From 72fd008e7fa5a85dd1d3e69d7c194a6160ec3615 Mon Sep 17 00:00:00 2001
From: Daniel Kraft <d@domob.eu>
Date: Sun, 7 Feb 2016 14:06:07 +0100
Subject: [PATCH 0001/1802] Fix quoting of copyright holders in configure.ac.

The old configure.ac did not work for a copyright holders string
containing commas due to insufficient quoting.  The new one allows this.
While this is, of course, not of direct consequence to the current code
(where the string is "Bitcoin Core"), it should still be fixed now that
the string is actually factored out.
---
 configure.ac | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index 939dfeaabfce9..bd30b6ab87362 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7,7 +7,7 @@ define(_CLIENT_VERSION_BUILD, 0)
 define(_CLIENT_VERSION_IS_RELEASE, false)
 define(_COPYRIGHT_YEAR, 2016)
 define(_COPYRIGHT_HOLDERS,[The %s developers])
-define(_COPYRIGHT_HOLDERS_SUBSTITUTION,[Bitcoin Core])
+define(_COPYRIGHT_HOLDERS_SUBSTITUTION,[[Bitcoin Core]])
 AC_INIT([Bitcoin Core],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_REVISION],[https://github.com/bitcoin/bitcoin/issues],[bitcoin],[https://bitcoincore.org/])
 AC_CONFIG_SRCDIR([src/main.cpp])
 AC_CONFIG_HEADERS([src/config/bitcoin-config.h])
@@ -999,10 +999,10 @@ AC_DEFINE(CLIENT_VERSION_MINOR, _CLIENT_VERSION_MINOR, [Minor version])
 AC_DEFINE(CLIENT_VERSION_REVISION, _CLIENT_VERSION_REVISION, [Build revision])
 AC_DEFINE(CLIENT_VERSION_BUILD, _CLIENT_VERSION_BUILD, [Version Build])
 AC_DEFINE(CLIENT_VERSION_IS_RELEASE, _CLIENT_VERSION_IS_RELEASE, [Version is release])
-AC_DEFINE(COPYRIGHT_YEAR, _COPYRIGHT_YEAR, [Version is release])
+AC_DEFINE(COPYRIGHT_YEAR, _COPYRIGHT_YEAR, [Copyright year])
 AC_DEFINE(COPYRIGHT_HOLDERS, "_COPYRIGHT_HOLDERS", [Copyright holder(s) before %s replacement])
 AC_DEFINE(COPYRIGHT_HOLDERS_SUBSTITUTION, "_COPYRIGHT_HOLDERS_SUBSTITUTION", [Replacement for %s in copyright holders string])
-define(_COPYRIGHT_HOLDERS_FINAL, patsubst(_COPYRIGHT_HOLDERS, [%s], [_COPYRIGHT_HOLDERS_SUBSTITUTION]))
+define(_COPYRIGHT_HOLDERS_FINAL, [patsubst(_COPYRIGHT_HOLDERS, [%s], [_COPYRIGHT_HOLDERS_SUBSTITUTION])])
 AC_DEFINE(COPYRIGHT_HOLDERS_FINAL, "_COPYRIGHT_HOLDERS_FINAL", [Copyright holder(s)])
 AC_SUBST(CLIENT_VERSION_MAJOR, _CLIENT_VERSION_MAJOR)
 AC_SUBST(CLIENT_VERSION_MINOR, _CLIENT_VERSION_MINOR)

From 7539f1aae3b41279dc5d49e09f448a78a071e114 Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Tue, 9 Feb 2016 12:37:05 +0100
Subject: [PATCH 0002/1802] tests: Make proxy_test work on travis servers
 without IPv6

---
 qa/rpc-tests/proxy_test.py             | 74 +++++++++++++++-----------
 qa/rpc-tests/test_framework/netutil.py | 15 ++++++
 2 files changed, 58 insertions(+), 31 deletions(-)

diff --git a/qa/rpc-tests/proxy_test.py b/qa/rpc-tests/proxy_test.py
index 7f77e664d266c..b3c65573ea332 100755
--- a/qa/rpc-tests/proxy_test.py
+++ b/qa/rpc-tests/proxy_test.py
@@ -7,6 +7,7 @@
 from test_framework.socks5 import Socks5Configuration, Socks5Command, Socks5Server, AddressType
 from test_framework.test_framework import BitcoinTestFramework
 from test_framework.util import *
+from test_framework.netutil import test_ipv6_local
 '''
 Test plan:
 - Start bitcoind's with different proxy configurations
@@ -34,6 +35,7 @@
 
 class ProxyTest(BitcoinTestFramework):
     def __init__(self):
+        self.have_ipv6 = test_ipv6_local()
         # Create two proxies on different ports
         # ... one unauthenticated
         self.conf1 = Socks5Configuration()
@@ -45,29 +47,36 @@ def __init__(self):
         self.conf2.addr = ('127.0.0.1', 14000 + (os.getpid() % 1000))
         self.conf2.unauth = True
         self.conf2.auth = True
-        # ... one on IPv6 with similar configuration
-        self.conf3 = Socks5Configuration()
-        self.conf3.af = socket.AF_INET6
-        self.conf3.addr = ('::1', 15000 + (os.getpid() % 1000))
-        self.conf3.unauth = True
-        self.conf3.auth = True
+        if self.have_ipv6:
+            # ... one on IPv6 with similar configuration
+            self.conf3 = Socks5Configuration()
+            self.conf3.af = socket.AF_INET6
+            self.conf3.addr = ('::1', 15000 + (os.getpid() % 1000))
+            self.conf3.unauth = True
+            self.conf3.auth = True
+        else:
+            print "Warning: testing without local IPv6 support"
 
         self.serv1 = Socks5Server(self.conf1)
         self.serv1.start()
         self.serv2 = Socks5Server(self.conf2)
         self.serv2.start()
-        self.serv3 = Socks5Server(self.conf3)
-        self.serv3.start()
+        if self.have_ipv6:
+            self.serv3 = Socks5Server(self.conf3)
+            self.serv3.start()
 
     def setup_nodes(self):
         # Note: proxies are not used to connect to local nodes
         # this is because the proxy to use is based on CService.GetNetwork(), which return NET_UNROUTABLE for localhost
-        return start_nodes(4, self.options.tmpdir, extra_args=[
+        args = [
             ['-listen', '-debug=net', '-debug=proxy', '-proxy=%s:%i' % (self.conf1.addr),'-proxyrandomize=1'], 
             ['-listen', '-debug=net', '-debug=proxy', '-proxy=%s:%i' % (self.conf1.addr),'-onion=%s:%i' % (self.conf2.addr),'-proxyrandomize=0'], 
             ['-listen', '-debug=net', '-debug=proxy', '-proxy=%s:%i' % (self.conf2.addr),'-proxyrandomize=1'], 
-            ['-listen', '-debug=net', '-debug=proxy', '-proxy=[%s]:%i' % (self.conf3.addr),'-proxyrandomize=0', '-noonion']
-            ])
+            []
+            ]
+        if self.have_ipv6:
+            args[3] = ['-listen', '-debug=net', '-debug=proxy', '-proxy=[%s]:%i' % (self.conf3.addr),'-proxyrandomize=0', '-noonion']
+        return start_nodes(4, self.options.tmpdir, extra_args=args)
 
     def node_test(self, node, proxies, auth, test_onion=True):
         rv = []
@@ -84,18 +93,19 @@ def node_test(self, node, proxies, auth, test_onion=True):
             assert_equal(cmd.password, None)
         rv.append(cmd)
 
-        # Test: outgoing IPv6 connection through node
-        node.addnode("[1233:3432:2434:2343:3234:2345:6546:4534]:5443", "onetry")
-        cmd = proxies[1].queue.get()
-        assert(isinstance(cmd, Socks5Command))
-        # Note: bitcoind's SOCKS5 implementation only sends atyp DOMAINNAME, even if connecting directly to IPv4/IPv6
-        assert_equal(cmd.atyp, AddressType.DOMAINNAME)
-        assert_equal(cmd.addr, "1233:3432:2434:2343:3234:2345:6546:4534")
-        assert_equal(cmd.port, 5443)
-        if not auth:
-            assert_equal(cmd.username, None)
-            assert_equal(cmd.password, None)
-        rv.append(cmd)
+        if self.have_ipv6:
+            # Test: outgoing IPv6 connection through node
+            node.addnode("[1233:3432:2434:2343:3234:2345:6546:4534]:5443", "onetry")
+            cmd = proxies[1].queue.get()
+            assert(isinstance(cmd, Socks5Command))
+            # Note: bitcoind's SOCKS5 implementation only sends atyp DOMAINNAME, even if connecting directly to IPv4/IPv6
+            assert_equal(cmd.atyp, AddressType.DOMAINNAME)
+            assert_equal(cmd.addr, "1233:3432:2434:2343:3234:2345:6546:4534")
+            assert_equal(cmd.port, 5443)
+            if not auth:
+                assert_equal(cmd.username, None)
+                assert_equal(cmd.password, None)
+            rv.append(cmd)
 
         if test_onion:
             # Test: outgoing onion connection through node
@@ -135,10 +145,11 @@ def run_test(self):
         rv = self.node_test(self.nodes[2], [self.serv2, self.serv2, self.serv2, self.serv2], True)
         # Check that credentials as used for -proxyrandomize connections are unique
         credentials = set((x.username,x.password) for x in rv)
-        assert_equal(len(credentials), 4)
+        assert_equal(len(credentials), len(rv))
 
-        # proxy on IPv6 localhost
-        self.node_test(self.nodes[3], [self.serv3, self.serv3, self.serv3, self.serv3], False, False)
+        if self.have_ipv6:
+            # proxy on IPv6 localhost
+            self.node_test(self.nodes[3], [self.serv3, self.serv3, self.serv3, self.serv3], False, False)
 
         def networks_dict(d):
             r = {}
@@ -167,11 +178,12 @@ def networks_dict(d):
             assert_equal(n2[net]['proxy_randomize_credentials'], True)
         assert_equal(n2['onion']['reachable'], True)
 
-        n3 = networks_dict(self.nodes[3].getnetworkinfo())
-        for net in ['ipv4','ipv6']:
-            assert_equal(n3[net]['proxy'], '[%s]:%i' % (self.conf3.addr))
-            assert_equal(n3[net]['proxy_randomize_credentials'], False)
-        assert_equal(n3['onion']['reachable'], False)
+        if self.have_ipv6:
+            n3 = networks_dict(self.nodes[3].getnetworkinfo())
+            for net in ['ipv4','ipv6']:
+                assert_equal(n3[net]['proxy'], '[%s]:%i' % (self.conf3.addr))
+                assert_equal(n3[net]['proxy_randomize_credentials'], False)
+            assert_equal(n3['onion']['reachable'], False)
 
 if __name__ == '__main__':
     ProxyTest().main()
diff --git a/qa/rpc-tests/test_framework/netutil.py b/qa/rpc-tests/test_framework/netutil.py
index 50daa8793732a..bfdef76ad1caf 100644
--- a/qa/rpc-tests/test_framework/netutil.py
+++ b/qa/rpc-tests/test_framework/netutil.py
@@ -137,3 +137,18 @@ def addr_to_hex(addr):
     else:
         raise ValueError('Could not parse address %s' % addr)
     return binascii.hexlify(bytearray(addr))
+
+def test_ipv6_local():
+    '''
+    Check for (local) IPv6 support.
+    '''
+    import socket
+    # By using SOCK_DGRAM this will not actually make a connection, but it will
+    # fail if there is no route to IPv6 localhost.
+    have_ipv6 = True
+    try:
+        s = socket.socket(socket.AF_INET6, socket.SOCK_DGRAM)
+        s.connect(('::1', 0))
+    except socket.error:
+        have_ipv6 = False
+    return have_ipv6

From 8aa722609d7e736b3a3763e15b552795b94f0e9b Mon Sep 17 00:00:00 2001
From: jmacwhyte <keatonatron@gmail.com>
Date: Thu, 11 Feb 2016 18:02:46 -0800
Subject: [PATCH 0003/1802] Fix IsInitialBlockDownload to play nice with
 testnet

---
 src/main.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main.cpp b/src/main.cpp
index 3ad2979b6b01c..9e478b6823685 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1384,7 +1384,7 @@ bool IsInitialBlockDownload()
     if (lockIBDState)
         return false;
     bool state = (chainActive.Height() < pindexBestHeader->nHeight - 24 * 6 ||
-            pindexBestHeader->GetBlockTime() < GetTime() - nMaxTipAge);
+            std::max(chainActive.Tip()->GetBlockTime(), pindexBestHeader->GetBlockTime()) < GetTime() - nMaxTipAge);
     if (!state)
         lockIBDState = true;
     return state;

From 146746bbafe5dfea7b2019231c2d37fe57a4c3bb Mon Sep 17 00:00:00 2001
From: Alice Wonder <github@domblogger.net>
Date: Fri, 26 Feb 2016 09:30:11 -0800
Subject: [PATCH 0004/1802] All files related to my RPM spec file project in
 one commit

---
 contrib/rpm/README.md                     | 185 +++++++++
 contrib/rpm/bitcoin-0.12.0-libressl.patch |  24 ++
 contrib/rpm/bitcoin.fc                    |   8 +
 contrib/rpm/bitcoin.if                    | 157 ++++++++
 contrib/rpm/bitcoin.spec                  | 444 ++++++++++++++++++++++
 contrib/rpm/bitcoin.te                    |  81 ++++
 6 files changed, 899 insertions(+)
 create mode 100644 contrib/rpm/README.md
 create mode 100644 contrib/rpm/bitcoin-0.12.0-libressl.patch
 create mode 100644 contrib/rpm/bitcoin.fc
 create mode 100644 contrib/rpm/bitcoin.if
 create mode 100644 contrib/rpm/bitcoin.spec
 create mode 100644 contrib/rpm/bitcoin.te

diff --git a/contrib/rpm/README.md b/contrib/rpm/README.md
new file mode 100644
index 0000000000000..aecb3ba84f20d
--- /dev/null
+++ b/contrib/rpm/README.md
@@ -0,0 +1,185 @@
+RPM Spec File Notes
+-------------------
+
+The RPM spec file provided here is for Bitcoin-Core 0.12.0 and builds on CentOS
+7 with either the CentOS provided OpenSSL library or with LibreSSL as packaged
+at [LibreLAMP.com](https://librelamp.com/). It should hopefully not be too
+difficult to port the RPM spec file to most RPM based Linux distributions.
+
+When porting the spec file to build for a particular distribution, there are
+some important notes.
+
+## Sources
+
+It is considered good form for all sources to reference a URL where the source
+can be downloaded.
+
+Sources 0-9 should be reserved for source code tarballs. `Source0` should
+reference the release tarball available from https://bitcoin.org/bin/ and
+`Source1` should reference the BerkeleyDB source.
+
+Sources 10-99 are for source files that are maintained in the
+[Bitcoin git repository](https://github.com/bitcoin/bitcoin) but are not part of
+the release tarball. Most of these will reside in the `contrib` sub-directory.
+
+Sources 10-19 should be reserved for miscellaneous configuration files.
+Currently only `Source10` is used, for the example `bitcoin.conf` file.
+
+Sources 20-29 should be reserved for man pages. Currently only `Source20`
+through `Source23` are used.
+
+Sources 30-39 should be reserved for SELinux related files. Currently only
+`Source30` through `Source32` are used. Until those files are in a tagged
+release, the full URL specified in the RPM spec file will not work. You can get
+them from the git ropository where you retrieved this file.
+
+Sources 100+ are for files that are not source tarballs and are not maintained
+in the bitcoin git repository. At present only an SVG version of the Bitcoin
+icon is used.
+
+## Patches
+
+In general, patches should be avoided. When a packager feels a patch is
+necessary, the packager should bring the problem to the attention of the bitcoin
+developers so that an official fix to the issue can make it into the next
+release.
+
+### Patch0 bitcoin-0.12.0-libressl.patch
+
+This patch is only needed if building against LibreSSL. LibreSSL is not the
+standard TLS library on most Linux distributions. The patch will likely not be
+needed when 0.12.1 is released, a proper fix is already in the Bitcoin git
+master branch.
+
+## BuildRequires
+
+The packages specified in the `BuildRequires` are specified according to the
+package naming convention currently used in CentOS 7 and EPEL for CentOS 7. You
+may need to change some of the package names for other distributions. This is
+most likely to be the case with the Qt packages.
+
+## BerkeleyDB
+
+The `build-unix.md` file recommends building against BerkeleyDB 4.8.30. Even if
+that is the version your Linux distribution ships with, it probably is a good
+idea to build Bitcoin Core against a static version of that library compiled
+according to the instructions in the `build-unix.md` file so that any changes
+the distribution may make in the future will not result in a problem for users.
+
+The problem that can exist, clients built against different versions of
+BerkeleyDB may not be able read each other's `wallet.dat` file which can make it
+difficult for a user to recover from backup in the event of a system failure.
+
+## Graphical User Interface and Qt Version
+
+The RPM spec file will by default build the GUI client linked against the Qt5
+libraries. If you wish instead to link against the Qt4 libraries you need to
+pass the switch `-D '_use_qt4 1'` at build time to the `rpmbuild` or `mock`
+command used to build the packages.
+
+If you would prefer not to build the GUI at all, you can pass the switch
+`-D '_no_gui 1'` to the `rpmbuild` or `mock` build command.
+
+## Desktop and KDE Files
+
+The desktop and KDE meta files are created in the spec file itself with the
+`cat` command. This is done to allow easy distribution specific changes without
+needing to use any patches. A specific time stamp is given to the files so that
+it does not they do not appear to have been updated every time the package is
+built. If you do make changes to them, you probably should update time stamp
+assigned to them in the `touch` command that specifies the time stamp.
+
+## SVG, PNG, and XPM Icons
+
+The `bitcoin.svg` file is from the source listed as `Source100`. It is used as
+the source for the PNG and XPM files. The generated PNG and XPM files are given
+the same time stamp as the source SVG file as a means of indicating they are
+derived from it.
+
+## Systemd
+
+This spec file assumes the target distribution uses systemd. That really only
+matters for the `bitcoin-server` package. At this point, most RPM based
+distributions that still receive vendor updates do in fact use systemd.
+
+The files to control the service are created in the RPM spec file itself using
+the `cat` command. This is done to make it easy to modify for other
+distributions that may implement things differently without needing to patch
+source. A specific time stamp is given to the files so that they do not appear
+to have been updated every time the package is built. If you do make changes to
+them, you probably should update the time stamp assigned to them in the `touch`
+command that specifies the time stamp.
+
+## SELinux
+
+The `bitcoin-server` package should have SELinux support. How to properly do
+that *may* vary by distribution and version of distribution.
+
+The SELinux stuff in this RPM spec file *should* be correct for CentOS, RHEL,
+and Fedora but it would be a good idea to review it before building the package
+on other distributions.
+
+## Tests
+
+The `%check` section takes a very long time to run. If your build system has a
+time limit for package build, you may need to make an exception for this
+package. On CentOS 7 the `%check` section completes successfully with both
+OpenSSL and LibreSSL, a failure really does mean something is wrong.
+
+## LibreSSL Build Notes
+
+To build against LibreSSL you will need to pass the switch
+`-D '_use_libressl 1'` to the `rpmbuild` or `mock` command or the spec file will
+want the OpenSSL development files.
+
+### LibreSSL and Boost
+
+LibreSSL (and some newer builds of OpenSSL) do not have support for SSLv3. This
+can cause issues with the Boost package if the Boost package has not been
+patched accordingly. On those distributions, you will either need to build
+Bitcoin-Core against OpenSSL or use a patched version of Boost in the build
+system.
+
+As SSLv3 is no longer safe, distributions that have not patched Boost to work
+with TLS libraries that do not support SSLv3 should have bug reports filed
+against the Boost package. This bug report has already been filed for RHEL 7 but
+it may need to be filed for other distributions.
+
+A patch for Boost: https://github.com/boostorg/asio/pull/23/files
+
+## ZeroMQ
+
+At this time, this RPM spec file does not support the ZeroMQ build options. A
+suitable version of ZeroMQ is not available for the platform this spec file was
+developed on (CentOS 7).
+
+## Legacy Credit
+
+This RPM spec file is largely based upon the work of Michael Hampton at
+[Ringing Liberty](https://www.ringingliberty.com/bitcoin/). He has been
+packaging Bitcoin for Fedora at least since 2012.
+
+Most of the differences between his packaging and this package are stylistic in
+nature. The major differences:
+
+1. He builds from a github tagged release rather than a release tarball. This
+should not result in different source code.
+
+2. He does not build BerkeleyDB but instead uses the BerkeleyDB provided by the
+Linux distribution. For the distributions he packages for, they currently all
+use the same version of BerkeleyDB so that difference is *probably* just
+academic.
+
+3. As of his 10.11.2 package he did not allow for building against LibreSSL,
+specifying a build without the Qt GUI, or specifying which version of the Qt
+libraries to use.
+
+4. I renamed the `bitcoin` package that contains the Qt GUI to `bitcoin-core` as
+that appears to be how the general population refers to it, in contrast to
+`bitcoin-xt` or `bitcoin-classic`. I wanted to make sure the general population
+knows what they are getting when installing the GUI package.
+
+As far as minor differences, I generally prefer to assign the file permissions
+in the `%files` portion of an RPM spec file rather than specifying the
+permissions of a file during `%install` and other minor things like that that
+are largely just cosmetic.
diff --git a/contrib/rpm/bitcoin-0.12.0-libressl.patch b/contrib/rpm/bitcoin-0.12.0-libressl.patch
new file mode 100644
index 0000000000000..555614a06d49a
--- /dev/null
+++ b/contrib/rpm/bitcoin-0.12.0-libressl.patch
@@ -0,0 +1,24 @@
+diff -ur bitcoin-0.12.0.orig/src/init.cpp bitcoin-0.12.0/src/init.cpp
+--- bitcoin-0.12.0.orig/src/init.cpp	2015-12-31 16:00:00.000000000 -0800
++++ bitcoin-0.12.0/src/init.cpp	2016-02-23 06:03:47.133227757 -0800
+@@ -1075,7 +1075,7 @@
+     if (fPrintToDebugLog)
+         OpenDebugLog();
+ 
+-#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
++#if defined(LIBRESSL_VERSION_NUMBER) || (OPENSSL_VERSION_NUMBER < 0x10100000L)
+     LogPrintf("Using OpenSSL version %s\n", SSLeay_version(SSLEAY_VERSION));
+ #else
+     LogPrintf("Using OpenSSL version %s\n", OpenSSL_version(OPENSSL_VERSION));
+diff -ur bitcoin-0.12.0.orig/src/qt/rpcconsole.cpp bitcoin-0.12.0/src/qt/rpcconsole.cpp
+--- bitcoin-0.12.0.orig/src/qt/rpcconsole.cpp	2015-12-31 16:00:00.000000000 -0800
++++ bitcoin-0.12.0/src/qt/rpcconsole.cpp	2016-02-23 15:09:42.881126841 -0800
+@@ -264,7 +264,7 @@
+ 
+     // set library version labels
+ 
+-#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
++#if defined(LIBRESSL_VERSION_NUMBER) || (OPENSSL_VERSION_NUMBER < 0x10100000L)
+     ui->openSSLVersion->setText(SSLeay_version(SSLEAY_VERSION));
+ #else
+     ui->openSSLVersion->setText(OpenSSL_version(OPENSSL_VERSION));
diff --git a/contrib/rpm/bitcoin.fc b/contrib/rpm/bitcoin.fc
new file mode 100644
index 0000000000000..6f5eef6375255
--- /dev/null
+++ b/contrib/rpm/bitcoin.fc
@@ -0,0 +1,8 @@
+/usr/bin/bitcoin-cli		--	gen_context(system_u:object_r:bitcoin_exec_t,s0)
+/usr/sbin/bitcoind		--	gen_context(system_u:object_r:bitcoin_exec_t,s0)
+/usr/lib(64)?/bitcoin/bitcoind		--	gen_context(system_u:object_r:bitcoin_exec_t,s0)
+
+/etc/bitcoin(/.*)?		gen_context(system_u:object_r:bitcoin_conf_t,s0)
+/var/lib/bitcoin(/.*)?		gen_context(system_u:object_r:bitcoin_var_lib_t,s0)
+
+(/var)?/run/bitcoind(/.*)?   gen_context(system_u:object_r:bitcoin_var_run_t,s0)
diff --git a/contrib/rpm/bitcoin.if b/contrib/rpm/bitcoin.if
new file mode 100644
index 0000000000000..2b096c24dc323
--- /dev/null
+++ b/contrib/rpm/bitcoin.if
@@ -0,0 +1,157 @@
+
+## <summary>policy for bitcoin</summary>
+
+
+########################################
+## <summary>
+##	Transition to bitcoin.
+## </summary>
+## <param name="domain">
+## <summary>
+##	Domain allowed to transition.
+## </summary>
+## </param>
+#
+interface(`bitcoin_domtrans',`
+	gen_require(`
+		type bitcoin_t, bitcoin_exec_t;
+	')
+
+	corecmd_search_bin($1)
+	domtrans_pattern($1, bitcoin_exec_t, bitcoin_t)
+')
+
+
+########################################
+## <summary>
+##	Execute bitcoin server in the bitcoin domain.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+#
+interface(`bitcoin_initrc_domtrans',`
+	gen_require(`
+		type bitcoin_initrc_exec_t;
+	')
+
+	init_labeled_script_domtrans($1, bitcoin_initrc_exec_t)
+')
+
+
+########################################
+## <summary>
+##	Search bitcoin lib directories.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+#
+interface(`bitcoin_search_lib',`
+	gen_require(`
+		type bitcoin_var_lib_t;
+	')
+
+	allow $1 bitcoin_var_lib_t:dir search_dir_perms;
+	files_search_var_lib($1)
+')
+
+########################################
+## <summary>
+##	Read bitcoin lib files.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+#
+interface(`bitcoin_read_lib_files',`
+	gen_require(`
+		type bitcoin_var_lib_t;
+	')
+
+	files_search_var_lib($1)
+	read_files_pattern($1, bitcoin_var_lib_t, bitcoin_var_lib_t)
+')
+
+########################################
+## <summary>
+##	Manage bitcoin lib files.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+#
+interface(`bitcoin_manage_lib_files',`
+	gen_require(`
+		type bitcoin_var_lib_t;
+	')
+
+	files_search_var_lib($1)
+	manage_files_pattern($1, bitcoin_var_lib_t, bitcoin_var_lib_t)
+')
+
+########################################
+## <summary>
+##	Manage bitcoin lib directories.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+#
+interface(`bitcoin_manage_lib_dirs',`
+	gen_require(`
+		type bitcoin_var_lib_t;
+	')
+
+	files_search_var_lib($1)
+	manage_dirs_pattern($1, bitcoin_var_lib_t, bitcoin_var_lib_t)
+')
+
+
+########################################
+## <summary>
+##	All of the rules required to administrate
+##	an bitcoin environment
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+## <param name="role">
+##	<summary>
+##	Role allowed access.
+##	</summary>
+## </param>
+## <rolecap/>
+#
+interface(`bitcoin_admin',`
+	gen_require(`
+		type bitcoin_t;
+		type bitcoin_initrc_exec_t;
+		type bitcoin_var_lib_t;
+	')
+
+	allow $1 bitcoin_t:process { ptrace signal_perms };
+	ps_process_pattern($1, bitcoin_t)
+
+	bitcoin_initrc_domtrans($1)
+	domain_system_change_exemption($1)
+	role_transition $2 bitcoin_initrc_exec_t system_r;
+	allow $2 system_r;
+
+	files_search_var_lib($1)
+	admin_pattern($1, bitcoin_var_lib_t)
+
+')
+
diff --git a/contrib/rpm/bitcoin.spec b/contrib/rpm/bitcoin.spec
new file mode 100644
index 0000000000000..38ae038180766
--- /dev/null
+++ b/contrib/rpm/bitcoin.spec
@@ -0,0 +1,444 @@
+%define bdbv 4.8.30
+%global selinux_variants mls strict targeted
+
+%if 0%{?_no_gui:1}
+%define _buildqt 0
+%define buildargs --with-gui=no
+%else
+%define _buildqt 1
+%if 0%{?_use_qt4}
+%define buildargs --with-qrencode --with-gui=qt4
+%else
+%define buildargs --with-qrencode --with-gui=qt5
+%endif
+%endif
+
+Name:		bitcoin
+Version:	0.12.0
+Release:	2%{?dist}
+Summary:	Peer to Peer Cryptographic Currency
+
+Group:		Applications/System
+License:	MIT
+URL:		https://bitcoin.org/
+Source0:	https://bitcoin.org/bin/bitcoin-core-%{version}/bitcoin-%{version}.tar.gz
+Source1:	http://download.oracle.com/berkeley-db/db-%{bdbv}.NC.tar.gz
+
+Source10:	https://raw.githubusercontent.com/bitcoin/bitcoin/v%{version}/contrib/debian/examples/bitcoin.conf
+
+#man pages
+Source20:	https://raw.githubusercontent.com/bitcoin/bitcoin/v%{version}/contrib/debian/manpages/bitcoind.1
+Source21:	https://raw.githubusercontent.com/bitcoin/bitcoin/v%{version}/contrib/debian/manpages/bitcoin-cli.1
+Source22:	https://raw.githubusercontent.com/bitcoin/bitcoin/v%{version}/contrib/debian/manpages/bitcoin-qt.1
+Source23:	https://raw.githubusercontent.com/bitcoin/bitcoin/v%{version}/contrib/debian/manpages/bitcoin.conf.5
+
+#selinux
+Source30:	https://raw.githubusercontent.com/bitcoin/bitcoin/v%{version}/contrib/rpm/bitcoin.te
+# Source31 - what about bitcoin-tx and bench_bitcoin ???
+Source31:	https://raw.githubusercontent.com/bitcoin/bitcoin/v%{version}/contrib/rpm/bitcoin.fc
+Source32:	https://raw.githubusercontent.com/bitcoin/bitcoin/v%{version}/contrib/rpm/bitcoin.if
+
+Source100:	https://upload.wikimedia.org/wikipedia/commons/4/46/Bitcoin.svg
+
+%if 0%{?_use_libressl:1}
+BuildRequires:	libressl-devel
+%else
+BuildRequires:	openssl-devel
+%endif
+BuildRequires:	boost-devel
+BuildRequires:	miniupnpc-devel
+BuildRequires:	autoconf automake libtool
+BuildRequires:	libevent-devel
+
+
+Patch0:		bitcoin-0.12.0-libressl.patch
+
+
+%description
+Bitcoin is a digital cryptographic currency that uses peer-to-peer technology to
+operate with no central authority or banks; managing transactions and the
+issuing of bitcoins is carried out collectively by the network.
+
+%if %{_buildqt}
+%package core
+Summary:	Peer to Peer Cryptographic Currency
+Group:		Applications/System
+Obsoletes:	%{name} < %{version}-%{release}
+Provides:	%{name} = %{version}-%{release}
+%if 0%{?_use_qt4}
+BuildRequires:	qt-devel
+%else
+BuildRequires:	qt5-qtbase-devel
+# for /usr/bin/lrelease-qt5
+BuildRequires:	qt5-linguist
+%endif
+BuildRequires:	protobuf-devel
+BuildRequires:	qrencode-devel
+BuildRequires:	%{_bindir}/desktop-file-validate
+# for icon generation from SVG
+BuildRequires:	%{_bindir}/inkscape
+BuildRequires:	%{_bindir}/convert
+
+%description core
+Bitcoin is a digital cryptographic currency that uses peer-to-peer technology to
+operate with no central authority or banks; managing transactions and the
+issuing of bitcoins is carried out collectively by the network.
+
+This package contains the Qt based graphical client and node. If you are looking
+to run a Bitcoin wallet, this is probably the package you want.
+%endif
+
+
+%package libs
+Summary:	Bitcoin shared libraries
+Group:		System Environment/Libraries
+
+%description libs
+This package provides the bitcoinconsensus shared libraries. These libraries
+may be used by third party software to provide consensus verification
+functionality.
+
+Unless you know need this package, you probably do not.
+
+%package devel
+Summary:	Development files for bitcoin
+Group:		Development/Libraries
+Requires:	%{name}-libs = %{version}-%{release}
+
+%description devel
+This package contains the header files and static library for the
+bitcoinconsensus shared library. If you are developing or compiling software
+that wants to link against that library, then you need this package installed.
+
+Most people do not need this package installed.
+
+%package server
+Summary:	The bitcoin daemon
+Group:		System Environment/Daemons
+Requires:	bitcoin-utils = %{version}-%{release}
+Requires:	selinux-policy policycoreutils-python
+Requires(pre):	shadow-utils
+Requires(post):	%{_sbindir}/semodule %{_sbindir}/restorecon %{_sbindir}/fixfiles %{_sbindir}/sestatus
+Requires(postun):	%{_sbindir}/semodule %{_sbindir}/restorecon %{_sbindir}/fixfiles %{_sbindir}/sestatus
+BuildRequires:	systemd
+BuildRequires:	checkpolicy
+BuildRequires:	%{_datadir}/selinux/devel/Makefile
+
+%description server
+This package provides a stand-alone bitcoin-core daemon. For most users, this
+package is only needed if they need a full-node without the graphical client.
+
+Some third party wallet software will want this package to provide the actual
+bitcoin-core node they use to connect to the network.
+
+If you use the graphical bitcoin-core client then you almost certainly do not
+need this package.
+
+%package utils
+Summary:	Bitcoin utilities
+Group:		Applications/System
+
+%description utils
+This package provides several command line utilities for interacting with a
+bitcoin-core daemon.
+
+The bitcoin-cli utility allows you to communicate and control a bitcoin daemon
+over RPC, the bitcoin-tx utility allows you to create a custom transaction, and
+the bench_bitcoin utility can be used to perform some benchmarks.
+
+This package contains utilities needed by the bitcoin-server package.
+
+
+%prep
+%setup -q
+%patch0 -p1 -b .libressl
+cp -p %{SOURCE10} ./bitcoin.conf.example
+tar -zxf %{SOURCE1}
+cp -p db-%{bdbv}.NC/LICENSE ./db-%{bdbv}.NC-LICENSE
+mkdir db4 SELinux
+cp -p %{SOURCE30} %{SOURCE31} %{SOURCE32} SELinux/
+
+
+%build
+CWD=`pwd`
+cd db-%{bdbv}.NC/build_unix/
+../dist/configure --enable-cxx --disable-shared --with-pic --prefix=${CWD}/db4
+make install
+cd ../..
+
+./autogen.sh
+%configure LDFLAGS="-L${CWD}/db4/lib/" CPPFLAGS="-I${CWD}/db4/include/" --with-miniupnpc --enable-glibc-back-compat %{buildargs}
+make %{?_smp_mflags}
+
+pushd SELinux
+for selinuxvariant in %{selinux_variants}; do
+	make NAME=${selinuxvariant} -f %{_datadir}/selinux/devel/Makefile
+	mv bitcoin.pp bitcoin.pp.${selinuxvariant}
+	make NAME=${selinuxvariant} -f %{_datadir}/selinux/devel/Makefile clean
+done
+popd
+
+
+%install
+make install DESTDIR=%{buildroot}
+
+mkdir -p -m755 %{buildroot}%{_sbindir}
+mv %{buildroot}%{_bindir}/bitcoind %{buildroot}%{_sbindir}/bitcoind
+
+# systemd stuff
+mkdir -p %{buildroot}%{_tmpfilesdir}
+cat <<EOF > %{buildroot}%{_tmpfilesdir}/bitcoin.conf
+d /run/bitcoind 0750 bitcoin bitcoin -
+EOF
+touch -a -m -t 201504280000 %{buildroot}%{_tmpfilesdir}/bitcoin.conf
+
+mkdir -p %{buildroot}%{_sysconfdir}/sysconfig
+cat <<EOF > %{buildroot}%{_sysconfdir}/sysconfig/bitcoin
+# Provide options to the bitcoin daemon here, for example
+# OPTIONS="-testnet -disable-wallet"
+
+OPTIONS=""
+
+# System service defaults.
+# Don't change these unless you know what you're doing.
+CONFIG_FILE="%{_sysconfdir}/bitcoin/bitcoin.conf"
+DATA_DIR="%{_localstatedir}/lib/bitcoin"
+PID_FILE="/run/bitcoind/bitcoind.pid"
+EOF
+touch -a -m -t 201504280000 %{buildroot}%{_sysconfdir}/sysconfig/bitcoin
+
+mkdir -p %{buildroot}%{_unitdir}
+cat <<EOF > %{buildroot}%{_unitdir}/bitcoin.service
+[Unit]
+Description=Bitcoin daemon
+After=syslog.target network.target
+
+[Service]
+Type=forking
+ExecStart=%{_sbindir}/bitcoind -daemon -conf=\${CONFIG_FILE} -datadir=\${DATA_DIR} -pid=\${PID_FILE} \$OPTIONS
+EnvironmentFile=%{_sysconfdir}/sysconfig/bitcoin
+User=bitcoin
+Group=bitcoin
+
+Restart=on-failure
+PrivateTmp=true
+TimeoutStopSec=120
+TimeoutStartSec=60
+StartLimitInterval=240
+StartLimitBurst=5
+
+[Install]
+WantedBy=multi-user.target
+EOF
+touch -a -m -t 201504280000 %{buildroot}%{_unitdir}/bitcoin.service
+#end systemd stuff
+
+mkdir %{buildroot}%{_sysconfdir}/bitcoin
+mkdir -p %{buildroot}%{_localstatedir}/lib/bitcoin
+
+#SELinux
+for selinuxvariant in %{selinux_variants}; do
+	install -d %{buildroot}%{_datadir}/selinux/${selinuxvariant}
+	install -p -m 644 SELinux/bitcoin.pp.${selinuxvariant} %{buildroot}%{_datadir}/selinux/${selinuxvariant}/bitcoin.pp
+done
+
+%if %{_buildqt}
+# qt icons
+install -D -p share/pixmaps/bitcoin.ico %{buildroot}%{_datadir}/pixmaps/bitcoin.ico
+install -p share/pixmaps/nsis-header.bmp %{buildroot}%{_datadir}/pixmaps/
+install -p share/pixmaps/nsis-wizard.bmp %{buildroot}%{_datadir}/pixmaps/
+install -p %{SOURCE100} %{buildroot}%{_datadir}/pixmaps/bitcoin.svg
+%{_bindir}/inkscape %{SOURCE100} --export-png=%{buildroot}%{_datadir}/pixmaps/bitcoin16.png -w16 -h16
+%{_bindir}/inkscape %{SOURCE100} --export-png=%{buildroot}%{_datadir}/pixmaps/bitcoin32.png -w32 -h32
+%{_bindir}/inkscape %{SOURCE100} --export-png=%{buildroot}%{_datadir}/pixmaps/bitcoin64.png -w64 -h64
+%{_bindir}/inkscape %{SOURCE100} --export-png=%{buildroot}%{_datadir}/pixmaps/bitcoin128.png -w128 -h128
+%{_bindir}/inkscape %{SOURCE100} --export-png=%{buildroot}%{_datadir}/pixmaps/bitcoin256.png -w256 -h256
+%{_bindir}/convert -resize 16x16 %{buildroot}%{_datadir}/pixmaps/bitcoin256.png %{buildroot}%{_datadir}/pixmaps/bitcoin16.xpm
+%{_bindir}/convert -resize 32x32 %{buildroot}%{_datadir}/pixmaps/bitcoin256.png %{buildroot}%{_datadir}/pixmaps/bitcoin32.xpm
+%{_bindir}/convert -resize 64x64 %{buildroot}%{_datadir}/pixmaps/bitcoin256.png %{buildroot}%{_datadir}/pixmaps/bitcoin64.xpm
+%{_bindir}/convert -resize 128x128 %{buildroot}%{_datadir}/pixmaps/bitcoin256.png %{buildroot}%{_datadir}/pixmaps/bitcoin128.xpm
+%{_bindir}/convert %{buildroot}%{_datadir}/pixmaps/bitcoin256.png %{buildroot}%{_datadir}/pixmaps/bitcoin256.xpm
+touch %{buildroot}%{_datadir}/pixmaps/*.png -r %{SOURCE100}
+touch %{buildroot}%{_datadir}/pixmaps/*.xpm -r %{SOURCE100}
+
+# Desktop File - change the touch timestamp if modifying
+mkdir -p %{buildroot}%{_datadir}/applications
+cat <<EOF > %{buildroot}%{_datadir}/applications/bitcoin-core.desktop
+[Desktop Entry]
+Encoding=UTF-8
+Name=Bitcoin
+Comment=Bitcoin P2P Cryptocurrency
+Comment[fr]=Bitcoin, monnaie virtuelle cryptographique pair à pair
+Comment[tr]=Bitcoin, eşten eşe kriptografik sanal para birimi
+Exec=bitcoin-qt %u
+Terminal=false
+Type=Application
+Icon=bitcoin128
+MimeType=x-scheme-handler/bitcoin;
+Categories=Office;Finance;
+EOF
+# change touch date when modifying desktop
+touch -a -m -t 201511100546 %{buildroot}%{_datadir}/applications/bitcoin-core.desktop
+%{_bindir}/desktop-file-validate %{buildroot}%{_datadir}/applications/bitcoin-core.desktop
+
+# KDE protocol - change the touch timestamp if modifying
+mkdir -p %{buildroot}%{_datadir}/kde4/services
+cat <<EOF > %{buildroot}%{_datadir}/kde4/services/bitcoin-core.protocol
+[Protocol]
+exec=bitcoin-qt '%u'
+protocol=bitcoin
+input=none
+output=none
+helper=true
+listing=
+reading=false
+writing=false
+makedir=false
+deleting=false
+EOF
+# change touch date when modifying protocol
+touch -a -m -t 201511100546 %{buildroot}%{_datadir}/kde4/services/bitcoin-core.protocol
+%endif
+
+# man pages
+install -D -p %{SOURCE20} %{buildroot}%{_mandir}/man1/bitcoind.1
+install -p %{SOURCE21} %{buildroot}%{_mandir}/man1/bitcoin-cli.1
+%if %{_buildqt}
+install -p %{SOURCE22} %{buildroot}%{_mandir}/man1/bitcoin-qt.1
+%endif
+install -D -p %{SOURCE23} %{buildroot}%{_mandir}/man5/bitcoin.conf.5
+
+# nuke these, we do extensive testing of binaries in %%check before packaging
+rm -f %{buildroot}%{_bindir}/test_*
+
+%check
+make check
+pushd src
+srcdir=. test/bitcoin-util-test.py
+popd
+qa/pull-tester/rpc-tests.py -extended
+
+%post libs -p /sbin/ldconfig
+
+%postun libs -p /sbin/ldconfig
+
+%pre server
+getent group bitcoin >/dev/null || groupadd -r bitcoin
+getent passwd bitcoin >/dev/null ||
+	useradd -r -g bitcoin -d /var/lib/bitcoin -s /sbin/nologin \
+	-c "Bitcoin wallet server" bitcoin
+exit 0
+
+%post server
+%systemd_post bitcoin.service
+# SELinux
+if [ `%{_sbindir}/sestatus |grep -c "disabled"` -eq 0 ]; then
+for selinuxvariant in %{selinux_variants}; do
+	%{_sbindir}/semodule -s ${selinuxvariant} -i %{_datadir}/selinux/${selinuxvariant}/bitcoin.pp &> /dev/null || :
+done
+%{_sbindir}/semanage port -a -t bitcoin_port_t -p tcp 8332
+%{_sbindir}/semanage port -a -t bitcoin_port_t -p tcp 8333
+%{_sbindir}/semanage port -a -t bitcoin_port_t -p tcp 18332
+%{_sbindir}/semanage port -a -t bitcoin_port_t -p tcp 18333
+%{_sbindir}/fixfiles -R bitcoin-server restore &> /dev/null || :
+%{_sbindir}/restorecon -R %{_localstatedir}/lib/bitcoin || :
+fi
+
+%posttrans server
+%{_bindir}/systemd-tmpfiles --create
+
+%preun server
+%systemd_preun bitcoin.service
+
+%postun server
+%systemd_postun bitcoin.service
+# SELinux
+if [ $1 -eq 0 ]; then
+	if [ `%{_sbindir}/sestatus |grep -c "disabled"` -eq 0 ]; then
+	%{_sbindir}/semanage port -d -p tcp 8332
+	%{_sbindir}/semanage port -d -p tcp 8333
+	%{_sbindir}/semanage port -d -p tcp 18332
+	%{_sbindir}/semanage port -d -p tcp 18333
+	for selinuxvariant in %{selinux_variants}; do
+		%{_sbindir}/semodule -s ${selinuxvariant} -r bitcoin &> /dev/null || :
+	done
+	%{_sbindir}/fixfiles -R bitcoin-server restore &> /dev/null || :
+	[ -d %{_localstatedir}/lib/bitcoin ] && \
+		%{_sbindir}/restorecon -R %{_localstatedir}/lib/bitcoin &> /dev/null || :
+	fi
+fi
+
+%clean
+rm -rf %{buildroot}
+
+%if %{_buildqt}
+%files core
+%defattr(-,root,root,-)
+%license COPYING db-%{bdbv}.NC-LICENSE
+%doc COPYING bitcoin.conf.example doc/README.md doc/bips.md doc/files.md doc/multiwallet-qt.md doc/reduce-traffic.md doc/release-notes.md doc/tor.md
+%attr(0755,root,root) %{_bindir}/bitcoin-qt
+%attr(0644,root,root) %{_datadir}/applications/bitcoin-core.desktop
+%attr(0644,root,root) %{_datadir}/kde4/services/bitcoin-core.protocol
+%attr(0644,root,root) %{_datadir}/pixmaps/*.ico
+%attr(0644,root,root) %{_datadir}/pixmaps/*.bmp
+%attr(0644,root,root) %{_datadir}/pixmaps/*.svg
+%attr(0644,root,root) %{_datadir}/pixmaps/*.png
+%attr(0644,root,root) %{_datadir}/pixmaps/*.xpm
+%attr(0644,root,root) %{_mandir}/man1/bitcoin-qt.1*
+%endif
+
+%files libs
+%defattr(-,root,root,-)
+%license COPYING
+%doc COPYING doc/README.md doc/shared-libraries.md
+%{_libdir}/lib*.so.*
+
+%files devel
+%defattr(-,root,root,-)
+%license COPYING
+%doc COPYING doc/README.md doc/developer-notes.md doc/shared-libraries.md
+%attr(0644,root,root) %{_includedir}/*.h
+%{_libdir}/*.so
+%{_libdir}/*.a
+%{_libdir}/*.la
+%attr(0644,root,root) %{_libdir}/pkgconfig/*.pc
+
+%files server
+%defattr(-,root,root,-)
+%license COPYING db-%{bdbv}.NC-LICENSE
+%doc COPYING bitcoin.conf.example doc/README.md doc/REST-interface.md doc/bips.md doc/dnsseed-policy.md doc/files.md doc/reduce-traffic.md doc/release-notes.md doc/tor.md
+%attr(0755,root,root) %{_sbindir}/bitcoind
+%attr(0644,root,root) %{_tmpfilesdir}/bitcoin.conf
+%attr(0644,root,root) %{_unitdir}/bitcoin.service
+%dir %attr(0750,bitcoin,bitcoin) %{_sysconfdir}/bitcoin
+%dir %attr(0750,bitcoin,bitcoin) %{_localstatedir}/lib/bitcoin
+%config(noreplace) %attr(0600,root,root) %{_sysconfdir}/sysconfig/bitcoin
+%attr(0644,root,root) %{_datadir}/selinux/*/*.pp
+%attr(0644,root,root) %{_mandir}/man1/bitcoind.1*
+%attr(0644,root,root) %{_mandir}/man5/bitcoin.conf.5*
+
+%files utils
+%defattr(-,root,root,-)
+%license COPYING
+%doc COPYING bitcoin.conf.example doc/README.md
+%attr(0755,root,root) %{_bindir}/bitcoin-cli
+%attr(0755,root,root) %{_bindir}/bitcoin-tx
+%attr(0755,root,root) %{_bindir}/bench_bitcoin
+%attr(0644,root,root) %{_mandir}/man1/bitcoin-cli.1*
+%attr(0644,root,root) %{_mandir}/man5/bitcoin.conf.5*
+
+
+
+%changelog
+* Fri Feb 26 2016 Alice Wonder <buildmaster@librelamp.com> - 0.12.0-2
+- Rename Qt package from bitcoin to bitcoin-core
+- Make building of the Qt package optional
+- When building the Qt package, default to Qt5 but allow building
+-  against Qt4
+- Only run SELinux stuff in post scripts if it is not set to disabled
+
+* Wed Feb 24 2016 Alice Wonder <buildmaster@librelamp.com> - 0.12.0-1
+- Initial spec file for 0.12.0 release
+
+# This spec file is written from scratch but a lot of the packaging decisions are directly
+# based upon the 0.11.2 package spec file from https://www.ringingliberty.com/bitcoin/
diff --git a/contrib/rpm/bitcoin.te b/contrib/rpm/bitcoin.te
new file mode 100644
index 0000000000000..d6231c591a243
--- /dev/null
+++ b/contrib/rpm/bitcoin.te
@@ -0,0 +1,81 @@
+policy_module(bitcoin, 1.100.1)
+
+########################################
+#
+# Declarations
+#
+
+type bitcoin_t;
+type bitcoin_exec_t;
+init_daemon_domain(bitcoin_t, bitcoin_exec_t)
+
+permissive bitcoin_t;
+
+type bitcoin_initrc_exec_t;
+init_script_file(bitcoin_initrc_exec_t)
+
+type bitcoin_conf_t;
+files_type(bitcoin_conf_t)
+
+type bitcoin_var_lib_t;
+files_type(bitcoin_var_lib_t)
+
+type bitcoin_var_run_t;
+files_type(bitcoin_var_run_t)
+
+type bitcoin_port_t;
+corenet_port(bitcoin_port_t)
+
+########################################
+#
+# bitcoin local policy
+#
+allow bitcoin_t self:process { fork };
+
+allow bitcoin_t self:fifo_file rw_fifo_file_perms;
+allow bitcoin_t self:unix_stream_socket create_stream_socket_perms;
+
+manage_dirs_pattern(bitcoin_t, bitcoin_conf_t, bitcoin_conf_t)
+manage_files_pattern(bitcoin_t, bitcoin_conf_t, bitcoin_conf_t)
+
+manage_dirs_pattern(bitcoin_t, bitcoin_var_lib_t, bitcoin_var_lib_t)
+manage_files_pattern(bitcoin_t, bitcoin_var_lib_t, bitcoin_var_lib_t)
+files_var_lib_filetrans(bitcoin_t, bitcoin_var_lib_t, { dir file })
+
+manage_dirs_pattern(bitcoin_t, bitcoin_var_run_t, bitcoin_var_run_t)
+manage_files_pattern(bitcoin_t, bitcoin_var_run_t, bitcoin_var_run_t)
+
+sysnet_dns_name_resolve(bitcoin_t)
+corenet_all_recvfrom_unlabeled(bitcoin_t)
+
+allow bitcoin_t self:tcp_socket create_stream_socket_perms;
+corenet_tcp_sendrecv_generic_if(bitcoin_t)
+corenet_tcp_sendrecv_generic_node(bitcoin_t)
+corenet_tcp_sendrecv_all_ports(bitcoin_t)
+corenet_tcp_bind_generic_node(bitcoin_t)
+
+gen_require(`
+    type bitcoin_port_t;
+')
+allow bitcoin_t bitcoin_port_t:tcp_socket name_bind;
+
+gen_require(`
+    type bitcoin_port_t;
+')
+allow bitcoin_t bitcoin_port_t:tcp_socket name_connect;
+
+domain_use_interactive_fds(bitcoin_t)
+
+files_read_etc_files(bitcoin_t)
+
+miscfiles_read_localization(bitcoin_t)
+
+sysnet_dns_name_resolve(bitcoin_t)
+
+allow bitcoin_t bitcoin_exec_t:file execute_no_trans;
+allow bitcoin_t self:process setsched;
+corecmd_exec_ls(bitcoin_t)
+corenet_tcp_connect_http_port(bitcoin_t)
+dev_read_urand(bitcoin_t)
+fs_getattr_xattr_fs(bitcoin_t)
+kernel_read_system_state(bitcoin_t)

From 0e4b50a48c72061f4bafe7f99f0b261a148b457b Mon Sep 17 00:00:00 2001
From: Alice Wonder <github@domblogger.net>
Date: Fri, 26 Feb 2016 10:09:03 -0800
Subject: [PATCH 0005/1802] Description of RPM directory

---
 contrib/README.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/contrib/README.md b/contrib/README.md
index b6e572102acb7..fe77476037682 100644
--- a/contrib/README.md
+++ b/contrib/README.md
@@ -42,6 +42,9 @@ Various PGP files of core developers.
 ### [MacDeploy](/contrib/macdeploy) ###
 Scripts and notes for Mac builds. 
 
+### [RPM](/contrib/rpm) ###
+RPM spec file for building bitcoin-core on RPM based distributions
+
 Test and Verify Tools 
 ---------------------
 

From fa58c76b9ff01abfc7f037fee85e70f342981d42 Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Fri, 25 Dec 2015 13:14:26 +0100
Subject: [PATCH 0006/1802] [gitian] Default reference_datetime to commit
 author date

---
 contrib/gitian-descriptors/gitian-linux.yml      | 3 +--
 contrib/gitian-descriptors/gitian-osx-signer.yml | 1 -
 contrib/gitian-descriptors/gitian-osx.yml        | 3 +--
 contrib/gitian-descriptors/gitian-win-signer.yml | 1 -
 contrib/gitian-descriptors/gitian-win.yml        | 3 +--
 5 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/contrib/gitian-descriptors/gitian-linux.yml b/contrib/gitian-descriptors/gitian-linux.yml
index 1f2c4f9999a67..8b2ab4ebfd25b 100644
--- a/contrib/gitian-descriptors/gitian-linux.yml
+++ b/contrib/gitian-descriptors/gitian-linux.yml
@@ -5,7 +5,7 @@ suites:
 - "trusty"
 architectures:
 - "amd64"
-packages: 
+packages:
 - "curl"
 - "g++-multilib"
 - "git-core"
@@ -18,7 +18,6 @@ packages:
 - "binutils-gold"
 - "ca-certificates"
 - "python"
-reference_datetime: "2016-01-01 00:00:00"
 remotes:
 - "url": "https://github.com/bitcoin/bitcoin.git"
   "dir": "bitcoin"
diff --git a/contrib/gitian-descriptors/gitian-osx-signer.yml b/contrib/gitian-descriptors/gitian-osx-signer.yml
index c4165470af132..ea67e1b7e5b5d 100644
--- a/contrib/gitian-descriptors/gitian-osx-signer.yml
+++ b/contrib/gitian-descriptors/gitian-osx-signer.yml
@@ -6,7 +6,6 @@ architectures:
 - "amd64"
 packages:
 - "faketime"
-reference_datetime: "2016-01-01 00:00:00"
 remotes:
 - "url": "https://github.com/bitcoin/bitcoin-detached-sigs.git"
   "dir": "signature"
diff --git a/contrib/gitian-descriptors/gitian-osx.yml b/contrib/gitian-descriptors/gitian-osx.yml
index 6f68ae08ce73f..74fc2e93ad3d8 100644
--- a/contrib/gitian-descriptors/gitian-osx.yml
+++ b/contrib/gitian-descriptors/gitian-osx.yml
@@ -5,7 +5,7 @@ suites:
 - "trusty"
 architectures:
 - "amd64"
-packages: 
+packages:
 - "ca-certificates"
 - "curl"
 - "g++"
@@ -27,7 +27,6 @@ packages:
 - "python-dev"
 - "python-setuptools"
 - "fonts-tuffy"
-reference_datetime: "2016-01-01 00:00:00"
 remotes:
 - "url": "https://github.com/bitcoin/bitcoin.git"
   "dir": "bitcoin"
diff --git a/contrib/gitian-descriptors/gitian-win-signer.yml b/contrib/gitian-descriptors/gitian-win-signer.yml
index 27c4f01eb4ed9..6b53b89b60b44 100644
--- a/contrib/gitian-descriptors/gitian-win-signer.yml
+++ b/contrib/gitian-descriptors/gitian-win-signer.yml
@@ -7,7 +7,6 @@ architectures:
 packages:
 - "libssl-dev"
 - "autoconf"
-reference_datetime: "2016-01-01 00:00:00"
 remotes:
 - "url": "https://github.com/bitcoin/bitcoin-detached-sigs.git"
   "dir": "signature"
diff --git a/contrib/gitian-descriptors/gitian-win.yml b/contrib/gitian-descriptors/gitian-win.yml
index f0fbff3e1035d..719ca9c232bfe 100644
--- a/contrib/gitian-descriptors/gitian-win.yml
+++ b/contrib/gitian-descriptors/gitian-win.yml
@@ -5,7 +5,7 @@ suites:
 - "trusty"
 architectures:
 - "amd64"
-packages: 
+packages:
 - "curl"
 - "g++"
 - "git-core"
@@ -21,7 +21,6 @@ packages:
 - "zip"
 - "ca-certificates"
 - "python"
-reference_datetime: "2016-01-01 00:00:00"
 remotes:
 - "url": "https://github.com/bitcoin/bitcoin.git"
   "dir": "bitcoin"

From d6cc6a1830bb7e03701488ca30c46457434dec6c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Barbosa?= <joao@uphold.com>
Date: Thu, 11 Feb 2016 01:07:22 +0000
Subject: [PATCH 0007/1802] Use CCoinControl selection in
 CWallet::FundTransaction

---
 src/coincontrol.h            |  5 ++---
 src/qt/coincontroldialog.cpp |  2 +-
 src/wallet/wallet.cpp        | 13 ++-----------
 3 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/src/coincontrol.h b/src/coincontrol.h
index 9626ad2c5b774..12fe9ce219c27 100644
--- a/src/coincontrol.h
+++ b/src/coincontrol.h
@@ -38,10 +38,9 @@ class CCoinControl
         return (setSelected.size() > 0);
     }
 
-    bool IsSelected(const uint256& hash, unsigned int n) const
+    bool IsSelected(const COutPoint& output) const
     {
-        COutPoint outpt(hash, n);
-        return (setSelected.count(outpt) > 0);
+        return (setSelected.count(output) > 0);
     }
 
     void Select(const COutPoint& output)
diff --git a/src/qt/coincontroldialog.cpp b/src/qt/coincontroldialog.cpp
index 7393c83c7d0df..f909499952c7e 100644
--- a/src/qt/coincontroldialog.cpp
+++ b/src/qt/coincontroldialog.cpp
@@ -796,7 +796,7 @@ void CoinControlDialog::updateView()
             }
 
             // set checkbox
-            if (coinControl->IsSelected(txhash, out.i))
+            if (coinControl->IsSelected(COutPoint(txhash, out.i)))
                 itemOutput->setCheckState(COLUMN_CHECKBOX, Qt::Checked);
         }
 
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index 8ea957ee33938..6c7173ede1ad4 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -1669,7 +1669,7 @@ void CWallet::AvailableCoins(vector<COutput>& vCoins, bool fOnlyConfirmed, const
                 isminetype mine = IsMine(pcoin->vout[i]);
                 if (!(IsSpent(wtxid, i)) && mine != ISMINE_NO &&
                     !IsLockedCoin((*it).first, i) && (pcoin->vout[i].nValue > 0 || fIncludeZeroValue) &&
-                    (!coinControl || !coinControl->HasSelected() || coinControl->fAllowOtherInputs || coinControl->IsSelected((*it).first, i)))
+                    (!coinControl || !coinControl->HasSelected() || coinControl->fAllowOtherInputs || coinControl->IsSelected(COutPoint((*it).first, i))))
                         vCoins.push_back(COutput(pcoin, i, nDepth,
                                                  ((mine & ISMINE_SPENDABLE) != ISMINE_NO) ||
                                                   (coinControl && coinControl->fAllowWatchOnly && (mine & ISMINE_WATCH_SOLVABLE) != ISMINE_NO)));
@@ -1927,16 +1927,7 @@ bool CWallet::FundTransaction(CMutableTransaction& tx, CAmount &nFeeRet, int& nC
     // Add new txins (keeping original txin scriptSig/order)
     BOOST_FOREACH(const CTxIn& txin, wtx.vin)
     {
-        bool found = false;
-        BOOST_FOREACH(const CTxIn& origTxIn, tx.vin)
-        {
-            if (txin.prevout.hash == origTxIn.prevout.hash && txin.prevout.n == origTxIn.prevout.n)
-            {
-                found = true;
-                break;
-            }
-        }
-        if (!found)
+        if (!coinControl.IsSelected(txin.prevout))
             tx.vin.push_back(txin);
     }
 

From 3252208cb10be645bae415c90fb2ed8217838490 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Barbosa?= <joao@uphold.com>
Date: Wed, 9 Mar 2016 00:19:16 +0000
Subject: [PATCH 0008/1802] Improve EncodeBase58 performance

---
 src/base58.cpp | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/base58.cpp b/src/base58.cpp
index 5e26cf8d4738f..d81c26092c305 100644
--- a/src/base58.cpp
+++ b/src/base58.cpp
@@ -68,26 +68,31 @@ std::string EncodeBase58(const unsigned char* pbegin, const unsigned char* pend)
 {
     // Skip & count leading zeroes.
     int zeroes = 0;
+    int length = 0;
     while (pbegin != pend && *pbegin == 0) {
         pbegin++;
         zeroes++;
     }
     // Allocate enough space in big-endian base58 representation.
-    std::vector<unsigned char> b58((pend - pbegin) * 138 / 100 + 1); // log(256) / log(58), rounded up.
+    int size = (pend - pbegin) * 138 / 100 + 1; // log(256) / log(58), rounded up.
+    std::vector<unsigned char> b58(size);
     // Process the bytes.
     while (pbegin != pend) {
         int carry = *pbegin;
+        int i = 0;
         // Apply "b58 = b58 * 256 + ch".
-        for (std::vector<unsigned char>::reverse_iterator it = b58.rbegin(); it != b58.rend(); it++) {
+        for (std::vector<unsigned char>::reverse_iterator it = b58.rbegin(); (carry != 0 || i < length) && (it != b58.rend()); it++, i++) {
             carry += 256 * (*it);
             *it = carry % 58;
             carry /= 58;
         }
+
         assert(carry == 0);
+        length = i;
         pbegin++;
     }
     // Skip leading zeroes in base58 result.
-    std::vector<unsigned char>::iterator it = b58.begin();
+    std::vector<unsigned char>::iterator it = b58.begin() + (size - length);
     while (it != b58.end() && *it == 0)
         it++;
     // Translate the result into a string.

From c3932b32700a210b5fbf36e32bddac604dec9288 Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Mon, 14 Mar 2016 19:22:11 +0100
Subject: [PATCH 0009/1802] List solvability in listunspent output and improve
 help

---
 src/qt/walletmodel.cpp           | 6 +++---
 src/wallet/rpcwallet.cpp         | 6 +++++-
 src/wallet/test/wallet_tests.cpp | 2 +-
 src/wallet/wallet.cpp            | 3 ++-
 src/wallet/wallet.h              | 5 +++--
 5 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/qt/walletmodel.cpp b/src/qt/walletmodel.cpp
index cf38c64eb0dee..a5b43270f3a56 100644
--- a/src/qt/walletmodel.cpp
+++ b/src/qt/walletmodel.cpp
@@ -572,7 +572,7 @@ void WalletModel::getOutputs(const std::vector<COutPoint>& vOutpoints, std::vect
         if (!wallet->mapWallet.count(outpoint.hash)) continue;
         int nDepth = wallet->mapWallet[outpoint.hash].GetDepthInMainChain();
         if (nDepth < 0) continue;
-        COutput out(&wallet->mapWallet[outpoint.hash], outpoint.n, nDepth, true);
+        COutput out(&wallet->mapWallet[outpoint.hash], outpoint.n, nDepth, true, true);
         vOutputs.push_back(out);
     }
 }
@@ -599,7 +599,7 @@ void WalletModel::listCoins(std::map<QString, std::vector<COutput> >& mapCoins)
         if (!wallet->mapWallet.count(outpoint.hash)) continue;
         int nDepth = wallet->mapWallet[outpoint.hash].GetDepthInMainChain();
         if (nDepth < 0) continue;
-        COutput out(&wallet->mapWallet[outpoint.hash], outpoint.n, nDepth, true);
+        COutput out(&wallet->mapWallet[outpoint.hash], outpoint.n, nDepth, true, true);
         if (outpoint.n < out.tx->vout.size() && wallet->IsMine(out.tx->vout[outpoint.n]) == ISMINE_SPENDABLE)
             vCoins.push_back(out);
     }
@@ -611,7 +611,7 @@ void WalletModel::listCoins(std::map<QString, std::vector<COutput> >& mapCoins)
         while (wallet->IsChange(cout.tx->vout[cout.i]) && cout.tx->vin.size() > 0 && wallet->IsMine(cout.tx->vin[0]))
         {
             if (!wallet->mapWallet.count(cout.tx->vin[0].prevout.hash)) break;
-            cout = COutput(&wallet->mapWallet[cout.tx->vin[0].prevout.hash], cout.tx->vin[0].prevout.n, 0, true);
+            cout = COutput(&wallet->mapWallet[cout.tx->vin[0].prevout.hash], cout.tx->vin[0].prevout.n, 0, true, true);
         }
 
         CTxDestination address;
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index 759f894ccbe67..077b3525472e4 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -2348,7 +2348,9 @@ UniValue listunspent(const UniValue& params, bool fHelp)
             "    \"account\" : \"account\",  (string) DEPRECATED. The associated account, or \"\" for the default account\n"
             "    \"scriptPubKey\" : \"key\", (string) the script key\n"
             "    \"amount\" : x.xxx,         (numeric) the transaction amount in " + CURRENCY_UNIT + "\n"
-            "    \"confirmations\" : n       (numeric) The number of confirmations\n"
+            "    \"confirmations\" : n,      (numeric) The number of confirmations\n"
+            "    \"spendable\" : xxx,        (bool) Whether we have the private keys to spend this output\n"
+            "    \"solvable\" : xxx          (bool) Whether we know how to spend this output, ignoring the lack of keys\n"
             "  }\n"
             "  ,...\n"
             "]\n"
@@ -2425,6 +2427,7 @@ UniValue listunspent(const UniValue& params, bool fHelp)
         entry.push_back(Pair("amount",ValueFromAmount(nValue)));
         entry.push_back(Pair("confirmations",out.nDepth));
         entry.push_back(Pair("spendable", out.fSpendable));
+        entry.push_back(Pair("solvable", out.fSolvable));
         results.push_back(entry);
     }
 
@@ -2446,6 +2449,7 @@ UniValue fundrawtransaction(const UniValue& params, bool fHelp)
                             "Note that all existing inputs must have their previous output transaction be in the wallet.\n"
                             "Note that all inputs selected must be of standard form and P2SH scripts must be"
                             "in the wallet using importaddress or addmultisigaddress (to calculate fees).\n"
+                            "You can see whether this is the case by checking the \"solvable\" field in the listunspent output.\n"
                             "Only pay-to-pubkey, multisig, and P2SH versions thereof are currently supported for watch-only\n"
                             "\nArguments:\n"
                             "1. \"hexstring\"     (string, required) The hex string of the raw transaction\n"
diff --git a/src/wallet/test/wallet_tests.cpp b/src/wallet/test/wallet_tests.cpp
index e84d5880261c4..06c9c903e4c76 100644
--- a/src/wallet/test/wallet_tests.cpp
+++ b/src/wallet/test/wallet_tests.cpp
@@ -48,7 +48,7 @@ static void add_coin(const CAmount& nValue, int nAge = 6*24, bool fIsFromMe = fa
         wtx->fDebitCached = true;
         wtx->nDebitCached = 1;
     }
-    COutput output(wtx, nInput, nAge, true);
+    COutput output(wtx, nInput, nAge, true, true);
     vCoins.push_back(output);
 }
 
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index bcfefa27ff269..59008282473f8 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -1675,7 +1675,8 @@ void CWallet::AvailableCoins(vector<COutput>& vCoins, bool fOnlyConfirmed, const
                     (!coinControl || !coinControl->HasSelected() || coinControl->fAllowOtherInputs || coinControl->IsSelected((*it).first, i)))
                         vCoins.push_back(COutput(pcoin, i, nDepth,
                                                  ((mine & ISMINE_SPENDABLE) != ISMINE_NO) ||
-                                                  (coinControl && coinControl->fAllowWatchOnly && (mine & ISMINE_WATCH_SOLVABLE) != ISMINE_NO)));
+                                                  (coinControl && coinControl->fAllowWatchOnly && (mine & ISMINE_WATCH_SOLVABLE) != ISMINE_NO),
+                                                 (mine & (ISMINE_SPENDABLE | ISMINE_WATCH_SOLVABLE)) != ISMINE_NO));
             }
         }
     }
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
index d009211a923eb..37a84153b4098 100644
--- a/src/wallet/wallet.h
+++ b/src/wallet/wallet.h
@@ -412,10 +412,11 @@ class COutput
     int i;
     int nDepth;
     bool fSpendable;
+    bool fSolvable;
 
-    COutput(const CWalletTx *txIn, int iIn, int nDepthIn, bool fSpendableIn)
+    COutput(const CWalletTx *txIn, int iIn, int nDepthIn, bool fSpendableIn, bool fSolvableIn)
     {
-        tx = txIn; i = iIn; nDepth = nDepthIn; fSpendable = fSpendableIn;
+        tx = txIn; i = iIn; nDepth = nDepthIn; fSpendable = fSpendableIn; fSolvable = fSolvableIn;
     }
 
     std::string ToString() const;

From 6851107b3a52ec869e5e3a2cb4eb02d6c743b8e5 Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Mon, 15 Feb 2016 05:13:27 +0100
Subject: [PATCH 0010/1802] BIP9 Implementation

Inspired by former implementations by Eric Lombrozo and Rusty Russell, and
based on code by Jorge Timon.
---
 src/Makefile.am          |   2 +
 src/chain.h              |   2 -
 src/chainparams.cpp      |   6 ++
 src/consensus/params.h   |  28 +++++++++
 src/init.cpp             |   2 +-
 src/main.cpp             |  80 +++++++++++++++++++++--
 src/main.h               |   5 ++
 src/miner.cpp            |  11 ++--
 src/primitives/block.h   |   3 +-
 src/test/miner_tests.cpp |  33 +++++++++-
 src/versionbits.cpp      | 133 +++++++++++++++++++++++++++++++++++++++
 src/versionbits.h        |  59 +++++++++++++++++
 12 files changed, 345 insertions(+), 19 deletions(-)
 create mode 100644 src/versionbits.cpp
 create mode 100644 src/versionbits.h

diff --git a/src/Makefile.am b/src/Makefile.am
index fa7a78f330694..7765ea43edc1a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -152,6 +152,7 @@ BITCOIN_CORE_H = \
   utilmoneystr.h \
   utiltime.h \
   validationinterface.h \
+  versionbits.h \
   wallet/crypter.h \
   wallet/db.h \
   wallet/rpcwallet.h \
@@ -204,6 +205,7 @@ libbitcoin_server_a_SOURCES = \
   txdb.cpp \
   txmempool.cpp \
   validationinterface.cpp \
+  versionbits.cpp \
   $(BITCOIN_CORE_H)
 
 if ENABLE_ZMQ
diff --git a/src/chain.h b/src/chain.h
index 9199983565ca7..5b9605a80bdb3 100644
--- a/src/chain.h
+++ b/src/chain.h
@@ -14,8 +14,6 @@
 
 #include <vector>
 
-#include <boost/foreach.hpp>
-
 struct CDiskBlockPos
 {
     int nFile;
diff --git a/src/chainparams.cpp b/src/chainparams.cpp
index b962f6ac0a053..6501af78b3ae6 100644
--- a/src/chainparams.cpp
+++ b/src/chainparams.cpp
@@ -81,6 +81,8 @@ class CMainParams : public CChainParams {
         consensus.nPowTargetSpacing = 10 * 60;
         consensus.fPowAllowMinDifficultyBlocks = false;
         consensus.fPowNoRetargeting = false;
+        consensus.nRuleChangeActivationThreshold = 1916; // 95% of 2016
+        consensus.nMinerConfirmationWindow = 2016; // nPowTargetTimespan / nPowTargetSpacing
         /** 
          * The message start string is designed to be unlikely to occur in normal data.
          * The characters are rarely used upper ASCII, not valid as UTF-8, and produce
@@ -162,6 +164,8 @@ class CTestNetParams : public CChainParams {
         consensus.nPowTargetSpacing = 10 * 60;
         consensus.fPowAllowMinDifficultyBlocks = true;
         consensus.fPowNoRetargeting = false;
+        consensus.nRuleChangeActivationThreshold = 1512; // 75% for testchains
+        consensus.nMinerConfirmationWindow = 2016; // nPowTargetTimespan / nPowTargetSpacing
         pchMessageStart[0] = 0x0b;
         pchMessageStart[1] = 0x11;
         pchMessageStart[2] = 0x09;
@@ -225,6 +229,8 @@ class CRegTestParams : public CChainParams {
         consensus.nPowTargetSpacing = 10 * 60;
         consensus.fPowAllowMinDifficultyBlocks = true;
         consensus.fPowNoRetargeting = true;
+        consensus.nRuleChangeActivationThreshold = 108; // 75% for testchains
+        consensus.nMinerConfirmationWindow = 144; // Faster than normal for regtest (144 instead of 2016)
 
         pchMessageStart[0] = 0xfa;
         pchMessageStart[1] = 0xbf;
diff --git a/src/consensus/params.h b/src/consensus/params.h
index 335750fe80724..d5039211a30be 100644
--- a/src/consensus/params.h
+++ b/src/consensus/params.h
@@ -7,8 +7,28 @@
 #define BITCOIN_CONSENSUS_PARAMS_H
 
 #include "uint256.h"
+#include <map>
+#include <string>
 
 namespace Consensus {
+
+enum DeploymentPos
+{
+    MAX_VERSION_BITS_DEPLOYMENTS = 0,
+};
+
+/**
+ * Struct for each individual consensus rule change using BIP9.
+ */
+struct BIP9Deployment {
+    /** Bit position to select the particular bit in nVersion. */
+    int bit;
+    /** Start MedianTime for version bits miner confirmation. Can be a date in the past */
+    int64_t nStartTime;
+    /** Timeout/expiry MedianTime for the deployment attempt. */
+    int64_t nTimeout;
+};
+
 /**
  * Parameters that influence chain consensus.
  */
@@ -22,6 +42,14 @@ struct Params {
     /** Block height and hash at which BIP34 becomes active */
     int BIP34Height;
     uint256 BIP34Hash;
+    /**
+     * Minimum blocks including miner confirmation of the total of 2016 blocks in a retargetting period,
+     * (nPowTargetTimespan / nPowTargetSpacing) which is also used for BIP9 deployments.
+     * Examples: 1916 for 95%, 1512 for testchains.
+     */
+    uint32_t nRuleChangeActivationThreshold;
+    uint32_t nMinerConfirmationWindow;
+    BIP9Deployment vDeployments[MAX_VERSION_BITS_DEPLOYMENTS];
     /** Proof of work parameters */
     uint256 powLimit;
     bool fPowAllowMinDifficultyBlocks;
diff --git a/src/init.cpp b/src/init.cpp
index 637b69ab0571e..a39256c6e3220 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -466,7 +466,7 @@ std::string HelpMessage(HelpMessageMode mode)
     strUsage += HelpMessageOpt("-blockmaxsize=<n>", strprintf(_("Set maximum block size in bytes (default: %d)"), DEFAULT_BLOCK_MAX_SIZE));
     strUsage += HelpMessageOpt("-blockprioritysize=<n>", strprintf(_("Set maximum size of high-priority/low-fee transactions in bytes (default: %d)"), DEFAULT_BLOCK_PRIORITY_SIZE));
     if (showDebug)
-        strUsage += HelpMessageOpt("-blockversion=<n>", strprintf("Override block version to test forking scenarios (default: %d)", (int)CBlock::CURRENT_VERSION));
+        strUsage += HelpMessageOpt("-blockversion=<n>", "Override block version to test forking scenarios");
 
     strUsage += HelpMessageGroup(_("RPC server options:"));
     strUsage += HelpMessageOpt("-server", _("Accept command line and JSON-RPC commands"));
diff --git a/src/main.cpp b/src/main.cpp
index 027a36394c34d..45e58818977d3 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -34,6 +34,7 @@
 #include "utilmoneystr.h"
 #include "utilstrencodings.h"
 #include "validationinterface.h"
+#include "versionbits.h"
 
 #include <sstream>
 
@@ -2083,6 +2084,51 @@ void PartitionCheck(bool (*initialDownloadCheck)(), CCriticalSection& cs, const
     }
 }
 
+// Protected by cs_main
+static VersionBitsCache versionbitscache;
+
+int32_t ComputeBlockVersion(const CBlockIndex* pindexPrev, const Consensus::Params& params)
+{
+    LOCK(cs_main);
+    int32_t nVersion = VERSIONBITS_TOP_BITS;
+
+    for (int i = 0; i < (int)Consensus::MAX_VERSION_BITS_DEPLOYMENTS; i++) {
+        ThresholdState state = VersionBitsState(pindexPrev, params, (Consensus::DeploymentPos)i, versionbitscache);
+        if (state == THRESHOLD_LOCKED_IN || state == THRESHOLD_STARTED) {
+            nVersion |= VersionBitsMask(params, (Consensus::DeploymentPos)i);
+        }
+    }
+
+    return nVersion;
+}
+
+/**
+ * Threshold condition checker that triggers when unknown versionbits are seen on the network.
+ */
+class WarningBitsConditionChecker : public AbstractThresholdConditionChecker
+{
+private:
+    int bit;
+
+public:
+    WarningBitsConditionChecker(int bitIn) : bit(bitIn) {}
+
+    int64_t BeginTime(const Consensus::Params& params) const { return 0; }
+    int64_t EndTime(const Consensus::Params& params) const { return std::numeric_limits<int64_t>::max(); }
+    int Period(const Consensus::Params& params) const { return params.nMinerConfirmationWindow; }
+    int Threshold(const Consensus::Params& params) const { return params.nRuleChangeActivationThreshold; }
+
+    bool Condition(const CBlockIndex* pindex, const Consensus::Params& params) const
+    {
+        return ((pindex->nVersion & VERSIONBITS_TOP_MASK) == VERSIONBITS_TOP_BITS) &&
+               ((pindex->nVersion >> bit) & 1) != 0 &&
+               ((ComputeBlockVersion(pindex->pprev, params) >> bit) & 1) == 0;
+    }
+};
+
+// Protected by cs_main
+static ThresholdConditionCache warningcache[VERSIONBITS_NUM_BITS];
+
 static int64_t nTimeCheck = 0;
 static int64_t nTimeForks = 0;
 static int64_t nTimeVerify = 0;
@@ -2452,24 +2498,42 @@ void static UpdateTip(CBlockIndex *pindexNew) {
 
     // Check the version of the last 100 blocks to see if we need to upgrade:
     static bool fWarned = false;
-    if (!IsInitialBlockDownload() && !fWarned)
+    if (!IsInitialBlockDownload())
     {
         int nUpgraded = 0;
         const CBlockIndex* pindex = chainActive.Tip();
+        for (int bit = 0; bit < VERSIONBITS_NUM_BITS; bit++) {
+            WarningBitsConditionChecker checker(bit);
+            ThresholdState state = checker.GetStateFor(pindex, chainParams.GetConsensus(), warningcache[bit]);
+            if (state == THRESHOLD_ACTIVE || state == THRESHOLD_LOCKED_IN) {
+                if (state == THRESHOLD_ACTIVE) {
+                    strMiscWarning = strprintf(_("Warning: unknown new rules activated (versionbit %i)"), bit);
+                    if (!fWarned) {
+                        CAlert::Notify(strMiscWarning, true);
+                        fWarned = true;
+                    }
+                } else {
+                    LogPrintf("%s: unknown new rules are about to activate (versionbit %i)\n", __func__, bit);
+                }
+            }
+        }
         for (int i = 0; i < 100 && pindex != NULL; i++)
         {
-            if (pindex->nVersion > CBlock::CURRENT_VERSION)
+            int32_t nExpectedVersion = ComputeBlockVersion(pindex->pprev, chainParams.GetConsensus());
+            if (pindex->nVersion > VERSIONBITS_LAST_OLD_BLOCK_VERSION && (pindex->nVersion & ~nExpectedVersion) != 0)
                 ++nUpgraded;
             pindex = pindex->pprev;
         }
         if (nUpgraded > 0)
-            LogPrintf("%s: %d of last 100 blocks above version %d\n", __func__, nUpgraded, (int)CBlock::CURRENT_VERSION);
+            LogPrintf("%s: %d of last 100 blocks have unexpected version\n", __func__, nUpgraded);
         if (nUpgraded > 100/2)
         {
             // strMiscWarning is read by GetWarnings(), called by Qt and the JSON-RPC code to warn the user:
-            strMiscWarning = _("Warning: This version is obsolete; upgrade required!");
-            CAlert::Notify(strMiscWarning, true);
-            fWarned = true;
+            strMiscWarning = _("Warning: Unknown block versions being mined! It's possible unknown rules are in effect");
+            if (!fWarned) {
+                CAlert::Notify(strMiscWarning, true);
+                fWarned = true;
+            }
         }
     }
 }
@@ -3763,6 +3827,10 @@ void UnloadBlockIndex()
     setDirtyFileInfo.clear();
     mapNodeState.clear();
     recentRejects.reset(NULL);
+    versionbitscache.Clear();
+    for (int b = 0; b < VERSIONBITS_NUM_BITS; b++) {
+        warningcache[b].clear();
+    }
 
     BOOST_FOREACH(BlockMap::value_type& entry, mapBlockIndex) {
         delete entry.second;
diff --git a/src/main.h b/src/main.h
index 5ba2be251c45b..7670bb74d357c 100644
--- a/src/main.h
+++ b/src/main.h
@@ -537,6 +537,11 @@ extern CBlockTreeDB *pblocktree;
  */
 int GetSpendHeight(const CCoinsViewCache& inputs);
 
+/**
+ * Determine what nVersion a new block should use.
+ */
+int32_t ComputeBlockVersion(const CBlockIndex* pindexPrev, const Consensus::Params& params);
+
 /** Reject codes greater or equal to this can be returned by AcceptToMemPool
  * for transactions, to signal internal conditions. They cannot and should not
  * be sent over the P2P network.
diff --git a/src/miner.cpp b/src/miner.cpp
index ec87e84ca7d02..ef8fd4db43d0e 100644
--- a/src/miner.cpp
+++ b/src/miner.cpp
@@ -79,11 +79,6 @@ CBlockTemplate* CreateNewBlock(const CChainParams& chainparams, const CScript& s
         return NULL;
     CBlock *pblock = &pblocktemplate->block; // pointer for convenience
 
-    // -regtest only: allow overriding block.nVersion with
-    // -blockversion=N to test forking scenarios
-    if (chainparams.MineBlocksOnDemand())
-        pblock->nVersion = GetArg("-blockversion", pblock->nVersion);
-
     // Create coinbase tx
     CMutableTransaction txNew;
     txNew.vin.resize(1);
@@ -137,6 +132,12 @@ CBlockTemplate* CreateNewBlock(const CChainParams& chainparams, const CScript& s
         pblock->nTime = GetAdjustedTime();
         const int64_t nMedianTimePast = pindexPrev->GetMedianTimePast();
 
+        pblock->nVersion = ComputeBlockVersion(pindexPrev, chainparams.GetConsensus());
+        // -regtest only: allow overriding block.nVersion with
+        // -blockversion=N to test forking scenarios
+        if (chainparams.MineBlocksOnDemand())
+            pblock->nVersion = GetArg("-blockversion", pblock->nVersion);
+
         int64_t nLockTimeCutoff = (STANDARD_LOCKTIME_VERIFY_FLAGS & LOCKTIME_MEDIAN_TIME_PAST)
                                 ? nMedianTimePast
                                 : pblock->GetBlockTime();
diff --git a/src/primitives/block.h b/src/primitives/block.h
index 0e93399c08e47..42276b2bc26bc 100644
--- a/src/primitives/block.h
+++ b/src/primitives/block.h
@@ -21,7 +21,6 @@ class CBlockHeader
 {
 public:
     // header
-    static const int32_t CURRENT_VERSION=4;
     int32_t nVersion;
     uint256 hashPrevBlock;
     uint256 hashMerkleRoot;
@@ -49,7 +48,7 @@ class CBlockHeader
 
     void SetNull()
     {
-        nVersion = CBlockHeader::CURRENT_VERSION;
+        nVersion = 0;
         hashPrevBlock.SetNull();
         hashMerkleRoot.SetNull();
         nTime = 0;
diff --git a/src/test/miner_tests.cpp b/src/test/miner_tests.cpp
index f3297e074de48..ab6485081ceed 100644
--- a/src/test/miner_tests.cpp
+++ b/src/test/miner_tests.cpp
@@ -247,13 +247,40 @@ BOOST_AUTO_TEST_CASE(CreateNewBlock_validity)
 
     // subsidy changing
     int nHeight = chainActive.Height();
-    chainActive.Tip()->nHeight = 209999;
+    // Create an actual 209999-long block chain (without valid blocks).
+    while (chainActive.Tip()->nHeight < 209999) {
+        CBlockIndex* prev = chainActive.Tip();
+        CBlockIndex* next = new CBlockIndex();
+        next->phashBlock = new uint256(GetRandHash());
+        pcoinsTip->SetBestBlock(next->GetBlockHash());
+        next->pprev = prev;
+        next->nHeight = prev->nHeight + 1;
+        next->BuildSkip();
+        chainActive.SetTip(next);
+    }
     BOOST_CHECK(pblocktemplate = CreateNewBlock(chainparams, scriptPubKey));
     delete pblocktemplate;
-    chainActive.Tip()->nHeight = 210000;
+    // Extend to a 210000-long block chain.
+    while (chainActive.Tip()->nHeight < 210000) {
+        CBlockIndex* prev = chainActive.Tip();
+        CBlockIndex* next = new CBlockIndex();
+        next->phashBlock = new uint256(GetRandHash());
+        pcoinsTip->SetBestBlock(next->GetBlockHash());
+        next->pprev = prev;
+        next->nHeight = prev->nHeight + 1;
+        next->BuildSkip();
+        chainActive.SetTip(next);
+    }
     BOOST_CHECK(pblocktemplate = CreateNewBlock(chainparams, scriptPubKey));
     delete pblocktemplate;
-    chainActive.Tip()->nHeight = nHeight;
+    // Delete the dummy blocks again.
+    while (chainActive.Tip()->nHeight > nHeight) {
+        CBlockIndex* del = chainActive.Tip();
+        chainActive.SetTip(del->pprev);
+        pcoinsTip->SetBestBlock(del->pprev->GetBlockHash());
+        delete del->phashBlock;
+        delete del;
+    }
 
     // non-final txs in mempool
     SetMockTime(chainActive.Tip()->GetMedianTimePast()+1);
diff --git a/src/versionbits.cpp b/src/versionbits.cpp
new file mode 100644
index 0000000000000..fbb60c0fc598e
--- /dev/null
+++ b/src/versionbits.cpp
@@ -0,0 +1,133 @@
+// Copyright (c) 2016 The Bitcoin Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#include "versionbits.h"
+
+ThresholdState AbstractThresholdConditionChecker::GetStateFor(const CBlockIndex* pindexPrev, const Consensus::Params& params, ThresholdConditionCache& cache) const
+{
+    int nPeriod = Period(params);
+    int nThreshold = Threshold(params);
+    int64_t nTimeStart = BeginTime(params);
+    int64_t nTimeTimeout = EndTime(params);
+
+    // A block's state is always the same as that of the first of its period, so it is computed based on a pindexPrev whose height equals a multiple of nPeriod - 1.
+    if (pindexPrev != NULL) {
+        pindexPrev = pindexPrev->GetAncestor(pindexPrev->nHeight - ((pindexPrev->nHeight + 1) % nPeriod));
+    }
+
+    // Walk backwards in steps of nPeriod to find a pindexPrev whose information is known
+    std::vector<const CBlockIndex*> vToCompute;
+    while (cache.count(pindexPrev) == 0) {
+        if (pindexPrev == NULL) {
+            // The genesis block is by definition defined.
+            cache[pindexPrev] = THRESHOLD_DEFINED;
+            break;
+        }
+        if (pindexPrev->GetMedianTimePast() < nTimeStart) {
+            // Optimizaton: don't recompute down further, as we know every earlier block will be before the start time
+            cache[pindexPrev] = THRESHOLD_DEFINED;
+            break;
+        }
+        vToCompute.push_back(pindexPrev);
+        pindexPrev = pindexPrev->GetAncestor(pindexPrev->nHeight - nPeriod);
+    }
+
+    // At this point, cache[pindexPrev] is known
+    assert(cache.count(pindexPrev));
+    ThresholdState state = cache[pindexPrev];
+
+    // Now walk forward and compute the state of descendants of pindexPrev
+    while (!vToCompute.empty()) {
+        ThresholdState stateNext = state;
+        pindexPrev = vToCompute.back();
+        vToCompute.pop_back();
+
+        switch (state) {
+            case THRESHOLD_DEFINED: {
+                if (pindexPrev->GetMedianTimePast() >= nTimeTimeout) {
+                    stateNext = THRESHOLD_FAILED;
+                } else if (pindexPrev->GetMedianTimePast() >= nTimeStart) {
+                    stateNext = THRESHOLD_STARTED;
+                }
+                break;
+            }
+            case THRESHOLD_STARTED: {
+                if (pindexPrev->GetMedianTimePast() >= nTimeTimeout) {
+                    stateNext = THRESHOLD_FAILED;
+                    break;
+                }
+                // We need to count
+                const CBlockIndex* pindexCount = pindexPrev;
+                int count = 0;
+                for (int i = 0; i < nPeriod; i++) {
+                    if (Condition(pindexCount, params)) {
+                        count++;
+                    }
+                    pindexCount = pindexCount->pprev;
+                }
+                if (count >= nThreshold) {
+                    stateNext = THRESHOLD_LOCKED_IN;
+                }
+                break;
+            }
+            case THRESHOLD_LOCKED_IN: {
+                // Always progresses into ACTIVE.
+                stateNext = THRESHOLD_ACTIVE;
+                break;
+            }
+            case THRESHOLD_FAILED:
+            case THRESHOLD_ACTIVE: {
+                // Nothing happens, these are terminal states.
+                break;
+            }
+        }
+        cache[pindexPrev] = state = stateNext;
+    }
+
+    return state;
+}
+
+namespace
+{
+/**
+ * Class to implement versionbits logic.
+ */
+class VersionBitsConditionChecker : public AbstractThresholdConditionChecker {
+private:
+    const Consensus::DeploymentPos id;
+
+protected:
+    int64_t BeginTime(const Consensus::Params& params) const { return params.vDeployments[id].nStartTime; }
+    int64_t EndTime(const Consensus::Params& params) const { return params.vDeployments[id].nTimeout; }
+    int Period(const Consensus::Params& params) const { return params.nMinerConfirmationWindow; }
+    int Threshold(const Consensus::Params& params) const { return params.nRuleChangeActivationThreshold; }
+
+    bool Condition(const CBlockIndex* pindex, const Consensus::Params& params) const
+    {
+        return (((pindex->nVersion & VERSIONBITS_TOP_MASK) == VERSIONBITS_TOP_BITS) && (pindex->nVersion & Mask(params)) != 0);
+    }
+
+public:
+    VersionBitsConditionChecker(Consensus::DeploymentPos id_) : id(id_) {}
+    uint32_t Mask(const Consensus::Params& params) const { return ((uint32_t)1) << params.vDeployments[id].bit; }
+};
+
+}
+
+ThresholdState VersionBitsState(const CBlockIndex* pindexPrev, const Consensus::Params& params, Consensus::DeploymentPos pos, VersionBitsCache& cache)
+{
+    return VersionBitsConditionChecker(pos).GetStateFor(pindexPrev, params, cache.caches[pos]);
+}
+
+uint32_t VersionBitsMask(const Consensus::Params& params, Consensus::DeploymentPos pos)
+{
+    return VersionBitsConditionChecker(pos).Mask(params);
+}
+
+void VersionBitsCache::Clear()
+{
+    for (unsigned int d = 0; d < Consensus::MAX_VERSION_BITS_DEPLOYMENTS; d++) {
+        caches[d].clear();
+    }
+}
diff --git a/src/versionbits.h b/src/versionbits.h
new file mode 100644
index 0000000000000..04f4738272796
--- /dev/null
+++ b/src/versionbits.h
@@ -0,0 +1,59 @@
+// Copyright (c) 2016 The Bitcoin Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#ifndef BITCOIN_CONSENSUS_VERSIONBITS
+#define BITCOIN_CONSENSUS_VERSIONBITS
+
+#include "chain.h"
+#include <map>
+
+/** What block version to use for new blocks (pre versionbits) */
+static const int32_t VERSIONBITS_LAST_OLD_BLOCK_VERSION = 4;
+/** What bits to set in version for versionbits blocks */
+static const int32_t VERSIONBITS_TOP_BITS = 0x20000000UL;
+/** What bitmask determines whether versionbits is in use */
+static const int32_t VERSIONBITS_TOP_MASK = 0xE0000000UL;
+/** Total bits available for versionbits */
+static const int32_t VERSIONBITS_NUM_BITS = 29;
+
+enum ThresholdState {
+    THRESHOLD_DEFINED,
+    THRESHOLD_STARTED,
+    THRESHOLD_LOCKED_IN,
+    THRESHOLD_ACTIVE,
+    THRESHOLD_FAILED,
+};
+
+// A map that gives the state for blocks whose height is a multiple of Period().
+// The map is indexed by the block's parent, however, so all keys in the map
+// will either be NULL or a block with (height + 1) % Period() == 0.
+typedef std::map<const CBlockIndex*, ThresholdState> ThresholdConditionCache;
+
+/**
+ * Abstract class that implements BIP9-style threshold logic, and caches results.
+ */
+class AbstractThresholdConditionChecker {
+protected:
+    virtual bool Condition(const CBlockIndex* pindex, const Consensus::Params& params) const =0;
+    virtual int64_t BeginTime(const Consensus::Params& params) const =0;
+    virtual int64_t EndTime(const Consensus::Params& params) const =0;
+    virtual int Period(const Consensus::Params& params) const =0;
+    virtual int Threshold(const Consensus::Params& params) const =0;
+
+public:
+    // Note that the function below takes a pindexPrev as input: they compute information for block B based on its parent.
+    ThresholdState GetStateFor(const CBlockIndex* pindexPrev, const Consensus::Params& params, ThresholdConditionCache& cache) const;
+};
+
+struct VersionBitsCache
+{
+    ThresholdConditionCache caches[Consensus::MAX_VERSION_BITS_DEPLOYMENTS];
+
+    void Clear();
+};
+
+ThresholdState VersionBitsState(const CBlockIndex* pindexPrev, const Consensus::Params& params, Consensus::DeploymentPos pos, VersionBitsCache& cache);
+uint32_t VersionBitsMask(const Consensus::Params& params, Consensus::DeploymentPos pos);
+
+#endif

From 732e774c0655a3a6bcb3f2f02c88b37ea1bd3e68 Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Sat, 20 Feb 2016 02:57:36 +0100
Subject: [PATCH 0011/1802] Versionbits tests

---
 src/Makefile.test.include      |   1 +
 src/test/versionbits_tests.cpp | 185 +++++++++++++++++++++++++++++++++
 2 files changed, 186 insertions(+)
 create mode 100644 src/test/versionbits_tests.cpp

diff --git a/src/Makefile.test.include b/src/Makefile.test.include
index 0c4e47a147020..57f9ac50e0a01 100644
--- a/src/Makefile.test.include
+++ b/src/Makefile.test.include
@@ -83,6 +83,7 @@ BITCOIN_TESTS =\
   test/timedata_tests.cpp \
   test/transaction_tests.cpp \
   test/txvalidationcache_tests.cpp \
+  test/versionbits_tests.cpp \
   test/uint256_tests.cpp \
   test/univalue_tests.cpp \
   test/util_tests.cpp
diff --git a/src/test/versionbits_tests.cpp b/src/test/versionbits_tests.cpp
new file mode 100644
index 0000000000000..9de8461d847be
--- /dev/null
+++ b/src/test/versionbits_tests.cpp
@@ -0,0 +1,185 @@
+// Copyright (c) 2014-2015 The Bitcoin Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#include "chain.h"
+#include "random.h"
+#include "versionbits.h"
+#include "test/test_bitcoin.h"
+
+#include <boost/test/unit_test.hpp>
+
+/* Define a virtual block time, one block per 10 minutes after Nov 14 2014, 0:55:36am */
+int32_t TestTime(int nHeight) { return 1415926536 + 600 * nHeight; }
+
+static const Consensus::Params paramsDummy = Consensus::Params();
+
+class TestConditionChecker : public AbstractThresholdConditionChecker
+{
+private:
+    mutable ThresholdConditionCache cache;
+
+public:
+    int64_t BeginTime(const Consensus::Params& params) const { return TestTime(10000); }
+    int64_t EndTime(const Consensus::Params& params) const { return TestTime(20000); }
+    int Period(const Consensus::Params& params) const { return 1000; }
+    int Threshold(const Consensus::Params& params) const { return 900; }
+    bool Condition(const CBlockIndex* pindex, const Consensus::Params& params) const { return (pindex->nVersion & 0x100); }
+
+    ThresholdState GetStateFor(const CBlockIndex* pindexPrev) const { return AbstractThresholdConditionChecker::GetStateFor(pindexPrev, paramsDummy, cache); }
+};
+
+#define CHECKERS 6
+
+class VersionBitsTester
+{
+    // A fake blockchain
+    std::vector<CBlockIndex*> vpblock;
+
+    // 6 independent checkers for the same bit.
+    // The first one performs all checks, the second only 50%, the third only 25%, etc...
+    // This is to test whether lack of cached information leads to the same results.
+    TestConditionChecker checker[CHECKERS];
+
+    // Test counter (to identify failures)
+    int num;
+
+public:
+    VersionBitsTester() : num(0) {}
+
+    VersionBitsTester& Reset() {
+        for (unsigned int i = 0; i < vpblock.size(); i++) {
+            delete vpblock[i];
+        }
+        for (unsigned int  i = 0; i < CHECKERS; i++) {
+            checker[i] = TestConditionChecker();
+        }
+        vpblock.clear();
+        return *this;
+    }
+
+    ~VersionBitsTester() {
+         Reset();
+    }
+
+    VersionBitsTester& Mine(unsigned int height, int32_t nTime, int32_t nVersion) {
+        while (vpblock.size() < height) {
+            CBlockIndex* pindex = new CBlockIndex();
+            pindex->nHeight = vpblock.size();
+            pindex->pprev = vpblock.size() > 0 ? vpblock.back() : NULL;
+            pindex->nTime = nTime;
+            pindex->nVersion = nVersion;
+            pindex->BuildSkip();
+            vpblock.push_back(pindex);
+        }
+        return *this;
+    }
+
+    VersionBitsTester& TestDefined() {
+        for (int i = 0; i < CHECKERS; i++) {
+            if ((insecure_rand() & ((1 << i) - 1)) == 0) {
+                BOOST_CHECK_MESSAGE(checker[i].GetStateFor(vpblock.empty() ? NULL : vpblock.back()) == THRESHOLD_DEFINED, strprintf("Test %i for DEFINED", num));
+            }
+        }
+        num++;
+        return *this;
+    }
+
+    VersionBitsTester& TestStarted() {
+        for (int i = 0; i < CHECKERS; i++) {
+            if ((insecure_rand() & ((1 << i) - 1)) == 0) {
+                BOOST_CHECK_MESSAGE(checker[i].GetStateFor(vpblock.empty() ? NULL : vpblock.back()) == THRESHOLD_STARTED, strprintf("Test %i for STARTED", num));
+            }
+        }
+        num++;
+        return *this;
+    }
+
+    VersionBitsTester& TestLockedIn() {
+        for (int i = 0; i < CHECKERS; i++) {
+            if ((insecure_rand() & ((1 << i) - 1)) == 0) {
+                BOOST_CHECK_MESSAGE(checker[i].GetStateFor(vpblock.empty() ? NULL : vpblock.back()) == THRESHOLD_LOCKED_IN, strprintf("Test %i for LOCKED_IN", num));
+            }
+        }
+        num++;
+        return *this;
+    }
+
+    VersionBitsTester& TestActive() {
+        for (int i = 0; i < CHECKERS; i++) {
+            if ((insecure_rand() & ((1 << i) - 1)) == 0) {
+                BOOST_CHECK_MESSAGE(checker[i].GetStateFor(vpblock.empty() ? NULL : vpblock.back()) == THRESHOLD_ACTIVE, strprintf("Test %i for ACTIVE", num));
+            }
+        }
+        num++;
+        return *this;
+    }
+
+    VersionBitsTester& TestFailed() {
+        for (int i = 0; i < CHECKERS; i++) {
+            if ((insecure_rand() & ((1 << i) - 1)) == 0) {
+                BOOST_CHECK_MESSAGE(checker[i].GetStateFor(vpblock.empty() ? NULL : vpblock.back()) == THRESHOLD_FAILED, strprintf("Test %i for FAILED", num));
+            }
+        }
+        num++;
+        return *this;
+    }
+};
+
+BOOST_FIXTURE_TEST_SUITE(versionbits_tests, TestingSetup)
+
+BOOST_AUTO_TEST_CASE(versionbits_test)
+{
+    for (int i = 0; i < 64; i++) {
+        // DEFINED -> FAILED
+        VersionBitsTester().TestDefined()
+                           .Mine(1, TestTime(1), 0x100).TestDefined()
+                           .Mine(11, TestTime(11), 0x100).TestDefined()
+                           .Mine(989, TestTime(989), 0x100).TestDefined()
+                           .Mine(999, TestTime(20000), 0x100).TestDefined()
+                           .Mine(1000, TestTime(20000), 0x100).TestFailed()
+                           .Mine(1999, TestTime(30001), 0x100).TestFailed()
+                           .Mine(2000, TestTime(30002), 0x100).TestFailed()
+                           .Mine(2001, TestTime(30003), 0x100).TestFailed()
+                           .Mine(2999, TestTime(30004), 0x100).TestFailed()
+                           .Mine(3000, TestTime(30005), 0x100).TestFailed()
+
+        // DEFINED -> STARTED -> FAILED
+                           .Reset().TestDefined()
+                           .Mine(1, TestTime(1), 0).TestDefined()
+                           .Mine(1000, TestTime(10000) - 1, 0x100).TestDefined() // One second more and it would be defined
+                           .Mine(2000, TestTime(10000), 0x100).TestStarted() // So that's what happens the next period
+                           .Mine(2051, TestTime(10010), 0).TestStarted() // 51 old blocks
+                           .Mine(2950, TestTime(10020), 0x100).TestStarted() // 899 new blocks
+                           .Mine(3000, TestTime(20000), 0).TestFailed() // 50 old blocks (so 899 out of the past 1000)
+                           .Mine(4000, TestTime(20010), 0x100).TestFailed()
+
+        // DEFINED -> STARTED -> FAILED while threshold reached
+                           .Reset().TestDefined()
+                           .Mine(1, TestTime(1), 0).TestDefined()
+                           .Mine(1000, TestTime(10000) - 1, 0x101).TestDefined() // One second more and it would be defined
+                           .Mine(2000, TestTime(10000), 0x101).TestStarted() // So that's what happens the next period
+                           .Mine(2999, TestTime(30000), 0x100).TestStarted() // 999 new blocks
+                           .Mine(3000, TestTime(30000), 0x100).TestFailed() // 1 new block (so 1000 out of the past 1000 are new)
+                           .Mine(3999, TestTime(30001), 0).TestFailed()
+                           .Mine(4000, TestTime(30002), 0).TestFailed()
+                           .Mine(14333, TestTime(30003), 0).TestFailed()
+                           .Mine(24000, TestTime(40000), 0).TestFailed()
+
+        // DEFINED -> STARTED -> LOCKEDIN at the last minute -> ACTIVE
+                           .Reset().TestDefined()
+                           .Mine(1, TestTime(1), 0).TestDefined()
+                           .Mine(1000, TestTime(10000) - 1, 0x101).TestDefined() // One second more and it would be defined
+                           .Mine(2000, TestTime(10000), 0x101).TestStarted() // So that's what happens the next period
+                           .Mine(2050, TestTime(10010), 0x200).TestStarted() // 50 old blocks
+                           .Mine(2950, TestTime(10020), 0x100).TestStarted() // 900 new blocks
+                           .Mine(2999, TestTime(19999), 0x200).TestStarted() // 49 old blocks
+                           .Mine(3000, TestTime(29999), 0x200).TestLockedIn() // 1 old block (so 900 out of the past 1000)
+                           .Mine(3999, TestTime(30001), 0).TestLockedIn()
+                           .Mine(4000, TestTime(30002), 0).TestActive()
+                           .Mine(14333, TestTime(30003), 0).TestActive()
+                           .Mine(24000, TestTime(40000), 0).TestActive();
+    }
+}
+
+BOOST_AUTO_TEST_SUITE_END()

From d23f6c6a0d2dc8a3f5f159faf7a40157259a8f8f Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Thu, 3 Mar 2016 21:00:03 +0100
Subject: [PATCH 0012/1802] Softfork status report in RPC

---
 src/main.cpp           |  6 +++++-
 src/main.h             |  4 ++++
 src/rpc/blockchain.cpp | 22 ++++++++++++++++++++++
 3 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/src/main.cpp b/src/main.cpp
index 45e58818977d3..e4567a8974c84 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -5859,7 +5859,11 @@ bool SendMessages(CNode* pto)
      return strprintf("CBlockFileInfo(blocks=%u, size=%u, heights=%u...%u, time=%s...%s)", nBlocks, nSize, nHeightFirst, nHeightLast, DateTimeStrFormat("%Y-%m-%d", nTimeFirst), DateTimeStrFormat("%Y-%m-%d", nTimeLast));
  }
 
-
+ThresholdState VersionBitsTipState(const Consensus::Params& params, Consensus::DeploymentPos pos)
+{
+    LOCK(cs_main);
+    return VersionBitsState(chainActive.Tip(), params, pos, versionbitscache);
+}
 
 class CMainCleanup
 {
diff --git a/src/main.h b/src/main.h
index 7670bb74d357c..b66ad53c8a7a1 100644
--- a/src/main.h
+++ b/src/main.h
@@ -16,6 +16,7 @@
 #include "net.h"
 #include "script/script_error.h"
 #include "sync.h"
+#include "versionbits.h"
 
 #include <algorithm>
 #include <exception>
@@ -289,6 +290,9 @@ bool AcceptToMemoryPool(CTxMemPool& pool, CValidationState &state, const CTransa
 /** Convert CValidationState to a human-readable message for logging */
 std::string FormatStateMessage(const CValidationState &state);
 
+/** Get the BIP9 state for a given deployment at the current tip. */
+ThresholdState VersionBitsTipState(const Consensus::Params& params, Consensus::DeploymentPos pos);
+
 struct CNodeStateStats {
     int nMisbehavior;
     int nSyncHeight;
diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp
index da57973daeaf2..a110dff0d1d4a 100644
--- a/src/rpc/blockchain.cpp
+++ b/src/rpc/blockchain.cpp
@@ -604,6 +604,20 @@ static UniValue SoftForkDesc(const std::string &name, int version, CBlockIndex*
     return rv;
 }
 
+static UniValue BIP9SoftForkDesc(const std::string& name, const Consensus::Params& consensusParams, Consensus::DeploymentPos id)
+{
+    UniValue rv(UniValue::VOBJ);
+    rv.push_back(Pair("id", name));
+    switch (VersionBitsTipState(consensusParams, id)) {
+    case THRESHOLD_DEFINED: rv.push_back(Pair("status", "defined")); break;
+    case THRESHOLD_STARTED: rv.push_back(Pair("status", "started")); break;
+    case THRESHOLD_LOCKED_IN: rv.push_back(Pair("status", "locked_in")); break;
+    case THRESHOLD_ACTIVE: rv.push_back(Pair("status", "active")); break;
+    case THRESHOLD_FAILED: rv.push_back(Pair("status", "failed")); break;
+    }
+    return rv;
+}
+
 UniValue getblockchaininfo(const UniValue& params, bool fHelp)
 {
     if (fHelp || params.size() != 0)
@@ -634,6 +648,12 @@ UniValue getblockchaininfo(const UniValue& params, bool fHelp)
             "        },\n"
             "        \"reject\": { ... }      (object) progress toward rejecting pre-softfork blocks (same fields as \"enforce\")\n"
             "     }, ...\n"
+            "  ],\n"
+            "  \"bip9_softforks\": [       (array) status of BIP9 softforks in progress\n"
+            "     {\n"
+            "        \"id\": \"xxxx\",        (string) name of the softfork\n"
+            "        \"status\": \"xxxx\",    (string) one of \"defined\", \"started\", \"lockedin\", \"active\", \"failed\"\n"
+            "     }\n"
             "  ]\n"
             "}\n"
             "\nExamples:\n"
@@ -657,10 +677,12 @@ UniValue getblockchaininfo(const UniValue& params, bool fHelp)
     const Consensus::Params& consensusParams = Params().GetConsensus();
     CBlockIndex* tip = chainActive.Tip();
     UniValue softforks(UniValue::VARR);
+    UniValue bip9_softforks(UniValue::VARR);
     softforks.push_back(SoftForkDesc("bip34", 2, tip, consensusParams));
     softforks.push_back(SoftForkDesc("bip66", 3, tip, consensusParams));
     softforks.push_back(SoftForkDesc("bip65", 4, tip, consensusParams));
     obj.push_back(Pair("softforks",             softforks));
+    obj.push_back(Pair("bip9_softforks", bip9_softforks));
 
     if (fPruneMode)
     {

From 532cbb22b57f25c89df30588185b0db659871c86 Mon Sep 17 00:00:00 2001
From: Suhas Daftuar <sdaftuar@gmail.com>
Date: Wed, 9 Mar 2016 16:00:53 -0500
Subject: [PATCH 0013/1802] Add testing of ComputeBlockVersion

---
 src/chainparams.cpp            |   9 +++
 src/consensus/params.h         |   3 +-
 src/test/versionbits_tests.cpp | 109 +++++++++++++++++++++++++++++++++
 3 files changed, 120 insertions(+), 1 deletion(-)

diff --git a/src/chainparams.cpp b/src/chainparams.cpp
index 6501af78b3ae6..35e090a0b3b3e 100644
--- a/src/chainparams.cpp
+++ b/src/chainparams.cpp
@@ -83,6 +83,9 @@ class CMainParams : public CChainParams {
         consensus.fPowNoRetargeting = false;
         consensus.nRuleChangeActivationThreshold = 1916; // 95% of 2016
         consensus.nMinerConfirmationWindow = 2016; // nPowTargetTimespan / nPowTargetSpacing
+        consensus.vDeployments[Consensus::DEPLOYMENT_TESTDUMMY].bit = 28;
+        consensus.vDeployments[Consensus::DEPLOYMENT_TESTDUMMY].nStartTime = 1199145601; // January 1, 2008
+        consensus.vDeployments[Consensus::DEPLOYMENT_TESTDUMMY].nTimeout = 1230767999; // December 31, 2008
         /** 
          * The message start string is designed to be unlikely to occur in normal data.
          * The characters are rarely used upper ASCII, not valid as UTF-8, and produce
@@ -166,6 +169,9 @@ class CTestNetParams : public CChainParams {
         consensus.fPowNoRetargeting = false;
         consensus.nRuleChangeActivationThreshold = 1512; // 75% for testchains
         consensus.nMinerConfirmationWindow = 2016; // nPowTargetTimespan / nPowTargetSpacing
+        consensus.vDeployments[Consensus::DEPLOYMENT_TESTDUMMY].bit = 28;
+        consensus.vDeployments[Consensus::DEPLOYMENT_TESTDUMMY].nStartTime = 1199145601; // January 1, 2008
+        consensus.vDeployments[Consensus::DEPLOYMENT_TESTDUMMY].nTimeout = 1230767999; // December 31, 2008
         pchMessageStart[0] = 0x0b;
         pchMessageStart[1] = 0x11;
         pchMessageStart[2] = 0x09;
@@ -231,6 +237,9 @@ class CRegTestParams : public CChainParams {
         consensus.fPowNoRetargeting = true;
         consensus.nRuleChangeActivationThreshold = 108; // 75% for testchains
         consensus.nMinerConfirmationWindow = 144; // Faster than normal for regtest (144 instead of 2016)
+        consensus.vDeployments[Consensus::DEPLOYMENT_TESTDUMMY].bit = 28;
+        consensus.vDeployments[Consensus::DEPLOYMENT_TESTDUMMY].nStartTime = 0;
+        consensus.vDeployments[Consensus::DEPLOYMENT_TESTDUMMY].nTimeout = 999999999999ULL;
 
         pchMessageStart[0] = 0xfa;
         pchMessageStart[1] = 0xbf;
diff --git a/src/consensus/params.h b/src/consensus/params.h
index d5039211a30be..7c3a8e84c3d35 100644
--- a/src/consensus/params.h
+++ b/src/consensus/params.h
@@ -14,7 +14,8 @@ namespace Consensus {
 
 enum DeploymentPos
 {
-    MAX_VERSION_BITS_DEPLOYMENTS = 0,
+    DEPLOYMENT_TESTDUMMY,
+    MAX_VERSION_BITS_DEPLOYMENTS
 };
 
 /**
diff --git a/src/test/versionbits_tests.cpp b/src/test/versionbits_tests.cpp
index 9de8461d847be..63dc4726bc8ea 100644
--- a/src/test/versionbits_tests.cpp
+++ b/src/test/versionbits_tests.cpp
@@ -6,6 +6,9 @@
 #include "random.h"
 #include "versionbits.h"
 #include "test/test_bitcoin.h"
+#include "chainparams.h"
+#include "main.h"
+#include "consensus/params.h"
 
 #include <boost/test/unit_test.hpp>
 
@@ -124,6 +127,8 @@ class VersionBitsTester
         num++;
         return *this;
     }
+
+    CBlockIndex * Tip() { return vpblock.size() ? vpblock.back() : NULL; }
 };
 
 BOOST_FIXTURE_TEST_SUITE(versionbits_tests, TestingSetup)
@@ -182,4 +187,108 @@ BOOST_AUTO_TEST_CASE(versionbits_test)
     }
 }
 
+BOOST_AUTO_TEST_CASE(versionbits_computeblockversion)
+{
+    // Check that ComputeBlockVersion will set the appropriate bit correctly
+    // on mainnet.
+    const Consensus::Params &mainnetParams = Params(CBaseChainParams::MAIN).GetConsensus();
+
+    // Use the TESTDUMMY deployment for testing purposes.
+    int64_t bit = mainnetParams.vDeployments[Consensus::DEPLOYMENT_TESTDUMMY].bit;
+    int64_t nStartTime = mainnetParams.vDeployments[Consensus::DEPLOYMENT_TESTDUMMY].nStartTime;
+    int64_t nTimeout = mainnetParams.vDeployments[Consensus::DEPLOYMENT_TESTDUMMY].nTimeout;
+
+    assert(nStartTime < nTimeout);
+
+    // In the first chain, test that the bit is set by CBV until it has failed.
+    // In the second chain, test the bit is set by CBV while STARTED and
+    // LOCKED-IN, and then no longer set while ACTIVE.
+    VersionBitsTester firstChain, secondChain;
+
+    // Start generating blocks before nStartTime
+    int64_t nTime = nStartTime - 1;
+
+    // Before MedianTimePast of the chain has crossed nStartTime, the bit
+    // should not be set.
+    CBlockIndex *lastBlock = NULL;
+    lastBlock = firstChain.Mine(2016, nTime, VERSIONBITS_LAST_OLD_BLOCK_VERSION).Tip();
+    BOOST_CHECK_EQUAL(ComputeBlockVersion(lastBlock, mainnetParams) & (1<<bit), 0);
+
+    // Mine 2011 more blocks at the old time, and check that CBV isn't setting the bit yet.
+    for (int i=1; i<2012; i++) {
+        lastBlock = firstChain.Mine(2016+i, nTime, VERSIONBITS_LAST_OLD_BLOCK_VERSION).Tip();
+        // This works because VERSIONBITS_LAST_OLD_BLOCK_VERSION happens
+        // to be 4, and the bit we're testing happens to be bit 28.
+        BOOST_CHECK_EQUAL(ComputeBlockVersion(lastBlock, mainnetParams) & (1<<bit), 0);
+    }
+    // Now mine 5 more blocks at the start time -- MTP should not have passed yet, so
+    // CBV should still not yet set the bit.
+    nTime = nStartTime;
+    for (int i=2012; i<=2016; i++) {
+        lastBlock = firstChain.Mine(2016+i, nTime, VERSIONBITS_LAST_OLD_BLOCK_VERSION).Tip();
+        BOOST_CHECK_EQUAL(ComputeBlockVersion(lastBlock, mainnetParams) & (1<<bit), 0);
+    }
+
+    // Advance to the next period and transition to STARTED,
+    lastBlock = firstChain.Mine(6048, nTime, VERSIONBITS_LAST_OLD_BLOCK_VERSION).Tip();
+    // so ComputeBlockVersion should now set the bit,
+    BOOST_CHECK((ComputeBlockVersion(lastBlock, mainnetParams) & (1<<bit)) != 0);
+    // and should also be using the VERSIONBITS_TOP_BITS.
+    BOOST_CHECK_EQUAL(ComputeBlockVersion(lastBlock, mainnetParams) & VERSIONBITS_TOP_MASK, VERSIONBITS_TOP_BITS);
+
+    // Check that ComputeBlockVersion will set the bit until nTimeout
+    nTime += 600;
+    int blocksToMine = 4032; // test blocks for up to 2 time periods
+    int nHeight = 6048;
+    // These blocks are all before nTimeout is reached.
+    while (nTime < nTimeout && blocksToMine > 0) {
+        lastBlock = firstChain.Mine(nHeight+1, nTime, VERSIONBITS_LAST_OLD_BLOCK_VERSION).Tip();
+        BOOST_CHECK((ComputeBlockVersion(lastBlock, mainnetParams) & (1<<bit)) != 0);
+        BOOST_CHECK_EQUAL(ComputeBlockVersion(lastBlock, mainnetParams) & VERSIONBITS_TOP_MASK, VERSIONBITS_TOP_BITS);
+        blocksToMine--;
+        nTime += 600;
+        nHeight += 1;
+    };
+
+    nTime = nTimeout;
+    // FAILED is only triggered at the end of a period, so CBV should be setting
+    // the bit until the period transition.
+    for (int i=0; i<2015; i++) {
+        lastBlock = firstChain.Mine(nHeight+1, nTime, VERSIONBITS_LAST_OLD_BLOCK_VERSION).Tip();
+        BOOST_CHECK((ComputeBlockVersion(lastBlock, mainnetParams) & (1<<bit)) != 0);
+        nHeight += 1;
+    }
+    // The next block should trigger no longer setting the bit.
+    lastBlock = firstChain.Mine(nHeight+1, nTime, VERSIONBITS_LAST_OLD_BLOCK_VERSION).Tip();
+    BOOST_CHECK_EQUAL(ComputeBlockVersion(lastBlock, mainnetParams) & (1<<bit), 0);
+
+    // On a new chain:
+    // verify that the bit will be set after lock-in, and then stop being set
+    // after activation.
+    nTime = nStartTime;
+
+    // Mine one period worth of blocks, and check that the bit will be on for the
+    // next period.
+    lastBlock = secondChain.Mine(2016, nStartTime, VERSIONBITS_LAST_OLD_BLOCK_VERSION).Tip();
+    BOOST_CHECK((ComputeBlockVersion(lastBlock, mainnetParams) & (1<<bit)) != 0);
+
+    // Mine another period worth of blocks, signaling the new bit.
+    lastBlock = secondChain.Mine(4032, nStartTime, VERSIONBITS_TOP_BITS | (1<<bit)).Tip();
+    // After one period of setting the bit on each block, it should have locked in.
+    // We keep setting the bit for one more period though, until activation.
+    BOOST_CHECK((ComputeBlockVersion(lastBlock, mainnetParams) & (1<<bit)) != 0);
+
+    // Now check that we keep mining the block until the end of this period, and
+    // then stop at the beginning of the next period.
+    lastBlock = secondChain.Mine(6047, nStartTime, VERSIONBITS_LAST_OLD_BLOCK_VERSION).Tip();
+    BOOST_CHECK((ComputeBlockVersion(lastBlock, mainnetParams) & (1<<bit)) != 0);
+    lastBlock = secondChain.Mine(6048, nStartTime, VERSIONBITS_LAST_OLD_BLOCK_VERSION).Tip();
+    BOOST_CHECK_EQUAL(ComputeBlockVersion(lastBlock, mainnetParams) & (1<<bit), 0);
+
+    // Finally, verify that after a soft fork has activated, CBV no longer uses
+    // VERSIONBITS_LAST_OLD_BLOCK_VERSION.
+    //BOOST_CHECK_EQUAL(ComputeBlockVersion(lastBlock, mainnetParams) & VERSIONBITS_TOP_MASK, VERSIONBITS_TOP_BITS);
+}
+
+
 BOOST_AUTO_TEST_SUITE_END()

From 7870debceba98f9b092586ab4f0c96a9b5d458fd Mon Sep 17 00:00:00 2001
From: Suhas Daftuar <sdaftuar@chaincode.com>
Date: Wed, 9 Mar 2016 09:48:20 -0500
Subject: [PATCH 0014/1802] Test versionbits deployments

---
 src/test/versionbits_tests.cpp | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/src/test/versionbits_tests.cpp b/src/test/versionbits_tests.cpp
index 63dc4726bc8ea..1f86a06a3f7f7 100644
--- a/src/test/versionbits_tests.cpp
+++ b/src/test/versionbits_tests.cpp
@@ -185,6 +185,28 @@ BOOST_AUTO_TEST_CASE(versionbits_test)
                            .Mine(14333, TestTime(30003), 0).TestActive()
                            .Mine(24000, TestTime(40000), 0).TestActive();
     }
+
+    // Sanity checks of version bit deployments
+    const Consensus::Params &mainnetParams = Params(CBaseChainParams::MAIN).GetConsensus();
+    for (int i=0; i<(int) Consensus::MAX_VERSION_BITS_DEPLOYMENTS; i++) {
+        uint32_t bitmask = VersionBitsMask(mainnetParams, (Consensus::DeploymentPos)i);
+        // Make sure that no deployment tries to set an invalid bit.
+        BOOST_CHECK_EQUAL(bitmask & ~(uint32_t)VERSIONBITS_TOP_MASK, bitmask);
+
+        // Verify that the deployment windows of different deployment using the
+        // same bit are disjoint.
+        // This test may need modification at such time as a new deployment
+        // is proposed that reuses the bit of an activated soft fork, before the
+        // end time of that soft fork.  (Alternatively, the end time of that
+        // activated soft fork could be later changed to be earlier to avoid
+        // overlap.)
+        for (int j=i+1; j<(int) Consensus::MAX_VERSION_BITS_DEPLOYMENTS; j++) {
+            if (VersionBitsMask(mainnetParams, (Consensus::DeploymentPos)j) == bitmask) {
+                BOOST_CHECK(mainnetParams.vDeployments[j].nStartTime > mainnetParams.vDeployments[i].nTimeout ||
+                        mainnetParams.vDeployments[i].nStartTime > mainnetParams.vDeployments[j].nTimeout);
+            }
+        }
+    }
 }
 
 BOOST_AUTO_TEST_CASE(versionbits_computeblockversion)

From 8c74cedef53ab791ed333f25794f8b9d2e9f51aa Mon Sep 17 00:00:00 2001
From: Suhas Daftuar <sdaftuar@chaincode.com>
Date: Tue, 15 Mar 2016 12:09:16 -0400
Subject: [PATCH 0015/1802] RPC test for BIP9 warning logic

---
 qa/pull-tester/rpc-tests.py             |   1 +
 qa/rpc-tests/p2p-versionbits-warning.py | 160 ++++++++++++++++++++++++
 2 files changed, 161 insertions(+)
 create mode 100755 qa/rpc-tests/p2p-versionbits-warning.py

diff --git a/qa/pull-tester/rpc-tests.py b/qa/pull-tester/rpc-tests.py
index 485888e9b45eb..f15eaacbdaed8 100755
--- a/qa/pull-tester/rpc-tests.py
+++ b/qa/pull-tester/rpc-tests.py
@@ -115,6 +115,7 @@
     'invalidblockrequest.py',
     'invalidtxrequest.py',
     'abandonconflict.py',
+    'p2p-versionbits-warning.py',
 ]
 testScriptsExt = [
     'bip65-cltv.py',
diff --git a/qa/rpc-tests/p2p-versionbits-warning.py b/qa/rpc-tests/p2p-versionbits-warning.py
new file mode 100755
index 0000000000000..061dcbf0e1e87
--- /dev/null
+++ b/qa/rpc-tests/p2p-versionbits-warning.py
@@ -0,0 +1,160 @@
+#!/usr/bin/env python2
+# Copyright (c) 2016 The Bitcoin Core developers
+# Distributed under the MIT/X11 software license, see the accompanying
+# file COPYING or http://www.opensource.org/licenses/mit-license.php.
+#
+
+from test_framework.mininode import *
+from test_framework.test_framework import BitcoinTestFramework
+from test_framework.util import *
+import time
+from test_framework.blocktools import create_block, create_coinbase
+
+'''
+Test version bits' warning system.
+
+Generate chains with block versions that appear to be signalling unknown
+soft-forks, and test that warning alerts are generated.
+'''
+
+VB_PERIOD = 144 # versionbits period length for regtest
+VB_THRESHOLD = 108 # versionbits activation threshold for regtest
+VB_TOP_BITS = 0x20000000
+VB_UNKNOWN_BIT = 27 # Choose a bit unassigned to any deployment
+
+# TestNode: bare-bones "peer".  Used mostly as a conduit for a test to sending
+# p2p messages to a node, generating the messages in the main testing logic.
+class TestNode(NodeConnCB):
+    def __init__(self):
+        NodeConnCB.__init__(self)
+        self.connection = None
+        self.ping_counter = 1
+        self.last_pong = msg_pong()
+
+    def add_connection(self, conn):
+        self.connection = conn
+
+    def on_inv(self, conn, message):
+        pass
+
+    # Wrapper for the NodeConn's send_message function
+    def send_message(self, message):
+        self.connection.send_message(message)
+
+    def on_pong(self, conn, message):
+        self.last_pong = message
+
+    # Sync up with the node after delivery of a block
+    def sync_with_ping(self, timeout=30):
+        self.connection.send_message(msg_ping(nonce=self.ping_counter))
+        received_pong = False
+        sleep_time = 0.05
+        while not received_pong and timeout > 0:
+            time.sleep(sleep_time)
+            timeout -= sleep_time
+            with mininode_lock:
+                if self.last_pong.nonce == self.ping_counter:
+                    received_pong = True
+        self.ping_counter += 1
+        return received_pong
+
+
+class VersionBitsWarningTest(BitcoinTestFramework):
+    def setup_chain(self):
+        initialize_chain_clean(self.options.tmpdir, 1)
+
+    def setup_network(self):
+        self.nodes = []
+        self.alert_filename = os.path.join(self.options.tmpdir, "alert.txt")
+        # Open and close to create zero-length file
+        with open(self.alert_filename, 'w') as f:
+            pass
+        self.node_options = ["-debug", "-logtimemicros=1", "-alertnotify=echo %s >> \"" + self.alert_filename + "\""]
+        self.nodes.append(start_node(0, self.options.tmpdir, self.node_options))
+
+        import re
+        self.vb_pattern = re.compile("^Warning.*versionbit")
+
+    # Send numblocks blocks via peer with nVersionToUse set.
+    def send_blocks_with_version(self, peer, numblocks, nVersionToUse):
+        tip = self.nodes[0].getbestblockhash()
+        height = self.nodes[0].getblockcount()
+        block_time = self.nodes[0].getblockheader(tip)["time"]+1
+        tip = int(tip, 16)
+
+        for i in xrange(numblocks):
+            block = create_block(tip, create_coinbase(height+1), block_time)
+            block.nVersion = nVersionToUse
+            block.solve()
+            peer.send_message(msg_block(block))
+            block_time += 1
+            height += 1
+            tip = block.sha256
+        peer.sync_with_ping()
+
+    def test_versionbits_in_alert_file(self):
+        with open(self.alert_filename, 'r') as f:
+            alert_text = f.read()
+        assert(self.vb_pattern.match(alert_text))
+
+    def run_test(self):
+        # Setup the p2p connection and start up the network thread.
+        test_node = TestNode()
+
+        connections = []
+        connections.append(NodeConn('127.0.0.1', p2p_port(0), self.nodes[0], test_node))
+        test_node.add_connection(connections[0])
+
+        NetworkThread().start() # Start up network handling in another thread
+
+        # Test logic begins here
+        test_node.wait_for_verack()
+
+        # 1. Have the node mine one period worth of blocks
+        self.nodes[0].generate(VB_PERIOD)
+
+        # 2. Now build one period of blocks on the tip, with < VB_THRESHOLD
+        # blocks signaling some unknown bit.
+        nVersion = VB_TOP_BITS | (1<<VB_UNKNOWN_BIT)
+        self.send_blocks_with_version(test_node, VB_THRESHOLD-1, nVersion)
+
+        # Fill rest of period with regular version blocks
+        self.nodes[0].generate(VB_PERIOD - VB_THRESHOLD + 1)
+        # Check that we're not getting any versionbit-related errors in
+        # getinfo()
+        assert(not self.vb_pattern.match(self.nodes[0].getinfo()["errors"]))
+
+        # 3. Now build one period of blocks with >= VB_THRESHOLD blocks signaling
+        # some unknown bit
+        self.send_blocks_with_version(test_node, VB_THRESHOLD, nVersion)
+        self.nodes[0].generate(VB_PERIOD - VB_THRESHOLD)
+        # Might not get a versionbits-related alert yet, as we should
+        # have gotten a different alert due to more than 51/100 blocks
+        # being of unexpected version.
+        # Check that getinfo() shows some kind of error.
+        assert(len(self.nodes[0].getinfo()["errors"]) != 0)
+
+        # Mine a period worth of expected blocks so the generic block-version warning
+        # is cleared, and restart the node. This should move the versionbit state
+        # to ACTIVE.
+        self.nodes[0].generate(VB_PERIOD)
+        stop_node(self.nodes[0], 0)
+        wait_bitcoinds()
+        # Empty out the alert file
+        with open(self.alert_filename, 'w') as f:
+            pass
+        self.nodes[0] = start_node(0, self.options.tmpdir, ["-debug", "-logtimemicros=1", "-alertnotify=echo %s >> \"" + self.alert_filename + "\""])
+
+        # Connecting one block should be enough to generate an error.
+        self.nodes[0].generate(1)
+        assert(len(self.nodes[0].getinfo()["errors"]) != 0)
+        stop_node(self.nodes[0], 0)
+        wait_bitcoinds()
+        self.test_versionbits_in_alert_file()
+
+        # Test framework expects the node to still be running...
+        self.nodes[0] = start_node(0, self.options.tmpdir, ["-debug", "-logtimemicros=1", "-alertnotify=echo %s >> \"" + self.alert_filename + "\""])
+
+
+if __name__ == '__main__':
+    VersionBitsWarningTest().main()

From fa4a52254178655f50e73b50153730a60ffafd32 Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Sun, 6 Mar 2016 18:30:51 +0100
Subject: [PATCH 0016/1802] [qa] Add tests verifychain, lockunspent,
 getbalance, listsinceblock

---
 qa/rpc-tests/blockchain.py       |  2 ++
 qa/rpc-tests/mempool_limit.py    |  1 -
 qa/rpc-tests/mempool_packages.py |  1 +
 qa/rpc-tests/wallet.py           | 21 ++++++++++++++++++++-
 4 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/qa/rpc-tests/blockchain.py b/qa/rpc-tests/blockchain.py
index 7045ae435ceb4..272a5dc15482e 100755
--- a/qa/rpc-tests/blockchain.py
+++ b/qa/rpc-tests/blockchain.py
@@ -28,6 +28,7 @@ class BlockchainTest(BitcoinTestFramework):
     Test blockchain-related RPC calls:
 
         - gettxoutsetinfo
+        - verifychain
 
     """
 
@@ -44,6 +45,7 @@ def setup_network(self, split=False):
     def run_test(self):
         self._test_gettxoutsetinfo()
         self._test_getblockheader()
+        self.nodes[0].verifychain(4, 0)
 
     def _test_gettxoutsetinfo(self):
         node = self.nodes[0]
diff --git a/qa/rpc-tests/mempool_limit.py b/qa/rpc-tests/mempool_limit.py
index 7914ceea22bc4..c19a63c6996d2 100755
--- a/qa/rpc-tests/mempool_limit.py
+++ b/qa/rpc-tests/mempool_limit.py
@@ -38,7 +38,6 @@ def run_test(self):
         self.nodes[0].settxfee(0) # return to automatic fee selection
         txFS = self.nodes[0].signrawtransaction(txF['hex'])
         txid = self.nodes[0].sendrawtransaction(txFS['hex'])
-        self.nodes[0].lockunspent(True, [us0])
 
         relayfee = self.nodes[0].getnetworkinfo()['relayfee']
         base_fee = relayfee*100
diff --git a/qa/rpc-tests/mempool_packages.py b/qa/rpc-tests/mempool_packages.py
index 6109cb026ceae..bc3f9e051cef1 100755
--- a/qa/rpc-tests/mempool_packages.py
+++ b/qa/rpc-tests/mempool_packages.py
@@ -7,6 +7,7 @@
 
 from test_framework.test_framework import BitcoinTestFramework
 from test_framework.util import *
+from test_framework.mininode import COIN
 
 MAX_ANCESTORS = 25
 MAX_DESCENDANTS = 25
diff --git a/qa/rpc-tests/wallet.py b/qa/rpc-tests/wallet.py
index 3cd495deb6092..e52d4e766801d 100755
--- a/qa/rpc-tests/wallet.py
+++ b/qa/rpc-tests/wallet.py
@@ -59,6 +59,15 @@ def run_test (self):
         self.nodes[0].generate(1)
         self.sync_all()
 
+        # Exercise locking of unspent outputs
+        unspent_0 = self.nodes[2].listunspent()[0]
+        unspent_0 = {"txid": unspent_0["txid"], "vout": unspent_0["vout"]}
+        self.nodes[2].lockunspent(False, [unspent_0])
+        assert_raises(JSONRPCException, self.nodes[2].sendtoaddress, self.nodes[2].getnewaddress(), 20)
+        assert_equal([unspent_0], self.nodes[2].listlockunspent())
+        self.nodes[2].lockunspent(True, [unspent_0])
+        assert_equal(len(self.nodes[2].listlockunspent()), 0)
+
         # Have node1 generate 100 blocks (so node0 can recover the fee)
         self.nodes[1].generate(100)
         self.sync_all()
@@ -148,6 +157,10 @@ def run_test (self):
 
         assert(txid1 in self.nodes[3].getrawmempool())
 
+        # Exercise balance rpcs
+        assert_equal(self.nodes[0].getwalletinfo()["unconfirmed_balance"], 1)
+        assert_equal(self.nodes[0].getunconfirmedbalance(), 1)
+
         #check if we can list zero value tx as available coins
         #1. create rawtx
         #2. hex-changed one output to 0.0
@@ -251,7 +264,7 @@ def run_test (self):
 
         #check if wallet or blochchain maintenance changes the balance
         self.sync_all()
-        self.nodes[0].generate(1)
+        blocks = self.nodes[0].generate(2)
         self.sync_all()
         balance_nodes = [self.nodes[i].getbalance() for i in range(3)]
 
@@ -269,6 +282,12 @@ def run_test (self):
             self.nodes = start_nodes(3, self.options.tmpdir, [[m]] * 3)
             assert_equal(balance_nodes, [self.nodes[i].getbalance() for i in range(3)])
 
+        # Exercise listsinceblock with the last two blocks
+        coinbase_tx_1 = self.nodes[0].listsinceblock(blocks[0])
+        assert_equal(coinbase_tx_1["lastblock"], blocks[1])
+        assert_equal(len(coinbase_tx_1["transactions"]), 1)
+        assert_equal(coinbase_tx_1["transactions"][0]["blockhash"], blocks[1])
+        assert_equal(len(self.nodes[0].listsinceblock(blocks[1])["transactions"]), 0)
 
 if __name__ == '__main__':
     WalletTest ().main ()

From fab688049402a111b32df6ca0765d3bcbb2d6ab5 Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Thu, 17 Mar 2016 16:47:15 +0100
Subject: [PATCH 0017/1802] [qa] Add amount tests

---
 src/Makefile.test.include |  1 +
 src/test/amount_tests.cpp | 42 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 43 insertions(+)
 create mode 100644 src/test/amount_tests.cpp

diff --git a/src/Makefile.test.include b/src/Makefile.test.include
index 0c4e47a147020..000d2af61fc92 100644
--- a/src/Makefile.test.include
+++ b/src/Makefile.test.include
@@ -38,6 +38,7 @@ BITCOIN_TESTS =\
   test/scriptnum10.h \
   test/addrman_tests.cpp \
   test/alert_tests.cpp \
+  test/amount_tests.cpp \
   test/allocator_tests.cpp \
   test/base32_tests.cpp \
   test/base58_tests.cpp \
diff --git a/src/test/amount_tests.cpp b/src/test/amount_tests.cpp
new file mode 100644
index 0000000000000..59dab20633ced
--- /dev/null
+++ b/src/test/amount_tests.cpp
@@ -0,0 +1,42 @@
+// Copyright (c) 2016 The Bitcoin Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#include "amount.h"
+#include "test/test_bitcoin.h"
+
+#include <boost/test/unit_test.hpp>
+
+BOOST_FIXTURE_TEST_SUITE(amount_tests, BasicTestingSetup)
+
+BOOST_AUTO_TEST_CASE(GetFeeTest)
+{
+    CFeeRate feeRate;
+
+    feeRate = CFeeRate(0);
+    // Must always return 0
+    BOOST_CHECK_EQUAL(feeRate.GetFee(0), 0);
+    BOOST_CHECK_EQUAL(feeRate.GetFee(1e5), 0);
+
+    feeRate = CFeeRate(1000);
+    // Must always just return the arg
+    BOOST_CHECK_EQUAL(feeRate.GetFee(0), 0);
+    BOOST_CHECK_EQUAL(feeRate.GetFee(1), 1);
+    BOOST_CHECK_EQUAL(feeRate.GetFee(121), 121);
+    BOOST_CHECK_EQUAL(feeRate.GetFee(999), 999);
+    BOOST_CHECK_EQUAL(feeRate.GetFee(1e3), 1e3);
+    BOOST_CHECK_EQUAL(feeRate.GetFee(9e3), 9e3);
+
+    feeRate = CFeeRate(123);
+    // Truncates the result, if not integer
+    BOOST_CHECK_EQUAL(feeRate.GetFee(0), 0);
+    BOOST_CHECK_EQUAL(feeRate.GetFee(8), 1); // Special case: returns 1 instead of 0
+    BOOST_CHECK_EQUAL(feeRate.GetFee(9), 1);
+    BOOST_CHECK_EQUAL(feeRate.GetFee(121), 14);
+    BOOST_CHECK_EQUAL(feeRate.GetFee(122), 15);
+    BOOST_CHECK_EQUAL(feeRate.GetFee(999), 122);
+    BOOST_CHECK_EQUAL(feeRate.GetFee(1e3), 123);
+    BOOST_CHECK_EQUAL(feeRate.GetFee(9e3), 1107);
+}
+
+BOOST_AUTO_TEST_SUITE_END()

From faf756ae4ed63a31f073c09f3d0f25c13971cb98 Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Wed, 9 Mar 2016 12:54:55 +0100
Subject: [PATCH 0018/1802] [amount] Make GetFee() monotonic

This reverts the hard-to-read and buggy code introduced in
d88af560111863c3e9c1ae855dcc287f04dffb02 and adds documentation
---
 src/amount.cpp |  6 +++---
 src/amount.h   | 12 ++++++++----
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/amount.cpp b/src/amount.cpp
index a3abd8cd835fb..d03ed5cfadb4c 100644
--- a/src/amount.cpp
+++ b/src/amount.cpp
@@ -19,10 +19,10 @@ CFeeRate::CFeeRate(const CAmount& nFeePaid, size_t nSize)
 
 CAmount CFeeRate::GetFee(size_t nSize) const
 {
-    CAmount nFee = nSatoshisPerK*nSize / 1000;
+    CAmount nFee = nSatoshisPerK * nSize / 1000;
 
-    if (nFee == 0 && nSatoshisPerK > 0)
-        nFee = nSatoshisPerK;
+    if (nFee == 0 && nSize != 0 && nSatoshisPerK != 0)
+        nFee = CAmount(1);
 
     return nFee;
 }
diff --git a/src/amount.h b/src/amount.h
index a48b17d514277..9aba6525c7f2b 100644
--- a/src/amount.h
+++ b/src/amount.h
@@ -42,10 +42,14 @@ class CFeeRate
     explicit CFeeRate(const CAmount& _nSatoshisPerK): nSatoshisPerK(_nSatoshisPerK) { }
     CFeeRate(const CAmount& nFeePaid, size_t nSize);
     CFeeRate(const CFeeRate& other) { nSatoshisPerK = other.nSatoshisPerK; }
-
-    CAmount GetFee(size_t size) const; // unit returned is satoshis
-    CAmount GetFeePerK() const { return GetFee(1000); } // satoshis-per-1000-bytes
-
+    /**
+     * Return the fee in satoshis for the given size in bytes.
+     */
+    CAmount GetFee(size_t size) const;
+    /**
+     * Return the fee in satoshis for a size of 1000 bytes
+     */
+    CAmount GetFeePerK() const { return GetFee(1000); }
     friend bool operator<(const CFeeRate& a, const CFeeRate& b) { return a.nSatoshisPerK < b.nSatoshisPerK; }
     friend bool operator>(const CFeeRate& a, const CFeeRate& b) { return a.nSatoshisPerK > b.nSatoshisPerK; }
     friend bool operator==(const CFeeRate& a, const CFeeRate& b) { return a.nSatoshisPerK == b.nSatoshisPerK; }

From e38781da40f862d4fa45bd23923d8665709e6f7a Mon Sep 17 00:00:00 2001
From: Suhas Daftuar <sdaftuar@chaincode.com>
Date: Thu, 17 Mar 2016 20:23:29 -0400
Subject: [PATCH 0019/1802] Tests: fix missing import in mempool_packages

---
 qa/rpc-tests/mempool_packages.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/qa/rpc-tests/mempool_packages.py b/qa/rpc-tests/mempool_packages.py
index 6109cb026ceae..bc3f9e051cef1 100755
--- a/qa/rpc-tests/mempool_packages.py
+++ b/qa/rpc-tests/mempool_packages.py
@@ -7,6 +7,7 @@
 
 from test_framework.test_framework import BitcoinTestFramework
 from test_framework.util import *
+from test_framework.mininode import COIN
 
 MAX_ANCESTORS = 25
 MAX_DESCENDANTS = 25

From 5fd2318d2dbb870939e101ce45b192d00fadacc5 Mon Sep 17 00:00:00 2001
From: fanquake <fanquake@gmail.com>
Date: Fri, 18 Mar 2016 09:03:58 +0800
Subject: [PATCH 0020/1802] [Depends] Miniupnpc 1.9.20160209

2016/01/24:
  Change miniwget to return HTTP status code
  Increments API_VERSION to 16

2016/01/22:
  Improve UPNPIGD_IsConnected() to check if WAN address is not private.
  Parse HTTP response status line in miniwget.c
---
 depends/packages/miniupnpc.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/depends/packages/miniupnpc.mk b/depends/packages/miniupnpc.mk
index 3d5a6df974bf1..45fa03631f89d 100644
--- a/depends/packages/miniupnpc.mk
+++ b/depends/packages/miniupnpc.mk
@@ -1,8 +1,8 @@
 package=miniupnpc
-$(package)_version=1.9.20151026
+$(package)_version=1.9.20160209
 $(package)_download_path=http://miniupnp.free.fr/files
 $(package)_file_name=$(package)-$($(package)_version).tar.gz
-$(package)_sha256_hash=f3cf9a5a31588a917d4d9237e5bc50f84d00c5aa48e27ed50d9b88dfa6a25d47
+$(package)_sha256_hash=572171eacc1d72537ce47b6f4571260757ab7bcfdaf54c3a55c7f88594d94b6f
 
 define $(package)_set_vars
 $(package)_build_opts=CC="$($(package)_cc)"

From c85f4757b856c617684a8fef85c95ca9973ae91c Mon Sep 17 00:00:00 2001
From: fanquake <fanquake@gmail.com>
Date: Fri, 18 Mar 2016 09:06:08 +0800
Subject: [PATCH 0021/1802] [Depends] Latest config.guess & config.sub

---
 depends/config.guess | 90 +++++++++++++++++++++++---------------------
 depends/config.sub   | 12 +++---
 2 files changed, 53 insertions(+), 49 deletions(-)

diff --git a/depends/config.guess b/depends/config.guess
index fba6e87a0f87a..373a659a06760 100755
--- a/depends/config.guess
+++ b/depends/config.guess
@@ -1,8 +1,8 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
-#   Copyright 1992-2015 Free Software Foundation, Inc.
+#   Copyright 1992-2016 Free Software Foundation, Inc.
 
-timestamp='2015-11-19'
+timestamp='2016-02-11'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -27,7 +27,7 @@ timestamp='2015-11-19'
 # Originally written by Per Bothner; maintained since 2000 by Ben Elliston.
 #
 # You can get the latest version of this script from:
-# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
 #
 # Please send patches to <config-patches@gnu.org>.
 
@@ -50,7 +50,7 @@ version="\
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright 1992-2015 Free Software Foundation, Inc.
+Copyright 1992-2016 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -237,6 +237,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
 	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
 	exit ;;
+    *:LibertyBSD:*:*)
+	UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'`
+	echo ${UNAME_MACHINE_ARCH}-unknown-libertybsd${UNAME_RELEASE}
+	exit ;;
     *:ekkoBSD:*:*)
 	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
 	exit ;;
@@ -268,42 +272,42 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^  The alpha \(.*\) processor.*$/\1/p' | head -n 1`
 	case "$ALPHA_CPU_TYPE" in
 	    "EV4 (21064)")
-		UNAME_MACHINE="alpha" ;;
+		UNAME_MACHINE=alpha ;;
 	    "EV4.5 (21064)")
-		UNAME_MACHINE="alpha" ;;
+		UNAME_MACHINE=alpha ;;
 	    "LCA4 (21066/21068)")
-		UNAME_MACHINE="alpha" ;;
+		UNAME_MACHINE=alpha ;;
 	    "EV5 (21164)")
-		UNAME_MACHINE="alphaev5" ;;
+		UNAME_MACHINE=alphaev5 ;;
 	    "EV5.6 (21164A)")
-		UNAME_MACHINE="alphaev56" ;;
+		UNAME_MACHINE=alphaev56 ;;
 	    "EV5.6 (21164PC)")
-		UNAME_MACHINE="alphapca56" ;;
+		UNAME_MACHINE=alphapca56 ;;
 	    "EV5.7 (21164PC)")
-		UNAME_MACHINE="alphapca57" ;;
+		UNAME_MACHINE=alphapca57 ;;
 	    "EV6 (21264)")
-		UNAME_MACHINE="alphaev6" ;;
+		UNAME_MACHINE=alphaev6 ;;
 	    "EV6.7 (21264A)")
-		UNAME_MACHINE="alphaev67" ;;
+		UNAME_MACHINE=alphaev67 ;;
 	    "EV6.8CB (21264C)")
-		UNAME_MACHINE="alphaev68" ;;
+		UNAME_MACHINE=alphaev68 ;;
 	    "EV6.8AL (21264B)")
-		UNAME_MACHINE="alphaev68" ;;
+		UNAME_MACHINE=alphaev68 ;;
 	    "EV6.8CX (21264D)")
-		UNAME_MACHINE="alphaev68" ;;
+		UNAME_MACHINE=alphaev68 ;;
 	    "EV6.9A (21264/EV69A)")
-		UNAME_MACHINE="alphaev69" ;;
+		UNAME_MACHINE=alphaev69 ;;
 	    "EV7 (21364)")
-		UNAME_MACHINE="alphaev7" ;;
+		UNAME_MACHINE=alphaev7 ;;
 	    "EV7.9 (21364A)")
-		UNAME_MACHINE="alphaev79" ;;
+		UNAME_MACHINE=alphaev79 ;;
 	esac
 	# A Pn.n version is a patched version.
 	# A Vn.n version is a released version.
 	# A Tn.n version is a released field test version.
 	# A Xn.n version is an unreleased experimental baselevel.
 	# 1.2 uses "1.2" for uname -r.
-	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`
 	# Reset EXIT trap before exiting to avoid spurious non-zero exit code.
 	exitcode=$?
 	trap '' 0
@@ -376,16 +380,16 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	exit ;;
     i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
 	eval $set_cc_for_build
-	SUN_ARCH="i386"
+	SUN_ARCH=i386
 	# If there is a compiler, see if it is configured for 64-bit objects.
 	# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
 	# This test works for both compilers.
-	if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+	if [ "$CC_FOR_BUILD" != no_compiler_found ]; then
 	    if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
 		(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
 		grep IS_64BIT_ARCH >/dev/null
 	    then
-		SUN_ARCH="x86_64"
+		SUN_ARCH=x86_64
 	    fi
 	fi
 	echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
@@ -410,7 +414,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	exit ;;
     sun*:*:4.2BSD:*)
 	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
-	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
+	test "x${UNAME_RELEASE}" = x && UNAME_RELEASE=3
 	case "`/bin/arch`" in
 	    sun3)
 		echo m68k-sun-sunos${UNAME_RELEASE}
@@ -635,13 +639,13 @@ EOF
 		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
 		    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
 		    case "${sc_cpu_version}" in
-		      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
-		      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
+		      523) HP_ARCH=hppa1.0 ;; # CPU_PA_RISC1_0
+		      528) HP_ARCH=hppa1.1 ;; # CPU_PA_RISC1_1
 		      532)                      # CPU_PA_RISC2_0
 			case "${sc_kernel_bits}" in
-			  32) HP_ARCH="hppa2.0n" ;;
-			  64) HP_ARCH="hppa2.0w" ;;
-			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
+			  32) HP_ARCH=hppa2.0n ;;
+			  64) HP_ARCH=hppa2.0w ;;
+			  '') HP_ARCH=hppa2.0 ;;   # HP-UX 10.20
 			esac ;;
 		    esac
 		fi
@@ -684,7 +688,7 @@ EOF
 		    test -z "$HP_ARCH" && HP_ARCH=hppa
 		fi ;;
 	esac
-	if [ ${HP_ARCH} = "hppa2.0w" ]
+	if [ ${HP_ARCH} = hppa2.0w ]
 	then
 	    eval $set_cc_for_build
 
@@ -700,9 +704,9 @@ EOF
 	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
 		grep -q __LP64__
 	    then
-		HP_ARCH="hppa2.0w"
+		HP_ARCH=hppa2.0w
 	    else
-		HP_ARCH="hppa64"
+		HP_ARCH=hppa64
 	    fi
 	fi
 	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
@@ -807,14 +811,14 @@ EOF
 	echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 	exit ;;
     F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
-	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+	FUJITSU_PROC=`uname -m | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`
+	FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'`
 	FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
 	echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
 	exit ;;
     5000:UNIX_System_V:4.*:*)
-	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-	FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
+	FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'`
+	FUJITSU_REL=`echo ${UNAME_RELEASE} | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/'`
 	echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
 	exit ;;
     i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
@@ -919,7 +923,7 @@ EOF
 	  EV68*) UNAME_MACHINE=alphaev68 ;;
 	esac
 	objdump --private-headers /bin/sh | grep -q ld.so.1
-	if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
+	if test "$?" = 0 ; then LIBC=gnulibc1 ; fi
 	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     arc:Linux:*:* | arceb:Linux:*:*)
@@ -1285,7 +1289,7 @@ EOF
 	    UNAME_PROCESSOR=powerpc
 	fi
 	if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then
-	    if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+	    if [ "$CC_FOR_BUILD" != no_compiler_found ]; then
 		if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
 		    (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
 		    grep IS_64BIT_ARCH >/dev/null
@@ -1309,7 +1313,7 @@ EOF
 	exit ;;
     *:procnto*:*:* | *:QNX:[0123456789]*:*)
 	UNAME_PROCESSOR=`uname -p`
-	if test "$UNAME_PROCESSOR" = "x86"; then
+	if test "$UNAME_PROCESSOR" = x86; then
 		UNAME_PROCESSOR=i386
 		UNAME_MACHINE=pc
 	fi
@@ -1340,7 +1344,7 @@ EOF
 	# "uname -m" is not consistent, so use $cputype instead. 386
 	# is converted to i386 for consistency with other x86
 	# operating systems.
-	if test "$cputype" = "386"; then
+	if test "$cputype" = 386; then
 	    UNAME_MACHINE=i386
 	else
 	    UNAME_MACHINE="$cputype"
@@ -1394,7 +1398,7 @@ EOF
 	echo ${UNAME_MACHINE}-unknown-esx
 	exit ;;
     amd64:Isilon\ OneFS:*:*)
-        echo x86_64-unknown-onefs
+	echo x86_64-unknown-onefs
 	exit ;;
 esac
 
@@ -1405,9 +1409,9 @@ This script, last modified $timestamp, has failed to recognize
 the operating system you are using. It is advised that you
 download the most up to date version of the config scripts from
 
-  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
 and
-  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
 
 If the version you run ($0) is already up to date, please
 send the following data and any information you think might be
diff --git a/depends/config.sub b/depends/config.sub
index ea8747d30fffb..6223dde931918 100755
--- a/depends/config.sub
+++ b/depends/config.sub
@@ -1,8 +1,8 @@
 #! /bin/sh
 # Configuration validation subroutine script.
-#   Copyright 1992-2015 Free Software Foundation, Inc.
+#   Copyright 1992-2016 Free Software Foundation, Inc.
 
-timestamp='2015-11-22'
+timestamp='2016-01-01'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -33,7 +33,7 @@ timestamp='2015-11-22'
 # Otherwise, we print the canonical config type on stdout and succeed.
 
 # You can get the latest version of this script from:
-# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
 
 # This file is supposed to be the same for all GNU packages
 # and recognize all the CPU types, system types and aliases
@@ -67,7 +67,7 @@ Report bugs and patches to <config-patches@gnu.org>."
 version="\
 GNU config.sub ($timestamp)
 
-Copyright 1992-2015 Free Software Foundation, Inc.
+Copyright 1992-2016 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -520,7 +520,7 @@ case $basic_machine in
 		basic_machine=i386-pc
 		os=-aros
 		;;
-        asmjs)
+	asmjs)
 		basic_machine=asmjs-unknown
 		;;
 	aux)
@@ -1382,7 +1382,7 @@ case $os in
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
 	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
-	      | -bitrig* | -openbsd* | -solidbsd* \
+	      | -bitrig* | -openbsd* | -solidbsd* | -libertybsd* \
 	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
 	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \

From 0f176927f88084f2f1ce329656878d122fb64623 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Barbosa?= <joao@uphold.com>
Date: Fri, 18 Mar 2016 04:14:19 +0000
Subject: [PATCH 0022/1802] Improve COutPoint less operator

---
 src/primitives/transaction.h | 3 ++-
 src/uint256.h                | 8 +++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/primitives/transaction.h b/src/primitives/transaction.h
index 07ae39e0b444f..e124dca365932 100644
--- a/src/primitives/transaction.h
+++ b/src/primitives/transaction.h
@@ -34,7 +34,8 @@ class COutPoint
 
     friend bool operator<(const COutPoint& a, const COutPoint& b)
     {
-        return (a.hash < b.hash || (a.hash == b.hash && a.n < b.n));
+        int cmp = a.hash.Compare(b.hash);
+        return cmp < 0 || (cmp == 0 && a.n < b.n);
     }
 
     friend bool operator==(const COutPoint& a, const COutPoint& b)
diff --git a/src/uint256.h b/src/uint256.h
index 4495000f2fa9b..bcdb6dd7c2958 100644
--- a/src/uint256.h
+++ b/src/uint256.h
@@ -42,9 +42,11 @@ class base_blob
         memset(data, 0, sizeof(data));
     }
 
-    friend inline bool operator==(const base_blob& a, const base_blob& b) { return memcmp(a.data, b.data, sizeof(a.data)) == 0; }
-    friend inline bool operator!=(const base_blob& a, const base_blob& b) { return memcmp(a.data, b.data, sizeof(a.data)) != 0; }
-    friend inline bool operator<(const base_blob& a, const base_blob& b) { return memcmp(a.data, b.data, sizeof(a.data)) < 0; }
+    inline int Compare(const base_blob& other) const { return memcmp(data, other.data, sizeof(data)); }
+
+    friend inline bool operator==(const base_blob& a, const base_blob& b) { return a.Compare(b) == 0; }
+    friend inline bool operator!=(const base_blob& a, const base_blob& b) { return a.Compare(b) != 0; }
+    friend inline bool operator<(const base_blob& a, const base_blob& b) { return a.Compare(b) < 0; }
 
     std::string GetHex() const;
     void SetHex(const char* psz);

From 65751a3cf2421a9419172949cad9dc49b7383551 Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Sat, 20 Feb 2016 23:37:13 +0100
Subject: [PATCH 0023/1802] Add CHECKSEQUENCEVERIFY softfork through BIP9

---
 src/chainparams.cpp    | 17 ++++++++++++++++-
 src/consensus/params.h |  1 +
 src/main.cpp           |  5 +++++
 src/rpc/blockchain.cpp |  1 +
 4 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/src/chainparams.cpp b/src/chainparams.cpp
index 35e090a0b3b3e..f48937d67deee 100644
--- a/src/chainparams.cpp
+++ b/src/chainparams.cpp
@@ -86,7 +86,13 @@ class CMainParams : public CChainParams {
         consensus.vDeployments[Consensus::DEPLOYMENT_TESTDUMMY].bit = 28;
         consensus.vDeployments[Consensus::DEPLOYMENT_TESTDUMMY].nStartTime = 1199145601; // January 1, 2008
         consensus.vDeployments[Consensus::DEPLOYMENT_TESTDUMMY].nTimeout = 1230767999; // December 31, 2008
-        /** 
+
+        // Deployment of BIP68, BIP112, and BIP113.
+        consensus.vDeployments[Consensus::DEPLOYMENT_CSV].bit = 0;
+        consensus.vDeployments[Consensus::DEPLOYMENT_CSV].nStartTime = 1462060800; // May 1st, 2016
+        consensus.vDeployments[Consensus::DEPLOYMENT_CSV].nTimeout = 1493596800; // May 1st, 2017
+
+        /**
          * The message start string is designed to be unlikely to occur in normal data.
          * The characters are rarely used upper ASCII, not valid as UTF-8, and produce
          * a large 32-bit integer with any alignment.
@@ -172,6 +178,12 @@ class CTestNetParams : public CChainParams {
         consensus.vDeployments[Consensus::DEPLOYMENT_TESTDUMMY].bit = 28;
         consensus.vDeployments[Consensus::DEPLOYMENT_TESTDUMMY].nStartTime = 1199145601; // January 1, 2008
         consensus.vDeployments[Consensus::DEPLOYMENT_TESTDUMMY].nTimeout = 1230767999; // December 31, 2008
+
+        // Deployment of BIP68, BIP112, and BIP113.
+        consensus.vDeployments[Consensus::DEPLOYMENT_CSV].bit = 0;
+        consensus.vDeployments[Consensus::DEPLOYMENT_CSV].nStartTime = 1456790400; // March 1st, 2016
+        consensus.vDeployments[Consensus::DEPLOYMENT_CSV].nTimeout = 1493596800; // May 1st, 2017
+
         pchMessageStart[0] = 0x0b;
         pchMessageStart[1] = 0x11;
         pchMessageStart[2] = 0x09;
@@ -240,6 +252,9 @@ class CRegTestParams : public CChainParams {
         consensus.vDeployments[Consensus::DEPLOYMENT_TESTDUMMY].bit = 28;
         consensus.vDeployments[Consensus::DEPLOYMENT_TESTDUMMY].nStartTime = 0;
         consensus.vDeployments[Consensus::DEPLOYMENT_TESTDUMMY].nTimeout = 999999999999ULL;
+        consensus.vDeployments[Consensus::DEPLOYMENT_CSV].bit = 0;
+        consensus.vDeployments[Consensus::DEPLOYMENT_CSV].nStartTime = 0;
+        consensus.vDeployments[Consensus::DEPLOYMENT_CSV].nTimeout = 999999999999ULL;
 
         pchMessageStart[0] = 0xfa;
         pchMessageStart[1] = 0xbf;
diff --git a/src/consensus/params.h b/src/consensus/params.h
index 7c3a8e84c3d35..4f3480b89ba69 100644
--- a/src/consensus/params.h
+++ b/src/consensus/params.h
@@ -15,6 +15,7 @@ namespace Consensus {
 enum DeploymentPos
 {
     DEPLOYMENT_TESTDUMMY,
+    DEPLOYMENT_CSV, // Deployment of BIP68, BIP112, and BIP113.
     MAX_VERSION_BITS_DEPLOYMENTS
 };
 
diff --git a/src/main.cpp b/src/main.cpp
index 1bc88326b6fc7..cfa69817b6a2b 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -2262,6 +2262,11 @@ bool ConnectBlock(const CBlock& block, CValidationState& state, CBlockIndex* pin
         flags |= SCRIPT_VERIFY_CHECKLOCKTIMEVERIFY;
     }
 
+    // Start enforcing CHECKSEQUENCEVERIFY using versionbits logic.
+    if (VersionBitsState(pindex->pprev, chainparams.GetConsensus(), Consensus::DEPLOYMENT_CSV, versionbitscache) == THRESHOLD_ACTIVE) {
+        flags |= SCRIPT_VERIFY_CHECKSEQUENCEVERIFY;
+    }
+
     int64_t nTime2 = GetTimeMicros(); nTimeForks += nTime2 - nTime1;
     LogPrint("bench", "    - Fork checks: %.2fms [%.2fs]\n", 0.001 * (nTime2 - nTime1), nTimeForks * 0.000001);
 
diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp
index a110dff0d1d4a..f5d75c20b367f 100644
--- a/src/rpc/blockchain.cpp
+++ b/src/rpc/blockchain.cpp
@@ -681,6 +681,7 @@ UniValue getblockchaininfo(const UniValue& params, bool fHelp)
     softforks.push_back(SoftForkDesc("bip34", 2, tip, consensusParams));
     softforks.push_back(SoftForkDesc("bip66", 3, tip, consensusParams));
     softforks.push_back(SoftForkDesc("bip65", 4, tip, consensusParams));
+    bip9_softforks.push_back(BIP9SoftForkDesc("csv", consensusParams, Consensus::DEPLOYMENT_CSV));
     obj.push_back(Pair("softforks",             softforks));
     obj.push_back(Pair("bip9_softforks", bip9_softforks));
 

From 478fba6d5213a3f1ffeca5feeacf28aaf6844fd6 Mon Sep 17 00:00:00 2001
From: BtcDrak <btcdrak@gmail.com>
Date: Tue, 16 Feb 2016 16:33:31 +0000
Subject: [PATCH 0024/1802] Soft fork logic for BIP113

---
 src/main.cpp | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index cfa69817b6a2b..857bf218ba799 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -3276,12 +3276,18 @@ bool ContextualCheckBlock(const CBlock& block, CValidationState& state, CBlockIn
     const int nHeight = pindexPrev == NULL ? 0 : pindexPrev->nHeight + 1;
     const Consensus::Params& consensusParams = Params().GetConsensus();
 
+    // Start enforcing BIP113 (Median Time Past) using versionbits logic.
+    int nLockTimeFlags = 0;
+    if (VersionBitsState(pindexPrev, consensusParams, Consensus::DEPLOYMENT_CSV, versionbitscache) == THRESHOLD_ACTIVE) {
+        nLockTimeFlags |= LOCKTIME_MEDIAN_TIME_PAST;
+    }
+
+    int64_t nLockTimeCutoff = (nLockTimeFlags & LOCKTIME_MEDIAN_TIME_PAST)
+                              ? pindexPrev->GetMedianTimePast()
+                              : block.GetBlockTime();
+
     // Check that all transactions are finalized
     BOOST_FOREACH(const CTransaction& tx, block.vtx) {
-        int nLockTimeFlags = 0;
-        int64_t nLockTimeCutoff = (nLockTimeFlags & LOCKTIME_MEDIAN_TIME_PAST)
-                                ? pindexPrev->GetMedianTimePast()
-                                : block.GetBlockTime();
         if (!IsFinalTx(tx, nHeight, nLockTimeCutoff)) {
             return state.DoS(10, false, REJECT_INVALID, "bad-txns-nonfinal", false, "non-final transaction");
         }

From 02c243580295a7f1c0298fcd9afc2e76b607e724 Mon Sep 17 00:00:00 2001
From: BtcDrak <btcdrak@gmail.com>
Date: Tue, 16 Feb 2016 16:37:43 +0000
Subject: [PATCH 0025/1802] Soft fork logic for BIP68

---
 src/main.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index 857bf218ba799..f74cb30574ce3 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -2262,9 +2262,11 @@ bool ConnectBlock(const CBlock& block, CValidationState& state, CBlockIndex* pin
         flags |= SCRIPT_VERIFY_CHECKLOCKTIMEVERIFY;
     }
 
-    // Start enforcing CHECKSEQUENCEVERIFY using versionbits logic.
+    // Start enforcing BIP68 (sequence locks) and BIP112 (CHECKSEQUENCEVERIFY) using versionbits logic.
+    int nLockTimeFlags = 0;
     if (VersionBitsState(pindex->pprev, chainparams.GetConsensus(), Consensus::DEPLOYMENT_CSV, versionbitscache) == THRESHOLD_ACTIVE) {
         flags |= SCRIPT_VERIFY_CHECKSEQUENCEVERIFY;
+        nLockTimeFlags |= LOCKTIME_VERIFY_SEQUENCE;
     }
 
     int64_t nTime2 = GetTimeMicros(); nTimeForks += nTime2 - nTime1;
@@ -2275,7 +2277,6 @@ bool ConnectBlock(const CBlock& block, CValidationState& state, CBlockIndex* pin
     CCheckQueueControl<CScriptCheck> control(fScriptChecks && nScriptCheckThreads ? &scriptcheckqueue : NULL);
 
     std::vector<int> prevheights;
-    int nLockTimeFlags = 0;
     CAmount nFees = 0;
     int nInputs = 0;
     unsigned int nSigOps = 0;

From 12c89c918534f8e615e80381b692d89d6b09d174 Mon Sep 17 00:00:00 2001
From: BtcDrak <btcdrak@gmail.com>
Date: Fri, 19 Feb 2016 19:52:31 +0000
Subject: [PATCH 0026/1802] Policy: allow transaction version 2 relay policy.

This commit introduces a way to gracefully bump the default
transaction version in a two step process.
---
 src/policy/policy.cpp        | 2 +-
 src/primitives/transaction.h | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/policy/policy.cpp b/src/policy/policy.cpp
index 332abc430e116..e3ed7be0008ee 100644
--- a/src/policy/policy.cpp
+++ b/src/policy/policy.cpp
@@ -55,7 +55,7 @@ bool IsStandard(const CScript& scriptPubKey, txnouttype& whichType)
 
 bool IsStandardTx(const CTransaction& tx, std::string& reason)
 {
-    if (tx.nVersion > CTransaction::CURRENT_VERSION || tx.nVersion < 1) {
+    if (tx.nVersion > CTransaction::MAX_STANDARD_VERSION || tx.nVersion < 1) {
         reason = "version";
         return false;
     }
diff --git a/src/primitives/transaction.h b/src/primitives/transaction.h
index 07ae39e0b444f..9f7d6f394390b 100644
--- a/src/primitives/transaction.h
+++ b/src/primitives/transaction.h
@@ -206,8 +206,15 @@ class CTransaction
     void UpdateHash() const;
 
 public:
+    // Default transaction version.
     static const int32_t CURRENT_VERSION=1;
 
+    // Changing the default transaction version requires a two step process: first
+    // adapting relay policy by bumping MAX_STANDARD_VERSION, and then later date
+    // bumping the default CURRENT_VERSION at which point both CURRENT_VERSION and
+    // MAX_STANDARD_VERSION will be equal.
+    static const int32_t MAX_STANDARD_VERSION=2;
+
     // The local variables are made const to prevent unintended modification
     // without updating the cached hash value. However, CTransaction is not
     // actually immutable; deserialization and assignment are implemented,

From 19d73d540c8de4a73b5b2a05bebd762e74890a20 Mon Sep 17 00:00:00 2001
From: Alex Morcos <morcos@chaincode.com>
Date: Thu, 10 Mar 2016 18:36:55 -0500
Subject: [PATCH 0027/1802] Add RPC test for BIP 68/112/113 soft fork.

This RPC test will test both the activation mechanism of the first versionbits soft fork as well as testing many code branches of the consensus logic for BIP's 68, 112, and 113.
---
 qa/pull-tester/rpc-tests.py       |   1 +
 qa/rpc-tests/bip68-112-113-p2p.py | 547 ++++++++++++++++++++++++++++++
 2 files changed, 548 insertions(+)
 create mode 100755 qa/rpc-tests/bip68-112-113-p2p.py

diff --git a/qa/pull-tester/rpc-tests.py b/qa/pull-tester/rpc-tests.py
index f15eaacbdaed8..cbc10abd215e0 100755
--- a/qa/pull-tester/rpc-tests.py
+++ b/qa/pull-tester/rpc-tests.py
@@ -83,6 +83,7 @@
 
 #Tests
 testScripts = [
+    'bip68-112-113-p2p.py',
     'wallet.py',
     'listtransactions.py',
     'receivedby.py',
diff --git a/qa/rpc-tests/bip68-112-113-p2p.py b/qa/rpc-tests/bip68-112-113-p2p.py
new file mode 100755
index 0000000000000..c226f4dad4976
--- /dev/null
+++ b/qa/rpc-tests/bip68-112-113-p2p.py
@@ -0,0 +1,547 @@
+#!/usr/bin/env python2
+# Copyright (c) 2015 The Bitcoin Core developers
+# Distributed under the MIT/X11 software license, see the accompanying
+# file COPYING or http://www.opensource.org/licenses/mit-license.php.
+#
+
+from test_framework.test_framework import ComparisonTestFramework
+from test_framework.util import *
+from test_framework.mininode import ToHex, CTransaction, NetworkThread
+from test_framework.blocktools import create_coinbase, create_block
+from test_framework.comptool import TestInstance, TestManager
+from test_framework.script import *
+from binascii import unhexlify
+import cStringIO
+import time
+
+'''
+This test is meant to exercise activation of the first version bits soft fork
+This soft fork will activate the following BIPS:
+BIP 68  - nSequence relative lock times
+BIP 112 - CHECKSEQUENCEVERIFY
+BIP 113 - MedianTimePast semantics for nLockTime
+
+regtest lock-in with 108/144 block signalling
+activation after a further 144 blocks
+
+mine 82 blocks whose coinbases will be used to generate inputs for our tests
+mine 61 blocks to transition from DEFINED to STARTED
+mine 144 blocks only 100 of which are signaling readiness in order to fail to change state this period
+mine 144 blocks with 108 signaling and verify STARTED->LOCKED_IN
+mine 140 blocks and seed block chain with the 82 inputs will use for our tests at height 572
+mine 3 blocks and verify still at LOCKED_IN and test that enforcement has not triggered
+mine 1 block and test that enforcement has triggered (which triggers ACTIVE)
+Test BIP 113 is enforced
+Mine 4 blocks so next height is 580 and test BIP 68 is enforced for time and height
+Mine 1 block so next height is 581 and test BIP 68 now passes time but not height
+Mine 1 block so next height is 582 and test BIP 68 now passes time and height
+Test that BIP 112 is enforced
+
+Various transactions will be used to test that the BIPs rules are not enforced before the soft fork activates
+And that after the soft fork activates transactions pass and fail as they should according to the rules.
+For each BIP, transactions of versions 1 and 2 will be tested.
+----------------
+BIP 113:
+bip113tx - modify the nLocktime variable
+
+BIP 68:
+bip68txs - 16 txs with nSequence relative locktime of 10 with various bits set as per the relative_locktimes below
+
+BIP 112:
+bip112txs_vary_nSequence - 16 txs with nSequence relative_locktimes of 10 evaluated against 10 OP_CSV OP_DROP
+bip112txs_vary_nSequence_9 - 16 txs with nSequence relative_locktimes of 9 evaluated against 10 OP_CSV OP_DROP
+bip112txs_vary_OP_CSV - 16 txs with nSequence = 10 evaluated against varying {relative_locktimes of 10} OP_CSV OP_DROP
+bip112txs_vary_OP_CSV_9 - 16 txs with nSequence = 9 evaluated against varying {relative_locktimes of 10} OP_CSV OP_DROP
+bip112tx_special - test negative argument to OP_CSV
+'''
+
+base_relative_locktime = 10
+seq_disable_flag = 1<<31
+seq_random_high_bit = 1<<25
+seq_type_flag = 1<<22
+seq_random_low_bit = 1<<18
+
+# b31,b25,b22,b18 represent the 31st, 25th, 22nd and 18th bits respectively in the nSequence field
+# relative_locktimes[b31][b25][b22][b18] is a base_relative_locktime with the indicated bits set if their indices are 1
+relative_locktimes = []
+for b31 in xrange(2):
+    b25times = []
+    for b25 in xrange(2):
+        b22times = []
+        for b22 in xrange(2):
+            b18times = []
+            for b18 in xrange(2):
+                rlt = base_relative_locktime
+                if (b31):
+                    rlt = rlt | seq_disable_flag
+                if (b25):
+                    rlt = rlt | seq_random_high_bit
+                if (b22):
+                    rlt = rlt | seq_type_flag
+                if (b18):
+                    rlt = rlt | seq_random_low_bit
+                b18times.append(rlt)
+            b22times.append(b18times)
+        b25times.append(b22times)
+    relative_locktimes.append(b25times)
+
+def all_rlt_txs(txarray):
+    txs = []
+    for b31 in xrange(2):
+        for b25 in xrange(2):
+            for b22 in xrange(2):
+                for b18 in xrange(2):
+                    txs.append(txarray[b31][b25][b22][b18])
+    return txs
+
+class BIP68_112_113Test(ComparisonTestFramework):
+    def __init__(self):
+        self.num_nodes = 1
+
+    def setup_network(self):
+        # Must set the blockversion for this test
+        self.nodes = start_nodes(1, self.options.tmpdir,
+                                 extra_args=[['-debug', '-whitelist=127.0.0.1', '-blockversion=4']],
+                                 binary=[self.options.testbinary])
+
+    def run_test(self):
+        test = TestManager(self, self.options.tmpdir)
+        test.add_all_connections(self.nodes)
+        NetworkThread().start() # Start up network handling in another thread
+        test.run()
+
+    def send_generic_input_tx(self, node, coinbases):
+        amount = Decimal("49.99")
+        return node.sendrawtransaction(ToHex(self.sign_transaction(node, self.create_transaction(node, node.getblock(coinbases.pop())['tx'][0], self.nodeaddress, amount))))
+
+    def create_transaction(self, node, txid, to_address, amount):
+        inputs = [{ "txid" : txid, "vout" : 0}]
+        outputs = { to_address : amount }
+        rawtx = node.createrawtransaction(inputs, outputs)
+        tx = CTransaction()
+        f = cStringIO.StringIO(unhexlify(rawtx))
+        tx.deserialize(f)
+        return tx
+
+    def sign_transaction(self, node, unsignedtx):
+        rawtx = ToHex(unsignedtx)
+        signresult = node.signrawtransaction(rawtx)
+        tx = CTransaction()
+        f = cStringIO.StringIO(unhexlify(signresult['hex']))
+        tx.deserialize(f)
+        return tx
+
+    def generate_blocks(self, number, version, test_blocks = []):
+        for i in xrange(number):
+            block = self.create_test_block([], version)
+            test_blocks.append([block, True])
+            self.last_block_time += 600
+            self.tip = block.sha256
+            self.tipheight += 1
+        return test_blocks
+
+    def create_test_block(self, txs, version = 536870912):
+        block = create_block(self.tip, create_coinbase(self.tipheight + 1), self.last_block_time + 600)
+        block.nVersion = version
+        block.vtx.extend(txs)
+        block.hashMerkleRoot = block.calc_merkle_root()
+        block.rehash()
+        block.solve()
+        return block
+
+    def get_bip9_status(self, key):
+        info = self.nodes[0].getblockchaininfo()
+        for row in info['bip9_softforks']:
+            if row['id'] == key:
+                return row
+        raise IndexError ('key:"%s" not found' % key)
+
+    def create_bip68txs(self, bip68inputs, txversion, locktime_delta = 0):
+        txs = []
+        assert(len(bip68inputs) >= 16)
+        i = 0
+        for b31 in xrange(2):
+            b25txs = []
+            for b25 in xrange(2):
+                b22txs = []
+                for b22 in xrange(2):
+                    b18txs = []
+                    for b18 in xrange(2):
+                        tx =  self.create_transaction(self.nodes[0], bip68inputs[i], self.nodeaddress, Decimal("49.98"))
+                        i += 1
+                        tx.nVersion = txversion
+                        tx.vin[0].nSequence = relative_locktimes[b31][b25][b22][b18] + locktime_delta
+                        b18txs.append(self.sign_transaction(self.nodes[0], tx))
+                    b22txs.append(b18txs)
+                b25txs.append(b22txs)
+            txs.append(b25txs)
+        return txs
+
+    def create_bip112special(self, input, txversion):
+        tx = self.create_transaction(self.nodes[0], input, self.nodeaddress, Decimal("49.98"))
+        tx.nVersion = txversion
+        signtx = self.sign_transaction(self.nodes[0], tx)
+        signtx.vin[0].scriptSig = CScript([-1, OP_NOP3, OP_DROP] + list(CScript(signtx.vin[0].scriptSig)))
+        return signtx
+
+    def create_bip112txs(self, bip112inputs, varyOP_CSV, txversion, locktime_delta = 0):
+        txs = []
+        assert(len(bip112inputs) >= 16)
+        i = 0
+        for b31 in xrange(2):
+            b25txs = []
+            for b25 in xrange(2):
+                b22txs = []
+                for b22 in xrange(2):
+                    b18txs = []
+                    for b18 in xrange(2):
+                        tx =  self.create_transaction(self.nodes[0], bip112inputs[i], self.nodeaddress, Decimal("49.98"))
+                        i += 1
+                        if (varyOP_CSV): # if varying OP_CSV, nSequence is fixed
+                            tx.vin[0].nSequence = base_relative_locktime + locktime_delta
+                        else: # vary nSequence instead, OP_CSV is fixed
+                            tx.vin[0].nSequence = relative_locktimes[b31][b25][b22][b18] + locktime_delta
+                        tx.nVersion = txversion
+                        signtx = self.sign_transaction(self.nodes[0], tx)
+                        if (varyOP_CSV):
+                            signtx.vin[0].scriptSig = CScript([relative_locktimes[b31][b25][b22][b18], OP_NOP3, OP_DROP] + list(CScript(signtx.vin[0].scriptSig)))
+                        else:
+                            signtx.vin[0].scriptSig = CScript([base_relative_locktime, OP_NOP3, OP_DROP] + list(CScript(signtx.vin[0].scriptSig)))
+                        b18txs.append(signtx)
+                    b22txs.append(b18txs)
+                b25txs.append(b22txs)
+            txs.append(b25txs)
+        return txs
+
+    def get_tests(self):
+        long_past_time = int(time.time()) - 600 * 1000 # enough to build up to 1000 blocks 10 minutes apart without worrying about getting into the future
+        self.nodes[0].setmocktime(long_past_time - 100) # enough so that the generated blocks will still all be before long_past_time
+        self.coinbase_blocks = self.nodes[0].generate(1 + 16 + 2*32 + 1) # 82 blocks generated for inputs
+        self.nodes[0].setmocktime(0) # set time back to present so yielded blocks aren't in the future as we advance last_block_time
+        self.tipheight = 82 # height of the next block to build
+        self.last_block_time = long_past_time
+        self.tip = int ("0x" + self.nodes[0].getbestblockhash() + "L", 0)
+        self.nodeaddress = self.nodes[0].getnewaddress()
+
+        assert_equal(self.get_bip9_status('csv')['status'], 'defined')
+        test_blocks = self.generate_blocks(61, 4)
+        yield TestInstance(test_blocks, sync_every_block=False) # 1
+        # Advanced from DEFINED to STARTED, height = 143
+        assert_equal(self.get_bip9_status('csv')['status'], 'started')
+
+        # Fail to achieve LOCKED_IN 100 out of 144 signal bit 0
+        # using a variety of bits to simulate multiple parallel softforks
+        test_blocks = self.generate_blocks(50, 536870913) # 0x20000001 (signalling ready)
+        test_blocks = self.generate_blocks(20, 4, test_blocks) # 0x00000004 (signalling not)
+        test_blocks = self.generate_blocks(50, 536871169, test_blocks) # 0x20000101 (signalling ready)
+        test_blocks = self.generate_blocks(24, 536936448, test_blocks) # 0x20010000 (signalling not)
+        yield TestInstance(test_blocks, sync_every_block=False) # 2
+        # Failed to advance past STARTED, height = 287
+        assert_equal(self.get_bip9_status('csv')['status'], 'started')
+
+        # 108 out of 144 signal bit 0 to achieve lock-in
+        # using a variety of bits to simulate multiple parallel softforks
+        test_blocks = self.generate_blocks(58, 536870913) # 0x20000001 (signalling ready)
+        test_blocks = self.generate_blocks(26, 4, test_blocks) # 0x00000004 (signalling not)
+        test_blocks = self.generate_blocks(50, 536871169, test_blocks) # 0x20000101 (signalling ready)
+        test_blocks = self.generate_blocks(10, 536936448, test_blocks) # 0x20010000 (signalling not)
+        yield TestInstance(test_blocks, sync_every_block=False) # 3
+        # Advanced from STARTED to LOCKED_IN, height = 431
+        assert_equal(self.get_bip9_status('csv')['status'], 'locked_in')
+
+        # 140 more version 4 blocks
+        test_blocks = self.generate_blocks(140, 4)
+        yield TestInstance(test_blocks, sync_every_block=False) # 4
+
+        ### Inputs at height = 572
+        # Put inputs for all tests in the chain at height 572 (tip now = 571) (time increases by 600s per block)
+        # Note we reuse inputs for v1 and v2 txs so must test these separately
+        # 16 normal inputs
+        bip68inputs = []
+        for i in xrange(16):
+            bip68inputs.append(self.send_generic_input_tx(self.nodes[0], self.coinbase_blocks))
+        # 2 sets of 16 inputs with 10 OP_CSV OP_DROP (actually will be prepended to spending scriptSig)
+        bip112basicinputs = []
+        for j in xrange(2):
+            inputs = []
+            for i in xrange(16):
+                inputs.append(self.send_generic_input_tx(self.nodes[0], self.coinbase_blocks))
+            bip112basicinputs.append(inputs)
+        # 2 sets of 16 varied inputs with (relative_lock_time) OP_CSV OP_DROP (actually will be prepended to spending scriptSig)
+        bip112diverseinputs = []
+        for j in xrange(2):
+            inputs = []
+            for i in xrange(16):
+                inputs.append(self.send_generic_input_tx(self.nodes[0], self.coinbase_blocks))
+            bip112diverseinputs.append(inputs)
+        # 1 special input with -1 OP_CSV OP_DROP (actually will be prepended to spending scriptSig)
+        bip112specialinput = self.send_generic_input_tx(self.nodes[0], self.coinbase_blocks)
+        # 1 normal input
+        bip113input = self.send_generic_input_tx(self.nodes[0], self.coinbase_blocks)
+
+        self.nodes[0].setmocktime(self.last_block_time + 600)
+        inputblockhash = self.nodes[0].generate(1)[0] # 1 block generated for inputs to be in chain at height 572
+        self.nodes[0].setmocktime(0)
+        self.tip = int("0x" + inputblockhash + "L", 0)
+        self.tipheight += 1
+        self.last_block_time += 600
+        assert_equal(len(self.nodes[0].getblock(inputblockhash,True)["tx"]), 82+1)
+
+        # 2 more version 4 blocks
+        test_blocks = self.generate_blocks(2, 4)
+        yield TestInstance(test_blocks, sync_every_block=False) # 5
+        # Not yet advanced to ACTIVE, height = 574 (will activate for block 576, not 575)
+        assert_equal(self.get_bip9_status('csv')['status'], 'locked_in')
+
+        # Test both version 1 and version 2 transactions for all tests
+        # BIP113 test transaction will be modified before each use to put in appropriate block time
+        bip113tx_v1 = self.create_transaction(self.nodes[0], bip113input, self.nodeaddress, Decimal("49.98"))
+        bip113tx_v1.vin[0].nSequence = 0xFFFFFFFE
+        bip113tx_v2 = self.create_transaction(self.nodes[0], bip113input, self.nodeaddress, Decimal("49.98"))
+        bip113tx_v2.vin[0].nSequence = 0xFFFFFFFE
+        bip113tx_v2.nVersion = 2
+
+        # For BIP68 test all 16 relative sequence locktimes
+        bip68txs_v1 = self.create_bip68txs(bip68inputs, 1)
+        bip68txs_v2 = self.create_bip68txs(bip68inputs, 2)
+
+        # For BIP112 test:
+        # 16 relative sequence locktimes of 10 against 10 OP_CSV OP_DROP inputs
+        bip112txs_vary_nSequence_v1 = self.create_bip112txs(bip112basicinputs[0], False, 1)
+        bip112txs_vary_nSequence_v2 = self.create_bip112txs(bip112basicinputs[0], False, 2)
+        # 16 relative sequence locktimes of 9 against 10 OP_CSV OP_DROP inputs
+        bip112txs_vary_nSequence_9_v1 = self.create_bip112txs(bip112basicinputs[1], False, 1, -1)
+        bip112txs_vary_nSequence_9_v2 = self.create_bip112txs(bip112basicinputs[1], False, 2, -1)
+        # sequence lock time of 10 against 16 (relative_lock_time) OP_CSV OP_DROP inputs
+        bip112txs_vary_OP_CSV_v1 = self.create_bip112txs(bip112diverseinputs[0], True, 1)
+        bip112txs_vary_OP_CSV_v2 = self.create_bip112txs(bip112diverseinputs[0], True, 2)
+        # sequence lock time of 9 against 16 (relative_lock_time) OP_CSV OP_DROP inputs
+        bip112txs_vary_OP_CSV_9_v1 = self.create_bip112txs(bip112diverseinputs[1], True, 1, -1)
+        bip112txs_vary_OP_CSV_9_v2 = self.create_bip112txs(bip112diverseinputs[1], True, 2, -1)
+        # -1 OP_CSV OP_DROP input
+        bip112tx_special_v1 = self.create_bip112special(bip112specialinput, 1)
+        bip112tx_special_v2 = self.create_bip112special(bip112specialinput, 2)
+
+
+        ### TESTING ###
+        ##################################
+        ### Before Soft Forks Activate ###
+        ##################################
+        # All txs should pass
+        ### Version 1 txs ###
+        success_txs = []
+        # add BIP113 tx and -1 CSV tx
+        bip113tx_v1.nLockTime = self.last_block_time - 600 * 5 # = MTP of prior block (not <) but < time put on current block
+        bip113signed1 = self.sign_transaction(self.nodes[0], bip113tx_v1)
+        success_txs.append(bip113signed1)
+        success_txs.append(bip112tx_special_v1)
+        # add BIP 68 txs
+        success_txs.extend(all_rlt_txs(bip68txs_v1))
+        # add BIP 112 with seq=10 txs
+        success_txs.extend(all_rlt_txs(bip112txs_vary_nSequence_v1))
+        success_txs.extend(all_rlt_txs(bip112txs_vary_OP_CSV_v1))
+        # try BIP 112 with seq=9 txs
+        success_txs.extend(all_rlt_txs(bip112txs_vary_nSequence_9_v1))
+        success_txs.extend(all_rlt_txs(bip112txs_vary_OP_CSV_9_v1))
+        yield TestInstance([[self.create_test_block(success_txs), True]]) # 6
+        self.nodes[0].invalidateblock(self.nodes[0].getbestblockhash())
+
+        ### Version 2 txs ###
+        success_txs = []
+        # add BIP113 tx and -1 CSV tx
+        bip113tx_v2.nLockTime = self.last_block_time - 600 * 5 # = MTP of prior block (not <) but < time put on current block
+        bip113signed2 = self.sign_transaction(self.nodes[0], bip113tx_v2)
+        success_txs.append(bip113signed2)
+        success_txs.append(bip112tx_special_v2)
+        # add BIP 68 txs
+        success_txs.extend(all_rlt_txs(bip68txs_v2))
+        # add BIP 112 with seq=10 txs
+        success_txs.extend(all_rlt_txs(bip112txs_vary_nSequence_v2))
+        success_txs.extend(all_rlt_txs(bip112txs_vary_OP_CSV_v2))
+        # try BIP 112 with seq=9 txs
+        success_txs.extend(all_rlt_txs(bip112txs_vary_nSequence_9_v2))
+        success_txs.extend(all_rlt_txs(bip112txs_vary_OP_CSV_9_v2))
+        yield TestInstance([[self.create_test_block(success_txs), True]]) # 7
+        self.nodes[0].invalidateblock(self.nodes[0].getbestblockhash())
+
+
+        # 1 more version 4 block to get us to height 575 so the fork should now be active for the next block
+        test_blocks = self.generate_blocks(1, 4)
+        yield TestInstance(test_blocks, sync_every_block=False) # 8
+        assert_equal(self.get_bip9_status('csv')['status'], 'active')
+
+
+        #################################
+        ### After Soft Forks Activate ###
+        #################################
+        ### BIP 113 ###
+        # BIP 113 tests should now fail regardless of version number if nLockTime isn't satisfied by new rules
+        bip113tx_v1.nLockTime = self.last_block_time - 600 * 5 # = MTP of prior block (not <) but < time put on current block
+        bip113signed1 = self.sign_transaction(self.nodes[0], bip113tx_v1)
+        bip113tx_v2.nLockTime = self.last_block_time - 600 * 5 # = MTP of prior block (not <) but < time put on current block
+        bip113signed2 = self.sign_transaction(self.nodes[0], bip113tx_v2)
+        for bip113tx in [bip113signed1, bip113signed2]:
+            yield TestInstance([[self.create_test_block([bip113tx]), False]]) # 9,10
+        # BIP 113 tests should now pass if the locktime is < MTP
+        bip113tx_v1.nLockTime = self.last_block_time - 600 * 5 - 1 # = MTP of prior block (not <) but < time put on current block
+        bip113signed1 = self.sign_transaction(self.nodes[0], bip113tx_v1)
+        bip113tx_v2.nLockTime = self.last_block_time - 600 * 5 - 1 # = MTP of prior block (not <) but < time put on current block
+        bip113signed2 = self.sign_transaction(self.nodes[0], bip113tx_v2)
+        for bip113tx in [bip113signed1, bip113signed2]:
+            yield TestInstance([[self.create_test_block([bip113tx]), True]]) # 11,12
+            self.nodes[0].invalidateblock(self.nodes[0].getbestblockhash())
+
+        # Next block height = 580 after 4 blocks of random version
+        test_blocks = self.generate_blocks(4, 1234)
+        yield TestInstance(test_blocks, sync_every_block=False) # 13
+
+        ### BIP 68 ###
+        ### Version 1 txs ###
+        # All still pass
+        success_txs = []
+        success_txs.extend(all_rlt_txs(bip68txs_v1))
+        yield TestInstance([[self.create_test_block(success_txs), True]]) # 14
+        self.nodes[0].invalidateblock(self.nodes[0].getbestblockhash())
+
+        ### Version 2 txs ###
+        bip68success_txs = []
+        # All txs with SEQUENCE_LOCKTIME_DISABLE_FLAG set pass
+        for b25 in xrange(2):
+            for b22 in xrange(2):
+                for b18 in xrange(2):
+                    bip68success_txs.append(bip68txs_v2[1][b25][b22][b18])
+        yield TestInstance([[self.create_test_block(bip68success_txs), True]]) # 15
+        self.nodes[0].invalidateblock(self.nodes[0].getbestblockhash())
+        # All txs without flag fail as we are at delta height = 8 < 10 and delta time = 8 * 600 < 10 * 512
+        bip68timetxs = []
+        for b25 in xrange(2):
+            for b18 in xrange(2):
+                bip68timetxs.append(bip68txs_v2[0][b25][1][b18])
+        for tx in bip68timetxs:
+            yield TestInstance([[self.create_test_block([tx]), False]]) # 16 - 19
+        bip68heighttxs = []
+        for b25 in xrange(2):
+            for b18 in xrange(2):
+                bip68heighttxs.append(bip68txs_v2[0][b25][0][b18])
+        for tx in bip68heighttxs:
+            yield TestInstance([[self.create_test_block([tx]), False]]) # 20 - 23
+
+        # Advance one block to 581
+        test_blocks = self.generate_blocks(1, 1234)
+        yield TestInstance(test_blocks, sync_every_block=False) # 24
+
+        # Height txs should fail and time txs should now pass 9 * 600 > 10 * 512
+        bip68success_txs.extend(bip68timetxs)
+        yield TestInstance([[self.create_test_block(bip68success_txs), True]]) # 25
+        self.nodes[0].invalidateblock(self.nodes[0].getbestblockhash())
+        for tx in bip68heighttxs:
+            yield TestInstance([[self.create_test_block([tx]), False]]) # 26 - 29
+
+        # Advance one block to 582
+        test_blocks = self.generate_blocks(1, 1234)
+        yield TestInstance(test_blocks, sync_every_block=False) # 30
+
+        # All BIP 68 txs should pass
+        bip68success_txs.extend(bip68heighttxs)
+        yield TestInstance([[self.create_test_block(bip68success_txs), True]]) # 31
+        self.nodes[0].invalidateblock(self.nodes[0].getbestblockhash())
+
+
+        ### BIP 112 ###
+        ### Version 1 txs ###
+        # -1 OP_CSV tx should fail
+        yield TestInstance([[self.create_test_block([bip112tx_special_v1]), False]]) #32
+        # If SEQUENCE_LOCKTIME_DISABLE_FLAG is set in argument to OP_CSV, version 1 txs should still pass
+        success_txs = []
+        for b25 in xrange(2):
+            for b22 in xrange(2):
+                for b18 in xrange(2):
+                    success_txs.append(bip112txs_vary_OP_CSV_v1[1][b25][b22][b18])
+                    success_txs.append(bip112txs_vary_OP_CSV_9_v1[1][b25][b22][b18])
+        yield TestInstance([[self.create_test_block(success_txs), True]]) # 33
+        self.nodes[0].invalidateblock(self.nodes[0].getbestblockhash())
+
+        # If SEQUENCE_LOCKTIME_DISABLE_FLAG is unset in argument to OP_CSV, version 1 txs should now fail
+        fail_txs = []
+        fail_txs.extend(all_rlt_txs(bip112txs_vary_nSequence_v1))
+        fail_txs.extend(all_rlt_txs(bip112txs_vary_nSequence_9_v1))
+        for b25 in xrange(2):
+            for b22 in xrange(2):
+                for b18 in xrange(2):
+                    fail_txs.append(bip112txs_vary_OP_CSV_v1[0][b25][b22][b18])
+                    fail_txs.append(bip112txs_vary_OP_CSV_9_v1[0][b25][b22][b18])
+
+        for tx in fail_txs:
+            yield TestInstance([[self.create_test_block([tx]), False]]) # 34 - 81
+
+        ### Version 2 txs ###
+        # -1 OP_CSV tx should fail
+        yield TestInstance([[self.create_test_block([bip112tx_special_v2]), False]]) #82
+
+        # If SEQUENCE_LOCKTIME_DISABLE_FLAG is set in argument to OP_CSV, version 2 txs should pass (all sequence locks are met)
+        success_txs = []
+        for b25 in xrange(2):
+            for b22 in xrange(2):
+                for b18 in xrange(2):
+                    success_txs.append(bip112txs_vary_OP_CSV_v2[1][b25][b22][b18]) # 8/16 of vary_OP_CSV
+                    success_txs.append(bip112txs_vary_OP_CSV_9_v2[1][b25][b22][b18]) # 8/16 of vary_OP_CSV_9
+
+        yield TestInstance([[self.create_test_block(success_txs), True]]) # 83
+        self.nodes[0].invalidateblock(self.nodes[0].getbestblockhash())
+
+        ## SEQUENCE_LOCKTIME_DISABLE_FLAG is unset in argument to OP_CSV for all remaining txs ##
+        # All txs with nSequence 11 should fail either due to earlier mismatch or failing the CSV check
+        fail_txs = []
+        fail_txs.extend(all_rlt_txs(bip112txs_vary_nSequence_9_v2)) # 16/16 of vary_nSequence_9
+        for b25 in xrange(2):
+            for b22 in xrange(2):
+                for b18 in xrange(2):
+                    fail_txs.append(bip112txs_vary_OP_CSV_9_v2[0][b25][b22][b18]) # 16/16 of vary_OP_CSV_9
+
+        for tx in fail_txs:
+            yield TestInstance([[self.create_test_block([tx]), False]]) # 84 - 107
+
+        # If SEQUENCE_LOCKTIME_DISABLE_FLAG is set in nSequence, tx should fail
+        fail_txs = []
+        for b25 in xrange(2):
+            for b22 in xrange(2):
+                for b18 in xrange(2):
+                    fail_txs.append(bip112txs_vary_nSequence_v2[1][b25][b22][b18]) # 8/16 of vary_nSequence
+        for tx in fail_txs:
+            yield TestInstance([[self.create_test_block([tx]), False]]) # 108-115
+
+        # If sequencelock types mismatch, tx should fail
+        fail_txs = []
+        for b25 in xrange(2):
+            for b18 in xrange(2):
+                fail_txs.append(bip112txs_vary_nSequence_v2[0][b25][1][b18]) # 12/16 of vary_nSequence
+                fail_txs.append(bip112txs_vary_OP_CSV_v2[0][b25][1][b18]) # 12/16 of vary_OP_CSV
+        for tx in fail_txs:
+            yield TestInstance([[self.create_test_block([tx]), False]]) # 116-123
+
+        # Remaining txs should pass, just test masking works properly
+        success_txs = []
+        for b25 in xrange(2):
+            for b18 in xrange(2):
+                success_txs.append(bip112txs_vary_nSequence_v2[0][b25][0][b18]) # 16/16 of vary_nSequence
+                success_txs.append(bip112txs_vary_OP_CSV_v2[0][b25][0][b18]) # 16/16 of vary_OP_CSV
+        yield TestInstance([[self.create_test_block(success_txs), True]]) # 124
+        self.nodes[0].invalidateblock(self.nodes[0].getbestblockhash())
+
+        # Additional test, of checking that comparison of two time types works properly
+        time_txs = []
+        for b25 in xrange(2):
+            for b18 in xrange(2):
+                tx = bip112txs_vary_OP_CSV_v2[0][b25][1][b18]
+                tx.vin[0].nSequence = base_relative_locktime | seq_type_flag
+                signtx = self.sign_transaction(self.nodes[0], tx)
+                time_txs.append(signtx)
+        yield TestInstance([[self.create_test_block(time_txs), True]]) # 125
+        self.nodes[0].invalidateblock(self.nodes[0].getbestblockhash())
+
+        ### Missing aspects of test
+        ##  Testing empty stack fails
+
+
+if __name__ == '__main__':
+    BIP68_112_113Test().main()

From 68d4282774d6a60c609301cddad0b652f16df4d9 Mon Sep 17 00:00:00 2001
From: Alex Morcos <morcos@chaincode.com>
Date: Thu, 17 Mar 2016 12:48:05 -0400
Subject: [PATCH 0028/1802] Fix calculation of balances and available coins.

No longer consider coins which aren't in our mempool.

Add test for regression in abandonconflict.py
---
 qa/rpc-tests/abandonconflict.py | 6 ++++++
 src/wallet/wallet.cpp           | 9 +++++++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/qa/rpc-tests/abandonconflict.py b/qa/rpc-tests/abandonconflict.py
index 38028df07902c..a83aa97fcd806 100755
--- a/qa/rpc-tests/abandonconflict.py
+++ b/qa/rpc-tests/abandonconflict.py
@@ -83,6 +83,12 @@ def run_test(self):
         # inputs are still spent, but change not received
         newbalance = self.nodes[0].getbalance()
         assert(newbalance == balance - Decimal("24.9996"))
+        # Unconfirmed received funds that are not in mempool, also shouldn't show
+        # up in unconfirmed balance
+        unconfbalance = self.nodes[0].getunconfirmedbalance() + self.nodes[0].getbalance()
+        assert(unconfbalance == newbalance)
+        # Also shouldn't show up in listunspent
+        assert(not txABC2 in [utxo["txid"] for utxo in self.nodes[0].listunspent(0)])
         balance = newbalance
 
         # Abandon original transaction and verify inputs are available again
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index 1ef055e5521c0..f1e61c710f288 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -1578,7 +1578,7 @@ CAmount CWallet::GetUnconfirmedBalance() const
         for (map<uint256, CWalletTx>::const_iterator it = mapWallet.begin(); it != mapWallet.end(); ++it)
         {
             const CWalletTx* pcoin = &(*it).second;
-            if (!CheckFinalTx(*pcoin) || (!pcoin->IsTrusted() && pcoin->GetDepthInMainChain() == 0))
+            if (!pcoin->IsTrusted() && pcoin->GetDepthInMainChain() == 0 && pcoin->InMempool())
                 nTotal += pcoin->GetAvailableCredit();
         }
     }
@@ -1623,7 +1623,7 @@ CAmount CWallet::GetUnconfirmedWatchOnlyBalance() const
         for (map<uint256, CWalletTx>::const_iterator it = mapWallet.begin(); it != mapWallet.end(); ++it)
         {
             const CWalletTx* pcoin = &(*it).second;
-            if (!CheckFinalTx(*pcoin) || (!pcoin->IsTrusted() && pcoin->GetDepthInMainChain() == 0))
+            if (!pcoin->IsTrusted() && pcoin->GetDepthInMainChain() == 0 && pcoin->InMempool())
                 nTotal += pcoin->GetAvailableWatchOnlyCredit();
         }
     }
@@ -1668,6 +1668,11 @@ void CWallet::AvailableCoins(vector<COutput>& vCoins, bool fOnlyConfirmed, const
             if (nDepth < 0)
                 continue;
 
+            // We should not consider coins which aren't at least in our mempool
+            // It's possible for these to be conflicted via ancestors which we may never be able to detect
+            if (nDepth == 0 && !pcoin->InMempool())
+                continue;
+
             for (unsigned int i = 0; i < pcoin->vout.size(); i++) {
                 isminetype mine = IsMine(pcoin->vout[i]);
                 if (!(IsSpent(wtxid, i)) && mine != ISMINE_NO &&

From bbb9d1d1231099122a5b0ad5dd86f3f93ce22724 Mon Sep 17 00:00:00 2001
From: BtcDrak <btcdrak@gmail.com>
Date: Mon, 7 Mar 2016 19:44:09 +0000
Subject: [PATCH 0029/1802] Remove p2p alert handling

---
 src/Makefile.am              |   2 -
 src/Makefile.test.include    |   2 +-
 src/alert.cpp                | 266 --------------------------------
 src/alert.h                  | 113 --------------
 src/main.cpp                 |  62 --------
 src/qt/clientmodel.cpp       |   1 -
 src/test/alert_tests.cpp     | 289 +++++++----------------------------
 src/test/data/alertTests.raw | Bin 1279 -> 0 bytes
 8 files changed, 57 insertions(+), 678 deletions(-)
 delete mode 100644 src/alert.cpp
 delete mode 100644 src/alert.h
 delete mode 100644 src/test/data/alertTests.raw

diff --git a/src/Makefile.am b/src/Makefile.am
index 7765ea43edc1a..6ad7aabae0ef6 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -87,7 +87,6 @@ endif
 # bitcoin core #
 BITCOIN_CORE_H = \
   addrman.h \
-  alert.h \
   base58.h \
   bloom.h \
   chain.h \
@@ -176,7 +175,6 @@ libbitcoin_server_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(MINIUPNPC_CP
 libbitcoin_server_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
 libbitcoin_server_a_SOURCES = \
   addrman.cpp \
-  alert.cpp \
   bloom.cpp \
   chain.cpp \
   checkpoints.cpp \
diff --git a/src/Makefile.test.include b/src/Makefile.test.include
index 57f9ac50e0a01..7e7bf8abeb76b 100644
--- a/src/Makefile.test.include
+++ b/src/Makefile.test.include
@@ -29,7 +29,7 @@ JSON_TEST_FILES = \
   test/data/tx_valid.json \
   test/data/sighash.json
 
-RAW_TEST_FILES = test/data/alertTests.raw
+RAW_TEST_FILES =
 
 GENERATED_TEST_FILES = $(JSON_TEST_FILES:.json=.json.h) $(RAW_TEST_FILES:.raw=.raw.h)
 
diff --git a/src/alert.cpp b/src/alert.cpp
deleted file mode 100644
index eb1cd5e7f6ebe..0000000000000
--- a/src/alert.cpp
+++ /dev/null
@@ -1,266 +0,0 @@
-// Copyright (c) 2010 Satoshi Nakamoto
-// Copyright (c) 2009-2015 The Bitcoin Core developers
-// Distributed under the MIT software license, see the accompanying
-// file COPYING or http://www.opensource.org/licenses/mit-license.php.
-
-#include "alert.h"
-
-#include "clientversion.h"
-#include "net.h"
-#include "pubkey.h"
-#include "timedata.h"
-#include "ui_interface.h"
-#include "util.h"
-#include "utilstrencodings.h"
-
-#include <stdint.h>
-#include <algorithm>
-#include <map>
-
-#include <boost/algorithm/string/classification.hpp>
-#include <boost/algorithm/string/replace.hpp>
-#include <boost/foreach.hpp>
-#include <boost/thread.hpp>
-
-using namespace std;
-
-map<uint256, CAlert> mapAlerts;
-CCriticalSection cs_mapAlerts;
-
-void CUnsignedAlert::SetNull()
-{
-    nVersion = 1;
-    nRelayUntil = 0;
-    nExpiration = 0;
-    nID = 0;
-    nCancel = 0;
-    setCancel.clear();
-    nMinVer = 0;
-    nMaxVer = 0;
-    setSubVer.clear();
-    nPriority = 0;
-
-    strComment.clear();
-    strStatusBar.clear();
-    strReserved.clear();
-}
-
-std::string CUnsignedAlert::ToString() const
-{
-    std::string strSetCancel;
-    BOOST_FOREACH(int n, setCancel)
-        strSetCancel += strprintf("%d ", n);
-    std::string strSetSubVer;
-    BOOST_FOREACH(const std::string& str, setSubVer)
-        strSetSubVer += "\"" + str + "\" ";
-    return strprintf(
-        "CAlert(\n"
-        "    nVersion     = %d\n"
-        "    nRelayUntil  = %d\n"
-        "    nExpiration  = %d\n"
-        "    nID          = %d\n"
-        "    nCancel      = %d\n"
-        "    setCancel    = %s\n"
-        "    nMinVer      = %d\n"
-        "    nMaxVer      = %d\n"
-        "    setSubVer    = %s\n"
-        "    nPriority    = %d\n"
-        "    strComment   = \"%s\"\n"
-        "    strStatusBar = \"%s\"\n"
-        ")\n",
-        nVersion,
-        nRelayUntil,
-        nExpiration,
-        nID,
-        nCancel,
-        strSetCancel,
-        nMinVer,
-        nMaxVer,
-        strSetSubVer,
-        nPriority,
-        strComment,
-        strStatusBar);
-}
-
-void CAlert::SetNull()
-{
-    CUnsignedAlert::SetNull();
-    vchMsg.clear();
-    vchSig.clear();
-}
-
-bool CAlert::IsNull() const
-{
-    return (nExpiration == 0);
-}
-
-uint256 CAlert::GetHash() const
-{
-    return Hash(this->vchMsg.begin(), this->vchMsg.end());
-}
-
-bool CAlert::IsInEffect() const
-{
-    return (GetAdjustedTime() < nExpiration);
-}
-
-bool CAlert::Cancels(const CAlert& alert) const
-{
-    if (!IsInEffect())
-        return false; // this was a no-op before 31403
-    return (alert.nID <= nCancel || setCancel.count(alert.nID));
-}
-
-bool CAlert::AppliesTo(int nVersion, const std::string& strSubVerIn) const
-{
-    // TODO: rework for client-version-embedded-in-strSubVer ?
-    return (IsInEffect() &&
-            nMinVer <= nVersion && nVersion <= nMaxVer &&
-            (setSubVer.empty() || setSubVer.count(strSubVerIn)));
-}
-
-bool CAlert::AppliesToMe() const
-{
-    return AppliesTo(PROTOCOL_VERSION, FormatSubVersion(CLIENT_NAME, CLIENT_VERSION, std::vector<std::string>()));
-}
-
-bool CAlert::RelayTo(CNode* pnode) const
-{
-    if (!IsInEffect())
-        return false;
-    // don't relay to nodes which haven't sent their version message
-    if (pnode->nVersion == 0)
-        return false;
-    // returns true if wasn't already contained in the set
-    if (pnode->setKnown.insert(GetHash()).second)
-    {
-        if (AppliesTo(pnode->nVersion, pnode->strSubVer) ||
-            AppliesToMe() ||
-            GetAdjustedTime() < nRelayUntil)
-        {
-            pnode->PushMessage(NetMsgType::ALERT, *this);
-            return true;
-        }
-    }
-    return false;
-}
-
-bool CAlert::CheckSignature(const std::vector<unsigned char>& alertKey) const
-{
-    CPubKey key(alertKey);
-    if (!key.Verify(Hash(vchMsg.begin(), vchMsg.end()), vchSig))
-        return error("CAlert::CheckSignature(): verify signature failed");
-
-    // Now unserialize the data
-    CDataStream sMsg(vchMsg, SER_NETWORK, PROTOCOL_VERSION);
-    sMsg >> *(CUnsignedAlert*)this;
-    return true;
-}
-
-CAlert CAlert::getAlertByHash(const uint256 &hash)
-{
-    CAlert retval;
-    {
-        LOCK(cs_mapAlerts);
-        map<uint256, CAlert>::iterator mi = mapAlerts.find(hash);
-        if(mi != mapAlerts.end())
-            retval = mi->second;
-    }
-    return retval;
-}
-
-bool CAlert::ProcessAlert(const std::vector<unsigned char>& alertKey, bool fThread)
-{
-    if (!CheckSignature(alertKey))
-        return false;
-    if (!IsInEffect())
-        return false;
-
-    // alert.nID=max is reserved for if the alert key is
-    // compromised. It must have a pre-defined message,
-    // must never expire, must apply to all versions,
-    // and must cancel all previous
-    // alerts or it will be ignored (so an attacker can't
-    // send an "everything is OK, don't panic" version that
-    // cannot be overridden):
-    int maxInt = std::numeric_limits<int>::max();
-    if (nID == maxInt)
-    {
-        if (!(
-                nExpiration == maxInt &&
-                nCancel == (maxInt-1) &&
-                nMinVer == 0 &&
-                nMaxVer == maxInt &&
-                setSubVer.empty() &&
-                nPriority == maxInt &&
-                strStatusBar == "URGENT: Alert key compromised, upgrade required"
-                ))
-            return false;
-    }
-
-    {
-        LOCK(cs_mapAlerts);
-        // Cancel previous alerts
-        for (map<uint256, CAlert>::iterator mi = mapAlerts.begin(); mi != mapAlerts.end();)
-        {
-            const CAlert& alert = (*mi).second;
-            if (Cancels(alert))
-            {
-                LogPrint("alert", "cancelling alert %d\n", alert.nID);
-                uiInterface.NotifyAlertChanged((*mi).first, CT_DELETED);
-                mapAlerts.erase(mi++);
-            }
-            else if (!alert.IsInEffect())
-            {
-                LogPrint("alert", "expiring alert %d\n", alert.nID);
-                uiInterface.NotifyAlertChanged((*mi).first, CT_DELETED);
-                mapAlerts.erase(mi++);
-            }
-            else
-                mi++;
-        }
-
-        // Check if this alert has been cancelled
-        BOOST_FOREACH(PAIRTYPE(const uint256, CAlert)& item, mapAlerts)
-        {
-            const CAlert& alert = item.second;
-            if (alert.Cancels(*this))
-            {
-                LogPrint("alert", "alert already cancelled by %d\n", alert.nID);
-                return false;
-            }
-        }
-
-        // Add to mapAlerts
-        mapAlerts.insert(make_pair(GetHash(), *this));
-        // Notify UI and -alertnotify if it applies to me
-        if(AppliesToMe())
-        {
-            uiInterface.NotifyAlertChanged(GetHash(), CT_NEW);
-            Notify(strStatusBar, fThread);
-        }
-    }
-
-    LogPrint("alert", "accepted alert %d, AppliesToMe()=%d\n", nID, AppliesToMe());
-    return true;
-}
-
-void
-CAlert::Notify(const std::string& strMessage, bool fThread)
-{
-    std::string strCmd = GetArg("-alertnotify", "");
-    if (strCmd.empty()) return;
-
-    // Alert text should be plain ascii coming from a trusted source, but to
-    // be safe we first strip anything not in safeChars, then add single quotes around
-    // the whole string before passing it to the shell:
-    std::string singleQuote("'");
-    std::string safeStatus = SanitizeString(strMessage);
-    safeStatus = singleQuote+safeStatus+singleQuote;
-    boost::replace_all(strCmd, "%s", safeStatus);
-
-    if (fThread)
-        boost::thread t(runCommand, strCmd); // thread runs free
-    else
-        runCommand(strCmd);
-}
diff --git a/src/alert.h b/src/alert.h
deleted file mode 100644
index 8cb86e338c5d2..0000000000000
--- a/src/alert.h
+++ /dev/null
@@ -1,113 +0,0 @@
-// Copyright (c) 2010 Satoshi Nakamoto
-// Copyright (c) 2009-2015 The Bitcoin Core developers
-// Distributed under the MIT software license, see the accompanying
-// file COPYING or http://www.opensource.org/licenses/mit-license.php.
-
-#ifndef BITCOIN_ALERT_H
-#define BITCOIN_ALERT_H
-
-#include "serialize.h"
-#include "sync.h"
-
-#include <map>
-#include <set>
-#include <stdint.h>
-#include <string>
-
-class CAlert;
-class CNode;
-class uint256;
-
-extern std::map<uint256, CAlert> mapAlerts;
-extern CCriticalSection cs_mapAlerts;
-
-/** Alerts are for notifying old versions if they become too obsolete and
- * need to upgrade.  The message is displayed in the status bar.
- * Alert messages are broadcast as a vector of signed data.  Unserializing may
- * not read the entire buffer if the alert is for a newer version, but older
- * versions can still relay the original data.
- */
-class CUnsignedAlert
-{
-public:
-    int nVersion;
-    int64_t nRelayUntil;      // when newer nodes stop relaying to newer nodes
-    int64_t nExpiration;
-    int nID;
-    int nCancel;
-    std::set<int> setCancel;
-    int nMinVer;            // lowest version inclusive
-    int nMaxVer;            // highest version inclusive
-    std::set<std::string> setSubVer;  // empty matches all
-    int nPriority;
-
-    // Actions
-    std::string strComment;
-    std::string strStatusBar;
-    std::string strReserved;
-
-    ADD_SERIALIZE_METHODS;
-
-    template <typename Stream, typename Operation>
-    inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) {
-        READWRITE(this->nVersion);
-        nVersion = this->nVersion;
-        READWRITE(nRelayUntil);
-        READWRITE(nExpiration);
-        READWRITE(nID);
-        READWRITE(nCancel);
-        READWRITE(setCancel);
-        READWRITE(nMinVer);
-        READWRITE(nMaxVer);
-        READWRITE(setSubVer);
-        READWRITE(nPriority);
-
-        READWRITE(LIMITED_STRING(strComment, 65536));
-        READWRITE(LIMITED_STRING(strStatusBar, 256));
-        READWRITE(LIMITED_STRING(strReserved, 256));
-    }
-
-    void SetNull();
-
-    std::string ToString() const;
-};
-
-/** An alert is a combination of a serialized CUnsignedAlert and a signature. */
-class CAlert : public CUnsignedAlert
-{
-public:
-    std::vector<unsigned char> vchMsg;
-    std::vector<unsigned char> vchSig;
-
-    CAlert()
-    {
-        SetNull();
-    }
-
-    ADD_SERIALIZE_METHODS;
-
-    template <typename Stream, typename Operation>
-    inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) {
-        READWRITE(vchMsg);
-        READWRITE(vchSig);
-    }
-
-    void SetNull();
-    bool IsNull() const;
-    uint256 GetHash() const;
-    bool IsInEffect() const;
-    bool Cancels(const CAlert& alert) const;
-    bool AppliesTo(int nVersion, const std::string& strSubVerIn) const;
-    bool AppliesToMe() const;
-    bool RelayTo(CNode* pnode) const;
-    bool CheckSignature(const std::vector<unsigned char>& alertKey) const;
-    bool ProcessAlert(const std::vector<unsigned char>& alertKey, bool fThread = true); // fThread means run -alertnotify in a free-running thread
-    static void Notify(const std::string& strMessage, bool fThread);
-
-    /*
-     * Get copy of (active) alert object by hash. Returns a null alert if it is not found.
-     */
-    static CAlert getAlertByHash(const uint256 &hash);
-};
-
-#endif // BITCOIN_ALERT_H
diff --git a/src/main.cpp b/src/main.cpp
index 1bc88326b6fc7..d5fb047aa0d11 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -6,7 +6,6 @@
 #include "main.h"
 
 #include "addrman.h"
-#include "alert.h"
 #include "arith_uint256.h"
 #include "chainparams.h"
 #include "checkpoints.h"
@@ -4213,14 +4212,8 @@ void static CheckBlockIndex(const Consensus::Params& consensusParams)
     assert(nNodes == forward.size());
 }
 
-//////////////////////////////////////////////////////////////////////////////
-//
-// CAlert
-//
-
 std::string GetWarnings(const std::string& strFor)
 {
-    int nPriority = 0;
     string strStatusBar;
     string strRPC;
     string strGUI;
@@ -4236,37 +4229,20 @@ std::string GetWarnings(const std::string& strFor)
     // Misc warnings like out of disk space and clock is wrong
     if (strMiscWarning != "")
     {
-        nPriority = 1000;
         strStatusBar = strGUI = strMiscWarning;
     }
 
     if (fLargeWorkForkFound)
     {
-        nPriority = 2000;
         strStatusBar = strRPC = "Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.";
         strGUI = _("Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.");
     }
     else if (fLargeWorkInvalidChainFound)
     {
-        nPriority = 2000;
         strStatusBar = strRPC = "Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.";
         strGUI = _("Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.");
     }
 
-    // Alerts
-    {
-        LOCK(cs_mapAlerts);
-        BOOST_FOREACH(PAIRTYPE(const uint256, CAlert)& item, mapAlerts)
-        {
-            const CAlert& alert = item.second;
-            if (alert.AppliesToMe() && alert.nPriority > nPriority)
-            {
-                nPriority = alert.nPriority;
-                strStatusBar = strGUI = alert.strStatusBar;
-            }
-        }
-    }
-
     if (strFor == "gui")
         return strGUI;
     else if (strFor == "statusbar")
@@ -4588,13 +4564,6 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
             }
         }
 
-        // Relay alerts
-        {
-            LOCK(cs_mapAlerts);
-            BOOST_FOREACH(PAIRTYPE(const uint256, CAlert)& item, mapAlerts)
-                item.second.RelayTo(pfrom);
-        }
-
         pfrom->fSuccessfullyConnected = true;
 
         string remoteAddr;
@@ -5302,37 +5271,6 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
     }
 
 
-    else if (fAlerts && strCommand == NetMsgType::ALERT)
-    {
-        CAlert alert;
-        vRecv >> alert;
-
-        uint256 alertHash = alert.GetHash();
-        if (pfrom->setKnown.count(alertHash) == 0)
-        {
-            if (alert.ProcessAlert(chainparams.AlertKey()))
-            {
-                // Relay
-                pfrom->setKnown.insert(alertHash);
-                {
-                    LOCK(cs_vNodes);
-                    BOOST_FOREACH(CNode* pnode, vNodes)
-                        alert.RelayTo(pnode);
-                }
-            }
-            else {
-                // Small DoS penalty so peers that send us lots of
-                // duplicate/expired/invalid-signature/whatever alerts
-                // eventually get banned.
-                // This isn't a Misbehaving(100) (immediate ban) because the
-                // peer might be an older or different implementation with
-                // a different signature key, etc.
-                Misbehaving(pfrom->GetId(), 10);
-            }
-        }
-    }
-
-
     else if (strCommand == NetMsgType::FILTERLOAD)
     {
         CBloomFilter filter;
diff --git a/src/qt/clientmodel.cpp b/src/qt/clientmodel.cpp
index fb502b3c81acc..71a12c27fd350 100644
--- a/src/qt/clientmodel.cpp
+++ b/src/qt/clientmodel.cpp
@@ -8,7 +8,6 @@
 #include "guiconstants.h"
 #include "peertablemodel.h"
 
-#include "alert.h"
 #include "chainparams.h"
 #include "checkpoints.h"
 #include "clientversion.h"
diff --git a/src/test/alert_tests.cpp b/src/test/alert_tests.cpp
index 87d35be41299d..ed3cce2de43bb 100644
--- a/src/test/alert_tests.cpp
+++ b/src/test/alert_tests.cpp
@@ -4,253 +4,76 @@
 
 // Unit tests for alert system
 
-#include "alert.h"
-#include "chain.h"
 #include "chainparams.h"
-#include "clientversion.h"
-#include "data/alertTests.raw.h"
 #include "main.h" // For PartitionCheck
-#include "serialize.h"
-#include "streams.h"
-#include "utilstrencodings.h"
 
 #include "test/testutil.h"
 #include "test/test_bitcoin.h"
 
-#include <fstream>
-
-#include <boost/filesystem/operations.hpp>
-#include <boost/foreach.hpp>
 #include <boost/test/unit_test.hpp>
 
-#if 0
-//
-// alertTests contains 7 alerts, generated with this code:
-// (SignAndSave code not shown, alert signing key is secret)
-//
-{
-    CAlert alert;
-    alert.nRelayUntil   = 60;
-    alert.nExpiration   = 24 * 60 * 60;
-    alert.nID           = 1;
-    alert.nCancel       = 0;   // cancels previous messages up to this ID number
-    alert.nMinVer       = 0;  // These versions are protocol versions
-    alert.nMaxVer       = 999001;
-    alert.nPriority     = 1;
-    alert.strComment    = "Alert comment";
-    alert.strStatusBar  = "Alert 1";
-
-    SignAndSave(alert, "test/alertTests");
-
-    alert.setSubVer.insert(std::string("/Satoshi:0.1.0/"));
-    alert.strStatusBar  = "Alert 1 for Satoshi 0.1.0";
-    SignAndSave(alert, "test/alertTests");
-
-    alert.setSubVer.insert(std::string("/Satoshi:0.2.0/"));
-    alert.strStatusBar  = "Alert 1 for Satoshi 0.1.0, 0.2.0";
-    SignAndSave(alert, "test/alertTests");
-
-    alert.setSubVer.clear();
-    ++alert.nID;
-    alert.nCancel = 1;
-    alert.nPriority = 100;
-    alert.strStatusBar  = "Alert 2, cancels 1";
-    SignAndSave(alert, "test/alertTests");
-
-    alert.nExpiration += 60;
-    ++alert.nID;
-    SignAndSave(alert, "test/alertTests");
-
-    ++alert.nID;
-    alert.nMinVer = 11;
-    alert.nMaxVer = 22;
-    SignAndSave(alert, "test/alertTests");
-
-    ++alert.nID;
-    alert.strStatusBar  = "Alert 2 for Satoshi 0.1.0";
-    alert.setSubVer.insert(std::string("/Satoshi:0.1.0/"));
-    SignAndSave(alert, "test/alertTests");
-
-    ++alert.nID;
-    alert.nMinVer = 0;
-    alert.nMaxVer = 999999;
-    alert.strStatusBar  = "Evil Alert'; /bin/ls; echo '";
-    alert.setSubVer.clear();
-    SignAndSave(alert, "test/alertTests");
-}
-#endif
-
-struct ReadAlerts : public TestingSetup
-{
-    ReadAlerts()
-    {
-        std::vector<unsigned char> vch(alert_tests::alertTests, alert_tests::alertTests + sizeof(alert_tests::alertTests));
-        CDataStream stream(vch, SER_DISK, CLIENT_VERSION);
-        try {
-            while (!stream.eof())
-            {
-                CAlert alert;
-                stream >> alert;
-                alerts.push_back(alert);
-            }
-        }
-        catch (const std::exception&) { }
-    }
-    ~ReadAlerts() { }
-
-    static std::vector<std::string> read_lines(boost::filesystem::path filepath)
-    {
-        std::vector<std::string> result;
-
-        std::ifstream f(filepath.string().c_str());
-        std::string line;
-        while (std::getline(f,line))
-            result.push_back(line);
-
-        return result;
-    }
-
-    std::vector<CAlert> alerts;
-};
-
-BOOST_FIXTURE_TEST_SUITE(Alert_tests, ReadAlerts)
-
-
-BOOST_AUTO_TEST_CASE(AlertApplies)
-{
-    SetMockTime(11);
-    const std::vector<unsigned char>& alertKey = Params(CBaseChainParams::MAIN).AlertKey();
-
-    BOOST_FOREACH(const CAlert& alert, alerts)
-    {
-        BOOST_CHECK(alert.CheckSignature(alertKey));
-    }
-
-    BOOST_CHECK(alerts.size() >= 3);
-
-    // Matches:
-    BOOST_CHECK(alerts[0].AppliesTo(1, ""));
-    BOOST_CHECK(alerts[0].AppliesTo(999001, ""));
-    BOOST_CHECK(alerts[0].AppliesTo(1, "/Satoshi:11.11.11/"));
+BOOST_FIXTURE_TEST_SUITE(Alert_tests, TestingSetup)
 
-    BOOST_CHECK(alerts[1].AppliesTo(1, "/Satoshi:0.1.0/"));
-    BOOST_CHECK(alerts[1].AppliesTo(999001, "/Satoshi:0.1.0/"));
-
-    BOOST_CHECK(alerts[2].AppliesTo(1, "/Satoshi:0.1.0/"));
-    BOOST_CHECK(alerts[2].AppliesTo(1, "/Satoshi:0.2.0/"));
-
-    // Don't match:
-    BOOST_CHECK(!alerts[0].AppliesTo(-1, ""));
-    BOOST_CHECK(!alerts[0].AppliesTo(999002, ""));
-
-    BOOST_CHECK(!alerts[1].AppliesTo(1, ""));
-    BOOST_CHECK(!alerts[1].AppliesTo(1, "Satoshi:0.1.0"));
-    BOOST_CHECK(!alerts[1].AppliesTo(1, "/Satoshi:0.1.0"));
-    BOOST_CHECK(!alerts[1].AppliesTo(1, "Satoshi:0.1.0/"));
-    BOOST_CHECK(!alerts[1].AppliesTo(-1, "/Satoshi:0.1.0/"));
-    BOOST_CHECK(!alerts[1].AppliesTo(999002, "/Satoshi:0.1.0/"));
-    BOOST_CHECK(!alerts[1].AppliesTo(1, "/Satoshi:0.2.0/"));
-
-    BOOST_CHECK(!alerts[2].AppliesTo(1, "/Satoshi:0.3.0/"));
-
-    SetMockTime(0);
-}
-
-
-BOOST_AUTO_TEST_CASE(AlertNotify)
-{
-    SetMockTime(11);
-    const std::vector<unsigned char>& alertKey = Params(CBaseChainParams::MAIN).AlertKey();
-
-    boost::filesystem::path temp = GetTempPath() /
-        boost::filesystem::unique_path("alertnotify-%%%%.txt");
-
-    mapArgs["-alertnotify"] = std::string("echo %s >> ") + temp.string();
-
-    BOOST_FOREACH(CAlert alert, alerts)
-        alert.ProcessAlert(alertKey, false);
-
-    std::vector<std::string> r = read_lines(temp);
-    BOOST_CHECK_EQUAL(r.size(), 4u);
-
-// Windows built-in echo semantics are different than posixy shells. Quotes and
-// whitespace are printed literally.
-
-#ifndef WIN32
-    BOOST_CHECK_EQUAL(r[0], "Alert 1");
-    BOOST_CHECK_EQUAL(r[1], "Alert 2, cancels 1");
-    BOOST_CHECK_EQUAL(r[2], "Alert 2, cancels 1");
-    BOOST_CHECK_EQUAL(r[3], "Evil Alert; /bin/ls; echo "); // single-quotes should be removed
-#else
-    BOOST_CHECK_EQUAL(r[0], "'Alert 1' ");
-    BOOST_CHECK_EQUAL(r[1], "'Alert 2, cancels 1' ");
-    BOOST_CHECK_EQUAL(r[2], "'Alert 2, cancels 1' ");
-    BOOST_CHECK_EQUAL(r[3], "'Evil Alert; /bin/ls; echo ' ");
-#endif
-    boost::filesystem::remove(temp);
-
-    SetMockTime(0);
-}
 
 static bool falseFunc() { return false; }
 
 BOOST_AUTO_TEST_CASE(PartitionAlert)
-{
-    // Test PartitionCheck
-    CCriticalSection csDummy;
-    CBlockIndex indexDummy[100];
-    CChainParams& params = Params(CBaseChainParams::MAIN);
-    int64_t nPowTargetSpacing = params.GetConsensus().nPowTargetSpacing;
-
-    // Generate fake blockchain timestamps relative to
-    // an arbitrary time:
-    int64_t now = 1427379054;
-    SetMockTime(now);
-    for (int i = 0; i < 100; i++)
-    {
-        indexDummy[i].phashBlock = NULL;
-        if (i == 0) indexDummy[i].pprev = NULL;
-        else indexDummy[i].pprev = &indexDummy[i-1];
-        indexDummy[i].nHeight = i;
-        indexDummy[i].nTime = now - (100-i)*nPowTargetSpacing;
-        // Other members don't matter, the partition check code doesn't
-        // use them
-    }
-
-    strMiscWarning = "";
-
-    // Test 1: chain with blocks every nPowTargetSpacing seconds,
-    // as normal, no worries:
-    PartitionCheck(falseFunc, csDummy, &indexDummy[99], nPowTargetSpacing);
-    BOOST_CHECK_MESSAGE(strMiscWarning.empty(), strMiscWarning);
-
-    // Test 2: go 3.5 hours without a block, expect a warning:
-    now += 3*60*60+30*60;
-    SetMockTime(now);
-    PartitionCheck(falseFunc, csDummy, &indexDummy[99], nPowTargetSpacing);
-    BOOST_CHECK(!strMiscWarning.empty());
-    BOOST_TEST_MESSAGE(std::string("Got alert text: ")+strMiscWarning);
-    strMiscWarning = "";
-
-    // Test 3: test the "partition alerts only go off once per day"
-    // code:
-    now += 60*10;
-    SetMockTime(now);
-    PartitionCheck(falseFunc, csDummy, &indexDummy[99], nPowTargetSpacing);
-    BOOST_CHECK(strMiscWarning.empty());
+        {
+                // Test PartitionCheck
+                CCriticalSection csDummy;
+        CBlockIndex indexDummy[100];
+        CChainParams& params = Params(CBaseChainParams::MAIN);
+        int64_t nPowTargetSpacing = params.GetConsensus().nPowTargetSpacing;
+
+        // Generate fake blockchain timestamps relative to
+        // an arbitrary time:
+        int64_t now = 1427379054;
+        SetMockTime(now);
+        for (int i = 0; i < 100; i++)
+        {
+            indexDummy[i].phashBlock = NULL;
+            if (i == 0) indexDummy[i].pprev = NULL;
+            else indexDummy[i].pprev = &indexDummy[i-1];
+            indexDummy[i].nHeight = i;
+            indexDummy[i].nTime = now - (100-i)*nPowTargetSpacing;
+            // Other members don't matter, the partition check code doesn't
+            // use them
+        }
 
-    // Test 4: get 2.5 times as many blocks as expected:
-    now += 60*60*24; // Pretend it is a day later
-    SetMockTime(now);
-    int64_t quickSpacing = nPowTargetSpacing*2/5;
-    for (int i = 0; i < 100; i++) // Tweak chain timestamps:
+        strMiscWarning = "";
+
+        // Test 1: chain with blocks every nPowTargetSpacing seconds,
+        // as normal, no worries:
+        PartitionCheck(falseFunc, csDummy, &indexDummy[99], nPowTargetSpacing);
+        BOOST_CHECK_MESSAGE(strMiscWarning.empty(), strMiscWarning);
+
+        // Test 2: go 3.5 hours without a block, expect a warning:
+        now += 3*60*60+30*60;
+        SetMockTime(now);
+        PartitionCheck(falseFunc, csDummy, &indexDummy[99], nPowTargetSpacing);
+        BOOST_CHECK(!strMiscWarning.empty());
+        BOOST_TEST_MESSAGE(std::string("Got alert text: ")+strMiscWarning);
+        strMiscWarning = "";
+
+        // Test 3: test the "partition alerts only go off once per day"
+        // code:
+        now += 60*10;
+        SetMockTime(now);
+        PartitionCheck(falseFunc, csDummy, &indexDummy[99], nPowTargetSpacing);
+        BOOST_CHECK(strMiscWarning.empty());
+
+        // Test 4: get 2.5 times as many blocks as expected:
+        now += 60*60*24; // Pretend it is a day later
+        SetMockTime(now);
+        int64_t quickSpacing = nPowTargetSpacing*2/5;
+        for (int i = 0; i < 100; i++) // Tweak chain timestamps:
         indexDummy[i].nTime = now - (100-i)*quickSpacing;
-    PartitionCheck(falseFunc, csDummy, &indexDummy[99], nPowTargetSpacing);
-    BOOST_CHECK(!strMiscWarning.empty());
-    BOOST_TEST_MESSAGE(std::string("Got alert text: ")+strMiscWarning);
-    strMiscWarning = "";
+        PartitionCheck(falseFunc, csDummy, &indexDummy[99], nPowTargetSpacing);
+        BOOST_CHECK(!strMiscWarning.empty());
+        BOOST_TEST_MESSAGE(std::string("Got alert text: ")+strMiscWarning);
+        strMiscWarning = "";
 
-    SetMockTime(0);
-}
+        SetMockTime(0);
+        }
 
-BOOST_AUTO_TEST_SUITE_END()
+BOOST_AUTO_TEST_SUITE_END()
\ No newline at end of file
diff --git a/src/test/data/alertTests.raw b/src/test/data/alertTests.raw
deleted file mode 100644
index 01f50680b95aa307a1a013b643ded4ae0bc47162..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1279
zcmZ={WME*h0b&qn2n6vM7$78=$-oe4#}5(Vb<9aEDp5$z&&^HED`AK53>n-FT$vOZ
zT6;>jOMiNBjj`hU_HgHQ?~0yVcV6r{KVN{qoVTd1?j)0f{?x_?$@^IxUUY29f16*-
z{-FM@nZvZ(TZ|lvBLA-{pO8$HOBng}gA+^gi!(B<4D<~34D>;|P+cYob(un1evtxH
zu>x2zgPVa1lY-RE%g6XV)mGXqWBmT=!_|Y)_kR4}7A7R>c<YzTK2EP5CIw#U7^^G!
zyI#1iYmfUGcJ%^}ZN_gYj{vKGw+dcZNUh#pMU+#S(4C6RH^S<41)NUT0r~)_2jT;L
zDV6R}k%fHq6E&`O{0#K9x)vUB?aK2XPVq{5r`GK=V^T2e7is$0UUISb)}LOPX^%8l
zERssxzgVmG;&avOt_%Fke6aa|2|4P)(Vl`4xIz#Y8tEt`C*~!m<`gR!LfoWxeba3D
zC8C_JAIetRS8K6Oth0Vw$FhI#<Lic@mp83j!lYpCyvN*L-8m{@S?=d~r@kfZoRGHn
zEOWpNlQk#8QUxN_QQWi#niQGIbQ2_1wom>0E!g1h&KK=J$_^x?-%R>l_4VpRoijgP
z&DbIlds%@=!Hs|Q$%9_UR_lD=jto@ZWi)^P&3X0fwJdjAvK+dmdHF6@N3p;h#SLVL
z0Wkw{0R?f?PV@b-k5Wyi>i4_%Bo<$lHv6ySF0|S7Vr$;KnH3w}K4Ve{5mx)@H;>VG
zV)PxY<k=|#+K<1QXq>7R{(M)t&dXdm1tqJ%LW&jLQ5abT(~;1uVuU5DK-_v|qEX;l
z`;Ea8OG>`yYWv(O?P7~*yl?IK{6}Bi%Enc$ObUtn4ofyOb8$Z~I;nGod;9)Xj~<*9
zKa_r_FRL*-b5><S7;;L3xs?s(R#4d4I{^zAOt;CnmSyHZGK9Ldf__qFo_<cTwL)rg
zM!teNB+Z4N?N`dL+3RZgsMG%R&HcvL8m73{@t<wpn6&I0qtEvmCWW|s;o98L`ZMw`
bo(5^`dVZ5xb+T{GmC|zo{n}P5`Wv+YY=?}R


From 92066344fdc3eb3071cb6fc0ce6a41d79c2dda53 Mon Sep 17 00:00:00 2001
From: BtcDrak <btcdrak@gmail.com>
Date: Sun, 6 Mar 2016 10:07:25 +0000
Subject: [PATCH 0030/1802] Update alert notification and GUI

---
 src/main.cpp           | 28 ++++++++++++++++++++++++----
 src/qt/clientmodel.cpp | 26 ++++++--------------------
 src/qt/clientmodel.h   |  2 +-
 src/ui_interface.h     |  5 ++---
 4 files changed, 33 insertions(+), 28 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index d5fb047aa0d11..6c193a25e3bf2 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1565,6 +1565,26 @@ bool fLargeWorkForkFound = false;
 bool fLargeWorkInvalidChainFound = false;
 CBlockIndex *pindexBestForkTip = NULL, *pindexBestForkBase = NULL;
 
+static void AlertNotify(const std::string& strMessage, bool fThread)
+{
+    uiInterface.NotifyAlertChanged();
+    std::string strCmd = GetArg("-alertnotify", "");
+    if (strCmd.empty()) return;
+
+    // Alert text should be plain ascii coming from a trusted source, but to
+    // be safe we first strip anything not in safeChars, then add single quotes around
+    // the whole string before passing it to the shell:
+    std::string singleQuote("'");
+    std::string safeStatus = SanitizeString(strMessage);
+    safeStatus = singleQuote+safeStatus+singleQuote;
+    boost::replace_all(strCmd, "%s", safeStatus);
+
+    if (fThread)
+        boost::thread t(runCommand, strCmd); // thread runs free
+    else
+        runCommand(strCmd);
+}
+
 void CheckForkWarningConditions()
 {
     AssertLockHeld(cs_main);
@@ -1584,7 +1604,7 @@ void CheckForkWarningConditions()
         {
             std::string warning = std::string("'Warning: Large-work fork detected, forking after block ") +
                 pindexBestForkBase->phashBlock->ToString() + std::string("'");
-            CAlert::Notify(warning, true);
+            AlertNotify(warning, true);
         }
         if (pindexBestForkTip && pindexBestForkBase)
         {
@@ -2115,7 +2135,7 @@ void PartitionCheck(bool (*initialDownloadCheck)(), CCriticalSection& cs, const
     if (!strWarning.empty())
     {
         strMiscWarning = strWarning;
-        CAlert::Notify(strWarning, true);
+        AlertNotify(strWarning, true);
         lastAlertTime = now;
     }
 }
@@ -2545,7 +2565,7 @@ void static UpdateTip(CBlockIndex *pindexNew) {
                 if (state == THRESHOLD_ACTIVE) {
                     strMiscWarning = strprintf(_("Warning: unknown new rules activated (versionbit %i)"), bit);
                     if (!fWarned) {
-                        CAlert::Notify(strMiscWarning, true);
+                        AlertNotify(strMiscWarning, true);
                         fWarned = true;
                     }
                 } else {
@@ -2567,7 +2587,7 @@ void static UpdateTip(CBlockIndex *pindexNew) {
             // strMiscWarning is read by GetWarnings(), called by Qt and the JSON-RPC code to warn the user:
             strMiscWarning = _("Warning: Unknown block versions being mined! It's possible unknown rules are in effect");
             if (!fWarned) {
-                CAlert::Notify(strMiscWarning, true);
+                AlertNotify(strMiscWarning, true);
                 fWarned = true;
             }
         }
diff --git a/src/qt/clientmodel.cpp b/src/qt/clientmodel.cpp
index 71a12c27fd350..d3edfedff29b6 100644
--- a/src/qt/clientmodel.cpp
+++ b/src/qt/clientmodel.cpp
@@ -121,20 +121,8 @@ void ClientModel::updateNumConnections(int numConnections)
     Q_EMIT numConnectionsChanged(numConnections);
 }
 
-void ClientModel::updateAlert(const QString &hash, int status)
+void ClientModel::updateAlert()
 {
-    // Show error message notification for new alert
-    if(status == CT_NEW)
-    {
-        uint256 hash_256;
-        hash_256.SetHex(hash.toStdString());
-        CAlert alert = CAlert::getAlertByHash(hash_256);
-        if(!alert.IsNull())
-        {
-            Q_EMIT message(tr("Network Alert"), QString::fromStdString(alert.strStatusBar), CClientUIInterface::ICON_ERROR);
-        }
-    }
-
     Q_EMIT alertsChanged(getStatusBarWarnings());
 }
 
@@ -226,12 +214,10 @@ static void NotifyNumConnectionsChanged(ClientModel *clientmodel, int newNumConn
                               Q_ARG(int, newNumConnections));
 }
 
-static void NotifyAlertChanged(ClientModel *clientmodel, const uint256 &hash, ChangeType status)
+static void NotifyAlertChanged(ClientModel *clientmodel)
 {
-    qDebug() << "NotifyAlertChanged: " + QString::fromStdString(hash.GetHex()) + " status=" + QString::number(status);
-    QMetaObject::invokeMethod(clientmodel, "updateAlert", Qt::QueuedConnection,
-                              Q_ARG(QString, QString::fromStdString(hash.GetHex())),
-                              Q_ARG(int, status));
+    qDebug() << "NotifyAlertChanged";
+    QMetaObject::invokeMethod(clientmodel, "updateAlert", Qt::QueuedConnection);
 }
 
 static void BannedListChanged(ClientModel *clientmodel)
@@ -265,7 +251,7 @@ void ClientModel::subscribeToCoreSignals()
     // Connect signals to client
     uiInterface.ShowProgress.connect(boost::bind(ShowProgress, this, _1, _2));
     uiInterface.NotifyNumConnectionsChanged.connect(boost::bind(NotifyNumConnectionsChanged, this, _1));
-    uiInterface.NotifyAlertChanged.connect(boost::bind(NotifyAlertChanged, this, _1, _2));
+    uiInterface.NotifyAlertChanged.connect(boost::bind(NotifyAlertChanged, this));
     uiInterface.BannedListChanged.connect(boost::bind(BannedListChanged, this));
     uiInterface.NotifyBlockTip.connect(boost::bind(BlockTipChanged, this, _1, _2));
 }
@@ -275,7 +261,7 @@ void ClientModel::unsubscribeFromCoreSignals()
     // Disconnect signals from client
     uiInterface.ShowProgress.disconnect(boost::bind(ShowProgress, this, _1, _2));
     uiInterface.NotifyNumConnectionsChanged.disconnect(boost::bind(NotifyNumConnectionsChanged, this, _1));
-    uiInterface.NotifyAlertChanged.disconnect(boost::bind(NotifyAlertChanged, this, _1, _2));
+    uiInterface.NotifyAlertChanged.disconnect(boost::bind(NotifyAlertChanged, this));
     uiInterface.BannedListChanged.disconnect(boost::bind(BannedListChanged, this));
     uiInterface.NotifyBlockTip.disconnect(boost::bind(BlockTipChanged, this, _1, _2));
 }
diff --git a/src/qt/clientmodel.h b/src/qt/clientmodel.h
index 62c9f71ac7792..2fef6131c3c8e 100644
--- a/src/qt/clientmodel.h
+++ b/src/qt/clientmodel.h
@@ -103,7 +103,7 @@ class ClientModel : public QObject
 public Q_SLOTS:
     void updateTimer();
     void updateNumConnections(int numConnections);
-    void updateAlert(const QString &hash, int status);
+    void updateAlert();
     void updateBanlist();
 };
 
diff --git a/src/ui_interface.h b/src/ui_interface.h
index 967d243270965..0b51d52e6576e 100644
--- a/src/ui_interface.h
+++ b/src/ui_interface.h
@@ -83,10 +83,9 @@ class CClientUIInterface
     boost::signals2::signal<void (int newNumConnections)> NotifyNumConnectionsChanged;
 
     /**
-     * New, updated or cancelled alert.
-     * @note called with lock cs_mapAlerts held.
+     * Status bar alerts changed.
      */
-    boost::signals2::signal<void (const uint256 &hash, ChangeType status)> NotifyAlertChanged;
+    boost::signals2::signal<void ()> NotifyAlertChanged;
 
     /** A wallet has been loaded. */
     boost::signals2::signal<void (CWallet* wallet)> LoadWallet;

From 01fdfeffc4515ea43748230139a3bcee2eec3865 Mon Sep 17 00:00:00 2001
From: BtcDrak <btcdrak@gmail.com>
Date: Sun, 6 Mar 2016 11:15:20 +0000
Subject: [PATCH 0031/1802] Remove `-alerts` option

---
 src/init.cpp | 3 ---
 src/main.cpp | 1 -
 src/main.h   | 3 ---
 3 files changed, 7 deletions(-)

diff --git a/src/init.cpp b/src/init.cpp
index a39256c6e3220..b430bcd585446 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -315,7 +315,6 @@ std::string HelpMessage(HelpMessageMode mode)
     string strUsage = HelpMessageGroup(_("Options:"));
     strUsage += HelpMessageOpt("-?", _("Print this help message and exit"));
     strUsage += HelpMessageOpt("-version", _("Print version and exit"));
-    strUsage += HelpMessageOpt("-alerts", strprintf(_("Receive and display P2P network alerts (default: %u)"), DEFAULT_ALERTS));
     strUsage += HelpMessageOpt("-alertnotify=<cmd>", _("Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)"));
     strUsage += HelpMessageOpt("-blocknotify=<cmd>", _("Execute command when the best block changes (%s in cmd is replaced by block hash)"));
     if (showDebug)
@@ -1002,8 +1001,6 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
     fAcceptDatacarrier = GetBoolArg("-datacarrier", DEFAULT_ACCEPT_DATACARRIER);
     nMaxDatacarrierBytes = GetArg("-datacarriersize", nMaxDatacarrierBytes);
 
-    fAlerts = GetBoolArg("-alerts", DEFAULT_ALERTS);
-
     // Option to startup with mocktime set (used for regression testing):
     SetMockTime(GetArg("-mocktime", 0)); // SetMockTime(0) is a no-op
 
diff --git a/src/main.cpp b/src/main.cpp
index 6c193a25e3bf2..e78ce4cdf72e2 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -74,7 +74,6 @@ bool fCheckBlockIndex = false;
 bool fCheckpointsEnabled = DEFAULT_CHECKPOINTS_ENABLED;
 size_t nCoinCacheUsage = 5000 * 300;
 uint64_t nPruneTarget = 0;
-bool fAlerts = DEFAULT_ALERTS;
 int64_t nMaxTipAge = DEFAULT_MAX_TIP_AGE;
 bool fEnableReplacement = DEFAULT_ENABLE_REPLACEMENT;
 
diff --git a/src/main.h b/src/main.h
index 6936b5379ae4b..7ec48d9d0027b 100644
--- a/src/main.h
+++ b/src/main.h
@@ -42,8 +42,6 @@ class CValidationState;
 struct CNodeStateStats;
 struct LockPoints;
 
-/** Default for accepting alerts from the P2P network. */
-static const bool DEFAULT_ALERTS = true;
 /** Default for DEFAULT_WHITELISTRELAY. */
 static const bool DEFAULT_WHITELISTRELAY = true;
 /** Default for DEFAULT_WHITELISTFORCERELAY. */
@@ -155,7 +153,6 @@ extern size_t nCoinCacheUsage;
 extern CFeeRate minRelayTxFee;
 /** Absolute maximum transaction fee (in satoshis) used by wallet and mempool (rejects high fee in sendrawtransaction) */
 extern CAmount maxTxFee;
-extern bool fAlerts;
 /** If the tip is older than this (in seconds), the node is considered to be in initial block download. */
 extern int64_t nMaxTipAge;
 extern bool fEnableReplacement;

From 1b77471bd62b31b6682c5e40d2d8bf88db3034c7 Mon Sep 17 00:00:00 2001
From: BtcDrak <btcdrak@gmail.com>
Date: Sun, 6 Mar 2016 10:38:53 +0000
Subject: [PATCH 0032/1802] Remove alert keys

---
 src/chainparams.cpp | 2 --
 src/chainparams.h   | 3 ---
 2 files changed, 5 deletions(-)

diff --git a/src/chainparams.cpp b/src/chainparams.cpp
index 35e090a0b3b3e..508c4de1670bb 100644
--- a/src/chainparams.cpp
+++ b/src/chainparams.cpp
@@ -95,7 +95,6 @@ class CMainParams : public CChainParams {
         pchMessageStart[1] = 0xbe;
         pchMessageStart[2] = 0xb4;
         pchMessageStart[3] = 0xd9;
-        vAlertPubKey = ParseHex("04fc9702847840aaf195de8442ebecedf5b095cdbb9bc716bda9110971b28a49e0ead8564ff0db22209e0374782c093bb899692d524e9d6a6956e7c5ecbcd68284");
         nDefaultPort = 8333;
         nPruneAfterHeight = 100000;
 
@@ -176,7 +175,6 @@ class CTestNetParams : public CChainParams {
         pchMessageStart[1] = 0x11;
         pchMessageStart[2] = 0x09;
         pchMessageStart[3] = 0x07;
-        vAlertPubKey = ParseHex("04302390343f91cc401d56d68b123028bf52e5fca1939df127f63c6467cdf9c8e2c14b61104cf817d0b780da337893ecc4aaff1309e536162dabbdb45200ca2b0a");
         nDefaultPort = 18333;
         nPruneAfterHeight = 1000;
 
diff --git a/src/chainparams.h b/src/chainparams.h
index 88bc666765d80..59202f548a3ca 100644
--- a/src/chainparams.h
+++ b/src/chainparams.h
@@ -54,7 +54,6 @@ class CChainParams
 
     const Consensus::Params& GetConsensus() const { return consensus; }
     const CMessageHeader::MessageStartChars& MessageStart() const { return pchMessageStart; }
-    const std::vector<unsigned char>& AlertKey() const { return vAlertPubKey; }
     int GetDefaultPort() const { return nDefaultPort; }
 
     const CBlock& GenesisBlock() const { return genesis; }
@@ -80,8 +79,6 @@ class CChainParams
 
     Consensus::Params consensus;
     CMessageHeader::MessageStartChars pchMessageStart;
-    //! Raw pub key bytes for the broadcast alert signing key.
-    std::vector<unsigned char> vAlertPubKey;
     int nDefaultPort;
     uint64_t nPruneAfterHeight;
     std::vector<CDNSSeedData> vSeeds;

From ad7210408c5d2f7d13534da4f4ff1ff3afa82b3a Mon Sep 17 00:00:00 2001
From: BtcDrak <btcdrak@gmail.com>
Date: Wed, 16 Mar 2016 09:13:50 +0000
Subject: [PATCH 0033/1802] Formatting

---
 src/test/alert_tests.cpp | 110 +++++++++++++++++++--------------------
 1 file changed, 55 insertions(+), 55 deletions(-)

diff --git a/src/test/alert_tests.cpp b/src/test/alert_tests.cpp
index ed3cce2de43bb..70f1f12273a82 100644
--- a/src/test/alert_tests.cpp
+++ b/src/test/alert_tests.cpp
@@ -18,62 +18,62 @@ BOOST_FIXTURE_TEST_SUITE(Alert_tests, TestingSetup)
 static bool falseFunc() { return false; }
 
 BOOST_AUTO_TEST_CASE(PartitionAlert)
-        {
-                // Test PartitionCheck
-                CCriticalSection csDummy;
-        CBlockIndex indexDummy[100];
-        CChainParams& params = Params(CBaseChainParams::MAIN);
-        int64_t nPowTargetSpacing = params.GetConsensus().nPowTargetSpacing;
-
-        // Generate fake blockchain timestamps relative to
-        // an arbitrary time:
-        int64_t now = 1427379054;
-        SetMockTime(now);
-        for (int i = 0; i < 100; i++)
-        {
-            indexDummy[i].phashBlock = NULL;
-            if (i == 0) indexDummy[i].pprev = NULL;
-            else indexDummy[i].pprev = &indexDummy[i-1];
-            indexDummy[i].nHeight = i;
-            indexDummy[i].nTime = now - (100-i)*nPowTargetSpacing;
-            // Other members don't matter, the partition check code doesn't
-            // use them
-        }
-
-        strMiscWarning = "";
-
-        // Test 1: chain with blocks every nPowTargetSpacing seconds,
-        // as normal, no worries:
-        PartitionCheck(falseFunc, csDummy, &indexDummy[99], nPowTargetSpacing);
-        BOOST_CHECK_MESSAGE(strMiscWarning.empty(), strMiscWarning);
-
-        // Test 2: go 3.5 hours without a block, expect a warning:
-        now += 3*60*60+30*60;
-        SetMockTime(now);
-        PartitionCheck(falseFunc, csDummy, &indexDummy[99], nPowTargetSpacing);
-        BOOST_CHECK(!strMiscWarning.empty());
-        BOOST_TEST_MESSAGE(std::string("Got alert text: ")+strMiscWarning);
-        strMiscWarning = "";
-
-        // Test 3: test the "partition alerts only go off once per day"
-        // code:
-        now += 60*10;
-        SetMockTime(now);
-        PartitionCheck(falseFunc, csDummy, &indexDummy[99], nPowTargetSpacing);
-        BOOST_CHECK(strMiscWarning.empty());
-
-        // Test 4: get 2.5 times as many blocks as expected:
-        now += 60*60*24; // Pretend it is a day later
-        SetMockTime(now);
-        int64_t quickSpacing = nPowTargetSpacing*2/5;
-        for (int i = 0; i < 100; i++) // Tweak chain timestamps:
+{
+    // Test PartitionCheck
+    CCriticalSection csDummy;
+    CBlockIndex indexDummy[100];
+    CChainParams& params = Params(CBaseChainParams::MAIN);
+    int64_t nPowTargetSpacing = params.GetConsensus().nPowTargetSpacing;
+
+    // Generate fake blockchain timestamps relative to
+    // an arbitrary time:
+    int64_t now = 1427379054;
+    SetMockTime(now);
+    for (int i = 0; i < 100; i++)
+    {
+        indexDummy[i].phashBlock = NULL;
+        if (i == 0) indexDummy[i].pprev = NULL;
+        else indexDummy[i].pprev = &indexDummy[i-1];
+        indexDummy[i].nHeight = i;
+        indexDummy[i].nTime = now - (100-i)*nPowTargetSpacing;
+        // Other members don't matter, the partition check code doesn't
+        // use them
+    }
+
+    strMiscWarning = "";
+
+    // Test 1: chain with blocks every nPowTargetSpacing seconds,
+    // as normal, no worries:
+    PartitionCheck(falseFunc, csDummy, &indexDummy[99], nPowTargetSpacing);
+    BOOST_CHECK_MESSAGE(strMiscWarning.empty(), strMiscWarning);
+
+    // Test 2: go 3.5 hours without a block, expect a warning:
+    now += 3*60*60+30*60;
+    SetMockTime(now);
+    PartitionCheck(falseFunc, csDummy, &indexDummy[99], nPowTargetSpacing);
+    BOOST_CHECK(!strMiscWarning.empty());
+    BOOST_TEST_MESSAGE(std::string("Got alert text: ")+strMiscWarning);
+    strMiscWarning = "";
+
+    // Test 3: test the "partition alerts only go off once per day"
+    // code:
+    now += 60*10;
+    SetMockTime(now);
+    PartitionCheck(falseFunc, csDummy, &indexDummy[99], nPowTargetSpacing);
+    BOOST_CHECK(strMiscWarning.empty());
+
+    // Test 4: get 2.5 times as many blocks as expected:
+    now += 60*60*24; // Pretend it is a day later
+    SetMockTime(now);
+    int64_t quickSpacing = nPowTargetSpacing*2/5;
+    for (int i = 0; i < 100; i++) // Tweak chain timestamps:
         indexDummy[i].nTime = now - (100-i)*quickSpacing;
-        PartitionCheck(falseFunc, csDummy, &indexDummy[99], nPowTargetSpacing);
-        BOOST_CHECK(!strMiscWarning.empty());
-        BOOST_TEST_MESSAGE(std::string("Got alert text: ")+strMiscWarning);
-        strMiscWarning = "";
+    PartitionCheck(falseFunc, csDummy, &indexDummy[99], nPowTargetSpacing);
+    BOOST_CHECK(!strMiscWarning.empty());
+    BOOST_TEST_MESSAGE(std::string("Got alert text: ")+strMiscWarning);
+    strMiscWarning = "";
 
-        SetMockTime(0);
-        }
+    SetMockTime(0);
+}
 
 BOOST_AUTO_TEST_SUITE_END()
\ No newline at end of file

From 6601ce508eaf2d0d853f35637a946938d31e8463 Mon Sep 17 00:00:00 2001
From: Thomas Kerin <afk11@users.noreply.github.com>
Date: Fri, 18 Mar 2016 18:20:04 +0000
Subject: [PATCH 0034/1802] protocol.h/cpp: Removes NetMsgType::ALERT

---
 src/protocol.cpp | 2 --
 src/protocol.h   | 7 -------
 2 files changed, 9 deletions(-)

diff --git a/src/protocol.cpp b/src/protocol.cpp
index c1c7c0b96bf7c..1ddb65b796814 100644
--- a/src/protocol.cpp
+++ b/src/protocol.cpp
@@ -28,7 +28,6 @@ const char *GETADDR="getaddr";
 const char *MEMPOOL="mempool";
 const char *PING="ping";
 const char *PONG="pong";
-const char *ALERT="alert";
 const char *NOTFOUND="notfound";
 const char *FILTERLOAD="filterload";
 const char *FILTERADD="filteradd";
@@ -64,7 +63,6 @@ const static std::string allNetMessageTypes[] = {
     NetMsgType::MEMPOOL,
     NetMsgType::PING,
     NetMsgType::PONG,
-    NetMsgType::ALERT,
     NetMsgType::NOTFOUND,
     NetMsgType::FILTERLOAD,
     NetMsgType::FILTERADD,
diff --git a/src/protocol.h b/src/protocol.h
index c8b8d20eaddd5..5504f213f471c 100644
--- a/src/protocol.h
+++ b/src/protocol.h
@@ -163,13 +163,6 @@ extern const char *PING;
  * @see https://bitcoin.org/en/developer-reference#pong
  */
 extern const char *PONG;
-/**
- * The alert message warns nodes of problems that may affect them or the rest
- * of the network.
- * @since protocol version 311.
- * @see https://bitcoin.org/en/developer-reference#alert
- */
-extern const char *ALERT;
 /**
  * The notfound message is a reply to a getdata message which requested an
  * object the receiving node does not have available for relay.

From cfd519e942aecd763449157a4a5ed602bcddd3a1 Mon Sep 17 00:00:00 2001
From: BtcDrak <btcdrak@gmail.com>
Date: Fri, 18 Mar 2016 19:11:27 +0000
Subject: [PATCH 0035/1802] Add release note documentation

---
 doc/release-notes.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/release-notes.md b/doc/release-notes.md
index 707f2357f8c06..43e1e3fb9aabb 100644
--- a/doc/release-notes.md
+++ b/doc/release-notes.md
@@ -51,6 +51,8 @@ The following outputs are affected by this change:
 
 ### P2P protocol and network code
 
+The p2p alert system has been removed in #7692 and the 'alert' message is no longer supported.
+
 ### Validation
 
 ### Build system

From c90036f6645dea7c19e033c11240567371407017 Mon Sep 17 00:00:00 2001
From: Patrick Strateman <patrick.strateman@gmail.com>
Date: Thu, 17 Mar 2016 17:23:33 -0700
Subject: [PATCH 0036/1802] Always disconnect old nodes which request filtered
 connections.

---
 doc/bips.md  | 2 +-
 src/init.cpp | 2 --
 src/main.cpp | 2 +-
 src/main.h   | 1 -
 4 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/doc/bips.md b/doc/bips.md
index e73add0130f3f..2552a7f03af24 100644
--- a/doc/bips.md
+++ b/doc/bips.md
@@ -17,6 +17,6 @@ BIPs that are implemented by Bitcoin Core (up-to-date up to **v0.12.0**):
 * [`BIP 65`](https://github.com/bitcoin/bips/blob/master/bip-0065.mediawiki): The CHECKLOCKTIMEVERIFY softfork was merged in **v0.12.0** ([PR #6351](https://github.com/bitcoin/bitcoin/pull/6351)), and backported to **v0.11.2** and **v0.10.4**. Mempool-only CLTV was added in [PR #6124](https://github.com/bitcoin/bitcoin/pull/6124).
 * [`BIP 66`](https://github.com/bitcoin/bips/blob/master/bip-0066.mediawiki): The strict DER rules and associated version 3 blocks have been implemented since **v0.10.0** ([PR #5713](https://github.com/bitcoin/bitcoin/pull/5713)).
 * [`BIP 70`](https://github.com/bitcoin/bips/blob/master/bip-0070.mediawiki) [`71`](https://github.com/bitcoin/bips/blob/master/bip-0071.mediawiki) [`72`](https://github.com/bitcoin/bips/blob/master/bip-0072.mediawiki): Payment Protocol support has been available in Bitcoin Core GUI since **v0.9.0** ([PR #5216](https://github.com/bitcoin/bitcoin/pull/5216)).
-* [`BIP 111`](https://github.com/bitcoin/bips/blob/master/bip-0111.mediawiki): `NODE_BLOOM` service bit added, but only enforced for peer versions `>=70011` as of **v0.12.0** ([PR #6579](https://github.com/bitcoin/bitcoin/pull/6579)).
+* [`BIP 111`](https://github.com/bitcoin/bips/blob/master/bip-0111.mediawiki): `NODE_BLOOM` service bit added, and enforced for all peer versions as of **v0.13.0** ([PR #6579](https://github.com/bitcoin/bitcoin/pull/6579) and [PR #6641](https://github.com/bitcoin/bitcoin/pull/6641)).
 * [`BIP 125`](https://github.com/bitcoin/bips/blob/master/bip-0125.mediawiki): Opt-in full replace-by-fee signaling honoured in mempool and mining as of **v0.12.0** ([PR 6871](https://github.com/bitcoin/bitcoin/pull/6871)).
 * [`BIP 130`](https://github.com/bitcoin/bips/blob/master/bip-0130.mediawiki): direct headers announcement is negotiated with peer versions `>=70012` as of **v0.12.0** ([PR 6494](https://github.com/bitcoin/bitcoin/pull/6494)).
diff --git a/src/init.cpp b/src/init.cpp
index 637b69ab0571e..96bb26f6ece6c 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -369,8 +369,6 @@ std::string HelpMessage(HelpMessageMode mode)
     strUsage += HelpMessageOpt("-onlynet=<net>", _("Only connect to nodes in network <net> (ipv4, ipv6 or onion)"));
     strUsage += HelpMessageOpt("-permitbaremultisig", strprintf(_("Relay non-P2SH multisig (default: %u)"), DEFAULT_PERMIT_BAREMULTISIG));
     strUsage += HelpMessageOpt("-peerbloomfilters", strprintf(_("Support filtering of blocks and transaction with bloom filters (default: %u)"), DEFAULT_PEERBLOOMFILTERS));
-    if (showDebug)
-        strUsage += HelpMessageOpt("-enforcenodebloom", strprintf("Enforce minimum protocol version to limit use of bloom filters (default: %u)", DEFAULT_ENFORCENODEBLOOM));
     strUsage += HelpMessageOpt("-port=<port>", strprintf(_("Listen for connections on <port> (default: %u or testnet: %u)"), Params(CBaseChainParams::MAIN).GetDefaultPort(), Params(CBaseChainParams::TESTNET).GetDefaultPort()));
     strUsage += HelpMessageOpt("-proxy=<ip:port>", _("Connect through SOCKS5 proxy"));
     strUsage += HelpMessageOpt("-proxyrandomize", strprintf(_("Randomize credentials for every proxy connection. This enables Tor stream isolation (default: %u)"), DEFAULT_PROXYRANDOMIZE));
diff --git a/src/main.cpp b/src/main.cpp
index 027a36394c34d..d74c88d235e88 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -4377,7 +4377,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
         if (pfrom->nVersion >= NO_BLOOM_VERSION) {
             Misbehaving(pfrom->GetId(), 100);
             return false;
-        } else if (GetBoolArg("-enforcenodebloom", DEFAULT_ENFORCENODEBLOOM)) {
+        } else {
             pfrom->fDisconnect = true;
             return false;
         }
diff --git a/src/main.h b/src/main.h
index 5ba2be251c45b..7230d326e690e 100644
--- a/src/main.h
+++ b/src/main.h
@@ -122,7 +122,6 @@ static const bool DEFAULT_ENABLE_REPLACEMENT = true;
 static const unsigned int MAX_BLOCKS_TO_ANNOUNCE = 8;
 
 static const bool DEFAULT_PEERBLOOMFILTERS = true;
-static const bool DEFAULT_ENFORCENODEBLOOM = false;
 
 struct BlockHasher
 {

From cf5c786fc3244b6aedcc4a2f839f5248f95fafa1 Mon Sep 17 00:00:00 2001
From: fanquake <fanquake@gmail.com>
Date: Sat, 19 Mar 2016 15:24:00 +0800
Subject: [PATCH 0037/1802] [build-aux] Update Boost & check macros to latest
 serials

---
 build-aux/m4/ax_boost_base.m4            |  20 +-
 build-aux/m4/ax_boost_program_options.m4 |   7 +-
 build-aux/m4/ax_boost_system.m4          |   5 +-
 build-aux/m4/ax_check_compile_flag.m4    |  12 +-
 build-aux/m4/ax_check_link_flag.m4       |  13 +-
 build-aux/m4/ax_check_preproc_flag.m4    |  12 +-
 build-aux/m4/ax_gcc_func_attribute.m4    |   8 +-
 build-aux/m4/ax_pthread.m4               | 537 +++++++++++++++--------
 8 files changed, 395 insertions(+), 219 deletions(-)

diff --git a/build-aux/m4/ax_boost_base.m4 b/build-aux/m4/ax_boost_base.m4
index 3f24d5ddc617b..45d948933d18f 100644
--- a/build-aux/m4/ax_boost_base.m4
+++ b/build-aux/m4/ax_boost_base.m4
@@ -33,7 +33,7 @@
 #   and this notice are preserved. This file is offered as-is, without any
 #   warranty.
 
-#serial 23
+#serial 26
 
 AC_DEFUN([AX_BOOST_BASE],
 [
@@ -95,8 +95,8 @@ if test "x$want_boost" = "xyes"; then
       x86_64)
         libsubdirs="lib64 libx32 lib lib64"
         ;;
-      ppc64|s390x|sparc64|aarch64)
-        libsubdirs="lib64 lib lib64"
+      ppc64|s390x|sparc64|aarch64|ppc64le)
+        libsubdirs="lib64 lib lib64 ppc64le"
         ;;
     esac
 
@@ -170,7 +170,7 @@ if test "x$want_boost" = "xyes"; then
         AC_MSG_RESULT(yes)
     succeeded=yes
     found_system=yes
-        ],[:
+        ],[
         ])
     AC_LANG_POP([C++])
 
@@ -179,6 +179,10 @@ if test "x$want_boost" = "xyes"; then
     dnl if we found no boost with system layout we search for boost libraries
     dnl built and installed without the --layout=system option or for a staged(not installed) version
     if test "x$succeeded" != "xyes"; then
+        CPPFLAGS="$CPPFLAGS_SAVED"
+        LDFLAGS="$LDFLAGS_SAVED"
+        BOOST_CPPFLAGS=
+        BOOST_LDFLAGS=
         _version=0
         if test "$ac_boost_path" != ""; then
             if test -d "$ac_boost_path" && test -r "$ac_boost_path"; then
@@ -191,6 +195,12 @@ if test "x$want_boost" = "xyes"; then
                     VERSION_UNDERSCORE=`echo $_version | sed 's/\./_/'`
                     BOOST_CPPFLAGS="-I$ac_boost_path/include/boost-$VERSION_UNDERSCORE"
                 done
+                dnl if nothing found search for layout used in Windows distributions
+                if test -z "$BOOST_CPPFLAGS"; then
+                    if test -d "$ac_boost_path/boost" && test -r "$ac_boost_path/boost"; then
+                        BOOST_CPPFLAGS="-I$ac_boost_path"
+                    fi
+                fi
             fi
         else
             if test "$cross_compiling" != yes; then
@@ -253,7 +263,7 @@ if test "x$want_boost" = "xyes"; then
             AC_MSG_RESULT(yes)
         succeeded=yes
         found_system=yes
-            ],[:
+            ],[
             ])
         AC_LANG_POP([C++])
     fi
diff --git a/build-aux/m4/ax_boost_program_options.m4 b/build-aux/m4/ax_boost_program_options.m4
index f591441854f59..2bdb5937162e4 100644
--- a/build-aux/m4/ax_boost_program_options.m4
+++ b/build-aux/m4/ax_boost_program_options.m4
@@ -29,7 +29,7 @@
 #   and this notice are preserved. This file is offered as-is, without any
 #   warranty.
 
-#serial 22
+#serial 24
 
 AC_DEFUN([AX_BOOST_PROGRAM_OPTIONS],
 [
@@ -63,9 +63,9 @@ AC_DEFUN([AX_BOOST_PROGRAM_OPTIONS],
 		AC_CACHE_CHECK([whether the Boost::Program_Options library is available],
 					   ax_cv_boost_program_options,
 					   [AC_LANG_PUSH(C++)
-				AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[@%:@include <boost/program_options.hpp>
+				AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[@%:@include <boost/program_options/errors.hpp>
                                                           ]],
-                                  [[boost::program_options::options_description generic("Generic options");
+                                  [[boost::program_options::error err("Error message");
                                    return 0;]])],
                            ax_cv_boost_program_options=yes, ax_cv_boost_program_options=no)
 					AC_LANG_POP([C++])
@@ -74,7 +74,6 @@ AC_DEFUN([AX_BOOST_PROGRAM_OPTIONS],
 				AC_DEFINE(HAVE_BOOST_PROGRAM_OPTIONS,,[define if the Boost::PROGRAM_OPTIONS library is available])
                   BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/@<:@^\/@:>@*//'`
                 if test "x$ax_boost_user_program_options_lib" = "x"; then
-                ax_lib=
                 for libextension in `ls $BOOSTLIBDIR/libboost_program_options*.so* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib\(boost_program_options.*\)\.so.*$;\1;'` `ls $BOOSTLIBDIR/libboost_program_options*.dylib* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib\(boost_program_options.*\)\.dylib.*$;\1;'` `ls $BOOSTLIBDIR/libboost_program_options*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib\(boost_program_options.*\)\.a.*$;\1;'` ; do
                      ax_lib=${libextension}
 				    AC_CHECK_LIB($ax_lib, exit,
diff --git a/build-aux/m4/ax_boost_system.m4 b/build-aux/m4/ax_boost_system.m4
index 9c78280fcae47..1c05450cbe1d5 100644
--- a/build-aux/m4/ax_boost_system.m4
+++ b/build-aux/m4/ax_boost_system.m4
@@ -31,7 +31,7 @@
 #   and this notice are preserved. This file is offered as-is, without any
 #   warranty.
 
-#serial 17
+#serial 18
 
 AC_DEFUN([AX_BOOST_SYSTEM],
 [
@@ -68,9 +68,10 @@ AC_DEFUN([AX_BOOST_SYSTEM],
 					   ax_cv_boost_system,
         [AC_LANG_PUSH([C++])
 			 CXXFLAGS_SAVE=$CXXFLAGS
+			 CXXFLAGS=
 
 			 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[@%:@include <boost/system/error_code.hpp>]],
-                                   [[boost::system::system_category]])],
+				    [[boost::system::error_category *a = 0;]])],
                    ax_cv_boost_system=yes, ax_cv_boost_system=no)
 			 CXXFLAGS=$CXXFLAGS_SAVE
              AC_LANG_POP([C++])
diff --git a/build-aux/m4/ax_check_compile_flag.m4 b/build-aux/m4/ax_check_compile_flag.m4
index c3a8d695a1bcd..ca3639715e724 100644
--- a/build-aux/m4/ax_check_compile_flag.m4
+++ b/build-aux/m4/ax_check_compile_flag.m4
@@ -4,7 +4,7 @@
 #
 # SYNOPSIS
 #
-#   AX_CHECK_COMPILE_FLAG(FLAG, [ACTION-SUCCESS], [ACTION-FAILURE], [EXTRA-FLAGS])
+#   AX_CHECK_COMPILE_FLAG(FLAG, [ACTION-SUCCESS], [ACTION-FAILURE], [EXTRA-FLAGS], [INPUT])
 #
 # DESCRIPTION
 #
@@ -19,6 +19,8 @@
 #   the flags: "CFLAGS EXTRA-FLAGS FLAG".  This can for example be used to
 #   force the compiler to issue an error when a bad flag is given.
 #
+#   INPUT gives an alternative input source to AC_COMPILE_IFELSE.
+#
 #   NOTE: Implementation based on AX_CFLAGS_GCC_OPTION. Please keep this
 #   macro in sync with AX_CHECK_{PREPROC,LINK}_FLAG.
 #
@@ -53,19 +55,19 @@
 #   modified version of the Autoconf Macro, you may extend this special
 #   exception to the GPL to apply to your modified version as well.
 
-#serial 2
+#serial 4
 
 AC_DEFUN([AX_CHECK_COMPILE_FLAG],
-[AC_PREREQ(2.59)dnl for _AC_LANG_PREFIX
+[AC_PREREQ(2.64)dnl for _AC_LANG_PREFIX and AS_VAR_IF
 AS_VAR_PUSHDEF([CACHEVAR],[ax_cv_check_[]_AC_LANG_ABBREV[]flags_$4_$1])dnl
 AC_CACHE_CHECK([whether _AC_LANG compiler accepts $1], CACHEVAR, [
   ax_check_save_flags=$[]_AC_LANG_PREFIX[]FLAGS
   _AC_LANG_PREFIX[]FLAGS="$[]_AC_LANG_PREFIX[]FLAGS $4 $1"
-  AC_COMPILE_IFELSE([AC_LANG_PROGRAM()],
+  AC_COMPILE_IFELSE([m4_default([$5],[AC_LANG_PROGRAM()])],
     [AS_VAR_SET(CACHEVAR,[yes])],
     [AS_VAR_SET(CACHEVAR,[no])])
   _AC_LANG_PREFIX[]FLAGS=$ax_check_save_flags])
-AS_IF([test x"AS_VAR_GET(CACHEVAR)" = xyes],
+AS_VAR_IF(CACHEVAR,yes,
   [m4_default([$2], :)],
   [m4_default([$3], :)])
 AS_VAR_POPDEF([CACHEVAR])dnl
diff --git a/build-aux/m4/ax_check_link_flag.m4 b/build-aux/m4/ax_check_link_flag.m4
index e2d0d363e4c4a..eb01a6ce135ec 100644
--- a/build-aux/m4/ax_check_link_flag.m4
+++ b/build-aux/m4/ax_check_link_flag.m4
@@ -4,7 +4,7 @@
 #
 # SYNOPSIS
 #
-#   AX_CHECK_LINK_FLAG(FLAG, [ACTION-SUCCESS], [ACTION-FAILURE], [EXTRA-FLAGS])
+#   AX_CHECK_LINK_FLAG(FLAG, [ACTION-SUCCESS], [ACTION-FAILURE], [EXTRA-FLAGS], [INPUT])
 #
 # DESCRIPTION
 #
@@ -19,6 +19,8 @@
 #   EXTRA-FLAGS FLAG".  This can for example be used to force the linker to
 #   issue an error when a bad flag is given.
 #
+#   INPUT gives an alternative input source to AC_LINK_IFELSE.
+#
 #   NOTE: Implementation based on AX_CFLAGS_GCC_OPTION. Please keep this
 #   macro in sync with AX_CHECK_{PREPROC,COMPILE}_FLAG.
 #
@@ -53,18 +55,19 @@
 #   modified version of the Autoconf Macro, you may extend this special
 #   exception to the GPL to apply to your modified version as well.
 
-#serial 2
+#serial 4
 
 AC_DEFUN([AX_CHECK_LINK_FLAG],
-[AS_VAR_PUSHDEF([CACHEVAR],[ax_cv_check_ldflags_$4_$1])dnl
+[AC_PREREQ(2.64)dnl for _AC_LANG_PREFIX and AS_VAR_IF
+AS_VAR_PUSHDEF([CACHEVAR],[ax_cv_check_ldflags_$4_$1])dnl
 AC_CACHE_CHECK([whether the linker accepts $1], CACHEVAR, [
   ax_check_save_flags=$LDFLAGS
   LDFLAGS="$LDFLAGS $4 $1"
-  AC_LINK_IFELSE([AC_LANG_PROGRAM()],
+  AC_LINK_IFELSE([m4_default([$5],[AC_LANG_PROGRAM()])],
     [AS_VAR_SET(CACHEVAR,[yes])],
     [AS_VAR_SET(CACHEVAR,[no])])
   LDFLAGS=$ax_check_save_flags])
-AS_IF([test x"AS_VAR_GET(CACHEVAR)" = xyes],
+AS_VAR_IF(CACHEVAR,yes,
   [m4_default([$2], :)],
   [m4_default([$3], :)])
 AS_VAR_POPDEF([CACHEVAR])dnl
diff --git a/build-aux/m4/ax_check_preproc_flag.m4 b/build-aux/m4/ax_check_preproc_flag.m4
index b1cfef6b86dd6..ca1d5ee2b6d1a 100644
--- a/build-aux/m4/ax_check_preproc_flag.m4
+++ b/build-aux/m4/ax_check_preproc_flag.m4
@@ -4,7 +4,7 @@
 #
 # SYNOPSIS
 #
-#   AX_CHECK_PREPROC_FLAG(FLAG, [ACTION-SUCCESS], [ACTION-FAILURE], [EXTRA-FLAGS])
+#   AX_CHECK_PREPROC_FLAG(FLAG, [ACTION-SUCCESS], [ACTION-FAILURE], [EXTRA-FLAGS], [INPUT])
 #
 # DESCRIPTION
 #
@@ -19,6 +19,8 @@
 #   "CPPFLAGS EXTRA-FLAGS FLAG".  This can for example be used to force the
 #   preprocessor to issue an error when a bad flag is given.
 #
+#   INPUT gives an alternative input source to AC_PREPROC_IFELSE.
+#
 #   NOTE: Implementation based on AX_CFLAGS_GCC_OPTION. Please keep this
 #   macro in sync with AX_CHECK_{COMPILE,LINK}_FLAG.
 #
@@ -53,19 +55,19 @@
 #   modified version of the Autoconf Macro, you may extend this special
 #   exception to the GPL to apply to your modified version as well.
 
-#serial 2
+#serial 4
 
 AC_DEFUN([AX_CHECK_PREPROC_FLAG],
-[AC_PREREQ(2.59)dnl for _AC_LANG_PREFIX
+[AC_PREREQ(2.64)dnl for _AC_LANG_PREFIX and AS_VAR_IF
 AS_VAR_PUSHDEF([CACHEVAR],[ax_cv_check_[]_AC_LANG_ABBREV[]cppflags_$4_$1])dnl
 AC_CACHE_CHECK([whether _AC_LANG preprocessor accepts $1], CACHEVAR, [
   ax_check_save_flags=$CPPFLAGS
   CPPFLAGS="$CPPFLAGS $4 $1"
-  AC_PREPROC_IFELSE([AC_LANG_PROGRAM()],
+  AC_PREPROC_IFELSE([m4_default([$5],[AC_LANG_PROGRAM()])],
     [AS_VAR_SET(CACHEVAR,[yes])],
     [AS_VAR_SET(CACHEVAR,[no])])
   CPPFLAGS=$ax_check_save_flags])
-AS_IF([test x"AS_VAR_GET(CACHEVAR)" = xyes],
+AS_VAR_IF(CACHEVAR,yes,
   [m4_default([$2], :)],
   [m4_default([$3], :)])
 AS_VAR_POPDEF([CACHEVAR])dnl
diff --git a/build-aux/m4/ax_gcc_func_attribute.m4 b/build-aux/m4/ax_gcc_func_attribute.m4
index 275ca63a2c217..c788ca9bd435f 100644
--- a/build-aux/m4/ax_gcc_func_attribute.m4
+++ b/build-aux/m4/ax_gcc_func_attribute.m4
@@ -31,6 +31,7 @@
 #    cold
 #    const
 #    constructor
+#    constructor_priority for constructor attribute with priority
 #    deprecated
 #    destructor
 #    dllexport
@@ -73,7 +74,7 @@
 #   and this notice are preserved.  This file is offered as-is, without any
 #   warranty.
 
-#serial 2
+#serial 3
 
 AC_DEFUN([AX_GCC_FUNC_ATTRIBUTE], [
     AS_VAR_PUSHDEF([ac_var], [ax_cv_have_func_attribute_$1])
@@ -103,6 +104,9 @@ AC_DEFUN([AX_GCC_FUNC_ATTRIBUTE], [
                 [const], [
                     int foo( void ) __attribute__(($1));
                 ],
+                [constructor_priority], [
+                    int foo( void ) __attribute__((__constructor__(65535/2)));
+                ],
                 [constructor], [
                     int foo( void ) __attribute__(($1));
                 ],
@@ -180,6 +184,8 @@ AC_DEFUN([AX_GCC_FUNC_ATTRIBUTE], [
                 [visibility], [
                     int foo_def( void ) __attribute__(($1("default")));
                     int foo_hid( void ) __attribute__(($1("hidden")));
+                    int foo_int( void ) __attribute__(($1("internal")));
+                    int foo_pro( void ) __attribute__(($1("protected")));
                 ],
                 [warning], [
                     int foo( void ) __attribute__(($1("")));
diff --git a/build-aux/m4/ax_pthread.m4 b/build-aux/m4/ax_pthread.m4
index d383ad5c6d6a5..d218d1af73817 100644
--- a/build-aux/m4/ax_pthread.m4
+++ b/build-aux/m4/ax_pthread.m4
@@ -19,10 +19,10 @@
 #   is necessary on AIX to use the special cc_r compiler alias.)
 #
 #   NOTE: You are assumed to not only compile your program with these flags,
-#   but also link it with them as well. e.g. you should link with
+#   but also to link with them as well. For example, you might link with
 #   $PTHREAD_CC $CFLAGS $PTHREAD_CFLAGS $LDFLAGS ... $PTHREAD_LIBS $LIBS
 #
-#   If you are only building threads programs, you may wish to use these
+#   If you are only building threaded programs, you may wish to use these
 #   variables in your default LIBS, CFLAGS, and CC:
 #
 #     LIBS="$PTHREAD_LIBS $LIBS"
@@ -30,8 +30,8 @@
 #     CC="$PTHREAD_CC"
 #
 #   In addition, if the PTHREAD_CREATE_JOINABLE thread-attribute constant
-#   has a nonstandard name, defines PTHREAD_CREATE_JOINABLE to that name
-#   (e.g. PTHREAD_CREATE_UNDETACHED on AIX).
+#   has a nonstandard name, this macro defines PTHREAD_CREATE_JOINABLE to
+#   that name (e.g. PTHREAD_CREATE_UNDETACHED on AIX).
 #
 #   Also HAVE_PTHREAD_PRIO_INHERIT is defined if pthread is found and the
 #   PTHREAD_PRIO_INHERIT symbol is defined when compiling with
@@ -82,35 +82,40 @@
 #   modified version of the Autoconf Macro, you may extend this special
 #   exception to the GPL to apply to your modified version as well.
 
-#serial 21
+#serial 22
 
 AU_ALIAS([ACX_PTHREAD], [AX_PTHREAD])
 AC_DEFUN([AX_PTHREAD], [
 AC_REQUIRE([AC_CANONICAL_HOST])
+AC_REQUIRE([AC_PROG_CC])
+AC_REQUIRE([AC_PROG_SED])
 AC_LANG_PUSH([C])
 ax_pthread_ok=no
 
 # We used to check for pthread.h first, but this fails if pthread.h
-# requires special compiler flags (e.g. on True64 or Sequent).
+# requires special compiler flags (e.g. on Tru64 or Sequent).
 # It gets checked for in the link test anyway.
 
 # First of all, check if the user has set any of the PTHREAD_LIBS,
 # etcetera environment variables, and if threads linking works using
 # them:
-if test x"$PTHREAD_LIBS$PTHREAD_CFLAGS" != x; then
-        save_CFLAGS="$CFLAGS"
-        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
-        save_LIBS="$LIBS"
-        LIBS="$PTHREAD_LIBS $LIBS"
-        AC_MSG_CHECKING([for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS])
-        AC_TRY_LINK_FUNC([pthread_join], [ax_pthread_ok=yes])
-        AC_MSG_RESULT([$ax_pthread_ok])
-        if test x"$ax_pthread_ok" = xno; then
-                PTHREAD_LIBS=""
-                PTHREAD_CFLAGS=""
-        fi
-        LIBS="$save_LIBS"
-        CFLAGS="$save_CFLAGS"
+if test "x$PTHREAD_CFLAGS$PTHREAD_LIBS" != "x"; then
+	ax_pthread_save_CC="$CC"
+	ax_pthread_save_CFLAGS="$CFLAGS"
+	ax_pthread_save_LIBS="$LIBS"
+	AS_IF([test "x$PTHREAD_CC" != "x"], [CC="$PTHREAD_CC"])
+	CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+	LIBS="$PTHREAD_LIBS $LIBS"
+	AC_MSG_CHECKING([for pthread_join using $CC $PTHREAD_CFLAGS $PTHREAD_LIBS])
+	AC_LINK_IFELSE([AC_LANG_CALL([], [pthread_join])], [ax_pthread_ok=yes])
+	AC_MSG_RESULT([$ax_pthread_ok])
+	if test "x$ax_pthread_ok" = "xno"; then
+		PTHREAD_LIBS=""
+		PTHREAD_CFLAGS=""
+	fi
+	CC="$ax_pthread_save_CC"
+	CFLAGS="$ax_pthread_save_CFLAGS"
+	LIBS="$ax_pthread_save_LIBS"
 fi
 
 # We must check for the threads library under a number of different
@@ -123,7 +128,7 @@ fi
 # which indicates that we try without any flags at all, and "pthread-config"
 # which is a program returning the flags for the Pth emulation library.
 
-ax_pthread_flags="pthreads none -Kthread -kthread lthread -pthread -pthreads -mthreads pthread --thread-safe -mt pthread-config"
+ax_pthread_flags="pthreads none -Kthread -pthread -pthreads -mthreads pthread --thread-safe -mt pthread-config"
 
 # The ordering *is* (sometimes) important.  Some notes on the
 # individual items follow:
@@ -132,186 +137,334 @@ ax_pthread_flags="pthreads none -Kthread -kthread lthread -pthread -pthreads -mt
 # none: in case threads are in libc; should be tried before -Kthread and
 #       other compiler flags to prevent continual compiler warnings
 # -Kthread: Sequent (threads in libc, but -Kthread needed for pthread.h)
-# -kthread: FreeBSD kernel threads (preferred to -pthread since SMP-able)
-# lthread: LinuxThreads port on FreeBSD (also preferred to -pthread)
-# -pthread: Linux/gcc (kernel threads), BSD/gcc (userland threads)
-# -pthreads: Solaris/gcc
-# -mthreads: Mingw32/gcc, Lynx/gcc
+# -pthread: Linux/gcc (kernel threads), BSD/gcc (userland threads), Tru64
+#           (Note: HP C rejects this with "bad form for `-t' option")
+# -pthreads: Solaris/gcc (Note: HP C also rejects)
 # -mt: Sun Workshop C (may only link SunOS threads [-lthread], but it
-#      doesn't hurt to check since this sometimes defines pthreads too;
-#      also defines -D_REENTRANT)
-#      ... -mt is also the pthreads flag for HP/aCC
+#      doesn't hurt to check since this sometimes defines pthreads and
+#      -D_REENTRANT too), HP C (must be checked before -lpthread, which
+#      is present but should not be used directly; and before -mthreads,
+#      because the compiler interprets this as "-mt" + "-hreads")
+# -mthreads: Mingw32/gcc, Lynx/gcc
 # pthread: Linux, etcetera
 # --thread-safe: KAI C++
 # pthread-config: use pthread-config program (for GNU Pth library)
 
-case ${host_os} in
-        solaris*)
+case $host_os in
+
+	freebsd*)
+
+	# -kthread: FreeBSD kernel threads (preferred to -pthread since SMP-able)
+	# lthread: LinuxThreads port on FreeBSD (also preferred to -pthread)
+
+	ax_pthread_flags="-kthread lthread $ax_pthread_flags"
+	;;
+
+	hpux*)
+
+	# From the cc(1) man page: "[-mt] Sets various -D flags to enable
+	# multi-threading and also sets -lpthread."
+
+	ax_pthread_flags="-mt -pthread pthread $ax_pthread_flags"
+	;;
+
+	openedition*)
 
-        # On Solaris (at least, for some versions), libc contains stubbed
-        # (non-functional) versions of the pthreads routines, so link-based
-        # tests will erroneously succeed.  (We need to link with -pthreads/-mt/
-        # -lpthread.)  (The stubs are missing pthread_cleanup_push, or rather
-        # a function called by this macro, so we could check for that, but
-        # who knows whether they'll stub that too in a future libc.)  So,
-        # we'll just look for -pthreads and -lpthread first:
+	# IBM z/OS requires a feature-test macro to be defined in order to
+	# enable POSIX threads at all, so give the user a hint if this is
+	# not set. (We don't define these ourselves, as they can affect
+	# other portions of the system API in unpredictable ways.)
 
-        ax_pthread_flags="-pthreads pthread -mt -pthread $ax_pthread_flags"
-        ;;
+	AC_EGREP_CPP([AX_PTHREAD_ZOS_MISSING],
+	    [
+#	     if !defined(_OPEN_THREADS) && !defined(_UNIX03_THREADS)
+	     AX_PTHREAD_ZOS_MISSING
+#	     endif
+	    ],
+	    [AC_MSG_WARN([IBM z/OS requires -D_OPEN_THREADS or -D_UNIX03_THREADS to enable pthreads support.])])
+	;;
 
-        darwin*)
-        ax_pthread_flags="-pthread $ax_pthread_flags"
-        ;;
+	solaris*)
+
+	# On Solaris (at least, for some versions), libc contains stubbed
+	# (non-functional) versions of the pthreads routines, so link-based
+	# tests will erroneously succeed. (N.B.: The stubs are missing
+	# pthread_cleanup_push, or rather a function called by this macro,
+	# so we could check for that, but who knows whether they'll stub
+	# that too in a future libc.)  So we'll check first for the
+	# standard Solaris way of linking pthreads (-mt -lpthread).
+
+	ax_pthread_flags="-mt,pthread pthread $ax_pthread_flags"
+	;;
 esac
 
-# Clang doesn't consider unrecognized options an error unless we specify
-# -Werror. We throw in some extra Clang-specific options to ensure that
-# this doesn't happen for GCC, which also accepts -Werror.
-
-AC_MSG_CHECKING([if compiler needs -Werror to reject unknown flags])
-save_CFLAGS="$CFLAGS"
-ax_pthread_extra_flags="-Werror"
-CFLAGS="$CFLAGS $ax_pthread_extra_flags -Wunknown-warning-option -Wsizeof-array-argument"
-AC_COMPILE_IFELSE([AC_LANG_PROGRAM([int foo(void);],[foo()])],
-                  [AC_MSG_RESULT([yes])],
-                  [ax_pthread_extra_flags=
-                   AC_MSG_RESULT([no])])
-CFLAGS="$save_CFLAGS"
-
-if test x"$ax_pthread_ok" = xno; then
-for flag in $ax_pthread_flags; do
-
-        case $flag in
-                none)
-                AC_MSG_CHECKING([whether pthreads work without any flags])
-                ;;
-
-                -*)
-                AC_MSG_CHECKING([whether pthreads work with $flag])
-                PTHREAD_CFLAGS="$flag"
-                ;;
-
-                pthread-config)
-                AC_CHECK_PROG([ax_pthread_config], [pthread-config], [yes], [no])
-                if test x"$ax_pthread_config" = xno; then continue; fi
-                PTHREAD_CFLAGS="`pthread-config --cflags`"
-                PTHREAD_LIBS="`pthread-config --ldflags` `pthread-config --libs`"
-                ;;
-
-                *)
-                AC_MSG_CHECKING([for the pthreads library -l$flag])
-                PTHREAD_LIBS="-l$flag"
-                ;;
-        esac
-
-        save_LIBS="$LIBS"
-        save_CFLAGS="$CFLAGS"
-        LIBS="$PTHREAD_LIBS $LIBS"
-        CFLAGS="$CFLAGS $PTHREAD_CFLAGS $ax_pthread_extra_flags"
-
-        # Check for various functions.  We must include pthread.h,
-        # since some functions may be macros.  (On the Sequent, we
-        # need a special flag -Kthread to make this header compile.)
-        # We check for pthread_join because it is in -lpthread on IRIX
-        # while pthread_create is in libc.  We check for pthread_attr_init
-        # due to DEC craziness with -lpthreads.  We check for
-        # pthread_cleanup_push because it is one of the few pthread
-        # functions on Solaris that doesn't have a non-functional libc stub.
-        # We try pthread_create on general principles.
-        AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <pthread.h>
-                        static void routine(void *a) { a = 0; }
-                        static void *start_routine(void *a) { return a; }],
-                       [pthread_t th; pthread_attr_t attr;
-                        pthread_create(&th, 0, start_routine, 0);
-                        pthread_join(th, 0);
-                        pthread_attr_init(&attr);
-                        pthread_cleanup_push(routine, 0);
-                        pthread_cleanup_pop(0) /* ; */])],
-                [ax_pthread_ok=yes],
-                [])
-
-        LIBS="$save_LIBS"
-        CFLAGS="$save_CFLAGS"
-
-        AC_MSG_RESULT([$ax_pthread_ok])
-        if test "x$ax_pthread_ok" = xyes; then
-                break;
-        fi
-
-        PTHREAD_LIBS=""
-        PTHREAD_CFLAGS=""
+# GCC generally uses -pthread, or -pthreads on some platforms (e.g. SPARC)
+
+AS_IF([test "x$GCC" = "xyes"],
+      [ax_pthread_flags="-pthread -pthreads $ax_pthread_flags"])
+
+# The presence of a feature test macro requesting re-entrant function
+# definitions is, on some systems, a strong hint that pthreads support is
+# correctly enabled
+
+case $host_os in
+	darwin* | hpux* | linux* | osf* | solaris*)
+	ax_pthread_check_macro="_REENTRANT"
+	;;
+
+	aix* | freebsd*)
+	ax_pthread_check_macro="_THREAD_SAFE"
+	;;
+
+	*)
+	ax_pthread_check_macro="--"
+	;;
+esac
+AS_IF([test "x$ax_pthread_check_macro" = "x--"],
+      [ax_pthread_check_cond=0],
+      [ax_pthread_check_cond="!defined($ax_pthread_check_macro)"])
+
+# Are we compiling with Clang?
+
+AC_CACHE_CHECK([whether $CC is Clang],
+    [ax_cv_PTHREAD_CLANG],
+    [ax_cv_PTHREAD_CLANG=no
+     # Note that Autoconf sets GCC=yes for Clang as well as GCC
+     if test "x$GCC" = "xyes"; then
+	AC_EGREP_CPP([AX_PTHREAD_CC_IS_CLANG],
+	    [/* Note: Clang 2.7 lacks __clang_[a-z]+__ */
+#	     if defined(__clang__) && defined(__llvm__)
+	     AX_PTHREAD_CC_IS_CLANG
+#	     endif
+	    ],
+	    [ax_cv_PTHREAD_CLANG=yes])
+     fi
+    ])
+ax_pthread_clang="$ax_cv_PTHREAD_CLANG"
+
+ax_pthread_clang_warning=no
+
+# Clang needs special handling, because older versions handle the -pthread
+# option in a rather... idiosyncratic way
+
+if test "x$ax_pthread_clang" = "xyes"; then
+
+	# Clang takes -pthread; it has never supported any other flag
+
+	# (Note 1: This will need to be revisited if a system that Clang
+	# supports has POSIX threads in a separate library.  This tends not
+	# to be the way of modern systems, but it's conceivable.)
+
+	# (Note 2: On some systems, notably Darwin, -pthread is not needed
+	# to get POSIX threads support; the API is always present and
+	# active.  We could reasonably leave PTHREAD_CFLAGS empty.  But
+	# -pthread does define _REENTRANT, and while the Darwin headers
+	# ignore this macro, third-party headers might not.)
+
+	PTHREAD_CFLAGS="-pthread"
+	PTHREAD_LIBS=
+
+	ax_pthread_ok=yes
+
+	# However, older versions of Clang make a point of warning the user
+	# that, in an invocation where only linking and no compilation is
+	# taking place, the -pthread option has no effect ("argument unused
+	# during compilation").  They expect -pthread to be passed in only
+	# when source code is being compiled.
+	#
+	# Problem is, this is at odds with the way Automake and most other
+	# C build frameworks function, which is that the same flags used in
+	# compilation (CFLAGS) are also used in linking.  Many systems
+	# supported by AX_PTHREAD require exactly this for POSIX threads
+	# support, and in fact it is often not straightforward to specify a
+	# flag that is used only in the compilation phase and not in
+	# linking.  Such a scenario is extremely rare in practice.
+	#
+	# Even though use of the -pthread flag in linking would only print
+	# a warning, this can be a nuisance for well-run software projects
+	# that build with -Werror.  So if the active version of Clang has
+	# this misfeature, we search for an option to squash it.
+
+	AC_CACHE_CHECK([whether Clang needs flag to prevent "argument unused" warning when linking with -pthread],
+	    [ax_cv_PTHREAD_CLANG_NO_WARN_FLAG],
+	    [ax_cv_PTHREAD_CLANG_NO_WARN_FLAG=unknown
+	     # Create an alternate version of $ac_link that compiles and
+	     # links in two steps (.c -> .o, .o -> exe) instead of one
+	     # (.c -> exe), because the warning occurs only in the second
+	     # step
+	     ax_pthread_save_ac_link="$ac_link"
+	     ax_pthread_sed='s/conftest\.\$ac_ext/conftest.$ac_objext/g'
+	     ax_pthread_link_step=`$as_echo "$ac_link" | sed "$ax_pthread_sed"`
+	     ax_pthread_2step_ac_link="($ac_compile) && (echo ==== >&5) && ($ax_pthread_link_step)"
+	     ax_pthread_save_CFLAGS="$CFLAGS"
+	     for ax_pthread_try in '' -Qunused-arguments -Wno-unused-command-line-argument unknown; do
+		AS_IF([test "x$ax_pthread_try" = "xunknown"], [break])
+		CFLAGS="-Werror -Wunknown-warning-option $ax_pthread_try -pthread $ax_pthread_save_CFLAGS"
+		ac_link="$ax_pthread_save_ac_link"
+		AC_LINK_IFELSE([AC_LANG_SOURCE([[int main(void){return 0;}]])],
+		    [ac_link="$ax_pthread_2step_ac_link"
+		     AC_LINK_IFELSE([AC_LANG_SOURCE([[int main(void){return 0;}]])],
+			 [break])
+		    ])
+	     done
+	     ac_link="$ax_pthread_save_ac_link"
+	     CFLAGS="$ax_pthread_save_CFLAGS"
+	     AS_IF([test "x$ax_pthread_try" = "x"], [ax_pthread_try=no])
+	     ax_cv_PTHREAD_CLANG_NO_WARN_FLAG="$ax_pthread_try"
+	    ])
+
+	case "$ax_cv_PTHREAD_CLANG_NO_WARN_FLAG" in
+		no | unknown) ;;
+		*) PTHREAD_CFLAGS="$ax_cv_PTHREAD_CLANG_NO_WARN_FLAG $PTHREAD_CFLAGS" ;;
+	esac
+
+fi # $ax_pthread_clang = yes
+
+if test "x$ax_pthread_ok" = "xno"; then
+for ax_pthread_try_flag in $ax_pthread_flags; do
+
+	case $ax_pthread_try_flag in
+		none)
+		AC_MSG_CHECKING([whether pthreads work without any flags])
+		;;
+
+		-mt,pthread)
+		AC_MSG_CHECKING([whether pthreads work with -mt -lpthread])
+		PTHREAD_CFLAGS="-mt"
+		PTHREAD_LIBS="-lpthread"
+		;;
+
+		-*)
+		AC_MSG_CHECKING([whether pthreads work with $ax_pthread_try_flag])
+		PTHREAD_CFLAGS="$ax_pthread_try_flag"
+		;;
+
+		pthread-config)
+		AC_CHECK_PROG([ax_pthread_config], [pthread-config], [yes], [no])
+		AS_IF([test "x$ax_pthread_config" = "xno"], [continue])
+		PTHREAD_CFLAGS="`pthread-config --cflags`"
+		PTHREAD_LIBS="`pthread-config --ldflags` `pthread-config --libs`"
+		;;
+
+		*)
+		AC_MSG_CHECKING([for the pthreads library -l$ax_pthread_try_flag])
+		PTHREAD_LIBS="-l$ax_pthread_try_flag"
+		;;
+	esac
+
+	ax_pthread_save_CFLAGS="$CFLAGS"
+	ax_pthread_save_LIBS="$LIBS"
+	CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+	LIBS="$PTHREAD_LIBS $LIBS"
+
+	# Check for various functions.  We must include pthread.h,
+	# since some functions may be macros.  (On the Sequent, we
+	# need a special flag -Kthread to make this header compile.)
+	# We check for pthread_join because it is in -lpthread on IRIX
+	# while pthread_create is in libc.  We check for pthread_attr_init
+	# due to DEC craziness with -lpthreads.  We check for
+	# pthread_cleanup_push because it is one of the few pthread
+	# functions on Solaris that doesn't have a non-functional libc stub.
+	# We try pthread_create on general principles.
+
+	AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <pthread.h>
+#			if $ax_pthread_check_cond
+#			 error "$ax_pthread_check_macro must be defined"
+#			endif
+			static void routine(void *a) { a = 0; }
+			static void *start_routine(void *a) { return a; }],
+		       [pthread_t th; pthread_attr_t attr;
+			pthread_create(&th, 0, start_routine, 0);
+			pthread_join(th, 0);
+			pthread_attr_init(&attr);
+			pthread_cleanup_push(routine, 0);
+			pthread_cleanup_pop(0) /* ; */])],
+	    [ax_pthread_ok=yes],
+	    [])
+
+	CFLAGS="$ax_pthread_save_CFLAGS"
+	LIBS="$ax_pthread_save_LIBS"
+
+	AC_MSG_RESULT([$ax_pthread_ok])
+	AS_IF([test "x$ax_pthread_ok" = "xyes"], [break])
+
+	PTHREAD_LIBS=""
+	PTHREAD_CFLAGS=""
 done
 fi
 
 # Various other checks:
-if test "x$ax_pthread_ok" = xyes; then
-        save_LIBS="$LIBS"
-        LIBS="$PTHREAD_LIBS $LIBS"
-        save_CFLAGS="$CFLAGS"
-        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
-
-        # Detect AIX lossage: JOINABLE attribute is called UNDETACHED.
-        AC_MSG_CHECKING([for joinable pthread attribute])
-        attr_name=unknown
-        for attr in PTHREAD_CREATE_JOINABLE PTHREAD_CREATE_UNDETACHED; do
-            AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <pthread.h>],
-                           [int attr = $attr; return attr /* ; */])],
-                [attr_name=$attr; break],
-                [])
-        done
-        AC_MSG_RESULT([$attr_name])
-        if test "$attr_name" != PTHREAD_CREATE_JOINABLE; then
-            AC_DEFINE_UNQUOTED([PTHREAD_CREATE_JOINABLE], [$attr_name],
-                               [Define to necessary symbol if this constant
-                                uses a non-standard name on your system.])
-        fi
-
-        AC_MSG_CHECKING([if more special flags are required for pthreads])
-        flag=no
-        case ${host_os} in
-            aix* | freebsd* | darwin*) flag="-D_THREAD_SAFE";;
-            osf* | hpux*) flag="-D_REENTRANT";;
-            solaris*)
-            if test "$GCC" = "yes"; then
-                flag="-D_REENTRANT"
-            else
-                # TODO: What about Clang on Solaris?
-                flag="-mt -D_REENTRANT"
-            fi
-            ;;
-        esac
-        AC_MSG_RESULT([$flag])
-        if test "x$flag" != xno; then
-            PTHREAD_CFLAGS="$flag $PTHREAD_CFLAGS"
-        fi
-
-        AC_CACHE_CHECK([for PTHREAD_PRIO_INHERIT],
-            [ax_cv_PTHREAD_PRIO_INHERIT], [
-                AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <pthread.h>]],
-                                                [[int i = PTHREAD_PRIO_INHERIT;]])],
-                    [ax_cv_PTHREAD_PRIO_INHERIT=yes],
-                    [ax_cv_PTHREAD_PRIO_INHERIT=no])
-            ])
-        AS_IF([test "x$ax_cv_PTHREAD_PRIO_INHERIT" = "xyes"],
-            [AC_DEFINE([HAVE_PTHREAD_PRIO_INHERIT], [1], [Have PTHREAD_PRIO_INHERIT.])])
-
-        LIBS="$save_LIBS"
-        CFLAGS="$save_CFLAGS"
-
-        # More AIX lossage: compile with *_r variant
-        if test "x$GCC" != xyes; then
-            case $host_os in
-                aix*)
-                AS_CASE(["x/$CC"],
-                  [x*/c89|x*/c89_128|x*/c99|x*/c99_128|x*/cc|x*/cc128|x*/xlc|x*/xlc_v6|x*/xlc128|x*/xlc128_v6],
-                  [#handle absolute path differently from PATH based program lookup
-                   AS_CASE(["x$CC"],
-                     [x/*],
-                     [AS_IF([AS_EXECUTABLE_P([${CC}_r])],[PTHREAD_CC="${CC}_r"])],
-                     [AC_CHECK_PROGS([PTHREAD_CC],[${CC}_r],[$CC])])])
-                ;;
-            esac
-        fi
+if test "x$ax_pthread_ok" = "xyes"; then
+	ax_pthread_save_CFLAGS="$CFLAGS"
+	ax_pthread_save_LIBS="$LIBS"
+	CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+	LIBS="$PTHREAD_LIBS $LIBS"
+
+	# Detect AIX lossage: JOINABLE attribute is called UNDETACHED.
+	AC_CACHE_CHECK([for joinable pthread attribute],
+	    [ax_cv_PTHREAD_JOINABLE_ATTR],
+	    [ax_cv_PTHREAD_JOINABLE_ATTR=unknown
+	     for ax_pthread_attr in PTHREAD_CREATE_JOINABLE PTHREAD_CREATE_UNDETACHED; do
+		 AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <pthread.h>],
+						 [int attr = $ax_pthread_attr; return attr /* ; */])],
+				[ax_cv_PTHREAD_JOINABLE_ATTR=$ax_pthread_attr; break],
+				[])
+	     done
+	    ])
+	AS_IF([test "x$ax_cv_PTHREAD_JOINABLE_ATTR" != "xunknown" && \
+	       test "x$ax_cv_PTHREAD_JOINABLE_ATTR" != "xPTHREAD_CREATE_JOINABLE" && \
+	       test "x$ax_pthread_joinable_attr_defined" != "xyes"],
+	      [AC_DEFINE_UNQUOTED([PTHREAD_CREATE_JOINABLE],
+				  [$ax_cv_PTHREAD_JOINABLE_ATTR],
+				  [Define to necessary symbol if this constant
+				   uses a non-standard name on your system.])
+	       ax_pthread_joinable_attr_defined=yes
+	      ])
+
+	AC_CACHE_CHECK([whether more special flags are required for pthreads],
+	    [ax_cv_PTHREAD_SPECIAL_FLAGS],
+	    [ax_cv_PTHREAD_SPECIAL_FLAGS=no
+	     case $host_os in
+	     solaris*)
+	     ax_cv_PTHREAD_SPECIAL_FLAGS="-D_POSIX_PTHREAD_SEMANTICS"
+	     ;;
+	     esac
+	    ])
+	AS_IF([test "x$ax_cv_PTHREAD_SPECIAL_FLAGS" != "xno" && \
+	       test "x$ax_pthread_special_flags_added" != "xyes"],
+	      [PTHREAD_CFLAGS="$ax_cv_PTHREAD_SPECIAL_FLAGS $PTHREAD_CFLAGS"
+	       ax_pthread_special_flags_added=yes])
+
+	AC_CACHE_CHECK([for PTHREAD_PRIO_INHERIT],
+	    [ax_cv_PTHREAD_PRIO_INHERIT],
+	    [AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <pthread.h>]],
+					     [[int i = PTHREAD_PRIO_INHERIT;]])],
+			    [ax_cv_PTHREAD_PRIO_INHERIT=yes],
+			    [ax_cv_PTHREAD_PRIO_INHERIT=no])
+	    ])
+	AS_IF([test "x$ax_cv_PTHREAD_PRIO_INHERIT" = "xyes" && \
+	       test "x$ax_pthread_prio_inherit_defined" != "xyes"],
+	      [AC_DEFINE([HAVE_PTHREAD_PRIO_INHERIT], [1], [Have PTHREAD_PRIO_INHERIT.])
+	       ax_pthread_prio_inherit_defined=yes
+	      ])
+
+	CFLAGS="$ax_pthread_save_CFLAGS"
+	LIBS="$ax_pthread_save_LIBS"
+
+	# More AIX lossage: compile with *_r variant
+	if test "x$GCC" != "xyes"; then
+	    case $host_os in
+		aix*)
+		AS_CASE(["x/$CC"],
+		    [x*/c89|x*/c89_128|x*/c99|x*/c99_128|x*/cc|x*/cc128|x*/xlc|x*/xlc_v6|x*/xlc128|x*/xlc128_v6],
+		    [#handle absolute path differently from PATH based program lookup
+		     AS_CASE(["x$CC"],
+			 [x/*],
+			 [AS_IF([AS_EXECUTABLE_P([${CC}_r])],[PTHREAD_CC="${CC}_r"])],
+			 [AC_CHECK_PROGS([PTHREAD_CC],[${CC}_r],[$CC])])])
+		;;
+	    esac
+	fi
 fi
 
 test -n "$PTHREAD_CC" || PTHREAD_CC="$CC"
@@ -321,12 +474,12 @@ AC_SUBST([PTHREAD_CFLAGS])
 AC_SUBST([PTHREAD_CC])
 
 # Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND:
-if test x"$ax_pthread_ok" = xyes; then
-        ifelse([$1],,[AC_DEFINE([HAVE_PTHREAD],[1],[Define if you have POSIX threads libraries and header files.])],[$1])
-        :
+if test "x$ax_pthread_ok" = "xyes"; then
+	ifelse([$1],,[AC_DEFINE([HAVE_PTHREAD],[1],[Define if you have POSIX threads libraries and header files.])],[$1])
+	:
 else
-        ax_pthread_ok=no
-        $2
+	ax_pthread_ok=no
+	$2
 fi
 AC_LANG_POP
 ])dnl AX_PTHREAD

From fad13b1612b5de16d94c78c1a464d431a4f770bf Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Sat, 19 Mar 2016 15:19:29 +0100
Subject: [PATCH 0038/1802] [amount] Preempt issues with negative fee rates

---
 src/amount.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/amount.cpp b/src/amount.cpp
index d03ed5cfadb4c..68806ff062bd9 100644
--- a/src/amount.cpp
+++ b/src/amount.cpp
@@ -21,7 +21,7 @@ CAmount CFeeRate::GetFee(size_t nSize) const
 {
     CAmount nFee = nSatoshisPerK * nSize / 1000;
 
-    if (nFee == 0 && nSize != 0 && nSatoshisPerK != 0)
+    if (nFee == 0 && nSize != 0 && nSatoshisPerK > 0)
         nFee = CAmount(1);
 
     return nFee;

From fab3890156c849e6b04309152d7a9bfcfcb98396 Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Sun, 15 Nov 2015 20:41:48 +0100
Subject: [PATCH 0039/1802] [qa] rpc-test: Normalize assert()

---
 qa/rpc-tests/fundrawtransaction.py         | 34 ++++++++++------------
 qa/rpc-tests/getblocktemplate_proposals.py | 10 ++-----
 qa/rpc-tests/httpbasics.py                 | 26 ++++++++---------
 qa/rpc-tests/wallet.py                     |  4 +--
 qa/rpc-tests/zapwallettxes.py              | 10 ++-----
 5 files changed, 34 insertions(+), 50 deletions(-)

diff --git a/qa/rpc-tests/fundrawtransaction.py b/qa/rpc-tests/fundrawtransaction.py
index 0287965b97f29..4458712815c57 100755
--- a/qa/rpc-tests/fundrawtransaction.py
+++ b/qa/rpc-tests/fundrawtransaction.py
@@ -71,7 +71,7 @@ def run_test(self):
         rawtxfund = self.nodes[2].fundrawtransaction(rawtx)
         fee = rawtxfund['fee']
         dec_tx  = self.nodes[2].decoderawtransaction(rawtxfund['hex'])
-        assert_equal(len(dec_tx['vin']) > 0, True) #test if we have enought inputs
+        assert(len(dec_tx['vin']) > 0) #test if we have enought inputs
 
         ##############################
         # simple test with two coins #
@@ -84,7 +84,7 @@ def run_test(self):
         rawtxfund = self.nodes[2].fundrawtransaction(rawtx)
         fee = rawtxfund['fee']
         dec_tx  = self.nodes[2].decoderawtransaction(rawtxfund['hex'])
-        assert_equal(len(dec_tx['vin']) > 0, True) #test if we have enough inputs
+        assert(len(dec_tx['vin']) > 0) #test if we have enough inputs
 
         ##############################
         # simple test with two coins #
@@ -97,7 +97,7 @@ def run_test(self):
         rawtxfund = self.nodes[2].fundrawtransaction(rawtx)
         fee = rawtxfund['fee']
         dec_tx  = self.nodes[2].decoderawtransaction(rawtxfund['hex'])
-        assert_equal(len(dec_tx['vin']) > 0, True)
+        assert(len(dec_tx['vin']) > 0)
         assert_equal(dec_tx['vin'][0]['scriptSig']['hex'], '')
 
 
@@ -116,7 +116,7 @@ def run_test(self):
         for out in dec_tx['vout']:
             totalOut += out['value']
 
-        assert_equal(len(dec_tx['vin']) > 0, True)
+        assert(len(dec_tx['vin']) > 0)
         assert_equal(dec_tx['vin'][0]['scriptSig']['hex'], '')
 
 
@@ -130,7 +130,7 @@ def run_test(self):
                 utx = aUtx
                 break
 
-        assert_equal(utx!=False, True)
+        assert(utx!=False)
 
         inputs  = [ {'txid' : utx['txid'], 'vout' : utx['vout']}]
         outputs = { self.nodes[0].getnewaddress() : 1.0 }
@@ -159,7 +159,7 @@ def run_test(self):
                 utx = aUtx
                 break
 
-        assert_equal(utx!=False, True)
+        assert(utx!=False)
 
         inputs  = [ {'txid' : utx['txid'], 'vout' : utx['vout']}]
         outputs = { self.nodes[0].getnewaddress() : Decimal(5.0) - fee - feeTolerance }
@@ -189,7 +189,7 @@ def run_test(self):
                 utx = aUtx
                 break
 
-        assert_equal(utx!=False, True)
+        assert(utx!=False)
 
         inputs  = [ {'txid' : utx['txid'], 'vout' : utx['vout']}]
         outputs = { self.nodes[0].getnewaddress() : 1.0 }
@@ -234,7 +234,7 @@ def run_test(self):
                 utx2 = aUtx
 
 
-        assert_equal(utx!=False, True)
+        assert(utx!=False)
 
         inputs  = [ {'txid' : utx['txid'], 'vout' : utx['vout']},{'txid' : utx2['txid'], 'vout' : utx2['vout']} ]
         outputs = { self.nodes[0].getnewaddress() : 6.0 }
@@ -276,7 +276,7 @@ def run_test(self):
                 utx2 = aUtx
 
 
-        assert_equal(utx!=False, True)
+        assert(utx!=False)
 
         inputs  = [ {'txid' : utx['txid'], 'vout' : utx['vout']},{'txid' : utx2['txid'], 'vout' : utx2['vout']} ]
         outputs = { self.nodes[0].getnewaddress() : 6.0, self.nodes[0].getnewaddress() : 1.0 }
@@ -306,14 +306,11 @@ def run_test(self):
         rawtx   = self.nodes[2].createrawtransaction(inputs, outputs)
         dec_tx  = self.nodes[2].decoderawtransaction(rawtx)
 
-        errorString = ""
         try:
             rawtxfund = self.nodes[2].fundrawtransaction(rawtx)
+            raise AssertionError("Spent more than available")
         except JSONRPCException,e:
-            errorString = e.error['message']
-
-        assert("Insufficient" in errorString)
-
+            assert("Insufficient" in e.error['message'])
 
 
         ############################################################
@@ -462,12 +459,11 @@ def run_test(self):
         self.is_network_split=False
         self.sync_all()
 
-        error = False
         try:
             self.nodes[1].sendtoaddress(self.nodes[0].getnewaddress(), 1.2)
-        except:
-            error = True
-        assert(error)
+            raise AssertionError("Wallet unlocked without passphrase")
+        except JSONRPCException as e:
+            assert('walletpassphrase' in e.error['message'])
 
         oldBalance = self.nodes[0].getbalance()
 
@@ -580,7 +576,7 @@ def run_test(self):
         assert_equal(len(res_dec["vin"]), 1)
         assert_equal(res_dec["vin"][0]["txid"], watchonly_txid)
 
-        assert_equal("fee" in result.keys(), True)
+        assert("fee" in result.keys())
         assert_greater_than(result["changepos"], -1)
 
         ###############################################################
diff --git a/qa/rpc-tests/getblocktemplate_proposals.py b/qa/rpc-tests/getblocktemplate_proposals.py
index f83b5f140d90b..d2cb4ab8d69b9 100755
--- a/qa/rpc-tests/getblocktemplate_proposals.py
+++ b/qa/rpc-tests/getblocktemplate_proposals.py
@@ -120,10 +120,7 @@ def run_test(self):
 
         # Test 3: Truncated final tx
         lastbyte = txlist[-1].pop()
-        try:
-            assert_template(node, tmpl, txlist, 'n/a')
-        except JSONRPCException:
-            pass  # Expected
+        assert_raises(JSONRPCException, assert_template, node, tmpl, txlist, 'n/a')
         txlist[-1].append(lastbyte)
 
         # Test 4: Add an invalid tx to the end (duplicate of gen tx)
@@ -144,10 +141,7 @@ def run_test(self):
 
         # Test 7: Bad tx count
         txlist.append(b'')
-        try:
-            assert_template(node, tmpl, txlist, 'n/a')
-        except JSONRPCException:
-            pass  # Expected
+        assert_raises(JSONRPCException, assert_template, node, tmpl, txlist, 'n/a')
         txlist.pop()
 
         # Test 8: Bad bits
diff --git a/qa/rpc-tests/httpbasics.py b/qa/rpc-tests/httpbasics.py
index eb548aee9de32..c231676ec87d7 100755
--- a/qa/rpc-tests/httpbasics.py
+++ b/qa/rpc-tests/httpbasics.py
@@ -37,14 +37,14 @@ def run_test(self):
         conn.connect()
         conn.request('POST', '/', '{"method": "getbestblockhash"}', headers)
         out1 = conn.getresponse().read()
-        assert_equal('"error":null' in out1, True)
-        assert_equal(conn.sock!=None, True) #according to http/1.1 connection must still be open!
+        assert('"error":null' in out1)
+        assert(conn.sock!=None) #according to http/1.1 connection must still be open!
 
         #send 2nd request without closing connection
         conn.request('POST', '/', '{"method": "getchaintips"}', headers)
         out2 = conn.getresponse().read()
-        assert_equal('"error":null' in out1, True) #must also response with a correct json-rpc message
-        assert_equal(conn.sock!=None, True) #according to http/1.1 connection must still be open!
+        assert('"error":null' in out1) #must also response with a correct json-rpc message
+        assert(conn.sock!=None) #according to http/1.1 connection must still be open!
         conn.close()
 
         #same should be if we add keep-alive because this should be the std. behaviour
@@ -54,14 +54,14 @@ def run_test(self):
         conn.connect()
         conn.request('POST', '/', '{"method": "getbestblockhash"}', headers)
         out1 = conn.getresponse().read()
-        assert_equal('"error":null' in out1, True)
-        assert_equal(conn.sock!=None, True) #according to http/1.1 connection must still be open!
+        assert('"error":null' in out1)
+        assert(conn.sock!=None) #according to http/1.1 connection must still be open!
 
         #send 2nd request without closing connection
         conn.request('POST', '/', '{"method": "getchaintips"}', headers)
         out2 = conn.getresponse().read()
-        assert_equal('"error":null' in out1, True) #must also response with a correct json-rpc message
-        assert_equal(conn.sock!=None, True) #according to http/1.1 connection must still be open!
+        assert('"error":null' in out1) #must also response with a correct json-rpc message
+        assert(conn.sock!=None) #according to http/1.1 connection must still be open!
         conn.close()
 
         #now do the same with "Connection: close"
@@ -71,8 +71,8 @@ def run_test(self):
         conn.connect()
         conn.request('POST', '/', '{"method": "getbestblockhash"}', headers)
         out1 = conn.getresponse().read()
-        assert_equal('"error":null' in out1, True)
-        assert_equal(conn.sock!=None, False) #now the connection must be closed after the response
+        assert('"error":null' in out1)
+        assert(conn.sock==None) #now the connection must be closed after the response
 
         #node1 (2nd node) is running with disabled keep-alive option
         urlNode1 = urlparse.urlparse(self.nodes[1].url)
@@ -83,7 +83,7 @@ def run_test(self):
         conn.connect()
         conn.request('POST', '/', '{"method": "getbestblockhash"}', headers)
         out1 = conn.getresponse().read()
-        assert_equal('"error":null' in out1, True)
+        assert('"error":null' in out1)
 
         #node2 (third node) is running with standard keep-alive parameters which means keep-alive is on
         urlNode2 = urlparse.urlparse(self.nodes[2].url)
@@ -94,8 +94,8 @@ def run_test(self):
         conn.connect()
         conn.request('POST', '/', '{"method": "getbestblockhash"}', headers)
         out1 = conn.getresponse().read()
-        assert_equal('"error":null' in out1, True)
-        assert_equal(conn.sock!=None, True) #connection must be closed because bitcoind should use keep-alive by default
+        assert('"error":null' in out1)
+        assert(conn.sock!=None) #connection must be closed because bitcoind should use keep-alive by default
 
         # Check excessive request size
         conn = httplib.HTTPConnection(urlNode2.hostname, urlNode2.port)
diff --git a/qa/rpc-tests/wallet.py b/qa/rpc-tests/wallet.py
index e52d4e766801d..f686e6be6c62d 100755
--- a/qa/rpc-tests/wallet.py
+++ b/qa/rpc-tests/wallet.py
@@ -252,7 +252,7 @@ def run_test (self):
         except JSONRPCException,e:
             errorString = e.error['message']
 
-        assert_equal("Invalid amount" in errorString, True)
+        assert("Invalid amount" in errorString)
 
         errorString = ""
         try:
@@ -260,7 +260,7 @@ def run_test (self):
         except JSONRPCException,e:
             errorString = e.error['message']
 
-        assert_equal("not an integer" in errorString, True)
+        assert("not an integer" in errorString)
 
         #check if wallet or blochchain maintenance changes the balance
         self.sync_all()
diff --git a/qa/rpc-tests/zapwallettxes.py b/qa/rpc-tests/zapwallettxes.py
index 1ee0f79ac06ba..1ba4ded249aad 100755
--- a/qa/rpc-tests/zapwallettxes.py
+++ b/qa/rpc-tests/zapwallettxes.py
@@ -65,14 +65,8 @@ def run_test (self):
         #restart bitcoind with zapwallettxes
         self.nodes[0] = start_node(0,self.options.tmpdir, ["-zapwallettxes=1"])
         
-        aException = False
-        try:
-            tx3 = self.nodes[0].gettransaction(txid3)
-        except JSONRPCException,e:
-            print e
-            aException = True
-        
-        assert_equal(aException, True) #there must be a expection because the unconfirmed wallettx0 must be gone by now
+        assert_raises(JSONRPCException, self.nodes[0].gettransaction, [txid3])
+        #there must be a expection because the unconfirmed wallettx0 must be gone by now
 
         tx0 = self.nodes[0].gettransaction(txid0)
         assert_equal(tx0['txid'], txid0) #tx0 (confirmed) must still be available because it was confirmed

From c5825d2d73ca7b0d76fb857554eea4176aed2b5f Mon Sep 17 00:00:00 2001
From: Denis Lukianov <denis@voxelsoft.com>
Date: Mon, 21 Mar 2016 03:16:19 +0000
Subject: [PATCH 0040/1802] Correct importaddress help reference to
 importpubkey

---
 src/wallet/rpcdump.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/wallet/rpcdump.cpp b/src/wallet/rpcdump.cpp
index 9ec28e7b91449..6e50f92428e68 100644
--- a/src/wallet/rpcdump.cpp
+++ b/src/wallet/rpcdump.cpp
@@ -192,7 +192,7 @@ UniValue importaddress(const UniValue& params, bool fHelp)
             "3. rescan               (boolean, optional, default=true) Rescan the wallet for transactions\n"
             "4. p2sh                 (boolean, optional, default=false) Add the P2SH version of the script as well\n"
             "\nNote: This call can take minutes to complete if rescan is true.\n"
-            "If you have the full public key, you should call importpublickey instead of this.\n"
+            "If you have the full public key, you should call importpubkey instead of this.\n"
             "\nExamples:\n"
             "\nImport a script with rescan\n"
             + HelpExampleCli("importaddress", "\"myscript\"") +

From 71527a0f31ae67edad0a7fcda59c75a6ce5666ca Mon Sep 17 00:00:00 2001
From: NicolasDorier <nicolas.dorier@gmail.com>
Date: Wed, 16 Mar 2016 14:30:04 +0900
Subject: [PATCH 0041/1802] Test of BIP9 fork activation of mtp, csv,
 sequence_lock

---
 qa/pull-tester/rpc-tests.py             |   1 +
 qa/rpc-tests/bip9-softforks.py          | 220 ++++++++++++++++++++++++
 qa/rpc-tests/test_framework/comptool.py |   4 +
 3 files changed, 225 insertions(+)
 create mode 100755 qa/rpc-tests/bip9-softforks.py

diff --git a/qa/pull-tester/rpc-tests.py b/qa/pull-tester/rpc-tests.py
index cbc10abd215e0..b32d8d93a9c25 100755
--- a/qa/pull-tester/rpc-tests.py
+++ b/qa/pull-tester/rpc-tests.py
@@ -119,6 +119,7 @@
     'p2p-versionbits-warning.py',
 ]
 testScriptsExt = [
+    'bip9-softforks.py',
     'bip65-cltv.py',
     'bip65-cltv-p2p.py',
     'bip68-sequence.py',
diff --git a/qa/rpc-tests/bip9-softforks.py b/qa/rpc-tests/bip9-softforks.py
new file mode 100755
index 0000000000000..cbb1b7d4cee89
--- /dev/null
+++ b/qa/rpc-tests/bip9-softforks.py
@@ -0,0 +1,220 @@
+#!/usr/bin/env python2
+# Copyright (c) 2015 The Bitcoin Core developers
+# Distributed under the MIT/X11 software license, see the accompanying
+# file COPYING or http://www.opensource.org/licenses/mit-license.php.
+#
+
+from test_framework.test_framework import ComparisonTestFramework
+from test_framework.util import *
+from test_framework.mininode import CTransaction, NetworkThread
+from test_framework.blocktools import create_coinbase, create_block
+from test_framework.comptool import TestInstance, TestManager
+from test_framework.script import CScript, OP_1NEGATE, OP_NOP3, OP_DROP
+from binascii import hexlify, unhexlify
+import cStringIO
+import time
+import itertools
+
+'''
+This test is meant to exercise BIP forks
+Connect to a single node.
+regtest lock-in with 108/144 block signalling
+activation after a further 144 blocks
+mine 2 block and save coinbases for later use
+mine 141 blocks to transition from DEFINED to STARTED
+mine 100 blocks signalling readiness and 44 not in order to fail to change state this period
+mine 108 blocks signalling readiness and 36 blocks not signalling readiness (STARTED->LOCKED_IN)
+mine a further 143 blocks (LOCKED_IN)
+test that enforcement has not triggered (which triggers ACTIVE)
+test that enforcement has triggered
+'''
+
+
+
+class BIP9SoftForksTest(ComparisonTestFramework):
+
+    def __init__(self):
+        self.num_nodes = 1
+
+    def setup_network(self):
+        self.nodes = start_nodes(1, self.options.tmpdir,
+                                 extra_args=[['-debug', '-whitelist=127.0.0.1']],
+                                 binary=[self.options.testbinary])
+
+    def run_test(self):
+        self.test = TestManager(self, self.options.tmpdir)
+        self.test.add_all_connections(self.nodes)
+        NetworkThread().start() # Start up network handling in another thread
+        self.test.run()
+
+    def create_transaction(self, node, coinbase, to_address, amount):
+        from_txid = node.getblock(coinbase)['tx'][0]
+        inputs = [{ "txid" : from_txid, "vout" : 0}]
+        outputs = { to_address : amount }
+        rawtx = node.createrawtransaction(inputs, outputs)
+        tx = CTransaction()
+        f = cStringIO.StringIO(unhexlify(rawtx))
+        tx.deserialize(f)
+        tx.nVersion = 2
+        return tx
+
+    def sign_transaction(self, node, tx):
+        signresult = node.signrawtransaction(hexlify(tx.serialize()))
+        tx = CTransaction()
+        f = cStringIO.StringIO(unhexlify(signresult['hex']))
+        tx.deserialize(f)
+        return tx
+
+    def generate_blocks(self, number, version, test_blocks = []):
+        for i in xrange(number):
+            block = create_block(self.tip, create_coinbase(self.height), self.last_block_time + 1)
+            block.nVersion = version
+            block.rehash()
+            block.solve()
+            test_blocks.append([block, True])
+            self.last_block_time += 1
+            self.tip = block.sha256
+            self.height += 1
+        return test_blocks
+
+    def get_bip9_status(self, key):
+        info = self.nodes[0].getblockchaininfo()
+        for row in info['bip9_softforks']:
+            if row['id'] == key:
+                return row
+        raise IndexError ('key:"%s" not found' % key)
+
+
+    def test_BIP(self, bipName, activated_version, invalidate, invalidatePostSignature):
+        # generate some coins for later
+        self.coinbase_blocks = self.nodes[0].generate(2)
+        self.height = 3  # height of the next block to build
+        self.tip = int ("0x" + self.nodes[0].getbestblockhash() + "L", 0)
+        self.nodeaddress = self.nodes[0].getnewaddress()
+        self.last_block_time = time.time()
+
+        assert_equal(self.get_bip9_status(bipName)['status'], 'defined')
+
+        # Test 1
+        # Advance from DEFINED to STARTED
+        test_blocks = self.generate_blocks(141, 4)
+        yield TestInstance(test_blocks, sync_every_block=False)
+
+        assert_equal(self.get_bip9_status(bipName)['status'], 'started')
+
+        # Test 2
+        # Fail to achieve LOCKED_IN 100 out of 144 signal bit 1
+        # using a variety of bits to simulate multiple parallel softforks
+        test_blocks = self.generate_blocks(50, activated_version) # 0x20000001 (signalling ready)
+        test_blocks = self.generate_blocks(20, 4, test_blocks) # 0x00000004 (signalling not)
+        test_blocks = self.generate_blocks(50, activated_version, test_blocks) # 0x20000101 (signalling ready)
+        test_blocks = self.generate_blocks(24, 4, test_blocks) # 0x20010000 (signalling not)
+        yield TestInstance(test_blocks, sync_every_block=False)
+
+        assert_equal(self.get_bip9_status(bipName)['status'], 'started')
+
+        # Test 3
+        # 108 out of 144 signal bit 1 to achieve LOCKED_IN
+        # using a variety of bits to simulate multiple parallel softforks
+        test_blocks = self.generate_blocks(58, activated_version) # 0x20000001 (signalling ready)
+        test_blocks = self.generate_blocks(26, 4, test_blocks) # 0x00000004 (signalling not)
+        test_blocks = self.generate_blocks(50, activated_version, test_blocks) # 0x20000101 (signalling ready)
+        test_blocks = self.generate_blocks(10, 4, test_blocks) # 0x20010000 (signalling not)
+        yield TestInstance(test_blocks, sync_every_block=False)
+
+        assert_equal(self.get_bip9_status(bipName)['status'], 'locked_in')
+
+        # Test 4
+        # 143 more version 536870913 blocks (waiting period-1)
+        test_blocks = self.generate_blocks(143, 4)
+        yield TestInstance(test_blocks, sync_every_block=False)
+
+        assert_equal(self.get_bip9_status(bipName)['status'], 'locked_in')
+
+        # Test 5
+        # Check that the new rule is enforced
+        spendtx = self.create_transaction(self.nodes[0],
+                self.coinbase_blocks[0], self.nodeaddress, 1.0)
+        invalidate(spendtx)
+        spendtx = self.sign_transaction(self.nodes[0], spendtx)
+        spendtx.rehash()
+        invalidatePostSignature(spendtx)
+        spendtx.rehash()
+        block = create_block(self.tip, create_coinbase(self.height), self.last_block_time + 1)
+        block.nVersion = activated_version
+        block.vtx.append(spendtx)
+        block.hashMerkleRoot = block.calc_merkle_root()
+        block.rehash()
+        block.solve()
+
+        self.last_block_time += 1
+        self.tip = block.sha256
+        self.height += 1
+        yield TestInstance([[block, True]])
+
+        assert_equal(self.get_bip9_status(bipName)['status'], 'active')
+
+        # Test 6
+        # Check that the new sequence lock rules are enforced
+        spendtx = self.create_transaction(self.nodes[0],
+                self.coinbase_blocks[1], self.nodeaddress, 1.0)
+        invalidate(spendtx)
+        spendtx = self.sign_transaction(self.nodes[0], spendtx)
+        spendtx.rehash()
+        invalidatePostSignature(spendtx)
+        spendtx.rehash()
+
+        block = create_block(self.tip, create_coinbase(self.height), self.last_block_time + 1)
+        block.nVersion = 5
+        block.vtx.append(spendtx)
+        block.hashMerkleRoot = block.calc_merkle_root()
+        block.rehash()
+        block.solve()
+        self.last_block_time += 1
+        yield TestInstance([[block, False]])
+
+        # Restart all
+        stop_nodes(self.nodes)
+        wait_bitcoinds()
+        shutil.rmtree(self.options.tmpdir)
+        self.setup_chain()
+        self.setup_network()
+        self.test.clear_all_connections()
+        self.test.add_all_connections(self.nodes)
+        NetworkThread().start() # Start up network handling in another thread
+
+
+
+    def get_tests(self):
+        for test in itertools.chain(
+                self.test_BIP('csv', 536870913, self.sequence_lock_invalidate, self.donothing),
+                self.test_BIP('csv', 536870913, self.mtp_invalidate, self.donothing),
+                self.test_BIP('csv', 536870913, self.donothing, self.csv_invalidate)
+        ):
+            yield test
+
+    def donothing(self, tx):
+        return
+
+    def csv_invalidate(self, tx):
+        '''Modify the signature in vin 0 of the tx to fail CSV
+        Prepends -1 CSV DROP in the scriptSig itself.
+        '''
+        tx.vin[0].scriptSig = CScript([OP_1NEGATE, OP_NOP3, OP_DROP] +
+                                      list(CScript(tx.vin[0].scriptSig)))
+
+    def sequence_lock_invalidate(self, tx):
+        '''Modify the nSequence to make it fails once sequence lock rule is activated (high timespan)
+        '''
+        tx.vin[0].nSequence = 0x00FFFFFF
+        tx.nLockTime = 0
+
+    def mtp_invalidate(self, tx):
+        '''Modify the nLockTime to make it fails once MTP rule is activated
+        '''
+        # Disable Sequence lock, Activate nLockTime
+        tx.vin[0].nSequence = 0x90FFFFFF
+        tx.nLockTime = self.last_block_time
+
+if __name__ == '__main__':
+    BIP9SoftForksTest().main()
\ No newline at end of file
diff --git a/qa/rpc-tests/test_framework/comptool.py b/qa/rpc-tests/test_framework/comptool.py
index a4cd4d0a89780..d8fcd807f6266 100755
--- a/qa/rpc-tests/test_framework/comptool.py
+++ b/qa/rpc-tests/test_framework/comptool.py
@@ -193,6 +193,10 @@ def add_all_connections(self, nodes):
             # associated NodeConn
             test_node.add_connection(self.connections[-1])
 
+    def clear_all_connections(self):
+        self.connections    = []
+        self.test_nodes     = []
+
     def wait_for_disconnections(self):
         def disconnected():
             return all(node.closed for node in self.test_nodes)

From fe00ca758a0f1ab2db3f7441c04780630a9df11a Mon Sep 17 00:00:00 2001
From: Andrew C <achow101@gmail.com>
Date: Sat, 12 Mar 2016 11:41:51 -0500
Subject: [PATCH 0042/1802] Create generatetoaddress rpc

Creates the generatetoaddress rpc which is virtually identical to the generate rpc except that it takes an argument for the address to mine to. It does not rely on wallet functionality.

The mining code shared by generate and generatetoaddress has been moved to another method to reduce duplication.
---
 src/rpc/client.cpp |   3 ++
 src/rpc/mining.cpp | 109 +++++++++++++++++++++++++++++++--------------
 src/rpc/server.cpp |   1 +
 src/rpc/server.h   |   1 +
 4 files changed, 81 insertions(+), 33 deletions(-)

diff --git a/src/rpc/client.cpp b/src/rpc/client.cpp
index 45fb6c16428b7..89420b93d7fb2 100644
--- a/src/rpc/client.cpp
+++ b/src/rpc/client.cpp
@@ -29,6 +29,9 @@ static const CRPCConvertParam vRPCConvertParams[] =
     { "getaddednodeinfo", 0 },
     { "generate", 0 },
     { "generate", 1 },
+    { "generatetoaddress", 0 },
+    { "generatetoaddress", 1 },
+    { "generatetoaddress", 2 },
     { "getnetworkhashps", 0 },
     { "getnetworkhashps", 1 },
     { "sendtoaddress", 1 },
diff --git a/src/rpc/mining.cpp b/src/rpc/mining.cpp
index c33082fca0c04..a2abbb323d5ce 100644
--- a/src/rpc/mining.cpp
+++ b/src/rpc/mining.cpp
@@ -3,6 +3,7 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
+#include "base58.h"
 #include "amount.h"
 #include "chain.h"
 #include "chainparams.h"
@@ -93,42 +94,12 @@ UniValue getnetworkhashps(const UniValue& params, bool fHelp)
     return GetNetworkHashPS(params.size() > 0 ? params[0].get_int() : 120, params.size() > 1 ? params[1].get_int() : -1);
 }
 
-UniValue generate(const UniValue& params, bool fHelp)
+UniValue generateBlocks(boost::shared_ptr<CReserveScript> coinbaseScript, int nGenerate, uint64_t nMaxTries, bool keepScript)
 {
-    if (fHelp || params.size() < 1 || params.size() > 2)
-        throw runtime_error(
-            "generate numblocks ( maxtries )\n"
-            "\nMine up to numblocks blocks immediately (before the RPC call returns)\n"
-            "\nArguments:\n"
-            "1. numblocks    (numeric, required) How many blocks are generated immediately.\n"
-            "2. maxtries     (numeric, optional) How many iterations to try (default = 1000000).\n"
-            "\nResult\n"
-            "[ blockhashes ]     (array) hashes of blocks generated\n"
-            "\nExamples:\n"
-            "\nGenerate 11 blocks\n"
-            + HelpExampleCli("generate", "11")
-        );
-
     static const int nInnerLoopCount = 0x10000;
     int nHeightStart = 0;
     int nHeightEnd = 0;
     int nHeight = 0;
-    int nGenerate = params[0].get_int();
-    uint64_t nMaxTries = 1000000;
-    if (params.size() > 1) {
-        nMaxTries = params[1].get_int();
-    }
-
-    boost::shared_ptr<CReserveScript> coinbaseScript;
-    GetMainSignals().ScriptForMining(coinbaseScript);
-
-    // If the keypool is exhausted, no script is returned at all.  Catch this.
-    if (!coinbaseScript)
-        throw JSONRPCError(RPC_WALLET_KEYPOOL_RAN_OUT, "Error: Keypool ran out, please call keypoolrefill first");
-
-    //throw an error if no script was provided
-    if (coinbaseScript->reserveScript.empty())
-        throw JSONRPCError(RPC_INTERNAL_ERROR, "No coinbase script available (mining requires a wallet)");
 
     {   // Don't keep cs_main locked
         LOCK(cs_main);
@@ -164,12 +135,84 @@ UniValue generate(const UniValue& params, bool fHelp)
         ++nHeight;
         blockHashes.push_back(pblock->GetHash().GetHex());
 
-        //mark script as important because it was used at least for one coinbase output
-        coinbaseScript->KeepScript();
+        //mark script as important because it was used at least for one coinbase output if the script came from the wallet
+        if (keepScript)
+        {
+            coinbaseScript->KeepScript();
+        }
     }
     return blockHashes;
 }
 
+UniValue generate(const UniValue& params, bool fHelp)
+{
+    if (fHelp || params.size() < 1 || params.size() > 2)
+        throw runtime_error(
+            "generate numblocks ( maxtries )\n"
+            "\nMine up to numblocks blocks immediately (before the RPC call returns)\n"
+            "\nArguments:\n"
+            "1. numblocks    (numeric, required) How many blocks are generated immediately.\n"
+            "2. maxtries     (numeric, optional) How many iterations to try (default = 1000000).\n"
+            "\nResult\n"
+            "[ blockhashes ]     (array) hashes of blocks generated\n"
+            "\nExamples:\n"
+            "\nGenerate 11 blocks\n"
+            + HelpExampleCli("generate", "11")
+        );
+
+    int nGenerate = params[0].get_int();
+    uint64_t nMaxTries = 1000000;
+    if (params.size() > 1) {
+        nMaxTries = params[1].get_int();
+    }
+
+    boost::shared_ptr<CReserveScript> coinbaseScript;
+    GetMainSignals().ScriptForMining(coinbaseScript);
+
+    // If the keypool is exhausted, no script is returned at all.  Catch this.
+    if (!coinbaseScript)
+        throw JSONRPCError(RPC_WALLET_KEYPOOL_RAN_OUT, "Error: Keypool ran out, please call keypoolrefill first");
+
+    //throw an error if no script was provided
+    if (coinbaseScript->reserveScript.empty())
+        throw JSONRPCError(RPC_INTERNAL_ERROR, "No coinbase script available (mining requires a wallet)");
+
+    return generateBlocks(coinbaseScript, nGenerate, nMaxTries, true);
+}
+
+UniValue generatetoaddress(const UniValue& params, bool fHelp)
+{
+    if (fHelp || params.size() < 2 || params.size() > 3)
+        throw runtime_error(
+            "generatetoaddress numblocks address (maxtries)\n"
+            "\nMine blocks immediately to a specified address (before the RPC call returns)\n"
+            "\nArguments:\n"
+            "1. numblocks    (numeric, required) How many blocks are generated immediately.\n"
+            "2. address    (string, required) The address to send the newly generated bitcoin to.\n"
+            "3. maxtries     (numeric, optional) How many iterations to try (default = 1000000).\n"
+            "\nResult\n"
+            "[ blockhashes ]     (array) hashes of blocks generated\n"
+            "\nExamples:\n"
+            "\nGenerate 11 blocks to myaddress\n"
+            + HelpExampleCli("generatetoaddress", "11 \"myaddress\"")
+        );
+
+    int nGenerate = params[0].get_int();
+    uint64_t nMaxTries = 1000000;
+    if (params.size() > 2) {
+        nMaxTries = params[2].get_int();
+    }
+
+    CBitcoinAddress address(params[1].get_str());
+    if (!address.IsValid())
+        throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Error: Invalid address");
+    
+    boost::shared_ptr<CReserveScript> coinbaseScript(new CReserveScript());
+    coinbaseScript->reserveScript = GetScriptForDestination(address.Get());
+
+    return generateBlocks(coinbaseScript, nGenerate, nMaxTries, false);
+}
+
 UniValue getmininginfo(const UniValue& params, bool fHelp)
 {
     if (fHelp || params.size() != 0)
diff --git a/src/rpc/server.cpp b/src/rpc/server.cpp
index 33fa1437e253b..1303a3bb1331f 100644
--- a/src/rpc/server.cpp
+++ b/src/rpc/server.cpp
@@ -299,6 +299,7 @@ static const CRPCCommand vRPCCommands[] =
 
     /* Coin generation */
     { "generating",         "generate",               &generate,               true  },
+    { "generating",         "generatetoaddress",      &generatetoaddress,      true  },
 
     /* Raw transactions */
     { "rawtransactions",    "createrawtransaction",   &createrawtransaction,   true  },
diff --git a/src/rpc/server.h b/src/rpc/server.h
index 38cb32e7f234d..35e114feef3ff 100644
--- a/src/rpc/server.h
+++ b/src/rpc/server.h
@@ -193,6 +193,7 @@ extern UniValue listbanned(const UniValue& params, bool fHelp);
 extern UniValue clearbanned(const UniValue& params, bool fHelp);
 
 extern UniValue generate(const UniValue& params, bool fHelp);
+extern UniValue generatetoaddress(const UniValue& params, bool fHelp);
 extern UniValue getnetworkhashps(const UniValue& params, bool fHelp);
 extern UniValue getmininginfo(const UniValue& params, bool fHelp);
 extern UniValue prioritisetransaction(const UniValue& params, bool fHelp);

From d5c5c713e67368802b6a4ab2b6b69962364c251b Mon Sep 17 00:00:00 2001
From: Andrew C <achow101@gmail.com>
Date: Mon, 14 Mar 2016 17:54:34 -0400
Subject: [PATCH 0043/1802] RPC tests for generatetoaddress

Adds two RPC tests for the generatetoaddress RPC, one in the wallet, and one when the wallet is disabled.

The wallet RPC Test mines Bitcoin to another node's address and checks that that node has received the Bitcoin.

The RPC test without the wallet mines Bitcoin to an arbitrary address and checks that it works. It then mines to an arbitrary invalid address and checks that that fails.
---
 qa/rpc-tests/disablewallet.py | 14 ++++++++++++++
 qa/rpc-tests/wallet.py        | 12 ++++++++++++
 2 files changed, 26 insertions(+)

diff --git a/qa/rpc-tests/disablewallet.py b/qa/rpc-tests/disablewallet.py
index 6964348d55a61..5af8158467969 100755
--- a/qa/rpc-tests/disablewallet.py
+++ b/qa/rpc-tests/disablewallet.py
@@ -29,5 +29,19 @@ def run_test (self):
         x = self.nodes[0].validateaddress('mneYUmWYsuk7kySiURxCi3AGxrAqZxLgPZ')
         assert(x['isvalid'] == True)
 
+        # Checking mining to an address without a wallet
+        try:
+            self.nodes[0].generatetoaddress(1, 'mneYUmWYsuk7kySiURxCi3AGxrAqZxLgPZ')
+        except JSONRPCException,e:
+            assert("Invalid address" not in e.error['message'])
+            assert("ProcessNewBlock, block not accepted" not in e.error['message'])
+            assert("Couldn't create new block" not in e.error['message'])
+
+        try:
+            self.nodes[0].generatetoaddress(1, '3J98t1WpEZ73CNmQviecrnyiWrnqRhWNLy')
+            raise AssertionError("Must not mine to invalid address!")
+        except JSONRPCException,e:
+            assert("Invalid address" in e.error['message'])
+
 if __name__ == '__main__':
     DisableWalletTest ().main ()
diff --git a/qa/rpc-tests/wallet.py b/qa/rpc-tests/wallet.py
index f686e6be6c62d..df176601a54b3 100755
--- a/qa/rpc-tests/wallet.py
+++ b/qa/rpc-tests/wallet.py
@@ -262,6 +262,18 @@ def run_test (self):
 
         assert("not an integer" in errorString)
 
+        # Mine a block from node0 to an address from node1
+        cbAddr = self.nodes[1].getnewaddress()
+        blkHash = self.nodes[0].generatetoaddress(1, cbAddr)[0]
+        cbTxId = self.nodes[0].getblock(blkHash)['tx'][0]
+        self.sync_all()
+
+        # Check that the txid and balance is found by node1
+        try:
+            self.nodes[1].gettransaction(cbTxId)
+        except JSONRPCException,e:
+            assert("Invalid or non-wallet transaction id" not in e.error['message'])
+
         #check if wallet or blochchain maintenance changes the balance
         self.sync_all()
         blocks = self.nodes[0].generate(2)

From 9e072a6e66efbda7d39bf61eded21d2b324323be Mon Sep 17 00:00:00 2001
From: Alex Morcos <morcos@chaincode.com>
Date: Fri, 12 Feb 2016 15:57:15 -0500
Subject: [PATCH 0044/1802] Implement "feefilter" P2P message.

The "feefilter" p2p message is used to inform other nodes of your mempool min fee which is the feerate that any new transaction must meet to be accepted to your mempool.  This will allow them to filter invs to you according to this feerate.
---
 src/init.cpp                         |  1 +
 src/main.cpp                         | 73 +++++++++++++++++++++++-----
 src/main.h                           |  8 ++-
 src/net.cpp                          | 20 +++++---
 src/net.h                            | 10 +++-
 src/policy/fees.cpp                  | 19 ++++++++
 src/policy/fees.h                    | 13 +++++
 src/protocol.cpp                     |  4 +-
 src/protocol.h                       |  7 ++-
 src/rpc/rawtransaction.cpp           |  5 +-
 src/test/txvalidationcache_tests.cpp |  2 +-
 src/txmempool.cpp                    | 10 ++++
 src/txmempool.h                      |  1 +
 src/version.h                        |  5 +-
 src/wallet/wallet.cpp                |  6 ++-
 15 files changed, 152 insertions(+), 32 deletions(-)

diff --git a/src/init.cpp b/src/init.cpp
index f53d7d3c3c548..38ac91b2af8b4 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -330,6 +330,7 @@ std::string HelpMessage(HelpMessageMode mode)
     }
     strUsage += HelpMessageOpt("-datadir=<dir>", _("Specify data directory"));
     strUsage += HelpMessageOpt("-dbcache=<n>", strprintf(_("Set database cache size in megabytes (%d to %d, default: %d)"), nMinDbCache, nMaxDbCache, nDefaultDbCache));
+    strUsage += HelpMessageOpt("-feefilter", strprintf(_("Tell other nodes to filter invs to us by our mempool min fee (default: %u)"), DEFAULT_FEEFILTER));
     strUsage += HelpMessageOpt("-loadblock=<file>", _("Imports blocks from external blk000??.dat file on startup"));
     strUsage += HelpMessageOpt("-maxorphantx=<n>", strprintf(_("Keep at most <n> unconnectable transactions in memory (default: %u)"), DEFAULT_MAX_ORPHAN_TRANSACTIONS));
     strUsage += HelpMessageOpt("-maxmempool=<n>", strprintf(_("Keep the transaction memory pool below <n> megabytes (default: %u)"), DEFAULT_MAX_MEMPOOL_SIZE));
diff --git a/src/main.cpp b/src/main.cpp
index fc443cfb72006..36189f4ffc628 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -17,10 +17,12 @@
 #include "init.h"
 #include "merkleblock.h"
 #include "net.h"
+#include "policy/fees.h"
 #include "policy/policy.h"
 #include "pow.h"
 #include "primitives/block.h"
 #include "primitives/transaction.h"
+#include "random.h"
 #include "script/script.h"
 #include "script/sigcache.h"
 #include "script/standard.h"
@@ -81,6 +83,7 @@ CFeeRate minRelayTxFee = CFeeRate(DEFAULT_MIN_RELAY_TX_FEE);
 CAmount maxTxFee = DEFAULT_TRANSACTION_MAXFEE;
 
 CTxMemPool mempool(::minRelayTxFee);
+FeeFilterRounder filterRounder(::minRelayTxFee);
 
 struct COrphanTx {
     CTransaction tx;
@@ -987,7 +990,7 @@ std::string FormatStateMessage(const CValidationState &state)
 }
 
 bool AcceptToMemoryPoolWorker(CTxMemPool& pool, CValidationState& state, const CTransaction& tx, bool fLimitFree,
-                              bool* pfMissingInputs, bool fOverrideMempoolLimit, const CAmount nAbsurdFee,
+                              bool* pfMissingInputs, CFeeRate* txFeeRate, bool fOverrideMempoolLimit, const CAmount& nAbsurdFee,
                               std::vector<uint256>& vHashTxnToUncache)
 {
     const uint256 hash = tx.GetHash();
@@ -1144,6 +1147,9 @@ bool AcceptToMemoryPoolWorker(CTxMemPool& pool, CValidationState& state, const C
 
         CTxMemPoolEntry entry(tx, nFees, GetTime(), dPriority, chainActive.Height(), pool.HasNoInputsOf(tx), inChainInputValue, fSpendsCoinbase, nSigOps, lp);
         unsigned int nSize = entry.GetTxSize();
+        if (txFeeRate) {
+            *txFeeRate = CFeeRate(nFees, nSize);
+        }
 
         // Check that the transaction doesn't have an excessive number of
         // sigops, making it impossible to mine. Since the coinbase transaction
@@ -1392,10 +1398,10 @@ bool AcceptToMemoryPoolWorker(CTxMemPool& pool, CValidationState& state, const C
 }
 
 bool AcceptToMemoryPool(CTxMemPool& pool, CValidationState &state, const CTransaction &tx, bool fLimitFree,
-                        bool* pfMissingInputs, bool fOverrideMempoolLimit, const CAmount nAbsurdFee)
+                        bool* pfMissingInputs, CFeeRate* txFeeRate, bool fOverrideMempoolLimit, const CAmount nAbsurdFee)
 {
     std::vector<uint256> vHashTxToUncache;
-    bool res = AcceptToMemoryPoolWorker(pool, state, tx, fLimitFree, pfMissingInputs, fOverrideMempoolLimit, nAbsurdFee, vHashTxToUncache);
+    bool res = AcceptToMemoryPoolWorker(pool, state, tx, fLimitFree, pfMissingInputs, txFeeRate, fOverrideMempoolLimit, nAbsurdFee, vHashTxToUncache);
     if (!res) {
         BOOST_FOREACH(const uint256& hashTx, vHashTxToUncache)
             pcoinsTip->Uncache(hashTx);
@@ -2620,7 +2626,7 @@ bool static DisconnectTip(CValidationState& state, const Consensus::Params& cons
         // ignore validation errors in resurrected transactions
         list<CTransaction> removed;
         CValidationState stateDummy;
-        if (tx.IsCoinBase() || !AcceptToMemoryPool(mempool, stateDummy, tx, false, NULL, true)) {
+        if (tx.IsCoinBase() || !AcceptToMemoryPool(mempool, stateDummy, tx, false, NULL, NULL, true)) {
             mempool.removeRecursive(tx, removed);
         } else if (mempool.exists(tx.GetHash())) {
             vHashUpdate.push_back(tx.GetHash());
@@ -4916,10 +4922,10 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
         pfrom->setAskFor.erase(inv.hash);
         mapAlreadyAskedFor.erase(inv);
 
-        if (!AlreadyHave(inv) && AcceptToMemoryPool(mempool, state, tx, true, &fMissingInputs))
-        {
+        CFeeRate txFeeRate = CFeeRate(0);
+        if (!AlreadyHave(inv) && AcceptToMemoryPool(mempool, state, tx, true, &fMissingInputs, &txFeeRate)) {
             mempool.check(pcoinsTip);
-            RelayTransaction(tx);
+            RelayTransaction(tx, txFeeRate);
             vWorkQueue.push_back(inv.hash);
 
             LogPrint("mempool", "AcceptToMemoryPool: peer=%d: accepted %s (poolsz %u txn, %u kB)\n",
@@ -4950,10 +4956,10 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
 
                     if (setMisbehaving.count(fromPeer))
                         continue;
-                    if (AcceptToMemoryPool(mempool, stateDummy, orphanTx, true, &fMissingInputs2))
-                    {
+                    CFeeRate orphanFeeRate = CFeeRate(0);
+                    if (AcceptToMemoryPool(mempool, stateDummy, orphanTx, true, &fMissingInputs2, &orphanFeeRate)) {
                         LogPrint("mempool", "   accepted orphan tx %s\n", orphanHash.ToString());
-                        RelayTransaction(orphanTx);
+                        RelayTransaction(orphanTx, orphanFeeRate);
                         vWorkQueue.push_back(orphanHash);
                         vEraseQueue.push_back(orphanHash);
                     }
@@ -5006,7 +5012,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
                 int nDoS = 0;
                 if (!state.IsInvalid(nDoS) || nDoS == 0) {
                     LogPrintf("Force relaying tx %s from whitelisted peer=%d\n", tx.GetHash().ToString(), pfrom->id);
-                    RelayTransaction(tx);
+                    RelayTransaction(tx, txFeeRate);
                 } else {
                     LogPrintf("Not relaying invalid transaction %s from whitelisted peer=%d (%s)\n", tx.GetHash().ToString(), pfrom->id, FormatStateMessage(state));
                 }
@@ -5200,6 +5206,13 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
                 if (!fInMemPool) continue; // another thread removed since queryHashes, maybe...
                 if (!pfrom->pfilter->IsRelevantAndUpdate(tx)) continue;
             }
+            if (pfrom->minFeeFilter) {
+                CFeeRate feeRate;
+                mempool.lookupFeeRate(hash, feeRate);
+                LOCK(pfrom->cs_feeFilter);
+                if (feeRate.GetFeePerK() < pfrom->minFeeFilter)
+                    continue;
+            }
             vInv.push_back(inv);
             if (vInv.size() == MAX_INV_SZ) {
                 pfrom->PushMessage(NetMsgType::INV, vInv);
@@ -5362,8 +5375,19 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
         }
     }
 
-    else
-    {
+    else if (strCommand == NetMsgType::FEEFILTER) {
+        CAmount newFeeFilter = 0;
+        vRecv >> newFeeFilter;
+        if (MoneyRange(newFeeFilter)) {
+            {
+                LOCK(pfrom->cs_feeFilter);
+                pfrom->minFeeFilter = newFeeFilter;
+            }
+            LogPrint("net", "received: feefilter of %s from peer=%d\n", CFeeRate(newFeeFilter).ToString(), pfrom->id);
+        }
+    }
+
+    else {
         // Ignore unknown commands for extensibility
         LogPrint("net", "Unknown command \"%s\" from peer=%d\n", SanitizeString(strCommand), pfrom->id);
     }
@@ -5845,6 +5869,29 @@ bool SendMessages(CNode* pto)
         if (!vGetData.empty())
             pto->PushMessage(NetMsgType::GETDATA, vGetData);
 
+        //
+        // Message: feefilter
+        //
+        // We don't want white listed peers to filter txs to us if we have -whitelistforcerelay
+        if (pto->nVersion >= FEEFILTER_VERSION && GetBoolArg("-feefilter", DEFAULT_FEEFILTER) &&
+            !(pto->fWhitelisted && GetBoolArg("-whitelistforcerelay", DEFAULT_WHITELISTFORCERELAY))) {
+            CAmount currentFilter = mempool.GetMinFee(GetArg("-maxmempool", DEFAULT_MAX_MEMPOOL_SIZE) * 1000000).GetFeePerK();
+            int64_t timeNow = GetTimeMicros();
+            if (timeNow > pto->nextSendTimeFeeFilter) {
+                CAmount filterToSend = filterRounder.round(currentFilter);
+                if (filterToSend != pto->lastSentFeeFilter) {
+                    pto->PushMessage(NetMsgType::FEEFILTER, filterToSend);
+                    pto->lastSentFeeFilter = filterToSend;
+                }
+                pto->nextSendTimeFeeFilter = PoissonNextSend(timeNow, AVG_FEEFILTER_BROADCAST_INTERVAL);
+            }
+            // If the fee filter has changed substantially and it's still more than MAX_FEEFILTER_CHANGE_DELAY
+            // until scheduled broadcast, then move the broadcast to within MAX_FEEFILTER_CHANGE_DELAY.
+            else if (timeNow + MAX_FEEFILTER_CHANGE_DELAY * 1000000 < pto->nextSendTimeFeeFilter &&
+                     (currentFilter < 3 * pto->lastSentFeeFilter / 4 || currentFilter > 4 * pto->lastSentFeeFilter / 3)) {
+                pto->nextSendTimeFeeFilter = timeNow + (insecure_rand() % MAX_FEEFILTER_CHANGE_DELAY) * 1000000;
+            }
+        }
     }
     return true;
 }
diff --git a/src/main.h b/src/main.h
index a011ba4e55b7d..0bfcfab2132e5 100644
--- a/src/main.h
+++ b/src/main.h
@@ -102,6 +102,10 @@ static const unsigned int AVG_ADDRESS_BROADCAST_INTERVAL = 30;
 /** Average delay between trickled inventory broadcasts in seconds.
  *  Blocks, whitelisted receivers, and a random 25% of transactions bypass this. */
 static const unsigned int AVG_INVENTORY_BROADCAST_INTERVAL = 5;
+/** Average delay between feefilter broadcasts in seconds. */
+static const unsigned int AVG_FEEFILTER_BROADCAST_INTERVAL = 10 * 60;
+/** Maximum feefilter broadcast delay after significant change. */
+static const unsigned int MAX_FEEFILTER_CHANGE_DELAY = 5 * 60;
 
 static const unsigned int DEFAULT_LIMITFREERELAY = 15;
 static const bool DEFAULT_RELAYPRIORITY = true;
@@ -117,6 +121,8 @@ static const unsigned int DEFAULT_BANSCORE_THRESHOLD = 100;
 static const bool DEFAULT_TESTSAFEMODE = false;
 /** Default for -mempoolreplacement */
 static const bool DEFAULT_ENABLE_REPLACEMENT = true;
+/** Default for using fee filter */
+static const bool DEFAULT_FEEFILTER = true;
 
 /** Maximum number of headers to announce when relaying blocks with headers message.*/
 static const unsigned int MAX_BLOCKS_TO_ANNOUNCE = 8;
@@ -282,7 +288,7 @@ void PruneAndFlush();
 
 /** (try to) add transaction to memory pool **/
 bool AcceptToMemoryPool(CTxMemPool& pool, CValidationState &state, const CTransaction &tx, bool fLimitFree,
-                        bool* pfMissingInputs, bool fOverrideMempoolLimit=false, const CAmount nAbsurdFee=0);
+                        bool* pfMissingInputs, CFeeRate* txFeeRate, bool fOverrideMempoolLimit=false, const CAmount nAbsurdFee=0);
 
 /** Convert CValidationState to a human-readable message for logging */
 std::string FormatStateMessage(const CValidationState &state);
diff --git a/src/net.cpp b/src/net.cpp
index b589692d1b45f..e8cc753a486d0 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -2053,20 +2053,15 @@ class CNetCleanup
 instance_of_cnetcleanup;
 
 
-
-
-
-
-
-void RelayTransaction(const CTransaction& tx)
+void RelayTransaction(const CTransaction& tx, CFeeRate feerate)
 {
     CDataStream ss(SER_NETWORK, PROTOCOL_VERSION);
     ss.reserve(10000);
     ss << tx;
-    RelayTransaction(tx, ss);
+    RelayTransaction(tx, feerate, ss);
 }
 
-void RelayTransaction(const CTransaction& tx, const CDataStream& ss)
+void RelayTransaction(const CTransaction& tx, CFeeRate feerate, const CDataStream& ss)
 {
     CInv inv(MSG_TX, tx.GetHash());
     {
@@ -2087,6 +2082,11 @@ void RelayTransaction(const CTransaction& tx, const CDataStream& ss)
     {
         if(!pnode->fRelayTxes)
             continue;
+        {
+            LOCK(pnode->cs_feeFilter);
+            if (feerate.GetFeePerK() < pnode->minFeeFilter)
+                continue;
+        }
         LOCK(pnode->cs_filter);
         if (pnode->pfilter)
         {
@@ -2390,6 +2390,10 @@ CNode::CNode(SOCKET hSocketIn, const CAddress& addrIn, const std::string& addrNa
     nPingUsecTime = 0;
     fPingQueued = false;
     nMinPingUsecTime = std::numeric_limits<int64_t>::max();
+    minFeeFilter = 0;
+    lastSentFeeFilter = 0;
+    nextSendTimeFeeFilter = 0;
+
     BOOST_FOREACH(const std::string &msg, getAllNetMessageTypes())
         mapRecvBytesPerMsgCmd[msg] = 0;
     mapRecvBytesPerMsgCmd[NET_MESSAGE_COMMAND_OTHER] = 0;
diff --git a/src/net.h b/src/net.h
index ec296e2abacd5..ab9eb68d8577a 100644
--- a/src/net.h
+++ b/src/net.h
@@ -6,6 +6,7 @@
 #ifndef BITCOIN_NET_H
 #define BITCOIN_NET_H
 
+#include "amount.h"
 #include "bloom.h"
 #include "compat.h"
 #include "limitedmap.h"
@@ -415,6 +416,11 @@ class CNode
     int64_t nMinPingUsecTime;
     // Whether a ping is requested.
     bool fPingQueued;
+    // Minimum fee rate with which to filter inv's to this node
+    CAmount minFeeFilter;
+    CCriticalSection cs_feeFilter;
+    CAmount lastSentFeeFilter;
+    int64_t nextSendTimeFeeFilter;
 
     CNode(SOCKET hSocketIn, const CAddress &addrIn, const std::string &addrNameIn = "", bool fInboundIn = false);
     ~CNode();
@@ -766,8 +772,8 @@ class CNode
 
 
 class CTransaction;
-void RelayTransaction(const CTransaction& tx);
-void RelayTransaction(const CTransaction& tx, const CDataStream& ss);
+void RelayTransaction(const CTransaction& tx, CFeeRate feerate);
+void RelayTransaction(const CTransaction& tx, CFeeRate feerate, const CDataStream& ss);
 
 /** Access to the (IP) address database (peers.dat) */
 class CAddrDB
diff --git a/src/policy/fees.cpp b/src/policy/fees.cpp
index de3c060d6a6d9..7b0e8b7d08cf7 100644
--- a/src/policy/fees.cpp
+++ b/src/policy/fees.cpp
@@ -8,6 +8,7 @@
 
 #include "amount.h"
 #include "primitives/transaction.h"
+#include "random.h"
 #include "streams.h"
 #include "txmempool.h"
 #include "util.h"
@@ -580,3 +581,21 @@ void CBlockPolicyEstimator::Read(CAutoFile& filein)
     priStats.Read(filein);
     nBestSeenHeight = nFileBestSeenHeight;
 }
+
+FeeFilterRounder::FeeFilterRounder(const CFeeRate& minIncrementalFee)
+{
+    CAmount minFeeLimit = minIncrementalFee.GetFeePerK() / 2;
+    feeset.insert(0);
+    for (double bucketBoundary = minFeeLimit; bucketBoundary <= MAX_FEERATE; bucketBoundary *= FEE_SPACING) {
+        feeset.insert(bucketBoundary);
+    }
+}
+
+CAmount FeeFilterRounder::round(CAmount currentMinFee)
+{
+    std::set<double>::iterator it = feeset.lower_bound(currentMinFee);
+    if ((it != feeset.begin() && insecure_rand() % 3 != 0) || it == feeset.end()) {
+        it--;
+    }
+    return *it;
+}
diff --git a/src/policy/fees.h b/src/policy/fees.h
index 3fa31c39e745b..cdd984de7d5fc 100644
--- a/src/policy/fees.h
+++ b/src/policy/fees.h
@@ -286,4 +286,17 @@ class CBlockPolicyEstimator
     CFeeRate feeLikely, feeUnlikely;
     double priLikely, priUnlikely;
 };
+
+class FeeFilterRounder
+{
+public:
+    /** Create new FeeFilterRounder */
+    FeeFilterRounder(const CFeeRate& minIncrementalFee);
+
+    /** Quantize a minimum fee for privacy purpose before broadcast **/
+    CAmount round(CAmount currentMinFee);
+
+private:
+    std::set<double> feeset;
+};
 #endif /*BITCOIN_POLICYESTIMATOR_H */
diff --git a/src/protocol.cpp b/src/protocol.cpp
index 1ddb65b796814..8c4bd057254a3 100644
--- a/src/protocol.cpp
+++ b/src/protocol.cpp
@@ -34,6 +34,7 @@ const char *FILTERADD="filteradd";
 const char *FILTERCLEAR="filterclear";
 const char *REJECT="reject";
 const char *SENDHEADERS="sendheaders";
+const char *FEEFILTER="feefilter";
 };
 
 static const char* ppszTypeName[] =
@@ -68,7 +69,8 @@ const static std::string allNetMessageTypes[] = {
     NetMsgType::FILTERADD,
     NetMsgType::FILTERCLEAR,
     NetMsgType::REJECT,
-    NetMsgType::SENDHEADERS
+    NetMsgType::SENDHEADERS,
+    NetMsgType::FEEFILTER
 };
 const static std::vector<std::string> allNetMessageTypesVec(allNetMessageTypes, allNetMessageTypes+ARRAYLEN(allNetMessageTypes));
 
diff --git a/src/protocol.h b/src/protocol.h
index 5504f213f471c..1b049e52af8a6 100644
--- a/src/protocol.h
+++ b/src/protocol.h
@@ -211,7 +211,12 @@ extern const char *REJECT;
  * @see https://bitcoin.org/en/developer-reference#sendheaders
  */
 extern const char *SENDHEADERS;
-
+/**
+ * The feefilter message tells the receiving peer not to inv us any txs
+ * which do not meet the specified min fee rate.
+ * @since protocol version 70013 as described by BIP133
+ */
+extern const char *FEEFILTER;
 };
 
 /* Get a vector of all valid message types (see above) */
diff --git a/src/rpc/rawtransaction.cpp b/src/rpc/rawtransaction.cpp
index de89fdeb0f144..c72339313caf8 100644
--- a/src/rpc/rawtransaction.cpp
+++ b/src/rpc/rawtransaction.cpp
@@ -818,11 +818,12 @@ UniValue sendrawtransaction(const UniValue& params, bool fHelp)
     const CCoins* existingCoins = view.AccessCoins(hashTx);
     bool fHaveMempool = mempool.exists(hashTx);
     bool fHaveChain = existingCoins && existingCoins->nHeight < 1000000000;
+    CFeeRate txFeeRate = CFeeRate(0);
     if (!fHaveMempool && !fHaveChain) {
         // push to local node and sync with wallets
         CValidationState state;
         bool fMissingInputs;
-        if (!AcceptToMemoryPool(mempool, state, tx, false, &fMissingInputs, false, nMaxRawTxFee)) {
+        if (!AcceptToMemoryPool(mempool, state, tx, false, &fMissingInputs, &txFeeRate, false, nMaxRawTxFee)) {
             if (state.IsInvalid()) {
                 throw JSONRPCError(RPC_TRANSACTION_REJECTED, strprintf("%i: %s", state.GetRejectCode(), state.GetRejectReason()));
             } else {
@@ -835,7 +836,7 @@ UniValue sendrawtransaction(const UniValue& params, bool fHelp)
     } else if (fHaveChain) {
         throw JSONRPCError(RPC_TRANSACTION_ALREADY_IN_CHAIN, "transaction already in block chain");
     }
-    RelayTransaction(tx);
+    RelayTransaction(tx, txFeeRate);
 
     return hashTx.GetHex();
 }
diff --git a/src/test/txvalidationcache_tests.cpp b/src/test/txvalidationcache_tests.cpp
index c29e30792a2a9..237b26329b1c1 100644
--- a/src/test/txvalidationcache_tests.cpp
+++ b/src/test/txvalidationcache_tests.cpp
@@ -23,7 +23,7 @@ ToMemPool(CMutableTransaction& tx)
     LOCK(cs_main);
 
     CValidationState state;
-    return AcceptToMemoryPool(mempool, state, tx, false, NULL, true, 0);
+    return AcceptToMemoryPool(mempool, state, tx, false, NULL, NULL, true, 0);
 }
 
 BOOST_FIXTURE_TEST_CASE(tx_mempool_block_doublespend, TestChain100Setup)
diff --git a/src/txmempool.cpp b/src/txmempool.cpp
index 088e5edde5813..52c7793118331 100644
--- a/src/txmempool.cpp
+++ b/src/txmempool.cpp
@@ -771,6 +771,16 @@ bool CTxMemPool::lookup(uint256 hash, CTransaction& result) const
     return true;
 }
 
+bool CTxMemPool::lookupFeeRate(const uint256& hash, CFeeRate& feeRate) const
+{
+    LOCK(cs);
+    indexed_transaction_set::const_iterator i = mapTx.find(hash);
+    if (i == mapTx.end())
+        return false;
+    feeRate = CFeeRate(i->GetFee(), i->GetTxSize());
+    return true;
+}
+
 CFeeRate CTxMemPool::estimateFee(int nBlocks) const
 {
     LOCK(cs);
diff --git a/src/txmempool.h b/src/txmempool.h
index 665bb44cf3e75..9dbb37dad068f 100644
--- a/src/txmempool.h
+++ b/src/txmempool.h
@@ -600,6 +600,7 @@ class CTxMemPool
     }
 
     bool lookup(uint256 hash, CTransaction& result) const;
+    bool lookupFeeRate(const uint256& hash, CFeeRate& feeRate) const;
 
     /** Estimate fee rate needed to get into the next nBlocks
      *  If no answer can be given at nBlocks, return an estimate
diff --git a/src/version.h b/src/version.h
index af2eb8eab64ea..0e1d8a63ced6e 100644
--- a/src/version.h
+++ b/src/version.h
@@ -9,7 +9,7 @@
  * network protocol versioning
  */
 
-static const int PROTOCOL_VERSION = 70012;
+static const int PROTOCOL_VERSION = 70013;
 
 //! initial proto version, to be increased after version/verack negotiation
 static const int INIT_PROTO_VERSION = 209;
@@ -36,4 +36,7 @@ static const int NO_BLOOM_VERSION = 70011;
 //! "sendheaders" command and announcing blocks with headers starts with this version
 static const int SENDHEADERS_VERSION = 70012;
 
+//! "feefilter" tells peers to filter invs to you by fee starts with this version
+static const int FEEFILTER_VERSION = 70013;
+
 #endif // BITCOIN_VERSION_H
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index 1ef055e5521c0..654e617071b2a 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -1268,7 +1268,9 @@ bool CWalletTx::RelayWalletTransaction()
     {
         if (GetDepthInMainChain() == 0 && !isAbandoned() && InMempool()) {
             LogPrintf("Relaying wtx %s\n", GetHash().ToString());
-            RelayTransaction((CTransaction)*this);
+            CFeeRate feeRate;
+            mempool.lookupFeeRate(GetHash(), feeRate);
+            RelayTransaction((CTransaction)*this, feeRate);
             return true;
         }
     }
@@ -3231,5 +3233,5 @@ int CMerkleTx::GetBlocksToMaturity() const
 bool CMerkleTx::AcceptToMemoryPool(bool fLimitFree, CAmount nAbsurdFee)
 {
     CValidationState state;
-    return ::AcceptToMemoryPool(mempool, state, *this, fLimitFree, NULL, false, nAbsurdFee);
+    return ::AcceptToMemoryPool(mempool, state, *this, fLimitFree, NULL, NULL, false, nAbsurdFee);
 }

From 5fa66e4682a59047d2ed2934760ccc052fd85f50 Mon Sep 17 00:00:00 2001
From: Alex Morcos <morcos@chaincode.com>
Date: Fri, 4 Mar 2016 15:08:10 -0500
Subject: [PATCH 0045/1802] Create SingleNodeConnCB class for RPC tests

---
 qa/rpc-tests/maxuploadtarget.py         |  1 -
 qa/rpc-tests/test_framework/comptool.py | 14 ---------
 qa/rpc-tests/test_framework/mininode.py | 40 +++++++++++++++++++++++++
 3 files changed, 40 insertions(+), 15 deletions(-)

diff --git a/qa/rpc-tests/maxuploadtarget.py b/qa/rpc-tests/maxuploadtarget.py
index 2517bed4706ed..e4127500cd89b 100755
--- a/qa/rpc-tests/maxuploadtarget.py
+++ b/qa/rpc-tests/maxuploadtarget.py
@@ -7,7 +7,6 @@
 from test_framework.mininode import *
 from test_framework.test_framework import BitcoinTestFramework
 from test_framework.util import *
-from test_framework.comptool import wait_until
 import time
 
 '''
diff --git a/qa/rpc-tests/test_framework/comptool.py b/qa/rpc-tests/test_framework/comptool.py
index a4cd4d0a89780..e3f9b4323546c 100755
--- a/qa/rpc-tests/test_framework/comptool.py
+++ b/qa/rpc-tests/test_framework/comptool.py
@@ -27,20 +27,6 @@
 
 global mininode_lock
 
-def wait_until(predicate, attempts=float('inf'), timeout=float('inf')):
-    attempt = 0
-    elapsed = 0
-
-    while attempt < attempts and elapsed < timeout:
-        with mininode_lock:
-            if predicate():
-                return True
-        attempt += 1
-        elapsed += 0.05
-        time.sleep(0.05)
-
-    return False
-
 class RejectResult(object):
     '''
     Outcome that expects rejection of a transaction or block.
diff --git a/qa/rpc-tests/test_framework/mininode.py b/qa/rpc-tests/test_framework/mininode.py
index 934d0c7a7557a..5b6bb190e40e1 100755
--- a/qa/rpc-tests/test_framework/mininode.py
+++ b/qa/rpc-tests/test_framework/mininode.py
@@ -1008,6 +1008,20 @@ def __repr__(self):
         return "msg_reject: %s %d %s [%064x]" \
             % (self.message, self.code, self.reason, self.data)
 
+# Helper function
+def wait_until(predicate, attempts=float('inf'), timeout=float('inf')):
+    attempt = 0
+    elapsed = 0
+
+    while attempt < attempts and elapsed < timeout:
+        with mininode_lock:
+            if predicate():
+                return True
+        attempt += 1
+        elapsed += 0.05
+        time.sleep(0.05)
+
+    return False
 
 # This is what a callback should look like for NodeConn
 # Reimplement the on_* functions to provide handling for events
@@ -1085,6 +1099,32 @@ def on_close(self, conn): pass
     def on_mempool(self, conn): pass
     def on_pong(self, conn, message): pass
 
+# More useful callbacks and functions for NodeConnCB's which have a single NodeConn
+class SingleNodeConnCB(NodeConnCB):
+    def __init__(self):
+        NodeConnCB.__init__(self)
+        self.connection = None
+        self.ping_counter = 1
+        self.last_pong = msg_pong()
+
+    def add_connection(self, conn):
+        self.connection = conn
+
+    # Wrapper for the NodeConn's send_message function
+    def send_message(self, message):
+        self.connection.send_message(message)
+
+    def on_pong(self, conn, message):
+        self.last_pong = message
+
+    # Sync up with the node
+    def sync_with_ping(self, timeout=30):
+        def received_pong():
+            return (self.last_pong.nonce == self.ping_counter)
+        self.send_message(msg_ping(nonce=self.ping_counter))
+        success = wait_until(received_pong, timeout)
+        self.ping_counter += 1
+        return success
 
 # The actual NodeConn class
 # This class provides an interface for a p2p connection to a specified node

From b536a6fc83ee20cfb80da8bcb5f21c664ec7b5fe Mon Sep 17 00:00:00 2001
From: Alex Morcos <morcos@chaincode.com>
Date: Fri, 4 Mar 2016 16:11:49 -0500
Subject: [PATCH 0046/1802] Add p2p test for feefilter

---
 qa/pull-tester/rpc-tests.py             |  3 +-
 qa/rpc-tests/p2p-feefilter.py           | 99 +++++++++++++++++++++++++
 qa/rpc-tests/test_framework/mininode.py | 21 +++++-
 3 files changed, 121 insertions(+), 2 deletions(-)
 create mode 100755 qa/rpc-tests/p2p-feefilter.py

diff --git a/qa/pull-tester/rpc-tests.py b/qa/pull-tester/rpc-tests.py
index f15eaacbdaed8..74be96da74641 100755
--- a/qa/pull-tester/rpc-tests.py
+++ b/qa/pull-tester/rpc-tests.py
@@ -127,7 +127,6 @@
     'getblocktemplate_proposals.py',
     'txn_doublespend.py',
     'txn_clone.py --mineblock',
-    'pruning.py',
     'forknotify.py',
     'invalidateblock.py',
 #    'rpcbind_test.py', #temporary, bug in libevent, see #6655
@@ -137,6 +136,8 @@
     'mempool_packages.py',
     'maxuploadtarget.py',
     'replace-by-fee.py',
+    'p2p-feefilter.py',
+    'pruning.py', # leave pruning last as it takes a REALLY long time
 ]
 
 #Enable ZMQ tests
diff --git a/qa/rpc-tests/p2p-feefilter.py b/qa/rpc-tests/p2p-feefilter.py
new file mode 100755
index 0000000000000..f85c18dcd5140
--- /dev/null
+++ b/qa/rpc-tests/p2p-feefilter.py
@@ -0,0 +1,99 @@
+#!/usr/bin/env python2
+# Copyright (c) 2016 The Bitcoin Core developers
+# Distributed under the MIT/X11 software license, see the accompanying
+# file COPYING or http://www.opensource.org/licenses/mit-license.php.
+#
+
+from test_framework.mininode import *
+from test_framework.test_framework import BitcoinTestFramework
+from test_framework.util import *
+import time
+
+'''
+FeeFilterTest -- test processing of feefilter messages
+'''
+
+def hashToHex(hash):
+    return format(hash, '064x').decode('utf-8')
+
+# Wait up to 60 secs to see if the testnode has received all the expected invs
+def allInvsMatch(invsExpected, testnode):
+    for x in xrange(60):
+        with mininode_lock:
+            if (sorted(invsExpected) == sorted(testnode.txinvs)):
+                return True;
+        time.sleep(1)
+    return False;
+
+# TestNode: bare-bones "peer".  Used to track which invs are received from a node
+# and to send the node feefilter messages.
+class TestNode(SingleNodeConnCB):
+    def __init__(self):
+        SingleNodeConnCB.__init__(self)
+        self.txinvs = []
+
+    def on_inv(self, conn, message):
+        for i in message.inv:
+            if (i.type == 1):
+                self.txinvs.append(hashToHex(i.hash))
+
+    def clear_invs(self):
+        with mininode_lock:
+            self.txinvs = []
+
+    def send_filter(self, feerate):
+        self.send_message(msg_feefilter(feerate))
+        self.sync_with_ping()
+
+class FeeFilterTest(BitcoinTestFramework):
+    def setup_network(self):
+        # Node1 will be used to generate txs which should be relayed from Node0
+        # to our test node
+        self.nodes = []
+        self.nodes.append(start_node(0, self.options.tmpdir, ["-debug", "-logtimemicros"]))
+        self.nodes.append(start_node(1, self.options.tmpdir, ["-debug", "-logtimemicros"]))
+        connect_nodes(self.nodes[0], 1)
+
+    def run_test(self):
+        node1 = self.nodes[1]
+        # Get out of IBD
+        node1.generate(1)
+        sync_blocks(self.nodes)
+
+        # Setup the p2p connections and start up the network thread.
+        test_node = TestNode()
+        connection = NodeConn('127.0.0.1', p2p_port(0), self.nodes[0], test_node)
+        test_node.add_connection(connection)
+        NetworkThread().start()
+        test_node.wait_for_verack()
+
+        # Test that invs are received for all txs at feerate of 20 sat/byte
+        node1.settxfee(Decimal("0.00020000"))
+        txids = [node1.sendtoaddress(node1.getnewaddress(), 1) for x in xrange(3)]
+        assert(allInvsMatch(txids, test_node))
+        test_node.clear_invs()
+
+        # Set a filter of 15 sat/byte
+        test_node.send_filter(15000)
+
+        # Test that txs are still being received (paying 20 sat/byte)
+        txids = [node1.sendtoaddress(node1.getnewaddress(), 1) for x in xrange(3)]
+        assert(allInvsMatch(txids, test_node))
+        test_node.clear_invs()
+
+        # Change tx fee rate to 10 sat/byte and test they are no longer received
+        node1.settxfee(Decimal("0.00010000"))
+        [node1.sendtoaddress(node1.getnewaddress(), 1) for x in xrange(3)]
+        sync_mempools(self.nodes) # must be sure node 0 has received all txs 
+        time.sleep(10) # wait 10 secs to be sure its doesn't relay any
+        assert(allInvsMatch([], test_node))
+        test_node.clear_invs()
+
+        # Remove fee filter and check that txs are received again
+        test_node.send_filter(0)
+        txids = [node1.sendtoaddress(node1.getnewaddress(), 1) for x in xrange(3)]
+        assert(allInvsMatch(txids, test_node))
+        test_node.clear_invs()
+
+if __name__ == '__main__':
+    FeeFilterTest().main()
diff --git a/qa/rpc-tests/test_framework/mininode.py b/qa/rpc-tests/test_framework/mininode.py
index 5b6bb190e40e1..20386c642c67b 100755
--- a/qa/rpc-tests/test_framework/mininode.py
+++ b/qa/rpc-tests/test_framework/mininode.py
@@ -1023,6 +1023,23 @@ def wait_until(predicate, attempts=float('inf'), timeout=float('inf')):
 
     return False
 
+class msg_feefilter(object):
+    command = "feefilter"
+
+    def __init__(self, feerate=0L):
+        self.feerate = feerate
+
+    def deserialize(self, f):
+        self.feerate = struct.unpack("<Q", f.read(8))[0]
+
+    def serialize(self):
+        r = ""
+        r += struct.pack("<Q", self.feerate)
+        return r
+
+    def __repr__(self):
+        return "msg_feefilter(feerate=%08x)" % self.feerate
+
 # This is what a callback should look like for NodeConn
 # Reimplement the on_* functions to provide handling for events
 class NodeConnCB(object):
@@ -1098,6 +1115,7 @@ def on_reject(self, conn, message): pass
     def on_close(self, conn): pass
     def on_mempool(self, conn): pass
     def on_pong(self, conn, message): pass
+    def on_feefilter(self, conn, message): pass
 
 # More useful callbacks and functions for NodeConnCB's which have a single NodeConn
 class SingleNodeConnCB(NodeConnCB):
@@ -1145,7 +1163,8 @@ class NodeConn(asyncore.dispatcher):
         "headers": msg_headers,
         "getheaders": msg_getheaders,
         "reject": msg_reject,
-        "mempool": msg_mempool
+        "mempool": msg_mempool,
+        "feefilter": msg_feefilter
     }
     MAGIC_BYTES = {
         "mainnet": "\xf9\xbe\xb4\xd9",   # mainnet

From 0371797e2a57711a742a810a719a279aea0bc694 Mon Sep 17 00:00:00 2001
From: Alex Morcos <morcos@chaincode.com>
Date: Fri, 4 Mar 2016 16:25:19 -0500
Subject: [PATCH 0047/1802] modify release-notes.md and bips.md

---
 doc/bips.md          | 1 +
 doc/release-notes.md | 9 +++++++++
 2 files changed, 10 insertions(+)

diff --git a/doc/bips.md b/doc/bips.md
index 2552a7f03af24..b8efabbcf251c 100644
--- a/doc/bips.md
+++ b/doc/bips.md
@@ -20,3 +20,4 @@ BIPs that are implemented by Bitcoin Core (up-to-date up to **v0.12.0**):
 * [`BIP 111`](https://github.com/bitcoin/bips/blob/master/bip-0111.mediawiki): `NODE_BLOOM` service bit added, and enforced for all peer versions as of **v0.13.0** ([PR #6579](https://github.com/bitcoin/bitcoin/pull/6579) and [PR #6641](https://github.com/bitcoin/bitcoin/pull/6641)).
 * [`BIP 125`](https://github.com/bitcoin/bips/blob/master/bip-0125.mediawiki): Opt-in full replace-by-fee signaling honoured in mempool and mining as of **v0.12.0** ([PR 6871](https://github.com/bitcoin/bitcoin/pull/6871)).
 * [`BIP 130`](https://github.com/bitcoin/bips/blob/master/bip-0130.mediawiki): direct headers announcement is negotiated with peer versions `>=70012` as of **v0.12.0** ([PR 6494](https://github.com/bitcoin/bitcoin/pull/6494)).
+* [`BIP 133`](https://github.com/bitcoin/bips/blob/master/bip-0133.mediawiki): feefilter messages are respected and sent for peer versions `>=70013` as of **v0.13.0** ([PR 7542](https://github.com/bitcoin/bitcoin/pull/7542)).
diff --git a/doc/release-notes.md b/doc/release-notes.md
index 43e1e3fb9aabb..806d174ebf7fc 100644
--- a/doc/release-notes.md
+++ b/doc/release-notes.md
@@ -53,6 +53,15 @@ The following outputs are affected by this change:
 
 The p2p alert system has been removed in #7692 and the 'alert' message is no longer supported.
 
+
+Fee filtering of invs (BIP 133)
+------------------------------------
+
+The optional new p2p message "feefilter" is implemented and the protocol
+version is bumped to 70013. Upon receiving a feefilter message from a peer,
+a node will not send invs for any transactions which do not meet the filter
+feerate. [BIP 133](https://github.com/bitcoin/bips/blob/master/bip-0133.mediawiki)
+
 ### Validation
 
 ### Build system

From 25340b7cd58c3451ae91c7b501fdff70ef05ec80 Mon Sep 17 00:00:00 2001
From: Jonas Schnelli <dev@jonasschnelli.ch>
Date: Tue, 15 Mar 2016 10:30:37 +0100
Subject: [PATCH 0048/1802] [Wallet] refactor wallet/init interaction

---
 src/init.cpp              |  86 ++---------------------
 src/init.h                |   2 -
 src/test/test_bitcoin.cpp |   1 -
 src/wallet/wallet.cpp     | 143 ++++++++++++++++++++++++++++----------
 src/wallet/wallet.h       |  11 ++-
 5 files changed, 118 insertions(+), 125 deletions(-)

diff --git a/src/init.cpp b/src/init.cpp
index 637b69ab0571e..957583870784d 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -63,9 +63,6 @@
 
 using namespace std;
 
-#ifdef ENABLE_WALLET
-CWallet* pwalletMain = NULL;
-#endif
 bool fFeeEstimatesInitialized = false;
 static const bool DEFAULT_PROXYRANDOMIZE = true;
 static const bool DEFAULT_REST_ENABLE = false;
@@ -946,56 +943,8 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
     nBytesPerSigOp = GetArg("-bytespersigop", nBytesPerSigOp);
 
 #ifdef ENABLE_WALLET
-    if (mapArgs.count("-mintxfee"))
-    {
-        CAmount n = 0;
-        if (ParseMoney(mapArgs["-mintxfee"], n) && n > 0)
-            CWallet::minTxFee = CFeeRate(n);
-        else
-            return InitError(AmountErrMsg("mintxfee", mapArgs["-mintxfee"]));
-    }
-    if (mapArgs.count("-fallbackfee"))
-    {
-        CAmount nFeePerK = 0;
-        if (!ParseMoney(mapArgs["-fallbackfee"], nFeePerK))
-            return InitError(strprintf(_("Invalid amount for -fallbackfee=<amount>: '%s'"), mapArgs["-fallbackfee"]));
-        if (nFeePerK > HIGH_TX_FEE_PER_KB)
-            InitWarning(_("-fallbackfee is set very high! This is the transaction fee you may pay when fee estimates are not available."));
-        CWallet::fallbackFee = CFeeRate(nFeePerK);
-    }
-    if (mapArgs.count("-paytxfee"))
-    {
-        CAmount nFeePerK = 0;
-        if (!ParseMoney(mapArgs["-paytxfee"], nFeePerK))
-            return InitError(AmountErrMsg("paytxfee", mapArgs["-paytxfee"]));
-        if (nFeePerK > HIGH_TX_FEE_PER_KB)
-            InitWarning(_("-paytxfee is set very high! This is the transaction fee you will pay if you send a transaction."));
-        payTxFee = CFeeRate(nFeePerK, 1000);
-        if (payTxFee < ::minRelayTxFee)
-        {
-            return InitError(strprintf(_("Invalid amount for -paytxfee=<amount>: '%s' (must be at least %s)"),
-                                       mapArgs["-paytxfee"], ::minRelayTxFee.ToString()));
-        }
-    }
-    if (mapArgs.count("-maxtxfee"))
-    {
-        CAmount nMaxFee = 0;
-        if (!ParseMoney(mapArgs["-maxtxfee"], nMaxFee))
-            return InitError(AmountErrMsg("maxtxfee", mapArgs["-maxtxfee"]));
-        if (nMaxFee > HIGH_MAX_TX_FEE)
-            InitWarning(_("-maxtxfee is set very high! Fees this large could be paid on a single transaction."));
-        maxTxFee = nMaxFee;
-        if (CFeeRate(maxTxFee, 1000) < ::minRelayTxFee)
-        {
-            return InitError(strprintf(_("Invalid amount for -maxtxfee=<amount>: '%s' (must be at least the minrelay fee of %s to prevent stuck transactions)"),
-                                       mapArgs["-maxtxfee"], ::minRelayTxFee.ToString()));
-        }
-    }
-    nTxConfirmTarget = GetArg("-txconfirmtarget", DEFAULT_TX_CONFIRM_TARGET);
-    bSpendZeroConfChange = GetBoolArg("-spendzeroconfchange", DEFAULT_SPEND_ZEROCONF_CHANGE);
-    fSendFreeTransactions = GetBoolArg("-sendfreetransactions", DEFAULT_SEND_FREE_TRANSACTIONS);
-
-    std::string strWalletFile = GetArg("-wallet", DEFAULT_WALLET_DAT);
+    if (!CWallet::ParameterInteraction())
+        return false;
 #endif // ENABLE_WALLET
 
     fIsBareMultisigStd = GetBoolArg("-permitbaremultisig", DEFAULT_PERMIT_BAREMULTISIG);
@@ -1032,11 +981,7 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
         return InitError(strprintf(_("Initialization sanity check failed. %s is shutting down."), _(PACKAGE_NAME)));
 
     std::string strDataDir = GetDataDir().string();
-#ifdef ENABLE_WALLET
-    // Wallet file must be a plain filename without a directory
-    if (strWalletFile != boost::filesystem::basename(strWalletFile) + boost::filesystem::extension(strWalletFile))
-        return InitError(strprintf(_("Wallet %s resides outside data directory %s"), strWalletFile, strDataDir));
-#endif
+
     // Make sure only a single Bitcoin process is using the data directory.
     boost::filesystem::path pathLockFile = GetDataDir() / ".lock";
     FILE* file = fopen(pathLockFile.string().c_str(), "a"); // empty lock file; created if it doesn't exist.
@@ -1097,20 +1042,8 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
     // ********************************************************* Step 5: verify wallet database integrity
 #ifdef ENABLE_WALLET
     if (!fDisableWallet) {
-        LogPrintf("Using wallet %s\n", strWalletFile);
-        uiInterface.InitMessage(_("Verifying wallet..."));
-
-        std::string warningString;
-        std::string errorString;
-
-        if (!CWallet::Verify(strWalletFile, warningString, errorString))
+        if (!CWallet::Verify())
             return false;
-
-        if (!warningString.empty())
-            InitWarning(warningString);
-        if (!errorString.empty())
-            return InitError(errorString);
-
     } // (!fDisableWallet)
 #endif // ENABLE_WALLET
     // ********************************************************* Step 6: network initialization
@@ -1421,16 +1354,7 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
         pwalletMain = NULL;
         LogPrintf("Wallet disabled!\n");
     } else {
-        std::string warningString;
-        std::string errorString;
-        pwalletMain = CWallet::InitLoadWallet(fDisableWallet, strWalletFile, warningString, errorString);
-        if (!warningString.empty())
-            InitWarning(warningString);
-        if (!errorString.empty())
-        {
-            LogPrintf("%s", errorString);
-            return InitError(errorString);
-        }
+        CWallet::InitLoadWallet();
         if (!pwalletMain)
             return false;
     }
diff --git a/src/init.h b/src/init.h
index af1b94b72a520..63e07ccb3c66a 100644
--- a/src/init.h
+++ b/src/init.h
@@ -16,8 +16,6 @@ namespace boost
 class thread_group;
 } // namespace boost
 
-extern CWallet* pwalletMain;
-
 void StartShutdown();
 bool ShutdownRequested();
 /** Interrupt threads */
diff --git a/src/test/test_bitcoin.cpp b/src/test/test_bitcoin.cpp
index 39586d7bb4992..9159a4499feb8 100644
--- a/src/test/test_bitcoin.cpp
+++ b/src/test/test_bitcoin.cpp
@@ -29,7 +29,6 @@
 #include <boost/thread.hpp>
 
 CClientUIInterface uiInterface; // Declared but not defined in ui_interface.h
-CWallet* pwalletMain;
 
 extern bool fPrintToConsole;
 extern void noui_connect();
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index bcfefa27ff269..026bf9ac598ab 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -33,6 +33,7 @@
 
 using namespace std;
 
+CWallet* pwalletMain = NULL;
 /** Transaction fee set by the user */
 CFeeRate payTxFee(DEFAULT_TRANSACTION_FEE);
 unsigned int nTxConfirmTarget = DEFAULT_TX_CONFIRM_TARGET;
@@ -364,8 +365,33 @@ void CWallet::Flush(bool shutdown)
     bitdb.Flush(shutdown);
 }
 
-bool CWallet::Verify(const string& walletFile, string& warningString, string& errorString)
+bool static UIError(const std::string &str)
 {
+    uiInterface.ThreadSafeMessageBox(str, "", CClientUIInterface::MSG_ERROR);
+    return false;
+}
+
+void static UIWarning(const std::string &str)
+{
+    uiInterface.ThreadSafeMessageBox(str, "", CClientUIInterface::MSG_WARNING);
+}
+
+static std::string AmountErrMsg(const char * const optname, const std::string& strValue)
+{
+    return strprintf(_("Invalid amount for -%s=<amount>: '%s'"), optname, strValue);
+}
+
+bool CWallet::Verify()
+{
+    std::string walletFile = GetArg("-wallet", DEFAULT_WALLET_DAT);
+
+    LogPrintf("Using wallet %s\n", walletFile);
+    uiInterface.InitMessage(_("Verifying wallet..."));
+
+    // Wallet file must be a plain filename without a directory
+    if (walletFile != boost::filesystem::basename(walletFile) + boost::filesystem::extension(walletFile))
+        return UIError(strprintf(_("Wallet %s resides outside data directory %s"), walletFile, GetDataDir().string()));
+
     if (!bitdb.Open(GetDataDir()))
     {
         // try moving the database env out of the way
@@ -381,9 +407,7 @@ bool CWallet::Verify(const string& walletFile, string& warningString, string& er
         // try again
         if (!bitdb.Open(GetDataDir())) {
             // if it still fails, it probably means we can't even create the database env
-            string msg = strprintf(_("Error initializing wallet database environment %s!"), GetDataDir());
-            errorString += msg;
-            return true;
+            return UIError(strprintf(_("Error initializing wallet database environment %s!"), GetDataDir()));
         }
     }
     
@@ -399,14 +423,14 @@ bool CWallet::Verify(const string& walletFile, string& warningString, string& er
         CDBEnv::VerifyResult r = bitdb.Verify(walletFile, CWalletDB::Recover);
         if (r == CDBEnv::RECOVER_OK)
         {
-            warningString += strprintf(_("Warning: Wallet file corrupt, data salvaged!"
+            UIWarning(strprintf(_("Warning: Wallet file corrupt, data salvaged!"
                                          " Original %s saved as %s in %s; if"
                                          " your balance or transactions are incorrect you should"
                                          " restore from a backup."),
-                walletFile, "wallet.{timestamp}.bak", GetDataDir());
+                walletFile, "wallet.{timestamp}.bak", GetDataDir()));
         }
         if (r == CDBEnv::RECOVER_FAIL)
-            errorString += strprintf(_("%s corrupt, salvage failed"), walletFile);
+            return UIError(strprintf(_("%s corrupt, salvage failed"), walletFile));
     }
     
     return true;
@@ -2992,20 +3016,20 @@ std::string CWallet::GetWalletHelpString(bool showDebug)
     return strUsage;
 }
 
-CWallet* CWallet::InitLoadWallet(bool fDisableWallet, const std::string& strWalletFile, std::string& warningString, std::string& errorString)
+bool CWallet::InitLoadWallet()
 {
+    std::string walletFile = GetArg("-wallet", DEFAULT_WALLET_DAT);
+
     // needed to restore wallet transaction meta data after -zapwallettxes
     std::vector<CWalletTx> vWtx;
 
     if (GetBoolArg("-zapwallettxes", false)) {
         uiInterface.InitMessage(_("Zapping all transactions from wallet..."));
 
-        CWallet *tempWallet = new CWallet(strWalletFile);
+        CWallet *tempWallet = new CWallet(walletFile);
         DBErrors nZapWalletRet = tempWallet->ZapWalletTx(vWtx);
         if (nZapWalletRet != DB_LOAD_OK) {
-            errorString = strprintf(_("Error loading %s: Wallet corrupted"), strWalletFile);
-            uiInterface.InitMessage(strprintf(_("Error loading %s: Wallet corrupted"), strWalletFile));
-            return NULL;
+            return UIError(strprintf(_("Error loading %s: Wallet corrupted"), walletFile));
         }
 
         delete tempWallet;
@@ -3016,32 +3040,27 @@ CWallet* CWallet::InitLoadWallet(bool fDisableWallet, const std::string& strWall
 
     int64_t nStart = GetTimeMillis();
     bool fFirstRun = true;
-    CWallet *walletInstance = new CWallet(strWalletFile);
+    CWallet *walletInstance = new CWallet(walletFile);
     DBErrors nLoadWalletRet = walletInstance->LoadWallet(fFirstRun);
     if (nLoadWalletRet != DB_LOAD_OK)
     {
         if (nLoadWalletRet == DB_CORRUPT)
-            errorString += strprintf(_("Error loading %s: Wallet corrupted"), strWalletFile) + "\n";
+            return UIError(strprintf(_("Error loading %s: Wallet corrupted"), walletFile));
         else if (nLoadWalletRet == DB_NONCRITICAL_ERROR)
         {
-            warningString += strprintf(_("Error reading %s! All keys read correctly, but transaction data"
+            UIWarning(strprintf(_("Error reading %s! All keys read correctly, but transaction data"
                                          " or address book entries might be missing or incorrect."),
-                strWalletFile);
+                walletFile));
         }
         else if (nLoadWalletRet == DB_TOO_NEW)
-            errorString += strprintf(_("Error loading %s: Wallet requires newer version of %s"),
-                               strWalletFile, _(PACKAGE_NAME)) +
-                           "\n";
+            return UIError(strprintf(_("Error loading %s: Wallet requires newer version of %s"),
+                               walletFile, _(PACKAGE_NAME)));
         else if (nLoadWalletRet == DB_NEED_REWRITE)
         {
-            errorString += strprintf(_("Wallet needed to be rewritten: restart %s to complete"), _(PACKAGE_NAME)) + "\n";
-            LogPrintf("%s", errorString);
+            return UIError(strprintf(_("Wallet needed to be rewritten: restart %s to complete"), _(PACKAGE_NAME)));
         }
         else
-            errorString += strprintf(_("Error loading %s"), strWalletFile) + "\n";
-
-        if (!errorString.empty())
-            return NULL;
+            return UIError(strprintf(_("Error loading %s"), walletFile));
     }
 
     if (GetBoolArg("-upgradewallet", fFirstRun))
@@ -3057,8 +3076,7 @@ CWallet* CWallet::InitLoadWallet(bool fDisableWallet, const std::string& strWall
             LogPrintf("Allowing wallet upgrade up to %i\n", nMaxVersion);
         if (nMaxVersion < walletInstance->GetVersion())
         {
-            errorString += _("Cannot downgrade wallet") + "\n";
-            return NULL;
+            return UIError(_("Cannot downgrade wallet"));
         }
         walletInstance->SetMaxVersion(nMaxVersion);
     }
@@ -3072,10 +3090,7 @@ CWallet* CWallet::InitLoadWallet(bool fDisableWallet, const std::string& strWall
         if (walletInstance->GetKeyFromPool(newDefaultKey)) {
             walletInstance->SetDefaultKey(newDefaultKey);
             if (!walletInstance->SetAddressBook(walletInstance->vchDefaultKey.GetID(), "", "receive"))
-            {
-                errorString += _("Cannot write default address") += "\n";
-                return NULL;
-            }
+                return UIError(_("Cannot write default address") += "\n");
         }
 
         walletInstance->SetBestChain(chainActive.GetLocator());
@@ -3090,7 +3105,7 @@ CWallet* CWallet::InitLoadWallet(bool fDisableWallet, const std::string& strWall
         pindexRescan = chainActive.Genesis();
     else
     {
-        CWalletDB walletdb(strWalletFile);
+        CWalletDB walletdb(walletFile);
         CBlockLocator locator;
         if (walletdb.ReadBestBlock(locator))
             pindexRescan = FindForkInGlobalIndex(chainActive, locator);
@@ -3109,10 +3124,7 @@ CWallet* CWallet::InitLoadWallet(bool fDisableWallet, const std::string& strWall
                 block = block->pprev;
 
             if (pindexRescan != block)
-            {
-                errorString = _("Prune: last wallet synchronisation goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of pruned node)");
-                return NULL;
-            }
+                return UIError(_("Prune: last wallet synchronisation goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of pruned node)"));
         }
 
         uiInterface.InitMessage(_("Rescanning..."));
@@ -3126,7 +3138,7 @@ CWallet* CWallet::InitLoadWallet(bool fDisableWallet, const std::string& strWall
         // Restore wallet transaction metadata after -zapwallettxes=1
         if (GetBoolArg("-zapwallettxes", false) && GetArg("-zapwallettxes", "1") != "2")
         {
-            CWalletDB walletdb(strWalletFile);
+            CWalletDB walletdb(walletFile);
 
             BOOST_FOREACH(const CWalletTx& wtxOld, vWtx)
             {
@@ -3150,7 +3162,62 @@ CWallet* CWallet::InitLoadWallet(bool fDisableWallet, const std::string& strWall
     }
     walletInstance->SetBroadcastTransactions(GetBoolArg("-walletbroadcast", DEFAULT_WALLETBROADCAST));
 
-    return walletInstance;
+    pwalletMain = walletInstance;
+    return true;
+}
+
+bool CWallet::ParameterInteraction()
+{
+    if (mapArgs.count("-mintxfee"))
+    {
+        CAmount n = 0;
+        if (ParseMoney(mapArgs["-mintxfee"], n) && n > 0)
+            CWallet::minTxFee = CFeeRate(n);
+        else
+            return UIError(AmountErrMsg("mintxfee", mapArgs["-mintxfee"]));
+    }
+    if (mapArgs.count("-fallbackfee"))
+    {
+        CAmount nFeePerK = 0;
+        if (!ParseMoney(mapArgs["-fallbackfee"], nFeePerK))
+            return UIError(strprintf(_("Invalid amount for -fallbackfee=<amount>: '%s'"), mapArgs["-fallbackfee"]));
+        if (nFeePerK > HIGH_TX_FEE_PER_KB)
+            UIWarning(_("-fallbackfee is set very high! This is the transaction fee you may pay when fee estimates are not available."));
+        CWallet::fallbackFee = CFeeRate(nFeePerK);
+    }
+    if (mapArgs.count("-paytxfee"))
+    {
+        CAmount nFeePerK = 0;
+        if (!ParseMoney(mapArgs["-paytxfee"], nFeePerK))
+            return UIError(AmountErrMsg("paytxfee", mapArgs["-paytxfee"]));
+        if (nFeePerK > HIGH_TX_FEE_PER_KB)
+            UIWarning(_("-paytxfee is set very high! This is the transaction fee you will pay if you send a transaction."));
+        payTxFee = CFeeRate(nFeePerK, 1000);
+        if (payTxFee < ::minRelayTxFee)
+        {
+            return UIError(strprintf(_("Invalid amount for -paytxfee=<amount>: '%s' (must be at least %s)"),
+                                       mapArgs["-paytxfee"], ::minRelayTxFee.ToString()));
+        }
+    }
+    if (mapArgs.count("-maxtxfee"))
+    {
+        CAmount nMaxFee = 0;
+        if (!ParseMoney(mapArgs["-maxtxfee"], nMaxFee))
+            return UIError(AmountErrMsg("maxtxfee", mapArgs["-maxtxfee"]));
+        if (nMaxFee > HIGH_MAX_TX_FEE)
+            UIWarning(_("-maxtxfee is set very high! Fees this large could be paid on a single transaction."));
+        maxTxFee = nMaxFee;
+        if (CFeeRate(maxTxFee, 1000) < ::minRelayTxFee)
+        {
+            return UIError(strprintf(_("Invalid amount for -maxtxfee=<amount>: '%s' (must be at least the minrelay fee of %s to prevent stuck transactions)"),
+                                       mapArgs["-maxtxfee"], ::minRelayTxFee.ToString()));
+        }
+    }
+    nTxConfirmTarget = GetArg("-txconfirmtarget", DEFAULT_TX_CONFIRM_TARGET);
+    bSpendZeroConfChange = GetBoolArg("-spendzeroconfchange", DEFAULT_SPEND_ZEROCONF_CHANGE);
+    fSendFreeTransactions = GetBoolArg("-sendfreetransactions", DEFAULT_SEND_FREE_TRANSACTIONS);
+
+    return true;
 }
 
 CKeyPool::CKeyPool()
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
index d009211a923eb..257d6f2e70839 100644
--- a/src/wallet/wallet.h
+++ b/src/wallet/wallet.h
@@ -28,6 +28,8 @@
 
 #include <boost/shared_ptr.hpp>
 
+extern CWallet* pwalletMain;
+
 /**
  * Settings
  */
@@ -840,7 +842,7 @@ class CWallet : public CCryptoKeyStore, public CValidationInterface
     void Flush(bool shutdown=false);
 
     //! Verify the wallet database and perform salvage if required
-    static bool Verify(const std::string& walletFile, std::string& warningString, std::string& errorString);
+    static bool Verify();
     
     /** 
      * Address book entry changed.
@@ -875,8 +877,11 @@ class CWallet : public CCryptoKeyStore, public CValidationInterface
     /* Returns the wallets help message */
     static std::string GetWalletHelpString(bool showDebug);
 
-    /* initializes the wallet, returns a new CWallet instance or a null pointer in case of an error */
-    static CWallet* InitLoadWallet(bool fDisableWallet, const std::string& strWalletFile, std::string& warningString, std::string& errorString);
+    /* Initializes the wallet, returns a new CWallet instance or a null pointer in case of an error */
+    static bool InitLoadWallet();
+
+    /* Wallets parameter interaction */
+    static bool ParameterInteraction();
 };
 
 /** A key allocated from the key pool. */

From 4856f1d6712cdb2eac8712e379fd1e351583d78f Mon Sep 17 00:00:00 2001
From: Jonas Schnelli <dev@jonasschnelli.ch>
Date: Tue, 22 Mar 2016 08:40:10 +0100
Subject: [PATCH 0049/1802] [Qt] Debug window: replace "Build date" with
 "Datadir"

The build date does only makes sense for custom/self-compiled bitcoin-core versions because we are using static build-dates for our deterministic release builds.
Having a quick option to get the current datadir is much more valuable for debug purposes.
---
 src/qt/clientmodel.cpp      | 5 +++++
 src/qt/clientmodel.h        | 1 +
 src/qt/forms/debugwindow.ui | 7 +++++--
 src/qt/rpcconsole.cpp       | 2 +-
 4 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/qt/clientmodel.cpp b/src/qt/clientmodel.cpp
index d3edfedff29b6..65637cd61fe73 100644
--- a/src/qt/clientmodel.cpp
+++ b/src/qt/clientmodel.cpp
@@ -193,6 +193,11 @@ QString ClientModel::formatClientStartupTime() const
     return QDateTime::fromTime_t(nClientStartupTime).toString();
 }
 
+QString ClientModel::dataDir() const
+{
+    return QString::fromStdString(GetDataDir().string());
+}
+
 void ClientModel::updateBanlist()
 {
     banTableModel->refresh();
diff --git a/src/qt/clientmodel.h b/src/qt/clientmodel.h
index 2fef6131c3c8e..db010f05cbd65 100644
--- a/src/qt/clientmodel.h
+++ b/src/qt/clientmodel.h
@@ -76,6 +76,7 @@ class ClientModel : public QObject
     bool isReleaseVersion() const;
     QString clientName() const;
     QString formatClientStartupTime() const;
+    QString dataDir() const;
 
 private:
     OptionsModel *optionsModel;
diff --git a/src/qt/forms/debugwindow.ui b/src/qt/forms/debugwindow.ui
index a5ac0a7d26b8e..c17efcf1b367a 100644
--- a/src/qt/forms/debugwindow.ui
+++ b/src/qt/forms/debugwindow.ui
@@ -141,12 +141,12 @@
        <item row="5" column="0">
         <widget class="QLabel" name="label_12">
          <property name="text">
-          <string>Build date</string>
+          <string>Datadir</string>
          </property>
         </widget>
        </item>
        <item row="5" column="1" colspan="2">
-        <widget class="QLabel" name="buildDate">
+        <widget class="QLabel" name="dataDir">
          <property name="cursor">
           <cursorShape>IBeamCursor</cursorShape>
          </property>
@@ -156,6 +156,9 @@
          <property name="textFormat">
           <enum>Qt::PlainText</enum>
          </property>
+         <property name="wordWrap">
+          <bool>true</bool>
+         </property>
          <property name="textInteractionFlags">
           <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
          </property>
diff --git a/src/qt/rpcconsole.cpp b/src/qt/rpcconsole.cpp
index e8ee3042dbd2d..42112c42f11ee 100644
--- a/src/qt/rpcconsole.cpp
+++ b/src/qt/rpcconsole.cpp
@@ -444,7 +444,7 @@ void RPCConsole::setClientModel(ClientModel *model)
         ui->clientVersion->setText(model->formatFullVersion());
         ui->clientUserAgent->setText(model->formatSubVersion());
         ui->clientName->setText(model->clientName());
-        ui->buildDate->setText(model->formatBuildDate());
+        ui->dataDir->setText(model->dataDir());
         ui->startupTime->setText(model->formatClientStartupTime());
         ui->networkName->setText(QString::fromStdString(Params().NetworkIDString()));
 

From bb16c8894becfba8764b13d448ba6e7e7f1608c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Barbosa?= <joao@uphold.com>
Date: Tue, 8 Mar 2016 00:15:17 +0000
Subject: [PATCH 0050/1802] Prevent multiple calls to CWallet::AvailableCoins

---
 src/wallet/wallet.cpp | 10 ++++++----
 src/wallet/wallet.h   |  2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index 654e617071b2a..51a2ad78d71e8 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -1841,10 +1841,9 @@ bool CWallet::SelectCoinsMinConf(const CAmount& nTargetValue, int nConfMine, int
     return true;
 }
 
-bool CWallet::SelectCoins(const CAmount& nTargetValue, set<pair<const CWalletTx*,unsigned int> >& setCoinsRet, CAmount& nValueRet, const CCoinControl* coinControl) const
+bool CWallet::SelectCoins(const vector<COutput>& vAvailableCoins, const CAmount& nTargetValue, set<pair<const CWalletTx*,unsigned int> >& setCoinsRet, CAmount& nValueRet, const CCoinControl* coinControl) const
 {
-    vector<COutput> vCoins;
-    AvailableCoins(vCoins, true, coinControl);
+    vector<COutput> vCoins(vAvailableCoins);
 
     // coin control -> return all selected outputs (we want all selected to go into the transaction for sure)
     if (coinControl && coinControl->HasSelected() && !coinControl->fAllowOtherInputs)
@@ -2010,6 +2009,9 @@ bool CWallet::CreateTransaction(const vector<CRecipient>& vecSend, CWalletTx& wt
     {
         LOCK2(cs_main, cs_wallet);
         {
+            std::vector<COutput> vAvailableCoins;
+            AvailableCoins(vAvailableCoins, true, coinControl);
+
             nFeeRet = 0;
             // Start with no fee and loop until there is enough fee
             while (true)
@@ -2059,7 +2061,7 @@ bool CWallet::CreateTransaction(const vector<CRecipient>& vecSend, CWalletTx& wt
                 // Choose coins to use
                 set<pair<const CWalletTx*,unsigned int> > setCoins;
                 CAmount nValueIn = 0;
-                if (!SelectCoins(nValueToSelect, setCoins, nValueIn, coinControl))
+                if (!SelectCoins(vAvailableCoins, nValueToSelect, setCoins, nValueIn, coinControl))
                 {
                     strFailReason = _("Insufficient funds");
                     return false;
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
index d009211a923eb..e37d972a154f2 100644
--- a/src/wallet/wallet.h
+++ b/src/wallet/wallet.h
@@ -544,7 +544,7 @@ class CWallet : public CCryptoKeyStore, public CValidationInterface
      * all coins from coinControl are selected; Never select unconfirmed coins
      * if they are not ours
      */
-    bool SelectCoins(const CAmount& nTargetValue, std::set<std::pair<const CWalletTx*,unsigned int> >& setCoinsRet, CAmount& nValueRet, const CCoinControl *coinControl = NULL) const;
+    bool SelectCoins(const std::vector<COutput>& vAvailableCoins, const CAmount& nTargetValue, std::set<std::pair<const CWalletTx*,unsigned int> >& setCoinsRet, CAmount& nValueRet, const CCoinControl *coinControl = NULL) const;
 
     CWalletDB *pwalletdbEncryption;
 

From f11c5a3cbd2833be124e66272aea274fda534626 Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Wed, 23 Mar 2016 11:55:46 +0100
Subject: [PATCH 0051/1802] devtools: make github-merge.py use py3

This makes github-merge.py the first developer tool to go
all Python 3 (for context see #7717).

The changes are straightforward as the script already was
`from __future__ import division,print_function,unicode_literals`.

However urllib2 changed name, and json will only accept unicode data not
bytes.

This retains py2 compatibility for now: not strictly necessary
as it's not used by the build system - but it was easy.
---
 contrib/devtools/github-merge.py | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/contrib/devtools/github-merge.py b/contrib/devtools/github-merge.py
index c8dcaae268b8e..9a62fccbbb555 100755
--- a/contrib/devtools/github-merge.py
+++ b/contrib/devtools/github-merge.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python3
 # Copyright (c) 2016 Bitcoin Core Developers
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
@@ -19,6 +19,11 @@
 from sys import stdin,stdout,stderr
 import argparse
 import subprocess
+import json,codecs
+try:
+    from urllib.request import Request,urlopen
+except:
+    from urllib2 import Request,urlopen
 
 # External tools (can be overridden using environment)
 GIT = os.getenv('GIT','git')
@@ -38,7 +43,7 @@ def git_config_get(option, default=None):
     Get named configuration option from git repository.
     '''
     try:
-        return subprocess.check_output([GIT,'config','--get',option]).rstrip()
+        return subprocess.check_output([GIT,'config','--get',option]).rstrip().decode('utf-8')
     except subprocess.CalledProcessError as e:
         return default
 
@@ -47,18 +52,19 @@ def retrieve_pr_title(repo,pull):
     Retrieve pull request title from github.
     Return None if no title can be found, or an error happens.
     '''
-    import urllib2,json
     try:
-        req = urllib2.Request("https://api.github.com/repos/"+repo+"/pulls/"+pull)
-        result = urllib2.urlopen(req)
-        result = json.load(result)
-        return result['title']
+        req = Request("https://api.github.com/repos/"+repo+"/pulls/"+pull)
+        result = urlopen(req)
+        reader = codecs.getreader('utf-8')
+        obj = json.load(reader(result))
+        return obj['title']
     except Exception as e:
         print('Warning: unable to retrieve pull title from github: %s' % e)
         return None
 
 def ask_prompt(text):
     print(text,end=" ",file=stderr)
+    stderr.flush()
     reply = stdin.readline().rstrip()
     print("",file=stderr)
     return reply

From 7eb702954ed0e297c5ded548e6c4f11f55313b7a Mon Sep 17 00:00:00 2001
From: instagibbs <gsanders87@gmail.com>
Date: Thu, 18 Feb 2016 16:31:12 -0800
Subject: [PATCH 0052/1802] Add importprunedfunds rpc call

---
 qa/pull-tester/rpc-tests.py       |   2 +
 qa/rpc-tests/importprunedfunds.py | 119 ++++++++++++++++++++++++++++++
 src/merkleblock.cpp               |  14 ++--
 src/merkleblock.h                 |   9 ++-
 src/rpc/rawtransaction.cpp        |   3 +-
 src/test/bloom_tests.cpp          |  23 +++---
 src/test/pmt_tests.cpp            |   8 +-
 src/wallet/rpcdump.cpp            |  67 +++++++++++++++++
 src/wallet/rpcwallet.cpp          |   2 +
 9 files changed, 224 insertions(+), 23 deletions(-)
 create mode 100755 qa/rpc-tests/importprunedfunds.py

diff --git a/qa/pull-tester/rpc-tests.py b/qa/pull-tester/rpc-tests.py
index 74be96da74641..10b51fef7a718 100755
--- a/qa/pull-tester/rpc-tests.py
+++ b/qa/pull-tester/rpc-tests.py
@@ -116,6 +116,7 @@
     'invalidtxrequest.py',
     'abandonconflict.py',
     'p2p-versionbits-warning.py',
+    'importprunedfunds.py',
 ]
 testScriptsExt = [
     'bip65-cltv.py',
@@ -127,6 +128,7 @@
     'getblocktemplate_proposals.py',
     'txn_doublespend.py',
     'txn_clone.py --mineblock',
+    'pruning.py',
     'forknotify.py',
     'invalidateblock.py',
 #    'rpcbind_test.py', #temporary, bug in libevent, see #6655
diff --git a/qa/rpc-tests/importprunedfunds.py b/qa/rpc-tests/importprunedfunds.py
new file mode 100755
index 0000000000000..bac144cd75aef
--- /dev/null
+++ b/qa/rpc-tests/importprunedfunds.py
@@ -0,0 +1,119 @@
+#!/usr/bin/env python2
+# Copyright (c) 2014-2016 The Bitcoin Core developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+from test_framework.test_framework import BitcoinTestFramework
+from test_framework.util import *
+import decimal
+
+class ImportPrunedFundsTest(BitcoinTestFramework):
+
+    def setup_chain(self):
+        print("Initializing test directory "+self.options.tmpdir)
+        initialize_chain_clean(self.options.tmpdir, 4)
+
+    def setup_network(self, split=False):
+        self.nodes = start_nodes(2, self.options.tmpdir)
+        connect_nodes_bi(self.nodes,0,1)
+        self.is_network_split=False
+        self.sync_all()
+
+    def run_test (self):
+        import time
+        begintime = int(time.time())
+
+        print "Mining blocks..."
+        self.nodes[0].generate(101)
+
+        # sync
+        self.sync_all()
+        
+        # address
+        address1 = self.nodes[0].getnewaddress()
+        # pubkey
+        address2 = self.nodes[0].getnewaddress()
+        address2_pubkey = self.nodes[0].validateaddress(address2)['pubkey']                 # Using pubkey
+        # privkey
+        address3 = self.nodes[0].getnewaddress()
+        address3_privkey = self.nodes[0].dumpprivkey(address3)                              # Using privkey
+
+        #Check only one address
+        address_info = self.nodes[0].validateaddress(address1)
+        assert_equal(address_info['ismine'], True)
+
+        self.sync_all()
+
+        #Node 1 sync test
+        assert_equal(self.nodes[1].getblockcount(),101)
+
+        #Address Test - before import
+        address_info = self.nodes[1].validateaddress(address1)
+        assert_equal(address_info['iswatchonly'], False)
+        assert_equal(address_info['ismine'], False)
+
+        address_info = self.nodes[1].validateaddress(address2)
+        assert_equal(address_info['iswatchonly'], False)
+        assert_equal(address_info['ismine'], False)
+
+        address_info = self.nodes[1].validateaddress(address3)
+        assert_equal(address_info['iswatchonly'], False)
+        assert_equal(address_info['ismine'], False)
+
+        #Send funds to self
+        txnid1 = self.nodes[0].sendtoaddress(address1, 0.1)
+        self.nodes[0].generate(1)
+        rawtxn1 = self.nodes[0].gettransaction(txnid1)['hex']
+        proof1 = self.nodes[0].gettxoutproof([txnid1])
+
+        txnid2 = self.nodes[0].sendtoaddress(address2, 0.05)
+        self.nodes[0].generate(1)
+        rawtxn2 = self.nodes[0].gettransaction(txnid2)['hex']
+        proof2 = self.nodes[0].gettxoutproof([txnid2])
+
+
+        txnid3 = self.nodes[0].sendtoaddress(address3, 0.025)
+        self.nodes[0].generate(1)
+        rawtxn3 = self.nodes[0].gettransaction(txnid3)['hex']
+        proof3 = self.nodes[0].gettxoutproof([txnid3])
+
+        self.sync_all()
+
+        #Import with no affiliated address
+        try:
+            result1 = self.nodes[1].importprunedfunds(rawtxn1, proof1, "")
+        except JSONRPCException,e:
+            errorString = e.error['message']
+
+        assert('No addresses' in errorString)
+
+        balance1 = self.nodes[1].getbalance("", 0, True)
+        assert_equal(balance1, Decimal(0))
+
+        #Import with affiliated address with no rescan
+        self.nodes[1].importaddress(address2, "", False)
+        result2 = self.nodes[1].importprunedfunds(rawtxn2, proof2, "")
+        balance2 = Decimal(self.nodes[1].getbalance("", 0, True))
+        assert_equal(balance2, Decimal('0.05'))
+
+        #Import with private key with no rescan
+        self.nodes[1].importprivkey(address3_privkey, "", False)
+        result3 = self.nodes[1].importprunedfunds(rawtxn3, proof3, "")
+        balance3 = Decimal(self.nodes[1].getbalance("", 0, False))
+        assert_equal(balance3, Decimal('0.025'))
+        balance3 = Decimal(self.nodes[1].getbalance("", 0, True))
+        assert_equal(balance3, Decimal('0.075'))
+
+        #Addresses Test - after import
+        address_info = self.nodes[1].validateaddress(address1)
+        assert_equal(address_info['iswatchonly'], False)
+        assert_equal(address_info['ismine'], False)
+        address_info = self.nodes[1].validateaddress(address2)
+        assert_equal(address_info['iswatchonly'], True)
+        assert_equal(address_info['ismine'], False)
+        address_info = self.nodes[1].validateaddress(address3)
+        assert_equal(address_info['iswatchonly'], False)
+        assert_equal(address_info['ismine'], True)
+
+if __name__ == '__main__':
+    ImportPrunedFundsTest ().main ()
diff --git a/src/merkleblock.cpp b/src/merkleblock.cpp
index 8447f924e4d55..dca4973cc4d88 100644
--- a/src/merkleblock.cpp
+++ b/src/merkleblock.cpp
@@ -95,7 +95,7 @@ void CPartialMerkleTree::TraverseAndBuild(int height, unsigned int pos, const st
     }
 }
 
-uint256 CPartialMerkleTree::TraverseAndExtract(int height, unsigned int pos, unsigned int &nBitsUsed, unsigned int &nHashUsed, std::vector<uint256> &vMatch) {
+uint256 CPartialMerkleTree::TraverseAndExtract(int height, unsigned int pos, unsigned int &nBitsUsed, unsigned int &nHashUsed, std::vector<uint256> &vMatch, std::vector<unsigned int> &vnIndex) {
     if (nBitsUsed >= vBits.size()) {
         // overflowed the bits array - failure
         fBad = true;
@@ -110,14 +110,16 @@ uint256 CPartialMerkleTree::TraverseAndExtract(int height, unsigned int pos, uns
             return uint256();
         }
         const uint256 &hash = vHash[nHashUsed++];
-        if (height==0 && fParentOfMatch) // in case of height 0, we have a matched txid
+        if (height==0 && fParentOfMatch) { // in case of height 0, we have a matched txid
             vMatch.push_back(hash);
+            vnIndex.push_back(pos);
+        }
         return hash;
     } else {
         // otherwise, descend into the subtrees to extract matched txids and hashes
-        uint256 left = TraverseAndExtract(height-1, pos*2, nBitsUsed, nHashUsed, vMatch), right;
+        uint256 left = TraverseAndExtract(height-1, pos*2, nBitsUsed, nHashUsed, vMatch, vnIndex), right;
         if (pos*2+1 < CalcTreeWidth(height-1)) {
-            right = TraverseAndExtract(height-1, pos*2+1, nBitsUsed, nHashUsed, vMatch);
+            right = TraverseAndExtract(height-1, pos*2+1, nBitsUsed, nHashUsed, vMatch, vnIndex);
             if (right == left) {
                 // The left and right branches should never be identical, as the transaction
                 // hashes covered by them must each be unique.
@@ -147,7 +149,7 @@ CPartialMerkleTree::CPartialMerkleTree(const std::vector<uint256> &vTxid, const
 
 CPartialMerkleTree::CPartialMerkleTree() : nTransactions(0), fBad(true) {}
 
-uint256 CPartialMerkleTree::ExtractMatches(std::vector<uint256> &vMatch) {
+uint256 CPartialMerkleTree::ExtractMatches(std::vector<uint256> &vMatch, std::vector<unsigned int> &vnIndex) {
     vMatch.clear();
     // An empty set will not work
     if (nTransactions == 0)
@@ -167,7 +169,7 @@ uint256 CPartialMerkleTree::ExtractMatches(std::vector<uint256> &vMatch) {
         nHeight++;
     // traverse the partial tree
     unsigned int nBitsUsed = 0, nHashUsed = 0;
-    uint256 hashMerkleRoot = TraverseAndExtract(nHeight, 0, nBitsUsed, nHashUsed, vMatch);
+    uint256 hashMerkleRoot = TraverseAndExtract(nHeight, 0, nBitsUsed, nHashUsed, vMatch, vnIndex);
     // verify that no problems occurred during the tree traversal
     if (fBad)
         return uint256();
diff --git a/src/merkleblock.h b/src/merkleblock.h
index 996cd12624fdd..835cbcce5550d 100644
--- a/src/merkleblock.h
+++ b/src/merkleblock.h
@@ -75,9 +75,9 @@ class CPartialMerkleTree
 
     /**
      * recursive function that traverses tree nodes, consuming the bits and hashes produced by TraverseAndBuild.
-     * it returns the hash of the respective node.
+     * it returns the hash of the respective node and its respective index.
      */
-    uint256 TraverseAndExtract(int height, unsigned int pos, unsigned int &nBitsUsed, unsigned int &nHashUsed, std::vector<uint256> &vMatch);
+    uint256 TraverseAndExtract(int height, unsigned int pos, unsigned int &nBitsUsed, unsigned int &nHashUsed, std::vector<uint256> &vMatch, std::vector<unsigned int> &vnIndex);
 
 public:
 
@@ -110,10 +110,11 @@ class CPartialMerkleTree
     CPartialMerkleTree();
 
     /**
-     * extract the matching txid's represented by this partial merkle tree.
+     * extract the matching txid's represented by this partial merkle tree
+     * and their respective indices within the partial tree.
      * returns the merkle root, or 0 in case of failure
      */
-    uint256 ExtractMatches(std::vector<uint256> &vMatch);
+    uint256 ExtractMatches(std::vector<uint256> &vMatch, std::vector<unsigned int> &vnIndex);
 };
 
 
diff --git a/src/rpc/rawtransaction.cpp b/src/rpc/rawtransaction.cpp
index c72339313caf8..34dd3b30f50ff 100644
--- a/src/rpc/rawtransaction.cpp
+++ b/src/rpc/rawtransaction.cpp
@@ -303,7 +303,8 @@ UniValue verifytxoutproof(const UniValue& params, bool fHelp)
     UniValue res(UniValue::VARR);
 
     vector<uint256> vMatch;
-    if (merkleBlock.txn.ExtractMatches(vMatch) != merkleBlock.header.hashMerkleRoot)
+    vector<unsigned int> vIndex;
+    if (merkleBlock.txn.ExtractMatches(vMatch, vIndex) != merkleBlock.header.hashMerkleRoot)
         return res;
 
     LOCK(cs_main);
diff --git a/src/test/bloom_tests.cpp b/src/test/bloom_tests.cpp
index 98f9de7673831..9557000ddcc11 100644
--- a/src/test/bloom_tests.cpp
+++ b/src/test/bloom_tests.cpp
@@ -204,7 +204,8 @@ BOOST_AUTO_TEST_CASE(merkle_block_1)
     BOOST_CHECK(merkleBlock.vMatchedTxn[0].first == 8);
 
     vector<uint256> vMatched;
-    BOOST_CHECK(merkleBlock.txn.ExtractMatches(vMatched) == block.hashMerkleRoot);
+    vector<unsigned int> vIndex;
+    BOOST_CHECK(merkleBlock.txn.ExtractMatches(vMatched, vIndex) == block.hashMerkleRoot);
     BOOST_CHECK(vMatched.size() == merkleBlock.vMatchedTxn.size());
     for (unsigned int i = 0; i < vMatched.size(); i++)
         BOOST_CHECK(vMatched[i] == merkleBlock.vMatchedTxn[i].second);
@@ -221,7 +222,7 @@ BOOST_AUTO_TEST_CASE(merkle_block_1)
     BOOST_CHECK(merkleBlock.vMatchedTxn[0].second == uint256S("0xdd1fd2a6fc16404faf339881a90adbde7f4f728691ac62e8f168809cdfae1053"));
     BOOST_CHECK(merkleBlock.vMatchedTxn[0].first == 7);
 
-    BOOST_CHECK(merkleBlock.txn.ExtractMatches(vMatched) == block.hashMerkleRoot);
+    BOOST_CHECK(merkleBlock.txn.ExtractMatches(vMatched, vIndex) == block.hashMerkleRoot);
     BOOST_CHECK(vMatched.size() == merkleBlock.vMatchedTxn.size());
     for (unsigned int i = 0; i < vMatched.size(); i++)
         BOOST_CHECK(vMatched[i] == merkleBlock.vMatchedTxn[i].second);
@@ -249,7 +250,8 @@ BOOST_AUTO_TEST_CASE(merkle_block_2)
     BOOST_CHECK(merkleBlock.vMatchedTxn[0].first == 0);
 
     vector<uint256> vMatched;
-    BOOST_CHECK(merkleBlock.txn.ExtractMatches(vMatched) == block.hashMerkleRoot);
+    vector<unsigned int> vIndex;
+    BOOST_CHECK(merkleBlock.txn.ExtractMatches(vMatched, vIndex) == block.hashMerkleRoot);
     BOOST_CHECK(vMatched.size() == merkleBlock.vMatchedTxn.size());
     for (unsigned int i = 0; i < vMatched.size(); i++)
         BOOST_CHECK(vMatched[i] == merkleBlock.vMatchedTxn[i].second);
@@ -275,7 +277,7 @@ BOOST_AUTO_TEST_CASE(merkle_block_2)
     BOOST_CHECK(merkleBlock.vMatchedTxn[3].second == uint256S("0x3c1d7e82342158e4109df2e0b6348b6e84e403d8b4046d7007663ace63cddb23"));
     BOOST_CHECK(merkleBlock.vMatchedTxn[3].first == 3);
 
-    BOOST_CHECK(merkleBlock.txn.ExtractMatches(vMatched) == block.hashMerkleRoot);
+    BOOST_CHECK(merkleBlock.txn.ExtractMatches(vMatched, vIndex) == block.hashMerkleRoot);
     BOOST_CHECK(vMatched.size() == merkleBlock.vMatchedTxn.size());
     for (unsigned int i = 0; i < vMatched.size(); i++)
         BOOST_CHECK(vMatched[i] == merkleBlock.vMatchedTxn[i].second);
@@ -303,7 +305,8 @@ BOOST_AUTO_TEST_CASE(merkle_block_2_with_update_none)
     BOOST_CHECK(merkleBlock.vMatchedTxn[0].first == 0);
 
     vector<uint256> vMatched;
-    BOOST_CHECK(merkleBlock.txn.ExtractMatches(vMatched) == block.hashMerkleRoot);
+    vector<unsigned int> vIndex;
+    BOOST_CHECK(merkleBlock.txn.ExtractMatches(vMatched, vIndex) == block.hashMerkleRoot);
     BOOST_CHECK(vMatched.size() == merkleBlock.vMatchedTxn.size());
     for (unsigned int i = 0; i < vMatched.size(); i++)
         BOOST_CHECK(vMatched[i] == merkleBlock.vMatchedTxn[i].second);
@@ -326,7 +329,7 @@ BOOST_AUTO_TEST_CASE(merkle_block_2_with_update_none)
     BOOST_CHECK(merkleBlock.vMatchedTxn[2].second == uint256S("0x3c1d7e82342158e4109df2e0b6348b6e84e403d8b4046d7007663ace63cddb23"));
     BOOST_CHECK(merkleBlock.vMatchedTxn[2].first == 3);
 
-    BOOST_CHECK(merkleBlock.txn.ExtractMatches(vMatched) == block.hashMerkleRoot);
+    BOOST_CHECK(merkleBlock.txn.ExtractMatches(vMatched, vIndex) == block.hashMerkleRoot);
     BOOST_CHECK(vMatched.size() == merkleBlock.vMatchedTxn.size());
     for (unsigned int i = 0; i < vMatched.size(); i++)
         BOOST_CHECK(vMatched[i] == merkleBlock.vMatchedTxn[i].second);
@@ -353,7 +356,8 @@ BOOST_AUTO_TEST_CASE(merkle_block_3_and_serialize)
     BOOST_CHECK(merkleBlock.vMatchedTxn[0].first == 0);
 
     vector<uint256> vMatched;
-    BOOST_CHECK(merkleBlock.txn.ExtractMatches(vMatched) == block.hashMerkleRoot);
+    vector<unsigned int> vIndex;
+    BOOST_CHECK(merkleBlock.txn.ExtractMatches(vMatched, vIndex) == block.hashMerkleRoot);
     BOOST_CHECK(vMatched.size() == merkleBlock.vMatchedTxn.size());
     for (unsigned int i = 0; i < vMatched.size(); i++)
         BOOST_CHECK(vMatched[i] == merkleBlock.vMatchedTxn[i].second);
@@ -392,7 +396,8 @@ BOOST_AUTO_TEST_CASE(merkle_block_4)
     BOOST_CHECK(merkleBlock.vMatchedTxn[0].first == 6);
 
     vector<uint256> vMatched;
-    BOOST_CHECK(merkleBlock.txn.ExtractMatches(vMatched) == block.hashMerkleRoot);
+    vector<unsigned int> vIndex;
+    BOOST_CHECK(merkleBlock.txn.ExtractMatches(vMatched, vIndex) == block.hashMerkleRoot);
     BOOST_CHECK(vMatched.size() == merkleBlock.vMatchedTxn.size());
     for (unsigned int i = 0; i < vMatched.size(); i++)
         BOOST_CHECK(vMatched[i] == merkleBlock.vMatchedTxn[i].second);
@@ -409,7 +414,7 @@ BOOST_AUTO_TEST_CASE(merkle_block_4)
 
     BOOST_CHECK(merkleBlock.vMatchedTxn[1] == pair);
 
-    BOOST_CHECK(merkleBlock.txn.ExtractMatches(vMatched) == block.hashMerkleRoot);
+    BOOST_CHECK(merkleBlock.txn.ExtractMatches(vMatched, vIndex) == block.hashMerkleRoot);
     BOOST_CHECK(vMatched.size() == merkleBlock.vMatchedTxn.size());
     for (unsigned int i = 0; i < vMatched.size(); i++)
         BOOST_CHECK(vMatched[i] == merkleBlock.vMatchedTxn[i].second);
diff --git a/src/test/pmt_tests.cpp b/src/test/pmt_tests.cpp
index 113b9437e0490..2f3f607889498 100644
--- a/src/test/pmt_tests.cpp
+++ b/src/test/pmt_tests.cpp
@@ -88,7 +88,8 @@ BOOST_AUTO_TEST_CASE(pmt_test1)
 
             // extract merkle root and matched txids from copy
             std::vector<uint256> vMatchTxid2;
-            uint256 merkleRoot2 = pmt2.ExtractMatches(vMatchTxid2);
+            std::vector<unsigned int> vIndex;
+            uint256 merkleRoot2 = pmt2.ExtractMatches(vMatchTxid2, vIndex);
 
             // check that it has the same merkle root as the original, and a valid one
             BOOST_CHECK(merkleRoot1 == merkleRoot2);
@@ -102,7 +103,7 @@ BOOST_AUTO_TEST_CASE(pmt_test1)
                 CPartialMerkleTreeTester pmt3(pmt2);
                 pmt3.Damage();
                 std::vector<uint256> vMatchTxid3;
-                uint256 merkleRoot3 = pmt3.ExtractMatches(vMatchTxid3);
+                uint256 merkleRoot3 = pmt3.ExtractMatches(vMatchTxid3, vIndex);
                 BOOST_CHECK(merkleRoot3 != merkleRoot1);
             }
         }
@@ -122,7 +123,8 @@ BOOST_AUTO_TEST_CASE(pmt_malleability)
 
     CPartialMerkleTree tree(vTxid, vMatch);
     std::vector<uint256> vTxid2;
-    BOOST_CHECK(tree.ExtractMatches(vTxid).IsNull());
+    std::vector<unsigned int> vIndex;
+    BOOST_CHECK(tree.ExtractMatches(vTxid, vIndex).IsNull());
 }
 
 BOOST_AUTO_TEST_SUITE_END()
diff --git a/src/wallet/rpcdump.cpp b/src/wallet/rpcdump.cpp
index 6e50f92428e68..899ed1b3d744b 100644
--- a/src/wallet/rpcdump.cpp
+++ b/src/wallet/rpcdump.cpp
@@ -13,6 +13,8 @@
 #include "util.h"
 #include "utiltime.h"
 #include "wallet.h"
+#include "merkleblock.h"
+#include "core_io.h"
 
 #include <fstream>
 #include <stdint.h>
@@ -243,6 +245,71 @@ UniValue importaddress(const UniValue& params, bool fHelp)
     return NullUniValue;
 }
 
+UniValue importprunedfunds(const UniValue& params, bool fHelp)
+{
+    if (!EnsureWalletIsAvailable(fHelp))
+        return NullUniValue;
+
+    if (fHelp || params.size() < 2 || params.size() > 3)
+        throw runtime_error(
+            "importprunedfunds\n"
+            "\nImports funds without rescan. Corresponding address or script must previously be included in wallet. Aimed towards pruned wallets. The end-user is responsible to import additional transactions that subsequently spend the imported outputs or rescan after the point in the blockchain the transaction is included.\n"
+            "\nArguments:\n"
+            "1. \"rawtransaction\" (string, required) A raw transaction in hex funding an already-existing address in wallet\n"
+            "2. \"txoutproof\"     (string, required) The hex output from gettxoutproof that contains the transaction\n"
+            "3. \"label\"          (string, optional) An optional label\n"
+        );
+
+    CTransaction tx;
+    if (!DecodeHexTx(tx, params[0].get_str()))
+        throw JSONRPCError(RPC_DESERIALIZATION_ERROR, "TX decode failed");
+    uint256 hashTx = tx.GetHash();
+    CWalletTx wtx(pwalletMain,tx);
+
+    CDataStream ssMB(ParseHexV(params[1], "proof"), SER_NETWORK, PROTOCOL_VERSION);
+    CMerkleBlock merkleBlock;
+    ssMB >> merkleBlock;
+
+    string strLabel = "";
+    if (params.size() == 3)
+        strLabel = params[2].get_str();
+
+    //Search partial merkle tree in proof for our transaction and index in valid block
+    vector<uint256> vMatch;
+    vector<unsigned int> vIndex;
+    unsigned int txnIndex = 0;
+    if (merkleBlock.txn.ExtractMatches(vMatch, vIndex) == merkleBlock.header.hashMerkleRoot) {
+
+        LOCK(cs_main);
+
+        if (!mapBlockIndex.count(merkleBlock.header.GetHash()) || !chainActive.Contains(mapBlockIndex[merkleBlock.header.GetHash()]))
+            throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Block not found in chain");
+
+        vector<uint256>::const_iterator it;
+        if ((it = std::find(vMatch.begin(), vMatch.end(), hashTx))==vMatch.end()) {
+            throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Transaction given doesn't exist in proof");
+        }
+
+        txnIndex = vIndex[it - vMatch.begin()];
+    }
+    else {
+        throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Something wrong with merkleblock");
+    }
+
+    wtx.nIndex = txnIndex;
+    wtx.hashBlock = merkleBlock.header.GetHash();
+
+    LOCK2(cs_main, pwalletMain->cs_wallet);
+
+    if (pwalletMain->IsMine(tx)) {
+        CWalletDB walletdb(pwalletMain->strWalletFile, "r+", false);
+        pwalletMain->AddToWallet(wtx, false, &walletdb);
+        return NullUniValue;
+    }
+
+    throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "No addresses in wallet correspond to included transaction");
+}
+
 UniValue importpubkey(const UniValue& params, bool fHelp)
 {
     if (!EnsureWalletIsAvailable(fHelp))
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index 759f894ccbe67..fbe95a14c2e34 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -2503,6 +2503,7 @@ extern UniValue importaddress(const UniValue& params, bool fHelp);
 extern UniValue importpubkey(const UniValue& params, bool fHelp);
 extern UniValue dumpwallet(const UniValue& params, bool fHelp);
 extern UniValue importwallet(const UniValue& params, bool fHelp);
+extern UniValue importprunedfunds(const UniValue& params, bool fHelp);
 
 const CRPCCommand vWalletRPCCommands[] =
 { //  category              name                        actor (function)           okSafeMode
@@ -2529,6 +2530,7 @@ const CRPCCommand vWalletRPCCommands[] =
     { "wallet",             "importprivkey",            &importprivkey,            true  },
     { "wallet",             "importwallet",             &importwallet,             true  },
     { "wallet",             "importaddress",            &importaddress,            true  },
+    { "wallet",             "importprunedfunds",        &importprunedfunds,        true  },
     { "wallet",             "importpubkey",             &importpubkey,             true  },
     { "wallet",             "keypoolrefill",            &keypoolrefill,            true  },
     { "wallet",             "listaccounts",             &listaccounts,             false },

From f1bb13c93da5d4bedf9dd2cd7357008376e9a2b4 Mon Sep 17 00:00:00 2001
From: instagibbs <gsanders87@gmail.com>
Date: Mon, 7 Mar 2016 08:51:06 -0500
Subject: [PATCH 0053/1802] Added companion removeprunedfunds call.

---
 qa/rpc-tests/importprunedfunds.py | 21 +++++++++++++++++
 src/wallet/rpcdump.cpp            | 38 ++++++++++++++++++++++++++++++
 src/wallet/rpcwallet.cpp          |  2 ++
 src/wallet/wallet.cpp             | 25 ++++++++++++++++++++
 src/wallet/wallet.h               |  1 +
 src/wallet/walletdb.cpp           | 39 +++++++++++++++++++++++++++++++
 src/wallet/walletdb.h             |  1 +
 7 files changed, 127 insertions(+)

diff --git a/qa/rpc-tests/importprunedfunds.py b/qa/rpc-tests/importprunedfunds.py
index bac144cd75aef..5cbdcde9aa997 100755
--- a/qa/rpc-tests/importprunedfunds.py
+++ b/qa/rpc-tests/importprunedfunds.py
@@ -115,5 +115,26 @@ def run_test (self):
         assert_equal(address_info['iswatchonly'], False)
         assert_equal(address_info['ismine'], True)
 
+        #Remove transactions
+
+        try:
+            self.nodes[1].removeprunedfunds(txnid1)
+        except JSONRPCException,e:
+            errorString = e.error['message']
+
+        assert('does not exist' in errorString)
+
+        balance1 = Decimal(self.nodes[1].getbalance("", 0, True))
+        assert_equal(balance1, Decimal('0.075'))
+
+
+        self.nodes[1].removeprunedfunds(txnid2)
+        balance2 = Decimal(self.nodes[1].getbalance("", 0, True))
+        assert_equal(balance2, Decimal('0.025'))
+
+        self.nodes[1].removeprunedfunds(txnid3)
+        balance3 = Decimal(self.nodes[1].getbalance("", 0, True))
+        assert_equal(balance3, Decimal('0.0'))
+
 if __name__ == '__main__':
     ImportPrunedFundsTest ().main ()
diff --git a/src/wallet/rpcdump.cpp b/src/wallet/rpcdump.cpp
index 899ed1b3d744b..bb40cf724536a 100644
--- a/src/wallet/rpcdump.cpp
+++ b/src/wallet/rpcdump.cpp
@@ -310,6 +310,44 @@ UniValue importprunedfunds(const UniValue& params, bool fHelp)
     throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "No addresses in wallet correspond to included transaction");
 }
 
+UniValue removeprunedfunds(const UniValue& params, bool fHelp)
+{
+    if (!EnsureWalletIsAvailable(fHelp))
+        return NullUniValue;
+
+    if (fHelp || params.size() != 1)
+        throw runtime_error(
+            "removeprunedfunds \"txid\"\n"
+            "\nDeletes the specified transaction from the wallet. Meant for use with pruned wallets and as a companion to importprunedfunds. This will effect wallet balances.\n"
+            "\nArguments:\n"
+            "1. \"txid\"           (string, required) The hex-encoded id of the transaction you are deleting\n"
+            "\nExamples:\n"
+            + HelpExampleCli("removeprunedfunds", "\"a8d0c0184dde994a09ec054286f1ce581bebf46446a512166eae7628734ea0a5\"") +
+            "\nAs a JSON-RPC call\n"
+            + HelpExampleRpc("removprunedfunds", "\"a8d0c0184dde994a09ec054286f1ce581bebf46446a512166eae7628734ea0a5\"")
+        );
+
+    LOCK2(cs_main, pwalletMain->cs_wallet);
+
+    uint256 hash;
+    hash.SetHex(params[0].get_str());
+    vector<uint256> vHash;
+    vHash.push_back(hash);
+    vector<uint256> vHashOut;
+
+    if(pwalletMain->ZapSelectTx(vHash, vHashOut) != DB_LOAD_OK) {
+        throw JSONRPCError(RPC_INTERNAL_ERROR, "Could not properly delete the transaction.");
+    }
+
+    if(vHashOut.empty()) {
+        throw JSONRPCError(RPC_INTERNAL_ERROR, "Transaction does not exist in wallet.");
+    }
+
+    ThreadFlushWalletDB(pwalletMain->strWalletFile);
+
+    return NullUniValue;
+}
+
 UniValue importpubkey(const UniValue& params, bool fHelp)
 {
     if (!EnsureWalletIsAvailable(fHelp))
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index fbe95a14c2e34..29f7802c5c88a 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -2504,6 +2504,7 @@ extern UniValue importpubkey(const UniValue& params, bool fHelp);
 extern UniValue dumpwallet(const UniValue& params, bool fHelp);
 extern UniValue importwallet(const UniValue& params, bool fHelp);
 extern UniValue importprunedfunds(const UniValue& params, bool fHelp);
+extern UniValue removeprunedfunds(const UniValue& params, bool fHelp);
 
 const CRPCCommand vWalletRPCCommands[] =
 { //  category              name                        actor (function)           okSafeMode
@@ -2552,6 +2553,7 @@ const CRPCCommand vWalletRPCCommands[] =
     { "wallet",             "walletlock",               &walletlock,               true  },
     { "wallet",             "walletpassphrasechange",   &walletpassphrasechange,   true  },
     { "wallet",             "walletpassphrase",         &walletpassphrase,         true  },
+    { "wallet",             "removeprunedfunds",        &removeprunedfunds,        true  },
 };
 
 void walletRegisterRPCCommands()
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index 7d1928dd6a268..801ef986841d5 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -2362,6 +2362,31 @@ DBErrors CWallet::LoadWallet(bool& fFirstRunRet)
     return DB_LOAD_OK;
 }
 
+DBErrors CWallet::ZapSelectTx(vector<uint256>& vHashIn, vector<uint256>& vHashOut)
+{
+    if (!fFileBacked)
+        return DB_LOAD_OK;
+    DBErrors nZapSelectTxRet = CWalletDB(strWalletFile,"cr+").ZapSelectTx(this, vHashIn, vHashOut);
+    if (nZapSelectTxRet == DB_NEED_REWRITE)
+    {
+        if (CDB::Rewrite(strWalletFile, "\x04pool"))
+        {
+            LOCK(cs_wallet);
+            setKeyPool.clear();
+            // Note: can't top-up keypool here, because wallet is locked.
+            // User will be prompted to unlock wallet the next operation
+            // that requires a new key.
+        }
+    }
+
+    if (nZapSelectTxRet != DB_LOAD_OK)
+        return nZapSelectTxRet;
+
+    MarkDirty();
+
+    return DB_LOAD_OK;
+
+}
 
 DBErrors CWallet::ZapWalletTx(std::vector<CWalletTx>& vWtx)
 {
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
index e37d972a154f2..5db36f52d1722 100644
--- a/src/wallet/wallet.h
+++ b/src/wallet/wallet.h
@@ -792,6 +792,7 @@ class CWallet : public CCryptoKeyStore, public CValidationInterface
 
     DBErrors LoadWallet(bool& fFirstRunRet);
     DBErrors ZapWalletTx(std::vector<CWalletTx>& vWtx);
+    DBErrors ZapSelectTx(std::vector<uint256>& vHashIn, std::vector<uint256>& vHashOut);
 
     bool SetAddressBook(const CTxDestination& address, const std::string& strName, const std::string& purpose);
 
diff --git a/src/wallet/walletdb.cpp b/src/wallet/walletdb.cpp
index 0a4a1dae2f059..f2b5408e92b5d 100644
--- a/src/wallet/walletdb.cpp
+++ b/src/wallet/walletdb.cpp
@@ -785,6 +785,45 @@ DBErrors CWalletDB::FindWalletTx(CWallet* pwallet, vector<uint256>& vTxHash, vec
     return result;
 }
 
+DBErrors CWalletDB::ZapSelectTx(CWallet* pwallet, vector<uint256>& vTxHashIn, vector<uint256>& vTxHashOut)
+{
+    // build list of wallet TXs and hashes
+    vector<uint256> vTxHash;
+    vector<CWalletTx> vWtx;
+    DBErrors err = FindWalletTx(pwallet, vTxHash, vWtx);
+    if (err != DB_LOAD_OK) {
+        return err;
+    }
+
+    std::sort(vTxHash.begin(), vTxHash.end());
+    std::sort(vTxHashIn.begin(), vTxHashIn.end());
+
+    // erase each matching wallet TX
+    bool delerror = false;
+    vector<uint256>::iterator it = vTxHashIn.begin();
+    BOOST_FOREACH (uint256 hash, vTxHash) {
+        while (it < vTxHashIn.end() && (*it) < hash) {
+            it++;
+        }
+        if (it == vTxHashIn.end()) {
+            break;
+        }
+        else if ((*it) == hash) {
+            pwallet->mapWallet.erase(hash);
+            if(!EraseTx(hash)) {
+                LogPrint("db", "Transaction was found for deletion but returned database error: %s\n", hash.GetHex());
+                delerror = true;
+            }
+            vTxHashOut.push_back(hash);
+        }
+    }
+
+    if (delerror) {
+        return DB_CORRUPT;
+    }
+    return DB_LOAD_OK;
+}
+
 DBErrors CWalletDB::ZapWalletTx(CWallet* pwallet, vector<CWalletTx>& vWtx)
 {
     // build list of wallet TXs
diff --git a/src/wallet/walletdb.h b/src/wallet/walletdb.h
index 7e8cc4084e973..fe6c366343599 100644
--- a/src/wallet/walletdb.h
+++ b/src/wallet/walletdb.h
@@ -130,6 +130,7 @@ class CWalletDB : public CDB
     DBErrors LoadWallet(CWallet* pwallet);
     DBErrors FindWalletTx(CWallet* pwallet, std::vector<uint256>& vTxHash, std::vector<CWalletTx>& vWtx);
     DBErrors ZapWalletTx(CWallet* pwallet, std::vector<CWalletTx>& vWtx);
+    DBErrors ZapSelectTx(CWallet* pwallet, std::vector<uint256>& vHashIn, std::vector<uint256>& vHashOut);
     static bool Recover(CDBEnv& dbenv, const std::string& filename, bool fOnlyKeys);
     static bool Recover(CDBEnv& dbenv, const std::string& filename);
 

From 263de3d1c80c8a0aa54acd4d6708a4078d479b70 Mon Sep 17 00:00:00 2001
From: Jonas Schnelli <dev@jonasschnelli.ch>
Date: Thu, 17 Mar 2016 17:46:06 +0100
Subject: [PATCH 0054/1802] [Wallet][RPC] add abandoned status to
 listtransactions

---
 src/wallet/rpcwallet.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index 759f894ccbe67..8f7c649839758 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -1346,6 +1346,7 @@ void ListTransactions(const CWalletTx& wtx, const string& strAccount, int nMinDe
             entry.push_back(Pair("fee", ValueFromAmount(-nFee)));
             if (fLong)
                 WalletTxToJSON(wtx, entry);
+            entry.push_back(Pair("abandoned", wtx.isAbandoned()));
             ret.push_back(entry);
         }
     }

From df9e9233dc4fce68e48beb45699cd255911578c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Barbosa?= <joao@uphold.com>
Date: Wed, 23 Mar 2016 15:44:18 +0000
Subject: [PATCH 0055/1802] Fix lockunspents help message

---
 src/wallet/rpcwallet.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index 8f7c649839758..1d23505961374 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -2099,16 +2099,17 @@ UniValue lockunspent(const UniValue& params, bool fHelp)
 
     if (fHelp || params.size() < 1 || params.size() > 2)
         throw runtime_error(
-            "lockunspent unlock [{\"txid\":\"txid\",\"vout\":n},...]\n"
+            "lockunspent unlock ([{\"txid\":\"txid\",\"vout\":n},...])\n"
             "\nUpdates list of temporarily unspendable outputs.\n"
             "Temporarily lock (unlock=false) or unlock (unlock=true) specified transaction outputs.\n"
+            "If no transaction outputs are specified when unlocking then all current locked transaction outputs are unlocked.\n"
             "A locked transaction output will not be chosen by automatic coin selection, when spending bitcoins.\n"
             "Locks are stored in memory only. Nodes start with zero locked outputs, and the locked output list\n"
             "is always cleared (by virtue of process exit) when a node stops or fails.\n"
             "Also see the listunspent call\n"
             "\nArguments:\n"
             "1. unlock            (boolean, required) Whether to unlock (true) or lock (false) the specified transactions\n"
-            "2. \"transactions\"  (string, required) A json array of objects. Each object the txid (string) vout (numeric)\n"
+            "2. \"transactions\"  (string, optional) A json array of objects. Each object the txid (string) vout (numeric)\n"
             "     [           (json array of json objects)\n"
             "       {\n"
             "         \"txid\":\"id\",    (string) The transaction id\n"

From fc737d127fb53dbfd31d3d677e157b27f17d5b09 Mon Sep 17 00:00:00 2001
From: Jonas Schnelli <dev@jonasschnelli.ch>
Date: Thu, 24 Mar 2016 21:48:45 +0100
Subject: [PATCH 0056/1802] [Qt] remove unused formatBuildDate method

---
 src/qt/clientmodel.cpp | 5 -----
 src/qt/clientmodel.h   | 1 -
 2 files changed, 6 deletions(-)

diff --git a/src/qt/clientmodel.cpp b/src/qt/clientmodel.cpp
index 65637cd61fe73..697736cc880bb 100644
--- a/src/qt/clientmodel.cpp
+++ b/src/qt/clientmodel.cpp
@@ -173,11 +173,6 @@ QString ClientModel::formatSubVersion() const
     return QString::fromStdString(strSubVersion);
 }
 
-QString ClientModel::formatBuildDate() const
-{
-    return QString::fromStdString(CLIENT_DATE);
-}
-
 bool ClientModel::isReleaseVersion() const
 {
     return CLIENT_VERSION_IS_RELEASE;
diff --git a/src/qt/clientmodel.h b/src/qt/clientmodel.h
index db010f05cbd65..109f95a2a7112 100644
--- a/src/qt/clientmodel.h
+++ b/src/qt/clientmodel.h
@@ -72,7 +72,6 @@ class ClientModel : public QObject
 
     QString formatFullVersion() const;
     QString formatSubVersion() const;
-    QString formatBuildDate() const;
     bool isReleaseVersion() const;
     QString clientName() const;
     QString formatClientStartupTime() const;

From 018b60c5ea703ed12edcde034a185f79e77e5576 Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Fri, 25 Mar 2016 14:21:24 +0100
Subject: [PATCH 0057/1802] test_framework: detect failure of bitcoind startup

Replace the `bitcoin-cli -rpcwait` after spawning bitcoind
with our own loop that detects when bitcoind exits prematurely.

And if one node fails to start, stop the others.

This prevents a hang in such a case (see #7463).
---
 qa/rpc-tests/test_framework/util.py | 60 +++++++++++++++++++----------
 1 file changed, 40 insertions(+), 20 deletions(-)

diff --git a/qa/rpc-tests/test_framework/util.py b/qa/rpc-tests/test_framework/util.py
index 8d4bd52b94f9b..f069c32a607ba 100644
--- a/qa/rpc-tests/test_framework/util.py
+++ b/qa/rpc-tests/test_framework/util.py
@@ -16,6 +16,7 @@
 import subprocess
 import time
 import re
+import errno
 
 from . import coverage
 from .authproxy import AuthServiceProxy, JSONRPCException
@@ -130,11 +131,33 @@ def initialize_datadir(dirname, n):
         f.write("listenonion=0\n")
     return datadir
 
+def rpc_url(i, rpchost=None):
+    return "http://rt:rt@%s:%d" % (rpchost or '127.0.0.1', rpc_port(i))
+
+def wait_for_bitcoind_start(process, url, i):
+    '''
+    Wait for bitcoind to start. This means that RPC is accessible and fully initialized.
+    Raise an exception if bitcoind exits during initialization.
+    '''
+    while True:
+        if process.poll() is not None:
+            raise Exception('bitcoind exited with status %i during initialization' % process.returncode)
+        try:
+            rpc = get_rpc_proxy(url, i)
+            blocks = rpc.getblockcount()
+            break # break out of loop on success
+        except IOError as e:
+            if e.errno != errno.ECONNREFUSED: # Port not yet open?
+                raise # unknown IO error
+        except JSONRPCException as e: # Initialization phase
+            if e.error['code'] != -28: # RPC in warmup?
+                raise # unkown JSON RPC exception
+        time.sleep(0.25)
+
 def initialize_chain(test_dir):
     """
     Create (or copy from cache) a 200-block-long chain and
     4 wallets.
-    bitcoind and bitcoin-cli must be in search path.
     """
 
     if (not os.path.isdir(os.path.join("cache","node0"))
@@ -147,7 +170,6 @@ def initialize_chain(test_dir):
             if os.path.isdir(os.path.join("cache","node"+str(i))):
                 shutil.rmtree(os.path.join("cache","node"+str(i)))
 
-        devnull = open(os.devnull, "w")
         # Create cache directories, run bitcoinds:
         for i in range(4):
             datadir=initialize_datadir("cache", i)
@@ -156,19 +178,15 @@ def initialize_chain(test_dir):
                 args.append("-connect=127.0.0.1:"+str(p2p_port(0)))
             bitcoind_processes[i] = subprocess.Popen(args)
             if os.getenv("PYTHON_DEBUG", ""):
-                print "initialize_chain: bitcoind started, calling bitcoin-cli -rpcwait getblockcount"
-            subprocess.check_call([ os.getenv("BITCOINCLI", "bitcoin-cli"), "-datadir="+datadir,
-                                    "-rpcwait", "getblockcount"], stdout=devnull)
+                print "initialize_chain: bitcoind started, waiting for RPC to come up"
+            wait_for_bitcoind_start(bitcoind_processes[i], rpc_url(i), i)
             if os.getenv("PYTHON_DEBUG", ""):
-                print "initialize_chain: bitcoin-cli -rpcwait getblockcount completed"
-        devnull.close()
+                print "initialize_chain: RPC succesfully started"
 
         rpcs = []
-
         for i in range(4):
             try:
-                url = "http://rt:rt@127.0.0.1:%d" % (rpc_port(i),)
-                rpcs.append(get_rpc_proxy(url, i))
+                rpcs.append(get_rpc_proxy(rpc_url(i), i))
             except:
                 sys.stderr.write("Error connecting to "+url+"\n")
                 sys.exit(1)
@@ -243,17 +261,12 @@ def start_node(i, dirname, extra_args=None, rpchost=None, timewait=None, binary=
     args = [ binary, "-datadir="+datadir, "-server", "-keypool=1", "-discover=0", "-rest", "-mocktime="+str(get_mocktime()) ]
     if extra_args is not None: args.extend(extra_args)
     bitcoind_processes[i] = subprocess.Popen(args)
-    devnull = open(os.devnull, "w")
     if os.getenv("PYTHON_DEBUG", ""):
-        print "start_node: bitcoind started, calling bitcoin-cli -rpcwait getblockcount"
-    subprocess.check_call([ os.getenv("BITCOINCLI", "bitcoin-cli"), "-datadir="+datadir] +
-                          _rpchost_to_args(rpchost)  +
-                          ["-rpcwait", "getblockcount"], stdout=devnull)
+        print "start_node: bitcoind started, waiting for RPC to come up"
+    url = rpc_url(i, rpchost)
+    wait_for_bitcoind_start(bitcoind_processes[i], url, i)
     if os.getenv("PYTHON_DEBUG", ""):
-        print "start_node: calling bitcoin-cli -rpcwait getblockcount returned"
-    devnull.close()
-    url = "http://rt:rt@%s:%d" % (rpchost or '127.0.0.1', rpc_port(i))
-
+        print "start_node: RPC succesfully started"
     proxy = get_rpc_proxy(url, i, timeout=timewait)
 
     if COVERAGE_DIR:
@@ -267,7 +280,14 @@ def start_nodes(num_nodes, dirname, extra_args=None, rpchost=None, binary=None):
     """
     if extra_args is None: extra_args = [ None for i in range(num_nodes) ]
     if binary is None: binary = [ None for i in range(num_nodes) ]
-    return [ start_node(i, dirname, extra_args[i], rpchost, binary=binary[i]) for i in range(num_nodes) ]
+    rpcs = []
+    try:
+        for i in range(num_nodes):
+            rpcs.append(start_node(i, dirname, extra_args[i], rpchost, binary=binary[i]))
+    except: # If one node failed to start, stop the others
+        stop_nodes(rpcs)
+        raise
+    return rpcs
 
 def log_filename(dirname, n_node, logname):
     return os.path.join(dirname, "node"+str(n_node), "regtest", logname)

From d7b80b54fbb73acc92ddee84697ac4cc10d4d336 Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Mon, 28 Mar 2016 11:44:19 +0200
Subject: [PATCH 0058/1802] test_framework: Avoid infinite loop in encoding
 Decimal

Avoid an infinite loop in encoding, by ensuring EncodeDecimal
returns a string. round(Decimal) used to convert it to
float, but it no longer does in python 3.x. Strings are
supported since #6380, so just use that.
---
 qa/rpc-tests/test_framework/authproxy.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qa/rpc-tests/test_framework/authproxy.py b/qa/rpc-tests/test_framework/authproxy.py
index fba469a0dd0b6..cfc254da09630 100644
--- a/qa/rpc-tests/test_framework/authproxy.py
+++ b/qa/rpc-tests/test_framework/authproxy.py
@@ -61,7 +61,7 @@ def __init__(self, rpc_error):
 
 def EncodeDecimal(o):
     if isinstance(o, decimal.Decimal):
-        return round(o, 8)
+        return str(o)
     raise TypeError(repr(o) + " is not JSON serializable")
 
 class AuthServiceProxy(object):

From e7e48ba66cb597621a30945da9ca7fc36a6dc84c Mon Sep 17 00:00:00 2001
From: Luke Dashjr <luke-jr+git@utopios.org>
Date: Mon, 28 Mar 2016 12:28:49 +0200
Subject: [PATCH 0059/1802] test_framework: Py3.4 compat: Specify timeout
 parameter by name
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Changed in version 3.4: The strict parameter was removed. HTTP 0.9-style
“Simple Responses” are not longer supported.
(https://docs.python.org/3/library/http.client.html)

Source: https://github.com/jgarzik/python-bitcoinrpc/commit/7ebeebb4f61917fe590d980cb4f9aefdce2c8f25
---
 qa/rpc-tests/test_framework/authproxy.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/qa/rpc-tests/test_framework/authproxy.py b/qa/rpc-tests/test_framework/authproxy.py
index cfc254da09630..1eb2772592265 100644
--- a/qa/rpc-tests/test_framework/authproxy.py
+++ b/qa/rpc-tests/test_framework/authproxy.py
@@ -92,11 +92,10 @@ def __init__(self, service_url, service_name=None, timeout=HTTP_TIMEOUT, connect
             self.__conn = connection
         elif self.__url.scheme == 'https':
             self.__conn = httplib.HTTPSConnection(self.__url.hostname, port,
-                                                  None, None, False,
-                                                  timeout)
+                                                  timeout=timeout)
         else:
             self.__conn = httplib.HTTPConnection(self.__url.hostname, port,
-                                                 False, timeout)
+                                                 timeout=timeout)
 
     def __getattr__(self, name):
         if name.startswith('__') and name.endswith('__'):

From fa3fafc96076afb15fa77e01d5f6aff88a333a7e Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Mon, 28 Mar 2016 21:47:13 +0200
Subject: [PATCH 0060/1802] [qa] wallet: Wait for reindex to catch up

---
 qa/rpc-tests/wallet.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/qa/rpc-tests/wallet.py b/qa/rpc-tests/wallet.py
index df176601a54b3..e6ce39711913a 100755
--- a/qa/rpc-tests/wallet.py
+++ b/qa/rpc-tests/wallet.py
@@ -279,6 +279,7 @@ def run_test (self):
         blocks = self.nodes[0].generate(2)
         self.sync_all()
         balance_nodes = [self.nodes[i].getbalance() for i in range(3)]
+        block_count = self.nodes[0].getblockcount()
 
         maintenance = [
             '-rescan',
@@ -292,6 +293,9 @@ def run_test (self):
             stop_nodes(self.nodes)
             wait_bitcoinds()
             self.nodes = start_nodes(3, self.options.tmpdir, [[m]] * 3)
+            while m == '-reindex' and [block_count] * 3 != [self.nodes[i].getblockcount() for i in range(3)]:
+                # reindex will leave rpc warm up "early"; Wait for it to finish
+                time.sleep(0.1)
             assert_equal(balance_nodes, [self.nodes[i].getbalance() for i in range(3)])
 
         # Exercise listsinceblock with the last two blocks

From cef8bdf5d747d42c3be473d7ef38052eebd5e9bd Mon Sep 17 00:00:00 2001
From: Jonas Schnelli <dev@jonasschnelli.ch>
Date: Thu, 24 Mar 2016 21:43:14 +0100
Subject: [PATCH 0061/1802] [Wallet][RPC] add missing abandon status
 documentation

---
 src/wallet/rpcwallet.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index 1d23505961374..d6b63bf12f22a 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -1439,6 +1439,7 @@ UniValue listtransactions(const UniValue& params, bool fHelp)
             "    \"vout\": n,                (numeric) the vout value\n"
             "    \"fee\": x.xxx,             (numeric) The amount of the fee in " + CURRENCY_UNIT + ". This is negative and only available for the \n"
             "                                         'send' category of transactions.\n"
+            "    \"abandoned\": xxx          (bool) 'true' if the transaction has been abandoned (inputs are respendable).\n"
             "    \"confirmations\": n,       (numeric) The number of confirmations for the transaction. Available for 'send' and \n"
             "                                         'receive' category of transactions. Negative confirmations indicate the\n"
             "                                         transaction conflicts with the block chain\n"

From 7d5e31a82bbf39b9e1a5f0afe5ad9cbf4df9778b Mon Sep 17 00:00:00 2001
From: Jonas Schnelli <dev@jonasschnelli.ch>
Date: Tue, 29 Mar 2016 11:17:47 +0200
Subject: [PATCH 0062/1802] [Qt] remove trailing output-index from
 transaction-id

The trailing output-index leads to cases where the user can't look-up the transaction ID in various systems.
---
 src/qt/transactiondesc.cpp   | 3 ++-
 src/qt/transactionrecord.cpp | 7 +++----
 src/qt/transactionrecord.h   | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/qt/transactiondesc.cpp b/src/qt/transactiondesc.cpp
index 5cb4cd5af72b2..5abefc144e842 100644
--- a/src/qt/transactiondesc.cpp
+++ b/src/qt/transactiondesc.cpp
@@ -240,7 +240,8 @@ QString TransactionDesc::toHTML(CWallet *wallet, CWalletTx &wtx, TransactionReco
     if (wtx.mapValue.count("comment") && !wtx.mapValue["comment"].empty())
         strHTML += "<br><b>" + tr("Comment") + ":</b><br>" + GUIUtil::HtmlEscape(wtx.mapValue["comment"], true) + "<br>";
 
-    strHTML += "<b>" + tr("Transaction ID") + ":</b> " + TransactionRecord::formatSubTxId(wtx.GetHash(), rec->idx) + "<br>";
+    strHTML += "<b>" + tr("Transaction ID") + ":</b> " + rec->getTxID() + "<br>";
+    strHTML += "<b>" + tr("Output index") + ":</b> " + QString::number(rec->getOutputIndex()) + "<br>";
 
     // Message from normal bitcoin:URI (bitcoin:123...?message=example)
     Q_FOREACH (const PAIRTYPE(std::string, std::string)& r, wtx.vOrderForm)
diff --git a/src/qt/transactionrecord.cpp b/src/qt/transactionrecord.cpp
index 5b16b108e66dd..97b77cc93d1be 100644
--- a/src/qt/transactionrecord.cpp
+++ b/src/qt/transactionrecord.cpp
@@ -260,11 +260,10 @@ bool TransactionRecord::statusUpdateNeeded()
 
 QString TransactionRecord::getTxID() const
 {
-    return formatSubTxId(hash, idx);
+    return QString::fromStdString(hash.ToString());
 }
 
-QString TransactionRecord::formatSubTxId(const uint256 &hash, int vout)
+int TransactionRecord::getOutputIndex() const
 {
-    return QString::fromStdString(hash.ToString() + strprintf("-%03d", vout));
+    return idx;
 }
-
diff --git a/src/qt/transactionrecord.h b/src/qt/transactionrecord.h
index 49753ee31f815..95ab98c10df4e 100644
--- a/src/qt/transactionrecord.h
+++ b/src/qt/transactionrecord.h
@@ -128,8 +128,8 @@ class TransactionRecord
     /** Return the unique identifier for this transaction (part) */
     QString getTxID() const;
 
-    /** Format subtransaction id */
-    static QString formatSubTxId(const uint256 &hash, int vout);
+    /** Return the output index of the subtransaction  */
+    int getOutputIndex() const;
 
     /** Update status from core wallet tx.
      */

From e1523cee5808bb792cd99f037f06b736af4e23fb Mon Sep 17 00:00:00 2001
From: mruddy <mruddy@users.noreply.github.com>
Date: Tue, 29 Mar 2016 14:40:00 +0000
Subject: [PATCH 0063/1802] P2P: add maxtimeadjustment command line option

---
 src/init.cpp     | 2 ++
 src/timedata.cpp | 2 +-
 src/timedata.h   | 2 ++
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/init.cpp b/src/init.cpp
index 38ac91b2af8b4..0fb7146128a3f 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -27,6 +27,7 @@
 #include "script/standard.h"
 #include "script/sigcache.h"
 #include "scheduler.h"
+#include "timedata.h"
 #include "txdb.h"
 #include "txmempool.h"
 #include "torcontrol.h"
@@ -365,6 +366,7 @@ std::string HelpMessage(HelpMessageMode mode)
     strUsage += HelpMessageOpt("-maxconnections=<n>", strprintf(_("Maintain at most <n> connections to peers (default: %u)"), DEFAULT_MAX_PEER_CONNECTIONS));
     strUsage += HelpMessageOpt("-maxreceivebuffer=<n>", strprintf(_("Maximum per-connection receive buffer, <n>*1000 bytes (default: %u)"), DEFAULT_MAXRECEIVEBUFFER));
     strUsage += HelpMessageOpt("-maxsendbuffer=<n>", strprintf(_("Maximum per-connection send buffer, <n>*1000 bytes (default: %u)"), DEFAULT_MAXSENDBUFFER));
+    strUsage += HelpMessageOpt("-maxtimeadjustment", strprintf(_("Maximum allowed median peer time offset adjustment. Local perspective of time may be influenced by peers forward or backward by this amount. (default: %u seconds)"), DEFAULT_MAX_TIME_ADJUSTMENT));
     strUsage += HelpMessageOpt("-onion=<ip:port>", strprintf(_("Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: %s)"), "-proxy"));
     strUsage += HelpMessageOpt("-onlynet=<net>", _("Only connect to nodes in network <net> (ipv4, ipv6 or onion)"));
     strUsage += HelpMessageOpt("-permitbaremultisig", strprintf(_("Relay non-P2SH multisig (default: %u)"), DEFAULT_PERMIT_BAREMULTISIG));
diff --git a/src/timedata.cpp b/src/timedata.cpp
index 4d2f8d1e3b664..b6bcf86fbf261 100644
--- a/src/timedata.cpp
+++ b/src/timedata.cpp
@@ -83,7 +83,7 @@ void AddTimeData(const CNetAddr& ip, int64_t nOffsetSample)
         int64_t nMedian = vTimeOffsets.median();
         std::vector<int64_t> vSorted = vTimeOffsets.sorted();
         // Only let other nodes change our time by so much
-        if (abs64(nMedian) < 70 * 60)
+        if (abs64(nMedian) <= std::max<int64_t>(0, GetArg("-maxtimeadjustment", DEFAULT_MAX_TIME_ADJUSTMENT)))
         {
             nTimeOffset = nMedian;
         }
diff --git a/src/timedata.h b/src/timedata.h
index 2296baf11bb92..9f2499c85c442 100644
--- a/src/timedata.h
+++ b/src/timedata.h
@@ -10,6 +10,8 @@
 #include <stdint.h>
 #include <vector>
 
+static const int64_t DEFAULT_MAX_TIME_ADJUSTMENT = 70 * 60;
+
 class CNetAddr;
 
 /** 

From faa9f01461fea8e3665371f658d7f0dc919851eb Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Tue, 29 Mar 2016 16:48:42 +0200
Subject: [PATCH 0064/1802] [qa] Don't run pruning.py twice

---
 qa/pull-tester/rpc-tests.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/qa/pull-tester/rpc-tests.py b/qa/pull-tester/rpc-tests.py
index 10b51fef7a718..d5d5f106103f2 100755
--- a/qa/pull-tester/rpc-tests.py
+++ b/qa/pull-tester/rpc-tests.py
@@ -128,7 +128,6 @@
     'getblocktemplate_proposals.py',
     'txn_doublespend.py',
     'txn_clone.py --mineblock',
-    'pruning.py',
     'forknotify.py',
     'invalidateblock.py',
 #    'rpcbind_test.py', #temporary, bug in libevent, see #6655

From 18f05c765c800126b74a6d5b7f33cef7c9aae1b7 Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Sun, 20 Mar 2016 17:51:52 +0000
Subject: [PATCH 0065/1802] build: python 3 compatibility

Ubuntu 16.04 "xenial xerus" does not come with Python 2.x by default.
It is possible to install a python-2.7 package, but this has its own
problem: no `python` or `python2` symlink (see #7717).

This fixes the following scripts to work with python 3:
- `make check` (bctest,py, bitcoin-util-test.py)
- `make translate` (extract_strings_qt.py)
- `make symbols-check` (symbol-check.py)
- `make security-check` (security-check.py)

Explicitly call the python commands using $(PYTHON) instead
of relying on the interpreter line at the top of the scripts.
---
 Makefile.am                         |   6 +-
 configure.ac                        |   2 +-
 contrib/devtools/security-check.py  |  34 +++----
 contrib/devtools/symbol-check.py    |  63 ++++++-------
 contrib/macdeploy/custom_dsstore.py |   6 +-
 contrib/macdeploy/macdeployqtplus   | 136 ++++++++++++++--------------
 share/qt/extract_strings_qt.py      |   9 +-
 src/Makefile.qt.include             |   2 +-
 src/Makefile.test.include           |   2 +-
 src/test/bctest.py                  |   2 +-
 src/test/bitcoin-util-test.py       |   2 +-
 11 files changed, 135 insertions(+), 129 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index d6cbd7cb1221c..0929a59ed2de6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -110,7 +110,7 @@ osx_volname:
 
 if BUILD_DARWIN
 $(OSX_DMG): $(OSX_APP_BUILT) $(OSX_PACKAGING)
-	$(OSX_DEPLOY_SCRIPT) $(OSX_APP) -add-qt-tr $(OSX_QT_TRANSLATIONS) -translations-dir=$(QT_TRANSLATION_DIR) -dmg -fancy $(OSX_FANCY_PLIST) -verbose 2 -volname $(OSX_VOLNAME)
+	$(PYTHON) $(OSX_DEPLOY_SCRIPT) $(OSX_APP) -add-qt-tr $(OSX_QT_TRANSLATIONS) -translations-dir=$(QT_TRANSLATION_DIR) -dmg -fancy $(OSX_FANCY_PLIST) -verbose 2 -volname $(OSX_VOLNAME)
 
 deploydir: $(OSX_DMG)
 else
@@ -134,10 +134,10 @@ $(APP_DIST_DIR)/.background/$(OSX_BACKGROUND_IMAGE): $(OSX_BACKGROUND_IMAGE_DPIF
 	$(TIFFCP) -c none $(OSX_BACKGROUND_IMAGE_DPIFILES) $@
 
 $(APP_DIST_DIR)/.DS_Store: $(OSX_DSSTORE_GEN)
-	$< "$@" "$(OSX_VOLNAME)"
+	$(PYTHON) $< "$@" "$(OSX_VOLNAME)"
 
 $(APP_DIST_DIR)/$(OSX_APP)/Contents/MacOS/Bitcoin-Qt: $(OSX_APP_BUILT) $(OSX_PACKAGING)
-	INSTALLNAMETOOL=$(INSTALLNAMETOOL)  OTOOL=$(OTOOL) STRIP=$(STRIP) $(OSX_DEPLOY_SCRIPT) $(OSX_APP) -translations-dir=$(QT_TRANSLATION_DIR) -add-qt-tr $(OSX_QT_TRANSLATIONS) -verbose 2
+	INSTALLNAMETOOL=$(INSTALLNAMETOOL)  OTOOL=$(OTOOL) STRIP=$(STRIP) $(PYTHON) $(OSX_DEPLOY_SCRIPT) $(OSX_APP) -translations-dir=$(QT_TRANSLATION_DIR) -add-qt-tr $(OSX_QT_TRANSLATIONS) -verbose 2
 
 deploydir: $(APP_DIST_EXTRAS)
 endif
diff --git a/configure.ac b/configure.ac
index 939dfeaabfce9..8596307f38bf5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -60,7 +60,7 @@ AC_PATH_TOOL(STRIP, strip)
 AC_PATH_TOOL(GCOV, gcov)
 AC_PATH_PROG(LCOV, lcov)
 AC_PATH_PROG(JAVA, java)
-AC_PATH_PROG(PYTHON, python)
+AC_PATH_PROGS([PYTHON], [python3 python2.7 python2 python])
 AC_PATH_PROG(GENHTML, genhtml)
 AC_PATH_PROG([GIT], [git])
 AC_PATH_PROG(CCACHE,ccache)
diff --git a/contrib/devtools/security-check.py b/contrib/devtools/security-check.py
index 0319f739c4936..301fea85c1f6f 100755
--- a/contrib/devtools/security-check.py
+++ b/contrib/devtools/security-check.py
@@ -5,7 +5,7 @@
 Otherwise the exit status will be 1 and it will log which executables failed which checks.
 Needs `readelf` (for ELF) and `objdump` (for PE).
 '''
-from __future__ import division,print_function
+from __future__ import division,print_function,unicode_literals
 import subprocess
 import sys
 import os
@@ -23,9 +23,9 @@ def check_ELF_PIE(executable):
         raise IOError('Error opening file')
 
     ok = False
-    for line in stdout.split('\n'):
+    for line in stdout.split(b'\n'):
         line = line.split()
-        if len(line)>=2 and line[0] == 'Type:' and line[1] == 'DYN':
+        if len(line)>=2 and line[0] == b'Type:' and line[1] == b'DYN':
             ok = True
     return ok
 
@@ -38,17 +38,17 @@ def get_ELF_program_headers(executable):
     in_headers = False
     count = 0
     headers = []
-    for line in stdout.split('\n'):
-        if line.startswith('Program Headers:'):
+    for line in stdout.split(b'\n'):
+        if line.startswith(b'Program Headers:'):
             in_headers = True
-        if line == '':
+        if line == b'':
             in_headers = False
         if in_headers:
             if count == 1: # header line
-                ofs_typ = line.find('Type')
-                ofs_offset = line.find('Offset')
-                ofs_flags = line.find('Flg')
-                ofs_align = line.find('Align')
+                ofs_typ = line.find(b'Type')
+                ofs_offset = line.find(b'Offset')
+                ofs_flags = line.find(b'Flg')
+                ofs_align = line.find(b'Align')
                 if ofs_typ == -1 or ofs_offset == -1 or ofs_flags == -1 or ofs_align  == -1:
                     raise ValueError('Cannot parse elfread -lW output')
             elif count > 1:
@@ -65,9 +65,9 @@ def check_ELF_NX(executable):
     have_wx = False
     have_gnu_stack = False
     for (typ, flags) in get_ELF_program_headers(executable):
-        if typ == 'GNU_STACK':
+        if typ == b'GNU_STACK':
             have_gnu_stack = True
-        if 'W' in flags and 'E' in flags: # section is both writable and executable
+        if b'W' in flags and b'E' in flags: # section is both writable and executable
             have_wx = True
     return have_gnu_stack and not have_wx
 
@@ -84,7 +84,7 @@ def check_ELF_RELRO(executable):
         # However, the dynamic linker need to write to this area so these are RW.
         # Glibc itself takes care of mprotecting this area R after relocations are finished.
         # See also http://permalink.gmane.org/gmane.comp.gnu.binutils/71347
-        if typ == 'GNU_RELRO':
+        if typ == b'GNU_RELRO':
             have_gnu_relro = True
 
     have_bindnow = False
@@ -92,9 +92,9 @@ def check_ELF_RELRO(executable):
     (stdout, stderr) = p.communicate()
     if p.returncode:
         raise IOError('Error opening file')
-    for line in stdout.split('\n'):
+    for line in stdout.split(b'\n'):
         tokens = line.split()
-        if len(tokens)>1 and tokens[1] == '(BIND_NOW)' or (len(tokens)>2 and tokens[1] == '(FLAGS)' and 'BIND_NOW' in tokens[2]):
+        if len(tokens)>1 and tokens[1] == b'(BIND_NOW)' or (len(tokens)>2 and tokens[1] == b'(FLAGS)' and b'BIND_NOW' in tokens[2]):
             have_bindnow = True
     return have_gnu_relro and have_bindnow
 
@@ -107,8 +107,8 @@ def check_ELF_Canary(executable):
     if p.returncode:
         raise IOError('Error opening file')
     ok = False
-    for line in stdout.split('\n'):
-        if '__stack_chk_fail' in line:
+    for line in stdout.split(b'\n'):
+        if b'__stack_chk_fail' in line:
             ok = True
     return ok
 
diff --git a/contrib/devtools/symbol-check.py b/contrib/devtools/symbol-check.py
index 4ad5136f79ee5..e26c0fbb94455 100755
--- a/contrib/devtools/symbol-check.py
+++ b/contrib/devtools/symbol-check.py
@@ -11,7 +11,7 @@
 
     find ../gitian-builder/build -type f -executable | xargs python contrib/devtools/symbol-check.py
 '''
-from __future__ import division, print_function
+from __future__ import division, print_function, unicode_literals
 import subprocess
 import re
 import sys
@@ -47,28 +47,28 @@
 
 # Ignore symbols that are exported as part of every executable
 IGNORE_EXPORTS = {
-'_edata', '_end', '_init', '__bss_start', '_fini', '_IO_stdin_used'
+b'_edata', b'_end', b'_init', b'__bss_start', b'_fini', b'_IO_stdin_used'
 }
 READELF_CMD = os.getenv('READELF', '/usr/bin/readelf')
 CPPFILT_CMD = os.getenv('CPPFILT', '/usr/bin/c++filt')
 # Allowed NEEDED libraries
 ALLOWED_LIBRARIES = {
 # bitcoind and bitcoin-qt
-'libgcc_s.so.1', # GCC base support
-'libc.so.6', # C library
-'libpthread.so.0', # threading
-'libanl.so.1', # DNS resolve
-'libm.so.6', # math library
-'librt.so.1', # real-time (clock)
-'ld-linux-x86-64.so.2', # 64-bit dynamic linker
-'ld-linux.so.2', # 32-bit dynamic linker
+b'libgcc_s.so.1', # GCC base support
+b'libc.so.6', # C library
+b'libpthread.so.0', # threading
+b'libanl.so.1', # DNS resolve
+b'libm.so.6', # math library
+b'librt.so.1', # real-time (clock)
+b'ld-linux-x86-64.so.2', # 64-bit dynamic linker
+b'ld-linux.so.2', # 32-bit dynamic linker
 # bitcoin-qt only
-'libX11-xcb.so.1', # part of X11
-'libX11.so.6', # part of X11
-'libxcb.so.1', # part of X11
-'libfontconfig.so.1', # font support
-'libfreetype.so.6', # font parsing
-'libdl.so.2' # programming interface to dynamic linker
+b'libX11-xcb.so.1', # part of X11
+b'libX11.so.6', # part of X11
+b'libxcb.so.1', # part of X11
+b'libfontconfig.so.1', # font support
+b'libfreetype.so.6', # font parsing
+b'libdl.so.2' # programming interface to dynamic linker
 }
 
 class CPPFilt(object):
@@ -81,7 +81,8 @@ def __init__(self):
         self.proc = subprocess.Popen(CPPFILT_CMD, stdin=subprocess.PIPE, stdout=subprocess.PIPE)
 
     def __call__(self, mangled):
-        self.proc.stdin.write(mangled + '\n')
+        self.proc.stdin.write(mangled + b'\n')
+        self.proc.stdin.flush()
         return self.proc.stdout.readline().rstrip()
 
     def close(self):
@@ -99,24 +100,24 @@ def read_symbols(executable, imports=True):
     if p.returncode:
         raise IOError('Could not read symbols for %s: %s' % (executable, stderr.strip()))
     syms = []
-    for line in stdout.split('\n'):
+    for line in stdout.split(b'\n'):
         line = line.split()
-        if len(line)>7 and re.match('[0-9]+:$', line[0]):
-            (sym, _, version) = line[7].partition('@')
-            is_import = line[6] == 'UND'
-            if version.startswith('@'):
+        if len(line)>7 and re.match(b'[0-9]+:$', line[0]):
+            (sym, _, version) = line[7].partition(b'@')
+            is_import = line[6] == b'UND'
+            if version.startswith(b'@'):
                 version = version[1:]
             if is_import == imports:
                 syms.append((sym, version))
     return syms
 
 def check_version(max_versions, version):
-    if '_' in version:
-        (lib, _, ver) = version.rpartition('_')
+    if b'_' in version:
+        (lib, _, ver) = version.rpartition(b'_')
     else:
         lib = version
         ver = '0'
-    ver = tuple([int(x) for x in ver.split('.')])
+    ver = tuple([int(x) for x in ver.split(b'.')])
     if not lib in max_versions:
         return False
     return ver <= max_versions[lib]
@@ -127,10 +128,10 @@ def read_libraries(filename):
     if p.returncode:
         raise IOError('Error opening file')
     libraries = []
-    for line in stdout.split('\n'):
+    for line in stdout.split(b'\n'):
         tokens = line.split()
-        if len(tokens)>2 and tokens[1] == '(NEEDED)':
-            match = re.match('^Shared library: \[(.*)\]$', ' '.join(tokens[2:]))
+        if len(tokens)>2 and tokens[1] == b'(NEEDED)':
+            match = re.match(b'^Shared library: \[(.*)\]$', b' '.join(tokens[2:]))
             if match:
                 libraries.append(match.group(1))
             else:
@@ -144,18 +145,18 @@ def read_libraries(filename):
         # Check imported symbols
         for sym,version in read_symbols(filename, True):
             if version and not check_version(MAX_VERSIONS, version):
-                print('%s: symbol %s from unsupported version %s' % (filename, cppfilt(sym), version))
+                print('%s: symbol %s from unsupported version %s' % (filename, cppfilt(sym).decode('utf-8'), version.decode('utf-8')))
                 retval = 1
         # Check exported symbols
         for sym,version in read_symbols(filename, False):
             if sym in IGNORE_EXPORTS:
                 continue
-            print('%s: export of symbol %s not allowed' % (filename, cppfilt(sym)))
+            print('%s: export of symbol %s not allowed' % (filename, cppfilt(sym).decode('utf-8')))
             retval = 1
         # Check dependency libraries
         for library_name in read_libraries(filename):
             if library_name not in ALLOWED_LIBRARIES:
-                print('%s: NEEDED library %s is not allowed' % (filename, library_name))
+                print('%s: NEEDED library %s is not allowed' % (filename, library_name.decode('utf-8')))
                 retval = 1
 
     exit(retval)
diff --git a/contrib/macdeploy/custom_dsstore.py b/contrib/macdeploy/custom_dsstore.py
index 8481e903a0d12..03e2325fc0c3c 100755
--- a/contrib/macdeploy/custom_dsstore.py
+++ b/contrib/macdeploy/custom_dsstore.py
@@ -2,7 +2,7 @@
 # Copyright (c) 2013-2015 The Bitcoin Core developers
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
-
+from __future__ import division,print_function,unicode_literals
 import biplist
 from ds_store import DSStore
 from mac_alias import Alias
@@ -14,7 +14,7 @@
 ds = DSStore.open(output_file, 'w+')
 ds['.']['bwsp'] = {
     'ShowStatusBar': False,
-    'WindowBounds': '{{300, 280}, {500, 343}}',
+    'WindowBounds': b'{{300, 280}, {500, 343}}',
     'ContainerShowSidebar': False,
     'SidebarWidth': 0,
     'ShowTabView': False,
@@ -28,7 +28,7 @@
     'gridOffsetX': 0.0,
     'textSize': 12.0,
     'viewOptionsVersion': 1,
-    'backgroundImageAlias': '\x00\x00\x00\x00\x02\x1e\x00\x02\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xd1\x94\\\xb0H+\x00\x05\x00\x00\x00\x98\x0fbackground.tiff\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x99\xd19\xb0\xf8\x00\x00\x00\x00\x00\x00\x00\x00\xff\xff\xff\xff\x00\x00\r\x02\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x0b.background\x00\x00\x10\x00\x08\x00\x00\xd1\x94\\\xb0\x00\x00\x00\x11\x00\x08\x00\x00\xd19\xb0\xf8\x00\x00\x00\x01\x00\x04\x00\x00\x00\x98\x00\x0e\x00 \x00\x0f\x00b\x00a\x00c\x00k\x00g\x00r\x00o\x00u\x00n\x00d\x00.\x00t\x00i\x00f\x00f\x00\x0f\x00\x02\x00\x00\x00\x12\x00\x1c/.background/background.tiff\x00\x14\x01\x06\x00\x00\x00\x00\x01\x06\x00\x02\x00\x00\x0cMacintosh HD\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xce\x97\xab\xc3H+\x00\x00\x01\x88[\x88\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02u\xab\x8d\xd1\x94\\\xb0devrddsk\xff\xff\xff\xff\x00\x00\t \x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x07bitcoin\x00\x00\x10\x00\x08\x00\x00\xce\x97\xab\xc3\x00\x00\x00\x11\x00\x08\x00\x00\xd1\x94\\\xb0\x00\x00\x00\x01\x00\x14\x01\x88[\x88\x00\x16\xa9\t\x00\x08\xfaR\x00\x08\xfaQ\x00\x02d\x8e\x00\x0e\x00\x02\x00\x00\x00\x0f\x00\x1a\x00\x0c\x00M\x00a\x00c\x00i\x00n\x00t\x00o\x00s\x00h\x00 \x00H\x00D\x00\x13\x00\x01/\x00\x00\x15\x00\x02\x00\x14\xff\xff\x00\x00\xff\xff\x00\x00',
+    'backgroundImageAlias': b'\x00\x00\x00\x00\x02\x1e\x00\x02\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xd1\x94\\\xb0H+\x00\x05\x00\x00\x00\x98\x0fbackground.tiff\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x99\xd19\xb0\xf8\x00\x00\x00\x00\x00\x00\x00\x00\xff\xff\xff\xff\x00\x00\r\x02\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x0b.background\x00\x00\x10\x00\x08\x00\x00\xd1\x94\\\xb0\x00\x00\x00\x11\x00\x08\x00\x00\xd19\xb0\xf8\x00\x00\x00\x01\x00\x04\x00\x00\x00\x98\x00\x0e\x00 \x00\x0f\x00b\x00a\x00c\x00k\x00g\x00r\x00o\x00u\x00n\x00d\x00.\x00t\x00i\x00f\x00f\x00\x0f\x00\x02\x00\x00\x00\x12\x00\x1c/.background/background.tiff\x00\x14\x01\x06\x00\x00\x00\x00\x01\x06\x00\x02\x00\x00\x0cMacintosh HD\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xce\x97\xab\xc3H+\x00\x00\x01\x88[\x88\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02u\xab\x8d\xd1\x94\\\xb0devrddsk\xff\xff\xff\xff\x00\x00\t \x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x07bitcoin\x00\x00\x10\x00\x08\x00\x00\xce\x97\xab\xc3\x00\x00\x00\x11\x00\x08\x00\x00\xd1\x94\\\xb0\x00\x00\x00\x01\x00\x14\x01\x88[\x88\x00\x16\xa9\t\x00\x08\xfaR\x00\x08\xfaQ\x00\x02d\x8e\x00\x0e\x00\x02\x00\x00\x00\x0f\x00\x1a\x00\x0c\x00M\x00a\x00c\x00i\x00n\x00t\x00o\x00s\x00h\x00 \x00H\x00D\x00\x13\x00\x01/\x00\x00\x15\x00\x02\x00\x14\xff\xff\x00\x00\xff\xff\x00\x00',
     'backgroundColorBlue': 1.0,
     'iconSize': 96.0,
     'backgroundColorGreen': 1.0,
diff --git a/contrib/macdeploy/macdeployqtplus b/contrib/macdeploy/macdeployqtplus
index 7e6270c743e3f..685ed8e5b89c0 100755
--- a/contrib/macdeploy/macdeployqtplus
+++ b/contrib/macdeploy/macdeployqtplus
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-
+from __future__ import division, print_function, unicode_literals
 #
 # Copyright (C) 2011  Patrick "p2k" Schneider <me@p2k-network.org>
 #
@@ -201,7 +201,7 @@ class DeploymentInfo(object):
 
 def getFrameworks(binaryPath, verbose):
     if verbose >= 3:
-        print "Inspecting with otool: " + binaryPath
+        print("Inspecting with otool: " + binaryPath)
     otoolbin=os.getenv("OTOOL", "otool")
     otool = subprocess.Popen([otoolbin, "-L", binaryPath], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
     o_stdout, o_stderr = otool.communicate()
@@ -222,8 +222,8 @@ def getFrameworks(binaryPath, verbose):
         info = FrameworkInfo.fromOtoolLibraryLine(line.strip())
         if info is not None:
             if verbose >= 3:
-                print "Found framework:"
-                print info
+                print("Found framework:")
+                print(info)
             libraries.append(info)
     
     return libraries
@@ -234,24 +234,24 @@ def runInstallNameTool(action, *args):
 
 def changeInstallName(oldName, newName, binaryPath, verbose):
     if verbose >= 3:
-        print "Using install_name_tool:"
-        print " in", binaryPath
-        print " change reference", oldName
-        print " to", newName
+        print("Using install_name_tool:")
+        print(" in", binaryPath)
+        print(" change reference", oldName)
+        print(" to", newName)
     runInstallNameTool("change", oldName, newName, binaryPath)
 
 def changeIdentification(id, binaryPath, verbose):
     if verbose >= 3:
-        print "Using install_name_tool:"
-        print " change identification in", binaryPath
-        print " to", id
+        print("Using install_name_tool:")
+        print(" change identification in", binaryPath)
+        print(" to", id)
     runInstallNameTool("id", id, binaryPath)
 
 def runStrip(binaryPath, verbose):
     stripbin=os.getenv("STRIP", "strip")
     if verbose >= 3:
-        print "Using strip:"
-        print " stripped", binaryPath
+        print("Using strip:")
+        print(" stripped", binaryPath)
     subprocess.check_call([stripbin, "-x", binaryPath])
 
 def copyFramework(framework, path, verbose):
@@ -274,8 +274,8 @@ def copyFramework(framework, path, verbose):
     
     shutil.copy2(fromPath, toPath)
     if verbose >= 3:
-        print "Copied:", fromPath
-        print " to:", toPath
+        print("Copied:", fromPath)
+        print(" to:", toPath)
 
     permissions = os.stat(toPath)
     if not permissions.st_mode & stat.S_IWRITE:
@@ -288,14 +288,14 @@ def copyFramework(framework, path, verbose):
         if not os.path.exists(linkfrom):
             os.symlink(linkto, linkfrom)
             if verbose >= 2:
-                print "Linked:", linkfrom, "->", linkto
+                print("Linked:", linkfrom, "->", linkto)
         fromResourcesDir = framework.sourceResourcesDirectory
         if os.path.exists(fromResourcesDir):
             toResourcesDir = os.path.join(path, framework.destinationResourcesDirectory)
             shutil.copytree(fromResourcesDir, toResourcesDir, symlinks=True)
             if verbose >= 3:
-                print "Copied resources:", fromResourcesDir
-                print " to:", toResourcesDir
+                print("Copied resources:", fromResourcesDir)
+                print(" to:", toResourcesDir)
         fromContentsDir = framework.sourceVersionContentsDirectory
         if not os.path.exists(fromContentsDir):
             fromContentsDir = framework.sourceContentsDirectory
@@ -304,16 +304,16 @@ def copyFramework(framework, path, verbose):
             shutil.copytree(fromContentsDir, toContentsDir, symlinks=True)
             contentslinkfrom = os.path.join(path, framework.destinationContentsDirectory)
             if verbose >= 3:
-                print "Copied Contents:", fromContentsDir
-                print " to:", toContentsDir
+                print("Copied Contents:", fromContentsDir)
+                print(" to:", toContentsDir)
     elif framework.frameworkName.startswith("libQtGui"): # Copy qt_menu.nib (applies to non-framework layout)
         qtMenuNibSourcePath = os.path.join(framework.frameworkDirectory, "Resources", "qt_menu.nib")
         qtMenuNibDestinationPath = os.path.join(path, "Contents", "Resources", "qt_menu.nib")
         if os.path.exists(qtMenuNibSourcePath) and not os.path.exists(qtMenuNibDestinationPath):
             shutil.copytree(qtMenuNibSourcePath, qtMenuNibDestinationPath, symlinks=True)
             if verbose >= 3:
-                print "Copied for libQtGui:", qtMenuNibSourcePath
-                print " to:", qtMenuNibDestinationPath
+                print("Copied for libQtGui:", qtMenuNibSourcePath)
+                print(" to:", qtMenuNibDestinationPath)
     
     return toPath
 
@@ -326,7 +326,7 @@ def deployFrameworks(frameworks, bundlePath, binaryPath, strip, verbose, deploym
         deploymentInfo.deployedFrameworks.append(framework.frameworkName)
         
         if verbose >= 2:
-            print "Processing", framework.frameworkName, "..."
+            print("Processing", framework.frameworkName, "...")
         
         # Get the Qt path from one of the Qt frameworks
         if deploymentInfo.qtPath is None and framework.isQtFramework():
@@ -334,7 +334,7 @@ def deployFrameworks(frameworks, bundlePath, binaryPath, strip, verbose, deploym
         
         if framework.installName.startswith("@executable_path") or framework.installName.startswith(bundlePath):
             if verbose >= 2:
-                print framework.frameworkName, "already deployed, skipping."
+                print(framework.frameworkName, "already deployed, skipping.")
             continue
         
         # install_name_tool the new id into the binary
@@ -366,7 +366,7 @@ def deployFrameworks(frameworks, bundlePath, binaryPath, strip, verbose, deploym
 def deployFrameworksForAppBundle(applicationBundle, strip, verbose):
     frameworks = getFrameworks(applicationBundle.binaryPath, verbose)
     if len(frameworks) == 0 and verbose >= 1:
-        print "Warning: Could not find any external frameworks to deploy in %s." % (applicationBundle.path)
+        print("Warning: Could not find any external frameworks to deploy in %s." % (applicationBundle.path))
         return DeploymentInfo()
     else:
         return deployFrameworks(frameworks, applicationBundle.path, applicationBundle.binaryPath, strip, verbose)
@@ -444,7 +444,7 @@ def deployPlugins(appBundleInfo, deploymentInfo, strip, verbose):
     
     for pluginDirectory, pluginName in plugins:
         if verbose >= 2:
-            print "Processing plugin", os.path.join(pluginDirectory, pluginName), "..."
+            print("Processing plugin", os.path.join(pluginDirectory, pluginName), "...")
         
         sourcePath = os.path.join(deploymentInfo.pluginPath, pluginDirectory, pluginName)
         destinationDirectory = os.path.join(appBundleInfo.pluginPath, pluginDirectory)
@@ -454,8 +454,8 @@ def deployPlugins(appBundleInfo, deploymentInfo, strip, verbose):
         destinationPath = os.path.join(destinationDirectory, pluginName)
         shutil.copy2(sourcePath, destinationPath)
         if verbose >= 3:
-            print "Copied:", sourcePath
-            print " to:", destinationPath
+            print("Copied:", sourcePath)
+            print(" to:", destinationPath)
         
         if strip:
             runStrip(destinationPath, verbose)
@@ -525,7 +525,7 @@ if config.translations_dir and config.translations_dir[0]:
 
 for p in config.add_resources:
     if verbose >= 3:
-        print "Checking for \"%s\"..." % p
+        print("Checking for \"%s\"..." % p)
     if not os.path.exists(p):
         if verbose >= 1:
             sys.stderr.write("Error: Could not find additional resource file \"%s\"\n" % (p))
@@ -535,7 +535,7 @@ for p in config.add_resources:
 
 if len(config.fancy) == 1:
     if verbose >= 3:
-        print "Fancy: Importing plistlib..."
+        print("Fancy: Importing plistlib...")
     try:
         import plistlib
     except ImportError:
@@ -545,7 +545,7 @@ if len(config.fancy) == 1:
     
     p = config.fancy[0]
     if verbose >= 3:
-        print "Fancy: Loading \"%s\"..." % p
+        print("Fancy: Loading \"%s\"..." % p)
     if not os.path.exists(p):
         if verbose >= 1:
             sys.stderr.write("Error: Could not find fancy disk image plist at \"%s\"\n" % (p))
@@ -559,23 +559,23 @@ if len(config.fancy) == 1:
         sys.exit(1)
     
     try:
-        assert not fancy.has_key("window_bounds") or (isinstance(fancy["window_bounds"], list) and len(fancy["window_bounds"]) == 4)
-        assert not fancy.has_key("background_picture") or isinstance(fancy["background_picture"], str)
-        assert not fancy.has_key("icon_size") or isinstance(fancy["icon_size"], int)
-        assert not fancy.has_key("applications_symlink") or isinstance(fancy["applications_symlink"], bool)
-        if fancy.has_key("items_position"):
+        assert "window_bounds" not in fancy or (isinstance(fancy["window_bounds"], list) and len(fancy["window_bounds"]) == 4)
+        assert "background_picture" not in fancy or isinstance(fancy["background_picture"], str)
+        assert "icon_size" not in fancy or isinstance(fancy["icon_size"], int)
+        assert "applications_symlink" not in fancy or isinstance(fancy["applications_symlink"], bool)
+        if "items_position" in fancy:
             assert isinstance(fancy["items_position"], dict)
-            for key, value in fancy["items_position"].iteritems():
+            for key, value in fancy["items_position"].items():
                 assert isinstance(value, list) and len(value) == 2 and isinstance(value[0], int) and isinstance(value[1], int)
     except:
         if verbose >= 1:
             sys.stderr.write("Error: Bad format of fancy disk image plist at \"%s\"\n" % (p))
         sys.exit(1)
     
-    if fancy.has_key("background_picture"):
+    if "background_picture" in fancy:
         bp = fancy["background_picture"]
         if verbose >= 3:
-            print "Fancy: Resolving background picture \"%s\"..." % bp
+            print("Fancy: Resolving background picture \"%s\"..." % bp)
         if not os.path.exists(bp):
             bp = os.path.join(os.path.dirname(p), bp)
             if not os.path.exists(bp):
@@ -591,7 +591,7 @@ else:
 
 if os.path.exists("dist"):
     if verbose >= 2:
-        print "+ Removing old dist folder +"
+        print("+ Removing old dist folder +")
     
     shutil.rmtree("dist")
 
@@ -607,9 +607,9 @@ else:
 target = os.path.join("dist", "Bitcoin-Qt.app")
 
 if verbose >= 2:
-    print "+ Copying source bundle +"
+    print("+ Copying source bundle +")
 if verbose >= 3:
-    print app_bundle, "->", target
+    print(app_bundle, "->", target)
 
 os.mkdir("dist")
 shutil.copytree(app_bundle, target, symlinks=True)
@@ -619,7 +619,7 @@ applicationBundle = ApplicationBundleInfo(target)
 # ------------------------------------------------
 
 if verbose >= 2:
-    print "+ Deploying frameworks +"
+    print("+ Deploying frameworks +")
 
 try:
     deploymentInfo = deployFrameworksForAppBundle(applicationBundle, config.strip, verbose)
@@ -638,7 +638,7 @@ except RuntimeError as e:
 
 if config.plugins:
     if verbose >= 2:
-        print "+ Deploying plugins +"
+        print("+ Deploying plugins +")
     
     try:
         deployPlugins(applicationBundle, deploymentInfo, config.strip, verbose)
@@ -664,7 +664,7 @@ else:
     for lng_file in add_qt_tr:
         p = os.path.join(qt_tr_dir, lng_file)
         if verbose >= 3:
-            print "Checking for \"%s\"..." % p
+            print("Checking for \"%s\"..." % p)
         if not os.path.exists(p):
             if verbose >= 1:
                 sys.stderr.write("Error: Could not find Qt translation file \"%s\"\n" % (lng_file))
@@ -673,7 +673,7 @@ else:
 # ------------------------------------------------
 
 if verbose >= 2:
-    print "+ Installing qt.conf +"
+    print("+ Installing qt.conf +")
 
 f = open(os.path.join(applicationBundle.resourcesPath, "qt.conf"), "wb")
 f.write(qt_conf)
@@ -682,22 +682,22 @@ f.close()
 # ------------------------------------------------
 
 if len(add_qt_tr) > 0 and verbose >= 2:
-    print "+ Adding Qt translations +"
+    print("+ Adding Qt translations +")
 
 for lng_file in add_qt_tr:
     if verbose >= 3:
-        print os.path.join(qt_tr_dir, lng_file), "->", os.path.join(applicationBundle.resourcesPath, lng_file)
+        print(os.path.join(qt_tr_dir, lng_file), "->", os.path.join(applicationBundle.resourcesPath, lng_file))
     shutil.copy2(os.path.join(qt_tr_dir, lng_file), os.path.join(applicationBundle.resourcesPath, lng_file))
 
 # ------------------------------------------------
 
 if len(config.add_resources) > 0 and verbose >= 2:
-    print "+ Adding additional resources +"
+    print("+ Adding additional resources +")
 
 for p in config.add_resources:
     t = os.path.join(applicationBundle.resourcesPath, os.path.basename(p))
     if verbose >= 3:
-        print p, "->", t
+        print(p, "->", t)
     if os.path.isdir(p):
         shutil.copytree(p, t, symlinks=True)
     else:
@@ -706,10 +706,10 @@ for p in config.add_resources:
 # ------------------------------------------------
 
 if config.sign and 'CODESIGNARGS' not in os.environ:
-    print "You must set the CODESIGNARGS environment variable. Skipping signing."
+    print("You must set the CODESIGNARGS environment variable. Skipping signing.")
 elif config.sign:
     if verbose >= 1:
-        print "Code-signing app bundle %s"%(target,)
+        print("Code-signing app bundle %s"%(target,))
     subprocess.check_call("codesign --force %s %s"%(os.environ['CODESIGNARGS'], target), shell=True)
 
 # ------------------------------------------------
@@ -734,7 +734,7 @@ if config.dmg is not None:
 
     def runHDIUtil(verb, image_basename, **kwargs):
         hdiutil_args = ["hdiutil", verb, image_basename + ".dmg"]
-        if kwargs.has_key("capture_stdout"):
+        if "capture_stdout" in kwargs:
             del kwargs["capture_stdout"]
             run = subprocess.check_output
         else:
@@ -744,7 +744,7 @@ if config.dmg is not None:
                 hdiutil_args.append("-verbose")
             run = subprocess.check_call
         
-        for key, value in kwargs.iteritems():
+        for key, value in kwargs.items():
             hdiutil_args.append("-" + key)
             if not value is True:
                 hdiutil_args.append(str(value))
@@ -753,9 +753,9 @@ if config.dmg is not None:
     
     if verbose >= 2:
         if fancy is None:
-            print "+ Creating .dmg disk image +"
+            print("+ Creating .dmg disk image +")
         else:
-            print "+ Preparing .dmg disk image +"
+            print("+ Preparing .dmg disk image +")
     
     if config.dmg != "":
         dmg_name = config.dmg
@@ -770,7 +770,7 @@ if config.dmg is not None:
             sys.exit(e.returncode)
     else:
         if verbose >= 3:
-            print "Determining size of \"dist\"..."
+            print("Determining size of \"dist\"...")
         size = 0
         for path, dirs, files in os.walk("dist"):
             for file in files:
@@ -778,14 +778,14 @@ if config.dmg is not None:
         size += int(size * 0.15)
         
         if verbose >= 3:
-            print "Creating temp image for modification..."
+            print("Creating temp image for modification...")
         try:
             runHDIUtil("create", dmg_name + ".temp", srcfolder="dist", format="UDRW", size=size, volname=volname, ov=True)
         except subprocess.CalledProcessError as e:
             sys.exit(e.returncode)
         
         if verbose >= 3:
-            print "Attaching temp image..."
+            print("Attaching temp image...")
         try:
             output = runHDIUtil("attach", dmg_name + ".temp", readwrite=True, noverify=True, noautoopen=True, capture_stdout=True)
         except subprocess.CalledProcessError as e:
@@ -796,13 +796,13 @@ if config.dmg is not None:
         disk_name = m.group(1)
         
         if verbose >= 2:
-            print "+ Applying fancy settings +"
+            print("+ Applying fancy settings +")
         
-        if fancy.has_key("background_picture"):
+        if "background_picture" in fancy:
             bg_path = os.path.join(disk_root, ".background", os.path.basename(fancy["background_picture"]))
             os.mkdir(os.path.dirname(bg_path))
             if verbose >= 3:
-                print fancy["background_picture"], "->", bg_path
+                print(fancy["background_picture"], "->", bg_path)
             shutil.copy2(fancy["background_picture"], bg_path)
         else:
             bg_path = None
@@ -839,8 +839,8 @@ if config.dmg is not None:
 
         itemscript = Template('set position of item "${item}" of container window to {${position}}')
         items_positions = []
-        if fancy.has_key("items_position"):
-            for name, position in fancy["items_position"].iteritems():
+        if "items_position" in fancy:
+            for name, position in fancy["items_position"].items():
                 params = { "item" : name, "position" : ",".join([str(p) for p in position]) }
                 items_positions.append(itemscript.substitute(params))
 
@@ -851,9 +851,9 @@ if config.dmg is not None:
             "background_commands" : "",
             "items_positions" : "\n                   ".join(items_positions)
             }
-        if fancy.has_key("window_bounds"):
+        if "window_bounds" in fancy:
             params["window.bounds"] = ",".join([str(p) for p in fancy["window_bounds"]])
-        if fancy.has_key("icon_size"):
+        if "icon_size" in fancy:
             params["icon_size"] = str(fancy["icon_size"])
         if bg_path is not None:
             # Set background file, then call SetFile to make it invisible.
@@ -873,7 +873,7 @@ if config.dmg is not None:
             print("Error running osascript.")
 
         if verbose >= 2:
-            print "+ Finalizing .dmg disk image +"
+            print("+ Finalizing .dmg disk image +")
             time.sleep(5)
         
         try:
@@ -886,6 +886,6 @@ if config.dmg is not None:
 # ------------------------------------------------
 
 if verbose >= 2:
-    print "+ Done +"
+    print("+ Done +")
 
 sys.exit(0)
diff --git a/share/qt/extract_strings_qt.py b/share/qt/extract_strings_qt.py
index 2a6e4b930cb20..7728a4377590b 100755
--- a/share/qt/extract_strings_qt.py
+++ b/share/qt/extract_strings_qt.py
@@ -1,8 +1,9 @@
 #!/usr/bin/python
 '''
-Extract _("...") strings for translation and convert to Qt4 stringdefs so that
+Extract _("...") strings for translation and convert to Qt stringdefs so that
 they can be picked up by Qt linguist.
 '''
+from __future__ import division,print_function,unicode_literals
 from subprocess import Popen, PIPE
 import glob
 import operator
@@ -52,10 +53,14 @@ def parse_po(text):
 
 # xgettext -n --keyword=_ $FILES
 XGETTEXT=os.getenv('XGETTEXT', 'xgettext')
+if not XGETTEXT:
+    print('Cannot extract strings: xgettext utility is not installed or not configured.',file=sys.stderr)
+    print('Please install package "gettext" and re-run \'./configure\'.',file=sys.stderr)
+    exit(1)
 child = Popen([XGETTEXT,'--output=-','-n','--keyword=_'] + files, stdout=PIPE)
 (out, err) = child.communicate()
 
-messages = parse_po(out) 
+messages = parse_po(out.decode('utf-8'))
 
 f = open(OUT_CPP, 'w')
 f.write("""
diff --git a/src/Makefile.qt.include b/src/Makefile.qt.include
index ca4e1e70d085e..357e4c47ff360 100644
--- a/src/Makefile.qt.include
+++ b/src/Makefile.qt.include
@@ -391,7 +391,7 @@ SECONDARY: $(QT_QM)
 
 qt/bitcoinstrings.cpp: $(libbitcoin_server_a_SOURCES) $(libbitcoin_wallet_a_SOURCES)
 	@test -n $(XGETTEXT) || echo "xgettext is required for updating translations"
-	$(AM_V_GEN) cd $(srcdir); XGETTEXT=$(XGETTEXT) PACKAGE_NAME="$(PACKAGE_NAME)" COPYRIGHT_HOLDERS="$(COPYRIGHT_HOLDERS)" COPYRIGHT_HOLDERS_SUBSTITUTION="$(COPYRIGHT_HOLDERS_SUBSTITUTION)" ../share/qt/extract_strings_qt.py $^
+	$(AM_V_GEN) cd $(srcdir); XGETTEXT=$(XGETTEXT) PACKAGE_NAME="$(PACKAGE_NAME)" COPYRIGHT_HOLDERS="$(COPYRIGHT_HOLDERS)" COPYRIGHT_HOLDERS_SUBSTITUTION="$(COPYRIGHT_HOLDERS_SUBSTITUTION)" $(PYTHON) ../share/qt/extract_strings_qt.py $^
 
 translate: qt/bitcoinstrings.cpp $(QT_FORMS_UI) $(QT_FORMS_UI) $(BITCOIN_QT_CPP) $(BITCOIN_QT_H) $(BITCOIN_MM)
 	@test -n $(LUPDATE) || echo "lupdate is required for updating translations"
diff --git a/src/Makefile.test.include b/src/Makefile.test.include
index 57f9ac50e0a01..86b27ae687d33 100644
--- a/src/Makefile.test.include
+++ b/src/Makefile.test.include
@@ -129,7 +129,7 @@ bitcoin_test_clean : FORCE
 
 check-local:
 	@echo "Running test/bitcoin-util-test.py..."
-	$(AM_V_at)srcdir=$(srcdir) PYTHONPATH=$(builddir)/test $(srcdir)/test/bitcoin-util-test.py
+	$(AM_V_at)srcdir=$(srcdir) PYTHONPATH=$(builddir)/test $(PYTHON) $(srcdir)/test/bitcoin-util-test.py
 	$(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C secp256k1 check
 if EMBEDDED_UNIVALUE
 	$(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C univalue check
diff --git a/src/test/bctest.py b/src/test/bctest.py
index 3a8d0ea51bf1b..8105b87ffa34c 100644
--- a/src/test/bctest.py
+++ b/src/test/bctest.py
@@ -1,7 +1,7 @@
 # Copyright 2014 BitPay, Inc.
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
-
+from __future__ import division,print_function,unicode_literals
 import subprocess
 import os
 import json
diff --git a/src/test/bitcoin-util-test.py b/src/test/bitcoin-util-test.py
index 20afb16a9ebe2..95dd3e81b4369 100755
--- a/src/test/bitcoin-util-test.py
+++ b/src/test/bitcoin-util-test.py
@@ -2,7 +2,7 @@
 # Copyright 2014 BitPay, Inc.
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
-
+from __future__ import division,print_function,unicode_literals
 import os
 import bctest
 import buildenv

From 3e55b3a00450279522900ca96e5cf79162169019 Mon Sep 17 00:00:00 2001
From: accraze <accraze@gmail.com>
Date: Wed, 30 Mar 2016 07:29:56 -0700
Subject: [PATCH 0066/1802] [doc] added depends cross compile info

---
 doc/build-unix.md | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/doc/build-unix.md b/doc/build-unix.md
index 5b519b80442d0..c1e92d8d15f65 100644
--- a/doc/build-unix.md
+++ b/doc/build-unix.md
@@ -248,3 +248,26 @@ Additional Configure Flags
 A list of additional configure flags can be displayed with:
 
     ./configure --help
+
+
+
+ARM Cross-compilation
+-------------------
+These steps can be performed on, for example, an Ubuntu VM. The depends system
+will also work on other Linux distributions, however the commands for
+installing the toolchain will be different.
+
+First install the toolchain:
+
+    sudo apt-get install g++-arm-linux-gnueabihf
+
+To build executables for ARM:
+
+    cd depends
+    make HOST=arm-linux-gnueabihf NO_QT=1
+    cd ..
+    ./configure --prefix=$PWD/depends/arm-linux-gnueabihf --enable-glibc-back-compat --enable-reduce-exports LDFLAGS=-static-libstdc++
+    make
+
+
+For further documentation on the depends system see [README.md](../depends/README.md) in the depends directory.
\ No newline at end of file

From ae2156f1235eb3c5ba294544ab04b5dd7509c7ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pavel=20Jan=C3=ADk?= <Pavel@Janik.cz>
Date: Wed, 30 Mar 2016 20:26:10 +0200
Subject: [PATCH 0067/1802] Clear the input line after activating autocomplete

---
 src/qt/rpcconsole.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/qt/rpcconsole.cpp b/src/qt/rpcconsole.cpp
index 42112c42f11ee..d8647d902a0e7 100644
--- a/src/qt/rpcconsole.cpp
+++ b/src/qt/rpcconsole.cpp
@@ -459,6 +459,8 @@ void RPCConsole::setClientModel(ClientModel *model)
         autoCompleter = new QCompleter(wordList, this);
         ui->lineEdit->setCompleter(autoCompleter);
 
+	// clear the lineEdit after activating from QCompleter
+	connect(autoCompleter, SIGNAL(activated(const QString&)), ui->lineEdit, SLOT(clear()), Qt::QueuedConnection);
     }
 }
 

From 40234ba89f00afe96daf807acf61e6a23f8a81fa Mon Sep 17 00:00:00 2001
From: BtcDrak <btcdrak@gmail.com>
Date: Wed, 30 Mar 2016 19:38:02 +0100
Subject: [PATCH 0068/1802] Fix comments in tests

---
 qa/rpc-tests/bip68-112-113-p2p.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/qa/rpc-tests/bip68-112-113-p2p.py b/qa/rpc-tests/bip68-112-113-p2p.py
index c226f4dad4976..7d3c59be3ee8f 100755
--- a/qa/rpc-tests/bip68-112-113-p2p.py
+++ b/qa/rpc-tests/bip68-112-113-p2p.py
@@ -383,9 +383,9 @@ def get_tests(self):
         for bip113tx in [bip113signed1, bip113signed2]:
             yield TestInstance([[self.create_test_block([bip113tx]), False]]) # 9,10
         # BIP 113 tests should now pass if the locktime is < MTP
-        bip113tx_v1.nLockTime = self.last_block_time - 600 * 5 - 1 # = MTP of prior block (not <) but < time put on current block
+        bip113tx_v1.nLockTime = self.last_block_time - 600 * 5 - 1 # < MTP of prior block
         bip113signed1 = self.sign_transaction(self.nodes[0], bip113tx_v1)
-        bip113tx_v2.nLockTime = self.last_block_time - 600 * 5 - 1 # = MTP of prior block (not <) but < time put on current block
+        bip113tx_v2.nLockTime = self.last_block_time - 600 * 5 - 1 # < MTP of prior block
         bip113signed2 = self.sign_transaction(self.nodes[0], bip113tx_v2)
         for bip113tx in [bip113signed1, bip113signed2]:
             yield TestInstance([[self.create_test_block([bip113tx]), True]]) # 11,12
@@ -490,7 +490,7 @@ def get_tests(self):
         self.nodes[0].invalidateblock(self.nodes[0].getbestblockhash())
 
         ## SEQUENCE_LOCKTIME_DISABLE_FLAG is unset in argument to OP_CSV for all remaining txs ##
-        # All txs with nSequence 11 should fail either due to earlier mismatch or failing the CSV check
+        # All txs with nSequence 9 should fail either due to earlier mismatch or failing the CSV check
         fail_txs = []
         fail_txs.extend(all_rlt_txs(bip112txs_vary_nSequence_9_v2)) # 16/16 of vary_nSequence_9
         for b25 in xrange(2):

From fb8a8cf2e610920e9eee61c19ed6080af064bb43 Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Tue, 29 Mar 2016 19:43:02 +0200
Subject: [PATCH 0069/1802] rpc: Register calls where they are defined

Split out methods to every module, apart from 'help' and 'stop' which
are implemented in rpcserver.cpp itself.

- This makes it easier to add or remove RPC commands - no longer everything that includes
    rpcserver.h has to be rebuilt when there's a change there.
- Cleans up `rpc/server.h` by getting rid of the huge cluttered list of function definitions.
- Removes most of the bitcoin-specific code from rpcserver.cpp and .h.

Continues #7307 for the non-wallet.
---
 src/Makefile.am            |  1 +
 src/init.cpp               |  4 ++-
 src/rest.cpp               |  3 ++
 src/rpc/blockchain.cpp     | 28 +++++++++++++++++
 src/rpc/mining.cpp         | 24 ++++++++++++++
 src/rpc/misc.cpp           | 18 +++++++++++
 src/rpc/net.cpp            | 22 +++++++++++++
 src/rpc/rawtransaction.cpp | 20 ++++++++++++
 src/rpc/register.h         | 32 +++++++++++++++++++
 src/rpc/server.cpp         | 64 --------------------------------------
 src/rpc/server.h           | 59 -----------------------------------
 src/test/rpc_tests.cpp     |  2 +-
 src/test/test_bitcoin.cpp  |  7 ++++-
 src/wallet/rpcwallet.cpp   | 14 +++------
 src/wallet/rpcwallet.h     |  4 ++-
 15 files changed, 165 insertions(+), 137 deletions(-)
 create mode 100644 src/rpc/register.h

diff --git a/src/Makefile.am b/src/Makefile.am
index 6ad7aabae0ef6..1e54512cbddc1 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -130,6 +130,7 @@ BITCOIN_CORE_H = \
   rpc/client.h \
   rpc/protocol.h \
   rpc/server.h \
+  rpc/register.h \
   scheduler.h \
   script/sigcache.h \
   script/sign.h \
diff --git a/src/init.cpp b/src/init.cpp
index 38ac91b2af8b4..0c371b288a5a3 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -24,6 +24,7 @@
 #include "net.h"
 #include "policy/policy.h"
 #include "rpc/server.h"
+#include "rpc/register.h"
 #include "script/standard.h"
 #include "script/sigcache.h"
 #include "scheduler.h"
@@ -913,10 +914,11 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
         fPruneMode = true;
     }
 
+    RegisterAllCoreRPCCommands(tableRPC);
 #ifdef ENABLE_WALLET
     bool fDisableWallet = GetBoolArg("-disablewallet", false);
     if (!fDisableWallet)
-        walletRegisterRPCCommands();
+        RegisterWalletRPCCommands(tableRPC);
 #endif
 
     nConnectTimeout = GetArg("-timeout", DEFAULT_CONNECT_TIMEOUT);
diff --git a/src/rest.cpp b/src/rest.cpp
index ebdccc94021b7..2dff8d7daddfc 100644
--- a/src/rest.cpp
+++ b/src/rest.cpp
@@ -273,6 +273,9 @@ static bool rest_block_notxdetails(HTTPRequest* req, const std::string& strURIPa
     return rest_block(req, strURIPart, false);
 }
 
+// A bit of a hack - dependency on a function defined in rpc/blockchain.cpp
+UniValue getblockchaininfo(const UniValue& params, bool fHelp);
+
 static bool rest_chaininfo(HTTPRequest* req, const std::string& strURIPart)
 {
     if (!CheckWarmup(req))
diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp
index a110dff0d1d4a..b947609b1a1b7 100644
--- a/src/rpc/blockchain.cpp
+++ b/src/rpc/blockchain.cpp
@@ -911,3 +911,31 @@ UniValue reconsiderblock(const UniValue& params, bool fHelp)
 
     return NullUniValue;
 }
+
+static const CRPCCommand commands[] =
+{ //  category              name                      actor (function)         okSafeMode
+  //  --------------------- ------------------------  -----------------------  ----------
+    { "blockchain",         "getblockchaininfo",      &getblockchaininfo,      true  },
+    { "blockchain",         "getbestblockhash",       &getbestblockhash,       true  },
+    { "blockchain",         "getblockcount",          &getblockcount,          true  },
+    { "blockchain",         "getblock",               &getblock,               true  },
+    { "blockchain",         "getblockhash",           &getblockhash,           true  },
+    { "blockchain",         "getblockheader",         &getblockheader,         true  },
+    { "blockchain",         "getchaintips",           &getchaintips,           true  },
+    { "blockchain",         "getdifficulty",          &getdifficulty,          true  },
+    { "blockchain",         "getmempoolinfo",         &getmempoolinfo,         true  },
+    { "blockchain",         "getrawmempool",          &getrawmempool,          true  },
+    { "blockchain",         "gettxout",               &gettxout,               true  },
+    { "blockchain",         "gettxoutsetinfo",        &gettxoutsetinfo,        true  },
+    { "blockchain",         "verifychain",            &verifychain,            true  },
+
+    /* Not shown in help */
+    { "hidden",             "invalidateblock",        &invalidateblock,        true  },
+    { "hidden",             "reconsiderblock",        &reconsiderblock,        true  },
+};
+
+void RegisterBlockchainRPCCommands(CRPCTable &tableRPC)
+{
+    for (unsigned int vcidx = 0; vcidx < ARRAYLEN(commands); vcidx++)
+        tableRPC.appendCommand(commands[vcidx].name, &commands[vcidx]);
+}
diff --git a/src/rpc/mining.cpp b/src/rpc/mining.cpp
index a2abbb323d5ce..b63ee2288918b 100644
--- a/src/rpc/mining.cpp
+++ b/src/rpc/mining.cpp
@@ -781,3 +781,27 @@ UniValue estimatesmartpriority(const UniValue& params, bool fHelp)
     result.push_back(Pair("blocks", answerFound));
     return result;
 }
+
+static const CRPCCommand commands[] =
+{ //  category              name                      actor (function)         okSafeMode
+  //  --------------------- ------------------------  -----------------------  ----------
+    { "mining",             "getnetworkhashps",       &getnetworkhashps,       true  },
+    { "mining",             "getmininginfo",          &getmininginfo,          true  },
+    { "mining",             "prioritisetransaction",  &prioritisetransaction,  true  },
+    { "mining",             "getblocktemplate",       &getblocktemplate,       true  },
+    { "mining",             "submitblock",            &submitblock,            true  },
+
+    { "generating",         "generate",               &generate,               true  },
+    { "generating",         "generatetoaddress",      &generatetoaddress,      true  },
+
+    { "util",               "estimatefee",            &estimatefee,            true  },
+    { "util",               "estimatepriority",       &estimatepriority,       true  },
+    { "util",               "estimatesmartfee",       &estimatesmartfee,       true  },
+    { "util",               "estimatesmartpriority",  &estimatesmartpriority,  true  },
+};
+
+void RegisterMiningRPCCommands(CRPCTable &tableRPC)
+{
+    for (unsigned int vcidx = 0; vcidx < ARRAYLEN(commands); vcidx++)
+        tableRPC.appendCommand(commands[vcidx].name, &commands[vcidx]);
+}
diff --git a/src/rpc/misc.cpp b/src/rpc/misc.cpp
index 0aab9c30434f8..e8a099b4452c4 100644
--- a/src/rpc/misc.cpp
+++ b/src/rpc/misc.cpp
@@ -396,3 +396,21 @@ UniValue setmocktime(const UniValue& params, bool fHelp)
 
     return NullUniValue;
 }
+
+static const CRPCCommand commands[] =
+{ //  category              name                      actor (function)         okSafeMode
+  //  --------------------- ------------------------  -----------------------  ----------
+    { "control",            "getinfo",                &getinfo,                true  }, /* uses wallet if enabled */
+    { "util",               "validateaddress",        &validateaddress,        true  }, /* uses wallet if enabled */
+    { "util",               "createmultisig",         &createmultisig,         true  },
+    { "util",               "verifymessage",          &verifymessage,          true  },
+
+    /* Not shown in help */
+    { "hidden",             "setmocktime",            &setmocktime,            true  },
+};
+
+void RegisterMiscRPCCommands(CRPCTable &tableRPC)
+{
+    for (unsigned int vcidx = 0; vcidx < ARRAYLEN(commands); vcidx++)
+        tableRPC.appendCommand(commands[vcidx].name, &commands[vcidx]);
+}
diff --git a/src/rpc/net.cpp b/src/rpc/net.cpp
index 065214a98addd..017cd6ca32187 100644
--- a/src/rpc/net.cpp
+++ b/src/rpc/net.cpp
@@ -626,3 +626,25 @@ UniValue clearbanned(const UniValue& params, bool fHelp)
 
     return NullUniValue;
 }
+
+static const CRPCCommand commands[] =
+{ //  category              name                      actor (function)         okSafeMode
+  //  --------------------- ------------------------  -----------------------  ----------
+    { "network",            "getconnectioncount",     &getconnectioncount,     true  },
+    { "network",            "ping",                   &ping,                   true  },
+    { "network",            "getpeerinfo",            &getpeerinfo,            true  },
+    { "network",            "addnode",                &addnode,                true  },
+    { "network",            "disconnectnode",         &disconnectnode,         true  },
+    { "network",            "getaddednodeinfo",       &getaddednodeinfo,       true  },
+    { "network",            "getnettotals",           &getnettotals,           true  },
+    { "network",            "getnetworkinfo",         &getnetworkinfo,         true  },
+    { "network",            "setban",                 &setban,                 true  },
+    { "network",            "listbanned",             &listbanned,             true  },
+    { "network",            "clearbanned",            &clearbanned,            true  },
+};
+
+void RegisterNetRPCCommands(CRPCTable &tableRPC)
+{
+    for (unsigned int vcidx = 0; vcidx < ARRAYLEN(commands); vcidx++)
+        tableRPC.appendCommand(commands[vcidx].name, &commands[vcidx]);
+}
diff --git a/src/rpc/rawtransaction.cpp b/src/rpc/rawtransaction.cpp
index 34dd3b30f50ff..de8cd68f66267 100644
--- a/src/rpc/rawtransaction.cpp
+++ b/src/rpc/rawtransaction.cpp
@@ -841,3 +841,23 @@ UniValue sendrawtransaction(const UniValue& params, bool fHelp)
 
     return hashTx.GetHex();
 }
+
+static const CRPCCommand commands[] =
+{ //  category              name                      actor (function)         okSafeMode
+  //  --------------------- ------------------------  -----------------------  ----------
+    { "rawtransactions",    "getrawtransaction",      &getrawtransaction,      true  },
+    { "rawtransactions",    "createrawtransaction",   &createrawtransaction,   true  },
+    { "rawtransactions",    "decoderawtransaction",   &decoderawtransaction,   true  },
+    { "rawtransactions",    "decodescript",           &decodescript,           true  },
+    { "rawtransactions",    "sendrawtransaction",     &sendrawtransaction,     false },
+    { "rawtransactions",    "signrawtransaction",     &signrawtransaction,     false }, /* uses wallet if enabled */
+
+    { "blockchain",         "gettxoutproof",          &gettxoutproof,          true  },
+    { "blockchain",         "verifytxoutproof",       &verifytxoutproof,       true  },
+};
+
+void RegisterRawTransactionRPCCommands(CRPCTable &tableRPC)
+{
+    for (unsigned int vcidx = 0; vcidx < ARRAYLEN(commands); vcidx++)
+        tableRPC.appendCommand(commands[vcidx].name, &commands[vcidx]);
+}
diff --git a/src/rpc/register.h b/src/rpc/register.h
new file mode 100644
index 0000000000000..01aa58a25d850
--- /dev/null
+++ b/src/rpc/register.h
@@ -0,0 +1,32 @@
+// Copyright (c) 2009-2016 The Bitcoin Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#ifndef BITCOIN_RPCREGISTER_H
+#define BITCOIN_RPCREGISTER_H
+
+/** These are in one header file to avoid creating tons of single-function
+ * headers for everything under src/rpc/ */
+class CRPCTable;
+
+/** Register block chain RPC commands */
+void RegisterBlockchainRPCCommands(CRPCTable &tableRPC);
+/** Register P2P networking RPC commands */
+void RegisterNetRPCCommands(CRPCTable &tableRPC);
+/** Register miscellaneous RPC commands */
+void RegisterMiscRPCCommands(CRPCTable &tableRPC);
+/** Register mining RPC commands */
+void RegisterMiningRPCCommands(CRPCTable &tableRPC);
+/** Register raw transaction RPC commands */
+void RegisterRawTransactionRPCCommands(CRPCTable &tableRPC);
+
+static inline void RegisterAllCoreRPCCommands(CRPCTable &tableRPC)
+{
+    RegisterBlockchainRPCCommands(tableRPC);
+    RegisterNetRPCCommands(tableRPC);
+    RegisterMiscRPCCommands(tableRPC);
+    RegisterMiningRPCCommands(tableRPC);
+    RegisterRawTransactionRPCCommands(tableRPC);
+}
+
+#endif
diff --git a/src/rpc/server.cpp b/src/rpc/server.cpp
index 1303a3bb1331f..8326fe14d2150 100644
--- a/src/rpc/server.cpp
+++ b/src/rpc/server.cpp
@@ -256,72 +256,8 @@ static const CRPCCommand vRPCCommands[] =
 { //  category              name                      actor (function)         okSafeMode
   //  --------------------- ------------------------  -----------------------  ----------
     /* Overall control/query calls */
-    { "control",            "getinfo",                &getinfo,                true  }, /* uses wallet if enabled */
     { "control",            "help",                   &help,                   true  },
     { "control",            "stop",                   &stop,                   true  },
-
-    /* P2P networking */
-    { "network",            "getnetworkinfo",         &getnetworkinfo,         true  },
-    { "network",            "addnode",                &addnode,                true  },
-    { "network",            "disconnectnode",         &disconnectnode,         true  },
-    { "network",            "getaddednodeinfo",       &getaddednodeinfo,       true  },
-    { "network",            "getconnectioncount",     &getconnectioncount,     true  },
-    { "network",            "getnettotals",           &getnettotals,           true  },
-    { "network",            "getpeerinfo",            &getpeerinfo,            true  },
-    { "network",            "ping",                   &ping,                   true  },
-    { "network",            "setban",                 &setban,                 true  },
-    { "network",            "listbanned",             &listbanned,             true  },
-    { "network",            "clearbanned",            &clearbanned,            true  },
-
-    /* Block chain and UTXO */
-    { "blockchain",         "getblockchaininfo",      &getblockchaininfo,      true  },
-    { "blockchain",         "getbestblockhash",       &getbestblockhash,       true  },
-    { "blockchain",         "getblockcount",          &getblockcount,          true  },
-    { "blockchain",         "getblock",               &getblock,               true  },
-    { "blockchain",         "getblockhash",           &getblockhash,           true  },
-    { "blockchain",         "getblockheader",         &getblockheader,         true  },
-    { "blockchain",         "getchaintips",           &getchaintips,           true  },
-    { "blockchain",         "getdifficulty",          &getdifficulty,          true  },
-    { "blockchain",         "getmempoolinfo",         &getmempoolinfo,         true  },
-    { "blockchain",         "getrawmempool",          &getrawmempool,          true  },
-    { "blockchain",         "gettxout",               &gettxout,               true  },
-    { "blockchain",         "gettxoutproof",          &gettxoutproof,          true  },
-    { "blockchain",         "verifytxoutproof",       &verifytxoutproof,       true  },
-    { "blockchain",         "gettxoutsetinfo",        &gettxoutsetinfo,        true  },
-    { "blockchain",         "verifychain",            &verifychain,            true  },
-
-    /* Mining */
-    { "mining",             "getblocktemplate",       &getblocktemplate,       true  },
-    { "mining",             "getmininginfo",          &getmininginfo,          true  },
-    { "mining",             "getnetworkhashps",       &getnetworkhashps,       true  },
-    { "mining",             "prioritisetransaction",  &prioritisetransaction,  true  },
-    { "mining",             "submitblock",            &submitblock,            true  },
-
-    /* Coin generation */
-    { "generating",         "generate",               &generate,               true  },
-    { "generating",         "generatetoaddress",      &generatetoaddress,      true  },
-
-    /* Raw transactions */
-    { "rawtransactions",    "createrawtransaction",   &createrawtransaction,   true  },
-    { "rawtransactions",    "decoderawtransaction",   &decoderawtransaction,   true  },
-    { "rawtransactions",    "decodescript",           &decodescript,           true  },
-    { "rawtransactions",    "getrawtransaction",      &getrawtransaction,      true  },
-    { "rawtransactions",    "sendrawtransaction",     &sendrawtransaction,     false },
-    { "rawtransactions",    "signrawtransaction",     &signrawtransaction,     false }, /* uses wallet if enabled */
-
-    /* Utility functions */
-    { "util",               "createmultisig",         &createmultisig,         true  },
-    { "util",               "validateaddress",        &validateaddress,        true  }, /* uses wallet if enabled */
-    { "util",               "verifymessage",          &verifymessage,          true  },
-    { "util",               "estimatefee",            &estimatefee,            true  },
-    { "util",               "estimatepriority",       &estimatepriority,       true  },
-    { "util",               "estimatesmartfee",       &estimatesmartfee,       true  },
-    { "util",               "estimatesmartpriority",  &estimatesmartpriority,  true  },
-
-    /* Not shown in help */
-    { "hidden",             "invalidateblock",        &invalidateblock,        true  },
-    { "hidden",             "reconsiderblock",        &reconsiderblock,        true  },
-    { "hidden",             "setmocktime",            &setmocktime,            true  },
 };
 
 CRPCTable::CRPCTable()
diff --git a/src/rpc/server.h b/src/rpc/server.h
index 35e114feef3ff..a7ed710ce60ad 100644
--- a/src/rpc/server.h
+++ b/src/rpc/server.h
@@ -181,65 +181,6 @@ extern std::string HelpExampleRpc(const std::string& methodname, const std::stri
 
 extern void EnsureWalletIsUnlocked();
 
-extern UniValue getconnectioncount(const UniValue& params, bool fHelp); // in rpc/net.cpp
-extern UniValue getpeerinfo(const UniValue& params, bool fHelp);
-extern UniValue ping(const UniValue& params, bool fHelp);
-extern UniValue addnode(const UniValue& params, bool fHelp);
-extern UniValue disconnectnode(const UniValue& params, bool fHelp);
-extern UniValue getaddednodeinfo(const UniValue& params, bool fHelp);
-extern UniValue getnettotals(const UniValue& params, bool fHelp);
-extern UniValue setban(const UniValue& params, bool fHelp);
-extern UniValue listbanned(const UniValue& params, bool fHelp);
-extern UniValue clearbanned(const UniValue& params, bool fHelp);
-
-extern UniValue generate(const UniValue& params, bool fHelp);
-extern UniValue generatetoaddress(const UniValue& params, bool fHelp);
-extern UniValue getnetworkhashps(const UniValue& params, bool fHelp);
-extern UniValue getmininginfo(const UniValue& params, bool fHelp);
-extern UniValue prioritisetransaction(const UniValue& params, bool fHelp);
-extern UniValue getblocktemplate(const UniValue& params, bool fHelp);
-extern UniValue submitblock(const UniValue& params, bool fHelp);
-extern UniValue estimatefee(const UniValue& params, bool fHelp);
-extern UniValue estimatepriority(const UniValue& params, bool fHelp);
-extern UniValue estimatesmartfee(const UniValue& params, bool fHelp);
-extern UniValue estimatesmartpriority(const UniValue& params, bool fHelp);
-
-extern UniValue verifymessage(const UniValue& params, bool fHelp);
-extern UniValue createmultisig(const UniValue& params, bool fHelp);
-extern UniValue validateaddress(const UniValue& params, bool fHelp);
-extern UniValue getinfo(const UniValue& params, bool fHelp);
-extern UniValue getblockchaininfo(const UniValue& params, bool fHelp);
-extern UniValue getnetworkinfo(const UniValue& params, bool fHelp);
-extern UniValue setmocktime(const UniValue& params, bool fHelp);
-
-extern UniValue getrawtransaction(const UniValue& params, bool fHelp); // in rpc/rawtransaction.cpp
-extern UniValue listunspent(const UniValue& params, bool fHelp);
-extern UniValue lockunspent(const UniValue& params, bool fHelp);
-extern UniValue listlockunspent(const UniValue& params, bool fHelp);
-extern UniValue createrawtransaction(const UniValue& params, bool fHelp);
-extern UniValue decoderawtransaction(const UniValue& params, bool fHelp);
-extern UniValue decodescript(const UniValue& params, bool fHelp);
-extern UniValue signrawtransaction(const UniValue& params, bool fHelp);
-extern UniValue sendrawtransaction(const UniValue& params, bool fHelp);
-extern UniValue gettxoutproof(const UniValue& params, bool fHelp);
-extern UniValue verifytxoutproof(const UniValue& params, bool fHelp);
-
-extern UniValue getblockcount(const UniValue& params, bool fHelp); // in rpc/blockchain.cpp
-extern UniValue getbestblockhash(const UniValue& params, bool fHelp);
-extern UniValue getdifficulty(const UniValue& params, bool fHelp);
-extern UniValue settxfee(const UniValue& params, bool fHelp);
-extern UniValue getmempoolinfo(const UniValue& params, bool fHelp);
-extern UniValue getrawmempool(const UniValue& params, bool fHelp);
-extern UniValue getblockhash(const UniValue& params, bool fHelp);
-extern UniValue getblockheader(const UniValue& params, bool fHelp);
-extern UniValue getblock(const UniValue& params, bool fHelp);
-extern UniValue gettxoutsetinfo(const UniValue& params, bool fHelp);
-extern UniValue gettxout(const UniValue& params, bool fHelp);
-extern UniValue verifychain(const UniValue& params, bool fHelp);
-extern UniValue getchaintips(const UniValue& params, bool fHelp);
-extern UniValue invalidateblock(const UniValue& params, bool fHelp);
-extern UniValue reconsiderblock(const UniValue& params, bool fHelp);
-
 bool StartRPC();
 void InterruptRPC();
 void StopRPC();
diff --git a/src/test/rpc_tests.cpp b/src/test/rpc_tests.cpp
index d6309ca384c75..1976ee2cb61f1 100644
--- a/src/test/rpc_tests.cpp
+++ b/src/test/rpc_tests.cpp
@@ -36,7 +36,7 @@ UniValue CallRPC(string args)
     string strMethod = vArgs[0];
     vArgs.erase(vArgs.begin());
     UniValue params = RPCConvertValues(strMethod, vArgs);
-
+    BOOST_CHECK(tableRPC[strMethod]);
     rpcfn_type method = tableRPC[strMethod]->actor;
     try {
         UniValue result = (*method)(params, false);
diff --git a/src/test/test_bitcoin.cpp b/src/test/test_bitcoin.cpp
index dadc8b948f48f..1f2e034b01a12 100644
--- a/src/test/test_bitcoin.cpp
+++ b/src/test/test_bitcoin.cpp
@@ -17,6 +17,8 @@
 #include "txdb.h"
 #include "txmempool.h"
 #include "ui_interface.h"
+#include "rpc/server.h"
+#include "rpc/register.h"
 #ifdef ENABLE_WALLET
 #include "wallet/db.h"
 #include "wallet/wallet.h"
@@ -53,9 +55,12 @@ BasicTestingSetup::~BasicTestingSetup()
 TestingSetup::TestingSetup(const std::string& chainName) : BasicTestingSetup(chainName)
 {
     const CChainParams& chainparams = Params();
+        // Ideally we'd move all the RPC tests to the functional testing framework
+        // instead of unit tests, but for now we need these here.
+        RegisterAllCoreRPCCommands(tableRPC);
 #ifdef ENABLE_WALLET
         bitdb.MakeMock();
-        walletRegisterRPCCommands();
+        RegisterWalletRPCCommands(tableRPC);
 #endif
         ClearDatadirCache();
         pathTemp = GetTempPath() / strprintf("test_bitcoin_%lu_%i", (unsigned long)GetTime(), (int)(GetRand(100000)));
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index a1733bae77b93..61c9846e114b3 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -2509,7 +2509,7 @@ extern UniValue importwallet(const UniValue& params, bool fHelp);
 extern UniValue importprunedfunds(const UniValue& params, bool fHelp);
 extern UniValue removeprunedfunds(const UniValue& params, bool fHelp);
 
-const CRPCCommand vWalletRPCCommands[] =
+static const CRPCCommand commands[] =
 { //  category              name                        actor (function)           okSafeMode
     //  --------------------- ------------------------    -----------------------    ----------
     { "rawtransactions",    "fundrawtransaction",       &fundrawtransaction,       false },
@@ -2559,14 +2559,8 @@ const CRPCCommand vWalletRPCCommands[] =
     { "wallet",             "removeprunedfunds",        &removeprunedfunds,        true  },
 };
 
-void walletRegisterRPCCommands()
+void RegisterWalletRPCCommands(CRPCTable &tableRPC)
 {
-    unsigned int vcidx;
-    for (vcidx = 0; vcidx < ARRAYLEN(vWalletRPCCommands); vcidx++)
-    {
-        const CRPCCommand *pcmd;
-
-        pcmd = &vWalletRPCCommands[vcidx];
-        tableRPC.appendCommand(pcmd->name, pcmd);
-    }
+    for (unsigned int vcidx = 0; vcidx < ARRAYLEN(commands); vcidx++)
+        tableRPC.appendCommand(commands[vcidx].name, &commands[vcidx]);
 }
diff --git a/src/wallet/rpcwallet.h b/src/wallet/rpcwallet.h
index 42e8021afa7f4..a5de7e2de1456 100644
--- a/src/wallet/rpcwallet.h
+++ b/src/wallet/rpcwallet.h
@@ -5,6 +5,8 @@
 #ifndef BITCOIN_WALLET_RPCWALLET_H
 #define BITCOIN_WALLET_RPCWALLET_H
 
-void walletRegisterRPCCommands();
+class CRPCTable;
+
+void RegisterWalletRPCCommands(CRPCTable &tableRPC);
 
 #endif //BITCOIN_WALLET_RPCWALLET_H

From eff736e55e84441f9509285e83a1a6ee9a0c6e69 Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Tue, 29 Mar 2016 16:46:20 +0200
Subject: [PATCH 0070/1802] Reformat version in UpdateTip and other messages

Also remove the hardly-readable nBits from UpdateTip's log message.
---
 src/main.cpp             | 8 ++++----
 src/primitives/block.cpp | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index 36189f4ffc628..d22b4c80e2217 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -2549,8 +2549,8 @@ void static UpdateTip(CBlockIndex *pindexNew) {
     nTimeBestReceived = GetTime();
     mempool.AddTransactionsUpdated(1);
 
-    LogPrintf("%s: new best=%s  height=%d bits=%d log2_work=%.8g  tx=%lu  date=%s progress=%f  cache=%.1fMiB(%utx)\n", __func__,
-      chainActive.Tip()->GetBlockHash().ToString(), chainActive.Height(), chainActive.Tip()->nBits,
+    LogPrintf("%s: new best=%s height=%d version=0x%08x log2_work=%.8g tx=%lu date='%s' progress=%f cache=%.1fMiB(%utx)\n", __func__,
+      chainActive.Tip()->GetBlockHash().ToString(), chainActive.Height(), chainActive.Tip()->nVersion,
       log(chainActive.Tip()->nChainWork.getdouble())/log(2.0), (unsigned long)chainActive.Tip()->nChainTx,
       DateTimeStrFormat("%Y-%m-%d %H:%M:%S", chainActive.Tip()->GetBlockTime()),
       Checkpoints::GuessVerificationProgress(chainParams.Checkpoints(), chainActive.Tip()), pcoinsTip->DynamicMemoryUsage() * (1.0 / (1<<20)), pcoinsTip->GetCacheSize());
@@ -3284,8 +3284,8 @@ bool ContextualCheckBlockHeader(const CBlockHeader& block, CValidationState& sta
     // Reject outdated version blocks when 95% (75% on testnet) of the network has upgraded:
     for (int32_t version = 2; version < 5; ++version) // check for version 2, 3 and 4 upgrades
         if (block.nVersion < version && IsSuperMajority(version, pindexPrev, consensusParams.nMajorityRejectBlockOutdated, consensusParams))
-            return state.Invalid(false, REJECT_OBSOLETE, strprintf("bad-version(v%d)", version - 1),
-                                 strprintf("rejected nVersion=%d block", version - 1));
+            return state.Invalid(false, REJECT_OBSOLETE, strprintf("bad-version(0x%08x)", version - 1),
+                                 strprintf("rejected nVersion=0x%08x block", version - 1));
 
     return true;
 }
diff --git a/src/primitives/block.cpp b/src/primitives/block.cpp
index 59e949d71a329..6fb33230a53e0 100644
--- a/src/primitives/block.cpp
+++ b/src/primitives/block.cpp
@@ -18,7 +18,7 @@ uint256 CBlockHeader::GetHash() const
 std::string CBlock::ToString() const
 {
     std::stringstream s;
-    s << strprintf("CBlock(hash=%s, ver=%d, hashPrevBlock=%s, hashMerkleRoot=%s, nTime=%u, nBits=%08x, nNonce=%u, vtx=%u)\n",
+    s << strprintf("CBlock(hash=%s, ver=0x%08x, hashPrevBlock=%s, hashMerkleRoot=%s, nTime=%u, nBits=%08x, nNonce=%u, vtx=%u)\n",
         GetHash().ToString(),
         nVersion,
         hashPrevBlock.ToString(),

From fa524d9ddbad0a03f9eb974100fb3b6001045645 Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Sat, 19 Mar 2016 21:36:32 +0100
Subject: [PATCH 0071/1802] [qa] Use python2/3 syntax

---
 qa/pull-tester/rpc-tests.py                   |  8 +--
 qa/rpc-tests/bip65-cltv-p2p.py                |  4 +-
 qa/rpc-tests/bip68-112-113-p2p.py             |  6 +--
 qa/rpc-tests/bip9-softforks.py                |  8 +--
 qa/rpc-tests/bipdersig-p2p.py                 |  4 +-
 qa/rpc-tests/decodescript.py                  |  4 +-
 qa/rpc-tests/disablewallet.py                 |  4 +-
 qa/rpc-tests/fundrawtransaction.py            |  8 +--
 qa/rpc-tests/importprunedfunds.py             |  4 +-
 qa/rpc-tests/keypool.py                       |  6 +--
 qa/rpc-tests/listtransactions.py              |  4 +-
 qa/rpc-tests/rawtransactions.py               |  2 +-
 qa/rpc-tests/rest.py                          |  9 ++--
 qa/rpc-tests/smartfees.py                     |  2 +-
 qa/rpc-tests/test_framework/blockstore.py     |  7 +--
 qa/rpc-tests/test_framework/blocktools.py     |  4 +-
 qa/rpc-tests/test_framework/comptool.py       |  6 +--
 qa/rpc-tests/test_framework/mininode.py       | 51 ++++++++++---------
 qa/rpc-tests/test_framework/socks5.py         |  2 +-
 qa/rpc-tests/test_framework/test_framework.py |  4 +-
 qa/rpc-tests/wallet.py                        |  6 +--
 21 files changed, 78 insertions(+), 75 deletions(-)

diff --git a/qa/pull-tester/rpc-tests.py b/qa/pull-tester/rpc-tests.py
index d794dbe806cb3..6d3bda10ee6d8 100755
--- a/qa/pull-tester/rpc-tests.py
+++ b/qa/pull-tester/rpc-tests.py
@@ -32,13 +32,13 @@
 from tests_config import *
 
 #If imported values are not defined then set to zero (or disabled)
-if not vars().has_key('ENABLE_WALLET'):
+if 'ENABLE_WALLET' not in vars():
     ENABLE_WALLET=0
-if not vars().has_key('ENABLE_BITCOIND'):
+if 'ENABLE_BITCOIND' not in vars():
     ENABLE_BITCOIND=0
-if not vars().has_key('ENABLE_UTILS'):
+if 'ENABLE_UTILS' not in vars():
     ENABLE_UTILS=0
-if not vars().has_key('ENABLE_ZMQ'):
+if 'ENABLE_ZMQ' not in vars():
     ENABLE_ZMQ=0
     
 # python-zmq may not be installed. Handle this gracefully and with some helpful info
diff --git a/qa/rpc-tests/bip65-cltv-p2p.py b/qa/rpc-tests/bip65-cltv-p2p.py
index bbd518cf5ff8e..316c5fe0904cc 100755
--- a/qa/rpc-tests/bip65-cltv-p2p.py
+++ b/qa/rpc-tests/bip65-cltv-p2p.py
@@ -11,7 +11,7 @@
 from test_framework.comptool import TestInstance, TestManager
 from test_framework.script import CScript, OP_1NEGATE, OP_CHECKLOCKTIMEVERIFY, OP_DROP
 from binascii import unhexlify
-import cStringIO
+from io import BytesIO
 import time
 
 def cltv_invalidate(tx):
@@ -60,7 +60,7 @@ def create_transaction(self, node, coinbase, to_address, amount):
         rawtx = node.createrawtransaction(inputs, outputs)
         signresult = node.signrawtransaction(rawtx)
         tx = CTransaction()
-        f = cStringIO.StringIO(unhexlify(signresult['hex']))
+        f = BytesIO(unhexlify(signresult['hex']))
         tx.deserialize(f)
         return tx
 
diff --git a/qa/rpc-tests/bip68-112-113-p2p.py b/qa/rpc-tests/bip68-112-113-p2p.py
index 7d3c59be3ee8f..f391cb0b7aab4 100755
--- a/qa/rpc-tests/bip68-112-113-p2p.py
+++ b/qa/rpc-tests/bip68-112-113-p2p.py
@@ -11,7 +11,7 @@
 from test_framework.comptool import TestInstance, TestManager
 from test_framework.script import *
 from binascii import unhexlify
-import cStringIO
+from io import BytesIO
 import time
 
 '''
@@ -119,7 +119,7 @@ def create_transaction(self, node, txid, to_address, amount):
         outputs = { to_address : amount }
         rawtx = node.createrawtransaction(inputs, outputs)
         tx = CTransaction()
-        f = cStringIO.StringIO(unhexlify(rawtx))
+        f = BytesIO(unhexlify(rawtx))
         tx.deserialize(f)
         return tx
 
@@ -127,7 +127,7 @@ def sign_transaction(self, node, unsignedtx):
         rawtx = ToHex(unsignedtx)
         signresult = node.signrawtransaction(rawtx)
         tx = CTransaction()
-        f = cStringIO.StringIO(unhexlify(signresult['hex']))
+        f = BytesIO(unhexlify(signresult['hex']))
         tx.deserialize(f)
         return tx
 
diff --git a/qa/rpc-tests/bip9-softforks.py b/qa/rpc-tests/bip9-softforks.py
index cbb1b7d4cee89..445c04494442a 100755
--- a/qa/rpc-tests/bip9-softforks.py
+++ b/qa/rpc-tests/bip9-softforks.py
@@ -11,7 +11,7 @@
 from test_framework.comptool import TestInstance, TestManager
 from test_framework.script import CScript, OP_1NEGATE, OP_NOP3, OP_DROP
 from binascii import hexlify, unhexlify
-import cStringIO
+from io import BytesIO
 import time
 import itertools
 
@@ -53,7 +53,7 @@ def create_transaction(self, node, coinbase, to_address, amount):
         outputs = { to_address : amount }
         rawtx = node.createrawtransaction(inputs, outputs)
         tx = CTransaction()
-        f = cStringIO.StringIO(unhexlify(rawtx))
+        f = BytesIO(unhexlify(rawtx))
         tx.deserialize(f)
         tx.nVersion = 2
         return tx
@@ -61,7 +61,7 @@ def create_transaction(self, node, coinbase, to_address, amount):
     def sign_transaction(self, node, tx):
         signresult = node.signrawtransaction(hexlify(tx.serialize()))
         tx = CTransaction()
-        f = cStringIO.StringIO(unhexlify(signresult['hex']))
+        f = BytesIO(unhexlify(signresult['hex']))
         tx.deserialize(f)
         return tx
 
@@ -217,4 +217,4 @@ def mtp_invalidate(self, tx):
         tx.nLockTime = self.last_block_time
 
 if __name__ == '__main__':
-    BIP9SoftForksTest().main()
\ No newline at end of file
+    BIP9SoftForksTest().main()
diff --git a/qa/rpc-tests/bipdersig-p2p.py b/qa/rpc-tests/bipdersig-p2p.py
index 544e4a96701f3..f0d81a6f441c0 100755
--- a/qa/rpc-tests/bipdersig-p2p.py
+++ b/qa/rpc-tests/bipdersig-p2p.py
@@ -11,7 +11,7 @@
 from test_framework.comptool import TestInstance, TestManager
 from test_framework.script import CScript
 from binascii import unhexlify
-import cStringIO
+from io import BytesIO
 import time
 
 # A canonical signature consists of: 
@@ -68,7 +68,7 @@ def create_transaction(self, node, coinbase, to_address, amount):
         rawtx = node.createrawtransaction(inputs, outputs)
         signresult = node.signrawtransaction(rawtx)
         tx = CTransaction()
-        f = cStringIO.StringIO(unhexlify(signresult['hex']))
+        f = BytesIO(unhexlify(signresult['hex']))
         tx.deserialize(f)
         return tx
 
diff --git a/qa/rpc-tests/decodescript.py b/qa/rpc-tests/decodescript.py
index 490808d49dd53..2dfafac2fc180 100755
--- a/qa/rpc-tests/decodescript.py
+++ b/qa/rpc-tests/decodescript.py
@@ -7,7 +7,7 @@
 from test_framework.util import *
 from test_framework.mininode import *
 from binascii import hexlify, unhexlify
-from cStringIO import StringIO
+from io import BytesIO
 
 class DecodeScriptTest(BitcoinTestFramework):
     """Tests decoding scripts via RPC command "decodescript"."""
@@ -131,7 +131,7 @@ def decoderawtransaction_asm_sighashtype(self):
         assert_equal('OP_DUP OP_HASH160 dc863734a218bfe83ef770ee9d41a27f824a6e56 OP_EQUALVERIFY OP_CHECKSIG', rpc_result['vout'][0]['scriptPubKey']['asm'])
         assert_equal('OP_HASH160 2a5edea39971049a540474c6a99edf0aa4074c58 OP_EQUAL', rpc_result['vout'][1]['scriptPubKey']['asm'])
         txSave = CTransaction()
-        txSave.deserialize(StringIO(unhexlify(tx)))
+        txSave.deserialize(BytesIO(unhexlify(tx)))
 
         # make sure that a specifically crafted op_return value will not pass all the IsDERSignature checks and then get decoded as a sighash type
         tx = '01000000015ded05872fdbda629c7d3d02b194763ce3b9b1535ea884e3c8e765d42e316724020000006b48304502204c10d4064885c42638cbff3585915b322de33762598321145ba033fc796971e2022100bb153ad3baa8b757e30a2175bd32852d2e1cb9080f84d7e32fcdfd667934ef1b012103163c0ff73511ea1743fb5b98384a2ff09dd06949488028fd819f4d83f56264efffffffff0200000000000000000b6a0930060201000201000180380100000000001976a9141cabd296e753837c086da7a45a6c2fe0d49d7b7b88ac00000000'
diff --git a/qa/rpc-tests/disablewallet.py b/qa/rpc-tests/disablewallet.py
index 5af8158467969..cb868029fa327 100755
--- a/qa/rpc-tests/disablewallet.py
+++ b/qa/rpc-tests/disablewallet.py
@@ -32,7 +32,7 @@ def run_test (self):
         # Checking mining to an address without a wallet
         try:
             self.nodes[0].generatetoaddress(1, 'mneYUmWYsuk7kySiURxCi3AGxrAqZxLgPZ')
-        except JSONRPCException,e:
+        except JSONRPCException as e:
             assert("Invalid address" not in e.error['message'])
             assert("ProcessNewBlock, block not accepted" not in e.error['message'])
             assert("Couldn't create new block" not in e.error['message'])
@@ -40,7 +40,7 @@ def run_test (self):
         try:
             self.nodes[0].generatetoaddress(1, '3J98t1WpEZ73CNmQviecrnyiWrnqRhWNLy')
             raise AssertionError("Must not mine to invalid address!")
-        except JSONRPCException,e:
+        except JSONRPCException as e:
             assert("Invalid address" in e.error['message'])
 
 if __name__ == '__main__':
diff --git a/qa/rpc-tests/fundrawtransaction.py b/qa/rpc-tests/fundrawtransaction.py
index 4458712815c57..82f2f4f5c52b8 100755
--- a/qa/rpc-tests/fundrawtransaction.py
+++ b/qa/rpc-tests/fundrawtransaction.py
@@ -209,7 +209,7 @@ def run_test(self):
         matchingOuts = 0
         for i, out in enumerate(dec_tx['vout']):
             totalOut += out['value']
-            if outputs.has_key(out['scriptPubKey']['addresses'][0]):
+            if out['scriptPubKey']['addresses'][0] in outputs:
                 matchingOuts+=1
             else:
                 assert_equal(i, rawtxfund['changepos'])
@@ -249,7 +249,7 @@ def run_test(self):
         matchingOuts = 0
         for out in dec_tx['vout']:
             totalOut += out['value']
-            if outputs.has_key(out['scriptPubKey']['addresses'][0]):
+            if out['scriptPubKey']['addresses'][0] in outputs:
                 matchingOuts+=1
 
         assert_equal(matchingOuts, 1)
@@ -291,7 +291,7 @@ def run_test(self):
         matchingOuts = 0
         for out in dec_tx['vout']:
             totalOut += out['value']
-            if outputs.has_key(out['scriptPubKey']['addresses'][0]):
+            if out['scriptPubKey']['addresses'][0] in outputs:
                 matchingOuts+=1
 
         assert_equal(matchingOuts, 2)
@@ -309,7 +309,7 @@ def run_test(self):
         try:
             rawtxfund = self.nodes[2].fundrawtransaction(rawtx)
             raise AssertionError("Spent more than available")
-        except JSONRPCException,e:
+        except JSONRPCException as e:
             assert("Insufficient" in e.error['message'])
 
 
diff --git a/qa/rpc-tests/importprunedfunds.py b/qa/rpc-tests/importprunedfunds.py
index 5cbdcde9aa997..db875800d4f0f 100755
--- a/qa/rpc-tests/importprunedfunds.py
+++ b/qa/rpc-tests/importprunedfunds.py
@@ -82,7 +82,7 @@ def run_test (self):
         #Import with no affiliated address
         try:
             result1 = self.nodes[1].importprunedfunds(rawtxn1, proof1, "")
-        except JSONRPCException,e:
+        except JSONRPCException as e:
             errorString = e.error['message']
 
         assert('No addresses' in errorString)
@@ -119,7 +119,7 @@ def run_test (self):
 
         try:
             self.nodes[1].removeprunedfunds(txnid1)
-        except JSONRPCException,e:
+        except JSONRPCException as e:
             errorString = e.error['message']
 
         assert('does not exist' in errorString)
diff --git a/qa/rpc-tests/keypool.py b/qa/rpc-tests/keypool.py
index 95d0d6832a91f..5253d49c308f7 100755
--- a/qa/rpc-tests/keypool.py
+++ b/qa/rpc-tests/keypool.py
@@ -46,7 +46,7 @@ def run_test(self):
         try:
             addr = nodes[0].getnewaddress()
             raise AssertionError('Keypool should be exhausted after one address')
-        except JSONRPCException,e:
+        except JSONRPCException as e:
             assert(e.error['code']==-12)
 
         # put three new keys in the keypool
@@ -66,7 +66,7 @@ def run_test(self):
         try:
             addr = nodes[0].getrawchangeaddress()
             raise AssertionError('Keypool should be exhausted after three addresses')
-        except JSONRPCException,e:
+        except JSONRPCException as e:
             assert(e.error['code']==-12)
 
         # refill keypool with three new addresses
@@ -84,7 +84,7 @@ def run_test(self):
         try:
             nodes[0].generate(1)
             raise AssertionError('Keypool should be exhausted after three addesses')
-        except JSONRPCException,e:
+        except JSONRPCException as e:
             assert(e.error['code']==-12)
 
     def setup_chain(self):
diff --git a/qa/rpc-tests/listtransactions.py b/qa/rpc-tests/listtransactions.py
index da1e98dc33df0..c4eca519b7cf9 100755
--- a/qa/rpc-tests/listtransactions.py
+++ b/qa/rpc-tests/listtransactions.py
@@ -8,12 +8,12 @@
 from test_framework.test_framework import BitcoinTestFramework
 from test_framework.util import *
 from test_framework.mininode import CTransaction, COIN
-import cStringIO
+from io import BytesIO
 import binascii
 
 def txFromHex(hexstring):
     tx = CTransaction()
-    f = cStringIO.StringIO(binascii.unhexlify(hexstring))
+    f = BytesIO(binascii.unhexlify(hexstring))
     tx.deserialize(f)
     return tx
 
diff --git a/qa/rpc-tests/rawtransactions.py b/qa/rpc-tests/rawtransactions.py
index dd9e5e28a526f..9f660c8bdadeb 100755
--- a/qa/rpc-tests/rawtransactions.py
+++ b/qa/rpc-tests/rawtransactions.py
@@ -59,7 +59,7 @@ def run_test(self):
         errorString = ""
         try:
             rawtx   = self.nodes[2].sendrawtransaction(rawtx['hex'])
-        except JSONRPCException,e:
+        except JSONRPCException as e:
             errorString = e.error['message']
 
         assert("Missing inputs" in errorString)
diff --git a/qa/rpc-tests/rest.py b/qa/rpc-tests/rest.py
index 8c835365010e8..3c8a405bdd044 100755
--- a/qa/rpc-tests/rest.py
+++ b/qa/rpc-tests/rest.py
@@ -11,8 +11,9 @@
 from test_framework.test_framework import BitcoinTestFramework
 from test_framework.util import *
 from struct import *
+from io import BytesIO
+from codecs import encode
 import binascii
-import StringIO
 
 try:
     import http.client as httplib
@@ -146,7 +147,7 @@ def run_test(self):
         binaryRequest += pack("i", 0)
 
         bin_response = http_post_call(url.hostname, url.port, '/rest/getutxos'+self.FORMAT_SEPARATOR+'bin', binaryRequest)
-        output = StringIO.StringIO()
+        output = BytesIO()
         output.write(bin_response)
         output.seek(0)
         chainHeight = unpack("i", output.read(4))[0]
@@ -233,7 +234,7 @@ def run_test(self):
         assert_equal(response_hex.status, 200)
         assert_greater_than(int(response_hex.getheader('content-length')), 160)
         response_hex_str = response_hex.read()
-        assert_equal(response_str.encode("hex")[0:160], response_hex_str[0:160])
+        assert_equal(encode(response_str, "hex")[0:160], response_hex_str[0:160])
 
         # compare with hex block header
         response_header_hex = http_get_call(url.hostname, url.port, '/rest/headers/1/'+bb_hash+self.FORMAT_SEPARATOR+"hex", True)
@@ -241,7 +242,7 @@ def run_test(self):
         assert_greater_than(int(response_header_hex.getheader('content-length')), 160)
         response_header_hex_str = response_header_hex.read()
         assert_equal(response_hex_str[0:160], response_header_hex_str[0:160])
-        assert_equal(response_header_str.encode("hex")[0:160], response_header_hex_str[0:160])
+        assert_equal(encode(response_header_str, "hex")[0:160], response_header_hex_str[0:160])
 
         # check json format
         block_json_string = http_get_call(url.hostname, url.port, '/rest/block/'+bb_hash+self.FORMAT_SEPARATOR+'json')
diff --git a/qa/rpc-tests/smartfees.py b/qa/rpc-tests/smartfees.py
index b209ae0c16338..6274cd05301e6 100755
--- a/qa/rpc-tests/smartfees.py
+++ b/qa/rpc-tests/smartfees.py
@@ -105,7 +105,7 @@ def check_estimates(node, fees_seen, max_invalid, print_estimates = True):
         print([str(all_estimates[e-1]) for e in [1,2,3,6,15,25]])
     delta = 1.0e-6 # account for rounding error
     last_e = max(fees_seen)
-    for e in filter(lambda x: x >= 0, all_estimates):
+    for e in [x for x in all_estimates if x >= 0]:
         # Estimates should be within the bounds of what transactions fees actually were:
         if float(e)+delta < min(fees_seen) or float(e)-delta > max(fees_seen):
             raise AssertionError("Estimated fee (%f) out of range (%f,%f)"
diff --git a/qa/rpc-tests/test_framework/blockstore.py b/qa/rpc-tests/test_framework/blockstore.py
index b9775b477cc28..73d9ffbb2fe05 100644
--- a/qa/rpc-tests/test_framework/blockstore.py
+++ b/qa/rpc-tests/test_framework/blockstore.py
@@ -3,8 +3,9 @@
 #             and for constructing a getheaders message
 #
 
-from mininode import *
+from .mininode import *
 import dbm
+from io import BytesIO
 
 class BlockStore(object):
     def __init__(self, datadir):
@@ -21,7 +22,7 @@ def get(self, blockhash):
             serialized_block = self.blockDB[repr(blockhash)]
         except KeyError:
             return None
-        f = cStringIO.StringIO(serialized_block)
+        f = BytesIO(serialized_block)
         ret = CBlock()
         ret.deserialize(f)
         ret.calc_sha256()
@@ -115,7 +116,7 @@ def get(self, txhash):
             serialized_tx = self.txDB[repr(txhash)]
         except KeyError:
             return None
-        f = cStringIO.StringIO(serialized_tx)
+        f = BytesIO(serialized_tx)
         ret = CTransaction()
         ret.deserialize(f)
         ret.calc_sha256()
diff --git a/qa/rpc-tests/test_framework/blocktools.py b/qa/rpc-tests/test_framework/blocktools.py
index b075f69c4751c..425e6dcdde419 100644
--- a/qa/rpc-tests/test_framework/blocktools.py
+++ b/qa/rpc-tests/test_framework/blocktools.py
@@ -4,8 +4,8 @@
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 #
 
-from mininode import *
-from script import CScript, OP_TRUE, OP_CHECKSIG
+from .mininode import *
+from .script import CScript, OP_TRUE, OP_CHECKSIG
 
 # Create a block (with regtest difficulty)
 def create_block(hashprev, coinbase, nTime=None):
diff --git a/qa/rpc-tests/test_framework/comptool.py b/qa/rpc-tests/test_framework/comptool.py
index f19edbf06900b..6279070fbc1bb 100755
--- a/qa/rpc-tests/test_framework/comptool.py
+++ b/qa/rpc-tests/test_framework/comptool.py
@@ -4,9 +4,9 @@
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 #
 
-from mininode import *
-from blockstore import BlockStore, TxStore
-from util import p2p_port
+from .mininode import *
+from .blockstore import BlockStore, TxStore
+from .util import p2p_port
 
 '''
 This is a tool for comparing two or more bitcoinds to each other
diff --git a/qa/rpc-tests/test_framework/mininode.py b/qa/rpc-tests/test_framework/mininode.py
index 20386c642c67b..07d1827dfe285 100755
--- a/qa/rpc-tests/test_framework/mininode.py
+++ b/qa/rpc-tests/test_framework/mininode.py
@@ -24,7 +24,8 @@
 import time
 import sys
 import random
-import cStringIO
+from io import BytesIO
+from codecs import encode
 import hashlib
 from threading import RLock
 from threading import Thread
@@ -75,12 +76,12 @@ def deser_string(f):
 
 def ser_string(s):
     if len(s) < 253:
-        return chr(len(s)) + s
+        return struct.pack("B", len(s)) + s
     elif len(s) < 0x10000:
-        return chr(253) + struct.pack("<H", len(s)) + s
+        return struct.pack("B", 253) + struct.pack("<H", len(s)) + s
     elif len(s) < 0x100000000L:
-        return chr(254) + struct.pack("<I", len(s)) + s
-    return chr(255) + struct.pack("<Q", len(s)) + s
+        return struct.pack("B", 254) + struct.pack("<I", len(s)) + s
+    return struct.pack("B", 255) + struct.pack("<Q", len(s)) + s
 
 
 def deser_uint256(f):
@@ -132,13 +133,13 @@ def deser_vector(f, c):
 def ser_vector(l):
     r = ""
     if len(l) < 253:
-        r = chr(len(l))
+        r = struct.pack("B", len(l))
     elif len(l) < 0x10000:
-        r = chr(253) + struct.pack("<H", len(l))
+        r = struct.pack("B", 253) + struct.pack("<H", len(l))
     elif len(l) < 0x100000000L:
-        r = chr(254) + struct.pack("<I", len(l))
+        r = struct.pack("B", 254) + struct.pack("<I", len(l))
     else:
-        r = chr(255) + struct.pack("<Q", len(l))
+        r = struct.pack("B", 255) + struct.pack("<Q", len(l))
     for i in l:
         r += i.serialize()
     return r
@@ -162,13 +163,13 @@ def deser_uint256_vector(f):
 def ser_uint256_vector(l):
     r = ""
     if len(l) < 253:
-        r = chr(len(l))
+        r = struct.pack("B", len(l))
     elif len(l) < 0x10000:
-        r = chr(253) + struct.pack("<H", len(l))
+        r = struct.pack("B", 253) + struct.pack("<H", len(l))
     elif len(l) < 0x100000000L:
-        r = chr(254) + struct.pack("<I", len(l))
+        r = struct.pack("B", 254) + struct.pack("<I", len(l))
     else:
-        r = chr(255) + struct.pack("<Q", len(l))
+        r = struct.pack("B", 255) + struct.pack("<Q", len(l))
     for i in l:
         r += ser_uint256(i)
     return r
@@ -192,13 +193,13 @@ def deser_string_vector(f):
 def ser_string_vector(l):
     r = ""
     if len(l) < 253:
-        r = chr(len(l))
+        r = struct.pack("B", len(l))
     elif len(l) < 0x10000:
-        r = chr(253) + struct.pack("<H", len(l))
+        r = struct.pack("B", 253) + struct.pack("<H", len(l))
     elif len(l) < 0x100000000L:
-        r = chr(254) + struct.pack("<I", len(l))
+        r = struct.pack("B", 254) + struct.pack("<I", len(l))
     else:
-        r = chr(255) + struct.pack("<Q", len(l))
+        r = struct.pack("B", 255) + struct.pack("<Q", len(l))
     for sv in l:
         r += ser_string(sv)
     return r
@@ -222,20 +223,20 @@ def deser_int_vector(f):
 def ser_int_vector(l):
     r = ""
     if len(l) < 253:
-        r = chr(len(l))
+        r = struct.pack("B", len(l))
     elif len(l) < 0x10000:
-        r = chr(253) + struct.pack("<H", len(l))
+        r = struct.pack("B", 253) + struct.pack("<H", len(l))
     elif len(l) < 0x100000000L:
-        r = chr(254) + struct.pack("<I", len(l))
+        r = struct.pack("B", 254) + struct.pack("<I", len(l))
     else:
-        r = chr(255) + struct.pack("<Q", len(l))
+        r = struct.pack("B", 255) + struct.pack("<Q", len(l))
     for i in l:
         r += struct.pack("<i", i)
     return r
 
 # Deserialize from a hex string representation (eg from RPC)
 def FromHex(obj, hex_string):
-    obj.deserialize(cStringIO.StringIO(binascii.unhexlify(hex_string)))
+    obj.deserialize(BytesIO(binascii.unhexlify(hex_string)))
     return obj
 
 # Convert a binary-serializable object to hex (eg for submission via RPC)
@@ -423,7 +424,7 @@ def rehash(self):
     def calc_sha256(self):
         if self.sha256 is None:
             self.sha256 = uint256_from_str(hash256(self.serialize()))
-        self.hash = hash256(self.serialize())[::-1].encode('hex_codec')
+        self.hash = encode(hash256(self.serialize())[::-1], 'hex')
 
     def is_valid(self):
         self.calc_sha256()
@@ -492,7 +493,7 @@ def calc_sha256(self):
             r += struct.pack("<I", self.nBits)
             r += struct.pack("<I", self.nNonce)
             self.sha256 = uint256_from_str(hash256(r))
-            self.hash = hash256(r)[::-1].encode('hex_codec')
+            self.hash = encode(hash256(r)[::-1], 'hex')
 
     def rehash(self):
         self.sha256 = None
@@ -1281,7 +1282,7 @@ def got_data(self):
                     raise ValueError("got bad checksum " + repr(self.recvbuf))
                 self.recvbuf = self.recvbuf[4+12+4+4+msglen:]
             if command in self.messagemap:
-                f = cStringIO.StringIO(msg)
+                f = BytesIO(msg)
                 t = self.messagemap[command]()
                 t.deserialize(f)
                 self.got_message(t)
diff --git a/qa/rpc-tests/test_framework/socks5.py b/qa/rpc-tests/test_framework/socks5.py
index 1dbfb98d5d3dd..12327a6c5f4a9 100644
--- a/qa/rpc-tests/test_framework/socks5.py
+++ b/qa/rpc-tests/test_framework/socks5.py
@@ -117,7 +117,7 @@ def handle(self):
             self.serv.queue.put(cmdin)
             print('Proxy: ', cmdin)
             # Fall through to disconnect
-        except Exception,e:
+        except Exception as e:
             traceback.print_exc(file=sys.stderr)
             self.serv.queue.put(e)
         finally:
diff --git a/qa/rpc-tests/test_framework/test_framework.py b/qa/rpc-tests/test_framework/test_framework.py
index 584f318d0bbcd..19ee4726093de 100755
--- a/qa/rpc-tests/test_framework/test_framework.py
+++ b/qa/rpc-tests/test_framework/test_framework.py
@@ -26,7 +26,7 @@
     check_json_precision,
     initialize_chain_clean,
 )
-from authproxy import AuthServiceProxy, JSONRPCException
+from .authproxy import AuthServiceProxy, JSONRPCException
 
 
 class BitcoinTestFramework(object):
@@ -140,7 +140,7 @@ def main(self):
             print("JSONRPC error: "+e.error['message'])
             traceback.print_tb(sys.exc_info()[2])
         except AssertionError as e:
-            print("Assertion failed: "+e.message)
+            print("Assertion failed: "+ str(e))
             traceback.print_tb(sys.exc_info()[2])
         except Exception as e:
             print("Unexpected exception caught during testing: "+str(e))
diff --git a/qa/rpc-tests/wallet.py b/qa/rpc-tests/wallet.py
index e6ce39711913a..cb876aae5cb90 100755
--- a/qa/rpc-tests/wallet.py
+++ b/qa/rpc-tests/wallet.py
@@ -249,7 +249,7 @@ def run_test (self):
         errorString = ""
         try:
             txId  = self.nodes[0].sendtoaddress(self.nodes[2].getnewaddress(), "1f-4")
-        except JSONRPCException,e:
+        except JSONRPCException as e:
             errorString = e.error['message']
 
         assert("Invalid amount" in errorString)
@@ -257,7 +257,7 @@ def run_test (self):
         errorString = ""
         try:
             self.nodes[0].generate("2") #use a string to as block amount parameter must fail because it's not interpreted as amount
-        except JSONRPCException,e:
+        except JSONRPCException as e:
             errorString = e.error['message']
 
         assert("not an integer" in errorString)
@@ -271,7 +271,7 @@ def run_test (self):
         # Check that the txid and balance is found by node1
         try:
             self.nodes[1].gettransaction(cbTxId)
-        except JSONRPCException,e:
+        except JSONRPCException as e:
             assert("Invalid or non-wallet transaction id" not in e.error['message'])
 
         #check if wallet or blochchain maintenance changes the balance

From fa2cea163b49a97e2a18aa125e41170d60ce59cc Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Sun, 20 Mar 2016 18:18:32 +0100
Subject: [PATCH 0072/1802] [qa] rpc-tests: Properly use integers, floats

---
 qa/rpc-tests/bip65-cltv-p2p.py            |  2 +-
 qa/rpc-tests/bip68-sequence.py            |  6 +--
 qa/rpc-tests/bip9-softforks.py            |  2 +-
 qa/rpc-tests/bipdersig-p2p.py             |  2 +-
 qa/rpc-tests/fundrawtransaction.py        |  2 +-
 qa/rpc-tests/listtransactions.py          |  2 +-
 qa/rpc-tests/maxuploadtarget.py           |  2 +-
 qa/rpc-tests/p2p-acceptblock.py           |  2 +-
 qa/rpc-tests/p2p-fullblocktest.py         |  4 +-
 qa/rpc-tests/pruning.py                   |  6 +--
 qa/rpc-tests/replace-by-fee.py            | 50 +++++++++++------------
 qa/rpc-tests/smartfees.py                 |  2 +-
 qa/rpc-tests/test_framework/blocktools.py |  2 +-
 qa/rpc-tests/test_framework/mininode.py   |  4 +-
 qa/rpc-tests/test_framework/netutil.py    |  2 +-
 15 files changed, 45 insertions(+), 45 deletions(-)

diff --git a/qa/rpc-tests/bip65-cltv-p2p.py b/qa/rpc-tests/bip65-cltv-p2p.py
index 316c5fe0904cc..54559c3541f2e 100755
--- a/qa/rpc-tests/bip65-cltv-p2p.py
+++ b/qa/rpc-tests/bip65-cltv-p2p.py
@@ -70,7 +70,7 @@ def get_tests(self):
         height = 3  # height of the next block to build
         self.tip = int ("0x" + self.nodes[0].getbestblockhash() + "L", 0)
         self.nodeaddress = self.nodes[0].getnewaddress()
-        self.last_block_time = time.time()
+        self.last_block_time = int(time.time())
 
         ''' 98 more version 3 blocks '''
         test_blocks = []
diff --git a/qa/rpc-tests/bip68-sequence.py b/qa/rpc-tests/bip68-sequence.py
index 84f941da33f6d..377a35b6872c7 100755
--- a/qa/rpc-tests/bip68-sequence.py
+++ b/qa/rpc-tests/bip68-sequence.py
@@ -61,7 +61,7 @@ def test_disable_flag(self):
         utxo = utxos[0]
 
         tx1 = CTransaction()
-        value = satoshi_round(utxo["amount"] - self.relayfee)*COIN
+        value = int(satoshi_round(utxo["amount"] - self.relayfee)*COIN)
 
         # Check that the disable flag disables relative locktime.
         # If sequence locks were used, this would require 1 block for the
@@ -179,8 +179,8 @@ def test_sequence_lock_confirmed_inputs(self):
                 tx.vin.append(CTxIn(COutPoint(int(utxos[j]["txid"], 16), utxos[j]["vout"]), nSequence=sequence_value))
                 value += utxos[j]["amount"]*COIN
             # Overestimate the size of the tx - signatures should be less than 120 bytes, and leave 50 for the output
-            tx_size = len(ToHex(tx))/2 + 120*num_inputs + 50
-            tx.vout.append(CTxOut(value-self.relayfee*tx_size*COIN/1000, CScript([b'a'])))
+            tx_size = len(ToHex(tx))//2 + 120*num_inputs + 50
+            tx.vout.append(CTxOut(int(value-self.relayfee*tx_size*COIN/1000), CScript([b'a'])))
             rawtx = self.nodes[0].signrawtransaction(ToHex(tx))["hex"]
 
             try:
diff --git a/qa/rpc-tests/bip9-softforks.py b/qa/rpc-tests/bip9-softforks.py
index 445c04494442a..98975e719335c 100755
--- a/qa/rpc-tests/bip9-softforks.py
+++ b/qa/rpc-tests/bip9-softforks.py
@@ -91,7 +91,7 @@ def test_BIP(self, bipName, activated_version, invalidate, invalidatePostSignatu
         self.height = 3  # height of the next block to build
         self.tip = int ("0x" + self.nodes[0].getbestblockhash() + "L", 0)
         self.nodeaddress = self.nodes[0].getnewaddress()
-        self.last_block_time = time.time()
+        self.last_block_time = int(time.time())
 
         assert_equal(self.get_bip9_status(bipName)['status'], 'defined')
 
diff --git a/qa/rpc-tests/bipdersig-p2p.py b/qa/rpc-tests/bipdersig-p2p.py
index f0d81a6f441c0..95be385d93fb0 100755
--- a/qa/rpc-tests/bipdersig-p2p.py
+++ b/qa/rpc-tests/bipdersig-p2p.py
@@ -78,7 +78,7 @@ def get_tests(self):
         height = 3  # height of the next block to build
         self.tip = int ("0x" + self.nodes[0].getbestblockhash() + "L", 0)
         self.nodeaddress = self.nodes[0].getnewaddress()
-        self.last_block_time = time.time()
+        self.last_block_time = int(time.time())
 
         ''' 98 more version 2 blocks '''
         test_blocks = []
diff --git a/qa/rpc-tests/fundrawtransaction.py b/qa/rpc-tests/fundrawtransaction.py
index 82f2f4f5c52b8..82c9e48a49735 100755
--- a/qa/rpc-tests/fundrawtransaction.py
+++ b/qa/rpc-tests/fundrawtransaction.py
@@ -48,7 +48,7 @@ def run_test(self):
 
         watchonly_address = self.nodes[0].getnewaddress()
         watchonly_pubkey = self.nodes[0].validateaddress(watchonly_address)["pubkey"]
-        watchonly_amount = 200
+        watchonly_amount = Decimal(200)
         self.nodes[3].importpubkey(watchonly_pubkey, "", True)
         watchonly_txid = self.nodes[0].sendtoaddress(watchonly_address, watchonly_amount)
         self.nodes[0].sendtoaddress(self.nodes[3].getnewaddress(), watchonly_amount / 10)
diff --git a/qa/rpc-tests/listtransactions.py b/qa/rpc-tests/listtransactions.py
index c4eca519b7cf9..8fe72d95d1d0d 100755
--- a/qa/rpc-tests/listtransactions.py
+++ b/qa/rpc-tests/listtransactions.py
@@ -192,7 +192,7 @@ def get_unconfirmed_utxo_entry(node, txid_to_match):
 
         # Replace tx3, and check that tx4 becomes unknown
         tx3_b = tx3_modified
-        tx3_b.vout[0].nValue -= 0.004 * COIN # bump the fee
+        tx3_b.vout[0].nValue -= int(Decimal("0.004") * COIN) # bump the fee
         tx3_b = binascii.hexlify(tx3_b.serialize()).decode('utf-8')
         tx3_b_signed = self.nodes[0].signrawtransaction(tx3_b)['hex']
         txid_3b = self.nodes[0].sendrawtransaction(tx3_b_signed, True)
diff --git a/qa/rpc-tests/maxuploadtarget.py b/qa/rpc-tests/maxuploadtarget.py
index e4127500cd89b..be45fecb5b32a 100755
--- a/qa/rpc-tests/maxuploadtarget.py
+++ b/qa/rpc-tests/maxuploadtarget.py
@@ -177,7 +177,7 @@ def run_test(self):
         max_bytes_per_day = 200*1024*1024
         daily_buffer = 144 * MAX_BLOCK_SIZE
         max_bytes_available = max_bytes_per_day - daily_buffer
-        success_count = max_bytes_available / old_block_size
+        success_count = max_bytes_available // old_block_size
 
         # 144MB will be reserved for relaying new blocks, so expect this to
         # succeed for ~70 tries.
diff --git a/qa/rpc-tests/p2p-acceptblock.py b/qa/rpc-tests/p2p-acceptblock.py
index bf355780c19c4..e429fcc5fe9d4 100755
--- a/qa/rpc-tests/p2p-acceptblock.py
+++ b/qa/rpc-tests/p2p-acceptblock.py
@@ -150,7 +150,7 @@ def run_test(self):
         # 2. Send one block that builds on each tip.
         # This should be accepted.
         blocks_h2 = []  # the height 2 blocks on each node's chain
-        block_time = time.time() + 1
+        block_time = int(time.time()) + 1
         for i in xrange(2):
             blocks_h2.append(create_block(tips[i], create_coinbase(2), block_time))
             blocks_h2[i].solve()
diff --git a/qa/rpc-tests/p2p-fullblocktest.py b/qa/rpc-tests/p2p-fullblocktest.py
index b1e8ca53ee1cf..131350c98ddf0 100755
--- a/qa/rpc-tests/p2p-fullblocktest.py
+++ b/qa/rpc-tests/p2p-fullblocktest.py
@@ -269,7 +269,7 @@ def update_block(block_number, new_transactions):
         #                      \-> b3 (1) -> b4 (2)
         
         # Test that a block with a lot of checksigs is okay
-        lots_of_checksigs = CScript([OP_CHECKSIG] * (1000000 / 50 - 1))
+        lots_of_checksigs = CScript([OP_CHECKSIG] * (1000000 // 50 - 1))
         tip(13)
         block(15, spend=out5, script=lots_of_checksigs)
         yield accepted()
@@ -277,7 +277,7 @@ def update_block(block_number, new_transactions):
 
         # Test that a block with too many checksigs is rejected
         out6 = get_spendable_output()
-        too_many_checksigs = CScript([OP_CHECKSIG] * (1000000 / 50))
+        too_many_checksigs = CScript([OP_CHECKSIG] * (1000000 // 50))
         block(16, spend=out6, script=too_many_checksigs)
         yield rejected(RejectResult(16, 'bad-blk-sigops'))
 
diff --git a/qa/rpc-tests/pruning.py b/qa/rpc-tests/pruning.py
index b0f4b88aee551..dd2adea950f23 100755
--- a/qa/rpc-tests/pruning.py
+++ b/qa/rpc-tests/pruning.py
@@ -15,7 +15,7 @@
 from test_framework.util import *
 
 def calc_usage(blockdir):
-    return sum(os.path.getsize(blockdir+f) for f in os.listdir(blockdir) if os.path.isfile(blockdir+f))/(1024*1024)
+    return sum(os.path.getsize(blockdir+f) for f in os.listdir(blockdir) if os.path.isfile(blockdir+f)) / (1024. * 1024.)
 
 class PruneTest(BitcoinTestFramework):
 
@@ -56,7 +56,7 @@ def create_big_chain(self):
         self.nodes[1].generate(200)
         sync_blocks(self.nodes[0:2])
         self.nodes[0].generate(150)
-        # Then mine enough full blocks to create more than 550MB of data
+        # Then mine enough full blocks to create more than 550MiB of data
         for i in xrange(645):
             self.mine_full_block(self.nodes[0], self.address[0])
 
@@ -66,7 +66,7 @@ def test_height_min(self):
         if not os.path.isfile(self.prunedir+"blk00000.dat"):
             raise AssertionError("blk00000.dat is missing, pruning too early")
         print "Success"
-        print "Though we're already using more than 550MB, current usage:", calc_usage(self.prunedir)
+        print "Though we're already using more than 550MiB, current usage:", calc_usage(self.prunedir)
         print "Mining 25 more blocks should cause the first block file to be pruned"
         # Pruning doesn't run until we're allocating another chunk, 20 full blocks past the height cutoff will ensure this
         for i in xrange(25):
diff --git a/qa/rpc-tests/replace-by-fee.py b/qa/rpc-tests/replace-by-fee.py
index eded24f405395..b951900c4dbd9 100755
--- a/qa/rpc-tests/replace-by-fee.py
+++ b/qa/rpc-tests/replace-by-fee.py
@@ -119,7 +119,7 @@ def run_test(self):
 
     def test_simple_doublespend(self):
         """Simple doublespend"""
-        tx0_outpoint = make_utxo(self.nodes[0], 1.1*COIN)
+        tx0_outpoint = make_utxo(self.nodes[0], int(1.1*COIN))
 
         tx1a = CTransaction()
         tx1a.vin = [CTxIn(tx0_outpoint, nSequence=0)]
@@ -143,7 +143,7 @@ def test_simple_doublespend(self):
         # Extra 0.1 BTC fee
         tx1b = CTransaction()
         tx1b.vin = [CTxIn(tx0_outpoint, nSequence=0)]
-        tx1b.vout = [CTxOut(0.9*COIN, CScript([b'b']))]
+        tx1b.vout = [CTxOut(int(0.9*COIN), CScript([b'b']))]
         tx1b_hex = txToHex(tx1b)
         tx1b_txid = self.nodes[0].sendrawtransaction(tx1b_hex, True)
 
@@ -235,7 +235,7 @@ def branch(prevout, initial_value, max_txs, tree_width=5, fee=0.0001*COIN, _tota
                                   _total_txs=_total_txs):
                     yield x
 
-        fee = 0.0001*COIN
+        fee = int(0.0001*COIN)
         n = MAX_REPLACEMENT_LIMIT
         tree_txs = list(branch(tx0_outpoint, initial_nValue, n, fee=fee))
         assert_equal(len(tree_txs), n)
@@ -268,7 +268,7 @@ def branch(prevout, initial_value, max_txs, tree_width=5, fee=0.0001*COIN, _tota
         # Try again, but with more total transactions than the "max txs
         # double-spent at once" anti-DoS limit.
         for n in (MAX_REPLACEMENT_LIMIT+1, MAX_REPLACEMENT_LIMIT*2):
-            fee = 0.0001*COIN
+            fee = int(0.0001*COIN)
             tx0_outpoint = make_utxo(self.nodes[0], initial_nValue)
             tree_txs = list(branch(tx0_outpoint, initial_nValue, n, fee=fee))
             assert_equal(len(tree_txs), n)
@@ -291,7 +291,7 @@ def branch(prevout, initial_value, max_txs, tree_width=5, fee=0.0001*COIN, _tota
 
     def test_replacement_feeperkb(self):
         """Replacement requires fee-per-KB to be higher"""
-        tx0_outpoint = make_utxo(self.nodes[0], 1.1*COIN)
+        tx0_outpoint = make_utxo(self.nodes[0], int(1.1*COIN))
 
         tx1a = CTransaction()
         tx1a.vin = [CTxIn(tx0_outpoint, nSequence=0)]
@@ -303,7 +303,7 @@ def test_replacement_feeperkb(self):
         # rejected.
         tx1b = CTransaction()
         tx1b.vin = [CTxIn(tx0_outpoint, nSequence=0)]
-        tx1b.vout = [CTxOut(0.001*COIN, CScript([b'a'*999000]))]
+        tx1b.vout = [CTxOut(int(0.001*COIN), CScript([b'a'*999000]))]
         tx1b_hex = txToHex(tx1b)
 
         try:
@@ -315,12 +315,12 @@ def test_replacement_feeperkb(self):
 
     def test_spends_of_conflicting_outputs(self):
         """Replacements that spend conflicting tx outputs are rejected"""
-        utxo1 = make_utxo(self.nodes[0], 1.2*COIN)
-        utxo2 = make_utxo(self.nodes[0], 3.0*COIN)
+        utxo1 = make_utxo(self.nodes[0], int(1.2*COIN))
+        utxo2 = make_utxo(self.nodes[0], 3*COIN)
 
         tx1a = CTransaction()
         tx1a.vin = [CTxIn(utxo1, nSequence=0)]
-        tx1a.vout = [CTxOut(1.1*COIN, CScript([b'a']))]
+        tx1a.vout = [CTxOut(int(1.1*COIN), CScript([b'a']))]
         tx1a_hex = txToHex(tx1a)
         tx1a_txid = self.nodes[0].sendrawtransaction(tx1a_hex, True)
 
@@ -343,7 +343,7 @@ def test_spends_of_conflicting_outputs(self):
         # Spend tx1a's output to test the indirect case.
         tx1b = CTransaction()
         tx1b.vin = [CTxIn(COutPoint(tx1a_txid, 0), nSequence=0)]
-        tx1b.vout = [CTxOut(1.0*COIN, CScript([b'a']))]
+        tx1b.vout = [CTxOut(1*COIN, CScript([b'a']))]
         tx1b_hex = txToHex(tx1b)
         tx1b_txid = self.nodes[0].sendrawtransaction(tx1b_hex, True)
         tx1b_txid = int(tx1b_txid, 16)
@@ -363,12 +363,12 @@ def test_spends_of_conflicting_outputs(self):
 
     def test_new_unconfirmed_inputs(self):
         """Replacements that add new unconfirmed inputs are rejected"""
-        confirmed_utxo = make_utxo(self.nodes[0], 1.1*COIN)
-        unconfirmed_utxo = make_utxo(self.nodes[0], 0.1*COIN, False)
+        confirmed_utxo = make_utxo(self.nodes[0], int(1.1*COIN))
+        unconfirmed_utxo = make_utxo(self.nodes[0], int(0.1*COIN), False)
 
         tx1 = CTransaction()
         tx1.vin = [CTxIn(confirmed_utxo)]
-        tx1.vout = [CTxOut(1.0*COIN, CScript([b'a']))]
+        tx1.vout = [CTxOut(1*COIN, CScript([b'a']))]
         tx1_hex = txToHex(tx1)
         tx1_txid = self.nodes[0].sendrawtransaction(tx1_hex, True)
 
@@ -392,7 +392,7 @@ def test_too_many_replacements(self):
         # Start by creating a single transaction with many outputs
         initial_nValue = 10*COIN
         utxo = make_utxo(self.nodes[0], initial_nValue)
-        fee = 0.0001*COIN
+        fee = int(0.0001*COIN)
         split_value = int((initial_nValue-fee)/(MAX_REPLACEMENT_LIMIT+1))
         actual_fee = initial_nValue - split_value*(MAX_REPLACEMENT_LIMIT+1)
 
@@ -445,7 +445,7 @@ def test_too_many_replacements(self):
 
     def test_opt_in(self):
         """ Replacing should only work if orig tx opted in """
-        tx0_outpoint = make_utxo(self.nodes[0], 1.1*COIN)
+        tx0_outpoint = make_utxo(self.nodes[0], int(1.1*COIN))
 
         # Create a non-opting in transaction
         tx1a = CTransaction()
@@ -457,7 +457,7 @@ def test_opt_in(self):
         # Shouldn't be able to double-spend
         tx1b = CTransaction()
         tx1b.vin = [CTxIn(tx0_outpoint, nSequence=0)]
-        tx1b.vout = [CTxOut(0.9*COIN, CScript([b'b']))]
+        tx1b.vout = [CTxOut(int(0.9*COIN), CScript([b'b']))]
         tx1b_hex = txToHex(tx1b)
 
         try:
@@ -468,7 +468,7 @@ def test_opt_in(self):
             print tx1b_txid
             assert(False)
 
-        tx1_outpoint = make_utxo(self.nodes[0], 1.1*COIN)
+        tx1_outpoint = make_utxo(self.nodes[0], int(1.1*COIN))
 
         # Create a different non-opting in transaction
         tx2a = CTransaction()
@@ -480,7 +480,7 @@ def test_opt_in(self):
         # Still shouldn't be able to double-spend
         tx2b = CTransaction()
         tx2b.vin = [CTxIn(tx1_outpoint, nSequence=0)]
-        tx2b.vout = [CTxOut(0.9*COIN, CScript([b'b']))]
+        tx2b.vout = [CTxOut(int(0.9*COIN), CScript([b'b']))]
         tx2b_hex = txToHex(tx2b)
 
         try:
@@ -500,19 +500,19 @@ def test_opt_in(self):
         tx3a = CTransaction()
         tx3a.vin = [CTxIn(COutPoint(tx1a_txid, 0), nSequence=0xffffffff),
                     CTxIn(COutPoint(tx2a_txid, 0), nSequence=0xfffffffd)]
-        tx3a.vout = [CTxOut(0.9*COIN, CScript([b'c'])), CTxOut(0.9*COIN, CScript([b'd']))]
+        tx3a.vout = [CTxOut(int(0.9*COIN), CScript([b'c'])), CTxOut(int(0.9*COIN), CScript([b'd']))]
         tx3a_hex = txToHex(tx3a)
 
         self.nodes[0].sendrawtransaction(tx3a_hex, True)
 
         tx3b = CTransaction()
         tx3b.vin = [CTxIn(COutPoint(tx1a_txid, 0), nSequence=0)]
-        tx3b.vout = [CTxOut(0.5*COIN, CScript([b'e']))]
+        tx3b.vout = [CTxOut(int(0.5*COIN), CScript([b'e']))]
         tx3b_hex = txToHex(tx3b)
 
         tx3c = CTransaction()
         tx3c.vin = [CTxIn(COutPoint(tx2a_txid, 0), nSequence=0)]
-        tx3c.vout = [CTxOut(0.5*COIN, CScript([b'f']))]
+        tx3c.vout = [CTxOut(int(0.5*COIN), CScript([b'f']))]
         tx3c_hex = txToHex(tx3c)
 
         self.nodes[0].sendrawtransaction(tx3b_hex, True)
@@ -525,7 +525,7 @@ def test_prioritised_transactions(self):
         # correctly used by replacement logic
 
         # 1. Check that feeperkb uses modified fees
-        tx0_outpoint = make_utxo(self.nodes[0], 1.1*COIN)
+        tx0_outpoint = make_utxo(self.nodes[0], int(1.1*COIN))
 
         tx1a = CTransaction()
         tx1a.vin = [CTxIn(tx0_outpoint, nSequence=0)]
@@ -536,7 +536,7 @@ def test_prioritised_transactions(self):
         # Higher fee, but the actual fee per KB is much lower.
         tx1b = CTransaction()
         tx1b.vin = [CTxIn(tx0_outpoint, nSequence=0)]
-        tx1b.vout = [CTxOut(0.001*COIN, CScript([b'a'*740000]))]
+        tx1b.vout = [CTxOut(int(0.001*COIN), CScript([b'a'*740000]))]
         tx1b_hex = txToHex(tx1b)
 
         # Verify tx1b cannot replace tx1a.
@@ -556,7 +556,7 @@ def test_prioritised_transactions(self):
         assert(tx1b_txid in self.nodes[0].getrawmempool())
 
         # 2. Check that absolute fee checks use modified fee.
-        tx1_outpoint = make_utxo(self.nodes[0], 1.1*COIN)
+        tx1_outpoint = make_utxo(self.nodes[0], int(1.1*COIN))
 
         tx2a = CTransaction()
         tx2a.vin = [CTxIn(tx1_outpoint, nSequence=0)]
@@ -567,7 +567,7 @@ def test_prioritised_transactions(self):
         # Lower fee, but we'll prioritise it
         tx2b = CTransaction()
         tx2b.vin = [CTxIn(tx1_outpoint, nSequence=0)]
-        tx2b.vout = [CTxOut(1.01*COIN, CScript([b'a']))]
+        tx2b.vout = [CTxOut(int(1.01*COIN), CScript([b'a']))]
         tx2b.rehash()
         tx2b_hex = txToHex(tx2b)
 
diff --git a/qa/rpc-tests/smartfees.py b/qa/rpc-tests/smartfees.py
index 6274cd05301e6..2c064ad8a03a9 100755
--- a/qa/rpc-tests/smartfees.py
+++ b/qa/rpc-tests/smartfees.py
@@ -219,7 +219,7 @@ def transact_and_mine(self, numblocks, mining_node):
                 from_index = random.randint(1,2)
                 (txhex, fee) = small_txpuzzle_randfee(self.nodes[from_index], self.confutxo,
                                                       self.memutxo, Decimal("0.005"), min_fee, min_fee)
-                tx_kbytes = (len(txhex)/2)/1000.0
+                tx_kbytes = (len(txhex) // 2) / 1000.0
                 self.fees_per_kb.append(float(fee)/tx_kbytes)
             sync_mempools(self.nodes[0:3],.1)
             mined = mining_node.getblock(mining_node.generate(1)[0],True)["tx"]
diff --git a/qa/rpc-tests/test_framework/blocktools.py b/qa/rpc-tests/test_framework/blocktools.py
index 425e6dcdde419..afa0f5f9ba5ec 100644
--- a/qa/rpc-tests/test_framework/blocktools.py
+++ b/qa/rpc-tests/test_framework/blocktools.py
@@ -29,7 +29,7 @@ def serialize_script_num(value):
     neg = value < 0
     absvalue = -value if neg else value
     while (absvalue):
-        r.append(chr(absvalue & 0xff))
+        r.append(int(absvalue & 0xff))
         absvalue >>= 8
     if r[-1] & 0x80:
         r.append(0x80 if neg else 0)
diff --git a/qa/rpc-tests/test_framework/mininode.py b/qa/rpc-tests/test_framework/mininode.py
index 07d1827dfe285..0c40730f9005e 100755
--- a/qa/rpc-tests/test_framework/mininode.py
+++ b/qa/rpc-tests/test_framework/mininode.py
@@ -641,7 +641,7 @@ class msg_version(object):
     def __init__(self):
         self.nVersion = MY_VERSION
         self.nServices = 1
-        self.nTime = time.time()
+        self.nTime = int(time.time())
         self.addrTo = CAddress()
         self.addrFrom = CAddress()
         self.nNonce = random.getrandbits(64)
@@ -986,7 +986,7 @@ class msg_reject(object):
 
     def __init__(self):
         self.message = ""
-        self.code = ""
+        self.code = 0
         self.reason = ""
         self.data = 0L
 
diff --git a/qa/rpc-tests/test_framework/netutil.py b/qa/rpc-tests/test_framework/netutil.py
index 50daa8793732a..4e4c81d397199 100644
--- a/qa/rpc-tests/test_framework/netutil.py
+++ b/qa/rpc-tests/test_framework/netutil.py
@@ -45,7 +45,7 @@ def _convert_ip_port(array):
     # convert host from mangled-per-four-bytes form as used by kernel
     host = binascii.unhexlify(host)
     host_out = ''
-    for x in range(0, len(host)/4):
+    for x in range(0, len(host) // 4):
         (val,) = struct.unpack('=I', host[x*4:(x+1)*4])
         host_out += '%08x' % val
 

From faaa3c9b6546d9a64cece4ff0223f0b167feb6ff Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Thu, 31 Mar 2016 18:33:15 +0200
Subject: [PATCH 0073/1802] [qa] mininode: Catch exceptions in got_data

---
 qa/rpc-tests/test_framework/mininode.py | 75 +++++++++++++------------
 1 file changed, 39 insertions(+), 36 deletions(-)

diff --git a/qa/rpc-tests/test_framework/mininode.py b/qa/rpc-tests/test_framework/mininode.py
index 0c40730f9005e..b06905301f4a8 100755
--- a/qa/rpc-tests/test_framework/mininode.py
+++ b/qa/rpc-tests/test_framework/mininode.py
@@ -1252,43 +1252,46 @@ def handle_write(self):
             self.sendbuf = self.sendbuf[sent:]
 
     def got_data(self):
-        while True:
-            if len(self.recvbuf) < 4:
-                return
-            if self.recvbuf[:4] != self.MAGIC_BYTES[self.network]:
-                raise ValueError("got garbage %s" % repr(self.recvbuf))
-            if self.ver_recv < 209:
-                if len(self.recvbuf) < 4 + 12 + 4:
-                    return
-                command = self.recvbuf[4:4+12].split("\x00", 1)[0]
-                msglen = struct.unpack("<i", self.recvbuf[4+12:4+12+4])[0]
-                checksum = None
-                if len(self.recvbuf) < 4 + 12 + 4 + msglen:
-                    return
-                msg = self.recvbuf[4+12+4:4+12+4+msglen]
-                self.recvbuf = self.recvbuf[4+12+4+msglen:]
-            else:
-                if len(self.recvbuf) < 4 + 12 + 4 + 4:
-                    return
-                command = self.recvbuf[4:4+12].split("\x00", 1)[0]
-                msglen = struct.unpack("<i", self.recvbuf[4+12:4+12+4])[0]
-                checksum = self.recvbuf[4+12+4:4+12+4+4]
-                if len(self.recvbuf) < 4 + 12 + 4 + 4 + msglen:
+        try:
+            while True:
+                if len(self.recvbuf) < 4:
                     return
-                msg = self.recvbuf[4+12+4+4:4+12+4+4+msglen]
-                th = sha256(msg)
-                h = sha256(th)
-                if checksum != h[:4]:
-                    raise ValueError("got bad checksum " + repr(self.recvbuf))
-                self.recvbuf = self.recvbuf[4+12+4+4+msglen:]
-            if command in self.messagemap:
-                f = BytesIO(msg)
-                t = self.messagemap[command]()
-                t.deserialize(f)
-                self.got_message(t)
-            else:
-                self.show_debug_msg("Unknown command: '" + command + "' " +
-                                    repr(msg))
+                if self.recvbuf[:4] != self.MAGIC_BYTES[self.network]:
+                    raise ValueError("got garbage %s" % repr(self.recvbuf))
+                if self.ver_recv < 209:
+                    if len(self.recvbuf) < 4 + 12 + 4:
+                        return
+                    command = self.recvbuf[4:4+12].split("\x00", 1)[0]
+                    msglen = struct.unpack("<i", self.recvbuf[4+12:4+12+4])[0]
+                    checksum = None
+                    if len(self.recvbuf) < 4 + 12 + 4 + msglen:
+                        return
+                    msg = self.recvbuf[4+12+4:4+12+4+msglen]
+                    self.recvbuf = self.recvbuf[4+12+4+msglen:]
+                else:
+                    if len(self.recvbuf) < 4 + 12 + 4 + 4:
+                        return
+                    command = self.recvbuf[4:4+12].split("\x00", 1)[0]
+                    msglen = struct.unpack("<i", self.recvbuf[4+12:4+12+4])[0]
+                    checksum = self.recvbuf[4+12+4:4+12+4+4]
+                    if len(self.recvbuf) < 4 + 12 + 4 + 4 + msglen:
+                        return
+                    msg = self.recvbuf[4+12+4+4:4+12+4+4+msglen]
+                    th = sha256(msg)
+                    h = sha256(th)
+                    if checksum != h[:4]:
+                        raise ValueError("got bad checksum " + repr(self.recvbuf))
+                    self.recvbuf = self.recvbuf[4+12+4+4+msglen:]
+                if command in self.messagemap:
+                    f = BytesIO(msg)
+                    t = self.messagemap[command]()
+                    t.deserialize(f)
+                    self.got_message(t)
+                else:
+                    self.show_debug_msg("Unknown command: '" + command + "' " +
+                                        repr(msg))
+        except Exception as e:
+            print 'got_data:', repr(e)
 
     def send_message(self, message, pushbuf=False):
         if self.state != "connected" and not pushbuf:

From a22bde94497a634bf750d0bdd4fd3227ba169d21 Mon Sep 17 00:00:00 2001
From: paveljanik <Pavel@Janik.cz>
Date: Fri, 1 Apr 2016 21:31:48 +0200
Subject: [PATCH 0074/1802] Fix typo: Optimizaton -> Optimization

---
 src/versionbits.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/versionbits.cpp b/src/versionbits.cpp
index fbb60c0fc598e..78feb8ab0c6d2 100644
--- a/src/versionbits.cpp
+++ b/src/versionbits.cpp
@@ -25,7 +25,7 @@ ThresholdState AbstractThresholdConditionChecker::GetStateFor(const CBlockIndex*
             break;
         }
         if (pindexPrev->GetMedianTimePast() < nTimeStart) {
-            // Optimizaton: don't recompute down further, as we know every earlier block will be before the start time
+            // Optimization: don't recompute down further, as we know every earlier block will be before the start time
             cache[pindexPrev] = THRESHOLD_DEFINED;
             break;
         }

From 10d3ae102afb89b3f50cd27f9ee657e5a542eb1b Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Fri, 1 Apr 2016 14:35:57 +0200
Subject: [PATCH 0075/1802] devtools: Auto-set branch to merge to in
 github-merge

As we are already using the API to retrieve the pull request
title, also retrieve the base branch.

This makes sure that pull requests for 0.12 automatically end up in
0.12, and pull requests for master automatically end up in master,
and so on.

It is still possible to override the branch from the command line
or using the `githubmerge.branch` git option.
---
 contrib/devtools/github-merge.py | 34 +++++++++++++++++++++-----------
 1 file changed, 22 insertions(+), 12 deletions(-)

diff --git a/contrib/devtools/github-merge.py b/contrib/devtools/github-merge.py
index 9a62fccbbb555..f82362fe417e3 100755
--- a/contrib/devtools/github-merge.py
+++ b/contrib/devtools/github-merge.py
@@ -47,9 +47,9 @@ def git_config_get(option, default=None):
     except subprocess.CalledProcessError as e:
         return default
 
-def retrieve_pr_title(repo,pull):
+def retrieve_pr_info(repo,pull):
     '''
-    Retrieve pull request title from github.
+    Retrieve pull request information from github.
     Return None if no title can be found, or an error happens.
     '''
     try:
@@ -57,9 +57,9 @@ def retrieve_pr_title(repo,pull):
         result = urlopen(req)
         reader = codecs.getreader('utf-8')
         obj = json.load(reader(result))
-        return obj['title']
+        return obj
     except Exception as e:
-        print('Warning: unable to retrieve pull title from github: %s' % e)
+        print('Warning: unable to retrieve pull information from github: %s' % e)
         return None
 
 def ask_prompt(text):
@@ -69,13 +69,13 @@ def ask_prompt(text):
     print("",file=stderr)
     return reply
 
-def parse_arguments(branch):
+def parse_arguments():
     epilog = '''
         In addition, you can set the following git configuration variables:
         githubmerge.repository (mandatory),
         user.signingkey (mandatory),
         githubmerge.host (default: git@github.com),
-        githubmerge.branch (default: master),
+        githubmerge.branch (no default),
         githubmerge.testcmd (default: none).
     '''
     parser = argparse.ArgumentParser(description='Utility to merge, sign and push github pull requests',
@@ -83,14 +83,14 @@ def parse_arguments(branch):
     parser.add_argument('pull', metavar='PULL', type=int, nargs=1,
         help='Pull request ID to merge')
     parser.add_argument('branch', metavar='BRANCH', type=str, nargs='?',
-        default=branch, help='Branch to merge against (default: '+branch+')')
+        default=None, help='Branch to merge against (default: githubmerge.branch setting, or base branch for pull, or \'master\')')
     return parser.parse_args()
 
 def main():
     # Extract settings from git repo
     repo = git_config_get('githubmerge.repository')
     host = git_config_get('githubmerge.host','git@github.com')
-    branch = git_config_get('githubmerge.branch','master')
+    opt_branch = git_config_get('githubmerge.branch',None)
     testcmd = git_config_get('githubmerge.testcmd')
     signingkey = git_config_get('user.signingkey')
     if repo is None:
@@ -105,9 +105,20 @@ def main():
     host_repo = host+":"+repo # shortcut for push/pull target
 
     # Extract settings from command line
-    args = parse_arguments(branch)
+    args = parse_arguments()
     pull = str(args.pull[0])
-    branch = args.branch
+
+    # Receive pull information from github
+    info = retrieve_pr_info(repo,pull)
+    if info is None:
+        exit(1)
+    title = info['title']
+    # precedence order for destination branch argument:
+    #   - command line argument
+    #   - githubmerge.branch setting
+    #   - base branch for pull (as retrieved from github)
+    #   - 'master'
+    branch = args.branch or opt_branch or info['base']['ref'] or 'master'
 
     # Initialize source branches
     head_branch = 'pull/'+pull+'/head'
@@ -147,7 +158,6 @@ def main():
 
     try:
         # Create unsigned merge commit.
-        title = retrieve_pr_title(repo,pull)
         if title:
             firstline = 'Merge #%s: %s' % (pull,title)
         else:
@@ -165,7 +175,7 @@ def main():
             print("ERROR: Creating merge failed (already merged?).",file=stderr)
             exit(4)
 
-        print('%s#%s%s %s' % (ATTR_RESET+ATTR_PR,pull,ATTR_RESET,title))
+        print('%s#%s%s %s %sinto %s%s' % (ATTR_RESET+ATTR_PR,pull,ATTR_RESET,title,ATTR_RESET+ATTR_PR,branch,ATTR_RESET))
         subprocess.check_call([GIT,'log','--graph','--topo-order','--pretty=format:'+COMMIT_FORMAT,base_branch+'..'+head_branch])
         print()
         # Run test command if configured.

From 444480649f08e6037f8ac178224b30a82e9ad72e Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Sat, 2 Apr 2016 11:51:49 +0200
Subject: [PATCH 0076/1802] [qa] mininode: Combine struct.pack format strings

---
 qa/rpc-tests/test_framework/mininode.py | 30 ++++++++++++-------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/qa/rpc-tests/test_framework/mininode.py b/qa/rpc-tests/test_framework/mininode.py
index b06905301f4a8..53f5e8805aa77 100755
--- a/qa/rpc-tests/test_framework/mininode.py
+++ b/qa/rpc-tests/test_framework/mininode.py
@@ -78,10 +78,10 @@ def ser_string(s):
     if len(s) < 253:
         return struct.pack("B", len(s)) + s
     elif len(s) < 0x10000:
-        return struct.pack("B", 253) + struct.pack("<H", len(s)) + s
+        return struct.pack("<BH", 253, len(s)) + s
     elif len(s) < 0x100000000L:
-        return struct.pack("B", 254) + struct.pack("<I", len(s)) + s
-    return struct.pack("B", 255) + struct.pack("<Q", len(s)) + s
+        return struct.pack("<BI", 254, len(s)) + s
+    return struct.pack("<BQ", 255, len(s)) + s
 
 
 def deser_uint256(f):
@@ -135,11 +135,11 @@ def ser_vector(l):
     if len(l) < 253:
         r = struct.pack("B", len(l))
     elif len(l) < 0x10000:
-        r = struct.pack("B", 253) + struct.pack("<H", len(l))
+        r = struct.pack("<BH", 253, len(l))
     elif len(l) < 0x100000000L:
-        r = struct.pack("B", 254) + struct.pack("<I", len(l))
+        r = struct.pack("<BI", 254, len(l))
     else:
-        r = struct.pack("B", 255) + struct.pack("<Q", len(l))
+        r = struct.pack("<BQ", 255, len(l))
     for i in l:
         r += i.serialize()
     return r
@@ -165,11 +165,11 @@ def ser_uint256_vector(l):
     if len(l) < 253:
         r = struct.pack("B", len(l))
     elif len(l) < 0x10000:
-        r = struct.pack("B", 253) + struct.pack("<H", len(l))
+        r = struct.pack("<BH", 253, len(l))
     elif len(l) < 0x100000000L:
-        r = struct.pack("B", 254) + struct.pack("<I", len(l))
+        r = struct.pack("<BI", 254, len(l))
     else:
-        r = struct.pack("B", 255) + struct.pack("<Q", len(l))
+        r = struct.pack("<BQ", 255, len(l))
     for i in l:
         r += ser_uint256(i)
     return r
@@ -195,11 +195,11 @@ def ser_string_vector(l):
     if len(l) < 253:
         r = struct.pack("B", len(l))
     elif len(l) < 0x10000:
-        r = struct.pack("B", 253) + struct.pack("<H", len(l))
+        r = struct.pack("<BH", 253, len(l))
     elif len(l) < 0x100000000L:
-        r = struct.pack("B", 254) + struct.pack("<I", len(l))
+        r = struct.pack("<BI", 254, len(l))
     else:
-        r = struct.pack("B", 255) + struct.pack("<Q", len(l))
+        r = struct.pack("<BQ", 255, len(l))
     for sv in l:
         r += ser_string(sv)
     return r
@@ -225,11 +225,11 @@ def ser_int_vector(l):
     if len(l) < 253:
         r = struct.pack("B", len(l))
     elif len(l) < 0x10000:
-        r = struct.pack("B", 253) + struct.pack("<H", len(l))
+        r = struct.pack("<BH", 253, len(l))
     elif len(l) < 0x100000000L:
-        r = struct.pack("B", 254) + struct.pack("<I", len(l))
+        r = struct.pack("<BI", 254, len(l))
     else:
-        r = struct.pack("B", 255) + struct.pack("<Q", len(l))
+        r = struct.pack("<BQ", 255, len(l))
     for i in l:
         r += struct.pack("<i", i)
     return r

From fabbf80f2f956e056e423f24318e9157367ff569 Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Mon, 21 Mar 2016 18:29:17 +0100
Subject: [PATCH 0077/1802] [ui] Move InitError, InitWarning, AmountErrMsg

---
 src/Makefile.am           |  1 +
 src/init.cpp              | 18 ------------
 src/test/test_bitcoin.cpp |  2 --
 src/ui_interface.cpp      | 24 +++++++++++++++
 src/ui_interface.h        |  8 +++++
 src/wallet/wallet.cpp     | 61 +++++++++++++++------------------------
 6 files changed, 56 insertions(+), 58 deletions(-)
 create mode 100644 src/ui_interface.cpp

diff --git a/src/Makefile.am b/src/Makefile.am
index 1e54512cbddc1..10aa550a02bef 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -323,6 +323,7 @@ libbitcoin_util_a_SOURCES = \
   rpc/protocol.cpp \
   support/cleanse.cpp \
   sync.cpp \
+  ui_interface.cpp \
   util.cpp \
   utilmoneystr.cpp \
   utilstrencodings.cpp \
diff --git a/src/init.cpp b/src/init.cpp
index 3667820a21fe6..038b28cc3a574 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -94,7 +94,6 @@ enum BindFlags {
 };
 
 static const char* FEE_ESTIMATES_FILENAME="fee_estimates.dat";
-CClientUIInterface uiInterface; // Declared but not defined in ui_interface.h
 
 //////////////////////////////////////////////////////////////////////////////
 //
@@ -266,18 +265,6 @@ void HandleSIGHUP(int)
     fReopenDebugLog = true;
 }
 
-bool static InitError(const std::string &str)
-{
-    uiInterface.ThreadSafeMessageBox(str, "", CClientUIInterface::MSG_ERROR);
-    return false;
-}
-
-bool static InitWarning(const std::string &str)
-{
-    uiInterface.ThreadSafeMessageBox(str, "", CClientUIInterface::MSG_WARNING);
-    return true;
-}
-
 bool static Bind(const CService &addr, unsigned int flags) {
     if (!(flags & BF_EXPLICIT) && IsLimited(addr))
         return false;
@@ -742,11 +729,6 @@ static std::string ResolveErrMsg(const char * const optname, const std::string&
     return strprintf(_("Cannot resolve -%s address: '%s'"), optname, strBind);
 }
 
-static std::string AmountErrMsg(const char * const optname, const std::string& strValue)
-{
-    return strprintf(_("Invalid amount for -%s=<amount>: '%s'"), optname, strValue);
-}
-
 void InitLogging()
 {
     fPrintToConsole = GetBoolArg("-printtoconsole", false);
diff --git a/src/test/test_bitcoin.cpp b/src/test/test_bitcoin.cpp
index 97b99962527e6..730f04f97faf9 100644
--- a/src/test/test_bitcoin.cpp
+++ b/src/test/test_bitcoin.cpp
@@ -30,8 +30,6 @@
 #include <boost/test/unit_test.hpp>
 #include <boost/thread.hpp>
 
-CClientUIInterface uiInterface; // Declared but not defined in ui_interface.h
-
 extern bool fPrintToConsole;
 extern void noui_connect();
 
diff --git a/src/ui_interface.cpp b/src/ui_interface.cpp
new file mode 100644
index 0000000000000..c778e40a9053a
--- /dev/null
+++ b/src/ui_interface.cpp
@@ -0,0 +1,24 @@
+// Copyright (c) 2010-2016 The Bitcoin Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#include "ui_interface.h"
+#include "util.h"
+
+CClientUIInterface uiInterface;
+
+bool InitError(const std::string& str)
+{
+    uiInterface.ThreadSafeMessageBox(str, "", CClientUIInterface::MSG_ERROR);
+    return false;
+}
+
+void InitWarning(const std::string& str)
+{
+    uiInterface.ThreadSafeMessageBox(str, "", CClientUIInterface::MSG_WARNING);
+}
+
+std::string AmountErrMsg(const char* const optname, const std::string& strValue)
+{
+    return strprintf(_("Invalid amount for -%s=<amount>: '%s'"), optname, strValue);
+}
diff --git a/src/ui_interface.h b/src/ui_interface.h
index 0b51d52e6576e..a27918c50766d 100644
--- a/src/ui_interface.h
+++ b/src/ui_interface.h
@@ -100,6 +100,14 @@ class CClientUIInterface
     boost::signals2::signal<void (void)> BannedListChanged;
 };
 
+/** Show warning message **/
+void InitWarning(const std::string& str);
+
+/** Show error message **/
+bool InitError(const std::string& str);
+
+std::string AmountErrMsg(const char* const optname, const std::string& strValue);
+
 extern CClientUIInterface uiInterface;
 
 #endif // BITCOIN_UI_INTERFACE_H
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index e8c946671044c..21d641f24720a 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -23,6 +23,7 @@
 #include "timedata.h"
 #include "txmempool.h"
 #include "util.h"
+#include "ui_interface.h"
 #include "utilmoneystr.h"
 
 #include <assert.h>
@@ -365,22 +366,6 @@ void CWallet::Flush(bool shutdown)
     bitdb.Flush(shutdown);
 }
 
-bool static UIError(const std::string &str)
-{
-    uiInterface.ThreadSafeMessageBox(str, "", CClientUIInterface::MSG_ERROR);
-    return false;
-}
-
-void static UIWarning(const std::string &str)
-{
-    uiInterface.ThreadSafeMessageBox(str, "", CClientUIInterface::MSG_WARNING);
-}
-
-static std::string AmountErrMsg(const char * const optname, const std::string& strValue)
-{
-    return strprintf(_("Invalid amount for -%s=<amount>: '%s'"), optname, strValue);
-}
-
 bool CWallet::Verify()
 {
     std::string walletFile = GetArg("-wallet", DEFAULT_WALLET_DAT);
@@ -390,7 +375,7 @@ bool CWallet::Verify()
 
     // Wallet file must be a plain filename without a directory
     if (walletFile != boost::filesystem::basename(walletFile) + boost::filesystem::extension(walletFile))
-        return UIError(strprintf(_("Wallet %s resides outside data directory %s"), walletFile, GetDataDir().string()));
+        return InitError(strprintf(_("Wallet %s resides outside data directory %s"), walletFile, GetDataDir().string()));
 
     if (!bitdb.Open(GetDataDir()))
     {
@@ -407,7 +392,7 @@ bool CWallet::Verify()
         // try again
         if (!bitdb.Open(GetDataDir())) {
             // if it still fails, it probably means we can't even create the database env
-            return UIError(strprintf(_("Error initializing wallet database environment %s!"), GetDataDir()));
+            return InitError(strprintf(_("Error initializing wallet database environment %s!"), GetDataDir()));
         }
     }
     
@@ -423,14 +408,14 @@ bool CWallet::Verify()
         CDBEnv::VerifyResult r = bitdb.Verify(walletFile, CWalletDB::Recover);
         if (r == CDBEnv::RECOVER_OK)
         {
-            UIWarning(strprintf(_("Warning: Wallet file corrupt, data salvaged!"
+            InitWarning(strprintf(_("Warning: Wallet file corrupt, data salvaged!"
                                          " Original %s saved as %s in %s; if"
                                          " your balance or transactions are incorrect you should"
                                          " restore from a backup."),
                 walletFile, "wallet.{timestamp}.bak", GetDataDir()));
         }
         if (r == CDBEnv::RECOVER_FAIL)
-            return UIError(strprintf(_("%s corrupt, salvage failed"), walletFile));
+            return InitError(strprintf(_("%s corrupt, salvage failed"), walletFile));
     }
     
     return true;
@@ -3055,7 +3040,7 @@ bool CWallet::InitLoadWallet()
         CWallet *tempWallet = new CWallet(walletFile);
         DBErrors nZapWalletRet = tempWallet->ZapWalletTx(vWtx);
         if (nZapWalletRet != DB_LOAD_OK) {
-            return UIError(strprintf(_("Error loading %s: Wallet corrupted"), walletFile));
+            return InitError(strprintf(_("Error loading %s: Wallet corrupted"), walletFile));
         }
 
         delete tempWallet;
@@ -3071,22 +3056,22 @@ bool CWallet::InitLoadWallet()
     if (nLoadWalletRet != DB_LOAD_OK)
     {
         if (nLoadWalletRet == DB_CORRUPT)
-            return UIError(strprintf(_("Error loading %s: Wallet corrupted"), walletFile));
+            return InitError(strprintf(_("Error loading %s: Wallet corrupted"), walletFile));
         else if (nLoadWalletRet == DB_NONCRITICAL_ERROR)
         {
-            UIWarning(strprintf(_("Error reading %s! All keys read correctly, but transaction data"
+            InitWarning(strprintf(_("Error reading %s! All keys read correctly, but transaction data"
                                          " or address book entries might be missing or incorrect."),
                 walletFile));
         }
         else if (nLoadWalletRet == DB_TOO_NEW)
-            return UIError(strprintf(_("Error loading %s: Wallet requires newer version of %s"),
+            return InitError(strprintf(_("Error loading %s: Wallet requires newer version of %s"),
                                walletFile, _(PACKAGE_NAME)));
         else if (nLoadWalletRet == DB_NEED_REWRITE)
         {
-            return UIError(strprintf(_("Wallet needed to be rewritten: restart %s to complete"), _(PACKAGE_NAME)));
+            return InitError(strprintf(_("Wallet needed to be rewritten: restart %s to complete"), _(PACKAGE_NAME)));
         }
         else
-            return UIError(strprintf(_("Error loading %s"), walletFile));
+            return InitError(strprintf(_("Error loading %s"), walletFile));
     }
 
     if (GetBoolArg("-upgradewallet", fFirstRun))
@@ -3102,7 +3087,7 @@ bool CWallet::InitLoadWallet()
             LogPrintf("Allowing wallet upgrade up to %i\n", nMaxVersion);
         if (nMaxVersion < walletInstance->GetVersion())
         {
-            return UIError(_("Cannot downgrade wallet"));
+            return InitError(_("Cannot downgrade wallet"));
         }
         walletInstance->SetMaxVersion(nMaxVersion);
     }
@@ -3116,7 +3101,7 @@ bool CWallet::InitLoadWallet()
         if (walletInstance->GetKeyFromPool(newDefaultKey)) {
             walletInstance->SetDefaultKey(newDefaultKey);
             if (!walletInstance->SetAddressBook(walletInstance->vchDefaultKey.GetID(), "", "receive"))
-                return UIError(_("Cannot write default address") += "\n");
+                return InitError(_("Cannot write default address") += "\n");
         }
 
         walletInstance->SetBestChain(chainActive.GetLocator());
@@ -3150,7 +3135,7 @@ bool CWallet::InitLoadWallet()
                 block = block->pprev;
 
             if (pindexRescan != block)
-                return UIError(_("Prune: last wallet synchronisation goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of pruned node)"));
+                return InitError(_("Prune: last wallet synchronisation goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of pruned node)"));
         }
 
         uiInterface.InitMessage(_("Rescanning..."));
@@ -3200,28 +3185,28 @@ bool CWallet::ParameterInteraction()
         if (ParseMoney(mapArgs["-mintxfee"], n) && n > 0)
             CWallet::minTxFee = CFeeRate(n);
         else
-            return UIError(AmountErrMsg("mintxfee", mapArgs["-mintxfee"]));
+            return InitError(AmountErrMsg("mintxfee", mapArgs["-mintxfee"]));
     }
     if (mapArgs.count("-fallbackfee"))
     {
         CAmount nFeePerK = 0;
         if (!ParseMoney(mapArgs["-fallbackfee"], nFeePerK))
-            return UIError(strprintf(_("Invalid amount for -fallbackfee=<amount>: '%s'"), mapArgs["-fallbackfee"]));
+            return InitError(strprintf(_("Invalid amount for -fallbackfee=<amount>: '%s'"), mapArgs["-fallbackfee"]));
         if (nFeePerK > HIGH_TX_FEE_PER_KB)
-            UIWarning(_("-fallbackfee is set very high! This is the transaction fee you may pay when fee estimates are not available."));
+            InitWarning(_("-fallbackfee is set very high! This is the transaction fee you may pay when fee estimates are not available."));
         CWallet::fallbackFee = CFeeRate(nFeePerK);
     }
     if (mapArgs.count("-paytxfee"))
     {
         CAmount nFeePerK = 0;
         if (!ParseMoney(mapArgs["-paytxfee"], nFeePerK))
-            return UIError(AmountErrMsg("paytxfee", mapArgs["-paytxfee"]));
+            return InitError(AmountErrMsg("paytxfee", mapArgs["-paytxfee"]));
         if (nFeePerK > HIGH_TX_FEE_PER_KB)
-            UIWarning(_("-paytxfee is set very high! This is the transaction fee you will pay if you send a transaction."));
+            InitWarning(_("-paytxfee is set very high! This is the transaction fee you will pay if you send a transaction."));
         payTxFee = CFeeRate(nFeePerK, 1000);
         if (payTxFee < ::minRelayTxFee)
         {
-            return UIError(strprintf(_("Invalid amount for -paytxfee=<amount>: '%s' (must be at least %s)"),
+            return InitError(strprintf(_("Invalid amount for -paytxfee=<amount>: '%s' (must be at least %s)"),
                                        mapArgs["-paytxfee"], ::minRelayTxFee.ToString()));
         }
     }
@@ -3229,13 +3214,13 @@ bool CWallet::ParameterInteraction()
     {
         CAmount nMaxFee = 0;
         if (!ParseMoney(mapArgs["-maxtxfee"], nMaxFee))
-            return UIError(AmountErrMsg("maxtxfee", mapArgs["-maxtxfee"]));
+            return InitError(AmountErrMsg("maxtxfee", mapArgs["-maxtxfee"]));
         if (nMaxFee > HIGH_MAX_TX_FEE)
-            UIWarning(_("-maxtxfee is set very high! Fees this large could be paid on a single transaction."));
+            InitWarning(_("-maxtxfee is set very high! Fees this large could be paid on a single transaction."));
         maxTxFee = nMaxFee;
         if (CFeeRate(maxTxFee, 1000) < ::minRelayTxFee)
         {
-            return UIError(strprintf(_("Invalid amount for -maxtxfee=<amount>: '%s' (must be at least the minrelay fee of %s to prevent stuck transactions)"),
+            return InitError(strprintf(_("Invalid amount for -maxtxfee=<amount>: '%s' (must be at least the minrelay fee of %s to prevent stuck transactions)"),
                                        mapArgs["-maxtxfee"], ::minRelayTxFee.ToString()));
         }
     }

From 4b9dfd6d81581e1b821d3a503335a1fa78471655 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pavel=20Jan=C3=ADk?= <Pavel@Janik.cz>
Date: Sat, 2 Apr 2016 18:54:12 +0200
Subject: [PATCH 0078/1802] Add note about using the Qt official binary
 installer.

---
 doc/build-osx.md | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/doc/build-osx.md b/doc/build-osx.md
index c3cb1b78917d2..296e0aa1f0726 100644
--- a/doc/build-osx.md
+++ b/doc/build-osx.md
@@ -1,6 +1,6 @@
 Mac OS X Build Instructions and Notes
 ====================================
-This guide will show you how to build bitcoind (headless client) for OS X.
+This guide will show you how to build Bitcoin Core for OS X.
 
 Notes
 -----
@@ -114,6 +114,16 @@ you can monitor its process by looking at the debug.log file, like this:
 Other commands:
 -------
 
-    ./bitcoind -daemon # to start the bitcoin daemon.
+    ./bitcoind -daemon    # to start the bitcoin daemon.
     ./bitcoin-cli --help  # for a list of command-line options.
     ./bitcoin-cli help    # When the daemon is running, to get a list of RPC commands
+
+Using Qt official installer while building
+------------------------------------------
+
+If you prefer to use the latest Qt installed from the official binary
+installer over the brew version, you have to make several changes to
+the installed tree and its binaries (all these changes are contained
+in the brew version already). The changes needed are described in
+[#7714](https://github.com/bitcoin/bitcoin/issues/7714). We do not
+support building Bitcoin Core this way though.

From 190c1e234d0454d4eb93536992674770fc1e68bb Mon Sep 17 00:00:00 2001
From: JeremyRand <biolizard89@gmail.com>
Date: Sat, 2 Apr 2016 22:10:28 +0000
Subject: [PATCH 0079/1802] Doc: change Precise to Trusty in gitian-building.md

https://github.com/bitcoin/bitcoin/commit/2cecb2460002bc645e47e8517b21099b0faec818 changed "precise" to "trusty" in the shell command, but didn't change the text above it accordingly.  This commit fixes that.
---
 doc/gitian-building.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/gitian-building.md b/doc/gitian-building.md
index 54993d13a99b7..69d79b3c68ab7 100644
--- a/doc/gitian-building.md
+++ b/doc/gitian-building.md
@@ -313,7 +313,7 @@ Setting up the Gitian image
 -------------------------
 
 Gitian needs a virtual image of the operating system to build in.
-Currently this is Ubuntu Precise x86_64.
+Currently this is Ubuntu Trusty x86_64.
 This image will be copied and used every time that a build is started to
 make sure that the build is deterministic.
 Creating the image will take a while, but only has to be done once.

From fada0c422c081ba53a324aaf63c0a750cb56498e Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Sun, 3 Apr 2016 11:49:36 +0200
Subject: [PATCH 0080/1802] [doc] Fix doxygen comments for members

---
 doc/developer-notes.md     |  6 ++++++
 src/chainparams.cpp        |  4 ++--
 src/main.cpp               |  8 ++++----
 src/main.h                 | 14 ++++++-------
 src/policy/fees.h          |  4 ++--
 src/rpc/client.cpp         |  4 ++--
 src/script/interpreter.cpp | 12 ++++++------
 src/script/standard.h      |  2 +-
 src/txmempool.h            | 40 +++++++++++++++++++-------------------
 src/utiltime.cpp           |  2 +-
 src/wallet/wallet.h        |  8 ++++----
 11 files changed, 55 insertions(+), 49 deletions(-)

diff --git a/doc/developer-notes.md b/doc/developer-notes.md
index 358792251b675..8affb2158a913 100644
--- a/doc/developer-notes.md
+++ b/doc/developer-notes.md
@@ -71,6 +71,12 @@ To describe a member or variable use:
 int var; //!< Detailed description after the member
 ```
 
+or
+```cpp
+//! Description before the member
+int var;
+```
+
 Also OK:
 ```c++
 ///
diff --git a/src/chainparams.cpp b/src/chainparams.cpp
index 965d131695b65..5c7d190125cc3 100644
--- a/src/chainparams.cpp
+++ b/src/chainparams.cpp
@@ -266,8 +266,8 @@ class CRegTestParams : public CChainParams {
         assert(consensus.hashGenesisBlock == uint256S("0x0f9188f13cb7b2c71f2a335e3a4fc328bf5beb436012afca590b1a11466e2206"));
         assert(genesis.hashMerkleRoot == uint256S("0x4a5e1e4baab89f3a32518a88c31bc87f618f76673e2cc77ab2127b7afdeda33b"));
 
-        vFixedSeeds.clear(); //! Regtest mode doesn't have any fixed seeds.
-        vSeeds.clear();  //! Regtest mode doesn't have any DNS seeds.
+        vFixedSeeds.clear(); //!< Regtest mode doesn't have any fixed seeds.
+        vSeeds.clear();      //!< Regtest mode doesn't have any DNS seeds.
 
         fMiningRequiresPeers = false;
         fDefaultConsistencyChecks = true;
diff --git a/src/main.cpp b/src/main.cpp
index 2c0b3bfee7aa6..b68c6affae7f9 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -194,10 +194,10 @@ namespace {
     /** Blocks that are in flight, and that are in the queue to be downloaded. Protected by cs_main. */
     struct QueuedBlock {
         uint256 hash;
-        CBlockIndex *pindex;  //! Optional.
-        int64_t nTime;  //! Time of "getdata" request in microseconds.
-        bool fValidatedHeaders;  //! Whether this block has validated headers at the time of request.
-        int64_t nTimeDisconnect; //! The timeout for this block request (for disconnecting a slow peer)
+        CBlockIndex* pindex;     //!< Optional.
+        int64_t nTime;           //!< Time of "getdata" request in microseconds.
+        bool fValidatedHeaders;  //!< Whether this block has validated headers at the time of request.
+        int64_t nTimeDisconnect; //!< The timeout for this block request (for disconnecting a slow peer)
     };
     map<uint256, pair<NodeId, list<QueuedBlock>::iterator> > mapBlocksInFlight;
 
diff --git a/src/main.h b/src/main.h
index 0bfcfab2132e5..3ea9dc500ca64 100644
--- a/src/main.h
+++ b/src/main.h
@@ -469,13 +469,13 @@ bool TestBlockValidity(CValidationState& state, const CChainParams& chainparams,
 class CBlockFileInfo
 {
 public:
-    unsigned int nBlocks;      //! number of blocks stored in file
-    unsigned int nSize;        //! number of used bytes of block file
-    unsigned int nUndoSize;    //! number of used bytes in the undo file
-    unsigned int nHeightFirst; //! lowest height of block in file
-    unsigned int nHeightLast;  //! highest height of block in file
-    uint64_t nTimeFirst;         //! earliest time of block in file
-    uint64_t nTimeLast;          //! latest time of block in file
+    unsigned int nBlocks;      //!< number of blocks stored in file
+    unsigned int nSize;        //!< number of used bytes of block file
+    unsigned int nUndoSize;    //!< number of used bytes in the undo file
+    unsigned int nHeightFirst; //!< lowest height of block in file
+    unsigned int nHeightLast;  //!< highest height of block in file
+    uint64_t nTimeFirst;       //!< earliest time of block in file
+    uint64_t nTimeLast;        //!< latest time of block in file
 
     ADD_SERIALIZE_METHODS;
 
diff --git a/src/policy/fees.h b/src/policy/fees.h
index cdd984de7d5fc..463f62f710603 100644
--- a/src/policy/fees.h
+++ b/src/policy/fees.h
@@ -265,8 +265,8 @@ class CBlockPolicyEstimator
     void Read(CAutoFile& filein);
 
 private:
-    CFeeRate minTrackedFee; //! Passed to constructor to avoid dependency on main
-    double minTrackedPriority; //! Set to AllowFreeThreshold
+    CFeeRate minTrackedFee;    //!< Passed to constructor to avoid dependency on main
+    double minTrackedPriority; //!< Set to AllowFreeThreshold
     unsigned int nBestSeenHeight;
     struct TxStatsInfo
     {
diff --git a/src/rpc/client.cpp b/src/rpc/client.cpp
index 89420b93d7fb2..033987af59efb 100644
--- a/src/rpc/client.cpp
+++ b/src/rpc/client.cpp
@@ -18,8 +18,8 @@ using namespace std;
 class CRPCConvertParam
 {
 public:
-    std::string methodName;            //! method whose params want conversion
-    int paramIdx;                      //! 0-based idx of param to convert
+    std::string methodName; //!< method whose params want conversion
+    int paramIdx;           //!< 0-based idx of param to convert
 };
 
 static const CRPCConvertParam vRPCConvertParams[] =
diff --git a/src/script/interpreter.cpp b/src/script/interpreter.cpp
index 149a4f0156315..9c47f7c6c9577 100644
--- a/src/script/interpreter.cpp
+++ b/src/script/interpreter.cpp
@@ -1015,12 +1015,12 @@ namespace {
  */
 class CTransactionSignatureSerializer {
 private:
-    const CTransaction &txTo;  //! reference to the spending transaction (the one being serialized)
-    const CScript &scriptCode; //! output script being consumed
-    const unsigned int nIn;    //! input index of txTo being signed
-    const bool fAnyoneCanPay;  //! whether the hashtype has the SIGHASH_ANYONECANPAY flag set
-    const bool fHashSingle;    //! whether the hashtype is SIGHASH_SINGLE
-    const bool fHashNone;      //! whether the hashtype is SIGHASH_NONE
+    const CTransaction& txTo;  //!< reference to the spending transaction (the one being serialized)
+    const CScript& scriptCode; //!< output script being consumed
+    const unsigned int nIn;    //!< input index of txTo being signed
+    const bool fAnyoneCanPay;  //!< whether the hashtype has the SIGHASH_ANYONECANPAY flag set
+    const bool fHashSingle;    //!< whether the hashtype is SIGHASH_SINGLE
+    const bool fHashNone;      //!< whether the hashtype is SIGHASH_NONE
 
 public:
     CTransactionSignatureSerializer(const CTransaction &txToIn, const CScript &scriptCodeIn, unsigned int nInIn, int nHashTypeIn) :
diff --git a/src/script/standard.h b/src/script/standard.h
index 64bf010ec199e..f348da8e1982b 100644
--- a/src/script/standard.h
+++ b/src/script/standard.h
@@ -27,7 +27,7 @@ class CScriptID : public uint160
     CScriptID(const uint160& in) : uint160(in) {}
 };
 
-static const unsigned int MAX_OP_RETURN_RELAY = 83; //! bytes (+1 for OP_RETURN, +2 for the pushdata opcodes)
+static const unsigned int MAX_OP_RETURN_RELAY = 83; //!< bytes (+1 for OP_RETURN, +2 for the pushdata opcodes)
 extern bool fAcceptDatacarrier;
 extern unsigned nMaxDatacarrierBytes;
 
diff --git a/src/txmempool.h b/src/txmempool.h
index 9dbb37dad068f..de4ba0b371a42 100644
--- a/src/txmempool.h
+++ b/src/txmempool.h
@@ -74,28 +74,28 @@ class CTxMemPoolEntry
 {
 private:
     CTransaction tx;
-    CAmount nFee; //! Cached to avoid expensive parent-transaction lookups
-    size_t nTxSize; //! ... and avoid recomputing tx size
-    size_t nModSize; //! ... and modified size for priority
-    size_t nUsageSize; //! ... and total memory usage
-    int64_t nTime; //! Local time when entering the mempool
-    double entryPriority; //! Priority when entering the mempool
-    unsigned int entryHeight; //! Chain height when entering the mempool
-    bool hadNoDependencies; //! Not dependent on any other txs when it entered the mempool
-    CAmount inChainInputValue; //! Sum of all txin values that are already in blockchain
-    bool spendsCoinbase; //! keep track of transactions that spend a coinbase
-    unsigned int sigOpCount; //! Legacy sig ops plus P2SH sig op count
-    int64_t feeDelta; //! Used for determining the priority of the transaction for mining in a block
-    LockPoints lockPoints; //! Track the height and time at which tx was final
+    CAmount nFee;              //!< Cached to avoid expensive parent-transaction lookups
+    size_t nTxSize;            //!< ... and avoid recomputing tx size
+    size_t nModSize;           //!< ... and modified size for priority
+    size_t nUsageSize;         //!< ... and total memory usage
+    int64_t nTime;             //!< Local time when entering the mempool
+    double entryPriority;      //!< Priority when entering the mempool
+    unsigned int entryHeight;  //!< Chain height when entering the mempool
+    bool hadNoDependencies;    //!< Not dependent on any other txs when it entered the mempool
+    CAmount inChainInputValue; //!< Sum of all txin values that are already in blockchain
+    bool spendsCoinbase;       //!< keep track of transactions that spend a coinbase
+    unsigned int sigOpCount;   //!< Legacy sig ops plus P2SH sig op count
+    int64_t feeDelta;          //!< Used for determining the priority of the transaction for mining in a block
+    LockPoints lockPoints;     //!< Track the height and time at which tx was final
 
     // Information about descendants of this transaction that are in the
     // mempool; if we remove this transaction we must remove all of these
     // descendants as well.  if nCountWithDescendants is 0, treat this entry as
     // dirty, and nSizeWithDescendants and nModFeesWithDescendants will not be
     // correct.
-    uint64_t nCountWithDescendants; //! number of descendant transactions
-    uint64_t nSizeWithDescendants;  //! ... and size
-    CAmount nModFeesWithDescendants;  //! ... and total fees (all including us)
+    uint64_t nCountWithDescendants;  //!< number of descendant transactions
+    uint64_t nSizeWithDescendants;   //!< ... and size
+    CAmount nModFeesWithDescendants; //!< ... and total fees (all including us)
 
     // Analogous statistics for ancestor transactions
     uint64_t nCountWithAncestors;
@@ -399,18 +399,18 @@ class CInPoint
 class CTxMemPool
 {
 private:
-    uint32_t nCheckFrequency; //! Value n means that n times in 2^32 we check.
+    uint32_t nCheckFrequency; //!< Value n means that n times in 2^32 we check.
     unsigned int nTransactionsUpdated;
     CBlockPolicyEstimator* minerPolicyEstimator;
 
-    uint64_t totalTxSize; //! sum of all mempool tx' byte sizes
-    uint64_t cachedInnerUsage; //! sum of dynamic memory usage of all the map elements (NOT the maps themselves)
+    uint64_t totalTxSize;      //!< sum of all mempool tx' byte sizes
+    uint64_t cachedInnerUsage; //!< sum of dynamic memory usage of all the map elements (NOT the maps themselves)
 
     CFeeRate minReasonableRelayFee;
 
     mutable int64_t lastRollingFeeUpdate;
     mutable bool blockSinceLastRollingFeeBump;
-    mutable double rollingMinimumFeeRate; //! minimum fee to get into the pool, decreases exponentially
+    mutable double rollingMinimumFeeRate; //!< minimum fee to get into the pool, decreases exponentially
 
     void trackPackageRemoved(const CFeeRate& rate);
 
diff --git a/src/utiltime.cpp b/src/utiltime.cpp
index 91b40d9991106..da590f8889346 100644
--- a/src/utiltime.cpp
+++ b/src/utiltime.cpp
@@ -14,7 +14,7 @@
 
 using namespace std;
 
-static int64_t nMockTime = 0;  //! For unit testing
+static int64_t nMockTime = 0; //!< For unit testing
 
 int64_t GetTime()
 {
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
index 867f33a7b5708..96d5d4e1e015b 100644
--- a/src/wallet/wallet.h
+++ b/src/wallet/wallet.h
@@ -228,11 +228,11 @@ class CWalletTx : public CMerkleTx
     mapValue_t mapValue;
     std::vector<std::pair<std::string, std::string> > vOrderForm;
     unsigned int fTimeReceivedIsTxTime;
-    unsigned int nTimeReceived; //! time received by this node
+    unsigned int nTimeReceived; //!< time received by this node
     unsigned int nTimeSmart;
     char fFromMe;
     std::string strFromAccount;
-    int64_t nOrderPos; //! position in ordered transaction list
+    int64_t nOrderPos; //!< position in ordered transaction list
 
     // memory only
     mutable bool fDebitCached;
@@ -324,7 +324,7 @@ class CWalletTx : public CMerkleTx
         }
 
         READWRITE(*(CMerkleTx*)this);
-        std::vector<CMerkleTx> vUnused; //! Used to be vtxPrev
+        std::vector<CMerkleTx> vUnused; //!< Used to be vtxPrev
         READWRITE(vUnused);
         READWRITE(mapValue);
         READWRITE(vOrderForm);
@@ -465,7 +465,7 @@ class CAccountingEntry
     std::string strOtherAccount;
     std::string strComment;
     mapValue_t mapValue;
-    int64_t nOrderPos;  //! position in ordered transaction list
+    int64_t nOrderPos; //!< position in ordered transaction list
     uint64_t nEntryNo;
 
     CAccountingEntry()

From faef3b710fe2ced7cc94a82847c547865a64fd92 Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Sun, 3 Apr 2016 14:39:48 +0200
Subject: [PATCH 0081/1802] [travis] Print the commit which was evaluated

---
 .travis.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 31b3d6d96e70f..3f1af53011cb6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -64,6 +64,7 @@ before_script:
     - if [ -n "$OSX_SDK" -a -f depends/sdk-sources/MacOSX${OSX_SDK}.sdk.tar.gz ]; then tar -C depends/SDKs -xf depends/sdk-sources/MacOSX${OSX_SDK}.sdk.tar.gz; fi
     - make $MAKEJOBS -C depends HOST=$HOST $DEP_OPTS
 script:
+    - export TRAVIS_COMMIT_LOG=`git log --format=fuller -1`
     - if [ -n "$USE_SHELL" ]; then export CONFIG_SHELL="$USE_SHELL"; fi
     - OUTDIR=$BASE_OUTDIR/$TRAVIS_PULL_REQUEST/$TRAVIS_JOB_NUMBER-$HOST
     - BITCOIN_CONFIG_ALL="--disable-dependency-tracking --prefix=$TRAVIS_BUILD_DIR/depends/$HOST --bindir=$OUTDIR/bin --libdir=$OUTDIR/lib"
@@ -79,4 +80,6 @@ script:
     - if [ "$RUN_TESTS" = "true" ]; then make check; fi
     - if [ "$RUN_TESTS" = "true" ]; then qa/pull-tester/rpc-tests.py --coverage; fi
 after_script:
+    - echo "Commit, which was evaluated by travis in this build job:"
+    - echo $TRAVIS_COMMIT_LOG
     - if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then (echo "Upload goes here. Something like: scp -r $BASE_OUTDIR server" || echo "upload failed"); fi

From f063863d1fc964aec80d8a0acfde623543573823 Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Thu, 31 Mar 2016 14:50:10 +0200
Subject: [PATCH 0082/1802] build: Remove unnecessary executables from gitian
 release

This removes the following executables from the binary gitian release:

- test_bitcoin-qt[.exe]
- bench_bitcoin[.exe]

@jonasschnelli and me discussed this on IRC a few days ago - unlike the
normal `bitcoin_tests` which is useful to see if it is safe to run
bitcoin on a certain OS/environment combination, there is no good reason
to include these. Better to leave them out to reduce the download
size.

Sizes from the 0.12 release:
```
2.4M bitcoin-0.12.0/bin/bench_bitcoin.exe
 22M bitcoin-0.12.0/bin/test_bitcoin-qt.exe
```
---
 configure.ac                                | 21 ++++++++++++---------
 contrib/gitian-descriptors/gitian-linux.yml |  2 +-
 contrib/gitian-descriptors/gitian-osx.yml   |  2 +-
 contrib/gitian-descriptors/gitian-win.yml   |  2 +-
 4 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/configure.ac b/configure.ac
index 1e894f57675d8..ec5656814f074 100644
--- a/configure.ac
+++ b/configure.ac
@@ -98,6 +98,11 @@ AC_ARG_ENABLE(tests,
     [use_tests=$enableval],
     [use_tests=yes])
 
+AC_ARG_ENABLE(gui-tests,
+    AS_HELP_STRING([--disable-gui-tests],[do not compile GUI tests (default is to compile if GUI and tests enabled)]),
+    [use_gui_tests=$enableval],
+    [use_gui_tests=$use_tests])
+
 AC_ARG_ENABLE(bench,
     AS_HELP_STRING([--disable-bench],[do not compile benchmarks (default is to compile)]),
     [use_bench=$enableval],
@@ -919,8 +924,8 @@ else
 fi
 
 dnl these are only used when qt is enabled
+BUILD_TEST_QT=""
 if test x$bitcoin_enable_qt != xno; then
-  BUILD_QT=qt
   dnl enable dbus support
   AC_MSG_CHECKING([whether to build GUI with support for D-Bus])
   if test x$bitcoin_enable_qt_dbus != xno; then
@@ -950,9 +955,9 @@ if test x$bitcoin_enable_qt != xno; then
   fi
 
   AC_MSG_CHECKING([whether to build test_bitcoin-qt])
-  if test x$use_tests$bitcoin_enable_qt_test = xyesyes; then
+  if test x$use_gui_tests$bitcoin_enable_qt_test = xyesyes; then
     AC_MSG_RESULT([yes])
-    BUILD_TEST_QT="test"
+    BUILD_TEST_QT="yes"
   else
     AC_MSG_RESULT([no])
   fi
@@ -963,9 +968,10 @@ AM_CONDITIONAL([ENABLE_ZMQ], [test "x$use_zmq" = "xyes"])
 AC_MSG_CHECKING([whether to build test_bitcoin])
 if test x$use_tests = xyes; then
   AC_MSG_RESULT([yes])
-  BUILD_TEST="test"
+  BUILD_TEST="yes"
 else
   AC_MSG_RESULT([no])
+  BUILD_TEST=""
 fi
 
 AC_MSG_CHECKING([whether to reduce exports])
@@ -983,9 +989,9 @@ AM_CONDITIONAL([TARGET_DARWIN], [test x$TARGET_OS = xdarwin])
 AM_CONDITIONAL([BUILD_DARWIN], [test x$BUILD_OS = xdarwin])
 AM_CONDITIONAL([TARGET_WINDOWS], [test x$TARGET_OS = xwindows])
 AM_CONDITIONAL([ENABLE_WALLET],[test x$enable_wallet = xyes])
-AM_CONDITIONAL([ENABLE_TESTS],[test x$use_tests = xyes])
+AM_CONDITIONAL([ENABLE_TESTS],[test x$BUILD_TEST = xyes])
 AM_CONDITIONAL([ENABLE_QT],[test x$bitcoin_enable_qt = xyes])
-AM_CONDITIONAL([ENABLE_QT_TESTS],[test x$use_tests$bitcoin_enable_qt_test = xyesyes])
+AM_CONDITIONAL([ENABLE_QT_TESTS],[test x$BUILD_TEST_QT = xyes])
 AM_CONDITIONAL([ENABLE_BENCH],[test x$use_bench = xyes])
 AM_CONDITIONAL([USE_QRCODE], [test x$use_qr = xyes])
 AM_CONDITIONAL([USE_LCOV],[test x$use_lcov = xyes])
@@ -1026,9 +1032,6 @@ AC_SUBST(USE_QRCODE)
 AC_SUBST(BOOST_LIBS)
 AC_SUBST(TESTDEFS)
 AC_SUBST(LEVELDB_TARGET_FLAGS)
-AC_SUBST(BUILD_TEST)
-AC_SUBST(BUILD_QT)
-AC_SUBST(BUILD_TEST_QT)
 AC_SUBST(MINIUPNPC_CPPFLAGS)
 AC_SUBST(MINIUPNPC_LIBS)
 AC_CONFIG_FILES([Makefile src/Makefile share/setup.nsi share/qt/Info.plist src/test/buildenv.py])
diff --git a/contrib/gitian-descriptors/gitian-linux.yml b/contrib/gitian-descriptors/gitian-linux.yml
index 1f2c4f9999a67..13941f5d55ea3 100644
--- a/contrib/gitian-descriptors/gitian-linux.yml
+++ b/contrib/gitian-descriptors/gitian-linux.yml
@@ -26,7 +26,7 @@ files: []
 script: |
   WRAP_DIR=$HOME/wrapped
   HOSTS="i686-pc-linux-gnu x86_64-unknown-linux-gnu"
-  CONFIGFLAGS="--enable-glibc-back-compat --enable-reduce-exports LDFLAGS=-static-libstdc++"
+  CONFIGFLAGS="--enable-glibc-back-compat --enable-reduce-exports --disable-bench --disable-gui-tests LDFLAGS=-static-libstdc++"
   FAKETIME_HOST_PROGS=""
   FAKETIME_PROGS="date ar ranlib nm strip"
 
diff --git a/contrib/gitian-descriptors/gitian-osx.yml b/contrib/gitian-descriptors/gitian-osx.yml
index 6f68ae08ce73f..c430932f9da0e 100644
--- a/contrib/gitian-descriptors/gitian-osx.yml
+++ b/contrib/gitian-descriptors/gitian-osx.yml
@@ -36,7 +36,7 @@ files:
 script: |
   WRAP_DIR=$HOME/wrapped
   HOSTS="x86_64-apple-darwin11"
-  CONFIGFLAGS="--enable-reduce-exports GENISOIMAGE=$WRAP_DIR/genisoimage"
+  CONFIGFLAGS="--enable-reduce-exports --disable-bench --disable-gui-tests GENISOIMAGE=$WRAP_DIR/genisoimage"
   FAKETIME_HOST_PROGS=""
   FAKETIME_PROGS="ar ranlib date dmg genisoimage"
 
diff --git a/contrib/gitian-descriptors/gitian-win.yml b/contrib/gitian-descriptors/gitian-win.yml
index f0fbff3e1035d..9f7322f0b5a21 100644
--- a/contrib/gitian-descriptors/gitian-win.yml
+++ b/contrib/gitian-descriptors/gitian-win.yml
@@ -29,7 +29,7 @@ files: []
 script: |
   WRAP_DIR=$HOME/wrapped
   HOSTS="x86_64-w64-mingw32 i686-w64-mingw32"
-  CONFIGFLAGS="--enable-reduce-exports"
+  CONFIGFLAGS="--enable-reduce-exports --disable-gui-tests"
   FAKETIME_HOST_PROGS="g++ ar ranlib nm windres strip"
   FAKETIME_PROGS="date makensis zip"
 

From 60361ca4816dd5b2d10408db3194fb77fcac8720 Mon Sep 17 00:00:00 2001
From: mruddy <mruddy@users.noreply.github.com>
Date: Sun, 3 Apr 2016 14:30:00 +0000
Subject: [PATCH 0083/1802] RPC: fix generatetoaddress failing to parse address
 and add unit test

---
 src/rpc/client.cpp     |  1 -
 src/test/rpc_tests.cpp | 24 ++++++++++++++++++++++++
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/src/rpc/client.cpp b/src/rpc/client.cpp
index 89420b93d7fb2..b040d2bc80149 100644
--- a/src/rpc/client.cpp
+++ b/src/rpc/client.cpp
@@ -30,7 +30,6 @@ static const CRPCConvertParam vRPCConvertParams[] =
     { "generate", 0 },
     { "generate", 1 },
     { "generatetoaddress", 0 },
-    { "generatetoaddress", 1 },
     { "generatetoaddress", 2 },
     { "getnetworkhashps", 0 },
     { "getnetworkhashps", 1 },
diff --git a/src/test/rpc_tests.cpp b/src/test/rpc_tests.cpp
index 1976ee2cb61f1..bbda6a48f4d5a 100644
--- a/src/test/rpc_tests.cpp
+++ b/src/test/rpc_tests.cpp
@@ -11,6 +11,7 @@
 #include "test/test_bitcoin.h"
 
 #include <boost/algorithm/string.hpp>
+#include <boost/assign/list_of.hpp>
 #include <boost/test/unit_test.hpp>
 
 #include <univalue.h>
@@ -308,4 +309,27 @@ BOOST_AUTO_TEST_CASE(rpc_ban)
     BOOST_CHECK_EQUAL(adr.get_str(), "2001:4d48:ac57:400:cacf:e9ff:fe1d:9c63/128");
 }
 
+BOOST_AUTO_TEST_CASE(rpc_convert_values_generatetoaddress)
+{
+    UniValue result;
+
+    BOOST_CHECK_NO_THROW(result = RPCConvertValues("generatetoaddress", boost::assign::list_of("101")("mkESjLZW66TmHhiFX8MCaBjrhZ543PPh9a")));
+    BOOST_CHECK_EQUAL(result[0].get_int(), 101);
+    BOOST_CHECK_EQUAL(result[1].get_str(), "mkESjLZW66TmHhiFX8MCaBjrhZ543PPh9a");
+
+    BOOST_CHECK_NO_THROW(result = RPCConvertValues("generatetoaddress", boost::assign::list_of("101")("mhMbmE2tE9xzJYCV9aNC8jKWN31vtGrguU")));
+    BOOST_CHECK_EQUAL(result[0].get_int(), 101);
+    BOOST_CHECK_EQUAL(result[1].get_str(), "mhMbmE2tE9xzJYCV9aNC8jKWN31vtGrguU");
+
+    BOOST_CHECK_NO_THROW(result = RPCConvertValues("generatetoaddress", boost::assign::list_of("1")("mkESjLZW66TmHhiFX8MCaBjrhZ543PPh9a")("9")));
+    BOOST_CHECK_EQUAL(result[0].get_int(), 1);
+    BOOST_CHECK_EQUAL(result[1].get_str(), "mkESjLZW66TmHhiFX8MCaBjrhZ543PPh9a");
+    BOOST_CHECK_EQUAL(result[2].get_int(), 9);
+
+    BOOST_CHECK_NO_THROW(result = RPCConvertValues("generatetoaddress", boost::assign::list_of("1")("mhMbmE2tE9xzJYCV9aNC8jKWN31vtGrguU")("9")));
+    BOOST_CHECK_EQUAL(result[0].get_int(), 1);
+    BOOST_CHECK_EQUAL(result[1].get_str(), "mhMbmE2tE9xzJYCV9aNC8jKWN31vtGrguU");
+    BOOST_CHECK_EQUAL(result[2].get_int(), 9);
+}
+
 BOOST_AUTO_TEST_SUITE_END()

From fa24456d0c4cd0f6571bcf3d8f1f51d8d4242a3e Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Sun, 3 Apr 2016 20:35:57 +0200
Subject: [PATCH 0084/1802] [qa] httpbasics: Actually test second connection

---
 qa/rpc-tests/httpbasics.py | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/qa/rpc-tests/httpbasics.py b/qa/rpc-tests/httpbasics.py
index c231676ec87d7..eff4c6e808bbd 100755
--- a/qa/rpc-tests/httpbasics.py
+++ b/qa/rpc-tests/httpbasics.py
@@ -37,13 +37,13 @@ def run_test(self):
         conn.connect()
         conn.request('POST', '/', '{"method": "getbestblockhash"}', headers)
         out1 = conn.getresponse().read()
-        assert('"error":null' in out1)
+        assert(b'"error":null' in out1)
         assert(conn.sock!=None) #according to http/1.1 connection must still be open!
 
         #send 2nd request without closing connection
         conn.request('POST', '/', '{"method": "getchaintips"}', headers)
-        out2 = conn.getresponse().read()
-        assert('"error":null' in out1) #must also response with a correct json-rpc message
+        out1 = conn.getresponse().read()
+        assert(b'"error":null' in out1) #must also response with a correct json-rpc message
         assert(conn.sock!=None) #according to http/1.1 connection must still be open!
         conn.close()
 
@@ -54,13 +54,13 @@ def run_test(self):
         conn.connect()
         conn.request('POST', '/', '{"method": "getbestblockhash"}', headers)
         out1 = conn.getresponse().read()
-        assert('"error":null' in out1)
+        assert(b'"error":null' in out1)
         assert(conn.sock!=None) #according to http/1.1 connection must still be open!
 
         #send 2nd request without closing connection
         conn.request('POST', '/', '{"method": "getchaintips"}', headers)
-        out2 = conn.getresponse().read()
-        assert('"error":null' in out1) #must also response with a correct json-rpc message
+        out1 = conn.getresponse().read()
+        assert(b'"error":null' in out1) #must also response with a correct json-rpc message
         assert(conn.sock!=None) #according to http/1.1 connection must still be open!
         conn.close()
 
@@ -71,7 +71,7 @@ def run_test(self):
         conn.connect()
         conn.request('POST', '/', '{"method": "getbestblockhash"}', headers)
         out1 = conn.getresponse().read()
-        assert('"error":null' in out1)
+        assert(b'"error":null' in out1)
         assert(conn.sock==None) #now the connection must be closed after the response
 
         #node1 (2nd node) is running with disabled keep-alive option
@@ -83,7 +83,7 @@ def run_test(self):
         conn.connect()
         conn.request('POST', '/', '{"method": "getbestblockhash"}', headers)
         out1 = conn.getresponse().read()
-        assert('"error":null' in out1)
+        assert(b'"error":null' in out1)
 
         #node2 (third node) is running with standard keep-alive parameters which means keep-alive is on
         urlNode2 = urlparse.urlparse(self.nodes[2].url)
@@ -94,7 +94,7 @@ def run_test(self):
         conn.connect()
         conn.request('POST', '/', '{"method": "getbestblockhash"}', headers)
         out1 = conn.getresponse().read()
-        assert('"error":null' in out1)
+        assert(b'"error":null' in out1)
         assert(conn.sock!=None) #connection must be closed because bitcoind should use keep-alive by default
 
         # Check excessive request size

From fac724c78f281168ea174c36cada4f95112aea6d Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Sun, 20 Mar 2016 18:56:13 +0100
Subject: [PATCH 0085/1802] [qa] maxblocksinflight: Actually enable test

---
 qa/rpc-tests/maxblocksinflight.py | 56 ++++++++++++++-----------------
 1 file changed, 26 insertions(+), 30 deletions(-)

diff --git a/qa/rpc-tests/maxblocksinflight.py b/qa/rpc-tests/maxblocksinflight.py
index 0313bce736b1f..ad633f661dd51 100755
--- a/qa/rpc-tests/maxblocksinflight.py
+++ b/qa/rpc-tests/maxblocksinflight.py
@@ -41,40 +41,36 @@ def add_new_connection(self, connection):
         self.disconnectOkay = False
 
     def run(self):
-        try:
-            fail = False
-            self.connection.rpc.generate(1) # Leave IBD
-
-            numBlocksToGenerate = [ 8, 16, 128, 1024 ]
-            for count in range(len(numBlocksToGenerate)):
-                current_invs = []
-                for i in range(numBlocksToGenerate[count]):
-                    current_invs.append(CInv(2, random.randrange(0, 1<<256)))
-                    if len(current_invs) >= 50000:
-                        self.connection.send_message(msg_inv(current_invs))
-                        current_invs = []
-                if len(current_invs) > 0:
+        self.connection.rpc.generate(1)  # Leave IBD
+
+        numBlocksToGenerate = [8, 16, 128, 1024]
+        for count in range(len(numBlocksToGenerate)):
+            current_invs = []
+            for i in range(numBlocksToGenerate[count]):
+                current_invs.append(CInv(2, random.randrange(0, 1 << 256)))
+                if len(current_invs) >= 50000:
                     self.connection.send_message(msg_inv(current_invs))
-                
-                # Wait and see how many blocks were requested
-                time.sleep(2)
-
-                total_requests = 0
-                with mininode_lock:
-                    for key in self.blockReqCounts:
-                        total_requests += self.blockReqCounts[key]
-                        if self.blockReqCounts[key] > 1:
-                            raise AssertionError("Error, test failed: block %064x requested more than once" % key)
-                if total_requests > MAX_REQUESTS:
-                    raise AssertionError("Error, too many blocks (%d) requested" % total_requests)
-                print "Round %d: success (total requests: %d)" % (count, total_requests)
-        except AssertionError as e:
-            print "TEST FAILED: ", e.args
+                    current_invs = []
+            if len(current_invs) > 0:
+                self.connection.send_message(msg_inv(current_invs))
+
+            # Wait and see how many blocks were requested
+            time.sleep(2)
+
+            total_requests = 0
+            with mininode_lock:
+                for key in self.blockReqCounts:
+                    total_requests += self.blockReqCounts[key]
+                    if self.blockReqCounts[key] > 1:
+                        raise AssertionError("Error, test failed: block %064x requested more than once" % key)
+            if total_requests > MAX_REQUESTS:
+                raise AssertionError("Error, too many blocks (%d) requested" % total_requests)
+            print "Round %d: success (total requests: %d)" % (count, total_requests)
 
         self.disconnectOkay = True
         self.connection.disconnect_node()
 
-        
+
 class MaxBlocksInFlightTest(BitcoinTestFramework):
     def add_options(self, parser):
         parser.add_option("--testbinary", dest="testbinary",
@@ -86,7 +82,7 @@ def setup_chain(self):
         initialize_chain_clean(self.options.tmpdir, 1)
 
     def setup_network(self):
-        self.nodes = start_nodes(1, self.options.tmpdir, 
+        self.nodes = start_nodes(1, self.options.tmpdir,
                                  extra_args=[['-debug', '-whitelist=127.0.0.1']],
                                  binary=[self.options.testbinary])
 

From ffff866da83209dcaa463d8b9539d3f539f83a97 Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Sun, 3 Apr 2016 21:20:14 +0200
Subject: [PATCH 0086/1802] [qa] Remove misleading "errorString syntax"

---
 qa/rpc-tests/importprunedfunds.py | 10 ++++++----
 qa/rpc-tests/rawtransactions.py   |  6 +++---
 qa/rpc-tests/wallet.py            | 19 +++++++------------
 3 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/qa/rpc-tests/importprunedfunds.py b/qa/rpc-tests/importprunedfunds.py
index db875800d4f0f..a9324196ee488 100755
--- a/qa/rpc-tests/importprunedfunds.py
+++ b/qa/rpc-tests/importprunedfunds.py
@@ -83,9 +83,10 @@ def run_test (self):
         try:
             result1 = self.nodes[1].importprunedfunds(rawtxn1, proof1, "")
         except JSONRPCException as e:
-            errorString = e.error['message']
+            assert('No addresses' in e.error['message'])
+        else:
+            assert(False)
 
-        assert('No addresses' in errorString)
 
         balance1 = self.nodes[1].getbalance("", 0, True)
         assert_equal(balance1, Decimal(0))
@@ -120,9 +121,10 @@ def run_test (self):
         try:
             self.nodes[1].removeprunedfunds(txnid1)
         except JSONRPCException as e:
-            errorString = e.error['message']
+            assert('does not exist' in e.error['message'])
+        else:
+            assert(False)
 
-        assert('does not exist' in errorString)
 
         balance1 = Decimal(self.nodes[1].getbalance("", 0, True))
         assert_equal(balance1, Decimal('0.075'))
diff --git a/qa/rpc-tests/rawtransactions.py b/qa/rpc-tests/rawtransactions.py
index 9f660c8bdadeb..762a6d6a30c21 100755
--- a/qa/rpc-tests/rawtransactions.py
+++ b/qa/rpc-tests/rawtransactions.py
@@ -56,13 +56,13 @@ def run_test(self):
         rawtx   = self.nodes[2].createrawtransaction(inputs, outputs)
         rawtx   = self.nodes[2].signrawtransaction(rawtx)
 
-        errorString = ""
         try:
             rawtx   = self.nodes[2].sendrawtransaction(rawtx['hex'])
         except JSONRPCException as e:
-            errorString = e.error['message']
+            assert("Missing inputs" in e.error['message'])
+        else:
+            assert(False)
 
-        assert("Missing inputs" in errorString)
 
         #########################
         # RAW TX MULTISIG TESTS #
diff --git a/qa/rpc-tests/wallet.py b/qa/rpc-tests/wallet.py
index cb876aae5cb90..8fdcea50b6329 100755
--- a/qa/rpc-tests/wallet.py
+++ b/qa/rpc-tests/wallet.py
@@ -245,22 +245,20 @@ def run_test (self):
         txObj = self.nodes[0].gettransaction(txId)
         assert_equal(txObj['amount'], Decimal('-0.0001'))
 
-        #this should fail
-        errorString = ""
         try:
             txId  = self.nodes[0].sendtoaddress(self.nodes[2].getnewaddress(), "1f-4")
         except JSONRPCException as e:
-            errorString = e.error['message']
+            assert("Invalid amount" in e.error['message'])
+        else:
+            raise AssertionError("Must not parse invalid amounts")
 
-        assert("Invalid amount" in errorString)
 
-        errorString = ""
         try:
-            self.nodes[0].generate("2") #use a string to as block amount parameter must fail because it's not interpreted as amount
+            self.nodes[0].generate("2")
+            raise AssertionError("Must not accept strings as numeric")
         except JSONRPCException as e:
-            errorString = e.error['message']
+            assert("not an integer" in e.error['message'])
 
-        assert("not an integer" in errorString)
 
         # Mine a block from node0 to an address from node1
         cbAddr = self.nodes[1].getnewaddress()
@@ -269,10 +267,7 @@ def run_test (self):
         self.sync_all()
 
         # Check that the txid and balance is found by node1
-        try:
-            self.nodes[1].gettransaction(cbTxId)
-        except JSONRPCException as e:
-            assert("Invalid or non-wallet transaction id" not in e.error['message'])
+        self.nodes[1].gettransaction(cbTxId)
 
         #check if wallet or blochchain maintenance changes the balance
         self.sync_all()

From 8efed3bc93a15fc715fd4f3cca50f44685872b5e Mon Sep 17 00:00:00 2001
From: Jonas Schnelli <dev@jonasschnelli.ch>
Date: Thu, 17 Mar 2016 17:54:54 +0100
Subject: [PATCH 0087/1802] [Qt] Support for abandoned/abandoning transactions

---
 src/Makefile.qt.include                    |   3 +-
 src/qt/bitcoin.qrc                         |   1 +
 src/qt/guiconstants.h                      |   2 ++
 src/qt/res/icons/transaction_abandoned.png | Bin 0 -> 1473 bytes
 src/qt/transactiondesc.cpp                 |   2 +-
 src/qt/transactionrecord.cpp               |   2 ++
 src/qt/transactionrecord.h                 |   1 +
 src/qt/transactiontablemodel.cpp           |  10 +++++++
 src/qt/transactionview.cpp                 |  33 +++++++++++++++++++--
 src/qt/transactionview.h                   |   2 ++
 src/qt/walletmodel.cpp                     |  15 ++++++++++
 src/qt/walletmodel.h                       |   3 ++
 12 files changed, 70 insertions(+), 4 deletions(-)
 create mode 100644 src/qt/res/icons/transaction_abandoned.png

diff --git a/src/Makefile.qt.include b/src/Makefile.qt.include
index ca4e1e70d085e..247ca3f1d41f6 100644
--- a/src/Makefile.qt.include
+++ b/src/Makefile.qt.include
@@ -268,7 +268,8 @@ RES_ICONS = \
   qt/res/icons/tx_output.png \
   qt/res/icons/tx_mined.png \
   qt/res/icons/warning.png \
-  qt/res/icons/verify.png
+  qt/res/icons/verify.png \
+  qt/res/icons/transaction_abandoned.png
 
 BITCOIN_QT_CPP = \
   qt/bantablemodel.cpp \
diff --git a/src/qt/bitcoin.qrc b/src/qt/bitcoin.qrc
index dcd3b4ae2ce09..24b0bae3ec144 100644
--- a/src/qt/bitcoin.qrc
+++ b/src/qt/bitcoin.qrc
@@ -49,6 +49,7 @@
         <file alias="fontbigger">res/icons/fontbigger.png</file>
         <file alias="fontsmaller">res/icons/fontsmaller.png</file>
         <file alias="prompticon">res/icons/chevron.png</file>
+        <file alias="transaction_abandoned">res/icons/transaction_abandoned.png</file>
     </qresource>
     <qresource prefix="/movies">
         <file alias="spinner-000">res/movies/spinner-000.png</file>
diff --git a/src/qt/guiconstants.h b/src/qt/guiconstants.h
index 5ceffcd70af58..4b2c10dd48e43 100644
--- a/src/qt/guiconstants.h
+++ b/src/qt/guiconstants.h
@@ -29,6 +29,8 @@ static const bool DEFAULT_SPLASHSCREEN = true;
 #define COLOR_TX_STATUS_OPENUNTILDATE QColor(64, 64, 255)
 /* Transaction list -- TX status decoration - offline */
 #define COLOR_TX_STATUS_OFFLINE QColor(192, 192, 192)
+/* Transaction list -- TX status decoration - danger, tx needs attention */
+#define COLOR_TX_STATUS_DANGER QColor(200, 100, 100)
 /* Transaction list -- TX status decoration - default color */
 #define COLOR_BLACK QColor(0, 0, 0)
 
diff --git a/src/qt/res/icons/transaction_abandoned.png b/src/qt/res/icons/transaction_abandoned.png
new file mode 100644
index 0000000000000000000000000000000000000000..8ca6445c20f263b3dd479806a524e3f09b8f9e63
GIT binary patch
literal 1473
zcmchX`8(8k0LMSynaoU+ab$|ek)tO~D$$@ah8aiFk|SEjIxB=3gH0I63^{UbMX?sC
zZJ%}I2uX;qb*;sq7)x%$jF53HQLLVRY5#$Jp7;Cx`uY9K>yFhWQyf+n3jn~GT`;!U
zCF@HusNHSSckci|B*Dy>Y8x`NFhcdl-@>;o`R}hiX`$rdLBrX{x>Tyos9;o{;Ex$5
zD5rafqo_i{1@%d)M6|T>19{`)%?D%O3||+g5?1dU#vIaXDWuk*Djz(tRjwhg;w&EK
z?9jI>JZB76wwg%i{7)~ww&adPsY(_0t0hjxWhnulXh7IQQ3hDZ3d1r4S(oUaebDtl
zl{Lnarf83cxZgClcU~x_+q-~DXbc3g#p|p)9dc+0;m#(8zz-L`u&%1vCq7ObcW;bS
zY%wZoC<FS?p#wi|SnHMR<Haa)8qUHAQ_UP6nVJt$eT5y9A@@KXy3<$C;W4^tg8?zJ
zAtN#;uq-oNE#3T}2%H_KP-~XX1dB+2t@)az*3C3uK$fi}hAoS^Rq#_C5<0x%gDL=q
z^-U;N;3DkqCR*)Da(bZ|J4UlhgW|du{4Q(qYdj;!ei0mbR?N_ZQ@=t}i~~Yr&j}xm
zBH1MFdLOh3ozlK*J9(rhLx&ZBQ|Xtnl!GI1%Kg=kbin7aN6SohB~-_iut^!Xfz0gR
z<zOY0?1L$2^&SGcY_zPg+7b|S{&BvC4@=>$*-hP9BNLq(BVb&Fn*9R>SdP1BzOBVj
z5FUwaSYS%Y9HR`c3M>XUYt+*f(OdHpxld%~(z{b#z1NZdIrPoB4Fmy_W*M*y*ov%C
zRLZtQ^_~;Jl3hf(6_ZUTeJGfAE?=p>QtI688XO^=|LUd_xR0!M<ZrkJ7=*nTT~snZ
zBjfq{XokhPRR5QA`CYG6KryoH;YR$$`K0zi-i9veYGAN#piT>K{_wWDxUWc_HV8f&
zm|D!xuya#V^@8t7p%*d_d&PrF6s&H_xnRzTyt1uTLN(=VXJ$*9a?~LS@IQuS4pj@R
zd9#^8v;dxH8*h~qDAvrAXYf|rc%r1hs%BpHKZ3579+1642<!}~XZG!^%+6g+bw%ox
zq^*bw65D6Xqe{C%{rE*Mx$kcF%?t<iou29aCFn6E4E=elJ)k}^ublUHl>FG|-XSMq
zPXpTs7brFu@Ll6P?Jm)8Kx*1nzEs9O=Oi<kegzT@#XH>S5vXr7v-sb`s4S-uSW?c$
zGVL5W_>-ip!4JBQa`QDP`BIJE!jM%@f);p3PJD)7{<%IhHJGvR7$QKWdf3;wL12I!
zwv26?;#Xk7c$Mk%B)BSDEJ`ji%5lAF?x_Qc!CjgDAl+8`!D>LZsN;7<FC&q%{t7pK
zt7)FE9`#gJ92U5#QYZL9r$4Ri4byll;5ncfD%2&r@wNlu_>Q6XRdbd$J9m1Zbk@h)
z7WwvvFS14JuMIev*{_EawY?Mo+<rSH!2`-H>w0L(PE8iAYbx=AOZ*?3tmXR6B*lX~
zWG2n}a^n7qE`&G)V0w2qY?5p;Cmo6ajPp%2HO{lA1<H^&ntlW3RL5@p<c`9DJmSPC
zCHHFUrco|re8zgXAI@lTp7f`;E3mxNcwV^N!nH<b#c^8z6hX#5{ZAcSbRtH{(e?6<
zOPyXDv52(v7ZR{s#!2He4tj_Cex7DGwTy6^wU8R)Gv0dlzW4dqr5=iuC{BS1jHANF
zvFExv^+o5W55RBMG#U7fg9Ky)vYV(Q;0HTjujTw2JhB-68<rv&nZFm2r}{;ActoBA
gi2Z87#OUURg0z{lFDIHzcGV2bOfDIh7`jFO3$FroD*ylh

literal 0
HcmV?d00001

diff --git a/src/qt/transactiondesc.cpp b/src/qt/transactiondesc.cpp
index 5cb4cd5af72b2..1b8bf978ad831 100644
--- a/src/qt/transactiondesc.cpp
+++ b/src/qt/transactiondesc.cpp
@@ -39,7 +39,7 @@ QString TransactionDesc::FormatTxStatus(const CWalletTx& wtx)
         else if (GetAdjustedTime() - wtx.nTimeReceived > 2 * 60 && wtx.GetRequestCount() == 0)
             return tr("%1/offline").arg(nDepth);
         else if (nDepth == 0)
-            return tr("0/unconfirmed, %1").arg((wtx.InMempool() ? tr("in memory pool") : tr("not in memory pool")));
+            return tr("0/unconfirmed, %1").arg((wtx.InMempool() ? tr("in memory pool") : tr("not in memory pool"))) + (wtx.isAbandoned() ? ", "+tr("abandoned") : "");
         else if (nDepth < 6)
             return tr("%1/unconfirmed").arg(nDepth);
         else
diff --git a/src/qt/transactionrecord.cpp b/src/qt/transactionrecord.cpp
index 5b16b108e66dd..1efeda93ec8f5 100644
--- a/src/qt/transactionrecord.cpp
+++ b/src/qt/transactionrecord.cpp
@@ -239,6 +239,8 @@ void TransactionRecord::updateStatus(const CWalletTx &wtx)
         else if (status.depth == 0)
         {
             status.status = TransactionStatus::Unconfirmed;
+            if (wtx.isAbandoned())
+                status.status = TransactionStatus::Abandoned;
         }
         else if (status.depth < RecommendedNumConfirmations)
         {
diff --git a/src/qt/transactionrecord.h b/src/qt/transactionrecord.h
index 49753ee31f815..330cd48cfa92a 100644
--- a/src/qt/transactionrecord.h
+++ b/src/qt/transactionrecord.h
@@ -33,6 +33,7 @@ class TransactionStatus
         Unconfirmed,        /**< Not yet mined into a block **/
         Confirming,         /**< Confirmed, but waiting for the recommended number of confirmations **/
         Conflicted,         /**< Conflicts with other transaction or mempool **/
+        Abandoned,          /**< Abandoned from the wallet **/
         /// Generated (mined) transactions
         Immature,           /**< Mined but waiting for maturity */
         MaturesWarning,     /**< Transaction will likely not mature because no nodes have confirmed */
diff --git a/src/qt/transactiontablemodel.cpp b/src/qt/transactiontablemodel.cpp
index d2a52b3022c79..b29ecf83486b0 100644
--- a/src/qt/transactiontablemodel.cpp
+++ b/src/qt/transactiontablemodel.cpp
@@ -312,6 +312,9 @@ QString TransactionTableModel::formatTxStatus(const TransactionRecord *wtx) cons
     case TransactionStatus::Unconfirmed:
         status = tr("Unconfirmed");
         break;
+    case TransactionStatus::Abandoned:
+        status = tr("Abandoned");
+        break;
     case TransactionStatus::Confirming:
         status = tr("Confirming (%1 of %2 recommended confirmations)").arg(wtx->status.depth).arg(TransactionRecord::RecommendedNumConfirmations);
         break;
@@ -468,6 +471,8 @@ QVariant TransactionTableModel::txStatusDecoration(const TransactionRecord *wtx)
         return COLOR_TX_STATUS_OFFLINE;
     case TransactionStatus::Unconfirmed:
         return QIcon(":/icons/transaction_0");
+    case TransactionStatus::Abandoned:
+        return QIcon(":/icons/transaction_abandoned");
     case TransactionStatus::Confirming:
         switch(wtx->status.depth)
         {
@@ -573,6 +578,11 @@ QVariant TransactionTableModel::data(const QModelIndex &index, int role) const
     case Qt::TextAlignmentRole:
         return column_alignments[index.column()];
     case Qt::ForegroundRole:
+        // Use the "danger" color for abandoned transactions
+        if(rec->status.status == TransactionStatus::Abandoned)
+        {
+            return COLOR_TX_STATUS_DANGER;
+        }
         // Non-confirmed (but not immature) as transactions are grey
         if(!rec->status.countsForBalance && rec->status.status != TransactionStatus::Immature)
         {
diff --git a/src/qt/transactionview.cpp b/src/qt/transactionview.cpp
index a4d4c7a35fe9b..a352228c36fb5 100644
--- a/src/qt/transactionview.cpp
+++ b/src/qt/transactionview.cpp
@@ -37,7 +37,7 @@
 
 TransactionView::TransactionView(const PlatformStyle *platformStyle, QWidget *parent) :
     QWidget(parent), model(0), transactionProxyModel(0),
-    transactionView(0)
+    transactionView(0), abandonAction(0)
 {
     // Build filter row
     setContentsMargins(0,0,0,0);
@@ -137,6 +137,7 @@ TransactionView::TransactionView(const PlatformStyle *platformStyle, QWidget *pa
     transactionView = view;
 
     // Actions
+    abandonAction = new QAction(tr("Abandon transaction"), this);
     QAction *copyAddressAction = new QAction(tr("Copy address"), this);
     QAction *copyLabelAction = new QAction(tr("Copy label"), this);
     QAction *copyAmountAction = new QAction(tr("Copy amount"), this);
@@ -153,8 +154,10 @@ TransactionView::TransactionView(const PlatformStyle *platformStyle, QWidget *pa
     contextMenu->addAction(copyTxIDAction);
     contextMenu->addAction(copyTxHexAction);
     contextMenu->addAction(copyTxPlainText);
-    contextMenu->addAction(editLabelAction);
     contextMenu->addAction(showDetailsAction);
+    contextMenu->addSeparator();
+    contextMenu->addAction(abandonAction);
+    contextMenu->addAction(editLabelAction);
 
     mapperThirdPartyTxUrls = new QSignalMapper(this);
 
@@ -170,6 +173,7 @@ TransactionView::TransactionView(const PlatformStyle *platformStyle, QWidget *pa
     connect(view, SIGNAL(doubleClicked(QModelIndex)), this, SIGNAL(doubleClicked(QModelIndex)));
     connect(view, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(contextualMenu(QPoint)));
 
+    connect(abandonAction, SIGNAL(triggered()), this, SLOT(abandonTx()));
     connect(copyAddressAction, SIGNAL(triggered()), this, SLOT(copyAddress()));
     connect(copyLabelAction, SIGNAL(triggered()), this, SLOT(copyLabel()));
     connect(copyAmountAction, SIGNAL(triggered()), this, SLOT(copyAmount()));
@@ -360,12 +364,37 @@ void TransactionView::exportClicked()
 void TransactionView::contextualMenu(const QPoint &point)
 {
     QModelIndex index = transactionView->indexAt(point);
+    QModelIndexList selection = transactionView->selectionModel()->selectedRows(0);
+
+    // check if transaction can be abandoned, disable context menu action in case it doesn't
+    uint256 hash;
+    hash.SetHex(selection.at(0).data(TransactionTableModel::TxHashRole).toString().toStdString());
+    abandonAction->setEnabled(model->transactionCanBeAbandoned(hash));
+
     if(index.isValid())
     {
         contextMenu->exec(QCursor::pos());
     }
 }
 
+void TransactionView::abandonTx()
+{
+    if(!transactionView || !transactionView->selectionModel())
+        return;
+    QModelIndexList selection = transactionView->selectionModel()->selectedRows(0);
+
+    // get the hash from the TxHashRole (QVariant / QString)
+    uint256 hash;
+    QString hashQStr = selection.at(0).data(TransactionTableModel::TxHashRole).toString();
+    hash.SetHex(hashQStr.toStdString());
+
+    // Abandon the wallet transaction over the walletModel
+    model->abandonTransaction(hash);
+
+    // Update the table
+    model->getTransactionTableModel()->updateTransaction(hashQStr, CT_UPDATED, false);
+}
+
 void TransactionView::copyAddress()
 {
     GUIUtil::copyEntryData(transactionView, 0, TransactionTableModel::AddressRole);
diff --git a/src/qt/transactionview.h b/src/qt/transactionview.h
index 2cfbd471b099b..e9b9d5b6bc9e2 100644
--- a/src/qt/transactionview.h
+++ b/src/qt/transactionview.h
@@ -75,6 +75,7 @@ class TransactionView : public QWidget
     QFrame *dateRangeWidget;
     QDateTimeEdit *dateFrom;
     QDateTimeEdit *dateTo;
+    QAction *abandonAction;
 
     QWidget *createDateRangeWidget();
 
@@ -97,6 +98,7 @@ private Q_SLOTS:
     void copyTxPlainText();
     void openThirdPartyTxUrl(QString url);
     void updateWatchOnlyColumn(bool fHaveWatchOnly);
+    void abandonTx();
 
 Q_SIGNALS:
     void doubleClicked(const QModelIndex&);
diff --git a/src/qt/walletmodel.cpp b/src/qt/walletmodel.cpp
index cf38c64eb0dee..ce230d6aedbce 100644
--- a/src/qt/walletmodel.cpp
+++ b/src/qt/walletmodel.cpp
@@ -668,3 +668,18 @@ bool WalletModel::saveReceiveRequest(const std::string &sAddress, const int64_t
     else
         return wallet->AddDestData(dest, key, sRequest);
 }
+
+bool WalletModel::transactionCanBeAbandoned(uint256 hash) const
+{
+    LOCK2(cs_main, wallet->cs_wallet);
+    const CWalletTx *wtx = wallet->GetWalletTx(hash);
+    if (!wtx || wtx->isAbandoned() || wtx->GetDepthInMainChain() > 0 || wtx->InMempool())
+        return false;
+    return true;
+}
+
+bool WalletModel::abandonTransaction(uint256 hash) const
+{
+    LOCK2(cs_main, wallet->cs_wallet);
+    return wallet->AbandonTransaction(hash);
+}
diff --git a/src/qt/walletmodel.h b/src/qt/walletmodel.h
index 7a47eda86f70d..e5470bf618eea 100644
--- a/src/qt/walletmodel.h
+++ b/src/qt/walletmodel.h
@@ -200,6 +200,9 @@ class WalletModel : public QObject
     void loadReceiveRequests(std::vector<std::string>& vReceiveRequests);
     bool saveReceiveRequest(const std::string &sAddress, const int64_t nId, const std::string &sRequest);
 
+    bool transactionCanBeAbandoned(uint256 hash) const;
+    bool abandonTransaction(uint256 hash) const;
+
 private:
     CWallet *wallet;
     bool fHaveWatchOnly;

From 0087f2684891d9f208a1d91758e662d0538d54ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pavel=20Jan=C3=ADk?= <Pavel@Janik.cz>
Date: Sat, 2 Apr 2016 16:32:42 +0200
Subject: [PATCH 0088/1802] Use relative paths instead of absolute paths

---
 src/Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index 1e54512cbddc1..d91e959cffe79 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -479,7 +479,7 @@ endif
 
 %.pb.cc %.pb.h: %.proto
 	@test -f $(PROTOC)
-	$(AM_V_GEN) $(PROTOC) --cpp_out=$(@D) --proto_path=$(abspath $(<D) $<)
+	$(AM_V_GEN) $(PROTOC) --cpp_out=$(@D) --proto_path=$(<D) $<
 
 if ENABLE_TESTS
 include Makefile.test.include

From 92107d574d35d803399ee4dc9d3a1fb6a82a9229 Mon Sep 17 00:00:00 2001
From: mruddy <mruddy@users.noreply.github.com>
Date: Mon, 4 Apr 2016 22:21:00 +0000
Subject: [PATCH 0089/1802] RPC: add versionHex in getblock and getblockheader
 JSON results; expand data in getblockchaininfo bip9_softforks field.

---
 qa/rpc-tests/blockchain.py |  1 +
 src/rpc/blockchain.cpp     | 16 +++++++++++++++-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/qa/rpc-tests/blockchain.py b/qa/rpc-tests/blockchain.py
index 272a5dc15482e..8f59ee741c366 100755
--- a/qa/rpc-tests/blockchain.py
+++ b/qa/rpc-tests/blockchain.py
@@ -82,6 +82,7 @@ def _test_getblockheader(self):
         assert isinstance(header['mediantime'], int)
         assert isinstance(header['nonce'], int)
         assert isinstance(header['version'], int)
+        assert isinstance(int(header['versionHex'], 16), int)
         assert isinstance(header['difficulty'], Decimal)
 
 if __name__ == '__main__':
diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp
index f1c9d9f7ab528..34637b9f7e398 100644
--- a/src/rpc/blockchain.cpp
+++ b/src/rpc/blockchain.cpp
@@ -70,6 +70,7 @@ UniValue blockheaderToJSON(const CBlockIndex* blockindex)
     result.push_back(Pair("confirmations", confirmations));
     result.push_back(Pair("height", blockindex->nHeight));
     result.push_back(Pair("version", blockindex->nVersion));
+    result.push_back(Pair("versionHex", strprintf("%08x", blockindex->nVersion)));
     result.push_back(Pair("merkleroot", blockindex->hashMerkleRoot.GetHex()));
     result.push_back(Pair("time", (int64_t)blockindex->nTime));
     result.push_back(Pair("mediantime", (int64_t)blockindex->GetMedianTimePast()));
@@ -98,6 +99,7 @@ UniValue blockToJSON(const CBlock& block, const CBlockIndex* blockindex, bool tx
     result.push_back(Pair("size", (int)::GetSerializeSize(block, SER_NETWORK, PROTOCOL_VERSION)));
     result.push_back(Pair("height", blockindex->nHeight));
     result.push_back(Pair("version", block.nVersion));
+    result.push_back(Pair("versionHex", strprintf("%08x", block.nVersion)));
     result.push_back(Pair("merkleroot", block.hashMerkleRoot.GetHex()));
     UniValue txs(UniValue::VARR);
     BOOST_FOREACH(const CTransaction&tx, block.vtx)
@@ -316,6 +318,7 @@ UniValue getblockheader(const UniValue& params, bool fHelp)
             "  \"confirmations\" : n,   (numeric) The number of confirmations, or -1 if the block is not on the main chain\n"
             "  \"height\" : n,          (numeric) The block height or index\n"
             "  \"version\" : n,         (numeric) The block version\n"
+            "  \"versionHex\" : \"00000000\", (string) The block version formatted in hexadecimal\n"
             "  \"merkleroot\" : \"xxxx\", (string) The merkle root\n"
             "  \"time\" : ttt,          (numeric) The block time in seconds since epoch (Jan 1 1970 GMT)\n"
             "  \"mediantime\" : ttt,    (numeric) The median block time in seconds since epoch (Jan 1 1970 GMT)\n"
@@ -375,6 +378,7 @@ UniValue getblock(const UniValue& params, bool fHelp)
             "  \"size\" : n,            (numeric) The block size\n"
             "  \"height\" : n,          (numeric) The block height or index\n"
             "  \"version\" : n,         (numeric) The block version\n"
+            "  \"versionHex\" : \"00000000\", (string) The block version formatted in hexadecimal\n"
             "  \"merkleroot\" : \"xxxx\", (string) The merkle root\n"
             "  \"tx\" : [               (array of string) The transaction ids\n"
             "     \"transactionid\"     (string) The transaction id\n"
@@ -608,13 +612,20 @@ static UniValue BIP9SoftForkDesc(const std::string& name, const Consensus::Param
 {
     UniValue rv(UniValue::VOBJ);
     rv.push_back(Pair("id", name));
-    switch (VersionBitsTipState(consensusParams, id)) {
+    const ThresholdState thresholdState = VersionBitsTipState(consensusParams, id);
+    switch (thresholdState) {
     case THRESHOLD_DEFINED: rv.push_back(Pair("status", "defined")); break;
     case THRESHOLD_STARTED: rv.push_back(Pair("status", "started")); break;
     case THRESHOLD_LOCKED_IN: rv.push_back(Pair("status", "locked_in")); break;
     case THRESHOLD_ACTIVE: rv.push_back(Pair("status", "active")); break;
     case THRESHOLD_FAILED: rv.push_back(Pair("status", "failed")); break;
     }
+    if (THRESHOLD_STARTED == thresholdState)
+    {
+        rv.push_back(Pair("bit", consensusParams.vDeployments[id].bit));
+    }
+    rv.push_back(Pair("startTime", consensusParams.vDeployments[id].nStartTime));
+    rv.push_back(Pair("timeout", consensusParams.vDeployments[id].nTimeout));
     return rv;
 }
 
@@ -653,6 +664,9 @@ UniValue getblockchaininfo(const UniValue& params, bool fHelp)
             "     {\n"
             "        \"id\": \"xxxx\",        (string) name of the softfork\n"
             "        \"status\": \"xxxx\",    (string) one of \"defined\", \"started\", \"lockedin\", \"active\", \"failed\"\n"
+            "        \"bit\": xx,             (numeric) the bit, 0-28, in the block version field used to signal this soft fork\n"
+            "        \"startTime\": xx,       (numeric) the minimum median time past of a block at which the bit gains its meaning\n"
+            "        \"timeout\": xx          (numeric) the median time past of a block at which the deployment is considered failed if not yet locked in\n"
             "     }\n"
             "  ]\n"
             "}\n"

From dc4ec6d3dbb5018cdc059eebb55994fab5d23679 Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Mon, 4 Apr 2016 15:48:18 -0400
Subject: [PATCH 0090/1802] depends: create a hostid and buildid and add option
 for salts

These add very simple sanity checks to ensure that the build/host toolchains
have not changed since the last run. If they have, all ids will change and
packages will be rebuilt.

For more complicated usage (like parsing dpkg), HOST_ID_SALT/BUILD_ID_SALT may
be used to introduce arbitrary data to the ids.
---
 depends/Makefile  | 18 +++++++++++++++++-
 depends/README.md |  2 ++
 depends/funcs.mk  |  2 +-
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/depends/Makefile b/depends/Makefile
index ef5a20e6c36aa..7ae14524e1f12 100644
--- a/depends/Makefile
+++ b/depends/Makefile
@@ -15,6 +15,8 @@ BASEDIR = $(CURDIR)
 HASH_LENGTH:=11
 DOWNLOAD_CONNECT_TIMEOUT:=10
 DOWNLOAD_RETRIES:=3
+HOST_ID_SALT ?= salt
+BUILD_ID_SALT ?= salt
 
 host:=$(BUILD)
 ifneq ($(HOST),)
@@ -73,6 +75,20 @@ include builders/$(build_os).mk
 include builders/default.mk
 include packages/packages.mk
 
+build_id_string:=$(BUILD_ID_SALT)
+build_id_string+=$(shell $(build_CC) --version 2>/dev/null)
+build_id_string+=$(shell $(build_AR) --version 2>/dev/null)
+build_id_string+=$(shell $(build_CXX) --version 2>/dev/null)
+build_id_string+=$(shell $(build_RANLIB) --version 2>/dev/null)
+build_id_string+=$(shell $(build_STRIP) --version 2>/dev/null)
+
+$(host_arch)_$(host_os)_id_string:=$(HOST_ID_SALT)
+$(host_arch)_$(host_os)_id_string+=$(shell $(host_CC) --version 2>/dev/null)
+$(host_arch)_$(host_os)_id_string+=$(shell $(host_AR) --version 2>/dev/null)
+$(host_arch)_$(host_os)_id_string+=$(shell $(host_CXX) --version 2>/dev/null)
+$(host_arch)_$(host_os)_id_string+=$(shell $(host_RANLIB) --version 2>/dev/null)
+$(host_arch)_$(host_os)_id_string+=$(shell $(host_STRIP) --version 2>/dev/null)
+
 qt_packages_$(NO_QT) = $(qt_packages) $(qt_$(host_os)_packages)
 qt_native_packages_$(NO_QT) = $(qt_native_packages)
 wallet_packages_$(NO_WALLET) = $(wallet_packages)
@@ -90,7 +106,7 @@ include funcs.mk
 
 toolchain_path=$($($(host_arch)_$(host_os)_native_toolchain)_prefixbin)
 final_build_id_long+=$(shell $(build_SHA256SUM) config.site.in)
-final_build_id+=$(shell echo -n $(final_build_id_long) | $(build_SHA256SUM) | cut -c-$(HASH_LENGTH))
+final_build_id+=$(shell echo -n "$(final_build_id_long)" | $(build_SHA256SUM) | cut -c-$(HASH_LENGTH))
 $(host_prefix)/.stamp_$(final_build_id): $(native_packages) $(packages)
 	$(AT)rm -rf $(@D)
 	$(AT)mkdir -p $(@D)
diff --git a/depends/README.md b/depends/README.md
index d85e652c60f23..271bbd80bfc4a 100644
--- a/depends/README.md
+++ b/depends/README.md
@@ -38,6 +38,8 @@ The following can be set when running make: make FOO=bar
     NO_WALLET: Don't download/build/cache libs needed to enable the wallet
     NO_UPNP: Don't download/build/cache packages needed for enabling upnp
     DEBUG: disable some optimizations and enable more runtime checking
+    HOST_ID_SALT: Optional salt to use when generating host package ids
+    BUILD_ID_SALT: Optional salt to use when generating build package ids
 
 If some packages are not built, for example `make NO_WALLET=1`, the appropriate
 options will be passed to bitcoin's configure. In this case, `--disable-wallet`.
diff --git a/depends/funcs.mk b/depends/funcs.mk
index 050a9b132137e..45bb96dd4438b 100644
--- a/depends/funcs.mk
+++ b/depends/funcs.mk
@@ -39,7 +39,7 @@ define int_get_build_id
 $(eval $(1)_dependencies += $($(1)_$(host_arch)_$(host_os)_dependencies) $($(1)_$(host_os)_dependencies))
 $(eval $(1)_all_dependencies:=$(call int_get_all_dependencies,$(1),$($($(1)_type)_native_toolchain) $($(1)_dependencies)))
 $(foreach dep,$($(1)_all_dependencies),$(eval $(1)_build_id_deps+=$(dep)-$($(dep)_version)-$($(dep)_recipe_hash)))
-$(eval $(1)_build_id_long:=$(1)-$($(1)_version)-$($(1)_recipe_hash)-$(release_type) $($(1)_build_id_deps))
+$(eval $(1)_build_id_long:=$(1)-$($(1)_version)-$($(1)_recipe_hash)-$(release_type) $($(1)_build_id_deps) $($($(1)_type)_id_string))
 $(eval $(1)_build_id:=$(shell echo -n "$($(1)_build_id_long)" | $(build_SHA256SUM) | cut -c-$(HASH_LENGTH)))
 final_build_id_long+=$($(package)_build_id_long)
 

From fe740f14690f70fbb84287595049afc719a5bd3b Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Thu, 3 Mar 2016 01:01:30 -0500
Subject: [PATCH 0091/1802] depends: fix fallback downloads

In some cases, failed downloads wouldn't trigger a fallback download attempt.
Namely, checksum mismatches.
---
 depends/funcs.mk | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/depends/funcs.mk b/depends/funcs.mk
index 45bb96dd4438b..15e404e42dcf3 100644
--- a/depends/funcs.mk
+++ b/depends/funcs.mk
@@ -19,15 +19,19 @@ define int_get_all_dependencies
 $(sort $(foreach dep,$(2),$(2) $(call int_get_all_dependencies,$(1),$($(dep)_dependencies))))
 endef
 
-define fetch_file
-(test -f $$($(1)_source_dir)/$(4) || \
-  ( mkdir -p $$($(1)_download_dir) && echo Fetching $(1)... && \
-  ( $(build_DOWNLOAD) "$$($(1)_download_dir)/$(4).temp" "$(2)/$(3)" || \
-    $(build_DOWNLOAD) "$$($(1)_download_dir)/$(4).temp" "$(FALLBACK_DOWNLOAD_PATH)/$(3)" ) && \
+define fetch_file_inner
+    ( mkdir -p $$($(1)_download_dir) && echo Fetching $(3) from $(2) && \
+    $(build_DOWNLOAD) "$$($(1)_download_dir)/$(4).temp" "$(2)/$(3)" && \
     echo "$(5)  $$($(1)_download_dir)/$(4).temp" > $$($(1)_download_dir)/.$(4).hash && \
     $(build_SHA256SUM) -c $$($(1)_download_dir)/.$(4).hash && \
     mv $$($(1)_download_dir)/$(4).temp $$($(1)_source_dir)/$(4) && \
-    rm -rf $$($(1)_download_dir) ))
+    rm -rf $$($(1)_download_dir) )
+endef
+
+define fetch_file
+    ( test -f $$($(1)_source_dir)/$(4) || \
+    ( $(call fetch_file_inner,$(1),$(2),$(3),$(4),$(5)) || \
+      $(call fetch_file_inner,$(1),$(FALLBACK_DOWNLOAD_PATH),$(3),$(4),$(5))))
 endef
 
 define int_get_build_recipe_hash

From bb717f43756cf2754b6ed6fc54d52b535ed25fb2 Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Mon, 4 Apr 2016 15:44:02 -0400
Subject: [PATCH 0092/1802] depends: fix "unexpected operator" error during
 "make download"

---
 depends/Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/depends/Makefile b/depends/Makefile
index 7ae14524e1f12..3ddfc85a450d0 100644
--- a/depends/Makefile
+++ b/depends/Makefile
@@ -147,9 +147,9 @@ endef
 
 define check_or_remove_sources
   mkdir -p $($(package)_source_dir); cd $($(package)_source_dir); \
-  $(build_SHA256SUM) -c $($(package)_fetched) >/dev/null 2>/dev/null || \
-    ( if test -f $($(package)_all_sources); then echo "Checksum missing or mismatched for $(package) source. Forcing re-download."; fi; \
-      rm -f $($(package)_all_sources) $($(1)_fetched))
+  test -f $($(package)_fetched) && ( $(build_SHA256SUM) -c $($(package)_fetched) >/dev/null 2>/dev/null || \
+    ( echo "Checksum missing or mismatched for $(package) source. Forcing re-download."; \
+      rm -f $($(package)_all_sources) $($(1)_fetched))) || true
 endef
 
 check-packages:

From 11d9f6b8b82df04e9cf0ba7d8434eaa3fe394ee5 Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Mon, 4 Apr 2016 18:20:20 -0400
Subject: [PATCH 0093/1802] depends: qt/cctools: fix checksum checksum tests

Checksums were being verified after download, but not again before extraction
---
 depends/packages/native_cctools.mk | 4 ++++
 depends/packages/qt.mk             | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/depends/packages/native_cctools.mk b/depends/packages/native_cctools.mk
index 1c1bcf199a0bd..b5603a8d48c60 100644
--- a/depends/packages/native_cctools.mk
+++ b/depends/packages/native_cctools.mk
@@ -17,6 +17,10 @@ $(call fetch_file,$(package),$($(package)_clang_download_path),$($(package)_clan
 endef
 
 define $(package)_extract_cmds
+  mkdir -p $($(package)_extract_dir) && \
+  echo "$($(package)_sha256_hash)  $($(package)_source)" > $($(package)_extract_dir)/.$($(package)_file_name).hash && \
+  echo "$($(package)_clang_sha256_hash)  $($(package)_source_dir)/$($(package)_clang_file_name)" >> $($(package)_extract_dir)/.$($(package)_file_name).hash && \
+  $(build_SHA256SUM) -c $($(package)_extract_dir)/.$($(package)_file_name).hash && \
   mkdir -p toolchain/bin toolchain/lib/clang/3.5/include && \
   tar --strip-components=1 -C toolchain -xf $($(package)_source_dir)/$($(package)_clang_file_name) && \
   echo "#!/bin/sh" > toolchain/bin/$(host)-dsymutil && \
diff --git a/depends/packages/qt.mk b/depends/packages/qt.mk
index 901b761fde142..77df77b73f7f0 100644
--- a/depends/packages/qt.mk
+++ b/depends/packages/qt.mk
@@ -108,8 +108,8 @@ endef
 define $(package)_extract_cmds
   mkdir -p $($(package)_extract_dir) && \
   echo "$($(package)_sha256_hash)  $($(package)_source)" > $($(package)_extract_dir)/.$($(package)_file_name).hash && \
-  echo "$($(package)_qttranslations_sha256_hash)  $($(package)_source_dir)/$($(package)_qttranslations_file_name)" > $($(package)_extract_dir)/.$($(package)_file_name).hash && \
-  echo "$($(package)_qttools_sha256_hash)  $($(package)_source_dir)/$($(package)_qttools_file_name)" > $($(package)_extract_dir)/.$($(package)_file_name).hash && \
+  echo "$($(package)_qttranslations_sha256_hash)  $($(package)_source_dir)/$($(package)_qttranslations_file_name)" >> $($(package)_extract_dir)/.$($(package)_file_name).hash && \
+  echo "$($(package)_qttools_sha256_hash)  $($(package)_source_dir)/$($(package)_qttools_file_name)" >> $($(package)_extract_dir)/.$($(package)_file_name).hash && \
   $(build_SHA256SUM) -c $($(package)_extract_dir)/.$($(package)_file_name).hash && \
   mkdir qtbase && \
   tar --strip-components=1 -xf $($(package)_source) -C qtbase && \

From fac9ca2ec69bc629dbbd81c83e5bf67690e52c96 Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Tue, 5 Apr 2016 12:49:53 +0200
Subject: [PATCH 0094/1802] [travis] echo $TRAVIS_COMMIT_RANGE

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 3f1af53011cb6..95ef36bf028ee 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -80,6 +80,6 @@ script:
     - if [ "$RUN_TESTS" = "true" ]; then make check; fi
     - if [ "$RUN_TESTS" = "true" ]; then qa/pull-tester/rpc-tests.py --coverage; fi
 after_script:
-    - echo "Commit, which was evaluated by travis in this build job:"
+    - echo $TRAVIS_COMMIT_RANGE
     - echo $TRAVIS_COMMIT_LOG
     - if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then (echo "Upload goes here. Something like: scp -r $BASE_OUTDIR server" || echo "upload failed"); fi

From c7c664191fd6ca4843cfe9d00abf8f2362b9550f Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Tue, 5 Apr 2016 14:54:18 +0200
Subject: [PATCH 0095/1802] Fix JSON pretty printing in script_tests

---
 src/test/script_tests.cpp | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/src/test/script_tests.cpp b/src/test/script_tests.cpp
index 30e3f37e14c28..8f927f8f91303 100644
--- a/src/test/script_tests.cpp
+++ b/src/test/script_tests.cpp
@@ -381,6 +381,18 @@ class TestBuilder
         return creditTx.vout[0].scriptPubKey;
     }
 };
+
+std::string JSONPrettyPrint(const UniValue& univalue)
+{
+    std::string ret = univalue.write(4);
+    // Workaround for libunivalue pretty printer, which puts a space between comma's and newlines
+    size_t pos = 0;
+    while ((pos = ret.find(" \n", pos)) != std::string::npos) {
+        ret.replace(pos, 2, "\n");
+        pos++;
+    }
+    return ret;
+}
 }
 
 BOOST_AUTO_TEST_CASE(script_build)
@@ -651,11 +663,11 @@ BOOST_AUTO_TEST_CASE(script_build)
 
         for (unsigned int idx = 0; idx < json_good.size(); idx++) {
             const UniValue& tv = json_good[idx];
-            tests_good.insert(tv.get_array().write(1,4));
+            tests_good.insert(JSONPrettyPrint(tv.get_array()));
         }
         for (unsigned int idx = 0; idx < json_bad.size(); idx++) {
             const UniValue& tv = json_bad[idx];
-            tests_bad.insert(tv.get_array().write(1,4));
+            tests_bad.insert(JSONPrettyPrint(tv.get_array()));
         }
     }
 
@@ -664,7 +676,7 @@ BOOST_AUTO_TEST_CASE(script_build)
 
     BOOST_FOREACH(TestBuilder& test, good) {
         test.Test(true);
-        std::string str = test.GetJSON().write(1,4);
+        std::string str = JSONPrettyPrint(test.GetJSON());
 #ifndef UPDATE_JSON_TESTS
         if (tests_good.count(str) == 0) {
             BOOST_CHECK_MESSAGE(false, "Missing auto script_valid test: " + test.GetComment());
@@ -674,7 +686,7 @@ BOOST_AUTO_TEST_CASE(script_build)
     }
     BOOST_FOREACH(TestBuilder& test, bad) {
         test.Test(false);
-        std::string str = test.GetJSON().write(1,4);
+        std::string str = JSONPrettyPrint(test.GetJSON());
 #ifndef UPDATE_JSON_TESTS
         if (tests_bad.count(str) == 0) {
             BOOST_CHECK_MESSAGE(false, "Missing auto script_invalid test: " + test.GetComment());

From d03e46625ac95954bb9ecbc2cf73ffd8de6b8a13 Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Tue, 5 Apr 2016 14:26:01 +0200
Subject: [PATCH 0096/1802] Fix formatting of NOPs for generated script tests

---
 src/core_write.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/core_write.cpp b/src/core_write.cpp
index b660e86c30b5d..6f9e2266a3966 100644
--- a/src/core_write.cpp
+++ b/src/core_write.cpp
@@ -35,7 +35,7 @@ string FormatScript(const CScript& script)
             } else if ((op >= OP_1 && op <= OP_16) || op == OP_1NEGATE) {
                 ret += strprintf("%i ", op - OP_1NEGATE - 1);
                 continue;
-            } else if (op >= OP_NOP && op <= OP_CHECKMULTISIGVERIFY) {
+            } else if (op >= OP_NOP && op <= OP_NOP10) {
                 string str(GetOpName(op));
                 if (str.substr(0, 3) == string("OP_")) {
                     ret += str.substr(3, string::npos) + " ";
@@ -45,7 +45,7 @@ string FormatScript(const CScript& script)
             if (vch.size() > 0) {
                 ret += strprintf("0x%x 0x%x ", HexStr(it2, it - vch.size()), HexStr(it - vch.size(), it));
             } else {
-                ret += strprintf("0x%x", HexStr(it2, it));
+                ret += strprintf("0x%x ", HexStr(it2, it));
             }
             continue;
         }

From 269281b7cc56e728fa64803fc7509ab3a0ce1805 Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Tue, 5 Apr 2016 14:08:13 +0200
Subject: [PATCH 0097/1802] Fix some misconstructed tests

They claimed to be testing P2SH scripts with non-push scriptSigs, but
1) they were not enabling P2SH
2) they have push-only scriptSigs

Fix this, and add a few more related cases.
---
 src/test/data/script_invalid.json | 16 ++++++++--------
 src/test/data/script_valid.json   | 12 ++++++++++++
 src/test/script_tests.cpp         | 14 ++++++++++----
 3 files changed, 30 insertions(+), 12 deletions(-)

diff --git a/src/test/data/script_invalid.json b/src/test/data/script_invalid.json
index 9e91132984ead..b9f150eacb236 100644
--- a/src/test/data/script_invalid.json
+++ b/src/test/data/script_invalid.json
@@ -845,18 +845,18 @@
     "SIG_PUSHONLY"
 ],
 [
-    "0x47 0x304402203e4516da7253cf068effec6b95c41221c0cf3a8e6ccb8cbf1725b562e9afde2c022054e1c258c2981cdfba5df1f46661fb6541c44f77ca0092f3600331abfffb125101 0x23 0x2103363d90d447b00c9c99ceac05b6262ee053441c7e55552ffe526bad8f83ff4640ac",
-    "0x21 0x03363d90d447b00c9c99ceac05b6262ee053441c7e55552ffe526bad8f83ff4640 CHECKSIG",
-    "",
+    "0x47 0x3044022018a2a81a93add5cb5f5da76305718e4ea66045ec4888b28d84cb22fae7f4645b02201e6daa5ed5d2e4b2b2027cf7ffd43d8d9844dd49f74ef86899ec8e669dfd39aa01 NOP8 0x23 0x2103363d90d447b00c9c99ceac05b6262ee053441c7e55552ffe526bad8f83ff4640ac",
+    "HASH160 0x14 0x215640c2f72f0d16b4eced26762035a42ffed39a EQUAL",
+    "P2SH",
     "P2SH(P2PK) with non-push scriptSig but no SIGPUSHONLY",
-    "EVAL_FALSE"
+    "SIG_PUSHONLY"
 ],
 [
-    "0x47 0x304402203e4516da7253cf068effec6b95c41221c0cf3a8e6ccb8cbf1725b562e9afde2c022054e1c258c2981cdfba5df1f46661fb6541c44f77ca0092f3600331abfffb125101 0x23 0x2103363d90d447b00c9c99ceac05b6262ee053441c7e55552ffe526bad8f83ff4640ac",
-    "0x21 0x03363d90d447b00c9c99ceac05b6262ee053441c7e55552ffe526bad8f83ff4640 CHECKSIG",
+    "0x47 0x3044022018a2a81a93add5cb5f5da76305718e4ea66045ec4888b28d84cb22fae7f4645b02201e6daa5ed5d2e4b2b2027cf7ffd43d8d9844dd49f74ef86899ec8e669dfd39aa01 NOP8 0x23 0x2103363d90d447b00c9c99ceac05b6262ee053441c7e55552ffe526bad8f83ff4640ac",
+    "HASH160 0x14 0x215640c2f72f0d16b4eced26762035a42ffed39a EQUAL",
     "SIGPUSHONLY",
-    "P2SH(P2PK) with non-push scriptSig",
-    "EVAL_FALSE"
+    "P2SH(P2PK) with non-push scriptSig but not P2SH",
+    "SIG_PUSHONLY"
 ],
 [
     "11 0x47 0x304402200a5c6163f07b8d3b013c4d1d6dba25e780b39658d79ba37af7057a3b7f15ffa102201fd9b4eaa9943f734928b99a83592c2e7bf342ea2680f6a2bb705167966b742001",
diff --git a/src/test/data/script_valid.json b/src/test/data/script_valid.json
index e5f0d17b0473e..29ccbd92ff930 100644
--- a/src/test/data/script_valid.json
+++ b/src/test/data/script_valid.json
@@ -882,6 +882,18 @@
     "",
     "2-of-2 with two identical keys and sigs pushed using OP_DUP but no SIGPUSHONLY"
 ],
+[
+    "0x47 0x3044022018a2a81a93add5cb5f5da76305718e4ea66045ec4888b28d84cb22fae7f4645b02201e6daa5ed5d2e4b2b2027cf7ffd43d8d9844dd49f74ef86899ec8e669dfd39aa01 NOP8 0x23 0x2103363d90d447b00c9c99ceac05b6262ee053441c7e55552ffe526bad8f83ff4640ac",
+    "HASH160 0x14 0x215640c2f72f0d16b4eced26762035a42ffed39a EQUAL",
+    "",
+    "P2SH(P2PK) with non-push scriptSig but no P2SH or SIGPUSHONLY"
+],
+[
+    "0x47 0x304402203e4516da7253cf068effec6b95c41221c0cf3a8e6ccb8cbf1725b562e9afde2c022054e1c258c2981cdfba5df1f46661fb6541c44f77ca0092f3600331abfffb125101 NOP8",
+    "0x21 0x03363d90d447b00c9c99ceac05b6262ee053441c7e55552ffe526bad8f83ff4640 CHECKSIG",
+    "",
+    "P2PK with non-push scriptSig but with P2SH validation"
+],
 [
     "0 0x47 0x304402200abeb4bd07f84222f474aed558cfbdfc0b4e96cde3c2935ba7098b1ff0bd74c302204a04c1ca67b2a20abee210cf9a21023edccbbf8024b988812634233115c6b73901 0x47 0x304402200abeb4bd07f84222f474aed558cfbdfc0b4e96cde3c2935ba7098b1ff0bd74c302204a04c1ca67b2a20abee210cf9a21023edccbbf8024b988812634233115c6b73901",
     "2 0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 2 CHECKMULTISIG",
diff --git a/src/test/script_tests.cpp b/src/test/script_tests.cpp
index 8f927f8f91303..4ecb56de84981 100644
--- a/src/test/script_tests.cpp
+++ b/src/test/script_tests.cpp
@@ -628,12 +628,18 @@ BOOST_AUTO_TEST_CASE(script_build)
     bad.push_back(TestBuilder(CScript() << OP_2 << ToByteVector(keys.pubkey1C) << ToByteVector(keys.pubkey1C) << OP_2 << OP_CHECKMULTISIG,
                               "2-of-2 with two identical keys and sigs pushed using OP_DUP", SCRIPT_VERIFY_SIGPUSHONLY
                              ).Num(0).PushSig(keys.key1).Add(CScript() << OP_DUP).ScriptError(SCRIPT_ERR_SIG_PUSHONLY));
+    good.push_back(TestBuilder(CScript() << ToByteVector(keys.pubkey2C) << OP_CHECKSIG,
+                               "P2SH(P2PK) with non-push scriptSig but no P2SH or SIGPUSHONLY", 0, true
+                              ).PushSig(keys.key2).Add(CScript() << OP_NOP8).PushRedeem());
+    good.push_back(TestBuilder(CScript() << ToByteVector(keys.pubkey2C) << OP_CHECKSIG,
+                               "P2PK with non-push scriptSig but with P2SH validation", 0
+                              ).PushSig(keys.key2).Add(CScript() << OP_NOP8));
     bad.push_back(TestBuilder(CScript() << ToByteVector(keys.pubkey2C) << OP_CHECKSIG,
-                              "P2SH(P2PK) with non-push scriptSig but no SIGPUSHONLY", 0
-                             ).PushSig(keys.key2).PushRedeem().ScriptError(SCRIPT_ERR_EVAL_FALSE));
+                              "P2SH(P2PK) with non-push scriptSig but no SIGPUSHONLY", SCRIPT_VERIFY_P2SH, true
+                             ).PushSig(keys.key2).Add(CScript() << OP_NOP8).PushRedeem().ScriptError(SCRIPT_ERR_SIG_PUSHONLY));
     bad.push_back(TestBuilder(CScript() << ToByteVector(keys.pubkey2C) << OP_CHECKSIG,
-                              "P2SH(P2PK) with non-push scriptSig", SCRIPT_VERIFY_SIGPUSHONLY
-                             ).PushSig(keys.key2).PushRedeem().ScriptError(SCRIPT_ERR_EVAL_FALSE));
+                              "P2SH(P2PK) with non-push scriptSig but not P2SH", SCRIPT_VERIFY_SIGPUSHONLY, true
+                             ).PushSig(keys.key2).Add(CScript() << OP_NOP8).PushRedeem().ScriptError(SCRIPT_ERR_SIG_PUSHONLY));
     good.push_back(TestBuilder(CScript() << OP_2 << ToByteVector(keys.pubkey1C) << ToByteVector(keys.pubkey1C) << OP_2 << OP_CHECKMULTISIG,
                                "2-of-2 with two identical keys and sigs pushed", SCRIPT_VERIFY_SIGPUSHONLY
                               ).Num(0).PushSig(keys.key1).PushSig(keys.key1));

From 3373c43505cf76b63e7aa81b0d745d14765bd610 Mon Sep 17 00:00:00 2001
From: Adam Brown <adam@deftnerd.com>
Date: Tue, 29 Mar 2016 15:16:16 -0300
Subject: [PATCH 0098/1802] [doc] Update port in tor.md

Tor Browser Bundle spawns the Tor process and listens on port 9150, it doesn't randomly pick a port.

[ci skip]
(cherry picked from commit 1b63cf98347b2a62915425576930f55c2126c2ff)
---
 doc/tor.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/tor.md b/doc/tor.md
index be4125544986d..43e922718b7dd 100644
--- a/doc/tor.md
+++ b/doc/tor.md
@@ -3,7 +3,7 @@ TOR SUPPORT IN BITCOIN
 
 It is possible to run Bitcoin as a Tor hidden service, and connect to such services.
 
-The following directions assume you have a Tor proxy running on port 9050. Many distributions default to having a SOCKS proxy listening on port 9050, but others may not. In particular, the Tor Browser Bundle defaults to listening on a random port. See [Tor Project FAQ:TBBSocksPort](https://www.torproject.org/docs/faq.html.en#TBBSocksPort) for how to properly
+The following directions assume you have a Tor proxy running on port 9050. Many distributions default to having a SOCKS proxy listening on port 9050, but others may not. In particular, the Tor Browser Bundle defaults to listening on port 9150. See [Tor Project FAQ:TBBSocksPort](https://www.torproject.org/docs/faq.html.en#TBBSocksPort) for how to properly
 configure Tor.
 
 

From 76da7613517d05aca31c2cee42b5ebf3d5c54974 Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Tue, 5 Apr 2016 15:45:10 +0200
Subject: [PATCH 0099/1802] Make script_error a mandatory 4th field for
 script_tests

---
 src/test/data/script_invalid.json | 1106 ++++++++++++-------------
 src/test/data/script_valid.json   | 1246 +++++++++++++++--------------
 src/test/script_tests.cpp         |   15 +-
 3 files changed, 1200 insertions(+), 1167 deletions(-)

diff --git a/src/test/data/script_invalid.json b/src/test/data/script_invalid.json
index b9f150eacb236..1427cb630a6f2 100644
--- a/src/test/data/script_invalid.json
+++ b/src/test/data/script_invalid.json
@@ -1,524 +1,524 @@
 [
-["Format is: [scriptSig, scriptPubKey, flags, ... comments]"],
+["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", "P2SH,STRICTENC",   "Test the test: we should have an empty stack after scriptSig evaluation", "EVAL_FALSE"],
-["  ", "DEPTH", "P2SH,STRICTENC", "and multiple spaces should not change that.", "EVAL_FALSE"],
-["   ", "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", "PUSHDATA1 with not enough bytes","BAD_OPCODE"],
-["0x4d0200ff","0x01 NOP", "P2SH,STRICTENC", "PUSHDATA2 with not enough bytes","BAD_OPCODE"],
-["0x4e03000000ffff","0x01 NOP", "P2SH,STRICTENC", "PUSHDATA4 with not enough bytes","BAD_OPCODE"],
-
-["1", "IF 0x50 ENDIF 1", "P2SH,STRICTENC", "0x50 is reserved","BAD_OPCODE"],
-["0x52", "0x5f ADD 0x60 EQUAL", "P2SH,STRICTENC", "0x51 through 0x60 push 1 through 16 onto stack","EVAL_FALSE"],
-["0","NOP", "P2SH,STRICTENC","","EVAL_FALSE"],
-["1", "IF VER ELSE 1 ENDIF", "P2SH,STRICTENC", "VER non-functional", "BAD_OPCODE"],
-["0", "IF VERIF ELSE 1 ENDIF", "P2SH,STRICTENC", "VERIF illegal everywhere", "BAD_OPCODE"],
-["0", "IF ELSE 1 ELSE VERIF ENDIF", "P2SH,STRICTENC", "VERIF illegal everywhere", "BAD_OPCODE"],
-["0", "IF VERNOTIF ELSE 1 ENDIF", "P2SH,STRICTENC", "VERNOTIF illegal everywhere", "BAD_OPCODE"],
-["0", "IF ELSE 1 ELSE VERNOTIF ENDIF", "P2SH,STRICTENC", "VERNOTIF illegal everywhere", "BAD_OPCODE"],
-
-["1 IF", "1 ENDIF", "P2SH,STRICTENC", "IF/ENDIF can't span scriptSig/scriptPubKey", "UNBALANCED_CONDITIONAL"],
-["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", "Multiple ELSEs", "OP_RETURN"],
-["1", "IF 1 ELSE ELSE RETURN ENDIF", "P2SH,STRICTENC", "", "OP_RETURN"],
-
-["1", "ENDIF", "P2SH,STRICTENC", "Malformed IF/ELSE/ENDIF sequence", "UNBALANCED_CONDITIONAL"],
-["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", "canonical prunable txout format", "OP_RETURN"],
-["0 IF", "RETURN ENDIF 1", "P2SH,STRICTENC", "still prunable because IF/ENDIF can't span scriptSig/scriptPubKey", "UNBALANCED_CONDITIONAL"],
-
-["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", "alt stack not shared between sig/pubkey", "INVALID_ALTSTACK_OPERATION"],
-
-["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", "CAT disabled", "DISABLED_OPCODE"],
-["'a' 'b' 0", "IF CAT ELSE 1 ENDIF", "P2SH,STRICTENC", "CAT disabled", "DISABLED_OPCODE"],
-["'abc' 1 1", "SUBSTR", "P2SH,STRICTENC", "SUBSTR disabled", "DISABLED_OPCODE"],
-["'abc' 1 1 0", "IF SUBSTR ELSE 1 ENDIF", "P2SH,STRICTENC", "SUBSTR disabled", "DISABLED_OPCODE"],
-["'abc' 2 0", "IF LEFT ELSE 1 ENDIF", "P2SH,STRICTENC", "LEFT disabled", "DISABLED_OPCODE"],
-["'abc' 2 0", "IF RIGHT ELSE 1 ENDIF", "P2SH,STRICTENC", "RIGHT disabled", "DISABLED_OPCODE"],
-
-["NOP", "SIZE 1", "P2SH,STRICTENC", "", "INVALID_STACK_OPERATION"],
-
-["'abc'", "IF INVERT ELSE 1 ENDIF", "P2SH,STRICTENC", "INVERT disabled", "DISABLED_OPCODE"],
-["1 2 0 IF AND ELSE 1 ENDIF", "NOP", "P2SH,STRICTENC", "AND disabled", "DISABLED_OPCODE"],
-["1 2 0 IF OR ELSE 1 ENDIF", "NOP", "P2SH,STRICTENC", "OR disabled", "DISABLED_OPCODE"],
-["1 2 0 IF XOR ELSE 1 ENDIF", "NOP", "P2SH,STRICTENC", "XOR disabled", "DISABLED_OPCODE"],
-["2 0 IF 2MUL ELSE 1 ENDIF", "NOP", "P2SH,STRICTENC", "2MUL disabled", "DISABLED_OPCODE"],
-["2 0 IF 2DIV ELSE 1 ENDIF", "NOP", "P2SH,STRICTENC", "2DIV disabled", "DISABLED_OPCODE"],
-["2 2 0 IF MUL ELSE 1 ENDIF", "NOP", "P2SH,STRICTENC", "MUL disabled", "DISABLED_OPCODE"],
-["2 2 0 IF DIV ELSE 1 ENDIF", "NOP", "P2SH,STRICTENC", "DIV disabled", "DISABLED_OPCODE"],
-["2 2 0 IF MOD ELSE 1 ENDIF", "NOP", "P2SH,STRICTENC", "MOD disabled", "DISABLED_OPCODE"],
-["2 2 0 IF LSHIFT ELSE 1 ENDIF", "NOP", "P2SH,STRICTENC", "LSHIFT disabled", "DISABLED_OPCODE"],
-["2 2 0 IF RSHIFT ELSE 1 ENDIF", "NOP", "P2SH,STRICTENC", "RSHIFT disabled", "DISABLED_OPCODE"],
-
-["", "EQUAL NOT", "P2SH,STRICTENC", "EQUAL must error when there are no stack items", "INVALID_STACK_OPERATION"],
-["0", "EQUAL NOT", "P2SH,STRICTENC", "EQUAL must error when there are not 2 stack items", "INVALID_STACK_OPERATION"],
-["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", "arithmetic operands must be in range [-2^31...2^31] ", "UNKNOWN_ERROR"],
-["-2147483648 0 ADD", "NOP", "P2SH,STRICTENC", "arithmetic operands must be in range [-2^31...2^31] ", "UNKNOWN_ERROR"],
-["2147483647 DUP ADD", "4294967294 NUMEQUAL", "P2SH,STRICTENC", "NUMEQUAL must be in numeric range", "UNKNOWN_ERROR"],
-["'abcdef' NOT", "0 EQUAL", "P2SH,STRICTENC", "NOT is an arithmetic operand", "UNKNOWN_ERROR"],
-
-["2 DUP MUL", "4 EQUAL", "P2SH,STRICTENC", "disabled", "DISABLED_OPCODE"],
-["2 DUP DIV", "1 EQUAL", "P2SH,STRICTENC", "disabled", "DISABLED_OPCODE"],
-["2 2MUL", "4 EQUAL", "P2SH,STRICTENC", "disabled", "DISABLED_OPCODE"],
-["2 2DIV", "1 EQUAL", "P2SH,STRICTENC", "disabled", "DISABLED_OPCODE"],
-["7 3 MOD", "1 EQUAL", "P2SH,STRICTENC", "disabled", "DISABLED_OPCODE"],
-["2 2 LSHIFT", "8 EQUAL", "P2SH,STRICTENC", "disabled", "DISABLED_OPCODE"],
-["2 1 RSHIFT", "1 EQUAL", "P2SH,STRICTENC", "disabled", "DISABLED_OPCODE"],
-
-["1","NOP1 CHECKLOCKTIMEVERIFY NOP3 NOP4 NOP5 NOP6 NOP7 NOP8 NOP9 NOP10 2 EQUAL", "P2SH,STRICTENC", "", "EVAL_FALSE"],
-["'NOP_1_to_10' NOP1 CHECKLOCKTIMEVERIFY NOP3 NOP4 NOP5 NOP6 NOP7 NOP8 NOP9 NOP10","'NOP_1_to_11' EQUAL", "P2SH,STRICTENC", "", "EVAL_FALSE"],
+["", "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 NOP3 NOP4 NOP5 NOP6 NOP7 NOP8 NOP9 NOP10 2 EQUAL", "P2SH,STRICTENC", "EVAL_FALSE"],
+["'NOP_1_to_10' NOP1 CHECKLOCKTIMEVERIFY NOP3 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", "NOP3",  "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", "Discouraged NOP10 in scriptSig", "DISCOURAGE_UPGRADABLE_NOPS"],
+["1", "NOP1",  "P2SH,DISCOURAGE_UPGRADABLE_NOPS", "DISCOURAGE_UPGRADABLE_NOPS"],
+["1", "CHECKLOCKTIMEVERIFY",  "P2SH,DISCOURAGE_UPGRADABLE_NOPS", "DISCOURAGE_UPGRADABLE_NOPS"],
+["1", "NOP3",  "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", "Discouraged NOP10 in redeemScript", "DISCOURAGE_UPGRADABLE_NOPS"],
-
-["0x50","1", "P2SH,STRICTENC", "opcode 0x50 is reserved", "BAD_OPCODE"],
-["1", "IF 0xba ELSE 1 ENDIF", "P2SH,STRICTENC", "opcodes above NOP10 invalid if executed", "BAD_OPCODE"],
-["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", "invalid because scriptSig and scriptPubKey are processed separately", "UNBALANCED_CONDITIONAL"],
-
-["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"],
+ "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",
-">520 byte push",
-"PUSH_SIZE"],
+"PUSH_SIZE",
+">520 byte push"],
 ["0",
 "IF 'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb' ENDIF 1",
 "P2SH,STRICTENC",
-">520 byte push in non-executed IF branch",
-"PUSH_SIZE"],
+"PUSH_SIZE",
+">520 byte push in non-executed IF branch"],
 ["1",
 "0x61616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161",
 "P2SH,STRICTENC",
-">201 opcodes executed. 0x61 is NOP",
-"OP_COUNT"],
+"OP_COUNT",
+">201 opcodes executed. 0x61 is NOP"],
 ["0",
 "IF 0x6161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161 ENDIF 1",
 "P2SH,STRICTENC",
-">201 opcodes including non-executed IF branch. 0x61 is NOP",
-"OP_COUNT"],
+"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",
-">1,000 stack size (0x6f is 3DUP)",
-"STACK_SIZE"],
+"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",
-">1,000 stack+altstack size",
-"STACK_SIZE"],
+"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",
-"10,001-byte scriptPubKey",
-"SCRIPT_SIZE"],
-
-["NOP1","NOP10", "P2SH,STRICTENC", "", "EVAL_FALSE"],
-
-["1","VER", "P2SH,STRICTENC", "OP_VER is reserved", "BAD_OPCODE"],
-["1","VERIF", "P2SH,STRICTENC", "OP_VERIF is reserved", "BAD_OPCODE"],
-["1","VERNOTIF", "P2SH,STRICTENC", "OP_VERNOTIF is reserved", "BAD_OPCODE"],
-["1","RESERVED", "P2SH,STRICTENC", "OP_RESERVED is reserved", "BAD_OPCODE"],
-["1","RESERVED1", "P2SH,STRICTENC", "OP_RESERVED1 is reserved", "BAD_OPCODE"],
-["1","RESERVED2", "P2SH,STRICTENC", "OP_RESERVED2 is reserved", "BAD_OPCODE"],
-["1","0xba", "P2SH,STRICTENC", "0xba == OP_NOP10 + 1", "BAD_OPCODE"],
-
-["2147483648", "1ADD 1", "P2SH,STRICTENC", "We cannot do math on 5-byte integers", "UNKNOWN_ERROR"],
-["2147483648", "NEGATE 1", "P2SH,STRICTENC", "We cannot do math on 5-byte integers", "UNKNOWN_ERROR"],
-["-2147483648", "1ADD 1", "P2SH,STRICTENC", "Because we use a sign bit, -2147483648 is also 5 bytes", "UNKNOWN_ERROR"],
-["2147483647", "1ADD 1SUB 1", "P2SH,STRICTENC", "We cannot do math on 5-byte integers, even if the result is 4-bytes", "UNKNOWN_ERROR"],
-["2147483648", "1SUB 1", "P2SH,STRICTENC", "We cannot do math on 5-byte integers, even if the result is 4-bytes", "UNKNOWN_ERROR"],
-
-["2147483648 1", "BOOLOR 1", "P2SH,STRICTENC", "We cannot do BOOLOR on 5-byte integers (but we can still do IF etc)", "UNKNOWN_ERROR"],
-["2147483648 1", "BOOLAND 1", "P2SH,STRICTENC", "We cannot do BOOLAND on 5-byte integers", "UNKNOWN_ERROR"],
-
-["1", "1 ENDIF", "P2SH,STRICTENC", "ENDIF without IF", "UNBALANCED_CONDITIONAL"],
-["1", "IF 1", "P2SH,STRICTENC", "IF without ENDIF", "UNBALANCED_CONDITIONAL"],
-["1 IF 1", "ENDIF", "P2SH,STRICTENC", "IFs don't carry over", "UNBALANCED_CONDITIONAL"],
-
-["NOP", "IF 1 ENDIF", "P2SH,STRICTENC", "The following tests check the if(stack.size() < N) tests in each opcode", "UNBALANCED_CONDITIONAL"],
-["NOP", "NOTIF 1 ENDIF", "P2SH,STRICTENC", "They are here to catch copy-and-paste errors", "UNBALANCED_CONDITIONAL"],
-["NOP", "VERIFY 1", "P2SH,STRICTENC", "Most of them are duplicated elsewhere,", "INVALID_STACK_OPERATION"],
-
-["NOP", "TOALTSTACK 1", "P2SH,STRICTENC", "but, hey, more is always better, right?", "INVALID_STACK_OPERATION"],
-["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"],
+"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", "CHECKSIG must error when there are no stack items", "INVALID_STACK_OPERATION"],
-["0", "CHECKSIG NOT", "STRICTENC", "CHECKSIG must error when there are not 2 stack items", "INVALID_STACK_OPERATION"],
-["", "CHECKMULTISIG NOT", "STRICTENC", "CHECKMULTISIG must error when there are no stack items", "INVALID_STACK_OPERATION"],
-["", "-1 CHECKMULTISIG NOT", "STRICTENC", "CHECKMULTISIG must error when the specified number of pubkeys is negative", "PUBKEY_COUNT"],
-["", "1 CHECKMULTISIG NOT", "STRICTENC", "CHECKMULTISIG must error when there are not enough pubkeys on the stack", "INVALID_STACK_OPERATION"],
-["", "-1 0 CHECKMULTISIG NOT", "STRICTENC", "CHECKMULTISIG must error when the specified number of signatures is negative", "SIG_COUNT"],
-["", "1 'pk1' 1 CHECKMULTISIG NOT", "STRICTENC", "CHECKMULTISIG must error when there are not enough signatures on the stack", "INVALID_STACK_OPERATION"],
-["", "'dummy' 'sig1' 1 'pk1' 1 CHECKMULTISIG IF 1 ENDIF", "", "CHECKMULTISIG must push false to stack when signature is invalid when NOT in strict enc mode","EVAL_FALSE"],
+["", "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",
-"202 CHECKMULTISIGS, fails due to 201 op limit",
-"OP_COUNT"],
+"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"],
+"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",
-"Fails due to 201 sig op limit",
-"OP_COUNT"],
+"OP_COUNT",
+"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",
-"",
-"OP_COUNT"],
+"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", "nPubKeys > 20", "PUBKEY_COUNT"],
-["0 'sig' 1 0", "CHECKMULTISIG 1", "P2SH,STRICTENC", "nSigs > nPubKeys", "SIG_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", "Tests for Script.IsPushOnly()", "SIG_PUSHONLY"],
-["NOP1 0x01 1", "HASH160 0x14 0xda1745e9b549bd0bfa1a569971c77eba30cd5a4b EQUAL", "P2SH,STRICTENC", "", "SIG_PUSHONLY"],
+["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", "OP_RESERVED in P2SH should fail", "BAD_OPCODE"],
-["0 0x01 VER", "HASH160 0x14 0x0f4d7845db968f2a81b530b6f3c1d6246d4c7e01 EQUAL", "P2SH,STRICTENC", "OP_VER in P2SH should fail", "BAD_OPCODE"],
+["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", "Basic OP_0 execution", "EVAL_FALSE"],
+["0x00", "'00' EQUAL", "P2SH,STRICTENC", "EVAL_FALSE", "Basic OP_0 execution"],
 
 ["MINIMALDATA enforcement for PUSHDATAs"],
 
-["0x4c 0x00", "DROP 1", "MINIMALDATA", "Empty vector minimally represented by OP_0", "MINIMALDATA"],
-["0x01 0x81", "DROP 1", "MINIMALDATA", "-1 minimally represented by OP_1NEGATE", "MINIMALDATA"],
-["0x01 0x01", "DROP 1", "MINIMALDATA", "1 to 16 minimally represented by OP_1 to OP_16", "MINIMALDATA"],
-["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 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",
- "PUSHDATA1 of 72 bytes minimally represented by direct push",
- "MINIMALDATA"],
+ "MINIMALDATA",
+ "PUSHDATA1 of 72 bytes minimally represented by direct push"],
 
 ["0x4d 0xFF00 0x111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111", "DROP 1", "MINIMALDATA",
- "PUSHDATA2 of 255 bytes minimally represented by PUSHDATA1",
- "MINIMALDATA"],
+ "MINIMALDATA",
+ "PUSHDATA2 of 255 bytes minimally represented by PUSHDATA1"],
 
 ["0x4e 0x00010000 0x11111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111", "DROP 1", "MINIMALDATA",
- "PUSHDATA4 of 256 bytes minimally represented by PUSHDATA2",
- "MINIMALDATA"],
+ "MINIMALDATA",
+ "PUSHDATA4 of 256 bytes minimally represented by PUSHDATA2"],
 
 ["MINIMALDATA enforcement for numeric arguments"],
 
-["0x01 0x00", "NOT DROP 1", "MINIMALDATA", "numequals 0", "UNKNOWN_ERROR"],
-["0x02 0x0000", "NOT DROP 1", "MINIMALDATA", "numequals 0", "UNKNOWN_ERROR"],
-["0x01 0x80", "NOT DROP 1", "MINIMALDATA", "0x80 (negative zero) numequals 0", "UNKNOWN_ERROR"],
-["0x02 0x0080", "NOT DROP 1", "MINIMALDATA", "numequals 0", "UNKNOWN_ERROR"],
-["0x02 0x0500", "NOT DROP 1", "MINIMALDATA", "numequals 5", "UNKNOWN_ERROR"],
-["0x03 0x050000", "NOT DROP 1", "MINIMALDATA", "numequals 5", "UNKNOWN_ERROR"],
-["0x02 0x0580", "NOT DROP 1", "MINIMALDATA", "numequals -5", "UNKNOWN_ERROR"],
-["0x03 0x050080", "NOT DROP 1", "MINIMALDATA", "numequals -5", "UNKNOWN_ERROR"],
-["0x03 0xff7f80", "NOT DROP 1", "MINIMALDATA", "Minimal encoding is 0xffff", "UNKNOWN_ERROR"],
-["0x03 0xff7f00", "NOT DROP 1", "MINIMALDATA", "Minimal encoding is 0xff7f", "UNKNOWN_ERROR"],
-["0x04 0xffff7f80", "NOT DROP 1", "MINIMALDATA", "Minimal encoding is 0xffffff", "UNKNOWN_ERROR"],
-["0x04 0xffff7f00", "NOT DROP 1", "MINIMALDATA", "Minimal encoding is 0xffff7f", "UNKNOWN_ERROR"],
+["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"],
+["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"],
 
 
 ["Order of CHECKMULTISIG evaluation tests, inverted by swapping the order of"],
@@ -528,349 +528,349 @@
     "0 0x47 0x3044022044dc17b0887c161bb67ba9635bf758735bdde503e4b0a0987f587f14a4e1143d022009a215772d49a85dae40d8ca03955af26ad3978a0ff965faa12915e9586249a501 0x47 0x3044022044dc17b0887c161bb67ba9635bf758735bdde503e4b0a0987f587f14a4e1143d022009a215772d49a85dae40d8ca03955af26ad3978a0ff965faa12915e9586249a501",
     "2 0x21 0x02865c40293a680cb9c020e7b1e106d8c1916d3cef99aa431a56d253e69256dac0 0 2 CHECKMULTISIG NOT",
     "STRICTENC",
-    "2-of-2 CHECKMULTISIG NOT with the first pubkey invalid, and both signatures validly encoded.",
-    "PUBKEYTYPE"
+    "PUBKEYTYPE",
+    "2-of-2 CHECKMULTISIG NOT with the first pubkey invalid, and both signatures validly encoded."
 ],
 [
     "0 0x47 0x3044022044dc17b0887c161bb67ba9635bf758735bdde503e4b0a0987f587f14a4e1143d022009a215772d49a85dae40d8ca03955af26ad3978a0ff965faa12915e9586249a501 1",
     "2 0x21 0x02865c40293a680cb9c020e7b1e106d8c1916d3cef99aa431a56d253e69256dac0 0x21 0x02865c40293a680cb9c020e7b1e106d8c1916d3cef99aa431a56d253e69256dac0 2 CHECKMULTISIG NOT",
     "STRICTENC",
-    "2-of-2 CHECKMULTISIG NOT with both pubkeys valid, but first signature invalid.",
-    "SIG_DER"
+    "SIG_DER",
+    "2-of-2 CHECKMULTISIG NOT with both pubkeys valid, but first signature invalid."
 ],
 [
     "0 0x47 0x304402205451ce65ad844dbb978b8bdedf5082e33b43cae8279c30f2c74d9e9ee49a94f802203fe95a7ccf74da7a232ee523ef4a53cb4d14bdd16289680cdb97a63819b8f42f01 0x46 0x304402205451ce65ad844dbb978b8bdedf5082e33b43cae8279c30f2c74d9e9ee49a94f802203fe95a7ccf74da7a232ee523ef4a53cb4d14bdd16289680cdb97a63819b8f42f",
     "2 0x21 0x02a673638cb9587cb68ea08dbef685c6f2d2a751a8b3c6f2a7e9a4999e6e4bfaf5 0x21 0x02a673638cb9587cb68ea08dbef685c6f2d2a751a8b3c6f2a7e9a4999e6e4bfaf5 0x21 0x02a673638cb9587cb68ea08dbef685c6f2d2a751a8b3c6f2a7e9a4999e6e4bfaf5 3 CHECKMULTISIG",
     "P2SH,STRICTENC",
-    "2-of-3 with one valid and one invalid signature due to parse error, nSigs > validSigs",
-    "SIG_DER"
+    "SIG_DER",
+    "2-of-3 with one valid and one invalid signature due to parse error, nSigs > validSigs"
 ],
 
 ["Increase DERSIG test coverage"],
-["0x4a 0x0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", "0 CHECKSIG NOT", "DERSIG", "Overly long signature is incorrectly encoded for DERSIG", "SIG_DER"],
-["0x25 0x30220220000000000000000000000000000000000000000000000000000000000000000000", "0 CHECKSIG NOT", "DERSIG", "Missing S is incorrectly encoded for DERSIG", "SIG_DER"],
-["0x27 0x3024021077777777777777777777777777777777020a7777777777777777777777777777777701", "0 CHECKSIG NOT", "DERSIG", "S with invalid S length is incorrectly encoded for DERSIG", "SIG_DER"],
-["0x27 0x302403107777777777777777777777777777777702107777777777777777777777777777777701", "0 CHECKSIG NOT", "DERSIG", "Non-integer R is incorrectly encoded for DERSIG", "SIG_DER"],
-["0x27 0x302402107777777777777777777777777777777703107777777777777777777777777777777701", "0 CHECKSIG NOT", "DERSIG", "Non-integer S is incorrectly encoded for DERSIG", "SIG_DER"],
-["0x17 0x3014020002107777777777777777777777777777777701", "0 CHECKSIG NOT", "DERSIG", "Zero-length R is incorrectly encoded for DERSIG", "SIG_DER"],
-["0x17 0x3014021077777777777777777777777777777777020001", "0 CHECKSIG NOT", "DERSIG", "Zero-length S is incorrectly encoded for DERSIG", "SIG_DER"],
-["0x27 0x302402107777777777777777777777777777777702108777777777777777777777777777777701", "0 CHECKSIG NOT", "DERSIG", "Negative S is incorrectly encoded for DERSIG", "SIG_DER"],
+["0x4a 0x0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", "0 CHECKSIG NOT", "DERSIG", "SIG_DER", "Overly long signature is incorrectly encoded for DERSIG"],
+["0x25 0x30220220000000000000000000000000000000000000000000000000000000000000000000", "0 CHECKSIG NOT", "DERSIG", "SIG_DER", "Missing S is incorrectly encoded for DERSIG"],
+["0x27 0x3024021077777777777777777777777777777777020a7777777777777777777777777777777701", "0 CHECKSIG NOT", "DERSIG", "SIG_DER", "S with invalid S length is incorrectly encoded for DERSIG"],
+["0x27 0x302403107777777777777777777777777777777702107777777777777777777777777777777701", "0 CHECKSIG NOT", "DERSIG", "SIG_DER", "Non-integer R is incorrectly encoded for DERSIG"],
+["0x27 0x302402107777777777777777777777777777777703107777777777777777777777777777777701", "0 CHECKSIG NOT", "DERSIG", "SIG_DER", "Non-integer S is incorrectly encoded for DERSIG"],
+["0x17 0x3014020002107777777777777777777777777777777701", "0 CHECKSIG NOT", "DERSIG", "SIG_DER", "Zero-length R is incorrectly encoded for DERSIG"],
+["0x17 0x3014021077777777777777777777777777777777020001", "0 CHECKSIG NOT", "DERSIG", "SIG_DER", "Zero-length S is incorrectly encoded for DERSIG"],
+["0x27 0x302402107777777777777777777777777777777702108777777777777777777777777777777701", "0 CHECKSIG NOT", "DERSIG", "SIG_DER", "Negative S is incorrectly encoded for DERSIG"],
 
 ["Automatically generated test cases"],
 [
     "0x47 0x304402200a5c6163f07b8c3b013c4d1d6dba25e780b39658d79ba37af7057a3b7f15ffa102201fd9b4eaa9943f734928b99a83592c2e7bf342ea2680f6a2bb705167966b742001",
     "0x41 0x0479be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8 CHECKSIG",
     "",
-    "P2PK, bad sig",
-    "EVAL_FALSE"
+    "EVAL_FALSE",
+    "P2PK, bad sig"
 ],
 [
     "0x47 0x3044022034bb0494b50b8ef130e2185bb220265b9284ef5b4b8a8da4d8415df489c83b5102206259a26d9cc0a125ac26af6153b17c02956855ebe1467412f066e402f5f05d1201 0x21 0x03363d90d446b00c9c99ceac05b6262ee053441c7e55552ffe526bad8f83ff4640",
     "DUP HASH160 0x14 0xc0834c0c158f53be706d234c38fd52de7eece656 EQUALVERIFY CHECKSIG",
     "",
-    "P2PKH, bad pubkey",
-    "EQUALVERIFY"
+    "EQUALVERIFY",
+    "P2PKH, bad pubkey"
 ],
 [
     "0x47 0x304402204710a85181663b32d25c70ec2bbd14adff5ddfff6cb50d09e155ef5f541fc86c0220056b0cc949be9386ecc5f6c2ac0493269031dbb185781db90171b54ac127790201",
     "0x41 0x048282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f5150811f8a8098557dfe45e8256e830b60ace62d613ac2f7b17bed31b6eaff6e26caf CHECKSIG",
     "",
-    "P2PK anyonecanpay marked with normal hashtype",
-    "EVAL_FALSE"
+    "EVAL_FALSE",
+    "P2PK anyonecanpay marked with normal hashtype"
 ],
 [
     "0x47 0x3044022003fef42ed6c7be8917441218f525a60e2431be978e28b7aca4d7a532cc413ae8022067a1f82c74e8d69291b90d148778405c6257bbcfc2353cc38a3e1f22bf44254601 0x23 0x210279be667ef9dcbbac54a06295ce870b07029bfcdb2dce28d959f2815b16f81798ac",
     "HASH160 0x14 0x23b0ad3477f2178bc0b3eed26e4e6316f4e83aa1 EQUAL",
     "P2SH",
-    "P2SH(P2PK), bad redeemscript",
-    "EVAL_FALSE"
+    "EVAL_FALSE",
+    "P2SH(P2PK), bad redeemscript"
 ],
 [
     "0x47 0x304402204e2eb034be7b089534ac9e798cf6a2c79f38bcb34d1b179efd6f2de0841735db022071461beb056b5a7be1819da6a3e3ce3662831ecc298419ca101eb6887b5dd6a401 0x19 0x76a9147cf9c846cd4882efec4bf07e44ebdad495c94f4b88ac",
     "HASH160 0x14 0x2df519943d5acc0ef5222091f9dfe3543f489a82 EQUAL",
     "P2SH",
-    "P2SH(P2PKH), bad sig",
-    "EQUALVERIFY"
+    "EQUALVERIFY",
+    "P2SH(P2PKH), bad sig"
 ],
 [
     "0 0x47 0x3044022051254b9fb476a52d85530792b578f86fea70ec1ffb4393e661bcccb23d8d63d3022076505f94a403c86097841944e044c70c2045ce90e36de51f7e9d3828db98a07501 0x47 0x304402200a358f750934b3feb822f1966bfcd8bbec9eeaa3a8ca941e11ee5960e181fa01022050bf6b5a8e7750f70354ae041cb68a7bade67ec6c3ab19eb359638974410626e01 0",
     "3 0x21 0x0279be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798 0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 0x21 0x03363d90d447b00c9c99ceac05b6262ee053441c7e55552ffe526bad8f83ff4640 3 CHECKMULTISIG",
     "",
-    "3-of-3, 2 sigs",
-    "EVAL_FALSE"
+    "EVAL_FALSE",
+    "3-of-3, 2 sigs"
 ],
 [
     "0 0x47 0x304402205b7d2c2f177ae76cfbbf14d589c113b0b35db753d305d5562dd0b61cbf366cfb02202e56f93c4f08a27f986cd424ffc48a462c3202c4902104d4d0ff98ed28f4bf8001 0 0x4c69 0x52210279be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f8179821038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f515082103363d90d447b00c9c99ceac05b6262ee053441c7e55552ffe526bad8f83ff464053ae",
     "HASH160 0x14 0xc9e4a896d149702d0d1695434feddd52e24ad78d EQUAL",
     "P2SH",
-    "P2SH(2-of-3), 1 sig",
-    "EVAL_FALSE"
+    "EVAL_FALSE",
+    "P2SH(2-of-3), 1 sig"
 ],
 [
     "0x47 0x304402200060558477337b9022e70534f1fea71a318caf836812465a2509931c5e7c4987022078ec32bd50ac9e03a349ba953dfd9fe1c8d2dd8bdb1d38ddca844d3d5c78c11801",
     "0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 CHECKSIG",
     "DERSIG",
-    "P2PK with too much R padding",
-    "SIG_DER"
+    "SIG_DER",
+    "P2PK with too much R padding"
 ],
 [
     "0x48 0x304502202de8c03fc525285c9c535631019a5f2af7c6454fa9eb392a3756a4917c420edd02210046130bf2baf7cfc065067c8b9e33a066d9c15edcea9feb0ca2d233e3597925b401",
     "0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 CHECKSIG",
     "DERSIG",
-    "P2PK with too much S padding",
-    "SIG_DER"
+    "SIG_DER",
+    "P2PK with too much S padding"
 ],
 [
     "0x47 0x30440220d7a0417c3f6d1a15094d1cf2a3378ca0503eb8a57630953a9e2987e21ddd0a6502207a6266d686c99090920249991d3d42065b6d43eb70187b219c0db82e4f94d1a201",
     "0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 CHECKSIG",
     "DERSIG",
-    "P2PK with too little R padding",
-    "SIG_DER"
+    "SIG_DER",
+    "P2PK with too little R padding"
 ],
 [
     "0x47 0x30440220005ece1335e7f757a1a1f476a7fb5bd90964e8a022489f890614a04acfb734c002206c12b8294a6513c7710e8c82d3c23d75cdbfe83200eb7efb495701958501a5d601",
     "0x21 0x03363d90d447b00c9c99ceac05b6262ee053441c7e55552ffe526bad8f83ff4640 CHECKSIG NOT",
     "DERSIG",
-    "P2PK NOT with bad sig with too much R padding",
-    "SIG_DER"
+    "SIG_DER",
+    "P2PK NOT with bad sig with too much R padding"
 ],
 [
     "0x47 0x30440220005ece1335e7f657a1a1f476a7fb5bd90964e8a022489f890614a04acfb734c002206c12b8294a6513c7710e8c82d3c23d75cdbfe83200eb7efb495701958501a5d601",
     "0x21 0x03363d90d447b00c9c99ceac05b6262ee053441c7e55552ffe526bad8f83ff4640 CHECKSIG NOT",
     "",
-    "P2PK NOT with too much R padding but no DERSIG",
-    "EVAL_FALSE"
+    "EVAL_FALSE",
+    "P2PK NOT with too much R padding but no DERSIG"
 ],
 [
     "0x47 0x30440220005ece1335e7f657a1a1f476a7fb5bd90964e8a022489f890614a04acfb734c002206c12b8294a6513c7710e8c82d3c23d75cdbfe83200eb7efb495701958501a5d601",
     "0x21 0x03363d90d447b00c9c99ceac05b6262ee053441c7e55552ffe526bad8f83ff4640 CHECKSIG NOT",
     "DERSIG",
-    "P2PK NOT with too much R padding",
-    "SIG_DER"
+    "SIG_DER",
+    "P2PK NOT with too much R padding"
 ],
 [
     "0x47 0x30440220d7a0417c3f6d1a15094d1cf2a3378ca0503eb8a57630953a9e2987e21ddd0a6502207a6266d686c99090920249991d3d42065b6d43eb70187b219c0db82e4f94d1a201",
     "0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 CHECKSIG",
     "DERSIG",
-    "BIP66 example 1, with DERSIG",
-    "SIG_DER"
+    "SIG_DER",
+    "BIP66 example 1, with DERSIG"
 ],
 [
     "0x47 0x304402208e43c0b91f7c1e5bc58e41c8185f8a6086e111b0090187968a86f2822462d3c902200a58f4076b1133b18ff1dc83ee51676e44c60cc608d9534e0df5ace0424fc0be01",
     "0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 CHECKSIG NOT",
     "",
-    "BIP66 example 2, without DERSIG",
-    "EVAL_FALSE"
+    "EVAL_FALSE",
+    "BIP66 example 2, without DERSIG"
 ],
 [
     "0x47 0x304402208e43c0b91f7c1e5bc58e41c8185f8a6086e111b0090187968a86f2822462d3c902200a58f4076b1133b18ff1dc83ee51676e44c60cc608d9534e0df5ace0424fc0be01",
     "0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 CHECKSIG NOT",
     "DERSIG",
-    "BIP66 example 2, with DERSIG",
-    "SIG_DER"
+    "SIG_DER",
+    "BIP66 example 2, with DERSIG"
 ],
 [
     "0",
     "0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 CHECKSIG",
     "",
-    "BIP66 example 3, without DERSIG",
-    "EVAL_FALSE"
+    "EVAL_FALSE",
+    "BIP66 example 3, without DERSIG"
 ],
 [
     "0",
     "0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 CHECKSIG",
     "DERSIG",
-    "BIP66 example 3, with DERSIG",
-    "EVAL_FALSE"
+    "EVAL_FALSE",
+    "BIP66 example 3, with DERSIG"
 ],
 [
     "1",
     "0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 CHECKSIG",
     "",
-    "BIP66 example 5, without DERSIG",
-    "EVAL_FALSE"
+    "EVAL_FALSE",
+    "BIP66 example 5, without DERSIG"
 ],
 [
     "1",
     "0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 CHECKSIG",
     "DERSIG",
-    "BIP66 example 5, with DERSIG",
-    "SIG_DER"
+    "SIG_DER",
+    "BIP66 example 5, with DERSIG"
 ],
 [
     "1",
     "0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 CHECKSIG NOT",
     "DERSIG",
-    "BIP66 example 6, with DERSIG",
-    "SIG_DER"
+    "SIG_DER",
+    "BIP66 example 6, with DERSIG"
 ],
 [
     "0 0x47 0x30440220cae00b1444babfbf6071b0ba8707f6bd373da3df494d6e74119b0430c5db810502205d5231b8c5939c8ff0c82242656d6e06edb073d42af336c99fe8837c36ea39d501 0x47 0x3044022027c2714269ca5aeecc4d70edc88ba5ee0e3da4986e9216028f489ab4f1b8efce022022bd545b4951215267e4c5ceabd4c5350331b2e4a0b6494c56f361fa5a57a1a201",
     "2 0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 0x21 0x03363d90d447b00c9c99ceac05b6262ee053441c7e55552ffe526bad8f83ff4640 2 CHECKMULTISIG",
     "DERSIG",
-    "BIP66 example 7, with DERSIG",
-    "SIG_DER"
+    "SIG_DER",
+    "BIP66 example 7, with DERSIG"
 ],
 [
     "0 0x47 0x30440220b119d67d389315308d1745f734a51ff3ec72e06081e84e236fdf9dc2f5d2a64802204b04e3bc38674c4422ea317231d642b56dc09d214a1ecbbf16ecca01ed996e2201 0x47 0x3044022079ea80afd538d9ada421b5101febeb6bc874e01dde5bca108c1d0479aec339a4022004576db8f66130d1df686ccf00935703689d69cf539438da1edab208b0d63c4801",
     "2 0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 0x21 0x03363d90d447b00c9c99ceac05b6262ee053441c7e55552ffe526bad8f83ff4640 2 CHECKMULTISIG NOT",
     "",
-    "BIP66 example 8, without DERSIG",
-    "EVAL_FALSE"
+    "EVAL_FALSE",
+    "BIP66 example 8, without DERSIG"
 ],
 [
     "0 0x47 0x30440220b119d67d389315308d1745f734a51ff3ec72e06081e84e236fdf9dc2f5d2a64802204b04e3bc38674c4422ea317231d642b56dc09d214a1ecbbf16ecca01ed996e2201 0x47 0x3044022079ea80afd538d9ada421b5101febeb6bc874e01dde5bca108c1d0479aec339a4022004576db8f66130d1df686ccf00935703689d69cf539438da1edab208b0d63c4801",
     "2 0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 0x21 0x03363d90d447b00c9c99ceac05b6262ee053441c7e55552ffe526bad8f83ff4640 2 CHECKMULTISIG NOT",
     "DERSIG",
-    "BIP66 example 8, with DERSIG",
-    "SIG_DER"
+    "SIG_DER",
+    "BIP66 example 8, with DERSIG"
 ],
 [
     "0 0 0x47 0x3044022081aa9d436f2154e8b6d600516db03d78de71df685b585a9807ead4210bd883490220534bb6bdf318a419ac0749660b60e78d17d515558ef369bf872eff405b676b2e01",
     "2 0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 0x21 0x03363d90d447b00c9c99ceac05b6262ee053441c7e55552ffe526bad8f83ff4640 2 CHECKMULTISIG",
     "",
-    "BIP66 example 9, without DERSIG",
-    "EVAL_FALSE"
+    "EVAL_FALSE",
+    "BIP66 example 9, without DERSIG"
 ],
 [
     "0 0 0x47 0x3044022081aa9d436f2154e8b6d600516db03d78de71df685b585a9807ead4210bd883490220534bb6bdf318a419ac0749660b60e78d17d515558ef369bf872eff405b676b2e01",
     "2 0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 0x21 0x03363d90d447b00c9c99ceac05b6262ee053441c7e55552ffe526bad8f83ff4640 2 CHECKMULTISIG",
     "DERSIG",
-    "BIP66 example 9, with DERSIG",
-    "SIG_DER"
+    "SIG_DER",
+    "BIP66 example 9, with DERSIG"
 ],
 [
     "0 0 0x47 0x30440220da6f441dc3b4b2c84cfa8db0cd5b34ed92c9e01686de5a800d40498b70c0dcac02207c2cf91b0c32b860c4cd4994be36cfb84caf8bb7c3a8e4d96a31b2022c5299c501",
     "2 0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 0x21 0x03363d90d447b00c9c99ceac05b6262ee053441c7e55552ffe526bad8f83ff4640 2 CHECKMULTISIG NOT",
     "DERSIG",
-    "BIP66 example 10, with DERSIG",
-    "SIG_DER"
+    "SIG_DER",
+    "BIP66 example 10, with DERSIG"
 ],
 [
     "0 0x47 0x30440220cae00b1444babfbf6071b0ba8707f6bd373da3df494d6e74119b0430c5db810502205d5231b8c5939c8ff0c82242656d6e06edb073d42af336c99fe8837c36ea39d501 0",
     "2 0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 0x21 0x03363d90d447b00c9c99ceac05b6262ee053441c7e55552ffe526bad8f83ff4640 2 CHECKMULTISIG",
     "",
-    "BIP66 example 11, without DERSIG",
-    "EVAL_FALSE"
+    "EVAL_FALSE",
+    "BIP66 example 11, without DERSIG"
 ],
 [
     "0 0x47 0x30440220cae00b1444babfbf6071b0ba8707f6bd373da3df494d6e74119b0430c5db810502205d5231b8c5939c8ff0c82242656d6e06edb073d42af336c99fe8837c36ea39d501 0",
     "2 0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 0x21 0x03363d90d447b00c9c99ceac05b6262ee053441c7e55552ffe526bad8f83ff4640 2 CHECKMULTISIG",
     "DERSIG",
-    "BIP66 example 11, with DERSIG",
-    "EVAL_FALSE"
+    "EVAL_FALSE",
+    "BIP66 example 11, with DERSIG"
 ],
 [
     "0x48 0x304402203e4516da7253cf068effec6b95c41221c0cf3a8e6ccb8cbf1725b562e9afde2c022054e1c258c2981cdfba5df1f46661fb6541c44f77ca0092f3600331abfffb12510101",
     "0x21 0x03363d90d447b00c9c99ceac05b6262ee053441c7e55552ffe526bad8f83ff4640 CHECKSIG",
     "DERSIG",
-    "P2PK with multi-byte hashtype, with DERSIG",
-    "SIG_DER"
+    "SIG_DER",
+    "P2PK with multi-byte hashtype, with DERSIG"
 ],
 [
     "0x48 0x304502203e4516da7253cf068effec6b95c41221c0cf3a8e6ccb8cbf1725b562e9afde2c022100ab1e3da73d67e32045a20e0b999e049978ea8d6ee5480d485fcf2ce0d03b2ef001",
     "0x21 0x03363d90d447b00c9c99ceac05b6262ee053441c7e55552ffe526bad8f83ff4640 CHECKSIG",
     "LOW_S",
-    "P2PK with high S",
-    "SIG_HIGH_S"
+    "SIG_HIGH_S",
+    "P2PK with high S"
 ],
 [
     "0x47 0x3044022057292e2d4dfe775becdd0a9e6547997c728cdf35390f6a017da56d654d374e4902206b643be2fc53763b4e284845bfea2c597d2dc7759941dce937636c9d341b71ed01",
     "0x41 0x0679be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8 CHECKSIG",
     "STRICTENC",
-    "P2PK with hybrid pubkey",
-    "PUBKEYTYPE"
+    "PUBKEYTYPE",
+    "P2PK with hybrid pubkey"
 ],
 [
     "0x47 0x30440220035d554e3153c14950c9993f41c496607a8e24093db0595be7bf875cf64fcf1f02204731c8c4e5daf15e706cec19cdd8f2c5b1d05490e11dab8465ed426569b6e92101",
     "0x41 0x0679be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8 CHECKSIG NOT",
     "",
-    "P2PK NOT with hybrid pubkey but no STRICTENC",
-    "EVAL_FALSE"
+    "EVAL_FALSE",
+    "P2PK NOT with hybrid pubkey but no STRICTENC"
 ],
 [
     "0x47 0x30440220035d554e3153c14950c9993f41c496607a8e24093db0595be7bf875cf64fcf1f02204731c8c4e5daf15e706cec19cdd8f2c5b1d05490e11dab8465ed426569b6e92101",
     "0x41 0x0679be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8 CHECKSIG NOT",
     "STRICTENC",
-    "P2PK NOT with hybrid pubkey",
-    "PUBKEYTYPE"
+    "PUBKEYTYPE",
+    "P2PK NOT with hybrid pubkey"
 ],
 [
     "0x47 0x30440220035d554e3153c04950c9993f41c496607a8e24093db0595be7bf875cf64fcf1f02204731c8c4e5daf15e706cec19cdd8f2c5b1d05490e11dab8465ed426569b6e92101",
     "0x41 0x0679be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8 CHECKSIG NOT",
     "STRICTENC",
-    "P2PK NOT with invalid hybrid pubkey",
-    "PUBKEYTYPE"
+    "PUBKEYTYPE",
+    "P2PK NOT with invalid hybrid pubkey"
 ],
 [
     "0 0x47 0x3044022079c7824d6c868e0e1a273484e28c2654a27d043c8a27f49f52cb72efed0759090220452bbbf7089574fa082095a4fc1b3a16bafcf97a3a34d745fafc922cce66b27201",
     "1 0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 0x41 0x0679be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8 2 CHECKMULTISIG",
     "STRICTENC",
-    "1-of-2 with the first 1 hybrid pubkey",
-    "PUBKEYTYPE"
+    "PUBKEYTYPE",
+    "1-of-2 with the first 1 hybrid pubkey"
 ],
 [
     "0x47 0x304402206177d513ec2cda444c021a1f4f656fc4c72ba108ae063e157eb86dc3575784940220666fc66702815d0e5413bb9b1df22aed44f5f1efb8b99d41dd5dc9a5be6d205205",
     "0x41 0x048282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f5150811f8a8098557dfe45e8256e830b60ace62d613ac2f7b17bed31b6eaff6e26caf CHECKSIG",
     "STRICTENC",
-    "P2PK with undefined hashtype",
-    "SIG_HASHTYPE"
+    "SIG_HASHTYPE",
+    "P2PK with undefined hashtype"
 ],
 [
     "0x47 0x304402207409b5b320296e5e2136a7b281a7f803028ca4ca44e2b83eebd46932677725de02202d4eea1c8d3c98e6f42614f54764e6e5e6542e213eb4d079737e9a8b6e9812ec05",
     "0x41 0x048282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f5150811f8a8098557dfe45e8256e830b60ace62d613ac2f7b17bed31b6eaff6e26caf CHECKSIG NOT",
     "STRICTENC",
-    "P2PK NOT with invalid sig and undefined hashtype",
-    "SIG_HASHTYPE"
+    "SIG_HASHTYPE",
+    "P2PK NOT with invalid sig and undefined hashtype"
 ],
 [
     "1 0x47 0x3044022051254b9fb476a52d85530792b578f86fea70ec1ffb4393e661bcccb23d8d63d3022076505f94a403c86097841944e044c70c2045ce90e36de51f7e9d3828db98a07501 0x47 0x304402200a358f750934b3feb822f1966bfcd8bbec9eeaa3a8ca941e11ee5960e181fa01022050bf6b5a8e7750f70354ae041cb68a7bade67ec6c3ab19eb359638974410626e01 0x47 0x304402200955d031fff71d8653221e85e36c3c85533d2312fc3045314b19650b7ae2f81002202a6bb8505e36201909d0921f01abff390ae6b7ff97bbf959f98aedeb0a56730901",
     "3 0x21 0x0279be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798 0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 0x21 0x03363d90d447b00c9c99ceac05b6262ee053441c7e55552ffe526bad8f83ff4640 3 CHECKMULTISIG",
     "NULLDUMMY",
-    "3-of-3 with nonzero dummy",
-    "SIG_NULLDUMMY"
+    "SIG_NULLDUMMY",
+    "3-of-3 with nonzero dummy"
 ],
 [
     "1 0x47 0x304402201bb2edab700a5d020236df174fefed78087697143731f659bea59642c759c16d022061f42cdbae5bcd3e8790f20bf76687443436e94a634321c16a72aa54cbc7c2ea01 0x47 0x304402204bb4a64f2a6e5c7fb2f07fef85ee56fde5e6da234c6a984262307a20e99842d702206f8303aaba5e625d223897e2ffd3f88ef1bcffef55f38dc3768e5f2e94c923f901 0x47 0x3044022040c2809b71fffb155ec8b82fe7a27f666bd97f941207be4e14ade85a1249dd4d02204d56c85ec525dd18e29a0533d5ddf61b6b1bb32980c2f63edf951aebf7a27bfe01",
     "3 0x21 0x0279be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798 0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 0x21 0x03363d90d447b00c9c99ceac05b6262ee053441c7e55552ffe526bad8f83ff4640 3 CHECKMULTISIG NOT",
     "NULLDUMMY",
-    "3-of-3 NOT with invalid sig with nonzero dummy",
-    "SIG_NULLDUMMY"
+    "SIG_NULLDUMMY",
+    "3-of-3 NOT with invalid sig with nonzero dummy"
 ],
 [
     "0 0x47 0x304402200abeb4bd07f84222f474aed558cfbdfc0b4e96cde3c2935ba7098b1ff0bd74c302204a04c1ca67b2a20abee210cf9a21023edccbbf8024b988812634233115c6b73901 DUP",
     "2 0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 2 CHECKMULTISIG",
     "SIGPUSHONLY",
-    "2-of-2 with two identical keys and sigs pushed using OP_DUP",
-    "SIG_PUSHONLY"
+    "SIG_PUSHONLY",
+    "2-of-2 with two identical keys and sigs pushed using OP_DUP"
 ],
 [
     "0x47 0x3044022018a2a81a93add5cb5f5da76305718e4ea66045ec4888b28d84cb22fae7f4645b02201e6daa5ed5d2e4b2b2027cf7ffd43d8d9844dd49f74ef86899ec8e669dfd39aa01 NOP8 0x23 0x2103363d90d447b00c9c99ceac05b6262ee053441c7e55552ffe526bad8f83ff4640ac",
     "HASH160 0x14 0x215640c2f72f0d16b4eced26762035a42ffed39a EQUAL",
     "P2SH",
-    "P2SH(P2PK) with non-push scriptSig but no SIGPUSHONLY",
-    "SIG_PUSHONLY"
+    "SIG_PUSHONLY",
+    "P2SH(P2PK) with non-push scriptSig but no SIGPUSHONLY"
 ],
 [
     "0x47 0x3044022018a2a81a93add5cb5f5da76305718e4ea66045ec4888b28d84cb22fae7f4645b02201e6daa5ed5d2e4b2b2027cf7ffd43d8d9844dd49f74ef86899ec8e669dfd39aa01 NOP8 0x23 0x2103363d90d447b00c9c99ceac05b6262ee053441c7e55552ffe526bad8f83ff4640ac",
     "HASH160 0x14 0x215640c2f72f0d16b4eced26762035a42ffed39a EQUAL",
     "SIGPUSHONLY",
-    "P2SH(P2PK) with non-push scriptSig but not P2SH",
-    "SIG_PUSHONLY"
+    "SIG_PUSHONLY",
+    "P2SH(P2PK) with non-push scriptSig but not P2SH"
 ],
 [
     "11 0x47 0x304402200a5c6163f07b8d3b013c4d1d6dba25e780b39658d79ba37af7057a3b7f15ffa102201fd9b4eaa9943f734928b99a83592c2e7bf342ea2680f6a2bb705167966b742001",
     "0x41 0x0479be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8 CHECKSIG",
     "CLEANSTACK,P2SH",
-    "P2PK with unnecessary input",
-    "CLEANSTACK"
+    "CLEANSTACK",
+    "P2PK with unnecessary input"
 ],
 [
     "11 0x47 0x304402202f7505132be14872581f35d74b759212d9da40482653f1ffa3116c3294a4a51702206adbf347a2240ca41c66522b1a22a41693610b76a8e7770645dc721d1635854f01 0x43 0x410479be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8ac",
     "HASH160 0x14 0x31edc23bdafda4639e669f89ad6b2318dd79d032 EQUAL",
     "CLEANSTACK,P2SH",
-    "P2SH with unnecessary input",
-    "CLEANSTACK"
+    "CLEANSTACK",
+    "P2SH with unnecessary input"
 ],
 
 ["The End"]
diff --git a/src/test/data/script_valid.json b/src/test/data/script_valid.json
index 29ccbd92ff930..4e86ee78ba604 100644
--- a/src/test/data/script_valid.json
+++ b/src/test/data/script_valid.json
@@ -1,674 +1,674 @@
 [
-["Format is: [scriptSig, scriptPubKey, flags, ... comments]"],
+["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", "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"],
+["", "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", "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 CHECKLOCKTIMEVERIFY NOP3 NOP4 NOP5 NOP6 NOP7 NOP8 NOP9 NOP10 1 EQUAL", "P2SH,STRICTENC"],
-["'NOP_1_to_10' NOP1 CHECKLOCKTIMEVERIFY NOP3 NOP4 NOP5 NOP6 NOP7 NOP8 NOP9 NOP10","'NOP_1_to_10' EQUAL", "P2SH,STRICTENC"],
-
-["1", "NOP", "P2SH,STRICTENC,DISCOURAGE_UPGRADABLE_NOPS", "Discourage NOPx flag allows OP_NOP"],
-
-["0", "IF NOP10 ENDIF 1", "P2SH,STRICTENC,DISCOURAGE_UPGRADABLE_NOPS",
+ "'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 NOP3 NOP4 NOP5 NOP6 NOP7 NOP8 NOP9 NOP10 1 EQUAL", "P2SH,STRICTENC", "OK"],
+["'NOP_1_to_10' NOP1 CHECKLOCKTIMEVERIFY NOP3 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", "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"],
+["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",
+"P2SH,STRICTENC", "OK",
 "520 byte push"],
 ["1",
 "0x616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161",
-"P2SH,STRICTENC",
+"P2SH,STRICTENC", "OK",
 "201 opcodes executed. 0x61 is NOP"],
 ["1 2 3 4 5 0x6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f",
 "1 2 3 4 5 0x6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f",
-"P2SH,STRICTENC",
+"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",
+"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",
+"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",
+"P2SH,STRICTENC", "OK",
 ">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", "CHECKLOCKTIMEVERIFY 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"],
+["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 0xFFFFFFFF7F 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", "NOP3 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",
+"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"],
+"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",
+"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"],
+"P2SH,STRICTENC", "OK"],
 
-["0 0x01 1", "HASH160 0x14 0xda1745e9b549bd0bfa1a569971c77eba30cd5a4b EQUAL", "P2SH,STRICTENC", "Very basic P2SH"],
-["0x4c 0 0x01 1", "HASH160 0x14 0xda1745e9b549bd0bfa1a569971c77eba30cd5a4b EQUAL", "P2SH,STRICTENC"],
+["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",
+"P2SH,STRICTENC", "OK",
 "Basic PUSH signedness check"],
 
 ["0x4c 0x40 0x42424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242",
 "0x4d 0x4000 0x42424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242 EQUAL",
-"P2SH,STRICTENC",
+"P2SH,STRICTENC", "OK",
 "Basic PUSHDATA1 signedness check"],
 
 ["all PUSHDATA forms are equivalent"],
 
-["0x4c 0x4b 0x111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111", "0x4b 0x111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111 EQUAL", "", "PUSHDATA1 of 75 bytes equals direct push of it"],
-["0x4d 0xFF00 0x111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111", "0x4c 0xFF 0x111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111 EQUAL", "", "PUSHDATA2 of 255 bytes equals PUSHDATA1 of it"],
+["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", "Basic OP_0 execution"],
+["0x00", "SIZE 0 EQUAL", "P2SH,STRICTENC", "OK", "Basic OP_0 execution"],
 
 ["Numeric pushes"],
 
-["0x01 0x81", "0x4f EQUAL", "", "OP1_NEGATE pushes 0x81"],
-["0x01 0x01", "0x51 EQUAL", "", "OP_1  pushes 0x01"],
-["0x01 0x02", "0x52 EQUAL", "", "OP_2  pushes 0x02"],
-["0x01 0x03", "0x53 EQUAL", "", "OP_3  pushes 0x03"],
-["0x01 0x04", "0x54 EQUAL", "", "OP_4  pushes 0x04"],
-["0x01 0x05", "0x55 EQUAL", "", "OP_5  pushes 0x05"],
-["0x01 0x06", "0x56 EQUAL", "", "OP_6  pushes 0x06"],
-["0x01 0x07", "0x57 EQUAL", "", "OP_7  pushes 0x07"],
-["0x01 0x08", "0x58 EQUAL", "", "OP_8  pushes 0x08"],
-["0x01 0x09", "0x59 EQUAL", "", "OP_9  pushes 0x09"],
-["0x01 0x0a", "0x5a EQUAL", "", "OP_10 pushes 0x0a"],
-["0x01 0x0b", "0x5b EQUAL", "", "OP_11 pushes 0x0b"],
-["0x01 0x0c", "0x5c EQUAL", "", "OP_12 pushes 0x0c"],
-["0x01 0x0d", "0x5d EQUAL", "", "OP_13 pushes 0x0d"],
-["0x01 0x0e", "0x5e EQUAL", "", "OP_14 pushes 0x0e"],
-["0x01 0x0f", "0x5f EQUAL", "", "OP_15 pushes 0x0f"],
-["0x01 0x10", "0x60 EQUAL", "", "OP_16 pushes 0x10"],
+["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", "", "0x8000 equals 128"],
-["0x01 0x00", "0 NUMEQUAL", "", "0x00 numequals 0"],
-["0x01 0x80", "0 NUMEQUAL", "", "0x80 (negative zero) numequals 0"],
-["0x02 0x0080", "0 NUMEQUAL", "", "0x0080 numequals 0"],
-["0x02 0x0500", "5 NUMEQUAL", "", "0x0500 numequals 5"],
-["0x03 0xff7f80", "0x02 0xffff NUMEQUAL", "", ""],
-["0x03 0xff7f00", "0x02 0xff7f NUMEQUAL", "", ""],
-["0x04 0xffff7f80", "0x03 0xffffff NUMEQUAL", "", ""],
-["0x04 0xffff7f00", "0x03 0xffff7f NUMEQUAL", "", ""],
+["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", "non-minimal PUSHDATA1 ignored"],
-["0 IF 0x4d 0x0000 ENDIF 1", "", "MINIMALDATA", "non-minimal PUSHDATA2 ignored"],
-["0 IF 0x4c 0x00000000 ENDIF 1", "", "MINIMALDATA", "non-minimal PUSHDATA4 ignored"],
-["0 IF 0x01 0x81 ENDIF 1", "", "MINIMALDATA", "1NEGATE equiv"],
-["0 IF 0x01 0x01 ENDIF 1", "", "MINIMALDATA", "OP_1  equiv"],
-["0 IF 0x01 0x02 ENDIF 1", "", "MINIMALDATA", "OP_2  equiv"],
-["0 IF 0x01 0x03 ENDIF 1", "", "MINIMALDATA", "OP_3  equiv"],
-["0 IF 0x01 0x04 ENDIF 1", "", "MINIMALDATA", "OP_4  equiv"],
-["0 IF 0x01 0x05 ENDIF 1", "", "MINIMALDATA", "OP_5  equiv"],
-["0 IF 0x01 0x06 ENDIF 1", "", "MINIMALDATA", "OP_6  equiv"],
-["0 IF 0x01 0x07 ENDIF 1", "", "MINIMALDATA", "OP_7  equiv"],
-["0 IF 0x01 0x08 ENDIF 1", "", "MINIMALDATA", "OP_8  equiv"],
-["0 IF 0x01 0x09 ENDIF 1", "", "MINIMALDATA", "OP_9  equiv"],
-["0 IF 0x01 0x0a ENDIF 1", "", "MINIMALDATA", "OP_10 equiv"],
-["0 IF 0x01 0x0b ENDIF 1", "", "MINIMALDATA", "OP_11 equiv"],
-["0 IF 0x01 0x0c ENDIF 1", "", "MINIMALDATA", "OP_12 equiv"],
-["0 IF 0x01 0x0d ENDIF 1", "", "MINIMALDATA", "OP_13 equiv"],
-["0 IF 0x01 0x0e ENDIF 1", "", "MINIMALDATA", "OP_14 equiv"],
-["0 IF 0x01 0x0f ENDIF 1", "", "MINIMALDATA", "OP_15 equiv"],
-["0 IF 0x01 0x10 ENDIF 1", "", "MINIMALDATA", "OP_16 equiv"],
+["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"],
-["0x01 0x80", "1", "MINIMALDATA"],
-["0x02 0x0180", "1", "MINIMALDATA"],
-["0x02 0x0100", "1", "MINIMALDATA"],
-["0x02 0x0200", "1", "MINIMALDATA"],
-["0x02 0x0300", "1", "MINIMALDATA"],
-["0x02 0x0400", "1", "MINIMALDATA"],
-["0x02 0x0500", "1", "MINIMALDATA"],
-["0x02 0x0600", "1", "MINIMALDATA"],
-["0x02 0x0700", "1", "MINIMALDATA"],
-["0x02 0x0800", "1", "MINIMALDATA"],
-["0x02 0x0900", "1", "MINIMALDATA"],
-["0x02 0x0a00", "1", "MINIMALDATA"],
-["0x02 0x0b00", "1", "MINIMALDATA"],
-["0x02 0x0c00", "1", "MINIMALDATA"],
-["0x02 0x0d00", "1", "MINIMALDATA"],
-["0x02 0x0e00", "1", "MINIMALDATA"],
-["0x02 0x0f00", "1", "MINIMALDATA"],
-["0x02 0x1000", "1", "MINIMALDATA"],
+["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", ""],
-["1 0x02 0x0000", "ROLL DROP 1", ""],
-["0x02 0x0000", "1ADD DROP 1", ""],
-["0x02 0x0000", "1SUB DROP 1", ""],
-["0x02 0x0000", "NEGATE DROP 1", ""],
-["0x02 0x0000", "ABS DROP 1", ""],
-["0x02 0x0000", "NOT DROP 1", ""],
-["0x02 0x0000", "0NOTEQUAL DROP 1", ""],
-
-["0 0x02 0x0000", "ADD DROP 1", ""],
-["0x02 0x0000 0", "ADD DROP 1", ""],
-["0 0x02 0x0000", "SUB DROP 1", ""],
-["0x02 0x0000 0", "SUB DROP 1", ""],
-["0 0x02 0x0000", "BOOLAND DROP 1", ""],
-["0x02 0x0000 0", "BOOLAND DROP 1", ""],
-["0 0x02 0x0000", "BOOLOR DROP 1", ""],
-["0x02 0x0000 0", "BOOLOR DROP 1", ""],
-["0 0x02 0x0000", "NUMEQUAL DROP 1", ""],
-["0x02 0x0000 1", "NUMEQUAL DROP 1", ""],
-["0 0x02 0x0000", "NUMEQUALVERIFY 1", ""],
-["0x02 0x0000 0", "NUMEQUALVERIFY 1", ""],
-["0 0x02 0x0000", "NUMNOTEQUAL DROP 1", ""],
-["0x02 0x0000 0", "NUMNOTEQUAL DROP 1", ""],
-["0 0x02 0x0000", "LESSTHAN DROP 1", ""],
-["0x02 0x0000 0", "LESSTHAN DROP 1", ""],
-["0 0x02 0x0000", "GREATERTHAN DROP 1", ""],
-["0x02 0x0000 0", "GREATERTHAN DROP 1", ""],
-["0 0x02 0x0000", "LESSTHANOREQUAL DROP 1", ""],
-["0x02 0x0000 0", "LESSTHANOREQUAL DROP 1", ""],
-["0 0x02 0x0000", "GREATERTHANOREQUAL DROP 1", ""],
-["0x02 0x0000 0", "GREATERTHANOREQUAL DROP 1", ""],
-["0 0x02 0x0000", "MIN DROP 1", ""],
-["0x02 0x0000 0", "MIN DROP 1", ""],
-["0 0x02 0x0000", "MAX DROP 1", ""],
-["0x02 0x0000 0", "MAX DROP 1", ""],
-
-["0x02 0x0000 0 0", "WITHIN DROP 1", ""],
-["0 0x02 0x0000 0", "WITHIN DROP 1", ""],
-["0 0 0x02 0x0000", "WITHIN DROP 1", ""],
-
-["0 0 0x02 0x0000", "CHECKMULTISIG DROP 1", ""],
-["0 0x02 0x0000 0", "CHECKMULTISIG DROP 1", ""],
-["0 0x02 0x0000 0 1", "CHECKMULTISIG DROP 1", ""],
-["0 0 0x02 0x0000", "CHECKMULTISIGVERIFY 1", ""],
-["0 0x02 0x0000 0", "CHECKMULTISIGVERIFY 1", ""],
+["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"],
-["0 0", "1 0x21 0x02865c40293a680cb9c020e7b1e106d8c1916d3cef99aa431a56d253e69256dac0 1 CHECKMULTISIG NOT", "STRICTENC"],
+["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"],
@@ -681,241 +681,277 @@
 [
     "0 0x47 0x3044022044dc17b0887c161bb67ba9635bf758735bdde503e4b0a0987f587f14a4e1143d022009a215772d49a85dae40d8ca03955af26ad3978a0ff965faa12915e9586249a501 0x47 0x3044022044dc17b0887c161bb67ba9635bf758735bdde503e4b0a0987f587f14a4e1143d022009a215772d49a85dae40d8ca03955af26ad3978a0ff965faa12915e9586249a501",
     "2 0 0x21 0x02865c40293a680cb9c020e7b1e106d8c1916d3cef99aa431a56d253e69256dac0 2 CHECKMULTISIG NOT",
-    "STRICTENC",
+    "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",
+    "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", "", "Overly long signature is correctly encoded"],
-["0x25 0x30220220000000000000000000000000000000000000000000000000000000000000000000", "0 CHECKSIG NOT", "", "Missing S is correctly encoded"],
-["0x27 0x3024021077777777777777777777777777777777020a7777777777777777777777777777777701", "0 CHECKSIG NOT", "", "S with invalid S length is correctly encoded"],
-["0x27 0x302403107777777777777777777777777777777702107777777777777777777777777777777701", "0 CHECKSIG NOT", "", "Non-integer R is correctly encoded"],
-["0x27 0x302402107777777777777777777777777777777703107777777777777777777777777777777701", "0 CHECKSIG NOT", "", "Non-integer S is correctly encoded"],
-["0x17 0x3014020002107777777777777777777777777777777701", "0 CHECKSIG NOT", "", "Zero-length R is correctly encoded"],
-["0x17 0x3014021077777777777777777777777777777777020001", "0 CHECKSIG NOT", "", "Zero-length S is correctly encoded for DERSIG"],
-["0x27 0x302402107777777777777777777777777777777702108777777777777777777777777777777701", "0 CHECKSIG NOT", "", "Negative S is correctly encoded"],
+["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"],
 
 ["Automatically generated test cases"],
 [
     "0x47 0x304402200a5c6163f07b8d3b013c4d1d6dba25e780b39658d79ba37af7057a3b7f15ffa102201fd9b4eaa9943f734928b99a83592c2e7bf342ea2680f6a2bb705167966b742001",
     "0x41 0x0479be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8 CHECKSIG",
     "",
+    "OK",
     "P2PK"
 ],
 [
     "0x47 0x304402206e05a6fe23c59196ffe176c9ddc31e73a9885638f9d1328d47c0c703863b8876022076feb53811aa5b04e0e79f938eb19906cc5e67548bc555a8e8b8b0fc603d840c01 0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508",
     "DUP HASH160 0x14 0x1018853670f9f3b0582c5b9ee8ce93764ac32b93 EQUALVERIFY CHECKSIG",
     "",
+    "OK",
     "P2PKH"
 ],
 [
     "0x47 0x304402204710a85181663b32d25c70ec2bbd14adff5ddfff6cb50d09e155ef5f541fc86c0220056b0cc949be9386ecc5f6c2ac0493269031dbb185781db90171b54ac127790281",
     "0x41 0x048282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f5150811f8a8098557dfe45e8256e830b60ace62d613ac2f7b17bed31b6eaff6e26caf CHECKSIG",
     "",
+    "OK",
     "P2PK anyonecanpay"
 ],
 [
     "0x47 0x3044022003fef42ed6c7be8917441218f525a60e2431be978e28b7aca4d7a532cc413ae8022067a1f82c74e8d69291b90d148778405c6257bbcfc2353cc38a3e1f22bf44254601 0x23 0x210279be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798ac",
     "HASH160 0x14 0x23b0ad3477f2178bc0b3eed26e4e6316f4e83aa1 EQUAL",
     "P2SH",
+    "OK",
     "P2SH(P2PK)"
 ],
 [
     "0x47 0x304402204e2eb034be7b089534ac9e798cf6a2c79f38bcb34d1b179efd6f2de0841735db022071461beb056b5a7be1819da6a3e3ce3662831ecc298419ca101eb6887b5dd6a401 0x19 0x76a9147cf9c846cd4882efec4bf07e44ebdad495c94f4b88ac",
     "HASH160 0x14 0x2df519943d5acc0ef5222091f9dfe3543f489a82 EQUAL",
     "",
+    "OK",
     "P2SH(P2PKH), bad sig but no VERIFY_P2SH"
 ],
 [
     "0 0x47 0x3044022051254b9fb476a52d85530792b578f86fea70ec1ffb4393e661bcccb23d8d63d3022076505f94a403c86097841944e044c70c2045ce90e36de51f7e9d3828db98a07501 0x47 0x304402200a358f750934b3feb822f1966bfcd8bbec9eeaa3a8ca941e11ee5960e181fa01022050bf6b5a8e7750f70354ae041cb68a7bade67ec6c3ab19eb359638974410626e01 0x47 0x304402200955d031fff71d8653221e85e36c3c85533d2312fc3045314b19650b7ae2f81002202a6bb8505e36201909d0921f01abff390ae6b7ff97bbf959f98aedeb0a56730901",
     "3 0x21 0x0279be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798 0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 0x21 0x03363d90d447b00c9c99ceac05b6262ee053441c7e55552ffe526bad8f83ff4640 3 CHECKMULTISIG",
     "",
+    "OK",
     "3-of-3"
 ],
 [
     "0 0x47 0x304402205b7d2c2f177ae76cfbbf14d589c113b0b35db753d305d5562dd0b61cbf366cfb02202e56f93c4f08a27f986cd424ffc48a462c3202c4902104d4d0ff98ed28f4bf8001 0x47 0x30440220563e5b3b1fc11662a84bc5ea2a32cc3819703254060ba30d639a1aaf2d5068ad0220601c1f47ddc76d93284dd9ed68f7c9974c4a0ea7cbe8a247d6bc3878567a5fca01 0x4c69 0x52210279be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f8179821038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f515082103363d90d447b00c9c99ceac05b6262ee053441c7e55552ffe526bad8f83ff464053ae",
     "HASH160 0x14 0xc9e4a896d149702d0d1695434feddd52e24ad78d EQUAL",
     "P2SH",
+    "OK",
     "P2SH(2-of-3)"
 ],
 [
     "0x47 0x304402200060558477337b9022e70534f1fea71a318caf836812465a2509931c5e7c4987022078ec32bd50ac9e03a349ba953dfd9fe1c8d2dd8bdb1d38ddca844d3d5c78c11801",
     "0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 CHECKSIG",
     "",
+    "OK",
     "P2PK with too much R padding but no DERSIG"
 ],
 [
     "0x48 0x304502202de8c03fc525285c9c535631019a5f2af7c6454fa9eb392a3756a4917c420edd02210046130bf2baf7cfc065067c8b9e33a066d9c15edcea9feb0ca2d233e3597925b401",
     "0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 CHECKSIG",
     "",
+    "OK",
     "P2PK with too much S padding but no DERSIG"
 ],
 [
     "0x47 0x30440220d7a0417c3f6d1a15094d1cf2a3378ca0503eb8a57630953a9e2987e21ddd0a6502207a6266d686c99090920249991d3d42065b6d43eb70187b219c0db82e4f94d1a201",
     "0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 CHECKSIG",
     "",
+    "OK",
     "P2PK with too little R padding but no DERSIG"
 ],
 [
     "0x47 0x30440220005ece1335e7f757a1a1f476a7fb5bd90964e8a022489f890614a04acfb734c002206c12b8294a6513c7710e8c82d3c23d75cdbfe83200eb7efb495701958501a5d601",
     "0x21 0x03363d90d447b00c9c99ceac05b6262ee053441c7e55552ffe526bad8f83ff4640 CHECKSIG NOT",
     "",
+    "OK",
     "P2PK NOT with bad sig with too much R padding but no DERSIG"
 ],
 [
     "0x47 0x30440220d7a0417c3f6d1a15094d1cf2a3378ca0503eb8a57630953a9e2987e21ddd0a6502207a6266d686c99090920249991d3d42065b6d43eb70187b219c0db82e4f94d1a201",
     "0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 CHECKSIG",
     "",
+    "OK",
     "BIP66 example 1, without DERSIG"
 ],
 [
     "0",
     "0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 CHECKSIG NOT",
     "",
+    "OK",
     "BIP66 example 4, without DERSIG"
 ],
 [
     "0",
     "0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 CHECKSIG NOT",
     "DERSIG",
+    "OK",
     "BIP66 example 4, with DERSIG"
 ],
 [
     "1",
     "0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 CHECKSIG NOT",
     "",
+    "OK",
     "BIP66 example 6, without DERSIG"
 ],
 [
     "0 0x47 0x30440220cae00b1444babfbf6071b0ba8707f6bd373da3df494d6e74119b0430c5db810502205d5231b8c5939c8ff0c82242656d6e06edb073d42af336c99fe8837c36ea39d501 0x47 0x3044022027c2714269ca5aeecc4d70edc88ba5ee0e3da4986e9216028f489ab4f1b8efce022022bd545b4951215267e4c5ceabd4c5350331b2e4a0b6494c56f361fa5a57a1a201",
     "2 0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 0x21 0x03363d90d447b00c9c99ceac05b6262ee053441c7e55552ffe526bad8f83ff4640 2 CHECKMULTISIG",
     "",
+    "OK",
     "BIP66 example 7, without DERSIG"
 ],
 [
     "0 0 0x47 0x30440220da6f441dc3b4b2c84cfa8db0cd5b34ed92c9e01686de5a800d40498b70c0dcac02207c2cf91b0c32b860c4cd4994be36cfb84caf8bb7c3a8e4d96a31b2022c5299c501",
     "2 0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 0x21 0x03363d90d447b00c9c99ceac05b6262ee053441c7e55552ffe526bad8f83ff4640 2 CHECKMULTISIG NOT",
     "",
+    "OK",
     "BIP66 example 10, without DERSIG"
 ],
 [
     "0 0x47 0x30440220b119d67d389315308d1745f734a51ff3ec72e06081e84e236fdf9dc2f5d2a64802204b04e3bc38674c4422ea317231d642b56dc09d214a1ecbbf16ecca01ed996e2201 0",
     "2 0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 0x21 0x03363d90d447b00c9c99ceac05b6262ee053441c7e55552ffe526bad8f83ff4640 2 CHECKMULTISIG NOT",
     "",
+    "OK",
     "BIP66 example 12, without DERSIG"
 ],
 [
     "0 0x47 0x30440220b119d67d389315308d1745f734a51ff3ec72e06081e84e236fdf9dc2f5d2a64802204b04e3bc38674c4422ea317231d642b56dc09d214a1ecbbf16ecca01ed996e2201 0",
     "2 0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 0x21 0x03363d90d447b00c9c99ceac05b6262ee053441c7e55552ffe526bad8f83ff4640 2 CHECKMULTISIG NOT",
     "DERSIG",
+    "OK",
     "BIP66 example 12, with DERSIG"
 ],
 [
     "0x48 0x304402203e4516da7253cf068effec6b95c41221c0cf3a8e6ccb8cbf1725b562e9afde2c022054e1c258c2981cdfba5df1f46661fb6541c44f77ca0092f3600331abfffb12510101",
     "0x21 0x03363d90d447b00c9c99ceac05b6262ee053441c7e55552ffe526bad8f83ff4640 CHECKSIG",
     "",
+    "OK",
     "P2PK with multi-byte hashtype, without DERSIG"
 ],
 [
     "0x48 0x304502203e4516da7253cf068effec6b95c41221c0cf3a8e6ccb8cbf1725b562e9afde2c022100ab1e3da73d67e32045a20e0b999e049978ea8d6ee5480d485fcf2ce0d03b2ef001",
     "0x21 0x03363d90d447b00c9c99ceac05b6262ee053441c7e55552ffe526bad8f83ff4640 CHECKSIG",
     "",
+    "OK",
     "P2PK with high S but no LOW_S"
 ],
 [
     "0x47 0x3044022057292e2d4dfe775becdd0a9e6547997c728cdf35390f6a017da56d654d374e4902206b643be2fc53763b4e284845bfea2c597d2dc7759941dce937636c9d341b71ed01",
     "0x41 0x0679be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8 CHECKSIG",
     "",
+    "OK",
     "P2PK with hybrid pubkey but no STRICTENC"
 ],
 [
     "0x47 0x30440220035d554e3153c04950c9993f41c496607a8e24093db0595be7bf875cf64fcf1f02204731c8c4e5daf15e706cec19cdd8f2c5b1d05490e11dab8465ed426569b6e92101",
     "0x41 0x0679be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8 CHECKSIG NOT",
     "",
+    "OK",
     "P2PK NOT with invalid hybrid pubkey but no STRICTENC"
 ],
 [
     "0 0x47 0x304402202e79441ad1baf5a07fb86bae3753184f6717d9692680947ea8b6e8b777c69af1022079a262e13d868bb5a0964fefe3ba26942e1b0669af1afb55ef3344bc9d4fc4c401",
     "1 0x41 0x0679be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8 0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 2 CHECKMULTISIG",
     "",
+    "OK",
     "1-of-2 with the second 1 hybrid pubkey and no STRICTENC"
 ],
 [
     "0 0x47 0x304402202e79441ad1baf5a07fb86bae3753184f6717d9692680947ea8b6e8b777c69af1022079a262e13d868bb5a0964fefe3ba26942e1b0669af1afb55ef3344bc9d4fc4c401",
     "1 0x41 0x0679be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8 0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 2 CHECKMULTISIG",
     "STRICTENC",
+    "OK",
     "1-of-2 with the second 1 hybrid pubkey"
 ],
 [
     "0x47 0x304402206177d513ec2cda444c021a1f4f656fc4c72ba108ae063e157eb86dc3575784940220666fc66702815d0e5413bb9b1df22aed44f5f1efb8b99d41dd5dc9a5be6d205205",
     "0x41 0x048282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f5150811f8a8098557dfe45e8256e830b60ace62d613ac2f7b17bed31b6eaff6e26caf CHECKSIG",
     "",
+    "OK",
     "P2PK with undefined hashtype but no STRICTENC"
 ],
 [
     "0x47 0x304402207409b5b320296e5e2136a7b281a7f803028ca4ca44e2b83eebd46932677725de02202d4eea1c8d3c98e6f42614f54764e6e5e6542e213eb4d079737e9a8b6e9812ec05",
     "0x41 0x048282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f5150811f8a8098557dfe45e8256e830b60ace62d613ac2f7b17bed31b6eaff6e26caf CHECKSIG NOT",
     "",
+    "OK",
     "P2PK NOT with invalid sig and undefined hashtype but no STRICTENC"
 ],
 [
     "1 0x47 0x3044022051254b9fb476a52d85530792b578f86fea70ec1ffb4393e661bcccb23d8d63d3022076505f94a403c86097841944e044c70c2045ce90e36de51f7e9d3828db98a07501 0x47 0x304402200a358f750934b3feb822f1966bfcd8bbec9eeaa3a8ca941e11ee5960e181fa01022050bf6b5a8e7750f70354ae041cb68a7bade67ec6c3ab19eb359638974410626e01 0x47 0x304402200955d031fff71d8653221e85e36c3c85533d2312fc3045314b19650b7ae2f81002202a6bb8505e36201909d0921f01abff390ae6b7ff97bbf959f98aedeb0a56730901",
     "3 0x21 0x0279be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798 0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 0x21 0x03363d90d447b00c9c99ceac05b6262ee053441c7e55552ffe526bad8f83ff4640 3 CHECKMULTISIG",
     "",
+    "OK",
     "3-of-3 with nonzero dummy but no NULLDUMMY"
 ],
 [
     "1 0x47 0x304402201bb2edab700a5d020236df174fefed78087697143731f659bea59642c759c16d022061f42cdbae5bcd3e8790f20bf76687443436e94a634321c16a72aa54cbc7c2ea01 0x47 0x304402204bb4a64f2a6e5c7fb2f07fef85ee56fde5e6da234c6a984262307a20e99842d702206f8303aaba5e625d223897e2ffd3f88ef1bcffef55f38dc3768e5f2e94c923f901 0x47 0x3044022040c2809b71fffb155ec8b82fe7a27f666bd97f941207be4e14ade85a1249dd4d02204d56c85ec525dd18e29a0533d5ddf61b6b1bb32980c2f63edf951aebf7a27bfe01",
     "3 0x21 0x0279be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798 0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 0x21 0x03363d90d447b00c9c99ceac05b6262ee053441c7e55552ffe526bad8f83ff4640 3 CHECKMULTISIG NOT",
     "",
+    "OK",
     "3-of-3 NOT with invalid sig and nonzero dummy but no NULLDUMMY"
 ],
 [
     "0 0x47 0x304402200abeb4bd07f84222f474aed558cfbdfc0b4e96cde3c2935ba7098b1ff0bd74c302204a04c1ca67b2a20abee210cf9a21023edccbbf8024b988812634233115c6b73901 DUP",
     "2 0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 2 CHECKMULTISIG",
     "",
+    "OK",
     "2-of-2 with two identical keys and sigs pushed using OP_DUP but no SIGPUSHONLY"
 ],
 [
     "0x47 0x3044022018a2a81a93add5cb5f5da76305718e4ea66045ec4888b28d84cb22fae7f4645b02201e6daa5ed5d2e4b2b2027cf7ffd43d8d9844dd49f74ef86899ec8e669dfd39aa01 NOP8 0x23 0x2103363d90d447b00c9c99ceac05b6262ee053441c7e55552ffe526bad8f83ff4640ac",
     "HASH160 0x14 0x215640c2f72f0d16b4eced26762035a42ffed39a EQUAL",
     "",
+    "OK",
     "P2SH(P2PK) with non-push scriptSig but no P2SH or SIGPUSHONLY"
 ],
 [
     "0x47 0x304402203e4516da7253cf068effec6b95c41221c0cf3a8e6ccb8cbf1725b562e9afde2c022054e1c258c2981cdfba5df1f46661fb6541c44f77ca0092f3600331abfffb125101 NOP8",
     "0x21 0x03363d90d447b00c9c99ceac05b6262ee053441c7e55552ffe526bad8f83ff4640 CHECKSIG",
     "",
+    "OK",
     "P2PK with non-push scriptSig but with P2SH validation"
 ],
 [
     "0 0x47 0x304402200abeb4bd07f84222f474aed558cfbdfc0b4e96cde3c2935ba7098b1ff0bd74c302204a04c1ca67b2a20abee210cf9a21023edccbbf8024b988812634233115c6b73901 0x47 0x304402200abeb4bd07f84222f474aed558cfbdfc0b4e96cde3c2935ba7098b1ff0bd74c302204a04c1ca67b2a20abee210cf9a21023edccbbf8024b988812634233115c6b73901",
     "2 0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 2 CHECKMULTISIG",
     "SIGPUSHONLY",
+    "OK",
     "2-of-2 with two identical keys and sigs pushed"
 ],
 [
     "11 0x47 0x304402200a5c6163f07b8d3b013c4d1d6dba25e780b39658d79ba37af7057a3b7f15ffa102201fd9b4eaa9943f734928b99a83592c2e7bf342ea2680f6a2bb705167966b742001",
     "0x41 0x0479be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8 CHECKSIG",
     "P2SH",
+    "OK",
     "P2PK with unnecessary input but no CLEANSTACK"
 ],
 [
     "11 0x47 0x304402202f7505132be14872581f35d74b759212d9da40482653f1ffa3116c3294a4a51702206adbf347a2240ca41c66522b1a22a41693610b76a8e7770645dc721d1635854f01 0x43 0x410479be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8ac",
     "HASH160 0x14 0x31edc23bdafda4639e669f89ad6b2318dd79d032 EQUAL",
     "P2SH",
+    "OK",
     "P2SH with unnecessary input but no CLEANSTACK"
 ],
 [
     "0x47 0x304402202f7505132be14872581f35d74b759212d9da40482653f1ffa3116c3294a4a51702206adbf347a2240ca41c66522b1a22a41693610b76a8e7770645dc721d1635854f01 0x43 0x410479be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8ac",
     "HASH160 0x14 0x31edc23bdafda4639e669f89ad6b2318dd79d032 EQUAL",
     "CLEANSTACK,P2SH",
+    "OK",
     "P2SH with CLEANSTACK"
 ],
 
diff --git a/src/test/script_tests.cpp b/src/test/script_tests.cpp
index 4ecb56de84981..006d8aa644beb 100644
--- a/src/test/script_tests.cpp
+++ b/src/test/script_tests.cpp
@@ -263,7 +263,7 @@ class TestBuilder
     }
 
 public:
-    TestBuilder(const CScript& redeemScript, const std::string& comment_, int flags_, bool P2SH = false) : scriptPubKey(redeemScript), havePush(false), comment(comment_), flags(flags_), scriptError(-1)
+    TestBuilder(const CScript& redeemScript, const std::string& comment_, int flags_, bool P2SH = false) : scriptPubKey(redeemScript), havePush(false), comment(comment_), flags(flags_), scriptError(SCRIPT_ERR_OK)
     {
         if (P2SH) {
             creditTx = BuildCreditingTransaction(CScript() << OP_HASH160 << ToByteVector(CScriptID(redeemScript)) << OP_EQUAL);
@@ -365,9 +365,8 @@ class TestBuilder
         array.push_back(FormatScript(spendTx.vin[0].scriptSig));
         array.push_back(FormatScript(creditTx.vout[0].scriptPubKey));
         array.push_back(FormatScriptFlags(flags));
+        array.push_back(FormatScriptError((ScriptError_t)scriptError));
         array.push_back(comment);
-        if (scriptError != -1)
-            array.push_back(FormatScriptError((ScriptError_t)scriptError));
         return array;
     }
 
@@ -715,7 +714,7 @@ BOOST_AUTO_TEST_CASE(script_valid)
 {
     // Read tests from test/data/script_valid.json
     // Format is an array of arrays
-    // Inner arrays are [ "scriptSig", "scriptPubKey", "flags" ]
+    // Inner arrays are [ "scriptSig", "scriptPubKey", "flags", "expected_scripterror" ]
     // ... where scriptSig and scriptPubKey are stringified
     // scripts.
     UniValue tests = read_json(std::string(json_tests::script_valid, json_tests::script_valid + sizeof(json_tests::script_valid)));
@@ -735,6 +734,7 @@ BOOST_AUTO_TEST_CASE(script_valid)
         string scriptPubKeyString = test[1].get_str();
         CScript scriptPubKey = ParseScript(scriptPubKeyString);
         unsigned int scriptflags = ParseScriptFlags(test[2].get_str());
+        BOOST_CHECK_EQUAL(test[3].get_str(), "OK");
 
         DoTest(scriptPubKey, scriptSig, scriptflags, true, strTest, SCRIPT_ERR_OK);
     }
@@ -747,7 +747,7 @@ BOOST_AUTO_TEST_CASE(script_invalid)
     for (unsigned int idx = 0; idx < tests.size(); idx++) {
         UniValue test = tests[idx];
         string strTest = test.write();
-        if (test.size() < 3) // Allow size > 2; extra stuff ignored (useful for comments)
+        if (test.size() < 4) // Allow size > 2; extra stuff ignored (useful for comments)
         {
             if (test.size() != 1) {
                 BOOST_ERROR("Bad test: " << strTest);
@@ -759,10 +759,7 @@ BOOST_AUTO_TEST_CASE(script_invalid)
         string scriptPubKeyString = test[1].get_str();
         CScript scriptPubKey = ParseScript(scriptPubKeyString);
         unsigned int scriptflags = ParseScriptFlags(test[2].get_str());
-        int scriptError = -1; // Expected script error is optional, and follows comment
-        if (test.size() >= 5 && test[4].get_str() != "") {
-            scriptError = ParseScriptError(test[4].get_str());
-        }
+        int scriptError = ParseScriptError(test[3].get_str());
 
         DoTest(scriptPubKey, scriptSig, scriptflags, false, strTest, scriptError);
     }

From 009b503792737ab03aeb6e15060bc4f499500a96 Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Tue, 5 Apr 2016 15:50:17 +0200
Subject: [PATCH 0100/1802] Get rid of expect in script_tests as it's implied
 by scripterror

---
 src/test/script_tests.cpp | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/test/script_tests.cpp b/src/test/script_tests.cpp
index 006d8aa644beb..6340af2081f95 100644
--- a/src/test/script_tests.cpp
+++ b/src/test/script_tests.cpp
@@ -145,13 +145,14 @@ CMutableTransaction BuildSpendingTransaction(const CScript& scriptSig, const CMu
     return txSpend;
 }
 
-void DoTest(const CScript& scriptPubKey, const CScript& scriptSig, int flags, bool expect, const std::string& message, int scriptError)
+void DoTest(const CScript& scriptPubKey, const CScript& scriptSig, int flags, const std::string& message, int scriptError)
 {
+    bool expect = (scriptError == SCRIPT_ERR_OK);
     ScriptError err;
     CMutableTransaction tx = BuildSpendingTransaction(scriptSig, BuildCreditingTransaction(scriptPubKey));
     CMutableTransaction tx2 = tx;
     BOOST_CHECK_MESSAGE(VerifyScript(scriptSig, scriptPubKey, flags, MutableTransactionSignatureChecker(&tx, 0), &err) == expect, message);
-    BOOST_CHECK_MESSAGE(scriptError == -1 || err == scriptError, std::string(FormatScriptError(err)) + " where " + std::string(FormatScriptError((ScriptError_t)scriptError)) + " expected: " + message);
+    BOOST_CHECK_MESSAGE(err == scriptError, std::string(FormatScriptError(err)) + " where " + std::string(FormatScriptError((ScriptError_t)scriptError)) + " expected: " + message);
 #if defined(HAVE_CONSENSUS_LIB)
     CDataStream stream(SER_NETWORK, PROTOCOL_VERSION);
     stream << tx2;
@@ -349,11 +350,11 @@ class TestBuilder
         return *this;
     }
 
-    TestBuilder& Test(bool expect)
+    TestBuilder& Test()
     {
         TestBuilder copy = *this; // Make a copy so we can rollback the push.
         DoPush();
-        DoTest(creditTx.vout[0].scriptPubKey, spendTx.vin[0].scriptSig, flags, expect, comment, expect ? SCRIPT_ERR_OK : scriptError);
+        DoTest(creditTx.vout[0].scriptPubKey, spendTx.vin[0].scriptSig, flags, comment, scriptError);
         *this = copy;
         return *this;
     }
@@ -680,7 +681,7 @@ BOOST_AUTO_TEST_CASE(script_build)
     std::string strBad;
 
     BOOST_FOREACH(TestBuilder& test, good) {
-        test.Test(true);
+        test.Test();
         std::string str = JSONPrettyPrint(test.GetJSON());
 #ifndef UPDATE_JSON_TESTS
         if (tests_good.count(str) == 0) {
@@ -690,7 +691,7 @@ BOOST_AUTO_TEST_CASE(script_build)
         strGood += str + ",\n";
     }
     BOOST_FOREACH(TestBuilder& test, bad) {
-        test.Test(false);
+        test.Test();
         std::string str = JSONPrettyPrint(test.GetJSON());
 #ifndef UPDATE_JSON_TESTS
         if (tests_bad.count(str) == 0) {
@@ -736,7 +737,7 @@ BOOST_AUTO_TEST_CASE(script_valid)
         unsigned int scriptflags = ParseScriptFlags(test[2].get_str());
         BOOST_CHECK_EQUAL(test[3].get_str(), "OK");
 
-        DoTest(scriptPubKey, scriptSig, scriptflags, true, strTest, SCRIPT_ERR_OK);
+        DoTest(scriptPubKey, scriptSig, scriptflags, strTest, SCRIPT_ERR_OK);
     }
 }
 
@@ -761,7 +762,7 @@ BOOST_AUTO_TEST_CASE(script_invalid)
         unsigned int scriptflags = ParseScriptFlags(test[2].get_str());
         int scriptError = ParseScriptError(test[3].get_str());
 
-        DoTest(scriptPubKey, scriptSig, scriptflags, false, strTest, scriptError);
+        DoTest(scriptPubKey, scriptSig, scriptflags, strTest, scriptError);
     }
 }
 

From dde46d3ae1de18700e089bc1861cf1e18649dc5d Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Tue, 5 Apr 2016 16:11:47 +0200
Subject: [PATCH 0101/1802] Merge script_valid and script_invalid tests

---
 src/Makefile.test.include                     |   3 +-
 src/test/data/script_invalid.json             | 877 ------------------
 .../{script_valid.json => script_tests.json}  | 865 +++++++++++++++++
 src/test/script_tests.cpp                     | 601 ++++++------
 4 files changed, 1143 insertions(+), 1203 deletions(-)
 delete mode 100644 src/test/data/script_invalid.json
 rename src/test/data/{script_valid.json => script_tests.json} (54%)

diff --git a/src/Makefile.test.include b/src/Makefile.test.include
index d806fb219e4f8..f025b18c7e690 100644
--- a/src/Makefile.test.include
+++ b/src/Makefile.test.include
@@ -20,11 +20,10 @@ EXTRA_DIST += \
 	test/data/txcreatesign.hex
 
 JSON_TEST_FILES = \
-  test/data/script_valid.json \
+  test/data/script_tests.json \
   test/data/base58_keys_valid.json \
   test/data/base58_encode_decode.json \
   test/data/base58_keys_invalid.json \
-  test/data/script_invalid.json \
   test/data/tx_invalid.json \
   test/data/tx_valid.json \
   test/data/sighash.json
diff --git a/src/test/data/script_invalid.json b/src/test/data/script_invalid.json
deleted file mode 100644
index 1427cb630a6f2..0000000000000
--- a/src/test/data/script_invalid.json
+++ /dev/null
@@ -1,877 +0,0 @@
-[
-["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", "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 NOP3 NOP4 NOP5 NOP6 NOP7 NOP8 NOP9 NOP10 2 EQUAL", "P2SH,STRICTENC", "EVAL_FALSE"],
-["'NOP_1_to_10' NOP1 CHECKLOCKTIMEVERIFY NOP3 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", "NOP3",  "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 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",
-"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"],
-
-["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"],
-
-
-["Order of CHECKMULTISIG evaluation tests, inverted by swapping the order of"],
-["pubkeys/signatures so they fail due to the STRICTENC rules on validly encoded"],
-["signatures and pubkeys."],
-[
-    "0 0x47 0x3044022044dc17b0887c161bb67ba9635bf758735bdde503e4b0a0987f587f14a4e1143d022009a215772d49a85dae40d8ca03955af26ad3978a0ff965faa12915e9586249a501 0x47 0x3044022044dc17b0887c161bb67ba9635bf758735bdde503e4b0a0987f587f14a4e1143d022009a215772d49a85dae40d8ca03955af26ad3978a0ff965faa12915e9586249a501",
-    "2 0x21 0x02865c40293a680cb9c020e7b1e106d8c1916d3cef99aa431a56d253e69256dac0 0 2 CHECKMULTISIG NOT",
-    "STRICTENC",
-    "PUBKEYTYPE",
-    "2-of-2 CHECKMULTISIG NOT with the first pubkey invalid, and both signatures validly encoded."
-],
-[
-    "0 0x47 0x3044022044dc17b0887c161bb67ba9635bf758735bdde503e4b0a0987f587f14a4e1143d022009a215772d49a85dae40d8ca03955af26ad3978a0ff965faa12915e9586249a501 1",
-    "2 0x21 0x02865c40293a680cb9c020e7b1e106d8c1916d3cef99aa431a56d253e69256dac0 0x21 0x02865c40293a680cb9c020e7b1e106d8c1916d3cef99aa431a56d253e69256dac0 2 CHECKMULTISIG NOT",
-    "STRICTENC",
-    "SIG_DER",
-    "2-of-2 CHECKMULTISIG NOT with both pubkeys valid, but first signature invalid."
-],
-[
-    "0 0x47 0x304402205451ce65ad844dbb978b8bdedf5082e33b43cae8279c30f2c74d9e9ee49a94f802203fe95a7ccf74da7a232ee523ef4a53cb4d14bdd16289680cdb97a63819b8f42f01 0x46 0x304402205451ce65ad844dbb978b8bdedf5082e33b43cae8279c30f2c74d9e9ee49a94f802203fe95a7ccf74da7a232ee523ef4a53cb4d14bdd16289680cdb97a63819b8f42f",
-    "2 0x21 0x02a673638cb9587cb68ea08dbef685c6f2d2a751a8b3c6f2a7e9a4999e6e4bfaf5 0x21 0x02a673638cb9587cb68ea08dbef685c6f2d2a751a8b3c6f2a7e9a4999e6e4bfaf5 0x21 0x02a673638cb9587cb68ea08dbef685c6f2d2a751a8b3c6f2a7e9a4999e6e4bfaf5 3 CHECKMULTISIG",
-    "P2SH,STRICTENC",
-    "SIG_DER",
-    "2-of-3 with one valid and one invalid signature due to parse error, nSigs > validSigs"
-],
-
-["Increase DERSIG test coverage"],
-["0x4a 0x0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", "0 CHECKSIG NOT", "DERSIG", "SIG_DER", "Overly long signature is incorrectly encoded for DERSIG"],
-["0x25 0x30220220000000000000000000000000000000000000000000000000000000000000000000", "0 CHECKSIG NOT", "DERSIG", "SIG_DER", "Missing S is incorrectly encoded for DERSIG"],
-["0x27 0x3024021077777777777777777777777777777777020a7777777777777777777777777777777701", "0 CHECKSIG NOT", "DERSIG", "SIG_DER", "S with invalid S length is incorrectly encoded for DERSIG"],
-["0x27 0x302403107777777777777777777777777777777702107777777777777777777777777777777701", "0 CHECKSIG NOT", "DERSIG", "SIG_DER", "Non-integer R is incorrectly encoded for DERSIG"],
-["0x27 0x302402107777777777777777777777777777777703107777777777777777777777777777777701", "0 CHECKSIG NOT", "DERSIG", "SIG_DER", "Non-integer S is incorrectly encoded for DERSIG"],
-["0x17 0x3014020002107777777777777777777777777777777701", "0 CHECKSIG NOT", "DERSIG", "SIG_DER", "Zero-length R is incorrectly encoded for DERSIG"],
-["0x17 0x3014021077777777777777777777777777777777020001", "0 CHECKSIG NOT", "DERSIG", "SIG_DER", "Zero-length S is incorrectly encoded for DERSIG"],
-["0x27 0x302402107777777777777777777777777777777702108777777777777777777777777777777701", "0 CHECKSIG NOT", "DERSIG", "SIG_DER", "Negative S is incorrectly encoded for DERSIG"],
-
-["Automatically generated test cases"],
-[
-    "0x47 0x304402200a5c6163f07b8c3b013c4d1d6dba25e780b39658d79ba37af7057a3b7f15ffa102201fd9b4eaa9943f734928b99a83592c2e7bf342ea2680f6a2bb705167966b742001",
-    "0x41 0x0479be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8 CHECKSIG",
-    "",
-    "EVAL_FALSE",
-    "P2PK, bad sig"
-],
-[
-    "0x47 0x3044022034bb0494b50b8ef130e2185bb220265b9284ef5b4b8a8da4d8415df489c83b5102206259a26d9cc0a125ac26af6153b17c02956855ebe1467412f066e402f5f05d1201 0x21 0x03363d90d446b00c9c99ceac05b6262ee053441c7e55552ffe526bad8f83ff4640",
-    "DUP HASH160 0x14 0xc0834c0c158f53be706d234c38fd52de7eece656 EQUALVERIFY CHECKSIG",
-    "",
-    "EQUALVERIFY",
-    "P2PKH, bad pubkey"
-],
-[
-    "0x47 0x304402204710a85181663b32d25c70ec2bbd14adff5ddfff6cb50d09e155ef5f541fc86c0220056b0cc949be9386ecc5f6c2ac0493269031dbb185781db90171b54ac127790201",
-    "0x41 0x048282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f5150811f8a8098557dfe45e8256e830b60ace62d613ac2f7b17bed31b6eaff6e26caf CHECKSIG",
-    "",
-    "EVAL_FALSE",
-    "P2PK anyonecanpay marked with normal hashtype"
-],
-[
-    "0x47 0x3044022003fef42ed6c7be8917441218f525a60e2431be978e28b7aca4d7a532cc413ae8022067a1f82c74e8d69291b90d148778405c6257bbcfc2353cc38a3e1f22bf44254601 0x23 0x210279be667ef9dcbbac54a06295ce870b07029bfcdb2dce28d959f2815b16f81798ac",
-    "HASH160 0x14 0x23b0ad3477f2178bc0b3eed26e4e6316f4e83aa1 EQUAL",
-    "P2SH",
-    "EVAL_FALSE",
-    "P2SH(P2PK), bad redeemscript"
-],
-[
-    "0x47 0x304402204e2eb034be7b089534ac9e798cf6a2c79f38bcb34d1b179efd6f2de0841735db022071461beb056b5a7be1819da6a3e3ce3662831ecc298419ca101eb6887b5dd6a401 0x19 0x76a9147cf9c846cd4882efec4bf07e44ebdad495c94f4b88ac",
-    "HASH160 0x14 0x2df519943d5acc0ef5222091f9dfe3543f489a82 EQUAL",
-    "P2SH",
-    "EQUALVERIFY",
-    "P2SH(P2PKH), bad sig"
-],
-[
-    "0 0x47 0x3044022051254b9fb476a52d85530792b578f86fea70ec1ffb4393e661bcccb23d8d63d3022076505f94a403c86097841944e044c70c2045ce90e36de51f7e9d3828db98a07501 0x47 0x304402200a358f750934b3feb822f1966bfcd8bbec9eeaa3a8ca941e11ee5960e181fa01022050bf6b5a8e7750f70354ae041cb68a7bade67ec6c3ab19eb359638974410626e01 0",
-    "3 0x21 0x0279be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798 0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 0x21 0x03363d90d447b00c9c99ceac05b6262ee053441c7e55552ffe526bad8f83ff4640 3 CHECKMULTISIG",
-    "",
-    "EVAL_FALSE",
-    "3-of-3, 2 sigs"
-],
-[
-    "0 0x47 0x304402205b7d2c2f177ae76cfbbf14d589c113b0b35db753d305d5562dd0b61cbf366cfb02202e56f93c4f08a27f986cd424ffc48a462c3202c4902104d4d0ff98ed28f4bf8001 0 0x4c69 0x52210279be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f8179821038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f515082103363d90d447b00c9c99ceac05b6262ee053441c7e55552ffe526bad8f83ff464053ae",
-    "HASH160 0x14 0xc9e4a896d149702d0d1695434feddd52e24ad78d EQUAL",
-    "P2SH",
-    "EVAL_FALSE",
-    "P2SH(2-of-3), 1 sig"
-],
-[
-    "0x47 0x304402200060558477337b9022e70534f1fea71a318caf836812465a2509931c5e7c4987022078ec32bd50ac9e03a349ba953dfd9fe1c8d2dd8bdb1d38ddca844d3d5c78c11801",
-    "0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 CHECKSIG",
-    "DERSIG",
-    "SIG_DER",
-    "P2PK with too much R padding"
-],
-[
-    "0x48 0x304502202de8c03fc525285c9c535631019a5f2af7c6454fa9eb392a3756a4917c420edd02210046130bf2baf7cfc065067c8b9e33a066d9c15edcea9feb0ca2d233e3597925b401",
-    "0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 CHECKSIG",
-    "DERSIG",
-    "SIG_DER",
-    "P2PK with too much S padding"
-],
-[
-    "0x47 0x30440220d7a0417c3f6d1a15094d1cf2a3378ca0503eb8a57630953a9e2987e21ddd0a6502207a6266d686c99090920249991d3d42065b6d43eb70187b219c0db82e4f94d1a201",
-    "0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 CHECKSIG",
-    "DERSIG",
-    "SIG_DER",
-    "P2PK with too little R padding"
-],
-[
-    "0x47 0x30440220005ece1335e7f757a1a1f476a7fb5bd90964e8a022489f890614a04acfb734c002206c12b8294a6513c7710e8c82d3c23d75cdbfe83200eb7efb495701958501a5d601",
-    "0x21 0x03363d90d447b00c9c99ceac05b6262ee053441c7e55552ffe526bad8f83ff4640 CHECKSIG NOT",
-    "DERSIG",
-    "SIG_DER",
-    "P2PK NOT with bad sig with too much R padding"
-],
-[
-    "0x47 0x30440220005ece1335e7f657a1a1f476a7fb5bd90964e8a022489f890614a04acfb734c002206c12b8294a6513c7710e8c82d3c23d75cdbfe83200eb7efb495701958501a5d601",
-    "0x21 0x03363d90d447b00c9c99ceac05b6262ee053441c7e55552ffe526bad8f83ff4640 CHECKSIG NOT",
-    "",
-    "EVAL_FALSE",
-    "P2PK NOT with too much R padding but no DERSIG"
-],
-[
-    "0x47 0x30440220005ece1335e7f657a1a1f476a7fb5bd90964e8a022489f890614a04acfb734c002206c12b8294a6513c7710e8c82d3c23d75cdbfe83200eb7efb495701958501a5d601",
-    "0x21 0x03363d90d447b00c9c99ceac05b6262ee053441c7e55552ffe526bad8f83ff4640 CHECKSIG NOT",
-    "DERSIG",
-    "SIG_DER",
-    "P2PK NOT with too much R padding"
-],
-[
-    "0x47 0x30440220d7a0417c3f6d1a15094d1cf2a3378ca0503eb8a57630953a9e2987e21ddd0a6502207a6266d686c99090920249991d3d42065b6d43eb70187b219c0db82e4f94d1a201",
-    "0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 CHECKSIG",
-    "DERSIG",
-    "SIG_DER",
-    "BIP66 example 1, with DERSIG"
-],
-[
-    "0x47 0x304402208e43c0b91f7c1e5bc58e41c8185f8a6086e111b0090187968a86f2822462d3c902200a58f4076b1133b18ff1dc83ee51676e44c60cc608d9534e0df5ace0424fc0be01",
-    "0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 CHECKSIG NOT",
-    "",
-    "EVAL_FALSE",
-    "BIP66 example 2, without DERSIG"
-],
-[
-    "0x47 0x304402208e43c0b91f7c1e5bc58e41c8185f8a6086e111b0090187968a86f2822462d3c902200a58f4076b1133b18ff1dc83ee51676e44c60cc608d9534e0df5ace0424fc0be01",
-    "0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 CHECKSIG NOT",
-    "DERSIG",
-    "SIG_DER",
-    "BIP66 example 2, with DERSIG"
-],
-[
-    "0",
-    "0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 CHECKSIG",
-    "",
-    "EVAL_FALSE",
-    "BIP66 example 3, without DERSIG"
-],
-[
-    "0",
-    "0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 CHECKSIG",
-    "DERSIG",
-    "EVAL_FALSE",
-    "BIP66 example 3, with DERSIG"
-],
-[
-    "1",
-    "0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 CHECKSIG",
-    "",
-    "EVAL_FALSE",
-    "BIP66 example 5, without DERSIG"
-],
-[
-    "1",
-    "0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 CHECKSIG",
-    "DERSIG",
-    "SIG_DER",
-    "BIP66 example 5, with DERSIG"
-],
-[
-    "1",
-    "0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 CHECKSIG NOT",
-    "DERSIG",
-    "SIG_DER",
-    "BIP66 example 6, with DERSIG"
-],
-[
-    "0 0x47 0x30440220cae00b1444babfbf6071b0ba8707f6bd373da3df494d6e74119b0430c5db810502205d5231b8c5939c8ff0c82242656d6e06edb073d42af336c99fe8837c36ea39d501 0x47 0x3044022027c2714269ca5aeecc4d70edc88ba5ee0e3da4986e9216028f489ab4f1b8efce022022bd545b4951215267e4c5ceabd4c5350331b2e4a0b6494c56f361fa5a57a1a201",
-    "2 0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 0x21 0x03363d90d447b00c9c99ceac05b6262ee053441c7e55552ffe526bad8f83ff4640 2 CHECKMULTISIG",
-    "DERSIG",
-    "SIG_DER",
-    "BIP66 example 7, with DERSIG"
-],
-[
-    "0 0x47 0x30440220b119d67d389315308d1745f734a51ff3ec72e06081e84e236fdf9dc2f5d2a64802204b04e3bc38674c4422ea317231d642b56dc09d214a1ecbbf16ecca01ed996e2201 0x47 0x3044022079ea80afd538d9ada421b5101febeb6bc874e01dde5bca108c1d0479aec339a4022004576db8f66130d1df686ccf00935703689d69cf539438da1edab208b0d63c4801",
-    "2 0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 0x21 0x03363d90d447b00c9c99ceac05b6262ee053441c7e55552ffe526bad8f83ff4640 2 CHECKMULTISIG NOT",
-    "",
-    "EVAL_FALSE",
-    "BIP66 example 8, without DERSIG"
-],
-[
-    "0 0x47 0x30440220b119d67d389315308d1745f734a51ff3ec72e06081e84e236fdf9dc2f5d2a64802204b04e3bc38674c4422ea317231d642b56dc09d214a1ecbbf16ecca01ed996e2201 0x47 0x3044022079ea80afd538d9ada421b5101febeb6bc874e01dde5bca108c1d0479aec339a4022004576db8f66130d1df686ccf00935703689d69cf539438da1edab208b0d63c4801",
-    "2 0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 0x21 0x03363d90d447b00c9c99ceac05b6262ee053441c7e55552ffe526bad8f83ff4640 2 CHECKMULTISIG NOT",
-    "DERSIG",
-    "SIG_DER",
-    "BIP66 example 8, with DERSIG"
-],
-[
-    "0 0 0x47 0x3044022081aa9d436f2154e8b6d600516db03d78de71df685b585a9807ead4210bd883490220534bb6bdf318a419ac0749660b60e78d17d515558ef369bf872eff405b676b2e01",
-    "2 0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 0x21 0x03363d90d447b00c9c99ceac05b6262ee053441c7e55552ffe526bad8f83ff4640 2 CHECKMULTISIG",
-    "",
-    "EVAL_FALSE",
-    "BIP66 example 9, without DERSIG"
-],
-[
-    "0 0 0x47 0x3044022081aa9d436f2154e8b6d600516db03d78de71df685b585a9807ead4210bd883490220534bb6bdf318a419ac0749660b60e78d17d515558ef369bf872eff405b676b2e01",
-    "2 0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 0x21 0x03363d90d447b00c9c99ceac05b6262ee053441c7e55552ffe526bad8f83ff4640 2 CHECKMULTISIG",
-    "DERSIG",
-    "SIG_DER",
-    "BIP66 example 9, with DERSIG"
-],
-[
-    "0 0 0x47 0x30440220da6f441dc3b4b2c84cfa8db0cd5b34ed92c9e01686de5a800d40498b70c0dcac02207c2cf91b0c32b860c4cd4994be36cfb84caf8bb7c3a8e4d96a31b2022c5299c501",
-    "2 0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 0x21 0x03363d90d447b00c9c99ceac05b6262ee053441c7e55552ffe526bad8f83ff4640 2 CHECKMULTISIG NOT",
-    "DERSIG",
-    "SIG_DER",
-    "BIP66 example 10, with DERSIG"
-],
-[
-    "0 0x47 0x30440220cae00b1444babfbf6071b0ba8707f6bd373da3df494d6e74119b0430c5db810502205d5231b8c5939c8ff0c82242656d6e06edb073d42af336c99fe8837c36ea39d501 0",
-    "2 0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 0x21 0x03363d90d447b00c9c99ceac05b6262ee053441c7e55552ffe526bad8f83ff4640 2 CHECKMULTISIG",
-    "",
-    "EVAL_FALSE",
-    "BIP66 example 11, without DERSIG"
-],
-[
-    "0 0x47 0x30440220cae00b1444babfbf6071b0ba8707f6bd373da3df494d6e74119b0430c5db810502205d5231b8c5939c8ff0c82242656d6e06edb073d42af336c99fe8837c36ea39d501 0",
-    "2 0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 0x21 0x03363d90d447b00c9c99ceac05b6262ee053441c7e55552ffe526bad8f83ff4640 2 CHECKMULTISIG",
-    "DERSIG",
-    "EVAL_FALSE",
-    "BIP66 example 11, with DERSIG"
-],
-[
-    "0x48 0x304402203e4516da7253cf068effec6b95c41221c0cf3a8e6ccb8cbf1725b562e9afde2c022054e1c258c2981cdfba5df1f46661fb6541c44f77ca0092f3600331abfffb12510101",
-    "0x21 0x03363d90d447b00c9c99ceac05b6262ee053441c7e55552ffe526bad8f83ff4640 CHECKSIG",
-    "DERSIG",
-    "SIG_DER",
-    "P2PK with multi-byte hashtype, with DERSIG"
-],
-[
-    "0x48 0x304502203e4516da7253cf068effec6b95c41221c0cf3a8e6ccb8cbf1725b562e9afde2c022100ab1e3da73d67e32045a20e0b999e049978ea8d6ee5480d485fcf2ce0d03b2ef001",
-    "0x21 0x03363d90d447b00c9c99ceac05b6262ee053441c7e55552ffe526bad8f83ff4640 CHECKSIG",
-    "LOW_S",
-    "SIG_HIGH_S",
-    "P2PK with high S"
-],
-[
-    "0x47 0x3044022057292e2d4dfe775becdd0a9e6547997c728cdf35390f6a017da56d654d374e4902206b643be2fc53763b4e284845bfea2c597d2dc7759941dce937636c9d341b71ed01",
-    "0x41 0x0679be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8 CHECKSIG",
-    "STRICTENC",
-    "PUBKEYTYPE",
-    "P2PK with hybrid pubkey"
-],
-[
-    "0x47 0x30440220035d554e3153c14950c9993f41c496607a8e24093db0595be7bf875cf64fcf1f02204731c8c4e5daf15e706cec19cdd8f2c5b1d05490e11dab8465ed426569b6e92101",
-    "0x41 0x0679be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8 CHECKSIG NOT",
-    "",
-    "EVAL_FALSE",
-    "P2PK NOT with hybrid pubkey but no STRICTENC"
-],
-[
-    "0x47 0x30440220035d554e3153c14950c9993f41c496607a8e24093db0595be7bf875cf64fcf1f02204731c8c4e5daf15e706cec19cdd8f2c5b1d05490e11dab8465ed426569b6e92101",
-    "0x41 0x0679be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8 CHECKSIG NOT",
-    "STRICTENC",
-    "PUBKEYTYPE",
-    "P2PK NOT with hybrid pubkey"
-],
-[
-    "0x47 0x30440220035d554e3153c04950c9993f41c496607a8e24093db0595be7bf875cf64fcf1f02204731c8c4e5daf15e706cec19cdd8f2c5b1d05490e11dab8465ed426569b6e92101",
-    "0x41 0x0679be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8 CHECKSIG NOT",
-    "STRICTENC",
-    "PUBKEYTYPE",
-    "P2PK NOT with invalid hybrid pubkey"
-],
-[
-    "0 0x47 0x3044022079c7824d6c868e0e1a273484e28c2654a27d043c8a27f49f52cb72efed0759090220452bbbf7089574fa082095a4fc1b3a16bafcf97a3a34d745fafc922cce66b27201",
-    "1 0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 0x41 0x0679be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8 2 CHECKMULTISIG",
-    "STRICTENC",
-    "PUBKEYTYPE",
-    "1-of-2 with the first 1 hybrid pubkey"
-],
-[
-    "0x47 0x304402206177d513ec2cda444c021a1f4f656fc4c72ba108ae063e157eb86dc3575784940220666fc66702815d0e5413bb9b1df22aed44f5f1efb8b99d41dd5dc9a5be6d205205",
-    "0x41 0x048282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f5150811f8a8098557dfe45e8256e830b60ace62d613ac2f7b17bed31b6eaff6e26caf CHECKSIG",
-    "STRICTENC",
-    "SIG_HASHTYPE",
-    "P2PK with undefined hashtype"
-],
-[
-    "0x47 0x304402207409b5b320296e5e2136a7b281a7f803028ca4ca44e2b83eebd46932677725de02202d4eea1c8d3c98e6f42614f54764e6e5e6542e213eb4d079737e9a8b6e9812ec05",
-    "0x41 0x048282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f5150811f8a8098557dfe45e8256e830b60ace62d613ac2f7b17bed31b6eaff6e26caf CHECKSIG NOT",
-    "STRICTENC",
-    "SIG_HASHTYPE",
-    "P2PK NOT with invalid sig and undefined hashtype"
-],
-[
-    "1 0x47 0x3044022051254b9fb476a52d85530792b578f86fea70ec1ffb4393e661bcccb23d8d63d3022076505f94a403c86097841944e044c70c2045ce90e36de51f7e9d3828db98a07501 0x47 0x304402200a358f750934b3feb822f1966bfcd8bbec9eeaa3a8ca941e11ee5960e181fa01022050bf6b5a8e7750f70354ae041cb68a7bade67ec6c3ab19eb359638974410626e01 0x47 0x304402200955d031fff71d8653221e85e36c3c85533d2312fc3045314b19650b7ae2f81002202a6bb8505e36201909d0921f01abff390ae6b7ff97bbf959f98aedeb0a56730901",
-    "3 0x21 0x0279be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798 0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 0x21 0x03363d90d447b00c9c99ceac05b6262ee053441c7e55552ffe526bad8f83ff4640 3 CHECKMULTISIG",
-    "NULLDUMMY",
-    "SIG_NULLDUMMY",
-    "3-of-3 with nonzero dummy"
-],
-[
-    "1 0x47 0x304402201bb2edab700a5d020236df174fefed78087697143731f659bea59642c759c16d022061f42cdbae5bcd3e8790f20bf76687443436e94a634321c16a72aa54cbc7c2ea01 0x47 0x304402204bb4a64f2a6e5c7fb2f07fef85ee56fde5e6da234c6a984262307a20e99842d702206f8303aaba5e625d223897e2ffd3f88ef1bcffef55f38dc3768e5f2e94c923f901 0x47 0x3044022040c2809b71fffb155ec8b82fe7a27f666bd97f941207be4e14ade85a1249dd4d02204d56c85ec525dd18e29a0533d5ddf61b6b1bb32980c2f63edf951aebf7a27bfe01",
-    "3 0x21 0x0279be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798 0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 0x21 0x03363d90d447b00c9c99ceac05b6262ee053441c7e55552ffe526bad8f83ff4640 3 CHECKMULTISIG NOT",
-    "NULLDUMMY",
-    "SIG_NULLDUMMY",
-    "3-of-3 NOT with invalid sig with nonzero dummy"
-],
-[
-    "0 0x47 0x304402200abeb4bd07f84222f474aed558cfbdfc0b4e96cde3c2935ba7098b1ff0bd74c302204a04c1ca67b2a20abee210cf9a21023edccbbf8024b988812634233115c6b73901 DUP",
-    "2 0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 2 CHECKMULTISIG",
-    "SIGPUSHONLY",
-    "SIG_PUSHONLY",
-    "2-of-2 with two identical keys and sigs pushed using OP_DUP"
-],
-[
-    "0x47 0x3044022018a2a81a93add5cb5f5da76305718e4ea66045ec4888b28d84cb22fae7f4645b02201e6daa5ed5d2e4b2b2027cf7ffd43d8d9844dd49f74ef86899ec8e669dfd39aa01 NOP8 0x23 0x2103363d90d447b00c9c99ceac05b6262ee053441c7e55552ffe526bad8f83ff4640ac",
-    "HASH160 0x14 0x215640c2f72f0d16b4eced26762035a42ffed39a EQUAL",
-    "P2SH",
-    "SIG_PUSHONLY",
-    "P2SH(P2PK) with non-push scriptSig but no SIGPUSHONLY"
-],
-[
-    "0x47 0x3044022018a2a81a93add5cb5f5da76305718e4ea66045ec4888b28d84cb22fae7f4645b02201e6daa5ed5d2e4b2b2027cf7ffd43d8d9844dd49f74ef86899ec8e669dfd39aa01 NOP8 0x23 0x2103363d90d447b00c9c99ceac05b6262ee053441c7e55552ffe526bad8f83ff4640ac",
-    "HASH160 0x14 0x215640c2f72f0d16b4eced26762035a42ffed39a EQUAL",
-    "SIGPUSHONLY",
-    "SIG_PUSHONLY",
-    "P2SH(P2PK) with non-push scriptSig but not P2SH"
-],
-[
-    "11 0x47 0x304402200a5c6163f07b8d3b013c4d1d6dba25e780b39658d79ba37af7057a3b7f15ffa102201fd9b4eaa9943f734928b99a83592c2e7bf342ea2680f6a2bb705167966b742001",
-    "0x41 0x0479be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8 CHECKSIG",
-    "CLEANSTACK,P2SH",
-    "CLEANSTACK",
-    "P2PK with unnecessary input"
-],
-[
-    "11 0x47 0x304402202f7505132be14872581f35d74b759212d9da40482653f1ffa3116c3294a4a51702206adbf347a2240ca41c66522b1a22a41693610b76a8e7770645dc721d1635854f01 0x43 0x410479be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8ac",
-    "HASH160 0x14 0x31edc23bdafda4639e669f89ad6b2318dd79d032 EQUAL",
-    "CLEANSTACK,P2SH",
-    "CLEANSTACK",
-    "P2SH with unnecessary input"
-],
-
-["The End"]
-]
diff --git a/src/test/data/script_valid.json b/src/test/data/script_tests.json
similarity index 54%
rename from src/test/data/script_valid.json
rename to src/test/data/script_tests.json
index 4e86ee78ba604..e69cc9e41371e 100644
--- a/src/test/data/script_valid.json
+++ b/src/test/data/script_tests.json
@@ -701,6 +701,556 @@
 ["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"],
 
+["", "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 NOP3 NOP4 NOP5 NOP6 NOP7 NOP8 NOP9 NOP10 2 EQUAL", "P2SH,STRICTENC", "EVAL_FALSE"],
+["'NOP_1_to_10' NOP1 CHECKLOCKTIMEVERIFY NOP3 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", "NOP3",  "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 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",
+"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"],
+
+["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"],
+
+
+["Order of CHECKMULTISIG evaluation tests, inverted by swapping the order of"],
+["pubkeys/signatures so they fail due to the STRICTENC rules on validly encoded"],
+["signatures and pubkeys."],
+[
+    "0 0x47 0x3044022044dc17b0887c161bb67ba9635bf758735bdde503e4b0a0987f587f14a4e1143d022009a215772d49a85dae40d8ca03955af26ad3978a0ff965faa12915e9586249a501 0x47 0x3044022044dc17b0887c161bb67ba9635bf758735bdde503e4b0a0987f587f14a4e1143d022009a215772d49a85dae40d8ca03955af26ad3978a0ff965faa12915e9586249a501",
+    "2 0x21 0x02865c40293a680cb9c020e7b1e106d8c1916d3cef99aa431a56d253e69256dac0 0 2 CHECKMULTISIG NOT",
+    "STRICTENC",
+    "PUBKEYTYPE",
+    "2-of-2 CHECKMULTISIG NOT with the first pubkey invalid, and both signatures validly encoded."
+],
+[
+    "0 0x47 0x3044022044dc17b0887c161bb67ba9635bf758735bdde503e4b0a0987f587f14a4e1143d022009a215772d49a85dae40d8ca03955af26ad3978a0ff965faa12915e9586249a501 1",
+    "2 0x21 0x02865c40293a680cb9c020e7b1e106d8c1916d3cef99aa431a56d253e69256dac0 0x21 0x02865c40293a680cb9c020e7b1e106d8c1916d3cef99aa431a56d253e69256dac0 2 CHECKMULTISIG NOT",
+    "STRICTENC",
+    "SIG_DER",
+    "2-of-2 CHECKMULTISIG NOT with both pubkeys valid, but first signature invalid."
+],
+[
+    "0 0x47 0x304402205451ce65ad844dbb978b8bdedf5082e33b43cae8279c30f2c74d9e9ee49a94f802203fe95a7ccf74da7a232ee523ef4a53cb4d14bdd16289680cdb97a63819b8f42f01 0x46 0x304402205451ce65ad844dbb978b8bdedf5082e33b43cae8279c30f2c74d9e9ee49a94f802203fe95a7ccf74da7a232ee523ef4a53cb4d14bdd16289680cdb97a63819b8f42f",
+    "2 0x21 0x02a673638cb9587cb68ea08dbef685c6f2d2a751a8b3c6f2a7e9a4999e6e4bfaf5 0x21 0x02a673638cb9587cb68ea08dbef685c6f2d2a751a8b3c6f2a7e9a4999e6e4bfaf5 0x21 0x02a673638cb9587cb68ea08dbef685c6f2d2a751a8b3c6f2a7e9a4999e6e4bfaf5 3 CHECKMULTISIG",
+    "P2SH,STRICTENC",
+    "SIG_DER",
+    "2-of-3 with one valid and one invalid signature due to parse error, nSigs > validSigs"
+],
+
+["Increase DERSIG test coverage"],
+["0x4a 0x0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", "0 CHECKSIG NOT", "DERSIG", "SIG_DER", "Overly long signature is incorrectly encoded for DERSIG"],
+["0x25 0x30220220000000000000000000000000000000000000000000000000000000000000000000", "0 CHECKSIG NOT", "DERSIG", "SIG_DER", "Missing S is incorrectly encoded for DERSIG"],
+["0x27 0x3024021077777777777777777777777777777777020a7777777777777777777777777777777701", "0 CHECKSIG NOT", "DERSIG", "SIG_DER", "S with invalid S length is incorrectly encoded for DERSIG"],
+["0x27 0x302403107777777777777777777777777777777702107777777777777777777777777777777701", "0 CHECKSIG NOT", "DERSIG", "SIG_DER", "Non-integer R is incorrectly encoded for DERSIG"],
+["0x27 0x302402107777777777777777777777777777777703107777777777777777777777777777777701", "0 CHECKSIG NOT", "DERSIG", "SIG_DER", "Non-integer S is incorrectly encoded for DERSIG"],
+["0x17 0x3014020002107777777777777777777777777777777701", "0 CHECKSIG NOT", "DERSIG", "SIG_DER", "Zero-length R is incorrectly encoded for DERSIG"],
+["0x17 0x3014021077777777777777777777777777777777020001", "0 CHECKSIG NOT", "DERSIG", "SIG_DER", "Zero-length S is incorrectly encoded for DERSIG"],
+["0x27 0x302402107777777777777777777777777777777702108777777777777777777777777777777701", "0 CHECKSIG NOT", "DERSIG", "SIG_DER", "Negative S is incorrectly encoded for DERSIG"],
+
 ["Automatically generated test cases"],
 [
     "0x47 0x304402200a5c6163f07b8d3b013c4d1d6dba25e780b39658d79ba37af7057a3b7f15ffa102201fd9b4eaa9943f734928b99a83592c2e7bf342ea2680f6a2bb705167966b742001",
@@ -709,6 +1259,13 @@
     "OK",
     "P2PK"
 ],
+[
+    "0x47 0x304402200a5c6163f07b8c3b013c4d1d6dba25e780b39658d79ba37af7057a3b7f15ffa102201fd9b4eaa9943f734928b99a83592c2e7bf342ea2680f6a2bb705167966b742001",
+    "0x41 0x0479be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8 CHECKSIG",
+    "",
+    "EVAL_FALSE",
+    "P2PK, bad sig"
+],
 [
     "0x47 0x304402206e05a6fe23c59196ffe176c9ddc31e73a9885638f9d1328d47c0c703863b8876022076feb53811aa5b04e0e79f938eb19906cc5e67548bc555a8e8b8b0fc603d840c01 0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508",
     "DUP HASH160 0x14 0x1018853670f9f3b0582c5b9ee8ce93764ac32b93 EQUALVERIFY CHECKSIG",
@@ -716,6 +1273,13 @@
     "OK",
     "P2PKH"
 ],
+[
+    "0x47 0x3044022034bb0494b50b8ef130e2185bb220265b9284ef5b4b8a8da4d8415df489c83b5102206259a26d9cc0a125ac26af6153b17c02956855ebe1467412f066e402f5f05d1201 0x21 0x03363d90d446b00c9c99ceac05b6262ee053441c7e55552ffe526bad8f83ff4640",
+    "DUP HASH160 0x14 0xc0834c0c158f53be706d234c38fd52de7eece656 EQUALVERIFY CHECKSIG",
+    "",
+    "EQUALVERIFY",
+    "P2PKH, bad pubkey"
+],
 [
     "0x47 0x304402204710a85181663b32d25c70ec2bbd14adff5ddfff6cb50d09e155ef5f541fc86c0220056b0cc949be9386ecc5f6c2ac0493269031dbb185781db90171b54ac127790281",
     "0x41 0x048282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f5150811f8a8098557dfe45e8256e830b60ace62d613ac2f7b17bed31b6eaff6e26caf CHECKSIG",
@@ -723,6 +1287,13 @@
     "OK",
     "P2PK anyonecanpay"
 ],
+[
+    "0x47 0x304402204710a85181663b32d25c70ec2bbd14adff5ddfff6cb50d09e155ef5f541fc86c0220056b0cc949be9386ecc5f6c2ac0493269031dbb185781db90171b54ac127790201",
+    "0x41 0x048282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f5150811f8a8098557dfe45e8256e830b60ace62d613ac2f7b17bed31b6eaff6e26caf CHECKSIG",
+    "",
+    "EVAL_FALSE",
+    "P2PK anyonecanpay marked with normal hashtype"
+],
 [
     "0x47 0x3044022003fef42ed6c7be8917441218f525a60e2431be978e28b7aca4d7a532cc413ae8022067a1f82c74e8d69291b90d148778405c6257bbcfc2353cc38a3e1f22bf44254601 0x23 0x210279be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798ac",
     "HASH160 0x14 0x23b0ad3477f2178bc0b3eed26e4e6316f4e83aa1 EQUAL",
@@ -730,6 +1301,13 @@
     "OK",
     "P2SH(P2PK)"
 ],
+[
+    "0x47 0x3044022003fef42ed6c7be8917441218f525a60e2431be978e28b7aca4d7a532cc413ae8022067a1f82c74e8d69291b90d148778405c6257bbcfc2353cc38a3e1f22bf44254601 0x23 0x210279be667ef9dcbbac54a06295ce870b07029bfcdb2dce28d959f2815b16f81798ac",
+    "HASH160 0x14 0x23b0ad3477f2178bc0b3eed26e4e6316f4e83aa1 EQUAL",
+    "P2SH",
+    "EVAL_FALSE",
+    "P2SH(P2PK), bad redeemscript"
+],
 [
     "0x47 0x304402204e2eb034be7b089534ac9e798cf6a2c79f38bcb34d1b179efd6f2de0841735db022071461beb056b5a7be1819da6a3e3ce3662831ecc298419ca101eb6887b5dd6a401 0x19 0x76a9147cf9c846cd4882efec4bf07e44ebdad495c94f4b88ac",
     "HASH160 0x14 0x2df519943d5acc0ef5222091f9dfe3543f489a82 EQUAL",
@@ -737,6 +1315,13 @@
     "OK",
     "P2SH(P2PKH), bad sig but no VERIFY_P2SH"
 ],
+[
+    "0x47 0x304402204e2eb034be7b089534ac9e798cf6a2c79f38bcb34d1b179efd6f2de0841735db022071461beb056b5a7be1819da6a3e3ce3662831ecc298419ca101eb6887b5dd6a401 0x19 0x76a9147cf9c846cd4882efec4bf07e44ebdad495c94f4b88ac",
+    "HASH160 0x14 0x2df519943d5acc0ef5222091f9dfe3543f489a82 EQUAL",
+    "P2SH",
+    "EQUALVERIFY",
+    "P2SH(P2PKH), bad sig"
+],
 [
     "0 0x47 0x3044022051254b9fb476a52d85530792b578f86fea70ec1ffb4393e661bcccb23d8d63d3022076505f94a403c86097841944e044c70c2045ce90e36de51f7e9d3828db98a07501 0x47 0x304402200a358f750934b3feb822f1966bfcd8bbec9eeaa3a8ca941e11ee5960e181fa01022050bf6b5a8e7750f70354ae041cb68a7bade67ec6c3ab19eb359638974410626e01 0x47 0x304402200955d031fff71d8653221e85e36c3c85533d2312fc3045314b19650b7ae2f81002202a6bb8505e36201909d0921f01abff390ae6b7ff97bbf959f98aedeb0a56730901",
     "3 0x21 0x0279be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798 0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 0x21 0x03363d90d447b00c9c99ceac05b6262ee053441c7e55552ffe526bad8f83ff4640 3 CHECKMULTISIG",
@@ -744,6 +1329,13 @@
     "OK",
     "3-of-3"
 ],
+[
+    "0 0x47 0x3044022051254b9fb476a52d85530792b578f86fea70ec1ffb4393e661bcccb23d8d63d3022076505f94a403c86097841944e044c70c2045ce90e36de51f7e9d3828db98a07501 0x47 0x304402200a358f750934b3feb822f1966bfcd8bbec9eeaa3a8ca941e11ee5960e181fa01022050bf6b5a8e7750f70354ae041cb68a7bade67ec6c3ab19eb359638974410626e01 0",
+    "3 0x21 0x0279be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798 0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 0x21 0x03363d90d447b00c9c99ceac05b6262ee053441c7e55552ffe526bad8f83ff4640 3 CHECKMULTISIG",
+    "",
+    "EVAL_FALSE",
+    "3-of-3, 2 sigs"
+],
 [
     "0 0x47 0x304402205b7d2c2f177ae76cfbbf14d589c113b0b35db753d305d5562dd0b61cbf366cfb02202e56f93c4f08a27f986cd424ffc48a462c3202c4902104d4d0ff98ed28f4bf8001 0x47 0x30440220563e5b3b1fc11662a84bc5ea2a32cc3819703254060ba30d639a1aaf2d5068ad0220601c1f47ddc76d93284dd9ed68f7c9974c4a0ea7cbe8a247d6bc3878567a5fca01 0x4c69 0x52210279be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f8179821038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f515082103363d90d447b00c9c99ceac05b6262ee053441c7e55552ffe526bad8f83ff464053ae",
     "HASH160 0x14 0xc9e4a896d149702d0d1695434feddd52e24ad78d EQUAL",
@@ -751,6 +1343,13 @@
     "OK",
     "P2SH(2-of-3)"
 ],
+[
+    "0 0x47 0x304402205b7d2c2f177ae76cfbbf14d589c113b0b35db753d305d5562dd0b61cbf366cfb02202e56f93c4f08a27f986cd424ffc48a462c3202c4902104d4d0ff98ed28f4bf8001 0 0x4c69 0x52210279be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f8179821038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f515082103363d90d447b00c9c99ceac05b6262ee053441c7e55552ffe526bad8f83ff464053ae",
+    "HASH160 0x14 0xc9e4a896d149702d0d1695434feddd52e24ad78d EQUAL",
+    "P2SH",
+    "EVAL_FALSE",
+    "P2SH(2-of-3), 1 sig"
+],
 [
     "0x47 0x304402200060558477337b9022e70534f1fea71a318caf836812465a2509931c5e7c4987022078ec32bd50ac9e03a349ba953dfd9fe1c8d2dd8bdb1d38ddca844d3d5c78c11801",
     "0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 CHECKSIG",
@@ -758,6 +1357,13 @@
     "OK",
     "P2PK with too much R padding but no DERSIG"
 ],
+[
+    "0x47 0x304402200060558477337b9022e70534f1fea71a318caf836812465a2509931c5e7c4987022078ec32bd50ac9e03a349ba953dfd9fe1c8d2dd8bdb1d38ddca844d3d5c78c11801",
+    "0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 CHECKSIG",
+    "DERSIG",
+    "SIG_DER",
+    "P2PK with too much R padding"
+],
 [
     "0x48 0x304502202de8c03fc525285c9c535631019a5f2af7c6454fa9eb392a3756a4917c420edd02210046130bf2baf7cfc065067c8b9e33a066d9c15edcea9feb0ca2d233e3597925b401",
     "0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 CHECKSIG",
@@ -765,6 +1371,13 @@
     "OK",
     "P2PK with too much S padding but no DERSIG"
 ],
+[
+    "0x48 0x304502202de8c03fc525285c9c535631019a5f2af7c6454fa9eb392a3756a4917c420edd02210046130bf2baf7cfc065067c8b9e33a066d9c15edcea9feb0ca2d233e3597925b401",
+    "0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 CHECKSIG",
+    "DERSIG",
+    "SIG_DER",
+    "P2PK with too much S padding"
+],
 [
     "0x47 0x30440220d7a0417c3f6d1a15094d1cf2a3378ca0503eb8a57630953a9e2987e21ddd0a6502207a6266d686c99090920249991d3d42065b6d43eb70187b219c0db82e4f94d1a201",
     "0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 CHECKSIG",
@@ -772,6 +1385,13 @@
     "OK",
     "P2PK with too little R padding but no DERSIG"
 ],
+[
+    "0x47 0x30440220d7a0417c3f6d1a15094d1cf2a3378ca0503eb8a57630953a9e2987e21ddd0a6502207a6266d686c99090920249991d3d42065b6d43eb70187b219c0db82e4f94d1a201",
+    "0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 CHECKSIG",
+    "DERSIG",
+    "SIG_DER",
+    "P2PK with too little R padding"
+],
 [
     "0x47 0x30440220005ece1335e7f757a1a1f476a7fb5bd90964e8a022489f890614a04acfb734c002206c12b8294a6513c7710e8c82d3c23d75cdbfe83200eb7efb495701958501a5d601",
     "0x21 0x03363d90d447b00c9c99ceac05b6262ee053441c7e55552ffe526bad8f83ff4640 CHECKSIG NOT",
@@ -779,6 +1399,27 @@
     "OK",
     "P2PK NOT with bad sig with too much R padding but no DERSIG"
 ],
+[
+    "0x47 0x30440220005ece1335e7f757a1a1f476a7fb5bd90964e8a022489f890614a04acfb734c002206c12b8294a6513c7710e8c82d3c23d75cdbfe83200eb7efb495701958501a5d601",
+    "0x21 0x03363d90d447b00c9c99ceac05b6262ee053441c7e55552ffe526bad8f83ff4640 CHECKSIG NOT",
+    "DERSIG",
+    "SIG_DER",
+    "P2PK NOT with bad sig with too much R padding"
+],
+[
+    "0x47 0x30440220005ece1335e7f657a1a1f476a7fb5bd90964e8a022489f890614a04acfb734c002206c12b8294a6513c7710e8c82d3c23d75cdbfe83200eb7efb495701958501a5d601",
+    "0x21 0x03363d90d447b00c9c99ceac05b6262ee053441c7e55552ffe526bad8f83ff4640 CHECKSIG NOT",
+    "",
+    "EVAL_FALSE",
+    "P2PK NOT with too much R padding but no DERSIG"
+],
+[
+    "0x47 0x30440220005ece1335e7f657a1a1f476a7fb5bd90964e8a022489f890614a04acfb734c002206c12b8294a6513c7710e8c82d3c23d75cdbfe83200eb7efb495701958501a5d601",
+    "0x21 0x03363d90d447b00c9c99ceac05b6262ee053441c7e55552ffe526bad8f83ff4640 CHECKSIG NOT",
+    "DERSIG",
+    "SIG_DER",
+    "P2PK NOT with too much R padding"
+],
 [
     "0x47 0x30440220d7a0417c3f6d1a15094d1cf2a3378ca0503eb8a57630953a9e2987e21ddd0a6502207a6266d686c99090920249991d3d42065b6d43eb70187b219c0db82e4f94d1a201",
     "0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 CHECKSIG",
@@ -786,6 +1427,41 @@
     "OK",
     "BIP66 example 1, without DERSIG"
 ],
+[
+    "0x47 0x30440220d7a0417c3f6d1a15094d1cf2a3378ca0503eb8a57630953a9e2987e21ddd0a6502207a6266d686c99090920249991d3d42065b6d43eb70187b219c0db82e4f94d1a201",
+    "0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 CHECKSIG",
+    "DERSIG",
+    "SIG_DER",
+    "BIP66 example 1, with DERSIG"
+],
+[
+    "0x47 0x304402208e43c0b91f7c1e5bc58e41c8185f8a6086e111b0090187968a86f2822462d3c902200a58f4076b1133b18ff1dc83ee51676e44c60cc608d9534e0df5ace0424fc0be01",
+    "0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 CHECKSIG NOT",
+    "",
+    "EVAL_FALSE",
+    "BIP66 example 2, without DERSIG"
+],
+[
+    "0x47 0x304402208e43c0b91f7c1e5bc58e41c8185f8a6086e111b0090187968a86f2822462d3c902200a58f4076b1133b18ff1dc83ee51676e44c60cc608d9534e0df5ace0424fc0be01",
+    "0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 CHECKSIG NOT",
+    "DERSIG",
+    "SIG_DER",
+    "BIP66 example 2, with DERSIG"
+],
+[
+    "0",
+    "0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 CHECKSIG",
+    "",
+    "EVAL_FALSE",
+    "BIP66 example 3, without DERSIG"
+],
+[
+    "0",
+    "0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 CHECKSIG",
+    "DERSIG",
+    "EVAL_FALSE",
+    "BIP66 example 3, with DERSIG"
+],
 [
     "0",
     "0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 CHECKSIG NOT",
@@ -800,6 +1476,20 @@
     "OK",
     "BIP66 example 4, with DERSIG"
 ],
+[
+    "1",
+    "0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 CHECKSIG",
+    "",
+    "EVAL_FALSE",
+    "BIP66 example 5, without DERSIG"
+],
+[
+    "1",
+    "0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 CHECKSIG",
+    "DERSIG",
+    "SIG_DER",
+    "BIP66 example 5, with DERSIG"
+],
 [
     "1",
     "0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 CHECKSIG NOT",
@@ -807,6 +1497,13 @@
     "OK",
     "BIP66 example 6, without DERSIG"
 ],
+[
+    "1",
+    "0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 CHECKSIG NOT",
+    "DERSIG",
+    "SIG_DER",
+    "BIP66 example 6, with DERSIG"
+],
 [
     "0 0x47 0x30440220cae00b1444babfbf6071b0ba8707f6bd373da3df494d6e74119b0430c5db810502205d5231b8c5939c8ff0c82242656d6e06edb073d42af336c99fe8837c36ea39d501 0x47 0x3044022027c2714269ca5aeecc4d70edc88ba5ee0e3da4986e9216028f489ab4f1b8efce022022bd545b4951215267e4c5ceabd4c5350331b2e4a0b6494c56f361fa5a57a1a201",
     "2 0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 0x21 0x03363d90d447b00c9c99ceac05b6262ee053441c7e55552ffe526bad8f83ff4640 2 CHECKMULTISIG",
@@ -814,6 +1511,41 @@
     "OK",
     "BIP66 example 7, without DERSIG"
 ],
+[
+    "0 0x47 0x30440220cae00b1444babfbf6071b0ba8707f6bd373da3df494d6e74119b0430c5db810502205d5231b8c5939c8ff0c82242656d6e06edb073d42af336c99fe8837c36ea39d501 0x47 0x3044022027c2714269ca5aeecc4d70edc88ba5ee0e3da4986e9216028f489ab4f1b8efce022022bd545b4951215267e4c5ceabd4c5350331b2e4a0b6494c56f361fa5a57a1a201",
+    "2 0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 0x21 0x03363d90d447b00c9c99ceac05b6262ee053441c7e55552ffe526bad8f83ff4640 2 CHECKMULTISIG",
+    "DERSIG",
+    "SIG_DER",
+    "BIP66 example 7, with DERSIG"
+],
+[
+    "0 0x47 0x30440220b119d67d389315308d1745f734a51ff3ec72e06081e84e236fdf9dc2f5d2a64802204b04e3bc38674c4422ea317231d642b56dc09d214a1ecbbf16ecca01ed996e2201 0x47 0x3044022079ea80afd538d9ada421b5101febeb6bc874e01dde5bca108c1d0479aec339a4022004576db8f66130d1df686ccf00935703689d69cf539438da1edab208b0d63c4801",
+    "2 0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 0x21 0x03363d90d447b00c9c99ceac05b6262ee053441c7e55552ffe526bad8f83ff4640 2 CHECKMULTISIG NOT",
+    "",
+    "EVAL_FALSE",
+    "BIP66 example 8, without DERSIG"
+],
+[
+    "0 0x47 0x30440220b119d67d389315308d1745f734a51ff3ec72e06081e84e236fdf9dc2f5d2a64802204b04e3bc38674c4422ea317231d642b56dc09d214a1ecbbf16ecca01ed996e2201 0x47 0x3044022079ea80afd538d9ada421b5101febeb6bc874e01dde5bca108c1d0479aec339a4022004576db8f66130d1df686ccf00935703689d69cf539438da1edab208b0d63c4801",
+    "2 0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 0x21 0x03363d90d447b00c9c99ceac05b6262ee053441c7e55552ffe526bad8f83ff4640 2 CHECKMULTISIG NOT",
+    "DERSIG",
+    "SIG_DER",
+    "BIP66 example 8, with DERSIG"
+],
+[
+    "0 0 0x47 0x3044022081aa9d436f2154e8b6d600516db03d78de71df685b585a9807ead4210bd883490220534bb6bdf318a419ac0749660b60e78d17d515558ef369bf872eff405b676b2e01",
+    "2 0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 0x21 0x03363d90d447b00c9c99ceac05b6262ee053441c7e55552ffe526bad8f83ff4640 2 CHECKMULTISIG",
+    "",
+    "EVAL_FALSE",
+    "BIP66 example 9, without DERSIG"
+],
+[
+    "0 0 0x47 0x3044022081aa9d436f2154e8b6d600516db03d78de71df685b585a9807ead4210bd883490220534bb6bdf318a419ac0749660b60e78d17d515558ef369bf872eff405b676b2e01",
+    "2 0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 0x21 0x03363d90d447b00c9c99ceac05b6262ee053441c7e55552ffe526bad8f83ff4640 2 CHECKMULTISIG",
+    "DERSIG",
+    "SIG_DER",
+    "BIP66 example 9, with DERSIG"
+],
 [
     "0 0 0x47 0x30440220da6f441dc3b4b2c84cfa8db0cd5b34ed92c9e01686de5a800d40498b70c0dcac02207c2cf91b0c32b860c4cd4994be36cfb84caf8bb7c3a8e4d96a31b2022c5299c501",
     "2 0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 0x21 0x03363d90d447b00c9c99ceac05b6262ee053441c7e55552ffe526bad8f83ff4640 2 CHECKMULTISIG NOT",
@@ -821,6 +1553,27 @@
     "OK",
     "BIP66 example 10, without DERSIG"
 ],
+[
+    "0 0 0x47 0x30440220da6f441dc3b4b2c84cfa8db0cd5b34ed92c9e01686de5a800d40498b70c0dcac02207c2cf91b0c32b860c4cd4994be36cfb84caf8bb7c3a8e4d96a31b2022c5299c501",
+    "2 0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 0x21 0x03363d90d447b00c9c99ceac05b6262ee053441c7e55552ffe526bad8f83ff4640 2 CHECKMULTISIG NOT",
+    "DERSIG",
+    "SIG_DER",
+    "BIP66 example 10, with DERSIG"
+],
+[
+    "0 0x47 0x30440220cae00b1444babfbf6071b0ba8707f6bd373da3df494d6e74119b0430c5db810502205d5231b8c5939c8ff0c82242656d6e06edb073d42af336c99fe8837c36ea39d501 0",
+    "2 0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 0x21 0x03363d90d447b00c9c99ceac05b6262ee053441c7e55552ffe526bad8f83ff4640 2 CHECKMULTISIG",
+    "",
+    "EVAL_FALSE",
+    "BIP66 example 11, without DERSIG"
+],
+[
+    "0 0x47 0x30440220cae00b1444babfbf6071b0ba8707f6bd373da3df494d6e74119b0430c5db810502205d5231b8c5939c8ff0c82242656d6e06edb073d42af336c99fe8837c36ea39d501 0",
+    "2 0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 0x21 0x03363d90d447b00c9c99ceac05b6262ee053441c7e55552ffe526bad8f83ff4640 2 CHECKMULTISIG",
+    "DERSIG",
+    "EVAL_FALSE",
+    "BIP66 example 11, with DERSIG"
+],
 [
     "0 0x47 0x30440220b119d67d389315308d1745f734a51ff3ec72e06081e84e236fdf9dc2f5d2a64802204b04e3bc38674c4422ea317231d642b56dc09d214a1ecbbf16ecca01ed996e2201 0",
     "2 0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 0x21 0x03363d90d447b00c9c99ceac05b6262ee053441c7e55552ffe526bad8f83ff4640 2 CHECKMULTISIG NOT",
@@ -842,6 +1595,13 @@
     "OK",
     "P2PK with multi-byte hashtype, without DERSIG"
 ],
+[
+    "0x48 0x304402203e4516da7253cf068effec6b95c41221c0cf3a8e6ccb8cbf1725b562e9afde2c022054e1c258c2981cdfba5df1f46661fb6541c44f77ca0092f3600331abfffb12510101",
+    "0x21 0x03363d90d447b00c9c99ceac05b6262ee053441c7e55552ffe526bad8f83ff4640 CHECKSIG",
+    "DERSIG",
+    "SIG_DER",
+    "P2PK with multi-byte hashtype, with DERSIG"
+],
 [
     "0x48 0x304502203e4516da7253cf068effec6b95c41221c0cf3a8e6ccb8cbf1725b562e9afde2c022100ab1e3da73d67e32045a20e0b999e049978ea8d6ee5480d485fcf2ce0d03b2ef001",
     "0x21 0x03363d90d447b00c9c99ceac05b6262ee053441c7e55552ffe526bad8f83ff4640 CHECKSIG",
@@ -849,6 +1609,13 @@
     "OK",
     "P2PK with high S but no LOW_S"
 ],
+[
+    "0x48 0x304502203e4516da7253cf068effec6b95c41221c0cf3a8e6ccb8cbf1725b562e9afde2c022100ab1e3da73d67e32045a20e0b999e049978ea8d6ee5480d485fcf2ce0d03b2ef001",
+    "0x21 0x03363d90d447b00c9c99ceac05b6262ee053441c7e55552ffe526bad8f83ff4640 CHECKSIG",
+    "LOW_S",
+    "SIG_HIGH_S",
+    "P2PK with high S"
+],
 [
     "0x47 0x3044022057292e2d4dfe775becdd0a9e6547997c728cdf35390f6a017da56d654d374e4902206b643be2fc53763b4e284845bfea2c597d2dc7759941dce937636c9d341b71ed01",
     "0x41 0x0679be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8 CHECKSIG",
@@ -856,6 +1623,27 @@
     "OK",
     "P2PK with hybrid pubkey but no STRICTENC"
 ],
+[
+    "0x47 0x3044022057292e2d4dfe775becdd0a9e6547997c728cdf35390f6a017da56d654d374e4902206b643be2fc53763b4e284845bfea2c597d2dc7759941dce937636c9d341b71ed01",
+    "0x41 0x0679be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8 CHECKSIG",
+    "STRICTENC",
+    "PUBKEYTYPE",
+    "P2PK with hybrid pubkey"
+],
+[
+    "0x47 0x30440220035d554e3153c14950c9993f41c496607a8e24093db0595be7bf875cf64fcf1f02204731c8c4e5daf15e706cec19cdd8f2c5b1d05490e11dab8465ed426569b6e92101",
+    "0x41 0x0679be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8 CHECKSIG NOT",
+    "",
+    "EVAL_FALSE",
+    "P2PK NOT with hybrid pubkey but no STRICTENC"
+],
+[
+    "0x47 0x30440220035d554e3153c14950c9993f41c496607a8e24093db0595be7bf875cf64fcf1f02204731c8c4e5daf15e706cec19cdd8f2c5b1d05490e11dab8465ed426569b6e92101",
+    "0x41 0x0679be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8 CHECKSIG NOT",
+    "STRICTENC",
+    "PUBKEYTYPE",
+    "P2PK NOT with hybrid pubkey"
+],
 [
     "0x47 0x30440220035d554e3153c04950c9993f41c496607a8e24093db0595be7bf875cf64fcf1f02204731c8c4e5daf15e706cec19cdd8f2c5b1d05490e11dab8465ed426569b6e92101",
     "0x41 0x0679be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8 CHECKSIG NOT",
@@ -863,6 +1651,13 @@
     "OK",
     "P2PK NOT with invalid hybrid pubkey but no STRICTENC"
 ],
+[
+    "0x47 0x30440220035d554e3153c04950c9993f41c496607a8e24093db0595be7bf875cf64fcf1f02204731c8c4e5daf15e706cec19cdd8f2c5b1d05490e11dab8465ed426569b6e92101",
+    "0x41 0x0679be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8 CHECKSIG NOT",
+    "STRICTENC",
+    "PUBKEYTYPE",
+    "P2PK NOT with invalid hybrid pubkey"
+],
 [
     "0 0x47 0x304402202e79441ad1baf5a07fb86bae3753184f6717d9692680947ea8b6e8b777c69af1022079a262e13d868bb5a0964fefe3ba26942e1b0669af1afb55ef3344bc9d4fc4c401",
     "1 0x41 0x0679be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8 0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 2 CHECKMULTISIG",
@@ -877,6 +1672,13 @@
     "OK",
     "1-of-2 with the second 1 hybrid pubkey"
 ],
+[
+    "0 0x47 0x3044022079c7824d6c868e0e1a273484e28c2654a27d043c8a27f49f52cb72efed0759090220452bbbf7089574fa082095a4fc1b3a16bafcf97a3a34d745fafc922cce66b27201",
+    "1 0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 0x41 0x0679be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8 2 CHECKMULTISIG",
+    "STRICTENC",
+    "PUBKEYTYPE",
+    "1-of-2 with the first 1 hybrid pubkey"
+],
 [
     "0x47 0x304402206177d513ec2cda444c021a1f4f656fc4c72ba108ae063e157eb86dc3575784940220666fc66702815d0e5413bb9b1df22aed44f5f1efb8b99d41dd5dc9a5be6d205205",
     "0x41 0x048282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f5150811f8a8098557dfe45e8256e830b60ace62d613ac2f7b17bed31b6eaff6e26caf CHECKSIG",
@@ -884,6 +1686,13 @@
     "OK",
     "P2PK with undefined hashtype but no STRICTENC"
 ],
+[
+    "0x47 0x304402206177d513ec2cda444c021a1f4f656fc4c72ba108ae063e157eb86dc3575784940220666fc66702815d0e5413bb9b1df22aed44f5f1efb8b99d41dd5dc9a5be6d205205",
+    "0x41 0x048282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f5150811f8a8098557dfe45e8256e830b60ace62d613ac2f7b17bed31b6eaff6e26caf CHECKSIG",
+    "STRICTENC",
+    "SIG_HASHTYPE",
+    "P2PK with undefined hashtype"
+],
 [
     "0x47 0x304402207409b5b320296e5e2136a7b281a7f803028ca4ca44e2b83eebd46932677725de02202d4eea1c8d3c98e6f42614f54764e6e5e6542e213eb4d079737e9a8b6e9812ec05",
     "0x41 0x048282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f5150811f8a8098557dfe45e8256e830b60ace62d613ac2f7b17bed31b6eaff6e26caf CHECKSIG NOT",
@@ -891,6 +1700,13 @@
     "OK",
     "P2PK NOT with invalid sig and undefined hashtype but no STRICTENC"
 ],
+[
+    "0x47 0x304402207409b5b320296e5e2136a7b281a7f803028ca4ca44e2b83eebd46932677725de02202d4eea1c8d3c98e6f42614f54764e6e5e6542e213eb4d079737e9a8b6e9812ec05",
+    "0x41 0x048282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f5150811f8a8098557dfe45e8256e830b60ace62d613ac2f7b17bed31b6eaff6e26caf CHECKSIG NOT",
+    "STRICTENC",
+    "SIG_HASHTYPE",
+    "P2PK NOT with invalid sig and undefined hashtype"
+],
 [
     "1 0x47 0x3044022051254b9fb476a52d85530792b578f86fea70ec1ffb4393e661bcccb23d8d63d3022076505f94a403c86097841944e044c70c2045ce90e36de51f7e9d3828db98a07501 0x47 0x304402200a358f750934b3feb822f1966bfcd8bbec9eeaa3a8ca941e11ee5960e181fa01022050bf6b5a8e7750f70354ae041cb68a7bade67ec6c3ab19eb359638974410626e01 0x47 0x304402200955d031fff71d8653221e85e36c3c85533d2312fc3045314b19650b7ae2f81002202a6bb8505e36201909d0921f01abff390ae6b7ff97bbf959f98aedeb0a56730901",
     "3 0x21 0x0279be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798 0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 0x21 0x03363d90d447b00c9c99ceac05b6262ee053441c7e55552ffe526bad8f83ff4640 3 CHECKMULTISIG",
@@ -898,6 +1714,13 @@
     "OK",
     "3-of-3 with nonzero dummy but no NULLDUMMY"
 ],
+[
+    "1 0x47 0x3044022051254b9fb476a52d85530792b578f86fea70ec1ffb4393e661bcccb23d8d63d3022076505f94a403c86097841944e044c70c2045ce90e36de51f7e9d3828db98a07501 0x47 0x304402200a358f750934b3feb822f1966bfcd8bbec9eeaa3a8ca941e11ee5960e181fa01022050bf6b5a8e7750f70354ae041cb68a7bade67ec6c3ab19eb359638974410626e01 0x47 0x304402200955d031fff71d8653221e85e36c3c85533d2312fc3045314b19650b7ae2f81002202a6bb8505e36201909d0921f01abff390ae6b7ff97bbf959f98aedeb0a56730901",
+    "3 0x21 0x0279be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798 0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 0x21 0x03363d90d447b00c9c99ceac05b6262ee053441c7e55552ffe526bad8f83ff4640 3 CHECKMULTISIG",
+    "NULLDUMMY",
+    "SIG_NULLDUMMY",
+    "3-of-3 with nonzero dummy"
+],
 [
     "1 0x47 0x304402201bb2edab700a5d020236df174fefed78087697143731f659bea59642c759c16d022061f42cdbae5bcd3e8790f20bf76687443436e94a634321c16a72aa54cbc7c2ea01 0x47 0x304402204bb4a64f2a6e5c7fb2f07fef85ee56fde5e6da234c6a984262307a20e99842d702206f8303aaba5e625d223897e2ffd3f88ef1bcffef55f38dc3768e5f2e94c923f901 0x47 0x3044022040c2809b71fffb155ec8b82fe7a27f666bd97f941207be4e14ade85a1249dd4d02204d56c85ec525dd18e29a0533d5ddf61b6b1bb32980c2f63edf951aebf7a27bfe01",
     "3 0x21 0x0279be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798 0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 0x21 0x03363d90d447b00c9c99ceac05b6262ee053441c7e55552ffe526bad8f83ff4640 3 CHECKMULTISIG NOT",
@@ -905,6 +1728,13 @@
     "OK",
     "3-of-3 NOT with invalid sig and nonzero dummy but no NULLDUMMY"
 ],
+[
+    "1 0x47 0x304402201bb2edab700a5d020236df174fefed78087697143731f659bea59642c759c16d022061f42cdbae5bcd3e8790f20bf76687443436e94a634321c16a72aa54cbc7c2ea01 0x47 0x304402204bb4a64f2a6e5c7fb2f07fef85ee56fde5e6da234c6a984262307a20e99842d702206f8303aaba5e625d223897e2ffd3f88ef1bcffef55f38dc3768e5f2e94c923f901 0x47 0x3044022040c2809b71fffb155ec8b82fe7a27f666bd97f941207be4e14ade85a1249dd4d02204d56c85ec525dd18e29a0533d5ddf61b6b1bb32980c2f63edf951aebf7a27bfe01",
+    "3 0x21 0x0279be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798 0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 0x21 0x03363d90d447b00c9c99ceac05b6262ee053441c7e55552ffe526bad8f83ff4640 3 CHECKMULTISIG NOT",
+    "NULLDUMMY",
+    "SIG_NULLDUMMY",
+    "3-of-3 NOT with invalid sig with nonzero dummy"
+],
 [
     "0 0x47 0x304402200abeb4bd07f84222f474aed558cfbdfc0b4e96cde3c2935ba7098b1ff0bd74c302204a04c1ca67b2a20abee210cf9a21023edccbbf8024b988812634233115c6b73901 DUP",
     "2 0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 2 CHECKMULTISIG",
@@ -912,6 +1742,13 @@
     "OK",
     "2-of-2 with two identical keys and sigs pushed using OP_DUP but no SIGPUSHONLY"
 ],
+[
+    "0 0x47 0x304402200abeb4bd07f84222f474aed558cfbdfc0b4e96cde3c2935ba7098b1ff0bd74c302204a04c1ca67b2a20abee210cf9a21023edccbbf8024b988812634233115c6b73901 DUP",
+    "2 0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 2 CHECKMULTISIG",
+    "SIGPUSHONLY",
+    "SIG_PUSHONLY",
+    "2-of-2 with two identical keys and sigs pushed using OP_DUP"
+],
 [
     "0x47 0x3044022018a2a81a93add5cb5f5da76305718e4ea66045ec4888b28d84cb22fae7f4645b02201e6daa5ed5d2e4b2b2027cf7ffd43d8d9844dd49f74ef86899ec8e669dfd39aa01 NOP8 0x23 0x2103363d90d447b00c9c99ceac05b6262ee053441c7e55552ffe526bad8f83ff4640ac",
     "HASH160 0x14 0x215640c2f72f0d16b4eced26762035a42ffed39a EQUAL",
@@ -926,6 +1763,20 @@
     "OK",
     "P2PK with non-push scriptSig but with P2SH validation"
 ],
+[
+    "0x47 0x3044022018a2a81a93add5cb5f5da76305718e4ea66045ec4888b28d84cb22fae7f4645b02201e6daa5ed5d2e4b2b2027cf7ffd43d8d9844dd49f74ef86899ec8e669dfd39aa01 NOP8 0x23 0x2103363d90d447b00c9c99ceac05b6262ee053441c7e55552ffe526bad8f83ff4640ac",
+    "HASH160 0x14 0x215640c2f72f0d16b4eced26762035a42ffed39a EQUAL",
+    "P2SH",
+    "SIG_PUSHONLY",
+    "P2SH(P2PK) with non-push scriptSig but no SIGPUSHONLY"
+],
+[
+    "0x47 0x3044022018a2a81a93add5cb5f5da76305718e4ea66045ec4888b28d84cb22fae7f4645b02201e6daa5ed5d2e4b2b2027cf7ffd43d8d9844dd49f74ef86899ec8e669dfd39aa01 NOP8 0x23 0x2103363d90d447b00c9c99ceac05b6262ee053441c7e55552ffe526bad8f83ff4640ac",
+    "HASH160 0x14 0x215640c2f72f0d16b4eced26762035a42ffed39a EQUAL",
+    "SIGPUSHONLY",
+    "SIG_PUSHONLY",
+    "P2SH(P2PK) with non-push scriptSig but not P2SH"
+],
 [
     "0 0x47 0x304402200abeb4bd07f84222f474aed558cfbdfc0b4e96cde3c2935ba7098b1ff0bd74c302204a04c1ca67b2a20abee210cf9a21023edccbbf8024b988812634233115c6b73901 0x47 0x304402200abeb4bd07f84222f474aed558cfbdfc0b4e96cde3c2935ba7098b1ff0bd74c302204a04c1ca67b2a20abee210cf9a21023edccbbf8024b988812634233115c6b73901",
     "2 0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 2 CHECKMULTISIG",
@@ -940,6 +1791,13 @@
     "OK",
     "P2PK with unnecessary input but no CLEANSTACK"
 ],
+[
+    "11 0x47 0x304402200a5c6163f07b8d3b013c4d1d6dba25e780b39658d79ba37af7057a3b7f15ffa102201fd9b4eaa9943f734928b99a83592c2e7bf342ea2680f6a2bb705167966b742001",
+    "0x41 0x0479be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8 CHECKSIG",
+    "CLEANSTACK,P2SH",
+    "CLEANSTACK",
+    "P2PK with unnecessary input"
+],
 [
     "11 0x47 0x304402202f7505132be14872581f35d74b759212d9da40482653f1ffa3116c3294a4a51702206adbf347a2240ca41c66522b1a22a41693610b76a8e7770645dc721d1635854f01 0x43 0x410479be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8ac",
     "HASH160 0x14 0x31edc23bdafda4639e669f89ad6b2318dd79d032 EQUAL",
@@ -947,6 +1805,13 @@
     "OK",
     "P2SH with unnecessary input but no CLEANSTACK"
 ],
+[
+    "11 0x47 0x304402202f7505132be14872581f35d74b759212d9da40482653f1ffa3116c3294a4a51702206adbf347a2240ca41c66522b1a22a41693610b76a8e7770645dc721d1635854f01 0x43 0x410479be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8ac",
+    "HASH160 0x14 0x31edc23bdafda4639e669f89ad6b2318dd79d032 EQUAL",
+    "CLEANSTACK,P2SH",
+    "CLEANSTACK",
+    "P2SH with unnecessary input"
+],
 [
     "0x47 0x304402202f7505132be14872581f35d74b759212d9da40482653f1ffa3116c3294a4a51702206adbf347a2240ca41c66522b1a22a41693610b76a8e7770645dc721d1635854f01 0x43 0x410479be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8ac",
     "HASH160 0x14 0x31edc23bdafda4639e669f89ad6b2318dd79d032 EQUAL",
diff --git a/src/test/script_tests.cpp b/src/test/script_tests.cpp
index 6340af2081f95..d42187f9127c2 100644
--- a/src/test/script_tests.cpp
+++ b/src/test/script_tests.cpp
@@ -2,8 +2,7 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include "data/script_invalid.json.h"
-#include "data/script_valid.json.h"
+#include "data/script_tests.json.h"
 
 #include "core_io.h"
 #include "key.h"
@@ -399,356 +398,310 @@ BOOST_AUTO_TEST_CASE(script_build)
 {
     const KeyData keys;
 
-    std::vector<TestBuilder> good;
-    std::vector<TestBuilder> bad;
-
-    good.push_back(TestBuilder(CScript() << ToByteVector(keys.pubkey0) << OP_CHECKSIG,
-                               "P2PK", 0
-                              ).PushSig(keys.key0));
-    bad.push_back(TestBuilder(CScript() << ToByteVector(keys.pubkey0) << OP_CHECKSIG,
-                              "P2PK, bad sig", 0
-                             ).PushSig(keys.key0).DamagePush(10).ScriptError(SCRIPT_ERR_EVAL_FALSE));
-
-    good.push_back(TestBuilder(CScript() << OP_DUP << OP_HASH160 << ToByteVector(keys.pubkey1C.GetID()) << OP_EQUALVERIFY << OP_CHECKSIG,
-                               "P2PKH", 0
-                              ).PushSig(keys.key1).Push(keys.pubkey1C));
-    bad.push_back(TestBuilder(CScript() << OP_DUP << OP_HASH160 << ToByteVector(keys.pubkey2C.GetID()) << OP_EQUALVERIFY << OP_CHECKSIG,
-                              "P2PKH, bad pubkey", 0
-                             ).PushSig(keys.key2).Push(keys.pubkey2C).DamagePush(5).ScriptError(SCRIPT_ERR_EQUALVERIFY));
-
-    good.push_back(TestBuilder(CScript() << ToByteVector(keys.pubkey1) << OP_CHECKSIG,
-                               "P2PK anyonecanpay", 0
-                              ).PushSig(keys.key1, SIGHASH_ALL | SIGHASH_ANYONECANPAY));
-    bad.push_back(TestBuilder(CScript() << ToByteVector(keys.pubkey1) << OP_CHECKSIG,
-                              "P2PK anyonecanpay marked with normal hashtype", 0
-                             ).PushSig(keys.key1, SIGHASH_ALL | SIGHASH_ANYONECANPAY).EditPush(70, "81", "01").ScriptError(SCRIPT_ERR_EVAL_FALSE));
-
-    good.push_back(TestBuilder(CScript() << ToByteVector(keys.pubkey0C) << OP_CHECKSIG,
-                               "P2SH(P2PK)", SCRIPT_VERIFY_P2SH, true
-                              ).PushSig(keys.key0).PushRedeem());
-    bad.push_back(TestBuilder(CScript() << ToByteVector(keys.pubkey0C) << OP_CHECKSIG,
-                              "P2SH(P2PK), bad redeemscript", SCRIPT_VERIFY_P2SH, true
-                             ).PushSig(keys.key0).PushRedeem().DamagePush(10).ScriptError(SCRIPT_ERR_EVAL_FALSE));
-
-    good.push_back(TestBuilder(CScript() << OP_DUP << OP_HASH160 << ToByteVector(keys.pubkey1.GetID()) << OP_EQUALVERIFY << OP_CHECKSIG,
-                               "P2SH(P2PKH), bad sig but no VERIFY_P2SH", 0, true
-                              ).PushSig(keys.key0).DamagePush(10).PushRedeem());
-    bad.push_back(TestBuilder(CScript() << OP_DUP << OP_HASH160 << ToByteVector(keys.pubkey1.GetID()) << OP_EQUALVERIFY << OP_CHECKSIG,
-                              "P2SH(P2PKH), bad sig", SCRIPT_VERIFY_P2SH, true
-                             ).PushSig(keys.key0).DamagePush(10).PushRedeem().ScriptError(SCRIPT_ERR_EQUALVERIFY));
-
-    good.push_back(TestBuilder(CScript() << OP_3 << ToByteVector(keys.pubkey0C) << ToByteVector(keys.pubkey1C) << ToByteVector(keys.pubkey2C) << OP_3 << OP_CHECKMULTISIG,
-                               "3-of-3", 0
-                              ).Num(0).PushSig(keys.key0).PushSig(keys.key1).PushSig(keys.key2));
-    bad.push_back(TestBuilder(CScript() << OP_3 << ToByteVector(keys.pubkey0C) << ToByteVector(keys.pubkey1C) << ToByteVector(keys.pubkey2C) << OP_3 << OP_CHECKMULTISIG,
-                              "3-of-3, 2 sigs", 0
-                             ).Num(0).PushSig(keys.key0).PushSig(keys.key1).Num(0).ScriptError(SCRIPT_ERR_EVAL_FALSE));
-
-    good.push_back(TestBuilder(CScript() << OP_2 << ToByteVector(keys.pubkey0C) << ToByteVector(keys.pubkey1C) << ToByteVector(keys.pubkey2C) << OP_3 << OP_CHECKMULTISIG,
-                               "P2SH(2-of-3)", SCRIPT_VERIFY_P2SH, true
-                              ).Num(0).PushSig(keys.key1).PushSig(keys.key2).PushRedeem());
-    bad.push_back(TestBuilder(CScript() << OP_2 << ToByteVector(keys.pubkey0C) << ToByteVector(keys.pubkey1C) << ToByteVector(keys.pubkey2C) << OP_3 << OP_CHECKMULTISIG,
-                              "P2SH(2-of-3), 1 sig", SCRIPT_VERIFY_P2SH, true
-                             ).Num(0).PushSig(keys.key1).Num(0).PushRedeem().ScriptError(SCRIPT_ERR_EVAL_FALSE));
-
-    good.push_back(TestBuilder(CScript() << ToByteVector(keys.pubkey1C) << OP_CHECKSIG,
-                               "P2PK with too much R padding but no DERSIG", 0
-                              ).PushSig(keys.key1, SIGHASH_ALL, 31, 32).EditPush(1, "43021F", "44022000"));
-    bad.push_back(TestBuilder(CScript() << ToByteVector(keys.pubkey1C) << OP_CHECKSIG,
-                              "P2PK with too much R padding", SCRIPT_VERIFY_DERSIG
-                             ).PushSig(keys.key1, SIGHASH_ALL, 31, 32).EditPush(1, "43021F", "44022000").ScriptError(SCRIPT_ERR_SIG_DER));
-    good.push_back(TestBuilder(CScript() << ToByteVector(keys.pubkey1C) << OP_CHECKSIG,
-                               "P2PK with too much S padding but no DERSIG", 0
-                              ).PushSig(keys.key1, SIGHASH_ALL).EditPush(1, "44", "45").EditPush(37, "20", "2100"));
-    bad.push_back(TestBuilder(CScript() << ToByteVector(keys.pubkey1C) << OP_CHECKSIG,
-                              "P2PK with too much S padding", SCRIPT_VERIFY_DERSIG
-                             ).PushSig(keys.key1, SIGHASH_ALL).EditPush(1, "44", "45").EditPush(37, "20", "2100").ScriptError(SCRIPT_ERR_SIG_DER));
-    good.push_back(TestBuilder(CScript() << ToByteVector(keys.pubkey1C) << OP_CHECKSIG,
-                               "P2PK with too little R padding but no DERSIG", 0
-                              ).PushSig(keys.key1, SIGHASH_ALL, 33, 32).EditPush(1, "45022100", "440220"));
-    bad.push_back(TestBuilder(CScript() << ToByteVector(keys.pubkey1C) << OP_CHECKSIG,
-                              "P2PK with too little R padding", SCRIPT_VERIFY_DERSIG
-                             ).PushSig(keys.key1, SIGHASH_ALL, 33, 32).EditPush(1, "45022100", "440220").ScriptError(SCRIPT_ERR_SIG_DER));
-    good.push_back(TestBuilder(CScript() << ToByteVector(keys.pubkey2C) << OP_CHECKSIG << OP_NOT,
-                               "P2PK NOT with bad sig with too much R padding but no DERSIG", 0
-                              ).PushSig(keys.key2, SIGHASH_ALL, 31, 32).EditPush(1, "43021F", "44022000").DamagePush(10));
-    bad.push_back(TestBuilder(CScript() << ToByteVector(keys.pubkey2C) << OP_CHECKSIG << OP_NOT,
-                              "P2PK NOT with bad sig with too much R padding", SCRIPT_VERIFY_DERSIG
-                             ).PushSig(keys.key2, SIGHASH_ALL, 31, 32).EditPush(1, "43021F", "44022000").DamagePush(10).ScriptError(SCRIPT_ERR_SIG_DER));
-    bad.push_back(TestBuilder(CScript() << ToByteVector(keys.pubkey2C) << OP_CHECKSIG << OP_NOT,
-                              "P2PK NOT with too much R padding but no DERSIG", 0
-                             ).PushSig(keys.key2, SIGHASH_ALL, 31, 32).EditPush(1, "43021F", "44022000").ScriptError(SCRIPT_ERR_EVAL_FALSE));
-    bad.push_back(TestBuilder(CScript() << ToByteVector(keys.pubkey2C) << OP_CHECKSIG << OP_NOT,
-                              "P2PK NOT with too much R padding", SCRIPT_VERIFY_DERSIG
-                             ).PushSig(keys.key2, SIGHASH_ALL, 31, 32).EditPush(1, "43021F", "44022000").ScriptError(SCRIPT_ERR_SIG_DER));
-
-    good.push_back(TestBuilder(CScript() << ToByteVector(keys.pubkey1C) << OP_CHECKSIG,
-                               "BIP66 example 1, without DERSIG", 0
-                              ).PushSig(keys.key1, SIGHASH_ALL, 33, 32).EditPush(1, "45022100", "440220"));
-    bad.push_back(TestBuilder(CScript() << ToByteVector(keys.pubkey1C) << OP_CHECKSIG,
-                              "BIP66 example 1, with DERSIG", SCRIPT_VERIFY_DERSIG
-                             ).PushSig(keys.key1, SIGHASH_ALL, 33, 32).EditPush(1, "45022100", "440220").ScriptError(SCRIPT_ERR_SIG_DER));
-    bad.push_back(TestBuilder(CScript() << ToByteVector(keys.pubkey1C) << OP_CHECKSIG << OP_NOT,
-                              "BIP66 example 2, without DERSIG", 0
-                             ).PushSig(keys.key1, SIGHASH_ALL, 33, 32).EditPush(1, "45022100", "440220").ScriptError(SCRIPT_ERR_EVAL_FALSE));
-    bad.push_back(TestBuilder(CScript() << ToByteVector(keys.pubkey1C) << OP_CHECKSIG << OP_NOT,
-                              "BIP66 example 2, with DERSIG", SCRIPT_VERIFY_DERSIG
-                             ).PushSig(keys.key1, SIGHASH_ALL, 33, 32).EditPush(1, "45022100", "440220").ScriptError(SCRIPT_ERR_SIG_DER));
-    bad.push_back(TestBuilder(CScript() << ToByteVector(keys.pubkey1C) << OP_CHECKSIG,
-                              "BIP66 example 3, without DERSIG", 0
-                             ).Num(0).ScriptError(SCRIPT_ERR_EVAL_FALSE));
-    bad.push_back(TestBuilder(CScript() << ToByteVector(keys.pubkey1C) << OP_CHECKSIG,
-                              "BIP66 example 3, with DERSIG", SCRIPT_VERIFY_DERSIG
-                             ).Num(0).ScriptError(SCRIPT_ERR_EVAL_FALSE));
-    good.push_back(TestBuilder(CScript() << ToByteVector(keys.pubkey1C) << OP_CHECKSIG << OP_NOT,
-                               "BIP66 example 4, without DERSIG", 0
-                              ).Num(0));
-    good.push_back(TestBuilder(CScript() << ToByteVector(keys.pubkey1C) << OP_CHECKSIG << OP_NOT,
-                               "BIP66 example 4, with DERSIG", SCRIPT_VERIFY_DERSIG
-                              ).Num(0));
-    bad.push_back(TestBuilder(CScript() << ToByteVector(keys.pubkey1C) << OP_CHECKSIG,
-                              "BIP66 example 5, without DERSIG", 0
-                             ).Num(1).ScriptError(SCRIPT_ERR_EVAL_FALSE));
-    bad.push_back(TestBuilder(CScript() << ToByteVector(keys.pubkey1C) << OP_CHECKSIG,
-                              "BIP66 example 5, with DERSIG", SCRIPT_VERIFY_DERSIG
-                             ).Num(1).ScriptError(SCRIPT_ERR_SIG_DER));
-    good.push_back(TestBuilder(CScript() << ToByteVector(keys.pubkey1C) << OP_CHECKSIG << OP_NOT,
-                               "BIP66 example 6, without DERSIG", 0
-                              ).Num(1));
-    bad.push_back(TestBuilder(CScript() << ToByteVector(keys.pubkey1C) << OP_CHECKSIG << OP_NOT,
-                              "BIP66 example 6, with DERSIG", SCRIPT_VERIFY_DERSIG
-                             ).Num(1).ScriptError(SCRIPT_ERR_SIG_DER));
-    good.push_back(TestBuilder(CScript() << OP_2 << ToByteVector(keys.pubkey1C) << ToByteVector(keys.pubkey2C) << OP_2 << OP_CHECKMULTISIG,
-                               "BIP66 example 7, without DERSIG", 0
-                              ).Num(0).PushSig(keys.key1, SIGHASH_ALL, 33, 32).EditPush(1, "45022100", "440220").PushSig(keys.key2));
-    bad.push_back(TestBuilder(CScript() << OP_2 << ToByteVector(keys.pubkey1C) << ToByteVector(keys.pubkey2C) << OP_2 << OP_CHECKMULTISIG,
-                              "BIP66 example 7, with DERSIG", SCRIPT_VERIFY_DERSIG
-                             ).Num(0).PushSig(keys.key1, SIGHASH_ALL, 33, 32).EditPush(1, "45022100", "440220").PushSig(keys.key2).ScriptError(SCRIPT_ERR_SIG_DER));
-    bad.push_back(TestBuilder(CScript() << OP_2 << ToByteVector(keys.pubkey1C) << ToByteVector(keys.pubkey2C) << OP_2 << OP_CHECKMULTISIG << OP_NOT,
-                              "BIP66 example 8, without DERSIG", 0
-                             ).Num(0).PushSig(keys.key1, SIGHASH_ALL, 33, 32).EditPush(1, "45022100", "440220").PushSig(keys.key2).ScriptError(SCRIPT_ERR_EVAL_FALSE));
-    bad.push_back(TestBuilder(CScript() << OP_2 << ToByteVector(keys.pubkey1C) << ToByteVector(keys.pubkey2C) << OP_2 << OP_CHECKMULTISIG << OP_NOT,
-                              "BIP66 example 8, with DERSIG", SCRIPT_VERIFY_DERSIG
-                             ).Num(0).PushSig(keys.key1, SIGHASH_ALL, 33, 32).EditPush(1, "45022100", "440220").PushSig(keys.key2).ScriptError(SCRIPT_ERR_SIG_DER));
-    bad.push_back(TestBuilder(CScript() << OP_2 << ToByteVector(keys.pubkey1C) << ToByteVector(keys.pubkey2C) << OP_2 << OP_CHECKMULTISIG,
-                              "BIP66 example 9, without DERSIG", 0
-                             ).Num(0).Num(0).PushSig(keys.key2, SIGHASH_ALL, 33, 32).EditPush(1, "45022100", "440220").ScriptError(SCRIPT_ERR_EVAL_FALSE));
-    bad.push_back(TestBuilder(CScript() << OP_2 << ToByteVector(keys.pubkey1C) << ToByteVector(keys.pubkey2C) << OP_2 << OP_CHECKMULTISIG,
-                              "BIP66 example 9, with DERSIG", SCRIPT_VERIFY_DERSIG
-                             ).Num(0).Num(0).PushSig(keys.key2, SIGHASH_ALL, 33, 32).EditPush(1, "45022100", "440220").ScriptError(SCRIPT_ERR_SIG_DER));
-    good.push_back(TestBuilder(CScript() << OP_2 << ToByteVector(keys.pubkey1C) << ToByteVector(keys.pubkey2C) << OP_2 << OP_CHECKMULTISIG << OP_NOT,
-                               "BIP66 example 10, without DERSIG", 0
-                              ).Num(0).Num(0).PushSig(keys.key2, SIGHASH_ALL, 33, 32).EditPush(1, "45022100", "440220"));
-    bad.push_back(TestBuilder(CScript() << OP_2 << ToByteVector(keys.pubkey1C) << ToByteVector(keys.pubkey2C) << OP_2 << OP_CHECKMULTISIG << OP_NOT,
-                              "BIP66 example 10, with DERSIG", SCRIPT_VERIFY_DERSIG
-                             ).Num(0).Num(0).PushSig(keys.key2, SIGHASH_ALL, 33, 32).EditPush(1, "45022100", "440220").ScriptError(SCRIPT_ERR_SIG_DER));
-    bad.push_back(TestBuilder(CScript() << OP_2 << ToByteVector(keys.pubkey1C) << ToByteVector(keys.pubkey2C) << OP_2 << OP_CHECKMULTISIG,
-                              "BIP66 example 11, without DERSIG", 0
-                             ).Num(0).PushSig(keys.key1, SIGHASH_ALL, 33, 32).EditPush(1, "45022100", "440220").Num(0).ScriptError(SCRIPT_ERR_EVAL_FALSE));
-    bad.push_back(TestBuilder(CScript() << OP_2 << ToByteVector(keys.pubkey1C) << ToByteVector(keys.pubkey2C) << OP_2 << OP_CHECKMULTISIG,
-                              "BIP66 example 11, with DERSIG", SCRIPT_VERIFY_DERSIG
-                             ).Num(0).PushSig(keys.key1, SIGHASH_ALL, 33, 32).EditPush(1, "45022100", "440220").Num(0).ScriptError(SCRIPT_ERR_EVAL_FALSE));
-    good.push_back(TestBuilder(CScript() << OP_2 << ToByteVector(keys.pubkey1C) << ToByteVector(keys.pubkey2C) << OP_2 << OP_CHECKMULTISIG << OP_NOT,
-                               "BIP66 example 12, without DERSIG", 0
-                              ).Num(0).PushSig(keys.key1, SIGHASH_ALL, 33, 32).EditPush(1, "45022100", "440220").Num(0));
-    good.push_back(TestBuilder(CScript() << OP_2 << ToByteVector(keys.pubkey1C) << ToByteVector(keys.pubkey2C) << OP_2 << OP_CHECKMULTISIG << OP_NOT,
-                               "BIP66 example 12, with DERSIG", SCRIPT_VERIFY_DERSIG
-                              ).Num(0).PushSig(keys.key1, SIGHASH_ALL, 33, 32).EditPush(1, "45022100", "440220").Num(0));
-    good.push_back(TestBuilder(CScript() << ToByteVector(keys.pubkey2C) << OP_CHECKSIG,
-                               "P2PK with multi-byte hashtype, without DERSIG", 0
-                              ).PushSig(keys.key2, SIGHASH_ALL).EditPush(70, "01", "0101"));
-    bad.push_back(TestBuilder(CScript() << ToByteVector(keys.pubkey2C) << OP_CHECKSIG,
-                               "P2PK with multi-byte hashtype, with DERSIG", SCRIPT_VERIFY_DERSIG
-                              ).PushSig(keys.key2, SIGHASH_ALL).EditPush(70, "01", "0101").ScriptError(SCRIPT_ERR_SIG_DER));
-
-    good.push_back(TestBuilder(CScript() << ToByteVector(keys.pubkey2C) << OP_CHECKSIG,
-                               "P2PK with high S but no LOW_S", 0
-                              ).PushSig(keys.key2, SIGHASH_ALL, 32, 33));
-    bad.push_back(TestBuilder(CScript() << ToByteVector(keys.pubkey2C) << OP_CHECKSIG,
-                              "P2PK with high S", SCRIPT_VERIFY_LOW_S
-                             ).PushSig(keys.key2, SIGHASH_ALL, 32, 33).ScriptError(SCRIPT_ERR_SIG_HIGH_S));
-
-    good.push_back(TestBuilder(CScript() << ToByteVector(keys.pubkey0H) << OP_CHECKSIG,
-                               "P2PK with hybrid pubkey but no STRICTENC", 0
-                              ).PushSig(keys.key0, SIGHASH_ALL));
-    bad.push_back(TestBuilder(CScript() << ToByteVector(keys.pubkey0H) << OP_CHECKSIG,
-                              "P2PK with hybrid pubkey", SCRIPT_VERIFY_STRICTENC
-                             ).PushSig(keys.key0, SIGHASH_ALL).ScriptError(SCRIPT_ERR_PUBKEYTYPE));
-    bad.push_back(TestBuilder(CScript() << ToByteVector(keys.pubkey0H) << OP_CHECKSIG << OP_NOT,
-                              "P2PK NOT with hybrid pubkey but no STRICTENC", 0
-                             ).PushSig(keys.key0, SIGHASH_ALL).ScriptError(SCRIPT_ERR_EVAL_FALSE));
-    bad.push_back(TestBuilder(CScript() << ToByteVector(keys.pubkey0H) << OP_CHECKSIG << OP_NOT,
-                              "P2PK NOT with hybrid pubkey", SCRIPT_VERIFY_STRICTENC
-                             ).PushSig(keys.key0, SIGHASH_ALL).ScriptError(SCRIPT_ERR_PUBKEYTYPE));
-    good.push_back(TestBuilder(CScript() << ToByteVector(keys.pubkey0H) << OP_CHECKSIG << OP_NOT,
-                               "P2PK NOT with invalid hybrid pubkey but no STRICTENC", 0
-                              ).PushSig(keys.key0, SIGHASH_ALL).DamagePush(10));
-    bad.push_back(TestBuilder(CScript() << ToByteVector(keys.pubkey0H) << OP_CHECKSIG << OP_NOT,
-                              "P2PK NOT with invalid hybrid pubkey", SCRIPT_VERIFY_STRICTENC
-                             ).PushSig(keys.key0, SIGHASH_ALL).DamagePush(10).ScriptError(SCRIPT_ERR_PUBKEYTYPE));
-    good.push_back(TestBuilder(CScript() << OP_1 << ToByteVector(keys.pubkey0H) << ToByteVector(keys.pubkey1C) << OP_2 << OP_CHECKMULTISIG,
-                               "1-of-2 with the second 1 hybrid pubkey and no STRICTENC", 0
-                              ).Num(0).PushSig(keys.key1, SIGHASH_ALL));
-    good.push_back(TestBuilder(CScript() << OP_1 << ToByteVector(keys.pubkey0H) << ToByteVector(keys.pubkey1C) << OP_2 << OP_CHECKMULTISIG,
-                               "1-of-2 with the second 1 hybrid pubkey", SCRIPT_VERIFY_STRICTENC
-                              ).Num(0).PushSig(keys.key1, SIGHASH_ALL));
-    bad.push_back(TestBuilder(CScript() << OP_1 << ToByteVector(keys.pubkey1C) << ToByteVector(keys.pubkey0H) << OP_2 << OP_CHECKMULTISIG,
-                              "1-of-2 with the first 1 hybrid pubkey", SCRIPT_VERIFY_STRICTENC
-                             ).Num(0).PushSig(keys.key1, SIGHASH_ALL).ScriptError(SCRIPT_ERR_PUBKEYTYPE));
-
-    good.push_back(TestBuilder(CScript() << ToByteVector(keys.pubkey1) << OP_CHECKSIG,
-                               "P2PK with undefined hashtype but no STRICTENC", 0
-                              ).PushSig(keys.key1, 5));
-    bad.push_back(TestBuilder(CScript() << ToByteVector(keys.pubkey1) << OP_CHECKSIG,
-                              "P2PK with undefined hashtype", SCRIPT_VERIFY_STRICTENC
-                             ).PushSig(keys.key1, 5).ScriptError(SCRIPT_ERR_SIG_HASHTYPE));
-    good.push_back(TestBuilder(CScript() << ToByteVector(keys.pubkey1) << OP_CHECKSIG << OP_NOT,
-                               "P2PK NOT with invalid sig and undefined hashtype but no STRICTENC", 0
-                              ).PushSig(keys.key1, 5).DamagePush(10));
-    bad.push_back(TestBuilder(CScript() << ToByteVector(keys.pubkey1) << OP_CHECKSIG << OP_NOT,
-                              "P2PK NOT with invalid sig and undefined hashtype", SCRIPT_VERIFY_STRICTENC
-                             ).PushSig(keys.key1, 5).DamagePush(10).ScriptError(SCRIPT_ERR_SIG_HASHTYPE));
-
-    good.push_back(TestBuilder(CScript() << OP_3 << ToByteVector(keys.pubkey0C) << ToByteVector(keys.pubkey1C) << ToByteVector(keys.pubkey2C) << OP_3 << OP_CHECKMULTISIG,
-                               "3-of-3 with nonzero dummy but no NULLDUMMY", 0
-                              ).Num(1).PushSig(keys.key0).PushSig(keys.key1).PushSig(keys.key2));
-    bad.push_back(TestBuilder(CScript() << OP_3 << ToByteVector(keys.pubkey0C) << ToByteVector(keys.pubkey1C) << ToByteVector(keys.pubkey2C) << OP_3 << OP_CHECKMULTISIG,
-                              "3-of-3 with nonzero dummy", SCRIPT_VERIFY_NULLDUMMY
-                             ).Num(1).PushSig(keys.key0).PushSig(keys.key1).PushSig(keys.key2).ScriptError(SCRIPT_ERR_SIG_NULLDUMMY));
-    good.push_back(TestBuilder(CScript() << OP_3 << ToByteVector(keys.pubkey0C) << ToByteVector(keys.pubkey1C) << ToByteVector(keys.pubkey2C) << OP_3 << OP_CHECKMULTISIG << OP_NOT,
-                               "3-of-3 NOT with invalid sig and nonzero dummy but no NULLDUMMY", 0
-                              ).Num(1).PushSig(keys.key0).PushSig(keys.key1).PushSig(keys.key2).DamagePush(10));
-    bad.push_back(TestBuilder(CScript() << OP_3 << ToByteVector(keys.pubkey0C) << ToByteVector(keys.pubkey1C) << ToByteVector(keys.pubkey2C) << OP_3 << OP_CHECKMULTISIG << OP_NOT,
-                              "3-of-3 NOT with invalid sig with nonzero dummy", SCRIPT_VERIFY_NULLDUMMY
-                             ).Num(1).PushSig(keys.key0).PushSig(keys.key1).PushSig(keys.key2).DamagePush(10).ScriptError(SCRIPT_ERR_SIG_NULLDUMMY));
-
-    good.push_back(TestBuilder(CScript() << OP_2 << ToByteVector(keys.pubkey1C) << ToByteVector(keys.pubkey1C) << OP_2 << OP_CHECKMULTISIG,
-                               "2-of-2 with two identical keys and sigs pushed using OP_DUP but no SIGPUSHONLY", 0
-                              ).Num(0).PushSig(keys.key1).Add(CScript() << OP_DUP));
-    bad.push_back(TestBuilder(CScript() << OP_2 << ToByteVector(keys.pubkey1C) << ToByteVector(keys.pubkey1C) << OP_2 << OP_CHECKMULTISIG,
-                              "2-of-2 with two identical keys and sigs pushed using OP_DUP", SCRIPT_VERIFY_SIGPUSHONLY
-                             ).Num(0).PushSig(keys.key1).Add(CScript() << OP_DUP).ScriptError(SCRIPT_ERR_SIG_PUSHONLY));
-    good.push_back(TestBuilder(CScript() << ToByteVector(keys.pubkey2C) << OP_CHECKSIG,
-                               "P2SH(P2PK) with non-push scriptSig but no P2SH or SIGPUSHONLY", 0, true
-                              ).PushSig(keys.key2).Add(CScript() << OP_NOP8).PushRedeem());
-    good.push_back(TestBuilder(CScript() << ToByteVector(keys.pubkey2C) << OP_CHECKSIG,
-                               "P2PK with non-push scriptSig but with P2SH validation", 0
-                              ).PushSig(keys.key2).Add(CScript() << OP_NOP8));
-    bad.push_back(TestBuilder(CScript() << ToByteVector(keys.pubkey2C) << OP_CHECKSIG,
-                              "P2SH(P2PK) with non-push scriptSig but no SIGPUSHONLY", SCRIPT_VERIFY_P2SH, true
-                             ).PushSig(keys.key2).Add(CScript() << OP_NOP8).PushRedeem().ScriptError(SCRIPT_ERR_SIG_PUSHONLY));
-    bad.push_back(TestBuilder(CScript() << ToByteVector(keys.pubkey2C) << OP_CHECKSIG,
-                              "P2SH(P2PK) with non-push scriptSig but not P2SH", SCRIPT_VERIFY_SIGPUSHONLY, true
-                             ).PushSig(keys.key2).Add(CScript() << OP_NOP8).PushRedeem().ScriptError(SCRIPT_ERR_SIG_PUSHONLY));
-    good.push_back(TestBuilder(CScript() << OP_2 << ToByteVector(keys.pubkey1C) << ToByteVector(keys.pubkey1C) << OP_2 << OP_CHECKMULTISIG,
-                               "2-of-2 with two identical keys and sigs pushed", SCRIPT_VERIFY_SIGPUSHONLY
-                              ).Num(0).PushSig(keys.key1).PushSig(keys.key1));
-    good.push_back(TestBuilder(CScript() << ToByteVector(keys.pubkey0) << OP_CHECKSIG,
-                               "P2PK with unnecessary input but no CLEANSTACK", SCRIPT_VERIFY_P2SH
-                              ).Num(11).PushSig(keys.key0));
-    bad.push_back(TestBuilder(CScript() << ToByteVector(keys.pubkey0) << OP_CHECKSIG,
-                              "P2PK with unnecessary input", SCRIPT_VERIFY_CLEANSTACK | SCRIPT_VERIFY_P2SH
-                             ).Num(11).PushSig(keys.key0).ScriptError(SCRIPT_ERR_CLEANSTACK));
-    good.push_back(TestBuilder(CScript() << ToByteVector(keys.pubkey0) << OP_CHECKSIG,
-                               "P2SH with unnecessary input but no CLEANSTACK", SCRIPT_VERIFY_P2SH, true
-                              ).Num(11).PushSig(keys.key0).PushRedeem());
-    bad.push_back(TestBuilder(CScript() << ToByteVector(keys.pubkey0) << OP_CHECKSIG,
-                              "P2SH with unnecessary input", SCRIPT_VERIFY_CLEANSTACK | SCRIPT_VERIFY_P2SH, true
-                             ).Num(11).PushSig(keys.key0).PushRedeem().ScriptError(SCRIPT_ERR_CLEANSTACK));
-    good.push_back(TestBuilder(CScript() << ToByteVector(keys.pubkey0) << OP_CHECKSIG,
-                               "P2SH with CLEANSTACK", SCRIPT_VERIFY_CLEANSTACK | SCRIPT_VERIFY_P2SH, true
-                              ).PushSig(keys.key0).PushRedeem());
-
-
-    std::set<std::string> tests_good;
-    std::set<std::string> tests_bad;
+    std::vector<TestBuilder> tests;
+
+    tests.push_back(TestBuilder(CScript() << ToByteVector(keys.pubkey0) << OP_CHECKSIG,
+                                "P2PK", 0
+                               ).PushSig(keys.key0));
+    tests.push_back(TestBuilder(CScript() << ToByteVector(keys.pubkey0) << OP_CHECKSIG,
+                                "P2PK, bad sig", 0
+                               ).PushSig(keys.key0).DamagePush(10).ScriptError(SCRIPT_ERR_EVAL_FALSE));
+
+    tests.push_back(TestBuilder(CScript() << OP_DUP << OP_HASH160 << ToByteVector(keys.pubkey1C.GetID()) << OP_EQUALVERIFY << OP_CHECKSIG,
+                                "P2PKH", 0
+                               ).PushSig(keys.key1).Push(keys.pubkey1C));
+    tests.push_back(TestBuilder(CScript() << OP_DUP << OP_HASH160 << ToByteVector(keys.pubkey2C.GetID()) << OP_EQUALVERIFY << OP_CHECKSIG,
+                                "P2PKH, bad pubkey", 0
+                               ).PushSig(keys.key2).Push(keys.pubkey2C).DamagePush(5).ScriptError(SCRIPT_ERR_EQUALVERIFY));
+
+    tests.push_back(TestBuilder(CScript() << ToByteVector(keys.pubkey1) << OP_CHECKSIG,
+                                "P2PK anyonecanpay", 0
+                               ).PushSig(keys.key1, SIGHASH_ALL | SIGHASH_ANYONECANPAY));
+    tests.push_back(TestBuilder(CScript() << ToByteVector(keys.pubkey1) << OP_CHECKSIG,
+                                "P2PK anyonecanpay marked with normal hashtype", 0
+                               ).PushSig(keys.key1, SIGHASH_ALL | SIGHASH_ANYONECANPAY).EditPush(70, "81", "01").ScriptError(SCRIPT_ERR_EVAL_FALSE));
+
+    tests.push_back(TestBuilder(CScript() << ToByteVector(keys.pubkey0C) << OP_CHECKSIG,
+                                "P2SH(P2PK)", SCRIPT_VERIFY_P2SH, true
+                               ).PushSig(keys.key0).PushRedeem());
+    tests.push_back(TestBuilder(CScript() << ToByteVector(keys.pubkey0C) << OP_CHECKSIG,
+                                "P2SH(P2PK), bad redeemscript", SCRIPT_VERIFY_P2SH, true
+                               ).PushSig(keys.key0).PushRedeem().DamagePush(10).ScriptError(SCRIPT_ERR_EVAL_FALSE));
+
+    tests.push_back(TestBuilder(CScript() << OP_DUP << OP_HASH160 << ToByteVector(keys.pubkey1.GetID()) << OP_EQUALVERIFY << OP_CHECKSIG,
+                                "P2SH(P2PKH), bad sig but no VERIFY_P2SH", 0, true
+                               ).PushSig(keys.key0).DamagePush(10).PushRedeem());
+    tests.push_back(TestBuilder(CScript() << OP_DUP << OP_HASH160 << ToByteVector(keys.pubkey1.GetID()) << OP_EQUALVERIFY << OP_CHECKSIG,
+                                "P2SH(P2PKH), bad sig", SCRIPT_VERIFY_P2SH, true
+                               ).PushSig(keys.key0).DamagePush(10).PushRedeem().ScriptError(SCRIPT_ERR_EQUALVERIFY));
+
+    tests.push_back(TestBuilder(CScript() << OP_3 << ToByteVector(keys.pubkey0C) << ToByteVector(keys.pubkey1C) << ToByteVector(keys.pubkey2C) << OP_3 << OP_CHECKMULTISIG,
+                                "3-of-3", 0
+                               ).Num(0).PushSig(keys.key0).PushSig(keys.key1).PushSig(keys.key2));
+    tests.push_back(TestBuilder(CScript() << OP_3 << ToByteVector(keys.pubkey0C) << ToByteVector(keys.pubkey1C) << ToByteVector(keys.pubkey2C) << OP_3 << OP_CHECKMULTISIG,
+                                "3-of-3, 2 sigs", 0
+                               ).Num(0).PushSig(keys.key0).PushSig(keys.key1).Num(0).ScriptError(SCRIPT_ERR_EVAL_FALSE));
+
+    tests.push_back(TestBuilder(CScript() << OP_2 << ToByteVector(keys.pubkey0C) << ToByteVector(keys.pubkey1C) << ToByteVector(keys.pubkey2C) << OP_3 << OP_CHECKMULTISIG,
+                                "P2SH(2-of-3)", SCRIPT_VERIFY_P2SH, true
+                               ).Num(0).PushSig(keys.key1).PushSig(keys.key2).PushRedeem());
+    tests.push_back(TestBuilder(CScript() << OP_2 << ToByteVector(keys.pubkey0C) << ToByteVector(keys.pubkey1C) << ToByteVector(keys.pubkey2C) << OP_3 << OP_CHECKMULTISIG,
+                                "P2SH(2-of-3), 1 sig", SCRIPT_VERIFY_P2SH, true
+                               ).Num(0).PushSig(keys.key1).Num(0).PushRedeem().ScriptError(SCRIPT_ERR_EVAL_FALSE));
+
+    tests.push_back(TestBuilder(CScript() << ToByteVector(keys.pubkey1C) << OP_CHECKSIG,
+                                "P2PK with too much R padding but no DERSIG", 0
+                               ).PushSig(keys.key1, SIGHASH_ALL, 31, 32).EditPush(1, "43021F", "44022000"));
+    tests.push_back(TestBuilder(CScript() << ToByteVector(keys.pubkey1C) << OP_CHECKSIG,
+                                "P2PK with too much R padding", SCRIPT_VERIFY_DERSIG
+                               ).PushSig(keys.key1, SIGHASH_ALL, 31, 32).EditPush(1, "43021F", "44022000").ScriptError(SCRIPT_ERR_SIG_DER));
+    tests.push_back(TestBuilder(CScript() << ToByteVector(keys.pubkey1C) << OP_CHECKSIG,
+                                "P2PK with too much S padding but no DERSIG", 0
+                               ).PushSig(keys.key1, SIGHASH_ALL).EditPush(1, "44", "45").EditPush(37, "20", "2100"));
+    tests.push_back(TestBuilder(CScript() << ToByteVector(keys.pubkey1C) << OP_CHECKSIG,
+                                "P2PK with too much S padding", SCRIPT_VERIFY_DERSIG
+                               ).PushSig(keys.key1, SIGHASH_ALL).EditPush(1, "44", "45").EditPush(37, "20", "2100").ScriptError(SCRIPT_ERR_SIG_DER));
+    tests.push_back(TestBuilder(CScript() << ToByteVector(keys.pubkey1C) << OP_CHECKSIG,
+                                "P2PK with too little R padding but no DERSIG", 0
+                               ).PushSig(keys.key1, SIGHASH_ALL, 33, 32).EditPush(1, "45022100", "440220"));
+    tests.push_back(TestBuilder(CScript() << ToByteVector(keys.pubkey1C) << OP_CHECKSIG,
+                                "P2PK with too little R padding", SCRIPT_VERIFY_DERSIG
+                               ).PushSig(keys.key1, SIGHASH_ALL, 33, 32).EditPush(1, "45022100", "440220").ScriptError(SCRIPT_ERR_SIG_DER));
+    tests.push_back(TestBuilder(CScript() << ToByteVector(keys.pubkey2C) << OP_CHECKSIG << OP_NOT,
+                                "P2PK NOT with bad sig with too much R padding but no DERSIG", 0
+                               ).PushSig(keys.key2, SIGHASH_ALL, 31, 32).EditPush(1, "43021F", "44022000").DamagePush(10));
+    tests.push_back(TestBuilder(CScript() << ToByteVector(keys.pubkey2C) << OP_CHECKSIG << OP_NOT,
+                                "P2PK NOT with bad sig with too much R padding", SCRIPT_VERIFY_DERSIG
+                               ).PushSig(keys.key2, SIGHASH_ALL, 31, 32).EditPush(1, "43021F", "44022000").DamagePush(10).ScriptError(SCRIPT_ERR_SIG_DER));
+    tests.push_back(TestBuilder(CScript() << ToByteVector(keys.pubkey2C) << OP_CHECKSIG << OP_NOT,
+                                "P2PK NOT with too much R padding but no DERSIG", 0
+                               ).PushSig(keys.key2, SIGHASH_ALL, 31, 32).EditPush(1, "43021F", "44022000").ScriptError(SCRIPT_ERR_EVAL_FALSE));
+    tests.push_back(TestBuilder(CScript() << ToByteVector(keys.pubkey2C) << OP_CHECKSIG << OP_NOT,
+                                "P2PK NOT with too much R padding", SCRIPT_VERIFY_DERSIG
+                               ).PushSig(keys.key2, SIGHASH_ALL, 31, 32).EditPush(1, "43021F", "44022000").ScriptError(SCRIPT_ERR_SIG_DER));
+
+    tests.push_back(TestBuilder(CScript() << ToByteVector(keys.pubkey1C) << OP_CHECKSIG,
+                                "BIP66 example 1, without DERSIG", 0
+                               ).PushSig(keys.key1, SIGHASH_ALL, 33, 32).EditPush(1, "45022100", "440220"));
+    tests.push_back(TestBuilder(CScript() << ToByteVector(keys.pubkey1C) << OP_CHECKSIG,
+                                "BIP66 example 1, with DERSIG", SCRIPT_VERIFY_DERSIG
+                               ).PushSig(keys.key1, SIGHASH_ALL, 33, 32).EditPush(1, "45022100", "440220").ScriptError(SCRIPT_ERR_SIG_DER));
+    tests.push_back(TestBuilder(CScript() << ToByteVector(keys.pubkey1C) << OP_CHECKSIG << OP_NOT,
+                                "BIP66 example 2, without DERSIG", 0
+                               ).PushSig(keys.key1, SIGHASH_ALL, 33, 32).EditPush(1, "45022100", "440220").ScriptError(SCRIPT_ERR_EVAL_FALSE));
+    tests.push_back(TestBuilder(CScript() << ToByteVector(keys.pubkey1C) << OP_CHECKSIG << OP_NOT,
+                                "BIP66 example 2, with DERSIG", SCRIPT_VERIFY_DERSIG
+                               ).PushSig(keys.key1, SIGHASH_ALL, 33, 32).EditPush(1, "45022100", "440220").ScriptError(SCRIPT_ERR_SIG_DER));
+    tests.push_back(TestBuilder(CScript() << ToByteVector(keys.pubkey1C) << OP_CHECKSIG,
+                                "BIP66 example 3, without DERSIG", 0
+                               ).Num(0).ScriptError(SCRIPT_ERR_EVAL_FALSE));
+    tests.push_back(TestBuilder(CScript() << ToByteVector(keys.pubkey1C) << OP_CHECKSIG,
+                                "BIP66 example 3, with DERSIG", SCRIPT_VERIFY_DERSIG
+                               ).Num(0).ScriptError(SCRIPT_ERR_EVAL_FALSE));
+    tests.push_back(TestBuilder(CScript() << ToByteVector(keys.pubkey1C) << OP_CHECKSIG << OP_NOT,
+                                "BIP66 example 4, without DERSIG", 0
+                               ).Num(0));
+    tests.push_back(TestBuilder(CScript() << ToByteVector(keys.pubkey1C) << OP_CHECKSIG << OP_NOT,
+                                "BIP66 example 4, with DERSIG", SCRIPT_VERIFY_DERSIG
+                               ).Num(0));
+    tests.push_back(TestBuilder(CScript() << ToByteVector(keys.pubkey1C) << OP_CHECKSIG,
+                                "BIP66 example 5, without DERSIG", 0
+                               ).Num(1).ScriptError(SCRIPT_ERR_EVAL_FALSE));
+    tests.push_back(TestBuilder(CScript() << ToByteVector(keys.pubkey1C) << OP_CHECKSIG,
+                                "BIP66 example 5, with DERSIG", SCRIPT_VERIFY_DERSIG
+                               ).Num(1).ScriptError(SCRIPT_ERR_SIG_DER));
+    tests.push_back(TestBuilder(CScript() << ToByteVector(keys.pubkey1C) << OP_CHECKSIG << OP_NOT,
+                                "BIP66 example 6, without DERSIG", 0
+                               ).Num(1));
+    tests.push_back(TestBuilder(CScript() << ToByteVector(keys.pubkey1C) << OP_CHECKSIG << OP_NOT,
+                                "BIP66 example 6, with DERSIG", SCRIPT_VERIFY_DERSIG
+                               ).Num(1).ScriptError(SCRIPT_ERR_SIG_DER));
+    tests.push_back(TestBuilder(CScript() << OP_2 << ToByteVector(keys.pubkey1C) << ToByteVector(keys.pubkey2C) << OP_2 << OP_CHECKMULTISIG,
+                                "BIP66 example 7, without DERSIG", 0
+                               ).Num(0).PushSig(keys.key1, SIGHASH_ALL, 33, 32).EditPush(1, "45022100", "440220").PushSig(keys.key2));
+    tests.push_back(TestBuilder(CScript() << OP_2 << ToByteVector(keys.pubkey1C) << ToByteVector(keys.pubkey2C) << OP_2 << OP_CHECKMULTISIG,
+                                "BIP66 example 7, with DERSIG", SCRIPT_VERIFY_DERSIG
+                               ).Num(0).PushSig(keys.key1, SIGHASH_ALL, 33, 32).EditPush(1, "45022100", "440220").PushSig(keys.key2).ScriptError(SCRIPT_ERR_SIG_DER));
+    tests.push_back(TestBuilder(CScript() << OP_2 << ToByteVector(keys.pubkey1C) << ToByteVector(keys.pubkey2C) << OP_2 << OP_CHECKMULTISIG << OP_NOT,
+                                "BIP66 example 8, without DERSIG", 0
+                               ).Num(0).PushSig(keys.key1, SIGHASH_ALL, 33, 32).EditPush(1, "45022100", "440220").PushSig(keys.key2).ScriptError(SCRIPT_ERR_EVAL_FALSE));
+    tests.push_back(TestBuilder(CScript() << OP_2 << ToByteVector(keys.pubkey1C) << ToByteVector(keys.pubkey2C) << OP_2 << OP_CHECKMULTISIG << OP_NOT,
+                                "BIP66 example 8, with DERSIG", SCRIPT_VERIFY_DERSIG
+                               ).Num(0).PushSig(keys.key1, SIGHASH_ALL, 33, 32).EditPush(1, "45022100", "440220").PushSig(keys.key2).ScriptError(SCRIPT_ERR_SIG_DER));
+    tests.push_back(TestBuilder(CScript() << OP_2 << ToByteVector(keys.pubkey1C) << ToByteVector(keys.pubkey2C) << OP_2 << OP_CHECKMULTISIG,
+                                "BIP66 example 9, without DERSIG", 0
+                               ).Num(0).Num(0).PushSig(keys.key2, SIGHASH_ALL, 33, 32).EditPush(1, "45022100", "440220").ScriptError(SCRIPT_ERR_EVAL_FALSE));
+    tests.push_back(TestBuilder(CScript() << OP_2 << ToByteVector(keys.pubkey1C) << ToByteVector(keys.pubkey2C) << OP_2 << OP_CHECKMULTISIG,
+                                "BIP66 example 9, with DERSIG", SCRIPT_VERIFY_DERSIG
+                               ).Num(0).Num(0).PushSig(keys.key2, SIGHASH_ALL, 33, 32).EditPush(1, "45022100", "440220").ScriptError(SCRIPT_ERR_SIG_DER));
+    tests.push_back(TestBuilder(CScript() << OP_2 << ToByteVector(keys.pubkey1C) << ToByteVector(keys.pubkey2C) << OP_2 << OP_CHECKMULTISIG << OP_NOT,
+                                "BIP66 example 10, without DERSIG", 0
+                               ).Num(0).Num(0).PushSig(keys.key2, SIGHASH_ALL, 33, 32).EditPush(1, "45022100", "440220"));
+    tests.push_back(TestBuilder(CScript() << OP_2 << ToByteVector(keys.pubkey1C) << ToByteVector(keys.pubkey2C) << OP_2 << OP_CHECKMULTISIG << OP_NOT,
+                                "BIP66 example 10, with DERSIG", SCRIPT_VERIFY_DERSIG
+                               ).Num(0).Num(0).PushSig(keys.key2, SIGHASH_ALL, 33, 32).EditPush(1, "45022100", "440220").ScriptError(SCRIPT_ERR_SIG_DER));
+    tests.push_back(TestBuilder(CScript() << OP_2 << ToByteVector(keys.pubkey1C) << ToByteVector(keys.pubkey2C) << OP_2 << OP_CHECKMULTISIG,
+                                "BIP66 example 11, without DERSIG", 0
+                               ).Num(0).PushSig(keys.key1, SIGHASH_ALL, 33, 32).EditPush(1, "45022100", "440220").Num(0).ScriptError(SCRIPT_ERR_EVAL_FALSE));
+    tests.push_back(TestBuilder(CScript() << OP_2 << ToByteVector(keys.pubkey1C) << ToByteVector(keys.pubkey2C) << OP_2 << OP_CHECKMULTISIG,
+                                "BIP66 example 11, with DERSIG", SCRIPT_VERIFY_DERSIG
+                               ).Num(0).PushSig(keys.key1, SIGHASH_ALL, 33, 32).EditPush(1, "45022100", "440220").Num(0).ScriptError(SCRIPT_ERR_EVAL_FALSE));
+    tests.push_back(TestBuilder(CScript() << OP_2 << ToByteVector(keys.pubkey1C) << ToByteVector(keys.pubkey2C) << OP_2 << OP_CHECKMULTISIG << OP_NOT,
+                                "BIP66 example 12, without DERSIG", 0
+                               ).Num(0).PushSig(keys.key1, SIGHASH_ALL, 33, 32).EditPush(1, "45022100", "440220").Num(0));
+    tests.push_back(TestBuilder(CScript() << OP_2 << ToByteVector(keys.pubkey1C) << ToByteVector(keys.pubkey2C) << OP_2 << OP_CHECKMULTISIG << OP_NOT,
+                                "BIP66 example 12, with DERSIG", SCRIPT_VERIFY_DERSIG
+                               ).Num(0).PushSig(keys.key1, SIGHASH_ALL, 33, 32).EditPush(1, "45022100", "440220").Num(0));
+    tests.push_back(TestBuilder(CScript() << ToByteVector(keys.pubkey2C) << OP_CHECKSIG,
+                                "P2PK with multi-byte hashtype, without DERSIG", 0
+                               ).PushSig(keys.key2, SIGHASH_ALL).EditPush(70, "01", "0101"));
+    tests.push_back(TestBuilder(CScript() << ToByteVector(keys.pubkey2C) << OP_CHECKSIG,
+                                "P2PK with multi-byte hashtype, with DERSIG", SCRIPT_VERIFY_DERSIG
+                               ).PushSig(keys.key2, SIGHASH_ALL).EditPush(70, "01", "0101").ScriptError(SCRIPT_ERR_SIG_DER));
+
+    tests.push_back(TestBuilder(CScript() << ToByteVector(keys.pubkey2C) << OP_CHECKSIG,
+                                "P2PK with high S but no LOW_S", 0
+                               ).PushSig(keys.key2, SIGHASH_ALL, 32, 33));
+    tests.push_back(TestBuilder(CScript() << ToByteVector(keys.pubkey2C) << OP_CHECKSIG,
+                                "P2PK with high S", SCRIPT_VERIFY_LOW_S
+                               ).PushSig(keys.key2, SIGHASH_ALL, 32, 33).ScriptError(SCRIPT_ERR_SIG_HIGH_S));
+
+    tests.push_back(TestBuilder(CScript() << ToByteVector(keys.pubkey0H) << OP_CHECKSIG,
+                                "P2PK with hybrid pubkey but no STRICTENC", 0
+                               ).PushSig(keys.key0, SIGHASH_ALL));
+    tests.push_back(TestBuilder(CScript() << ToByteVector(keys.pubkey0H) << OP_CHECKSIG,
+                                "P2PK with hybrid pubkey", SCRIPT_VERIFY_STRICTENC
+                               ).PushSig(keys.key0, SIGHASH_ALL).ScriptError(SCRIPT_ERR_PUBKEYTYPE));
+    tests.push_back(TestBuilder(CScript() << ToByteVector(keys.pubkey0H) << OP_CHECKSIG << OP_NOT,
+                                "P2PK NOT with hybrid pubkey but no STRICTENC", 0
+                               ).PushSig(keys.key0, SIGHASH_ALL).ScriptError(SCRIPT_ERR_EVAL_FALSE));
+    tests.push_back(TestBuilder(CScript() << ToByteVector(keys.pubkey0H) << OP_CHECKSIG << OP_NOT,
+                                "P2PK NOT with hybrid pubkey", SCRIPT_VERIFY_STRICTENC
+                               ).PushSig(keys.key0, SIGHASH_ALL).ScriptError(SCRIPT_ERR_PUBKEYTYPE));
+    tests.push_back(TestBuilder(CScript() << ToByteVector(keys.pubkey0H) << OP_CHECKSIG << OP_NOT,
+                                "P2PK NOT with invalid hybrid pubkey but no STRICTENC", 0
+                               ).PushSig(keys.key0, SIGHASH_ALL).DamagePush(10));
+    tests.push_back(TestBuilder(CScript() << ToByteVector(keys.pubkey0H) << OP_CHECKSIG << OP_NOT,
+                                "P2PK NOT with invalid hybrid pubkey", SCRIPT_VERIFY_STRICTENC
+                               ).PushSig(keys.key0, SIGHASH_ALL).DamagePush(10).ScriptError(SCRIPT_ERR_PUBKEYTYPE));
+    tests.push_back(TestBuilder(CScript() << OP_1 << ToByteVector(keys.pubkey0H) << ToByteVector(keys.pubkey1C) << OP_2 << OP_CHECKMULTISIG,
+                                "1-of-2 with the second 1 hybrid pubkey and no STRICTENC", 0
+                               ).Num(0).PushSig(keys.key1, SIGHASH_ALL));
+    tests.push_back(TestBuilder(CScript() << OP_1 << ToByteVector(keys.pubkey0H) << ToByteVector(keys.pubkey1C) << OP_2 << OP_CHECKMULTISIG,
+                                "1-of-2 with the second 1 hybrid pubkey", SCRIPT_VERIFY_STRICTENC
+                               ).Num(0).PushSig(keys.key1, SIGHASH_ALL));
+    tests.push_back(TestBuilder(CScript() << OP_1 << ToByteVector(keys.pubkey1C) << ToByteVector(keys.pubkey0H) << OP_2 << OP_CHECKMULTISIG,
+                                "1-of-2 with the first 1 hybrid pubkey", SCRIPT_VERIFY_STRICTENC
+                               ).Num(0).PushSig(keys.key1, SIGHASH_ALL).ScriptError(SCRIPT_ERR_PUBKEYTYPE));
+
+    tests.push_back(TestBuilder(CScript() << ToByteVector(keys.pubkey1) << OP_CHECKSIG,
+                                "P2PK with undefined hashtype but no STRICTENC", 0
+                               ).PushSig(keys.key1, 5));
+    tests.push_back(TestBuilder(CScript() << ToByteVector(keys.pubkey1) << OP_CHECKSIG,
+                                "P2PK with undefined hashtype", SCRIPT_VERIFY_STRICTENC
+                               ).PushSig(keys.key1, 5).ScriptError(SCRIPT_ERR_SIG_HASHTYPE));
+    tests.push_back(TestBuilder(CScript() << ToByteVector(keys.pubkey1) << OP_CHECKSIG << OP_NOT,
+                                "P2PK NOT with invalid sig and undefined hashtype but no STRICTENC", 0
+                               ).PushSig(keys.key1, 5).DamagePush(10));
+    tests.push_back(TestBuilder(CScript() << ToByteVector(keys.pubkey1) << OP_CHECKSIG << OP_NOT,
+                                "P2PK NOT with invalid sig and undefined hashtype", SCRIPT_VERIFY_STRICTENC
+                               ).PushSig(keys.key1, 5).DamagePush(10).ScriptError(SCRIPT_ERR_SIG_HASHTYPE));
+
+    tests.push_back(TestBuilder(CScript() << OP_3 << ToByteVector(keys.pubkey0C) << ToByteVector(keys.pubkey1C) << ToByteVector(keys.pubkey2C) << OP_3 << OP_CHECKMULTISIG,
+                                "3-of-3 with nonzero dummy but no NULLDUMMY", 0
+                               ).Num(1).PushSig(keys.key0).PushSig(keys.key1).PushSig(keys.key2));
+    tests.push_back(TestBuilder(CScript() << OP_3 << ToByteVector(keys.pubkey0C) << ToByteVector(keys.pubkey1C) << ToByteVector(keys.pubkey2C) << OP_3 << OP_CHECKMULTISIG,
+                                "3-of-3 with nonzero dummy", SCRIPT_VERIFY_NULLDUMMY
+                               ).Num(1).PushSig(keys.key0).PushSig(keys.key1).PushSig(keys.key2).ScriptError(SCRIPT_ERR_SIG_NULLDUMMY));
+    tests.push_back(TestBuilder(CScript() << OP_3 << ToByteVector(keys.pubkey0C) << ToByteVector(keys.pubkey1C) << ToByteVector(keys.pubkey2C) << OP_3 << OP_CHECKMULTISIG << OP_NOT,
+                                "3-of-3 NOT with invalid sig and nonzero dummy but no NULLDUMMY", 0
+                               ).Num(1).PushSig(keys.key0).PushSig(keys.key1).PushSig(keys.key2).DamagePush(10));
+    tests.push_back(TestBuilder(CScript() << OP_3 << ToByteVector(keys.pubkey0C) << ToByteVector(keys.pubkey1C) << ToByteVector(keys.pubkey2C) << OP_3 << OP_CHECKMULTISIG << OP_NOT,
+                                "3-of-3 NOT with invalid sig with nonzero dummy", SCRIPT_VERIFY_NULLDUMMY
+                               ).Num(1).PushSig(keys.key0).PushSig(keys.key1).PushSig(keys.key2).DamagePush(10).ScriptError(SCRIPT_ERR_SIG_NULLDUMMY));
+
+    tests.push_back(TestBuilder(CScript() << OP_2 << ToByteVector(keys.pubkey1C) << ToByteVector(keys.pubkey1C) << OP_2 << OP_CHECKMULTISIG,
+                                "2-of-2 with two identical keys and sigs pushed using OP_DUP but no SIGPUSHONLY", 0
+                               ).Num(0).PushSig(keys.key1).Add(CScript() << OP_DUP));
+    tests.push_back(TestBuilder(CScript() << OP_2 << ToByteVector(keys.pubkey1C) << ToByteVector(keys.pubkey1C) << OP_2 << OP_CHECKMULTISIG,
+                                "2-of-2 with two identical keys and sigs pushed using OP_DUP", SCRIPT_VERIFY_SIGPUSHONLY
+                               ).Num(0).PushSig(keys.key1).Add(CScript() << OP_DUP).ScriptError(SCRIPT_ERR_SIG_PUSHONLY));
+    tests.push_back(TestBuilder(CScript() << ToByteVector(keys.pubkey2C) << OP_CHECKSIG,
+                                "P2SH(P2PK) with non-push scriptSig but no P2SH or SIGPUSHONLY", 0, true
+                               ).PushSig(keys.key2).Add(CScript() << OP_NOP8).PushRedeem());
+    tests.push_back(TestBuilder(CScript() << ToByteVector(keys.pubkey2C) << OP_CHECKSIG,
+                                "P2PK with non-push scriptSig but with P2SH validation", 0
+                               ).PushSig(keys.key2).Add(CScript() << OP_NOP8));
+    tests.push_back(TestBuilder(CScript() << ToByteVector(keys.pubkey2C) << OP_CHECKSIG,
+                                "P2SH(P2PK) with non-push scriptSig but no SIGPUSHONLY", SCRIPT_VERIFY_P2SH, true
+                               ).PushSig(keys.key2).Add(CScript() << OP_NOP8).PushRedeem().ScriptError(SCRIPT_ERR_SIG_PUSHONLY));
+    tests.push_back(TestBuilder(CScript() << ToByteVector(keys.pubkey2C) << OP_CHECKSIG,
+                                "P2SH(P2PK) with non-push scriptSig but not P2SH", SCRIPT_VERIFY_SIGPUSHONLY, true
+                               ).PushSig(keys.key2).Add(CScript() << OP_NOP8).PushRedeem().ScriptError(SCRIPT_ERR_SIG_PUSHONLY));
+    tests.push_back(TestBuilder(CScript() << OP_2 << ToByteVector(keys.pubkey1C) << ToByteVector(keys.pubkey1C) << OP_2 << OP_CHECKMULTISIG,
+                                "2-of-2 with two identical keys and sigs pushed", SCRIPT_VERIFY_SIGPUSHONLY
+                               ).Num(0).PushSig(keys.key1).PushSig(keys.key1));
+    tests.push_back(TestBuilder(CScript() << ToByteVector(keys.pubkey0) << OP_CHECKSIG,
+                                "P2PK with unnecessary input but no CLEANSTACK", SCRIPT_VERIFY_P2SH
+                               ).Num(11).PushSig(keys.key0));
+    tests.push_back(TestBuilder(CScript() << ToByteVector(keys.pubkey0) << OP_CHECKSIG,
+                                "P2PK with unnecessary input", SCRIPT_VERIFY_CLEANSTACK | SCRIPT_VERIFY_P2SH
+                               ).Num(11).PushSig(keys.key0).ScriptError(SCRIPT_ERR_CLEANSTACK));
+    tests.push_back(TestBuilder(CScript() << ToByteVector(keys.pubkey0) << OP_CHECKSIG,
+                                "P2SH with unnecessary input but no CLEANSTACK", SCRIPT_VERIFY_P2SH, true
+                               ).Num(11).PushSig(keys.key0).PushRedeem());
+    tests.push_back(TestBuilder(CScript() << ToByteVector(keys.pubkey0) << OP_CHECKSIG,
+                                "P2SH with unnecessary input", SCRIPT_VERIFY_CLEANSTACK | SCRIPT_VERIFY_P2SH, true
+                               ).Num(11).PushSig(keys.key0).PushRedeem().ScriptError(SCRIPT_ERR_CLEANSTACK));
+    tests.push_back(TestBuilder(CScript() << ToByteVector(keys.pubkey0) << OP_CHECKSIG,
+                                "P2SH with CLEANSTACK", SCRIPT_VERIFY_CLEANSTACK | SCRIPT_VERIFY_P2SH, true
+                               ).PushSig(keys.key0).PushRedeem());
+
+
+    std::set<std::string> tests_set;
 
     {
-        UniValue json_good = read_json(std::string(json_tests::script_valid, json_tests::script_valid + sizeof(json_tests::script_valid)));
-        UniValue json_bad = read_json(std::string(json_tests::script_invalid, json_tests::script_invalid + sizeof(json_tests::script_invalid)));
+        UniValue json_tests = read_json(std::string(json_tests::script_tests, json_tests::script_tests + sizeof(json_tests::script_tests)));
 
-        for (unsigned int idx = 0; idx < json_good.size(); idx++) {
-            const UniValue& tv = json_good[idx];
-            tests_good.insert(JSONPrettyPrint(tv.get_array()));
-        }
-        for (unsigned int idx = 0; idx < json_bad.size(); idx++) {
-            const UniValue& tv = json_bad[idx];
-            tests_bad.insert(JSONPrettyPrint(tv.get_array()));
+        for (unsigned int idx = 0; idx < json_tests.size(); idx++) {
+            const UniValue& tv = json_tests[idx];
+            tests_set.insert(JSONPrettyPrint(tv.get_array()));
         }
     }
 
-    std::string strGood;
-    std::string strBad;
+    std::string strGen;
 
-    BOOST_FOREACH(TestBuilder& test, good) {
+    BOOST_FOREACH(TestBuilder& test, tests) {
         test.Test();
         std::string str = JSONPrettyPrint(test.GetJSON());
 #ifndef UPDATE_JSON_TESTS
-        if (tests_good.count(str) == 0) {
+        if (tests_set.count(str) == 0) {
             BOOST_CHECK_MESSAGE(false, "Missing auto script_valid test: " + test.GetComment());
         }
 #endif
-        strGood += str + ",\n";
-    }
-    BOOST_FOREACH(TestBuilder& test, bad) {
-        test.Test();
-        std::string str = JSONPrettyPrint(test.GetJSON());
-#ifndef UPDATE_JSON_TESTS
-        if (tests_bad.count(str) == 0) {
-            BOOST_CHECK_MESSAGE(false, "Missing auto script_invalid test: " + test.GetComment());
-        }
-#endif
-        strBad += str + ",\n";
+        strGen += str + ",\n";
     }
 
 #ifdef UPDATE_JSON_TESTS
-    FILE* valid = fopen("script_valid.json.gen", "w");
-    fputs(strGood.c_str(), valid);
-    fclose(valid);
-    FILE* invalid = fopen("script_invalid.json.gen", "w");
-    fputs(strBad.c_str(), invalid);
-    fclose(invalid);
+    FILE* file = fopen("script_tests.json.gen", "w");
+    fputs(strGen.c_str(), file);
+    fclose(file);
 #endif
 }
 
-BOOST_AUTO_TEST_CASE(script_valid)
+BOOST_AUTO_TEST_CASE(script_json_test)
 {
-    // Read tests from test/data/script_valid.json
+    // Read tests from test/data/script_tests.json
     // Format is an array of arrays
     // Inner arrays are [ "scriptSig", "scriptPubKey", "flags", "expected_scripterror" ]
     // ... where scriptSig and scriptPubKey are stringified
     // scripts.
-    UniValue tests = read_json(std::string(json_tests::script_valid, json_tests::script_valid + sizeof(json_tests::script_valid)));
-
-    for (unsigned int idx = 0; idx < tests.size(); idx++) {
-        UniValue test = tests[idx];
-        string strTest = test.write();
-        if (test.size() < 3) // Allow size > 3; extra stuff ignored (useful for comments)
-        {
-            if (test.size() != 1) {
-                BOOST_ERROR("Bad test: " << strTest);
-            }
-            continue;
-        }
-        string scriptSigString = test[0].get_str();
-        CScript scriptSig = ParseScript(scriptSigString);
-        string scriptPubKeyString = test[1].get_str();
-        CScript scriptPubKey = ParseScript(scriptPubKeyString);
-        unsigned int scriptflags = ParseScriptFlags(test[2].get_str());
-        BOOST_CHECK_EQUAL(test[3].get_str(), "OK");
-
-        DoTest(scriptPubKey, scriptSig, scriptflags, strTest, SCRIPT_ERR_OK);
-    }
-}
+    UniValue tests = read_json(std::string(json_tests::script_tests, json_tests::script_tests + sizeof(json_tests::script_tests)));
 
-BOOST_AUTO_TEST_CASE(script_invalid)
-{
-    // Scripts that should evaluate as invalid
-    UniValue tests = read_json(std::string(json_tests::script_invalid, json_tests::script_invalid + sizeof(json_tests::script_invalid)));
     for (unsigned int idx = 0; idx < tests.size(); idx++) {
         UniValue test = tests[idx];
         string strTest = test.write();
-        if (test.size() < 4) // Allow size > 2; extra stuff ignored (useful for comments)
+        if (test.size() < 4) // Allow size > 3; extra stuff ignored (useful for comments)
         {
             if (test.size() != 1) {
                 BOOST_ERROR("Bad test: " << strTest);

From f20d42ed2b1b8de9c41525f96c40b172ab82ec99 Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Sun, 3 Apr 2016 12:08:14 +0200
Subject: [PATCH 0102/1802] UpdateTip: log only one line at most per block

Avoid logging two or more lines per block in UpdateTip by
adding the warning into the UpdateTip log message.
---
 src/main.cpp | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index 2c0b3bfee7aa6..1044c3556b8a3 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -40,6 +40,7 @@
 #include <sstream>
 
 #include <boost/algorithm/string/replace.hpp>
+#include <boost/algorithm/string/join.hpp>
 #include <boost/filesystem.hpp>
 #include <boost/filesystem/fstream.hpp>
 #include <boost/math/distributions/poisson.hpp>
@@ -2555,16 +2556,10 @@ void static UpdateTip(CBlockIndex *pindexNew) {
     nTimeBestReceived = GetTime();
     mempool.AddTransactionsUpdated(1);
 
-    LogPrintf("%s: new best=%s height=%d version=0x%08x log2_work=%.8g tx=%lu date='%s' progress=%f cache=%.1fMiB(%utx)\n", __func__,
-      chainActive.Tip()->GetBlockHash().ToString(), chainActive.Height(), chainActive.Tip()->nVersion,
-      log(chainActive.Tip()->nChainWork.getdouble())/log(2.0), (unsigned long)chainActive.Tip()->nChainTx,
-      DateTimeStrFormat("%Y-%m-%d %H:%M:%S", chainActive.Tip()->GetBlockTime()),
-      Checkpoints::GuessVerificationProgress(chainParams.Checkpoints(), chainActive.Tip()), pcoinsTip->DynamicMemoryUsage() * (1.0 / (1<<20)), pcoinsTip->GetCacheSize());
-
     cvBlockChange.notify_all();
 
-    // Check the version of the last 100 blocks to see if we need to upgrade:
     static bool fWarned = false;
+    std::vector<std::string> warningMessages;
     if (!IsInitialBlockDownload())
     {
         int nUpgraded = 0;
@@ -2580,10 +2575,11 @@ void static UpdateTip(CBlockIndex *pindexNew) {
                         fWarned = true;
                     }
                 } else {
-                    LogPrintf("%s: unknown new rules are about to activate (versionbit %i)\n", __func__, bit);
+                    warningMessages.push_back(strprintf("unknown new rules are about to activate (versionbit %i)", bit));
                 }
             }
         }
+        // Check the version of the last 100 blocks to see if we need to upgrade:
         for (int i = 0; i < 100 && pindex != NULL; i++)
         {
             int32_t nExpectedVersion = ComputeBlockVersion(pindex->pprev, chainParams.GetConsensus());
@@ -2592,7 +2588,7 @@ void static UpdateTip(CBlockIndex *pindexNew) {
             pindex = pindex->pprev;
         }
         if (nUpgraded > 0)
-            LogPrintf("%s: %d of last 100 blocks have unexpected version\n", __func__, nUpgraded);
+            warningMessages.push_back(strprintf("%d of last 100 blocks have unexpected version", nUpgraded));
         if (nUpgraded > 100/2)
         {
             // strMiscWarning is read by GetWarnings(), called by Qt and the JSON-RPC code to warn the user:
@@ -2603,6 +2599,15 @@ void static UpdateTip(CBlockIndex *pindexNew) {
             }
         }
     }
+    LogPrintf("%s: new best=%s height=%d version=0x%08x log2_work=%.8g tx=%lu date='%s' progress=%f cache=%.1fMiB(%utx)", __func__,
+      chainActive.Tip()->GetBlockHash().ToString(), chainActive.Height(), chainActive.Tip()->nVersion,
+      log(chainActive.Tip()->nChainWork.getdouble())/log(2.0), (unsigned long)chainActive.Tip()->nChainTx,
+      DateTimeStrFormat("%Y-%m-%d %H:%M:%S", chainActive.Tip()->GetBlockTime()),
+      Checkpoints::GuessVerificationProgress(chainParams.Checkpoints(), chainActive.Tip()), pcoinsTip->DynamicMemoryUsage() * (1.0 / (1<<20)), pcoinsTip->GetCacheSize());
+    if (!warningMessages.empty())
+        LogPrintf(" warning='%s'", boost::algorithm::join(warningMessages, ", "));
+    LogPrintf("\n");
+
 }
 
 /** Disconnect chainActive's tip. You probably want to call mempool.removeForReorg and manually re-limit mempool size after this, with cs_main held. */

From eda3d9248971a1c3df6e6c4b23ba89be30508b51 Mon Sep 17 00:00:00 2001
From: mruddy <mruddy@users.noreply.github.com>
Date: Tue, 5 Apr 2016 22:26:38 +0000
Subject: [PATCH 0103/1802] Net: Add IPv6 Link-Local Address Support

---
 src/netbase.cpp | 10 +++++++---
 src/netbase.h   |  3 ++-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/netbase.cpp b/src/netbase.cpp
index 7f79dd02c6052..281c6bcb7fe79 100644
--- a/src/netbase.cpp
+++ b/src/netbase.cpp
@@ -170,7 +170,8 @@ bool static LookupIntern(const char *pszName, std::vector<CNetAddr>& vIP, unsign
         if (aiTrav->ai_family == AF_INET6)
         {
             assert(aiTrav->ai_addrlen >= sizeof(sockaddr_in6));
-            vIP.push_back(CNetAddr(((struct sockaddr_in6*)(aiTrav->ai_addr))->sin6_addr));
+            struct sockaddr_in6* s6 = (struct sockaddr_in6*) aiTrav->ai_addr;
+            vIP.push_back(CNetAddr(s6->sin6_addr, s6->sin6_scope_id));
         }
 
         aiTrav = aiTrav->ai_next;
@@ -629,6 +630,7 @@ bool ConnectSocketByName(CService &addr, SOCKET& hSocketRet, const char *pszDest
 void CNetAddr::Init()
 {
     memset(ip, 0, sizeof(ip));
+    scopeId = 0;
 }
 
 void CNetAddr::SetIP(const CNetAddr& ipIn)
@@ -678,9 +680,10 @@ CNetAddr::CNetAddr(const struct in_addr& ipv4Addr)
     SetRaw(NET_IPV4, (const uint8_t*)&ipv4Addr);
 }
 
-CNetAddr::CNetAddr(const struct in6_addr& ipv6Addr)
+CNetAddr::CNetAddr(const struct in6_addr& ipv6Addr, const uint32_t scope)
 {
     SetRaw(NET_IPV6, (const uint8_t*)&ipv6Addr);
+    scopeId = scope;
 }
 
 CNetAddr::CNetAddr(const char *pszIp, bool fAllowLookup)
@@ -1099,7 +1102,7 @@ CService::CService(const struct sockaddr_in& addr) : CNetAddr(addr.sin_addr), po
     assert(addr.sin_family == AF_INET);
 }
 
-CService::CService(const struct sockaddr_in6 &addr) : CNetAddr(addr.sin6_addr), port(ntohs(addr.sin6_port))
+CService::CService(const struct sockaddr_in6 &addr) : CNetAddr(addr.sin6_addr, addr.sin6_scope_id), port(ntohs(addr.sin6_port))
 {
    assert(addr.sin6_family == AF_INET6);
 }
@@ -1192,6 +1195,7 @@ bool CService::GetSockAddr(struct sockaddr* paddr, socklen_t *addrlen) const
         memset(paddrin6, 0, *addrlen);
         if (!GetIn6Addr(&paddrin6->sin6_addr))
             return false;
+        paddrin6->sin6_scope_id = scopeId;
         paddrin6->sin6_family = AF_INET6;
         paddrin6->sin6_port = htons(port);
         return true;
diff --git a/src/netbase.h b/src/netbase.h
index 1db66ac27f2da..db736154fa684 100644
--- a/src/netbase.h
+++ b/src/netbase.h
@@ -44,6 +44,7 @@ class CNetAddr
 {
     protected:
         unsigned char ip[16]; // in network byte order
+        uint32_t scopeId; // for scoped/link-local ipv6 addresses
 
     public:
         CNetAddr();
@@ -89,7 +90,7 @@ class CNetAddr
         std::vector<unsigned char> GetGroup() const;
         int GetReachabilityFrom(const CNetAddr *paddrPartner = NULL) const;
 
-        CNetAddr(const struct in6_addr& pipv6Addr);
+        CNetAddr(const struct in6_addr& pipv6Addr, const uint32_t scope = 0);
         bool GetIn6Addr(struct in6_addr* pipv6Addr) const;
 
         friend bool operator==(const CNetAddr& a, const CNetAddr& b);

From 07398e8e9d2ef807e63abd0978a6e98549bdf271 Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Wed, 6 Apr 2016 10:27:51 +0200
Subject: [PATCH 0104/1802] init: allow shutdown during 'Activating best
 chain...'

Two-line patch to make it possible to shut down bitcoind cleanly during
the initial ActivateBestChain.

Fixes #6459 (among other complaints).

To reproduce:

- shutdown bitcoind
- copy chainstate
- start bitcoind
- let the chain sync a bit
- shutdown bitcoind
- copy back old chainstate
- start bitcoind
- bitcoind will catch up with all blocks during Init()

(the `boost::this_thread::interruption_point` / `ShutdownRequested()`
dance is ugly, this should be refactored all over bitcoind at some point
when moving from boost::threads to c++11 threads, but it works...)
---
 src/main.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/main.cpp b/src/main.cpp
index b68c6affae7f9..c1137c9b1f369 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -2877,6 +2877,8 @@ bool ActivateBestChain(CValidationState &state, const CChainParams& chainparams,
     CBlockIndex *pindexMostWork = NULL;
     do {
         boost::this_thread::interruption_point();
+        if (ShutdownRequested())
+            break;
 
         CBlockIndex *pindexNewTip = NULL;
         const CBlockIndex *pindexFork;

From 4f7c959af1672f9f51122867dca48ac4fa454d75 Mon Sep 17 00:00:00 2001
From: Jonas Schnelli <dev@jonasschnelli.ch>
Date: Tue, 5 Apr 2016 14:20:49 +0200
Subject: [PATCH 0105/1802] Refactor IsRBFOptIn, avoid exception

---
 src/policy/rbf.cpp       | 15 ++++++++-------
 src/policy/rbf.h         |  8 +++++++-
 src/wallet/rpcwallet.cpp | 12 ++++--------
 3 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/src/policy/rbf.cpp b/src/policy/rbf.cpp
index 98b1a1ba4c735..133cff611d34b 100644
--- a/src/policy/rbf.cpp
+++ b/src/policy/rbf.cpp
@@ -14,33 +14,34 @@ bool SignalsOptInRBF(const CTransaction &tx)
     return false;
 }
 
-bool IsRBFOptIn(const CTxMemPoolEntry &entry, CTxMemPool &pool)
+RBFTransactionState IsRBFOptIn(const CTransaction &tx, CTxMemPool &pool)
 {
     AssertLockHeld(pool.cs);
 
     CTxMemPool::setEntries setAncestors;
 
     // First check the transaction itself.
-    if (SignalsOptInRBF(entry.GetTx())) {
-        return true;
+    if (SignalsOptInRBF(tx)) {
+        return RBF_TRANSACTIONSTATE_REPLACEABLE_BIP125;
     }
 
     // If this transaction is not in our mempool, then we can't be sure
     // we will know about all its inputs.
-    if (!pool.exists(entry.GetTx().GetHash())) {
-        throw std::runtime_error("Cannot determine RBF opt-in signal for non-mempool transaction\n");
+    if (!pool.exists(tx.GetHash())) {
+        return RBF_TRANSACTIONSTATE_UNKNOWN;
     }
 
     // If all the inputs have nSequence >= maxint-1, it still might be
     // signaled for RBF if any unconfirmed parents have signaled.
     uint64_t noLimit = std::numeric_limits<uint64_t>::max();
     std::string dummy;
+    CTxMemPoolEntry entry = *pool.mapTx.find(tx.GetHash());
     pool.CalculateMemPoolAncestors(entry, setAncestors, noLimit, noLimit, noLimit, noLimit, dummy, false);
 
     BOOST_FOREACH(CTxMemPool::txiter it, setAncestors) {
         if (SignalsOptInRBF(it->GetTx())) {
-            return true;
+            return RBF_TRANSACTIONSTATE_REPLACEABLE_BIP125;
         }
     }
-    return false;
+    return RBF_TRANSACTIONSTATE_FINAL;
 }
diff --git a/src/policy/rbf.h b/src/policy/rbf.h
index 925ce0d9bd14a..5a711dba07370 100644
--- a/src/policy/rbf.h
+++ b/src/policy/rbf.h
@@ -7,6 +7,12 @@
 
 #include "txmempool.h"
 
+enum RBFTransactionState {
+    RBF_TRANSACTIONSTATE_UNKNOWN,
+    RBF_TRANSACTIONSTATE_REPLACEABLE_BIP125,
+    RBF_TRANSACTIONSTATE_FINAL
+};
+
 // Check whether the sequence numbers on this transaction are signaling
 // opt-in to replace-by-fee, according to BIP 125
 bool SignalsOptInRBF(const CTransaction &tx);
@@ -15,6 +21,6 @@ bool SignalsOptInRBF(const CTransaction &tx);
 // according to BIP 125
 // This involves checking sequence numbers of the transaction, as well
 // as the sequence numbers of all in-mempool ancestors.
-bool IsRBFOptIn(const CTxMemPoolEntry &entry, CTxMemPool &pool);
+RBFTransactionState IsRBFOptIn(const CTransaction &tx, CTxMemPool &pool);
 
 #endif // BITCOIN_POLICY_RBF_H
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index 61c9846e114b3..5511e9d3aba41 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -82,15 +82,11 @@ void WalletTxToJSON(const CWalletTx& wtx, UniValue& entry)
     std::string rbfStatus = "no";
     if (confirms <= 0) {
         LOCK(mempool.cs);
-        if (!mempool.exists(hash)) {
-            if (SignalsOptInRBF(wtx)) {
-                rbfStatus = "yes";
-            } else {
-                rbfStatus = "unknown";
-            }
-        } else if (IsRBFOptIn(*mempool.mapTx.find(hash), mempool)) {
+        RBFTransactionState rbfState = IsRBFOptIn(wtx, mempool);
+        if (rbfState == RBF_TRANSACTIONSTATE_UNKNOWN)
+            rbfStatus = "unknown";
+        else if (rbfState == RBF_TRANSACTIONSTATE_REPLACEABLE_BIP125)
             rbfStatus = "yes";
-        }
     }
     entry.push_back(Pair("bip125-replaceable", rbfStatus));
 

From 9f7336b4575b15193151dbf08b09562529a24363 Mon Sep 17 00:00:00 2001
From: Jonas Schnelli <dev@jonasschnelli.ch>
Date: Tue, 5 Apr 2016 10:45:11 +0200
Subject: [PATCH 0106/1802] [Wallet] slightly refactor GetOldestKeyPoolTime()

---
 src/wallet/wallet.cpp | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index e8c946671044c..15b9af852b6f3 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -2611,12 +2611,19 @@ bool CWallet::GetKeyFromPool(CPubKey& result)
 
 int64_t CWallet::GetOldestKeyPoolTime()
 {
-    int64_t nIndex = 0;
-    CKeyPool keypool;
-    ReserveKeyFromKeyPool(nIndex, keypool);
-    if (nIndex == -1)
+    LOCK(cs_wallet);
+
+    // if the keypool is empty, return <NOW>
+    if (setKeyPool.empty())
         return GetTime();
-    ReturnKey(nIndex);
+
+    // load oldest key from keypool, get time and return
+    CKeyPool keypool;
+    CWalletDB walletdb(strWalletFile);
+    int64_t nIndex = *(setKeyPool.begin());
+    if (!walletdb.ReadPool(nIndex, keypool))
+        throw runtime_error("GetOldestKeyPoolTime(): read oldest key in keypool failed");
+    assert(keypool.vchPubKey.IsValid());
     return keypool.nTime;
 }
 

From bf477bcc794360c145156c9e8f155e0215f70dd3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jorge=20Tim=C3=B3n?= <jtimon@jtimon.cc>
Date: Wed, 6 Apr 2016 16:00:25 +0200
Subject: [PATCH 0107/1802] Trivial: Globals: Explicitly pass const
 CChainParams& to ProcessMessage()

---
 src/main.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index b68c6affae7f9..4e94ab780999d 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -4475,9 +4475,8 @@ void static ProcessGetData(CNode* pfrom, const Consensus::Params& consensusParam
     }
 }
 
-bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv, int64_t nTimeReceived)
+bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv, int64_t nTimeReceived, const CChainParams& chainparams)
 {
-    const CChainParams& chainparams = Params();
     RandAddSeedPerfmon();
     LogPrint("net", "received: %s (%u bytes) peer=%d\n", SanitizeString(strCommand), vRecv.size(), pfrom->id);
     if (mapArgs.count("-dropmessagestest") && GetRand(atoi(mapArgs["-dropmessagestest"])) == 0)
@@ -5487,7 +5486,7 @@ bool ProcessMessages(CNode* pfrom)
         bool fRet = false;
         try
         {
-            fRet = ProcessMessage(pfrom, strCommand, vRecv, msg.nTime);
+            fRet = ProcessMessage(pfrom, strCommand, vRecv, msg.nTime, chainparams);
             boost::this_thread::interruption_point();
         }
         catch (const std::ios_base::failure& e)

From 2d1d6581eca4508838cd339cc19c72efc42d6ea0 Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Sun, 3 Apr 2016 15:24:09 +0200
Subject: [PATCH 0108/1802] Track block download times per individual block

Currently, we're keeping a timeout for each requested block, starting
from when it is requested, with a correction factor for the number of
blocks in the queue.

That's unnecessarily complicated and inaccurate.

As peers process block requests in order, we can make the timeout for each
block start counting only when all previous ones have been received, and
have a correction based on the number of peers, rather than the total number
of blocks.
---
 src/main.cpp | 60 +++++++++++++++++++++++++---------------------------
 src/main.h   |  4 ++++
 2 files changed, 33 insertions(+), 31 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index b68c6affae7f9..de74593bb1858 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -195,15 +195,10 @@ namespace {
     struct QueuedBlock {
         uint256 hash;
         CBlockIndex* pindex;     //!< Optional.
-        int64_t nTime;           //!< Time of "getdata" request in microseconds.
         bool fValidatedHeaders;  //!< Whether this block has validated headers at the time of request.
-        int64_t nTimeDisconnect; //!< The timeout for this block request (for disconnecting a slow peer)
     };
     map<uint256, pair<NodeId, list<QueuedBlock>::iterator> > mapBlocksInFlight;
 
-    /** Number of blocks in flight with validated headers. */
-    int nQueuedValidatedHeaders = 0;
-
     /** Number of preferable block download peers. */
     int nPreferredDownload = 0;
 
@@ -212,6 +207,9 @@ namespace {
 
     /** Dirty block file entries. */
     set<int> setDirtyFileInfo;
+
+    /** Number of peers from which we're downloading blocks. */
+    int nPeersWithValidatedDownloads = 0;
 } // anon namespace
 
 //////////////////////////////////////////////////////////////////////////////
@@ -259,6 +257,8 @@ struct CNodeState {
     //! Since when we're stalling block download progress (in microseconds), or 0.
     int64_t nStallingSince;
     list<QueuedBlock> vBlocksInFlight;
+    //! When the first entry in vBlocksInFlight started downloading. Don't care when vBlocksInFlight is empty.
+    int64_t nDownloadingSince;
     int nBlocksInFlight;
     int nBlocksInFlightValidHeaders;
     //! Whether we consider this a preferred download peer.
@@ -276,6 +276,7 @@ struct CNodeState {
         pindexBestHeaderSent = NULL;
         fSyncStarted = false;
         nStallingSince = 0;
+        nDownloadingSince = 0;
         nBlocksInFlight = 0;
         nBlocksInFlightValidHeaders = 0;
         fPreferredDownload = false;
@@ -310,12 +311,6 @@ void UpdatePreferredDownload(CNode* node, CNodeState* state)
     nPreferredDownload += state->fPreferredDownload;
 }
 
-// Returns time at which to timeout block request (nTime in microseconds)
-int64_t GetBlockTimeout(int64_t nTime, int nValidatedQueuedBefore, const Consensus::Params &consensusParams)
-{
-    return nTime + 500000 * consensusParams.nPowTargetSpacing * (4 + nValidatedQueuedBefore);
-}
-
 void InitializeNode(NodeId nodeid, const CNode *pnode) {
     LOCK(cs_main);
     CNodeState &state = mapNodeState.insert(std::make_pair(nodeid, CNodeState())).first->second;
@@ -335,11 +330,12 @@ void FinalizeNode(NodeId nodeid) {
     }
 
     BOOST_FOREACH(const QueuedBlock& entry, state->vBlocksInFlight) {
-        nQueuedValidatedHeaders -= entry.fValidatedHeaders;
         mapBlocksInFlight.erase(entry.hash);
     }
     EraseOrphansFor(nodeid);
     nPreferredDownload -= state->fPreferredDownload;
+    nPeersWithValidatedDownloads -= (state->nBlocksInFlightValidHeaders != 0);
+    assert(nPeersWithValidatedDownloads >= 0);
 
     mapNodeState.erase(nodeid);
 }
@@ -350,8 +346,15 @@ bool MarkBlockAsReceived(const uint256& hash) {
     map<uint256, pair<NodeId, list<QueuedBlock>::iterator> >::iterator itInFlight = mapBlocksInFlight.find(hash);
     if (itInFlight != mapBlocksInFlight.end()) {
         CNodeState *state = State(itInFlight->second.first);
-        nQueuedValidatedHeaders -= itInFlight->second.second->fValidatedHeaders;
         state->nBlocksInFlightValidHeaders -= itInFlight->second.second->fValidatedHeaders;
+        if (state->nBlocksInFlightValidHeaders == 0 && itInFlight->second.second->fValidatedHeaders) {
+            // Last validated block on the queue was received.
+            nPeersWithValidatedDownloads--;
+        }
+        if (state->vBlocksInFlight.begin() == itInFlight->second.second) {
+            // First block on the queue was received, update the start download time for the next one
+            state->nDownloadingSince = std::max(state->nDownloadingSince, GetTimeMicros());
+        }
         state->vBlocksInFlight.erase(itInFlight->second.second);
         state->nBlocksInFlight--;
         state->nStallingSince = 0;
@@ -369,12 +372,17 @@ void MarkBlockAsInFlight(NodeId nodeid, const uint256& hash, const Consensus::Pa
     // Make sure it's not listed somewhere already.
     MarkBlockAsReceived(hash);
 
-    int64_t nNow = GetTimeMicros();
-    QueuedBlock newentry = {hash, pindex, nNow, pindex != NULL, GetBlockTimeout(nNow, nQueuedValidatedHeaders, consensusParams)};
-    nQueuedValidatedHeaders += newentry.fValidatedHeaders;
+    QueuedBlock newentry = {hash, pindex, pindex != NULL};
     list<QueuedBlock>::iterator it = state->vBlocksInFlight.insert(state->vBlocksInFlight.end(), newentry);
     state->nBlocksInFlight++;
     state->nBlocksInFlightValidHeaders += newentry.fValidatedHeaders;
+    if (state->nBlocksInFlight == 1) {
+        // We're starting a block download (batch) from this peer.
+        state->nDownloadingSince = GetTimeMicros();
+    }
+    if (state->nBlocksInFlightValidHeaders == 1 && pindex != NULL) {
+        nPeersWithValidatedDownloads++;
+    }
     mapBlocksInFlight[hash] = std::make_pair(nodeid, it);
 }
 
@@ -3894,7 +3902,6 @@ void UnloadBlockIndex()
     nBlockSequenceId = 1;
     mapBlockSource.clear();
     mapBlocksInFlight.clear();
-    nQueuedValidatedHeaders = 0;
     nPreferredDownload = 0;
     setDirtyBlockIndex.clear();
     setDirtyFileInfo.clear();
@@ -5811,24 +5818,15 @@ bool SendMessages(CNode* pto)
             LogPrintf("Peer=%d is stalling block download, disconnecting\n", pto->id);
             pto->fDisconnect = true;
         }
-        // In case there is a block that has been in flight from this peer for (2 + 0.5 * N) times the block interval
-        // (with N the number of validated blocks that were in flight at the time it was requested), disconnect due to
-        // timeout. We compensate for in-flight blocks to prevent killing off peers due to our own downstream link
+        // In case there is a block that has been in flight from this peer for 2 + 0.5 * N times the block interval
+        // (with N the number of peers from which we're downloading validated blocks), disconnect due to timeout.
+        // We compensate for other peers to prevent killing off peers due to our own downstream link
         // being saturated. We only count validated in-flight blocks so peers can't advertise non-existing block hashes
         // to unreasonably increase our timeout.
-        // We also compare the block download timeout originally calculated against the time at which we'd disconnect
-        // if we assumed the block were being requested now (ignoring blocks we've requested from this peer, since we're
-        // only looking at this peer's oldest request).  This way a large queue in the past doesn't result in a
-        // permanently large window for this block to be delivered (ie if the number of blocks in flight is decreasing
-        // more quickly than once every 5 minutes, then we'll shorten the download window for this block).
         if (!pto->fDisconnect && state.vBlocksInFlight.size() > 0) {
             QueuedBlock &queuedBlock = state.vBlocksInFlight.front();
-            int64_t nTimeoutIfRequestedNow = GetBlockTimeout(nNow, nQueuedValidatedHeaders - state.nBlocksInFlightValidHeaders, consensusParams);
-            if (queuedBlock.nTimeDisconnect > nTimeoutIfRequestedNow) {
-                LogPrint("net", "Reducing block download timeout for peer=%d block=%s, orig=%d new=%d\n", pto->id, queuedBlock.hash.ToString(), queuedBlock.nTimeDisconnect, nTimeoutIfRequestedNow);
-                queuedBlock.nTimeDisconnect = nTimeoutIfRequestedNow;
-            }
-            if (queuedBlock.nTimeDisconnect < nNow) {
+            int nOtherPeersWithValidatedDownloads = nPeersWithValidatedDownloads - (state.nBlocksInFlightValidHeaders > 0);
+            if (nNow > state.nDownloadingSince + consensusParams.nPowTargetSpacing * (BLOCK_DOWNLOAD_TIMEOUT_BASE + BLOCK_DOWNLOAD_TIMEOUT_PER_PEER * nOtherPeersWithValidatedDownloads)) {
                 LogPrintf("Timeout downloading block %s from peer=%d, disconnecting\n", queuedBlock.hash.ToString(), pto->id);
                 pto->fDisconnect = true;
             }
diff --git a/src/main.h b/src/main.h
index 3ea9dc500ca64..68fcf8e7c986e 100644
--- a/src/main.h
+++ b/src/main.h
@@ -106,6 +106,10 @@ static const unsigned int AVG_INVENTORY_BROADCAST_INTERVAL = 5;
 static const unsigned int AVG_FEEFILTER_BROADCAST_INTERVAL = 10 * 60;
 /** Maximum feefilter broadcast delay after significant change. */
 static const unsigned int MAX_FEEFILTER_CHANGE_DELAY = 5 * 60;
+/** Block download timeout base, expressed in millionths of the block interval (i.e. 20 min) */
+static const int64_t BLOCK_DOWNLOAD_TIMEOUT_BASE = 2000000;
+/** Additional block download timeout per parallel downloading peer (i.e. 5 min) */
+static const int64_t BLOCK_DOWNLOAD_TIMEOUT_PER_PEER = 500000;
 
 static const unsigned int DEFAULT_LIMITFREERELAY = 15;
 static const bool DEFAULT_RELAYPRIORITY = true;

From 0e24bbf679c95784ed5514a6a1f2fbf99dd97725 Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Mon, 4 Apr 2016 13:35:26 +0200
Subject: [PATCH 0109/1802] Self check after the last peer is removed

---
 src/main.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/main.cpp b/src/main.cpp
index de74593bb1858..87c727b28feef 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -338,6 +338,13 @@ void FinalizeNode(NodeId nodeid) {
     assert(nPeersWithValidatedDownloads >= 0);
 
     mapNodeState.erase(nodeid);
+
+    if (mapNodeState.empty()) {
+        // Do a consistency check after the last peer is removed.
+        assert(mapBlocksInFlight.empty());
+        assert(nPreferredDownload == 0);
+        assert(nPeersWithValidatedDownloads == 0);
+    }
 }
 
 // Requires cs_main.

From 62b9a557fca2aa55803c336ffcceccc50ccf0c3e Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Thu, 7 Apr 2016 13:18:11 +0200
Subject: [PATCH 0110/1802] Reduce block timeout to 10 minutes

Now that #7804 fixed the timeout handling, reduce the block timeout from
20 minutes to 10 minutes. 20 minutes is overkill.
---
 src/main.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main.h b/src/main.h
index 68fcf8e7c986e..0962f44e9439e 100644
--- a/src/main.h
+++ b/src/main.h
@@ -106,8 +106,8 @@ static const unsigned int AVG_INVENTORY_BROADCAST_INTERVAL = 5;
 static const unsigned int AVG_FEEFILTER_BROADCAST_INTERVAL = 10 * 60;
 /** Maximum feefilter broadcast delay after significant change. */
 static const unsigned int MAX_FEEFILTER_CHANGE_DELAY = 5 * 60;
-/** Block download timeout base, expressed in millionths of the block interval (i.e. 20 min) */
-static const int64_t BLOCK_DOWNLOAD_TIMEOUT_BASE = 2000000;
+/** Block download timeout base, expressed in millionths of the block interval (i.e. 10 min) */
+static const int64_t BLOCK_DOWNLOAD_TIMEOUT_BASE = 1000000;
 /** Additional block download timeout per parallel downloading peer (i.e. 5 min) */
 static const int64_t BLOCK_DOWNLOAD_TIMEOUT_PER_PEER = 500000;
 

From 5078ca45438e8f8d8e7cd937659887fb8ec70038 Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Thu, 7 Apr 2016 15:21:01 +0200
Subject: [PATCH 0111/1802] tests: Check Content-Type header returned from RPC
 server

Check the Content-Type header that is returned from the RPC server. Only
if it is `application/json` the data is supposed to be parsed as JSON.

This gives better reporting if the HTTP server happens to return an error that is
not JSON-formatted, which is the case if it happens at a lower level
before JSON-RPC kicks in.

Before: `Unexpected exception caught during testing: No JSON object could be decoded`

After: `JSONRPC error: non-JSON HTTP response with '403 Forbidden' from server`
---
 qa/rpc-tests/test_framework/authproxy.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/qa/rpc-tests/test_framework/authproxy.py b/qa/rpc-tests/test_framework/authproxy.py
index 1eb2772592265..e5f7ab3656167 100644
--- a/qa/rpc-tests/test_framework/authproxy.py
+++ b/qa/rpc-tests/test_framework/authproxy.py
@@ -154,6 +154,11 @@ def _get_response(self):
             raise JSONRPCException({
                 'code': -342, 'message': 'missing HTTP response from server'})
 
+        content_type = http_response.getheader('Content-Type')
+        if content_type != 'application/json':
+            raise JSONRPCException({
+                'code': -342, 'message': 'non-JSON HTTP response with \'%i %s\' from server' % (http_response.status, http_response.reason)})
+
         responsedata = http_response.read().decode('utf8')
         response = json.loads(responsedata, parse_float=decimal.Decimal)
         if "error" in response and response["error"] is None:

From 617deeb06e99d4b5fb76235b6009ec72accb4970 Mon Sep 17 00:00:00 2001
From: instagibbs <gsanders87@gmail.com>
Date: Mon, 4 Apr 2016 11:17:23 -0400
Subject: [PATCH 0112/1802] Gave miner test values constants for less
 error-prone values.

---
 src/test/miner_tests.cpp | 53 ++++++++++++++++++++++------------------
 1 file changed, 29 insertions(+), 24 deletions(-)

diff --git a/src/test/miner_tests.cpp b/src/test/miner_tests.cpp
index ab6485081ceed..492bed1450856 100644
--- a/src/test/miner_tests.cpp
+++ b/src/test/miner_tests.cpp
@@ -124,6 +124,11 @@ BOOST_AUTO_TEST_CASE(CreateNewBlock_validity)
     BOOST_CHECK(pblocktemplate = CreateNewBlock(chainparams, scriptPubKey));
     delete pblocktemplate;
 
+    const CAmount BLOCKSUBSIDY = 50*COIN;
+    const CAmount LOWFEE = CENT;
+    const CAmount HIGHFEE = COIN;
+    const CAmount HIGHERFEE = 4*COIN;
+
     // block sigops > limit: 1000 CHECKMULTISIG + 1
     tx.vin.resize(1);
     // NOTE: OP_NOP is used to force 20 SigOps for the CHECKMULTISIG
@@ -131,28 +136,28 @@ BOOST_AUTO_TEST_CASE(CreateNewBlock_validity)
     tx.vin[0].prevout.hash = txFirst[0]->GetHash();
     tx.vin[0].prevout.n = 0;
     tx.vout.resize(1);
-    tx.vout[0].nValue = 5000000000LL;
+    tx.vout[0].nValue = BLOCKSUBSIDY;
     for (unsigned int i = 0; i < 1001; ++i)
     {
-        tx.vout[0].nValue -= 1000000;
+        tx.vout[0].nValue -= LOWFEE;
         hash = tx.GetHash();
         bool spendsCoinbase = (i == 0) ? true : false; // only first tx spends coinbase
         // If we don't set the # of sig ops in the CTxMemPoolEntry, template creation fails
-        mempool.addUnchecked(hash, entry.Fee(1000000).Time(GetTime()).SpendsCoinbase(spendsCoinbase).FromTx(tx));
+        mempool.addUnchecked(hash, entry.Fee(LOWFEE).Time(GetTime()).SpendsCoinbase(spendsCoinbase).FromTx(tx));
         tx.vin[0].prevout.hash = hash;
     }
     BOOST_CHECK_THROW(CreateNewBlock(chainparams, scriptPubKey), std::runtime_error);
     mempool.clear();
 
     tx.vin[0].prevout.hash = txFirst[0]->GetHash();
-    tx.vout[0].nValue = 5000000000LL;
+    tx.vout[0].nValue = BLOCKSUBSIDY;
     for (unsigned int i = 0; i < 1001; ++i)
     {
-        tx.vout[0].nValue -= 1000000;
+        tx.vout[0].nValue -= LOWFEE;
         hash = tx.GetHash();
         bool spendsCoinbase = (i == 0) ? true : false; // only first tx spends coinbase
         // If we do set the # of sig ops in the CTxMemPoolEntry, template creation passes
-        mempool.addUnchecked(hash, entry.Fee(1000000).Time(GetTime()).SpendsCoinbase(spendsCoinbase).SigOps(20).FromTx(tx));
+        mempool.addUnchecked(hash, entry.Fee(LOWFEE).Time(GetTime()).SpendsCoinbase(spendsCoinbase).SigOps(20).FromTx(tx));
         tx.vin[0].prevout.hash = hash;
     }
     BOOST_CHECK(pblocktemplate = CreateNewBlock(chainparams, scriptPubKey));
@@ -167,13 +172,13 @@ BOOST_AUTO_TEST_CASE(CreateNewBlock_validity)
         tx.vin[0].scriptSig << vchData << OP_DROP;
     tx.vin[0].scriptSig << OP_1;
     tx.vin[0].prevout.hash = txFirst[0]->GetHash();
-    tx.vout[0].nValue = 5000000000LL;
+    tx.vout[0].nValue = BLOCKSUBSIDY;
     for (unsigned int i = 0; i < 128; ++i)
     {
-        tx.vout[0].nValue -= 10000000;
+        tx.vout[0].nValue -= 10*LOWFEE;
         hash = tx.GetHash();
         bool spendsCoinbase = (i == 0) ? true : false; // only first tx spends coinbase
-        mempool.addUnchecked(hash, entry.Fee(1000000).Time(GetTime()).SpendsCoinbase(spendsCoinbase).FromTx(tx));
+        mempool.addUnchecked(hash, entry.Fee(LOWFEE).Time(GetTime()).SpendsCoinbase(spendsCoinbase).FromTx(tx));
         tx.vin[0].prevout.hash = hash;
     }
     BOOST_CHECK(pblocktemplate = CreateNewBlock(chainparams, scriptPubKey));
@@ -182,24 +187,24 @@ BOOST_AUTO_TEST_CASE(CreateNewBlock_validity)
 
     // orphan in mempool, template creation fails
     hash = tx.GetHash();
-    mempool.addUnchecked(hash, entry.Fee(1000000).Time(GetTime()).FromTx(tx));
+    mempool.addUnchecked(hash, entry.Fee(LOWFEE).Time(GetTime()).FromTx(tx));
     BOOST_CHECK_THROW(CreateNewBlock(chainparams, scriptPubKey), std::runtime_error);
     mempool.clear();
 
     // child with higher priority than parent
     tx.vin[0].scriptSig = CScript() << OP_1;
     tx.vin[0].prevout.hash = txFirst[1]->GetHash();
-    tx.vout[0].nValue = 4900000000LL;
+    tx.vout[0].nValue = BLOCKSUBSIDY-HIGHFEE;
     hash = tx.GetHash();
-    mempool.addUnchecked(hash, entry.Fee(100000000LL).Time(GetTime()).SpendsCoinbase(true).FromTx(tx));
+    mempool.addUnchecked(hash, entry.Fee(HIGHFEE).Time(GetTime()).SpendsCoinbase(true).FromTx(tx));
     tx.vin[0].prevout.hash = hash;
     tx.vin.resize(2);
     tx.vin[1].scriptSig = CScript() << OP_1;
     tx.vin[1].prevout.hash = txFirst[0]->GetHash();
     tx.vin[1].prevout.n = 0;
-    tx.vout[0].nValue = 5900000000LL;
+    tx.vout[0].nValue = tx.vout[0].nValue+BLOCKSUBSIDY-HIGHERFEE; //First txn output + fresh coinbase - new txn fee
     hash = tx.GetHash();
-    mempool.addUnchecked(hash, entry.Fee(400000000LL).Time(GetTime()).SpendsCoinbase(true).FromTx(tx));
+    mempool.addUnchecked(hash, entry.Fee(HIGHERFEE).Time(GetTime()).SpendsCoinbase(true).FromTx(tx));
     BOOST_CHECK(pblocktemplate = CreateNewBlock(chainparams, scriptPubKey));
     delete pblocktemplate;
     mempool.clear();
@@ -211,7 +216,7 @@ BOOST_AUTO_TEST_CASE(CreateNewBlock_validity)
     tx.vout[0].nValue = 0;
     hash = tx.GetHash();
     // give it a fee so it'll get mined
-    mempool.addUnchecked(hash, entry.Fee(100000).Time(GetTime()).SpendsCoinbase(false).FromTx(tx));
+    mempool.addUnchecked(hash, entry.Fee(LOWFEE/10).Time(GetTime()).SpendsCoinbase(false).FromTx(tx));
     BOOST_CHECK_THROW(CreateNewBlock(chainparams, scriptPubKey), std::runtime_error);
     mempool.clear();
 
@@ -219,29 +224,29 @@ BOOST_AUTO_TEST_CASE(CreateNewBlock_validity)
     tx.vin[0].prevout.hash = txFirst[0]->GetHash();
     tx.vin[0].prevout.n = 0;
     tx.vin[0].scriptSig = CScript() << OP_1;
-    tx.vout[0].nValue = 4900000000LL;
+    tx.vout[0].nValue = BLOCKSUBSIDY-LOWFEE;
     script = CScript() << OP_0;
     tx.vout[0].scriptPubKey = GetScriptForDestination(CScriptID(script));
     hash = tx.GetHash();
-    mempool.addUnchecked(hash, entry.Fee(10000000L).Time(GetTime()).SpendsCoinbase(true).FromTx(tx));
+    mempool.addUnchecked(hash, entry.Fee(LOWFEE).Time(GetTime()).SpendsCoinbase(true).FromTx(tx));
     tx.vin[0].prevout.hash = hash;
     tx.vin[0].scriptSig = CScript() << std::vector<unsigned char>(script.begin(), script.end());
-    tx.vout[0].nValue -= 1000000;
+    tx.vout[0].nValue -= LOWFEE;
     hash = tx.GetHash();
-    mempool.addUnchecked(hash, entry.Fee(1000000).Time(GetTime()).SpendsCoinbase(false).FromTx(tx));
+    mempool.addUnchecked(hash, entry.Fee(LOWFEE).Time(GetTime()).SpendsCoinbase(false).FromTx(tx));
     BOOST_CHECK_THROW(CreateNewBlock(chainparams, scriptPubKey), std::runtime_error);
     mempool.clear();
 
     // double spend txn pair in mempool, template creation fails
     tx.vin[0].prevout.hash = txFirst[0]->GetHash();
     tx.vin[0].scriptSig = CScript() << OP_1;
-    tx.vout[0].nValue = 4900000000LL;
+    tx.vout[0].nValue = BLOCKSUBSIDY-HIGHFEE;
     tx.vout[0].scriptPubKey = CScript() << OP_1;
     hash = tx.GetHash();
-    mempool.addUnchecked(hash, entry.Fee(100000000L).Time(GetTime()).SpendsCoinbase(true).FromTx(tx));
+    mempool.addUnchecked(hash, entry.Fee(HIGHFEE).Time(GetTime()).SpendsCoinbase(true).FromTx(tx));
     tx.vout[0].scriptPubKey = CScript() << OP_2;
     hash = tx.GetHash();
-    mempool.addUnchecked(hash, entry.Fee(100000000L).Time(GetTime()).SpendsCoinbase(true).FromTx(tx));
+    mempool.addUnchecked(hash, entry.Fee(HIGHFEE).Time(GetTime()).SpendsCoinbase(true).FromTx(tx));
     BOOST_CHECK_THROW(CreateNewBlock(chainparams, scriptPubKey), std::runtime_error);
     mempool.clear();
 
@@ -298,11 +303,11 @@ BOOST_AUTO_TEST_CASE(CreateNewBlock_validity)
     tx.vin[0].nSequence = chainActive.Tip()->nHeight + 1; // txFirst[0] is the 2nd block
     prevheights[0] = baseheight + 1;
     tx.vout.resize(1);
-    tx.vout[0].nValue = 4900000000LL;
+    tx.vout[0].nValue = BLOCKSUBSIDY-HIGHFEE;
     tx.vout[0].scriptPubKey = CScript() << OP_1;
     tx.nLockTime = 0;
     hash = tx.GetHash();
-    mempool.addUnchecked(hash, entry.Fee(100000000L).Time(GetTime()).SpendsCoinbase(true).FromTx(tx));
+    mempool.addUnchecked(hash, entry.Fee(HIGHFEE).Time(GetTime()).SpendsCoinbase(true).FromTx(tx));
     BOOST_CHECK(CheckFinalTx(tx, flags)); // Locktime passes
     BOOST_CHECK(!TestSequenceLocks(tx, flags)); // Sequence locks fail
     BOOST_CHECK(SequenceLocks(tx, flags, &prevheights, CreateBlockIndex(chainActive.Tip()->nHeight + 2))); // Sequence locks pass on 2nd block

From f8536a62c318aeb1049479568aa8c4b6b03e87a6 Mon Sep 17 00:00:00 2001
From: instagibbs <gsanders87@gmail.com>
Date: Wed, 6 Apr 2016 08:29:19 -0400
Subject: [PATCH 0113/1802] Corrected values

---
 src/test/miner_tests.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/test/miner_tests.cpp b/src/test/miner_tests.cpp
index 492bed1450856..469862518c58c 100644
--- a/src/test/miner_tests.cpp
+++ b/src/test/miner_tests.cpp
@@ -175,7 +175,7 @@ BOOST_AUTO_TEST_CASE(CreateNewBlock_validity)
     tx.vout[0].nValue = BLOCKSUBSIDY;
     for (unsigned int i = 0; i < 128; ++i)
     {
-        tx.vout[0].nValue -= 10*LOWFEE;
+        tx.vout[0].nValue -= LOWFEE;
         hash = tx.GetHash();
         bool spendsCoinbase = (i == 0) ? true : false; // only first tx spends coinbase
         mempool.addUnchecked(hash, entry.Fee(LOWFEE).Time(GetTime()).SpendsCoinbase(spendsCoinbase).FromTx(tx));
@@ -216,7 +216,7 @@ BOOST_AUTO_TEST_CASE(CreateNewBlock_validity)
     tx.vout[0].nValue = 0;
     hash = tx.GetHash();
     // give it a fee so it'll get mined
-    mempool.addUnchecked(hash, entry.Fee(LOWFEE/10).Time(GetTime()).SpendsCoinbase(false).FromTx(tx));
+    mempool.addUnchecked(hash, entry.Fee(LOWFEE).Time(GetTime()).SpendsCoinbase(false).FromTx(tx));
     BOOST_CHECK_THROW(CreateNewBlock(chainparams, scriptPubKey), std::runtime_error);
     mempool.clear();
 

From e4ba9f6b0402cf7a2ad0d74f617c434a26c6e124 Mon Sep 17 00:00:00 2001
From: Suhas Daftuar <sdaftuar@gmail.com>
Date: Thu, 7 Apr 2016 14:33:08 -0400
Subject: [PATCH 0114/1802] Version 2 transactions remain non-standard until
 CSV activates

Before activation, such transactions might not be mined, so don't
allow into the mempool.
---
 src/main.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/main.cpp b/src/main.cpp
index a9f104c88bee6..f5c7e11d6e8a3 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1025,6 +1025,14 @@ bool AcceptToMemoryPoolWorker(CTxMemPool& pool, CValidationState& state, const C
     if (fRequireStandard && !IsStandardTx(tx, reason))
         return state.DoS(0, false, REJECT_NONSTANDARD, reason);
 
+    // Don't relay version 2 transactions until CSV is active, and we can be
+    // sure that such transactions will be mined (unless we're on
+    // -testnet/-regtest).
+    const CChainParams& chainparams = Params();
+    if (fRequireStandard && tx.nVersion >= 2 && VersionBitsTipState(chainparams.GetConsensus(), Consensus::DEPLOYMENT_CSV) != THRESHOLD_ACTIVE) {
+        return state.DoS(0, false, REJECT_NONSTANDARD, "premature-version2-tx");
+    }
+
     // Only accept nLockTime-using transactions that can be mined in the next
     // block; we don't want our mempool filled up with transactions that can't
     // be mined yet.

From 5cb1d8a2071d05beb9907a423178895fd8a5c359 Mon Sep 17 00:00:00 2001
From: Suhas Daftuar <sdaftuar@gmail.com>
Date: Thu, 7 Apr 2016 14:54:50 -0400
Subject: [PATCH 0115/1802] Tests: move get_bip9_status to util.py

---
 qa/rpc-tests/bip68-112-113-p2p.py   | 19 ++++++-------------
 qa/rpc-tests/test_framework/util.py |  7 +++++++
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/qa/rpc-tests/bip68-112-113-p2p.py b/qa/rpc-tests/bip68-112-113-p2p.py
index f391cb0b7aab4..35c831cb8b71d 100755
--- a/qa/rpc-tests/bip68-112-113-p2p.py
+++ b/qa/rpc-tests/bip68-112-113-p2p.py
@@ -149,13 +149,6 @@ def create_test_block(self, txs, version = 536870912):
         block.solve()
         return block
 
-    def get_bip9_status(self, key):
-        info = self.nodes[0].getblockchaininfo()
-        for row in info['bip9_softforks']:
-            if row['id'] == key:
-                return row
-        raise IndexError ('key:"%s" not found' % key)
-
     def create_bip68txs(self, bip68inputs, txversion, locktime_delta = 0):
         txs = []
         assert(len(bip68inputs) >= 16)
@@ -223,11 +216,11 @@ def get_tests(self):
         self.tip = int ("0x" + self.nodes[0].getbestblockhash() + "L", 0)
         self.nodeaddress = self.nodes[0].getnewaddress()
 
-        assert_equal(self.get_bip9_status('csv')['status'], 'defined')
+        assert_equal(get_bip9_status(self.nodes[0], 'csv')['status'], 'defined')
         test_blocks = self.generate_blocks(61, 4)
         yield TestInstance(test_blocks, sync_every_block=False) # 1
         # Advanced from DEFINED to STARTED, height = 143
-        assert_equal(self.get_bip9_status('csv')['status'], 'started')
+        assert_equal(get_bip9_status(self.nodes[0], 'csv')['status'], 'started')
 
         # Fail to achieve LOCKED_IN 100 out of 144 signal bit 0
         # using a variety of bits to simulate multiple parallel softforks
@@ -237,7 +230,7 @@ def get_tests(self):
         test_blocks = self.generate_blocks(24, 536936448, test_blocks) # 0x20010000 (signalling not)
         yield TestInstance(test_blocks, sync_every_block=False) # 2
         # Failed to advance past STARTED, height = 287
-        assert_equal(self.get_bip9_status('csv')['status'], 'started')
+        assert_equal(get_bip9_status(self.nodes[0], 'csv')['status'], 'started')
 
         # 108 out of 144 signal bit 0 to achieve lock-in
         # using a variety of bits to simulate multiple parallel softforks
@@ -247,7 +240,7 @@ def get_tests(self):
         test_blocks = self.generate_blocks(10, 536936448, test_blocks) # 0x20010000 (signalling not)
         yield TestInstance(test_blocks, sync_every_block=False) # 3
         # Advanced from STARTED to LOCKED_IN, height = 431
-        assert_equal(self.get_bip9_status('csv')['status'], 'locked_in')
+        assert_equal(get_bip9_status(self.nodes[0], 'csv')['status'], 'locked_in')
 
         # 140 more version 4 blocks
         test_blocks = self.generate_blocks(140, 4)
@@ -291,7 +284,7 @@ def get_tests(self):
         test_blocks = self.generate_blocks(2, 4)
         yield TestInstance(test_blocks, sync_every_block=False) # 5
         # Not yet advanced to ACTIVE, height = 574 (will activate for block 576, not 575)
-        assert_equal(self.get_bip9_status('csv')['status'], 'locked_in')
+        assert_equal(get_bip9_status(self.nodes[0], 'csv')['status'], 'locked_in')
 
         # Test both version 1 and version 2 transactions for all tests
         # BIP113 test transaction will be modified before each use to put in appropriate block time
@@ -368,7 +361,7 @@ def get_tests(self):
         # 1 more version 4 block to get us to height 575 so the fork should now be active for the next block
         test_blocks = self.generate_blocks(1, 4)
         yield TestInstance(test_blocks, sync_every_block=False) # 8
-        assert_equal(self.get_bip9_status('csv')['status'], 'active')
+        assert_equal(get_bip9_status(self.nodes[0], 'csv')['status'], 'active')
 
 
         #################################
diff --git a/qa/rpc-tests/test_framework/util.py b/qa/rpc-tests/test_framework/util.py
index f069c32a607ba..d9fe0f75f2608 100644
--- a/qa/rpc-tests/test_framework/util.py
+++ b/qa/rpc-tests/test_framework/util.py
@@ -545,3 +545,10 @@ def create_lots_of_big_transactions(node, txouts, utxos, fee):
         txid = node.sendrawtransaction(signresult["hex"], True)
         txids.append(txid)
     return txids
+
+def get_bip9_status(node, key):
+    info = node.getblockchaininfo()
+    for row in info['bip9_softforks']:
+        if row['id'] == key:
+            return row
+    raise IndexError ('key:"%s" not found' % key)

From da5fdbb3a2778523cce70d635c1aa2b31a693bc6 Mon Sep 17 00:00:00 2001
From: Suhas Daftuar <sdaftuar@gmail.com>
Date: Thu, 7 Apr 2016 14:59:50 -0400
Subject: [PATCH 0116/1802] Test relay of version 2 transactions

---
 qa/rpc-tests/bip68-sequence.py | 46 +++++++++++++++++++++++++++++++---
 1 file changed, 42 insertions(+), 4 deletions(-)

diff --git a/qa/rpc-tests/bip68-sequence.py b/qa/rpc-tests/bip68-sequence.py
index 377a35b6872c7..33e05dfc51a09 100755
--- a/qa/rpc-tests/bip68-sequence.py
+++ b/qa/rpc-tests/bip68-sequence.py
@@ -4,7 +4,7 @@
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #
-# Test BIP68 implementation (mempool only)
+# Test BIP68 implementation
 #
 
 from test_framework.test_framework import BitcoinTestFramework
@@ -26,8 +26,10 @@ class BIP68Test(BitcoinTestFramework):
     def setup_network(self):
         self.nodes = []
         self.nodes.append(start_node(0, self.options.tmpdir, ["-debug", "-blockprioritysize=0"]))
+        self.nodes.append(start_node(1, self.options.tmpdir, ["-debug", "-blockprioritysize=0", "-acceptnonstdtxn=0"]))
         self.is_network_split = False
         self.relayfee = self.nodes[0].getnetworkinfo()["relayfee"]
+        connect_nodes(self.nodes[0], 1)
 
     def run_test(self):
         # Generate some coins
@@ -42,10 +44,18 @@ def run_test(self):
         print "Running test sequence-lock-unconfirmed-inputs"
         self.test_sequence_lock_unconfirmed_inputs()
 
-        # This test needs to change when BIP68 becomes consensus
-        print "Running test BIP68 not consensus"
+        print "Running test BIP68 not consensus before versionbits activation"
         self.test_bip68_not_consensus()
 
+        print "Verifying nVersion=2 transactions aren't standard"
+        self.test_version2_relay(before_activation=True)
+
+        print "Activating BIP68 (and 112/113)"
+        self.activateCSV()
+
+        print "Verifying nVersion=2 transactions are now standard"
+        self.test_version2_relay(before_activation=False)
+
         print "Passed\n"
 
     # Test that BIP68 is not in effect if tx version is 1, or if
@@ -333,8 +343,12 @@ def test_nonzero_locks(orig_tx, node, relayfee, use_height_lock):
         self.nodes[0].invalidateblock(self.nodes[0].getblockhash(cur_height+1))
         self.nodes[0].generate(10)
 
-    # Make sure that BIP68 isn't being used to validate blocks.
+    # Make sure that BIP68 isn't being used to validate blocks, prior to
+    # versionbits activation.  If more blocks are mined prior to this test
+    # being run, then it's possible the test has activated the soft fork, and
+    # this test should be moved to run earlier, or deleted.
     def test_bip68_not_consensus(self):
+        assert(get_bip9_status(self.nodes[0], 'csv')['status'] != 'active')
         txid = self.nodes[0].sendtoaddress(self.nodes[0].getnewaddress(), 2)
 
         tx1 = FromHex(CTransaction(), self.nodes[0].getrawtransaction(txid))
@@ -381,6 +395,30 @@ def test_bip68_not_consensus(self):
         self.nodes[0].submitblock(ToHex(block))
         assert_equal(self.nodes[0].getbestblockhash(), block.hash)
 
+    def activateCSV(self):
+        # activation should happen at block height 432 (3 periods)
+        min_activation_height = 432
+        height = self.nodes[0].getblockcount()
+        assert(height < 432)
+        self.nodes[0].generate(432-height)
+        assert(get_bip9_status(self.nodes[0], 'csv')['status'] == 'active')
+        sync_blocks(self.nodes)
+
+    # Use self.nodes[1] to test standardness relay policy
+    def test_version2_relay(self, before_activation):
+        inputs = [ ]
+        outputs = { self.nodes[1].getnewaddress() : 1.0 }
+        rawtx = self.nodes[1].createrawtransaction(inputs, outputs)
+        rawtxfund = self.nodes[1].fundrawtransaction(rawtx)['hex']
+        tx = FromHex(CTransaction(), rawtxfund)
+        tx.nVersion = 2
+        tx_signed = self.nodes[1].signrawtransaction(ToHex(tx))["hex"]
+        try:
+            tx_id = self.nodes[1].sendrawtransaction(tx_signed)
+            assert(before_activation == False)
+        except:
+            assert(before_activation)
+
 
 if __name__ == '__main__':
     BIP68Test().main()

From 11114a69c86e9abf4dd7e88ac268f5d078f40913 Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Sun, 3 Apr 2016 13:18:31 +0200
Subject: [PATCH 0117/1802] [amount] test negative fee rates and full
 constructor

---
 src/test/amount_tests.cpp | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/src/test/amount_tests.cpp b/src/test/amount_tests.cpp
index 59dab20633ced..c65646474d514 100644
--- a/src/test/amount_tests.cpp
+++ b/src/test/amount_tests.cpp
@@ -27,6 +27,15 @@ BOOST_AUTO_TEST_CASE(GetFeeTest)
     BOOST_CHECK_EQUAL(feeRate.GetFee(1e3), 1e3);
     BOOST_CHECK_EQUAL(feeRate.GetFee(9e3), 9e3);
 
+    feeRate = CFeeRate(-1000);
+    // Must always just return -1 * arg
+    BOOST_CHECK_EQUAL(feeRate.GetFee(0), 0);
+    BOOST_CHECK_EQUAL(feeRate.GetFee(1), -1);
+    BOOST_CHECK_EQUAL(feeRate.GetFee(121), -121);
+    BOOST_CHECK_EQUAL(feeRate.GetFee(999), -999);
+    BOOST_CHECK_EQUAL(feeRate.GetFee(1e3), -1e3);
+    BOOST_CHECK_EQUAL(feeRate.GetFee(9e3), -9e3);
+
     feeRate = CFeeRate(123);
     // Truncates the result, if not integer
     BOOST_CHECK_EQUAL(feeRate.GetFee(0), 0);
@@ -37,6 +46,26 @@ BOOST_AUTO_TEST_CASE(GetFeeTest)
     BOOST_CHECK_EQUAL(feeRate.GetFee(999), 122);
     BOOST_CHECK_EQUAL(feeRate.GetFee(1e3), 123);
     BOOST_CHECK_EQUAL(feeRate.GetFee(9e3), 1107);
+
+    feeRate = CFeeRate(-123);
+    // Truncates the result, if not integer
+    BOOST_CHECK_EQUAL(feeRate.GetFee(0), 0);
+    BOOST_CHECK_EQUAL(feeRate.GetFee(8), -1); // Special case: returns -1 instead of 0
+    BOOST_CHECK_EQUAL(feeRate.GetFee(9), -1);
+
+    // Check full constructor
+    // default value
+    BOOST_CHECK(CFeeRate(CAmount(-1), 1000) == CFeeRate(-1));
+    BOOST_CHECK(CFeeRate(CAmount(0), 1000) == CFeeRate(0));
+    BOOST_CHECK(CFeeRate(CAmount(1), 1000) == CFeeRate(1));
+    // lost precision (can only resolve satoshis per kB)
+    BOOST_CHECK(CFeeRate(CAmount(1), 1001) == CFeeRate(0));
+    BOOST_CHECK(CFeeRate(CAmount(2), 1001) == CFeeRate(1));
+    // some more integer checks
+    BOOST_CHECK(CFeeRate(CAmount(26), 789) == CFeeRate(32));
+    BOOST_CHECK(CFeeRate(CAmount(27), 789) == CFeeRate(34));
+    // Maximum size in bytes, should not crash
+    CFeeRate(MAX_MONEY, (std::numeric_limits<size_t>::max() >> 1) - 1).GetFeePerK();
 }
 
 BOOST_AUTO_TEST_SUITE_END()

From fa2da2cb607ba359231fccc9635abe7c8616de56 Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Sun, 3 Apr 2016 13:44:01 +0200
Subject: [PATCH 0118/1802] [amount] Add support for negative fee rates

Currently negative fee rates are not supported on archs of 64-bit or
more
---
 src/amount.cpp | 20 +++++++++++++++-----
 src/amount.h   | 11 +++++++----
 2 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/src/amount.cpp b/src/amount.cpp
index 68806ff062bd9..7b8618de332a6 100644
--- a/src/amount.cpp
+++ b/src/amount.cpp
@@ -9,20 +9,30 @@
 
 const std::string CURRENCY_UNIT = "BTC";
 
-CFeeRate::CFeeRate(const CAmount& nFeePaid, size_t nSize)
+CFeeRate::CFeeRate(const CAmount& nFeePaid, size_t nBytes_)
 {
+    assert(nBytes_ <= uint64_t(std::numeric_limits<int64_t>::max()));
+    int64_t nSize = int64_t(nBytes_);
+
     if (nSize > 0)
-        nSatoshisPerK = nFeePaid*1000/nSize;
+        nSatoshisPerK = nFeePaid * 1000 / nSize;
     else
         nSatoshisPerK = 0;
 }
 
-CAmount CFeeRate::GetFee(size_t nSize) const
+CAmount CFeeRate::GetFee(size_t nBytes_) const
 {
+    assert(nBytes_ <= uint64_t(std::numeric_limits<int64_t>::max()));
+    int64_t nSize = int64_t(nBytes_);
+
     CAmount nFee = nSatoshisPerK * nSize / 1000;
 
-    if (nFee == 0 && nSize != 0 && nSatoshisPerK > 0)
-        nFee = CAmount(1);
+    if (nFee == 0 && nSize != 0) {
+        if (nSatoshisPerK > 0)
+            nFee = CAmount(1);
+        if (nSatoshisPerK < 0)
+            nFee = CAmount(-1);
+    }
 
     return nFee;
 }
diff --git a/src/amount.h b/src/amount.h
index 9aba6525c7f2b..5e52f37f2369d 100644
--- a/src/amount.h
+++ b/src/amount.h
@@ -11,6 +11,7 @@
 #include <stdlib.h>
 #include <string>
 
+/** Amount in satoshis (Can be negative) */
 typedef int64_t CAmount;
 
 static const CAmount COIN = 100000000;
@@ -30,22 +31,24 @@ extern const std::string CURRENCY_UNIT;
 static const CAmount MAX_MONEY = 21000000 * COIN;
 inline bool MoneyRange(const CAmount& nValue) { return (nValue >= 0 && nValue <= MAX_MONEY); }
 
-/** Type-safe wrapper class for fee rates
- * (how much to pay based on transaction size)
+/**
+ * Fee rate in satoshis per kilobyte: CAmount / kB
  */
 class CFeeRate
 {
 private:
     CAmount nSatoshisPerK; // unit is satoshis-per-1,000-bytes
 public:
+    /** Fee rate of 0 satoshis per kB */
     CFeeRate() : nSatoshisPerK(0) { }
     explicit CFeeRate(const CAmount& _nSatoshisPerK): nSatoshisPerK(_nSatoshisPerK) { }
-    CFeeRate(const CAmount& nFeePaid, size_t nSize);
+    /** Constructor for a fee rate in satoshis per kB. The size in bytes must not exceed (2^63 - 1)*/
+    CFeeRate(const CAmount& nFeePaid, size_t nBytes);
     CFeeRate(const CFeeRate& other) { nSatoshisPerK = other.nSatoshisPerK; }
     /**
      * Return the fee in satoshis for the given size in bytes.
      */
-    CAmount GetFee(size_t size) const;
+    CAmount GetFee(size_t nBytes) const;
     /**
      * Return the fee in satoshis for a size of 1000 bytes
      */

From 03c77fdc143fb8d533011f23164daac560e381b2 Mon Sep 17 00:00:00 2001
From: Matthew English <s-matthew-english@users.noreply.github.com>
Date: Fri, 1 Apr 2016 23:44:26 +0200
Subject: [PATCH 0119/1802] Doc: Update isStandardTx comment

---
 src/policy/policy.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/policy/policy.cpp b/src/policy/policy.cpp
index e3ed7be0008ee..d1a15451dc1f6 100644
--- a/src/policy/policy.cpp
+++ b/src/policy/policy.cpp
@@ -73,12 +73,12 @@ bool IsStandardTx(const CTransaction& tx, std::string& reason)
     BOOST_FOREACH(const CTxIn& txin, tx.vin)
     {
         // Biggest 'standard' txin is a 15-of-15 P2SH multisig with compressed
-        // keys. (remember the 520 byte limit on redeemScript size) That works
+        // keys (remember the 520 byte limit on redeemScript size). That works
         // out to a (15*(33+1))+3=513 byte redeemScript, 513+1+15*(73+1)+3=1627
         // bytes of scriptSig, which we round off to 1650 bytes for some minor
         // future-proofing. That's also enough to spend a 20-of-20
         // CHECKMULTISIG scriptPubKey, though such a scriptPubKey is not
-        // considered standard)
+        // considered standard.
         if (txin.scriptSig.size() > 1650) {
             reason = "scriptsig-size";
             return false;

From 4521f005a1e61969f21b91a7e8eef5a5cdfdd191 Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Sat, 9 Apr 2016 06:52:43 +0200
Subject: [PATCH 0120/1802] tests: add varints_bitpatterns test

The current tests for varint only check that
serialization-deserialization is a roundtrip. That is a useful test, but
it is also good to check for some exact bit patterns, to prevent a code
change that changes the serialization format from going undetected.

As the varint functions are templated, also check with different types.
---
 src/test/serialize_tests.cpp | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/src/test/serialize_tests.cpp b/src/test/serialize_tests.cpp
index c0fd99aca2e67..bec2c7459d8c9 100644
--- a/src/test/serialize_tests.cpp
+++ b/src/test/serialize_tests.cpp
@@ -160,6 +160,27 @@ BOOST_AUTO_TEST_CASE(varints)
     }
 }
 
+BOOST_AUTO_TEST_CASE(varints_bitpatterns)
+{
+    CDataStream ss(SER_DISK, 0);
+    ss << VARINT(0); BOOST_CHECK_EQUAL(HexStr(ss), "00"); ss.clear();
+    ss << VARINT(0x7f); BOOST_CHECK_EQUAL(HexStr(ss), "7f"); ss.clear();
+    ss << VARINT((int8_t)0x7f); BOOST_CHECK_EQUAL(HexStr(ss), "7f"); ss.clear();
+    ss << VARINT(0x80); BOOST_CHECK_EQUAL(HexStr(ss), "8000"); ss.clear();
+    ss << VARINT((uint8_t)0x80); BOOST_CHECK_EQUAL(HexStr(ss), "8000"); ss.clear();
+    ss << VARINT(0x1234); BOOST_CHECK_EQUAL(HexStr(ss), "a334"); ss.clear();
+    ss << VARINT((int16_t)0x1234); BOOST_CHECK_EQUAL(HexStr(ss), "a334"); ss.clear();
+    ss << VARINT(0xffff); BOOST_CHECK_EQUAL(HexStr(ss), "82fe7f"); ss.clear();
+    ss << VARINT((uint16_t)0xffff); BOOST_CHECK_EQUAL(HexStr(ss), "82fe7f"); ss.clear();
+    ss << VARINT(0x123456); BOOST_CHECK_EQUAL(HexStr(ss), "c7e756"); ss.clear();
+    ss << VARINT((int32_t)0x123456); BOOST_CHECK_EQUAL(HexStr(ss), "c7e756"); ss.clear();
+    ss << VARINT(0x80123456U); BOOST_CHECK_EQUAL(HexStr(ss), "86ffc7e756"); ss.clear();
+    ss << VARINT((uint32_t)0x80123456U); BOOST_CHECK_EQUAL(HexStr(ss), "86ffc7e756"); ss.clear();
+    ss << VARINT(0xffffffff); BOOST_CHECK_EQUAL(HexStr(ss), "8efefefe7f"); ss.clear();
+    ss << VARINT(0x7fffffffffffffffLL); BOOST_CHECK_EQUAL(HexStr(ss), "fefefefefefefefe7f"); ss.clear();
+    ss << VARINT(0xffffffffffffffffULL); BOOST_CHECK_EQUAL(HexStr(ss), "80fefefefefefefefe7f"); ss.clear();
+}
+
 BOOST_AUTO_TEST_CASE(compactsize)
 {
     CDataStream ss(SER_DISK, 0);

From 62a64860580253d9c733f3b8826908bba40eab1d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pavel=20Jan=C3=ADk?= <Pavel@Janik.cz>
Date: Fri, 8 Apr 2016 18:52:59 +0200
Subject: [PATCH 0121/1802] RPC: do not print ping info in getpeerinfo when no
 ping received yet, fix help

---
 src/rpc/net.cpp | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/rpc/net.cpp b/src/rpc/net.cpp
index 017cd6ca32187..ce14d034ce1fd 100644
--- a/src/rpc/net.cpp
+++ b/src/rpc/net.cpp
@@ -97,9 +97,9 @@ UniValue getpeerinfo(const UniValue& params, bool fHelp)
             "    \"bytesrecv\": n,            (numeric) The total bytes received\n"
             "    \"conntime\": ttt,           (numeric) The connection time in seconds since epoch (Jan 1 1970 GMT)\n"
             "    \"timeoffset\": ttt,         (numeric) The time offset in seconds\n"
-            "    \"pingtime\": n,             (numeric) ping time\n"
-            "    \"minping\": n,              (numeric) minimum observed ping time\n"
-            "    \"pingwait\": n,             (numeric) ping wait\n"
+            "    \"pingtime\": n,             (numeric) ping time (if available)\n"
+            "    \"minping\": n,              (numeric) minimum observed ping time (if any at all)\n"
+            "    \"pingwait\": n,             (numeric) ping wait (if non-zero)\n"
             "    \"version\": v,              (numeric) The peer version, such as 7001\n"
             "    \"subver\": \"/Satoshi:0.8.5/\",  (string) The string version\n"
             "    \"inbound\": true|false,     (boolean) Inbound (true) or Outbound (false)\n"
@@ -150,8 +150,10 @@ UniValue getpeerinfo(const UniValue& params, bool fHelp)
         obj.push_back(Pair("bytesrecv", stats.nRecvBytes));
         obj.push_back(Pair("conntime", stats.nTimeConnected));
         obj.push_back(Pair("timeoffset", stats.nTimeOffset));
-        obj.push_back(Pair("pingtime", stats.dPingTime));
-        obj.push_back(Pair("minping", stats.dPingMin));
+        if (stats.dPingTime > 0.0)
+            obj.push_back(Pair("pingtime", stats.dPingTime));
+        if (stats.dPingMin < std::numeric_limits<int64_t>::max()/1e6)
+            obj.push_back(Pair("minping", stats.dPingMin));
         if (stats.dPingWait > 0.0)
             obj.push_back(Pair("pingwait", stats.dPingWait));
         obj.push_back(Pair("version", stats.nVersion));

From fe53a2af6f8dccd53116ae35f28ec3860cc72f19 Mon Sep 17 00:00:00 2001
From: mruddy <mruddy@users.noreply.github.com>
Date: Fri, 8 Apr 2016 20:15:41 -0400
Subject: [PATCH 0122/1802] doc: add arch linux setup and build example [skip
 ci]

---
 doc/build-unix.md | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/doc/build-unix.md b/doc/build-unix.md
index c1e92d8d15f65..dc754fc7339c9 100644
--- a/doc/build-unix.md
+++ b/doc/build-unix.md
@@ -250,6 +250,24 @@ A list of additional configure flags can be displayed with:
     ./configure --help
 
 
+Setup and Build Example: Arch Linux
+-----------------------------------
+This example lists the steps necessary to setup and build a command line only, non-wallet distribution of the latest changes on Arch Linux:
+
+    pacman -S git base-devel boost libevent python
+    git clone https://github.com/bitcoin/bitcoin.git
+    cd bitcoin/
+    ./autogen.sh
+    ./configure --disable-wallet --without-gui --without-miniupnpc
+    make check
+
+Note:
+Enabling wallet support requires either compiling against a Berkeley DB newer than 4.8 (package `db`) using `--with-incompatible-bdb`,
+or building and depending on a local version of Berkeley DB 4.8. The readily available Arch Linux packages are currently built using
+`--with-incompatible-bdb` according to the [PKGBUILD](https://projects.archlinux.org/svntogit/community.git/tree/bitcoin/trunk/PKGBUILD).
+As mentioned above, when maintaining portability of the wallet between the standard Bitcoin Core distributions and independently built
+node software is desired, Berkeley DB 4.8 must be used.
+
 
 ARM Cross-compilation
 -------------------
@@ -270,4 +288,4 @@ To build executables for ARM:
     make
 
 
-For further documentation on the depends system see [README.md](../depends/README.md) in the depends directory.
\ No newline at end of file
+For further documentation on the depends system see [README.md](../depends/README.md) in the depends directory.

From facf5a494708df755a15d63d339412201512e13f Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Sat, 9 Apr 2016 15:28:17 +0200
Subject: [PATCH 0123/1802] [amount] tests: Fix off-by-one mistake

---
 src/test/amount_tests.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test/amount_tests.cpp b/src/test/amount_tests.cpp
index c65646474d514..fd6f88b36627d 100644
--- a/src/test/amount_tests.cpp
+++ b/src/test/amount_tests.cpp
@@ -65,7 +65,7 @@ BOOST_AUTO_TEST_CASE(GetFeeTest)
     BOOST_CHECK(CFeeRate(CAmount(26), 789) == CFeeRate(32));
     BOOST_CHECK(CFeeRate(CAmount(27), 789) == CFeeRate(34));
     // Maximum size in bytes, should not crash
-    CFeeRate(MAX_MONEY, (std::numeric_limits<size_t>::max() >> 1) - 1).GetFeePerK();
+    CFeeRate(MAX_MONEY, std::numeric_limits<size_t>::max() >> 1).GetFeePerK();
 }
 
 BOOST_AUTO_TEST_SUITE_END()

From fa05e22e919b7e2e816606f0c0d3dea1bd325bfd Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Sat, 9 Apr 2016 21:14:18 +0200
Subject: [PATCH 0124/1802] [qa] pull-tester: Don't mute zmq ImportError

---
 qa/pull-tester/rpc-tests.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/qa/pull-tester/rpc-tests.py b/qa/pull-tester/rpc-tests.py
index 6d3bda10ee6d8..17c0b3adf2e7f 100755
--- a/qa/pull-tester/rpc-tests.py
+++ b/qa/pull-tester/rpc-tests.py
@@ -45,10 +45,10 @@
 if ENABLE_ZMQ:
     try:
         import zmq
-    except ImportError:
-        print("WARNING: \"import zmq\" failed. Setting ENABLE_ZMQ=0. " \
-            "To run zmq tests, see dependency info in /qa/README.md.")
-        ENABLE_ZMQ=0
+    except ImportError as e:
+        print("WARNING: \"import zmq\" failed. Set ENABLE_ZMQ=0 or " \
+            "to run zmq tests, see dependency info in /qa/README.md.")
+        raise e
 
 ENABLE_COVERAGE=0
 

From faa4f22342b682a5ead1bbb8587facd761b4ac2d Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Sat, 9 Apr 2016 22:17:52 +0200
Subject: [PATCH 0125/1802] [qa] pull-tester: Exit early when no tests are run

---
 qa/pull-tester/rpc-tests.py | 124 ++++++++++++++++++------------------
 1 file changed, 61 insertions(+), 63 deletions(-)

diff --git a/qa/pull-tester/rpc-tests.py b/qa/pull-tester/rpc-tests.py
index 17c0b3adf2e7f..e159082a009e5 100755
--- a/qa/pull-tester/rpc-tests.py
+++ b/qa/pull-tester/rpc-tests.py
@@ -40,15 +40,6 @@
     ENABLE_UTILS=0
 if 'ENABLE_ZMQ' not in vars():
     ENABLE_ZMQ=0
-    
-# python-zmq may not be installed. Handle this gracefully and with some helpful info
-if ENABLE_ZMQ:
-    try:
-        import zmq
-    except ImportError as e:
-        print("WARNING: \"import zmq\" failed. Set ENABLE_ZMQ=0 or " \
-            "to run zmq tests, see dependency info in /qa/README.md.")
-        raise e
 
 ENABLE_COVERAGE=0
 
@@ -76,11 +67,24 @@
 if "BITCOINCLI" not in os.environ:
     os.environ["BITCOINCLI"] = buildDir + '/src/bitcoin-cli' + EXEEXT
 
-#Disable Windows tests by default
 if EXEEXT == ".exe" and "-win" not in opts:
-    print "Win tests currently disabled.  Use -win option to enable"
+    # https://github.com/bitcoin/bitcoin/commit/d52802551752140cf41f0d9a225a43e84404d3e9
+    print "Win tests currently disabled by default.  Use -win option to enable"
+    sys.exit(0)
+
+if not (ENABLE_WALLET == 1 and ENABLE_UTILS == 1 and ENABLE_BITCOIND == 1):
+    print "No rpc tests to run. Wallet, utils, and bitcoind must all be enabled"
     sys.exit(0)
 
+# python-zmq may not be installed. Handle this gracefully and with some helpful info
+if ENABLE_ZMQ:
+    try:
+        import zmq
+    except ImportError as e:
+        print("WARNING: \"import zmq\" failed. Set ENABLE_ZMQ=0 or " \
+            "to run zmq tests, see dependency info in /qa/README.md.")
+        raise e
+
 #Tests
 testScripts = [
     'bip68-112-113-p2p.py',
@@ -119,6 +123,9 @@
     'p2p-versionbits-warning.py',
     'importprunedfunds.py',
 ]
+if ENABLE_ZMQ:
+    testScripts.append('zmq_test.py')
+
 testScriptsExt = [
     'bip9-softforks.py',
     'bip65-cltv.py',
@@ -143,11 +150,6 @@
     'pruning.py', # leave pruning last as it takes a REALLY long time
 ]
 
-#Enable ZMQ tests
-if ENABLE_ZMQ == 1:
-    testScripts.append('zmq_test.py')
-
-
 def runtests():
     coverage = None
 
@@ -155,53 +157,49 @@ def runtests():
         coverage = RPCCoverage()
         print("Initializing coverage directory at %s\n" % coverage.dir)
 
-    if(ENABLE_WALLET == 1 and ENABLE_UTILS == 1 and ENABLE_BITCOIND == 1):
-        rpcTestDir = buildDir + '/qa/rpc-tests/'
-        run_extended = '-extended' in opts
-        cov_flag = coverage.flag if coverage else ''
-        flags = " --srcdir %s/src %s %s" % (buildDir, cov_flag, passOn)
-
-        #Run Tests
-        for i in range(len(testScripts)):
-            if (len(opts) == 0
-                    or (len(opts) == 1 and "-win" in opts )
-                    or run_extended
-                    or testScripts[i] in opts
-                    or re.sub(".py$", "", testScripts[i]) in opts ):
-
-                print("Running testscript %s%s%s ..." % (bold[1], testScripts[i], bold[0]))
-                time0 = time.time()
-                subprocess.check_call(
-                    rpcTestDir + testScripts[i] + flags, shell=True)
-                print("Duration: %s s\n" % (int(time.time() - time0)))
-
-                # exit if help is called so we print just one set of
-                # instructions
-                p = re.compile(" -h| --help")
-                if p.match(passOn):
-                    sys.exit(0)
-
-        # Run Extended Tests
-        for i in range(len(testScriptsExt)):
-            if (run_extended or testScriptsExt[i] in opts
-                    or re.sub(".py$", "", testScriptsExt[i]) in opts):
-
-                print(
-                    "Running 2nd level testscript "
-                    + "%s%s%s ..." % (bold[1], testScriptsExt[i], bold[0]))
-                time0 = time.time()
-                subprocess.check_call(
-                    rpcTestDir + testScriptsExt[i] + flags, shell=True)
-                print("Duration: %s s\n" % (int(time.time() - time0)))
-
-        if coverage:
-            coverage.report_rpc_coverage()
-
-            print("Cleaning up coverage data")
-            coverage.cleanup()
-
-    else:
-        print "No rpc tests to run. Wallet, utils, and bitcoind must all be enabled"
+    rpcTestDir = buildDir + '/qa/rpc-tests/'
+    run_extended = '-extended' in opts
+    cov_flag = coverage.flag if coverage else ''
+    flags = " --srcdir %s/src %s %s" % (buildDir, cov_flag, passOn)
+
+    #Run Tests
+    for i in range(len(testScripts)):
+        if (len(opts) == 0
+                or (len(opts) == 1 and "-win" in opts )
+                or run_extended
+                or testScripts[i] in opts
+                or re.sub(".py$", "", testScripts[i]) in opts ):
+
+            print("Running testscript %s%s%s ..." % (bold[1], testScripts[i], bold[0]))
+            time0 = time.time()
+            subprocess.check_call(
+                rpcTestDir + testScripts[i] + flags, shell=True)
+            print("Duration: %s s\n" % (int(time.time() - time0)))
+
+            # exit if help is called so we print just one set of
+            # instructions
+            p = re.compile(" -h| --help")
+            if p.match(passOn):
+                sys.exit(0)
+
+    # Run Extended Tests
+    for i in range(len(testScriptsExt)):
+        if (run_extended or testScriptsExt[i] in opts
+                or re.sub(".py$", "", testScriptsExt[i]) in opts):
+
+            print(
+                "Running 2nd level testscript "
+                + "%s%s%s ..." % (bold[1], testScriptsExt[i], bold[0]))
+            time0 = time.time()
+            subprocess.check_call(
+                rpcTestDir + testScriptsExt[i] + flags, shell=True)
+            print("Duration: %s s\n" % (int(time.time() - time0)))
+
+    if coverage:
+        coverage.report_rpc_coverage()
+
+        print("Cleaning up coverage data")
+        coverage.cleanup()
 
 
 class RPCCoverage(object):

From 5eeb913d6cff9cfe9a6769d7efe4a7b9f23de0f4 Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Fri, 8 Apr 2016 22:14:19 +0200
Subject: [PATCH 0126/1802] Clean up lockorder data of destroyed mutexes

The lockorder potential deadlock detection works by remembering for each
lock A that is acquired while holding another B the pair (A,B), and
triggering a warning when (B,A) already exists in the table.

A and B in the above text are represented by pointers to the CCriticalSection
object that is acquired. This does mean however that we need to clean up the
table entries that refer to any critical section which is destroyed, as it
memory address can potentially be used for another unrelated lock in the future.

Implement this clean up by remembering not only the pairs in forward direction,
but also backward direction. This allows for fast iteration over all pairs that
use a deleted CCriticalSection in either the first or the second position.
---
 src/sync.cpp | 55 +++++++++++++++++++++++++++++++++++++++++-----------
 src/sync.h   | 33 +++++++++++++++++++------------
 2 files changed, 65 insertions(+), 23 deletions(-)

diff --git a/src/sync.cpp b/src/sync.cpp
index 8df8ae43f4357..641ed2c8ca036 100644
--- a/src/sync.cpp
+++ b/src/sync.cpp
@@ -56,11 +56,24 @@ struct CLockLocation {
 };
 
 typedef std::vector<std::pair<void*, CLockLocation> > LockStack;
+typedef std::map<std::pair<void*, void*>, LockStack> LockOrders;
+typedef std::set<std::pair<void*, void*> > InvLockOrders;
 
-static boost::mutex dd_mutex;
-static std::map<std::pair<void*, void*>, LockStack> lockorders;
-static boost::thread_specific_ptr<LockStack> lockstack;
+struct LockData {
+    // Very ugly hack: as the global constructs and destructors run single
+    // threaded, we use this boolean to know whether LockData still exists,
+    // as DeleteLock can get called by global CCriticalSection destructors
+    // after LockData disappears.
+    bool available;
+    LockData() : available(true) {}
+    ~LockData() { available = false; }
 
+    LockOrders lockorders;
+    InvLockOrders invlockorders;
+    boost::mutex dd_mutex;
+} static lockdata;
+
+boost::thread_specific_ptr<LockStack> lockstack;
 
 static void potential_deadlock_detected(const std::pair<void*, void*>& mismatch, const LockStack& s1, const LockStack& s2)
 {
@@ -117,7 +130,7 @@ static void push_lock(void* c, const CLockLocation& locklocation, bool fTry)
     if (lockstack.get() == NULL)
         lockstack.reset(new LockStack);
 
-    dd_mutex.lock();
+    boost::unique_lock<boost::mutex> lock(lockdata.dd_mutex);
 
     (*lockstack).push_back(std::make_pair(c, locklocation));
 
@@ -127,23 +140,21 @@ static void push_lock(void* c, const CLockLocation& locklocation, bool fTry)
                 break;
 
             std::pair<void*, void*> p1 = std::make_pair(i.first, c);
-            if (lockorders.count(p1))
+            if (lockdata.lockorders.count(p1))
                 continue;
-            lockorders[p1] = (*lockstack);
+            lockdata.lockorders[p1] = (*lockstack);
 
             std::pair<void*, void*> p2 = std::make_pair(c, i.first);
-            if (lockorders.count(p2))
-                potential_deadlock_detected(p1, lockorders[p2], lockorders[p1]);
+            lockdata.invlockorders.insert(p2);
+            if (lockdata.lockorders.count(p2))
+                potential_deadlock_detected(p1, lockdata.lockorders[p2], lockdata.lockorders[p1]);
         }
     }
-    dd_mutex.unlock();
 }
 
 static void pop_lock()
 {
-    dd_mutex.lock();
     (*lockstack).pop_back();
-    dd_mutex.unlock();
 }
 
 void EnterCritical(const char* pszName, const char* pszFile, int nLine, void* cs, bool fTry)
@@ -173,4 +184,26 @@ void AssertLockHeldInternal(const char* pszName, const char* pszFile, int nLine,
     abort();
 }
 
+void DeleteLock(void* cs)
+{
+    if (!lockdata.available) {
+        // We're already shutting down.
+        return;
+    }
+    boost::unique_lock<boost::mutex> lock(lockdata.dd_mutex);
+    std::pair<void*, void*> item = std::make_pair(cs, (void*)0);
+    LockOrders::iterator it = lockdata.lockorders.lower_bound(item);
+    while (it != lockdata.lockorders.end() && it->first.first == cs) {
+        std::pair<void*, void*> invitem = std::make_pair(it->first.second, it->first.first);
+        lockdata.invlockorders.erase(invitem);
+        lockdata.lockorders.erase(it++);
+    }
+    InvLockOrders::iterator invit = lockdata.invlockorders.lower_bound(item);
+    while (invit != lockdata.invlockorders.end() && invit->first == cs) {
+        std::pair<void*, void*> invinvitem = std::make_pair(invit->second, invit->first);
+        lockdata.lockorders.erase(invinvitem);
+        lockdata.invlockorders.erase(invit++);
+    }
+}
+
 #endif /* DEBUG_LOCKORDER */
diff --git a/src/sync.h b/src/sync.h
index 34dd8c228eb76..0c58fb6b4e94c 100644
--- a/src/sync.h
+++ b/src/sync.h
@@ -71,30 +71,39 @@ class LOCKABLE AnnotatedMixin : public PARENT
     }
 };
 
-/**
- * Wrapped boost mutex: supports recursive locking, but no waiting
- * TODO: We should move away from using the recursive lock by default.
- */
-typedef AnnotatedMixin<boost::recursive_mutex> CCriticalSection;
-
-/** Wrapped boost mutex: supports waiting but not recursive locking */
-typedef AnnotatedMixin<boost::mutex> CWaitableCriticalSection;
-
-/** Just a typedef for boost::condition_variable, can be wrapped later if desired */
-typedef boost::condition_variable CConditionVariable;
-
 #ifdef DEBUG_LOCKORDER
 void EnterCritical(const char* pszName, const char* pszFile, int nLine, void* cs, bool fTry = false);
 void LeaveCritical();
 std::string LocksHeld();
 void AssertLockHeldInternal(const char* pszName, const char* pszFile, int nLine, void* cs);
+void DeleteLock(void* cs);
 #else
 void static inline EnterCritical(const char* pszName, const char* pszFile, int nLine, void* cs, bool fTry = false) {}
 void static inline LeaveCritical() {}
 void static inline AssertLockHeldInternal(const char* pszName, const char* pszFile, int nLine, void* cs) {}
+void static inline DeleteLock(void* cs) {}
 #endif
 #define AssertLockHeld(cs) AssertLockHeldInternal(#cs, __FILE__, __LINE__, &cs)
 
+/**
+ * Wrapped boost mutex: supports recursive locking, but no waiting
+ * TODO: We should move away from using the recursive lock by default.
+ */
+class CCriticalSection : public AnnotatedMixin<boost::recursive_mutex>
+{
+public:
+    ~CCriticalSection() {
+        DeleteLock((void*)this);
+    }
+};
+
+typedef CCriticalSection CDynamicCriticalSection;
+/** Wrapped boost mutex: supports waiting but not recursive locking */
+typedef AnnotatedMixin<boost::mutex> CWaitableCriticalSection;
+
+/** Just a typedef for boost::condition_variable, can be wrapped later if desired */
+typedef boost::condition_variable CConditionVariable;
+
 #ifdef DEBUG_LOCKCONTENTION
 void PrintLockContention(const char* pszName, const char* pszFile, int nLine);
 #endif

From faa41ee204124da19dcf1e5b8a3aef1e216bf5e6 Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Sun, 10 Apr 2016 16:54:28 +0200
Subject: [PATCH 0127/1802] [qa] py2: Unfiddle strings into bytes explicitly

---
 qa/rpc-tests/bip65-cltv-p2p.py             |   3 +-
 qa/rpc-tests/bip68-112-113-p2p.py          |   5 +-
 qa/rpc-tests/bip9-softforks.py             |   9 +-
 qa/rpc-tests/bipdersig-p2p.py              |   5 +-
 qa/rpc-tests/decodescript.py               |  22 ++-
 qa/rpc-tests/fundrawtransaction.py         |   3 -
 qa/rpc-tests/getblocktemplate_proposals.py |   2 +-
 qa/rpc-tests/httpbasics.py                 |  11 +-
 qa/rpc-tests/invalidblockrequest.py        |  10 +-
 qa/rpc-tests/invalidtxrequest.py           |   6 +-
 qa/rpc-tests/listtransactions.py           |   7 +-
 qa/rpc-tests/multi_rpc.py                  |  13 +-
 qa/rpc-tests/p2p-feefilter.py              |   2 +-
 qa/rpc-tests/p2p-fullblocktest.py          |  32 ++--
 qa/rpc-tests/proxy_test.py                 |   8 +-
 qa/rpc-tests/pruning.py                    |   2 +-
 qa/rpc-tests/rawtransactions.py            |   2 -
 qa/rpc-tests/replace-by-fee.py             |  10 +-
 qa/rpc-tests/rest.py                       |  15 +-
 qa/rpc-tests/test_framework/blocktools.py  |   2 +-
 qa/rpc-tests/test_framework/comptool.py    |   6 +-
 qa/rpc-tests/test_framework/mininode.py    | 186 ++++++++++-----------
 qa/rpc-tests/test_framework/netutil.py     |  11 +-
 qa/rpc-tests/test_framework/script.py      |   4 +-
 qa/rpc-tests/test_framework/socks5.py      |   2 +-
 qa/rpc-tests/test_framework/util.py        |  15 +-
 qa/rpc-tests/zmq_test.py                   |  22 +--
 src/test/bctest.py                         |   3 +-
 28 files changed, 205 insertions(+), 213 deletions(-)

diff --git a/qa/rpc-tests/bip65-cltv-p2p.py b/qa/rpc-tests/bip65-cltv-p2p.py
index 54559c3541f2e..99d74344aef95 100755
--- a/qa/rpc-tests/bip65-cltv-p2p.py
+++ b/qa/rpc-tests/bip65-cltv-p2p.py
@@ -10,7 +10,6 @@
 from test_framework.blocktools import create_coinbase, create_block
 from test_framework.comptool import TestInstance, TestManager
 from test_framework.script import CScript, OP_1NEGATE, OP_CHECKLOCKTIMEVERIFY, OP_DROP
-from binascii import unhexlify
 from io import BytesIO
 import time
 
@@ -60,7 +59,7 @@ def create_transaction(self, node, coinbase, to_address, amount):
         rawtx = node.createrawtransaction(inputs, outputs)
         signresult = node.signrawtransaction(rawtx)
         tx = CTransaction()
-        f = BytesIO(unhexlify(signresult['hex']))
+        f = BytesIO(hex_str_to_bytes(signresult['hex']))
         tx.deserialize(f)
         return tx
 
diff --git a/qa/rpc-tests/bip68-112-113-p2p.py b/qa/rpc-tests/bip68-112-113-p2p.py
index 35c831cb8b71d..3bcfdabe269a1 100755
--- a/qa/rpc-tests/bip68-112-113-p2p.py
+++ b/qa/rpc-tests/bip68-112-113-p2p.py
@@ -10,7 +10,6 @@
 from test_framework.blocktools import create_coinbase, create_block
 from test_framework.comptool import TestInstance, TestManager
 from test_framework.script import *
-from binascii import unhexlify
 from io import BytesIO
 import time
 
@@ -119,7 +118,7 @@ def create_transaction(self, node, txid, to_address, amount):
         outputs = { to_address : amount }
         rawtx = node.createrawtransaction(inputs, outputs)
         tx = CTransaction()
-        f = BytesIO(unhexlify(rawtx))
+        f = BytesIO(hex_str_to_bytes(rawtx))
         tx.deserialize(f)
         return tx
 
@@ -127,7 +126,7 @@ def sign_transaction(self, node, unsignedtx):
         rawtx = ToHex(unsignedtx)
         signresult = node.signrawtransaction(rawtx)
         tx = CTransaction()
-        f = BytesIO(unhexlify(signresult['hex']))
+        f = BytesIO(hex_str_to_bytes(signresult['hex']))
         tx.deserialize(f)
         return tx
 
diff --git a/qa/rpc-tests/bip9-softforks.py b/qa/rpc-tests/bip9-softforks.py
index 98975e719335c..d131eed92dc14 100755
--- a/qa/rpc-tests/bip9-softforks.py
+++ b/qa/rpc-tests/bip9-softforks.py
@@ -10,7 +10,6 @@
 from test_framework.blocktools import create_coinbase, create_block
 from test_framework.comptool import TestInstance, TestManager
 from test_framework.script import CScript, OP_1NEGATE, OP_NOP3, OP_DROP
-from binascii import hexlify, unhexlify
 from io import BytesIO
 import time
 import itertools
@@ -30,7 +29,6 @@
 '''
 
 
-
 class BIP9SoftForksTest(ComparisonTestFramework):
 
     def __init__(self):
@@ -53,15 +51,15 @@ def create_transaction(self, node, coinbase, to_address, amount):
         outputs = { to_address : amount }
         rawtx = node.createrawtransaction(inputs, outputs)
         tx = CTransaction()
-        f = BytesIO(unhexlify(rawtx))
+        f = BytesIO(hex_str_to_bytes(rawtx))
         tx.deserialize(f)
         tx.nVersion = 2
         return tx
 
     def sign_transaction(self, node, tx):
-        signresult = node.signrawtransaction(hexlify(tx.serialize()))
+        signresult = node.signrawtransaction(bytes_to_hex_str(tx.serialize()))
         tx = CTransaction()
-        f = BytesIO(unhexlify(signresult['hex']))
+        f = BytesIO(hex_str_to_bytes(signresult['hex']))
         tx.deserialize(f)
         return tx
 
@@ -184,7 +182,6 @@ def test_BIP(self, bipName, activated_version, invalidate, invalidatePostSignatu
         NetworkThread().start() # Start up network handling in another thread
 
 
-
     def get_tests(self):
         for test in itertools.chain(
                 self.test_BIP('csv', 536870913, self.sequence_lock_invalidate, self.donothing),
diff --git a/qa/rpc-tests/bipdersig-p2p.py b/qa/rpc-tests/bipdersig-p2p.py
index 95be385d93fb0..bba86a50c4c56 100755
--- a/qa/rpc-tests/bipdersig-p2p.py
+++ b/qa/rpc-tests/bipdersig-p2p.py
@@ -10,7 +10,6 @@
 from test_framework.blocktools import create_coinbase, create_block
 from test_framework.comptool import TestInstance, TestManager
 from test_framework.script import CScript
-from binascii import unhexlify
 from io import BytesIO
 import time
 
@@ -25,7 +24,7 @@ def unDERify(tx):
     newscript = []
     for i in scriptSig:
         if (len(newscript) == 0):
-            newscript.append(i[0:-1] + '\0' + i[-1])
+            newscript.append(i[0:-1] + b'\0' + i[-1:])
         else:
             newscript.append(i)
     tx.vin[0].scriptSig = CScript(newscript)
@@ -68,7 +67,7 @@ def create_transaction(self, node, coinbase, to_address, amount):
         rawtx = node.createrawtransaction(inputs, outputs)
         signresult = node.signrawtransaction(rawtx)
         tx = CTransaction()
-        f = BytesIO(unhexlify(signresult['hex']))
+        f = BytesIO(hex_str_to_bytes(signresult['hex']))
         tx.deserialize(f)
         return tx
 
diff --git a/qa/rpc-tests/decodescript.py b/qa/rpc-tests/decodescript.py
index 2dfafac2fc180..578844f2c5bb0 100755
--- a/qa/rpc-tests/decodescript.py
+++ b/qa/rpc-tests/decodescript.py
@@ -6,7 +6,6 @@
 from test_framework.test_framework import BitcoinTestFramework
 from test_framework.util import *
 from test_framework.mininode import *
-from binascii import hexlify, unhexlify
 from io import BytesIO
 
 class DecodeScriptTest(BitcoinTestFramework):
@@ -131,7 +130,7 @@ def decoderawtransaction_asm_sighashtype(self):
         assert_equal('OP_DUP OP_HASH160 dc863734a218bfe83ef770ee9d41a27f824a6e56 OP_EQUALVERIFY OP_CHECKSIG', rpc_result['vout'][0]['scriptPubKey']['asm'])
         assert_equal('OP_HASH160 2a5edea39971049a540474c6a99edf0aa4074c58 OP_EQUAL', rpc_result['vout'][1]['scriptPubKey']['asm'])
         txSave = CTransaction()
-        txSave.deserialize(BytesIO(unhexlify(tx)))
+        txSave.deserialize(BytesIO(hex_str_to_bytes(tx)))
 
         # make sure that a specifically crafted op_return value will not pass all the IsDERSignature checks and then get decoded as a sighash type
         tx = '01000000015ded05872fdbda629c7d3d02b194763ce3b9b1535ea884e3c8e765d42e316724020000006b48304502204c10d4064885c42638cbff3585915b322de33762598321145ba033fc796971e2022100bb153ad3baa8b757e30a2175bd32852d2e1cb9080f84d7e32fcdfd667934ef1b012103163c0ff73511ea1743fb5b98384a2ff09dd06949488028fd819f4d83f56264efffffffff0200000000000000000b6a0930060201000201000180380100000000001976a9141cabd296e753837c086da7a45a6c2fe0d49d7b7b88ac00000000'
@@ -147,7 +146,7 @@ def decoderawtransaction_asm_sighashtype(self):
         # some more full transaction tests of varying specific scriptSigs. used instead of
         # tests in decodescript_script_sig because the decodescript RPC is specifically
         # for working on scriptPubKeys (argh!).
-        push_signature = hexlify(txSave.vin[0].scriptSig)[2:(0x48*2+4)]
+        push_signature = bytes_to_hex_str(txSave.vin[0].scriptSig)[2:(0x48*2+4)]
         signature = push_signature[2:]
         der_signature = signature[:-2]
         signature_sighash_decoded = der_signature + '[ALL]'
@@ -156,25 +155,24 @@ def decoderawtransaction_asm_sighashtype(self):
         signature_2_sighash_decoded = der_signature + '[NONE|ANYONECANPAY]'
 
         # 1) P2PK scriptSig
-        txSave.vin[0].scriptSig = unhexlify(push_signature)
-        rpc_result = self.nodes[0].decoderawtransaction(hexlify(txSave.serialize()))
+        txSave.vin[0].scriptSig = hex_str_to_bytes(push_signature)
+        rpc_result = self.nodes[0].decoderawtransaction(bytes_to_hex_str(txSave.serialize()))
         assert_equal(signature_sighash_decoded, rpc_result['vin'][0]['scriptSig']['asm'])
 
         # make sure that the sighash decodes come out correctly for a more complex / lesser used case.
-        txSave.vin[0].scriptSig = unhexlify(push_signature_2)
-        rpc_result = self.nodes[0].decoderawtransaction(hexlify(txSave.serialize()))
+        txSave.vin[0].scriptSig = hex_str_to_bytes(push_signature_2)
+        rpc_result = self.nodes[0].decoderawtransaction(bytes_to_hex_str(txSave.serialize()))
         assert_equal(signature_2_sighash_decoded, rpc_result['vin'][0]['scriptSig']['asm'])
 
         # 2) multisig scriptSig
-        txSave.vin[0].scriptSig = unhexlify('00' + push_signature + push_signature_2)
-        rpc_result = self.nodes[0].decoderawtransaction(hexlify(txSave.serialize()))
+        txSave.vin[0].scriptSig = hex_str_to_bytes('00' + push_signature + push_signature_2)
+        rpc_result = self.nodes[0].decoderawtransaction(bytes_to_hex_str(txSave.serialize()))
         assert_equal('0 ' + signature_sighash_decoded + ' ' + signature_2_sighash_decoded, rpc_result['vin'][0]['scriptSig']['asm'])
 
         # 3) test a scriptSig that contains more than push operations.
         # in fact, it contains an OP_RETURN with data specially crafted to cause improper decode if the code does not catch it.
-        txSave.vin[0].scriptSig = unhexlify('6a143011020701010101010101020601010101010101')
-        rpc_result = self.nodes[0].decoderawtransaction(hexlify(txSave.serialize()))
-        print(hexlify('636174'))
+        txSave.vin[0].scriptSig = hex_str_to_bytes('6a143011020701010101010101020601010101010101')
+        rpc_result = self.nodes[0].decoderawtransaction(bytes_to_hex_str(txSave.serialize()))
         assert_equal('OP_RETURN 3011020701010101010101020601010101010101', rpc_result['vin'][0]['scriptSig']['asm'])
 
     def run_test(self):
diff --git a/qa/rpc-tests/fundrawtransaction.py b/qa/rpc-tests/fundrawtransaction.py
index 82c9e48a49735..4492ea398f4ba 100755
--- a/qa/rpc-tests/fundrawtransaction.py
+++ b/qa/rpc-tests/fundrawtransaction.py
@@ -148,7 +148,6 @@ def run_test(self):
         assert_equal(fee + totalOut, utx['amount']) #compare vin total and totalout+fee
 
 
-
         #####################################################################
         # test a fundrawtransaction with which will not get a change output #
         #####################################################################
@@ -178,7 +177,6 @@ def run_test(self):
         assert_equal(fee + totalOut, utx['amount']) #compare vin total and totalout+fee
 
 
-
         #########################################################################
         # test a fundrawtransaction with a VIN smaller than the required amount #
         #########################################################################
@@ -484,7 +482,6 @@ def run_test(self):
         assert_equal(oldBalance+Decimal('51.10000000'), self.nodes[0].getbalance())
 
 
-
         ###############################################
         # multiple (~19) inputs tx test | Compare fee #
         ###############################################
diff --git a/qa/rpc-tests/getblocktemplate_proposals.py b/qa/rpc-tests/getblocktemplate_proposals.py
index d2cb4ab8d69b9..07bfe69c6d869 100755
--- a/qa/rpc-tests/getblocktemplate_proposals.py
+++ b/qa/rpc-tests/getblocktemplate_proposals.py
@@ -130,7 +130,7 @@ def run_test(self):
 
         # Test 5: Add an invalid tx to the end (non-duplicate)
         txlist.append(bytearray(txlist[0]))
-        txlist[-1][4+1] = b'\xff'
+        txlist[-1][4+1] = 0xff
         assert_template(node, tmpl, txlist, 'bad-txns-inputs-missingorspent')
         txlist.pop()
 
diff --git a/qa/rpc-tests/httpbasics.py b/qa/rpc-tests/httpbasics.py
index eff4c6e808bbd..cf37976a4ed85 100755
--- a/qa/rpc-tests/httpbasics.py
+++ b/qa/rpc-tests/httpbasics.py
@@ -9,7 +9,6 @@
 
 from test_framework.test_framework import BitcoinTestFramework
 from test_framework.util import *
-import base64
 
 try:
     import http.client as httplib
@@ -31,7 +30,7 @@ def run_test(self):
         #################################################
         url = urlparse.urlparse(self.nodes[0].url)
         authpair = url.username + ':' + url.password
-        headers = {"Authorization": "Basic " + base64.b64encode(authpair)}
+        headers = {"Authorization": "Basic " + str_to_b64str(authpair)}
 
         conn = httplib.HTTPConnection(url.hostname, url.port)
         conn.connect()
@@ -48,7 +47,7 @@ def run_test(self):
         conn.close()
 
         #same should be if we add keep-alive because this should be the std. behaviour
-        headers = {"Authorization": "Basic " + base64.b64encode(authpair), "Connection": "keep-alive"}
+        headers = {"Authorization": "Basic " + str_to_b64str(authpair), "Connection": "keep-alive"}
 
         conn = httplib.HTTPConnection(url.hostname, url.port)
         conn.connect()
@@ -65,7 +64,7 @@ def run_test(self):
         conn.close()
 
         #now do the same with "Connection: close"
-        headers = {"Authorization": "Basic " + base64.b64encode(authpair), "Connection":"close"}
+        headers = {"Authorization": "Basic " + str_to_b64str(authpair), "Connection":"close"}
 
         conn = httplib.HTTPConnection(url.hostname, url.port)
         conn.connect()
@@ -77,7 +76,7 @@ def run_test(self):
         #node1 (2nd node) is running with disabled keep-alive option
         urlNode1 = urlparse.urlparse(self.nodes[1].url)
         authpair = urlNode1.username + ':' + urlNode1.password
-        headers = {"Authorization": "Basic " + base64.b64encode(authpair)}
+        headers = {"Authorization": "Basic " + str_to_b64str(authpair)}
 
         conn = httplib.HTTPConnection(urlNode1.hostname, urlNode1.port)
         conn.connect()
@@ -88,7 +87,7 @@ def run_test(self):
         #node2 (third node) is running with standard keep-alive parameters which means keep-alive is on
         urlNode2 = urlparse.urlparse(self.nodes[2].url)
         authpair = urlNode2.username + ':' + urlNode2.password
-        headers = {"Authorization": "Basic " + base64.b64encode(authpair)}
+        headers = {"Authorization": "Basic " + str_to_b64str(authpair)}
 
         conn = httplib.HTTPConnection(urlNode2.hostname, urlNode2.port)
         conn.connect()
diff --git a/qa/rpc-tests/invalidblockrequest.py b/qa/rpc-tests/invalidblockrequest.py
index daad312d36390..de6be8d5b5b5d 100755
--- a/qa/rpc-tests/invalidblockrequest.py
+++ b/qa/rpc-tests/invalidblockrequest.py
@@ -77,9 +77,9 @@ def get_tests(self):
         block2 = create_block(self.tip, create_coinbase(height), self.block_time)
         self.block_time += 1
 
-        # chr(81) is OP_TRUE
-        tx1 = create_transaction(self.block1.vtx[0], 0, chr(81), 50 * COIN)
-        tx2 = create_transaction(tx1, 0, chr(81), 50 * COIN)
+        # b'0x51' is OP_TRUE
+        tx1 = create_transaction(self.block1.vtx[0], 0, b'\x51', 50 * COIN)
+        tx2 = create_transaction(tx1, 0, b'\x51', 50 * COIN)
 
         block2.vtx.extend([tx1, tx2])
         block2.hashMerkleRoot = block2.calc_merkle_root()
@@ -95,7 +95,7 @@ def get_tests(self):
         assert(block2_orig.vtx != block2.vtx)
 
         self.tip = block2.sha256
-        yield TestInstance([[block2, RejectResult(16,'bad-txns-duplicate')], [block2_orig, True]])
+        yield TestInstance([[block2, RejectResult(16, b'bad-txns-duplicate')], [block2_orig, True]])
         height += 1
 
         '''
@@ -110,7 +110,7 @@ def get_tests(self):
         block3.rehash()
         block3.solve()
 
-        yield TestInstance([[block3, RejectResult(16,'bad-cb-amount')]])
+        yield TestInstance([[block3, RejectResult(16, b'bad-cb-amount')]])
 
 
 if __name__ == '__main__':
diff --git a/qa/rpc-tests/invalidtxrequest.py b/qa/rpc-tests/invalidtxrequest.py
index 8fe471ccd318b..7b8199bab0cc4 100755
--- a/qa/rpc-tests/invalidtxrequest.py
+++ b/qa/rpc-tests/invalidtxrequest.py
@@ -61,10 +61,10 @@ def get_tests(self):
             height += 1
         yield test
 
-        # chr(100) is OP_NOTIF
+        # b'\x64' is OP_NOTIF
         # Transaction will be rejected with code 16 (REJECT_INVALID)
-        tx1 = create_transaction(self.block1.vtx[0], 0, chr(100), 50 * COIN - 12000)
-        yield TestInstance([[tx1, RejectResult(16, 'mandatory-script-verify-flag-failed')]])
+        tx1 = create_transaction(self.block1.vtx[0], 0, b'\x64', 50 * COIN - 12000)
+        yield TestInstance([[tx1, RejectResult(16, b'mandatory-script-verify-flag-failed')]])
 
         # TODO: test further transactions...
 
diff --git a/qa/rpc-tests/listtransactions.py b/qa/rpc-tests/listtransactions.py
index 8fe72d95d1d0d..0783a1f3d3717 100755
--- a/qa/rpc-tests/listtransactions.py
+++ b/qa/rpc-tests/listtransactions.py
@@ -9,11 +9,10 @@
 from test_framework.util import *
 from test_framework.mininode import CTransaction, COIN
 from io import BytesIO
-import binascii
 
 def txFromHex(hexstring):
     tx = CTransaction()
-    f = BytesIO(binascii.unhexlify(hexstring))
+    f = BytesIO(hex_str_to_bytes(hexstring))
     tx.deserialize(f)
     return tx
 
@@ -167,7 +166,7 @@ def get_unconfirmed_utxo_entry(node, txid_to_match):
         tx3 = self.nodes[0].createrawtransaction(inputs, outputs)
         tx3_modified = txFromHex(tx3)
         tx3_modified.vin[0].nSequence = 0
-        tx3 = binascii.hexlify(tx3_modified.serialize()).decode('utf-8')
+        tx3 = bytes_to_hex_str(tx3_modified.serialize())
         tx3_signed = self.nodes[0].signrawtransaction(tx3)['hex']
         txid_3 = self.nodes[0].sendrawtransaction(tx3_signed)
 
@@ -193,7 +192,7 @@ def get_unconfirmed_utxo_entry(node, txid_to_match):
         # Replace tx3, and check that tx4 becomes unknown
         tx3_b = tx3_modified
         tx3_b.vout[0].nValue -= int(Decimal("0.004") * COIN) # bump the fee
-        tx3_b = binascii.hexlify(tx3_b.serialize()).decode('utf-8')
+        tx3_b = bytes_to_hex_str(tx3_b.serialize())
         tx3_b_signed = self.nodes[0].signrawtransaction(tx3_b)['hex']
         txid_3b = self.nodes[0].sendrawtransaction(tx3_b_signed, True)
         assert(is_opt_in(self.nodes[0], txid_3b))
diff --git a/qa/rpc-tests/multi_rpc.py b/qa/rpc-tests/multi_rpc.py
index 2452b77319805..afb18cf3da20d 100755
--- a/qa/rpc-tests/multi_rpc.py
+++ b/qa/rpc-tests/multi_rpc.py
@@ -53,7 +53,7 @@ def run_test(self):
         password2 = "8/F3uMDw4KSEbw96U3CA1C4X05dkHDN2BPFjTgZW4KI="
         authpairnew = "rt:"+password
 
-        headers = {"Authorization": "Basic " + base64.b64encode(authpair)}
+        headers = {"Authorization": "Basic " + str_to_b64str(authpair)}
 
         conn = httplib.HTTPConnection(url.hostname, url.port)
         conn.connect()
@@ -63,7 +63,7 @@ def run_test(self):
         conn.close()
         
         #Use new authpair to confirm both work
-        headers = {"Authorization": "Basic " + base64.b64encode(authpairnew)}
+        headers = {"Authorization": "Basic " + str_to_b64str(authpairnew)}
 
         conn = httplib.HTTPConnection(url.hostname, url.port)
         conn.connect()
@@ -74,7 +74,7 @@ def run_test(self):
 
         #Wrong login name with rt's password
         authpairnew = "rtwrong:"+password
-        headers = {"Authorization": "Basic " + base64.b64encode(authpairnew)}
+        headers = {"Authorization": "Basic " + str_to_b64str(authpairnew)}
 
         conn = httplib.HTTPConnection(url.hostname, url.port)
         conn.connect()
@@ -85,7 +85,7 @@ def run_test(self):
 
         #Wrong password for rt
         authpairnew = "rt:"+password+"wrong"
-        headers = {"Authorization": "Basic " + base64.b64encode(authpairnew)}
+        headers = {"Authorization": "Basic " + str_to_b64str(authpairnew)}
 
         conn = httplib.HTTPConnection(url.hostname, url.port)
         conn.connect()
@@ -96,7 +96,7 @@ def run_test(self):
 
         #Correct for rt2
         authpairnew = "rt2:"+password2
-        headers = {"Authorization": "Basic " + base64.b64encode(authpairnew)}
+        headers = {"Authorization": "Basic " + str_to_b64str(authpairnew)}
 
         conn = httplib.HTTPConnection(url.hostname, url.port)
         conn.connect()
@@ -107,7 +107,7 @@ def run_test(self):
 
         #Wrong password for rt2
         authpairnew = "rt2:"+password2+"wrong"
-        headers = {"Authorization": "Basic " + base64.b64encode(authpairnew)}
+        headers = {"Authorization": "Basic " + str_to_b64str(authpairnew)}
 
         conn = httplib.HTTPConnection(url.hostname, url.port)
         conn.connect()
@@ -117,6 +117,5 @@ def run_test(self):
         conn.close()
 
 
-
 if __name__ == '__main__':
     HTTPBasicsTest ().main ()
diff --git a/qa/rpc-tests/p2p-feefilter.py b/qa/rpc-tests/p2p-feefilter.py
index f85c18dcd5140..281b6ca37a0ce 100755
--- a/qa/rpc-tests/p2p-feefilter.py
+++ b/qa/rpc-tests/p2p-feefilter.py
@@ -14,7 +14,7 @@
 '''
 
 def hashToHex(hash):
-    return format(hash, '064x').decode('utf-8')
+    return format(hash, '064x')
 
 # Wait up to 60 secs to see if the testnode has received all the expected invs
 def allInvsMatch(invsExpected, testnode):
diff --git a/qa/rpc-tests/p2p-fullblocktest.py b/qa/rpc-tests/p2p-fullblocktest.py
index 131350c98ddf0..ae82d9dca9266 100755
--- a/qa/rpc-tests/p2p-fullblocktest.py
+++ b/qa/rpc-tests/p2p-fullblocktest.py
@@ -33,7 +33,7 @@ def __init__(self):
         self.num_nodes = 1
         self.block_heights = {}
         self.coinbase_key = CECKey()
-        self.coinbase_key.set_secretbytes(bytes("horsebattery"))
+        self.coinbase_key.set_secretbytes(b"horsebattery")
         self.coinbase_pubkey = self.coinbase_key.get_pubkey()
         self.block_time = int(time.time())+1
         self.tip = None
@@ -70,7 +70,7 @@ def next_block(self, number, spend=None, additional_coinbase_value=0, script=Non
         block = create_block(base_block_hash, coinbase, self.block_time)
         if (spend != None):
             tx = CTransaction()
-            tx.vin.append(CTxIn(COutPoint(spend.tx.sha256, spend.n), "", 0xffffffff))  # no signature yet
+            tx.vin.append(CTxIn(COutPoint(spend.tx.sha256, spend.n), b"", 0xffffffff))  # no signature yet
             # This copies the java comparison tool testing behavior: the first
             # txout has a garbage scriptPubKey, "to make sure we're not
             # pre-verifying too much" (?)
@@ -80,7 +80,7 @@ def next_block(self, number, spend=None, additional_coinbase_value=0, script=Non
             else:
                 tx.vout.append(CTxOut(1, script))
             # Now sign it if necessary
-            scriptSig = ""
+            scriptSig = b""
             scriptPubKey = bytearray(spend.tx.vout[spend.n].scriptPubKey)
             if (scriptPubKey[0] == OP_TRUE):  # looks like an anyone-can-spend
                 scriptSig = CScript([OP_TRUE])
@@ -225,7 +225,7 @@ def update_block(block_number, new_transactions):
         #                      \-> b3 (1) -> b4 (2)
         tip(6)
         block(9, spend=out4, additional_coinbase_value=1)
-        yield rejected(RejectResult(16, 'bad-cb-amount'))
+        yield rejected(RejectResult(16, b'bad-cb-amount'))
 
         
         # Create a fork that ends in a block with too much fee (the one that causes the reorg)
@@ -237,7 +237,7 @@ def update_block(block_number, new_transactions):
         yield rejected()
 
         block(11, spend=out4, additional_coinbase_value=1)
-        yield rejected(RejectResult(16, 'bad-cb-amount'))
+        yield rejected(RejectResult(16, b'bad-cb-amount'))
 
 
         # Try again, but with a valid fork first
@@ -279,7 +279,7 @@ def update_block(block_number, new_transactions):
         out6 = get_spendable_output()
         too_many_checksigs = CScript([OP_CHECKSIG] * (1000000 // 50))
         block(16, spend=out6, script=too_many_checksigs)
-        yield rejected(RejectResult(16, 'bad-blk-sigops'))
+        yield rejected(RejectResult(16, b'bad-blk-sigops'))
 
 
         # Attempt to spend a transaction created on a different fork
@@ -288,7 +288,7 @@ def update_block(block_number, new_transactions):
         #                      \-> b3 (1) -> b4 (2)
         tip(15)
         block(17, spend=txout_b3)
-        yield rejected(RejectResult(16, 'bad-txns-inputs-missingorspent'))
+        yield rejected(RejectResult(16, b'bad-txns-inputs-missingorspent'))
 
         # Attempt to spend a transaction created on a different fork (on a fork this time)
         #     genesis -> b1 (0) -> b2 (1) -> b5 (2) -> b6  (3)
@@ -309,7 +309,7 @@ def update_block(block_number, new_transactions):
         tip(15)
         out7 = get_spendable_output()
         block(20, spend=out7)
-        yield rejected(RejectResult(16, 'bad-txns-premature-spend-of-coinbase'))
+        yield rejected(RejectResult(16, b'bad-txns-premature-spend-of-coinbase'))
 
         # Attempt to spend a coinbase at depth too low (on a fork this time)
         #     genesis -> b1 (0) -> b2 (1) -> b5 (2) -> b6  (3)
@@ -333,7 +333,7 @@ def update_block(block_number, new_transactions):
         old_hash = b23.sha256
         tx = CTransaction()
         script_length = MAX_BLOCK_SIZE - len(b23.serialize()) - 69
-        script_output = CScript([chr(0)*script_length])
+        script_output = CScript([b'\x00' * script_length])
         tx.vout.append(CTxOut(0, script_output))
         tx.vin.append(CTxIn(COutPoint(b23.vtx[1].sha256, 1)))
         b23 = update_block(23, [tx])
@@ -345,11 +345,11 @@ def update_block(block_number, new_transactions):
         tip(15)
         b24 = block(24, spend=out6)
         script_length = MAX_BLOCK_SIZE - len(b24.serialize()) - 69
-        script_output = CScript([chr(0)*(script_length+1)])
+        script_output = CScript([b'\x00' * (script_length+1)])
         tx.vout = [CTxOut(0, script_output)]
         b24 = update_block(24, [tx])
         assert_equal(len(b24.serialize()), MAX_BLOCK_SIZE+1)
-        yield rejected(RejectResult(16, 'bad-blk-length'))
+        yield rejected(RejectResult(16, b'bad-blk-length'))
 
         b25 = block(25, spend=out7)
         yield rejected()
@@ -361,12 +361,12 @@ def update_block(block_number, new_transactions):
         #                      \-> b3 (1) -> b4 (2)
         tip(15)
         b26 = block(26, spend=out6)
-        b26.vtx[0].vin[0].scriptSig = chr(0)
+        b26.vtx[0].vin[0].scriptSig = b'\x00'
         b26.vtx[0].rehash()
         # update_block causes the merkle root to get updated, even with no new
         # transactions, and updates the required state.
         b26 = update_block(26, [])
-        yield rejected(RejectResult(16, 'bad-cb-length'))
+        yield rejected(RejectResult(16, b'bad-cb-length'))
 
         # Extend the b26 chain to make sure bitcoind isn't accepting b26
         b27 = block(27, spend=out7)
@@ -375,10 +375,10 @@ def update_block(block_number, new_transactions):
         # Now try a too-large-coinbase script
         tip(15)
         b28 = block(28, spend=out6)
-        b28.vtx[0].vin[0].scriptSig = chr(0)*101
+        b28.vtx[0].vin[0].scriptSig = b'\x00' * 101
         b28.vtx[0].rehash()
         b28 = update_block(28, [])
-        yield rejected(RejectResult(16, 'bad-cb-length'))
+        yield rejected(RejectResult(16, b'bad-cb-length'))
 
         # Extend the b28 chain to make sure bitcoind isn't accepted b28
         b29 = block(29, spend=out7)
@@ -390,7 +390,7 @@ def update_block(block_number, new_transactions):
         # b30 has a max-sized coinbase scriptSig.
         tip(23)
         b30 = block(30)
-        b30.vtx[0].vin[0].scriptSig = chr(0)*100
+        b30.vtx[0].vin[0].scriptSig = b'\x00' * 100
         b30.vtx[0].rehash()
         b30 = update_block(30, [])
         yield accepted()
diff --git a/qa/rpc-tests/proxy_test.py b/qa/rpc-tests/proxy_test.py
index b3c65573ea332..91c871ddc9003 100755
--- a/qa/rpc-tests/proxy_test.py
+++ b/qa/rpc-tests/proxy_test.py
@@ -86,7 +86,7 @@ def node_test(self, node, proxies, auth, test_onion=True):
         assert(isinstance(cmd, Socks5Command))
         # Note: bitcoind's SOCKS5 implementation only sends atyp DOMAINNAME, even if connecting directly to IPv4/IPv6
         assert_equal(cmd.atyp, AddressType.DOMAINNAME)
-        assert_equal(cmd.addr, "15.61.23.23")
+        assert_equal(cmd.addr, b"15.61.23.23")
         assert_equal(cmd.port, 1234)
         if not auth:
             assert_equal(cmd.username, None)
@@ -100,7 +100,7 @@ def node_test(self, node, proxies, auth, test_onion=True):
             assert(isinstance(cmd, Socks5Command))
             # Note: bitcoind's SOCKS5 implementation only sends atyp DOMAINNAME, even if connecting directly to IPv4/IPv6
             assert_equal(cmd.atyp, AddressType.DOMAINNAME)
-            assert_equal(cmd.addr, "1233:3432:2434:2343:3234:2345:6546:4534")
+            assert_equal(cmd.addr, b"1233:3432:2434:2343:3234:2345:6546:4534")
             assert_equal(cmd.port, 5443)
             if not auth:
                 assert_equal(cmd.username, None)
@@ -113,7 +113,7 @@ def node_test(self, node, proxies, auth, test_onion=True):
             cmd = proxies[2].queue.get()
             assert(isinstance(cmd, Socks5Command))
             assert_equal(cmd.atyp, AddressType.DOMAINNAME)
-            assert_equal(cmd.addr, "bitcoinostk4e4re.onion")
+            assert_equal(cmd.addr, b"bitcoinostk4e4re.onion")
             assert_equal(cmd.port, 8333)
             if not auth:
                 assert_equal(cmd.username, None)
@@ -125,7 +125,7 @@ def node_test(self, node, proxies, auth, test_onion=True):
         cmd = proxies[3].queue.get()
         assert(isinstance(cmd, Socks5Command))
         assert_equal(cmd.atyp, AddressType.DOMAINNAME)
-        assert_equal(cmd.addr, "node.noumenon")
+        assert_equal(cmd.addr, b"node.noumenon")
         assert_equal(cmd.port, 8333)
         if not auth:
             assert_equal(cmd.username, None)
diff --git a/qa/rpc-tests/pruning.py b/qa/rpc-tests/pruning.py
index dd2adea950f23..eccd157e5c085 100755
--- a/qa/rpc-tests/pruning.py
+++ b/qa/rpc-tests/pruning.py
@@ -311,7 +311,7 @@ def run_test(self):
         #                   \                 \
         #                    ++...++(1044)     ..
         #
-        # N0    ********************(1032) @@...@@@(1552) 
+        # N0    ********************(1032) @@...@@@(1552)
         #                                 \
         #                                  *...**(1320)
 
diff --git a/qa/rpc-tests/rawtransactions.py b/qa/rpc-tests/rawtransactions.py
index 762a6d6a30c21..e38ef6c8b1071 100755
--- a/qa/rpc-tests/rawtransactions.py
+++ b/qa/rpc-tests/rawtransactions.py
@@ -88,8 +88,6 @@ def run_test(self):
         assert_equal(self.nodes[2].getbalance(), bal+Decimal('1.20000000')) #node2 has both keys of the 2of2 ms addr., tx should affect the balance
 
 
-
-
         # 2of3 test from different nodes
         bal = self.nodes[2].getbalance()
         addr1 = self.nodes[1].getnewaddress()
diff --git a/qa/rpc-tests/replace-by-fee.py b/qa/rpc-tests/replace-by-fee.py
index b951900c4dbd9..4c8ef6de26eb2 100755
--- a/qa/rpc-tests/replace-by-fee.py
+++ b/qa/rpc-tests/replace-by-fee.py
@@ -11,15 +11,11 @@
 from test_framework.util import *
 from test_framework.script import *
 from test_framework.mininode import *
-import binascii
 
 MAX_REPLACEMENT_LIMIT = 100
 
-def satoshi_round(amount):
-    return Decimal(amount).quantize(Decimal('0.00000001'), rounding=ROUND_DOWN)
-
 def txToHex(tx):
-    return binascii.hexlify(tx.serialize()).decode('utf-8')
+    return bytes_to_hex_str(tx.serialize())
 
 def make_utxo(node, amount, confirmed=True, scriptPubKey=CScript([1])):
     """Create a txout with a given amount and scriptPubKey
@@ -53,9 +49,7 @@ def make_utxo(node, amount, confirmed=True, scriptPubKey=CScript([1])):
     tx2.vout = [CTxOut(amount, scriptPubKey)]
     tx2.rehash()
 
-    binascii.hexlify(tx2.serialize()).decode('utf-8')
-
-    signed_tx = node.signrawtransaction(binascii.hexlify(tx2.serialize()).decode('utf-8'))
+    signed_tx = node.signrawtransaction(txToHex(tx2))
 
     txid = node.sendrawtransaction(signed_tx['hex'], True)
 
diff --git a/qa/rpc-tests/rest.py b/qa/rpc-tests/rest.py
index 3c8a405bdd044..359f9239fb370 100755
--- a/qa/rpc-tests/rest.py
+++ b/qa/rpc-tests/rest.py
@@ -39,7 +39,7 @@ def http_get_call(host, port, path, response_object = 0):
     if response_object:
         return conn.getresponse()
 
-    return conn.getresponse().read()
+    return conn.getresponse().read().decode('utf-8')
 
 #allows simple http post calls with a request body
 def http_post_call(host, port, path, requestdata = '', response_object = 0):
@@ -141,9 +141,9 @@ def run_test(self):
         bb_hash = self.nodes[0].getbestblockhash()
 
         binaryRequest = b'\x01\x02'
-        binaryRequest += binascii.unhexlify(txid)
+        binaryRequest += hex_str_to_bytes(txid)
         binaryRequest += pack("i", n)
-        binaryRequest += binascii.unhexlify(vintx)
+        binaryRequest += hex_str_to_bytes(vintx)
         binaryRequest += pack("i", 0)
 
         bin_response = http_post_call(url.hostname, url.port, '/rest/getutxos'+self.FORMAT_SEPARATOR+'bin', binaryRequest)
@@ -234,7 +234,7 @@ def run_test(self):
         assert_equal(response_hex.status, 200)
         assert_greater_than(int(response_hex.getheader('content-length')), 160)
         response_hex_str = response_hex.read()
-        assert_equal(encode(response_str, "hex")[0:160], response_hex_str[0:160])
+        assert_equal(encode(response_str, "hex_codec")[0:160], response_hex_str[0:160])
 
         # compare with hex block header
         response_header_hex = http_get_call(url.hostname, url.port, '/rest/headers/1/'+bb_hash+self.FORMAT_SEPARATOR+"hex", True)
@@ -242,7 +242,7 @@ def run_test(self):
         assert_greater_than(int(response_header_hex.getheader('content-length')), 160)
         response_header_hex_str = response_header_hex.read()
         assert_equal(response_hex_str[0:160], response_header_hex_str[0:160])
-        assert_equal(encode(response_header_str, "hex")[0:160], response_header_hex_str[0:160])
+        assert_equal(encode(response_header_str, "hex_codec")[0:160], response_header_hex_str[0:160])
 
         # check json format
         block_json_string = http_get_call(url.hostname, url.port, '/rest/block/'+bb_hash+self.FORMAT_SEPARATOR+'json')
@@ -252,7 +252,7 @@ def run_test(self):
         # compare with json block header
         response_header_json = http_get_call(url.hostname, url.port, '/rest/headers/1/'+bb_hash+self.FORMAT_SEPARATOR+"json", True)
         assert_equal(response_header_json.status, 200)
-        response_header_json_str = response_header_json.read()
+        response_header_json_str = response_header_json.read().decode('utf-8')
         json_obj = json.loads(response_header_json_str, parse_float=Decimal)
         assert_equal(len(json_obj), 1) #ensure that there is one header in the json response
         assert_equal(json_obj[0]['hash'], bb_hash) #request/response hash should be the same
@@ -276,7 +276,7 @@ def run_test(self):
         self.sync_all()
         response_header_json = http_get_call(url.hostname, url.port, '/rest/headers/5/'+bb_hash+self.FORMAT_SEPARATOR+"json", True)
         assert_equal(response_header_json.status, 200)
-        response_header_json_str = response_header_json.read()
+        response_header_json_str = response_header_json.read().decode('utf-8')
         json_obj = json.loads(response_header_json_str)
         assert_equal(len(json_obj), 5) #now we should have 5 header objects
 
@@ -292,7 +292,6 @@ def run_test(self):
         assert_greater_than(int(response.getheader('content-length')), 10)
 
 
-
         # check block tx details
         # let's make 3 tx and mine them on node 1
         txs = []
diff --git a/qa/rpc-tests/test_framework/blocktools.py b/qa/rpc-tests/test_framework/blocktools.py
index afa0f5f9ba5ec..384f40e62dfca 100644
--- a/qa/rpc-tests/test_framework/blocktools.py
+++ b/qa/rpc-tests/test_framework/blocktools.py
@@ -62,6 +62,6 @@ def create_transaction(prevtx, n, sig, value):
     tx = CTransaction()
     assert(n < len(prevtx.vout))
     tx.vin.append(CTxIn(COutPoint(prevtx.sha256, n), sig, 0xffffffff))
-    tx.vout.append(CTxOut(value, ""))
+    tx.vout.append(CTxOut(value, b""))
     tx.calc_sha256()
     return tx
diff --git a/qa/rpc-tests/test_framework/comptool.py b/qa/rpc-tests/test_framework/comptool.py
index 6279070fbc1bb..17626cf8dada4 100755
--- a/qa/rpc-tests/test_framework/comptool.py
+++ b/qa/rpc-tests/test_framework/comptool.py
@@ -31,7 +31,7 @@ class RejectResult(object):
     '''
     Outcome that expects rejection of a transaction or block.
     '''
-    def __init__(self, code, reason=''):
+    def __init__(self, code, reason=b''):
         self.code = code
         self.reason = reason
     def match(self, other):
@@ -97,9 +97,9 @@ def on_pong(self, conn, message):
             raise AssertionError("Got pong for unknown ping [%s]" % repr(message))
 
     def on_reject(self, conn, message):
-        if message.message == 'tx':
+        if message.message == b'tx':
             self.tx_reject_map[message.data] = RejectResult(message.code, message.reason)
-        if message.message == 'block':
+        if message.message == b'block':
             self.block_reject_map[message.data] = RejectResult(message.code, message.reason)
 
     def send_inv(self, obj):
diff --git a/qa/rpc-tests/test_framework/mininode.py b/qa/rpc-tests/test_framework/mininode.py
index 53f5e8805aa77..5ee5b132757d4 100755
--- a/qa/rpc-tests/test_framework/mininode.py
+++ b/qa/rpc-tests/test_framework/mininode.py
@@ -20,10 +20,10 @@
 import struct
 import socket
 import asyncore
-import binascii
 import time
 import sys
 import random
+from binascii import hexlify, unhexlify
 from io import BytesIO
 from codecs import encode
 import hashlib
@@ -34,7 +34,7 @@
 
 BIP0031_VERSION = 60000
 MY_VERSION = 60001  # past bip-31 for ping/pong
-MY_SUBVERSION = "/python-mininode-tester:0.0.1/"
+MY_SUBVERSION = b"/python-mininode-tester:0.0.2/"
 
 MAX_INV_SZ = 50000
 MAX_BLOCK_SIZE = 1000000
@@ -131,7 +131,7 @@ def deser_vector(f, c):
 
 
 def ser_vector(l):
-    r = ""
+    r = b""
     if len(l) < 253:
         r = struct.pack("B", len(l))
     elif len(l) < 0x10000:
@@ -161,7 +161,7 @@ def deser_uint256_vector(f):
 
 
 def ser_uint256_vector(l):
-    r = ""
+    r = b""
     if len(l) < 253:
         r = struct.pack("B", len(l))
     elif len(l) < 0x10000:
@@ -221,7 +221,7 @@ def deser_int_vector(f):
 
 
 def ser_int_vector(l):
-    r = ""
+    r = b""
     if len(l) < 253:
         r = struct.pack("B", len(l))
     elif len(l) < 0x10000:
@@ -236,19 +236,19 @@ def ser_int_vector(l):
 
 # Deserialize from a hex string representation (eg from RPC)
 def FromHex(obj, hex_string):
-    obj.deserialize(BytesIO(binascii.unhexlify(hex_string)))
+    obj.deserialize(BytesIO(unhexlify(hex_string.encode('ascii'))))
     return obj
 
 # Convert a binary-serializable object to hex (eg for submission via RPC)
 def ToHex(obj):
-    return binascii.hexlify(obj.serialize()).decode('utf-8')
+    return hexlify(obj.serialize()).decode('ascii')
 
 # Objects that map to bitcoind objects, which can be serialized/deserialized
 
 class CAddress(object):
     def __init__(self):
         self.nServices = 1
-        self.pchReserved = "\x00" * 10 + "\xff" * 2
+        self.pchReserved = b"\x00" * 10 + b"\xff" * 2
         self.ip = "0.0.0.0"
         self.port = 0
 
@@ -259,7 +259,7 @@ def deserialize(self, f):
         self.port = struct.unpack(">H", f.read(2))[0]
 
     def serialize(self):
-        r = ""
+        r = b""
         r += struct.pack("<Q", self.nServices)
         r += self.pchReserved
         r += socket.inet_aton(self.ip)
@@ -286,7 +286,7 @@ def deserialize(self, f):
         self.hash = deser_uint256(f)
 
     def serialize(self):
-        r = ""
+        r = b""
         r += struct.pack("<i", self.type)
         r += ser_uint256(self.hash)
         return r
@@ -306,7 +306,7 @@ def deserialize(self, f):
         self.vHave = deser_uint256_vector(f)
 
     def serialize(self):
-        r = ""
+        r = b""
         r += struct.pack("<i", self.nVersion)
         r += ser_uint256_vector(self.vHave)
         return r
@@ -326,7 +326,7 @@ def deserialize(self, f):
         self.n = struct.unpack("<I", f.read(4))[0]
 
     def serialize(self):
-        r = ""
+        r = b""
         r += ser_uint256(self.hash)
         r += struct.pack("<I", self.n)
         return r
@@ -336,7 +336,7 @@ def __repr__(self):
 
 
 class CTxIn(object):
-    def __init__(self, outpoint=None, scriptSig="", nSequence=0):
+    def __init__(self, outpoint=None, scriptSig=b"", nSequence=0):
         if outpoint is None:
             self.prevout = COutPoint()
         else:
@@ -351,7 +351,7 @@ def deserialize(self, f):
         self.nSequence = struct.unpack("<I", f.read(4))[0]
 
     def serialize(self):
-        r = ""
+        r = b""
         r += self.prevout.serialize()
         r += ser_string(self.scriptSig)
         r += struct.pack("<I", self.nSequence)
@@ -359,12 +359,12 @@ def serialize(self):
 
     def __repr__(self):
         return "CTxIn(prevout=%s scriptSig=%s nSequence=%i)" \
-            % (repr(self.prevout), binascii.hexlify(self.scriptSig),
+            % (repr(self.prevout), hexlify(self.scriptSig),
                self.nSequence)
 
 
 class CTxOut(object):
-    def __init__(self, nValue=0, scriptPubKey=""):
+    def __init__(self, nValue=0, scriptPubKey=b""):
         self.nValue = nValue
         self.scriptPubKey = scriptPubKey
 
@@ -373,7 +373,7 @@ def deserialize(self, f):
         self.scriptPubKey = deser_string(f)
 
     def serialize(self):
-        r = ""
+        r = b""
         r += struct.pack("<q", self.nValue)
         r += ser_string(self.scriptPubKey)
         return r
@@ -381,7 +381,7 @@ def serialize(self):
     def __repr__(self):
         return "CTxOut(nValue=%i.%08i scriptPubKey=%s)" \
             % (self.nValue // COIN, self.nValue % COIN,
-               binascii.hexlify(self.scriptPubKey))
+               hexlify(self.scriptPubKey))
 
 
 class CTransaction(object):
@@ -410,7 +410,7 @@ def deserialize(self, f):
         self.hash = None
 
     def serialize(self):
-        r = ""
+        r = b""
         r += struct.pack("<i", self.nVersion)
         r += ser_vector(self.vin)
         r += ser_vector(self.vout)
@@ -424,7 +424,7 @@ def rehash(self):
     def calc_sha256(self):
         if self.sha256 is None:
             self.sha256 = uint256_from_str(hash256(self.serialize()))
-        self.hash = encode(hash256(self.serialize())[::-1], 'hex')
+        self.hash = encode(hash256(self.serialize())[::-1], 'hex_codec').decode('ascii')
 
     def is_valid(self):
         self.calc_sha256()
@@ -474,7 +474,7 @@ def deserialize(self, f):
         self.hash = None
 
     def serialize(self):
-        r = ""
+        r = b""
         r += struct.pack("<i", self.nVersion)
         r += ser_uint256(self.hashPrevBlock)
         r += ser_uint256(self.hashMerkleRoot)
@@ -485,7 +485,7 @@ def serialize(self):
 
     def calc_sha256(self):
         if self.sha256 is None:
-            r = ""
+            r = b""
             r += struct.pack("<i", self.nVersion)
             r += ser_uint256(self.hashPrevBlock)
             r += ser_uint256(self.hashMerkleRoot)
@@ -493,7 +493,7 @@ def calc_sha256(self):
             r += struct.pack("<I", self.nBits)
             r += struct.pack("<I", self.nNonce)
             self.sha256 = uint256_from_str(hash256(r))
-            self.hash = encode(hash256(r)[::-1], 'hex')
+            self.hash = encode(hash256(r)[::-1], 'hex_codec').decode('ascii')
 
     def rehash(self):
         self.sha256 = None
@@ -516,7 +516,7 @@ def deserialize(self, f):
         self.vtx = deser_vector(f, CTransaction)
 
     def serialize(self):
-        r = ""
+        r = b""
         r += super(CBlock, self).serialize()
         r += ser_vector(self.vtx)
         return r
@@ -571,9 +571,9 @@ def __init__(self):
         self.nMaxVer = 0
         self.setSubVer = []
         self.nPriority = 0
-        self.strComment = ""
-        self.strStatusBar = ""
-        self.strReserved = ""
+        self.strComment = b""
+        self.strStatusBar = b""
+        self.strReserved = b""
 
     def deserialize(self, f):
         self.nVersion = struct.unpack("<i", f.read(4))[0]
@@ -591,7 +591,7 @@ def deserialize(self, f):
         self.strReserved = deser_string(f)
 
     def serialize(self):
-        r = ""
+        r = b""
         r += struct.pack("<i", self.nVersion)
         r += struct.pack("<q", self.nRelayUntil)
         r += struct.pack("<q", self.nExpiration)
@@ -616,8 +616,8 @@ def __repr__(self):
 
 class CAlert(object):
     def __init__(self):
-        self.vchMsg = ""
-        self.vchSig = ""
+        self.vchMsg = b""
+        self.vchSig = b""
 
     def deserialize(self, f):
         self.vchMsg = deser_string(f)
@@ -636,7 +636,7 @@ def __repr__(self):
 
 # Objects that correspond to messages on the wire
 class msg_version(object):
-    command = "version"
+    command = b"version"
 
     def __init__(self):
         self.nVersion = MY_VERSION
@@ -672,7 +672,7 @@ def deserialize(self, f):
             self.nStartingHeight = None
 
     def serialize(self):
-        r = ""
+        r = b""
         r += struct.pack("<i", self.nVersion)
         r += struct.pack("<Q", self.nServices)
         r += struct.pack("<q", self.nTime)
@@ -691,7 +691,7 @@ def __repr__(self):
 
 
 class msg_verack(object):
-    command = "verack"
+    command = b"verack"
 
     def __init__(self):
         pass
@@ -700,14 +700,14 @@ def deserialize(self, f):
         pass
 
     def serialize(self):
-        return ""
+        return b""
 
     def __repr__(self):
         return "msg_verack()"
 
 
 class msg_addr(object):
-    command = "addr"
+    command = b"addr"
 
     def __init__(self):
         self.addrs = []
@@ -723,7 +723,7 @@ def __repr__(self):
 
 
 class msg_alert(object):
-    command = "alert"
+    command = b"alert"
 
     def __init__(self):
         self.alert = CAlert()
@@ -733,7 +733,7 @@ def deserialize(self, f):
         self.alert.deserialize(f)
 
     def serialize(self):
-        r = ""
+        r = b""
         r += self.alert.serialize()
         return r
 
@@ -742,7 +742,7 @@ def __repr__(self):
 
 
 class msg_inv(object):
-    command = "inv"
+    command = b"inv"
 
     def __init__(self, inv=None):
         if inv is None:
@@ -761,7 +761,7 @@ def __repr__(self):
 
 
 class msg_getdata(object):
-    command = "getdata"
+    command = b"getdata"
 
     def __init__(self, inv=None):
         self.inv = inv if inv != None else []
@@ -777,7 +777,7 @@ def __repr__(self):
 
 
 class msg_getblocks(object):
-    command = "getblocks"
+    command = b"getblocks"
 
     def __init__(self):
         self.locator = CBlockLocator()
@@ -789,7 +789,7 @@ def deserialize(self, f):
         self.hashstop = deser_uint256(f)
 
     def serialize(self):
-        r = ""
+        r = b""
         r += self.locator.serialize()
         r += ser_uint256(self.hashstop)
         return r
@@ -800,7 +800,7 @@ def __repr__(self):
 
 
 class msg_tx(object):
-    command = "tx"
+    command = b"tx"
 
     def __init__(self, tx=CTransaction()):
         self.tx = tx
@@ -816,7 +816,7 @@ def __repr__(self):
 
 
 class msg_block(object):
-    command = "block"
+    command = b"block"
 
     def __init__(self, block=None):
         if block is None:
@@ -835,7 +835,7 @@ def __repr__(self):
 
 
 class msg_getaddr(object):
-    command = "getaddr"
+    command = b"getaddr"
 
     def __init__(self):
         pass
@@ -844,14 +844,14 @@ def deserialize(self, f):
         pass
 
     def serialize(self):
-        return ""
+        return b""
 
     def __repr__(self):
         return "msg_getaddr()"
 
 
 class msg_ping_prebip31(object):
-    command = "ping"
+    command = b"ping"
 
     def __init__(self):
         pass
@@ -860,14 +860,14 @@ def deserialize(self, f):
         pass
 
     def serialize(self):
-        return ""
+        return b""
 
     def __repr__(self):
         return "msg_ping() (pre-bip31)"
 
 
 class msg_ping(object):
-    command = "ping"
+    command = b"ping"
 
     def __init__(self, nonce=0L):
         self.nonce = nonce
@@ -876,7 +876,7 @@ def deserialize(self, f):
         self.nonce = struct.unpack("<Q", f.read(8))[0]
 
     def serialize(self):
-        r = ""
+        r = b""
         r += struct.pack("<Q", self.nonce)
         return r
 
@@ -885,16 +885,16 @@ def __repr__(self):
 
 
 class msg_pong(object):
-    command = "pong"
+    command = b"pong"
 
-    def __init__(self, nonce=0L):
+    def __init__(self, nonce=0):
         self.nonce = nonce
 
     def deserialize(self, f):
         self.nonce = struct.unpack("<Q", f.read(8))[0]
 
     def serialize(self):
-        r = ""
+        r = b""
         r += struct.pack("<Q", self.nonce)
         return r
 
@@ -903,7 +903,7 @@ def __repr__(self):
 
 
 class msg_mempool(object):
-    command = "mempool"
+    command = b"mempool"
 
     def __init__(self):
         pass
@@ -912,13 +912,13 @@ def deserialize(self, f):
         pass
 
     def serialize(self):
-        return ""
+        return b""
 
     def __repr__(self):
         return "msg_mempool()"
 
 class msg_sendheaders(object):
-    command = "sendheaders"
+    command = b"sendheaders"
 
     def __init__(self):
         pass
@@ -927,7 +927,7 @@ def deserialize(self, f):
         pass
 
     def serialize(self):
-        return ""
+        return b""
 
     def __repr__(self):
         return "msg_sendheaders()"
@@ -937,7 +937,7 @@ def __repr__(self):
 # vector of hashes
 # hash_stop (hash of last desired block header, 0 to get as many as possible)
 class msg_getheaders(object):
-    command = "getheaders"
+    command = b"getheaders"
 
     def __init__(self):
         self.locator = CBlockLocator()
@@ -949,7 +949,7 @@ def deserialize(self, f):
         self.hashstop = deser_uint256(f)
 
     def serialize(self):
-        r = ""
+        r = b""
         r += self.locator.serialize()
         r += ser_uint256(self.hashstop)
         return r
@@ -962,7 +962,7 @@ def __repr__(self):
 # headers message has
 # <count> <vector of block headers>
 class msg_headers(object):
-    command = "headers"
+    command = b"headers"
 
     def __init__(self):
         self.headers = []
@@ -982,10 +982,10 @@ def __repr__(self):
 
 
 class msg_reject(object):
-    command = "reject"
+    command = b"reject"
 
     def __init__(self):
-        self.message = ""
+        self.message = b""
         self.code = 0
         self.reason = ""
         self.data = 0L
@@ -1025,7 +1025,7 @@ def wait_until(predicate, attempts=float('inf'), timeout=float('inf')):
     return False
 
 class msg_feefilter(object):
-    command = "feefilter"
+    command = b"feefilter"
 
     def __init__(self, feerate=0L):
         self.feerate = feerate
@@ -1034,7 +1034,7 @@ def deserialize(self, f):
         self.feerate = struct.unpack("<Q", f.read(8))[0]
 
     def serialize(self):
-        r = ""
+        r = b""
         r += struct.pack("<Q", self.feerate)
         return r
 
@@ -1149,28 +1149,28 @@ def received_pong():
 # This class provides an interface for a p2p connection to a specified node
 class NodeConn(asyncore.dispatcher):
     messagemap = {
-        "version": msg_version,
-        "verack": msg_verack,
-        "addr": msg_addr,
-        "alert": msg_alert,
-        "inv": msg_inv,
-        "getdata": msg_getdata,
-        "getblocks": msg_getblocks,
-        "tx": msg_tx,
-        "block": msg_block,
-        "getaddr": msg_getaddr,
-        "ping": msg_ping,
-        "pong": msg_pong,
-        "headers": msg_headers,
-        "getheaders": msg_getheaders,
-        "reject": msg_reject,
-        "mempool": msg_mempool,
-        "feefilter": msg_feefilter
+        b"version": msg_version,
+        b"verack": msg_verack,
+        b"addr": msg_addr,
+        b"alert": msg_alert,
+        b"inv": msg_inv,
+        b"getdata": msg_getdata,
+        b"getblocks": msg_getblocks,
+        b"tx": msg_tx,
+        b"block": msg_block,
+        b"getaddr": msg_getaddr,
+        b"ping": msg_ping,
+        b"pong": msg_pong,
+        b"headers": msg_headers,
+        b"getheaders": msg_getheaders,
+        b"reject": msg_reject,
+        b"mempool": msg_mempool,
+        b"feefilter": msg_feefilter
     }
     MAGIC_BYTES = {
-        "mainnet": "\xf9\xbe\xb4\xd9",   # mainnet
-        "testnet3": "\x0b\x11\x09\x07",  # testnet3
-        "regtest": "\xfa\xbf\xb5\xda"    # regtest
+        "mainnet": b"\xf9\xbe\xb4\xd9",   # mainnet
+        "testnet3": b"\x0b\x11\x09\x07",  # testnet3
+        "regtest": b"\xfa\xbf\xb5\xda"    # regtest
     }
 
     def __init__(self, dstaddr, dstport, rpc, callback, net="regtest", services=1):
@@ -1179,8 +1179,8 @@ def __init__(self, dstaddr, dstport, rpc, callback, net="regtest", services=1):
         self.dstaddr = dstaddr
         self.dstport = dstport
         self.create_socket(socket.AF_INET, socket.SOCK_STREAM)
-        self.sendbuf = ""
-        self.recvbuf = ""
+        self.sendbuf = b""
+        self.recvbuf = b""
         self.ver_send = 209
         self.ver_recv = 209
         self.last_sent = 0
@@ -1217,8 +1217,8 @@ def handle_close(self):
         self.show_debug_msg("MiniNode: Closing Connection to %s:%d... "
                             % (self.dstaddr, self.dstport))
         self.state = "closed"
-        self.recvbuf = ""
-        self.sendbuf = ""
+        self.recvbuf = b""
+        self.sendbuf = b""
         try:
             self.close()
         except:
@@ -1261,7 +1261,7 @@ def got_data(self):
                 if self.ver_recv < 209:
                     if len(self.recvbuf) < 4 + 12 + 4:
                         return
-                    command = self.recvbuf[4:4+12].split("\x00", 1)[0]
+                    command = self.recvbuf[4:4+12].split(b"\x00", 1)[0]
                     msglen = struct.unpack("<i", self.recvbuf[4+12:4+12+4])[0]
                     checksum = None
                     if len(self.recvbuf) < 4 + 12 + 4 + msglen:
@@ -1271,7 +1271,7 @@ def got_data(self):
                 else:
                     if len(self.recvbuf) < 4 + 12 + 4 + 4:
                         return
-                    command = self.recvbuf[4:4+12].split("\x00", 1)[0]
+                    command = self.recvbuf[4:4+12].split(b"\x00", 1)[0]
                     msglen = struct.unpack("<i", self.recvbuf[4+12:4+12+4])[0]
                     checksum = self.recvbuf[4+12+4:4+12+4+4]
                     if len(self.recvbuf) < 4 + 12 + 4 + 4 + msglen:
@@ -1301,7 +1301,7 @@ def send_message(self, message, pushbuf=False):
         data = message.serialize()
         tmsg = self.MAGIC_BYTES[self.network]
         tmsg += command
-        tmsg += "\x00" * (12 - len(command))
+        tmsg += b"\x00" * (12 - len(command))
         tmsg += struct.pack("<I", len(data))
         if self.ver_send >= 209:
             th = sha256(data)
@@ -1313,11 +1313,11 @@ def send_message(self, message, pushbuf=False):
             self.last_sent = time.time()
 
     def got_message(self, message):
-        if message.command == "version":
+        if message.command == b"version":
             if message.nVersion <= BIP0031_VERSION:
-                self.messagemap['ping'] = msg_ping_prebip31
+                self.messagemap[b'ping'] = msg_ping_prebip31
         if self.last_sent + 30 * 60 < time.time():
-            self.send_message(self.messagemap['ping']())
+            self.send_message(self.messagemap[b'ping']())
         self.show_debug_msg("Recv %s" % repr(message))
         self.cb.deliver(self, message)
 
diff --git a/qa/rpc-tests/test_framework/netutil.py b/qa/rpc-tests/test_framework/netutil.py
index bbc58a14ec346..52a7ab74890f1 100644
--- a/qa/rpc-tests/test_framework/netutil.py
+++ b/qa/rpc-tests/test_framework/netutil.py
@@ -4,13 +4,14 @@
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 # Linux network utilities
+
 import sys
 import socket
 import fcntl
 import struct
 import array
 import os
-import binascii
+from binascii import unhexlify, hexlify
 
 # Roughly based on http://voorloopnul.com/blog/a-python-netstat-in-less-than-100-lines-of-code/ by Ricardo Pascal
 STATE_ESTABLISHED = '01'
@@ -43,7 +44,7 @@ def _remove_empty(array):
 def _convert_ip_port(array):
     host,port = array.split(':')
     # convert host from mangled-per-four-bytes form as used by kernel
-    host = binascii.unhexlify(host)
+    host = unhexlify(host)
     host_out = ''
     for x in range(0, len(host) // 4):
         (val,) = struct.unpack('=I', host[x*4:(x+1)*4])
@@ -94,7 +95,7 @@ def all_interfaces():
     max_possible = 8 # initial value
     while True:
         bytes = max_possible * struct_size
-        names = array.array('B', '\0' * bytes)
+        names = array.array('B', b'\0' * bytes)
         outbytes = struct.unpack('iL', fcntl.ioctl(
             s.fileno(),
             0x8912,  # SIOCGIFCONF
@@ -105,7 +106,7 @@ def all_interfaces():
         else:
             break
     namestr = names.tostring()
-    return [(namestr[i:i+16].split('\0', 1)[0],
+    return [(namestr[i:i+16].split(b'\0', 1)[0],
              socket.inet_ntoa(namestr[i+20:i+24]))
             for i in range(0, outbytes, struct_size)]
 
@@ -136,7 +137,7 @@ def addr_to_hex(addr):
         addr = sub[0] + ([0] * nullbytes) + sub[1]
     else:
         raise ValueError('Could not parse address %s' % addr)
-    return binascii.hexlify(bytearray(addr))
+    return hexlify(bytearray(addr)).decode('ascii')
 
 def test_ipv6_local():
     '''
diff --git a/qa/rpc-tests/test_framework/script.py b/qa/rpc-tests/test_framework/script.py
index bf5e25fb27653..5fb5758f81fa3 100644
--- a/qa/rpc-tests/test_framework/script.py
+++ b/qa/rpc-tests/test_framework/script.py
@@ -629,7 +629,7 @@ def encode(obj):
         neg = obj.value < 0
         absvalue = -obj.value if neg else obj.value
         while (absvalue):
-            r.append(chr(absvalue & 0xff))
+            r.append(absvalue & 0xff)
             absvalue >>= 8
         if r[-1] & 0x80:
             r.append(0x80 if neg else 0)
@@ -777,7 +777,7 @@ def __repr__(self):
         # need to change
         def _repr(o):
             if isinstance(o, bytes):
-                return "x('%s')" % hexlify(o).decode('utf8')
+                return b"x('%s')" % hexlify(o).decode('ascii')
             else:
                 return repr(o)
 
diff --git a/qa/rpc-tests/test_framework/socks5.py b/qa/rpc-tests/test_framework/socks5.py
index 12327a6c5f4a9..f725d97701747 100644
--- a/qa/rpc-tests/test_framework/socks5.py
+++ b/qa/rpc-tests/test_framework/socks5.py
@@ -102,7 +102,7 @@ def handle(self):
                 addr = recvall(self.conn, 4)
             elif atyp == AddressType.DOMAINNAME:
                 n = recvall(self.conn, 1)[0]
-                addr = str(recvall(self.conn, n))
+                addr = recvall(self.conn, n)
             elif atyp == AddressType.IPV6:
                 addr = recvall(self.conn, 16)
             else:
diff --git a/qa/rpc-tests/test_framework/util.py b/qa/rpc-tests/test_framework/util.py
index d9fe0f75f2608..42541b4162e96 100644
--- a/qa/rpc-tests/test_framework/util.py
+++ b/qa/rpc-tests/test_framework/util.py
@@ -1,6 +1,8 @@
 # Copyright (c) 2014-2015 The Bitcoin Core developers
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+
 #
 # Helpful routines for regression testing
 #
@@ -9,6 +11,8 @@
 import os
 import sys
 
+from binascii import hexlify, unhexlify
+from base64 import b64encode
 from decimal import Decimal, ROUND_DOWN
 import json
 import random
@@ -91,6 +95,15 @@ def check_json_precision():
 def count_bytes(hex_string):
     return len(bytearray.fromhex(hex_string))
 
+def bytes_to_hex_str(byte_str):
+    return hexlify(byte_str).decode('ascii')
+
+def hex_str_to_bytes(hex_str):
+    return unhexlify(hex_str.encode('ascii'))
+
+def str_to_b64str(string):
+    return b64encode(string.encode('utf-8')).decode('ascii')
+
 def sync_blocks(rpc_connections, wait=1):
     """
     Wait until everybody has the same block count
@@ -466,7 +479,7 @@ def assert_is_hash_string(string, length=64):
             "String %r contains invalid characters for a hash." % string)
 
 def satoshi_round(amount):
-    return  Decimal(amount).quantize(Decimal('0.00000001'), rounding=ROUND_DOWN)
+    return Decimal(amount).quantize(Decimal('0.00000001'), rounding=ROUND_DOWN)
 
 # Helper to create at least "count" utxos
 # Pass in a fee that is sufficient for relay and mining new transactions.
diff --git a/qa/rpc-tests/zmq_test.py b/qa/rpc-tests/zmq_test.py
index 88532541ab6a5..3a8d62ef2eddc 100755
--- a/qa/rpc-tests/zmq_test.py
+++ b/qa/rpc-tests/zmq_test.py
@@ -28,8 +28,8 @@ class ZMQTest (BitcoinTestFramework):
     def setup_nodes(self):
         self.zmqContext = zmq.Context()
         self.zmqSubSocket = self.zmqContext.socket(zmq.SUB)
-        self.zmqSubSocket.setsockopt(zmq.SUBSCRIBE, "hashblock")
-        self.zmqSubSocket.setsockopt(zmq.SUBSCRIBE, "hashtx")
+        self.zmqSubSocket.setsockopt(zmq.SUBSCRIBE, b"hashblock")
+        self.zmqSubSocket.setsockopt(zmq.SUBSCRIBE, b"hashtx")
         self.zmqSubSocket.connect("tcp://127.0.0.1:%i" % self.port)
         return start_nodes(4, self.options.tmpdir, extra_args=[
             ['-zmqpubhashtx=tcp://127.0.0.1:'+str(self.port), '-zmqpubhashblock=tcp://127.0.0.1:'+str(self.port)],
@@ -46,13 +46,13 @@ def run_test(self):
 
         print "listen..."
         msg = self.zmqSubSocket.recv_multipart()
-        topic = str(msg[0])
+        topic = msg[0]
         body = msg[1]
 
         msg = self.zmqSubSocket.recv_multipart()
-        topic = str(msg[0])
+        topic = msg[0]
         body = msg[1]
-        blkhash = binascii.hexlify(body)
+        blkhash = bytes_to_hex_str(body)
 
         assert_equal(genhashes[0], blkhash) #blockhash from generate must be equal to the hash received over zmq
 
@@ -63,10 +63,10 @@ def run_test(self):
         zmqHashes = []
         for x in range(0,n*2):
             msg = self.zmqSubSocket.recv_multipart()
-            topic = str(msg[0])
+            topic = msg[0]
             body = msg[1]
-            if topic == "hashblock":
-                zmqHashes.append(binascii.hexlify(body))
+            if topic == b"hashblock":
+                zmqHashes.append(bytes_to_hex_str(body))
 
         for x in range(0,n):
             assert_equal(genhashes[x], zmqHashes[x]) #blockhash from generate must be equal to the hash received over zmq
@@ -77,11 +77,11 @@ def run_test(self):
 
         # now we should receive a zmq msg because the tx was broadcast
         msg = self.zmqSubSocket.recv_multipart()
-        topic = str(msg[0])
+        topic = msg[0]
         body = msg[1]
         hashZMQ = ""
-        if topic == "hashtx":
-            hashZMQ = binascii.hexlify(body)
+        if topic == b"hashtx":
+            hashZMQ = bytes_to_hex_str(body)
 
         assert_equal(hashRPC, hashZMQ) #blockhash from generate must be equal to the hash received over zmq
 
diff --git a/src/test/bctest.py b/src/test/bctest.py
index 8105b87ffa34c..fc59152ba12f1 100644
--- a/src/test/bctest.py
+++ b/src/test/bctest.py
@@ -2,6 +2,7 @@
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 from __future__ import division,print_function,unicode_literals
+from io import open
 import subprocess
 import os
 import json
@@ -16,7 +17,7 @@ def bctest(testDir, testObj, exeext):
 	inputData = None
 	if "input" in testObj:
 		filename = testDir + "/" + testObj['input']
-		inputData = open(filename).read()
+		inputData = open(filename, 'rb').read()
 		stdinCfg = subprocess.PIPE
 
 	outputFn = None

From fa6399d918fdaa8844c4c767b2012e0b2ca60ee9 Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Sun, 10 Apr 2016 20:49:07 +0200
Subject: [PATCH 0128/1802] [doc] gitian: Replace precise with trusty

---
 doc/gitian-building.md | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/doc/gitian-building.md b/doc/gitian-building.md
index 69d79b3c68ab7..e1f46cd82f289 100644
--- a/doc/gitian-building.md
+++ b/doc/gitian-building.md
@@ -363,7 +363,7 @@ Output from `gbuild` will look something like
     Resolving deltas: 100% (41590/41590), done.
     From https://github.com/bitcoin/bitcoin
     ... (new tags, new branch etc)
-    --- Building for precise amd64 ---
+    --- Building for trusty amd64 ---
     Stopping target if it is up
     Making a new image copy
     stdin: is not a tty
@@ -412,14 +412,14 @@ So, if you use LXC:
 export PATH="$PATH":/path/to/gitian-builder/libexec
 export USE_LXC=1
 cd /path/to/gitian-builder
-./libexec/make-clean-vm --suite precise --arch amd64
+./libexec/make-clean-vm --suite trusty --arch amd64
 
-LXC_ARCH=amd64 LXC_SUITE=precise on-target -u root apt-get update
-LXC_ARCH=amd64 LXC_SUITE=precise on-target -u root \
+LXC_ARCH=amd64 LXC_SUITE=trusty on-target -u root apt-get update
+LXC_ARCH=amd64 LXC_SUITE=trusty on-target -u root \
   -e DEBIAN_FRONTEND=noninteractive apt-get --no-install-recommends -y install \
   $( sed -ne '/^packages:/,/[^-] .*/ {/^- .*/{s/"//g;s/- //;p}}' ../bitcoin/contrib/gitian-descriptors/*|sort|uniq )
-LXC_ARCH=amd64 LXC_SUITE=precise on-target -u root apt-get -q -y purge grub
-LXC_ARCH=amd64 LXC_SUITE=precise on-target -u root -e DEBIAN_FRONTEND=noninteractive apt-get -y dist-upgrade
+LXC_ARCH=amd64 LXC_SUITE=trusty on-target -u root apt-get -q -y purge grub
+LXC_ARCH=amd64 LXC_SUITE=trusty on-target -u root -e DEBIAN_FRONTEND=noninteractive apt-get -y dist-upgrade
 ```
 
 And then set offline mode for apt-cacher-ng:

From fa42a675c08ba738a47bf37056ef090441ec5a83 Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Tue, 5 Apr 2016 13:29:04 +0200
Subject: [PATCH 0129/1802] [gitian] hardcode datetime for depends

---
 contrib/gitian-descriptors/gitian-linux.yml | 19 ++++++++++++----
 contrib/gitian-descriptors/gitian-osx.yml   | 19 ++++++++++++----
 contrib/gitian-descriptors/gitian-win.yml   | 25 ++++++++++++++++-----
 3 files changed, 49 insertions(+), 14 deletions(-)

diff --git a/contrib/gitian-descriptors/gitian-linux.yml b/contrib/gitian-descriptors/gitian-linux.yml
index 8b2ab4ebfd25b..045643e297f17 100644
--- a/contrib/gitian-descriptors/gitian-linux.yml
+++ b/contrib/gitian-descriptors/gitian-linux.yml
@@ -41,29 +41,36 @@ script: |
     mkdir -p ${BASE_CACHE} ${SOURCES_PATH}
   fi
 
-  # Create global faketime wrappers
+  function create_global_faketime_wrappers {
   for prog in ${FAKETIME_PROGS}; do
     echo '#!/bin/bash' > ${WRAP_DIR}/${prog}
     echo "REAL=\`which -a ${prog} | grep -v ${WRAP_DIR}/${prog} | head -1\`" >> ${WRAP_DIR}/${prog}
     echo 'export LD_PRELOAD=/usr/lib/x86_64-linux-gnu/faketime/libfaketime.so.1' >> ${WRAP_DIR}/${prog}
-    echo "export FAKETIME=\"${REFERENCE_DATETIME}\"" >> ${WRAP_DIR}/${prog}
+    echo "export FAKETIME=\"$1\"" >> ${WRAP_DIR}/${prog}
     echo "\$REAL \$@" >> $WRAP_DIR/${prog}
     chmod +x ${WRAP_DIR}/${prog}
   done
+  }
 
-  # Create per-host faketime wrappers
+  function create_per-host_faketime_wrappers {
   for i in $HOSTS; do
     for prog in ${FAKETIME_HOST_PROGS}; do
         echo '#!/bin/bash' > ${WRAP_DIR}/${i}-${prog}
         echo "REAL=\`which -a ${i}-${prog} | grep -v ${WRAP_DIR}/${i}-${prog} | head -1\`" >> ${WRAP_DIR}/${i}-${prog}
         echo 'export LD_PRELOAD=/usr/lib/x86_64-linux-gnu/faketime/libfaketime.so.1' >> ${WRAP_DIR}/${i}-${prog}
-        echo "export FAKETIME=\"${REFERENCE_DATETIME}\"" >> ${WRAP_DIR}/${i}-${prog}
+        echo "export FAKETIME=\"$1\"" >> ${WRAP_DIR}/${i}-${prog}
         echo "\$REAL \$@" >> $WRAP_DIR/${i}-${prog}
         chmod +x ${WRAP_DIR}/${i}-${prog}
     done
   done
+  }
+
   export PATH=${WRAP_DIR}:${PATH}
 
+  # Faketime for depends so intermediate results are comparable
+  create_global_faketime_wrappers "2000-01-01 12:00:00"
+  create_per-host_faketime_wrappers "2000-01-01 12:00:00"
+
   cd bitcoin
   BASEPREFIX=`pwd`/depends
   # Build dependencies for each host
@@ -71,6 +78,10 @@ script: |
     make ${MAKEOPTS} -C ${BASEPREFIX} HOST="${i}"
   done
 
+  # Faketime for binaries
+  create_global_faketime_wrappers "${REFERENCE_DATETIME}"
+  create_per-host_faketime_wrappers "${REFERENCE_DATETIME}"
+
   # Create the release tarball using (arbitrarily) the first host
   ./autogen.sh
   ./configure --prefix=${BASEPREFIX}/`echo "${HOSTS}" | awk '{print $1;}'`
diff --git a/contrib/gitian-descriptors/gitian-osx.yml b/contrib/gitian-descriptors/gitian-osx.yml
index 74fc2e93ad3d8..dbd0cedafeb41 100644
--- a/contrib/gitian-descriptors/gitian-osx.yml
+++ b/contrib/gitian-descriptors/gitian-osx.yml
@@ -53,29 +53,36 @@ script: |
 
   export ZERO_AR_DATE=1
 
-  # Create global faketime wrappers
+  function create_global_faketime_wrappers {
   for prog in ${FAKETIME_PROGS}; do
     echo '#!/bin/bash' > ${WRAP_DIR}/${prog}
     echo "REAL=\`which -a ${prog} | grep -v ${WRAP_DIR}/${prog} | head -1\`" >> ${WRAP_DIR}/${prog}
     echo 'export LD_PRELOAD=/usr/lib/x86_64-linux-gnu/faketime/libfaketime.so.1' >> ${WRAP_DIR}/${prog}
-    echo "export FAKETIME=\"${REFERENCE_DATETIME}\"" >> ${WRAP_DIR}/${prog}
+    echo "export FAKETIME=\"$1\"" >> ${WRAP_DIR}/${prog}
     echo "\$REAL \$@" >> $WRAP_DIR/${prog}
     chmod +x ${WRAP_DIR}/${prog}
   done
+  }
 
-  # Create per-host faketime wrappers
+  function create_per-host_faketime_wrappers {
   for i in $HOSTS; do
     for prog in ${FAKETIME_HOST_PROGS}; do
         echo '#!/bin/bash' > ${WRAP_DIR}/${i}-${prog}
         echo "REAL=\`which -a ${i}-${prog} | grep -v ${WRAP_DIR}/${i}-${prog} | head -1\`" >> ${WRAP_DIR}/${i}-${prog}
         echo 'export LD_PRELOAD=/usr/lib/x86_64-linux-gnu/faketime/libfaketime.so.1' >> ${WRAP_DIR}/${i}-${prog}
-        echo "export FAKETIME=\"${REFERENCE_DATETIME}\"" >> ${WRAP_DIR}/${i}-${prog}
+        echo "export FAKETIME=\"$1\"" >> ${WRAP_DIR}/${i}-${prog}
         echo "\$REAL \$@" >> $WRAP_DIR/${i}-${prog}
         chmod +x ${WRAP_DIR}/${i}-${prog}
     done
   done
+  }
+
   export PATH=${WRAP_DIR}:${PATH}
 
+  # Faketime for depends so intermediate results are comparable
+  create_global_faketime_wrappers "2000-01-01 12:00:00"
+  create_per-host_faketime_wrappers "2000-01-01 12:00:00"
+
   cd bitcoin
   BASEPREFIX=`pwd`/depends
 
@@ -87,6 +94,10 @@ script: |
     make ${MAKEOPTS} -C ${BASEPREFIX} HOST="${i}"
   done
 
+  # Faketime for binaries
+  create_global_faketime_wrappers "${REFERENCE_DATETIME}"
+  create_per-host_faketime_wrappers "${REFERENCE_DATETIME}"
+
   # Create the release tarball using (arbitrarily) the first host
   ./autogen.sh
   ./configure --prefix=${BASEPREFIX}/`echo "${HOSTS}" | awk '{print $1;}'`
diff --git a/contrib/gitian-descriptors/gitian-win.yml b/contrib/gitian-descriptors/gitian-win.yml
index 719ca9c232bfe..2c035db17b8b8 100644
--- a/contrib/gitian-descriptors/gitian-win.yml
+++ b/contrib/gitian-descriptors/gitian-win.yml
@@ -44,29 +44,31 @@ script: |
     mkdir -p ${BASE_CACHE} ${SOURCES_PATH}
   fi
 
-  # Create global faketime wrappers
+  function create_global_faketime_wrappers {
   for prog in ${FAKETIME_PROGS}; do
     echo '#!/bin/bash' > ${WRAP_DIR}/${prog}
     echo "REAL=\`which -a ${prog} | grep -v ${WRAP_DIR}/${prog} | head -1\`" >> ${WRAP_DIR}/${prog}
     echo 'export LD_PRELOAD=/usr/lib/x86_64-linux-gnu/faketime/libfaketime.so.1' >> ${WRAP_DIR}/${prog}
-    echo "export FAKETIME=\"${REFERENCE_DATETIME}\"" >> ${WRAP_DIR}/${prog}
+    echo "export FAKETIME=\"$1\"" >> ${WRAP_DIR}/${prog}
     echo "\$REAL \$@" >> $WRAP_DIR/${prog}
     chmod +x ${WRAP_DIR}/${prog}
   done
+  }
 
-  # Create per-host faketime wrappers
+  function create_per-host_faketime_wrappers {
   for i in $HOSTS; do
     for prog in ${FAKETIME_HOST_PROGS}; do
         echo '#!/bin/bash' > ${WRAP_DIR}/${i}-${prog}
         echo "REAL=\`which -a ${i}-${prog} | grep -v ${WRAP_DIR}/${i}-${prog} | head -1\`" >> ${WRAP_DIR}/${i}-${prog}
         echo 'export LD_PRELOAD=/usr/lib/x86_64-linux-gnu/faketime/libfaketime.so.1' >> ${WRAP_DIR}/${i}-${prog}
-        echo "export FAKETIME=\"${REFERENCE_DATETIME}\"" >> ${WRAP_DIR}/${i}-${prog}
+        echo "export FAKETIME=\"$1\"" >> ${WRAP_DIR}/${i}-${prog}
         echo "\$REAL \$@" >> $WRAP_DIR/${i}-${prog}
         chmod +x ${WRAP_DIR}/${i}-${prog}
     done
   done
+  }
 
-  # Create per-host linker wrapper
+  function create_per-host_linker_wrapper {
   # This is only needed for trusty, as the mingw linker leaks a few bytes of
   # heap, causing non-determinism. See discussion in https://github.com/bitcoin/bitcoin/pull/6900
   for i in $HOSTS; do
@@ -82,15 +84,21 @@ script: |
         echo '#!/bin/bash' > ${WRAP_DIR}/${i}-${prog}
         echo "REAL=\`which -a ${i}-${prog} | grep -v ${WRAP_DIR}/${i}-${prog} | head -1\`" >> ${WRAP_DIR}/${i}-${prog}
         echo 'export LD_PRELOAD=/usr/lib/x86_64-linux-gnu/faketime/libfaketime.so.1' >> ${WRAP_DIR}/${i}-${prog}
-        echo "export FAKETIME=\"${REFERENCE_DATETIME}\"" >> ${WRAP_DIR}/${i}-${prog}
+        echo "export FAKETIME=\"$1\"" >> ${WRAP_DIR}/${i}-${prog}
         echo "export COMPILER_PATH=${WRAP_DIR}/${i}" >> ${WRAP_DIR}/${i}-${prog}
         echo "\$REAL \$@" >> $WRAP_DIR/${i}-${prog}
         chmod +x ${WRAP_DIR}/${i}-${prog}
     done
   done
+  }
 
   export PATH=${WRAP_DIR}:${PATH}
 
+  # Faketime for depends so intermediate results are comparable
+  create_global_faketime_wrappers "2000-01-01 12:00:00"
+  create_per-host_faketime_wrappers "2000-01-01 12:00:00"
+  create_per-host_linker_wrapper "2000-01-01 12:00:00"
+
   cd bitcoin
   BASEPREFIX=`pwd`/depends
   # Build dependencies for each host
@@ -98,6 +106,11 @@ script: |
     make ${MAKEOPTS} -C ${BASEPREFIX} HOST="${i}"
   done
 
+  # Faketime for binaries
+  create_global_faketime_wrappers "${REFERENCE_DATETIME}"
+  create_per-host_faketime_wrappers "${REFERENCE_DATETIME}"
+  create_per-host_linker_wrapper "${REFERENCE_DATETIME}"
+
   # Create the release tarball using (arbitrarily) the first host
   ./autogen.sh
   ./configure --prefix=${BASEPREFIX}/`echo "${HOSTS}" | awk '{print $1;}'`

From 66b07247a7a9e48e082502338176cc06edf61474 Mon Sep 17 00:00:00 2001
From: Gregory Maxwell <greg@xiph.org>
Date: Mon, 11 Apr 2016 01:09:34 +0000
Subject: [PATCH 0130/1802] Only send one GetAddr response per connection.

This conserves resources from abusive peers that just send
 getaddr in a loop. Also makes correlating addr messages
 against INVs less effective.
---
 src/main.cpp | 8 ++++++++
 src/net.cpp  | 1 +
 src/net.h    | 1 +
 3 files changed, 10 insertions(+)

diff --git a/src/main.cpp b/src/main.cpp
index f5c7e11d6e8a3..df494b226dcf0 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -5214,6 +5214,14 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
             return true;
         }
 
+        // Only send one GetAddr response per connection to reduce resource waste
+        //  and discourage addr stamping of INV announcements.
+        if (pfrom->fSentAddr) {
+            LogPrint("net", "Ignoring repeated \"getaddr\". peer=%d\n", pfrom->id);
+            return true;
+        }
+        pfrom->fSentAddr = true;
+
         pfrom->vAddrToSend.clear();
         vector<CAddress> vAddr = addrman.GetAddr();
         BOOST_FOREACH(const CAddress &addr, vAddr)
diff --git a/src/net.cpp b/src/net.cpp
index e8cc753a486d0..77310fb162afa 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -2384,6 +2384,7 @@ CNode::CNode(SOCKET hSocketIn, const CAddress& addrIn, const std::string& addrNa
     nNextAddrSend = 0;
     nNextInvSend = 0;
     fRelayTxes = false;
+    fSentAddr = false;
     pfilter = new CBloomFilter();
     nPingNonceSent = 0;
     nPingUsecStart = 0;
diff --git a/src/net.h b/src/net.h
index ab9eb68d8577a..230fd5bf403e7 100644
--- a/src/net.h
+++ b/src/net.h
@@ -358,6 +358,7 @@ class CNode
     // b) the peer may tell us in its version message that we should not relay tx invs
     //    unless it loads a bloom filter.
     bool fRelayTxes;
+    bool fSentAddr;
     CSemaphoreGrant grantOutbound;
     CCriticalSection cs_filter;
     CBloomFilter* pfilter;

From 0dbf6e4b409648a27324bf230d7feec973984da4 Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Fri, 1 Apr 2016 12:19:28 -0400
Subject: [PATCH 0131/1802] build: define base filenames for use elsewhere in
 the buildsystem

Unfortunately, the target namees defined at the Makefile.am level can't be used
for *.in substitution. So these new defines will have to stay synced up with
those targets.

Using the new variables for the deploy targets in the main Makefile.am will
ensure that they stay in sync, otherwise build tests will fail.
---
 Makefile.am  | 6 +++---
 configure.ac | 9 +++++++++
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 0929a59ed2de6..5783c1fdd8f55 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -10,9 +10,9 @@ pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libbitcoinconsensus.pc
 endif
 
-BITCOIND_BIN=$(top_builddir)/src/bitcoind$(EXEEXT)
-BITCOIN_QT_BIN=$(top_builddir)/src/qt/bitcoin-qt$(EXEEXT)
-BITCOIN_CLI_BIN=$(top_builddir)/src/bitcoin-cli$(EXEEXT)
+BITCOIND_BIN=$(top_builddir)/src/$(BITCOIN_DAEMON_NAME)$(EXEEXT)
+BITCOIN_QT_BIN=$(top_builddir)/src/qt/$(BITCOIN_GUI_NAME)$(EXEEXT)
+BITCOIN_CLI_BIN=$(top_builddir)/src/$(BITCOIN_CLI_NAME)$(EXEEXT)
 BITCOIN_WIN_INSTALLER=$(PACKAGE)-$(PACKAGE_VERSION)-win$(WINDOWS_BITS)-setup$(EXEEXT)
 
 empty :=
diff --git a/configure.ac b/configure.ac
index ec5656814f074..6e463dfc5540d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -14,6 +14,11 @@ AC_CONFIG_HEADERS([src/config/bitcoin-config.h])
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_MACRO_DIR([build-aux/m4])
 
+BITCOIN_DAEMON_NAME=bitcoind
+BITCOIN_GUI_NAME=bitcoin-qt
+BITCOIN_CLI_NAME=bitcoin-cli
+BITCOIN_TX_NAME=bitcoin-tx
+
 AC_CANONICAL_HOST
 
 AH_TOP([#ifndef BITCOIN_CONFIG_H])
@@ -1019,6 +1024,10 @@ AC_SUBST(COPYRIGHT_YEAR, _COPYRIGHT_YEAR)
 AC_SUBST(COPYRIGHT_HOLDERS, "_COPYRIGHT_HOLDERS")
 AC_SUBST(COPYRIGHT_HOLDERS_SUBSTITUTION, "_COPYRIGHT_HOLDERS_SUBSTITUTION")
 AC_SUBST(COPYRIGHT_HOLDERS_FINAL, "_COPYRIGHT_HOLDERS_FINAL")
+AC_SUBST(BITCOIN_DAEMON_NAME)
+AC_SUBST(BITCOIN_GUI_NAME)
+AC_SUBST(BITCOIN_CLI_NAME)
+AC_SUBST(BITCOIN_TX_NAME)
 
 AC_SUBST(RELDFLAGS)
 AC_SUBST(HARDENED_CXXFLAGS)

From 26880c34cd3e0837724487f6b14cc3cdd7bc8a4f Mon Sep 17 00:00:00 2001
From: JeremyRand <biolizard89@gmail.com>
Date: Fri, 26 Feb 2016 00:04:48 +0000
Subject: [PATCH 0132/1802] build: Use PACKAGE_TARNAME and new bin names in
 NSIS script.

Replaces the hardcoded string "bitcoin" with the autoconf variable PACKAGE_TARNAME; fixes #7265.

Places where I chose not to replace:

1. bitcoin.ico wasn't replaced because it doesn't seem to be relevant to the build system and its filename never affects the end user.
2. InstallDir wasn't replaced because the current text has an uppercase B, and I'm not sure of a good way to capitalize the result of PACKAGE_TARNAME.
3. A comment in the Main Installer section wasn't replaced because comments don't ever face the end user.
4. The registry value "URL:Bitcoin" wasn't replaced for the same reason as InstallDir.
5. Startup shortcut wasn't replaced for the same reason as InstallDir.

All other appearances of "bitcoin" were replaced with PACKAGE_TARNAME, except for the bin names, which were instead replaced with the new bin name autoconf variables.
---
 share/setup.nsi.in | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/share/setup.nsi.in b/share/setup.nsi.in
index e553a5ae88275..ebffb3b8590c4 100644
--- a/share/setup.nsi.in
+++ b/share/setup.nsi.in
@@ -20,7 +20,7 @@ SetCompressor /SOLID lzma
 !define MUI_STARTMENUPAGE_REGISTRY_KEY ${REGKEY}
 !define MUI_STARTMENUPAGE_REGISTRY_VALUENAME StartMenuGroup
 !define MUI_STARTMENUPAGE_DEFAULTFOLDER "@PACKAGE_NAME@"
-!define MUI_FINISHPAGE_RUN $INSTDIR\bitcoin-qt.exe
+!define MUI_FINISHPAGE_RUN $INSTDIR\@BITCOIN_GUI_NAME@@EXEEXT@
 !define MUI_UNICON "${NSISDIR}\Contrib\Graphics\Icons\modern-uninstall.ico"
 !define MUI_UNWELCOMEFINISHPAGE_BITMAP "@abs_top_srcdir@/share/pixmaps/nsis-wizard.bmp"
 !define MUI_UNFINISHPAGE_NOAUTOCLOSE
@@ -48,7 +48,7 @@ Var StartMenuGroup
 !insertmacro MUI_LANGUAGE English
 
 # Installer attributes
-OutFile @abs_top_srcdir@/bitcoin-${VERSION}-win@WINDOWS_BITS@-setup.exe
+OutFile @abs_top_srcdir@/@PACKAGE_TARNAME@-${VERSION}-win@WINDOWS_BITS@-setup.exe
 !if "@WINDOWS_BITS@" == "64"
 InstallDir $PROGRAMFILES64\Bitcoin
 !else
@@ -73,19 +73,19 @@ ShowUninstDetails show
 Section -Main SEC0000
     SetOutPath $INSTDIR
     SetOverwrite on
-    File @abs_top_srcdir@/release/bitcoin-qt.exe
+    File @abs_top_srcdir@/release/@BITCOIN_GUI_NAME@@EXEEXT@
     File /oname=COPYING.txt @abs_top_srcdir@/COPYING
     File /oname=readme.txt @abs_top_srcdir@/doc/README_windows.txt
     SetOutPath $INSTDIR\daemon
-    File @abs_top_srcdir@/release/bitcoind.exe
-    File @abs_top_srcdir@/release/bitcoin-cli.exe
+    File @abs_top_srcdir@/release/@BITCOIN_DAEMON_NAME@@EXEEXT@
+    File @abs_top_srcdir@/release/@BITCOIN_CLI_NAME@@EXEEXT@
     SetOutPath $INSTDIR\doc
     File /r @abs_top_srcdir@/doc\*.*
     SetOutPath $INSTDIR
     WriteRegStr HKCU "${REGKEY}\Components" Main 1
 
     # Remove old wxwidgets-based-bitcoin executable and locales:
-    Delete /REBOOTOK $INSTDIR\bitcoin.exe
+    Delete /REBOOTOK $INSTDIR\@PACKAGE_TARNAME@.exe
     RMDir /r /REBOOTOK $INSTDIR\locale
 SectionEnd
 
@@ -95,7 +95,7 @@ Section -post SEC0001
     WriteUninstaller $INSTDIR\uninstall.exe
     !insertmacro MUI_STARTMENU_WRITE_BEGIN Application
     CreateDirectory $SMPROGRAMS\$StartMenuGroup
-    CreateShortcut "$SMPROGRAMS\$StartMenuGroup\$(^Name).lnk" $INSTDIR\bitcoin-qt.exe
+    CreateShortcut "$SMPROGRAMS\$StartMenuGroup\$(^Name).lnk" $INSTDIR\@BITCOIN_GUI_NAME@@EXEEXT@
     CreateShortcut "$SMPROGRAMS\$StartMenuGroup\Uninstall $(^Name).lnk" $INSTDIR\uninstall.exe
     !insertmacro MUI_STARTMENU_WRITE_END
     WriteRegStr HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" DisplayName "$(^Name)"
@@ -106,10 +106,10 @@ Section -post SEC0001
     WriteRegStr HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" UninstallString $INSTDIR\uninstall.exe
     WriteRegDWORD HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" NoModify 1
     WriteRegDWORD HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" NoRepair 1
-    WriteRegStr HKCR "bitcoin" "URL Protocol" ""
-    WriteRegStr HKCR "bitcoin" "" "URL:Bitcoin"
-    WriteRegStr HKCR "bitcoin\DefaultIcon" "" $INSTDIR\bitcoin-qt.exe
-    WriteRegStr HKCR "bitcoin\shell\open\command" "" '"$INSTDIR\bitcoin-qt.exe" "%1"'
+    WriteRegStr HKCR "@PACKAGE_TARNAME@" "URL Protocol" ""
+    WriteRegStr HKCR "@PACKAGE_TARNAME@" "" "URL:Bitcoin"
+    WriteRegStr HKCR "@PACKAGE_TARNAME@\DefaultIcon" "" $INSTDIR\@BITCOIN_GUI_NAME@@EXEEXT@
+    WriteRegStr HKCR "@PACKAGE_TARNAME@\shell\open\command" "" '"$INSTDIR\@BITCOIN_GUI_NAME@@EXEEXT@" "%1"'
 SectionEnd
 
 # Macro for selecting uninstaller sections
@@ -127,7 +127,7 @@ done${UNSECTION_ID}:
 
 # Uninstaller sections
 Section /o -un.Main UNSEC0000
-    Delete /REBOOTOK $INSTDIR\bitcoin-qt.exe
+    Delete /REBOOTOK $INSTDIR\@BITCOIN_GUI_NAME@@EXEEXT@
     Delete /REBOOTOK $INSTDIR\COPYING.txt
     Delete /REBOOTOK $INSTDIR\readme.txt
     RMDir /r /REBOOTOK $INSTDIR\daemon
@@ -147,7 +147,7 @@ Section -un.post UNSEC0001
     DeleteRegValue HKCU "${REGKEY}" Path
     DeleteRegKey /IfEmpty HKCU "${REGKEY}\Components"
     DeleteRegKey /IfEmpty HKCU "${REGKEY}"
-    DeleteRegKey HKCR "bitcoin"
+    DeleteRegKey HKCR "@PACKAGE_TARNAME@"
     RmDir /REBOOTOK $SMPROGRAMS\$StartMenuGroup
     RmDir /REBOOTOK $INSTDIR
     Push $R0

From 0528e30a4551d1437e049103624fd461229aced1 Mon Sep 17 00:00:00 2001
From: JeremyRand <biolizard89@gmail.com>
Date: Sat, 19 Mar 2016 11:19:06 +0000
Subject: [PATCH 0133/1802] Remove wxwidgets references from NSIS script.

The NSIS script tried to delete wxwidgets-based executables/locales.  These files are ancient, and presumably no users have them anymore, so we can simplify the NSIS script by removing those lines.
---
 share/setup.nsi.in | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/share/setup.nsi.in b/share/setup.nsi.in
index ebffb3b8590c4..c062f96a3059c 100644
--- a/share/setup.nsi.in
+++ b/share/setup.nsi.in
@@ -83,10 +83,6 @@ Section -Main SEC0000
     File /r @abs_top_srcdir@/doc\*.*
     SetOutPath $INSTDIR
     WriteRegStr HKCU "${REGKEY}\Components" Main 1
-
-    # Remove old wxwidgets-based-bitcoin executable and locales:
-    Delete /REBOOTOK $INSTDIR\@PACKAGE_TARNAME@.exe
-    RMDir /r /REBOOTOK $INSTDIR\locale
 SectionEnd
 
 Section -post SEC0001

From 4a1d5c19ee86b924705e66a8bc31567a35f9e53d Mon Sep 17 00:00:00 2001
From: fanquake <fanquake@gmail.com>
Date: Fri, 8 Apr 2016 16:00:40 +0800
Subject: [PATCH 0134/1802] [Doc] Update gitian build guide to debian 8.4.0

---
 doc/gitian-building.md                        |  20 +++++++++++-------
 .../all_files_in_one_partition.png            | Bin 0 -> 3350 bytes
 .../create_vm_file_location_size.png          | Bin 71743 -> 111942 bytes
 doc/gitian-building/select_startup_disk.png   | Bin 130324 -> 72785 bytes
 4 files changed, 12 insertions(+), 8 deletions(-)
 create mode 100644 doc/gitian-building/all_files_in_one_partition.png

diff --git a/doc/gitian-building.md b/doc/gitian-building.md
index 69d79b3c68ab7..151b9d8f9acda 100644
--- a/doc/gitian-building.md
+++ b/doc/gitian-building.md
@@ -47,7 +47,7 @@ You can also install Gitian on actual hardware instead of using virtualization.
 
 Create a new VirtualBox VM
 ---------------------------
-In the VirtualBox GUI click "Create" and choose the following parameters in the wizard:
+In the VirtualBox GUI click "New" and choose the following parameters in the wizard:
 
 ![](gitian-building/create_new_vm.png)
 
@@ -74,13 +74,6 @@ In the VirtualBox GUI click "Create" and choose the following parameters in the
 - File location and size: at least 40GB; as low as 20GB *may* be possible, but better to err on the safe side
 - Click `Create`
 
-Get the [Debian 8.x net installer](http://cdimage.debian.org/debian-cd/8.3.0/amd64/iso-cd/debian-8.3.0-amd64-netinst.iso) (a more recent minor version should also work, see also [Debian Network installation](https://www.debian.org/CD/netinst/)).
-This DVD image can be validated using a SHA256 hashing tool, for example on
-Unixy OSes by entering the following in a terminal:
-
-    echo "dd25bcdde3c6ea5703cc0f313cde621b13d42ff7d252e2538a11663c93bf8654  debian-8.3.0-amd64-netinst.iso" | sha256sum -c
-    # (must return OK)
-
 After creating the VM, we need to configure it.
 
 - Click the `Settings` button, then go to the `Network` tab. Adapter 1 should be attached to `NAT`.
@@ -102,6 +95,13 @@ After creating the VM, we need to configure it.
 
 - Click `Ok` twice to save.
 
+Get the [Debian 8.x net installer](http://cdimage.debian.org/debian-cd/8.4.0/amd64/iso-cd/debian-8.4.0-amd64-netinst.iso) (a more recent minor version should also work, see also [Debian Network installation](https://www.debian.org/CD/netinst/)).
+This DVD image can be validated using a SHA256 hashing tool, for example on
+Unixy OSes by entering the following in a terminal:
+
+    echo "7a6b418e6a4ee3ca75dda04d79ed96c9e2c33bb0c703ca7e40c6374ab4590748  debian-8.4.0-amd64-netinst.iso" | sha256sum -c
+    # (must return OK)
+
 Then start the VM. On the first launch you will be asked for a CD or DVD image. Choose the downloaded iso.
 
 ![](gitian-building/select_startup_disk.png)
@@ -160,6 +160,10 @@ To select a different button, press `Tab`.
 
 ![](gitian-building/debian_install_12_choose_disk.png)
 
+  - Partition Disks -> *All files in one partition*
+
+![](gitian-building/all_files_in_one_partition.png)
+
   - Finish partitioning and write changes to disk -> *Yes* (`Tab`, `Enter` to select the `Yes` button)
 
 ![](gitian-building/debian_install_14_finish.png)
diff --git a/doc/gitian-building/all_files_in_one_partition.png b/doc/gitian-building/all_files_in_one_partition.png
new file mode 100644
index 0000000000000000000000000000000000000000..8cbb0d8adc1deda1c7c4023611b65521e054ff69
GIT binary patch
literal 3350
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
N_gLG}?oz$u{{@7oipT%}

literal 0
HcmV?d00001

diff --git a/doc/gitian-building/create_vm_file_location_size.png b/doc/gitian-building/create_vm_file_location_size.png
index 14aef5abaea8d94a5d9ab6cc7e449f7efe4e9f97..5f77206b6fa8f9f0f1bbd6d02819d67bf18327ad 100644
GIT binary patch
literal 111942
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
Hmf`;gDV($h

literal 71743
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
CUm^Vf

diff --git a/doc/gitian-building/select_startup_disk.png b/doc/gitian-building/select_startup_disk.png
index 5acdc3fe10eebce2422cdb6d6ae799a7630f0b8d..59bc093e2c3d35bee0d1bdc50f11f2cf2a6fdafe 100644
GIT binary patch
literal 72785
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

literal 130324
zcmZU4V{~Op*KTavM#pxtV`m2)t7F@?ZL2%Bla6iM9osf;pZ9zk<L+N;SJj*~y=u&Q
zR)nIwBqAIh90&*qqO_FQcMuRTP7n}KY8a@$BW(+?sURS5&=#ViiqfK@B#Mr9rWV#F
zARtl^E~(HeD$7`*)1CA9Hu}fR_nYe=b6!b5#7%JYkNXtGt)&zL!pX?MWQ0Uinei;?
zVZLDn`h#JylL!k%^n#U^-Z5^^cl@5{vZ}eO^2@oK?lLp2dI2SAWkp9bGys6??k4g4
zKw7%@?;+v6MD_>6=z(|lM@>pe)<4+Uf%|Mql>lvQ+g#LmczyEOV)(4RroaM;hwejA
z1Ea>>0f%`jq@=FA<?ah4F#Z;dt(MU_#O#?Ox~yqz6Bn0;*mnxDJt{{Ph6s`naD1<V
zg?~c|MN&yfjD;C@UEa+@mxvpBjTpR0Zm2wm>f7E%&1j3CpR|vvhV&6e{pR;B+WpFw
zab81!oz?ex`=f$O1S#(6K|+nCkWvU@2BMAxvJjkC3WT5*Q7IpVlA!hND$l4gr$N}2
z%Ku^{;#&_?0tqgU-4`;`6-SA2JXHEfuDzIpI8oN(mBXJ~M4L&>{6DY7l&+xq*-_!=
zc6iE2{;_5tifLUIjx`AmNZ|Gs@hN@My31-cMEW48FFr6}N+gi`{;V?~Z9ORIV6ytq
z*#UglpaJ^u`lNS5q{>ABa<$m|{`~eh1mHzK!Lp%Tw&}T%*LuY5F?FDS_mbd%#`Qp?
zLoxM$X@Jq8K<tpfiG_%fT1bI@4{|1jGDcbzu8zmXfC&+@{zfDd!1~Kakw^t5MI=R0
z;2wSfR5!#{M05t+94#~GhbXZ=hFmD5fwTtdQXp<E<~i6~PnH2^HjG)%>NRN#M0MbF
zPt~>RGbcZoLJ!lnIEGMyB6~7|4EUhX>dy@&;Zhh3=qC7-C|U{CUzv(IrGN$91qe%`
z2cj5p<yq%Os5Oj>@JI26nTTWEV{d1gHl#n1m*QLE3i;SGc`O*w5E6(+few8T`YY+|
za!AEE%0U*rI{nf5#VoQK^r@k$eRu|hbpb2p=SbFoM~Y_L^$@~7c>`<*?(A>!h-RTq
z!z>P?Ed(2|8@L;o8_c$NPe=-VvU@H!kIy9D`~Y~pXuBT0A>=)?YdQ!(AXsnkwmb~E
zH8loGIc!caU$8|VTtZ%{7(4kZN<oBI1mytLF2^qS4Pt~?A|-ATzqC@JKq1;3&m7_$
z#fgBXf2B+_DRh$ZNZ3fzKI1L;Ek0aGzEoWygi<0+*tdsdqA~O_J|fyUsyK87oN3!!
z)?Bq*gWR+Zh#!zY=r$QTa61M&u-&h&r|wXnF<z{n)4kiD$DVnghn}%s%HDb3FW(*B
zU)~Ylxn9g5?ZG0!T)_;$R>4XjJt2xqzm*d#hK}W57N{xLD3w6g1<C}<2hIk11e!rY
zLtqC(1mB0e2hW9!1vA0|XB64RGtn7R)r9yI@QZv<QZbs*kgx&YHYoV%JLt(64QbFA
z6Y1vYS;=mNlNl|k@yI>J8iDt9I9hV56Uy|!^W+tdIu8e72W5v;_v&Yln=rK6;PT+K
z0i=j|v=6kX#P5kniLi;(6kZfZMdsgAzt4Ub|DINKSXef9IHxoxKBr!oHy?7WcCX<H
z+nLryLQcB(Es0E-hK;0wtb*c<E{k%V{!JtH+i-kTJYC{hs&;%@s$0@@vR$%YsgR=n
zH!)fQ^<!lXHI?u8>KipH#oQGX`TK>*zZOc_tL2oM73Ec`zju`csv49IlxC~os)VQ_
zs*tOWt6Y`#T83IGSyC^CF0h;qo!*?Po*Lm9BhtmF#7M+Q12c;&OjAv>4rLiUsz|EH
zwS2Vlnh+a}nkt%zPhgI@&x}u;Pdk=W7fnu5Pd4WZj#tkvmaLY&ifW39tNmoYx<D6u
zCiT08fA><0l8eR~B<*A;bSQ-@wa(&*#_#lwm~Ai*;b`Muadw%%Zw|~*tnPP=ZWZGd
zvlJs1H{d682HTZxGMi9Y4Y60SXEB##g{6NP0}M!wdK*jY-7RU%a7{Ihc#Mh+F>PFi
zPK%nFIfmN?Jy(YYOiO@i3}Z{ZoXf5~@;y__)eDyqos|OXU9-Nuy*&nDqG{wqvx7I`
zd+AAq=;LLZ7QL$@9wkmS@T-ICMGFUI73FlpP4kGZPOf~XoLx!=M(;zMZrhjpz6&39
zVTqFY!*;nE3dqx}(`G+-e`Ngd*;Kiz+C<!x1uOv|0dd|bKFZ$hAMPK4AEzIwA2uKG
zAJkxtV6IRbNEq<ZaMs9ukS~yn5Dd2U>(18m&b7k!^4G_vMUy94cDAVNXzd4cYMWIP
zRoEiTq@SdSq{JDQ6SRkhrOM_W$6({3F4+%c6RefrtQj}xJD9zx`snkS4O4A~0AsmP
zjp6jM*>Uv|v@xET7dX18odkPC%J}^;4{<iJ{lg&xE(7ob!vjyYNo%QHHs6F9NU06T
zW+`qocEN^2l#?JRZR9N#u*5$3-;|S;eWfzwI20IUebNroTuE~T1pu9X?Wd1H>t?Ly
zY`&WTo4sqZIW$SFTuzQ9i&JB|Gu1P?f7%aR&8~7c_i9UQnH=mUHn$oY8{ir?FYmUN
zGZ->Dsl862!-(;m+#R`jjNX7x>I6c>;k?ZDidWkaL3vL7j&=tYN0>)G6J`fnuS!S5
ziNvj8WJrh@I9S=d(E<d1?)Tw?32h>uebIeo1-6pfQODw~;&yR10<H}j-7SC1ko(w8
z1ln@qBl;~hQr@!$o+j^iQ{5#UMkU``?-%2h(H-T~l1y3(x?5VnJI2HOhfLVm67695
z?)=JpSxKJio9ffY#B*zxL?u<tp|Xwlg;<Wdu3e{+k57=8s4)3P`W&|#)$_!*=6b^g
z5D%C#*?8FDw5>DNdej~K&g!{&;Qa(S6jH2*>C0gEt9id!q-tFodyQ<JY7Klnj5nLF
zjStAD?K}To^_V{~ST8G*2FHlbWTtocW3;7yC1r-gFU7~D+{@~zAlE<Ft24I~d|9XZ
zPm8TzXUTN=)fi#}KDJ%v#(B$N%cAT0wX0RPu;2I<RQGQL9HhogmbQ6-IsXbzqrvfQ
z?cnudd$U{3mQ$OXm+{`nOzG9}N8NT^#GApB8SwzX{ek&mXRJVAFa2g?*gGyNPl~_n
zRrDb45Vk);HmN!3L!mPdkZB0)d}ceDj+<Yd{x%(HR%mu==3>S)wK|Om*t++A74M5m
zdCBg6{-X6Od%s=oX85|)gV9L$9rPIV$@!AF2VQ7@{QeU~6s3^5o2r)Tv=z}+;Wh2P
z_0;>-KOwUwxiOrmK%2)a*zQeqH000<D~II70QWOKl$;F2T^AmN5@i%AND6CLb6Q95
z7U6!Ybojt`?=->ge4!zCd}$2DUrQFm`w3(_(l}XJijG81Vren_*a%i%ptI(qD3R>m
zd08-KLO6evkMSvn0;EMA1mMuJk&>iySz>9t0uAC!>FdUMEbAAxe79|BkdW++)FAWm
zy}jpa*$;#VvFle8AUpE!`7p;qMZ;MGD93ALXTxY<Y-eb~=x$^G_s9qW!tc)e_tD10
z*?`2|#@g12*Ij_@KP!0uKL0b!L`L$TCC*j?WEwz45>Y!x6A}(ac1C7002~Pk3BRMU
zDereNiT@)1`%i$(+}YWlmx;;E&5hBGjnU50jERMZhlh!om5G&=;qM9tCl6a^19t{n
zC-Q%p{5Kyl6DK1_3wvh^J6n=}_!=16xi|}uk^QsL|NQ=y)5P84e|NHV`Y*NqD#-ND
z3=<0@Gt>X@{!7aL&nT~=g}aHhhM0woiLKM$Jpde>oc#Y;|NqVW?~eb6QuBW)S$R1A
zFXjK4`7cU-rhgRpKMMV8t^bVvH5UMmpXq;04}jZ`i*p765dx7G6IO8tJ=cZR$6Q?e
z6v0AEtfe%-gv5x*&sP%@w+F?ngt1xJ?IY6)X!F--#N0r!*3^Qugv1bokO^o}LR34}
zYa}aGRpQhHLn8r212f)o|9bl4ao60D)&bHie$+QUv2n2BG@X<2Hpz3eiC<^6%!r-6
zEwwF34~k8;Eh0eRBo2c5&T=f_d=ob(2h+j^&RE4?ocy*h(>PsK@NF@w_FG#SYbb{#
z0bA=}2s!~QH<~@gU-~fefKp<4<?PgKI5cMcAw)}rZZZ5oEMNcPrO;q7axDKF5c1iB
z8ky|~VUQA{IMjEy3CvM;P=Ze#2p)dk-UNSgP)V>@2zeh^?w-SitA6F5khT}m+LDHB
z)}WdCyy(Rcy|{tY!ud9ifZ^@dLPFjlod+p#nS9UPFbCB@J_xP^iG~6K`F~{T`O7Ro
zSrrVamPgg=5@TCC6a6FB<DLR*K9KMSA`k@yjbhB!mV0|>ZW;ny7|XyYc()8hUcglC
z6Xu6%#=fWRWGsk0V)P0EkK{ih{iEV@UZOv^^=C=jURZB5ok$nkLST!JnYFh*D737o
zkuVW%&_=J5p=2;16pHcFMC7O;S~ZYySfl1v{5CE&HA6;=K$uX3wP3Ie-072^Tm4_A
z_7vB|ssFI;2m2ybr=E<y7&KG_!>8NU*AG~q7FXxoj;Eh!&7nrvAwV8bB<vk~xm6lP
zXiG(oEgD3<k7U;(C~$I|P%*fVO&a{yeqaBwUiTJs2{$wZ$lMH$hQ2Ul0F03(tNu_Z
z#v{wm*2`nX?S8J`^-JWZ;XAr?Ao;wsrLNN96~q`V&#3~rPM`!|`T?x6NBeoZIz0dJ
zY)?W@gzV4K(&ONWzn%#ef8L|`NxF&In;{OB4grRzO=Y`as0T#^o@fQemC%SOE{Qgh
zoU(2IiMn(qqN78wySImmsYyJZ+J!6ir`7d;+#>~MVeugk_xrDtXbj(PP!h_d@$lk=
zBh1B~2j*siX~IB+_OxkHHpIkHXA}jLwRFM-pdZN<eo~P^C9pVzN6<*_4ahV`S?Nn{
zc%DrwiX+AjzaPjxQ)EYRt=o)HQD4Lq^wt&a5D@++K<&NJq!j$#p5dTq4nVR<L>%(p
zDfRuMq6Oz>o+&i_CHi@%z0tjIpL3QnhaIU>!R?$Iv)uxA`}#-L@`Cy$BNcH`V@8f8
z!b`C&<P;AmhZQv(F=Ft!SQk}PRY_S{6LVRxS`r%Si<EBnc3YSRx{hDK2;i5(jqpzw
z*GBfLw`h+46P15Myh*kPl(T94STegmv;2b95)Sc5jd=|>E?4BZS02`(GW7>TUwrsa
zs#0I}fc`oo?##Tf4+wV2sIl$*va%l^RN-W`^|a*SBz&ol!EEV;#RemST7j?5JrU#y
zrKM7P5cC%@A8Z-&eZ&rS;8gu#)qieL25x@j1dkD*{dd$UQvc1dV)@-y2V>5lMj;4E
z8!r&`@uu_~+=UpNjqL#+7#duKwxdF=rEpIO_73zoRW*_?Ax6+iP>d8cuvv%jXd4+o
zbOrOcCJ0r$Kcs!SjF5_sR_t6o9Jsw9ti9oJy0XHBKIys~rpBjOHAB24mb93+MpffI
z*V5L^1t7sQr~bc1LDBh}rLc@?#3q&RX0f;^zYH>a1*oz<vMX`WPvjp8!wA}dA|oo9
zF{ij;+he!i&$qllppg#q8w1&L^YKaQ15AF@mm?yX^V7E~K+q3l5k$$t*p7|Sna|a;
zbF=VEIAkWZp!U>(N|VIwbz<qxs(f(H)Hibf&B(snkqdV^hq3<-a-k|Tdw*aR*=v9q
z^BTf$Hs<LjlSJIYRcj0L4&l1XZKrY^K6N2><?`Wge#!VV$*CBBCEDod|0XDrmzfSB
z#u2WB6}oLw)tLF^35o<`ORF@M2Wg*QI{GVPOdxK3X`8?gxcGv?07?Mq)z$)O0a4yz
zriOG>^KaQBfX%l4r|=oe-edeSvp}zed?4GPg|gtCNI&P~@yOa`yMN2}oUdZT-#(UU
zd<Q2C<mrz{4@K&gOh`$J5e<V^#6%Sj+YW``bFOA-f=<0F`JP6Hza4HZE?)E^E|E&k
z$O%<<KNwL6JF#a@&mgZG9+sfqB>+bRfC0s%T;(&RCC598`>zt*20@_jG$;Pr4V=j=
zufmnT)vjw~=p!*jsD?66?ib*N&OT*zzD`9okK92hfl+h3han7fa<nh}i8D-QgsRz1
z(?s1YYVUqXrCgGw$3+A`8JZ(9U=qa0gNKcgl3y6?D{$YNP*5jlXxQ({+6)?@`z{vO
z>^&GX*#JpT=<k$Y?=r^spVC93_)l~sk04*K1>!DD;h-2G-vra!`fo?+c9aFO|L{j^
z){s&uI#t5Y#|+d}P2m>X%J_JDDyVG%Lv@6Sl`YOFHVxbU`H*0bsT9@|kR3QqS5Cj7
z3eBmiW>cA8;GiUpOBgdA<8k_yD_!&$4jk2afQIIFWhBh`_a*W-U5Cj*p;rjv7UVNn
z+1*iu(m%4!6Oucu>{V;ymQt?t=z^g1A)O8wjRqlJ&Zbo2){sFnBX3#Hx7<M9kO{=3
zd3eGt{7awP_#m=grM1~|3qLH9aiXwBW8!g$WhWJ29dBFo^Cn~Et&1;OP$coU3CI=e
z&Atz|lthltYJ9SgJ^AqBMRDi}5=8lM^voT7`vd#mnWM<{PZHbS@=`ilX(Zc-{~Y2w
zy;C8l_TyDS?lnqLKpKSm<upT@{>i4a@%Xc{5XbBBa=3Rx^jk%~0#J@WfA35i!m@CC
zYS#&+8;pJKlih|uL1-Q&2CY&xG=-s6I`GA!7XW!v!Wsw#;Fgyr4MMcvM=!M4HF<|!
z89|n`+7)XRm*RX^V{hJ;l&UwNUNL1tCN3^K2-thx31*O>F8DW?`2S{Aj3h?MXM{SR
z(aZD-cOMkHD?G<Hx&;W8N`g<npp-ja2yC1%eH#x&Sl+`Sb}?t4NqbiN{yaqn^<DMi
zeDi9u?Cj+5Lm)m`0A8k|u#ng<=>qoxpIQ1+BML`;5Xtk@+1ZwCL55pwY<!@k(d&+4
z6WKEcchadbC_$5EVm)Z=n$d|3y&%DvOx^z;4>BpXL9#LnooEXkC>rH}>^v4KDl;%;
zL2u@|s$XZ2v`xnMG?s{6nLA=dD0IA@6vRB)JB19$vEoA{kx0F>56;>&W`qQRDOsoR
zpoy;(n`C9AnWzg=PH48_R45k7C}A@BacGPS)EBa<grKoXu4N+idYYOc1tF^6kXVvr
z*0AD+1}6)(e8_si?WG3RbD;7QD7iG)>ID+Cvj3|(KJUo%d{}(-+iWBMHrcrJuK*|B
zbGG1t#8=!KLNm2T@Ct5%9?zttbbKgnDkUxe(p1=Uy9sjIJVRx5|A~Fir(Lj$4?bQQ
zG9{*lp9!Ay2W8K!q99J2*XA7bF#A1(Ta_ddh?fz=-XJaXO=E_a=eE~kjT;me@ifcg
z&lqiMFy`3fPK<i7!4zEsb6U41n_l0QpCIBL+h<J2uH%w+beyTe@To54kc!FMUU&zj
za9?@RkX*hAI5pFHszc-u57$6hg4oDFCGwHMY5sJXCf}!`s%m84cV0U`yI*K|4A~*7
z8I;0S+?o%02$~Q^GkM*a>u8nU`Z{7_G=OXY@<M*^yR448V#CdHIf*cJH{E^3#3n4Z
zp_rkbFf)S>&Rm6bXcuMarLgo<z|+Bz3b)`(M;P@}rm@qlM|oK@v05g$wS3cOG8;1o
z8DsSu*%n#@R17ZUD#{Z~X)i~|HX&<D_u9`&<4*|lT^MsR9Zc?8J7iApP9kl$a|r`V
zAH`ke(jp5ffHR%6=$=9nDrt~^1W3$;fQ^D|FC?MXUgIG!dWcGcG@}IR5L>_hv2&%x
zhPZ3B3!0}@QWOm9hLBi&3xoia5P0?olAXCy$s7Eey4%03f@`n+%GKcMQg@|e_sQK@
z(GDT|F+tPM>|<|wy8(P~=tbR^JG<~;59U0@<k<(ca!@TBBx7ftI%@lvW%&j)yJOPM
zaBhT2aa**ex&;4FC(PC6kfggBvVTg?zo}qoCrPwOST?)zRUwo<kmYz<Z_)-<t;<t~
zvN@VCj!AT+U(k<|^+>KS8+f{NeTt-x1O~i{y@<N0h;pz<bBb4NB-$&9=_SqIkL;LC
zXSa#vc{)1s`#RmfBg);dN}L!yDl1;|)v$=AImI|p*n_doHtrNHniUGh`FWv3nz(v8
zL(?p^k3cZUS6EpHq4{=<;?0b_);G!xLH+#N5p3jm>u7AHg?6m6K~{#E$!V!i5PabY
z9>)qxIKedVDJt3eDc1_>^f00=Ee+{<$s<)ImrX;~2F4a3OqB!0ZgHY6^MyYdSYC)6
zvtP2&JUXmA^`XN5F+hQEY|aCa)F)sa$_Z0a#@=1;?G_b>mZ{Ajn3zCgZfLfyEySCc
z)o8RzYY7YbNxiGi&d+~0u#7Buv$KH4aQ4FzA%D@{2|Xjw<rN+K&(cgdA1EG&`U(Vj
zeZxTt5&QaR`Iqqs8BWmW`{G8b{z1@CQJ*y$KKrDY+MM@TTuiCP00m3mM%&J!E;dgx
zF=RCkFCOxy11H@{!1=kC92e$5sfeX5B2&py9!$R%-vHN)@_s&n=%%LuCp~}bve?A#
z$wIOj@ZwdWkOwd8D>ymsHxd#aV`i4l!*e;aFWu!YS#X{7G1L_1qRM;@M?=JpCAi)?
z9hI7nMijo^cKyp+)<SBJq$(0rWK@6*I!O41Z@)j_#h0peC1v>v92%ASxt*<-338^a
zZA>{VmXvFMUZB)J9_^jkc-2}lJtgc)d^cqg;BrR|pKW62feVYp$p6{0(6H{toT=r|
zV$ly}K9OfCV4?G9?m$1%W0+b?OFPa_p%Xs*qK>rv0GeD2m?vv4N`6ziSiJ`I^-)Gk
zOiVmJ-yp8>OSWL=9{92H5a)rjK@ZFDY_(d6pR0WjJBC9X(C_Xy^lgX+0K1Ifi<M`(
zx)vd0?P<qb?NHKWyw=^&8A>kwXZMAfRjR;41}(FQqTuZ(>@!8h#(kt5N*1f>PcIp`
z@ApP)M*#NoP;r$5{gVdpD*g#BZ;4QKc;&>15Ti~D@L@)FsxV-bM8SFioj-%o4AqN4
zC361js165m(0QA3n^9kW)3=mb9}yEZsJr`NvI5Oov|GWvu**LsWDWHwcCoGavgvAx
zt<k1&AsXGT2|G?3PRJ@1erI!a#{f@UxIZpp$+knsmj!jL@h)nIhA+{xxtzt$#IXlw
zPCneQ4qAyJCg`DFV-H^Lyqv_%6L#yVK%s5}qnq>o5B?J)JzbkMoNswG@EtZR93k-)
zbH;}mydCXfrh=JXA{u-Aa<WnNuCoxS77?io%FOoXSGBuFKWT`Y!(qPK*aYt{(mvCh
z94o?Neezjxl@~8(pZS-)wxo-Z^;V(CrM)H#{><2oS?-%MO0NBJitopb|0L~rn@%nh
zo;qEgy;CDKYJNV6od&;ZVt!Mz(Hise=sRESVA`05xC%1KL+AGrftvezuk<jDCdl&{
z=7--UHJP#Af8OZMOUm<|t{&LQ_A@#qvGYUBYa?iD06WO-W&kgEYd<sLD`wQbVu1|1
zt8~|JmhVdxx<;j}%$F~|k_9`Y(>bI9H#gt27gRiq5|9%@AIbW`2bea|ua}PANw&GD
z*Y##6*8Xih#D&jE`lg7g-ftx$lq6<dr0`*n!`zg?yN|4_TGUGtNJ2$))NB{vwALh+
z6naDYLPP5RVrxglX}xX*qUzz1Li`ifc+)nGopW&Em>{40Znp2cuZyNXHFI}$k%2|_
zO3yXw@TxZJ$*9BXCLGz1jQdrIu8MRu%|?9U4=a|MX<_u=^)e4jeD}CS$1d0aUN5v%
z6Jz~DbZPhfBi-xM(1LGU0OT}ecZkVi#$L%YKz|>NF0;`>&CRN?{(9dV%l@ja`%S09
z^{C*MP+T<j%oTM54>P#erWc$*7=KU~Q;`wo{LnV!#=;BD`E4xAE|Rvm(L3Y&XxPvs
z_H^;hFQP85CtMv4bN<(aq0_|^cZB(wqreha966;kWW7iDD*$nKX0FKBuSJbkcR0>i
z;^3^3Y7<YuA>vu2QUm$*-0h-9gCk(qEKX#39sAeKL3htUK-mNv3KK&YcojoPMwtC*
zv&S*7K0;y%{ZOXMS#A17E~g^`K;WCyA)=B^+fR7F&<IzTv!t4%KT!}v4sSjOFz+R=
zMu>>RDg|PN4l7!uri<KR3!Ukw-4$Q?qMlL<s5XFapY+l(h1^M&DsrVH>+lmnbl5D@
zwNg7RfO@^i=osA29W=Wn`AH0XKHmV_XrM7By`CGKE^S(T9CA8eGHeSMR}JH`H<QcM
z$a7R7q0SUBwbP#1RL~RNm*+{gvE#hi@_p5&OuAb9;n8q+(1)e$nR8AjY;jyqWFXMN
z-Tg*_$w+vrnbC*9M^e7uhl##FlLPlSmx~a0VtFQKS=sH8))|N&1ci=m^atCD`A7+S
z=+7o1F6TBdQn>I81q-l&6hvh+u)(3QooGxPqp8Ceoz9AV`nnK+elx>y5pjN3Ybp-)
zi1GGxVY}JiwCT5B<H~b2bY=vlKck`FmzO89?(bE_=%bz71U5euE531Uq9Mui_i8N`
z)rYa?mcE8~x$(y9nmaEf`bEKT@ZPI-`_8+uwH7^|1&faJyK0eQD`HJFa5w|IsYkot
z%LvW3UuN@&_}v6-jv8@LphoNCAi?W0tmP$A*uC>Z%&CUnuZ)-~<~Rg8)r@SzY_NRg
z1-}}?`*O`biu<LD2^Pl*9h!1nQ*_%u;0hizGYOL&2j9^)6K{s2e^i`dU`NzLh0Y8e
z<61Z_a?j7wEc!(@Lo^72$<8(xm(>3!hdH}4O;Lm?x5F4Gp@$V*$e_*w(^V-b6|10h
z61n8Ieb5>el8PIwItC*h)6rqt><~mzN@Nfu@WeJ9Mfw`kXe>EZ^>zcYDwXXfHBaAA
z=$BqMCx+Q`ZR5celM!Kc|L&V-0q_GR+u;t}UH?WqJ>%2v-CF~DBJYjM`OJ+6O%}Oe
zGvg?J?QEr<ix`ObCupR=gX!^Bmc{hrNQy36oZva+<5rHuh6+me3w_{P)_ulko`rIc
zv~uIwYGb`MB8=QNc*-8-1;B1g8ly4y9F{e-ea0k#;cyVYCD&gVo$##RPu?;I{N*_O
zWk4a>lMqGRlR}tv4PQ^3n^%wJGc@tHUA7U*BA0c&$-Xfs?vfitV}-SsuTU^k`(e`Z
z`rb_Nhp`9P*+#;-4HYAQIpoSTY~sTtYA6lRx!|pTKU?XbCKgESe0QQGdw0GRiY9J@
zS@)d>C#2;xTsrGX!c|u*ph?Zs>B2?+ky@$DuDP{T^Z7xg*3<53?s_0b|6>(YfbX}M
zurF4)nFWhO)^52O7t0`@8qO+z>L*p`eeG%X%Y$K|9<x7d2eEn^%rgtZ*{3t{+8M)|
z0ok0}l*HPGLO}b~U6Mj}9G9}mBR1&)oI3yObY2`EQzy|8XLV2S3OILMVfQaJW)&3X
zXLryLPHPsbO^=k(C4)n3?s#7o0Q|QBaRfQJ$4>%FM5cil<ca>wGdJ>7p^sAinPFLG
z*JoLG0RhaDEI~uP7j*kpLx;zM<sG!lR@dw;L;)s?pg^Enu6bT1YTH*SuJD>Hj$^-g
zI7Rwn=U1riaVNB8O2aQc6k=0>I48qDObmH#mgnpKZ;3Grla~qeKDIoax0}CP+S<jP
zKbP5NONv0$z2r_fiJZDtVxX_if+EVuSwca)M_L6Cw&f*>E8EH$y3z+6J>C*zf!~+u
zp!cE{(|)nvI1?iU#Ek0=VfjK-W_T0xrhA!SZ2omgi3x$Fry3)iFW=j&D`Vh4&AHx#
z+q|enb2(-sQ;rNLw?)ryL6?7=4J$L$!M{eL$%T{$nRdZfbx6~h+WQh^7Ak5WA2M%7
zmyWA8Tp-vNG6@QD<V<r5sbX57fMkZP#L7TnA=)ti!|PeJf<G)-%8rQmbU3kAv_BYt
z`jdegjDcBjmzTN*u1~3PG0$*V#&a^}D6%MGiu+_E2F2RGzagGnEh5WhqO?TDo6R?c
zyfI(n!}nhJaAv9+6bKX)zObOnwRU^d;q4D+vfk$?*6yw{Lp?mEjYhV!t_!7sg9T2X
z!SXh6*AK&yII(y0ACbQR%h0!oN1G=_H^I_UgE({C%V9&U0qopSQ%EL|sd&C?{?!Xd
z&!OxX2i8Vn#P{5KC=;ha14sfal|hWUrOXAv2tO7@F(k+G?b5c-fB95ULk%=`-y%61
z3D9xM3p<WNFKi+76HoRW(HUWqG39iU+W;S+RRUfKS_EG{Y;fZ11}R+5u+qs#TvCLD
zh;^0+wW+a{Z%0Rz>en^RC6cN>4jguX=>8U029mu#5T$tH72_rDU#>%;iB^=mI_)>>
z3s}iPT=&%m{!XgKS#KuW0vG&{WMtpt*P#Di%lY&zl&1RBQu)ArGP`1U%Kff?@;!#+
ze_Ed+7+Gw_gy2x~KCBi(u^g-rhay@8X;w77fr#$m;n?sCHRN`@oQJ-+PlxotTqv`<
z^B?xqwdM*QhVX@W4z)E;(bv;<Yo723o;`lMmx?A70s&mYS?jUpg3u6RQ&9cvPedT_
ze$_-cUR<PIvBBX;j@z~tR3QIDContbR3r9lysE$QoxMNgt#T!sXLyZr`|d*1%anR}
zG}-^%j9Yg2d8QWsJS{%Az{pcmE2!+@iDFT9?YqDEAAWTcn#apeB)yt1IKHm+@m_u;
zmWW9d%zo<iYce79ec-Nvc=oDbz1&5#DfeOt!&$VNG<O_Z_SE*mh2l>Mt(5ly@s;e1
zNj;?7+Xu+={LzS>-qet?aqX~@(|GCt5AxD?vXLEyb}y?tU`CltOBb*-Rg<kOe`5UY
zU6yem<6=tU?eSu=#smD#p)SstLITAcL(Oh0f?>UKtK6h!`vBUD>}XPNZ+Tw!`t@s8
zuHFXQ)mC>(ScjPtPSWi{IID3>U$BW`oy#Wz5`C(F-^+97W5cvXsQi=qGxQvM;pfTk
zD{cCWJ6hklHFz0{K=KT)nOn1N77uGYWia#o+IQbiBxAp*A}75;$|^$`RmdrBqe>1s
z!}NArF2a7~%&p5Bb;HYdF9$7Ai)GeYmWq}A*}Ont)bZJEd0tI`prqPT%mPSEx=Qqc
zp0Sp*n_0T+-R0fPZ8m!=N<S3XUK-=@x-1px!{}!!)Id@%U}qZzLi}Y>0T}3`TYo1D
zj+CDeq^Ud4%-})MH9E%f-cbn0GqOm;dVQcqT!Lf?N?GUl$5f)fZWwvjwAw4~Mqrjx
z=|rverLKk{Y-Zc>Pt%=^j(|JCE4_A9<%Z7wp{bIUkWFNfd7bn#A$h*`F4&=m&j*o0
z$GB>swdH!H@GANw(nMcEy6jC~x1)polUk)F01<LtawmXC4>jxL#S3ApcB<8)Cmqm@
zc*=Jm%5ZPtb6e>3JbIA(cB=nqS~#5(Rb2x4HUi6V1lKIkBwO+muOmF1_mSZ$PWtP0
zDeQ{Y$v3>qyD219{R7NGYPch$W{;@`z56pCev9s2_#Fx7x^KO>hI4#k)es8`K^Lw@
zNo9RJ{&lz&@FYVCD4bpnK3G>QF)QMv%5jc^@ZOxs<v!YfO9ttUc7Tc9r;9TsLTocl
z#*Dqzhy60(vTp$pJqBY#nA6Hc)mja^R_c9md}uf-p{}B^z|uIwGz&)X%LSJXrQwfn
zP$;5rkw9In7jAolWvWf$;S;CoL(p!pWpiGxgxR@Way3L!fM;YEn%xv#>H(Z1{kpc*
zC8GL0jdy8(h91xCh_La=_;UObY4oBC3vJXDQ|>IPRP!AjfirXYf>ij?Ge6IEP1q#w
zwcH(&`+FlwJj0}v9sD~1S!@cK+ZEUId{38Y?P6dk-)0xF025yLQ`Zy)x21n*M4}%p
zS}WEJWxri-s+nEicm*ffl|APY13}dKWh*`p=4Vi!+tp?qzAr1vRrR!(i3&J{qk~A+
z&>(;vDSjvu(#YXVQ4bGdNjm2m0{Z8#AZkMfP}3h%rX3>dUo*mbBs&|qIMSBnp|mkU
z)`wbhZI%>j`;_@Cdz0gy<IB&_6@=dq><Kt5SPxZ`Nx7^9OgA=%8{4;!QBx5Rlv*6G
zG4!!iKM0tKuKW!2p{89zj_5T$Sc@tLhqa$bvpVDnI73@o5rj=x{xsqa$d4)+`*tCa
zL)DSBxtkIr{&{jBtR7BEo=pE?6fgV|c^K?9Z~k3Mv?dn#vLVyYg4jRABy4I6X!hYo
zUXIZYS{UY??>U^-3((#hHm6u3SsnoM;;t02@a0tNe&rsLa&bzIz4KInfMrw%Yr8)K
zs?9NT7zrQ|PxX4u6Zg3v7Ky!!++04*lw7I0yY}Mk&jblH|1v?d#3^`->|x=^;Em?K
z|ImeUkvTbjSh$UUctv&9Ytcz<=!{ZfBox++xsp9H{?pH+(XLN07m764<>*(co|PT6
zXf)hPd%E;n2O(#qnCYN#l%XW-gcy8d{!T87f+K-cL<M?-?H8A6oF@iu8TxFAD8Uvq
z^tH?upyhdIbtPFfcqDYAe+uJ?%gMDv?J8UvhwVjop8ybDMR!DE^M3Yi=Q{?609`Y`
zsQtd!G70Ecdu3>}{9J@|&-3&M)XrProEOJ_yDID_6WbfDaRLeb*hZma2&80ugB`IR
ztE7@RhlL6~VPNa`+Cd?1jEgnZ2!cS4J+i=0nmY3-f$U5?GyN_8u_NOBjrO#L>_@`=
zp_Iz+pIpCWR&Ew~lq2mbt1mV_A0XRVg%V-s7%dV6fy6Zm${EGh;}E9MaT1xRnbJjh
z&6?kejhswEoEh)4DDaggJq;GE6bzoX^>#u})K08Izi_7?1PCLbFD17k+;*ySqkw%J
z-8lY8XIMtBId*$fOnL(=HCMxb1ll!1p4}EER9h0&dOY3a`#O9=a2&mm<1#Ea@~3AS
zD0@?=x$JxY)a<ST-S#%mI@pQaEif66M(}*X(n4*D(PAp3jl3F7zB`Ch7!BZ8*zcza
z%>F*3k8(U^rvLIJ>6IlQdLbhWyOg>scEOKG@jJKc%H{jPMet_`F&_?qj+<e(gGS6S
z=)olz*yun@4FY=Kb;ele+X0d^x7jBEO<ZWWB}n0V88Hk)M%9!RIKJktC*8(Z_3QhK
zHp!22@81w$XIGAAdpJD5p`mmVswbq9)J$a=b(AhxoIj1yIm{s#If3V)2ITYCH;vLb
zyjPYJJFbMiqO3&TPL#15>+nIIn(PUgp)Y5}IC^n068*inzF(i1ZMjBDQiR-)vcz4H
z*o@D2zd<&e8)0dd3-|k<?|l6FYiv)31|f0Gm)!5G>6krkFVcPb(@baX$NI~a{rLU}
z5IQ~b2YW$1u!3{I<4q=(C7-zdxj8}{;!ASdJ5=Iw@^2o~bJ#NG=c+}Q`8*{Lqe|2N
z{%SNLg&&z_clXMnNg4RjG{zZjbs)|E6uY(4)G3bR{kEv4Ju;gVwVdI#k~EsVKxXze
z@u}W)e<6wdV>eB2e!)xd9_5qcnD%$Jxss;^$A@X=OoaOPT~6lB_34^Q#<oI4;nNn(
zW0vBQHzM0OYPD(cOI6WXa-Yf+y(bve9}(WYtB!GJ_Rvcc)BTu1P)38sblPi4Q8(*n
zQ$p4yGt*=7E;dyYQ(L^UB!<h?x?NXeyy*6D3lyLkS<kH1=s#f#u{~#y79GmJBbP=A
z?MihWpm?X75@Rp_4zJFWa=pJVcm4*~#qWOhn=sIX(Q<-jeX{i+;Ho&et4JhAc27x4
z=r6u+Pg&F^E<3ohDVP>FbA92l>Uvt0&cS8+$1nKhc(PnF8g}??du^E2GfS9Eo1!NB
z{qBPL-OeAKM&Ic7YtdDSZyv~TjYc`i@+1GgH{9i!YG`*OJ16FQz-TZ{Oib6qsH9^O
zgi<nJ<pXrXZqY1Lo?&r;+P)~=(h66qDXBk$GfP*3A>wF;@<q-N%`hx3NM}olXa1Cr
zrFuylkb>G_prM^6L014dW4;%sw2;jXn5Uetti`5Wx(<_)rh+s_D&NSu%S&EdF+DGz
zXe&Ud%P{^#)>I+$=~^+fMBjBM!X?4j61j9bSo}1D1z2&}csCJO`@Uh1c)rPJy2F*S
zG_2tkx{s79I#wCxrPvGLRRAi0y|0|{wW_f~{3AZwS<B?`w*=!|FMy!QB!;KVQ#h)l
z%-eN~+{cBP->mqPZS{mYY~B5}@+^m&(Qpl47oLB6oB<7Qm3=Z`FH-=aA16E4jDWbg
zIA*d~bei}5OTVp8vs}z})i1u``}^MssY}S>;;d1*8l|9lxi~w-P8Nvps05W&n)0^N
zD_06{IL-blJw(3m@T+y4(li965WgDeup7sDdT`~PVGglCP}yC?DA|wvi$JwoJBu;=
zA|F$Lt8LAoKz3|d*`3(6oeBFnUtljtp!W~FIpci2zgM$J`<OW0*cqjk;M|`&s~x$|
zO8nBaV03Fc+S+_0vl@6s`lOMvh_cG6F46Ks3)`g#Sy50r-)5FzR(%f1NW$ZOvs2_B
zL`EMqiK|{jL{!-|st-bV9n29aIW72uNOl405YbRXhaeo!iSAMYe26f|g%`;*FYHw4
zf2Sx`;^ClR6y+TcI50N`jdNGYl9#Zj;eIo^7^scIOZPFCNJPFeSy4Gno$Z$2s;?f=
zsPGNMgGBrk4l(@x@ulJMu}4dXG<#3kb0m_qXPtfwm1I@;$E<j4#^&}YoJh|108F`a
znMl*UpzAjqvVv{vvWgNj&vNpX{9R*7b63%oJLncqy{y)gX?$28)u~tIL|-LKoY6)g
zCOZdX4U}av2f^l`S$?NlFq02>W+!sknc!{ZGs|^QyS@M9==par=({R9MbS1qX8viX
z^l3$VS8L19vcHbOVTVeaZ*|z}BABx0_1|S}3%?b|Hab5JMaOCmll0@=q&v8S!k<|%
z2~9#&yM>SBuHsy>HpZ2yD7Zjc%TXg{P{zwh32D*|bUno4Mp=1QfNWAGox3MC`;J-~
z9%n9(irrJ^hK#%~Sxg5s;G)B8h%QctpNY5=@;6Fp@|ws?gd}NndS=0J81pI{<~Oy7
z3wN0Kptz<`6Q@+<?ON`&x~Z9el6kpc4RuSBlIoWlTn8EcJrVcues4u(xF(Bu{ZZBN
zZj^RCYU_u=n9GNlQWYdTx^@<6;mJ$1*Cr==*;e^DAs_qo7s8;t5aAkt>(2x8oSwzb
zonALb#30{@q`b-JoY5QV;0S|NN<+gq1S-D_uqVMbao&%P1UlCsS*z>dlmA$wB{kE(
zVd_r8kY7$srCQjwT_*9vyjXWmXN%kKCcB98wxl4k$%&t%NYJJpfL`2PVJ~bNJy?Q;
zhOuwd4IIPsH)=5B+F;xUxLUh;7k@+k`3t2<D(^2`6mtW~wT&RGX}sm#+7d1?LyZgz
zk%xvZeZ2q=p{!L<Op<5eQRpIJcU3?ls=!H`oxchz*|$U3xnf?;5AWEw!#KzBUjzUQ
zE$A=?rV9PniBte?*XtkuAvPFucAf-ON@KQ;{`7aVdrUpC_0KLJuLQSaW*?CJ$;-8e
zlRX0#6eM(_Y9KBsD&(ZS<==xxB8*sLm+aprg~TVTBwXd6X7bT=U8?V1aLgE3DGpTM
zadSeElS~6wB}f@Z);L)|q`b(tayrNdxkoyGMZ(&*5HXj<r!uvN-rjtm>L*AHf?(bL
zqB*(E;_+VKYtl@%sfsF&JX4qZgz!(^0;B(Ypp(CtQ&<-sX)JQw-IAJB9<i0W27Ko{
zK*?iuk`AKyapB^=K*^dY9aO;RBs-jk`(w4~8>u^RG18qZd8_!Wh@1h*@4ciu_t0I2
zhx%VzJYUKFJXDzZ0{DG-5sc{ca<#pyb})I@Tf{-w#(vCgIJgk%c;nXyFP%e6kx3#E
z_jPr8B}{iFl;#RM>%jdM(N{lJ?pAY3Dt&b{o3u|<kSq|JvfqX4U2=u)^6=(K80ygq
zl88EmZ7fye+0qg!_T-sW`&(zco`{R}CY2i0lh}o|Fs9|XGM**Zh>Bn}Y<Ag=ZIZUB
z49v>zX2V0X$GkB_fhq(gEtZQ0kQx3EGxQ*;IgN<+6Dl`jXke+Vfmt}<`d}WvWyifs
z^msV9cJ)ApUD=yYJl;s3b4a)KDTa+FN6-*&tS#c$qsGCw!MGk39@MWuzgo7NR<qxT
zQ`7~sid`@&>ukAnWux{W{zWam*GT>CW*IyN%K?X8)P4>z8g)NhoN2}8I!<6;Dv~$_
zGmo?Q<{lApOCe4IY&{eu!t@!3bELxbt3!-HVpcI5u%J4!@ooI&<maj>9FVC&GbKz3
zlV{lX1ryy`!tpZ6C6e+3mRT`hnkTdY%xd6mt_Mpb)^hS;a5K#=tXht3?)ve~hSbZe
zbwWTA%0o339FfK*Hl_PC)O6I9Ye;f1d`UPNe$xgafOn0J5ShOEz$B+^SpqDl>c($5
zga9c7GjwTJQ!30RCKpI<%Ze&4^p-i9$-x8@+lz!X<!KN>{Eg#M6fsNR8-wua{bgdl
zn%I0RK}fKmx!rHve*sNU{{ou6Okh{8#=ltczbY2*LKqMcOC<3@ekJG#+quOMrQ-F7
zEk49?aBBpK)z;&A8%>~XV2*4ig*@o_L`-VC<<}+#ITaj+M_5^dGJu<(8&Km=4z4yu
zm{=*xWJE)lP6;$%P5}x$Vtz`j1^PfEWdUj2E_uvN!KC?&Kmr-i^R)PzR;fWHF;Ryn
zkKN{@Gc$Tfh}fR&T~uDzHC!ObFVV53{FhJhKv6B!@EoY^E{+-UNc9v843|tZR44F*
zrT%`D#^6t8cH$k_S#ZyS=C1UOhUS;W3>;;<y3ts}UHo8^9p2DzzJ<|LWd3|3yCiK*
zvu6;)H@oO5nJ1rU?5|pwEeDaX=j6w+%6?IMmvE|f5uzA9^u2=91G2xMhMVaeE!5S-
z1|Aka+MAbr&F3($cJp>l!ZWmiIxR~FTjhiaN_5#QWo*yh+tk$WxxHv$yE65Ffd$w*
z%Riue8{VM%-OJ-+=S}G>UMZRoOi}Rf!1ND;82H`AB1F|}EgcQZ7mu6?iQsjn-qZIk
zcR01>GEDV|X{@Qf^7!=@bw^$g_i0h!#gYK0%j}VXfI7!459S<!K6+!?bA2(@0HqC#
z-(%YAC<uFR`5h8{Do+Uj6sYP!<9f9g!PNbZw%$E{2wwwgh~LC~Hlral$kzx_a01DO
z<$^yW=2Y%jaR{79h1Q~JDUP8z*s9}uL*caE3cGqFWc4MVyLRslU^=p8#4z~^WHSZv
zmjhm`+b026mAwNIEgf421Do*b(z1cguSzVNKV4k+Yw68Qfa9r46dLjU4IJ>Y{1D#}
z)$%>F+12p2i#kV-ToENB9d9ga=IzJ(V$=@j1fD<O<LuKc&*pNa7lT2l6NDr$kP+=G
zT~!b5`lB=M;;-1|)<Gn-ev@UkRT56hDmu7BQ^n;4GkBwxuQtO@gOP@4@SQq%JBFW~
zLIm$wbTakS=|nR4c7hDIA(fUd$yV{OezkE*HJE59!;ZPlHL`H;lV|;0?VrSMynaI0
zblhf(CT<^<!)01w4dYX&;X3+dSuwIc(L7bwSw&H6Fy&&tY$_kammXG5t>T^YN(qy2
z6;wj9m>sAD>CHF{>B9&#g6ryYxv1_}2ef+;D3ITAc1K8)cVDk2KDd`=<CzdBC))|W
zJWqdHyVF|2-?$oI`#lqp6V>RC&Om93Lc4FM&$Iew&-{c!tD`hT%AKnBy!2FOP?!oQ
zpp)gjgg~8kGd_brZ6VDb(^{;ru)3tL`9sMBO0R(`hS=gN<cXeL^#Jurb-_6z%(aBl
z1GJz$U9i+3f*HmtH2wk~T~t|_;HkXa1}d#QNmI&8Li#aaF<ha-@oYi|>K(PFxY9r7
zO-FNV{CIdCW@L&%9G64a!E9@E(yz79vnPp4h{8<&WqgE3;~gSTTKqD<G1P)}qOTp)
zJ3e~QPnB}LzwA`?VJ6dq%%c8#d$<uWp7kWXf+h4~Jq~8C(qu5~wW9u)_Lbh)R7pW$
zS$(lOjsYkUuYz_0RneoMPJ77PD*<hJXS|w=K)R1M#|zXFs%=+~<JPc?Ns)I^OQuWq
zYsxf$?`Go-Ao4hqnPqUnma_l5)9~BpZvMJs6vU=po3Q*^JKei4?9lR4zjAG+d{YY*
zPD0M)6tcT?OBU)Z36b=Bi8MJiTE0vBP43Kx>+NL(`p)qi-Pu>``^Vy4x2$H4TmwiW
zUd`;(GdJW}h<zYci6SCb5a?O#p*dx?lKnn2r`?8s&5~cga9w<bG8K9CuSfg2KN?xC
z5>4hPGYY+a$R%v+>}+1#O@~DC907P1%*}poAX&|3S!L^Bq|HkM`P$=p?VfqoT{;oD
zu5YQuLj{mdN0{6zt<=-c*J9#z$;1p<k#D88vqF=4^Z|0<;O{LRosDb;{2xWxb%hUx
z6C~%dYm-s=aBg4d-R%_&-}yAUw-{crBL|WzP_E=Uu;;O-`Wt-K^Y=8(NFIiiG`av`
zXJ2-`=v>9SH!eMoH_HXXqVRPW<KoAzi|8xIpKD`VnE^^4FPSoPHTcE!FNsl@lK2;M
zzot{S0~*%r<UgwWiPL=GY)|&k-x({P^9j=hACU@+b3>e_yNLWU?~v43ijoh@&Jp45
zhehvh7OCN9=_z5^y4QjZ;*f^sfRHP%QyPuWtIp>)=Df5wvkQDI?n~74x)H!D;4sHz
z;>`E%-s#<~)!b;n`*ou+HC9~v{Mc|u&@cnDDJi&li<84^Fsk_`JtPec%`ulH6em&h
z1i5xv?BF%-IJ2FOTT*J`93h*U30b}~8&Ow1qJ(2yA%jtk$kXh&;>Zz&(;`0t8RD$c
zCT!FaUITEn+2q)Fa(+bzr`O~r?eEQMod&yIAfFx_6yPm(Rx3Dbn!TC?y(aeJsLX08
ze|4kO363=={3nGKLow3t^&U<DKV6|Fz1zGa!c}fyDuXsz(HA%U`%xN!IlY4nkwv%H
zbR$g?6}X-Dn^SjDl`pFs-B+#G1O0soziH*zt?X8#IeVKxTOb%g5a%eec9v#6Qz{VW
zGC{UGti-6Ho#`F!j!fgj<uYx;WP{m-bg4$y_>|yj1ANh=p00XgVBwPnr_;QXuwPrz
z;SbAMQc(2XM~io;Ma9Y2Wq;kd6BsDed=1T>+}D|wR#6f1Q@_fX7=PTE{7dH(Q8Ch-
z4_m)NP*KOY1agUoDQf8Y6V{uFP4(g|sw$7h>$y<eMCkMg^8s7h-RG&`qLZMp>2=#1
z_jK{Em$Rc^?Fwzr<r8E2d5^<n058{(uk4q$D0$LN0w=Ci<|^K4Q3sDGqUZE4&z#&q
zSlo=6PD4TL{36zZ_PECpl7$At<u@bl&+q`m?#8lTpl-{}zDsGvRPN^S4<uSKl#4@2
zmZ&am>SWI^v|kxgjQxJc+n^2okIR42EH&{-&FGn=oGcMIvRRBvgfk<{BIjKB{imxo
zSvwsKT3O<^U_d|@f|bNfsxHq;BRPKS20`Lr1vp+el^0WoSr<l?(-u3pC3j4_jg@aC
zGz9)ascn=(%Ke9?`dEoT`ST;|1z!?K*?b1WNdwt6_Kz7Yp0zn)j1Y^DK%bl^7TYTx
zoSGejj@Ko)j@LK6ou-n@KBga^(G~Cw)gN>>b8OQjmtB+^b-Tc5pbxx}Z7agnm0fV-
zR)@cp^nGQo!fsujuD?-{WSz-4*T}DE*~jWWVA@v5@;V^wN$>^2&+9J~!C`*%ZEG_i
zvFdK-VrqEi6j}CqcFo28p;eaU?YGg*RnTq!&B0u1lvaG$a@a$klPntZ0TZtK8xyk8
z{DNTCM55H_tVl=qwZVPI3F*e$^IgkhG!*yy3mieQYe~OC8yK-*P;|^os%fz?_>YVZ
zFtfaQEX^x{5UanKnk+q;VZqNAD53+ZJT4bsxOOn8M;KeCm)C3A>+5rv_mdptn;mF)
z6hSWv#%?20xKm8S+3Tq5ijyt<Ilax{x2ulGRQTb&Q>1QDQ*nqfcsFvNcbJY7yx0^g
zHKVBlAd7F${Bt=gq#OSS8kfO-x}Y^#ZdVl>?e9s^Wl*E|3COwsN7XyFY1T9Wwq5M9
zd6&Cv+eVjd+qP}nwr$(C%`RJ~o_A(GoS(3-h>VELT)FmgrAEk*Lc8wzDE&)feOV=0
zp(kr@sKESdI&%ZP{Uk1xb{hcmK4&oe>{++(<W=tkB&6C6q+@?>EsBoS09LtVCxDo6
zWIqaZXE*k!`EUVKE!EXdN0Oo&7Sm!`@9{1Lp-vYYSNoDh@a?d2Qai|@wM5pvBy6$+
ze8SpEZ&LLif0E%=2Wk*j?eVpTY`qO}dvO$hKv+cGzX;~U2<QXr>tGo8TFcQR42TD|
z)UU&2J5zdM5JLCn+cHQ~w>7I&HrY@!d~J2l-_j8VIxrm=gvC~ai9?vGZJsphG_Gje
zi|9aJP<NP(Uz;RO7wFc|b^3i|59gdn&)m1bZ%^F=F(u1(JX8)dB^7U)ek-Chk2eY5
zOC6~~wjR<UD3`7$<eJQmT<Tox=#(lZx)Lc-7;`7UAV`wm1Lr;&`g7CFt{w{nt*rxw
z|B_?qt#5QYvpz76i=Q2B<jqbBgP9q#j?>~!nOxYHE2T$9JJn7(|4}C{QTF$D%$$5?
z_`hOS)Y;#nSYq=+u*zsfEYMy~nwTIh&&N>z$w$%Y<c`9(N8|Zm*+KX+e#NjfTScpS
ziEa^8%%C|Huw}S|^;bitsB=cVcRCMUrbiq-aYz$|wPDWwW&lM#;SvAH2#0jg7OY_e
z2t1D`&$Qk(akgq6jc&%9W&6bgvQas|WA?<DhhnHO=mxN&MXwR~F>P;Zr2zcINNiB;
zCjP0N+wZKVa>(LucT#aX0mWCxmpeAiTx7e+zkgs(>NIIlqwZX4KIHU7pK#_IHO9<8
z>;q*$>a*mk8fc3shbsg*2vTdy07mmJ<_;1u1Aif<0-QfF!-nvsW=hDVb)M$HXXTx)
zO5dh+?Ie!C%S<=zzL*)s#ZD7ys)xWG3)2M$$vrbeEHJ$rHIYIis{WnRSvUNX-kPlL
zaLrr1$Z?rQF~8CG;xgJ}r9s!fZVj+Cw_%~b`E%`D@E*=Nplq6YfVXJbp@Vj+84EAw
zK5kw)X&qcnH*RB0u7_W59SwOrn6_g~1HG!+JY2_7Rd3FBY+t8R2<sl`^5r?}HU&Ig
zN-?sw>X){4{27(;>1H;3!-#mD*AySFD$|V0QoGOHGFR^P5I9}eUm$S6uiJ>ijLF|n
z=u>)aCeOHULjLs<p6Tp%LwoG^n)r;ox1!28N)3L)rjBV5ndsj<^70d*dtyJVI!aEv
zLf~0`Fnh19bp#m+KlR+2g5O+vFvdEE?Q`1EsryIpL<p=!qq?S=86<ZF@pH?=Owd;A
z_&-dy#KHA!OHJC`j0bYY321Y|e^b-FJ~Q=@6#T8pnC;kr_;{SOK6O+3t!UqwI^%az
z-<?8G7sywsC7SGwlkt3b@Q1Z{>1$D0Y-qp6#J)ke`Mduqb>52W*s~5xu)0y+VuCf_
zsd`P$V|*N)T)_%r5$G@4bsrc=GdMjEaqjoWYwP{|g`M>Q6m}%H@4f0i7R@{cMz<Dy
zj2uYavCMN`z;-(h$v!unEGx~;R9RPlW&N6_Z3ET5z~)OYS7n<w>$7A1{ncQ{jDyO#
zc#Xl~hZDw1Nmte`JByhQW;IU_wM_`LtwIfr?UibH+-1bb{LWx3?ik6=WDPpur$5jS
z3H6ELoYx{lIfWyjV6OXlJI40O_I5OOv@OMyQTcpV_}T6$n3919JRFuIIx6$$_vbCj
zil%0qd?=WM3CO^)!Eu0>WE^ykPB?c>j!f(g`P<iK{{EH9MSI!PpS)ugN`<2O%WtVu
zWK&oc%ttOw`aKY?)n@?*uZ^4SRF-=LsOIm1QOm>q-?m00B#W4j1NREc`7^0*t53T^
z4eVDs-$`Md9D}+=9x;na7R?8FG*&k*`<d@w_Cae2lL*W{@wW?YAoSj+e=Ogn;2ld>
zL)B_PWQ;Y>a$=rE@MjQ}$Tvm3QE57EMI4RaMD8W*c3!rjCe<A6TViLz-w`3mZU;IS
z37-xiKpEs?EZ|AOJX~)+v6~M*@Ys7ciz{CZOrC}Vxfmms>(&{ned=9gSe_j4O5(!}
zG<}K*_5l{P=ymPDfMomvKxI>{mPA6Z-t}Ih=u{}$(t@Hn7!csEjuDN;>w#74bEP|C
zg)mwv;w(pj(t>$fWU;XgZj%rwGs900ZIW6j2LnGc%#frbq*g5b%<v2c=SJoB1I)od
znx~5HE*m*p|MPE-(w|K&rdh)DcvULwNW>DZms*VGbrmKBF;`RrbulQfK?YMvVrH7%
zJi;n0D)56ob!SF8!|*Px-=unQkz1#=3;QQdBc%FrrDJD2FV#KN>Z0hyM9;%wzn)xB
z=Q0u8pP4ne0d$gcltqKL^oFf@A-cz*IhO|DQ}(&Ua5DfIkN8U#VW{~|2}jaGE4(~d
zQTJMtz;^cuYtr_lN79q%w|9Ezt+#Qg&(5^^S>8GivhmsiUwwLrgMrNPFxZ8Y+H934
zez7zJ%shTAQOhzW56zYnNhr;5e&2>-8x?A~3(h%yhO52xiy*wfeXixN?bB?xL?tm1
z0ej!H{v*GFlXnvWm(Hzsg_IVjM6q()a7oL_>&X(C@6NYf_124(Ikb0#hv0Rt0bEP+
zaFN)P+d;O=)eKvz#!RjjN4XJRrFf1%ZzN6-?n2e-Hhh=wiT6gDso;tRgn4sn;0%jl
zUVQIxNTHIi4`uEfk@%a2Qdu-lYjp&eIf~4+y930Bg2894FFnq+WZn9E5xl$O)AHGb
zf^HXLRr_8MlkQ+WE#1e5vhi%rO<z)I`RE8P6zdhPpBiPWCiU$5n4+XcJ&35cw$`d2
zeamAHRcWM96&L)e(^{JKcw$ELuaoXgr66_^>mL#e6t$Zm3K=fm_UdpO<NL|oPzyD{
z(U$b#=y9&(I%V~<L346HD|4<X$%epT`)iytb^iDNrLa0pg7;#;74Nzb5Io(SlQf>i
zf|!ECfG|O5EUpuLfq7^DcFXzn@)Kf6Nu^g?eV9!C`UlSJz6R#Cr*;N7?fSlKr87G6
zjuEkwaD@4NIUoP$a<v;)$MY7<*$9VEi3v!mAo&4uX+k({fS%p$VtKc+Y$$z?s3+~7
zv$1$bVu~@7f})&Dp_#E^^I||2H@&E!?>tZd0oXi=iCJBo4W)EVShm2)uCc6;TCYj!
zm?W+6@N)Au(pb!DW3y6O6RUJCIFX=zF+F-}DJZ}XaG^{W8{BETg-ICasc37Qq-FAy
zEF~heUln-p5-HRDh?vIgi)-KGTN!vh09yxB8(m*AS)@lvLq6Q0fIEo%msR&O|DFEh
zxybdo;yN}(wC&OjPqCEFHVXjv)#*1^oA)hQ{w98f(G#U`0Eu)N+w%Lnc4jJ$Rw{yf
z!PzNky~3+%f4T>e8*=%p-IW}T8m#!a2Vw5EYBo(da`Ar{liTQ?&3Cs=o#S-H>HNBR
zf@vyE3|i(y?y-=KCMAlsdME*WPdIi00mwxQ+N!wFlhJTdVdmpSw2Q)RaYIxwEf@XV
zu_a+ox~L>tA9mLNa{*8c-_bJI-R$yXZ)WX*^DFvfAI|2!o)xD0Ii;b|A-o1;u-?_6
zb5Tg=1$J=h{QoH<L7`t(QG&`OGdf8-w5Au3YB|;Ux!ftoMESPx(Sw@d=wCxeaLzVE
z=|>B)bY3X9srN~w2OqTcw~zaAs*JB_oi}>bq&%x(&oq<0Dc)Xk){jAFq(65!YE8>C
zUHejg>+eAfjyoPa%%EVHG%8f?+l)Y|j{r0(ZTte*H?76Q7GBn^qR9D`>sx}j7@1^*
zO|2zx$fJ1{R;FSvBilBKz9mGizFw3X1g_gJ(xtRW8!M;DO{b13kLc&E|A%yO^a+n>
zx6ENbA{l?00pvxs!~SwS?{dF#7*7{AH_T|U)#&Bwsu?6epH+ZG>a=6q(53}0lD-#s
zA#4lWUY_ubUh8$3j!o0T)+*O5Zj*jdf9Gj`^7+BqP;dZu9P$?UWfY`YGdfhL6{x~~
zo{eEL#blY|eKOnzRlSg{D;GeTLP4ME)R`fdSk{begNU9YWCnsqWpq5-%~x!>cfHS*
z?)3v6VlYG2nwc&#SN53vgNg2s@XAxUjove?JlKplXH3SOQ?+Wqm(T+BfqzaGrET^;
z(_0!|%+0BC0REV859T@8elj*|DE~cWXkNS{lGQ+_7%hw!by(M<sV%|xMS*EWnU`Bl
zU%rwV183?Ko)qwiGCPhhyYR>I8H;4JTUiZSZRf<oQkfa(?Rf16@W7aeBoUMYC6w$0
zqpMi$vB13F_D#g-ffxL1m(cNEUb!ss=;@0Fk*DwwZEI-%&Rm%}I6Lzh0kRH>d!4&z
z^|;eVL6F4Z_(L$9Ti*!L*3r}duwm0H8aYR?AO!kxyRCn~lt58t=db2M*8CXcS_pFU
zB87Z27yZfBcuo0XH`+x~bDb0J`xO^i*k?E7IG6>m9Zmkc6B7v+b8ya>&rUaZFpt=x
zJJG<ZH(egJSZs8V5cGpbak~(92-Ha1n7aOJa*a)ax8-|dN=R>+Y)Z9%6m<QT1y*-%
z1v+43;d0-?=<MM^W|#E%m%>}py{D`xxYUh0E-SuW*muhV$;Df2Mdr(_c2P&&;j1$@
zE|sT}NRVR3Xnk#<eF!ER6RY!=1&#ZnW(lO59&pn?fxdPAM;6nUUWGeIX`{aOYQU}a
zK6~wJa8m_U^tH`K09E3?q3&&IBnlH+)S;qE)Bs$-dt!&)8j-=_KCUg9N2x&h*VV@(
zbkR=N2<>;p&80u{Xx@oy<=SAfpiAVNh}CJZvf_K=`J+X_UTPu>Am?3IlvOZ!ve`2#
zrf1!+oYAIsebEAjVHJJtG6M3sxQ=#ywt}!PK!$8vOW`xwaNrC*qtHet)!Xr2Q4HBc
z*L40!<cx>Te9^K{>YZKv6i66Z(@h3IM-7Xd>?M8gMZ#eGfp!pPk$t%X7L}1R#DyvL
zy<q~b+Rb`|EBkEPH+$|%TsuCyGIjz;gT>)Ov}k*C`yYtr)0!91O=pz9t~vccy+~!n
z--ByHkl&Yfx?=@xJfj^D7tryVk;2s^v^U<T0I@BiKY8J4{YoH54SLWfFaLpo_vOHC
z|2NSO|Mj5h#r1+`Aq6=ks&4<KrPw5Bj5l33pc_vlz{naYlwPM5ZS;nV=a`_ZEG;{e
z*{D3ZSl<1E>D072yL{|qW#i|5F4iaU-ZbBgM;t#@Pk-yvglZpfqa-Te36suj6=+!P
zC!fGb*N`4`@E;`*B?k7%X*fLlM)MtpUnMeO93@Lwy2ruHzzCTs_BVbp^qAy%ohIH$
zDlb%_pouOkGy88@(Hu!CRI~F?OJyV5+iQHIO^_Hcft4lZ1phz>3;eT(xesIa#|GXF
zLY6fxX|~)ck1faX*ReVWhy#F!x1$D=2RLUQmzJ-<b_Y*Imv2O*IA{9%>{qwb$ZiSV
zLYkAY10~4!aJC!ecG2fo$$(GTcZRj_&ci8J<bI0D=i<BF!eGbjb$t-YUU0`hfpbx4
zI`S*4&3iXac-VKLccr1_lgm8T9l={#n?YI+S{88=t#b5FXFQ)+<4{Ipo-O|6mS*n3
zza;42i8|SgJbk&pZTKAZ=<nQO8hf1nXm4nQ_O(3svMErY9-#RITd3dR9ye`q(qu-@
zeS3qvx_o7Nc7QEep=^H-%*f{aMcw=!roetRl7VT9KF1GQ)S$PyLdnGXZ3*0zl%+n8
zGUSTX)Y`xo4c;*Q`D(^#OjNC^6&U5?1!{IMKifhn3KF~>KQ$6RrGZgjT@|*FL&g|T
zOK=S$lXz0dpXn5{m@H!){d-3PWRn*Kq`EbAO@W?{8dYQ7YV@2SEEv6bZ|1oxL}zP$
zDqf*Q@BfiguCH%ZuCpU}<mFO2A0BI<n{E?gjz_)4u_Enf>}Xx57-o(TwVbenKj_rn
z4?1P=L`HcP{!Vhx=9e|A>r#x`S0@FC*6<b;-F@IWy;lUU&+eJCp}TV3vUS8_g#d9!
zgph4`*v+7{JKWaBSd4&`6O$VFa8j_9uB3LO<oN3BtMqZ1eM>s{Bh!PTe;+^l$)M}>
z$DxI<(=NB^9OCc{$><i^YWBLw&#|=Rdi?RkU7ll$8#MxQ8$9y#fF3%^(~KCmQ>cNm
zLvIba%Pt~onR-gzACh*Mna=}0X_s`|m=}H=F~yYxr`;(z645&C@rvUwV&dBW=(ua?
zAj1c2{+zV9wAP1B!~5-?QXc@2D80MR=KLYV6KS1;4423*SJ@Vd=JK#df%^+Yzk|@g
zf~`T0VkFKYG$pC0uggDAY{HYL-A}Veqx3~S4XUXvH`b7U2^QM5|LSx-KWF!)KexIb
zozZglE|y*R8g;slqburGxY#WwQ7PoQk?RW;m6hx!0zg(L9wDGkClE2QW|&Qp*mdO{
z3`OL>(Z$Hzojb!vHS<`^;@Z$QopYPHGZmE;nx9W_2}<|RTMoxwW>QJOZA@-dGoYX6
zXcM0M9gf-aUd3~Rk4qLb)^(1w)kPEr$hUsO**ziu)~EvAOgv61j%t0u?-Q2lbN)!;
zjb10KC0&EK`#juqR{ff`|IhRCA!dq$`51&lq+n)}56QqR)%jGmmqe!cTFUlDfXnze
zj$`)~<$1>QO$}ZoLZ1b|?v6Z9ux=&TSH)~{E5yq1eR<Qa#YF7G)YzoyLsiSUl~ZI+
zX>igU_!B0Un{4}VgNQQkN5Vm|ey67A%?)sZjgR}MD0LqbADpYrqz{;L9A^vPyhqm3
zxg*x}Da+I?CV0kzhAEOf7^fE7^}@EUHN7Zn29ByB)7KFa8u>$?9AT`Cnx9J)&D3=V
zo#GtzD#1X1J>(Mi7U98uqiR2+$pX+4ML8I#R9o`(HC3_$mlZGC;<?BUlM=g0h4Q?J
z*bVOm`#6sd|0`r!NQA@XdUv}WVdNpB4ADZ{U$gTbNt7Art;S3P24a8m$6|TPn@{R0
zCN~or;@p3%I{aBx9Ot^u)(B8N*<a*hfA>1El~e4q{`^$=qT=4KGW~D68RCf7z&Fas
zT)y%1&x0q3JK?4LKZ8-wZ%=}4?zjGx{I;WqiqY}Cc3Sp#xk2K|g4h0Vi}^)>BfG?+
zRd7Q0AQc~Blq8bM$&ZmU0VDb852;FrrNvHx0r>2Th0|ql;F`4#d1+}$>P`?VdO^jg
z=f!c99l*zrpU+Tqncsj#BHx%Kt)T@#%!HqV+wUhl*(7Ne0x=IK_g)lqi2`bRF2}RZ
zTY<_f2u$wB&m(3WAnnpX41I-M)Okk<MQd6s;aePv$9{gV)e_~6qItJ-WFGk9x>j_K
zruhh=2^ixY;%(K8D?GXNEJ`B@#xL+!Z=q<2&2dJ92U7;HSQ{>0o4Y_VtH&q33C_bR
z4fi--jB`nIC6P#R4kHWX;`$kaF$>LymUToTCiytlth)$e9~lnNwv2KgGLNn>t1^LV
zI$fOEpzLosg4X`|)8=QsHMTr0f(`WAGhA?8c#FYq2bGSa8d0|}Kj+c!!OtHBVXj<|
zf_jk+sT4=ausqeW)W3coG;Zg4yZ027GP8buYg2Q<_FkmBVIPUfi1|Y=D=6z|!7heE
zr-)838KIA5^lkiZy47rXur*R<EhkOi(E0bZ_^}Y(BJ*LEt*){p8mJKH6Z0LJp=04%
z={@kyT5`<4$XkP_ClgOLO5R%7n)<Zuwc7KIui{aZVCzZ9WSXziVULZM8>cKV@g2fB
zFy=Gf46bhRZ0^H%ptt3vKQXGK-y|V2<Zq;(3C;$TvY^hyGCk?XY+gIX<2pzMw|Z8Y
zJS;;*7jxaTPEaMey{B(2$2WzX<qhWRY0_x6D@Af+A$%pP8|xGEEBn+mymeBF1KfbO
z)^fLL-KaQpLy)cS;gzvCx8CSwJ%lfPPwOwCQJAJx5|;#91hq0}0`hJkaNvBSDOy_b
z06Ow!;v9?$`4k={H?D8NlZBEYkmML$^e@rp((@H+{$<JU_vW$W2CtIWVw{<_s+KzQ
z#f2h{M|y=7)Tn{7F38}{Ce*Tto#EdWEqZ?k&0NX7VBelk5v27<XY3^KDVh=0UD|OM
zM0$cbr>l$$IHb#^>+mW-rNtEz)l_2`vo6s~ANw1$3&I!DvW~A-&*`@t&rP2GuF)7R
z{Oo2sNTJixcJ?rOIt>6!`<KOU#t2R3)zTHk7|<x#jO&3!*37v{Zb!Uw3bTBq36aig
z%__6ZAX!tEQb83(ujqF@P@|SeRoKovV?`vggi!OY7_o?xuYDy@Ry(mWQwh!XwLgzA
z#R{B<swbu?q7(;S*i8L+nmW8c-&ETlqzuB5Xu%xOlsm!oU>``44pS?gLMrtZiw$>h
zo*u`zf{Uv>gnx7#WZ=8Aajh&@35V5HgoQ(hy@^y8z_ypkYfgXD=PpIJ3h3v6+0v_}
z6sUltb$Q*!*GWnDOarho6uGNQG0U|%V;mg+lfC)q0P|WaB)&!_`ETMl_M=yvq^ESB
z_^CM8tw(<`ef)6E)Z2Uwar=^5PRy)pP8PLv8S?hz?rA3e>^<vlPAGh_ZRD&yy`KCN
zL<$Yg!!3@b4zNkv%WpcbiMPhLLKHQ=fs-=n&bSnd%QRE!^NrU7543ZQj!l2N{~n+I
zP2@6-<G89>Y<5xr(e_MmqRB?WT7*wWOI1nFwdYU{VYm&Y#aaYS{`9UM@;cSE_9FSK
zP!dH8_EjhxR>F1Yi$f(A`~%DDq&3IyS|6?_NHm@!UA7bJzS5kL;t@~%sfbE0FK;t)
z+8b=wuyO}h`dGI0|9>_cwns_1^xH%4I5+K5uDOV5A!zE<o6pXxLU$XNVN5YoRbTG+
zd)Qt&i#}`<C;gSXFvx&k_sJHrcC=r`Q7AIfHz{e=<^`2pETxdg3JO>{^SGn5V!k2)
zjaTT3HNkQcxgsF09@Y~GP*i60gX{i>D*eL46p;CcsW_66MMjf?)FDjFA{dsnWE$~z
z*-OeQS7&HL>-TOB7~X1<zeLwNY{|)TnAk{>6xFNHOT$QgQEGF0TEi;Bs>jK&ZLTQr
z@;;?eJVQ&_)j>ClZH#QcIDSM+HwMYQVP|LG(DC=(DPG&whXXKtZxt=wuW4czQ6}5r
zPMvUbEU+-{ajXSnr=I@?h@^sk1%qSkpj(ITd(Y`BfPBzY)80QWb7xX3$`V3a>AI1i
z?{j`%E*n!L!&;6EPWo_^YDb%vIAo=@`vYDr437>CkXM3N$H3m8!l_C$)0oTwSxoQZ
z>Y2`!4J-;;bataY;!b!R>Xx3yjnz@$$GVIK6s2S2ha~aAdA^8@y9}yIdP7O}sCDSy
zz0}B_p7B@y%Io>LX6@fm$^HxVSi~%J879HNZY<n>dmja&w@2?adY7dhw<pgotKxci
zU60F*k1YAcB8*>-8!N60;ETGv;Xrc)v`IRuN+cz{x&chL$Nv|iTSa0!@|D^>H95dw
z9);nEM3}AB$sO@B<ez&YH2fQ7GcN%QRRvuDb~jxlSScwEZfd$%CMb(@2SQ#DtUF@;
zud>Sk@3;1~M0KCokON{zLmR+m<Y|gMqPQDK2^cVfcNwgX;)u#c7i6Wv31+Tt59Q9r
zzm8FL))2)RVzZWJFlolXF1}#o8DLJJuRhGHjxHKq=LC7g)PY@eaHTh0NwMFp`IF1|
z3z43-zyXJ@iEtADCaLe=#y6TF$?>FrVM&u-HRuhFxehJ5s(NMXW6TUb=SQQ#OvxC>
z_?|N|^DUr~l`8|SXhnqkz_~aN<vh<gV5zZ`ZCuDWoV(nMk+25y#S1_W3<xbQ!#3@|
zTr?loldOT#&1E`u0$&zp{;!X!mRR;aV{ZD9*Kv_k(o_;emOaIE1-h2UBuq${arp$y
zgo!nhZ7wBy=jN!pwxW)S1V9AFq@LR60pEmpH$}Hg0n-plt#08P(<@hPQ(s1x5wS#!
zv4i@W5C|oObTF5yP+WAj=CNywGo|lM&8Vap16i8ZUkP1WS8TqpDP*EcU09;~G*!No
zw=xlCc=d<QTzD##r3Z#IR5UHaP`Z3you~absQe-hAhPIHBDa}D6#)Y2rS2bI4z~W-
zKi8bo10Lpg-ln3SSmD<5)MWTtidg~g9q)GsYcPG-_3))n!}sw;aPUV<6gwS;G0l29
z9a`h8T)5PmcTzjOn_?A<a6{sMhXE)vT2n<z$TW#uKLZ+xGS+M=hiZya)?=N%WZfbk
zB+5jOnA!aCYhG5uP^RF>|16dAz{goG6!zK@q@(rnaM~ZJvIBDcHMi$|Rb6u%_e9`v
zjJ#iSzsM|NwO`cvYLKTCtTae7`V@2~op3<^oEhZvU*h8gvRdwlHo&U17cCPg%6?9@
zjTJsca8$V=7XX#5Q5id27pZa&XBg*{;i#hvZ{RdaR`U$4XT&H}t>LLR7%LdVJso1R
zSd^>!4ns^%1D56R3DX*e`sd)rFjaHqBaqL@WDA<@V3>ME26C2r%rFEl3^<`vt~{YZ
ze)9zMbUwjwWIF}Fa;JRBc-DI&aX7Pqlzn`@9l^Io6_kSPc(o$*oX;lTzG;Q<7W<56
zrAZ;dU8{zX{<|ygYV`yuUo}yF`E@;=71@omo~JO<jBy(RV|xIb_|FxZ_w!81l6;q4
zC92Eh#zFOV`JSynin6ef=wSNR=Abr1fdAM$@=E69p6K(<;Ay<dSUHV_EooUCKhO3;
z{>R%J<+Q1C9(KRJ7xqBCdOO|Vx=&kCch?km`0DPdq!?tQGTE<t7hk>;RnV%YL&MB;
z8@k?t{rS%A*XDy8aZE05%5U;aieA+(dNz~pptbW|@+@oXZ-abWK1Ad60E?6&8O8vQ
z)}V8QRpjJ;xN0?kyYn&K_FtpmwT8^J2Vk{9TEs4?bYkK?AQ=WOzs&NXjnLZ7py)&y
z!T>&!R#p$U?3Ba5bvVajA7r5HiZang=j6`ayj0AOwu-S4>dS=VScLfsq#IJilwTi@
zsC^PQKLpHe(rvvmKo`)KP%#co2xjw|w4Um;*^kD*Mfk=h@_fi6Jic4aRVED&r+C*V
z8Bj{&f{AiSVm1jiff6~DGWe4S6VIP(MCG4i=$+n#)!abM8w*^ps$-BT#F~pLHTEE~
z;?}@|+k5j^U71~A&Dx=hZ)2Uu*q|FUjoj#YJ`HJn1nIABC}ltPBtOpU`dq65s#OTg
zEja!Gyl6Re>JVFoyMwU)?P*IKoa}8`U$p`4<lIi|L=GLP`1nq=^-T0`KkIMMX7}%#
zv=`VfbWph<JB!o|FI-XmGnUy7K~JgTlmBN9gYiX4b=8F1Q>qhrwb7Ex5S(6=D&cuI
zHu13)PF%qwRB)-(x>ud2`RU4uYyM0P?)=IQ2bUB5Oseghh1co3*VBq^1S$g}-?d(~
zdKhtg8d*a3+9%v<HEh6Eq6J0KJ=#A{8e$7Q>5cI|Qdjysb24kQsQKYI8R2@6zP#Fe
z!;10QKohFj1<h*Ta?fmGe8-CYSH&kZUul8faM3C?tNcO+q2a9NbmZuW(`6^<od!lV
zV9>j?Gi%Sq*gai~n9cwMuw~;M%OZkDdyY53b=sYiDn1jE$n33Uh3**rAGQ8rN^Cn0
zgjG@UV!xmf3&Q%Hj(_u~CyFB7-q1WW;-I|jL$PHiZoGu6ou%A@vyZ}h4#G~GyF#l%
z1}J;I4wy~-qTtGG4BXTZXLMwbkoXu3+fw$iWWQ@3dgEosb~pKZir=4z+P?(VLl7*D
za+;$HGb`ioWMvg$Vu*19#))Q*080&z+>%V%7&x<e#PaGbtOR8)Z}{@!91JP@7L=^m
zkHLblQr%PBeHu&?%QlYP>gfz#zLF~aoJv%;O3YKF0);YuNv&dAwd<1DxQQ?>mn5~I
zib;Qd`Sj~17|zvbOQALMeORcm16_->CrEqd8$8A3FkRSWE7C&rJ58;P$@|X8)ovI`
zbN*ePC=mx}`gHVVXf@jbRI1xMi6b7!^*Jq%En(tBH1qM70^m<c(F)qb{s?WZ3F9*2
z9Gr~HCk~qDE6%@80nbH2<R^y*0!T*GzbunNGs#?CwcKB`pO~E=*VndJtc<O4#&}d%
z_S67j+yNPD?_cmV-q6rr-EqCg^2W^qit}lw-de=keLHrykKA)%L@l0qjX<s*1J`i?
zg-~ITkY9q@eK~mTbE93ND@LmwH(ZgP2MU{|U7TYB`BTVq+-W6OBDotcMy-0sY>p?x
zGKe@n(O4p#y@B{}g57^mF*#fDDE6$kXn&4;Oq^L09U>suJ)t`(rfYmQSDZ03D*rc9
z|5$d(e_K}8u&_IyE1lxO*zT!hE-uQeSRgjMIU+nxnQO;-MnP?+rs!kXh}cLit62#r
z{tf7sRJ>*KC~UR}`%!?#4V~>VATBz&w~l-VdmLGA#~~+wOAQ3FWlrQYa(h5lD%SKy
z86H~2^n83&r~ZWf3c{QTdJ@i<fZNOj4t<u1FGRChflFj9XVZDO9os6eTpQ^@`htaQ
zOg6qJRC#ym2t55RXwJ99{j;J8(v1?`XFY{t)sn*NF(P^W+#|;{p@RsI*QnsTbWxJr
zKc1rc_W=nWDpth4l}+wNz@{Vvo$P{N^-6A#M;NA6nyubWhg5aHjZ-T&^(4p5`c@{E
zQ+*lv=4hRGzHdy+R-|yeNtf#c)mmb2O{pfOR!^7)%>)9y4VxFIl)9Fl)!12db-iaM
z#bHYIaBFLV$;^eV2ux0ZfvBx64y#e;wI`!Oq<#^XdOmAQTXwf0XY`k*zZicwdW_n{
zii#MnovqzDS6L9=W_@x+(sh?<&P1Sw<ZgMI1yo<QlZ?2tW~z(h%LhCAfBImyqW>+`
z_apQVqmgc1@UBxP2y?m=G|}~pUa-l|qpe@0wOF6Sq8-YV3D-$F&3u5);}-(~q%1#X
zZq^Vi#ba9!ATvl%+d-SwzSJbuybqg30UL*DiFh-zRJ8tL@`Xe+xrs4O^Yf(pB4dXo
zRcd7BS!ki=lLz~>UKA)W3W(W4a>Q2pb<BLA4RqD|(zxn8`3XEExt+|hCUZ-CeJK?h
zdg)OH^e|Qs(}%ViiAQKeqVM&rAh1M11Y6M!J`%c><Odyt$%kXrT6aPkGvPtmCt~oN
zk}0+V)A@ZpEgC3s&h5quC=275AyTV<Lta-@5;S=_64ZXvZLqGKLQD0Sr4n<bfTRa{
zN*RPqjG(0r(fl?IaF3N50pmrtuUwHJU;!{U&Wn7-!G*xIReVe<dB2qI?Fe)mo{0xN
z&@R_ysx@FuCk~{#9R+p$`5I}yVTE;yij8f&NOjCbP_uom3h9b`z&|qLj*P0v|0n5;
z`=vu)VqAJfIpqxm&4)6JZBYDnzOY4_%7r~w>B9rb(S+o-D1NHDqToQo&TCFrZG!E|
zIX9;QK(H&=s=Yu_jl1$Gz*NO*z8><f@+p|(5t8+;YH`pGQQjopwEswAG%iK@Q)Hau
z<Q~4}rr|B1?jkbX%kK7onLkDzZbhG7s0#}(%m(VyJqIqCl^h6a-foEdX1zmTx!$(J
zCbz*uSFDW+RVli{!wcfO`m~-IB<NIEbWq!R?_PPcKC-Xh3tc*w%W@+71m0;sGjm!v
zA;l1bJ*>86G~kB&<89%5a==NusyI3LHx?m>hHlZDMkXqsK;%OuwYTDH6LcQ2Q7T~-
zmHXK+4x{S4SBcxBdkI~b<97|A`CRP-&27_$9>GwN;)2Zbcup^?CAS$aFx?mTJ+qzk
zOIeQSik65E80e4(1q?JSH~-%ssPKQlP-OnbN{($pD!MA5PKc<Tbfpluy%Zt#p`}y^
zsB-?4rL{<Wx4mHev!$SI14$V~hcz`G?%R`{ZnU)cJwgkytX_&LDk{&8D~>8ILyLXH
zEuUbiuH4zGt#BPKU%o~85eY>0Q>WTiS51VZykzI`nk+tGzj;-smxp2w-uM@47YgpB
z^@e5GQ{7&&?Kcvy%e0e-jeDkrO(*L1R=4v2v%N{Y6YR3nemkhY$2Y^H(x!kZY1+F4
zVExP|6Z)<pT1pIW4k`GIVwg?2Y3ySU$;OblR=N6eA(aw#r%*vf9uf`22Ga6>E2uo^
zwsJeEULw}<JOx_qK|kY9(bwO_=ja4BT6rX;foUhBOMe&FSAyGWgi+G*UUP?ngxD8C
zRJXQLifuX_5h0PzTiM&;Pv~NwMeKQx*>O&pTn`RGMv-=&Hjiepa)Aj3Bx|nSokIi>
z_UV#Jk{Rh)@rpP5sM5zolnoL-+3Q4{T$QR#t!I>Lf|O{uA+_&>;Tn90^JE>DrSfh$
zBCA(^vXVUepnEmL^?N8hADs9342UK;23Lqq_RmI_{ISNe%kn>8IuMd=idBngWusUy
zMOTP(nN~yuQ*Tq1Z8kpaZQ7dAKX>ZCQ^D=q{qh-6Li^%{^+uF=pj*VGx>M|rO$I9M
zP|UdI<BvpYg<LvcHn|ZYvAvJ2(9P@DQb;y9#k;_Fp)`Xy7Ogr*<J~vUE#t%BFVWpG
zF6@3~_s*t+fHnG^fc<36DV}J*33b?voD^^-aSw-(eNoj%J(_5*GVNy%_o2-$3m&B#
z?j5PBdMr1?wPwz6AFtk5C&ISEcM__Aoc&>I@kcq)(%|Lw)DAp&ZW?kP1Pww2w6L!$
z7yFX@($?b41ksjlO{CiApuEV^ZLU`@vAwk_4uVbb56#%zD$#Y1Trg8moQQZz0{2mh
zKk!6(vtB*EW70X)OA**FV4jHbTnOoQIdctax-qbp7@aKj%(-89)bGE1&NqjoNp#An
zESnoHL2pl&{BBb4Irgl2mVEu37rRTz<anmzmEu#!OV!nyU&HNVlSseH)%C+T(qkqE
z;&HJ;00PJ=CKM^QZMYMK)sQMx(V=kATD1trR5}k@im$k4l6P_Fj-AiM+R72D*JZoY
zr@6+X69UPVy@P{8gv*4s<V1)cszc<PnwU^a;hiRA8qH{K?lD?at=@W22{7p)`ka#I
zN2mFE3`wL(4!M~iq?EtCS48MugNnfq<s*Mkb(Vg373+Fooj?$7)W|H5a{nYerC`jw
zB2u=_f8Khrj4VX4)B9jYPbdei)WY1UIQbq8qLG?t<8_bmk2aEefC}w7GGzfI88W%=
z;0@`$2b)$f`|#6G+X}Og%H5kM11Bmi<9_`$ky+6psUb&pswFjeEykG|SOi~|MI?FR
z-@-q?WYfgOTG6>;L4v=F4;UPXfc*>v6j4!0tY%*RoeSzmlPKCPR{|kj3NNS-V~ag9
zRU}rd!K7^0UdJ%PAKDQGXrW({E3>`s8REVU-{F9%o2rQl+!<<hZUQQ48WSL(m>s1f
zIYhh-4x039apXAQCkVA^fZfr6t%T0I3I2XZS>=M7>*!xn@#8Kyd%8sNLX>jlXM!AI
zzi8Rxzuf;LG6_JEHf%lCMVs?A7Eu@N3JnP8=HMn4fRmB7n|0w}o*swaJMBEEMy*1g
zvJv6~tU^ivg=|QejB+zM36HsUWa_Weik7ldCUr8&NWidcV+p=<582aaZ~731cb6<f
z`+URRvLX<Kw!F#L?#J0{)G|DV-<T=rrxuLbgQ1XMP47DSg03$L0q_+>k)M3(yIdD}
z4yXG6EXvwKBp$?^q=YiJ|4}jw3f|x~7N)|s#<eM)=XA<dHE_YDmHD8@^dnKH7^^2g
zoRcMbUkh{A%-WME%t3ChXg}jLd-)PsF7|Gf%;Cj_`Es2w_+MG9p9Xri)D|%xfE<9a
zBzjc^XXP#)KO;}$b8W+uk+FLesZwQo(H+(%+)X7iNh2u1B1K>f{za6U9!ZpiysKui
zIO3<iCc!p_L>QO(s~?&TypAUJ2F11%>%QxB=W@+Qm8Pu%Q~4)f96Eh#tf}XE*1Tl5
zv^A)Z^LEOk_Wa6YN}>w~qwV94pjuTCL2aOFkumh{G6r`^-NY_-^AdyH6gzWkZ&pbb
z<0D!i8Gxmzq!7hC+}{&nPj7DG`K=-4OAVX0fMJ0M34QxP?medPg;KM?a2lXHt_I)6
zJdQiA4$V*E!&iFWQn<*Kj^krfN>ct?8$Cd9iTr&c@Wv=?Y<?C5q_arf1DdP1GBrS`
z<AEvEE8{9iU>X$Y9z7&#xN|R32-^&(n!bg;Gtj32GKW;m$_sFcuxs108$$K|17S6W
zpI8d@G^3VhvTW-gpVo^UMd9szY?)uM3+kD2GLwG}N5Oo44{3tYz7*V56C}I*VlPHk
z@udSoTU&Da@5^^FYwziH!I<~(`9x}YW!2c0RUi%}Ae>VD!N9XvFKd*l8(x0d`DLoV
zP%EPin6YzhvgD2ld*K<3``KB)Z4#$*dCL%E`~|K`a%c)SQjq)nHcAqC!L{EIhZx-t
z3D9gF8Gh_m@pgj5IXTBEhg>~As{SwO$xeI|K#XK-=MM3neTUfx=*cK<MfUIRV@A))
z1e&;qs9{SKcJB&`u^ta3VP9}euiDsS&u`iN(u6wiO1e9X;x|dkl>{GbgvM4_X86bl
zGG>C75lZ|bzhG%EILSzBUGGAT@%p7YxwMqJ%rj3f4aq;T0E$Go11`zB3A;4Y#YAN5
zsC!U>(*r0V=7O&yX^>lx#}5j0hfp}=tdF+EzhA5Dw}v_dN#MaOx042|a^fqk8R1*f
zT^rLrqfpww00J*511Keoz_5>|iSqT96$~YF1$O;k^WJx{Dv+=2^F@K;^dY*+wI90}
zqV9sZkV(Q#Is37OhH8$8O=aNJ-_$33?7zJSux)2Hjmq=g?HK~pOXKEn=?F2o!BT<Y
zoaiz)6t)Y72gS33#Ex-0K1O@B2)V?KKVML#2htl~y0kzu1GtK*LkDbR#Emof<nvle
zR9Ulo$8*1=AfHNJoTP?~DKPK#`?l;=pjs{)^&7O?^vIoY1aDI39KUS&%b=DA%lSg_
z0%jh7c#ZTDk|^cs>H#B48C+1viP%AZcE)DqS_dd^{vp^o%pWT&WU9Ktw;+kAa?Ga_
zCbuM6F+!3NZ~QWW$lI0pK%^r?sMCZ}tep5Bfr5R-m2NHuc5PmTzGn`S)gSu!CHePv
z3C<3bEM50qsy$qyL++(Rt|b&pCXOM>N`U%Hm~R<Dh_FpQD$C9E6*&bu=WjVM1E6)3
zRow4ry_@7;Xo+f5eMl33FObq%WCg~Y5v5BTWbd9(=G0J;@h);7Yz!@WPj_Z1*knY5
z>@{KWVZbVIJmAQS3<0H!Z>&5T3POey7kuXDRq>L&!OVy}m^f^i+MFRtLCQlF;l6t=
zkvXqq5b`I)(#p)O>AEnK@v6kT7=geSH{d~`5x}r2YWt-aRQ|$a0>$0Bw4&B9$Mn|m
zm)b>kDWePm?9M(MQ1+TddhfOy;?yE%g~(48pmhjRLi|5ns_|Cn#8XEA2?bb1)pc2i
zIkh80Z9rhO@(A+3{O`RE05OuU-SaIQVR<e+g*yXx91<t7;DXs|hpHQ+Y$L90E-@_1
zuO~zIkYYrLH=@hnPOJDu_>mPs0$mtL1r-hqcR$ZHK+cqaFFNq^V1wj$=7!K$Q96?2
z8O>)#<CcHJPic@YoB~XM`6$vIkI(68Q<cJ6w%0*}@goA2`^RJGF%pw8$JT-3SwY(g
zhdpP=LTXe|y&mdqwOJW~Vpr42$`T+F4an|3U@{rs73$MX<jTs$8@!WoBfBAe-$F1I
zMrni==1{s_BKN#CC(H^lLa-+*J%@s($EO;XY~Tz;=Zy@y@0cv`(Cps*B>On~O~*c8
z8j9s25fNd!i!5hx^1{8^YGvlXhqE$I;?*11)}1GmxKi;sZqDE#E2Jqts{=a7Y|>kY
z8{=1|gkFPn6oyh>!Fw1#1<CA4XIVKi0<HXN(K-ey%(5>j=8<v431`5nqXB81vm6W9
z@PWkLl$aQ)iKO&*Nt$dMlAxXdBwl?wQhAOobeL0E1ZqJ<{d_Df`kq?*MmJdPj$CS}
zB7G_)BiETwr=zuBFn#g-Lx{7bjlg^)SP;23&DhO%3g3WIx@;9+h91hgsd2z`qaRe_
ze#j#v4I!IIUSqyewrrF}c>M(b{~7wxevcRG{=EB30W2<Jobi^oYpeq#p^f^f;tAWh
zxP_1Oulc0u@*70WP;Cn+$PH0ZaV2k%m{sJa8)1~}J<eqZk1=8NsG>F$)LX>PcCaa4
zzp#)@l%t&^KFQ8^ZHETSd<<3w)KC~XG-c(-5TiH0w3{JYj9RY*2}1gRsh9|`SGOz1
z#3U8$qAoq*+BA`1275y>X_iGi4C|g>Cm#EE$vVbCREZL<{F03kX<o}08sDXW4a!2k
zDiuXG=MHxvCO<MUbKto4u+=wPptLxQu_j~~XiPqqYU^~+*T}{8VE-*`43{Y0CsMO&
zOV$A103k{bc7+S_xiJhs9DeX?`fln;kvNU6YeT`0Kp9+3rMIW`AdDILM*z>3NnMiq
zgfp3Fu&$rY-wgg|rH24a6KLU$RrK=RhC#UHII;GPm8u{vv$otzLg^Ca6DvI=w;D`E
zaFl@~<0pSPvU>Q%iA6yf-d`M3X8QqE@d{?CZ_G);7_djJLk<#6Y)$I}sMysavbzyK
zQFZkRgMJDfX{2mfa<!=a8xsuElqO+1ftj6V3o1hjNZ`)Ig_WCcR-j1=2oih3B#nj$
zk3<;!T@hYC&Ny~l<{pb9`?27K-@iZJH~zm39n5cmm^)HC)FfN}H{gR*+NQoS?DhZy
zC1aa-R!RJ@f?WOJy8_XOL2V^OeZ%@nqG04t6fr3?Artf};K-Mw%yft%IzY`K4jWTk
zEvNoHOyK|maZ^H?6cw%?a9>Nl5AxV2D+)$>ruv4SZbEZv|LG3Ku&XLUZodQ_B1}0K
z$sbT)cpk!Clrb-QCYEs}7AUs8=yr#WFdtE(7^|VpfEBF5Y`E)!+aBGS*~=+ZY-3KO
zbXGZqm|%Zc6)Py%aD*k}#(x=oY=0x`#))bqww>pP4b`-7mes?E+kgZXiEr{-`?hY&
zhnG7{QxAekX(xiPSY^fqe}+|V+gwQ~mNy5<7<FSyrkPMc)IqKexJ@Uk<Y6^il#rFo
z7*Xj@;fffaN!w4|qR{~R$c>?w{*k52fMwAfW1i23w{WaeA7dIiA69h|bL!99j^z6Y
zej;yYN_r@D?#85m$nP@tmrD7Sb>Qq3PqMP}rT=;tXpKva^_9mkg0p7CN#s2jFVpaA
z+d=AAibu_i$EIB^z=d^kKiy2|%Bv%ylE(rfZe$4H8!}#V&p$9D<)!krypK>2lX#1Z
zG*2P{#co+H6&2Lbca*42;VQgHols1Tz8#@pYQ5AA9}mhfIJ9$X{%KQsaEVfV!G!6N
zdVL@oMAV2}FF{kNh^+=5;lR<7>0I(xCooe&SoOdZbF?mocG#0=r73d)fsyS^_OUe0
z1+Bn>Km#^L;wN-H!N24$=6d4ZZ2)1PWj~ERyj6f57q5n3!@%R|0{Sb_Pb!T&qKeB|
z+C+|L)IVNOByfyMoFv28o&N5ymDS0=v;gJI&dLPx3CtrOW3oz|l@_>&{XXzc!6f)2
zmrjs7+jI{ZUa~@5Et{oAfPgL9b-!2^dHiS`%wyd-sU?~tL`P~M7g{NjkVohro!1m~
zXKX$K8+K8m$Nwo)H2;;Ug6?jkOZf!xRG^tPOK-s}oy=>KQj<zY_`+y;Py*Bl2P2Pi
z{YZ@EMDYdgJuqFVHE-kq3(Y4mh+W7N!mL4If&dOS51}!a5pDVzKFaNSc{zp)$vyX>
zpnkxk^!)rYg;sj}gN^F*Ta#O#4(es$kv(8Fae;ABBhE}d&iY07FRpW7hcS>u<x4Ka
z?@sXqvXGUexJGhf9XYz=gz<qmwmU^~@Oz?IP%@O(4Yt-nS=X?L+07@07Lp7r(s}|=
zN`X8|rOtktb-_c5Sm*Khj5s&X?9V}^5!o~<%}NDGe8gXDkPZe41g~<GqQ#QrOo~1v
zIf6y(f61T!&rA;cUm+`2Ee3&8#^z=p#q=plCmKAh0GH}vvdLtf?8mVK3+i-hLO>OM
z9=1sD6EC5dLF7lFDWNzGhs3-2gJQaWh!(~&ga5{=??GXI4?{IA`_n^XzM_71r-yQ6
zqF!hX%*_GdEbu2{88}L!%Q#dEYaqg}`S(GrZj%e+XK?NU^JZkFcAViAEOBfU_}}vA
zmvI0JP=}!4BZb_(X5=gx<nutCQx!-90$Ve^m=?wqODF<RDAcL)MAaDlTqFloVe>c<
zXiBsN%|TEC=c44Fe*53i6U+a?8^Q}`&EQ+ccf*Hf9$Jadd|YI|*od;FlR_u2uiz1J
z8ywb)=%Pq6^YP)?c2FQoi9R8u9M9;89ChVMc%^tnPnT_q%=AJLhH7J!&7T<Qg9dcc
z+b1@~h@g;bul<?fuJ03GQqWI+WIs{TW~7^dHVCiq9o&%c$bMBWkV~cj_HK5r|3`9_
zOUiQ>Q*5sp(X0d#c-{aN=hx$H8uU}?UtyO@cP2wTFpT38zM%zWDxIwbEPS~nyFcEl
z%B{Gml>L$G&Pb3EluXr10KwRbILSkLuA*)LFRwyBJNc|eF{-imqnv?JNsiNEwCa_w
zKXf5x>Yd5|W)6)*zK5H=fgf=LY6AaX5sGZ*IYCuj1Ou;40-R&Bocw;zk47)jXpuQx
zy~uP!!`t5J-SHDBwpPQTjWLwO&S@Y)ppfGq5C#m<+LIJU#@o2%HiM~0tcMK*Z-0zx
z^D8$jkit%1o6nN;RuTRz-1BAyOhG54zh95ur1o338418<7E(cI#UfXiMv2;(F?a=6
z{ioKJN0WxEKdBtJQ|4p@Z+^B=tzlP)a#+%R(cmZ6GFY$6%-6ps-Jgg(Yprp3w7Sr8
zDkYSBE_mKyER=l$8$aAfKU@jCE1lq`OZRF-k3>NqO;25O;GAM8py6G^!yGYHS{-1&
z9*0{@??a4N+w56LXt@I;zE(l=x_RsuRCMPDW9D}A@8uXL^O4oWy6kwBkF7QQOme;v
zZmTr%?EOxmAuU^*?}ha#c3qFJUO*R$tN1>78~ez!p@f8w^rkw|W8G_krY+PJQu)R!
zn|U9Yi)G$_!P2n7FDZ5F_LF0jCwTnHmB$-9+q62DCd}mAN>g}uSWwa5Ka82ptvWW-
z*2ZnR9e@g?IPrT-{pgoxYTxx-yfKS#G@D6LM%~YMz)Fgo;8#|hqbcnC;3DDr2H5^X
zHC5}VCwxq~7txf-`4bU-7wbR-m2^1kpSd$&QqvVUbz3z@rCIXOcmEznA*8*Gh#5$D
zszS_AgrK1^EjW)XV*oNO{GQzOchasN*mC`WTD?gk_LWb^)Sb&Q_}!Nix095Mw&#Aa
zR%u@BD7R2R5p2#U4wCKQm$R|qUP#vaQP8AlBaBeDDRx3MNR)P~t;kCs`~KvOyAXhi
zl~e_qefmT1W76VoLzjestS`8hTUz#@1$juJLWFDD%9|pcsl2LL#8so(q28&#{j)N+
znut`O<ZEj9+ND%M&f3)_)a^Xn)*(94OFiJn^+vtzQ_zf=mFuVPSP99QBkdZK<3vDa
z<+W6)t+d5dNrU*%yVkc4e7V++yJP(cx8wZ?l<jU$mF?yM)@=2T$oo+X#`!Zybrh1`
zKKglb{$+!oD3LArH;TxJvFH?zw6{!!RzBPWATgOK5p%aCyd%nNdnJ|xG~qH-1v>`4
zvl?s`rqt@t5`pz0QlEIuY}yRORS$5o?w^S>)`~v#uafZO7s2WPWcK`Q=-tk-u^nfJ
zon?&_*~0O3(tK6ET7HW{8~M6)da7;k4g`uf)TvM#)PeI%hdUcK_-%Tn5GT(cS&g)Y
z5u(Tx<k!=c{52rzZmts|3h_}7pg%CyZ7JxUmc-21?r+u8!C%0{^z*qcPnok>6k24z
z7GSExMCXs54@fM|_FiS3JoPV*GTHT&m>f*sE2wk#Y0bU}IdVZsc|~n!y7I4)*ueZy
zP3%A<L<-T<TEsL}42P%YRqQEZn`u#8D@(_`W0NgUn-CI1#nx5{YOP1W!6_iI^?sad
zo{Hgw&sBb8TTH0=g8Kgel|X90qH|HK22@uz|9~2$9ZB9WlO&EGqlO+nNkhJ@QWVBm
z+f!kV8#}No9HkkiO_@#{q5RyMX+-l3a>*XIi1sS;4EmD2P<aCJhANp7g{M>u<`M62
ze~|lcL}{27#JS}Y%2CgR1~$3svO~->WE{*E9%=m>XC2%VRw!)lc=DQe3~>c1+{Jv(
zTscuqaQoBK#9V>UaP(VbyxSGUeILf-H=iwF6sEH=rv*@5wvp(HWIr>yLh#BB=_O~J
zW)KuSe>{$>c`>poP(_Y;)A6NjHE0!f+$Mh2X;gIZPYmJfLgaG0kJ+su`NDm*P=|&V
zxU-8$dt+I-)98ziN*h)%Sah8I>ueA^GK43ZwAEC!5gT9AnCK!D6~svU#-L&?iL68+
zS_CR53YG5+S=nMH-trwIeaZ<C@VoK_q6Mce&k<#N!=(`@uEj0byYoif2+|Vq@&UX*
zJ5)(FT0~VM!A-^724Q*EkBl>p(X}F9fdtXFBO^#egl_lup8*{vV(f@pBFu3tV3F6;
z4|`n2CaP|6s%|wgWam!dpQG}AnSRG{QB|s<w)~T!>9}2#=x_@2@!WGs_~VI@dykvO
zUjsq7vG3QQC*m?WY0>drD#<xPxUxVU8~)>jPAq#x&*Zxu`*AoY2T?IHc{#ZfZVd9K
zdBb4{;}%+;tR58{IU?g+WEoixXI;GLO?o&OZyslu+at}yJVUEy4NyabJ+7conKUv-
zI1Nj_vR(Ea$i~L+c3_*VjPbsgaE@CvG!1cf)B0+wh_<=7g%`jYF1I_4{Nxr{HCY|0
zC95Qn2sL@K6-S{eQ;x**D7Vt1k;$JfTRj7O;H12M&FgrmdsDP-*&GRd9>=;24a<Yt
zo0d((wP!U&EBQNX=(E^(K=(85cskv_jqhMchuUaVzdq{q8im(B{DNbYa$6RR!e5?D
zQ7bmNyVl{Ez8z4nPHpu!WWpk32$X4Ovq-RQ<uqI;FfV+#El8-z-MJ3q`*c9<+A^fd
z-yKiAC95J@mj?I%@6CJ?Jz6xD`kaO#&%BF6hS2<<@y;_tksxUa%^S<=!4!OZNSFBi
zJCEU-2j3D=&!QxM6CUb%AHJ1qlZ;b3MHTY!Me>tq-lPdywm1!glb*q{wPKP(Wiz!f
zIrw}Z$uB&LtDBvHvs;{sJ`cWxGz(``g(7_W!Hc-EaYHm}SReKKCE@d3h67F<K-$Vz
z(7#??)Kh=GFn#$J1(364Aug*s8k@3o*<7($aCc8kSe}mDt&;YqN3nVTH@N%K#u&B=
z*gWcTTz1bwWJ#w^TRt28>efYF^>-PPUSA_CY^Dw=nEUL5g1aFaHmr-DcTdAs->>pQ
ze3LR+;4C~+hjlxH>+sF%_uz{AQh`;&q`Z5uUT|fmEyw6yru@1XHEV^UD=KdjMqkzo
z)0Qm3gnmq)Y^|UKc#^i#NxQ%<+XCh*O+9nd7NYOnuc`h|9*lnCPIS0$sW52-8rQiS
zUuS0Ftr53k{x_L224rF3J%cgf_17`j)V0@Wtl4MPH8TyfM)kCLIr;VJ7}R$>(t=qb
zJ6!v)c=A0Ktkmza!C1V0U!Zah-+`?uxX0$vWtgyVy=;(a7m9yO<vTZc@<L3%=Q69D
z!C1Iv4QAWnUYNZyT_M`KFbO>ejl$#7Z**VKZNa{v`%_;m+{#NzwIgo!q21rSflC{7
z#47pM`SiL-N=Xxd(EWk=?wP$DDboi_IhSFbqd#SS^SXs=Gwv2#_q_6MP#-v$n~sG^
z%&YrM&$}mK(?LBJv#<B;ISR9;jk426y|xT1rEUg(@Z=QLzf3*K%F{W8mlc{7oob~<
ze5F}Br~IG=8_8%16C9GbPfrEWZMzO3T@-4M6cvC<#%8>>=4**?yTDZEi1$WH*c)Y_
zNx~5kY$)JR!8lT9hEc-PZ~h|9UlJSzf>zBMiK1_P(SwPR+jJw{o+4(}mVaEmsh|WS
zUJ|(ByPwrbtdfK{mVI`!hDyk(EM@cfeCRx;ESAeA)e|)pgKLU$&~WylbPoBp7J=)a
zoYFch7Yed0rN3b&st{jPmEwVSlg6OIUGwqYyK`~J{+Z}A_FW}}Y+L>Wt{d_cdQC~j
z%9U?oBqrjja~{F>9=Wb?=W?{_cq@|6eF95Xuf~EKfDxk>$^s0({DrRUjYwU(O>kym
z{*bFM4mV+$==ppw{|O{NH4wMGBHJUXBgD&!luY7FAIBfAe-I5PEXChDoo=dUJ+m-R
za6DD`7bJi92^PNmDBhbi7<a$1$%dQ$^bQPP_#e!h`T#zfIs^;W9~AUCcyrjrxNqua
zJUa6oB)>5g_5b|@dj4Soev<l-#_zt|Z{y$qz3san5g5+7N+ZI+qK9zveJ`TlQ*-g&
z(znn)<3)TZxvEM(G4HVhiSo{#xCw*jEknwi(@|~Sqv(45i^!1r{=DpQbiX|bS5KUe
z<sT;FK1@RQHjm*)4}Xh=zZd^y1ga#xfwf<x;^q5_G5Y2XND%>|upkSYMI#~G8Ut8h
z_7AC8^v!;qwt0gL=JjyPqf^jL(h>%Z#iKX2LE+ZfXxDoL>WrU<)U|6dZ+u%!95w=<
z?qxsJZu-+3F>LV)q^8V7jk%-IzWZc&r{8T$9>L}P#-OM4krgYFRUheg-lIVidc%uv
z#Mr)+bo*k;yjyT;_DXbb*BjF$NAj{2NS-(h)9?EWx=mV*;({aCw|Nyt_wSEIbw*-l
zawk+XMDZ#7XqPDb7&}k#V}{|!zM7?~XJK9zmd+iH&OL_Vj)$H{kFK}4X_UTrVBJz=
zSc>*X(voEhZWvn6T#Qty>#&Sz=rQ_j5e5%pcHefmZ+Z>POi9Ix<l8WR*eJZY^ncjz
z>_Ao>zL|L)298O?6yfdKwJCVGX)*@h`DT#thJ7n>ZTo(Bwb@vtq^4r=l%5zjq%-bZ
zECPh2h2kHJDahJ}<S|3=Uc(Vsk-8WoJ0xRBj~-aA!pkteZ-#99jKU__D=x^|j#TNJ
zlX9<C<t%*u4%HTaoB5@pm^|2dD6kz@khKAuKiiM0&HjY3Gar`kmjooucm<u$sE%;`
zfi%53qPKid07)-Cf+oUW<KpVI#UnG46s|sk>&A1cx%$AY<V*1GpbIf%;zo?0mx5)B
zXQJWUnip>4002M$Nkl<Z$I-FHld7-rJxEQRj{8POA$i3L%y~Ew(}&-T#EE$lChvv`
zKl<UdFYV79Q}jvy3^8<{^mGe>dh*nRd!+R8OFmjnUd8fNPF)A%)EBx8oCh=W)e?PO
z*_Np-U;A9pSKCuoaR%Og`o)`ZPE9-lDPaX>!ggkQ^nEH+-s5%zkB4)`qa^2xs-#RM
zq#LpcM*P%)sVO|*9W*p@Stvq)(ocz~a8+Y9aVh<qBSrXrTj2hi8u8?9Xh-E@mc1+E
zu$YDr1Dm2?>{~W@YfVtJ=3TW)B@GuEwMq$Gu*VfMsjm@c?0lr3f5GlZ7I4w1#rQ|p
zb5!EBw{^kv83$1qosTbGoeA796}NT!11c0nVZZ~EFfQdTEc@R-amV?hC~LWImkOLr
zSgHRSgcf`Y&l-y*SsT%Pj^@2)ab>lYgT0czcQ?dB2HJJ#k1tlXLteGh<?~&(Dewc9
zJU<*yJ@qPv&;1M!b!#SZZkH##&)&tjT@ZHS4;S~r^7k%6Ui=w?<8uZ4!m7#WRF8aU
zibvZ$iMd~<qfgE6@ZfS_=$v`z-Cp)&Z~?}r&cR}tI96^Rg0?EB7Q~d-@ne*Fj~0o}
z#k_gIfZ2F3v4es*^VwC{ySM|^EA~oX_hIv6@61Av)>Va|v+?|rXK`-#dyu-VH?n8E
z1oZkB`gFYj@x>L;|NiIj^!s<?gAMoMZ*5MoDJX>K?ugsDdlzzx+o1bDW@A;CZHVQ>
zpp`*1ZxxjOsZ}XJNX3{sIKT5X=-Ocj{(WW#bh@|&3MJnhnV>K3aWSgp9zb!^mXh&R
zY}$SR7g)Qk<CndPzqFx9(F)U6OvLGz55vc4x8rP6j;vyQIDI;hI0XZ)x&YDgJu~3`
ziPA@gsX7dD^pTp)F2)t-HWA6{JY3VcExw=GM+CCISUGP5&W;sY+qA+8Y{%upUc~yF
z?-enWLf9O9l+;aaXPP4Ubn+uV>U?y+b2d`16n<2#gVT?po)0hHgrOJLQAN~T-^8Xd
z&Z9-dR%oB}0fzQCU%}ouxGN@3-H)stpJRlqhK*nL0(vNZwZQy&+i_m+EkW(VjP))Z
zi+Rghpi`TM$UKk^xtdFs{DQakHZB&$WxiKW-=W{D7Q?ZmxEgjfjDtz@<==pdEuKA$
z*(0u%O;n)TZGACrRTVrT;l>hfI^;Htc=c^$7Zf9|m`jL*u=Zbfpc&ua7Gsh8!*nFh
z{1p2KHkSx-74;+VE1e{+AujLUSvI0X@b2Cn=U2?atOrB)hf7svY4h~wbeji|A*N0X
zbh)|^|3Zqw)uv!QUX*mx2MT0$?er92Wb#`W&{4P5)UW3u`MloJ*ZzT9RG&@2yiG|^
z$xVl#!<b}roBAL+wyJ`tmWk*#WTIg7d^I>|I9a`AR<Pkp4Tqu9tk^IEPbG0BftRcK
zId$u+EYa`Smx)8NEzzJ>HB=RS3JNzWOVFe)cr+n?=v;An0(C{%0oH@M7F;!`C|g1?
za=~BlWNU+;aF5{*bzmAds3|9?wEoRLxp}yB<{3z;)J_Bk>fdB$<zaL7Zl%w2s@#7Q
z7aR2U+jV0*ooea+Xak#BaztPBq^J!m|G7;@I;j{;7s(}iY=h&yV6Q+HDLS@os`>-V
zFOn}GL|2u?mV?+JgEcT12@CiPxXLnYI=fC(6bHt3sN;A8&-qg?;6blaay)KY_&)YN
zmW1A&v?u{thM)KJKhZ#;-z-ASX65^QLplmYurVmP(w3D|ASd2paP6#ju=lAaaYrvb
zRHEJOc<Hg>sIPKff(G%*BYpX(@=ygvDkeW&aK#@e)L5>n2pc6huF_CXims^OXKY+6
zvR<F2cCM(XI%v@e_>jyC5-16F6)tQp1X-sID>pqGEhP59-k-2_HPi3JAK&IP;3^io
z6>(x3bi;oajK}j2-Hj_IYq+jMpU2n-+5|E=e3o3|h@saK2jq5Xx|rBlWPdv!XASJ3
z!ofe?(5_{5iDt!Q4r|(4?JQ;-4t%*IXD7Z^ePjsEPF7&{Pvt1na(0wx>xd*OPOs<E
ze-Ro`sIgqrwjIScU*NR6v6q>ktqAK8)36&-lgHzkQNz)3l8)?p*YkKn@gq-*fu*Qt
z$2NMRBqleFR)N;zNCwdP;xp~Yf+MU$B^2#Vlc$?sr<_iqe4P#J^i+-oRzGzkdZ*~V
z-l2mt)#(@f9Xg?5MS0uQfE|OjHw;n$8~+!ce=+2BLN!|ts&+FGToa;DlYLZh$<<`a
z=@E<NG)FzV9N_$Gl7NXz@crRioCF2=i)EFbu0U3%iVI5W4^mFIZfHt@JkabaKYyIK
z%!_aOKtU19>4q+C18s$P@B3RDbt>EFz}|}jjzLuvZgQ+FI{92GqmF%zq|4KHZ1kxX
z;W@!7-5P7)^#N1(IC&c7;++|X<aoGjQ*i9`>0Am2<GpF#FhP9cn4i%~NE3h~Jbs-g
z+f#DE->>aR7yo!nns?BgE&4a{@s)+P<I}&{E2b8xe?wCbyp1@V<MHsOr`1uqKc`Ul
zM^@XIhnE7LB{cD7<wzVa*xP?7OWAg!{*GFuv&9Wl(?~E;sM1QW<Vy|NG84%LM`Ih}
zJlQ!&c;sE|&B)MyyT3*9tXXJxnrG4~<^Z!>Hktx1{nHO5b0DmJa(eHlDD-~rZS2d~
zj!mDvkB1vfMekeZ+k4-0zub)t^M~WVPhF2^Ki;d_i;BSqWGS4-_@kq8u`M0A?x_X%
z_Peb}UH%UKS?^{1ZRkSJ_qC&Jdt~?k|ND+YnB~M21%-@!(~)J&j1d7uUPBcA^fg3=
zLA3PSB1<<bs$v7QZU-#bC<GW+oQGYq5>%TnuKbbn0Y^;lW6O3K^(|MFk&dn6kFR<v
zT1(;0A6$eVw(Z33-FvWS$2VB;(o49=%ipYYWL9d6=l;7Fdw$x2Rqs5H%*n$sbjDZK
zz+GK!ld*_mp=XB@Hmm}J9(pR<IPXpj8JB~_U!-C0URizImI6J$a$ulK!Nzp1n`l?K
zZ=0+h$d|t*c&pedRv&qIvBp6>J2xSD=1l1$x*RKe&_i~c#O*c<PAYxJrj0fnCn0B1
zb^<+_={QvBB0T@eKB0RHQWsA|=A_}cll-t<r1g}Ne1;}Z54W-U0avcaHINjnO$$t&
zdsSW3)auB~F0u>L+9hIQoniQ2`Yy${DTDe#DVn(;rD@5dRr?(8RUuZ2ZcftTtvW3X
z|2(L46}24YO_H$CxoW$k9N7+DyF}tUp{XP(L0J^#jVo~I#+W!N4@Z^IA6TD+wyhCs
z-Zzsu#51@Lq~Oafj>2Vb;SeLI^L<^QHGGrHOr$-0l^Kc+p;kkeZdF5uP#H)mv=pnW
z(n7SZRff8wMf^&+_~-pNWR#1UO^wFxAz5YfMtQ@`$~eDxg+Q-v92LPKU$&=?<mbsG
z8h+we*-r3}A-9GI5v|W`q?C*+Rf;|?{Tm7>+js33{hRH|L_<kch_4!pgr*J9{PcQC
z&><bQM3<%{NByb&heVG??%JV1=F+24nN96V!lc`d(9snu;1nsly3iz7B3UjT7Y+Ff
zHa~U^rY+xyi~~Ed=G9S1y!BS>C~!|&Ej!&Ld8Xo)QLiB_;~>&j&qjw~OM#}2&nJa-
zFJ8X-N?a(4sNZbMMojhUsG;Iz4M-+r;4(C<8-s?O{)wqK0OJzx#)ms{l{p0VGuE|O
z_Oj;Qd@VXX@G>_4EO!l6tq#3F6Ie%*)%Ae0MuoUDJL8`%fJb}YkL4SG!tS3w#j~;p
zzZJc3S&LHyUU)Be{e1SlY?J-`DJBfNU*h7GP!koUW?=<${?%Qis(tXn@(rTTv>PA1
zbT6LKx#idY9lZC-hh^(20~tHM!1K4>A#i^~+vfFg;qBMqyC-^L_Q&5~-@#p2J@+Bp
z@VCEVmz+X!x?B-Dy7#;SNpn-NOFlqjtLtsR>Y}7xtzL5hO~IQ>K9fl@9ZSaFCOS-N
zs*-mzuwqs$NB`+k)7N9`&P;1!6d_u^X!l9n<eR%;m854LKBVCIGo<|}tW4V{>Fe;+
zEdwQH5H3Eenw^ef_K`$v9@9gVccqU=9oEbpjl_Wiu|rnY!nu}RZkOa~=s)^(Y)#*Z
zZ&uF6fZL`^5rc5Px7&CS<!oDmZapr?<BA_q0e;9w!?Dy;b4C}Ugo({xW7SvRBeT%I
zJw4<grs4T`SZ3G}mp_8#TSah{y8M-O@o~ikIXK98vOf1P($+1+kbbX9#6Iji?CiKe
z%RlqI8ix^2zlU814`R!*8Au%SDsn~dE-e4-CK59uB?u9$dsGz1orxGUW<JvP9Z>Xl
z8J&uRk!_&XM`V$6%*)A=whtRuOhcE)Q$>=OEOct=XBAd{ydHaVVvo5$Xk?CGkFXin
z;!4fq&LfbrJ`Fq5)*$J2>3c{-=a#kXjLx=niIpCFc7`(G3I8UY%oQ-g1;6?ngJVgr
z6<0;5^HF?6bZi8;gg&e=QxG!B#WkwsqrT{WRIVrkg6L3ag;fuu_^vq#@rET?MTL#m
z2$bb;ZcoX1(HJT7L^_s8l0rF?Mq#qP+%!y~f=9G>iw!Dnq50~-_#)F4*V|Lk>iYig
zev&U&u_eW$-@NN3oTL6tBu;O|h~;f-iCwSIICGjBIpc!;XEcaY{e;jl(sy`WM2?(~
z=G`<DIb*9f;i+roTJ;%+S9WBf|BW3nTE!&b;rXATQ$zQw7IXTw`25W$@Yn0_Lc6JV
zDagbd5|F%0<Ea>91h%GlXyq*I6Gh{W3m(*o2{&NwtVGm~`ACOl04h2fiz^>`7uPJf
z1~(?XkM(1(L}j~rXW-s<ry}E;!RWd8QJtqnFT61MI#DovPr~uizjU;--xe3w!tHaH
z;PCM7_(#vT1NoLeg_bgrM)kZ8gXdg{+ppAVR}YX$W$S)*sxUULzJ(At`{rlx+>U#3
z_uw9wtYR-wt3K+pR=tD<H1N{g(0d;STydV2a6M+M7=hD;g;6&>g_n2d;P!r<@R&+X
z!00#D;Li=*{H@Zu9~M2mO-?5D#Pqv0n)Y`*jj?@NBdX$=STMRPZWz){RFB1VNYo2u
z@|j&Fu8{^-zcq0|FIgEFF%0cjWMR|%dyzOg5k1;*QU$v9>4St-b48eZ8@*TPnXylw
zy+~|#wn`U88q8ZeQt4o9sT7zpTHW#_UJ(Ja|IJqf`pCSsL48Cck$l#K7}u-^zF0h7
z^i_nOX*#uipXc$#qtvO{ie^@+evhi>^v65Gk86itD+;1kUg5_ReOs$Q>FU`4Rk;OY
zjTSAt3`U31{m{E}8dB2cs%ACfAy+Ppp9RHLJJYI9LkwLall?yiivHGxl9GVFi3!-8
zEW!%`oi3&s2F@9YY5j)aLRIe$7&I&qt0s=az}Z*ezeE3ML-V+P>YNO;@7EtopVrZd
z56{B`UE~UZ;?u+MkFdh))(xSLty?co&<d)q`%$H11JwBZ?=a1sASb#O+<m#46RsIO
z9wWMqK)d7-g0}-kj!eY3Pc%JI)lWnBZV4FGuQQg3{?VdAq5H!|oh7p0xGJ7LPzOWb
zT82ZncSgU?!dSY5M9f(`Ug_)Psyhg(2OT@FT|HLA##Qs+)6r$&H|ob9f3%0cvOsWv
zM$t*(tRmFs%ksE!fuYgFxMhr(iqUe}+V{xFE<)wF>e2~Iw;IAF_KI@Drco}IjV)12
z2*E-xG2XC{sG>@Y*Z8S(Qn6xXb>B{)cE7wYL~Vi!GGu3qA<6A>^67xAiqMs8J=}@P
zVBz)-h0Q2+Bl4;BPl?!uQ{~E)v0%YlxZ#HD6k=`fC|?Ao0(E3u<Wg~ga?F72q#~qW
zn86-Gp@>^wRV*_ICH0yjIX#jq0!K`|+^`%HxlmP@i_E+t(ccg__uOpfvKCO}w$dzF
z9+x{uJO(>+^5i}m(WT+`8u{m}sg1<)<Y(sy4zZC{HN+==h|J!6Y-6qk@oWFEoGOcw
zJ9Vmts(@8?QGPbWSU6(itH~WfVv9;H=c_37J}OGUY!jPuiv|N9S1lgVR;Sd$ut4W$
z$sJJ@5L2z1W0^jf_$av*H&Ys-V#PSb#)?F$oQ5kBe&$;Iq<j^bD@2y)i6JHq@q#a^
zC`<5*Ki=RLA=7I6SZVtZO{$7AaPB%pLWP@#NOBk$!;cuDKfn)@>U_G(@T;d2y43#M
zG|YbCJtW+8J1%alKV;Gt-h*~Sazs&fT9BeF@!PapZO->WBqhX}&fy?}u!j%lB1*=1
zwv*er>*h|2EVOY}Ph7F+CZsR=t1Q`xabK%HICE<n3gphF>W)6@gmC+hy+63|_=Q4^
z9e%LCR$OxOA|xjEM0R%eagz}4y*qB?Cl-Mo2-O96GANa_^5Ue0D>kCF<&28h&()hE
zOS$;4C>PgP%Egt`>J0~Hmt)X5V47q{oC5K}Nj5v42-Rd&to2%oWGI%;YyL&a!2WAG
zQym&|Y}urNGO0iTCp$-MKyl)WXtpp|wC)pYzGweo9FXJJG}_sqP7PTliM*aUBIGK2
zM<OIKmwT1Qloc7*D6g`qcx=3?T%N}jDPkx|s3G=fnXn^SS1RU!7y^)GJGzPp1a3f{
z6r*x5kE~NDaMzVo1iQ*r<zAoQXdUA$%mZWcQAngY1D-16<%GrZ0>%d^BziJi!RX3W
zq2wufS$W5_cBWAC4CGbtu@Y}U9XVoTLaW5v3tcZh0o{0tqhl3+{kmeb@Y8UVX#8LT
z)EFNHOOs2Aj}{z(paP1t?QJ+$9ZWglo^Be#L3+~+KfLk5VRspR^$gBaikLXr8vJAo
zdW;)`VPnUm-kvoWH8B}ola}}jHN<SwZt+XM51!6pkwDmLHA8(;xa(F5s%_9ho*-By
zg0aw2)7t^OG(_0G$KD@ovO;>iV@F89-$+6k7Ho721ctHTK`m4p@mMtn=3{jn0HfuH
z3YzxK#j-sTEy@;p0m$*P`H|&`Q$bH0X|to`#c<wWTqvd)c<)Wj3EG|_Pg!=P&cJeO
zii*5EqP=VHLGaQ$3ImZ%7zT^pDx@w<`p*5LN0Eio<n&Y|+fNw+%k3x9uP1rpG<YMe
zjpUFl%tfp0@glU*a46le_ZXEu;vdq_zfg`VQWR)tw33vTv`P~Sk1IZ0fdZ&_N~uQ5
zJ1Tuotqw81gnX_toB=YJnfWJv8;$KDuq&X#$66lSG>}&n&H`M{4dY5G5B%aBsEGk@
zZ$ZN1MfhONR&0(s4O5a+(W_&NU%aFff$;P{jm5+%RovTFC!(NooX5n0GB4P0@Z-R4
z?lLKf3mnpDRw3}E$H9}arFTx{;=?&d<Y;(R)R5cKisf4R0Di&iH;$SjonyBjoFPln
zoWc$3TOf9>cydbLedAqjH5rfXc`RHZ`Q!<$eAl-0Z}y1Z422YKqebR46ZDpY=-<dT
z%XdHRQOd>Czo{n5x=zQNf^+hVRFqZ>HmSr@I%fnLWd=c3Xv_tFCyPMC+T_Syj$V<n
zwr-^FJG)TnYAnzZWTuc9C1w_iMURRK-*f>XK?O_yBg|IsZRvBW94ue=6fXk*ST9t0
z_+;QfO}P_jfc%{dw3Lp9nk_ow7Rq28G|Jsc$APjh*l=KuU~slMFa1z$MV0vdO{67v
zT0*&%i)DMNrtJI5RuS)9u^qjBbXxItvdLn>+VMmrfq-zM0glRKb3~4YN6Wo8T*2XF
z@oPFmKCNf-h&ESRxIM+&eMuVypOT%yq6H<wtJ{G^w}F=i(*6_$JKku#Ps|{+lv|SN
zj=Abm9H(ne;IwN+T^jlg6<&%>yejk<e+*9IGJf;)Ls=jSWtrJ>V#C^YGVL5Lj~^a8
zE`p5Yr{aSwLl#N-zKZfT!qR#y!7OApDcqt_KdgYjYo6(_lYaqJAz~#u&_^PH31BSu
zm2;q+17(K;Wm>S|Af<*UYqSasePJ3vCPbcWvF`o~0cbFpCrb(MI00}V_TF6VQZ6=V
z3|fQI8e^@8j<o~wr7SUa76}A|8-jARiYEwVdy1<!BHU2O`6V37WZB2!Og^r#&_u#M
zF|0`ehdMBkZ%+kE=86yNxm&im4vPK_3Covb+`N-0B3UVb%H<<YI@-yKmsJ|0&tvG<
zsqSC9E!@$^6e6y0_|&$OY<cF%N)3C$|BFCFnuMto?Ra00QtD=0I6_NVd&PI}B3=ae
zZ4ld2%7P;RCvCrET_Y&69Hg8B<sA40IZ&nr8^edvjBy;aqLt-YnI_DvW)OvZvV?F`
zT_B@Vxj1lhu_zaFNgx~wrb#i@LnAcse(_2&bJkp@A<?}!lAkZvw2S_YSR0PSG(&)L
ze_!M^_s?&tz?GX*Xd*$(BkU3r4P1GM{CK#=&B=xW4p%SeBH!N9`JKOPdeX)t+f)oT
zhB6JkPS_LWceb8i8PuW4mMu=6#G{yDR*_1|=Z8zhMUatYP$#`u1R8ETov=w>5NqXk
z66NK(mrzI8@;YTA=5|1YtUeRm^(jrxuxQH@%Q;Zafs=>>&hg<SBCC|7xIV8qSeb#+
z={Goyy(oqaoJr#|)DRge-kDeX)dVbGyn&mG56f1EoYFCBFn(k)s}&zal@;NPHxskF
zbWVR_d&=6Lq7F{v!kZhDGZcBvow?k8($3Wo>dCYgi_LZAG#M38dBUu;j{J2sc_|Q(
zZ#?Zpp^vLcRCuOPLn=y7Ny!Bl?plLM)0VpoLz182c$)R&#~Aa_%h;HaFRLZ`hGbLU
zaQVVgBN=~Aor@Qezm!|F*-JDH2497!Jgl8J5%X65s1(zwuSABJa>L?2rbG%h#mE;O
zDXOFeF~ksN;oh<8RXj6$C5{j<qK48yMRM#nD_84aMM)k1`_d#VPs=TlV)m1h-xbOg
z0D1a`Tp>1HF1bsZzS3cB{N$^FY7e>I;P>JpX_MUam6(t;8xeF%#Wva%<gtNr7n%cQ
zT(Hrjk7o?DY8x1t^k$BZ=72>V8*X2ee$r=2{-yb`*r{Cno!ne}Fk9|bkUJObQ`!L%
z-Pt8RD9MU&#j`T52oq%GXs4$@>ED#ba=4q2Kq&HB2l9A*B$a<u%H{3BXP?<nF5@e$
zc?K`m$ioz9SP$yaP@v(Hjx?Ppm%HmzjCpXQvi!}m!|{>yWy%W8p7j4=;)^e1zgz%$
z+>(Wbg5@6E`VJ<K`~sPtSzE8t9L0~XOu(Ft`_+4)1e$Qf`ZA0eoPWMRfynF)xc;2(
z_@C?A3d!#(R|hh;%*52k{wIQs#S%t48qVPj;1}P9nOEY>CNtE{wZ+AS*gQH3Ux>gM
zaG`Pv`p`*%?7yZj^DA^|+67-_Y9cZ>&%ne{>(vqDUz4nGWp9|#1x*{zaG8Y&2Vd6H
zB59L?j7=CfaR&BBAgx4+5!E?e8YA(wQeE9w*4bEU`pfiI6u&#w;1khjB}XYe8q&hI
zx{E_HN0c>)t)5XeC_NBCNVjrvJ{rij3|9%%0TV-3AdB`%yb{O+0dXi71WPRlNe_y*
z;H7fBfUtmO8H!@W3_xU-!>!ywkH~8sl+_hMa_MTw4a3#NEW#eK8};*^1L{J(W6{6S
z*h2rZkFZSgoZC*^exfsUsK77$LxZNgRv=EwqthZ(=tA<i?UZ{&j;jk*(S&Xyf|qXl
zB3aUimQzWQI@Mq7P7}x#L$odA_&VPk`A31KLWM%n&!Wy*3}Sf8x{zD?cfzMIRji2*
zrd@qh$W5uW<XT;;IRb<_d<H|yTR+0L{mDmeAv@j)2W+sn7*#4Yk=s@)BbJpS841$w
ztTr)i6r8VY#6(r8D%`7W-yGZOj{jokKv@|*iOG+v*hJc(((mS&bR=yOC29jeQyH7s
z+r`+X2slbx!nYme3JST2dVjWgGkk%5_mRJe6`ROgQLo)_C53~!R($d1b`QerKIYF2
zS-Os;Cy^*oe9go6JN9GmA^A)diA1g5xQlcbBWbQ=Z&;vJx&z4e(xWtu<x)X;TX=e^
zPz<}2ex)ivQt4_P$mi!%bV@tauU!r2%JvkkeUndS8^kY9Y2r8mautNSIJ9v^9Umjq
z5RYkBzdEHYpN+n?#qzEC>wqz@tybGfTNjMNkcsm#dsGKIZPM~Io2-2s-@%X$wb7t{
zebnhS3UfdFLQSSNfWwovVm59O{I%up)JDB9`=hP8U$SrF1H3o$N%UyZ7_D2Lh9S?q
z3uBQeYuiV7vQJ|qNE-j1eEkz-tJ;VmzIPtO)uY~moI%qi<!{31uJ_?v*QyAG?L2(G
z@Ch_;+5`z_HOAniXRv%NM9}c#hOG8{zZ?&Vh3<qF{JRn_EZ%@3MQ0SUwtX!02%Z-D
z&(I^Av3O_naM}J^fDtO6<n8k~)@8`euUi)4>Xu!_Xyz(h-|AF6v+O6)fZva$(?{T}
zrj7L9m3Lz4hJC6Y-@W|^`abhMj#S9PqLF{cvv0hHe>AAC_}t+7hp={E@aOKv*Y3fk
z_bmlBkH8uA?p7;9m1I)*Qnt13=~xeq8Z|<_>mI_Iede;xLTp?z86E4@MLquYPr_$A
zg7GSXa?`OeX)x;6t*ice-aQGM4(ctItqYUTbI>R}F6JCe`lwke>@A|GqFq?<cwakh
z@Z=P=f)SM`ZFN~MOk1)96Z#SFWE?2mhs9#V(cq~omfaVx--pa^UdN>kItuqzq4Vi=
zk(82#Ez&m=pIoBKp?~n?g_u41GAr+8m~8b^Zpp0^8V%0Ak59s=zJ0NHtF`o_dye&c
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
TE=<Ox00000NkvXXu0mjfTt|$H


From 64c22be7a9d66340be89bcc92312aea2667545ee Mon Sep 17 00:00:00 2001
From: Johnson Lau <jl2012@users.noreply.github.com>
Date: Mon, 11 Apr 2016 17:31:25 +0800
Subject: [PATCH 0135/1802] Add jl2012 public key for gitian build

---
 contrib/gitian-downloader/jl2012-key.pgp | 105 +++++++++++++++++++++++
 1 file changed, 105 insertions(+)
 create mode 100644 contrib/gitian-downloader/jl2012-key.pgp

diff --git a/contrib/gitian-downloader/jl2012-key.pgp b/contrib/gitian-downloader/jl2012-key.pgp
new file mode 100644
index 0000000000000..b8aad7fd88b42
--- /dev/null
+++ b/contrib/gitian-downloader/jl2012-key.pgp
@@ -0,0 +1,105 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Comment: GPGTools - https://gpgtools.org
+
+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
+=1irw
+-----END PGP PUBLIC KEY BLOCK-----

From 7e91f632c70ff1848a152f24ee67a06796803943 Mon Sep 17 00:00:00 2001
From: Suhas Daftuar <sdaftuar@gmail.com>
Date: Mon, 11 Apr 2016 12:52:29 -0400
Subject: [PATCH 0136/1802] Use txid as key in mapAlreadyAskedFor

Previously we used the CInv that would be sent to the peer announcing the
transaction as the key, but using the txid instead allows us to decouple the
p2p layer from the application logic (which relies on this map to avoid
duplicate tx requests).
---
 src/main.cpp | 2 +-
 src/net.cpp  | 6 +++---
 src/net.h    | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index f5c7e11d6e8a3..5c1af9ecccfc8 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -4956,7 +4956,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
         CValidationState state;
 
         pfrom->setAskFor.erase(inv.hash);
-        mapAlreadyAskedFor.erase(inv);
+        mapAlreadyAskedFor.erase(inv.hash);
 
         CFeeRate txFeeRate = CFeeRate(0);
         if (!AlreadyHave(inv) && AcceptToMemoryPool(mempool, state, tx, true, &fMissingInputs, &txFeeRate)) {
diff --git a/src/net.cpp b/src/net.cpp
index e8cc753a486d0..3bf8c165dc911 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -93,7 +93,7 @@ CCriticalSection cs_vNodes;
 map<CInv, CDataStream> mapRelay;
 deque<pair<int64_t, CInv> > vRelayExpiration;
 CCriticalSection cs_mapRelay;
-limitedmap<CInv, int64_t> mapAlreadyAskedFor(MAX_INV_SZ);
+limitedmap<uint256, int64_t> mapAlreadyAskedFor(MAX_INV_SZ);
 
 static deque<string> vOneShots;
 CCriticalSection cs_vOneShots;
@@ -2436,7 +2436,7 @@ void CNode::AskFor(const CInv& inv)
     // We're using mapAskFor as a priority queue,
     // the key is the earliest time the request can be sent
     int64_t nRequestTime;
-    limitedmap<CInv, int64_t>::const_iterator it = mapAlreadyAskedFor.find(inv);
+    limitedmap<uint256, int64_t>::const_iterator it = mapAlreadyAskedFor.find(inv.hash);
     if (it != mapAlreadyAskedFor.end())
         nRequestTime = it->second;
     else
@@ -2455,7 +2455,7 @@ void CNode::AskFor(const CInv& inv)
     if (it != mapAlreadyAskedFor.end())
         mapAlreadyAskedFor.update(it, nRequestTime);
     else
-        mapAlreadyAskedFor.insert(std::make_pair(inv, nRequestTime));
+        mapAlreadyAskedFor.insert(std::make_pair(inv.hash, nRequestTime));
     mapAskFor.insert(std::make_pair(nRequestTime, inv));
 }
 
diff --git a/src/net.h b/src/net.h
index ab9eb68d8577a..1892c963fcee2 100644
--- a/src/net.h
+++ b/src/net.h
@@ -164,7 +164,7 @@ extern CCriticalSection cs_vNodes;
 extern std::map<CInv, CDataStream> mapRelay;
 extern std::deque<std::pair<int64_t, CInv> > vRelayExpiration;
 extern CCriticalSection cs_mapRelay;
-extern limitedmap<CInv, int64_t> mapAlreadyAskedFor;
+extern limitedmap<uint256, int64_t> mapAlreadyAskedFor;
 
 extern std::vector<std::string> vAddedNodes;
 extern CCriticalSection cs_vAddedNodes;

From 41dbc4849e0bf14eef98962b0f0bddcde0bb3014 Mon Sep 17 00:00:00 2001
From: Alexander Regueiro <alexreg@me.com>
Date: Sat, 9 Apr 2016 14:30:07 +0100
Subject: [PATCH 0137/1802] Removed call to `TryCreateDirectory` from
 `GetDefaultDataDir` in `src/util.cpp`.

See https://github.com/bitcoin/bitcoin/issues/7845#issuecomment-207684728.
Also refactored `GetDefaultDataDir` function to return path for Mac in one expression.
---
 src/util.cpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/util.cpp b/src/util.cpp
index 59f58f2c5534f..00b75fbdbe38e 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -471,9 +471,7 @@ boost::filesystem::path GetDefaultDataDir()
         pathRet = fs::path(pszHome);
 #ifdef MAC_OSX
     // Mac
-    pathRet /= "Library/Application Support";
-    TryCreateDirectory(pathRet);
-    return pathRet / "Bitcoin";
+    return pathRet / "Library/Application Support/Bitcoin";
 #else
     // Unix
     return pathRet / ".bitcoin";

From 85c807c9ead3215021503348e75851900dfa08db Mon Sep 17 00:00:00 2001
From: Rusty Russell <rusty@rustcorp.com.au>
Date: Tue, 12 Apr 2016 15:44:18 +0930
Subject: [PATCH 0138/1802] getblockchaininfo: make bip9_softforks an object,
 not an array.

We can't change "softforks", but it seems far more logical to use tags
in an object rather than using an "id" field in an array.

For example, to get the csv status before, you need to iterate the
array to find the entry with 'id' field equal to "csv":

   jq '.bip9_softforks | map(select(.id == "csv"))[] | .status'

Now:
   jq '.bip9_softforks.csv.status'

There is no issue with fork names being incompatible with JSON tags,
since we're selecting them ourselves.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
---
 qa/rpc-tests/bip9-softforks.py      |  6 +-----
 qa/rpc-tests/test_framework/util.py |  5 +----
 src/rpc/blockchain.cpp              | 14 ++++++--------
 3 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/qa/rpc-tests/bip9-softforks.py b/qa/rpc-tests/bip9-softforks.py
index 98975e719335c..e63343d35232e 100755
--- a/qa/rpc-tests/bip9-softforks.py
+++ b/qa/rpc-tests/bip9-softforks.py
@@ -79,11 +79,7 @@ def generate_blocks(self, number, version, test_blocks = []):
 
     def get_bip9_status(self, key):
         info = self.nodes[0].getblockchaininfo()
-        for row in info['bip9_softforks']:
-            if row['id'] == key:
-                return row
-        raise IndexError ('key:"%s" not found' % key)
-
+        return info['bip9_softforks'][key]
 
     def test_BIP(self, bipName, activated_version, invalidate, invalidatePostSignature):
         # generate some coins for later
diff --git a/qa/rpc-tests/test_framework/util.py b/qa/rpc-tests/test_framework/util.py
index d9fe0f75f2608..acb7f8a6b49df 100644
--- a/qa/rpc-tests/test_framework/util.py
+++ b/qa/rpc-tests/test_framework/util.py
@@ -548,7 +548,4 @@ def create_lots_of_big_transactions(node, txouts, utxos, fee):
 
 def get_bip9_status(node, key):
     info = node.getblockchaininfo()
-    for row in info['bip9_softforks']:
-        if row['id'] == key:
-            return row
-    raise IndexError ('key:"%s" not found' % key)
+    return info['bip9_softforks'][key]
diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp
index 34637b9f7e398..7a01a10b7d629 100644
--- a/src/rpc/blockchain.cpp
+++ b/src/rpc/blockchain.cpp
@@ -608,10 +608,9 @@ static UniValue SoftForkDesc(const std::string &name, int version, CBlockIndex*
     return rv;
 }
 
-static UniValue BIP9SoftForkDesc(const std::string& name, const Consensus::Params& consensusParams, Consensus::DeploymentPos id)
+static UniValue BIP9SoftForkDesc(const Consensus::Params& consensusParams, Consensus::DeploymentPos id)
 {
     UniValue rv(UniValue::VOBJ);
-    rv.push_back(Pair("id", name));
     const ThresholdState thresholdState = VersionBitsTipState(consensusParams, id);
     switch (thresholdState) {
     case THRESHOLD_DEFINED: rv.push_back(Pair("status", "defined")); break;
@@ -660,15 +659,14 @@ UniValue getblockchaininfo(const UniValue& params, bool fHelp)
             "        \"reject\": { ... }      (object) progress toward rejecting pre-softfork blocks (same fields as \"enforce\")\n"
             "     }, ...\n"
             "  ],\n"
-            "  \"bip9_softforks\": [       (array) status of BIP9 softforks in progress\n"
-            "     {\n"
-            "        \"id\": \"xxxx\",        (string) name of the softfork\n"
+            "  \"bip9_softforks\": {          (object) status of BIP9 softforks in progress\n"
+            "     \"xxxx\" : {                (string) name of the softfork\n"
             "        \"status\": \"xxxx\",    (string) one of \"defined\", \"started\", \"lockedin\", \"active\", \"failed\"\n"
             "        \"bit\": xx,             (numeric) the bit, 0-28, in the block version field used to signal this soft fork\n"
             "        \"startTime\": xx,       (numeric) the minimum median time past of a block at which the bit gains its meaning\n"
             "        \"timeout\": xx          (numeric) the median time past of a block at which the deployment is considered failed if not yet locked in\n"
             "     }\n"
-            "  ]\n"
+            "  }\n"
             "}\n"
             "\nExamples:\n"
             + HelpExampleCli("getblockchaininfo", "")
@@ -691,11 +689,11 @@ UniValue getblockchaininfo(const UniValue& params, bool fHelp)
     const Consensus::Params& consensusParams = Params().GetConsensus();
     CBlockIndex* tip = chainActive.Tip();
     UniValue softforks(UniValue::VARR);
-    UniValue bip9_softforks(UniValue::VARR);
+    UniValue bip9_softforks(UniValue::VOBJ);
     softforks.push_back(SoftForkDesc("bip34", 2, tip, consensusParams));
     softforks.push_back(SoftForkDesc("bip66", 3, tip, consensusParams));
     softforks.push_back(SoftForkDesc("bip65", 4, tip, consensusParams));
-    bip9_softforks.push_back(BIP9SoftForkDesc("csv", consensusParams, Consensus::DEPLOYMENT_CSV));
+    bip9_softforks.push_back(Pair("csv", BIP9SoftForkDesc(consensusParams, Consensus::DEPLOYMENT_CSV)));
     obj.push_back(Pair("softforks",             softforks));
     obj.push_back(Pair("bip9_softforks", bip9_softforks));
 

From d12760b16ac30734b5e3b047df8aaf6564e927db Mon Sep 17 00:00:00 2001
From: Rusty Russell <rusty@rustcorp.com.au>
Date: Wed, 13 Apr 2016 16:54:07 +0930
Subject: [PATCH 0139/1802] rpc-tests: handle KeyError nicely in
 test_framework.py

btcdrak wrote this for me.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
---
 qa/rpc-tests/test_framework/test_framework.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/qa/rpc-tests/test_framework/test_framework.py b/qa/rpc-tests/test_framework/test_framework.py
index 19ee4726093de..3b08cd1384d4e 100755
--- a/qa/rpc-tests/test_framework/test_framework.py
+++ b/qa/rpc-tests/test_framework/test_framework.py
@@ -142,6 +142,9 @@ def main(self):
         except AssertionError as e:
             print("Assertion failed: "+ str(e))
             traceback.print_tb(sys.exc_info()[2])
+        except KeyError as e:
+            print("key not found: "+ str(e))
+            traceback.print_tb(sys.exc_info()[2])
         except Exception as e:
             print("Unexpected exception caught during testing: "+str(e))
             traceback.print_tb(sys.exc_info()[2])

From c6cb6f7d4c4bbfe96256c66b3aef4e7e3ff6285f Mon Sep 17 00:00:00 2001
From: Alex Morcos <morcos@chaincode.com>
Date: Wed, 13 Apr 2016 16:02:46 -0400
Subject: [PATCH 0140/1802] Avoid unnecessary database access for unknown
 transactions

---
 src/main.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/main.cpp b/src/main.cpp
index 9b164c799915c..f5baf355956fe 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -4344,10 +4344,12 @@ bool static AlreadyHave(const CInv& inv) EXCLUSIVE_LOCKS_REQUIRED(cs_main)
                 recentRejects->reset();
             }
 
+            // Use pcoinsTip->HaveCoinsInCache as a quick approximation to exclude
+            // requesting or processing some txs which have already been included in a block
             return recentRejects->contains(inv.hash) ||
                    mempool.exists(inv.hash) ||
                    mapOrphanTransactions.count(inv.hash) ||
-                   pcoinsTip->HaveCoins(inv.hash);
+                   pcoinsTip->HaveCoinsInCache(inv.hash);
         }
     case MSG_BLOCK:
         return mapBlockIndex.count(inv.hash);

From 38c310299cfef419d42744362b90c1700b598953 Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Thu, 14 Apr 2016 16:04:50 +0200
Subject: [PATCH 0141/1802] Change mapRelay to store CTransactions

---
 src/main.cpp |  7 ++-----
 src/net.cpp  | 17 ++++-------------
 src/net.h    |  5 ++---
 3 files changed, 8 insertions(+), 21 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index fff1cc346e014..f84fb8dd56550 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -4456,7 +4456,7 @@ void static ProcessGetData(CNode* pfrom, const Consensus::Params& consensusParam
                 bool pushed = false;
                 {
                     LOCK(cs_mapRelay);
-                    map<CInv, CDataStream>::iterator mi = mapRelay.find(inv);
+                    map<uint256, CTransaction>::iterator mi = mapRelay.find(inv.hash);
                     if (mi != mapRelay.end()) {
                         pfrom->PushMessage(inv.GetCommand(), (*mi).second);
                         pushed = true;
@@ -4465,10 +4465,7 @@ void static ProcessGetData(CNode* pfrom, const Consensus::Params& consensusParam
                 if (!pushed && inv.type == MSG_TX) {
                     CTransaction tx;
                     if (mempool.lookup(inv.hash, tx)) {
-                        CDataStream ss(SER_NETWORK, PROTOCOL_VERSION);
-                        ss.reserve(1000);
-                        ss << tx;
-                        pfrom->PushMessage(NetMsgType::TX, ss);
+                        pfrom->PushMessage(NetMsgType::TX, tx);
                         pushed = true;
                     }
                 }
diff --git a/src/net.cpp b/src/net.cpp
index 3bf8c165dc911..e64cb4ef90207 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -90,8 +90,8 @@ std::string strSubVersion;
 
 vector<CNode*> vNodes;
 CCriticalSection cs_vNodes;
-map<CInv, CDataStream> mapRelay;
-deque<pair<int64_t, CInv> > vRelayExpiration;
+map<uint256, CTransaction> mapRelay;
+deque<pair<int64_t, uint256> > vRelayExpiration;
 CCriticalSection cs_mapRelay;
 limitedmap<uint256, int64_t> mapAlreadyAskedFor(MAX_INV_SZ);
 
@@ -2054,14 +2054,6 @@ instance_of_cnetcleanup;
 
 
 void RelayTransaction(const CTransaction& tx, CFeeRate feerate)
-{
-    CDataStream ss(SER_NETWORK, PROTOCOL_VERSION);
-    ss.reserve(10000);
-    ss << tx;
-    RelayTransaction(tx, feerate, ss);
-}
-
-void RelayTransaction(const CTransaction& tx, CFeeRate feerate, const CDataStream& ss)
 {
     CInv inv(MSG_TX, tx.GetHash());
     {
@@ -2073,9 +2065,8 @@ void RelayTransaction(const CTransaction& tx, CFeeRate feerate, const CDataStrea
             vRelayExpiration.pop_front();
         }
 
-        // Save original serialized message so newer versions are preserved
-        mapRelay.insert(std::make_pair(inv, ss));
-        vRelayExpiration.push_back(std::make_pair(GetTime() + 15 * 60, inv));
+        mapRelay.insert(std::make_pair(inv.hash, tx));
+        vRelayExpiration.push_back(std::make_pair(GetTime() + 15 * 60, inv.hash));
     }
     LOCK(cs_vNodes);
     BOOST_FOREACH(CNode* pnode, vNodes)
diff --git a/src/net.h b/src/net.h
index 1892c963fcee2..7f905002a6254 100644
--- a/src/net.h
+++ b/src/net.h
@@ -161,8 +161,8 @@ extern int nMaxConnections;
 
 extern std::vector<CNode*> vNodes;
 extern CCriticalSection cs_vNodes;
-extern std::map<CInv, CDataStream> mapRelay;
-extern std::deque<std::pair<int64_t, CInv> > vRelayExpiration;
+extern std::map<uint256, CTransaction> mapRelay;
+extern std::deque<std::pair<int64_t, uint256> > vRelayExpiration;
 extern CCriticalSection cs_mapRelay;
 extern limitedmap<uint256, int64_t> mapAlreadyAskedFor;
 
@@ -773,7 +773,6 @@ class CNode
 
 class CTransaction;
 void RelayTransaction(const CTransaction& tx, CFeeRate feerate);
-void RelayTransaction(const CTransaction& tx, CFeeRate feerate, const CDataStream& ss);
 
 /** Access to the (IP) address database (peers.dat) */
 class CAddrDB

From fa7abe0a00464e6aa88d55c63dba40878bbe5b79 Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Thu, 14 Apr 2016 19:39:49 +0200
Subject: [PATCH 0142/1802] [test] bctest.py: Revert faa41ee

---
 src/test/bctest.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/test/bctest.py b/src/test/bctest.py
index fc59152ba12f1..8105b87ffa34c 100644
--- a/src/test/bctest.py
+++ b/src/test/bctest.py
@@ -2,7 +2,6 @@
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 from __future__ import division,print_function,unicode_literals
-from io import open
 import subprocess
 import os
 import json
@@ -17,7 +16,7 @@ def bctest(testDir, testObj, exeext):
 	inputData = None
 	if "input" in testObj:
 		filename = testDir + "/" + testObj['input']
-		inputData = open(filename, 'rb').read()
+		inputData = open(filename).read()
 		stdinCfg = subprocess.PIPE
 
 	outputFn = None

From 90604f16af63ec066d6561337f476ccd8acec326 Mon Sep 17 00:00:00 2001
From: Jonas Schnelli <jonas.schnelli@include7.ch>
Date: Mon, 1 Jun 2015 16:35:19 +0200
Subject: [PATCH 0143/1802] add bip32 pubkey serialization

CExtPubKey should be serializable like CPubKey
---
 src/base58.h             |  4 ++--
 src/key.cpp              |  6 +++---
 src/key.h                | 21 +++++++++++++++++++--
 src/pubkey.cpp           |  6 +++---
 src/pubkey.h             | 30 ++++++++++++++++++++++++++++--
 src/test/bip32_tests.cpp | 16 ++++++++++++++++
 6 files changed, 71 insertions(+), 12 deletions(-)

diff --git a/src/base58.h b/src/base58.h
index a3980118aae34..cccebc9e0e753 100644
--- a/src/base58.h
+++ b/src/base58.h
@@ -164,7 +164,7 @@ template<typename K, int Size, CChainParams::Base58Type Type> class CBitcoinExtK
     CBitcoinExtKeyBase() {}
 };
 
-typedef CBitcoinExtKeyBase<CExtKey, 74, CChainParams::EXT_SECRET_KEY> CBitcoinExtKey;
-typedef CBitcoinExtKeyBase<CExtPubKey, 74, CChainParams::EXT_PUBLIC_KEY> CBitcoinExtPubKey;
+typedef CBitcoinExtKeyBase<CExtKey, BIP32_EXTKEY_SIZE, CChainParams::EXT_SECRET_KEY> CBitcoinExtKey;
+typedef CBitcoinExtKeyBase<CExtPubKey, BIP32_EXTKEY_SIZE, CChainParams::EXT_PUBLIC_KEY> CBitcoinExtPubKey;
 
 #endif // BITCOIN_BASE58_H
diff --git a/src/key.cpp b/src/key.cpp
index 28ba5144e4314..6a3d9aa140906 100644
--- a/src/key.cpp
+++ b/src/key.cpp
@@ -275,7 +275,7 @@ CExtPubKey CExtKey::Neuter() const {
     return ret;
 }
 
-void CExtKey::Encode(unsigned char code[74]) const {
+void CExtKey::Encode(unsigned char code[BIP32_EXTKEY_SIZE]) const {
     code[0] = nDepth;
     memcpy(code+1, vchFingerprint, 4);
     code[5] = (nChild >> 24) & 0xFF; code[6] = (nChild >> 16) & 0xFF;
@@ -286,12 +286,12 @@ void CExtKey::Encode(unsigned char code[74]) const {
     memcpy(code+42, key.begin(), 32);
 }
 
-void CExtKey::Decode(const unsigned char code[74]) {
+void CExtKey::Decode(const unsigned char code[BIP32_EXTKEY_SIZE]) {
     nDepth = code[0];
     memcpy(vchFingerprint, code+1, 4);
     nChild = (code[5] << 24) | (code[6] << 16) | (code[7] << 8) | code[8];
     memcpy(chaincode.begin(), code+9, 32);
-    key.Set(code+42, code+74, true);
+    key.Set(code+42, code+BIP32_EXTKEY_SIZE, true);
 }
 
 bool ECC_InitSanityCheck() {
diff --git a/src/key.h b/src/key.h
index 6c820d49cd5fc..b4f48d59f5b08 100644
--- a/src/key.h
+++ b/src/key.h
@@ -164,11 +164,28 @@ struct CExtKey {
                a.chaincode == b.chaincode && a.key == b.key;
     }
 
-    void Encode(unsigned char code[74]) const;
-    void Decode(const unsigned char code[74]);
+    void Encode(unsigned char code[BIP32_EXTKEY_SIZE]) const;
+    void Decode(const unsigned char code[BIP32_EXTKEY_SIZE]);
     bool Derive(CExtKey& out, unsigned int nChild) const;
     CExtPubKey Neuter() const;
     void SetMaster(const unsigned char* seed, unsigned int nSeedLen);
+    template <typename Stream>
+    void Serialize(Stream& s, int nType, int nVersion) const
+    {
+        unsigned int len = BIP32_EXTKEY_SIZE;
+        ::WriteCompactSize(s, len);
+        unsigned char code[BIP32_EXTKEY_SIZE];
+        Encode(code);
+        s.write((const char *)&code[0], len);
+    }
+    template <typename Stream>
+    void Unserialize(Stream& s, int nType, int nVersion)
+    {
+        unsigned int len = ::ReadCompactSize(s);
+        unsigned char code[BIP32_EXTKEY_SIZE];
+        s.read((char *)&code[0], len);
+        Decode(code);
+    }
 };
 
 /** Initialize the elliptic curve support. May not be called twice without calling ECC_Stop first. */
diff --git a/src/pubkey.cpp b/src/pubkey.cpp
index db06a8928567f..be4ee27cd48d5 100644
--- a/src/pubkey.cpp
+++ b/src/pubkey.cpp
@@ -246,7 +246,7 @@ bool CPubKey::Derive(CPubKey& pubkeyChild, ChainCode &ccChild, unsigned int nChi
     return true;
 }
 
-void CExtPubKey::Encode(unsigned char code[74]) const {
+void CExtPubKey::Encode(unsigned char code[BIP32_EXTKEY_SIZE]) const {
     code[0] = nDepth;
     memcpy(code+1, vchFingerprint, 4);
     code[5] = (nChild >> 24) & 0xFF; code[6] = (nChild >> 16) & 0xFF;
@@ -256,12 +256,12 @@ void CExtPubKey::Encode(unsigned char code[74]) const {
     memcpy(code+41, pubkey.begin(), 33);
 }
 
-void CExtPubKey::Decode(const unsigned char code[74]) {
+void CExtPubKey::Decode(const unsigned char code[BIP32_EXTKEY_SIZE]) {
     nDepth = code[0];
     memcpy(vchFingerprint, code+1, 4);
     nChild = (code[5] << 24) | (code[6] << 16) | (code[7] << 8) | code[8];
     memcpy(chaincode.begin(), code+9, 32);
-    pubkey.Set(code+41, code+74);
+    pubkey.Set(code+41, code+BIP32_EXTKEY_SIZE);
 }
 
 bool CExtPubKey::Derive(CExtPubKey &out, unsigned int nChild) const {
diff --git a/src/pubkey.h b/src/pubkey.h
index e1a17b658261b..db5444ea9d745 100644
--- a/src/pubkey.h
+++ b/src/pubkey.h
@@ -23,6 +23,8 @@
  * script supports up to 75 for single byte push
  */
 
+const unsigned int BIP32_EXTKEY_SIZE = 74;
+
 /** A reference to a CKey: the Hash160 of its serialized public key */
 class CKeyID : public uint160
 {
@@ -205,9 +207,33 @@ struct CExtPubKey {
                a.chaincode == b.chaincode && a.pubkey == b.pubkey;
     }
 
-    void Encode(unsigned char code[74]) const;
-    void Decode(const unsigned char code[74]);
+    void Encode(unsigned char code[BIP32_EXTKEY_SIZE]) const;
+    void Decode(const unsigned char code[BIP32_EXTKEY_SIZE]);
     bool Derive(CExtPubKey& out, unsigned int nChild) const;
+
+    unsigned int GetSerializeSize(int nType, int nVersion) const
+    {
+        return BIP32_EXTKEY_SIZE+1; //add one byte for the size (compact int)
+    }
+    template <typename Stream>
+    void Serialize(Stream& s, int nType, int nVersion) const
+    {
+        unsigned int len = BIP32_EXTKEY_SIZE;
+        ::WriteCompactSize(s, len);
+        unsigned char code[BIP32_EXTKEY_SIZE];
+        Encode(code);
+        s.write((const char *)&code[0], len);
+    }
+    template <typename Stream>
+    void Unserialize(Stream& s, int nType, int nVersion)
+    {
+        unsigned int len = ::ReadCompactSize(s);
+        unsigned char code[BIP32_EXTKEY_SIZE];
+        if (len != BIP32_EXTKEY_SIZE)
+            throw std::runtime_error("Invalid extended key size\n");
+        s.read((char *)&code[0], len);
+        Decode(code);
+    }
 };
 
 /** Users of this module must hold an ECCVerifyHandle. The constructor and
diff --git a/src/test/bip32_tests.cpp b/src/test/bip32_tests.cpp
index ce29e692db2bd..7f1c2a32dd121 100644
--- a/src/test/bip32_tests.cpp
+++ b/src/test/bip32_tests.cpp
@@ -117,6 +117,22 @@ void RunTest(const TestVector &test) {
         }
         key = keyNew;
         pubkey = pubkeyNew;
+
+        CDataStream ssPub(SER_DISK, CLIENT_VERSION);
+        ssPub << pubkeyNew;
+        BOOST_CHECK(ssPub.size() == 75);
+
+        CDataStream ssPriv(SER_DISK, CLIENT_VERSION);
+        ssPriv << keyNew;
+        BOOST_CHECK(ssPriv.size() == 75);
+
+        CExtPubKey pubCheck;
+        CExtKey privCheck;
+        ssPub >> pubCheck;
+        ssPriv >> privCheck;
+
+        BOOST_CHECK(pubCheck == pubkeyNew);
+        BOOST_CHECK(privCheck == keyNew);
     }
 }
 

From fa939366910ee11e9c307d0d57eb21cdec8a362b Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Wed, 13 Apr 2016 12:10:04 +0200
Subject: [PATCH 0144/1802] [gitian] Add marcofalke-key.pgp

---
 contrib/gitian-downloader/marcofalke-key.pgp | 69 ++++++++++++++++++++
 1 file changed, 69 insertions(+)
 create mode 100644 contrib/gitian-downloader/marcofalke-key.pgp

diff --git a/contrib/gitian-downloader/marcofalke-key.pgp b/contrib/gitian-downloader/marcofalke-key.pgp
new file mode 100644
index 0000000000000..ee626500a4824
--- /dev/null
+++ b/contrib/gitian-downloader/marcofalke-key.pgp
@@ -0,0 +1,69 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1
+
+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
+=GC3s
+-----END PGP PUBLIC KEY BLOCK-----

From faf4c837fba119437ddbb36d6a799dc5fd79db37 Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Wed, 13 Apr 2016 12:34:32 +0200
Subject: [PATCH 0145/1802] [gitian] Move keys to contrib/gitian-keys

---
 contrib/README.md                                   |   6 +++---
 .../achow101-key.pgp                                |   0
 .../aschildbach-key.pgp                             | Bin
 .../bluematt-key.pgp                                | Bin
 .../btcdrak-key.pgp                                 |   0
 .../cdecker-key.pgp                                 | Bin
 .../centaur1-key.pgp                                |   0
 .../cfields-key.pgp                                 |   0
 .../devrandom-key.pgp                               | Bin
 .../{gitian-downloader => gitian-keys}/erkmos.pgp   | Bin
 .../fanquake-key.pgp                                |   0
 .../gavinandresen-key.pgp                           | Bin
 .../jl2012-key.pgp                                  |   0
 .../jonasschnelli-key.pgp                           |   0
 .../laanwj-key.pgp                                  |   0
 .../luke-jr-key.pgp                                 | Bin
 .../marcofalke-key.pgp                              |   0
 .../michagogo-key.pgp                               |   0
 .../petertodd-key.pgp                               |   0
 .../{gitian-downloader => gitian-keys}/prab-key.pgp |   0
 .../{gitian-downloader => gitian-keys}/sipa-key.pgp | Bin
 .../tcatm-key.pgp                                   | Bin
 .../wtogami-key.pgp                                 |   0
 doc/release-process.md                              |   2 +-
 24 files changed, 4 insertions(+), 4 deletions(-)
 rename contrib/{gitian-downloader => gitian-keys}/achow101-key.pgp (100%)
 rename contrib/{gitian-downloader => gitian-keys}/aschildbach-key.pgp (100%)
 rename contrib/{gitian-downloader => gitian-keys}/bluematt-key.pgp (100%)
 rename contrib/{gitian-downloader => gitian-keys}/btcdrak-key.pgp (100%)
 rename contrib/{gitian-downloader => gitian-keys}/cdecker-key.pgp (100%)
 rename contrib/{gitian-downloader => gitian-keys}/centaur1-key.pgp (100%)
 rename contrib/{gitian-downloader => gitian-keys}/cfields-key.pgp (100%)
 rename contrib/{gitian-downloader => gitian-keys}/devrandom-key.pgp (100%)
 rename contrib/{gitian-downloader => gitian-keys}/erkmos.pgp (100%)
 rename contrib/{gitian-downloader => gitian-keys}/fanquake-key.pgp (100%)
 rename contrib/{gitian-downloader => gitian-keys}/gavinandresen-key.pgp (100%)
 rename contrib/{gitian-downloader => gitian-keys}/jl2012-key.pgp (100%)
 rename contrib/{gitian-downloader => gitian-keys}/jonasschnelli-key.pgp (100%)
 rename contrib/{gitian-downloader => gitian-keys}/laanwj-key.pgp (100%)
 rename contrib/{gitian-downloader => gitian-keys}/luke-jr-key.pgp (100%)
 rename contrib/{gitian-downloader => gitian-keys}/marcofalke-key.pgp (100%)
 rename contrib/{gitian-downloader => gitian-keys}/michagogo-key.pgp (100%)
 rename contrib/{gitian-downloader => gitian-keys}/petertodd-key.pgp (100%)
 rename contrib/{gitian-downloader => gitian-keys}/prab-key.pgp (100%)
 rename contrib/{gitian-downloader => gitian-keys}/sipa-key.pgp (100%)
 rename contrib/{gitian-downloader => gitian-keys}/tcatm-key.pgp (100%)
 rename contrib/{gitian-downloader => gitian-keys}/wtogami-key.pgp (100%)

diff --git a/contrib/README.md b/contrib/README.md
index 9461539166ff9..32b3a170ac7ec 100644
--- a/contrib/README.md
+++ b/contrib/README.md
@@ -34,10 +34,10 @@ Contains files used to package bitcoind/bitcoin-qt
 for Debian-based Linux systems. If you compile bitcoind/bitcoin-qt yourself, there are some useful files here.
 
 ### [Gitian-descriptors](/contrib/gitian-descriptors) ###
-Gavin's notes on getting gitian builds up and running using KVM.
+Notes on getting Gitian builds up and running using KVM.
 
-### [Gitian-downloader](/contrib/gitian-downloader)
-Various PGP files of core developers. 
+### [Gitian-keys](/contrib/gitian-keys)
+PGP keys used for signing Bitcoin Core [Gitian release](/doc/release-process.md) results.
 
 ### [MacDeploy](/contrib/macdeploy) ###
 Scripts and notes for Mac builds. 
diff --git a/contrib/gitian-downloader/achow101-key.pgp b/contrib/gitian-keys/achow101-key.pgp
similarity index 100%
rename from contrib/gitian-downloader/achow101-key.pgp
rename to contrib/gitian-keys/achow101-key.pgp
diff --git a/contrib/gitian-downloader/aschildbach-key.pgp b/contrib/gitian-keys/aschildbach-key.pgp
similarity index 100%
rename from contrib/gitian-downloader/aschildbach-key.pgp
rename to contrib/gitian-keys/aschildbach-key.pgp
diff --git a/contrib/gitian-downloader/bluematt-key.pgp b/contrib/gitian-keys/bluematt-key.pgp
similarity index 100%
rename from contrib/gitian-downloader/bluematt-key.pgp
rename to contrib/gitian-keys/bluematt-key.pgp
diff --git a/contrib/gitian-downloader/btcdrak-key.pgp b/contrib/gitian-keys/btcdrak-key.pgp
similarity index 100%
rename from contrib/gitian-downloader/btcdrak-key.pgp
rename to contrib/gitian-keys/btcdrak-key.pgp
diff --git a/contrib/gitian-downloader/cdecker-key.pgp b/contrib/gitian-keys/cdecker-key.pgp
similarity index 100%
rename from contrib/gitian-downloader/cdecker-key.pgp
rename to contrib/gitian-keys/cdecker-key.pgp
diff --git a/contrib/gitian-downloader/centaur1-key.pgp b/contrib/gitian-keys/centaur1-key.pgp
similarity index 100%
rename from contrib/gitian-downloader/centaur1-key.pgp
rename to contrib/gitian-keys/centaur1-key.pgp
diff --git a/contrib/gitian-downloader/cfields-key.pgp b/contrib/gitian-keys/cfields-key.pgp
similarity index 100%
rename from contrib/gitian-downloader/cfields-key.pgp
rename to contrib/gitian-keys/cfields-key.pgp
diff --git a/contrib/gitian-downloader/devrandom-key.pgp b/contrib/gitian-keys/devrandom-key.pgp
similarity index 100%
rename from contrib/gitian-downloader/devrandom-key.pgp
rename to contrib/gitian-keys/devrandom-key.pgp
diff --git a/contrib/gitian-downloader/erkmos.pgp b/contrib/gitian-keys/erkmos.pgp
similarity index 100%
rename from contrib/gitian-downloader/erkmos.pgp
rename to contrib/gitian-keys/erkmos.pgp
diff --git a/contrib/gitian-downloader/fanquake-key.pgp b/contrib/gitian-keys/fanquake-key.pgp
similarity index 100%
rename from contrib/gitian-downloader/fanquake-key.pgp
rename to contrib/gitian-keys/fanquake-key.pgp
diff --git a/contrib/gitian-downloader/gavinandresen-key.pgp b/contrib/gitian-keys/gavinandresen-key.pgp
similarity index 100%
rename from contrib/gitian-downloader/gavinandresen-key.pgp
rename to contrib/gitian-keys/gavinandresen-key.pgp
diff --git a/contrib/gitian-downloader/jl2012-key.pgp b/contrib/gitian-keys/jl2012-key.pgp
similarity index 100%
rename from contrib/gitian-downloader/jl2012-key.pgp
rename to contrib/gitian-keys/jl2012-key.pgp
diff --git a/contrib/gitian-downloader/jonasschnelli-key.pgp b/contrib/gitian-keys/jonasschnelli-key.pgp
similarity index 100%
rename from contrib/gitian-downloader/jonasschnelli-key.pgp
rename to contrib/gitian-keys/jonasschnelli-key.pgp
diff --git a/contrib/gitian-downloader/laanwj-key.pgp b/contrib/gitian-keys/laanwj-key.pgp
similarity index 100%
rename from contrib/gitian-downloader/laanwj-key.pgp
rename to contrib/gitian-keys/laanwj-key.pgp
diff --git a/contrib/gitian-downloader/luke-jr-key.pgp b/contrib/gitian-keys/luke-jr-key.pgp
similarity index 100%
rename from contrib/gitian-downloader/luke-jr-key.pgp
rename to contrib/gitian-keys/luke-jr-key.pgp
diff --git a/contrib/gitian-downloader/marcofalke-key.pgp b/contrib/gitian-keys/marcofalke-key.pgp
similarity index 100%
rename from contrib/gitian-downloader/marcofalke-key.pgp
rename to contrib/gitian-keys/marcofalke-key.pgp
diff --git a/contrib/gitian-downloader/michagogo-key.pgp b/contrib/gitian-keys/michagogo-key.pgp
similarity index 100%
rename from contrib/gitian-downloader/michagogo-key.pgp
rename to contrib/gitian-keys/michagogo-key.pgp
diff --git a/contrib/gitian-downloader/petertodd-key.pgp b/contrib/gitian-keys/petertodd-key.pgp
similarity index 100%
rename from contrib/gitian-downloader/petertodd-key.pgp
rename to contrib/gitian-keys/petertodd-key.pgp
diff --git a/contrib/gitian-downloader/prab-key.pgp b/contrib/gitian-keys/prab-key.pgp
similarity index 100%
rename from contrib/gitian-downloader/prab-key.pgp
rename to contrib/gitian-keys/prab-key.pgp
diff --git a/contrib/gitian-downloader/sipa-key.pgp b/contrib/gitian-keys/sipa-key.pgp
similarity index 100%
rename from contrib/gitian-downloader/sipa-key.pgp
rename to contrib/gitian-keys/sipa-key.pgp
diff --git a/contrib/gitian-downloader/tcatm-key.pgp b/contrib/gitian-keys/tcatm-key.pgp
similarity index 100%
rename from contrib/gitian-downloader/tcatm-key.pgp
rename to contrib/gitian-keys/tcatm-key.pgp
diff --git a/contrib/gitian-downloader/wtogami-key.pgp b/contrib/gitian-keys/wtogami-key.pgp
similarity index 100%
rename from contrib/gitian-downloader/wtogami-key.pgp
rename to contrib/gitian-keys/wtogami-key.pgp
diff --git a/doc/release-process.md b/doc/release-process.md
index 2c83896c22216..5a6ac8482b674 100644
--- a/doc/release-process.md
+++ b/doc/release-process.md
@@ -115,7 +115,7 @@ The gbuild invocations below <b>DO NOT DO THIS</b> by default.
 
   Add other gitian builders keys to your gpg keyring
 
-	gpg --import ../bitcoin/contrib/gitian-downloader/*.pgp
+	gpg --import ../bitcoin/contrib/gitian-keys/*.pgp
 
   Verify the signatures
 

From de821d56e1f458fbe580520c77ac066107f4d77c Mon Sep 17 00:00:00 2001
From: Jonas Schnelli <dev@jonasschnelli.ch>
Date: Tue, 29 Mar 2016 11:34:25 +0200
Subject: [PATCH 0146/1802] [ZMQ] refactor message string

---
 src/zmq/zmqpublishnotifier.cpp | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/zmq/zmqpublishnotifier.cpp b/src/zmq/zmqpublishnotifier.cpp
index f5839620ff227..a9ce9c48c4b55 100644
--- a/src/zmq/zmqpublishnotifier.cpp
+++ b/src/zmq/zmqpublishnotifier.cpp
@@ -9,6 +9,11 @@
 
 static std::multimap<std::string, CZMQAbstractPublishNotifier*> mapPublishNotifiers;
 
+static const char *MSG_HASHBLOCK = "hashblock";
+static const char *MSG_HASHTX    = "hashtx";
+static const char *MSG_RAWBLOCK  = "rawblock";
+static const char *MSG_RAWTX     = "rawtx";
+
 // Internal function to send multipart message
 static int zmq_send_multipart(void *sock, const void* data, size_t size, ...)
 {
@@ -125,7 +130,7 @@ bool CZMQPublishHashBlockNotifier::NotifyBlock(const CBlockIndex *pindex)
     char data[32];
     for (unsigned int i = 0; i < 32; i++)
         data[31 - i] = hash.begin()[i];
-    int rc = zmq_send_multipart(psocket, "hashblock", 9, data, 32, 0);
+    int rc = zmq_send_multipart(psocket, MSG_HASHBLOCK, 9, data, 32, 0);
     return rc == 0;
 }
 
@@ -136,7 +141,7 @@ bool CZMQPublishHashTransactionNotifier::NotifyTransaction(const CTransaction &t
     char data[32];
     for (unsigned int i = 0; i < 32; i++)
         data[31 - i] = hash.begin()[i];
-    int rc = zmq_send_multipart(psocket, "hashtx", 6, data, 32, 0);
+    int rc = zmq_send_multipart(psocket, MSG_HASHTX, 6, data, 32, 0);
     return rc == 0;
 }
 
@@ -158,7 +163,7 @@ bool CZMQPublishRawBlockNotifier::NotifyBlock(const CBlockIndex *pindex)
         ss << block;
     }
 
-    int rc = zmq_send_multipart(psocket, "rawblock", 8, &(*ss.begin()), ss.size(), 0);
+    int rc = zmq_send_multipart(psocket, MSG_RAWBLOCK, 8, &(*ss.begin()), ss.size(), 0);
     return rc == 0;
 }
 
@@ -168,6 +173,6 @@ bool CZMQPublishRawTransactionNotifier::NotifyTransaction(const CTransaction &tr
     LogPrint("zmq", "zmq: Publish rawtx %s\n", hash.GetHex());
     CDataStream ss(SER_NETWORK, PROTOCOL_VERSION);
     ss << transaction;
-    int rc = zmq_send_multipart(psocket, "rawtx", 5, &(*ss.begin()), ss.size(), 0);
+    int rc = zmq_send_multipart(psocket, MSG_RAWTX, 5, &(*ss.begin()), ss.size(), 0);
     return rc == 0;
 }

From 41e835dd50d358c127bab17a1f2872471dbdfe9c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Barbosa?= <joao@uphold.com>
Date: Wed, 30 Mar 2016 00:59:29 +0100
Subject: [PATCH 0147/1802] Add strict flag to RPCTypeCheckObj

Strict flag forces type check on all object keys.
---
 src/rpc/server.cpp | 15 ++++++++++++++-
 src/rpc/server.h   |  2 +-
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/rpc/server.cpp b/src/rpc/server.cpp
index 8326fe14d2150..d06a9142b6819 100644
--- a/src/rpc/server.cpp
+++ b/src/rpc/server.cpp
@@ -89,7 +89,8 @@ void RPCTypeCheck(const UniValue& params,
 
 void RPCTypeCheckObj(const UniValue& o,
                   const map<string, UniValue::VType>& typesExpected,
-                  bool fAllowNull)
+                  bool fAllowNull,
+                  bool fStrict)
 {
     BOOST_FOREACH(const PAIRTYPE(string, UniValue::VType)& t, typesExpected)
     {
@@ -104,6 +105,18 @@ void RPCTypeCheckObj(const UniValue& o,
             throw JSONRPCError(RPC_TYPE_ERROR, err);
         }
     }
+
+    if (fStrict)
+    {
+        BOOST_FOREACH(const string& k, o.getKeys())
+        {
+            if (typesExpected.count(k) == 0)
+            {
+                string err = strprintf("Unexpected key %s", k);
+                throw JSONRPCError(RPC_TYPE_ERROR, err);
+            }
+        }
+    }
 }
 
 CAmount AmountFromValue(const UniValue& value)
diff --git a/src/rpc/server.h b/src/rpc/server.h
index a7ed710ce60ad..b4713366172ae 100644
--- a/src/rpc/server.h
+++ b/src/rpc/server.h
@@ -70,7 +70,7 @@ void RPCTypeCheck(const UniValue& params,
   Use like: RPCTypeCheckObj(object, boost::assign::map_list_of("name", str_type)("value", int_type));
 */
 void RPCTypeCheckObj(const UniValue& o,
-                  const std::map<std::string, UniValue::VType>& typesExpected, bool fAllowNull=false);
+                  const std::map<std::string, UniValue::VType>& typesExpected, bool fAllowNull=false, bool fStrict=false);
 
 /** Opaque base class for timers returned by NewTimerFunc.
  * This provides no methods at the moment, but makes sure that delete

From af4fe7fd126eff2dd1942276ea91c8ab9dd717c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Barbosa?= <joao@uphold.com>
Date: Wed, 30 Mar 2016 02:04:22 +0100
Subject: [PATCH 0148/1802] Add change options to fundrawtransaction

---
 qa/rpc-tests/fundrawtransaction.py | 80 +++++++++++++++++++++++++++++-
 src/wallet/rpcwallet.cpp           | 58 ++++++++++++++++++----
 src/wallet/wallet.cpp              | 34 +++++++++----
 src/wallet/wallet.h                |  5 +-
 4 files changed, 153 insertions(+), 24 deletions(-)

diff --git a/qa/rpc-tests/fundrawtransaction.py b/qa/rpc-tests/fundrawtransaction.py
index 4492ea398f4ba..496c7fe8b0ed0 100755
--- a/qa/rpc-tests/fundrawtransaction.py
+++ b/qa/rpc-tests/fundrawtransaction.py
@@ -177,6 +177,83 @@ def run_test(self):
         assert_equal(fee + totalOut, utx['amount']) #compare vin total and totalout+fee
 
 
+        ####################################################
+        # test a fundrawtransaction with an invalid option #
+        ####################################################
+        utx = False
+        listunspent = self.nodes[2].listunspent()
+        for aUtx in listunspent:
+            if aUtx['amount'] == 5.0:
+                utx = aUtx
+                break
+
+        assert_equal(utx!=False, True)
+
+        inputs  = [ {'txid' : utx['txid'], 'vout' : utx['vout']} ]
+        outputs = { self.nodes[0].getnewaddress() : Decimal(4.0) }
+        rawtx   = self.nodes[2].createrawtransaction(inputs, outputs)
+        dec_tx  = self.nodes[2].decoderawtransaction(rawtx)
+        assert_equal(utx['txid'], dec_tx['vin'][0]['txid'])
+
+        try:
+            self.nodes[2].fundrawtransaction(rawtx, {'foo': 'bar'})
+            raise AssertionError("Accepted invalid option foo")
+        except JSONRPCException,e:
+            assert("Unexpected key foo" in e.error['message'])
+
+
+        ############################################################
+        # test a fundrawtransaction with an invalid change address #
+        ############################################################
+        utx = False
+        listunspent = self.nodes[2].listunspent()
+        for aUtx in listunspent:
+            if aUtx['amount'] == 5.0:
+                utx = aUtx
+                break
+
+        assert_equal(utx!=False, True)
+
+        inputs  = [ {'txid' : utx['txid'], 'vout' : utx['vout']} ]
+        outputs = { self.nodes[0].getnewaddress() : Decimal(4.0) }
+        rawtx   = self.nodes[2].createrawtransaction(inputs, outputs)
+        dec_tx  = self.nodes[2].decoderawtransaction(rawtx)
+        assert_equal(utx['txid'], dec_tx['vin'][0]['txid'])
+
+        try:
+            self.nodes[2].fundrawtransaction(rawtx, {'changeAddress': 'foobar'})
+            raise AssertionError("Accepted invalid bitcoin address")
+        except JSONRPCException,e:
+            assert("changeAddress must be a valid bitcoin address" in e.error['message'])
+
+
+
+        ############################################################
+        # test a fundrawtransaction with a provided change address #
+        ############################################################
+        utx = False
+        listunspent = self.nodes[2].listunspent()
+        for aUtx in listunspent:
+            if aUtx['amount'] == 5.0:
+                utx = aUtx
+                break
+
+        assert_equal(utx!=False, True)
+
+        inputs  = [ {'txid' : utx['txid'], 'vout' : utx['vout']} ]
+        outputs = { self.nodes[0].getnewaddress() : Decimal(4.0) }
+        rawtx   = self.nodes[2].createrawtransaction(inputs, outputs)
+        dec_tx  = self.nodes[2].decoderawtransaction(rawtx)
+        assert_equal(utx['txid'], dec_tx['vin'][0]['txid'])
+
+        change = self.nodes[2].getnewaddress()
+        rawtxfund = self.nodes[2].fundrawtransaction(rawtx, {'changeAddress': change, 'changePosition': 0})
+        dec_tx  = self.nodes[2].decoderawtransaction(rawtxfund['hex'])
+        out = dec_tx['vout'][0];
+        assert_equal(change, out['scriptPubKey']['addresses'][0])
+
+
+
         #########################################################################
         # test a fundrawtransaction with a VIN smaller than the required amount #
         #########################################################################
@@ -568,7 +645,7 @@ def run_test(self):
         outputs = {self.nodes[2].getnewaddress() : watchonly_amount / 2}
         rawtx = self.nodes[3].createrawtransaction(inputs, outputs)
 
-        result = self.nodes[3].fundrawtransaction(rawtx, True)
+        result = self.nodes[3].fundrawtransaction(rawtx, {'includeWatching': True })
         res_dec = self.nodes[0].decoderawtransaction(result["hex"])
         assert_equal(len(res_dec["vin"]), 1)
         assert_equal(res_dec["vin"][0]["txid"], watchonly_txid)
@@ -584,6 +661,7 @@ def run_test(self):
         outputs = {self.nodes[2].getnewaddress() : watchonly_amount}
         rawtx = self.nodes[3].createrawtransaction(inputs, outputs)
 
+        # Backward compatibility test (2nd param is includeWatching)
         result = self.nodes[3].fundrawtransaction(rawtx, True)
         res_dec = self.nodes[0].decoderawtransaction(result["hex"])
         assert_equal(len(res_dec["vin"]), 2)
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index 5511e9d3aba41..5cd57fc385114 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -2437,7 +2437,7 @@ UniValue fundrawtransaction(const UniValue& params, bool fHelp)
 
     if (fHelp || params.size() < 1 || params.size() > 2)
         throw runtime_error(
-                            "fundrawtransaction \"hexstring\" includeWatching\n"
+                            "fundrawtransaction \"hexstring\" ( options )\n"
                             "\nAdd inputs to a transaction until it has enough in value to meet its out value.\n"
                             "This will not modify existing inputs, and will add one change output to the outputs.\n"
                             "Note that inputs which were signed may need to be resigned after completion since in/outputs have been added.\n"
@@ -2447,8 +2447,14 @@ UniValue fundrawtransaction(const UniValue& params, bool fHelp)
                             "in the wallet using importaddress or addmultisigaddress (to calculate fees).\n"
                             "Only pay-to-pubkey, multisig, and P2SH versions thereof are currently supported for watch-only\n"
                             "\nArguments:\n"
-                            "1. \"hexstring\"     (string, required) The hex string of the raw transaction\n"
-                            "2. includeWatching (boolean, optional, default false) Also select inputs which are watch only\n"
+                            "1. \"hexstring\"           (string, required) The hex string of the raw transaction\n"
+                            "2. options               (object, optional)\n"
+                            "   {\n"
+                            "     \"changeAddress\"     (string, optional, default pool address) The bitcoin address to receive the change\n"
+                            "     \"changePosition\"    (numeric, optional, default random) The index of the change output\n"
+                            "     \"includeWatching\"   (boolean, optional, default false) Also select inputs which are watch only\n"
+                            "   }\n"
+                            "                         for backward compatibility: passing in a true instzead of an object will result in {\"includeWatching\":true}\n"
                             "\nResult:\n"
                             "{\n"
                             "  \"hex\":       \"value\", (string)  The resulting raw transaction (hex-encoded string)\n"
@@ -2467,7 +2473,40 @@ UniValue fundrawtransaction(const UniValue& params, bool fHelp)
                             + HelpExampleCli("sendrawtransaction", "\"signedtransactionhex\"")
                             );
 
-    RPCTypeCheck(params, boost::assign::list_of(UniValue::VSTR)(UniValue::VBOOL));
+    RPCTypeCheck(params, boost::assign::list_of(UniValue::VSTR));
+
+    CTxDestination changeAddress = CNoDestination();
+    int changePosition = -1;
+    bool includeWatching = false;
+
+    if (params.size() > 1) {
+      if (params[1].type() == UniValue::VBOOL) {
+        // backward compatibility bool only fallback
+        includeWatching = params[1].get_bool();
+      }
+      else {
+        RPCTypeCheck(params, boost::assign::list_of(UniValue::VSTR)(UniValue::VOBJ));
+
+        UniValue options = params[1];
+
+        RPCTypeCheckObj(options, boost::assign::map_list_of("changeAddress", UniValue::VSTR)("changePosition", UniValue::VNUM)("includeWatching", UniValue::VBOOL), true, true);
+
+        if (options.exists("changeAddress")) {
+            CBitcoinAddress address(options["changeAddress"].get_str());
+
+            if (!address.IsValid())
+                throw JSONRPCError(RPC_INVALID_PARAMETER, "changeAddress must be a valid bitcoin address");
+
+            changeAddress = address.Get();
+        }
+
+        if (options.exists("changePosition"))
+            changePosition = options["changePosition"].get_int();
+
+        if (options.exists("includeWatching"))
+            includeWatching = options["includeWatching"].get_bool();
+      }
+    }
 
     // parse hex string from parameter
     CTransaction origTx;
@@ -2477,20 +2516,19 @@ UniValue fundrawtransaction(const UniValue& params, bool fHelp)
     if (origTx.vout.size() == 0)
         throw JSONRPCError(RPC_INVALID_PARAMETER, "TX must have at least one output");
 
-    bool includeWatching = false;
-    if (params.size() > 1)
-        includeWatching = params[1].get_bool();
+    if (changePosition != -1 && (changePosition < 0 || changePosition > origTx.vout.size()))
+        throw JSONRPCError(RPC_INVALID_PARAMETER, "changePosition out of bounds");
 
     CMutableTransaction tx(origTx);
     CAmount nFee;
     string strFailReason;
-    int nChangePos = -1;
-    if(!pwalletMain->FundTransaction(tx, nFee, nChangePos, strFailReason, includeWatching))
+
+    if(!pwalletMain->FundTransaction(tx, nFee, changePosition, strFailReason, includeWatching, changeAddress))
         throw JSONRPCError(RPC_INTERNAL_ERROR, strFailReason);
 
     UniValue result(UniValue::VOBJ);
     result.push_back(Pair("hex", EncodeHexTx(tx)));
-    result.push_back(Pair("changepos", nChangePos));
+    result.push_back(Pair("changepos", changePosition));
     result.push_back(Pair("fee", ValueFromAmount(nFee)));
 
     return result;
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index e8c946671044c..ee92552168b43 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -1932,7 +1932,7 @@ bool CWallet::SelectCoins(const vector<COutput>& vAvailableCoins, const CAmount&
     return res;
 }
 
-bool CWallet::FundTransaction(CMutableTransaction& tx, CAmount &nFeeRet, int& nChangePosRet, std::string& strFailReason, bool includeWatching)
+bool CWallet::FundTransaction(CMutableTransaction& tx, CAmount& nFeeRet, int& nChangePosInOut, std::string& strFailReason, bool includeWatching, const CTxDestination& destChange)
 {
     vector<CRecipient> vecSend;
 
@@ -1944,6 +1944,7 @@ bool CWallet::FundTransaction(CMutableTransaction& tx, CAmount &nFeeRet, int& nC
     }
 
     CCoinControl coinControl;
+    coinControl.destChange = destChange;
     coinControl.fAllowOtherInputs = true;
     coinControl.fAllowWatchOnly = includeWatching;
     BOOST_FOREACH(const CTxIn& txin, tx.vin)
@@ -1951,11 +1952,11 @@ bool CWallet::FundTransaction(CMutableTransaction& tx, CAmount &nFeeRet, int& nC
 
     CReserveKey reservekey(this);
     CWalletTx wtx;
-    if (!CreateTransaction(vecSend, wtx, reservekey, nFeeRet, nChangePosRet, strFailReason, &coinControl, false))
+    if (!CreateTransaction(vecSend, wtx, reservekey, nFeeRet, nChangePosInOut, strFailReason, &coinControl, false))
         return false;
 
-    if (nChangePosRet != -1)
-        tx.vout.insert(tx.vout.begin() + nChangePosRet, wtx.vout[nChangePosRet]);
+    if (nChangePosInOut != -1)
+        tx.vout.insert(tx.vout.begin() + nChangePosInOut, wtx.vout[nChangePosInOut]);
 
     // Add new txins (keeping original txin scriptSig/order)
     BOOST_FOREACH(const CTxIn& txin, wtx.vin)
@@ -1968,9 +1969,10 @@ bool CWallet::FundTransaction(CMutableTransaction& tx, CAmount &nFeeRet, int& nC
 }
 
 bool CWallet::CreateTransaction(const vector<CRecipient>& vecSend, CWalletTx& wtxNew, CReserveKey& reservekey, CAmount& nFeeRet,
-                                int& nChangePosRet, std::string& strFailReason, const CCoinControl* coinControl, bool sign)
+                                int& nChangePosInOut, std::string& strFailReason, const CCoinControl* coinControl, bool sign)
 {
     CAmount nValue = 0;
+    int nChangePosRequest = nChangePosInOut;
     unsigned int nSubtractFeeFromAmount = 0;
     BOOST_FOREACH (const CRecipient& recipient, vecSend)
     {
@@ -2036,10 +2038,10 @@ bool CWallet::CreateTransaction(const vector<CRecipient>& vecSend, CWalletTx& wt
             // Start with no fee and loop until there is enough fee
             while (true)
             {
+                nChangePosInOut = nChangePosRequest;
                 txNew.vin.clear();
                 txNew.vout.clear();
                 wtxNew.fFromMe = true;
-                nChangePosRet = -1;
                 bool fFirst = true;
 
                 CAmount nValueToSelect = nValue;
@@ -2159,14 +2161,24 @@ bool CWallet::CreateTransaction(const vector<CRecipient>& vecSend, CWalletTx& wt
                     // add the dust to the fee.
                     if (newTxOut.IsDust(::minRelayTxFee))
                     {
+                        nChangePosInOut = -1;
                         nFeeRet += nChange;
                         reservekey.ReturnKey();
                     }
                     else
                     {
-                        // Insert change txn at random position:
-                        nChangePosRet = GetRandInt(txNew.vout.size()+1);
-                        vector<CTxOut>::iterator position = txNew.vout.begin()+nChangePosRet;
+                        if (nChangePosInOut == -1)
+                        {
+                            // Insert change txn at random position:
+                            nChangePosInOut = GetRandInt(txNew.vout.size()+1);
+                        }
+                        else if (nChangePosInOut > txNew.vout.size())
+                        {
+                            strFailReason = _("Change index out of range");
+                            return false;
+                        }
+
+                        vector<CTxOut>::iterator position = txNew.vout.begin()+nChangePosInOut;
                         txNew.vout.insert(position, newTxOut);
                     }
                 }
@@ -2842,13 +2854,13 @@ void CWallet::GetScriptForMining(boost::shared_ptr<CReserveScript> &script)
     script->reserveScript = CScript() << ToByteVector(pubkey) << OP_CHECKSIG;
 }
 
-void CWallet::LockCoin(COutPoint& output)
+void CWallet::LockCoin(const COutPoint& output)
 {
     AssertLockHeld(cs_wallet); // setLockedCoins
     setLockedCoins.insert(output);
 }
 
-void CWallet::UnlockCoin(COutPoint& output)
+void CWallet::UnlockCoin(const COutPoint& output)
 {
     AssertLockHeld(cs_wallet); // setLockedCoins
     setLockedCoins.erase(output);
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
index 96d5d4e1e015b..b0781e917b917 100644
--- a/src/wallet/wallet.h
+++ b/src/wallet/wallet.h
@@ -739,13 +739,14 @@ class CWallet : public CCryptoKeyStore, public CValidationInterface
      * Insert additional inputs into the transaction by
      * calling CreateTransaction();
      */
-    bool FundTransaction(CMutableTransaction& tx, CAmount& nFeeRet, int& nChangePosRet, std::string& strFailReason, bool includeWatching);
+    bool FundTransaction(CMutableTransaction& tx, CAmount& nFeeRet, int& nChangePosInOut, std::string& strFailReason, bool includeWatching, const CTxDestination& destChange = CNoDestination());
 
     /**
      * Create a new transaction paying the recipients with a set of coins
      * selected by SelectCoins(); Also create the change output, when needed
+     * @note passing nChangePosInOut as -1 will result in setting a random position
      */
-    bool CreateTransaction(const std::vector<CRecipient>& vecSend, CWalletTx& wtxNew, CReserveKey& reservekey, CAmount& nFeeRet, int& nChangePosRet,
+    bool CreateTransaction(const std::vector<CRecipient>& vecSend, CWalletTx& wtxNew, CReserveKey& reservekey, CAmount& nFeeRet, int& nChangePosInOut,
                            std::string& strFailReason, const CCoinControl *coinControl = NULL, bool sign = true);
     bool CommitTransaction(CWalletTx& wtxNew, CReserveKey& reservekey);
 

From f2d0944eb372838e05c666ce9b3df119d7da5594 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Barbosa?= <joao@uphold.com>
Date: Wed, 6 Apr 2016 15:56:14 +0100
Subject: [PATCH 0149/1802] Add lockUnspents option to fundrawtransaction

---
 src/wallet/rpcwallet.cpp |  9 +++++++--
 src/wallet/wallet.cpp    | 10 +++++++++-
 src/wallet/wallet.h      |  6 +++---
 3 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index 5cd57fc385114..3078cebd486c3 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -2453,6 +2453,7 @@ UniValue fundrawtransaction(const UniValue& params, bool fHelp)
                             "     \"changeAddress\"     (string, optional, default pool address) The bitcoin address to receive the change\n"
                             "     \"changePosition\"    (numeric, optional, default random) The index of the change output\n"
                             "     \"includeWatching\"   (boolean, optional, default false) Also select inputs which are watch only\n"
+                            "     \"lockUnspents\"      (boolean, optional, default false) Lock selected unspent outputs\n"
                             "   }\n"
                             "                         for backward compatibility: passing in a true instzead of an object will result in {\"includeWatching\":true}\n"
                             "\nResult:\n"
@@ -2478,6 +2479,7 @@ UniValue fundrawtransaction(const UniValue& params, bool fHelp)
     CTxDestination changeAddress = CNoDestination();
     int changePosition = -1;
     bool includeWatching = false;
+    bool lockUnspents = false;
 
     if (params.size() > 1) {
       if (params[1].type() == UniValue::VBOOL) {
@@ -2489,7 +2491,7 @@ UniValue fundrawtransaction(const UniValue& params, bool fHelp)
 
         UniValue options = params[1];
 
-        RPCTypeCheckObj(options, boost::assign::map_list_of("changeAddress", UniValue::VSTR)("changePosition", UniValue::VNUM)("includeWatching", UniValue::VBOOL), true, true);
+        RPCTypeCheckObj(options, boost::assign::map_list_of("changeAddress", UniValue::VSTR)("changePosition", UniValue::VNUM)("includeWatching", UniValue::VBOOL)("lockUnspents", UniValue::VBOOL), true, true);
 
         if (options.exists("changeAddress")) {
             CBitcoinAddress address(options["changeAddress"].get_str());
@@ -2505,6 +2507,9 @@ UniValue fundrawtransaction(const UniValue& params, bool fHelp)
 
         if (options.exists("includeWatching"))
             includeWatching = options["includeWatching"].get_bool();
+
+        if (options.exists("lockUnspents"))
+            lockUnspents = options["lockUnspents"].get_bool();
       }
     }
 
@@ -2523,7 +2528,7 @@ UniValue fundrawtransaction(const UniValue& params, bool fHelp)
     CAmount nFee;
     string strFailReason;
 
-    if(!pwalletMain->FundTransaction(tx, nFee, changePosition, strFailReason, includeWatching, changeAddress))
+    if(!pwalletMain->FundTransaction(tx, nFee, changePosition, strFailReason, includeWatching, lockUnspents, changeAddress))
         throw JSONRPCError(RPC_INTERNAL_ERROR, strFailReason);
 
     UniValue result(UniValue::VOBJ);
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index ee92552168b43..8161c659ab369 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -1932,7 +1932,7 @@ bool CWallet::SelectCoins(const vector<COutput>& vAvailableCoins, const CAmount&
     return res;
 }
 
-bool CWallet::FundTransaction(CMutableTransaction& tx, CAmount& nFeeRet, int& nChangePosInOut, std::string& strFailReason, bool includeWatching, const CTxDestination& destChange)
+bool CWallet::FundTransaction(CMutableTransaction& tx, CAmount& nFeeRet, int& nChangePosInOut, std::string& strFailReason, bool includeWatching, bool lockUnspents, const CTxDestination& destChange)
 {
     vector<CRecipient> vecSend;
 
@@ -1962,7 +1962,15 @@ bool CWallet::FundTransaction(CMutableTransaction& tx, CAmount& nFeeRet, int& nC
     BOOST_FOREACH(const CTxIn& txin, wtx.vin)
     {
         if (!coinControl.IsSelected(txin.prevout))
+        {
             tx.vin.push_back(txin);
+
+            if (lockUnspents)
+            {
+              LOCK2(cs_main, cs_wallet);
+              LockCoin(txin.prevout);
+            }
+        }
     }
 
     return true;
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
index b0781e917b917..aab4b217caa87 100644
--- a/src/wallet/wallet.h
+++ b/src/wallet/wallet.h
@@ -667,8 +667,8 @@ class CWallet : public CCryptoKeyStore, public CValidationInterface
     bool IsSpent(const uint256& hash, unsigned int n) const;
 
     bool IsLockedCoin(uint256 hash, unsigned int n) const;
-    void LockCoin(COutPoint& output);
-    void UnlockCoin(COutPoint& output);
+    void LockCoin(const COutPoint& output);
+    void UnlockCoin(const COutPoint& output);
     void UnlockAllCoins();
     void ListLockedCoins(std::vector<COutPoint>& vOutpts);
 
@@ -739,7 +739,7 @@ class CWallet : public CCryptoKeyStore, public CValidationInterface
      * Insert additional inputs into the transaction by
      * calling CreateTransaction();
      */
-    bool FundTransaction(CMutableTransaction& tx, CAmount& nFeeRet, int& nChangePosInOut, std::string& strFailReason, bool includeWatching, const CTxDestination& destChange = CNoDestination());
+    bool FundTransaction(CMutableTransaction& tx, CAmount& nFeeRet, int& nChangePosInOut, std::string& strFailReason, bool includeWatching, bool lockUnspents, const CTxDestination& destChange = CNoDestination());
 
     /**
      * Create a new transaction paying the recipients with a set of coins

From 509cb006d514cece5ab7680094f033c8dc8a2318 Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Mon, 28 Mar 2016 18:18:30 +0200
Subject: [PATCH 0150/1802] txdb: Add Cursor() method to CCoinsView to iterate
 over UTXO set

Add a method Cursor() to CCoinsView that returns a cursor which can be
used to iterate over the whole UTXO set.

- rpc: Change gettxoutsetinfo to use new Cursor method

- txdb: Remove GetStats method - Now that GetStats is implemented in
  terms of Cursor, remove it.
---
 src/coins.cpp            |  8 +++--
 src/coins.h              | 33 ++++++++++-------
 src/rpc/blockchain.cpp   | 58 +++++++++++++++++++++++++++++-
 src/test/coins_tests.cpp |  2 --
 src/txdb.cpp             | 78 ++++++++++++++++++++--------------------
 src/txdb.h               | 26 +++++++++++++-
 6 files changed, 148 insertions(+), 57 deletions(-)

diff --git a/src/coins.cpp b/src/coins.cpp
index 877fb8b26c4f6..1c329740b45f6 100644
--- a/src/coins.cpp
+++ b/src/coins.cpp
@@ -45,7 +45,7 @@ bool CCoinsView::GetCoins(const uint256 &txid, CCoins &coins) const { return fal
 bool CCoinsView::HaveCoins(const uint256 &txid) const { return false; }
 uint256 CCoinsView::GetBestBlock() const { return uint256(); }
 bool CCoinsView::BatchWrite(CCoinsMap &mapCoins, const uint256 &hashBlock) { return false; }
-bool CCoinsView::GetStats(CCoinsStats &stats) const { return false; }
+CCoinsViewCursor *CCoinsView::Cursor() const { return 0; }
 
 
 CCoinsViewBacked::CCoinsViewBacked(CCoinsView *viewIn) : base(viewIn) { }
@@ -54,7 +54,7 @@ bool CCoinsViewBacked::HaveCoins(const uint256 &txid) const { return base->HaveC
 uint256 CCoinsViewBacked::GetBestBlock() const { return base->GetBestBlock(); }
 void CCoinsViewBacked::SetBackend(CCoinsView &viewIn) { base = &viewIn; }
 bool CCoinsViewBacked::BatchWrite(CCoinsMap &mapCoins, const uint256 &hashBlock) { return base->BatchWrite(mapCoins, hashBlock); }
-bool CCoinsViewBacked::GetStats(CCoinsStats &stats) const { return base->GetStats(stats); }
+CCoinsViewCursor *CCoinsViewBacked::Cursor() const { return base->Cursor(); }
 
 CCoinsKeyHasher::CCoinsKeyHasher() : salt(GetRandHash()) {}
 
@@ -300,3 +300,7 @@ CCoinsModifier::~CCoinsModifier()
         cache.cachedCoinsUsage += it->second.coins.DynamicMemoryUsage();
     }
 }
+
+CCoinsViewCursor::~CCoinsViewCursor()
+{
+}
diff --git a/src/coins.h b/src/coins.h
index d297cae1aa3c5..d72f8854731eb 100644
--- a/src/coins.h
+++ b/src/coins.h
@@ -297,19 +297,26 @@ struct CCoinsCacheEntry
 
 typedef boost::unordered_map<uint256, CCoinsCacheEntry, CCoinsKeyHasher> CCoinsMap;
 
-struct CCoinsStats
+/** Cursor for iterating over CoinsView state */
+class CCoinsViewCursor
 {
-    int nHeight;
-    uint256 hashBlock;
-    uint64_t nTransactions;
-    uint64_t nTransactionOutputs;
-    uint64_t nSerializedSize;
-    uint256 hashSerialized;
-    CAmount nTotalAmount;
+public:
+    CCoinsViewCursor(const uint256 &hashBlockIn): hashBlock(hashBlockIn) {}
+    virtual ~CCoinsViewCursor();
 
-    CCoinsStats() : nHeight(0), nTransactions(0), nTransactionOutputs(0), nSerializedSize(0), nTotalAmount(0) {}
-};
+    virtual bool GetKey(uint256 &key) const = 0;
+    virtual bool GetValue(CCoins &coins) const = 0;
+    /* Don't care about GetKeySize here */
+    virtual unsigned int GetValueSize() const = 0;
 
+    virtual bool Valid() const = 0;
+    virtual void Next() = 0;
+
+    //! Get best block at the time this cursor was created
+    const uint256 &GetBestBlock() const { return hashBlock; }
+private:
+    uint256 hashBlock;
+};
 
 /** Abstract view on the open txout dataset. */
 class CCoinsView
@@ -329,8 +336,8 @@ class CCoinsView
     //! The passed mapCoins can be modified.
     virtual bool BatchWrite(CCoinsMap &mapCoins, const uint256 &hashBlock);
 
-    //! Calculate statistics about the unspent transaction output set
-    virtual bool GetStats(CCoinsStats &stats) const;
+    //! Get a cursor to iterate over the whole state
+    virtual CCoinsViewCursor *Cursor() const;
 
     //! As we use CCoinsViews polymorphically, have a virtual destructor
     virtual ~CCoinsView() {}
@@ -350,7 +357,7 @@ class CCoinsViewBacked : public CCoinsView
     uint256 GetBestBlock() const;
     void SetBackend(CCoinsView &viewIn);
     bool BatchWrite(CCoinsMap &mapCoins, const uint256 &hashBlock);
-    bool GetStats(CCoinsStats &stats) const;
+    CCoinsViewCursor *Cursor() const;
 };
 
 
diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp
index 34637b9f7e398..8dbfbd5ff8d8b 100644
--- a/src/rpc/blockchain.cpp
+++ b/src/rpc/blockchain.cpp
@@ -18,11 +18,14 @@
 #include "txmempool.h"
 #include "util.h"
 #include "utilstrencodings.h"
+#include "hash.h"
 
 #include <stdint.h>
 
 #include <univalue.h>
 
+#include <boost/thread/thread.hpp> // boost::thread::interrupt
+
 using namespace std;
 
 extern void TxToJSON(const CTransaction& tx, const uint256 hashBlock, UniValue& entry);
@@ -432,6 +435,59 @@ UniValue getblock(const UniValue& params, bool fHelp)
     return blockToJSON(block, pblockindex);
 }
 
+struct CCoinsStats
+{
+    int nHeight;
+    uint256 hashBlock;
+    uint64_t nTransactions;
+    uint64_t nTransactionOutputs;
+    uint64_t nSerializedSize;
+    uint256 hashSerialized;
+    CAmount nTotalAmount;
+
+    CCoinsStats() : nHeight(0), nTransactions(0), nTransactionOutputs(0), nSerializedSize(0), nTotalAmount(0) {}
+};
+
+//! Calculate statistics about the unspent transaction output set
+static bool GetUTXOStats(CCoinsView *view, CCoinsStats &stats)
+{
+    boost::scoped_ptr<CCoinsViewCursor> pcursor(view->Cursor());
+
+    CHashWriter ss(SER_GETHASH, PROTOCOL_VERSION);
+    stats.hashBlock = pcursor->GetBestBlock();
+    {
+        LOCK(cs_main);
+        stats.nHeight = mapBlockIndex.find(stats.hashBlock)->second->nHeight;
+    }
+    ss << stats.hashBlock;
+    CAmount nTotalAmount = 0;
+    while (pcursor->Valid()) {
+        boost::this_thread::interruption_point();
+        uint256 key;
+        CCoins coins;
+        if (pcursor->GetKey(key) && pcursor->GetValue(coins)) {
+            stats.nTransactions++;
+            for (unsigned int i=0; i<coins.vout.size(); i++) {
+                const CTxOut &out = coins.vout[i];
+                if (!out.IsNull()) {
+                    stats.nTransactionOutputs++;
+                    ss << VARINT(i+1);
+                    ss << out;
+                    nTotalAmount += out.nValue;
+                }
+            }
+            stats.nSerializedSize += 32 + pcursor->GetValueSize();
+            ss << VARINT(0);
+        } else {
+            return error("%s: unable to read value", __func__);
+        }
+        pcursor->Next();
+    }
+    stats.hashSerialized = ss.GetHash();
+    stats.nTotalAmount = nTotalAmount;
+    return true;
+}
+
 UniValue gettxoutsetinfo(const UniValue& params, bool fHelp)
 {
     if (fHelp || params.size() != 0)
@@ -458,7 +514,7 @@ UniValue gettxoutsetinfo(const UniValue& params, bool fHelp)
 
     CCoinsStats stats;
     FlushStateToDisk();
-    if (pcoinsTip->GetStats(stats)) {
+    if (GetUTXOStats(pcoinsTip, stats)) {
         ret.push_back(Pair("height", (int64_t)stats.nHeight));
         ret.push_back(Pair("bestblock", stats.hashBlock.GetHex()));
         ret.push_back(Pair("transactions", (int64_t)stats.nTransactions));
diff --git a/src/test/coins_tests.cpp b/src/test/coins_tests.cpp
index 3fe536f91aec8..48e3c8ed8e07f 100644
--- a/src/test/coins_tests.cpp
+++ b/src/test/coins_tests.cpp
@@ -61,8 +61,6 @@ class CCoinsViewTest : public CCoinsView
             hashBestBlock_ = hashBlock;
         return true;
     }
-
-    bool GetStats(CCoinsStats& stats) const { return false; }
 };
 
 class CCoinsViewCacheTest : public CCoinsViewCache
diff --git a/src/txdb.cpp b/src/txdb.cpp
index f99e11f26e3f4..be86cceeb36a7 100644
--- a/src/txdb.cpp
+++ b/src/txdb.cpp
@@ -94,50 +94,52 @@ bool CBlockTreeDB::ReadLastBlockFile(int &nFile) {
     return Read(DB_LAST_BLOCK, nFile);
 }
 
-bool CCoinsViewDB::GetStats(CCoinsStats &stats) const {
+CCoinsViewCursor *CCoinsViewDB::Cursor() const
+{
+    CCoinsViewDBCursor *i = new CCoinsViewDBCursor(const_cast<CDBWrapper*>(&db)->NewIterator(), GetBestBlock());
     /* It seems that there are no "const iterators" for LevelDB.  Since we
        only need read operations on it, use a const-cast to get around
        that restriction.  */
-    boost::scoped_ptr<CDBIterator> pcursor(const_cast<CDBWrapper*>(&db)->NewIterator());
-    pcursor->Seek(DB_COINS);
+    i->pcursor->Seek(DB_COINS);
+    // Cache key of first record
+    i->pcursor->GetKey(i->keyTmp);
+    return i;
+}
 
-    CHashWriter ss(SER_GETHASH, PROTOCOL_VERSION);
-    stats.hashBlock = GetBestBlock();
-    ss << stats.hashBlock;
-    CAmount nTotalAmount = 0;
-    while (pcursor->Valid()) {
-        boost::this_thread::interruption_point();
-        std::pair<char, uint256> key;
-        CCoins coins;
-        if (pcursor->GetKey(key) && key.first == DB_COINS) {
-            if (pcursor->GetValue(coins)) {
-                stats.nTransactions++;
-                for (unsigned int i=0; i<coins.vout.size(); i++) {
-                    const CTxOut &out = coins.vout[i];
-                    if (!out.IsNull()) {
-                        stats.nTransactionOutputs++;
-                        ss << VARINT(i+1);
-                        ss << out;
-                        nTotalAmount += out.nValue;
-                    }
-                }
-                stats.nSerializedSize += 32 + pcursor->GetValueSize();
-                ss << VARINT(0);
-            } else {
-                return error("CCoinsViewDB::GetStats() : unable to read value");
-            }
-        } else {
-            break;
-        }
-        pcursor->Next();
+bool CCoinsViewDBCursor::GetKey(uint256 &key) const
+{
+    // Return cached key
+    if (keyTmp.first == DB_COINS) {
+        key = keyTmp.second;
+        return true;
     }
-    {
-        LOCK(cs_main);
-        stats.nHeight = mapBlockIndex.find(stats.hashBlock)->second->nHeight;
+    return false;
+}
+
+bool CCoinsViewDBCursor::GetValue(CCoins &coins) const
+{
+    return pcursor->GetValue(coins);
+}
+
+unsigned int CCoinsViewDBCursor::GetValueSize() const
+{
+    return pcursor->GetValueSize();
+}
+
+bool CCoinsViewDBCursor::Valid() const
+{
+    return keyTmp.first == DB_COINS;
+}
+
+void CCoinsViewDBCursor::Next()
+{
+    pcursor->Next();
+    if (pcursor->Valid()) {
+        bool ok = pcursor->GetKey(keyTmp);
+        assert(ok); // If GetKey fails here something must be wrong with underlying database, we cannot handle that here
+    } else {
+        keyTmp.first = 0; // Invalidate cached key after last record so that Valid() and GetKey() return false
     }
-    stats.hashSerialized = ss.GetHash();
-    stats.nTotalAmount = nTotalAmount;
-    return true;
 }
 
 bool CBlockTreeDB::WriteBatchSync(const std::vector<std::pair<int, const CBlockFileInfo*> >& fileInfo, int nLastFile, const std::vector<const CBlockIndex*>& blockinfo) {
diff --git a/src/txdb.h b/src/txdb.h
index 22e0c5704cb26..749802f0e5fd0 100644
--- a/src/txdb.h
+++ b/src/txdb.h
@@ -26,6 +26,8 @@ static const int64_t nMaxDbCache = sizeof(void*) > 4 ? 16384 : 1024;
 //! min. -dbcache in (MiB)
 static const int64_t nMinDbCache = 4;
 
+class CCoinsViewDBCursor;
+
 /** CCoinsView backed by the coin database (chainstate/) */
 class CCoinsViewDB : public CCoinsView
 {
@@ -38,7 +40,29 @@ class CCoinsViewDB : public CCoinsView
     bool HaveCoins(const uint256 &txid) const;
     uint256 GetBestBlock() const;
     bool BatchWrite(CCoinsMap &mapCoins, const uint256 &hashBlock);
-    bool GetStats(CCoinsStats &stats) const;
+    CCoinsViewCursor *Cursor() const;
+};
+
+/** Specialization of CCoinsViewCursor to iterate over a CCoinsViewDB */
+class CCoinsViewDBCursor: public CCoinsViewCursor
+{
+public:
+    ~CCoinsViewDBCursor() {}
+
+    bool GetKey(uint256 &key) const;
+    bool GetValue(CCoins &coins) const;
+    unsigned int GetValueSize() const;
+
+    bool Valid() const;
+    void Next();
+
+private:
+    CCoinsViewDBCursor(CDBIterator* pcursorIn, const uint256 &hashBlockIn):
+        CCoinsViewCursor(hashBlockIn), pcursor(pcursorIn) {}
+    boost::scoped_ptr<CDBIterator> pcursor;
+    std::pair<char, uint256> keyTmp;
+
+    friend class CCoinsViewDB;
 };
 
 /** Access to the block database (blocks/index/) */

From 9ad1a518574b9afed3e66a1e1658ead1d3d7ce54 Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Sat, 9 Apr 2016 07:39:35 +0200
Subject: [PATCH 0151/1802] crypto: bytes counts are 64 bit

Byte counts for SHA256, SHA512, SHA1 and RIPEMD160 must be 64 bits.
`size_t` has a different size per platform, causing divergent results
when hashing more than 4GB of data.
---
 src/crypto/ripemd160.h | 2 +-
 src/crypto/sha1.h      | 2 +-
 src/crypto/sha256.h    | 2 +-
 src/crypto/sha512.h    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/crypto/ripemd160.h b/src/crypto/ripemd160.h
index 687204fdae8b6..bd41f02508404 100644
--- a/src/crypto/ripemd160.h
+++ b/src/crypto/ripemd160.h
@@ -14,7 +14,7 @@ class CRIPEMD160
 private:
     uint32_t s[5];
     unsigned char buf[64];
-    size_t bytes;
+    uint64_t bytes;
 
 public:
     static const size_t OUTPUT_SIZE = 20;
diff --git a/src/crypto/sha1.h b/src/crypto/sha1.h
index 7b2a21bc6c6f6..8fb20810be66a 100644
--- a/src/crypto/sha1.h
+++ b/src/crypto/sha1.h
@@ -14,7 +14,7 @@ class CSHA1
 private:
     uint32_t s[5];
     unsigned char buf[64];
-    size_t bytes;
+    uint64_t bytes;
 
 public:
     static const size_t OUTPUT_SIZE = 20;
diff --git a/src/crypto/sha256.h b/src/crypto/sha256.h
index 85cf33739aec8..5b15b6a233b16 100644
--- a/src/crypto/sha256.h
+++ b/src/crypto/sha256.h
@@ -14,7 +14,7 @@ class CSHA256
 private:
     uint32_t s[8];
     unsigned char buf[64];
-    size_t bytes;
+    uint64_t bytes;
 
 public:
     static const size_t OUTPUT_SIZE = 32;
diff --git a/src/crypto/sha512.h b/src/crypto/sha512.h
index f1f17caf90ce4..614681fae2f11 100644
--- a/src/crypto/sha512.h
+++ b/src/crypto/sha512.h
@@ -14,7 +14,7 @@ class CSHA512
 private:
     uint64_t s[8];
     unsigned char buf[128];
-    size_t bytes;
+    uint64_t bytes;
 
 public:
     static const size_t OUTPUT_SIZE = 64;

From 99e70751f23aa59ac297f6746dd8f09a140d48ae Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Tue, 5 Apr 2016 15:14:48 +0200
Subject: [PATCH 0152/1802] =?UTF-8?q?Break=20circular=20dependency=20main?=
 =?UTF-8?q?=20=E2=86=94=20txdb?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Break the circular dependency between main and txdb by:

- Moving `CBlockFileInfo` from `main.h` to `chain.h`. I think this makes
  sense, as the other block-file stuff is there too.

- Moving `CDiskTxPos` from `main.h` to `txdb.h`. This type seems
  specific to txdb.

- Pass a functor `insertBlockIndex` to `LoadBlockIndexGuts`. This leaves
  it up to the caller how to insert block indices.
---
 src/chain.h  | 54 +++++++++++++++++++++++++++++++++++
 src/main.cpp |  2 +-
 src/main.h   | 79 ----------------------------------------------------
 src/txdb.cpp |  8 ++----
 src/txdb.h   | 33 +++++++++++++++++++---
 5 files changed, 87 insertions(+), 89 deletions(-)

diff --git a/src/chain.h b/src/chain.h
index 5b9605a80bdb3..e9da407e9917e 100644
--- a/src/chain.h
+++ b/src/chain.h
@@ -14,6 +14,60 @@
 
 #include <vector>
 
+class CBlockFileInfo
+{
+public:
+    unsigned int nBlocks;      //!< number of blocks stored in file
+    unsigned int nSize;        //!< number of used bytes of block file
+    unsigned int nUndoSize;    //!< number of used bytes in the undo file
+    unsigned int nHeightFirst; //!< lowest height of block in file
+    unsigned int nHeightLast;  //!< highest height of block in file
+    uint64_t nTimeFirst;       //!< earliest time of block in file
+    uint64_t nTimeLast;        //!< latest time of block in file
+
+    ADD_SERIALIZE_METHODS;
+
+    template <typename Stream, typename Operation>
+    inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) {
+        READWRITE(VARINT(nBlocks));
+        READWRITE(VARINT(nSize));
+        READWRITE(VARINT(nUndoSize));
+        READWRITE(VARINT(nHeightFirst));
+        READWRITE(VARINT(nHeightLast));
+        READWRITE(VARINT(nTimeFirst));
+        READWRITE(VARINT(nTimeLast));
+    }
+
+     void SetNull() {
+         nBlocks = 0;
+         nSize = 0;
+         nUndoSize = 0;
+         nHeightFirst = 0;
+         nHeightLast = 0;
+         nTimeFirst = 0;
+         nTimeLast = 0;
+     }
+
+     CBlockFileInfo() {
+         SetNull();
+     }
+
+     std::string ToString() const;
+
+     /** update statistics (does not update nSize) */
+     void AddBlock(unsigned int nHeightIn, uint64_t nTimeIn) {
+         if (nBlocks==0 || nHeightFirst > nHeightIn)
+             nHeightFirst = nHeightIn;
+         if (nBlocks==0 || nTimeFirst > nTimeIn)
+             nTimeFirst = nTimeIn;
+         nBlocks++;
+         if (nHeightIn > nHeightLast)
+             nHeightLast = nHeightIn;
+         if (nTimeIn > nTimeLast)
+             nTimeLast = nTimeIn;
+     }
+};
+
 struct CDiskBlockPos
 {
     int nFile;
diff --git a/src/main.cpp b/src/main.cpp
index a94d52f8954e8..2db726cb45dba 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -3706,7 +3706,7 @@ CBlockIndex * InsertBlockIndex(uint256 hash)
 bool static LoadBlockIndexDB()
 {
     const CChainParams& chainparams = Params();
-    if (!pblocktree->LoadBlockIndexGuts())
+    if (!pblocktree->LoadBlockIndexGuts(InsertBlockIndex))
         return false;
 
     boost::this_thread::interruption_point();
diff --git a/src/main.h b/src/main.h
index 0962f44e9439e..cd2009e28614c 100644
--- a/src/main.h
+++ b/src/main.h
@@ -307,30 +307,6 @@ struct CNodeStateStats {
     std::vector<int> vHeightInFlight;
 };
 
-struct CDiskTxPos : public CDiskBlockPos
-{
-    unsigned int nTxOffset; // after header
-
-    ADD_SERIALIZE_METHODS;
-
-    template <typename Stream, typename Operation>
-    inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) {
-        READWRITE(*(CDiskBlockPos*)this);
-        READWRITE(VARINT(nTxOffset));
-    }
-
-    CDiskTxPos(const CDiskBlockPos &blockIn, unsigned int nTxOffsetIn) : CDiskBlockPos(blockIn.nFile, blockIn.nPos), nTxOffset(nTxOffsetIn) {
-    }
-
-    CDiskTxPos() {
-        SetNull();
-    }
-
-    void SetNull() {
-        CDiskBlockPos::SetNull();
-        nTxOffset = 0;
-    }
-};
 
 
 /** 
@@ -469,61 +445,6 @@ bool DisconnectBlock(const CBlock& block, CValidationState& state, const CBlockI
 /** Check a block is completely valid from start to finish (only works on top of our current best block, with cs_main held) */
 bool TestBlockValidity(CValidationState& state, const CChainParams& chainparams, const CBlock& block, CBlockIndex* pindexPrev, bool fCheckPOW = true, bool fCheckMerkleRoot = true);
 
-
-class CBlockFileInfo
-{
-public:
-    unsigned int nBlocks;      //!< number of blocks stored in file
-    unsigned int nSize;        //!< number of used bytes of block file
-    unsigned int nUndoSize;    //!< number of used bytes in the undo file
-    unsigned int nHeightFirst; //!< lowest height of block in file
-    unsigned int nHeightLast;  //!< highest height of block in file
-    uint64_t nTimeFirst;       //!< earliest time of block in file
-    uint64_t nTimeLast;        //!< latest time of block in file
-
-    ADD_SERIALIZE_METHODS;
-
-    template <typename Stream, typename Operation>
-    inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) {
-        READWRITE(VARINT(nBlocks));
-        READWRITE(VARINT(nSize));
-        READWRITE(VARINT(nUndoSize));
-        READWRITE(VARINT(nHeightFirst));
-        READWRITE(VARINT(nHeightLast));
-        READWRITE(VARINT(nTimeFirst));
-        READWRITE(VARINT(nTimeLast));
-    }
-
-     void SetNull() {
-         nBlocks = 0;
-         nSize = 0;
-         nUndoSize = 0;
-         nHeightFirst = 0;
-         nHeightLast = 0;
-         nTimeFirst = 0;
-         nTimeLast = 0;
-     }
-
-     CBlockFileInfo() {
-         SetNull();
-     }
-
-     std::string ToString() const;
-
-     /** update statistics (does not update nSize) */
-     void AddBlock(unsigned int nHeightIn, uint64_t nTimeIn) {
-         if (nBlocks==0 || nHeightFirst > nHeightIn)
-             nHeightFirst = nHeightIn;
-         if (nBlocks==0 || nTimeFirst > nTimeIn)
-             nTimeFirst = nTimeIn;
-         nBlocks++;
-         if (nHeightIn > nHeightLast)
-             nHeightLast = nHeightIn;
-         if (nTimeIn > nTimeLast)
-             nTimeLast = nTimeIn;
-     }
-};
-
 /** RAII wrapper for VerifyDB: Verify consistency of the block and coin databases */
 class CVerifyDB {
 public:
diff --git a/src/txdb.cpp b/src/txdb.cpp
index be86cceeb36a7..caa6bde38d607 100644
--- a/src/txdb.cpp
+++ b/src/txdb.cpp
@@ -5,10 +5,8 @@
 
 #include "txdb.h"
 
-#include "chain.h"
 #include "chainparams.h"
 #include "hash.h"
-#include "main.h"
 #include "pow.h"
 #include "uint256.h"
 
@@ -177,7 +175,7 @@ bool CBlockTreeDB::ReadFlag(const std::string &name, bool &fValue) {
     return true;
 }
 
-bool CBlockTreeDB::LoadBlockIndexGuts()
+bool CBlockTreeDB::LoadBlockIndexGuts(boost::function<CBlockIndex*(const uint256&)> insertBlockIndex)
 {
     boost::scoped_ptr<CDBIterator> pcursor(NewIterator());
 
@@ -191,8 +189,8 @@ bool CBlockTreeDB::LoadBlockIndexGuts()
             CDiskBlockIndex diskindex;
             if (pcursor->GetValue(diskindex)) {
                 // Construct block index object
-                CBlockIndex* pindexNew = InsertBlockIndex(diskindex.GetBlockHash());
-                pindexNew->pprev          = InsertBlockIndex(diskindex.hashPrev);
+                CBlockIndex* pindexNew = insertBlockIndex(diskindex.GetBlockHash());
+                pindexNew->pprev          = insertBlockIndex(diskindex.hashPrev);
                 pindexNew->nHeight        = diskindex.nHeight;
                 pindexNew->nFile          = diskindex.nFile;
                 pindexNew->nDataPos       = diskindex.nDataPos;
diff --git a/src/txdb.h b/src/txdb.h
index 749802f0e5fd0..ce3c39d7fec11 100644
--- a/src/txdb.h
+++ b/src/txdb.h
@@ -8,15 +8,17 @@
 
 #include "coins.h"
 #include "dbwrapper.h"
+#include "chain.h"
 
 #include <map>
 #include <string>
 #include <utility>
 #include <vector>
 
-class CBlockFileInfo;
+#include <boost/function.hpp>
+
 class CBlockIndex;
-struct CDiskTxPos;
+class CCoinsViewDBCursor;
 class uint256;
 
 //! -dbcache default (MiB)
@@ -26,7 +28,30 @@ static const int64_t nMaxDbCache = sizeof(void*) > 4 ? 16384 : 1024;
 //! min. -dbcache in (MiB)
 static const int64_t nMinDbCache = 4;
 
-class CCoinsViewDBCursor;
+struct CDiskTxPos : public CDiskBlockPos
+{
+    unsigned int nTxOffset; // after header
+
+    ADD_SERIALIZE_METHODS;
+
+    template <typename Stream, typename Operation>
+    inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) {
+        READWRITE(*(CDiskBlockPos*)this);
+        READWRITE(VARINT(nTxOffset));
+    }
+
+    CDiskTxPos(const CDiskBlockPos &blockIn, unsigned int nTxOffsetIn) : CDiskBlockPos(blockIn.nFile, blockIn.nPos), nTxOffset(nTxOffsetIn) {
+    }
+
+    CDiskTxPos() {
+        SetNull();
+    }
+
+    void SetNull() {
+        CDiskBlockPos::SetNull();
+        nTxOffset = 0;
+    }
+};
 
 /** CCoinsView backed by the coin database (chainstate/) */
 class CCoinsViewDB : public CCoinsView
@@ -83,7 +108,7 @@ class CBlockTreeDB : public CDBWrapper
     bool WriteTxIndex(const std::vector<std::pair<uint256, CDiskTxPos> > &list);
     bool WriteFlag(const std::string &name, bool fValue);
     bool ReadFlag(const std::string &name, bool &fValue);
-    bool LoadBlockIndexGuts();
+    bool LoadBlockIndexGuts(boost::function<CBlockIndex*(const uint256&)> insertBlockIndex);
 };
 
 #endif // BITCOIN_TXDB_H

From 76212bbc6a13298d7154ac16c0b989aca5471de8 Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Sat, 9 Apr 2016 07:59:49 +0200
Subject: [PATCH 0153/1802] rpc: make sure `gettxoutsetinfo` hash has txids

The key (transaction id for the following outputs) should be serialized
to the HashWriter.

This is a problem as it means different transactions in the same
position with the same outputs will potentially result in the same hash.

Fixes primary concern of #7758.
---
 src/rpc/blockchain.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp
index b85b2f6b57e19..88f6278b2a42a 100644
--- a/src/rpc/blockchain.cpp
+++ b/src/rpc/blockchain.cpp
@@ -467,6 +467,7 @@ static bool GetUTXOStats(CCoinsView *view, CCoinsStats &stats)
         CCoins coins;
         if (pcursor->GetKey(key) && pcursor->GetValue(coins)) {
             stats.nTransactions++;
+            ss << key;
             for (unsigned int i=0; i<coins.vout.size(); i++) {
                 const CTxOut &out = coins.vout[i];
                 if (!out.IsNull()) {

From 28b400f7d146cca311d0d02d636a3251bddd4b04 Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Fri, 15 Apr 2016 17:54:45 +0200
Subject: [PATCH 0154/1802] doc: update release-notes for `gettxoutsetinfo`
 change

---
 doc/release-notes.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/doc/release-notes.md b/doc/release-notes.md
index 806d174ebf7fc..8360cc4816c36 100644
--- a/doc/release-notes.md
+++ b/doc/release-notes.md
@@ -21,6 +21,13 @@ It is recommended to use this for sensitive information such as wallet
 passphrases, as command-line arguments can usually be read from the process
 table by any user on the system.
 
+RPC low-level changes
+----------------------
+
+- `gettxoutsetinfo` UTXO hash (`hash_serialized`) has changed. There was a divergence between
+  32-bit and 64-bit platforms, and the txids were missing in the hashed data. This has been
+  fixed, but this means that the output will be different than from previous versions.
+
 0.13.0 Change log
 =================
 

From 1e2c29f2632c378843c5a3c9ad401a7bcacc4de0 Mon Sep 17 00:00:00 2001
From: Kaz Wesley <keziahw@gmail.com>
Date: Wed, 13 Apr 2016 10:09:16 -0700
Subject: [PATCH 0155/1802] prevector: destroy elements only via erase()

Fixes a bug in which pop_back did not call the deleted item's destructor.

Using the most general erase() implementation to implement all the others
prevents similar bugs because the coupling between deallocation and destructor
invocation only needs to be maintained in one place.
Also reduces duplication of complex memmove logic.
---
 src/prevector.h | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/prevector.h b/src/prevector.h
index 1da459bcfe1f3..16b2f8dca7fb6 100644
--- a/src/prevector.h
+++ b/src/prevector.h
@@ -298,9 +298,8 @@ class prevector {
     }
 
     void resize(size_type new_size) {
-        while (size() > new_size) {
-            item_ptr(size() - 1)->~T();
-            _size--;
+        if (size() > new_size) {
+            erase(item_ptr(new_size), end());
         }
         if (new_size > capacity()) {
             change_capacity(new_size);
@@ -368,10 +367,7 @@ class prevector {
     }
 
     iterator erase(iterator pos) {
-        (*pos).~T();
-        memmove(&(*pos), &(*pos) + 1, ((char*)&(*end())) - ((char*)(1 + &(*pos))));
-        _size--;
-        return pos;
+        return erase(pos, pos + 1);
     }
 
     iterator erase(iterator first, iterator last) {
@@ -396,7 +392,7 @@ class prevector {
     }
 
     void pop_back() {
-        _size--;
+        erase(end() - 1, end());
     }
 
     T& front() {

From 4ed41a2b611dfd328fe6f72312d6c596650f03f8 Mon Sep 17 00:00:00 2001
From: Kaz Wesley <keziahw@gmail.com>
Date: Sat, 16 Apr 2016 06:49:38 -0700
Subject: [PATCH 0156/1802] test prevector::swap

- add a swap operation to prevector tests (fails due to broken prevector::swap)
- fix 2 prevector test operation conditions that were impossible
---
 src/test/prevector_tests.cpp | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/test/prevector_tests.cpp b/src/test/prevector_tests.cpp
index 01a45b540d512..b39b90353053c 100644
--- a/src/test/prevector_tests.cpp
+++ b/src/test/prevector_tests.cpp
@@ -19,9 +19,11 @@ template<unsigned int N, typename T>
 class prevector_tester {
     typedef std::vector<T> realtype;
     realtype real_vector;
+    realtype real_vector_alt;
 
     typedef prevector<N, T> pretype;
     pretype pre_vector;
+    pretype pre_vector_alt;
 
     typedef typename pretype::size_type Size;
 
@@ -149,6 +151,12 @@ class prevector_tester {
         pre_vector.shrink_to_fit();
         test();
     }
+
+    void swap() {
+        real_vector.swap(real_vector_alt);
+        pre_vector.swap(pre_vector_alt);
+        test();
+    }
 };
 
 BOOST_AUTO_TEST_CASE(PrevectorTestInt)
@@ -204,12 +212,15 @@ BOOST_AUTO_TEST_CASE(PrevectorTestInt)
             if (test.size() > 0) {
                 test.update(insecure_rand() % test.size(), insecure_rand());
             }
-            if (((r >> 11) & 1024) == 11) {
+            if (((r >> 11) % 1024) == 11) {
                 test.clear();
             }
-            if (((r >> 21) & 512) == 12) {
+            if (((r >> 21) % 512) == 12) {
                 test.assign(insecure_rand() % 32, insecure_rand());
             }
+            if (((r >> 15) % 64) == 3) {
+                test.swap();
+            }
         }
     }
 }

From a7af72a697a8decab364792230153f114be3919c Mon Sep 17 00:00:00 2001
From: Kaz Wesley <keziahw@gmail.com>
Date: Thu, 14 Apr 2016 09:26:32 -0700
Subject: [PATCH 0157/1802] prevector::swap: fix (unreached) data corruption

swap was using an incorrect condition to determine when to apply an optimization
(not swapping the full direct[] when swapping two indirect prevectors).

Rather than correct the optimization I'm removing it for simplicity. Removing
this optimization minutely improves performance in the typical (currently only)
usage of member swap(), which is swapping with a freshly value-initialized
object.
---
 src/prevector.h | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/prevector.h b/src/prevector.h
index 16b2f8dca7fb6..a0e1e140b4013 100644
--- a/src/prevector.h
+++ b/src/prevector.h
@@ -412,12 +412,7 @@ class prevector {
     }
 
     void swap(prevector<N, T, Size, Diff>& other) {
-        if (_size & other._size & 1) {
-            std::swap(_union.capacity, other._union.capacity);
-            std::swap(_union.indirect, other._union.indirect);
-        } else {
-            std::swap(_union, other._union);
-        }
+        std::swap(_union, other._union);
         std::swap(_size, other._size);
     }
 

From fc95f6ecb6ee09c4a5832247f2c8759cb88c2fa1 Mon Sep 17 00:00:00 2001
From: Chris Moore <dooglus@gmail.com>
Date: Sat, 16 Apr 2016 13:35:42 -0700
Subject: [PATCH 0158/1802] fix typo in help text

'in which the transaction is included in'
---
 src/rpc/rawtransaction.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/rpc/rawtransaction.cpp b/src/rpc/rawtransaction.cpp
index de8cd68f66267..4e1b1576a4886 100644
--- a/src/rpc/rawtransaction.cpp
+++ b/src/rpc/rawtransaction.cpp
@@ -211,7 +211,7 @@ UniValue gettxoutproof(const UniValue& params, bool fHelp)
             "\nNOTE: By default this function only works sometimes. This is when there is an\n"
             "unspent output in the utxo for this transaction. To make it always work,\n"
             "you need to maintain a transaction index, using the -txindex command line option or\n"
-            "specify the block in which the transaction is included in manually (by blockhash).\n"
+            "specify the block in which the transaction is included manually (by blockhash).\n"
             "\nReturn the raw transaction data.\n"
             "\nArguments:\n"
             "1. \"txids\"       (string) A json array of txids to filter\n"

From dc0693f6379cc63fcea4cb979526b1ba8e0461f3 Mon Sep 17 00:00:00 2001
From: Chris Moore <dooglus@gmail.com>
Date: Sat, 16 Apr 2016 13:42:28 -0700
Subject: [PATCH 0159/1802] add missing newline

Without the newline I see "bein" where the two lines are concatenated:

Note that all inputs selected must be of standard form and P2SH scripts must *bein* the wallet using importaddress or addmultisigaddress (to calculate fees).
---
 src/wallet/rpcwallet.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index 3078cebd486c3..096206f5de8e3 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -2443,7 +2443,7 @@ UniValue fundrawtransaction(const UniValue& params, bool fHelp)
                             "Note that inputs which were signed may need to be resigned after completion since in/outputs have been added.\n"
                             "The inputs added will not be signed, use signrawtransaction for that.\n"
                             "Note that all existing inputs must have their previous output transaction be in the wallet.\n"
-                            "Note that all inputs selected must be of standard form and P2SH scripts must be"
+                            "Note that all inputs selected must be of standard form and P2SH scripts must be\n"
                             "in the wallet using importaddress or addmultisigaddress (to calculate fees).\n"
                             "Only pay-to-pubkey, multisig, and P2SH versions thereof are currently supported for watch-only\n"
                             "\nArguments:\n"

From 3107c475a70042c1aad8b3bbb7d63234b1bbed8d Mon Sep 17 00:00:00 2001
From: Chris Moore <dooglus@gmail.com>
Date: Sun, 17 Apr 2016 00:01:49 -0700
Subject: [PATCH 0160/1802] fix spelling mistake

---
 src/wallet/rpcwallet.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index 3078cebd486c3..21192a58b81f8 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -2455,7 +2455,7 @@ UniValue fundrawtransaction(const UniValue& params, bool fHelp)
                             "     \"includeWatching\"   (boolean, optional, default false) Also select inputs which are watch only\n"
                             "     \"lockUnspents\"      (boolean, optional, default false) Lock selected unspent outputs\n"
                             "   }\n"
-                            "                         for backward compatibility: passing in a true instzead of an object will result in {\"includeWatching\":true}\n"
+                            "                         for backward compatibility: passing in a true instead of an object will result in {\"includeWatching\":true}\n"
                             "\nResult:\n"
                             "{\n"
                             "  \"hex\":       \"value\", (string)  The resulting raw transaction (hex-encoded string)\n"

From e9fc71e5fa6f0d7991bac616b9fed6a80e77a8d7 Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Tue, 12 Apr 2016 20:23:16 -0400
Subject: [PATCH 0161/1802] net: require lookup functions to specify all
 arguments

To make it clear where DNS resolves are happening
---
 src/net.cpp   | 4 ++--
 src/netbase.h | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/net.cpp b/src/net.cpp
index f294e4c667836..6ab6ef819d077 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -1443,7 +1443,7 @@ void ThreadDNSAddressSeed()
         } else {
             vector<CNetAddr> vIPs;
             vector<CAddress> vAdd;
-            if (LookupHost(seed.host.c_str(), vIPs))
+            if (LookupHost(seed.host.c_str(), vIPs, 0, true))
             {
                 BOOST_FOREACH(const CNetAddr& ip, vIPs)
                 {
@@ -1884,7 +1884,7 @@ void static Discover(boost::thread_group& threadGroup)
     if (gethostname(pszHostName, sizeof(pszHostName)) != SOCKET_ERROR)
     {
         vector<CNetAddr> vaddr;
-        if (LookupHost(pszHostName, vaddr))
+        if (LookupHost(pszHostName, vaddr, 0, true))
         {
             BOOST_FOREACH (const CNetAddr &addr, vaddr)
             {
diff --git a/src/netbase.h b/src/netbase.h
index db736154fa684..4529f9822914c 100644
--- a/src/netbase.h
+++ b/src/netbase.h
@@ -206,9 +206,9 @@ bool GetProxy(enum Network net, proxyType &proxyInfoOut);
 bool IsProxy(const CNetAddr &addr);
 bool SetNameProxy(const proxyType &addrProxy);
 bool HaveNameProxy();
-bool LookupHost(const char *pszName, std::vector<CNetAddr>& vIP, unsigned int nMaxSolutions = 0, bool fAllowLookup = true);
-bool Lookup(const char *pszName, CService& addr, int portDefault = 0, bool fAllowLookup = true);
-bool Lookup(const char *pszName, std::vector<CService>& vAddr, int portDefault = 0, bool fAllowLookup = true, unsigned int nMaxSolutions = 0);
+bool LookupHost(const char *pszName, std::vector<CNetAddr>& vIP, unsigned int nMaxSolutions, bool fAllowLookup);
+bool Lookup(const char *pszName, CService& addr, int portDefault, bool fAllowLookup);
+bool Lookup(const char *pszName, std::vector<CService>& vAddr, int portDefault, bool fAllowLookup, unsigned int nMaxSolutions);
 bool LookupNumeric(const char *pszName, CService& addr, int portDefault = 0);
 bool ConnectSocket(const CService &addr, SOCKET& hSocketRet, int nTimeout, bool *outProxyConnectionFailed = 0);
 bool ConnectSocketByName(CService &addr, SOCKET& hSocketRet, const char *pszDest, int portDefault, int nTimeout, bool *outProxyConnectionFailed = 0);

From a3310b4d485b1510c240f1db882530590b6fd7c9 Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Mon, 18 Apr 2016 12:05:32 +0200
Subject: [PATCH 0162/1802] txdb: Fix assert crash in new UTXO set cursor

Remove the mistaken assumption that GetKey returning false signifies
an internal database issue. It will return false when the key cannot
be deserialized into the (char,uint256) stanza, which indicates
that the cursor has reached a different kind of key.

Fixes bug #7890 introduced in #7756.
---
 src/txdb.cpp | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/txdb.cpp b/src/txdb.cpp
index be86cceeb36a7..19ca1786549ee 100644
--- a/src/txdb.cpp
+++ b/src/txdb.cpp
@@ -134,12 +134,8 @@ bool CCoinsViewDBCursor::Valid() const
 void CCoinsViewDBCursor::Next()
 {
     pcursor->Next();
-    if (pcursor->Valid()) {
-        bool ok = pcursor->GetKey(keyTmp);
-        assert(ok); // If GetKey fails here something must be wrong with underlying database, we cannot handle that here
-    } else {
+    if (!pcursor->Valid() || !pcursor->GetKey(keyTmp))
         keyTmp.first = 0; // Invalidate cached key after last record so that Valid() and GetKey() return false
-    }
 }
 
 bool CBlockTreeDB::WriteBatchSync(const std::vector<std::pair<int, const CBlockFileInfo*> >& fileInfo, int nLastFile, const std::vector<const CBlockIndex*>& blockinfo) {

From de39c95c2468cc643a5d5bed9e5dd8cea6a40747 Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Mon, 18 Apr 2016 14:03:53 +0200
Subject: [PATCH 0163/1802] test: move accounting_tests and rpc_wallet_tests to
 wallet/test

Move the two other wallet tests to where they belong.
---
 src/Makefile.test.include                  | 4 ++--
 src/{ => wallet}/test/accounting_tests.cpp | 0
 src/{ => wallet}/test/rpc_wallet_tests.cpp | 0
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename src/{ => wallet}/test/accounting_tests.cpp (100%)
 rename src/{ => wallet}/test/rpc_wallet_tests.cpp (100%)

diff --git a/src/Makefile.test.include b/src/Makefile.test.include
index f025b18c7e690..989718554930f 100644
--- a/src/Makefile.test.include
+++ b/src/Makefile.test.include
@@ -90,9 +90,9 @@ BITCOIN_TESTS =\
 
 if ENABLE_WALLET
 BITCOIN_TESTS += \
-  test/accounting_tests.cpp \
+  wallet/test/accounting_tests.cpp \
   wallet/test/wallet_tests.cpp \
-  test/rpc_wallet_tests.cpp
+  wallet/test/rpc_wallet_tests.cpp
 endif
 
 test_test_bitcoin_SOURCES = $(BITCOIN_TESTS) $(JSON_TEST_FILES) $(RAW_TEST_FILES)
diff --git a/src/test/accounting_tests.cpp b/src/wallet/test/accounting_tests.cpp
similarity index 100%
rename from src/test/accounting_tests.cpp
rename to src/wallet/test/accounting_tests.cpp
diff --git a/src/test/rpc_wallet_tests.cpp b/src/wallet/test/rpc_wallet_tests.cpp
similarity index 100%
rename from src/test/rpc_wallet_tests.cpp
rename to src/wallet/test/rpc_wallet_tests.cpp

From fae1f4ebfe6be4426685b22166f5367c92ba0833 Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Fri, 15 Apr 2016 11:25:19 +0200
Subject: [PATCH 0164/1802] [qa] rpc-tests: Fix link in comment and label error
 msg

---
 qa/pull-tester/rpc-tests.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/qa/pull-tester/rpc-tests.py b/qa/pull-tester/rpc-tests.py
index e159082a009e5..c0637209e3c1d 100755
--- a/qa/pull-tester/rpc-tests.py
+++ b/qa/pull-tester/rpc-tests.py
@@ -69,6 +69,7 @@
 
 if EXEEXT == ".exe" and "-win" not in opts:
     # https://github.com/bitcoin/bitcoin/commit/d52802551752140cf41f0d9a225a43e84404d3e9
+    # https://github.com/bitcoin/bitcoin/pull/5677#issuecomment-136646964
     print "Win tests currently disabled by default.  Use -win option to enable"
     sys.exit(0)
 
@@ -81,7 +82,7 @@
     try:
         import zmq
     except ImportError as e:
-        print("WARNING: \"import zmq\" failed. Set ENABLE_ZMQ=0 or " \
+        print("ERROR: \"import zmq\" failed. Set ENABLE_ZMQ=0 or " \
             "to run zmq tests, see dependency info in /qa/README.md.")
         raise e
 

From f4eae2d910d9edb3750efec4facbeab161cce593 Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Mon, 18 Apr 2016 14:54:57 +0200
Subject: [PATCH 0165/1802] test: Create test fixture for wallet

Removes all the `#ifdef ENABLE_WALLET` from `test_bitcoin` by
making the wallet tests use their own fixture.
---
 src/Makefile.test.include               |  2 ++
 src/test/test_bitcoin.cpp               | 23 --------------------
 src/test/test_bitcoin.h                 |  3 +--
 src/wallet/test/accounting_tests.cpp    |  4 ++--
 src/wallet/test/rpc_wallet_tests.cpp    |  4 ++--
 src/wallet/test/wallet_test_fixture.cpp | 28 +++++++++++++++++++++++++
 src/wallet/test/wallet_test_fixture.h   | 18 ++++++++++++++++
 src/wallet/test/wallet_tests.cpp        |  4 ++--
 8 files changed, 55 insertions(+), 31 deletions(-)
 create mode 100644 src/wallet/test/wallet_test_fixture.cpp
 create mode 100644 src/wallet/test/wallet_test_fixture.h

diff --git a/src/Makefile.test.include b/src/Makefile.test.include
index 989718554930f..08e2f6af4db73 100644
--- a/src/Makefile.test.include
+++ b/src/Makefile.test.include
@@ -90,6 +90,8 @@ BITCOIN_TESTS =\
 
 if ENABLE_WALLET
 BITCOIN_TESTS += \
+  wallet/test/wallet_test_fixture.cpp \
+  wallet/test/wallet_test_fixture.h \
   wallet/test/accounting_tests.cpp \
   wallet/test/wallet_tests.cpp \
   wallet/test/rpc_wallet_tests.cpp
diff --git a/src/test/test_bitcoin.cpp b/src/test/test_bitcoin.cpp
index 97b99962527e6..eb8ac01e8d32e 100644
--- a/src/test/test_bitcoin.cpp
+++ b/src/test/test_bitcoin.cpp
@@ -19,10 +19,6 @@
 #include "ui_interface.h"
 #include "rpc/server.h"
 #include "rpc/register.h"
-#ifdef ENABLE_WALLET
-#include "wallet/db.h"
-#include "wallet/wallet.h"
-#endif
 
 #include "test/testutil.h"
 
@@ -57,10 +53,6 @@ TestingSetup::TestingSetup(const std::string& chainName) : BasicTestingSetup(cha
         // Ideally we'd move all the RPC tests to the functional testing framework
         // instead of unit tests, but for now we need these here.
         RegisterAllCoreRPCCommands(tableRPC);
-#ifdef ENABLE_WALLET
-        bitdb.MakeMock();
-        RegisterWalletRPCCommands(tableRPC);
-#endif
         ClearDatadirCache();
         pathTemp = GetTempPath() / strprintf("test_bitcoin_%lu_%i", (unsigned long)GetTime(), (int)(GetRand(100000)));
         boost::filesystem::create_directories(pathTemp);
@@ -69,12 +61,6 @@ TestingSetup::TestingSetup(const std::string& chainName) : BasicTestingSetup(cha
         pcoinsdbview = new CCoinsViewDB(1 << 23, true);
         pcoinsTip = new CCoinsViewCache(pcoinsdbview);
         InitBlockIndex(chainparams);
-#ifdef ENABLE_WALLET
-        bool fFirstRun;
-        pwalletMain = new CWallet("wallet.dat");
-        pwalletMain->LoadWallet(fFirstRun);
-        RegisterValidationInterface(pwalletMain);
-#endif
         nScriptCheckThreads = 3;
         for (int i=0; i < nScriptCheckThreads-1; i++)
             threadGroup.create_thread(&ThreadScriptCheck);
@@ -86,19 +72,10 @@ TestingSetup::~TestingSetup()
         UnregisterNodeSignals(GetNodeSignals());
         threadGroup.interrupt_all();
         threadGroup.join_all();
-#ifdef ENABLE_WALLET
-        UnregisterValidationInterface(pwalletMain);
-        delete pwalletMain;
-        pwalletMain = NULL;
-#endif
         UnloadBlockIndex();
         delete pcoinsTip;
         delete pcoinsdbview;
         delete pblocktree;
-#ifdef ENABLE_WALLET
-        bitdb.Flush(true);
-        bitdb.Reset();
-#endif
         boost::filesystem::remove_all(pathTemp);
 }
 
diff --git a/src/test/test_bitcoin.h b/src/test/test_bitcoin.h
index 769ae5a13252b..57f66f6c6d0dc 100644
--- a/src/test/test_bitcoin.h
+++ b/src/test/test_bitcoin.h
@@ -25,8 +25,7 @@ struct BasicTestingSetup {
 };
 
 /** Testing setup that configures a complete environment.
- * Included are data directory, coins database, script check threads
- * and wallet (if enabled) setup.
+ * Included are data directory, coins database, script check threads setup.
  */
 struct TestingSetup: public BasicTestingSetup {
     CCoinsViewDB *pcoinsdbview;
diff --git a/src/wallet/test/accounting_tests.cpp b/src/wallet/test/accounting_tests.cpp
index dad191c68435e..d075b2b641a1b 100644
--- a/src/wallet/test/accounting_tests.cpp
+++ b/src/wallet/test/accounting_tests.cpp
@@ -5,7 +5,7 @@
 #include "wallet/wallet.h"
 #include "wallet/walletdb.h"
 
-#include "test/test_bitcoin.h"
+#include "wallet/test/wallet_test_fixture.h"
 
 #include <stdint.h>
 
@@ -14,7 +14,7 @@
 
 extern CWallet* pwalletMain;
 
-BOOST_FIXTURE_TEST_SUITE(accounting_tests, TestingSetup)
+BOOST_FIXTURE_TEST_SUITE(accounting_tests, WalletTestingSetup)
 
 static void
 GetResults(CWalletDB& walletdb, std::map<CAmount, CAccountingEntry>& results)
diff --git a/src/wallet/test/rpc_wallet_tests.cpp b/src/wallet/test/rpc_wallet_tests.cpp
index 3443be2093015..4e7d177f51855 100644
--- a/src/wallet/test/rpc_wallet_tests.cpp
+++ b/src/wallet/test/rpc_wallet_tests.cpp
@@ -9,7 +9,7 @@
 #include "main.h"
 #include "wallet/wallet.h"
 
-#include "test/test_bitcoin.h"
+#include "wallet/test/wallet_test_fixture.h"
 
 #include <boost/algorithm/string.hpp>
 #include <boost/test/unit_test.hpp>
@@ -23,7 +23,7 @@ extern UniValue CallRPC(string args);
 
 extern CWallet* pwalletMain;
 
-BOOST_FIXTURE_TEST_SUITE(rpc_wallet_tests, TestingSetup)
+BOOST_FIXTURE_TEST_SUITE(rpc_wallet_tests, WalletTestingSetup)
 
 BOOST_AUTO_TEST_CASE(rpc_addmultisig)
 {
diff --git a/src/wallet/test/wallet_test_fixture.cpp b/src/wallet/test/wallet_test_fixture.cpp
new file mode 100644
index 0000000000000..8370300963213
--- /dev/null
+++ b/src/wallet/test/wallet_test_fixture.cpp
@@ -0,0 +1,28 @@
+#include "wallet/test/wallet_test_fixture.h"
+
+#include "rpc/server.h"
+#include "wallet/db.h"
+#include "wallet/wallet.h"
+
+WalletTestingSetup::WalletTestingSetup(const std::string& chainName):
+    TestingSetup(chainName)
+{
+    bitdb.MakeMock();
+
+    bool fFirstRun;
+    pwalletMain = new CWallet("wallet.dat");
+    pwalletMain->LoadWallet(fFirstRun);
+    RegisterValidationInterface(pwalletMain);
+
+    RegisterWalletRPCCommands(tableRPC);
+}
+
+WalletTestingSetup::~WalletTestingSetup()
+{
+    UnregisterValidationInterface(pwalletMain);
+    delete pwalletMain;
+    pwalletMain = NULL;
+
+    bitdb.Flush(true);
+    bitdb.Reset();
+}
diff --git a/src/wallet/test/wallet_test_fixture.h b/src/wallet/test/wallet_test_fixture.h
new file mode 100644
index 0000000000000..97a6d98397acc
--- /dev/null
+++ b/src/wallet/test/wallet_test_fixture.h
@@ -0,0 +1,18 @@
+// Copyright (c) 2016 The Bitcoin Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#ifndef BITCOIN_WALLET_TEST_FIXTURE_H
+#define BITCOIN_WALLET_TEST_FIXTURE_H
+
+#include "test/test_bitcoin.h"
+
+/** Testing setup and teardown for wallet.
+ */
+struct WalletTestingSetup: public TestingSetup {
+    WalletTestingSetup(const std::string& chainName = CBaseChainParams::MAIN);
+    ~WalletTestingSetup();
+};
+
+#endif
+
diff --git a/src/wallet/test/wallet_tests.cpp b/src/wallet/test/wallet_tests.cpp
index e84d5880261c4..b759a6b2e8b75 100644
--- a/src/wallet/test/wallet_tests.cpp
+++ b/src/wallet/test/wallet_tests.cpp
@@ -9,7 +9,7 @@
 #include <utility>
 #include <vector>
 
-#include "test/test_bitcoin.h"
+#include "wallet/test/wallet_test_fixture.h"
 
 #include <boost/foreach.hpp>
 #include <boost/test/unit_test.hpp>
@@ -25,7 +25,7 @@ using namespace std;
 
 typedef set<pair<const CWalletTx*,unsigned int> > CoinSet;
 
-BOOST_FIXTURE_TEST_SUITE(wallet_tests, TestingSetup)
+BOOST_FIXTURE_TEST_SUITE(wallet_tests, WalletTestingSetup)
 
 static CWallet wallet;
 static vector<COutput> vCoins;

From a25a4f5b04c3e045557e9e7e807b2af74ad75128 Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Mon, 18 Apr 2016 15:12:46 +0200
Subject: [PATCH 0166/1802] =?UTF-8?q?wallet=5Fismine.h=20=E2=86=92=20scrip?=
 =?UTF-8?q?t/ismine.h?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Removes conditional dependency of `src/test` on wallet.

Makes multisig and P2SH tests complete without wallet built-in.
---
 src/Makefile.am                                     |  4 ++--
 src/{wallet/wallet_ismine.cpp => script/ismine.cpp} |  2 +-
 src/{wallet/wallet_ismine.h => script/ismine.h}     |  6 +++---
 src/test/multisig_tests.cpp                         | 12 +-----------
 src/test/script_P2SH_tests.cpp                      |  9 +--------
 src/wallet/wallet.h                                 |  2 +-
 6 files changed, 9 insertions(+), 26 deletions(-)
 rename src/{wallet/wallet_ismine.cpp => script/ismine.cpp} (99%)
 rename src/{wallet/wallet_ismine.h => script/ismine.h} (90%)

diff --git a/src/Makefile.am b/src/Makefile.am
index d91e959cffe79..24744835f50d6 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -135,6 +135,7 @@ BITCOIN_CORE_H = \
   script/sigcache.h \
   script/sign.h \
   script/standard.h \
+  script/ismine.h \
   streams.h \
   support/allocators/secure.h \
   support/allocators/zeroafterfree.h \
@@ -157,7 +158,6 @@ BITCOIN_CORE_H = \
   wallet/db.h \
   wallet/rpcwallet.h \
   wallet/wallet.h \
-  wallet/wallet_ismine.h \
   wallet/walletdb.h \
   zmq/zmqabstractnotifier.h \
   zmq/zmqconfig.h\
@@ -199,6 +199,7 @@ libbitcoin_server_a_SOURCES = \
   rpc/rawtransaction.cpp \
   rpc/server.cpp \
   script/sigcache.cpp \
+  script/ismine.cpp \
   timedata.cpp \
   torcontrol.cpp \
   txdb.cpp \
@@ -229,7 +230,6 @@ libbitcoin_wallet_a_SOURCES = \
   wallet/rpcdump.cpp \
   wallet/rpcwallet.cpp \
   wallet/wallet.cpp \
-  wallet/wallet_ismine.cpp \
   wallet/walletdb.cpp \
   policy/rbf.cpp \
   $(BITCOIN_CORE_H)
diff --git a/src/wallet/wallet_ismine.cpp b/src/script/ismine.cpp
similarity index 99%
rename from src/wallet/wallet_ismine.cpp
rename to src/script/ismine.cpp
index ebda5cc53df76..535c56b57a06a 100644
--- a/src/wallet/wallet_ismine.cpp
+++ b/src/script/ismine.cpp
@@ -3,7 +3,7 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include "wallet_ismine.h"
+#include "ismine.h"
 
 #include "key.h"
 #include "keystore.h"
diff --git a/src/wallet/wallet_ismine.h b/src/script/ismine.h
similarity index 90%
rename from src/wallet/wallet_ismine.h
rename to src/script/ismine.h
index 51afd1b1402cb..4b7db8802ba54 100644
--- a/src/wallet/wallet_ismine.h
+++ b/src/script/ismine.h
@@ -3,8 +3,8 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#ifndef BITCOIN_WALLET_WALLET_ISMINE_H
-#define BITCOIN_WALLET_WALLET_ISMINE_H
+#ifndef BITCOIN_SCRIPT_ISMINE_H
+#define BITCOIN_SCRIPT_ISMINE_H
 
 #include "script/standard.h"
 
@@ -31,4 +31,4 @@ typedef uint8_t isminefilter;
 isminetype IsMine(const CKeyStore& keystore, const CScript& scriptPubKey);
 isminetype IsMine(const CKeyStore& keystore, const CTxDestination& dest);
 
-#endif // BITCOIN_WALLET_WALLET_ISMINE_H
+#endif // BITCOIN_SCRIPT_ISMINE_H
diff --git a/src/test/multisig_tests.cpp b/src/test/multisig_tests.cpp
index edf1650ca54d5..d48a68ba547c5 100644
--- a/src/test/multisig_tests.cpp
+++ b/src/test/multisig_tests.cpp
@@ -9,12 +9,10 @@
 #include "script/script_error.h"
 #include "script/interpreter.h"
 #include "script/sign.h"
+#include "script/ismine.h"
 #include "uint256.h"
 #include "test/test_bitcoin.h"
 
-#ifdef ENABLE_WALLET
-#include "wallet/wallet_ismine.h"
-#endif
 
 #include <boost/foreach.hpp>
 #include <boost/test/unit_test.hpp>
@@ -210,10 +208,8 @@ BOOST_AUTO_TEST_CASE(multisig_Solver1)
         CTxDestination addr;
         BOOST_CHECK(ExtractDestination(s, addr));
         BOOST_CHECK(addr == keyaddr[0]);
-#ifdef ENABLE_WALLET
         BOOST_CHECK(IsMine(keystore, s));
         BOOST_CHECK(!IsMine(emptykeystore, s));
-#endif
     }
     {
         vector<valtype> solutions;
@@ -225,10 +221,8 @@ BOOST_AUTO_TEST_CASE(multisig_Solver1)
         CTxDestination addr;
         BOOST_CHECK(ExtractDestination(s, addr));
         BOOST_CHECK(addr == keyaddr[0]);
-#ifdef ENABLE_WALLET
         BOOST_CHECK(IsMine(keystore, s));
         BOOST_CHECK(!IsMine(emptykeystore, s));
-#endif
     }
     {
         vector<valtype> solutions;
@@ -239,11 +233,9 @@ BOOST_AUTO_TEST_CASE(multisig_Solver1)
         BOOST_CHECK_EQUAL(solutions.size(), 4U);
         CTxDestination addr;
         BOOST_CHECK(!ExtractDestination(s, addr));
-#ifdef ENABLE_WALLET
         BOOST_CHECK(IsMine(keystore, s));
         BOOST_CHECK(!IsMine(emptykeystore, s));
         BOOST_CHECK(!IsMine(partialkeystore, s));
-#endif
     }
     {
         vector<valtype> solutions;
@@ -258,11 +250,9 @@ BOOST_AUTO_TEST_CASE(multisig_Solver1)
         BOOST_CHECK(addrs[0] == keyaddr[0]);
         BOOST_CHECK(addrs[1] == keyaddr[1]);
         BOOST_CHECK(nRequired == 1);
-#ifdef ENABLE_WALLET
         BOOST_CHECK(IsMine(keystore, s));
         BOOST_CHECK(!IsMine(emptykeystore, s));
         BOOST_CHECK(!IsMine(partialkeystore, s));
-#endif
     }
     {
         vector<valtype> solutions;
diff --git a/src/test/script_P2SH_tests.cpp b/src/test/script_P2SH_tests.cpp
index 28b85e8d290a7..d10284fe940e5 100644
--- a/src/test/script_P2SH_tests.cpp
+++ b/src/test/script_P2SH_tests.cpp
@@ -9,12 +9,9 @@
 #include "script/script.h"
 #include "script/script_error.h"
 #include "script/sign.h"
+#include "script/ismine.h"
 #include "test/test_bitcoin.h"
 
-#ifdef ENABLE_WALLET
-#include "wallet/wallet_ismine.h"
-#endif
-
 #include <vector>
 
 #include <boost/test/unit_test.hpp>
@@ -101,9 +98,7 @@ BOOST_AUTO_TEST_CASE(sign)
         txTo[i].vin[0].prevout.n = i;
         txTo[i].vin[0].prevout.hash = txFrom.GetHash();
         txTo[i].vout[0].nValue = 1;
-#ifdef ENABLE_WALLET
         BOOST_CHECK_MESSAGE(IsMine(keystore, txFrom.vout[i].scriptPubKey), strprintf("IsMine %d", i));
-#endif
     }
     for (int i = 0; i < 8; i++)
     {
@@ -198,9 +193,7 @@ BOOST_AUTO_TEST_CASE(set)
         txTo[i].vin[0].prevout.hash = txFrom.GetHash();
         txTo[i].vout[0].nValue = 1*CENT;
         txTo[i].vout[0].scriptPubKey = inner[i];
-#ifdef ENABLE_WALLET
         BOOST_CHECK_MESSAGE(IsMine(keystore, txFrom.vout[i].scriptPubKey), strprintf("IsMine %d", i));
-#endif
     }
     for (int i = 0; i < 4; i++)
     {
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
index aab4b217caa87..fa8740eb7fe38 100644
--- a/src/wallet/wallet.h
+++ b/src/wallet/wallet.h
@@ -12,8 +12,8 @@
 #include "ui_interface.h"
 #include "utilstrencodings.h"
 #include "validationinterface.h"
+#include "script/ismine.h"
 #include "wallet/crypter.h"
-#include "wallet/wallet_ismine.h"
 #include "wallet/walletdb.h"
 #include "wallet/rpcwallet.h"
 

From b30fb42e499beee5899b7e0e6c7581101b14ee83 Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Mon, 18 Apr 2016 15:15:57 +0200
Subject: [PATCH 0167/1802] test: Rename wallet.dat to wallet_test.dat

Indicate that the file name is not hardcoded, and a little bit of safety
so that it never nukes the main wallet.

Suggestion by Marco Falke.
---
 src/wallet/test/wallet_test_fixture.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/wallet/test/wallet_test_fixture.cpp b/src/wallet/test/wallet_test_fixture.cpp
index 8370300963213..9036ee26d83e0 100644
--- a/src/wallet/test/wallet_test_fixture.cpp
+++ b/src/wallet/test/wallet_test_fixture.cpp
@@ -10,7 +10,7 @@ WalletTestingSetup::WalletTestingSetup(const std::string& chainName):
     bitdb.MakeMock();
 
     bool fFirstRun;
-    pwalletMain = new CWallet("wallet.dat");
+    pwalletMain = new CWallet("wallet_test.dat");
     pwalletMain->LoadWallet(fFirstRun);
     RegisterValidationInterface(pwalletMain);
 

From 87049e832d97d4f2808c0b479b21fc7b16c86934 Mon Sep 17 00:00:00 2001
From: mrbandrews <bandrewsny@gmail.com>
Date: Mon, 18 Apr 2016 12:10:47 -0400
Subject: [PATCH 0168/1802] Speed up getchaintips.

---
 src/rpc/blockchain.cpp | 29 +++++++++++++++++++++--------
 1 file changed, 21 insertions(+), 8 deletions(-)

diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp
index 34637b9f7e398..3db827d9ae372 100644
--- a/src/rpc/blockchain.cpp
+++ b/src/rpc/blockchain.cpp
@@ -760,17 +760,30 @@ UniValue getchaintips(const UniValue& params, bool fHelp)
 
     LOCK(cs_main);
 
-    /* Build up a list of chain tips.  We start with the list of all
-       known blocks, and successively remove blocks that appear as pprev
-       of another block.  */
+    /*
+     * Idea:  the set of chain tips is chainActive.tip, plus orphan blocks which do not have another orphan building off of them. 
+     * Algorithm:
+     *  - Make one pass through mapBlockIndex, picking out the orphan blocks, and also storing a set of the orphan block's pprev pointers.
+     *  - Iterate through the orphan blocks. If the block isn't pointed to by another orphan, it is a chain tip.
+     *  - add chainActive.Tip()
+     */
     std::set<const CBlockIndex*, CompareBlocksByHeight> setTips;
-    BOOST_FOREACH(const PAIRTYPE(const uint256, CBlockIndex*)& item, mapBlockIndex)
-        setTips.insert(item.second);
+    std::set<const CBlockIndex*> setOrphans;
+    std::set<const CBlockIndex*> setPrevs;
+
     BOOST_FOREACH(const PAIRTYPE(const uint256, CBlockIndex*)& item, mapBlockIndex)
     {
-        const CBlockIndex* pprev = item.second->pprev;
-        if (pprev)
-            setTips.erase(pprev);
+        if (!chainActive.Contains(item.second)) {
+            setOrphans.insert(item.second);
+            setPrevs.insert(item.second->pprev);
+        }
+    }
+
+    for (std::set<const CBlockIndex*>::iterator it = setOrphans.begin(); it != setOrphans.end(); ++it)
+    {
+        if (setPrevs.erase(*it) == 0) {
+            setTips.insert(*it);
+        }
     }
 
     // Always report the currently active tip.

From fa942c755ab513829dcab27487ba1e7ab5a806ee Mon Sep 17 00:00:00 2001
From: Joao Fonseca <jpdf.fonseca@gmail.com>
Date: Tue, 19 Apr 2016 12:22:11 +0100
Subject: [PATCH 0169/1802] Move method to check matches within arrays on
 util.py

---
 qa/rpc-tests/getblocktemplate_longpoll.py  | 22 -------
 qa/rpc-tests/getblocktemplate_proposals.py | 22 -------
 qa/rpc-tests/keypool.py                    | 22 -------
 qa/rpc-tests/listtransactions.py           | 71 ++++++++--------------
 qa/rpc-tests/receivedby.py                 | 40 +++---------
 qa/rpc-tests/test_framework/util.py        | 29 +++++++++
 6 files changed, 61 insertions(+), 145 deletions(-)

diff --git a/qa/rpc-tests/getblocktemplate_longpoll.py b/qa/rpc-tests/getblocktemplate_longpoll.py
index 3e85957ae2323..e2a839f718924 100755
--- a/qa/rpc-tests/getblocktemplate_longpoll.py
+++ b/qa/rpc-tests/getblocktemplate_longpoll.py
@@ -6,28 +6,6 @@
 from test_framework.test_framework import BitcoinTestFramework
 from test_framework.util import *
 
-
-def check_array_result(object_array, to_match, expected):
-    """
-    Pass in array of JSON objects, a dictionary with key/value pairs
-    to match against, and another dictionary with expected key/value
-    pairs.
-    """
-    num_matched = 0
-    for item in object_array:
-        all_match = True
-        for key,value in to_match.items():
-            if item[key] != value:
-                all_match = False
-        if not all_match:
-            continue
-        for key,value in expected.items():
-            if item[key] != value:
-                raise AssertionError("%s : expected %s=%s"%(str(item), str(key), str(value)))
-            num_matched = num_matched+1
-    if num_matched == 0:
-        raise AssertionError("No objects matched %s"%(str(to_match)))
-
 import threading
 
 class LongpollThread(threading.Thread):
diff --git a/qa/rpc-tests/getblocktemplate_proposals.py b/qa/rpc-tests/getblocktemplate_proposals.py
index 07bfe69c6d869..be119031baf0b 100755
--- a/qa/rpc-tests/getblocktemplate_proposals.py
+++ b/qa/rpc-tests/getblocktemplate_proposals.py
@@ -10,28 +10,6 @@
 from hashlib import sha256
 from struct import pack
 
-
-def check_array_result(object_array, to_match, expected):
-    """
-    Pass in array of JSON objects, a dictionary with key/value pairs
-    to match against, and another dictionary with expected key/value
-    pairs.
-    """
-    num_matched = 0
-    for item in object_array:
-        all_match = True
-        for key,value in to_match.items():
-            if item[key] != value:
-                all_match = False
-        if not all_match:
-            continue
-        for key,value in expected.items():
-            if item[key] != value:
-                raise AssertionError("%s : expected %s=%s"%(str(item), str(key), str(value)))
-            num_matched = num_matched+1
-    if num_matched == 0:
-        raise AssertionError("No objects matched %s"%(str(to_match)))
-
 def b2x(b):
     return b2a_hex(b).decode('ascii')
 
diff --git a/qa/rpc-tests/keypool.py b/qa/rpc-tests/keypool.py
index 5253d49c308f7..b86c085e0009e 100755
--- a/qa/rpc-tests/keypool.py
+++ b/qa/rpc-tests/keypool.py
@@ -10,28 +10,6 @@
 from test_framework.test_framework import BitcoinTestFramework
 from test_framework.util import *
 
-
-def check_array_result(object_array, to_match, expected):
-    """
-    Pass in array of JSON objects, a dictionary with key/value pairs
-    to match against, and another dictionary with expected key/value
-    pairs.
-    """
-    num_matched = 0
-    for item in object_array:
-        all_match = True
-        for key,value in to_match.items():
-            if item[key] != value:
-                all_match = False
-        if not all_match:
-            continue
-        for key,value in expected.items():
-            if item[key] != value:
-                raise AssertionError("%s : expected %s=%s"%(str(item), str(key), str(value)))
-            num_matched = num_matched+1
-    if num_matched == 0:
-        raise AssertionError("No objects matched %s"%(str(to_match)))
-
 class KeyPoolTest(BitcoinTestFramework):
 
     def run_test(self):
diff --git a/qa/rpc-tests/listtransactions.py b/qa/rpc-tests/listtransactions.py
index 0783a1f3d3717..4e5809f4a77d8 100755
--- a/qa/rpc-tests/listtransactions.py
+++ b/qa/rpc-tests/listtransactions.py
@@ -16,27 +16,6 @@ def txFromHex(hexstring):
     tx.deserialize(f)
     return tx
 
-def check_array_result(object_array, to_match, expected):
-    """
-    Pass in array of JSON objects, a dictionary with key/value pairs
-    to match against, and another dictionary with expected key/value
-    pairs.
-    """
-    num_matched = 0
-    for item in object_array:
-        all_match = True
-        for key,value in to_match.items():
-            if item[key] != value:
-                all_match = False
-        if not all_match:
-            continue
-        for key,value in expected.items():
-            if item[key] != value:
-                raise AssertionError("%s : expected %s=%s"%(str(item), str(key), str(value)))
-            num_matched = num_matched+1
-    if num_matched == 0:
-        raise AssertionError("No objects matched %s"%(str(to_match)))
-
 class ListTransactionsTest(BitcoinTestFramework):
 
     def setup_nodes(self):
@@ -48,28 +27,28 @@ def run_test(self):
         # Simple send, 0 to 1:
         txid = self.nodes[0].sendtoaddress(self.nodes[1].getnewaddress(), 0.1)
         self.sync_all()
-        check_array_result(self.nodes[0].listtransactions(),
+        assert_array_result(self.nodes[0].listtransactions(),
                            {"txid":txid},
                            {"category":"send","account":"","amount":Decimal("-0.1"),"confirmations":0})
-        check_array_result(self.nodes[1].listtransactions(),
+        assert_array_result(self.nodes[1].listtransactions(),
                            {"txid":txid},
                            {"category":"receive","account":"","amount":Decimal("0.1"),"confirmations":0})
         # mine a block, confirmations should change:
         self.nodes[0].generate(1)
         self.sync_all()
-        check_array_result(self.nodes[0].listtransactions(),
+        assert_array_result(self.nodes[0].listtransactions(),
                            {"txid":txid},
                            {"category":"send","account":"","amount":Decimal("-0.1"),"confirmations":1})
-        check_array_result(self.nodes[1].listtransactions(),
+        assert_array_result(self.nodes[1].listtransactions(),
                            {"txid":txid},
                            {"category":"receive","account":"","amount":Decimal("0.1"),"confirmations":1})
 
         # send-to-self:
         txid = self.nodes[0].sendtoaddress(self.nodes[0].getnewaddress(), 0.2)
-        check_array_result(self.nodes[0].listtransactions(),
+        assert_array_result(self.nodes[0].listtransactions(),
                            {"txid":txid, "category":"send"},
                            {"amount":Decimal("-0.2")})
-        check_array_result(self.nodes[0].listtransactions(),
+        assert_array_result(self.nodes[0].listtransactions(),
                            {"txid":txid, "category":"receive"},
                            {"amount":Decimal("0.2")})
 
@@ -80,28 +59,28 @@ def run_test(self):
                     self.nodes[1].getaccountaddress("toself") : 0.44 }
         txid = self.nodes[1].sendmany("", send_to)
         self.sync_all()
-        check_array_result(self.nodes[1].listtransactions(),
+        assert_array_result(self.nodes[1].listtransactions(),
                            {"category":"send","amount":Decimal("-0.11")},
                            {"txid":txid} )
-        check_array_result(self.nodes[0].listtransactions(),
+        assert_array_result(self.nodes[0].listtransactions(),
                            {"category":"receive","amount":Decimal("0.11")},
                            {"txid":txid} )
-        check_array_result(self.nodes[1].listtransactions(),
+        assert_array_result(self.nodes[1].listtransactions(),
                            {"category":"send","amount":Decimal("-0.22")},
                            {"txid":txid} )
-        check_array_result(self.nodes[1].listtransactions(),
+        assert_array_result(self.nodes[1].listtransactions(),
                            {"category":"receive","amount":Decimal("0.22")},
                            {"txid":txid} )
-        check_array_result(self.nodes[1].listtransactions(),
+        assert_array_result(self.nodes[1].listtransactions(),
                            {"category":"send","amount":Decimal("-0.33")},
                            {"txid":txid} )
-        check_array_result(self.nodes[0].listtransactions(),
+        assert_array_result(self.nodes[0].listtransactions(),
                            {"category":"receive","amount":Decimal("0.33")},
                            {"txid":txid, "account" : "from1"} )
-        check_array_result(self.nodes[1].listtransactions(),
+        assert_array_result(self.nodes[1].listtransactions(),
                            {"category":"send","amount":Decimal("-0.44")},
                            {"txid":txid, "account" : ""} )
-        check_array_result(self.nodes[1].listtransactions(),
+        assert_array_result(self.nodes[1].listtransactions(),
                            {"category":"receive","amount":Decimal("0.44")},
                            {"txid":txid, "account" : "toself"} )
 
@@ -111,7 +90,7 @@ def run_test(self):
         self.nodes[1].generate(1)
         self.sync_all()
         assert(len(self.nodes[0].listtransactions("watchonly", 100, 0, False)) == 0)
-        check_array_result(self.nodes[0].listtransactions("watchonly", 100, 0, True),
+        assert_array_result(self.nodes[0].listtransactions("watchonly", 100, 0, True),
                            {"category":"receive","amount":Decimal("0.1")},
                            {"txid":txid, "account" : "watchonly"} )
 
@@ -139,9 +118,9 @@ def get_unconfirmed_utxo_entry(node, txid_to_match):
         # 1. Chain a few transactions that don't opt-in.
         txid_1 = self.nodes[0].sendtoaddress(self.nodes[1].getnewaddress(), 1)
         assert(not is_opt_in(self.nodes[0], txid_1))
-        check_array_result(self.nodes[0].listtransactions(), {"txid": txid_1}, {"bip125-replaceable":"no"})
+        assert_array_result(self.nodes[0].listtransactions(), {"txid": txid_1}, {"bip125-replaceable":"no"})
         sync_mempools(self.nodes)
-        check_array_result(self.nodes[1].listtransactions(), {"txid": txid_1}, {"bip125-replaceable":"no"})
+        assert_array_result(self.nodes[1].listtransactions(), {"txid": txid_1}, {"bip125-replaceable":"no"})
 
         # Tx2 will build off txid_1, still not opting in to RBF.
         utxo_to_use = get_unconfirmed_utxo_entry(self.nodes[1], txid_1)
@@ -155,9 +134,9 @@ def get_unconfirmed_utxo_entry(node, txid_to_match):
 
         # ...and check the result
         assert(not is_opt_in(self.nodes[1], txid_2))
-        check_array_result(self.nodes[1].listtransactions(), {"txid": txid_2}, {"bip125-replaceable":"no"})
+        assert_array_result(self.nodes[1].listtransactions(), {"txid": txid_2}, {"bip125-replaceable":"no"})
         sync_mempools(self.nodes)
-        check_array_result(self.nodes[0].listtransactions(), {"txid": txid_2}, {"bip125-replaceable":"no"})
+        assert_array_result(self.nodes[0].listtransactions(), {"txid": txid_2}, {"bip125-replaceable":"no"})
 
         # Tx3 will opt-in to RBF
         utxo_to_use = get_unconfirmed_utxo_entry(self.nodes[0], txid_2)
@@ -171,9 +150,9 @@ def get_unconfirmed_utxo_entry(node, txid_to_match):
         txid_3 = self.nodes[0].sendrawtransaction(tx3_signed)
 
         assert(is_opt_in(self.nodes[0], txid_3))
-        check_array_result(self.nodes[0].listtransactions(), {"txid": txid_3}, {"bip125-replaceable":"yes"})
+        assert_array_result(self.nodes[0].listtransactions(), {"txid": txid_3}, {"bip125-replaceable":"yes"})
         sync_mempools(self.nodes)
-        check_array_result(self.nodes[1].listtransactions(), {"txid": txid_3}, {"bip125-replaceable":"yes"})
+        assert_array_result(self.nodes[1].listtransactions(), {"txid": txid_3}, {"bip125-replaceable":"yes"})
 
         # Tx4 will chain off tx3.  Doesn't signal itself, but depends on one
         # that does.
@@ -185,9 +164,9 @@ def get_unconfirmed_utxo_entry(node, txid_to_match):
         txid_4 = self.nodes[1].sendrawtransaction(tx4_signed)
 
         assert(not is_opt_in(self.nodes[1], txid_4))
-        check_array_result(self.nodes[1].listtransactions(), {"txid": txid_4}, {"bip125-replaceable":"yes"})
+        assert_array_result(self.nodes[1].listtransactions(), {"txid": txid_4}, {"bip125-replaceable":"yes"})
         sync_mempools(self.nodes)
-        check_array_result(self.nodes[0].listtransactions(), {"txid": txid_4}, {"bip125-replaceable":"yes"})
+        assert_array_result(self.nodes[0].listtransactions(), {"txid": txid_4}, {"bip125-replaceable":"yes"})
 
         # Replace tx3, and check that tx4 becomes unknown
         tx3_b = tx3_modified
@@ -197,9 +176,9 @@ def get_unconfirmed_utxo_entry(node, txid_to_match):
         txid_3b = self.nodes[0].sendrawtransaction(tx3_b_signed, True)
         assert(is_opt_in(self.nodes[0], txid_3b))
 
-        check_array_result(self.nodes[0].listtransactions(), {"txid": txid_4}, {"bip125-replaceable":"unknown"})
+        assert_array_result(self.nodes[0].listtransactions(), {"txid": txid_4}, {"bip125-replaceable":"unknown"})
         sync_mempools(self.nodes)
-        check_array_result(self.nodes[1].listtransactions(), {"txid": txid_4}, {"bip125-replaceable":"unknown"})
+        assert_array_result(self.nodes[1].listtransactions(), {"txid": txid_4}, {"bip125-replaceable":"unknown"})
 
         # Check gettransaction as well:
         for n in self.nodes[0:2]:
diff --git a/qa/rpc-tests/receivedby.py b/qa/rpc-tests/receivedby.py
index 606426b394199..7d8231f5e47cf 100755
--- a/qa/rpc-tests/receivedby.py
+++ b/qa/rpc-tests/receivedby.py
@@ -25,32 +25,6 @@ def get_sub_array_from_array(object_array, to_match):
         return item
     return []
 
-def check_array_result(object_array, to_match, expected, should_not_find = False):
-    """
-        Pass in array of JSON objects, a dictionary with key/value pairs
-        to match against, and another dictionary with expected key/value
-        pairs.
-        If the should_not_find flag is true, to_match should not be found in object_array
-        """
-    if should_not_find == True:
-        expected = { }
-    num_matched = 0
-    for item in object_array:
-        all_match = True
-        for key,value in to_match.items():
-            if item[key] != value:
-                all_match = False
-        if not all_match:
-            continue
-        for key,value in expected.items():
-            if item[key] != value:
-                raise AssertionError("%s : expected %s=%s"%(str(item), str(key), str(value)))
-            num_matched = num_matched+1
-    if num_matched == 0 and should_not_find != True:
-        raise AssertionError("No objects matched %s"%(str(to_match)))
-    if num_matched > 0 and should_not_find == True:
-        raise AssertionError("Objects was matched %s"%(str(to_match)))
-
 class ReceivedByTest(BitcoinTestFramework):
 
     def setup_nodes(self):
@@ -68,26 +42,26 @@ def run_test(self):
         self.sync_all()
 
         #Check not listed in listreceivedbyaddress because has 0 confirmations
-        check_array_result(self.nodes[1].listreceivedbyaddress(),
+        assert_array_result(self.nodes[1].listreceivedbyaddress(),
                            {"address":addr},
                            { },
                            True)
         #Bury Tx under 10 block so it will be returned by listreceivedbyaddress
         self.nodes[1].generate(10)
         self.sync_all()
-        check_array_result(self.nodes[1].listreceivedbyaddress(),
+        assert_array_result(self.nodes[1].listreceivedbyaddress(),
                            {"address":addr},
                            {"address":addr, "account":"", "amount":Decimal("0.1"), "confirmations":10, "txids":[txid,]})
         #With min confidence < 10
-        check_array_result(self.nodes[1].listreceivedbyaddress(5),
+        assert_array_result(self.nodes[1].listreceivedbyaddress(5),
                            {"address":addr},
                            {"address":addr, "account":"", "amount":Decimal("0.1"), "confirmations":10, "txids":[txid,]})
         #With min confidence > 10, should not find Tx
-        check_array_result(self.nodes[1].listreceivedbyaddress(11),{"address":addr},{ },True)
+        assert_array_result(self.nodes[1].listreceivedbyaddress(11),{"address":addr},{ },True)
 
         #Empty Tx
         addr = self.nodes[1].getnewaddress()
-        check_array_result(self.nodes[1].listreceivedbyaddress(0,True),
+        assert_array_result(self.nodes[1].listreceivedbyaddress(0,True),
                            {"address":addr},
                            {"address":addr, "account":"", "amount":0, "confirmations":0, "txids":[]})
 
@@ -131,7 +105,7 @@ def run_test(self):
         self.sync_all()
 
         # listreceivedbyaccount should return received_by_account_json because of 0 confirmations
-        check_array_result(self.nodes[1].listreceivedbyaccount(),
+        assert_array_result(self.nodes[1].listreceivedbyaccount(),
                            {"account":account},
                            received_by_account_json)
 
@@ -143,7 +117,7 @@ def run_test(self):
         self.nodes[1].generate(10)
         self.sync_all()
         # listreceivedbyaccount should return updated account balance
-        check_array_result(self.nodes[1].listreceivedbyaccount(),
+        assert_array_result(self.nodes[1].listreceivedbyaccount(),
                            {"account":account},
                            {"account":received_by_account_json["account"], "amount":(received_by_account_json["amount"] + Decimal("0.1"))})
 
diff --git a/qa/rpc-tests/test_framework/util.py b/qa/rpc-tests/test_framework/util.py
index 8b720b54a1a3d..27891f7f4c383 100644
--- a/qa/rpc-tests/test_framework/util.py
+++ b/qa/rpc-tests/test_framework/util.py
@@ -478,6 +478,35 @@ def assert_is_hash_string(string, length=64):
         raise AssertionError(
             "String %r contains invalid characters for a hash." % string)
 
+def assert_array_result(object_array, to_match, expected, should_not_find = False):
+    """
+        Pass in array of JSON objects, a dictionary with key/value pairs
+        to match against, and another dictionary with expected key/value
+        pairs.
+        If the should_not_find flag is true, to_match should not be found
+        in object_array
+        """
+    if should_not_find == True:
+        expected = { }
+    num_matched = 0
+    for item in object_array:
+        all_match = True
+        for key,value in to_match.items():
+            if item[key] != value:
+                all_match = False
+        if not all_match:
+            continue
+        elif should_not_find == True:
+            num_matched = num_matched+1
+        for key,value in expected.items():
+            if item[key] != value:
+                raise AssertionError("%s : expected %s=%s"%(str(item), str(key), str(value)))
+            num_matched = num_matched+1
+    if num_matched == 0 and should_not_find != True:
+        raise AssertionError("No objects matched %s"%(str(to_match)))
+    if num_matched > 0 and should_not_find == True:
+        raise AssertionError("Objects were found %s"%(str(to_match)))
+
 def satoshi_round(amount):
     return Decimal(amount).quantize(Decimal('0.00000001'), rounding=ROUND_DOWN)
 

From 5d217decc1145823a3c126658c82c60cf7dbfec8 Mon Sep 17 00:00:00 2001
From: Joao Fonseca <jpdf.fonseca@gmail.com>
Date: Tue, 19 Apr 2016 12:28:37 +0100
Subject: [PATCH 0170/1802] Add test to check spendable and unspendable UTXO on
 RPC listunspent

---
 qa/rpc-tests/wallet.py | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/qa/rpc-tests/wallet.py b/qa/rpc-tests/wallet.py
index 8fdcea50b6329..555f836482d20 100755
--- a/qa/rpc-tests/wallet.py
+++ b/qa/rpc-tests/wallet.py
@@ -32,6 +32,12 @@ def setup_network(self, split=False):
         self.sync_all()
 
     def run_test (self):
+
+        # Check that there's no UTXO on none of the nodes
+        assert_equal(len(self.nodes[0].listunspent()), 0)
+        assert_equal(len(self.nodes[1].listunspent()), 0)
+        assert_equal(len(self.nodes[2].listunspent()), 0)
+
         print "Mining blocks..."
 
         self.nodes[0].generate(1)
@@ -48,6 +54,11 @@ def run_test (self):
         assert_equal(self.nodes[1].getbalance(), 50)
         assert_equal(self.nodes[2].getbalance(), 0)
 
+        # Check that only first and second nodes have UTXOs
+        assert_equal(len(self.nodes[0].listunspent()), 1)
+        assert_equal(len(self.nodes[1].listunspent()), 1)
+        assert_equal(len(self.nodes[2].listunspent()), 0)
+
         # Send 21 BTC from 0 to 2 using sendtoaddress call.
         self.nodes[0].sendtoaddress(self.nodes[2].getnewaddress(), 11)
         self.nodes[0].sendtoaddress(self.nodes[2].getnewaddress(), 10)
@@ -259,6 +270,32 @@ def run_test (self):
         except JSONRPCException as e:
             assert("not an integer" in e.error['message'])
 
+        # Import address and private key to check correct behavior of spendable unspents
+        # 1. Send some coins to generate new UTXO
+        address_to_import = self.nodes[2].getnewaddress()
+        txid = self.nodes[0].sendtoaddress(address_to_import, 1)
+        self.nodes[0].generate(1)
+        self.sync_all()
+
+        # 2. Import address from node2 to node1
+        self.nodes[1].importaddress(address_to_import)
+
+        # 3. Validate that the imported address is watch-only on node1
+        assert(self.nodes[1].validateaddress(address_to_import)["iswatchonly"])
+
+        # 4. Check that the unspents after import are not spendable
+        assert_array_result(self.nodes[1].listunspent(),
+                           {"address": address_to_import},
+                           {"spendable": False})
+
+        # 5. Import private key of the previously imported address on node1
+        priv_key = self.nodes[2].dumpprivkey(address_to_import)
+        self.nodes[1].importprivkey(priv_key)
+
+        # 6. Check that the unspents are now spendable on node1
+        assert_array_result(self.nodes[1].listunspent(),
+                           {"address": address_to_import},
+                           {"spendable": True})
 
         # Mine a block from node0 to an address from node1
         cbAddr = self.nodes[1].getnewaddress()

From 0b25a9fb42d5df54ea35ddb2bb4837e1e29355fd Mon Sep 17 00:00:00 2001
From: Jonas Schnelli <dev@jonasschnelli.ch>
Date: Tue, 29 Mar 2016 14:30:02 +0200
Subject: [PATCH 0171/1802] [ZMQ] append a message sequence number to every ZMQ
 notification

---
 contrib/zmq/zmq_sub.py         | 14 +++++++++-----
 doc/release-notes.md           |  9 +++++++++
 doc/zmq.md                     |  5 +++++
 qa/rpc-tests/zmq_test.py       | 13 +++++++++++++
 src/zmq/zmqpublishnotifier.cpp | 29 +++++++++++++++++++++--------
 src/zmq/zmqpublishnotifier.h   | 12 ++++++++++++
 6 files changed, 69 insertions(+), 13 deletions(-)

diff --git a/contrib/zmq/zmq_sub.py b/contrib/zmq/zmq_sub.py
index decf29d42a4c1..6268123dd8e53 100755
--- a/contrib/zmq/zmq_sub.py
+++ b/contrib/zmq/zmq_sub.py
@@ -3,6 +3,7 @@
 import array
 import binascii
 import zmq
+import struct
 
 port = 28332
 
@@ -19,18 +20,21 @@
         msg = zmqSubSocket.recv_multipart()
         topic = str(msg[0])
         body = msg[1]
-
+        sequence = "Unknown";
+        if len(msg[-1]) == 4:
+          msgSequence = struct.unpack('<I', msg[-1])[-1]
+          sequence = str(msgSequence)
         if topic == "hashblock":
-            print "- HASH BLOCK -"
+            print '- HASH BLOCK ('+sequence+') -'
             print binascii.hexlify(body)
         elif topic == "hashtx":
-            print '- HASH TX -'
+            print '- HASH TX  ('+sequence+') -'
             print binascii.hexlify(body)
         elif topic == "rawblock":
-            print "- RAW BLOCK HEADER -"
+            print '- RAW BLOCK HEADER ('+sequence+') -'
             print binascii.hexlify(body[:80])
         elif topic == "rawtx":
-            print '- RAW TX -'
+            print '- RAW TX ('+sequence+') -'
             print binascii.hexlify(body)
 
 except KeyboardInterrupt:
diff --git a/doc/release-notes.md b/doc/release-notes.md
index 806d174ebf7fc..9fb1a1307228d 100644
--- a/doc/release-notes.md
+++ b/doc/release-notes.md
@@ -45,6 +45,15 @@ The following outputs are affected by this change:
 - REST `/rest/block/` (JSON format when including extended tx details)
 - `bitcoin-tx -json`
 
+### ZMQ
+
+Each ZMQ notification now contains an up-counting sequence number that allows
+listeners to detect lost notifications.
+The sequence number is always the last element in a multi-part ZMQ notification and
+therefore backward compatible.
+Each message type has its own counter.
+(https://github.com/bitcoin/bitcoin/pull/7762)
+
 ### Configuration and command-line options
 
 ### Block and transaction handling
diff --git a/doc/zmq.md b/doc/zmq.md
index 902d1124c766d..8d795a388a9b4 100644
--- a/doc/zmq.md
+++ b/doc/zmq.md
@@ -99,3 +99,8 @@ using other means such as firewalling.
 Note that when the block chain tip changes, a reorganisation may occur
 and just the tip will be notified. It is up to the subscriber to
 retrieve the chain from the last known block to the new tip.
+
+There are several possibilities that ZMQ notification can get lost
+during transmission depending on the communication type your are
+using. Bitcoind appends an up-counting sequence number to each
+notification which allows listeners to detect lost notifications.
diff --git a/qa/rpc-tests/zmq_test.py b/qa/rpc-tests/zmq_test.py
index 3a8d62ef2eddc..97850bea3c022 100755
--- a/qa/rpc-tests/zmq_test.py
+++ b/qa/rpc-tests/zmq_test.py
@@ -11,6 +11,7 @@
 from test_framework.util import *
 import zmq
 import binascii
+import struct
 
 try:
     import http.client as httplib
@@ -47,11 +48,17 @@ def run_test(self):
         print "listen..."
         msg = self.zmqSubSocket.recv_multipart()
         topic = msg[0]
+        assert_equal(topic, b"hashtx")
         body = msg[1]
+        nseq = msg[2]
+        msgSequence = struct.unpack('<I', msg[-1])[-1]
+        assert_equal(msgSequence, 0) #must be sequence 0 on hashtx
 
         msg = self.zmqSubSocket.recv_multipart()
         topic = msg[0]
         body = msg[1]
+        msgSequence = struct.unpack('<I', msg[-1])[-1]
+        assert_equal(msgSequence, 0) #must be sequence 0 on hashblock
         blkhash = bytes_to_hex_str(body)
 
         assert_equal(genhashes[0], blkhash) #blockhash from generate must be equal to the hash received over zmq
@@ -61,12 +68,16 @@ def run_test(self):
         self.sync_all()
 
         zmqHashes = []
+        blockcount = 0
         for x in range(0,n*2):
             msg = self.zmqSubSocket.recv_multipart()
             topic = msg[0]
             body = msg[1]
             if topic == b"hashblock":
                 zmqHashes.append(bytes_to_hex_str(body))
+                msgSequence = struct.unpack('<I', msg[-1])[-1]
+                assert_equal(msgSequence, blockcount+1)
+                blockcount += 1
 
         for x in range(0,n):
             assert_equal(genhashes[x], zmqHashes[x]) #blockhash from generate must be equal to the hash received over zmq
@@ -82,6 +93,8 @@ def run_test(self):
         hashZMQ = ""
         if topic == b"hashtx":
             hashZMQ = bytes_to_hex_str(body)
+            msgSequence = struct.unpack('<I', msg[-1])[-1]
+            assert_equal(msgSequence, blockcount+1)
 
         assert_equal(hashRPC, hashZMQ) #blockhash from generate must be equal to the hash received over zmq
 
diff --git a/src/zmq/zmqpublishnotifier.cpp b/src/zmq/zmqpublishnotifier.cpp
index a9ce9c48c4b55..b6c907980f0c3 100644
--- a/src/zmq/zmqpublishnotifier.cpp
+++ b/src/zmq/zmqpublishnotifier.cpp
@@ -123,6 +123,23 @@ void CZMQAbstractPublishNotifier::Shutdown()
     psocket = 0;
 }
 
+bool CZMQAbstractPublishNotifier::SendMessage(const char *command, const void* data, size_t size)
+{
+    assert(psocket);
+
+    /* send three parts, command & data & a LE 4byte sequence number */
+    unsigned char msgseq[sizeof(uint32_t)];
+    WriteLE32(&msgseq[0], nSequence);
+    int rc = zmq_send_multipart(psocket, command, strlen(command), data, size, msgseq, (size_t)sizeof(uint32_t), (void*)0);
+    if (rc == -1)
+        return false;
+
+    /* increment memory only sequence number after sending */
+    nSequence++;
+
+    return true;
+}
+
 bool CZMQPublishHashBlockNotifier::NotifyBlock(const CBlockIndex *pindex)
 {
     uint256 hash = pindex->GetBlockHash();
@@ -130,8 +147,7 @@ bool CZMQPublishHashBlockNotifier::NotifyBlock(const CBlockIndex *pindex)
     char data[32];
     for (unsigned int i = 0; i < 32; i++)
         data[31 - i] = hash.begin()[i];
-    int rc = zmq_send_multipart(psocket, MSG_HASHBLOCK, 9, data, 32, 0);
-    return rc == 0;
+    return SendMessage(MSG_HASHBLOCK, data, 32);
 }
 
 bool CZMQPublishHashTransactionNotifier::NotifyTransaction(const CTransaction &transaction)
@@ -141,8 +157,7 @@ bool CZMQPublishHashTransactionNotifier::NotifyTransaction(const CTransaction &t
     char data[32];
     for (unsigned int i = 0; i < 32; i++)
         data[31 - i] = hash.begin()[i];
-    int rc = zmq_send_multipart(psocket, MSG_HASHTX, 6, data, 32, 0);
-    return rc == 0;
+    return SendMessage(MSG_HASHTX, data, 32);
 }
 
 bool CZMQPublishRawBlockNotifier::NotifyBlock(const CBlockIndex *pindex)
@@ -163,8 +178,7 @@ bool CZMQPublishRawBlockNotifier::NotifyBlock(const CBlockIndex *pindex)
         ss << block;
     }
 
-    int rc = zmq_send_multipart(psocket, MSG_RAWBLOCK, 8, &(*ss.begin()), ss.size(), 0);
-    return rc == 0;
+    return SendMessage(MSG_RAWBLOCK, &(*ss.begin()), ss.size());
 }
 
 bool CZMQPublishRawTransactionNotifier::NotifyTransaction(const CTransaction &transaction)
@@ -173,6 +187,5 @@ bool CZMQPublishRawTransactionNotifier::NotifyTransaction(const CTransaction &tr
     LogPrint("zmq", "zmq: Publish rawtx %s\n", hash.GetHex());
     CDataStream ss(SER_NETWORK, PROTOCOL_VERSION);
     ss << transaction;
-    int rc = zmq_send_multipart(psocket, MSG_RAWTX, 5, &(*ss.begin()), ss.size(), 0);
-    return rc == 0;
+    return SendMessage(MSG_RAWTX, &(*ss.begin()), ss.size());
 }
diff --git a/src/zmq/zmqpublishnotifier.h b/src/zmq/zmqpublishnotifier.h
index 44d5cbea67d20..22f02a3d0dbb8 100644
--- a/src/zmq/zmqpublishnotifier.h
+++ b/src/zmq/zmqpublishnotifier.h
@@ -11,7 +11,19 @@ class CBlockIndex;
 
 class CZMQAbstractPublishNotifier : public CZMQAbstractNotifier
 {
+private:
+    uint32_t nSequence; //! upcounting per message sequence number
+
 public:
+
+    /* send zmq multipart message
+       parts:
+          * command
+          * data
+          * message sequence number
+    */
+    bool SendMessage(const char *command, const void* data, size_t size);
+
     bool Initialize(void *pcontext);
     void Shutdown();
 };

From fa10ce6a6dd0a6f00f6528e12f1de7a7fcb08928 Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Tue, 19 Apr 2016 16:10:19 +0200
Subject: [PATCH 0172/1802] Move ui_interface.cpp to
 libbitcoin_server_a_SOURCES

It is only needed by bitcoind and bitcoin-qt
---
 src/Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index 10aa550a02bef..585463fc13988 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -203,6 +203,7 @@ libbitcoin_server_a_SOURCES = \
   torcontrol.cpp \
   txdb.cpp \
   txmempool.cpp \
+  ui_interface.cpp \
   validationinterface.cpp \
   versionbits.cpp \
   $(BITCOIN_CORE_H)
@@ -323,7 +324,6 @@ libbitcoin_util_a_SOURCES = \
   rpc/protocol.cpp \
   support/cleanse.cpp \
   sync.cpp \
-  ui_interface.cpp \
   util.cpp \
   utilmoneystr.cpp \
   utilstrencodings.cpp \

From 764d2377727c8945d648a018492a61add4fcf042 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jorge=20Tim=C3=B3n?= <jtimon@jtimon.cc>
Date: Wed, 6 Apr 2016 16:36:32 +0200
Subject: [PATCH 0173/1802] Globals: Explicitly pass const CChainParams& to
 UpdateTip()

---
 src/main.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index a94d52f8954e8..aaf5f9ae64845 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -2570,8 +2570,7 @@ void PruneAndFlush() {
 }
 
 /** Update chainActive and related internal data structures. */
-void static UpdateTip(CBlockIndex *pindexNew) {
-    const CChainParams& chainParams = Params();
+void static UpdateTip(CBlockIndex *pindexNew, const CChainParams& chainParams) {
     chainActive.SetTip(pindexNew);
 
     // New best block
@@ -2631,6 +2630,7 @@ void static UpdateTip(CBlockIndex *pindexNew) {
 /** Disconnect chainActive's tip. You probably want to call mempool.removeForReorg and manually re-limit mempool size after this, with cs_main held. */
 bool static DisconnectTip(CValidationState& state, const Consensus::Params& consensusParams)
 {
+    const CChainParams& chainparams = Params(); // TODO replace consensusParams parameter
     CBlockIndex *pindexDelete = chainActive.Tip();
     assert(pindexDelete);
     // Read block from disk.
@@ -2668,7 +2668,7 @@ bool static DisconnectTip(CValidationState& state, const Consensus::Params& cons
     // block that were added back and cleans up the mempool state.
     mempool.UpdateTransactionsFromBlock(vHashUpdate);
     // Update chainActive and related variables.
-    UpdateTip(pindexDelete->pprev);
+    UpdateTip(pindexDelete->pprev, chainparams);
     // Let wallets know transactions went from 1-confirmed to
     // 0-confirmed or conflicted:
     BOOST_FOREACH(const CTransaction &tx, block.vtx) {
@@ -2727,7 +2727,7 @@ bool static ConnectTip(CValidationState& state, const CChainParams& chainparams,
     list<CTransaction> txConflicted;
     mempool.removeForBlock(pblock->vtx, pindexNew->nHeight, txConflicted, !IsInitialBlockDownload());
     // Update chainActive & related variables.
-    UpdateTip(pindexNew);
+    UpdateTip(pindexNew, chainparams);
     // Tell wallet about transactions that went from mempool
     // to conflicted:
     BOOST_FOREACH(const CTransaction &tx, txConflicted) {

From d0a6353dec48f365c38de3c76b42f67eda737ed5 Mon Sep 17 00:00:00 2001
From: face <face@hmel.org>
Date: Sun, 17 Apr 2016 10:58:50 +0300
Subject: [PATCH 0174/1802] Pass CChainParams to DisconnectTip()

---
 src/main.cpp           | 11 +++++------
 src/main.h             |  2 +-
 src/rpc/blockchain.cpp |  2 +-
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index aaf5f9ae64845..518393000162e 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -2628,14 +2628,13 @@ void static UpdateTip(CBlockIndex *pindexNew, const CChainParams& chainParams) {
 }
 
 /** Disconnect chainActive's tip. You probably want to call mempool.removeForReorg and manually re-limit mempool size after this, with cs_main held. */
-bool static DisconnectTip(CValidationState& state, const Consensus::Params& consensusParams)
+bool static DisconnectTip(CValidationState& state, const CChainParams& chainparams)
 {
-    const CChainParams& chainparams = Params(); // TODO replace consensusParams parameter
     CBlockIndex *pindexDelete = chainActive.Tip();
     assert(pindexDelete);
     // Read block from disk.
     CBlock block;
-    if (!ReadBlockFromDisk(block, pindexDelete, consensusParams))
+    if (!ReadBlockFromDisk(block, pindexDelete, chainparams.GetConsensus()))
         return AbortNode(state, "Failed to read block");
     // Apply the block atomically to the chain state.
     int64_t nStart = GetTimeMicros();
@@ -2828,7 +2827,7 @@ static bool ActivateBestChainStep(CValidationState& state, const CChainParams& c
     // Disconnect active blocks which are no longer in the best chain.
     bool fBlocksDisconnected = false;
     while (chainActive.Tip() && chainActive.Tip() != pindexFork) {
-        if (!DisconnectTip(state, chainparams.GetConsensus()))
+        if (!DisconnectTip(state, chainparams))
             return false;
         fBlocksDisconnected = true;
     }
@@ -2973,7 +2972,7 @@ bool ActivateBestChain(CValidationState &state, const CChainParams& chainparams,
     return true;
 }
 
-bool InvalidateBlock(CValidationState& state, const Consensus::Params& consensusParams, CBlockIndex *pindex)
+bool InvalidateBlock(CValidationState& state, const CChainParams& chainparams, CBlockIndex *pindex)
 {
     AssertLockHeld(cs_main);
 
@@ -2989,7 +2988,7 @@ bool InvalidateBlock(CValidationState& state, const Consensus::Params& consensus
         setBlockIndexCandidates.erase(pindexWalk);
         // ActivateBestChain considers blocks already in chainActive
         // unconditionally valid already, so force disconnect away from it.
-        if (!DisconnectTip(state, consensusParams)) {
+        if (!DisconnectTip(state, chainparams)) {
             mempool.removeForReorg(pcoinsTip, chainActive.Tip()->nHeight + 1, STANDARD_LOCKTIME_VERIFY_FLAGS);
             return false;
         }
diff --git a/src/main.h b/src/main.h
index 0962f44e9439e..e4c98a96964ae 100644
--- a/src/main.h
+++ b/src/main.h
@@ -536,7 +536,7 @@ class CVerifyDB {
 CBlockIndex* FindForkInGlobalIndex(const CChain& chain, const CBlockLocator& locator);
 
 /** Mark a block as invalid. */
-bool InvalidateBlock(CValidationState& state, const Consensus::Params& consensusParams, CBlockIndex *pindex);
+bool InvalidateBlock(CValidationState& state, const CChainParams& chainparams, CBlockIndex *pindex);
 
 /** Remove invalidity status from a block and its descendants. */
 bool ReconsiderBlock(CValidationState& state, CBlockIndex *pindex);
diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp
index b85b2f6b57e19..2670a85c4ffeb 100644
--- a/src/rpc/blockchain.cpp
+++ b/src/rpc/blockchain.cpp
@@ -928,7 +928,7 @@ UniValue invalidateblock(const UniValue& params, bool fHelp)
             throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Block not found");
 
         CBlockIndex* pblockindex = mapBlockIndex[hash];
-        InvalidateBlock(state, Params().GetConsensus(), pblockindex);
+        InvalidateBlock(state, Params(), pblockindex);
     }
 
     if (state.IsValid()) {

From a4625acbf8afbe3f698e8dc7936312c9d2b65d22 Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Wed, 17 Feb 2016 14:35:35 -0500
Subject: [PATCH 0175/1802] leveldb: integrate leveldb into our buildsystem

leveldb's buildsystem causes us a few problems:
- breaks out-of-tree builds
- forces flags used for some tools
- limits cross builds

Rather than continuing to add wrappers around it, simply integrate it into our
build.
---
 configure.ac                 | 22 ++++++++--
 src/Makefile.am              | 22 +++-------
 src/Makefile.leveldb.include | 81 ++++++++++++++++++++++++++++++++++++
 3 files changed, 106 insertions(+), 19 deletions(-)
 create mode 100644 src/Makefile.leveldb.include

diff --git a/configure.ac b/configure.ac
index 6e463dfc5540d..03b90521045ed 100644
--- a/configure.ac
+++ b/configure.ac
@@ -267,7 +267,7 @@ case $host in
      fi
 
      CPPFLAGS="$CPPFLAGS -D_MT -DWIN32 -D_WINDOWS -DBOOST_THREAD_USE_LIB"
-     LEVELDB_TARGET_FLAGS="TARGET_OS=OS_WINDOWS_CROSSCOMPILE"
+     LEVELDB_TARGET_FLAGS="-DOS_WINDOWS"
      if test "x$CXXFLAGS_overridden" = "xno"; then
        CXXFLAGS="$CXXFLAGS -w"
      fi
@@ -289,7 +289,7 @@ case $host in
      ;;
   *darwin*)
      TARGET_OS=darwin
-     LEVELDB_TARGET_FLAGS="TARGET_OS=Darwin"
+     LEVELDB_TARGET_FLAGS="-DOS_MACOSX"
      if  test x$cross_compiling != xyes; then
        BUILD_OS=darwin
        AC_CHECK_PROG([PORT],port, port)
@@ -354,9 +354,11 @@ case $host in
      OBJCXXFLAGS="$CXXFLAGS"
      ;;
    *linux*)
-     TARGET_OS=linux
+     LEVELDB_TARGET_FLAGS="-DOS_LINUX"
      ;;
    *)
+     OTHER_OS=`echo ${host_os} | awk '{print toupper($0)}'`
+     LEVELDB_TARGET_FLAGS="-DOS_${OTHER_OS}"
      ;;
 esac
 
@@ -541,6 +543,18 @@ if test x$use_reduce_exports = xyes; then
   [AC_MSG_ERROR([Cannot set default symbol visibility. Use --disable-reduce-exports.])])
 fi
 
+dnl This can go away when we require c++11
+TEMP_CXXFLAGS="$CXXFLAGS"
+CXXFLAGS="$CXXFLAGS -std=c++0x"
+AC_MSG_CHECKING(for c++11 atomics)
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+  #include <atomic>
+  ]],[[]])],
+  [ AC_MSG_RESULT(yes); LEVELDB_ATOMIC_CPPFLAGS="-DLEVELDB_ATOMIC_PRESENT"; LEVELDB_ATOMIC_CXXFLAGS="-std=c++0x"],
+  [ AC_MSG_RESULT(no)]
+)
+CXXFLAGS="$TEMP_CXXFLAGS"
+
 LEVELDB_CPPFLAGS=
 LIBLEVELDB=
 LIBMEMENV=
@@ -1043,6 +1057,8 @@ AC_SUBST(TESTDEFS)
 AC_SUBST(LEVELDB_TARGET_FLAGS)
 AC_SUBST(MINIUPNPC_CPPFLAGS)
 AC_SUBST(MINIUPNPC_LIBS)
+AC_SUBST(LEVELDB_ATOMIC_CPPFLAGS)
+AC_SUBST(LEVELDB_ATOMIC_CXXFLAGS)
 AC_CONFIG_FILES([Makefile src/Makefile share/setup.nsi share/qt/Info.plist src/test/buildenv.py])
 AC_CONFIG_FILES([qa/pull-tester/run-bitcoind-for-test.sh],[chmod +x qa/pull-tester/run-bitcoind-for-test.sh])
 AC_CONFIG_FILES([qa/pull-tester/tests_config.py],[chmod +x qa/pull-tester/tests_config.py])
diff --git a/src/Makefile.am b/src/Makefile.am
index c1912dafc53bb..3c056386fac7b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -3,6 +3,7 @@ DIST_SUBDIRS = secp256k1 univalue
 AM_LDFLAGS = $(PTHREAD_CFLAGS) $(LIBTOOL_LDFLAGS) $(HARDENED_LDFLAGS)
 AM_CXXFLAGS = $(HARDENED_CXXFLAGS)
 AM_CPPFLAGS = $(HARDENED_CPPFLAGS)
+EXTRA_LIBRARIES =
 
 if EMBEDDED_UNIVALUE
 LIBUNIVALUE = univalue/libunivalue.la
@@ -13,21 +14,6 @@ else
 LIBUNIVALUE = $(UNIVALUE_LIBS)
 endif
 
-if EMBEDDED_LEVELDB
-LEVELDB_CPPFLAGS += -I$(srcdir)/leveldb/include
-LEVELDB_CPPFLAGS += -I$(srcdir)/leveldb/helpers/memenv
-LIBLEVELDB += $(builddir)/leveldb/libleveldb.a
-LIBMEMENV  += $(builddir)/leveldb/libmemenv.a
-
-# NOTE: This dependency is not strictly necessary, but without it make may try to build both in parallel, which breaks the LevelDB build system in a race
-$(LIBLEVELDB): $(LIBMEMENV)
-
-$(LIBLEVELDB) $(LIBMEMENV):
-	@echo "Building LevelDB ..." && $(MAKE) -C $(@D) $(@F) CXX="$(CXX)" \
-	  CC="$(CC)" PLATFORM=$(TARGET_OS) AR="$(AR)" $(LEVELDB_TARGET_FLAGS) \
-          OPT="$(AM_CXXFLAGS) $(PIE_FLAGS) $(CXXFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) -D__STDC_LIMIT_MACROS"
-endif
-
 BITCOIN_CONFIG_INCLUDES=-I$(builddir)/config
 BITCOIN_INCLUDES=-I$(builddir) -I$(builddir)/obj $(BOOST_CPPFLAGS) $(LEVELDB_CPPFLAGS) $(CRYPTO_CFLAGS) $(SSL_CFLAGS)
 
@@ -49,7 +35,7 @@ $(LIBSECP256K1): $(wildcard secp256k1/src/*) $(wildcard secp256k1/include/*)
 
 # Make is not made aware of per-object dependencies to avoid limiting building parallelization
 # But to build the less dependent modules first, we manually select their order here:
-EXTRA_LIBRARIES = \
+EXTRA_LIBRARIES += \
   crypto/libbitcoin_crypto.a \
   libbitcoin_util.a \
   libbitcoin_common.a \
@@ -482,6 +468,10 @@ endif
 	@test -f $(PROTOC)
 	$(AM_V_GEN) $(PROTOC) --cpp_out=$(@D) --proto_path=$(<D) $<
 
+if EMBEDDED_LEVELDB
+include Makefile.leveldb.include
+endif
+
 if ENABLE_TESTS
 include Makefile.test.include
 endif
diff --git a/src/Makefile.leveldb.include b/src/Makefile.leveldb.include
new file mode 100644
index 0000000000000..36a6bc4095ad0
--- /dev/null
+++ b/src/Makefile.leveldb.include
@@ -0,0 +1,81 @@
+LIBLEVELDB_INT = leveldb/libleveldb.a
+LIBMEMENV_INT  = leveldb/libmemenv.a
+
+EXTRA_LIBRARIES += $(LIBLEVELDB_INT)
+EXTRA_LIBRARIES += $(LIBMEMENV_INT)
+
+LIBLEVELDB += $(LIBLEVELDB_INT)
+LIBMEMENV += $(LIBMEMENV_INT)
+
+LEVELDB_CPPFLAGS += -I$(srcdir)/leveldb/include
+LEVELDB_CPPFLAGS += -I$(srcdir)/leveldb/helpers/memenv
+
+LEVELDB_CPPFLAGS_INT =
+LEVELDB_CPPFLAGS_INT += -I$(srcdir)/leveldb
+LEVELDB_CPPFLAGS_INT += $(LEVELDB_TARGET_FLAGS)
+LEVELDB_CPPFLAGS_INT += $(LEVELDB_ATOMIC_CPPFLAGS)
+LEVELDB_CPPFLAGS_INT += -D__STDC_LIMIT_MACROS
+
+if TARGET_WINDOWS
+LEVELDB_CPPFLAGS_INT += -DLEVELDB_PLATFORM_WINDOWS -DWINVER=0x0500 -D__USE_MINGW_ANSI_STDIO=1
+else
+LEVELDB_CPPFLAGS_INT += -DLEVELDB_PLATFORM_POSIX
+endif
+
+LEVELDB_CXXFLAGS_INT =
+LEVELDB_CXXFLAGS_INT += $(LEVELDB_ATOMIC_CXXFLAGS)
+
+leveldb_libleveldb_a_CPPFLAGS = $(AM_CPPFLAGS) $(LEVELDB_CPPFLAGS_INT) $(LEVELDB_CPPFLAGS)
+leveldb_libleveldb_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) $(LEVELDB_CXXFLAGS_INT)
+
+leveldb_libleveldb_a_SOURCES=
+leveldb_libleveldb_a_SOURCES += leveldb/db/builder.cc
+leveldb_libleveldb_a_SOURCES += leveldb/db/c.cc
+leveldb_libleveldb_a_SOURCES += leveldb/db/dbformat.cc
+leveldb_libleveldb_a_SOURCES += leveldb/db/db_impl.cc
+leveldb_libleveldb_a_SOURCES += leveldb/db/db_iter.cc
+leveldb_libleveldb_a_SOURCES += leveldb/db/dumpfile.cc
+leveldb_libleveldb_a_SOURCES += leveldb/db/filename.cc
+leveldb_libleveldb_a_SOURCES += leveldb/db/log_reader.cc
+leveldb_libleveldb_a_SOURCES += leveldb/db/log_writer.cc
+leveldb_libleveldb_a_SOURCES += leveldb/db/memtable.cc
+leveldb_libleveldb_a_SOURCES += leveldb/db/repair.cc
+leveldb_libleveldb_a_SOURCES += leveldb/db/table_cache.cc
+leveldb_libleveldb_a_SOURCES += leveldb/db/version_edit.cc
+leveldb_libleveldb_a_SOURCES += leveldb/db/version_set.cc
+leveldb_libleveldb_a_SOURCES += leveldb/db/write_batch.cc
+leveldb_libleveldb_a_SOURCES += leveldb/table/block_builder.cc
+leveldb_libleveldb_a_SOURCES += leveldb/table/block.cc
+leveldb_libleveldb_a_SOURCES += leveldb/table/filter_block.cc
+leveldb_libleveldb_a_SOURCES += leveldb/table/format.cc
+leveldb_libleveldb_a_SOURCES += leveldb/table/iterator.cc
+leveldb_libleveldb_a_SOURCES += leveldb/table/merger.cc
+leveldb_libleveldb_a_SOURCES += leveldb/table/table_builder.cc
+leveldb_libleveldb_a_SOURCES += leveldb/table/table.cc
+leveldb_libleveldb_a_SOURCES += leveldb/table/two_level_iterator.cc
+leveldb_libleveldb_a_SOURCES += leveldb/util/arena.cc
+leveldb_libleveldb_a_SOURCES += leveldb/util/bloom.cc
+leveldb_libleveldb_a_SOURCES += leveldb/util/cache.cc
+leveldb_libleveldb_a_SOURCES += leveldb/util/coding.cc
+leveldb_libleveldb_a_SOURCES += leveldb/util/comparator.cc
+leveldb_libleveldb_a_SOURCES += leveldb/util/crc32c.cc
+leveldb_libleveldb_a_SOURCES += leveldb/util/env.cc
+leveldb_libleveldb_a_SOURCES += leveldb/util/env_posix.cc
+leveldb_libleveldb_a_SOURCES += leveldb/util/env_win.cc
+leveldb_libleveldb_a_SOURCES += leveldb/util/filter_policy.cc
+leveldb_libleveldb_a_SOURCES += leveldb/util/hash.cc
+leveldb_libleveldb_a_SOURCES += leveldb/util/histogram.cc
+leveldb_libleveldb_a_SOURCES += leveldb/util/logging.cc
+leveldb_libleveldb_a_SOURCES += leveldb/util/options.cc
+leveldb_libleveldb_a_SOURCES += leveldb/util/status.cc
+
+if TARGET_WINDOWS
+leveldb_libleveldb_a_SOURCES += leveldb/util/env_win.cc
+leveldb_libleveldb_a_SOURCES += leveldb/port/port_win.cc
+else
+leveldb_libleveldb_a_SOURCES += leveldb/port/port_posix.cc
+endif
+
+leveldb_libmemenv_a_CPPFLAGS = $(leveldb_libleveldb_a_CPPFLAGS)
+leveldb_libmemenv_a_CXXFLAGS = $(leveldb_libleveldb_a_CXXFLAGS)
+leveldb_libmemenv_a_SOURCES =  leveldb/helpers/memenv/memenv.cc

From ec9ad5f199e4ec6eb05d8ea47016413413fe17e0 Mon Sep 17 00:00:00 2001
From: Patrick Strateman <patrick.strateman@gmail.com>
Date: Tue, 19 Apr 2016 13:07:16 -0700
Subject: [PATCH 0176/1802] Replace memcmp with std::equal in
 CScript::FindAndDelete

Function is stl; std::equal just makes more sense.
---
 src/script/script.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/script/script.h b/src/script/script.h
index d2a68a07ba149..ef3af21d6a3cc 100644
--- a/src/script/script.h
+++ b/src/script/script.h
@@ -574,7 +574,7 @@ class CScript : public CScriptBase
         opcodetype opcode;
         do
         {
-            while (end() - pc >= (long)b.size() && memcmp(&pc[0], &b[0], b.size()) == 0)
+            while (end() - pc >= (long)b.size() && std::equal(b.begin(), b.end(), pc))
             {
                 pc = erase(pc, pc + b.size());
                 ++nFound;

From c0f660c3a39e3b6d75d9a6bf8a9824c347c321b8 Mon Sep 17 00:00:00 2001
From: Patrick Strateman <patrick.strateman@gmail.com>
Date: Tue, 19 Apr 2016 13:13:46 -0700
Subject: [PATCH 0177/1802] Replace c-style cast with c++ style static_cast.

---
 src/script/script.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/script/script.h b/src/script/script.h
index ef3af21d6a3cc..0503b39a76f54 100644
--- a/src/script/script.h
+++ b/src/script/script.h
@@ -574,7 +574,7 @@ class CScript : public CScriptBase
         opcodetype opcode;
         do
         {
-            while (end() - pc >= (long)b.size() && std::equal(b.begin(), b.end(), pc))
+            while (static_cast<size_t>(end() - pc) >= b.size() && std::equal(b.begin(), b.end(), pc))
             {
                 pc = erase(pc, pc + b.size());
                 ++nFound;

From e2a30bc9a9f7d2969e52632f8e8942a4e72f4ba6 Mon Sep 17 00:00:00 2001
From: Gavin Andresen <gavinandresen@gmail.com>
Date: Wed, 3 Feb 2016 16:15:18 -0500
Subject: [PATCH 0178/1802] Unit test for CScript::FindAndDelete

---
 src/test/script_tests.cpp | 117 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 117 insertions(+)

diff --git a/src/test/script_tests.cpp b/src/test/script_tests.cpp
index d42187f9127c2..5e9711a4a7e26 100644
--- a/src/test/script_tests.cpp
+++ b/src/test/script_tests.cpp
@@ -1051,4 +1051,121 @@ BOOST_AUTO_TEST_CASE(script_GetScriptAsm)
     BOOST_CHECK_EQUAL(derSig + "83 " + pubKey, ScriptToAsmStr(CScript() << ToByteVector(ParseHex(derSig + "83")) << vchPubKey));
 }
 
+static CScript
+ScriptFromHex(const char* hex)
+{
+    std::vector<unsigned char> data = ParseHex(hex);
+    return CScript(data.begin(), data.end());
+}
+
+
+BOOST_AUTO_TEST_CASE(script_FindAndDelete)
+{
+    // Exercise the FindAndDelete functionality
+    CScript s;
+    CScript d;
+    CScript expect;
+
+    s = CScript() << OP_1 << OP_2;
+    d = CScript(); // delete nothing should be a no-op
+    expect = s;
+    BOOST_CHECK_EQUAL(s.FindAndDelete(d), 0);
+    BOOST_CHECK(s == expect);
+
+    s = CScript() << OP_1 << OP_2 << OP_3;
+    d = CScript() << OP_2;
+    expect = CScript() << OP_1 << OP_3;
+    BOOST_CHECK_EQUAL(s.FindAndDelete(d), 1);
+    BOOST_CHECK(s == expect);
+
+    s = CScript() << OP_3 << OP_1 << OP_3 << OP_3 << OP_4 << OP_3;
+    d = CScript() << OP_3;
+    expect = CScript() << OP_1 << OP_4;
+    BOOST_CHECK_EQUAL(s.FindAndDelete(d), 4);
+    BOOST_CHECK(s == expect);
+
+    s = ScriptFromHex("0302ff03"); // PUSH 0x02ff03 onto stack
+    d = ScriptFromHex("0302ff03");
+    expect = CScript();
+    BOOST_CHECK_EQUAL(s.FindAndDelete(d), 1);
+    BOOST_CHECK(s == expect);
+
+    s = ScriptFromHex("0302ff030302ff03"); // PUSH 0x2ff03 PUSH 0x2ff03
+    d = ScriptFromHex("0302ff03");
+    expect = CScript();
+    BOOST_CHECK_EQUAL(s.FindAndDelete(d), 2);
+    BOOST_CHECK(s == expect);
+
+    s = ScriptFromHex("0302ff030302ff03");
+    d = ScriptFromHex("02");
+    expect = s; // FindAndDelete matches entire opcodes
+    BOOST_CHECK_EQUAL(s.FindAndDelete(d), 0);
+    BOOST_CHECK(s == expect);
+
+    s = ScriptFromHex("0302ff030302ff03");
+    d = ScriptFromHex("ff");
+    expect = s;
+    BOOST_CHECK_EQUAL(s.FindAndDelete(d), 0);
+    BOOST_CHECK(s == expect);
+
+    // This is an odd edge case: strip of the push-three-bytes
+    // prefix, leaving 02ff03 which is push-two-bytes:
+    s = ScriptFromHex("0302ff030302ff03");
+    d = ScriptFromHex("03");
+    expect = CScript() << ParseHex("ff03") << ParseHex("ff03");
+    BOOST_CHECK_EQUAL(s.FindAndDelete(d), 2);
+    BOOST_CHECK(s == expect);
+
+    // Byte sequence that spans multiple opcodes:
+    s = ScriptFromHex("02feed5169"); // PUSH(0xfeed) OP_1 OP_VERIFY
+    d = ScriptFromHex("feed51");
+    expect = s;
+    BOOST_CHECK_EQUAL(s.FindAndDelete(d), 0); // doesn't match 'inside' opcodes
+    BOOST_CHECK(s == expect);
+
+    s = ScriptFromHex("02feed5169"); // PUSH(0xfeed) OP_1 OP_VERIFY
+    d = ScriptFromHex("02feed51");
+    expect = ScriptFromHex("69");
+    BOOST_CHECK_EQUAL(s.FindAndDelete(d), 1);
+    BOOST_CHECK(s == expect);
+
+    s = ScriptFromHex("516902feed5169");
+    d = ScriptFromHex("feed51");
+    expect = s;
+    BOOST_CHECK_EQUAL(s.FindAndDelete(d), 0);
+    BOOST_CHECK(s == expect);
+
+    s = ScriptFromHex("516902feed5169");
+    d = ScriptFromHex("02feed51");
+    expect = ScriptFromHex("516969");
+    BOOST_CHECK_EQUAL(s.FindAndDelete(d), 1);
+    BOOST_CHECK(s == expect);
+
+    s = CScript() << OP_0 << OP_0 << OP_1 << OP_1;
+    d = CScript() << OP_0 << OP_1;
+    expect = CScript() << OP_0 << OP_1; // FindAndDelete is single-pass
+    BOOST_CHECK_EQUAL(s.FindAndDelete(d), 1);
+    BOOST_CHECK(s == expect);
+
+    s = CScript() << OP_0 << OP_0 << OP_1 << OP_0 << OP_1 << OP_1;
+    d = CScript() << OP_0 << OP_1;
+    expect = CScript() << OP_0 << OP_1; // FindAndDelete is single-pass
+    BOOST_CHECK_EQUAL(s.FindAndDelete(d), 2);
+    BOOST_CHECK(s == expect);
+
+    // Another weird edge case:
+    // End with invalid push (not enough data)...
+    s = ScriptFromHex("0003feed");
+    d = ScriptFromHex("03feed"); // ... can remove the invalid push
+    expect = ScriptFromHex("00");
+    BOOST_CHECK_EQUAL(s.FindAndDelete(d), 1);
+    BOOST_CHECK(s == expect);
+
+    s = ScriptFromHex("0003feed");
+    d = ScriptFromHex("00");
+    expect = ScriptFromHex("03feed");
+    BOOST_CHECK_EQUAL(s.FindAndDelete(d), 1);
+    BOOST_CHECK(s == expect);
+}
+
 BOOST_AUTO_TEST_SUITE_END()

From f2d3ba73860e875972738d1da1507124d0971ae5 Mon Sep 17 00:00:00 2001
From: Gregory Maxwell <greg@xiph.org>
Date: Mon, 4 Apr 2016 02:36:47 +0000
Subject: [PATCH 0179/1802] Eliminate TX trickle bypass, sort TX invs for
 privacy and priority.

Previously Bitcoin would send 1/4 of transactions out to all peers
 instantly.  This causes high overhead because it makes >80% of
 INVs size 1.  Doing so harms privacy, because it limits the
 amount of source obscurity a transaction can receive.

These randomized broadcasts also disobeyed transaction dependencies
 and required use of the orphan pool.  Because the orphan pool is
 so small this leads to poor propagation for dependent transactions.

When the bypass wasn't in effect, transactions were sent in the
 order they were received.  This avoided creating orphans but
 undermines privacy fairly significantly.

This commit:
 Eliminates the bypass. The bypass is replaced by halving the
  average delay for outbound peers.

 Sorts candidate transactions for INV by their topological
  depth then by their feerate (then hash); removing the
  information leakage and providing priority service to
  higher fee transactions.

 Limits the amount of transactions sent in a single INV to
  7tx/sec (and twice that for outbound); this limits the
  harm of low fee transaction floods, gives faster relay
  service to higher fee transactions. The 7 sounds lower
  than it really is because received advertisements need
  not be sent, and because the aggregate rate is multipled
  by the number of peers.
---
 src/main.cpp      | 60 ++++++++++++++++++++++++++++-------------------
 src/main.h        |  9 ++++---
 src/txmempool.cpp | 15 ++++++++++++
 src/txmempool.h   |  1 +
 4 files changed, 58 insertions(+), 27 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index a94d52f8954e8..4a28bbb00c422 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -5560,6 +5560,29 @@ bool ProcessMessages(CNode* pfrom)
     return fOk;
 }
 
+class CompareInvMempoolOrder
+{
+    CTxMemPool *mp;
+public:
+    CompareInvMempoolOrder(CTxMemPool *mempool)
+    {
+        mp = mempool;
+    }
+
+    bool operator()(const CInv &a, const CInv &b)
+    {
+        if (a.type != MSG_TX && b.type != MSG_TX) {
+            return false;
+        } else {
+            if (a.type != MSG_TX) {
+                return true;
+            } else if (b.type != MSG_TX) {
+                return false;
+            }
+            return mp->CompareDepthAndScore(a.hash, b.hash);
+        }
+    }
+};
 
 bool SendMessages(CNode* pto)
 {
@@ -5790,42 +5813,31 @@ bool SendMessages(CNode* pto)
             bool fSendTrickle = pto->fWhitelisted;
             if (pto->nNextInvSend < nNow) {
                 fSendTrickle = true;
-                pto->nNextInvSend = PoissonNextSend(nNow, AVG_INVENTORY_BROADCAST_INTERVAL);
+                // Use half the delay for outbound peers, as their is less privacy concern for them.
+                pto->nNextInvSend = PoissonNextSend(nNow, INVENTORY_BROADCAST_INTERVAL >> !pto->fInbound);
             }
             LOCK(pto->cs_inventory);
-            vInv.reserve(std::min<size_t>(1000, pto->vInventoryToSend.size()));
+            if (fSendTrickle && pto->vInventoryToSend.size() > 1) {
+                // Topologically and fee-rate sort the inventory we send for privacy and priority reasons.
+                CompareInvMempoolOrder compareInvMempoolOrder(&mempool);
+                std::stable_sort(pto->vInventoryToSend.begin(), pto->vInventoryToSend.end(), compareInvMempoolOrder);
+            }
+            vInv.reserve(std::min<size_t>(INVENTORY_BROADCAST_MAX, pto->vInventoryToSend.size()));
             vInvWait.reserve(pto->vInventoryToSend.size());
             BOOST_FOREACH(const CInv& inv, pto->vInventoryToSend)
             {
                 if (inv.type == MSG_TX && pto->filterInventoryKnown.contains(inv.hash))
                     continue;
-
-                // trickle out tx inv to protect privacy
-                if (inv.type == MSG_TX && !fSendTrickle)
-                {
-                    // 1/4 of tx invs blast to all immediately
-                    static uint256 hashSalt;
-                    if (hashSalt.IsNull())
-                        hashSalt = GetRandHash();
-                    uint256 hashRand = ArithToUint256(UintToArith256(inv.hash) ^ UintToArith256(hashSalt));
-                    hashRand = Hash(BEGIN(hashRand), END(hashRand));
-                    bool fTrickleWait = ((UintToArith256(hashRand) & 3) != 0);
-
-                    if (fTrickleWait)
-                    {
-                        vInvWait.push_back(inv);
-                        continue;
-                    }
+                // No reason to drain out at many times the network's capacity,
+                // especially since we have many peers and some will draw much shorter delays.
+                if (vInv.size() >= INVENTORY_BROADCAST_MAX || (inv.type == MSG_TX && !fSendTrickle)) {
+                    vInvWait.push_back(inv);
+                    continue;
                 }
 
                 pto->filterInventoryKnown.insert(inv.hash);
 
                 vInv.push_back(inv);
-                if (vInv.size() >= 1000)
-                {
-                    pto->PushMessage(NetMsgType::INV, vInv);
-                    vInv.clear();
-                }
             }
             pto->vInventoryToSend = vInvWait;
         }
diff --git a/src/main.h b/src/main.h
index 0962f44e9439e..4372c16a421c8 100644
--- a/src/main.h
+++ b/src/main.h
@@ -99,9 +99,12 @@ static const unsigned int MAX_REJECT_MESSAGE_LENGTH = 111;
 static const unsigned int AVG_LOCAL_ADDRESS_BROADCAST_INTERVAL = 24 * 24 * 60;
 /** Average delay between peer address broadcasts in seconds. */
 static const unsigned int AVG_ADDRESS_BROADCAST_INTERVAL = 30;
-/** Average delay between trickled inventory broadcasts in seconds.
- *  Blocks, whitelisted receivers, and a random 25% of transactions bypass this. */
-static const unsigned int AVG_INVENTORY_BROADCAST_INTERVAL = 5;
+/** Average delay between trickled inventory transmissions in seconds.
+ *  Blocks and whitelisted receivers bypass this, outbound peers get half this delay. */
+static const unsigned int INVENTORY_BROADCAST_INTERVAL = 5;
+/** Maximum number of inventory items to send per transmission.
+ *  Limits the impact of low-fee transaction floods. */
+static const unsigned int INVENTORY_BROADCAST_MAX = 7 * INVENTORY_BROADCAST_INTERVAL;
 /** Average delay between feefilter broadcasts in seconds. */
 static const unsigned int AVG_FEEFILTER_BROADCAST_INTERVAL = 10 * 60;
 /** Maximum feefilter broadcast delay after significant change. */
diff --git a/src/txmempool.cpp b/src/txmempool.cpp
index 52c7793118331..3aba578fac99e 100644
--- a/src/txmempool.cpp
+++ b/src/txmempool.cpp
@@ -752,6 +752,21 @@ void CTxMemPool::check(const CCoinsViewCache *pcoins) const
     assert(innerUsage == cachedInnerUsage);
 }
 
+bool CTxMemPool::CompareDepthAndScore(const uint256& hasha, const uint256& hashb)
+{
+    LOCK(cs);
+    indexed_transaction_set::const_iterator i = mapTx.find(hasha);
+    if (i == mapTx.end()) return false;
+    indexed_transaction_set::const_iterator j = mapTx.find(hashb);
+    if (j == mapTx.end()) return true;
+    uint64_t counta = i->GetCountWithAncestors();
+    uint64_t countb = j->GetCountWithAncestors();
+    if (counta == countb) {
+        return CompareTxMemPoolEntryByScore()(*i, *j);
+    }
+    return counta < countb;
+}
+
 void CTxMemPool::queryHashes(vector<uint256>& vtxid)
 {
     vtxid.clear();
diff --git a/src/txmempool.h b/src/txmempool.h
index de4ba0b371a42..e4934336c2cdc 100644
--- a/src/txmempool.h
+++ b/src/txmempool.h
@@ -511,6 +511,7 @@ class CTxMemPool
                         std::list<CTransaction>& conflicts, bool fCurrentEstimate = true);
     void clear();
     void _clear(); //lock free
+    bool CompareDepthAndScore(const uint256& hasha, const uint256& hashb);
     void queryHashes(std::vector<uint256>& vtxid);
     void pruneSpent(const uint256& hash, CCoins &coins);
     unsigned int GetTransactionsUpdated() const;

From 220f950ab1302f8f8c0bb5b9c818f3d6569796bd Mon Sep 17 00:00:00 2001
From: Yuri Zhykin <yuri.zhykin@gmail.com>
Date: Wed, 20 Apr 2016 00:03:42 +0300
Subject: [PATCH 0180/1802] Fix for incorrect locking in GetPubKey()
 (keystore.cpp)

---
 src/keystore.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/keystore.cpp b/src/keystore.cpp
index cc8a5733671da..d568a7435098a 100644
--- a/src/keystore.cpp
+++ b/src/keystore.cpp
@@ -19,6 +19,7 @@ bool CBasicKeyStore::GetPubKey(const CKeyID &address, CPubKey &vchPubKeyOut) con
 {
     CKey key;
     if (!GetKey(address, key)) {
+        LOCK(cs_KeyStore);
         WatchKeyMap::const_iterator it = mapWatchKeys.find(address);
         if (it != mapWatchKeys.end()) {
             vchPubKeyOut = it->second;

From 807fa47a1e5c9f072d7dbf549bf17f66c47dbf46 Mon Sep 17 00:00:00 2001
From: Suhas Daftuar <sdaftuar@chaincode.com>
Date: Tue, 19 Apr 2016 16:18:38 -0400
Subject: [PATCH 0181/1802] Tests: Fix deserialization of reject messages

Assume that reject messages for blocks or transactions due to reason
REJECT_MALFORMED will not include the hash of the block or tx being rejected.
---
 qa/rpc-tests/test_framework/mininode.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/qa/rpc-tests/test_framework/mininode.py b/qa/rpc-tests/test_framework/mininode.py
index 5ee5b132757d4..af3356411471e 100755
--- a/qa/rpc-tests/test_framework/mininode.py
+++ b/qa/rpc-tests/test_framework/mininode.py
@@ -983,6 +983,7 @@ def __repr__(self):
 
 class msg_reject(object):
     command = b"reject"
+    REJECT_MALFORMED = 1
 
     def __init__(self):
         self.message = b""
@@ -994,14 +995,16 @@ def deserialize(self, f):
         self.message = deser_string(f)
         self.code = struct.unpack("<B", f.read(1))[0]
         self.reason = deser_string(f)
-        if (self.message == "block" or self.message == "tx"):
+        if (self.code != self.REJECT_MALFORMED and
+                (self.message == b"block" or self.message == b"tx")):
             self.data = deser_uint256(f)
 
     def serialize(self):
         r = ser_string(self.message)
         r += struct.pack("<B", self.code)
         r += ser_string(self.reason)
-        if (self.message == "block" or self.message == "tx"):
+        if (self.code != self.REJECT_MALFORMED and
+                (self.message == b"block" or self.message == b"tx")):
             r += ser_uint256(self.data)
         return r
 

From 176869f9b367b6eaf2800de0c30d9b31311e3819 Mon Sep 17 00:00:00 2001
From: face <face@hmel.org>
Date: Tue, 19 Apr 2016 16:16:39 +0300
Subject: [PATCH 0182/1802] Explicitly pass CChainParams to ConnectBlock

---
 src/main.cpp | 10 +++++-----
 src/main.h   |  3 ++-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index 518393000162e..1015e538d5117 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -2221,9 +2221,9 @@ static int64_t nTimeIndex = 0;
 static int64_t nTimeCallbacks = 0;
 static int64_t nTimeTotal = 0;
 
-bool ConnectBlock(const CBlock& block, CValidationState& state, CBlockIndex* pindex, CCoinsViewCache& view, bool fJustCheck)
+bool ConnectBlock(const CBlock& block, CValidationState& state, CBlockIndex* pindex,
+                  CCoinsViewCache& view, const CChainParams& chainparams, bool fJustCheck)
 {
-    const CChainParams& chainparams = Params();
     AssertLockHeld(cs_main);
 
     int64_t nTimeStart = GetTimeMicros();
@@ -2703,7 +2703,7 @@ bool static ConnectTip(CValidationState& state, const CChainParams& chainparams,
     LogPrint("bench", "  - Load block from disk: %.2fms [%.2fs]\n", (nTime2 - nTime1) * 0.001, nTimeReadFromDisk * 0.000001);
     {
         CCoinsViewCache view(pcoinsTip);
-        bool rv = ConnectBlock(*pblock, state, pindexNew, view);
+        bool rv = ConnectBlock(*pblock, state, pindexNew, view, chainparams);
         GetMainSignals().BlockChecked(*pblock, state);
         if (!rv) {
             if (state.IsInvalid())
@@ -3523,7 +3523,7 @@ bool TestBlockValidity(CValidationState& state, const CChainParams& chainparams,
         return error("%s: Consensus::CheckBlock: %s", __func__, FormatStateMessage(state));
     if (!ContextualCheckBlock(block, state, pindexPrev))
         return error("%s: Consensus::ContextualCheckBlock: %s", __func__, FormatStateMessage(state));
-    if (!ConnectBlock(block, state, &indexDummy, viewNew, true))
+    if (!ConnectBlock(block, state, &indexDummy, viewNew, chainparams, true))
         return false;
     assert(state.IsValid());
 
@@ -3891,7 +3891,7 @@ bool CVerifyDB::VerifyDB(const CChainParams& chainparams, CCoinsView *coinsview,
             CBlock block;
             if (!ReadBlockFromDisk(block, pindex, chainparams.GetConsensus()))
                 return error("VerifyDB(): *** ReadBlockFromDisk failed at %d, hash=%s", pindex->nHeight, pindex->GetBlockHash().ToString());
-            if (!ConnectBlock(block, state, pindex, coins))
+            if (!ConnectBlock(block, state, pindex, coins, chainparams))
                 return error("VerifyDB(): *** found unconnectable block at %d, hash=%s", pindex->nHeight, pindex->GetBlockHash().ToString());
         }
     }
diff --git a/src/main.h b/src/main.h
index e4c98a96964ae..2c9635bcf2b8f 100644
--- a/src/main.h
+++ b/src/main.h
@@ -458,7 +458,8 @@ bool ContextualCheckBlock(const CBlock& block, CValidationState& state, CBlockIn
 /** Apply the effects of this block (with given index) on the UTXO set represented by coins.
  *  Validity checks that depend on the UTXO set are also done; ConnectBlock()
  *  can fail if those validity checks fail (among other reasons). */
-bool ConnectBlock(const CBlock& block, CValidationState& state, CBlockIndex* pindex, CCoinsViewCache& coins, bool fJustCheck = false);
+bool ConnectBlock(const CBlock& block, CValidationState& state, CBlockIndex* pindex, CCoinsViewCache& coins,
+                  const CChainParams& chainparams, bool fJustCheck = false);
 
 /** Undo the effects of this block (with given index) on the UTXO set represented by coins.
  *  In case pfClean is provided, operation will try to be tolerant about errors, and *pfClean

From a98cd1fc86eac1e5e5a09830028233dbce1dae70 Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Tue, 12 Apr 2016 20:38:06 -0400
Subject: [PATCH 0183/1802] net: manually resolve dns seed sources

Note: Some seeds aren't actually returning an IP for their name entries, so
they're being added to addrman with a source of [::].

This commit shouldn't change that behavior, for better or worse.
---
 src/net.cpp | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/net.cpp b/src/net.cpp
index 6ab6ef819d077..7dec8fc1cf599 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -1454,7 +1454,15 @@ void ThreadDNSAddressSeed()
                     found++;
                 }
             }
-            addrman.Add(vAdd, CNetAddr(seed.name, true));
+            // TODO: The seed name resolve may fail, yielding an IP of [::], which results in
+            // addrman assigning the same source to results from different seeds.
+            // This should switch to a hard-coded stable dummy IP for each seed name, so that the
+            // resolve is not required at all.
+            if (!vIPs.empty()) {
+                CService seedSource;
+                Lookup(seed.name.c_str(), seedSource, 0, true);
+                addrman.Add(vAdd, seedSource);
+            }
         }
     }
 

From 367569926a9b15c05ba8d56c554880b8f5614f71 Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Tue, 12 Apr 2016 20:41:39 -0400
Subject: [PATCH 0184/1802] net: resolve outside of storage structures

Rather than allowing CNetAddr/CService/CSubNet to launch DNS queries, require
that addresses are already resolved.

This greatly simplifies async resolve logic, and makes it harder to
accidentally leak DNS queries.
---
 src/init.cpp    |  7 ++++---
 src/netbase.cpp | 10 ++++++----
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/init.cpp b/src/init.cpp
index 3667820a21fe6..80527b782e986 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -1156,10 +1156,11 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
 
     if (mapArgs.count("-externalip")) {
         BOOST_FOREACH(const std::string& strAddr, mapMultiArgs["-externalip"]) {
-            CService addrLocal(strAddr, GetListenPort(), fNameLookup);
-            if (!addrLocal.IsValid())
+            CService addrLocal;
+            if (Lookup(strAddr.c_str(), addrLocal, GetListenPort(), fNameLookup) && addrLocal.IsValid())
+                AddLocal(addrLocal, LOCAL_MANUAL);
+            else
                 return InitError(ResolveErrMsg("externalip", strAddr));
-            AddLocal(CService(strAddr, GetListenPort(), fNameLookup), LOCAL_MANUAL);
         }
     }
 
diff --git a/src/netbase.cpp b/src/netbase.cpp
index 281c6bcb7fe79..1855d0a2e833b 100644
--- a/src/netbase.cpp
+++ b/src/netbase.cpp
@@ -614,10 +614,12 @@ bool ConnectSocketByName(CService &addr, SOCKET& hSocketRet, const char *pszDest
     proxyType nameProxy;
     GetNameProxy(nameProxy);
 
-    CService addrResolved(CNetAddr(strDest, fNameLookup && !HaveNameProxy()), port);
-    if (addrResolved.IsValid()) {
-        addr = addrResolved;
-        return ConnectSocket(addr, hSocketRet, nTimeout);
+    CService addrResolved;
+    if (Lookup(strDest.c_str(), addrResolved, port, fNameLookup && !HaveNameProxy())) {
+        if (addrResolved.IsValid()) {
+            addr = addrResolved;
+            return ConnectSocket(addr, hSocketRet, nTimeout);
+        }
     }
 
     addr = CService("0.0.0.0:0");

From d39f5b425d8fc1bf3b7f33d35625ffd8d7a3cd77 Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Tue, 12 Apr 2016 20:48:29 -0400
Subject: [PATCH 0185/1802] net: disable resolving from storage structures

CNetAddr/CService/CSubnet can no longer resolve DNS.
---
 src/netbase.cpp    | 28 ++++++++++++++--------------
 src/netbase.h      | 14 +++++++-------
 src/torcontrol.cpp |  2 +-
 3 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/src/netbase.cpp b/src/netbase.cpp
index 1855d0a2e833b..b44a8b16e20cc 100644
--- a/src/netbase.cpp
+++ b/src/netbase.cpp
@@ -688,19 +688,19 @@ CNetAddr::CNetAddr(const struct in6_addr& ipv6Addr, const uint32_t scope)
     scopeId = scope;
 }
 
-CNetAddr::CNetAddr(const char *pszIp, bool fAllowLookup)
+CNetAddr::CNetAddr(const char *pszIp)
 {
     Init();
     std::vector<CNetAddr> vIP;
-    if (LookupHost(pszIp, vIP, 1, fAllowLookup))
+    if (LookupHost(pszIp, vIP, 1, false))
         *this = vIP[0];
 }
 
-CNetAddr::CNetAddr(const std::string &strIp, bool fAllowLookup)
+CNetAddr::CNetAddr(const std::string &strIp)
 {
     Init();
     std::vector<CNetAddr> vIP;
-    if (LookupHost(strIp.c_str(), vIP, 1, fAllowLookup))
+    if (LookupHost(strIp.c_str(), vIP, 1, false))
         *this = vIP[0];
 }
 
@@ -1123,35 +1123,35 @@ bool CService::SetSockAddr(const struct sockaddr *paddr)
     }
 }
 
-CService::CService(const char *pszIpPort, bool fAllowLookup)
+CService::CService(const char *pszIpPort)
 {
     Init();
     CService ip;
-    if (Lookup(pszIpPort, ip, 0, fAllowLookup))
+    if (Lookup(pszIpPort, ip, 0, false))
         *this = ip;
 }
 
-CService::CService(const char *pszIpPort, int portDefault, bool fAllowLookup)
+CService::CService(const char *pszIpPort, int portDefault)
 {
     Init();
     CService ip;
-    if (Lookup(pszIpPort, ip, portDefault, fAllowLookup))
+    if (Lookup(pszIpPort, ip, portDefault, false))
         *this = ip;
 }
 
-CService::CService(const std::string &strIpPort, bool fAllowLookup)
+CService::CService(const std::string &strIpPort)
 {
     Init();
     CService ip;
-    if (Lookup(strIpPort.c_str(), ip, 0, fAllowLookup))
+    if (Lookup(strIpPort.c_str(), ip, 0, false))
         *this = ip;
 }
 
-CService::CService(const std::string &strIpPort, int portDefault, bool fAllowLookup)
+CService::CService(const std::string &strIpPort, int portDefault)
 {
     Init();
     CService ip;
-    if (Lookup(strIpPort.c_str(), ip, portDefault, fAllowLookup))
+    if (Lookup(strIpPort.c_str(), ip, portDefault, false))
         *this = ip;
 }
 
@@ -1245,7 +1245,7 @@ CSubNet::CSubNet():
     memset(netmask, 0, sizeof(netmask));
 }
 
-CSubNet::CSubNet(const std::string &strSubnet, bool fAllowLookup)
+CSubNet::CSubNet(const std::string &strSubnet)
 {
     size_t slash = strSubnet.find_last_of('/');
     std::vector<CNetAddr> vIP;
@@ -1255,7 +1255,7 @@ CSubNet::CSubNet(const std::string &strSubnet, bool fAllowLookup)
     memset(netmask, 255, sizeof(netmask));
 
     std::string strAddress = strSubnet.substr(0, slash);
-    if (LookupHost(strAddress.c_str(), vIP, 1, fAllowLookup))
+    if (LookupHost(strAddress.c_str(), vIP, 1, false))
     {
         network = vIP[0];
         if (slash != strSubnet.npos)
diff --git a/src/netbase.h b/src/netbase.h
index 4529f9822914c..65187a17cfd54 100644
--- a/src/netbase.h
+++ b/src/netbase.h
@@ -49,8 +49,8 @@ class CNetAddr
     public:
         CNetAddr();
         CNetAddr(const struct in_addr& ipv4Addr);
-        explicit CNetAddr(const char *pszIp, bool fAllowLookup = false);
-        explicit CNetAddr(const std::string &strIp, bool fAllowLookup = false);
+        explicit CNetAddr(const char *pszIp);
+        explicit CNetAddr(const std::string &strIp);
         void Init();
         void SetIP(const CNetAddr& ip);
 
@@ -119,7 +119,7 @@ class CSubNet
 
     public:
         CSubNet();
-        explicit CSubNet(const std::string &strSubnet, bool fAllowLookup = false);
+        explicit CSubNet(const std::string &strSubnet);
 
         //constructor for single ip subnet (<ipv4>/32 or <ipv6>/128)
         explicit CSubNet(const CNetAddr &addr);
@@ -154,10 +154,10 @@ class CService : public CNetAddr
         CService(const CNetAddr& ip, unsigned short port);
         CService(const struct in_addr& ipv4Addr, unsigned short port);
         CService(const struct sockaddr_in& addr);
-        explicit CService(const char *pszIpPort, int portDefault, bool fAllowLookup = false);
-        explicit CService(const char *pszIpPort, bool fAllowLookup = false);
-        explicit CService(const std::string& strIpPort, int portDefault, bool fAllowLookup = false);
-        explicit CService(const std::string& strIpPort, bool fAllowLookup = false);
+        explicit CService(const char *pszIpPort, int portDefault);
+        explicit CService(const char *pszIpPort);
+        explicit CService(const std::string& strIpPort, int portDefault);
+        explicit CService(const std::string& strIpPort);
         void Init();
         void SetPort(unsigned short portIn);
         unsigned short GetPort() const;
diff --git a/src/torcontrol.cpp b/src/torcontrol.cpp
index 1c7bc2dbeee6b..47d834c7b4eff 100644
--- a/src/torcontrol.cpp
+++ b/src/torcontrol.cpp
@@ -438,7 +438,7 @@ void TorController::add_onion_cb(TorControlConnection& conn, const TorControlRep
                 private_key = i->second;
         }
 
-        service = CService(service_id+".onion", GetListenPort(), false);
+        service = CService(service_id+".onion", GetListenPort());
         LogPrintf("tor: Got service ID %s, advertising service %s\n", service_id, service.ToString());
         if (WriteBinaryFile(GetPrivateKeyFile(), private_key)) {
             LogPrint("tor", "tor: Cached service private key to %s\n", GetPrivateKeyFile());

From 3a99fb2cb14955f5e029d315041a093e957e6c3e Mon Sep 17 00:00:00 2001
From: Suhas Daftuar <sdaftuar@gmail.com>
Date: Wed, 20 Apr 2016 13:49:55 -0400
Subject: [PATCH 0186/1802] Fix headers announcements edge case

Previously we would assert that if every block in vBlockHashesToAnnounce is in
chainActive, then the blocks to be announced must connect.  However, there are
edge cases where this assumption could be violated (eg using invalidateblock /
reconsiderblock), so just check for this case and revert to inv-announcement
instead.
---
 src/main.cpp | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/main.cpp b/src/main.cpp
index a94d52f8954e8..e2fbfcf12dfa4 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -5718,7 +5718,21 @@ bool SendMessages(CNode* pto)
                         fRevertToInv = true;
                         break;
                     }
-                    assert(pBestIndex == NULL || pindex->pprev == pBestIndex);
+                    if (pBestIndex != NULL && pindex->pprev != pBestIndex) {
+                        // This means that the list of blocks to announce don't
+                        // connect to each other.
+                        // This shouldn't really be possible to hit during
+                        // regular operation (because reorgs should take us to
+                        // a chain that has some block not on the prior chain,
+                        // which should be caught by the prior check), but one
+                        // way this could happen is by using invalidateblock /
+                        // reconsiderblock repeatedly on the tip, causing it to
+                        // be added multiple times to vBlockHashesToAnnounce.
+                        // Robustly deal with this rare situation by reverting
+                        // to an inv.
+                        fRevertToInv = true;
+                        break;
+                    }
                     pBestIndex = pindex;
                     if (fFoundStartingHeader) {
                         // add this to the headers message

From dc13dcd2bec2613a1cd5e0395b09b449d176146f Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Thu, 7 Apr 2016 13:57:36 +0200
Subject: [PATCH 0187/1802] Split up and optimize transaction and block inv
 queues

---
 src/main.cpp | 76 +++++++++++++++++++++++++++++++---------------------
 src/net.h    | 20 +++++++++-----
 2 files changed, 59 insertions(+), 37 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index 4a28bbb00c422..61d9301f8f0d2 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -5569,18 +5569,11 @@ class CompareInvMempoolOrder
         mp = mempool;
     }
 
-    bool operator()(const CInv &a, const CInv &b)
+    bool operator()(std::set<uint256>::iterator a, std::set<uint256>::iterator b)
     {
-        if (a.type != MSG_TX && b.type != MSG_TX) {
-            return false;
-        } else {
-            if (a.type != MSG_TX) {
-                return true;
-            } else if (b.type != MSG_TX) {
-                return false;
-            }
-            return mp->CompareDepthAndScore(a.hash, b.hash);
-        }
+        /* As std::make_heap produces a max-heap, we want the entries with the
+         * fewest ancestors/highest fee to sort later. */
+        return mp->CompareDepthAndScore(*b, *a);
     }
 };
 
@@ -5808,38 +5801,59 @@ bool SendMessages(CNode* pto)
         // Message: inventory
         //
         vector<CInv> vInv;
-        vector<CInv> vInvWait;
         {
+            LOCK(pto->cs_inventory);
+            vInv.reserve(std::max<size_t>(pto->vInventoryBlockToSend.size(), INVENTORY_BROADCAST_MAX));
+
+            // Add blocks
+            BOOST_FOREACH(const uint256& hash, pto->vInventoryBlockToSend) {
+                vInv.push_back(CInv(MSG_BLOCK, hash));
+                if (vInv.size() == MAX_INV_SZ) {
+                    pto->PushMessage(NetMsgType::INV, vInv);
+                    vInv.clear();
+                }
+            }
+            pto->vInventoryBlockToSend.clear();
+
+            // Determine transactions to relay
             bool fSendTrickle = pto->fWhitelisted;
             if (pto->nNextInvSend < nNow) {
                 fSendTrickle = true;
-                // Use half the delay for outbound peers, as their is less privacy concern for them.
+                // Use half the delay for outbound peers, as there is less privacy concern for them.
                 pto->nNextInvSend = PoissonNextSend(nNow, INVENTORY_BROADCAST_INTERVAL >> !pto->fInbound);
             }
-            LOCK(pto->cs_inventory);
-            if (fSendTrickle && pto->vInventoryToSend.size() > 1) {
+            if (fSendTrickle) {
+                // Produce a vector with all candidates for sending
+                vector<std::set<uint256>::iterator> vInvTx;
+                vInvTx.reserve(pto->setInventoryTxToSend.size());
+                for (std::set<uint256>::iterator it = pto->setInventoryTxToSend.begin(); it != pto->setInventoryTxToSend.end(); it++) {
+                    vInvTx.push_back(it);
+                }
                 // Topologically and fee-rate sort the inventory we send for privacy and priority reasons.
+                // A heap is used so that not all items need sorting if only a few are being sent.
                 CompareInvMempoolOrder compareInvMempoolOrder(&mempool);
-                std::stable_sort(pto->vInventoryToSend.begin(), pto->vInventoryToSend.end(), compareInvMempoolOrder);
-            }
-            vInv.reserve(std::min<size_t>(INVENTORY_BROADCAST_MAX, pto->vInventoryToSend.size()));
-            vInvWait.reserve(pto->vInventoryToSend.size());
-            BOOST_FOREACH(const CInv& inv, pto->vInventoryToSend)
-            {
-                if (inv.type == MSG_TX && pto->filterInventoryKnown.contains(inv.hash))
-                    continue;
+                std::make_heap(vInvTx.begin(), vInvTx.end(), compareInvMempoolOrder);
                 // No reason to drain out at many times the network's capacity,
                 // especially since we have many peers and some will draw much shorter delays.
-                if (vInv.size() >= INVENTORY_BROADCAST_MAX || (inv.type == MSG_TX && !fSendTrickle)) {
-                    vInvWait.push_back(inv);
-                    continue;
+                unsigned int nRelayedTransactions = 0;
+                while (!vInvTx.empty() && nRelayedTransactions < INVENTORY_BROADCAST_MAX) {
+                    // Fetch the top element from the heap
+                    std::pop_heap(vInvTx.begin(), vInvTx.end(), compareInvMempoolOrder);
+                    std::set<uint256>::iterator it = vInvTx.back();
+                    vInvTx.pop_back();
+                    uint256 hash = *it;
+                    // Remove it from the to-be-sent set
+                    pto->setInventoryTxToSend.erase(it);
+                    // Check if not in the filter already
+                    if (pto->filterInventoryKnown.contains(hash)) {
+                        continue;
+                    }
+                    // Send
+                    vInv.push_back(CInv(MSG_TX, hash));
+                    nRelayedTransactions++;
+                    pto->filterInventoryKnown.insert(hash);
                 }
-
-                pto->filterInventoryKnown.insert(inv.hash);
-
-                vInv.push_back(inv);
             }
-            pto->vInventoryToSend = vInvWait;
         }
         if (!vInv.empty())
             pto->PushMessage(NetMsgType::INV, vInv);
diff --git a/src/net.h b/src/net.h
index bf367684f6c14..a95fa79e7e03b 100644
--- a/src/net.h
+++ b/src/net.h
@@ -397,7 +397,13 @@ class CNode
 
     // inventory based relay
     CRollingBloomFilter filterInventoryKnown;
-    std::vector<CInv> vInventoryToSend;
+    // Set of transaction ids we still have to announce.
+    // They are sorted by the mempool before relay, so the order is not important.
+    std::set<uint256> setInventoryTxToSend;
+    // List of block ids we still have announce.
+    // There is no final sorting before sending, as they are always sent immediately
+    // and in the order requested.
+    std::vector<uint256> vInventoryBlockToSend;
     CCriticalSection cs_inventory;
     std::set<uint256> setAskFor;
     std::multimap<int64_t, CInv> mapAskFor;
@@ -517,11 +523,13 @@ class CNode
 
     void PushInventory(const CInv& inv)
     {
-        {
-            LOCK(cs_inventory);
-            if (inv.type == MSG_TX && filterInventoryKnown.contains(inv.hash))
-                return;
-            vInventoryToSend.push_back(inv);
+        LOCK(cs_inventory);
+        if (inv.type == MSG_TX) {
+            if (!filterInventoryKnown.contains(inv.hash)) {
+                setInventoryTxToSend.insert(inv.hash);
+            }
+        } else if (inv.type == MSG_BLOCK) {
+            vInventoryBlockToSend.push_back(inv.hash);
         }
     }
 

From ed7068302c7490e8061cb3a558a0f83a465beeea Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Fri, 8 Apr 2016 16:26:41 +0200
Subject: [PATCH 0188/1802] Handle mempool requests in send loop, subject to
 trickle

By eliminating queued entries from the mempool response and responding only at
trickle time, this makes the mempool no longer leak transaction arrival order
information (as the mempool itself is also sorted)-- at least no more than
relay itself leaks it.
---
 src/main.cpp | 74 ++++++++++++++++++++++++++++++++--------------------
 src/net.cpp  |  1 +
 src/net.h    |  2 ++
 3 files changed, 49 insertions(+), 28 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index 61d9301f8f0d2..282c8cdb66449 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -5235,34 +5235,9 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
             pfrom->fDisconnect = true;
             return true;
         }
-        LOCK2(cs_main, pfrom->cs_filter);
 
-        std::vector<uint256> vtxid;
-        mempool.queryHashes(vtxid);
-        vector<CInv> vInv;
-        BOOST_FOREACH(uint256& hash, vtxid) {
-            CInv inv(MSG_TX, hash);
-            if (pfrom->pfilter) {
-                CTransaction tx;
-                bool fInMemPool = mempool.lookup(hash, tx);
-                if (!fInMemPool) continue; // another thread removed since queryHashes, maybe...
-                if (!pfrom->pfilter->IsRelevantAndUpdate(tx)) continue;
-            }
-            if (pfrom->minFeeFilter) {
-                CFeeRate feeRate;
-                mempool.lookupFeeRate(hash, feeRate);
-                LOCK(pfrom->cs_feeFilter);
-                if (feeRate.GetFeePerK() < pfrom->minFeeFilter)
-                    continue;
-            }
-            vInv.push_back(inv);
-            if (vInv.size() == MAX_INV_SZ) {
-                pfrom->PushMessage(NetMsgType::INV, vInv);
-                vInv.clear();
-            }
-        }
-        if (vInv.size() > 0)
-            pfrom->PushMessage(NetMsgType::INV, vInv);
+        LOCK(pfrom->cs_inventory);
+        pfrom->fSendMempool = true;
     }
 
 
@@ -5815,13 +5790,52 @@ bool SendMessages(CNode* pto)
             }
             pto->vInventoryBlockToSend.clear();
 
-            // Determine transactions to relay
+            // Check whether periodic sends should happen
             bool fSendTrickle = pto->fWhitelisted;
             if (pto->nNextInvSend < nNow) {
                 fSendTrickle = true;
                 // Use half the delay for outbound peers, as there is less privacy concern for them.
                 pto->nNextInvSend = PoissonNextSend(nNow, INVENTORY_BROADCAST_INTERVAL >> !pto->fInbound);
             }
+
+            // Respond to BIP35 mempool requests
+            if (fSendTrickle && pto->fSendMempool) {
+                std::vector<uint256> vtxid;
+                mempool.queryHashes(vtxid);
+                pto->fSendMempool = false;
+                CAmount filterrate = 0;
+                {
+                    LOCK(pto->cs_feeFilter);
+                    filterrate = pto->minFeeFilter;
+                }
+
+                LOCK(pto->cs_filter);
+
+                BOOST_FOREACH(const uint256& hash, vtxid) {
+                    CInv inv(MSG_TX, hash);
+                    pto->setInventoryTxToSend.erase(hash);
+                    if (filterrate) {
+                        CFeeRate feeRate;
+                        mempool.lookupFeeRate(hash, feeRate);
+                        if (feeRate.GetFeePerK() < filterrate)
+                            continue;
+                    }
+                    if (pto->pfilter) {
+                        CTransaction tx;
+                        bool fInMemPool = mempool.lookup(hash, tx);
+                        if (!fInMemPool) continue; // another thread removed since queryHashes, maybe...
+                        if (!pto->pfilter->IsRelevantAndUpdate(tx)) continue;
+                    }
+                    pto->filterInventoryKnown.insert(hash);
+                    vInv.push_back(inv);
+                    if (vInv.size() == MAX_INV_SZ) {
+                        pto->PushMessage(NetMsgType::INV, vInv);
+                        vInv.clear();
+                    }
+                }
+            }
+
+            // Determine transactions to relay
             if (fSendTrickle) {
                 // Produce a vector with all candidates for sending
                 vector<std::set<uint256>::iterator> vInvTx;
@@ -5851,6 +5865,10 @@ bool SendMessages(CNode* pto)
                     // Send
                     vInv.push_back(CInv(MSG_TX, hash));
                     nRelayedTransactions++;
+                    if (vInv.size() == MAX_INV_SZ) {
+                        pto->PushMessage(NetMsgType::INV, vInv);
+                        vInv.clear();
+                    }
                     pto->filterInventoryKnown.insert(hash);
                 }
             }
diff --git a/src/net.cpp b/src/net.cpp
index f294e4c667836..6b305ebae48a8 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -2370,6 +2370,7 @@ CNode::CNode(SOCKET hSocketIn, const CAddress& addrIn, const std::string& addrNa
     hashContinue = uint256();
     nStartingHeight = -1;
     filterInventoryKnown.reset();
+    fSendMempool = false;
     fGetAddr = false;
     nNextLocalAddrSend = 0;
     nNextAddrSend = 0;
diff --git a/src/net.h b/src/net.h
index a95fa79e7e03b..26acf59e605cf 100644
--- a/src/net.h
+++ b/src/net.h
@@ -411,6 +411,8 @@ class CNode
     // Used for headers announcements - unfiltered blocks to relay
     // Also protected by cs_inventory
     std::vector<uint256> vBlockHashesToAnnounce;
+    // Used for BIP35 mempool sending, also protected by cs_inventory
+    bool fSendMempool;
 
     // Ping time measurement:
     // The pong reply we're expecting, or 0 if no pong expected.

From 4578215e7f787968c1d6478e6df75499bd36dd8d Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Sun, 10 Apr 2016 15:33:05 +0200
Subject: [PATCH 0189/1802] Return mempool queries in dependency order

---
 src/txmempool.cpp | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/txmempool.cpp b/src/txmempool.cpp
index 3aba578fac99e..0d9fcc982d306 100644
--- a/src/txmempool.cpp
+++ b/src/txmempool.cpp
@@ -767,6 +767,16 @@ bool CTxMemPool::CompareDepthAndScore(const uint256& hasha, const uint256& hashb
     return counta < countb;
 }
 
+namespace {
+class DepthAndScoreComparator
+{
+    CTxMemPool *mp;
+public:
+    DepthAndScoreComparator(CTxMemPool *mempool) : mp(mempool) {}
+    bool operator()(const uint256& a, const uint256& b) { return mp->CompareDepthAndScore(a, b); }
+};
+}
+
 void CTxMemPool::queryHashes(vector<uint256>& vtxid)
 {
     vtxid.clear();
@@ -775,6 +785,8 @@ void CTxMemPool::queryHashes(vector<uint256>& vtxid)
     vtxid.reserve(mapTx.size());
     for (indexed_transaction_set::iterator mi = mapTx.begin(); mi != mapTx.end(); ++mi)
         vtxid.push_back(mi->GetTx().GetHash());
+
+    std::sort(vtxid.begin(), vtxid.end(), DepthAndScoreComparator(this));
 }
 
 bool CTxMemPool::lookup(uint256 hash, CTransaction& result) const

From b5599147533103efea896a1fc4ff51f2d3ad5808 Mon Sep 17 00:00:00 2001
From: Gregory Maxwell <greg@xiph.org>
Date: Wed, 20 Apr 2016 07:05:23 +0000
Subject: [PATCH 0190/1802] Move bloom and feerate filtering to just prior to
 tx sending.

This will avoid sending more pointless INVs around updates, and
 prevents using filter updates to timetag transactions.

Also adds locking for fRelayTxes.
---
 src/main.cpp | 42 ++++++++++++++++++++++++++++++++++++------
 src/net.cpp  | 15 +--------------
 src/net.h    |  2 +-
 3 files changed, 38 insertions(+), 21 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index 282c8cdb66449..b707de2e585da 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -4557,12 +4557,16 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
             vRecv >> LIMITED_STRING(pfrom->strSubVer, MAX_SUBVERSION_LENGTH);
             pfrom->cleanSubVer = SanitizeString(pfrom->strSubVer);
         }
-        if (!vRecv.empty())
+        if (!vRecv.empty()) {
             vRecv >> pfrom->nStartingHeight;
-        if (!vRecv.empty())
-            vRecv >> pfrom->fRelayTxes; // set to true after we get the first filter* message
-        else
-            pfrom->fRelayTxes = true;
+        }
+        {
+            LOCK(pfrom->cs_filter);
+            if (!vRecv.empty())
+                vRecv >> pfrom->fRelayTxes; // set to true after we get the first filter* message
+            else
+                pfrom->fRelayTxes = true;
+        }
 
         // Disconnect if we connected to ourself
         if (nNonce == nLocalHostNonce && nNonce > 1)
@@ -5325,12 +5329,13 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
         CBloomFilter filter;
         vRecv >> filter;
 
+        LOCK(pfrom->cs_filter);
+
         if (!filter.IsWithinSizeConstraints())
             // There is no excuse for sending a too-large filter
             Misbehaving(pfrom->GetId(), 100);
         else
         {
-            LOCK(pfrom->cs_filter);
             delete pfrom->pfilter;
             pfrom->pfilter = new CBloomFilter(filter);
             pfrom->pfilter->UpdateEmptyFull();
@@ -5798,6 +5803,12 @@ bool SendMessages(CNode* pto)
                 pto->nNextInvSend = PoissonNextSend(nNow, INVENTORY_BROADCAST_INTERVAL >> !pto->fInbound);
             }
 
+            // Time to send but the peer has requested we not relay transactions.
+            if (fSendTrickle) {
+                LOCK(pto->cs_filter);
+                if (!pto->fRelayTxes) pto->setInventoryTxToSend.clear();
+            }
+
             // Respond to BIP35 mempool requests
             if (fSendTrickle && pto->fSendMempool) {
                 std::vector<uint256> vtxid;
@@ -5843,6 +5854,11 @@ bool SendMessages(CNode* pto)
                 for (std::set<uint256>::iterator it = pto->setInventoryTxToSend.begin(); it != pto->setInventoryTxToSend.end(); it++) {
                     vInvTx.push_back(it);
                 }
+                CAmount filterrate = 0;
+                {
+                    LOCK(pto->cs_feeFilter);
+                    filterrate = pto->minFeeFilter;
+                }
                 // Topologically and fee-rate sort the inventory we send for privacy and priority reasons.
                 // A heap is used so that not all items need sorting if only a few are being sent.
                 CompareInvMempoolOrder compareInvMempoolOrder(&mempool);
@@ -5850,6 +5866,7 @@ bool SendMessages(CNode* pto)
                 // No reason to drain out at many times the network's capacity,
                 // especially since we have many peers and some will draw much shorter delays.
                 unsigned int nRelayedTransactions = 0;
+                LOCK(pto->cs_filter);
                 while (!vInvTx.empty() && nRelayedTransactions < INVENTORY_BROADCAST_MAX) {
                     // Fetch the top element from the heap
                     std::pop_heap(vInvTx.begin(), vInvTx.end(), compareInvMempoolOrder);
@@ -5862,6 +5879,19 @@ bool SendMessages(CNode* pto)
                     if (pto->filterInventoryKnown.contains(hash)) {
                         continue;
                     }
+                    // Not in the mempool anymore? don't bother sending it.
+                    CFeeRate feeRate;
+                    if (!mempool.lookupFeeRate(hash, feeRate)) {
+                        continue;
+                    }
+                    if (filterrate && feeRate.GetFeePerK() < filterrate) {
+                        continue;
+                    }
+                    if (pto->pfilter) {
+                        CTransaction tx;
+                        if (!mempool.lookup(hash, tx)) continue;
+                        if (!pto->pfilter->IsRelevantAndUpdate(tx)) continue;
+                    }
                     // Send
                     vInv.push_back(CInv(MSG_TX, hash));
                     nRelayedTransactions++;
diff --git a/src/net.cpp b/src/net.cpp
index 6b305ebae48a8..ccc430f5c2804 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -2071,20 +2071,7 @@ void RelayTransaction(const CTransaction& tx, CFeeRate feerate)
     LOCK(cs_vNodes);
     BOOST_FOREACH(CNode* pnode, vNodes)
     {
-        if(!pnode->fRelayTxes)
-            continue;
-        {
-            LOCK(pnode->cs_feeFilter);
-            if (feerate.GetFeePerK() < pnode->minFeeFilter)
-                continue;
-        }
-        LOCK(pnode->cs_filter);
-        if (pnode->pfilter)
-        {
-            if (pnode->pfilter->IsRelevantAndUpdate(tx))
-                pnode->PushInventory(inv);
-        } else
-            pnode->PushInventory(inv);
+        pnode->PushInventory(inv);
     }
 }
 
diff --git a/src/net.h b/src/net.h
index 26acf59e605cf..b6ec7bf3e2c28 100644
--- a/src/net.h
+++ b/src/net.h
@@ -357,7 +357,7 @@ class CNode
     // a) it allows us to not relay tx invs before receiving the peer's version message
     // b) the peer may tell us in its version message that we should not relay tx invs
     //    unless it loads a bloom filter.
-    bool fRelayTxes;
+    bool fRelayTxes; //protected by cs_filter
     bool fSentAddr;
     CSemaphoreGrant grantOutbound;
     CCriticalSection cs_filter;

From fa243293343eb964bfee5b91cc52b91f16232ab6 Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Thu, 21 Apr 2016 15:28:53 +0200
Subject: [PATCH 0191/1802] [contrib] verify-commits: Add MarcoFalke
 fingerprint

---
 contrib/verify-commits/trusted-keys | 1 +
 1 file changed, 1 insertion(+)

diff --git a/contrib/verify-commits/trusted-keys b/contrib/verify-commits/trusted-keys
index a0d0f82db3f43..ad1b28be0cc47 100644
--- a/contrib/verify-commits/trusted-keys
+++ b/contrib/verify-commits/trusted-keys
@@ -5,3 +5,4 @@ AF8BE07C7049F3A26B239D5325B3083201782B2F
 81291FA67D2C379A006A053FEAB5AF94D9E9ABE7
 3F1888C6DCA92A6499C4911FDBA1A67379A1A931
 32EE5C4C3FA15CCADB46ABE529D4BCB6416F53EC
+FE09B823E6D83A3BC7983EAA2D7F2372E50FE137

From a6666b25c7fa196d3829f0df38104e0384408412 Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Sat, 2 Apr 2016 16:45:26 +0200
Subject: [PATCH 0192/1802] depends: mac deploy Py3 compatibility

This fixes the gitian MacOSX build, it was broken in #7723.

The patch to `native_mac_alias` should probably make it upstream.
---
 contrib/macdeploy/macdeployqtplus             |  6 +-
 depends/packages/native_mac_alias.mk          |  5 ++
 .../patches/native_mac_alias/python3.patch    | 72 +++++++++++++++++++
 3 files changed, 80 insertions(+), 3 deletions(-)
 create mode 100644 depends/patches/native_mac_alias/python3.patch

diff --git a/contrib/macdeploy/macdeployqtplus b/contrib/macdeploy/macdeployqtplus
index 685ed8e5b89c0..f8201e72c649d 100755
--- a/contrib/macdeploy/macdeployqtplus
+++ b/contrib/macdeploy/macdeployqtplus
@@ -210,8 +210,8 @@ def getFrameworks(binaryPath, verbose):
             sys.stderr.write(o_stderr)
             sys.stderr.flush()
             raise RuntimeError("otool failed with return code %d" % otool.returncode)
-    
-    otoolLines = o_stdout.split("\n")
+
+    otoolLines = o_stdout.decode().split("\n")
     otoolLines.pop(0) # First line is the inspected binary
     if ".framework" in binaryPath or binaryPath.endswith(".dylib"):
         otoolLines.pop(0) # Frameworks and dylibs list themselves as a dependency.
@@ -676,7 +676,7 @@ if verbose >= 2:
     print("+ Installing qt.conf +")
 
 f = open(os.path.join(applicationBundle.resourcesPath, "qt.conf"), "wb")
-f.write(qt_conf)
+f.write(qt_conf.encode())
 f.close()
 
 # ------------------------------------------------
diff --git a/depends/packages/native_mac_alias.mk b/depends/packages/native_mac_alias.mk
index d117c1c9a3f68..85a8a402bf92c 100644
--- a/depends/packages/native_mac_alias.mk
+++ b/depends/packages/native_mac_alias.mk
@@ -5,6 +5,11 @@ $(package)_download_file=v$($(package)_version).tar.bz2
 $(package)_file_name=$(package)-$($(package)_version).tar.bz2
 $(package)_sha256_hash=87ad827e66790028361e43fc754f68ed041a9bdb214cca03c853f079b04fb120
 $(package)_install_libdir=$(build_prefix)/lib/python/dist-packages
+$(package)_patches=python3.patch
+
+define $(package)_preprocess_cmds
+  patch -p1 < $($(package)_patch_dir)/python3.patch
+endef
 
 define $(package)_build_cmds
     python setup.py build
diff --git a/depends/patches/native_mac_alias/python3.patch b/depends/patches/native_mac_alias/python3.patch
new file mode 100644
index 0000000000000..1a32340be5b13
--- /dev/null
+++ b/depends/patches/native_mac_alias/python3.patch
@@ -0,0 +1,72 @@
+diff -dur a/mac_alias/alias.py b/mac_alias/alias.py
+--- a/mac_alias/alias.py	2015-10-19 12:12:48.000000000 +0200
++++ b/mac_alias/alias.py	2016-04-03 12:13:12.037159417 +0200
+@@ -243,10 +243,10 @@
+         alias = Alias()
+         alias.appinfo = appinfo
+             
+-        alias.volume = VolumeInfo (volname.replace('/',':'),
++        alias.volume = VolumeInfo (volname.decode().replace('/',':'),
+                                    voldate, fstype, disktype,
+                                    volattrs, volfsid)
+-        alias.target = TargetInfo (kind, filename.replace('/',':'),
++        alias.target = TargetInfo (kind, filename.decode().replace('/',':'),
+                                    folder_cnid, cnid,
+                                    crdate, creator_code, type_code)
+         alias.target.levels_from = levels_from
+@@ -261,9 +261,9 @@
+                 b.read(1)
+ 
+             if tag == TAG_CARBON_FOLDER_NAME:
+-                alias.target.folder_name = value.replace('/',':')
++                alias.target.folder_name = value.decode().replace('/',':')
+             elif tag == TAG_CNID_PATH:
+-                alias.target.cnid_path = struct.unpack(b'>%uI' % (length // 4),
++                alias.target.cnid_path = struct.unpack('>%uI' % (length // 4),
+                                                            value)
+             elif tag == TAG_CARBON_PATH:
+                 alias.target.carbon_path = value
+@@ -298,9 +298,9 @@
+                 alias.target.creation_date \
+                     = mac_epoch + datetime.timedelta(seconds=seconds)
+             elif tag == TAG_POSIX_PATH:
+-                alias.target.posix_path = value
++                alias.target.posix_path = value.decode()
+             elif tag == TAG_POSIX_PATH_TO_MOUNTPOINT:
+-                alias.volume.posix_path = value
++                alias.volume.posix_path = value.decode()
+             elif tag == TAG_RECURSIVE_ALIAS_OF_DISK_IMAGE:
+                 alias.volume.disk_image_alias = Alias.from_bytes(value)
+             elif tag == TAG_USER_HOME_LENGTH_PREFIX:
+@@ -422,13 +422,13 @@
+         #       (so doing so is ridiculous, and nothing could rely on it).
+         b.write(struct.pack(b'>h28pI2shI64pII4s4shhI2s10s',
+                             self.target.kind,
+-                            carbon_volname, voldate,
++                            carbon_volname, int(voldate),
+                             self.volume.fs_type,
+                             self.volume.disk_type,
+                             self.target.folder_cnid,
+                             carbon_filename,
+                             self.target.cnid,
+-                            crdate,
++                            int(crdate),
+                             self.target.creator_code,
+                             self.target.type_code,
+                             self.target.levels_from,
+@@ -449,12 +449,12 @@
+ 
+         b.write(struct.pack(b'>hhQhhQ',
+                 TAG_HIGH_RES_VOLUME_CREATION_DATE,
+-                8, long(voldate * 65536),
++                8, int(voldate * 65536),
+                 TAG_HIGH_RES_CREATION_DATE,
+-                8, long(crdate * 65536)))
++                8, int(crdate * 65536)))
+ 
+         if self.target.cnid_path:
+-            cnid_path = struct.pack(b'>%uI' % len(self.target.cnid_path),
++            cnid_path = struct.pack('>%uI' % len(self.target.cnid_path),
+                                     *self.target.cnid_path)
+             b.write(struct.pack(b'>hh', TAG_CNID_PATH,
+                                  len(cnid_path)))

From 06fdffd222ba0a00add4abe9fab9ad2c3e220d8f Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Wed, 20 Apr 2016 16:36:52 -0400
Subject: [PATCH 0193/1802] travis: switch to Trusty

---
 .travis.yml | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 95ef36bf028ee..0c9ac71c00b06 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,8 +7,7 @@
 #   IPv6 support
 
 sudo: required
-dist: precise
-group: legacy
+dist: trusty
 
 os: linux
 language: cpp
@@ -38,22 +37,25 @@ matrix:
     - compiler: ": ARM"
       env: HOST=arm-linux-gnueabihf PACKAGES="g++-arm-linux-gnueabihf" DEP_OPTS="NO_QT=1" CHECK_DOC=1 GOAL="install" BITCOIN_CONFIG="--enable-glibc-back-compat --enable-reduce-exports"
     - compiler: ": Win32"
-      env: HOST=i686-w64-mingw32 PPA="ppa:ubuntu-wine/ppa" PACKAGES="nsis gcc-mingw-w64-i686 g++-mingw-w64-i686 binutils-mingw-w64-i686 mingw-w64-dev wine1.7 bc" RUN_TESTS=true GOAL="deploy" BITCOIN_CONFIG="--enable-gui --enable-reduce-exports" MAKEJOBS="-j2"
+      env: HOST=i686-w64-mingw32 DPKG_ADD_ARCH="i386" PACKAGES="nsis g++-mingw-w64-i686 wine1.6 bc" RUN_TESTS=true GOAL="deploy" BITCOIN_CONFIG="--enable-gui --enable-reduce-exports" MAKEJOBS="-j2"
     - compiler: ": 32-bit + dash"
-      env: HOST=i686-pc-linux-gnu PACKAGES="g++-multilib bc python-zmq" PPA="ppa:chris-lea/zeromq" RUN_TESTS=true GOAL="install" BITCOIN_CONFIG="--enable-zmq --enable-glibc-back-compat --enable-reduce-exports LDFLAGS=-static-libstdc++" USE_SHELL="/bin/dash"
+      env: HOST=i686-pc-linux-gnu PACKAGES="g++-multilib bc python-zmq" RUN_TESTS=true GOAL="install" BITCOIN_CONFIG="--enable-zmq --enable-glibc-back-compat --enable-reduce-exports LDFLAGS=-static-libstdc++" USE_SHELL="/bin/dash"
     - compiler: ": Win64"
-      env: HOST=x86_64-w64-mingw32 PPA="ppa:ubuntu-wine/ppa" PACKAGES="nsis gcc-mingw-w64-x86-64 g++-mingw-w64-x86-64 binutils-mingw-w64-x86-64 mingw-w64-dev wine1.7 bc" RUN_TESTS=true GOAL="deploy" BITCOIN_CONFIG="--enable-gui --enable-reduce-exports" MAKEJOBS="-j2"
+      env: HOST=x86_64-w64-mingw32 DPKG_ADD_ARCH="i386" PACKAGES="nsis g++-mingw-w64-x86-64 wine1.6 bc" RUN_TESTS=true GOAL="deploy" BITCOIN_CONFIG="--enable-gui --enable-reduce-exports" MAKEJOBS="-j2"
     - compiler: ": bitcoind"
-      env: HOST=x86_64-unknown-linux-gnu PACKAGES="bc python-zmq" PPA="ppa:chris-lea/zeromq" DEP_OPTS="NO_QT=1 NO_UPNP=1 DEBUG=1" RUN_TESTS=true GOAL="install" BITCOIN_CONFIG="--enable-zmq --enable-glibc-back-compat --enable-reduce-exports CPPFLAGS=-DDEBUG_LOCKORDER"
+      env: HOST=x86_64-unknown-linux-gnu PACKAGES="bc python-zmq" DEP_OPTS="NO_QT=1 NO_UPNP=1 DEBUG=1" RUN_TESTS=true GOAL="install" BITCOIN_CONFIG="--enable-zmq --enable-glibc-back-compat --enable-reduce-exports CPPFLAGS=-DDEBUG_LOCKORDER"
     - compiler: ": No wallet"
       env: HOST=x86_64-unknown-linux-gnu DEP_OPTS="NO_WALLET=1" RUN_TESTS=true GOAL="install" BITCOIN_CONFIG="--enable-glibc-back-compat --enable-reduce-exports"
     - compiler: ": Cross-Mac"
       env: HOST=x86_64-apple-darwin11 PACKAGES="cmake imagemagick libcap-dev librsvg2-bin libz-dev libbz2-dev libtiff-tools python-dev" BITCOIN_CONFIG="--enable-reduce-exports" OSX_SDK=10.9 GOAL="deploy"
   exclude:
     - compiler: gcc
+before_install:
+    - export PATH=$(echo $PATH | tr ':' "\n" | sed '/\/opt\/python/d' | tr "\n" ":" | sed "s|::|:|g")
 install:
-    - if [ -n "$PACKAGES" ]; then sudo rm -f /etc/apt/sources.list.d/travis_ci_zeromq3-source.list; fi
+    - if [ -n "$PACKAGES" ]; then sudo rm -f /etc/apt/sources.list.d/google-chrome.list; fi
     - if [ -n "$PPA" ]; then travis_retry sudo add-apt-repository "$PPA" -y; fi
+    - if [ -n "$DPKG_ADD_ARCH" ]; then sudo dpkg --add-architecture "$DPKG_ADD_ARCH" ; fi
     - if [ -n "$PACKAGES" ]; then travis_retry sudo apt-get update; fi
     - if [ -n "$PACKAGES" ]; then travis_retry sudo apt-get install --no-install-recommends --no-upgrade -qq $PACKAGES; fi
 before_script:

From d1d7775587473410a107e7079616b9ecaae8dd06 Mon Sep 17 00:00:00 2001
From: Patrick Strateman <patrick.strateman@gmail.com>
Date: Tue, 19 Apr 2016 13:17:38 -0700
Subject: [PATCH 0194/1802] Improve worst-case behavior of
 CScript::FindAndDelete

Thanks to Sergio Lerner for identifying this issue and suggesting this kind of solution.
---
 src/script/script.h | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/script/script.h b/src/script/script.h
index 0503b39a76f54..bdbd340bccfdb 100644
--- a/src/script/script.h
+++ b/src/script/script.h
@@ -570,17 +570,26 @@ class CScript : public CScriptBase
         int nFound = 0;
         if (b.empty())
             return nFound;
-        iterator pc = begin();
+        CScript result;
+        iterator pc = begin(), pc2 = begin();
         opcodetype opcode;
         do
         {
+            result.insert(result.end(), pc2, pc);
             while (static_cast<size_t>(end() - pc) >= b.size() && std::equal(b.begin(), b.end(), pc))
             {
-                pc = erase(pc, pc + b.size());
+                pc = pc + b.size();
                 ++nFound;
             }
+            pc2 = pc;
         }
         while (GetOp(pc, opcode));
+
+        if (nFound > 0) {
+            result.insert(result.end(), pc2, end());
+            *this = result;
+        }
+
         return nFound;
     }
     int Find(opcodetype op) const

From 57704499be948c640c789c7fc11ed1abf8a681bd Mon Sep 17 00:00:00 2001
From: Kaz Wesley <keziahw@gmail.com>
Date: Mon, 18 Apr 2016 14:56:02 -0700
Subject: [PATCH 0195/1802] CBase58Data::SetString: cleanse the full vector

SetString seems to be passing the length of the wrong variable to
memory_cleanse, resulting in the last byte of the temporary buffer not being
securely erased.
---
 src/base58.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/base58.cpp b/src/base58.cpp
index d81c26092c305..d1d60a6f1dcf5 100644
--- a/src/base58.cpp
+++ b/src/base58.cpp
@@ -177,7 +177,7 @@ bool CBase58Data::SetString(const char* psz, unsigned int nVersionBytes)
     vchData.resize(vchTemp.size() - nVersionBytes);
     if (!vchData.empty())
         memcpy(&vchData[0], &vchTemp[nVersionBytes], vchData.size());
-    memory_cleanse(&vchTemp[0], vchData.size());
+    memory_cleanse(&vchTemp[0], vchTemp.size());
     return true;
 }
 

From f59dceb44f9bcfe1447b2dcca7483ed806cab22a Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Fri, 22 Apr 2016 09:21:09 +0200
Subject: [PATCH 0196/1802] qt: Fix out-of-tree GUI builds

Without this patch:

- When I compile the GUI from the bitcoin directory itself, it works as
  expected.

- When I build the GUI in an out-of-tree build, I cannot get it to
  select tabs. When I click, say the "Receive" tab nothing happens,
  the button selects but it doesn't switch the page. The rest - even
  the debug window - seems to work.

See full discussion here:
https://github.com/bitcoin/bitcoin/pull/7911#issuecomment-212413442

This turned out to be caused by a mismatch in the arguments to moc,
preventing it from finding `bitcoin-config.h`. Fix this by passing
`$(DEFAULT_INCLUDES)` to it, which gets set to the appropriate
path by autoconf itself.
---
 src/Makefile.qt.include | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Makefile.qt.include b/src/Makefile.qt.include
index 8443fe697b336..3b39919441088 100644
--- a/src/Makefile.qt.include
+++ b/src/Makefile.qt.include
@@ -424,11 +424,11 @@ ui_%.h: %.ui
 	$(AM_V_GEN) QT_SELECT=$(QT_SELECT) $(UIC) -o $@ $< || (echo "Error creating $@"; false)
 
 %.moc: %.cpp
-	$(AM_V_GEN) QT_SELECT=$(QT_SELECT) $(MOC) $(QT_INCLUDES) $(MOC_DEFS) $< | \
+	$(AM_V_GEN) QT_SELECT=$(QT_SELECT) $(MOC) $(DEFAULT_INCLUDES) $(QT_INCLUDES) $(MOC_DEFS) $< | \
 	  $(SED) -e '/^\*\*.*Created:/d' -e '/^\*\*.*by:/d' > $@
 
 moc_%.cpp: %.h
-	$(AM_V_GEN) QT_SELECT=$(QT_SELECT) $(MOC) $(QT_INCLUDES) $(MOC_DEFS) $< | \
+	$(AM_V_GEN) QT_SELECT=$(QT_SELECT) $(MOC) $(DEFAULT_INCLUDES) $(QT_INCLUDES) $(MOC_DEFS) $< | \
 	  $(SED) -e '/^\*\*.*Created:/d' -e '/^\*\*.*by:/d' > $@
 
 %.qm: %.ts

From 9c0bcb617b7358006842900ad8a9b333b30f5031 Mon Sep 17 00:00:00 2001
From: instagibbs <gsanders87@gmail.com>
Date: Fri, 22 Apr 2016 11:20:06 -0700
Subject: [PATCH 0197/1802] push back getaddednodeinfo dead value

---
 src/rpc/net.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/rpc/net.cpp b/src/rpc/net.cpp
index ce14d034ce1fd..320091b9c4d4d 100644
--- a/src/rpc/net.cpp
+++ b/src/rpc/net.cpp
@@ -347,6 +347,7 @@ UniValue getaddednodeinfo(const UniValue& params, bool fHelp)
             obj.push_back(Pair("connected", false));
             UniValue addresses(UniValue::VARR);
             obj.push_back(Pair("addresses", addresses));
+            ret.push_back(obj);
         }
     }
 

From 74f7b1273c41892058fb2ff99aab878ccd22082a Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Wed, 20 Apr 2016 09:05:12 +0200
Subject: [PATCH 0198/1802] dbwrapper: Remove throw keywords in function
 signatures

Using throw() specifications in function signatures is not only
not required in C++, it is considered deprecated for
[various reasons](https://stackoverflow.com/questions/1055387/throw-keyword-in-functions-signature).
It is not implemented by any of the common C++ compilers. The usage is
also inconsistent with the rest of the source code.
---
 src/dbwrapper.cpp |  4 ++--
 src/dbwrapper.h   | 14 +++++++-------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/dbwrapper.cpp b/src/dbwrapper.cpp
index 1907e2fa78439..16f85a3e65dbd 100644
--- a/src/dbwrapper.cpp
+++ b/src/dbwrapper.cpp
@@ -15,7 +15,7 @@
 #include <memenv.h>
 #include <stdint.h>
 
-void HandleError(const leveldb::Status& status) throw(dbwrapper_error)
+void HandleError(const leveldb::Status& status)
 {
     if (status.ok())
         return;
@@ -102,7 +102,7 @@ CDBWrapper::~CDBWrapper()
     options.env = NULL;
 }
 
-bool CDBWrapper::WriteBatch(CDBBatch& batch, bool fSync) throw(dbwrapper_error)
+bool CDBWrapper::WriteBatch(CDBBatch& batch, bool fSync)
 {
     leveldb::Status status = pdb->Write(fSync ? syncoptions : writeoptions, &batch.batch);
     HandleError(status);
diff --git a/src/dbwrapper.h b/src/dbwrapper.h
index 5e7313f7eb544..96fb42429f84e 100644
--- a/src/dbwrapper.h
+++ b/src/dbwrapper.h
@@ -23,7 +23,7 @@ class dbwrapper_error : public std::runtime_error
     dbwrapper_error(const std::string& msg) : std::runtime_error(msg) {}
 };
 
-void HandleError(const leveldb::Status& status) throw(dbwrapper_error);
+void HandleError(const leveldb::Status& status);
 
 /** Batch of changes queued to be written to a CDBWrapper */
 class CDBBatch
@@ -180,7 +180,7 @@ class CDBWrapper
     ~CDBWrapper();
 
     template <typename K, typename V>
-    bool Read(const K& key, V& value) const throw(dbwrapper_error)
+    bool Read(const K& key, V& value) const
     {
         CDataStream ssKey(SER_DISK, CLIENT_VERSION);
         ssKey.reserve(ssKey.GetSerializeSize(key));
@@ -206,7 +206,7 @@ class CDBWrapper
     }
 
     template <typename K, typename V>
-    bool Write(const K& key, const V& value, bool fSync = false) throw(dbwrapper_error)
+    bool Write(const K& key, const V& value, bool fSync = false)
     {
         CDBBatch batch(&obfuscate_key);
         batch.Write(key, value);
@@ -214,7 +214,7 @@ class CDBWrapper
     }
 
     template <typename K>
-    bool Exists(const K& key) const throw(dbwrapper_error)
+    bool Exists(const K& key) const
     {
         CDataStream ssKey(SER_DISK, CLIENT_VERSION);
         ssKey.reserve(ssKey.GetSerializeSize(key));
@@ -233,14 +233,14 @@ class CDBWrapper
     }
 
     template <typename K>
-    bool Erase(const K& key, bool fSync = false) throw(dbwrapper_error)
+    bool Erase(const K& key, bool fSync = false)
     {
         CDBBatch batch(&obfuscate_key);
         batch.Erase(key);
         return WriteBatch(batch, fSync);
     }
 
-    bool WriteBatch(CDBBatch& batch, bool fSync = false) throw(dbwrapper_error);
+    bool WriteBatch(CDBBatch& batch, bool fSync = false);
 
     // not available for LevelDB; provide for compatibility with BDB
     bool Flush()
@@ -248,7 +248,7 @@ class CDBWrapper
         return true;
     }
 
-    bool Sync() throw(dbwrapper_error)
+    bool Sync()
     {
         CDBBatch batch(&obfuscate_key);
         return WriteBatch(batch, true);

From 878bf480a3875181712a53a1156754faa19e579b Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Wed, 20 Apr 2016 09:08:45 +0200
Subject: [PATCH 0199/1802] dbwrapper: Remove CDBWrapper::GetObfuscateKeyHex

It is an unnecessary method as it is used only two times
and only internally, and the whole implementation is
HexStr(obfuscate_key).
---
 src/dbwrapper.cpp | 9 ++-------
 src/dbwrapper.h   | 6 ------
 2 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/src/dbwrapper.cpp b/src/dbwrapper.cpp
index 16f85a3e65dbd..9eae7c7c80b54 100644
--- a/src/dbwrapper.cpp
+++ b/src/dbwrapper.cpp
@@ -84,10 +84,10 @@ CDBWrapper::CDBWrapper(const boost::filesystem::path& path, size_t nCacheSize, b
         Write(OBFUSCATE_KEY_KEY, new_key);
         obfuscate_key = new_key;
 
-        LogPrintf("Wrote new obfuscate key for %s: %s\n", path.string(), GetObfuscateKeyHex());
+        LogPrintf("Wrote new obfuscate key for %s: %s\n", path.string(), HexStr(obfuscate_key));
     }
 
-    LogPrintf("Using obfuscation key for %s: %s\n", path.string(), GetObfuscateKeyHex());
+    LogPrintf("Using obfuscation key for %s: %s\n", path.string(), HexStr(obfuscate_key));
 }
 
 CDBWrapper::~CDBWrapper()
@@ -141,11 +141,6 @@ const std::vector<unsigned char>& CDBWrapper::GetObfuscateKey() const
     return obfuscate_key;
 }
 
-std::string CDBWrapper::GetObfuscateKeyHex() const
-{
-    return HexStr(obfuscate_key);
-}
-
 CDBIterator::~CDBIterator() { delete piter; }
 bool CDBIterator::Valid() { return piter->Valid(); }
 void CDBIterator::SeekToFirst() { piter->SeekToFirst(); }
diff --git a/src/dbwrapper.h b/src/dbwrapper.h
index 96fb42429f84e..153c0fd1bf8b8 100644
--- a/src/dbwrapper.h
+++ b/src/dbwrapper.h
@@ -268,12 +268,6 @@ class CDBWrapper
      * Accessor for obfuscate_key.
      */
     const std::vector<unsigned char>& GetObfuscateKey() const;
-
-    /**
-     * Return the obfuscate_key as a hex-formatted string.
-     */
-    std::string GetObfuscateKeyHex() const;
-
 };
 
 #endif // BITCOIN_DBWRAPPER_H

From b69836d6ff2bd7dc9568ad4af8235662bb4f1826 Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Wed, 20 Apr 2016 11:46:01 +0200
Subject: [PATCH 0200/1802] dbwrapper: Pass parent CDBWrapper into CDBBatch and
 CDBIterator

Pass parent wrapper directly instead of obfuscation key. This
makes it possible for other databases which re-use this code
to use other properties from the database.

Add a namespace dbwrapper_private for private functions to be used
only in dbwrapper.h/cpp and dbwrapper_tests.
---
 src/dbwrapper.cpp            | 14 +++++++----
 src/dbwrapper.h              | 46 ++++++++++++++++++++++--------------
 src/test/dbwrapper_tests.cpp |  8 +++----
 src/txdb.cpp                 |  6 ++---
 4 files changed, 44 insertions(+), 30 deletions(-)

diff --git a/src/dbwrapper.cpp b/src/dbwrapper.cpp
index 9eae7c7c80b54..42f57676ab961 100644
--- a/src/dbwrapper.cpp
+++ b/src/dbwrapper.cpp
@@ -136,12 +136,16 @@ bool CDBWrapper::IsEmpty()
     return !(it->Valid());
 }
 
-const std::vector<unsigned char>& CDBWrapper::GetObfuscateKey() const
-{
-    return obfuscate_key;
-}
-
 CDBIterator::~CDBIterator() { delete piter; }
 bool CDBIterator::Valid() { return piter->Valid(); }
 void CDBIterator::SeekToFirst() { piter->SeekToFirst(); }
 void CDBIterator::Next() { piter->Next(); }
+
+namespace dbwrapper_private {
+
+const std::vector<unsigned char>& GetObfuscateKey(const CDBWrapper &w)
+{
+    return w.obfuscate_key;
+}
+
+};
diff --git a/src/dbwrapper.h b/src/dbwrapper.h
index 153c0fd1bf8b8..9eca2edf60734 100644
--- a/src/dbwrapper.h
+++ b/src/dbwrapper.h
@@ -25,20 +25,34 @@ class dbwrapper_error : public std::runtime_error
 
 void HandleError(const leveldb::Status& status);
 
+class CDBWrapper;
+
+/** These should be considered an implementation detail of the specific database.
+ */
+namespace dbwrapper_private {
+
+/** Work around circular dependency, as well as for testing in dbwrapper_tests.
+ * Database obfuscation should be considered an implementation detail of the
+ * specific database.
+ */
+const std::vector<unsigned char>& GetObfuscateKey(const CDBWrapper &w);
+
+};
+
 /** Batch of changes queued to be written to a CDBWrapper */
 class CDBBatch
 {
     friend class CDBWrapper;
 
 private:
+    const CDBWrapper &parent;
     leveldb::WriteBatch batch;
-    const std::vector<unsigned char> *obfuscate_key;
 
 public:
     /**
-     * @param[in] obfuscate_key    If passed, XOR data with this key.
+     * @param[in] parent    CDBWrapper that this batch is to be submitted to
      */
-    CDBBatch(const std::vector<unsigned char> *obfuscate_key) : obfuscate_key(obfuscate_key) { };
+    CDBBatch(const CDBWrapper &parent) : parent(parent) { };
 
     template <typename K, typename V>
     void Write(const K& key, const V& value)
@@ -51,7 +65,7 @@ class CDBBatch
         CDataStream ssValue(SER_DISK, CLIENT_VERSION);
         ssValue.reserve(ssValue.GetSerializeSize(value));
         ssValue << value;
-        ssValue.Xor(*obfuscate_key);
+        ssValue.Xor(dbwrapper_private::GetObfuscateKey(parent));
         leveldb::Slice slValue(&ssValue[0], ssValue.size());
 
         batch.Put(slKey, slValue);
@@ -72,17 +86,17 @@ class CDBBatch
 class CDBIterator
 {
 private:
+    const CDBWrapper &parent;
     leveldb::Iterator *piter;
-    const std::vector<unsigned char> *obfuscate_key;
 
 public:
 
     /**
+     * @param[in] parent           Parent CDBWrapper instance.
      * @param[in] piterIn          The original leveldb iterator.
-     * @param[in] obfuscate_key    If passed, XOR data with this key.
      */
-    CDBIterator(leveldb::Iterator *piterIn, const std::vector<unsigned char>* obfuscate_key) :
-        piter(piterIn), obfuscate_key(obfuscate_key) { };
+    CDBIterator(const CDBWrapper &parent, leveldb::Iterator *piterIn) :
+        parent(parent), piter(piterIn) { };
     ~CDBIterator();
 
     bool Valid();
@@ -118,7 +132,7 @@ class CDBIterator
         leveldb::Slice slValue = piter->value();
         try {
             CDataStream ssValue(slValue.data(), slValue.data() + slValue.size(), SER_DISK, CLIENT_VERSION);
-            ssValue.Xor(*obfuscate_key);
+            ssValue.Xor(dbwrapper_private::GetObfuscateKey(parent));
             ssValue >> value;
         } catch (const std::exception&) {
             return false;
@@ -134,6 +148,7 @@ class CDBIterator
 
 class CDBWrapper
 {
+    friend const std::vector<unsigned char>& dbwrapper_private::GetObfuscateKey(const CDBWrapper &w);
 private:
     //! custom environment this database is using (may be NULL in case of default environment)
     leveldb::Env* penv;
@@ -208,7 +223,7 @@ class CDBWrapper
     template <typename K, typename V>
     bool Write(const K& key, const V& value, bool fSync = false)
     {
-        CDBBatch batch(&obfuscate_key);
+        CDBBatch batch(*this);
         batch.Write(key, value);
         return WriteBatch(batch, fSync);
     }
@@ -235,7 +250,7 @@ class CDBWrapper
     template <typename K>
     bool Erase(const K& key, bool fSync = false)
     {
-        CDBBatch batch(&obfuscate_key);
+        CDBBatch batch(*this);
         batch.Erase(key);
         return WriteBatch(batch, fSync);
     }
@@ -250,24 +265,19 @@ class CDBWrapper
 
     bool Sync()
     {
-        CDBBatch batch(&obfuscate_key);
+        CDBBatch batch(*this);
         return WriteBatch(batch, true);
     }
 
     CDBIterator *NewIterator()
     {
-        return new CDBIterator(pdb->NewIterator(iteroptions), &obfuscate_key);
+        return new CDBIterator(*this, pdb->NewIterator(iteroptions));
     }
 
     /**
      * Return true if the database managed by this class contains no entries.
      */
     bool IsEmpty();
-
-    /**
-     * Accessor for obfuscate_key.
-     */
-    const std::vector<unsigned char>& GetObfuscateKey() const;
 };
 
 #endif // BITCOIN_DBWRAPPER_H
diff --git a/src/test/dbwrapper_tests.cpp b/src/test/dbwrapper_tests.cpp
index e399315870e79..081d57831d0dd 100644
--- a/src/test/dbwrapper_tests.cpp
+++ b/src/test/dbwrapper_tests.cpp
@@ -39,7 +39,7 @@ BOOST_AUTO_TEST_CASE(dbwrapper)
         uint256 res;
 
         // Ensure that we're doing real obfuscation when obfuscate=true
-        BOOST_CHECK(obfuscate != is_null_key(dbw.GetObfuscateKey()));
+        BOOST_CHECK(obfuscate != is_null_key(dbwrapper_private::GetObfuscateKey(dbw)));
 
         BOOST_CHECK(dbw.Write(key, in));
         BOOST_CHECK(dbw.Read(key, res));
@@ -64,7 +64,7 @@ BOOST_AUTO_TEST_CASE(dbwrapper_batch)
         uint256 in3 = GetRandHash();
 
         uint256 res;
-        CDBBatch batch(&dbw.GetObfuscateKey());
+        CDBBatch batch(dbw);
 
         batch.Write(key, in);
         batch.Write(key2, in2);
@@ -156,7 +156,7 @@ BOOST_AUTO_TEST_CASE(existing_data_no_obfuscate)
     BOOST_CHECK_EQUAL(res2.ToString(), in.ToString());
 
     BOOST_CHECK(!odbw.IsEmpty()); // There should be existing data
-    BOOST_CHECK(is_null_key(odbw.GetObfuscateKey())); // The key should be an empty string
+    BOOST_CHECK(is_null_key(dbwrapper_private::GetObfuscateKey(odbw))); // The key should be an empty string
 
     uint256 in2 = GetRandHash();
     uint256 res3;
@@ -193,7 +193,7 @@ BOOST_AUTO_TEST_CASE(existing_data_reindex)
     // Check that the key/val we wrote with unobfuscated wrapper doesn't exist
     uint256 res2;
     BOOST_CHECK(!odbw.Read(key, res2));
-    BOOST_CHECK(!is_null_key(odbw.GetObfuscateKey()));
+    BOOST_CHECK(!is_null_key(dbwrapper_private::GetObfuscateKey(odbw)));
 
     uint256 in2 = GetRandHash();
     uint256 res3;
diff --git a/src/txdb.cpp b/src/txdb.cpp
index 19ca1786549ee..5fbaeb608a74c 100644
--- a/src/txdb.cpp
+++ b/src/txdb.cpp
@@ -49,7 +49,7 @@ uint256 CCoinsViewDB::GetBestBlock() const {
 }
 
 bool CCoinsViewDB::BatchWrite(CCoinsMap &mapCoins, const uint256 &hashBlock) {
-    CDBBatch batch(&db.GetObfuscateKey());
+    CDBBatch batch(db);
     size_t count = 0;
     size_t changed = 0;
     for (CCoinsMap::iterator it = mapCoins.begin(); it != mapCoins.end();) {
@@ -139,7 +139,7 @@ void CCoinsViewDBCursor::Next()
 }
 
 bool CBlockTreeDB::WriteBatchSync(const std::vector<std::pair<int, const CBlockFileInfo*> >& fileInfo, int nLastFile, const std::vector<const CBlockIndex*>& blockinfo) {
-    CDBBatch batch(&GetObfuscateKey());
+    CDBBatch batch(*this);
     for (std::vector<std::pair<int, const CBlockFileInfo*> >::const_iterator it=fileInfo.begin(); it != fileInfo.end(); it++) {
         batch.Write(make_pair(DB_BLOCK_FILES, it->first), *it->second);
     }
@@ -155,7 +155,7 @@ bool CBlockTreeDB::ReadTxIndex(const uint256 &txid, CDiskTxPos &pos) {
 }
 
 bool CBlockTreeDB::WriteTxIndex(const std::vector<std::pair<uint256, CDiskTxPos> >&vect) {
-    CDBBatch batch(&GetObfuscateKey());
+    CDBBatch batch(*this);
     for (std::vector<std::pair<uint256,CDiskTxPos> >::const_iterator it=vect.begin(); it!=vect.end(); it++)
         batch.Write(make_pair(DB_TXINDEX, it->first), it->second);
     return WriteBatch(batch);

From 869cf1234a915808fda6fd663dead5580fbd046e Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Wed, 20 Apr 2016 11:48:57 +0200
Subject: [PATCH 0201/1802] dbwrapper: Move `HandleError` to
 `dbwrapper_private`

HandleError is implementation-specific.
---
 src/dbwrapper.cpp | 34 +++++++++++++++++-----------------
 src/dbwrapper.h   | 10 ++++++----
 2 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/src/dbwrapper.cpp b/src/dbwrapper.cpp
index 42f57676ab961..09c68fbe550c8 100644
--- a/src/dbwrapper.cpp
+++ b/src/dbwrapper.cpp
@@ -15,20 +15,6 @@
 #include <memenv.h>
 #include <stdint.h>
 
-void HandleError(const leveldb::Status& status)
-{
-    if (status.ok())
-        return;
-    LogPrintf("%s\n", status.ToString());
-    if (status.IsCorruption())
-        throw dbwrapper_error("Database corrupted");
-    if (status.IsIOError())
-        throw dbwrapper_error("Database I/O error");
-    if (status.IsNotFound())
-        throw dbwrapper_error("Database entry missing");
-    throw dbwrapper_error("Unknown database error");
-}
-
 static leveldb::Options GetOptions(size_t nCacheSize)
 {
     leveldb::Options options;
@@ -61,13 +47,13 @@ CDBWrapper::CDBWrapper(const boost::filesystem::path& path, size_t nCacheSize, b
         if (fWipe) {
             LogPrintf("Wiping LevelDB in %s\n", path.string());
             leveldb::Status result = leveldb::DestroyDB(path.string(), options);
-            HandleError(result);
+            dbwrapper_private::HandleError(result);
         }
         TryCreateDirectory(path);
         LogPrintf("Opening LevelDB in %s\n", path.string());
     }
     leveldb::Status status = leveldb::DB::Open(options, path.string(), &pdb);
-    HandleError(status);
+    dbwrapper_private::HandleError(status);
     LogPrintf("Opened LevelDB successfully\n");
 
     // The base-case obfuscation key, which is a noop.
@@ -105,7 +91,7 @@ CDBWrapper::~CDBWrapper()
 bool CDBWrapper::WriteBatch(CDBBatch& batch, bool fSync)
 {
     leveldb::Status status = pdb->Write(fSync ? syncoptions : writeoptions, &batch.batch);
-    HandleError(status);
+    dbwrapper_private::HandleError(status);
     return true;
 }
 
@@ -143,6 +129,20 @@ void CDBIterator::Next() { piter->Next(); }
 
 namespace dbwrapper_private {
 
+void HandleError(const leveldb::Status& status)
+{
+    if (status.ok())
+        return;
+    LogPrintf("%s\n", status.ToString());
+    if (status.IsCorruption())
+        throw dbwrapper_error("Database corrupted");
+    if (status.IsIOError())
+        throw dbwrapper_error("Database I/O error");
+    if (status.IsNotFound())
+        throw dbwrapper_error("Database entry missing");
+    throw dbwrapper_error("Unknown database error");
+}
+
 const std::vector<unsigned char>& GetObfuscateKey(const CDBWrapper &w)
 {
     return w.obfuscate_key;
diff --git a/src/dbwrapper.h b/src/dbwrapper.h
index 9eca2edf60734..a0779d3ab9918 100644
--- a/src/dbwrapper.h
+++ b/src/dbwrapper.h
@@ -23,14 +23,16 @@ class dbwrapper_error : public std::runtime_error
     dbwrapper_error(const std::string& msg) : std::runtime_error(msg) {}
 };
 
-void HandleError(const leveldb::Status& status);
-
 class CDBWrapper;
 
 /** These should be considered an implementation detail of the specific database.
  */
 namespace dbwrapper_private {
 
+/** Handle database error by throwing dbwrapper_error exception.
+ */
+void HandleError(const leveldb::Status& status);
+
 /** Work around circular dependency, as well as for testing in dbwrapper_tests.
  * Database obfuscation should be considered an implementation detail of the
  * specific database.
@@ -208,7 +210,7 @@ class CDBWrapper
             if (status.IsNotFound())
                 return false;
             LogPrintf("LevelDB read failure: %s\n", status.ToString());
-            HandleError(status);
+            dbwrapper_private::HandleError(status);
         }
         try {
             CDataStream ssValue(strValue.data(), strValue.data() + strValue.size(), SER_DISK, CLIENT_VERSION);
@@ -242,7 +244,7 @@ class CDBWrapper
             if (status.IsNotFound())
                 return false;
             LogPrintf("LevelDB read failure: %s\n", status.ToString());
-            HandleError(status);
+            dbwrapper_private::HandleError(status);
         }
         return true;
     }

From 5555528b47b7d33a5b963c076e6bb09ee25931b5 Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Sat, 23 Apr 2016 14:35:52 +0200
Subject: [PATCH 0202/1802] [qa] mininode: Unfiddle strings into bytes

---
 qa/rpc-tests/test_framework/mininode.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/qa/rpc-tests/test_framework/mininode.py b/qa/rpc-tests/test_framework/mininode.py
index af3356411471e..30aecfd445b0e 100755
--- a/qa/rpc-tests/test_framework/mininode.py
+++ b/qa/rpc-tests/test_framework/mininode.py
@@ -93,7 +93,7 @@ def deser_uint256(f):
 
 
 def ser_uint256(u):
-    rs = ""
+    rs = b""
     for i in xrange(8):
         rs += struct.pack("<I", u & 0xFFFFFFFFL)
         u >>= 32
@@ -191,7 +191,7 @@ def deser_string_vector(f):
 
 
 def ser_string_vector(l):
-    r = ""
+    r = b""
     if len(l) < 253:
         r = struct.pack("B", len(l))
     elif len(l) < 0x10000:
@@ -624,7 +624,7 @@ def deserialize(self, f):
         self.vchSig = deser_string(f)
 
     def serialize(self):
-        r = ""
+        r = b""
         r += ser_string(self.vchMsg)
         r += ser_string(self.vchSig)
         return r
@@ -988,7 +988,7 @@ class msg_reject(object):
     def __init__(self):
         self.message = b""
         self.code = 0
-        self.reason = ""
+        self.reason = b""
         self.data = 0L
 
     def deserialize(self, f):

From fb26bf0ea3822638b10a783f054c280fc053a2b5 Mon Sep 17 00:00:00 2001
From: Patrick Strateman <patrick.strateman@gmail.com>
Date: Sat, 23 Apr 2016 22:21:52 -0700
Subject: [PATCH 0203/1802] CAddrMan::Deserialize handle corrupt serializations
 better.

---
 src/addrman.h | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/addrman.h b/src/addrman.h
index 4f3de8d7c5e63..3085450450474 100644
--- a/src/addrman.h
+++ b/src/addrman.h
@@ -350,6 +350,14 @@ class CAddrMan
             nUBuckets ^= (1 << 30);
         }
 
+        if (nNew > ADDRMAN_NEW_BUCKET_COUNT * ADDRMAN_BUCKET_SIZE) {
+            throw std::ios_base::failure("Corrupt CAddrMan serialization, nNew exceeds limit.");
+        }
+
+        if (nTried > ADDRMAN_TRIED_BUCKET_COUNT * ADDRMAN_BUCKET_SIZE) {
+            throw std::ios_base::failure("Corrupt CAddrMan serialization, nTried exceeds limit.");
+        }
+
         // Deserialize entries from the new table.
         for (int n = 0; n < nNew; n++) {
             CAddrInfo &info = mapInfo[n];

From c907f4d56b0a27ecd002a6d7d89a38cfc6d45ee3 Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Fri, 15 Apr 2016 13:21:16 +0200
Subject: [PATCH 0204/1802] doc: Update release process

The actual release process quite diverged from what was written here,
also clarify things a bit.
---
 doc/release-notes.md   |  15 +++
 doc/release-process.md | 294 ++++++++++++++++++++++++-----------------
 2 files changed, 191 insertions(+), 118 deletions(-)

diff --git a/doc/release-notes.md b/doc/release-notes.md
index 806d174ebf7fc..4e318ef294059 100644
--- a/doc/release-notes.md
+++ b/doc/release-notes.md
@@ -1,6 +1,21 @@
 (note: this is a temporary file, to be added-to by anybody, and moved to
 release-notes at release time)
 
+Bitcoin Core version *version* is now available from:
+
+  <https://bitcoin.org/bin/bitcoin-core-*version*/>
+
+This is a new major version release, including new features, various bugfixes
+and performance improvements, as well as updated translations.
+
+Please report bugs using the issue tracker at github:
+
+  <https://github.com/bitcoin/bitcoin/issues>
+
+To receive security and update notifications, please subscribe to:
+
+  <https://bitcoincore.org/en/list/announcements/join/>
+
 Notable changes
 ===============
 
diff --git a/doc/release-process.md b/doc/release-process.md
index 5a6ac8482b674..34dead86bc1e4 100644
--- a/doc/release-process.md
+++ b/doc/release-process.md
@@ -1,181 +1,228 @@
 Release Process
 ====================
 
-* Update translations (ping wumpus, Diapolo or tcatm on IRC) see [translation_process.md](https://github.com/bitcoin/bitcoin/blob/master/doc/translation_process.md#syncing-with-transifex)
+Before every release candidate:
+
+* Update translations (ping wumpus on IRC) see [translation_process.md](https://github.com/bitcoin/bitcoin/blob/master/doc/translation_process.md#syncing-with-transifex)
+
+Before every minor and major release:
+
 * Update [bips.md](bips.md) to account for changes since the last release.
-* Update hardcoded [seeds](/contrib/seeds)
+* Update version in sources (see below)
+* Write release notes (see below)
+
+Before every major release:
 
-* * *
+* Update hardcoded [seeds](/contrib/seeds/README.md), see [this pull request](https://github.com/bitcoin/bitcoin/pull/7415) for an example. 
+
+### First time / New builders
 
-###First time / New builders
 Check out the source code in the following directory hierarchy.
 
-	cd /path/to/your/toplevel/build
-	git clone https://github.com/bitcoin/gitian.sigs.git
-	git clone https://github.com/bitcoin/bitcoin-detached-sigs.git
-	git clone https://github.com/devrandom/gitian-builder.git
-	git clone https://github.com/bitcoin/bitcoin.git
+    cd /path/to/your/toplevel/build
+    git clone https://github.com/bitcoin/gitian.sigs.git
+    git clone https://github.com/bitcoin/bitcoin-detached-sigs.git
+    git clone https://github.com/devrandom/gitian-builder.git
+    git clone https://github.com/bitcoin/bitcoin.git
+
+### Bitcoin maintainers/release engineers, update version in sources
+
+Update the following:
+
+- `configure.ac`:
+    - `_CLIENT_VERSION_MAJOR`
+    - `_CLIENT_VERSION_MINOR`
+    - `_CLIENT_VERSION_REVISION`
+    - Don't forget to set `_CLIENT_VERSION_IS_RELEASE` to `true`
+- `src/clientversion.h`: (this mirrors `configure.ac` - see issue #3539)
+    - `CLIENT_VERSION_MAJOR`
+    - `CLIENT_VERSION_MINOR`
+    - `CLIENT_VERSION_REVISION`
+    - Don't forget to set `CLIENT_VERSION_IS_RELEASE` to `true`
+- `doc/README.md` and `doc/README_windows.txt`
+- `doc/Doxyfile`: `PROJECT_NUMBER` contains the full version
+- `contrib/gitian-descriptors/*.yml`: usually one'd want to do this on master after branching off the release - but be sure to at least do it before a new major release
 
-###Bitcoin maintainers/release engineers, update (commit) version in sources
+Write release notes. git shortlog helps a lot, for example:
 
-	pushd ./bitcoin
-	contrib/verifysfbinaries/verify.sh
-	configure.ac
-	doc/README*
-	doc/Doxyfile
-	contrib/gitian-descriptors/*.yml
-	src/clientversion.h (change CLIENT_VERSION_IS_RELEASE to true)
+    git shortlog --no-merges v(current version, e.g. 0.7.2)..v(new version, e.g. 0.8.0)
 
-	# tag version in git
+(or ping @wumpus on IRC, he has specific tooling to generate the list of merged pulls
+and sort them into categories based on labels)
 
-	git tag -s v(new version, e.g. 0.8.0)
+Generate list of authors:
 
-	# write release notes. git shortlog helps a lot, for example:
+    git log --format='%aN' "$*" | sort -ui | sed -e 's/^/- /'
 
-	git shortlog --no-merges v(current version, e.g. 0.7.2)..v(new version, e.g. 0.8.0)
-	popd
+Tag version (or release candidate) in git
 
-* * *
+    git tag -s v(new version, e.g. 0.8.0)
 
-###Setup and perform Gitian builds
+### Setup and perform Gitian builds
 
- Setup Gitian descriptors:
+Setup Gitian descriptors:
 
-	pushd ./bitcoin
-	export SIGNER=(your Gitian key, ie bluematt, sipa, etc)
-	export VERSION=(new version, e.g. 0.8.0)
-	git fetch
-	git checkout v${VERSION}
-	popd
+    pushd ./bitcoin
+    export SIGNER=(your Gitian key, ie bluematt, sipa, etc)
+    export VERSION=(new version, e.g. 0.8.0)
+    git fetch
+    git checkout v${VERSION}
+    popd
 
-  Ensure your gitian.sigs are up-to-date if you wish to gverify your builds against other Gitian signatures.
+Ensure your gitian.sigs are up-to-date if you wish to gverify your builds against other Gitian signatures.
 
-	pushd ./gitian.sigs
-	git pull
-	popd
+    pushd ./gitian.sigs
+    git pull
+    popd
 
-  Ensure gitian-builder is up-to-date to take advantage of new caching features (`e9741525c` or later is recommended).
+Ensure gitian-builder is up-to-date to take advantage of new caching features (`e9741525c` or later is recommended).
 
-	pushd ./gitian-builder
-	git pull
+    pushd ./gitian-builder
+    git pull
+    popd
 
-###Fetch and create inputs: (first time, or when dependency versions change)
+### Fetch and create inputs: (first time, or when dependency versions change)
 
-	mkdir -p inputs
-	wget -P inputs https://bitcoincore.org/cfields/osslsigncode-Backports-to-1.7.1.patch
-	wget -P inputs http://downloads.sourceforge.net/project/osslsigncode/osslsigncode/osslsigncode-1.7.1.tar.gz
+    pushd ./gitian-builder
+    mkdir -p inputs
+    wget -P inputs https://bitcoincore.org/cfields/osslsigncode-Backports-to-1.7.1.patch
+    wget -P inputs http://downloads.sourceforge.net/project/osslsigncode/osslsigncode/osslsigncode-1.7.1.tar.gz
+    popd
 
- Register and download the Apple SDK: see [OS X readme](README_osx.txt) for details.
+Register and download the Apple SDK: see [OS X readme](README_osx.txt) for details.
 
- https://developer.apple.com/devcenter/download.action?path=/Developer_Tools/xcode_6.1.1/xcode_6.1.1.dmg
+https://developer.apple.com/devcenter/download.action?path=/Developer_Tools/xcode_6.1.1/xcode_6.1.1.dmg
 
- Using a Mac, create a tarball for the 10.9 SDK and copy it to the inputs directory:
+Using a Mac, create a tarball for the 10.9 SDK and copy it to the inputs directory:
 
-	tar -C /Volumes/Xcode/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/ -czf MacOSX10.9.sdk.tar.gz MacOSX10.9.sdk
+    tar -C /Volumes/Xcode/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/ -czf MacOSX10.9.sdk.tar.gz MacOSX10.9.sdk
 
-###Optional: Seed the Gitian sources cache and offline git repositories
+### Optional: Seed the Gitian sources cache and offline git repositories
 
 By default, Gitian will fetch source files as needed. To cache them ahead of time:
 
-	make -C ../bitcoin/depends download SOURCES_PATH=`pwd`/cache/common
+    pushd ./gitian-builder
+    make -C ../bitcoin/depends download SOURCES_PATH=`pwd`/cache/common
+    popd
 
 Only missing files will be fetched, so this is safe to re-run for each build.
 
 NOTE: Offline builds must use the --url flag to ensure Gitian fetches only from local URLs. For example:
-```
-./bin/gbuild --url bitcoin=/path/to/bitcoin,signature=/path/to/sigs {rest of arguments}
-```
+
+    pushd ./gitian-builder
+    ./bin/gbuild --url bitcoin=/path/to/bitcoin,signature=/path/to/sigs {rest of arguments}
+    popd
+
 The gbuild invocations below <b>DO NOT DO THIS</b> by default.
 
-###Build and sign Bitcoin Core for Linux, Windows, and OS X:
+### Build and sign Bitcoin Core for Linux, Windows, and OS X:
 
-	./bin/gbuild --commit bitcoin=v${VERSION} ../bitcoin/contrib/gitian-descriptors/gitian-linux.yml
-	./bin/gsign --signer $SIGNER --release ${VERSION}-linux --destination ../gitian.sigs/ ../bitcoin/contrib/gitian-descriptors/gitian-linux.yml
+    pushd ./gitian-builder
+    ./bin/gbuild --commit bitcoin=v${VERSION} ../bitcoin/contrib/gitian-descriptors/gitian-linux.yml
+    ./bin/gsign --signer $SIGNER --release ${VERSION}-linux --destination ../gitian.sigs/ ../bitcoin/contrib/gitian-descriptors/gitian-linux.yml
     mv build/out/bitcoin-*.tar.gz build/out/src/bitcoin-*.tar.gz ../
 
-	./bin/gbuild --commit bitcoin=v${VERSION} ../bitcoin/contrib/gitian-descriptors/gitian-win.yml
-	./bin/gsign --signer $SIGNER --release ${VERSION}-win-unsigned --destination ../gitian.sigs/ ../bitcoin/contrib/gitian-descriptors/gitian-win.yml
+    ./bin/gbuild --commit bitcoin=v${VERSION} ../bitcoin/contrib/gitian-descriptors/gitian-win.yml
+    ./bin/gsign --signer $SIGNER --release ${VERSION}-win-unsigned --destination ../gitian.sigs/ ../bitcoin/contrib/gitian-descriptors/gitian-win.yml
     mv build/out/bitcoin-*-win-unsigned.tar.gz inputs/bitcoin-win-unsigned.tar.gz
     mv build/out/bitcoin-*.zip build/out/bitcoin-*.exe ../
 
-	./bin/gbuild --commit bitcoin=v${VERSION} ../bitcoin/contrib/gitian-descriptors/gitian-osx.yml
-	./bin/gsign --signer $SIGNER --release ${VERSION}-osx-unsigned --destination ../gitian.sigs/ ../bitcoin/contrib/gitian-descriptors/gitian-osx.yml
+    ./bin/gbuild --commit bitcoin=v${VERSION} ../bitcoin/contrib/gitian-descriptors/gitian-osx.yml
+    ./bin/gsign --signer $SIGNER --release ${VERSION}-osx-unsigned --destination ../gitian.sigs/ ../bitcoin/contrib/gitian-descriptors/gitian-osx.yml
     mv build/out/bitcoin-*-osx-unsigned.tar.gz inputs/bitcoin-osx-unsigned.tar.gz
     mv build/out/bitcoin-*.tar.gz build/out/bitcoin-*.dmg ../
+    popd
 
-  Build output expected:
+Build output expected:
 
-  1. source tarball (bitcoin-${VERSION}.tar.gz)
-  2. linux 32-bit and 64-bit dist tarballs (bitcoin-${VERSION}-linux[32|64].tar.gz)
-  3. windows 32-bit and 64-bit unsigned installers and dist zips (bitcoin-${VERSION}-win[32|64]-setup-unsigned.exe, bitcoin-${VERSION}-win[32|64].zip)
-  4. OS X unsigned installer and dist tarball (bitcoin-${VERSION}-osx-unsigned.dmg, bitcoin-${VERSION}-osx64.tar.gz)
-  5. Gitian signatures (in gitian.sigs/${VERSION}-<linux|{win,osx}-unsigned>/(your Gitian key)/
+  1. source tarball (`bitcoin-${VERSION}.tar.gz`)
+  2. linux 32-bit and 64-bit dist tarballs (`bitcoin-${VERSION}-linux[32|64].tar.gz`)
+  3. windows 32-bit and 64-bit unsigned installers and dist zips (`bitcoin-${VERSION}-win[32|64]-setup-unsigned.exe`, `bitcoin-${VERSION}-win[32|64].zip`)
+  4. OS X unsigned installer and dist tarball (`bitcoin-${VERSION}-osx-unsigned.dmg`, `bitcoin-${VERSION}-osx64.tar.gz`)
+  5. Gitian signatures (in `gitian.sigs/${VERSION}-<linux|{win,osx}-unsigned>/(your Gitian key)/`)
 
-###Verify other gitian builders signatures to your own. (Optional)
+### Verify other gitian builders signatures to your own. (Optional)
 
-  Add other gitian builders keys to your gpg keyring
+Add other gitian builders keys to your gpg keyring
 
-	gpg --import ../bitcoin/contrib/gitian-keys/*.pgp
+    gpg --import bitcoin/contrib/gitian-keys/*.pgp
 
-  Verify the signatures
+Verify the signatures
 
-	./bin/gverify -v -d ../gitian.sigs/ -r ${VERSION}-linux ../bitcoin/contrib/gitian-descriptors/gitian-linux.yml
-	./bin/gverify -v -d ../gitian.sigs/ -r ${VERSION}-win-unsigned ../bitcoin/contrib/gitian-descriptors/gitian-win.yml
-	./bin/gverify -v -d ../gitian.sigs/ -r ${VERSION}-osx-unsigned ../bitcoin/contrib/gitian-descriptors/gitian-osx.yml
+    pushd ./gitian-builder
+    ./bin/gverify -v -d ../gitian.sigs/ -r ${VERSION}-linux ../bitcoin/contrib/gitian-descriptors/gitian-linux.yml
+    ./bin/gverify -v -d ../gitian.sigs/ -r ${VERSION}-win-unsigned ../bitcoin/contrib/gitian-descriptors/gitian-win.yml
+    ./bin/gverify -v -d ../gitian.sigs/ -r ${VERSION}-osx-unsigned ../bitcoin/contrib/gitian-descriptors/gitian-osx.yml
+    popd
 
-	popd
-
-###Next steps:
+### Next steps:
 
 Commit your signature to gitian.sigs:
 
-	pushd gitian.sigs
-	git add ${VERSION}-linux/${SIGNER}
-	git add ${VERSION}-win-unsigned/${SIGNER}
-	git add ${VERSION}-osx-unsigned/${SIGNER}
-	git commit -a
-	git push  # Assuming you can push to the gitian.sigs tree
-	popd
-
-  Wait for Windows/OS X detached signatures:
-	Once the Windows/OS X builds each have 3 matching signatures, they will be signed with their respective release keys.
-	Detached signatures will then be committed to the [bitcoin-detached-sigs](https://github.com/bitcoin/bitcoin-detached-sigs) repository, which can be combined with the unsigned apps to create signed binaries.
-
-  Create (and optionally verify) the signed OS X binary:
-
-	pushd ./gitian-builder
-	./bin/gbuild -i --commit signature=v${VERSION} ../bitcoin/contrib/gitian-descriptors/gitian-osx-signer.yml
-	./bin/gsign --signer $SIGNER --release ${VERSION}-osx-signed --destination ../gitian.sigs/ ../bitcoin/contrib/gitian-descriptors/gitian-osx-signer.yml
-	./bin/gverify -v -d ../gitian.sigs/ -r ${VERSION}-osx-signed ../bitcoin/contrib/gitian-descriptors/gitian-osx-signer.yml
-	mv build/out/bitcoin-osx-signed.dmg ../bitcoin-${VERSION}-osx.dmg
-	popd
-
-  Create (and optionally verify) the signed Windows binaries:
-
-	pushd ./gitian-builder
-	./bin/gbuild -i --commit signature=v${VERSION} ../bitcoin/contrib/gitian-descriptors/gitian-win-signer.yml
-	./bin/gsign --signer $SIGNER --release ${VERSION}-win-signed --destination ../gitian.sigs/ ../bitcoin/contrib/gitian-descriptors/gitian-win-signer.yml
-	./bin/gverify -v -d ../gitian.sigs/ -r ${VERSION}-win-signed ../bitcoin/contrib/gitian-descriptors/gitian-win-signer.yml
-	mv build/out/bitcoin-*win64-setup.exe ../bitcoin-${VERSION}-win64-setup.exe
-	mv build/out/bitcoin-*win32-setup.exe ../bitcoin-${VERSION}-win32-setup.exe
-	popd
+    pushd gitian.sigs
+    git add ${VERSION}-linux/${SIGNER}
+    git add ${VERSION}-win-unsigned/${SIGNER}
+    git add ${VERSION}-osx-unsigned/${SIGNER}
+    git commit -a
+    git push  # Assuming you can push to the gitian.sigs tree
+    popd
 
-Commit your signature for the signed OS X/Windows binaries:
+Wait for Windows/OS X detached signatures:
+
+- Once the Windows/OS X builds each have 3 matching signatures, they will be signed with their respective release keys.
+- Detached signatures will then be committed to the [bitcoin-detached-sigs](https://github.com/bitcoin/bitcoin-detached-sigs) repository, which can be combined with the unsigned apps to create signed binaries.
+
+Create (and optionally verify) the signed OS X binary:
 
-	pushd gitian.sigs
-	git add ${VERSION}-osx-signed/${SIGNER}
-	git add ${VERSION}-win-signed/${SIGNER}
-	git commit -a
-	git push  # Assuming you can push to the gitian.sigs tree
-	popd
+    pushd ./gitian-builder
+    ./bin/gbuild -i --commit signature=v${VERSION} ../bitcoin/contrib/gitian-descriptors/gitian-osx-signer.yml
+    ./bin/gsign --signer $SIGNER --release ${VERSION}-osx-signed --destination ../gitian.sigs/ ../bitcoin/contrib/gitian-descriptors/gitian-osx-signer.yml
+    ./bin/gverify -v -d ../gitian.sigs/ -r ${VERSION}-osx-signed ../bitcoin/contrib/gitian-descriptors/gitian-osx-signer.yml
+    mv build/out/bitcoin-osx-signed.dmg ../bitcoin-${VERSION}-osx.dmg
+    popd
 
--------------------------------------------------------------------------
+Create (and optionally verify) the signed Windows binaries:
+
+    pushd ./gitian-builder
+    ./bin/gbuild -i --commit signature=v${VERSION} ../bitcoin/contrib/gitian-descriptors/gitian-win-signer.yml
+    ./bin/gsign --signer $SIGNER --release ${VERSION}-win-signed --destination ../gitian.sigs/ ../bitcoin/contrib/gitian-descriptors/gitian-win-signer.yml
+    ./bin/gverify -v -d ../gitian.sigs/ -r ${VERSION}-win-signed ../bitcoin/contrib/gitian-descriptors/gitian-win-signer.yml
+    mv build/out/bitcoin-*win64-setup.exe ../bitcoin-${VERSION}-win64-setup.exe
+    mv build/out/bitcoin-*win32-setup.exe ../bitcoin-${VERSION}-win32-setup.exe
+    popd
+
+Commit your signature for the signed OS X/Windows binaries:
+
+    pushd gitian.sigs
+    git add ${VERSION}-osx-signed/${SIGNER}
+    git add ${VERSION}-win-signed/${SIGNER}
+    git commit -a
+    git push  # Assuming you can push to the gitian.sigs tree
+    popd
 
 ### After 3 or more people have gitian-built and their results match:
 
 - Create `SHA256SUMS.asc` for the builds, and GPG-sign it:
+
 ```bash
 sha256sum * > SHA256SUMS
+```
+
+The list of files should be:
+```
+bitcoin-${VERSION}-linux32.tar.gz
+bitcoin-${VERSION}-linux64.tar.gz
+bitcoin-${VERSION}-osx64.tar.gz
+bitcoin-${VERSION}-osx.dmg
+bitcoin-${VERSION}.tar.gz
+bitcoin-${VERSION}-win32-setup.exe
+bitcoin-${VERSION}-win32.zip
+bitcoin-${VERSION}-win64-setup.exe
+bitcoin-${VERSION}-win64.zip
+```
+
+- GPG-sign it, delete the unsigned file:
+```
 gpg --digest-algo sha256 --clearsign SHA256SUMS # outputs SHA256SUMS.asc
 rm SHA256SUMS
 ```
@@ -185,6 +232,15 @@ Note: check that SHA256SUMS itself doesn't end up in SHA256SUMS, which is a spur
 - Upload zips and installers, as well as `SHA256SUMS.asc` from last step, to the bitcoin.org server
   into `/var/www/bin/bitcoin-core-${VERSION}`
 
+- A `.torrent` will appear in the directory after a few minutes. Optionally help seed this torrent. To get the `magnet:` URI use:
+```bash
+transmission-show -m <torrent file>
+```
+Insert the magnet URI into the announcement sent to mailing lists. This permits
+people without access to `bitcoin.org` to download the binary distribution.
+Also put it into the `optional_magnetlink:` slot in the YAML file for
+bitcoin.org (see below for bitcoin.org update instructions). 
+
 - Update bitcoin.org version
 
   - First, check to see if the Bitcoin.org maintainers have prepared a
@@ -202,16 +258,18 @@ Note: check that SHA256SUMS itself doesn't end up in SHA256SUMS, which is a spur
 
 - Announce the release:
 
-  - Release sticky on bitcointalk: https://bitcointalk.org/index.php?board=1.0
+  - bitcoin-dev and bitcoin-core-dev mailing list
+
+  - Bitcoin Core announcements list https://bitcoincore.org/en/list/announcements/join/
 
-  - Bitcoin-development mailing list
+  - bitcoincore.org blog post
 
   - Update title of #bitcoin on Freenode IRC
 
-  - Optionally reddit /r/Bitcoin, ... but this will usually sort out itself
+  - Optionally twitter, reddit /r/Bitcoin, ... but this will usually sort out itself
 
-- Notify BlueMatt so that he can start building [the PPAs](https://launchpad.net/~bitcoin/+archive/ubuntu/bitcoin)
+  - Notify BlueMatt so that he can start building [the PPAs](https://launchpad.net/~bitcoin/+archive/ubuntu/bitcoin)
 
-- Add release notes for the new version to the directory `doc/release-notes` in git master
+  - Add release notes for the new version to the directory `doc/release-notes` in git master
 
-- Celebrate
+  - Celebrate

From 182bec427946d4ce951e8572130c903f0131447e Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Fri, 15 Apr 2016 13:21:51 +0200
Subject: [PATCH 0205/1802] contrib: remove hardcoded version from verify.sh

Closes #7595 as by removing the hardcoded version number from
`verify.sh`.
---
 contrib/verifysfbinaries/verify.sh | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/contrib/verifysfbinaries/verify.sh b/contrib/verifysfbinaries/verify.sh
index 847c507553057..657c3bd33c2e2 100755
--- a/contrib/verifysfbinaries/verify.sh
+++ b/contrib/verifysfbinaries/verify.sh
@@ -23,9 +23,6 @@ BASEDIR="https://bitcoin.org/bin/"
 VERSIONPREFIX="bitcoin-core-"
 RCVERSIONSTRING="rc"
 
-#this URL is used if a version number is not specified as an argument to the script
-SIGNATUREFILE="$BASEDIR""$VERSIONPREFIX""0.10.4/""$RCSUBDIR""$SIGNATUREFILENAME"
-
 if [ ! -d "$WORKINGDIR" ]; then
    mkdir "$WORKINGDIR"
 fi
@@ -53,7 +50,8 @@ if [ -n "$1" ]; then
 
    SIGNATUREFILE="$BASEDIR$SIGNATUREFILENAME"
 else
-   BASEDIR="${SIGNATUREFILE%/*}/"
+   echo "Error: need to specify a version on the command line"
+   exit 2
 fi
 
 #first we fetch the file containing the signature

From f1544700703a442191ac1dfaae7f31b04ba7b12b Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Fri, 15 Apr 2016 12:18:12 +0200
Subject: [PATCH 0206/1802] [contrib] Remove reference to sf and add doc to
 verify.sh

---
 contrib/README.md                                      | 4 ++--
 contrib/{verifysfbinaries => verifybinaries}/README.md | 9 ++++++++-
 contrib/{verifysfbinaries => verifybinaries}/verify.sh | 0
 3 files changed, 10 insertions(+), 3 deletions(-)
 rename contrib/{verifysfbinaries => verifybinaries}/README.md (81%)
 rename contrib/{verifysfbinaries => verifybinaries}/verify.sh (100%)

diff --git a/contrib/README.md b/contrib/README.md
index 32b3a170ac7ec..a23b197cc6122 100644
--- a/contrib/README.md
+++ b/contrib/README.md
@@ -51,5 +51,5 @@ Test and Verify Tools
 ### [TestGen](/contrib/testgen) ###
 Utilities to generate test vectors for the data-driven Bitcoin tests.
 
-### [Verify SF Binaries](/contrib/verifysfbinaries) ###
-This script attempts to download and verify the signature file SHA256SUMS.asc from SourceForge.
+### [Verify Binaries](/contrib/verifybinaries) ###
+This script attempts to download and verify the signature file SHA256SUMS.asc from bitcoin.org.
diff --git a/contrib/verifysfbinaries/README.md b/contrib/verifybinaries/README.md
similarity index 81%
rename from contrib/verifysfbinaries/README.md
rename to contrib/verifybinaries/README.md
index 1db3fe52fc2c3..8970f3daa406a 100644
--- a/contrib/verifysfbinaries/README.md
+++ b/contrib/verifybinaries/README.md
@@ -1,6 +1,13 @@
-### Verify Binaries ###
+### Verify Binaries
 This script attempts to download the signature file `SHA256SUMS.asc` from https://bitcoin.org.
 
 It first checks if the signature passes, and then downloads the files specified in the file, and checks if the hashes of these files match those that are specified in the signature file.
 
 The script returns 0 if everything passes the checks. It returns 1 if either the signature check or the hash check doesn't pass. If an error occurs the return value is 2.
+
+Usage:
+
+```sh
+./verify.sh bitcoin-core-0.11.2
+./verify.sh bitcoin-core-0.12.0
+```
diff --git a/contrib/verifysfbinaries/verify.sh b/contrib/verifybinaries/verify.sh
similarity index 100%
rename from contrib/verifysfbinaries/verify.sh
rename to contrib/verifybinaries/verify.sh

From f8e6fb1800fbac87e76cdddc074d8f4af585f050 Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Mon, 25 Apr 2016 12:31:45 +0200
Subject: [PATCH 0207/1802] Introduce constant for maximum CScript length

---
 src/script/interpreter.cpp | 2 +-
 src/script/script.h        | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/script/interpreter.cpp b/src/script/interpreter.cpp
index 9c47f7c6c9577..fd4a5674cfea1 100644
--- a/src/script/interpreter.cpp
+++ b/src/script/interpreter.cpp
@@ -247,7 +247,7 @@ bool EvalScript(vector<vector<unsigned char> >& stack, const CScript& script, un
     vector<bool> vfExec;
     vector<valtype> altstack;
     set_error(serror, SCRIPT_ERR_UNKNOWN_ERROR);
-    if (script.size() > 10000)
+    if (script.size() > MAX_SCRIPT_SIZE)
         return set_error(serror, SCRIPT_ERR_SCRIPT_SIZE);
     int nOpCount = 0;
     bool fRequireMinimal = (flags & SCRIPT_VERIFY_MINIMALDATA) != 0;
diff --git a/src/script/script.h b/src/script/script.h
index d2a68a07ba149..68cde03e34543 100644
--- a/src/script/script.h
+++ b/src/script/script.h
@@ -27,6 +27,9 @@ static const int MAX_OPS_PER_SCRIPT = 201;
 // Maximum number of public keys per multisig
 static const int MAX_PUBKEYS_PER_MULTISIG = 20;
 
+// Maximum script length in bytes
+static const int MAX_SCRIPT_SIZE = 10000;
+
 // Threshold for nLockTime: below this value it is interpreted as block number,
 // otherwise as UNIX timestamp.
 static const unsigned int LOCKTIME_THRESHOLD = 500000000; // Tue Nov  5 00:53:20 1985 UTC

From 4f87af6fc7580912726f9bf833c21e6e1b478e1d Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Mon, 25 Apr 2016 12:32:01 +0200
Subject: [PATCH 0208/1802] Treat overly long scriptPubKeys as unspendable

---
 src/script/script.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/script/script.h b/src/script/script.h
index 68cde03e34543..2a338d6f5ccbf 100644
--- a/src/script/script.h
+++ b/src/script/script.h
@@ -624,7 +624,7 @@ class CScript : public CScriptBase
      */
     bool IsUnspendable() const
     {
-        return (size() > 0 && *begin() == OP_RETURN);
+        return (size() > 0 && *begin() == OP_RETURN) || (size() > MAX_SCRIPT_SIZE);
     }
 
     void clear()

From 4bf631e5e48cd4c14c825cdaf7a1bee81e15493d Mon Sep 17 00:00:00 2001
From: Patrick Strateman <patrick.strateman@gmail.com>
Date: Sun, 24 Apr 2016 21:59:46 -0700
Subject: [PATCH 0209/1802] CDataStream::ignore Throw exception instead of
 assert on negative nSize.

Previously disk corruption would cause an assert instead of an exception.
---
 src/streams.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/streams.h b/src/streams.h
index 0fc6135a6a793..a50fe4e859d77 100644
--- a/src/streams.h
+++ b/src/streams.h
@@ -240,7 +240,9 @@ class CDataStream
     CDataStream& ignore(int nSize)
     {
         // Ignore from the beginning of the buffer
-        assert(nSize >= 0);
+        if (nSize < 0) {
+            throw std::ios_base::failure("CDataStream::ignore(): nSize negative");
+        }
         unsigned int nReadPosNext = nReadPos + nSize;
         if (nReadPosNext >= vch.size())
         {

From 5d0434d13d0145a110c0c93e59edfd7d062f8531 Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Sun, 24 Apr 2016 16:21:44 +0200
Subject: [PATCH 0210/1802] Fix OOM bug: UTXO entries with invalid script
 length

---
 src/compressor.h | 10 ++++++++--
 src/streams.h    | 14 ++++++++++++++
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/src/compressor.h b/src/compressor.h
index 4a72090830587..fa702f0dfa900 100644
--- a/src/compressor.h
+++ b/src/compressor.h
@@ -86,8 +86,14 @@ class CScriptCompressor
             return;
         }
         nSize -= nSpecialScripts;
-        script.resize(nSize);
-        s >> REF(CFlatData(script));
+        if (nSize > MAX_SCRIPT_SIZE) {
+            // Overly long script, replace with a short invalid one
+            script << OP_RETURN;
+            s.ignore(nSize);
+        } else {
+            script.resize(nSize);
+            s >> REF(CFlatData(script));
+        }
     }
 };
 
diff --git a/src/streams.h b/src/streams.h
index a50fe4e859d77..ed14f3f412172 100644
--- a/src/streams.h
+++ b/src/streams.h
@@ -406,6 +406,20 @@ class CAutoFile
         return (*this);
     }
 
+    CAutoFile& ignore(size_t nSize)
+    {
+        if (!file)
+            throw std::ios_base::failure("CAutoFile::ignore: file handle is NULL");
+        unsigned char data[4096];
+        while (nSize > 0) {
+            size_t nNow = std::min<size_t>(nSize, sizeof(data));
+            if (fread(data, 1, nNow, file) != nNow)
+                throw std::ios_base::failure(feof(file) ? "CAutoFile::ignore: end of file" : "CAutoFile::read: fread failed");
+            nSize -= nNow;
+        }
+        return (*this);
+    }
+
     CAutoFile& write(const char* pch, size_t nSize)
     {
         if (!file)

From 1e44169f0e0c334a86b14a22ebc8fec45cec7354 Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Mon, 25 Apr 2016 14:05:36 +0200
Subject: [PATCH 0211/1802] Add tests for CCoins deserialization

---
 src/test/coins_tests.cpp | 71 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 71 insertions(+)

diff --git a/src/test/coins_tests.cpp b/src/test/coins_tests.cpp
index 48e3c8ed8e07f..129ce04e0bca1 100644
--- a/src/test/coins_tests.cpp
+++ b/src/test/coins_tests.cpp
@@ -4,7 +4,9 @@
 
 #include "coins.h"
 #include "random.h"
+#include "script/standard.h"
 #include "uint256.h"
+#include "utilstrencodings.h"
 #include "test/test_bitcoin.h"
 #include "main.h"
 #include "consensus/validation.h"
@@ -345,4 +347,73 @@ BOOST_AUTO_TEST_CASE(updatecoins_simulation_test)
     BOOST_CHECK(spent_a_duplicate_coinbase);
 }
 
+BOOST_AUTO_TEST_CASE(ccoins_serialization)
+{
+    // Good example
+    CDataStream ss1(ParseHex("0104835800816115944e077fe7c803cfa57f29b36bf87c1d358bb85e"), SER_DISK, CLIENT_VERSION);
+    CCoins cc1;
+    ss1 >> cc1;
+    BOOST_CHECK_EQUAL(cc1.nVersion, 1);
+    BOOST_CHECK_EQUAL(cc1.fCoinBase, false);
+    BOOST_CHECK_EQUAL(cc1.nHeight, 203998);
+    BOOST_CHECK_EQUAL(cc1.vout.size(), 2);
+    BOOST_CHECK_EQUAL(cc1.IsAvailable(0), false);
+    BOOST_CHECK_EQUAL(cc1.IsAvailable(1), true);
+    BOOST_CHECK_EQUAL(cc1.vout[1].nValue, 60000000000ULL);
+    BOOST_CHECK_EQUAL(HexStr(cc1.vout[1].scriptPubKey), HexStr(GetScriptForDestination(CKeyID(uint160(ParseHex("816115944e077fe7c803cfa57f29b36bf87c1d35"))))));
+
+    // Good example
+    CDataStream ss2(ParseHex("0109044086ef97d5790061b01caab50f1b8e9c50a5057eb43c2d9563a4eebbd123008c988f1a4a4de2161e0f50aac7f17e7f9555caa486af3b"), SER_DISK, CLIENT_VERSION);
+    CCoins cc2;
+    ss2 >> cc2;
+    BOOST_CHECK_EQUAL(cc2.nVersion, 1);
+    BOOST_CHECK_EQUAL(cc2.fCoinBase, true);
+    BOOST_CHECK_EQUAL(cc2.nHeight, 120891);
+    BOOST_CHECK_EQUAL(cc2.vout.size(), 17);
+    for (int i = 0; i < 17; i++) {
+        BOOST_CHECK_EQUAL(cc2.IsAvailable(i), i == 4 || i == 16);
+    }
+    BOOST_CHECK_EQUAL(cc2.vout[4].nValue, 234925952);
+    BOOST_CHECK_EQUAL(HexStr(cc2.vout[4].scriptPubKey), HexStr(GetScriptForDestination(CKeyID(uint160(ParseHex("61b01caab50f1b8e9c50a5057eb43c2d9563a4ee"))))));
+    BOOST_CHECK_EQUAL(cc2.vout[16].nValue, 110397);
+    BOOST_CHECK_EQUAL(HexStr(cc2.vout[16].scriptPubKey), HexStr(GetScriptForDestination(CKeyID(uint160(ParseHex("8c988f1a4a4de2161e0f50aac7f17e7f9555caa4"))))));
+
+    // Smallest possible example
+    CDataStream ssx(SER_DISK, CLIENT_VERSION);
+    BOOST_CHECK_EQUAL(HexStr(ssx.begin(), ssx.end()), "");
+
+    CDataStream ss3(ParseHex("0002000600"), SER_DISK, CLIENT_VERSION);
+    CCoins cc3;
+    ss3 >> cc3;
+    BOOST_CHECK_EQUAL(cc3.nVersion, 0);
+    BOOST_CHECK_EQUAL(cc3.fCoinBase, false);
+    BOOST_CHECK_EQUAL(cc3.nHeight, 0);
+    BOOST_CHECK_EQUAL(cc3.vout.size(), 1);
+    BOOST_CHECK_EQUAL(cc3.IsAvailable(0), true);
+    BOOST_CHECK_EQUAL(cc3.vout[0].nValue, 0);
+    BOOST_CHECK_EQUAL(cc3.vout[0].scriptPubKey.size(), 0);
+
+    // scriptPubKey that ends beyond the end of the stream
+    CDataStream ss4(ParseHex("0002000800"), SER_DISK, CLIENT_VERSION);
+    try {
+        CCoins cc4;
+        ss4 >> cc4;
+        BOOST_CHECK_MESSAGE(false, "We should have thrown");
+    } catch (const std::ios_base::failure& e) {
+    }
+
+    // Very large scriptPubKey (3*10^9 bytes) past the end of the stream
+    CDataStream tmp(SER_DISK, CLIENT_VERSION);
+    uint64_t x = 3000000000ULL;
+    tmp << VARINT(x);
+    BOOST_CHECK_EQUAL(HexStr(tmp.begin(), tmp.end()), "8a95c0bb00");
+    CDataStream ss5(ParseHex("0002008a95c0bb0000"), SER_DISK, CLIENT_VERSION);
+    try {
+        CCoins cc5;
+        ss5 >> cc5;
+        BOOST_CHECK_MESSAGE(false, "We should have thrown");
+    } catch (const std::ios_base::failure& e) {
+    }
+}
+
 BOOST_AUTO_TEST_SUITE_END()

From 17a6a217867603f349de676739f072c789c3918f Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Mon, 25 Apr 2016 16:01:28 +0200
Subject: [PATCH 0212/1802] qt: Make it possible to show details for multiple
 transactions

A small GUI annoyance for me has always been that it's impossible to
have multiple transaction detail windows open, for example to compare
transactions.

This patch makes the window non-modal so that it is possible to open
transaction details at will.
---
 src/qt/transactionview.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/qt/transactionview.cpp b/src/qt/transactionview.cpp
index a352228c36fb5..eb6111e682e9f 100644
--- a/src/qt/transactionview.cpp
+++ b/src/qt/transactionview.cpp
@@ -478,8 +478,9 @@ void TransactionView::showDetails()
     QModelIndexList selection = transactionView->selectionModel()->selectedRows();
     if(!selection.isEmpty())
     {
-        TransactionDescDialog dlg(selection.at(0));
-        dlg.exec();
+        TransactionDescDialog *dlg = new TransactionDescDialog(selection.at(0));
+        dlg->setAttribute(Qt::WA_DeleteOnClose);
+        dlg->show();
     }
 }
 

From 62a9abd12b27d94cddae2b38f94bb44fead34235 Mon Sep 17 00:00:00 2001
From: Chris Stewart <stewart.chris1234@gmail.com>
Date: Mon, 25 Apr 2016 11:08:10 -0500
Subject: [PATCH 0213/1802] Fixing comment in script_test.json test case

---
 src/test/data/script_tests.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test/data/script_tests.json b/src/test/data/script_tests.json
index e69cc9e41371e..e75b7825ed545 100644
--- a/src/test/data/script_tests.json
+++ b/src/test/data/script_tests.json
@@ -1098,7 +1098,7 @@
 "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 sig op limit"],
+"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",

From efb54ba065e41e0d36383bcabfcc01bbca7b2340 Mon Sep 17 00:00:00 2001
From: Kaz Wesley <keziahw@gmail.com>
Date: Mon, 25 Apr 2016 13:13:52 -0700
Subject: [PATCH 0214/1802] lock cs_main for State/Misbehaving

ProcessMessage calls State(...) and Misbehaving(...) without holding the
required lock; add LOCK(cs_main) blocks.
---
 src/main.cpp | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/src/main.cpp b/src/main.cpp
index f6a89fa2e675a..a85ee46d5aa7d 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -4514,6 +4514,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
                strCommand == NetMsgType::FILTERCLEAR))
     {
         if (pfrom->nVersion >= NO_BLOOM_VERSION) {
+            LOCK(cs_main);
             Misbehaving(pfrom->GetId(), 100);
             return false;
         } else {
@@ -4529,6 +4530,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
         if (pfrom->nVersion != 0)
         {
             pfrom->PushMessage(NetMsgType::REJECT, strCommand, REJECT_DUPLICATE, string("Duplicate version message"));
+            LOCK(cs_main);
             Misbehaving(pfrom->GetId(), 1);
             return false;
         }
@@ -4584,7 +4586,10 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
         pfrom->fClient = !(pfrom->nServices & NODE_NETWORK);
 
         // Potentially mark this peer as a preferred download peer.
+        {
+        LOCK(cs_main);
         UpdatePreferredDownload(pfrom, State(pfrom->GetId()));
+        }
 
         // Change version
         pfrom->PushMessage(NetMsgType::VERACK);
@@ -4642,6 +4647,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
     else if (pfrom->nVersion == 0)
     {
         // Must have a version message before anything else
+        LOCK(cs_main);
         Misbehaving(pfrom->GetId(), 1);
         return false;
     }
@@ -4677,6 +4683,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
             return true;
         if (vAddr.size() > 1000)
         {
+            LOCK(cs_main);
             Misbehaving(pfrom->GetId(), 20);
             return error("message addr size() = %u", vAddr.size());
         }
@@ -4746,6 +4753,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
         vRecv >> vInv;
         if (vInv.size() > MAX_INV_SZ)
         {
+            LOCK(cs_main);
             Misbehaving(pfrom->GetId(), 20);
             return error("message inv size() = %u", vInv.size());
         }
@@ -4821,6 +4829,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
         vRecv >> vInv;
         if (vInv.size() > MAX_INV_SZ)
         {
+            LOCK(cs_main);
             Misbehaving(pfrom->GetId(), 20);
             return error("message getdata size() = %u", vInv.size());
         }
@@ -5074,6 +5083,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
         // Bypass the normal CBlock deserialization, as we don't want to risk deserializing 2000 full blocks.
         unsigned int nCount = ReadCompactSize(vRecv);
         if (nCount > MAX_HEADERS_RESULTS) {
+            LOCK(cs_main);
             Misbehaving(pfrom->GetId(), 20);
             return error("headers message size = %u", nCount);
         }
@@ -5350,8 +5360,11 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
         vRecv >> filter;
 
         if (!filter.IsWithinSizeConstraints())
+        {
             // There is no excuse for sending a too-large filter
+            LOCK(cs_main);
             Misbehaving(pfrom->GetId(), 100);
+        }
         else
         {
             LOCK(pfrom->cs_filter);
@@ -5372,13 +5385,17 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
         // and thus, the maximum size any matched object can have) in a filteradd message
         if (vData.size() > MAX_SCRIPT_ELEMENT_SIZE)
         {
+            LOCK(cs_main);
             Misbehaving(pfrom->GetId(), 100);
         } else {
             LOCK(pfrom->cs_filter);
             if (pfrom->pfilter)
                 pfrom->pfilter->insert(vData);
             else
+            {
+                LOCK(cs_main);
                 Misbehaving(pfrom->GetId(), 100);
+            }
         }
     }
 

From 719de56ab2c8e5bc6ce9f67c7bf159adc242d49b Mon Sep 17 00:00:00 2001
From: Kaz Wesley <keziahw@gmail.com>
Date: Mon, 25 Apr 2016 12:31:32 -0700
Subject: [PATCH 0215/1802] lock cs_main for chainActive

ActivateBestChain uses chainActive after releasing the lock; reorder operations
to move all access to synchronized object into existing LOCK(cs_main) block.
---
 src/main.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index a85ee46d5aa7d..83fc4d6bd8843 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -2897,14 +2897,15 @@ static bool ActivateBestChainStep(CValidationState& state, const CChainParams& c
  */
 bool ActivateBestChain(CValidationState &state, const CChainParams& chainparams, const CBlock *pblock) {
     CBlockIndex *pindexMostWork = NULL;
+    CBlockIndex *pindexNewTip = NULL;
     do {
         boost::this_thread::interruption_point();
         if (ShutdownRequested())
             break;
 
-        CBlockIndex *pindexNewTip = NULL;
         const CBlockIndex *pindexFork;
         bool fInitialDownload;
+        int nNewHeight;
         {
             LOCK(cs_main);
             CBlockIndex *pindexOldTip = chainActive.Tip();
@@ -2920,6 +2921,7 @@ bool ActivateBestChain(CValidationState &state, const CChainParams& chainparams,
             pindexNewTip = chainActive.Tip();
             pindexFork = chainActive.FindFork(pindexOldTip);
             fInitialDownload = IsInitialBlockDownload();
+            nNewHeight = chainActive.Height();
         }
         // When we reach this point, we switched to a new tip (stored in pindexNewTip).
 
@@ -2948,7 +2950,7 @@ bool ActivateBestChain(CValidationState &state, const CChainParams& chainparams,
                 {
                     LOCK(cs_vNodes);
                     BOOST_FOREACH(CNode* pnode, vNodes) {
-                        if (chainActive.Height() > (pnode->nStartingHeight != -1 ? pnode->nStartingHeight - 2000 : nBlockEstimate)) {
+                        if (nNewHeight > (pnode->nStartingHeight != -1 ? pnode->nStartingHeight - 2000 : nBlockEstimate)) {
                             BOOST_REVERSE_FOREACH(const uint256& hash, vHashes) {
                                 pnode->PushBlockHash(hash);
                             }
@@ -2961,7 +2963,7 @@ bool ActivateBestChain(CValidationState &state, const CChainParams& chainparams,
                 }
             }
         }
-    } while(pindexMostWork != chainActive.Tip());
+    } while (pindexNewTip != pindexMostWork);
     CheckBlockIndex(chainparams.GetConsensus());
 
     // Write changes periodically to disk, after relay.

From 9267a47d86d0673eae9e504ee566aa4e0410d923 Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Mon, 25 Apr 2016 22:27:59 -0400
Subject: [PATCH 0216/1802] depends: enable pre-compiled headers for qt

All trusty compilers work ok with this now, and it shaves a few minutes off of
build time
---
 depends/packages/qt.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/depends/packages/qt.mk b/depends/packages/qt.mk
index 77df77b73f7f0..e5ac0c9651bc7 100644
--- a/depends/packages/qt.mk
+++ b/depends/packages/qt.mk
@@ -31,7 +31,7 @@ $(package)_config_opts += -no-iconv
 $(package)_config_opts += -no-gif
 $(package)_config_opts += -no-freetype
 $(package)_config_opts += -no-nis
-$(package)_config_opts += -no-pch
+$(package)_config_opts += -pch
 $(package)_config_opts += -no-qml-debug
 $(package)_config_opts += -nomake examples
 $(package)_config_opts += -nomake tests

From cf77fcdb1fe525b63b004ef729173f04bdb48882 Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Mon, 25 Apr 2016 22:29:23 -0400
Subject: [PATCH 0217/1802] travis: drop MAKEJOBS=2 for windows compilers

These were only in place because of the old precice mingw toolchain
---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 0c9ac71c00b06..804686a34a5d4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -37,11 +37,11 @@ matrix:
     - compiler: ": ARM"
       env: HOST=arm-linux-gnueabihf PACKAGES="g++-arm-linux-gnueabihf" DEP_OPTS="NO_QT=1" CHECK_DOC=1 GOAL="install" BITCOIN_CONFIG="--enable-glibc-back-compat --enable-reduce-exports"
     - compiler: ": Win32"
-      env: HOST=i686-w64-mingw32 DPKG_ADD_ARCH="i386" PACKAGES="nsis g++-mingw-w64-i686 wine1.6 bc" RUN_TESTS=true GOAL="deploy" BITCOIN_CONFIG="--enable-gui --enable-reduce-exports" MAKEJOBS="-j2"
+      env: HOST=i686-w64-mingw32 DPKG_ADD_ARCH="i386" PACKAGES="nsis g++-mingw-w64-i686 wine1.6 bc" RUN_TESTS=true GOAL="deploy" BITCOIN_CONFIG="--enable-gui --enable-reduce-exports"
     - compiler: ": 32-bit + dash"
       env: HOST=i686-pc-linux-gnu PACKAGES="g++-multilib bc python-zmq" RUN_TESTS=true GOAL="install" BITCOIN_CONFIG="--enable-zmq --enable-glibc-back-compat --enable-reduce-exports LDFLAGS=-static-libstdc++" USE_SHELL="/bin/dash"
     - compiler: ": Win64"
-      env: HOST=x86_64-w64-mingw32 DPKG_ADD_ARCH="i386" PACKAGES="nsis g++-mingw-w64-x86-64 wine1.6 bc" RUN_TESTS=true GOAL="deploy" BITCOIN_CONFIG="--enable-gui --enable-reduce-exports" MAKEJOBS="-j2"
+      env: HOST=x86_64-w64-mingw32 DPKG_ADD_ARCH="i386" PACKAGES="nsis g++-mingw-w64-x86-64 wine1.6 bc" RUN_TESTS=true GOAL="deploy" BITCOIN_CONFIG="--enable-gui --enable-reduce-exports"
     - compiler: ": bitcoind"
       env: HOST=x86_64-unknown-linux-gnu PACKAGES="bc python-zmq" DEP_OPTS="NO_QT=1 NO_UPNP=1 DEBUG=1" RUN_TESTS=true GOAL="install" BITCOIN_CONFIG="--enable-zmq --enable-glibc-back-compat --enable-reduce-exports CPPFLAGS=-DDEBUG_LOCKORDER"
     - compiler: ": No wallet"

From 174023c9b008fc02316bce972b0c1031de3feee3 Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Tue, 26 Apr 2016 01:17:46 -0400
Subject: [PATCH 0218/1802] travis: Don't disable writing ccache for
 pull-requests

This was doing more harm than good. The original intention was to speed up
builds, since a PR's ccache results will be thrown away anyway.

However, each PR maintains its own cache, so disabling writes means that
subsequent pushes don't benefit from the fresh cache. This is significant when
(for example) many headers are touched in a PR, then the PR is updated. With
this change, the updated PR will take advantage of the cache generated during
the PR's previous build.
---
 .travis.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 804686a34a5d4..25e9cc1e05647 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -71,7 +71,6 @@ script:
     - OUTDIR=$BASE_OUTDIR/$TRAVIS_PULL_REQUEST/$TRAVIS_JOB_NUMBER-$HOST
     - BITCOIN_CONFIG_ALL="--disable-dependency-tracking --prefix=$TRAVIS_BUILD_DIR/depends/$HOST --bindir=$OUTDIR/bin --libdir=$OUTDIR/lib"
     - depends/$HOST/native/bin/ccache --max-size=$CCACHE_SIZE
-    - if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then export CCACHE_READONLY=1; fi
     - test -n "$USE_SHELL" && eval '"$USE_SHELL" -c "./autogen.sh"' || ./autogen.sh
     - ./configure --cache-file=config.cache $BITCOIN_CONFIG_ALL $BITCOIN_CONFIG || ( cat config.log && false)
     - make distdir PACKAGE=bitcoin VERSION=$HOST

From a33b7c9cb545985771d074748c0e368ca2d06702 Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Tue, 26 Apr 2016 00:54:57 -0400
Subject: [PATCH 0219/1802] travis: temporarily disable qt to avoid timeouts

These builds take longer than they did on precise. Disable them now to keep
things working, we can re-enable them after experimentation
---
 .travis.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 25e9cc1e05647..2f3ea4e76f859 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -37,11 +37,11 @@ matrix:
     - compiler: ": ARM"
       env: HOST=arm-linux-gnueabihf PACKAGES="g++-arm-linux-gnueabihf" DEP_OPTS="NO_QT=1" CHECK_DOC=1 GOAL="install" BITCOIN_CONFIG="--enable-glibc-back-compat --enable-reduce-exports"
     - compiler: ": Win32"
-      env: HOST=i686-w64-mingw32 DPKG_ADD_ARCH="i386" PACKAGES="nsis g++-mingw-w64-i686 wine1.6 bc" RUN_TESTS=true GOAL="deploy" BITCOIN_CONFIG="--enable-gui --enable-reduce-exports"
+      env: HOST=i686-w64-mingw32 DPKG_ADD_ARCH="i386" DEP_OPTS="NO_QT=1" PACKAGES="nsis g++-mingw-w64-i686 wine1.6 bc" RUN_TESTS=true GOAL="install" BITCOIN_CONFIG="--enable-reduce-exports"
     - compiler: ": 32-bit + dash"
-      env: HOST=i686-pc-linux-gnu PACKAGES="g++-multilib bc python-zmq" RUN_TESTS=true GOAL="install" BITCOIN_CONFIG="--enable-zmq --enable-glibc-back-compat --enable-reduce-exports LDFLAGS=-static-libstdc++" USE_SHELL="/bin/dash"
+      env: HOST=i686-pc-linux-gnu PACKAGES="g++-multilib bc python-zmq" DEP_OPTS="NO_QT=1" RUN_TESTS=true GOAL="install" BITCOIN_CONFIG="--enable-zmq --enable-glibc-back-compat --enable-reduce-exports LDFLAGS=-static-libstdc++" USE_SHELL="/bin/dash"
     - compiler: ": Win64"
-      env: HOST=x86_64-w64-mingw32 DPKG_ADD_ARCH="i386" PACKAGES="nsis g++-mingw-w64-x86-64 wine1.6 bc" RUN_TESTS=true GOAL="deploy" BITCOIN_CONFIG="--enable-gui --enable-reduce-exports"
+      env: HOST=x86_64-w64-mingw32 DPKG_ADD_ARCH="i386" DEP_OPTS="NO_QT=1" PACKAGES="nsis g++-mingw-w64-x86-64 wine1.6 bc" RUN_TESTS=true GOAL="install" BITCOIN_CONFIG="--enable-reduce-exports"
     - compiler: ": bitcoind"
       env: HOST=x86_64-unknown-linux-gnu PACKAGES="bc python-zmq" DEP_OPTS="NO_QT=1 NO_UPNP=1 DEBUG=1" RUN_TESTS=true GOAL="install" BITCOIN_CONFIG="--enable-zmq --enable-glibc-back-compat --enable-reduce-exports CPPFLAGS=-DDEBUG_LOCKORDER"
     - compiler: ": No wallet"

From 89c844df14046a114bebec959bd9e188bf8ba21b Mon Sep 17 00:00:00 2001
From: randy-waterhouse <kiwigb@yahoo.com>
Date: Tue, 26 Apr 2016 19:43:14 +1200
Subject: [PATCH 0220/1802] Re-instate TARGET_OS=linux in configure.ac. Removed
 by 351abf9e035.

---
 configure.ac | 1 +
 1 file changed, 1 insertion(+)

diff --git a/configure.ac b/configure.ac
index 03b90521045ed..100bb79e11fea 100644
--- a/configure.ac
+++ b/configure.ac
@@ -354,6 +354,7 @@ case $host in
      OBJCXXFLAGS="$CXXFLAGS"
      ;;
    *linux*)
+     TARGET_OS=linux
      LEVELDB_TARGET_FLAGS="-DOS_LINUX"
      ;;
    *)

From f135e3c943a19096485b0979918f8878f7fa1c8d Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Tue, 26 Apr 2016 16:01:45 +0200
Subject: [PATCH 0221/1802] qt: Add transaction hash to details window title

---
 src/qt/forms/transactiondescdialog.ui | 2 +-
 src/qt/transactiondescdialog.cpp      | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/qt/forms/transactiondescdialog.ui b/src/qt/forms/transactiondescdialog.ui
index 5ae1e12856631..3a698cfd1d408 100644
--- a/src/qt/forms/transactiondescdialog.ui
+++ b/src/qt/forms/transactiondescdialog.ui
@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Transaction details</string>
+   <string notr="true">Transaction details</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
diff --git a/src/qt/transactiondescdialog.cpp b/src/qt/transactiondescdialog.cpp
index f7b6995b239c3..65adcc4f023e3 100644
--- a/src/qt/transactiondescdialog.cpp
+++ b/src/qt/transactiondescdialog.cpp
@@ -14,6 +14,7 @@ TransactionDescDialog::TransactionDescDialog(const QModelIndex &idx, QWidget *pa
     ui(new Ui::TransactionDescDialog)
 {
     ui->setupUi(this);
+    setWindowTitle(tr("Details for %1").arg(idx.data(TransactionTableModel::TxIDRole).toString()));
     QString desc = idx.data(TransactionTableModel::LongDescriptionRole).toString();
     ui->detailText->setHtml(desc);
 }

From 67969af09f4729d041589da5f31ac40c07d2f4be Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Thu, 3 Dec 2015 14:44:57 +0100
Subject: [PATCH 0222/1802] build: Enable C++11 build, require C++11 compiler

Implements #6211.
---
 build-aux/m4/ax_cxx_compile_stdcxx.m4 | 558 ++++++++++++++++++++++++++
 configure.ac                          |   2 +
 2 files changed, 560 insertions(+)
 create mode 100644 build-aux/m4/ax_cxx_compile_stdcxx.m4

diff --git a/build-aux/m4/ax_cxx_compile_stdcxx.m4 b/build-aux/m4/ax_cxx_compile_stdcxx.m4
new file mode 100644
index 0000000000000..079e17d2a629e
--- /dev/null
+++ b/build-aux/m4/ax_cxx_compile_stdcxx.m4
@@ -0,0 +1,558 @@
+# ===========================================================================
+#   http://www.gnu.org/software/autoconf-archive/ax_cxx_compile_stdcxx.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+#   AX_CXX_COMPILE_STDCXX(VERSION, [ext|noext], [mandatory|optional])
+#
+# DESCRIPTION
+#
+#   Check for baseline language coverage in the compiler for the specified
+#   version of the C++ standard.  If necessary, add switches to CXXFLAGS to
+#   enable support.  VERSION may be '11' (for the C++11 standard) or '14'
+#   (for the C++14 standard).
+#
+#   The second argument, if specified, indicates whether you insist on an
+#   extended mode (e.g. -std=gnu++11) or a strict conformance mode (e.g.
+#   -std=c++11).  If neither is specified, you get whatever works, with
+#   preference for an extended mode.
+#
+#   The third argument, if specified 'mandatory' or if left unspecified,
+#   indicates that baseline support for the specified C++ standard is
+#   required and that the macro should error out if no mode with that
+#   support is found.  If specified 'optional', then configuration proceeds
+#   regardless, after defining HAVE_CXX${VERSION} if and only if a
+#   supporting mode is found.
+#
+# LICENSE
+#
+#   Copyright (c) 2008 Benjamin Kosnik <bkoz@redhat.com>
+#   Copyright (c) 2012 Zack Weinberg <zackw@panix.com>
+#   Copyright (c) 2013 Roy Stogner <roystgnr@ices.utexas.edu>
+#   Copyright (c) 2014, 2015 Google Inc.; contributed by Alexey Sokolov <sokolov@google.com>
+#   Copyright (c) 2015 Paul Norman <penorman@mac.com>
+#   Copyright (c) 2015 Moritz Klammler <moritz@klammler.eu>
+#
+#   Copying and distribution of this file, with or without modification, are
+#   permitted in any medium without royalty provided the copyright notice
+#   and this notice are preserved.  This file is offered as-is, without any
+#   warranty.
+
+#serial 1
+
+dnl  This macro is based on the code from the AX_CXX_COMPILE_STDCXX_11 macro
+dnl  (serial version number 13).
+
+AC_DEFUN([AX_CXX_COMPILE_STDCXX], [dnl
+  m4_if([$1], [11], [],
+        [$1], [14], [],
+        [$1], [17], [m4_fatal([support for C++17 not yet implemented in AX_CXX_COMPILE_STDCXX])],
+        [m4_fatal([invalid first argument `$1' to AX_CXX_COMPILE_STDCXX])])dnl
+  m4_if([$2], [], [],
+        [$2], [ext], [],
+        [$2], [noext], [],
+        [m4_fatal([invalid second argument `$2' to AX_CXX_COMPILE_STDCXX])])dnl
+  m4_if([$3], [], [ax_cxx_compile_cxx$1_required=true],
+        [$3], [mandatory], [ax_cxx_compile_cxx$1_required=true],
+        [$3], [optional], [ax_cxx_compile_cxx$1_required=false],
+        [m4_fatal([invalid third argument `$3' to AX_CXX_COMPILE_STDCXX])])
+  AC_LANG_PUSH([C++])dnl
+  ac_success=no
+  AC_CACHE_CHECK(whether $CXX supports C++$1 features by default,
+  ax_cv_cxx_compile_cxx$1,
+  [AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_testbody_$1])],
+    [ax_cv_cxx_compile_cxx$1=yes],
+    [ax_cv_cxx_compile_cxx$1=no])])
+  if test x$ax_cv_cxx_compile_cxx$1 = xyes; then
+    ac_success=yes
+  fi
+
+  m4_if([$2], [noext], [], [dnl
+  if test x$ac_success = xno; then
+    for switch in -std=gnu++$1 -std=gnu++0x; do
+      cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx$1_$switch])
+      AC_CACHE_CHECK(whether $CXX supports C++$1 features with $switch,
+                     $cachevar,
+        [ac_save_CXXFLAGS="$CXXFLAGS"
+         CXXFLAGS="$CXXFLAGS $switch"
+         AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_testbody_$1])],
+          [eval $cachevar=yes],
+          [eval $cachevar=no])
+         CXXFLAGS="$ac_save_CXXFLAGS"])
+      if eval test x\$$cachevar = xyes; then
+        CXXFLAGS="$CXXFLAGS $switch"
+        ac_success=yes
+        break
+      fi
+    done
+  fi])
+
+  m4_if([$2], [ext], [], [dnl
+  if test x$ac_success = xno; then
+    dnl HP's aCC needs +std=c++11 according to:
+    dnl http://h21007.www2.hp.com/portal/download/files/unprot/aCxx/PDF_Release_Notes/769149-001.pdf
+    dnl Cray's crayCC needs "-h std=c++11"
+    for switch in -std=c++$1 -std=c++0x +std=c++$1 "-h std=c++$1"; do
+      cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx$1_$switch])
+      AC_CACHE_CHECK(whether $CXX supports C++$1 features with $switch,
+                     $cachevar,
+        [ac_save_CXXFLAGS="$CXXFLAGS"
+         CXXFLAGS="$CXXFLAGS $switch"
+         AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_testbody_$1])],
+          [eval $cachevar=yes],
+          [eval $cachevar=no])
+         CXXFLAGS="$ac_save_CXXFLAGS"])
+      if eval test x\$$cachevar = xyes; then
+        CXXFLAGS="$CXXFLAGS $switch"
+        ac_success=yes
+        break
+      fi
+    done
+  fi])
+  AC_LANG_POP([C++])
+  if test x$ax_cxx_compile_cxx$1_required = xtrue; then
+    if test x$ac_success = xno; then
+      AC_MSG_ERROR([*** A compiler with support for C++$1 language features is required.])
+    fi
+  else
+    if test x$ac_success = xno; then
+      HAVE_CXX$1=0
+      AC_MSG_NOTICE([No compiler with C++$1 support was found])
+    else
+      HAVE_CXX$1=1
+      AC_DEFINE(HAVE_CXX$1,1,
+                [define if the compiler supports basic C++$1 syntax])
+    fi
+
+    AC_SUBST(HAVE_CXX$1)
+  fi
+])
+
+
+dnl  Test body for checking C++11 support
+
+m4_define([_AX_CXX_COMPILE_STDCXX_testbody_11],
+  _AX_CXX_COMPILE_STDCXX_testbody_new_in_11
+)
+
+
+dnl  Test body for checking C++14 support
+
+m4_define([_AX_CXX_COMPILE_STDCXX_testbody_14],
+  _AX_CXX_COMPILE_STDCXX_testbody_new_in_11
+  _AX_CXX_COMPILE_STDCXX_testbody_new_in_14
+)
+
+
+dnl  Tests for new features in C++11
+
+m4_define([_AX_CXX_COMPILE_STDCXX_testbody_new_in_11], [[
+
+// If the compiler admits that it is not ready for C++11, why torture it?
+// Hopefully, this will speed up the test.
+
+#ifndef __cplusplus
+
+#error "This is not a C++ compiler"
+
+#elif __cplusplus < 201103L
+
+#error "This is not a C++11 compiler"
+
+#else
+
+namespace cxx11
+{
+
+  namespace test_static_assert
+  {
+
+    template <typename T>
+    struct check
+    {
+      static_assert(sizeof(int) <= sizeof(T), "not big enough");
+    };
+
+  }
+
+  namespace test_final_override
+  {
+
+    struct Base
+    {
+      virtual void f() {}
+    };
+
+    struct Derived : public Base
+    {
+      virtual void f() override {}
+    };
+
+  }
+
+  namespace test_double_right_angle_brackets
+  {
+
+    template < typename T >
+    struct check {};
+
+    typedef check<void> single_type;
+    typedef check<check<void>> double_type;
+    typedef check<check<check<void>>> triple_type;
+    typedef check<check<check<check<void>>>> quadruple_type;
+
+  }
+
+  namespace test_decltype
+  {
+
+    int
+    f()
+    {
+      int a = 1;
+      decltype(a) b = 2;
+      return a + b;
+    }
+
+  }
+
+  namespace test_type_deduction
+  {
+
+    template < typename T1, typename T2 >
+    struct is_same
+    {
+      static const bool value = false;
+    };
+
+    template < typename T >
+    struct is_same<T, T>
+    {
+      static const bool value = true;
+    };
+
+    template < typename T1, typename T2 >
+    auto
+    add(T1 a1, T2 a2) -> decltype(a1 + a2)
+    {
+      return a1 + a2;
+    }
+
+    int
+    test(const int c, volatile int v)
+    {
+      static_assert(is_same<int, decltype(0)>::value == true, "");
+      static_assert(is_same<int, decltype(c)>::value == false, "");
+      static_assert(is_same<int, decltype(v)>::value == false, "");
+      auto ac = c;
+      auto av = v;
+      auto sumi = ac + av + 'x';
+      auto sumf = ac + av + 1.0;
+      static_assert(is_same<int, decltype(ac)>::value == true, "");
+      static_assert(is_same<int, decltype(av)>::value == true, "");
+      static_assert(is_same<int, decltype(sumi)>::value == true, "");
+      static_assert(is_same<int, decltype(sumf)>::value == false, "");
+      static_assert(is_same<int, decltype(add(c, v))>::value == true, "");
+      return (sumf > 0.0) ? sumi : add(c, v);
+    }
+
+  }
+
+  namespace test_noexcept
+  {
+
+    int f() { return 0; }
+    int g() noexcept { return 0; }
+
+    static_assert(noexcept(f()) == false, "");
+    static_assert(noexcept(g()) == true, "");
+
+  }
+
+  namespace test_constexpr
+  {
+
+    template < typename CharT >
+    unsigned long constexpr
+    strlen_c_r(const CharT *const s, const unsigned long acc) noexcept
+    {
+      return *s ? strlen_c_r(s + 1, acc + 1) : acc;
+    }
+
+    template < typename CharT >
+    unsigned long constexpr
+    strlen_c(const CharT *const s) noexcept
+    {
+      return strlen_c_r(s, 0UL);
+    }
+
+    static_assert(strlen_c("") == 0UL, "");
+    static_assert(strlen_c("1") == 1UL, "");
+    static_assert(strlen_c("example") == 7UL, "");
+    static_assert(strlen_c("another\0example") == 7UL, "");
+
+  }
+
+  namespace test_rvalue_references
+  {
+
+    template < int N >
+    struct answer
+    {
+      static constexpr int value = N;
+    };
+
+    answer<1> f(int&)       { return answer<1>(); }
+    answer<2> f(const int&) { return answer<2>(); }
+    answer<3> f(int&&)      { return answer<3>(); }
+
+    void
+    test()
+    {
+      int i = 0;
+      const int c = 0;
+      static_assert(decltype(f(i))::value == 1, "");
+      static_assert(decltype(f(c))::value == 2, "");
+      static_assert(decltype(f(0))::value == 3, "");
+    }
+
+  }
+
+  namespace test_uniform_initialization
+  {
+
+    struct test
+    {
+      static const int zero {};
+      static const int one {1};
+    };
+
+    static_assert(test::zero == 0, "");
+    static_assert(test::one == 1, "");
+
+  }
+
+  namespace test_lambdas
+  {
+
+    void
+    test1()
+    {
+      auto lambda1 = [](){};
+      auto lambda2 = lambda1;
+      lambda1();
+      lambda2();
+    }
+
+    int
+    test2()
+    {
+      auto a = [](int i, int j){ return i + j; }(1, 2);
+      auto b = []() -> int { return '0'; }();
+      auto c = [=](){ return a + b; }();
+      auto d = [&](){ return c; }();
+      auto e = [a, &b](int x) mutable {
+        const auto identity = [](int y){ return y; };
+        for (auto i = 0; i < a; ++i)
+          a += b--;
+        return x + identity(a + b);
+      }(0);
+      return a + b + c + d + e;
+    }
+
+    int
+    test3()
+    {
+      const auto nullary = [](){ return 0; };
+      const auto unary = [](int x){ return x; };
+      using nullary_t = decltype(nullary);
+      using unary_t = decltype(unary);
+      const auto higher1st = [](nullary_t f){ return f(); };
+      const auto higher2nd = [unary](nullary_t f1){
+        return [unary, f1](unary_t f2){ return f2(unary(f1())); };
+      };
+      return higher1st(nullary) + higher2nd(nullary)(unary);
+    }
+
+  }
+
+  namespace test_variadic_templates
+  {
+
+    template <int...>
+    struct sum;
+
+    template <int N0, int... N1toN>
+    struct sum<N0, N1toN...>
+    {
+      static constexpr auto value = N0 + sum<N1toN...>::value;
+    };
+
+    template <>
+    struct sum<>
+    {
+      static constexpr auto value = 0;
+    };
+
+    static_assert(sum<>::value == 0, "");
+    static_assert(sum<1>::value == 1, "");
+    static_assert(sum<23>::value == 23, "");
+    static_assert(sum<1, 2>::value == 3, "");
+    static_assert(sum<5, 5, 11>::value == 21, "");
+    static_assert(sum<2, 3, 5, 7, 11, 13>::value == 41, "");
+
+  }
+
+  // http://stackoverflow.com/questions/13728184/template-aliases-and-sfinae
+  // Clang 3.1 fails with headers of libstd++ 4.8.3 when using std::function
+  // because of this.
+  namespace test_template_alias_sfinae
+  {
+
+    struct foo {};
+
+    template<typename T>
+    using member = typename T::member_type;
+
+    template<typename T>
+    void func(...) {}
+
+    template<typename T>
+    void func(member<T>*) {}
+
+    void test();
+
+    void test() { func<foo>(0); }
+
+  }
+
+}  // namespace cxx11
+
+#endif  // __cplusplus >= 201103L
+
+]])
+
+
+dnl  Tests for new features in C++14
+
+m4_define([_AX_CXX_COMPILE_STDCXX_testbody_new_in_14], [[
+
+// If the compiler admits that it is not ready for C++14, why torture it?
+// Hopefully, this will speed up the test.
+
+#ifndef __cplusplus
+
+#error "This is not a C++ compiler"
+
+#elif __cplusplus < 201402L
+
+#error "This is not a C++14 compiler"
+
+#else
+
+namespace cxx14
+{
+
+  namespace test_polymorphic_lambdas
+  {
+
+    int
+    test()
+    {
+      const auto lambda = [](auto&&... args){
+        const auto istiny = [](auto x){
+          return (sizeof(x) == 1UL) ? 1 : 0;
+        };
+        const int aretiny[] = { istiny(args)... };
+        return aretiny[0];
+      };
+      return lambda(1, 1L, 1.0f, '1');
+    }
+
+  }
+
+  namespace test_binary_literals
+  {
+
+    constexpr auto ivii = 0b0000000000101010;
+    static_assert(ivii == 42, "wrong value");
+
+  }
+
+  namespace test_generalized_constexpr
+  {
+
+    template < typename CharT >
+    constexpr unsigned long
+    strlen_c(const CharT *const s) noexcept
+    {
+      auto length = 0UL;
+      for (auto p = s; *p; ++p)
+        ++length;
+      return length;
+    }
+
+    static_assert(strlen_c("") == 0UL, "");
+    static_assert(strlen_c("x") == 1UL, "");
+    static_assert(strlen_c("test") == 4UL, "");
+    static_assert(strlen_c("another\0test") == 7UL, "");
+
+  }
+
+  namespace test_lambda_init_capture
+  {
+
+    int
+    test()
+    {
+      auto x = 0;
+      const auto lambda1 = [a = x](int b){ return a + b; };
+      const auto lambda2 = [a = lambda1(x)](){ return a; };
+      return lambda2();
+    }
+
+  }
+
+  namespace test_digit_seperators
+  {
+
+    constexpr auto ten_million = 100'000'000;
+    static_assert(ten_million == 100000000, "");
+
+  }
+
+  namespace test_return_type_deduction
+  {
+
+    auto f(int& x) { return x; }
+    decltype(auto) g(int& x) { return x; }
+
+    template < typename T1, typename T2 >
+    struct is_same
+    {
+      static constexpr auto value = false;
+    };
+
+    template < typename T >
+    struct is_same<T, T>
+    {
+      static constexpr auto value = true;
+    };
+
+    int
+    test()
+    {
+      auto x = 0;
+      static_assert(is_same<int, decltype(f(x))>::value, "");
+      static_assert(is_same<int&, decltype(g(x))>::value, "");
+      return x;
+    }
+
+  }
+
+}  // namespace cxx14
+
+#endif  // __cplusplus >= 201402L
+
+]])
diff --git a/configure.ac b/configure.ac
index 100bb79e11fea..713ea59edacf9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -55,6 +55,8 @@ case $host in
      lt_cv_deplibs_check_method="pass_all"
   ;;
 esac
+dnl Require C++11 compiler (no GNU extensions)
+AX_CXX_COMPILE_STDCXX([11], [noext], [mandatory])
 dnl Libtool init checks.
 LT_INIT([pic-only])
 

From fada064f67302502f6b51d9d22927381c2707cbb Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Tue, 26 Apr 2016 18:11:42 +0200
Subject: [PATCH 0223/1802] [qa] test_framework: Properly print exceptions and
 assert empty dict

---
 qa/rpc-tests/test_framework/test_framework.py | 2 +-
 qa/rpc-tests/test_framework/util.py           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/qa/rpc-tests/test_framework/test_framework.py b/qa/rpc-tests/test_framework/test_framework.py
index 3b08cd1384d4e..18ecf64b06e59 100755
--- a/qa/rpc-tests/test_framework/test_framework.py
+++ b/qa/rpc-tests/test_framework/test_framework.py
@@ -146,7 +146,7 @@ def main(self):
             print("key not found: "+ str(e))
             traceback.print_tb(sys.exc_info()[2])
         except Exception as e:
-            print("Unexpected exception caught during testing: "+str(e))
+            print("Unexpected exception caught during testing: " + repr(e))
             traceback.print_tb(sys.exc_info()[2])
 
         if not self.options.noshutdown:
diff --git a/qa/rpc-tests/test_framework/util.py b/qa/rpc-tests/test_framework/util.py
index 27891f7f4c383..baa1ed6790724 100644
--- a/qa/rpc-tests/test_framework/util.py
+++ b/qa/rpc-tests/test_framework/util.py
@@ -487,7 +487,7 @@ def assert_array_result(object_array, to_match, expected, should_not_find = Fals
         in object_array
         """
     if should_not_find == True:
-        expected = { }
+        assert_equal(expected, { })
     num_matched = 0
     for item in object_array:
         all_match = True

From 61c01706cd1d38023facea7f25bc1d84980f8c43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pavel=20Jan=C3=ADk?= <Pavel@Janik.cz>
Date: Tue, 26 Apr 2016 22:22:59 +0200
Subject: [PATCH 0224/1802] Log invalid block hash to make debugging easier.

---
 src/main.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main.cpp b/src/main.cpp
index f6a89fa2e675a..a8f8e6fa5b104 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -3371,7 +3371,7 @@ static bool AcceptBlockHeader(const CBlockHeader& block, CValidationState& state
             if (ppindex)
                 *ppindex = pindex;
             if (pindex->nStatus & BLOCK_FAILED_MASK)
-                return state.Invalid(error("%s: block is marked invalid", __func__), 0, "duplicate");
+                return state.Invalid(error("%s: block %s is marked invalid", __func__, hash.ToString()), 0, "duplicate");
             return true;
         }
 

From 63b3111f84daa421abc2889a550e86c17bf9609d Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Wed, 9 Mar 2016 16:45:58 -0500
Subject: [PATCH 0225/1802] build: quiet annoying warnings without adding new
 ones

Disabling warnings can be tricky, because doing so can cause a different
compiler to create new warnings about unsupported disable flags. Also, some
warnings don't surface until they're paired with another warning (gcc). For
example, adding "-Wno-foo" won't cause any trouble, but if there's a legitimate
warning emitted, the "unknown option -Wno-foo" will show up as well.

Work around this in 2 ways:

1. When checking to see if -Wno-foo is supported, check for "-Wfoo" instead.
2. Enable -Werror while checking 1.

If "-Werror -Wfoo" compiles, "-Wno-foo" is almost guaranteed to be supported.

-Werror itself is also checked. If that fails to compile by itself, it likely
means that the user added a flag that adds a warning. In that case, -Werror
won't be used while checking, and the build may be extra noisy. The user would
need to fix the bad input flag.

Also, silence 2 more additional warnings that can show up post-c++11.
---
 configure.ac | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/configure.ac b/configure.ac
index 100bb79e11fea..e73f7e0868e65 100644
--- a/configure.ac
+++ b/configure.ac
@@ -185,6 +185,9 @@ AC_ARG_ENABLE([debug],
     [enable_debug=$enableval],
     [enable_debug=no])
 
+AC_LANG_PUSH([C++])
+AX_CHECK_COMPILE_FLAG([-Werror],[CXXFLAG_WERROR="-Werror"],[CXXFLAG_WERROR=""])
+
 if test "x$enable_debug" = xyes; then
     CPPFLAGS="$CPPFLAGS -DDEBUG -DDEBUG_LOCKORDER"
     if test "x$GCC" = xyes; then
@@ -196,11 +199,19 @@ if test "x$enable_debug" = xyes; then
     fi
 fi
 
-## TODO: Remove these hard-coded paths and flags. They are here for the sake of
-##       compatibility with the legacy buildsystem.
-##
 if test "x$CXXFLAGS_overridden" = "xno"; then
-  CXXFLAGS="$CXXFLAGS -Wall -Wextra -Wformat -Wformat-security -Wno-unused-parameter -Wno-self-assign"
+  AX_CHECK_COMPILE_FLAG([-Wall],[CXXFLAGS="$CXXFLAGS -Wall"],,[[$CXXFLAG_WERROR]])
+  AX_CHECK_COMPILE_FLAG([-Wextra],[CXXFLAGS="$CXXFLAGS -Wextra"],,[[$CXXFLAG_WERROR]])
+  AX_CHECK_COMPILE_FLAG([-Wformat],[CXXFLAGS="$CXXFLAGS -Wformat"],,[[$CXXFLAG_WERROR]])
+  AX_CHECK_COMPILE_FLAG([-Wformat-security],[CXXFLAGS="$CXXFLAGS -Wformat-security"],,[[$CXXFLAG_WERROR]])
+
+  ## Some compilers (gcc) ignore unknown -Wno-* options, but warn about all
+  ## unknown options if any other warning is produced. Test the -Wfoo case, and
+  ## set the -Wno-foo case if it works.
+  AX_CHECK_COMPILE_FLAG([-Wunused-parameter],[CXXFLAGS="$CXXFLAGS -Wno-unused-parameter"],,[[$CXXFLAG_WERROR]])
+  AX_CHECK_COMPILE_FLAG([-Wself-assign],[CXXFLAGS="$CXXFLAGS -Wno-self-assign"],,[[$CXXFLAG_WERROR]])
+  AX_CHECK_COMPILE_FLAG([-Wunused-local-typedef],[CXXFLAGS="$CXXFLAGS -Wno-unused-local-typedef"],,[[$CXXFLAG_WERROR]])
+  AX_CHECK_COMPILE_FLAG([-Wdeprecated-register],[CXXFLAGS="$CXXFLAGS -Wno-deprecated-register"],,[[$CXXFLAG_WERROR]])
 fi
 CPPFLAGS="$CPPFLAGS -DHAVE_BUILD_INFO -D__STDC_FORMAT_MACROS"
 
@@ -222,8 +233,6 @@ AC_ARG_WITH([daemon],
   [build_bitcoind=$withval],
   [build_bitcoind=yes])
 
-AC_LANG_PUSH([C++])
-
 use_pkgconfig=yes
 case $host in
   *mingw*)

From 84c13e759dbb0de282e2c8ce43d77f4d52fda6d9 Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Tue, 26 Apr 2016 14:34:40 +0200
Subject: [PATCH 0226/1802] chain: Add assertion in case of missing records in
 index db

---
 src/chain.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/chain.cpp b/src/chain.cpp
index 32f6480f849da..77e924e703043 100644
--- a/src/chain.cpp
+++ b/src/chain.cpp
@@ -93,6 +93,7 @@ CBlockIndex* CBlockIndex::GetAncestor(int height)
             pindexWalk = pindexWalk->pskip;
             heightWalk = heightSkip;
         } else {
+            assert(pindexWalk->pprev);
             pindexWalk = pindexWalk->pprev;
             heightWalk--;
         }

From 6030625631c62b0ffab2ac545c8351fa59dca483 Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Wed, 27 Apr 2016 11:07:43 +0200
Subject: [PATCH 0227/1802] test: Add more thorough test for dbwrapper
 iterators

I made a silly mistake in a database wrapper where keys
were sorted by char instead of uint8_t. As x86 char is signed
the sorting for the block index database was messed up, resulting
in a segfault due to missing records.

Add a test to catch:
- Wrong sorting
- Seeking errors
- Iteration result not complete
---
 src/test/dbwrapper_tests.cpp | 36 +++++++++++++++++++++++++++++++++++-
 1 file changed, 35 insertions(+), 1 deletion(-)

diff --git a/src/test/dbwrapper_tests.cpp b/src/test/dbwrapper_tests.cpp
index 081d57831d0dd..8745d1439ca33 100644
--- a/src/test/dbwrapper_tests.cpp
+++ b/src/test/dbwrapper_tests.cpp
@@ -203,5 +203,39 @@ BOOST_AUTO_TEST_CASE(existing_data_reindex)
     BOOST_CHECK(odbw.Read(key, res3));
     BOOST_CHECK_EQUAL(res3.ToString(), in2.ToString());
 }
- 
+
+BOOST_AUTO_TEST_CASE(iterator_ordering)
+{
+    path ph = temp_directory_path() / unique_path();
+    CDBWrapper dbw(ph, (1 << 20), true, false, false);
+    for (int x=0x00; x<256; ++x) {
+        uint8_t key = x;
+        uint32_t value = x*x;
+        BOOST_CHECK(dbw.Write(key, value));
+    }
+
+    boost::scoped_ptr<CDBIterator> it(const_cast<CDBWrapper*>(&dbw)->NewIterator());
+    for (int c=0; c<2; ++c) {
+        int seek_start;
+        if (c == 0)
+            seek_start = 0x00;
+        else
+            seek_start = 0x80;
+        it->Seek((uint8_t)seek_start);
+        for (int x=seek_start; x<256; ++x) {
+            uint8_t key;
+            uint32_t value;
+            BOOST_CHECK(it->Valid());
+            if (!it->Valid()) // Avoid spurious errors about invalid iterator's key and value in case of failure
+                break;
+            BOOST_CHECK(it->GetKey(key));
+            BOOST_CHECK(it->GetValue(value));
+            BOOST_CHECK_EQUAL(key, x);
+            BOOST_CHECK_EQUAL(value, x*x);
+            it->Next();
+        }
+        BOOST_CHECK(!it->Valid());
+    }
+}
+
 BOOST_AUTO_TEST_SUITE_END()

From f90efbfeef9cd733aa7590fdf581ff82b999c4b5 Mon Sep 17 00:00:00 2001
From: Andrew <achow101@gmail.com>
Date: Tue, 26 Apr 2016 13:17:00 -0400
Subject: [PATCH 0228/1802] Create signmessagewithprivkey rpc

New rpc 'signmessagewithprivkey' which takes a private key to sign a message without using the wallet.
---
 src/rpc/misc.cpp | 43 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)

diff --git a/src/rpc/misc.cpp b/src/rpc/misc.cpp
index e8a099b4452c4..09f51857815e2 100644
--- a/src/rpc/misc.cpp
+++ b/src/rpc/misc.cpp
@@ -366,6 +366,48 @@ UniValue verifymessage(const UniValue& params, bool fHelp)
     return (pubkey.GetID() == keyID);
 }
 
+UniValue signmessagewithprivkey(const UniValue& params, bool fHelp)
+{
+    if (fHelp || params.size() != 2)
+        throw runtime_error(
+            "signmessagewithprivkey \"privkey\" \"message\"\n"
+            "\nSign a message with the private key of an address\n"
+            "\nArguments:\n"
+            "1. \"privkey\"         (string, required) The private key to sign the message with.\n"
+            "2. \"message\"         (string, required) The message to create a signature of.\n"
+            "\nResult:\n"
+            "\"signature\"          (string) The signature of the message encoded in base 64\n"
+            "\nExamples:\n"
+            "\nCreate the signature\n"
+            + HelpExampleCli("signmessagewithprivkey", "\"privkey\" \"my message\"") +
+            "\nVerify the signature\n"
+            + HelpExampleCli("verifymessage", "\"1D1ZrZNe3JUo7ZycKEYQQiQAWd9y54F4XZ\" \"signature\" \"my message\"") +
+            "\nAs json rpc\n"
+            + HelpExampleRpc("signmessagewithprivkey", "\"privkey\", \"my message\"")
+        );
+
+    string strPrivkey = params[0].get_str();
+    string strMessage = params[1].get_str();
+
+    CBitcoinSecret vchSecret;
+    bool fGood = vchSecret.SetString(strPrivkey);
+    if (!fGood)
+        throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid private key");
+    CKey key = vchSecret.GetKey();
+    if (!key.IsValid())
+        throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Private key outside allowed range");
+
+    CHashWriter ss(SER_GETHASH, 0);
+    ss << strMessageMagic;
+    ss << strMessage;
+
+    vector<unsigned char> vchSig;
+    if (!key.SignCompact(ss.GetHash(), vchSig))
+        throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Sign failed");
+
+    return EncodeBase64(&vchSig[0], vchSig.size());
+}
+
 UniValue setmocktime(const UniValue& params, bool fHelp)
 {
     if (fHelp || params.size() != 1)
@@ -404,6 +446,7 @@ static const CRPCCommand commands[] =
     { "util",               "validateaddress",        &validateaddress,        true  }, /* uses wallet if enabled */
     { "util",               "createmultisig",         &createmultisig,         true  },
     { "util",               "verifymessage",          &verifymessage,          true  },
+    { "util",               "signmessagewithprivkey", &signmessagewithprivkey, true  },
 
     /* Not shown in help */
     { "hidden",             "setmocktime",            &setmocktime,            true  },

From a398549b3bfc976f1b6408f41af7dac3514e2553 Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Thu, 21 Apr 2016 16:23:40 -0400
Subject: [PATCH 0229/1802] depends: use c++11

---
 depends/hosts/darwin.mk      | 2 +-
 depends/packages/bdb.mk      | 1 +
 depends/packages/boost.mk    | 2 +-
 depends/packages/protobuf.mk | 1 +
 depends/packages/qt.mk       | 2 +-
 depends/packages/zeromq.mk   | 1 +
 6 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/depends/hosts/darwin.mk b/depends/hosts/darwin.mk
index 2958dc50cc8dc..dbe6d00795e00 100644
--- a/depends/hosts/darwin.mk
+++ b/depends/hosts/darwin.mk
@@ -3,7 +3,7 @@ OSX_SDK_VERSION=10.9
 OSX_SDK=$(SDK_PATH)/MacOSX$(OSX_SDK_VERSION).sdk
 LD64_VERSION=241.9
 darwin_CC=clang -target $(host) -mmacosx-version-min=$(OSX_MIN_VERSION) --sysroot $(OSX_SDK) -mlinker-version=$(LD64_VERSION)
-darwin_CXX=clang++ -target $(host) -mmacosx-version-min=$(OSX_MIN_VERSION) --sysroot $(OSX_SDK) -mlinker-version=$(LD64_VERSION)
+darwin_CXX=clang++ -target $(host) -mmacosx-version-min=$(OSX_MIN_VERSION) --sysroot $(OSX_SDK) -mlinker-version=$(LD64_VERSION) -stdlib=libc++
 
 darwin_CFLAGS=-pipe
 darwin_CXXFLAGS=$(darwin_CFLAGS)
diff --git a/depends/packages/bdb.mk b/depends/packages/bdb.mk
index e2f85ad4fcad8..200d57314ea0d 100644
--- a/depends/packages/bdb.mk
+++ b/depends/packages/bdb.mk
@@ -9,6 +9,7 @@ define $(package)_set_vars
 $(package)_config_opts=--disable-shared --enable-cxx --disable-replication
 $(package)_config_opts_mingw32=--enable-mingw
 $(package)_config_opts_linux=--with-pic
+$(package)_cxxflags=-std=c++11
 endef
 
 define $(package)_preprocess_cmds
diff --git a/depends/packages/boost.mk b/depends/packages/boost.mk
index 215c694b6b82b..ef1307c241b66 100644
--- a/depends/packages/boost.mk
+++ b/depends/packages/boost.mk
@@ -20,7 +20,7 @@ $(package)_archiver_$(host_os)=$($(package)_ar)
 $(package)_toolset_darwin=darwin
 $(package)_archiver_darwin=$($(package)_libtool)
 $(package)_config_libraries=chrono,filesystem,program_options,system,thread,test
-$(package)_cxxflags=-fvisibility=hidden
+$(package)_cxxflags=-std=c++11 -fvisibility=hidden
 $(package)_cxxflags_linux=-fPIC
 endef
 
diff --git a/depends/packages/protobuf.mk b/depends/packages/protobuf.mk
index 5affad28375a9..54d3fd924519b 100644
--- a/depends/packages/protobuf.mk
+++ b/depends/packages/protobuf.mk
@@ -4,6 +4,7 @@ $(package)_download_path=$(native_$(package)_download_path)
 $(package)_file_name=$(native_$(package)_file_name)
 $(package)_sha256_hash=$(native_$(package)_sha256_hash)
 $(package)_dependencies=native_$(package)
+$(package)_cxxflags=-std=c++11
 
 define $(package)_set_vars
   $(package)_config_opts=--disable-shared --with-protoc=$(build_prefix)/bin/protoc
diff --git a/depends/packages/qt.mk b/depends/packages/qt.mk
index e5ac0c9651bc7..c1fc8e3058e9e 100644
--- a/depends/packages/qt.mk
+++ b/depends/packages/qt.mk
@@ -49,7 +49,7 @@ $(package)_config_opts += -no-sql-sqlite2
 $(package)_config_opts += -prefix $(host_prefix)
 $(package)_config_opts += -hostprefix $(build_prefix)
 $(package)_config_opts += -bindir $(build_prefix)/bin
-$(package)_config_opts += -no-c++11
+$(package)_config_opts += -c++11
 $(package)_config_opts += -openssl-linked
 $(package)_config_opts += -v
 $(package)_config_opts += -static
diff --git a/depends/packages/zeromq.mk b/depends/packages/zeromq.mk
index 7b866e9c0f662..b3f18db056968 100644
--- a/depends/packages/zeromq.mk
+++ b/depends/packages/zeromq.mk
@@ -7,6 +7,7 @@ $(package)_sha256_hash=e00b2967e074990d0538361cc79084a0a92892df2c6e7585da34e4c61
 define $(package)_set_vars
   $(package)_config_opts=--without-documentation --disable-shared
   $(package)_config_opts_linux=--with-pic
+  $(package)_cxxflags=-std=c++11
 endef
 
 define $(package)_config_cmds

From a946bb6b182ee169934ffb97940434f38d1ae9e8 Mon Sep 17 00:00:00 2001
From: Jonas Schnelli <dev@jonasschnelli.ch>
Date: Tue, 22 Dec 2015 13:52:57 +0100
Subject: [PATCH 0230/1802] [RPC] createrawtransaction: add option to set the
 sequence number per input

---
 qa/rpc-tests/rawtransactions.py | 6 ++++++
 src/rpc/rawtransaction.cpp      | 7 +++++++
 2 files changed, 13 insertions(+)

diff --git a/qa/rpc-tests/rawtransactions.py b/qa/rpc-tests/rawtransactions.py
index e38ef6c8b1071..ef545273c5b33 100755
--- a/qa/rpc-tests/rawtransactions.py
+++ b/qa/rpc-tests/rawtransactions.py
@@ -137,5 +137,11 @@ def run_test(self):
         self.sync_all()
         assert_equal(self.nodes[0].getbalance(), bal+Decimal('50.00000000')+Decimal('2.19000000')) #block reward + tx
 
+        inputs  = [ {'txid' : "1d1d4e24ed99057e84c3f80fd8fbec79ed9e1acee37da269356ecea000000000", 'vout' : 1, 'sequence' : 1000}]
+        outputs = { self.nodes[0].getnewaddress() : 1 }
+        rawtx   = self.nodes[0].createrawtransaction(inputs, outputs)
+        decrawtx= self.nodes[0].decoderawtransaction(rawtx)
+        assert_equal(decrawtx['vin'][0]['sequence'], 1000)
+
 if __name__ == '__main__':
     RawTransactionsTest().main()
diff --git a/src/rpc/rawtransaction.cpp b/src/rpc/rawtransaction.cpp
index de8cd68f66267..b475f9a223007 100644
--- a/src/rpc/rawtransaction.cpp
+++ b/src/rpc/rawtransaction.cpp
@@ -334,6 +334,7 @@ UniValue createrawtransaction(const UniValue& params, bool fHelp)
             "       {\n"
             "         \"txid\":\"id\",    (string, required) The transaction id\n"
             "         \"vout\":n        (numeric, required) The output number\n"
+            "         \"sequence\":n    (numeric, optional) The sequence number\n"
             "       }\n"
             "       ,...\n"
             "     ]\n"
@@ -384,6 +385,12 @@ UniValue createrawtransaction(const UniValue& params, bool fHelp)
             throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid parameter, vout must be positive");
 
         uint32_t nSequence = (rawTx.nLockTime ? std::numeric_limits<uint32_t>::max() - 1 : std::numeric_limits<uint32_t>::max());
+
+        // set the sequence number if passed in the parameters object
+        const UniValue& sequenceObj = find_value(o, "sequence");
+        if (sequenceObj.isNum())
+            nSequence = sequenceObj.get_int();
+
         CTxIn in(COutPoint(txid, nOutput), CScript(), nSequence);
 
         rawTx.vin.push_back(in);

From e59336fbf9b906bf05d50a732036613216898bd1 Mon Sep 17 00:00:00 2001
From: Jonas Schnelli <dev@jonasschnelli.ch>
Date: Thu, 3 Dec 2015 16:29:45 +0100
Subject: [PATCH 0231/1802] [bitcoin-tx] allow to set nSequence number over the
 in= command

---
 src/bitcoin-tx.cpp | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/bitcoin-tx.cpp b/src/bitcoin-tx.cpp
index 95d7a085a0a3d..d5e2fc279bc25 100644
--- a/src/bitcoin-tx.cpp
+++ b/src/bitcoin-tx.cpp
@@ -71,7 +71,7 @@ static bool AppInitRawTx(int argc, char* argv[])
         strUsage = HelpMessageGroup(_("Commands:"));
         strUsage += HelpMessageOpt("delin=N", _("Delete input N from TX"));
         strUsage += HelpMessageOpt("delout=N", _("Delete output N from TX"));
-        strUsage += HelpMessageOpt("in=TXID:VOUT", _("Add input to TX"));
+        strUsage += HelpMessageOpt("in=TXID:VOUT(:SEQUENCE_NUMBER)", _("Add input to TX"));
         strUsage += HelpMessageOpt("locktime=N", _("Set TX lock time to N"));
         strUsage += HelpMessageOpt("nversion=N", _("Set TX version to N"));
         strUsage += HelpMessageOpt("outaddr=VALUE:ADDRESS", _("Add address-based output to TX"));
@@ -181,15 +181,15 @@ static void MutateTxLocktime(CMutableTransaction& tx, const string& cmdVal)
 
 static void MutateTxAddInput(CMutableTransaction& tx, const string& strInput)
 {
+    std::vector<std::string> vStrInputParts;
+    boost::split(vStrInputParts, strInput, boost::is_any_of(":"));
+
     // separate TXID:VOUT in string
-    size_t pos = strInput.find(':');
-    if ((pos == string::npos) ||
-        (pos == 0) ||
-        (pos == (strInput.size() - 1)))
+    if (vStrInputParts.size()<2)
         throw runtime_error("TX input missing separator");
 
     // extract and validate TXID
-    string strTxid = strInput.substr(0, pos);
+    string strTxid = vStrInputParts[0];
     if ((strTxid.size() != 64) || !IsHex(strTxid))
         throw runtime_error("invalid TX input txid");
     uint256 txid(uint256S(strTxid));
@@ -198,13 +198,18 @@ static void MutateTxAddInput(CMutableTransaction& tx, const string& strInput)
     static const unsigned int maxVout = MAX_BLOCK_SIZE / minTxOutSz;
 
     // extract and validate vout
-    string strVout = strInput.substr(pos + 1, string::npos);
+    string strVout = vStrInputParts[1];
     int vout = atoi(strVout);
     if ((vout < 0) || (vout > (int)maxVout))
         throw runtime_error("invalid TX input vout");
 
+    // extract the optional sequence number
+    uint32_t nSequenceIn=std::numeric_limits<unsigned int>::max();
+    if (vStrInputParts.size() > 2)
+        nSequenceIn = atoi(vStrInputParts[2]);
+
     // append to transaction input list
-    CTxIn txin(txid, vout);
+    CTxIn txin(txid, vout, CScript(), nSequenceIn);
     tx.vin.push_back(txin);
 }
 

From 383fc10ebb8e9ffe88c1b9e2ea706c76e5a6343e Mon Sep 17 00:00:00 2001
From: Suhas Daftuar <sdaftuar@chaincode.com>
Date: Wed, 27 Apr 2016 09:57:02 -0400
Subject: [PATCH 0232/1802] Only use AddInventoryKnown for transactions

filterInventoryKnown is only used when relaying transactions,
so stop adding block hashes to the filter.
---
 src/main.cpp | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index f6a89fa2e675a..90db9de14eed7 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -4765,7 +4765,6 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
             const CInv &inv = vInv[nInv];
 
             boost::this_thread::interruption_point();
-            pfrom->AddInventoryKnown(inv);
 
             bool fAlreadyHave = AlreadyHave(inv);
             LogPrint("net", "got inv: %s  %s peer=%d\n", inv.ToString(), fAlreadyHave ? "have" : "new", pfrom->id);
@@ -4795,6 +4794,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
             }
             else
             {
+                pfrom->AddInventoryKnown(inv);
                 if (fBlocksOnly)
                     LogPrint("net", "transaction (%s) inv sent in violation of protocol peer=%d\n", inv.hash.ToString(), pfrom->id);
                 else if (!fAlreadyHave && !fImporting && !fReindex && !IsInitialBlockDownload())
@@ -5173,10 +5173,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
         CBlock block;
         vRecv >> block;
 
-        CInv inv(MSG_BLOCK, block.GetHash());
-        LogPrint("net", "received block %s peer=%d\n", inv.hash.ToString(), pfrom->id);
-
-        pfrom->AddInventoryKnown(inv);
+        LogPrint("net", "received block %s peer=%d\n", block.GetHash().ToString(), pfrom->id);
 
         CValidationState state;
         // Process all blocks from whitelisted peers, even if not requested,
@@ -5189,7 +5186,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
         if (state.IsInvalid(nDoS)) {
             assert (state.GetRejectCode() < REJECT_INTERNAL); // Blocks are never rejected with internal reject codes
             pfrom->PushMessage(NetMsgType::REJECT, strCommand, (unsigned char)state.GetRejectCode(),
-                               state.GetRejectReason().substr(0, MAX_REJECT_MESSAGE_LENGTH), inv.hash);
+                               state.GetRejectReason().substr(0, MAX_REJECT_MESSAGE_LENGTH), block.GetHash());
             if (nDoS > 0) {
                 LOCK(cs_main);
                 Misbehaving(pfrom->GetId(), nDoS);
@@ -5769,9 +5766,7 @@ bool SendMessages(CNode* pto)
                             hashToAnnounce.ToString(), chainActive.Tip()->GetBlockHash().ToString());
                     }
 
-                    // If the peer announced this block to us, don't inv it back.
-                    // (Since block announcements may not be via inv's, we can't solely rely on
-                    // setInventoryKnown to track this.)
+                    // If the peer's chain has this block, don't inv it back.
                     if (!PeerHasHeader(&state, pindex)) {
                         pto->PushInventory(CInv(MSG_BLOCK, hashToAnnounce));
                         LogPrint("net", "%s: sending inv peer=%d hash=%s\n", __func__,

From b02119e4634f2453260bb1b195e39bdc0a3b5691 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pavel=20Jan=C3=ADk?= <Pavel@Janik.cz>
Date: Wed, 27 Apr 2016 18:04:02 +0200
Subject: [PATCH 0233/1802] Remove useless argument to AlertNotify.

It is always 'true', so useless.
---
 src/main.cpp | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index f6a89fa2e675a..418ef704b5167 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1593,7 +1593,7 @@ bool fLargeWorkForkFound = false;
 bool fLargeWorkInvalidChainFound = false;
 CBlockIndex *pindexBestForkTip = NULL, *pindexBestForkBase = NULL;
 
-static void AlertNotify(const std::string& strMessage, bool fThread)
+static void AlertNotify(const std::string& strMessage)
 {
     uiInterface.NotifyAlertChanged();
     std::string strCmd = GetArg("-alertnotify", "");
@@ -1607,10 +1607,7 @@ static void AlertNotify(const std::string& strMessage, bool fThread)
     safeStatus = singleQuote+safeStatus+singleQuote;
     boost::replace_all(strCmd, "%s", safeStatus);
 
-    if (fThread)
-        boost::thread t(runCommand, strCmd); // thread runs free
-    else
-        runCommand(strCmd);
+    boost::thread t(runCommand, strCmd); // thread runs free
 }
 
 void CheckForkWarningConditions()
@@ -1632,7 +1629,7 @@ void CheckForkWarningConditions()
         {
             std::string warning = std::string("'Warning: Large-work fork detected, forking after block ") +
                 pindexBestForkBase->phashBlock->ToString() + std::string("'");
-            AlertNotify(warning, true);
+            AlertNotify(warning);
         }
         if (pindexBestForkTip && pindexBestForkBase)
         {
@@ -2163,7 +2160,7 @@ void PartitionCheck(bool (*initialDownloadCheck)(), CCriticalSection& cs, const
     if (!strWarning.empty())
     {
         strMiscWarning = strWarning;
-        AlertNotify(strWarning, true);
+        AlertNotify(strWarning);
         lastAlertTime = now;
     }
 }
@@ -2598,7 +2595,7 @@ void static UpdateTip(CBlockIndex *pindexNew, const CChainParams& chainParams) {
                 if (state == THRESHOLD_ACTIVE) {
                     strMiscWarning = strprintf(_("Warning: unknown new rules activated (versionbit %i)"), bit);
                     if (!fWarned) {
-                        AlertNotify(strMiscWarning, true);
+                        AlertNotify(strMiscWarning);
                         fWarned = true;
                     }
                 } else {
@@ -2620,7 +2617,7 @@ void static UpdateTip(CBlockIndex *pindexNew, const CChainParams& chainParams) {
             // strMiscWarning is read by GetWarnings(), called by Qt and the JSON-RPC code to warn the user:
             strMiscWarning = _("Warning: Unknown block versions being mined! It's possible unknown rules are in effect");
             if (!fWarned) {
-                AlertNotify(strMiscWarning, true);
+                AlertNotify(strMiscWarning);
                 fWarned = true;
             }
         }

From f4ac02ee7c6530c273503d8575a492e9b2ac1f13 Mon Sep 17 00:00:00 2001
From: Kaz Wesley <keziahw@gmail.com>
Date: Wed, 27 Apr 2016 09:26:33 -0700
Subject: [PATCH 0234/1802] fix race that could fail to persist a ban

DumpBanList currently does this:
  - with lock: take a copy of the banmap
  - perform I/O (write out the banmap)
  - with lock: mark the banmap non-dirty
If a new ban is added during the I/O operation, it may never be persisted to
disk.

Reorder operations so that the data to be persisted cannot be older than the
time at which the banmap was marked non-dirty.
---
 src/net.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/net.cpp b/src/net.cpp
index 7dec8fc1cf599..f566af24c425a 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -2634,9 +2634,10 @@ void DumpBanlist()
 
     CBanDB bandb;
     banmap_t banmap;
+    CNode::SetBannedSetDirty(false);
     CNode::GetBanned(banmap);
-    if (bandb.Write(banmap))
-        CNode::SetBannedSetDirty(false);
+    if (!bandb.Write(banmap))
+        CNode::SetBannedSetDirty(true);
 
     LogPrint("net", "Flushed %d banned node ips/subnets to banlist.dat  %dms\n",
         banmap.size(), GetTimeMillis() - nStart);

From c7aac2d557fe3d3aa5bcdd3301a9b87eb110d8ed Mon Sep 17 00:00:00 2001
From: 21E14 <21xe14@gmail.com>
Date: Wed, 27 Apr 2016 22:36:45 -0400
Subject: [PATCH 0235/1802] Deprecating the remaining LogPrintf dependencies
 that were made obsolete in PR #7459.

---
 src/pow.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/pow.cpp b/src/pow.cpp
index 058404f357b0b..1db3b692932fe 100644
--- a/src/pow.cpp
+++ b/src/pow.cpp
@@ -64,9 +64,7 @@ unsigned int CalculateNextWorkRequired(const CBlockIndex* pindexLast, int64_t nF
     // Retarget
     const arith_uint256 bnPowLimit = UintToArith256(params.powLimit);
     arith_uint256 bnNew;
-    arith_uint256 bnOld;
     bnNew.SetCompact(pindexLast->nBits);
-    bnOld = bnNew;
     bnNew *= nActualTimespan;
     bnNew /= params.nPowTargetTimespan;
 

From 2aacc72727b891aa6f42e97d16e8954fba014703 Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Thu, 28 Apr 2016 10:18:06 +0200
Subject: [PATCH 0236/1802] build: update ax_cxx_compile_stdcxx to serial 4

---
 build-aux/m4/ax_cxx_compile_stdcxx.m4 | 48 +++++++++++++++------------
 1 file changed, 26 insertions(+), 22 deletions(-)

diff --git a/build-aux/m4/ax_cxx_compile_stdcxx.m4 b/build-aux/m4/ax_cxx_compile_stdcxx.m4
index 079e17d2a629e..2c18e49c56c0b 100644
--- a/build-aux/m4/ax_cxx_compile_stdcxx.m4
+++ b/build-aux/m4/ax_cxx_compile_stdcxx.m4
@@ -9,9 +9,9 @@
 # DESCRIPTION
 #
 #   Check for baseline language coverage in the compiler for the specified
-#   version of the C++ standard.  If necessary, add switches to CXXFLAGS to
-#   enable support.  VERSION may be '11' (for the C++11 standard) or '14'
-#   (for the C++14 standard).
+#   version of the C++ standard.  If necessary, add switches to CXX and
+#   CXXCPP to enable support.  VERSION may be '11' (for the C++11 standard)
+#   or '14' (for the C++14 standard).
 #
 #   The second argument, if specified, indicates whether you insist on an
 #   extended mode (e.g. -std=gnu++11) or a strict conformance mode (e.g.
@@ -39,7 +39,7 @@
 #   and this notice are preserved.  This file is offered as-is, without any
 #   warranty.
 
-#serial 1
+#serial 4
 
 dnl  This macro is based on the code from the AX_CXX_COMPILE_STDCXX_11 macro
 dnl  (serial version number 13).
@@ -74,14 +74,17 @@ AC_DEFUN([AX_CXX_COMPILE_STDCXX], [dnl
       cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx$1_$switch])
       AC_CACHE_CHECK(whether $CXX supports C++$1 features with $switch,
                      $cachevar,
-        [ac_save_CXXFLAGS="$CXXFLAGS"
-         CXXFLAGS="$CXXFLAGS $switch"
+        [ac_save_CXX="$CXX"
+         CXX="$CXX $switch"
          AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_testbody_$1])],
           [eval $cachevar=yes],
           [eval $cachevar=no])
-         CXXFLAGS="$ac_save_CXXFLAGS"])
+         CXX="$ac_save_CXX"])
       if eval test x\$$cachevar = xyes; then
-        CXXFLAGS="$CXXFLAGS $switch"
+        CXX="$CXX $switch"
+        if test -n "$CXXCPP" ; then
+          CXXCPP="$CXXCPP $switch"
+        fi
         ac_success=yes
         break
       fi
@@ -97,14 +100,17 @@ AC_DEFUN([AX_CXX_COMPILE_STDCXX], [dnl
       cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx$1_$switch])
       AC_CACHE_CHECK(whether $CXX supports C++$1 features with $switch,
                      $cachevar,
-        [ac_save_CXXFLAGS="$CXXFLAGS"
-         CXXFLAGS="$CXXFLAGS $switch"
+        [ac_save_CXX="$CXX"
+         CXX="$CXX $switch"
          AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_testbody_$1])],
           [eval $cachevar=yes],
           [eval $cachevar=no])
-         CXXFLAGS="$ac_save_CXXFLAGS"])
+         CXX="$ac_save_CXX"])
       if eval test x\$$cachevar = xyes; then
-        CXXFLAGS="$CXXFLAGS $switch"
+        CXX="$CXX $switch"
+        if test -n "$CXXCPP" ; then
+          CXXCPP="$CXXCPP $switch"
+        fi
         ac_success=yes
         break
       fi
@@ -115,18 +121,16 @@ AC_DEFUN([AX_CXX_COMPILE_STDCXX], [dnl
     if test x$ac_success = xno; then
       AC_MSG_ERROR([*** A compiler with support for C++$1 language features is required.])
     fi
+  fi
+  if test x$ac_success = xno; then
+    HAVE_CXX$1=0
+    AC_MSG_NOTICE([No compiler with C++$1 support was found])
   else
-    if test x$ac_success = xno; then
-      HAVE_CXX$1=0
-      AC_MSG_NOTICE([No compiler with C++$1 support was found])
-    else
-      HAVE_CXX$1=1
-      AC_DEFINE(HAVE_CXX$1,1,
-                [define if the compiler supports basic C++$1 syntax])
-    fi
-
-    AC_SUBST(HAVE_CXX$1)
+    HAVE_CXX$1=1
+    AC_DEFINE(HAVE_CXX$1,1,
+              [define if the compiler supports basic C++$1 syntax])
   fi
+  AC_SUBST(HAVE_CXX$1)
 ])
 
 

From 7df92242a99db68962048aad34532e6c0e7a42fa Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Thu, 28 Apr 2016 10:43:39 +0200
Subject: [PATCH 0237/1802] doc: Add note about new build/test requirements to
 release notes

[skip ci]
---
 doc/release-notes.md | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/doc/release-notes.md b/doc/release-notes.md
index 7a673cc350670..7d44b8cda934c 100644
--- a/doc/release-notes.md
+++ b/doc/release-notes.md
@@ -43,6 +43,19 @@ RPC low-level changes
   32-bit and 64-bit platforms, and the txids were missing in the hashed data. This has been
   fixed, but this means that the output will be different than from previous versions.
 
+C++11 and Python 3
+-------------------
+
+Various code modernizations have been done. The Bitcoin Core code base has
+started using C++11. This means that a C++11-capable compiler is now needed for
+building. Effectively this means GCC 4.7 or higher, or Clang 3.3 or higher.
+
+When cross-compiling for a target that doesn't have C++11 libraries, configure with
+`./configure --enable-glibc-back-compat ... LDFLAGS=-static-libstdc++`.
+
+For running the functional tests in `qa/rpc-tests`, Python3.4 or higher is now
+required.
+
 0.13.0 Change log
 =================
 

From 073225cb01d9c2629c7a423dbe6afcd07601ffb7 Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Thu, 28 Apr 2016 13:35:16 +0200
Subject: [PATCH 0238/1802] chain: define enum used as bit field as uint32_t

Bitwise logic combined with `<` with undefined signedness will
potentially results in undefined behavior. Fix this by defining the type
as a c++11 typed enum.

Fixes #6017.
---
 src/chain.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/chain.h b/src/chain.h
index 5b9605a80bdb3..017d4fe45789a 100644
--- a/src/chain.h
+++ b/src/chain.h
@@ -54,7 +54,7 @@ struct CDiskBlockPos
 
 };
 
-enum BlockStatus {
+enum BlockStatus: uint32_t {
     //! Unused.
     BLOCK_VALID_UNKNOWN      =    0,
 

From 07e4edb056249e017b0e5a4783e4452ce892b52d Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Thu, 28 Apr 2016 13:40:20 +0200
Subject: [PATCH 0239/1802] =?UTF-8?q?auto=5Fptr=20=E2=86=92=20unique=5Fptr?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change the few occurrences of the deprecated `auto_ptr` to c++11 `unique_ptr`.
Silences the deprecation warnings.

Also add a missing `std::` for consistency.
---
 src/httpserver.cpp | 4 ++--
 src/miner.cpp      | 2 +-
 src/rpc/mining.cpp | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/httpserver.cpp b/src/httpserver.cpp
index ce1accb0464e1..a98eff7c167d7 100644
--- a/src/httpserver.cpp
+++ b/src/httpserver.cpp
@@ -252,7 +252,7 @@ static std::string RequestMethodString(HTTPRequest::RequestMethod m)
 /** HTTP request callback */
 static void http_request_cb(struct evhttp_request* req, void* arg)
 {
-    std::auto_ptr<HTTPRequest> hreq(new HTTPRequest(req));
+    std::unique_ptr<HTTPRequest> hreq(new HTTPRequest(req));
 
     LogPrint("http", "Received a %s request for %s from %s\n",
              RequestMethodString(hreq->GetRequestMethod()), hreq->GetURI(), hreq->GetPeer().ToString());
@@ -288,7 +288,7 @@ static void http_request_cb(struct evhttp_request* req, void* arg)
 
     // Dispatch to worker thread
     if (i != iend) {
-        std::auto_ptr<HTTPWorkItem> item(new HTTPWorkItem(hreq.release(), path, i->handler));
+        std::unique_ptr<HTTPWorkItem> item(new HTTPWorkItem(hreq.release(), path, i->handler));
         assert(workQueue);
         if (workQueue->Enqueue(item.get()))
             item.release(); /* if true, queue took ownership */
diff --git a/src/miner.cpp b/src/miner.cpp
index ef8fd4db43d0e..eaf29a767b594 100644
--- a/src/miner.cpp
+++ b/src/miner.cpp
@@ -74,7 +74,7 @@ int64_t UpdateTime(CBlockHeader* pblock, const Consensus::Params& consensusParam
 CBlockTemplate* CreateNewBlock(const CChainParams& chainparams, const CScript& scriptPubKeyIn)
 {
     // Create new block
-    auto_ptr<CBlockTemplate> pblocktemplate(new CBlockTemplate());
+    std::unique_ptr<CBlockTemplate> pblocktemplate(new CBlockTemplate());
     if(!pblocktemplate.get())
         return NULL;
     CBlock *pblock = &pblocktemplate->block; // pointer for convenience
diff --git a/src/rpc/mining.cpp b/src/rpc/mining.cpp
index b63ee2288918b..9a7d9d53a07fc 100644
--- a/src/rpc/mining.cpp
+++ b/src/rpc/mining.cpp
@@ -111,7 +111,7 @@ UniValue generateBlocks(boost::shared_ptr<CReserveScript> coinbaseScript, int nG
     UniValue blockHashes(UniValue::VARR);
     while (nHeight < nHeightEnd)
     {
-        auto_ptr<CBlockTemplate> pblocktemplate(CreateNewBlock(Params(), coinbaseScript->reserveScript));
+        std::unique_ptr<CBlockTemplate> pblocktemplate(CreateNewBlock(Params(), coinbaseScript->reserveScript));
         if (!pblocktemplate.get())
             throw JSONRPCError(RPC_INTERNAL_ERROR, "Couldn't create new block");
         CBlock *pblock = &pblocktemplate->block;

From aa62b68745ef43ca135fdffbd886818221e85731 Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Sun, 24 Apr 2016 17:12:34 +0200
Subject: [PATCH 0240/1802] Benchmark rolling bloom filter

---
 src/Makefile.bench.include |  3 ++-
 src/bench/rollingbloom.cpp | 43 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 45 insertions(+), 1 deletion(-)
 create mode 100644 src/bench/rollingbloom.cpp

diff --git a/src/Makefile.bench.include b/src/Makefile.bench.include
index 8e7b59b46177d..24e2b3e0c85e1 100644
--- a/src/Makefile.bench.include
+++ b/src/Makefile.bench.include
@@ -7,7 +7,8 @@ bench_bench_bitcoin_SOURCES = \
   bench/bench_bitcoin.cpp \
   bench/bench.cpp \
   bench/bench.h \
-  bench/Examples.cpp
+  bench/Examples.cpp \
+  bench/rollingbloom.cpp
 
 bench_bench_bitcoin_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(EVENT_CLFAGS) $(EVENT_PTHREADS_CFLAGS) -I$(builddir)/bench/
 bench_bench_bitcoin_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
diff --git a/src/bench/rollingbloom.cpp b/src/bench/rollingbloom.cpp
new file mode 100644
index 0000000000000..73c02cf7189eb
--- /dev/null
+++ b/src/bench/rollingbloom.cpp
@@ -0,0 +1,43 @@
+// Copyright (c) 2016 The Bitcoin Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#include <iostream>
+
+#include "bench.h"
+#include "bloom.h"
+#include "utiltime.h"
+
+static void RollingBloom(benchmark::State& state)
+{
+    CRollingBloomFilter filter(120000, 0.000001);
+    std::vector<unsigned char> data(32);
+    uint32_t count = 0;
+    uint32_t nEntriesPerGeneration = (120000 + 1) / 2;
+    uint32_t countnow = 0;
+    uint64_t match = 0;
+    while (state.KeepRunning()) {
+        count++;
+        data[0] = count;
+        data[1] = count >> 8;
+        data[2] = count >> 16;
+        data[3] = count >> 24;
+        if (countnow == nEntriesPerGeneration) {
+            int64_t b = GetTimeMicros();
+            filter.insert(data);
+            int64_t e = GetTimeMicros();
+            std::cout << "RollingBloom-refresh,1," << (e-b)*0.000001 << "," << (e-b)*0.000001 << "," << (e-b)*0.000001 << "\n";
+            countnow = 0;
+        } else {
+            filter.insert(data);
+        }
+        countnow++;
+        data[0] = count >> 24;
+        data[1] = count >> 16;
+        data[2] = count >> 8;
+        data[3] = count;
+        match += filter.contains(data);
+    }
+}
+
+BENCHMARK(RollingBloom);

From 1953c40aa9589a03035fd294f3ba3549374a4826 Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Sun, 24 Apr 2016 18:37:29 +0200
Subject: [PATCH 0241/1802] More efficient bitsliced rolling Bloom filter

This patch changes the implementation from one that stores 16 2-bit integers
in one uint32_t's, to one that stores the first bit of 64 2-bit integers in
one uint64_t and the second bit in another. This allows for 450x faster
refreshing and 2.2x faster average speed.
---
 src/bloom.cpp            | 40 +++++++++++++++++++++++++++-------------
 src/bloom.h              | 13 +------------
 src/test/bloom_tests.cpp |  5 ++++-
 3 files changed, 32 insertions(+), 26 deletions(-)

diff --git a/src/bloom.cpp b/src/bloom.cpp
index 4e6f0e5d2ddaa..fd328e8e96e53 100644
--- a/src/bloom.cpp
+++ b/src/bloom.cpp
@@ -234,14 +234,18 @@ CRollingBloomFilter::CRollingBloomFilter(unsigned int nElements, double fpRate)
      */
     uint32_t nFilterBits = (uint32_t)ceil(-1.0 * nHashFuncs * nMaxElements / log(1.0 - exp(logFpRate / nHashFuncs)));
     data.clear();
-    /* We store up to 16 'bits' per data element. */
-    data.resize((nFilterBits + 15) / 16);
+    /* For each data element we need to store 2 bits. If both bits are 0, the
+     * bit is treated as unset. If the bits are (01), (10), or (11), the bit is
+     * treated as set in generation 1, 2, or 3 respectively.
+     * These bits are stored in separate integers: position P corresponds to bit
+     * (P & 63) of the integers data[(P >> 6) * 2] and data[(P >> 6) * 2 + 1]. */
+    data.resize(((nFilterBits + 63) / 64) << 1);
     reset();
 }
 
 /* Similar to CBloomFilter::Hash */
-inline unsigned int CRollingBloomFilter::Hash(unsigned int nHashNum, const std::vector<unsigned char>& vDataToHash) const {
-    return MurmurHash3(nHashNum * 0xFBA4C795 + nTweak, vDataToHash) % (data.size() * 16);
+static inline uint32_t RollingBloomHash(unsigned int nHashNum, uint32_t nTweak, const std::vector<unsigned char>& vDataToHash) {
+    return MurmurHash3(nHashNum * 0xFBA4C795 + nTweak, vDataToHash);
 }
 
 void CRollingBloomFilter::insert(const std::vector<unsigned char>& vKey)
@@ -252,18 +256,25 @@ void CRollingBloomFilter::insert(const std::vector<unsigned char>& vKey)
         if (nGeneration == 4) {
             nGeneration = 1;
         }
+        uint64_t nGenerationMask1 = -(uint64_t)(nGeneration & 1);
+        uint64_t nGenerationMask2 = -(uint64_t)(nGeneration >> 1);
         /* Wipe old entries that used this generation number. */
-        for (uint32_t p = 0; p < data.size() * 16; p++) {
-            if (get(p) == nGeneration) {
-                put(p, 0);
-            }
+        for (uint32_t p = 0; p < data.size(); p += 2) {
+            uint64_t p1 = data[p], p2 = data[p + 1];
+            uint64_t mask = (p1 ^ nGenerationMask1) | (p2 ^ nGenerationMask2);
+            data[p] = p1 & mask;
+            data[p + 1] = p2 & mask;
         }
     }
     nEntriesThisGeneration++;
 
     for (int n = 0; n < nHashFuncs; n++) {
-        uint32_t h = Hash(n, vKey);
-        put(h, nGeneration);
+        uint32_t h = RollingBloomHash(n, nTweak, vKey);
+        int bit = h & 0x3F;
+        uint32_t pos = (h >> 6) % data.size();
+        /* The lowest bit of pos is ignored, and set to zero for the first bit, and to one for the second. */
+        data[pos & ~1] = (data[pos & ~1] & ~(((uint64_t)1) << bit)) | ((uint64_t)(nGeneration & 1)) << bit;
+        data[pos | 1] = (data[pos | 1] & ~(((uint64_t)1) << bit)) | ((uint64_t)(nGeneration >> 1)) << bit;
     }
 }
 
@@ -276,8 +287,11 @@ void CRollingBloomFilter::insert(const uint256& hash)
 bool CRollingBloomFilter::contains(const std::vector<unsigned char>& vKey) const
 {
     for (int n = 0; n < nHashFuncs; n++) {
-        uint32_t h = Hash(n, vKey);
-        if (get(h) == 0) {
+        uint32_t h = RollingBloomHash(n, nTweak, vKey);
+        int bit = h & 0x3F;
+        uint32_t pos = (h >> 6) % data.size();
+        /* If the relevant bit is not set in either data[pos & ~1] or data[pos | 1], the filter does not contain vKey */
+        if (!(((data[pos & ~1] | data[pos | 1]) >> bit) & 1)) {
             return false;
         }
     }
@@ -295,7 +309,7 @@ void CRollingBloomFilter::reset()
     nTweak = GetRand(std::numeric_limits<unsigned int>::max());
     nEntriesThisGeneration = 0;
     nGeneration = 1;
-    for (std::vector<uint32_t>::iterator it = data.begin(); it != data.end(); it++) {
+    for (std::vector<uint64_t>::iterator it = data.begin(); it != data.end(); it++) {
         *it = 0;
     }
 }
diff --git a/src/bloom.h b/src/bloom.h
index b0ad8b875d04b..ad6de625d8f8a 100644
--- a/src/bloom.h
+++ b/src/bloom.h
@@ -135,20 +135,9 @@ class CRollingBloomFilter
     int nEntriesPerGeneration;
     int nEntriesThisGeneration;
     int nGeneration;
-    std::vector<uint32_t> data;
+    std::vector<uint64_t> data;
     unsigned int nTweak;
     int nHashFuncs;
-
-    unsigned int Hash(unsigned int nHashNum, const std::vector<unsigned char>& vDataToHash) const;
-
-    inline int get(uint32_t position) const {
-        return (data[(position >> 4) % data.size()] >> (2 * (position & 0xF))) & 0x3;
-    }
-
-    inline void put(uint32_t position, uint32_t val) {
-        uint32_t& cell = data[(position >> 4) % data.size()];
-        cell = (cell & ~(((uint32_t)3) << (2 * (position & 0xF)))) | (val << (2 * (position & 0xF)));
-    }
 };
 
 #endif // BITCOIN_BLOOM_H
diff --git a/src/test/bloom_tests.cpp b/src/test/bloom_tests.cpp
index 9557000ddcc11..042fad42dae89 100644
--- a/src/test/bloom_tests.cpp
+++ b/src/test/bloom_tests.cpp
@@ -514,11 +514,14 @@ BOOST_AUTO_TEST_CASE(rolling_bloom)
         if (i >= 100)
             BOOST_CHECK(rb1.contains(data[i-100]));
         rb1.insert(data[i]);
+        BOOST_CHECK(rb1.contains(data[i]));
     }
 
     // Insert 999 more random entries:
     for (int i = 0; i < 999; i++) {
-        rb1.insert(RandomData());
+        std::vector<unsigned char> d = RandomData();
+        rb1.insert(d);
+        BOOST_CHECK(rb1.contains(d));
     }
     // Sanity check to make sure the filter isn't just filling up:
     nHits = 0;

From 7db0ecb90c80bd4995bedf8c2982e9a22345ca65 Mon Sep 17 00:00:00 2001
From: Andrew Chow <achow101@gmail.com>
Date: Wed, 27 Apr 2016 12:18:20 -0700
Subject: [PATCH 0242/1802] Test for signing messages

New rpc test for signing and verifying messages.
---
 qa/pull-tester/rpc-tests.py  |  1 +
 qa/rpc-tests/signmessages.py | 40 ++++++++++++++++++++++++++++++++++++
 2 files changed, 41 insertions(+)
 create mode 100755 qa/rpc-tests/signmessages.py

diff --git a/qa/pull-tester/rpc-tests.py b/qa/pull-tester/rpc-tests.py
index c0637209e3c1d..26142c35e9992 100755
--- a/qa/pull-tester/rpc-tests.py
+++ b/qa/pull-tester/rpc-tests.py
@@ -123,6 +123,7 @@
     'abandonconflict.py',
     'p2p-versionbits-warning.py',
     'importprunedfunds.py',
+    'signmessages.py'
 ]
 if ENABLE_ZMQ:
     testScripts.append('zmq_test.py')
diff --git a/qa/rpc-tests/signmessages.py b/qa/rpc-tests/signmessages.py
new file mode 100755
index 0000000000000..ff22f35300a4b
--- /dev/null
+++ b/qa/rpc-tests/signmessages.py
@@ -0,0 +1,40 @@
+#!/usr/bin/env python2
+# Copyright (c) 2016 The Bitcoin Core developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+from test_framework.test_framework import BitcoinTestFramework
+from test_framework.util import *
+
+
+class SignMessagesTest(BitcoinTestFramework):
+    """Tests RPC commands for signing and verifying messages."""
+
+    def setup_chain(self):
+        print('Initializing test directory ' + self.options.tmpdir)
+        initialize_chain_clean(self.options.tmpdir, 1)
+
+    def setup_network(self, split=False):
+        self.nodes = start_nodes(1, self.options.tmpdir)
+        self.is_network_split = False
+
+    def run_test(self):
+        message = 'This is just a test message'
+
+        # Test the signing with a privkey
+        privKey = 'cUeKHd5orzT3mz8P9pxyREHfsWtVfgsfDjiZZBcjUBAaGk1BTj7N'
+        address = 'mpLQjfK79b7CCV4VMJWEWAj5Mpx8Up5zxB'
+        signature = self.nodes[0].signmessagewithprivkey(privKey, message)
+
+        # Verify the message
+        assert(self.nodes[0].verifymessage(address, signature, message))
+
+        # Test the signing with an address with wallet
+        address = self.nodes[0].getnewaddress()
+        signature = self.nodes[0].signmessage(address, message)
+
+        # Verify the message
+        assert(self.nodes[0].verifymessage(address, signature, message))
+
+if __name__ == '__main__':
+    SignMessagesTest().main()

From 3b35e4896b5b8be9ffd6dacddb081f69a5b77903 Mon Sep 17 00:00:00 2001
From: Jonas Schnelli <dev@jonasschnelli.ch>
Date: Thu, 28 Apr 2016 22:04:07 +0200
Subject: [PATCH 0243/1802] [RPC] add feerate option to fundrawtransaction

---
 qa/rpc-tests/fundrawtransaction.py |  8 ++++++++
 src/coincontrol.h                  |  3 +++
 src/wallet/rpcwallet.cpp           | 13 +++++++++----
 src/wallet/wallet.cpp              |  6 +++++-
 src/wallet/wallet.h                |  2 +-
 5 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/qa/rpc-tests/fundrawtransaction.py b/qa/rpc-tests/fundrawtransaction.py
index 496c7fe8b0ed0..f76fe90ef4e79 100755
--- a/qa/rpc-tests/fundrawtransaction.py
+++ b/qa/rpc-tests/fundrawtransaction.py
@@ -677,6 +677,14 @@ def run_test(self):
         assert(signedtx["complete"])
         self.nodes[0].sendrawtransaction(signedtx["hex"])
 
+        inputs = []
+        outputs = {self.nodes[2].getnewaddress() : 1}
+        rawtx = self.nodes[3].createrawtransaction(inputs, outputs)
+        result = self.nodes[3].fundrawtransaction(rawtx, )
+        result2 = self.nodes[3].fundrawtransaction(rawtx, {"feeRate": 2000})
+        result3 = self.nodes[3].fundrawtransaction(rawtx, {"feeRate": 10000})
+        assert_equal(result['fee']*2, result2['fee'])
+        assert_equal(result['fee']*10, result3['fee'])
 
 if __name__ == '__main__':
     RawTransactionsTest().main()
diff --git a/src/coincontrol.h b/src/coincontrol.h
index 12fe9ce219c27..6129397bc8f5d 100644
--- a/src/coincontrol.h
+++ b/src/coincontrol.h
@@ -18,6 +18,8 @@ class CCoinControl
     bool fAllowWatchOnly;
     //! Minimum absolute fee (not per kilobyte)
     CAmount nMinimumTotalFee;
+    //! Feerate to use (0 = estimate fee with payTxFee fallback)
+    CFeeRate nFeeRate;
 
     CCoinControl()
     {
@@ -31,6 +33,7 @@ class CCoinControl
         fAllowWatchOnly = false;
         setSelected.clear();
         nMinimumTotalFee = 0;
+        nFeeRate = CFeeRate(0);
     }
 
     bool HasSelected() const
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index 623037e76648b..b14d748b3917e 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -2458,6 +2458,7 @@ UniValue fundrawtransaction(const UniValue& params, bool fHelp)
                             "     \"changePosition\"    (numeric, optional, default random) The index of the change output\n"
                             "     \"includeWatching\"   (boolean, optional, default false) Also select inputs which are watch only\n"
                             "     \"lockUnspents\"      (boolean, optional, default false) Lock selected unspent outputs\n"
+                            "     \"feeRate\"           (numeric, optional, default 0=estimate) Set a specific feerate (fee per KB)\n"
                             "   }\n"
                             "                         for backward compatibility: passing in a true instead of an object will result in {\"includeWatching\":true}\n"
                             "\nResult:\n"
@@ -2484,6 +2485,7 @@ UniValue fundrawtransaction(const UniValue& params, bool fHelp)
     int changePosition = -1;
     bool includeWatching = false;
     bool lockUnspents = false;
+    CFeeRate feeRate = CFeeRate(0);
 
     if (params.size() > 1) {
       if (params[1].type() == UniValue::VBOOL) {
@@ -2495,7 +2497,7 @@ UniValue fundrawtransaction(const UniValue& params, bool fHelp)
 
         UniValue options = params[1];
 
-        RPCTypeCheckObj(options, boost::assign::map_list_of("changeAddress", UniValue::VSTR)("changePosition", UniValue::VNUM)("includeWatching", UniValue::VBOOL)("lockUnspents", UniValue::VBOOL), true, true);
+        RPCTypeCheckObj(options, boost::assign::map_list_of("changeAddress", UniValue::VSTR)("changePosition", UniValue::VNUM)("includeWatching", UniValue::VBOOL)("lockUnspents", UniValue::VBOOL)("feeRate", UniValue::VNUM), true, true);
 
         if (options.exists("changeAddress")) {
             CBitcoinAddress address(options["changeAddress"].get_str());
@@ -2514,6 +2516,9 @@ UniValue fundrawtransaction(const UniValue& params, bool fHelp)
 
         if (options.exists("lockUnspents"))
             lockUnspents = options["lockUnspents"].get_bool();
+
+        if (options.exists("feeRate"))
+            feeRate = CFeeRate(options["feeRate"].get_real());
       }
     }
 
@@ -2529,16 +2534,16 @@ UniValue fundrawtransaction(const UniValue& params, bool fHelp)
         throw JSONRPCError(RPC_INVALID_PARAMETER, "changePosition out of bounds");
 
     CMutableTransaction tx(origTx);
-    CAmount nFee;
+    CAmount nFeeOut;
     string strFailReason;
 
-    if(!pwalletMain->FundTransaction(tx, nFee, changePosition, strFailReason, includeWatching, lockUnspents, changeAddress))
+    if(!pwalletMain->FundTransaction(tx, nFeeOut, feeRate, changePosition, strFailReason, includeWatching, lockUnspents, changeAddress))
         throw JSONRPCError(RPC_INTERNAL_ERROR, strFailReason);
 
     UniValue result(UniValue::VOBJ);
     result.push_back(Pair("hex", EncodeHexTx(tx)));
     result.push_back(Pair("changepos", changePosition));
-    result.push_back(Pair("fee", ValueFromAmount(nFee)));
+    result.push_back(Pair("fee", ValueFromAmount(nFeeOut)));
 
     return result;
 }
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index 29d7138547bd1..6b5e3ca7f5994 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -1918,7 +1918,7 @@ bool CWallet::SelectCoins(const vector<COutput>& vAvailableCoins, const CAmount&
     return res;
 }
 
-bool CWallet::FundTransaction(CMutableTransaction& tx, CAmount& nFeeRet, int& nChangePosInOut, std::string& strFailReason, bool includeWatching, bool lockUnspents, const CTxDestination& destChange)
+bool CWallet::FundTransaction(CMutableTransaction& tx, CAmount& nFeeRet, const CFeeRate& specificFeeRate, int& nChangePosInOut, std::string& strFailReason, bool includeWatching, bool lockUnspents, const CTxDestination& destChange)
 {
     vector<CRecipient> vecSend;
 
@@ -1933,6 +1933,8 @@ bool CWallet::FundTransaction(CMutableTransaction& tx, CAmount& nFeeRet, int& nC
     coinControl.destChange = destChange;
     coinControl.fAllowOtherInputs = true;
     coinControl.fAllowWatchOnly = includeWatching;
+    coinControl.nFeeRate = specificFeeRate;
+
     BOOST_FOREACH(const CTxIn& txin, tx.vin)
         coinControl.Select(txin.prevout);
 
@@ -2242,6 +2244,8 @@ bool CWallet::CreateTransaction(const vector<CRecipient>& vecSend, CWalletTx& wt
                 if (coinControl && nFeeNeeded > 0 && coinControl->nMinimumTotalFee > nFeeNeeded) {
                     nFeeNeeded = coinControl->nMinimumTotalFee;
                 }
+                if (coinControl && coinControl->nFeeRate > CFeeRate(0))
+                    nFeeNeeded = coinControl->nFeeRate.GetFee(nBytes);
 
                 // If we made it here and we aren't even able to meet the relay fee on the next pass, give up
                 // because we must be at the maximum allowed fee.
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
index c3bd343edd3e7..7b5168975ce11 100644
--- a/src/wallet/wallet.h
+++ b/src/wallet/wallet.h
@@ -740,7 +740,7 @@ class CWallet : public CCryptoKeyStore, public CValidationInterface
      * Insert additional inputs into the transaction by
      * calling CreateTransaction();
      */
-    bool FundTransaction(CMutableTransaction& tx, CAmount& nFeeRet, int& nChangePosInOut, std::string& strFailReason, bool includeWatching, bool lockUnspents, const CTxDestination& destChange = CNoDestination());
+    bool FundTransaction(CMutableTransaction& tx, CAmount& nFeeRet, const CFeeRate& specificFeeRate, int& nChangePosInOut, std::string& strFailReason, bool includeWatching, bool lockUnspents, const CTxDestination& destChange = CNoDestination());
 
     /**
      * Create a new transaction paying the recipients with a set of coins

From faf3d11ad7b10b9acfb59fe186876a3005385e4d Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Fri, 29 Apr 2016 23:17:18 +0200
Subject: [PATCH 0244/1802] [doc] Update bitcoin-core GitHub links

---
 contrib/devtools/README.md                       | 6 +++---
 contrib/gitian-descriptors/gitian-osx-signer.yml | 2 +-
 contrib/gitian-descriptors/gitian-win-signer.yml | 2 +-
 doc/gitian-building.md                           | 6 +++---
 doc/release-notes/release-notes-0.12.0.md        | 2 +-
 doc/release-process.md                           | 6 +++---
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/contrib/devtools/README.md b/contrib/devtools/README.md
index 1103ca86c5e82..bb8b9246b8781 100644
--- a/contrib/devtools/README.md
+++ b/contrib/devtools/README.md
@@ -48,9 +48,9 @@ the commit it claims to have been updated to.
 
 To use, make sure that you have fetched the upstream repository branch in which the subtree is
 maintained:
-* for `src/secp256k1`: https://github.com/bitcoin/secp256k1.git (branch master)
-* for `src/leveldb`: https://github.com/bitcoin/leveldb.git (branch bitcoin-fork)
-* for `src/univalue`: https://github.com/bitcoin/univalue.git (branch master)
+* for `src/secp256k1`: https://github.com/bitcoin-core/secp256k1.git (branch master)
+* for `src/leveldb`: https://github.com/bitcoin-core/leveldb.git (branch bitcoin-fork)
+* for `src/univalue`: https://github.com/bitcoin-core/univalue.git (branch master)
 
 Usage: `git-subtree-check.sh DIR COMMIT`
 
diff --git a/contrib/gitian-descriptors/gitian-osx-signer.yml b/contrib/gitian-descriptors/gitian-osx-signer.yml
index c4165470af132..fac61aa3debed 100644
--- a/contrib/gitian-descriptors/gitian-osx-signer.yml
+++ b/contrib/gitian-descriptors/gitian-osx-signer.yml
@@ -8,7 +8,7 @@ packages:
 - "faketime"
 reference_datetime: "2016-01-01 00:00:00"
 remotes:
-- "url": "https://github.com/bitcoin/bitcoin-detached-sigs.git"
+- "url": "https://github.com/bitcoin-core/bitcoin-detached-sigs.git"
   "dir": "signature"
 files:
 - "bitcoin-osx-unsigned.tar.gz"
diff --git a/contrib/gitian-descriptors/gitian-win-signer.yml b/contrib/gitian-descriptors/gitian-win-signer.yml
index 27c4f01eb4ed9..88edb96627e82 100644
--- a/contrib/gitian-descriptors/gitian-win-signer.yml
+++ b/contrib/gitian-descriptors/gitian-win-signer.yml
@@ -9,7 +9,7 @@ packages:
 - "autoconf"
 reference_datetime: "2016-01-01 00:00:00"
 remotes:
-- "url": "https://github.com/bitcoin/bitcoin-detached-sigs.git"
+- "url": "https://github.com/bitcoin-core/bitcoin-detached-sigs.git"
   "dir": "signature"
 files:
 - "osslsigncode-1.7.1.tar.gz"
diff --git a/doc/gitian-building.md b/doc/gitian-building.md
index 3126218518690..13f8ad316b3f5 100644
--- a/doc/gitian-building.md
+++ b/doc/gitian-building.md
@@ -310,7 +310,7 @@ Clone the git repositories for bitcoin and Gitian.
 ```bash
 git clone https://github.com/devrandom/gitian-builder.git
 git clone https://github.com/bitcoin/bitcoin
-git clone https://github.com/bitcoin/gitian.sigs.git
+git clone https://github.com/bitcoin-core/gitian.sigs.git
 ```
 
 Setting up the Gitian image
@@ -441,7 +441,7 @@ Then when building, override the remote URLs that gbuild would otherwise pull fr
 ```bash
 
 cd /some/root/path/
-git clone https://github.com/bitcoin/bitcoin-detached-sigs.git
+git clone https://github.com/bitcoin-core/bitcoin-detached-sigs.git
 
 BTCPATH=/some/root/path/bitcoin.git
 SIGPATH=/some/root/path/bitcoin-detached-sigs.git
@@ -473,5 +473,5 @@ Uploading signatures
 ---------------------
 
 After building and signing you can push your signatures (both the `.assert` and `.assert.sig` files) to the
-[bitcoin/gitian.sigs](https://github.com/bitcoin/gitian.sigs/) repository, or if that's not possible create a pull
+[bitcoin-core/gitian.sigs](https://github.com/bitcoin-core/gitian.sigs/) repository, or if that's not possible create a pull
 request. You can also mail the files to Wladimir (laanwj@gmail.com) and he will commit them.
diff --git a/doc/release-notes/release-notes-0.12.0.md b/doc/release-notes/release-notes-0.12.0.md
index 135cd68a7c78f..1b7bd06ece6a2 100644
--- a/doc/release-notes/release-notes-0.12.0.md
+++ b/doc/release-notes/release-notes-0.12.0.md
@@ -61,7 +61,7 @@ Signature validation using libsecp256k1
 ---------------------------------------
 
 ECDSA signatures inside Bitcoin transactions now use validation using
-[libsecp256k1](https://github.com/bitcoin/secp256k1) instead of OpenSSL.
+[libsecp256k1](https://github.com/bitcoin-core/secp256k1) instead of OpenSSL.
 
 Depending on the platform, this means a significant speedup for raw signature
 validation speed. The advantage is largest on x86_64, where validation is over
diff --git a/doc/release-process.md b/doc/release-process.md
index 34dead86bc1e4..3bfcc38177bb2 100644
--- a/doc/release-process.md
+++ b/doc/release-process.md
@@ -20,8 +20,8 @@ Before every major release:
 Check out the source code in the following directory hierarchy.
 
     cd /path/to/your/toplevel/build
-    git clone https://github.com/bitcoin/gitian.sigs.git
-    git clone https://github.com/bitcoin/bitcoin-detached-sigs.git
+    git clone https://github.com/bitcoin-core/gitian.sigs.git
+    git clone https://github.com/bitcoin-core/bitcoin-detached-sigs.git
     git clone https://github.com/devrandom/gitian-builder.git
     git clone https://github.com/bitcoin/bitcoin.git
 
@@ -170,7 +170,7 @@ Commit your signature to gitian.sigs:
 Wait for Windows/OS X detached signatures:
 
 - Once the Windows/OS X builds each have 3 matching signatures, they will be signed with their respective release keys.
-- Detached signatures will then be committed to the [bitcoin-detached-sigs](https://github.com/bitcoin/bitcoin-detached-sigs) repository, which can be combined with the unsigned apps to create signed binaries.
+- Detached signatures will then be committed to the [bitcoin-detached-sigs](https://github.com/bitcoin-core/bitcoin-detached-sigs) repository, which can be combined with the unsigned apps to create signed binaries.
 
 Create (and optionally verify) the signed OS X binary:
 

From d90351f0504c5d4057e560d64107a2f36d7bf3d4 Mon Sep 17 00:00:00 2001
From: Gregory Maxwell <greg@xiph.org>
Date: Fri, 29 Apr 2016 14:23:51 +0000
Subject: [PATCH 0245/1802] More comments on the design of
 AttemptToEvictConnection.

Some developers clearly don't get this and have been posting
 "improvements" that create clear vulnerabilities.  It should
 have been better explained in the code, since the design
 is somewhat subtle and getting it right is important.
---
 src/net.cpp | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/net.cpp b/src/net.cpp
index 7dec8fc1cf599..ced371164addc 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -877,6 +877,14 @@ class CompareNetGroupKeyed
     }
 };
 
+/** Try to find a connection to evict when the node is full.
+ *  Extreme care must be taken to avoid opening the node to attacker
+ *   triggered network partitioning.
+ *  The strategy used here is to protect a small number of peers
+ *   for each of several distinct characteristics which are difficult
+ *   to forge.  In order to partition a node the attacker must be
+ *   simultaneously better at all of them than honest peers.
+ */
 static bool AttemptToEvictConnection(bool fPreferNewConnection) {
     std::vector<CNodeRef> vEvictionCandidates;
     {
@@ -905,7 +913,7 @@ static bool AttemptToEvictConnection(bool fPreferNewConnection) {
 
     if (vEvictionCandidates.empty()) return false;
 
-    // Protect the 8 nodes with the best ping times.
+    // Protect the 8 nodes with the lowest minimum ping time.
     // An attacker cannot manipulate this metric without physically moving nodes closer to the target.
     std::sort(vEvictionCandidates.begin(), vEvictionCandidates.end(), ReverseCompareNodeMinPingTime);
     vEvictionCandidates.erase(vEvictionCandidates.end() - std::min(8, static_cast<int>(vEvictionCandidates.size())), vEvictionCandidates.end());
@@ -913,7 +921,7 @@ static bool AttemptToEvictConnection(bool fPreferNewConnection) {
     if (vEvictionCandidates.empty()) return false;
 
     // Protect the half of the remaining nodes which have been connected the longest.
-    // This replicates the existing implicit behavior.
+    // This replicates the non-eviction implicit behavior, and precludes attacks that start later.
     std::sort(vEvictionCandidates.begin(), vEvictionCandidates.end(), ReverseCompareNodeTimeConnected);
     vEvictionCandidates.erase(vEvictionCandidates.end() - static_cast<int>(vEvictionCandidates.size() / 2), vEvictionCandidates.end());
 
@@ -941,6 +949,7 @@ static bool AttemptToEvictConnection(bool fPreferNewConnection) {
     vEvictionCandidates = mapAddrCounts[naMostConnections];
 
     // Do not disconnect peers if there is only one unprotected connection from their network group.
+    // This step excessively favors netgroup diversity, and should be removed once more protective criteria are established.
     if (vEvictionCandidates.size() <= 1)
         // unless we prefer the new connection (for whitelisted peers)
         if (!fPreferNewConnection)

From f7c4f79f07c777801db7dc047cd45eaf2bba81c9 Mon Sep 17 00:00:00 2001
From: Daniel Kraft <d@domob.eu>
Date: Sat, 30 Apr 2016 19:25:00 +0200
Subject: [PATCH 0246/1802] [trivial] Add missing const qualifiers.

Add some const qualifiers to references that are not modified and should
be marked as const.
---
 src/main.cpp      | 2 +-
 src/txmempool.cpp | 2 +-
 src/txmempool.h   | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index 11ccab253e4ed..2777245654a0a 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1468,7 +1468,7 @@ bool GetTransaction(const uint256 &hash, CTransaction &txOut, const Consensus::P
     if (fAllowSlow) { // use coin database to locate block that contains transaction, and scan it
         int nHeight = -1;
         {
-            CCoinsViewCache &view = *pcoinsTip;
+            const CCoinsViewCache& view = *pcoinsTip;
             const CCoins* coins = view.AccessCoins(hash);
             if (coins)
                 nHeight = coins->nHeight;
diff --git a/src/txmempool.cpp b/src/txmempool.cpp
index 52c7793118331..420f6896b371e 100644
--- a/src/txmempool.cpp
+++ b/src/txmempool.cpp
@@ -885,7 +885,7 @@ bool CTxMemPool::HasNoInputsOf(const CTransaction &tx) const
     return true;
 }
 
-CCoinsViewMemPool::CCoinsViewMemPool(CCoinsView *baseIn, CTxMemPool &mempoolIn) : CCoinsViewBacked(baseIn), mempool(mempoolIn) { }
+CCoinsViewMemPool::CCoinsViewMemPool(CCoinsView* baseIn, const CTxMemPool& mempoolIn) : CCoinsViewBacked(baseIn), mempool(mempoolIn) { }
 
 bool CCoinsViewMemPool::GetCoins(const uint256 &txid, CCoins &coins) const {
     // If an entry in the mempool exists, always return that one, as it's guaranteed to never
diff --git a/src/txmempool.h b/src/txmempool.h
index de4ba0b371a42..d17e3322d307b 100644
--- a/src/txmempool.h
+++ b/src/txmempool.h
@@ -672,10 +672,10 @@ class CTxMemPool
 class CCoinsViewMemPool : public CCoinsViewBacked
 {
 protected:
-    CTxMemPool &mempool;
+    const CTxMemPool& mempool;
 
 public:
-    CCoinsViewMemPool(CCoinsView *baseIn, CTxMemPool &mempoolIn);
+    CCoinsViewMemPool(CCoinsView* baseIn, const CTxMemPool& mempoolIn);
     bool GetCoins(const uint256 &txid, CCoins &coins) const;
     bool HaveCoins(const uint256 &txid) const;
 };

From c8b92486c4eca1287546b0683b6af3551db1fe67 Mon Sep 17 00:00:00 2001
From: 21E14 <21xe14@gmail.com>
Date: Fri, 29 Apr 2016 23:45:20 -0400
Subject: [PATCH 0247/1802] Remove obsolete reference to CValidationState from
 UpdateCoins.

---
 src/main.cpp             | 8 ++++----
 src/main.h               | 2 +-
 src/test/coins_tests.cpp | 3 +--
 src/txmempool.cpp        | 4 ++--
 4 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index 11ccab253e4ed..c5c61469301d2 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1744,7 +1744,7 @@ void static InvalidBlockFound(CBlockIndex *pindex, const CValidationState &state
     }
 }
 
-void UpdateCoins(const CTransaction& tx, CValidationState &state, CCoinsViewCache &inputs, CTxUndo &txundo, int nHeight)
+void UpdateCoins(const CTransaction& tx, CCoinsViewCache& inputs, CTxUndo &txundo, int nHeight)
 {
     // mark inputs spent
     if (!tx.IsCoinBase()) {
@@ -1770,10 +1770,10 @@ void UpdateCoins(const CTransaction& tx, CValidationState &state, CCoinsViewCach
     inputs.ModifyNewCoins(tx.GetHash(), tx.IsCoinBase())->FromTx(tx, nHeight);
 }
 
-void UpdateCoins(const CTransaction& tx, CValidationState &state, CCoinsViewCache &inputs, int nHeight)
+void UpdateCoins(const CTransaction& tx, CCoinsViewCache& inputs, int nHeight)
 {
     CTxUndo txundo;
-    UpdateCoins(tx, state, inputs, txundo, nHeight);
+    UpdateCoins(tx, inputs, txundo, nHeight);
 }
 
 bool CScriptCheck::operator()() {
@@ -2385,7 +2385,7 @@ bool ConnectBlock(const CBlock& block, CValidationState& state, CBlockIndex* pin
         if (i > 0) {
             blockundo.vtxundo.push_back(CTxUndo());
         }
-        UpdateCoins(tx, state, view, i == 0 ? undoDummy : blockundo.vtxundo.back(), pindex->nHeight);
+        UpdateCoins(tx, view, i == 0 ? undoDummy : blockundo.vtxundo.back(), pindex->nHeight);
 
         vPos.push_back(std::make_pair(tx.GetHash(), pos));
         pos.nTxOffset += ::GetSerializeSize(tx, SER_DISK, CLIENT_VERSION);
diff --git a/src/main.h b/src/main.h
index 2c9635bcf2b8f..792747a33464b 100644
--- a/src/main.h
+++ b/src/main.h
@@ -359,7 +359,7 @@ bool CheckInputs(const CTransaction& tx, CValidationState &state, const CCoinsVi
                  unsigned int flags, bool cacheStore, std::vector<CScriptCheck> *pvChecks = NULL);
 
 /** Apply the effects of this transaction on the UTXO set represented by view */
-void UpdateCoins(const CTransaction& tx, CValidationState &state, CCoinsViewCache &inputs, int nHeight);
+void UpdateCoins(const CTransaction& tx, CCoinsViewCache& inputs, int nHeight);
 
 /** Context-independent validity checks */
 bool CheckTransaction(const CTransaction& tx, CValidationState& state);
diff --git a/src/test/coins_tests.cpp b/src/test/coins_tests.cpp
index 129ce04e0bca1..e6923265592d7 100644
--- a/src/test/coins_tests.cpp
+++ b/src/test/coins_tests.cpp
@@ -297,8 +297,7 @@ BOOST_AUTO_TEST_CASE(updatecoins_simulation_test)
             CCoins &coins = result[tx.GetHash()];
             coins.FromTx(tx, height);
 
-            CValidationState dummy;
-            UpdateCoins(tx, dummy, *(stack.back()), height);
+            UpdateCoins(tx, *(stack.back()), height);
         }
 
         // Once every 1000 iterations and at the end, verify the full cache.
diff --git a/src/txmempool.cpp b/src/txmempool.cpp
index 52c7793118331..f9c33087fdc69 100644
--- a/src/txmempool.cpp
+++ b/src/txmempool.cpp
@@ -720,7 +720,7 @@ void CTxMemPool::check(const CCoinsViewCache *pcoins) const
         else {
             CValidationState state;
             assert(CheckInputs(tx, state, mempoolDuplicate, false, 0, false, NULL));
-            UpdateCoins(tx, state, mempoolDuplicate, 1000000);
+            UpdateCoins(tx, mempoolDuplicate, 1000000);
         }
     }
     unsigned int stepsSinceLastRemove = 0;
@@ -734,7 +734,7 @@ void CTxMemPool::check(const CCoinsViewCache *pcoins) const
             assert(stepsSinceLastRemove < waitingOnDependants.size());
         } else {
             assert(CheckInputs(entry->GetTx(), state, mempoolDuplicate, false, 0, false, NULL));
-            UpdateCoins(entry->GetTx(), state, mempoolDuplicate, 1000000);
+            UpdateCoins(entry->GetTx(), mempoolDuplicate, 1000000);
             stepsSinceLastRemove = 0;
         }
     }

From de982901555b3f168a721a8911dc1ce8a51d3f59 Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Thu, 28 Apr 2016 17:46:35 -0400
Subject: [PATCH 0248/1802] build: No need to check for leveldb atomics

They're guaranteed with c++11
---
 configure.ac                 | 14 --------------
 src/Makefile.leveldb.include |  7 ++-----
 2 files changed, 2 insertions(+), 19 deletions(-)

diff --git a/configure.ac b/configure.ac
index 558835bbbd9b5..a1c04daf53601 100644
--- a/configure.ac
+++ b/configure.ac
@@ -555,18 +555,6 @@ if test x$use_reduce_exports = xyes; then
   [AC_MSG_ERROR([Cannot set default symbol visibility. Use --disable-reduce-exports.])])
 fi
 
-dnl This can go away when we require c++11
-TEMP_CXXFLAGS="$CXXFLAGS"
-CXXFLAGS="$CXXFLAGS -std=c++0x"
-AC_MSG_CHECKING(for c++11 atomics)
-AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
-  #include <atomic>
-  ]],[[]])],
-  [ AC_MSG_RESULT(yes); LEVELDB_ATOMIC_CPPFLAGS="-DLEVELDB_ATOMIC_PRESENT"; LEVELDB_ATOMIC_CXXFLAGS="-std=c++0x"],
-  [ AC_MSG_RESULT(no)]
-)
-CXXFLAGS="$TEMP_CXXFLAGS"
-
 LEVELDB_CPPFLAGS=
 LIBLEVELDB=
 LIBMEMENV=
@@ -1069,8 +1057,6 @@ AC_SUBST(TESTDEFS)
 AC_SUBST(LEVELDB_TARGET_FLAGS)
 AC_SUBST(MINIUPNPC_CPPFLAGS)
 AC_SUBST(MINIUPNPC_LIBS)
-AC_SUBST(LEVELDB_ATOMIC_CPPFLAGS)
-AC_SUBST(LEVELDB_ATOMIC_CXXFLAGS)
 AC_CONFIG_FILES([Makefile src/Makefile share/setup.nsi share/qt/Info.plist src/test/buildenv.py])
 AC_CONFIG_FILES([qa/pull-tester/run-bitcoind-for-test.sh],[chmod +x qa/pull-tester/run-bitcoind-for-test.sh])
 AC_CONFIG_FILES([qa/pull-tester/tests_config.py],[chmod +x qa/pull-tester/tests_config.py])
diff --git a/src/Makefile.leveldb.include b/src/Makefile.leveldb.include
index 36a6bc4095ad0..88bb0c19326f1 100644
--- a/src/Makefile.leveldb.include
+++ b/src/Makefile.leveldb.include
@@ -13,7 +13,7 @@ LEVELDB_CPPFLAGS += -I$(srcdir)/leveldb/helpers/memenv
 LEVELDB_CPPFLAGS_INT =
 LEVELDB_CPPFLAGS_INT += -I$(srcdir)/leveldb
 LEVELDB_CPPFLAGS_INT += $(LEVELDB_TARGET_FLAGS)
-LEVELDB_CPPFLAGS_INT += $(LEVELDB_ATOMIC_CPPFLAGS)
+LEVELDB_CPPFLAGS_INT += -DLEVELDB_ATOMIC_PRESENT
 LEVELDB_CPPFLAGS_INT += -D__STDC_LIMIT_MACROS
 
 if TARGET_WINDOWS
@@ -22,11 +22,8 @@ else
 LEVELDB_CPPFLAGS_INT += -DLEVELDB_PLATFORM_POSIX
 endif
 
-LEVELDB_CXXFLAGS_INT =
-LEVELDB_CXXFLAGS_INT += $(LEVELDB_ATOMIC_CXXFLAGS)
-
 leveldb_libleveldb_a_CPPFLAGS = $(AM_CPPFLAGS) $(LEVELDB_CPPFLAGS_INT) $(LEVELDB_CPPFLAGS)
-leveldb_libleveldb_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) $(LEVELDB_CXXFLAGS_INT)
+leveldb_libleveldb_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
 
 leveldb_libleveldb_a_SOURCES=
 leveldb_libleveldb_a_SOURCES += leveldb/db/builder.cc

From 9a8a7d011564c43231d16e6e3a25c73f0c76fde1 Mon Sep 17 00:00:00 2001
From: Puru <tuladharpuru@gmail.com>
Date: Mon, 2 May 2016 22:33:04 +0545
Subject: [PATCH 0249/1802] bitcoin-cli.cpp: Use symbolic constant for exit
 code

---
 src/bitcoin-cli.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bitcoin-cli.cpp b/src/bitcoin-cli.cpp
index 49935699fd5d8..a04101d3ed847 100644
--- a/src/bitcoin-cli.cpp
+++ b/src/bitcoin-cli.cpp
@@ -314,7 +314,7 @@ int main(int argc, char* argv[])
     SetupEnvironment();
     if (!SetupNetworking()) {
         fprintf(stderr, "Error: Initializing networking failed\n");
-        exit(1);
+        return EXIT_FAILURE;
     }
 
     try {

From fa17f93fbd2889c020849b941a94c5bd8a619a3c Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Sat, 30 Apr 2016 23:16:06 +0200
Subject: [PATCH 0250/1802] [qa] smartfees: Properly use ordered dict

---
 qa/rpc-tests/smartfees.py | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/qa/rpc-tests/smartfees.py b/qa/rpc-tests/smartfees.py
index 2c064ad8a03a9..b3fb8fb1007c6 100755
--- a/qa/rpc-tests/smartfees.py
+++ b/qa/rpc-tests/smartfees.py
@@ -7,6 +7,7 @@
 # Test fee estimation code
 #
 
+from collections import OrderedDict
 from test_framework.test_framework import BitcoinTestFramework
 from test_framework.util import *
 
@@ -49,8 +50,8 @@ def small_txpuzzle_randfee(from_node, conflist, unconflist, amount, min_fee, fee
         if total_in <= amount + fee:
             raise RuntimeError("Insufficient funds: need %d, have %d"%(amount+fee, total_in))
     outputs = {}
-    outputs[P2SH_1] = total_in - amount - fee
-    outputs[P2SH_2] = amount
+    outputs = OrderedDict([(P2SH_1, total_in - amount - fee),
+                           (P2SH_2, amount)])
     rawtx = from_node.createrawtransaction(inputs, outputs)
     # Createrawtransaction constructions a transaction that is ready to be signed
     # These transactions don't need to be signed, but we still have to insert the ScriptSig
@@ -78,12 +79,10 @@ def split_inputs(from_node, txins, txouts, initial_split = False):
     '''
     prevtxout = txins.pop()
     inputs = []
-    outputs = {}
     inputs.append({ "txid" : prevtxout["txid"], "vout" : prevtxout["vout"] })
     half_change = satoshi_round(prevtxout["amount"]/2)
     rem_change = prevtxout["amount"] - half_change  - Decimal("0.00001000")
-    outputs[P2SH_1] = half_change
-    outputs[P2SH_2] = rem_change
+    outputs = OrderedDict([(P2SH_1, half_change), (P2SH_2, rem_change)])
     rawtx = from_node.createrawtransaction(inputs, outputs)
     # If this is the initial split we actually need to sign the transaction
     # Otherwise we just need to insert the property ScriptSig

From 43bbcd075355630544a530f3cc52014edb3787b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pavel=20Jan=C3=ADk?= <Pavel@Janik.cz>
Date: Mon, 2 May 2016 22:23:21 +0200
Subject: [PATCH 0251/1802] [qa] Fix typos in doc and comments

---
 qa/rpc-tests/smartfees.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/qa/rpc-tests/smartfees.py b/qa/rpc-tests/smartfees.py
index b3fb8fb1007c6..7239e5a0da825 100755
--- a/qa/rpc-tests/smartfees.py
+++ b/qa/rpc-tests/smartfees.py
@@ -23,7 +23,7 @@
 def small_txpuzzle_randfee(from_node, conflist, unconflist, amount, min_fee, fee_increment):
     '''
     Create and send a transaction with a random fee.
-    The transaction pays to a trival P2SH script, and assumes that its inputs
+    The transaction pays to a trivial P2SH script, and assumes that its inputs
     are of the same form.
     The function takes a list of confirmed outputs and unconfirmed outputs
     and attempts to use the confirmed list first for its inputs.
@@ -53,7 +53,7 @@ def small_txpuzzle_randfee(from_node, conflist, unconflist, amount, min_fee, fee
     outputs = OrderedDict([(P2SH_1, total_in - amount - fee),
                            (P2SH_2, amount)])
     rawtx = from_node.createrawtransaction(inputs, outputs)
-    # Createrawtransaction constructions a transaction that is ready to be signed
+    # createrawtransaction constructs a transaction that is ready to be signed.
     # These transactions don't need to be signed, but we still have to insert the ScriptSig
     # that will satisfy the ScriptPubKey.
     completetx = rawtx[0:10]
@@ -223,7 +223,7 @@ def transact_and_mine(self, numblocks, mining_node):
             sync_mempools(self.nodes[0:3],.1)
             mined = mining_node.getblock(mining_node.generate(1)[0],True)["tx"]
             sync_blocks(self.nodes[0:3],.1)
-            #update which txouts are confirmed
+            # update which txouts are confirmed
             newmem = []
             for utx in self.memutxo:
                 if utx["txid"] in mined:

From 9eaa0afa6ec5d3dd01e4d01121314ef51f2bc305 Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Wed, 4 May 2016 11:35:44 +0200
Subject: [PATCH 0252/1802] tinyformat: force USE_VARIADIC_TEMPLATES

Now that we started using c++11, force use of variadic templates.

The autodetection may be wonky on some compilers, see discussion
[here](https://github.com/bitcoin/bitcoin/pull/7982#issuecomment-216222357)
and is unnecessary for us anyhow.
---
 src/tinyformat.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/tinyformat.h b/src/tinyformat.h
index 73d49a1fe4d79..c6ec0419b3943 100644
--- a/src/tinyformat.h
+++ b/src/tinyformat.h
@@ -113,7 +113,7 @@ namespace tfm = tinyformat;
 
 // Define for C++11 variadic templates which make the code shorter & more
 // general.  If you don't define this, C++11 support is autodetected below.
-// #define TINYFORMAT_USE_VARIADIC_TEMPLATES
+#define TINYFORMAT_USE_VARIADIC_TEMPLATES
 
 
 //------------------------------------------------------------------------------

From 47eda2d8820b8161b6ef550af6575cbe4f1a3207 Mon Sep 17 00:00:00 2001
From: fanquake <fanquake@gmail.com>
Date: Wed, 4 May 2016 19:03:59 +0800
Subject: [PATCH 0253/1802] [depends] Add -stdlib=libc++ to darwin CXX flags

---
 depends/builders/darwin.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/depends/builders/darwin.mk b/depends/builders/darwin.mk
index 200d6ed22a230..27f550ab036ae 100644
--- a/depends/builders/darwin.mk
+++ b/depends/builders/darwin.mk
@@ -11,7 +11,7 @@ build_darwin_DOWNLOAD = curl --location --fail --connect-timeout $(DOWNLOAD_CONN
 
 #darwin host on darwin builder. overrides darwin host preferences.
 darwin_CC=$(shell xcrun -f clang) -mmacosx-version-min=$(OSX_MIN_VERSION)
-darwin_CXX:=$(shell xcrun -f clang++) -mmacosx-version-min=$(OSX_MIN_VERSION)
+darwin_CXX:=$(shell xcrun -f clang++) -mmacosx-version-min=$(OSX_MIN_VERSION) -stdlib=libc++
 darwin_AR:=$(shell xcrun -f ar)
 darwin_RANLIB:=$(shell xcrun -f ranlib)
 darwin_STRIP:=$(shell xcrun -f strip)

From 08d7b563e91ed2ad226ec2505a5a850ab869d2f0 Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Wed, 4 May 2016 14:21:04 +0200
Subject: [PATCH 0254/1802] util: switch LogPrint and error to variadic
 templates

---
 src/util.h | 43 ++++++++++++++++++-------------------------
 1 file changed, 18 insertions(+), 25 deletions(-)

diff --git a/src/util.h b/src/util.h
index ac099f11845d3..25c9b733e871f 100644
--- a/src/util.h
+++ b/src/util.h
@@ -76,40 +76,33 @@ int LogPrintStr(const std::string &str);
 
 #define LogPrintf(...) LogPrint(NULL, __VA_ARGS__)
 
-/**
- * When we switch to C++11, this can be switched to variadic templates instead
- * of this macro-based construction (see tinyformat.h).
- */
-#define MAKE_ERROR_AND_LOG_FUNC(n)                                        \
-    /**   Print to debug.log if -debug=category switch is given OR category is NULL. */ \
-    template<TINYFORMAT_ARGTYPES(n)>                                          \
-    static inline int LogPrint(const char* category, const char* format, TINYFORMAT_VARARGS(n))  \
-    {                                                                         \
-        if(!LogAcceptCategory(category)) return 0;                            \
-        return LogPrintStr(tfm::format(format, TINYFORMAT_PASSARGS(n))); \
-    }                                                                         \
-    /**   Log error and return false */                                        \
-    template<TINYFORMAT_ARGTYPES(n)>                                          \
-    static inline bool error(const char* format, TINYFORMAT_VARARGS(n))                     \
-    {                                                                         \
-        LogPrintStr("ERROR: " + tfm::format(format, TINYFORMAT_PASSARGS(n)) + "\n"); \
-        return false;                                                         \
-    }
+template<typename T1, typename... Args>
+static inline int LogPrint(const char* category, const char* fmt, const T1& v1, const Args&... args)
+{
+    if(!LogAcceptCategory(category)) return 0;                            \
+    return LogPrintStr(tfm::format(fmt, v1, args...));
+}
 
-TINYFORMAT_FOREACH_ARGNUM(MAKE_ERROR_AND_LOG_FUNC)
+template<typename T1, typename... Args>
+bool error(const char* fmt, const T1& v1, const Args&... args)
+{
+    LogPrintStr("ERROR: " + tfm::format(fmt, v1, args...) + "\n");
+    return false;
+}
 
 /**
  * Zero-arg versions of logging and error, these are not covered by
- * TINYFORMAT_FOREACH_ARGNUM
+ * the variadic templates above (and don't take format arguments but
+ * bare strings).
  */
-static inline int LogPrint(const char* category, const char* format)
+static inline int LogPrint(const char* category, const char* s)
 {
     if(!LogAcceptCategory(category)) return 0;
-    return LogPrintStr(format);
+    return LogPrintStr(s);
 }
-static inline bool error(const char* format)
+static inline bool error(const char* s)
 {
-    LogPrintStr(std::string("ERROR: ") + format + "\n");
+    LogPrintStr(std::string("ERROR: ") + s + "\n");
     return false;
 }
 

From 0281678d6ebf68dacfb6ecaf7c231fedcd971d66 Mon Sep 17 00:00:00 2001
From: Warren Togami <wtogami@gmail.com>
Date: Thu, 28 Apr 2016 15:07:31 -0700
Subject: [PATCH 0255/1802] doc: Fedora build requirements

---
 doc/build-unix.md | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/doc/build-unix.md b/doc/build-unix.md
index dc754fc7339c9..27c57088af015 100644
--- a/doc/build-unix.md
+++ b/doc/build-unix.md
@@ -124,6 +124,24 @@ libqrencode (optional) can be installed with:
 Once these are installed, they will be found by configure and a bitcoin-qt executable will be
 built by default.
 
+Dependency Build Instructions: Fedora
+-------------------------------------
+Build requirements:
+
+    sudo dnf install libtool make autoconf automake openssl-devel libevent-devel boost-devel libdb4-devel libdb4-cxx-devel
+
+Optional:
+
+    sudo dnf install miniupnpc-devel
+
+To build with Qt 5 (recommended) you need the following:
+
+    sudo dnf install qt5-qttools-devel qtr5-qtbase-devel protobuf-devel
+
+libqrencode (optional) can be installed with:
+
+    sudo dnf install qrencode-devel
+
 Notes
 -----
 The release is built with GCC and then "strip bitcoind" to strip the debug

From 1475ecf61141e03f63a79d59831c411e0e8a5c0a Mon Sep 17 00:00:00 2001
From: EthanHeilman <ethan.r.heilman@gmail.com>
Date: Wed, 16 Mar 2016 12:54:30 -0400
Subject: [PATCH 0256/1802] Fix de-serialization bug where AddrMan is corrupted
 after exception * CAddrDB modified so that when de-serialization code throws
 an exception Addrman is reset to a clean state * CAddrDB modified to make
 unit tests possible * Regression test created to ensure bug is fixed *
 StartNode modifed to clear adrman if CAddrDB::Read returns an error code.

---
 src/Makefile.test.include |   1 +
 src/net.cpp               |   8 +++
 src/net.h                 |   1 +
 src/test/net_tests.cpp    | 136 ++++++++++++++++++++++++++++++++++++++
 4 files changed, 146 insertions(+)
 create mode 100644 src/test/net_tests.cpp

diff --git a/src/Makefile.test.include b/src/Makefile.test.include
index 468d3043a7155..edeca6b28c2e2 100644
--- a/src/Makefile.test.include
+++ b/src/Makefile.test.include
@@ -60,6 +60,7 @@ BITCOIN_TESTS =\
   test/merkle_tests.cpp \
   test/miner_tests.cpp \
   test/multisig_tests.cpp \
+  test/net_tests.cpp \
   test/netbase_tests.cpp \
   test/pmt_tests.cpp \
   test/policyestimator_tests.cpp \
diff --git a/src/net.cpp b/src/net.cpp
index d9c4c117379c5..cf53816034c15 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -1944,6 +1944,7 @@ void StartNode(boost::thread_group& threadGroup, CScheduler& scheduler)
         if (adb.Read(addrman))
             LogPrintf("Loaded %i addresses from peers.dat  %dms\n", addrman.size(), GetTimeMillis() - nStart);
         else {
+            addrman.Clear(); // Addrman can be in an inconsistent state after failure, reset it
             LogPrintf("Invalid or missing peers.dat; recreating\n");
             DumpAddresses();
         }
@@ -2336,6 +2337,11 @@ bool CAddrDB::Read(CAddrMan& addr)
     if (hashIn != hashTmp)
         return error("%s: Checksum mismatch, data corrupted", __func__);
 
+    return Read(addr, ssPeers);
+}
+
+bool CAddrDB::Read(CAddrMan& addr, CDataStream& ssPeers)
+{
     unsigned char pchMsgTmp[4];
     try {
         // de-serialize file header (network specific magic number) and ..
@@ -2349,6 +2355,8 @@ bool CAddrDB::Read(CAddrMan& addr)
         ssPeers >> addr;
     }
     catch (const std::exception& e) {
+        // de-serialization has failed, ensure addrman is left in a clean state
+        addr.Clear();
         return error("%s: Deserialize or I/O error - %s", __func__, e.what());
     }
 
diff --git a/src/net.h b/src/net.h
index 833c9cf07cb0b..dfa270544f22f 100644
--- a/src/net.h
+++ b/src/net.h
@@ -779,6 +779,7 @@ class CAddrDB
     CAddrDB();
     bool Write(const CAddrMan& addr);
     bool Read(CAddrMan& addr);
+    bool Read(CAddrMan& addr, CDataStream& ssPeers);
 };
 
 /** Access to the banlist database (banlist.dat) */
diff --git a/src/test/net_tests.cpp b/src/test/net_tests.cpp
new file mode 100644
index 0000000000000..6debf6ac5e168
--- /dev/null
+++ b/src/test/net_tests.cpp
@@ -0,0 +1,136 @@
+// Copyright (c) 2012-2016 The Bitcoin Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+#include "addrman.h"
+#include "test/test_bitcoin.h"
+#include <string>
+#include <boost/test/unit_test.hpp>
+#include "hash.h"
+#include "serialize.h"
+#include "streams.h"
+#include "net.h"
+#include "chainparams.h"
+
+using namespace std;
+
+class CAddrManSerializationMock : public CAddrMan
+{
+public:
+    virtual void Serialize(CDataStream& s, int nType, int nVersionDummy) const = 0;
+};
+
+class CAddrManUncorrupted : public CAddrManSerializationMock
+{
+public:
+    void Serialize(CDataStream& s, int nType, int nVersionDummy) const
+    {
+        CAddrMan::Serialize(s, nType, nVersionDummy);
+    }
+};
+
+class CAddrManCorrupted : public CAddrManSerializationMock
+{
+public:
+    void Serialize(CDataStream& s, int nType, int nVersionDummy) const
+    {
+        // Produces corrupt output that claims addrman has 20 addrs when it only has one addr.
+        unsigned char nVersion = 1;
+        s << nVersion;
+        s << ((unsigned char)32);
+        s << nKey;
+        s << 10; // nNew
+        s << 10; // nTried
+
+        int nUBuckets = ADDRMAN_NEW_BUCKET_COUNT ^ (1 << 30);
+        s << nUBuckets;
+
+        CAddress addr = CAddress(CService("252.1.1.1", 7777));
+        CAddrInfo info = CAddrInfo(addr, CNetAddr("252.2.2.2"));
+        s << info;
+    }
+};
+
+CDataStream AddrmanToStream(CAddrManSerializationMock& addrman)
+{
+    CDataStream ssPeersIn(SER_DISK, CLIENT_VERSION);
+    ssPeersIn << FLATDATA(Params().MessageStart());
+    ssPeersIn << addrman;
+    std::string str = ssPeersIn.str();
+    vector<unsigned char> vchData(str.begin(), str.end());
+    return CDataStream(vchData, SER_DISK, CLIENT_VERSION);
+}
+
+BOOST_FIXTURE_TEST_SUITE(net_tests, BasicTestingSetup)
+
+BOOST_AUTO_TEST_CASE(caddrdb_read)
+{
+    CAddrManUncorrupted addrmanUncorrupted;
+
+    CService addr1 = CService("250.7.1.1", 8333);
+    CService addr2 = CService("250.7.2.2", 9999);
+    CService addr3 = CService("250.7.3.3", 9999);
+
+    // Add three addresses to new table.
+    addrmanUncorrupted.Add(CAddress(addr1), CService("252.5.1.1", 8333));
+    addrmanUncorrupted.Add(CAddress(addr2), CService("252.5.1.1", 8333));
+    addrmanUncorrupted.Add(CAddress(addr3), CService("252.5.1.1", 8333));
+
+    // Test that the de-serialization does not throw an exception.
+    CDataStream ssPeers1 = AddrmanToStream(addrmanUncorrupted);
+    bool exceptionThrown = false;
+    CAddrMan addrman1;
+
+    BOOST_CHECK(addrman1.size() == 0);
+    try {
+        unsigned char pchMsgTmp[4];
+        ssPeers1 >> FLATDATA(pchMsgTmp);
+        ssPeers1 >> addrman1;
+    } catch (const std::exception& e) {
+        exceptionThrown = true;
+    }
+
+    BOOST_CHECK(addrman1.size() == 3);
+    BOOST_CHECK(exceptionThrown == false);
+
+    // Test that CAddrDB::Read creates an addrman with the correct number of addrs.
+    CDataStream ssPeers2 = AddrmanToStream(addrmanUncorrupted);
+
+    CAddrMan addrman2;
+    CAddrDB adb;
+    BOOST_CHECK(addrman2.size() == 0);
+    adb.Read(addrman2, ssPeers2);
+    BOOST_CHECK(addrman2.size() == 3);
+}
+
+
+BOOST_AUTO_TEST_CASE(caddrdb_read_corrupted)
+{
+    CAddrManCorrupted addrmanCorrupted;
+
+    // Test that the de-serialization of corrupted addrman throws an exception.
+    CDataStream ssPeers1 = AddrmanToStream(addrmanCorrupted);
+    bool exceptionThrown = false;
+    CAddrMan addrman1;
+    BOOST_CHECK(addrman1.size() == 0);
+    try {
+        unsigned char pchMsgTmp[4];
+        ssPeers1 >> FLATDATA(pchMsgTmp);
+        ssPeers1 >> addrman1;
+    } catch (const std::exception& e) {
+        exceptionThrown = true;
+    }
+    // Even through de-serialization failed adddrman is not left in a clean state.
+    BOOST_CHECK(addrman1.size() == 1);
+    BOOST_CHECK(exceptionThrown);
+
+    // Test that CAddrDB::Read leaves addrman in a clean state if de-serialization fails.
+    CDataStream ssPeers2 = AddrmanToStream(addrmanCorrupted);
+
+    CAddrMan addrman2;
+    CAddrDB adb;
+    BOOST_CHECK(addrman2.size() == 0);
+    adb.Read(addrman2, ssPeers2);
+    BOOST_CHECK(addrman2.size() == 0);
+}
+
+BOOST_AUTO_TEST_SUITE_END()

From 091d6e04998d2c88dd7f42ad2d90929f428764c2 Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Thu, 28 Apr 2016 19:03:05 +0200
Subject: [PATCH 0257/1802] http: Do a pending c++11 simplification

Use std::unique_ptr for handling work items.

This makes the code more RAII and, as mentioned in the comment, is what
I planned when I wrote the code in the first place.
---
 src/httpserver.cpp | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/src/httpserver.cpp b/src/httpserver.cpp
index a98eff7c167d7..8297b6f758398 100644
--- a/src/httpserver.cpp
+++ b/src/httpserver.cpp
@@ -71,8 +71,7 @@ class WorkQueue
     /** Mutex protects entire object */
     CWaitableCriticalSection cs;
     CConditionVariable cond;
-    /* XXX in C++11 we can use std::unique_ptr here and avoid manual cleanup */
-    std::deque<WorkItem*> queue;
+    std::deque<std::unique_ptr<WorkItem>> queue;
     bool running;
     size_t maxDepth;
     int numThreads;
@@ -101,15 +100,11 @@ class WorkQueue
                                  numThreads(0)
     {
     }
-    /*( Precondition: worker threads have all stopped
+    /** Precondition: worker threads have all stopped
      * (call WaitExit)
      */
     ~WorkQueue()
     {
-        while (!queue.empty()) {
-            delete queue.front();
-            queue.pop_front();
-        }
     }
     /** Enqueue a work item */
     bool Enqueue(WorkItem* item)
@@ -118,7 +113,7 @@ class WorkQueue
         if (queue.size() >= maxDepth) {
             return false;
         }
-        queue.push_back(item);
+        queue.emplace_back(std::unique_ptr<WorkItem>(item));
         cond.notify_one();
         return true;
     }
@@ -127,18 +122,17 @@ class WorkQueue
     {
         ThreadCounter count(*this);
         while (running) {
-            WorkItem* i = 0;
+            std::unique_ptr<WorkItem> i;
             {
                 boost::unique_lock<boost::mutex> lock(cs);
                 while (running && queue.empty())
                     cond.wait(lock);
                 if (!running)
                     break;
-                i = queue.front();
+                i = std::move(queue.front());
                 queue.pop_front();
             }
             (*i)();
-            delete i;
         }
     }
     /** Interrupt and exit loops */

From f97b410fdd57743f9a26ea49086534000eb9626a Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Wed, 4 May 2016 15:37:26 +0200
Subject: [PATCH 0258/1802] http: Add log message when work queue is full

More useful error reporting.
---
 src/httpserver.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/httpserver.cpp b/src/httpserver.cpp
index 8297b6f758398..67a9e1e92f7b4 100644
--- a/src/httpserver.cpp
+++ b/src/httpserver.cpp
@@ -286,8 +286,10 @@ static void http_request_cb(struct evhttp_request* req, void* arg)
         assert(workQueue);
         if (workQueue->Enqueue(item.get()))
             item.release(); /* if true, queue took ownership */
-        else
+        else {
+            LogPrintf("WARNING: request rejected because http work queue depth exceeded, it can be increased with the -rpcworkqueue= setting\n");
             item->req->WriteReply(HTTP_INTERNAL, "Work queue depth exceeded");
+        }
     } else {
         hreq->WriteReply(HTTP_NOTFOUND);
     }

From 37b21372a0a3e5d876a87f03c8cbef2e02d8dc92 Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Wed, 4 May 2016 15:55:23 +0200
Subject: [PATCH 0259/1802] http: Change boost::scoped_ptr to std::unique_ptr
 in HTTPRequest

No need for boost here.
---
 src/httpserver.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/httpserver.cpp b/src/httpserver.cpp
index 67a9e1e92f7b4..c193d2af1bac2 100644
--- a/src/httpserver.cpp
+++ b/src/httpserver.cpp
@@ -36,7 +36,6 @@
 
 #include <boost/algorithm/string/case_conv.hpp> // for to_lower()
 #include <boost/foreach.hpp>
-#include <boost/scoped_ptr.hpp>
 
 /** Maximum size of http request (request line + headers) */
 static const size_t MAX_HEADERS_SIZE = 8192;
@@ -54,7 +53,7 @@ class HTTPWorkItem : public HTTPClosure
         func(req.get(), path);
     }
 
-    boost::scoped_ptr<HTTPRequest> req;
+    std::unique_ptr<HTTPRequest> req;
 
 private:
     std::string path;

From f0188f9178a22fd493ed228c008d4cc25ac2952d Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Wed, 4 May 2016 16:05:17 +0200
Subject: [PATCH 0260/1802] http: use std::move to move HTTPRequest into
 HTTPWorkItem

Thanks to Cory Fields for the idea.
---
 src/httpserver.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/httpserver.cpp b/src/httpserver.cpp
index c193d2af1bac2..812940eaf9861 100644
--- a/src/httpserver.cpp
+++ b/src/httpserver.cpp
@@ -44,8 +44,8 @@ static const size_t MAX_HEADERS_SIZE = 8192;
 class HTTPWorkItem : public HTTPClosure
 {
 public:
-    HTTPWorkItem(HTTPRequest* req, const std::string &path, const HTTPRequestHandler& func):
-        req(req), path(path), func(func)
+    HTTPWorkItem(std::unique_ptr<HTTPRequest> req, const std::string &path, const HTTPRequestHandler& func):
+        req(std::move(req)), path(path), func(func)
     {
     }
     void operator()()
@@ -281,7 +281,7 @@ static void http_request_cb(struct evhttp_request* req, void* arg)
 
     // Dispatch to worker thread
     if (i != iend) {
-        std::unique_ptr<HTTPWorkItem> item(new HTTPWorkItem(hreq.release(), path, i->handler));
+        std::unique_ptr<HTTPWorkItem> item(new HTTPWorkItem(std::move(hreq), path, i->handler));
         assert(workQueue);
         if (workQueue->Enqueue(item.get()))
             item.release(); /* if true, queue took ownership */

From fa389d4edc367073e2ccc6d1f0790c4b72ba17f2 Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Sat, 19 Mar 2016 20:58:06 +0100
Subject: [PATCH 0261/1802] [qa] Switch to py3

---
 .travis.yml                                   |  10 +-
 doc/zmq.md                                    |   2 +-
 qa/README.md                                  |   4 +-
 qa/pull-tester/rpc-tests.py                   |  10 +-
 qa/pull-tester/tests_config.py.in             |   6 +-
 qa/rpc-tests/abandonconflict.py               |  17 ++-
 qa/rpc-tests/bip65-cltv-p2p.py                |  15 ++-
 qa/rpc-tests/bip65-cltv.py                    |   8 +-
 qa/rpc-tests/bip68-112-113-p2p.py             | 109 +++++++++---------
 qa/rpc-tests/bip68-sequence.py                |  30 ++---
 qa/rpc-tests/bip9-softforks.py                |   9 +-
 qa/rpc-tests/bipdersig-p2p.py                 |  15 ++-
 qa/rpc-tests/bipdersig.py                     |   8 +-
 qa/rpc-tests/blockchain.py                    |  18 +--
 qa/rpc-tests/decodescript.py                  |   4 +-
 qa/rpc-tests/disablewallet.py                 |   4 +-
 qa/rpc-tests/forknotify.py                    |   4 +-
 qa/rpc-tests/fundrawtransaction.py            |  12 +-
 qa/rpc-tests/getblocktemplate_longpoll.py     |   6 +-
 qa/rpc-tests/getblocktemplate_proposals.py    |  12 +-
 qa/rpc-tests/getchaintips.py                  |   4 +-
 qa/rpc-tests/httpbasics.py                    |  38 +++---
 qa/rpc-tests/importprunedfunds.py             |   4 +-
 qa/rpc-tests/invalidateblock.py               |  30 ++---
 qa/rpc-tests/invalidblockrequest.py           |  11 +-
 qa/rpc-tests/invalidtxrequest.py              |  11 +-
 qa/rpc-tests/keypool.py                       |   4 +-
 qa/rpc-tests/listtransactions.py              |   4 +-
 qa/rpc-tests/maxblocksinflight.py             |  11 +-
 qa/rpc-tests/maxuploadtarget.py               |  35 +++---
 qa/rpc-tests/mempool_limit.py                 |   6 +-
 qa/rpc-tests/mempool_packages.py              |  24 ++--
 qa/rpc-tests/mempool_reorg.py                 |   4 +-
 qa/rpc-tests/mempool_resurrect_test.py        |   4 +-
 qa/rpc-tests/mempool_spendcoinbase.py         |   4 +-
 qa/rpc-tests/merkle_blocks.py                 |   6 +-
 qa/rpc-tests/multi_rpc.py                     |  29 ++---
 qa/rpc-tests/nodehandling.py                  |  16 +--
 qa/rpc-tests/p2p-acceptblock.py               |  37 +++---
 qa/rpc-tests/p2p-feefilter.py                 |  14 +--
 qa/rpc-tests/p2p-fullblocktest.py             |   7 +-
 qa/rpc-tests/p2p-versionbits-warning.py       |   7 +-
 qa/rpc-tests/prioritise_transaction.py        |  14 +--
 qa/rpc-tests/proxy_test.py                    |   7 +-
 qa/rpc-tests/pruning.py                       |  68 +++++------
 qa/rpc-tests/rawtransactions.py               |   4 +-
 qa/rpc-tests/receivedby.py                    |   4 +-
 qa/rpc-tests/reindex.py                       |   6 +-
 qa/rpc-tests/replace-by-fee.py                |  26 ++---
 qa/rpc-tests/rest.py                          |  25 ++--
 qa/rpc-tests/rpcbind_test.py                  |   6 +-
 qa/rpc-tests/sendheaders.py                   |  45 ++++----
 qa/rpc-tests/signmessages.py                  |   2 +-
 qa/rpc-tests/signrawtransactions.py           |   4 +-
 qa/rpc-tests/smartfees.py                     |   6 +-
 qa/rpc-tests/test_framework/bignum.py         |   5 +-
 qa/rpc-tests/test_framework/blockstore.py     |  13 ++-
 qa/rpc-tests/test_framework/blocktools.py     |   6 +-
 qa/rpc-tests/test_framework/comptool.py       |  17 ++-
 qa/rpc-tests/test_framework/coverage.py       |   7 +-
 qa/rpc-tests/test_framework/mininode.py       |  77 +++++++------
 qa/rpc-tests/test_framework/netutil.py        |   4 +-
 qa/rpc-tests/test_framework/script.py         |  11 +-
 qa/rpc-tests/test_framework/socks5.py         |   9 +-
 qa/rpc-tests/test_framework/test_framework.py |   8 +-
 qa/rpc-tests/test_framework/util.py           |  21 ++--
 qa/rpc-tests/txn_clone.py                     |   4 +-
 qa/rpc-tests/txn_doublespend.py               |   4 +-
 qa/rpc-tests/wallet.py                        |   8 +-
 qa/rpc-tests/walletbackup.py                  |   4 +-
 qa/rpc-tests/zapwallettxes.py                 |   6 +-
 qa/rpc-tests/zmq_test.py                      |  17 +--
 72 files changed, 504 insertions(+), 547 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 2f3ea4e76f859..fd70d3ab52d7c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -37,15 +37,15 @@ matrix:
     - compiler: ": ARM"
       env: HOST=arm-linux-gnueabihf PACKAGES="g++-arm-linux-gnueabihf" DEP_OPTS="NO_QT=1" CHECK_DOC=1 GOAL="install" BITCOIN_CONFIG="--enable-glibc-back-compat --enable-reduce-exports"
     - compiler: ": Win32"
-      env: HOST=i686-w64-mingw32 DPKG_ADD_ARCH="i386" DEP_OPTS="NO_QT=1" PACKAGES="nsis g++-mingw-w64-i686 wine1.6 bc" RUN_TESTS=true GOAL="install" BITCOIN_CONFIG="--enable-reduce-exports"
+      env: HOST=i686-w64-mingw32 DPKG_ADD_ARCH="i386" DEP_OPTS="NO_QT=1" PACKAGES="python3 nsis g++-mingw-w64-i686 wine1.6 bc" RUN_TESTS=true GOAL="install" BITCOIN_CONFIG="--enable-reduce-exports"
     - compiler: ": 32-bit + dash"
-      env: HOST=i686-pc-linux-gnu PACKAGES="g++-multilib bc python-zmq" DEP_OPTS="NO_QT=1" RUN_TESTS=true GOAL="install" BITCOIN_CONFIG="--enable-zmq --enable-glibc-back-compat --enable-reduce-exports LDFLAGS=-static-libstdc++" USE_SHELL="/bin/dash"
+      env: HOST=i686-pc-linux-gnu PACKAGES="g++-multilib bc python3-zmq" DEP_OPTS="NO_QT=1" RUN_TESTS=true GOAL="install" BITCOIN_CONFIG="--enable-zmq --enable-glibc-back-compat --enable-reduce-exports LDFLAGS=-static-libstdc++" USE_SHELL="/bin/dash"
     - compiler: ": Win64"
-      env: HOST=x86_64-w64-mingw32 DPKG_ADD_ARCH="i386" DEP_OPTS="NO_QT=1" PACKAGES="nsis g++-mingw-w64-x86-64 wine1.6 bc" RUN_TESTS=true GOAL="install" BITCOIN_CONFIG="--enable-reduce-exports"
+      env: HOST=x86_64-w64-mingw32 DPKG_ADD_ARCH="i386" DEP_OPTS="NO_QT=1" PACKAGES="python3 nsis g++-mingw-w64-x86-64 wine1.6 bc" RUN_TESTS=true GOAL="install" BITCOIN_CONFIG="--enable-reduce-exports"
     - compiler: ": bitcoind"
-      env: HOST=x86_64-unknown-linux-gnu PACKAGES="bc python-zmq" DEP_OPTS="NO_QT=1 NO_UPNP=1 DEBUG=1" RUN_TESTS=true GOAL="install" BITCOIN_CONFIG="--enable-zmq --enable-glibc-back-compat --enable-reduce-exports CPPFLAGS=-DDEBUG_LOCKORDER"
+      env: HOST=x86_64-unknown-linux-gnu PACKAGES="bc python3-zmq" DEP_OPTS="NO_QT=1 NO_UPNP=1 DEBUG=1" RUN_TESTS=true GOAL="install" BITCOIN_CONFIG="--enable-zmq --enable-glibc-back-compat --enable-reduce-exports CPPFLAGS=-DDEBUG_LOCKORDER"
     - compiler: ": No wallet"
-      env: HOST=x86_64-unknown-linux-gnu DEP_OPTS="NO_WALLET=1" RUN_TESTS=true GOAL="install" BITCOIN_CONFIG="--enable-glibc-back-compat --enable-reduce-exports"
+      env: HOST=x86_64-unknown-linux-gnu PACKAGES="python3" DEP_OPTS="NO_WALLET=1" RUN_TESTS=true GOAL="install" BITCOIN_CONFIG="--enable-glibc-back-compat --enable-reduce-exports"
     - compiler: ": Cross-Mac"
       env: HOST=x86_64-apple-darwin11 PACKAGES="cmake imagemagick libcap-dev librsvg2-bin libz-dev libbz2-dev libtiff-tools python-dev" BITCOIN_CONFIG="--enable-reduce-exports" OSX_SDK=10.9 GOAL="deploy"
   exclude:
diff --git a/doc/zmq.md b/doc/zmq.md
index 8d795a388a9b4..6079e3254f783 100644
--- a/doc/zmq.md
+++ b/doc/zmq.md
@@ -38,7 +38,7 @@ newer. Typically, it is packaged by distributions as something like
 *libzmq3-dev*. The C++ wrapper for ZeroMQ is *not* needed.
 
 In order to run the example Python client scripts in contrib/ one must
-also install *python-zmq*, though this is not necessary for daemon
+also install *python3-zmq*, though this is not necessary for daemon
 operation.
 
 ## Enabling
diff --git a/qa/README.md b/qa/README.md
index 2b476c4d8d93f..3e0a526d1306f 100644
--- a/qa/README.md
+++ b/qa/README.md
@@ -11,9 +11,9 @@ Before running the tests, the following must be installed.
 
 Unix
 ----
-The python-zmq library is required. On Ubuntu or Debian it can be installed via: 
+The python3-zmq library is required. On Ubuntu or Debian it can be installed via:
 ```
-sudo apt-get install python-zmq
+sudo apt-get install python3-zmq
 ```
 
 Running tests
diff --git a/qa/pull-tester/rpc-tests.py b/qa/pull-tester/rpc-tests.py
index 26142c35e9992..15153b7f586fc 100755
--- a/qa/pull-tester/rpc-tests.py
+++ b/qa/pull-tester/rpc-tests.py
@@ -1,5 +1,5 @@
-#!/usr/bin/env python2
-# Copyright (c) 2014-2015 The Bitcoin Core developers
+#!/usr/bin/env python3
+# Copyright (c) 2014-2016 The Bitcoin Core developers
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
@@ -70,14 +70,14 @@
 if EXEEXT == ".exe" and "-win" not in opts:
     # https://github.com/bitcoin/bitcoin/commit/d52802551752140cf41f0d9a225a43e84404d3e9
     # https://github.com/bitcoin/bitcoin/pull/5677#issuecomment-136646964
-    print "Win tests currently disabled by default.  Use -win option to enable"
+    print("Win tests currently disabled by default.  Use -win option to enable")
     sys.exit(0)
 
 if not (ENABLE_WALLET == 1 and ENABLE_UTILS == 1 and ENABLE_BITCOIND == 1):
-    print "No rpc tests to run. Wallet, utils, and bitcoind must all be enabled"
+    print("No rpc tests to run. Wallet, utils, and bitcoind must all be enabled")
     sys.exit(0)
 
-# python-zmq may not be installed. Handle this gracefully and with some helpful info
+# python3-zmq may not be installed. Handle this gracefully and with some helpful info
 if ENABLE_ZMQ:
     try:
         import zmq
diff --git a/qa/pull-tester/tests_config.py.in b/qa/pull-tester/tests_config.py.in
index 937b4231f12f8..2356b5200ebfe 100644
--- a/qa/pull-tester/tests_config.py.in
+++ b/qa/pull-tester/tests_config.py.in
@@ -1,5 +1,5 @@
-#!/usr/bin/env python2
-# Copyright (c) 2013-2014 The Bitcoin Core developers
+#!/usr/bin/env python3
+# Copyright (c) 2013-2016 The Bitcoin Core developers
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
@@ -11,5 +11,3 @@ EXEEXT="@EXEEXT@"
 @BUILD_BITCOIN_UTILS_TRUE@ENABLE_UTILS=1
 @BUILD_BITCOIND_TRUE@ENABLE_BITCOIND=1
 @ENABLE_ZMQ_TRUE@ENABLE_ZMQ=1
-
-
diff --git a/qa/rpc-tests/abandonconflict.py b/qa/rpc-tests/abandonconflict.py
index a83aa97fcd806..b6c4b9db48fbf 100755
--- a/qa/rpc-tests/abandonconflict.py
+++ b/qa/rpc-tests/abandonconflict.py
@@ -1,15 +1,12 @@
-#!/usr/bin/env python2
-# Copyright (c) 2014-2015 The Bitcoin Core developers
+#!/usr/bin/env python3
+# Copyright (c) 2014-2016 The Bitcoin Core developers
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 
 from test_framework.test_framework import BitcoinTestFramework
 from test_framework.util import *
-try:
-    import urllib.parse as urlparse
-except ImportError:
-    import urlparse
+import urllib.parse
 
 class AbandonConflictTest(BitcoinTestFramework):
 
@@ -34,7 +31,7 @@ def run_test(self):
         assert(balance - newbalance < Decimal("0.001")) #no more than fees lost
         balance = newbalance
 
-        url = urlparse.urlparse(self.nodes[1].url)
+        url = urllib.parse.urlparse(self.nodes[1].url)
         self.nodes[0].disconnectnode(url.hostname+":"+str(p2p_port(1)))
 
         # Identify the 10btc outputs
@@ -151,9 +148,9 @@ def run_test(self):
         self.nodes[0].invalidateblock(self.nodes[0].getbestblockhash())
         newbalance = self.nodes[0].getbalance()
         #assert(newbalance == balance - Decimal("10"))
-        print "If balance has not declined after invalidateblock then out of mempool wallet tx which is no longer"
-        print "conflicted has not resumed causing its inputs to be seen as spent.  See Issue #7315"
-        print balance , " -> " , newbalance , " ?"
+        print("If balance has not declined after invalidateblock then out of mempool wallet tx which is no longer")
+        print("conflicted has not resumed causing its inputs to be seen as spent.  See Issue #7315")
+        print(str(balance) + " -> " + str(newbalance) + " ?")
 
 if __name__ == '__main__':
     AbandonConflictTest().main()
diff --git a/qa/rpc-tests/bip65-cltv-p2p.py b/qa/rpc-tests/bip65-cltv-p2p.py
index 99d74344aef95..60923b9dda90a 100755
--- a/qa/rpc-tests/bip65-cltv-p2p.py
+++ b/qa/rpc-tests/bip65-cltv-p2p.py
@@ -1,8 +1,7 @@
-#!/usr/bin/env python2
-# Copyright (c) 2015 The Bitcoin Core developers
-# Distributed under the MIT/X11 software license, see the accompanying
+#!/usr/bin/env python3
+# Copyright (c) 2015-2016 The Bitcoin Core developers
+# Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
-#
 
 from test_framework.test_framework import ComparisonTestFramework
 from test_framework.util import *
@@ -67,13 +66,13 @@ def get_tests(self):
 
         self.coinbase_blocks = self.nodes[0].generate(2)
         height = 3  # height of the next block to build
-        self.tip = int ("0x" + self.nodes[0].getbestblockhash() + "L", 0)
+        self.tip = int("0x" + self.nodes[0].getbestblockhash(), 0)
         self.nodeaddress = self.nodes[0].getnewaddress()
         self.last_block_time = int(time.time())
 
         ''' 98 more version 3 blocks '''
         test_blocks = []
-        for i in xrange(98):
+        for i in range(98):
             block = create_block(self.tip, create_coinbase(height), self.last_block_time + 1)
             block.nVersion = 3
             block.rehash()
@@ -86,7 +85,7 @@ def get_tests(self):
 
         ''' Mine 749 version 4 blocks '''
         test_blocks = []
-        for i in xrange(749):
+        for i in range(749):
             block = create_block(self.tip, create_coinbase(height), self.last_block_time + 1)
             block.nVersion = 4
             block.rehash()
@@ -138,7 +137,7 @@ def get_tests(self):
 
         ''' Mine 199 new version blocks on last valid tip '''
         test_blocks = []
-        for i in xrange(199):
+        for i in range(199):
             block = create_block(self.tip, create_coinbase(height), self.last_block_time + 1)
             block.nVersion = 4
             block.rehash()
diff --git a/qa/rpc-tests/bip65-cltv.py b/qa/rpc-tests/bip65-cltv.py
index f666a07c9b769..9d83fc947b166 100755
--- a/qa/rpc-tests/bip65-cltv.py
+++ b/qa/rpc-tests/bip65-cltv.py
@@ -1,5 +1,5 @@
-#!/usr/bin/env python2
-# Copyright (c) 2015 The Bitcoin Core developers
+#!/usr/bin/env python3
+# Copyright (c) 2015-2016 The Bitcoin Core developers
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
@@ -32,7 +32,7 @@ def run_test(self):
             raise AssertionError("Failed to mine 100 version=3 blocks")
 
         # Mine 750 new-version blocks
-        for i in xrange(15):
+        for i in range(15):
             self.nodes[2].generate(50)
         self.sync_all()
         if (self.nodes[0].getblockcount() != cnt + 850):
@@ -49,7 +49,7 @@ def run_test(self):
         # TODO: check that new CHECKLOCKTIMEVERIFY rules are enforced
 
         # Mine 198 new-version blocks
-        for i in xrange(2):
+        for i in range(2):
             self.nodes[2].generate(99)
         self.sync_all()
         if (self.nodes[0].getblockcount() != cnt + 1049):
diff --git a/qa/rpc-tests/bip68-112-113-p2p.py b/qa/rpc-tests/bip68-112-113-p2p.py
index 3bcfdabe269a1..eedb60e3a0958 100755
--- a/qa/rpc-tests/bip68-112-113-p2p.py
+++ b/qa/rpc-tests/bip68-112-113-p2p.py
@@ -1,8 +1,7 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python3
 # Copyright (c) 2015 The Bitcoin Core developers
-# Distributed under the MIT/X11 software license, see the accompanying
+# Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
-#
 
 from test_framework.test_framework import ComparisonTestFramework
 from test_framework.util import *
@@ -63,13 +62,13 @@
 # b31,b25,b22,b18 represent the 31st, 25th, 22nd and 18th bits respectively in the nSequence field
 # relative_locktimes[b31][b25][b22][b18] is a base_relative_locktime with the indicated bits set if their indices are 1
 relative_locktimes = []
-for b31 in xrange(2):
+for b31 in range(2):
     b25times = []
-    for b25 in xrange(2):
+    for b25 in range(2):
         b22times = []
-        for b22 in xrange(2):
+        for b22 in range(2):
             b18times = []
-            for b18 in xrange(2):
+            for b18 in range(2):
                 rlt = base_relative_locktime
                 if (b31):
                     rlt = rlt | seq_disable_flag
@@ -86,10 +85,10 @@
 
 def all_rlt_txs(txarray):
     txs = []
-    for b31 in xrange(2):
-        for b25 in xrange(2):
-            for b22 in xrange(2):
-                for b18 in xrange(2):
+    for b31 in range(2):
+        for b25 in range(2):
+            for b22 in range(2):
+                for b18 in range(2):
                     txs.append(txarray[b31][b25][b22][b18])
     return txs
 
@@ -131,7 +130,7 @@ def sign_transaction(self, node, unsignedtx):
         return tx
 
     def generate_blocks(self, number, version, test_blocks = []):
-        for i in xrange(number):
+        for i in range(number):
             block = self.create_test_block([], version)
             test_blocks.append([block, True])
             self.last_block_time += 600
@@ -152,13 +151,13 @@ def create_bip68txs(self, bip68inputs, txversion, locktime_delta = 0):
         txs = []
         assert(len(bip68inputs) >= 16)
         i = 0
-        for b31 in xrange(2):
+        for b31 in range(2):
             b25txs = []
-            for b25 in xrange(2):
+            for b25 in range(2):
                 b22txs = []
-                for b22 in xrange(2):
+                for b22 in range(2):
                     b18txs = []
-                    for b18 in xrange(2):
+                    for b18 in range(2):
                         tx =  self.create_transaction(self.nodes[0], bip68inputs[i], self.nodeaddress, Decimal("49.98"))
                         i += 1
                         tx.nVersion = txversion
@@ -180,13 +179,13 @@ def create_bip112txs(self, bip112inputs, varyOP_CSV, txversion, locktime_delta =
         txs = []
         assert(len(bip112inputs) >= 16)
         i = 0
-        for b31 in xrange(2):
+        for b31 in range(2):
             b25txs = []
-            for b25 in xrange(2):
+            for b25 in range(2):
                 b22txs = []
-                for b22 in xrange(2):
+                for b22 in range(2):
                     b18txs = []
-                    for b18 in xrange(2):
+                    for b18 in range(2):
                         tx =  self.create_transaction(self.nodes[0], bip112inputs[i], self.nodeaddress, Decimal("49.98"))
                         i += 1
                         if (varyOP_CSV): # if varying OP_CSV, nSequence is fixed
@@ -212,7 +211,7 @@ def get_tests(self):
         self.nodes[0].setmocktime(0) # set time back to present so yielded blocks aren't in the future as we advance last_block_time
         self.tipheight = 82 # height of the next block to build
         self.last_block_time = long_past_time
-        self.tip = int ("0x" + self.nodes[0].getbestblockhash() + "L", 0)
+        self.tip = int("0x" + self.nodes[0].getbestblockhash(), 0)
         self.nodeaddress = self.nodes[0].getnewaddress()
 
         assert_equal(get_bip9_status(self.nodes[0], 'csv')['status'], 'defined')
@@ -250,20 +249,20 @@ def get_tests(self):
         # Note we reuse inputs for v1 and v2 txs so must test these separately
         # 16 normal inputs
         bip68inputs = []
-        for i in xrange(16):
+        for i in range(16):
             bip68inputs.append(self.send_generic_input_tx(self.nodes[0], self.coinbase_blocks))
         # 2 sets of 16 inputs with 10 OP_CSV OP_DROP (actually will be prepended to spending scriptSig)
         bip112basicinputs = []
-        for j in xrange(2):
+        for j in range(2):
             inputs = []
-            for i in xrange(16):
+            for i in range(16):
                 inputs.append(self.send_generic_input_tx(self.nodes[0], self.coinbase_blocks))
             bip112basicinputs.append(inputs)
         # 2 sets of 16 varied inputs with (relative_lock_time) OP_CSV OP_DROP (actually will be prepended to spending scriptSig)
         bip112diverseinputs = []
-        for j in xrange(2):
+        for j in range(2):
             inputs = []
-            for i in xrange(16):
+            for i in range(16):
                 inputs.append(self.send_generic_input_tx(self.nodes[0], self.coinbase_blocks))
             bip112diverseinputs.append(inputs)
         # 1 special input with -1 OP_CSV OP_DROP (actually will be prepended to spending scriptSig)
@@ -274,7 +273,7 @@ def get_tests(self):
         self.nodes[0].setmocktime(self.last_block_time + 600)
         inputblockhash = self.nodes[0].generate(1)[0] # 1 block generated for inputs to be in chain at height 572
         self.nodes[0].setmocktime(0)
-        self.tip = int("0x" + inputblockhash + "L", 0)
+        self.tip = int("0x" + inputblockhash, 0)
         self.tipheight += 1
         self.last_block_time += 600
         assert_equal(len(self.nodes[0].getblock(inputblockhash,True)["tx"]), 82+1)
@@ -398,22 +397,22 @@ def get_tests(self):
         ### Version 2 txs ###
         bip68success_txs = []
         # All txs with SEQUENCE_LOCKTIME_DISABLE_FLAG set pass
-        for b25 in xrange(2):
-            for b22 in xrange(2):
-                for b18 in xrange(2):
+        for b25 in range(2):
+            for b22 in range(2):
+                for b18 in range(2):
                     bip68success_txs.append(bip68txs_v2[1][b25][b22][b18])
         yield TestInstance([[self.create_test_block(bip68success_txs), True]]) # 15
         self.nodes[0].invalidateblock(self.nodes[0].getbestblockhash())
         # All txs without flag fail as we are at delta height = 8 < 10 and delta time = 8 * 600 < 10 * 512
         bip68timetxs = []
-        for b25 in xrange(2):
-            for b18 in xrange(2):
+        for b25 in range(2):
+            for b18 in range(2):
                 bip68timetxs.append(bip68txs_v2[0][b25][1][b18])
         for tx in bip68timetxs:
             yield TestInstance([[self.create_test_block([tx]), False]]) # 16 - 19
         bip68heighttxs = []
-        for b25 in xrange(2):
-            for b18 in xrange(2):
+        for b25 in range(2):
+            for b18 in range(2):
                 bip68heighttxs.append(bip68txs_v2[0][b25][0][b18])
         for tx in bip68heighttxs:
             yield TestInstance([[self.create_test_block([tx]), False]]) # 20 - 23
@@ -445,9 +444,9 @@ def get_tests(self):
         yield TestInstance([[self.create_test_block([bip112tx_special_v1]), False]]) #32
         # If SEQUENCE_LOCKTIME_DISABLE_FLAG is set in argument to OP_CSV, version 1 txs should still pass
         success_txs = []
-        for b25 in xrange(2):
-            for b22 in xrange(2):
-                for b18 in xrange(2):
+        for b25 in range(2):
+            for b22 in range(2):
+                for b18 in range(2):
                     success_txs.append(bip112txs_vary_OP_CSV_v1[1][b25][b22][b18])
                     success_txs.append(bip112txs_vary_OP_CSV_9_v1[1][b25][b22][b18])
         yield TestInstance([[self.create_test_block(success_txs), True]]) # 33
@@ -457,9 +456,9 @@ def get_tests(self):
         fail_txs = []
         fail_txs.extend(all_rlt_txs(bip112txs_vary_nSequence_v1))
         fail_txs.extend(all_rlt_txs(bip112txs_vary_nSequence_9_v1))
-        for b25 in xrange(2):
-            for b22 in xrange(2):
-                for b18 in xrange(2):
+        for b25 in range(2):
+            for b22 in range(2):
+                for b18 in range(2):
                     fail_txs.append(bip112txs_vary_OP_CSV_v1[0][b25][b22][b18])
                     fail_txs.append(bip112txs_vary_OP_CSV_9_v1[0][b25][b22][b18])
 
@@ -472,9 +471,9 @@ def get_tests(self):
 
         # If SEQUENCE_LOCKTIME_DISABLE_FLAG is set in argument to OP_CSV, version 2 txs should pass (all sequence locks are met)
         success_txs = []
-        for b25 in xrange(2):
-            for b22 in xrange(2):
-                for b18 in xrange(2):
+        for b25 in range(2):
+            for b22 in range(2):
+                for b18 in range(2):
                     success_txs.append(bip112txs_vary_OP_CSV_v2[1][b25][b22][b18]) # 8/16 of vary_OP_CSV
                     success_txs.append(bip112txs_vary_OP_CSV_9_v2[1][b25][b22][b18]) # 8/16 of vary_OP_CSV_9
 
@@ -485,9 +484,9 @@ def get_tests(self):
         # All txs with nSequence 9 should fail either due to earlier mismatch or failing the CSV check
         fail_txs = []
         fail_txs.extend(all_rlt_txs(bip112txs_vary_nSequence_9_v2)) # 16/16 of vary_nSequence_9
-        for b25 in xrange(2):
-            for b22 in xrange(2):
-                for b18 in xrange(2):
+        for b25 in range(2):
+            for b22 in range(2):
+                for b18 in range(2):
                     fail_txs.append(bip112txs_vary_OP_CSV_9_v2[0][b25][b22][b18]) # 16/16 of vary_OP_CSV_9
 
         for tx in fail_txs:
@@ -495,17 +494,17 @@ def get_tests(self):
 
         # If SEQUENCE_LOCKTIME_DISABLE_FLAG is set in nSequence, tx should fail
         fail_txs = []
-        for b25 in xrange(2):
-            for b22 in xrange(2):
-                for b18 in xrange(2):
+        for b25 in range(2):
+            for b22 in range(2):
+                for b18 in range(2):
                     fail_txs.append(bip112txs_vary_nSequence_v2[1][b25][b22][b18]) # 8/16 of vary_nSequence
         for tx in fail_txs:
             yield TestInstance([[self.create_test_block([tx]), False]]) # 108-115
 
         # If sequencelock types mismatch, tx should fail
         fail_txs = []
-        for b25 in xrange(2):
-            for b18 in xrange(2):
+        for b25 in range(2):
+            for b18 in range(2):
                 fail_txs.append(bip112txs_vary_nSequence_v2[0][b25][1][b18]) # 12/16 of vary_nSequence
                 fail_txs.append(bip112txs_vary_OP_CSV_v2[0][b25][1][b18]) # 12/16 of vary_OP_CSV
         for tx in fail_txs:
@@ -513,8 +512,8 @@ def get_tests(self):
 
         # Remaining txs should pass, just test masking works properly
         success_txs = []
-        for b25 in xrange(2):
-            for b18 in xrange(2):
+        for b25 in range(2):
+            for b18 in range(2):
                 success_txs.append(bip112txs_vary_nSequence_v2[0][b25][0][b18]) # 16/16 of vary_nSequence
                 success_txs.append(bip112txs_vary_OP_CSV_v2[0][b25][0][b18]) # 16/16 of vary_OP_CSV
         yield TestInstance([[self.create_test_block(success_txs), True]]) # 124
@@ -522,8 +521,8 @@ def get_tests(self):
 
         # Additional test, of checking that comparison of two time types works properly
         time_txs = []
-        for b25 in xrange(2):
-            for b18 in xrange(2):
+        for b25 in range(2):
+            for b18 in range(2):
                 tx = bip112txs_vary_OP_CSV_v2[0][b25][1][b18]
                 tx.vin[0].nSequence = base_relative_locktime | seq_type_flag
                 signtx = self.sign_transaction(self.nodes[0], tx)
diff --git a/qa/rpc-tests/bip68-sequence.py b/qa/rpc-tests/bip68-sequence.py
index 33e05dfc51a09..717f7562cdee2 100755
--- a/qa/rpc-tests/bip68-sequence.py
+++ b/qa/rpc-tests/bip68-sequence.py
@@ -1,5 +1,5 @@
-#!/usr/bin/env python2
-# Copyright (c) 2014-2015 The Bitcoin Core developers
+#!/usr/bin/env python3
+# Copyright (c) 2014-2016 The Bitcoin Core developers
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
@@ -35,28 +35,28 @@ def run_test(self):
         # Generate some coins
         self.nodes[0].generate(110)
 
-        print "Running test disable flag"
+        print("Running test disable flag")
         self.test_disable_flag()
 
-        print "Running test sequence-lock-confirmed-inputs"
+        print("Running test sequence-lock-confirmed-inputs")
         self.test_sequence_lock_confirmed_inputs()
 
-        print "Running test sequence-lock-unconfirmed-inputs"
+        print("Running test sequence-lock-unconfirmed-inputs")
         self.test_sequence_lock_unconfirmed_inputs()
 
-        print "Running test BIP68 not consensus before versionbits activation"
+        print("Running test BIP68 not consensus before versionbits activation")
         self.test_bip68_not_consensus()
 
-        print "Verifying nVersion=2 transactions aren't standard"
+        print("Verifying nVersion=2 transactions aren't standard")
         self.test_version2_relay(before_activation=True)
 
-        print "Activating BIP68 (and 112/113)"
+        print("Activating BIP68 (and 112/113)")
         self.activateCSV()
 
-        print "Verifying nVersion=2 transactions are now standard"
+        print("Verifying nVersion=2 transactions are now standard")
         self.test_version2_relay(before_activation=False)
 
-        print "Passed\n"
+        print("Passed\n")
 
     # Test that BIP68 is not in effect if tx version is 1, or if
     # the first sequence bit is set.
@@ -125,7 +125,7 @@ def test_sequence_lock_confirmed_inputs(self):
             random.shuffle(addresses)
             num_outputs = random.randint(1, max_outputs)
             outputs = {}
-            for i in xrange(num_outputs):
+            for i in range(num_outputs):
                 outputs[addresses[i]] = random.randint(1, 20)*0.01
             self.nodes[0].sendmany("", outputs)
             self.nodes[0].generate(1)
@@ -137,7 +137,7 @@ def test_sequence_lock_confirmed_inputs(self):
         # some of those inputs to be sequence locked (and randomly choose
         # between height/time locking). Small random chance of making the locks
         # all pass.
-        for i in xrange(400):
+        for i in range(400):
             # Randomly choose up to 10 inputs
             num_inputs = random.randint(1, 10)
             random.shuffle(utxos)
@@ -151,7 +151,7 @@ def test_sequence_lock_confirmed_inputs(self):
             tx = CTransaction()
             tx.nVersion = 2
             value = 0
-            for j in xrange(num_inputs):
+            for j in range(num_inputs):
                 sequence_value = 0xfffffffe # this disables sequence locks
 
                 # 50% chance we enable sequence locks
@@ -259,7 +259,7 @@ def test_nonzero_locks(orig_tx, node, relayfee, use_height_lock):
         # Use prioritisetransaction to lower the effective feerate to 0
         self.nodes[0].prioritisetransaction(tx2.hash, -1e15, int(-self.relayfee*COIN))
         cur_time = int(time.time())
-        for i in xrange(10):
+        for i in range(10):
             self.nodes[0].setmocktime(cur_time + 600)
             self.nodes[0].generate(1)
             cur_time += 600
@@ -324,7 +324,7 @@ def test_nonzero_locks(orig_tx, node, relayfee, use_height_lock):
         # tx3 to be removed.
         tip = int(self.nodes[0].getblockhash(self.nodes[0].getblockcount()-1), 16)
         height = self.nodes[0].getblockcount()
-        for i in xrange(2):
+        for i in range(2):
             block = create_block(tip, create_coinbase(height), cur_time)
             block.nVersion = 3
             block.rehash()
diff --git a/qa/rpc-tests/bip9-softforks.py b/qa/rpc-tests/bip9-softforks.py
index ddca3c2e33d34..e9b659d5082d2 100755
--- a/qa/rpc-tests/bip9-softforks.py
+++ b/qa/rpc-tests/bip9-softforks.py
@@ -1,8 +1,7 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python3
 # Copyright (c) 2015 The Bitcoin Core developers
-# Distributed under the MIT/X11 software license, see the accompanying
+# Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
-#
 
 from test_framework.test_framework import ComparisonTestFramework
 from test_framework.util import *
@@ -64,7 +63,7 @@ def sign_transaction(self, node, tx):
         return tx
 
     def generate_blocks(self, number, version, test_blocks = []):
-        for i in xrange(number):
+        for i in range(number):
             block = create_block(self.tip, create_coinbase(self.height), self.last_block_time + 1)
             block.nVersion = version
             block.rehash()
@@ -83,7 +82,7 @@ def test_BIP(self, bipName, activated_version, invalidate, invalidatePostSignatu
         # generate some coins for later
         self.coinbase_blocks = self.nodes[0].generate(2)
         self.height = 3  # height of the next block to build
-        self.tip = int ("0x" + self.nodes[0].getbestblockhash() + "L", 0)
+        self.tip = int("0x" + self.nodes[0].getbestblockhash(), 0)
         self.nodeaddress = self.nodes[0].getnewaddress()
         self.last_block_time = int(time.time())
 
diff --git a/qa/rpc-tests/bipdersig-p2p.py b/qa/rpc-tests/bipdersig-p2p.py
index bba86a50c4c56..c4627308400b8 100755
--- a/qa/rpc-tests/bipdersig-p2p.py
+++ b/qa/rpc-tests/bipdersig-p2p.py
@@ -1,8 +1,7 @@
-#!/usr/bin/env python2
-# Copyright (c) 2015 The Bitcoin Core developers
-# Distributed under the MIT/X11 software license, see the accompanying
+#!/usr/bin/env python3
+# Copyright (c) 2015-2016 The Bitcoin Core developers
+# Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
-#
 
 from test_framework.test_framework import ComparisonTestFramework
 from test_framework.util import *
@@ -75,13 +74,13 @@ def get_tests(self):
 
         self.coinbase_blocks = self.nodes[0].generate(2)
         height = 3  # height of the next block to build
-        self.tip = int ("0x" + self.nodes[0].getbestblockhash() + "L", 0)
+        self.tip = int("0x" + self.nodes[0].getbestblockhash(), 0)
         self.nodeaddress = self.nodes[0].getnewaddress()
         self.last_block_time = int(time.time())
 
         ''' 98 more version 2 blocks '''
         test_blocks = []
-        for i in xrange(98):
+        for i in range(98):
             block = create_block(self.tip, create_coinbase(height), self.last_block_time + 1)
             block.nVersion = 2
             block.rehash()
@@ -94,7 +93,7 @@ def get_tests(self):
 
         ''' Mine 749 version 3 blocks '''
         test_blocks = []
-        for i in xrange(749):
+        for i in range(749):
             block = create_block(self.tip, create_coinbase(height), self.last_block_time + 1)
             block.nVersion = 3
             block.rehash()
@@ -146,7 +145,7 @@ def get_tests(self):
 
         ''' Mine 199 new version blocks on last valid tip '''
         test_blocks = []
-        for i in xrange(199):
+        for i in range(199):
             block = create_block(self.tip, create_coinbase(height), self.last_block_time + 1)
             block.nVersion = 3
             block.rehash()
diff --git a/qa/rpc-tests/bipdersig.py b/qa/rpc-tests/bipdersig.py
index be9121c456831..f2d2c14a72c24 100755
--- a/qa/rpc-tests/bipdersig.py
+++ b/qa/rpc-tests/bipdersig.py
@@ -1,5 +1,5 @@
-#!/usr/bin/env python2
-# Copyright (c) 2014-2015 The Bitcoin Core developers
+#!/usr/bin/env python3
+# Copyright (c) 2014-2016 The Bitcoin Core developers
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
@@ -32,7 +32,7 @@ def run_test(self):
             raise AssertionError("Failed to mine 100 version=2 blocks")
 
         # Mine 750 new-version blocks
-        for i in xrange(15):
+        for i in range(15):
             self.nodes[2].generate(50)
         self.sync_all()
         if (self.nodes[0].getblockcount() != cnt + 850):
@@ -49,7 +49,7 @@ def run_test(self):
         # TODO: check that new DERSIG rules are enforced
 
         # Mine 198 new-version blocks
-        for i in xrange(2):
+        for i in range(2):
             self.nodes[2].generate(99)
         self.sync_all()
         if (self.nodes[0].getblockcount() != cnt + 1049):
diff --git a/qa/rpc-tests/blockchain.py b/qa/rpc-tests/blockchain.py
index 8f59ee741c366..c84047b5dd18c 100755
--- a/qa/rpc-tests/blockchain.py
+++ b/qa/rpc-tests/blockchain.py
@@ -1,5 +1,5 @@
-#!/usr/bin/env python2
-# Copyright (c) 2014-2015 The Bitcoin Core developers
+#!/usr/bin/env python3
+# Copyright (c) 2014-2016 The Bitcoin Core developers
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
@@ -51,13 +51,13 @@ def _test_gettxoutsetinfo(self):
         node = self.nodes[0]
         res = node.gettxoutsetinfo()
 
-        assert_equal(res[u'total_amount'], Decimal('8725.00000000'))
-        assert_equal(res[u'transactions'], 200)
-        assert_equal(res[u'height'], 200)
-        assert_equal(res[u'txouts'], 200)
-        assert_equal(res[u'bytes_serialized'], 13924),
-        assert_equal(len(res[u'bestblock']), 64)
-        assert_equal(len(res[u'hash_serialized']), 64)
+        assert_equal(res['total_amount'], Decimal('8725.00000000'))
+        assert_equal(res['transactions'], 200)
+        assert_equal(res['height'], 200)
+        assert_equal(res['txouts'], 200)
+        assert_equal(res['bytes_serialized'], 13924),
+        assert_equal(len(res['bestblock']), 64)
+        assert_equal(len(res['hash_serialized']), 64)
 
     def _test_getblockheader(self):
         node = self.nodes[0]
diff --git a/qa/rpc-tests/decodescript.py b/qa/rpc-tests/decodescript.py
index 578844f2c5bb0..0037542e62e02 100755
--- a/qa/rpc-tests/decodescript.py
+++ b/qa/rpc-tests/decodescript.py
@@ -1,5 +1,5 @@
-#!/usr/bin/env python2
-# Copyright (c) 2015 The Bitcoin Core developers
+#!/usr/bin/env python3
+# Copyright (c) 2015-2016 The Bitcoin Core developers
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/qa/rpc-tests/disablewallet.py b/qa/rpc-tests/disablewallet.py
index cb868029fa327..b25d2ba3352cf 100755
--- a/qa/rpc-tests/disablewallet.py
+++ b/qa/rpc-tests/disablewallet.py
@@ -1,5 +1,5 @@
-#!/usr/bin/env python2
-# Copyright (c) 2014-2015 The Bitcoin Core developers
+#!/usr/bin/env python3
+# Copyright (c) 2015-2016 The Bitcoin Core developers
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/qa/rpc-tests/forknotify.py b/qa/rpc-tests/forknotify.py
index 20e6ce961954b..421f3dd872973 100755
--- a/qa/rpc-tests/forknotify.py
+++ b/qa/rpc-tests/forknotify.py
@@ -1,5 +1,5 @@
-#!/usr/bin/env python2
-# Copyright (c) 2014-2015 The Bitcoin Core developers
+#!/usr/bin/env python3
+# Copyright (c) 2014-2016 The Bitcoin Core developers
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/qa/rpc-tests/fundrawtransaction.py b/qa/rpc-tests/fundrawtransaction.py
index 496c7fe8b0ed0..74849603f719d 100755
--- a/qa/rpc-tests/fundrawtransaction.py
+++ b/qa/rpc-tests/fundrawtransaction.py
@@ -1,5 +1,5 @@
-#!/usr/bin/env python2
-# Copyright (c) 2014-2015 The Bitcoin Core developers
+#!/usr/bin/env python3
+# Copyright (c) 2014-2016 The Bitcoin Core developers
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
@@ -10,7 +10,7 @@
 class RawTransactionsTest(BitcoinTestFramework):
 
     def setup_chain(self):
-        print("Initializing test directory "+self.options.tmpdir)
+        print(("Initializing test directory "+self.options.tmpdir))
         initialize_chain_clean(self.options.tmpdir, 4)
 
     def setup_network(self, split=False):
@@ -25,7 +25,7 @@ def setup_network(self, split=False):
         self.sync_all()
 
     def run_test(self):
-        print "Mining blocks..."
+        print("Mining blocks...")
 
         min_relay_tx_fee = self.nodes[0].getnetworkinfo()['relayfee']
         # This test is not meant to test fee estimation and we'd like
@@ -198,7 +198,7 @@ def run_test(self):
         try:
             self.nodes[2].fundrawtransaction(rawtx, {'foo': 'bar'})
             raise AssertionError("Accepted invalid option foo")
-        except JSONRPCException,e:
+        except JSONRPCException as e:
             assert("Unexpected key foo" in e.error['message'])
 
 
@@ -223,7 +223,7 @@ def run_test(self):
         try:
             self.nodes[2].fundrawtransaction(rawtx, {'changeAddress': 'foobar'})
             raise AssertionError("Accepted invalid bitcoin address")
-        except JSONRPCException,e:
+        except JSONRPCException as e:
             assert("changeAddress must be a valid bitcoin address" in e.error['message'])
 
 
diff --git a/qa/rpc-tests/getblocktemplate_longpoll.py b/qa/rpc-tests/getblocktemplate_longpoll.py
index e2a839f718924..e443347077741 100755
--- a/qa/rpc-tests/getblocktemplate_longpoll.py
+++ b/qa/rpc-tests/getblocktemplate_longpoll.py
@@ -1,5 +1,5 @@
-#!/usr/bin/env python2
-# Copyright (c) 2014-2015 The Bitcoin Core developers
+#!/usr/bin/env python3
+# Copyright (c) 2014-2016 The Bitcoin Core developers
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
@@ -27,7 +27,7 @@ class GetBlockTemplateLPTest(BitcoinTestFramework):
     '''
 
     def run_test(self):
-        print "Warning: this test will take about 70 seconds in the best case. Be patient."
+        print("Warning: this test will take about 70 seconds in the best case. Be patient.")
         self.nodes[0].generate(10)
         templat = self.nodes[0].getblocktemplate()
         longpollid = templat['longpollid']
diff --git a/qa/rpc-tests/getblocktemplate_proposals.py b/qa/rpc-tests/getblocktemplate_proposals.py
index be119031baf0b..1ad2af4c2e3ac 100755
--- a/qa/rpc-tests/getblocktemplate_proposals.py
+++ b/qa/rpc-tests/getblocktemplate_proposals.py
@@ -1,5 +1,5 @@
-#!/usr/bin/env python2
-# Copyright (c) 2014-2015 The Bitcoin Core developers
+#!/usr/bin/env python3
+# Copyright (c) 2014-2016 The Bitcoin Core developers
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
@@ -46,7 +46,7 @@ def genmrklroot(leaflist):
         cur = n
     return cur[0]
 
-def template_to_bytes(tmpl, txlist):
+def template_to_bytearray(tmpl, txlist):
     blkver = pack('<L', tmpl['version'])
     mrklroot = genmrklroot(list(dblsha(a) for a in txlist))
     timestamp = pack('<L', tmpl['curtime'])
@@ -55,10 +55,10 @@ def template_to_bytes(tmpl, txlist):
     blk += varlenEncode(len(txlist))
     for tx in txlist:
         blk += tx
-    return blk
+    return bytearray(blk)
 
 def template_to_hex(tmpl, txlist):
-    return b2x(template_to_bytes(tmpl, txlist))
+    return b2x(template_to_bytearray(tmpl, txlist))
 
 def assert_template(node, tmpl, txlist, expect):
     rsp = node.getblocktemplate({'data':template_to_hex(tmpl, txlist),'mode':'proposal'})
@@ -129,7 +129,7 @@ def run_test(self):
         tmpl['bits'] = realbits
 
         # Test 9: Bad merkle root
-        rawtmpl = template_to_bytes(tmpl, txlist)
+        rawtmpl = template_to_bytearray(tmpl, txlist)
         rawtmpl[4+32] = (rawtmpl[4+32] + 1) % 0x100
         rsp = node.getblocktemplate({'data':b2x(rawtmpl),'mode':'proposal'})
         if rsp != 'bad-txnmrklroot':
diff --git a/qa/rpc-tests/getchaintips.py b/qa/rpc-tests/getchaintips.py
index dd260836bb98a..da354b0c97a01 100755
--- a/qa/rpc-tests/getchaintips.py
+++ b/qa/rpc-tests/getchaintips.py
@@ -1,5 +1,5 @@
-#!/usr/bin/env python2
-# Copyright (c) 2014-2015 The Bitcoin Core developers
+#!/usr/bin/env python3
+# Copyright (c) 2014-2016 The Bitcoin Core developers
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/qa/rpc-tests/httpbasics.py b/qa/rpc-tests/httpbasics.py
index cf37976a4ed85..c62edc8e130cc 100755
--- a/qa/rpc-tests/httpbasics.py
+++ b/qa/rpc-tests/httpbasics.py
@@ -1,5 +1,5 @@
-#!/usr/bin/env python2
-# Copyright (c) 2014-2015 The Bitcoin Core developers
+#!/usr/bin/env python3
+# Copyright (c) 2014-2016 The Bitcoin Core developers
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
@@ -10,14 +10,8 @@
 from test_framework.test_framework import BitcoinTestFramework
 from test_framework.util import *
 
-try:
-    import http.client as httplib
-except ImportError:
-    import httplib
-try:
-    import urllib.parse as urlparse
-except ImportError:
-    import urlparse
+import http.client
+import urllib.parse
 
 class HTTPBasicsTest (BitcoinTestFramework):
     def setup_nodes(self):
@@ -28,11 +22,11 @@ def run_test(self):
         #################################################
         # lowlevel check for http persistent connection #
         #################################################
-        url = urlparse.urlparse(self.nodes[0].url)
+        url = urllib.parse.urlparse(self.nodes[0].url)
         authpair = url.username + ':' + url.password
         headers = {"Authorization": "Basic " + str_to_b64str(authpair)}
 
-        conn = httplib.HTTPConnection(url.hostname, url.port)
+        conn = http.client.HTTPConnection(url.hostname, url.port)
         conn.connect()
         conn.request('POST', '/', '{"method": "getbestblockhash"}', headers)
         out1 = conn.getresponse().read()
@@ -49,7 +43,7 @@ def run_test(self):
         #same should be if we add keep-alive because this should be the std. behaviour
         headers = {"Authorization": "Basic " + str_to_b64str(authpair), "Connection": "keep-alive"}
 
-        conn = httplib.HTTPConnection(url.hostname, url.port)
+        conn = http.client.HTTPConnection(url.hostname, url.port)
         conn.connect()
         conn.request('POST', '/', '{"method": "getbestblockhash"}', headers)
         out1 = conn.getresponse().read()
@@ -66,7 +60,7 @@ def run_test(self):
         #now do the same with "Connection: close"
         headers = {"Authorization": "Basic " + str_to_b64str(authpair), "Connection":"close"}
 
-        conn = httplib.HTTPConnection(url.hostname, url.port)
+        conn = http.client.HTTPConnection(url.hostname, url.port)
         conn.connect()
         conn.request('POST', '/', '{"method": "getbestblockhash"}', headers)
         out1 = conn.getresponse().read()
@@ -74,22 +68,22 @@ def run_test(self):
         assert(conn.sock==None) #now the connection must be closed after the response
 
         #node1 (2nd node) is running with disabled keep-alive option
-        urlNode1 = urlparse.urlparse(self.nodes[1].url)
+        urlNode1 = urllib.parse.urlparse(self.nodes[1].url)
         authpair = urlNode1.username + ':' + urlNode1.password
         headers = {"Authorization": "Basic " + str_to_b64str(authpair)}
 
-        conn = httplib.HTTPConnection(urlNode1.hostname, urlNode1.port)
+        conn = http.client.HTTPConnection(urlNode1.hostname, urlNode1.port)
         conn.connect()
         conn.request('POST', '/', '{"method": "getbestblockhash"}', headers)
         out1 = conn.getresponse().read()
         assert(b'"error":null' in out1)
 
         #node2 (third node) is running with standard keep-alive parameters which means keep-alive is on
-        urlNode2 = urlparse.urlparse(self.nodes[2].url)
+        urlNode2 = urllib.parse.urlparse(self.nodes[2].url)
         authpair = urlNode2.username + ':' + urlNode2.password
         headers = {"Authorization": "Basic " + str_to_b64str(authpair)}
 
-        conn = httplib.HTTPConnection(urlNode2.hostname, urlNode2.port)
+        conn = http.client.HTTPConnection(urlNode2.hostname, urlNode2.port)
         conn.connect()
         conn.request('POST', '/', '{"method": "getbestblockhash"}', headers)
         out1 = conn.getresponse().read()
@@ -97,17 +91,17 @@ def run_test(self):
         assert(conn.sock!=None) #connection must be closed because bitcoind should use keep-alive by default
 
         # Check excessive request size
-        conn = httplib.HTTPConnection(urlNode2.hostname, urlNode2.port)
+        conn = http.client.HTTPConnection(urlNode2.hostname, urlNode2.port)
         conn.connect()
         conn.request('GET', '/' + ('x'*1000), '', headers)
         out1 = conn.getresponse()
-        assert_equal(out1.status, httplib.NOT_FOUND)
+        assert_equal(out1.status, http.client.NOT_FOUND)
 
-        conn = httplib.HTTPConnection(urlNode2.hostname, urlNode2.port)
+        conn = http.client.HTTPConnection(urlNode2.hostname, urlNode2.port)
         conn.connect()
         conn.request('GET', '/' + ('x'*10000), '', headers)
         out1 = conn.getresponse()
-        assert_equal(out1.status, httplib.BAD_REQUEST)
+        assert_equal(out1.status, http.client.BAD_REQUEST)
 
 
 if __name__ == '__main__':
diff --git a/qa/rpc-tests/importprunedfunds.py b/qa/rpc-tests/importprunedfunds.py
index a9324196ee488..def1d891c3614 100755
--- a/qa/rpc-tests/importprunedfunds.py
+++ b/qa/rpc-tests/importprunedfunds.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python3
 # Copyright (c) 2014-2016 The Bitcoin Core developers
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
@@ -23,7 +23,7 @@ def run_test (self):
         import time
         begintime = int(time.time())
 
-        print "Mining blocks..."
+        print("Mining blocks...")
         self.nodes[0].generate(101)
 
         # sync
diff --git a/qa/rpc-tests/invalidateblock.py b/qa/rpc-tests/invalidateblock.py
index 0e78a3c806f84..2e3a449f5e781 100755
--- a/qa/rpc-tests/invalidateblock.py
+++ b/qa/rpc-tests/invalidateblock.py
@@ -1,5 +1,5 @@
-#!/usr/bin/env python2
-# Copyright (c) 2014-2015 The Bitcoin Core developers
+#!/usr/bin/env python3
+# Copyright (c) 2014-2016 The Bitcoin Core developers
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
@@ -25,46 +25,46 @@ def setup_network(self):
         self.nodes.append(start_node(2, self.options.tmpdir, ["-debug"]))
         
     def run_test(self):
-        print "Make sure we repopulate setBlockIndexCandidates after InvalidateBlock:"
-        print "Mine 4 blocks on Node 0"
+        print("Make sure we repopulate setBlockIndexCandidates after InvalidateBlock:")
+        print("Mine 4 blocks on Node 0")
         self.nodes[0].generate(4)
         assert(self.nodes[0].getblockcount() == 4)
         besthash = self.nodes[0].getbestblockhash()
 
-        print "Mine competing 6 blocks on Node 1"
+        print("Mine competing 6 blocks on Node 1")
         self.nodes[1].generate(6)
         assert(self.nodes[1].getblockcount() == 6)
 
-        print "Connect nodes to force a reorg"
+        print("Connect nodes to force a reorg")
         connect_nodes_bi(self.nodes,0,1)
         sync_blocks(self.nodes[0:2])
         assert(self.nodes[0].getblockcount() == 6)
         badhash = self.nodes[1].getblockhash(2)
 
-        print "Invalidate block 2 on node 0 and verify we reorg to node 0's original chain"
+        print("Invalidate block 2 on node 0 and verify we reorg to node 0's original chain")
         self.nodes[0].invalidateblock(badhash)
         newheight = self.nodes[0].getblockcount()
         newhash = self.nodes[0].getbestblockhash()
         if (newheight != 4 or newhash != besthash):
             raise AssertionError("Wrong tip for node0, hash %s, height %d"%(newhash,newheight))
 
-        print "\nMake sure we won't reorg to a lower work chain:"
+        print("\nMake sure we won't reorg to a lower work chain:")
         connect_nodes_bi(self.nodes,1,2)
-        print "Sync node 2 to node 1 so both have 6 blocks"
+        print("Sync node 2 to node 1 so both have 6 blocks")
         sync_blocks(self.nodes[1:3])
         assert(self.nodes[2].getblockcount() == 6)
-        print "Invalidate block 5 on node 1 so its tip is now at 4"
+        print("Invalidate block 5 on node 1 so its tip is now at 4")
         self.nodes[1].invalidateblock(self.nodes[1].getblockhash(5))
         assert(self.nodes[1].getblockcount() == 4)
-        print "Invalidate block 3 on node 2, so its tip is now 2"
+        print("Invalidate block 3 on node 2, so its tip is now 2")
         self.nodes[2].invalidateblock(self.nodes[2].getblockhash(3))
         assert(self.nodes[2].getblockcount() == 2)
-        print "..and then mine a block"
+        print("..and then mine a block")
         self.nodes[2].generate(1)
-        print "Verify all nodes are at the right height"
+        print("Verify all nodes are at the right height")
         time.sleep(5)
-        for i in xrange(3):
-            print i,self.nodes[i].getblockcount()
+        for i in range(3):
+            print(i,self.nodes[i].getblockcount())
         assert(self.nodes[2].getblockcount() == 3)
         assert(self.nodes[0].getblockcount() == 4)
         node1height = self.nodes[1].getblockcount()
diff --git a/qa/rpc-tests/invalidblockrequest.py b/qa/rpc-tests/invalidblockrequest.py
index de6be8d5b5b5d..78dc7199da316 100755
--- a/qa/rpc-tests/invalidblockrequest.py
+++ b/qa/rpc-tests/invalidblockrequest.py
@@ -1,8 +1,7 @@
-#!/usr/bin/env python2
-# Copyright (c) 2015 The Bitcoin Core developers
-# Distributed under the MIT/X11 software license, see the accompanying
+#!/usr/bin/env python3
+# Copyright (c) 2015-2016 The Bitcoin Core developers
+# Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
-#
 
 from test_framework.test_framework import ComparisonTestFramework
 from test_framework.util import *
@@ -38,7 +37,7 @@ def run_test(self):
 
     def get_tests(self):
         if self.tip is None:
-            self.tip = int ("0x" + self.nodes[0].getbestblockhash() + "L", 0)
+            self.tip = int("0x" + self.nodes[0].getbestblockhash(), 0)
         self.block_time = int(time.time())+1
 
         '''
@@ -58,7 +57,7 @@ def get_tests(self):
         Now we need that block to mature so we can spend the coinbase.
         '''
         test = TestInstance(sync_every_block=False)
-        for i in xrange(100):
+        for i in range(100):
             block = create_block(self.tip, create_coinbase(height), self.block_time)
             block.solve()
             self.tip = block.sha256
diff --git a/qa/rpc-tests/invalidtxrequest.py b/qa/rpc-tests/invalidtxrequest.py
index 7b8199bab0cc4..d4200b0e885f9 100755
--- a/qa/rpc-tests/invalidtxrequest.py
+++ b/qa/rpc-tests/invalidtxrequest.py
@@ -1,8 +1,7 @@
-#!/usr/bin/env python2
-# Copyright (c) 2015 The Bitcoin Core developers
-# Distributed under the MIT/X11 software license, see the accompanying
+#!/usr/bin/env python3
+# Copyright (c) 2015-2016 The Bitcoin Core developers
+# Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
-#
 
 from test_framework.test_framework import ComparisonTestFramework
 from test_framework.comptool import TestManager, TestInstance, RejectResult
@@ -32,7 +31,7 @@ def run_test(self):
 
     def get_tests(self):
         if self.tip is None:
-            self.tip = int ("0x" + self.nodes[0].getbestblockhash() + "L", 0)
+            self.tip = int("0x" + self.nodes[0].getbestblockhash(), 0)
         self.block_time = int(time.time())+1
 
         '''
@@ -52,7 +51,7 @@ def get_tests(self):
         Now we need that block to mature so we can spend the coinbase.
         '''
         test = TestInstance(sync_every_block=False)
-        for i in xrange(100):
+        for i in range(100):
             block = create_block(self.tip, create_coinbase(height), self.block_time)
             block.solve()
             self.tip = block.sha256
diff --git a/qa/rpc-tests/keypool.py b/qa/rpc-tests/keypool.py
index b86c085e0009e..bdc144bfbc2fb 100755
--- a/qa/rpc-tests/keypool.py
+++ b/qa/rpc-tests/keypool.py
@@ -1,5 +1,5 @@
-#!/usr/bin/env python2
-# Copyright (c) 2014-2015 The Bitcoin Core developers
+#!/usr/bin/env python3
+# Copyright (c) 2014-2016 The Bitcoin Core developers
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/qa/rpc-tests/listtransactions.py b/qa/rpc-tests/listtransactions.py
index 4e5809f4a77d8..8dad687eddaa9 100755
--- a/qa/rpc-tests/listtransactions.py
+++ b/qa/rpc-tests/listtransactions.py
@@ -1,5 +1,5 @@
-#!/usr/bin/env python2
-# Copyright (c) 2014-2015 The Bitcoin Core developers
+#!/usr/bin/env python3
+# Copyright (c) 2014-2016 The Bitcoin Core developers
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/qa/rpc-tests/maxblocksinflight.py b/qa/rpc-tests/maxblocksinflight.py
index ad633f661dd51..6f105a77e3af9 100755
--- a/qa/rpc-tests/maxblocksinflight.py
+++ b/qa/rpc-tests/maxblocksinflight.py
@@ -1,8 +1,7 @@
-#!/usr/bin/env python2
-# Copyright (c) 2015 The Bitcoin Core developers
-# Distributed under the MIT/X11 software license, see the accompanying
+#!/usr/bin/env python3
+# Copyright (c) 2015-2016 The Bitcoin Core developers
+# Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
-#
 
 from test_framework.mininode import *
 from test_framework.test_framework import BitcoinTestFramework
@@ -65,7 +64,7 @@ def run(self):
                         raise AssertionError("Error, test failed: block %064x requested more than once" % key)
             if total_requests > MAX_REQUESTS:
                 raise AssertionError("Error, too many blocks (%d) requested" % total_requests)
-            print "Round %d: success (total requests: %d)" % (count, total_requests)
+            print("Round %d: success (total requests: %d)" % (count, total_requests))
 
         self.disconnectOkay = True
         self.connection.disconnect_node()
@@ -78,7 +77,7 @@ def add_options(self, parser):
                           help="Binary to test max block requests behavior")
 
     def setup_chain(self):
-        print "Initializing test directory "+self.options.tmpdir
+        print("Initializing test directory "+self.options.tmpdir)
         initialize_chain_clean(self.options.tmpdir, 1)
 
     def setup_network(self):
diff --git a/qa/rpc-tests/maxuploadtarget.py b/qa/rpc-tests/maxuploadtarget.py
index be45fecb5b32a..ec802d8155bd5 100755
--- a/qa/rpc-tests/maxuploadtarget.py
+++ b/qa/rpc-tests/maxuploadtarget.py
@@ -1,8 +1,7 @@
-#!/usr/bin/env python2
-#
-# Distributed under the MIT/X11 software license, see the accompanying
+#!/usr/bin/env python3
+# Copyright (c) 2015-2016 The Bitcoin Core developers
+# Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
-#
 
 from test_framework.mininode import *
 from test_framework.test_framework import BitcoinTestFramework
@@ -101,7 +100,7 @@ def setup_network(self):
     def mine_full_block(self, node, address):
         # Want to create a full block
         # We'll generate a 66k transaction below, and 14 of them is close to the 1MB block limit
-        for j in xrange(14):
+        for j in range(14):
             if len(self.utxo) < 14:
                 self.utxo = node.listunspent()
             inputs=[]
@@ -139,7 +138,7 @@ def run_test(self):
         test_nodes = []
         connections = []
 
-        for i in xrange(3):
+        for i in range(3):
             test_nodes.append(TestNode())
             connections.append(NodeConn('127.0.0.1', p2p_port(0), self.nodes[0], test_nodes[i]))
             test_nodes[i].add_connection(connections[i])
@@ -181,7 +180,7 @@ def run_test(self):
 
         # 144MB will be reserved for relaying new blocks, so expect this to
         # succeed for ~70 tries.
-        for i in xrange(success_count):
+        for i in range(success_count):
             test_nodes[0].send_message(getdata_request)
             test_nodes[0].sync_with_ping()
             assert_equal(test_nodes[0].block_receive_map[big_old_block], i+1)
@@ -189,22 +188,22 @@ def run_test(self):
         assert_equal(len(self.nodes[0].getpeerinfo()), 3)
         # At most a couple more tries should succeed (depending on how long 
         # the test has been running so far).
-        for i in xrange(3):
+        for i in range(3):
             test_nodes[0].send_message(getdata_request)
         test_nodes[0].wait_for_disconnect()
         assert_equal(len(self.nodes[0].getpeerinfo()), 2)
-        print "Peer 0 disconnected after downloading old block too many times"
+        print("Peer 0 disconnected after downloading old block too many times")
 
         # Requesting the current block on test_nodes[1] should succeed indefinitely,
         # even when over the max upload target.
         # We'll try 200 times
         getdata_request.inv = [CInv(2, big_new_block)]
-        for i in xrange(200):
+        for i in range(200):
             test_nodes[1].send_message(getdata_request)
             test_nodes[1].sync_with_ping()
             assert_equal(test_nodes[1].block_receive_map[big_new_block], i+1)
 
-        print "Peer 1 able to repeatedly download new block"
+        print("Peer 1 able to repeatedly download new block")
 
         # But if test_nodes[1] tries for an old block, it gets disconnected too.
         getdata_request.inv = [CInv(2, big_old_block)]
@@ -212,9 +211,9 @@ def run_test(self):
         test_nodes[1].wait_for_disconnect()
         assert_equal(len(self.nodes[0].getpeerinfo()), 1)
 
-        print "Peer 1 disconnected after trying to download old block"
+        print("Peer 1 disconnected after trying to download old block")
 
-        print "Advancing system time on node to clear counters..."
+        print("Advancing system time on node to clear counters...")
 
         # If we advance the time by 24 hours, then the counters should reset,
         # and test_nodes[2] should be able to retrieve the old block.
@@ -224,12 +223,12 @@ def run_test(self):
         test_nodes[2].sync_with_ping()
         assert_equal(test_nodes[2].block_receive_map[big_old_block], 1)
 
-        print "Peer 2 able to download old block"
+        print("Peer 2 able to download old block")
 
         [c.disconnect_node() for c in connections]
 
         #stop and start node 0 with 1MB maxuploadtarget, whitelist 127.0.0.1
-        print "Restarting nodes with -whitelist=127.0.0.1"
+        print("Restarting nodes with -whitelist=127.0.0.1")
         stop_node(self.nodes[0], 0)
         self.nodes[0] = start_node(0, self.options.tmpdir, ["-debug", "-whitelist=127.0.0.1", "-maxuploadtarget=1", "-blockmaxsize=999000"])
 
@@ -237,7 +236,7 @@ def run_test(self):
         test_nodes = []
         connections = []
 
-        for i in xrange(3):
+        for i in range(3):
             test_nodes.append(TestNode())
             connections.append(NodeConn('127.0.0.1', p2p_port(0), self.nodes[0], test_nodes[i]))
             test_nodes[i].add_connection(connections[i])
@@ -247,7 +246,7 @@ def run_test(self):
 
         #retrieve 20 blocks which should be enough to break the 1MB limit
         getdata_request.inv = [CInv(2, big_new_block)]
-        for i in xrange(20):
+        for i in range(20):
             test_nodes[1].send_message(getdata_request)
             test_nodes[1].sync_with_ping()
             assert_equal(test_nodes[1].block_receive_map[big_new_block], i+1)
@@ -257,7 +256,7 @@ def run_test(self):
         test_nodes[1].wait_for_disconnect()
         assert_equal(len(self.nodes[0].getpeerinfo()), 3) #node is still connected because of the whitelist
 
-        print "Peer 1 still connected after trying to download old block (whitelisted)"
+        print("Peer 1 still connected after trying to download old block (whitelisted)")
 
         [c.disconnect_node() for c in connections]
 
diff --git a/qa/rpc-tests/mempool_limit.py b/qa/rpc-tests/mempool_limit.py
index c19a63c6996d2..bc208709e9125 100755
--- a/qa/rpc-tests/mempool_limit.py
+++ b/qa/rpc-tests/mempool_limit.py
@@ -1,5 +1,5 @@
-#!/usr/bin/env python2
-# Copyright (c) 2014-2015 The Bitcoin Core developers
+#!/usr/bin/env python3
+# Copyright (c) 2014-2016 The Bitcoin Core developers
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
@@ -41,7 +41,7 @@ def run_test(self):
 
         relayfee = self.nodes[0].getnetworkinfo()['relayfee']
         base_fee = relayfee*100
-        for i in xrange (4):
+        for i in range (4):
             txids.append([])
             txids[i] = create_lots_of_big_transactions(self.nodes[0], self.txouts, utxos[30*i:30*i+30], (i+1)*base_fee)
 
diff --git a/qa/rpc-tests/mempool_packages.py b/qa/rpc-tests/mempool_packages.py
index bc3f9e051cef1..7ac85c1b6d3e9 100755
--- a/qa/rpc-tests/mempool_packages.py
+++ b/qa/rpc-tests/mempool_packages.py
@@ -1,5 +1,5 @@
-#!/usr/bin/env python2
-# Copyright (c) 2014-2015 The Bitcoin Core developers
+#!/usr/bin/env python3
+# Copyright (c) 2014-2016 The Bitcoin Core developers
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
@@ -28,7 +28,7 @@ def chain_transaction(self, node, parent_txid, vout, value, fee, num_outputs):
         send_value = satoshi_round((value - fee)/num_outputs)
         inputs = [ {'txid' : parent_txid, 'vout' : vout} ]
         outputs = {}
-        for i in xrange(num_outputs):
+        for i in range(num_outputs):
             outputs[node.getnewaddress()] = send_value
         rawtx = node.createrawtransaction(inputs, outputs)
         signedtx = node.signrawtransaction(rawtx)
@@ -48,7 +48,7 @@ def run_test(self):
         fee = Decimal("0.0001")
         # MAX_ANCESTORS transactions off a confirmed tx should be fine
         chain = []
-        for i in xrange(MAX_ANCESTORS):
+        for i in range(MAX_ANCESTORS):
             (txid, sent_value) = self.chain_transaction(self.nodes[0], txid, 0, value, fee, 1)
             value = sent_value
             chain.append(txid)
@@ -84,7 +84,7 @@ def run_test(self):
         try:
             self.chain_transaction(self.nodes[0], txid, vout, value, fee, 1)
         except JSONRPCException as e:
-            print "too-long-ancestor-chain successfully rejected"
+            print("too-long-ancestor-chain successfully rejected")
 
         # Check that prioritising a tx before it's added to the mempool works
         # First clear the mempool by mining a block.
@@ -121,22 +121,22 @@ def run_test(self):
         # First create one parent tx with 10 children
         (txid, sent_value) = self.chain_transaction(self.nodes[0], txid, vout, value, fee, 10)
         parent_transaction = txid
-        for i in xrange(10):
+        for i in range(10):
             transaction_package.append({'txid': txid, 'vout': i, 'amount': sent_value})
 
-        for i in xrange(MAX_DESCENDANTS):
+        for i in range(MAX_DESCENDANTS):
             utxo = transaction_package.pop(0)
             try:
                 (txid, sent_value) = self.chain_transaction(self.nodes[0], utxo['txid'], utxo['vout'], utxo['amount'], fee, 10)
-                for j in xrange(10):
+                for j in range(10):
                     transaction_package.append({'txid': txid, 'vout': j, 'amount': sent_value})
                 if i == MAX_DESCENDANTS - 2:
                     mempool = self.nodes[0].getrawmempool(True)
                     assert_equal(mempool[parent_transaction]['descendantcount'], MAX_DESCENDANTS)
             except JSONRPCException as e:
-                print e.error['message']
+                print(e.error['message'])
                 assert_equal(i, MAX_DESCENDANTS - 1)
-                print "tx that would create too large descendant package successfully rejected"
+                print("tx that would create too large descendant package successfully rejected")
 
         # TODO: check that node1's mempool is as expected
 
@@ -171,7 +171,7 @@ def run_test(self):
         send_value = satoshi_round((value - fee)/2)
         inputs = [ {'txid' : txid, 'vout' : vout} ]
         outputs = {}
-        for i in xrange(2):
+        for i in range(2):
             outputs[self.nodes[0].getnewaddress()] = send_value
         rawtx = self.nodes[0].createrawtransaction(inputs, outputs)
         signedtx = self.nodes[0].signrawtransaction(rawtx)
@@ -185,7 +185,7 @@ def run_test(self):
         # Create tx2-7
         vout = 1
         txid = tx0_id
-        for i in xrange(6):
+        for i in range(6):
             (txid, sent_value) = self.chain_transaction(self.nodes[0], txid, vout, value, fee, 1)
             vout = 0
             value = sent_value
diff --git a/qa/rpc-tests/mempool_reorg.py b/qa/rpc-tests/mempool_reorg.py
index 5e9856e5d4318..608e9d0a06c8d 100755
--- a/qa/rpc-tests/mempool_reorg.py
+++ b/qa/rpc-tests/mempool_reorg.py
@@ -1,5 +1,5 @@
-#!/usr/bin/env python2
-# Copyright (c) 2014-2015 The Bitcoin Core developers
+#!/usr/bin/env python3
+# Copyright (c) 2014-2016 The Bitcoin Core developers
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/qa/rpc-tests/mempool_resurrect_test.py b/qa/rpc-tests/mempool_resurrect_test.py
index 0ba46e6f51e8a..b4d9f0a1a23ff 100755
--- a/qa/rpc-tests/mempool_resurrect_test.py
+++ b/qa/rpc-tests/mempool_resurrect_test.py
@@ -1,5 +1,5 @@
-#!/usr/bin/env python2
-# Copyright (c) 2014-2015 The Bitcoin Core developers
+#!/usr/bin/env python3
+# Copyright (c) 2014-2016 The Bitcoin Core developers
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/qa/rpc-tests/mempool_spendcoinbase.py b/qa/rpc-tests/mempool_spendcoinbase.py
index 507b5ff416409..c23f5ef10ae12 100755
--- a/qa/rpc-tests/mempool_spendcoinbase.py
+++ b/qa/rpc-tests/mempool_spendcoinbase.py
@@ -1,5 +1,5 @@
-#!/usr/bin/env python2
-# Copyright (c) 2014-2015 The Bitcoin Core developers
+#!/usr/bin/env python3
+# Copyright (c) 2014-2016 The Bitcoin Core developers
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/qa/rpc-tests/merkle_blocks.py b/qa/rpc-tests/merkle_blocks.py
index eb718f39e41a6..9419d9a714ced 100755
--- a/qa/rpc-tests/merkle_blocks.py
+++ b/qa/rpc-tests/merkle_blocks.py
@@ -1,5 +1,5 @@
-#!/usr/bin/env python2
-# Copyright (c) 2014-2015 The Bitcoin Core developers
+#!/usr/bin/env python3
+# Copyright (c) 2014-2016 The Bitcoin Core developers
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
@@ -32,7 +32,7 @@ def setup_network(self):
         self.sync_all()
 
     def run_test(self):
-        print "Mining blocks..."
+        print("Mining blocks...")
         self.nodes[0].generate(105)
         self.sync_all()
 
diff --git a/qa/rpc-tests/multi_rpc.py b/qa/rpc-tests/multi_rpc.py
index afb18cf3da20d..577d80949d4ce 100755
--- a/qa/rpc-tests/multi_rpc.py
+++ b/qa/rpc-tests/multi_rpc.py
@@ -1,5 +1,5 @@
-#!/usr/bin/env python2
-# Copyright (c) 2015 The Bitcoin Core developers
+#!/usr/bin/env python3
+# Copyright (c) 2015-2016 The Bitcoin Core developers
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
@@ -9,16 +9,9 @@
 
 from test_framework.test_framework import BitcoinTestFramework
 from test_framework.util import *
-import base64
 
-try:
-    import http.client as httplib
-except ImportError:
-    import httplib
-try:
-    import urllib.parse as urlparse
-except ImportError:
-    import urlparse
+import http.client
+import urllib.parse
 
 class HTTPBasicsTest (BitcoinTestFramework):
     def setup_nodes(self):
@@ -39,7 +32,7 @@ def run_test(self):
         ##################################################
         # Check correctness of the rpcauth config option #
         ##################################################
-        url = urlparse.urlparse(self.nodes[0].url)
+        url = urllib.parse.urlparse(self.nodes[0].url)
 
         #Old authpair
         authpair = url.username + ':' + url.password
@@ -55,7 +48,7 @@ def run_test(self):
 
         headers = {"Authorization": "Basic " + str_to_b64str(authpair)}
 
-        conn = httplib.HTTPConnection(url.hostname, url.port)
+        conn = http.client.HTTPConnection(url.hostname, url.port)
         conn.connect()
         conn.request('POST', '/', '{"method": "getbestblockhash"}', headers)
         resp = conn.getresponse()
@@ -65,7 +58,7 @@ def run_test(self):
         #Use new authpair to confirm both work
         headers = {"Authorization": "Basic " + str_to_b64str(authpairnew)}
 
-        conn = httplib.HTTPConnection(url.hostname, url.port)
+        conn = http.client.HTTPConnection(url.hostname, url.port)
         conn.connect()
         conn.request('POST', '/', '{"method": "getbestblockhash"}', headers)
         resp = conn.getresponse()
@@ -76,7 +69,7 @@ def run_test(self):
         authpairnew = "rtwrong:"+password
         headers = {"Authorization": "Basic " + str_to_b64str(authpairnew)}
 
-        conn = httplib.HTTPConnection(url.hostname, url.port)
+        conn = http.client.HTTPConnection(url.hostname, url.port)
         conn.connect()
         conn.request('POST', '/', '{"method": "getbestblockhash"}', headers)
         resp = conn.getresponse()
@@ -87,7 +80,7 @@ def run_test(self):
         authpairnew = "rt:"+password+"wrong"
         headers = {"Authorization": "Basic " + str_to_b64str(authpairnew)}
 
-        conn = httplib.HTTPConnection(url.hostname, url.port)
+        conn = http.client.HTTPConnection(url.hostname, url.port)
         conn.connect()
         conn.request('POST', '/', '{"method": "getbestblockhash"}', headers)
         resp = conn.getresponse()
@@ -98,7 +91,7 @@ def run_test(self):
         authpairnew = "rt2:"+password2
         headers = {"Authorization": "Basic " + str_to_b64str(authpairnew)}
 
-        conn = httplib.HTTPConnection(url.hostname, url.port)
+        conn = http.client.HTTPConnection(url.hostname, url.port)
         conn.connect()
         conn.request('POST', '/', '{"method": "getbestblockhash"}', headers)
         resp = conn.getresponse()
@@ -109,7 +102,7 @@ def run_test(self):
         authpairnew = "rt2:"+password2+"wrong"
         headers = {"Authorization": "Basic " + str_to_b64str(authpairnew)}
 
-        conn = httplib.HTTPConnection(url.hostname, url.port)
+        conn = http.client.HTTPConnection(url.hostname, url.port)
         conn.connect()
         conn.request('POST', '/', '{"method": "getbestblockhash"}', headers)
         resp = conn.getresponse()
diff --git a/qa/rpc-tests/nodehandling.py b/qa/rpc-tests/nodehandling.py
index c6c8c436e9701..1b6ba021a0cea 100755
--- a/qa/rpc-tests/nodehandling.py
+++ b/qa/rpc-tests/nodehandling.py
@@ -1,5 +1,5 @@
-#!/usr/bin/env python2
-# Copyright (c) 2014-2015 The Bitcoin Core developers
+#!/usr/bin/env python3
+# Copyright (c) 2014-2016 The Bitcoin Core developers
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
@@ -10,14 +10,8 @@
 from test_framework.test_framework import BitcoinTestFramework
 from test_framework.util import *
 
-try:
-    import http.client as httplib
-except ImportError:
-    import httplib
-try:
-    import urllib.parse as urlparse
-except ImportError:
-    import urlparse
+import http.client
+import urllib.parse
 
 class NodeHandlingTest (BitcoinTestFramework):
     def run_test(self):
@@ -69,7 +63,7 @@ def run_test(self):
         ###########################
         # RPC disconnectnode test #
         ###########################
-        url = urlparse.urlparse(self.nodes[1].url)
+        url = urllib.parse.urlparse(self.nodes[1].url)
         self.nodes[0].disconnectnode(url.hostname+":"+str(p2p_port(1)))
         time.sleep(2) #disconnecting a node needs a little bit of time
         for node in self.nodes[0].getpeerinfo():
diff --git a/qa/rpc-tests/p2p-acceptblock.py b/qa/rpc-tests/p2p-acceptblock.py
index e429fcc5fe9d4..21e4c2f468521 100755
--- a/qa/rpc-tests/p2p-acceptblock.py
+++ b/qa/rpc-tests/p2p-acceptblock.py
@@ -1,8 +1,7 @@
-#!/usr/bin/env python2
-# Copyright (c) 2015 The Bitcoin Core developers
-# Distributed under the MIT/X11 software license, see the accompanying
+#!/usr/bin/env python3
+# Copyright (c) 2015-2016 The Bitcoin Core developers
+# Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
-#
 
 from test_framework.mininode import *
 from test_framework.test_framework import BitcoinTestFramework
@@ -145,13 +144,13 @@ def run_test(self):
 
         # 1. Have both nodes mine a block (leave IBD)
         [ n.generate(1) for n in self.nodes ]
-        tips = [ int ("0x" + n.getbestblockhash() + "L", 0) for n in self.nodes ]
+        tips = [ int("0x" + n.getbestblockhash(), 0) for n in self.nodes ]
 
         # 2. Send one block that builds on each tip.
         # This should be accepted.
         blocks_h2 = []  # the height 2 blocks on each node's chain
         block_time = int(time.time()) + 1
-        for i in xrange(2):
+        for i in range(2):
             blocks_h2.append(create_block(tips[i], create_coinbase(2), block_time))
             blocks_h2[i].solve()
             block_time += 1
@@ -161,11 +160,11 @@ def run_test(self):
         [ x.sync_with_ping() for x in [test_node, white_node] ]
         assert_equal(self.nodes[0].getblockcount(), 2)
         assert_equal(self.nodes[1].getblockcount(), 2)
-        print "First height 2 block accepted by both nodes"
+        print("First height 2 block accepted by both nodes")
 
         # 3. Send another block that builds on the original tip.
         blocks_h2f = []  # Blocks at height 2 that fork off the main chain
-        for i in xrange(2):
+        for i in range(2):
             blocks_h2f.append(create_block(tips[i], create_coinbase(2), blocks_h2[i].nTime+1))
             blocks_h2f[i].solve()
         test_node.send_message(msg_block(blocks_h2f[0]))
@@ -180,11 +179,11 @@ def run_test(self):
             if x['hash'] == blocks_h2f[1].hash:
                 assert_equal(x['status'], "valid-headers")
 
-        print "Second height 2 block accepted only from whitelisted peer"
+        print("Second height 2 block accepted only from whitelisted peer")
 
         # 4. Now send another block that builds on the forking chain.
         blocks_h3 = []
-        for i in xrange(2):
+        for i in range(2):
             blocks_h3.append(create_block(blocks_h2f[i].sha256, create_coinbase(3), blocks_h2f[i].nTime+1))
             blocks_h3[i].solve()
         test_node.send_message(msg_block(blocks_h3[0]))
@@ -200,13 +199,13 @@ def run_test(self):
         # But this block should be accepted by node0 since it has more work.
         try:
             self.nodes[0].getblock(blocks_h3[0].hash)
-            print "Unrequested more-work block accepted from non-whitelisted peer"
+            print("Unrequested more-work block accepted from non-whitelisted peer")
         except:
             raise AssertionError("Unrequested more work block was not processed")
 
         # Node1 should have accepted and reorged.
         assert_equal(self.nodes[1].getblockcount(), 3)
-        print "Successfully reorged to length 3 chain from whitelisted peer"
+        print("Successfully reorged to length 3 chain from whitelisted peer")
 
         # 4b. Now mine 288 more blocks and deliver; all should be processed but
         # the last (height-too-high) on node0.  Node1 should process the tip if
@@ -214,8 +213,8 @@ def run_test(self):
         tips = blocks_h3
         headers_message = msg_headers()
         all_blocks = []   # node0's blocks
-        for j in xrange(2):
-            for i in xrange(288):
+        for j in range(2):
+            for i in range(288):
                 next_block = create_block(tips[j].sha256, create_coinbase(i + 4), tips[j].nTime+1)
                 next_block.solve()
                 if j==0:
@@ -233,7 +232,7 @@ def run_test(self):
                     raise AssertionError("Unrequested block too far-ahead should have been ignored")
             except:
                 if x == all_blocks[287]:
-                    print "Unrequested block too far-ahead not processed"
+                    print("Unrequested block too far-ahead not processed")
                 else:
                     raise AssertionError("Unrequested block with more work should have been accepted")
 
@@ -243,7 +242,7 @@ def run_test(self):
         try:
             white_node.sync_with_ping()
             self.nodes[1].getblock(tips[1].hash)
-            print "Unrequested block far ahead of tip accepted from whitelisted peer"
+            print("Unrequested block far ahead of tip accepted from whitelisted peer")
         except:
             raise AssertionError("Unrequested block from whitelisted peer not accepted")
 
@@ -259,7 +258,7 @@ def run_test(self):
         # a getdata request for this block.
         test_node.sync_with_ping()
         assert_equal(self.nodes[0].getblockcount(), 2)
-        print "Unrequested block that would complete more-work chain was ignored"
+        print("Unrequested block that would complete more-work chain was ignored")
 
         # 6. Try to get node to request the missing block.
         # Poke the node with an inv for block at height 3 and see if that
@@ -275,14 +274,14 @@ def run_test(self):
 
         # Check that the getdata includes the right block
         assert_equal(getdata.inv[0].hash, blocks_h2f[0].sha256)
-        print "Inv at tip triggered getdata for unprocessed block"
+        print("Inv at tip triggered getdata for unprocessed block")
 
         # 7. Send the missing block for the third time (now it is requested)
         test_node.send_message(msg_block(blocks_h2f[0]))
 
         test_node.sync_with_ping()
         assert_equal(self.nodes[0].getblockcount(), 290)
-        print "Successfully reorged to longer chain from non-whitelisted peer"
+        print("Successfully reorged to longer chain from non-whitelisted peer")
 
         [ c.disconnect_node() for c in connections ]
 
diff --git a/qa/rpc-tests/p2p-feefilter.py b/qa/rpc-tests/p2p-feefilter.py
index 281b6ca37a0ce..5fb51ed0fe792 100755
--- a/qa/rpc-tests/p2p-feefilter.py
+++ b/qa/rpc-tests/p2p-feefilter.py
@@ -1,6 +1,6 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python3
 # Copyright (c) 2016 The Bitcoin Core developers
-# Distributed under the MIT/X11 software license, see the accompanying
+# Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 #
 
@@ -18,7 +18,7 @@ def hashToHex(hash):
 
 # Wait up to 60 secs to see if the testnode has received all the expected invs
 def allInvsMatch(invsExpected, testnode):
-    for x in xrange(60):
+    for x in range(60):
         with mininode_lock:
             if (sorted(invsExpected) == sorted(testnode.txinvs)):
                 return True;
@@ -69,7 +69,7 @@ def run_test(self):
 
         # Test that invs are received for all txs at feerate of 20 sat/byte
         node1.settxfee(Decimal("0.00020000"))
-        txids = [node1.sendtoaddress(node1.getnewaddress(), 1) for x in xrange(3)]
+        txids = [node1.sendtoaddress(node1.getnewaddress(), 1) for x in range(3)]
         assert(allInvsMatch(txids, test_node))
         test_node.clear_invs()
 
@@ -77,13 +77,13 @@ def run_test(self):
         test_node.send_filter(15000)
 
         # Test that txs are still being received (paying 20 sat/byte)
-        txids = [node1.sendtoaddress(node1.getnewaddress(), 1) for x in xrange(3)]
+        txids = [node1.sendtoaddress(node1.getnewaddress(), 1) for x in range(3)]
         assert(allInvsMatch(txids, test_node))
         test_node.clear_invs()
 
         # Change tx fee rate to 10 sat/byte and test they are no longer received
         node1.settxfee(Decimal("0.00010000"))
-        [node1.sendtoaddress(node1.getnewaddress(), 1) for x in xrange(3)]
+        [node1.sendtoaddress(node1.getnewaddress(), 1) for x in range(3)]
         sync_mempools(self.nodes) # must be sure node 0 has received all txs 
         time.sleep(10) # wait 10 secs to be sure its doesn't relay any
         assert(allInvsMatch([], test_node))
@@ -91,7 +91,7 @@ def run_test(self):
 
         # Remove fee filter and check that txs are received again
         test_node.send_filter(0)
-        txids = [node1.sendtoaddress(node1.getnewaddress(), 1) for x in xrange(3)]
+        txids = [node1.sendtoaddress(node1.getnewaddress(), 1) for x in range(3)]
         assert(allInvsMatch(txids, test_node))
         test_node.clear_invs()
 
diff --git a/qa/rpc-tests/p2p-fullblocktest.py b/qa/rpc-tests/p2p-fullblocktest.py
index ae82d9dca9266..56df8ffd01181 100755
--- a/qa/rpc-tests/p2p-fullblocktest.py
+++ b/qa/rpc-tests/p2p-fullblocktest.py
@@ -1,8 +1,7 @@
-#!/usr/bin/env python2
-# Copyright (c) 2015 The Bitcoin Core developers
-# Distributed under the MIT/X11 software license, see the accompanying
+#!/usr/bin/env python3
+# Copyright (c) 2015-2016 The Bitcoin Core developers
+# Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
-#
 
 from test_framework.test_framework import ComparisonTestFramework
 from test_framework.util import *
diff --git a/qa/rpc-tests/p2p-versionbits-warning.py b/qa/rpc-tests/p2p-versionbits-warning.py
index 061dcbf0e1e87..8c8c2358f74e6 100755
--- a/qa/rpc-tests/p2p-versionbits-warning.py
+++ b/qa/rpc-tests/p2p-versionbits-warning.py
@@ -1,8 +1,7 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python3
 # Copyright (c) 2016 The Bitcoin Core developers
-# Distributed under the MIT/X11 software license, see the accompanying
+# Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
-#
 
 from test_framework.mininode import *
 from test_framework.test_framework import BitcoinTestFramework
@@ -82,7 +81,7 @@ def send_blocks_with_version(self, peer, numblocks, nVersionToUse):
         block_time = self.nodes[0].getblockheader(tip)["time"]+1
         tip = int(tip, 16)
 
-        for i in xrange(numblocks):
+        for i in range(numblocks):
             block = create_block(tip, create_coinbase(height+1), block_time)
             block.nVersion = nVersionToUse
             block.solve()
diff --git a/qa/rpc-tests/prioritise_transaction.py b/qa/rpc-tests/prioritise_transaction.py
index f8d9063b4ebc0..6ab88602b57ac 100755
--- a/qa/rpc-tests/prioritise_transaction.py
+++ b/qa/rpc-tests/prioritise_transaction.py
@@ -1,5 +1,5 @@
-#!/usr/bin/env python2
-# Copyright (c) 2015 The Bitcoin Core developers
+#!/usr/bin/env python3
+# Copyright (c) 2015-2016 The Bitcoin Core developers
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
@@ -35,7 +35,7 @@ def run_test(self):
 
         # Create 3 batches of transactions at 3 different fee rate levels
         range_size = utxo_count // 3
-        for i in xrange(3):
+        for i in range(3):
             txids.append([])
             start_range = i * range_size
             end_range = start_range + range_size
@@ -46,7 +46,7 @@ def run_test(self):
         # more transactions.
         mempool = self.nodes[0].getrawmempool(True)
         sizes = [0, 0, 0]
-        for i in xrange(3):
+        for i in range(3):
             for j in txids[i]:
                 assert(j in mempool)
                 sizes[i] += mempool[j]['size']
@@ -61,7 +61,7 @@ def run_test(self):
         self.nodes[0].generate(1)
 
         mempool = self.nodes[0].getrawmempool()
-        print "Assert that prioritised transaction was mined"
+        print("Assert that prioritised transaction was mined")
         assert(txids[0][0] not in mempool)
         assert(txids[0][1] in mempool)
 
@@ -93,7 +93,7 @@ def run_test(self):
         # High fee transaction should not have been mined, but other high fee rate
         # transactions should have been.
         mempool = self.nodes[0].getrawmempool()
-        print "Assert that de-prioritised transaction is still in mempool"
+        print("Assert that de-prioritised transaction is still in mempool")
         assert(high_fee_tx in mempool)
         for x in txids[2]:
             if (x != high_fee_tx):
@@ -135,7 +135,7 @@ def run_test(self):
         # accepted.
         self.nodes[0].prioritisetransaction(tx2_id, 0, int(self.relayfee*COIN))
 
-        print "Assert that prioritised free transaction is accepted to mempool"
+        print("Assert that prioritised free transaction is accepted to mempool")
         assert_equal(self.nodes[0].sendrawtransaction(tx2_hex), tx2_id)
         assert(tx2_id in self.nodes[0].getrawmempool())
 
diff --git a/qa/rpc-tests/proxy_test.py b/qa/rpc-tests/proxy_test.py
index 91c871ddc9003..6c7b201d562d0 100755
--- a/qa/rpc-tests/proxy_test.py
+++ b/qa/rpc-tests/proxy_test.py
@@ -1,7 +1,8 @@
-#!/usr/bin/env python2
-# Copyright (c) 2015 The Bitcoin Core developers
+#!/usr/bin/env python3
+# Copyright (c) 2015-2016 The Bitcoin Core developers
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
 import socket
 
 from test_framework.socks5 import Socks5Configuration, Socks5Command, Socks5Server, AddressType
@@ -55,7 +56,7 @@ def __init__(self):
             self.conf3.unauth = True
             self.conf3.auth = True
         else:
-            print "Warning: testing without local IPv6 support"
+            print("Warning: testing without local IPv6 support")
 
         self.serv1 = Socks5Server(self.conf1)
         self.serv1.start()
diff --git a/qa/rpc-tests/pruning.py b/qa/rpc-tests/pruning.py
index eccd157e5c085..92d33bd20ec3e 100755
--- a/qa/rpc-tests/pruning.py
+++ b/qa/rpc-tests/pruning.py
@@ -1,5 +1,5 @@
-#!/usr/bin/env python2
-# Copyright (c) 2014-2015 The Bitcoin Core developers
+#!/usr/bin/env python3
+# Copyright (c) 2014-2016 The Bitcoin Core developers
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
@@ -57,7 +57,7 @@ def create_big_chain(self):
         sync_blocks(self.nodes[0:2])
         self.nodes[0].generate(150)
         # Then mine enough full blocks to create more than 550MiB of data
-        for i in xrange(645):
+        for i in range(645):
             self.mine_full_block(self.nodes[0], self.address[0])
 
         sync_blocks(self.nodes[0:3])
@@ -65,11 +65,11 @@ def create_big_chain(self):
     def test_height_min(self):
         if not os.path.isfile(self.prunedir+"blk00000.dat"):
             raise AssertionError("blk00000.dat is missing, pruning too early")
-        print "Success"
-        print "Though we're already using more than 550MiB, current usage:", calc_usage(self.prunedir)
-        print "Mining 25 more blocks should cause the first block file to be pruned"
+        print("Success")
+        print("Though we're already using more than 550MiB, current usage:", calc_usage(self.prunedir))
+        print("Mining 25 more blocks should cause the first block file to be pruned")
         # Pruning doesn't run until we're allocating another chunk, 20 full blocks past the height cutoff will ensure this
-        for i in xrange(25):
+        for i in range(25):
             self.mine_full_block(self.nodes[0],self.address[0])
 
         waitstart = time.time()
@@ -78,17 +78,17 @@ def test_height_min(self):
             if time.time() - waitstart > 10:
                 raise AssertionError("blk00000.dat not pruned when it should be")
 
-        print "Success"
+        print("Success")
         usage = calc_usage(self.prunedir)
-        print "Usage should be below target:", usage
+        print("Usage should be below target:", usage)
         if (usage > 550):
             raise AssertionError("Pruning target not being met")
 
     def create_chain_with_staleblocks(self):
         # Create stale blocks in manageable sized chunks
-        print "Mine 24 (stale) blocks on Node 1, followed by 25 (main chain) block reorg from Node 0, for 12 rounds"
+        print("Mine 24 (stale) blocks on Node 1, followed by 25 (main chain) block reorg from Node 0, for 12 rounds")
 
-        for j in xrange(12):
+        for j in range(12):
             # Disconnect node 0 so it can mine a longer reorg chain without knowing about node 1's soon-to-be-stale chain
             # Node 2 stays connected, so it hears about the stale blocks and then reorg's when node0 reconnects
             # Stopping node 0 also clears its mempool, so it doesn't have node1's transactions to accidentally mine
@@ -96,7 +96,7 @@ def create_chain_with_staleblocks(self):
             self.nodes[0]=start_node(0, self.options.tmpdir, ["-debug","-maxreceivebuffer=20000","-blockmaxsize=999000", "-checkblocks=5"], timewait=900)
             # Mine 24 blocks in node 1
             self.utxo = self.nodes[1].listunspent()
-            for i in xrange(24):
+            for i in range(24):
                 if j == 0:
                     self.mine_full_block(self.nodes[1],self.address[1])
                 else:
@@ -104,7 +104,7 @@ def create_chain_with_staleblocks(self):
 
             # Reorg back with 25 block chain from node 0
             self.utxo = self.nodes[0].listunspent()
-            for i in xrange(25): 
+            for i in range(25):
                 self.mine_full_block(self.nodes[0],self.address[0])
 
             # Create connections in the order so both nodes can see the reorg at the same time
@@ -112,7 +112,7 @@ def create_chain_with_staleblocks(self):
             connect_nodes(self.nodes[2], 0)
             sync_blocks(self.nodes[0:3])
 
-        print "Usage can be over target because of high stale rate:", calc_usage(self.prunedir)
+        print("Usage can be over target because of high stale rate:", calc_usage(self.prunedir))
 
     def reorg_test(self):
         # Node 1 will mine a 300 block chain starting 287 blocks back from Node 0 and Node 2's tip
@@ -123,11 +123,11 @@ def reorg_test(self):
         self.nodes[1]=start_node(1, self.options.tmpdir, ["-debug","-maxreceivebuffer=20000","-blockmaxsize=5000", "-checkblocks=5", "-disablesafemode"], timewait=900)
 
         height = self.nodes[1].getblockcount()
-        print "Current block height:", height
+        print("Current block height:", height)
 
         invalidheight = height-287
         badhash = self.nodes[1].getblockhash(invalidheight)
-        print "Invalidating block at height:",invalidheight,badhash
+        print("Invalidating block at height:",invalidheight,badhash)
         self.nodes[1].invalidateblock(badhash)
 
         # We've now switched to our previously mined-24 block fork on node 1, but thats not what we want
@@ -139,29 +139,29 @@ def reorg_test(self):
             curhash = self.nodes[1].getblockhash(invalidheight - 1)
 
         assert(self.nodes[1].getblockcount() == invalidheight - 1)
-        print "New best height", self.nodes[1].getblockcount()
+        print("New best height", self.nodes[1].getblockcount())
 
         # Reboot node1 to clear those giant tx's from mempool
         stop_node(self.nodes[1],1)
         self.nodes[1]=start_node(1, self.options.tmpdir, ["-debug","-maxreceivebuffer=20000","-blockmaxsize=5000", "-checkblocks=5", "-disablesafemode"], timewait=900)
 
-        print "Generating new longer chain of 300 more blocks"
+        print("Generating new longer chain of 300 more blocks")
         self.nodes[1].generate(300)
 
-        print "Reconnect nodes"
+        print("Reconnect nodes")
         connect_nodes(self.nodes[0], 1)
         connect_nodes(self.nodes[2], 1)
         sync_blocks(self.nodes[0:3])
 
-        print "Verify height on node 2:",self.nodes[2].getblockcount()
-        print "Usage possibly still high bc of stale blocks in block files:", calc_usage(self.prunedir)
+        print("Verify height on node 2:",self.nodes[2].getblockcount())
+        print("Usage possibly still high bc of stale blocks in block files:", calc_usage(self.prunedir))
 
-        print "Mine 220 more blocks so we have requisite history (some blocks will be big and cause pruning of previous chain)"
+        print("Mine 220 more blocks so we have requisite history (some blocks will be big and cause pruning of previous chain)")
         self.nodes[0].generate(220) #node 0 has many large tx's in its mempool from the disconnects
         sync_blocks(self.nodes[0:3])
 
         usage = calc_usage(self.prunedir)
-        print "Usage should be below target:", usage
+        print("Usage should be below target:", usage)
         if (usage > 550):
             raise AssertionError("Pruning target not being met")
 
@@ -173,7 +173,7 @@ def reorg_back(self):
             self.nodes[2].getblock(self.forkhash)
             raise AssertionError("Old block wasn't pruned so can't test redownload")
         except JSONRPCException as e:
-            print "Will need to redownload block",self.forkheight
+            print("Will need to redownload block",self.forkheight)
 
         # Verify that we have enough history to reorg back to the fork point
         # Although this is more than 288 blocks, because this chain was written more recently
@@ -197,14 +197,14 @@ def reorg_back(self):
         # At this point node 2 is within 288 blocks of the fork point so it will preserve its ability to reorg
         if self.nodes[2].getblockcount() < self.mainchainheight:
             blocks_to_mine = first_reorg_height + 1 - self.mainchainheight
-            print "Rewind node 0 to prev main chain to mine longer chain to trigger redownload. Blocks needed:", blocks_to_mine
+            print("Rewind node 0 to prev main chain to mine longer chain to trigger redownload. Blocks needed:", blocks_to_mine)
             self.nodes[0].invalidateblock(curchainhash)
             assert(self.nodes[0].getblockcount() == self.mainchainheight)
             assert(self.nodes[0].getbestblockhash() == self.mainchainhash2)
             goalbesthash = self.nodes[0].generate(blocks_to_mine)[-1]
             goalbestheight = first_reorg_height + 1
 
-        print "Verify node 2 reorged back to the main chain, some blocks of which it had to redownload"
+        print("Verify node 2 reorged back to the main chain, some blocks of which it had to redownload")
         waitstart = time.time()
         while self.nodes[2].getblockcount() < goalbestheight:
             time.sleep(0.1)
@@ -217,7 +217,7 @@ def reorg_back(self):
     def mine_full_block(self, node, address):
         # Want to create a full block
         # We'll generate a 66k transaction below, and 14 of them is close to the 1MB block limit
-        for j in xrange(14):
+        for j in range(14):
             if len(self.utxo) < 14:
                 self.utxo = node.listunspent()
             inputs=[]
@@ -241,8 +241,8 @@ def mine_full_block(self, node, address):
 
 
     def run_test(self):
-        print "Warning! This test requires 4GB of disk space and takes over 30 mins (up to 2 hours)"
-        print "Mining a big blockchain of 995 blocks"
+        print("Warning! This test requires 4GB of disk space and takes over 30 mins (up to 2 hours)")
+        print("Mining a big blockchain of 995 blocks")
         self.create_big_chain()
         # Chain diagram key:
         # *   blocks on main chain
@@ -253,12 +253,12 @@ def run_test(self):
         # Start by mining a simple chain that all nodes have
         # N0=N1=N2 **...*(995)
 
-        print "Check that we haven't started pruning yet because we're below PruneAfterHeight"
+        print("Check that we haven't started pruning yet because we're below PruneAfterHeight")
         self.test_height_min()
         # Extend this chain past the PruneAfterHeight
         # N0=N1=N2 **...*(1020)
 
-        print "Check that we'll exceed disk space target if we have a very high stale block rate"
+        print("Check that we'll exceed disk space target if we have a very high stale block rate")
         self.create_chain_with_staleblocks()
         # Disconnect N0
         # And mine a 24 block chain on N1 and a separate 25 block chain on N0
@@ -282,7 +282,7 @@ def run_test(self):
         self.mainchainheight = self.nodes[2].getblockcount()   #1320
         self.mainchainhash2 = self.nodes[2].getblockhash(self.mainchainheight)
 
-        print "Check that we can survive a 288 block reorg still"
+        print("Check that we can survive a 288 block reorg still")
         (self.forkheight,self.forkhash) = self.reorg_test() #(1033, )
         # Now create a 288 block reorg by mining a longer chain on N1
         # First disconnect N1
@@ -315,7 +315,7 @@ def run_test(self):
         #                                 \
         #                                  *...**(1320)
 
-        print "Test that we can rerequest a block we previously pruned if needed for a reorg"
+        print("Test that we can rerequest a block we previously pruned if needed for a reorg")
         self.reorg_back()
         # Verify that N2 still has block 1033 on current chain (@), but not on main chain (*)
         # Invalidate 1033 on current chain (@) on N2 and we should be able to reorg to
@@ -335,7 +335,7 @@ def run_test(self):
         #
         # N1 doesn't change because 1033 on main chain (*) is invalid
 
-        print "Done"
+        print("Done")
 
 if __name__ == '__main__':
     PruneTest().main()
diff --git a/qa/rpc-tests/rawtransactions.py b/qa/rpc-tests/rawtransactions.py
index e38ef6c8b1071..7f7b6887a834f 100755
--- a/qa/rpc-tests/rawtransactions.py
+++ b/qa/rpc-tests/rawtransactions.py
@@ -1,5 +1,5 @@
-#!/usr/bin/env python2
-# Copyright (c) 2014-2015 The Bitcoin Core developers
+#!/usr/bin/env python3
+# Copyright (c) 2014-2016 The Bitcoin Core developers
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/qa/rpc-tests/receivedby.py b/qa/rpc-tests/receivedby.py
index 7d8231f5e47cf..a3f97669ea27a 100755
--- a/qa/rpc-tests/receivedby.py
+++ b/qa/rpc-tests/receivedby.py
@@ -1,5 +1,5 @@
-#!/usr/bin/env python2
-# Copyright (c) 2014-2015 The Bitcoin Core developers
+#!/usr/bin/env python3
+# Copyright (c) 2014-2016 The Bitcoin Core developers
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/qa/rpc-tests/reindex.py b/qa/rpc-tests/reindex.py
index 321c2fe422a5f..39564b32bad90 100755
--- a/qa/rpc-tests/reindex.py
+++ b/qa/rpc-tests/reindex.py
@@ -1,5 +1,5 @@
-#!/usr/bin/env python2
-# Copyright (c) 2014-2015 The Bitcoin Core developers
+#!/usr/bin/env python3
+# Copyright (c) 2014-2016 The Bitcoin Core developers
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
@@ -26,7 +26,7 @@ def run_test(self):
         wait_bitcoinds()
         self.nodes[0]=start_node(0, self.options.tmpdir, ["-debug", "-reindex", "-checkblockindex=1"])
         assert_equal(self.nodes[0].getblockcount(), 3)
-        print "Success"
+        print("Success")
 
 if __name__ == '__main__':
     ReindexTest().main()
diff --git a/qa/rpc-tests/replace-by-fee.py b/qa/rpc-tests/replace-by-fee.py
index 4c8ef6de26eb2..4afc3981da112 100755
--- a/qa/rpc-tests/replace-by-fee.py
+++ b/qa/rpc-tests/replace-by-fee.py
@@ -1,5 +1,5 @@
-#!/usr/bin/env python2
-# Copyright (c) 2014-2015 The Bitcoin Core developers
+#!/usr/bin/env python3
+# Copyright (c) 2014-2016 The Bitcoin Core developers
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
@@ -82,34 +82,34 @@ def setup_network(self):
     def run_test(self):
         make_utxo(self.nodes[0], 1*COIN)
 
-        print "Running test simple doublespend..."
+        print("Running test simple doublespend...")
         self.test_simple_doublespend()
 
-        print "Running test doublespend chain..."
+        print("Running test doublespend chain...")
         self.test_doublespend_chain()
 
-        print "Running test doublespend tree..."
+        print("Running test doublespend tree...")
         self.test_doublespend_tree()
 
-        print "Running test replacement feeperkb..."
+        print("Running test replacement feeperkb...")
         self.test_replacement_feeperkb()
 
-        print "Running test spends of conflicting outputs..."
+        print("Running test spends of conflicting outputs...")
         self.test_spends_of_conflicting_outputs()
 
-        print "Running test new unconfirmed inputs..."
+        print("Running test new unconfirmed inputs...")
         self.test_new_unconfirmed_inputs()
 
-        print "Running test too many replacements..."
+        print("Running test too many replacements...")
         self.test_too_many_replacements()
 
-        print "Running test opt-in..."
+        print("Running test opt-in...")
         self.test_opt_in()
 
-        print "Running test prioritised transactions..."
+        print("Running test prioritised transactions...")
         self.test_prioritised_transactions()
 
-        print "Passed\n"
+        print("Passed\n")
 
     def test_simple_doublespend(self):
         """Simple doublespend"""
@@ -459,7 +459,7 @@ def test_opt_in(self):
         except JSONRPCException as exp:
             assert_equal(exp.error['code'], -26)
         else:
-            print tx1b_txid
+            print(tx1b_txid)
             assert(False)
 
         tx1_outpoint = make_utxo(self.nodes[0], int(1.1*COIN))
diff --git a/qa/rpc-tests/rest.py b/qa/rpc-tests/rest.py
index 359f9239fb370..ec9515528ecb7 100755
--- a/qa/rpc-tests/rest.py
+++ b/qa/rpc-tests/rest.py
@@ -1,5 +1,5 @@
-#!/usr/bin/env python2
-# Copyright (c) 2014-2015 The Bitcoin Core developers
+#!/usr/bin/env python3
+# Copyright (c) 2014-2016 The Bitcoin Core developers
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
@@ -13,16 +13,9 @@
 from struct import *
 from io import BytesIO
 from codecs import encode
-import binascii
 
-try:
-    import http.client as httplib
-except ImportError:
-    import httplib
-try:
-    import urllib.parse as urlparse
-except ImportError:
-    import urlparse
+import http.client
+import urllib.parse
 
 def deser_uint256(f):
     r = 0
@@ -33,7 +26,7 @@ def deser_uint256(f):
 
 #allows simple http get calls
 def http_get_call(host, port, path, response_object = 0):
-    conn = httplib.HTTPConnection(host, port)
+    conn = http.client.HTTPConnection(host, port)
     conn.request('GET', path)
 
     if response_object:
@@ -43,7 +36,7 @@ def http_get_call(host, port, path, response_object = 0):
 
 #allows simple http post calls with a request body
 def http_post_call(host, port, path, requestdata = '', response_object = 0):
-    conn = httplib.HTTPConnection(host, port)
+    conn = http.client.HTTPConnection(host, port)
     conn.request('POST', path, requestdata)
 
     if response_object:
@@ -67,8 +60,8 @@ def setup_network(self, split=False):
         self.sync_all()
 
     def run_test(self):
-        url = urlparse.urlparse(self.nodes[0].url)
-        print "Mining blocks..."
+        url = urllib.parse.urlparse(self.nodes[0].url)
+        print("Mining blocks...")
 
         self.nodes[0].generate(1)
         self.sync_all()
@@ -151,7 +144,7 @@ def run_test(self):
         output.write(bin_response)
         output.seek(0)
         chainHeight = unpack("i", output.read(4))[0]
-        hashFromBinResponse = hex(deser_uint256(output))[2:].zfill(65).rstrip("L")
+        hashFromBinResponse = hex(deser_uint256(output))[2:].zfill(64)
 
         assert_equal(bb_hash, hashFromBinResponse) #check if getutxo's chaintip during calculation was fine
         assert_equal(chainHeight, 102) #chain height must be 102
diff --git a/qa/rpc-tests/rpcbind_test.py b/qa/rpc-tests/rpcbind_test.py
index 10a48b5556e40..7b7c01f993cf4 100755
--- a/qa/rpc-tests/rpcbind_test.py
+++ b/qa/rpc-tests/rpcbind_test.py
@@ -1,5 +1,5 @@
-#!/usr/bin/env python2
-# Copyright (c) 2014-2015 The Bitcoin Core developers
+#!/usr/bin/env python3
+# Copyright (c) 2014-2016 The Bitcoin Core developers
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
@@ -51,7 +51,7 @@ def run_allowip_test(tmpdir, allow_ips, rpchost, rpcport):
 
 
 def run_test(tmpdir):
-    assert(sys.platform == 'linux2') # due to OS-specific network stats queries, this test works only on Linux
+    assert(sys.platform.startswith('linux')) # due to OS-specific network stats queries, this test works only on Linux
     # find the first non-loopback interface for testing
     non_loopback_ip = None
     for name,ip in all_interfaces():
diff --git a/qa/rpc-tests/sendheaders.py b/qa/rpc-tests/sendheaders.py
index 2bc32584b5f8e..96d1da729b909 100755
--- a/qa/rpc-tests/sendheaders.py
+++ b/qa/rpc-tests/sendheaders.py
@@ -1,8 +1,7 @@
-#!/usr/bin/env python2
-# Copyright (c) 2014-2015 The Bitcoin Core developers
-# Distributed under the MIT/X11 software license, see the accompanying
+#!/usr/bin/env python3
+# Copyright (c) 2014-2016 The Bitcoin Core developers
+# Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
-#
 
 from test_framework.mininode import *
 from test_framework.test_framework import BitcoinTestFramework
@@ -266,8 +265,8 @@ def run_test(self):
 
         # PART 1
         # 1. Mine a block; expect inv announcements each time
-        print "Part 1: headers don't start before sendheaders message..."
-        for i in xrange(4):
+        print("Part 1: headers don't start before sendheaders message...")
+        for i in range(4):
             old_tip = tip
             tip = self.mine_blocks(1)
             assert_equal(inv_node.check_last_announcement(inv=[tip]), True)
@@ -297,14 +296,14 @@ def run_test(self):
                 inv_node.clear_last_announcement()
                 test_node.clear_last_announcement()
 
-        print "Part 1: success!"
-        print "Part 2: announce blocks with headers after sendheaders message..."
+        print("Part 1: success!")
+        print("Part 2: announce blocks with headers after sendheaders message...")
         # PART 2
         # 2. Send a sendheaders message and test that headers announcements
         # commence and keep working.
         test_node.send_message(msg_sendheaders())
         prev_tip = int(self.nodes[0].getbestblockhash(), 16)
-        test_node.get_headers(locator=[prev_tip], hashstop=0L)
+        test_node.get_headers(locator=[prev_tip], hashstop=0)
         test_node.sync_with_ping()
 
         # Now that we've synced headers, headers announcements should work
@@ -314,14 +313,14 @@ def run_test(self):
 
         height = self.nodes[0].getblockcount()+1
         block_time += 10  # Advance far enough ahead
-        for i in xrange(10):
+        for i in range(10):
             # Mine i blocks, and alternate announcing either via
             # inv (of tip) or via headers. After each, new blocks
             # mined by the node should successfully be announced
             # with block header, even though the blocks are never requested
-            for j in xrange(2):
+            for j in range(2):
                 blocks = []
-                for b in xrange(i+1):
+                for b in range(i+1):
                     blocks.append(create_block(tip, create_coinbase(height), block_time))
                     blocks[-1].solve()
                     tip = blocks[-1].sha256
@@ -360,13 +359,13 @@ def run_test(self):
                 height += 1
                 block_time += 1
 
-        print "Part 2: success!"
+        print("Part 2: success!")
 
-        print "Part 3: headers announcements can stop after large reorg, and resume after headers/inv from peer..."
+        print("Part 3: headers announcements can stop after large reorg, and resume after headers/inv from peer...")
 
         # PART 3.  Headers announcements can stop after large reorg, and resume after
         # getheaders or inv from peer.
-        for j in xrange(2):
+        for j in range(2):
             # First try mining a reorg that can propagate with header announcement
             new_block_hashes = self.mine_reorg(length=7)
             tip = new_block_hashes[-1]
@@ -392,7 +391,7 @@ def run_test(self):
             test_node.get_data(new_block_hashes)
             test_node.wait_for_block(new_block_hashes[-1])
 
-            for i in xrange(3):
+            for i in range(3):
                 # Mine another block, still should get only an inv
                 tip = self.mine_blocks(1)
                 assert_equal(inv_node.check_last_announcement(inv=[tip]), True)
@@ -414,7 +413,7 @@ def run_test(self):
                     # of headers announcements, or mine a new block and inv it, also 
                     # triggering resumption of headers announcements.
                     if j == 0:
-                        test_node.get_headers(locator=[tip], hashstop=0L)
+                        test_node.get_headers(locator=[tip], hashstop=0)
                         test_node.sync_with_ping()
                     else:
                         test_node.send_block_inv(tip)
@@ -424,9 +423,9 @@ def run_test(self):
             assert_equal(inv_node.check_last_announcement(inv=[tip]), True)
             assert_equal(test_node.check_last_announcement(headers=[tip]), True)
 
-        print "Part 3: success!"
+        print("Part 3: success!")
 
-        print "Part 4: Testing direct fetch behavior..."
+        print("Part 4: Testing direct fetch behavior...")
         tip = self.mine_blocks(1)
         height = self.nodes[0].getblockcount() + 1
         last_time = self.nodes[0].getblock(self.nodes[0].getbestblockhash())['time']
@@ -434,7 +433,7 @@ def run_test(self):
 
         # Create 2 blocks.  Send the blocks, then send the headers.
         blocks = []
-        for b in xrange(2):
+        for b in range(2):
             blocks.append(create_block(tip, create_coinbase(height), block_time))
             blocks[-1].solve()
             tip = blocks[-1].sha256
@@ -452,7 +451,7 @@ def run_test(self):
 
         # This time, direct fetch should work
         blocks = []
-        for b in xrange(3):
+        for b in range(3):
             blocks.append(create_block(tip, create_coinbase(height), block_time))
             blocks[-1].solve()
             tip = blocks[-1].sha256
@@ -473,7 +472,7 @@ def run_test(self):
         blocks = []
 
         # Create extra blocks for later
-        for b in xrange(20):
+        for b in range(20):
             blocks.append(create_block(tip, create_coinbase(height), block_time))
             blocks[-1].solve()
             tip = blocks[-1].sha256
@@ -507,7 +506,7 @@ def run_test(self):
         with mininode_lock:
             assert_equal(test_node.last_getdata, None)
 
-        print "Part 4: success!"
+        print("Part 4: success!")
 
         # Finally, check that the inv node never received a getdata request,
         # throughout the test
diff --git a/qa/rpc-tests/signmessages.py b/qa/rpc-tests/signmessages.py
index ff22f35300a4b..4a47c0ca1e198 100755
--- a/qa/rpc-tests/signmessages.py
+++ b/qa/rpc-tests/signmessages.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python3
 # Copyright (c) 2016 The Bitcoin Core developers
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
diff --git a/qa/rpc-tests/signrawtransactions.py b/qa/rpc-tests/signrawtransactions.py
index d51d6ee6106e0..a06ac53191846 100755
--- a/qa/rpc-tests/signrawtransactions.py
+++ b/qa/rpc-tests/signrawtransactions.py
@@ -1,5 +1,5 @@
-#!/usr/bin/env python2
-# Copyright (c) 2015 The Bitcoin Core developers
+#!/usr/bin/env python3
+# Copyright (c) 2015-2016 The Bitcoin Core developers
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/qa/rpc-tests/smartfees.py b/qa/rpc-tests/smartfees.py
index 7239e5a0da825..8fcb99c1b7f4e 100755
--- a/qa/rpc-tests/smartfees.py
+++ b/qa/rpc-tests/smartfees.py
@@ -1,5 +1,5 @@
-#!/usr/bin/env python2
-# Copyright (c) 2014-2015 The Bitcoin Core developers
+#!/usr/bin/env python3
+# Copyright (c) 2014-2016 The Bitcoin Core developers
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
@@ -238,7 +238,7 @@ def run_test(self):
         self.confutxo = self.txouts # Start with the set of confirmed txouts after splitting
         print("Will output estimates for 1/2/3/6/15/25 blocks")
 
-        for i in xrange(2):
+        for i in range(2):
             print("Creating transactions and mining them with a block size that can't keep up")
             # Create transactions and mine 10 small blocks with node 2, but create txs faster than we can mine
             self.transact_and_mine(10, self.nodes[2])
diff --git a/qa/rpc-tests/test_framework/bignum.py b/qa/rpc-tests/test_framework/bignum.py
index b0c58ccd47447..ef800e4d57369 100644
--- a/qa/rpc-tests/test_framework/bignum.py
+++ b/qa/rpc-tests/test_framework/bignum.py
@@ -1,16 +1,15 @@
-#
+#!/usr/bin/env python3
 #
 # bignum.py
 #
 # This file is copied from python-bitcoinlib.
 #
-# Distributed under the MIT/X11 software license, see the accompanying
+# Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 #
 
 """Bignum routines"""
 
-from __future__ import absolute_import, division, print_function, unicode_literals
 
 import struct
 
diff --git a/qa/rpc-tests/test_framework/blockstore.py b/qa/rpc-tests/test_framework/blockstore.py
index 73d9ffbb2fe05..4bc279032bf08 100644
--- a/qa/rpc-tests/test_framework/blockstore.py
+++ b/qa/rpc-tests/test_framework/blockstore.py
@@ -1,16 +1,17 @@
+#!/usr/bin/env python3
 # BlockStore: a helper class that keeps a map of blocks and implements
 #             helper functions for responding to getheaders and getdata,
 #             and for constructing a getheaders message
 #
 
 from .mininode import *
-import dbm
 from io import BytesIO
+import dbm.ndbm
 
 class BlockStore(object):
     def __init__(self, datadir):
-        self.blockDB = dbm.open(datadir + "/blocks", 'c')
-        self.currentBlock = 0L
+        self.blockDB = dbm.ndbm.open(datadir + "/blocks", 'c')
+        self.currentBlock = 0
         self.headers_map = dict()
     
     def close(self):
@@ -67,7 +68,7 @@ def add_block(self, block):
         try:
             self.blockDB[repr(block.sha256)] = bytes(block.serialize())
         except TypeError as e:
-            print "Unexpected error: ", sys.exc_info()[0], e.args
+            print("Unexpected error: ", sys.exc_info()[0], e.args)
         self.currentBlock = block.sha256
         self.headers_map[block.sha256] = CBlockHeader(block)
 
@@ -105,7 +106,7 @@ def get_locator(self, current_tip=None):
 
 class TxStore(object):
     def __init__(self, datadir):
-        self.txDB = dbm.open(datadir + "/transactions", 'c')
+        self.txDB = dbm.ndbm.open(datadir + "/transactions", 'c')
 
     def close(self):
         self.txDB.close()
@@ -127,7 +128,7 @@ def add_transaction(self, tx):
         try:
             self.txDB[repr(tx.sha256)] = bytes(tx.serialize())
         except TypeError as e:
-            print "Unexpected error: ", sys.exc_info()[0], e.args
+            print("Unexpected error: ", sys.exc_info()[0], e.args)
 
     def get_transactions(self, inv):
         responses = []
diff --git a/qa/rpc-tests/test_framework/blocktools.py b/qa/rpc-tests/test_framework/blocktools.py
index 384f40e62dfca..44232153ac702 100644
--- a/qa/rpc-tests/test_framework/blocktools.py
+++ b/qa/rpc-tests/test_framework/blocktools.py
@@ -1,8 +1,8 @@
+#!/usr/bin/env python3
 # blocktools.py - utilities for manipulating blocks and transactions
-# Copyright (c) 2015 The Bitcoin Core developers
-# Distributed under the MIT/X11 software license, see the accompanying
+# Copyright (c) 2015-2016 The Bitcoin Core developers
+# Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
-#
 
 from .mininode import *
 from .script import CScript, OP_TRUE, OP_CHECKSIG
diff --git a/qa/rpc-tests/test_framework/comptool.py b/qa/rpc-tests/test_framework/comptool.py
index 17626cf8dada4..7c92d3f828917 100755
--- a/qa/rpc-tests/test_framework/comptool.py
+++ b/qa/rpc-tests/test_framework/comptool.py
@@ -1,8 +1,7 @@
-#!/usr/bin/env python2
-# Copyright (c) 2015 The Bitcoin Core developers
-# Distributed under the MIT/X11 software license, see the accompanying
+#!/usr/bin/env python3
+# Copyright (c) 2015-2016 The Bitcoin Core developers
+# Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
-#
 
 from .mininode import *
 from .blockstore import BlockStore, TxStore
@@ -259,10 +258,10 @@ def check_results(self, blockhash, outcome):
                     if c.cb.bestblockhash == blockhash:
                         return False
                     if blockhash not in c.cb.block_reject_map:
-                        print 'Block not in reject map: %064x' % (blockhash)
+                        print('Block not in reject map: %064x' % (blockhash))
                         return False
                     if not outcome.match(c.cb.block_reject_map[blockhash]):
-                        print 'Block rejected with %s instead of expected %s: %064x' % (c.cb.block_reject_map[blockhash], outcome, blockhash)
+                        print('Block rejected with %s instead of expected %s: %064x' % (c.cb.block_reject_map[blockhash], outcome, blockhash))
                         return False
                 elif ((c.cb.bestblockhash == blockhash) != outcome):
                     # print c.cb.bestblockhash, blockhash, outcome
@@ -287,10 +286,10 @@ def check_mempool(self, txhash, outcome):
                     if txhash in c.cb.lastInv:
                         return False
                     if txhash not in c.cb.tx_reject_map:
-                        print 'Tx not in reject map: %064x' % (txhash)
+                        print('Tx not in reject map: %064x' % (txhash))
                         return False
                     if not outcome.match(c.cb.tx_reject_map[txhash]):
-                        print 'Tx rejected with %s instead of expected %s: %064x' % (c.cb.tx_reject_map[txhash], outcome, txhash)
+                        print('Tx rejected with %s instead of expected %s: %064x' % (c.cb.tx_reject_map[txhash], outcome, txhash))
                         return False
                 elif ((txhash in c.cb.lastInv) != outcome):
                     # print c.rpc.getrawmempool(), c.cb.lastInv
@@ -393,7 +392,7 @@ def run(self):
                 if (not self.check_mempool(tx.sha256, tx_outcome)):
                     raise AssertionError("Mempool test failed at test %d" % test_number)
 
-            print "Test %d: PASS" % test_number, [ c.rpc.getblockcount() for c in self.connections ]
+            print("Test %d: PASS" % test_number, [ c.rpc.getblockcount() for c in self.connections ])
             test_number += 1
 
         [ c.disconnect_node() for c in self.connections ]
diff --git a/qa/rpc-tests/test_framework/coverage.py b/qa/rpc-tests/test_framework/coverage.py
index d21a001b6efe0..23fce61014040 100644
--- a/qa/rpc-tests/test_framework/coverage.py
+++ b/qa/rpc-tests/test_framework/coverage.py
@@ -1,8 +1,7 @@
-#!/usr/bin/env python2
-# Copyright (c) 2015 The Bitcoin Core developers
-# Distributed under the MIT/X11 software license, see the accompanying
+#!/usr/bin/env python3
+# Copyright (c) 2015-2016 The Bitcoin Core developers
+# Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
-#
 
 """
 This module contains utilities for doing coverage analysis on the RPC
diff --git a/qa/rpc-tests/test_framework/mininode.py b/qa/rpc-tests/test_framework/mininode.py
index 30aecfd445b0e..1617daa20008d 100755
--- a/qa/rpc-tests/test_framework/mininode.py
+++ b/qa/rpc-tests/test_framework/mininode.py
@@ -1,7 +1,12 @@
-# mininode.py - Bitcoin P2P network half-a-node
-#
-# Distributed under the MIT/X11 software license, see the accompanying
+#!/usr/bin/env python3
+# Copyright (c) 2010 ArtForz -- public domain half-a-node
+# Copyright (c) 2012 Jeff Garzik
+# Copyright (c) 2010-2016 The Bitcoin Core developers
+# Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#
+# mininode.py - Bitcoin P2P network half-a-node
 #
 # This python code was modified from ArtForz' public domain  half-a-node, as
 # found in the mini-node branch of http://github.com/jgarzik/pynode.
@@ -34,12 +39,12 @@
 
 BIP0031_VERSION = 60000
 MY_VERSION = 60001  # past bip-31 for ping/pong
-MY_SUBVERSION = b"/python-mininode-tester:0.0.2/"
+MY_SUBVERSION = b"/python-mininode-tester:0.0.3/"
 
 MAX_INV_SZ = 50000
 MAX_BLOCK_SIZE = 1000000
 
-COIN = 100000000L # 1 btc in satoshis
+COIN = 100000000 # 1 btc in satoshis
 
 # Keep our own socket map for asyncore, so that we can track disconnects
 # ourselves (to workaround an issue with closing an asyncore socket when 
@@ -73,20 +78,18 @@ def deser_string(f):
         nit = struct.unpack("<Q", f.read(8))[0]
     return f.read(nit)
 
-
 def ser_string(s):
     if len(s) < 253:
         return struct.pack("B", len(s)) + s
     elif len(s) < 0x10000:
         return struct.pack("<BH", 253, len(s)) + s
-    elif len(s) < 0x100000000L:
+    elif len(s) < 0x100000000:
         return struct.pack("<BI", 254, len(s)) + s
     return struct.pack("<BQ", 255, len(s)) + s
 
-
 def deser_uint256(f):
-    r = 0L
-    for i in xrange(8):
+    r = 0
+    for i in range(8):
         t = struct.unpack("<I", f.read(4))[0]
         r += t << (i * 32)
     return r
@@ -94,23 +97,23 @@ def deser_uint256(f):
 
 def ser_uint256(u):
     rs = b""
-    for i in xrange(8):
-        rs += struct.pack("<I", u & 0xFFFFFFFFL)
+    for i in range(8):
+        rs += struct.pack("<I", u & 0xFFFFFFFF)
         u >>= 32
     return rs
 
 
 def uint256_from_str(s):
-    r = 0L
+    r = 0
     t = struct.unpack("<IIIIIIII", s[:32])
-    for i in xrange(8):
+    for i in range(8):
         r += t[i] << (i * 32)
     return r
 
 
 def uint256_from_compact(c):
     nbytes = (c >> 24) & 0xFF
-    v = (c & 0xFFFFFFL) << (8 * (nbytes - 3))
+    v = (c & 0xFFFFFF) << (8 * (nbytes - 3))
     return v
 
 
@@ -123,7 +126,7 @@ def deser_vector(f, c):
     elif nit == 255:
         nit = struct.unpack("<Q", f.read(8))[0]
     r = []
-    for i in xrange(nit):
+    for i in range(nit):
         t = c()
         t.deserialize(f)
         r.append(t)
@@ -136,7 +139,7 @@ def ser_vector(l):
         r = struct.pack("B", len(l))
     elif len(l) < 0x10000:
         r = struct.pack("<BH", 253, len(l))
-    elif len(l) < 0x100000000L:
+    elif len(l) < 0x100000000:
         r = struct.pack("<BI", 254, len(l))
     else:
         r = struct.pack("<BQ", 255, len(l))
@@ -154,7 +157,7 @@ def deser_uint256_vector(f):
     elif nit == 255:
         nit = struct.unpack("<Q", f.read(8))[0]
     r = []
-    for i in xrange(nit):
+    for i in range(nit):
         t = deser_uint256(f)
         r.append(t)
     return r
@@ -166,7 +169,7 @@ def ser_uint256_vector(l):
         r = struct.pack("B", len(l))
     elif len(l) < 0x10000:
         r = struct.pack("<BH", 253, len(l))
-    elif len(l) < 0x100000000L:
+    elif len(l) < 0x100000000:
         r = struct.pack("<BI", 254, len(l))
     else:
         r = struct.pack("<BQ", 255, len(l))
@@ -184,7 +187,7 @@ def deser_string_vector(f):
     elif nit == 255:
         nit = struct.unpack("<Q", f.read(8))[0]
     r = []
-    for i in xrange(nit):
+    for i in range(nit):
         t = deser_string(f)
         r.append(t)
     return r
@@ -196,7 +199,7 @@ def ser_string_vector(l):
         r = struct.pack("B", len(l))
     elif len(l) < 0x10000:
         r = struct.pack("<BH", 253, len(l))
-    elif len(l) < 0x100000000L:
+    elif len(l) < 0x100000000:
         r = struct.pack("<BI", 254, len(l))
     else:
         r = struct.pack("<BQ", 255, len(l))
@@ -214,7 +217,7 @@ def deser_int_vector(f):
     elif nit == 255:
         nit = struct.unpack("<Q", f.read(8))[0]
     r = []
-    for i in xrange(nit):
+    for i in range(nit):
         t = struct.unpack("<i", f.read(4))[0]
         r.append(t)
     return r
@@ -226,7 +229,7 @@ def ser_int_vector(l):
         r = struct.pack("B", len(l))
     elif len(l) < 0x10000:
         r = struct.pack("<BH", 253, len(l))
-    elif len(l) < 0x100000000L:
+    elif len(l) < 0x100000000:
         r = struct.pack("<BI", 254, len(l))
     else:
         r = struct.pack("<BQ", 255, len(l))
@@ -277,7 +280,7 @@ class CInv(object):
         1: "TX",
         2: "Block"}
 
-    def __init__(self, t=0, h=0L):
+    def __init__(self, t=0, h=0):
         self.type = t
         self.hash = h
 
@@ -528,7 +531,7 @@ def calc_merkle_root(self):
             hashes.append(ser_uint256(tx.sha256))
         while len(hashes) > 1:
             newhashes = []
-            for i in xrange(0, len(hashes), 2):
+            for i in range(0, len(hashes), 2):
                 i2 = min(i+1, len(hashes)-1)
                 newhashes.append(hash256(hashes[i] + hashes[i2]))
             hashes = newhashes
@@ -781,7 +784,7 @@ class msg_getblocks(object):
 
     def __init__(self):
         self.locator = CBlockLocator()
-        self.hashstop = 0L
+        self.hashstop = 0
 
     def deserialize(self, f):
         self.locator = CBlockLocator()
@@ -869,7 +872,7 @@ def __repr__(self):
 class msg_ping(object):
     command = b"ping"
 
-    def __init__(self, nonce=0L):
+    def __init__(self, nonce=0):
         self.nonce = nonce
 
     def deserialize(self, f):
@@ -941,7 +944,7 @@ class msg_getheaders(object):
 
     def __init__(self):
         self.locator = CBlockLocator()
-        self.hashstop = 0L
+        self.hashstop = 0
 
     def deserialize(self, f):
         self.locator = CBlockLocator()
@@ -989,7 +992,7 @@ def __init__(self):
         self.message = b""
         self.code = 0
         self.reason = b""
-        self.data = 0L
+        self.data = 0
 
     def deserialize(self, f):
         self.message = deser_string(f)
@@ -1030,7 +1033,7 @@ def wait_until(predicate, attempts=float('inf'), timeout=float('inf')):
 class msg_feefilter(object):
     command = b"feefilter"
 
-    def __init__(self, feerate=0L):
+    def __init__(self, feerate=0):
         self.feerate = feerate
 
     def deserialize(self, f):
@@ -1079,10 +1082,10 @@ def deliver(self, conn, message):
             time.sleep(deliver_sleep)
         with mininode_lock:
             try:
-                getattr(self, 'on_' + message.command)(conn, message)
+                getattr(self, 'on_' + message.command.decode('ascii'))(conn, message)
             except:
-                print "ERROR delivering %s (%s)" % (repr(message),
-                                                    sys.exc_info()[0])
+                print("ERROR delivering %s (%s)" % (repr(message),
+                                                    sys.exc_info()[0]))
 
     def on_version(self, conn, message):
         if message.nVersion >= 209:
@@ -1200,8 +1203,8 @@ def __init__(self, dstaddr, dstport, rpc, callback, net="regtest", services=1):
         vt.addrFrom.ip = "0.0.0.0"
         vt.addrFrom.port = 0
         self.send_message(vt, True)
-        print 'MiniNode: Connecting to Bitcoin Node IP # ' + dstaddr + ':' \
-            + str(dstport)
+        print('MiniNode: Connecting to Bitcoin Node IP # ' + dstaddr + ':' \
+            + str(dstport))
 
         try:
             self.connect((dstaddr, dstport))
@@ -1294,7 +1297,9 @@ def got_data(self):
                     self.show_debug_msg("Unknown command: '" + command + "' " +
                                         repr(msg))
         except Exception as e:
-            print 'got_data:', repr(e)
+            print('got_data:', repr(e))
+            # import  traceback
+            # traceback.print_tb(sys.exc_info()[2])
 
     def send_message(self, message, pushbuf=False):
         if self.state != "connected" and not pushbuf:
diff --git a/qa/rpc-tests/test_framework/netutil.py b/qa/rpc-tests/test_framework/netutil.py
index 52a7ab74890f1..573b06772d7b3 100644
--- a/qa/rpc-tests/test_framework/netutil.py
+++ b/qa/rpc-tests/test_framework/netutil.py
@@ -1,5 +1,5 @@
-#!/usr/bin/env python2
-# Copyright (c) 2014-2015 The Bitcoin Core developers
+#!/usr/bin/env python3
+# Copyright (c) 2014-2016 The Bitcoin Core developers
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/qa/rpc-tests/test_framework/script.py b/qa/rpc-tests/test_framework/script.py
index 5fb5758f81fa3..44a894fc8f488 100644
--- a/qa/rpc-tests/test_framework/script.py
+++ b/qa/rpc-tests/test_framework/script.py
@@ -1,18 +1,19 @@
+#!/usr/bin/env python3
+# Copyright (c) 2015-2016 The Bitcoin Core developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
 #
 # script.py
 #
 # This file is modified from python-bitcoinlib.
 #
-# Distributed under the MIT/X11 software license, see the accompanying
-# file COPYING or http://www.opensource.org/licenses/mit-license.php.
-#
 
 """Scripts
 
 Functionality to build scripts, as well as SignatureHash().
 """
 
-from __future__ import absolute_import, division, print_function, unicode_literals
 
 from .mininode import CTransaction, CTxOut, hash256
 from binascii import hexlify
@@ -658,7 +659,7 @@ def __coerce_instance(cls, other):
                 other = bchr(CScriptOp(OP_0))
             else:
                 other = CScriptNum.encode(other)
-        elif isinstance(other, (int, long)):
+        elif isinstance(other, int):
             if 0 <= other <= 16:
                 other = bytes(bchr(CScriptOp.encode_op_n(other)))
             elif other == -1:
diff --git a/qa/rpc-tests/test_framework/socks5.py b/qa/rpc-tests/test_framework/socks5.py
index f725d97701747..372f5ed605e4a 100644
--- a/qa/rpc-tests/test_framework/socks5.py
+++ b/qa/rpc-tests/test_framework/socks5.py
@@ -1,11 +1,12 @@
-# Copyright (c) 2015 The Bitcoin Core developers
+#!/usr/bin/env python3
+# Copyright (c) 2015-2016 The Bitcoin Core developers
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 '''
 Dummy Socks5 server for testing.
 '''
-from __future__ import print_function, division, unicode_literals
-import socket, threading, Queue
+
+import socket, threading, queue
 import traceback, sys
 
 ### Protocol constants
@@ -132,7 +133,7 @@ def __init__(self, conf):
         self.s.listen(5)
         self.running = False
         self.thread = None
-        self.queue = Queue.Queue() # report connections and exceptions to client
+        self.queue = queue.Queue() # report connections and exceptions to client
 
     def run(self):
         while self.running:
diff --git a/qa/rpc-tests/test_framework/test_framework.py b/qa/rpc-tests/test_framework/test_framework.py
index 18ecf64b06e59..ed12e1efb6d1a 100755
--- a/qa/rpc-tests/test_framework/test_framework.py
+++ b/qa/rpc-tests/test_framework/test_framework.py
@@ -1,5 +1,5 @@
-#!/usr/bin/env python2
-# Copyright (c) 2014-2015 The Bitcoin Core developers
+#!/usr/bin/env python3
+# Copyright (c) 2014-2016 The Bitcoin Core developers
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
@@ -140,7 +140,7 @@ def main(self):
             print("JSONRPC error: "+e.error['message'])
             traceback.print_tb(sys.exc_info()[2])
         except AssertionError as e:
-            print("Assertion failed: "+ str(e))
+            print("Assertion failed: " + str(e))
             traceback.print_tb(sys.exc_info()[2])
         except KeyError as e:
             print("key not found: "+ str(e))
@@ -189,7 +189,7 @@ def add_options(self, parser):
                           help="bitcoind binary to use for reference nodes (if any)")
 
     def setup_chain(self):
-        print "Initializing test directory "+self.options.tmpdir
+        print("Initializing test directory "+self.options.tmpdir)
         initialize_chain_clean(self.options.tmpdir, self.num_nodes)
 
     def setup_network(self):
diff --git a/qa/rpc-tests/test_framework/util.py b/qa/rpc-tests/test_framework/util.py
index baa1ed6790724..ea3931cef3614 100644
--- a/qa/rpc-tests/test_framework/util.py
+++ b/qa/rpc-tests/test_framework/util.py
@@ -1,4 +1,5 @@
-# Copyright (c) 2014-2015 The Bitcoin Core developers
+#!/usr/bin/env python3
+# Copyright (c) 2014-2016 The Bitcoin Core developers
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
@@ -191,10 +192,10 @@ def initialize_chain(test_dir):
                 args.append("-connect=127.0.0.1:"+str(p2p_port(0)))
             bitcoind_processes[i] = subprocess.Popen(args)
             if os.getenv("PYTHON_DEBUG", ""):
-                print "initialize_chain: bitcoind started, waiting for RPC to come up"
+                print("initialize_chain: bitcoind started, waiting for RPC to come up")
             wait_for_bitcoind_start(bitcoind_processes[i], rpc_url(i), i)
             if os.getenv("PYTHON_DEBUG", ""):
-                print "initialize_chain: RPC succesfully started"
+                print("initialize_chain: RPC succesfully started")
 
         rpcs = []
         for i in range(4):
@@ -275,11 +276,11 @@ def start_node(i, dirname, extra_args=None, rpchost=None, timewait=None, binary=
     if extra_args is not None: args.extend(extra_args)
     bitcoind_processes[i] = subprocess.Popen(args)
     if os.getenv("PYTHON_DEBUG", ""):
-        print "start_node: bitcoind started, waiting for RPC to come up"
+        print("start_node: bitcoind started, waiting for RPC to come up")
     url = rpc_url(i, rpchost)
     wait_for_bitcoind_start(bitcoind_processes[i], url, i)
     if os.getenv("PYTHON_DEBUG", ""):
-        print "start_node: RPC succesfully started"
+        print("start_node: RPC succesfully started")
     proxy = get_rpc_proxy(url, i, timeout=timewait)
 
     if COVERAGE_DIR:
@@ -469,7 +470,7 @@ def assert_is_hex_string(string):
             "Couldn't interpret %r as hexadecimal; raised: %s" % (string, e))
 
 def assert_is_hash_string(string, length=64):
-    if not isinstance(string, basestring):
+    if not isinstance(string, str):
         raise AssertionError("Expected a string, got type %r" % type(string))
     elif length and len(string) != length:
         raise AssertionError(
@@ -520,7 +521,7 @@ def create_confirmed_utxos(fee, node, count):
     addr2 = node.getnewaddress()
     if iterations <= 0:
         return utxos
-    for i in xrange(iterations):
+    for i in range(iterations):
         t = utxos.pop()
         inputs = []
         inputs.append({ "txid" : t["txid"], "vout" : t["vout"]})
@@ -546,11 +547,11 @@ def gen_return_txouts():
     # So we have big transactions (and therefore can't fit very many into each block)
     # create one script_pubkey
     script_pubkey = "6a4d0200" #OP_RETURN OP_PUSH2 512 bytes
-    for i in xrange (512):
+    for i in range (512):
         script_pubkey = script_pubkey + "01"
     # concatenate 128 txouts of above script_pubkey which we'll insert before the txout for change
     txouts = "81"
-    for k in xrange(128):
+    for k in range(128):
         # add txout value
         txouts = txouts + "0000000000000000"
         # add length of script_pubkey
@@ -572,7 +573,7 @@ def create_tx(node, coinbase, to_address, amount):
 def create_lots_of_big_transactions(node, txouts, utxos, fee):
     addr = node.getnewaddress()
     txids = []
-    for i in xrange(len(utxos)):
+    for i in range(len(utxos)):
         t = utxos.pop()
         inputs = []
         inputs.append({ "txid" : t["txid"], "vout" : t["vout"]})
diff --git a/qa/rpc-tests/txn_clone.py b/qa/rpc-tests/txn_clone.py
index b132aec4b6165..5710c29aa60cd 100755
--- a/qa/rpc-tests/txn_clone.py
+++ b/qa/rpc-tests/txn_clone.py
@@ -1,5 +1,5 @@
-#!/usr/bin/env python2
-# Copyright (c) 2014-2015 The Bitcoin Core developers
+#!/usr/bin/env python3
+# Copyright (c) 2014-2016 The Bitcoin Core developers
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/qa/rpc-tests/txn_doublespend.py b/qa/rpc-tests/txn_doublespend.py
index 8d7f6e505d15b..1fbb207e22db8 100755
--- a/qa/rpc-tests/txn_doublespend.py
+++ b/qa/rpc-tests/txn_doublespend.py
@@ -1,5 +1,5 @@
-#!/usr/bin/env python2
-# Copyright (c) 2014-2015 The Bitcoin Core developers
+#!/usr/bin/env python3
+# Copyright (c) 2014-2016 The Bitcoin Core developers
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/qa/rpc-tests/wallet.py b/qa/rpc-tests/wallet.py
index 555f836482d20..42ce0a7260fa3 100755
--- a/qa/rpc-tests/wallet.py
+++ b/qa/rpc-tests/wallet.py
@@ -1,5 +1,5 @@
-#!/usr/bin/env python2
-# Copyright (c) 2014-2015 The Bitcoin Core developers
+#!/usr/bin/env python3
+# Copyright (c) 2014-2016 The Bitcoin Core developers
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
@@ -38,7 +38,7 @@ def run_test (self):
         assert_equal(len(self.nodes[1].listunspent()), 0)
         assert_equal(len(self.nodes[2].listunspent()), 0)
 
-        print "Mining blocks..."
+        print("Mining blocks...")
 
         self.nodes[0].generate(1)
 
@@ -321,7 +321,7 @@ def run_test (self):
             '-salvagewallet',
         ]
         for m in maintenance:
-            print "check " + m
+            print("check " + m)
             stop_nodes(self.nodes)
             wait_bitcoinds()
             self.nodes = start_nodes(3, self.options.tmpdir, [[m]] * 3)
diff --git a/qa/rpc-tests/walletbackup.py b/qa/rpc-tests/walletbackup.py
index 1221a09116791..418f3103e3ad7 100755
--- a/qa/rpc-tests/walletbackup.py
+++ b/qa/rpc-tests/walletbackup.py
@@ -1,5 +1,5 @@
-#!/usr/bin/env python2
-# Copyright (c) 2014-2015 The Bitcoin Core developers
+#!/usr/bin/env python3
+# Copyright (c) 2014-2016 The Bitcoin Core developers
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/qa/rpc-tests/zapwallettxes.py b/qa/rpc-tests/zapwallettxes.py
index 1ba4ded249aad..2f8214f87c26c 100755
--- a/qa/rpc-tests/zapwallettxes.py
+++ b/qa/rpc-tests/zapwallettxes.py
@@ -1,5 +1,5 @@
-#!/usr/bin/env python2
-# Copyright (c) 2014-2015 The Bitcoin Core developers
+#!/usr/bin/env python3
+# Copyright (c) 2014-2016 The Bitcoin Core developers
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
@@ -22,7 +22,7 @@ def setup_network(self, split=False):
         self.sync_all()
 
     def run_test (self):
-        print "Mining blocks..."
+        print("Mining blocks...")
         self.nodes[0].generate(1)
         self.sync_all()
         self.nodes[1].generate(101)
diff --git a/qa/rpc-tests/zmq_test.py b/qa/rpc-tests/zmq_test.py
index 97850bea3c022..f5617a084db7d 100755
--- a/qa/rpc-tests/zmq_test.py
+++ b/qa/rpc-tests/zmq_test.py
@@ -1,5 +1,5 @@
-#!/usr/bin/env python2
-# Copyright (c) 2015 The Bitcoin Core developers
+#!/usr/bin/env python3
+# Copyright (c) 2015-2016 The Bitcoin Core developers
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
@@ -10,17 +10,10 @@
 from test_framework.test_framework import BitcoinTestFramework
 from test_framework.util import *
 import zmq
-import binascii
 import struct
 
-try:
-    import http.client as httplib
-except ImportError:
-    import httplib
-try:
-    import urllib.parse as urlparse
-except ImportError:
-    import urlparse
+import http.client
+import urllib.parse
 
 class ZMQTest (BitcoinTestFramework):
 
@@ -45,7 +38,7 @@ def run_test(self):
         genhashes = self.nodes[0].generate(1)
         self.sync_all()
 
-        print "listen..."
+        print("listen...")
         msg = self.zmqSubSocket.recv_multipart()
         topic = msg[0]
         assert_equal(topic, b"hashtx")

From 52cbce287a0d9b3184fd3aee9d4f1186fd2dd7da Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Fri, 15 Apr 2016 19:53:45 -0400
Subject: [PATCH 0262/1802] net: don't import std namespace

This file is about to be broken up into chunks and moved around. Drop the
namespace now rather than requiring other files to use it.
---
 src/net.cpp | 63 ++++++++++++++++++++++++++---------------------------
 1 file changed, 31 insertions(+), 32 deletions(-)

diff --git a/src/net.cpp b/src/net.cpp
index 6642ef651508d..8ae31e715e36b 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -56,7 +56,6 @@
 #endif
 #endif
 
-using namespace std;
 
 namespace {
     const int MAX_OUTBOUND_CONNECTIONS = 8;
@@ -78,7 +77,7 @@ bool fDiscover = true;
 bool fListen = true;
 uint64_t nLocalServices = NODE_NETWORK;
 CCriticalSection cs_mapLocalHost;
-map<CNetAddr, LocalServiceInfo> mapLocalHost;
+std::map<CNetAddr, LocalServiceInfo> mapLocalHost;
 static bool vfLimited[NET_MAX] = {};
 static CNode* pnodeLocalHost = NULL;
 uint64_t nLocalHostNonce = 0;
@@ -88,20 +87,20 @@ int nMaxConnections = DEFAULT_MAX_PEER_CONNECTIONS;
 bool fAddressesInitialized = false;
 std::string strSubVersion;
 
-vector<CNode*> vNodes;
+std::vector<CNode*> vNodes;
 CCriticalSection cs_vNodes;
-map<uint256, CTransaction> mapRelay;
-deque<pair<int64_t, uint256> > vRelayExpiration;
+std::map<uint256, CTransaction> mapRelay;
+std::deque<std::pair<int64_t, uint256> > vRelayExpiration;
 CCriticalSection cs_mapRelay;
 limitedmap<uint256, int64_t> mapAlreadyAskedFor(MAX_INV_SZ);
 
-static deque<string> vOneShots;
+static std::deque<std::string> vOneShots;
 CCriticalSection cs_vOneShots;
 
-set<CNetAddr> setservAddNodeAddresses;
+std::set<CNetAddr> setservAddNodeAddresses;
 CCriticalSection cs_setservAddNodeAddresses;
 
-vector<std::string> vAddedNodes;
+std::vector<std::string> vAddedNodes;
 CCriticalSection cs_vAddedNodes;
 
 NodeId nLastNodeId = 0;
@@ -135,7 +134,7 @@ bool GetLocal(CService& addr, const CNetAddr *paddrPeer)
     int nBestReachability = -1;
     {
         LOCK(cs_mapLocalHost);
-        for (map<CNetAddr, LocalServiceInfo>::iterator it = mapLocalHost.begin(); it != mapLocalHost.end(); it++)
+        for (std::map<CNetAddr, LocalServiceInfo>::iterator it = mapLocalHost.begin(); it != mapLocalHost.end(); it++)
         {
             int nScore = (*it).second.nScore;
             int nReachability = (*it).first.GetReachabilityFrom(paddrPeer);
@@ -796,7 +795,7 @@ void SocketSendData(CNode *pnode)
     pnode->vSendMsg.erase(pnode->vSendMsg.begin(), it);
 }
 
-static list<CNode*> vNodesDisconnected;
+static std::list<CNode*> vNodesDisconnected;
 
 class CNodeRef {
 public:
@@ -1045,7 +1044,7 @@ void ThreadSocketHandler()
         {
             LOCK(cs_vNodes);
             // Disconnect unused nodes
-            vector<CNode*> vNodesCopy = vNodes;
+            std::vector<CNode*> vNodesCopy = vNodes;
             BOOST_FOREACH(CNode* pnode, vNodesCopy)
             {
                 if (pnode->fDisconnect ||
@@ -1069,7 +1068,7 @@ void ThreadSocketHandler()
         }
         {
             // Delete disconnected nodes
-            list<CNode*> vNodesDisconnectedCopy = vNodesDisconnected;
+            std::list<CNode*> vNodesDisconnectedCopy = vNodesDisconnected;
             BOOST_FOREACH(CNode* pnode, vNodesDisconnectedCopy)
             {
                 // wait until threads are done using it
@@ -1120,7 +1119,7 @@ void ThreadSocketHandler()
 
         BOOST_FOREACH(const ListenSocket& hListenSocket, vhListenSocket) {
             FD_SET(hListenSocket.socket, &fdsetRecv);
-            hSocketMax = max(hSocketMax, hListenSocket.socket);
+            hSocketMax = std::max(hSocketMax, hListenSocket.socket);
             have_fds = true;
         }
 
@@ -1131,7 +1130,7 @@ void ThreadSocketHandler()
                 if (pnode->hSocket == INVALID_SOCKET)
                     continue;
                 FD_SET(pnode->hSocket, &fdsetError);
-                hSocketMax = max(hSocketMax, pnode->hSocket);
+                hSocketMax = std::max(hSocketMax, pnode->hSocket);
                 have_fds = true;
 
                 // Implement the following logic:
@@ -1198,7 +1197,7 @@ void ThreadSocketHandler()
         //
         // Service each socket
         //
-        vector<CNode*> vNodesCopy;
+        std::vector<CNode*> vNodesCopy;
         {
             LOCK(cs_vNodes);
             vNodesCopy = vNodes;
@@ -1355,7 +1354,7 @@ void ThreadMapPort()
             }
         }
 
-        string strDesc = "Bitcoin " + FormatFullVersion();
+        std::string strDesc = "Bitcoin " + FormatFullVersion();
 
         try {
             while (true) {
@@ -1441,7 +1440,7 @@ void ThreadDNSAddressSeed()
         }
     }
 
-    const vector<CDNSSeedData> &vSeeds = Params().DNSSeeds();
+    const std::vector<CDNSSeedData> &vSeeds = Params().DNSSeeds();
     int found = 0;
 
     LogPrintf("Loading addresses from DNS seeds (could take a while)\n");
@@ -1450,8 +1449,8 @@ void ThreadDNSAddressSeed()
         if (HaveNameProxy()) {
             AddOneShot(seed.host);
         } else {
-            vector<CNetAddr> vIPs;
-            vector<CAddress> vAdd;
+            std::vector<CNetAddr> vIPs;
+            std::vector<CAddress> vAdd;
             if (LookupHost(seed.host.c_str(), vIPs, 0, true))
             {
                 BOOST_FOREACH(const CNetAddr& ip, vIPs)
@@ -1508,7 +1507,7 @@ void DumpData()
 
 void static ProcessOneShot()
 {
-    string strDest;
+    std::string strDest;
     {
         LOCK(cs_vOneShots);
         if (vOneShots.empty())
@@ -1574,7 +1573,7 @@ void ThreadOpenConnections()
         // Only connect out to one peer per network group (/16 for IPv4).
         // Do this here so we don't have to critsect vNodes inside mapAddresses critsect.
         int nOutbound = 0;
-        set<vector<unsigned char> > setConnected;
+        std::set<std::vector<unsigned char> > setConnected;
         {
             LOCK(cs_vNodes);
             BOOST_FOREACH(CNode* pnode, vNodes) {
@@ -1632,7 +1631,7 @@ void ThreadOpenAddedConnections()
 
     if (HaveNameProxy()) {
         while(true) {
-            list<string> lAddresses(0);
+            std::list<std::string> lAddresses(0);
             {
                 LOCK(cs_vAddedNodes);
                 BOOST_FOREACH(const std::string& strAddNode, vAddedNodes)
@@ -1650,16 +1649,16 @@ void ThreadOpenAddedConnections()
 
     for (unsigned int i = 0; true; i++)
     {
-        list<string> lAddresses(0);
+        std::list<std::string> lAddresses(0);
         {
             LOCK(cs_vAddedNodes);
             BOOST_FOREACH(const std::string& strAddNode, vAddedNodes)
                 lAddresses.push_back(strAddNode);
         }
 
-        list<vector<CService> > lservAddressesToAdd(0);
+        std::list<std::vector<CService> > lservAddressesToAdd(0);
         BOOST_FOREACH(const std::string& strAddNode, lAddresses) {
-            vector<CService> vservNode(0);
+            std::vector<CService> vservNode(0);
             if(Lookup(strAddNode.c_str(), vservNode, Params().GetDefaultPort(), fNameLookup, 0))
             {
                 lservAddressesToAdd.push_back(vservNode);
@@ -1675,7 +1674,7 @@ void ThreadOpenAddedConnections()
         {
             LOCK(cs_vNodes);
             BOOST_FOREACH(CNode* pnode, vNodes)
-                for (list<vector<CService> >::iterator it = lservAddressesToAdd.begin(); it != lservAddressesToAdd.end(); it++)
+                for (std::list<std::vector<CService> >::iterator it = lservAddressesToAdd.begin(); it != lservAddressesToAdd.end(); it++)
                     BOOST_FOREACH(const CService& addrNode, *(it))
                         if (pnode->addr == addrNode)
                         {
@@ -1684,7 +1683,7 @@ void ThreadOpenAddedConnections()
                             break;
                         }
         }
-        BOOST_FOREACH(vector<CService>& vserv, lservAddressesToAdd)
+        BOOST_FOREACH(std::vector<CService>& vserv, lservAddressesToAdd)
         {
             CSemaphoreGrant grant(*semOutbound);
             OpenNetworkConnection(CAddress(vserv[i % vserv.size()]), &grant);
@@ -1732,7 +1731,7 @@ void ThreadMessageHandler()
     SetThreadPriority(THREAD_PRIORITY_BELOW_NORMAL);
     while (true)
     {
-        vector<CNode*> vNodesCopy;
+        std::vector<CNode*> vNodesCopy;
         {
             LOCK(cs_vNodes);
             vNodesCopy = vNodes;
@@ -1792,7 +1791,7 @@ void ThreadMessageHandler()
 
 
 
-bool BindListenPort(const CService &addrBind, string& strError, bool fWhitelisted)
+bool BindListenPort(const CService &addrBind, std::string& strError, bool fWhitelisted)
 {
     strError = "";
     int nOne = 1;
@@ -1900,7 +1899,7 @@ void static Discover(boost::thread_group& threadGroup)
     char pszHostName[256] = "";
     if (gethostname(pszHostName, sizeof(pszHostName)) != SOCKET_ERROR)
     {
-        vector<CNetAddr> vaddr;
+        std::vector<CNetAddr> vaddr;
         if (LookupHost(pszHostName, vaddr, 0, true))
         {
             BOOST_FOREACH (const CNetAddr &addr, vaddr)
@@ -2300,7 +2299,7 @@ bool CAddrDB::Read(CAddrMan& addr)
     // Don't try to resize to a negative number if file is small
     if (fileSize >= sizeof(uint256))
         dataSize = fileSize - sizeof(uint256);
-    vector<unsigned char> vchData;
+    std::vector<unsigned char> vchData;
     vchData.resize(dataSize);
     uint256 hashIn;
 
@@ -2580,7 +2579,7 @@ bool CBanDB::Read(banmap_t& banSet)
     // Don't try to resize to a negative number if file is small
     if (fileSize >= sizeof(uint256))
         dataSize = fileSize - sizeof(uint256);
-    vector<unsigned char> vchData;
+    std::vector<unsigned char> vchData;
     vchData.resize(dataSize);
     uint256 hashIn;
 

From 9faa4902cd32af9742b7ffcc163725bff226da1f Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Fri, 15 Apr 2016 20:01:40 -0400
Subject: [PATCH 0263/1802] net: remove unused set

---
 src/net.cpp | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/src/net.cpp b/src/net.cpp
index 8ae31e715e36b..771d9e862499f 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -97,9 +97,6 @@ limitedmap<uint256, int64_t> mapAlreadyAskedFor(MAX_INV_SZ);
 static std::deque<std::string> vOneShots;
 CCriticalSection cs_vOneShots;
 
-std::set<CNetAddr> setservAddNodeAddresses;
-CCriticalSection cs_setservAddNodeAddresses;
-
 std::vector<std::string> vAddedNodes;
 CCriticalSection cs_vAddedNodes;
 
@@ -1660,14 +1657,7 @@ void ThreadOpenAddedConnections()
         BOOST_FOREACH(const std::string& strAddNode, lAddresses) {
             std::vector<CService> vservNode(0);
             if(Lookup(strAddNode.c_str(), vservNode, Params().GetDefaultPort(), fNameLookup, 0))
-            {
                 lservAddressesToAdd.push_back(vservNode);
-                {
-                    LOCK(cs_setservAddNodeAddresses);
-                    BOOST_FOREACH(const CService& serv, vservNode)
-                        setservAddNodeAddresses.insert(serv);
-                }
-            }
         }
         // Attempt to connect to each IP for each addnode entry until at least one is successful per addnode entry
         // (keeping in mind that addnode entries can have many IPs if fNameLookup)

From 563f375cdeae3e67a57d8a7187362a4706c33748 Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Fri, 15 Apr 2016 20:03:18 -0400
Subject: [PATCH 0264/1802] net: use the exposed GetNodeSignals() rather than
 g_signals directly

---
 src/net.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/net.cpp b/src/net.cpp
index 771d9e862499f..d6034953cff7e 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -439,7 +439,7 @@ void CNode::CloseSocketDisconnect()
 
 void CNode::PushVersion()
 {
-    int nBestHeight = g_signals.GetHeight().get_value_or(0);
+    int nBestHeight = GetNodeSignals().GetHeight().get_value_or(0);
 
     int64_t nTime = (fInbound ? GetAdjustedTime() : GetTime());
     CAddress addrYou = (addr.IsRoutable() && !IsProxy(addr) ? addr : CAddress(CService("0.0.0.0",0)));
@@ -1742,7 +1742,7 @@ void ThreadMessageHandler()
                 TRY_LOCK(pnode->cs_vRecvMsg, lockRecv);
                 if (lockRecv)
                 {
-                    if (!g_signals.ProcessMessages(pnode))
+                    if (!GetNodeSignals().ProcessMessages(pnode))
                         pnode->CloseSocketDisconnect();
 
                     if (pnode->nSendSize < SendBufferSize())
@@ -1760,7 +1760,7 @@ void ThreadMessageHandler()
             {
                 TRY_LOCK(pnode->cs_vSend, lockSend);
                 if (lockSend)
-                    g_signals.SendMessages(pnode);
+                    GetNodeSignals().SendMessages(pnode);
             }
             boost::this_thread::interruption_point();
         }

From cca221fd211f63b338bd90afc505bd4a22a01d5d Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Mon, 18 Apr 2016 15:58:19 -0400
Subject: [PATCH 0265/1802] net: Drop CNodeRef for AttemptToEvictConnection

Locking for each operation here is unnecessary, and solves the wrong problem.
Additionally, it introduces a problem when cs_vNodes is held in an owning
class, to which invididual CNodeRefs won't have access.

These should be weak pointers anyway, once vNodes contain shared pointers.

Rather than using a refcounting class, use a 3-step process instead.

1. Lock vNodes long enough to snapshot the fields necessary for comparing
2. Unlock and do the comparison
3. Re-lock and mark the resulting node for disconnection if it still exists
---
 src/net.cpp | 84 ++++++++++++++++++++---------------------------------
 1 file changed, 31 insertions(+), 53 deletions(-)

diff --git a/src/net.cpp b/src/net.cpp
index d6034953cff7e..41e657fba3719 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -794,51 +794,22 @@ void SocketSendData(CNode *pnode)
 
 static std::list<CNode*> vNodesDisconnected;
 
-class CNodeRef {
-public:
-    CNodeRef(CNode *pnode) : _pnode(pnode) {
-        LOCK(cs_vNodes);
-        _pnode->AddRef();
-    }
-
-    ~CNodeRef() {
-        LOCK(cs_vNodes);
-        _pnode->Release();
-    }
-
-    CNode& operator *() const {return *_pnode;};
-    CNode* operator ->() const {return _pnode;};
-
-    CNodeRef& operator =(const CNodeRef& other)
-    {
-        if (this != &other) {
-            LOCK(cs_vNodes);
-
-            _pnode->Release();
-            _pnode = other._pnode;
-            _pnode->AddRef();
-        }
-        return *this;
-    }
-
-    CNodeRef(const CNodeRef& other):
-        _pnode(other._pnode)
-    {
-        LOCK(cs_vNodes);
-        _pnode->AddRef();
-    }
-private:
-    CNode *_pnode;
+struct NodeEvictionCandidate
+{
+    NodeId id;
+    int64_t nTimeConnected;
+    int64_t nMinPingUsecTime;
+    CAddress addr;
 };
 
-static bool ReverseCompareNodeMinPingTime(const CNodeRef &a, const CNodeRef &b)
+static bool ReverseCompareNodeMinPingTime(const NodeEvictionCandidate &a, const NodeEvictionCandidate &b)
 {
-    return a->nMinPingUsecTime > b->nMinPingUsecTime;
+    return a.nMinPingUsecTime > b.nMinPingUsecTime;
 }
 
-static bool ReverseCompareNodeTimeConnected(const CNodeRef &a, const CNodeRef &b)
+static bool ReverseCompareNodeTimeConnected(const NodeEvictionCandidate &a, const NodeEvictionCandidate &b)
 {
-    return a->nTimeConnected > b->nTimeConnected;
+    return a.nTimeConnected > b.nTimeConnected;
 }
 
 class CompareNetGroupKeyed
@@ -851,14 +822,14 @@ class CompareNetGroupKeyed
         GetRandBytes(vchSecretKey.data(), vchSecretKey.size());
     }
 
-    bool operator()(const CNodeRef &a, const CNodeRef &b)
+    bool operator()(const NodeEvictionCandidate &a, const NodeEvictionCandidate &b)
     {
         std::vector<unsigned char> vchGroupA, vchGroupB;
         CSHA256 hashA, hashB;
         std::vector<unsigned char> vchA(32), vchB(32);
 
-        vchGroupA = a->addr.GetGroup();
-        vchGroupB = b->addr.GetGroup();
+        vchGroupA = a.addr.GetGroup();
+        vchGroupB = b.addr.GetGroup();
 
         hashA.Write(begin_ptr(vchGroupA), vchGroupA.size());
         hashB.Write(begin_ptr(vchGroupB), vchGroupB.size());
@@ -882,7 +853,7 @@ class CompareNetGroupKeyed
  *   simultaneously better at all of them than honest peers.
  */
 static bool AttemptToEvictConnection(bool fPreferNewConnection) {
-    std::vector<CNodeRef> vEvictionCandidates;
+    std::vector<NodeEvictionCandidate> vEvictionCandidates;
     {
         LOCK(cs_vNodes);
 
@@ -893,7 +864,8 @@ static bool AttemptToEvictConnection(bool fPreferNewConnection) {
                 continue;
             if (node->fDisconnect)
                 continue;
-            vEvictionCandidates.push_back(CNodeRef(node));
+            NodeEvictionCandidate candidate = {node->id, node->nTimeConnected, node->nMinPingUsecTime, node->addr};
+            vEvictionCandidates.push_back(candidate);
         }
     }
 
@@ -928,16 +900,16 @@ static bool AttemptToEvictConnection(bool fPreferNewConnection) {
     std::vector<unsigned char> naMostConnections;
     unsigned int nMostConnections = 0;
     int64_t nMostConnectionsTime = 0;
-    std::map<std::vector<unsigned char>, std::vector<CNodeRef> > mapAddrCounts;
-    BOOST_FOREACH(const CNodeRef &node, vEvictionCandidates) {
-        mapAddrCounts[node->addr.GetGroup()].push_back(node);
-        int64_t grouptime = mapAddrCounts[node->addr.GetGroup()][0]->nTimeConnected;
-        size_t groupsize = mapAddrCounts[node->addr.GetGroup()].size();
+    std::map<std::vector<unsigned char>, std::vector<NodeEvictionCandidate> > mapAddrCounts;
+    BOOST_FOREACH(const NodeEvictionCandidate &node, vEvictionCandidates) {
+        mapAddrCounts[node.addr.GetGroup()].push_back(node);
+        int64_t grouptime = mapAddrCounts[node.addr.GetGroup()][0].nTimeConnected;
+        size_t groupsize = mapAddrCounts[node.addr.GetGroup()].size();
 
         if (groupsize > nMostConnections || (groupsize == nMostConnections && grouptime > nMostConnectionsTime)) {
             nMostConnections = groupsize;
             nMostConnectionsTime = grouptime;
-            naMostConnections = node->addr.GetGroup();
+            naMostConnections = node.addr.GetGroup();
         }
     }
 
@@ -952,9 +924,15 @@ static bool AttemptToEvictConnection(bool fPreferNewConnection) {
             return false;
 
     // Disconnect from the network group with the most connections
-    vEvictionCandidates[0]->fDisconnect = true;
-
-    return true;
+    NodeId evicted = vEvictionCandidates.front().id;
+    LOCK(cs_vNodes);
+    for(std::vector<CNode*>::const_iterator it(vNodes.begin()); it != vNodes.end(); ++it) {
+        if ((*it)->GetId() == evicted) {
+            (*it)->fDisconnect = true;
+            return true;
+        }
+    }
+    return false;
 }
 
 static void AcceptConnection(const ListenSocket& hListenSocket) {

From e53e7c54736b98098553ba1a5191e093684f9114 Mon Sep 17 00:00:00 2001
From: Kaz Wesley <keziahw@gmail.com>
Date: Thu, 5 May 2016 11:55:46 -0700
Subject: [PATCH 0266/1802] don't run ThreadMessageHandler at lowered priority

There's no clear reason ThreadMessageHandler should be low priority.
Fixes #8010 (priority inversion).
---
 src/compat.h | 11 -----------
 src/net.cpp  |  1 -
 src/util.cpp | 13 -------------
 src/util.h   |  1 -
 4 files changed, 26 deletions(-)

diff --git a/src/compat.h b/src/compat.h
index 1225ea18edb85..79a297e5e4010 100644
--- a/src/compat.h
+++ b/src/compat.h
@@ -78,17 +78,6 @@ typedef u_int SOCKET;
 #define MSG_NOSIGNAL 0
 #endif
 
-#ifndef WIN32
-// PRIO_MAX is not defined on Solaris
-#ifndef PRIO_MAX
-#define PRIO_MAX 20
-#endif
-#define THREAD_PRIORITY_LOWEST          PRIO_MAX
-#define THREAD_PRIORITY_BELOW_NORMAL    2
-#define THREAD_PRIORITY_NORMAL          0
-#define THREAD_PRIORITY_ABOVE_NORMAL    (-2)
-#endif
-
 #if HAVE_DECL_STRNLEN == 0
 size_t strnlen( const char *start, size_t max_len);
 #endif // HAVE_DECL_STRNLEN
diff --git a/src/net.cpp b/src/net.cpp
index 6642ef651508d..5e810a0f15888 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -1729,7 +1729,6 @@ void ThreadMessageHandler()
     boost::mutex condition_mutex;
     boost::unique_lock<boost::mutex> lock(condition_mutex);
 
-    SetThreadPriority(THREAD_PRIORITY_BELOW_NORMAL);
     while (true)
     {
         vector<CNode*> vNodesCopy;
diff --git a/src/util.cpp b/src/util.cpp
index 00b75fbdbe38e..3f0f8be544768 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -790,19 +790,6 @@ bool SetupNetworking()
     return true;
 }
 
-void SetThreadPriority(int nPriority)
-{
-#ifdef WIN32
-    SetThreadPriority(GetCurrentThread(), nPriority);
-#else // WIN32
-#ifdef PRIO_THREAD
-    setpriority(PRIO_THREAD, 0, nPriority);
-#else // PRIO_THREAD
-    setpriority(PRIO_PROCESS, 0, nPriority);
-#endif // PRIO_THREAD
-#endif // WIN32
-}
-
 int GetNumCores()
 {
 #if BOOST_VERSION >= 105600
diff --git a/src/util.h b/src/util.h
index 25c9b733e871f..45e81ab67f32d 100644
--- a/src/util.h
+++ b/src/util.h
@@ -208,7 +208,6 @@ std::string HelpMessageOpt(const std::string& option, const std::string& message
  */
 int GetNumCores();
 
-void SetThreadPriority(int nPriority);
 void RenameThread(const char* name);
 
 /**

From b06f6a992b4a80c6a9ef2387bfd81e30a407b245 Mon Sep 17 00:00:00 2001
From: JeremyRand <biolizard89@gmail.com>
Date: Thu, 5 May 2016 23:08:47 +0000
Subject: [PATCH 0267/1802] Fixed invalid example paths in gitian-building.md

The example local paths for "Building fully offline" have an extraneous ".git".  This caused an error when trying to run gbuild, like this

fatal: '/home/user/bitcoin.git' does not appear to be a git repository
fatal: Could not read from remote repository.

This commit fixes that.
---
 doc/gitian-building.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/gitian-building.md b/doc/gitian-building.md
index 13f8ad316b3f5..791f209bb1373 100644
--- a/doc/gitian-building.md
+++ b/doc/gitian-building.md
@@ -443,8 +443,8 @@ Then when building, override the remote URLs that gbuild would otherwise pull fr
 cd /some/root/path/
 git clone https://github.com/bitcoin-core/bitcoin-detached-sigs.git
 
-BTCPATH=/some/root/path/bitcoin.git
-SIGPATH=/some/root/path/bitcoin-detached-sigs.git
+BTCPATH=/some/root/path/bitcoin
+SIGPATH=/some/root/path/bitcoin-detached-sigs
 
 ./bin/gbuild --url bitcoin=${BTCPATH},signature=${SIGPATH} ../bitcoin/contrib/gitian-descriptors/gitian-win-signer.yml
 ```

From b3d18ba072f21d5fdb43c9e3cbf6963190d787bd Mon Sep 17 00:00:00 2001
From: Warren Togami <wtogami@gmail.com>
Date: Thu, 5 May 2016 18:24:27 -0700
Subject: [PATCH 0268/1802] doc: Fedora build requirements, add gcc-c++ and fix
 typo

---
 doc/build-unix.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/build-unix.md b/doc/build-unix.md
index 27c57088af015..bd89978cc2a74 100644
--- a/doc/build-unix.md
+++ b/doc/build-unix.md
@@ -128,7 +128,7 @@ Dependency Build Instructions: Fedora
 -------------------------------------
 Build requirements:
 
-    sudo dnf install libtool make autoconf automake openssl-devel libevent-devel boost-devel libdb4-devel libdb4-cxx-devel
+    sudo dnf install gcc-c++ libtool make autoconf automake openssl-devel libevent-devel boost-devel libdb4-devel libdb4-cxx-devel
 
 Optional:
 
@@ -136,7 +136,7 @@ Optional:
 
 To build with Qt 5 (recommended) you need the following:
 
-    sudo dnf install qt5-qttools-devel qtr5-qtbase-devel protobuf-devel
+    sudo dnf install qt5-qttools-devel qt5-qtbase-devel protobuf-devel
 
 libqrencode (optional) can be installed with:
 

From a4d5855a2518c0727faf737de4febcee5f5c4901 Mon Sep 17 00:00:00 2001
From: 21E14 <21xe14@gmail.com>
Date: Fri, 6 May 2016 00:10:49 -0400
Subject: [PATCH 0269/1802] CCoinsViewErrorCatcher raison-d-etre

---
 src/init.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/init.cpp b/src/init.cpp
index b06f448a001cf..d74e6272eff1c 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -136,6 +136,11 @@ bool ShutdownRequested()
     return fRequestShutdown;
 }
 
+/**
+ * This is a minimally invasive approach to shutdown on LevelDB read errors from the
+ * chainstate, while keeping user interface out of the common library, which is shared
+ * between bitcoind, and bitcoin-qt and non-server tools.
+*/
 class CCoinsViewErrorCatcher : public CCoinsViewBacked
 {
 public:

From 04eaa9095813b854c4299027c595fb9ebaf6f934 Mon Sep 17 00:00:00 2001
From: Jonas Schnelli <dev@jonasschnelli.ch>
Date: Fri, 6 May 2016 11:01:50 +0200
Subject: [PATCH 0270/1802] Add more clear interface for CoinControl.h
 regarding individual feerate

---
 src/coincontrol.h        | 5 ++++-
 src/wallet/rpcwallet.cpp | 6 +++++-
 src/wallet/wallet.cpp    | 5 +++--
 src/wallet/wallet.h      | 2 +-
 4 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/coincontrol.h b/src/coincontrol.h
index 6129397bc8f5d..e33adc4d2b00c 100644
--- a/src/coincontrol.h
+++ b/src/coincontrol.h
@@ -18,7 +18,9 @@ class CCoinControl
     bool fAllowWatchOnly;
     //! Minimum absolute fee (not per kilobyte)
     CAmount nMinimumTotalFee;
-    //! Feerate to use (0 = estimate fee with payTxFee fallback)
+    //! Override estimated feerate
+    bool fOverrideFeeRate;
+    //! Feerate to use if overrideFeeRate is true
     CFeeRate nFeeRate;
 
     CCoinControl()
@@ -34,6 +36,7 @@ class CCoinControl
         setSelected.clear();
         nMinimumTotalFee = 0;
         nFeeRate = CFeeRate(0);
+        fOverrideFeeRate = false;
     }
 
     bool HasSelected() const
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index b14d748b3917e..933cd1e80752d 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -2486,6 +2486,7 @@ UniValue fundrawtransaction(const UniValue& params, bool fHelp)
     bool includeWatching = false;
     bool lockUnspents = false;
     CFeeRate feeRate = CFeeRate(0);
+    bool overrideEstimatedFeerate = false;
 
     if (params.size() > 1) {
       if (params[1].type() == UniValue::VBOOL) {
@@ -2518,7 +2519,10 @@ UniValue fundrawtransaction(const UniValue& params, bool fHelp)
             lockUnspents = options["lockUnspents"].get_bool();
 
         if (options.exists("feeRate"))
+        {
             feeRate = CFeeRate(options["feeRate"].get_real());
+            overrideEstimatedFeerate = true;
+        }
       }
     }
 
@@ -2537,7 +2541,7 @@ UniValue fundrawtransaction(const UniValue& params, bool fHelp)
     CAmount nFeeOut;
     string strFailReason;
 
-    if(!pwalletMain->FundTransaction(tx, nFeeOut, feeRate, changePosition, strFailReason, includeWatching, lockUnspents, changeAddress))
+    if(!pwalletMain->FundTransaction(tx, nFeeOut, overrideEstimatedFeerate, feeRate, changePosition, strFailReason, includeWatching, lockUnspents, changeAddress))
         throw JSONRPCError(RPC_INTERNAL_ERROR, strFailReason);
 
     UniValue result(UniValue::VOBJ);
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index 6b5e3ca7f5994..96c5c416aa863 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -1918,7 +1918,7 @@ bool CWallet::SelectCoins(const vector<COutput>& vAvailableCoins, const CAmount&
     return res;
 }
 
-bool CWallet::FundTransaction(CMutableTransaction& tx, CAmount& nFeeRet, const CFeeRate& specificFeeRate, int& nChangePosInOut, std::string& strFailReason, bool includeWatching, bool lockUnspents, const CTxDestination& destChange)
+bool CWallet::FundTransaction(CMutableTransaction& tx, CAmount& nFeeRet, bool overrideEstimatedFeeRate, const CFeeRate& specificFeeRate, int& nChangePosInOut, std::string& strFailReason, bool includeWatching, bool lockUnspents, const CTxDestination& destChange)
 {
     vector<CRecipient> vecSend;
 
@@ -1933,6 +1933,7 @@ bool CWallet::FundTransaction(CMutableTransaction& tx, CAmount& nFeeRet, const C
     coinControl.destChange = destChange;
     coinControl.fAllowOtherInputs = true;
     coinControl.fAllowWatchOnly = includeWatching;
+    coinControl.fOverrideFeeRate = overrideEstimatedFeeRate;
     coinControl.nFeeRate = specificFeeRate;
 
     BOOST_FOREACH(const CTxIn& txin, tx.vin)
@@ -2244,7 +2245,7 @@ bool CWallet::CreateTransaction(const vector<CRecipient>& vecSend, CWalletTx& wt
                 if (coinControl && nFeeNeeded > 0 && coinControl->nMinimumTotalFee > nFeeNeeded) {
                     nFeeNeeded = coinControl->nMinimumTotalFee;
                 }
-                if (coinControl && coinControl->nFeeRate > CFeeRate(0))
+                if (coinControl && coinControl->fOverrideFeeRate)
                     nFeeNeeded = coinControl->nFeeRate.GetFee(nBytes);
 
                 // If we made it here and we aren't even able to meet the relay fee on the next pass, give up
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
index 7b5168975ce11..7a9e306f6fe0a 100644
--- a/src/wallet/wallet.h
+++ b/src/wallet/wallet.h
@@ -740,7 +740,7 @@ class CWallet : public CCryptoKeyStore, public CValidationInterface
      * Insert additional inputs into the transaction by
      * calling CreateTransaction();
      */
-    bool FundTransaction(CMutableTransaction& tx, CAmount& nFeeRet, const CFeeRate& specificFeeRate, int& nChangePosInOut, std::string& strFailReason, bool includeWatching, bool lockUnspents, const CTxDestination& destChange = CNoDestination());
+    bool FundTransaction(CMutableTransaction& tx, CAmount& nFeeRet, bool overrideEstimatedFeeRate, const CFeeRate& specificFeeRate, int& nChangePosInOut, std::string& strFailReason, bool includeWatching, bool lockUnspents, const CTxDestination& destChange = CNoDestination());
 
     /**
      * Create a new transaction paying the recipients with a set of coins

From 0bf6f302626497184a26b88c61fe6af1741e2a44 Mon Sep 17 00:00:00 2001
From: Pedro Branco <branco@uphold.com>
Date: Tue, 8 Mar 2016 10:37:18 +0000
Subject: [PATCH 0271/1802] Prevent multiple calls to ExtractDestination

---
 src/wallet/rpcwallet.cpp | 41 +++++++++++++++++++---------------------
 1 file changed, 19 insertions(+), 22 deletions(-)

diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index 623037e76648b..8da749f525280 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -2341,13 +2341,14 @@ UniValue listunspent(const UniValue& params, bool fHelp)
             "\nResult\n"
             "[                   (array of json object)\n"
             "  {\n"
-            "    \"txid\" : \"txid\",        (string) the transaction id \n"
+            "    \"txid\" : \"txid\",          (string) the transaction id \n"
             "    \"vout\" : n,               (numeric) the vout value\n"
-            "    \"address\" : \"address\",  (string) the bitcoin address\n"
-            "    \"account\" : \"account\",  (string) DEPRECATED. The associated account, or \"\" for the default account\n"
-            "    \"scriptPubKey\" : \"key\", (string) the script key\n"
+            "    \"address\" : \"address\",    (string) the bitcoin address\n"
+            "    \"account\" : \"account\",    (string) DEPRECATED. The associated account, or \"\" for the default account\n"
+            "    \"scriptPubKey\" : \"key\",   (string) the script key\n"
             "    \"amount\" : x.xxx,         (numeric) the transaction amount in " + CURRENCY_UNIT + "\n"
             "    \"confirmations\" : n,      (numeric) The number of confirmations\n"
+            "    \"redeemScript\" : n        (string) The redeemScript if scriptPubKey is P2SH\n"
             "    \"spendable\" : xxx,        (bool) Whether we have the private keys to spend this output\n"
             "    \"solvable\" : xxx          (bool) Whether we know how to spend this output, ignoring the lack of keys\n"
             "  }\n"
@@ -2393,38 +2394,34 @@ UniValue listunspent(const UniValue& params, bool fHelp)
         if (out.nDepth < nMinDepth || out.nDepth > nMaxDepth)
             continue;
 
-        if (setAddress.size()) {
-            CTxDestination address;
-            if (!ExtractDestination(out.tx->vout[out.i].scriptPubKey, address))
-                continue;
+        CTxDestination address;
+        const CScript& scriptPubKey = out.tx->vout[out.i].scriptPubKey;
+        bool fValidAddress = ExtractDestination(scriptPubKey, address);
 
-            if (!setAddress.count(address))
-                continue;
-        }
+        if (setAddress.size() && (!fValidAddress || !setAddress.count(address)))
+            continue;
 
-        CAmount nValue = out.tx->vout[out.i].nValue;
-        const CScript& pk = out.tx->vout[out.i].scriptPubKey;
         UniValue entry(UniValue::VOBJ);
         entry.push_back(Pair("txid", out.tx->GetHash().GetHex()));
         entry.push_back(Pair("vout", out.i));
-        CTxDestination address;
-        if (ExtractDestination(out.tx->vout[out.i].scriptPubKey, address)) {
+
+        if (fValidAddress) {
             entry.push_back(Pair("address", CBitcoinAddress(address).ToString()));
+
             if (pwalletMain->mapAddressBook.count(address))
                 entry.push_back(Pair("account", pwalletMain->mapAddressBook[address].name));
-        }
-        entry.push_back(Pair("scriptPubKey", HexStr(pk.begin(), pk.end())));
-        if (pk.IsPayToScriptHash()) {
-            CTxDestination address;
-            if (ExtractDestination(pk, address)) {
+
+            if (scriptPubKey.IsPayToScriptHash()) {
                 const CScriptID& hash = boost::get<CScriptID>(address);
                 CScript redeemScript;
                 if (pwalletMain->GetCScript(hash, redeemScript))
                     entry.push_back(Pair("redeemScript", HexStr(redeemScript.begin(), redeemScript.end())));
             }
         }
-        entry.push_back(Pair("amount",ValueFromAmount(nValue)));
-        entry.push_back(Pair("confirmations",out.nDepth));
+
+        entry.push_back(Pair("scriptPubKey", HexStr(scriptPubKey.begin(), scriptPubKey.end())));
+        entry.push_back(Pair("amount", ValueFromAmount(out.tx->vout[out.i].nValue)));
+        entry.push_back(Pair("confirmations", out.nDepth));
         entry.push_back(Pair("spendable", out.fSpendable));
         entry.push_back(Pair("solvable", out.fSolvable));
         results.push_back(entry);

From fabbf6bd62c1d8a290841b63fb1e5acec42ba3b0 Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Wed, 27 Apr 2016 22:29:52 +0200
Subject: [PATCH 0272/1802] [qa] Refactor test_framework and pull tester

* log to stdout
* increase range for p2p and rpc ports
* UPPERCASE_CONSTANTS
* Stop nodes on CTRL+C
---
 qa/pull-tester/rpc-tests.py                   | 83 +++++++++----------
 qa/rpc-tests/test_framework/test_framework.py |  4 +-
 qa/rpc-tests/test_framework/util.py           | 17 +++-
 qa/rpc-tests/walletbackup.py                  |  2 +-
 4 files changed, 56 insertions(+), 50 deletions(-)

diff --git a/qa/pull-tester/rpc-tests.py b/qa/pull-tester/rpc-tests.py
index 15153b7f586fc..e8434b4a6059a 100755
--- a/qa/pull-tester/rpc-tests.py
+++ b/qa/pull-tester/rpc-tests.py
@@ -31,6 +31,14 @@
 
 from tests_config import *
 
+BOLD = ("","")
+if os.name == 'posix':
+    # primitive formatting on supported
+    # terminal via ANSI escape sequences:
+    BOLD = ('\033[0m', '\033[1m')
+
+RPC_TESTS_DIR = BUILDDIR + '/qa/rpc-tests/'
+
 #If imported values are not defined then set to zero (or disabled)
 if 'ENABLE_WALLET' not in vars():
     ENABLE_WALLET=0
@@ -43,29 +51,29 @@
 
 ENABLE_COVERAGE=0
 
-#Create a set to store arguments and create the passOn string
+#Create a set to store arguments and create the passon string
 opts = set()
-passOn = ""
-p = re.compile("^--")
+passon_args = ""
+PASSON_REGEX = re.compile("^--")
 
-bold = ("","")
-if (os.name == 'posix'):
-    bold = ('\033[0m', '\033[1m')
+print_help = False
 
 for arg in sys.argv[1:]:
+    if arg == "--help" or arg == "-h" or arg == "-?":
+        print_help = True
+        break
     if arg == '--coverage':
         ENABLE_COVERAGE = 1
-    elif (p.match(arg) or arg == "-h"):
-        passOn += " " + arg
+    elif PASSON_REGEX.match(arg):
+        passon_args += " " + arg
     else:
         opts.add(arg)
 
 #Set env vars
-buildDir = BUILDDIR
 if "BITCOIND" not in os.environ:
-    os.environ["BITCOIND"] = buildDir + '/src/bitcoind' + EXEEXT
+    os.environ["BITCOIND"] = BUILDDIR + '/src/bitcoind' + EXEEXT
 if "BITCOINCLI" not in os.environ:
-    os.environ["BITCOINCLI"] = buildDir + '/src/bitcoin-cli' + EXEEXT
+    os.environ["BITCOINCLI"] = BUILDDIR + '/src/bitcoin-cli' + EXEEXT
 
 if EXEEXT == ".exe" and "-win" not in opts:
     # https://github.com/bitcoin/bitcoin/commit/d52802551752140cf41f0d9a225a43e84404d3e9
@@ -153,48 +161,35 @@
 ]
 
 def runtests():
+    test_list = []
+    if '-extended' in opts:
+        test_list = testScripts + testScriptsExt
+    elif len(opts) == 0 or (len(opts) == 1 and "-win" in opts):
+        test_list = testScripts
+    else:
+        for t in testScripts + testScriptsExt:
+            if t in opts or re.sub(".py$", "", t) in opts:
+                test_list.append(t)
+
+    if print_help:
+        # Help should be the same for all scripts, so just
+        # call the first and exit
+        subprocess.check_call(RPC_TESTS_DIR + test_list[0] + ' -h', shell=True)
+        sys.exit(0)
+
     coverage = None
 
     if ENABLE_COVERAGE:
         coverage = RPCCoverage()
         print("Initializing coverage directory at %s\n" % coverage.dir)
-
-    rpcTestDir = buildDir + '/qa/rpc-tests/'
-    run_extended = '-extended' in opts
-    cov_flag = coverage.flag if coverage else ''
-    flags = " --srcdir %s/src %s %s" % (buildDir, cov_flag, passOn)
+    flags = " --srcdir %s/src %s %s" % (BUILDDIR, coverage.flag if coverage else '', passon_args)
 
     #Run Tests
-    for i in range(len(testScripts)):
-        if (len(opts) == 0
-                or (len(opts) == 1 and "-win" in opts )
-                or run_extended
-                or testScripts[i] in opts
-                or re.sub(".py$", "", testScripts[i]) in opts ):
-
-            print("Running testscript %s%s%s ..." % (bold[1], testScripts[i], bold[0]))
-            time0 = time.time()
-            subprocess.check_call(
-                rpcTestDir + testScripts[i] + flags, shell=True)
-            print("Duration: %s s\n" % (int(time.time() - time0)))
-
-            # exit if help is called so we print just one set of
-            # instructions
-            p = re.compile(" -h| --help")
-            if p.match(passOn):
-                sys.exit(0)
-
-    # Run Extended Tests
-    for i in range(len(testScriptsExt)):
-        if (run_extended or testScriptsExt[i] in opts
-                or re.sub(".py$", "", testScriptsExt[i]) in opts):
-
-            print(
-                "Running 2nd level testscript "
-                + "%s%s%s ..." % (bold[1], testScriptsExt[i], bold[0]))
+    for t in test_list:
+            print("Running testscript %s%s%s ..." % (BOLD[1], t, BOLD[0]))
             time0 = time.time()
             subprocess.check_call(
-                rpcTestDir + testScriptsExt[i] + flags, shell=True)
+                RPC_TESTS_DIR + t + flags, shell=True)
             print("Duration: %s s\n" % (int(time.time() - time0)))
 
     if coverage:
diff --git a/qa/rpc-tests/test_framework/test_framework.py b/qa/rpc-tests/test_framework/test_framework.py
index ed12e1efb6d1a..103d9a068aa3a 100755
--- a/qa/rpc-tests/test_framework/test_framework.py
+++ b/qa/rpc-tests/test_framework/test_framework.py
@@ -115,7 +115,7 @@ def main(self):
 
         if self.options.trace_rpc:
             import logging
-            logging.basicConfig(level=logging.DEBUG)
+            logging.basicConfig(level=logging.DEBUG, stream=sys.stdout)
 
         if self.options.coveragedir:
             enable_coverage(self.options.coveragedir)
@@ -148,6 +148,8 @@ def main(self):
         except Exception as e:
             print("Unexpected exception caught during testing: " + repr(e))
             traceback.print_tb(sys.exc_info()[2])
+        except KeyboardInterrupt as e:
+            print("Exiting after " + repr(e))
 
         if not self.options.noshutdown:
             print("Stopping nodes")
diff --git a/qa/rpc-tests/test_framework/util.py b/qa/rpc-tests/test_framework/util.py
index ea3931cef3614..4c129b78b5434 100644
--- a/qa/rpc-tests/test_framework/util.py
+++ b/qa/rpc-tests/test_framework/util.py
@@ -28,6 +28,13 @@
 
 COVERAGE_DIR = None
 
+# The maximum number of nodes a single test can spawn
+MAX_NODES = 8
+# Don't assign rpc or p2p ports lower than this
+PORT_MIN = 11000
+# The number of ports to "reserve" for p2p and rpc, each
+PORT_RANGE = 5000
+
 #Set Mocktime default to OFF.
 #MOCKTIME is only needed for scripts that use the
 #cached version of the blockchain.  If the cached
@@ -82,9 +89,11 @@ def get_rpc_proxy(url, node_number, timeout=None):
 
 
 def p2p_port(n):
-    return 11000 + n + os.getpid()%999
+    assert(n <= MAX_NODES)
+    return PORT_MIN + n + (MAX_NODES * os.getpid()) % (PORT_RANGE - 1 - MAX_NODES)
+
 def rpc_port(n):
-    return 12000 + n + os.getpid()%999
+    return PORT_MIN + PORT_RANGE + n + (MAX_NODES * os.getpid()) % (PORT_RANGE -1 - MAX_NODES)
 
 def check_json_precision():
     """Make sure json library being used does not lose precision converting BTC values"""
@@ -292,8 +301,8 @@ def start_nodes(num_nodes, dirname, extra_args=None, rpchost=None, binary=None):
     """
     Start multiple bitcoinds, return RPC connections to them
     """
-    if extra_args is None: extra_args = [ None for i in range(num_nodes) ]
-    if binary is None: binary = [ None for i in range(num_nodes) ]
+    if extra_args is None: extra_args = [ None for _ in range(num_nodes) ]
+    if binary is None: binary = [ None for _ in range(num_nodes) ]
     rpcs = []
     try:
         for i in range(num_nodes):
diff --git a/qa/rpc-tests/walletbackup.py b/qa/rpc-tests/walletbackup.py
index 418f3103e3ad7..c3d53669c9fa4 100755
--- a/qa/rpc-tests/walletbackup.py
+++ b/qa/rpc-tests/walletbackup.py
@@ -37,7 +37,7 @@
 from test_framework.util import *
 from random import randint
 import logging
-logging.basicConfig(format='%(levelname)s:%(message)s', level=logging.INFO)
+logging.basicConfig(format='%(levelname)s: %(message)s', level=logging.INFO, stream=sys.stdout)
 
 class WalletBackupTest(BitcoinTestFramework):
 

From 2222dae6e31c433f83aa9fd0e8f028cbee59199b Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Sat, 30 Apr 2016 00:03:06 +0200
Subject: [PATCH 0273/1802] [qa] Update README.md

---
 qa/README.md | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/qa/README.md b/qa/README.md
index 3e0a526d1306f..c7e574ff70ef4 100644
--- a/qa/README.md
+++ b/qa/README.md
@@ -19,15 +19,25 @@ sudo apt-get install python3-zmq
 Running tests
 =============
 
-You can run any single test by calling `qa/pull-tester/rpc-tests.py <testname>`.
+You can run any single test by calling
 
-Or you can run any combination of tests by calling `qa/pull-tester/rpc-tests.py <testname1> <testname2> <testname3> ...`
+    qa/pull-tester/rpc-tests.py <testname>
 
-Run the regression test suite with `qa/pull-tester/rpc-tests.py`
+Or you can run any combination of tests by calling
 
-Run all possible tests with `qa/pull-tester/rpc-tests.py -extended`
+    qa/pull-tester/rpc-tests.py <testname1> <testname2> <testname3> ...
 
-Possible options:
+Run the regression test suite with
+
+    qa/pull-tester/rpc-tests.py
+
+Run all possible tests with
+
+    qa/pull-tester/rpc-tests.py -extended
+
+If you want to create a basic coverage report for the rpc test suite, append `--coverage`.
+
+Possible options, which apply to each individual test run:
 
 ```
   -h, --help            show this help message and exit

From fafb33cdefd2d8ce065263978075d26a1672b630 Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Sat, 30 Apr 2016 14:55:31 +0200
Subject: [PATCH 0274/1802] [qa] Stop other nodes, even when one fails to stop

---
 qa/rpc-tests/test_framework/util.py | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/qa/rpc-tests/test_framework/util.py b/qa/rpc-tests/test_framework/util.py
index 4c129b78b5434..6dc685ea1b46f 100644
--- a/qa/rpc-tests/test_framework/util.py
+++ b/qa/rpc-tests/test_framework/util.py
@@ -16,6 +16,7 @@
 from base64 import b64encode
 from decimal import Decimal, ROUND_DOWN
 import json
+import http.client
 import random
 import shutil
 import subprocess
@@ -316,13 +317,19 @@ def log_filename(dirname, n_node, logname):
     return os.path.join(dirname, "node"+str(n_node), "regtest", logname)
 
 def stop_node(node, i):
-    node.stop()
+    try:
+        node.stop()
+    except http.client.CannotSendRequest as e:
+        print("WARN: Unable to stop node: " + repr(e))
     bitcoind_processes[i].wait()
     del bitcoind_processes[i]
 
 def stop_nodes(nodes):
     for node in nodes:
-        node.stop()
+        try:
+            node.stop()
+        except http.client.CannotSendRequest as e:
+            print("WARN: Unable to stop node: " + repr(e))
     del nodes[:] # Emptying array closes connections as a side effect
 
 def set_node_times(nodes, t):

From addb9d2a092b4fd0384d4ff82e9607e5411eab97 Mon Sep 17 00:00:00 2001
From: instagibbs <gsanders87@gmail.com>
Date: Fri, 6 May 2016 12:53:23 -0400
Subject: [PATCH 0275/1802] Remove state arg from ReconsiderBlock

---
 src/main.cpp           | 2 +-
 src/main.h             | 2 +-
 src/rpc/blockchain.cpp | 8 +++-----
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index 92a38f230fbdd..9489bb1c46170 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -3011,7 +3011,7 @@ bool InvalidateBlock(CValidationState& state, const CChainParams& chainparams, C
     return true;
 }
 
-bool ReconsiderBlock(CValidationState& state, CBlockIndex *pindex) {
+bool ReconsiderBlock(CBlockIndex *pindex) {
     AssertLockHeld(cs_main);
 
     int nHeight = pindex->nHeight;
diff --git a/src/main.h b/src/main.h
index bdf7f5a6874c5..e48cebecb37cb 100644
--- a/src/main.h
+++ b/src/main.h
@@ -464,7 +464,7 @@ CBlockIndex* FindForkInGlobalIndex(const CChain& chain, const CBlockLocator& loc
 bool InvalidateBlock(CValidationState& state, const CChainParams& chainparams, CBlockIndex *pindex);
 
 /** Remove invalidity status from a block and its descendants. */
-bool ReconsiderBlock(CValidationState& state, CBlockIndex *pindex);
+bool ReconsiderBlock(CBlockIndex *pindex);
 
 /** The currently-connected chain of blocks (protected by cs_main). */
 extern CChain chainActive;
diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp
index 6960415e2e7d3..d221012afad33 100644
--- a/src/rpc/blockchain.cpp
+++ b/src/rpc/blockchain.cpp
@@ -973,7 +973,6 @@ UniValue reconsiderblock(const UniValue& params, bool fHelp)
 
     std::string strHash = params[0].get_str();
     uint256 hash(uint256S(strHash));
-    CValidationState state;
 
     {
         LOCK(cs_main);
@@ -981,12 +980,11 @@ UniValue reconsiderblock(const UniValue& params, bool fHelp)
             throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Block not found");
 
         CBlockIndex* pblockindex = mapBlockIndex[hash];
-        ReconsiderBlock(state, pblockindex);
+        ReconsiderBlock(pblockindex);
     }
 
-    if (state.IsValid()) {
-        ActivateBestChain(state, Params());
-    }
+    CValidationState state;
+    ActivateBestChain(state, Params());
 
     if (!state.IsValid()) {
         throw JSONRPCError(RPC_DATABASE_ERROR, state.GetRejectReason());

From db18ab28c7a74bb289bfe6a5f9a4a9f963f71c0b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pavel=20Jan=C3=ADk?= <Pavel@Janik.cz>
Date: Fri, 6 May 2016 11:00:01 +0200
Subject: [PATCH 0276/1802] Reenable multithread scheduler test.

---
 src/test/scheduler_tests.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/test/scheduler_tests.cpp b/src/test/scheduler_tests.cpp
index 9acd0e2430a30..aa12dfbd54f8f 100644
--- a/src/test/scheduler_tests.cpp
+++ b/src/test/scheduler_tests.cpp
@@ -40,7 +40,6 @@ static void MicroSleep(uint64_t n)
 #endif
 }
 
-#if 0 /* Disabled for now because there is a race condition issue in this test - see #6540 */
 BOOST_AUTO_TEST_CASE(manythreads)
 {
     seed_insecure_rand(false);
@@ -116,6 +115,5 @@ BOOST_AUTO_TEST_CASE(manythreads)
     }
     BOOST_CHECK_EQUAL(counterSum, 200);
 }
-#endif
 
 BOOST_AUTO_TEST_SUITE_END()

From 166e4b0dfa283fbdedc9a6a1e83296500c853a31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pavel=20Jan=C3=ADk?= <Pavel@Janik.cz>
Date: Fri, 6 May 2016 11:01:51 +0200
Subject: [PATCH 0277/1802] Notify other serviceQueue thread we are finished to
 prevent deadlocks.

---
 src/scheduler.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/scheduler.cpp b/src/scheduler.cpp
index 184ddc28abbff..52777b61f96c8 100644
--- a/src/scheduler.cpp
+++ b/src/scheduler.cpp
@@ -79,6 +79,7 @@ void CScheduler::serviceQueue()
         }
     }
     --nThreadsServicingQueue;
+    newTaskScheduled.notify_one();
 }
 
 void CScheduler::stop(bool drain)

From fad336648c848c7a4b3e32bae68ea9a22f97e668 Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Sun, 8 May 2016 14:09:49 +0200
Subject: [PATCH 0278/1802] [qa] pull-tester: Adjust comment

---
 qa/pull-tester/rpc-tests.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/qa/pull-tester/rpc-tests.py b/qa/pull-tester/rpc-tests.py
index e8434b4a6059a..c6f91f8cb3342 100755
--- a/qa/pull-tester/rpc-tests.py
+++ b/qa/pull-tester/rpc-tests.py
@@ -172,8 +172,7 @@ def runtests():
                 test_list.append(t)
 
     if print_help:
-        # Help should be the same for all scripts, so just
-        # call the first and exit
+        # Only print help of the first script and exit
         subprocess.check_call(RPC_TESTS_DIR + test_list[0] + ' -h', shell=True)
         sys.exit(0)
 

From 0fd599767d2dabf25ac8c3543cb586cfc4b9d816 Mon Sep 17 00:00:00 2001
From: Patrick Strateman <patrick.strateman@gmail.com>
Date: Mon, 9 May 2016 00:15:12 -0700
Subject: [PATCH 0279/1802] Fix insanity of CWalletDB::WriteTx and
 CWalletTx::WriteToDisk

---
 src/wallet/wallet.cpp   | 14 ++++----------
 src/wallet/wallet.h     |  2 --
 src/wallet/walletdb.cpp | 10 +++++-----
 src/wallet/walletdb.h   |  2 +-
 4 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index 29d7138547bd1..d6895b80f53bc 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -729,7 +729,7 @@ bool CWallet::AddToWallet(const CWalletTx& wtxIn, bool fFromLoadWallet, CWalletD
 
         // Write to disk
         if (fInsertedNew || fUpdated)
-            if (!wtx.WriteToDisk(pwalletdb))
+            if (!pwalletdb->WriteTx(wtx))
                 return false;
 
         // Break debit/credit balance caches:
@@ -829,7 +829,7 @@ bool CWallet::AbandonTransaction(const uint256& hashTx)
             wtx.nIndex = -1;
             wtx.setAbandoned();
             wtx.MarkDirty();
-            wtx.WriteToDisk(&walletdb);
+            walletdb.WriteTx(wtx);
             NotifyTransactionChanged(this, wtx.GetHash(), CT_UPDATED);
             // Iterate over all its outputs, and mark transactions in the wallet that spend them abandoned too
             TxSpends::const_iterator iter = mapTxSpends.lower_bound(COutPoint(hashTx, 0));
@@ -891,7 +891,7 @@ void CWallet::MarkConflicted(const uint256& hashBlock, const uint256& hashTx)
             wtx.nIndex = -1;
             wtx.hashBlock = hashBlock;
             wtx.MarkDirty();
-            wtx.WriteToDisk(&walletdb);
+            walletdb.WriteTx(wtx);
             // Iterate over all its outputs, and mark transactions in the wallet that spend them conflicted too
             TxSpends::const_iterator iter = mapTxSpends.lower_bound(COutPoint(now, 0));
             while (iter != mapTxSpends.end() && iter->first.hash == now) {
@@ -1186,12 +1186,6 @@ void CWalletTx::GetAccountAmounts(const string& strAccount, CAmount& nReceived,
     }
 }
 
-
-bool CWalletTx::WriteToDisk(CWalletDB *pwalletdb)
-{
-    return pwalletdb->WriteTx(GetHash(), *this);
-}
-
 /**
  * Scan the block chain (starting in pindexStart) for transactions
  * from or to us. If fUpdate is true, found transactions that already
@@ -3194,7 +3188,7 @@ bool CWallet::InitLoadWallet()
                     copyTo->fFromMe = copyFrom->fFromMe;
                     copyTo->strFromAccount = copyFrom->strFromAccount;
                     copyTo->nOrderPos = copyFrom->nOrderPos;
-                    copyTo->WriteToDisk(&walletdb);
+                    walletdb.WriteTx(*copyTo);
                 }
             }
         }
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
index c3bd343edd3e7..cc568c3749b7c 100644
--- a/src/wallet/wallet.h
+++ b/src/wallet/wallet.h
@@ -394,8 +394,6 @@ class CWalletTx : public CMerkleTx
     bool InMempool() const;
     bool IsTrusted() const;
 
-    bool WriteToDisk(CWalletDB *pwalletdb);
-
     int64_t GetTxTime() const;
     int GetRequestCount() const;
 
diff --git a/src/wallet/walletdb.cpp b/src/wallet/walletdb.cpp
index f2b5408e92b5d..48579b2821e8e 100644
--- a/src/wallet/walletdb.cpp
+++ b/src/wallet/walletdb.cpp
@@ -55,10 +55,10 @@ bool CWalletDB::ErasePurpose(const string& strPurpose)
     return Erase(make_pair(string("purpose"), strPurpose));
 }
 
-bool CWalletDB::WriteTx(uint256 hash, const CWalletTx& wtx)
+bool CWalletDB::WriteTx(const CWalletTx& wtx)
 {
     nWalletDBUpdated++;
-    return Write(std::make_pair(std::string("tx"), hash), wtx);
+    return Write(std::make_pair(std::string("tx"), wtx.GetHash()), wtx);
 }
 
 bool CWalletDB::EraseTx(uint256 hash)
@@ -291,7 +291,7 @@ DBErrors CWalletDB::ReorderTransactions(CWallet* pwallet)
 
             if (pwtx)
             {
-                if (!WriteTx(pwtx->GetHash(), *pwtx))
+                if (!WriteTx(*pwtx))
                     return DB_LOAD_FAIL;
             }
             else
@@ -315,7 +315,7 @@ DBErrors CWalletDB::ReorderTransactions(CWallet* pwallet)
             // Since we're changing the order, write it back
             if (pwtx)
             {
-                if (!WriteTx(pwtx->GetHash(), *pwtx))
+                if (!WriteTx(*pwtx))
                     return DB_LOAD_FAIL;
             }
             else
@@ -698,7 +698,7 @@ DBErrors CWalletDB::LoadWallet(CWallet* pwallet)
         pwallet->nTimeFirstKey = 1; // 0 would be considered 'no value'
 
     BOOST_FOREACH(uint256 hash, wss.vWalletUpgrade)
-        WriteTx(hash, pwallet->mapWallet[hash]);
+        WriteTx(pwallet->mapWallet[hash]);
 
     // Rewrite encrypted wallets of versions 0.4.0 and 0.5.0rc:
     if (wss.fIsEncrypted && (wss.nFileVersion == 40000 || wss.nFileVersion == 50000))
diff --git a/src/wallet/walletdb.h b/src/wallet/walletdb.h
index fe6c366343599..5345c0907e9cd 100644
--- a/src/wallet/walletdb.h
+++ b/src/wallet/walletdb.h
@@ -87,7 +87,7 @@ class CWalletDB : public CDB
     bool WritePurpose(const std::string& strAddress, const std::string& purpose);
     bool ErasePurpose(const std::string& strAddress);
 
-    bool WriteTx(uint256 hash, const CWalletTx& wtx);
+    bool WriteTx(const CWalletTx& wtx);
     bool EraseTx(uint256 hash);
 
     bool WriteKey(const CPubKey& vchPubKey, const CPrivKey& vchPrivKey, const CKeyMetadata &keyMeta);

From 65fee8e699eb458291810e2d70cfa904d994fecf Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Mon, 9 May 2016 12:08:56 +0200
Subject: [PATCH 0280/1802] test: Revert fatal-ness of missing python-zmq

It looks like travis is using the `travis.yml` from the branch, but runs
the test script from the branch merged into master. This causes
pull requests created before the QA tests python 3 transition to fail.

This temporarily reverts fa05e22e919b7e2e816606f0c0d3dea1bd325bfd
(#7851). It can be restored when this is no longer an issue.
---
 qa/pull-tester/rpc-tests.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/qa/pull-tester/rpc-tests.py b/qa/pull-tester/rpc-tests.py
index 15153b7f586fc..01c2736e6693a 100755
--- a/qa/pull-tester/rpc-tests.py
+++ b/qa/pull-tester/rpc-tests.py
@@ -82,9 +82,9 @@
     try:
         import zmq
     except ImportError as e:
-        print("ERROR: \"import zmq\" failed. Set ENABLE_ZMQ=0 or " \
+        print("WARNING: \"import zmq\" failed. Set ENABLE_ZMQ=0 or " \
             "to run zmq tests, see dependency info in /qa/README.md.")
-        raise e
+        ENABLE_ZMQ=0
 
 #Tests
 testScripts = [

From fe80102d3320c973b34daa245b3e41fb38413223 Mon Sep 17 00:00:00 2001
From: Matthew English <s-matthew-english@users.noreply.github.com>
Date: Mon, 9 May 2016 14:00:28 +0200
Subject: [PATCH 0281/1802] changing "(tests are) automatically run" to
 correspond to the earlier instance of "run automatically (on the build
 server)"

---
 README.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 85b1985560c8f..8e816e7a43fa4 100644
--- a/README.md
+++ b/README.md
@@ -57,8 +57,7 @@ There are also [regression and integration tests](/qa) of the RPC interface, wri
 in Python, that are run automatically on the build server.
 These tests can be run (if the [test dependencies](/qa) are installed) with: `qa/pull-tester/rpc-tests.py`
 
-The Travis CI system makes sure that every pull request is built for Windows
-and Linux, OS X, and that unit and sanity tests are automatically run.
+The Travis CI system makes sure that every pull request is built for Windows, Linux, and OS X, and that unit/sanity tests are run automatically.
 
 ### Manual Quality Assurance (QA) Testing
 

From 5ea450834ed3abae9d85deae336ed65111e02906 Mon Sep 17 00:00:00 2001
From: Jonas Schnelli <dev@jonasschnelli.ch>
Date: Fri, 6 May 2016 12:40:12 +0200
Subject: [PATCH 0282/1802] Autofind rpc tests --srcdir

---
 qa/rpc-tests/test_framework/test_framework.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qa/rpc-tests/test_framework/test_framework.py b/qa/rpc-tests/test_framework/test_framework.py
index ed12e1efb6d1a..0b6d1b6abc91b 100755
--- a/qa/rpc-tests/test_framework/test_framework.py
+++ b/qa/rpc-tests/test_framework/test_framework.py
@@ -102,7 +102,7 @@ def main(self):
                           help="Leave bitcoinds and test.* datadir on exit or error")
         parser.add_option("--noshutdown", dest="noshutdown", default=False, action="store_true",
                           help="Don't stop bitcoinds after the test execution")
-        parser.add_option("--srcdir", dest="srcdir", default="../../src",
+        parser.add_option("--srcdir", dest="srcdir", default=os.path.normpath(os.path.dirname(os.path.realpath(__file__))+"/../../../src"),
                           help="Source directory containing bitcoind/bitcoin-cli (default: %default)")
         parser.add_option("--tmpdir", dest="tmpdir", default=tempfile.mkdtemp(prefix="test"),
                           help="Root directory for datadirs")

From 326231611bda6808b579ab7286e471c36f62e98c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Chirag=20Dav=C3=A9?= <c@chirag.io>
Date: Wed, 4 May 2016 21:40:28 -0700
Subject: [PATCH 0283/1802] fReopenDebugLog and fRequestShutdown should be type
 sig_atomic_t

This allows access as an atomic variable in the presence
of async interrupts.

See issue #7433 for more details
fixes: #7433
---
 src/init.cpp | 2 +-
 src/util.cpp | 2 +-
 src/util.h   | 6 +++++-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/init.cpp b/src/init.cpp
index b06f448a001cf..a9b3f88a32b8f 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -125,7 +125,7 @@ static const char* FEE_ESTIMATES_FILENAME="fee_estimates.dat";
 // shutdown thing.
 //
 
-volatile bool fRequestShutdown = false;
+volatile sig_atomic_t fRequestShutdown = false;
 
 void StartShutdown()
 {
diff --git a/src/util.cpp b/src/util.cpp
index 00b75fbdbe38e..579be338e617c 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -113,7 +113,7 @@ string strMiscWarning;
 bool fLogTimestamps = DEFAULT_LOGTIMESTAMPS;
 bool fLogTimeMicros = DEFAULT_LOGTIMEMICROS;
 bool fLogIPs = DEFAULT_LOGIPS;
-volatile bool fReopenDebugLog = false;
+volatile sig_atomic_t fReopenDebugLog = false;
 CTranslationInterface translationInterface;
 
 /** Init OpenSSL library multithreading support */
diff --git a/src/util.h b/src/util.h
index ac099f11845d3..33db0f9e4acda 100644
--- a/src/util.h
+++ b/src/util.h
@@ -28,6 +28,10 @@
 #include <boost/signals2/signal.hpp>
 #include <boost/thread/exceptions.hpp>
 
+#ifndef WIN32
+#include <signal.h>
+#endif
+
 static const bool DEFAULT_LOGTIMEMICROS = false;
 static const bool DEFAULT_LOGIPS        = false;
 static const bool DEFAULT_LOGTIMESTAMPS = true;
@@ -50,7 +54,7 @@ extern std::string strMiscWarning;
 extern bool fLogTimestamps;
 extern bool fLogTimeMicros;
 extern bool fLogIPs;
-extern volatile bool fReopenDebugLog;
+extern volatile sig_atomic_t fReopenDebugLog;
 extern CTranslationInterface translationInterface;
 
 extern const char * const BITCOIN_CONF_FILENAME;

From 657e07efa34ffe9d8614a618e00452c9ee7c0e0d Mon Sep 17 00:00:00 2001
From: instagibbs <gsanders87@gmail.com>
Date: Mon, 9 May 2016 11:26:37 -0400
Subject: [PATCH 0284/1802] Rename ReconsiderBlock func to reflect real
 behavior

---
 src/main.cpp           | 2 +-
 src/main.h             | 2 +-
 src/rpc/blockchain.cpp | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index 9489bb1c46170..11eaa055d71c9 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -3011,7 +3011,7 @@ bool InvalidateBlock(CValidationState& state, const CChainParams& chainparams, C
     return true;
 }
 
-bool ReconsiderBlock(CBlockIndex *pindex) {
+bool ResetBlockFailureFlags(CBlockIndex *pindex) {
     AssertLockHeld(cs_main);
 
     int nHeight = pindex->nHeight;
diff --git a/src/main.h b/src/main.h
index e48cebecb37cb..ebbd12c8c39c2 100644
--- a/src/main.h
+++ b/src/main.h
@@ -464,7 +464,7 @@ CBlockIndex* FindForkInGlobalIndex(const CChain& chain, const CBlockLocator& loc
 bool InvalidateBlock(CValidationState& state, const CChainParams& chainparams, CBlockIndex *pindex);
 
 /** Remove invalidity status from a block and its descendants. */
-bool ReconsiderBlock(CBlockIndex *pindex);
+bool ResetBlockFailureFlags(CBlockIndex *pindex);
 
 /** The currently-connected chain of blocks (protected by cs_main). */
 extern CChain chainActive;
diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp
index d221012afad33..cf3c73c4dfef6 100644
--- a/src/rpc/blockchain.cpp
+++ b/src/rpc/blockchain.cpp
@@ -980,7 +980,7 @@ UniValue reconsiderblock(const UniValue& params, bool fHelp)
             throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Block not found");
 
         CBlockIndex* pblockindex = mapBlockIndex[hash];
-        ReconsiderBlock(pblockindex);
+        ResetBlockFailureFlags(pblockindex);
     }
 
     CValidationState state;

From fa494dec79b9d469b7eb38d2f0b8cf9832cdc398 Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Fri, 29 Apr 2016 12:51:15 +0200
Subject: [PATCH 0285/1802] [qa] pull-tester: Run rpc test in parallel

---
 qa/README.md                 |  3 ++
 qa/pull-tester/rpc-tests.py  | 92 +++++++++++++++++++++++++++++++-----
 qa/rpc-tests/create_cache.py | 23 +++++++++
 3 files changed, 105 insertions(+), 13 deletions(-)
 create mode 100755 qa/rpc-tests/create_cache.py

diff --git a/qa/README.md b/qa/README.md
index c7e574ff70ef4..7489eb5130ac0 100644
--- a/qa/README.md
+++ b/qa/README.md
@@ -35,6 +35,9 @@ Run all possible tests with
 
     qa/pull-tester/rpc-tests.py -extended
 
+By default, tests will be run in parallel if you want to specify how many
+tests should be run in parallel, append `-paralell=n` (default n=4).
+
 If you want to create a basic coverage report for the rpc test suite, append `--coverage`.
 
 Possible options, which apply to each individual test run:
diff --git a/qa/pull-tester/rpc-tests.py b/qa/pull-tester/rpc-tests.py
index 10c3799b86c25..f926398d58259 100755
--- a/qa/pull-tester/rpc-tests.py
+++ b/qa/pull-tester/rpc-tests.py
@@ -53,10 +53,12 @@
 
 #Create a set to store arguments and create the passon string
 opts = set()
-passon_args = ""
+passon_args = []
 PASSON_REGEX = re.compile("^--")
+PARALLEL_REGEX = re.compile('^-parallel=')
 
 print_help = False
+run_parallel = 4
 
 for arg in sys.argv[1:]:
     if arg == "--help" or arg == "-h" or arg == "-?":
@@ -65,7 +67,9 @@
     if arg == '--coverage':
         ENABLE_COVERAGE = 1
     elif PASSON_REGEX.match(arg):
-        passon_args += " " + arg
+        passon_args.append(arg)
+    elif PARALLEL_REGEX.match(arg):
+        run_parallel = int(arg.split(sep='=', maxsplit=1)[1])
     else:
         opts.add(arg)
 
@@ -96,6 +100,7 @@
 
 #Tests
 testScripts = [
+    'walletbackup.py',
     'bip68-112-113-p2p.py',
     'wallet.py',
     'listtransactions.py',
@@ -116,7 +121,6 @@
     'merkle_blocks.py',
     'fundrawtransaction.py',
     'signrawtransactions.py',
-    'walletbackup.py',
     'nodehandling.py',
     'reindex.py',
     'decodescript.py',
@@ -131,7 +135,7 @@
     'abandonconflict.py',
     'p2p-versionbits-warning.py',
     'importprunedfunds.py',
-    'signmessages.py'
+    'signmessages.py',
 ]
 if ENABLE_ZMQ:
     testScripts.append('zmq_test.py')
@@ -160,6 +164,7 @@
     'pruning.py', # leave pruning last as it takes a REALLY long time
 ]
 
+
 def runtests():
     test_list = []
     if '-extended' in opts:
@@ -173,7 +178,7 @@ def runtests():
 
     if print_help:
         # Only print help of the first script and exit
-        subprocess.check_call(RPC_TESTS_DIR + test_list[0] + ' -h', shell=True)
+        subprocess.check_call((RPC_TESTS_DIR + test_list[0]).split() + ['-h'])
         sys.exit(0)
 
     coverage = None
@@ -181,15 +186,34 @@ def runtests():
     if ENABLE_COVERAGE:
         coverage = RPCCoverage()
         print("Initializing coverage directory at %s\n" % coverage.dir)
-    flags = " --srcdir %s/src %s %s" % (BUILDDIR, coverage.flag if coverage else '', passon_args)
+    flags = ["--srcdir=%s/src" % BUILDDIR] + passon_args
+    if coverage:
+        flags.append(coverage.flag)
+
+    if len(test_list) > 1:
+        # Populate cache
+        subprocess.check_output([RPC_TESTS_DIR + 'create_cache.py'] + flags)
 
     #Run Tests
-    for t in test_list:
-            print("Running testscript %s%s%s ..." % (BOLD[1], t, BOLD[0]))
-            time0 = time.time()
-            subprocess.check_call(
-                RPC_TESTS_DIR + t + flags, shell=True)
-            print("Duration: %s s\n" % (int(time.time() - time0)))
+    max_len_name = len(max(test_list, key=len))
+    time_sum = 0
+    time0 = time.time()
+    job_queue = RPCTestHandler(run_parallel, test_list, flags)
+    results = BOLD[1] + "%s | %s | %s\n\n" % ("TEST".ljust(max_len_name), "PASSED", "DURATION") + BOLD[0]
+    all_passed = True
+    for _ in range(len(test_list)):
+        (name, stdout, stderr, passed, duration) = job_queue.get_next()
+        all_passed = all_passed and passed
+        time_sum += duration
+
+        print('\n' + BOLD[1] + name + BOLD[0] + ":")
+        print(stdout)
+        print('stderr:\n' if not stderr == '' else '', stderr)
+        results += "%s | %s | %s s\n" % (name.ljust(max_len_name), str(passed).ljust(6), duration)
+        print("Pass: %s%s%s, Duration: %s s\n" % (BOLD[1], passed, BOLD[0], duration))
+    results += BOLD[1] + "\n%s | %s | %s s (accumulated)" % ("ALL".ljust(max_len_name), str(all_passed).ljust(6), time_sum) + BOLD[0]
+    print(results)
+    print("\nRuntime: %s s" % (int(time.time() - time0)))
 
     if coverage:
         coverage.report_rpc_coverage()
@@ -197,6 +221,48 @@ def runtests():
         print("Cleaning up coverage data")
         coverage.cleanup()
 
+    sys.exit(not all_passed)
+
+
+class RPCTestHandler:
+    """
+    Trigger the testscrips passed in via the list.
+    """
+
+    def __init__(self, num_tests_parallel, test_list=None, flags=None):
+        assert(num_tests_parallel >= 1)
+        self.num_jobs = num_tests_parallel
+        self.test_list = test_list
+        self.flags = flags
+        self.num_running = 0
+        self.jobs = []
+
+    def get_next(self):
+        while self.num_running < self.num_jobs and self.test_list:
+            # Add tests
+            self.num_running += 1
+            t = self.test_list.pop(0)
+            self.jobs.append((t,
+                              time.time(),
+                              subprocess.Popen((RPC_TESTS_DIR + t).split() + self.flags,
+                                               universal_newlines=True,
+                                               stdout=subprocess.PIPE,
+                                               stderr=subprocess.PIPE)))
+        if not self.jobs:
+            raise IndexError('%s from empty list' % __name__)
+        while True:
+            # Return first proc that finishes
+            time.sleep(.5)
+            for j in self.jobs:
+                (name, time0, proc) = j
+                if proc.poll() is not None:
+                    (stdout, stderr) = proc.communicate(timeout=3)
+                    passed = stderr == "" and proc.returncode == 0
+                    self.num_running -= 1
+                    self.jobs.remove(j)
+                    return name, stdout, stderr, passed, int(time.time() - time0)
+            print('.', end='', flush=True)
+
 
 class RPCCoverage(object):
     """
@@ -215,7 +281,7 @@ class RPCCoverage(object):
     """
     def __init__(self):
         self.dir = tempfile.mkdtemp(prefix="coverage")
-        self.flag = '--coveragedir %s' % self.dir
+        self.flag = '--coveragedir=%s' % self.dir
 
     def report_rpc_coverage(self):
         """
diff --git a/qa/rpc-tests/create_cache.py b/qa/rpc-tests/create_cache.py
new file mode 100755
index 0000000000000..b6161e0917d07
--- /dev/null
+++ b/qa/rpc-tests/create_cache.py
@@ -0,0 +1,23 @@
+#!/usr/bin/env python3
+# Copyright (c) 2016 The Bitcoin Core developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#
+# Helper script to create the cache
+# (see BitcoinTestFramework.setup_chain)
+#
+
+from test_framework.test_framework import BitcoinTestFramework
+
+class CreateCache(BitcoinTestFramework):
+
+    def setup_network(self):
+        # Don't setup any test nodes
+        self.options.noshutdown = True
+
+    def run_test(self):
+        pass
+
+if __name__ == '__main__':
+    CreateCache().main()

From ccccc591a456f9a8fcf5f8e68a5bacdbbaeb0937 Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Mon, 9 May 2016 19:55:49 +0200
Subject: [PATCH 0286/1802] [qa] Add option --portseed to test_framework

---
 qa/pull-tester/rpc-tests.py                   |  3 ++-
 qa/rpc-tests/test_framework/test_framework.py | 13 ++++++++-----
 qa/rpc-tests/test_framework/util.py           | 10 +++++++---
 3 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/qa/pull-tester/rpc-tests.py b/qa/pull-tester/rpc-tests.py
index f926398d58259..f810f89a5991a 100755
--- a/qa/pull-tester/rpc-tests.py
+++ b/qa/pull-tester/rpc-tests.py
@@ -242,9 +242,10 @@ def get_next(self):
             # Add tests
             self.num_running += 1
             t = self.test_list.pop(0)
+            port_seed = ["--portseed=%s" % len(self.test_list)]
             self.jobs.append((t,
                               time.time(),
-                              subprocess.Popen((RPC_TESTS_DIR + t).split() + self.flags,
+                              subprocess.Popen((RPC_TESTS_DIR + t).split() + self.flags + port_seed,
                                                universal_newlines=True,
                                                stdout=subprocess.PIPE,
                                                stderr=subprocess.PIPE)))
diff --git a/qa/rpc-tests/test_framework/test_framework.py b/qa/rpc-tests/test_framework/test_framework.py
index 4e7246309660f..3480de6c6e20c 100755
--- a/qa/rpc-tests/test_framework/test_framework.py
+++ b/qa/rpc-tests/test_framework/test_framework.py
@@ -5,10 +5,10 @@
 
 # Base class for RPC testing
 
-# Add python-bitcoinrpc to module search path:
+import logging
+import optparse
 import os
 import sys
-
 import shutil
 import tempfile
 import traceback
@@ -25,8 +25,9 @@
     enable_coverage,
     check_json_precision,
     initialize_chain_clean,
+    PortSeed,
 )
-from .authproxy import AuthServiceProxy, JSONRPCException
+from .authproxy import JSONRPCException
 
 
 class BitcoinTestFramework(object):
@@ -95,7 +96,6 @@ def join_network(self):
         self.setup_network(False)
 
     def main(self):
-        import optparse
 
         parser = optparse.OptionParser(usage="%prog [options]")
         parser.add_option("--nocleanup", dest="nocleanup", default=False, action="store_true",
@@ -108,18 +108,21 @@ def main(self):
                           help="Root directory for datadirs")
         parser.add_option("--tracerpc", dest="trace_rpc", default=False, action="store_true",
                           help="Print out all RPC calls as they are made")
+        parser.add_option("--portseed", dest="port_seed", default=os.getpid(), type='int',
+                          help="The seed to use for assigning port numbers (default: current process id)")
         parser.add_option("--coveragedir", dest="coveragedir",
                           help="Write tested RPC commands into this directory")
         self.add_options(parser)
         (self.options, self.args) = parser.parse_args()
 
         if self.options.trace_rpc:
-            import logging
             logging.basicConfig(level=logging.DEBUG, stream=sys.stdout)
 
         if self.options.coveragedir:
             enable_coverage(self.options.coveragedir)
 
+        PortSeed.n = self.options.port_seed
+
         os.environ['PATH'] = self.options.srcdir+":"+self.options.srcdir+"/qt:"+os.environ['PATH']
 
         check_json_precision()
diff --git a/qa/rpc-tests/test_framework/util.py b/qa/rpc-tests/test_framework/util.py
index 6dc685ea1b46f..6784177aaac57 100644
--- a/qa/rpc-tests/test_framework/util.py
+++ b/qa/rpc-tests/test_framework/util.py
@@ -8,7 +8,6 @@
 # Helpful routines for regression testing
 #
 
-# Add python-bitcoinrpc to module search path:
 import os
 import sys
 
@@ -36,6 +35,11 @@
 # The number of ports to "reserve" for p2p and rpc, each
 PORT_RANGE = 5000
 
+
+class PortSeed:
+    # Must be initialized with a unique integer for each process
+    n = None
+
 #Set Mocktime default to OFF.
 #MOCKTIME is only needed for scripts that use the
 #cached version of the blockchain.  If the cached
@@ -91,10 +95,10 @@ def get_rpc_proxy(url, node_number, timeout=None):
 
 def p2p_port(n):
     assert(n <= MAX_NODES)
-    return PORT_MIN + n + (MAX_NODES * os.getpid()) % (PORT_RANGE - 1 - MAX_NODES)
+    return PORT_MIN + n + (MAX_NODES * PortSeed.n) % (PORT_RANGE - 1 - MAX_NODES)
 
 def rpc_port(n):
-    return PORT_MIN + PORT_RANGE + n + (MAX_NODES * os.getpid()) % (PORT_RANGE -1 - MAX_NODES)
+    return PORT_MIN + PORT_RANGE + n + (MAX_NODES * PortSeed.n) % (PORT_RANGE - 1 - MAX_NODES)
 
 def check_json_precision():
     """Make sure json library being used does not lose precision converting BTC values"""

From 00678bdb0aeb296456501f818faaa012a75ce18e Mon Sep 17 00:00:00 2001
From: Warren Togami <wtogami@gmail.com>
Date: Mon, 9 May 2016 17:01:33 -0700
Subject: [PATCH 0287/1802] Make failures to connect via Socks5() more
 informative and less unnecessarily scary.

* The "ERROR" was printed far too often during normal operation for what was not an error.
* Makes the Socks5() connect failure similar to the IP connect failure in debug.log.

Before:
`2016-05-09 00:15:00 ERROR: Proxy error: host unreachable`

After:
`2016-05-09 00:15:00 Socks5() connect to t6xj6wilh4ytvcs7.onion:18333 failed: host unreachable"`
---
 src/netbase.cpp | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/netbase.cpp b/src/netbase.cpp
index b44a8b16e20cc..6e81fdcac29b6 100644
--- a/src/netbase.cpp
+++ b/src/netbase.cpp
@@ -379,19 +379,21 @@ static bool Socks5(const std::string& strDest, int port, const ProxyCredentials
         return error("Proxy failed to accept request");
     }
     if (pchRet2[1] != 0x00) {
+        // Failures to connect to a peer that are not proxy errors
         CloseSocket(hSocket);
         switch (pchRet2[1])
         {
-            case 0x01: return error("Proxy error: general failure");
-            case 0x02: return error("Proxy error: connection not allowed");
-            case 0x03: return error("Proxy error: network unreachable");
-            case 0x04: return error("Proxy error: host unreachable");
-            case 0x05: return error("Proxy error: connection refused");
-            case 0x06: return error("Proxy error: TTL expired");
-            case 0x07: return error("Proxy error: protocol error");
-            case 0x08: return error("Proxy error: address type not supported");
-            default:   return error("Proxy error: unknown");
+            case 0x01: LogPrintf("Socks5() connect to %s:%d failed: general failure\n", strDest, port); break;
+            case 0x02: LogPrintf("Socks5() connect to %s:%d failed: connection not allowed\n", strDest, port); break;
+            case 0x03: LogPrintf("Socks5() connect to %s:%d failed: network unreachable\n", strDest, port); break;
+            case 0x04: LogPrintf("Socks5() connect to %s:%d failed: host unreachable\n", strDest, port); break;
+            case 0x05: LogPrintf("Socks5() connect to %s:%d failed: connection refused\n", strDest, port); break;
+            case 0x06: LogPrintf("Socks5() connect to %s:%d failed: TTL expired\n", strDest, port); break;
+            case 0x07: LogPrintf("Socks5() connect to %s:%d failed: protocol error\n", strDest, port); break;
+            case 0x08: LogPrintf("Socks5() connect to %s:%d failed: address type not supported\n", strDest, port); break;
+            default:   LogPrintf("Socks5() connect to %s:%d failed: unknown\n", strDest, port);
         }
+        return false;
     }
     if (pchRet2[2] != 0x00) {
         CloseSocket(hSocket);

From 0d9af79e5084dc2fb6a73abd9dd113dda4e993b4 Mon Sep 17 00:00:00 2001
From: Warren Togami <wtogami@gmail.com>
Date: Mon, 9 May 2016 17:35:14 -0700
Subject: [PATCH 0288/1802] SOCKS5 connecting and connected messages with
 -debug=net.

They were too noisy and not necessary for normal operation.
---
 src/netbase.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/netbase.cpp b/src/netbase.cpp
index 6e81fdcac29b6..5ab12c9a7c43e 100644
--- a/src/netbase.cpp
+++ b/src/netbase.cpp
@@ -294,7 +294,7 @@ struct ProxyCredentials
 /** Connect using SOCKS5 (as described in RFC1928) */
 static bool Socks5(const std::string& strDest, int port, const ProxyCredentials *auth, SOCKET& hSocket)
 {
-    LogPrintf("SOCKS5 connecting %s\n", strDest);
+    LogPrint("net", "SOCKS5 connecting %s\n", strDest);
     if (strDest.size() > 255) {
         CloseSocket(hSocket);
         return error("Hostname too long");
@@ -425,7 +425,7 @@ static bool Socks5(const std::string& strDest, int port, const ProxyCredentials
         CloseSocket(hSocket);
         return error("Error reading from proxy");
     }
-    LogPrintf("SOCKS5 connected %s\n", strDest);
+    LogPrint("net", "SOCKS5 connected %s\n", strDest);
     return true;
 }
 

From 3902a291abecad4da25d496f0e3e2b45f43a7947 Mon Sep 17 00:00:00 2001
From: Tyler Hardin <th020394@gmail.com>
Date: Mon, 9 May 2016 22:26:57 -0400
Subject: [PATCH 0289/1802] Qt: Delay user confirmation of send

I made a subclass of QMessageBox that disables the send button in
exec() and starts a timer that calls a slot to re-enable it after a
configurable delay.

It also has a countdown in the send/yes button while it is disabled
to hint to the user why the send button is disabled (and that it is
actually supposed to be disabled).
---
 src/qt/sendcoinsdialog.cpp | 53 +++++++++++++++++++++++++++++++++++---
 src/qt/sendcoinsdialog.h   | 22 ++++++++++++++++
 2 files changed, 71 insertions(+), 4 deletions(-)

diff --git a/src/qt/sendcoinsdialog.cpp b/src/qt/sendcoinsdialog.cpp
index 780a6c9709ed8..54ebd25833827 100644
--- a/src/qt/sendcoinsdialog.cpp
+++ b/src/qt/sendcoinsdialog.cpp
@@ -26,6 +26,9 @@
 #include <QScrollBar>
 #include <QSettings>
 #include <QTextDocument>
+#include <QTimer>
+
+#define SEND_CONFIRM_DELAY   3
 
 SendCoinsDialog::SendCoinsDialog(const PlatformStyle *platformStyle, QWidget *parent) :
     QDialog(parent),
@@ -311,10 +314,10 @@ void SendCoinsDialog::on_sendButton_clicked()
     questionString.append(QString("<span style='font-size:10pt;font-weight:normal;'><br />(=%2)</span>")
         .arg(alternativeUnits.join(" " + tr("or") + "<br />")));
 
-    QMessageBox::StandardButton retval = QMessageBox::question(this, tr("Confirm send coins"),
-        questionString.arg(formatted.join("<br />")),
-        QMessageBox::Yes | QMessageBox::Cancel,
-        QMessageBox::Cancel);
+    SendConfirmationDialog confirmationDialog(tr("Confirm send coins"),
+        questionString.arg(formatted.join("<br />")), SEND_CONFIRM_DELAY, this);
+    confirmationDialog.exec();
+    QMessageBox::StandardButton retval = (QMessageBox::StandardButton)confirmationDialog.result();
 
     if(retval != QMessageBox::Yes)
     {
@@ -828,3 +831,45 @@ void SendCoinsDialog::coinControlUpdateLabels()
         ui->labelCoinControlInsuffFunds->hide();
     }
 }
+
+SendConfirmationDialog::SendConfirmationDialog(const QString &title, const QString &text, int secDelay,
+    QWidget *parent) :
+    QMessageBox(QMessageBox::Question, title, text, QMessageBox::Yes | QMessageBox::Cancel, parent), secDelay(secDelay)
+{
+    setDefaultButton(QMessageBox::Cancel);
+    yesButton = button(QMessageBox::Yes);
+    updateYesButton();
+    connect(&countDownTimer, SIGNAL(timeout()), this, SLOT(countDown()));
+}
+
+int SendConfirmationDialog::exec()
+{
+    updateYesButton();
+    countDownTimer.start(1000);
+    return QMessageBox::exec();
+}
+
+void SendConfirmationDialog::countDown()
+{
+    secDelay--;
+    updateYesButton();
+
+    if(secDelay <= 0)
+    {
+        countDownTimer.stop();
+    }
+}
+
+void SendConfirmationDialog::updateYesButton()
+{
+    if(secDelay > 0)
+    {
+        yesButton->setEnabled(false);
+        yesButton->setText(tr("Yes") + " (" + QString::number(secDelay) + ")");
+    }
+    else
+    {
+        yesButton->setEnabled(true);
+        yesButton->setText(tr("Yes"));
+    }
+}
diff --git a/src/qt/sendcoinsdialog.h b/src/qt/sendcoinsdialog.h
index ec171734faa20..be4f2ee44ba03 100644
--- a/src/qt/sendcoinsdialog.h
+++ b/src/qt/sendcoinsdialog.h
@@ -8,7 +8,9 @@
 #include "walletmodel.h"
 
 #include <QDialog>
+#include <QMessageBox>
 #include <QString>
+#include <QTimer>
 
 class ClientModel;
 class OptionsModel;
@@ -100,4 +102,24 @@ private Q_SLOTS:
     void message(const QString &title, const QString &message, unsigned int style);
 };
 
+
+
+class SendConfirmationDialog : public QMessageBox
+{
+    Q_OBJECT
+
+public:
+    SendConfirmationDialog(const QString &title, const QString &text, int secDelay = 0, QWidget *parent = 0);
+    int exec();
+
+private Q_SLOTS:
+    void countDown();
+    void updateYesButton();
+
+private:
+    QAbstractButton *yesButton;
+    QTimer countDownTimer;
+    int secDelay;
+};
+
 #endif // BITCOIN_QT_SENDCOINSDIALOG_H

From 2d5603c7e8316c3051304ed22553da64d686df56 Mon Sep 17 00:00:00 2001
From: Tyler Hardin <th020394@gmail.com>
Date: Mon, 9 May 2016 22:46:33 -0400
Subject: [PATCH 0290/1802] Qt: Sort transactions by date

Conflicted transactions can get stuck at the top. This fixes that.
---
 src/qt/overviewpage.cpp    | 2 +-
 src/qt/transactionview.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/qt/overviewpage.cpp b/src/qt/overviewpage.cpp
index d577345e49097..6a0404cbf702f 100644
--- a/src/qt/overviewpage.cpp
+++ b/src/qt/overviewpage.cpp
@@ -219,7 +219,7 @@ void OverviewPage::setWalletModel(WalletModel *model)
         filter->setDynamicSortFilter(true);
         filter->setSortRole(Qt::EditRole);
         filter->setShowInactive(false);
-        filter->sort(TransactionTableModel::Status, Qt::DescendingOrder);
+        filter->sort(TransactionTableModel::Date, Qt::DescendingOrder);
 
         ui->listTransactions->setModel(filter);
         ui->listTransactions->setModelColumn(TransactionTableModel::ToAddress);
diff --git a/src/qt/transactionview.cpp b/src/qt/transactionview.cpp
index eb6111e682e9f..199a7b2d77b1b 100644
--- a/src/qt/transactionview.cpp
+++ b/src/qt/transactionview.cpp
@@ -203,7 +203,7 @@ void TransactionView::setModel(WalletModel *model)
         transactionView->setSelectionBehavior(QAbstractItemView::SelectRows);
         transactionView->setSelectionMode(QAbstractItemView::ExtendedSelection);
         transactionView->setSortingEnabled(true);
-        transactionView->sortByColumn(TransactionTableModel::Status, Qt::DescendingOrder);
+        transactionView->sortByColumn(TransactionTableModel::Date, Qt::DescendingOrder);
         transactionView->verticalHeader()->hide();
 
         transactionView->setColumnWidth(TransactionTableModel::Status, STATUS_COLUMN_WIDTH);

From 90963e53707cf244e6a2a804341e9280628b0c34 Mon Sep 17 00:00:00 2001
From: fanquake <fanquake@gmail.com>
Date: Tue, 10 May 2016 14:23:49 +0800
Subject: [PATCH 0291/1802] [doc] Add basic git squash example

---
 CONTRIBUTING.md | 28 +++++++++++++++++++++-------
 1 file changed, 21 insertions(+), 7 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 53d6527d40718..5c1138b812d47 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -17,13 +17,13 @@ To contribute a patch, the workflow is as follows:
   - Create topic branch
   - Commit patches
 
-The project coding conventions in [doc/developer-notes.md](doc/developer-notes.md) must be adhered to.
+The project coding conventions in the [developer notes](doc/developer-notes.md) must be adhered to.
 
 In general [commits should be atomic](https://en.wikipedia.org/wiki/Atomic_commit#Atomic_commit_convention) and diffs should be easy to read. For this reason do not mix any formatting fixes or code moves with actual code changes.
 
 Commit messages should be verbose by default consisting of a short subject line (50 chars max), a blank line and detailed explanatory text as separate paragraph(s); unless the title alone is self-explanatory (like "Corrected typo in main.cpp") then a single title line is sufficient. Commit messages should be helpful to people reading your code in the future, so explain the reasoning for your decisions. Further explanation [here](http://chris.beams.io/posts/git-commit/).
 
-If a particular commit references another issue, please add the reference, for example "refs #1234", or "fixes #4321". Using "fixes or closes" keywords will cause the corresponding issue to be closed when the pull request is merged.
+If a particular commit references another issue, please add the reference, for example `refs #1234`, or `fixes #4321`. Using the `fixes` or `closes` keywords will cause the corresponding issue to be closed when the pull request is merged.
 
 Please refer to the [Git manual](https://git-scm.com/doc) for more information about Git.
 
@@ -35,13 +35,27 @@ The title of the pull request should be prefixed by the component or area that t
     Consensus: Add new opcode for BIP-XXXX OP_CHECKAWESOMESIG
     Net: Automatically create hidden service, listen on Tor
     Qt: Add feed bump button
-    Trivial: fix typo
+    Trivial: Fix typo in main.cpp
 
-If a pull request is specifically not to be considered for merging (yet) please prefix the title with [WIP] or use [Tasks Lists](https://github.com/blog/1375-task-lists-in-gfm-issues-pulls-comments) in the body of the pull request to indicate tasks are pending.
+If a pull request is specifically not to be considered for merging (yet) please prefix the title with [WIP] or use [Tasks Lists](https://help.github.com/articles/basic-writing-and-formatting-syntax/#task-lists) in the body of the pull request to indicate tasks are pending.
 
 The body of the pull request should contain enough description about what the patch does together with any justification/reasoning. You should include references to any discussions (for example other tickets or mailing list discussions).
 
-At this stage one should expect comments and review from other contributors. You can add more commits to your pull request by committing them locally and pushing to your fork until you have satisfied all feedback. If your pull request is accepted for merging, you may be asked by a maintainer to squash and or rebase your commits before it will be merged. The length of time required for peer review is unpredictable and will vary from patch to patch.
+At this stage one should expect comments and review from other contributors. You can add more commits to your pull request by committing them locally and pushing to your fork until you have satisfied all feedback.
+
+Squashing Commits
+---------------------------
+If your pull request is accepted for merging, you may be asked by a maintainer to squash and or [rebase](https://git-scm.com/docs/git-rebase) your commits before it will be merged. The basic squashing workflow is shown below.
+
+    git checkout your_branch_name
+    git rebase -i HEAD~n
+    # n is normally the number of commits in the pull
+    # set commits from 'pick' to 'squash', save and quit
+    # on the next screen, edit/refine commit messages
+    # save and quit
+    git push -f # (force push to GitHub)
+
+The length of time required for peer review is unpredictable and will vary from pull request to pull request.
 
 
 Pull Request Philosophy
@@ -61,7 +75,7 @@ Refactoring is a necessary part of any software project's evolution. The followi
 
 There are three categories of refactoring, code only moves, code style fixes, code refactoring. In general refactoring pull requests should not mix these three kinds of activity in order to make refactoring pull requests easy to review and uncontroversial. In all cases, refactoring PRs must not change the behaviour of code within the pull request (bugs must be preserved as is).
 
-Project maintainers aim for a quick turnaround on refactoring pull requests, so where possible keep them short, uncomplex and easy to verify. 
+Project maintainers aim for a quick turnaround on refactoring pull requests, so where possible keep them short, uncomplex and easy to verify.
 
 
 "Decision Making" Process
@@ -69,7 +83,7 @@ Project maintainers aim for a quick turnaround on refactoring pull requests, so
 
 The following applies to code changes to the Bitcoin Core project (and related projects such as libsecp256k1), and is not to be confused with overall Bitcoin Network Protocol consensus changes.
 
-Whether a pull request is merged into Bitcoin Core rests with the project merge maintainers and ultimately the project lead. 
+Whether a pull request is merged into Bitcoin Core rests with the project merge maintainers and ultimately the project lead.
 
 Maintainers will take into consideration if a patch is in line with the general principles of the project; meets the minimum standards for inclusion; and will judge the general consensus of contributors.
 

From 3e2c946cfdfdaae4b00793a554157762d1971705 Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Tue, 10 May 2016 12:53:49 +0200
Subject: [PATCH 0292/1802] init: Move berkeleydb version reporting to wallet

Move the version reporting to Wallet::Verify, before starting
verification of the wallet.

This removes the dependency of init on a specific wallet database
library.

A further, trivial step towards resolving #7965.
---
 src/init.cpp          | 5 -----
 src/wallet/wallet.cpp | 1 +
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/init.cpp b/src/init.cpp
index b06f448a001cf..a46cc52a845e9 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -37,9 +37,7 @@
 #include "utilmoneystr.h"
 #include "validationinterface.h"
 #ifdef ENABLE_WALLET
-#include "wallet/db.h"
 #include "wallet/wallet.h"
-#include "wallet/walletdb.h"
 #endif
 #include <stdint.h>
 #include <stdio.h>
@@ -986,9 +984,6 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
     if (fPrintToDebugLog)
         OpenDebugLog();
 
-#ifdef ENABLE_WALLET
-    LogPrintf("Using BerkeleyDB version %s\n", DbEnv::version(0, 0, 0));
-#endif
     if (!fLogTimestamps)
         LogPrintf("Startup time: %s\n", DateTimeStrFormat("%Y-%m-%d %H:%M:%S", GetTime()));
     LogPrintf("Default data directory %s\n", GetDefaultDataDir().string());
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index 29d7138547bd1..d32fe43ed84f6 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -368,6 +368,7 @@ void CWallet::Flush(bool shutdown)
 
 bool CWallet::Verify()
 {
+    LogPrintf("Using BerkeleyDB version %s\n", DbEnv::version(0, 0, 0));
     std::string walletFile = GetArg("-wallet", DEFAULT_WALLET_DAT);
 
     LogPrintf("Using wallet %s\n", walletFile);

From ac40ed780079861e67d5c026e5026e8cc387eb24 Mon Sep 17 00:00:00 2001
From: error10 <error@ioerror.us>
Date: Fri, 4 Dec 2015 14:00:18 -0500
Subject: [PATCH 0293/1802] Increase timeout waiting for pruned blk00000.dat

In my ever-growing list of test failures, I was seeing this one intermittently.

```
Running 2nd level testscript pruning.py...
Initializing test directory /tmp/testY5ypCv
Warning! This test requires 4GB of disk space and takes over 30 mins (up to 2 hours)
Mining a big blockchain of 995 blocks
Check that we haven't started pruning yet because we're below PruneAfterHeight
Success
Though we're already using more than 550MB, current usage: 587
Mining 25 more blocks should cause the first block file to be pruned
Assertion failed: blk00000.dat not pruned when it should be
  File "/home/error/bitcoinxt-0.11D/qa/rpc-tests/test_framework/test_framework.py", line 118, in main
    self.run_test()
  File "/home/error/bitcoinxt-0.11D/qa/rpc-tests/pruning.py", line 272, in run_test
    self.test_height_min()
  File "/home/error/bitcoinxt-0.11D/qa/rpc-tests/pruning.py", line 94, in test_height_min
    raise AssertionError("blk00000.dat not pruned when it should be")
Stopping nodes
Failed
```

After digging into the test, I found that the code is waiting 10 seconds for blk00000.dat to be deleted, and then throwing this failure if it still exists after 10 seconds.

I increased this amount, had the script print the actual time taken, and ran the test a few more times. The time taken ranged between 8 to 12 seconds. So, I feel that this timeout is too short.

After changing the timeout to 30 seconds, the test passes consistently.
(cherry picked from commit 3469911c89a48dd2fefe4d1c2a0c176256e14ee0)
---
 qa/rpc-tests/pruning.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qa/rpc-tests/pruning.py b/qa/rpc-tests/pruning.py
index 92d33bd20ec3e..eac2272db25c0 100755
--- a/qa/rpc-tests/pruning.py
+++ b/qa/rpc-tests/pruning.py
@@ -75,7 +75,7 @@ def test_height_min(self):
         waitstart = time.time()
         while os.path.isfile(self.prunedir+"blk00000.dat"):
             time.sleep(0.1)
-            if time.time() - waitstart > 10:
+            if time.time() - waitstart > 30:
                 raise AssertionError("blk00000.dat not pruned when it should be")
 
         print("Success")

From fa72f7d99deeebe8bd088753a9a378170ec71f91 Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Tue, 10 May 2016 17:54:34 +0200
Subject: [PATCH 0294/1802] [doc] Remove outdated line from listunspent RPC
 help, fix typo

---
 src/wallet/rpcwallet.cpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index 623037e76648b..27596929f1484 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -2233,7 +2233,7 @@ UniValue settxfee(const UniValue& params, bool fHelp)
             "settxfee amount\n"
             "\nSet the transaction fee per kB. Overwrites the paytxfee parameter.\n"
             "\nArguments:\n"
-            "1. amount         (numeric or sting, required) The transaction fee in " + CURRENCY_UNIT + "/kB\n"
+            "1. amount         (numeric or string, required) The transaction fee in " + CURRENCY_UNIT + "/kB\n"
             "\nResult\n"
             "true|false        (boolean) Returns true if successful\n"
             "\nExamples:\n"
@@ -2328,8 +2328,6 @@ UniValue listunspent(const UniValue& params, bool fHelp)
             "\nReturns array of unspent transaction outputs\n"
             "with between minconf and maxconf (inclusive) confirmations.\n"
             "Optionally filter to only include txouts paid to specified addresses.\n"
-            "Results are an array of Objects, each of which has:\n"
-            "{txid, vout, scriptPubKey, amount, confirmations}\n"
             "\nArguments:\n"
             "1. minconf          (numeric, optional, default=1) The minimum confirmations to filter\n"
             "2. maxconf          (numeric, optional, default=9999999) The maximum confirmations to filter\n"

From fadd0485922de94720dfe60c859633041d67b22f Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Mon, 14 Mar 2016 22:13:04 +0100
Subject: [PATCH 0295/1802] [doc] Link to clang-format in the developer notes

---
 doc/developer-notes.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/doc/developer-notes.md b/doc/developer-notes.md
index 8affb2158a913..add2fb5004d8e 100644
--- a/doc/developer-notes.md
+++ b/doc/developer-notes.md
@@ -5,7 +5,9 @@ Various coding styles have been used during the history of the codebase,
 and the result is not very consistent. However, we're now trying to converge to
 a single style, so please use it in new code. Old code will be converted
 gradually.
-- Basic rules specified in src/.clang-format. Use a recent clang-format-3.5 to format automatically.
+- Basic rules specified in [src/.clang-format](/src/.clang-format).
+  Use a recent clang-format to format automatically using one of the [dev scripts]
+  (/contrib/devtools/README.md#clang-formatpy).
   - Braces on new lines for namespaces, classes, functions, methods.
   - Braces on the same line for everything else.
   - 4 space indentation (no tabs) for every block except namespaces.

From fa83a5dbce0b76e78744c9ad5578c93e89b123e5 Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Tue, 10 May 2016 17:22:01 +0200
Subject: [PATCH 0296/1802] [qa] wallet: Temporarily disable salvagewallet test

---
 qa/rpc-tests/wallet.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/qa/rpc-tests/wallet.py b/qa/rpc-tests/wallet.py
index 42ce0a7260fa3..f321f5e90b15e 100755
--- a/qa/rpc-tests/wallet.py
+++ b/qa/rpc-tests/wallet.py
@@ -306,7 +306,7 @@ def run_test (self):
         # Check that the txid and balance is found by node1
         self.nodes[1].gettransaction(cbTxId)
 
-        #check if wallet or blochchain maintenance changes the balance
+        # check if wallet or blockchain maintenance changes the balance
         self.sync_all()
         blocks = self.nodes[0].generate(2)
         self.sync_all()
@@ -318,7 +318,8 @@ def run_test (self):
             '-reindex',
             '-zapwallettxes=1',
             '-zapwallettxes=2',
-            '-salvagewallet',
+            # disabled until issue is fixed: https://github.com/bitcoin/bitcoin/issues/7463
+            # '-salvagewallet',
         ]
         for m in maintenance:
             print("check " + m)
@@ -338,4 +339,4 @@ def run_test (self):
         assert_equal(len(self.nodes[0].listsinceblock(blocks[1])["transactions"]), 0)
 
 if __name__ == '__main__':
-    WalletTest ().main ()
+    WalletTest().main()

From 8b8f87714df8c1e0868e6411c8f09c838ea736ab Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Mon, 18 Apr 2016 17:02:43 -0400
Subject: [PATCH 0297/1802] net: make Ban/Unban/ClearBan functionality
 consistent

- Ban/Unban/ClearBan call uiInterface.BannedListChanged() as necessary
- Ban/Unban/ClearBan sync to disk if the operation is user-invoked
- Mark node for disconnection automatically when banning
- Lock cs_vNodes while setting disconnected
- Don't spin in a tight loop while setting disconnected
---
 src/net.cpp           | 44 +++++++++++++++++++++++++++++++------------
 src/qt/rpcconsole.cpp |  5 +----
 src/rpc/net.cpp       | 10 ----------
 3 files changed, 33 insertions(+), 26 deletions(-)

diff --git a/src/net.cpp b/src/net.cpp
index 41e657fba3719..3f953a72d5fad 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -463,9 +463,13 @@ bool CNode::setBannedIsDirty;
 
 void CNode::ClearBanned()
 {
-    LOCK(cs_setBanned);
-    setBanned.clear();
-    setBannedIsDirty = true;
+    {
+        LOCK(cs_setBanned);
+        setBanned.clear();
+        setBannedIsDirty = true;
+    }
+    DumpBanlist(); //store banlist to disk
+    uiInterface.BannedListChanged();
 }
 
 bool CNode::IsBanned(CNetAddr ip)
@@ -516,11 +520,25 @@ void CNode::Ban(const CSubNet& subNet, const BanReason &banReason, int64_t banti
     }
     banEntry.nBanUntil = (sinceUnixEpoch ? 0 : GetTime() )+bantimeoffset;
 
-    LOCK(cs_setBanned);
-    if (setBanned[subNet].nBanUntil < banEntry.nBanUntil)
-        setBanned[subNet] = banEntry;
-
-    setBannedIsDirty = true;
+    {
+        LOCK(cs_setBanned);
+        if (setBanned[subNet].nBanUntil < banEntry.nBanUntil) {
+            setBanned[subNet] = banEntry;
+            setBannedIsDirty = true;
+        }
+        else
+            return;
+    }
+    uiInterface.BannedListChanged();
+    {
+        LOCK(cs_vNodes);
+        BOOST_FOREACH(CNode* pnode, vNodes) {
+            if (subNet.Match((CNetAddr)pnode->addr))
+                pnode->fDisconnect = true;
+        }
+    }
+    if(banReason == BanReasonManuallyAdded)
+        DumpBanlist(); //store banlist to disk immediately if user requested ban
 }
 
 bool CNode::Unban(const CNetAddr &addr) {
@@ -529,13 +547,15 @@ bool CNode::Unban(const CNetAddr &addr) {
 }
 
 bool CNode::Unban(const CSubNet &subNet) {
-    LOCK(cs_setBanned);
-    if (setBanned.erase(subNet))
     {
+        LOCK(cs_setBanned);
+        if (!setBanned.erase(subNet))
+            return false;
         setBannedIsDirty = true;
-        return true;
     }
-    return false;
+    uiInterface.BannedListChanged();
+    DumpBanlist(); //store banlist to disk immediately
+    return true;
 }
 
 void CNode::GetBanned(banmap_t &banMap)
diff --git a/src/qt/rpcconsole.cpp b/src/qt/rpcconsole.cpp
index d8647d902a0e7..18552f0736acd 100644
--- a/src/qt/rpcconsole.cpp
+++ b/src/qt/rpcconsole.cpp
@@ -885,15 +885,13 @@ void RPCConsole::banSelectedNode(int bantime)
     // Get currently selected peer address
     QString strNode = GUIUtil::getEntryData(ui->peerWidget, 0, PeerTableModel::Address);
     // Find possible nodes, ban it and clear the selected node
-    if (CNode *bannedNode = FindNode(strNode.toStdString())) {
+    if (FindNode(strNode.toStdString())) {
         std::string nStr = strNode.toStdString();
         std::string addr;
         int port = 0;
         SplitHostPort(nStr, port, addr);
 
         CNode::Ban(CNetAddr(addr), BanReasonManuallyAdded, bantime);
-        bannedNode->fDisconnect = true;
-        DumpBanlist();
 
         clearSelectedNode();
         clientModel->getBanTableModel()->refresh();
@@ -912,7 +910,6 @@ void RPCConsole::unbanSelectedNode()
     if (possibleSubnet.IsValid())
     {
         CNode::Unban(possibleSubnet);
-        DumpBanlist();
         clientModel->getBanTableModel()->refresh();
     }
 }
diff --git a/src/rpc/net.cpp b/src/rpc/net.cpp
index 320091b9c4d4d..e09af89656832 100644
--- a/src/rpc/net.cpp
+++ b/src/rpc/net.cpp
@@ -565,20 +565,12 @@ UniValue setban(const UniValue& params, bool fHelp)
             absolute = true;
 
         isSubnet ? CNode::Ban(subNet, BanReasonManuallyAdded, banTime, absolute) : CNode::Ban(netAddr, BanReasonManuallyAdded, banTime, absolute);
-
-        //disconnect possible nodes
-        while(CNode *bannedNode = (isSubnet ? FindNode(subNet) : FindNode(netAddr)))
-            bannedNode->fDisconnect = true;
     }
     else if(strCommand == "remove")
     {
         if (!( isSubnet ? CNode::Unban(subNet) : CNode::Unban(netAddr) ))
             throw JSONRPCError(RPC_MISC_ERROR, "Error: Unban failed");
     }
-
-    DumpBanlist(); //store banlist to disk
-    uiInterface.BannedListChanged();
-
     return NullUniValue;
 }
 
@@ -624,8 +616,6 @@ UniValue clearbanned(const UniValue& params, bool fHelp)
                             );
 
     CNode::ClearBanned();
-    DumpBanlist(); //store banlist to disk
-    uiInterface.BannedListChanged();
 
     return NullUniValue;
 }

From e9ed6206b32a05547dfa4bfa1e090044ddad7c82 Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Mon, 18 Apr 2016 17:59:31 -0400
Subject: [PATCH 0298/1802] net: No need to export DumpBanlist

---
 src/net.cpp | 40 ++++++++++++++++++++--------------------
 src/net.h   |  2 --
 2 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/src/net.cpp b/src/net.cpp
index 3f953a72d5fad..f5aa6abde85d9 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -422,6 +422,26 @@ CNode* ConnectNode(CAddress addrConnect, const char *pszDest)
     return NULL;
 }
 
+static void DumpBanlist()
+{
+    CNode::SweepBanned(); // clean unused entries (if bantime has expired)
+
+    if (!CNode::BannedSetIsDirty())
+        return;
+
+    int64_t nStart = GetTimeMillis();
+
+    CBanDB bandb;
+    banmap_t banmap;
+    CNode::SetBannedSetDirty(false);
+    CNode::GetBanned(banmap);
+    if (!bandb.Write(banmap))
+        CNode::SetBannedSetDirty(true);
+
+    LogPrint("net", "Flushed %d banned node ips/subnets to banlist.dat  %dms\n",
+        banmap.size(), GetTimeMillis() - nStart);
+}
+
 void CNode::CloseSocketDisconnect()
 {
     fDisconnect = true;
@@ -2607,26 +2627,6 @@ bool CBanDB::Read(banmap_t& banSet)
     return true;
 }
 
-void DumpBanlist()
-{
-    CNode::SweepBanned(); // clean unused entries (if bantime has expired)
-
-    if (!CNode::BannedSetIsDirty())
-        return;
-
-    int64_t nStart = GetTimeMillis();
-
-    CBanDB bandb;
-    banmap_t banmap;
-    CNode::SetBannedSetDirty(false);
-    CNode::GetBanned(banmap);
-    if (!bandb.Write(banmap))
-        CNode::SetBannedSetDirty(true);
-
-    LogPrint("net", "Flushed %d banned node ips/subnets to banlist.dat  %dms\n",
-        banmap.size(), GetTimeMillis() - nStart);
-}
-
 int64_t PoissonNextSend(int64_t nNow, int average_interval_seconds) {
     return nNow + (int64_t)(log1p(GetRand(1ULL << 48) * -0.0000000000000035527136788 /* -1/2^48 */) * average_interval_seconds * -1000000.0 + 0.5);
 }
diff --git a/src/net.h b/src/net.h
index b6ec7bf3e2c28..167dc36a53ad5 100644
--- a/src/net.h
+++ b/src/net.h
@@ -807,8 +807,6 @@ class CBanDB
     bool Read(banmap_t& banSet);
 };
 
-void DumpBanlist();
-
 /** Return a timestamp in the future (in microseconds) for exponentially distributed events. */
 int64_t PoissonNextSend(int64_t nNow, int average_interval_seconds);
 

From 5d5e7a097a87e0fe6efb5e2d622daadc10c2ad79 Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Sat, 16 Apr 2016 14:46:14 -0400
Subject: [PATCH 0299/1802] net: No need to export ConnectNode

---
 src/net.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/net.h b/src/net.h
index 167dc36a53ad5..70df27573ee79 100644
--- a/src/net.h
+++ b/src/net.h
@@ -83,7 +83,6 @@ CNode* FindNode(const CNetAddr& ip);
 CNode* FindNode(const CSubNet& subNet);
 CNode* FindNode(const std::string& addrName);
 CNode* FindNode(const CService& ip);
-CNode* ConnectNode(CAddress addrConnect, const char *pszDest = NULL);
 bool OpenNetworkConnection(const CAddress& addrConnect, CSemaphoreGrant *grantOutbound = NULL, const char *strDest = NULL, bool fOneShot = false);
 void MapPort(bool fUseUPnP);
 unsigned short GetListenPort();

From 10e83d795672ba2790f66cb023f9a78e7105c0e6 Mon Sep 17 00:00:00 2001
From: Chris Stewart <stewart.chris1234@gmail.com>
Date: Tue, 3 May 2016 09:18:36 -0500
Subject: [PATCH 0300/1802] Adding basic tests for OP_CSV inside of
 script_tests.json

Changing NOP3 op name to OP_CHECKSEQUENCEVERIFY, renaming instances of OP_NOP3 in script_tests.json to CHECKSEQUENCEVERIFY

Cleaning up NOP3 comment

Re-adding test cases that were accidentally deleted, removing dupicated test case, fixing formatting

Removing re-labeling of OP_NOP3 to OP_CSV

Fixing whitespace issues
---
 src/test/data/script_tests.json | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/test/data/script_tests.json b/src/test/data/script_tests.json
index e75b7825ed545..757d94b526857 100644
--- a/src/test/data/script_tests.json
+++ b/src/test/data/script_tests.json
@@ -700,6 +700,8 @@
 ["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", "NOP3", "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."],
@@ -855,7 +857,7 @@
 ["2 2 LSHIFT", "8 EQUAL", "P2SH,STRICTENC", "DISABLED_OPCODE", "disabled"],
 ["2 1 RSHIFT", "1 EQUAL", "P2SH,STRICTENC", "DISABLED_OPCODE", "disabled"],
 
-["1","NOP1 CHECKLOCKTIMEVERIFY NOP3 NOP4 NOP5 NOP6 NOP7 NOP8 NOP9 NOP10 2 EQUAL", "P2SH,STRICTENC", "EVAL_FALSE"],
+["1", "NOP1 CHECKLOCKTIMEVERIFY NOP3 NOP4 NOP5 NOP6 NOP7 NOP8 NOP9 NOP10 2 EQUAL", "P2SH,STRICTENC", "EVAL_FALSE"],
 ["'NOP_1_to_10' NOP1 CHECKLOCKTIMEVERIFY NOP3 NOP4 NOP5 NOP6 NOP7 NOP8 NOP9 NOP10","'NOP_1_to_11' EQUAL", "P2SH,STRICTENC", "EVAL_FALSE"],
 
 ["Ensure 100% coverage of discouraged NOPS"],
@@ -1820,5 +1822,12 @@
     "P2SH with CLEANSTACK"
 ],
 
+["CHECKSEQUENCEVERIFY tests"], 
+["", "NOP3", "CHECKSEQUENCEVERIFY", "INVALID_STACK_OPERATION", "CSV automatically fails on a empty stack"],
+["-1", "NOP3", "CHECKSEQUENCEVERIFY", "NEGATIVE_LOCKTIME", "CSV automatically fails if stack top is negative"],
+["0x0100", "NOP3", "CHECKSEQUENCEVERIFY,MINIMALDATA", "UNKNOWN_ERROR", "CSV fails if stack top is not minimally encoded"],
+["0", "NOP3", "CHECKSEQUENCEVERIFY", "UNSATISFIED_LOCKTIME", "CSV fails if stack top bit 1 << 31 is set and the tx version < 2"],
+["4294967296", "NOP3", "CHECKSEQUENCEVERIFY", "UNSATISFIED_LOCKTIME",
+  "CSV fails if stack top bit 1 << 31 is not set, and tx version < 2"],
 ["The End"]
 ]

From fad60b3911236eabf89f4e06274500e57bb08d0d Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Wed, 11 May 2016 13:19:10 +0200
Subject: [PATCH 0301/1802] [qa] Fix bip9-softforks blockstore issue

---
 qa/rpc-tests/bip9-softforks.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/qa/rpc-tests/bip9-softforks.py b/qa/rpc-tests/bip9-softforks.py
index e9b659d5082d2..a8fb878dcb1e6 100755
--- a/qa/rpc-tests/bip9-softforks.py
+++ b/qa/rpc-tests/bip9-softforks.py
@@ -3,6 +3,7 @@
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
+from test_framework.blockstore import BlockStore
 from test_framework.test_framework import ComparisonTestFramework
 from test_framework.util import *
 from test_framework.mininode import CTransaction, NetworkThread
@@ -167,11 +168,13 @@ def test_BIP(self, bipName, activated_version, invalidate, invalidatePostSignatu
         yield TestInstance([[block, False]])
 
         # Restart all
+        self.test.block_store.close()
         stop_nodes(self.nodes)
         wait_bitcoinds()
         shutil.rmtree(self.options.tmpdir)
         self.setup_chain()
         self.setup_network()
+        self.test.block_store = BlockStore(self.options.tmpdir)
         self.test.clear_all_connections()
         self.test.add_all_connections(self.nodes)
         NetworkThread().start() # Start up network handling in another thread

From a545127fbccef4ee674d18d43732ce00ba97f782 Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Wed, 11 May 2016 19:36:38 +0200
Subject: [PATCH 0302/1802] Squashed 'src/crypto/ctaes/' content from commit
 cd3c3ac

git-subtree-dir: src/crypto/ctaes
git-subtree-split: cd3c3ac31fac41cc253bf5780b55ecd8d7368545
---
 COPYING   |  21 +++
 README.md |  41 ++++
 bench.c   | 170 +++++++++++++++++
 ctaes.c   | 556 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 ctaes.h   |  41 ++++
 test.c    | 110 +++++++++++
 6 files changed, 939 insertions(+)
 create mode 100644 COPYING
 create mode 100644 README.md
 create mode 100644 bench.c
 create mode 100644 ctaes.c
 create mode 100644 ctaes.h
 create mode 100644 test.c

diff --git a/COPYING b/COPYING
new file mode 100644
index 0000000000000..415b202a2a54e
--- /dev/null
+++ b/COPYING
@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2016 Pieter Wuille
+
+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.
diff --git a/README.md b/README.md
new file mode 100644
index 0000000000000..0e7fe1775153e
--- /dev/null
+++ b/README.md
@@ -0,0 +1,41 @@
+ctaes
+=====
+
+Simple C module for constant-time AES encryption and decryption.
+
+Features:
+* Simple, pure C code without any dependencies.
+* No tables or data-dependent branches whatsoever, but using bit sliced approach from https://eprint.iacr.org/2009/129.pdf.
+* Very small object code: slightly over 4k of executable code when compiled with -Os.
+* Slower than implementations based on precomputed tables or specialized instructions, but can do ~15 MB/s on modern CPUs.
+
+Performance
+-----------
+
+Compiled with GCC 5.3.1 with -O3, on an Intel(R) Core(TM) i7-4800MQ CPU, numbers in CPU cycles:
+
+| Algorithm | Key schedule | Encryption per byte | Decryption per byte |
+| --------- | ------------:| -------------------:| -------------------:|
+| AES-128   |         2.8k |                 154 |                 161 |
+| AES-192   |         3.1k |                 169 |                 181 |
+| AES-256   |         4.0k |                 191 |                 203 |
+
+Build steps
+-----------
+
+Object code:
+
+    $ gcc -O3 ctaes.c -c -o ctaes.o
+
+Tests:
+
+    $ gcc -O3 ctaes.c test.c -o test
+
+Benchmark:
+
+    $ gcc -O3 ctaes.c bench.c -o bench
+
+Review
+------
+
+Results of a formal review of the code can be found in http://bitcoin.sipa.be/ctaes/review.zip
diff --git a/bench.c b/bench.c
new file mode 100644
index 0000000000000..a86df496c8300
--- /dev/null
+++ b/bench.c
@@ -0,0 +1,170 @@
+#include <stdio.h>
+#include <math.h>
+#include "sys/time.h"
+
+#include "ctaes.h"
+
+static double gettimedouble(void) {
+    struct timeval tv;
+    gettimeofday(&tv, NULL);
+    return tv.tv_usec * 0.000001 + tv.tv_sec;
+}
+
+static void print_number(double x) {
+    double y = x;
+    int c = 0;
+    if (y < 0.0) {
+        y = -y;
+    }
+    while (y < 100.0) {
+        y *= 10.0;
+        c++;
+    }
+    printf("%.*f", c, x);
+}
+
+static void run_benchmark(char *name, void (*benchmark)(void*), void (*setup)(void*), void (*teardown)(void*), void* data, int count, int iter) {
+    int i;
+    double min = HUGE_VAL;
+    double sum = 0.0;
+    double max = 0.0;
+    for (i = 0; i < count; i++) {
+        double begin, total;
+        if (setup != NULL) {
+            setup(data);
+        }
+        begin = gettimedouble();
+        benchmark(data);
+        total = gettimedouble() - begin;
+        if (teardown != NULL) {
+            teardown(data);
+        }
+        if (total < min) {
+            min = total;
+        }
+        if (total > max) {
+            max = total;
+        }
+        sum += total;
+    }
+    printf("%s: min ", name);
+    print_number(min * 1000000000.0 / iter);
+    printf("ns / avg ");
+    print_number((sum / count) * 1000000000.0 / iter);
+    printf("ns / max ");
+    print_number(max * 1000000000.0 / iter);
+    printf("ns\n");
+}
+
+static void bench_AES128_init(void* data) {
+    AES128_ctx* ctx = (AES128_ctx*)data;
+    int i;
+    for (i = 0; i < 50000; i++) {
+        AES128_init(ctx, (unsigned char*)ctx);
+    }
+}
+
+static void bench_AES128_encrypt_setup(void* data) {
+    AES128_ctx* ctx = (AES128_ctx*)data;
+    static const unsigned char key[16] = {0};
+    AES128_init(ctx, key);
+}
+
+static void bench_AES128_encrypt(void* data) {
+    const AES128_ctx* ctx = (const AES128_ctx*)data;
+    unsigned char scratch[16] = {0};
+    int i;
+    for (i = 0; i < 4000000 / 16; i++) {
+        AES128_encrypt(ctx, 1, scratch, scratch);
+    }
+}
+
+static void bench_AES128_decrypt(void* data) {
+    const AES128_ctx* ctx = (const AES128_ctx*)data;
+    unsigned char scratch[16] = {0};
+    int i;
+    for (i = 0; i < 4000000 / 16; i++) {
+        AES128_decrypt(ctx, 1, scratch, scratch);
+    }
+}
+
+static void bench_AES192_init(void* data) {
+    AES192_ctx* ctx = (AES192_ctx*)data;
+    int i;
+    for (i = 0; i < 50000; i++) {
+        AES192_init(ctx, (unsigned char*)ctx);
+    }
+}
+
+static void bench_AES192_encrypt_setup(void* data) {
+    AES192_ctx* ctx = (AES192_ctx*)data;
+    static const unsigned char key[16] = {0};
+    AES192_init(ctx, key);
+}
+
+static void bench_AES192_encrypt(void* data) {
+    const AES192_ctx* ctx = (const AES192_ctx*)data;
+    unsigned char scratch[16] = {0};
+    int i;
+    for (i = 0; i < 4000000 / 16; i++) {
+        AES192_encrypt(ctx, 1, scratch, scratch);
+    }
+}
+
+static void bench_AES192_decrypt(void* data) {
+    const AES192_ctx* ctx = (const AES192_ctx*)data;
+    unsigned char scratch[16] = {0};
+    int i;
+    for (i = 0; i < 4000000 / 16; i++) {
+        AES192_decrypt(ctx, 1, scratch, scratch);
+    }
+}
+
+static void bench_AES256_init(void* data) {
+    AES256_ctx* ctx = (AES256_ctx*)data;
+    int i;
+    for (i = 0; i < 50000; i++) {
+        AES256_init(ctx, (unsigned char*)ctx);
+    }
+}
+
+
+static void bench_AES256_encrypt_setup(void* data) {
+    AES256_ctx* ctx = (AES256_ctx*)data;
+    static const unsigned char key[16] = {0};
+    AES256_init(ctx, key);
+}
+
+static void bench_AES256_encrypt(void* data) {
+    const AES256_ctx* ctx = (const AES256_ctx*)data;
+    unsigned char scratch[16] = {0};
+    int i;
+    for (i = 0; i < 4000000 / 16; i++) {
+        AES256_encrypt(ctx, 1, scratch, scratch);
+    }
+}
+
+static void bench_AES256_decrypt(void* data) {
+    const AES256_ctx* ctx = (const AES256_ctx*)data;
+    unsigned char scratch[16] = {0};
+    int i;
+    for (i = 0; i < 4000000 / 16; i++) {
+        AES256_decrypt(ctx, 1, scratch, scratch);
+    }
+}
+
+int main(void) {
+    AES128_ctx ctx128;
+    AES192_ctx ctx192;
+    AES256_ctx ctx256;
+    run_benchmark("aes128_init", bench_AES128_init, NULL, NULL, &ctx128, 20, 50000);
+    run_benchmark("aes128_encrypt_byte", bench_AES128_encrypt, bench_AES128_encrypt_setup, NULL, &ctx128, 20, 4000000);
+    run_benchmark("aes128_decrypt_byte", bench_AES128_decrypt, bench_AES128_encrypt_setup, NULL, &ctx128, 20, 4000000);
+    run_benchmark("aes192_init", bench_AES192_init, NULL, NULL, &ctx192, 20, 50000);
+    run_benchmark("aes192_encrypt_byte", bench_AES192_encrypt, bench_AES192_encrypt_setup, NULL, &ctx192, 20, 4000000);
+    run_benchmark("aes192_decrypt_byte", bench_AES192_decrypt, bench_AES192_encrypt_setup, NULL, &ctx192, 20, 4000000);
+    run_benchmark("aes256_init", bench_AES256_init, NULL, NULL, &ctx256, 20, 50000);
+    run_benchmark("aes256_encrypt_byte", bench_AES256_encrypt, bench_AES256_encrypt_setup, NULL, &ctx256, 20, 4000000);
+    run_benchmark("aes256_decrypt_byte", bench_AES256_decrypt, bench_AES256_encrypt_setup, NULL, &ctx256, 20, 4000000);
+    return 0;
+}
diff --git a/ctaes.c b/ctaes.c
new file mode 100644
index 0000000000000..2389fc0bb254f
--- /dev/null
+++ b/ctaes.c
@@ -0,0 +1,556 @@
+ /*********************************************************************
+ * Copyright (c) 2016 Pieter Wuille                                   *
+ * Distributed under the MIT software license, see the accompanying   *
+ * file COPYING or http://www.opensource.org/licenses/mit-license.php.*
+ **********************************************************************/
+
+/* Constant time, unoptimized, concise, plain C, AES implementation
+ * Based On:
+ *   Emilia Kasper and Peter Schwabe, Faster and Timing-Attack Resistant AES-GCM
+ *   http://www.iacr.org/archive/ches2009/57470001/57470001.pdf
+ * But using 8 16-bit integers representing a single AES state rather than 8 128-bit
+ * integers representing 8 AES states.
+ */
+
+#include "ctaes.h"
+
+/* Slice variable slice_i contains the i'th bit of the 16 state variables in this order:
+ *  0  1  2  3
+ *  4  5  6  7
+ *  8  9 10 11
+ * 12 13 14 15
+ */
+
+/** Convert a byte to sliced form, storing it corresponding to given row and column in s */
+static void LoadByte(AES_state* s, unsigned char byte, int r, int c) {
+    int i;
+    for (i = 0; i < 8; i++) {
+        s->slice[i] |= (byte & 1) << (r * 4 + c);
+        byte >>= 1;
+    }
+}
+
+/** Load 16 bytes of data into 8 sliced integers */
+static void LoadBytes(AES_state *s, const unsigned char* data16) {
+    int c;
+    for (c = 0; c < 4; c++) {
+        int r;
+        for (r = 0; r < 4; r++) {
+            LoadByte(s, *(data16++), r, c);
+        }
+    }
+}
+
+/** Convert 8 sliced integers into 16 bytes of data */
+static void SaveBytes(unsigned char* data16, const AES_state *s) {
+    int c;
+    for (c = 0; c < 4; c++) {
+        int r;
+        for (r = 0; r < 4; r++) {
+            int b;
+            uint8_t v = 0;
+            for (b = 0; b < 8; b++) {
+                v |= ((s->slice[b] >> (r * 4 + c)) & 1) << b;
+            }
+            *(data16++) = v;
+        }
+    }
+}
+
+/* S-box implementation based on the gate logic from:
+ *   Joan Boyar and Rene Peralta, A depth-16 circuit for the AES S-box.
+ *   https://eprint.iacr.org/2011/332.pdf
+*/
+static void SubBytes(AES_state *s, int inv) {
+    /* Load the bit slices */
+    uint16_t U0 = s->slice[7], U1 = s->slice[6], U2 = s->slice[5], U3 = s->slice[4];
+    uint16_t U4 = s->slice[3], U5 = s->slice[2], U6 = s->slice[1], U7 = s->slice[0];
+
+    uint16_t T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16;
+    uint16_t T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, D;
+    uint16_t M1, M6, M11, M13, M15, M20, M21, M22, M23, M25, M37, M38, M39, M40;
+    uint16_t M41, M42, M43, M44, M45, M46, M47, M48, M49, M50, M51, M52, M53, M54;
+    uint16_t M55, M56, M57, M58, M59, M60, M61, M62, M63;
+
+    if (inv) {
+        uint16_t R5, R13, R17, R18, R19;
+        /* Undo linear postprocessing */
+        T23 = U0 ^ U3;
+        T22 = ~(U1 ^ U3);
+        T2 = ~(U0 ^ U1);
+        T1 = U3 ^ U4;
+        T24 = ~(U4 ^ U7);
+        R5 = U6 ^ U7;
+        T8 = ~(U1 ^ T23);
+        T19 = T22 ^ R5;
+        T9 = ~(U7 ^ T1);
+        T10 = T2 ^ T24;
+        T13 = T2 ^ R5;
+        T3 = T1 ^ R5;
+        T25 = ~(U2 ^ T1);
+        R13 = U1 ^ U6;
+        T17 = ~(U2 ^ T19);
+        T20 = T24 ^ R13;
+        T4 = U4 ^ T8;
+        R17 = ~(U2 ^ U5);
+        R18 = ~(U5 ^ U6);
+        R19 = ~(U2 ^ U4);
+        D = U0 ^ R17;
+        T6 = T22 ^ R17;
+        T16 = R13 ^ R19;
+        T27 = T1 ^ R18;
+        T15 = T10 ^ T27;
+        T14 = T10 ^ R18;
+        T26 = T3 ^ T16;
+    } else {
+        /* Linear preprocessing. */
+        T1 = U0 ^ U3;
+        T2 = U0 ^ U5;
+        T3 = U0 ^ U6;
+        T4 = U3 ^ U5;
+        T5 = U4 ^ U6;
+        T6 = T1 ^ T5;
+        T7 = U1 ^ U2;
+        T8 = U7 ^ T6;
+        T9 = U7 ^ T7;
+        T10 = T6 ^ T7;
+        T11 = U1 ^ U5;
+        T12 = U2 ^ U5;
+        T13 = T3 ^ T4;
+        T14 = T6 ^ T11;
+        T15 = T5 ^ T11;
+        T16 = T5 ^ T12;
+        T17 = T9 ^ T16;
+        T18 = U3 ^ U7;
+        T19 = T7 ^ T18;
+        T20 = T1 ^ T19;
+        T21 = U6 ^ U7;
+        T22 = T7 ^ T21;
+        T23 = T2 ^ T22;
+        T24 = T2 ^ T10;
+        T25 = T20 ^ T17;
+        T26 = T3 ^ T16;
+        T27 = T1 ^ T12;
+        D = U7;
+    }
+
+    /* Non-linear transformation (identical to the code in SubBytes) */
+    M1 = T13 & T6;
+    M6 = T3 & T16;
+    M11 = T1 & T15;
+    M13 = (T4 & T27) ^ M11;
+    M15 = (T2 & T10) ^ M11;
+    M20 = T14 ^ M1 ^ (T23 & T8) ^ M13;
+    M21 = (T19 & D) ^ M1 ^ T24 ^ M15;
+    M22 = T26 ^ M6 ^ (T22 & T9) ^ M13;
+    M23 = (T20 & T17) ^ M6 ^ M15 ^ T25;
+    M25 = M22 & M20;
+    M37 = M21 ^ ((M20 ^ M21) & (M23 ^ M25));
+    M38 = M20 ^ M25 ^ (M21 | (M20 & M23));
+    M39 = M23 ^ ((M22 ^ M23) & (M21 ^ M25));
+    M40 = M22 ^ M25 ^ (M23 | (M21 & M22));
+    M41 = M38 ^ M40;
+    M42 = M37 ^ M39;
+    M43 = M37 ^ M38;
+    M44 = M39 ^ M40;
+    M45 = M42 ^ M41;
+    M46 = M44 & T6;
+    M47 = M40 & T8;
+    M48 = M39 & D;
+    M49 = M43 & T16;
+    M50 = M38 & T9;
+    M51 = M37 & T17;
+    M52 = M42 & T15;
+    M53 = M45 & T27;
+    M54 = M41 & T10;
+    M55 = M44 & T13;
+    M56 = M40 & T23;
+    M57 = M39 & T19;
+    M58 = M43 & T3;
+    M59 = M38 & T22;
+    M60 = M37 & T20;
+    M61 = M42 & T1;
+    M62 = M45 & T4;
+    M63 = M41 & T2;
+
+    if (inv){
+        /* Undo linear preprocessing */
+        uint16_t P0 = M52 ^ M61;
+        uint16_t P1 = M58 ^ M59;
+        uint16_t P2 = M54 ^ M62;
+        uint16_t P3 = M47 ^ M50;
+        uint16_t P4 = M48 ^ M56;
+        uint16_t P5 = M46 ^ M51;
+        uint16_t P6 = M49 ^ M60;
+        uint16_t P7 = P0 ^ P1;
+        uint16_t P8 = M50 ^ M53;
+        uint16_t P9 = M55 ^ M63;
+        uint16_t P10 = M57 ^ P4;
+        uint16_t P11 = P0 ^ P3;
+        uint16_t P12 = M46 ^ M48;
+        uint16_t P13 = M49 ^ M51;
+        uint16_t P14 = M49 ^ M62;
+        uint16_t P15 = M54 ^ M59;
+        uint16_t P16 = M57 ^ M61;
+        uint16_t P17 = M58 ^ P2;
+        uint16_t P18 = M63 ^ P5;
+        uint16_t P19 = P2 ^ P3;
+        uint16_t P20 = P4 ^ P6;
+        uint16_t P22 = P2 ^ P7;
+        uint16_t P23 = P7 ^ P8;
+        uint16_t P24 = P5 ^ P7;
+        uint16_t P25 = P6 ^ P10;
+        uint16_t P26 = P9 ^ P11;
+        uint16_t P27 = P10 ^ P18;
+        uint16_t P28 = P11 ^ P25;
+        uint16_t P29 = P15 ^ P20;
+        s->slice[7] = P13 ^ P22;
+        s->slice[6] = P26 ^ P29;
+        s->slice[5] = P17 ^ P28;
+        s->slice[4] = P12 ^ P22;
+        s->slice[3] = P23 ^ P27;
+        s->slice[2] = P19 ^ P24;
+        s->slice[1] = P14 ^ P23;
+        s->slice[0] = P9 ^ P16;
+    } else {
+        /* Linear postprocessing */
+        uint16_t L0 = M61 ^ M62;
+        uint16_t L1 = M50 ^ M56;
+        uint16_t L2 = M46 ^ M48;
+        uint16_t L3 = M47 ^ M55;
+        uint16_t L4 = M54 ^ M58;
+        uint16_t L5 = M49 ^ M61;
+        uint16_t L6 = M62 ^ L5;
+        uint16_t L7 = M46 ^ L3;
+        uint16_t L8 = M51 ^ M59;
+        uint16_t L9 = M52 ^ M53;
+        uint16_t L10 = M53 ^ L4;
+        uint16_t L11 = M60 ^ L2;
+        uint16_t L12 = M48 ^ M51;
+        uint16_t L13 = M50 ^ L0;
+        uint16_t L14 = M52 ^ M61;
+        uint16_t L15 = M55 ^ L1;
+        uint16_t L16 = M56 ^ L0;
+        uint16_t L17 = M57 ^ L1;
+        uint16_t L18 = M58 ^ L8;
+        uint16_t L19 = M63 ^ L4;
+        uint16_t L20 = L0 ^ L1;
+        uint16_t L21 = L1 ^ L7;
+        uint16_t L22 = L3 ^ L12;
+        uint16_t L23 = L18 ^ L2;
+        uint16_t L24 = L15 ^ L9;
+        uint16_t L25 = L6 ^ L10;
+        uint16_t L26 = L7 ^ L9;
+        uint16_t L27 = L8 ^ L10;
+        uint16_t L28 = L11 ^ L14;
+        uint16_t L29 = L11 ^ L17;
+        s->slice[7] = L6 ^ L24;
+        s->slice[6] = ~(L16 ^ L26);
+        s->slice[5] = ~(L19 ^ L28);
+        s->slice[4] = L6 ^ L21;
+        s->slice[3] = L20 ^ L22;
+        s->slice[2] = L25 ^ L29;
+        s->slice[1] = ~(L13 ^ L27);
+        s->slice[0] = ~(L6 ^ L23);
+    }
+}
+
+#define BIT_RANGE(from,to) (((1 << ((to) - (from))) - 1) << (from))
+
+#define BIT_RANGE_LEFT(x,from,to,shift) (((x) & BIT_RANGE((from), (to))) << (shift))
+#define BIT_RANGE_RIGHT(x,from,to,shift) (((x) & BIT_RANGE((from), (to))) >> (shift))
+
+static void ShiftRows(AES_state* s) {
+    int i;
+    for (i = 0; i < 8; i++) {
+        uint16_t v = s->slice[i];
+        s->slice[i] =
+            (v & BIT_RANGE(0, 4)) |
+            BIT_RANGE_LEFT(v, 4, 5, 3) | BIT_RANGE_RIGHT(v, 5, 8, 1) |
+            BIT_RANGE_LEFT(v, 8, 10, 2) | BIT_RANGE_RIGHT(v, 10, 12, 2) |
+            BIT_RANGE_LEFT(v, 12, 15, 1) | BIT_RANGE_RIGHT(v, 15, 16, 3);
+    }
+}
+
+static void InvShiftRows(AES_state* s) {
+    int i;
+    for (i = 0; i < 8; i++) {
+        uint16_t v = s->slice[i];
+        s->slice[i] =
+            (v & BIT_RANGE(0, 4)) |
+            BIT_RANGE_LEFT(v, 4, 7, 1) | BIT_RANGE_RIGHT(v, 7, 8, 3) |
+            BIT_RANGE_LEFT(v, 8, 10, 2) | BIT_RANGE_RIGHT(v, 10, 12, 2) |
+            BIT_RANGE_LEFT(v, 12, 13, 3) | BIT_RANGE_RIGHT(v, 13, 16, 1);
+    }
+}
+
+#define ROT(x,b) (((x) >> ((b) * 4)) | ((x) << ((4-(b)) * 4)))
+
+static void MixColumns(AES_state* s, int inv) {
+    /* The MixColumns transform treats the bytes of the columns of the state as
+     * coefficients of a 3rd degree polynomial over GF(2^8) and multiplies them
+     * by the fixed polynomial a(x) = {03}x^3 + {01}x^2 + {01}x + {02}, modulo
+     * x^4 + {01}.
+     *
+     * In the inverse transform, we multiply by the inverse of a(x),
+     * a^-1(x) = {0b}x^3 + {0d}x^2 + {09}x + {0e}. This is equal to
+     * a(x) * ({04}x^2 + {05}), so we can reuse the forward transform's code
+     * (found in OpenSSL's bsaes-x86_64.pl, attributed to Jussi Kivilinna)
+     *
+     * In the bitsliced representation, a multiplication of every column by x
+     * mod x^4 + 1 is simply a right rotation.
+     */
+
+    /* Shared for both directions is a multiplication by a(x), which can be
+     * rewritten as (x^3 + x^2 + x) + {02}*(x^3 + {01}).
+     *
+     * First compute s into the s? variables, (x^3 + {01}) * s into the s?_01
+     * variables and (x^3 + x^2 + x)*s into the s?_123 variables.
+     */
+    uint16_t s0 = s->slice[0], s1 = s->slice[1], s2 = s->slice[2], s3 = s->slice[3];
+    uint16_t s4 = s->slice[4], s5 = s->slice[5], s6 = s->slice[6], s7 = s->slice[7];
+    uint16_t s0_01 = s0 ^ ROT(s0, 1), s0_123 = ROT(s0_01, 1) ^ ROT(s0, 3);
+    uint16_t s1_01 = s1 ^ ROT(s1, 1), s1_123 = ROT(s1_01, 1) ^ ROT(s1, 3);
+    uint16_t s2_01 = s2 ^ ROT(s2, 1), s2_123 = ROT(s2_01, 1) ^ ROT(s2, 3);
+    uint16_t s3_01 = s3 ^ ROT(s3, 1), s3_123 = ROT(s3_01, 1) ^ ROT(s3, 3);
+    uint16_t s4_01 = s4 ^ ROT(s4, 1), s4_123 = ROT(s4_01, 1) ^ ROT(s4, 3);
+    uint16_t s5_01 = s5 ^ ROT(s5, 1), s5_123 = ROT(s5_01, 1) ^ ROT(s5, 3);
+    uint16_t s6_01 = s6 ^ ROT(s6, 1), s6_123 = ROT(s6_01, 1) ^ ROT(s6, 3);
+    uint16_t s7_01 = s7 ^ ROT(s7, 1), s7_123 = ROT(s7_01, 1) ^ ROT(s7, 3);
+    /* Now compute s = s?_123 + {02} * s?_01. */
+    s->slice[0] = s7_01 ^ s0_123;
+    s->slice[1] = s7_01 ^ s0_01 ^ s1_123;
+    s->slice[2] = s1_01 ^ s2_123;
+    s->slice[3] = s7_01 ^ s2_01 ^ s3_123;
+    s->slice[4] = s7_01 ^ s3_01 ^ s4_123;
+    s->slice[5] = s4_01 ^ s5_123;
+    s->slice[6] = s5_01 ^ s6_123;
+    s->slice[7] = s6_01 ^ s7_123;
+    if (inv) {
+        /* In the reverse direction, we further need to multiply by
+         * {04}x^2 + {05}, which can be written as {04} * (x^2 + {01}) + {01}.
+         *
+         * First compute (x^2 + {01}) * s into the t?_02 variables: */
+        uint16_t t0_02 = s->slice[0] ^ ROT(s->slice[0], 2);
+        uint16_t t1_02 = s->slice[1] ^ ROT(s->slice[1], 2);
+        uint16_t t2_02 = s->slice[2] ^ ROT(s->slice[2], 2);
+        uint16_t t3_02 = s->slice[3] ^ ROT(s->slice[3], 2);
+        uint16_t t4_02 = s->slice[4] ^ ROT(s->slice[4], 2);
+        uint16_t t5_02 = s->slice[5] ^ ROT(s->slice[5], 2);
+        uint16_t t6_02 = s->slice[6] ^ ROT(s->slice[6], 2);
+        uint16_t t7_02 = s->slice[7] ^ ROT(s->slice[7], 2);
+        /* And then update s += {04} * t?_02 */
+        s->slice[0] ^= t6_02;
+        s->slice[1] ^= t6_02 ^ t7_02;
+        s->slice[2] ^= t0_02 ^ t7_02;
+        s->slice[3] ^= t1_02 ^ t6_02;
+        s->slice[4] ^= t2_02 ^ t6_02 ^ t7_02;
+        s->slice[5] ^= t3_02 ^ t7_02;
+        s->slice[6] ^= t4_02;
+        s->slice[7] ^= t5_02;
+    }
+}
+
+static void AddRoundKey(AES_state* s, const AES_state* round) {
+    int b;
+    for (b = 0; b < 8; b++) {
+        s->slice[b] ^= round->slice[b];
+    }
+}
+
+/** column_0(s) = column_c(a) */
+static void GetOneColumn(AES_state* s, const AES_state* a, int c) {
+    int b;
+    for (b = 0; b < 8; b++) {
+        s->slice[b] = (a->slice[b] >> c) & 0x1111;
+    }
+}
+
+/** column_c1(r) |= (column_0(s) ^= column_c2(a)) */
+static void KeySetupColumnMix(AES_state* s, AES_state* r, const AES_state* a, int c1, int c2) {
+    int b;
+    for (b = 0; b < 8; b++) {
+        r->slice[b] |= ((s->slice[b] ^= ((a->slice[b] >> c2) & 0x1111)) & 0x1111) << c1;
+    }
+}
+
+/** Rotate the rows in s one position upwards, and xor in r */
+static void KeySetupTransform(AES_state* s, const AES_state* r) {
+    int b;
+    for (b = 0; b < 8; b++) {
+        s->slice[b] = ((s->slice[b] >> 4) | (s->slice[b] << 12)) ^ r->slice[b];
+    }
+}
+
+/* Multiply the cells in s by x, as polynomials over GF(2) mod x^8 + x^4 + x^3 + x + 1 */
+static void MultX(AES_state* s) {
+    uint16_t top = s->slice[7];
+    s->slice[7] = s->slice[6];
+    s->slice[6] = s->slice[5];
+    s->slice[5] = s->slice[4];
+    s->slice[4] = s->slice[3] ^ top;
+    s->slice[3] = s->slice[2] ^ top;
+    s->slice[2] = s->slice[1];
+    s->slice[1] = s->slice[0] ^ top;
+    s->slice[0] = top;
+}
+
+/** Expand the cipher key into the key schedule.
+ *
+ *  state must be a pointer to an array of size nrounds + 1.
+ *  key must be a pointer to 4 * nkeywords bytes.
+ *
+ *  AES128 uses nkeywords = 4, nrounds = 10
+ *  AES192 uses nkeywords = 6, nrounds = 12
+ *  AES256 uses nkeywords = 8, nrounds = 14
+ */
+static void AES_setup(AES_state* rounds, const uint8_t* key, int nkeywords, int nrounds)
+{
+    int i;
+
+    /* The one-byte round constant */
+    AES_state rcon = {{1,0,0,0,0,0,0,0}};
+    /* The number of the word being generated, modulo nkeywords */
+    int pos = 0;
+    /* The column representing the word currently being processed */
+    AES_state column;
+
+    for (i = 0; i < nrounds + 1; i++) {
+        int b;
+        for (b = 0; b < 8; b++) {
+            rounds[i].slice[b] = 0;
+        }
+    }
+
+    /* The first nkeywords round columns are just taken from the key directly. */
+    for (i = 0; i < nkeywords; i++) {
+        int r;
+        for (r = 0; r < 4; r++) {
+            LoadByte(&rounds[i >> 2], *(key++), r, i & 3);
+        }
+    }
+
+    GetOneColumn(&column, &rounds[(nkeywords - 1) >> 2], (nkeywords - 1) & 3);
+
+    for (i = nkeywords; i < 4 * (nrounds + 1); i++) {
+        /* Transform column */
+        if (pos == 0) {
+            SubBytes(&column, 0);
+            KeySetupTransform(&column, &rcon);
+            MultX(&rcon);
+        } else if (nkeywords > 6 && pos == 4) {
+            SubBytes(&column, 0);
+        }
+        if (++pos == nkeywords) pos = 0;
+        KeySetupColumnMix(&column, &rounds[i >> 2], &rounds[(i - nkeywords) >> 2], i & 3, (i - nkeywords) & 3);
+    }
+}
+
+static void AES_encrypt(const AES_state* rounds, int nrounds, unsigned char* cipher16, const unsigned char* plain16) {
+    AES_state s = {{0}};
+    int round;
+
+    LoadBytes(&s, plain16);
+    AddRoundKey(&s, rounds++);
+
+    for (round = 1; round < nrounds; round++) {
+        SubBytes(&s, 0);
+        ShiftRows(&s);
+        MixColumns(&s, 0);
+        AddRoundKey(&s, rounds++);
+    }
+
+    SubBytes(&s, 0);
+    ShiftRows(&s);
+    AddRoundKey(&s, rounds);
+
+    SaveBytes(cipher16, &s);
+}
+
+static void AES_decrypt(const AES_state* rounds, int nrounds, unsigned char* plain16, const unsigned char* cipher16) {
+    /* Most AES decryption implementations use the alternate scheme
+     * (the Equivalent Inverse Cipher), which looks more like encryption, but
+     * needs different round constants. We can't reuse any code here anyway, so
+     * don't bother. */
+    AES_state s = {{0}};
+    int round;
+
+    rounds += nrounds;
+
+    LoadBytes(&s, cipher16);
+    AddRoundKey(&s, rounds--);
+
+    for (round = 1; round < nrounds; round++) {
+        InvShiftRows(&s);
+        SubBytes(&s, 1);
+        AddRoundKey(&s, rounds--);
+        MixColumns(&s, 1);
+    }
+
+    InvShiftRows(&s);
+    SubBytes(&s, 1);
+    AddRoundKey(&s, rounds);
+
+    SaveBytes(plain16, &s);
+}
+
+void AES128_init(AES128_ctx* ctx, const unsigned char* key16) {
+    AES_setup(ctx->rk, key16, 4, 10);
+}
+
+void AES128_encrypt(const AES128_ctx* ctx, size_t blocks, unsigned char* cipher16, const unsigned char* plain16) {
+    while (blocks--) {
+        AES_encrypt(ctx->rk, 10, cipher16, plain16);
+        cipher16 += 16;
+        plain16 += 16;
+    }
+}
+
+void AES128_decrypt(const AES128_ctx* ctx, size_t blocks, unsigned char* plain16, const unsigned char* cipher16) {
+    while (blocks--) {
+        AES_decrypt(ctx->rk, 10, plain16, cipher16);
+        cipher16 += 16;
+        plain16 += 16;
+    }
+}
+
+void AES192_init(AES192_ctx* ctx, const unsigned char* key24) {
+    AES_setup(ctx->rk, key24, 6, 12);
+}
+
+void AES192_encrypt(const AES192_ctx* ctx, size_t blocks, unsigned char* cipher16, const unsigned char* plain16) {
+    while (blocks--) {
+        AES_encrypt(ctx->rk, 12, cipher16, plain16);
+        cipher16 += 16;
+        plain16 += 16;
+    }
+
+}
+
+void AES192_decrypt(const AES192_ctx* ctx, size_t blocks, unsigned char* plain16, const unsigned char* cipher16) {
+    while (blocks--) {
+        AES_decrypt(ctx->rk, 12, plain16, cipher16);
+        cipher16 += 16;
+        plain16 += 16;
+    }
+}
+
+void AES256_init(AES256_ctx* ctx, const unsigned char* key32) {
+    AES_setup(ctx->rk, key32, 8, 14);
+}
+
+void AES256_encrypt(const AES256_ctx* ctx, size_t blocks, unsigned char* cipher16, const unsigned char* plain16) {
+    while (blocks--) {
+        AES_encrypt(ctx->rk, 14, cipher16, plain16);
+        cipher16 += 16;
+        plain16 += 16;
+    }
+}
+
+void AES256_decrypt(const AES256_ctx* ctx, size_t blocks, unsigned char* plain16, const unsigned char* cipher16) {
+    while (blocks--) {
+        AES_decrypt(ctx->rk, 14, plain16, cipher16);
+        cipher16 += 16;
+        plain16 += 16;
+    }
+}
diff --git a/ctaes.h b/ctaes.h
new file mode 100644
index 0000000000000..2f0af04216053
--- /dev/null
+++ b/ctaes.h
@@ -0,0 +1,41 @@
+ /*********************************************************************
+ * Copyright (c) 2016 Pieter Wuille                                   *
+ * Distributed under the MIT software license, see the accompanying   *
+ * file COPYING or http://www.opensource.org/licenses/mit-license.php.*
+ **********************************************************************/
+
+#ifndef _CTAES_H_
+#define _CTAES_H_ 1
+
+#include <stdint.h>
+#include <stdlib.h>
+
+typedef struct {
+    uint16_t slice[8];
+} AES_state;
+
+typedef struct {
+    AES_state rk[11];
+} AES128_ctx;
+
+typedef struct {
+    AES_state rk[13];
+} AES192_ctx;
+
+typedef struct {
+    AES_state rk[15];
+} AES256_ctx;
+
+void AES128_init(AES128_ctx* ctx, const unsigned char* key16);
+void AES128_encrypt(const AES128_ctx* ctx, size_t blocks, unsigned char* cipher16, const unsigned char* plain16);
+void AES128_decrypt(const AES128_ctx* ctx, size_t blocks, unsigned char* plain16, const unsigned char* cipher16);
+
+void AES192_init(AES192_ctx* ctx, const unsigned char* key24);
+void AES192_encrypt(const AES192_ctx* ctx, size_t blocks, unsigned char* cipher16, const unsigned char* plain16);
+void AES192_decrypt(const AES192_ctx* ctx, size_t blocks, unsigned char* plain16, const unsigned char* cipher16);
+
+void AES256_init(AES256_ctx* ctx, const unsigned char* key32);
+void AES256_encrypt(const AES256_ctx* ctx, size_t blocks, unsigned char* cipher16, const unsigned char* plain16);
+void AES256_decrypt(const AES256_ctx* ctx, size_t blocks, unsigned char* plain16, const unsigned char* cipher16);
+
+#endif
diff --git a/test.c b/test.c
new file mode 100644
index 0000000000000..fce1696acdc2d
--- /dev/null
+++ b/test.c
@@ -0,0 +1,110 @@
+ /*********************************************************************
+ * Copyright (c) 2016 Pieter Wuille                                   *
+ * Distributed under the MIT software license, see the accompanying   *
+ * file COPYING or http://www.opensource.org/licenses/mit-license.php.*
+ **********************************************************************/
+
+#include "ctaes.h"
+
+#include <stdio.h>
+#include <string.h>
+#include <assert.h>
+
+typedef struct {
+    int keysize;
+    const char* key;
+    const char* plain;
+    const char* cipher;
+} ctaes_test;
+
+static const ctaes_test ctaes_tests[] = {
+    /* AES test vectors from FIPS 197. */
+    {128, "000102030405060708090a0b0c0d0e0f", "00112233445566778899aabbccddeeff", "69c4e0d86a7b0430d8cdb78070b4c55a"},
+    {192, "000102030405060708090a0b0c0d0e0f1011121314151617", "00112233445566778899aabbccddeeff", "dda97ca4864cdfe06eaf70a0ec0d7191"},
+    {256, "000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f", "00112233445566778899aabbccddeeff", "8ea2b7ca516745bfeafc49904b496089"},
+
+    /* AES-ECB test vectors from NIST sp800-38a. */
+    {128, "2b7e151628aed2a6abf7158809cf4f3c", "6bc1bee22e409f96e93d7e117393172a", "3ad77bb40d7a3660a89ecaf32466ef97"},
+    {128, "2b7e151628aed2a6abf7158809cf4f3c", "ae2d8a571e03ac9c9eb76fac45af8e51", "f5d3d58503b9699de785895a96fdbaaf"},
+    {128, "2b7e151628aed2a6abf7158809cf4f3c", "30c81c46a35ce411e5fbc1191a0a52ef", "43b1cd7f598ece23881b00e3ed030688"},
+    {128, "2b7e151628aed2a6abf7158809cf4f3c", "f69f2445df4f9b17ad2b417be66c3710", "7b0c785e27e8ad3f8223207104725dd4"},
+    {192, "8e73b0f7da0e6452c810f32b809079e562f8ead2522c6b7b", "6bc1bee22e409f96e93d7e117393172a", "bd334f1d6e45f25ff712a214571fa5cc"},
+    {192, "8e73b0f7da0e6452c810f32b809079e562f8ead2522c6b7b", "ae2d8a571e03ac9c9eb76fac45af8e51", "974104846d0ad3ad7734ecb3ecee4eef"},
+    {192, "8e73b0f7da0e6452c810f32b809079e562f8ead2522c6b7b", "30c81c46a35ce411e5fbc1191a0a52ef", "ef7afd2270e2e60adce0ba2face6444e"},
+    {192, "8e73b0f7da0e6452c810f32b809079e562f8ead2522c6b7b", "f69f2445df4f9b17ad2b417be66c3710", "9a4b41ba738d6c72fb16691603c18e0e"},
+    {256, "603deb1015ca71be2b73aef0857d77811f352c073b6108d72d9810a30914dff4", "6bc1bee22e409f96e93d7e117393172a", "f3eed1bdb5d2a03c064b5a7e3db181f8"},
+    {256, "603deb1015ca71be2b73aef0857d77811f352c073b6108d72d9810a30914dff4", "ae2d8a571e03ac9c9eb76fac45af8e51", "591ccb10d410ed26dc5ba74a31362870"},
+    {256, "603deb1015ca71be2b73aef0857d77811f352c073b6108d72d9810a30914dff4", "30c81c46a35ce411e5fbc1191a0a52ef", "b6ed21b99ca6f4f9f153e7b1beafed1d"},
+    {256, "603deb1015ca71be2b73aef0857d77811f352c073b6108d72d9810a30914dff4", "f69f2445df4f9b17ad2b417be66c3710", "23304b7a39f9f3ff067d8d8f9e24ecc7"}
+};
+
+static void from_hex(unsigned char* data, int len, const char* hex) {
+    int p;
+    for (p = 0; p < len; p++) {
+        int v = 0;
+        int n;
+        for (n = 0; n < 2; n++) {
+            assert((*hex >= '0' && *hex <= '9') || (*hex >= 'a' && *hex <= 'f'));
+            if (*hex >= '0' && *hex <= '9') {
+                v |= (*hex - '0') << (4 * (1 - n));
+            } else {
+                v |= (*hex - 'a' + 10) << (4 * (1 - n));
+            }
+            hex++;
+        }
+        *(data++) = v;
+    }
+    assert(*hex == 0);
+}
+
+int main(void) {
+    int i;
+    int fail = 0;
+    for (i = 0; i < sizeof(ctaes_tests) / sizeof(ctaes_tests[0]); i++) {
+        unsigned char key[32], plain[16], cipher[16], ciphered[16], deciphered[16];
+        const ctaes_test* test = &ctaes_tests[i];
+        assert(test->keysize == 128 || test->keysize == 192 || test->keysize == 256);
+        from_hex(plain, 16, test->plain);
+        from_hex(cipher, 16, test->cipher);
+        switch (test->keysize) {
+            case 128: {
+                AES128_ctx ctx;
+                from_hex(key, 16, test->key);
+                AES128_init(&ctx, key);
+                AES128_encrypt(&ctx, 1, ciphered, plain);
+                AES128_decrypt(&ctx, 1, deciphered, cipher);
+                break;
+            }
+            case 192: {
+                AES192_ctx ctx;
+                from_hex(key, 24, test->key);
+                AES192_init(&ctx, key);
+                AES192_encrypt(&ctx, 1, ciphered, plain);
+                AES192_decrypt(&ctx, 1, deciphered, cipher);
+                break;
+            }
+            case 256: {
+                AES256_ctx ctx;
+                from_hex(key, 32, test->key);
+                AES256_init(&ctx, key);
+                AES256_encrypt(&ctx, 1, ciphered, plain);
+                AES256_decrypt(&ctx, 1, deciphered, cipher);
+                break;
+            }
+        }
+        if (memcmp(cipher, ciphered, 16)) {
+            fprintf(stderr, "E(key=\"%s\", plain=\"%s\") != \"%s\"\n", test->key, test->plain, test->cipher);
+            fail++;
+        }
+        if (memcmp(plain, deciphered, 16)) {
+            fprintf(stderr, "D(key=\"%s\", cipher=\"%s\") != \"%s\"\n", test->key, test->cipher, test->plain);
+            fail++;
+        }
+    }
+    if (fail == 0) {
+        fprintf(stderr, "All tests succesful\n");
+    } else {
+        fprintf(stderr, "%i tests failed\n", fail);
+    }
+    return (fail != 0);
+}

From 32114dd63493fd169bf666fc3a5b4a912c083766 Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Tue, 10 May 2016 18:19:03 +0200
Subject: [PATCH 0303/1802] bench: Add crypto hash benchmarks

Add benchmarks for the cryptographic hash algorithms:

- RIPEMD160
- SHA1
- SHA256
- SHA512

Continues work on #7883.
---
 src/Makefile.bench.include |  3 ++-
 src/bench/crypto_hash.cpp  | 53 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 55 insertions(+), 1 deletion(-)
 create mode 100644 src/bench/crypto_hash.cpp

diff --git a/src/Makefile.bench.include b/src/Makefile.bench.include
index 24e2b3e0c85e1..65fd24e051cae 100644
--- a/src/Makefile.bench.include
+++ b/src/Makefile.bench.include
@@ -8,7 +8,8 @@ bench_bench_bitcoin_SOURCES = \
   bench/bench.cpp \
   bench/bench.h \
   bench/Examples.cpp \
-  bench/rollingbloom.cpp
+  bench/rollingbloom.cpp \
+  bench/crypto_hash.cpp
 
 bench_bench_bitcoin_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(EVENT_CLFAGS) $(EVENT_PTHREADS_CFLAGS) -I$(builddir)/bench/
 bench_bench_bitcoin_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
diff --git a/src/bench/crypto_hash.cpp b/src/bench/crypto_hash.cpp
new file mode 100644
index 0000000000000..6b753f6308371
--- /dev/null
+++ b/src/bench/crypto_hash.cpp
@@ -0,0 +1,53 @@
+// Copyright (c) 2016 The Bitcoin Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#include <iostream>
+
+#include "bench.h"
+#include "bloom.h"
+#include "utiltime.h"
+#include "crypto/ripemd160.h"
+#include "crypto/sha1.h"
+#include "crypto/sha256.h"
+#include "crypto/sha512.h"
+
+/* Number of bytes to hash per iteration */
+static const uint64_t BUFFER_SIZE = 1000*1000;
+
+static void RIPEMD160(benchmark::State& state)
+{
+    uint8_t hash[CRIPEMD160::OUTPUT_SIZE];
+    std::vector<uint8_t> in(BUFFER_SIZE,0);
+    while (state.KeepRunning())
+        CRIPEMD160().Write(begin_ptr(in), in.size()).Finalize(hash);
+}
+
+static void SHA1(benchmark::State& state)
+{
+    uint8_t hash[CSHA1::OUTPUT_SIZE];
+    std::vector<uint8_t> in(BUFFER_SIZE,0);
+    while (state.KeepRunning())
+        CSHA1().Write(begin_ptr(in), in.size()).Finalize(hash);
+}
+
+static void SHA256(benchmark::State& state)
+{
+    uint8_t hash[CSHA256::OUTPUT_SIZE];
+    std::vector<uint8_t> in(BUFFER_SIZE,0);
+    while (state.KeepRunning())
+        CSHA256().Write(begin_ptr(in), in.size()).Finalize(hash);
+}
+
+static void SHA512(benchmark::State& state)
+{
+    uint8_t hash[CSHA512::OUTPUT_SIZE];
+    std::vector<uint8_t> in(BUFFER_SIZE,0);
+    while (state.KeepRunning())
+        CSHA512().Write(begin_ptr(in), in.size()).Finalize(hash);
+}
+
+BENCHMARK(RIPEMD160);
+BENCHMARK(SHA1);
+BENCHMARK(SHA256);
+BENCHMARK(SHA512);

From 8b0e4970281de15472a93a529302f3de15163943 Mon Sep 17 00:00:00 2001
From: Tyler Hardin <th020394@gmail.com>
Date: Wed, 11 May 2016 22:28:02 -0400
Subject: [PATCH 0304/1802] Qt: Add option to hide the system tray icon

My changes leave all tray icon and menu creation/initialization logic
untouched. It only shows or hides the icon according to the setting.

A new checkbox was added to the OptionsDialog under the Window tab. A
bool option named "hideTrayIcon" was added to OptionsModel. This
checkbox was mapped like other all options to the OptionsModel.

A signal was added to the OptionsModel for broadcasting changes the the
hideTrayIcon option. This signal was connected to a new slot added to
BitcoinGUI named setTrayIconVisible(bool). The slot simply hides or
shows the trayIcon in BitcoinGUI according to the parameter recieved.
---
 src/qt/bitcoingui.cpp         | 20 +++++++++++++++++++-
 src/qt/bitcoingui.h           |  3 +++
 src/qt/forms/optionsdialog.ui | 10 ++++++++++
 src/qt/optionsdialog.cpp      | 14 ++++++++++++++
 src/qt/optionsdialog.h        |  2 ++
 src/qt/optionsmodel.cpp       | 14 +++++++++++++-
 src/qt/optionsmodel.h         |  4 ++++
 7 files changed, 65 insertions(+), 2 deletions(-)

diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp
index b00cdfcaf2bdd..99844863640f4 100644
--- a/src/qt/bitcoingui.cpp
+++ b/src/qt/bitcoingui.cpp
@@ -474,6 +474,16 @@ void BitcoinGUI::setClientModel(ClientModel *clientModel)
         }
 #endif // ENABLE_WALLET
         unitDisplayControl->setOptionsModel(clientModel->getOptionsModel());
+        
+        OptionsModel* optionsModel = clientModel->getOptionsModel();
+        if(optionsModel)
+        {
+            // be aware of the tray icon disable state change reported by the OptionsModel object.
+            connect(optionsModel,SIGNAL(hideTrayIconChanged(bool)),this,SLOT(setTrayIconVisible(bool)));
+        
+            // initialize the disable state of the tray icon with the current value in the model.
+            setTrayIconVisible(optionsModel->getHideTrayIcon());
+        }
     } else {
         // Disable possibility to show main window via action
         toggleHideAction->setEnabled(false);
@@ -535,7 +545,7 @@ void BitcoinGUI::createTrayIcon(const NetworkStyle *networkStyle)
     QString toolTip = tr("%1 client").arg(tr(PACKAGE_NAME)) + " " + networkStyle->getTitleAddText();
     trayIcon->setToolTip(toolTip);
     trayIcon->setIcon(networkStyle->getTrayAndWindowIcon());
-    trayIcon->show();
+    trayIcon->hide();
 #endif
 
     notificator = new Notificator(QApplication::applicationName(), trayIcon, this);
@@ -1044,6 +1054,14 @@ void BitcoinGUI::showProgress(const QString &title, int nProgress)
         progressDialog->setValue(nProgress);
 }
 
+void BitcoinGUI::setTrayIconVisible(bool fHideTrayIcon)
+{
+    if (trayIcon)
+    {
+        trayIcon->setVisible(!fHideTrayIcon);
+    }
+}
+
 static bool ThreadSafeMessageBox(BitcoinGUI *gui, const std::string& message, const std::string& caption, unsigned int style)
 {
     bool modal = (style & CClientUIInterface::MODAL);
diff --git a/src/qt/bitcoingui.h b/src/qt/bitcoingui.h
index 871ca1ba347e9..27ef11c75c079 100644
--- a/src/qt/bitcoingui.h
+++ b/src/qt/bitcoingui.h
@@ -218,6 +218,9 @@ private Q_SLOTS:
 
     /** Show progress dialog e.g. for verifychain */
     void showProgress(const QString &title, int nProgress);
+    
+    /** When hideTrayIcon setting is changed in OptionsModel hide or show the icon accordingly. */
+    void setTrayIconVisible(bool);
 };
 
 class UnitDisplayStatusBarControl : public QLabel
diff --git a/src/qt/forms/optionsdialog.ui b/src/qt/forms/optionsdialog.ui
index c712e6ea01793..0b292018727ed 100644
--- a/src/qt/forms/optionsdialog.ui
+++ b/src/qt/forms/optionsdialog.ui
@@ -504,6 +504,16 @@
        <string>&amp;Window</string>
       </attribute>
       <layout class="QVBoxLayout" name="verticalLayout_Window">
+       <item>
+        <widget class="QCheckBox" name="hideTrayIcon">
+         <property name="toolTip">
+          <string>&amp;Hide the icon from the system tray.</string>
+         </property>
+         <property name="text">
+          <string>Hide tray icon</string>
+         </property>
+        </widget>
+       </item>
        <item>
         <widget class="QCheckBox" name="minimizeToTray">
          <property name="toolTip">
diff --git a/src/qt/optionsdialog.cpp b/src/qt/optionsdialog.cpp
index 95a3fa8d21a4d..f2db3988991a0 100644
--- a/src/qt/optionsdialog.cpp
+++ b/src/qt/optionsdialog.cpp
@@ -198,6 +198,7 @@ void OptionsDialog::setMapper()
 
     /* Window */
 #ifndef Q_OS_MAC
+    mapper->addMapping(ui->hideTrayIcon, OptionsModel::HideTrayIcon);
     mapper->addMapping(ui->minimizeToTray, OptionsModel::MinimizeToTray);
     mapper->addMapping(ui->minimizeOnClose, OptionsModel::MinimizeOnClose);
 #endif
@@ -243,6 +244,19 @@ void OptionsDialog::on_cancelButton_clicked()
     reject();
 }
 
+void OptionsDialog::on_hideTrayIcon_stateChanged(int fState)
+{
+    if(fState)
+    {
+        ui->minimizeToTray->setChecked(false);
+        ui->minimizeToTray->setEnabled(false);
+    }
+    else
+    {
+        ui->minimizeToTray->setEnabled(true);
+    }
+}
+
 void OptionsDialog::showRestartWarning(bool fPersistent)
 {
     ui->statusLabel->setStyleSheet("QLabel { color: red; }");
diff --git a/src/qt/optionsdialog.h b/src/qt/optionsdialog.h
index e944fb9ee9b2a..41b56d1386257 100644
--- a/src/qt/optionsdialog.h
+++ b/src/qt/optionsdialog.h
@@ -49,6 +49,8 @@ private Q_SLOTS:
     void on_resetButton_clicked();
     void on_okButton_clicked();
     void on_cancelButton_clicked();
+    
+    void on_hideTrayIcon_stateChanged(int fState);
 
     void showRestartWarning(bool fPersistent = false);
     void clearStatusLabel();
diff --git a/src/qt/optionsmodel.cpp b/src/qt/optionsmodel.cpp
index d091bb9e610aa..cc2cbc0e66419 100644
--- a/src/qt/optionsmodel.cpp
+++ b/src/qt/optionsmodel.cpp
@@ -51,9 +51,14 @@ void OptionsModel::Init(bool resetSettings)
     // These are Qt-only settings:
 
     // Window
+    if (!settings.contains("fHideTrayIcon"))
+        settings.setValue("fHideTrayIcon", false);
+    fHideTrayIcon = settings.value("fHideTrayIcon").toBool();
+    Q_EMIT hideTrayIconChanged(fHideTrayIcon);
+    
     if (!settings.contains("fMinimizeToTray"))
         settings.setValue("fMinimizeToTray", false);
-    fMinimizeToTray = settings.value("fMinimizeToTray").toBool();
+    fMinimizeToTray = settings.value("fMinimizeToTray").toBool() && !fHideTrayIcon;
 
     if (!settings.contains("fMinimizeOnClose"))
         settings.setValue("fMinimizeOnClose", false);
@@ -166,6 +171,8 @@ QVariant OptionsModel::data(const QModelIndex & index, int role) const
         {
         case StartAtStartup:
             return GUIUtil::GetStartOnSystemStartup();
+        case HideTrayIcon:
+            return fHideTrayIcon;
         case MinimizeToTray:
             return fMinimizeToTray;
         case MapPortUPnP:
@@ -242,6 +249,11 @@ bool OptionsModel::setData(const QModelIndex & index, const QVariant & value, in
         case StartAtStartup:
             successful = GUIUtil::SetStartOnSystemStartup(value.toBool());
             break;
+        case HideTrayIcon:
+            fHideTrayIcon = value.toBool();
+            settings.setValue("fHideTrayIcon", fHideTrayIcon);
+    		Q_EMIT hideTrayIconChanged(fHideTrayIcon);
+            break;
         case MinimizeToTray:
             fMinimizeToTray = value.toBool();
             settings.setValue("fMinimizeToTray", fMinimizeToTray);
diff --git a/src/qt/optionsmodel.h b/src/qt/optionsmodel.h
index 841711dd2d978..3b491ceac2cde 100644
--- a/src/qt/optionsmodel.h
+++ b/src/qt/optionsmodel.h
@@ -28,6 +28,7 @@ class OptionsModel : public QAbstractListModel
 
     enum OptionID {
         StartAtStartup,         // bool
+        HideTrayIcon,           // bool
         MinimizeToTray,         // bool
         MapPortUPnP,            // bool
         MinimizeOnClose,        // bool
@@ -58,6 +59,7 @@ class OptionsModel : public QAbstractListModel
     void setDisplayUnit(const QVariant &value);
 
     /* Explicit getters */
+    bool getHideTrayIcon() { return fHideTrayIcon; }
     bool getMinimizeToTray() { return fMinimizeToTray; }
     bool getMinimizeOnClose() { return fMinimizeOnClose; }
     int getDisplayUnit() { return nDisplayUnit; }
@@ -72,6 +74,7 @@ class OptionsModel : public QAbstractListModel
 
 private:
     /* Qt-only settings */
+    bool fHideTrayIcon;
     bool fMinimizeToTray;
     bool fMinimizeOnClose;
     QString language;
@@ -87,6 +90,7 @@ class OptionsModel : public QAbstractListModel
 Q_SIGNALS:
     void displayUnitChanged(int unit);
     void coinControlFeaturesChanged(bool);
+    void hideTrayIconChanged(bool);
 };
 
 #endif // BITCOIN_QT_OPTIONSMODEL_H

From 276ce84fd3a9561a11ae4c5a00c71ff44d3a59a9 Mon Sep 17 00:00:00 2001
From: Jonas Schnelli <dev@jonasschnelli.ch>
Date: Wed, 11 May 2016 21:08:36 +0200
Subject: [PATCH 0305/1802] [Qt] Disable some menu items during
 splashscreen/verification state

---
 src/qt/bitcoingui.cpp | 12 ++++++++++++
 src/qt/bitcoingui.h   |  1 +
 2 files changed, 13 insertions(+)

diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp
index b00cdfcaf2bdd..aa8276a69bc4b 100644
--- a/src/qt/bitcoingui.cpp
+++ b/src/qt/bitcoingui.cpp
@@ -320,12 +320,14 @@ void BitcoinGUI::createActions()
     aboutAction = new QAction(platformStyle->TextColorIcon(":/icons/about"), tr("&About %1").arg(tr(PACKAGE_NAME)), this);
     aboutAction->setStatusTip(tr("Show information about %1").arg(tr(PACKAGE_NAME)));
     aboutAction->setMenuRole(QAction::AboutRole);
+    aboutAction->setEnabled(false);
     aboutQtAction = new QAction(platformStyle->TextColorIcon(":/icons/about_qt"), tr("About &Qt"), this);
     aboutQtAction->setStatusTip(tr("Show information about Qt"));
     aboutQtAction->setMenuRole(QAction::AboutQtRole);
     optionsAction = new QAction(platformStyle->TextColorIcon(":/icons/options"), tr("&Options..."), this);
     optionsAction->setStatusTip(tr("Modify configuration options for %1").arg(tr(PACKAGE_NAME)));
     optionsAction->setMenuRole(QAction::PreferencesRole);
+    optionsAction->setEnabled(false);
     toggleHideAction = new QAction(platformStyle->TextColorIcon(":/icons/about"), tr("&Show / Hide"), this);
     toggleHideAction->setStatusTip(tr("Show or hide the main Window"));
 
@@ -343,6 +345,8 @@ void BitcoinGUI::createActions()
 
     openRPCConsoleAction = new QAction(platformStyle->TextColorIcon(":/icons/debugwindow"), tr("&Debug window"), this);
     openRPCConsoleAction->setStatusTip(tr("Open debugging and diagnostic console"));
+    // initially disable the debug window menu item
+    openRPCConsoleAction->setEnabled(false);
 
     usedSendingAddressesAction = new QAction(platformStyle->TextColorIcon(":/icons/address-book"), tr("&Sending addresses..."), this);
     usedSendingAddressesAction->setStatusTip(tr("Show the list of used sending addresses and labels"));
@@ -891,6 +895,14 @@ void BitcoinGUI::closeEvent(QCloseEvent *event)
     QMainWindow::closeEvent(event);
 }
 
+void BitcoinGUI::showEvent(QShowEvent *event)
+{
+    // enable the debug window when the main window shows up
+    openRPCConsoleAction->setEnabled(true);
+    aboutAction->setEnabled(true);
+    optionsAction->setEnabled(true);
+}
+
 #ifdef ENABLE_WALLET
 void BitcoinGUI::incomingTransaction(const QString& date, int unit, const CAmount& amount, const QString& type, const QString& address, const QString& label)
 {
diff --git a/src/qt/bitcoingui.h b/src/qt/bitcoingui.h
index 871ca1ba347e9..ef8b8726f7193 100644
--- a/src/qt/bitcoingui.h
+++ b/src/qt/bitcoingui.h
@@ -72,6 +72,7 @@ class BitcoinGUI : public QMainWindow
 protected:
     void changeEvent(QEvent *e);
     void closeEvent(QCloseEvent *event);
+    void showEvent(QShowEvent *event);
     void dragEnterEvent(QDragEnterEvent *event);
     void dropEvent(QDropEvent *event);
     bool eventFilter(QObject *object, QEvent *event);

From 34ebceb25a40a2160349656265951cbe9a5b0f34 Mon Sep 17 00:00:00 2001
From: Jonas Schnelli <dev@jonasschnelli.ch>
Date: Thu, 12 May 2016 09:51:43 +0200
Subject: [PATCH 0306/1802] [Qt][OSX] Fix Cmd-Q / Menu Quit shutdown on OSX

---
 src/qt/bitcoin.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp
index 9c21bb24cee28..6218ab6ab0542 100644
--- a/src/qt/bitcoin.cpp
+++ b/src/qt/bitcoin.cpp
@@ -370,6 +370,7 @@ void BitcoinApplication::createSplashScreen(const NetworkStyle *networkStyle)
     splash->setAttribute(Qt::WA_DeleteOnClose);
     splash->show();
     connect(this, SIGNAL(splashFinished(QWidget*)), splash, SLOT(slotFinish(QWidget*)));
+    connect(this, SIGNAL(requestedShutdown()), splash, SLOT(close()));
 }
 
 void BitcoinApplication::startThread()

From fab5233fe6c99d446a2cebc48cf479c3f026c2cc Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Thu, 12 May 2016 12:54:00 +0200
Subject: [PATCH 0307/1802] [qa] test_framework: Set wait-timeout for bitcoind
 procs

---
 qa/rpc-tests/test_framework/util.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/qa/rpc-tests/test_framework/util.py b/qa/rpc-tests/test_framework/util.py
index 6784177aaac57..d62b8ac55c533 100644
--- a/qa/rpc-tests/test_framework/util.py
+++ b/qa/rpc-tests/test_framework/util.py
@@ -35,6 +35,8 @@
 # The number of ports to "reserve" for p2p and rpc, each
 PORT_RANGE = 5000
 
+BITCOIND_PROC_WAIT_TIMEOUT = 60
+
 
 class PortSeed:
     # Must be initialized with a unique integer for each process
@@ -325,7 +327,7 @@ def stop_node(node, i):
         node.stop()
     except http.client.CannotSendRequest as e:
         print("WARN: Unable to stop node: " + repr(e))
-    bitcoind_processes[i].wait()
+    bitcoind_processes[i].wait(timeout=BITCOIND_PROC_WAIT_TIMEOUT)
     del bitcoind_processes[i]
 
 def stop_nodes(nodes):
@@ -343,7 +345,7 @@ def set_node_times(nodes, t):
 def wait_bitcoinds():
     # Wait for all bitcoinds to cleanly exit
     for bitcoind in bitcoind_processes.values():
-        bitcoind.wait()
+        bitcoind.wait(timeout=BITCOIND_PROC_WAIT_TIMEOUT)
     bitcoind_processes.clear()
 
 def connect_nodes(from_connection, node_num):

From e5764e69cbd0bf4eb98c96eeb31c94349bbe7b7c Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Thu, 12 May 2016 13:48:58 +0200
Subject: [PATCH 0308/1802] doc: Remove outdated qt4 install information from
 README.md

This text is aimed at users installing the binaries.

Now that Qt5 is linked statically, there is no need to install Qt
as a run-time dependency.
---
 doc/README.md | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/doc/README.md b/doc/README.md
index cf475ef18e5fc..a5524889d2976 100644
--- a/doc/README.md
+++ b/doc/README.md
@@ -11,17 +11,11 @@ The following are some helpful notes on how to run Bitcoin on your native platfo
 
 ### Unix
 
-You need the Qt4 run-time libraries to run Bitcoin-Qt. On Debian or Ubuntu:
-
-	sudo apt-get install libqtgui4
-
 Unpack the files into a directory and run:
 
 - bin/32/bitcoin-qt (GUI, 32-bit) or bin/32/bitcoind (headless, 32-bit)
 - bin/64/bitcoin-qt (GUI, 64-bit) or bin/64/bitcoind (headless, 64-bit)
 
-
-
 ### Windows
 
 Unpack the files into a directory, and then run bitcoin-qt.exe.

From 581ddff05c92eb835a20c2be9ccf5d2d37b94883 Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Thu, 12 May 2016 14:00:22 +0200
Subject: [PATCH 0309/1802] net: Add fRelayTxes flag

Add a fRelayTxes to keep track of the relay transaction flag
we send to other peers.
---
 src/init.cpp | 1 +
 src/main.cpp | 4 ++--
 src/net.cpp  | 3 ++-
 src/net.h    | 1 +
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/init.cpp b/src/init.cpp
index d19ca530b3831..3218321a322da 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -1102,6 +1102,7 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
     fListen = GetBoolArg("-listen", DEFAULT_LISTEN);
     fDiscover = GetBoolArg("-discover", true);
     fNameLookup = GetBoolArg("-dns", DEFAULT_NAME_LOOKUP);
+    fRelayTxes = !GetBoolArg("-blocksonly", DEFAULT_BLOCKSONLY);
 
     bool fBound = false;
     if (fListen) {
diff --git a/src/main.cpp b/src/main.cpp
index ee30954b48545..f813056a7a905 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -4751,7 +4751,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
             return error("message inv size() = %u", vInv.size());
         }
 
-        bool fBlocksOnly = GetBoolArg("-blocksonly", DEFAULT_BLOCKSONLY);
+        bool fBlocksOnly = !fRelayTxes;
 
         // Allow whitelisted peers to send data other than blocks in blocks only mode if whitelistrelay is true
         if (pfrom->fWhitelisted && GetBoolArg("-whitelistrelay", DEFAULT_WHITELISTRELAY))
@@ -4934,7 +4934,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
     {
         // Stop processing the transaction early if
         // We are in blocks only mode and peer is either not whitelisted or whitelistrelay is off
-        if (GetBoolArg("-blocksonly", DEFAULT_BLOCKSONLY) && (!pfrom->fWhitelisted || !GetBoolArg("-whitelistrelay", DEFAULT_WHITELISTRELAY)))
+        if (!fRelayTxes && (!pfrom->fWhitelisted || !GetBoolArg("-whitelistrelay", DEFAULT_WHITELISTRELAY)))
         {
             LogPrint("net", "transaction sent in violation of protocol peer=%d\n", pfrom->id);
             return true;
diff --git a/src/net.cpp b/src/net.cpp
index 5e810a0f15888..da5090dbc624a 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -77,6 +77,7 @@ const static std::string NET_MESSAGE_COMMAND_OTHER = "*other*";
 bool fDiscover = true;
 bool fListen = true;
 uint64_t nLocalServices = NODE_NETWORK;
+bool fRelayTxes = true;
 CCriticalSection cs_mapLocalHost;
 map<CNetAddr, LocalServiceInfo> mapLocalHost;
 static bool vfLimited[NET_MAX] = {};
@@ -454,7 +455,7 @@ void CNode::PushVersion()
     else
         LogPrint("net", "send version message: version %d, blocks=%d, us=%s, peer=%d\n", PROTOCOL_VERSION, nBestHeight, addrMe.ToString(), id);
     PushMessage(NetMsgType::VERSION, PROTOCOL_VERSION, nLocalServices, nTime, addrYou, addrMe,
-                nLocalHostNonce, strSubVersion, nBestHeight, !GetBoolArg("-blocksonly", DEFAULT_BLOCKSONLY));
+                nLocalHostNonce, strSubVersion, nBestHeight, fRelayTxes);
 }
 
 
diff --git a/src/net.h b/src/net.h
index b6ec7bf3e2c28..66511e0fbd430 100644
--- a/src/net.h
+++ b/src/net.h
@@ -153,6 +153,7 @@ CAddress GetLocalAddress(const CNetAddr *paddrPeer = NULL);
 extern bool fDiscover;
 extern bool fListen;
 extern uint64_t nLocalServices;
+extern bool fRelayTxes;
 extern uint64_t nLocalHostNonce;
 extern CAddrMan addrman;
 

From 1ab1dc3140ff521df42f1f396a49a50e91bf2740 Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Thu, 12 May 2016 14:09:43 +0200
Subject: [PATCH 0310/1802] rpc: Add `relaytxes` flag to `getnetworkinfo`

Re-work of PR #7841 by dragongem45.
Closes #7771.
---
 src/rpc/net.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/rpc/net.cpp b/src/rpc/net.cpp
index 320091b9c4d4d..3297d2c6ee74c 100644
--- a/src/rpc/net.cpp
+++ b/src/rpc/net.cpp
@@ -460,6 +460,7 @@ UniValue getnetworkinfo(const UniValue& params, bool fHelp)
             "  \"subversion\": \"/Satoshi:x.x.x/\",     (string) the server subversion string\n"
             "  \"protocolversion\": xxxxx,              (numeric) the protocol version\n"
             "  \"localservices\": \"xxxxxxxxxxxxxxxx\", (string) the services we offer to the network\n"
+            "  \"localrelay\": true|false,              (bool) true if transaction relay is requested from peers\n"
             "  \"timeoffset\": xxxxx,                   (numeric) the time offset\n"
             "  \"connections\": xxxxx,                  (numeric) the number of connections\n"
             "  \"networks\": [                          (array) information per network\n"
@@ -494,6 +495,7 @@ UniValue getnetworkinfo(const UniValue& params, bool fHelp)
     obj.push_back(Pair("subversion",    strSubVersion));
     obj.push_back(Pair("protocolversion",PROTOCOL_VERSION));
     obj.push_back(Pair("localservices",       strprintf("%016x", nLocalServices)));
+    obj.push_back(Pair("localrelay",     fRelayTxes));
     obj.push_back(Pair("timeoffset",    GetTimeOffset()));
     obj.push_back(Pair("connections",   (int)vNodes.size()));
     obj.push_back(Pair("networks",      GetNetworksInfo()));

From 2692e1b10bd7a0be644ed8a69c54152bc741e855 Mon Sep 17 00:00:00 2001
From: fanquake <fanquake@gmail.com>
Date: Mon, 9 May 2016 16:30:27 +0800
Subject: [PATCH 0311/1802] [Doc] Simplify OS X build notes
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Add —c++11 flags to brew dependancies that support it
Remove release-build section, this is covered by depends/release-notes
---
 doc/build-osx.md | 136 +++++++++++++++++------------------------------
 1 file changed, 50 insertions(+), 86 deletions(-)

diff --git a/doc/build-osx.md b/doc/build-osx.md
index 296e0aa1f0726..89d7816c9a42b 100644
--- a/doc/build-osx.md
+++ b/doc/build-osx.md
@@ -1,129 +1,93 @@
 Mac OS X Build Instructions and Notes
 ====================================
-This guide will show you how to build Bitcoin Core for OS X.
-
-Notes
------
-
-* Tested on OS X 10.7 through 10.11 on 64-bit Intel processors only.
-
-* All of the commands should be executed in a Terminal application. The
-built-in one is located in `/Applications/Utilities`.
+The commands in this guide should be executed in a Terminal application.
+The built-in one is located in `/Applications/Utilities/Terminal.app`.
 
 Preparation
 -----------
+Download and install [Xcode](https://developer.apple.com/xcode/download).
 
-You need to install Xcode with all the options checked so that the compiler
-and everything is available in /usr not just /Developer. Xcode should be
-available on your OS X installation media, but if not, you can get the
-current version from https://developer.apple.com/xcode/. If you install
-Xcode 4.3 or later, you'll need to install its command line tools. This can
-be done in `Xcode > Preferences > Downloads > Components` and generally must
-be re-done or updated every time Xcode is updated.
-
-You will also need to install [Homebrew](http://brew.sh) in order to install library
-dependencies.
+Once installed, run `xcode-select --install` to install the OS X command line tools.
 
-The installation of the actual dependencies is covered in the instructions
-sections below.
+Install [Homebrew](http://brew.sh).
 
-Instructions: Homebrew
+Dependencies
 ----------------------
 
-#### Install dependencies using Homebrew
+    brew install automake berkeley-db4 libtool boost --c++11 miniupnpc openssl pkg-config protobuf --c++11 qt5 libevent
 
-    brew install autoconf automake berkeley-db4 libtool boost miniupnpc openssl pkg-config protobuf qt5 libevent
+NOTE: Building with Qt4 is still supported, however, could result in a broken UI. Building with Qt5 is recommended.
 
-NOTE: Building with Qt4 is still supported, however, could result in a broken UI. As such, building with Qt5 is recommended.
-
-### Building `bitcoin`
+Build Bitcoin Core
+------------------------
 
-1. Clone the GitHub tree to get the source code and go into the directory.
+1. Clone the bitcoin source code and cd into `bitcoin`
 
-        git clone https://github.com/bitcoin/bitcoin.git
+        git clone https://github.com/bitcoin/bitcoin
         cd bitcoin
 
 2.  Build bitcoin-core:
-    This will configure and build the headless bitcoin binaries as well as the gui (if Qt is found).
-    You can disable the gui build by passing `--without-gui` to configure.
+
+    Configure and build the headless bitcoin binaries as well as the GUI (if Qt is found).
+
+    You can disable the GUI build by passing `--without-gui` to configure.
 
         ./autogen.sh
         ./configure
         make
 
-3.  It is also a good idea to build and run the unit tests:
+3.  It is recommended to build and run the unit tests:
 
         make check
 
-4.  (Optional) You can also install bitcoind to your path:
-
-        make install
-
-Use Qt Creator as IDE
-------------------------
-You can use Qt Creator as IDE, for debugging and for manipulating forms, etc.
-Download Qt Creator from https://www.qt.io/download/. Download the "community edition" and only install Qt Creator (uncheck the rest during the installation process).
-
-1. Make sure you installed everything through Homebrew mentioned above
-2. Do a proper ./configure --enable-debug
-3. In Qt Creator do "New Project" -> Import Project -> Import Existing Project
-4. Enter "bitcoin-qt" as project name, enter src/qt as location
-5. Leave the file selection as it is
-6. Confirm the "summary page"
-7. In the "Projects" tab select "Manage Kits..."
-8. Select the default "Desktop" kit and select "Clang (x86 64bit in /usr/bin)" as compiler
-9. Select LLDB as debugger (you might need to set the path to your installation)
-10. Start debugging with Qt Creator
-
-Creating a release build
-------------------------
-You can ignore this section if you are building `bitcoind` for your own use.
-
-bitcoind/bitcoin-cli binaries are not included in the Bitcoin-Qt.app bundle.
-
-If you are building `bitcoind` or `Bitcoin Core` for others, your build machine should be set up
-as follows for maximum compatibility:
+4.  You can also create a .dmg that contains the .app bundle (optional):
 
-All dependencies should be compiled with these flags:
-
- -mmacosx-version-min=10.7
- -arch x86_64
- -isysroot $(xcode-select --print-path)/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk
-
-Once dependencies are compiled, see [doc/release-process.md](release-process.md) for how the Bitcoin Core
-bundle is packaged and signed to create the .dmg disk image that is distributed.
+        make deploy
 
 Running
 -------
 
-It's now available at `./bitcoind`, provided that you are still in the `src`
-directory. We have to first create the RPC configuration file, though.
+Bitcoin Core is now available at `./src/bitcoind`
 
-Run `./bitcoind` to get the filename where it should be put, or just try these
-commands:
+Before running, it's recommended you create an RPC configuration file.
 
     echo -e "rpcuser=bitcoinrpc\nrpcpassword=$(xxd -l 16 -p /dev/urandom)" > "/Users/${USER}/Library/Application Support/Bitcoin/bitcoin.conf"
+
     chmod 600 "/Users/${USER}/Library/Application Support/Bitcoin/bitcoin.conf"
 
-The next time you run it, it will start downloading the blockchain, but it won't
-output anything while it's doing this. This process may take several hours;
-you can monitor its process by looking at the debug.log file, like this:
+The first time you run bitcoind, it will start downloading the blockchain. This process could take several hours.
+
+You can monitor the download process by looking at the debug.log file:
 
     tail -f $HOME/Library/Application\ Support/Bitcoin/debug.log
 
 Other commands:
 -------
 
-    ./bitcoind -daemon    # to start the bitcoin daemon.
-    ./bitcoin-cli --help  # for a list of command-line options.
-    ./bitcoin-cli help    # When the daemon is running, to get a list of RPC commands
+    ./src/bitcoind -daemon # Starts the bitcoin daemon.
+    ./src/bitcoin-cli --help # Outputs a list of command-line options.
+    ./src/bitcoin-cli help # Outputs a list of RPC commands when the daemon is running.
+
+Using Qt Creator as IDE
+------------------------
+You can use Qt Creator as an IDE, for bitcoin development.
+Download and install the community edition of [Qt Creator](https://www.qt.io/download/).
+Uncheck everything except Qt Creator during the installation process.
 
-Using Qt official installer while building
-------------------------------------------
+1. Make sure you installed everything through Homebrew mentioned above
+2. Do a proper ./configure --enable-debug
+3. In Qt Creator do "New Project" -> Import Project -> Import Existing Project
+4. Enter "bitcoin-qt" as project name, enter src/qt as location
+5. Leave the file selection as it is
+6. Confirm the "summary page"
+7. In the "Projects" tab select "Manage Kits..."
+8. Select the default "Desktop" kit and select "Clang (x86 64bit in /usr/bin)" as compiler
+9. Select LLDB as debugger (you might need to set the path to your installation)
+10. Start debugging with Qt Creator
+
+Notes
+-----
+
+* Tested on OS X 10.7 through 10.11 on 64-bit Intel processors only.
 
-If you prefer to use the latest Qt installed from the official binary
-installer over the brew version, you have to make several changes to
-the installed tree and its binaries (all these changes are contained
-in the brew version already). The changes needed are described in
-[#7714](https://github.com/bitcoin/bitcoin/issues/7714). We do not
-support building Bitcoin Core this way though.
+* Building with downloaded Qt binaries is not officially supported. See the notes in [#7714](https://github.com/bitcoin/bitcoin/issues/7714)

From 6bec172eb95e195847bb6dd6d4e62ada79c98c6d Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Wed, 30 Mar 2016 15:37:41 +0200
Subject: [PATCH 0312/1802] Add ctaes-based constant time AES implementation

---
 src/Makefile.am           |  4 ++-
 src/crypto/aes.cpp        | 73 +++++++++++++++++++++++++++++++++++++++
 src/crypto/aes.h          | 66 +++++++++++++++++++++++++++++++++++
 src/test/crypto_tests.cpp | 56 ++++++++++++++++++++++++++++++
 4 files changed, 198 insertions(+), 1 deletion(-)
 create mode 100644 src/crypto/aes.cpp
 create mode 100644 src/crypto/aes.h

diff --git a/src/Makefile.am b/src/Makefile.am
index 3c056386fac7b..0ab0d66ac21cb 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -225,6 +225,8 @@ libbitcoin_wallet_a_SOURCES = \
 crypto_libbitcoin_crypto_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_CONFIG_INCLUDES)
 crypto_libbitcoin_crypto_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
 crypto_libbitcoin_crypto_a_SOURCES = \
+  crypto/aes.cpp \
+  crypto/aes.h \
   crypto/common.h \
   crypto/hmac_sha256.cpp \
   crypto/hmac_sha256.h \
@@ -434,7 +436,7 @@ CLEANFILES += zmq/*.gcda zmq/*.gcno
 
 DISTCLEANFILES = obj/build.h
 
-EXTRA_DIST = leveldb
+EXTRA_DIST = leveldb crypto/ctaes
 
 clean-local:
 	-$(MAKE) -C leveldb clean
diff --git a/src/crypto/aes.cpp b/src/crypto/aes.cpp
new file mode 100644
index 0000000000000..035abd75bdbdc
--- /dev/null
+++ b/src/crypto/aes.cpp
@@ -0,0 +1,73 @@
+// Copyright (c) 2016 The Bitcoin Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#include "aes.h"
+#include "crypto/common.h"
+
+#include <assert.h>
+#include <string.h>
+
+extern "C" {
+#include "crypto/ctaes/ctaes.c"
+}
+
+AES128Encrypt::AES128Encrypt(const unsigned char key[16])
+{
+    AES128_init(&ctx, key);
+}
+
+AES128Encrypt::~AES128Encrypt()
+{
+    memset(&ctx, 0, sizeof(ctx));
+}
+
+void AES128Encrypt::Encrypt(unsigned char ciphertext[16], const unsigned char plaintext[16]) const
+{
+    AES128_encrypt(&ctx, 1, ciphertext, plaintext);
+}
+
+AES128Decrypt::AES128Decrypt(const unsigned char key[16])
+{
+    AES128_init(&ctx, key);
+}
+
+AES128Decrypt::~AES128Decrypt()
+{
+    memset(&ctx, 0, sizeof(ctx));
+}
+
+void AES128Decrypt::Decrypt(unsigned char plaintext[16], const unsigned char ciphertext[16]) const
+{
+    AES128_decrypt(&ctx, 1, plaintext, ciphertext);
+}
+
+AES256Encrypt::AES256Encrypt(const unsigned char key[32])
+{
+    AES256_init(&ctx, key);
+}
+
+AES256Encrypt::~AES256Encrypt()
+{
+    memset(&ctx, 0, sizeof(ctx));
+}
+
+void AES256Encrypt::Encrypt(unsigned char ciphertext[16], const unsigned char plaintext[16]) const
+{
+    AES256_encrypt(&ctx, 1, ciphertext, plaintext);
+}
+
+AES256Decrypt::AES256Decrypt(const unsigned char key[32])
+{
+    AES256_init(&ctx, key);
+}
+
+AES256Decrypt::~AES256Decrypt()
+{
+    memset(&ctx, 0, sizeof(ctx));
+}
+
+void AES256Decrypt::Decrypt(unsigned char plaintext[16], const unsigned char ciphertext[16]) const
+{
+    AES256_decrypt(&ctx, 1, plaintext, ciphertext);
+}
diff --git a/src/crypto/aes.h b/src/crypto/aes.h
new file mode 100644
index 0000000000000..4bf17a33eae55
--- /dev/null
+++ b/src/crypto/aes.h
@@ -0,0 +1,66 @@
+// Copyright (c) 2015 The Bitcoin Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+//
+// C++ wrapper around ctaes, a constant-time AES implementation
+
+#ifndef BITCOIN_CRYPTO_AES_H
+#define BITCOIN_CRYPTO_AES_H
+
+extern "C" {
+#include "crypto/ctaes/ctaes.h"
+}
+
+static const int AES_BLOCKSIZE = 16;
+static const int AES128_KEYSIZE = 16;
+static const int AES256_KEYSIZE = 32;
+
+/** An encryption class for AES-128. */
+class AES128Encrypt
+{
+private:
+    AES128_ctx ctx;
+
+public:
+    AES128Encrypt(const unsigned char key[16]);
+    ~AES128Encrypt();
+    void Encrypt(unsigned char ciphertext[16], const unsigned char plaintext[16]) const;
+};
+
+/** A decryption class for AES-128. */
+class AES128Decrypt
+{
+private:
+    AES128_ctx ctx;
+
+public:
+    AES128Decrypt(const unsigned char key[16]);
+    ~AES128Decrypt();
+    void Decrypt(unsigned char plaintext[16], const unsigned char ciphertext[16]) const;
+};
+
+/** An encryption class for AES-256. */
+class AES256Encrypt
+{
+private:
+    AES256_ctx ctx;
+
+public:
+    AES256Encrypt(const unsigned char key[32]);
+    ~AES256Encrypt();
+    void Encrypt(unsigned char ciphertext[16], const unsigned char plaintext[16]) const;
+};
+
+/** A decryption class for AES-256. */
+class AES256Decrypt
+{
+private:
+    AES256_ctx ctx;
+
+public:
+    AES256Decrypt(const unsigned char key[32]);
+    ~AES256Decrypt();
+    void Decrypt(unsigned char plaintext[16], const unsigned char ciphertext[16]) const;
+};
+
+#endif // BITCOIN_CRYPTO_AES_H
diff --git a/src/test/crypto_tests.cpp b/src/test/crypto_tests.cpp
index 0b46d718d1d13..3fc9855d6ab63 100644
--- a/src/test/crypto_tests.cpp
+++ b/src/test/crypto_tests.cpp
@@ -2,6 +2,7 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
+#include "crypto/aes.h"
 #include "crypto/ripemd160.h"
 #include "crypto/sha1.h"
 #include "crypto/sha256.h"
@@ -63,6 +64,45 @@ void TestHMACSHA512(const std::string &hexkey, const std::string &hexin, const s
     TestVector(CHMAC_SHA512(&key[0], key.size()), ParseHex(hexin), ParseHex(hexout));
 }
 
+void TestAES128(const std::string &hexkey, const std::string &hexin, const std::string &hexout)
+{
+    std::vector<unsigned char> key = ParseHex(hexkey);
+    std::vector<unsigned char> in = ParseHex(hexin);
+    std::vector<unsigned char> correctout = ParseHex(hexout);
+    std::vector<unsigned char> buf, buf2;
+
+    assert(key.size() == 16);
+    assert(in.size() == 16);
+    assert(correctout.size() == 16);
+    AES128Encrypt enc(&key[0]);
+    buf.resize(correctout.size());
+    buf2.resize(correctout.size());
+    enc.Encrypt(&buf[0], &in[0]);
+    BOOST_CHECK_EQUAL(HexStr(buf), HexStr(correctout));
+    AES128Decrypt dec(&key[0]);
+    dec.Decrypt(&buf2[0], &buf[0]);
+    BOOST_CHECK_EQUAL(HexStr(buf2), HexStr(in));
+}
+
+void TestAES256(const std::string &hexkey, const std::string &hexin, const std::string &hexout)
+{
+    std::vector<unsigned char> key = ParseHex(hexkey);
+    std::vector<unsigned char> in = ParseHex(hexin);
+    std::vector<unsigned char> correctout = ParseHex(hexout);
+    std::vector<unsigned char> buf;
+
+    assert(key.size() == 32);
+    assert(in.size() == 16);
+    assert(correctout.size() == 16);
+    AES256Encrypt enc(&key[0]);
+    buf.resize(correctout.size());
+    enc.Encrypt(&buf[0], &in[0]);
+    BOOST_CHECK(buf == correctout);
+    AES256Decrypt dec(&key[0]);
+    dec.Decrypt(&buf[0], &buf[0]);
+    BOOST_CHECK(buf == in);
+}
+
 std::string LongTestString(void) {
     std::string ret;
     for (int i=0; i<200000; i++) {
@@ -248,4 +288,20 @@ BOOST_AUTO_TEST_CASE(hmac_sha512_testvectors) {
                    "b6022cac3c4982b10d5eeb55c3e4de15134676fb6de0446065c97440fa8c6a58");
 }
 
+BOOST_AUTO_TEST_CASE(aes_testvectors) {
+    // AES test vectors from FIPS 197.
+    TestAES128("000102030405060708090a0b0c0d0e0f", "00112233445566778899aabbccddeeff", "69c4e0d86a7b0430d8cdb78070b4c55a");
+    TestAES256("000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f", "00112233445566778899aabbccddeeff", "8ea2b7ca516745bfeafc49904b496089");
+
+    // AES-ECB test vectors from NIST sp800-38a.
+    TestAES128("2b7e151628aed2a6abf7158809cf4f3c", "6bc1bee22e409f96e93d7e117393172a", "3ad77bb40d7a3660a89ecaf32466ef97");
+    TestAES128("2b7e151628aed2a6abf7158809cf4f3c", "ae2d8a571e03ac9c9eb76fac45af8e51", "f5d3d58503b9699de785895a96fdbaaf");
+    TestAES128("2b7e151628aed2a6abf7158809cf4f3c", "30c81c46a35ce411e5fbc1191a0a52ef", "43b1cd7f598ece23881b00e3ed030688");
+    TestAES128("2b7e151628aed2a6abf7158809cf4f3c", "f69f2445df4f9b17ad2b417be66c3710", "7b0c785e27e8ad3f8223207104725dd4");
+    TestAES256("603deb1015ca71be2b73aef0857d77811f352c073b6108d72d9810a30914dff4", "6bc1bee22e409f96e93d7e117393172a", "f3eed1bdb5d2a03c064b5a7e3db181f8");
+    TestAES256("603deb1015ca71be2b73aef0857d77811f352c073b6108d72d9810a30914dff4", "ae2d8a571e03ac9c9eb76fac45af8e51", "591ccb10d410ed26dc5ba74a31362870");
+    TestAES256("603deb1015ca71be2b73aef0857d77811f352c073b6108d72d9810a30914dff4", "30c81c46a35ce411e5fbc1191a0a52ef", "b6ed21b99ca6f4f9f153e7b1beafed1d");
+    TestAES256("603deb1015ca71be2b73aef0857d77811f352c073b6108d72d9810a30914dff4", "f69f2445df4f9b17ad2b417be66c3710", "23304b7a39f9f3ff067d8d8f9e24ecc7");
+}
+
 BOOST_AUTO_TEST_SUITE_END()

From 27a212dcb4fe842ead77d01b98f2c1a58ecca609 Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Fri, 20 Mar 2015 00:49:13 -0400
Subject: [PATCH 0313/1802] crypto: add AES 128/256 CBC classes

The output should always match openssl's, even for failed operations. Even for
a decrypt with broken padding, the output is always deterministic (and attemtps
to be constant-time).
---
 src/crypto/aes.cpp | 144 +++++++++++++++++++++++++++++++++++++++++++++
 src/crypto/aes.h   |  52 ++++++++++++++++
 2 files changed, 196 insertions(+)

diff --git a/src/crypto/aes.cpp b/src/crypto/aes.cpp
index 035abd75bdbdc..1d469d0fb4622 100644
--- a/src/crypto/aes.cpp
+++ b/src/crypto/aes.cpp
@@ -71,3 +71,147 @@ void AES256Decrypt::Decrypt(unsigned char plaintext[16], const unsigned char cip
 {
     AES256_decrypt(&ctx, 1, plaintext, ciphertext);
 }
+
+
+template <typename T>
+static int CBCEncrypt(const T& enc, const unsigned char iv[AES_BLOCKSIZE], const unsigned char* data, int size, bool pad, unsigned char* out)
+{
+    int written = 0;
+    int padsize = size % AES_BLOCKSIZE;
+    unsigned char mixed[AES_BLOCKSIZE];
+
+    if (!data || !size || !out)
+        return 0;
+
+    if (!pad && padsize != 0)
+        return 0;
+
+    memcpy(mixed, iv, AES_BLOCKSIZE);
+
+    // Write all but the last block
+    while (written + AES_BLOCKSIZE <= size) {
+        for (int i = 0; i != AES_BLOCKSIZE; i++)
+            mixed[i] ^= *data++;
+        enc.Encrypt(out + written, mixed);
+        memcpy(mixed, out + written, AES_BLOCKSIZE);
+        written += AES_BLOCKSIZE;
+    }
+    if (pad) {
+        // For all that remains, pad each byte with the value of the remaining
+        // space. If there is none, pad by a full block.
+        for (int i = 0; i != padsize; i++)
+            mixed[i] ^= *data++;
+        for (int i = padsize; i != AES_BLOCKSIZE; i++)
+            mixed[i] ^= AES_BLOCKSIZE - padsize;
+        enc.Encrypt(out + written, mixed);
+        written += AES_BLOCKSIZE;
+    }
+    return written;
+}
+
+template <typename T>
+static int CBCDecrypt(const T& dec, const unsigned char iv[AES_BLOCKSIZE], const unsigned char* data, int size, bool pad, unsigned char* out)
+{
+    unsigned char padsize = 0;
+    int written = 0;
+    bool fail = false;
+    const unsigned char* prev = iv;
+
+    if (!data || !size || !out)
+        return 0;
+
+    if (size % AES_BLOCKSIZE != 0)
+        return 0;
+
+    // Decrypt all data. Padding will be checked in the output.
+    while (written != size) {
+        dec.Decrypt(out, data + written);
+        for (int i = 0; i != AES_BLOCKSIZE; i++)
+            *out++ ^= prev[i];
+        prev = data + written;
+        written += AES_BLOCKSIZE;
+    }
+
+    // When decrypting padding, attempt to run in constant-time
+    if (pad) {
+        // If used, padding size is the value of the last decrypted byte. For
+        // it to be valid, It must be between 1 and AES_BLOCKSIZE.
+        padsize = *--out;
+        fail = !padsize | (padsize > AES_BLOCKSIZE);
+
+        // If not well-formed, treat it as though there's no padding.
+        padsize *= !fail;
+
+        // All padding must equal the last byte otherwise it's not well-formed
+        for (int i = AES_BLOCKSIZE; i != 0; i--)
+            fail |= ((i > AES_BLOCKSIZE - padsize) & (*out-- != padsize));
+
+        written -= padsize;
+    }
+    return written * !fail;
+}
+
+AES256CBCEncrypt::AES256CBCEncrypt(const unsigned char key[AES256_KEYSIZE], const unsigned char ivIn[AES_BLOCKSIZE], bool padIn)
+    : enc(key), pad(padIn)
+{
+    memcpy(iv, ivIn, AES_BLOCKSIZE);
+}
+
+int AES256CBCEncrypt::Encrypt(const unsigned char* data, int size, unsigned char* out) const
+{
+    return CBCEncrypt(enc, iv, data, size, pad, out);
+}
+
+AES256CBCEncrypt::~AES256CBCEncrypt()
+{
+    memset(iv, 0, sizeof(iv));
+}
+
+AES256CBCDecrypt::AES256CBCDecrypt(const unsigned char key[AES256_KEYSIZE], const unsigned char ivIn[AES_BLOCKSIZE], bool padIn)
+    : dec(key), pad(padIn)
+{
+    memcpy(iv, ivIn, AES_BLOCKSIZE);
+}
+
+
+int AES256CBCDecrypt::Decrypt(const unsigned char* data, int size, unsigned char* out) const
+{
+    return CBCDecrypt(dec, iv, data, size, pad, out);
+}
+
+AES256CBCDecrypt::~AES256CBCDecrypt()
+{
+    memset(iv, 0, sizeof(iv));
+}
+
+AES128CBCEncrypt::AES128CBCEncrypt(const unsigned char key[AES128_KEYSIZE], const unsigned char ivIn[AES_BLOCKSIZE], bool padIn)
+    : enc(key), pad(padIn)
+{
+    memcpy(iv, ivIn, AES_BLOCKSIZE);
+}
+
+AES128CBCEncrypt::~AES128CBCEncrypt()
+{
+    memset(iv, 0, AES_BLOCKSIZE);
+}
+
+int AES128CBCEncrypt::Encrypt(const unsigned char* data, int size, unsigned char* out) const
+{
+    return CBCEncrypt(enc, iv, data, size, pad, out);
+}
+
+AES128CBCDecrypt::AES128CBCDecrypt(const unsigned char key[AES128_KEYSIZE], const unsigned char ivIn[AES_BLOCKSIZE], bool padIn)
+    : dec(key), pad(padIn)
+{
+    memcpy(iv, ivIn, AES_BLOCKSIZE);
+}
+
+AES128CBCDecrypt::~AES128CBCDecrypt()
+{
+    memset(iv, 0, AES_BLOCKSIZE);
+}
+
+int AES128CBCDecrypt::Decrypt(const unsigned char* data, int size, unsigned char* out) const
+{
+    return CBCDecrypt(dec, iv, data, size, pad, out);
+}
diff --git a/src/crypto/aes.h b/src/crypto/aes.h
index 4bf17a33eae55..8cae357c1287e 100644
--- a/src/crypto/aes.h
+++ b/src/crypto/aes.h
@@ -63,4 +63,56 @@ class AES256Decrypt
     void Decrypt(unsigned char plaintext[16], const unsigned char ciphertext[16]) const;
 };
 
+class AES256CBCEncrypt
+{
+public:
+    AES256CBCEncrypt(const unsigned char key[AES256_KEYSIZE], const unsigned char ivIn[AES_BLOCKSIZE], bool padIn);
+    ~AES256CBCEncrypt();
+    int Encrypt(const unsigned char* data, int size, unsigned char* out) const;
+
+private:
+    const AES256Encrypt enc;
+    const bool pad;
+    unsigned char iv[AES_BLOCKSIZE];
+};
+
+class AES256CBCDecrypt
+{
+public:
+    AES256CBCDecrypt(const unsigned char key[AES256_KEYSIZE], const unsigned char ivIn[AES_BLOCKSIZE], bool padIn);
+    ~AES256CBCDecrypt();
+    int Decrypt(const unsigned char* data, int size, unsigned char* out) const;
+
+private:
+    const AES256Decrypt dec;
+    const bool pad;
+    unsigned char iv[AES_BLOCKSIZE];
+};
+
+class AES128CBCEncrypt
+{
+public:
+    AES128CBCEncrypt(const unsigned char key[AES128_KEYSIZE], const unsigned char ivIn[AES_BLOCKSIZE], bool padIn);
+    ~AES128CBCEncrypt();
+    int Encrypt(const unsigned char* data, int size, unsigned char* out) const;
+
+private:
+    const AES128Encrypt enc;
+    const bool pad;
+    unsigned char iv[AES_BLOCKSIZE];
+};
+
+class AES128CBCDecrypt
+{
+public:
+    AES128CBCDecrypt(const unsigned char key[AES128_KEYSIZE], const unsigned char ivIn[AES_BLOCKSIZE], bool padIn);
+    ~AES128CBCDecrypt();
+    int Decrypt(const unsigned char* data, int size, unsigned char* out) const;
+
+private:
+    const AES128Decrypt dec;
+    const bool pad;
+    unsigned char iv[AES_BLOCKSIZE];
+};
+
 #endif // BITCOIN_CRYPTO_AES_H

From daa384120a63542257d4ca73047d775f16fac654 Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Fri, 20 Mar 2015 00:52:58 -0400
Subject: [PATCH 0314/1802] crypto: add aes cbc tests

---
 src/test/crypto_tests.cpp | 135 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 135 insertions(+)

diff --git a/src/test/crypto_tests.cpp b/src/test/crypto_tests.cpp
index 3fc9855d6ab63..58a62ee02262d 100644
--- a/src/test/crypto_tests.cpp
+++ b/src/test/crypto_tests.cpp
@@ -17,6 +17,8 @@
 
 #include <boost/assign/list_of.hpp>
 #include <boost/test/unit_test.hpp>
+#include <openssl/aes.h>
+#include <openssl/evp.h>
 
 BOOST_FIXTURE_TEST_SUITE(crypto_tests, BasicTestingSetup)
 
@@ -103,6 +105,88 @@ void TestAES256(const std::string &hexkey, const std::string &hexin, const std::
     BOOST_CHECK(buf == in);
 }
 
+void TestAES128CBC(const std::string &hexkey, const std::string &hexiv, bool pad, const std::string &hexin, const std::string &hexout)
+{
+    std::vector<unsigned char> key = ParseHex(hexkey);
+    std::vector<unsigned char> iv = ParseHex(hexiv);
+    std::vector<unsigned char> in = ParseHex(hexin);
+    std::vector<unsigned char> correctout = ParseHex(hexout);
+    std::vector<unsigned char> realout(in.size() + AES_BLOCKSIZE);
+
+    // Encrypt the plaintext and verify that it equals the cipher
+    AES128CBCEncrypt enc(&key[0], &iv[0], pad);
+    int size = enc.Encrypt(&in[0], in.size(), &realout[0]);
+    realout.resize(size);
+    BOOST_CHECK(realout.size() == correctout.size());
+    BOOST_CHECK_MESSAGE(realout == correctout, HexStr(realout) + std::string(" != ") + hexout);
+
+    // Decrypt the cipher and verify that it equals the plaintext
+    std::vector<unsigned char> decrypted(correctout.size());
+    AES128CBCDecrypt dec(&key[0], &iv[0], pad);
+    size = dec.Decrypt(&correctout[0], correctout.size(), &decrypted[0]);
+    decrypted.resize(size);
+    BOOST_CHECK(decrypted.size() == in.size());
+    BOOST_CHECK_MESSAGE(decrypted == in, HexStr(decrypted) + std::string(" != ") + hexin);
+
+    // Encrypt and re-decrypt substrings of the plaintext and verify that they equal each-other
+    for(std::vector<unsigned char>::iterator i(in.begin()); i != in.end(); ++i)
+    {
+        std::vector<unsigned char> sub(i, in.end());
+        std::vector<unsigned char> subout(sub.size() + AES_BLOCKSIZE);
+        int size = enc.Encrypt(&sub[0], sub.size(), &subout[0]);
+        if (size != 0)
+        {
+            subout.resize(size);
+            std::vector<unsigned char> subdecrypted(subout.size());
+            size = dec.Decrypt(&subout[0], subout.size(), &subdecrypted[0]);
+            subdecrypted.resize(size);
+            BOOST_CHECK(decrypted.size() == in.size());
+            BOOST_CHECK_MESSAGE(subdecrypted == sub, HexStr(subdecrypted) + std::string(" != ") + HexStr(sub));
+        }
+    }
+}
+
+void TestAES256CBC(const std::string &hexkey, const std::string &hexiv, bool pad, const std::string &hexin, const std::string &hexout)
+{
+    std::vector<unsigned char> key = ParseHex(hexkey);
+    std::vector<unsigned char> iv = ParseHex(hexiv);
+    std::vector<unsigned char> in = ParseHex(hexin);
+    std::vector<unsigned char> correctout = ParseHex(hexout);
+    std::vector<unsigned char> realout(in.size() + AES_BLOCKSIZE);
+
+    // Encrypt the plaintext and verify that it equals the cipher
+    AES256CBCEncrypt enc(&key[0], &iv[0], pad);
+    int size = enc.Encrypt(&in[0], in.size(), &realout[0]);
+    realout.resize(size);
+    BOOST_CHECK(realout.size() == correctout.size());
+    BOOST_CHECK_MESSAGE(realout == correctout, HexStr(realout) + std::string(" != ") + hexout);
+
+    // Decrypt the cipher and verify that it equals the plaintext
+    std::vector<unsigned char> decrypted(correctout.size());
+    AES256CBCDecrypt dec(&key[0], &iv[0], pad);
+    size = dec.Decrypt(&correctout[0], correctout.size(), &decrypted[0]);
+    decrypted.resize(size);
+    BOOST_CHECK(decrypted.size() == in.size());
+    BOOST_CHECK_MESSAGE(decrypted == in, HexStr(decrypted) + std::string(" != ") + hexin);
+
+    // Encrypt and re-decrypt substrings of the plaintext and verify that they equal each-other
+    for(std::vector<unsigned char>::iterator i(in.begin()); i != in.end(); ++i)
+    {
+        std::vector<unsigned char> sub(i, in.end());
+        std::vector<unsigned char> subout(sub.size() + AES_BLOCKSIZE);
+        int size = enc.Encrypt(&sub[0], sub.size(), &subout[0]);
+        if (size != 0)
+        {
+            subout.resize(size);
+            std::vector<unsigned char> subdecrypted(subout.size());
+            size = dec.Decrypt(&subout[0], subout.size(), &subdecrypted[0]);
+            subdecrypted.resize(size);
+            BOOST_CHECK(decrypted.size() == in.size());
+            BOOST_CHECK_MESSAGE(subdecrypted == sub, HexStr(subdecrypted) + std::string(" != ") + HexStr(sub));
+        }
+    }
+}
+
 std::string LongTestString(void) {
     std::string ret;
     for (int i=0; i<200000; i++) {
@@ -304,4 +388,55 @@ BOOST_AUTO_TEST_CASE(aes_testvectors) {
     TestAES256("603deb1015ca71be2b73aef0857d77811f352c073b6108d72d9810a30914dff4", "f69f2445df4f9b17ad2b417be66c3710", "23304b7a39f9f3ff067d8d8f9e24ecc7");
 }
 
+BOOST_AUTO_TEST_CASE(aes_cbc_testvectors) {
+
+    // NIST AES CBC 128-bit encryption test-vectors
+    TestAES128CBC("2b7e151628aed2a6abf7158809cf4f3c", "000102030405060708090A0B0C0D0E0F", false, \
+                  "6bc1bee22e409f96e93d7e117393172a", "7649abac8119b246cee98e9b12e9197d");
+    TestAES128CBC("2b7e151628aed2a6abf7158809cf4f3c", "7649ABAC8119B246CEE98E9B12E9197D", false, \
+                  "ae2d8a571e03ac9c9eb76fac45af8e51", "5086cb9b507219ee95db113a917678b2");
+    TestAES128CBC("2b7e151628aed2a6abf7158809cf4f3c", "5086cb9b507219ee95db113a917678b2", false, \
+                  "30c81c46a35ce411e5fbc1191a0a52ef", "73bed6b8e3c1743b7116e69e22229516");
+    TestAES128CBC("2b7e151628aed2a6abf7158809cf4f3c", "73bed6b8e3c1743b7116e69e22229516", false, \
+                  "f69f2445df4f9b17ad2b417be66c3710", "3ff1caa1681fac09120eca307586e1a7");
+
+    // The same vectors with padding enabled
+    TestAES128CBC("2b7e151628aed2a6abf7158809cf4f3c", "000102030405060708090A0B0C0D0E0F", true, \
+                  "6bc1bee22e409f96e93d7e117393172a", "7649abac8119b246cee98e9b12e9197d8964e0b149c10b7b682e6e39aaeb731c");
+    TestAES128CBC("2b7e151628aed2a6abf7158809cf4f3c", "7649ABAC8119B246CEE98E9B12E9197D", true, \
+                  "ae2d8a571e03ac9c9eb76fac45af8e51", "5086cb9b507219ee95db113a917678b255e21d7100b988ffec32feeafaf23538");
+    TestAES128CBC("2b7e151628aed2a6abf7158809cf4f3c", "5086cb9b507219ee95db113a917678b2", true, \
+                  "30c81c46a35ce411e5fbc1191a0a52ef", "73bed6b8e3c1743b7116e69e22229516f6eccda327bf8e5ec43718b0039adceb");
+    TestAES128CBC("2b7e151628aed2a6abf7158809cf4f3c", "73bed6b8e3c1743b7116e69e22229516", true, \
+                  "f69f2445df4f9b17ad2b417be66c3710", "3ff1caa1681fac09120eca307586e1a78cb82807230e1321d3fae00d18cc2012");
+
+    // NIST AES CBC 256-bit encryption test-vectors
+    TestAES256CBC("603deb1015ca71be2b73aef0857d77811f352c073b6108d72d9810a30914dff4", \
+                  "000102030405060708090A0B0C0D0E0F", false, "6bc1bee22e409f96e93d7e117393172a", \
+                  "f58c4c04d6e5f1ba779eabfb5f7bfbd6");
+    TestAES256CBC("603deb1015ca71be2b73aef0857d77811f352c073b6108d72d9810a30914dff4", \
+                  "F58C4C04D6E5F1BA779EABFB5F7BFBD6", false, "ae2d8a571e03ac9c9eb76fac45af8e51", \
+                  "9cfc4e967edb808d679f777bc6702c7d");
+    TestAES256CBC("603deb1015ca71be2b73aef0857d77811f352c073b6108d72d9810a30914dff4", \
+                  "9CFC4E967EDB808D679F777BC6702C7D", false, "30c81c46a35ce411e5fbc1191a0a52ef",
+                  "39f23369a9d9bacfa530e26304231461");
+    TestAES256CBC("603deb1015ca71be2b73aef0857d77811f352c073b6108d72d9810a30914dff4", \
+                  "39F23369A9D9BACFA530E26304231461", false, "f69f2445df4f9b17ad2b417be66c3710", \
+                  "b2eb05e2c39be9fcda6c19078c6a9d1b");
+
+    // The same vectors with padding enabled
+    TestAES256CBC("603deb1015ca71be2b73aef0857d77811f352c073b6108d72d9810a30914dff4", \
+                  "000102030405060708090A0B0C0D0E0F", true, "6bc1bee22e409f96e93d7e117393172a", \
+                  "f58c4c04d6e5f1ba779eabfb5f7bfbd6485a5c81519cf378fa36d42b8547edc0");
+    TestAES256CBC("603deb1015ca71be2b73aef0857d77811f352c073b6108d72d9810a30914dff4", \
+                  "F58C4C04D6E5F1BA779EABFB5F7BFBD6", true, "ae2d8a571e03ac9c9eb76fac45af8e51", \
+                  "9cfc4e967edb808d679f777bc6702c7d3a3aa5e0213db1a9901f9036cf5102d2");
+    TestAES256CBC("603deb1015ca71be2b73aef0857d77811f352c073b6108d72d9810a30914dff4", \
+                  "9CFC4E967EDB808D679F777BC6702C7D", true, "30c81c46a35ce411e5fbc1191a0a52ef",
+                  "39f23369a9d9bacfa530e263042314612f8da707643c90a6f732b3de1d3f5cee");
+    TestAES256CBC("603deb1015ca71be2b73aef0857d77811f352c073b6108d72d9810a30914dff4", \
+                  "39F23369A9D9BACFA530E26304231461", true, "f69f2445df4f9b17ad2b417be66c3710", \
+                  "b2eb05e2c39be9fcda6c19078c6a9d1b3f461796d6b0d6b2e0c2a72b4d80e644");
+}
+
 BOOST_AUTO_TEST_SUITE_END()

From 1c391a5866e1342617b51041afebee2215e9a30c Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Fri, 20 Mar 2015 01:05:47 -0400
Subject: [PATCH 0315/1802] crypter: fix the stored initialization vector size

AES IV's are 16bytes, not 32. This was harmless but confusing.

Add WALLET_CRYPTO_IV_SIZE to make its usage explicit.
---
 src/wallet/crypter.cpp | 10 +++++-----
 src/wallet/crypter.h   |  3 ++-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/wallet/crypter.cpp b/src/wallet/crypter.cpp
index 95aa4c2593164..8f555579fa3b5 100644
--- a/src/wallet/crypter.cpp
+++ b/src/wallet/crypter.cpp
@@ -37,7 +37,7 @@ bool CCrypter::SetKeyFromPassphrase(const SecureString& strKeyData, const std::v
 
 bool CCrypter::SetKey(const CKeyingMaterial& chNewKey, const std::vector<unsigned char>& chNewIV)
 {
-    if (chNewKey.size() != WALLET_CRYPTO_KEY_SIZE || chNewIV.size() != WALLET_CRYPTO_KEY_SIZE)
+    if (chNewKey.size() != WALLET_CRYPTO_KEY_SIZE || chNewIV.size() != WALLET_CRYPTO_IV_SIZE)
         return false;
 
     memcpy(&chKey[0], &chNewKey[0], sizeof chKey);
@@ -105,8 +105,8 @@ bool CCrypter::Decrypt(const std::vector<unsigned char>& vchCiphertext, CKeyingM
 static bool EncryptSecret(const CKeyingMaterial& vMasterKey, const CKeyingMaterial &vchPlaintext, const uint256& nIV, std::vector<unsigned char> &vchCiphertext)
 {
     CCrypter cKeyCrypter;
-    std::vector<unsigned char> chIV(WALLET_CRYPTO_KEY_SIZE);
-    memcpy(&chIV[0], &nIV, WALLET_CRYPTO_KEY_SIZE);
+    std::vector<unsigned char> chIV(WALLET_CRYPTO_IV_SIZE);
+    memcpy(&chIV[0], &nIV, WALLET_CRYPTO_IV_SIZE);
     if(!cKeyCrypter.SetKey(vMasterKey, chIV))
         return false;
     return cKeyCrypter.Encrypt(*((const CKeyingMaterial*)&vchPlaintext), vchCiphertext);
@@ -115,8 +115,8 @@ static bool EncryptSecret(const CKeyingMaterial& vMasterKey, const CKeyingMateri
 static bool DecryptSecret(const CKeyingMaterial& vMasterKey, const std::vector<unsigned char>& vchCiphertext, const uint256& nIV, CKeyingMaterial& vchPlaintext)
 {
     CCrypter cKeyCrypter;
-    std::vector<unsigned char> chIV(WALLET_CRYPTO_KEY_SIZE);
-    memcpy(&chIV[0], &nIV, WALLET_CRYPTO_KEY_SIZE);
+    std::vector<unsigned char> chIV(WALLET_CRYPTO_IV_SIZE);
+    memcpy(&chIV[0], &nIV, WALLET_CRYPTO_IV_SIZE);
     if(!cKeyCrypter.SetKey(vMasterKey, chIV))
         return false;
     return cKeyCrypter.Decrypt(vchCiphertext, *((CKeyingMaterial*)&vchPlaintext));
diff --git a/src/wallet/crypter.h b/src/wallet/crypter.h
index eb06a7866a96c..b4727ac8ac090 100644
--- a/src/wallet/crypter.h
+++ b/src/wallet/crypter.h
@@ -13,6 +13,7 @@ class uint256;
 
 const unsigned int WALLET_CRYPTO_KEY_SIZE = 32;
 const unsigned int WALLET_CRYPTO_SALT_SIZE = 8;
+const unsigned int WALLET_CRYPTO_IV_SIZE = 16;
 
 /**
  * Private key encryption is done based on a CMasterKey,
@@ -71,7 +72,7 @@ class CCrypter
 {
 private:
     unsigned char chKey[WALLET_CRYPTO_KEY_SIZE];
-    unsigned char chIV[WALLET_CRYPTO_KEY_SIZE];
+    unsigned char chIV[WALLET_CRYPTO_IV_SIZE];
     bool fKeySet;
 
 public:

From fb96831c1ff767cd86099f66127fa4dc1ec6e277 Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Thu, 26 Mar 2015 17:37:29 -0400
Subject: [PATCH 0316/1802] crypter: constify encrypt/decrypt

This makes CCrypter easier to pass aroundf for tests
---
 src/wallet/crypter.cpp | 4 ++--
 src/wallet/crypter.h   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/wallet/crypter.cpp b/src/wallet/crypter.cpp
index 8f555579fa3b5..e37a9c4c85d4e 100644
--- a/src/wallet/crypter.cpp
+++ b/src/wallet/crypter.cpp
@@ -47,7 +47,7 @@ bool CCrypter::SetKey(const CKeyingMaterial& chNewKey, const std::vector<unsigne
     return true;
 }
 
-bool CCrypter::Encrypt(const CKeyingMaterial& vchPlaintext, std::vector<unsigned char> &vchCiphertext)
+bool CCrypter::Encrypt(const CKeyingMaterial& vchPlaintext, std::vector<unsigned char> &vchCiphertext) const
 {
     if (!fKeySet)
         return false;
@@ -74,7 +74,7 @@ bool CCrypter::Encrypt(const CKeyingMaterial& vchPlaintext, std::vector<unsigned
     return true;
 }
 
-bool CCrypter::Decrypt(const std::vector<unsigned char>& vchCiphertext, CKeyingMaterial& vchPlaintext)
+bool CCrypter::Decrypt(const std::vector<unsigned char>& vchCiphertext, CKeyingMaterial& vchPlaintext) const
 {
     if (!fKeySet)
         return false;
diff --git a/src/wallet/crypter.h b/src/wallet/crypter.h
index b4727ac8ac090..3457d40ffd029 100644
--- a/src/wallet/crypter.h
+++ b/src/wallet/crypter.h
@@ -77,8 +77,8 @@ class CCrypter
 
 public:
     bool SetKeyFromPassphrase(const SecureString &strKeyData, const std::vector<unsigned char>& chSalt, const unsigned int nRounds, const unsigned int nDerivationMethod);
-    bool Encrypt(const CKeyingMaterial& vchPlaintext, std::vector<unsigned char> &vchCiphertext);
-    bool Decrypt(const std::vector<unsigned char>& vchCiphertext, CKeyingMaterial& vchPlaintext);
+    bool Encrypt(const CKeyingMaterial& vchPlaintext, std::vector<unsigned char> &vchCiphertext) const;
+    bool Decrypt(const std::vector<unsigned char>& vchCiphertext, CKeyingMaterial& vchPlaintext) const;
     bool SetKey(const CKeyingMaterial& chNewKey, const std::vector<unsigned char>& chNewIV);
 
     void CleanKey()

From 9049cde4d962862f507f9ddf1c0dbd49ea04be51 Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Fri, 20 Mar 2015 01:10:30 -0400
Subject: [PATCH 0317/1802] crypter: hook up the new aes cbc classes

---
 src/wallet/crypter.cpp | 45 +++++++++++++-----------------------------
 1 file changed, 14 insertions(+), 31 deletions(-)

diff --git a/src/wallet/crypter.cpp b/src/wallet/crypter.cpp
index e37a9c4c85d4e..0a19139a3172a 100644
--- a/src/wallet/crypter.cpp
+++ b/src/wallet/crypter.cpp
@@ -4,6 +4,7 @@
 
 #include "crypter.h"
 
+#include "crypto/aes.h"
 #include "script/script.h"
 #include "script/standard.h"
 #include "util.h"
@@ -53,24 +54,15 @@ bool CCrypter::Encrypt(const CKeyingMaterial& vchPlaintext, std::vector<unsigned
         return false;
 
     // max ciphertext len for a n bytes of plaintext is
-    // n + AES_BLOCK_SIZE - 1 bytes
-    int nLen = vchPlaintext.size();
-    int nCLen = nLen + AES_BLOCK_SIZE, nFLen = 0;
-    vchCiphertext = std::vector<unsigned char> (nCLen);
+    // n + AES_BLOCKSIZE bytes
+    vchCiphertext.resize(vchPlaintext.size() + AES_BLOCKSIZE);
 
-    EVP_CIPHER_CTX ctx;
-
-    bool fOk = true;
-
-    EVP_CIPHER_CTX_init(&ctx);
-    if (fOk) fOk = EVP_EncryptInit_ex(&ctx, EVP_aes_256_cbc(), NULL, chKey, chIV) != 0;
-    if (fOk) fOk = EVP_EncryptUpdate(&ctx, &vchCiphertext[0], &nCLen, &vchPlaintext[0], nLen) != 0;
-    if (fOk) fOk = EVP_EncryptFinal_ex(&ctx, (&vchCiphertext[0]) + nCLen, &nFLen) != 0;
-    EVP_CIPHER_CTX_cleanup(&ctx);
-
-    if (!fOk) return false;
+    AES256CBCEncrypt enc(chKey, chIV, true);
+    size_t nLen = enc.Encrypt(&vchPlaintext[0], vchPlaintext.size(), &vchCiphertext[0]);
+    if(nLen < vchPlaintext.size())
+        return false;
+    vchCiphertext.resize(nLen);
 
-    vchCiphertext.resize(nCLen + nFLen);
     return true;
 }
 
@@ -81,23 +73,14 @@ bool CCrypter::Decrypt(const std::vector<unsigned char>& vchCiphertext, CKeyingM
 
     // plaintext will always be equal to or lesser than length of ciphertext
     int nLen = vchCiphertext.size();
-    int nPLen = nLen, nFLen = 0;
-
-    vchPlaintext = CKeyingMaterial(nPLen);
 
-    EVP_CIPHER_CTX ctx;
+    vchPlaintext.resize(nLen);
 
-    bool fOk = true;
-
-    EVP_CIPHER_CTX_init(&ctx);
-    if (fOk) fOk = EVP_DecryptInit_ex(&ctx, EVP_aes_256_cbc(), NULL, chKey, chIV) != 0;
-    if (fOk) fOk = EVP_DecryptUpdate(&ctx, &vchPlaintext[0], &nPLen, &vchCiphertext[0], nLen) != 0;
-    if (fOk) fOk = EVP_DecryptFinal_ex(&ctx, (&vchPlaintext[0]) + nPLen, &nFLen) != 0;
-    EVP_CIPHER_CTX_cleanup(&ctx);
-
-    if (!fOk) return false;
-
-    vchPlaintext.resize(nPLen + nFLen);
+    AES256CBCDecrypt dec(chKey, chIV, true);
+    nLen = dec.Decrypt(&vchCiphertext[0], vchCiphertext.size(), &vchPlaintext[0]);
+    if(nLen == 0)
+        return false;
+    vchPlaintext.resize(nLen);
     return true;
 }
 

From 976f9ec2645242032d34ab68a60d963f2ac586d8 Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Fri, 20 Mar 2015 01:24:12 -0400
Subject: [PATCH 0318/1802] crypter: add a BytesToKey clone to replace the use
 of openssl

BytesToKeySHA512AES should be functionally identical to EVP_BytesToKey, but
drops the dependency on openssl.
---
 src/wallet/crypter.cpp | 33 +++++++++++++++++++++++++++++----
 src/wallet/crypter.h   |  2 ++
 2 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/src/wallet/crypter.cpp b/src/wallet/crypter.cpp
index 0a19139a3172a..190f8ecf2ab49 100644
--- a/src/wallet/crypter.cpp
+++ b/src/wallet/crypter.cpp
@@ -5,6 +5,7 @@
 #include "crypter.h"
 
 #include "crypto/aes.h"
+#include "crypto/sha512.h"
 #include "script/script.h"
 #include "script/standard.h"
 #include "util.h"
@@ -12,8 +13,33 @@
 #include <string>
 #include <vector>
 #include <boost/foreach.hpp>
-#include <openssl/aes.h>
-#include <openssl/evp.h>
+
+int CCrypter::BytesToKeySHA512AES(const std::vector<unsigned char>& chSalt, const SecureString& strKeyData, int count, unsigned char *key,unsigned char *iv) const
+{
+    // This mimics the behavior of openssl's EVP_BytesToKey with an aes256cbc
+    // cipher and sha512 message digest. Because sha512's output size (64b) is
+    // greater than the aes256 block size (16b) + aes256 key size (32b),
+    // there's no need to process more than once (D_0).
+
+    if(!count || !key || !iv)
+        return 0;
+
+    unsigned char buf[CSHA512::OUTPUT_SIZE];
+    CSHA512 di;
+
+    di.Write((const unsigned char*)strKeyData.c_str(), strKeyData.size());
+    if(chSalt.size())
+        di.Write(&chSalt[0], chSalt.size());
+    di.Finalize(buf);
+
+    for(int i = 0; i != count - 1; i++)
+        di.Reset().Write(buf, sizeof(buf)).Finalize(buf);
+
+    memcpy(key, buf, WALLET_CRYPTO_KEY_SIZE);
+    memcpy(iv, buf + WALLET_CRYPTO_KEY_SIZE, WALLET_CRYPTO_IV_SIZE);
+    memory_cleanse(buf, sizeof(buf));
+    return WALLET_CRYPTO_KEY_SIZE;
+}
 
 bool CCrypter::SetKeyFromPassphrase(const SecureString& strKeyData, const std::vector<unsigned char>& chSalt, const unsigned int nRounds, const unsigned int nDerivationMethod)
 {
@@ -22,8 +48,7 @@ bool CCrypter::SetKeyFromPassphrase(const SecureString& strKeyData, const std::v
 
     int i = 0;
     if (nDerivationMethod == 0)
-        i = EVP_BytesToKey(EVP_aes_256_cbc(), EVP_sha512(), &chSalt[0],
-                          (unsigned char *)&strKeyData[0], strKeyData.size(), nRounds, chKey, chIV);
+        i = BytesToKeySHA512AES(chSalt, strKeyData, nRounds, chKey, chIV);
 
     if (i != (int)WALLET_CRYPTO_KEY_SIZE)
     {
diff --git a/src/wallet/crypter.h b/src/wallet/crypter.h
index 3457d40ffd029..16f2ba622069c 100644
--- a/src/wallet/crypter.h
+++ b/src/wallet/crypter.h
@@ -75,6 +75,8 @@ class CCrypter
     unsigned char chIV[WALLET_CRYPTO_IV_SIZE];
     bool fKeySet;
 
+    int BytesToKeySHA512AES(const std::vector<unsigned char>& chSalt, const SecureString& strKeyData, int count, unsigned char *key,unsigned char *iv) const;
+
 public:
     bool SetKeyFromPassphrase(const SecureString &strKeyData, const std::vector<unsigned char>& chSalt, const unsigned int nRounds, const unsigned int nDerivationMethod);
     bool Encrypt(const CKeyingMaterial& vchPlaintext, std::vector<unsigned char> &vchCiphertext) const;

From 0a36b9af281e31b080ca0835eec7704097527bda Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Thu, 26 Mar 2015 19:15:28 -0400
Subject: [PATCH 0319/1802] crypter: shuffle Makefile so that crypto can be
 used by the wallet

Wallet must come before crypto, otherwise linking fails on some platforms.

Includes a tangentially-related general cleanup rather than making the Makefile
sloppier.
---
 src/Makefile.am | 55 +++++++++++++++++++++----------------------------
 1 file changed, 23 insertions(+), 32 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index 0ab0d66ac21cb..31917f1350e46 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -15,13 +15,12 @@ LIBUNIVALUE = $(UNIVALUE_LIBS)
 endif
 
 BITCOIN_CONFIG_INCLUDES=-I$(builddir)/config
-BITCOIN_INCLUDES=-I$(builddir) -I$(builddir)/obj $(BOOST_CPPFLAGS) $(LEVELDB_CPPFLAGS) $(CRYPTO_CFLAGS) $(SSL_CFLAGS)
+BITCOIN_INCLUDES=-I$(builddir) -I$(builddir)/obj $(BDB_CPPFLAGS) $(BOOST_CPPFLAGS) $(LEVELDB_CPPFLAGS) $(CRYPTO_CFLAGS) $(SSL_CFLAGS)
 
 BITCOIN_INCLUDES += -I$(srcdir)/secp256k1/include
 BITCOIN_INCLUDES += $(UNIVALUE_CFLAGS)
 
 LIBBITCOIN_SERVER=libbitcoin_server.a
-LIBBITCOIN_WALLET=libbitcoin_wallet.a
 LIBBITCOIN_COMMON=libbitcoin_common.a
 LIBBITCOIN_CONSENSUS=libbitcoin_consensus.a
 LIBBITCOIN_CLI=libbitcoin_cli.a
@@ -30,32 +29,32 @@ LIBBITCOIN_CRYPTO=crypto/libbitcoin_crypto.a
 LIBBITCOINQT=qt/libbitcoinqt.a
 LIBSECP256K1=secp256k1/libsecp256k1.la
 
+if ENABLE_ZMQ
+LIBBITCOIN_ZMQ=libbitcoin_zmq.a
+endif
+if BUILD_BITCOIN_LIBS
+LIBBITCOINCONSENSUS=libbitcoinconsensus.la
+endif
+if ENABLE_WALLET
+LIBBITCOIN_WALLET=libbitcoin_wallet.a
+endif
+
 $(LIBSECP256K1): $(wildcard secp256k1/src/*) $(wildcard secp256k1/include/*)
 	$(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F)
 
 # Make is not made aware of per-object dependencies to avoid limiting building parallelization
 # But to build the less dependent modules first, we manually select their order here:
 EXTRA_LIBRARIES += \
-  crypto/libbitcoin_crypto.a \
-  libbitcoin_util.a \
-  libbitcoin_common.a \
-  libbitcoin_consensus.a \
-  libbitcoin_server.a \
-  libbitcoin_cli.a
-if ENABLE_WALLET
-BITCOIN_INCLUDES += $(BDB_CPPFLAGS)
-EXTRA_LIBRARIES += libbitcoin_wallet.a
-endif
-if ENABLE_ZMQ
-EXTRA_LIBRARIES += libbitcoin_zmq.a
-endif
+  $(LIBBITCOIN_CRYPTO) \
+  $(LIBBITCOIN_UTIL) \
+  $(LIBBITCOIN_COMMON) \
+  $(LIBBITCOIN_CONSENSUS) \
+  $(LIBBITCOIN_SERVER) \
+  $(LIBBITCOIN_CLI) \
+  $(LIBBITCOIN_WALLET) \
+  $(LIBBITCOIN_ZMQ)
 
-if BUILD_BITCOIN_LIBS
-lib_LTLIBRARIES = libbitcoinconsensus.la
-LIBBITCOINCONSENSUS=libbitcoinconsensus.la
-else
-LIBBITCOINCONSENSUS=
-endif
+lib_LTLIBRARIES = $(LIBBITCOINCONSENSUS)
 
 bin_PROGRAMS =
 TESTS =
@@ -196,8 +195,6 @@ libbitcoin_server_a_SOURCES = \
   $(BITCOIN_CORE_H)
 
 if ENABLE_ZMQ
-LIBBITCOIN_ZMQ=libbitcoin_zmq.a
-
 libbitcoin_zmq_a_CPPFLAGS = $(BITCOIN_INCLUDES) $(ZMQ_CFLAGS)
 libbitcoin_zmq_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
 libbitcoin_zmq_a_SOURCES = \
@@ -347,21 +344,15 @@ bitcoind_LDADD = \
   $(LIBBITCOIN_COMMON) \
   $(LIBUNIVALUE) \
   $(LIBBITCOIN_UTIL) \
+  $(LIBBITCOIN_WALLET) \
+  $(LIBBITCOIN_ZMQ) \
   $(LIBBITCOIN_CONSENSUS) \
   $(LIBBITCOIN_CRYPTO) \
   $(LIBLEVELDB) \
   $(LIBMEMENV) \
   $(LIBSECP256K1)
 
-if ENABLE_ZMQ
-bitcoind_LDADD += $(LIBBITCOIN_ZMQ) $(ZMQ_LIBS)
-endif
-
-if ENABLE_WALLET
-bitcoind_LDADD += libbitcoin_wallet.a
-endif
-
-bitcoind_LDADD += $(BOOST_LIBS) $(BDB_LIBS) $(SSL_LIBS) $(CRYPTO_LIBS) $(MINIUPNPC_LIBS) $(EVENT_PTHREADS_LIBS) $(EVENT_LIBS)
+bitcoind_LDADD += $(BOOST_LIBS) $(BDB_LIBS) $(SSL_LIBS) $(CRYPTO_LIBS) $(MINIUPNPC_LIBS) $(EVENT_PTHREADS_LIBS) $(EVENT_LIBS) $(ZMQ_LIBS)
 
 # bitcoin-cli binary #
 bitcoin_cli_SOURCES = bitcoin-cli.cpp

From 34ed64a404fb6da691f67f00f47c4dd748e3e428 Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Fri, 20 Mar 2015 01:27:50 -0400
Subject: [PATCH 0320/1802] crypter: add tests for crypter

Verify that results correct (match known values), consistent (encrypt->decrypt
matches the original), and compatible with the previous openssl implementation.

Also check that failed encrypts/decrypts fail the exact same way as openssl.
---
 src/Makefile.test.include        |   1 +
 src/wallet/crypter.h             |   6 +
 src/wallet/test/crypto_tests.cpp | 230 +++++++++++++++++++++++++++++++
 3 files changed, 237 insertions(+)
 create mode 100644 src/wallet/test/crypto_tests.cpp

diff --git a/src/Makefile.test.include b/src/Makefile.test.include
index 08e2f6af4db73..d443b6d34aff1 100644
--- a/src/Makefile.test.include
+++ b/src/Makefile.test.include
@@ -94,6 +94,7 @@ BITCOIN_TESTS += \
   wallet/test/wallet_test_fixture.h \
   wallet/test/accounting_tests.cpp \
   wallet/test/wallet_tests.cpp \
+  wallet/test/crypto_tests.cpp \
   wallet/test/rpc_wallet_tests.cpp
 endif
 
diff --git a/src/wallet/crypter.h b/src/wallet/crypter.h
index 16f2ba622069c..5d0a4a3305b8c 100644
--- a/src/wallet/crypter.h
+++ b/src/wallet/crypter.h
@@ -67,9 +67,15 @@ class CMasterKey
 
 typedef std::vector<unsigned char, secure_allocator<unsigned char> > CKeyingMaterial;
 
+namespace wallet_crypto
+{
+    class TestCrypter;
+}
+
 /** Encryption/decryption context with key information */
 class CCrypter
 {
+friend class wallet_crypto::TestCrypter; // for test access to chKey/chIV
 private:
     unsigned char chKey[WALLET_CRYPTO_KEY_SIZE];
     unsigned char chIV[WALLET_CRYPTO_IV_SIZE];
diff --git a/src/wallet/test/crypto_tests.cpp b/src/wallet/test/crypto_tests.cpp
new file mode 100644
index 0000000000000..05387f5f2b5e6
--- /dev/null
+++ b/src/wallet/test/crypto_tests.cpp
@@ -0,0 +1,230 @@
+// Copyright (c) 2014 The Bitcoin Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#include "random.h"
+#include "utilstrencodings.h"
+#include "test/test_bitcoin.h"
+#include "wallet/crypter.h"
+
+#include <vector>
+
+#include <boost/test/unit_test.hpp>
+#include <openssl/aes.h>
+#include <openssl/evp.h>
+
+BOOST_FIXTURE_TEST_SUITE(wallet_crypto, BasicTestingSetup)
+
+bool OldSetKeyFromPassphrase(const SecureString& strKeyData, const std::vector<unsigned char>& chSalt, const unsigned int nRounds, const unsigned int nDerivationMethod, unsigned char* chKey, unsigned char* chIV)
+{
+    if (nRounds < 1 || chSalt.size() != WALLET_CRYPTO_SALT_SIZE)
+        return false;
+
+    int i = 0;
+    if (nDerivationMethod == 0)
+        i = EVP_BytesToKey(EVP_aes_256_cbc(), EVP_sha512(), &chSalt[0],
+                          (unsigned char *)&strKeyData[0], strKeyData.size(), nRounds, chKey, chIV);
+
+    if (i != (int)WALLET_CRYPTO_KEY_SIZE)
+    {
+        memory_cleanse(chKey, sizeof(chKey));
+        memory_cleanse(chIV, sizeof(chIV));
+        return false;
+    }
+    return true;
+}
+
+bool OldEncrypt(const CKeyingMaterial& vchPlaintext, std::vector<unsigned char> &vchCiphertext, const unsigned char chKey[32], const unsigned char chIV[16])
+{
+    // max ciphertext len for a n bytes of plaintext is
+    // n + AES_BLOCK_SIZE - 1 bytes
+    int nLen = vchPlaintext.size();
+    int nCLen = nLen + AES_BLOCK_SIZE, nFLen = 0;
+    vchCiphertext = std::vector<unsigned char> (nCLen);
+
+    EVP_CIPHER_CTX ctx;
+
+    bool fOk = true;
+
+    EVP_CIPHER_CTX_init(&ctx);
+    if (fOk) fOk = EVP_EncryptInit_ex(&ctx, EVP_aes_256_cbc(), NULL, chKey, chIV) != 0;
+    if (fOk) fOk = EVP_EncryptUpdate(&ctx, &vchCiphertext[0], &nCLen, &vchPlaintext[0], nLen) != 0;
+    if (fOk) fOk = EVP_EncryptFinal_ex(&ctx, (&vchCiphertext[0]) + nCLen, &nFLen) != 0;
+    EVP_CIPHER_CTX_cleanup(&ctx);
+
+    if (!fOk) return false;
+
+    vchCiphertext.resize(nCLen + nFLen);
+    return true;
+}
+
+bool OldDecrypt(const std::vector<unsigned char>& vchCiphertext, CKeyingMaterial& vchPlaintext, const unsigned char chKey[32], const unsigned char chIV[16])
+{
+    // plaintext will always be equal to or lesser than length of ciphertext
+    int nLen = vchCiphertext.size();
+    int nPLen = nLen, nFLen = 0;
+
+    vchPlaintext = CKeyingMaterial(nPLen);
+
+    EVP_CIPHER_CTX ctx;
+
+    bool fOk = true;
+
+    EVP_CIPHER_CTX_init(&ctx);
+    if (fOk) fOk = EVP_DecryptInit_ex(&ctx, EVP_aes_256_cbc(), NULL, chKey, chIV) != 0;
+    if (fOk) fOk = EVP_DecryptUpdate(&ctx, &vchPlaintext[0], &nPLen, &vchCiphertext[0], nLen) != 0;
+    if (fOk) fOk = EVP_DecryptFinal_ex(&ctx, (&vchPlaintext[0]) + nPLen, &nFLen) != 0;
+    EVP_CIPHER_CTX_cleanup(&ctx);
+
+    if (!fOk) return false;
+
+    vchPlaintext.resize(nPLen + nFLen);
+    return true;
+}
+
+class TestCrypter
+{
+public:
+static void TestPassphraseSingle(const std::vector<unsigned char>& vchSalt, const SecureString& passphrase, uint32_t rounds,
+                 const std::vector<unsigned char>& correctKey = std::vector<unsigned char>(),
+                 const std::vector<unsigned char>& correctIV=std::vector<unsigned char>())
+{
+    unsigned char chKey[WALLET_CRYPTO_KEY_SIZE];
+    unsigned char chIV[WALLET_CRYPTO_IV_SIZE];
+
+    CCrypter crypt;
+    crypt.SetKeyFromPassphrase(passphrase, vchSalt, rounds, 0);
+
+    OldSetKeyFromPassphrase(passphrase, vchSalt, rounds, 0, chKey, chIV);
+
+    BOOST_CHECK_MESSAGE(memcmp(chKey, crypt.chKey, sizeof(chKey)) == 0, \
+        HexStr(chKey, chKey+sizeof(chKey)) + std::string(" != ") + HexStr(crypt.chKey, crypt.chKey + (sizeof crypt.chKey)));
+    BOOST_CHECK_MESSAGE(memcmp(chIV, crypt.chIV, sizeof(chIV)) == 0, \
+        HexStr(chIV, chIV+sizeof(chIV)) + std::string(" != ") + HexStr(crypt.chIV, crypt.chIV + (sizeof crypt.chIV)));
+
+    if(!correctKey.empty())
+        BOOST_CHECK_MESSAGE(memcmp(chKey, &correctKey[0], sizeof(chKey)) == 0, \
+            HexStr(chKey, chKey+sizeof(chKey)) + std::string(" != ") + HexStr(correctKey.begin(), correctKey.end()));
+    if(!correctIV.empty())
+        BOOST_CHECK_MESSAGE(memcmp(chIV, &correctIV[0], sizeof(chIV)) == 0,
+            HexStr(chIV, chIV+sizeof(chIV)) + std::string(" != ") + HexStr(correctIV.begin(), correctIV.end()));
+}
+
+static void TestPassphrase(const std::vector<unsigned char>& vchSalt, const SecureString& passphrase, uint32_t rounds,
+                 const std::vector<unsigned char>& correctKey = std::vector<unsigned char>(),
+                 const std::vector<unsigned char>& correctIV=std::vector<unsigned char>())
+{
+    TestPassphraseSingle(vchSalt, passphrase, rounds, correctKey, correctIV);
+    for(SecureString::const_iterator i(passphrase.begin()); i != passphrase.end(); ++i)
+        TestPassphraseSingle(vchSalt, SecureString(i, passphrase.end()), rounds);
+}
+
+
+static void TestDecrypt(const CCrypter& crypt, const std::vector<unsigned char>& vchCiphertext, \
+                        const std::vector<unsigned char>& vchPlaintext = std::vector<unsigned char>())
+{
+    CKeyingMaterial vchDecrypted1;
+    CKeyingMaterial vchDecrypted2;
+    int result1, result2;
+    result1 = crypt.Decrypt(vchCiphertext, vchDecrypted1);
+    result2 = OldDecrypt(vchCiphertext, vchDecrypted2, crypt.chKey, crypt.chIV);
+    BOOST_CHECK(result1 == result2);
+
+    // These two should be equal. However, OpenSSL 1.0.1j introduced a change
+    // that would zero all padding except for the last byte for failed decrypts.
+    // This behavior was reverted for 1.0.1k.
+    if (vchDecrypted1 != vchDecrypted2 && vchDecrypted1.size() >= AES_BLOCK_SIZE && SSLeay() == 0x100010afL)
+    {
+        for(CKeyingMaterial::iterator it = vchDecrypted1.end() - AES_BLOCK_SIZE; it != vchDecrypted1.end() - 1; it++)
+            *it = 0;
+    }
+
+    BOOST_CHECK_MESSAGE(vchDecrypted1 == vchDecrypted2, HexStr(vchDecrypted1.begin(), vchDecrypted1.end()) + " != " + HexStr(vchDecrypted2.begin(), vchDecrypted2.end()));
+
+    if (vchPlaintext.size())
+        BOOST_CHECK(CKeyingMaterial(vchPlaintext.begin(), vchPlaintext.end()) == vchDecrypted2);
+}
+
+static void TestEncryptSingle(const CCrypter& crypt, const CKeyingMaterial& vchPlaintext,
+                       const std::vector<unsigned char>& vchCiphertextCorrect = std::vector<unsigned char>())
+{
+    std::vector<unsigned char> vchCiphertext1;
+    std::vector<unsigned char> vchCiphertext2;
+    int result1 = crypt.Encrypt(vchPlaintext, vchCiphertext1);
+
+    int result2 = OldEncrypt(vchPlaintext, vchCiphertext2, crypt.chKey, crypt.chIV);
+    BOOST_CHECK(result1 == result2);
+    BOOST_CHECK(vchCiphertext1 == vchCiphertext2);
+
+    if (!vchCiphertextCorrect.empty())
+        BOOST_CHECK(vchCiphertext2 == vchCiphertextCorrect);
+
+    const std::vector<unsigned char> vchPlaintext2(vchPlaintext.begin(), vchPlaintext.end());
+
+    if(vchCiphertext1 == vchCiphertext2)
+        TestDecrypt(crypt, vchCiphertext1, vchPlaintext2);
+}
+
+static void TestEncrypt(const CCrypter& crypt, const std::vector<unsigned char>& vchPlaintextIn, \
+                       const std::vector<unsigned char>& vchCiphertextCorrect = std::vector<unsigned char>())
+{
+    TestEncryptSingle(crypt, CKeyingMaterial(vchPlaintextIn.begin(), vchPlaintextIn.end()), vchCiphertextCorrect);
+    for(std::vector<unsigned char>::const_iterator i(vchPlaintextIn.begin()); i != vchPlaintextIn.end(); ++i)
+        TestEncryptSingle(crypt, CKeyingMaterial(i, vchPlaintextIn.end()));
+}
+
+};
+
+BOOST_AUTO_TEST_CASE(passphrase) {
+    // These are expensive.
+
+    TestCrypter::TestPassphrase(ParseHex("0000deadbeef0000"), "test", 25000, \
+                                ParseHex("fc7aba077ad5f4c3a0988d8daa4810d0d4a0e3bcb53af662998898f33df0556a"), \
+                                ParseHex("cf2f2691526dd1aa220896fb8bf7c369"));
+
+    std::string hash(GetRandHash().ToString());
+    std::vector<unsigned char> vchSalt(8);
+    GetRandBytes(&vchSalt[0], vchSalt.size());
+    uint32_t rounds = insecure_rand();
+    if (rounds > 30000)
+        rounds = 30000;
+    TestCrypter::TestPassphrase(vchSalt, SecureString(hash.begin(), hash.end()), rounds);
+}
+
+BOOST_AUTO_TEST_CASE(encrypt) {
+    std::vector<unsigned char> vchSalt = ParseHex("0000deadbeef0000");
+    BOOST_CHECK(vchSalt.size() == WALLET_CRYPTO_SALT_SIZE);
+    CCrypter crypt;
+    crypt.SetKeyFromPassphrase("passphrase", vchSalt, 25000, 0);
+    TestCrypter::TestEncrypt(crypt, ParseHex("22bcade09ac03ff6386914359cfe885cfeb5f77ff0d670f102f619687453b29d"));
+
+    for (int i = 0; i != 100; i++)
+    {
+        uint256 hash(GetRandHash());
+        TestCrypter::TestEncrypt(crypt, std::vector<unsigned char>(hash.begin(), hash.end()));
+    }
+
+}
+
+BOOST_AUTO_TEST_CASE(decrypt) {
+    std::vector<unsigned char> vchSalt = ParseHex("0000deadbeef0000");
+    BOOST_CHECK(vchSalt.size() == WALLET_CRYPTO_SALT_SIZE);
+    CCrypter crypt;
+    crypt.SetKeyFromPassphrase("passphrase", vchSalt, 25000, 0);
+
+    // Some corner cases the came up while testing
+    TestCrypter::TestDecrypt(crypt,ParseHex("795643ce39d736088367822cdc50535ec6f103715e3e48f4f3b1a60a08ef59ca"));
+    TestCrypter::TestDecrypt(crypt,ParseHex("de096f4a8f9bd97db012aa9d90d74de8cdea779c3ee8bc7633d8b5d6da703486"));
+    TestCrypter::TestDecrypt(crypt,ParseHex("32d0a8974e3afd9c6c3ebf4d66aa4e6419f8c173de25947f98cf8b7ace49449c"));
+    TestCrypter::TestDecrypt(crypt,ParseHex("e7c055cca2faa78cb9ac22c9357a90b4778ded9b2cc220a14cea49f931e596ea"));
+    TestCrypter::TestDecrypt(crypt,ParseHex("b88efddd668a6801d19516d6830da4ae9811988ccbaf40df8fbb72f3f4d335fd"));
+    TestCrypter::TestDecrypt(crypt,ParseHex("8cae76aa6a43694e961ebcb28c8ca8f8540b84153d72865e8561ddd93fa7bfa9"));
+
+    for (int i = 0; i != 100; i++)
+    {
+        uint256 hash(GetRandHash());
+        TestCrypter::TestDecrypt(crypt, std::vector<unsigned char>(hash.begin(), hash.end()));
+    }
+}
+
+BOOST_AUTO_TEST_SUITE_END()

From fac93497986b5f74716383bf26c78406253c625a Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Sat, 14 May 2016 13:01:31 +0200
Subject: [PATCH 0321/1802] [qa] Remove hardcoded "4 nodes" from test_framework

---
 qa/rpc-tests/abandonconflict.py               |  4 +++
 qa/rpc-tests/bip65-cltv-p2p.py                |  3 +-
 qa/rpc-tests/bip65-cltv.py                    |  4 +++
 qa/rpc-tests/bip68-112-113-p2p.py             |  3 +-
 qa/rpc-tests/bip68-sequence.py                |  4 +++
 qa/rpc-tests/bip9-softforks.py                |  3 +-
 qa/rpc-tests/bipdersig-p2p.py                 |  3 +-
 qa/rpc-tests/bipdersig.py                     |  4 +++
 qa/rpc-tests/blockchain.py                    | 10 +++---
 qa/rpc-tests/decodescript.py                  |  9 ++---
 qa/rpc-tests/disablewallet.py                 |  9 ++---
 qa/rpc-tests/forknotify.py                    |  5 +++
 qa/rpc-tests/fundrawtransaction.py            | 11 ++++---
 qa/rpc-tests/getblocktemplate_longpoll.py     |  5 +++
 qa/rpc-tests/getblocktemplate_proposals.py    |  9 +++++
 qa/rpc-tests/getchaintips.py                  |  5 ++-
 qa/rpc-tests/httpbasics.py                    |  9 +++--
 qa/rpc-tests/importprunedfunds.py             |  9 ++---
 qa/rpc-tests/invalidateblock.py               |  9 ++---
 qa/rpc-tests/invalidblockrequest.py           |  1 +
 qa/rpc-tests/invalidtxrequest.py              |  1 +
 qa/rpc-tests/keypool.py                       | 11 +++----
 qa/rpc-tests/listtransactions.py              |  6 +++-
 qa/rpc-tests/maxblocksinflight.py             |  9 ++---
 qa/rpc-tests/maxuploadtarget.py               | 12 ++++---
 qa/rpc-tests/mempool_limit.py                 | 12 +++----
 qa/rpc-tests/mempool_packages.py              |  4 +++
 qa/rpc-tests/mempool_reorg.py                 |  4 +++
 qa/rpc-tests/mempool_resurrect_test.py        |  5 +++
 qa/rpc-tests/mempool_spendcoinbase.py         |  5 +++
 qa/rpc-tests/merkle_blocks.py                 |  7 ++--
 qa/rpc-tests/multi_rpc.py                     | 16 ++++++---
 qa/rpc-tests/nodehandling.py                  |  6 ++++
 qa/rpc-tests/p2p-acceptblock.py               |  6 ++--
 qa/rpc-tests/p2p-feefilter.py                 |  6 ++++
 qa/rpc-tests/p2p-fullblocktest.py             |  1 +
 qa/rpc-tests/p2p-versionbits-warning.py       |  6 ++--
 qa/rpc-tests/prioritise_transaction.py        |  8 ++---
 qa/rpc-tests/proxy_test.py                    |  6 +++-
 qa/rpc-tests/pruning.py                       |  8 ++---
 qa/rpc-tests/rawtransactions.py               |  9 ++---
 qa/rpc-tests/receivedby.py                    |  7 +++-
 qa/rpc-tests/reindex.py                       |  7 ++--
 qa/rpc-tests/replace-by-fee.py                |  5 +++
 qa/rpc-tests/rest.py                          |  9 ++---
 qa/rpc-tests/rpcbind_test.py                  |  4 +--
 qa/rpc-tests/sendheaders.py                   |  8 +++--
 qa/rpc-tests/signmessages.py                  |  9 ++---
 qa/rpc-tests/signrawtransactions.py           |  9 ++---
 qa/rpc-tests/smartfees.py                     |  5 +++
 qa/rpc-tests/test_framework/test_framework.py | 25 +++++++-------
 qa/rpc-tests/test_framework/util.py           | 33 +++++++++++--------
 qa/rpc-tests/txn_clone.py                     |  5 +++
 qa/rpc-tests/txn_doublespend.py               |  5 +++
 qa/rpc-tests/wallet.py                        |  7 ++--
 qa/rpc-tests/walletbackup.py                  |  9 ++---
 qa/rpc-tests/zapwallettxes.py                 |  9 ++---
 qa/rpc-tests/zmq_test.py                      |  6 +++-
 58 files changed, 291 insertions(+), 138 deletions(-)

diff --git a/qa/rpc-tests/abandonconflict.py b/qa/rpc-tests/abandonconflict.py
index b6c4b9db48fbf..c50c3cc562e5f 100755
--- a/qa/rpc-tests/abandonconflict.py
+++ b/qa/rpc-tests/abandonconflict.py
@@ -9,6 +9,10 @@
 import urllib.parse
 
 class AbandonConflictTest(BitcoinTestFramework):
+    def __init__(self):
+        super().__init__()
+        self.num_nodes = 2
+        self.setup_clean_chain = False
 
     def setup_network(self):
         self.nodes = []
diff --git a/qa/rpc-tests/bip65-cltv-p2p.py b/qa/rpc-tests/bip65-cltv-p2p.py
index 60923b9dda90a..754b6873b71ff 100755
--- a/qa/rpc-tests/bip65-cltv-p2p.py
+++ b/qa/rpc-tests/bip65-cltv-p2p.py
@@ -37,11 +37,12 @@ def cltv_invalidate(tx):
 class BIP65Test(ComparisonTestFramework):
 
     def __init__(self):
+        super().__init__()
         self.num_nodes = 1
 
     def setup_network(self):
         # Must set the blockversion for this test
-        self.nodes = start_nodes(1, self.options.tmpdir,
+        self.nodes = start_nodes(self.num_nodes, self.options.tmpdir,
                                  extra_args=[['-debug', '-whitelist=127.0.0.1', '-blockversion=3']],
                                  binary=[self.options.testbinary])
 
diff --git a/qa/rpc-tests/bip65-cltv.py b/qa/rpc-tests/bip65-cltv.py
index 9d83fc947b166..abba7fc20e7d9 100755
--- a/qa/rpc-tests/bip65-cltv.py
+++ b/qa/rpc-tests/bip65-cltv.py
@@ -11,6 +11,10 @@
 from test_framework.util import *
 
 class BIP65Test(BitcoinTestFramework):
+    def __init__(self):
+        super().__init__()
+        self.num_nodes = 3
+        self.setup_clean_chain = False
 
     def setup_network(self):
         self.nodes = []
diff --git a/qa/rpc-tests/bip68-112-113-p2p.py b/qa/rpc-tests/bip68-112-113-p2p.py
index eedb60e3a0958..8ba07043849a6 100755
--- a/qa/rpc-tests/bip68-112-113-p2p.py
+++ b/qa/rpc-tests/bip68-112-113-p2p.py
@@ -94,11 +94,12 @@ def all_rlt_txs(txarray):
 
 class BIP68_112_113Test(ComparisonTestFramework):
     def __init__(self):
+        super().__init__()
         self.num_nodes = 1
 
     def setup_network(self):
         # Must set the blockversion for this test
-        self.nodes = start_nodes(1, self.options.tmpdir,
+        self.nodes = start_nodes(self.num_nodes, self.options.tmpdir,
                                  extra_args=[['-debug', '-whitelist=127.0.0.1', '-blockversion=4']],
                                  binary=[self.options.testbinary])
 
diff --git a/qa/rpc-tests/bip68-sequence.py b/qa/rpc-tests/bip68-sequence.py
index 717f7562cdee2..a12bf10ebd758 100755
--- a/qa/rpc-tests/bip68-sequence.py
+++ b/qa/rpc-tests/bip68-sequence.py
@@ -22,6 +22,10 @@
 NOT_FINAL_ERROR = "64: non-BIP68-final"
 
 class BIP68Test(BitcoinTestFramework):
+    def __init__(self):
+        super().__init__()
+        self.num_nodes = 2
+        self.setup_clean_chain = False
 
     def setup_network(self):
         self.nodes = []
diff --git a/qa/rpc-tests/bip9-softforks.py b/qa/rpc-tests/bip9-softforks.py
index a8fb878dcb1e6..aae258315e0b7 100755
--- a/qa/rpc-tests/bip9-softforks.py
+++ b/qa/rpc-tests/bip9-softforks.py
@@ -32,10 +32,11 @@
 class BIP9SoftForksTest(ComparisonTestFramework):
 
     def __init__(self):
+        super().__init__()
         self.num_nodes = 1
 
     def setup_network(self):
-        self.nodes = start_nodes(1, self.options.tmpdir,
+        self.nodes = start_nodes(self.num_nodes, self.options.tmpdir,
                                  extra_args=[['-debug', '-whitelist=127.0.0.1']],
                                  binary=[self.options.testbinary])
 
diff --git a/qa/rpc-tests/bipdersig-p2p.py b/qa/rpc-tests/bipdersig-p2p.py
index c4627308400b8..4e4936a4ae6de 100755
--- a/qa/rpc-tests/bipdersig-p2p.py
+++ b/qa/rpc-tests/bipdersig-p2p.py
@@ -45,11 +45,12 @@ def unDERify(tx):
 class BIP66Test(ComparisonTestFramework):
 
     def __init__(self):
+        super().__init__()
         self.num_nodes = 1
 
     def setup_network(self):
         # Must set the blockversion for this test
-        self.nodes = start_nodes(1, self.options.tmpdir, 
+        self.nodes = start_nodes(self.num_nodes, self.options.tmpdir,
                                  extra_args=[['-debug', '-whitelist=127.0.0.1', '-blockversion=2']],
                                  binary=[self.options.testbinary])
 
diff --git a/qa/rpc-tests/bipdersig.py b/qa/rpc-tests/bipdersig.py
index f2d2c14a72c24..17c2ced79ac1e 100755
--- a/qa/rpc-tests/bipdersig.py
+++ b/qa/rpc-tests/bipdersig.py
@@ -11,6 +11,10 @@
 from test_framework.util import *
 
 class BIP66Test(BitcoinTestFramework):
+    def __init__(self):
+        super().__init__()
+        self.num_nodes = 3
+        self.setup_clean_chain = False
 
     def setup_network(self):
         self.nodes = []
diff --git a/qa/rpc-tests/blockchain.py b/qa/rpc-tests/blockchain.py
index c84047b5dd18c..410b85d15e35f 100755
--- a/qa/rpc-tests/blockchain.py
+++ b/qa/rpc-tests/blockchain.py
@@ -13,7 +13,6 @@
 from test_framework.test_framework import BitcoinTestFramework
 from test_framework.authproxy import JSONRPCException
 from test_framework.util import (
-    initialize_chain,
     assert_equal,
     assert_raises,
     assert_is_hex_string,
@@ -32,12 +31,13 @@ class BlockchainTest(BitcoinTestFramework):
 
     """
 
-    def setup_chain(self):
-        print("Initializing test directory " + self.options.tmpdir)
-        initialize_chain(self.options.tmpdir)
+    def __init__(self):
+        super().__init__()
+        self.setup_clean_chain = False
+        self.num_nodes = 2
 
     def setup_network(self, split=False):
-        self.nodes = start_nodes(2, self.options.tmpdir)
+        self.nodes = start_nodes(self.num_nodes, self.options.tmpdir)
         connect_nodes_bi(self.nodes, 0, 1)
         self.is_network_split = False
         self.sync_all()
diff --git a/qa/rpc-tests/decodescript.py b/qa/rpc-tests/decodescript.py
index 0037542e62e02..24768c265577a 100755
--- a/qa/rpc-tests/decodescript.py
+++ b/qa/rpc-tests/decodescript.py
@@ -11,12 +11,13 @@
 class DecodeScriptTest(BitcoinTestFramework):
     """Tests decoding scripts via RPC command "decodescript"."""
 
-    def setup_chain(self):
-        print('Initializing test directory ' + self.options.tmpdir)
-        initialize_chain_clean(self.options.tmpdir, 1)
+    def __init__(self):
+        super().__init__()
+        self.setup_clean_chain = True
+        self.num_nodes = 1
 
     def setup_network(self, split=False):
-        self.nodes = start_nodes(1, self.options.tmpdir)
+        self.nodes = start_nodes(self.num_nodes, self.options.tmpdir)
         self.is_network_split = False
 
     def decodescript_script_sig(self):
diff --git a/qa/rpc-tests/disablewallet.py b/qa/rpc-tests/disablewallet.py
index b25d2ba3352cf..36c147edad3a6 100755
--- a/qa/rpc-tests/disablewallet.py
+++ b/qa/rpc-tests/disablewallet.py
@@ -13,12 +13,13 @@
 
 class DisableWalletTest (BitcoinTestFramework):
 
-    def setup_chain(self):
-        print("Initializing test directory "+self.options.tmpdir)
-        initialize_chain_clean(self.options.tmpdir, 1)
+    def __init__(self):
+        super().__init__()
+        self.setup_clean_chain = True
+        self.num_nodes = 1
 
     def setup_network(self, split=False):
-        self.nodes = start_nodes(1, self.options.tmpdir, [['-disablewallet']])
+        self.nodes = start_nodes(self.num_nodes, self.options.tmpdir, [['-disablewallet']])
         self.is_network_split = False
         self.sync_all()
 
diff --git a/qa/rpc-tests/forknotify.py b/qa/rpc-tests/forknotify.py
index 421f3dd872973..5a3f75c808741 100755
--- a/qa/rpc-tests/forknotify.py
+++ b/qa/rpc-tests/forknotify.py
@@ -12,6 +12,11 @@
 
 class ForkNotifyTest(BitcoinTestFramework):
 
+    def __init__(self):
+        super().__init__()
+        self.num_nodes = 2
+        self.setup_clean_chain = False
+
     alert_filename = None  # Set by setup_network
 
     def setup_network(self):
diff --git a/qa/rpc-tests/fundrawtransaction.py b/qa/rpc-tests/fundrawtransaction.py
index 74849603f719d..57b850a6a9eaa 100755
--- a/qa/rpc-tests/fundrawtransaction.py
+++ b/qa/rpc-tests/fundrawtransaction.py
@@ -9,12 +9,13 @@
 # Create one-input, one-output, no-fee transaction:
 class RawTransactionsTest(BitcoinTestFramework):
 
-    def setup_chain(self):
-        print(("Initializing test directory "+self.options.tmpdir))
-        initialize_chain_clean(self.options.tmpdir, 4)
+    def __init__(self):
+        super().__init__()
+        self.setup_clean_chain = True
+        self.num_nodes = 4
 
     def setup_network(self, split=False):
-        self.nodes = start_nodes(4, self.options.tmpdir)
+        self.nodes = start_nodes(self.num_nodes, self.options.tmpdir)
 
         connect_nodes_bi(self.nodes,0,1)
         connect_nodes_bi(self.nodes,1,2)
@@ -521,7 +522,7 @@ def run_test(self):
         stop_nodes(self.nodes)
         wait_bitcoinds()
 
-        self.nodes = start_nodes(4, self.options.tmpdir)
+        self.nodes = start_nodes(self.num_nodes, self.options.tmpdir)
         # This test is not meant to test fee estimation and we'd like
         # to be sure all txs are sent at a consistent desired feerate
         for node in self.nodes:
diff --git a/qa/rpc-tests/getblocktemplate_longpoll.py b/qa/rpc-tests/getblocktemplate_longpoll.py
index e443347077741..3cddf4046aaf6 100755
--- a/qa/rpc-tests/getblocktemplate_longpoll.py
+++ b/qa/rpc-tests/getblocktemplate_longpoll.py
@@ -26,6 +26,11 @@ class GetBlockTemplateLPTest(BitcoinTestFramework):
     Test longpolling with getblocktemplate.
     '''
 
+    def __init__(self):
+        super().__init__()
+        self.num_nodes = 4
+        self.setup_clean_chain = False
+
     def run_test(self):
         print("Warning: this test will take about 70 seconds in the best case. Be patient.")
         self.nodes[0].generate(10)
diff --git a/qa/rpc-tests/getblocktemplate_proposals.py b/qa/rpc-tests/getblocktemplate_proposals.py
index 1ad2af4c2e3ac..7a4f8f8fdc3c2 100755
--- a/qa/rpc-tests/getblocktemplate_proposals.py
+++ b/qa/rpc-tests/getblocktemplate_proposals.py
@@ -70,6 +70,15 @@ class GetBlockTemplateProposalTest(BitcoinTestFramework):
     Test block proposals with getblocktemplate.
     '''
 
+    def __init__(self):
+        super().__init__()
+        self.num_nodes = 2
+        self.setup_clean_chain = False
+
+    def setup_network(self):
+        self.nodes = self.setup_nodes()
+        connect_nodes_bi(self.nodes, 0, 1)
+
     def run_test(self):
         node = self.nodes[0]
         node.generate(1) # Mine a block to leave initial block download
diff --git a/qa/rpc-tests/getchaintips.py b/qa/rpc-tests/getchaintips.py
index da354b0c97a01..1c66b8c28927d 100755
--- a/qa/rpc-tests/getchaintips.py
+++ b/qa/rpc-tests/getchaintips.py
@@ -11,9 +11,12 @@
 from test_framework.util import assert_equal
 
 class GetChainTipsTest (BitcoinTestFramework):
+    def __init__(self):
+        super().__init__()
+        self.num_nodes = 4
+        self.setup_clean_chain = False
 
     def run_test (self):
-        BitcoinTestFramework.run_test (self)
 
         tips = self.nodes[0].getchaintips ()
         assert_equal (len (tips), 1)
diff --git a/qa/rpc-tests/httpbasics.py b/qa/rpc-tests/httpbasics.py
index c62edc8e130cc..10bc927e1a51a 100755
--- a/qa/rpc-tests/httpbasics.py
+++ b/qa/rpc-tests/httpbasics.py
@@ -14,8 +14,13 @@
 import urllib.parse
 
 class HTTPBasicsTest (BitcoinTestFramework):
-    def setup_nodes(self):
-        return start_nodes(4, self.options.tmpdir)
+    def __init__(self):
+        super().__init__()
+        self.num_nodes = 3
+        self.setup_clean_chain = False
+
+    def setup_network(self):
+        self.nodes = self.setup_nodes()
 
     def run_test(self):
 
diff --git a/qa/rpc-tests/importprunedfunds.py b/qa/rpc-tests/importprunedfunds.py
index def1d891c3614..761c9af90c30e 100755
--- a/qa/rpc-tests/importprunedfunds.py
+++ b/qa/rpc-tests/importprunedfunds.py
@@ -9,12 +9,13 @@
 
 class ImportPrunedFundsTest(BitcoinTestFramework):
 
-    def setup_chain(self):
-        print("Initializing test directory "+self.options.tmpdir)
-        initialize_chain_clean(self.options.tmpdir, 4)
+    def __init__(self):
+        super().__init__()
+        self.setup_clean_chain = True
+        self.num_nodes = 4
 
     def setup_network(self, split=False):
-        self.nodes = start_nodes(2, self.options.tmpdir)
+        self.nodes = start_nodes(self.num_nodes, self.options.tmpdir)
         connect_nodes_bi(self.nodes,0,1)
         self.is_network_split=False
         self.sync_all()
diff --git a/qa/rpc-tests/invalidateblock.py b/qa/rpc-tests/invalidateblock.py
index 2e3a449f5e781..0faadd33ab35a 100755
--- a/qa/rpc-tests/invalidateblock.py
+++ b/qa/rpc-tests/invalidateblock.py
@@ -13,10 +13,11 @@
 class InvalidateTest(BitcoinTestFramework):
     
         
-    def setup_chain(self):
-        print("Initializing test directory "+self.options.tmpdir)
-        initialize_chain_clean(self.options.tmpdir, 3)
-                 
+    def __init__(self):
+        super().__init__()
+        self.setup_clean_chain = True
+        self.num_nodes = 3
+
     def setup_network(self):
         self.nodes = []
         self.is_network_split = False 
diff --git a/qa/rpc-tests/invalidblockrequest.py b/qa/rpc-tests/invalidblockrequest.py
index 78dc7199da316..3d8107a76c661 100755
--- a/qa/rpc-tests/invalidblockrequest.py
+++ b/qa/rpc-tests/invalidblockrequest.py
@@ -25,6 +25,7 @@ class InvalidBlockRequestTest(ComparisonTestFramework):
     ''' Can either run this test as 1 node with expected answers, or two and compare them. 
         Change the "outcome" variable from each TestInstance object to only do the comparison. '''
     def __init__(self):
+        super().__init__()
         self.num_nodes = 1
 
     def run_test(self):
diff --git a/qa/rpc-tests/invalidtxrequest.py b/qa/rpc-tests/invalidtxrequest.py
index d4200b0e885f9..93205d79dee5b 100755
--- a/qa/rpc-tests/invalidtxrequest.py
+++ b/qa/rpc-tests/invalidtxrequest.py
@@ -19,6 +19,7 @@ class InvalidTxRequestTest(ComparisonTestFramework):
     ''' Can either run this test as 1 node with expected answers, or two and compare them. 
         Change the "outcome" variable from each TestInstance object to only do the comparison. '''
     def __init__(self):
+        super().__init__()
         self.num_nodes = 1
 
     def run_test(self):
diff --git a/qa/rpc-tests/keypool.py b/qa/rpc-tests/keypool.py
index bdc144bfbc2fb..c75303ecbfc31 100755
--- a/qa/rpc-tests/keypool.py
+++ b/qa/rpc-tests/keypool.py
@@ -5,8 +5,6 @@
 
 # Exercise the wallet keypool, and interaction with wallet encryption/locking
 
-# Add python-bitcoinrpc to module search path:
-
 from test_framework.test_framework import BitcoinTestFramework
 from test_framework.util import *
 
@@ -65,12 +63,13 @@ def run_test(self):
         except JSONRPCException as e:
             assert(e.error['code']==-12)
 
-    def setup_chain(self):
-        print("Initializing test directory "+self.options.tmpdir)
-        initialize_chain(self.options.tmpdir)
+    def __init__(self):
+        super().__init__()
+        self.setup_clean_chain = False
+        self.num_nodes = 1
 
     def setup_network(self):
-        self.nodes = start_nodes(1, self.options.tmpdir)
+        self.nodes = self.setup_nodes()
 
 if __name__ == '__main__':
     KeyPoolTest().main()
diff --git a/qa/rpc-tests/listtransactions.py b/qa/rpc-tests/listtransactions.py
index 8dad687eddaa9..5ec6ce17e01e8 100755
--- a/qa/rpc-tests/listtransactions.py
+++ b/qa/rpc-tests/listtransactions.py
@@ -17,11 +17,15 @@ def txFromHex(hexstring):
     return tx
 
 class ListTransactionsTest(BitcoinTestFramework):
+    def __init__(self):
+        super().__init__()
+        self.num_nodes = 4
+        self.setup_clean_chain = False
 
     def setup_nodes(self):
         #This test requires mocktime
         enable_mocktime()
-        return start_nodes(4, self.options.tmpdir)
+        return start_nodes(self.num_nodes, self.options.tmpdir)
 
     def run_test(self):
         # Simple send, 0 to 1:
diff --git a/qa/rpc-tests/maxblocksinflight.py b/qa/rpc-tests/maxblocksinflight.py
index 6f105a77e3af9..1df1c484bea12 100755
--- a/qa/rpc-tests/maxblocksinflight.py
+++ b/qa/rpc-tests/maxblocksinflight.py
@@ -76,12 +76,13 @@ def add_options(self, parser):
                           default=os.getenv("BITCOIND", "bitcoind"),
                           help="Binary to test max block requests behavior")
 
-    def setup_chain(self):
-        print("Initializing test directory "+self.options.tmpdir)
-        initialize_chain_clean(self.options.tmpdir, 1)
+    def __init__(self):
+        super().__init__()
+        self.setup_clean_chain = True
+        self.num_nodes = 1
 
     def setup_network(self):
-        self.nodes = start_nodes(1, self.options.tmpdir,
+        self.nodes = start_nodes(self.num_nodes, self.options.tmpdir,
                                  extra_args=[['-debug', '-whitelist=127.0.0.1']],
                                  binary=[self.options.testbinary])
 
diff --git a/qa/rpc-tests/maxuploadtarget.py b/qa/rpc-tests/maxuploadtarget.py
index ec802d8155bd5..42235a511910b 100755
--- a/qa/rpc-tests/maxuploadtarget.py
+++ b/qa/rpc-tests/maxuploadtarget.py
@@ -80,17 +80,19 @@ def received_pong():
         return success
 
 class MaxUploadTest(BitcoinTestFramework):
-    def __init__(self):
-        self.utxo = []
-        self.txouts = gen_return_txouts()
  
     def add_options(self, parser):
         parser.add_option("--testbinary", dest="testbinary",
                           default=os.getenv("BITCOIND", "bitcoind"),
                           help="bitcoind binary to test")
 
-    def setup_chain(self):
-        initialize_chain_clean(self.options.tmpdir, 2)
+    def __init__(self):
+        super().__init__()
+        self.setup_clean_chain = True
+        self.num_nodes = 2
+
+        self.utxo = []
+        self.txouts = gen_return_txouts()
 
     def setup_network(self):
         # Start a node with maxuploadtarget of 200 MB (/24h)
diff --git a/qa/rpc-tests/mempool_limit.py b/qa/rpc-tests/mempool_limit.py
index bc208709e9125..c1c5558a95fc1 100755
--- a/qa/rpc-tests/mempool_limit.py
+++ b/qa/rpc-tests/mempool_limit.py
@@ -10,9 +10,6 @@
 
 class MempoolLimitTest(BitcoinTestFramework):
 
-    def __init__(self):
-        self.txouts = gen_return_txouts()
-
     def setup_network(self):
         self.nodes = []
         self.nodes.append(start_node(0, self.options.tmpdir, ["-maxmempool=5", "-spendzeroconfchange=0", "-debug"]))
@@ -20,9 +17,12 @@ def setup_network(self):
         self.sync_all()
         self.relayfee = self.nodes[0].getnetworkinfo()['relayfee']
 
-    def setup_chain(self):
-        print("Initializing test directory "+self.options.tmpdir)
-        initialize_chain_clean(self.options.tmpdir, 2)
+    def __init__(self):
+        super().__init__()
+        self.setup_clean_chain = True
+        self.num_nodes = 2
+
+        self.txouts = gen_return_txouts()
 
     def run_test(self):
         txids = []
diff --git a/qa/rpc-tests/mempool_packages.py b/qa/rpc-tests/mempool_packages.py
index 7ac85c1b6d3e9..693ff593b3485 100755
--- a/qa/rpc-tests/mempool_packages.py
+++ b/qa/rpc-tests/mempool_packages.py
@@ -13,6 +13,10 @@
 MAX_DESCENDANTS = 25
 
 class MempoolPackagesTest(BitcoinTestFramework):
+    def __init__(self):
+        super().__init__()
+        self.num_nodes = 2
+        self.setup_clean_chain = False
 
     def setup_network(self):
         self.nodes = []
diff --git a/qa/rpc-tests/mempool_reorg.py b/qa/rpc-tests/mempool_reorg.py
index 608e9d0a06c8d..301b094eb08ca 100755
--- a/qa/rpc-tests/mempool_reorg.py
+++ b/qa/rpc-tests/mempool_reorg.py
@@ -13,6 +13,10 @@
 
 # Create one-input, one-output, no-fee transaction:
 class MempoolCoinbaseTest(BitcoinTestFramework):
+    def __init__(self):
+        super().__init__()
+        self.num_nodes = 2
+        self.setup_clean_chain = False
 
     alert_filename = None  # Set by setup_network
 
diff --git a/qa/rpc-tests/mempool_resurrect_test.py b/qa/rpc-tests/mempool_resurrect_test.py
index b4d9f0a1a23ff..3db12cbf76a68 100755
--- a/qa/rpc-tests/mempool_resurrect_test.py
+++ b/qa/rpc-tests/mempool_resurrect_test.py
@@ -14,6 +14,11 @@
 # Create one-input, one-output, no-fee transaction:
 class MempoolCoinbaseTest(BitcoinTestFramework):
 
+    def __init__(self):
+        super().__init__()
+        self.num_nodes = 1
+        self.setup_clean_chain = False
+
     def setup_network(self):
         # Just need one node for this test
         args = ["-checkmempool", "-debug=mempool"]
diff --git a/qa/rpc-tests/mempool_spendcoinbase.py b/qa/rpc-tests/mempool_spendcoinbase.py
index c23f5ef10ae12..d5e4bf52d26ce 100755
--- a/qa/rpc-tests/mempool_spendcoinbase.py
+++ b/qa/rpc-tests/mempool_spendcoinbase.py
@@ -19,6 +19,11 @@
 # Create one-input, one-output, no-fee transaction:
 class MempoolSpendCoinbaseTest(BitcoinTestFramework):
 
+    def __init__(self):
+        super().__init__()
+        self.num_nodes = 1
+        self.setup_clean_chain = False
+
     def setup_network(self):
         # Just need one node for this test
         args = ["-checkmempool", "-debug=mempool"]
diff --git a/qa/rpc-tests/merkle_blocks.py b/qa/rpc-tests/merkle_blocks.py
index 9419d9a714ced..b2155d7fc33c3 100755
--- a/qa/rpc-tests/merkle_blocks.py
+++ b/qa/rpc-tests/merkle_blocks.py
@@ -12,9 +12,10 @@
 
 class MerkleBlockTest(BitcoinTestFramework):
 
-    def setup_chain(self):
-        print("Initializing test directory "+self.options.tmpdir)
-        initialize_chain_clean(self.options.tmpdir, 4)
+    def __init__(self):
+        super().__init__()
+        self.setup_clean_chain = True
+        self.num_nodes = 4
 
     def setup_network(self):
         self.nodes = []
diff --git a/qa/rpc-tests/multi_rpc.py b/qa/rpc-tests/multi_rpc.py
index 577d80949d4ce..24373b257d7e6 100755
--- a/qa/rpc-tests/multi_rpc.py
+++ b/qa/rpc-tests/multi_rpc.py
@@ -8,18 +8,21 @@
 #
 
 from test_framework.test_framework import BitcoinTestFramework
-from test_framework.util import *
+from test_framework.util import str_to_b64str, assert_equal
 
+import os
 import http.client
 import urllib.parse
 
 class HTTPBasicsTest (BitcoinTestFramework):
-    def setup_nodes(self):
-        return start_nodes(4, self.options.tmpdir)
+
+    def __init__(self):
+        super().__init__()
+        self.setup_clean_chain = False
+        self.num_nodes = 1
 
     def setup_chain(self):
-        print("Initializing test directory "+self.options.tmpdir)
-        initialize_chain(self.options.tmpdir)
+        super().setup_chain()
         #Append rpcauth to bitcoin.conf before initialization
         rpcauth = "rpcauth=rt:93648e835a54c573682c2eb19f882535$7681e9c5b74bdd85e78166031d2058e1069b3ed7ed967c93fc63abba06f31144"
         rpcauth2 = "rpcauth=rt2:f8607b1a88861fac29dfccf9b52ff9f$ff36a0c23c8c62b4846112e50fa888416e94c17bfd4c42f88fd8f55ec6a3137e"
@@ -27,6 +30,9 @@ def setup_chain(self):
             f.write(rpcauth+"\n")
             f.write(rpcauth2+"\n")
 
+    def setup_network(self):
+        self.nodes = self.setup_nodes()
+
     def run_test(self):
 
         ##################################################
diff --git a/qa/rpc-tests/nodehandling.py b/qa/rpc-tests/nodehandling.py
index 1b6ba021a0cea..e9682c4908f65 100755
--- a/qa/rpc-tests/nodehandling.py
+++ b/qa/rpc-tests/nodehandling.py
@@ -14,6 +14,12 @@
 import urllib.parse
 
 class NodeHandlingTest (BitcoinTestFramework):
+
+    def __init__(self):
+        super().__init__()
+        self.num_nodes = 4
+        self.setup_clean_chain = False
+
     def run_test(self):
         ###########################
         # setban/listbanned tests #
diff --git a/qa/rpc-tests/p2p-acceptblock.py b/qa/rpc-tests/p2p-acceptblock.py
index 21e4c2f468521..015ec34effabe 100755
--- a/qa/rpc-tests/p2p-acceptblock.py
+++ b/qa/rpc-tests/p2p-acceptblock.py
@@ -111,8 +111,10 @@ def add_options(self, parser):
                           default=os.getenv("BITCOIND", "bitcoind"),
                           help="bitcoind binary to test")
 
-    def setup_chain(self):
-        initialize_chain_clean(self.options.tmpdir, 2)
+    def __init__(self):
+        super().__init__()
+        self.setup_clean_chain = True
+        self.num_nodes = 2
 
     def setup_network(self):
         # Node0 will be used to test behavior of processing unrequested blocks
diff --git a/qa/rpc-tests/p2p-feefilter.py b/qa/rpc-tests/p2p-feefilter.py
index 5fb51ed0fe792..cd0501a3140c3 100755
--- a/qa/rpc-tests/p2p-feefilter.py
+++ b/qa/rpc-tests/p2p-feefilter.py
@@ -46,6 +46,12 @@ def send_filter(self, feerate):
         self.sync_with_ping()
 
 class FeeFilterTest(BitcoinTestFramework):
+
+    def __init__(self):
+        super().__init__()
+        self.num_nodes = 2
+        self.setup_clean_chain = False
+
     def setup_network(self):
         # Node1 will be used to generate txs which should be relayed from Node0
         # to our test node
diff --git a/qa/rpc-tests/p2p-fullblocktest.py b/qa/rpc-tests/p2p-fullblocktest.py
index 56df8ffd01181..aa0501c5e9260 100755
--- a/qa/rpc-tests/p2p-fullblocktest.py
+++ b/qa/rpc-tests/p2p-fullblocktest.py
@@ -29,6 +29,7 @@ class FullBlockTest(ComparisonTestFramework):
     ''' Can either run this test as 1 node with expected answers, or two and compare them. 
         Change the "outcome" variable from each TestInstance object to only do the comparison. '''
     def __init__(self):
+        super().__init__()
         self.num_nodes = 1
         self.block_heights = {}
         self.coinbase_key = CECKey()
diff --git a/qa/rpc-tests/p2p-versionbits-warning.py b/qa/rpc-tests/p2p-versionbits-warning.py
index 8c8c2358f74e6..962cafef0b17b 100755
--- a/qa/rpc-tests/p2p-versionbits-warning.py
+++ b/qa/rpc-tests/p2p-versionbits-warning.py
@@ -59,8 +59,10 @@ def sync_with_ping(self, timeout=30):
 
 
 class VersionBitsWarningTest(BitcoinTestFramework):
-    def setup_chain(self):
-        initialize_chain_clean(self.options.tmpdir, 1)
+    def __init__(self):
+        super().__init__()
+        self.setup_clean_chain = True
+        self.num_nodes = 1
 
     def setup_network(self):
         self.nodes = []
diff --git a/qa/rpc-tests/prioritise_transaction.py b/qa/rpc-tests/prioritise_transaction.py
index 6ab88602b57ac..e1771231c066e 100755
--- a/qa/rpc-tests/prioritise_transaction.py
+++ b/qa/rpc-tests/prioritise_transaction.py
@@ -14,11 +14,11 @@
 class PrioritiseTransactionTest(BitcoinTestFramework):
 
     def __init__(self):
-        self.txouts = gen_return_txouts()
+        super().__init__()
+        self.setup_clean_chain = True
+        self.num_nodes = 1
 
-    def setup_chain(self):
-        print("Initializing test directory "+self.options.tmpdir)
-        initialize_chain_clean(self.options.tmpdir, 1)
+        self.txouts = gen_return_txouts()
 
     def setup_network(self):
         self.nodes = []
diff --git a/qa/rpc-tests/proxy_test.py b/qa/rpc-tests/proxy_test.py
index 6c7b201d562d0..27160cae07762 100755
--- a/qa/rpc-tests/proxy_test.py
+++ b/qa/rpc-tests/proxy_test.py
@@ -36,6 +36,10 @@
 
 class ProxyTest(BitcoinTestFramework):
     def __init__(self):
+        super().__init__()
+        self.num_nodes = 4
+        self.setup_clean_chain = False
+
         self.have_ipv6 = test_ipv6_local()
         # Create two proxies on different ports
         # ... one unauthenticated
@@ -77,7 +81,7 @@ def setup_nodes(self):
             ]
         if self.have_ipv6:
             args[3] = ['-listen', '-debug=net', '-debug=proxy', '-proxy=[%s]:%i' % (self.conf3.addr),'-proxyrandomize=0', '-noonion']
-        return start_nodes(4, self.options.tmpdir, extra_args=args)
+        return start_nodes(self.num_nodes, self.options.tmpdir, extra_args=args)
 
     def node_test(self, node, proxies, auth, test_onion=True):
         rv = []
diff --git a/qa/rpc-tests/pruning.py b/qa/rpc-tests/pruning.py
index 92d33bd20ec3e..4c0530b355a59 100755
--- a/qa/rpc-tests/pruning.py
+++ b/qa/rpc-tests/pruning.py
@@ -20,14 +20,14 @@ def calc_usage(blockdir):
 class PruneTest(BitcoinTestFramework):
 
     def __init__(self):
+        super().__init__()
+        self.setup_clean_chain = True
+        self.num_nodes = 3
+
         self.utxo = []
         self.address = ["",""]
         self.txouts = gen_return_txouts()
 
-    def setup_chain(self):
-        print("Initializing test directory "+self.options.tmpdir)
-        initialize_chain_clean(self.options.tmpdir, 3)
-
     def setup_network(self):
         self.nodes = []
         self.is_network_split = False
diff --git a/qa/rpc-tests/rawtransactions.py b/qa/rpc-tests/rawtransactions.py
index 7f7b6887a834f..df02c1697f342 100755
--- a/qa/rpc-tests/rawtransactions.py
+++ b/qa/rpc-tests/rawtransactions.py
@@ -14,12 +14,13 @@
 # Create one-input, one-output, no-fee transaction:
 class RawTransactionsTest(BitcoinTestFramework):
 
-    def setup_chain(self):
-        print("Initializing test directory "+self.options.tmpdir)
-        initialize_chain_clean(self.options.tmpdir, 3)
+    def __init__(self):
+        super().__init__()
+        self.setup_clean_chain = True
+        self.num_nodes = 3
 
     def setup_network(self, split=False):
-        self.nodes = start_nodes(3, self.options.tmpdir)
+        self.nodes = start_nodes(self.num_nodes, self.options.tmpdir)
 
         #connect to a local machine for debugging
         #url = "http://bitcoinrpc:DP6DvqZtqXarpeNWyN3LZTFchCCyCUuHwNF7E8pX99x1@%s:%d" % ('127.0.0.1', 18332)
diff --git a/qa/rpc-tests/receivedby.py b/qa/rpc-tests/receivedby.py
index a3f97669ea27a..4f17b661cb28d 100755
--- a/qa/rpc-tests/receivedby.py
+++ b/qa/rpc-tests/receivedby.py
@@ -27,10 +27,15 @@ def get_sub_array_from_array(object_array, to_match):
 
 class ReceivedByTest(BitcoinTestFramework):
 
+    def __init__(self):
+        super().__init__()
+        self.num_nodes = 4
+        self.setup_clean_chain = False
+
     def setup_nodes(self):
         #This test requires mocktime
         enable_mocktime()
-        return start_nodes(4, self.options.tmpdir)
+        return start_nodes(self.num_nodes, self.options.tmpdir)
 
     def run_test(self):
         '''
diff --git a/qa/rpc-tests/reindex.py b/qa/rpc-tests/reindex.py
index 39564b32bad90..87e6239b59b32 100755
--- a/qa/rpc-tests/reindex.py
+++ b/qa/rpc-tests/reindex.py
@@ -11,9 +11,10 @@
 
 class ReindexTest(BitcoinTestFramework):
 
-    def setup_chain(self):
-        print("Initializing test directory "+self.options.tmpdir)
-        initialize_chain_clean(self.options.tmpdir, 1)
+    def __init__(self):
+        super().__init__()
+        self.setup_clean_chain = True
+        self.num_nodes = 1
 
     def setup_network(self):
         self.nodes = []
diff --git a/qa/rpc-tests/replace-by-fee.py b/qa/rpc-tests/replace-by-fee.py
index 4afc3981da112..34c0f9d7957c7 100755
--- a/qa/rpc-tests/replace-by-fee.py
+++ b/qa/rpc-tests/replace-by-fee.py
@@ -68,6 +68,11 @@ def make_utxo(node, amount, confirmed=True, scriptPubKey=CScript([1])):
 
 class ReplaceByFeeTest(BitcoinTestFramework):
 
+    def __init__(self):
+        super().__init__()
+        self.num_nodes = 1
+        self.setup_clean_chain = False
+
     def setup_network(self):
         self.nodes = []
         self.nodes.append(start_node(0, self.options.tmpdir, ["-maxorphantx=1000", "-debug",
diff --git a/qa/rpc-tests/rest.py b/qa/rpc-tests/rest.py
index ec9515528ecb7..c9c2eaf7f37b9 100755
--- a/qa/rpc-tests/rest.py
+++ b/qa/rpc-tests/rest.py
@@ -47,12 +47,13 @@ def http_post_call(host, port, path, requestdata = '', response_object = 0):
 class RESTTest (BitcoinTestFramework):
     FORMAT_SEPARATOR = "."
 
-    def setup_chain(self):
-        print("Initializing test directory "+self.options.tmpdir)
-        initialize_chain_clean(self.options.tmpdir, 3)
+    def __init__(self):
+        super().__init__()
+        self.setup_clean_chain = True
+        self.num_nodes = 3
 
     def setup_network(self, split=False):
-        self.nodes = start_nodes(3, self.options.tmpdir)
+        self.nodes = start_nodes(self.num_nodes, self.options.tmpdir)
         connect_nodes_bi(self.nodes,0,1)
         connect_nodes_bi(self.nodes,1,2)
         connect_nodes_bi(self.nodes,0,2)
diff --git a/qa/rpc-tests/rpcbind_test.py b/qa/rpc-tests/rpcbind_test.py
index 7b7c01f993cf4..572273566b63a 100755
--- a/qa/rpc-tests/rpcbind_test.py
+++ b/qa/rpc-tests/rpcbind_test.py
@@ -24,7 +24,7 @@ def run_bind_test(tmpdir, allow_ips, connect_to, addresses, expected):
     if allow_ips:
         base_args += ['-rpcallowip=' + x for x in allow_ips]
     binds = ['-rpcbind='+addr for addr in addresses]
-    nodes = start_nodes(1, tmpdir, [base_args + binds], connect_to)
+    nodes = start_nodes(self.num_nodes, tmpdir, [base_args + binds], connect_to)
     try:
         pid = bitcoind_processes[0].pid
         assert_equal(set(get_bind_addrs(pid)), set(expected))
@@ -38,7 +38,7 @@ def run_allowip_test(tmpdir, allow_ips, rpchost, rpcport):
     at a non-localhost IP.
     '''
     base_args = ['-disablewallet', '-nolisten'] + ['-rpcallowip='+x for x in allow_ips]
-    nodes = start_nodes(1, tmpdir, [base_args])
+    nodes = start_nodes(self.num_nodes, tmpdir, [base_args])
     try:
         # connect to node through non-loopback interface
         url = "http://rt:rt@%s:%d" % (rpchost, rpcport,)
diff --git a/qa/rpc-tests/sendheaders.py b/qa/rpc-tests/sendheaders.py
index 96d1da729b909..6ab17d59b3878 100755
--- a/qa/rpc-tests/sendheaders.py
+++ b/qa/rpc-tests/sendheaders.py
@@ -208,12 +208,14 @@ def __init__(self):
         BaseNode.__init__(self)
 
 class SendHeadersTest(BitcoinTestFramework):
-    def setup_chain(self):
-        initialize_chain_clean(self.options.tmpdir, 2)
+    def __init__(self):
+        super().__init__()
+        self.setup_clean_chain = True
+        self.num_nodes = 2
 
     def setup_network(self):
         self.nodes = []
-        self.nodes = start_nodes(2, self.options.tmpdir, [["-debug", "-logtimemicros=1"]]*2)
+        self.nodes = start_nodes(self.num_nodes, self.options.tmpdir, [["-debug", "-logtimemicros=1"]]*2)
         connect_nodes(self.nodes[0], 1)
 
     # mine count blocks and return the new tip
diff --git a/qa/rpc-tests/signmessages.py b/qa/rpc-tests/signmessages.py
index 4a47c0ca1e198..31b6f14a26562 100755
--- a/qa/rpc-tests/signmessages.py
+++ b/qa/rpc-tests/signmessages.py
@@ -10,12 +10,13 @@
 class SignMessagesTest(BitcoinTestFramework):
     """Tests RPC commands for signing and verifying messages."""
 
-    def setup_chain(self):
-        print('Initializing test directory ' + self.options.tmpdir)
-        initialize_chain_clean(self.options.tmpdir, 1)
+    def __init__(self):
+        super().__init__()
+        self.setup_clean_chain = True
+        self.num_nodes = 1
 
     def setup_network(self, split=False):
-        self.nodes = start_nodes(1, self.options.tmpdir)
+        self.nodes = start_nodes(self.num_nodes, self.options.tmpdir)
         self.is_network_split = False
 
     def run_test(self):
diff --git a/qa/rpc-tests/signrawtransactions.py b/qa/rpc-tests/signrawtransactions.py
index a06ac53191846..c61a280616cf7 100755
--- a/qa/rpc-tests/signrawtransactions.py
+++ b/qa/rpc-tests/signrawtransactions.py
@@ -10,12 +10,13 @@
 class SignRawTransactionsTest(BitcoinTestFramework):
     """Tests transaction signing via RPC command "signrawtransaction"."""
 
-    def setup_chain(self):
-        print('Initializing test directory ' + self.options.tmpdir)
-        initialize_chain_clean(self.options.tmpdir, 1)
+    def __init__(self):
+        super().__init__()
+        self.setup_clean_chain = True
+        self.num_nodes = 1
 
     def setup_network(self, split=False):
-        self.nodes = start_nodes(1, self.options.tmpdir)
+        self.nodes = start_nodes(self.num_nodes, self.options.tmpdir)
         self.is_network_split = False
 
     def successful_signing_test(self):
diff --git a/qa/rpc-tests/smartfees.py b/qa/rpc-tests/smartfees.py
index 8fcb99c1b7f4e..d76fba4b075ce 100755
--- a/qa/rpc-tests/smartfees.py
+++ b/qa/rpc-tests/smartfees.py
@@ -145,6 +145,11 @@ def check_estimates(node, fees_seen, max_invalid, print_estimates = True):
 
 class EstimateFeeTest(BitcoinTestFramework):
 
+    def __init__(self):
+        super().__init__()
+        self.num_nodes = 3
+        self.setup_clean_chain = False
+
     def setup_network(self):
         '''
         We'll setup the network to have 3 nodes that all mine with different parameters.
diff --git a/qa/rpc-tests/test_framework/test_framework.py b/qa/rpc-tests/test_framework/test_framework.py
index 3480de6c6e20c..b9b803429dec2 100755
--- a/qa/rpc-tests/test_framework/test_framework.py
+++ b/qa/rpc-tests/test_framework/test_framework.py
@@ -15,7 +15,6 @@
 
 from .util import (
     initialize_chain,
-    assert_equal,
     start_nodes,
     connect_nodes_bi,
     sync_blocks,
@@ -32,21 +31,26 @@
 
 class BitcoinTestFramework(object):
 
-    # These may be over-ridden by subclasses:
+    def __init__(self):
+        self.num_nodes = 4
+        self.setup_clean_chain = False
+        self.nodes = None
+
     def run_test(self):
-        for node in self.nodes:
-            assert_equal(node.getblockcount(), 200)
-            assert_equal(node.getbalance(), 25*50)
+        raise NotImplementedError
 
     def add_options(self, parser):
         pass
 
     def setup_chain(self):
         print("Initializing test directory "+self.options.tmpdir)
-        initialize_chain(self.options.tmpdir)
+        if self.setup_clean_chain:
+            initialize_chain_clean(self.options.tmpdir, self.num_nodes)
+        else:
+            initialize_chain(self.options.tmpdir, self.num_nodes)
 
     def setup_nodes(self):
-        return start_nodes(4, self.options.tmpdir)
+        return start_nodes(self.num_nodes, self.options.tmpdir)
 
     def setup_network(self, split = False):
         self.nodes = self.setup_nodes()
@@ -181,9 +185,10 @@ def main(self):
 
 class ComparisonTestFramework(BitcoinTestFramework):
 
-    # Can override the num_nodes variable to indicate how many nodes to run.
     def __init__(self):
+        super().__init__()
         self.num_nodes = 2
+        self.setup_clean_chain = True
 
     def add_options(self, parser):
         parser.add_option("--testbinary", dest="testbinary",
@@ -193,10 +198,6 @@ def add_options(self, parser):
                           default=os.getenv("BITCOIND", "bitcoind"),
                           help="bitcoind binary to use for reference nodes (if any)")
 
-    def setup_chain(self):
-        print("Initializing test directory "+self.options.tmpdir)
-        initialize_chain_clean(self.options.tmpdir, self.num_nodes)
-
     def setup_network(self):
         self.nodes = start_nodes(
             self.num_nodes, self.options.tmpdir,
diff --git a/qa/rpc-tests/test_framework/util.py b/qa/rpc-tests/test_framework/util.py
index 6784177aaac57..0e522e78d4853 100644
--- a/qa/rpc-tests/test_framework/util.py
+++ b/qa/rpc-tests/test_framework/util.py
@@ -182,24 +182,28 @@ def wait_for_bitcoind_start(process, url, i):
                 raise # unkown JSON RPC exception
         time.sleep(0.25)
 
-def initialize_chain(test_dir):
+def initialize_chain(test_dir, num_nodes):
     """
-    Create (or copy from cache) a 200-block-long chain and
-    4 wallets.
+    Create a cache of a 200-block-long chain (with wallet) for MAX_NODES
+    Afterward, create num_nodes copies from the cache
     """
 
-    if (not os.path.isdir(os.path.join("cache","node0"))
-        or not os.path.isdir(os.path.join("cache","node1"))
-        or not os.path.isdir(os.path.join("cache","node2"))
-        or not os.path.isdir(os.path.join("cache","node3"))):
+    assert num_nodes <= MAX_NODES
+    create_cache = False
+    for i in range(MAX_NODES):
+        if not os.path.isdir(os.path.join('cache', 'node'+str(i))):
+            create_cache = True
+            break
+
+    if create_cache:
 
         #find and delete old cache directories if any exist
-        for i in range(4):
+        for i in range(MAX_NODES):
             if os.path.isdir(os.path.join("cache","node"+str(i))):
                 shutil.rmtree(os.path.join("cache","node"+str(i)))
 
         # Create cache directories, run bitcoinds:
-        for i in range(4):
+        for i in range(MAX_NODES):
             datadir=initialize_datadir("cache", i)
             args = [ os.getenv("BITCOIND", "bitcoind"), "-server", "-keypool=1", "-datadir="+datadir, "-discover=0" ]
             if i > 0:
@@ -212,15 +216,18 @@ def initialize_chain(test_dir):
                 print("initialize_chain: RPC succesfully started")
 
         rpcs = []
-        for i in range(4):
+        for i in range(MAX_NODES):
             try:
                 rpcs.append(get_rpc_proxy(rpc_url(i), i))
             except:
                 sys.stderr.write("Error connecting to "+url+"\n")
                 sys.exit(1)
 
-        # Create a 200-block-long chain; each of the 4 nodes
+        # Create a 200-block-long chain; each of the 4 first nodes
         # gets 25 mature blocks and 25 immature.
+        # Note: To preserve compatibility with older versions of
+        # initialize_chain, only 4 nodes will generate coins.
+        #
         # blocks are created with timestamps 10 minutes apart
         # starting from 2010 minutes in the past
         enable_mocktime()
@@ -238,13 +245,13 @@ def initialize_chain(test_dir):
         stop_nodes(rpcs)
         wait_bitcoinds()
         disable_mocktime()
-        for i in range(4):
+        for i in range(MAX_NODES):
             os.remove(log_filename("cache", i, "debug.log"))
             os.remove(log_filename("cache", i, "db.log"))
             os.remove(log_filename("cache", i, "peers.dat"))
             os.remove(log_filename("cache", i, "fee_estimates.dat"))
 
-    for i in range(4):
+    for i in range(num_nodes):
         from_dir = os.path.join("cache", "node"+str(i))
         to_dir = os.path.join(test_dir,  "node"+str(i))
         shutil.copytree(from_dir, to_dir)
diff --git a/qa/rpc-tests/txn_clone.py b/qa/rpc-tests/txn_clone.py
index 5710c29aa60cd..22f850ece64a2 100755
--- a/qa/rpc-tests/txn_clone.py
+++ b/qa/rpc-tests/txn_clone.py
@@ -12,6 +12,11 @@
 
 class TxnMallTest(BitcoinTestFramework):
 
+    def __init__(self):
+        super().__init__()
+        self.num_nodes = 4
+        self.setup_clean_chain = False
+
     def add_options(self, parser):
         parser.add_option("--mineblock", dest="mine_block", default=False, action="store_true",
                           help="Test double-spend of 1-confirmed transaction")
diff --git a/qa/rpc-tests/txn_doublespend.py b/qa/rpc-tests/txn_doublespend.py
index 1fbb207e22db8..84944c3c1943a 100755
--- a/qa/rpc-tests/txn_doublespend.py
+++ b/qa/rpc-tests/txn_doublespend.py
@@ -12,6 +12,11 @@
 
 class TxnMallTest(BitcoinTestFramework):
 
+    def __init__(self):
+        super().__init__()
+        self.num_nodes = 4
+        self.setup_clean_chain = False
+
     def add_options(self, parser):
         parser.add_option("--mineblock", dest="mine_block", default=False, action="store_true",
                           help="Test double-spend of 1-confirmed transaction")
diff --git a/qa/rpc-tests/wallet.py b/qa/rpc-tests/wallet.py
index 42ce0a7260fa3..2d24ced97cffc 100755
--- a/qa/rpc-tests/wallet.py
+++ b/qa/rpc-tests/wallet.py
@@ -19,9 +19,10 @@ def check_fee_amount(self, curr_balance, balance_with_fee, fee_per_byte, tx_size
             raise AssertionError("Fee of %s BTC too high! (Should be %s BTC)"%(str(fee), str(target_fee)))
         return curr_balance
 
-    def setup_chain(self):
-        print("Initializing test directory "+self.options.tmpdir)
-        initialize_chain_clean(self.options.tmpdir, 4)
+    def __init__(self):
+        super().__init__()
+        self.setup_clean_chain = True
+        self.num_nodes = 4
 
     def setup_network(self, split=False):
         self.nodes = start_nodes(3, self.options.tmpdir)
diff --git a/qa/rpc-tests/walletbackup.py b/qa/rpc-tests/walletbackup.py
index c3d53669c9fa4..b991d5c761862 100755
--- a/qa/rpc-tests/walletbackup.py
+++ b/qa/rpc-tests/walletbackup.py
@@ -41,15 +41,16 @@
 
 class WalletBackupTest(BitcoinTestFramework):
 
-    def setup_chain(self):
-        logging.info("Initializing test directory "+self.options.tmpdir)
-        initialize_chain_clean(self.options.tmpdir, 4)
+    def __init__(self):
+        super().__init__()
+        self.setup_clean_chain = True
+        self.num_nodes = 4
 
     # This mirrors how the network was setup in the bash test
     def setup_network(self, split=False):
         # nodes 1, 2,3 are spenders, let's give them a keypool=100
         extra_args = [["-keypool=100"], ["-keypool=100"], ["-keypool=100"], []]
-        self.nodes = start_nodes(4, self.options.tmpdir, extra_args)
+        self.nodes = start_nodes(self.num_nodes, self.options.tmpdir, extra_args)
         connect_nodes(self.nodes[0], 3)
         connect_nodes(self.nodes[1], 3)
         connect_nodes(self.nodes[2], 3)
diff --git a/qa/rpc-tests/zapwallettxes.py b/qa/rpc-tests/zapwallettxes.py
index 2f8214f87c26c..17ba53a844b4f 100755
--- a/qa/rpc-tests/zapwallettxes.py
+++ b/qa/rpc-tests/zapwallettxes.py
@@ -9,12 +9,13 @@
 
 class ZapWalletTXesTest (BitcoinTestFramework):
 
-    def setup_chain(self):
-        print("Initializing test directory "+self.options.tmpdir)
-        initialize_chain_clean(self.options.tmpdir, 3)
+    def __init__(self):
+        super().__init__()
+        self.setup_clean_chain = True
+        self.num_nodes = 3
 
     def setup_network(self, split=False):
-        self.nodes = start_nodes(3, self.options.tmpdir)
+        self.nodes = start_nodes(self.num_nodes, self.options.tmpdir)
         connect_nodes_bi(self.nodes,0,1)
         connect_nodes_bi(self.nodes,1,2)
         connect_nodes_bi(self.nodes,0,2)
diff --git a/qa/rpc-tests/zmq_test.py b/qa/rpc-tests/zmq_test.py
index f5617a084db7d..3a116317fed96 100755
--- a/qa/rpc-tests/zmq_test.py
+++ b/qa/rpc-tests/zmq_test.py
@@ -17,6 +17,10 @@
 
 class ZMQTest (BitcoinTestFramework):
 
+    def __init__(self):
+        super().__init__()
+        self.num_nodes = 4
+
     port = 28332
 
     def setup_nodes(self):
@@ -25,7 +29,7 @@ def setup_nodes(self):
         self.zmqSubSocket.setsockopt(zmq.SUBSCRIBE, b"hashblock")
         self.zmqSubSocket.setsockopt(zmq.SUBSCRIBE, b"hashtx")
         self.zmqSubSocket.connect("tcp://127.0.0.1:%i" % self.port)
-        return start_nodes(4, self.options.tmpdir, extra_args=[
+        return start_nodes(self.num_nodes, self.options.tmpdir, extra_args=[
             ['-zmqpubhashtx=tcp://127.0.0.1:'+str(self.port), '-zmqpubhashblock=tcp://127.0.0.1:'+str(self.port)],
             [],
             [],

From fad68f751aff024bcbc1587640c3591aab5a80f7 Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Sun, 15 May 2016 12:20:15 +0200
Subject: [PATCH 0322/1802] [qa] Reduce node count for some tests

---
 qa/rpc-tests/importprunedfunds.py | 2 +-
 qa/rpc-tests/maxuploadtarget.py   | 2 +-
 qa/rpc-tests/mempool_limit.py     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/qa/rpc-tests/importprunedfunds.py b/qa/rpc-tests/importprunedfunds.py
index 761c9af90c30e..d86f51b7f3aaf 100755
--- a/qa/rpc-tests/importprunedfunds.py
+++ b/qa/rpc-tests/importprunedfunds.py
@@ -12,7 +12,7 @@ class ImportPrunedFundsTest(BitcoinTestFramework):
     def __init__(self):
         super().__init__()
         self.setup_clean_chain = True
-        self.num_nodes = 4
+        self.num_nodes = 2
 
     def setup_network(self, split=False):
         self.nodes = start_nodes(self.num_nodes, self.options.tmpdir)
diff --git a/qa/rpc-tests/maxuploadtarget.py b/qa/rpc-tests/maxuploadtarget.py
index 42235a511910b..5087f0762033a 100755
--- a/qa/rpc-tests/maxuploadtarget.py
+++ b/qa/rpc-tests/maxuploadtarget.py
@@ -89,7 +89,7 @@ def add_options(self, parser):
     def __init__(self):
         super().__init__()
         self.setup_clean_chain = True
-        self.num_nodes = 2
+        self.num_nodes = 1
 
         self.utxo = []
         self.txouts = gen_return_txouts()
diff --git a/qa/rpc-tests/mempool_limit.py b/qa/rpc-tests/mempool_limit.py
index c1c5558a95fc1..4438c152df10a 100755
--- a/qa/rpc-tests/mempool_limit.py
+++ b/qa/rpc-tests/mempool_limit.py
@@ -20,7 +20,7 @@ def setup_network(self):
     def __init__(self):
         super().__init__()
         self.setup_clean_chain = True
-        self.num_nodes = 2
+        self.num_nodes = 1
 
         self.txouts = gen_return_txouts()
 

From f93c2a1b7ee912f0651ebb4c8a5eca220e434f4a Mon Sep 17 00:00:00 2001
From: Daniel Kraft <d@domob.eu>
Date: Sun, 15 May 2016 20:15:02 +0200
Subject: [PATCH 0323/1802] net: Avoid duplicate getheaders requests.

The current logic for syncing headers may lead to lots of duplicate
getheaders requests being sent:  If a new block arrives while the node
is in headers sync, it will send getheaders in response to the block
announcement.  When the headers arrive, the message will be of maximum
size and so a follow-up request will be sent---all of that in addition
to the existing headers syncing.  This will create a second "chain" of
getheaders requests.  If more blocks arrive, this may even lead to
arbitrarily many parallel chains of redundant requests.

This patch changes the behaviour to only request more headers after a
maximum-sized message when it contained at least one unknown header.
This avoids sustaining parallel chains of redundant requests.

Note that this patch avoids the issues raised in the discussion of
https://github.com/bitcoin/bitcoin/pull/6821:  There is no risk of the
node being permanently blocked.  At the latest when a new block arrives
this will trigger a new getheaders request and restart syncing.
---
 src/main.cpp | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/main.cpp b/src/main.cpp
index ee30954b48545..5816f799a0039 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -5091,6 +5091,13 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
             return true;
         }
 
+        // If we already know the last header in the message, then it contains
+        // no new information for us.  In this case, we do not request
+        // more headers later.  This prevents multiple chains of redundant
+        // getheader requests from running in parallel if triggered by incoming
+        // blocks while the node is still in initial headers sync.
+        const bool hasNewHeaders = (mapBlockIndex.count(headers.back().GetHash()) == 0);
+
         CBlockIndex *pindexLast = NULL;
         BOOST_FOREACH(const CBlockHeader& header, headers) {
             CValidationState state;
@@ -5111,7 +5118,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
         if (pindexLast)
             UpdateBlockAvailability(pfrom->GetId(), pindexLast->GetBlockHash());
 
-        if (nCount == MAX_HEADERS_RESULTS && pindexLast) {
+        if (nCount == MAX_HEADERS_RESULTS && pindexLast && hasNewHeaders) {
             // Headers message had its maximum size; the peer may have more headers.
             // TODO: optimize: if pindexLast is an ancestor of chainActive.Tip or pindexBestHeader, continue
             // from there instead.

From d87b198b7334317952ca6a1377e25b5c859a1767 Mon Sep 17 00:00:00 2001
From: Gregory Maxwell <greg@xiph.org>
Date: Wed, 20 Apr 2016 19:38:19 +0000
Subject: [PATCH 0324/1802] Remove unneeded feerate param from
 RelayTransaction/AcceptToMemoryPool.

---
 src/main.cpp                         | 23 +++++++++--------------
 src/main.h                           |  2 +-
 src/net.cpp                          |  2 +-
 src/net.h                            |  2 +-
 src/rpc/rawtransaction.cpp           |  5 ++---
 src/test/txvalidationcache_tests.cpp |  2 +-
 src/wallet/wallet.cpp                |  6 ++----
 7 files changed, 17 insertions(+), 25 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index ee30954b48545..09f82312a9b9e 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1005,7 +1005,7 @@ std::string FormatStateMessage(const CValidationState &state)
 }
 
 bool AcceptToMemoryPoolWorker(CTxMemPool& pool, CValidationState& state, const CTransaction& tx, bool fLimitFree,
-                              bool* pfMissingInputs, CFeeRate* txFeeRate, bool fOverrideMempoolLimit, const CAmount& nAbsurdFee,
+                              bool* pfMissingInputs, bool fOverrideMempoolLimit, const CAmount& nAbsurdFee,
                               std::vector<uint256>& vHashTxnToUncache)
 {
     const uint256 hash = tx.GetHash();
@@ -1170,9 +1170,6 @@ bool AcceptToMemoryPoolWorker(CTxMemPool& pool, CValidationState& state, const C
 
         CTxMemPoolEntry entry(tx, nFees, GetTime(), dPriority, chainActive.Height(), pool.HasNoInputsOf(tx), inChainInputValue, fSpendsCoinbase, nSigOps, lp);
         unsigned int nSize = entry.GetTxSize();
-        if (txFeeRate) {
-            *txFeeRate = CFeeRate(nFees, nSize);
-        }
 
         // Check that the transaction doesn't have an excessive number of
         // sigops, making it impossible to mine. Since the coinbase transaction
@@ -1421,10 +1418,10 @@ bool AcceptToMemoryPoolWorker(CTxMemPool& pool, CValidationState& state, const C
 }
 
 bool AcceptToMemoryPool(CTxMemPool& pool, CValidationState &state, const CTransaction &tx, bool fLimitFree,
-                        bool* pfMissingInputs, CFeeRate* txFeeRate, bool fOverrideMempoolLimit, const CAmount nAbsurdFee)
+                        bool* pfMissingInputs, bool fOverrideMempoolLimit, const CAmount nAbsurdFee)
 {
     std::vector<uint256> vHashTxToUncache;
-    bool res = AcceptToMemoryPoolWorker(pool, state, tx, fLimitFree, pfMissingInputs, txFeeRate, fOverrideMempoolLimit, nAbsurdFee, vHashTxToUncache);
+    bool res = AcceptToMemoryPoolWorker(pool, state, tx, fLimitFree, pfMissingInputs, fOverrideMempoolLimit, nAbsurdFee, vHashTxToUncache);
     if (!res) {
         BOOST_FOREACH(const uint256& hashTx, vHashTxToUncache)
             pcoinsTip->Uncache(hashTx);
@@ -2651,7 +2648,7 @@ bool static DisconnectTip(CValidationState& state, const CChainParams& chainpara
         // ignore validation errors in resurrected transactions
         list<CTransaction> removed;
         CValidationState stateDummy;
-        if (tx.IsCoinBase() || !AcceptToMemoryPool(mempool, stateDummy, tx, false, NULL, NULL, true)) {
+        if (tx.IsCoinBase() || !AcceptToMemoryPool(mempool, stateDummy, tx, false, NULL, true)) {
             mempool.removeRecursive(tx, removed);
         } else if (mempool.exists(tx.GetHash())) {
             vHashUpdate.push_back(tx.GetHash());
@@ -4956,10 +4953,9 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
         pfrom->setAskFor.erase(inv.hash);
         mapAlreadyAskedFor.erase(inv.hash);
 
-        CFeeRate txFeeRate = CFeeRate(0);
-        if (!AlreadyHave(inv) && AcceptToMemoryPool(mempool, state, tx, true, &fMissingInputs, &txFeeRate)) {
+        if (!AlreadyHave(inv) && AcceptToMemoryPool(mempool, state, tx, true, &fMissingInputs)) {
             mempool.check(pcoinsTip);
-            RelayTransaction(tx, txFeeRate);
+            RelayTransaction(tx);
             vWorkQueue.push_back(inv.hash);
 
             LogPrint("mempool", "AcceptToMemoryPool: peer=%d: accepted %s (poolsz %u txn, %u kB)\n",
@@ -4990,10 +4986,9 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
 
                     if (setMisbehaving.count(fromPeer))
                         continue;
-                    CFeeRate orphanFeeRate = CFeeRate(0);
-                    if (AcceptToMemoryPool(mempool, stateDummy, orphanTx, true, &fMissingInputs2, &orphanFeeRate)) {
+                    if (AcceptToMemoryPool(mempool, stateDummy, orphanTx, true, &fMissingInputs2)) {
                         LogPrint("mempool", "   accepted orphan tx %s\n", orphanHash.ToString());
-                        RelayTransaction(orphanTx, orphanFeeRate);
+                        RelayTransaction(orphanTx);
                         vWorkQueue.push_back(orphanHash);
                         vEraseQueue.push_back(orphanHash);
                     }
@@ -5046,7 +5041,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
                 int nDoS = 0;
                 if (!state.IsInvalid(nDoS) || nDoS == 0) {
                     LogPrintf("Force relaying tx %s from whitelisted peer=%d\n", tx.GetHash().ToString(), pfrom->id);
-                    RelayTransaction(tx, txFeeRate);
+                    RelayTransaction(tx);
                 } else {
                     LogPrintf("Not relaying invalid transaction %s from whitelisted peer=%d (%s)\n", tx.GetHash().ToString(), pfrom->id, FormatStateMessage(state));
                 }
diff --git a/src/main.h b/src/main.h
index 548218a1b51cc..576f73b5f2ba7 100644
--- a/src/main.h
+++ b/src/main.h
@@ -295,7 +295,7 @@ void PruneAndFlush();
 
 /** (try to) add transaction to memory pool **/
 bool AcceptToMemoryPool(CTxMemPool& pool, CValidationState &state, const CTransaction &tx, bool fLimitFree,
-                        bool* pfMissingInputs, CFeeRate* txFeeRate, bool fOverrideMempoolLimit=false, const CAmount nAbsurdFee=0);
+                        bool* pfMissingInputs, bool fOverrideMempoolLimit=false, const CAmount nAbsurdFee=0);
 
 /** Convert CValidationState to a human-readable message for logging */
 std::string FormatStateMessage(const CValidationState &state);
diff --git a/src/net.cpp b/src/net.cpp
index 5e810a0f15888..aa5b47340a340 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -2069,7 +2069,7 @@ class CNetCleanup
 instance_of_cnetcleanup;
 
 
-void RelayTransaction(const CTransaction& tx, CFeeRate feerate)
+void RelayTransaction(const CTransaction& tx)
 {
     CInv inv(MSG_TX, tx.GetHash());
     {
diff --git a/src/net.h b/src/net.h
index b6ec7bf3e2c28..fd80056c6b8b7 100644
--- a/src/net.h
+++ b/src/net.h
@@ -783,7 +783,7 @@ class CNode
 
 
 class CTransaction;
-void RelayTransaction(const CTransaction& tx, CFeeRate feerate);
+void RelayTransaction(const CTransaction& tx);
 
 /** Access to the (IP) address database (peers.dat) */
 class CAddrDB
diff --git a/src/rpc/rawtransaction.cpp b/src/rpc/rawtransaction.cpp
index de8cd68f66267..bec7ebe55f636 100644
--- a/src/rpc/rawtransaction.cpp
+++ b/src/rpc/rawtransaction.cpp
@@ -819,12 +819,11 @@ UniValue sendrawtransaction(const UniValue& params, bool fHelp)
     const CCoins* existingCoins = view.AccessCoins(hashTx);
     bool fHaveMempool = mempool.exists(hashTx);
     bool fHaveChain = existingCoins && existingCoins->nHeight < 1000000000;
-    CFeeRate txFeeRate = CFeeRate(0);
     if (!fHaveMempool && !fHaveChain) {
         // push to local node and sync with wallets
         CValidationState state;
         bool fMissingInputs;
-        if (!AcceptToMemoryPool(mempool, state, tx, false, &fMissingInputs, &txFeeRate, false, nMaxRawTxFee)) {
+        if (!AcceptToMemoryPool(mempool, state, tx, false, &fMissingInputs, false, nMaxRawTxFee)) {
             if (state.IsInvalid()) {
                 throw JSONRPCError(RPC_TRANSACTION_REJECTED, strprintf("%i: %s", state.GetRejectCode(), state.GetRejectReason()));
             } else {
@@ -837,7 +836,7 @@ UniValue sendrawtransaction(const UniValue& params, bool fHelp)
     } else if (fHaveChain) {
         throw JSONRPCError(RPC_TRANSACTION_ALREADY_IN_CHAIN, "transaction already in block chain");
     }
-    RelayTransaction(tx, txFeeRate);
+    RelayTransaction(tx);
 
     return hashTx.GetHex();
 }
diff --git a/src/test/txvalidationcache_tests.cpp b/src/test/txvalidationcache_tests.cpp
index 237b26329b1c1..c29e30792a2a9 100644
--- a/src/test/txvalidationcache_tests.cpp
+++ b/src/test/txvalidationcache_tests.cpp
@@ -23,7 +23,7 @@ ToMemPool(CMutableTransaction& tx)
     LOCK(cs_main);
 
     CValidationState state;
-    return AcceptToMemoryPool(mempool, state, tx, false, NULL, NULL, true, 0);
+    return AcceptToMemoryPool(mempool, state, tx, false, NULL, true, 0);
 }
 
 BOOST_FIXTURE_TEST_CASE(tx_mempool_block_doublespend, TestChain100Setup)
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index a18b669b32d89..6b942e29d76c4 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -1272,9 +1272,7 @@ bool CWalletTx::RelayWalletTransaction()
     {
         if (GetDepthInMainChain() == 0 && !isAbandoned() && InMempool()) {
             LogPrintf("Relaying wtx %s\n", GetHash().ToString());
-            CFeeRate feeRate;
-            mempool.lookupFeeRate(GetHash(), feeRate);
-            RelayTransaction((CTransaction)*this, feeRate);
+            RelayTransaction((CTransaction)*this);
             return true;
         }
     }
@@ -3331,5 +3329,5 @@ int CMerkleTx::GetBlocksToMaturity() const
 bool CMerkleTx::AcceptToMemoryPool(bool fLimitFree, CAmount nAbsurdFee)
 {
     CValidationState state;
-    return ::AcceptToMemoryPool(mempool, state, *this, fLimitFree, NULL, NULL, false, nAbsurdFee);
+    return ::AcceptToMemoryPool(mempool, state, *this, fLimitFree, NULL, false, nAbsurdFee);
 }

From d253ec4baa21cc292cf72d453f71b4043b53e591 Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Wed, 20 Apr 2016 14:53:36 +0200
Subject: [PATCH 0325/1802] Make ProcessNewBlock dbp const and update comment

---
 src/main.cpp | 4 ++--
 src/main.h   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index 09f82312a9b9e..981d987711731 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -3398,7 +3398,7 @@ static bool AcceptBlockHeader(const CBlockHeader& block, CValidationState& state
 }
 
 /** Store block on disk. If dbp is non-NULL, the file is known to already reside on disk */
-static bool AcceptBlock(const CBlock& block, CValidationState& state, const CChainParams& chainparams, CBlockIndex** ppindex, bool fRequested, CDiskBlockPos* dbp)
+static bool AcceptBlock(const CBlock& block, CValidationState& state, const CChainParams& chainparams, CBlockIndex** ppindex, bool fRequested, const CDiskBlockPos* dbp)
 {
     AssertLockHeld(cs_main);
 
@@ -3474,7 +3474,7 @@ static bool IsSuperMajority(int minVersion, const CBlockIndex* pstart, unsigned
 }
 
 
-bool ProcessNewBlock(CValidationState& state, const CChainParams& chainparams, const CNode* pfrom, const CBlock* pblock, bool fForceProcessing, CDiskBlockPos* dbp)
+bool ProcessNewBlock(CValidationState& state, const CChainParams& chainparams, const CNode* pfrom, const CBlock* pblock, bool fForceProcessing, const CDiskBlockPos* dbp)
 {
     {
         LOCK(cs_main);
diff --git a/src/main.h b/src/main.h
index 576f73b5f2ba7..f287171f141ba 100644
--- a/src/main.h
+++ b/src/main.h
@@ -212,10 +212,10 @@ void UnregisterNodeSignals(CNodeSignals& nodeSignals);
  * @param[in]   pfrom   The node which we are receiving the block from; it is added to mapBlockSource and may be penalised if the block is invalid.
  * @param[in]   pblock  The block we want to process.
  * @param[in]   fForceProcessing Process this block even if unrequested; used for non-network block sources and whitelisted peers.
- * @param[out]  dbp     If pblock is stored to disk (or already there), this will be set to its location.
+ * @param[out]  dbp     The already known disk position of pblock, or NULL if not yet stored.
  * @return True if state.IsValid()
  */
-bool ProcessNewBlock(CValidationState& state, const CChainParams& chainparams, const CNode* pfrom, const CBlock* pblock, bool fForceProcessing, CDiskBlockPos* dbp);
+bool ProcessNewBlock(CValidationState& state, const CChainParams& chainparams, const CNode* pfrom, const CBlock* pblock, bool fForceProcessing, const CDiskBlockPos* dbp);
 /** Check whether enough disk space is available for an incoming block */
 bool CheckDiskSpace(uint64_t nAdditionalBytes = 0);
 /** Open a block file (blk?????.dat) */

From 316623f2c197971db9b5bcb9c84e446254b552c3 Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Wed, 20 Apr 2016 15:45:41 +0200
Subject: [PATCH 0326/1802] Switch reindexing to AcceptBlock in-loop and
 ActivateBestChain afterwards

---
 src/init.cpp | 20 ++++++++++----------
 src/main.cpp | 13 ++++++++-----
 2 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/src/init.cpp b/src/init.cpp
index d19ca530b3831..beb848ddb0eff 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -404,7 +404,7 @@ std::string HelpMessage(HelpMessageMode mode)
         strUsage += HelpMessageOpt("-limitdescendantcount=<n>", strprintf("Do not accept transactions if any ancestor would have <n> or more in-mempool descendants (default: %u)", DEFAULT_DESCENDANT_LIMIT));
         strUsage += HelpMessageOpt("-limitdescendantsize=<n>", strprintf("Do not accept transactions if any ancestor would have more than <n> kilobytes of in-mempool descendants (default: %u).", DEFAULT_DESCENDANT_SIZE_LIMIT));
     }
-    string debugCategories = "addrman, alert, bench, coindb, db, lock, rand, rpc, selectcoins, mempool, mempoolrej, net, proxy, prune, http, libevent, tor, zmq"; // Don't translate these and qt below
+    string debugCategories = "addrman, alert, bench, coindb, db, http, libevent, lock, mempool, mempoolrej, net, proxy, prune, rand, reindex, rpc, selectcoins, tor, zmq"; // Don't translate these and qt below
     if (mode == HMM_BITCOIN_QT)
         debugCategories += ", qt";
     strUsage += HelpMessageOpt("-debug=<category>", strprintf(_("Output debugging information (default: %u, supplying <category> is optional)"), 0) + ". " +
@@ -554,9 +554,10 @@ void ThreadImport(std::vector<boost::filesystem::path> vImportFiles)
 {
     const CChainParams& chainparams = Params();
     RenameThread("bitcoin-loadblk");
+    CImportingNow imp;
+
     // -reindex
     if (fReindex) {
-        CImportingNow imp;
         int nFile = 0;
         while (true) {
             CDiskBlockPos pos(nFile, 0);
@@ -581,7 +582,6 @@ void ThreadImport(std::vector<boost::filesystem::path> vImportFiles)
     if (boost::filesystem::exists(pathBootstrap)) {
         FILE *file = fopen(pathBootstrap.string().c_str(), "rb");
         if (file) {
-            CImportingNow imp;
             boost::filesystem::path pathBootstrapOld = GetDataDir() / "bootstrap.dat.old";
             LogPrintf("Importing bootstrap.dat...\n");
             LoadExternalBlockFile(chainparams, file);
@@ -595,7 +595,6 @@ void ThreadImport(std::vector<boost::filesystem::path> vImportFiles)
     BOOST_FOREACH(const boost::filesystem::path& path, vImportFiles) {
         FILE *file = fopen(path.string().c_str(), "rb");
         if (file) {
-            CImportingNow imp;
             LogPrintf("Importing blocks file %s...\n", path.string());
             LoadExternalBlockFile(chainparams, file);
         } else {
@@ -603,6 +602,13 @@ void ThreadImport(std::vector<boost::filesystem::path> vImportFiles)
         }
     }
 
+    // scan for better chains in the block chain database, that are not yet connected in the active best chain
+    CValidationState state;
+    if (!ActivateBestChain(state, chainparams)) {
+        LogPrintf("Failed to connect best block");
+        StartShutdown();
+    }
+
     if (GetBoolArg("-stopafterblockimport", DEFAULT_STOPAFTERBLOCKIMPORT)) {
         LogPrintf("Stopping after block import\n");
         StartShutdown();
@@ -1358,12 +1364,6 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
     if (mapArgs.count("-blocknotify"))
         uiInterface.NotifyBlockTip.connect(BlockNotifyCallback);
 
-    uiInterface.InitMessage(_("Activating best chain..."));
-    // scan for better chains in the block chain database, that are not yet connected in the active best chain
-    CValidationState state;
-    if (!ActivateBestChain(state, chainparams))
-        strErrors << "Failed to connect best block";
-
     std::vector<boost::filesystem::path> vImportFiles;
     if (mapArgs.count("-loadblock"))
     {
diff --git a/src/main.cpp b/src/main.cpp
index 981d987711731..42733ee2de2ca 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -3402,7 +3402,8 @@ static bool AcceptBlock(const CBlock& block, CValidationState& state, const CCha
 {
     AssertLockHeld(cs_main);
 
-    CBlockIndex *&pindex = *ppindex;
+    CBlockIndex *pindexDummy = NULL;
+    CBlockIndex *&pindex = ppindex ? *ppindex : pindexDummy;
 
     if (!AcceptBlockHeader(block, state, chainparams, &pindex))
         return false;
@@ -4037,13 +4038,14 @@ bool LoadExternalBlockFile(const CChainParams& chainparams, FILE* fileIn, CDiskB
 
                 // process in case the block isn't known yet
                 if (mapBlockIndex.count(hash) == 0 || (mapBlockIndex[hash]->nStatus & BLOCK_HAVE_DATA) == 0) {
+                    LOCK(cs_main);
                     CValidationState state;
-                    if (ProcessNewBlock(state, chainparams, NULL, &block, true, dbp))
+                    if (AcceptBlock(block, state, chainparams, NULL, true, dbp))
                         nLoaded++;
                     if (state.IsError())
                         break;
                 } else if (hash != chainparams.GetConsensus().hashGenesisBlock && mapBlockIndex[hash]->nHeight % 1000 == 0) {
-                    LogPrintf("Block Import: already had block %s at height %d\n", hash.ToString(), mapBlockIndex[hash]->nHeight);
+                    LogPrint("reindex", "Block Import: already had block %s at height %d\n", hash.ToString(), mapBlockIndex[hash]->nHeight);
                 }
 
                 // Recursively process earlier encountered successors of this block
@@ -4057,10 +4059,11 @@ bool LoadExternalBlockFile(const CChainParams& chainparams, FILE* fileIn, CDiskB
                         std::multimap<uint256, CDiskBlockPos>::iterator it = range.first;
                         if (ReadBlockFromDisk(block, it->second, chainparams.GetConsensus()))
                         {
-                            LogPrintf("%s: Processing out of order child %s of %s\n", __func__, block.GetHash().ToString(),
+                            LogPrint("reindex", "%s: Processing out of order child %s of %s\n", __func__, block.GetHash().ToString(),
                                     head.ToString());
+                            LOCK(cs_main);
                             CValidationState dummy;
-                            if (ProcessNewBlock(dummy, chainparams, NULL, &block, true, &it->second))
+                            if (AcceptBlock(block, dummy, chainparams, NULL, true, &it->second))
                             {
                                 nLoaded++;
                                 queue.push_back(block.GetHash());

From fb8fad1586ced69fa37c665a11916ae4c4d0df05 Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Wed, 20 Apr 2016 16:02:19 +0200
Subject: [PATCH 0327/1802] Optimize ActivateBestChain for long chains

---
 src/main.cpp | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index 42733ee2de2ca..38851cda3e21d 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -2811,10 +2811,9 @@ static void PruneBlockIndexCandidates() {
  * Try to make some progress towards making pindexMostWork the active block.
  * pblock is either NULL or a pointer to a CBlock corresponding to pindexMostWork.
  */
-static bool ActivateBestChainStep(CValidationState& state, const CChainParams& chainparams, CBlockIndex* pindexMostWork, const CBlock* pblock)
+static bool ActivateBestChainStep(CValidationState& state, const CChainParams& chainparams, CBlockIndex* pindexMostWork, const CBlock* pblock, bool& fInvalidFound)
 {
     AssertLockHeld(cs_main);
-    bool fInvalidFound = false;
     const CBlockIndex *pindexOldTip = chainActive.Tip();
     const CBlockIndex *pindexFork = chainActive.FindFork(pindexMostWork);
 
@@ -2902,15 +2901,22 @@ bool ActivateBestChain(CValidationState &state, const CChainParams& chainparams,
         {
             LOCK(cs_main);
             CBlockIndex *pindexOldTip = chainActive.Tip();
-            pindexMostWork = FindMostWorkChain();
+            if (pindexMostWork == NULL) {
+                pindexMostWork = FindMostWorkChain();
+            }
 
             // Whether we have anything to do at all.
             if (pindexMostWork == NULL || pindexMostWork == chainActive.Tip())
                 return true;
 
-            if (!ActivateBestChainStep(state, chainparams, pindexMostWork, pblock && pblock->GetHash() == pindexMostWork->GetBlockHash() ? pblock : NULL))
+            bool fInvalidFound = false;
+            if (!ActivateBestChainStep(state, chainparams, pindexMostWork, pblock && pblock->GetHash() == pindexMostWork->GetBlockHash() ? pblock : NULL, fInvalidFound))
                 return false;
 
+            if (fInvalidFound) {
+                // Wipe cache, we may need another branch now.
+                pindexMostWork = NULL;
+            }
             pindexNewTip = chainActive.Tip();
             pindexFork = chainActive.FindFork(pindexOldTip);
             fInitialDownload = IsInitialBlockDownload();

From d3d75479115bc3480f163df774ee9dd2f8bd9f54 Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Thu, 21 Apr 2016 14:14:37 +0200
Subject: [PATCH 0328/1802] Add -reindex-chainstate that does not rebuild block
 index

---
 qa/rpc-tests/reindex.py | 15 +++++++++++----
 src/init.cpp            |  8 +++++---
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/qa/rpc-tests/reindex.py b/qa/rpc-tests/reindex.py
index 39564b32bad90..cb5e413fd6a94 100755
--- a/qa/rpc-tests/reindex.py
+++ b/qa/rpc-tests/reindex.py
@@ -4,7 +4,7 @@
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #
-# Test -reindex with CheckBlockIndex
+# Test -reindex and -reindex-chainstate with CheckBlockIndex
 #
 from test_framework.test_framework import BitcoinTestFramework
 from test_framework.util import *
@@ -20,13 +20,20 @@ def setup_network(self):
         self.is_network_split = False
         self.nodes.append(start_node(0, self.options.tmpdir))
 
-    def run_test(self):
+    def reindex(self, justchainstate=False):
         self.nodes[0].generate(3)
+        blockcount = self.nodes[0].getblockcount()
         stop_node(self.nodes[0], 0)
         wait_bitcoinds()
-        self.nodes[0]=start_node(0, self.options.tmpdir, ["-debug", "-reindex", "-checkblockindex=1"])
-        assert_equal(self.nodes[0].getblockcount(), 3)
+        self.nodes[0]=start_node(0, self.options.tmpdir, ["-debug", "-reindex-chainstate" if justchainstate else "-reindex", "-checkblockindex=1"])
+        assert_equal(self.nodes[0].getblockcount(), blockcount)
         print("Success")
 
+    def run_test(self):
+        self.reindex(False)
+        self.reindex(True)
+        self.reindex(False)
+        self.reindex(True)
+
 if __name__ == '__main__':
     ReindexTest().main()
diff --git a/src/init.cpp b/src/init.cpp
index beb848ddb0eff..8688381ecff35 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -327,7 +327,8 @@ std::string HelpMessage(HelpMessageMode mode)
     strUsage += HelpMessageOpt("-prune=<n>", strprintf(_("Reduce storage requirements by pruning (deleting) old blocks. This mode is incompatible with -txindex and -rescan. "
             "Warning: Reverting this setting requires re-downloading the entire blockchain. "
             "(default: 0 = disable pruning blocks, >%u = target size in MiB to use for block files)"), MIN_DISK_SPACE_FOR_BLOCK_FILES / 1024 / 1024));
-    strUsage += HelpMessageOpt("-reindex", _("Rebuild block chain index from current blk000??.dat files on startup"));
+    strUsage += HelpMessageOpt("-reindex-chainstate", _("Rebuild chain state from the currently indexed blocks"));
+    strUsage += HelpMessageOpt("-reindex", _("Rebuild chain state and block index from the blk*.dat files on disk"));
 #ifndef WIN32
     strUsage += HelpMessageOpt("-sysperms", _("Create new files with system default permissions, instead of umask 077 (only effective with disabled wallet functionality)"));
 #endif
@@ -1164,6 +1165,7 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
     // ********************************************************* Step 7: load block chain
 
     fReindex = GetBoolArg("-reindex", false);
+    bool fReindexChainState = GetBoolArg("-reindex-chainstate", false);
 
     // Upgrading to 0.8; hard-link the old blknnnn.dat files into /blocks/
     boost::filesystem::path blocksDir = GetDataDir() / "blocks";
@@ -1225,7 +1227,7 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
                 delete pblocktree;
 
                 pblocktree = new CBlockTreeDB(nBlockTreeDBCache, false, fReindex);
-                pcoinsdbview = new CCoinsViewDB(nCoinDBCache, false, fReindex);
+                pcoinsdbview = new CCoinsViewDB(nCoinDBCache, false, fReindex || fReindexChainState);
                 pcoinscatcher = new CCoinsViewErrorCatcher(pcoinsdbview);
                 pcoinsTip = new CCoinsViewCache(pcoinscatcher);
 
@@ -1254,7 +1256,7 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
 
                 // Check for changed -txindex state
                 if (fTxIndex != GetBoolArg("-txindex", DEFAULT_TXINDEX)) {
-                    strLoadError = _("You need to rebuild the database using -reindex to change -txindex");
+                    strLoadError = _("You need to rebuild the database using -reindex-chainstate to change -txindex");
                     break;
                 }
 

From b4d24e142e25a21c78ab74146c3520f2259fd7c2 Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Thu, 28 Apr 2016 16:18:45 +0200
Subject: [PATCH 0329/1802] Report reindexing progress in GUI

---
 qa/rpc-tests/reindex.py    |  3 +++
 src/main.cpp               | 39 ++++++++++++++++++++++++++++++++++++++
 src/qt/bitcoingui.cpp      | 18 ++++++++++++++----
 src/qt/bitcoingui.h        |  2 +-
 src/qt/clientmodel.cpp     | 18 ++++++++++++------
 src/qt/clientmodel.h       |  2 +-
 src/qt/rpcconsole.cpp      | 12 +++++++-----
 src/qt/rpcconsole.h        |  2 +-
 src/qt/sendcoinsdialog.cpp |  2 +-
 src/ui_interface.h         |  3 +++
 10 files changed, 82 insertions(+), 19 deletions(-)

diff --git a/qa/rpc-tests/reindex.py b/qa/rpc-tests/reindex.py
index cb5e413fd6a94..a3f4d6ea01573 100755
--- a/qa/rpc-tests/reindex.py
+++ b/qa/rpc-tests/reindex.py
@@ -8,6 +8,7 @@
 #
 from test_framework.test_framework import BitcoinTestFramework
 from test_framework.util import *
+import time
 
 class ReindexTest(BitcoinTestFramework):
 
@@ -26,6 +27,8 @@ def reindex(self, justchainstate=False):
         stop_node(self.nodes[0], 0)
         wait_bitcoinds()
         self.nodes[0]=start_node(0, self.options.tmpdir, ["-debug", "-reindex-chainstate" if justchainstate else "-reindex", "-checkblockindex=1"])
+        while self.nodes[0].getblockcount() < blockcount:
+            time.sleep(0.1)
         assert_equal(self.nodes[0].getblockcount(), blockcount)
         print("Success")
 
diff --git a/src/main.cpp b/src/main.cpp
index 38851cda3e21d..66930b3b067b4 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -2883,6 +2883,28 @@ static bool ActivateBestChainStep(CValidationState& state, const CChainParams& c
     return true;
 }
 
+static void NotifyHeaderTip() {
+    bool fNotify = false;
+    bool fInitialBlockDownload = false;
+    static CBlockIndex* pindexHeaderOld = NULL;
+    CBlockIndex* pindexHeader = NULL;
+    {
+        LOCK(cs_main);
+        if (!setBlockIndexCandidates.empty()) {
+            pindexHeader = *setBlockIndexCandidates.rbegin();
+        }
+        if (pindexHeader != pindexHeaderOld) {
+            fNotify = true;
+            fInitialBlockDownload = IsInitialBlockDownload();
+            pindexHeaderOld = pindexHeader;
+        }
+    }
+    // Send block tip changed notifications without cs_main
+    if (fNotify) {
+        uiInterface.NotifyHeaderTip(fInitialBlockDownload, pindexHeader);
+    }
+}
+
 /**
  * Make the best chain active, in multiple steps. The result is either failure
  * or an activated best chain. pblock is either NULL or a pointer to a block
@@ -3499,6 +3521,8 @@ bool ProcessNewBlock(CValidationState& state, const CChainParams& chainparams, c
             return error("%s: AcceptBlock FAILED", __func__);
     }
 
+    NotifyHeaderTip();
+
     if (!ActivateBestChain(state, chainparams, pblock))
         return error("%s: ActivateBestChain failed", __func__);
 
@@ -4054,6 +4078,16 @@ bool LoadExternalBlockFile(const CChainParams& chainparams, FILE* fileIn, CDiskB
                     LogPrint("reindex", "Block Import: already had block %s at height %d\n", hash.ToString(), mapBlockIndex[hash]->nHeight);
                 }
 
+                // Activate the genesis block so normal node progress can continue
+                if (hash == chainparams.GetConsensus().hashGenesisBlock) {
+                    CValidationState state;
+                    if (!ActivateBestChain(state, chainparams)) {
+                        break;
+                    }
+                }
+
+                NotifyHeaderTip();
+
                 // Recursively process earlier encountered successors of this block
                 deque<uint256> queue;
                 queue.push_back(hash);
@@ -4077,6 +4111,7 @@ bool LoadExternalBlockFile(const CChainParams& chainparams, FILE* fileIn, CDiskB
                         }
                         range.first++;
                         mapBlocksUnknownParent.erase(it);
+                        NotifyHeaderTip();
                     }
                 }
             } catch (const std::exception& e) {
@@ -5088,6 +5123,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
             ReadCompactSize(vRecv); // ignore tx count; assume it is 0.
         }
 
+        {
         LOCK(cs_main);
 
         if (nCount == 0) {
@@ -5171,6 +5207,9 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
         }
 
         CheckBlockIndex(chainparams.GetConsensus());
+        }
+
+        NotifyHeaderTip();
     }
 
     else if (strCommand == NetMsgType::BLOCK && !fImporting && !fReindex) // Ignore blocks received while importing
diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp
index 99844863640f4..4998848e9fb98 100644
--- a/src/qt/bitcoingui.cpp
+++ b/src/qt/bitcoingui.cpp
@@ -457,8 +457,8 @@ void BitcoinGUI::setClientModel(ClientModel *clientModel)
         setNumConnections(clientModel->getNumConnections());
         connect(clientModel, SIGNAL(numConnectionsChanged(int)), this, SLOT(setNumConnections(int)));
 
-        setNumBlocks(clientModel->getNumBlocks(), clientModel->getLastBlockDate(), clientModel->getVerificationProgress(NULL));
-        connect(clientModel, SIGNAL(numBlocksChanged(int,QDateTime,double)), this, SLOT(setNumBlocks(int,QDateTime,double)));
+        setNumBlocks(clientModel->getNumBlocks(), clientModel->getLastBlockDate(), clientModel->getVerificationProgress(NULL), false);
+        connect(clientModel, SIGNAL(numBlocksChanged(int,QDateTime,double,bool)), this, SLOT(setNumBlocks(int,QDateTime,double,bool)));
 
         // Receive and report messages from client model
         connect(clientModel, SIGNAL(message(QString,QString,unsigned int)), this, SLOT(message(QString,QString,unsigned int)));
@@ -696,7 +696,7 @@ void BitcoinGUI::setNumConnections(int count)
     labelConnectionsIcon->setToolTip(tr("%n active connection(s) to Bitcoin network", "", count));
 }
 
-void BitcoinGUI::setNumBlocks(int count, const QDateTime& blockDate, double nVerificationProgress)
+void BitcoinGUI::setNumBlocks(int count, const QDateTime& blockDate, double nVerificationProgress, bool header)
 {
     if(!clientModel)
         return;
@@ -708,15 +708,25 @@ void BitcoinGUI::setNumBlocks(int count, const QDateTime& blockDate, double nVer
     enum BlockSource blockSource = clientModel->getBlockSource();
     switch (blockSource) {
         case BLOCK_SOURCE_NETWORK:
+            if (header) {
+                return;
+            }
             progressBarLabel->setText(tr("Synchronizing with network..."));
             break;
         case BLOCK_SOURCE_DISK:
-            progressBarLabel->setText(tr("Importing blocks from disk..."));
+            if (header) {
+                progressBarLabel->setText(tr("Indexing blocks on disk..."));
+            } else {
+                progressBarLabel->setText(tr("Processing blocks on disk..."));
+            }
             break;
         case BLOCK_SOURCE_REINDEX:
             progressBarLabel->setText(tr("Reindexing blocks on disk..."));
             break;
         case BLOCK_SOURCE_NONE:
+            if (header) {
+                return;
+            }
             // Case: not Importing, not Reindexing and no network connection
             progressBarLabel->setText(tr("No block source available..."));
             break;
diff --git a/src/qt/bitcoingui.h b/src/qt/bitcoingui.h
index 27ef11c75c079..33639ed5a2d4b 100644
--- a/src/qt/bitcoingui.h
+++ b/src/qt/bitcoingui.h
@@ -150,7 +150,7 @@ public Q_SLOTS:
     /** Set number of connections shown in the UI */
     void setNumConnections(int count);
     /** Set number of blocks and last block date shown in the UI */
-    void setNumBlocks(int count, const QDateTime& blockDate, double nVerificationProgress);
+    void setNumBlocks(int count, const QDateTime& blockDate, double nVerificationProgress, bool headers);
 
     /** Notify the user of an event from the core network or transaction handling code.
        @param[in] title     the message box / notification title
diff --git a/src/qt/clientmodel.cpp b/src/qt/clientmodel.cpp
index 697736cc880bb..108500654b2da 100644
--- a/src/qt/clientmodel.cpp
+++ b/src/qt/clientmodel.cpp
@@ -24,6 +24,7 @@
 class CBlockIndex;
 
 static const int64_t nClientStartupTime = GetTime();
+static int64_t nLastHeaderTipUpdateNotification = 0;
 static int64_t nLastBlockTipUpdateNotification = 0;
 
 ClientModel::ClientModel(OptionsModel *optionsModel, QObject *parent) :
@@ -226,7 +227,7 @@ static void BannedListChanged(ClientModel *clientmodel)
     QMetaObject::invokeMethod(clientmodel, "updateBanlist", Qt::QueuedConnection);
 }
 
-static void BlockTipChanged(ClientModel *clientmodel, bool initialSync, const CBlockIndex *pIndex)
+static void BlockTipChanged(ClientModel *clientmodel, bool initialSync, const CBlockIndex *pIndex, bool fHeader)
 {
     // lock free async UI updates in case we have a new block tip
     // during initial sync, only update the UI if the last update
@@ -235,14 +236,17 @@ static void BlockTipChanged(ClientModel *clientmodel, bool initialSync, const CB
     if (initialSync)
         now = GetTimeMillis();
 
+    int64_t& nLastUpdateNotification = fHeader ? nLastHeaderTipUpdateNotification : nLastBlockTipUpdateNotification;
+
     // if we are in-sync, update the UI regardless of last update time
-    if (!initialSync || now - nLastBlockTipUpdateNotification > MODEL_UPDATE_DELAY) {
+    if (!initialSync || now - nLastUpdateNotification > MODEL_UPDATE_DELAY) {
         //pass a async signal to the UI thread
         QMetaObject::invokeMethod(clientmodel, "numBlocksChanged", Qt::QueuedConnection,
                                   Q_ARG(int, pIndex->nHeight),
                                   Q_ARG(QDateTime, QDateTime::fromTime_t(pIndex->GetBlockTime())),
-                                  Q_ARG(double, clientmodel->getVerificationProgress(pIndex)));
-        nLastBlockTipUpdateNotification = now;
+                                  Q_ARG(double, clientmodel->getVerificationProgress(pIndex)),
+                                  Q_ARG(bool, fHeader));
+        nLastUpdateNotification = now;
     }
 }
 
@@ -253,7 +257,8 @@ void ClientModel::subscribeToCoreSignals()
     uiInterface.NotifyNumConnectionsChanged.connect(boost::bind(NotifyNumConnectionsChanged, this, _1));
     uiInterface.NotifyAlertChanged.connect(boost::bind(NotifyAlertChanged, this));
     uiInterface.BannedListChanged.connect(boost::bind(BannedListChanged, this));
-    uiInterface.NotifyBlockTip.connect(boost::bind(BlockTipChanged, this, _1, _2));
+    uiInterface.NotifyBlockTip.connect(boost::bind(BlockTipChanged, this, _1, _2, false));
+    uiInterface.NotifyHeaderTip.connect(boost::bind(BlockTipChanged, this, _1, _2, true));
 }
 
 void ClientModel::unsubscribeFromCoreSignals()
@@ -263,5 +268,6 @@ void ClientModel::unsubscribeFromCoreSignals()
     uiInterface.NotifyNumConnectionsChanged.disconnect(boost::bind(NotifyNumConnectionsChanged, this, _1));
     uiInterface.NotifyAlertChanged.disconnect(boost::bind(NotifyAlertChanged, this));
     uiInterface.BannedListChanged.disconnect(boost::bind(BannedListChanged, this));
-    uiInterface.NotifyBlockTip.disconnect(boost::bind(BlockTipChanged, this, _1, _2));
+    uiInterface.NotifyBlockTip.disconnect(boost::bind(BlockTipChanged, this, _1, _2, false));
+    uiInterface.NotifyHeaderTip.disconnect(boost::bind(BlockTipChanged, this, _1, _2, true));
 }
diff --git a/src/qt/clientmodel.h b/src/qt/clientmodel.h
index 109f95a2a7112..439680431963e 100644
--- a/src/qt/clientmodel.h
+++ b/src/qt/clientmodel.h
@@ -89,7 +89,7 @@ class ClientModel : public QObject
 
 Q_SIGNALS:
     void numConnectionsChanged(int count);
-    void numBlocksChanged(int count, const QDateTime& blockDate, double nVerificationProgress);
+    void numBlocksChanged(int count, const QDateTime& blockDate, double nVerificationProgress, bool header);
     void mempoolSizeChanged(long count, size_t mempoolSizeInBytes);
     void alertsChanged(const QString &warnings);
     void bytesChanged(quint64 totalBytesIn, quint64 totalBytesOut);
diff --git a/src/qt/rpcconsole.cpp b/src/qt/rpcconsole.cpp
index d8647d902a0e7..fd627eb4afc38 100644
--- a/src/qt/rpcconsole.cpp
+++ b/src/qt/rpcconsole.cpp
@@ -353,8 +353,8 @@ void RPCConsole::setClientModel(ClientModel *model)
         setNumConnections(model->getNumConnections());
         connect(model, SIGNAL(numConnectionsChanged(int)), this, SLOT(setNumConnections(int)));
 
-        setNumBlocks(model->getNumBlocks(), model->getLastBlockDate(), model->getVerificationProgress(NULL));
-        connect(model, SIGNAL(numBlocksChanged(int,QDateTime,double)), this, SLOT(setNumBlocks(int,QDateTime,double)));
+        setNumBlocks(model->getNumBlocks(), model->getLastBlockDate(), model->getVerificationProgress(NULL), false);
+        connect(model, SIGNAL(numBlocksChanged(int,QDateTime,double,bool)), this, SLOT(setNumBlocks(int,QDateTime,double,bool)));
 
         updateTrafficStats(model->getTotalBytesRecv(), model->getTotalBytesSent());
         connect(model, SIGNAL(bytesChanged(quint64,quint64)), this, SLOT(updateTrafficStats(quint64, quint64)));
@@ -585,10 +585,12 @@ void RPCConsole::setNumConnections(int count)
     ui->numberOfConnections->setText(connections);
 }
 
-void RPCConsole::setNumBlocks(int count, const QDateTime& blockDate, double nVerificationProgress)
+void RPCConsole::setNumBlocks(int count, const QDateTime& blockDate, double nVerificationProgress, bool headers)
 {
-    ui->numberOfBlocks->setText(QString::number(count));
-    ui->lastBlockTime->setText(blockDate.toString());
+    if (!headers) {
+        ui->numberOfBlocks->setText(QString::number(count));
+        ui->lastBlockTime->setText(blockDate.toString());
+    }
 }
 
 void RPCConsole::setMempoolSize(long numberOfTxs, size_t dynUsage)
diff --git a/src/qt/rpcconsole.h b/src/qt/rpcconsole.h
index 2923587bc82c5..28affa954dca2 100644
--- a/src/qt/rpcconsole.h
+++ b/src/qt/rpcconsole.h
@@ -87,7 +87,7 @@ public Q_SLOTS:
     /** Set number of connections shown in the UI */
     void setNumConnections(int count);
     /** Set number of blocks and last block date shown in the UI */
-    void setNumBlocks(int count, const QDateTime& blockDate, double nVerificationProgress);
+    void setNumBlocks(int count, const QDateTime& blockDate, double nVerificationProgress, bool headers);
     /** Set size (number of transactions and memory usage) of the mempool in the UI */
     void setMempoolSize(long numberOfTxs, size_t dynUsage);
     /** Go forward or back in history */
diff --git a/src/qt/sendcoinsdialog.cpp b/src/qt/sendcoinsdialog.cpp
index 54ebd25833827..6d50be56ecba7 100644
--- a/src/qt/sendcoinsdialog.cpp
+++ b/src/qt/sendcoinsdialog.cpp
@@ -124,7 +124,7 @@ void SendCoinsDialog::setClientModel(ClientModel *clientModel)
     this->clientModel = clientModel;
 
     if (clientModel) {
-        connect(clientModel, SIGNAL(numBlocksChanged(int,QDateTime,double)), this, SLOT(updateSmartFeeLabel()));
+        connect(clientModel, SIGNAL(numBlocksChanged(int,QDateTime,double,bool)), this, SLOT(updateSmartFeeLabel()));
     }
 }
 
diff --git a/src/ui_interface.h b/src/ui_interface.h
index a27918c50766d..7ebfc17e5dd52 100644
--- a/src/ui_interface.h
+++ b/src/ui_interface.h
@@ -96,6 +96,9 @@ class CClientUIInterface
     /** New block has been accepted */
     boost::signals2::signal<void (bool, const CBlockIndex *)> NotifyBlockTip;
 
+    /** Best header has changed */
+    boost::signals2::signal<void (bool, const CBlockIndex *)> NotifyHeaderTip;
+
     /** Banlist did change. */
     boost::signals2::signal<void (void)> BannedListChanged;
 };

From ecb9741ec3067f67f595126869d0200c62064bbd Mon Sep 17 00:00:00 2001
From: Patrick Strateman <patrick.strateman@gmail.com>
Date: Mon, 16 May 2016 17:11:24 -0700
Subject: [PATCH 0330/1802] Move GetAccountBalance from rpcwallet.cpp into
 CWallet::GetAccountBalance

---
 src/wallet/rpcwallet.cpp | 38 +++-----------------------------------
 src/wallet/wallet.cpp    | 31 +++++++++++++++++++++++++++++++
 src/wallet/wallet.h      |  2 ++
 3 files changed, 36 insertions(+), 35 deletions(-)

diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index 623037e76648b..8bd1279b7f5ab 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -673,38 +673,6 @@ UniValue getreceivedbyaccount(const UniValue& params, bool fHelp)
 }
 
 
-CAmount GetAccountBalance(CWalletDB& walletdb, const string& strAccount, int nMinDepth, const isminefilter& filter)
-{
-    CAmount nBalance = 0;
-
-    // Tally wallet transactions
-    for (map<uint256, CWalletTx>::iterator it = pwalletMain->mapWallet.begin(); it != pwalletMain->mapWallet.end(); ++it)
-    {
-        const CWalletTx& wtx = (*it).second;
-        if (!CheckFinalTx(wtx) || wtx.GetBlocksToMaturity() > 0 || wtx.GetDepthInMainChain() < 0)
-            continue;
-
-        CAmount nReceived, nSent, nFee;
-        wtx.GetAccountAmounts(strAccount, nReceived, nSent, nFee, filter);
-
-        if (nReceived != 0 && wtx.GetDepthInMainChain() >= nMinDepth)
-            nBalance += nReceived;
-        nBalance -= nSent + nFee;
-    }
-
-    // Tally internal accounting entries
-    nBalance += walletdb.GetAccountCreditDebit(strAccount);
-
-    return nBalance;
-}
-
-CAmount GetAccountBalance(const string& strAccount, int nMinDepth, const isminefilter& filter)
-{
-    CWalletDB walletdb(pwalletMain->strWalletFile);
-    return GetAccountBalance(walletdb, strAccount, nMinDepth, filter);
-}
-
-
 UniValue getbalance(const UniValue& params, bool fHelp)
 {
     if (!EnsureWalletIsAvailable(fHelp))
@@ -775,7 +743,7 @@ UniValue getbalance(const UniValue& params, bool fHelp)
 
     string strAccount = AccountFromValue(params[0]);
 
-    CAmount nBalance = GetAccountBalance(strAccount, nMinDepth, filter);
+    CAmount nBalance = pwalletMain->GetAccountBalance(strAccount, nMinDepth, filter);
 
     return ValueFromAmount(nBalance);
 }
@@ -923,7 +891,7 @@ UniValue sendfrom(const UniValue& params, bool fHelp)
     EnsureWalletIsUnlocked();
 
     // Check funds
-    CAmount nBalance = GetAccountBalance(strAccount, nMinDepth, ISMINE_SPENDABLE);
+    CAmount nBalance = pwalletMain->GetAccountBalance(strAccount, nMinDepth, ISMINE_SPENDABLE);
     if (nAmount > nBalance)
         throw JSONRPCError(RPC_WALLET_INSUFFICIENT_FUNDS, "Account has insufficient funds");
 
@@ -1026,7 +994,7 @@ UniValue sendmany(const UniValue& params, bool fHelp)
     EnsureWalletIsUnlocked();
 
     // Check funds
-    CAmount nBalance = GetAccountBalance(strAccount, nMinDepth, ISMINE_SPENDABLE);
+    CAmount nBalance = pwalletMain->GetAccountBalance(strAccount, nMinDepth, ISMINE_SPENDABLE);
     if (totalAmount > nBalance)
         throw JSONRPCError(RPC_WALLET_INSUFFICIENT_FUNDS, "Account has insufficient funds");
 
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index 6b942e29d76c4..4809e3baa6c38 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -2759,6 +2759,37 @@ set< set<CTxDestination> > CWallet::GetAddressGroupings()
     return ret;
 }
 
+CAmount CWallet::GetAccountBalance(const std::string& strAccount, int nMinDepth, const isminefilter& filter)
+{
+    CWalletDB walletdb(strWalletFile);
+    return GetAccountBalance(walletdb, strAccount, nMinDepth, filter);
+}
+
+CAmount CWallet::GetAccountBalance(CWalletDB& walletdb, const std::string& strAccount, int nMinDepth, const isminefilter& filter)
+{
+    CAmount nBalance = 0;
+
+    // Tally wallet transactions
+    for (map<uint256, CWalletTx>::iterator it = mapWallet.begin(); it != mapWallet.end(); ++it)
+    {
+        const CWalletTx& wtx = (*it).second;
+        if (!CheckFinalTx(wtx) || wtx.GetBlocksToMaturity() > 0 || wtx.GetDepthInMainChain() < 0)
+            continue;
+
+        CAmount nReceived, nSent, nFee;
+        wtx.GetAccountAmounts(strAccount, nReceived, nSent, nFee, filter);
+
+        if (nReceived != 0 && wtx.GetDepthInMainChain() >= nMinDepth)
+            nBalance += nReceived;
+        nBalance -= nSent + nFee;
+    }
+
+    // Tally internal accounting entries
+    nBalance += walletdb.GetAccountCreditDebit(strAccount);
+
+    return nBalance;
+}
+
 std::set<CTxDestination> CWallet::GetAccountAddresses(const std::string& strAccount) const
 {
     LOCK(cs_wallet);
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
index cc568c3749b7c..631f2b31ef6d0 100644
--- a/src/wallet/wallet.h
+++ b/src/wallet/wallet.h
@@ -776,6 +776,8 @@ class CWallet : public CCryptoKeyStore, public CValidationInterface
     std::set< std::set<CTxDestination> > GetAddressGroupings();
     std::map<CTxDestination, CAmount> GetAddressBalances();
 
+    CAmount GetAccountBalance(const std::string& strAccount, int nMinDepth, const isminefilter& filter);
+    CAmount GetAccountBalance(CWalletDB& walletdb, const std::string& strAccount, int nMinDepth, const isminefilter& filter);
     std::set<CTxDestination> GetAccountAddresses(const std::string& strAccount) const;
 
     isminetype IsMine(const CTxIn& txin) const;

From 380498aba4f6aebe53a8241f163e3c7fe424b7e0 Mon Sep 17 00:00:00 2001
From: Patrick Strateman <patrick.strateman@gmail.com>
Date: Mon, 16 May 2016 17:31:16 -0700
Subject: [PATCH 0331/1802] Move BackupWallet to CWallet::BackupWallet

---
 src/qt/walletmodel.cpp   |  2 +-
 src/wallet/rpcwallet.cpp |  2 +-
 src/wallet/wallet.cpp    | 40 ++++++++++++++++++++++++++++++++++++++++
 src/wallet/wallet.h      |  2 ++
 src/wallet/walletdb.cpp  | 40 ----------------------------------------
 src/wallet/walletdb.h    |  1 -
 6 files changed, 44 insertions(+), 43 deletions(-)

diff --git a/src/qt/walletmodel.cpp b/src/qt/walletmodel.cpp
index a0d0e70442196..3867310cd6857 100644
--- a/src/qt/walletmodel.cpp
+++ b/src/qt/walletmodel.cpp
@@ -447,7 +447,7 @@ bool WalletModel::changePassphrase(const SecureString &oldPass, const SecureStri
 
 bool WalletModel::backupWallet(const QString &filename)
 {
-    return BackupWallet(*wallet, filename.toLocal8Bit().data());
+    return wallet->BackupWallet(filename.toLocal8Bit().data());
 }
 
 // Handlers for core signals
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index 8bd1279b7f5ab..f11f299141587 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -1804,7 +1804,7 @@ UniValue backupwallet(const UniValue& params, bool fHelp)
     LOCK2(cs_main, pwalletMain->cs_wallet);
 
     string strDest = params[0].get_str();
-    if (!BackupWallet(*pwalletMain, strDest))
+    if (!pwalletMain->BackupWallet(strDest))
         throw JSONRPCError(RPC_WALLET_ERROR, "Error: Wallet backup failed!");
 
     return NullUniValue;
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index 4809e3baa6c38..5d1a431190954 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -3283,6 +3283,46 @@ bool CWallet::ParameterInteraction()
     return true;
 }
 
+bool CWallet::BackupWallet(const std::string& strDest)
+{
+    if (!fFileBacked)
+        return false;
+    while (true)
+    {
+        {
+            LOCK(bitdb.cs_db);
+            if (!bitdb.mapFileUseCount.count(strWalletFile) || bitdb.mapFileUseCount[strWalletFile] == 0)
+            {
+                // Flush log data to the dat file
+                bitdb.CloseDb(strWalletFile);
+                bitdb.CheckpointLSN(strWalletFile);
+                bitdb.mapFileUseCount.erase(strWalletFile);
+
+                // Copy wallet file
+                boost::filesystem::path pathSrc = GetDataDir() / strWalletFile;
+                boost::filesystem::path pathDest(strDest);
+                if (boost::filesystem::is_directory(pathDest))
+                    pathDest /= strWalletFile;
+
+                try {
+#if BOOST_VERSION >= 104000
+                    boost::filesystem::copy_file(pathSrc, pathDest, boost::filesystem::copy_option::overwrite_if_exists);
+#else
+                    boost::filesystem::copy_file(pathSrc, pathDest);
+#endif
+                    LogPrintf("copied %s to %s\n", strWalletFile, pathDest.string());
+                    return true;
+                } catch (const boost::filesystem::filesystem_error& e) {
+                    LogPrintf("error copying %s to %s - %s\n", strWalletFile, pathDest.string(), e.what());
+                    return false;
+                }
+            }
+        }
+        MilliSleep(100);
+    }
+    return false;
+}
+
 CKeyPool::CKeyPool()
 {
     nTime = GetTime();
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
index 631f2b31ef6d0..b2180a5a26bb8 100644
--- a/src/wallet/wallet.h
+++ b/src/wallet/wallet.h
@@ -885,6 +885,8 @@ class CWallet : public CCryptoKeyStore, public CValidationInterface
 
     /* Wallets parameter interaction */
     static bool ParameterInteraction();
+
+    bool BackupWallet(const std::string& strDest);
 };
 
 /** A key allocated from the key pool. */
diff --git a/src/wallet/walletdb.cpp b/src/wallet/walletdb.cpp
index 48579b2821e8e..b5037c9a65abf 100644
--- a/src/wallet/walletdb.cpp
+++ b/src/wallet/walletdb.cpp
@@ -903,46 +903,6 @@ void ThreadFlushWalletDB(const string& strFile)
     }
 }
 
-bool BackupWallet(const CWallet& wallet, const string& strDest)
-{
-    if (!wallet.fFileBacked)
-        return false;
-    while (true)
-    {
-        {
-            LOCK(bitdb.cs_db);
-            if (!bitdb.mapFileUseCount.count(wallet.strWalletFile) || bitdb.mapFileUseCount[wallet.strWalletFile] == 0)
-            {
-                // Flush log data to the dat file
-                bitdb.CloseDb(wallet.strWalletFile);
-                bitdb.CheckpointLSN(wallet.strWalletFile);
-                bitdb.mapFileUseCount.erase(wallet.strWalletFile);
-
-                // Copy wallet file
-                boost::filesystem::path pathSrc = GetDataDir() / wallet.strWalletFile;
-                boost::filesystem::path pathDest(strDest);
-                if (boost::filesystem::is_directory(pathDest))
-                    pathDest /= wallet.strWalletFile;
-
-                try {
-#if BOOST_VERSION >= 104000
-                    boost::filesystem::copy_file(pathSrc, pathDest, boost::filesystem::copy_option::overwrite_if_exists);
-#else
-                    boost::filesystem::copy_file(pathSrc, pathDest);
-#endif
-                    LogPrintf("copied %s to %s\n", wallet.strWalletFile, pathDest.string());
-                    return true;
-                } catch (const boost::filesystem::filesystem_error& e) {
-                    LogPrintf("error copying %s to %s - %s\n", wallet.strWalletFile, pathDest.string(), e.what());
-                    return false;
-                }
-            }
-        }
-        MilliSleep(100);
-    }
-    return false;
-}
-
 //
 // Try to (very carefully!) recover wallet file if there is a problem.
 //
diff --git a/src/wallet/walletdb.h b/src/wallet/walletdb.h
index 5345c0907e9cd..00c10ea70f03b 100644
--- a/src/wallet/walletdb.h
+++ b/src/wallet/walletdb.h
@@ -141,7 +141,6 @@ class CWalletDB : public CDB
     bool WriteAccountingEntry(const uint64_t nAccEntryNum, const CAccountingEntry& acentry);
 };
 
-bool BackupWallet(const CWallet& wallet, const std::string& strDest);
 void ThreadFlushWalletDB(const std::string& strFile);
 
 #endif // BITCOIN_WALLET_WALLETDB_H

From 46b0c3b688dccf6ba9ac08cbd6d6981249a73b1a Mon Sep 17 00:00:00 2001
From: Patrick Strateman <patrick.strateman@gmail.com>
Date: Mon, 16 May 2016 20:33:32 -0700
Subject: [PATCH 0332/1802] Acquire lock to check for genesis block.

---
 src/init.cpp | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/init.cpp b/src/init.cpp
index d19ca530b3831..fd1241d930319 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -1371,10 +1371,18 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
             vImportFiles.push_back(strFile);
     }
     threadGroup.create_thread(boost::bind(&ThreadImport, vImportFiles));
-    if (chainActive.Tip() == NULL) {
-        LogPrintf("Waiting for genesis block to be imported...\n");
-        while (!fRequestShutdown && chainActive.Tip() == NULL)
+
+    // Wait for genesis block to be processed
+    bool fHaveGenesis = false;
+    while (!fHaveGenesis && !fRequestShutdown) {
+        {
+            LOCK(cs_main);
+            fHaveGenesis = (chainActive.Tip() != NULL);
+        }
+
+        if (!fHaveGenesis) {
             MilliSleep(10);
+        }
     }
 
     // ********************************************************* Step 11: start node

From 94fd1d8d53adceb80e5a41cc6438c7704aeac0f7 Mon Sep 17 00:00:00 2001
From: Warren Togami <wtogami@gmail.com>
Date: Tue, 17 May 2016 16:43:23 +0900
Subject: [PATCH 0333/1802] Make Socks5() InterruptibleRecv() timeout/failures
 informative.

Before:
2016-05-16 06:10:45 ERROR: Error reading proxy response

After:
2016-05-16 06:10:45 Socks5() connect to k7s5d6jqig4ej4v4.onion:18333 failed: InterruptibleRecv() timeout or other failure
---
 src/netbase.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/netbase.cpp b/src/netbase.cpp
index 5ab12c9a7c43e..d2a4188ffcb54 100644
--- a/src/netbase.cpp
+++ b/src/netbase.cpp
@@ -318,7 +318,8 @@ static bool Socks5(const std::string& strDest, int port, const ProxyCredentials
     char pchRet1[2];
     if (!InterruptibleRecv(pchRet1, 2, SOCKS5_RECV_TIMEOUT, hSocket)) {
         CloseSocket(hSocket);
-        return error("Error reading proxy response");
+        LogPrintf("Socks5() connect to %s:%d failed: InterruptibleRecv() timeout or other failure\n", strDest, port);
+        return false;
     }
     if (pchRet1[0] != 0x05) {
         CloseSocket(hSocket);

From fad184550e1c507a897be59169f9c5dabce8d652 Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Sun, 3 Apr 2016 20:36:27 +0200
Subject: [PATCH 0334/1802] [qa] test_framework: Use different rpc_auth_pair
 for each node

---
 qa/rpc-tests/test_framework/util.py | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/qa/rpc-tests/test_framework/util.py b/qa/rpc-tests/test_framework/util.py
index 6784177aaac57..d6bb32b18ca7c 100644
--- a/qa/rpc-tests/test_framework/util.py
+++ b/qa/rpc-tests/test_framework/util.py
@@ -150,17 +150,22 @@ def initialize_datadir(dirname, n):
     datadir = os.path.join(dirname, "node"+str(n))
     if not os.path.isdir(datadir):
         os.makedirs(datadir)
+    rpc_u, rpc_p = rpc_auth_pair(n)
     with open(os.path.join(datadir, "bitcoin.conf"), 'w') as f:
         f.write("regtest=1\n")
-        f.write("rpcuser=rt\n")
-        f.write("rpcpassword=rt\n")
+        f.write("rpcuser=" + rpc_u + "\n")
+        f.write("rpcpassword=" + rpc_p + "\n")
         f.write("port="+str(p2p_port(n))+"\n")
         f.write("rpcport="+str(rpc_port(n))+"\n")
         f.write("listenonion=0\n")
     return datadir
 
+def rpc_auth_pair(n):
+    return 'rpcuser💻' + str(n), 'rpcpass🔑' + str(n)
+
 def rpc_url(i, rpchost=None):
-    return "http://rt:rt@%s:%d" % (rpchost or '127.0.0.1', rpc_port(i))
+    rpc_u, rpc_p = rpc_auth_pair(i)
+    return "http://%s:%s@%s:%d" % (rpc_u, rpc_p, rpchost or '127.0.0.1', rpc_port(i))
 
 def wait_for_bitcoind_start(process, url, i):
     '''

From 5ec0cde371149e5be6ca5e9803183021b10928f8 Mon Sep 17 00:00:00 2001
From: Suhas Daftuar <sdaftuar@gmail.com>
Date: Mon, 4 Jan 2016 13:43:17 -0500
Subject: [PATCH 0335/1802] Refactor logic for converting mempool entries to
 JSON

---
 src/rpc/blockchain.cpp | 90 ++++++++++++++++++++++++------------------
 1 file changed, 51 insertions(+), 39 deletions(-)

diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp
index cf3c73c4dfef6..fe628097a920a 100644
--- a/src/rpc/blockchain.cpp
+++ b/src/rpc/blockchain.cpp
@@ -183,6 +183,54 @@ UniValue getdifficulty(const UniValue& params, bool fHelp)
     return GetDifficulty();
 }
 
+std::string EntryDescriptionString()
+{
+    return "    \"size\" : n,             (numeric) transaction size in bytes\n"
+           "    \"fee\" : n,              (numeric) transaction fee in " + CURRENCY_UNIT + "\n"
+           "    \"modifiedfee\" : n,      (numeric) transaction fee with fee deltas used for mining priority\n"
+           "    \"time\" : n,             (numeric) local time transaction entered pool in seconds since 1 Jan 1970 GMT\n"
+           "    \"height\" : n,           (numeric) block height when transaction entered pool\n"
+           "    \"startingpriority\" : n, (numeric) priority when transaction entered pool\n"
+           "    \"currentpriority\" : n,  (numeric) transaction priority now\n"
+           "    \"descendantcount\" : n,  (numeric) number of in-mempool descendant transactions (including this one)\n"
+           "    \"descendantsize\" : n,   (numeric) size of in-mempool descendants (including this one)\n"
+           "    \"descendantfees\" : n,   (numeric) modified fees (see above) of in-mempool descendants (including this one)\n"
+           "    \"depends\" : [           (array) unconfirmed transactions used as inputs for this transaction\n"
+           "        \"transactionid\",    (string) parent transaction id\n"
+           "       ... ]\n";
+}
+
+void entryToJSON(UniValue &info, const CTxMemPoolEntry &e)
+{
+    AssertLockHeld(mempool.cs);
+
+    info.push_back(Pair("size", (int)e.GetTxSize()));
+    info.push_back(Pair("fee", ValueFromAmount(e.GetFee())));
+    info.push_back(Pair("modifiedfee", ValueFromAmount(e.GetModifiedFee())));
+    info.push_back(Pair("time", e.GetTime()));
+    info.push_back(Pair("height", (int)e.GetHeight()));
+    info.push_back(Pair("startingpriority", e.GetPriority(e.GetHeight())));
+    info.push_back(Pair("currentpriority", e.GetPriority(chainActive.Height())));
+    info.push_back(Pair("descendantcount", e.GetCountWithDescendants()));
+    info.push_back(Pair("descendantsize", e.GetSizeWithDescendants()));
+    info.push_back(Pair("descendantfees", e.GetModFeesWithDescendants()));
+    const CTransaction& tx = e.GetTx();
+    set<string> setDepends;
+    BOOST_FOREACH(const CTxIn& txin, tx.vin)
+    {
+        if (mempool.exists(txin.prevout.hash))
+            setDepends.insert(txin.prevout.hash.ToString());
+    }
+
+    UniValue depends(UniValue::VARR);
+    BOOST_FOREACH(const string& dep, setDepends)
+    {
+        depends.push_back(dep);
+    }
+
+    info.push_back(Pair("depends", depends));
+}
+
 UniValue mempoolToJSON(bool fVerbose = false)
 {
     if (fVerbose)
@@ -193,31 +241,7 @@ UniValue mempoolToJSON(bool fVerbose = false)
         {
             const uint256& hash = e.GetTx().GetHash();
             UniValue info(UniValue::VOBJ);
-            info.push_back(Pair("size", (int)e.GetTxSize()));
-            info.push_back(Pair("fee", ValueFromAmount(e.GetFee())));
-            info.push_back(Pair("modifiedfee", ValueFromAmount(e.GetModifiedFee())));
-            info.push_back(Pair("time", e.GetTime()));
-            info.push_back(Pair("height", (int)e.GetHeight()));
-            info.push_back(Pair("startingpriority", e.GetPriority(e.GetHeight())));
-            info.push_back(Pair("currentpriority", e.GetPriority(chainActive.Height())));
-            info.push_back(Pair("descendantcount", e.GetCountWithDescendants()));
-            info.push_back(Pair("descendantsize", e.GetSizeWithDescendants()));
-            info.push_back(Pair("descendantfees", e.GetModFeesWithDescendants()));
-            const CTransaction& tx = e.GetTx();
-            set<string> setDepends;
-            BOOST_FOREACH(const CTxIn& txin, tx.vin)
-            {
-                if (mempool.exists(txin.prevout.hash))
-                    setDepends.insert(txin.prevout.hash.ToString());
-            }
-
-            UniValue depends(UniValue::VARR);
-            BOOST_FOREACH(const string& dep, setDepends)
-            {
-                depends.push_back(dep);
-            }
-
-            info.push_back(Pair("depends", depends));
+            entryToJSON(info, e);
             o.push_back(Pair(hash.ToString(), info));
         }
         return o;
@@ -251,20 +275,8 @@ UniValue getrawmempool(const UniValue& params, bool fHelp)
             "\nResult: (for verbose = true):\n"
             "{                           (json object)\n"
             "  \"transactionid\" : {       (json object)\n"
-            "    \"size\" : n,             (numeric) transaction size in bytes\n"
-            "    \"fee\" : n,              (numeric) transaction fee in " + CURRENCY_UNIT + "\n"
-            "    \"modifiedfee\" : n,      (numeric) transaction fee with fee deltas used for mining priority\n"
-            "    \"time\" : n,             (numeric) local time transaction entered pool in seconds since 1 Jan 1970 GMT\n"
-            "    \"height\" : n,           (numeric) block height when transaction entered pool\n"
-            "    \"startingpriority\" : n, (numeric) priority when transaction entered pool\n"
-            "    \"currentpriority\" : n,  (numeric) transaction priority now\n"
-            "    \"descendantcount\" : n,  (numeric) number of in-mempool descendant transactions (including this one)\n"
-            "    \"descendantsize\" : n,   (numeric) size of in-mempool descendants (including this one)\n"
-            "    \"descendantfees\" : n,   (numeric) modified fees (see above) of in-mempool descendants (including this one)\n"
-            "    \"depends\" : [           (array) unconfirmed transactions used as inputs for this transaction\n"
-            "        \"transactionid\",    (string) parent transaction id\n"
-            "       ... ]\n"
-            "  }, ...\n"
+            + EntryDescriptionString()
+            + "  }, ...\n"
             "}\n"
             "\nExamples\n"
             + HelpExampleCli("getrawmempool", "true")

From 8f7b5dc4afb28e38ce0223339b8ce77aa0a47845 Mon Sep 17 00:00:00 2001
From: Suhas Daftuar <sdaftuar@gmail.com>
Date: Mon, 4 Jan 2016 13:58:59 -0500
Subject: [PATCH 0336/1802] Add getmempoolancestors RPC call

---
 src/rpc/blockchain.cpp | 65 ++++++++++++++++++++++++++++++++++++++++++
 src/rpc/client.cpp     |  1 +
 2 files changed, 66 insertions(+)

diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp
index fe628097a920a..6c005068d86d2 100644
--- a/src/rpc/blockchain.cpp
+++ b/src/rpc/blockchain.cpp
@@ -292,6 +292,70 @@ UniValue getrawmempool(const UniValue& params, bool fHelp)
     return mempoolToJSON(fVerbose);
 }
 
+UniValue getmempoolancestors(const UniValue& params, bool fHelp)
+{
+    if (fHelp || params.size() < 1 || params.size() > 2) {
+        throw runtime_error(
+            "getmempoolancestors txid (verbose)\n"
+            "\nIf txid is in the mempool, returns all in-mempool ancestors.\n"
+            "\nArguments:\n"
+            "1. \"txid\"                   (string, required) The transaction id (must be in mempool)\n"
+            "2. verbose                  (boolean, optional, default=false) true for a json object, false for array of transaction ids\n"
+            "\nResult (for verbose=false):\n"
+            "[                       (json array of string)\n"
+            "  \"transactionid\"           (string) The transaction id of an in-mempool ancestor transaction\n"
+            "  ,...\n"
+            "]\n"
+            "\nResult (for verbose=true):\n"
+            "{                           (json object)\n"
+            "  \"transactionid\" : {       (json object)\n"
+            + EntryDescriptionString()
+            + "  }, ...\n"
+            "}\n"
+            "\nExamples\n"
+            + HelpExampleCli("getmempoolancestors", "\"mytxid\"")
+            + HelpExampleRpc("getmempoolancestors", "\"mytxid\"")
+            );
+    }
+
+    bool fVerbose = false;
+    if (params.size() > 1)
+        fVerbose = params[1].get_bool();
+
+    uint256 hash = ParseHashV(params[0], "parameter 1");
+
+    LOCK(mempool.cs);
+
+    CTxMemPool::txiter it = mempool.mapTx.find(hash);
+    if (it == mempool.mapTx.end()) {
+        throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Transaction not in mempool");
+    }
+
+    CTxMemPool::setEntries setAncestors;
+    uint64_t noLimit = std::numeric_limits<uint64_t>::max();
+    std::string dummy;
+    mempool.CalculateMemPoolAncestors(*it, setAncestors, noLimit, noLimit, noLimit, noLimit, dummy, false);
+
+    if (!fVerbose) {
+        UniValue o(UniValue::VARR);
+        BOOST_FOREACH(CTxMemPool::txiter ancestorIt, setAncestors) {
+            o.push_back(ancestorIt->GetTx().GetHash().ToString());
+        }
+
+        return o;
+    } else {
+        UniValue o(UniValue::VOBJ);
+        BOOST_FOREACH(CTxMemPool::txiter ancestorIt, setAncestors) {
+            const CTxMemPoolEntry &e = *ancestorIt;
+            const uint256& hash = e.GetTx().GetHash();
+            UniValue info(UniValue::VOBJ);
+            entryToJSON(info, e);
+            o.push_back(Pair(hash.ToString(), info));
+        }
+        return o;
+    }
+}
+
 UniValue getblockhash(const UniValue& params, bool fHelp)
 {
     if (fHelp || params.size() != 1)
@@ -1016,6 +1080,7 @@ static const CRPCCommand commands[] =
     { "blockchain",         "getblockheader",         &getblockheader,         true  },
     { "blockchain",         "getchaintips",           &getchaintips,           true  },
     { "blockchain",         "getdifficulty",          &getdifficulty,          true  },
+    { "blockchain",         "getmempoolancestors",    &getmempoolancestors,    true  },
     { "blockchain",         "getmempoolinfo",         &getmempoolinfo,         true  },
     { "blockchain",         "getrawmempool",          &getrawmempool,          true  },
     { "blockchain",         "gettxout",               &gettxout,               true  },
diff --git a/src/rpc/client.cpp b/src/rpc/client.cpp
index c89af6bfa7c52..3dfc27fff78af 100644
--- a/src/rpc/client.cpp
+++ b/src/rpc/client.cpp
@@ -102,6 +102,7 @@ static const CRPCConvertParam vRPCConvertParams[] =
     { "prioritisetransaction", 2 },
     { "setban", 2 },
     { "setban", 3 },
+    { "getmempoolancestors", 1 },
 };
 
 class CRPCConvertTable

From 0b1295b066b9369decb2e664e60b0129dbc30dfb Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Fri, 6 May 2016 20:41:28 +0200
Subject: [PATCH 0337/1802] Add SipHash-2-4 primitives to hash

---
 src/hash.cpp            | 94 +++++++++++++++++++++++++++++++++++++++++
 src/hash.h              | 15 +++++++
 src/test/hash_tests.cpp | 20 +++++++++
 src/uint256.h           | 13 ++++++
 4 files changed, 142 insertions(+)

diff --git a/src/hash.cpp b/src/hash.cpp
index 7f3cf1a1faa74..a518314a5376a 100644
--- a/src/hash.cpp
+++ b/src/hash.cpp
@@ -81,3 +81,97 @@ void BIP32Hash(const ChainCode &chainCode, unsigned int nChild, unsigned char he
     num[3] = (nChild >>  0) & 0xFF;
     CHMAC_SHA512(chainCode.begin(), chainCode.size()).Write(&header, 1).Write(data, 32).Write(num, 4).Finalize(output);
 }
+
+#define ROTL(x, b) (uint64_t)(((x) << (b)) | ((x) >> (64 - (b))))
+
+#define SIPROUND do { \
+    v0 += v1; v1 = ROTL(v1, 13); v1 ^= v0; \
+    v0 = ROTL(v0, 32); \
+    v2 += v3; v3 = ROTL(v3, 16); v3 ^= v2; \
+    v0 += v3; v3 = ROTL(v3, 21); v3 ^= v0; \
+    v2 += v1; v1 = ROTL(v1, 17); v1 ^= v2; \
+    v2 = ROTL(v2, 32); \
+} while (0)
+
+CSipHasher::CSipHasher(uint64_t k0, uint64_t k1)
+{
+    v[0] = 0x736f6d6570736575ULL ^ k0;
+    v[1] = 0x646f72616e646f6dULL ^ k1;
+    v[2] = 0x6c7967656e657261ULL ^ k0;
+    v[3] = 0x7465646279746573ULL ^ k1;
+    count = 0;
+}
+
+CSipHasher& CSipHasher::Write(uint64_t data)
+{
+    uint64_t v0 = v[0], v1 = v[1], v2 = v[2], v3 = v[3];
+
+    v3 ^= data;
+    SIPROUND;
+    SIPROUND;
+    v0 ^= data;
+
+    v[0] = v0;
+    v[1] = v1;
+    v[2] = v2;
+    v[3] = v3;
+
+    count++;
+    return *this;
+}
+
+uint64_t CSipHasher::Finalize() const
+{
+    uint64_t v0 = v[0], v1 = v[1], v2 = v[2], v3 = v[3];
+
+    v3 ^= ((uint64_t)count) << 59;
+    SIPROUND;
+    SIPROUND;
+    v0 ^= ((uint64_t)count) << 59;
+    v2 ^= 0xFF;
+    SIPROUND;
+    SIPROUND;
+    SIPROUND;
+    SIPROUND;
+    return v0 ^ v1 ^ v2 ^ v3;
+}
+
+uint64_t SipHashUint256(uint64_t k0, uint64_t k1, const uint256& val)
+{
+    /* Specialized implementation for efficiency */
+    uint64_t d = val.GetUint64(0);
+
+    uint64_t v0 = 0x736f6d6570736575ULL ^ k0;
+    uint64_t v1 = 0x646f72616e646f6dULL ^ k1;
+    uint64_t v2 = 0x6c7967656e657261ULL ^ k0;
+    uint64_t v3 = 0x7465646279746573ULL ^ k1 ^ d;
+
+    SIPROUND;
+    SIPROUND;
+    v0 ^= d;
+    d = val.GetUint64(1);
+    v3 ^= d;
+    SIPROUND;
+    SIPROUND;
+    v0 ^= d;
+    d = val.GetUint64(2);
+    v3 ^= d;
+    SIPROUND;
+    SIPROUND;
+    v0 ^= d;
+    d = val.GetUint64(3);
+    v3 ^= d;
+    SIPROUND;
+    SIPROUND;
+    v0 ^= d;
+    v3 ^= ((uint64_t)4) << 59;
+    SIPROUND;
+    SIPROUND;
+    v0 ^= ((uint64_t)4) << 59;
+    v2 ^= 0xFF;
+    SIPROUND;
+    SIPROUND;
+    SIPROUND;
+    SIPROUND;
+    return v0 ^ v1 ^ v2 ^ v3;
+}
diff --git a/src/hash.h b/src/hash.h
index 97955c8d5ad6d..600dabec56087 100644
--- a/src/hash.h
+++ b/src/hash.h
@@ -171,4 +171,19 @@ unsigned int MurmurHash3(unsigned int nHashSeed, const std::vector<unsigned char
 
 void BIP32Hash(const ChainCode &chainCode, unsigned int nChild, unsigned char header, const unsigned char data[32], unsigned char output[64]);
 
+/** SipHash-2-4, using a uint64_t-based (rather than byte-based) interface */
+class CSipHasher
+{
+private:
+    uint64_t v[4];
+    int count;
+
+public:
+    CSipHasher(uint64_t k0, uint64_t k1);
+    CSipHasher& Write(uint64_t data);
+    uint64_t Finalize() const;
+};
+
+uint64_t SipHashUint256(uint64_t k0, uint64_t k1, const uint256& val);
+
 #endif // BITCOIN_HASH_H
diff --git a/src/test/hash_tests.cpp b/src/test/hash_tests.cpp
index 35079d1614345..8baaf3645fab5 100644
--- a/src/test/hash_tests.cpp
+++ b/src/test/hash_tests.cpp
@@ -47,4 +47,24 @@ BOOST_AUTO_TEST_CASE(murmurhash3)
 #undef T
 }
 
+BOOST_AUTO_TEST_CASE(siphash)
+{
+    CSipHasher hasher(0x0706050403020100ULL, 0x0F0E0D0C0B0A0908ULL);
+    BOOST_CHECK_EQUAL(hasher.Finalize(),  0x726fdb47dd0e0e31ull);
+    hasher.Write(0x0706050403020100ULL);
+    BOOST_CHECK_EQUAL(hasher.Finalize(),  0x93f5f5799a932462ull);
+    hasher.Write(0x0F0E0D0C0B0A0908ULL);
+    BOOST_CHECK_EQUAL(hasher.Finalize(),  0x3f2acc7f57c29bdbull);
+    hasher.Write(0x1716151413121110ULL);
+    BOOST_CHECK_EQUAL(hasher.Finalize(),  0xb8ad50c6f649af94ull);
+    hasher.Write(0x1F1E1D1C1B1A1918ULL);
+    BOOST_CHECK_EQUAL(hasher.Finalize(),  0x7127512f72f27cceull);
+    hasher.Write(0x2726252423222120ULL);
+    BOOST_CHECK_EQUAL(hasher.Finalize(),  0x0e3ea96b5304a7d0ull);
+    hasher.Write(0x2F2E2D2C2B2A2928ULL);
+    BOOST_CHECK_EQUAL(hasher.Finalize(),  0xe612a3cb9ecba951ull);
+
+    BOOST_CHECK_EQUAL(SipHashUint256(0x0706050403020100ULL, 0x0F0E0D0C0B0A0908ULL, uint256S("1f1e1d1c1b1a191817161514131211100f0e0d0c0b0a09080706050403020100")), 0x7127512f72f27cceull);
+}
+
 BOOST_AUTO_TEST_SUITE_END()
diff --git a/src/uint256.h b/src/uint256.h
index bcdb6dd7c2958..af1f3ab7d99e5 100644
--- a/src/uint256.h
+++ b/src/uint256.h
@@ -83,6 +83,19 @@ class base_blob
         return sizeof(data);
     }
 
+    uint64_t GetUint64(int pos) const
+    {
+        const uint8_t* ptr = data + pos * 8;
+        return ((uint64_t)ptr[0]) | \
+               ((uint64_t)ptr[1]) << 8 | \
+               ((uint64_t)ptr[2]) << 16 | \
+               ((uint64_t)ptr[3]) << 24 | \
+               ((uint64_t)ptr[4]) << 32 | \
+               ((uint64_t)ptr[5]) << 40 | \
+               ((uint64_t)ptr[6]) << 48 | \
+               ((uint64_t)ptr[7]) << 56;
+    }
+
     template<typename Stream>
     void Serialize(Stream& s, int nType, int nVersion) const
     {

From 382c871d28b95cc52309a128edd8dc23822bcd60 Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Fri, 6 May 2016 20:47:12 +0200
Subject: [PATCH 0338/1802] Use SipHash-2-4 for CCoinsCache index

This is ~1.7x slower than the Lookup3-of-Xor-with-salt construct we were
using before, but it is a primitive designed for exactly this.
---
 src/coins.cpp   |  6 ++++-
 src/coins.h     | 14 ++++++-----
 src/uint256.cpp | 64 -------------------------------------------------
 src/uint256.h   |  5 ----
 4 files changed, 13 insertions(+), 76 deletions(-)

diff --git a/src/coins.cpp b/src/coins.cpp
index 1c329740b45f6..b7dd293d69564 100644
--- a/src/coins.cpp
+++ b/src/coins.cpp
@@ -56,7 +56,11 @@ void CCoinsViewBacked::SetBackend(CCoinsView &viewIn) { base = &viewIn; }
 bool CCoinsViewBacked::BatchWrite(CCoinsMap &mapCoins, const uint256 &hashBlock) { return base->BatchWrite(mapCoins, hashBlock); }
 CCoinsViewCursor *CCoinsViewBacked::Cursor() const { return base->Cursor(); }
 
-CCoinsKeyHasher::CCoinsKeyHasher() : salt(GetRandHash()) {}
+SaltedTxidHasher::SaltedTxidHasher()
+{
+    GetRandBytes((unsigned char*)&k0, sizeof(k0));
+    GetRandBytes((unsigned char*)&k1, sizeof(k1));
+}
 
 CCoinsViewCache::CCoinsViewCache(CCoinsView *baseIn) : CCoinsViewBacked(baseIn), hasModifier(false), cachedCoinsUsage(0) { }
 
diff --git a/src/coins.h b/src/coins.h
index d72f8854731eb..1dd908700b12b 100644
--- a/src/coins.h
+++ b/src/coins.h
@@ -8,6 +8,7 @@
 
 #include "compressor.h"
 #include "core_memusage.h"
+#include "hash.h"
 #include "memusage.h"
 #include "serialize.h"
 #include "uint256.h"
@@ -264,21 +265,22 @@ class CCoins
     }
 };
 
-class CCoinsKeyHasher
+class SaltedTxidHasher
 {
 private:
-    uint256 salt;
+    /** Salt */
+    uint64_t k0, k1;
 
 public:
-    CCoinsKeyHasher();
+    SaltedTxidHasher();
 
     /**
      * This *must* return size_t. With Boost 1.46 on 32-bit systems the
      * unordered_map will behave unpredictably if the custom hasher returns a
      * uint64_t, resulting in failures when syncing the chain (#4634).
      */
-    size_t operator()(const uint256& key) const {
-        return key.GetHash(salt);
+    size_t operator()(const uint256& txid) const {
+        return SipHashUint256(k0, k1, txid);
     }
 };
 
@@ -295,7 +297,7 @@ struct CCoinsCacheEntry
     CCoinsCacheEntry() : coins(), flags(0) {}
 };
 
-typedef boost::unordered_map<uint256, CCoinsCacheEntry, CCoinsKeyHasher> CCoinsMap;
+typedef boost::unordered_map<uint256, CCoinsCacheEntry, SaltedTxidHasher> CCoinsMap;
 
 /** Cursor for iterating over CoinsView state */
 class CCoinsViewCursor
diff --git a/src/uint256.cpp b/src/uint256.cpp
index c58c88bf4a8f1..f22ddcd1effce 100644
--- a/src/uint256.cpp
+++ b/src/uint256.cpp
@@ -80,67 +80,3 @@ template std::string base_blob<256>::GetHex() const;
 template std::string base_blob<256>::ToString() const;
 template void base_blob<256>::SetHex(const char*);
 template void base_blob<256>::SetHex(const std::string&);
-
-static void inline HashMix(uint32_t& a, uint32_t& b, uint32_t& c)
-{
-    // Taken from lookup3, by Bob Jenkins.
-    a -= c;
-    a ^= ((c << 4) | (c >> 28));
-    c += b;
-    b -= a;
-    b ^= ((a << 6) | (a >> 26));
-    a += c;
-    c -= b;
-    c ^= ((b << 8) | (b >> 24));
-    b += a;
-    a -= c;
-    a ^= ((c << 16) | (c >> 16));
-    c += b;
-    b -= a;
-    b ^= ((a << 19) | (a >> 13));
-    a += c;
-    c -= b;
-    c ^= ((b << 4) | (b >> 28));
-    b += a;
-}
-
-static void inline HashFinal(uint32_t& a, uint32_t& b, uint32_t& c)
-{
-    // Taken from lookup3, by Bob Jenkins.
-    c ^= b;
-    c -= ((b << 14) | (b >> 18));
-    a ^= c;
-    a -= ((c << 11) | (c >> 21));
-    b ^= a;
-    b -= ((a << 25) | (a >> 7));
-    c ^= b;
-    c -= ((b << 16) | (b >> 16));
-    a ^= c;
-    a -= ((c << 4) | (c >> 28));
-    b ^= a;
-    b -= ((a << 14) | (a >> 18));
-    c ^= b;
-    c -= ((b << 24) | (b >> 8));
-}
-
-uint64_t uint256::GetHash(const uint256& salt) const
-{
-    uint32_t a, b, c;
-    const uint32_t *pn = (const uint32_t*)data;
-    const uint32_t *salt_pn = (const uint32_t*)salt.data;
-    a = b = c = 0xdeadbeef + WIDTH;
-
-    a += pn[0] ^ salt_pn[0];
-    b += pn[1] ^ salt_pn[1];
-    c += pn[2] ^ salt_pn[2];
-    HashMix(a, b, c);
-    a += pn[3] ^ salt_pn[3];
-    b += pn[4] ^ salt_pn[4];
-    c += pn[5] ^ salt_pn[5];
-    HashMix(a, b, c);
-    a += pn[6] ^ salt_pn[6];
-    b += pn[7] ^ salt_pn[7];
-    HashFinal(a, b, c);
-
-    return ((((uint64_t)b) << 32) | c);
-}
diff --git a/src/uint256.h b/src/uint256.h
index af1f3ab7d99e5..dd8432d74cab5 100644
--- a/src/uint256.h
+++ b/src/uint256.h
@@ -140,11 +140,6 @@ class uint256 : public base_blob<256> {
     {
         return ReadLE64(data);
     }
-
-    /** A more secure, salted hash function.
-     * @note This hash is not stable between little and big endian.
-     */
-    uint64_t GetHash(const uint256& salt) const;
 };
 
 /* uint256 from const char *.

From 8cc9cfe1605432be43d49e09094121bdb93caac8 Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Fri, 6 May 2016 21:36:36 +0200
Subject: [PATCH 0339/1802] Switch CTxMempool::mapTx to use a hash index for
 txids

---
 src/txmempool.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/txmempool.h b/src/txmempool.h
index bca8dd9791bda..3e1d387975b6f 100644
--- a/src/txmempool.h
+++ b/src/txmempool.h
@@ -17,6 +17,7 @@
 #undef foreach
 #include "boost/multi_index_container.hpp"
 #include "boost/multi_index/ordered_index.hpp"
+#include "boost/multi_index/hashed_index.hpp"
 
 class CAutoFile;
 class CBlockIndex;
@@ -422,7 +423,7 @@ class CTxMemPool
         CTxMemPoolEntry,
         boost::multi_index::indexed_by<
             // sorted by txid
-            boost::multi_index::ordered_unique<mempoolentry_txid>,
+            boost::multi_index::hashed_unique<mempoolentry_txid, SaltedTxidHasher>,
             // sorted by fee rate
             boost::multi_index::ordered_non_unique<
                 boost::multi_index::tag<descendant_score>,

From a68ec21f7ed2978d8945a0f4cfd7e80bfa5fd917 Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Fri, 6 May 2016 21:53:38 +0200
Subject: [PATCH 0340/1802] Use SipHash-2-4 for address relay selection

---
 src/main.cpp | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index 09f82312a9b9e..a1c027bef38c5 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -4698,25 +4698,23 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
                     LOCK(cs_vNodes);
                     // Use deterministic randomness to send to the same nodes for 24 hours
                     // at a time so the addrKnowns of the chosen nodes prevent repeats
-                    static uint256 hashSalt;
-                    if (hashSalt.IsNull())
-                        hashSalt = GetRandHash();
+                    static uint64_t salt0 = 0, salt1 = 0;
+                    while (salt0 == 0 && salt1 == 0) {
+                        GetRandBytes((unsigned char*)&salt0, sizeof(salt0));
+                        GetRandBytes((unsigned char*)&salt1, sizeof(salt1));
+                    }
                     uint64_t hashAddr = addr.GetHash();
-                    uint256 hashRand = ArithToUint256(UintToArith256(hashSalt) ^ (hashAddr<<32) ^ ((GetTime()+hashAddr)/(24*60*60)));
-                    hashRand = Hash(BEGIN(hashRand), END(hashRand));
-                    multimap<uint256, CNode*> mapMix;
+                    multimap<uint64_t, CNode*> mapMix;
+                    const CSipHasher hasher = CSipHasher(salt0, salt1).Write(hashAddr << 32).Write((GetTime() + hashAddr) / (24*60*60));
                     BOOST_FOREACH(CNode* pnode, vNodes)
                     {
                         if (pnode->nVersion < CADDR_TIME_VERSION)
                             continue;
-                        unsigned int nPointer;
-                        memcpy(&nPointer, &pnode, sizeof(nPointer));
-                        uint256 hashKey = ArithToUint256(UintToArith256(hashRand) ^ nPointer);
-                        hashKey = Hash(BEGIN(hashKey), END(hashKey));
+                        uint64_t hashKey = CSipHasher(hasher).Write(pnode->id).Finalize();
                         mapMix.insert(make_pair(hashKey, pnode));
                     }
                     int nRelayNodes = fReachable ? 2 : 1; // limited relaying of addresses outside our network(s)
-                    for (multimap<uint256, CNode*>::iterator mi = mapMix.begin(); mi != mapMix.end() && nRelayNodes-- > 0; ++mi)
+                    for (multimap<uint64_t, CNode*>::iterator mi = mapMix.begin(); mi != mapMix.end() && nRelayNodes-- > 0; ++mi)
                         ((*mi).second)->PushAddress(addr);
                 }
             }

From 269a4402a8617a539a70b2c332e86f0fe292a7a6 Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Mon, 2 May 2016 17:52:31 -0700
Subject: [PATCH 0341/1802] Add test for dbwrapper iterators with same-prefix
 keys.

---
 src/test/dbwrapper_tests.cpp | 86 ++++++++++++++++++++++++++++++++++++
 1 file changed, 86 insertions(+)

diff --git a/src/test/dbwrapper_tests.cpp b/src/test/dbwrapper_tests.cpp
index 8745d1439ca33..a0bdcf4afbc70 100644
--- a/src/test/dbwrapper_tests.cpp
+++ b/src/test/dbwrapper_tests.cpp
@@ -238,4 +238,90 @@ BOOST_AUTO_TEST_CASE(iterator_ordering)
     }
 }
 
+struct StringContentsSerializer {
+    // Used to make two serialized objects the same while letting them have a different lengths
+    // This is a terrible idea
+    string str;
+    StringContentsSerializer() {}
+    StringContentsSerializer(const string& inp) : str(inp) {}
+
+    StringContentsSerializer& operator+=(const string& s) {
+        str += s;
+        return *this;
+    }
+    StringContentsSerializer& operator+=(const StringContentsSerializer& s) { return *this += s.str; }
+
+    ADD_SERIALIZE_METHODS;
+
+    template <typename Stream, typename Operation>
+    inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) {
+        if (ser_action.ForRead()) {
+            str.clear();
+            char c = 0;
+            while (true) {
+                try {
+                    READWRITE(c);
+                    str.push_back(c);
+                } catch (const std::ios_base::failure& e) {
+                    break;
+                }
+            }
+        } else {
+            for (size_t i = 0; i < str.size(); i++)
+                READWRITE(str[i]);
+        }
+    }
+};
+
+BOOST_AUTO_TEST_CASE(iterator_string_ordering)
+{
+    char buf[10];
+
+    path ph = temp_directory_path() / unique_path();
+    CDBWrapper dbw(ph, (1 << 20), true, false, false);
+    for (int x=0x00; x<10; ++x) {
+        for (int y = 0; y < 10; y++) {
+            sprintf(buf, "%d", x);
+            StringContentsSerializer key(buf);
+            for (int z = 0; z < y; z++)
+                key += key;
+            uint32_t value = x*x;
+            BOOST_CHECK(dbw.Write(key, value));
+        }
+    }
+
+    boost::scoped_ptr<CDBIterator> it(const_cast<CDBWrapper*>(&dbw)->NewIterator());
+    for (int c=0; c<2; ++c) {
+        int seek_start;
+        if (c == 0)
+            seek_start = 0;
+        else
+            seek_start = 5;
+        sprintf(buf, "%d", seek_start);
+        StringContentsSerializer seek_key(buf);
+        it->Seek(seek_key);
+        for (int x=seek_start; x<10; ++x) {
+            for (int y = 0; y < 10; y++) {
+                sprintf(buf, "%d", x);
+                string exp_key(buf);
+                for (int z = 0; z < y; z++)
+                    exp_key += exp_key;
+                StringContentsSerializer key;
+                uint32_t value;
+                BOOST_CHECK(it->Valid());
+                if (!it->Valid()) // Avoid spurious errors about invalid iterator's key and value in case of failure
+                    break;
+                BOOST_CHECK(it->GetKey(key));
+                BOOST_CHECK(it->GetValue(value));
+                BOOST_CHECK_EQUAL(key.str, exp_key);
+                BOOST_CHECK_EQUAL(value, x*x);
+                it->Next();
+            }
+        }
+        BOOST_CHECK(!it->Valid());
+    }
+}
+
+
+
 BOOST_AUTO_TEST_SUITE_END()

From 6075bc4d67bcd5f95561dc6d53b4fdbaf2c63f4b Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Wed, 18 May 2016 11:10:34 +0200
Subject: [PATCH 0342/1802] doc: 32 and 64 bit packages are seperate

---
 doc/README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/README.md b/doc/README.md
index a5524889d2976..357334dfb23f5 100644
--- a/doc/README.md
+++ b/doc/README.md
@@ -13,8 +13,8 @@ The following are some helpful notes on how to run Bitcoin on your native platfo
 
 Unpack the files into a directory and run:
 
-- bin/32/bitcoin-qt (GUI, 32-bit) or bin/32/bitcoind (headless, 32-bit)
-- bin/64/bitcoin-qt (GUI, 64-bit) or bin/64/bitcoind (headless, 64-bit)
+- `bin/bitcoin-qt` (GUI) or
+- `bin/bitcoind` (headless)
 
 ### Windows
 

From f4119c6c988ea24a5218aa6bc67e57e47e051547 Mon Sep 17 00:00:00 2001
From: EthanHeilman <ethan.r.heilman@gmail.com>
Date: Wed, 18 May 2016 12:04:07 -0400
Subject: [PATCH 0343/1802] Remove non-determinism which is breaking net_tests
 #8069

---
 src/test/net_tests.cpp | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/test/net_tests.cpp b/src/test/net_tests.cpp
index 6debf6ac5e168..df1a4d2fb1918 100644
--- a/src/test/net_tests.cpp
+++ b/src/test/net_tests.cpp
@@ -17,6 +17,13 @@ class CAddrManSerializationMock : public CAddrMan
 {
 public:
     virtual void Serialize(CDataStream& s, int nType, int nVersionDummy) const = 0;
+
+    //! Ensure that bucket placement is always the same for testing purposes.
+    void MakeDeterministic()
+    {
+        nKey.SetNull();
+        seed_insecure_rand(true);
+    }
 };
 
 class CAddrManUncorrupted : public CAddrManSerializationMock
@@ -65,6 +72,7 @@ BOOST_FIXTURE_TEST_SUITE(net_tests, BasicTestingSetup)
 BOOST_AUTO_TEST_CASE(caddrdb_read)
 {
     CAddrManUncorrupted addrmanUncorrupted;
+    addrmanUncorrupted.MakeDeterministic();
 
     CService addr1 = CService("250.7.1.1", 8333);
     CService addr2 = CService("250.7.2.2", 9999);
@@ -106,6 +114,7 @@ BOOST_AUTO_TEST_CASE(caddrdb_read)
 BOOST_AUTO_TEST_CASE(caddrdb_read_corrupted)
 {
     CAddrManCorrupted addrmanCorrupted;
+    addrmanCorrupted.MakeDeterministic();
 
     // Test that the de-serialization of corrupted addrman throws an exception.
     CDataStream ssPeers1 = AddrmanToStream(addrmanCorrupted);

From 4dc94d1036576fe988a066fdabc047350ccddda9 Mon Sep 17 00:00:00 2001
From: Alex Morcos <morcos@chaincode.com>
Date: Tue, 15 Dec 2015 15:26:44 -0500
Subject: [PATCH 0344/1802] Refactor CreateNewBlock to be a method of the
 BlockAssembler class

---
 src/miner.cpp             | 444 ++++++++++++++++++++++----------------
 src/miner.h               |  56 ++++-
 src/rpc/mining.cpp        |   4 +-
 src/test/miner_tests.cpp  |  28 +--
 src/test/test_bitcoin.cpp |   2 +-
 5 files changed, 328 insertions(+), 206 deletions(-)

diff --git a/src/miner.cpp b/src/miner.cpp
index eaf29a767b594..91e05f9ce48bf 100644
--- a/src/miner.cpp
+++ b/src/miner.cpp
@@ -71,231 +71,299 @@ int64_t UpdateTime(CBlockHeader* pblock, const Consensus::Params& consensusParam
     return nNewTime - nOldTime;
 }
 
-CBlockTemplate* CreateNewBlock(const CChainParams& chainparams, const CScript& scriptPubKeyIn)
+BlockAssembler::BlockAssembler(const CChainParams& _chainparams)
+    : chainparams(_chainparams)
 {
-    // Create new block
-    std::unique_ptr<CBlockTemplate> pblocktemplate(new CBlockTemplate());
+   // Largest block you're willing to create:
+    nBlockMaxSize = GetArg("-blockmaxsize", DEFAULT_BLOCK_MAX_SIZE);
+    // Limit to between 1K and MAX_BLOCK_SIZE-1K for sanity:
+    nBlockMaxSize = std::max((unsigned int)1000, std::min((unsigned int)(MAX_BLOCK_SIZE-1000), nBlockMaxSize));
+
+    // Minimum block size you want to create; block will be filled with free transactions
+    // until there are no more or the block reaches this size:
+    nBlockMinSize = GetArg("-blockminsize", DEFAULT_BLOCK_MIN_SIZE);
+    nBlockMinSize = std::min(nBlockMaxSize, nBlockMinSize);
+}
+
+void BlockAssembler::resetBlock()
+{
+    inBlock.clear();
+
+    // Reserve space for coinbase tx
+    nBlockSize = 1000;
+    nBlockSigOps = 100;
+
+    // These counters do not include coinbase tx
+    nBlockTx = 0;
+    nFees = 0;
+
+    lastFewTxs = 0;
+    blockFinished = false;
+}
+
+CBlockTemplate* BlockAssembler::CreateNewBlock(const CScript& scriptPubKeyIn)
+{
+    resetBlock();
+
+    pblocktemplate.reset(new CBlockTemplate());
+
     if(!pblocktemplate.get())
         return NULL;
-    CBlock *pblock = &pblocktemplate->block; // pointer for convenience
-
-    // Create coinbase tx
-    CMutableTransaction txNew;
-    txNew.vin.resize(1);
-    txNew.vin[0].prevout.SetNull();
-    txNew.vout.resize(1);
-    txNew.vout[0].scriptPubKey = scriptPubKeyIn;
+    pblock = &pblocktemplate->block; // pointer for convenience
 
     // Add dummy coinbase tx as first transaction
     pblock->vtx.push_back(CTransaction());
     pblocktemplate->vTxFees.push_back(-1); // updated at end
     pblocktemplate->vTxSigOps.push_back(-1); // updated at end
 
-    // Largest block you're willing to create:
-    unsigned int nBlockMaxSize = GetArg("-blockmaxsize", DEFAULT_BLOCK_MAX_SIZE);
-    // Limit to between 1K and MAX_BLOCK_SIZE-1K for sanity:
-    nBlockMaxSize = std::max((unsigned int)1000, std::min((unsigned int)(MAX_BLOCK_SIZE-1000), nBlockMaxSize));
+    LOCK2(cs_main, mempool.cs);
+    CBlockIndex* pindexPrev = chainActive.Tip();
+    nHeight = pindexPrev->nHeight + 1;
+
+    pblock->nVersion = ComputeBlockVersion(pindexPrev, chainparams.GetConsensus());
+    // -regtest only: allow overriding block.nVersion with
+    // -blockversion=N to test forking scenarios
+    if (chainparams.MineBlocksOnDemand())
+        pblock->nVersion = GetArg("-blockversion", pblock->nVersion);
+
+    pblock->nTime = GetAdjustedTime();
+    const int64_t nMedianTimePast = pindexPrev->GetMedianTimePast();
+
+    nLockTimeCutoff = (STANDARD_LOCKTIME_VERIFY_FLAGS & LOCKTIME_MEDIAN_TIME_PAST)
+                       ? nMedianTimePast
+                       : pblock->GetBlockTime();
+
+    addPriorityTxs();
+    addScoreTxs();
+
+    nLastBlockTx = nBlockTx;
+    nLastBlockSize = nBlockSize;
+    LogPrintf("CreateNewBlock(): total size %u txs: %u fees: %ld sigops %d\n", nBlockSize, nBlockTx, nFees, nBlockSigOps);
+
+    // Create coinbase transaction.
+    CMutableTransaction coinbaseTx;
+    coinbaseTx.vin.resize(1);
+    coinbaseTx.vin[0].prevout.SetNull();
+    coinbaseTx.vout.resize(1);
+    coinbaseTx.vout[0].scriptPubKey = scriptPubKeyIn;
+    coinbaseTx.vout[0].nValue = nFees + GetBlockSubsidy(nHeight, chainparams.GetConsensus());
+    coinbaseTx.vin[0].scriptSig = CScript() << nHeight << OP_0;
+    pblock->vtx[0] = coinbaseTx;
+    pblocktemplate->vTxFees[0] = -nFees;
+
+    // Fill in header
+    pblock->hashPrevBlock  = pindexPrev->GetBlockHash();
+    UpdateTime(pblock, chainparams.GetConsensus(), pindexPrev);
+    pblock->nBits          = GetNextWorkRequired(pindexPrev, pblock, chainparams.GetConsensus());
+    pblock->nNonce         = 0;
+    pblocktemplate->vTxSigOps[0] = GetLegacySigOpCount(pblock->vtx[0]);
+
+    CValidationState state;
+    if (!TestBlockValidity(state, chainparams, *pblock, pindexPrev, false, false)) {
+        throw std::runtime_error(strprintf("%s: TestBlockValidity failed: %s", __func__, FormatStateMessage(state)));
+    }
 
-    // How much of the block should be dedicated to high-priority transactions,
-    // included regardless of the fees they pay
-    unsigned int nBlockPrioritySize = GetArg("-blockprioritysize", DEFAULT_BLOCK_PRIORITY_SIZE);
-    nBlockPrioritySize = std::min(nBlockMaxSize, nBlockPrioritySize);
+    return pblocktemplate.release();
+}
 
-    // Minimum block size you want to create; block will be filled with free transactions
-    // until there are no more or the block reaches this size:
-    unsigned int nBlockMinSize = GetArg("-blockminsize", DEFAULT_BLOCK_MIN_SIZE);
-    nBlockMinSize = std::min(nBlockMaxSize, nBlockMinSize);
+bool BlockAssembler::isStillDependent(CTxMemPool::txiter iter)
+{
+    BOOST_FOREACH(CTxMemPool::txiter parent, mempool.GetMemPoolParents(iter))
+    {
+        if (!inBlock.count(parent)) {
+            return true;
+        }
+    }
+    return false;
+}
 
-    // Collect memory pool transactions into the block
-    CTxMemPool::setEntries inBlock;
-    CTxMemPool::setEntries waitSet;
 
-    // This vector will be sorted into a priority queue:
-    vector<TxCoinAgePriority> vecPriority;
-    TxCoinAgePriorityCompare pricomparer;
-    std::map<CTxMemPool::txiter, double, CTxMemPool::CompareIteratorByHash> waitPriMap;
-    typedef std::map<CTxMemPool::txiter, double, CTxMemPool::CompareIteratorByHash>::iterator waitPriIter;
-    double actualPriority = -1;
 
-    std::priority_queue<CTxMemPool::txiter, std::vector<CTxMemPool::txiter>, ScoreCompare> clearedTxs;
+bool BlockAssembler::TestForBlock(CTxMemPool::txiter iter)
+{
+    if (nBlockSize + iter->GetTxSize() >= nBlockMaxSize) {
+        // If the block is so close to full that no more txs will fit
+        // or if we've tried more than 50 times to fill remaining space
+        // then flag that the block is finished
+        if (nBlockSize >  nBlockMaxSize - 100 || lastFewTxs > 50) {
+             blockFinished = true;
+             return false;
+        }
+        // Once we're within 1000 bytes of a full block, only look at 50 more txs
+        // to try to fill the remaining space.
+        if (nBlockSize > nBlockMaxSize - 1000) {
+            lastFewTxs++;
+        }
+        return false;
+    }
+
+    if (nBlockSigOps + iter->GetSigOpCount() >= MAX_BLOCK_SIGOPS) {
+        // If the block has room for no more sig ops then
+        // flag that the block is finished
+        if (nBlockSigOps > MAX_BLOCK_SIGOPS - 2) {
+            blockFinished = true;
+            return false;
+        }
+        // Otherwise attempt to find another tx with fewer sigops
+        // to put in the block.
+        return false;
+    }
+
+    // Must check that lock times are still valid
+    // This can be removed once MTP is always enforced
+    // as long as reorgs keep the mempool consistent.
+    if (!IsFinalTx(iter->GetTx(), nHeight, nLockTimeCutoff))
+        return false;
+
+    return true;
+}
+
+void BlockAssembler::AddToBlock(CTxMemPool::txiter iter)
+{
+    pblock->vtx.push_back(iter->GetTx());
+    pblocktemplate->vTxFees.push_back(iter->GetFee());
+    pblocktemplate->vTxSigOps.push_back(iter->GetSigOpCount());
+    nBlockSize += iter->GetTxSize();
+    ++nBlockTx;
+    nBlockSigOps += iter->GetSigOpCount();
+    nFees += iter->GetFee();
+    inBlock.insert(iter);
+
     bool fPrintPriority = GetBoolArg("-printpriority", DEFAULT_PRINTPRIORITY);
-    uint64_t nBlockSize = 1000;
-    uint64_t nBlockTx = 0;
-    unsigned int nBlockSigOps = 100;
-    int lastFewTxs = 0;
-    CAmount nFees = 0;
+    if (fPrintPriority) {
+        double dPriority = iter->GetPriority(nHeight);
+        CAmount dummy;
+        mempool.ApplyDeltas(iter->GetTx().GetHash(), dPriority, dummy);
+        LogPrintf("priority %.1f fee %s txid %s\n",
+                  dPriority,
+                  CFeeRate(iter->GetModifiedFee(), iter->GetTxSize()).ToString(),
+                  iter->GetTx().GetHash().ToString());
+    }
+}
 
+void BlockAssembler::addScoreTxs()
+{
+    std::priority_queue<CTxMemPool::txiter, std::vector<CTxMemPool::txiter>, ScoreCompare> clearedTxs;
+    CTxMemPool::setEntries waitSet;
+    CTxMemPool::indexed_transaction_set::index<mining_score>::type::iterator mi = mempool.mapTx.get<mining_score>().begin();
+    CTxMemPool::txiter iter;
+    while (!blockFinished && (mi != mempool.mapTx.get<mining_score>().end() || !clearedTxs.empty()))
     {
-        LOCK2(cs_main, mempool.cs);
-        CBlockIndex* pindexPrev = chainActive.Tip();
-        const int nHeight = pindexPrev->nHeight + 1;
-        pblock->nTime = GetAdjustedTime();
-        const int64_t nMedianTimePast = pindexPrev->GetMedianTimePast();
-
-        pblock->nVersion = ComputeBlockVersion(pindexPrev, chainparams.GetConsensus());
-        // -regtest only: allow overriding block.nVersion with
-        // -blockversion=N to test forking scenarios
-        if (chainparams.MineBlocksOnDemand())
-            pblock->nVersion = GetArg("-blockversion", pblock->nVersion);
-
-        int64_t nLockTimeCutoff = (STANDARD_LOCKTIME_VERIFY_FLAGS & LOCKTIME_MEDIAN_TIME_PAST)
-                                ? nMedianTimePast
-                                : pblock->GetBlockTime();
-
-        bool fPriorityBlock = nBlockPrioritySize > 0;
-        if (fPriorityBlock) {
-            vecPriority.reserve(mempool.mapTx.size());
-            for (CTxMemPool::indexed_transaction_set::iterator mi = mempool.mapTx.begin();
-                 mi != mempool.mapTx.end(); ++mi)
-            {
-                double dPriority = mi->GetPriority(nHeight);
-                CAmount dummy;
-                mempool.ApplyDeltas(mi->GetTx().GetHash(), dPriority, dummy);
-                vecPriority.push_back(TxCoinAgePriority(dPriority, mi));
-            }
-            std::make_heap(vecPriority.begin(), vecPriority.end(), pricomparer);
+        // If no txs that were previously postponed are available to try
+        // again, then try the next highest score tx
+        if (clearedTxs.empty()) {
+            iter = mempool.mapTx.project<0>(mi);
+            mi++;
+        }
+        // If a previously postponed tx is available to try again, then it
+        // has higher score than all untried so far txs
+        else {
+            iter = clearedTxs.top();
+            clearedTxs.pop();
         }
 
-        CTxMemPool::indexed_transaction_set::index<mining_score>::type::iterator mi = mempool.mapTx.get<mining_score>().begin();
-        CTxMemPool::txiter iter;
-
-        while (mi != mempool.mapTx.get<mining_score>().end() || !clearedTxs.empty())
-        {
-            bool priorityTx = false;
-            if (fPriorityBlock && !vecPriority.empty()) { // add a tx from priority queue to fill the blockprioritysize
-                priorityTx = true;
-                iter = vecPriority.front().second;
-                actualPriority = vecPriority.front().first;
-                std::pop_heap(vecPriority.begin(), vecPriority.end(), pricomparer);
-                vecPriority.pop_back();
-            }
-            else if (clearedTxs.empty()) { // add tx with next highest score
-                iter = mempool.mapTx.project<0>(mi);
-                mi++;
-            }
-            else {  // try to add a previously postponed child tx
-                iter = clearedTxs.top();
-                clearedTxs.pop();
-            }
+        // If tx is dependent on other mempool txs which haven't yet been included
+        // then put it in the waitSet
+        if (isStillDependent(iter)) {
+            waitSet.insert(iter);
+            continue;
+        }
 
-            if (inBlock.count(iter))
-                continue; // could have been added to the priorityBlock
+        // If the fee rate is below the min fee rate for mining, then we're done
+        // adding txs based on score (fee rate)
+        if (iter->GetModifiedFee() < ::minRelayTxFee.GetFee(iter->GetTxSize()) && nBlockSize >= nBlockMinSize) {
+            return;
+        }
 
-            const CTransaction& tx = iter->GetTx();
+        // If this tx fits in the block add it, otherwise keep looping
+        if (TestForBlock(iter)) {
+            AddToBlock(iter);
 
-            bool fOrphan = false;
-            BOOST_FOREACH(CTxMemPool::txiter parent, mempool.GetMemPoolParents(iter))
+            // This tx was successfully added, so
+            // add transactions that depend on this one to the priority queue to try again
+            BOOST_FOREACH(CTxMemPool::txiter child, mempool.GetMemPoolChildren(iter))
             {
-                if (!inBlock.count(parent)) {
-                    fOrphan = true;
-                    break;
+                if (waitSet.count(child)) {
+                    clearedTxs.push(child);
+                    waitSet.erase(child);
                 }
             }
-            if (fOrphan) {
-                if (priorityTx)
-                    waitPriMap.insert(std::make_pair(iter,actualPriority));
-                else
-                    waitSet.insert(iter);
-                continue;
-            }
+        }
+    }
+}
 
-            unsigned int nTxSize = iter->GetTxSize();
-            if (fPriorityBlock &&
-                (nBlockSize + nTxSize >= nBlockPrioritySize || !AllowFree(actualPriority))) {
-                fPriorityBlock = false;
-                waitPriMap.clear();
-            }
-            if (!priorityTx &&
-                (iter->GetModifiedFee() < ::minRelayTxFee.GetFee(nTxSize) && nBlockSize >= nBlockMinSize)) {
-                break;
-            }
-            if (nBlockSize + nTxSize >= nBlockMaxSize) {
-                if (nBlockSize >  nBlockMaxSize - 100 || lastFewTxs > 50) {
-                    break;
-                }
-                // Once we're within 1000 bytes of a full block, only look at 50 more txs
-                // to try to fill the remaining space.
-                if (nBlockSize > nBlockMaxSize - 1000) {
-                    lastFewTxs++;
-                }
-                continue;
-            }
+void BlockAssembler::addPriorityTxs()
+{
+    // How much of the block should be dedicated to high-priority transactions,
+    // included regardless of the fees they pay
+    unsigned int nBlockPrioritySize = GetArg("-blockprioritysize", DEFAULT_BLOCK_PRIORITY_SIZE);
+    nBlockPrioritySize = std::min(nBlockMaxSize, nBlockPrioritySize);
 
-            if (!IsFinalTx(tx, nHeight, nLockTimeCutoff))
-                continue;
+    if (nBlockPrioritySize == 0) {
+        return;
+    }
 
-            unsigned int nTxSigOps = iter->GetSigOpCount();
-            if (nBlockSigOps + nTxSigOps >= MAX_BLOCK_SIGOPS) {
-                if (nBlockSigOps > MAX_BLOCK_SIGOPS - 2) {
-                    break;
-                }
-                continue;
-            }
+    // This vector will be sorted into a priority queue:
+    vector<TxCoinAgePriority> vecPriority;
+    TxCoinAgePriorityCompare pricomparer;
+    std::map<CTxMemPool::txiter, double, CTxMemPool::CompareIteratorByHash> waitPriMap;
+    typedef std::map<CTxMemPool::txiter, double, CTxMemPool::CompareIteratorByHash>::iterator waitPriIter;
+    double actualPriority = -1;
 
-            CAmount nTxFees = iter->GetFee();
-            // Added
-            pblock->vtx.push_back(tx);
-            pblocktemplate->vTxFees.push_back(nTxFees);
-            pblocktemplate->vTxSigOps.push_back(nTxSigOps);
-            nBlockSize += nTxSize;
-            ++nBlockTx;
-            nBlockSigOps += nTxSigOps;
-            nFees += nTxFees;
-
-            if (fPrintPriority)
-            {
-                double dPriority = iter->GetPriority(nHeight);
-                CAmount dummy;
-                mempool.ApplyDeltas(tx.GetHash(), dPriority, dummy);
-                LogPrintf("priority %.1f fee %s txid %s\n",
-                          dPriority , CFeeRate(iter->GetModifiedFee(), nTxSize).ToString(), tx.GetHash().ToString());
-            }
+    vecPriority.reserve(mempool.mapTx.size());
+    for (CTxMemPool::indexed_transaction_set::iterator mi = mempool.mapTx.begin();
+         mi != mempool.mapTx.end(); ++mi)
+    {
+        double dPriority = mi->GetPriority(nHeight);
+        CAmount dummy;
+        mempool.ApplyDeltas(mi->GetTx().GetHash(), dPriority, dummy);
+        vecPriority.push_back(TxCoinAgePriority(dPriority, mi));
+    }
+    std::make_heap(vecPriority.begin(), vecPriority.end(), pricomparer);
+
+    CTxMemPool::txiter iter;
+    while (!vecPriority.empty() && !blockFinished) { // add a tx from priority queue to fill the blockprioritysize
+        iter = vecPriority.front().second;
+        actualPriority = vecPriority.front().first;
+        std::pop_heap(vecPriority.begin(), vecPriority.end(), pricomparer);
+        vecPriority.pop_back();
+
+        // If tx already in block, skip
+        if (inBlock.count(iter)) {
+            assert(false); // shouldn't happen for priority txs
+            continue;
+        }
+
+        // If tx is dependent on other mempool txs which haven't yet been included
+        // then put it in the waitSet
+        if (isStillDependent(iter)) {
+            waitPriMap.insert(std::make_pair(iter, actualPriority));
+            continue;
+        }
 
-            inBlock.insert(iter);
+        // If this tx fits in the block add it, otherwise keep looping
+        if (TestForBlock(iter)) {
+            AddToBlock(iter);
 
-            // Add transactions that depend on this one to the priority queue
+            // If now that this txs is added we've surpassed our desired priority size
+            // or have dropped below the AllowFreeThreshold, then we're done adding priority txs
+            if (nBlockSize + iter->GetTxSize() >= nBlockPrioritySize || !AllowFree(actualPriority)) {
+                return;
+            }
+
+            // This tx was successfully added, so
+            // add transactions that depend on this one to the priority queue to try again
             BOOST_FOREACH(CTxMemPool::txiter child, mempool.GetMemPoolChildren(iter))
             {
-                if (fPriorityBlock) {
-                    waitPriIter wpiter = waitPriMap.find(child);
-                    if (wpiter != waitPriMap.end()) {
-                        vecPriority.push_back(TxCoinAgePriority(wpiter->second,child));
-                        std::push_heap(vecPriority.begin(), vecPriority.end(), pricomparer);
-                        waitPriMap.erase(wpiter);
-                    }
-                }
-                else {
-                    if (waitSet.count(child)) {
-                        clearedTxs.push(child);
-                        waitSet.erase(child);
-                    }
+                waitPriIter wpiter = waitPriMap.find(child);
+                if (wpiter != waitPriMap.end()) {
+                    vecPriority.push_back(TxCoinAgePriority(wpiter->second,child));
+                    std::push_heap(vecPriority.begin(), vecPriority.end(), pricomparer);
+                    waitPriMap.erase(wpiter);
                 }
             }
         }
-        nLastBlockTx = nBlockTx;
-        nLastBlockSize = nBlockSize;
-        LogPrintf("CreateNewBlock(): total size %u txs: %u fees: %ld sigops %d\n", nBlockSize, nBlockTx, nFees, nBlockSigOps);
-
-        // Compute final coinbase transaction.
-        txNew.vout[0].nValue = nFees + GetBlockSubsidy(nHeight, chainparams.GetConsensus());
-        txNew.vin[0].scriptSig = CScript() << nHeight << OP_0;
-        pblock->vtx[0] = txNew;
-        pblocktemplate->vTxFees[0] = -nFees;
-
-        // Fill in header
-        pblock->hashPrevBlock  = pindexPrev->GetBlockHash();
-        UpdateTime(pblock, chainparams.GetConsensus(), pindexPrev);
-        pblock->nBits          = GetNextWorkRequired(pindexPrev, pblock, chainparams.GetConsensus());
-        pblock->nNonce         = 0;
-        pblocktemplate->vTxSigOps[0] = GetLegacySigOpCount(pblock->vtx[0]);
-
-        CValidationState state;
-        if (!TestBlockValidity(state, chainparams, *pblock, pindexPrev, false, false)) {
-            throw std::runtime_error(strprintf("%s: TestBlockValidity failed: %s", __func__, FormatStateMessage(state)));
-        }
     }
-
-    return pblocktemplate.release();
 }
 
 void IncrementExtraNonce(CBlock* pblock, const CBlockIndex* pindexPrev, unsigned int& nExtraNonce)
diff --git a/src/miner.h b/src/miner.h
index cd0f1366253ab..74f19693c4b29 100644
--- a/src/miner.h
+++ b/src/miner.h
@@ -7,14 +7,17 @@
 #define BITCOIN_MINER_H
 
 #include "primitives/block.h"
+#include "txmempool.h"
 
 #include <stdint.h>
+#include <memory>
 
 class CBlockIndex;
 class CChainParams;
 class CReserveKey;
 class CScript;
 class CWallet;
+
 namespace Consensus { struct Params; };
 
 static const bool DEFAULT_PRINTPRIORITY = false;
@@ -27,7 +30,58 @@ struct CBlockTemplate
 };
 
 /** Generate a new block, without valid proof-of-work */
-CBlockTemplate* CreateNewBlock(const CChainParams& chainparams, const CScript& scriptPubKeyIn);
+class BlockAssembler
+{
+private:
+    // The constructed block template
+    std::unique_ptr<CBlockTemplate> pblocktemplate;
+    // A convenience pointer that always refers to the CBlock in pblocktemplate
+    CBlock* pblock;
+
+    // Configuration parameters for the block size
+    unsigned int nBlockMaxSize, nBlockMinSize;
+
+    // Information on the current status of the block
+    uint64_t nBlockSize;
+    uint64_t nBlockTx;
+    unsigned int nBlockSigOps;
+    CAmount nFees;
+    CTxMemPool::setEntries inBlock;
+
+    // Chain context for the block
+    int nHeight;
+    int64_t nLockTimeCutoff;
+    const CChainParams& chainparams;
+
+    // Variables used for addScoreTxs and addPriorityTxs
+    int lastFewTxs;
+    bool blockFinished;
+
+public:
+    BlockAssembler(const CChainParams& chainparams);
+    /** Construct a new block template with coinbase to scriptPubKeyIn */
+    CBlockTemplate* CreateNewBlock(const CScript& scriptPubKeyIn);
+
+private:
+    // utility functions
+    /** Clear the block's state and prepare for assembling a new block */
+    void resetBlock();
+    /** Add a tx to the block */
+    void AddToBlock(CTxMemPool::txiter iter);
+
+    // Methods for how to add transactions to a block.
+    /** Add transactions based on modified feerate */
+    void addScoreTxs();
+    /** Add transactions based on tx "priority" */
+    void addPriorityTxs();
+
+    // helper function for addScoreTxs and addPriorityTxs
+    /** Test if tx will still "fit" in the block */
+    bool TestForBlock(CTxMemPool::txiter iter);
+    /** Test if tx still has unconfirmed parents not yet in block */
+    bool isStillDependent(CTxMemPool::txiter iter);
+};
+
 /** Modify the extranonce in a block */
 void IncrementExtraNonce(CBlock* pblock, const CBlockIndex* pindexPrev, unsigned int& nExtraNonce);
 int64_t UpdateTime(CBlockHeader* pblock, const Consensus::Params& consensusParams, const CBlockIndex* pindexPrev);
diff --git a/src/rpc/mining.cpp b/src/rpc/mining.cpp
index 9a7d9d53a07fc..bd90cca1cc189 100644
--- a/src/rpc/mining.cpp
+++ b/src/rpc/mining.cpp
@@ -111,7 +111,7 @@ UniValue generateBlocks(boost::shared_ptr<CReserveScript> coinbaseScript, int nG
     UniValue blockHashes(UniValue::VARR);
     while (nHeight < nHeightEnd)
     {
-        std::unique_ptr<CBlockTemplate> pblocktemplate(CreateNewBlock(Params(), coinbaseScript->reserveScript));
+        std::unique_ptr<CBlockTemplate> pblocktemplate(BlockAssembler(Params()).CreateNewBlock(coinbaseScript->reserveScript));
         if (!pblocktemplate.get())
             throw JSONRPCError(RPC_INTERNAL_ERROR, "Couldn't create new block");
         CBlock *pblock = &pblocktemplate->block;
@@ -493,7 +493,7 @@ UniValue getblocktemplate(const UniValue& params, bool fHelp)
             pblocktemplate = NULL;
         }
         CScript scriptDummy = CScript() << OP_TRUE;
-        pblocktemplate = CreateNewBlock(Params(), scriptDummy);
+        pblocktemplate = BlockAssembler(Params()).CreateNewBlock(scriptDummy);
         if (!pblocktemplate)
             throw JSONRPCError(RPC_OUT_OF_MEMORY, "Out of memory");
 
diff --git a/src/test/miner_tests.cpp b/src/test/miner_tests.cpp
index 469862518c58c..329b488c0ab9d 100644
--- a/src/test/miner_tests.cpp
+++ b/src/test/miner_tests.cpp
@@ -89,7 +89,7 @@ BOOST_AUTO_TEST_CASE(CreateNewBlock_validity)
     fCheckpointsEnabled = false;
 
     // Simple block creation, nothing special yet:
-    BOOST_CHECK(pblocktemplate = CreateNewBlock(chainparams, scriptPubKey));
+    BOOST_CHECK(pblocktemplate = BlockAssembler(chainparams).CreateNewBlock(scriptPubKey));
 
     // We can't make transactions until we have inputs
     // Therefore, load 100 blocks :)
@@ -121,7 +121,7 @@ BOOST_AUTO_TEST_CASE(CreateNewBlock_validity)
     delete pblocktemplate;
 
     // Just to make sure we can still make simple blocks
-    BOOST_CHECK(pblocktemplate = CreateNewBlock(chainparams, scriptPubKey));
+    BOOST_CHECK(pblocktemplate = BlockAssembler(chainparams).CreateNewBlock(scriptPubKey));
     delete pblocktemplate;
 
     const CAmount BLOCKSUBSIDY = 50*COIN;
@@ -146,7 +146,7 @@ BOOST_AUTO_TEST_CASE(CreateNewBlock_validity)
         mempool.addUnchecked(hash, entry.Fee(LOWFEE).Time(GetTime()).SpendsCoinbase(spendsCoinbase).FromTx(tx));
         tx.vin[0].prevout.hash = hash;
     }
-    BOOST_CHECK_THROW(CreateNewBlock(chainparams, scriptPubKey), std::runtime_error);
+    BOOST_CHECK_THROW(BlockAssembler(chainparams).CreateNewBlock(scriptPubKey), std::runtime_error);
     mempool.clear();
 
     tx.vin[0].prevout.hash = txFirst[0]->GetHash();
@@ -160,7 +160,7 @@ BOOST_AUTO_TEST_CASE(CreateNewBlock_validity)
         mempool.addUnchecked(hash, entry.Fee(LOWFEE).Time(GetTime()).SpendsCoinbase(spendsCoinbase).SigOps(20).FromTx(tx));
         tx.vin[0].prevout.hash = hash;
     }
-    BOOST_CHECK(pblocktemplate = CreateNewBlock(chainparams, scriptPubKey));
+    BOOST_CHECK(pblocktemplate = BlockAssembler(chainparams).CreateNewBlock(scriptPubKey));
     delete pblocktemplate;
     mempool.clear();
 
@@ -181,14 +181,14 @@ BOOST_AUTO_TEST_CASE(CreateNewBlock_validity)
         mempool.addUnchecked(hash, entry.Fee(LOWFEE).Time(GetTime()).SpendsCoinbase(spendsCoinbase).FromTx(tx));
         tx.vin[0].prevout.hash = hash;
     }
-    BOOST_CHECK(pblocktemplate = CreateNewBlock(chainparams, scriptPubKey));
+    BOOST_CHECK(pblocktemplate = BlockAssembler(chainparams).CreateNewBlock(scriptPubKey));
     delete pblocktemplate;
     mempool.clear();
 
     // orphan in mempool, template creation fails
     hash = tx.GetHash();
     mempool.addUnchecked(hash, entry.Fee(LOWFEE).Time(GetTime()).FromTx(tx));
-    BOOST_CHECK_THROW(CreateNewBlock(chainparams, scriptPubKey), std::runtime_error);
+    BOOST_CHECK_THROW(BlockAssembler(chainparams).CreateNewBlock(scriptPubKey), std::runtime_error);
     mempool.clear();
 
     // child with higher priority than parent
@@ -205,7 +205,7 @@ BOOST_AUTO_TEST_CASE(CreateNewBlock_validity)
     tx.vout[0].nValue = tx.vout[0].nValue+BLOCKSUBSIDY-HIGHERFEE; //First txn output + fresh coinbase - new txn fee
     hash = tx.GetHash();
     mempool.addUnchecked(hash, entry.Fee(HIGHERFEE).Time(GetTime()).SpendsCoinbase(true).FromTx(tx));
-    BOOST_CHECK(pblocktemplate = CreateNewBlock(chainparams, scriptPubKey));
+    BOOST_CHECK(pblocktemplate = BlockAssembler(chainparams).CreateNewBlock(scriptPubKey));
     delete pblocktemplate;
     mempool.clear();
 
@@ -217,7 +217,7 @@ BOOST_AUTO_TEST_CASE(CreateNewBlock_validity)
     hash = tx.GetHash();
     // give it a fee so it'll get mined
     mempool.addUnchecked(hash, entry.Fee(LOWFEE).Time(GetTime()).SpendsCoinbase(false).FromTx(tx));
-    BOOST_CHECK_THROW(CreateNewBlock(chainparams, scriptPubKey), std::runtime_error);
+    BOOST_CHECK_THROW(BlockAssembler(chainparams).CreateNewBlock(scriptPubKey), std::runtime_error);
     mempool.clear();
 
     // invalid (pre-p2sh) txn in mempool, template creation fails
@@ -234,7 +234,7 @@ BOOST_AUTO_TEST_CASE(CreateNewBlock_validity)
     tx.vout[0].nValue -= LOWFEE;
     hash = tx.GetHash();
     mempool.addUnchecked(hash, entry.Fee(LOWFEE).Time(GetTime()).SpendsCoinbase(false).FromTx(tx));
-    BOOST_CHECK_THROW(CreateNewBlock(chainparams, scriptPubKey), std::runtime_error);
+    BOOST_CHECK_THROW(BlockAssembler(chainparams).CreateNewBlock(scriptPubKey), std::runtime_error);
     mempool.clear();
 
     // double spend txn pair in mempool, template creation fails
@@ -247,7 +247,7 @@ BOOST_AUTO_TEST_CASE(CreateNewBlock_validity)
     tx.vout[0].scriptPubKey = CScript() << OP_2;
     hash = tx.GetHash();
     mempool.addUnchecked(hash, entry.Fee(HIGHFEE).Time(GetTime()).SpendsCoinbase(true).FromTx(tx));
-    BOOST_CHECK_THROW(CreateNewBlock(chainparams, scriptPubKey), std::runtime_error);
+    BOOST_CHECK_THROW(BlockAssembler(chainparams).CreateNewBlock(scriptPubKey), std::runtime_error);
     mempool.clear();
 
     // subsidy changing
@@ -263,7 +263,7 @@ BOOST_AUTO_TEST_CASE(CreateNewBlock_validity)
         next->BuildSkip();
         chainActive.SetTip(next);
     }
-    BOOST_CHECK(pblocktemplate = CreateNewBlock(chainparams, scriptPubKey));
+    BOOST_CHECK(pblocktemplate = BlockAssembler(chainparams).CreateNewBlock(scriptPubKey));
     delete pblocktemplate;
     // Extend to a 210000-long block chain.
     while (chainActive.Tip()->nHeight < 210000) {
@@ -276,7 +276,7 @@ BOOST_AUTO_TEST_CASE(CreateNewBlock_validity)
         next->BuildSkip();
         chainActive.SetTip(next);
     }
-    BOOST_CHECK(pblocktemplate = CreateNewBlock(chainparams, scriptPubKey));
+    BOOST_CHECK(pblocktemplate = BlockAssembler(chainparams).CreateNewBlock(scriptPubKey));
     delete pblocktemplate;
     // Delete the dummy blocks again.
     while (chainActive.Tip()->nHeight > nHeight) {
@@ -363,7 +363,7 @@ BOOST_AUTO_TEST_CASE(CreateNewBlock_validity)
     tx.vin[0].nSequence = CTxIn::SEQUENCE_LOCKTIME_TYPE_FLAG | 1;
     BOOST_CHECK(!TestSequenceLocks(tx, flags)); // Sequence locks fail
 
-    BOOST_CHECK(pblocktemplate = CreateNewBlock(chainparams, scriptPubKey));
+    BOOST_CHECK(pblocktemplate = BlockAssembler(chainparams).CreateNewBlock(scriptPubKey));
 
     // None of the of the absolute height/time locked tx should have made
     // it into the template because we still check IsFinalTx in CreateNewBlock,
@@ -377,7 +377,7 @@ BOOST_AUTO_TEST_CASE(CreateNewBlock_validity)
     chainActive.Tip()->nHeight++;
     SetMockTime(chainActive.Tip()->GetMedianTimePast() + 1);
 
-    BOOST_CHECK(pblocktemplate = CreateNewBlock(chainparams, scriptPubKey));
+    BOOST_CHECK(pblocktemplate = BlockAssembler(chainparams).CreateNewBlock(scriptPubKey));
     BOOST_CHECK_EQUAL(pblocktemplate->block.vtx.size(), 5);
     delete pblocktemplate;
 
diff --git a/src/test/test_bitcoin.cpp b/src/test/test_bitcoin.cpp
index 9bcb07626ad6d..c68320ba8b8e6 100644
--- a/src/test/test_bitcoin.cpp
+++ b/src/test/test_bitcoin.cpp
@@ -98,7 +98,7 @@ CBlock
 TestChain100Setup::CreateAndProcessBlock(const std::vector<CMutableTransaction>& txns, const CScript& scriptPubKey)
 {
     const CChainParams& chainparams = Params();
-    CBlockTemplate *pblocktemplate = CreateNewBlock(chainparams, scriptPubKey);
+    CBlockTemplate *pblocktemplate = BlockAssembler(chainparams).CreateNewBlock(scriptPubKey);
     CBlock& block = pblocktemplate->block;
 
     // Replace mempool-selected txns with just coinbase plus passed-in txns:

From 2a8b3589b5a6c0863012329ddb40e7d901decf0e Mon Sep 17 00:00:00 2001
From: Ethan Heilman <Ethan.R.Heilman@gmail.com>
Date: Wed, 18 May 2016 20:14:26 -0400
Subject: [PATCH 0345/1802] Fix typo adddrman to addrman as requested in #8070

---
 src/test/net_tests.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test/net_tests.cpp b/src/test/net_tests.cpp
index df1a4d2fb1918..b38d61f330354 100644
--- a/src/test/net_tests.cpp
+++ b/src/test/net_tests.cpp
@@ -128,7 +128,7 @@ BOOST_AUTO_TEST_CASE(caddrdb_read_corrupted)
     } catch (const std::exception& e) {
         exceptionThrown = true;
     }
-    // Even through de-serialization failed adddrman is not left in a clean state.
+    // Even through de-serialization failed addrman is not left in a clean state.
     BOOST_CHECK(addrman1.size() == 1);
     BOOST_CHECK(exceptionThrown);
 

From bf9266e017b286c36e08fd09b91d9e39f14b2cf3 Mon Sep 17 00:00:00 2001
From: Warren Togami <wtogami@gmail.com>
Date: Thu, 19 May 2016 14:19:08 +0900
Subject: [PATCH 0346/1802] Use Socks5ErrorString() to decode error responses
 from socks proxy.

---
 src/netbase.cpp | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/src/netbase.cpp b/src/netbase.cpp
index d2a4188ffcb54..572ae70871d40 100644
--- a/src/netbase.cpp
+++ b/src/netbase.cpp
@@ -291,6 +291,21 @@ struct ProxyCredentials
     std::string password;
 };
 
+std::string Socks5ErrorString(int err)
+{
+    switch(err) {
+        case 0x01: return "general failure";
+        case 0x02: return "connection not allowed";
+        case 0x03: return "network unreachable";
+        case 0x04: return "host unreachable";
+        case 0x05: return "connection refused";
+        case 0x06: return "TTL expired";
+        case 0x07: return "protocol error";
+        case 0x08: return "address type not supported";
+        default:   return "unknown";
+    }
+}
+
 /** Connect using SOCKS5 (as described in RFC1928) */
 static bool Socks5(const std::string& strDest, int port, const ProxyCredentials *auth, SOCKET& hSocket)
 {
@@ -382,18 +397,7 @@ static bool Socks5(const std::string& strDest, int port, const ProxyCredentials
     if (pchRet2[1] != 0x00) {
         // Failures to connect to a peer that are not proxy errors
         CloseSocket(hSocket);
-        switch (pchRet2[1])
-        {
-            case 0x01: LogPrintf("Socks5() connect to %s:%d failed: general failure\n", strDest, port); break;
-            case 0x02: LogPrintf("Socks5() connect to %s:%d failed: connection not allowed\n", strDest, port); break;
-            case 0x03: LogPrintf("Socks5() connect to %s:%d failed: network unreachable\n", strDest, port); break;
-            case 0x04: LogPrintf("Socks5() connect to %s:%d failed: host unreachable\n", strDest, port); break;
-            case 0x05: LogPrintf("Socks5() connect to %s:%d failed: connection refused\n", strDest, port); break;
-            case 0x06: LogPrintf("Socks5() connect to %s:%d failed: TTL expired\n", strDest, port); break;
-            case 0x07: LogPrintf("Socks5() connect to %s:%d failed: protocol error\n", strDest, port); break;
-            case 0x08: LogPrintf("Socks5() connect to %s:%d failed: address type not supported\n", strDest, port); break;
-            default:   LogPrintf("Socks5() connect to %s:%d failed: unknown\n", strDest, port);
-        }
+        LogPrintf("Socks5() connect to %s:%d failed: %s\n", strDest, port, Socks5ErrorString(pchRet2[1]));
         return false;
     }
     if (pchRet2[2] != 0x00) {

From 401ae654b247d80e29e76ebd094e9e37409941bd Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Tue, 17 May 2016 17:54:41 -0400
Subject: [PATCH 0347/1802] travis: 'make check' in parallel and verbose

- 'make check' in parallel, since the log will take care of clean output
- 'make check' verbose, so that test failure causes aren't hidden
---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index fd70d3ab52d7c..bc2c7faf7ee57 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -78,7 +78,7 @@ script:
     - ./configure --cache-file=../config.cache $BITCOIN_CONFIG_ALL $BITCOIN_CONFIG || ( cat config.log && false)
     - make $MAKEJOBS $GOAL || ( echo "Build failure. Verbose build follows." && make $GOAL V=1 ; false )
     - export LD_LIBRARY_PATH=$TRAVIS_BUILD_DIR/depends/$HOST/lib
-    - if [ "$RUN_TESTS" = "true" ]; then make check; fi
+    - if [ "$RUN_TESTS" = "true" ]; then make $MAKEJOBS check VERBOSE=1; fi
     - if [ "$RUN_TESTS" = "true" ]; then qa/pull-tester/rpc-tests.py --coverage; fi
 after_script:
     - echo $TRAVIS_COMMIT_RANGE

From 02ce2a3ca773e2d10ff37ecf50d15c71113f3335 Mon Sep 17 00:00:00 2001
From: Pavel Vasin <pavel@vasin.nl>
Date: Mon, 3 Aug 2015 03:03:14 +0300
Subject: [PATCH 0348/1802] qt: askpassphrasedialog: Clear pass fields on
 accept

This is usability improvement in a case if user gets re-asked
passphrase. (e.g. made a typo)
---
 src/qt/askpassphrasedialog.cpp | 21 +++++++++++++++++----
 src/qt/askpassphrasedialog.h   |  1 +
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/src/qt/askpassphrasedialog.cpp b/src/qt/askpassphrasedialog.cpp
index 415bffb991457..e8aa79679c04a 100644
--- a/src/qt/askpassphrasedialog.cpp
+++ b/src/qt/askpassphrasedialog.cpp
@@ -77,10 +77,7 @@ AskPassphraseDialog::AskPassphraseDialog(Mode mode, QWidget *parent) :
 
 AskPassphraseDialog::~AskPassphraseDialog()
 {
-    // Attempt to overwrite text so that they do not linger around in memory
-    ui->passEdit1->setText(QString(" ").repeated(ui->passEdit1->text().size()));
-    ui->passEdit2->setText(QString(" ").repeated(ui->passEdit2->text().size()));
-    ui->passEdit3->setText(QString(" ").repeated(ui->passEdit3->text().size()));
+    secureClearPassFields();
     delete ui;
 }
 
@@ -103,6 +100,8 @@ void AskPassphraseDialog::accept()
     newpass1.assign(ui->passEdit2->text().toStdString().c_str());
     newpass2.assign(ui->passEdit3->text().toStdString().c_str());
 
+    secureClearPassFields();
+
     switch(mode)
     {
     case Encrypt: {
@@ -260,3 +259,17 @@ bool AskPassphraseDialog::eventFilter(QObject *object, QEvent *event)
     }
     return QDialog::eventFilter(object, event);
 }
+
+static void SecureClearQLineEdit(QLineEdit* edit)
+{
+    // Attempt to overwrite text so that they do not linger around in memory
+    edit->setText(QString(" ").repeated(edit->text().size()));
+    edit->clear();
+}
+
+void AskPassphraseDialog::secureClearPassFields()
+{
+    SecureClearQLineEdit(ui->passEdit1);
+    SecureClearQLineEdit(ui->passEdit2);
+    SecureClearQLineEdit(ui->passEdit3);
+}
diff --git a/src/qt/askpassphrasedialog.h b/src/qt/askpassphrasedialog.h
index 727b5a1ada18a..34bf7ccb31f6f 100644
--- a/src/qt/askpassphrasedialog.h
+++ b/src/qt/askpassphrasedialog.h
@@ -42,6 +42,7 @@ class AskPassphraseDialog : public QDialog
 
 private Q_SLOTS:
     void textChanged();
+    void secureClearPassFields();
 
 protected:
     bool event(QEvent *event);

From fa57b0c5ef8101e1228d17a2bdce28a36e6f2ff6 Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Sun, 15 May 2016 11:06:23 +0200
Subject: [PATCH 0349/1802] [qa] test_framework: Append portseed to tmpdir

This makes it possible to specify a tmpdir while running tests in
parallel
---
 qa/rpc-tests/test_framework/test_framework.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/qa/rpc-tests/test_framework/test_framework.py b/qa/rpc-tests/test_framework/test_framework.py
index 3480de6c6e20c..091378186419a 100755
--- a/qa/rpc-tests/test_framework/test_framework.py
+++ b/qa/rpc-tests/test_framework/test_framework.py
@@ -115,6 +115,8 @@ def main(self):
         self.add_options(parser)
         (self.options, self.args) = parser.parse_args()
 
+        self.options.tmpdir += '/' + str(self.options.port_seed)
+
         if self.options.trace_rpc:
             logging.basicConfig(level=logging.DEBUG, stream=sys.stdout)
 

From ee9f4a5b1505113eae0fe8d70fd0414bd5bce0ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jorge=20Tim=C3=B3n?= <jtimon@jtimon.cc>
Date: Fri, 20 May 2016 14:43:37 +0200
Subject: [PATCH 0350/1802] Consensus: Decouple from chainparams.o and
 timedata.o

Do it for the consensus-critical functions:

- CheckBlockHeader
- CheckBlock
- ContextualCheckBlockHeader
---
 src/main.cpp | 27 +++++++++++++--------------
 src/main.h   |  6 +++---
 2 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index 9ba90b4ead2b3..f66de42aa8852 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -2223,7 +2223,7 @@ bool ConnectBlock(const CBlock& block, CValidationState& state, CBlockIndex* pin
     int64_t nTimeStart = GetTimeMicros();
 
     // Check it again in case a previous version let a bad block in
-    if (!CheckBlock(block, state, !fJustCheck, !fJustCheck))
+    if (!CheckBlock(block, state, chainparams.GetConsensus(), GetAdjustedTime(), !fJustCheck, !fJustCheck))
         return error("%s: Consensus::CheckBlock: %s", __func__, FormatStateMessage(state));
 
     // verify that the view's current state corresponds to the previous block
@@ -3234,20 +3234,20 @@ bool FindUndoPos(CValidationState &state, int nFile, CDiskBlockPos &pos, unsigne
     return true;
 }
 
-bool CheckBlockHeader(const CBlockHeader& block, CValidationState& state, bool fCheckPOW)
+bool CheckBlockHeader(const CBlockHeader& block, CValidationState& state, const Consensus::Params& consensusParams, int64_t nAdjustedTime, bool fCheckPOW)
 {
     // Check proof of work matches claimed amount
-    if (fCheckPOW && !CheckProofOfWork(block.GetHash(), block.nBits, Params().GetConsensus()))
+    if (fCheckPOW && !CheckProofOfWork(block.GetHash(), block.nBits, consensusParams))
         return state.DoS(50, false, REJECT_INVALID, "high-hash", false, "proof of work failed");
 
     // Check timestamp
-    if (block.GetBlockTime() > GetAdjustedTime() + 2 * 60 * 60)
+    if (block.GetBlockTime() > nAdjustedTime + 2 * 60 * 60)
         return state.Invalid(false, REJECT_INVALID, "time-too-new", "block timestamp too far in the future");
 
     return true;
 }
 
-bool CheckBlock(const CBlock& block, CValidationState& state, bool fCheckPOW, bool fCheckMerkleRoot)
+bool CheckBlock(const CBlock& block, CValidationState& state, const Consensus::Params& consensusParams, int64_t nAdjustedTime, bool fCheckPOW, bool fCheckMerkleRoot)
 {
     // These are checks that are independent of context.
 
@@ -3256,7 +3256,7 @@ bool CheckBlock(const CBlock& block, CValidationState& state, bool fCheckPOW, bo
 
     // Check that the header is valid (particularly PoW).  This is mostly
     // redundant with the call in AcceptBlockHeader.
-    if (!CheckBlockHeader(block, state, fCheckPOW))
+    if (!CheckBlockHeader(block, state, consensusParams, nAdjustedTime, fCheckPOW))
         return false;
 
     // Check the merkle root.
@@ -3322,9 +3322,8 @@ static bool CheckIndexAgainstCheckpoint(const CBlockIndex* pindexPrev, CValidati
     return true;
 }
 
-bool ContextualCheckBlockHeader(const CBlockHeader& block, CValidationState& state, CBlockIndex * const pindexPrev)
+bool ContextualCheckBlockHeader(const CBlockHeader& block, CValidationState& state, const Consensus::Params& consensusParams, CBlockIndex * const pindexPrev)
 {
-    const Consensus::Params& consensusParams = Params().GetConsensus();
     // Check proof of work
     if (block.nBits != GetNextWorkRequired(pindexPrev, &block, consensusParams))
         return state.DoS(100, false, REJECT_INVALID, "bad-diffbits", false, "incorrect proof of work");
@@ -3397,7 +3396,7 @@ static bool AcceptBlockHeader(const CBlockHeader& block, CValidationState& state
             return true;
         }
 
-        if (!CheckBlockHeader(block, state))
+        if (!CheckBlockHeader(block, state, chainparams.GetConsensus(), GetAdjustedTime()))
             return error("%s: Consensus::CheckBlockHeader: %s, %s", __func__, hash.ToString(), FormatStateMessage(state));
 
         // Get prev block index
@@ -3413,7 +3412,7 @@ static bool AcceptBlockHeader(const CBlockHeader& block, CValidationState& state
         if (fCheckpointsEnabled && !CheckIndexAgainstCheckpoint(pindexPrev, state, chainparams, hash))
             return error("%s: CheckIndexAgainstCheckpoint(): %s", __func__, state.GetRejectReason().c_str());
 
-        if (!ContextualCheckBlockHeader(block, state, pindexPrev))
+        if (!ContextualCheckBlockHeader(block, state, chainparams.GetConsensus(), pindexPrev))
             return error("%s: Consensus::ContextualCheckBlockHeader: %s, %s", __func__, hash.ToString(), FormatStateMessage(state));
     }
     if (pindex == NULL)
@@ -3457,7 +3456,7 @@ static bool AcceptBlock(const CBlock& block, CValidationState& state, const CCha
         if (fTooFarAhead) return true;      // Block height is too high
     }
 
-    if ((!CheckBlock(block, state)) || !ContextualCheckBlock(block, state, pindex->pprev)) {
+    if ((!CheckBlock(block, state, chainparams.GetConsensus(), GetAdjustedTime())) || !ContextualCheckBlock(block, state, pindex->pprev)) {
         if (state.IsInvalid() && !state.CorruptionPossible()) {
             pindex->nStatus |= BLOCK_FAILED_VALID;
             setDirtyBlockIndex.insert(pindex);
@@ -3542,9 +3541,9 @@ bool TestBlockValidity(CValidationState& state, const CChainParams& chainparams,
     indexDummy.nHeight = pindexPrev->nHeight + 1;
 
     // NOTE: CheckBlockHeader is called by CheckBlock
-    if (!ContextualCheckBlockHeader(block, state, pindexPrev))
+    if (!ContextualCheckBlockHeader(block, state, chainparams.GetConsensus(), pindexPrev))
         return error("%s: Consensus::ContextualCheckBlockHeader: %s", __func__, FormatStateMessage(state));
-    if (!CheckBlock(block, state, fCheckPOW, fCheckMerkleRoot))
+    if (!CheckBlock(block, state, chainparams.GetConsensus(), GetAdjustedTime(), fCheckPOW, fCheckMerkleRoot))
         return error("%s: Consensus::CheckBlock: %s", __func__, FormatStateMessage(state));
     if (!ContextualCheckBlock(block, state, pindexPrev))
         return error("%s: Consensus::ContextualCheckBlock: %s", __func__, FormatStateMessage(state));
@@ -3876,7 +3875,7 @@ bool CVerifyDB::VerifyDB(const CChainParams& chainparams, CCoinsView *coinsview,
         if (!ReadBlockFromDisk(block, pindex, chainparams.GetConsensus()))
             return error("VerifyDB(): *** ReadBlockFromDisk failed at %d, hash=%s", pindex->nHeight, pindex->GetBlockHash().ToString());
         // check level 1: verify block validity
-        if (nCheckLevel >= 1 && !CheckBlock(block, state))
+        if (nCheckLevel >= 1 && !CheckBlock(block, state, chainparams.GetConsensus(), GetAdjustedTime()))
             return error("%s: *** found bad block at %d, hash=%s (%s)\n", __func__, 
                          pindex->nHeight, pindex->GetBlockHash().ToString(), FormatStateMessage(state));
         // check level 2: verify undo validity
diff --git a/src/main.h b/src/main.h
index f287171f141ba..4e93c084f417f 100644
--- a/src/main.h
+++ b/src/main.h
@@ -425,13 +425,13 @@ bool ReadBlockFromDisk(CBlock& block, const CBlockIndex* pindex, const Consensus
 /** Functions for validating blocks and updating the block tree */
 
 /** Context-independent validity checks */
-bool CheckBlockHeader(const CBlockHeader& block, CValidationState& state, bool fCheckPOW = true);
-bool CheckBlock(const CBlock& block, CValidationState& state, bool fCheckPOW = true, bool fCheckMerkleRoot = true);
+bool CheckBlockHeader(const CBlockHeader& block, CValidationState& state, const Consensus::Params& consensusParams, int64_t nAdjustedTime, bool fCheckPOW = true);
+bool CheckBlock(const CBlock& block, CValidationState& state, const Consensus::Params& consensusParams, int64_t nAdjustedTime, bool fCheckPOW = true, bool fCheckMerkleRoot = true);
 
 /** Context-dependent validity checks.
  *  By "context", we mean only the previous block headers, but not the UTXO
  *  set; UTXO-related validity checks are done in ConnectBlock(). */
-bool ContextualCheckBlockHeader(const CBlockHeader& block, CValidationState& state, CBlockIndex *pindexPrev);
+bool ContextualCheckBlockHeader(const CBlockHeader& block, CValidationState& state, const Consensus::Params& consensusParams, CBlockIndex* pindexPrev);
 bool ContextualCheckBlock(const CBlock& block, CValidationState& state, CBlockIndex *pindexPrev);
 
 /** Apply the effects of this block (with given index) on the UTXO set represented by coins.

From beceac9bbf14bf4a81f6f63b9cca2a64157054ae Mon Sep 17 00:00:00 2001
From: Peter Todd <pete@petertodd.org>
Date: Fri, 20 May 2016 14:44:32 +0100
Subject: [PATCH 0351/1802] Disable the mempool P2P command when bloom filters
 disabled

Only useful to SPV peers, and attackers... like bloom is a DoS vector as far
more data is sent than received.
---
 src/main.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/main.cpp b/src/main.cpp
index 9ba90b4ead2b3..2ad2a8e3f11f1 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -5277,6 +5277,13 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
 
     else if (strCommand == NetMsgType::MEMPOOL)
     {
+        if (!(nLocalServices & NODE_BLOOM) && !pfrom->fWhitelisted)
+        {
+            LogPrint("net", "mempool request with bloom filters disabled, disconnect peer=%d\n", pfrom->GetId());
+            pfrom->fDisconnect = true;
+            return true;
+        }
+
         if (CNode::OutboundTargetReached(false) && !pfrom->fWhitelisted)
         {
             LogPrint("net", "mempool request with bandwidth limit reached, disconnect peer=%d\n", pfrom->GetId());

From 3d3602faf4a47855be264f05d9d52253e8bd0f9d Mon Sep 17 00:00:00 2001
From: Jonas Schnelli <dev@jonasschnelli.ch>
Date: Fri, 20 May 2016 16:50:48 +0200
Subject: [PATCH 0352/1802] Add RPC test for the p2p mempool command in
 conjunction with disabled bloomfilters

---
 qa/rpc-tests/p2p-mempool.py | 99 +++++++++++++++++++++++++++++++++++++
 1 file changed, 99 insertions(+)
 create mode 100755 qa/rpc-tests/p2p-mempool.py

diff --git a/qa/rpc-tests/p2p-mempool.py b/qa/rpc-tests/p2p-mempool.py
new file mode 100755
index 0000000000000..5d2daf39f8288
--- /dev/null
+++ b/qa/rpc-tests/p2p-mempool.py
@@ -0,0 +1,99 @@
+#!/usr/bin/env python3
+# Copyright (c) 2015-2016 The Bitcoin Core developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+from test_framework.mininode import *
+from test_framework.test_framework import BitcoinTestFramework
+from test_framework.util import *
+import time
+
+class TestNode(NodeConnCB):
+    def __init__(self):
+        NodeConnCB.__init__(self)
+        self.connection = None
+        self.ping_counter = 1
+        self.last_pong = msg_pong()
+        self.block_receive_map = {}
+
+    def add_connection(self, conn):
+        self.connection = conn
+        self.peer_disconnected = False
+
+    def on_inv(self, conn, message):
+        pass
+
+    # Track the last getdata message we receive (used in the test)
+    def on_getdata(self, conn, message):
+        self.last_getdata = message
+
+    def on_block(self, conn, message):
+        message.block.calc_sha256()
+        try:
+            self.block_receive_map[message.block.sha256] += 1
+        except KeyError as e:
+            self.block_receive_map[message.block.sha256] = 1
+
+    # Spin until verack message is received from the node.
+    # We use this to signal that our test can begin. This
+    # is called from the testing thread, so it needs to acquire
+    # the global lock.
+    def wait_for_verack(self):
+        def veracked():
+            return self.verack_received
+        return wait_until(veracked, timeout=10)
+
+    def wait_for_disconnect(self):
+        def disconnected():
+            return self.peer_disconnected
+        return wait_until(disconnected, timeout=10)
+
+    # Wrapper for the NodeConn's send_message function
+    def send_message(self, message):
+        self.connection.send_message(message)
+
+    def on_pong(self, conn, message):
+        self.last_pong = message
+
+    def on_close(self, conn):
+        self.peer_disconnected = True
+
+    # Sync up with the node after delivery of a block
+    def sync_with_ping(self, timeout=30):
+        def received_pong():
+            return (self.last_pong.nonce == self.ping_counter)
+        self.connection.send_message(msg_ping(nonce=self.ping_counter))
+        success = wait_until(received_pong, timeout)
+        self.ping_counter += 1
+        return success
+
+    def send_mempool(self):
+        self.lastInv = []
+        self.send_message(msg_mempool())
+
+class P2PMempoolTests(BitcoinTestFramework):
+    def setup_chain(self):
+        initialize_chain_clean(self.options.tmpdir, 2)
+
+    def setup_network(self):
+        # Start a node with maxuploadtarget of 200 MB (/24h)
+        self.nodes = []
+        self.nodes.append(start_node(0, self.options.tmpdir, ["-debug", "-peerbloomfilters=0"]))
+
+    def run_test(self):
+        #connect a mininode
+        aTestNode = TestNode()
+        node = NodeConn('127.0.0.1', p2p_port(0), self.nodes[0], aTestNode)
+        aTestNode.add_connection(node)
+        NetworkThread().start()
+        aTestNode.wait_for_verack()
+
+        #request mempool
+        aTestNode.send_mempool()
+        aTestNode.wait_for_disconnect()
+
+        #mininode must be disconnected at this point
+        assert_equal(len(self.nodes[0].getpeerinfo()), 0)
+    
+if __name__ == '__main__':
+    P2PMempoolTests().main()

From 2ca8962a095ee29709316d163508f26ab1c340ae Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Tue, 17 May 2016 17:54:41 -0400
Subject: [PATCH 0353/1802] travis: use slim generic image, and some fixups

Now that caches are distinct (https://github.com/travis-ci/travis-ci/issues/4393),
we can use the Travis minimal image.
The minimal image should take less time to setup and lead to quicker builds.

Also addressed while I'm in here:
- No need to delete the broken google-chrome repo in the minimal image
- Set the hostname to work-around an openjdk bug
- Remove the non-functional apt-cache option
- Remove useless message at completion
- Install jre where the java tests are run
---
 .travis.yml | 63 ++++++++++++++++++++++-------------------------------
 1 file changed, 26 insertions(+), 37 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index bc2c7faf7ee57..53fe4f8075465 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,17 +1,17 @@
-# errata:
-# - A travis bug causes caches to trample eachother when using the same
-#   compiler key (which we don't use anyway). This is worked around for now by
-#   replacing the "compilers" with a build name prefixed by the no-op ":"
-#   command. See: https://github.com/travis-ci/travis-ci/issues/4393
-# - sudo/dist/group are set so as to get Blue Box VMs, necessary for [loopback]
-#   IPv6 support
-
 sudo: required
 dist: trusty
 
+#workaround for https://github.com/travis-ci/travis-ci/issues/5227
+addons:
+  hostname: bitcoin-tester
+
 os: linux
-language: cpp
-compiler: gcc
+language: generic
+cache:
+  directories:
+  - depends/built
+  - depends/sdk-sources
+  - $HOME/.ccache
 env:
   global:
     - MAKEJOBS=-j3
@@ -25,35 +25,25 @@ env:
     - SDK_URL=https://bitcoincore.org/depends-sources/sdks
     - PYTHON_DEBUG=1
     - WINEDEBUG=fixme-all
-cache:
-  apt: true
-  directories:
-  - depends/built
-  - depends/sdk-sources
-  - $HOME/.ccache
-matrix:
-  fast_finish: true
-  include:
-    - compiler: ": ARM"
-      env: HOST=arm-linux-gnueabihf PACKAGES="g++-arm-linux-gnueabihf" DEP_OPTS="NO_QT=1" CHECK_DOC=1 GOAL="install" BITCOIN_CONFIG="--enable-glibc-back-compat --enable-reduce-exports"
-    - compiler: ": Win32"
-      env: HOST=i686-w64-mingw32 DPKG_ADD_ARCH="i386" DEP_OPTS="NO_QT=1" PACKAGES="python3 nsis g++-mingw-w64-i686 wine1.6 bc" RUN_TESTS=true GOAL="install" BITCOIN_CONFIG="--enable-reduce-exports"
-    - compiler: ": 32-bit + dash"
-      env: HOST=i686-pc-linux-gnu PACKAGES="g++-multilib bc python3-zmq" DEP_OPTS="NO_QT=1" RUN_TESTS=true GOAL="install" BITCOIN_CONFIG="--enable-zmq --enable-glibc-back-compat --enable-reduce-exports LDFLAGS=-static-libstdc++" USE_SHELL="/bin/dash"
-    - compiler: ": Win64"
-      env: HOST=x86_64-w64-mingw32 DPKG_ADD_ARCH="i386" DEP_OPTS="NO_QT=1" PACKAGES="python3 nsis g++-mingw-w64-x86-64 wine1.6 bc" RUN_TESTS=true GOAL="install" BITCOIN_CONFIG="--enable-reduce-exports"
-    - compiler: ": bitcoind"
-      env: HOST=x86_64-unknown-linux-gnu PACKAGES="bc python3-zmq" DEP_OPTS="NO_QT=1 NO_UPNP=1 DEBUG=1" RUN_TESTS=true GOAL="install" BITCOIN_CONFIG="--enable-zmq --enable-glibc-back-compat --enable-reduce-exports CPPFLAGS=-DDEBUG_LOCKORDER"
-    - compiler: ": No wallet"
-      env: HOST=x86_64-unknown-linux-gnu PACKAGES="python3" DEP_OPTS="NO_WALLET=1" RUN_TESTS=true GOAL="install" BITCOIN_CONFIG="--enable-glibc-back-compat --enable-reduce-exports"
-    - compiler: ": Cross-Mac"
-      env: HOST=x86_64-apple-darwin11 PACKAGES="cmake imagemagick libcap-dev librsvg2-bin libz-dev libbz2-dev libtiff-tools python-dev" BITCOIN_CONFIG="--enable-reduce-exports" OSX_SDK=10.9 GOAL="deploy"
-  exclude:
-    - compiler: gcc
+  matrix:
+# ARM
+    - HOST=arm-linux-gnueabihf PACKAGES="g++-arm-linux-gnueabihf" DEP_OPTS="NO_QT=1" CHECK_DOC=1 GOAL="install" BITCOIN_CONFIG="--enable-glibc-back-compat --enable-reduce-exports"
+# Win32
+    - HOST=i686-w64-mingw32 DPKG_ADD_ARCH="i386" DEP_OPTS="NO_QT=1" PACKAGES="python3 nsis g++-mingw-w64-i686 wine1.6 bc openjdk-7-jre-headless" RUN_TESTS=true GOAL="install" BITCOIN_CONFIG="--enable-reduce-exports"
+# 32-bit + dash
+    - HOST=i686-pc-linux-gnu PACKAGES="g++-multilib bc python3-zmq openjdk-7-jre-headless" DEP_OPTS="NO_QT=1" RUN_TESTS=true GOAL="install" BITCOIN_CONFIG="--enable-zmq --enable-glibc-back-compat --enable-reduce-exports LDFLAGS=-static-libstdc++" USE_SHELL="/bin/dash"
+# Win64
+    - HOST=x86_64-w64-mingw32 DPKG_ADD_ARCH="i386" DEP_OPTS="NO_QT=1" PACKAGES="python3 nsis g++-mingw-w64-x86-64 wine1.6 bc openjdk-7-jre-headless" RUN_TESTS=true GOAL="install" BITCOIN_CONFIG="--enable-reduce-exports"
+# bitcoind
+    - HOST=x86_64-unknown-linux-gnu PACKAGES="bc python3-zmq openjdk-7-jre-headless" DEP_OPTS="NO_QT=1 NO_UPNP=1 DEBUG=1" RUN_TESTS=true GOAL="install" BITCOIN_CONFIG="--enable-zmq --enable-glibc-back-compat --enable-reduce-exports CPPFLAGS=-DDEBUG_LOCKORDER"
+# No wallet
+    - HOST=x86_64-unknown-linux-gnu PACKAGES=" openjdk-7-jre-headless python3" DEP_OPTS="NO_WALLET=1" RUN_TESTS=true GOAL="install" BITCOIN_CONFIG="--enable-glibc-back-compat --enable-reduce-exports"
+# Cross-Mac
+    - HOST=x86_64-apple-darwin11 PACKAGES="cmake imagemagick libcap-dev librsvg2-bin libz-dev libbz2-dev libtiff-tools python-dev" BITCOIN_CONFIG="--enable-reduce-exports" OSX_SDK=10.9 GOAL="deploy"
+
 before_install:
     - export PATH=$(echo $PATH | tr ':' "\n" | sed '/\/opt\/python/d' | tr "\n" ":" | sed "s|::|:|g")
 install:
-    - if [ -n "$PACKAGES" ]; then sudo rm -f /etc/apt/sources.list.d/google-chrome.list; fi
     - if [ -n "$PPA" ]; then travis_retry sudo add-apt-repository "$PPA" -y; fi
     - if [ -n "$DPKG_ADD_ARCH" ]; then sudo dpkg --add-architecture "$DPKG_ADD_ARCH" ; fi
     - if [ -n "$PACKAGES" ]; then travis_retry sudo apt-get update; fi
@@ -83,4 +73,3 @@ script:
 after_script:
     - echo $TRAVIS_COMMIT_RANGE
     - echo $TRAVIS_COMMIT_LOG
-    - if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then (echo "Upload goes here. Something like: scp -r $BASE_OUTDIR server" || echo "upload failed"); fi

From f7d4a25fe6b1bd52e70fa0779d1cd145f32bd2ab Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Fri, 20 May 2016 18:29:15 -0700
Subject: [PATCH 0354/1802] Make verify-commits POSIX-compliant

---
 contrib/verify-commits/gpg.sh            | 10 +++++-----
 contrib/verify-commits/verify-commits.sh | 15 ++++++---------
 2 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/contrib/verify-commits/gpg.sh b/contrib/verify-commits/gpg.sh
index 0218b82e11dd3..375d711725707 100755
--- a/contrib/verify-commits/gpg.sh
+++ b/contrib/verify-commits/gpg.sh
@@ -1,8 +1,9 @@
 #!/bin/sh
-INPUT=$(</dev/stdin)
+INPUT=$(cat /dev/stdin)
 VALID=false
 REVSIG=false
-IFS=$'\n'
+IFS='
+'
 for LINE in $(echo "$INPUT" | gpg --trust-model always "$@" 2>/dev/null); do
 	case "$LINE" in
 	"[GNUPG:] VALIDSIG "*)
@@ -13,10 +14,9 @@ for LINE in $(echo "$INPUT" | gpg --trust-model always "$@" 2>/dev/null); do
 	"[GNUPG:] REVKEYSIG "*)
 		[ "$BITCOIN_VERIFY_COMMITS_ALLOW_REVSIG" != 1 ] && exit 1
 		while read KEY; do
-			case "$LINE" in "[GNUPG:] REVKEYSIG ${KEY:24:40} "*)
+			case "$LINE" in "[GNUPG:] REVKEYSIG ${KEY#????????????????????????} "*)
 				REVSIG=true
-				GOODREVSIG="[GNUPG:] GOODSIG ${KEY:24:40} "
-				;;
+				GOODREVSIG="[GNUPG:] GOODSIG ${KEY#????????????????????????} "
 			esac
 		done < ./contrib/verify-commits/trusted-keys
 		;;
diff --git a/contrib/verify-commits/verify-commits.sh b/contrib/verify-commits/verify-commits.sh
index 9ba781008a658..c9d2b96d8c8a9 100755
--- a/contrib/verify-commits/verify-commits.sh
+++ b/contrib/verify-commits/verify-commits.sh
@@ -1,4 +1,6 @@
 #!/bin/sh
+# Not technically POSIX-compliant due to use of "local", but almost every
+# shell anyone uses today supports it, so its probably fine
 
 DIR=$(dirname "$0")
 
@@ -6,20 +8,14 @@ echo "Please verify all commits in the following list are not evil:"
 git log "$DIR"
 
 VERIFIED_ROOT=$(cat "${DIR}/trusted-git-root")
-
-IS_REVSIG_ALLOWED () {
-	while read LINE; do
-		[ "$LINE" = "$1" ] && return 0
-	done < "${DIR}/allow-revsig-commits"
-	return 1
-}
+REVSIG_ALLOWED=$(cat "${DIR}/allow-revsig-commits")
 
 HAVE_FAILED=false
 IS_SIGNED () {
 	if [ $1 = $VERIFIED_ROOT ]; then
 		return 0;
 	fi
-	if IS_REVSIG_ALLOWED "$1"; then
+	if [ "${REVSIG_ALLOWED#*$1}" != "$REVSIG_ALLOWED" ]; then
 		export BITCOIN_VERIFY_COMMITS_ALLOW_REVSIG=1
 	else
 		export BITCOIN_VERIFY_COMMITS_ALLOW_REVSIG=0
@@ -27,7 +23,8 @@ IS_SIGNED () {
 	if ! git -c "gpg.program=${DIR}/gpg.sh" verify-commit $1 > /dev/null 2>&1; then
 		return 1;
 	fi
-	local PARENTS=$(git show -s --format=format:%P $1)
+	local PARENTS
+	PARENTS=$(git show -s --format=format:%P $1)
 	for PARENT in $PARENTS; do
 		if IS_SIGNED $PARENT > /dev/null; then
 			return 0;

From 9523e8adafd24f1c9358c437b857f0f2f25eeb47 Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Sat, 21 May 2016 01:44:29 -0700
Subject: [PATCH 0355/1802] Make verify-commits path-independent

---
 contrib/verify-commits/verify-commits.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/contrib/verify-commits/verify-commits.sh b/contrib/verify-commits/verify-commits.sh
index c9d2b96d8c8a9..a859e67852448 100755
--- a/contrib/verify-commits/verify-commits.sh
+++ b/contrib/verify-commits/verify-commits.sh
@@ -3,6 +3,7 @@
 # shell anyone uses today supports it, so its probably fine
 
 DIR=$(dirname "$0")
+[ "/${DIR#/}" != "$DIR" ] && DIR=$(dirname "$(pwd)/$0")
 
 echo "Please verify all commits in the following list are not evil:"
 git log "$DIR"

From 22421faa199b7922259b4b55e6471a1b5f91d0da Mon Sep 17 00:00:00 2001
From: Peter Todd <pete@petertodd.org>
Date: Fri, 18 Mar 2016 06:04:08 -0400
Subject: [PATCH 0356/1802] Remove pointless warning

Any attacker who managed to make an evil commit that changed something in the
contrib/verify-commits/ directory could just as easily remove the warning
and/or modify it to not display the evil commits; telling the user to check
those commits specifically misleads them into checking just those commits
rather than the script itself.
---
 contrib/verify-commits/verify-commits.sh | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/contrib/verify-commits/verify-commits.sh b/contrib/verify-commits/verify-commits.sh
index a859e67852448..5219331e2e5bc 100755
--- a/contrib/verify-commits/verify-commits.sh
+++ b/contrib/verify-commits/verify-commits.sh
@@ -5,9 +5,6 @@
 DIR=$(dirname "$0")
 [ "/${DIR#/}" != "$DIR" ] && DIR=$(dirname "$(pwd)/$0")
 
-echo "Please verify all commits in the following list are not evil:"
-git log "$DIR"
-
 VERIFIED_ROOT=$(cat "${DIR}/trusted-git-root")
 REVSIG_ALLOWED=$(cat "${DIR}/allow-revsig-commits")
 

From 11164ec0b4c1790059220b09b5827e5618a46c76 Mon Sep 17 00:00:00 2001
From: Peter Todd <pete@petertodd.org>
Date: Fri, 20 May 2016 08:55:57 +0100
Subject: [PATCH 0357/1802] Remove keys that are no longer used for merging

Also updated trusted git root to be right after gmaxwell's last merge.
---
 contrib/verify-commits/trusted-git-root | 2 +-
 contrib/verify-commits/trusted-keys     | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/contrib/verify-commits/trusted-git-root b/contrib/verify-commits/trusted-git-root
index 838b8d1ea84bd..c60f8ab695e9c 100644
--- a/contrib/verify-commits/trusted-git-root
+++ b/contrib/verify-commits/trusted-git-root
@@ -1 +1 @@
-165e323d851cc87213c7673c6f278e87a6f2e752
+82bcf405f6db1d55b684a1f63a4aabad376cdad7
diff --git a/contrib/verify-commits/trusted-keys b/contrib/verify-commits/trusted-keys
index ad1b28be0cc47..9c36d58cd2a30 100644
--- a/contrib/verify-commits/trusted-keys
+++ b/contrib/verify-commits/trusted-keys
@@ -1,8 +1,5 @@
 71A3B16735405025D447E8F274810B012346C9A6
 1F4410F6A89268CE3197A84C57896D2FF8F0B657
-01CDF4627A3B88AAE4A571C87588242FBE38D3A8
-AF8BE07C7049F3A26B239D5325B3083201782B2F
-81291FA67D2C379A006A053FEAB5AF94D9E9ABE7
 3F1888C6DCA92A6499C4911FDBA1A67379A1A931
 32EE5C4C3FA15CCADB46ABE529D4BCB6416F53EC
 FE09B823E6D83A3BC7983EAA2D7F2372E50FE137

From bd477f4e8ba9e632f42649f2fca10d698c6b7181 Mon Sep 17 00:00:00 2001
From: Suhas Daftuar <sdaftuar@chaincode.com>
Date: Fri, 20 May 2016 04:59:57 -0400
Subject: [PATCH 0358/1802] VerifyDB: don't check blocks that have been pruned

---
 src/init.cpp | 4 ++--
 src/main.cpp | 5 +++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/init.cpp b/src/init.cpp
index 8688381ecff35..a17377f6f332f 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -1269,8 +1269,8 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
 
                 uiInterface.InitMessage(_("Verifying blocks..."));
                 if (fHavePruned && GetArg("-checkblocks", DEFAULT_CHECKBLOCKS) > MIN_BLOCKS_TO_KEEP) {
-                    LogPrintf("Prune: pruned datadir may not have more than %d blocks; -checkblocks=%d may fail\n",
-                        MIN_BLOCKS_TO_KEEP, GetArg("-checkblocks", DEFAULT_CHECKBLOCKS));
+                    LogPrintf("Prune: pruned datadir may not have more than %d blocks; only checking available blocks",
+                        MIN_BLOCKS_TO_KEEP);
                 }
 
                 {
diff --git a/src/main.cpp b/src/main.cpp
index 9ba90b4ead2b3..33abf3957869f 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -3871,6 +3871,11 @@ bool CVerifyDB::VerifyDB(const CChainParams& chainparams, CCoinsView *coinsview,
         uiInterface.ShowProgress(_("Verifying blocks..."), std::max(1, std::min(99, (int)(((double)(chainActive.Height() - pindex->nHeight)) / (double)nCheckDepth * (nCheckLevel >= 4 ? 50 : 100)))));
         if (pindex->nHeight < chainActive.Height()-nCheckDepth)
             break;
+        if (fPruneMode && !(pindex->nStatus & BLOCK_HAVE_DATA)) {
+            // If pruning, only go back as far as we have data.
+            LogPrintf("VerifyDB(): block verification stopping at height %d (pruning, no data)\n", pindex->nHeight);
+            break;
+        }
         CBlock block;
         // check level 0: read from disk
         if (!ReadBlockFromDisk(block, pindex, chainparams.GetConsensus()))

From 678513cc94995a243a7e56593fe3e44e003cb597 Mon Sep 17 00:00:00 2001
From: Mitchell Cash <mitchell.cash@gmail.com>
Date: Tue, 24 May 2016 10:43:01 +1000
Subject: [PATCH 0359/1802] Correct small typo in extract_strings_qt.py

---
 share/qt/extract_strings_qt.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/share/qt/extract_strings_qt.py b/share/qt/extract_strings_qt.py
index 7728a4377590b..2ba8bb9b3acb7 100755
--- a/share/qt/extract_strings_qt.py
+++ b/share/qt/extract_strings_qt.py
@@ -32,7 +32,7 @@ def parse_po(text):
                 in_msgstr = False
             # message start
             in_msgid = True
-            
+
             msgid = [line[6:]]
         elif line.startswith('msgstr '):
             in_msgid = False
@@ -67,7 +67,7 @@ def parse_po(text):
 
 #include <QtGlobal>
 
-// Automatically generated by extract_strings.py
+// Automatically generated by extract_strings_qt.py
 #ifdef __GNUC__
 #define UNUSED __attribute__((unused))
 #else

From a27876474819ffff80614f966fea06d5da2d5c15 Mon Sep 17 00:00:00 2001
From: Alex Morcos <morcos@chaincode.com>
Date: Tue, 24 May 2016 14:23:15 -0400
Subject: [PATCH 0360/1802] FIX: Account for txs already added to block in
 addPriorityTxs

---
 src/miner.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/miner.cpp b/src/miner.cpp
index 91e05f9ce48bf..1eab8f949d41d 100644
--- a/src/miner.cpp
+++ b/src/miner.cpp
@@ -74,7 +74,7 @@ int64_t UpdateTime(CBlockHeader* pblock, const Consensus::Params& consensusParam
 BlockAssembler::BlockAssembler(const CChainParams& _chainparams)
     : chainparams(_chainparams)
 {
-   // Largest block you're willing to create:
+    // Largest block you're willing to create:
     nBlockMaxSize = GetArg("-blockmaxsize", DEFAULT_BLOCK_MAX_SIZE);
     // Limit to between 1K and MAX_BLOCK_SIZE-1K for sanity:
     nBlockMaxSize = std::max((unsigned int)1000, std::min((unsigned int)(MAX_BLOCK_SIZE-1000), nBlockMaxSize));
@@ -262,6 +262,11 @@ void BlockAssembler::addScoreTxs()
             clearedTxs.pop();
         }
 
+        // If tx already in block, skip  (added by addPriorityTxs)
+        if (inBlock.count(iter)) {
+            continue;
+        }
+
         // If tx is dependent on other mempool txs which haven't yet been included
         // then put it in the waitSet
         if (isStillDependent(iter)) {

From 1ad933950884ae3411cce78e3b8e92e9a649e735 Mon Sep 17 00:00:00 2001
From: Suhas Daftuar <sdaftuar@chaincode.com>
Date: Tue, 24 May 2016 11:35:06 -0400
Subject: [PATCH 0361/1802] Test framework: only cleanup on successful test
 runs

---
 qa/rpc-tests/test_framework/test_framework.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/qa/rpc-tests/test_framework/test_framework.py b/qa/rpc-tests/test_framework/test_framework.py
index b9b803429dec2..49f4192269f02 100755
--- a/qa/rpc-tests/test_framework/test_framework.py
+++ b/qa/rpc-tests/test_framework/test_framework.py
@@ -165,9 +165,11 @@ def main(self):
         else:
             print("Note: bitcoinds were not stopped and may still be running")
 
-        if not self.options.nocleanup and not self.options.noshutdown:
+        if not self.options.nocleanup and not self.options.noshutdown and success:
             print("Cleaning up")
             shutil.rmtree(self.options.tmpdir)
+        else:
+            print("Not cleaning up dir %s" % self.options.tmpdir)
 
         if success:
             print("Tests successful")

From 2d83013dc54320b3f0c978475517da6156f7b50d Mon Sep 17 00:00:00 2001
From: Jonas Schnelli <dev@jonasschnelli.ch>
Date: Sat, 21 May 2016 23:55:22 +0200
Subject: [PATCH 0362/1802] Add support for dnsseeds with option to filter by
 servicebits

---
 src/chainparams.cpp | 10 ++++++++++
 src/chainparams.h   |  7 +++++--
 src/net.cpp         |  5 +++--
 3 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/src/chainparams.cpp b/src/chainparams.cpp
index 5c7d190125cc3..0005115671122 100644
--- a/src/chainparams.cpp
+++ b/src/chainparams.cpp
@@ -16,6 +16,14 @@
 
 #include "chainparamsseeds.h"
 
+std::string CDNSSeedData::getHost(uint64_t requiredServiceBits) const {
+    //use default host for non-filter-capable seeds or if we use the default service bits (NODE_NETWORK)
+    if (!supportsServiceBitsFiltering || requiredServiceBits == NODE_NETWORK)
+        return host;
+    
+    return strprintf("x%x.%s", requiredServiceBits, host);
+}
+
 static CBlock CreateGenesisBlock(const char* pszTimestamp, const CScript& genesisOutputScript, uint32_t nTime, uint32_t nNonce, uint32_t nBits, int32_t nVersion, const CAmount& genesisReward)
 {
     CMutableTransaction txNew;
@@ -197,6 +205,8 @@ class CTestNetParams : public CChainParams {
 
         vFixedSeeds.clear();
         vSeeds.clear();
+        // nodes with support for servicebits filtering should be at the top
+        vSeeds.push_back(CDNSSeedData("testnetbitcoin.jonasschnelli.ch", "testnet-seed.bitcoin.jonasschnelli.ch", true));
         vSeeds.push_back(CDNSSeedData("bitcoin.petertodd.org", "testnet-seed.bitcoin.petertodd.org"));
         vSeeds.push_back(CDNSSeedData("bluematt.me", "testnet-seed.bluematt.me"));
         vSeeds.push_back(CDNSSeedData("bitcoin.schildbach.de", "testnet-seed.bitcoin.schildbach.de"));
diff --git a/src/chainparams.h b/src/chainparams.h
index 59202f548a3ca..7168daaf4347c 100644
--- a/src/chainparams.h
+++ b/src/chainparams.h
@@ -13,9 +13,12 @@
 
 #include <vector>
 
-struct CDNSSeedData {
+class CDNSSeedData {
+public:
     std::string name, host;
-    CDNSSeedData(const std::string &strName, const std::string &strHost) : name(strName), host(strHost) {}
+    bool supportsServiceBitsFiltering;
+    std::string getHost(uint64_t requiredServiceBits) const;
+    CDNSSeedData(const std::string &strName, const std::string &strHost, bool supportsServiceBitsFilteringIn = false) : name(strName), host(strHost), supportsServiceBitsFiltering(supportsServiceBitsFilteringIn) {}
 };
 
 struct SeedSpec6 {
diff --git a/src/net.cpp b/src/net.cpp
index bbd23d292a4cc..54d14a7234d2f 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -1466,12 +1466,13 @@ void ThreadDNSAddressSeed()
         } else {
             std::vector<CNetAddr> vIPs;
             std::vector<CAddress> vAdd;
-            if (LookupHost(seed.host.c_str(), vIPs, 0, true))
+            uint64_t requiredServiceBits = NODE_NETWORK;
+            if (LookupHost(seed.getHost(requiredServiceBits).c_str(), vIPs, 0, true))
             {
                 BOOST_FOREACH(const CNetAddr& ip, vIPs)
                 {
                     int nOneDay = 24*3600;
-                    CAddress addr = CAddress(CService(ip, Params().GetDefaultPort()));
+                    CAddress addr = CAddress(CService(ip, Params().GetDefaultPort()), requiredServiceBits);
                     addr.nTime = GetTime() - 3*nOneDay - GetRand(4*nOneDay); // use a random age between 3 and 7 days old
                     vAdd.push_back(addr);
                     found++;

From 7e908c7b826cedbf29560ce7a668af809ee71524 Mon Sep 17 00:00:00 2001
From: Gregory Maxwell <greg@xiph.org>
Date: Fri, 20 May 2016 16:19:26 +0000
Subject: [PATCH 0363/1802] Do not use mempool for GETDATA for tx accepted
 after the last mempool req.

The ability to GETDATA a transaction which has not (yet) been relayed
 is a privacy loss vector.

The use of the mempool for this was added as part of the mempool p2p
 message and is only needed to fetch transactions returned by it.
---
 src/main.cpp      |  6 +++++-
 src/net.cpp       |  1 +
 src/net.h         |  3 +++
 src/txmempool.cpp | 10 +++++++++-
 src/txmempool.h   |  1 +
 5 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index 9ba90b4ead2b3..2ee6bc531098a 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -4503,7 +4503,10 @@ void static ProcessGetData(CNode* pfrom, const Consensus::Params& consensusParam
                 }
                 if (!pushed && inv.type == MSG_TX) {
                     CTransaction tx;
-                    if (mempool.lookup(inv.hash, tx)) {
+                    int64_t txtime;
+                    // To protect privacy, do not answer getdata using the mempool when
+                    // that TX couldn't have been INVed in reply to a MEMPOOL request.
+                    if (mempool.lookup(inv.hash, tx, txtime) && txtime <= pfrom->timeLastMempoolReq) {
                         pfrom->PushMessage(NetMsgType::TX, tx);
                         pushed = true;
                     }
@@ -5902,6 +5905,7 @@ bool SendMessages(CNode* pto)
                         vInv.clear();
                     }
                 }
+                pto->timeLastMempoolReq = GetTime();
             }
 
             // Determine transactions to relay
diff --git a/src/net.cpp b/src/net.cpp
index bbd23d292a4cc..df3221e841560 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -2396,6 +2396,7 @@ CNode::CNode(SOCKET hSocketIn, const CAddress& addrIn, const std::string& addrNa
     fRelayTxes = false;
     fSentAddr = false;
     pfilter = new CBloomFilter();
+    timeLastMempoolReq = 0;
     nPingNonceSent = 0;
     nPingUsecStart = 0;
     nPingUsecTime = 0;
diff --git a/src/net.h b/src/net.h
index 998ee492608eb..66cc912a52537 100644
--- a/src/net.h
+++ b/src/net.h
@@ -17,6 +17,7 @@
 #include "sync.h"
 #include "uint256.h"
 
+#include <atomic>
 #include <deque>
 #include <stdint.h>
 
@@ -413,6 +414,8 @@ class CNode
     // Used for BIP35 mempool sending, also protected by cs_inventory
     bool fSendMempool;
 
+    // Last time a "MEMPOOL" request was serviced.
+    std::atomic<int64_t> timeLastMempoolReq;
     // Ping time measurement:
     // The pong reply we're expecting, or 0 if no pong expected.
     uint64_t nPingNonceSent;
diff --git a/src/txmempool.cpp b/src/txmempool.cpp
index aa5df6ca4e40e..4f17e7f8cac19 100644
--- a/src/txmempool.cpp
+++ b/src/txmempool.cpp
@@ -789,15 +789,23 @@ void CTxMemPool::queryHashes(vector<uint256>& vtxid)
     std::sort(vtxid.begin(), vtxid.end(), DepthAndScoreComparator(this));
 }
 
-bool CTxMemPool::lookup(uint256 hash, CTransaction& result) const
+
+bool CTxMemPool::lookup(uint256 hash, CTransaction& result, int64_t& time) const
 {
     LOCK(cs);
     indexed_transaction_set::const_iterator i = mapTx.find(hash);
     if (i == mapTx.end()) return false;
     result = i->GetTx();
+    time = i->GetTime();
     return true;
 }
 
+bool CTxMemPool::lookup(uint256 hash, CTransaction& result) const
+{
+    int64_t time;
+    return CTxMemPool::lookup(hash, result, time);
+}
+
 bool CTxMemPool::lookupFeeRate(const uint256& hash, CFeeRate& feeRate) const
 {
     LOCK(cs);
diff --git a/src/txmempool.h b/src/txmempool.h
index 3e1d387975b6f..75cf0f4c124de 100644
--- a/src/txmempool.h
+++ b/src/txmempool.h
@@ -602,6 +602,7 @@ class CTxMemPool
     }
 
     bool lookup(uint256 hash, CTransaction& result) const;
+    bool lookup(uint256 hash, CTransaction& result, int64_t& time) const;
     bool lookupFeeRate(const uint256& hash, CFeeRate& feeRate) const;
 
     /** Estimate fee rate needed to get into the next nBlocks

From c769c4af11fc58dd4813d328c7f71042bc577676 Mon Sep 17 00:00:00 2001
From: Gregory Maxwell <greg@xiph.org>
Date: Sun, 19 Apr 2015 12:34:43 -0700
Subject: [PATCH 0364/1802] Avoid counting failed connect attempts when
 probably offline.

If a node is offline failed outbound connection attempts will crank up
 the addrman counter and effectively blow away our state.

This change reduces the problem by only counting attempts made while
 the node believes it has outbound connections to at least two
 netgroups.

Connect and addnode connections are also not counted, as there is no
 reason to unequally penalize them for their more frequent
 connections -- though there should be no real effect from this
 unless their addnode configureation is later removed.

Wasteful repeated connection attempts while only a few connections are
 up are avoided via nLastTry.

This is still somewhat incomplete protection because our outbound
 peers could be down but not timed out or might all be on 'local'
 networks (although the requirement for multiple netgroups helps).
---
 src/addrman.cpp |  4 ++--
 src/addrman.h   |  6 +++---
 src/net.cpp     | 20 ++++++++++----------
 src/net.h       |  2 +-
 src/rpc/net.cpp |  2 +-
 5 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/addrman.cpp b/src/addrman.cpp
index 6c54cfa4cd2fd..0a1745c10c539 100644
--- a/src/addrman.cpp
+++ b/src/addrman.cpp
@@ -311,7 +311,7 @@ bool CAddrMan::Add_(const CAddress& addr, const CNetAddr& source, int64_t nTimeP
     return fNew;
 }
 
-void CAddrMan::Attempt_(const CService& addr, int64_t nTime)
+void CAddrMan::Attempt_(const CService& addr, bool fCountFailure, int64_t nTime)
 {
     CAddrInfo* pinfo = Find(addr);
 
@@ -327,7 +327,7 @@ void CAddrMan::Attempt_(const CService& addr, int64_t nTime)
 
     // update info
     info.nLastTry = nTime;
-    info.nAttempts++;
+    if (fCountFailure) info.nAttempts++;
 }
 
 CAddrInfo CAddrMan::Select_(bool newOnly)
diff --git a/src/addrman.h b/src/addrman.h
index 3085450450474..65ca79fa02cfd 100644
--- a/src/addrman.h
+++ b/src/addrman.h
@@ -230,7 +230,7 @@ class CAddrMan
     bool Add_(const CAddress &addr, const CNetAddr& source, int64_t nTimePenalty);
 
     //! Mark an entry as attempted to connect.
-    void Attempt_(const CService &addr, int64_t nTime);
+    void Attempt_(const CService &addr, bool fCountFailure, int64_t nTime);
 
     //! Select an address to connect to, if newOnly is set to true, only the new table is selected from.
     CAddrInfo Select_(bool newOnly);
@@ -532,12 +532,12 @@ class CAddrMan
     }
 
     //! Mark an entry as connection attempted to.
-    void Attempt(const CService &addr, int64_t nTime = GetAdjustedTime())
+    void Attempt(const CService &addr, bool fCountFailure, int64_t nTime = GetAdjustedTime())
     {
         {
             LOCK(cs);
             Check();
-            Attempt_(addr, nTime);
+            Attempt_(addr, fCountFailure, nTime);
             Check();
         }
     }
diff --git a/src/net.cpp b/src/net.cpp
index bbd23d292a4cc..f30321869a81a 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -367,7 +367,7 @@ CNode* FindNode(const CService& addr)
     return NULL;
 }
 
-CNode* ConnectNode(CAddress addrConnect, const char *pszDest)
+CNode* ConnectNode(CAddress addrConnect, const char *pszDest, bool fCountFailure)
 {
     if (pszDest == NULL) {
         if (IsLocal(addrConnect))
@@ -399,7 +399,7 @@ CNode* ConnectNode(CAddress addrConnect, const char *pszDest)
             return NULL;
         }
 
-        addrman.Attempt(addrConnect);
+        addrman.Attempt(addrConnect, fCountFailure);
 
         // Add node
         CNode* pnode = new CNode(hSocket, addrConnect, pszDest ? pszDest : "", false);
@@ -416,7 +416,7 @@ CNode* ConnectNode(CAddress addrConnect, const char *pszDest)
     } else if (!proxyConnectionFailed) {
         // If connecting to the node failed, and failure is not caused by a problem connecting to
         // the proxy, mark this as an attempt.
-        addrman.Attempt(addrConnect);
+        addrman.Attempt(addrConnect, fCountFailure);
     }
 
     return NULL;
@@ -1533,7 +1533,7 @@ void static ProcessOneShot()
     CAddress addr;
     CSemaphoreGrant grant(*semOutbound, true);
     if (grant) {
-        if (!OpenNetworkConnection(addr, &grant, strDest.c_str(), true))
+        if (!OpenNetworkConnection(addr, false, &grant, strDest.c_str(), true))
             AddOneShot(strDest);
     }
 }
@@ -1549,7 +1549,7 @@ void ThreadOpenConnections()
             BOOST_FOREACH(const std::string& strAddr, mapMultiArgs["-connect"])
             {
                 CAddress addr;
-                OpenNetworkConnection(addr, NULL, strAddr.c_str());
+                OpenNetworkConnection(addr, false, NULL, strAddr.c_str());
                 for (int i = 0; i < 10 && i < nLoop; i++)
                 {
                     MilliSleep(500);
@@ -1633,7 +1633,7 @@ void ThreadOpenConnections()
         }
 
         if (addrConnect.IsValid())
-            OpenNetworkConnection(addrConnect, &grant);
+            OpenNetworkConnection(addrConnect, (int)setConnected.size() >= min(nMaxConnections - 1, 2), &grant);
     }
 }
 
@@ -1655,7 +1655,7 @@ void ThreadOpenAddedConnections()
             BOOST_FOREACH(const std::string& strAddNode, lAddresses) {
                 CAddress addr;
                 CSemaphoreGrant grant(*semOutbound);
-                OpenNetworkConnection(addr, &grant, strAddNode.c_str());
+                OpenNetworkConnection(addr, false, &grant, strAddNode.c_str());
                 MilliSleep(500);
             }
             MilliSleep(120000); // Retry every 2 minutes
@@ -1694,7 +1694,7 @@ void ThreadOpenAddedConnections()
         BOOST_FOREACH(std::vector<CService>& vserv, lservAddressesToAdd)
         {
             CSemaphoreGrant grant(*semOutbound);
-            OpenNetworkConnection(CAddress(vserv[i % vserv.size()]), &grant);
+            OpenNetworkConnection(CAddress(vserv[i % vserv.size()]), false, &grant);
             MilliSleep(500);
         }
         MilliSleep(120000); // Retry every 2 minutes
@@ -1702,7 +1702,7 @@ void ThreadOpenAddedConnections()
 }
 
 // if successful, this moves the passed grant to the constructed node
-bool OpenNetworkConnection(const CAddress& addrConnect, CSemaphoreGrant *grantOutbound, const char *pszDest, bool fOneShot)
+bool OpenNetworkConnection(const CAddress& addrConnect, bool fCountFailure, CSemaphoreGrant *grantOutbound, const char *pszDest, bool fOneShot)
 {
     //
     // Initiate outbound network connection
@@ -1716,7 +1716,7 @@ bool OpenNetworkConnection(const CAddress& addrConnect, CSemaphoreGrant *grantOu
     } else if (FindNode(std::string(pszDest)))
         return false;
 
-    CNode* pnode = ConnectNode(addrConnect, pszDest);
+    CNode* pnode = ConnectNode(addrConnect, pszDest, fCountFailure);
     boost::this_thread::interruption_point();
 
     if (!pnode)
diff --git a/src/net.h b/src/net.h
index 998ee492608eb..3332496c05184 100644
--- a/src/net.h
+++ b/src/net.h
@@ -83,7 +83,7 @@ CNode* FindNode(const CNetAddr& ip);
 CNode* FindNode(const CSubNet& subNet);
 CNode* FindNode(const std::string& addrName);
 CNode* FindNode(const CService& ip);
-bool OpenNetworkConnection(const CAddress& addrConnect, CSemaphoreGrant *grantOutbound = NULL, const char *strDest = NULL, bool fOneShot = false);
+bool OpenNetworkConnection(const CAddress& addrConnect, bool fCountFailure, CSemaphoreGrant *grantOutbound = NULL, const char *strDest = NULL, bool fOneShot = false);
 void MapPort(bool fUseUPnP);
 unsigned short GetListenPort();
 bool BindListenPort(const CService &bindAddr, std::string& strError, bool fWhitelisted = false);
diff --git a/src/rpc/net.cpp b/src/rpc/net.cpp
index e09af89656832..8f62d636d86fd 100644
--- a/src/rpc/net.cpp
+++ b/src/rpc/net.cpp
@@ -219,7 +219,7 @@ UniValue addnode(const UniValue& params, bool fHelp)
     if (strCommand == "onetry")
     {
         CAddress addr;
-        OpenNetworkConnection(addr, NULL, strNode.c_str());
+        OpenNetworkConnection(addr, false, NULL, strNode.c_str());
         return NullUniValue;
     }
 

From 6182d10503ae3af222a7e4575724dce7ef563fec Mon Sep 17 00:00:00 2001
From: Gregory Maxwell <greg@xiph.org>
Date: Sun, 19 Apr 2015 13:39:38 -0700
Subject: [PATCH 0365/1802] Do not increment nAttempts by more than one for
 every Good connection.

This slows the increase of the nAttempts in addrman while partitioned,
 even if the node hasn't yet noticed the partitioning.
---
 src/addrman.cpp | 8 +++++++-
 src/addrman.h   | 8 ++++++++
 src/net.cpp     | 2 +-
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/addrman.cpp b/src/addrman.cpp
index 0a1745c10c539..00f6fe99e001c 100644
--- a/src/addrman.cpp
+++ b/src/addrman.cpp
@@ -197,6 +197,9 @@ void CAddrMan::MakeTried(CAddrInfo& info, int nId)
 void CAddrMan::Good_(const CService& addr, int64_t nTime)
 {
     int nId;
+
+    nLastGood = nTime;
+
     CAddrInfo* pinfo = Find(addr, &nId);
 
     // if not found, bail out
@@ -327,7 +330,10 @@ void CAddrMan::Attempt_(const CService& addr, bool fCountFailure, int64_t nTime)
 
     // update info
     info.nLastTry = nTime;
-    if (fCountFailure) info.nAttempts++;
+    if (fCountFailure && info.nLastCountAttempt < nLastGood) {
+        info.nLastCountAttempt = nTime;
+        info.nAttempts++;
+    }
 }
 
 CAddrInfo CAddrMan::Select_(bool newOnly)
diff --git a/src/addrman.h b/src/addrman.h
index 65ca79fa02cfd..c5923e94171c6 100644
--- a/src/addrman.h
+++ b/src/addrman.h
@@ -29,6 +29,9 @@ class CAddrInfo : public CAddress
     //! last try whatsoever by us (memory only)
     int64_t nLastTry;
 
+    //! last counted attempt (memory only)
+    int64_t nLastCountAttempt;
+
 private:
     //! where knowledge about this address first came from
     CNetAddr source;
@@ -66,6 +69,7 @@ class CAddrInfo : public CAddress
     {
         nLastSuccess = 0;
         nLastTry = 0;
+        nLastCountAttempt = 0;
         nAttempts = 0;
         nRefCount = 0;
         fInTried = false;
@@ -200,6 +204,9 @@ class CAddrMan
     //! list of "new" buckets
     int vvNew[ADDRMAN_NEW_BUCKET_COUNT][ADDRMAN_BUCKET_SIZE];
 
+    //! last time Good was called (memory only)
+    int64_t nLastGood;
+
 protected:
     //! secret key to randomize bucket select with
     uint256 nKey;
@@ -458,6 +465,7 @@ class CAddrMan
         nIdCount = 0;
         nTried = 0;
         nNew = 0;
+        nLastGood = 1; //Initially at 1 so that "never" is strictly worse.
     }
 
     CAddrMan()
diff --git a/src/net.cpp b/src/net.cpp
index f30321869a81a..c15a4692e169b 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -1633,7 +1633,7 @@ void ThreadOpenConnections()
         }
 
         if (addrConnect.IsValid())
-            OpenNetworkConnection(addrConnect, (int)setConnected.size() >= min(nMaxConnections - 1, 2), &grant);
+            OpenNetworkConnection(addrConnect, (int)setConnected.size() >= std::min(nMaxConnections - 1, 2), &grant);
     }
 }
 

From 52b02ecd6d7ce918676c76c725678cf0ae2561d2 Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Thu, 26 May 2016 18:44:14 +0200
Subject: [PATCH 0366/1802] Use global ::fRelayTxes instead of CNode one

---
 src/net.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/net.cpp b/src/net.cpp
index 44cdfd2ae26c5..a0c670e595f4e 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -471,7 +471,7 @@ void CNode::PushVersion()
     else
         LogPrint("net", "send version message: version %d, blocks=%d, us=%s, peer=%d\n", PROTOCOL_VERSION, nBestHeight, addrMe.ToString(), id);
     PushMessage(NetMsgType::VERSION, PROTOCOL_VERSION, nLocalServices, nTime, addrYou, addrMe,
-                nLocalHostNonce, strSubVersion, nBestHeight, fRelayTxes);
+                nLocalHostNonce, strSubVersion, nBestHeight, ::fRelayTxes);
 }
 
 

From e871f8338ad180428ff997b80a476d9719d8073f Mon Sep 17 00:00:00 2001
From: Suhas Daftuar <sdaftuar@gmail.com>
Date: Thu, 26 May 2016 14:19:07 -0400
Subject: [PATCH 0367/1802] Tests: add timeout to sync_blocks() and
 sync_mempools()

Previously these functions would infinitely loop if sync failed;
now they have a default timeout of 60 seconds, after which an
AssertionError is raised.

sync_blocks() has also been improved and now compares the tip
hash of each node, rather than just using block count.
---
 qa/rpc-tests/test_framework/util.py | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/qa/rpc-tests/test_framework/util.py b/qa/rpc-tests/test_framework/util.py
index 3948b664e31ca..fc66ef287d715 100644
--- a/qa/rpc-tests/test_framework/util.py
+++ b/qa/rpc-tests/test_framework/util.py
@@ -121,30 +121,34 @@ def hex_str_to_bytes(hex_str):
 def str_to_b64str(string):
     return b64encode(string.encode('utf-8')).decode('ascii')
 
-def sync_blocks(rpc_connections, wait=1):
+def sync_blocks(rpc_connections, wait=1, timeout=60):
     """
-    Wait until everybody has the same block count
+    Wait until everybody has the same tip
     """
-    while True:
-        counts = [ x.getblockcount() for x in rpc_connections ]
-        if counts == [ counts[0] ]*len(counts):
-            break
+    while timeout > 0:
+        tips = [ x.getbestblockhash() for x in rpc_connections ]
+        if tips == [ tips[0] ]*len(tips):
+            return True
         time.sleep(wait)
+        timeout -= wait
+    raise AssertionError("Block sync failed")
 
-def sync_mempools(rpc_connections, wait=1):
+def sync_mempools(rpc_connections, wait=1, timeout=60):
     """
     Wait until everybody has the same transactions in their memory
     pools
     """
-    while True:
+    while timeout > 0:
         pool = set(rpc_connections[0].getrawmempool())
         num_match = 1
         for i in range(1, len(rpc_connections)):
             if set(rpc_connections[i].getrawmempool()) == pool:
                 num_match = num_match+1
         if num_match == len(rpc_connections):
-            break
+            return True
         time.sleep(wait)
+        timeout -= wait
+    raise AssertionError("Mempool sync failed")
 
 bitcoind_processes = {}
 

From 5fac1f33fb5afad4cbcb51b7c85ab2cd759846e1 Mon Sep 17 00:00:00 2001
From: Yuri Zhykin <yuri.zhykin@gmail.com>
Date: Fri, 27 May 2016 05:32:58 +0300
Subject: [PATCH 0368/1802] bench: Added base58 encoding/decoding benchmarks

---
 src/Makefile.bench.include |  3 +-
 src/bench/base58.cpp       | 56 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 58 insertions(+), 1 deletion(-)
 create mode 100644 src/bench/base58.cpp

diff --git a/src/Makefile.bench.include b/src/Makefile.bench.include
index 65fd24e051cae..4067ceb3993e8 100644
--- a/src/Makefile.bench.include
+++ b/src/Makefile.bench.include
@@ -9,7 +9,8 @@ bench_bench_bitcoin_SOURCES = \
   bench/bench.h \
   bench/Examples.cpp \
   bench/rollingbloom.cpp \
-  bench/crypto_hash.cpp
+  bench/crypto_hash.cpp \
+  bench/base58.cpp
 
 bench_bench_bitcoin_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(EVENT_CLFAGS) $(EVENT_PTHREADS_CFLAGS) -I$(builddir)/bench/
 bench_bench_bitcoin_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
diff --git a/src/bench/base58.cpp b/src/bench/base58.cpp
new file mode 100644
index 0000000000000..1279c3e7df5dd
--- /dev/null
+++ b/src/bench/base58.cpp
@@ -0,0 +1,56 @@
+// Copyright (c) 2016 the Bitcoin Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#include "bench.h"
+
+#include "main.h"
+#include "base58.h"
+
+#include <vector>
+#include <string>
+
+
+static void Base58Encode(benchmark::State& state)
+{
+    unsigned char buff[32] = {
+        17, 79, 8, 99, 150, 189, 208, 162, 22, 23, 203, 163, 36, 58, 147,
+        227, 139, 2, 215, 100, 91, 38, 11, 141, 253, 40, 117, 21, 16, 90,
+        200, 24
+    };
+    unsigned char* b = buff;
+    while (state.KeepRunning()) {
+        EncodeBase58(b, b + 32);
+    }
+}
+
+
+static void Base58CheckEncode(benchmark::State& state)
+{
+    unsigned char buff[32] = {
+        17, 79, 8, 99, 150, 189, 208, 162, 22, 23, 203, 163, 36, 58, 147,
+        227, 139, 2, 215, 100, 91, 38, 11, 141, 253, 40, 117, 21, 16, 90,
+        200, 24
+    };
+    unsigned char* b = buff;
+    std::vector<unsigned char> vch;
+    vch.assign(b, b + 32);
+    while (state.KeepRunning()) {
+        EncodeBase58Check(vch);
+    }
+}
+
+
+static void Base58Decode(benchmark::State& state)
+{
+    const char* addr = "17VZNX1SN5NtKa8UQFxwQbFeFc3iqRYhem";
+    std::vector<unsigned char> vch;
+    while (state.KeepRunning()) {
+        DecodeBase58(addr, vch);
+    }
+}
+
+
+BENCHMARK(Base58Encode);
+BENCHMARK(Base58CheckEncode);
+BENCHMARK(Base58Decode);

From 13c455823f6d74c9632bc85191a0bebad973da1d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pavel=20Jan=C3=ADk?= <Pavel@Janik.cz>
Date: Fri, 27 May 2016 07:46:36 +0200
Subject: [PATCH 0369/1802] Remove unused local variable shadowing upper local

---
 src/test/sighash_tests.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/test/sighash_tests.cpp b/src/test/sighash_tests.cpp
index 04c6fa9625caa..e43b2ff6c45dc 100644
--- a/src/test/sighash_tests.cpp
+++ b/src/test/sighash_tests.cpp
@@ -195,7 +195,6 @@ BOOST_AUTO_TEST_CASE(sighash_from_data)
           nHashType = test[3].get_int();
           sigHashHex = test[4].get_str();
 
-          uint256 sh;
           CDataStream stream(ParseHex(raw_tx), SER_NETWORK, PROTOCOL_VERSION);
           stream >> tx;
 

From 88f14b999cb70f6c556633f2889e698a05305158 Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Fri, 27 May 2016 13:30:36 +0200
Subject: [PATCH 0370/1802] Include signal.h for sig_atomic_t in WIN32

---
 src/util.h | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/util.h b/src/util.h
index 88a00d3ca1fcb..c6f8af4cdf07d 100644
--- a/src/util.h
+++ b/src/util.h
@@ -28,9 +28,7 @@
 #include <boost/signals2/signal.hpp>
 #include <boost/thread/exceptions.hpp>
 
-#ifndef WIN32
 #include <signal.h>
-#endif
 
 static const bool DEFAULT_LOGTIMEMICROS = false;
 static const bool DEFAULT_LOGIPS        = false;

From 723779c6504453cfb5ccdacf864e7e2f09bb6c32 Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Fri, 27 May 2016 14:14:44 -0400
Subject: [PATCH 0371/1802] build: Enumerate ctaes rather than globbing

---
 src/Makefile.am | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index 31917f1350e46..cb8a99fe9aedb 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -410,6 +410,12 @@ libbitcoinconsensus_la_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
 endif
 #
 
+CTAES_DIST =  crypto/ctaes/bench.c
+CTAES_DIST += crypto/ctaes/ctaes.c
+CTAES_DIST += crypto/ctaes/ctaes.h
+CTAES_DIST += crypto/ctaes/README.md
+CTAES_DIST += crypto/ctaes/test.c
+
 CLEANFILES = leveldb/libleveldb.a leveldb/libmemenv.a
 CLEANFILES += $(EXTRA_LIBRARIES)
 CLEANFILES += *.gcda *.gcno
@@ -427,7 +433,7 @@ CLEANFILES += zmq/*.gcda zmq/*.gcno
 
 DISTCLEANFILES = obj/build.h
 
-EXTRA_DIST = leveldb crypto/ctaes
+EXTRA_DIST = leveldb $(CTAES_DIST)
 
 clean-local:
 	-$(MAKE) -C leveldb clean

From 619d5691c20bee5d08be2ce85aafa2cb570dbca4 Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Fri, 27 May 2016 13:30:08 +0200
Subject: [PATCH 0372/1802] Benchmark SipHash

---
 src/bench/crypto_hash.cpp | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/src/bench/crypto_hash.cpp b/src/bench/crypto_hash.cpp
index 6b753f6308371..168006154f8fe 100644
--- a/src/bench/crypto_hash.cpp
+++ b/src/bench/crypto_hash.cpp
@@ -6,6 +6,8 @@
 
 #include "bench.h"
 #include "bloom.h"
+#include "hash.h"
+#include "uint256.h"
 #include "utiltime.h"
 #include "crypto/ripemd160.h"
 #include "crypto/sha1.h"
@@ -39,6 +41,16 @@ static void SHA256(benchmark::State& state)
         CSHA256().Write(begin_ptr(in), in.size()).Finalize(hash);
 }
 
+static void SHA256_32b(benchmark::State& state)
+{
+    std::vector<uint8_t> in(32,0);
+    while (state.KeepRunning()) {
+        for (int i = 0; i < 1000000; i++) {
+            CSHA256().Write(begin_ptr(in), in.size()).Finalize(&in[0]);
+        }
+    }
+}
+
 static void SHA512(benchmark::State& state)
 {
     uint8_t hash[CSHA512::OUTPUT_SIZE];
@@ -47,7 +59,20 @@ static void SHA512(benchmark::State& state)
         CSHA512().Write(begin_ptr(in), in.size()).Finalize(hash);
 }
 
+static void SipHash_32b(benchmark::State& state)
+{
+    uint256 x;
+    while (state.KeepRunning()) {
+        for (int i = 0; i < 1000000; i++) {
+            *((uint64_t*)x.begin()) = SipHashUint256(0, i, x);
+        }
+    }
+}
+
 BENCHMARK(RIPEMD160);
 BENCHMARK(SHA1);
 BENCHMARK(SHA256);
 BENCHMARK(SHA512);
+
+BENCHMARK(SHA256_32b);
+BENCHMARK(SipHash_32b);

From fa2637a3beb8677067015df3d9d7b394fa837c2f Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Sat, 16 Apr 2016 12:25:12 +0200
Subject: [PATCH 0373/1802] Always require OS randomness when generating secret
 keys

---
 src/Makefile.am       |  3 ++-
 src/init.cpp          |  2 --
 src/key.cpp           |  3 +--
 src/main.cpp          |  1 -
 src/random.cpp        | 48 ++++++++++++++++++++++++++++++++++++++++++-
 src/random.h          | 11 ++++++----
 src/wallet/wallet.cpp |  8 ++------
 7 files changed, 59 insertions(+), 17 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index 3c056386fac7b..f630ad4aa1bb1 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -374,7 +374,8 @@ endif
 bitcoin_cli_LDADD = \
   $(LIBBITCOIN_CLI) \
   $(LIBUNIVALUE) \
-  $(LIBBITCOIN_UTIL)
+  $(LIBBITCOIN_UTIL) \
+  $(LIBBITCOIN_CRYPTO)
 
 bitcoin_cli_LDADD += $(BOOST_LIBS) $(SSL_LIBS) $(CRYPTO_LIBS) $(EVENT_LIBS)
 #
diff --git a/src/init.cpp b/src/init.cpp
index 9b6943c5866c2..98c0894122783 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -1401,8 +1401,6 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
     if (!strErrors.str().empty())
         return InitError(strErrors.str());
 
-    RandAddSeedPerfmon();
-
     //// debug print
     LogPrintf("mapBlockIndex.size() = %u\n",   mapBlockIndex.size());
     LogPrintf("nBestHeight = %d\n",                   chainActive.Height());
diff --git a/src/key.cpp b/src/key.cpp
index 6a3d9aa140906..79023566c3e61 100644
--- a/src/key.cpp
+++ b/src/key.cpp
@@ -124,9 +124,8 @@ bool CKey::Check(const unsigned char *vch) {
 }
 
 void CKey::MakeNewKey(bool fCompressedIn) {
-    RandAddSeedPerfmon();
     do {
-        GetRandBytes(vch, sizeof(vch));
+        GetStrongRandBytes(vch, sizeof(vch));
     } while (!Check(vch));
     fValid = true;
     fCompressed = fCompressedIn;
diff --git a/src/main.cpp b/src/main.cpp
index ed157b53dced7..ffc57d48be973 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -4547,7 +4547,6 @@ void static ProcessGetData(CNode* pfrom, const Consensus::Params& consensusParam
 
 bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv, int64_t nTimeReceived, const CChainParams& chainparams)
 {
-    RandAddSeedPerfmon();
     LogPrint("net", "received: %s (%u bytes) peer=%d\n", SanitizeString(strCommand), vRecv.size(), pfrom->id);
     if (mapArgs.count("-dropmessagestest") && GetRand(atoi(mapArgs["-dropmessagestest"])) == 0)
     {
diff --git a/src/random.cpp b/src/random.cpp
index 6155c0d8cf23a..8ad0a9b007b4b 100644
--- a/src/random.cpp
+++ b/src/random.cpp
@@ -5,9 +5,11 @@
 
 #include "random.h"
 
+#include "crypto/sha512.h"
 #include "support/cleanse.h"
 #ifdef WIN32
 #include "compat.h" // for Windows API
+#include <wincrypt.h>
 #endif
 #include "serialize.h"        // for begin_ptr(vec)
 #include "util.h"             // for LogPrint()
@@ -43,7 +45,7 @@ void RandAddSeed()
     memory_cleanse((void*)&nCounter, sizeof(nCounter));
 }
 
-void RandAddSeedPerfmon()
+static void RandAddSeedPerfmon()
 {
     RandAddSeed();
 
@@ -83,6 +85,29 @@ void RandAddSeedPerfmon()
 #endif
 }
 
+/** Get 32 bytes of system entropy. */
+static void GetOSRand(unsigned char *ent32)
+{
+#ifdef WIN32
+    HCRYPTPROV hProvider;
+    int ret = CryptAcquireContextW(&hProvider, NULL, NULL, PROV_RSA_FULL, CRYPT_VERIFYCONTEXT);
+    assert(ret);
+    ret = CryptGenRandom(hProvider, 32, ent32);
+    assert(ret);
+    CryptReleaseContext(hProvider, 0);
+#else
+    int f = open("/dev/urandom", O_RDONLY);
+    assert(f != -1);
+    int have = 0;
+    do {
+        ssize_t n = read(f, ent32 + have, 32 - have);
+        assert(n > 0 && n <= 32 - have);
+        have += n;
+    } while (have < 32);
+    close(f);
+#endif
+}
+
 void GetRandBytes(unsigned char* buf, int num)
 {
     if (RAND_bytes(buf, num) != 1) {
@@ -91,6 +116,27 @@ void GetRandBytes(unsigned char* buf, int num)
     }
 }
 
+void GetStrongRandBytes(unsigned char* out, int num)
+{
+    assert(num <= 32);
+    CSHA512 hasher;
+    unsigned char buf[64];
+
+    // First source: OpenSSL's RNG
+    RandAddSeedPerfmon();
+    GetRandBytes(buf, 32);
+    hasher.Write(buf, 32);
+
+    // Second source: OS RNG
+    GetOSRand(buf);
+    hasher.Write(buf, 32);
+
+    // Produce output
+    hasher.Finalize(buf);
+    memcpy(out, buf, num);
+    memory_cleanse(buf, 64);
+}
+
 uint64_t GetRand(uint64_t nMax)
 {
     if (nMax == 0)
diff --git a/src/random.h b/src/random.h
index 1a2d3e8ee24ca..31b80bd565bdc 100644
--- a/src/random.h
+++ b/src/random.h
@@ -10,11 +10,8 @@
 
 #include <stdint.h>
 
-/**
- * Seed OpenSSL PRNG with additional entropy data
- */
+/* Seed OpenSSL PRNG with additional entropy data */
 void RandAddSeed();
-void RandAddSeedPerfmon();
 
 /**
  * Functions to gather random data via the OpenSSL PRNG
@@ -24,6 +21,12 @@ uint64_t GetRand(uint64_t nMax);
 int GetRandInt(int nMax);
 uint256 GetRandHash();
 
+/**
+ * Function to gather random data from multiple sources, failing whenever any
+ * of those source fail to provide a result.
+ */
+void GetStrongRandBytes(unsigned char* buf, int num);
+
 /**
  * Seed insecure_rand using the random pool.
  * @param Deterministic Use a deterministic seed
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index 5d1a431190954..da0d6f272bfef 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -509,16 +509,14 @@ bool CWallet::EncryptWallet(const SecureString& strWalletPassphrase)
         return false;
 
     CKeyingMaterial vMasterKey;
-    RandAddSeedPerfmon();
 
     vMasterKey.resize(WALLET_CRYPTO_KEY_SIZE);
-    GetRandBytes(&vMasterKey[0], WALLET_CRYPTO_KEY_SIZE);
+    GetStrongRandBytes(&vMasterKey[0], WALLET_CRYPTO_KEY_SIZE);
 
     CMasterKey kMasterKey;
-    RandAddSeedPerfmon();
 
     kMasterKey.vchSalt.resize(WALLET_CRYPTO_SALT_SIZE);
-    GetRandBytes(&kMasterKey.vchSalt[0], WALLET_CRYPTO_SALT_SIZE);
+    GetStrongRandBytes(&kMasterKey.vchSalt[0], WALLET_CRYPTO_SALT_SIZE);
 
     CCrypter crypter;
     int64_t nStartTime = GetTimeMillis();
@@ -3147,8 +3145,6 @@ bool CWallet::InitLoadWallet()
     if (fFirstRun)
     {
         // Create new keyUser and set as default key
-        RandAddSeedPerfmon();
-
         CPubKey newDefaultKey;
         if (walletInstance->GetKeyFromPool(newDefaultKey)) {
             walletInstance->SetDefaultKey(newDefaultKey);

From 628cf1440aca8b5b259458a4ed41cc138cae34fa Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Sat, 23 Apr 2016 18:07:35 +0200
Subject: [PATCH 0374/1802] Don't use assert for catching randomness failures

---
 src/random.cpp | 26 ++++++++++++++++++++------
 1 file changed, 20 insertions(+), 6 deletions(-)

diff --git a/src/random.cpp b/src/random.cpp
index 8ad0a9b007b4b..d9a8cc145ea91 100644
--- a/src/random.cpp
+++ b/src/random.cpp
@@ -15,6 +15,7 @@
 #include "util.h"             // for LogPrint()
 #include "utilstrencodings.h" // for GetTime()
 
+#include <stdlib.h>
 #include <limits>
 
 #ifndef WIN32
@@ -24,6 +25,12 @@
 #include <openssl/err.h>
 #include <openssl/rand.h>
 
+static void RandFailure()
+{
+    LogPrintf("Failed to read randomness, aborting\n");
+    abort();
+}
+
 static inline int64_t GetPerformanceCounter()
 {
     int64_t nCounter = 0;
@@ -91,17 +98,25 @@ static void GetOSRand(unsigned char *ent32)
 #ifdef WIN32
     HCRYPTPROV hProvider;
     int ret = CryptAcquireContextW(&hProvider, NULL, NULL, PROV_RSA_FULL, CRYPT_VERIFYCONTEXT);
-    assert(ret);
+    if (!ret) {
+        RandFailure();
+    }
     ret = CryptGenRandom(hProvider, 32, ent32);
-    assert(ret);
+    if (!ret) {
+        RandFailure();
+    }
     CryptReleaseContext(hProvider, 0);
 #else
     int f = open("/dev/urandom", O_RDONLY);
-    assert(f != -1);
+    if (f == -1) {
+        RandFailure();
+    }
     int have = 0;
     do {
         ssize_t n = read(f, ent32 + have, 32 - have);
-        assert(n > 0 && n <= 32 - have);
+        if (n <= 0 || n + have > 32) {
+            RandFailure();
+        }
         have += n;
     } while (have < 32);
     close(f);
@@ -111,8 +126,7 @@ static void GetOSRand(unsigned char *ent32)
 void GetRandBytes(unsigned char* buf, int num)
 {
     if (RAND_bytes(buf, num) != 1) {
-        LogPrintf("%s: OpenSSL RAND_bytes() failed with error: %s\n", __func__, ERR_error_string(ERR_get_error(), NULL));
-        assert(false);
+        RandFailure();
     }
 }
 

From 1a8c4d575d9ae15c954a850a2516ef4a75eabf7a Mon Sep 17 00:00:00 2001
From: fanquake <fanquake@gmail.com>
Date: Fri, 27 May 2016 16:01:14 +0800
Subject: [PATCH 0375/1802] [Doc] Add benchmarking notes

---
 doc/README.md       |  1 +
 doc/benchmarking.md | 30 ++++++++++++++++++++++++++++++
 2 files changed, 31 insertions(+)
 create mode 100644 doc/benchmarking.md

diff --git a/doc/README.md b/doc/README.md
index 357334dfb23f5..c30f29452b786 100644
--- a/doc/README.md
+++ b/doc/README.md
@@ -57,6 +57,7 @@ The Bitcoin repo's [root README](/README.md) contains relevant information on th
 - [Shared Libraries](shared-libraries.md)
 - [BIPS](bips.md)
 - [Dnsseed Policy](dnsseed-policy.md)
+- [Benchmarking](benchmarking.md)
 
 ### Resources
 * Discuss on the [BitcoinTalk](https://bitcointalk.org/) forums, in the [Development & Technical Discussion board](https://bitcointalk.org/index.php?board=6.0).
diff --git a/doc/benchmarking.md b/doc/benchmarking.md
new file mode 100644
index 0000000000000..0ba75afcda3cb
--- /dev/null
+++ b/doc/benchmarking.md
@@ -0,0 +1,30 @@
+Benchmarking
+============
+
+Bitcoin Core has an internal benchmarking framework, with benchmarks
+for cryptographic algorithms such as SHA1, SHA256, SHA512 and RIPEMD160. As well as the rolling bloom filter.
+
+After compiling bitcoin-core, the benchmarks can be run with:
+`src/bench/bench_bitcoin`
+
+The output will look similar to:
+```
+#Benchmark,count,min,max,average
+RIPEMD160,448,0.001245033173334,0.002638196945190,0.002461894814457
+RollingBloom-refresh,1,0.000635000000000,0.000635000000000,0.000635000000000
+RollingBloom-refresh,1,0.000108000000000,0.000108000000000,0.000108000000000
+RollingBloom-refresh,1,0.000107000000000,0.000107000000000,0.000107000000000
+RollingBloom-refresh,1,0.000204000000000,0.000204000000000,0.000204000000000
+SHA1,640,0.000909024336207,0.001938136418660,0.001843086257577
+SHA256,256,0.002209486499909,0.008500099182129,0.004300644621253
+SHA512,384,0.001319904176016,0.002813005447388,0.002615700786312
+Sleep100ms,10,0.205592155456543,0.210056066513062,0.104166316986084
+Trig,67108864,0.000000014997003,0.000000015448112,0.000000015188842
+```
+
+More benchmarks are needed for, in no particular order:
+- Script Validation
+- CCoinDBView caching
+- Coins database
+- Memory pool
+- Wallet coin selection

From bd0f41387783ee91623d7fac15e89e57db37df82 Mon Sep 17 00:00:00 2001
From: Jonas Nick <jonasd.nick@gmail.com>
Date: Mon, 30 May 2016 11:43:53 +0200
Subject: [PATCH 0376/1802] Reduce unnecessary hashing in signrawtransaction

---
 src/rpc/rawtransaction.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/rpc/rawtransaction.cpp b/src/rpc/rawtransaction.cpp
index bec7ebe55f636..1bc31c4e3cac1 100644
--- a/src/rpc/rawtransaction.cpp
+++ b/src/rpc/rawtransaction.cpp
@@ -743,6 +743,9 @@ UniValue signrawtransaction(const UniValue& params, bool fHelp)
     // Script verification errors
     UniValue vErrors(UniValue::VARR);
 
+    // Use CTransaction for the constant parts of the
+    // transaction to avoid rehashing.
+    const CTransaction txConst(mergedTx);
     // Sign what we can:
     for (unsigned int i = 0; i < mergedTx.vin.size(); i++) {
         CTxIn& txin = mergedTx.vin[i];
@@ -760,10 +763,10 @@ UniValue signrawtransaction(const UniValue& params, bool fHelp)
 
         // ... and merge in other signatures:
         BOOST_FOREACH(const CMutableTransaction& txv, txVariants) {
-            txin.scriptSig = CombineSignatures(prevPubKey, mergedTx, i, txin.scriptSig, txv.vin[i].scriptSig);
+            txin.scriptSig = CombineSignatures(prevPubKey, txConst, i, txin.scriptSig, txv.vin[i].scriptSig);
         }
         ScriptError serror = SCRIPT_ERR_OK;
-        if (!VerifyScript(txin.scriptSig, prevPubKey, STANDARD_SCRIPT_VERIFY_FLAGS, MutableTransactionSignatureChecker(&mergedTx, i), &serror)) {
+        if (!VerifyScript(txin.scriptSig, prevPubKey, STANDARD_SCRIPT_VERIFY_FLAGS, TransactionSignatureChecker(&txConst, i), &serror)) {
             TxInErrorToJSON(txin, vErrors, ScriptErrorString(serror));
         }
     }

From e4f73c76b3a408037fdf32d9700d57f3d0e77a47 Mon Sep 17 00:00:00 2001
From: fanquake <fanquake@gmail.com>
Date: Mon, 30 May 2016 20:43:46 +0800
Subject: [PATCH 0377/1802] [Doc] Update implemented BIPs list

---
 doc/bips.md | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/doc/bips.md b/doc/bips.md
index b8efabbcf251c..b4b62e781ec61 100644
--- a/doc/bips.md
+++ b/doc/bips.md
@@ -1,5 +1,6 @@
-BIPs that are implemented by Bitcoin Core (up-to-date up to **v0.12.0**):
+BIPs that are implemented by Bitcoin Core (up-to-date up to **v0.13.0**):
 
+* [`BIP 9`](https://github.com/bitcoin/bips/blob/master/bip-0009.mediawiki): The changes allowing multiple soft-forks to be deployed in parallel have been implemented since **v0.12.1**  ([PR #7575](https://github.com/bitcoin/bitcoin/pull/7575))
 * [`BIP 11`](https://github.com/bitcoin/bips/blob/master/bip-0011.mediawiki): Multisig outputs are standard since **v0.6.0** ([PR #669](https://github.com/bitcoin/bitcoin/pull/669)).
 * [`BIP 13`](https://github.com/bitcoin/bips/blob/master/bip-0013.mediawiki): The address format for P2SH addresses has been implemented since **v0.6.0** ([PR #669](https://github.com/bitcoin/bitcoin/pull/669)).
 * [`BIP 14`](https://github.com/bitcoin/bips/blob/master/bip-0014.mediawiki): The subversion string is being used as User Agent since **v0.6.0** ([PR #669](https://github.com/bitcoin/bitcoin/pull/669)).
@@ -16,8 +17,11 @@ BIPs that are implemented by Bitcoin Core (up-to-date up to **v0.12.0**):
 * [`BIP 61`](https://github.com/bitcoin/bips/blob/master/bip-0061.mediawiki): The 'reject' protocol message (and the protocol version bump to 70002) was added in **v0.9.0** ([PR #3185](https://github.com/bitcoin/bitcoin/pull/3185)).
 * [`BIP 65`](https://github.com/bitcoin/bips/blob/master/bip-0065.mediawiki): The CHECKLOCKTIMEVERIFY softfork was merged in **v0.12.0** ([PR #6351](https://github.com/bitcoin/bitcoin/pull/6351)), and backported to **v0.11.2** and **v0.10.4**. Mempool-only CLTV was added in [PR #6124](https://github.com/bitcoin/bitcoin/pull/6124).
 * [`BIP 66`](https://github.com/bitcoin/bips/blob/master/bip-0066.mediawiki): The strict DER rules and associated version 3 blocks have been implemented since **v0.10.0** ([PR #5713](https://github.com/bitcoin/bitcoin/pull/5713)).
+* [`BIP 68`](https://github.com/bitcoin/bips/blob/master/bip-0068.mediawiki): Sequence locks have been implemented as of **v0.12.1**  ([PR #7184](https://github.com/bitcoin/bitcoin/pull/7184)).
 * [`BIP 70`](https://github.com/bitcoin/bips/blob/master/bip-0070.mediawiki) [`71`](https://github.com/bitcoin/bips/blob/master/bip-0071.mediawiki) [`72`](https://github.com/bitcoin/bips/blob/master/bip-0072.mediawiki): Payment Protocol support has been available in Bitcoin Core GUI since **v0.9.0** ([PR #5216](https://github.com/bitcoin/bitcoin/pull/5216)).
 * [`BIP 111`](https://github.com/bitcoin/bips/blob/master/bip-0111.mediawiki): `NODE_BLOOM` service bit added, and enforced for all peer versions as of **v0.13.0** ([PR #6579](https://github.com/bitcoin/bitcoin/pull/6579) and [PR #6641](https://github.com/bitcoin/bitcoin/pull/6641)).
+* [`BIP 112`](https://github.com/bitcoin/bips/blob/master/bip-0112.mediawiki): The CHECKSEQUENCEVERIFY opcode has been implemented since **v0.12.1** ([PR #7524](https://github.com/bitcoin/bitcoin/pull/7524)).
+* [`BIP 113`](https://github.com/bitcoin/bips/blob/master/bip-0113.mediawiki): Median time past lock-time calculations have been implemented since **v0.12.1** ([PR #6566](https://github.com/bitcoin/bitcoin/pull/6566)).
 * [`BIP 125`](https://github.com/bitcoin/bips/blob/master/bip-0125.mediawiki): Opt-in full replace-by-fee signaling honoured in mempool and mining as of **v0.12.0** ([PR 6871](https://github.com/bitcoin/bitcoin/pull/6871)).
 * [`BIP 130`](https://github.com/bitcoin/bips/blob/master/bip-0130.mediawiki): direct headers announcement is negotiated with peer versions `>=70012` as of **v0.12.0** ([PR 6494](https://github.com/bitcoin/bitcoin/pull/6494)).
 * [`BIP 133`](https://github.com/bitcoin/bips/blob/master/bip-0133.mediawiki): feefilter messages are respected and sent for peer versions `>=70013` as of **v0.13.0** ([PR 7542](https://github.com/bitcoin/bitcoin/pull/7542)).

From b682960a28137966306e0a3646c96fa5f4b811ff Mon Sep 17 00:00:00 2001
From: Chris Stewart <stewart.chris1234@gmail.com>
Date: Mon, 23 May 2016 14:23:07 -0500
Subject: [PATCH 0378/1802] Adding P2SH(p2pkh) script test case

Fixing formatting

Adding test case into automatically generated test case set

Clean up commits

removing extra whitespace from eol

Removing extra whitespace on macro line
---
 src/test/data/script_tests.json | 7 +++++++
 src/test/script_tests.cpp       | 5 ++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/test/data/script_tests.json b/src/test/data/script_tests.json
index 757d94b526857..0bdac182e0079 100644
--- a/src/test/data/script_tests.json
+++ b/src/test/data/script_tests.json
@@ -1310,6 +1310,13 @@
     "EVAL_FALSE",
     "P2SH(P2PK), bad redeemscript"
 ],
+[
+    "0x47 0x30440220781ba4f59a7b207a10db87628bc2168df4d59b844b397d2dbc9a5835fb2f2b7602206ed8fbcc1072fe2dfc5bb25909269e5dc42ffcae7ec2bc81d59692210ff30c2b01 0x41 0x0479be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8 0x19 0x76a91491b24bf9f5288532960ac687abb035127b1d28a588ac",
+    "HASH160 0x14 0x7f67f0521934a57d3039f77f9f32cf313f3ac74b EQUAL",
+    "P2SH",
+    "OK",
+    "P2SH(P2PKH)"
+],
 [
     "0x47 0x304402204e2eb034be7b089534ac9e798cf6a2c79f38bcb34d1b179efd6f2de0841735db022071461beb056b5a7be1819da6a3e3ce3662831ecc298419ca101eb6887b5dd6a401 0x19 0x76a9147cf9c846cd4882efec4bf07e44ebdad495c94f4b88ac",
     "HASH160 0x14 0x2df519943d5acc0ef5222091f9dfe3543f489a82 EQUAL",
diff --git a/src/test/script_tests.cpp b/src/test/script_tests.cpp
index 5e9711a4a7e26..39089f103d0c2 100644
--- a/src/test/script_tests.cpp
+++ b/src/test/script_tests.cpp
@@ -427,7 +427,10 @@ BOOST_AUTO_TEST_CASE(script_build)
     tests.push_back(TestBuilder(CScript() << ToByteVector(keys.pubkey0C) << OP_CHECKSIG,
                                 "P2SH(P2PK), bad redeemscript", SCRIPT_VERIFY_P2SH, true
                                ).PushSig(keys.key0).PushRedeem().DamagePush(10).ScriptError(SCRIPT_ERR_EVAL_FALSE));
-
+    
+    tests.push_back(TestBuilder(CScript() << OP_DUP << OP_HASH160 << ToByteVector(keys.pubkey0.GetID()) << OP_EQUALVERIFY << OP_CHECKSIG,
+                                "P2SH(P2PKH)", SCRIPT_VERIFY_P2SH, true
+                               ).PushSig(keys.key0).Push(keys.pubkey0).PushRedeem());
     tests.push_back(TestBuilder(CScript() << OP_DUP << OP_HASH160 << ToByteVector(keys.pubkey1.GetID()) << OP_EQUALVERIFY << OP_CHECKSIG,
                                 "P2SH(P2PKH), bad sig but no VERIFY_P2SH", 0, true
                                ).PushSig(keys.key0).DamagePush(10).PushRedeem());

From 63ff57db4beb2e92b3d8ed396da016f29f790195 Mon Sep 17 00:00:00 2001
From: Gregory Maxwell <greg@xiph.org>
Date: Sun, 29 May 2016 01:36:52 +0000
Subject: [PATCH 0379/1802] Avoid integer division in the benchmark inner-most
 loop.

Previously the benchmark code used an integer division (%) with
 a non-constant in the inner-loop.  This is quite slow on many
 processors, especially ones like ARM that lack a hardware divide.

Even on fairly recent x86_64 like haswell an integer division can
 take something like 100 cycles-- making it comparable to the
 runtime of siphash.

This change avoids the division by using bitmasking instead. This
 was especially easy since the count was only increased by doubling.

This change also restarts the timing when the execution time was
 very low this avoids mintimes of zero in cases where one execution
 ends up below the timer resolution. It also reduces the impact of
 the overhead on the final result.

The formatting of the prints is changed to not use scientific
 notation make it more machine readable (in particular, gnuplot
 croaks on the non-fixedpoint, and it doesn't sort correctly).

This also hoists out all the floating point divisions out of the
 semi-hot path because it was easy to do so.

It might be prudent to break out the critical test into a macro
 just to guarantee that it gets inlined.  It might also make sense
 to just save out the intermediate counts and times and get the
 floating point completely out of the timing loop (because e.g.
 on hardware without a fast hardware FPU like some ARM it will
 still be slow enough to distort the results). I haven't done
 either of these in this commit.
---
 src/bench/bench.cpp | 35 ++++++++++++++++++++++++-----------
 src/bench/bench.h   |  7 ++++---
 2 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/src/bench/bench.cpp b/src/bench/bench.cpp
index 6ee3cdc27a49e..227546a7a78a3 100644
--- a/src/bench/bench.cpp
+++ b/src/bench/bench.cpp
@@ -5,6 +5,7 @@
 #include "bench.h"
 
 #include <iostream>
+#include <iomanip>
 #include <sys/time.h>
 
 using namespace benchmark;
@@ -25,7 +26,7 @@ BenchRunner::BenchRunner(std::string name, BenchFunction func)
 void
 BenchRunner::RunAll(double elapsedTimeForOne)
 {
-    std::cout << "Benchmark" << "," << "count" << "," << "min" << "," << "max" << "," << "average" << "\n";
+    std::cout << "#Benchmark" << "," << "count" << "," << "min" << "," << "max" << "," << "average" << "\n";
 
     for (std::map<std::string,BenchFunction>::iterator it = benchmarks.begin();
          it != benchmarks.end(); ++it) {
@@ -38,22 +39,34 @@ BenchRunner::RunAll(double elapsedTimeForOne)
 
 bool State::KeepRunning()
 {
+    if (count & countMask) {
+      ++count;
+      return true;
+    }
     double now;
     if (count == 0) {
-        beginTime = now = gettimedouble();
+        lastTime = beginTime = now = gettimedouble();
     }
     else {
-        // timeCheckCount is used to avoid calling gettime most of the time,
-        // so benchmarks that run very quickly get consistent results.
-        if ((count+1)%timeCheckCount != 0) {
-            ++count;
-            return true; // keep going
-        }
         now = gettimedouble();
-        double elapsedOne = (now - lastTime)/timeCheckCount;
+        double elapsed = now - lastTime;
+        double elapsedOne = elapsed * countMaskInv;
         if (elapsedOne < minTime) minTime = elapsedOne;
         if (elapsedOne > maxTime) maxTime = elapsedOne;
-        if (elapsedOne*timeCheckCount < maxElapsed/16) timeCheckCount *= 2;
+        if (elapsed*128 < maxElapsed) {
+          // If the execution was much too fast (1/128th of maxElapsed), increase the count mask by 8x and restart timing.
+          // The restart avoids including the overhead of this code in the measurement.
+          countMask = ((countMask<<3)|7) & ((1LL<<60)-1);
+          countMaskInv = 1./(countMask+1);
+          count = 0;
+          minTime = std::numeric_limits<double>::max();
+          maxTime = std::numeric_limits<double>::min();
+          return true;
+        }
+        if (elapsed*16 < maxElapsed) {
+          countMask = ((countMask<<1)|1) & ((1LL<<60)-1);
+          countMaskInv = 1./(countMask+1);
+        }
     }
     lastTime = now;
     ++count;
@@ -64,7 +77,7 @@ bool State::KeepRunning()
 
     // Output results
     double average = (now-beginTime)/count;
-    std::cout << name << "," << count << "," << minTime << "," << maxTime << "," << average << "\n";
+    std::cout << std::fixed << std::setprecision(15) << name << "," << count << "," << minTime << "," << maxTime << "," << average << "\n";
 
     return false;
 }
diff --git a/src/bench/bench.h b/src/bench/bench.h
index 5ce13c642b59b..f13b145aaf0c7 100644
--- a/src/bench/bench.h
+++ b/src/bench/bench.h
@@ -40,14 +40,15 @@ namespace benchmark {
         std::string name;
         double maxElapsed;
         double beginTime;
-        double lastTime, minTime, maxTime;
+        double lastTime, minTime, maxTime, countMaskInv;
         int64_t count;
-        int64_t timeCheckCount;
+        int64_t countMask;
     public:
         State(std::string _name, double _maxElapsed) : name(_name), maxElapsed(_maxElapsed), count(0) {
             minTime = std::numeric_limits<double>::max();
             maxTime = std::numeric_limits<double>::min();
-            timeCheckCount = 1;
+            countMask = 1;
+            countMaskInv = 1./(countMask + 1);
         }
         bool KeepRunning();
     };

From 16698cb77e455ae1e2fffd8d0225d2486232a366 Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@dash.org>
Date: Tue, 31 May 2016 05:30:35 +0300
Subject: [PATCH 0380/1802] PR #7772 is not enough to fix the issue with
 QCompleter, use event filter instead of `connect`

---
 src/qt/rpcconsole.cpp | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/qt/rpcconsole.cpp b/src/qt/rpcconsole.cpp
index b11648e46fcf2..11f3e49a06d9b 100644
--- a/src/qt/rpcconsole.cpp
+++ b/src/qt/rpcconsole.cpp
@@ -327,6 +327,14 @@ bool RPCConsole::eventFilter(QObject* obj, QEvent *event)
                 return true;
             }
             break;
+        case Qt::Key_Return:
+        case Qt::Key_Enter:
+            // forward these events to lineEdit
+            if(obj == autoCompleter->popup()) {
+                QApplication::postEvent(ui->lineEdit, new QKeyEvent(*keyevt));
+                return true;
+            }
+            break;
         default:
             // Typing in messages widget brings focus to line edit, and redirects key there
             // Exclude most combinations and keys that emit no text, except paste shortcuts
@@ -458,9 +466,7 @@ void RPCConsole::setClientModel(ClientModel *model)
 
         autoCompleter = new QCompleter(wordList, this);
         ui->lineEdit->setCompleter(autoCompleter);
-
-	// clear the lineEdit after activating from QCompleter
-	connect(autoCompleter, SIGNAL(activated(const QString&)), ui->lineEdit, SLOT(clear()), Qt::QueuedConnection);
+        autoCompleter->popup()->installEventFilter(this);
     }
 }
 

From f19025106de47a92396f9fb98e6d3bbc568c40b5 Mon Sep 17 00:00:00 2001
From: Jonas Schnelli <dev@jonasschnelli.ch>
Date: Sat, 2 Jan 2016 12:34:08 +0100
Subject: [PATCH 0381/1802] [Wallet] Add simplest BIP32/deterministic key
 generation implementation

---
 src/wallet/wallet.cpp   | 86 +++++++++++++++++++++++++++++++++++++++--
 src/wallet/wallet.h     | 12 ++++++
 src/wallet/walletdb.cpp | 17 ++++++++
 src/wallet/walletdb.h   | 32 +++++++++++++++
 4 files changed, 143 insertions(+), 4 deletions(-)

diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index da0d6f272bfef..fdb46472a83a1 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -91,7 +91,48 @@ CPubKey CWallet::GenerateNewKey()
     bool fCompressed = CanSupportFeature(FEATURE_COMPRPUBKEY); // default to compressed public keys if we want 0.6.0 wallets
 
     CKey secret;
-    secret.MakeNewKey(fCompressed);
+
+    // Create new metadata
+    int64_t nCreationTime = GetTime();
+    CKeyMetadata metadata(nCreationTime);
+
+    // use HD key derivation if HD was enabled during wallet creation
+    if (!hdChain.masterKeyID.IsNull()) {
+        // for now we use a fixed keypath scheme of m/0'/0'/k
+        CKey key;                      //master key seed (256bit)
+        CExtKey masterKey;             //hd master key
+        CExtKey accountKey;            //key at m/0'
+        CExtKey externalChainChildKey; //key at m/0'/0'
+        CExtKey childKey;              //key at m/0'/0'/<n>'
+
+        // try to get the master key
+        if (!GetKey(hdChain.masterKeyID, key))
+            throw std::runtime_error("CWallet::GenerateNewKey(): Master key not found");
+
+        masterKey.SetMaster(key.begin(), key.size());
+
+        // derive m/0'
+        // use hardened derivation (child keys > 0x80000000 are hardened after bip32)
+        masterKey.Derive(accountKey, 0 | 0x80000000);
+
+        // derive m/0'/0'
+        accountKey.Derive(externalChainChildKey, 0 | 0x80000000);
+
+        // derive child key at next index, skip keys already known to the wallet
+        do
+        {
+            externalChainChildKey.Derive(childKey, hdChain.nExternalChainCounter | 0x80000000);
+            // increment childkey index
+            hdChain.nExternalChainCounter++;
+        } while(HaveKey(childKey.key.GetPubKey().GetID()));
+        secret = childKey.key;
+
+        // update the chain model in the database
+        if (!CWalletDB(strWalletFile).WriteHDChain(hdChain))
+            throw std::runtime_error("CWallet::GenerateNewKey(): Writing HD chain model failed");
+    } else {
+        secret.MakeNewKey(fCompressed);
+    }
 
     // Compressed public keys were introduced in version 0.6.0
     if (fCompressed)
@@ -100,9 +141,7 @@ CPubKey CWallet::GenerateNewKey()
     CPubKey pubkey = secret.GetPubKey();
     assert(secret.VerifyPubKey(pubkey));
 
-    // Create new metadata
-    int64_t nCreationTime = GetTime();
-    mapKeyMetadata[pubkey.GetID()] = CKeyMetadata(nCreationTime);
+    mapKeyMetadata[pubkey.GetID()] = metadata;
     if (!nTimeFirstKey || nCreationTime < nTimeFirstKey)
         nTimeFirstKey = nCreationTime;
 
@@ -1049,6 +1088,37 @@ CAmount CWallet::GetChange(const CTransaction& tx) const
     return nChange;
 }
 
+bool CWallet::SetHDMasterKey(const CKey& key)
+{
+    LOCK(cs_wallet);
+
+    // store the key as normal "key"/"ckey" object
+    // in the database
+    // key metadata is not required
+    CPubKey pubkey = key.GetPubKey();
+    if (!AddKeyPubKey(key, pubkey))
+        throw std::runtime_error("CWallet::GenerateNewKey(): AddKey failed");
+
+    // store the keyid (hash160) together with
+    // the child index counter in the database
+    // as a hdchain object
+    CHDChain newHdChain;
+    newHdChain.masterKeyID = pubkey.GetID();
+    SetHDChain(newHdChain, false);
+
+    return true;
+}
+
+bool CWallet::SetHDChain(const CHDChain& chain, bool memonly)
+{
+    LOCK(cs_wallet);
+    if (!memonly && !CWalletDB(strWalletFile).WriteHDChain(chain))
+        throw runtime_error("AddHDChain(): writing chain failed");
+
+    hdChain = chain;
+    return true;
+}
+
 int64_t CWalletTx::GetTxTime() const
 {
     int64_t n = nTimeSmart;
@@ -3058,6 +3128,7 @@ std::string CWallet::GetWalletHelpString(bool showDebug)
         strUsage += HelpMessageOpt("-sendfreetransactions", strprintf(_("Send transactions as zero-fee transactions if possible (default: %u)"), DEFAULT_SEND_FREE_TRANSACTIONS));
     strUsage += HelpMessageOpt("-spendzeroconfchange", strprintf(_("Spend unconfirmed change when sending transactions (default: %u)"), DEFAULT_SPEND_ZEROCONF_CHANGE));
     strUsage += HelpMessageOpt("-txconfirmtarget=<n>", strprintf(_("If paytxfee is not set, include enough fee so transactions begin confirmation on average within n blocks (default: %u)"), DEFAULT_TX_CONFIRM_TARGET));
+    strUsage += HelpMessageOpt("-usehd", _("Use hierarchical deterministic key generation (HD) after bip32. Only has effect during wallet creation/first start") + " " + strprintf(_("(default: %u)"), DEFAULT_USE_HD_WALLET));
     strUsage += HelpMessageOpt("-upgradewallet", _("Upgrade wallet to latest format on startup"));
     strUsage += HelpMessageOpt("-wallet=<file>", _("Specify wallet file (within data directory)") + " " + strprintf(_("(default: %s)"), DEFAULT_WALLET_DAT));
     strUsage += HelpMessageOpt("-walletbroadcast", _("Make the wallet broadcast transactions") + " " + strprintf(_("(default: %u)"), DEFAULT_WALLETBROADCAST));
@@ -3145,6 +3216,13 @@ bool CWallet::InitLoadWallet()
     if (fFirstRun)
     {
         // Create new keyUser and set as default key
+        if (GetBoolArg("-usehd", DEFAULT_USE_HD_WALLET)) {
+            // generate a new master key
+            CKey key;
+            key.MakeNewKey(true);
+            if (!walletInstance->SetHDMasterKey(key))
+                throw std::runtime_error("CWallet::GenerateNewKey(): Storing master key failed");
+        }
         CPubKey newDefaultKey;
         if (walletInstance->GetKeyFromPool(newDefaultKey)) {
             walletInstance->SetDefaultKey(newDefaultKey);
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
index b2180a5a26bb8..a819c03266e5e 100644
--- a/src/wallet/wallet.h
+++ b/src/wallet/wallet.h
@@ -57,6 +57,9 @@ static const unsigned int DEFAULT_TX_CONFIRM_TARGET = 2;
 static const unsigned int MAX_FREE_TRANSACTION_CREATE_SIZE = 1000;
 static const bool DEFAULT_WALLETBROADCAST = true;
 
+//! if set, all keys will be derived by using BIP32
+static const bool DEFAULT_USE_HD_WALLET = true;
+
 extern const char * DEFAULT_WALLET_DAT;
 
 class CBlockIndex;
@@ -574,6 +577,9 @@ class CWallet : public CCryptoKeyStore, public CValidationInterface
 
     void SyncMetaData(std::pair<TxSpends::iterator, TxSpends::iterator>);
 
+    /* the hd chain data model (external chain counters) */
+    CHDChain hdChain;
+
 public:
     /*
      * Main wallet lock.
@@ -887,6 +893,12 @@ class CWallet : public CCryptoKeyStore, public CValidationInterface
     static bool ParameterInteraction();
 
     bool BackupWallet(const std::string& strDest);
+
+    /* Set the hd chain model (chain child index counters) */
+    bool SetHDChain(const CHDChain& chain, bool memonly);
+
+    /* Set the current hd master key (will reset the chain child index counters) */
+    bool SetHDMasterKey(const CKey& key);
 };
 
 /** A key allocated from the key pool. */
diff --git a/src/wallet/walletdb.cpp b/src/wallet/walletdb.cpp
index b5037c9a65abf..7bfd4909506f3 100644
--- a/src/wallet/walletdb.cpp
+++ b/src/wallet/walletdb.cpp
@@ -599,6 +599,16 @@ ReadKeyValue(CWallet* pwallet, CDataStream& ssKey, CDataStream& ssValue,
                 return false;
             }
         }
+        else if (strType == "hdchain")
+        {
+            CHDChain chain;
+            ssValue >> chain;
+            if (!pwallet->SetHDChain(chain, true))
+            {
+                strErr = "Error reading wallet database: SetHDChain failed";
+                return false;
+            }
+        }
     } catch (...)
     {
         return false;
@@ -1003,3 +1013,10 @@ bool CWalletDB::EraseDestData(const std::string &address, const std::string &key
     nWalletDBUpdated++;
     return Erase(std::make_pair(std::string("destdata"), std::make_pair(address, key)));
 }
+
+
+bool CWalletDB::WriteHDChain(const CHDChain& chain)
+{
+    nWalletDBUpdated++;
+    return Write(std::string("hdchain"), chain);
+}
diff --git a/src/wallet/walletdb.h b/src/wallet/walletdb.h
index 00c10ea70f03b..71b0ff26db173 100644
--- a/src/wallet/walletdb.h
+++ b/src/wallet/walletdb.h
@@ -40,6 +40,35 @@ enum DBErrors
     DB_NEED_REWRITE
 };
 
+/* simple hd chain data model */
+class CHDChain
+{
+public:
+    uint32_t nExternalChainCounter;
+    CKeyID masterKeyID; //!< master key hash160
+
+    static const int CURRENT_VERSION = 1;
+    int nVersion;
+
+    CHDChain() { SetNull(); }
+    ADD_SERIALIZE_METHODS;
+    template <typename Stream, typename Operation>
+    inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion)
+    {
+        READWRITE(this->nVersion);
+        nVersion = this->nVersion;
+        READWRITE(nExternalChainCounter);
+        READWRITE(masterKeyID);
+    }
+
+    void SetNull()
+    {
+        nVersion = CHDChain::CURRENT_VERSION;
+        nExternalChainCounter = 0;
+        masterKeyID.SetNull();
+    }
+};
+
 class CKeyMetadata
 {
 public:
@@ -134,6 +163,9 @@ class CWalletDB : public CDB
     static bool Recover(CDBEnv& dbenv, const std::string& filename, bool fOnlyKeys);
     static bool Recover(CDBEnv& dbenv, const std::string& filename);
 
+    //! write the hdchain model (external chain child index counter)
+    bool WriteHDChain(const CHDChain& chain);
+
 private:
     CWalletDB(const CWalletDB&);
     void operator=(const CWalletDB&);

From 4d8993b3469915d8c9ba4cd3b918f16782edf0de Mon Sep 17 00:00:00 2001
From: Gregory Maxwell <greg@xiph.org>
Date: Sat, 21 May 2016 09:45:32 +0000
Subject: [PATCH 0382/1802] Defer inserting into maprelay until just before
 relaying.

This reduces the rate of not founds by better matching the far
 end expectations, it also improves privacy by removing the
 ability to use getdata to probe for a node having a txn before
 it has been relayed.
---
 src/main.cpp | 43 ++++++++++++++++++++++++++++++-------------
 src/net.cpp  | 15 ---------------
 src/net.h    |  3 ---
 3 files changed, 30 insertions(+), 31 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index c2905784f0455..f9b8ab37e3f6d 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -80,6 +80,10 @@ uint64_t nPruneTarget = 0;
 int64_t nMaxTipAge = DEFAULT_MAX_TIP_AGE;
 bool fEnableReplacement = DEFAULT_ENABLE_REPLACEMENT;
 
+std::map<uint256, CTransaction> mapRelay;
+std::deque<std::pair<int64_t, uint256> > vRelayExpiration;
+CCriticalSection cs_mapRelay;
+
 CFeeRate minRelayTxFee = CFeeRate(DEFAULT_MIN_RELAY_TX_FEE);
 CAmount maxTxFee = DEFAULT_TRANSACTION_MAXFEE;
 
@@ -4501,27 +4505,28 @@ void static ProcessGetData(CNode* pfrom, const Consensus::Params& consensusParam
             }
             else if (inv.IsKnownType())
             {
+                CTransaction tx;
                 // Send stream from relay memory
-                bool pushed = false;
+                bool push = false;
                 {
                     LOCK(cs_mapRelay);
                     map<uint256, CTransaction>::iterator mi = mapRelay.find(inv.hash);
                     if (mi != mapRelay.end()) {
-                        pfrom->PushMessage(inv.GetCommand(), (*mi).second);
-                        pushed = true;
+                        tx = (*mi).second;
+                        push = true;
                     }
                 }
-                if (!pushed && inv.type == MSG_TX) {
-                    CTransaction tx;
+                if (!push && inv.type == MSG_TX) {
                     int64_t txtime;
                     // To protect privacy, do not answer getdata using the mempool when
                     // that TX couldn't have been INVed in reply to a MEMPOOL request.
                     if (mempool.lookup(inv.hash, tx, txtime) && txtime <= pfrom->timeLastMempoolReq) {
-                        pfrom->PushMessage(NetMsgType::TX, tx);
-                        pushed = true;
+                        push = true;
                     }
                 }
-                if (!pushed) {
+                if (push) {
+                    pfrom->PushMessage(inv.GetCommand(), tx);
+                } else {
                     vNotFound.push_back(inv);
                 }
             }
@@ -5958,14 +5963,26 @@ bool SendMessages(CNode* pto)
                     if (filterrate && feeRate.GetFeePerK() < filterrate) {
                         continue;
                     }
-                    if (pto->pfilter) {
-                        CTransaction tx;
-                        if (!mempool.lookup(hash, tx)) continue;
-                        if (!pto->pfilter->IsRelevantAndUpdate(tx)) continue;
-                    }
+                    CTransaction tx;
+                    if (!mempool.lookup(hash, tx)) continue;
+                    if (pto->pfilter && !pto->pfilter->IsRelevantAndUpdate(tx)) continue;
                     // Send
                     vInv.push_back(CInv(MSG_TX, hash));
                     nRelayedTransactions++;
+                    {
+                        LOCK(cs_mapRelay);
+                        // Expire old relay messages
+                        while (!vRelayExpiration.empty() && vRelayExpiration.front().first < GetTime())
+                        {
+                            mapRelay.erase(vRelayExpiration.front().second);
+                            vRelayExpiration.pop_front();
+                        }
+
+                        auto ret = mapRelay.insert(std::make_pair(hash, tx));
+                        if (ret.second) {
+                            vRelayExpiration.push_back(std::make_pair(GetTime() + 15 * 60, hash));
+                        }
+                    }
                     if (vInv.size() == MAX_INV_SZ) {
                         pto->PushMessage(NetMsgType::INV, vInv);
                         vInv.clear();
diff --git a/src/net.cpp b/src/net.cpp
index 78a914ebdf8f6..c09e3aedb6b76 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -90,9 +90,6 @@ std::string strSubVersion;
 
 std::vector<CNode*> vNodes;
 CCriticalSection cs_vNodes;
-std::map<uint256, CTransaction> mapRelay;
-std::deque<std::pair<int64_t, uint256> > vRelayExpiration;
-CCriticalSection cs_mapRelay;
 limitedmap<uint256, int64_t> mapAlreadyAskedFor(MAX_INV_SZ);
 
 static std::deque<std::string> vOneShots;
@@ -2081,18 +2078,6 @@ instance_of_cnetcleanup;
 void RelayTransaction(const CTransaction& tx)
 {
     CInv inv(MSG_TX, tx.GetHash());
-    {
-        LOCK(cs_mapRelay);
-        // Expire old relay messages
-        while (!vRelayExpiration.empty() && vRelayExpiration.front().first < GetTime())
-        {
-            mapRelay.erase(vRelayExpiration.front().second);
-            vRelayExpiration.pop_front();
-        }
-
-        mapRelay.insert(std::make_pair(inv.hash, tx));
-        vRelayExpiration.push_back(std::make_pair(GetTime() + 15 * 60, inv.hash));
-    }
     LOCK(cs_vNodes);
     BOOST_FOREACH(CNode* pnode, vNodes)
     {
diff --git a/src/net.h b/src/net.h
index 0b4cd0bcb37c5..403653e8c83a3 100644
--- a/src/net.h
+++ b/src/net.h
@@ -162,9 +162,6 @@ extern int nMaxConnections;
 
 extern std::vector<CNode*> vNodes;
 extern CCriticalSection cs_vNodes;
-extern std::map<uint256, CTransaction> mapRelay;
-extern std::deque<std::pair<int64_t, uint256> > vRelayExpiration;
-extern CCriticalSection cs_mapRelay;
 extern limitedmap<uint256, int64_t> mapAlreadyAskedFor;
 
 extern std::vector<std::string> vAddedNodes;

From 8c9e681ff8bae61c803cdcc1d05d69cbea5da7bf Mon Sep 17 00:00:00 2001
From: mrbandrews <bandrewsny@gmail.com>
Date: Tue, 31 May 2016 14:21:40 -0400
Subject: [PATCH 0383/1802] Tests: Rework blockstore to avoid re-serialization.

---
 qa/rpc-tests/test_framework/blockstore.py | 59 +++++++++++++++--------
 qa/rpc-tests/test_framework/mininode.py   | 13 +++++
 2 files changed, 53 insertions(+), 19 deletions(-)

diff --git a/qa/rpc-tests/test_framework/blockstore.py b/qa/rpc-tests/test_framework/blockstore.py
index 4bc279032bf08..6120dd574b5dd 100644
--- a/qa/rpc-tests/test_framework/blockstore.py
+++ b/qa/rpc-tests/test_framework/blockstore.py
@@ -13,20 +13,31 @@ def __init__(self, datadir):
         self.blockDB = dbm.ndbm.open(datadir + "/blocks", 'c')
         self.currentBlock = 0
         self.headers_map = dict()
-    
+
     def close(self):
         self.blockDB.close()
 
+    def erase(self, blockhash):
+        del self.blockDB[repr(blockhash)]
+
+    # lookup an entry and return the item as raw bytes
     def get(self, blockhash):
-        serialized_block = None
+        value = None
         try:
-            serialized_block = self.blockDB[repr(blockhash)]
+            value = self.blockDB[repr(blockhash)]
         except KeyError:
             return None
-        f = BytesIO(serialized_block)
-        ret = CBlock()
-        ret.deserialize(f)
-        ret.calc_sha256()
+        return value
+
+    # lookup an entry and return it as a CBlock
+    def get_block(self, blockhash):
+        ret = None
+        serialized_block = self.get(blockhash)
+        if serialized_block is not None:
+            f = BytesIO(serialized_block)
+            ret = CBlock()
+            ret.deserialize(f)
+            ret.calc_sha256()
         return ret
 
     def get_header(self, blockhash):
@@ -75,13 +86,16 @@ def add_block(self, block):
     def add_header(self, header):
         self.headers_map[header.sha256] = header
 
+    # lookup the hashes in "inv", and return p2p messages for delivering
+    # blocks found.
     def get_blocks(self, inv):
         responses = []
         for i in inv:
             if (i.type == 2): # MSG_BLOCK
-                block = self.get(i.hash)
-                if block is not None:
-                    responses.append(msg_block(block))
+                data = self.get(i.hash)
+                if data is not None:
+                    # Use msg_generic to avoid re-serialization
+                    responses.append(msg_generic(b"block", data))
         return responses
 
     def get_locator(self, current_tip=None):
@@ -90,11 +104,11 @@ def get_locator(self, current_tip=None):
         r = []
         counter = 0
         step = 1
-        lastBlock = self.get(current_tip)
+        lastBlock = self.get_block(current_tip)
         while lastBlock is not None:
             r.append(lastBlock.hashPrevBlock)
             for i in range(step):
-                lastBlock = self.get(lastBlock.hashPrevBlock)
+                lastBlock = self.get_block(lastBlock.hashPrevBlock)
                 if lastBlock is None:
                     break
             counter += 1
@@ -111,16 +125,23 @@ def __init__(self, datadir):
     def close(self):
         self.txDB.close()
 
+    # lookup an entry and return the item as raw bytes
     def get(self, txhash):
-        serialized_tx = None
+        value = None
         try:
-            serialized_tx = self.txDB[repr(txhash)]
+            value = self.txDB[repr(txhash)]
         except KeyError:
             return None
-        f = BytesIO(serialized_tx)
-        ret = CTransaction()
-        ret.deserialize(f)
-        ret.calc_sha256()
+        return value
+
+    def get_transaction(self, txhash):
+        ret = None
+        serialized_tx = self.get(txhash)
+        if serialized_tx is not None:
+            f = BytesIO(serialized_tx)
+            ret = CTransaction()
+            ret.deserialize(f)
+            ret.calc_sha256()
         return ret
 
     def add_transaction(self, tx):
@@ -136,5 +157,5 @@ def get_transactions(self, inv):
             if (i.type == 1): # MSG_TX
                 tx = self.get(i.hash)
                 if tx is not None:
-                    responses.append(msg_tx(tx))
+                    responses.append(msg_generic(b"tx", tx))
         return responses
diff --git a/qa/rpc-tests/test_framework/mininode.py b/qa/rpc-tests/test_framework/mininode.py
index 1617daa20008d..e85399c960bb7 100755
--- a/qa/rpc-tests/test_framework/mininode.py
+++ b/qa/rpc-tests/test_framework/mininode.py
@@ -556,6 +556,7 @@ def solve(self):
             self.nNonce += 1
             self.rehash()
 
+
     def __repr__(self):
         return "CBlock(nVersion=%i hashPrevBlock=%064x hashMerkleRoot=%064x nTime=%s nBits=%08x nNonce=%08x vtx=%s)" \
             % (self.nVersion, self.hashPrevBlock, self.hashMerkleRoot,
@@ -836,6 +837,18 @@ def serialize(self):
     def __repr__(self):
         return "msg_block(block=%s)" % (repr(self.block))
 
+# for cases where a user needs tighter control over what is sent over the wire
+# note that the user must supply the name of the command, and the data
+class msg_generic(object):
+    def __init__(self, command, data=None):
+        self.command = command
+        self.data = data
+
+    def serialize(self):
+        return self.data
+
+    def __repr__(self):
+        return "msg_generic()"
 
 class msg_getaddr(object):
     command = b"getaddr"

From c2dd5a3c39156749e8ee24772d1fcb01404f2b6f Mon Sep 17 00:00:00 2001
From: Alex Morcos <morcos@chaincode.com>
Date: Wed, 1 Jun 2016 12:29:03 -0400
Subject: [PATCH 0384/1802] FIX: correctly measure size of priority block

---
 src/miner.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/miner.cpp b/src/miner.cpp
index 1eab8f949d41d..99eb0a2ebd0f7 100644
--- a/src/miner.cpp
+++ b/src/miner.cpp
@@ -352,7 +352,7 @@ void BlockAssembler::addPriorityTxs()
 
             // If now that this txs is added we've surpassed our desired priority size
             // or have dropped below the AllowFreeThreshold, then we're done adding priority txs
-            if (nBlockSize + iter->GetTxSize() >= nBlockPrioritySize || !AllowFree(actualPriority)) {
+            if (nBlockSize >= nBlockPrioritySize || !AllowFree(actualPriority)) {
                 return;
             }
 

From 16cf85fa2c2da7ff73b2c72afcbb5de26a2bede2 Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Wed, 1 Jun 2016 19:18:06 +0200
Subject: [PATCH 0385/1802] Revert "Include signal.h for sig_atomic_t in WIN32"

This reverts commit 88f14b999cb70f6c556633f2889e698a05305158.
---
 src/util.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/util.h b/src/util.h
index c6f8af4cdf07d..88a00d3ca1fcb 100644
--- a/src/util.h
+++ b/src/util.h
@@ -28,7 +28,9 @@
 #include <boost/signals2/signal.hpp>
 #include <boost/thread/exceptions.hpp>
 
+#ifndef WIN32
 #include <signal.h>
+#endif
 
 static const bool DEFAULT_LOGTIMEMICROS = false;
 static const bool DEFAULT_LOGIPS        = false;

From a886dbf8e7b6b007153a53e8d8d1fd63b7fc9ee2 Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Mon, 30 May 2016 15:39:37 +0200
Subject: [PATCH 0386/1802] Use std::atomic for fRequestShutdown and
 fReopenDebugLog

---
 src/init.cpp | 2 +-
 src/util.cpp | 2 +-
 src/util.h   | 7 ++-----
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/init.cpp b/src/init.cpp
index 98c0894122783..9a22501859428 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -123,7 +123,7 @@ static const char* FEE_ESTIMATES_FILENAME="fee_estimates.dat";
 // shutdown thing.
 //
 
-volatile sig_atomic_t fRequestShutdown = false;
+std::atomic<bool> fRequestShutdown(false);
 
 void StartShutdown()
 {
diff --git a/src/util.cpp b/src/util.cpp
index 80f2193016ef2..9a9209c62140b 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -113,7 +113,7 @@ string strMiscWarning;
 bool fLogTimestamps = DEFAULT_LOGTIMESTAMPS;
 bool fLogTimeMicros = DEFAULT_LOGTIMEMICROS;
 bool fLogIPs = DEFAULT_LOGIPS;
-volatile sig_atomic_t fReopenDebugLog = false;
+std::atomic<bool> fReopenDebugLog(false);
 CTranslationInterface translationInterface;
 
 /** Init OpenSSL library multithreading support */
diff --git a/src/util.h b/src/util.h
index 88a00d3ca1fcb..ac4b947785f43 100644
--- a/src/util.h
+++ b/src/util.h
@@ -18,6 +18,7 @@
 #include "tinyformat.h"
 #include "utiltime.h"
 
+#include <atomic>
 #include <exception>
 #include <map>
 #include <stdint.h>
@@ -28,10 +29,6 @@
 #include <boost/signals2/signal.hpp>
 #include <boost/thread/exceptions.hpp>
 
-#ifndef WIN32
-#include <signal.h>
-#endif
-
 static const bool DEFAULT_LOGTIMEMICROS = false;
 static const bool DEFAULT_LOGIPS        = false;
 static const bool DEFAULT_LOGTIMESTAMPS = true;
@@ -54,7 +51,7 @@ extern std::string strMiscWarning;
 extern bool fLogTimestamps;
 extern bool fLogTimeMicros;
 extern bool fLogIPs;
-extern volatile sig_atomic_t fReopenDebugLog;
+extern std::atomic<bool> fReopenDebugLog;
 extern CTranslationInterface translationInterface;
 
 extern const char * const BITCOIN_CONF_FILENAME;

From c022e5b15dd0b26bb6ef77a382279987c2efa93f Mon Sep 17 00:00:00 2001
From: Jonas Schnelli <dev@jonasschnelli.ch>
Date: Wed, 1 Jun 2016 20:29:39 +0200
Subject: [PATCH 0387/1802] [Wallet] use constant for bip32 hardened key limit

---
 src/wallet/wallet.cpp | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index fdb46472a83a1..1c212d01476dd 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -42,6 +42,7 @@ bool bSpendZeroConfChange = DEFAULT_SPEND_ZEROCONF_CHANGE;
 bool fSendFreeTransactions = DEFAULT_SEND_FREE_TRANSACTIONS;
 
 const char * DEFAULT_WALLET_DAT = "wallet.dat";
+const uint32_t BIP32_HARDENED_KEY_LIMIT = 0x80000000;
 
 /**
  * Fees smaller than this (in satoshi) are considered zero fee (for transaction creation)
@@ -112,16 +113,19 @@ CPubKey CWallet::GenerateNewKey()
         masterKey.SetMaster(key.begin(), key.size());
 
         // derive m/0'
-        // use hardened derivation (child keys > 0x80000000 are hardened after bip32)
-        masterKey.Derive(accountKey, 0 | 0x80000000);
+        // use hardened derivation (child keys >= 0x80000000 are hardened after bip32)
+        masterKey.Derive(accountKey, BIP32_HARDENED_KEY_LIMIT);
 
         // derive m/0'/0'
-        accountKey.Derive(externalChainChildKey, 0 | 0x80000000);
+        accountKey.Derive(externalChainChildKey, BIP32_HARDENED_KEY_LIMIT);
 
         // derive child key at next index, skip keys already known to the wallet
         do
         {
-            externalChainChildKey.Derive(childKey, hdChain.nExternalChainCounter | 0x80000000);
+            // always derive hardened keys
+            // childIndex | BIP32_HARDENED_KEY_LIMIT = derive childIndex in hardened child-index-range
+            // example: 1 | BIP32_HARDENED_KEY_LIMIT == 0x80000001 == 2147483649
+            externalChainChildKey.Derive(childKey, hdChain.nExternalChainCounter | BIP32_HARDENED_KEY_LIMIT);
             // increment childkey index
             hdChain.nExternalChainCounter++;
         } while(HaveKey(childKey.key.GetPubKey().GetID()));

From 0cb0f2626e1553426e16a52fc6928d35824827f5 Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Wed, 1 Jun 2016 18:05:09 -0400
Subject: [PATCH 0388/1802] build: out-of-tree fixups

Don't glob the leveldb for dist. That means we need to enumerate the headers.
---
 Makefile.am                  | 10 -------
 src/Makefile.am              |  7 ++---
 src/Makefile.leveldb.include | 56 ++++++++++++++++++++++++++++++++++++
 3 files changed, 59 insertions(+), 14 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 5783c1fdd8f55..bfdf76568a304 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -53,18 +53,8 @@ COVERAGE_INFO = baseline_filtered_combined.info baseline.info block_test.info \
   leveldb_baseline_filtered.info test_bitcoin_coverage.info test_bitcoin.info
 
 dist-hook:
-	-$(MAKE) -C $(top_distdir)/src/leveldb clean
-	-$(MAKE) -C $(top_distdir)/src/secp256k1 distclean
 	-$(GIT) archive --format=tar HEAD -- src/clientversion.cpp | $(AMTAR) -C $(top_distdir) -xf -
 
-distcheck-hook:
-	$(MKDIR_P) $(top_distdir)/_build/src/leveldb
-	cp -rf $(top_srcdir)/src/leveldb/* $(top_distdir)/_build/src/leveldb/
-	-$(MAKE) -C $(top_distdir)/_build/src/leveldb clean
-
-distcleancheck:
-	@:
-
 $(BITCOIN_WIN_INSTALLER): all-recursive
 	$(MKDIR_P) $(top_builddir)/release
 	STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM) $(BITCOIND_BIN) $(top_builddir)/release
diff --git a/src/Makefile.am b/src/Makefile.am
index ea49efe92d2af..c833272ff9db7 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -417,8 +417,8 @@ CTAES_DIST += crypto/ctaes/ctaes.h
 CTAES_DIST += crypto/ctaes/README.md
 CTAES_DIST += crypto/ctaes/test.c
 
-CLEANFILES = leveldb/libleveldb.a leveldb/libmemenv.a
-CLEANFILES += $(EXTRA_LIBRARIES)
+CLEANFILES = $(EXTRA_LIBRARIES)
+
 CLEANFILES += *.gcda *.gcno
 CLEANFILES += compat/*.gcda compat/*.gcno
 CLEANFILES += consensus/*.gcda consensus/*.gcno
@@ -434,10 +434,9 @@ CLEANFILES += zmq/*.gcda zmq/*.gcno
 
 DISTCLEANFILES = obj/build.h
 
-EXTRA_DIST = leveldb $(CTAES_DIST)
+EXTRA_DIST = $(CTAES_DIST)
 
 clean-local:
-	-$(MAKE) -C leveldb clean
 	-$(MAKE) -C secp256k1 clean
 	-$(MAKE) -C univalue clean
 	-rm -f leveldb/*/*.gcda leveldb/*/*.gcno leveldb/helpers/memenv/*.gcda leveldb/helpers/memenv/*.gcno
diff --git a/src/Makefile.leveldb.include b/src/Makefile.leveldb.include
index 88bb0c19326f1..4b3cd6364a29b 100644
--- a/src/Makefile.leveldb.include
+++ b/src/Makefile.leveldb.include
@@ -26,6 +26,61 @@ leveldb_libleveldb_a_CPPFLAGS = $(AM_CPPFLAGS) $(LEVELDB_CPPFLAGS_INT) $(LEVELDB
 leveldb_libleveldb_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
 
 leveldb_libleveldb_a_SOURCES=
+leveldb_libleveldb_a_SOURCES += leveldb/port/atomic_pointer.h
+leveldb_libleveldb_a_SOURCES += leveldb/port/port_example.h
+leveldb_libleveldb_a_SOURCES += leveldb/port/port_posix.h
+leveldb_libleveldb_a_SOURCES += leveldb/port/win/stdint.h
+leveldb_libleveldb_a_SOURCES += leveldb/port/port.h
+leveldb_libleveldb_a_SOURCES += leveldb/port/port_win.h
+leveldb_libleveldb_a_SOURCES += leveldb/port/thread_annotations.h
+leveldb_libleveldb_a_SOURCES += leveldb/include/leveldb/db.h
+leveldb_libleveldb_a_SOURCES += leveldb/include/leveldb/options.h
+leveldb_libleveldb_a_SOURCES += leveldb/include/leveldb/comparator.h
+leveldb_libleveldb_a_SOURCES += leveldb/include/leveldb/filter_policy.h
+leveldb_libleveldb_a_SOURCES += leveldb/include/leveldb/slice.h
+leveldb_libleveldb_a_SOURCES += leveldb/include/leveldb/table_builder.h
+leveldb_libleveldb_a_SOURCES += leveldb/include/leveldb/env.h
+leveldb_libleveldb_a_SOURCES += leveldb/include/leveldb/c.h
+leveldb_libleveldb_a_SOURCES += leveldb/include/leveldb/iterator.h
+leveldb_libleveldb_a_SOURCES += leveldb/include/leveldb/cache.h
+leveldb_libleveldb_a_SOURCES += leveldb/include/leveldb/dumpfile.h
+leveldb_libleveldb_a_SOURCES += leveldb/include/leveldb/table.h
+leveldb_libleveldb_a_SOURCES += leveldb/include/leveldb/write_batch.h
+leveldb_libleveldb_a_SOURCES += leveldb/include/leveldb/status.h
+leveldb_libleveldb_a_SOURCES += leveldb/db/log_format.h
+leveldb_libleveldb_a_SOURCES += leveldb/db/memtable.h
+leveldb_libleveldb_a_SOURCES += leveldb/db/version_set.h
+leveldb_libleveldb_a_SOURCES += leveldb/db/write_batch_internal.h
+leveldb_libleveldb_a_SOURCES += leveldb/db/filename.h
+leveldb_libleveldb_a_SOURCES += leveldb/db/version_edit.h
+leveldb_libleveldb_a_SOURCES += leveldb/db/dbformat.h
+leveldb_libleveldb_a_SOURCES += leveldb/db/builder.h
+leveldb_libleveldb_a_SOURCES += leveldb/db/log_writer.h
+leveldb_libleveldb_a_SOURCES += leveldb/db/db_iter.h
+leveldb_libleveldb_a_SOURCES += leveldb/db/skiplist.h
+leveldb_libleveldb_a_SOURCES += leveldb/db/db_impl.h
+leveldb_libleveldb_a_SOURCES += leveldb/db/table_cache.h
+leveldb_libleveldb_a_SOURCES += leveldb/db/snapshot.h
+leveldb_libleveldb_a_SOURCES += leveldb/db/log_reader.h
+leveldb_libleveldb_a_SOURCES += leveldb/table/filter_block.h
+leveldb_libleveldb_a_SOURCES += leveldb/table/block_builder.h
+leveldb_libleveldb_a_SOURCES += leveldb/table/block.h
+leveldb_libleveldb_a_SOURCES += leveldb/table/two_level_iterator.h
+leveldb_libleveldb_a_SOURCES += leveldb/table/merger.h
+leveldb_libleveldb_a_SOURCES += leveldb/table/format.h
+leveldb_libleveldb_a_SOURCES += leveldb/table/iterator_wrapper.h
+leveldb_libleveldb_a_SOURCES += leveldb/util/crc32c.h
+leveldb_libleveldb_a_SOURCES += leveldb/util/arena.h
+leveldb_libleveldb_a_SOURCES += leveldb/util/random.h
+leveldb_libleveldb_a_SOURCES += leveldb/util/posix_logger.h
+leveldb_libleveldb_a_SOURCES += leveldb/util/hash.h
+leveldb_libleveldb_a_SOURCES += leveldb/util/histogram.h
+leveldb_libleveldb_a_SOURCES += leveldb/util/coding.h
+leveldb_libleveldb_a_SOURCES += leveldb/util/testutil.h
+leveldb_libleveldb_a_SOURCES += leveldb/util/mutexlock.h
+leveldb_libleveldb_a_SOURCES += leveldb/util/logging.h
+leveldb_libleveldb_a_SOURCES += leveldb/util/testharness.h
+
 leveldb_libleveldb_a_SOURCES += leveldb/db/builder.cc
 leveldb_libleveldb_a_SOURCES += leveldb/db/c.cc
 leveldb_libleveldb_a_SOURCES += leveldb/db/dbformat.cc
@@ -76,3 +131,4 @@ endif
 leveldb_libmemenv_a_CPPFLAGS = $(leveldb_libleveldb_a_CPPFLAGS)
 leveldb_libmemenv_a_CXXFLAGS = $(leveldb_libleveldb_a_CXXFLAGS)
 leveldb_libmemenv_a_SOURCES =  leveldb/helpers/memenv/memenv.cc
+leveldb_libmemenv_a_SOURCES += leveldb/helpers/memenv/memenv.h

From fc4ad0c7fcf2e5841756c9d1003f95c879ee5cd2 Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Wed, 1 Jun 2016 18:06:40 -0400
Subject: [PATCH 0389/1802] build: more out-of-tree fixups

- clear the __pycache__ during 'make clean'
- Copy the qrc locale file to a temp location and remove it when finished
  (rcc expects everything to be in the same path)
---
 src/Makefile.am         | 1 +
 src/Makefile.qt.include | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index c833272ff9db7..5e33c6a869d7a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -441,6 +441,7 @@ clean-local:
 	-$(MAKE) -C univalue clean
 	-rm -f leveldb/*/*.gcda leveldb/*/*.gcno leveldb/helpers/memenv/*.gcda leveldb/helpers/memenv/*.gcno
 	-rm -f config.h
+	-rm -rf test/__pycache__
 
 .rc.o:
 	@test -f $(WINDRES)
diff --git a/src/Makefile.qt.include b/src/Makefile.qt.include
index 3b39919441088..29e3a264ccc7c 100644
--- a/src/Makefile.qt.include
+++ b/src/Makefile.qt.include
@@ -400,9 +400,10 @@ translate: qt/bitcoinstrings.cpp $(QT_FORMS_UI) $(QT_FORMS_UI) $(BITCOIN_QT_CPP)
 
 $(QT_QRC_LOCALE_CPP): $(QT_QRC_LOCALE) $(QT_QM)
 	@test -f $(RCC)
-	@test -f $(@D)/$(<F) || cp -f $< $(@D)
-	$(AM_V_GEN) QT_SELECT=$(QT_SELECT) $(RCC) -name bitcoin_locale $(@D)/$(<F) | \
+	@cp -f $< $(@D)/temp_$(<F)
+	$(AM_V_GEN) QT_SELECT=$(QT_SELECT) $(RCC) -name bitcoin_locale $(@D)/temp_$(<F) | \
 	  $(SED) -e '/^\*\*.*Created:/d' -e '/^\*\*.*by:/d' > $@
+	@rm $(@D)/temp_$(<F)
 
 $(QT_QRC_CPP): $(QT_QRC) $(QT_FORMS_H) $(RES_ICONS) $(RES_IMAGES) $(RES_MOVIES) $(PROTOBUF_H)
 	@test -f $(RCC)

From ab95d5df3dc492c6355c78686c559527622fe033 Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Wed, 1 Jun 2016 18:47:21 -0400
Subject: [PATCH 0390/1802] build: a few ugly hacks to get the rpc tests
 working out-of-tree

- Link pull-tester/rpc-tests.py to the build dir
- Add the build-dir's config to the python path so that tests can find it
- The tests themselves are in srcdir
- Clean up __pycache__ in 'make clean'
---
 Makefile.am                       | 1 +
 configure.ac                      | 1 +
 qa/pull-tester/rpc-tests.py       | 3 ++-
 qa/pull-tester/tests_config.py.in | 1 +
 4 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/Makefile.am b/Makefile.am
index bfdf76568a304..9957968f81888 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -228,3 +228,4 @@ CLEANFILES = $(OSX_DMG) $(BITCOIN_WIN_INSTALLER)
 
 clean-local:
 	rm -rf coverage_percent.txt test_bitcoin.coverage/ total.coverage/ qa/tmp/ cache/ $(OSX_APP)
+	rm -rf qa/pull-tester/__pycache__
diff --git a/configure.ac b/configure.ac
index a1c04daf53601..7f9ff20cd7be5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1060,6 +1060,7 @@ AC_SUBST(MINIUPNPC_LIBS)
 AC_CONFIG_FILES([Makefile src/Makefile share/setup.nsi share/qt/Info.plist src/test/buildenv.py])
 AC_CONFIG_FILES([qa/pull-tester/run-bitcoind-for-test.sh],[chmod +x qa/pull-tester/run-bitcoind-for-test.sh])
 AC_CONFIG_FILES([qa/pull-tester/tests_config.py],[chmod +x qa/pull-tester/tests_config.py])
+AC_CONFIG_LINKS([qa/pull-tester/rpc-tests.py:qa/pull-tester/rpc-tests.py])
 
 dnl boost's m4 checks do something really nasty: they export these vars. As a
 dnl result, they leak into secp256k1's configure and crazy things happen.
diff --git a/qa/pull-tester/rpc-tests.py b/qa/pull-tester/rpc-tests.py
index f810f89a5991a..57a576f1c7bf0 100755
--- a/qa/pull-tester/rpc-tests.py
+++ b/qa/pull-tester/rpc-tests.py
@@ -29,6 +29,7 @@
 import tempfile
 import re
 
+sys.path.append("qa/pull-tester/")
 from tests_config import *
 
 BOLD = ("","")
@@ -37,7 +38,7 @@
     # terminal via ANSI escape sequences:
     BOLD = ('\033[0m', '\033[1m')
 
-RPC_TESTS_DIR = BUILDDIR + '/qa/rpc-tests/'
+RPC_TESTS_DIR = SRCDIR + '/qa/rpc-tests/'
 
 #If imported values are not defined then set to zero (or disabled)
 if 'ENABLE_WALLET' not in vars():
diff --git a/qa/pull-tester/tests_config.py.in b/qa/pull-tester/tests_config.py.in
index 2356b5200ebfe..a0d0a3d98a86b 100644
--- a/qa/pull-tester/tests_config.py.in
+++ b/qa/pull-tester/tests_config.py.in
@@ -3,6 +3,7 @@
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
+SRCDIR="@abs_top_srcdir@"
 BUILDDIR="@abs_top_builddir@"
 EXEEXT="@EXEEXT@"
 

From 2b2d52ea3a2c48ce9a221a51bb0c8eef2068582b Mon Sep 17 00:00:00 2001
From: fanquake <fanquake@gmail.com>
Date: Tue, 3 May 2016 20:42:42 +0800
Subject: [PATCH 0391/1802] [depends] Freetype 2.6.3

Update FreeType, and change the download location to gnu.org. This is
the other official download location listed on freetype.org
---
 depends/packages/freetype.mk | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/depends/packages/freetype.mk b/depends/packages/freetype.mk
index f7d6e0f9fc58d..7cea28ff0bbf9 100644
--- a/depends/packages/freetype.mk
+++ b/depends/packages/freetype.mk
@@ -1,8 +1,8 @@
 package=freetype
-$(package)_version=2.5.3
-$(package)_download_path=http://downloads.sourceforge.net/$(package)
+$(package)_version=2.6.3
+$(package)_download_path=http://download.savannah.gnu.org/releases/$(package)
 $(package)_file_name=$(package)-$($(package)_version).tar.bz2
-$(package)_sha256_hash=c0848b29d52ef3ca27ad92e08351f023c5e24ce8cea7d8fe69fc96358e65f75e
+$(package)_sha256_hash=371e707aa522acf5b15ce93f11183c725b8ed1ee8546d7b3af549863045863a2
 
 define $(package)_set_vars
   $(package)_config_opts=--without-zlib --without-png --disable-static

From 0385202befb3416c5d4a39c1665865de7b1e44df Mon Sep 17 00:00:00 2001
From: fanquake <fanquake@gmail.com>
Date: Tue, 3 May 2016 20:51:29 +0800
Subject: [PATCH 0392/1802] [depends] ccache 3.2.5

---
 depends/packages/native_ccache.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/depends/packages/native_ccache.mk b/depends/packages/native_ccache.mk
index cc76f9a794655..9216e175983a9 100644
--- a/depends/packages/native_ccache.mk
+++ b/depends/packages/native_ccache.mk
@@ -1,8 +1,8 @@
 package=native_ccache
-$(package)_version=3.2.4
+$(package)_version=3.2.5
 $(package)_download_path=http://samba.org/ftp/ccache
 $(package)_file_name=ccache-$($(package)_version).tar.bz2
-$(package)_sha256_hash=ffeb967edb549e67da0bd5f44f729a2022de9fdde65dfd80d2a7204d7f75332e
+$(package)_sha256_hash=7a553809e90faf9de3a23ee9c5b5f786cfd4836bf502744bedb824a24bee1097
 
 define $(package)_set_vars
 $(package)_config_opts=

From bd3cbd53330e001603bfd4be4edfbdb9c952bb36 Mon Sep 17 00:00:00 2001
From: fanquake <fanquake@gmail.com>
Date: Tue, 3 May 2016 20:52:10 +0800
Subject: [PATCH 0393/1802] [depends] ZeroMQ 4.1.4

---
 depends/packages/zeromq.mk | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/depends/packages/zeromq.mk b/depends/packages/zeromq.mk
index b3f18db056968..f8901f72c26c6 100644
--- a/depends/packages/zeromq.mk
+++ b/depends/packages/zeromq.mk
@@ -1,11 +1,11 @@
 package=zeromq
-$(package)_version=4.0.7
+$(package)_version=4.1.4
 $(package)_download_path=http://download.zeromq.org
 $(package)_file_name=$(package)-$($(package)_version).tar.gz
-$(package)_sha256_hash=e00b2967e074990d0538361cc79084a0a92892df2c6e7585da34e4c61ee47b03
+$(package)_sha256_hash=e99f44fde25c2e4cb84ce440f87ca7d3fe3271c2b8cfbc67d55e4de25e6fe378
 
 define $(package)_set_vars
-  $(package)_config_opts=--without-documentation --disable-shared
+  $(package)_config_opts=--without-documentation --disable-shared --without-libsodium
   $(package)_config_opts_linux=--with-pic
   $(package)_cxxflags=-std=c++11
 endef
@@ -15,11 +15,11 @@ define $(package)_config_cmds
 endef
 
 define $(package)_build_cmds
-  $(MAKE) -C src
+  $(MAKE) libzmq.la
 endef
 
 define $(package)_stage_cmds
-  $(MAKE) -C src DESTDIR=$($(package)_staging_dir) install
+  $(MAKE) DESTDIR=$($(package)_staging_dir) install-libLTLIBRARIES install-includeHEADERS install-pkgconfigDATA
 endef
 
 define $(package)_postprocess_cmds

From 87b8175d999e10082049afd1fb6440cf54d86f1e Mon Sep 17 00:00:00 2001
From: fanquake <fanquake@gmail.com>
Date: Tue, 3 May 2016 20:52:34 +0800
Subject: [PATCH 0394/1802] [depends] Latest config.guess & config.sub

---
 depends/config.guess | 37 +++++++++++++++++++++----------------
 depends/config.sub   |  6 ++++--
 2 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/depends/config.guess b/depends/config.guess
index 373a659a06760..c4bd827a7bedc 100755
--- a/depends/config.guess
+++ b/depends/config.guess
@@ -2,7 +2,7 @@
 # Attempt to guess a canonical system name.
 #   Copyright 1992-2016 Free Software Foundation, Inc.
 
-timestamp='2016-02-11'
+timestamp='2016-05-15'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -186,9 +186,12 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
 	esac
 	# The Operating System including object format, if it has switched
-	# to ELF recently, or will in the future.
+	# to ELF recently (or will in the future) and ABI.
 	case "${UNAME_MACHINE_ARCH}" in
-	    arm*|earm*|i386|m68k|ns32k|sh3*|sparc|vax)
+	    earm*)
+		os=netbsdelf
+		;;
+	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
 		eval $set_cc_for_build
 		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
 			| grep -q __ELF__
@@ -386,7 +389,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	# This test works for both compilers.
 	if [ "$CC_FOR_BUILD" != no_compiler_found ]; then
 	    if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
-		(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+		(CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
 		grep IS_64BIT_ARCH >/dev/null
 	    then
 		SUN_ARCH=x86_64
@@ -684,7 +687,7 @@ EOF
 		    exit (0);
 		}
 EOF
-		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
+		    (CCOPTS="" $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
 		    test -z "$HP_ARCH" && HP_ARCH=hppa
 		fi ;;
 	esac
@@ -701,7 +704,7 @@ EOF
 	    # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
 	    # => hppa64-hp-hpux11.23
 
-	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
+	    if echo __LP64__ | (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) |
 		grep -q __LP64__
 	    then
 		HP_ARCH=hppa2.0w
@@ -900,7 +903,7 @@ EOF
 	exit ;;
     *:GNU/*:*:*)
 	# other systems with GNU libc and userland
-	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
+	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
 	exit ;;
     i*86:Minix:*:*)
 	echo ${UNAME_MACHINE}-pc-minix
@@ -1276,6 +1279,9 @@ EOF
     SX-8R:SUPER-UX:*:*)
 	echo sx8r-nec-superux${UNAME_RELEASE}
 	exit ;;
+    SX-ACE:SUPER-UX:*:*)
+	echo sxace-nec-superux${UNAME_RELEASE}
+	exit ;;
     Power*:Rhapsody:*:*)
 	echo powerpc-apple-rhapsody${UNAME_RELEASE}
 	exit ;;
@@ -1291,7 +1297,7 @@ EOF
 	if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then
 	    if [ "$CC_FOR_BUILD" != no_compiler_found ]; then
 		if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
-		    (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+		    (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
 		    grep IS_64BIT_ARCH >/dev/null
 		then
 		    case $UNAME_PROCESSOR in
@@ -1386,7 +1392,7 @@ EOF
 	echo i386-pc-xenix
 	exit ;;
     i*86:skyos:*:*)
-	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
+	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE} | sed -e 's/ .*$//'`
 	exit ;;
     i*86:rdos:*:*)
 	echo ${UNAME_MACHINE}-pc-rdos
@@ -1405,18 +1411,17 @@ esac
 cat >&2 <<EOF
 $0: unable to guess system type
 
-This script, last modified $timestamp, has failed to recognize
-the operating system you are using. It is advised that you
-download the most up to date version of the config scripts from
+This script (version $timestamp), has failed to recognize the
+operating system you are using. If your script is old, overwrite
+config.guess and config.sub with the latest versions from:
 
   http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
 and
   http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
 
-If the version you run ($0) is already up to date, please
-send the following data and any information you think might be
-pertinent to <config-patches@gnu.org> in order to provide the needed
-information to handle your system.
+If $0 has already been updated, send the following data and any
+information you think might be pertinent to config-patches@gnu.org to
+provide the necessary information to handle your system.
 
 config.guess timestamp = $timestamp
 
diff --git a/depends/config.sub b/depends/config.sub
index 6223dde931918..6d86a1e2f77b3 100755
--- a/depends/config.sub
+++ b/depends/config.sub
@@ -2,7 +2,7 @@
 # Configuration validation subroutine script.
 #   Copyright 1992-2016 Free Software Foundation, Inc.
 
-timestamp='2016-01-01'
+timestamp='2016-05-10'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -1399,7 +1399,7 @@ case $os in
 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
 	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \
-	      | -onefs* | -tirtos*)
+	      | -onefs* | -tirtos* | -phoenix*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
@@ -1531,6 +1531,8 @@ case $os in
 		;;
 	-nacl*)
 		;;
+	-ios)
+		;;
 	-none)
 		;;
 	*)

From 3e0587bf816b9912126ed74ba173edf3d601d2ad Mon Sep 17 00:00:00 2001
From: fanquake <fanquake@gmail.com>
Date: Tue, 10 May 2016 12:50:56 +0800
Subject: [PATCH 0395/1802] [depends] miniupnpc 2.0

---
 depends/packages/miniupnpc.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/depends/packages/miniupnpc.mk b/depends/packages/miniupnpc.mk
index 45fa03631f89d..e34cf7be2f1bf 100644
--- a/depends/packages/miniupnpc.mk
+++ b/depends/packages/miniupnpc.mk
@@ -1,8 +1,8 @@
 package=miniupnpc
-$(package)_version=1.9.20160209
+$(package)_version=2.0
 $(package)_download_path=http://miniupnp.free.fr/files
 $(package)_file_name=$(package)-$($(package)_version).tar.gz
-$(package)_sha256_hash=572171eacc1d72537ce47b6f4571260757ab7bcfdaf54c3a55c7f88594d94b6f
+$(package)_sha256_hash=d434ceb8986efbe199c5ca53f90ed53eab290b1e6d0530b717eb6fa49d61f93b
 
 define $(package)_set_vars
 $(package)_build_opts=CC="$($(package)_cc)"

From 6a4cf16e2bea6e35507fd90846fa4f2441ba93af Mon Sep 17 00:00:00 2001
From: fanquake <fanquake@gmail.com>
Date: Thu, 12 May 2016 19:44:45 +0800
Subject: [PATCH 0396/1802] [depends] expat 2.1.1

---
 depends/packages/expat.mk | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/depends/packages/expat.mk b/depends/packages/expat.mk
index 1ac443537420b..bd2927563850b 100644
--- a/depends/packages/expat.mk
+++ b/depends/packages/expat.mk
@@ -1,8 +1,8 @@
 package=expat
-$(package)_version=2.1.0
-$(package)_download_path=http://sourceforge.net/projects/expat/files/expat/$($(package)_version)
-$(package)_file_name=$(package)-$($(package)_version).tar.gz
-$(package)_sha256_hash=823705472f816df21c8f6aa026dd162b280806838bb55b3432b0fb1fcca7eb86
+$(package)_version=2.1.1
+$(package)_download_path=https://downloads.sourceforge.net/project/expat/expat/$($(package)_version)
+$(package)_file_name=$(package)-$($(package)_version).tar.bz2
+$(package)_sha256_hash=aff584e5a2f759dcfc6d48671e9529f6afe1e30b0cd6a4cec200cbe3f793de67
 
 define $(package)_set_vars
 $(package)_config_opts=--disable-static

From 92e37a368900542700480143af278f66cbe558db Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Wed, 1 Jun 2016 22:19:29 -0400
Subject: [PATCH 0397/1802] build: fix out-of-tree 'make deploy' for osx

The plist is generated, lives in builddir.
---
 Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile.am b/Makefile.am
index 9957968f81888..b93748e324e24 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -28,7 +28,7 @@ OSX_DSSTORE_GEN=$(top_srcdir)/contrib/macdeploy/custom_dsstore.py
 OSX_DEPLOY_SCRIPT=$(top_srcdir)/contrib/macdeploy/macdeployqtplus
 OSX_FANCY_PLIST=$(top_srcdir)/contrib/macdeploy/fancy.plist
 OSX_INSTALLER_ICONS=$(top_srcdir)/src/qt/res/icons/bitcoin.icns
-OSX_PLIST=$(top_srcdir)/share/qt/Info.plist #not installed
+OSX_PLIST=$(top_builddir)/share/qt/Info.plist #not installed
 OSX_QT_TRANSLATIONS = da,de,es,hu,ru,uk,zh_CN,zh_TW
 
 DIST_DOCS = $(wildcard doc/*.md) $(wildcard doc/release-notes/*.md)

From 142ffc7e6136607b9a31709f31256f360b26588b Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Wed, 1 Jun 2016 19:24:29 -0400
Subject: [PATCH 0398/1802] travis: use out-of-tree build

---
 .travis.yml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index bc2c7faf7ee57..f5e306f0a6b85 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -72,10 +72,8 @@ script:
     - BITCOIN_CONFIG_ALL="--disable-dependency-tracking --prefix=$TRAVIS_BUILD_DIR/depends/$HOST --bindir=$OUTDIR/bin --libdir=$OUTDIR/lib"
     - depends/$HOST/native/bin/ccache --max-size=$CCACHE_SIZE
     - test -n "$USE_SHELL" && eval '"$USE_SHELL" -c "./autogen.sh"' || ./autogen.sh
-    - ./configure --cache-file=config.cache $BITCOIN_CONFIG_ALL $BITCOIN_CONFIG || ( cat config.log && false)
-    - make distdir PACKAGE=bitcoin VERSION=$HOST
-    - cd bitcoin-$HOST
-    - ./configure --cache-file=../config.cache $BITCOIN_CONFIG_ALL $BITCOIN_CONFIG || ( cat config.log && false)
+    - mkdir build && cd build
+    - ../configure $BITCOIN_CONFIG_ALL $BITCOIN_CONFIG || ( cat config.log && false)
     - make $MAKEJOBS $GOAL || ( echo "Build failure. Verbose build follows." && make $GOAL V=1 ; false )
     - export LD_LIBRARY_PATH=$TRAVIS_BUILD_DIR/depends/$HOST/lib
     - if [ "$RUN_TESTS" = "true" ]; then make $MAKEJOBS check VERBOSE=1; fi

From 9dfaa1cb70670eb0a4c82a7ddfcba71ba5ebea94 Mon Sep 17 00:00:00 2001
From: Patrick Strateman <patrick.strateman@gmail.com>
Date: Thu, 2 Jun 2016 06:00:59 -0700
Subject: [PATCH 0399/1802] Improve CWallet API with new AccountMove function.

---
 src/wallet/rpcwallet.cpp | 28 +---------------------------
 src/wallet/wallet.cpp    | 34 ++++++++++++++++++++++++++++++++++
 src/wallet/wallet.h      |  1 +
 3 files changed, 36 insertions(+), 27 deletions(-)

diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index b9f086b09205e..f7d5210eb095d 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -804,33 +804,7 @@ UniValue movecmd(const UniValue& params, bool fHelp)
     if (params.size() > 4)
         strComment = params[4].get_str();
 
-    CWalletDB walletdb(pwalletMain->strWalletFile);
-    if (!walletdb.TxnBegin())
-        throw JSONRPCError(RPC_DATABASE_ERROR, "database error");
-
-    int64_t nNow = GetAdjustedTime();
-
-    // Debit
-    CAccountingEntry debit;
-    debit.nOrderPos = pwalletMain->IncOrderPosNext(&walletdb);
-    debit.strAccount = strFrom;
-    debit.nCreditDebit = -nAmount;
-    debit.nTime = nNow;
-    debit.strOtherAccount = strTo;
-    debit.strComment = strComment;
-    pwalletMain->AddAccountingEntry(debit, walletdb);
-
-    // Credit
-    CAccountingEntry credit;
-    credit.nOrderPos = pwalletMain->IncOrderPosNext(&walletdb);
-    credit.strAccount = strTo;
-    credit.nCreditDebit = nAmount;
-    credit.nTime = nNow;
-    credit.strOtherAccount = strFrom;
-    credit.strComment = strComment;
-    pwalletMain->AddAccountingEntry(credit, walletdb);
-
-    if (!walletdb.TxnCommit())
+    if (!pwalletMain->AccountMove(strFrom, strTo, nAmount, strComment))
         throw JSONRPCError(RPC_DATABASE_ERROR, "database error");
 
     return true;
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index da0d6f272bfef..482eb6aa65d7d 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -606,6 +606,40 @@ int64_t CWallet::IncOrderPosNext(CWalletDB *pwalletdb)
     return nRet;
 }
 
+bool CWallet::AccountMove(std::string strFrom, std::string strTo, CAmount nAmount, std::string strComment)
+{
+    CWalletDB walletdb(strWalletFile);
+    if (!walletdb.TxnBegin())
+        return false;
+
+    int64_t nNow = GetAdjustedTime();
+
+    // Debit
+    CAccountingEntry debit;
+    debit.nOrderPos = IncOrderPosNext(&walletdb);
+    debit.strAccount = strFrom;
+    debit.nCreditDebit = -nAmount;
+    debit.nTime = nNow;
+    debit.strOtherAccount = strTo;
+    debit.strComment = strComment;
+    AddAccountingEntry(debit, walletdb);
+
+    // Credit
+    CAccountingEntry credit;
+    credit.nOrderPos = IncOrderPosNext(&walletdb);
+    credit.strAccount = strTo;
+    credit.nCreditDebit = nAmount;
+    credit.nTime = nNow;
+    credit.strOtherAccount = strFrom;
+    credit.strComment = strComment;
+    AddAccountingEntry(credit, walletdb);
+
+    if (!walletdb.TxnCommit())
+        return false;
+
+    return true;
+}
+
 void CWallet::MarkDirty()
 {
     {
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
index b2180a5a26bb8..9fb2eba23c02a 100644
--- a/src/wallet/wallet.h
+++ b/src/wallet/wallet.h
@@ -718,6 +718,7 @@ class CWallet : public CCryptoKeyStore, public CValidationInterface
      * @return next transaction order id
      */
     int64_t IncOrderPosNext(CWalletDB *pwalletdb = NULL);
+    bool AccountMove(std::string strFrom, std::string strTo, CAmount nAmount, std::string strComment = "");
 
     void MarkDirty();
     bool AddToWallet(const CWalletTx& wtxIn, bool fFromLoadWallet, CWalletDB* pwalletdb);

From 595b22e5c0bf1c3e8ee73aea2f28397c12046a60 Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Mon, 14 Mar 2016 18:55:19 +0100
Subject: [PATCH 0400/1802] Stop treating importaddress'ed scripts as change

Before this, if someone imported a scriptPubKey directly (in hex form) using
importaddress, outputs sending to it would be treated as change, as the
corresponding CTxDestination was not added to the address book.

Fix this by trying to detect scriptPubKeys that are in fact convertible to a
CTxDestination and add them anyway. Add a warning to the RPC help to warn
against importing raw non-standard scripts.
---
 src/wallet/rpcdump.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/wallet/rpcdump.cpp b/src/wallet/rpcdump.cpp
index bb40cf724536a..70a8462da0d32 100644
--- a/src/wallet/rpcdump.cpp
+++ b/src/wallet/rpcdump.cpp
@@ -167,6 +167,11 @@ void ImportScript(const CScript& script, const string& strLabel, bool isRedeemSc
         if (!pwalletMain->HaveCScript(script) && !pwalletMain->AddCScript(script))
             throw JSONRPCError(RPC_WALLET_ERROR, "Error adding p2sh redeemScript to wallet");
         ImportAddress(CBitcoinAddress(CScriptID(script)), strLabel);
+    } else {
+        CTxDestination destination;
+        if (ExtractDestination(script, destination)) {
+            pwalletMain->SetAddressBook(destination, strLabel, "receive");
+        }
     }
 }
 
@@ -195,6 +200,8 @@ UniValue importaddress(const UniValue& params, bool fHelp)
             "4. p2sh                 (boolean, optional, default=false) Add the P2SH version of the script as well\n"
             "\nNote: This call can take minutes to complete if rescan is true.\n"
             "If you have the full public key, you should call importpubkey instead of this.\n"
+            "\nNote: If you import a non-standard raw script in hex form, outputs sending to it will be treated\n"
+            "as change, and not show up in many RPCs.\n"
             "\nExamples:\n"
             "\nImport a script with rescan\n"
             + HelpExampleCli("importaddress", "\"myscript\"") +

From f45f51e3ae4fca24bc49474ca61c3262186c447d Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Fri, 13 May 2016 04:49:19 +0200
Subject: [PATCH 0401/1802] Fix interrupted HTTP RPC connection workaround for
 Python 3.5+

---
 qa/rpc-tests/test_framework/authproxy.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/qa/rpc-tests/test_framework/authproxy.py b/qa/rpc-tests/test_framework/authproxy.py
index e5f7ab3656167..95b2be658cffe 100644
--- a/qa/rpc-tests/test_framework/authproxy.py
+++ b/qa/rpc-tests/test_framework/authproxy.py
@@ -124,6 +124,11 @@ def _request(self, method, path, postdata):
                 return self._get_response()
             else:
                 raise
+        except BrokenPipeError:
+            # Python 3.5+ raises this instead of BadStatusLine when the connection was reset
+            self.__conn.close()
+            self.__conn.request(method, path, postdata, headers)
+            return self._get_response()
 
     def __call__(self, *args):
         AuthServiceProxy.__id_count += 1

From 291f8aa5daf80eed56d6cefa3d410652b412150a Mon Sep 17 00:00:00 2001
From: mrbandrews <bandrewsny@gmail.com>
Date: Thu, 2 Jun 2016 14:42:09 -0400
Subject: [PATCH 0402/1802] Continuing port of java comptool

---
 qa/rpc-tests/p2p-fullblocktest.py         | 1097 +++++++++++++++++++--
 qa/rpc-tests/test_framework/blocktools.py |   23 +-
 qa/rpc-tests/test_framework/mininode.py   |    1 -
 3 files changed, 1010 insertions(+), 111 deletions(-)

diff --git a/qa/rpc-tests/p2p-fullblocktest.py b/qa/rpc-tests/p2p-fullblocktest.py
index aa0501c5e9260..19b90d4db11eb 100755
--- a/qa/rpc-tests/p2p-fullblocktest.py
+++ b/qa/rpc-tests/p2p-fullblocktest.py
@@ -9,7 +9,8 @@
 from test_framework.blocktools import *
 import time
 from test_framework.key import CECKey
-from test_framework.script import CScript, SignatureHash, SIGHASH_ALL, OP_TRUE, OP_FALSE
+from test_framework.script import *
+import struct
 
 class PreviousSpendableOutput(object):
     def __init__(self, tx = CTransaction(), n = -1):
@@ -24,10 +25,36 @@ def __init__(self, tx = CTransaction(), n = -1):
 each test.
 '''
 
+def hash160(s):
+    return hashlib.new('ripemd160', sha256(s)).digest()
+
+#  Use this class for tests that require behavior other than normal "mininode" behavior.
+#  For now, it is used to serialize a bloated varint (b64).
+class CBrokenBlock(CBlock):
+    def __init__(self, header=None):
+        super(CBrokenBlock, self).__init__(header)
+
+    def initialize(self, base_block):
+        self.vtx = copy.deepcopy(base_block.vtx)
+        self.hashMerkleRoot = self.calc_merkle_root()
+
+    def serialize(self):
+        r = b""
+        r += super(CBlock, self).serialize()
+        r += struct.pack("<BQ", 255, len(self.vtx))
+        for tx in self.vtx:
+            r += tx.serialize()
+        return r
+
+    def normal_serialize(self):
+        r = b""
+        r += super(CBrokenBlock, self).serialize()
+        return r
+
 class FullBlockTest(ComparisonTestFramework):
 
-    ''' Can either run this test as 1 node with expected answers, or two and compare them. 
-        Change the "outcome" variable from each TestInstance object to only do the comparison. '''
+    # Can either run this test as 1 node with expected answers, or two and compare them.
+    # Change the "outcome" variable from each TestInstance object to only do the comparison.
     def __init__(self):
         super().__init__()
         self.num_nodes = 1
@@ -35,66 +62,66 @@ def __init__(self):
         self.coinbase_key = CECKey()
         self.coinbase_key.set_secretbytes(b"horsebattery")
         self.coinbase_pubkey = self.coinbase_key.get_pubkey()
-        self.block_time = int(time.time())+1
         self.tip = None
         self.blocks = {}
 
     def run_test(self):
-        test = TestManager(self, self.options.tmpdir)
-        test.add_all_connections(self.nodes)
+        self.test = TestManager(self, self.options.tmpdir)
+        self.test.add_all_connections(self.nodes)
         NetworkThread().start() # Start up network handling in another thread
-        test.run()
+        self.test.run()
 
     def add_transactions_to_block(self, block, tx_list):
         [ tx.rehash() for tx in tx_list ]
         block.vtx.extend(tx_list)
-        block.hashMerkleRoot = block.calc_merkle_root()
-        block.rehash()
-        return block
-    
-    # Create a block on top of self.tip, and advance self.tip to point to the new block
-    # if spend is specified, then 1 satoshi will be spent from that to an anyone-can-spend output,
-    # and rest will go to fees.
-    def next_block(self, number, spend=None, additional_coinbase_value=0, script=None):
+
+    # this is a little handier to use than the version in blocktools.py
+    def create_tx(self, spend_tx, n, value, script=CScript([OP_TRUE])):
+        tx = create_transaction(spend_tx, n, b"", value, script)
+        return tx
+
+    # sign a transaction, using the key we know about
+    # this signs input 0 in tx, which is assumed to be spending output n in spend_tx
+    def sign_tx(self, tx, spend_tx, n):
+        scriptPubKey = bytearray(spend_tx.vout[n].scriptPubKey)
+        if (scriptPubKey[0] == OP_TRUE):  # an anyone-can-spend
+            tx.vin[0].scriptSig = CScript()
+            return
+        (sighash, err) = SignatureHash(spend_tx.vout[n].scriptPubKey, tx, 0, SIGHASH_ALL)
+        tx.vin[0].scriptSig = CScript([self.coinbase_key.sign(sighash) + bytes(bytearray([SIGHASH_ALL]))])
+
+    def create_and_sign_transaction(self, spend_tx, n, value, script=CScript([OP_TRUE])):
+        tx = self.create_tx(spend_tx, n, value, script)
+        self.sign_tx(tx, spend_tx, n)
+        tx.rehash()
+        return tx
+
+    def next_block(self, number, spend=None, additional_coinbase_value=0, script=CScript([OP_TRUE]), solve=True):
         if self.tip == None:
             base_block_hash = self.genesis_hash
+            block_time = int(time.time())+1
         else:
             base_block_hash = self.tip.sha256
+            block_time = self.tip.nTime + 1
         # First create the coinbase
         height = self.block_heights[base_block_hash] + 1
         coinbase = create_coinbase(height, self.coinbase_pubkey)
         coinbase.vout[0].nValue += additional_coinbase_value
-        if (spend != None):
-            coinbase.vout[0].nValue += spend.tx.vout[spend.n].nValue - 1 # all but one satoshi to fees
         coinbase.rehash()
-        block = create_block(base_block_hash, coinbase, self.block_time)
-        if (spend != None):
-            tx = CTransaction()
-            tx.vin.append(CTxIn(COutPoint(spend.tx.sha256, spend.n), b"", 0xffffffff))  # no signature yet
-            # This copies the java comparison tool testing behavior: the first
-            # txout has a garbage scriptPubKey, "to make sure we're not
-            # pre-verifying too much" (?)
-            tx.vout.append(CTxOut(0, CScript([random.randint(0,255), height & 255])))
-            if script == None:
-                tx.vout.append(CTxOut(1, CScript([OP_TRUE])))
-            else:
-                tx.vout.append(CTxOut(1, script))
-            # Now sign it if necessary
-            scriptSig = b""
-            scriptPubKey = bytearray(spend.tx.vout[spend.n].scriptPubKey)
-            if (scriptPubKey[0] == OP_TRUE):  # looks like an anyone-can-spend
-                scriptSig = CScript([OP_TRUE])
-            else:
-                # We have to actually sign it
-                (sighash, err) = SignatureHash(spend.tx.vout[spend.n].scriptPubKey, tx, 0, SIGHASH_ALL)
-                scriptSig = CScript([self.coinbase_key.sign(sighash) + bytes(bytearray([SIGHASH_ALL]))])
-            tx.vin[0].scriptSig = scriptSig
-            # Now add the transaction to the block
-            block = self.add_transactions_to_block(block, [tx])
-        block.solve()
+        if spend == None:
+            block = create_block(base_block_hash, coinbase, block_time)
+        else:
+            coinbase.vout[0].nValue += spend.tx.vout[spend.n].nValue - 1 # all but one satoshi to fees
+            coinbase.rehash()
+            block = create_block(base_block_hash, coinbase, block_time)
+            tx = create_transaction(spend.tx, spend.n, b"", 1, script)  # spend 1 satoshi
+            self.sign_tx(tx, spend.tx, spend.n)
+            self.add_transactions_to_block(block, [tx])
+            block.hashMerkleRoot = block.calc_merkle_root()
+        if solve:
+            block.solve()
         self.tip = block
         self.block_heights[block.sha256] = height
-        self.block_time += 1
         assert number not in self.blocks
         self.blocks[number] = block
         return block
@@ -108,7 +135,7 @@ def get_tests(self):
         def save_spendable_output():
             spendable_outputs.append(self.tip)
 
-        # get an output that we previous marked as spendable
+        # get an output that we previously marked as spendable
         def get_spendable_output():
             return PreviousSpendableOutput(spendable_outputs.pop(0).vtx[0], 0)
 
@@ -122,26 +149,33 @@ def rejected(reject = None):
                 return TestInstance([[self.tip, False]])
             else:
                 return TestInstance([[self.tip, reject]])
-       
+
         # move the tip back to a previous block
         def tip(number):
             self.tip = self.blocks[number]
 
-        # add transactions to a block produced by next_block
+        # adds transactions to the block and updates state
         def update_block(block_number, new_transactions):
             block = self.blocks[block_number]
-            old_hash = block.sha256
             self.add_transactions_to_block(block, new_transactions)
+            old_sha256 = block.sha256
+            block.hashMerkleRoot = block.calc_merkle_root()
             block.solve()
             # Update the internal state just like in next_block
             self.tip = block
-            self.block_heights[block.sha256] = self.block_heights[old_hash]
-            del self.block_heights[old_hash]
+            if block.sha256 != old_sha256:
+                self.block_heights[block.sha256] = self.block_heights[old_sha256]
+                del self.block_heights[old_sha256]
             self.blocks[block_number] = block
             return block
 
-        # creates a new block and advances the tip to that block
+        # shorthand for functions
         block = self.next_block
+        create_tx = self.create_tx
+        create_and_sign_tx = self.create_and_sign_transaction
+
+        # these must be updated if consensus changes
+        MAX_BLOCK_SIGOPS = 20000
 
 
         # Create a new block
@@ -153,43 +187,44 @@ def update_block(block_number, new_transactions):
         # Now we need that block to mature so we can spend the coinbase.
         test = TestInstance(sync_every_block=False)
         for i in range(99):
-            block(1000 + i)
+            block(5000 + i)
             test.blocks_and_transactions.append([self.tip, True])
             save_spendable_output()
         yield test
 
+        # collect spendable outputs now to avoid cluttering the code later on
+        out = []
+        for i in range(33):
+            out.append(get_spendable_output())
 
         # Start by building a couple of blocks on top (which output is spent is
         # in parentheses):
         #     genesis -> b1 (0) -> b2 (1)
-        out0 = get_spendable_output()
-        block(1, spend=out0)
+        block(1, spend=out[0])
         save_spendable_output()
         yield accepted()
 
-        out1 = get_spendable_output()
-        b2 = block(2, spend=out1)
+        block(2, spend=out[1])
         yield accepted()
-
+        save_spendable_output()
 
         # so fork like this:
-        # 
+        #
         #     genesis -> b1 (0) -> b2 (1)
         #                      \-> b3 (1)
-        # 
+        #
         # Nothing should happen at this point. We saw b2 first so it takes priority.
         tip(1)
-        b3 = block(3, spend=out1)
-        txout_b3 = PreviousSpendableOutput(b3.vtx[1], 1)
+        b3 = block(3, spend=out[1])
+        txout_b3 = PreviousSpendableOutput(b3.vtx[1], 0)
         yield rejected()
 
 
         # Now we add another block to make the alternative chain longer.
-        # 
+        #
         #     genesis -> b1 (0) -> b2 (1)
         #                      \-> b3 (1) -> b4 (2)
-        out2 = get_spendable_output()
-        block(4, spend=out2)
+        block(4, spend=out[2])
         yield accepted()
 
 
@@ -197,46 +232,41 @@ def update_block(block_number, new_transactions):
         #     genesis -> b1 (0) -> b2 (1) -> b5 (2) -> b6 (3)
         #                      \-> b3 (1) -> b4 (2)
         tip(2)
-        block(5, spend=out2)
+        block(5, spend=out[2])
         save_spendable_output()
         yield rejected()
 
-        out3 = get_spendable_output()
-        block(6, spend=out3)
+        block(6, spend=out[3])
         yield accepted()
 
-
         # Try to create a fork that double-spends
         #     genesis -> b1 (0) -> b2 (1) -> b5 (2) -> b6 (3)
         #                                          \-> b7 (2) -> b8 (4)
         #                      \-> b3 (1) -> b4 (2)
         tip(5)
-        block(7, spend=out2)
+        block(7, spend=out[2])
         yield rejected()
 
-        out4 = get_spendable_output()
-        block(8, spend=out4)
+        block(8, spend=out[4])
         yield rejected()
 
-
         # Try to create a block that has too much fee
         #     genesis -> b1 (0) -> b2 (1) -> b5 (2) -> b6 (3)
         #                                                    \-> b9 (4)
         #                      \-> b3 (1) -> b4 (2)
         tip(6)
-        block(9, spend=out4, additional_coinbase_value=1)
+        block(9, spend=out[4], additional_coinbase_value=1)
         yield rejected(RejectResult(16, b'bad-cb-amount'))
 
-        
         # Create a fork that ends in a block with too much fee (the one that causes the reorg)
         #     genesis -> b1 (0) -> b2 (1) -> b5 (2) -> b6  (3)
         #                                          \-> b10 (3) -> b11 (4)
         #                      \-> b3 (1) -> b4 (2)
         tip(5)
-        block(10, spend=out3)
+        block(10, spend=out[3])
         yield rejected()
 
-        block(11, spend=out4, additional_coinbase_value=1)
+        block(11, spend=out[4], additional_coinbase_value=1)
         yield rejected(RejectResult(16, b'bad-cb-amount'))
 
 
@@ -246,19 +276,17 @@ def update_block(block_number, new_transactions):
         #                                              (b12 added last)
         #                      \-> b3 (1) -> b4 (2)
         tip(5)
-        b12 = block(12, spend=out3)
+        b12 = block(12, spend=out[3])
         save_spendable_output()
-        #yield TestInstance([[b12, False]])
-        b13 = block(13, spend=out4)
+        b13 = block(13, spend=out[4])
         # Deliver the block header for b12, and the block b13.
         # b13 should be accepted but the tip won't advance until b12 is delivered.
         yield TestInstance([[CBlockHeader(b12), None], [b13, False]])
 
         save_spendable_output()
-        out5 = get_spendable_output()
         # b14 is invalid, but the node won't know that until it tries to connect
         # Tip still can't advance because b12 is missing
-        block(14, spend=out5, additional_coinbase_value=1)
+        block(14, spend=out[5], additional_coinbase_value=1)
         yield rejected()
 
         yield TestInstance([[b12, True, b13.sha256]]) # New tip should be b13.
@@ -267,18 +295,18 @@ def update_block(block_number, new_transactions):
         #     genesis -> b1 (0) -> b2 (1) -> b5 (2) -> b6  (3)
         #                                          \-> b12 (3) -> b13 (4) -> b15 (5) -> b16 (6)
         #                      \-> b3 (1) -> b4 (2)
-        
+
         # Test that a block with a lot of checksigs is okay
-        lots_of_checksigs = CScript([OP_CHECKSIG] * (1000000 // 50 - 1))
+        lots_of_checksigs = CScript([OP_CHECKSIG] * (MAX_BLOCK_SIGOPS - 1))
         tip(13)
-        block(15, spend=out5, script=lots_of_checksigs)
+        block(15, spend=out[5], script=lots_of_checksigs)
         yield accepted()
+        save_spendable_output()
 
 
         # Test that a block with too many checksigs is rejected
-        out6 = get_spendable_output()
-        too_many_checksigs = CScript([OP_CHECKSIG] * (1000000 // 50))
-        block(16, spend=out6, script=too_many_checksigs)
+        too_many_checksigs = CScript([OP_CHECKSIG] * (MAX_BLOCK_SIGOPS))
+        block(16, spend=out[6], script=too_many_checksigs)
         yield rejected(RejectResult(16, b'bad-blk-sigops'))
 
 
@@ -299,7 +327,7 @@ def update_block(block_number, new_transactions):
         block(18, spend=txout_b3)
         yield rejected()
 
-        block(19, spend=out6)
+        block(19, spend=out[6])
         yield rejected()
 
         # Attempt to spend a coinbase at depth too low
@@ -307,8 +335,7 @@ def update_block(block_number, new_transactions):
         #                                          \-> b12 (3) -> b13 (4) -> b15 (5) -> b20 (7)
         #                      \-> b3 (1) -> b4 (2)
         tip(15)
-        out7 = get_spendable_output()
-        block(20, spend=out7)
+        block(20, spend=out[7])
         yield rejected(RejectResult(16, b'bad-txns-premature-spend-of-coinbase'))
 
         # Attempt to spend a coinbase at depth too low (on a fork this time)
@@ -317,10 +344,10 @@ def update_block(block_number, new_transactions):
         #                                                                \-> b21 (6) -> b22 (5)
         #                      \-> b3 (1) -> b4 (2)
         tip(13)
-        block(21, spend=out6)
+        block(21, spend=out[6])
         yield rejected()
 
-        block(22, spend=out5)
+        block(22, spend=out[5])
         yield rejected()
 
         # Create a block on either side of MAX_BLOCK_SIZE and make sure its accepted/rejected
@@ -329,21 +356,21 @@ def update_block(block_number, new_transactions):
         #                                                                           \-> b24 (6) -> b25 (7)
         #                      \-> b3 (1) -> b4 (2)
         tip(15)
-        b23 = block(23, spend=out6)
-        old_hash = b23.sha256
+        b23 = block(23, spend=out[6])
         tx = CTransaction()
         script_length = MAX_BLOCK_SIZE - len(b23.serialize()) - 69
         script_output = CScript([b'\x00' * script_length])
         tx.vout.append(CTxOut(0, script_output))
-        tx.vin.append(CTxIn(COutPoint(b23.vtx[1].sha256, 1)))
+        tx.vin.append(CTxIn(COutPoint(b23.vtx[1].sha256, 0)))
         b23 = update_block(23, [tx])
         # Make sure the math above worked out to produce a max-sized block
         assert_equal(len(b23.serialize()), MAX_BLOCK_SIZE)
         yield accepted()
+        save_spendable_output()
 
         # Make the next block one byte bigger and check that it fails
         tip(15)
-        b24 = block(24, spend=out6)
+        b24 = block(24, spend=out[6])
         script_length = MAX_BLOCK_SIZE - len(b24.serialize()) - 69
         script_output = CScript([b'\x00' * (script_length+1)])
         tx.vout = [CTxOut(0, script_output)]
@@ -351,7 +378,7 @@ def update_block(block_number, new_transactions):
         assert_equal(len(b24.serialize()), MAX_BLOCK_SIZE+1)
         yield rejected(RejectResult(16, b'bad-blk-length'))
 
-        b25 = block(25, spend=out7)
+        block(25, spend=out[7])
         yield rejected()
 
         # Create blocks with a coinbase input script size out of range
@@ -360,7 +387,7 @@ def update_block(block_number, new_transactions):
         #                                                                           \-> ... (6) -> ... (7)
         #                      \-> b3 (1) -> b4 (2)
         tip(15)
-        b26 = block(26, spend=out6)
+        b26 = block(26, spend=out[6])
         b26.vtx[0].vin[0].scriptSig = b'\x00'
         b26.vtx[0].rehash()
         # update_block causes the merkle root to get updated, even with no new
@@ -369,23 +396,20 @@ def update_block(block_number, new_transactions):
         yield rejected(RejectResult(16, b'bad-cb-length'))
 
         # Extend the b26 chain to make sure bitcoind isn't accepting b26
-        b27 = block(27, spend=out7)
-        yield rejected()
+        b27 = block(27, spend=out[7])
+        yield rejected(RejectResult(16, b'bad-prevblk'))
 
         # Now try a too-large-coinbase script
         tip(15)
-        b28 = block(28, spend=out6)
+        b28 = block(28, spend=out[6])
         b28.vtx[0].vin[0].scriptSig = b'\x00' * 101
         b28.vtx[0].rehash()
         b28 = update_block(28, [])
         yield rejected(RejectResult(16, b'bad-cb-length'))
 
-        # Extend the b28 chain to make sure bitcoind isn't accepted b28
-        b29 = block(29, spend=out7)
-        # TODO: Should get a reject message back with "bad-prevblk", except
-        # there's a bug that prevents this from being detected.  Just note
-        # failure for now, and add the reject result later.
-        yield rejected()
+        # Extend the b28 chain to make sure bitcoind isn't accepting b28
+        b29 = block(29, spend=out[7])
+        yield rejected(RejectResult(16, b'bad-prevblk'))
 
         # b30 has a max-sized coinbase scriptSig.
         tip(23)
@@ -394,6 +418,867 @@ def update_block(block_number, new_transactions):
         b30.vtx[0].rehash()
         b30 = update_block(30, [])
         yield accepted()
+        save_spendable_output()
+
+        # b31 - b35 - check sigops of OP_CHECKMULTISIG / OP_CHECKMULTISIGVERIFY / OP_CHECKSIGVERIFY
+        #
+        #     genesis -> ... -> b30 (7) -> b31 (8) -> b33 (9) -> b35 (10)
+        #                                                                \-> b36 (11)
+        #                                                    \-> b34 (10)
+        #                                         \-> b32 (9)
+        #
+
+        # MULTISIG: each op code counts as 20 sigops.  To create the edge case, pack another 19 sigops at the end.
+        lots_of_multisigs = CScript([OP_CHECKMULTISIG] * ((MAX_BLOCK_SIGOPS-1) // 20) + [OP_CHECKSIG] * 19)
+        b31 = block(31, spend=out[8], script=lots_of_multisigs)
+        assert_equal(get_legacy_sigopcount_block(b31), MAX_BLOCK_SIGOPS)
+        yield accepted()
+        save_spendable_output()
+
+        # this goes over the limit because the coinbase has one sigop
+        too_many_multisigs = CScript([OP_CHECKMULTISIG] * (MAX_BLOCK_SIGOPS // 20))
+        b32 = block(32, spend=out[9], script=too_many_multisigs)
+        assert_equal(get_legacy_sigopcount_block(b32), MAX_BLOCK_SIGOPS + 1)
+        yield rejected(RejectResult(16, b'bad-blk-sigops'))
+
+
+        # CHECKMULTISIGVERIFY
+        tip(31)
+        lots_of_multisigs = CScript([OP_CHECKMULTISIGVERIFY] * ((MAX_BLOCK_SIGOPS-1) // 20) + [OP_CHECKSIG] * 19)
+        block(33, spend=out[9], script=lots_of_multisigs)
+        yield accepted()
+        save_spendable_output()
+
+        too_many_multisigs = CScript([OP_CHECKMULTISIGVERIFY] * (MAX_BLOCK_SIGOPS // 20))
+        block(34, spend=out[10], script=too_many_multisigs)
+        yield rejected(RejectResult(16, b'bad-blk-sigops'))
+
+
+        # CHECKSIGVERIFY
+        tip(33)
+        lots_of_checksigs = CScript([OP_CHECKSIGVERIFY] * (MAX_BLOCK_SIGOPS - 1))
+        b35 = block(35, spend=out[10], script=lots_of_checksigs)
+        yield accepted()
+        save_spendable_output()
+
+        too_many_checksigs = CScript([OP_CHECKSIGVERIFY] * (MAX_BLOCK_SIGOPS))
+        block(36, spend=out[11], script=too_many_checksigs)
+        yield rejected(RejectResult(16, b'bad-blk-sigops'))
+
+
+        # Check spending of a transaction in a block which failed to connect
+        #
+        # b6  (3)
+        # b12 (3) -> b13 (4) -> b15 (5) -> b23 (6) -> b30 (7) -> b31 (8) -> b33 (9) -> b35 (10)
+        #                                                                                     \-> b37 (11)
+        #                                                                                     \-> b38 (11/37)
+        #
+
+        # save 37's spendable output, but then double-spend out11 to invalidate the block
+        tip(35)
+        b37 = block(37, spend=out[11])
+        txout_b37 = PreviousSpendableOutput(b37.vtx[1], 0)
+        tx = create_and_sign_tx(out[11].tx, out[11].n, 0)
+        b37 = update_block(37, [tx])
+        yield rejected(RejectResult(16, b'bad-txns-inputs-missingorspent'))
+
+        # attempt to spend b37's first non-coinbase tx, at which point b37 was still considered valid
+        tip(35)
+        block(38, spend=txout_b37)
+        yield rejected(RejectResult(16, b'bad-txns-inputs-missingorspent'))
+
+        # Check P2SH SigOp counting
+        #
+        #
+        #   13 (4) -> b15 (5) -> b23 (6) -> b30 (7) -> b31 (8) -> b33 (9) -> b35 (10) -> b39 (11) -> b41 (12)
+        #                                                                                        \-> b40 (12)
+        #
+        # b39 - create some P2SH outputs that will require 6 sigops to spend:
+        #
+        #           redeem_script = COINBASE_PUBKEY, (OP_2DUP+OP_CHECKSIGVERIFY) * 5, OP_CHECKSIG
+        #           p2sh_script = OP_HASH160, ripemd160(sha256(script)), OP_EQUAL
+        #
+        tip(35)
+        b39 = block(39)
+        b39_outputs = 0
+        b39_sigops_per_output = 6
+
+        # Build the redeem script, hash it, use hash to create the p2sh script
+        redeem_script = CScript([self.coinbase_pubkey] + [OP_2DUP, OP_CHECKSIGVERIFY]*5 + [OP_CHECKSIG])
+        redeem_script_hash = hash160(redeem_script)
+        p2sh_script = CScript([OP_HASH160, redeem_script_hash, OP_EQUAL])
+
+        # Create a transaction that spends one satoshi to the p2sh_script, the rest to OP_TRUE
+        # This must be signed because it is spending a coinbase
+        spend = out[11]
+        tx = create_tx(spend.tx, spend.n, 1, p2sh_script)
+        tx.vout.append(CTxOut(spend.tx.vout[spend.n].nValue - 1, CScript([OP_TRUE])))
+        self.sign_tx(tx, spend.tx, spend.n)
+        tx.rehash()
+        b39 = update_block(39, [tx])
+        b39_outputs += 1
+
+        # Until block is full, add tx's with 1 satoshi to p2sh_script, the rest to OP_TRUE
+        tx_new = None
+        tx_last = tx
+        total_size=len(b39.serialize())
+        while(total_size < MAX_BLOCK_SIZE):
+            tx_new = create_tx(tx_last, 1, 1, p2sh_script)
+            tx_new.vout.append(CTxOut(tx_last.vout[1].nValue - 1, CScript([OP_TRUE])))
+            tx_new.rehash()
+            total_size += len(tx_new.serialize())
+            if total_size >= MAX_BLOCK_SIZE:
+                break
+            b39.vtx.append(tx_new) # add tx to block
+            tx_last = tx_new
+            b39_outputs += 1
+
+        b39 = update_block(39, [])
+        yield accepted()
+        save_spendable_output()
+
+
+        # Test sigops in P2SH redeem scripts
+        #
+        # b40 creates 3333 tx's spending the 6-sigop P2SH outputs from b39 for a total of 19998 sigops.
+        # The first tx has one sigop and then at the end we add 2 more to put us just over the max.
+        #
+        # b41 does the same, less one, so it has the maximum sigops permitted.
+        #
+        tip(39)
+        b40 = block(40, spend=out[12])
+        sigops = get_legacy_sigopcount_block(b40)
+        numTxes = (MAX_BLOCK_SIGOPS - sigops) // b39_sigops_per_output
+        assert_equal(numTxes <= b39_outputs, True)
+
+        lastOutpoint = COutPoint(b40.vtx[1].sha256, 0)
+        new_txs = []
+        for i in range(1, numTxes+1):
+            tx = CTransaction()
+            tx.vout.append(CTxOut(1, CScript([OP_TRUE])))
+            tx.vin.append(CTxIn(lastOutpoint, b''))
+            # second input is corresponding P2SH output from b39
+            tx.vin.append(CTxIn(COutPoint(b39.vtx[i].sha256, 0), b''))
+            # Note: must pass the redeem_script (not p2sh_script) to the signature hash function
+            (sighash, err) = SignatureHash(redeem_script, tx, 1, SIGHASH_ALL)
+            sig = self.coinbase_key.sign(sighash) + bytes(bytearray([SIGHASH_ALL]))
+            scriptSig = CScript([sig, redeem_script])
+
+            tx.vin[1].scriptSig = scriptSig
+            tx.rehash()
+            new_txs.append(tx)
+            lastOutpoint = COutPoint(tx.sha256, 0)
+
+        b40_sigops_to_fill = MAX_BLOCK_SIGOPS - (numTxes * b39_sigops_per_output + sigops) + 1
+        tx = CTransaction()
+        tx.vin.append(CTxIn(lastOutpoint, b''))
+        tx.vout.append(CTxOut(1, CScript([OP_CHECKSIG] * b40_sigops_to_fill)))
+        tx.rehash()
+        new_txs.append(tx)
+        update_block(40, new_txs)
+        yield rejected(RejectResult(16, b'bad-blk-sigops'))
+
+        # same as b40, but one less sigop
+        tip(39)
+        b41 = block(41, spend=None)
+        update_block(41, b40.vtx[1:-1])
+        b41_sigops_to_fill = b40_sigops_to_fill - 1
+        tx = CTransaction()
+        tx.vin.append(CTxIn(lastOutpoint, b''))
+        tx.vout.append(CTxOut(1, CScript([OP_CHECKSIG] * b41_sigops_to_fill)))
+        tx.rehash()
+        update_block(41, [tx])
+        yield accepted()
+
+        # Fork off of b39 to create a constant base again
+        #
+        # b23 (6) -> b30 (7) -> b31 (8) -> b33 (9) -> b35 (10) -> b39 (11) -> b42 (12) -> b43 (13)
+        #                                                                  \-> b41 (12)
+        #
+        tip(39)
+        block(42, spend=out[12])
+        yield rejected()
+        save_spendable_output()
+
+        block(43, spend=out[13])
+        yield accepted()
+        save_spendable_output()
+
+
+        # Test a number of really invalid scenarios
+        #
+        #  -> b31 (8) -> b33 (9) -> b35 (10) -> b39 (11) -> b42 (12) -> b43 (13) -> b44 (14)
+        #                                                                                   \-> ??? (15)
+
+        # The next few blocks are going to be created "by hand" since they'll do funky things, such as having
+        # the first transaction be non-coinbase, etc.  The purpose of b44 is to make sure this works.
+        height = self.block_heights[self.tip.sha256] + 1
+        coinbase = create_coinbase(height, self.coinbase_pubkey)
+        b44 = CBlock()
+        b44.nTime = self.tip.nTime + 1
+        b44.hashPrevBlock = self.tip.sha256
+        b44.nBits = 0x207fffff
+        b44.vtx.append(coinbase)
+        b44.hashMerkleRoot = b44.calc_merkle_root()
+        b44.solve()
+        self.tip = b44
+        self.block_heights[b44.sha256] = height
+        self.blocks[44] = b44
+        yield accepted()
+
+        # A block with a non-coinbase as the first tx
+        non_coinbase = create_tx(out[15].tx, out[15].n, 1)
+        b45 = CBlock()
+        b45.nTime = self.tip.nTime + 1
+        b45.hashPrevBlock = self.tip.sha256
+        b45.nBits = 0x207fffff
+        b45.vtx.append(non_coinbase)
+        b45.hashMerkleRoot = b45.calc_merkle_root()
+        b45.calc_sha256()
+        b45.solve()
+        self.block_heights[b45.sha256] = self.block_heights[self.tip.sha256]+1
+        self.tip = b45
+        self.blocks[45] = b45
+        yield rejected(RejectResult(16, b'bad-cb-missing'))
+
+        # A block with no txns
+        tip(44)
+        b46 = CBlock()
+        b46.nTime = b44.nTime+1
+        b46.hashPrevBlock = b44.sha256
+        b46.nBits = 0x207fffff
+        b46.vtx = []
+        b46.hashMerkleRoot = 0
+        b46.solve()
+        self.block_heights[b46.sha256] = self.block_heights[b44.sha256]+1
+        self.tip = b46
+        assert 46 not in self.blocks
+        self.blocks[46] = b46
+        s = ser_uint256(b46.hashMerkleRoot)
+        yield rejected(RejectResult(16, b'bad-blk-length'))
+
+        # A block with invalid work
+        tip(44)
+        b47 = block(47, solve=False)
+        target = uint256_from_compact(b47.nBits)
+        while b47.sha256 < target: #changed > to <
+            b47.nNonce += 1
+            b47.rehash()
+        yield rejected(RejectResult(16, b'high-hash'))
+
+        # A block with timestamp > 2 hrs in the future
+        tip(44)
+        b48 = block(48, solve=False)
+        b48.nTime = int(time.time()) + 60 * 60 * 3
+        b48.solve()
+        yield rejected(RejectResult(16, b'time-too-new'))
+
+        # A block with an invalid merkle hash
+        tip(44)
+        b49 = block(49)
+        b49.hashMerkleRoot += 1
+        b49.solve()
+        yield rejected(RejectResult(16, b'bad-txnmrklroot'))
+
+        # A block with an incorrect POW limit
+        tip(44)
+        b50 = block(50)
+        b50.nBits = b50.nBits - 1
+        b50.solve()
+        yield rejected(RejectResult(16, b'bad-diffbits'))
+
+        # A block with two coinbase txns
+        tip(44)
+        b51 = block(51)
+        cb2 = create_coinbase(51, self.coinbase_pubkey)
+        b51 = update_block(51, [cb2])
+        yield rejected(RejectResult(16, b'bad-cb-multiple'))
+
+        # A block w/ duplicate txns
+        # Note: txns have to be in the right position in the merkle tree to trigger this error
+        tip(44)
+        b52 = block(52, spend=out[15])
+        tx = create_tx(b52.vtx[1], 0, 1)
+        b52 = update_block(52, [tx, tx])
+        yield rejected(RejectResult(16, b'bad-txns-duplicate'))
+
+        # Test block timestamps
+        #  -> b31 (8) -> b33 (9) -> b35 (10) -> b39 (11) -> b42 (12) -> b43 (13) -> b53 (14) -> b55 (15)
+        #                                                                                   \-> b54 (15)
+        #
+        tip(43)
+        block(53, spend=out[14])
+        yield rejected() # rejected since b44 is at same height
+        save_spendable_output()
+
+        # invalid timestamp (b35 is 5 blocks back, so its time is MedianTimePast)
+        b54 = block(54, spend=out[15])
+        b54.nTime = b35.nTime - 1
+        b54.solve()
+        yield rejected(RejectResult(16, b'time-too-old'))
+
+        # valid timestamp
+        tip(53)
+        b55 = block(55, spend=out[15])
+        b55.nTime = b35.nTime
+        update_block(55, [])
+        yield accepted()
+        save_spendable_output()
+
+
+        # Test CVE-2012-2459
+        #
+        # -> b42 (12) -> b43 (13) -> b53 (14) -> b55 (15) -> b57p2 (16)
+        #                                                \-> b57   (16)
+        #                                                \-> b56p2 (16)
+        #                                                \-> b56   (16)
+        #
+        # Merkle tree malleability (CVE-2012-2459): repeating sequences of transactions in a block without 
+        #                           affecting the merkle root of a block, while still invalidating it.
+        #                           See:  src/consensus/merkle.h
+        #
+        #  b57 has three txns:  coinbase, tx, tx1.  The merkle root computation will duplicate tx.
+        #  Result:  OK
+        #
+        #  b56 copies b57 but duplicates tx1 and does not recalculate the block hash.  So it has a valid merkle
+        #  root but duplicate transactions.
+        #  Result:  Fails
+        #
+        #  b57p2 has six transactions in its merkle tree:
+        #       - coinbase, tx, tx1, tx2, tx3, tx4
+        #  Merkle root calculation will duplicate as necessary.
+        #  Result:  OK.
+        #
+        #  b56p2 copies b57p2 but adds both tx3 and tx4.  The purpose of the test is to make sure the code catches
+        #  duplicate txns that are not next to one another with the "bad-txns-duplicate" error (which indicates
+        #  that the error was caught early, avoiding a DOS vulnerability.)
+
+        # b57 - a good block with 2 txs, don't submit until end
+        tip(55)
+        b57 = block(57)
+        tx = create_and_sign_tx(out[16].tx, out[16].n, 1)
+        tx1 = create_tx(tx, 0, 1)
+        b57 = update_block(57, [tx, tx1])
+
+        # b56 - copy b57, add a duplicate tx
+        tip(55)
+        b56 = copy.deepcopy(b57)
+        self.blocks[56] = b56
+        assert_equal(len(b56.vtx),3)
+        b56 = update_block(56, [tx1])
+        assert_equal(b56.hash, b57.hash)
+        yield rejected(RejectResult(16, b'bad-txns-duplicate'))
+
+        # b57p2 - a good block with 6 tx'es, don't submit until end
+        tip(55)
+        b57p2 = block("57p2")
+        tx = create_and_sign_tx(out[16].tx, out[16].n, 1)
+        tx1 = create_tx(tx, 0, 1)
+        tx2 = create_tx(tx1, 0, 1)
+        tx3 = create_tx(tx2, 0, 1)
+        tx4 = create_tx(tx3, 0, 1)
+        b57p2 = update_block("57p2", [tx, tx1, tx2, tx3, tx4])
+
+        # b56p2 - copy b57p2, duplicate two non-consecutive tx's
+        tip(55)
+        b56p2 = copy.deepcopy(b57p2)
+        self.blocks["b56p2"] = b56p2
+        assert_equal(b56p2.hash, b57p2.hash)
+        assert_equal(len(b56p2.vtx),6)
+        b56p2 = update_block("b56p2", [tx3, tx4])
+        yield rejected(RejectResult(16, b'bad-txns-duplicate'))
+
+        tip("57p2")
+        yield accepted()
+
+        tip(57)
+        yield rejected()  #rejected because 57p2 seen first
+        save_spendable_output()
+
+        # Test a few invalid tx types
+        #
+        # -> b35 (10) -> b39 (11) -> b42 (12) -> b43 (13) -> b53 (14) -> b55 (15) -> b57 (16) -> b60 (17)
+        #                                                                                    \-> ??? (17)
+        #
+
+        # tx with prevout.n out of range
+        tip(57)
+        b58 = block(58, spend=out[17])
+        tx = CTransaction()
+        assert(len(out[17].tx.vout) < 42)
+        tx.vin.append(CTxIn(COutPoint(out[17].tx.sha256, 42), CScript([OP_TRUE]), 0xffffffff))
+        tx.vout.append(CTxOut(0, b""))
+        tx.calc_sha256()
+        b58 = update_block(58, [tx])
+        yield rejected(RejectResult(16, b'bad-txns-inputs-missingorspent'))
+
+        # tx with output value > input value out of range
+        tip(57)
+        b59 = block(59)
+        tx = create_and_sign_tx(out[17].tx, out[17].n, 51*COIN)
+        b59 = update_block(59, [tx])
+        yield rejected(RejectResult(16, b'bad-txns-in-belowout'))
+
+        # reset to good chain
+        tip(57)
+        b60 = block(60, spend=out[17])
+        yield accepted()
+        save_spendable_output()
+
+        # Test BIP30
+        #
+        # -> b39 (11) -> b42 (12) -> b43 (13) -> b53 (14) -> b55 (15) -> b57 (16) -> b60 (17)
+        #                                                                                    \-> b61 (18)
+        #
+        # Blocks are not allowed to contain a transaction whose id matches that of an earlier,
+        # not-fully-spent transaction in the same chain. To test, make identical coinbases;
+        # the second one should be rejected.
+        #
+        tip(60)
+        b61 = block(61, spend=out[18])
+        b61.vtx[0].vin[0].scriptSig = b60.vtx[0].vin[0].scriptSig  #equalize the coinbases
+        b61.vtx[0].rehash()
+        b61 = update_block(61, [])
+        assert_equal(b60.vtx[0].serialize(), b61.vtx[0].serialize())
+        yield rejected(RejectResult(16, b'bad-txns-BIP30'))
+
+
+        # Test tx.isFinal is properly rejected (not an exhaustive tx.isFinal test, that should be in data-driven transaction tests)
+        #
+        #   -> b39 (11) -> b42 (12) -> b43 (13) -> b53 (14) -> b55 (15) -> b57 (16) -> b60 (17)
+        #                                                                                     \-> b62 (18)
+        #
+        tip(60)
+        b62 = block(62)
+        tx = CTransaction()
+        tx.nLockTime = 0xffffffff  #this locktime is non-final
+        assert(out[18].n < len(out[18].tx.vout))
+        tx.vin.append(CTxIn(COutPoint(out[18].tx.sha256, out[18].n))) # don't set nSequence
+        tx.vout.append(CTxOut(0, CScript([OP_TRUE])))
+        assert(tx.vin[0].nSequence < 0xffffffff)
+        tx.calc_sha256()
+        b62 = update_block(62, [tx])
+        yield rejected(RejectResult(16, b'bad-txns-nonfinal'))
+
+
+        # Test a non-final coinbase is also rejected
+        #
+        #   -> b39 (11) -> b42 (12) -> b43 (13) -> b53 (14) -> b55 (15) -> b57 (16) -> b60 (17)
+        #                                                                                     \-> b63 (-)
+        #
+        tip(60)
+        b63 = block(63)
+        b63.vtx[0].nLockTime = 0xffffffff
+        b63.vtx[0].vin[0].nSequence = 0xDEADBEEF
+        b63.vtx[0].rehash()
+        b63 = update_block(63, [])
+        yield rejected(RejectResult(16, b'bad-txns-nonfinal'))
+
+
+        #  This checks that a block with a bloated VARINT between the block_header and the array of tx is rejected
+        #  (previous behavior was that it was accepted.)  It also checks that if you subsequently send that block
+        #  with correct encoding, it should be accepted (i.e., the receiving node should not reject it on the
+        #  basis that it's the same as an already-rejected block, which would be a DoS vulnerability.)
+        #
+        #  -> b39 (11) -> b42 (12) -> b43 (13) -> b53 (14) -> b55 (15) -> b57 (16) -> b60 (17) -> b64 (18)
+        #                                                                                        \
+        #                                                                                         b64a (18)
+        #  b64a is a bloated block (non-canonical varint)
+        #  b64 is a good block (same as b64 but w/ canonical varint)
+        #
+        tip(60)
+        regular_block = block("64a", spend=out[18])
+
+        # make it a "broken_block," with non-canonical serialization
+        b64a = CBrokenBlock(regular_block)
+        b64a.initialize(regular_block)
+        self.blocks["64a"] = b64a
+        self.tip = b64a
+        tx = CTransaction()
+
+        # use canonical serialization to calculate size
+        script_length = MAX_BLOCK_SIZE - len(b64a.normal_serialize()) - 69
+        script_output = CScript([b'\x00' * script_length])
+        tx.vout.append(CTxOut(0, script_output))
+        tx.vin.append(CTxIn(COutPoint(b64a.vtx[1].sha256, 0)))
+        b64a = update_block("64a", [tx])
+        assert_equal(len(b64a.serialize()), MAX_BLOCK_SIZE + 8)
+        yield rejected()
+
+        # comptool workaround: to make sure b64 is delivered, manually erase b64a from blockstore
+        self.test.block_store.erase(b64a.sha256)
+
+        tip(60)
+        b64 = CBlock(b64a)
+        b64.vtx = copy.deepcopy(b64a.vtx)
+        assert_equal(b64.hash, b64a.hash)
+        assert_equal(len(b64.serialize()), MAX_BLOCK_SIZE)
+        self.blocks[64] = b64
+        update_block(64, [])
+        yield accepted()
+        save_spendable_output()
+
+        # Spend an output created in the block itself
+        #
+        # -> b42 (12) -> b43 (13) -> b53 (14) -> b55 (15) -> b57 (16) -> b60 (17) -> b64 (18) -> b65 (19)
+        #
+        tip(64)
+        b65 = block(65)
+        tx1 = create_and_sign_tx(out[19].tx, out[19].n, out[19].tx.vout[0].nValue)
+        tx2 = create_and_sign_tx(tx1, 0, 0)
+        update_block(65, [tx1, tx2])
+        yield accepted()
+        save_spendable_output()
+
+        # Attempt to spend an output created later in the same block
+        #
+        # -> b43 (13) -> b53 (14) -> b55 (15) -> b57 (16) -> b60 (17) -> b64 (18) -> b65 (19)
+        #                                                                                    \-> b66 (20)
+        tip(65)
+        b66 = block(66)
+        tx1 = create_and_sign_tx(out[20].tx, out[20].n, out[20].tx.vout[0].nValue)
+        tx2 = create_and_sign_tx(tx1, 0, 1)
+        update_block(66, [tx2, tx1])
+        yield rejected(RejectResult(16, b'bad-txns-inputs-missingorspent'))
+
+
+        # Attempt to double-spend a transaction created in a block
+        #
+        # -> b43 (13) -> b53 (14) -> b55 (15) -> b57 (16) -> b60 (17) -> b64 (18) -> b65 (19)
+        #                                                                                    \-> b67 (20)
+        #
+        #
+        tip(65)
+        b67 = block(67)
+        tx1 = create_and_sign_tx(out[20].tx, out[20].n, out[20].tx.vout[0].nValue)
+        tx2 = create_and_sign_tx(tx1, 0, 1)
+        tx3 = create_and_sign_tx(tx1, 0, 2)
+        update_block(67, [tx1, tx2, tx3])
+        yield rejected(RejectResult(16, b'bad-txns-inputs-missingorspent'))
+
+        # More tests of block subsidy
+        #
+        # -> b43 (13) -> b53 (14) -> b55 (15) -> b57 (16) -> b60 (17) -> b64 (18) -> b65 (19) -> b69 (20)
+        #                                                                                    \-> b68 (20)
+        #
+        # b68 - coinbase with an extra 10 satoshis,
+        #       creates a tx that has 9 satoshis from out[20] go to fees
+        #       this fails because the coinbase is trying to claim 1 satoshi too much in fees
+        #
+        # b69 - coinbase with extra 10 satoshis, and a tx that gives a 10 satoshi fee
+        #       this succeeds
+        #
+        tip(65)
+        b68 = block(68, additional_coinbase_value=10)
+        tx = create_and_sign_tx(out[20].tx, out[20].n, out[20].tx.vout[0].nValue-9)
+        update_block(68, [tx])
+        yield rejected(RejectResult(16, b'bad-cb-amount'))
+
+        tip(65)
+        b69 = block(69, additional_coinbase_value=10)
+        tx = create_and_sign_tx(out[20].tx, out[20].n, out[20].tx.vout[0].nValue-10)
+        update_block(69, [tx])
+        yield accepted()
+        save_spendable_output()
+
+        # Test spending the outpoint of a non-existent transaction
+        #
+        # -> b53 (14) -> b55 (15) -> b57 (16) -> b60 (17) -> b64 (18) -> b65 (19) -> b69 (20)
+        #                                                                                    \-> b70 (21)
+        #
+        tip(69)
+        block(70, spend=out[21])
+        bogus_tx = CTransaction()
+        bogus_tx.sha256 = uint256_from_str(b"23c70ed7c0506e9178fc1a987f40a33946d4ad4c962b5ae3a52546da53af0c5c")
+        tx = CTransaction()
+        tx.vin.append(CTxIn(COutPoint(bogus_tx.sha256, 0), b"", 0xffffffff))
+        tx.vout.append(CTxOut(1, b""))
+        update_block(70, [tx])
+        yield rejected(RejectResult(16, b'bad-txns-inputs-missingorspent'))
+
+
+        # Test accepting an invalid block which has the same hash as a valid one (via merkle tree tricks)
+        #
+        #  -> b53 (14) -> b55 (15) -> b57 (16) -> b60 (17) -> b64 (18) -> b65 (19) -> b69 (20) -> b72 (21)
+        #                                                                                      \-> b71 (21)
+        #
+        # b72 is a good block.
+        # b71 is a copy of 72, but re-adds one of its transactions.  However, it has the same hash as b71.
+        #
+        tip(69)
+        b72 = block(72)
+        tx1 = create_and_sign_tx(out[21].tx, out[21].n, 2)
+        tx2 = create_and_sign_tx(tx1, 0, 1)
+        b72 = update_block(72, [tx1, tx2])  # now tip is 72
+        b71 = copy.deepcopy(b72)
+        b71.vtx.append(tx2)   # add duplicate tx2
+        self.block_heights[b71.sha256] = self.block_heights[b69.sha256] + 1  # b71 builds off b69
+        self.blocks[71] = b71
+
+        assert_equal(len(b71.vtx), 4)
+        assert_equal(len(b72.vtx), 3)
+        assert_equal(b72.sha256, b71.sha256)
+
+        tip(71)
+        yield rejected(RejectResult(16, b'bad-txns-duplicate'))
+        tip(72)
+        yield accepted()
+        save_spendable_output()
+
+
+        # Test some invalid scripts and MAX_BLOCK_SIGOPS
+        #
+        # -> b55 (15) -> b57 (16) -> b60 (17) -> b64 (18) -> b65 (19) -> b69 (20) -> b72 (21)
+        #                                                                                    \-> b** (22)
+        #
+
+        # b73 - tx with excessive sigops that are placed after an excessively large script element.
+        #       The purpose of the test is to make sure those sigops are counted.
+        #
+        #       script is a bytearray of size 20,526
+        #
+        #       bytearray[0-19,998]     : OP_CHECKSIG
+        #       bytearray[19,999]       : OP_PUSHDATA4
+        #       bytearray[20,000-20,003]: 521  (max_script_element_size+1, in little-endian format)
+        #       bytearray[20,004-20,525]: unread data (script_element)
+        #       bytearray[20,526]       : OP_CHECKSIG (this puts us over the limit)
+        #
+        tip(72)
+        b73 = block(73)
+        size = MAX_BLOCK_SIGOPS - 1 + MAX_SCRIPT_ELEMENT_SIZE + 1 + 5 + 1
+        a = bytearray([OP_CHECKSIG] * size)
+        a[MAX_BLOCK_SIGOPS - 1] = int("4e",16) # OP_PUSHDATA4
+
+        element_size = MAX_SCRIPT_ELEMENT_SIZE + 1
+        a[MAX_BLOCK_SIGOPS] = element_size % 256
+        a[MAX_BLOCK_SIGOPS+1] = element_size // 256
+        a[MAX_BLOCK_SIGOPS+2] = 0
+        a[MAX_BLOCK_SIGOPS+3] = 0
+
+        tx = create_and_sign_tx(out[22].tx, 0, 1, CScript(a))
+        b73 = update_block(73, [tx])
+        assert_equal(get_legacy_sigopcount_block(b73), MAX_BLOCK_SIGOPS+1)
+        yield rejected(RejectResult(16, b'bad-blk-sigops'))
+
+        # b74/75 - if we push an invalid script element, all prevous sigops are counted,
+        #          but sigops after the element are not counted.
+        #
+        #       The invalid script element is that the push_data indicates that
+        #       there will be a large amount of data (0xffffff bytes), but we only
+        #       provide a much smaller number.  These bytes are CHECKSIGS so they would
+        #       cause b75 to fail for excessive sigops, if those bytes were counted.
+        #
+        #       b74 fails because we put MAX_BLOCK_SIGOPS+1 before the element
+        #       b75 succeeds because we put MAX_BLOCK_SIGOPS before the element
+        #
+        #
+        tip(72)
+        b74 = block(74)
+        size = MAX_BLOCK_SIGOPS - 1 + MAX_SCRIPT_ELEMENT_SIZE + 42 # total = 20,561
+        a = bytearray([OP_CHECKSIG] * size)
+        a[MAX_BLOCK_SIGOPS] = 0x4e
+        a[MAX_BLOCK_SIGOPS+1] = 0xfe
+        a[MAX_BLOCK_SIGOPS+2] = 0xff
+        a[MAX_BLOCK_SIGOPS+3] = 0xff
+        a[MAX_BLOCK_SIGOPS+4] = 0xff
+        tx = create_and_sign_tx(out[22].tx, 0, 1, CScript(a))
+        b74 = update_block(74, [tx])
+        yield rejected(RejectResult(16, b'bad-blk-sigops'))
+
+        tip(72)
+        b75 = block(75)
+        size = MAX_BLOCK_SIGOPS - 1 + MAX_SCRIPT_ELEMENT_SIZE + 42
+        a = bytearray([OP_CHECKSIG] * size)
+        a[MAX_BLOCK_SIGOPS-1] = 0x4e
+        a[MAX_BLOCK_SIGOPS] = 0xff
+        a[MAX_BLOCK_SIGOPS+1] = 0xff
+        a[MAX_BLOCK_SIGOPS+2] = 0xff
+        a[MAX_BLOCK_SIGOPS+3] = 0xff
+        tx = create_and_sign_tx(out[22].tx, 0, 1, CScript(a))
+        b75 = update_block(75, [tx])
+        yield accepted()
+        save_spendable_output()
+
+        # Check that if we push an element filled with CHECKSIGs, they are not counted
+        tip(75)
+        b76 = block(76)
+        size = MAX_BLOCK_SIGOPS - 1 + MAX_SCRIPT_ELEMENT_SIZE + 1 + 5
+        a = bytearray([OP_CHECKSIG] * size)
+        a[MAX_BLOCK_SIGOPS-1] = 0x4e # PUSHDATA4, but leave the following bytes as just checksigs
+        tx = create_and_sign_tx(out[23].tx, 0, 1, CScript(a))
+        b76 = update_block(76, [tx])
+        yield accepted()
+        save_spendable_output()
+
+        # Test transaction resurrection
+        #
+        # -> b77 (24) -> b78 (25) -> b79 (26)
+        #            \-> b80 (25) -> b81 (26) -> b82 (27)
+        #
+        #    b78 creates a tx, which is spent in b79. After b82, both should be in mempool
+        #
+        #    The tx'es must be unsigned and pass the node's mempool policy.  It is unsigned for the
+        #    rather obscure reason that the Python signature code does not distinguish between
+        #    Low-S and High-S values (whereas the bitcoin code has custom code which does so);
+        #    as a result of which, the odds are 50% that the python code will use the right
+        #    value and the transaction will be accepted into the mempool. Until we modify the
+        #    test framework to support low-S signing, we are out of luck.
+        #
+        #    To get around this issue, we construct transactions which are not signed and which
+        #    spend to OP_TRUE.  If the standard-ness rules change, this test would need to be
+        #    updated.  (Perhaps to spend to a P2SH OP_TRUE script)
+        #
+        tip(76)
+        block(77)
+        tx77 = create_and_sign_tx(out[24].tx, out[24].n, 10*COIN)
+        update_block(77, [tx77])
+        yield accepted()
+        save_spendable_output()
+
+        block(78)
+        tx78 = create_tx(tx77, 0, 9*COIN)
+        update_block(78, [tx78])
+        yield accepted()
+
+        block(79)
+        tx79 = create_tx(tx78, 0, 8*COIN)
+        update_block(79, [tx79])
+        yield accepted()
+
+        # mempool should be empty
+        assert_equal(len(self.nodes[0].getrawmempool()), 0)
+
+        tip(77)
+        block(80, spend=out[25])
+        yield rejected()
+        save_spendable_output()
+
+        block(81, spend=out[26])
+        yield rejected() # other chain is same length
+        save_spendable_output()
+
+        block(82, spend=out[27])
+        yield accepted()  # now this chain is longer, triggers re-org
+        save_spendable_output()
+
+        # now check that tx78 and tx79 have been put back into the peer's mempool
+        mempool = self.nodes[0].getrawmempool()
+        assert_equal(len(mempool), 2)
+        assert(tx78.hash in mempool)
+        assert(tx79.hash in mempool)
+
+
+        # Test invalid opcodes in dead execution paths.
+        #
+        #  -> b81 (26) -> b82 (27) -> b83 (28)
+        #
+        b83 = block(83)
+        op_codes = [OP_IF, OP_INVALIDOPCODE, OP_ELSE, OP_TRUE, OP_ENDIF]
+        script = CScript(op_codes)
+        tx1 = create_and_sign_tx(out[28].tx, out[28].n, out[28].tx.vout[0].nValue, script)
+
+        tx2 = create_and_sign_tx(tx1, 0, 0, CScript([OP_TRUE]))
+        tx2.vin[0].scriptSig = CScript([OP_FALSE])
+        tx2.rehash()
+
+        update_block(83, [tx1, tx2])
+        yield accepted()
+        save_spendable_output()
+
+
+        # Reorg on/off blocks that have OP_RETURN in them (and try to spend them)
+        #
+        #  -> b81 (26) -> b82 (27) -> b83 (28) -> b84 (29) -> b87 (30) -> b88 (31)
+        #                                    \-> b85 (29) -> b86 (30)            \-> b89a (32)
+        #
+        #
+        b84 = block(84)
+        tx1 = create_tx(out[29].tx, out[29].n, 0, CScript([OP_RETURN]))
+        tx1.vout.append(CTxOut(0, CScript([OP_TRUE])))
+        tx1.vout.append(CTxOut(0, CScript([OP_TRUE])))
+        tx1.vout.append(CTxOut(0, CScript([OP_TRUE])))
+        tx1.vout.append(CTxOut(0, CScript([OP_TRUE])))
+        tx1.calc_sha256()
+        self.sign_tx(tx1, out[29].tx, out[29].n)
+        tx1.rehash()
+        tx2 = create_tx(tx1, 1, 0, CScript([OP_RETURN]))
+        tx2.vout.append(CTxOut(0, CScript([OP_RETURN])))
+        tx3 = create_tx(tx1, 2, 0, CScript([OP_RETURN]))
+        tx3.vout.append(CTxOut(0, CScript([OP_TRUE])))
+        tx4 = create_tx(tx1, 3, 0, CScript([OP_TRUE]))
+        tx4.vout.append(CTxOut(0, CScript([OP_RETURN])))
+        tx5 = create_tx(tx1, 4, 0, CScript([OP_RETURN]))
+
+        update_block(84, [tx1,tx2,tx3,tx4,tx5])
+        yield accepted()
+        save_spendable_output()
+
+        tip(83)
+        block(85, spend=out[29])
+        yield rejected()
+
+        block(86, spend=out[30])
+        yield accepted()
+
+        tip(84)
+        block(87, spend=out[30])
+        yield rejected()
+        save_spendable_output()
+
+        block(88, spend=out[31])
+        yield accepted()
+        save_spendable_output()
+
+        # trying to spend the OP_RETURN output is rejected
+        block("89a", spend=out[32])
+        tx = create_tx(tx1, 0, 0, CScript([OP_TRUE]))
+        update_block("89a", [tx])
+        yield rejected()
+
+
+        #  Test re-org of a week's worth of blocks (1088 blocks)
+        #  This test takes a minute or two and can be accomplished in memory
+        #
+        tip(88)
+        LARGE_REORG_SIZE = 1088
+        test1 = TestInstance(sync_every_block=False)
+        spend=out[32]
+        for i in range(89, LARGE_REORG_SIZE + 89):
+            b = block(i, spend)
+            tx = CTransaction()
+            script_length = MAX_BLOCK_SIZE - len(b.serialize()) - 69
+            script_output = CScript([b'\x00' * script_length])
+            tx.vout.append(CTxOut(0, script_output))
+            tx.vin.append(CTxIn(COutPoint(b.vtx[1].sha256, 0)))
+            b = update_block(i, [tx])
+            assert_equal(len(b.serialize()), MAX_BLOCK_SIZE)
+            test1.blocks_and_transactions.append([self.tip, True])
+            save_spendable_output()
+            spend = get_spendable_output()
+
+        yield test1
+        chain1_tip = i
+
+        # now create alt chain of same length
+        tip(88)
+        test2 = TestInstance(sync_every_block=False)
+        for i in range(89, LARGE_REORG_SIZE + 89):
+            block("alt"+str(i))
+            test2.blocks_and_transactions.append([self.tip, False])
+        yield test2
+
+        # extend alt chain to trigger re-org
+        block("alt" + str(chain1_tip + 1))
+        yield accepted()
+
+        # ... and re-org back to the first chain
+        tip(chain1_tip)
+        block(chain1_tip + 1)
+        yield rejected()
+        block(chain1_tip + 2)
+        yield accepted()
+
+        chain1_tip += 2
 
 
 if __name__ == '__main__':
diff --git a/qa/rpc-tests/test_framework/blocktools.py b/qa/rpc-tests/test_framework/blocktools.py
index 44232153ac702..26cc3963151ed 100644
--- a/qa/rpc-tests/test_framework/blocktools.py
+++ b/qa/rpc-tests/test_framework/blocktools.py
@@ -56,12 +56,27 @@ def create_coinbase(height, pubkey = None):
     coinbase.calc_sha256()
     return coinbase
 
-# Create a transaction with an anyone-can-spend output, that spends the
-# nth output of prevtx.
-def create_transaction(prevtx, n, sig, value):
+# Create a transaction.
+# If the scriptPubKey is not specified, make it anyone-can-spend.
+def create_transaction(prevtx, n, sig, value, scriptPubKey=CScript()):
     tx = CTransaction()
     assert(n < len(prevtx.vout))
     tx.vin.append(CTxIn(COutPoint(prevtx.sha256, n), sig, 0xffffffff))
-    tx.vout.append(CTxOut(value, b""))
+    tx.vout.append(CTxOut(value, scriptPubKey))
     tx.calc_sha256()
     return tx
+
+def get_legacy_sigopcount_block(block, fAccurate=True):
+    count = 0
+    for tx in block.vtx:
+        count += get_legacy_sigopcount_tx(tx, fAccurate)
+    return count
+
+def get_legacy_sigopcount_tx(tx, fAccurate=True):
+    count = 0
+    for i in tx.vout:
+        count += i.scriptPubKey.GetSigOpCount(fAccurate)
+    for j in tx.vin:
+        # scriptSig might be of type bytes, so convert to CScript for the moment
+        count += CScript(j.scriptSig).GetSigOpCount(fAccurate)
+    return count
diff --git a/qa/rpc-tests/test_framework/mininode.py b/qa/rpc-tests/test_framework/mininode.py
index e85399c960bb7..c0b59f38579d7 100755
--- a/qa/rpc-tests/test_framework/mininode.py
+++ b/qa/rpc-tests/test_framework/mininode.py
@@ -556,7 +556,6 @@ def solve(self):
             self.nNonce += 1
             self.rehash()
 
-
     def __repr__(self):
         return "CBlock(nVersion=%i hashPrevBlock=%064x hashMerkleRoot=%064x nTime=%s nBits=%08x nNonce=%08x vtx=%s)" \
             % (self.nVersion, self.hashPrevBlock, self.hashMerkleRoot,

From 12c5a16c4e635799cfb6cadbca79dfa83555da72 Mon Sep 17 00:00:00 2001
From: mrbandrews <bandrewsny@gmail.com>
Date: Thu, 2 Jun 2016 14:43:18 -0400
Subject: [PATCH 0403/1802] Catch exceptions from non-canonical encoding and
 print only to log

---
 src/main.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/main.cpp b/src/main.cpp
index ed157b53dced7..885b1b56fb533 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -5567,6 +5567,11 @@ bool ProcessMessages(CNode* pfrom)
                 // Allow exceptions from over-long size
                 LogPrintf("%s(%s, %u bytes): Exception '%s' caught\n", __func__, SanitizeString(strCommand), nMessageSize, e.what());
             }
+            else if (strstr(e.what(), "non-canonical ReadCompactSize()"))
+            {
+                // Allow exceptions from non-canonical encoding
+                LogPrintf("%s(%s, %u bytes): Exception '%s' caught\n", __func__, SanitizeString(strCommand), nMessageSize, e.what());
+            }
             else
             {
                 PrintExceptionContinue(&e, "ProcessMessages()");

From 9805f4af7ecb6becf8a146bd845fb131ffa625c9 Mon Sep 17 00:00:00 2001
From: Kaz Wesley <keziahw@gmail.com>
Date: Sat, 30 Apr 2016 21:45:26 -0700
Subject: [PATCH 0404/1802] mapNextTx: use pointer as key, simplify value

Saves about 10% of application memory usage once the mempool warms up. Since the
mempool is DynamicUsage-regulated, this will translate to a larger mempool in
the same amount of space.

Map value type: eliminate the vin index; no users of the map need to know which
input of the transaction is spending the prevout.

Map key type: replace the COutPoint with a pointer to a COutPoint. A COutPoint
is 36 bytes, but each COutPoint is accessible from the same map entry's value.
A trivial DereferencingComparator functor allows indirect map keys, but the
resulting syntax is misleading: `map.find(&outpoint)`. Implement an indirectmap
that acts as a wrapper to a map that uses a DereferencingComparator, supporting
a syntax that accurately reflect the container's semantics: inserts and
iterators use pointers since they store pointers and need them to remain
constant and dereferenceable, but lookup functions take const references.
---
 src/Makefile.am   |  1 +
 src/indirectmap.h | 52 +++++++++++++++++++++++++++++++++++++++++++++++
 src/main.cpp      |  5 +++--
 src/memusage.h    | 16 +++++++++++++++
 src/txmempool.cpp | 46 ++++++++++++++++++++---------------------
 src/txmempool.h   | 17 ++--------------
 6 files changed, 96 insertions(+), 41 deletions(-)
 create mode 100644 src/indirectmap.h

diff --git a/src/Makefile.am b/src/Makefile.am
index 3c056386fac7b..ad61e4f108db4 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -94,6 +94,7 @@ BITCOIN_CORE_H = \
   core_memusage.h \
   httprpc.h \
   httpserver.h \
+  indirectmap.h \
   init.h \
   key.h \
   keystore.h \
diff --git a/src/indirectmap.h b/src/indirectmap.h
new file mode 100644
index 0000000000000..28e1e8deddbde
--- /dev/null
+++ b/src/indirectmap.h
@@ -0,0 +1,52 @@
+#ifndef BITCOIN_INDIRECTMAP_H
+#define BITCOIN_INDIRECTMAP_H
+
+template <class T>
+struct DereferencingComparator { bool operator()(const T a, const T b) const { return *a < *b; } };
+
+/* Map whose keys are pointers, but are compared by their dereferenced values.
+ *
+ * Differs from a plain std::map<const K*, T, DereferencingComparator<K*> > in
+ * that methods that take a key for comparison take a K rather than taking a K*
+ * (taking a K* would be confusing, since it's the value rather than the address
+ * of the object for comparison that matters due to the dereferencing comparator).
+ *
+ * Objects pointed to by keys must not be modified in any way that changes the
+ * result of DereferencingComparator.
+ */
+template <class K, class T>
+class indirectmap {
+private:
+    typedef std::map<const K*, T, DereferencingComparator<const K*> > base;
+    base m;
+public:
+    typedef typename base::iterator iterator;
+    typedef typename base::const_iterator const_iterator;
+    typedef typename base::size_type size_type;
+    typedef typename base::value_type value_type;
+
+    // passthrough (pointer interface)
+    std::pair<iterator, bool> insert(const value_type& value) { return m.insert(value); }
+
+    // pass address (value interface)
+    iterator find(const K& key)                     { return m.find(&key); }
+    const_iterator find(const K& key) const         { return m.find(&key); }
+    iterator lower_bound(const K& key)              { return m.lower_bound(&key); }
+    const_iterator lower_bound(const K& key) const  { return m.lower_bound(&key); }
+    size_type erase(const K& key)                   { return m.erase(&key); }
+    size_type count(const K& key) const             { return m.count(&key); }
+
+    // passthrough
+    bool empty() const              { return m.empty(); }
+    size_type size() const          { return m.size(); }
+    size_type max_size() const      { return m.max_size(); }
+    void clear()                    { m.clear(); }
+    iterator begin()                { return m.begin(); }
+    iterator end()                  { return m.end(); }
+    const_iterator begin() const    { return m.begin(); }
+    const_iterator end() const      { return m.end(); }
+    const_iterator cbegin() const   { return m.cbegin(); }
+    const_iterator cend() const     { return m.cend(); }
+};
+
+#endif // BITCOIN_INDIRECTMAP_H
diff --git a/src/main.cpp b/src/main.cpp
index 11ccab253e4ed..13da2137e5295 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1049,9 +1049,10 @@ bool AcceptToMemoryPoolWorker(CTxMemPool& pool, CValidationState& state, const C
     LOCK(pool.cs); // protect pool.mapNextTx
     BOOST_FOREACH(const CTxIn &txin, tx.vin)
     {
-        if (pool.mapNextTx.count(txin.prevout))
+        auto itConflicting = pool.mapNextTx.find(txin.prevout);
+        if (itConflicting != pool.mapNextTx.end())
         {
-            const CTransaction *ptxConflicting = pool.mapNextTx[txin.prevout].ptx;
+            const CTransaction *ptxConflicting = itConflicting->second;
             if (!setConflicts.count(ptxConflicting->GetHash()))
             {
                 // Allow opt-out of transaction replacement by setting
diff --git a/src/memusage.h b/src/memusage.h
index 49760e64c78cd..9c98e5c2cf22e 100644
--- a/src/memusage.h
+++ b/src/memusage.h
@@ -5,6 +5,8 @@
 #ifndef BITCOIN_MEMUSAGE_H
 #define BITCOIN_MEMUSAGE_H
 
+#include "indirectmap.h"
+
 #include <stdlib.h>
 
 #include <map>
@@ -106,6 +108,20 @@ static inline size_t IncrementalDynamicUsage(const std::map<X, Y, Z>& m)
     return MallocUsage(sizeof(stl_tree_node<std::pair<const X, Y> >));
 }
 
+// indirectmap has underlying map with pointer as key
+
+template<typename X, typename Y>
+static inline size_t DynamicUsage(const indirectmap<X, Y>& m)
+{
+    return MallocUsage(sizeof(stl_tree_node<std::pair<const X*, Y> >)) * m.size();
+}
+
+template<typename X, typename Y>
+static inline size_t IncrementalDynamicUsage(const indirectmap<X, Y>& m)
+{
+    return MallocUsage(sizeof(stl_tree_node<std::pair<const X*, Y> >));
+}
+
 // Boost data structures
 
 template<typename X>
diff --git a/src/txmempool.cpp b/src/txmempool.cpp
index 52c7793118331..d7fb77661bd47 100644
--- a/src/txmempool.cpp
+++ b/src/txmempool.cpp
@@ -147,11 +147,11 @@ void CTxMemPool::UpdateTransactionsFromBlock(const std::vector<uint256> &vHashes
         if (it == mapTx.end()) {
             continue;
         }
-        std::map<COutPoint, CInPoint>::iterator iter = mapNextTx.lower_bound(COutPoint(hash, 0));
+        auto iter = mapNextTx.lower_bound(COutPoint(hash, 0));
         // First calculate the children, and update setMemPoolChildren to
         // include them, and update their setMemPoolParents to include this tx.
-        for (; iter != mapNextTx.end() && iter->first.hash == hash; ++iter) {
-            const uint256 &childHash = iter->second.ptx->GetHash();
+        for (; iter != mapNextTx.end() && iter->first->hash == hash; ++iter) {
+            const uint256 &childHash = iter->second->GetHash();
             txiter childIter = mapTx.find(childHash);
             assert(childIter != mapTx.end());
             // We can skip updating entries we've encountered before or that
@@ -365,11 +365,11 @@ void CTxMemPool::pruneSpent(const uint256 &hashTx, CCoins &coins)
 {
     LOCK(cs);
 
-    std::map<COutPoint, CInPoint>::iterator it = mapNextTx.lower_bound(COutPoint(hashTx, 0));
+    auto it = mapNextTx.lower_bound(COutPoint(hashTx, 0));
 
     // iterate over all COutPoints in mapNextTx whose hash equals the provided hashTx
-    while (it != mapNextTx.end() && it->first.hash == hashTx) {
-        coins.Spend(it->first.n); // and remove those outputs from coins
+    while (it != mapNextTx.end() && it->first->hash == hashTx) {
+        coins.Spend(it->first->n); // and remove those outputs from coins
         it++;
     }
 }
@@ -414,7 +414,7 @@ bool CTxMemPool::addUnchecked(const uint256& hash, const CTxMemPoolEntry &entry,
     const CTransaction& tx = newit->GetTx();
     std::set<uint256> setParentTransactions;
     for (unsigned int i = 0; i < tx.vin.size(); i++) {
-        mapNextTx[tx.vin[i].prevout] = CInPoint(&tx, i);
+        mapNextTx.insert(std::make_pair(&tx.vin[i].prevout, &tx));
         setParentTransactions.insert(tx.vin[i].prevout.hash);
     }
     // Don't bother worrying about child transactions of this one.
@@ -500,10 +500,10 @@ void CTxMemPool::removeRecursive(const CTransaction &origTx, std::list<CTransact
             // happen during chain re-orgs if origTx isn't re-accepted into
             // the mempool for any reason.
             for (unsigned int i = 0; i < origTx.vout.size(); i++) {
-                std::map<COutPoint, CInPoint>::iterator it = mapNextTx.find(COutPoint(origTx.GetHash(), i));
+                auto it = mapNextTx.find(COutPoint(origTx.GetHash(), i));
                 if (it == mapNextTx.end())
                     continue;
-                txiter nextit = mapTx.find(it->second.ptx->GetHash());
+                txiter nextit = mapTx.find(it->second->GetHash());
                 assert(nextit != mapTx.end());
                 txToRemove.insert(nextit);
             }
@@ -561,9 +561,9 @@ void CTxMemPool::removeConflicts(const CTransaction &tx, std::list<CTransaction>
     list<CTransaction> result;
     LOCK(cs);
     BOOST_FOREACH(const CTxIn &txin, tx.vin) {
-        std::map<COutPoint, CInPoint>::iterator it = mapNextTx.find(txin.prevout);
+        auto it = mapNextTx.find(txin.prevout);
         if (it != mapNextTx.end()) {
-            const CTransaction &txConflict = *it->second.ptx;
+            const CTransaction &txConflict = *it->second;
             if (txConflict != tx)
             {
                 removeRecursive(txConflict, removed);
@@ -671,10 +671,10 @@ void CTxMemPool::check(const CCoinsViewCache *pcoins) const
                 assert(coins && coins->IsAvailable(txin.prevout.n));
             }
             // Check whether its inputs are marked in mapNextTx.
-            std::map<COutPoint, CInPoint>::const_iterator it3 = mapNextTx.find(txin.prevout);
+            auto it3 = mapNextTx.find(txin.prevout);
             assert(it3 != mapNextTx.end());
-            assert(it3->second.ptx == &tx);
-            assert(it3->second.n == i);
+            assert(it3->first == &txin.prevout);
+            assert(it3->second == &tx);
             i++;
         }
         assert(setParentCheck == GetMemPoolParents(it));
@@ -701,10 +701,10 @@ void CTxMemPool::check(const CCoinsViewCache *pcoins) const
 
         // Check children against mapNextTx
         CTxMemPool::setEntries setChildrenCheck;
-        std::map<COutPoint, CInPoint>::const_iterator iter = mapNextTx.lower_bound(COutPoint(it->GetTx().GetHash(), 0));
+        auto iter = mapNextTx.lower_bound(COutPoint(it->GetTx().GetHash(), 0));
         int64_t childSizes = 0;
-        for (; iter != mapNextTx.end() && iter->first.hash == it->GetTx().GetHash(); ++iter) {
-            txiter childit = mapTx.find(iter->second.ptx->GetHash());
+        for (; iter != mapNextTx.end() && iter->first->hash == it->GetTx().GetHash(); ++iter) {
+            txiter childit = mapTx.find(iter->second->GetHash());
             assert(childit != mapTx.end()); // mapNextTx points to in-mempool transactions
             if (setChildrenCheck.insert(childit).second) {
                 childSizes += childit->GetTxSize();
@@ -738,14 +738,12 @@ void CTxMemPool::check(const CCoinsViewCache *pcoins) const
             stepsSinceLastRemove = 0;
         }
     }
-    for (std::map<COutPoint, CInPoint>::const_iterator it = mapNextTx.begin(); it != mapNextTx.end(); it++) {
-        uint256 hash = it->second.ptx->GetHash();
+    for (auto it = mapNextTx.cbegin(); it != mapNextTx.cend(); it++) {
+        uint256 hash = it->second->GetHash();
         indexed_transaction_set::const_iterator it2 = mapTx.find(hash);
         const CTransaction& tx = it2->GetTx();
         assert(it2 != mapTx.end());
-        assert(&tx == it->second.ptx);
-        assert(tx.vin.size() > it->second.n);
-        assert(it->first == it->second.ptx->vin[it->second.n].prevout);
+        assert(&tx == it->second);
     }
 
     assert(totalTxSize == checkTotal);
@@ -1044,8 +1042,8 @@ void CTxMemPool::TrimToSize(size_t sizelimit, std::vector<uint256>* pvNoSpendsRe
                 BOOST_FOREACH(const CTxIn& txin, tx.vin) {
                     if (exists(txin.prevout.hash))
                         continue;
-                    std::map<COutPoint, CInPoint>::iterator it = mapNextTx.lower_bound(COutPoint(txin.prevout.hash, 0));
-                    if (it == mapNextTx.end() || it->first.hash != txin.prevout.hash)
+                    auto it = mapNextTx.lower_bound(COutPoint(txin.prevout.hash, 0));
+                    if (it == mapNextTx.end() || it->first->hash != txin.prevout.hash)
                         pvNoSpendsRemaining->push_back(txin.prevout.hash);
                 }
             }
diff --git a/src/txmempool.h b/src/txmempool.h
index de4ba0b371a42..7ad5579a066a9 100644
--- a/src/txmempool.h
+++ b/src/txmempool.h
@@ -11,6 +11,7 @@
 
 #include "amount.h"
 #include "coins.h"
+#include "indirectmap.h"
 #include "primitives/transaction.h"
 #include "sync.h"
 
@@ -305,20 +306,6 @@ struct ancestor_score {};
 
 class CBlockPolicyEstimator;
 
-/** An inpoint - a combination of a transaction and an index n into its vin */
-class CInPoint
-{
-public:
-    const CTransaction* ptx;
-    uint32_t n;
-
-    CInPoint() { SetNull(); }
-    CInPoint(const CTransaction* ptxIn, uint32_t nIn) { ptx = ptxIn; n = nIn; }
-    void SetNull() { ptx = NULL; n = (uint32_t) -1; }
-    bool IsNull() const { return (ptx == NULL && n == (uint32_t) -1); }
-    size_t DynamicMemoryUsage() const { return 0; }
-};
-
 /**
  * CTxMemPool stores valid-according-to-the-current-best-chain
  * transactions that may be included in the next block.
@@ -477,7 +464,7 @@ class CTxMemPool
     void UpdateChild(txiter entry, txiter child, bool add);
 
 public:
-    std::map<COutPoint, CInPoint> mapNextTx;
+    indirectmap<COutPoint, const CTransaction*> mapNextTx;
     std::map<uint256, std::pair<double, CAmount> > mapDeltas;
 
     /** Create a new CTxMemPool.

From e39dc698adf46dc3306526971ca6f0f6401f30ca Mon Sep 17 00:00:00 2001
From: instagibbs <gsanders87@gmail.com>
Date: Fri, 3 Jun 2016 10:05:51 -0400
Subject: [PATCH 0405/1802] comment nit: miners don't vote

---
 src/main.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index c98f42d7c93c2..527d4f570ef7f 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1886,8 +1886,8 @@ bool CheckInputs(const CTransaction& tx, CValidationState &state, const CCoinsVi
                     // such nodes as they are not following the protocol. That
                     // said during an upgrade careful thought should be taken
                     // as to the correct behavior - we may want to continue
-                    // peering with non-upgraded nodes even after a soft-fork
-                    // super-majority vote has passed.
+                    // peering with non-upgraded nodes even after soft-fork
+                    // super-majority signaling has occurred.
                     return state.DoS(100,false, REJECT_INVALID, strprintf("mandatory-script-verify-flag-failed (%s)", ScriptErrorString(check.GetScriptError())));
                 }
             }

From 340012d9c978901d23ccedad5805c6630c49e756 Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Fri, 3 Jun 2016 14:00:38 -0400
Subject: [PATCH 0406/1802] build: add temporary fix for "bad magic number"
 error in out-of-tree builds

This was caused by an pyc files hanging around from previous
python2 invocations, when the matching .py missing from that path.

This should not be a problem with python3's tagged caches.
---
 Makefile.am               | 3 +++
 src/Makefile.test.include | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/Makefile.am b/Makefile.am
index b93748e324e24..b10d0850664c8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -224,6 +224,9 @@ EXTRA_DIST = $(top_srcdir)/share/genbuild.sh qa/pull-tester/rpc-tests.py qa/rpc-
 
 CLEANFILES = $(OSX_DMG) $(BITCOIN_WIN_INSTALLER)
 
+# This file is problematic for out-of-tree builds if it exists.
+DISTCLEANFILES = qa/pull-tester/tests_config.pyc
+
 .INTERMEDIATE: $(COVERAGE_INFO)
 
 clean-local:
diff --git a/src/Makefile.test.include b/src/Makefile.test.include
index 77cf1001e1d9d..ff3351fe725c9 100644
--- a/src/Makefile.test.include
+++ b/src/Makefile.test.include
@@ -123,6 +123,9 @@ CLEAN_BITCOIN_TEST = test/*.gcda test/*.gcno $(GENERATED_TEST_FILES)
 
 CLEANFILES += $(CLEAN_BITCOIN_TEST)
 
+# This file is problematic for out-of-tree builds if it exists.
+DISTCLEANFILES += test/buildenv.pyc
+
 bitcoin_test: $(TEST_BINARY)
 
 bitcoin_test_check: $(TEST_BINARY) FORCE

From 1b9e6d3c1a0f0e7eeff5ddb2e0386911fe9ab2b6 Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Mon, 30 May 2016 16:50:14 +0200
Subject: [PATCH 0407/1802] Add support for unique_ptr and shared_ptr to
 memusage

---
 src/memusage.h | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/src/memusage.h b/src/memusage.h
index 9c98e5c2cf22e..3810bfad07a91 100644
--- a/src/memusage.h
+++ b/src/memusage.h
@@ -72,6 +72,15 @@ struct stl_tree_node
     X x;
 };
 
+struct stl_shared_counter
+{
+    /* Various platforms use different sized counters here.
+     * Conservatively assume that they won't be larger than size_t. */
+    void* class_type;
+    size_t use_count;
+    size_t weak_count;
+};
+
 template<typename X>
 static inline size_t DynamicUsage(const std::vector<X>& v)
 {
@@ -122,6 +131,21 @@ static inline size_t IncrementalDynamicUsage(const indirectmap<X, Y>& m)
     return MallocUsage(sizeof(stl_tree_node<std::pair<const X*, Y> >));
 }
 
+template<typename X>
+static inline size_t DynamicUsage(const std::unique_ptr<X>& p)
+{
+    return p ? MallocUsage(sizeof(X)) : 0;
+}
+
+template<typename X>
+static inline size_t DynamicUsage(const std::shared_ptr<X>& p)
+{
+    // A shared_ptr can either use a single continuous memory block for both
+    // the counter and the storage (when using std::make_shared), or separate.
+    // We can't observe the difference, however, so assume the worst.
+    return p ? MallocUsage(sizeof(X)) + MallocUsage(sizeof(stl_shared_counter)) : 0;
+}
+
 // Boost data structures
 
 template<typename X>

From 8d39d7a2cf1559e0ba40681b0ab90f13ea6c0618 Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Mon, 30 May 2016 17:06:24 +0200
Subject: [PATCH 0408/1802] Switch CTransaction storage in mempool to
 std::shared_ptr

---
 src/main.cpp      | 32 ++++++++----------
 src/txmempool.cpp | 84 +++++++++++++++++++++++++++++++++--------------
 src/txmempool.h   | 28 +++++++++++++---
 3 files changed, 97 insertions(+), 47 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index 527d4f570ef7f..d71f35bf7e4fc 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -4519,10 +4519,11 @@ void static ProcessGetData(CNode* pfrom, const Consensus::Params& consensusParam
                     }
                 }
                 if (!push && inv.type == MSG_TX) {
-                    int64_t txtime;
+                    auto txinfo = mempool.info(inv.hash);
                     // To protect privacy, do not answer getdata using the mempool when
                     // that TX couldn't have been INVed in reply to a MEMPOOL request.
-                    if (mempool.lookup(inv.hash, tx, txtime) && txtime <= pfrom->timeLastMempoolReq) {
+                    if (txinfo.tx && txinfo.nTime <= pfrom->timeLastMempoolReq) {
+                        tx = *txinfo.tx;
                         push = true;
                     }
                 }
@@ -5900,8 +5901,7 @@ bool SendMessages(CNode* pto)
 
             // Respond to BIP35 mempool requests
             if (fSendTrickle && pto->fSendMempool) {
-                std::vector<uint256> vtxid;
-                mempool.queryHashes(vtxid);
+                auto vtxinfo = mempool.infoAll();
                 pto->fSendMempool = false;
                 CAmount filterrate = 0;
                 {
@@ -5911,20 +5911,16 @@ bool SendMessages(CNode* pto)
 
                 LOCK(pto->cs_filter);
 
-                BOOST_FOREACH(const uint256& hash, vtxid) {
+                for (const auto& txinfo : vtxinfo) {
+                    const uint256& hash = txinfo.tx->GetHash();
                     CInv inv(MSG_TX, hash);
                     pto->setInventoryTxToSend.erase(hash);
                     if (filterrate) {
-                        CFeeRate feeRate;
-                        mempool.lookupFeeRate(hash, feeRate);
-                        if (feeRate.GetFeePerK() < filterrate)
+                        if (txinfo.feeRate.GetFeePerK() < filterrate)
                             continue;
                     }
                     if (pto->pfilter) {
-                        CTransaction tx;
-                        bool fInMemPool = mempool.lookup(hash, tx);
-                        if (!fInMemPool) continue; // another thread removed since queryHashes, maybe...
-                        if (!pto->pfilter->IsRelevantAndUpdate(tx)) continue;
+                        if (!pto->pfilter->IsRelevantAndUpdate(*txinfo.tx)) continue;
                     }
                     pto->filterInventoryKnown.insert(hash);
                     vInv.push_back(inv);
@@ -5970,16 +5966,14 @@ bool SendMessages(CNode* pto)
                         continue;
                     }
                     // Not in the mempool anymore? don't bother sending it.
-                    CFeeRate feeRate;
-                    if (!mempool.lookupFeeRate(hash, feeRate)) {
+                    auto txinfo = mempool.info(hash);
+                    if (!txinfo.tx) {
                         continue;
                     }
-                    if (filterrate && feeRate.GetFeePerK() < filterrate) {
+                    if (filterrate && txinfo.feeRate.GetFeePerK() < filterrate) {
                         continue;
                     }
-                    CTransaction tx;
-                    if (!mempool.lookup(hash, tx)) continue;
-                    if (pto->pfilter && !pto->pfilter->IsRelevantAndUpdate(tx)) continue;
+                    if (pto->pfilter && !pto->pfilter->IsRelevantAndUpdate(*txinfo.tx)) continue;
                     // Send
                     vInv.push_back(CInv(MSG_TX, hash));
                     nRelayedTransactions++;
@@ -5992,7 +5986,7 @@ bool SendMessages(CNode* pto)
                             vRelayExpiration.pop_front();
                         }
 
-                        auto ret = mapRelay.insert(std::make_pair(hash, tx));
+                        auto ret = mapRelay.insert(std::make_pair(hash, *txinfo.tx));
                         if (ret.second) {
                             vRelayExpiration.push_back(std::make_pair(GetTime() + 15 * 60, hash));
                         }
diff --git a/src/txmempool.cpp b/src/txmempool.cpp
index f44e450363f09..d39c9577f2484 100644
--- a/src/txmempool.cpp
+++ b/src/txmempool.cpp
@@ -23,18 +23,18 @@ CTxMemPoolEntry::CTxMemPoolEntry(const CTransaction& _tx, const CAmount& _nFee,
                                  int64_t _nTime, double _entryPriority, unsigned int _entryHeight,
                                  bool poolHasNoInputsOf, CAmount _inChainInputValue,
                                  bool _spendsCoinbase, unsigned int _sigOps, LockPoints lp):
-    tx(_tx), nFee(_nFee), nTime(_nTime), entryPriority(_entryPriority), entryHeight(_entryHeight),
+    tx(std::make_shared<CTransaction>(_tx)), nFee(_nFee), nTime(_nTime), entryPriority(_entryPriority), entryHeight(_entryHeight),
     hadNoDependencies(poolHasNoInputsOf), inChainInputValue(_inChainInputValue),
     spendsCoinbase(_spendsCoinbase), sigOpCount(_sigOps), lockPoints(lp)
 {
-    nTxSize = ::GetSerializeSize(tx, SER_NETWORK, PROTOCOL_VERSION);
-    nModSize = tx.CalculateModifiedSize(nTxSize);
-    nUsageSize = RecursiveDynamicUsage(tx);
+    nTxSize = ::GetSerializeSize(_tx, SER_NETWORK, PROTOCOL_VERSION);
+    nModSize = _tx.CalculateModifiedSize(nTxSize);
+    nUsageSize = RecursiveDynamicUsage(*tx) + memusage::DynamicUsage(tx);
 
     nCountWithDescendants = 1;
     nSizeWithDescendants = nTxSize;
     nModFeesWithDescendants = nFee;
-    CAmount nValueIn = tx.GetValueOut()+nFee;
+    CAmount nValueIn = _tx.GetValueOut()+nFee;
     assert(inChainInputValue <= nValueIn);
 
     feeDelta = 0;
@@ -768,50 +768,86 @@ bool CTxMemPool::CompareDepthAndScore(const uint256& hasha, const uint256& hashb
 namespace {
 class DepthAndScoreComparator
 {
-    CTxMemPool *mp;
 public:
-    DepthAndScoreComparator(CTxMemPool *mempool) : mp(mempool) {}
-    bool operator()(const uint256& a, const uint256& b) { return mp->CompareDepthAndScore(a, b); }
+    bool operator()(const CTxMemPool::indexed_transaction_set::const_iterator& a, const CTxMemPool::indexed_transaction_set::const_iterator& b)
+    {
+        uint64_t counta = a->GetCountWithAncestors();
+        uint64_t countb = b->GetCountWithAncestors();
+        if (counta == countb) {
+            return CompareTxMemPoolEntryByScore()(*a, *b);
+        }
+        return counta < countb;
+    }
 };
 }
 
-void CTxMemPool::queryHashes(vector<uint256>& vtxid)
+std::vector<CTxMemPool::indexed_transaction_set::const_iterator> CTxMemPool::GetSortedDepthAndScore() const
 {
-    vtxid.clear();
+    std::vector<indexed_transaction_set::const_iterator> iters;
+    AssertLockHeld(cs);
+
+    iters.reserve(mapTx.size());
 
+    for (indexed_transaction_set::iterator mi = mapTx.begin(); mi != mapTx.end(); ++mi) {
+        iters.push_back(mi);
+    }
+    std::sort(iters.begin(), iters.end(), DepthAndScoreComparator());
+    return iters;
+}
+
+void CTxMemPool::queryHashes(vector<uint256>& vtxid)
+{
     LOCK(cs);
+    auto iters = GetSortedDepthAndScore();
+
+    vtxid.clear();
     vtxid.reserve(mapTx.size());
-    for (indexed_transaction_set::iterator mi = mapTx.begin(); mi != mapTx.end(); ++mi)
-        vtxid.push_back(mi->GetTx().GetHash());
 
-    std::sort(vtxid.begin(), vtxid.end(), DepthAndScoreComparator(this));
+    for (auto it : iters) {
+        vtxid.push_back(it->GetTx().GetHash());
+    }
 }
 
+std::vector<TxMempoolInfo> CTxMemPool::infoAll() const
+{
+    LOCK(cs);
+    auto iters = GetSortedDepthAndScore();
+
+    std::vector<TxMempoolInfo> ret;
+    ret.reserve(mapTx.size());
+    for (auto it : iters) {
+        ret.push_back(TxMempoolInfo{it->GetSharedTx(), it->GetTime(), CFeeRate(it->GetFee(), it->GetTxSize())});
+    }
+
+    return ret;
+}
 
-bool CTxMemPool::lookup(uint256 hash, CTransaction& result, int64_t& time) const
+std::shared_ptr<const CTransaction> CTxMemPool::get(const uint256& hash) const
 {
     LOCK(cs);
     indexed_transaction_set::const_iterator i = mapTx.find(hash);
-    if (i == mapTx.end()) return false;
-    result = i->GetTx();
-    time = i->GetTime();
-    return true;
+    if (i == mapTx.end())
+        return nullptr;
+    return i->GetSharedTx();
 }
 
 bool CTxMemPool::lookup(uint256 hash, CTransaction& result) const
 {
-    int64_t time;
-    return CTxMemPool::lookup(hash, result, time);
+    auto tx = get(hash);
+    if (tx) {
+        result = *tx;
+        return true;
+    }
+    return false;
 }
 
-bool CTxMemPool::lookupFeeRate(const uint256& hash, CFeeRate& feeRate) const
+TxMempoolInfo CTxMemPool::info(const uint256& hash) const
 {
     LOCK(cs);
     indexed_transaction_set::const_iterator i = mapTx.find(hash);
     if (i == mapTx.end())
-        return false;
-    feeRate = CFeeRate(i->GetFee(), i->GetTxSize());
-    return true;
+        return TxMempoolInfo();
+    return TxMempoolInfo{i->GetSharedTx(), i->GetTime(), CFeeRate(i->GetFee(), i->GetTxSize())};
 }
 
 CFeeRate CTxMemPool::estimateFee(int nBlocks) const
diff --git a/src/txmempool.h b/src/txmempool.h
index 3cf84159cc36b..2f407fe008efe 100644
--- a/src/txmempool.h
+++ b/src/txmempool.h
@@ -7,6 +7,7 @@
 #define BITCOIN_TXMEMPOOL_H
 
 #include <list>
+#include <memory>
 #include <set>
 
 #include "amount.h"
@@ -75,7 +76,7 @@ class CTxMemPool;
 class CTxMemPoolEntry
 {
 private:
-    CTransaction tx;
+    std::shared_ptr<const CTransaction> tx;
     CAmount nFee;              //!< Cached to avoid expensive parent-transaction lookups
     size_t nTxSize;            //!< ... and avoid recomputing tx size
     size_t nModSize;           //!< ... and modified size for priority
@@ -112,7 +113,8 @@ class CTxMemPoolEntry
                     unsigned int nSigOps, LockPoints lp);
     CTxMemPoolEntry(const CTxMemPoolEntry& other);
 
-    const CTransaction& GetTx() const { return this->tx; }
+    const CTransaction& GetTx() const { return *this->tx; }
+    std::shared_ptr<const CTransaction> GetSharedTx() const { return this->tx; }
     /**
      * Fast calculation of lower bound of current priority as update
      * from entry priority. Only inputs that were originally in-chain will age.
@@ -307,6 +309,21 @@ struct ancestor_score {};
 
 class CBlockPolicyEstimator;
 
+/**
+ * Information about a mempool transaction.
+ */
+struct TxMempoolInfo
+{
+    /** The transaction itself */
+    std::shared_ptr<const CTransaction> tx;
+
+    /** Time the transaction entered the mempool. */
+    int64_t nTime;
+
+    /** Feerate of the transaction. */
+    CFeeRate feeRate;
+};
+
 /**
  * CTxMemPool stores valid-according-to-the-current-best-chain
  * transactions that may be included in the next block.
@@ -464,6 +481,8 @@ class CTxMemPool
     void UpdateParent(txiter entry, txiter parent, bool add);
     void UpdateChild(txiter entry, txiter child, bool add);
 
+    std::vector<indexed_transaction_set::const_iterator> GetSortedDepthAndScore() const;
+
 public:
     indirectmap<COutPoint, const CTransaction*> mapNextTx;
     std::map<uint256, std::pair<double, CAmount> > mapDeltas;
@@ -589,8 +608,9 @@ class CTxMemPool
     }
 
     bool lookup(uint256 hash, CTransaction& result) const;
-    bool lookup(uint256 hash, CTransaction& result, int64_t& time) const;
-    bool lookupFeeRate(const uint256& hash, CFeeRate& feeRate) const;
+    std::shared_ptr<const CTransaction> get(const uint256& hash) const;
+    TxMempoolInfo info(const uint256& hash) const;
+    std::vector<TxMempoolInfo> infoAll() const;
 
     /** Estimate fee rate needed to get into the next nBlocks
      *  If no answer can be given at nBlocks, return an estimate

From f0fdda0181e1b05b66541bf235c6702c41664170 Mon Sep 17 00:00:00 2001
From: Kaz Wesley <keziahw@gmail.com>
Date: Tue, 26 Apr 2016 17:21:22 -0700
Subject: [PATCH 0409/1802] IsInitialBlockDownload: usually avoid locking

Optimistically test the latch bool before taking the lock.
For all IsInitialBlockDownload calls after the first to return false,
this avoids the need to lock cs_main.
---
 src/main.cpp | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index d2b7c6bc4fba2..aed8a7c4213ca 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -37,6 +37,7 @@
 #include "validationinterface.h"
 #include "versionbits.h"
 
+#include <atomic>
 #include <sstream>
 
 #include <boost/algorithm/string/replace.hpp>
@@ -1574,18 +1575,24 @@ CAmount GetBlockSubsidy(int nHeight, const Consensus::Params& consensusParams)
 bool IsInitialBlockDownload()
 {
     const CChainParams& chainParams = Params();
+
+    // Once this function has returned false, it must remain false.
+    static std::atomic<bool> latchToFalse{false};
+    // Optimization: pre-test latch before taking the lock.
+    if (latchToFalse.load(std::memory_order_relaxed))
+        return false;
+
     LOCK(cs_main);
+    if (latchToFalse.load(std::memory_order_relaxed))
+        return false;
     if (fImporting || fReindex)
         return true;
     if (fCheckpointsEnabled && chainActive.Height() < Checkpoints::GetTotalBlocksEstimate(chainParams.Checkpoints()))
         return true;
-    static bool lockIBDState = false;
-    if (lockIBDState)
-        return false;
     bool state = (chainActive.Height() < pindexBestHeader->nHeight - 24 * 6 ||
             std::max(chainActive.Tip()->GetBlockTime(), pindexBestHeader->GetBlockTime()) < GetTime() - nMaxTipAge);
     if (!state)
-        lockIBDState = true;
+        latchToFalse.store(true, std::memory_order_relaxed);
     return state;
 }
 

From dbfb426b96fbd79fb76734c6b747ef8ee10ad5ab Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Tue, 31 May 2016 19:51:45 +0200
Subject: [PATCH 0410/1802] Optimize the relay map to use shared_ptr's

* Switch mapRelay to use shared_ptr<CTransaction>
* Switch the relay code to copy mempool shared_ptr's, rather than copying
  the transaction itself.
* Change vRelayExpiration to store mapRelay iterators rather than hashes
  (smaller and faster).
---
 src/main.cpp | 37 ++++++++++++++++---------------------
 1 file changed, 16 insertions(+), 21 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index d71f35bf7e4fc..bf0f0d8964ea0 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -80,9 +80,6 @@ uint64_t nPruneTarget = 0;
 int64_t nMaxTipAge = DEFAULT_MAX_TIP_AGE;
 bool fEnableReplacement = DEFAULT_ENABLE_REPLACEMENT;
 
-std::map<uint256, CTransaction> mapRelay;
-std::deque<std::pair<int64_t, uint256> > vRelayExpiration;
-CCriticalSection cs_mapRelay;
 
 CFeeRate minRelayTxFee = CFeeRate(DEFAULT_MIN_RELAY_TX_FEE);
 CAmount maxTxFee = DEFAULT_TRANSACTION_MAXFEE;
@@ -215,6 +212,12 @@ namespace {
 
     /** Number of peers from which we're downloading blocks. */
     int nPeersWithValidatedDownloads = 0;
+
+    /** Relay map, protected by cs_main. */
+    typedef std::map<uint256, std::shared_ptr<const CTransaction>> MapRelay;
+    MapRelay mapRelay;
+    /** Expiration-time ordered list of (expire time, relay map entry) pairs, protected by cs_main). */
+    std::deque<std::pair<int64_t, MapRelay::iterator>> vRelayExpiration;
 } // anon namespace
 
 //////////////////////////////////////////////////////////////////////////////
@@ -4505,31 +4508,24 @@ void static ProcessGetData(CNode* pfrom, const Consensus::Params& consensusParam
                     }
                 }
             }
-            else if (inv.IsKnownType())
+            else if (inv.type == MSG_TX)
             {
-                CTransaction tx;
                 // Send stream from relay memory
                 bool push = false;
-                {
-                    LOCK(cs_mapRelay);
-                    map<uint256, CTransaction>::iterator mi = mapRelay.find(inv.hash);
-                    if (mi != mapRelay.end()) {
-                        tx = (*mi).second;
-                        push = true;
-                    }
-                }
-                if (!push && inv.type == MSG_TX) {
+                auto mi = mapRelay.find(inv.hash);
+                if (mi != mapRelay.end()) {
+                    pfrom->PushMessage(NetMsgType::TX, *mi->second);
+                    push = true;
+                } else {
                     auto txinfo = mempool.info(inv.hash);
                     // To protect privacy, do not answer getdata using the mempool when
                     // that TX couldn't have been INVed in reply to a MEMPOOL request.
                     if (txinfo.tx && txinfo.nTime <= pfrom->timeLastMempoolReq) {
-                        tx = *txinfo.tx;
+                        pfrom->PushMessage(NetMsgType::TX, *txinfo.tx);
                         push = true;
                     }
                 }
-                if (push) {
-                    pfrom->PushMessage(inv.GetCommand(), tx);
-                } else {
+                if (!push) {
                     vNotFound.push_back(inv);
                 }
             }
@@ -5978,7 +5974,6 @@ bool SendMessages(CNode* pto)
                     vInv.push_back(CInv(MSG_TX, hash));
                     nRelayedTransactions++;
                     {
-                        LOCK(cs_mapRelay);
                         // Expire old relay messages
                         while (!vRelayExpiration.empty() && vRelayExpiration.front().first < GetTime())
                         {
@@ -5986,9 +5981,9 @@ bool SendMessages(CNode* pto)
                             vRelayExpiration.pop_front();
                         }
 
-                        auto ret = mapRelay.insert(std::make_pair(hash, *txinfo.tx));
+                        auto ret = mapRelay.insert(std::make_pair(hash, std::move(txinfo.tx)));
                         if (ret.second) {
-                            vRelayExpiration.push_back(std::make_pair(GetTime() + 15 * 60, hash));
+                            vRelayExpiration.push_back(std::make_pair(GetTime() + 15 * 60, ret.first));
                         }
                     }
                     if (vInv.size() == MAX_INV_SZ) {

From e9b4780b292122fd727426471f025ec3d3eb7b08 Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Tue, 31 May 2016 20:34:27 +0200
Subject: [PATCH 0411/1802] Optimization: don't check the mempool at all if no
 mempool req ever

---
 src/main.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main.cpp b/src/main.cpp
index bf0f0d8964ea0..68368e402b3d1 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -4516,7 +4516,7 @@ void static ProcessGetData(CNode* pfrom, const Consensus::Params& consensusParam
                 if (mi != mapRelay.end()) {
                     pfrom->PushMessage(NetMsgType::TX, *mi->second);
                     push = true;
-                } else {
+                } else if (pfrom->timeLastMempoolReq) {
                     auto txinfo = mempool.info(inv.hash);
                     // To protect privacy, do not answer getdata using the mempool when
                     // that TX couldn't have been INVed in reply to a MEMPOOL request.

From c2a4724642400bc9200aeef4c725b5c07eee9d90 Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Tue, 31 May 2016 20:35:44 +0200
Subject: [PATCH 0412/1802] Optimization: use usec in expiration and reuse nNow

---
 src/main.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index 68368e402b3d1..db0580bda6142 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -5975,7 +5975,7 @@ bool SendMessages(CNode* pto)
                     nRelayedTransactions++;
                     {
                         // Expire old relay messages
-                        while (!vRelayExpiration.empty() && vRelayExpiration.front().first < GetTime())
+                        while (!vRelayExpiration.empty() && vRelayExpiration.front().first < nNow)
                         {
                             mapRelay.erase(vRelayExpiration.front().second);
                             vRelayExpiration.pop_front();
@@ -5983,7 +5983,7 @@ bool SendMessages(CNode* pto)
 
                         auto ret = mapRelay.insert(std::make_pair(hash, std::move(txinfo.tx)));
                         if (ret.second) {
-                            vRelayExpiration.push_back(std::make_pair(GetTime() + 15 * 60, ret.first));
+                            vRelayExpiration.push_back(std::make_pair(nNow + 15 * 60 * 1000000, ret.first));
                         }
                     }
                     if (vInv.size() == MAX_INV_SZ) {

From e6b141acf9dcc0a12f49d53c0bb8a892bae72217 Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Mon, 6 Jun 2016 10:23:51 +0200
Subject: [PATCH 0413/1802] qt: translation strings update

---
 src/qt/bitcoinstrings.cpp   |  108 ++--
 src/qt/locale/bitcoin_en.ts | 1004 +++++++++++++++++++----------------
 2 files changed, 606 insertions(+), 506 deletions(-)

diff --git a/src/qt/bitcoinstrings.cpp b/src/qt/bitcoinstrings.cpp
index 41f1d5841a659..23be8e016bddf 100644
--- a/src/qt/bitcoinstrings.cpp
+++ b/src/qt/bitcoinstrings.cpp
@@ -1,26 +1,35 @@
-// Copyright (c) 2013-2015 The Bitcoin Core developers
-// Distributed under the MIT software license, see the accompanying
-// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
 
 #include <QtGlobal>
 
-// Automatically generated by extract_strings.py
+// Automatically generated by extract_strings_qt.py
 #ifdef __GNUC__
 #define UNUSED __attribute__((unused))
 #else
 #define UNUSED
 #endif
 static const char UNUSED *bitcoin_strings[] = {
+QT_TRANSLATE_NOOP("bitcoin-core", "Bitcoin Core"),
+QT_TRANSLATE_NOOP("bitcoin-core", "The %s developers"),
 QT_TRANSLATE_NOOP("bitcoin-core", ""
 "(1 = keep tx meta data e.g. account owner and payment request information, 2 "
 "= drop tx meta data)"),
 QT_TRANSLATE_NOOP("bitcoin-core", ""
+"-fallbackfee is set very high! This is the transaction fee you may pay when "
+"fee estimates are not available."),
+QT_TRANSLATE_NOOP("bitcoin-core", ""
 "-maxtxfee is set very high! Fees this large could be paid on a single "
 "transaction."),
 QT_TRANSLATE_NOOP("bitcoin-core", ""
 "-paytxfee is set very high! This is the transaction fee you will pay if you "
 "send a transaction."),
 QT_TRANSLATE_NOOP("bitcoin-core", ""
+"A fee rate (in %s/kB) that will be used when fee estimation has insufficient "
+"data (default: %s)"),
+QT_TRANSLATE_NOOP("bitcoin-core", ""
+"Accept relayed transactions received from whitelisted peers even when not "
+"relaying transactions (default: %d)"),
+QT_TRANSLATE_NOOP("bitcoin-core", ""
 "Allow JSON-RPC connections from specified source. Valid for <ip> are a "
 "single IP (e.g. 1.2.3.4), a network/netmask (e.g. 1.2.3.4/255.255.255.0) or "
 "a network/CIDR (e.g. 1.2.3.4/24). This option can be specified multiple times"),
@@ -35,8 +44,7 @@ QT_TRANSLATE_NOOP("bitcoin-core", ""
 "notation for IPv6. This option can be specified multiple times (default: "
 "bind to all interfaces)"),
 QT_TRANSLATE_NOOP("bitcoin-core", ""
-"Cannot obtain a lock on data directory %s. Bitcoin Core is probably already "
-"running."),
+"Cannot obtain a lock on data directory %s. %s is probably already running."),
 QT_TRANSLATE_NOOP("bitcoin-core", ""
 "Create new files with system default permissions, instead of umask 077 (only "
 "effective with disabled wallet functionality)"),
@@ -52,8 +60,8 @@ QT_TRANSLATE_NOOP("bitcoin-core", ""
 QT_TRANSLATE_NOOP("bitcoin-core", ""
 "Do not keep transactions in the mempool longer than <n> hours (default: %u)"),
 QT_TRANSLATE_NOOP("bitcoin-core", ""
-"Error reading wallet.dat! All keys read correctly, but transaction data or "
-"address book entries might be missing or incorrect."),
+"Error reading %s! All keys read correctly, but transaction data or address "
+"book entries might be missing or incorrect."),
 QT_TRANSLATE_NOOP("bitcoin-core", ""
 "Error: Listening for incoming connections failed (listen returned error %s)"),
 QT_TRANSLATE_NOOP("bitcoin-core", ""
@@ -72,6 +80,9 @@ QT_TRANSLATE_NOOP("bitcoin-core", ""
 "Fees (in %s/kB) smaller than this are considered zero fee for transaction "
 "creation (default: %s)"),
 QT_TRANSLATE_NOOP("bitcoin-core", ""
+"Force relay of transactions from whitelisted peers even they violate local "
+"relay policy (default: %d)"),
+QT_TRANSLATE_NOOP("bitcoin-core", ""
 "How thorough the block verification of -checkblocks is (0-4, default: %u)"),
 QT_TRANSLATE_NOOP("bitcoin-core", ""
 "If <category> is not supplied or if <category> = 1, output all debugging "
@@ -86,18 +97,22 @@ QT_TRANSLATE_NOOP("bitcoin-core", ""
 "Maintain a full transaction index, used by the getrawtransaction rpc call "
 "(default: %u)"),
 QT_TRANSLATE_NOOP("bitcoin-core", ""
+"Maximum allowed median peer time offset adjustment. Local perspective of "
+"time may be influenced by peers forward or backward by this amount. "
+"(default: %u seconds)"),
+QT_TRANSLATE_NOOP("bitcoin-core", ""
 "Maximum size of data in data carrier transactions we relay and mine "
 "(default: %u)"),
 QT_TRANSLATE_NOOP("bitcoin-core", ""
-"Maximum total fees (in %s) to use in a single wallet transaction; setting "
-"this too low may abort large transactions (default: %s)"),
+"Maximum total fees (in %s) to use in a single wallet transaction or raw "
+"transaction; setting this too low may abort large transactions (default: %s)"),
 QT_TRANSLATE_NOOP("bitcoin-core", ""
 "Number of seconds to keep misbehaving peers from reconnecting (default: %u)"),
 QT_TRANSLATE_NOOP("bitcoin-core", ""
 "Output debugging information (default: %u, supplying <category> is optional)"),
 QT_TRANSLATE_NOOP("bitcoin-core", ""
 "Please check that your computer's date and time are correct! If your clock "
-"is wrong Bitcoin Core will not work properly."),
+"is wrong, %s will not work properly."),
 QT_TRANSLATE_NOOP("bitcoin-core", ""
 "Prune configured below the minimum of %d MiB.  Please use a higher number."),
 QT_TRANSLATE_NOOP("bitcoin-core", ""
@@ -123,11 +138,10 @@ QT_TRANSLATE_NOOP("bitcoin-core", ""
 "Set the number of script verification threads (%u to %d, 0 = auto, <0 = "
 "leave that many cores free, default: %d)"),
 QT_TRANSLATE_NOOP("bitcoin-core", ""
-"Set the number of threads for coin generation if enabled (-1 = all cores, "
-"default: %d)"),
-QT_TRANSLATE_NOOP("bitcoin-core", ""
 "Support filtering of blocks and transaction with bloom filters (default: %u)"),
 QT_TRANSLATE_NOOP("bitcoin-core", ""
+"Tell other nodes to filter invs to us by our mempool min fee (default: %u)"),
+QT_TRANSLATE_NOOP("bitcoin-core", ""
 "The block database contains a block which appears to be from the future. "
 "This may be due to your computer's date and time being set incorrectly. Only "
 "rebuild the block database if you are sure that your computer's date and "
@@ -148,12 +162,12 @@ QT_TRANSLATE_NOOP("bitcoin-core", ""
 "Tries to keep outbound traffic under the given target (in MiB per 24h), 0 = "
 "no limit (default: %d)"),
 QT_TRANSLATE_NOOP("bitcoin-core", ""
-"Unable to bind to %s on this computer. Bitcoin Core is probably already "
-"running."),
-QT_TRANSLATE_NOOP("bitcoin-core", ""
 "Unsupported argument -socks found. Setting SOCKS version isn't possible "
 "anymore, only SOCKS5 proxies are supported."),
 QT_TRANSLATE_NOOP("bitcoin-core", ""
+"Unsupported argument -whitelistalwaysrelay ignored, use -whitelistrelay and/"
+"or -whitelistforcerelay."),
+QT_TRANSLATE_NOOP("bitcoin-core", ""
 "Use UPnP to map the listening port (default: 1 when listening and no -proxy)"),
 QT_TRANSLATE_NOOP("bitcoin-core", ""
 "Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: "
@@ -172,13 +186,16 @@ QT_TRANSLATE_NOOP("bitcoin-core", ""
 "Warning: The network does not appear to fully agree! Some miners appear to "
 "be experiencing issues."),
 QT_TRANSLATE_NOOP("bitcoin-core", ""
+"Warning: Unknown block versions being mined! It's possible unknown rules are "
+"in effect"),
+QT_TRANSLATE_NOOP("bitcoin-core", ""
+"Warning: Wallet file corrupt, data salvaged! Original %s saved as %s in %s; "
+"if your balance or transactions are incorrect you should restore from a "
+"backup."),
+QT_TRANSLATE_NOOP("bitcoin-core", ""
 "Warning: We do not appear to fully agree with our peers! You may need to "
 "upgrade, or other nodes may need to upgrade."),
 QT_TRANSLATE_NOOP("bitcoin-core", ""
-"Warning: wallet.dat corrupt, data salvaged! Original wallet.dat saved as "
-"wallet.{timestamp}.bak in %s; if your balance or transactions are incorrect "
-"you should restore from a backup."),
-QT_TRANSLATE_NOOP("bitcoin-core", ""
 "Whitelist peers connecting from the given netmask or IP address. Can be "
 "specified multiple times."),
 QT_TRANSLATE_NOOP("bitcoin-core", ""
@@ -187,6 +204,9 @@ QT_TRANSLATE_NOOP("bitcoin-core", ""
 QT_TRANSLATE_NOOP("bitcoin-core", ""
 "You need to rebuild the database using -reindex to go back to unpruned "
 "mode.  This will redownload the entire blockchain"),
+QT_TRANSLATE_NOOP("bitcoin-core", ""
+"You need to rebuild the database using -reindex-chainstate to change -txindex"),
+QT_TRANSLATE_NOOP("bitcoin-core", "%s corrupt, salvage failed"),
 QT_TRANSLATE_NOOP("bitcoin-core", "(default: %s)"),
 QT_TRANSLATE_NOOP("bitcoin-core", "(default: %u)"),
 QT_TRANSLATE_NOOP("bitcoin-core", "-maxmempool must be at least %d MB"),
@@ -194,24 +214,22 @@ QT_TRANSLATE_NOOP("bitcoin-core", "<category> can be:"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Accept command line and JSON-RPC commands"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Accept connections from outside (default: 1 if no -proxy or -connect)"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Accept public REST requests (default: %u)"),
-QT_TRANSLATE_NOOP("bitcoin-core", "Activating best chain..."),
 QT_TRANSLATE_NOOP("bitcoin-core", "Add a node to connect to and attempt to keep the connection open"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Allow DNS lookups for -addnode, -seednode and -connect"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Always query for peer addresses via DNS lookup (default: %u)"),
-QT_TRANSLATE_NOOP("bitcoin-core", "Always relay transactions received from whitelisted peers (default: %d)"),
-QT_TRANSLATE_NOOP("bitcoin-core", "Attempt to recover private keys from a corrupt wallet.dat on startup"),
+QT_TRANSLATE_NOOP("bitcoin-core", "Append comment to the user agent string"),
+QT_TRANSLATE_NOOP("bitcoin-core", "Attempt to recover private keys from a corrupt wallet on startup"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Automatically create Tor hidden service (default: %d)"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Block creation options:"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Cannot downgrade wallet"),
-QT_TRANSLATE_NOOP("bitcoin-core", "Cannot resolve -bind address: '%s'"),
-QT_TRANSLATE_NOOP("bitcoin-core", "Cannot resolve -externalip address: '%s'"),
-QT_TRANSLATE_NOOP("bitcoin-core", "Cannot resolve -whitebind address: '%s'"),
+QT_TRANSLATE_NOOP("bitcoin-core", "Cannot resolve -%s address: '%s'"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Cannot write default address"),
+QT_TRANSLATE_NOOP("bitcoin-core", "Change index out of range"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Connect only to the specified node(s)"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Connect through SOCKS5 proxy"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Connect to a node to retrieve peer addresses, and disconnect"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Connection options:"),
-QT_TRANSLATE_NOOP("bitcoin-core", "Copyright (C) 2009-%i The Bitcoin Core Developers"),
+QT_TRANSLATE_NOOP("bitcoin-core", "Copyright (C) %i-%i"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Corrupted block database detected"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Debugging/Testing options:"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Do not load the wallet and disable wallet RPC calls"),
@@ -221,12 +239,13 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Enable publish hash block in <address>"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Enable publish hash transaction in <address>"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Enable publish raw block in <address>"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Enable publish raw transaction in <address>"),
+QT_TRANSLATE_NOOP("bitcoin-core", "Enable transaction replacement in the memory pool (default: %u)"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Error initializing block database"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Error initializing wallet database environment %s!"),
+QT_TRANSLATE_NOOP("bitcoin-core", "Error loading %s"),
+QT_TRANSLATE_NOOP("bitcoin-core", "Error loading %s: Wallet corrupted"),
+QT_TRANSLATE_NOOP("bitcoin-core", "Error loading %s: Wallet requires newer version of %s"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Error loading block database"),
-QT_TRANSLATE_NOOP("bitcoin-core", "Error loading wallet.dat"),
-QT_TRANSLATE_NOOP("bitcoin-core", "Error loading wallet.dat: Wallet corrupted"),
-QT_TRANSLATE_NOOP("bitcoin-core", "Error loading wallet.dat: Wallet requires newer version of Bitcoin Core"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Error opening block database"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Error reading from database, shutting down."),
 QT_TRANSLATE_NOOP("bitcoin-core", "Error"),
@@ -234,34 +253,34 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Error: A fatal internal error occurred, see d
 QT_TRANSLATE_NOOP("bitcoin-core", "Error: Disk space is low!"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Failed to listen on any port. Use -listen=0 if you want this."),
 QT_TRANSLATE_NOOP("bitcoin-core", "Fee (in %s/kB) to add to transactions you send (default: %s)"),
-QT_TRANSLATE_NOOP("bitcoin-core", "Generate coins (default: %u)"),
 QT_TRANSLATE_NOOP("bitcoin-core", "How many blocks to check at startup (default: %u, 0 = all)"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Importing..."),
 QT_TRANSLATE_NOOP("bitcoin-core", "Imports blocks from external blk000??.dat file on startup"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Include IP addresses in debug output (default: %u)"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Incorrect or no genesis block found. Wrong datadir for network?"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Information"),
-QT_TRANSLATE_NOOP("bitcoin-core", "Initialization sanity check failed. Bitcoin Core is shutting down."),
+QT_TRANSLATE_NOOP("bitcoin-core", "Initialization sanity check failed. %s is shutting down."),
 QT_TRANSLATE_NOOP("bitcoin-core", "Insufficient funds"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Invalid -onion address: '%s'"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Invalid -proxy address: '%s'"),
-QT_TRANSLATE_NOOP("bitcoin-core", "Invalid amount for -maxtxfee=<amount>: '%s'"),
-QT_TRANSLATE_NOOP("bitcoin-core", "Invalid amount for -minrelaytxfee=<amount>: '%s'"),
-QT_TRANSLATE_NOOP("bitcoin-core", "Invalid amount for -mintxfee=<amount>: '%s'"),
+QT_TRANSLATE_NOOP("bitcoin-core", "Invalid amount for -%s=<amount>: '%s'"),
+QT_TRANSLATE_NOOP("bitcoin-core", "Invalid amount for -fallbackfee=<amount>: '%s'"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Invalid amount for -paytxfee=<amount>: '%s' (must be at least %s)"),
-QT_TRANSLATE_NOOP("bitcoin-core", "Invalid amount for -paytxfee=<amount>: '%s'"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Invalid netmask specified in -whitelist: '%s'"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Keep at most <n> unconnectable transactions in memory (default: %u)"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Keep the transaction memory pool below <n> megabytes (default: %u)"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Listen for JSON-RPC connections on <port> (default: %u or testnet: %u)"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Listen for connections on <port> (default: %u or testnet: %u)"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Loading addresses..."),
+QT_TRANSLATE_NOOP("bitcoin-core", "Loading banlist..."),
 QT_TRANSLATE_NOOP("bitcoin-core", "Loading block index..."),
 QT_TRANSLATE_NOOP("bitcoin-core", "Loading wallet..."),
+QT_TRANSLATE_NOOP("bitcoin-core", "Location of the auth cookie (default: data dir)"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Maintain at most <n> connections to peers (default: %u)"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Make the wallet broadcast transactions"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Maximum per-connection receive buffer, <n>*1000 bytes (default: %u)"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Maximum per-connection send buffer, <n>*1000 bytes (default: %u)"),
+QT_TRANSLATE_NOOP("bitcoin-core", "Minimum bytes per sigop in transactions we relay and mine (default: %u)"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Need to specify a port with -whitebind: '%s'"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Node relay options:"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Not enough file descriptors available."),
@@ -269,12 +288,14 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Only connect to nodes in network <net> (ipv4,
 QT_TRANSLATE_NOOP("bitcoin-core", "Options:"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Password for JSON-RPC connections"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Prepend debug output with timestamp (default: %u)"),
+QT_TRANSLATE_NOOP("bitcoin-core", "Print this help message and exit"),
+QT_TRANSLATE_NOOP("bitcoin-core", "Print version and exit"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Prune cannot be configured with a negative value."),
 QT_TRANSLATE_NOOP("bitcoin-core", "Prune mode is incompatible with -txindex."),
 QT_TRANSLATE_NOOP("bitcoin-core", "Pruning blockstore..."),
 QT_TRANSLATE_NOOP("bitcoin-core", "RPC server options:"),
-QT_TRANSLATE_NOOP("bitcoin-core", "Rebuild block chain index from current blk000??.dat files on startup"),
-QT_TRANSLATE_NOOP("bitcoin-core", "Receive and display P2P network alerts (default: %u)"),
+QT_TRANSLATE_NOOP("bitcoin-core", "Rebuild chain state and block index from the blk*.dat files on disk"),
+QT_TRANSLATE_NOOP("bitcoin-core", "Rebuild chain state from the currently indexed blocks"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Reducing -maxconnections from %d to %d, because of system limitations."),
 QT_TRANSLATE_NOOP("bitcoin-core", "Relay and mine data carrier transactions (default: %u)"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Relay non-P2SH multisig (default: %u)"),
@@ -299,7 +320,6 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Specify wallet file (within data directory)")
 QT_TRANSLATE_NOOP("bitcoin-core", "Specify your own public address"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Spend unconfirmed change when sending transactions (default: %u)"),
 QT_TRANSLATE_NOOP("bitcoin-core", "The transaction amount is too small to pay the fee"),
-QT_TRANSLATE_NOOP("bitcoin-core", "This help message"),
 QT_TRANSLATE_NOOP("bitcoin-core", "This is experimental software."),
 QT_TRANSLATE_NOOP("bitcoin-core", "Threshold for disconnecting misbehaving peers (default: %u)"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Tor control port password (default: empty)"),
@@ -309,6 +329,7 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Transaction amounts must be positive"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Transaction too large for fee policy"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Transaction too large"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Unable to bind to %s on this computer (bind returned error %s)"),
+QT_TRANSLATE_NOOP("bitcoin-core", "Unable to bind to %s on this computer. %s is probably already running."),
 QT_TRANSLATE_NOOP("bitcoin-core", "Unable to start HTTP server. See debug log for details."),
 QT_TRANSLATE_NOOP("bitcoin-core", "Unknown network specified in -onlynet: '%s'"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Unsupported argument -benchmark ignored, use -debug=bench."),
@@ -321,13 +342,12 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Username for JSON-RPC connections"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Verifying blocks..."),
 QT_TRANSLATE_NOOP("bitcoin-core", "Verifying wallet..."),
 QT_TRANSLATE_NOOP("bitcoin-core", "Wallet %s resides outside data directory %s"),
-QT_TRANSLATE_NOOP("bitcoin-core", "Wallet needed to be rewritten: restart Bitcoin Core to complete"),
+QT_TRANSLATE_NOOP("bitcoin-core", "Wallet debugging/testing options:"),
+QT_TRANSLATE_NOOP("bitcoin-core", "Wallet needed to be rewritten: restart %s to complete"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Wallet options:"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Warning"),
-QT_TRANSLATE_NOOP("bitcoin-core", "Warning: This version is obsolete; upgrade required!"),
+QT_TRANSLATE_NOOP("bitcoin-core", "Warning: unknown new rules activated (versionbit %i)"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Whether to operate in a blocks only mode (default: %u)"),
-QT_TRANSLATE_NOOP("bitcoin-core", "You need to rebuild the database using -reindex to change -txindex"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Zapping all transactions from wallet..."),
 QT_TRANSLATE_NOOP("bitcoin-core", "ZeroMQ notification options:"),
-QT_TRANSLATE_NOOP("bitcoin-core", "wallet.dat corrupt, salvage failed"),
 };
diff --git a/src/qt/locale/bitcoin_en.ts b/src/qt/locale/bitcoin_en.ts
index 00411741f1b9a..5549ccd4f80f9 100644
--- a/src/qt/locale/bitcoin_en.ts
+++ b/src/qt/locale/bitcoin_en.ts
@@ -165,7 +165,7 @@
         <translation>Repeat new passphrase</translation>
     </message>
     <message>
-        <location filename="../askpassphrasedialog.cpp" line="+45"/>
+        <location filename="../askpassphrasedialog.cpp" line="+49"/>
         <source>Encrypt wallet</source>
         <translation>Encrypt wallet</translation>
     </message>
@@ -195,7 +195,7 @@
         <translation>Change passphrase</translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+45"/>
         <source>Confirm wallet encryption</source>
         <translation>Confirm wallet encryption</translation>
     </message>
@@ -210,12 +210,7 @@
         <translation>Are you sure you wish to encrypt your wallet?</translation>
     </message>
     <message>
-        <location line="+11"/>
-        <source>Bitcoin Core will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
+        <location line="+15"/>
         <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source>
         <translation>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</translation>
     </message>
@@ -232,7 +227,7 @@
         <translation>Wallet encrypted</translation>
     </message>
     <message>
-        <location line="-136"/>
+        <location line="-135"/>
         <source>Enter the new passphrase to the wallet.&lt;br/&gt;Please use a passphrase of &lt;b&gt;ten or more random characters&lt;/b&gt;, or &lt;b&gt;eight or more words&lt;/b&gt;.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -242,7 +237,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+70"/>
+        <location line="+56"/>
+        <source>%1 will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+13"/>
         <location line="+7"/>
         <location line="+42"/>
         <location line="+6"/>
@@ -299,17 +299,17 @@
 <context>
     <name>BitcoinGUI</name>
     <message>
-        <location filename="../bitcoingui.cpp" line="+335"/>
+        <location filename="../bitcoingui.cpp" line="+341"/>
         <source>Sign &amp;message...</source>
         <translation>Sign &amp;message...</translation>
     </message>
     <message>
-        <location line="+362"/>
+        <location line="+377"/>
         <source>Synchronizing with network...</source>
         <translation>Synchronizing with network...</translation>
     </message>
     <message>
-        <location line="-438"/>
+        <location line="-455"/>
         <source>&amp;Overview</source>
         <translation>&amp;Overview</translation>
     </message>
@@ -344,7 +344,17 @@
         <translation>Quit application</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+3"/>
+        <source>&amp;About %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Show information about %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
         <source>About &amp;Qt</source>
         <translation>About &amp;Qt</translation>
     </message>
@@ -358,6 +368,11 @@
         <source>&amp;Options...</source>
         <translation>&amp;Options...</translation>
     </message>
+    <message>
+        <location line="+1"/>
+        <source>Modify configuration options for %1</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location line="+6"/>
         <source>&amp;Encrypt Wallet...</source>
@@ -374,7 +389,7 @@
         <translation>&amp;Change Passphrase...</translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="+12"/>
         <source>&amp;Sending addresses...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -389,27 +404,17 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+183"/>
-        <source>Bitcoin Core client</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+169"/>
-        <source>Importing blocks from disk...</source>
-        <translation>Importing blocks from disk...</translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <location line="+372"/>
         <source>Reindexing blocks on disk...</source>
         <translation>Reindexing blocks on disk...</translation>
     </message>
     <message>
-        <location line="-436"/>
+        <location line="-457"/>
         <source>Send coins to a Bitcoin address</source>
         <translation>Send coins to a Bitcoin address</translation>
     </message>
     <message>
-        <location line="+65"/>
+        <location line="+67"/>
         <source>Backup wallet to another location</source>
         <translation>Backup wallet to another location</translation>
     </message>
@@ -434,12 +439,12 @@
         <translation>&amp;Verify message...</translation>
     </message>
     <message>
-        <location line="+459"/>
+        <location line="+481"/>
         <source>Bitcoin</source>
         <translation>Bitcoin</translation>
     </message>
     <message>
-        <location line="-669"/>
+        <location line="-693"/>
         <source>Wallet</source>
         <translation>Wallet</translation>
     </message>
@@ -454,12 +459,7 @@
         <translation>&amp;Receive</translation>
     </message>
     <message>
-        <location line="+40"/>
-        <source>Show information about Bitcoin Core</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
+        <location line="+50"/>
         <source>&amp;Show / Hide</source>
         <translation>&amp;Show / Hide</translation>
     </message>
@@ -484,7 +484,7 @@
         <translation>Verify messages to ensure they were signed with specified Bitcoin addresses</translation>
     </message>
     <message>
-        <location line="+56"/>
+        <location line="+58"/>
         <source>&amp;File</source>
         <translation>&amp;File</translation>
     </message>
@@ -504,27 +504,12 @@
         <translation>Tabs toolbar</translation>
     </message>
     <message>
-        <location line="-314"/>
-        <source>Bitcoin Core</source>
-        <translation type="unfinished">Bitcoin Core</translation>
-    </message>
-    <message>
-        <location line="+160"/>
+        <location line="-158"/>
         <source>Request payments (generates QR codes and bitcoin: URIs)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+38"/>
-        <source>&amp;About Bitcoin Core</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <source>Modify configuration options for Bitcoin Core</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+21"/>
+        <location line="+70"/>
         <source>Show the list of used sending addresses and labels</source>
         <translation type="unfinished"></translation>
     </message>
@@ -543,13 +528,8 @@
         <source>&amp;Command-line options</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+2"/>
-        <source>Show the Bitcoin Core help message to get a list with possible Bitcoin command-line options</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message numerus="yes">
-        <location line="+329"/>
+        <location line="+341"/>
         <source>%n active connection(s) to Bitcoin network</source>
         <translation>
             <numerusform>%n active connection to Bitcoin network</numerusform>
@@ -557,7 +537,17 @@
         </translation>
     </message>
     <message>
-        <location line="+25"/>
+        <location line="+22"/>
+        <source>Indexing blocks on disk...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Processing blocks on disk...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
         <source>No block source available...</source>
         <translation>No block source available...</translation>
     </message>
@@ -643,12 +633,22 @@
         <translation>Up to date</translation>
     </message>
     <message>
-        <location line="+44"/>
+        <location line="-388"/>
+        <source>Show the %1 help message to get a list with possible Bitcoin command-line options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+188"/>
+        <source>%1 client</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+244"/>
         <source>Catching up...</source>
         <translation>Catching up...</translation>
     </message>
     <message>
-        <location line="+129"/>
+        <location line="+137"/>
         <source>Date: %1
 </source>
         <translation type="unfinished"></translation>
@@ -698,14 +698,6 @@
         <translation>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;locked&lt;/b&gt;</translation>
     </message>
 </context>
-<context>
-    <name>ClientModel</name>
-    <message>
-        <location filename="../clientmodel.cpp" line="+135"/>
-        <source>Network Alert</source>
-        <translation>Network Alert</translation>
-    </message>
-</context>
 <context>
     <name>CoinControlDialog</name>
     <message>
@@ -870,7 +862,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+351"/>
+        <location line="+349"/>
         <source>highest</source>
         <translation type="unfinished"></translation>
     </message>
@@ -935,12 +927,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>This label turns red if any recipient receives an amount smaller than %1.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+9"/>
+        <location line="+12"/>
         <source>Can vary +/- %1 satoshi(s) per input.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -971,7 +958,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+59"/>
+        <location line="+4"/>
+        <source>This label turns red if any recipient receives an amount smaller than the current dust threshold.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+55"/>
         <location line="+60"/>
         <source>(no label)</source>
         <translation type="unfinished">(no label)</translation>
@@ -1058,7 +1050,7 @@
 <context>
     <name>FreespaceChecker</name>
     <message>
-        <location filename="../intro.cpp" line="+68"/>
+        <location filename="../intro.cpp" line="+78"/>
         <source>A new data directory will be created.</source>
         <translation>A new data directory will be created.</translation>
     </message>
@@ -1086,12 +1078,7 @@
 <context>
     <name>HelpMessageDialog</name>
     <message>
-        <location filename="../utilitydialog.cpp" line="+36"/>
-        <source>Bitcoin Core</source>
-        <translation type="unfinished">Bitcoin Core</translation>
-    </message>
-    <message>
-        <location line="+0"/>
+        <location filename="../utilitydialog.cpp" line="+40"/>
         <source>version</source>
         <translation type="unfinished">version</translation>
     </message>
@@ -1103,7 +1090,7 @@
     </message>
     <message>
         <location line="+5"/>
-        <source>About Bitcoin Core</source>
+        <source>About %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1166,17 +1153,17 @@
     </message>
     <message>
         <location line="+9"/>
-        <source>Welcome to Bitcoin Core.</source>
+        <source>Welcome to %1.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+26"/>
-        <source>As this is the first time the program is launched, you can choose where Bitcoin Core will store its data.</source>
+        <source>As this is the first time the program is launched, you can choose where %1 will store its data.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+10"/>
-        <source>Bitcoin Core will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source>
+        <source>%1 will download and store a copy of the Bitcoin block chain. At least %2GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1190,12 +1177,7 @@
         <translation>Use a custom data directory:</translation>
     </message>
     <message>
-        <location filename="../intro.cpp" line="+82"/>
-        <source>Bitcoin Core</source>
-        <translation type="unfinished">Bitcoin Core</translation>
-    </message>
-    <message>
-        <location line="+1"/>
+        <location filename="../intro.cpp" line="+89"/>
         <source>Error: Specified data directory &quot;%1&quot; cannot be created.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1262,7 +1244,17 @@
         <translation>&amp;Main</translation>
     </message>
     <message>
-        <location line="+18"/>
+        <location line="+6"/>
+        <source>Automatically start %1 after logging in to the system.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>&amp;Start %1 on system login</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
         <source>Size of &amp;database cache</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1293,17 +1285,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+84"/>
+        <location line="+94"/>
         <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Exit in the menu.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+45"/>
-        <source>The user interface language can be set here. This setting will take effect after restarting Bitcoin Core.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+35"/>
+        <location line="+80"/>
         <location line="+13"/>
         <source>Third party URLs (e.g. a block explorer) that appear in the transactions tab as context menu items. %s in the URL is replaced by transaction hash. Multiple URLs are separated by vertical bar |.</source>
         <translation type="unfinished"></translation>
@@ -1329,22 +1316,12 @@
         <translation>&amp;Reset Options</translation>
     </message>
     <message>
-        <location line="-504"/>
+        <location line="-514"/>
         <source>&amp;Network</source>
         <translation>&amp;Network</translation>
     </message>
     <message>
-        <location line="-153"/>
-        <source>Automatically start Bitcoin Core after logging in to the system.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>&amp;Start Bitcoin Core on system login</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+65"/>
+        <location line="-85"/>
         <source>(0 = auto, &lt;0 = leave that many cores free)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1455,6 +1432,16 @@
     </message>
     <message>
         <location line="+6"/>
+        <source>&amp;Hide the icon from the system tray.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Hide tray icon</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
         <source>Show only a tray icon after minimizing the window.</source>
         <translation>Show only a tray icon after minimizing the window.</translation>
     </message>
@@ -1479,7 +1466,12 @@
         <translation>User Interface &amp;language:</translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+13"/>
+        <source>The user interface language can be set here. This setting will take effect after restarting %1.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
         <source>&amp;Unit to show amounts in:</source>
         <translation>&amp;Unit to show amounts in:</translation>
     </message>
@@ -1489,12 +1481,12 @@
         <translation>Choose the default subdivision unit to show in the interface and when sending coins.</translation>
     </message>
     <message>
-        <location line="-440"/>
+        <location line="-450"/>
         <source>Whether to show coin control features or not.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+602"/>
+        <location line="+612"/>
         <source>&amp;OK</source>
         <translation>&amp;OK</translation>
     </message>
@@ -1504,7 +1496,7 @@
         <translation>&amp;Cancel</translation>
     </message>
     <message>
-        <location filename="../optionsdialog.cpp" line="+81"/>
+        <location filename="../optionsdialog.cpp" line="+86"/>
         <source>default</source>
         <translation>default</translation>
     </message>
@@ -1514,23 +1506,23 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+71"/>
+        <location line="+72"/>
         <source>Confirm options reset</source>
         <translation>Confirm options reset</translation>
     </message>
     <message>
         <location line="+1"/>
-        <location line="+30"/>
+        <location line="+43"/>
         <source>Client restart required to activate changes.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-30"/>
+        <location line="-43"/>
         <source>Client will be shut down. Do you want to proceed?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+47"/>
         <source>This change would require a client restart.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1781,12 +1773,12 @@
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../bitcoinunits.cpp" line="+183"/>
+        <location filename="../bitcoinunits.cpp" line="+176"/>
         <source>Amount</source>
         <translation type="unfinished">Amount</translation>
     </message>
     <message>
-        <location filename="../guiutil.cpp" line="+110"/>
+        <location filename="../guiutil.cpp" line="+118"/>
         <source>Enter a Bitcoin address (e.g. %1)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1807,7 +1799,7 @@
     </message>
     <message>
         <location line="+2"/>
-        <location line="+41"/>
+        <location line="+44"/>
         <source>%1 s</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1862,16 +1854,15 @@
         <location line="+23"/>
         <location line="+26"/>
         <location line="+26"/>
-        <location line="+26"/>
-        <location line="+23"/>
-        <location line="+23"/>
-        <location line="+23"/>
         <location line="+23"/>
+        <location line="+26"/>
         <location line="+36"/>
         <location line="+23"/>
         <location line="+36"/>
+        <location line="+23"/>
         <location line="+36"/>
-        <location line="+534"/>
+        <location line="+23"/>
+        <location line="+663"/>
         <location line="+23"/>
         <location line="+23"/>
         <location line="+23"/>
@@ -1892,7 +1883,7 @@
         <translation>N/A</translation>
     </message>
     <message>
-        <location line="-1216"/>
+        <location line="-1322"/>
         <source>Client version</source>
         <translation>Client version</translation>
     </message>
@@ -1913,26 +1904,26 @@
     </message>
     <message>
         <location line="+79"/>
-        <source>Using OpenSSL version</source>
-        <translation>Using OpenSSL version</translation>
+        <source>Using BerkeleyDB version</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+26"/>
-        <source>Using BerkeleyDB version</source>
+        <source>Datadir</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+26"/>
         <source>Startup time</source>
         <translation>Startup time</translation>
     </message>
     <message>
-        <location line="+170"/>
+        <location line="+29"/>
         <source>Network</source>
         <translation>Network</translation>
     </message>
     <message>
-        <location line="-147"/>
+        <location line="+7"/>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1962,41 +1953,36 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+36"/>
+        <location line="+23"/>
         <source>Memory usage</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+48"/>
-        <source>Open the Bitcoin Core debug log file from the current data directory. This can take a few seconds for large log files.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+233"/>
-        <location line="+552"/>
+        <location line="+404"/>
+        <location line="+558"/>
         <source>Received</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-472"/>
-        <location line="+449"/>
+        <location line="-478"/>
+        <location line="+455"/>
         <source>Sent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-408"/>
+        <location line="-414"/>
         <source>&amp;Peers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+50"/>
+        <location line="+53"/>
         <source>Banned peers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+57"/>
-        <location filename="../rpcconsole.cpp" line="+287"/>
-        <location line="+578"/>
+        <location line="+60"/>
+        <location filename="../rpcconsole.cpp" line="+295"/>
+        <location line="+635"/>
         <source>Select a peer to view detailed information.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2031,13 +2017,28 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-973"/>
-        <location line="+881"/>
+        <location line="-1079"/>
+        <location line="+987"/>
         <source>User Agent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="-684"/>
+        <source>Open the %1 debug log file from the current data directory. This can take a few seconds for large log files.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+68"/>
+        <source>Decrease font size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+29"/>
+        <source>Increase font size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+610"/>
         <source>Services</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2082,12 +2083,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-977"/>
+        <location line="-1093"/>
         <source>Last block time</source>
         <translation>Last block time</translation>
     </message>
     <message>
-        <location line="+123"/>
+        <location line="+110"/>
         <source>&amp;Open</source>
         <translation>&amp;Open</translation>
     </message>
@@ -2097,7 +2098,7 @@
         <translation>&amp;Console</translation>
     </message>
     <message>
-        <location line="+72"/>
+        <location line="+195"/>
         <source>&amp;Network Traffic</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2112,7 +2113,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rpcconsole.cpp" line="-343"/>
+        <location filename="../rpcconsole.cpp" line="-342"/>
         <source>In:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2122,22 +2123,17 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../forms/debugwindow.ui" line="-417"/>
-        <source>Build date</source>
-        <translation>Build date</translation>
-    </message>
-    <message>
-        <location line="+241"/>
+        <location filename="../forms/debugwindow.ui" line="-299"/>
         <source>Debug log file</source>
         <translation>Debug log file</translation>
     </message>
     <message>
-        <location line="+85"/>
+        <location line="+136"/>
         <source>Clear console</source>
         <translation>Clear console</translation>
     </message>
     <message>
-        <location filename="../rpcconsole.cpp" line="-156"/>
+        <location filename="../rpcconsole.cpp" line="-204"/>
         <source>&amp;Disconnect Node</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2175,8 +2171,8 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+70"/>
-        <source>Welcome to the Bitcoin Core RPC console.</source>
+        <location line="+118"/>
+        <source>Welcome to the %1 RPC console.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -2190,7 +2186,7 @@
         <translation>Type &lt;b&gt;help&lt;/b&gt; for an overview of available commands.</translation>
     </message>
     <message>
-        <location line="+144"/>
+        <location line="+146"/>
         <source>%1 B</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2444,9 +2440,14 @@
         <translation type="unfinished">Message</translation>
     </message>
     <message>
-        <location line="+99"/>
-        <source>Amount</source>
-        <translation type="unfinished">Amount</translation>
+        <location line="+57"/>
+        <source>(no amount requested)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+42"/>
+        <source>Requested</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="-59"/>
@@ -2458,17 +2459,12 @@
         <source>(no message)</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+8"/>
-        <source>(no amount)</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>SendCoinsDialog</name>
     <message>
         <location filename="../forms/sendcoinsdialog.ui" line="+14"/>
-        <location filename="../sendcoinsdialog.cpp" line="+546"/>
+        <location filename="../sendcoinsdialog.cpp" line="+543"/>
         <source>Send Coins</source>
         <translation>Send Coins</translation>
     </message>
@@ -2615,17 +2611,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+38"/>
-        <source>Send as zero-fee transaction if possible</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <source>(confirmation may take longer)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+110"/>
+        <location line="+102"/>
         <source>Send to multiple recipients at once</source>
         <translation>Send to multiple recipients at once</translation>
     </message>
@@ -2640,12 +2626,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-858"/>
+        <location line="-805"/>
         <source>Dust:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+861"/>
+        <location line="+808"/>
         <source>Clear &amp;All</source>
         <translation>Clear &amp;All</translation>
     </message>
@@ -2678,7 +2664,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-221"/>
+        <location line="-215"/>
         <source>Copy quantity</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2713,7 +2699,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+244"/>
+        <location line="+238"/>
         <source>Total Amount %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2758,12 +2744,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+91"/>
+        <location line="+89"/>
         <source>Pay only the required fee of %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
-        <location line="+23"/>
+        <location line="+25"/>
         <source>Estimated to begin confirmation within %n block(s).</source>
         <translation type="unfinished">
             <numerusform>Estimated to begin confirmation within %n block.</numerusform>
@@ -2796,12 +2782,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-695"/>
+        <location line="-689"/>
         <source>Copy dust</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+221"/>
+        <location line="+215"/>
         <source>Are you sure you want to send?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2920,11 +2906,20 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>SendConfirmationDialog</name>
+    <message>
+        <location filename="../sendcoinsdialog.cpp" line="+571"/>
+        <location line="+5"/>
+        <source>Yes</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>ShutdownWindow</name>
     <message>
         <location filename="../utilitydialog.cpp" line="+78"/>
-        <source>Bitcoin Core is shutting down...</source>
+        <source>%1 is shutting down...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -3117,16 +3112,6 @@
 </context>
 <context>
     <name>SplashScreen</name>
-    <message>
-        <location filename="../splashscreen.cpp" line="+41"/>
-        <source>Bitcoin Core</source>
-        <translation type="unfinished">Bitcoin Core</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>The Bitcoin Core developers</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../networkstyle.cpp" line="+19"/>
         <source>[testnet]</source>
@@ -3149,14 +3134,29 @@
         <translation>Open until %1</translation>
     </message>
     <message>
-        <location line="+6"/>
-        <source>conflicted</source>
-        <translation type="unfinished"></translation>
+        <location line="+8"/>
+        <source>%1/offline</source>
+        <translation>%1/offline</translation>
     </message>
     <message>
         <location line="+2"/>
-        <source>%1/offline</source>
-        <translation>%1/offline</translation>
+        <source>0/unconfirmed, %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>in memory pool</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>not in memory pool</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>abandoned</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+2"/>
@@ -3231,12 +3231,12 @@
         <location line="+12"/>
         <location line="+53"/>
         <location line="+26"/>
-        <location line="+53"/>
+        <location line="+54"/>
         <source>Credit</source>
         <translation>Credit</translation>
     </message>
     <message numerus="yes">
-        <location line="-142"/>
+        <location line="-143"/>
         <source>matures in %n more block(s)</source>
         <translation>
             <numerusform>matures in %n more block</numerusform>
@@ -3251,12 +3251,12 @@
     <message>
         <location line="+59"/>
         <location line="+25"/>
-        <location line="+53"/>
+        <location line="+54"/>
         <source>Debit</source>
         <translation>Debit</translation>
     </message>
     <message>
-        <location line="-68"/>
+        <location line="-69"/>
         <source>Total debit</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3277,12 +3277,12 @@
     </message>
     <message>
         <location line="+6"/>
-        <location line="+9"/>
+        <location line="+10"/>
         <source>Message</source>
         <translation>Message</translation>
     </message>
     <message>
-        <location line="-7"/>
+        <location line="-8"/>
         <source>Comment</source>
         <translation>Comment</translation>
     </message>
@@ -3291,6 +3291,11 @@
         <source>Transaction ID</source>
         <translation>Transaction ID</translation>
     </message>
+    <message>
+        <location line="+1"/>
+        <source>Output index</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location line="+18"/>
         <source>Merchant</source>
@@ -3334,12 +3339,12 @@
         <translation>false</translation>
     </message>
     <message>
-        <location line="-242"/>
+        <location line="-243"/>
         <source>, has not been successfully broadcast yet</source>
         <translation>, has not been successfully broadcast yet</translation>
     </message>
     <message numerus="yes">
-        <location line="-36"/>
+        <location line="-38"/>
         <source>Open for %n more block(s)</source>
         <translation>
             <numerusform>Open for %n more block</numerusform>
@@ -3347,7 +3352,12 @@
         </translation>
     </message>
     <message>
-        <location line="+67"/>
+        <location line="+8"/>
+        <source>conflicted with a transaction with %1 confirmations</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+61"/>
         <source>unknown</source>
         <translation>unknown</translation>
     </message>
@@ -3355,15 +3365,15 @@
 <context>
     <name>TransactionDescDialog</name>
     <message>
-        <location filename="../forms/transactiondescdialog.ui" line="+14"/>
-        <source>Transaction details</source>
-        <translation>Transaction details</translation>
-    </message>
-    <message>
-        <location line="+6"/>
+        <location filename="../forms/transactiondescdialog.ui" line="+20"/>
         <source>This pane shows a detailed description of the transaction</source>
         <translation>This pane shows a detailed description of the transaction</translation>
     </message>
+    <message>
+        <location filename="../transactiondescdialog.cpp" line="+17"/>
+        <source>Details for %1</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TransactionTableModel</name>
@@ -3378,12 +3388,12 @@
         <translation>Type</translation>
     </message>
     <message>
-        <location line="+79"/>
+        <location line="+82"/>
         <source>Immature (%1 confirmations, will be available after %2)</source>
         <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
-        <location line="-21"/>
+        <location line="-24"/>
         <source>Open for %n more block(s)</source>
         <translation>
             <numerusform>Open for %n more block</numerusform>
@@ -3396,7 +3406,7 @@
         <translation>Open until %1</translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="+15"/>
         <source>Confirmed (%1 confirmations)</source>
         <translation>Confirmed (%1 confirmations)</translation>
     </message>
@@ -3411,7 +3421,7 @@
         <translation>Generated but not accepted</translation>
     </message>
     <message>
-        <location line="-21"/>
+        <location line="-24"/>
         <source>Offline</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3425,6 +3435,11 @@
         <source>Unconfirmed</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+3"/>
+        <source>Abandoned</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location line="+3"/>
         <source>Confirming (%1 of %2 recommended confirmations)</source>
@@ -3471,7 +3486,12 @@
         <translation>(n/a)</translation>
     </message>
     <message>
-        <location line="+217"/>
+        <location line="+213"/>
+        <source>(no label)</source>
+        <translation type="unfinished">(no label)</translation>
+    </message>
+    <message>
+        <location line="+39"/>
         <source>Transaction status. Hover over this field to show number of confirmations.</source>
         <translation>Transaction status. Hover over this field to show number of confirmations.</translation>
     </message>
@@ -3576,6 +3596,11 @@
     </message>
     <message>
         <location line="+36"/>
+        <source>Abandon transaction</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
         <source>Copy address</source>
         <translation>Copy address</translation>
     </message>
@@ -3599,6 +3624,11 @@
         <source>Copy raw transaction</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+1"/>
+        <source>Copy full transaction details</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location line="+1"/>
         <source>Edit label</source>
@@ -3610,7 +3640,7 @@
         <translation>Show transaction details</translation>
     </message>
     <message>
-        <location line="+181"/>
+        <location line="+186"/>
         <source>Export Transaction History</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3675,7 +3705,7 @@
         <translation>ID</translation>
     </message>
     <message>
-        <location line="+121"/>
+        <location line="+152"/>
         <source>Range:</source>
         <translation>Range:</translation>
     </message>
@@ -3688,7 +3718,7 @@
 <context>
     <name>UnitDisplayStatusBarControl</name>
     <message>
-        <location filename="../bitcoingui.cpp" line="+106"/>
+        <location filename="../bitcoingui.cpp" line="+114"/>
         <source>Unit to show amounts in. Click to select another unit.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3755,47 +3785,37 @@
 <context>
     <name>bitcoin-core</name>
     <message>
-        <location filename="../bitcoinstrings.cpp" line="+267"/>
+        <location filename="../bitcoinstrings.cpp" line="+288"/>
         <source>Options:</source>
         <translation>Options:</translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+29"/>
         <source>Specify data directory</source>
         <translation>Specify data directory</translation>
     </message>
     <message>
-        <location line="-84"/>
+        <location line="-87"/>
         <source>Connect to a node to retrieve peer addresses, and disconnect</source>
         <translation>Connect to a node to retrieve peer addresses, and disconnect</translation>
     </message>
     <message>
-        <location line="+87"/>
+        <location line="+90"/>
         <source>Specify your own public address</source>
         <translation>Specify your own public address</translation>
     </message>
     <message>
-        <location line="-105"/>
+        <location line="-106"/>
         <source>Accept command line and JSON-RPC commands</source>
         <translation>Accept command line and JSON-RPC commands</translation>
     </message>
     <message>
-        <location line="-118"/>
+        <location line="-127"/>
         <source>If &lt;category&gt; is not supplied or if &lt;category&gt; = 1, output all debugging information.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+15"/>
-        <source>Maximum total fees (in %s) to use in a single wallet transaction; setting this too low may abort large transactions (default: %s)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <source>Please check that your computer&apos;s date and time are correct! If your clock is wrong Bitcoin Core will not work properly.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <location line="+29"/>
         <source>Prune configured below the minimum of %d MiB.  Please use a higher number.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3815,7 +3835,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+116"/>
+        <location line="+120"/>
         <source>Error: A fatal internal error occurred, see debug.log for details</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3825,7 +3845,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+38"/>
+        <location line="+40"/>
         <source>Pruning blockstore...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3840,17 +3860,47 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-117"/>
+        <location line="-118"/>
         <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
         <translation>Accept connections from outside (default: 1 if no -proxy or -connect)</translation>
     </message>
     <message>
-        <location line="-168"/>
+        <location line="-203"/>
+        <source>Bitcoin Core</source>
+        <translation type="unfinished">Bitcoin Core</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>The %s developers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>-fallbackfee is set very high! This is the transaction fee you may pay when fee estimates are not available.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>A fee rate (in %s/kB) that will be used when fee estimation has insufficient data (default: %s)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Accept relayed transactions received from whitelisted peers even when not relaying transactions (default: %d)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
         <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source>
         <translation>Bind to given address and always listen on it. Use [host]:port notation for IPv6</translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location line="+10"/>
+        <source>Cannot obtain a lock on data directory %s. %s is probably already running.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
         <source>Delete all wallet transactions and only recover those parts of the blockchain through -rescan on startup</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3860,17 +3910,47 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location line="+5"/>
+        <source>Error reading %s! All keys read correctly, but transaction data or address book entries might be missing or incorrect.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
         <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source>
         <translation>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+12"/>
+        <source>Force relay of transactions from whitelisted peers even they violate local relay policy (default: %d)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Maximum allowed median peer time offset adjustment. Local perspective of time may be influenced by peers forward or backward by this amount. (default: %u seconds)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Maximum total fees (in %s) to use in a single wallet transaction or raw transaction; setting this too low may abort large transactions (default: %s)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Please check that your computer&apos;s date and time are correct! If your clock is wrong, %s will not work properly.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+24"/>
         <source>Set the number of script verification threads (%u to %d, 0 = auto, &lt;0 = leave that many cores free, default: %d)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="+5"/>
+        <source>Tell other nodes to filter invs to us by our mempool min fee (default: %u)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>The block database contains a block which appears to be from the future. This may be due to your computer&apos;s date and time being set incorrectly. Only rebuild the block database if you are sure that your computer&apos;s date and time are correct</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3880,12 +3960,7 @@
         <translation>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</translation>
     </message>
     <message>
-        <location line="+13"/>
-        <source>Unable to bind to %s on this computer. Bitcoin Core is probably already running.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
+        <location line="+19"/>
         <source>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3905,22 +3980,27 @@
         <translation>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="+10"/>
         <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source>
         <translation>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</translation>
     </message>
     <message>
         <location line="+3"/>
-        <source>Warning: wallet.dat corrupt, data salvaged! Original wallet.dat saved as wallet.{timestamp}.bak in %s; if your balance or transactions are incorrect you should restore from a backup.</source>
-        <translation>Warning: wallet.dat corrupt, data salvaged! Original wallet.dat saved as wallet.{timestamp}.bak in %s; if your balance or transactions are incorrect you should restore from a backup.</translation>
+        <source>Whitelist peers connecting from the given netmask or IP address. Can be specified multiple times.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
-        <source>Whitelist peers connecting from the given netmask or IP address. Can be specified multiple times.</source>
+        <location line="+9"/>
+        <source>You need to rebuild the database using -reindex-chainstate to change -txindex</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
+        <location line="+2"/>
+        <source>%s corrupt, salvage failed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
         <source>-maxmempool must be at least %d MB</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3930,12 +4010,32 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
+        <location line="+7"/>
+        <source>Append comment to the user agent string</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Attempt to recover private keys from a corrupt wallet on startup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>Block creation options:</source>
         <translation>Block creation options:</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+2"/>
+        <source>Cannot resolve -%s address: &apos;%s&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Change index out of range</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
         <source>Connect only to the specified node(s)</source>
         <translation>Connect only to the specified node(s)</translation>
     </message>
@@ -3945,7 +4045,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+1"/>
+        <source>Copyright (C) %i-%i</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
         <source>Corrupted block database detected</source>
         <translation>Corrupted block database detected</translation>
     </message>
@@ -3984,6 +4089,11 @@
         <source>Enable publish raw transaction in &lt;address&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+1"/>
+        <source>Enable transaction replacement in the memory pool (default: %u)</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location line="+1"/>
         <source>Error initializing block database</source>
@@ -3994,13 +4104,28 @@
         <source>Error initializing wallet database environment %s!</source>
         <translation>Error initializing wallet database environment %s!</translation>
     </message>
+    <message>
+        <location line="+1"/>
+        <source>Error loading %s</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Error loading %s: Wallet corrupted</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Error loading %s: Wallet requires newer version of %s</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location line="+1"/>
         <source>Error loading block database</source>
         <translation>Error loading block database</translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+1"/>
         <source>Error opening block database</source>
         <translation>Error opening block database</translation>
     </message>
@@ -4015,7 +4140,7 @@
         <translation>Failed to listen on any port. Use -listen=0 if you want this.</translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+3"/>
         <source>Importing...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4025,17 +4150,47 @@
         <translation>Incorrect or no genesis block found. Wrong datadir for network?</translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+2"/>
+        <source>Initialization sanity check failed. %s is shutting down.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>Invalid -onion address: &apos;%s&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+2"/>
+        <source>Invalid amount for -%s=&lt;amount&gt;: &apos;%s&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Invalid amount for -fallbackfee=&lt;amount&gt;: &apos;%s&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
         <source>Keep the transaction memory pool below &lt;n&gt; megabytes (default: %u)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="+4"/>
+        <source>Loading banlist...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Location of the auth cookie (default: data dir)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Minimum bytes per sigop in transactions we relay and mine (default: %u)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
         <source>Not enough file descriptors available.</source>
         <translation>Not enough file descriptors available.</translation>
     </message>
@@ -4046,6 +4201,16 @@
     </message>
     <message>
         <location line="+4"/>
+        <source>Print this help message and exit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Print version and exit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
         <source>Prune cannot be configured with a negative value.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4055,7 +4220,17 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location line="+3"/>
+        <source>Rebuild chain state and block index from the blk*.dat files on disk</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Rebuild chain state from the currently indexed blocks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
         <source>Set database cache size in megabytes (%d to %d, default: %d)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4070,7 +4245,12 @@
         <translation>Specify wallet file (within data directory)</translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location line="+13"/>
+        <source>Unable to bind to %s on this computer. %s is probably already running.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
         <source>Unsupported argument -benchmark ignored, use -debug=bench.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4110,22 +4290,22 @@
         <translation>Wallet %s resides outside data directory %s</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Wallet options:</source>
+        <location line="+1"/>
+        <source>Wallet debugging/testing options:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Warning: This version is obsolete; upgrade required!</source>
+        <location line="+1"/>
+        <source>Wallet needed to be rewritten: restart %s to complete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>You need to rebuild the database using -reindex to change -txindex</source>
-        <translation>You need to rebuild the database using -reindex to change -txindex</translation>
+        <location line="+1"/>
+        <source>Wallet options:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-306"/>
+        <location line="-315"/>
         <source>Allow JSON-RPC connections from specified source. Valid for &lt;ip&gt; are a single IP (e.g. 1.2.3.4), a network/netmask (e.g. 1.2.3.4/255.255.255.0) or a network/CIDR (e.g. 1.2.3.4/24). This option can be specified multiple times</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4140,12 +4320,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
-        <source>Cannot obtain a lock on data directory %s. Bitcoin Core is probably already running.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <location line="+6"/>
         <source>Create new files with system default permissions, instead of umask 077 (only effective with disabled wallet functionality)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4170,7 +4345,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
+        <location line="+14"/>
         <source>If paytxfee is not set, include enough fee so transactions begin confirmation on average within n blocks (default: %u)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4180,7 +4355,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+10"/>
         <source>Maximum size of data in data carrier transactions we relay and mine (default: %u)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4200,12 +4375,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
-        <source>Set the number of threads for coin generation if enabled (-1 = all cores, default: %d)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
+        <location line="+14"/>
         <source>The transaction amount is too small to send after the fee has been deducted</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4215,7 +4385,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+44"/>
+        <location line="+47"/>
         <source>Whitelisted peers cannot be DoS banned and their transactions are always relayed, even if they are already in the mempool, useful e.g. for a gateway</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4225,7 +4395,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+7"/>
         <source>(default: %u)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4235,52 +4405,22 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Activating best chain...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Always relay transactions received from whitelisted peers (default: %d)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Attempt to recover private keys from a corrupt wallet.dat on startup</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
+        <location line="+6"/>
         <source>Automatically create Tor hidden service (default: %d)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
-        <source>Cannot resolve -whitebind address: &apos;%s&apos;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <location line="+7"/>
         <source>Connect through SOCKS5 proxy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Copyright (C) 2009-%i The Bitcoin Core Developers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+15"/>
-        <source>Error loading wallet.dat: Wallet requires newer version of Bitcoin Core</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
+        <location line="+21"/>
         <source>Error reading from database, shutting down.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+8"/>
         <source>Imports blocks from external blk000??.dat file on startup</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4290,32 +4430,12 @@
         <translation>Information</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Initialization sanity check failed. Bitcoin Core is shutting down.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Invalid amount for -maxtxfee=&lt;amount&gt;: &apos;%s&apos;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Invalid amount for -minrelaytxfee=&lt;amount&gt;: &apos;%s&apos;</source>
-        <translation>Invalid amount for -minrelaytxfee=&lt;amount&gt;: &apos;%s&apos;</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Invalid amount for -mintxfee=&lt;amount&gt;: &apos;%s&apos;</source>
-        <translation>Invalid amount for -mintxfee=&lt;amount&gt;: &apos;%s&apos;</translation>
-    </message>
-    <message>
-        <location line="+1"/>
+        <location line="+7"/>
         <source>Invalid amount for -paytxfee=&lt;amount&gt;: &apos;%s&apos; (must be at least %s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+1"/>
         <source>Invalid netmask specified in -whitelist: &apos;%s&apos;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4325,7 +4445,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
+        <location line="+14"/>
         <source>Need to specify a port with -whitebind: &apos;%s&apos;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4335,22 +4455,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+11"/>
         <source>RPC server options:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Rebuild block chain index from current blk000??.dat files on startup</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Receive and display P2P network alerts (default: %u)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
+        <location line="+3"/>
         <source>Reducing -maxconnections from %d to %d, because of system limitations.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4390,7 +4500,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+1"/>
         <source>This is experimental software.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4430,7 +4540,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+7"/>
         <source>Upgrade wallet to latest format on startup</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4440,72 +4550,57 @@
         <translation>Username for JSON-RPC connections</translation>
     </message>
     <message>
-        <location line="+4"/>
-        <source>Wallet needed to be rewritten: restart Bitcoin Core to complete</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
+        <location line="+7"/>
         <source>Warning</source>
         <translation>Warning</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Whether to operate in a blocks only mode (default: %u)</source>
+        <location line="+1"/>
+        <source>Warning: unknown new rules activated (versionbit %i)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Zapping all transactions from wallet...</source>
+        <location line="+1"/>
+        <source>Whether to operate in a blocks only mode (default: %u)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>ZeroMQ notification options:</source>
+        <source>Zapping all transactions from wallet...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>wallet.dat corrupt, salvage failed</source>
-        <translation>wallet.dat corrupt, salvage failed</translation>
+        <source>ZeroMQ notification options:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-62"/>
+        <location line="-63"/>
         <source>Password for JSON-RPC connections</source>
         <translation>Password for JSON-RPC connections</translation>
     </message>
     <message>
-        <location line="-205"/>
+        <location line="-216"/>
         <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
         <translation>Execute command when the best block changes (%s in cmd is replaced by block hash)</translation>
     </message>
     <message>
-        <location line="+237"/>
-        <source>This help message</source>
-        <translation>This help message</translation>
-    </message>
-    <message>
-        <location line="-103"/>
+        <location line="+145"/>
         <source>Allow DNS lookups for -addnode, -seednode and -connect</source>
         <translation>Allow DNS lookups for -addnode, -seednode and -connect</translation>
     </message>
     <message>
-        <location line="+59"/>
+        <location line="+56"/>
         <source>Loading addresses...</source>
         <translation>Loading addresses...</translation>
     </message>
     <message>
-        <location line="-30"/>
-        <source>Error loading wallet.dat: Wallet corrupted</source>
-        <translation>Error loading wallet.dat: Wallet corrupted</translation>
-    </message>
-    <message>
-        <location line="-214"/>
+        <location line="-260"/>
         <source>(1 = keep tx meta data e.g. account owner and payment request information, 2 = drop tx meta data)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="+6"/>
         <source>-maxtxfee is set very high! Fees this large could be paid on a single transaction.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4515,22 +4610,17 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+37"/>
         <source>Do not keep transactions in the mempool longer than &lt;n&gt; hours (default: %u)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Error reading wallet.dat! All keys read correctly, but transaction data or address book entries might be missing or incorrect.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+17"/>
+        <location line="+19"/>
         <source>Fees (in %s/kB) smaller than this are considered zero fee for transaction creation (default: %s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="+6"/>
         <source>How thorough the block verification of -checkblocks is (0-4, default: %u)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4540,7 +4630,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+13"/>
         <source>Number of seconds to keep misbehaving peers from reconnecting (default: %u)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4550,12 +4640,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+29"/>
         <source>Support filtering of blocks and transaction with bloom filters (default: %u)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location line="+18"/>
         <source>Total length of network version string (%i) exceeds maximum length (%i). Reduce the number or size of uacomments.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4565,10 +4655,15 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+3"/>
         <source>Unsupported argument -socks found. Setting SOCKS version isn&apos;t possible anymore, only SOCKS5 proxies are supported.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+3"/>
+        <source>Unsupported argument -whitelistalwaysrelay ignored, use -whitelistrelay and/or -whitelistforcerelay.</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location line="+5"/>
         <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: %s)</source>
@@ -4580,27 +4675,27 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+29"/>
-        <source>(default: %s)</source>
+        <location line="+13"/>
+        <source>Warning: Unknown block versions being mined! It&apos;s possible unknown rules are in effect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
-        <source>Always query for peer addresses via DNS lookup (default: %u)</source>
+        <location line="+3"/>
+        <source>Warning: Wallet file corrupt, data salvaged! Original %s saved as %s in %s; if your balance or transactions are incorrect you should restore from a backup.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+27"/>
-        <source>Error loading wallet.dat</source>
-        <translation>Error loading wallet.dat</translation>
+        <location line="+19"/>
+        <source>(default: %s)</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
-        <source>Generate coins (default: %u)</source>
+        <location line="+9"/>
+        <source>Always query for peer addresses via DNS lookup (default: %u)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+37"/>
         <source>How many blocks to check at startup (default: %u, 0 = all)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4615,7 +4710,7 @@
         <translation>Invalid -proxy address: &apos;%s&apos;</translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+7"/>
         <source>Listen for JSON-RPC connections on &lt;port&gt; (default: %u or testnet: %u)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4625,7 +4720,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+6"/>
         <source>Maintain at most &lt;n&gt; connections to peers (default: %u)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4645,12 +4740,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+8"/>
         <source>Prepend debug output with timestamp (default: %u)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="+10"/>
         <source>Relay and mine data carrier transactions (default: %u)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4695,72 +4790,57 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+3"/>
         <source>Threshold for disconnecting misbehaving peers (default: %u)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+10"/>
         <source>Unknown network specified in -onlynet: &apos;%s&apos;</source>
         <translation>Unknown network specified in -onlynet: &apos;%s&apos;</translation>
     </message>
     <message>
-        <location line="-107"/>
-        <source>Cannot resolve -bind address: &apos;%s&apos;</source>
-        <translation>Cannot resolve -bind address: &apos;%s&apos;</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Cannot resolve -externalip address: &apos;%s&apos;</source>
-        <translation>Cannot resolve -externalip address: &apos;%s&apos;</translation>
-    </message>
-    <message>
-        <location line="+45"/>
-        <source>Invalid amount for -paytxfee=&lt;amount&gt;: &apos;%s&apos;</source>
-        <translation>Invalid amount for -paytxfee=&lt;amount&gt;: &apos;%s&apos;</translation>
-    </message>
-    <message>
-        <location line="-7"/>
+        <location line="-71"/>
         <source>Insufficient funds</source>
         <translation>Insufficient funds</translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="+13"/>
         <source>Loading block index...</source>
         <translation>Loading block index...</translation>
     </message>
     <message>
-        <location line="-61"/>
+        <location line="-59"/>
         <source>Add a node to connect to and attempt to keep the connection open</source>
         <translation>Add a node to connect to and attempt to keep the connection open</translation>
     </message>
     <message>
-        <location line="+62"/>
+        <location line="+60"/>
         <source>Loading wallet...</source>
         <translation>Loading wallet...</translation>
     </message>
     <message>
-        <location line="-55"/>
+        <location line="-53"/>
         <source>Cannot downgrade wallet</source>
         <translation>Cannot downgrade wallet</translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+2"/>
         <source>Cannot write default address</source>
         <translation>Cannot write default address</translation>
     </message>
     <message>
-        <location line="+73"/>
+        <location line="+77"/>
         <source>Rescanning...</source>
         <translation>Rescanning...</translation>
     </message>
     <message>
-        <location line="-63"/>
+        <location line="-66"/>
         <source>Done loading</source>
         <translation>Done loading</translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location line="+14"/>
         <source>Error</source>
         <translation>Error</translation>
     </message>

From 2e494489c35499dbe7891d4c07b4c35b178341d1 Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Thu, 17 Mar 2016 12:49:16 +0100
Subject: [PATCH 0414/1802] tor: Change auth order to only use HASHEDPASSWORD
 if -torpassword

Change authentication order to make it more clear (see #7700).

- If the `-torpassword` option is provided, force use of
  `HASHEDPASSWORD` auth.

- Give error message if `-torpassword` provided, but
  `HASHEDPASSWORD` auth is not available.

- Give error message if only `HASHEDPASSWORD` available, but
  `-torpassword` not given.
---
 src/torcontrol.cpp | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/torcontrol.cpp b/src/torcontrol.cpp
index 1c7bc2dbeee6b..6fabe54afeb90 100644
--- a/src/torcontrol.cpp
+++ b/src/torcontrol.cpp
@@ -574,7 +574,15 @@ void TorController::protocolinfo_cb(TorControlConnection& conn, const TorControl
          *   password: "password"
          */
         std::string torpassword = GetArg("-torpassword", "");
-        if (methods.count("NULL")) {
+        if (!torpassword.empty()) {
+            if (methods.count("HASHEDPASSWORD")) {
+                LogPrint("tor", "tor: Using HASHEDPASSWORD authentication\n");
+                boost::replace_all(torpassword, "\"", "\\\"");
+                conn.Command("AUTHENTICATE \"" + torpassword + "\"", boost::bind(&TorController::auth_cb, this, _1, _2));
+            } else {
+                LogPrintf("tor: Password provided with -torpassword, but HASHEDPASSWORD authentication is not available\n");
+            }
+        } else if (methods.count("NULL")) {
             LogPrint("tor", "tor: Using NULL authentication\n");
             conn.Command("AUTHENTICATE", boost::bind(&TorController::auth_cb, this, _1, _2));
         } else if (methods.count("SAFECOOKIE")) {
@@ -595,13 +603,7 @@ void TorController::protocolinfo_cb(TorControlConnection& conn, const TorControl
                 }
             }
         } else if (methods.count("HASHEDPASSWORD")) {
-            if (!torpassword.empty()) {
-                LogPrint("tor", "tor: Using HASHEDPASSWORD authentication\n");
-                boost::replace_all(torpassword, "\"", "\\\"");
-                conn.Command("AUTHENTICATE \"" + torpassword + "\"", boost::bind(&TorController::auth_cb, this, _1, _2));
-            } else {
-                LogPrintf("tor: Password authentication required, but no password provided with -torpassword\n");
-            }
+            LogPrintf("tor: The only supported authentication mechanism left is password, but no password provided with -torpassword\n");
         } else {
             LogPrintf("tor: No supported authentication method\n");
         }

From 152ab236ea1c1106340196f45918fd84f57a0b63 Mon Sep 17 00:00:00 2001
From: Patrick Strateman <patrick.strateman@gmail.com>
Date: Thu, 2 Jun 2016 23:16:42 -0700
Subject: [PATCH 0415/1802] Improve CWallet API  with new GetAccountPubkey
 function.

Remove one more caller that is passing CWalletDB.
---
 src/wallet/rpcwallet.cpp | 34 ++++------------------------------
 src/wallet/wallet.cpp    | 38 ++++++++++++++++++++++++++++++++++++++
 src/wallet/wallet.h      |  1 +
 3 files changed, 43 insertions(+), 30 deletions(-)

diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index 42b37ea7784f0..5e6afcd7cb124 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -146,38 +146,12 @@ UniValue getnewaddress(const UniValue& params, bool fHelp)
 
 CBitcoinAddress GetAccountAddress(string strAccount, bool bForceNew=false)
 {
-    CWalletDB walletdb(pwalletMain->strWalletFile);
-
-    CAccount account;
-    walletdb.ReadAccount(strAccount, account);
-
-    if (!bForceNew) {
-        if (!account.vchPubKey.IsValid())
-            bForceNew = true;
-        else {
-            // Check if the current key has been used
-            CScript scriptPubKey = GetScriptForDestination(account.vchPubKey.GetID());
-            for (map<uint256, CWalletTx>::iterator it = pwalletMain->mapWallet.begin();
-                 it != pwalletMain->mapWallet.end() && account.vchPubKey.IsValid();
-                 ++it)
-                BOOST_FOREACH(const CTxOut& txout, (*it).second.vout)
-                    if (txout.scriptPubKey == scriptPubKey) {
-                        bForceNew = true;
-                        break;
-                    }
-        }
-    }
-
-    // Generate a new key
-    if (bForceNew) {
-        if (!pwalletMain->GetKeyFromPool(account.vchPubKey))
-            throw JSONRPCError(RPC_WALLET_KEYPOOL_RAN_OUT, "Error: Keypool ran out, please call keypoolrefill first");
-
-        pwalletMain->SetAddressBook(account.vchPubKey.GetID(), strAccount, "receive");
-        walletdb.WriteAccount(strAccount, account);
+    CPubKey pubKey;
+    if (!pwalletMain->GetAccountPubkey(pubKey, strAccount, bForceNew)) {
+        throw JSONRPCError(RPC_WALLET_KEYPOOL_RAN_OUT, "Error: Keypool ran out, please call keypoolrefill first");
     }
 
-    return CBitcoinAddress(account.vchPubKey.GetID());
+    return CBitcoinAddress(pubKey.GetID());
 }
 
 UniValue getaccountaddress(const UniValue& params, bool fHelp)
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index fb56e7c1db7a0..f3d165472aec2 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -640,6 +640,44 @@ bool CWallet::AccountMove(std::string strFrom, std::string strTo, CAmount nAmoun
     return true;
 }
 
+bool CWallet::GetAccountPubkey(CPubKey &pubKey, std::string strAccount, bool bForceNew)
+{
+    CWalletDB walletdb(strWalletFile);
+
+    CAccount account;
+    walletdb.ReadAccount(strAccount, account);
+
+    if (!bForceNew) {
+        if (!account.vchPubKey.IsValid())
+            bForceNew = true;
+        else {
+            // Check if the current key has been used
+            CScript scriptPubKey = GetScriptForDestination(account.vchPubKey.GetID());
+            for (map<uint256, CWalletTx>::iterator it = mapWallet.begin();
+                 it != mapWallet.end() && account.vchPubKey.IsValid();
+                 ++it)
+                BOOST_FOREACH(const CTxOut& txout, (*it).second.vout)
+                    if (txout.scriptPubKey == scriptPubKey) {
+                        bForceNew = true;
+                        break;
+                    }
+        }
+    }
+
+    // Generate a new key
+    if (bForceNew) {
+        if (!GetKeyFromPool(account.vchPubKey))
+            return false;
+
+        SetAddressBook(account.vchPubKey.GetID(), strAccount, "receive");
+        walletdb.WriteAccount(strAccount, account);
+    }
+
+    pubKey = account.vchPubKey;
+
+    return true;
+}
+
 void CWallet::MarkDirty()
 {
     {
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
index 3077bf461f809..683c901444c1b 100644
--- a/src/wallet/wallet.h
+++ b/src/wallet/wallet.h
@@ -719,6 +719,7 @@ class CWallet : public CCryptoKeyStore, public CValidationInterface
      */
     int64_t IncOrderPosNext(CWalletDB *pwalletdb = NULL);
     bool AccountMove(std::string strFrom, std::string strTo, CAmount nAmount, std::string strComment = "");
+    bool GetAccountPubkey(CPubKey &pubKey, std::string strAccount, bool bForceNew = false);
 
     void MarkDirty();
     bool AddToWallet(const CWalletTx& wtxIn, bool fFromLoadWallet, CWalletDB* pwalletdb);

From d3df40e51a29bd98830043dd19829126390d1bc4 Mon Sep 17 00:00:00 2001
From: Luke Dashjr <luke-jr+git@utopios.org>
Date: Sat, 23 Apr 2016 23:30:20 +0000
Subject: [PATCH 0416/1802] Implement BIP 9 GBT changes

- BIP9DeploymentInfo struct for static deployment info
- VersionBitsDeploymentInfo: Avoid C++11ism by commenting parameter names
- getblocktemplate: Make sure to set deployments in the version if it is LOCKED_IN
- In this commit, all rules are considered required for clients to support
---
 src/consensus/params.h |  1 +
 src/main.cpp           |  2 +-
 src/main.h             |  2 ++
 src/rpc/mining.cpp     | 50 ++++++++++++++++++++++++++++++++++++++++--
 src/versionbits.cpp    | 11 ++++++++++
 src/versionbits.h      |  7 ++++++
 6 files changed, 70 insertions(+), 3 deletions(-)

diff --git a/src/consensus/params.h b/src/consensus/params.h
index 4f3480b89ba69..6c4cc49479ba1 100644
--- a/src/consensus/params.h
+++ b/src/consensus/params.h
@@ -16,6 +16,7 @@ enum DeploymentPos
 {
     DEPLOYMENT_TESTDUMMY,
     DEPLOYMENT_CSV, // Deployment of BIP68, BIP112, and BIP113.
+    // NOTE: Also add new deployments to VersionBitsDeploymentInfo in versionbits.cpp
     MAX_VERSION_BITS_DEPLOYMENTS
 };
 
diff --git a/src/main.cpp b/src/main.cpp
index f74cb30574ce3..623d77985ca87 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -2122,7 +2122,7 @@ void PartitionCheck(bool (*initialDownloadCheck)(), CCriticalSection& cs, const
 }
 
 // Protected by cs_main
-static VersionBitsCache versionbitscache;
+VersionBitsCache versionbitscache;
 
 int32_t ComputeBlockVersion(const CBlockIndex* pindexPrev, const Consensus::Params& params)
 {
diff --git a/src/main.h b/src/main.h
index 6936b5379ae4b..404a787e4dce5 100644
--- a/src/main.h
+++ b/src/main.h
@@ -551,6 +551,8 @@ extern CBlockTreeDB *pblocktree;
  */
 int GetSpendHeight(const CCoinsViewCache& inputs);
 
+extern VersionBitsCache versionbitscache;
+
 /**
  * Determine what nVersion a new block should use.
  */
diff --git a/src/rpc/mining.cpp b/src/rpc/mining.cpp
index c33082fca0c04..277696fe0b561 100644
--- a/src/rpc/mining.cpp
+++ b/src/rpc/mining.cpp
@@ -7,6 +7,7 @@
 #include "chain.h"
 #include "chainparams.h"
 #include "consensus/consensus.h"
+#include "consensus/params.h"
 #include "consensus/validation.h"
 #include "core_io.h"
 #include "init.h"
@@ -260,6 +261,13 @@ static UniValue BIP22ValidationResult(const CValidationState& state)
     return "valid?";
 }
 
+std::string gbt_vb_name(const Consensus::DeploymentPos pos) {
+    const struct BIP9DeploymentInfo& vbinfo = VersionBitsDeploymentInfo[pos];
+    std::string s = vbinfo.name;
+    s.insert(s.begin(), '!');
+    return s;
+}
+
 UniValue getblocktemplate(const UniValue& params, bool fHelp)
 {
     if (fHelp || params.size() > 1)
@@ -267,7 +275,9 @@ UniValue getblocktemplate(const UniValue& params, bool fHelp)
             "getblocktemplate ( \"jsonrequestobject\" )\n"
             "\nIf the request parameters include a 'mode' key, that is used to explicitly select between the default 'template' request or a 'proposal'.\n"
             "It returns data needed to construct a block to work on.\n"
-            "See https://en.bitcoin.it/wiki/BIP_0022 for full specification.\n"
+            "For full specification, see BIPs 22 and 9:\n"
+            "    https://github.com/bitcoin/bips/blob/master/bip-0022.mediawiki\n"
+            "    https://github.com/bitcoin/bips/blob/master/bip-0009.mediawiki#getblocktemplate_changes\n"
 
             "\nArguments:\n"
             "1. \"jsonrequestobject\"       (string, optional) A json object in the following spec\n"
@@ -283,6 +293,12 @@ UniValue getblocktemplate(const UniValue& params, bool fHelp)
             "\nResult:\n"
             "{\n"
             "  \"version\" : n,                    (numeric) The block version\n"
+            "  \"rules\" : [ \"rulename\", ... ],    (array of strings) specific block rules that are to be enforced\n"
+            "  \"vbavailable\" : {                 (json object) set of pending, supported versionbit (BIP 9) softfork deployments\n"
+            "      \"rulename\" : bitnumber        (numeric) identifies the bit number as indicating acceptance and readiness for the named softfork rule\n"
+            "      ,...\n"
+            "  },\n"
+            "  \"vbrequired\" : n,                 (numeric) bit mask of versionbits the server requires set in submissions\n"
             "  \"previousblockhash\" : \"xxxx\",    (string) The hash of current highest block\n"
             "  \"transactions\" : [                (array) contents of non-coinbase transactions that should be included in the next block\n"
             "      {\n"
@@ -458,9 +474,10 @@ UniValue getblocktemplate(const UniValue& params, bool fHelp)
         pindexPrev = pindexPrevNew;
     }
     CBlock* pblock = &pblocktemplate->block; // pointer for convenience
+    const Consensus::Params& consensusParams = Params().GetConsensus();
 
     // Update nTime
-    UpdateTime(pblock, Params().GetConsensus(), pindexPrev);
+    UpdateTime(pblock, consensusParams, pindexPrev);
     pblock->nNonce = 0;
 
     UniValue aCaps(UniValue::VARR); aCaps.push_back("proposal");
@@ -511,7 +528,36 @@ UniValue getblocktemplate(const UniValue& params, bool fHelp)
 
     UniValue result(UniValue::VOBJ);
     result.push_back(Pair("capabilities", aCaps));
+
+    UniValue aRules(UniValue::VARR);
+    UniValue vbavailable(UniValue::VOBJ);
+    for (int i = 0; i < (int)Consensus::MAX_VERSION_BITS_DEPLOYMENTS; ++i) {
+        Consensus::DeploymentPos pos = Consensus::DeploymentPos(i);
+        ThresholdState state = VersionBitsState(pindexPrev, consensusParams, pos, versionbitscache);
+        switch (state) {
+            case THRESHOLD_DEFINED:
+            case THRESHOLD_FAILED:
+                // Not exposed to GBT at all
+                break;
+            case THRESHOLD_LOCKED_IN:
+                // Ensure bit is set in block version
+                pblock->nVersion |= VersionBitsMask(consensusParams, pos);
+                // FALL THROUGH to get vbavailable set...
+            case THRESHOLD_STARTED:
+                // Add to vbavailable (and it's presumably in version already)
+                vbavailable.push_back(Pair(gbt_vb_name(pos), consensusParams.vDeployments[pos].bit));
+                break;
+            case THRESHOLD_ACTIVE:
+                // Add to rules only
+                aRules.push_back(gbt_vb_name(pos));
+                break;
+        }
+    }
     result.push_back(Pair("version", pblock->nVersion));
+    result.push_back(Pair("rules", aRules));
+    result.push_back(Pair("vbavailable", vbavailable));
+    result.push_back(Pair("vbrequired", int(0)));
+
     result.push_back(Pair("previousblockhash", pblock->hashPrevBlock.GetHex()));
     result.push_back(Pair("transactions", transactions));
     result.push_back(Pair("coinbaseaux", aux));
diff --git a/src/versionbits.cpp b/src/versionbits.cpp
index fbb60c0fc598e..041ca2adbcafc 100644
--- a/src/versionbits.cpp
+++ b/src/versionbits.cpp
@@ -4,6 +4,17 @@
 
 #include "versionbits.h"
 
+#include "consensus/params.h"
+
+const struct BIP9DeploymentInfo VersionBitsDeploymentInfo[Consensus::MAX_VERSION_BITS_DEPLOYMENTS] = {
+    {
+        /*.name =*/ "testdummy",
+    },
+    {
+        /*.name =*/ "csv",
+    }
+};
+
 ThresholdState AbstractThresholdConditionChecker::GetStateFor(const CBlockIndex* pindexPrev, const Consensus::Params& params, ThresholdConditionCache& cache) const
 {
     int nPeriod = Period(params);
diff --git a/src/versionbits.h b/src/versionbits.h
index 04f4738272796..d80594202884b 100644
--- a/src/versionbits.h
+++ b/src/versionbits.h
@@ -30,6 +30,13 @@ enum ThresholdState {
 // will either be NULL or a block with (height + 1) % Period() == 0.
 typedef std::map<const CBlockIndex*, ThresholdState> ThresholdConditionCache;
 
+struct BIP9DeploymentInfo {
+    /** Deployment name */
+    const char *name;
+};
+
+extern const struct BIP9DeploymentInfo VersionBitsDeploymentInfo[];
+
 /**
  * Abstract class that implements BIP9-style threshold logic, and caches results.
  */

From 72cd6b20cae3d1eda2f917f1608a8ae7f1e606f7 Mon Sep 17 00:00:00 2001
From: Luke Dashjr <luke-jr+git@utopios.org>
Date: Sat, 21 May 2016 08:39:34 +0000
Subject: [PATCH 0417/1802] qa/rpc-tests: bip9-softforks: Add tests for
 getblocktemplate versionbits updates

---
 qa/rpc-tests/bip9-softforks.py | 32 ++++++++++++++++++++++++++++----
 1 file changed, 28 insertions(+), 4 deletions(-)

diff --git a/qa/rpc-tests/bip9-softforks.py b/qa/rpc-tests/bip9-softforks.py
index cbb1b7d4cee89..1b1f5dd0dcce4 100755
--- a/qa/rpc-tests/bip9-softforks.py
+++ b/qa/rpc-tests/bip9-softforks.py
@@ -85,7 +85,7 @@ def get_bip9_status(self, key):
         raise IndexError ('key:"%s" not found' % key)
 
 
-    def test_BIP(self, bipName, activated_version, invalidate, invalidatePostSignature):
+    def test_BIP(self, bipName, activated_version, invalidate, invalidatePostSignature, bitno):
         # generate some coins for later
         self.coinbase_blocks = self.nodes[0].generate(2)
         self.height = 3  # height of the next block to build
@@ -94,6 +94,11 @@ def test_BIP(self, bipName, activated_version, invalidate, invalidatePostSignatu
         self.last_block_time = time.time()
 
         assert_equal(self.get_bip9_status(bipName)['status'], 'defined')
+        tmpl = self.nodes[0].getblocktemplate({})
+        assert(bipName not in tmpl['rules'])
+        assert(bipName not in tmpl['vbavailable'])
+        assert_equal(tmpl['vbrequired'], 0)
+        assert_equal(tmpl['version'], 0x20000000)
 
         # Test 1
         # Advance from DEFINED to STARTED
@@ -101,6 +106,11 @@ def test_BIP(self, bipName, activated_version, invalidate, invalidatePostSignatu
         yield TestInstance(test_blocks, sync_every_block=False)
 
         assert_equal(self.get_bip9_status(bipName)['status'], 'started')
+        tmpl = self.nodes[0].getblocktemplate({})
+        assert(bipName not in tmpl['rules'])
+        assert_equal(tmpl['vbavailable'][bipName], bitno)
+        assert_equal(tmpl['vbrequired'], 0)
+        assert(tmpl['version'] & activated_version)
 
         # Test 2
         # Fail to achieve LOCKED_IN 100 out of 144 signal bit 1
@@ -112,6 +122,11 @@ def test_BIP(self, bipName, activated_version, invalidate, invalidatePostSignatu
         yield TestInstance(test_blocks, sync_every_block=False)
 
         assert_equal(self.get_bip9_status(bipName)['status'], 'started')
+        tmpl = self.nodes[0].getblocktemplate({})
+        assert(bipName not in tmpl['rules'])
+        assert_equal(tmpl['vbavailable'][bipName], bitno)
+        assert_equal(tmpl['vbrequired'], 0)
+        assert(tmpl['version'] & activated_version)
 
         # Test 3
         # 108 out of 144 signal bit 1 to achieve LOCKED_IN
@@ -123,6 +138,8 @@ def test_BIP(self, bipName, activated_version, invalidate, invalidatePostSignatu
         yield TestInstance(test_blocks, sync_every_block=False)
 
         assert_equal(self.get_bip9_status(bipName)['status'], 'locked_in')
+        tmpl = self.nodes[0].getblocktemplate({})
+        assert(bipName not in tmpl['rules'])
 
         # Test 4
         # 143 more version 536870913 blocks (waiting period-1)
@@ -130,6 +147,8 @@ def test_BIP(self, bipName, activated_version, invalidate, invalidatePostSignatu
         yield TestInstance(test_blocks, sync_every_block=False)
 
         assert_equal(self.get_bip9_status(bipName)['status'], 'locked_in')
+        tmpl = self.nodes[0].getblocktemplate({})
+        assert(bipName not in tmpl['rules'])
 
         # Test 5
         # Check that the new rule is enforced
@@ -153,6 +172,11 @@ def test_BIP(self, bipName, activated_version, invalidate, invalidatePostSignatu
         yield TestInstance([[block, True]])
 
         assert_equal(self.get_bip9_status(bipName)['status'], 'active')
+        tmpl = self.nodes[0].getblocktemplate({})
+        assert(bipName in tmpl['rules'])
+        assert(bipName not in tmpl['vbavailable'])
+        assert_equal(tmpl['vbrequired'], 0)
+        assert(not (tmpl['version'] & (1 << bitno)))
 
         # Test 6
         # Check that the new sequence lock rules are enforced
@@ -187,9 +211,9 @@ def test_BIP(self, bipName, activated_version, invalidate, invalidatePostSignatu
 
     def get_tests(self):
         for test in itertools.chain(
-                self.test_BIP('csv', 536870913, self.sequence_lock_invalidate, self.donothing),
-                self.test_BIP('csv', 536870913, self.mtp_invalidate, self.donothing),
-                self.test_BIP('csv', 536870913, self.donothing, self.csv_invalidate)
+                self.test_BIP('csv', 0x20000001, self.sequence_lock_invalidate, self.donothing, 0),
+                self.test_BIP('csv', 0x20000001, self.mtp_invalidate, self.donothing, 0),
+                self.test_BIP('csv', 0x20000001, self.donothing, self.csv_invalidate, 0)
         ):
             yield test
 

From 98790608a43e60b8025346034d28ff1f58cebab0 Mon Sep 17 00:00:00 2001
From: Luke Dashjr <luke-jr+git@utopios.org>
Date: Wed, 1 Jun 2016 16:47:36 +0000
Subject: [PATCH 0418/1802] getblocktemplate: Explicitly handle the distinction
 between GBT-affecting softforks vs not

---
 src/rpc/mining.cpp  | 32 ++++++++++++++++++++++++++++++--
 src/versionbits.cpp |  2 ++
 src/versionbits.h   |  2 ++
 3 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/src/rpc/mining.cpp b/src/rpc/mining.cpp
index 277696fe0b561..9558b4c20ef8f 100644
--- a/src/rpc/mining.cpp
+++ b/src/rpc/mining.cpp
@@ -264,7 +264,9 @@ static UniValue BIP22ValidationResult(const CValidationState& state)
 std::string gbt_vb_name(const Consensus::DeploymentPos pos) {
     const struct BIP9DeploymentInfo& vbinfo = VersionBitsDeploymentInfo[pos];
     std::string s = vbinfo.name;
-    s.insert(s.begin(), '!');
+    if (!vbinfo.gbt_force) {
+        s.insert(s.begin(), '!');
+    }
     return s;
 }
 
@@ -342,6 +344,7 @@ UniValue getblocktemplate(const UniValue& params, bool fHelp)
 
     std::string strMode = "template";
     UniValue lpval = NullUniValue;
+    std::set<std::string> setClientRules;
     if (params.size() > 0)
     {
         const UniValue& oparam = params[0].get_obj();
@@ -385,6 +388,14 @@ UniValue getblocktemplate(const UniValue& params, bool fHelp)
             TestBlockValidity(state, Params(), block, pindexPrev, false, true);
             return BIP22ValidationResult(state);
         }
+
+        const UniValue& aClientRules = find_value(oparam, "rules");
+        if (aClientRules.isArray()) {
+            for (unsigned int i = 0; i < aClientRules.size(); ++i) {
+                const UniValue& v = aClientRules[i];
+                setClientRules.insert(v.get_str());
+            }
+        }
     }
 
     if (strMode != "template")
@@ -544,13 +555,30 @@ UniValue getblocktemplate(const UniValue& params, bool fHelp)
                 pblock->nVersion |= VersionBitsMask(consensusParams, pos);
                 // FALL THROUGH to get vbavailable set...
             case THRESHOLD_STARTED:
-                // Add to vbavailable (and it's presumably in version already)
+            {
+                const struct BIP9DeploymentInfo& vbinfo = VersionBitsDeploymentInfo[pos];
                 vbavailable.push_back(Pair(gbt_vb_name(pos), consensusParams.vDeployments[pos].bit));
+                if (setClientRules.find(vbinfo.name) == setClientRules.end()) {
+                    if (!vbinfo.gbt_force) {
+                        // If the client doesn't support this, don't indicate it in the [default] version
+                        pblock->nVersion &= ~VersionBitsMask(consensusParams, pos);
+                    }
+                }
                 break;
+            }
             case THRESHOLD_ACTIVE:
+            {
                 // Add to rules only
+                const struct BIP9DeploymentInfo& vbinfo = VersionBitsDeploymentInfo[pos];
                 aRules.push_back(gbt_vb_name(pos));
+                if (setClientRules.find(vbinfo.name) == setClientRules.end()) {
+                    // Not supported by the client; make sure it's safe to proceed
+                    if (!vbinfo.gbt_force) {
+                        throw JSONRPCError(RPC_INVALID_PARAMETER, strprintf("Support for '%s' rule requires explicit client support", vbinfo.name));
+                    }
+                }
                 break;
+            }
         }
     }
     result.push_back(Pair("version", pblock->nVersion));
diff --git a/src/versionbits.cpp b/src/versionbits.cpp
index 041ca2adbcafc..c06c9907be944 100644
--- a/src/versionbits.cpp
+++ b/src/versionbits.cpp
@@ -9,9 +9,11 @@
 const struct BIP9DeploymentInfo VersionBitsDeploymentInfo[Consensus::MAX_VERSION_BITS_DEPLOYMENTS] = {
     {
         /*.name =*/ "testdummy",
+        /*.gbt_force =*/ true,
     },
     {
         /*.name =*/ "csv",
+        /*.gbt_force =*/ true,
     }
 };
 
diff --git a/src/versionbits.h b/src/versionbits.h
index d80594202884b..ede2dcdda8a7a 100644
--- a/src/versionbits.h
+++ b/src/versionbits.h
@@ -33,6 +33,8 @@ typedef std::map<const CBlockIndex*, ThresholdState> ThresholdConditionCache;
 struct BIP9DeploymentInfo {
     /** Deployment name */
     const char *name;
+    /** Whether GBT clients can safely ignore this rule in simplified usage */
+    bool gbt_force;
 };
 
 extern const struct BIP9DeploymentInfo VersionBitsDeploymentInfo[];

From 12c708a4b3a799478fbb3f93fda696706177a824 Mon Sep 17 00:00:00 2001
From: Luke Dashjr <luke-jr+git@utopios.org>
Date: Wed, 1 Jun 2016 16:51:54 +0000
Subject: [PATCH 0419/1802] getblocktemplate: Use version/force mutation to
 support pre-BIP9 clients

---
 src/rpc/mining.cpp | 27 ++++++++++++++++++++-------
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/src/rpc/mining.cpp b/src/rpc/mining.cpp
index 9558b4c20ef8f..5a06d15c53f78 100644
--- a/src/rpc/mining.cpp
+++ b/src/rpc/mining.cpp
@@ -345,6 +345,7 @@ UniValue getblocktemplate(const UniValue& params, bool fHelp)
     std::string strMode = "template";
     UniValue lpval = NullUniValue;
     std::set<std::string> setClientRules;
+    int64_t nMaxVersionPreVB = -1;
     if (params.size() > 0)
     {
         const UniValue& oparam = params[0].get_obj();
@@ -395,6 +396,12 @@ UniValue getblocktemplate(const UniValue& params, bool fHelp)
                 const UniValue& v = aClientRules[i];
                 setClientRules.insert(v.get_str());
             }
+        } else {
+            // NOTE: It is important that this NOT be read if versionbits is supported
+            const UniValue& uvMaxVersion = find_value(oparam, "maxversion");
+            if (uvMaxVersion.isNum()) {
+                nMaxVersionPreVB = uvMaxVersion.get_int64();
+            }
         }
     }
 
@@ -529,13 +536,10 @@ UniValue getblocktemplate(const UniValue& params, bool fHelp)
 
     arith_uint256 hashTarget = arith_uint256().SetCompact(pblock->nBits);
 
-    static UniValue aMutable(UniValue::VARR);
-    if (aMutable.empty())
-    {
-        aMutable.push_back("time");
-        aMutable.push_back("transactions");
-        aMutable.push_back("prevblock");
-    }
+    UniValue aMutable(UniValue::VARR);
+    aMutable.push_back("time");
+    aMutable.push_back("transactions");
+    aMutable.push_back("prevblock");
 
     UniValue result(UniValue::VOBJ);
     result.push_back(Pair("capabilities", aCaps));
@@ -574,6 +578,7 @@ UniValue getblocktemplate(const UniValue& params, bool fHelp)
                 if (setClientRules.find(vbinfo.name) == setClientRules.end()) {
                     // Not supported by the client; make sure it's safe to proceed
                     if (!vbinfo.gbt_force) {
+                        // If we do anything other than throw an exception here, be sure version/force isn't sent to old clients
                         throw JSONRPCError(RPC_INVALID_PARAMETER, strprintf("Support for '%s' rule requires explicit client support", vbinfo.name));
                     }
                 }
@@ -586,6 +591,14 @@ UniValue getblocktemplate(const UniValue& params, bool fHelp)
     result.push_back(Pair("vbavailable", vbavailable));
     result.push_back(Pair("vbrequired", int(0)));
 
+    if (nMaxVersionPreVB >= 2) {
+        // If VB is supported by the client, nMaxVersionPreVB is -1, so we won't get here
+        // Because BIP 34 changed how the generation transaction is serialised, we can only use version/force back to v2 blocks
+        // This is safe to do [otherwise-]unconditionally only because we are throwing an exception above if a non-force deployment gets activated
+        // Note that this can probably also be removed entirely after the first BIP9 non-force deployment (ie, probably segwit) gets activated
+        aMutable.push_back("version/force");
+    }
+
     result.push_back(Pair("previousblockhash", pblock->hashPrevBlock.GetHex()));
     result.push_back(Pair("transactions", transactions));
     result.push_back(Pair("coinbaseaux", aux));

From faf82e8fc819b2f1f8b60983ac72cb111c47e8ba Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Fri, 3 Jun 2016 19:07:08 +0200
Subject: [PATCH 0420/1802] [rpc] fundrawtransaction: Fix help text and
 interface

---
 qa/rpc-tests/fundrawtransaction.py | 2 +-
 src/wallet/rpcwallet.cpp           | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/qa/rpc-tests/fundrawtransaction.py b/qa/rpc-tests/fundrawtransaction.py
index 5c11d3ab18162..3040752dcb470 100755
--- a/qa/rpc-tests/fundrawtransaction.py
+++ b/qa/rpc-tests/fundrawtransaction.py
@@ -681,7 +681,7 @@ def run_test(self):
         inputs = []
         outputs = {self.nodes[2].getnewaddress() : 1}
         rawtx = self.nodes[3].createrawtransaction(inputs, outputs)
-        result = self.nodes[3].fundrawtransaction(rawtx, )
+        result = self.nodes[3].fundrawtransaction(rawtx) # 1000 sat via settxfee
         result2 = self.nodes[3].fundrawtransaction(rawtx, {"feeRate": 2000})
         result3 = self.nodes[3].fundrawtransaction(rawtx, {"feeRate": 10000})
         assert_equal(result['fee']*2, result2['fee'])
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index 5e6afcd7cb124..68895ac526577 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -2369,13 +2369,13 @@ UniValue fundrawtransaction(const UniValue& params, bool fHelp)
                             "     \"changePosition\"    (numeric, optional, default random) The index of the change output\n"
                             "     \"includeWatching\"   (boolean, optional, default false) Also select inputs which are watch only\n"
                             "     \"lockUnspents\"      (boolean, optional, default false) Lock selected unspent outputs\n"
-                            "     \"feeRate\"           (numeric, optional, default 0=estimate) Set a specific feerate (fee per KB)\n"
+                            "     \"feeRate\"           (numeric, optional, default not set: makes wallet determine the fee) Set a specific feerate (satoshis per KB)\n"
                             "   }\n"
                             "                         for backward compatibility: passing in a true instead of an object will result in {\"includeWatching\":true}\n"
                             "\nResult:\n"
                             "{\n"
                             "  \"hex\":       \"value\", (string)  The resulting raw transaction (hex-encoded string)\n"
-                            "  \"fee\":       n,         (numeric) Fee the resulting transaction pays\n"
+                            "  \"fee\":       n,         (numeric) Fee in " + CURRENCY_UNIT + " the resulting transaction pays\n"
                             "  \"changepos\": n          (numeric) The position of the added change output, or -1\n"
                             "}\n"
                             "\"hex\"             \n"

From d3d02d51453943bfe3a9edb944eb48f9f1e01aca Mon Sep 17 00:00:00 2001
From: Kaz Wesley <keziahw@gmail.com>
Date: Mon, 6 Jun 2016 14:42:34 -0700
Subject: [PATCH 0421/1802] drop vAddrToSend after sending big addr message

We send a newly-accepted peer a 1000-entry addr message, and then only use
vAddrToSend for small messages. Deallocate vAddrToSend after it's been used for
the big message to save about 40 kB per connected inbound peer.
---
 src/main.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/main.cpp b/src/main.cpp
index fc8e72a7dbc98..5fff4187ace62 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -5713,6 +5713,9 @@ bool SendMessages(CNode* pto)
             pto->vAddrToSend.clear();
             if (!vAddr.empty())
                 pto->PushMessage(NetMsgType::ADDR, vAddr);
+            // we only send the big addr message once
+            if (pto->vAddrToSend.capacity() > 40)
+                pto->vAddrToSend.shrink_to_fit();
         }
 
         CNodeState &state = *State(pto->GetId());

From fa51a1d2b73580e240a4750144ceb14022deeae2 Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Mon, 6 Jun 2016 17:20:58 +0200
Subject: [PATCH 0422/1802] [init] Make feefilter option debug option

---
 src/init.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/init.cpp b/src/init.cpp
index 9a22501859428..3a260d16db5a2 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -319,7 +319,8 @@ std::string HelpMessage(HelpMessageMode mode)
     }
     strUsage += HelpMessageOpt("-datadir=<dir>", _("Specify data directory"));
     strUsage += HelpMessageOpt("-dbcache=<n>", strprintf(_("Set database cache size in megabytes (%d to %d, default: %d)"), nMinDbCache, nMaxDbCache, nDefaultDbCache));
-    strUsage += HelpMessageOpt("-feefilter", strprintf(_("Tell other nodes to filter invs to us by our mempool min fee (default: %u)"), DEFAULT_FEEFILTER));
+    if (showDebug)
+        strUsage += HelpMessageOpt("-feefilter", strprintf("Tell other nodes to filter invs to us by our mempool min fee (default: %u)", DEFAULT_FEEFILTER));
     strUsage += HelpMessageOpt("-loadblock=<file>", _("Imports blocks from external blk000??.dat file on startup"));
     strUsage += HelpMessageOpt("-maxorphantx=<n>", strprintf(_("Keep at most <n> unconnectable transactions in memory (default: %u)"), DEFAULT_MAX_ORPHAN_TRANSACTIONS));
     strUsage += HelpMessageOpt("-maxmempool=<n>", strprintf(_("Keep the transaction memory pool below <n> megabytes (default: %u)"), DEFAULT_MAX_MEMPOOL_SIZE));

From 8b78486d02ed3c1c217d79ebca78a70d73e0d570 Mon Sep 17 00:00:00 2001
From: Jonas Schnelli <dev@jonasschnelli.ch>
Date: Thu, 2 Jun 2016 13:52:09 +0200
Subject: [PATCH 0423/1802] Log/report in 10% steps during VerifyDB

---
 src/main.cpp | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/main.cpp b/src/main.cpp
index 162c8b986caec..a712698210df8 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -3873,10 +3873,18 @@ bool CVerifyDB::VerifyDB(const CChainParams& chainparams, CCoinsView *coinsview,
     CBlockIndex* pindexFailure = NULL;
     int nGoodTransactions = 0;
     CValidationState state;
+    int reportDone = 0;
+    LogPrintf("[0%]...");
     for (CBlockIndex* pindex = chainActive.Tip(); pindex && pindex->pprev; pindex = pindex->pprev)
     {
         boost::this_thread::interruption_point();
-        uiInterface.ShowProgress(_("Verifying blocks..."), std::max(1, std::min(99, (int)(((double)(chainActive.Height() - pindex->nHeight)) / (double)nCheckDepth * (nCheckLevel >= 4 ? 50 : 100)))));
+        int percentageDone = std::max(1, std::min(99, (int)(((double)(chainActive.Height() - pindex->nHeight)) / (double)nCheckDepth * (nCheckLevel >= 4 ? 50 : 100))));
+        if (reportDone < percentageDone/10) {
+            // report every 10% step
+            LogPrintf("[%d%%]...", percentageDone);
+            reportDone = percentageDone/10;
+        }
+        uiInterface.ShowProgress(_("Verifying blocks..."), percentageDone);
         if (pindex->nHeight < chainActive.Height()-nCheckDepth)
             break;
         if (fPruneMode && !(pindex->nStatus & BLOCK_HAVE_DATA)) {
@@ -3934,6 +3942,7 @@ bool CVerifyDB::VerifyDB(const CChainParams& chainparams, CCoinsView *coinsview,
         }
     }
 
+    LogPrintf("[DONE].\n");
     LogPrintf("No coin database inconsistencies in last %i blocks (%i transactions)\n", chainActive.Height() - pindexState->nHeight, nGoodTransactions);
 
     return true;

From fa7f4f577cbab2b4bc03b5427704c2ec16680c34 Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Mon, 6 Jun 2016 17:50:50 +0200
Subject: [PATCH 0424/1802] [rpc] fundrawtransaction feeRate: Use BTC/kB

Also introduce UniValueType

UniValueType is a wrapper for UniValue::VType which allows setting
a typeAny flag. This flag indicates the type does not matter.

(Used by RPCTypeCheckObj)
---
 qa/rpc-tests/fundrawtransaction.py |  6 +++---
 src/rpc/rawtransaction.cpp         | 15 +++++++++++++--
 src/rpc/server.cpp                 | 14 ++++++--------
 src/rpc/server.h                   | 15 ++++++++++++---
 src/wallet/rpcwallet.cpp           | 20 ++++++++++++++++----
 5 files changed, 50 insertions(+), 20 deletions(-)

diff --git a/qa/rpc-tests/fundrawtransaction.py b/qa/rpc-tests/fundrawtransaction.py
index 3040752dcb470..998f822afe81d 100755
--- a/qa/rpc-tests/fundrawtransaction.py
+++ b/qa/rpc-tests/fundrawtransaction.py
@@ -681,9 +681,9 @@ def run_test(self):
         inputs = []
         outputs = {self.nodes[2].getnewaddress() : 1}
         rawtx = self.nodes[3].createrawtransaction(inputs, outputs)
-        result = self.nodes[3].fundrawtransaction(rawtx) # 1000 sat via settxfee
-        result2 = self.nodes[3].fundrawtransaction(rawtx, {"feeRate": 2000})
-        result3 = self.nodes[3].fundrawtransaction(rawtx, {"feeRate": 10000})
+        result = self.nodes[3].fundrawtransaction(rawtx) # uses min_relay_tx_fee (set by settxfee)
+        result2 = self.nodes[3].fundrawtransaction(rawtx, {"feeRate": 2*min_relay_tx_fee})
+        result3 = self.nodes[3].fundrawtransaction(rawtx, {"feeRate": 10*min_relay_tx_fee})
         assert_equal(result['fee']*2, result2['fee'])
         assert_equal(result['fee']*10, result3['fee'])
 
diff --git a/src/rpc/rawtransaction.cpp b/src/rpc/rawtransaction.cpp
index 483fe746ca10f..f92ddb282e8da 100644
--- a/src/rpc/rawtransaction.cpp
+++ b/src/rpc/rawtransaction.cpp
@@ -675,7 +675,12 @@ UniValue signrawtransaction(const UniValue& params, bool fHelp)
 
             UniValue prevOut = p.get_obj();
 
-            RPCTypeCheckObj(prevOut, boost::assign::map_list_of("txid", UniValue::VSTR)("vout", UniValue::VNUM)("scriptPubKey", UniValue::VSTR));
+            RPCTypeCheckObj(prevOut,
+                {
+                    {"txid", UniValueType(UniValue::VSTR)},
+                    {"vout", UniValueType(UniValue::VNUM)},
+                    {"scriptPubKey", UniValueType(UniValue::VSTR)},
+                });
 
             uint256 txid = ParseHashO(prevOut, "txid");
 
@@ -703,7 +708,13 @@ UniValue signrawtransaction(const UniValue& params, bool fHelp)
             // if redeemScript given and not using the local wallet (private keys
             // given), add redeemScript to the tempKeystore so it can be signed:
             if (fGivenKeys && scriptPubKey.IsPayToScriptHash()) {
-                RPCTypeCheckObj(prevOut, boost::assign::map_list_of("txid", UniValue::VSTR)("vout", UniValue::VNUM)("scriptPubKey", UniValue::VSTR)("redeemScript",UniValue::VSTR));
+                RPCTypeCheckObj(prevOut,
+                    {
+                        {"txid", UniValueType(UniValue::VSTR)},
+                        {"vout", UniValueType(UniValue::VNUM)},
+                        {"scriptPubKey", UniValueType(UniValue::VSTR)},
+                        {"redeemScript", UniValueType(UniValue::VSTR)},
+                    });
                 UniValue v = find_value(prevOut, "redeemScript");
                 if (!v.isNull()) {
                     vector<unsigned char> rsData(ParseHexV(v, "redeemScript"));
diff --git a/src/rpc/server.cpp b/src/rpc/server.cpp
index d06a9142b6819..23149baa6d945 100644
--- a/src/rpc/server.cpp
+++ b/src/rpc/server.cpp
@@ -88,20 +88,18 @@ void RPCTypeCheck(const UniValue& params,
 }
 
 void RPCTypeCheckObj(const UniValue& o,
-                  const map<string, UniValue::VType>& typesExpected,
-                  bool fAllowNull,
-                  bool fStrict)
+    const map<string, UniValueType>& typesExpected,
+    bool fAllowNull,
+    bool fStrict)
 {
-    BOOST_FOREACH(const PAIRTYPE(string, UniValue::VType)& t, typesExpected)
-    {
+    for (const auto& t : typesExpected) {
         const UniValue& v = find_value(o, t.first);
         if (!fAllowNull && v.isNull())
             throw JSONRPCError(RPC_TYPE_ERROR, strprintf("Missing %s", t.first));
 
-        if (!((v.type() == t.second) || (fAllowNull && (v.isNull()))))
-        {
+        if (!(t.second.typeAny || v.type() == t.second.type || (fAllowNull && v.isNull()))) {
             string err = strprintf("Expected type %s for %s, got %s",
-                                   uvTypeName(t.second), t.first, uvTypeName(v.type()));
+                uvTypeName(t.second.type), t.first, uvTypeName(v.type()));
             throw JSONRPCError(RPC_TYPE_ERROR, err);
         }
     }
diff --git a/src/rpc/server.h b/src/rpc/server.h
index b4713366172ae..b5ccc153d07ef 100644
--- a/src/rpc/server.h
+++ b/src/rpc/server.h
@@ -32,6 +32,15 @@ namespace RPCServer
 class CBlockIndex;
 class CNetAddr;
 
+/** Wrapper for UniValue::VType, which includes typeAny:
+ * Used to denote don't care type. Only used by RPCTypeCheckObj */
+struct UniValueType {
+    UniValueType(UniValue::VType _type) : typeAny(false), type(_type) {}
+    UniValueType() : typeAny(true) {}
+    bool typeAny;
+    UniValue::VType type;
+};
+
 class JSONRequest
 {
 public:
@@ -60,17 +69,17 @@ bool RPCIsInWarmup(std::string *statusOut);
 /**
  * Type-check arguments; throws JSONRPCError if wrong type given. Does not check that
  * the right number of arguments are passed, just that any passed are the correct type.
- * Use like:  RPCTypeCheck(params, boost::assign::list_of(str_type)(int_type)(obj_type));
  */
 void RPCTypeCheck(const UniValue& params,
                   const std::list<UniValue::VType>& typesExpected, bool fAllowNull=false);
 
 /*
   Check for expected keys/value types in an Object.
-  Use like: RPCTypeCheckObj(object, boost::assign::map_list_of("name", str_type)("value", int_type));
 */
 void RPCTypeCheckObj(const UniValue& o,
-                  const std::map<std::string, UniValue::VType>& typesExpected, bool fAllowNull=false, bool fStrict=false);
+    const std::map<std::string, UniValueType>& typesExpected,
+    bool fAllowNull = false,
+    bool fStrict = false);
 
 /** Opaque base class for timers returned by NewTimerFunc.
  * This provides no methods at the moment, but makes sure that delete
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index 68895ac526577..1300e39aa9412 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -2069,7 +2069,11 @@ UniValue lockunspent(const UniValue& params, bool fHelp)
             throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid parameter, expected object");
         const UniValue& o = output.get_obj();
 
-        RPCTypeCheckObj(o, boost::assign::map_list_of("txid", UniValue::VSTR)("vout", UniValue::VNUM));
+        RPCTypeCheckObj(o,
+            {
+                {"txid", UniValueType(UniValue::VSTR)},
+                {"vout", UniValueType(UniValue::VNUM)},
+            });
 
         string txid = find_value(o, "txid").get_str();
         if (!IsHex(txid))
@@ -2369,7 +2373,7 @@ UniValue fundrawtransaction(const UniValue& params, bool fHelp)
                             "     \"changePosition\"    (numeric, optional, default random) The index of the change output\n"
                             "     \"includeWatching\"   (boolean, optional, default false) Also select inputs which are watch only\n"
                             "     \"lockUnspents\"      (boolean, optional, default false) Lock selected unspent outputs\n"
-                            "     \"feeRate\"           (numeric, optional, default not set: makes wallet determine the fee) Set a specific feerate (satoshis per KB)\n"
+                            "     \"feeRate\"           (numeric, optional, default not set: makes wallet determine the fee) Set a specific feerate (" + CURRENCY_UNIT + " per KB)\n"
                             "   }\n"
                             "                         for backward compatibility: passing in a true instead of an object will result in {\"includeWatching\":true}\n"
                             "\nResult:\n"
@@ -2409,7 +2413,15 @@ UniValue fundrawtransaction(const UniValue& params, bool fHelp)
 
         UniValue options = params[1];
 
-        RPCTypeCheckObj(options, boost::assign::map_list_of("changeAddress", UniValue::VSTR)("changePosition", UniValue::VNUM)("includeWatching", UniValue::VBOOL)("lockUnspents", UniValue::VBOOL)("feeRate", UniValue::VNUM), true, true);
+        RPCTypeCheckObj(options,
+            {
+                {"changeAddress", UniValueType(UniValue::VSTR)},
+                {"changePosition", UniValueType(UniValue::VNUM)},
+                {"includeWatching", UniValueType(UniValue::VBOOL)},
+                {"lockUnspents", UniValueType(UniValue::VBOOL)},
+                {"feeRate", UniValueType()}, // will be checked below
+            },
+            true, true);
 
         if (options.exists("changeAddress")) {
             CBitcoinAddress address(options["changeAddress"].get_str());
@@ -2431,7 +2443,7 @@ UniValue fundrawtransaction(const UniValue& params, bool fHelp)
 
         if (options.exists("feeRate"))
         {
-            feeRate = CFeeRate(options["feeRate"].get_real());
+            feeRate = CFeeRate(AmountFromValue(options["feeRate"]));
             overrideEstimatedFeerate = true;
         }
       }

From 288d85ddf2e0a0c9d25a23db56052883170466d0 Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Tue, 7 Jun 2016 13:44:56 +0200
Subject: [PATCH 0425/1802] Get rid of CTxMempool::lookup() entirely

---
 src/main.cpp                       |  4 +++-
 src/test/policyestimator_tests.cpp | 18 +++++++++---------
 src/txmempool.cpp                  | 16 +++-------------
 src/txmempool.h                    |  1 -
 4 files changed, 15 insertions(+), 24 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index db0580bda6142..b581ece09ac4f 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1445,8 +1445,10 @@ bool GetTransaction(const uint256 &hash, CTransaction &txOut, const Consensus::P
 
     LOCK(cs_main);
 
-    if (mempool.lookup(hash, txOut))
+    std::shared_ptr<const CTransaction> ptx = mempool.get(hash);
+    if (ptx)
     {
+        txOut = *ptx;
         return true;
     }
 
diff --git a/src/test/policyestimator_tests.cpp b/src/test/policyestimator_tests.cpp
index 644c3da213a99..2b00e6f567fa8 100644
--- a/src/test/policyestimator_tests.cpp
+++ b/src/test/policyestimator_tests.cpp
@@ -74,9 +74,9 @@ BOOST_AUTO_TEST_CASE(BlockPolicyEstimates)
             // 9/10 blocks add 2nd highest and so on until ...
             // 1/10 blocks add lowest fee/pri transactions
             while (txHashes[9-h].size()) {
-                CTransaction btx;
-                if (mpool.lookup(txHashes[9-h].back(), btx))
-                    block.push_back(btx);
+                std::shared_ptr<const CTransaction> ptx = mpool.get(txHashes[9-h].back());
+                if (ptx)
+                    block.push_back(*ptx);
                 txHashes[9-h].pop_back();
             }
         }
@@ -160,9 +160,9 @@ BOOST_AUTO_TEST_CASE(BlockPolicyEstimates)
     // Estimates should still not be below original
     for (int j = 0; j < 10; j++) {
         while(txHashes[j].size()) {
-            CTransaction btx;
-            if (mpool.lookup(txHashes[j].back(), btx))
-                block.push_back(btx);
+            std::shared_ptr<const CTransaction> ptx = mpool.get(txHashes[j].back());
+            if (ptx)
+                block.push_back(*ptx);
             txHashes[j].pop_back();
         }
     }
@@ -181,9 +181,9 @@ BOOST_AUTO_TEST_CASE(BlockPolicyEstimates)
                 tx.vin[0].prevout.n = 10000*blocknum+100*j+k;
                 uint256 hash = tx.GetHash();
                 mpool.addUnchecked(hash, entry.Fee(feeV[k/4][j]).Time(GetTime()).Priority(priV[k/4][j]).Height(blocknum).FromTx(tx, &mpool));
-                CTransaction btx;
-                if (mpool.lookup(hash, btx))
-                    block.push_back(btx);
+                std::shared_ptr<const CTransaction> ptx = mpool.get(hash);
+                if (ptx)
+                    block.push_back(*ptx);
             }
         }
         mpool.removeForBlock(block, ++blocknum, dummyConflicted);
diff --git a/src/txmempool.cpp b/src/txmempool.cpp
index d39c9577f2484..205ffd6379351 100644
--- a/src/txmempool.cpp
+++ b/src/txmempool.cpp
@@ -831,16 +831,6 @@ std::shared_ptr<const CTransaction> CTxMemPool::get(const uint256& hash) const
     return i->GetSharedTx();
 }
 
-bool CTxMemPool::lookup(uint256 hash, CTransaction& result) const
-{
-    auto tx = get(hash);
-    if (tx) {
-        result = *tx;
-        return true;
-    }
-    return false;
-}
-
 TxMempoolInfo CTxMemPool::info(const uint256& hash) const
 {
     LOCK(cs);
@@ -960,9 +950,9 @@ bool CCoinsViewMemPool::GetCoins(const uint256 &txid, CCoins &coins) const {
     // If an entry in the mempool exists, always return that one, as it's guaranteed to never
     // conflict with the underlying cache, and it cannot have pruned entries (as it contains full)
     // transactions. First checking the underlying cache risks returning a pruned entry instead.
-    CTransaction tx;
-    if (mempool.lookup(txid, tx)) {
-        coins = CCoins(tx, MEMPOOL_HEIGHT);
+    shared_ptr<const CTransaction> ptx = mempool.get(txid);
+    if (ptx) {
+        coins = CCoins(*ptx, MEMPOOL_HEIGHT);
         return true;
     }
     return (base->GetCoins(txid, coins) && !coins.IsPruned());
diff --git a/src/txmempool.h b/src/txmempool.h
index 2f407fe008efe..f0e9b2e2c6975 100644
--- a/src/txmempool.h
+++ b/src/txmempool.h
@@ -607,7 +607,6 @@ class CTxMemPool
         return (mapTx.count(hash) != 0);
     }
 
-    bool lookup(uint256 hash, CTransaction& result) const;
     std::shared_ptr<const CTransaction> get(const uint256& hash) const;
     TxMempoolInfo info(const uint256& hash) const;
     std::vector<TxMempoolInfo> infoAll() const;

From 053930ffc41ba33fe7ce26bde7097951fe0b8462 Mon Sep 17 00:00:00 2001
From: Patrick Strateman <patrick.strateman@gmail.com>
Date: Mon, 23 May 2016 00:21:05 -0700
Subject: [PATCH 0426/1802] Avoid recalculating vchKeyedNetGroup in eviction
 logic.

Lazy calculate vchKeyedNetGroup in CNode::GetKeyedNetGroup.
---
 src/net.cpp | 43 +++++++++----------------------------------
 src/net.h   | 20 ++++++++++++++++++++
 2 files changed, 29 insertions(+), 34 deletions(-)

diff --git a/src/net.cpp b/src/net.cpp
index c09e3aedb6b76..eb62ee8a06e53 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -14,6 +14,7 @@
 #include "clientversion.h"
 #include "consensus/consensus.h"
 #include "crypto/common.h"
+#include "crypto/sha256.h"
 #include "hash.h"
 #include "primitives/transaction.h"
 #include "scheduler.h"
@@ -838,6 +839,7 @@ struct NodeEvictionCandidate
     int64_t nTimeConnected;
     int64_t nMinPingUsecTime;
     CAddress addr;
+    std::vector<unsigned char> vchKeyedNetGroup;
 };
 
 static bool ReverseCompareNodeMinPingTime(const NodeEvictionCandidate &a, const NodeEvictionCandidate &b)
@@ -850,36 +852,8 @@ static bool ReverseCompareNodeTimeConnected(const NodeEvictionCandidate &a, cons
     return a.nTimeConnected > b.nTimeConnected;
 }
 
-class CompareNetGroupKeyed
-{
-    std::vector<unsigned char> vchSecretKey;
-public:
-    CompareNetGroupKeyed()
-    {
-        vchSecretKey.resize(32, 0);
-        GetRandBytes(vchSecretKey.data(), vchSecretKey.size());
-    }
-
-    bool operator()(const NodeEvictionCandidate &a, const NodeEvictionCandidate &b)
-    {
-        std::vector<unsigned char> vchGroupA, vchGroupB;
-        CSHA256 hashA, hashB;
-        std::vector<unsigned char> vchA(32), vchB(32);
-
-        vchGroupA = a.addr.GetGroup();
-        vchGroupB = b.addr.GetGroup();
-
-        hashA.Write(begin_ptr(vchGroupA), vchGroupA.size());
-        hashB.Write(begin_ptr(vchGroupB), vchGroupB.size());
-
-        hashA.Write(begin_ptr(vchSecretKey), vchSecretKey.size());
-        hashB.Write(begin_ptr(vchSecretKey), vchSecretKey.size());
-
-        hashA.Finalize(begin_ptr(vchA));
-        hashB.Finalize(begin_ptr(vchB));
-
-        return vchA < vchB;
-    }
+static bool CompareNetGroupKeyed(const NodeEvictionCandidate &a, const NodeEvictionCandidate &b) {
+    return a.vchKeyedNetGroup < b.vchKeyedNetGroup;
 };
 
 /** Try to find a connection to evict when the node is full.
@@ -902,7 +876,7 @@ static bool AttemptToEvictConnection(bool fPreferNewConnection) {
                 continue;
             if (node->fDisconnect)
                 continue;
-            NodeEvictionCandidate candidate = {node->id, node->nTimeConnected, node->nMinPingUsecTime, node->addr};
+            NodeEvictionCandidate candidate = {node->id, node->nTimeConnected, node->nMinPingUsecTime, node->addr, node->vchKeyedNetGroup};
             vEvictionCandidates.push_back(candidate);
         }
     }
@@ -912,9 +886,8 @@ static bool AttemptToEvictConnection(bool fPreferNewConnection) {
     // Protect connections with certain characteristics
 
     // Deterministically select 4 peers to protect by netgroup.
-    // An attacker cannot predict which netgroups will be protected.
-    static CompareNetGroupKeyed comparerNetGroupKeyed;
-    std::sort(vEvictionCandidates.begin(), vEvictionCandidates.end(), comparerNetGroupKeyed);
+    // An attacker cannot predict which netgroups will be protected
+    std::sort(vEvictionCandidates.begin(), vEvictionCandidates.end(), CompareNetGroupKeyed);
     vEvictionCandidates.erase(vEvictionCandidates.end() - std::min(4, static_cast<int>(vEvictionCandidates.size())), vEvictionCandidates.end());
 
     if (vEvictionCandidates.empty()) return false;
@@ -2392,6 +2365,8 @@ CNode::CNode(SOCKET hSocketIn, const CAddress& addrIn, const std::string& addrNa
     lastSentFeeFilter = 0;
     nextSendTimeFeeFilter = 0;
 
+    CalculateKeyedNetGroup();
+
     BOOST_FOREACH(const std::string &msg, getAllNetMessageTypes())
         mapRecvBytesPerMsgCmd[msg] = 0;
     mapRecvBytesPerMsgCmd[NET_MESSAGE_COMMAND_OTHER] = 0;
diff --git a/src/net.h b/src/net.h
index 403653e8c83a3..019a3f7ee3e20 100644
--- a/src/net.h
+++ b/src/net.h
@@ -9,6 +9,8 @@
 #include "amount.h"
 #include "bloom.h"
 #include "compat.h"
+#include "crypto/common.h"
+#include "crypto/sha256.h"
 #include "limitedmap.h"
 #include "netbase.h"
 #include "protocol.h"
@@ -362,6 +364,8 @@ class CNode
     CBloomFilter* pfilter;
     int nRefCount;
     NodeId id;
+
+    std::vector<unsigned char> vchKeyedNetGroup;
 protected:
 
     // Denial-of-service detection/prevention
@@ -450,6 +454,22 @@ class CNode
     CNode(const CNode&);
     void operator=(const CNode&);
 
+    void CalculateKeyedNetGroup() {
+        static std::vector<unsigned char> vchSecretKey;
+        if (vchSecretKey.empty()) {
+            vchSecretKey.resize(32, 0);
+            GetRandBytes(vchSecretKey.data(), vchSecretKey.size());
+        }
+
+        std::vector<unsigned char> vchNetGroup(this->addr.GetGroup());
+
+        CSHA256 hash;
+        hash.Write(begin_ptr(vchNetGroup), vchNetGroup.size());
+        hash.Write(begin_ptr(vchSecretKey), vchSecretKey.size());
+
+        vchKeyedNetGroup.resize(32, 0);
+        hash.Finalize(begin_ptr(vchKeyedNetGroup));
+    }
 public:
 
     NodeId GetId() const {

From 9bf156bb9ee4915fa7e8f84589d65f6598563c97 Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Sun, 22 May 2016 11:06:18 +0200
Subject: [PATCH 0427/1802] Support SipHash with arbitrary byte writes

---
 src/hash.cpp            | 39 ++++++++++++++++++++++++++++++++++++---
 src/hash.h              | 21 ++++++++++++++++++++-
 src/test/hash_tests.cpp | 17 +++++++++++++----
 3 files changed, 69 insertions(+), 8 deletions(-)

diff --git a/src/hash.cpp b/src/hash.cpp
index a518314a5376a..20a83342db4c9 100644
--- a/src/hash.cpp
+++ b/src/hash.cpp
@@ -100,12 +100,15 @@ CSipHasher::CSipHasher(uint64_t k0, uint64_t k1)
     v[2] = 0x6c7967656e657261ULL ^ k0;
     v[3] = 0x7465646279746573ULL ^ k1;
     count = 0;
+    tmp = 0;
 }
 
 CSipHasher& CSipHasher::Write(uint64_t data)
 {
     uint64_t v0 = v[0], v1 = v[1], v2 = v[2], v3 = v[3];
 
+    assert(count % 8 == 0);
+
     v3 ^= data;
     SIPROUND;
     SIPROUND;
@@ -116,7 +119,35 @@ CSipHasher& CSipHasher::Write(uint64_t data)
     v[2] = v2;
     v[3] = v3;
 
-    count++;
+    count += 8;
+    return *this;
+}
+
+CSipHasher& CSipHasher::Write(const unsigned char* data, size_t size)
+{
+    uint64_t v0 = v[0], v1 = v[1], v2 = v[2], v3 = v[3];
+    uint64_t t = tmp;
+    int c = count;
+
+    while (size--) {
+        t |= ((uint64_t)(*(data++))) << (8 * (c % 8));
+        c++;
+        if ((c & 7) == 0) {
+            v3 ^= t;
+            SIPROUND;
+            SIPROUND;
+            v0 ^= t;
+            t = 0;
+        }
+    }
+
+    v[0] = v0;
+    v[1] = v1;
+    v[2] = v2;
+    v[3] = v3;
+    count = c;
+    tmp = t;
+
     return *this;
 }
 
@@ -124,10 +155,12 @@ uint64_t CSipHasher::Finalize() const
 {
     uint64_t v0 = v[0], v1 = v[1], v2 = v[2], v3 = v[3];
 
-    v3 ^= ((uint64_t)count) << 59;
+    uint64_t t = tmp | (((uint64_t)count) << 56);
+
+    v3 ^= t;
     SIPROUND;
     SIPROUND;
-    v0 ^= ((uint64_t)count) << 59;
+    v0 ^= t;
     v2 ^= 0xFF;
     SIPROUND;
     SIPROUND;
diff --git a/src/hash.h b/src/hash.h
index 600dabec56087..db4e130ae7fec 100644
--- a/src/hash.h
+++ b/src/hash.h
@@ -171,19 +171,38 @@ unsigned int MurmurHash3(unsigned int nHashSeed, const std::vector<unsigned char
 
 void BIP32Hash(const ChainCode &chainCode, unsigned int nChild, unsigned char header, const unsigned char data[32], unsigned char output[64]);
 
-/** SipHash-2-4, using a uint64_t-based (rather than byte-based) interface */
+/** SipHash-2-4 */
 class CSipHasher
 {
 private:
     uint64_t v[4];
+    uint64_t tmp;
     int count;
 
 public:
+    /** Construct a SipHash calculator initialized with 128-bit key (k0, k1) */
     CSipHasher(uint64_t k0, uint64_t k1);
+    /** Hash a 64-bit integer worth of data
+     *  It is treated as if this was the little-endian interpretation of 8 bytes.
+     *  This function can only be used when a multiple of 8 bytes have been written so far.
+     */
     CSipHasher& Write(uint64_t data);
+    /** Hash arbitrary bytes. */
+    CSipHasher& Write(const unsigned char* data, size_t size);
+    /** Compute the 64-bit SipHash-2-4 of the data written so far. The object remains untouched. */
     uint64_t Finalize() const;
 };
 
+/** Optimized SipHash-2-4 implementation for uint256.
+ *
+ *  It is identical to:
+ *    SipHasher(k0, k1)
+ *      .Write(val.GetUint64(0))
+ *      .Write(val.GetUint64(1))
+ *      .Write(val.GetUint64(2))
+ *      .Write(val.GetUint64(3))
+ *      .Finalize()
+ */
 uint64_t SipHashUint256(uint64_t k0, uint64_t k1, const uint256& val);
 
 #endif // BITCOIN_HASH_H
diff --git a/src/test/hash_tests.cpp b/src/test/hash_tests.cpp
index 8baaf3645fab5..f62080c1d24f8 100644
--- a/src/test/hash_tests.cpp
+++ b/src/test/hash_tests.cpp
@@ -51,13 +51,22 @@ BOOST_AUTO_TEST_CASE(siphash)
 {
     CSipHasher hasher(0x0706050403020100ULL, 0x0F0E0D0C0B0A0908ULL);
     BOOST_CHECK_EQUAL(hasher.Finalize(),  0x726fdb47dd0e0e31ull);
-    hasher.Write(0x0706050403020100ULL);
+    static const unsigned char t0[1] = {0};
+    hasher.Write(t0, 1);
+    BOOST_CHECK_EQUAL(hasher.Finalize(),  0x74f839c593dc67fdull);
+    static const unsigned char t1[7] = {1,2,3,4,5,6,7};
+    hasher.Write(t1, 7);
     BOOST_CHECK_EQUAL(hasher.Finalize(),  0x93f5f5799a932462ull);
     hasher.Write(0x0F0E0D0C0B0A0908ULL);
     BOOST_CHECK_EQUAL(hasher.Finalize(),  0x3f2acc7f57c29bdbull);
-    hasher.Write(0x1716151413121110ULL);
-    BOOST_CHECK_EQUAL(hasher.Finalize(),  0xb8ad50c6f649af94ull);
-    hasher.Write(0x1F1E1D1C1B1A1918ULL);
+    static const unsigned char t2[2] = {16,17};
+    hasher.Write(t2, 2);
+    BOOST_CHECK_EQUAL(hasher.Finalize(),  0x4bc1b3f0968dd39cull);
+    static const unsigned char t3[9] = {18,19,20,21,22,23,24,25,26};
+    hasher.Write(t3, 9);
+    BOOST_CHECK_EQUAL(hasher.Finalize(),  0x2f2e6163076bcfadull);
+    static const unsigned char t4[5] = {27,28,29,30,31};
+    hasher.Write(t4, 5);
     BOOST_CHECK_EQUAL(hasher.Finalize(),  0x7127512f72f27cceull);
     hasher.Write(0x2726252423222120ULL);
     BOOST_CHECK_EQUAL(hasher.Finalize(),  0x0e3ea96b5304a7d0ull);

From c31b24f745a84669f2af729052da7fd7ed2da868 Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Wed, 25 May 2016 15:38:32 +0200
Subject: [PATCH 0428/1802] Use 64-bit SipHash of netgroups in eviction

---
 src/net.cpp | 39 ++++++++++++++++++++++++++-------------
 src/net.h   | 22 +++-------------------
 2 files changed, 29 insertions(+), 32 deletions(-)

diff --git a/src/net.cpp b/src/net.cpp
index eb62ee8a06e53..0bc501601dd97 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -839,7 +839,7 @@ struct NodeEvictionCandidate
     int64_t nTimeConnected;
     int64_t nMinPingUsecTime;
     CAddress addr;
-    std::vector<unsigned char> vchKeyedNetGroup;
+    uint64_t nKeyedNetGroup;
 };
 
 static bool ReverseCompareNodeMinPingTime(const NodeEvictionCandidate &a, const NodeEvictionCandidate &b)
@@ -853,7 +853,7 @@ static bool ReverseCompareNodeTimeConnected(const NodeEvictionCandidate &a, cons
 }
 
 static bool CompareNetGroupKeyed(const NodeEvictionCandidate &a, const NodeEvictionCandidate &b) {
-    return a.vchKeyedNetGroup < b.vchKeyedNetGroup;
+    return a.nKeyedNetGroup < b.nKeyedNetGroup;
 };
 
 /** Try to find a connection to evict when the node is full.
@@ -876,7 +876,7 @@ static bool AttemptToEvictConnection(bool fPreferNewConnection) {
                 continue;
             if (node->fDisconnect)
                 continue;
-            NodeEvictionCandidate candidate = {node->id, node->nTimeConnected, node->nMinPingUsecTime, node->addr, node->vchKeyedNetGroup};
+            NodeEvictionCandidate candidate = {node->id, node->nTimeConnected, node->nMinPingUsecTime, node->addr, node->nKeyedNetGroup};
             vEvictionCandidates.push_back(candidate);
         }
     }
@@ -908,24 +908,24 @@ static bool AttemptToEvictConnection(bool fPreferNewConnection) {
 
     // Identify the network group with the most connections and youngest member.
     // (vEvictionCandidates is already sorted by reverse connect time)
-    std::vector<unsigned char> naMostConnections;
+    uint64_t naMostConnections;
     unsigned int nMostConnections = 0;
     int64_t nMostConnectionsTime = 0;
-    std::map<std::vector<unsigned char>, std::vector<NodeEvictionCandidate> > mapAddrCounts;
+    std::map<uint64_t, std::vector<NodeEvictionCandidate> > mapAddrCounts;
     BOOST_FOREACH(const NodeEvictionCandidate &node, vEvictionCandidates) {
-        mapAddrCounts[node.addr.GetGroup()].push_back(node);
-        int64_t grouptime = mapAddrCounts[node.addr.GetGroup()][0].nTimeConnected;
-        size_t groupsize = mapAddrCounts[node.addr.GetGroup()].size();
+        mapAddrCounts[node.nKeyedNetGroup].push_back(node);
+        int64_t grouptime = mapAddrCounts[node.nKeyedNetGroup][0].nTimeConnected;
+        size_t groupsize = mapAddrCounts[node.nKeyedNetGroup].size();
 
         if (groupsize > nMostConnections || (groupsize == nMostConnections && grouptime > nMostConnectionsTime)) {
             nMostConnections = groupsize;
             nMostConnectionsTime = grouptime;
-            naMostConnections = node.addr.GetGroup();
+            naMostConnections = node.nKeyedNetGroup;
         }
     }
 
     // Reduce to the network group with the most connections
-    vEvictionCandidates = mapAddrCounts[naMostConnections];
+    vEvictionCandidates = std::move(mapAddrCounts[naMostConnections]);
 
     // Do not disconnect peers if there is only one unprotected connection from their network group.
     // This step excessively favors netgroup diversity, and should be removed once more protective criteria are established.
@@ -2318,6 +2318,8 @@ unsigned int SendBufferSize() { return 1000*GetArg("-maxsendbuffer", DEFAULT_MAX
 
 CNode::CNode(SOCKET hSocketIn, const CAddress& addrIn, const std::string& addrNameIn, bool fInboundIn) :
     ssSend(SER_NETWORK, INIT_PROTO_VERSION),
+    addr(addrIn),
+    nKeyedNetGroup(CalculateKeyedNetGroup(addrIn)),
     addrKnown(5000, 0.001),
     filterInventoryKnown(50000, 0.000001)
 {
@@ -2330,7 +2332,6 @@ CNode::CNode(SOCKET hSocketIn, const CAddress& addrIn, const std::string& addrNa
     nRecvBytes = 0;
     nTimeConnected = GetTime();
     nTimeOffset = 0;
-    addr = addrIn;
     addrName = addrNameIn == "" ? addr.ToStringIPPort() : addrNameIn;
     nVersion = 0;
     strSubVer = "";
@@ -2365,8 +2366,6 @@ CNode::CNode(SOCKET hSocketIn, const CAddress& addrIn, const std::string& addrNa
     lastSentFeeFilter = 0;
     nextSendTimeFeeFilter = 0;
 
-    CalculateKeyedNetGroup();
-
     BOOST_FOREACH(const std::string &msg, getAllNetMessageTypes())
         mapRecvBytesPerMsgCmd[msg] = 0;
     mapRecvBytesPerMsgCmd[NET_MESSAGE_COMMAND_OTHER] = 0;
@@ -2599,3 +2598,17 @@ bool CBanDB::Read(banmap_t& banSet)
 int64_t PoissonNextSend(int64_t nNow, int average_interval_seconds) {
     return nNow + (int64_t)(log1p(GetRand(1ULL << 48) * -0.0000000000000035527136788 /* -1/2^48 */) * average_interval_seconds * -1000000.0 + 0.5);
 }
+
+/* static */ uint64_t CNode::CalculateKeyedNetGroup(const CAddress& ad)
+{
+    static uint64_t k0 = 0, k1 = 0;
+    while (k0 == 0 && k1 == 0) {
+        // Make sure this only runs on the first invocation.
+        GetRandBytes((unsigned char*)&k0, sizeof(k0));
+        GetRandBytes((unsigned char*)&k1, sizeof(k1));
+    }
+
+    std::vector<unsigned char> vchNetGroup(ad.GetGroup());
+
+    return CSipHasher(k0, k1).Write(&vchNetGroup[0], vchNetGroup.size()).Finalize();
+}
diff --git a/src/net.h b/src/net.h
index 019a3f7ee3e20..8df3cb421fea4 100644
--- a/src/net.h
+++ b/src/net.h
@@ -9,8 +9,6 @@
 #include "amount.h"
 #include "bloom.h"
 #include "compat.h"
-#include "crypto/common.h"
-#include "crypto/sha256.h"
 #include "limitedmap.h"
 #include "netbase.h"
 #include "protocol.h"
@@ -337,7 +335,7 @@ class CNode
     int64_t nLastRecv;
     int64_t nTimeConnected;
     int64_t nTimeOffset;
-    CAddress addr;
+    const CAddress addr;
     std::string addrName;
     CService addrLocal;
     int nVersion;
@@ -365,7 +363,7 @@ class CNode
     int nRefCount;
     NodeId id;
 
-    std::vector<unsigned char> vchKeyedNetGroup;
+    const uint64_t nKeyedNetGroup;
 protected:
 
     // Denial-of-service detection/prevention
@@ -454,22 +452,8 @@ class CNode
     CNode(const CNode&);
     void operator=(const CNode&);
 
-    void CalculateKeyedNetGroup() {
-        static std::vector<unsigned char> vchSecretKey;
-        if (vchSecretKey.empty()) {
-            vchSecretKey.resize(32, 0);
-            GetRandBytes(vchSecretKey.data(), vchSecretKey.size());
-        }
-
-        std::vector<unsigned char> vchNetGroup(this->addr.GetGroup());
+    static uint64_t CalculateKeyedNetGroup(const CAddress& ad);
 
-        CSHA256 hash;
-        hash.Write(begin_ptr(vchNetGroup), vchNetGroup.size());
-        hash.Write(begin_ptr(vchSecretKey), vchSecretKey.size());
-
-        vchKeyedNetGroup.resize(32, 0);
-        hash.Finalize(begin_ptr(vchKeyedNetGroup));
-    }
 public:
 
     NodeId GetId() const {

From 888483098e60f2a944f1d246bbfec4d14a2975f8 Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Tue, 7 Jun 2016 16:29:03 +0200
Subject: [PATCH 0429/1802] Use C++11 thread-safe static initializers

---
 src/coins.cpp | 6 +-----
 src/coins.h   | 2 +-
 src/main.cpp  | 7 ++-----
 src/net.cpp   | 8 ++------
 4 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/src/coins.cpp b/src/coins.cpp
index b7dd293d69564..39db7dedfbbe1 100644
--- a/src/coins.cpp
+++ b/src/coins.cpp
@@ -56,11 +56,7 @@ void CCoinsViewBacked::SetBackend(CCoinsView &viewIn) { base = &viewIn; }
 bool CCoinsViewBacked::BatchWrite(CCoinsMap &mapCoins, const uint256 &hashBlock) { return base->BatchWrite(mapCoins, hashBlock); }
 CCoinsViewCursor *CCoinsViewBacked::Cursor() const { return base->Cursor(); }
 
-SaltedTxidHasher::SaltedTxidHasher()
-{
-    GetRandBytes((unsigned char*)&k0, sizeof(k0));
-    GetRandBytes((unsigned char*)&k1, sizeof(k1));
-}
+SaltedTxidHasher::SaltedTxidHasher() : k0(GetRand(std::numeric_limits<uint64_t>::max())), k1(GetRand(std::numeric_limits<uint64_t>::max())) {}
 
 CCoinsViewCache::CCoinsViewCache(CCoinsView *baseIn) : CCoinsViewBacked(baseIn), hasModifier(false), cachedCoinsUsage(0) { }
 
diff --git a/src/coins.h b/src/coins.h
index 1dd908700b12b..033651a435c04 100644
--- a/src/coins.h
+++ b/src/coins.h
@@ -269,7 +269,7 @@ class SaltedTxidHasher
 {
 private:
     /** Salt */
-    uint64_t k0, k1;
+    const uint64_t k0, k1;
 
 public:
     SaltedTxidHasher();
diff --git a/src/main.cpp b/src/main.cpp
index bf6e6d04b5113..da140cffacfc3 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -4784,11 +4784,8 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
                     LOCK(cs_vNodes);
                     // Use deterministic randomness to send to the same nodes for 24 hours
                     // at a time so the addrKnowns of the chosen nodes prevent repeats
-                    static uint64_t salt0 = 0, salt1 = 0;
-                    while (salt0 == 0 && salt1 == 0) {
-                        GetRandBytes((unsigned char*)&salt0, sizeof(salt0));
-                        GetRandBytes((unsigned char*)&salt1, sizeof(salt1));
-                    }
+                    static const uint64_t salt0 = GetRand(std::numeric_limits<uint64_t>::max());
+                    static const uint64_t salt1 = GetRand(std::numeric_limits<uint64_t>::max());
                     uint64_t hashAddr = addr.GetHash();
                     multimap<uint64_t, CNode*> mapMix;
                     const CSipHasher hasher = CSipHasher(salt0, salt1).Write(hashAddr << 32).Write((GetTime() + hashAddr) / (24*60*60));
diff --git a/src/net.cpp b/src/net.cpp
index 0bc501601dd97..e29053cf548c2 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -2601,12 +2601,8 @@ int64_t PoissonNextSend(int64_t nNow, int average_interval_seconds) {
 
 /* static */ uint64_t CNode::CalculateKeyedNetGroup(const CAddress& ad)
 {
-    static uint64_t k0 = 0, k1 = 0;
-    while (k0 == 0 && k1 == 0) {
-        // Make sure this only runs on the first invocation.
-        GetRandBytes((unsigned char*)&k0, sizeof(k0));
-        GetRandBytes((unsigned char*)&k1, sizeof(k1));
-    }
+    static const uint64_t k0 = GetRand(std::numeric_limits<uint64_t>::max());
+    static const uint64_t k1 = GetRand(std::numeric_limits<uint64_t>::max());
 
     std::vector<unsigned char> vchNetGroup(ad.GetGroup());
 

From ae357d5ab940dea5e2640361ae17fd8722a93c9f Mon Sep 17 00:00:00 2001
From: Jonas Schnelli <dev@jonasschnelli.ch>
Date: Tue, 7 Jun 2016 17:37:35 +0200
Subject: [PATCH 0430/1802] [Bitcoin-Tx] Add tests for sequence number support

---
 src/test/data/bitcoin-util-test.json | 13 +++++++++++++
 src/test/data/txcreatedata_seq0.hex  |  1 +
 src/test/data/txcreatedata_seq1.hex  |  1 +
 3 files changed, 15 insertions(+)
 create mode 100644 src/test/data/txcreatedata_seq0.hex
 create mode 100644 src/test/data/txcreatedata_seq1.hex

diff --git a/src/test/data/bitcoin-util-test.json b/src/test/data/bitcoin-util-test.json
index 3bf80ca4348a2..5cb383de85a06 100644
--- a/src/test/data/bitcoin-util-test.json
+++ b/src/test/data/bitcoin-util-test.json
@@ -86,5 +86,18 @@
      "outaddr=0.18:13tuJJDR2RgArmgfv6JScSdreahzgc4T6o",
      "outdata=54686973204f505f52455455524e207472616e73616374696f6e206f7574707574207761732063726561746564206279206d6f646966696564206372656174657261777472616e73616374696f6e2e"],
     "output_cmp": "txcreatedata2.hex"
+  },
+  { "exec": "./bitcoin-tx",
+    "args":
+    ["-create",
+     "in=5897de6bd6027a475eadd57019d4e6872c396d0716c4875a5f1a6fcfdf385c1f:0:4294967293",
+     "outaddr=0.18:13tuJJDR2RgArmgfv6JScSdreahzgc4T6o"],
+    "output_cmp": "txcreatedata_seq0.hex"
+  },
+  { "exec": "./bitcoin-tx",
+    "args":
+    ["01000000011f5c38dfcf6f1a5f5a87c416076d392c87e6d41970d5ad5e477a02d66bde97580000000000fdffffff0180a81201000000001976a9141fc11f39be1729bf973a7ab6a615ca4729d6457488ac00000000",
+     "in=5897de6bd6027a475eadd57019d4e6872c396d0716c4875a5f1a6fcfdf385c1f:0:1"],
+    "output_cmp": "txcreatedata_seq1.hex"
   }
 ]
diff --git a/src/test/data/txcreatedata_seq0.hex b/src/test/data/txcreatedata_seq0.hex
new file mode 100644
index 0000000000000..db02b5e4a46a7
--- /dev/null
+++ b/src/test/data/txcreatedata_seq0.hex
@@ -0,0 +1 @@
+01000000011f5c38dfcf6f1a5f5a87c416076d392c87e6d41970d5ad5e477a02d66bde97580000000000fdffffff0180a81201000000001976a9141fc11f39be1729bf973a7ab6a615ca4729d6457488ac00000000
diff --git a/src/test/data/txcreatedata_seq1.hex b/src/test/data/txcreatedata_seq1.hex
new file mode 100644
index 0000000000000..4cedcd975cc21
--- /dev/null
+++ b/src/test/data/txcreatedata_seq1.hex
@@ -0,0 +1 @@
+01000000021f5c38dfcf6f1a5f5a87c416076d392c87e6d41970d5ad5e477a02d66bde97580000000000fdffffff1f5c38dfcf6f1a5f5a87c416076d392c87e6d41970d5ad5e477a02d66bde97580000000000010000000180a81201000000001976a9141fc11f39be1729bf973a7ab6a615ca4729d6457488ac00000000

From 86efa30ae3fd36aa77b19ff0f70bb89be9ec308e Mon Sep 17 00:00:00 2001
From: Jonas Schnelli <dev@jonasschnelli.ch>
Date: Tue, 7 Jun 2016 19:57:54 +0200
Subject: [PATCH 0431/1802] [Bitcoin-Tx] fix missing test fixtures, fix 32bit
 atoi issue

---
 src/Makefile.test.include | 4 +++-
 src/bitcoin-tx.cpp        | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/Makefile.test.include b/src/Makefile.test.include
index 77cf1001e1d9d..2d7791232daa8 100644
--- a/src/Makefile.test.include
+++ b/src/Makefile.test.include
@@ -17,7 +17,9 @@ EXTRA_DIST += \
 	test/data/txcreate2.hex \
 	test/data/txcreatedata1.hex \
 	test/data/txcreatedata2.hex \
-	test/data/txcreatesign.hex
+	test/data/txcreatesign.hex \
+	test/data/txcreatedata_seq0.hex \
+	test/data/txcreatedata_seq1.hex
 
 JSON_TEST_FILES = \
   test/data/script_tests.json \
diff --git a/src/bitcoin-tx.cpp b/src/bitcoin-tx.cpp
index d5e2fc279bc25..f9ea94b9f42d3 100644
--- a/src/bitcoin-tx.cpp
+++ b/src/bitcoin-tx.cpp
@@ -206,7 +206,7 @@ static void MutateTxAddInput(CMutableTransaction& tx, const string& strInput)
     // extract the optional sequence number
     uint32_t nSequenceIn=std::numeric_limits<unsigned int>::max();
     if (vStrInputParts.size() > 2)
-        nSequenceIn = atoi(vStrInputParts[2]);
+        nSequenceIn = std::stoul(vStrInputParts[2]);
 
     // append to transaction input list
     CTxIn txin(txid, vout, CScript(), nSequenceIn);

From c2715d3ab8d83be5bc256380b84d5467e85a4330 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pavel=20Jan=C3=ADk?= <Pavel@Janik.cz>
Date: Tue, 7 Jun 2016 21:22:48 +0200
Subject: [PATCH 0432/1802] Do not shadow local variables

---
 src/test/base58_tests.cpp    | 4 ++--
 src/test/miner_tests.cpp     | 4 ++--
 src/test/pmt_tests.cpp       | 4 ++--
 src/test/prevector_tests.cpp | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/test/base58_tests.cpp b/src/test/base58_tests.cpp
index e5a2e28b2e9de..01eb2aee9ed02 100644
--- a/src/test/base58_tests.cpp
+++ b/src/test/base58_tests.cpp
@@ -79,7 +79,7 @@ class TestAddrTypeVisitor : public boost::static_visitor<bool>
 private:
     std::string exp_addrType;
 public:
-    TestAddrTypeVisitor(const std::string &exp_addrType) : exp_addrType(exp_addrType) { }
+    TestAddrTypeVisitor(const std::string &_exp_addrType) : exp_addrType(_exp_addrType) { }
     bool operator()(const CKeyID &id) const
     {
         return (exp_addrType == "pubkey");
@@ -100,7 +100,7 @@ class TestPayloadVisitor : public boost::static_visitor<bool>
 private:
     std::vector<unsigned char> exp_payload;
 public:
-    TestPayloadVisitor(std::vector<unsigned char> &exp_payload) : exp_payload(exp_payload) { }
+    TestPayloadVisitor(std::vector<unsigned char> &_exp_payload) : exp_payload(_exp_payload) { }
     bool operator()(const CKeyID &id) const
     {
         uint160 exp_key(exp_payload);
diff --git a/src/test/miner_tests.cpp b/src/test/miner_tests.cpp
index 469862518c58c..3f5f0ee98bbd6 100644
--- a/src/test/miner_tests.cpp
+++ b/src/test/miner_tests.cpp
@@ -385,8 +385,8 @@ BOOST_AUTO_TEST_CASE(CreateNewBlock_validity)
     SetMockTime(0);
     mempool.clear();
 
-    BOOST_FOREACH(CTransaction *tx, txFirst)
-        delete tx;
+    BOOST_FOREACH(CTransaction *_tx, txFirst)
+        delete _tx;
 
     fCheckpointsEnabled = true;
 }
diff --git a/src/test/pmt_tests.cpp b/src/test/pmt_tests.cpp
index 2f3f607889498..74ffe0cc74045 100644
--- a/src/test/pmt_tests.cpp
+++ b/src/test/pmt_tests.cpp
@@ -37,8 +37,8 @@ BOOST_AUTO_TEST_CASE(pmt_test1)
     seed_insecure_rand(false);
     static const unsigned int nTxCounts[] = {1, 4, 7, 17, 56, 100, 127, 256, 312, 513, 1000, 4095};
 
-    for (int n = 0; n < 12; n++) {
-        unsigned int nTx = nTxCounts[n];
+    for (int i = 0; i < 12; i++) {
+        unsigned int nTx = nTxCounts[i];
 
         // build a block with some dummy transactions
         CBlock block;
diff --git a/src/test/prevector_tests.cpp b/src/test/prevector_tests.cpp
index b39b90353053c..d1407c1da9339 100644
--- a/src/test/prevector_tests.cpp
+++ b/src/test/prevector_tests.cpp
@@ -192,8 +192,8 @@ BOOST_AUTO_TEST_CASE(PrevectorTestInt)
             if (((r >> 21) % 32) == 7) {
                 int values[4];
                 int num = 1 + (insecure_rand() % 4);
-                for (int i = 0; i < num; i++) {
-                    values[i] = insecure_rand();
+                for (int k = 0; k < num; k++) {
+                    values[k] = insecure_rand();
                 }
                 test.insert_range(insecure_rand() % (test.size() + 1), values, values + num);
             }

From b676f38791edd4a276f7c7937ffdd98c0cd2cf08 Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Tue, 7 Jun 2016 15:45:02 -0400
Subject: [PATCH 0433/1802] depends: allow for CONFIG_SITE to be used rather
 than stealing prefix

This does not break any existing prefix behavior, only makes new behavior work.

For example:
CONFIG_SITE=$PWD/depends/x86_64-pc-linux-gnu/share/config.site ./configure --prefix=/
---
 depends/config.site.in | 32 +++++++++++++++++---------------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/depends/config.site.in b/depends/config.site.in
index 984ddb1e62b01..e731537bf76bd 100644
--- a/depends/config.site.in
+++ b/depends/config.site.in
@@ -1,24 +1,26 @@
+depends_prefix="`dirname ${ac_site_file}`/.."
+
 cross_compiling=maybe
 host_alias=@HOST@
 ac_tool_prefix=${host_alias}-
 
 if test -z $with_boost; then
-  with_boost=$prefix
+  with_boost=$depends_prefix
 fi
 if test -z $with_qt_plugindir; then
-  with_qt_plugindir=$prefix/plugins
+  with_qt_plugindir=$depends_prefix/plugins
 fi
 if test -z $with_qt_translationdir; then
-  with_qt_translationdir=$prefix/translations
+  with_qt_translationdir=$depends_prefix/translations
 fi
 if test -z $with_qt_bindir; then
-  with_qt_bindir=$prefix/native/bin
+  with_qt_bindir=$depends_prefix/native/bin
 fi
 if test -z $with_protoc_bindir; then
-  with_protoc_bindir=$prefix/native/bin
+  with_protoc_bindir=$depends_prefix/native/bin
 fi
 if test -z $with_comparison_tool; then
-  with_comparison_tool=$prefix/native/share/BitcoindComparisonTool_jar/BitcoindComparisonTool.jar
+  with_comparison_tool=$depends_prefix/native/share/BitcoindComparisonTool_jar/BitcoindComparisonTool.jar
 fi
 
 
@@ -41,32 +43,32 @@ fi
 
 if test x@host_os@ = xmingw32; then
   if test -z $with_qt_incdir; then
-    with_qt_incdir=$prefix/include
+    with_qt_incdir=$depends_prefix/include
   fi
   if test -z $with_qt_libdir; then
-    with_qt_libdir=$prefix/lib
+    with_qt_libdir=$depends_prefix/lib
   fi
 fi
 
-PATH=$prefix/native/bin:$PATH
+PATH=$depends_prefix/native/bin:$PATH
 PKG_CONFIG="`which pkg-config` --static"
 
 # These two need to remain exported because pkg-config does not see them
 # otherwise. That means they must be unexported at the end of configure.ac to
 # avoid ruining the cache. Sigh.
 
-export PKG_CONFIG_LIBDIR=$prefix/lib/pkgconfig
-export PKG_CONFIG_PATH=$prefix/share/pkgconfig
+export PKG_CONFIG_LIBDIR=$depends_prefix/lib/pkgconfig
+export PKG_CONFIG_PATH=$depends_prefix/share/pkgconfig
 
-CPPFLAGS="-I$prefix/include/ $CPPFLAGS"
-LDFLAGS="-L$prefix/lib $LDFLAGS"
+CPPFLAGS="-I$depends_prefix/include/ $CPPFLAGS"
+LDFLAGS="-L$depends_prefix/lib $LDFLAGS"
 
 CC="@CC@"
 CXX="@CXX@"
 OBJC="${CC}"
 OBJCXX="${CXX}"
-CCACHE=$prefix/native/bin/ccache
-PYTHONPATH=$prefix/native/lib/python/dist-packages:$PYTHONPATH
+CCACHE=$depends_prefix/native/bin/ccache
+PYTHONPATH=$depends_prefix/native/lib/python/dist-packages:$PYTHONPATH
 
 if test -n "@AR@"; then
   AR=@AR@

From ad38204e6e114d383af0f17b18c216cae10d7686 Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Tue, 7 Jun 2016 14:51:51 -0400
Subject: [PATCH 0434/1802] gitian: use CONFIG_SITE rather than hijacking the
 prefix

---
 contrib/gitian-descriptors/gitian-linux.yml | 6 +++---
 contrib/gitian-descriptors/gitian-osx.yml   | 6 +++---
 contrib/gitian-descriptors/gitian-win.yml   | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/contrib/gitian-descriptors/gitian-linux.yml b/contrib/gitian-descriptors/gitian-linux.yml
index 13941f5d55ea3..2ea6769efa3d0 100644
--- a/contrib/gitian-descriptors/gitian-linux.yml
+++ b/contrib/gitian-descriptors/gitian-linux.yml
@@ -74,7 +74,7 @@ script: |
 
   # Create the release tarball using (arbitrarily) the first host
   ./autogen.sh
-  ./configure --prefix=${BASEPREFIX}/`echo "${HOSTS}" | awk '{print $1;}'`
+  CONFIG_SITE=${BASEPREFIX}/`echo "${HOSTS}" | awk '{print $1;}'`/share/config.site ./configure --prefix=/
   make dist
   SOURCEDIST=`echo bitcoin-*.tar.gz`
   DISTNAME=`echo ${SOURCEDIST} | sed 's/.tar.*//'`
@@ -95,11 +95,11 @@ script: |
     mkdir -p ${INSTALLPATH}
     tar --strip-components=1 -xf ../$SOURCEDIST
 
-    ./configure --prefix=${BASEPREFIX}/${i} --bindir=${INSTALLPATH}/bin --includedir=${INSTALLPATH}/include --libdir=${INSTALLPATH}/lib --disable-ccache --disable-maintainer-mode --disable-dependency-tracking ${CONFIGFLAGS}
+    CONFIG_SITE=${BASEPREFIX}/${i}/share/config.site ./configure --prefix=/ --disable-ccache --disable-maintainer-mode --disable-dependency-tracking ${CONFIGFLAGS}
     make ${MAKEOPTS}
     make ${MAKEOPTS} -C src check-security
     make ${MAKEOPTS} -C src check-symbols
-    make install-strip
+    make install-strip DESTDIR=${INSTALLPATH}
     cd installed
     find . -name "lib*.la" -delete
     find . -name "lib*.a" -delete
diff --git a/contrib/gitian-descriptors/gitian-osx.yml b/contrib/gitian-descriptors/gitian-osx.yml
index c430932f9da0e..b37b35d76b404 100644
--- a/contrib/gitian-descriptors/gitian-osx.yml
+++ b/contrib/gitian-descriptors/gitian-osx.yml
@@ -90,7 +90,7 @@ script: |
 
   # Create the release tarball using (arbitrarily) the first host
   ./autogen.sh
-  ./configure --prefix=${BASEPREFIX}/`echo "${HOSTS}" | awk '{print $1;}'`
+  CONFIG_SITE=${BASEPREFIX}/`echo "${HOSTS}" | awk '{print $1;}'`/share/config.site ./configure --prefix=/
   make dist
   SOURCEDIST=`echo bitcoin-*.tar.gz`
   DISTNAME=`echo ${SOURCEDIST} | sed 's/.tar.*//'`
@@ -112,9 +112,9 @@ script: |
     mkdir -p ${INSTALLPATH}
     tar --strip-components=1 -xf ../$SOURCEDIST
 
-    ./configure --prefix=${BASEPREFIX}/${i} --bindir=${INSTALLPATH}/bin --includedir=${INSTALLPATH}/include --libdir=${INSTALLPATH}/lib --disable-ccache --disable-maintainer-mode --disable-dependency-tracking ${CONFIGFLAGS}
+    CONFIG_SITE=${BASEPREFIX}/${i}/share/config.site ./configure --prefix=/ --disable-ccache --disable-maintainer-mode --disable-dependency-tracking ${CONFIGFLAGS}
     make ${MAKEOPTS}
-    make install-strip
+    make install-strip DESTDIR=${INSTALLPATH}
 
     make osx_volname
     make deploydir
diff --git a/contrib/gitian-descriptors/gitian-win.yml b/contrib/gitian-descriptors/gitian-win.yml
index 9f7322f0b5a21..6504a64b3bae7 100644
--- a/contrib/gitian-descriptors/gitian-win.yml
+++ b/contrib/gitian-descriptors/gitian-win.yml
@@ -101,7 +101,7 @@ script: |
 
   # Create the release tarball using (arbitrarily) the first host
   ./autogen.sh
-  ./configure --prefix=${BASEPREFIX}/`echo "${HOSTS}" | awk '{print $1;}'`
+  CONFIG_SITE=${BASEPREFIX}/`echo "${HOSTS}" | awk '{print $1;}'`/share/config.site ./configure --prefix=/
   make dist
   SOURCEDIST=`echo bitcoin-*.tar.gz`
   DISTNAME=`echo ${SOURCEDIST} | sed 's/.tar.*//'`
@@ -125,11 +125,11 @@ script: |
     mkdir -p ${INSTALLPATH}
     tar --strip-components=1 -xf ../$SOURCEDIST
 
-    ./configure --prefix=${BASEPREFIX}/${i} --bindir=${INSTALLPATH}/bin --includedir=${INSTALLPATH}/include --libdir=${INSTALLPATH}/lib --disable-ccache --disable-maintainer-mode --disable-dependency-tracking ${CONFIGFLAGS}
+    CONFIG_SITE=${BASEPREFIX}/${i}/share/config.site ./configure --prefix=/ --disable-ccache --disable-maintainer-mode --disable-dependency-tracking ${CONFIGFLAGS}
     make ${MAKEOPTS}
     make ${MAKEOPTS} -C src check-security
     make deploy
-    make install-strip
+    make install-strip DESTDIR=${INSTALLPATH}
     cp -f bitcoin-*setup*.exe $OUTDIR/
     cd installed
     mv ${DISTNAME}/bin/*.dll ${DISTNAME}/lib/

From 7e7eb2724e1d66b9d6675433798f312a71789a8f Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Tue, 7 Jun 2016 22:09:28 -0400
Subject: [PATCH 0435/1802] gitian: create debug packages for linux/windows

The -debug tarballs/zips contain detached debugging symbols. To use them, place
in the same dir as the target binary, and invoke gdb as usual.

Also, because the debug symbols add a substantial space requirement, the build
dirs are now deleted when they're no longer needed.
---
 contrib/gitian-descriptors/gitian-linux.yml | 19 ++++++++++++++-----
 contrib/gitian-descriptors/gitian-win.yml   | 18 +++++++++++++-----
 2 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/contrib/gitian-descriptors/gitian-linux.yml b/contrib/gitian-descriptors/gitian-linux.yml
index 2ea6769efa3d0..cfd254cf15c20 100644
--- a/contrib/gitian-descriptors/gitian-linux.yml
+++ b/contrib/gitian-descriptors/gitian-linux.yml
@@ -26,9 +26,12 @@ files: []
 script: |
   WRAP_DIR=$HOME/wrapped
   HOSTS="i686-pc-linux-gnu x86_64-unknown-linux-gnu"
-  CONFIGFLAGS="--enable-glibc-back-compat --enable-reduce-exports --disable-bench --disable-gui-tests LDFLAGS=-static-libstdc++"
+  CONFIGFLAGS="--enable-glibc-back-compat --enable-reduce-exports --disable-bench --disable-gui-tests"
   FAKETIME_HOST_PROGS=""
-  FAKETIME_PROGS="date ar ranlib nm strip"
+  FAKETIME_PROGS="date ar ranlib nm strip objcopy"
+  HOST_CFLAGS="-O2 -g"
+  HOST_CXXFLAGS="-O2 -g"
+  HOST_LDFLAGS=-static-libstdc++
 
   export QT_RCC_TEST=1
   export GZIP="-9n"
@@ -95,20 +98,26 @@ script: |
     mkdir -p ${INSTALLPATH}
     tar --strip-components=1 -xf ../$SOURCEDIST
 
-    CONFIG_SITE=${BASEPREFIX}/${i}/share/config.site ./configure --prefix=/ --disable-ccache --disable-maintainer-mode --disable-dependency-tracking ${CONFIGFLAGS}
+    CONFIG_SITE=${BASEPREFIX}/${i}/share/config.site ./configure --prefix=/ --disable-ccache --disable-maintainer-mode --disable-dependency-tracking ${CONFIGFLAGS} CFLAGS="${HOST_CFLAGS}" CXXFLAGS="${HOST_CXXFLAGS}" LDFLAGS="${HOST_LDFLAGS}"
     make ${MAKEOPTS}
     make ${MAKEOPTS} -C src check-security
     make ${MAKEOPTS} -C src check-symbols
-    make install-strip DESTDIR=${INSTALLPATH}
+    make install DESTDIR=${INSTALLPATH}
     cd installed
     find . -name "lib*.la" -delete
     find . -name "lib*.a" -delete
     rm -rf ${DISTNAME}/lib/pkgconfig
-    find ${DISTNAME} | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ${OUTDIR}/${DISTNAME}-${i}.tar.gz
+    find ${DISTNAME}/bin -type f -executable -exec objcopy --only-keep-debug {} {}.dbg \; -exec strip -s {} \; -exec objcopy --add-gnu-debuglink={}.dbg {} \;
+    find ${DISTNAME}/lib -type f -exec objcopy --only-keep-debug {} {}.dbg \; -exec strip -s {} \; -exec objcopy --add-gnu-debuglink={}.dbg {} \;
+    find ${DISTNAME} -not -name "*.dbg" | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ${OUTDIR}/${DISTNAME}-${i}.tar.gz
+    find ${DISTNAME} -name "*.dbg" | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ${OUTDIR}/${DISTNAME}-${i}-debug.tar.gz
     cd ../../
+    rm -rf distsrc-${i}
   done
   mkdir -p $OUTDIR/src
   mv $SOURCEDIST $OUTDIR/src
+  mv ${OUTDIR}/${DISTNAME}-x86_64-*-debug.tar.gz ${OUTDIR}/${DISTNAME}-linux64-debug.tar.gz
+  mv ${OUTDIR}/${DISTNAME}-i686-*-debug.tar.gz ${OUTDIR}/${DISTNAME}-linux32-debug.tar.gz
   mv ${OUTDIR}/${DISTNAME}-x86_64-*.tar.gz ${OUTDIR}/${DISTNAME}-linux64.tar.gz
   mv ${OUTDIR}/${DISTNAME}-i686-*.tar.gz ${OUTDIR}/${DISTNAME}-linux32.tar.gz
 
diff --git a/contrib/gitian-descriptors/gitian-win.yml b/contrib/gitian-descriptors/gitian-win.yml
index 6504a64b3bae7..bb57d2faf75c6 100644
--- a/contrib/gitian-descriptors/gitian-win.yml
+++ b/contrib/gitian-descriptors/gitian-win.yml
@@ -30,8 +30,10 @@ script: |
   WRAP_DIR=$HOME/wrapped
   HOSTS="x86_64-w64-mingw32 i686-w64-mingw32"
   CONFIGFLAGS="--enable-reduce-exports --disable-gui-tests"
-  FAKETIME_HOST_PROGS="g++ ar ranlib nm windres strip"
+  FAKETIME_HOST_PROGS="g++ ar ranlib nm windres strip objcopy"
   FAKETIME_PROGS="date makensis zip"
+  HOST_CFLAGS="-O2 -g"
+  HOST_CXXFLAGS="-O2 -g"
 
   export QT_RCC_TEST=1
   export GZIP="-9n"
@@ -125,22 +127,28 @@ script: |
     mkdir -p ${INSTALLPATH}
     tar --strip-components=1 -xf ../$SOURCEDIST
 
-    CONFIG_SITE=${BASEPREFIX}/${i}/share/config.site ./configure --prefix=/ --disable-ccache --disable-maintainer-mode --disable-dependency-tracking ${CONFIGFLAGS}
+    CONFIG_SITE=${BASEPREFIX}/${i}/share/config.site ./configure --prefix=/ --disable-ccache --disable-maintainer-mode --disable-dependency-tracking ${CONFIGFLAGS} CFLAGS="${HOST_CFLAGS}" CXXFLAGS="${HOST_CXXFLAGS}"
     make ${MAKEOPTS}
     make ${MAKEOPTS} -C src check-security
     make deploy
-    make install-strip DESTDIR=${INSTALLPATH}
+    make install DESTDIR=${INSTALLPATH}
     cp -f bitcoin-*setup*.exe $OUTDIR/
     cd installed
     mv ${DISTNAME}/bin/*.dll ${DISTNAME}/lib/
     find . -name "lib*.la" -delete
     find . -name "lib*.a" -delete
     rm -rf ${DISTNAME}/lib/pkgconfig
-    find ${DISTNAME} -type f | sort | zip -X@ ${OUTDIR}/${DISTNAME}-${i}.zip
-    cd ../..
+    find ${DISTNAME}/bin -type f -executable -exec ${i}-objcopy --only-keep-debug {} {}.dbg \; -exec ${i}-strip -s {} \; -exec ${i}-objcopy --add-gnu-debuglink={}.dbg {} \;
+    find ${DISTNAME}/lib -type f -exec ${i}-objcopy --only-keep-debug {} {}.dbg \; -exec ${i}-strip -s {} \; -exec ${i}-objcopy --add-gnu-debuglink={}.dbg {} \;
+    find ${DISTNAME} -not -name "*.dbg"  -type f | sort | zip -X@ ${OUTDIR}/${DISTNAME}-${i}.zip
+    find ${DISTNAME} -name "*.dbg"  -type f | sort | zip -X@ ${OUTDIR}/${DISTNAME}-${i}-debug.zip
+    cd ../../
+    rm -rf distsrc-${i}
   done
   cd $OUTDIR
   rename 's/-setup\.exe$/-setup-unsigned.exe/' *-setup.exe
   find . -name "*-setup-unsigned.exe" | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ${OUTDIR}/${DISTNAME}-win-unsigned.tar.gz
+  mv ${OUTDIR}/${DISTNAME}-x86_64-*-debug.zip ${OUTDIR}/${DISTNAME}-win64-debug.zip
+  mv ${OUTDIR}/${DISTNAME}-i686-*-debug.zip ${OUTDIR}/${DISTNAME}-win32-debug.zip
   mv ${OUTDIR}/${DISTNAME}-x86_64-*.zip ${OUTDIR}/${DISTNAME}-win64.zip
   mv ${OUTDIR}/${DISTNAME}-i686-*.zip ${OUTDIR}/${DISTNAME}-win32.zip

From e012f3cea0ca4096dd4dd59a356a973c43651912 Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Wed, 8 Jun 2016 10:23:25 +0200
Subject: [PATCH 0436/1802] util: Add ParseUInt32 and ParseUInt64

Add error and range-checking parsers for unsigned 32 and 64 bit numbers.
The 32-bit variant is required for parsing sequence numbers from the
command line in `bitcoin-tx` (see #8164 for discussion). I've thrown in
the 64-bit variant as a bonus, as I'm sure it will be needed at some
point.

Also adds tests, and updates `developer-notes.md`.
---
 doc/developer-notes.md   |  2 +-
 src/test/util_tests.cpp  | 63 ++++++++++++++++++++++++++++++++++++++++
 src/utilstrencodings.cpp | 34 ++++++++++++++++++++++
 src/utilstrencodings.h   | 14 +++++++++
 4 files changed, 112 insertions(+), 1 deletion(-)

diff --git a/doc/developer-notes.md b/doc/developer-notes.md
index add2fb5004d8e..e40b73ffa7b93 100644
--- a/doc/developer-notes.md
+++ b/doc/developer-notes.md
@@ -323,7 +323,7 @@ Strings and formatting
     buffer overflows and surprises with `\0` characters. Also some C string manipulations
     tend to act differently depending on platform, or even the user locale
 
-- Use `ParseInt32`, `ParseInt64`, `ParseDouble` from `utilstrencodings.h` for number parsing
+- Use `ParseInt32`, `ParseInt64`, `ParseUInt32`, `ParseUInt64`, `ParseDouble` from `utilstrencodings.h` for number parsing
 
   - *Rationale*: These functions do overflow checking, and avoid pesky locale issues
 
diff --git a/src/test/util_tests.cpp b/src/test/util_tests.cpp
index b99f952a0dbc4..e467a4171d984 100644
--- a/src/test/util_tests.cpp
+++ b/src/test/util_tests.cpp
@@ -376,6 +376,69 @@ BOOST_AUTO_TEST_CASE(test_ParseInt64)
     BOOST_CHECK(!ParseInt64("32482348723847471234", NULL));
 }
 
+BOOST_AUTO_TEST_CASE(test_ParseUInt32)
+{
+    uint32_t n;
+    // Valid values
+    BOOST_CHECK(ParseUInt32("1234", NULL));
+    BOOST_CHECK(ParseUInt32("0", &n) && n == 0);
+    BOOST_CHECK(ParseUInt32("1234", &n) && n == 1234);
+    BOOST_CHECK(ParseUInt32("01234", &n) && n == 1234); // no octal
+    BOOST_CHECK(ParseUInt32("2147483647", &n) && n == 2147483647);
+    BOOST_CHECK(ParseUInt32("2147483648", &n) && n == (uint32_t)2147483648);
+    BOOST_CHECK(ParseUInt32("4294967295", &n) && n == (uint32_t)4294967295);
+    // Invalid values
+    BOOST_CHECK(!ParseUInt32("", &n));
+    BOOST_CHECK(!ParseUInt32(" 1", &n)); // no padding inside
+    BOOST_CHECK(!ParseUInt32(" -1", &n));
+    BOOST_CHECK(!ParseUInt32("1 ", &n));
+    BOOST_CHECK(!ParseUInt32("1a", &n));
+    BOOST_CHECK(!ParseUInt32("aap", &n));
+    BOOST_CHECK(!ParseUInt32("0x1", &n)); // no hex
+    BOOST_CHECK(!ParseUInt32("0x1", &n)); // no hex
+    const char test_bytes[] = {'1', 0, '1'};
+    std::string teststr(test_bytes, sizeof(test_bytes));
+    BOOST_CHECK(!ParseUInt32(teststr, &n)); // no embedded NULs
+    // Overflow and underflow
+    BOOST_CHECK(!ParseUInt32("-2147483648", &n));
+    BOOST_CHECK(!ParseUInt32("4294967296", &n));
+    BOOST_CHECK(!ParseUInt32("-1234", &n));
+    BOOST_CHECK(!ParseUInt32("-32482348723847471234", NULL));
+    BOOST_CHECK(!ParseUInt32("32482348723847471234", NULL));
+}
+
+BOOST_AUTO_TEST_CASE(test_ParseUInt64)
+{
+    uint64_t n;
+    // Valid values
+    BOOST_CHECK(ParseUInt64("1234", NULL));
+    BOOST_CHECK(ParseUInt64("0", &n) && n == 0LL);
+    BOOST_CHECK(ParseUInt64("1234", &n) && n == 1234LL);
+    BOOST_CHECK(ParseUInt64("01234", &n) && n == 1234LL); // no octal
+    BOOST_CHECK(ParseUInt64("2147483647", &n) && n == 2147483647LL);
+    BOOST_CHECK(ParseUInt64("9223372036854775807", &n) && n == 9223372036854775807ULL);
+    BOOST_CHECK(ParseUInt64("9223372036854775808", &n) && n == 9223372036854775808ULL);
+    BOOST_CHECK(ParseUInt64("18446744073709551615", &n) && n == 18446744073709551615ULL);
+    // Invalid values
+    BOOST_CHECK(!ParseUInt64("", &n));
+    BOOST_CHECK(!ParseUInt64(" 1", &n)); // no padding inside
+    BOOST_CHECK(!ParseUInt64(" -1", &n));
+    BOOST_CHECK(!ParseUInt64("1 ", &n));
+    BOOST_CHECK(!ParseUInt64("1a", &n));
+    BOOST_CHECK(!ParseUInt64("aap", &n));
+    BOOST_CHECK(!ParseUInt64("0x1", &n)); // no hex
+    const char test_bytes[] = {'1', 0, '1'};
+    std::string teststr(test_bytes, sizeof(test_bytes));
+    BOOST_CHECK(!ParseUInt64(teststr, &n)); // no embedded NULs
+    // Overflow and underflow
+    BOOST_CHECK(!ParseUInt64("-9223372036854775809", NULL));
+    BOOST_CHECK(!ParseUInt64("18446744073709551616", NULL));
+    BOOST_CHECK(!ParseUInt64("-32482348723847471234", NULL));
+    BOOST_CHECK(!ParseUInt64("-2147483648", &n));
+    BOOST_CHECK(!ParseUInt64("-9223372036854775808", &n));
+    BOOST_CHECK(!ParseUInt64("-1234", &n));
+}
+
 BOOST_AUTO_TEST_CASE(test_ParseDouble)
 {
     double n;
diff --git a/src/utilstrencodings.cpp b/src/utilstrencodings.cpp
index 0f9334cbe3738..5ffdb3be15cf4 100644
--- a/src/utilstrencodings.cpp
+++ b/src/utilstrencodings.cpp
@@ -461,6 +461,40 @@ bool ParseInt64(const std::string& str, int64_t *out)
         n <= std::numeric_limits<int64_t>::max();
 }
 
+bool ParseUInt32(const std::string& str, uint32_t *out)
+{
+    if (!ParsePrechecks(str))
+        return false;
+    if (str.size() >= 1 && str[0] == '-') // Reject negative values, unfortunately strtoul accepts these by default if they fit in the range
+        return false;
+    char *endp = NULL;
+    errno = 0; // strtoul will not set errno if valid
+    unsigned long int n = strtoul(str.c_str(), &endp, 10);
+    if(out) *out = (uint32_t)n;
+    // Note that strtoul returns a *unsigned long int*, so even if it doesn't report a over/underflow
+    // we still have to check that the returned value is within the range of an *uint32_t*. On 64-bit
+    // platforms the size of these types may be different.
+    return endp && *endp == 0 && !errno &&
+        n <= std::numeric_limits<uint32_t>::max();
+}
+
+bool ParseUInt64(const std::string& str, uint64_t *out)
+{
+    if (!ParsePrechecks(str))
+        return false;
+    if (str.size() >= 1 && str[0] == '-') // Reject negative values, unfortunately strtoull accepts these by default if they fit in the range
+        return false;
+    char *endp = NULL;
+    errno = 0; // strtoull will not set errno if valid
+    unsigned long long int n = strtoull(str.c_str(), &endp, 10);
+    if(out) *out = (uint64_t)n;
+    // Note that strtoull returns a *unsigned long long int*, so even if it doesn't report a over/underflow
+    // we still have to check that the returned value is within the range of an *uint64_t*.
+    return endp && *endp == 0 && !errno &&
+        n <= std::numeric_limits<uint64_t>::max();
+}
+
+
 bool ParseDouble(const std::string& str, double *out)
 {
     if (!ParsePrechecks(str))
diff --git a/src/utilstrencodings.h b/src/utilstrencodings.h
index d40613cfc43bc..5744f78c6e631 100644
--- a/src/utilstrencodings.h
+++ b/src/utilstrencodings.h
@@ -70,6 +70,20 @@ bool ParseInt32(const std::string& str, int32_t *out);
  */
 bool ParseInt64(const std::string& str, int64_t *out);
 
+/**
+ * Convert decimal string to unsigned 32-bit integer with strict parse error feedback.
+ * @returns true if the entire string could be parsed as valid integer,
+ *   false if not the entire string could be parsed or when overflow or underflow occurred.
+ */
+bool ParseUInt32(const std::string& str, uint32_t *out);
+
+/**
+ * Convert decimal string to unsigned 64-bit integer with strict parse error feedback.
+ * @returns true if the entire string could be parsed as valid integer,
+ *   false if not the entire string could be parsed or when overflow or underflow occurred.
+ */
+bool ParseUInt64(const std::string& str, uint64_t *out);
+
 /**
  * Convert string to double with strict parse error feedback.
  * @returns true if the entire string could be parsed as valid double,

From cdf7dff4248ec4050e535079227dd57cbfb610e4 Mon Sep 17 00:00:00 2001
From: Jonas Schnelli <dev@jonasschnelli.ch>
Date: Wed, 8 Jun 2016 13:25:50 +0200
Subject: [PATCH 0437/1802] OSX diskimages need 0775 folder permissions Avoids
 endless Gatekeeper warnings (#7085)

---
 contrib/gitian-descriptors/gitian-osx-signer.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contrib/gitian-descriptors/gitian-osx-signer.yml b/contrib/gitian-descriptors/gitian-osx-signer.yml
index fac61aa3debed..8b2b1467cfe85 100644
--- a/contrib/gitian-descriptors/gitian-osx-signer.yml
+++ b/contrib/gitian-descriptors/gitian-osx-signer.yml
@@ -34,5 +34,5 @@ script: |
   tar -xf ${UNSIGNED}
   OSX_VOLNAME="$(cat osx_volname)"
   ./detached-sig-apply.sh ${UNSIGNED} signature/osx
-  ${WRAP_DIR}/genisoimage -no-cache-inodes -D -l -probe -V "${OSX_VOLNAME}" -no-pad -r -apple -o uncompressed.dmg signed-app
+  ${WRAP_DIR}/genisoimage -no-cache-inodes -D -l -probe -V "${OSX_VOLNAME}" -no-pad -r -dir-mode 0755 -apple -o uncompressed.dmg signed-app
   ${WRAP_DIR}/dmg dmg uncompressed.dmg ${OUTDIR}/${SIGNED}

From 77f63a4fcd0517a6804bde7285e1859d5a087d77 Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Wed, 8 Jun 2016 15:34:18 +0200
Subject: [PATCH 0438/1802] Fix two warnings for comparison between signed and
 unsigned

---
 src/wallet/rpcwallet.cpp | 2 +-
 src/wallet/wallet.cpp    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index 1300e39aa9412..2d4e95911dd0f 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -2457,7 +2457,7 @@ UniValue fundrawtransaction(const UniValue& params, bool fHelp)
     if (origTx.vout.size() == 0)
         throw JSONRPCError(RPC_INVALID_PARAMETER, "TX must have at least one output");
 
-    if (changePosition != -1 && (changePosition < 0 || changePosition > origTx.vout.size()))
+    if (changePosition != -1 && (changePosition < 0 || (unsigned int)changePosition > origTx.vout.size()))
         throw JSONRPCError(RPC_INVALID_PARAMETER, "changePosition out of bounds");
 
     CMutableTransaction tx(origTx);
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index f3d165472aec2..9faf21591fa84 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -2232,7 +2232,7 @@ bool CWallet::CreateTransaction(const vector<CRecipient>& vecSend, CWalletTx& wt
                             // Insert change txn at random position:
                             nChangePosInOut = GetRandInt(txNew.vout.size()+1);
                         }
-                        else if (nChangePosInOut > txNew.vout.size())
+                        else if ((unsigned int)nChangePosInOut > txNew.vout.size())
                         {
                             strFailReason = _("Change index out of range");
                             return false;

From 6fa950a57334e93e70d806532ee517cbd75a2338 Mon Sep 17 00:00:00 2001
From: Jonas Schnelli <dev@jonasschnelli.ch>
Date: Wed, 8 Jun 2016 15:34:25 +0200
Subject: [PATCH 0439/1802] [RPC] Fix createrawtx sequence number unsigned int
 parsing

---
 qa/rpc-tests/rawtransactions.py | 14 ++++++++++++++
 src/rpc/rawtransaction.cpp      |  9 +++++++--
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/qa/rpc-tests/rawtransactions.py b/qa/rpc-tests/rawtransactions.py
index aa403f058c538..ab6d2e8def148 100755
--- a/qa/rpc-tests/rawtransactions.py
+++ b/qa/rpc-tests/rawtransactions.py
@@ -143,6 +143,20 @@ def run_test(self):
         rawtx   = self.nodes[0].createrawtransaction(inputs, outputs)
         decrawtx= self.nodes[0].decoderawtransaction(rawtx)
         assert_equal(decrawtx['vin'][0]['sequence'], 1000)
+        
+        inputs  = [ {'txid' : "1d1d4e24ed99057e84c3f80fd8fbec79ed9e1acee37da269356ecea000000000", 'vout' : 1, 'sequence' : -1}]
+        outputs = { self.nodes[0].getnewaddress() : 1 }
+        assert_raises(JSONRPCException, self.nodes[0].createrawtransaction, inputs, outputs)
+        
+        inputs  = [ {'txid' : "1d1d4e24ed99057e84c3f80fd8fbec79ed9e1acee37da269356ecea000000000", 'vout' : 1, 'sequence' : 4294967296}]
+        outputs = { self.nodes[0].getnewaddress() : 1 }
+        assert_raises(JSONRPCException, self.nodes[0].createrawtransaction, inputs, outputs)
+        
+        inputs  = [ {'txid' : "1d1d4e24ed99057e84c3f80fd8fbec79ed9e1acee37da269356ecea000000000", 'vout' : 1, 'sequence' : 4294967294}]
+        outputs = { self.nodes[0].getnewaddress() : 1 }
+        rawtx   = self.nodes[0].createrawtransaction(inputs, outputs)
+        decrawtx= self.nodes[0].decoderawtransaction(rawtx)
+        assert_equal(decrawtx['vin'][0]['sequence'], 4294967294)
 
 if __name__ == '__main__':
     RawTransactionsTest().main()
diff --git a/src/rpc/rawtransaction.cpp b/src/rpc/rawtransaction.cpp
index 992914f88c121..9723e394d6509 100644
--- a/src/rpc/rawtransaction.cpp
+++ b/src/rpc/rawtransaction.cpp
@@ -388,8 +388,13 @@ UniValue createrawtransaction(const UniValue& params, bool fHelp)
 
         // set the sequence number if passed in the parameters object
         const UniValue& sequenceObj = find_value(o, "sequence");
-        if (sequenceObj.isNum())
-            nSequence = sequenceObj.get_int();
+        if (sequenceObj.isNum()) {
+            int64_t seqNr64 = sequenceObj.get_int64();
+            if (seqNr64 < 0 || seqNr64 > std::numeric_limits<uint32_t>::max())
+                throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid parameter, sequence number is out of range");
+            else
+                nSequence = (uint32_t)seqNr64;
+        }
 
         CTxIn in(COutPoint(txid, nOutput), CScript(), nSequence);
 

From eebc23218758d89bce0b7cb0eced9fd654cd3d15 Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Wed, 8 Jun 2016 15:49:27 +0200
Subject: [PATCH 0440/1802] test: Add more test vectors for siphash

Add full test vectors from spec, test per byte and per 8 bytes.

Builds on #8086.
---
 src/test/hash_tests.cpp | 48 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 48 insertions(+)

diff --git a/src/test/hash_tests.cpp b/src/test/hash_tests.cpp
index f62080c1d24f8..82d61209b5e50 100644
--- a/src/test/hash_tests.cpp
+++ b/src/test/hash_tests.cpp
@@ -47,6 +47,38 @@ BOOST_AUTO_TEST_CASE(murmurhash3)
 #undef T
 }
 
+/*
+   SipHash-2-4 output with
+   k = 00 01 02 ...
+   and
+   in = (empty string)
+   in = 00 (1 byte)
+   in = 00 01 (2 bytes)
+   in = 00 01 02 (3 bytes)
+   ...
+   in = 00 01 02 ... 3e (63 bytes)
+
+   from: https://131002.net/siphash/siphash24.c
+*/
+uint64_t siphash_4_2_testvec[] = {
+    0x726fdb47dd0e0e31, 0x74f839c593dc67fd, 0x0d6c8009d9a94f5a, 0x85676696d7fb7e2d,
+    0xcf2794e0277187b7, 0x18765564cd99a68d, 0xcbc9466e58fee3ce, 0xab0200f58b01d137,
+    0x93f5f5799a932462, 0x9e0082df0ba9e4b0, 0x7a5dbbc594ddb9f3, 0xf4b32f46226bada7,
+    0x751e8fbc860ee5fb, 0x14ea5627c0843d90, 0xf723ca908e7af2ee, 0xa129ca6149be45e5,
+    0x3f2acc7f57c29bdb, 0x699ae9f52cbe4794, 0x4bc1b3f0968dd39c, 0xbb6dc91da77961bd,
+    0xbed65cf21aa2ee98, 0xd0f2cbb02e3b67c7, 0x93536795e3a33e88, 0xa80c038ccd5ccec8,
+    0xb8ad50c6f649af94, 0xbce192de8a85b8ea, 0x17d835b85bbb15f3, 0x2f2e6163076bcfad,
+    0xde4daaaca71dc9a5, 0xa6a2506687956571, 0xad87a3535c49ef28, 0x32d892fad841c342,
+    0x7127512f72f27cce, 0xa7f32346f95978e3, 0x12e0b01abb051238, 0x15e034d40fa197ae,
+    0x314dffbe0815a3b4, 0x027990f029623981, 0xcadcd4e59ef40c4d, 0x9abfd8766a33735c,
+    0x0e3ea96b5304a7d0, 0xad0c42d6fc585992, 0x187306c89bc215a9, 0xd4a60abcf3792b95,
+    0xf935451de4f21df2, 0xa9538f0419755787, 0xdb9acddff56ca510, 0xd06c98cd5c0975eb,
+    0xe612a3cb9ecba951, 0xc766e62cfcadaf96, 0xee64435a9752fe72, 0xa192d576b245165a,
+    0x0a8787bf8ecb74b2, 0x81b3e73d20b49b6f, 0x7fa8220ba3b2ecea, 0x245731c13ca42499,
+    0xb78dbfaf3a8d83bd, 0xea1ad565322a1a0b, 0x60e61c23a3795013, 0x6606d7e446282b93,
+    0x6ca4ecb15c5f91e1, 0x9f626da15c9625f3, 0xe51b38608ef25f57, 0x958a324ceb064572
+};
+
 BOOST_AUTO_TEST_CASE(siphash)
 {
     CSipHasher hasher(0x0706050403020100ULL, 0x0F0E0D0C0B0A0908ULL);
@@ -74,6 +106,22 @@ BOOST_AUTO_TEST_CASE(siphash)
     BOOST_CHECK_EQUAL(hasher.Finalize(),  0xe612a3cb9ecba951ull);
 
     BOOST_CHECK_EQUAL(SipHashUint256(0x0706050403020100ULL, 0x0F0E0D0C0B0A0908ULL, uint256S("1f1e1d1c1b1a191817161514131211100f0e0d0c0b0a09080706050403020100")), 0x7127512f72f27cceull);
+
+    // Check test vectors from spec, one byte at a time
+    CSipHasher hasher2(0x0706050403020100ULL, 0x0F0E0D0C0B0A0908ULL);
+    for (uint8_t x=0; x<ARRAYLEN(siphash_4_2_testvec); ++x)
+    {
+        BOOST_CHECK_EQUAL(hasher2.Finalize(), siphash_4_2_testvec[x]);
+        hasher2.Write(&x, 1);
+    }
+    // Check test vectors from spec, eight bytes at a time
+    CSipHasher hasher3(0x0706050403020100ULL, 0x0F0E0D0C0B0A0908ULL);
+    for (uint8_t x=0; x<ARRAYLEN(siphash_4_2_testvec); x+=8)
+    {
+        BOOST_CHECK_EQUAL(hasher3.Finalize(), siphash_4_2_testvec[x]);
+        hasher3.Write(uint64_t(x)|(uint64_t(x+1)<<8)|(uint64_t(x+2)<<16)|(uint64_t(x+3)<<24)|
+                     (uint64_t(x+4)<<32)|(uint64_t(x+5)<<40)|(uint64_t(x+6)<<48)|(uint64_t(x+7)<<56));
+    }
 }
 
 BOOST_AUTO_TEST_SUITE_END()

From ff2dcf274d8a69de07a8cbd3ada3aaaca38501cf Mon Sep 17 00:00:00 2001
From: mrbandrews <bandrewsny@gmail.com>
Date: Wed, 8 Jun 2016 15:09:01 -0400
Subject: [PATCH 0441/1802] Tests: Edit bloated varint test and add option for
 'barely expensive' tests

---
 qa/rpc-tests/p2p-fullblocktest.py | 98 +++++++++++++++++--------------
 1 file changed, 53 insertions(+), 45 deletions(-)

diff --git a/qa/rpc-tests/p2p-fullblocktest.py b/qa/rpc-tests/p2p-fullblocktest.py
index 19b90d4db11eb..17fd40ef1dffd 100755
--- a/qa/rpc-tests/p2p-fullblocktest.py
+++ b/qa/rpc-tests/p2p-fullblocktest.py
@@ -65,6 +65,10 @@ def __init__(self):
         self.tip = None
         self.blocks = {}
 
+    def add_options(self, parser):
+        super().add_options(parser)
+        parser.add_option("--runbarelyexpensive", dest="runbarelyexpensive", default=True)
+
     def run_test(self):
         self.test = TestManager(self, self.options.tmpdir)
         self.test.add_all_connections(self.nodes)
@@ -875,10 +879,13 @@ def update_block(block_number, new_transactions):
         yield rejected(RejectResult(16, b'bad-txns-nonfinal'))
 
 
-        #  This checks that a block with a bloated VARINT between the block_header and the array of tx is rejected
-        #  (previous behavior was that it was accepted.)  It also checks that if you subsequently send that block
-        #  with correct encoding, it should be accepted (i.e., the receiving node should not reject it on the
-        #  basis that it's the same as an already-rejected block, which would be a DoS vulnerability.)
+        #  This checks that a block with a bloated VARINT between the block_header and the array of tx such that
+        #  the block is > MAX_BLOCK_SIZE with the bloated varint, but <= MAX_BLOCK_SIZE without the bloated varint,
+        #  does not cause a subsequent, identical block with canonical encoding to be rejected.  The test does not
+        #  care whether the bloated block is accepted or rejected; it only cares that the second block is accepted.
+        #
+        #  What matters is that the receiving node should not reject the bloated block, and then reject the canonical
+        #  block on the basis that it's the same as an already-rejected block (which would be a consensus failure.)
         #
         #  -> b39 (11) -> b42 (12) -> b43 (13) -> b53 (14) -> b55 (15) -> b57 (16) -> b60 (17) -> b64 (18)
         #                                                                                        \
@@ -903,7 +910,7 @@ def update_block(block_number, new_transactions):
         tx.vin.append(CTxIn(COutPoint(b64a.vtx[1].sha256, 0)))
         b64a = update_block("64a", [tx])
         assert_equal(len(b64a.serialize()), MAX_BLOCK_SIZE + 8)
-        yield rejected()
+        yield TestInstance([[self.tip, None]])
 
         # comptool workaround: to make sure b64 is delivered, manually erase b64a from blockstore
         self.test.block_store.erase(b64a.sha256)
@@ -941,7 +948,6 @@ def update_block(block_number, new_transactions):
         update_block(66, [tx2, tx1])
         yield rejected(RejectResult(16, b'bad-txns-inputs-missingorspent'))
 
-
         # Attempt to double-spend a transaction created in a block
         #
         # -> b43 (13) -> b53 (14) -> b55 (15) -> b57 (16) -> b60 (17) -> b64 (18) -> b65 (19)
@@ -1239,46 +1245,48 @@ def update_block(block_number, new_transactions):
         #  Test re-org of a week's worth of blocks (1088 blocks)
         #  This test takes a minute or two and can be accomplished in memory
         #
-        tip(88)
-        LARGE_REORG_SIZE = 1088
-        test1 = TestInstance(sync_every_block=False)
-        spend=out[32]
-        for i in range(89, LARGE_REORG_SIZE + 89):
-            b = block(i, spend)
-            tx = CTransaction()
-            script_length = MAX_BLOCK_SIZE - len(b.serialize()) - 69
-            script_output = CScript([b'\x00' * script_length])
-            tx.vout.append(CTxOut(0, script_output))
-            tx.vin.append(CTxIn(COutPoint(b.vtx[1].sha256, 0)))
-            b = update_block(i, [tx])
-            assert_equal(len(b.serialize()), MAX_BLOCK_SIZE)
-            test1.blocks_and_transactions.append([self.tip, True])
-            save_spendable_output()
-            spend = get_spendable_output()
-
-        yield test1
-        chain1_tip = i
-
-        # now create alt chain of same length
-        tip(88)
-        test2 = TestInstance(sync_every_block=False)
-        for i in range(89, LARGE_REORG_SIZE + 89):
-            block("alt"+str(i))
-            test2.blocks_and_transactions.append([self.tip, False])
-        yield test2
-
-        # extend alt chain to trigger re-org
-        block("alt" + str(chain1_tip + 1))
-        yield accepted()
-
-        # ... and re-org back to the first chain
-        tip(chain1_tip)
-        block(chain1_tip + 1)
-        yield rejected()
-        block(chain1_tip + 2)
-        yield accepted()
+        if self.options.runbarelyexpensive:
+            tip(88)
+            LARGE_REORG_SIZE = 1088
+            test1 = TestInstance(sync_every_block=False)
+            spend=out[32]
+            for i in range(89, LARGE_REORG_SIZE + 89):
+                b = block(i, spend)
+                tx = CTransaction()
+                script_length = MAX_BLOCK_SIZE - len(b.serialize()) - 69
+                script_output = CScript([b'\x00' * script_length])
+                tx.vout.append(CTxOut(0, script_output))
+                tx.vin.append(CTxIn(COutPoint(b.vtx[1].sha256, 0)))
+                b = update_block(i, [tx])
+                assert_equal(len(b.serialize()), MAX_BLOCK_SIZE)
+                test1.blocks_and_transactions.append([self.tip, True])
+                save_spendable_output()
+                spend = get_spendable_output()
+
+            yield test1
+            chain1_tip = i
+
+            # now create alt chain of same length
+            tip(88)
+            test2 = TestInstance(sync_every_block=False)
+            for i in range(89, LARGE_REORG_SIZE + 89):
+                block("alt"+str(i))
+                test2.blocks_and_transactions.append([self.tip, False])
+            yield test2
+
+            # extend alt chain to trigger re-org
+            block("alt" + str(chain1_tip + 1))
+            yield accepted()
+
+            # ... and re-org back to the first chain
+            tip(chain1_tip)
+            block(chain1_tip + 1)
+            yield rejected()
+            block(chain1_tip + 2)
+            yield accepted()
+
+            chain1_tip += 2
 
-        chain1_tip += 2
 
 
 if __name__ == '__main__':

From 74c134748291bff8b94244456ae6b97f8e587645 Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Wed, 8 Jun 2016 20:21:18 +0200
Subject: [PATCH 0442/1802] gitian: Add --disable-bench to config flags for
 windows

Forgot to do this in #7776.
---
 contrib/gitian-descriptors/gitian-win.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contrib/gitian-descriptors/gitian-win.yml b/contrib/gitian-descriptors/gitian-win.yml
index bb57d2faf75c6..65f76e8df81eb 100644
--- a/contrib/gitian-descriptors/gitian-win.yml
+++ b/contrib/gitian-descriptors/gitian-win.yml
@@ -29,7 +29,7 @@ files: []
 script: |
   WRAP_DIR=$HOME/wrapped
   HOSTS="x86_64-w64-mingw32 i686-w64-mingw32"
-  CONFIGFLAGS="--enable-reduce-exports --disable-gui-tests"
+  CONFIGFLAGS="--enable-reduce-exports --disable-bench --disable-gui-tests"
   FAKETIME_HOST_PROGS="g++ ar ranlib nm windres strip objcopy"
   FAKETIME_PROGS="date makensis zip"
   HOST_CFLAGS="-O2 -g"

From 0d53a9e72f9694e84344f230317aa2485bc07960 Mon Sep 17 00:00:00 2001
From: Luke Dashjr <luke-jr+git@utopios.org>
Date: Thu, 9 Jun 2016 05:20:30 +0000
Subject: [PATCH 0443/1802] Update luke-jr's PGP key

Same key, extended expiration date
---
 contrib/gitian-keys/luke-jr-key.pgp | Bin 6518 -> 6518 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/contrib/gitian-keys/luke-jr-key.pgp b/contrib/gitian-keys/luke-jr-key.pgp
index 4406e6d5be02c1e9006c6ecccc1e4c7c0dbad60c..a2d34e75e1c16c17cb721633038813800dbe45b3 100644
GIT binary patch
delta 4256
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
CqBzt5

delta 4256
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
A(f|Me


From d096d22446a1d126ea78170f37a148ce0ca43df2 Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Thu, 9 Jun 2016 11:09:21 +0200
Subject: [PATCH 0444/1802] build: Get rid of `CLIENT_DATE`

Putting the build date in the executable is a practice that has no place
in these days, now that deterministic building is increasingly common.

Continues #7732 which did this for the GUI.
---
 share/genbuild.sh      | 7 -------
 src/clientversion.cpp  | 9 ---------
 src/clientversion.h    | 1 -
 src/init.cpp           | 2 +-
 src/wallet/rpcdump.cpp | 2 +-
 5 files changed, 2 insertions(+), 19 deletions(-)

diff --git a/share/genbuild.sh b/share/genbuild.sh
index a15cb34e47ae6..1ef77d706f7aa 100755
--- a/share/genbuild.sh
+++ b/share/genbuild.sh
@@ -15,7 +15,6 @@ fi
 
 DESC=""
 SUFFIX=""
-LAST_COMMIT_DATE=""
 if [ -e "$(which git 2>/dev/null)" -a "$(git rev-parse --is-inside-work-tree 2>/dev/null)" = "true" ]; then
     # clean 'dirty' status of touched files that haven't been modified
     git diff >/dev/null 2>/dev/null 
@@ -29,9 +28,6 @@ if [ -e "$(which git 2>/dev/null)" -a "$(git rev-parse --is-inside-work-tree 2>/
     # otherwise generate suffix from git, i.e. string like "59887e8-dirty"
     SUFFIX=$(git rev-parse --short HEAD)
     git diff-index --quiet HEAD -- || SUFFIX="$SUFFIX-dirty"
-
-    # get a string like "2012-04-10 16:27:19 +0200"
-    LAST_COMMIT_DATE="$(git log -n 1 --format="%ci")"
 fi
 
 if [ -n "$DESC" ]; then
@@ -45,7 +41,4 @@ fi
 # only update build.h if necessary
 if [ "$INFO" != "$NEWINFO" ]; then
     echo "$NEWINFO" >"$FILE"
-    if [ -n "$LAST_COMMIT_DATE" ]; then
-        echo "#define BUILD_DATE \"$LAST_COMMIT_DATE\"" >> "$FILE"
-    fi
 fi
diff --git a/src/clientversion.cpp b/src/clientversion.cpp
index aae0569bba211..bfe9e16f80ee7 100644
--- a/src/clientversion.cpp
+++ b/src/clientversion.cpp
@@ -67,16 +67,7 @@ const std::string CLIENT_NAME("Satoshi");
 #endif
 #endif
 
-#ifndef BUILD_DATE
-#ifdef GIT_COMMIT_DATE
-#define BUILD_DATE GIT_COMMIT_DATE
-#else
-#define BUILD_DATE __DATE__ ", " __TIME__
-#endif
-#endif
-
 const std::string CLIENT_BUILD(BUILD_DESC CLIENT_VERSION_SUFFIX);
-const std::string CLIENT_DATE(BUILD_DATE);
 
 static std::string FormatVersion(int nVersion)
 {
diff --git a/src/clientversion.h b/src/clientversion.h
index 6f255d69c96ef..47263d5344f3c 100644
--- a/src/clientversion.h
+++ b/src/clientversion.h
@@ -59,7 +59,6 @@ static const int CLIENT_VERSION =
 
 extern const std::string CLIENT_NAME;
 extern const std::string CLIENT_BUILD;
-extern const std::string CLIENT_DATE;
 
 
 std::string FormatFullVersion();
diff --git a/src/init.cpp b/src/init.cpp
index 3a260d16db5a2..ec4ce6b6da7b6 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -748,7 +748,7 @@ void InitLogging()
     fLogIPs = GetBoolArg("-logips", DEFAULT_LOGIPS);
 
     LogPrintf("\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n");
-    LogPrintf("Bitcoin version %s (%s)\n", FormatFullVersion(), CLIENT_DATE);
+    LogPrintf("Bitcoin version %s\n", FormatFullVersion());
 }
 
 /** Initialize bitcoin.
diff --git a/src/wallet/rpcdump.cpp b/src/wallet/rpcdump.cpp
index bb40cf724536a..14c2e31d956d6 100644
--- a/src/wallet/rpcdump.cpp
+++ b/src/wallet/rpcdump.cpp
@@ -590,7 +590,7 @@ UniValue dumpwallet(const UniValue& params, bool fHelp)
     std::sort(vKeyBirth.begin(), vKeyBirth.end());
 
     // produce output
-    file << strprintf("# Wallet dump created by Bitcoin %s (%s)\n", CLIENT_BUILD, CLIENT_DATE);
+    file << strprintf("# Wallet dump created by Bitcoin %s\n", CLIENT_BUILD);
     file << strprintf("# * Created on %s\n", EncodeDumpTime(GetTime()));
     file << strprintf("# * Best block at time of backup was %i (%s),\n", chainActive.Height(), chainActive.Tip()->GetBlockHash().ToString());
     file << strprintf("#   mined on %s\n", EncodeDumpTime(chainActive.Tip()->GetBlockTime()));

From 31444491f2e07c5ffd4d50827b54830ee3958a4d Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Wed, 8 Jun 2016 18:07:45 +0200
Subject: [PATCH 0445/1802] Add git and github tips and tricks to developer
 notes

---
 doc/developer-notes.md | 48 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 48 insertions(+)

diff --git a/doc/developer-notes.md b/doc/developer-notes.md
index add2fb5004d8e..0caad3b7aa057 100644
--- a/doc/developer-notes.md
+++ b/doc/developer-notes.md
@@ -381,3 +381,51 @@ GUI
   - *Rationale*: Model classes pass through events and data from the core, they
     should not interact with the user. That's where View classes come in. The converse also
     holds: try to not directly access core data structures from Views.
+
+Git and github tips
+---------------------
+
+- For resolving merge/rebase conflicts, it can be useful to enable diff3 style using
+  `git config merge.conflictstyle diff3`. Instead of
+
+        <<<
+        yours
+        ===
+        theirs
+        >>>
+
+  you will see
+
+        <<<
+        yours
+        |||
+        original
+        ===
+        theirs
+        >>>
+
+  This may make it much clearer what caused the conflict. In this style, you can often just look
+  at what changed between *original* and *theirs*, and mechanically apply that to *yours* (or the other way around).
+
+- When reviewing patches which change indentation in C++ files, use `git diff -w` and `git show -w`. This makes
+  the diff algorithm ignore whitespace changes. This feature is also available on github.com, by adding `?w=1`
+  at the end of any URL which shows a diff.
+
+- When reviewing patches that change symbol names in many places, use `git diff --word-diff`. This will instead
+  of showing the patch as deleted/added *lines*, show deleted/added *words*.
+
+- When reviewing patches that move code around, try using
+  `git diff --patience commit~:old/file.cpp commit:new/file/name.cpp`, and ignoring everything except the
+  moved body of code which should show up as neither `+` or `-` lines. In case it was not a pure move, this may
+  even work when combined with the `-w` or `--word-diff` options described above.
+
+- When looking at other's pull requests, it may make sense to add the following section to your `.git/config`
+  file:
+
+        [remote "upstream-pull"]
+                fetch = +refs/pull/*:refs/remotes/upstream-pull/*
+                url = git@github.com:bitcoin/bitcoin.git
+
+  This will add an `upstream-pull` remote to your git repository, which can be fetched using `git fetch --all`
+  or `git fetch upstream-pull`. Afterwards, you can use `upstream-pull/NUMBER/head` in arguments to `git show`,
+  `git checkout` and anywhere a commit id would be acceptable to see the changes from pull request NUMBER.

From 0dfd86956dcd2ac8a2223437e9bbd4f29bd35fce Mon Sep 17 00:00:00 2001
From: Suhas Daftuar <sdaftuar@gmail.com>
Date: Mon, 4 Jan 2016 14:48:22 -0500
Subject: [PATCH 0446/1802] Add getmempooldescendants RPC call

---
 src/rpc/blockchain.cpp | 67 +++++++++++++++++++++++++++++++++++++++++-
 src/rpc/client.cpp     |  1 +
 2 files changed, 67 insertions(+), 1 deletion(-)

diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp
index 6c005068d86d2..e53ed1c1b1d4d 100644
--- a/src/rpc/blockchain.cpp
+++ b/src/rpc/blockchain.cpp
@@ -302,7 +302,7 @@ UniValue getmempoolancestors(const UniValue& params, bool fHelp)
             "1. \"txid\"                   (string, required) The transaction id (must be in mempool)\n"
             "2. verbose                  (boolean, optional, default=false) true for a json object, false for array of transaction ids\n"
             "\nResult (for verbose=false):\n"
-            "[                       (json array of string)\n"
+            "[                       (json array of strings)\n"
             "  \"transactionid\"           (string) The transaction id of an in-mempool ancestor transaction\n"
             "  ,...\n"
             "]\n"
@@ -356,6 +356,70 @@ UniValue getmempoolancestors(const UniValue& params, bool fHelp)
     }
 }
 
+UniValue getmempooldescendants(const UniValue& params, bool fHelp)
+{
+    if (fHelp || params.size() < 1 || params.size() > 2) {
+        throw runtime_error(
+            "getmempooldescendants txid (verbose)\n"
+            "\nIf txid is in the mempool, returns all in-mempool descendants.\n"
+            "\nArguments:\n"
+            "1. \"txid\"                   (string, required) The transaction id (must be in mempool)\n"
+            "2. verbose                  (boolean, optional, default=false) true for a json object, false for array of transaction ids\n"
+            "\nResult (for verbose=false):\n"
+            "[                       (json array of strings)\n"
+            "  \"transactionid\"           (string) The transaction id of an in-mempool descendant transaction\n"
+            "  ,...\n"
+            "]\n"
+            "\nResult (for verbose=true):\n"
+            "{                           (json object)\n"
+            "  \"transactionid\" : {       (json object)\n"
+            + EntryDescriptionString()
+            + "  }, ...\n"
+            "}\n"
+            "\nExamples\n"
+            + HelpExampleCli("getmempooldescendants", "\"mytxid\"")
+            + HelpExampleRpc("getmempooldescendants", "\"mytxid\"")
+            );
+    }
+
+    bool fVerbose = false;
+    if (params.size() > 1)
+        fVerbose = params[1].get_bool();
+
+    uint256 hash = ParseHashV(params[0], "parameter 1");
+
+    LOCK(mempool.cs);
+
+    CTxMemPool::txiter it = mempool.mapTx.find(hash);
+    if (it == mempool.mapTx.end()) {
+        throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Transaction not in mempool");
+    }
+
+    CTxMemPool::setEntries setDescendants;
+    mempool.CalculateDescendants(it, setDescendants);
+    // CTxMemPool::CalculateDescendants will include the given tx
+    setDescendants.erase(it);
+
+    if (!fVerbose) {
+        UniValue o(UniValue::VARR);
+        BOOST_FOREACH(CTxMemPool::txiter descendantIt, setDescendants) {
+            o.push_back(descendantIt->GetTx().GetHash().ToString());
+        }
+
+        return o;
+    } else {
+        UniValue o(UniValue::VOBJ);
+        BOOST_FOREACH(CTxMemPool::txiter descendantIt, setDescendants) {
+            const CTxMemPoolEntry &e = *descendantIt;
+            const uint256& hash = e.GetTx().GetHash();
+            UniValue info(UniValue::VOBJ);
+            entryToJSON(info, e);
+            o.push_back(Pair(hash.ToString(), info));
+        }
+        return o;
+    }
+}
+
 UniValue getblockhash(const UniValue& params, bool fHelp)
 {
     if (fHelp || params.size() != 1)
@@ -1081,6 +1145,7 @@ static const CRPCCommand commands[] =
     { "blockchain",         "getchaintips",           &getchaintips,           true  },
     { "blockchain",         "getdifficulty",          &getdifficulty,          true  },
     { "blockchain",         "getmempoolancestors",    &getmempoolancestors,    true  },
+    { "blockchain",         "getmempooldescendants",  &getmempooldescendants,  true  },
     { "blockchain",         "getmempoolinfo",         &getmempoolinfo,         true  },
     { "blockchain",         "getrawmempool",          &getrawmempool,          true  },
     { "blockchain",         "gettxout",               &gettxout,               true  },
diff --git a/src/rpc/client.cpp b/src/rpc/client.cpp
index 3dfc27fff78af..d0675fdb49506 100644
--- a/src/rpc/client.cpp
+++ b/src/rpc/client.cpp
@@ -103,6 +103,7 @@ static const CRPCConvertParam vRPCConvertParams[] =
     { "setban", 2 },
     { "setban", 3 },
     { "getmempoolancestors", 1 },
+    { "getmempooldescendants", 1 },
 };
 
 class CRPCConvertTable

From b09b8135ae1c4df103c68543c931e479fbb907ab Mon Sep 17 00:00:00 2001
From: Suhas Daftuar <sdaftuar@gmail.com>
Date: Mon, 4 Jan 2016 14:57:58 -0500
Subject: [PATCH 0447/1802] Add getmempoolentry RPC call

---
 src/rpc/blockchain.cpp | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp
index e53ed1c1b1d4d..6a07bb8c4eb10 100644
--- a/src/rpc/blockchain.cpp
+++ b/src/rpc/blockchain.cpp
@@ -420,6 +420,39 @@ UniValue getmempooldescendants(const UniValue& params, bool fHelp)
     }
 }
 
+UniValue getmempoolentry(const UniValue& params, bool fHelp)
+{
+    if (fHelp || params.size() != 1) {
+        throw runtime_error(
+            "getmempoolentry txid\n"
+            "\nReturns mempool data for given transaction\n"
+            "\nArguments:\n"
+            "1. \"txid\"                   (string, required) The transaction id (must be in mempool)\n"
+            "\nResult:\n"
+            "{                           (json object)\n"
+            + EntryDescriptionString()
+            + "}\n"
+            "\nExamples\n"
+            + HelpExampleCli("getmempoolentry", "\"mytxid\"")
+            + HelpExampleRpc("getmempoolentry", "\"mytxid\"")
+        );
+    }
+
+    uint256 hash = ParseHashV(params[0], "parameter 1");
+
+    LOCK(mempool.cs);
+
+    CTxMemPool::txiter it = mempool.mapTx.find(hash);
+    if (it == mempool.mapTx.end()) {
+        throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Transaction not in mempool");
+    }
+
+    const CTxMemPoolEntry &e = *it;
+    UniValue info(UniValue::VOBJ);
+    entryToJSON(info, e);
+    return info;
+}
+
 UniValue getblockhash(const UniValue& params, bool fHelp)
 {
     if (fHelp || params.size() != 1)
@@ -1146,6 +1179,7 @@ static const CRPCCommand commands[] =
     { "blockchain",         "getdifficulty",          &getdifficulty,          true  },
     { "blockchain",         "getmempoolancestors",    &getmempoolancestors,    true  },
     { "blockchain",         "getmempooldescendants",  &getmempooldescendants,  true  },
+    { "blockchain",         "getmempoolentry",        &getmempoolentry,        true  },
     { "blockchain",         "getmempoolinfo",         &getmempoolinfo,         true  },
     { "blockchain",         "getrawmempool",          &getrawmempool,          true  },
     { "blockchain",         "gettxout",               &gettxout,               true  },

From a9b8390222a19496922c05d0c3f31bd6f75e1ac6 Mon Sep 17 00:00:00 2001
From: Suhas Daftuar <sdaftuar@gmail.com>
Date: Mon, 4 Jan 2016 15:15:15 -0500
Subject: [PATCH 0448/1802] Add test coverage for new RPC calls

---
 qa/rpc-tests/mempool_packages.py | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/qa/rpc-tests/mempool_packages.py b/qa/rpc-tests/mempool_packages.py
index 7ac85c1b6d3e9..35a7e2326de52 100755
--- a/qa/rpc-tests/mempool_packages.py
+++ b/qa/rpc-tests/mempool_packages.py
@@ -61,7 +61,14 @@ def run_test(self):
         descendant_fees = 0
         descendant_size = 0
 
+        descendants = []
+        ancestors = list(chain)
         for x in reversed(chain):
+            # Check that getmempoolentry is consistent with getrawmempool
+            entry = self.nodes[0].getmempoolentry(x)
+            assert_equal(entry, mempool[x])
+
+            # Check that the descendant calculations are correct
             assert_equal(mempool[x]['descendantcount'], descendant_count)
             descendant_fees += mempool[x]['fee']
             assert_equal(mempool[x]['modifiedfee'], mempool[x]['fee'])
@@ -70,6 +77,27 @@ def run_test(self):
             assert_equal(mempool[x]['descendantsize'], descendant_size)
             descendant_count += 1
 
+            # Check that getmempooldescendants is correct
+            assert_equal(sorted(descendants), sorted(self.nodes[0].getmempooldescendants(x)))
+            descendants.append(x)
+
+            # Check that getmempoolancestors is correct
+            ancestors.remove(x)
+            assert_equal(sorted(ancestors), sorted(self.nodes[0].getmempoolancestors(x)))
+
+        # Check that getmempoolancestors/getmempooldescendants correctly handle verbose=true
+        v_ancestors = self.nodes[0].getmempoolancestors(chain[-1], True)
+        assert_equal(len(v_ancestors), len(chain)-1)
+        for x in v_ancestors.keys():
+            assert_equal(mempool[x], v_ancestors[x])
+        assert(chain[-1] not in v_ancestors.keys())
+
+        v_descendants = self.nodes[0].getmempooldescendants(chain[0], True)
+        assert_equal(len(v_descendants), len(chain)-1)
+        for x in v_descendants.keys():
+            assert_equal(mempool[x], v_descendants[x])
+        assert(chain[0] not in v_descendants.keys())
+
         # Check that descendant modified fees includes fee deltas from
         # prioritisetransaction
         self.nodes[0].prioritisetransaction(chain[-1], 0, 1000)

From 7f6eda80438be452a0b6e079737fb6fe00bb26b7 Mon Sep 17 00:00:00 2001
From: Suhas Daftuar <sdaftuar@gmail.com>
Date: Tue, 17 May 2016 08:42:35 -0400
Subject: [PATCH 0449/1802] Add ancestor statistics to mempool entry RPC output

---
 src/rpc/blockchain.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp
index 6a07bb8c4eb10..1bb365d36cdad 100644
--- a/src/rpc/blockchain.cpp
+++ b/src/rpc/blockchain.cpp
@@ -195,6 +195,9 @@ std::string EntryDescriptionString()
            "    \"descendantcount\" : n,  (numeric) number of in-mempool descendant transactions (including this one)\n"
            "    \"descendantsize\" : n,   (numeric) size of in-mempool descendants (including this one)\n"
            "    \"descendantfees\" : n,   (numeric) modified fees (see above) of in-mempool descendants (including this one)\n"
+           "    \"ancestorcount\" : n,    (numeric) number of in-mempool ancestor transactions (including this one)\n"
+           "    \"ancestorsize\" : n,     (numeric) size of in-mempool ancestors (including this one)\n"
+           "    \"ancestorfees\" : n,     (numeric) modified fees (see above) of in-mempool ancestors (including this one)\n"
            "    \"depends\" : [           (array) unconfirmed transactions used as inputs for this transaction\n"
            "        \"transactionid\",    (string) parent transaction id\n"
            "       ... ]\n";
@@ -214,6 +217,9 @@ void entryToJSON(UniValue &info, const CTxMemPoolEntry &e)
     info.push_back(Pair("descendantcount", e.GetCountWithDescendants()));
     info.push_back(Pair("descendantsize", e.GetSizeWithDescendants()));
     info.push_back(Pair("descendantfees", e.GetModFeesWithDescendants()));
+    info.push_back(Pair("ancestorcount", e.GetCountWithAncestors()));
+    info.push_back(Pair("ancestorsize", e.GetSizeWithAncestors()));
+    info.push_back(Pair("ancestorfees", e.GetModFeesWithAncestors()));
     const CTransaction& tx = e.GetTx();
     set<string> setDepends;
     BOOST_FOREACH(const CTxIn& txin, tx.vin)

From 176e19b571f722437043d2aa80a69ae21852c70d Mon Sep 17 00:00:00 2001
From: Suhas Daftuar <sdaftuar@gmail.com>
Date: Tue, 17 May 2016 09:01:12 -0400
Subject: [PATCH 0450/1802] Mention new RPC's in release notes

---
 doc/release-notes.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/doc/release-notes.md b/doc/release-notes.md
index 7d44b8cda934c..be619e41c6ae0 100644
--- a/doc/release-notes.md
+++ b/doc/release-notes.md
@@ -80,6 +80,13 @@ The following outputs are affected by this change:
 - REST `/rest/block/` (JSON format when including extended tx details)
 - `bitcoin-tx -json`
 
+New mempool information RPC calls
+---------------------------------
+
+RPC calls have been added to output detailed statistics for individual mempool
+entries, as well as to calculate the in-mempool ancestors or descendants of a
+transaction: see `getmempoolentry`, `getmempoolancestors`, `getmempooldescendants`.
+
 ### ZMQ
 
 Each ZMQ notification now contains an up-counting sequence number that allows

From 654a21162252294b7dbd6c982fec88008af7335e Mon Sep 17 00:00:00 2001
From: Kaz Wesley <keziahw@gmail.com>
Date: Wed, 8 Jun 2016 13:26:18 -0700
Subject: [PATCH 0451/1802] developer notes: updates for C++11

- boost::scoped_ptr is obsolete
- std::vector::data replaces begin_ptr / end_ptr
---
 doc/developer-notes.md | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/doc/developer-notes.md b/doc/developer-notes.md
index add2fb5004d8e..94bd86203eb6b 100644
--- a/doc/developer-notes.md
+++ b/doc/developer-notes.md
@@ -265,7 +265,7 @@ General C++
       the `.h` to the `.cpp` should not result in build errors
 
 - Use the RAII (Resource Acquisition Is Initialization) paradigm where possible. For example by using
-  `scoped_pointer` for allocations in a function.
+  `unique_ptr` for allocations in a function.
 
   - *Rationale*: This avoids memory and resource leaks, and ensures exception safety
 
@@ -284,10 +284,9 @@ C++ data structures
   - *Rationale*: Behavior is undefined. In C++ parlor this means "may reformat
     the universe", in practice this has resulted in at least one hard-to-debug crash bug
 
-- Watch out for vector out-of-bounds exceptions. `&vch[0]` is illegal for an
-  empty vector, `&vch[vch.size()]` is always illegal. Use `begin_ptr(vch)` and
-  `end_ptr(vch)` to get the begin and end pointer instead (defined in
-  `serialize.h`)
+- Watch out for out-of-bounds vector access. `&vch[vch.size()]` is illegal,
+  including `&vch[0]` for an empty vector. Use `vch.data()` and `vch.data() +
+  vch.size()` instead.
 
 - Vector bounds checking is only enabled in debug mode. Do not rely on it
 

From 966151e71dc33cb5b97cf4243efd18afb4cf279d Mon Sep 17 00:00:00 2001
From: Peter Todd <pete@petertodd.org>
Date: Thu, 9 Jun 2016 13:55:12 -0400
Subject: [PATCH 0452/1802] Add README for verify-commits

---
 contrib/verify-commits/README.md | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 contrib/verify-commits/README.md

diff --git a/contrib/verify-commits/README.md b/contrib/verify-commits/README.md
new file mode 100644
index 0000000000000..e9e3f65da292a
--- /dev/null
+++ b/contrib/verify-commits/README.md
@@ -0,0 +1,26 @@
+Tooling for verification of PGP signed commits
+----------------------------------------------
+
+This is an incomplete work in progress, but currently includes a pre-push hook
+script (`pre-push-hook.sh`) for maintainers to ensure that their own commits
+are PGP signed (nearly always merge commits), as well as a script to verify
+commits against a trusted keys list.
+
+
+Using verify-commits.sh safely
+------------------------------
+
+Remember that you can't use an untrusted script to verify itself. This means
+that checking out code, then running `verify-commits.sh` against `HEAD` is
+_not_ safe, because the version of `verify-commits.sh` that you just ran could
+be backdoored. Instead, you need to use a trusted version of verify-commits
+prior to checkout to make sure you're checking out only code signed by trusted
+keys:
+
+    git fetch origin && \
+      ./contrib/verify-commits/verify-commits.sh origin/master && \
+      git checkout origin/master
+
+Note that the above isn't a good UI/UX yet, and needs significant improvements
+to make it more convenient and reduce the chance of errors; pull-reqs
+improving this process would be much appreciated.

From d1a3d570e5f4e59683cde9ccc0ac10d012ef7070 Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Thu, 9 Jun 2016 17:49:16 -0400
Subject: [PATCH 0453/1802] bulid: fix "make translate" when out-of-tree

---
 src/Makefile.qt.include | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Makefile.qt.include b/src/Makefile.qt.include
index 29e3a264ccc7c..9381cca9f256c 100644
--- a/src/Makefile.qt.include
+++ b/src/Makefile.qt.include
@@ -390,13 +390,13 @@ QT_QM=$(QT_TS:.ts=.qm)
 
 SECONDARY: $(QT_QM)
 
-qt/bitcoinstrings.cpp: $(libbitcoin_server_a_SOURCES) $(libbitcoin_wallet_a_SOURCES)
+$(srcdir)/qt/bitcoinstrings.cpp: $(libbitcoin_server_a_SOURCES) $(libbitcoin_wallet_a_SOURCES)
 	@test -n $(XGETTEXT) || echo "xgettext is required for updating translations"
 	$(AM_V_GEN) cd $(srcdir); XGETTEXT=$(XGETTEXT) PACKAGE_NAME="$(PACKAGE_NAME)" COPYRIGHT_HOLDERS="$(COPYRIGHT_HOLDERS)" COPYRIGHT_HOLDERS_SUBSTITUTION="$(COPYRIGHT_HOLDERS_SUBSTITUTION)" $(PYTHON) ../share/qt/extract_strings_qt.py $^
 
-translate: qt/bitcoinstrings.cpp $(QT_FORMS_UI) $(QT_FORMS_UI) $(BITCOIN_QT_CPP) $(BITCOIN_QT_H) $(BITCOIN_MM)
+translate: $(srcdir)/qt/bitcoinstrings.cpp $(QT_FORMS_UI) $(QT_FORMS_UI) $(BITCOIN_QT_CPP) $(BITCOIN_QT_H) $(BITCOIN_MM)
 	@test -n $(LUPDATE) || echo "lupdate is required for updating translations"
-	$(AM_V_GEN) QT_SELECT=$(QT_SELECT) $(LUPDATE) $^ -locations relative -no-obsolete -ts qt/locale/bitcoin_en.ts
+	$(AM_V_GEN) QT_SELECT=$(QT_SELECT) $(LUPDATE) $^ -locations relative -no-obsolete -ts $(srcdir)/qt/locale/bitcoin_en.ts
 
 $(QT_QRC_LOCALE_CPP): $(QT_QRC_LOCALE) $(QT_QM)
 	@test -f $(RCC)

From ac8d0418ed2891311cb786f32d39a54242aa2759 Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Fri, 10 Jun 2016 10:12:00 +0200
Subject: [PATCH 0454/1802] qt: translations update

---
 src/qt/bitcoinstrings.cpp   |  2 --
 src/qt/locale/bitcoin_en.ts | 25 ++++++++++---------------
 2 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/src/qt/bitcoinstrings.cpp b/src/qt/bitcoinstrings.cpp
index 23be8e016bddf..9e53f19591070 100644
--- a/src/qt/bitcoinstrings.cpp
+++ b/src/qt/bitcoinstrings.cpp
@@ -140,8 +140,6 @@ QT_TRANSLATE_NOOP("bitcoin-core", ""
 QT_TRANSLATE_NOOP("bitcoin-core", ""
 "Support filtering of blocks and transaction with bloom filters (default: %u)"),
 QT_TRANSLATE_NOOP("bitcoin-core", ""
-"Tell other nodes to filter invs to us by our mempool min fee (default: %u)"),
-QT_TRANSLATE_NOOP("bitcoin-core", ""
 "The block database contains a block which appears to be from the future. "
 "This may be due to your computer's date and time being set incorrectly. Only "
 "rebuild the block database if you are sure that your computer's date and "
diff --git a/src/qt/locale/bitcoin_en.ts b/src/qt/locale/bitcoin_en.ts
index 5549ccd4f80f9..b90221f2c2535 100644
--- a/src/qt/locale/bitcoin_en.ts
+++ b/src/qt/locale/bitcoin_en.ts
@@ -3785,7 +3785,7 @@
 <context>
     <name>bitcoin-core</name>
     <message>
-        <location filename="../bitcoinstrings.cpp" line="+288"/>
+        <location filename="../bitcoinstrings.cpp" line="+286"/>
         <source>Options:</source>
         <translation>Options:</translation>
     </message>
@@ -3810,7 +3810,7 @@
         <translation>Accept command line and JSON-RPC commands</translation>
     </message>
     <message>
-        <location line="-127"/>
+        <location line="-125"/>
         <source>If &lt;category&gt; is not supplied or if &lt;category&gt; = 1, output all debugging information.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3835,7 +3835,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+120"/>
+        <location line="+118"/>
         <source>Error: A fatal internal error occurred, see debug.log for details</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3865,7 +3865,7 @@
         <translation>Accept connections from outside (default: 1 if no -proxy or -connect)</translation>
     </message>
     <message>
-        <location line="-203"/>
+        <location line="-201"/>
         <source>Bitcoin Core</source>
         <translation type="unfinished">Bitcoin Core</translation>
     </message>
@@ -3946,11 +3946,6 @@
     </message>
     <message>
         <location line="+5"/>
-        <source>Tell other nodes to filter invs to us by our mempool min fee (default: %u)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
         <source>The block database contains a block which appears to be from the future. This may be due to your computer&apos;s date and time being set incorrectly. Only rebuild the block database if you are sure that your computer&apos;s date and time are correct</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4305,7 +4300,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-315"/>
+        <location line="-313"/>
         <source>Allow JSON-RPC connections from specified source. Valid for &lt;ip&gt; are a single IP (e.g. 1.2.3.4), a network/netmask (e.g. 1.2.3.4/255.255.255.0) or a network/CIDR (e.g. 1.2.3.4/24). This option can be specified multiple times</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4375,7 +4370,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="+12"/>
         <source>The transaction amount is too small to send after the fee has been deducted</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4580,12 +4575,12 @@
         <translation>Password for JSON-RPC connections</translation>
     </message>
     <message>
-        <location line="-216"/>
+        <location line="-214"/>
         <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
         <translation>Execute command when the best block changes (%s in cmd is replaced by block hash)</translation>
     </message>
     <message>
-        <location line="+145"/>
+        <location line="+143"/>
         <source>Allow DNS lookups for -addnode, -seednode and -connect</source>
         <translation>Allow DNS lookups for -addnode, -seednode and -connect</translation>
     </message>
@@ -4595,7 +4590,7 @@
         <translation>Loading addresses...</translation>
     </message>
     <message>
-        <location line="-260"/>
+        <location line="-258"/>
         <source>(1 = keep tx meta data e.g. account owner and payment request information, 2 = drop tx meta data)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4645,7 +4640,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+18"/>
+        <location line="+16"/>
         <source>Total length of network version string (%i) exceeds maximum length (%i). Reduce the number or size of uacomments.</source>
         <translation type="unfinished"></translation>
     </message>

From 980e7eb98c81af5acc843cdd697ad277489252ad Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Thu, 9 Jun 2016 18:13:33 -0400
Subject: [PATCH 0455/1802] depends: only build qt on linux for x86_64/x86

---
 depends/Makefile             | 10 +++++++---
 depends/packages/packages.mk |  4 +++-
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/depends/Makefile b/depends/Makefile
index 3ddfc85a450d0..dedb0674cf149 100644
--- a/depends/Makefile
+++ b/depends/Makefile
@@ -89,13 +89,17 @@ $(host_arch)_$(host_os)_id_string+=$(shell $(host_CXX) --version 2>/dev/null)
 $(host_arch)_$(host_os)_id_string+=$(shell $(host_RANLIB) --version 2>/dev/null)
 $(host_arch)_$(host_os)_id_string+=$(shell $(host_STRIP) --version 2>/dev/null)
 
-qt_packages_$(NO_QT) = $(qt_packages) $(qt_$(host_os)_packages)
-qt_native_packages_$(NO_QT) = $(qt_native_packages)
+qt_packages_$(NO_QT) = $(qt_packages) $(qt_$(host_os)_packages) $(qt_$(host_arch)_$(host_os)_packages)
 wallet_packages_$(NO_WALLET) = $(wallet_packages)
 upnp_packages_$(NO_UPNP) = $(upnp_packages)
 
 packages += $($(host_arch)_$(host_os)_packages) $($(host_os)_packages) $(qt_packages_) $(wallet_packages_) $(upnp_packages_)
-native_packages += $($(host_arch)_$(host_os)_native_packages) $($(host_os)_native_packages) $(qt_native_packages_)
+native_packages += $($(host_arch)_$(host_os)_native_packages) $($(host_os)_native_packages)
+
+ifneq ($(qt_packages_),)
+native_packages += $(qt_native_packages)
+endif
+
 all_packages = $(packages) $(native_packages)
 
 meta_depends = Makefile funcs.mk builders/default.mk hosts/default.mk hosts/$(host_os).mk builders/$(build_os).mk
diff --git a/depends/packages/packages.mk b/depends/packages/packages.mk
index 59b009b66a27b..ac43ef4a2e304 100644
--- a/depends/packages/packages.mk
+++ b/depends/packages/packages.mk
@@ -6,7 +6,9 @@ native_packages := native_ccache native_comparisontool
 qt_native_packages = native_protobuf
 qt_packages = qrencode protobuf
 
-qt_linux_packages= qt expat dbus libxcb xcb_proto libXau xproto freetype fontconfig libX11 xextproto libXext xtrans
+qt_x86_64_linux_packages:=qt expat dbus libxcb xcb_proto libXau xproto freetype fontconfig libX11 xextproto libXext xtrans
+qt_i686_linux_packages:=$(qt_x86_64_linux_packages)
+
 qt_darwin_packages=qt
 qt_mingw32_packages=qt
 

From 17c0131fad62bfc966da93b7e42c7f0e07948b51 Mon Sep 17 00:00:00 2001
From: Jonas Schnelli <dev@jonasschnelli.ch>
Date: Fri, 10 Jun 2016 11:04:16 +0200
Subject: [PATCH 0456/1802] [Docs] Add release notes and bip update for
 Bip32/HD wallets

---
 doc/bips.md          |  1 +
 doc/release-notes.md | 18 ++++++++++++++++++
 2 files changed, 19 insertions(+)

diff --git a/doc/bips.md b/doc/bips.md
index b8efabbcf251c..266544d7ac96d 100644
--- a/doc/bips.md
+++ b/doc/bips.md
@@ -9,6 +9,7 @@ BIPs that are implemented by Bitcoin Core (up-to-date up to **v0.12.0**):
 * [`BIP 23`](https://github.com/bitcoin/bips/blob/master/bip-0023.mediawiki): Some extensions to GBT have been implemented since **v0.10.0rc1**, including longpolling and block proposals ([PR #1816](https://github.com/bitcoin/bitcoin/pull/1816)).
 * [`BIP 30`](https://github.com/bitcoin/bips/blob/master/bip-0030.mediawiki): The evaluation rules to forbid creating new transactions with the same txid as previous not-fully-spent transactions were implemented since **v0.6.0**, and the rule took effect on *March 15th 2012* ([PR #915](https://github.com/bitcoin/bitcoin/pull/915)).
 * [`BIP 31`](https://github.com/bitcoin/bips/blob/master/bip-0031.mediawiki): The 'pong' protocol message (and the protocol version bump to 60001) has been implemented since **v0.6.1** ([PR #1081](https://github.com/bitcoin/bitcoin/pull/1081)).
+* [`BIP 32`](https://github.com/bitcoin/bips/blob/master/bip-0032.mediawiki): Hierarchical Deterministic Wallets has been implemented since **v0.13.0** ([PR #8035](https://github.com/bitcoin/bitcoin/pull/8035)).
 * [`BIP 34`](https://github.com/bitcoin/bips/blob/master/bip-0034.mediawiki): The rule that requires blocks to contain their height (number) in the coinbase input, and the introduction of version 2 blocks has been implemented since **v0.7.0**. The rule took effect for version 2 blocks as of *block 224413* (March 5th 2013), and version 1 blocks are no longer allowed since *block 227931* (March 25th 2013) ([PR #1526](https://github.com/bitcoin/bitcoin/pull/1526)).
 * [`BIP 35`](https://github.com/bitcoin/bips/blob/master/bip-0035.mediawiki): The 'mempool' protocol message (and the protocol version bump to 60002) has been implemented since **v0.7.0** ([PR #1641](https://github.com/bitcoin/bitcoin/pull/1641)).
 * [`BIP 37`](https://github.com/bitcoin/bips/blob/master/bip-0037.mediawiki): The bloom filtering for transaction relaying, partial merkle trees for blocks, and the protocol version bump to 70001 (enabling low-bandwidth SPV clients) has been implemented since **v0.8.0** ([PR #1795](https://github.com/bitcoin/bitcoin/pull/1795)).
diff --git a/doc/release-notes.md b/doc/release-notes.md
index 7d44b8cda934c..72f69446f8f23 100644
--- a/doc/release-notes.md
+++ b/doc/release-notes.md
@@ -112,6 +112,24 @@ feerate. [BIP 133](https://github.com/bitcoin/bips/blob/master/bip-0133.mediawik
 
 ### Wallet
 
+Hierarchical Deterministic Key Generation
+-----------------------------------------
+Newly created wallets will use hierarchical deterministic key generation
+according to BIP32 (keypath m/0'/0'/k').
+Existing wallets will still use traditional key generation.
+
+Backups of HD wallets, regardless of when they have been created, can
+therefore be used to re-generate all possible private keys, even the
+ones which haven't already been generated during the time of the backup.
+
+HD key generation for new wallets can be disabled by `-usehd=0`. Keep in
+mind that this flag only has affect on newly created wallets.
+You can't disable HD key generation once you have created a HD wallet.
+
+There is no distinction between internal (change) and external keys.
+
+[Pull request](https://github.com/bitcoin/bitcoin/pull/8035/files), [BIP 32](https://github.com/bitcoin/bips/blob/master/bip-0032.mediawiki)
+
 ### GUI
 
 ### Tests

From 9d253620874087d96d64d0c4c771a582d9774657 Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Fri, 10 Jun 2016 02:56:42 -0400
Subject: [PATCH 0457/1802] build: add armhf/aarch64 gitian builds

- create a script to handle split debug. This will also eventually need to check
  targets, and use dsymutil for osx.
- update config.guess/config.sub for bdb for aarch64.
- temporarily disable symbol checks for arm/aarch64
- quit renaming to linux32/linux64 and use the host directly

This also adds a hack to work around an Ubuntu bug in the gcc-multilib package:
https://bugs.launchpad.net/ubuntu/+source/gcc-defaults-armhf-cross/+bug/1347820

The problem is that gcc-multilib conflicts with the aarch toolchain.
gcc-multilib installs a symlink that points
/usr/include/asm -> /usr/include/x86_64-linux-gnu/asm.

Without this link, gcc -m32 can't find asm/errno.h (and others), since
/usr/include/x86_64-linux-gnu isn't in its default include path. But
/usr/include/i386-linux-gnu is (though it doesn't exist on disk).

So work around the problem by linking
/usr/include/i386-linux-gnu/asm -> /usr/include/x86_64-linux-gnu/asm.

The symlink fix is actually quite reasonable, but echoing the password into
sudo is nasty, and should probably be addressed in gitian itself. It makes more
sense to enable passwordless sudo for the build user by default.
---
 configure.ac                                |  2 +
 contrib/devtools/split-debug.sh.in          | 10 +++++
 contrib/gitian-descriptors/gitian-linux.yml | 45 +++++++++++++++------
 depends/packages/bdb.mk                     |  3 +-
 4 files changed, 47 insertions(+), 13 deletions(-)
 create mode 100644 contrib/devtools/split-debug.sh.in

diff --git a/configure.ac b/configure.ac
index 7f9ff20cd7be5..97af58bd7cd85 100644
--- a/configure.ac
+++ b/configure.ac
@@ -75,6 +75,7 @@ AC_PATH_PROG(XGETTEXT,xgettext)
 AC_PATH_PROG(HEXDUMP,hexdump)
 AC_PATH_TOOL(READELF, readelf)
 AC_PATH_TOOL(CPPFILT, c++filt)
+AC_PATH_TOOL(OBJCOPY, objcopy)
 
 AC_ARG_VAR(PYTHONPATH, Augments the default search path for python module files)
 
@@ -1060,6 +1061,7 @@ AC_SUBST(MINIUPNPC_LIBS)
 AC_CONFIG_FILES([Makefile src/Makefile share/setup.nsi share/qt/Info.plist src/test/buildenv.py])
 AC_CONFIG_FILES([qa/pull-tester/run-bitcoind-for-test.sh],[chmod +x qa/pull-tester/run-bitcoind-for-test.sh])
 AC_CONFIG_FILES([qa/pull-tester/tests_config.py],[chmod +x qa/pull-tester/tests_config.py])
+AC_CONFIG_FILES([contrib/devtools/split-debug.sh],[chmod +x contrib/devtools/split-debug.sh])
 AC_CONFIG_LINKS([qa/pull-tester/rpc-tests.py:qa/pull-tester/rpc-tests.py])
 
 dnl boost's m4 checks do something really nasty: they export these vars. As a
diff --git a/contrib/devtools/split-debug.sh.in b/contrib/devtools/split-debug.sh.in
new file mode 100644
index 0000000000000..deda49cc54104
--- /dev/null
+++ b/contrib/devtools/split-debug.sh.in
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+if [ $# -ne 3 ];
+    then echo "usage: $0 <input> <stripped-binary> <debug-binary>"
+fi
+
+@OBJCOPY@ --enable-deterministic-archives -p --only-keep-debug $1 $3
+@OBJCOPY@ --enable-deterministic-archives -p --strip-debug $1 $2
+@STRIP@ --enable-deterministic-archives -p -s $2
+@OBJCOPY@ --enable-deterministic-archives -p --add-gnu-debuglink=$3 $2
diff --git a/contrib/gitian-descriptors/gitian-linux.yml b/contrib/gitian-descriptors/gitian-linux.yml
index cd289b2f6e4c8..fb629578d65f0 100644
--- a/contrib/gitian-descriptors/gitian-linux.yml
+++ b/contrib/gitian-descriptors/gitian-linux.yml
@@ -7,7 +7,17 @@ architectures:
 - "amd64"
 packages:
 - "curl"
-- "g++-multilib"
+- "g++-aarch64-linux-gnu"
+- "g++-4.8-aarch64-linux-gnu"
+- "gcc-4.8-aarch64-linux-gnu"
+- "binutils-aarch64-linux-gnu"
+- "g++-arm-linux-gnueabihf"
+- "g++-4.8-arm-linux-gnueabihf"
+- "gcc-4.8-arm-linux-gnueabihf"
+- "binutils-arm-linux-gnueabihf"
+- "g++-4.8-multilib"
+- "gcc-4.8-multilib"
+- "binutils-gold"
 - "git-core"
 - "pkg-config"
 - "autoconf"
@@ -15,7 +25,6 @@ packages:
 - "automake"
 - "faketime"
 - "bsdmainutils"
-- "binutils-gold"
 - "ca-certificates"
 - "python"
 remotes:
@@ -23,11 +32,18 @@ remotes:
   "dir": "bitcoin"
 files: []
 script: |
+
+  #unlock sudo
+  echo "ubuntu" | sudo -S true
+
+  sudo mkdir -p /usr/include/i386-linux-gnu/
+  sudo ln -s /usr/include/x86_64-linux-gnu/asm /usr/include/i386-linux-gnu/asm
+
   WRAP_DIR=$HOME/wrapped
-  HOSTS="i686-pc-linux-gnu x86_64-unknown-linux-gnu"
+  HOSTS="i686-pc-linux-gnu x86_64-linux-gnu arm-linux-gnueabihf aarch64-linux-gnu"
   CONFIGFLAGS="--enable-glibc-back-compat --enable-reduce-exports --disable-bench --disable-gui-tests"
   FAKETIME_HOST_PROGS=""
-  FAKETIME_PROGS="date ar ranlib nm strip objcopy"
+  FAKETIME_PROGS="date ar ranlib nm"
   HOST_CFLAGS="-O2 -g"
   HOST_CXXFLAGS="-O2 -g"
   HOST_LDFLAGS=-static-libstdc++
@@ -111,14 +127,24 @@ script: |
     CONFIG_SITE=${BASEPREFIX}/${i}/share/config.site ./configure --prefix=/ --disable-ccache --disable-maintainer-mode --disable-dependency-tracking ${CONFIGFLAGS} CFLAGS="${HOST_CFLAGS}" CXXFLAGS="${HOST_CXXFLAGS}" LDFLAGS="${HOST_LDFLAGS}"
     make ${MAKEOPTS}
     make ${MAKEOPTS} -C src check-security
-    make ${MAKEOPTS} -C src check-symbols
+
+    #TODO: This is a quick hack that disables symbol checking for arm.
+    #      Instead, we should investigate why these are popping up.
+    #      For aarch64, we'll need to bump up the min GLIBC version, as the abi
+    #      support wasn't introduced until 2.17.
+    case $i in
+       aarch64-*) : ;;
+       arm-*) : ;;
+       *) make ${MAKEOPTS} -C src check-symbols ;;
+    esac
+
     make install DESTDIR=${INSTALLPATH}
     cd installed
     find . -name "lib*.la" -delete
     find . -name "lib*.a" -delete
     rm -rf ${DISTNAME}/lib/pkgconfig
-    find ${DISTNAME}/bin -type f -executable -exec objcopy --only-keep-debug {} {}.dbg \; -exec strip -s {} \; -exec objcopy --add-gnu-debuglink={}.dbg {} \;
-    find ${DISTNAME}/lib -type f -exec objcopy --only-keep-debug {} {}.dbg \; -exec strip -s {} \; -exec objcopy --add-gnu-debuglink={}.dbg {} \;
+    find ${DISTNAME}/bin -type f -executable -exec ../contrib/devtools/split-debug.sh {} {} {}.dbg \;
+    find ${DISTNAME}/lib -type f -exec ../contrib/devtools/split-debug.sh {} {} {}.dbg \;
     find ${DISTNAME} -not -name "*.dbg" | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ${OUTDIR}/${DISTNAME}-${i}.tar.gz
     find ${DISTNAME} -name "*.dbg" | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ${OUTDIR}/${DISTNAME}-${i}-debug.tar.gz
     cd ../../
@@ -126,8 +152,3 @@ script: |
   done
   mkdir -p $OUTDIR/src
   mv $SOURCEDIST $OUTDIR/src
-  mv ${OUTDIR}/${DISTNAME}-x86_64-*-debug.tar.gz ${OUTDIR}/${DISTNAME}-linux64-debug.tar.gz
-  mv ${OUTDIR}/${DISTNAME}-i686-*-debug.tar.gz ${OUTDIR}/${DISTNAME}-linux32-debug.tar.gz
-  mv ${OUTDIR}/${DISTNAME}-x86_64-*.tar.gz ${OUTDIR}/${DISTNAME}-linux64.tar.gz
-  mv ${OUTDIR}/${DISTNAME}-i686-*.tar.gz ${OUTDIR}/${DISTNAME}-linux32.tar.gz
-
diff --git a/depends/packages/bdb.mk b/depends/packages/bdb.mk
index 200d57314ea0d..6c9876c2c7c7c 100644
--- a/depends/packages/bdb.mk
+++ b/depends/packages/bdb.mk
@@ -14,7 +14,8 @@ endef
 
 define $(package)_preprocess_cmds
   sed -i.old 's/__atomic_compare_exchange/__atomic_compare_exchange_db/' dbinc/atomic.h && \
-  sed -i.old 's/atomic_init/atomic_init_db/' dbinc/atomic.h mp/mp_region.c mp/mp_mvcc.c mp/mp_fget.c mutex/mut_method.c mutex/mut_tas.c
+  sed -i.old 's/atomic_init/atomic_init_db/' dbinc/atomic.h mp/mp_region.c mp/mp_mvcc.c mp/mp_fget.c mutex/mut_method.c mutex/mut_tas.c && \
+  cp -f $(BASEDIR)/config.guess $(BASEDIR)/config.sub dist
 endef
 
 define $(package)_config_cmds

From 60ab9b200654ef0914459711cf2b22be16be3dc2 Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Fri, 10 Jun 2016 15:19:51 +0200
Subject: [PATCH 0458/1802] Squashed 'src/univalue/' changes from
 2740c4f..f32df99

f32df99 Merge branch '2016_04_unicode' into bitcoin
280b191 Merge remote-tracking branch 'jgarzik/master' into bitcoin
c9a716c Handle UTF-8
bed8dd9 Version 1.0.2.
5e7985a Merge pull request #14 from laanwj/2015_11_escape_plan

git-subtree-dir: src/univalue
git-subtree-split: f32df99e96d99ab49e5eeda16cac93747d388245
---
 Makefile.am              |   9 ++-
 configure.ac             |   6 +-
 lib/univalue_read.cpp    |  37 +++++-------
 lib/univalue_utffilter.h | 119 +++++++++++++++++++++++++++++++++++++++
 lib/univalue_write.cpp   |  11 +---
 test/fail38.json         |   1 +
 test/fail39.json         |   1 +
 test/fail40.json         |   1 +
 test/fail41.json         |   1 +
 test/round2.json         |   1 +
 test/unitester.cpp       |  31 ++++++++++
 11 files changed, 181 insertions(+), 37 deletions(-)
 create mode 100644 lib/univalue_utffilter.h
 create mode 100644 test/fail38.json
 create mode 100644 test/fail39.json
 create mode 100644 test/fail40.json
 create mode 100644 test/fail41.json
 create mode 100644 test/round2.json

diff --git a/Makefile.am b/Makefile.am
index 34fe9e3f13dbc..6c1ec81e63fb7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,7 +3,7 @@ ACLOCAL_AMFLAGS = -I build-aux/m4
 .INTERMEDIATE: $(GENBIN)
 
 include_HEADERS = include/univalue.h
-noinst_HEADERS = lib/univalue_escapes.h
+noinst_HEADERS = lib/univalue_escapes.h lib/univalue_utffilter.h
 
 lib_LTLIBRARIES = libunivalue.la
 
@@ -73,6 +73,10 @@ TEST_FILES = \
 	$(TEST_DATA_DIR)/fail35.json \
 	$(TEST_DATA_DIR)/fail36.json \
 	$(TEST_DATA_DIR)/fail37.json \
+	$(TEST_DATA_DIR)/fail38.json \
+	$(TEST_DATA_DIR)/fail39.json \
+	$(TEST_DATA_DIR)/fail40.json \
+	$(TEST_DATA_DIR)/fail41.json \
 	$(TEST_DATA_DIR)/fail3.json \
 	$(TEST_DATA_DIR)/fail4.json \
 	$(TEST_DATA_DIR)/fail5.json \
@@ -83,6 +87,7 @@ TEST_FILES = \
 	$(TEST_DATA_DIR)/pass1.json \
 	$(TEST_DATA_DIR)/pass2.json \
 	$(TEST_DATA_DIR)/pass3.json \
-	$(TEST_DATA_DIR)/round1.json
+	$(TEST_DATA_DIR)/round1.json \
+	$(TEST_DATA_DIR)/round2.json
 
 EXTRA_DIST=$(TEST_FILES) $(GEN_SRCS)
diff --git a/configure.ac b/configure.ac
index 0515b632bdf9a..93d3ba945d143 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 m4_define([libunivalue_major_version], [1])
 m4_define([libunivalue_minor_version], [1])
-m4_define([libunivalue_micro_version], [1])
-m4_define([libunivalue_interface_age], [1])
+m4_define([libunivalue_micro_version], [2])
+m4_define([libunivalue_interface_age], [2])
 # If you need a modifier for the version number. 
 # Normally empty, but can be used to make "fixup" releases.
 m4_define([libunivalue_extraversion], [])
@@ -14,7 +14,7 @@ m4_define([libunivalue_age], [m4_eval(libunivalue_binary_age - libunivalue_inter
 m4_define([libunivalue_version], [libunivalue_major_version().libunivalue_minor_version().libunivalue_micro_version()libunivalue_extraversion()])
 
 
-AC_INIT([univalue], [1.0.1],
+AC_INIT([univalue], [1.0.2],
         [http://github.com/jgarzik/univalue/])
 
 dnl make the compilation flags quiet unless V=1 is used
diff --git a/lib/univalue_read.cpp b/lib/univalue_read.cpp
index c7516b9628169..95bac6958d0fa 100644
--- a/lib/univalue_read.cpp
+++ b/lib/univalue_read.cpp
@@ -6,6 +6,7 @@
 #include <vector>
 #include <stdio.h>
 #include "univalue.h"
+#include "univalue_utffilter.h"
 
 using namespace std;
 
@@ -174,41 +175,31 @@ enum jtokentype getJsonToken(string& tokenVal, unsigned int& consumed,
         raw++;                                // skip "
 
         string valStr;
+        JSONUTF8StringFilter writer(valStr);
 
         while (*raw) {
-            if (*raw < 0x20)
+            if ((unsigned char)*raw < 0x20)
                 return JTOK_ERR;
 
             else if (*raw == '\\') {
                 raw++;                        // skip backslash
 
                 switch (*raw) {
-                case '"':  valStr += "\""; break;
-                case '\\': valStr += "\\"; break;
-                case '/':  valStr += "/"; break;
-                case 'b':  valStr += "\b"; break;
-                case 'f':  valStr += "\f"; break;
-                case 'n':  valStr += "\n"; break;
-                case 'r':  valStr += "\r"; break;
-                case 't':  valStr += "\t"; break;
+                case '"':  writer.push_back('\"'); break;
+                case '\\': writer.push_back('\\'); break;
+                case '/':  writer.push_back('/'); break;
+                case 'b':  writer.push_back('\b'); break;
+                case 'f':  writer.push_back('\f'); break;
+                case 'n':  writer.push_back('\n'); break;
+                case 'r':  writer.push_back('\r'); break;
+                case 't':  writer.push_back('\t'); break;
 
                 case 'u': {
                     unsigned int codepoint;
                     if (hatoui(raw + 1, raw + 1 + 4, codepoint) !=
                                raw + 1 + 4)
                         return JTOK_ERR;
-
-                    if (codepoint <= 0x7f)
-                        valStr.push_back((char)codepoint);
-                    else if (codepoint <= 0x7FF) {
-                        valStr.push_back((char)(0xC0 | (codepoint >> 6)));
-                        valStr.push_back((char)(0x80 | (codepoint & 0x3F)));
-                    } else if (codepoint <= 0xFFFF) {
-                        valStr.push_back((char)(0xE0 | (codepoint >> 12)));
-                        valStr.push_back((char)(0x80 | ((codepoint >> 6) & 0x3F)));
-                        valStr.push_back((char)(0x80 | (codepoint & 0x3F)));
-                    }
-
+                    writer.push_back_u(codepoint);
                     raw += 4;
                     break;
                     }
@@ -226,11 +217,13 @@ enum jtokentype getJsonToken(string& tokenVal, unsigned int& consumed,
             }
 
             else {
-                valStr += *raw;
+                writer.push_back(*raw);
                 raw++;
             }
         }
 
+        if (!writer.finalize())
+            return JTOK_ERR;
         tokenVal = valStr;
         consumed = (raw - rawStart);
         return JTOK_STRING;
diff --git a/lib/univalue_utffilter.h b/lib/univalue_utffilter.h
new file mode 100644
index 0000000000000..0e330dce9cd04
--- /dev/null
+++ b/lib/univalue_utffilter.h
@@ -0,0 +1,119 @@
+// Copyright 2016 Wladimir J. van der Laan
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+#ifndef UNIVALUE_UTFFILTER_H
+#define UNIVALUE_UTFFILTER_H
+
+#include <string>
+
+/**
+ * Filter that generates and validates UTF-8, as well as collates UTF-16
+ * surrogate pairs as specified in RFC4627.
+ */
+class JSONUTF8StringFilter
+{
+public:
+    JSONUTF8StringFilter(std::string &s):
+        str(s), is_valid(true), codepoint(0), state(0), surpair(0)
+    {
+    }
+    // Write single 8-bit char (may be part of UTF-8 sequence)
+    void push_back(unsigned char ch)
+    {
+        if (state == 0) {
+            if (ch < 0x80) // 7-bit ASCII, fast direct pass-through
+                str.push_back(ch);
+            else if (ch < 0xc0) // Mid-sequence character, invalid in this state
+                is_valid = false;
+            else if (ch < 0xe0) { // Start of 2-byte sequence
+                codepoint = (ch & 0x1f) << 6;
+                state = 6;
+            } else if (ch < 0xf0) { // Start of 3-byte sequence
+                codepoint = (ch & 0x0f) << 12;
+                state = 12;
+            } else if (ch < 0xf8) { // Start of 4-byte sequence
+                codepoint = (ch & 0x07) << 18;
+                state = 18;
+            } else // Reserved, invalid
+                is_valid = false;
+        } else {
+            if ((ch & 0xc0) != 0x80) // Not a continuation, invalid
+                is_valid = false;
+            state -= 6;
+            codepoint |= (ch & 0x3f) << state;
+            if (state == 0)
+                push_back_u(codepoint);
+        }
+    }
+    // Write codepoint directly, possibly collating surrogate pairs
+    void push_back_u(unsigned int codepoint)
+    {
+        if (state) // Only accept full codepoints in open state
+            is_valid = false;
+        if (codepoint >= 0xD800 && codepoint < 0xDC00) { // First half of surrogate pair
+            if (surpair) // Two subsequent surrogate pair openers - fail
+                is_valid = false;
+            else
+                surpair = codepoint;
+        } else if (codepoint >= 0xDC00 && codepoint < 0xE000) { // Second half of surrogate pair
+            if (surpair) { // Open surrogate pair, expect second half
+                // Compute code point from UTF-16 surrogate pair
+                append_codepoint(0x10000 | ((surpair - 0xD800)<<10) | (codepoint - 0xDC00));
+                surpair = 0;
+            } else // Second half doesn't follow a first half - fail
+                is_valid = false;
+        } else {
+            if (surpair) // First half of surrogate pair not followed by second - fail
+                is_valid = false;
+            else
+                append_codepoint(codepoint);
+        }
+    }
+    // Check that we're in a state where the string can be ended
+    // No open sequences, no open surrogate pairs, etc
+    bool finalize()
+    {
+        if (state || surpair)
+            is_valid = false;
+        return is_valid;
+    }
+private:
+    std::string &str;
+    bool is_valid;
+    // Current UTF-8 decoding state
+    unsigned int codepoint;
+    int state; // Top bit to be filled in for next UTF-8 byte, or 0
+
+    // Keep track of the following state to handle the following section of
+    // RFC4627:
+    //
+    //    To escape an extended character that is not in the Basic Multilingual
+    //    Plane, the character is represented as a twelve-character sequence,
+    //    encoding the UTF-16 surrogate pair.  So, for example, a string
+    //    containing only the G clef character (U+1D11E) may be represented as
+    //    "\uD834\uDD1E".
+    //
+    //  Two subsequent \u.... may have to be replaced with one actual codepoint.
+    unsigned int surpair; // First half of open UTF-16 surrogate pair, or 0
+
+    void append_codepoint(unsigned int codepoint)
+    {
+        if (codepoint <= 0x7f)
+            str.push_back((char)codepoint);
+        else if (codepoint <= 0x7FF) {
+            str.push_back((char)(0xC0 | (codepoint >> 6)));
+            str.push_back((char)(0x80 | (codepoint & 0x3F)));
+        } else if (codepoint <= 0xFFFF) {
+            str.push_back((char)(0xE0 | (codepoint >> 12)));
+            str.push_back((char)(0x80 | ((codepoint >> 6) & 0x3F)));
+            str.push_back((char)(0x80 | (codepoint & 0x3F)));
+        } else if (codepoint <= 0x1FFFFF) {
+            str.push_back((char)(0xF0 | (codepoint >> 18)));
+            str.push_back((char)(0x80 | ((codepoint >> 12) & 0x3F)));
+            str.push_back((char)(0x80 | ((codepoint >> 6) & 0x3F)));
+            str.push_back((char)(0x80 | (codepoint & 0x3F)));
+        }
+    }
+};
+
+#endif
diff --git a/lib/univalue_write.cpp b/lib/univalue_write.cpp
index ceb4cc9166cd2..cfbdad3284ed5 100644
--- a/lib/univalue_write.cpp
+++ b/lib/univalue_write.cpp
@@ -8,8 +8,6 @@
 #include "univalue.h"
 #include "univalue_escapes.h"
 
-// TODO: Using UTF8
-
 using namespace std;
 
 static string json_escape(const string& inS)
@@ -23,15 +21,8 @@ static string json_escape(const string& inS)
 
         if (escStr)
             outS += escStr;
-
-        else if (ch < 0x80)
+        else
             outS += ch;
-
-        else { // TODO handle UTF-8 properly
-            char tmpesc[16];
-            sprintf(tmpesc, "\\u%04x", ch);
-            outS += tmpesc;
-        }
     }
 
     return outS;
diff --git a/test/fail38.json b/test/fail38.json
new file mode 100644
index 0000000000000..b245e2e46cad5
--- /dev/null
+++ b/test/fail38.json
@@ -0,0 +1 @@
+["\ud834"]
diff --git a/test/fail39.json b/test/fail39.json
new file mode 100644
index 0000000000000..7c9e263f27de5
--- /dev/null
+++ b/test/fail39.json
@@ -0,0 +1 @@
+["\udd61"]
diff --git a/test/fail40.json b/test/fail40.json
new file mode 100644
index 0000000000000..664dc9e245f65
--- /dev/null
+++ b/test/fail40.json
@@ -0,0 +1 @@
+["���"]
\ No newline at end of file
diff --git a/test/fail41.json b/test/fail41.json
new file mode 100644
index 0000000000000..0de342a2b5fdf
--- /dev/null
+++ b/test/fail41.json
@@ -0,0 +1 @@
+["�"]
\ No newline at end of file
diff --git a/test/round2.json b/test/round2.json
new file mode 100644
index 0000000000000..b766cccc68899
--- /dev/null
+++ b/test/round2.json
@@ -0,0 +1 @@
+["a§■𐎒𝅘𝅥𝅯"]
diff --git a/test/unitester.cpp b/test/unitester.cpp
index 5a052fe92c85b..05f3842cd1eb6 100644
--- a/test/unitester.cpp
+++ b/test/unitester.cpp
@@ -22,6 +22,7 @@ string srcdir(JSON_TEST_SRC);
 static bool test_failed = false;
 
 #define d_assert(expr) { if (!(expr)) { test_failed = true; fprintf(stderr, "%s failed\n", filename.c_str()); } }
+#define f_assert(expr) { if (!(expr)) { test_failed = true; fprintf(stderr, "%s failed\n", __func__); } }
 
 static std::string rtrim(std::string s)
 {
@@ -108,6 +109,10 @@ static const char *filenames[] = {
         "fail35.json",
         "fail36.json",
         "fail37.json",
+        "fail38.json",               // invalid unicode: only first half of surrogate pair
+        "fail39.json",               // invalid unicode: only second half of surrogate pair
+        "fail40.json",               // invalid unicode: broken UTF-8
+        "fail41.json",               // invalid unicode: unfinished UTF-8
         "fail3.json",
         "fail4.json",                // extra comma
         "fail5.json",
@@ -119,14 +124,40 @@ static const char *filenames[] = {
         "pass2.json",
         "pass3.json",
         "round1.json",              // round-trip test
+        "round2.json",              // unicode
 };
 
+// Test \u handling
+void unescape_unicode_test()
+{
+    UniValue val;
+    bool testResult;
+    // Escaped ASCII (quote)
+    testResult = val.read("[\"\\u0022\"]");
+    f_assert(testResult);
+    f_assert(val[0].get_str() == "\"");
+    // Escaped Basic Plane character, two-byte UTF-8
+    testResult = val.read("[\"\\u0191\"]");
+    f_assert(testResult);
+    f_assert(val[0].get_str() == "\xc6\x91");
+    // Escaped Basic Plane character, three-byte UTF-8
+    testResult = val.read("[\"\\u2191\"]");
+    f_assert(testResult);
+    f_assert(val[0].get_str() == "\xe2\x86\x91");
+    // Escaped Supplementary Plane character U+1d161
+    testResult = val.read("[\"\\ud834\\udd61\"]");
+    f_assert(testResult);
+    f_assert(val[0].get_str() == "\xf0\x9d\x85\xa1");
+}
+
 int main (int argc, char *argv[])
 {
     for (unsigned int fidx = 0; fidx < ARRAY_SIZE(filenames); fidx++) {
         runtest_file(filenames[fidx]);
     }
 
+    unescape_unicode_test();
+
     return test_failed ? 1 : 0;
 }
 

From a406fcb6cacdc49ce11fc6147df58c0c827a7a06 Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Thu, 28 Apr 2016 15:17:41 +0200
Subject: [PATCH 0459/1802] test: add ensure_ascii setting to AuthServiceProxy

Add a setting ensure_ascii to AuthServiceProxy. This setting,
defaulting to True (backwards compatible),
is passed through to json.dumps. If set to False, non-ASCII characters
>0x80 are not escaped. This is useful for testing server
input processing, as well as slightly more bandwidth friendly in case of
heavy unicode usage.
---
 qa/rpc-tests/test_framework/authproxy.py | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/qa/rpc-tests/test_framework/authproxy.py b/qa/rpc-tests/test_framework/authproxy.py
index 95b2be658cffe..d095a56ce75e3 100644
--- a/qa/rpc-tests/test_framework/authproxy.py
+++ b/qa/rpc-tests/test_framework/authproxy.py
@@ -67,9 +67,11 @@ def EncodeDecimal(o):
 class AuthServiceProxy(object):
     __id_count = 0
 
-    def __init__(self, service_url, service_name=None, timeout=HTTP_TIMEOUT, connection=None):
+    # ensure_ascii: escape unicode as \uXXXX, passed to json.dumps
+    def __init__(self, service_url, service_name=None, timeout=HTTP_TIMEOUT, connection=None, ensure_ascii=True):
         self.__service_url = service_url
         self._service_name = service_name
+        self.ensure_ascii = ensure_ascii # can be toggled on the fly by tests
         self.__url = urlparse.urlparse(service_url)
         if self.__url.port is None:
             port = 80
@@ -134,12 +136,12 @@ def __call__(self, *args):
         AuthServiceProxy.__id_count += 1
 
         log.debug("-%s-> %s %s"%(AuthServiceProxy.__id_count, self._service_name,
-                                 json.dumps(args, default=EncodeDecimal)))
+                                 json.dumps(args, default=EncodeDecimal, ensure_ascii=self.ensure_ascii)))
         postdata = json.dumps({'version': '1.1',
                                'method': self._service_name,
                                'params': args,
-                               'id': AuthServiceProxy.__id_count}, default=EncodeDecimal)
-        response = self._request('POST', self.__url.path, postdata)
+                               'id': AuthServiceProxy.__id_count}, default=EncodeDecimal, ensure_ascii=self.ensure_ascii)
+        response = self._request('POST', self.__url.path, postdata.encode('utf-8'))
         if response['error'] is not None:
             raise JSONRPCException(response['error'])
         elif 'result' not in response:
@@ -149,9 +151,9 @@ def __call__(self, *args):
             return response['result']
 
     def _batch(self, rpc_call_list):
-        postdata = json.dumps(list(rpc_call_list), default=EncodeDecimal)
+        postdata = json.dumps(list(rpc_call_list), default=EncodeDecimal, ensure_ascii=self.ensure_ascii)
         log.debug("--> "+postdata)
-        return self._request('POST', self.__url.path, postdata)
+        return self._request('POST', self.__url.path, postdata.encode('utf-8'))
 
     def _get_response(self):
         http_response = self.__conn.getresponse()
@@ -167,7 +169,7 @@ def _get_response(self):
         responsedata = http_response.read().decode('utf8')
         response = json.loads(responsedata, parse_float=decimal.Decimal)
         if "error" in response and response["error"] is None:
-            log.debug("<-%s- %s"%(response["id"], json.dumps(response["result"], default=EncodeDecimal)))
+            log.debug("<-%s- %s"%(response["id"], json.dumps(response["result"], default=EncodeDecimal, ensure_ascii=self.ensure_ascii)))
         else:
             log.debug("<-- "+responsedata)
         return response

From 6bbb4ef39989ff75167da48faec581b55ba51240 Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Thu, 28 Apr 2016 15:18:01 +0200
Subject: [PATCH 0460/1802] test: test utf-8 for labels in wallet

---
 qa/rpc-tests/wallet.py | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/qa/rpc-tests/wallet.py b/qa/rpc-tests/wallet.py
index 9dda712f4ff08..ba84f0d5686dc 100755
--- a/qa/rpc-tests/wallet.py
+++ b/qa/rpc-tests/wallet.py
@@ -314,6 +314,20 @@ def run_test (self):
         balance_nodes = [self.nodes[i].getbalance() for i in range(3)]
         block_count = self.nodes[0].getblockcount()
 
+        # Check modes:
+        #   - True: unicode escaped as \u....
+        #   - False: unicode directly as UTF-8
+        for mode in [True, False]:
+            self.nodes[0].ensure_ascii = mode
+            # unicode check: Basic Multilingual Plane, Supplementary Plane respectively
+            for s in [u'рыба', u'𝅘𝅥𝅯']:
+                addr = self.nodes[0].getaccountaddress(s)
+                label = self.nodes[0].getaccount(addr)
+                assert_equal(label, s)
+                assert(s in self.nodes[0].listaccounts().keys())
+        self.nodes[0].ensure_ascii = True # restore to default
+
+        # maintenance tests
         maintenance = [
             '-rescan',
             '-reindex',

From 7982fce64c61c53d1e2e8cc6a8724f878701796d Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Sat, 16 Apr 2016 15:21:47 +0200
Subject: [PATCH 0461/1802] doc: Mention full UTF-8 support in release notes

---
 doc/release-notes.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/doc/release-notes.md b/doc/release-notes.md
index 7d44b8cda934c..0d457714d5856 100644
--- a/doc/release-notes.md
+++ b/doc/release-notes.md
@@ -43,6 +43,11 @@ RPC low-level changes
   32-bit and 64-bit platforms, and the txids were missing in the hashed data. This has been
   fixed, but this means that the output will be different than from previous versions.
 
+- Full UTF-8 support in the RPC API. Non-ASCII characters in, for example,
+  wallet labels have always been malformed because they weren't taken into account
+  properly in JSON RPC processing. This is no longer the case. This also affects
+  the GUI debug console.
+
 C++11 and Python 3
 -------------------
 

From 657fc19d6535b33748dafcf63cc0248c6fa0ee7a Mon Sep 17 00:00:00 2001
From: instagibbs <gsanders87@gmail.com>
Date: Fri, 10 Jun 2016 10:09:06 -0400
Subject: [PATCH 0462/1802] rename mapAddrCount to mapNetGroupNodes

---
 src/net.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/net.cpp b/src/net.cpp
index 173eba57c8669..c29dc3032a3fd 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -911,11 +911,11 @@ static bool AttemptToEvictConnection(bool fPreferNewConnection) {
     uint64_t naMostConnections;
     unsigned int nMostConnections = 0;
     int64_t nMostConnectionsTime = 0;
-    std::map<uint64_t, std::vector<NodeEvictionCandidate> > mapAddrCounts;
+    std::map<uint64_t, std::vector<NodeEvictionCandidate> > mapNetGroupNodes;
     BOOST_FOREACH(const NodeEvictionCandidate &node, vEvictionCandidates) {
-        mapAddrCounts[node.nKeyedNetGroup].push_back(node);
-        int64_t grouptime = mapAddrCounts[node.nKeyedNetGroup][0].nTimeConnected;
-        size_t groupsize = mapAddrCounts[node.nKeyedNetGroup].size();
+        mapNetGroupNodes[node.nKeyedNetGroup].push_back(node);
+        int64_t grouptime = mapNetGroupNodes[node.nKeyedNetGroup][0].nTimeConnected;
+        size_t groupsize = mapNetGroupNodes[node.nKeyedNetGroup].size();
 
         if (groupsize > nMostConnections || (groupsize == nMostConnections && grouptime > nMostConnectionsTime)) {
             nMostConnections = groupsize;
@@ -925,7 +925,7 @@ static bool AttemptToEvictConnection(bool fPreferNewConnection) {
     }
 
     // Reduce to the network group with the most connections
-    vEvictionCandidates = std::move(mapAddrCounts[naMostConnections]);
+    vEvictionCandidates = std::move(mapNetGroupNodes[naMostConnections]);
 
     // Do not disconnect peers if there is only one unprotected connection from their network group.
     // This step excessively favors netgroup diversity, and should be removed once more protective criteria are established.

From 1b0bcc5f9573406bff1c3ffaf73826b0142d23cc Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Fri, 10 Jun 2016 16:07:14 +0200
Subject: [PATCH 0463/1802] Track orphan by prev COutPoint rather than prev
 hash

---
 src/main.cpp | 58 ++++++++++++++++++++++++++++++++--------------------
 1 file changed, 36 insertions(+), 22 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index 6d006e8789db1..17867c869cd5b 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -88,12 +88,21 @@ CAmount maxTxFee = DEFAULT_TRANSACTION_MAXFEE;
 CTxMemPool mempool(::minRelayTxFee);
 FeeFilterRounder filterRounder(::minRelayTxFee);
 
+struct IteratorComparator
+{
+    template<typename I>
+    bool operator()(const I& a, const I& b)
+    {
+        return &(*a) < &(*b);
+    }
+};
+
 struct COrphanTx {
     CTransaction tx;
     NodeId fromPeer;
 };
 map<uint256, COrphanTx> mapOrphanTransactions GUARDED_BY(cs_main);
-map<uint256, set<uint256> > mapOrphanTransactionsByPrev GUARDED_BY(cs_main);
+map<COutPoint, set<map<uint256, COrphanTx>::iterator, IteratorComparator>> mapOrphanTransactionsByPrev GUARDED_BY(cs_main);
 void EraseOrphansFor(NodeId peer) EXCLUSIVE_LOCKS_REQUIRED(cs_main);
 
 /**
@@ -632,31 +641,33 @@ bool AddOrphanTx(const CTransaction& tx, NodeId peer) EXCLUSIVE_LOCKS_REQUIRED(c
         return false;
     }
 
-    mapOrphanTransactions[hash].tx = tx;
-    mapOrphanTransactions[hash].fromPeer = peer;
-    BOOST_FOREACH(const CTxIn& txin, tx.vin)
-        mapOrphanTransactionsByPrev[txin.prevout.hash].insert(hash);
+    auto ret = mapOrphanTransactions.emplace(hash, COrphanTx{tx, peer});
+    assert(ret.second);
+    BOOST_FOREACH(const CTxIn& txin, tx.vin) {
+        mapOrphanTransactionsByPrev[txin.prevout].insert(ret.first);
+    }
 
-    LogPrint("mempool", "stored orphan tx %s (mapsz %u prevsz %u)\n", hash.ToString(),
+    LogPrint("mempool", "stored orphan tx %s (mapsz %u outsz %u)\n", hash.ToString(),
              mapOrphanTransactions.size(), mapOrphanTransactionsByPrev.size());
     return true;
 }
 
-void static EraseOrphanTx(uint256 hash) EXCLUSIVE_LOCKS_REQUIRED(cs_main)
+int static EraseOrphanTx(uint256 hash) EXCLUSIVE_LOCKS_REQUIRED(cs_main)
 {
     map<uint256, COrphanTx>::iterator it = mapOrphanTransactions.find(hash);
     if (it == mapOrphanTransactions.end())
-        return;
+        return 0;
     BOOST_FOREACH(const CTxIn& txin, it->second.tx.vin)
     {
-        map<uint256, set<uint256> >::iterator itPrev = mapOrphanTransactionsByPrev.find(txin.prevout.hash);
+        auto itPrev = mapOrphanTransactionsByPrev.find(txin.prevout);
         if (itPrev == mapOrphanTransactionsByPrev.end())
             continue;
-        itPrev->second.erase(hash);
+        itPrev->second.erase(it);
         if (itPrev->second.empty())
             mapOrphanTransactionsByPrev.erase(itPrev);
     }
     mapOrphanTransactions.erase(it);
+    return 1;
 }
 
 void EraseOrphansFor(NodeId peer)
@@ -668,8 +679,7 @@ void EraseOrphansFor(NodeId peer)
         map<uint256, COrphanTx>::iterator maybeErase = iter++; // increment to avoid iterator becoming invalid
         if (maybeErase->second.fromPeer == peer)
         {
-            EraseOrphanTx(maybeErase->second.tx.GetHash());
-            ++nErased;
+            nErased += EraseOrphanTx(maybeErase->second.tx.GetHash());
         }
     }
     if (nErased > 0) LogPrint("mempool", "Erased %d orphan tx from peer %d\n", nErased, peer);
@@ -5019,7 +5029,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
             return true;
         }
 
-        vector<uint256> vWorkQueue;
+        deque<COutPoint> vWorkQueue;
         vector<uint256> vEraseQueue;
         CTransaction tx;
         vRecv >> tx;
@@ -5038,7 +5048,9 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
         if (!AlreadyHave(inv) && AcceptToMemoryPool(mempool, state, tx, true, &fMissingInputs)) {
             mempool.check(pcoinsTip);
             RelayTransaction(tx);
-            vWorkQueue.push_back(inv.hash);
+            for (unsigned int i = 0; i < tx.vout.size(); i++) {
+                vWorkQueue.emplace_back(inv.hash, i);
+            }
 
             LogPrint("mempool", "AcceptToMemoryPool: peer=%d: accepted %s (poolsz %u txn, %u kB)\n",
                 pfrom->id,
@@ -5047,18 +5059,18 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
 
             // Recursively process any orphan transactions that depended on this one
             set<NodeId> setMisbehaving;
-            for (unsigned int i = 0; i < vWorkQueue.size(); i++)
-            {
-                map<uint256, set<uint256> >::iterator itByPrev = mapOrphanTransactionsByPrev.find(vWorkQueue[i]);
+            while (!vWorkQueue.empty()) {
+                auto itByPrev = mapOrphanTransactionsByPrev.find(vWorkQueue.front());
+                vWorkQueue.pop_front();
                 if (itByPrev == mapOrphanTransactionsByPrev.end())
                     continue;
-                for (set<uint256>::iterator mi = itByPrev->second.begin();
+                for (auto mi = itByPrev->second.begin();
                      mi != itByPrev->second.end();
                      ++mi)
                 {
-                    const uint256& orphanHash = *mi;
-                    const CTransaction& orphanTx = mapOrphanTransactions[orphanHash].tx;
-                    NodeId fromPeer = mapOrphanTransactions[orphanHash].fromPeer;
+                    const CTransaction& orphanTx = (*mi)->second.tx;
+                    const uint256& orphanHash = orphanTx.GetHash();
+                    NodeId fromPeer = (*mi)->second.fromPeer;
                     bool fMissingInputs2 = false;
                     // Use a dummy CValidationState so someone can't setup nodes to counter-DoS based on orphan
                     // resolution (that is, feeding people an invalid transaction based on LegitTxX in order to get
@@ -5071,7 +5083,9 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
                     if (AcceptToMemoryPool(mempool, stateDummy, orphanTx, true, &fMissingInputs2)) {
                         LogPrint("mempool", "   accepted orphan tx %s\n", orphanHash.ToString());
                         RelayTransaction(orphanTx);
-                        vWorkQueue.push_back(orphanHash);
+                        for (unsigned int i = 0; i < orphanTx.vout.size(); i++) {
+                            vWorkQueue.emplace_back(orphanHash, i);
+                        }
                         vEraseQueue.push_back(orphanHash);
                     }
                     else if (!fMissingInputs2)

From db0ffe80a0919653f058ab0f1fc735f46bb902f3 Mon Sep 17 00:00:00 2001
From: Gregory Maxwell <greg@xiph.org>
Date: Fri, 10 Jun 2016 20:41:49 +0000
Subject: [PATCH 0464/1802] This eliminates the primary leak that causes the
 orphan map to  always grow to its maximum size.

This does not go so far as to attempt to connect orphans made
 connectable by a new block.

Keeping the orphan map less full helps improve the reliability
 of relaying chains of transactions.
---
 src/main.cpp | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/src/main.cpp b/src/main.cpp
index 17867c869cd5b..c80a4ac922c83 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -2345,6 +2345,7 @@ bool ConnectBlock(const CBlock& block, CValidationState& state, CBlockIndex* pin
 
     CCheckQueueControl<CScriptCheck> control(fScriptChecks && nScriptCheckThreads ? &scriptcheckqueue : NULL);
 
+    std::vector<uint256> vOrphanErase;
     std::vector<int> prevheights;
     CAmount nFees = 0;
     int nInputs = 0;
@@ -2377,6 +2378,17 @@ bool ConnectBlock(const CBlock& block, CValidationState& state, CBlockIndex* pin
                 prevheights[j] = view.AccessCoins(tx.vin[j].prevout.hash)->nHeight;
             }
 
+            // Which orphan pool entries must we evict?
+            for (size_t j = 0; j < tx.vin.size(); j++) {
+                auto itByPrev = mapOrphanTransactionsByPrev.find(tx.vin[j].prevout);
+                if (itByPrev == mapOrphanTransactionsByPrev.end()) continue;
+                for (auto mi = itByPrev->second.begin(); mi != itByPrev->second.end(); ++mi) {
+                    const CTransaction& orphanTx = (*mi)->second.tx;
+                    const uint256& orphanHash = orphanTx.GetHash();
+                    vOrphanErase.push_back(orphanHash);
+                }
+            }
+
             if (!SequenceLocks(tx, nLockTimeFlags, &prevheights, *pindex)) {
                 return state.DoS(100, error("%s: contains a non-BIP68-final transaction", __func__),
                                  REJECT_INVALID, "bad-txns-nonfinal");
@@ -2464,6 +2476,15 @@ bool ConnectBlock(const CBlock& block, CValidationState& state, CBlockIndex* pin
     GetMainSignals().UpdatedTransaction(hashPrevBestCoinBase);
     hashPrevBestCoinBase = block.vtx[0].GetHash();
 
+    // Erase orphan transactions include or precluded by this block
+    if (vOrphanErase.size()) {
+        int nErased = 0;
+        BOOST_FOREACH(uint256 &orphanHash, vOrphanErase) {
+            nErased += EraseOrphanTx(orphanHash);
+        }
+        LogPrint("mempool", "Erased %d orphan tx included or conflicted by block\n", nErased);
+    }
+
     int64_t nTime6 = GetTimeMicros(); nTimeCallbacks += nTime6 - nTime5;
     LogPrint("bench", "    - Callbacks: %.2fms [%.2fs]\n", 0.001 * (nTime6 - nTime5), nTimeCallbacks * 0.000001);
 

From fa61756842d78beeac8e7cffa88767fa3f710510 Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Sun, 12 Jun 2016 14:10:55 +0200
Subject: [PATCH 0465/1802] [gitian] set correct PATH for wrappers

---
 contrib/gitian-descriptors/gitian-linux.yml | 6 ++++--
 contrib/gitian-descriptors/gitian-osx.yml   | 6 ++++--
 contrib/gitian-descriptors/gitian-win.yml   | 6 ++++--
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/contrib/gitian-descriptors/gitian-linux.yml b/contrib/gitian-descriptors/gitian-linux.yml
index cd289b2f6e4c8..28b7e6d351847 100644
--- a/contrib/gitian-descriptors/gitian-linux.yml
+++ b/contrib/gitian-descriptors/gitian-linux.yml
@@ -68,11 +68,11 @@ script: |
   done
   }
 
-  export PATH=${WRAP_DIR}:${PATH}
-
   # Faketime for depends so intermediate results are comparable
+  export PATH_orig=${PATH}
   create_global_faketime_wrappers "2000-01-01 12:00:00"
   create_per-host_faketime_wrappers "2000-01-01 12:00:00"
+  export PATH=${WRAP_DIR}:${PATH}
 
   cd bitcoin
   BASEPREFIX=`pwd`/depends
@@ -82,8 +82,10 @@ script: |
   done
 
   # Faketime for binaries
+  export PATH=${PATH_orig}
   create_global_faketime_wrappers "${REFERENCE_DATETIME}"
   create_per-host_faketime_wrappers "${REFERENCE_DATETIME}"
+  export PATH=${WRAP_DIR}:${PATH}
 
   # Create the release tarball using (arbitrarily) the first host
   ./autogen.sh
diff --git a/contrib/gitian-descriptors/gitian-osx.yml b/contrib/gitian-descriptors/gitian-osx.yml
index 8436cd612a57d..536fcfb105d53 100644
--- a/contrib/gitian-descriptors/gitian-osx.yml
+++ b/contrib/gitian-descriptors/gitian-osx.yml
@@ -77,11 +77,11 @@ script: |
   done
   }
 
-  export PATH=${WRAP_DIR}:${PATH}
-
   # Faketime for depends so intermediate results are comparable
+  export PATH_orig=${PATH}
   create_global_faketime_wrappers "2000-01-01 12:00:00"
   create_per-host_faketime_wrappers "2000-01-01 12:00:00"
+  export PATH=${WRAP_DIR}:${PATH}
 
   cd bitcoin
   BASEPREFIX=`pwd`/depends
@@ -95,8 +95,10 @@ script: |
   done
 
   # Faketime for binaries
+  export PATH=${PATH_orig}
   create_global_faketime_wrappers "${REFERENCE_DATETIME}"
   create_per-host_faketime_wrappers "${REFERENCE_DATETIME}"
+  export PATH=${WRAP_DIR}:${PATH}
 
   # Create the release tarball using (arbitrarily) the first host
   ./autogen.sh
diff --git a/contrib/gitian-descriptors/gitian-win.yml b/contrib/gitian-descriptors/gitian-win.yml
index 1d3a876dfb559..32b57b3160bd3 100644
--- a/contrib/gitian-descriptors/gitian-win.yml
+++ b/contrib/gitian-descriptors/gitian-win.yml
@@ -94,12 +94,12 @@ script: |
   done
   }
 
-  export PATH=${WRAP_DIR}:${PATH}
-
   # Faketime for depends so intermediate results are comparable
+  export PATH_orig=${PATH}
   create_global_faketime_wrappers "2000-01-01 12:00:00"
   create_per-host_faketime_wrappers "2000-01-01 12:00:00"
   create_per-host_linker_wrapper "2000-01-01 12:00:00"
+  export PATH=${WRAP_DIR}:${PATH}
 
   cd bitcoin
   BASEPREFIX=`pwd`/depends
@@ -109,9 +109,11 @@ script: |
   done
 
   # Faketime for binaries
+  export PATH=${PATH_orig}
   create_global_faketime_wrappers "${REFERENCE_DATETIME}"
   create_per-host_faketime_wrappers "${REFERENCE_DATETIME}"
   create_per-host_linker_wrapper "${REFERENCE_DATETIME}"
+  export PATH=${WRAP_DIR}:${PATH}
 
   # Create the release tarball using (arbitrarily) the first host
   ./autogen.sh

From b0938a00203a32cd932c78bc2782d113d2d78f06 Mon Sep 17 00:00:00 2001
From: fanquake <fanquake@gmail.com>
Date: Sun, 12 Jun 2016 20:33:20 +0800
Subject: [PATCH 0466/1802] [trivial][doc] Use Debian 8.5 in the gitian-build
 guide

---
 doc/gitian-building.md | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/doc/gitian-building.md b/doc/gitian-building.md
index 791f209bb1373..7796a5fc9c151 100644
--- a/doc/gitian-building.md
+++ b/doc/gitian-building.md
@@ -1,7 +1,7 @@
 Gitian building
 ================
 
-*Setup instructions for a Gitian build of Bitcoin using a Debian VM or physical system.*
+*Setup instructions for a Gitian build of Bitcoin Core using a Debian VM or physical system.*
 
 Gitian is the deterministic build process that is used to build the Bitcoin
 Core executables. It provides a way to be reasonably sure that the
@@ -26,7 +26,7 @@ Table of Contents
 - [Installing Gitian](#installing-gitian)
 - [Setting up the Gitian image](#setting-up-the-gitian-image)
 - [Getting and building the inputs](#getting-and-building-the-inputs)
-- [Building Bitcoin](#building-bitcoin)
+- [Building Bitcoin Core](#building-bitcoin-core)
 - [Building an alternative repository](#building-an-alternative-repository)
 - [Signing externally](#signing-externally)
 - [Uploading signatures](#uploading-signatures)
@@ -95,11 +95,11 @@ After creating the VM, we need to configure it.
 
 - Click `Ok` twice to save.
 
-Get the [Debian 8.x net installer](http://cdimage.debian.org/debian-cd/8.4.0/amd64/iso-cd/debian-8.4.0-amd64-netinst.iso) (a more recent minor version should also work, see also [Debian Network installation](https://www.debian.org/CD/netinst/)).
+Get the [Debian 8.x net installer](http://cdimage.debian.org/debian-cd/8.5.0/amd64/iso-cd/debian-8.5.0-amd64-netinst.iso) (a more recent minor version should also work, see also [Debian Network installation](https://www.debian.org/CD/netinst/)).
 This DVD image can be validated using a SHA256 hashing tool, for example on
 Unixy OSes by entering the following in a terminal:
 
-    echo "7a6b418e6a4ee3ca75dda04d79ed96c9e2c33bb0c703ca7e40c6374ab4590748  debian-8.4.0-amd64-netinst.iso" | sha256sum -c
+    echo "ad4e8c27c561ad8248d5ebc1d36eb172f884057bfeb2c22ead823f59fa8c3dff  debian-8.5.0-amd64-netinst.iso" | sha256sum -c
     # (must return OK)
 
 Then start the VM. On the first launch you will be asked for a CD or DVD image. Choose the downloaded iso.
@@ -342,10 +342,10 @@ manual intervention. Also optionally follow the next step: 'Seed the Gitian sour
 and offline git repositories' which will fetch the remaining files required for building
 offline.
 
-Building Bitcoin
+Building Bitcoin Core
 ----------------
 
-To build Bitcoin (for Linux, OS X and Windows) just follow the steps under 'perform
+To build Bitcoin Core (for Linux, OS X and Windows) just follow the steps under 'perform
 Gitian builds' in [doc/release-process.md](release-process.md#perform-gitian-builds) in the bitcoin repository.
 
 This may take some time as it will build all the dependencies needed for each descriptor.

From 01a99046de63dac4dbf1ddce9fc711ff1f05049a Mon Sep 17 00:00:00 2001
From: fanquake <fanquake@gmail.com>
Date: Mon, 13 Jun 2016 19:28:39 +0800
Subject: [PATCH 0467/1802] [trivial] Ignore split-debug.sh

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index a8722aa593ac3..ce40019dc314f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -114,3 +114,4 @@ share/BitcoindComparisonTool.jar
 /doc/doxygen/
 
 libbitcoinconsensus.pc
+contrib/devtools/split-debug.sh

From 0e209f9bf940ec2f6215885cf30deaa7355086e9 Mon Sep 17 00:00:00 2001
From: fanquake <fanquake@gmail.com>
Date: Mon, 13 Jun 2016 19:33:02 +0800
Subject: [PATCH 0468/1802] [trivial] Sync ax_pthread with upstream draft

---
 build-aux/m4/ax_pthread.m4 | 550 ++++++++++++++++++-------------------
 1 file changed, 275 insertions(+), 275 deletions(-)

diff --git a/build-aux/m4/ax_pthread.m4 b/build-aux/m4/ax_pthread.m4
index d218d1af73817..4c4051ea376f7 100644
--- a/build-aux/m4/ax_pthread.m4
+++ b/build-aux/m4/ax_pthread.m4
@@ -82,7 +82,7 @@
 #   modified version of the Autoconf Macro, you may extend this special
 #   exception to the GPL to apply to your modified version as well.
 
-#serial 22
+#serial 23
 
 AU_ALIAS([ACX_PTHREAD], [AX_PTHREAD])
 AC_DEFUN([AX_PTHREAD], [
@@ -100,22 +100,22 @@ ax_pthread_ok=no
 # etcetera environment variables, and if threads linking works using
 # them:
 if test "x$PTHREAD_CFLAGS$PTHREAD_LIBS" != "x"; then
-	ax_pthread_save_CC="$CC"
-	ax_pthread_save_CFLAGS="$CFLAGS"
-	ax_pthread_save_LIBS="$LIBS"
-	AS_IF([test "x$PTHREAD_CC" != "x"], [CC="$PTHREAD_CC"])
-	CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
-	LIBS="$PTHREAD_LIBS $LIBS"
-	AC_MSG_CHECKING([for pthread_join using $CC $PTHREAD_CFLAGS $PTHREAD_LIBS])
-	AC_LINK_IFELSE([AC_LANG_CALL([], [pthread_join])], [ax_pthread_ok=yes])
-	AC_MSG_RESULT([$ax_pthread_ok])
-	if test "x$ax_pthread_ok" = "xno"; then
-		PTHREAD_LIBS=""
-		PTHREAD_CFLAGS=""
-	fi
-	CC="$ax_pthread_save_CC"
-	CFLAGS="$ax_pthread_save_CFLAGS"
-	LIBS="$ax_pthread_save_LIBS"
+        ax_pthread_save_CC="$CC"
+        ax_pthread_save_CFLAGS="$CFLAGS"
+        ax_pthread_save_LIBS="$LIBS"
+        AS_IF([test "x$PTHREAD_CC" != "x"], [CC="$PTHREAD_CC"])
+        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+        LIBS="$PTHREAD_LIBS $LIBS"
+        AC_MSG_CHECKING([for pthread_join using $CC $PTHREAD_CFLAGS $PTHREAD_LIBS])
+        AC_LINK_IFELSE([AC_LANG_CALL([], [pthread_join])], [ax_pthread_ok=yes])
+        AC_MSG_RESULT([$ax_pthread_ok])
+        if test "x$ax_pthread_ok" = "xno"; then
+                PTHREAD_LIBS=""
+                PTHREAD_CFLAGS=""
+        fi
+        CC="$ax_pthread_save_CC"
+        CFLAGS="$ax_pthread_save_CFLAGS"
+        LIBS="$ax_pthread_save_LIBS"
 fi
 
 # We must check for the threads library under a number of different
@@ -152,50 +152,50 @@ ax_pthread_flags="pthreads none -Kthread -pthread -pthreads -mthreads pthread --
 
 case $host_os in
 
-	freebsd*)
+        freebsd*)
 
-	# -kthread: FreeBSD kernel threads (preferred to -pthread since SMP-able)
-	# lthread: LinuxThreads port on FreeBSD (also preferred to -pthread)
+        # -kthread: FreeBSD kernel threads (preferred to -pthread since SMP-able)
+        # lthread: LinuxThreads port on FreeBSD (also preferred to -pthread)
 
-	ax_pthread_flags="-kthread lthread $ax_pthread_flags"
-	;;
+        ax_pthread_flags="-kthread lthread $ax_pthread_flags"
+        ;;
 
-	hpux*)
+        hpux*)
 
-	# From the cc(1) man page: "[-mt] Sets various -D flags to enable
-	# multi-threading and also sets -lpthread."
+        # From the cc(1) man page: "[-mt] Sets various -D flags to enable
+        # multi-threading and also sets -lpthread."
 
-	ax_pthread_flags="-mt -pthread pthread $ax_pthread_flags"
-	;;
+        ax_pthread_flags="-mt -pthread pthread $ax_pthread_flags"
+        ;;
 
-	openedition*)
+        openedition*)
 
-	# IBM z/OS requires a feature-test macro to be defined in order to
-	# enable POSIX threads at all, so give the user a hint if this is
-	# not set. (We don't define these ourselves, as they can affect
-	# other portions of the system API in unpredictable ways.)
+        # IBM z/OS requires a feature-test macro to be defined in order to
+        # enable POSIX threads at all, so give the user a hint if this is
+        # not set. (We don't define these ourselves, as they can affect
+        # other portions of the system API in unpredictable ways.)
 
-	AC_EGREP_CPP([AX_PTHREAD_ZOS_MISSING],
-	    [
-#	     if !defined(_OPEN_THREADS) && !defined(_UNIX03_THREADS)
-	     AX_PTHREAD_ZOS_MISSING
-#	     endif
-	    ],
-	    [AC_MSG_WARN([IBM z/OS requires -D_OPEN_THREADS or -D_UNIX03_THREADS to enable pthreads support.])])
-	;;
+        AC_EGREP_CPP([AX_PTHREAD_ZOS_MISSING],
+            [
+#            if !defined(_OPEN_THREADS) && !defined(_UNIX03_THREADS)
+             AX_PTHREAD_ZOS_MISSING
+#            endif
+            ],
+            [AC_MSG_WARN([IBM z/OS requires -D_OPEN_THREADS or -D_UNIX03_THREADS to enable pthreads support.])])
+        ;;
 
-	solaris*)
+        solaris*)
 
-	# On Solaris (at least, for some versions), libc contains stubbed
-	# (non-functional) versions of the pthreads routines, so link-based
-	# tests will erroneously succeed. (N.B.: The stubs are missing
-	# pthread_cleanup_push, or rather a function called by this macro,
-	# so we could check for that, but who knows whether they'll stub
-	# that too in a future libc.)  So we'll check first for the
-	# standard Solaris way of linking pthreads (-mt -lpthread).
+        # On Solaris (at least, for some versions), libc contains stubbed
+        # (non-functional) versions of the pthreads routines, so link-based
+        # tests will erroneously succeed. (N.B.: The stubs are missing
+        # pthread_cleanup_push, or rather a function called by this macro,
+        # so we could check for that, but who knows whether they'll stub
+        # that too in a future libc.)  So we'll check first for the
+        # standard Solaris way of linking pthreads (-mt -lpthread).
 
-	ax_pthread_flags="-mt,pthread pthread $ax_pthread_flags"
-	;;
+        ax_pthread_flags="-mt,pthread pthread $ax_pthread_flags"
+        ;;
 esac
 
 # GCC generally uses -pthread, or -pthreads on some platforms (e.g. SPARC)
@@ -208,17 +208,17 @@ AS_IF([test "x$GCC" = "xyes"],
 # correctly enabled
 
 case $host_os in
-	darwin* | hpux* | linux* | osf* | solaris*)
-	ax_pthread_check_macro="_REENTRANT"
-	;;
+        darwin* | hpux* | linux* | osf* | solaris*)
+        ax_pthread_check_macro="_REENTRANT"
+        ;;
 
-	aix* | freebsd*)
-	ax_pthread_check_macro="_THREAD_SAFE"
-	;;
+        aix*)
+        ax_pthread_check_macro="_THREAD_SAFE"
+        ;;
 
-	*)
-	ax_pthread_check_macro="--"
-	;;
+        *)
+        ax_pthread_check_macro="--"
+        ;;
 esac
 AS_IF([test "x$ax_pthread_check_macro" = "x--"],
       [ax_pthread_check_cond=0],
@@ -231,13 +231,13 @@ AC_CACHE_CHECK([whether $CC is Clang],
     [ax_cv_PTHREAD_CLANG=no
      # Note that Autoconf sets GCC=yes for Clang as well as GCC
      if test "x$GCC" = "xyes"; then
-	AC_EGREP_CPP([AX_PTHREAD_CC_IS_CLANG],
-	    [/* Note: Clang 2.7 lacks __clang_[a-z]+__ */
-#	     if defined(__clang__) && defined(__llvm__)
-	     AX_PTHREAD_CC_IS_CLANG
-#	     endif
-	    ],
-	    [ax_cv_PTHREAD_CLANG=yes])
+        AC_EGREP_CPP([AX_PTHREAD_CC_IS_CLANG],
+            [/* Note: Clang 2.7 lacks __clang_[a-z]+__ */
+#            if defined(__clang__) && defined(__llvm__)
+             AX_PTHREAD_CC_IS_CLANG
+#            endif
+            ],
+            [ax_cv_PTHREAD_CLANG=yes])
      fi
     ])
 ax_pthread_clang="$ax_cv_PTHREAD_CLANG"
@@ -249,222 +249,222 @@ ax_pthread_clang_warning=no
 
 if test "x$ax_pthread_clang" = "xyes"; then
 
-	# Clang takes -pthread; it has never supported any other flag
-
-	# (Note 1: This will need to be revisited if a system that Clang
-	# supports has POSIX threads in a separate library.  This tends not
-	# to be the way of modern systems, but it's conceivable.)
-
-	# (Note 2: On some systems, notably Darwin, -pthread is not needed
-	# to get POSIX threads support; the API is always present and
-	# active.  We could reasonably leave PTHREAD_CFLAGS empty.  But
-	# -pthread does define _REENTRANT, and while the Darwin headers
-	# ignore this macro, third-party headers might not.)
-
-	PTHREAD_CFLAGS="-pthread"
-	PTHREAD_LIBS=
-
-	ax_pthread_ok=yes
-
-	# However, older versions of Clang make a point of warning the user
-	# that, in an invocation where only linking and no compilation is
-	# taking place, the -pthread option has no effect ("argument unused
-	# during compilation").  They expect -pthread to be passed in only
-	# when source code is being compiled.
-	#
-	# Problem is, this is at odds with the way Automake and most other
-	# C build frameworks function, which is that the same flags used in
-	# compilation (CFLAGS) are also used in linking.  Many systems
-	# supported by AX_PTHREAD require exactly this for POSIX threads
-	# support, and in fact it is often not straightforward to specify a
-	# flag that is used only in the compilation phase and not in
-	# linking.  Such a scenario is extremely rare in practice.
-	#
-	# Even though use of the -pthread flag in linking would only print
-	# a warning, this can be a nuisance for well-run software projects
-	# that build with -Werror.  So if the active version of Clang has
-	# this misfeature, we search for an option to squash it.
-
-	AC_CACHE_CHECK([whether Clang needs flag to prevent "argument unused" warning when linking with -pthread],
-	    [ax_cv_PTHREAD_CLANG_NO_WARN_FLAG],
-	    [ax_cv_PTHREAD_CLANG_NO_WARN_FLAG=unknown
-	     # Create an alternate version of $ac_link that compiles and
-	     # links in two steps (.c -> .o, .o -> exe) instead of one
-	     # (.c -> exe), because the warning occurs only in the second
-	     # step
-	     ax_pthread_save_ac_link="$ac_link"
-	     ax_pthread_sed='s/conftest\.\$ac_ext/conftest.$ac_objext/g'
-	     ax_pthread_link_step=`$as_echo "$ac_link" | sed "$ax_pthread_sed"`
-	     ax_pthread_2step_ac_link="($ac_compile) && (echo ==== >&5) && ($ax_pthread_link_step)"
-	     ax_pthread_save_CFLAGS="$CFLAGS"
-	     for ax_pthread_try in '' -Qunused-arguments -Wno-unused-command-line-argument unknown; do
-		AS_IF([test "x$ax_pthread_try" = "xunknown"], [break])
-		CFLAGS="-Werror -Wunknown-warning-option $ax_pthread_try -pthread $ax_pthread_save_CFLAGS"
-		ac_link="$ax_pthread_save_ac_link"
-		AC_LINK_IFELSE([AC_LANG_SOURCE([[int main(void){return 0;}]])],
-		    [ac_link="$ax_pthread_2step_ac_link"
-		     AC_LINK_IFELSE([AC_LANG_SOURCE([[int main(void){return 0;}]])],
-			 [break])
-		    ])
-	     done
-	     ac_link="$ax_pthread_save_ac_link"
-	     CFLAGS="$ax_pthread_save_CFLAGS"
-	     AS_IF([test "x$ax_pthread_try" = "x"], [ax_pthread_try=no])
-	     ax_cv_PTHREAD_CLANG_NO_WARN_FLAG="$ax_pthread_try"
-	    ])
-
-	case "$ax_cv_PTHREAD_CLANG_NO_WARN_FLAG" in
-		no | unknown) ;;
-		*) PTHREAD_CFLAGS="$ax_cv_PTHREAD_CLANG_NO_WARN_FLAG $PTHREAD_CFLAGS" ;;
-	esac
+        # Clang takes -pthread; it has never supported any other flag
+
+        # (Note 1: This will need to be revisited if a system that Clang
+        # supports has POSIX threads in a separate library.  This tends not
+        # to be the way of modern systems, but it's conceivable.)
+
+        # (Note 2: On some systems, notably Darwin, -pthread is not needed
+        # to get POSIX threads support; the API is always present and
+        # active.  We could reasonably leave PTHREAD_CFLAGS empty.  But
+        # -pthread does define _REENTRANT, and while the Darwin headers
+        # ignore this macro, third-party headers might not.)
+
+        PTHREAD_CFLAGS="-pthread"
+        PTHREAD_LIBS=
+
+        ax_pthread_ok=yes
+
+        # However, older versions of Clang make a point of warning the user
+        # that, in an invocation where only linking and no compilation is
+        # taking place, the -pthread option has no effect ("argument unused
+        # during compilation").  They expect -pthread to be passed in only
+        # when source code is being compiled.
+        #
+        # Problem is, this is at odds with the way Automake and most other
+        # C build frameworks function, which is that the same flags used in
+        # compilation (CFLAGS) are also used in linking.  Many systems
+        # supported by AX_PTHREAD require exactly this for POSIX threads
+        # support, and in fact it is often not straightforward to specify a
+        # flag that is used only in the compilation phase and not in
+        # linking.  Such a scenario is extremely rare in practice.
+        #
+        # Even though use of the -pthread flag in linking would only print
+        # a warning, this can be a nuisance for well-run software projects
+        # that build with -Werror.  So if the active version of Clang has
+        # this misfeature, we search for an option to squash it.
+
+        AC_CACHE_CHECK([whether Clang needs flag to prevent "argument unused" warning when linking with -pthread],
+            [ax_cv_PTHREAD_CLANG_NO_WARN_FLAG],
+            [ax_cv_PTHREAD_CLANG_NO_WARN_FLAG=unknown
+             # Create an alternate version of $ac_link that compiles and
+             # links in two steps (.c -> .o, .o -> exe) instead of one
+             # (.c -> exe), because the warning occurs only in the second
+             # step
+             ax_pthread_save_ac_link="$ac_link"
+             ax_pthread_sed='s/conftest\.\$ac_ext/conftest.$ac_objext/g'
+             ax_pthread_link_step=`$as_echo "$ac_link" | sed "$ax_pthread_sed"`
+             ax_pthread_2step_ac_link="($ac_compile) && (echo ==== >&5) && ($ax_pthread_link_step)"
+             ax_pthread_save_CFLAGS="$CFLAGS"
+             for ax_pthread_try in '' -Qunused-arguments -Wno-unused-command-line-argument unknown; do
+                AS_IF([test "x$ax_pthread_try" = "xunknown"], [break])
+                CFLAGS="-Werror -Wunknown-warning-option $ax_pthread_try -pthread $ax_pthread_save_CFLAGS"
+                ac_link="$ax_pthread_save_ac_link"
+                AC_LINK_IFELSE([AC_LANG_SOURCE([[int main(void){return 0;}]])],
+                    [ac_link="$ax_pthread_2step_ac_link"
+                     AC_LINK_IFELSE([AC_LANG_SOURCE([[int main(void){return 0;}]])],
+                         [break])
+                    ])
+             done
+             ac_link="$ax_pthread_save_ac_link"
+             CFLAGS="$ax_pthread_save_CFLAGS"
+             AS_IF([test "x$ax_pthread_try" = "x"], [ax_pthread_try=no])
+             ax_cv_PTHREAD_CLANG_NO_WARN_FLAG="$ax_pthread_try"
+            ])
+
+        case "$ax_cv_PTHREAD_CLANG_NO_WARN_FLAG" in
+                no | unknown) ;;
+                *) PTHREAD_CFLAGS="$ax_cv_PTHREAD_CLANG_NO_WARN_FLAG $PTHREAD_CFLAGS" ;;
+        esac
 
 fi # $ax_pthread_clang = yes
 
 if test "x$ax_pthread_ok" = "xno"; then
 for ax_pthread_try_flag in $ax_pthread_flags; do
 
-	case $ax_pthread_try_flag in
-		none)
-		AC_MSG_CHECKING([whether pthreads work without any flags])
-		;;
-
-		-mt,pthread)
-		AC_MSG_CHECKING([whether pthreads work with -mt -lpthread])
-		PTHREAD_CFLAGS="-mt"
-		PTHREAD_LIBS="-lpthread"
-		;;
-
-		-*)
-		AC_MSG_CHECKING([whether pthreads work with $ax_pthread_try_flag])
-		PTHREAD_CFLAGS="$ax_pthread_try_flag"
-		;;
-
-		pthread-config)
-		AC_CHECK_PROG([ax_pthread_config], [pthread-config], [yes], [no])
-		AS_IF([test "x$ax_pthread_config" = "xno"], [continue])
-		PTHREAD_CFLAGS="`pthread-config --cflags`"
-		PTHREAD_LIBS="`pthread-config --ldflags` `pthread-config --libs`"
-		;;
-
-		*)
-		AC_MSG_CHECKING([for the pthreads library -l$ax_pthread_try_flag])
-		PTHREAD_LIBS="-l$ax_pthread_try_flag"
-		;;
-	esac
-
-	ax_pthread_save_CFLAGS="$CFLAGS"
-	ax_pthread_save_LIBS="$LIBS"
-	CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
-	LIBS="$PTHREAD_LIBS $LIBS"
-
-	# Check for various functions.  We must include pthread.h,
-	# since some functions may be macros.  (On the Sequent, we
-	# need a special flag -Kthread to make this header compile.)
-	# We check for pthread_join because it is in -lpthread on IRIX
-	# while pthread_create is in libc.  We check for pthread_attr_init
-	# due to DEC craziness with -lpthreads.  We check for
-	# pthread_cleanup_push because it is one of the few pthread
-	# functions on Solaris that doesn't have a non-functional libc stub.
-	# We try pthread_create on general principles.
-
-	AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <pthread.h>
-#			if $ax_pthread_check_cond
-#			 error "$ax_pthread_check_macro must be defined"
-#			endif
-			static void routine(void *a) { a = 0; }
-			static void *start_routine(void *a) { return a; }],
-		       [pthread_t th; pthread_attr_t attr;
-			pthread_create(&th, 0, start_routine, 0);
-			pthread_join(th, 0);
-			pthread_attr_init(&attr);
-			pthread_cleanup_push(routine, 0);
-			pthread_cleanup_pop(0) /* ; */])],
-	    [ax_pthread_ok=yes],
-	    [])
-
-	CFLAGS="$ax_pthread_save_CFLAGS"
-	LIBS="$ax_pthread_save_LIBS"
-
-	AC_MSG_RESULT([$ax_pthread_ok])
-	AS_IF([test "x$ax_pthread_ok" = "xyes"], [break])
-
-	PTHREAD_LIBS=""
-	PTHREAD_CFLAGS=""
+        case $ax_pthread_try_flag in
+                none)
+                AC_MSG_CHECKING([whether pthreads work without any flags])
+                ;;
+
+                -mt,pthread)
+                AC_MSG_CHECKING([whether pthreads work with -mt -lpthread])
+                PTHREAD_CFLAGS="-mt"
+                PTHREAD_LIBS="-lpthread"
+                ;;
+
+                -*)
+                AC_MSG_CHECKING([whether pthreads work with $ax_pthread_try_flag])
+                PTHREAD_CFLAGS="$ax_pthread_try_flag"
+                ;;
+
+                pthread-config)
+                AC_CHECK_PROG([ax_pthread_config], [pthread-config], [yes], [no])
+                AS_IF([test "x$ax_pthread_config" = "xno"], [continue])
+                PTHREAD_CFLAGS="`pthread-config --cflags`"
+                PTHREAD_LIBS="`pthread-config --ldflags` `pthread-config --libs`"
+                ;;
+
+                *)
+                AC_MSG_CHECKING([for the pthreads library -l$ax_pthread_try_flag])
+                PTHREAD_LIBS="-l$ax_pthread_try_flag"
+                ;;
+        esac
+
+        ax_pthread_save_CFLAGS="$CFLAGS"
+        ax_pthread_save_LIBS="$LIBS"
+        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+        LIBS="$PTHREAD_LIBS $LIBS"
+
+        # Check for various functions.  We must include pthread.h,
+        # since some functions may be macros.  (On the Sequent, we
+        # need a special flag -Kthread to make this header compile.)
+        # We check for pthread_join because it is in -lpthread on IRIX
+        # while pthread_create is in libc.  We check for pthread_attr_init
+        # due to DEC craziness with -lpthreads.  We check for
+        # pthread_cleanup_push because it is one of the few pthread
+        # functions on Solaris that doesn't have a non-functional libc stub.
+        # We try pthread_create on general principles.
+
+        AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <pthread.h>
+#                       if $ax_pthread_check_cond
+#                        error "$ax_pthread_check_macro must be defined"
+#                       endif
+                        static void routine(void *a) { a = 0; }
+                        static void *start_routine(void *a) { return a; }],
+                       [pthread_t th; pthread_attr_t attr;
+                        pthread_create(&th, 0, start_routine, 0);
+                        pthread_join(th, 0);
+                        pthread_attr_init(&attr);
+                        pthread_cleanup_push(routine, 0);
+                        pthread_cleanup_pop(0) /* ; */])],
+            [ax_pthread_ok=yes],
+            [])
+
+        CFLAGS="$ax_pthread_save_CFLAGS"
+        LIBS="$ax_pthread_save_LIBS"
+
+        AC_MSG_RESULT([$ax_pthread_ok])
+        AS_IF([test "x$ax_pthread_ok" = "xyes"], [break])
+
+        PTHREAD_LIBS=""
+        PTHREAD_CFLAGS=""
 done
 fi
 
 # Various other checks:
 if test "x$ax_pthread_ok" = "xyes"; then
-	ax_pthread_save_CFLAGS="$CFLAGS"
-	ax_pthread_save_LIBS="$LIBS"
-	CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
-	LIBS="$PTHREAD_LIBS $LIBS"
-
-	# Detect AIX lossage: JOINABLE attribute is called UNDETACHED.
-	AC_CACHE_CHECK([for joinable pthread attribute],
-	    [ax_cv_PTHREAD_JOINABLE_ATTR],
-	    [ax_cv_PTHREAD_JOINABLE_ATTR=unknown
-	     for ax_pthread_attr in PTHREAD_CREATE_JOINABLE PTHREAD_CREATE_UNDETACHED; do
-		 AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <pthread.h>],
-						 [int attr = $ax_pthread_attr; return attr /* ; */])],
-				[ax_cv_PTHREAD_JOINABLE_ATTR=$ax_pthread_attr; break],
-				[])
-	     done
-	    ])
-	AS_IF([test "x$ax_cv_PTHREAD_JOINABLE_ATTR" != "xunknown" && \
-	       test "x$ax_cv_PTHREAD_JOINABLE_ATTR" != "xPTHREAD_CREATE_JOINABLE" && \
-	       test "x$ax_pthread_joinable_attr_defined" != "xyes"],
-	      [AC_DEFINE_UNQUOTED([PTHREAD_CREATE_JOINABLE],
-				  [$ax_cv_PTHREAD_JOINABLE_ATTR],
-				  [Define to necessary symbol if this constant
-				   uses a non-standard name on your system.])
-	       ax_pthread_joinable_attr_defined=yes
-	      ])
-
-	AC_CACHE_CHECK([whether more special flags are required for pthreads],
-	    [ax_cv_PTHREAD_SPECIAL_FLAGS],
-	    [ax_cv_PTHREAD_SPECIAL_FLAGS=no
-	     case $host_os in
-	     solaris*)
-	     ax_cv_PTHREAD_SPECIAL_FLAGS="-D_POSIX_PTHREAD_SEMANTICS"
-	     ;;
-	     esac
-	    ])
-	AS_IF([test "x$ax_cv_PTHREAD_SPECIAL_FLAGS" != "xno" && \
-	       test "x$ax_pthread_special_flags_added" != "xyes"],
-	      [PTHREAD_CFLAGS="$ax_cv_PTHREAD_SPECIAL_FLAGS $PTHREAD_CFLAGS"
-	       ax_pthread_special_flags_added=yes])
-
-	AC_CACHE_CHECK([for PTHREAD_PRIO_INHERIT],
-	    [ax_cv_PTHREAD_PRIO_INHERIT],
-	    [AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <pthread.h>]],
-					     [[int i = PTHREAD_PRIO_INHERIT;]])],
-			    [ax_cv_PTHREAD_PRIO_INHERIT=yes],
-			    [ax_cv_PTHREAD_PRIO_INHERIT=no])
-	    ])
-	AS_IF([test "x$ax_cv_PTHREAD_PRIO_INHERIT" = "xyes" && \
-	       test "x$ax_pthread_prio_inherit_defined" != "xyes"],
-	      [AC_DEFINE([HAVE_PTHREAD_PRIO_INHERIT], [1], [Have PTHREAD_PRIO_INHERIT.])
-	       ax_pthread_prio_inherit_defined=yes
-	      ])
-
-	CFLAGS="$ax_pthread_save_CFLAGS"
-	LIBS="$ax_pthread_save_LIBS"
-
-	# More AIX lossage: compile with *_r variant
-	if test "x$GCC" != "xyes"; then
-	    case $host_os in
-		aix*)
-		AS_CASE(["x/$CC"],
-		    [x*/c89|x*/c89_128|x*/c99|x*/c99_128|x*/cc|x*/cc128|x*/xlc|x*/xlc_v6|x*/xlc128|x*/xlc128_v6],
-		    [#handle absolute path differently from PATH based program lookup
-		     AS_CASE(["x$CC"],
-			 [x/*],
-			 [AS_IF([AS_EXECUTABLE_P([${CC}_r])],[PTHREAD_CC="${CC}_r"])],
-			 [AC_CHECK_PROGS([PTHREAD_CC],[${CC}_r],[$CC])])])
-		;;
-	    esac
-	fi
+        ax_pthread_save_CFLAGS="$CFLAGS"
+        ax_pthread_save_LIBS="$LIBS"
+        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+        LIBS="$PTHREAD_LIBS $LIBS"
+
+        # Detect AIX lossage: JOINABLE attribute is called UNDETACHED.
+        AC_CACHE_CHECK([for joinable pthread attribute],
+            [ax_cv_PTHREAD_JOINABLE_ATTR],
+            [ax_cv_PTHREAD_JOINABLE_ATTR=unknown
+             for ax_pthread_attr in PTHREAD_CREATE_JOINABLE PTHREAD_CREATE_UNDETACHED; do
+                 AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <pthread.h>],
+                                                 [int attr = $ax_pthread_attr; return attr /* ; */])],
+                                [ax_cv_PTHREAD_JOINABLE_ATTR=$ax_pthread_attr; break],
+                                [])
+             done
+            ])
+        AS_IF([test "x$ax_cv_PTHREAD_JOINABLE_ATTR" != "xunknown" && \
+               test "x$ax_cv_PTHREAD_JOINABLE_ATTR" != "xPTHREAD_CREATE_JOINABLE" && \
+               test "x$ax_pthread_joinable_attr_defined" != "xyes"],
+              [AC_DEFINE_UNQUOTED([PTHREAD_CREATE_JOINABLE],
+                                  [$ax_cv_PTHREAD_JOINABLE_ATTR],
+                                  [Define to necessary symbol if this constant
+                                   uses a non-standard name on your system.])
+               ax_pthread_joinable_attr_defined=yes
+              ])
+
+        AC_CACHE_CHECK([whether more special flags are required for pthreads],
+            [ax_cv_PTHREAD_SPECIAL_FLAGS],
+            [ax_cv_PTHREAD_SPECIAL_FLAGS=no
+             case $host_os in
+             solaris*)
+             ax_cv_PTHREAD_SPECIAL_FLAGS="-D_POSIX_PTHREAD_SEMANTICS"
+             ;;
+             esac
+            ])
+        AS_IF([test "x$ax_cv_PTHREAD_SPECIAL_FLAGS" != "xno" && \
+               test "x$ax_pthread_special_flags_added" != "xyes"],
+              [PTHREAD_CFLAGS="$ax_cv_PTHREAD_SPECIAL_FLAGS $PTHREAD_CFLAGS"
+               ax_pthread_special_flags_added=yes])
+
+        AC_CACHE_CHECK([for PTHREAD_PRIO_INHERIT],
+            [ax_cv_PTHREAD_PRIO_INHERIT],
+            [AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <pthread.h>]],
+                                             [[int i = PTHREAD_PRIO_INHERIT;]])],
+                            [ax_cv_PTHREAD_PRIO_INHERIT=yes],
+                            [ax_cv_PTHREAD_PRIO_INHERIT=no])
+            ])
+        AS_IF([test "x$ax_cv_PTHREAD_PRIO_INHERIT" = "xyes" && \
+               test "x$ax_pthread_prio_inherit_defined" != "xyes"],
+              [AC_DEFINE([HAVE_PTHREAD_PRIO_INHERIT], [1], [Have PTHREAD_PRIO_INHERIT.])
+               ax_pthread_prio_inherit_defined=yes
+              ])
+
+        CFLAGS="$ax_pthread_save_CFLAGS"
+        LIBS="$ax_pthread_save_LIBS"
+
+        # More AIX lossage: compile with *_r variant
+        if test "x$GCC" != "xyes"; then
+            case $host_os in
+                aix*)
+                AS_CASE(["x/$CC"],
+                    [x*/c89|x*/c89_128|x*/c99|x*/c99_128|x*/cc|x*/cc128|x*/xlc|x*/xlc_v6|x*/xlc128|x*/xlc128_v6],
+                    [#handle absolute path differently from PATH based program lookup
+                     AS_CASE(["x$CC"],
+                         [x/*],
+                         [AS_IF([AS_EXECUTABLE_P([${CC}_r])],[PTHREAD_CC="${CC}_r"])],
+                         [AC_CHECK_PROGS([PTHREAD_CC],[${CC}_r],[$CC])])])
+                ;;
+            esac
+        fi
 fi
 
 test -n "$PTHREAD_CC" || PTHREAD_CC="$CC"
@@ -475,11 +475,11 @@ AC_SUBST([PTHREAD_CC])
 
 # Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND:
 if test "x$ax_pthread_ok" = "xyes"; then
-	ifelse([$1],,[AC_DEFINE([HAVE_PTHREAD],[1],[Define if you have POSIX threads libraries and header files.])],[$1])
-	:
+        ifelse([$1],,[AC_DEFINE([HAVE_PTHREAD],[1],[Define if you have POSIX threads libraries and header files.])],[$1])
+        :
 else
-	ax_pthread_ok=no
-	$2
+        ax_pthread_ok=no
+        $2
 fi
 AC_LANG_POP
 ])dnl AX_PTHREAD

From 1c2a1bac0ad6901868c1a4003c7cbddcdf46a29b Mon Sep 17 00:00:00 2001
From: Francesco 'makevoid' Canessa <makevoid@gmail.com>
Date: Thu, 3 Mar 2016 10:54:31 +0000
Subject: [PATCH 0469/1802] Add address label to request payment QR Code (QT)

In the Receive 'Tab' of the QT wallet, when 'Show'ing a previously requested payment, add a label underneath the QR Code showing the bitcoin address where the funds will go to.

This way the user can be sure that the QR code scanner app the user using is reading the correct bitcoin address, preventing funds to be stolen.

Includes fix for HiDPI screens by @jonasschnelli.
---
 src/qt/forms/receiverequestdialog.ui |  2 +-
 src/qt/guiconstants.h                |  2 +-
 src/qt/receiverequestdialog.cpp      | 22 +++++++++++++++++-----
 src/qt/receiverequestdialog.h        |  1 +
 4 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/src/qt/forms/receiverequestdialog.ui b/src/qt/forms/receiverequestdialog.ui
index 1e484dd9a0f59..4163f4189c5e9 100644
--- a/src/qt/forms/receiverequestdialog.ui
+++ b/src/qt/forms/receiverequestdialog.ui
@@ -22,7 +22,7 @@
      <property name="minimumSize">
       <size>
        <width>300</width>
-       <height>300</height>
+       <height>320</height>
       </size>
      </property>
      <property name="toolTip">
diff --git a/src/qt/guiconstants.h b/src/qt/guiconstants.h
index 4b2c10dd48e43..bab9923d20d49 100644
--- a/src/qt/guiconstants.h
+++ b/src/qt/guiconstants.h
@@ -43,7 +43,7 @@ static const int TOOLTIP_WRAP_THRESHOLD = 80;
 static const int MAX_URI_LENGTH = 255;
 
 /* QRCodeDialog -- size of exported QR Code image */
-#define EXPORT_IMAGE_SIZE 256
+#define QR_IMAGE_SIZE 300
 
 /* Number of frames in spinner animation */
 #define SPINNER_FRAMES 36
diff --git a/src/qt/receiverequestdialog.cpp b/src/qt/receiverequestdialog.cpp
index a1e9156eeae4e..b13ea3df709bb 100644
--- a/src/qt/receiverequestdialog.cpp
+++ b/src/qt/receiverequestdialog.cpp
@@ -45,7 +45,7 @@ QImage QRImageWidget::exportImage()
 {
     if(!pixmap())
         return QImage();
-    return pixmap()->toImage().scaled(EXPORT_IMAGE_SIZE, EXPORT_IMAGE_SIZE);
+    return pixmap()->toImage();
 }
 
 void QRImageWidget::mousePressEvent(QMouseEvent *event)
@@ -166,20 +166,32 @@ void ReceiveRequestDialog::update()
                 ui->lblQRCode->setText(tr("Error encoding URI into QR Code."));
                 return;
             }
-            QImage myImage = QImage(code->width + 8, code->width + 8, QImage::Format_RGB32);
-            myImage.fill(0xffffff);
+            QImage qrImage = QImage(code->width + 8, code->width + 8, QImage::Format_RGB32);
+            qrImage.fill(0xffffff);
             unsigned char *p = code->data;
             for (int y = 0; y < code->width; y++)
             {
                 for (int x = 0; x < code->width; x++)
                 {
-                    myImage.setPixel(x + 4, y + 4, ((*p & 1) ? 0x0 : 0xffffff));
+                    qrImage.setPixel(x + 4, y + 4, ((*p & 1) ? 0x0 : 0xffffff));
                     p++;
                 }
             }
             QRcode_free(code);
 
-            ui->lblQRCode->setPixmap(QPixmap::fromImage(myImage).scaled(300, 300));
+            QImage qrAddrImage = QImage(QR_IMAGE_SIZE, QR_IMAGE_SIZE+20, QImage::Format_RGB32);
+            qrAddrImage.fill(0xffffff);
+            QPainter painter(&qrAddrImage);
+            painter.drawImage(0, 0, qrImage.scaled(QR_IMAGE_SIZE, QR_IMAGE_SIZE));
+            QFont font = GUIUtil::fixedPitchFont();
+            font.setPixelSize(12);
+            painter.setFont(font);
+            QRect paddedRect = qrAddrImage.rect();
+            paddedRect.setHeight(QR_IMAGE_SIZE+12);
+            painter.drawText(paddedRect, Qt::AlignBottom|Qt::AlignCenter, info.address);
+            painter.end();
+
+            ui->lblQRCode->setPixmap(QPixmap::fromImage(qrAddrImage));
             ui->btnSaveAs->setEnabled(true);
         }
     }
diff --git a/src/qt/receiverequestdialog.h b/src/qt/receiverequestdialog.h
index 4cab4caff1ace..676745a858f6c 100644
--- a/src/qt/receiverequestdialog.h
+++ b/src/qt/receiverequestdialog.h
@@ -10,6 +10,7 @@
 #include <QDialog>
 #include <QImage>
 #include <QLabel>
+#include <QPainter>
 
 class OptionsModel;
 

From 3764dec36c815267174951a4c64e17c07ee6302f Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Sat, 26 Mar 2016 18:58:00 +0100
Subject: [PATCH 0470/1802] Keep addrman's nService bits consistent with
 outbound observations

---
 src/addrman.cpp | 18 ++++++++++++++++++
 src/addrman.h   | 11 +++++++++++
 src/main.cpp    |  4 ++++
 3 files changed, 33 insertions(+)

diff --git a/src/addrman.cpp b/src/addrman.cpp
index 00f6fe99e001c..d1e98d8ac0904 100644
--- a/src/addrman.cpp
+++ b/src/addrman.cpp
@@ -502,6 +502,24 @@ void CAddrMan::Connected_(const CService& addr, int64_t nTime)
         info.nTime = nTime;
 }
 
+void CAddrMan::SetServices_(const CService& addr, uint64_t nServices)
+{
+    CAddrInfo* pinfo = Find(addr);
+
+    // if not found, bail out
+    if (!pinfo)
+        return;
+
+    CAddrInfo& info = *pinfo;
+
+    // check whether we are talking about the exact same CService (including same port)
+    if (info != addr)
+        return;
+
+    // update info
+    info.nServices = nServices;
+}
+
 int CAddrMan::RandomInt(int nMax){
     return GetRandInt(nMax);
 }
diff --git a/src/addrman.h b/src/addrman.h
index c5923e94171c6..7e36e2228f39e 100644
--- a/src/addrman.h
+++ b/src/addrman.h
@@ -256,6 +256,9 @@ class CAddrMan
     //! Mark an entry as currently-connected-to.
     void Connected_(const CService &addr, int64_t nTime);
 
+    //! Update an entry's service bits.
+    void SetServices_(const CService &addr, uint64_t nServices);
+
 public:
     /**
      * serialized format:
@@ -589,6 +592,14 @@ class CAddrMan
         }
     }
 
+    void SetServices(const CService &addr, uint64_t nServices)
+    {
+        LOCK(cs);
+        Check();
+        SetServices_(addr, nServices);
+        Check();
+    }
+
 };
 
 #endif // BITCOIN_ADDRMAN_H
diff --git a/src/main.cpp b/src/main.cpp
index 6092e7a12e991..ac89945bf2638 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -4612,6 +4612,10 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
         CAddress addrFrom;
         uint64_t nNonce = 1;
         vRecv >> pfrom->nVersion >> pfrom->nServices >> nTime >> addrMe;
+        if (!pfrom->fInbound)
+        {
+            addrman.SetServices(pfrom->addr, pfrom->nServices);
+        }
         if (pfrom->nVersion < MIN_PEER_PROTO_VERSION)
         {
             // disconnect from peers older than this proto version

From fc83f181530fb566726e5f3f4197fc5586d77fd8 Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Sat, 26 Mar 2016 19:09:22 +0100
Subject: [PATCH 0471/1802] Verify that outbound connections have expected
 services

---
 src/main.cpp | 9 +++++++++
 src/net.cpp  | 5 +++++
 src/net.h    | 1 +
 3 files changed, 15 insertions(+)

diff --git a/src/main.cpp b/src/main.cpp
index ac89945bf2638..7818056d2142d 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -4616,6 +4616,15 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
         {
             addrman.SetServices(pfrom->addr, pfrom->nServices);
         }
+        if (pfrom->nServicesExpected & ~pfrom->nServices)
+        {
+            LogPrint("net", "peer=%d does not offer the expected services (%08x offered, %08x expected); disconnecting\n", pfrom->id, pfrom->nServices, pfrom->nServicesExpected);
+            pfrom->PushMessage(NetMsgType::REJECT, strCommand, REJECT_NONSTANDARD,
+                               strprintf("Expected to offer services %08x", pfrom->nServicesExpected));
+            pfrom->fDisconnect = true;
+            return false;
+        }
+
         if (pfrom->nVersion < MIN_PEER_PROTO_VERSION)
         {
             // disconnect from peers older than this proto version
diff --git a/src/net.cpp b/src/net.cpp
index 173eba57c8669..a0c2bd5091ce1 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -71,6 +71,9 @@ namespace {
 
 const static std::string NET_MESSAGE_COMMAND_OTHER = "*other*";
 
+/** Services this node implementation cares about */
+static const uint64_t nRelevantServices = NODE_NETWORK;
+
 //
 // Global state variables
 //
@@ -409,6 +412,7 @@ CNode* ConnectNode(CAddress addrConnect, const char *pszDest, bool fCountFailure
             vNodes.push_back(pnode);
         }
 
+        pnode->nServicesExpected = addrConnect.nServices & nRelevantServices;
         pnode->nTimeConnected = GetTime();
 
         return pnode;
@@ -2325,6 +2329,7 @@ CNode::CNode(SOCKET hSocketIn, const CAddress& addrIn, const std::string& addrNa
     filterInventoryKnown(50000, 0.000001)
 {
     nServices = 0;
+    nServicesExpected = 0;
     hSocket = hSocketIn;
     nRecvVersion = INIT_PROTO_VERSION;
     nLastSend = 0;
diff --git a/src/net.h b/src/net.h
index 5c1f7e3e89cbc..445d25bf821bd 100644
--- a/src/net.h
+++ b/src/net.h
@@ -317,6 +317,7 @@ class CNode
 public:
     // socket
     uint64_t nServices;
+    uint64_t nServicesExpected;
     SOCKET hSocket;
     CDataStream ssSend;
     size_t nSendSize; // total size of all vSendMsg entries

From 5e7ab16d29ac66a5a5753dd4f59b6fb12e60654e Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Sat, 26 Mar 2016 13:31:25 +0100
Subject: [PATCH 0472/1802] Only store and connect to NODE_NETWORK nodes

---
 src/main.cpp | 3 +++
 src/net.cpp  | 4 ++++
 2 files changed, 7 insertions(+)

diff --git a/src/main.cpp b/src/main.cpp
index 7818056d2142d..bcaf095ab3141 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -4785,6 +4785,9 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
         {
             boost::this_thread::interruption_point();
 
+            if (!(addr.nServices & NODE_NETWORK))
+                continue;
+
             if (addr.nTime <= 100000000 || addr.nTime > nNow + 10 * 60)
                 addr.nTime = nNow - 5 * 24 * 60 * 60;
             pfrom->AddAddressKnown(addr);
diff --git a/src/net.cpp b/src/net.cpp
index a0c2bd5091ce1..395e1fe423bda 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -1596,6 +1596,10 @@ void ThreadOpenConnections()
             if (IsLimited(addr))
                 continue;
 
+            // only connect to full nodes
+            if (!(addr.nServices & NODE_NETWORK))
+                continue;
+
             // only consider very recently tried nodes after 30 failed attempts
             if (nANow - addr.nLastTry < 600 && nTries < 30)
                 continue;

From 15bf863219abe968ebe9e59fed4806c9fd07a58b Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Wed, 25 May 2016 17:18:37 +0200
Subject: [PATCH 0473/1802] Don't require services in -addnode

---
 src/net.cpp                | 15 ++++---
 src/protocol.cpp           |  2 +-
 src/protocol.h             |  2 +-
 src/test/DoS_tests.cpp     |  8 ++--
 src/test/addrman_tests.cpp | 92 +++++++++++++++++++-------------------
 src/test/net_tests.cpp     |  8 ++--
 6 files changed, 64 insertions(+), 63 deletions(-)

diff --git a/src/net.cpp b/src/net.cpp
index 395e1fe423bda..80ba7fce2288a 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -162,7 +162,7 @@ static std::vector<CAddress> convertSeed6(const std::vector<SeedSpec6> &vSeedsIn
     {
         struct in6_addr ip;
         memcpy(&ip, i->addr, sizeof(ip));
-        CAddress addr(CService(ip, i->port));
+        CAddress addr(CService(ip, i->port), NODE_NETWORK);
         addr.nTime = GetTime() - GetRand(nOneWeek) - nOneWeek;
         vSeedsOut.push_back(addr);
     }
@@ -179,9 +179,8 @@ CAddress GetLocalAddress(const CNetAddr *paddrPeer)
     CService addr;
     if (GetLocal(addr, paddrPeer))
     {
-        ret = CAddress(addr);
+        ret = CAddress(addr, nLocalServices);
     }
-    ret.nServices = nLocalServices;
     ret.nTime = GetAdjustedTime();
     return ret;
 }
@@ -465,7 +464,7 @@ void CNode::PushVersion()
     int nBestHeight = GetNodeSignals().GetHeight().get_value_or(0);
 
     int64_t nTime = (fInbound ? GetAdjustedTime() : GetTime());
-    CAddress addrYou = (addr.IsRoutable() && !IsProxy(addr) ? addr : CAddress(CService("0.0.0.0",0)));
+    CAddress addrYou = (addr.IsRoutable() && !IsProxy(addr) ? addr : CAddress(CService("0.0.0.0",0), addr.nServices));
     CAddress addrMe = GetLocalAddress(&addr);
     GetRandBytes((unsigned char*)&nLocalHostNonce, sizeof(nLocalHostNonce));
     if (fLogIPs)
@@ -1441,7 +1440,7 @@ void ThreadDNSAddressSeed()
         } else {
             std::vector<CNetAddr> vIPs;
             std::vector<CAddress> vAdd;
-            uint64_t requiredServiceBits = NODE_NETWORK;
+            uint64_t requiredServiceBits = nRelevantServices;
             if (LookupHost(seed.getHost(requiredServiceBits).c_str(), vIPs, 0, true))
             {
                 BOOST_FOREACH(const CNetAddr& ip, vIPs)
@@ -1524,7 +1523,7 @@ void ThreadOpenConnections()
             ProcessOneShot();
             BOOST_FOREACH(const std::string& strAddr, mapMultiArgs["-connect"])
             {
-                CAddress addr;
+                CAddress addr(CService(), 0);
                 OpenNetworkConnection(addr, false, NULL, strAddr.c_str());
                 for (int i = 0; i < 10 && i < nLoop; i++)
                 {
@@ -1674,7 +1673,9 @@ void ThreadOpenAddedConnections()
         BOOST_FOREACH(std::vector<CService>& vserv, lservAddressesToAdd)
         {
             CSemaphoreGrant grant(*semOutbound);
-            OpenNetworkConnection(CAddress(vserv[i % vserv.size()]), false, &grant);
+            /* We want -addnode to work even for nodes that don't provide all
+             * wanted services, so pass in nServices=0 to CAddress. */
+            OpenNetworkConnection(CAddress(vserv[i % vserv.size()], 0), false, &grant);
             MilliSleep(500);
         }
         MilliSleep(120000); // Retry every 2 minutes
diff --git a/src/protocol.cpp b/src/protocol.cpp
index 8c4bd057254a3..a46051b84f2e3 100644
--- a/src/protocol.cpp
+++ b/src/protocol.cpp
@@ -141,7 +141,7 @@ CAddress::CAddress(CService ipIn, uint64_t nServicesIn) : CService(ipIn)
 
 void CAddress::Init()
 {
-    nServices = NODE_NETWORK;
+    nServices = 0;
     nTime = 100000000;
 }
 
diff --git a/src/protocol.h b/src/protocol.h
index 1b049e52af8a6..c3f819aaee882 100644
--- a/src/protocol.h
+++ b/src/protocol.h
@@ -251,7 +251,7 @@ class CAddress : public CService
 {
 public:
     CAddress();
-    explicit CAddress(CService ipIn, uint64_t nServicesIn = NODE_NETWORK);
+    explicit CAddress(CService ipIn, uint64_t nServicesIn);
 
     void Init();
 
diff --git a/src/test/DoS_tests.cpp b/src/test/DoS_tests.cpp
index 95342498fa782..dc019d6cf5746 100644
--- a/src/test/DoS_tests.cpp
+++ b/src/test/DoS_tests.cpp
@@ -45,7 +45,7 @@ BOOST_FIXTURE_TEST_SUITE(DoS_tests, TestingSetup)
 BOOST_AUTO_TEST_CASE(DoS_banning)
 {
     CNode::ClearBanned();
-    CAddress addr1(ip(0xa0b0c001));
+    CAddress addr1(ip(0xa0b0c001), 0);
     CNode dummyNode1(INVALID_SOCKET, addr1, "", true);
     dummyNode1.nVersion = 1;
     Misbehaving(dummyNode1.GetId(), 100); // Should get banned
@@ -53,7 +53,7 @@ BOOST_AUTO_TEST_CASE(DoS_banning)
     BOOST_CHECK(CNode::IsBanned(addr1));
     BOOST_CHECK(!CNode::IsBanned(ip(0xa0b0c001|0x0000ff00))); // Different IP, not banned
 
-    CAddress addr2(ip(0xa0b0c002));
+    CAddress addr2(ip(0xa0b0c002), 0);
     CNode dummyNode2(INVALID_SOCKET, addr2, "", true);
     dummyNode2.nVersion = 1;
     Misbehaving(dummyNode2.GetId(), 50);
@@ -69,7 +69,7 @@ BOOST_AUTO_TEST_CASE(DoS_banscore)
 {
     CNode::ClearBanned();
     mapArgs["-banscore"] = "111"; // because 11 is my favorite number
-    CAddress addr1(ip(0xa0b0c001));
+    CAddress addr1(ip(0xa0b0c001), 0);
     CNode dummyNode1(INVALID_SOCKET, addr1, "", true);
     dummyNode1.nVersion = 1;
     Misbehaving(dummyNode1.GetId(), 100);
@@ -90,7 +90,7 @@ BOOST_AUTO_TEST_CASE(DoS_bantime)
     int64_t nStartTime = GetTime();
     SetMockTime(nStartTime); // Overrides future calls to GetTime()
 
-    CAddress addr(ip(0xa0b0c001));
+    CAddress addr(ip(0xa0b0c001), 0);
     CNode dummyNode(INVALID_SOCKET, addr, "", true);
     dummyNode.nVersion = 1;
 
diff --git a/src/test/addrman_tests.cpp b/src/test/addrman_tests.cpp
index 767b653e47734..93c3eba7fe27d 100644
--- a/src/test/addrman_tests.cpp
+++ b/src/test/addrman_tests.cpp
@@ -68,7 +68,7 @@ BOOST_AUTO_TEST_CASE(addrman_simple)
 
     // Test 2: Does Addrman::Add work as expected.
     CService addr1 = CService("250.1.1.1", 8333);
-    addrman.Add(CAddress(addr1), source);
+    addrman.Add(CAddress(addr1, 0), source);
     BOOST_CHECK(addrman.size() == 1);
     CAddrInfo addr_ret1 = addrman.Select();
     BOOST_CHECK(addr_ret1.ToString() == "250.1.1.1:8333");
@@ -76,14 +76,14 @@ BOOST_AUTO_TEST_CASE(addrman_simple)
     // Test 3: Does IP address deduplication work correctly.
     //  Expected dup IP should not be added.
     CService addr1_dup = CService("250.1.1.1", 8333);
-    addrman.Add(CAddress(addr1_dup), source);
+    addrman.Add(CAddress(addr1_dup, 0), source);
     BOOST_CHECK(addrman.size() == 1);
 
 
     // Test 5: New table has one addr and we add a diff addr we should
     //  have two addrs.
     CService addr2 = CService("250.1.1.2", 8333);
-    addrman.Add(CAddress(addr2), source);
+    addrman.Add(CAddress(addr2, 0), source);
     BOOST_CHECK(addrman.size() == 2);
 
     // Test 6: AddrMan::Clear() should empty the new table.
@@ -106,18 +106,18 @@ BOOST_AUTO_TEST_CASE(addrman_ports)
 
     // Test 7; Addr with same IP but diff port does not replace existing addr.
     CService addr1 = CService("250.1.1.1", 8333);
-    addrman.Add(CAddress(addr1), source);
+    addrman.Add(CAddress(addr1, 0), source);
     BOOST_CHECK(addrman.size() == 1);
 
     CService addr1_port = CService("250.1.1.1", 8334);
-    addrman.Add(CAddress(addr1_port), source);
+    addrman.Add(CAddress(addr1_port, 0), source);
     BOOST_CHECK(addrman.size() == 1);
     CAddrInfo addr_ret2 = addrman.Select();
     BOOST_CHECK(addr_ret2.ToString() == "250.1.1.1:8333");
 
     // Test 8: Add same IP but diff port to tried table, it doesn't get added.
     //  Perhaps this is not ideal behavior but it is the current behavior.
-    addrman.Good(CAddress(addr1_port));
+    addrman.Good(CAddress(addr1_port, 0));
     BOOST_CHECK(addrman.size() == 1);
     bool newOnly = true;
     CAddrInfo addr_ret3 = addrman.Select(newOnly);
@@ -136,7 +136,7 @@ BOOST_AUTO_TEST_CASE(addrman_select)
 
     // Test 9: Select from new with 1 addr in new.
     CService addr1 = CService("250.1.1.1", 8333);
-    addrman.Add(CAddress(addr1), source);
+    addrman.Add(CAddress(addr1, 0), source);
     BOOST_CHECK(addrman.size() == 1);
 
     bool newOnly = true;
@@ -144,7 +144,7 @@ BOOST_AUTO_TEST_CASE(addrman_select)
     BOOST_CHECK(addr_ret1.ToString() == "250.1.1.1:8333");
 
     // Test 10: move addr to tried, select from new expected nothing returned.
-    addrman.Good(CAddress(addr1));
+    addrman.Good(CAddress(addr1, 0));
     BOOST_CHECK(addrman.size() == 1);
     CAddrInfo addr_ret2 = addrman.Select(newOnly);
     BOOST_CHECK(addr_ret2.ToString() == "[::]:0");
@@ -160,21 +160,21 @@ BOOST_AUTO_TEST_CASE(addrman_select)
     CService addr3 = CService("250.3.2.2", 9999);
     CService addr4 = CService("250.3.3.3", 9999);
 
-    addrman.Add(CAddress(addr2), CService("250.3.1.1", 8333));
-    addrman.Add(CAddress(addr3), CService("250.3.1.1", 8333));
-    addrman.Add(CAddress(addr4), CService("250.4.1.1", 8333));
+    addrman.Add(CAddress(addr2, 0), CService("250.3.1.1", 8333));
+    addrman.Add(CAddress(addr3, 0), CService("250.3.1.1", 8333));
+    addrman.Add(CAddress(addr4, 0), CService("250.4.1.1", 8333));
 
     // Add three addresses to tried table.
     CService addr5 = CService("250.4.4.4", 8333);
     CService addr6 = CService("250.4.5.5", 7777);
     CService addr7 = CService("250.4.6.6", 8333);
 
-    addrman.Add(CAddress(addr5), CService("250.3.1.1", 8333));
-    addrman.Good(CAddress(addr5));
-    addrman.Add(CAddress(addr6), CService("250.3.1.1", 8333));
-    addrman.Good(CAddress(addr6));
-    addrman.Add(CAddress(addr7), CService("250.1.1.3", 8333));
-    addrman.Good(CAddress(addr7));
+    addrman.Add(CAddress(addr5, 0), CService("250.3.1.1", 8333));
+    addrman.Good(CAddress(addr5, 0));
+    addrman.Add(CAddress(addr6, 0), CService("250.3.1.1", 8333));
+    addrman.Good(CAddress(addr6, 0));
+    addrman.Add(CAddress(addr7, 0), CService("250.1.1.3", 8333));
+    addrman.Good(CAddress(addr7, 0));
 
     // Test 11: 6 addrs + 1 addr from last test = 7.
     BOOST_CHECK(addrman.size() == 7);
@@ -199,7 +199,7 @@ BOOST_AUTO_TEST_CASE(addrman_new_collisions)
 
     for (unsigned int i = 1; i < 18; i++) {
         CService addr = CService("250.1.1." + boost::to_string(i));
-        addrman.Add(CAddress(addr), source);
+        addrman.Add(CAddress(addr, 0), source);
 
         //Test 13: No collision in new table yet.
         BOOST_CHECK(addrman.size() == i);
@@ -207,11 +207,11 @@ BOOST_AUTO_TEST_CASE(addrman_new_collisions)
 
     //Test 14: new table collision!
     CService addr1 = CService("250.1.1.18");
-    addrman.Add(CAddress(addr1), source);
+    addrman.Add(CAddress(addr1, 0), source);
     BOOST_CHECK(addrman.size() == 17);
 
     CService addr2 = CService("250.1.1.19");
-    addrman.Add(CAddress(addr2), source);
+    addrman.Add(CAddress(addr2, 0), source);
     BOOST_CHECK(addrman.size() == 18);
 }
 
@@ -228,8 +228,8 @@ BOOST_AUTO_TEST_CASE(addrman_tried_collisions)
 
     for (unsigned int i = 1; i < 80; i++) {
         CService addr = CService("250.1.1." + boost::to_string(i));
-        addrman.Add(CAddress(addr), source);
-        addrman.Good(CAddress(addr));
+        addrman.Add(CAddress(addr, 0), source);
+        addrman.Good(CAddress(addr, 0));
 
         //Test 15: No collision in tried table yet.
         BOOST_TEST_MESSAGE(addrman.size());
@@ -238,11 +238,11 @@ BOOST_AUTO_TEST_CASE(addrman_tried_collisions)
 
     //Test 16: tried table collision!
     CService addr1 = CService("250.1.1.80");
-    addrman.Add(CAddress(addr1), source);
+    addrman.Add(CAddress(addr1, 0), source);
     BOOST_CHECK(addrman.size() == 79);
 
     CService addr2 = CService("250.1.1.81");
-    addrman.Add(CAddress(addr2), source);
+    addrman.Add(CAddress(addr2, 0), source);
     BOOST_CHECK(addrman.size() == 80);
 }
 
@@ -255,9 +255,9 @@ BOOST_AUTO_TEST_CASE(addrman_find)
 
     BOOST_CHECK(addrman.size() == 0);
 
-    CAddress addr1 = CAddress(CService("250.1.2.1", 8333));
-    CAddress addr2 = CAddress(CService("250.1.2.1", 9999));
-    CAddress addr3 = CAddress(CService("251.255.2.1", 8333));
+    CAddress addr1 = CAddress(CService("250.1.2.1", 8333), 0);
+    CAddress addr2 = CAddress(CService("250.1.2.1", 9999), 0);
+    CAddress addr3 = CAddress(CService("251.255.2.1", 8333), 0);
 
     CNetAddr source1 = CNetAddr("250.1.2.1");
     CNetAddr source2 = CNetAddr("250.1.2.2");
@@ -294,7 +294,7 @@ BOOST_AUTO_TEST_CASE(addrman_create)
 
     BOOST_CHECK(addrman.size() == 0);
 
-    CAddress addr1 = CAddress(CService("250.1.2.1", 8333));
+    CAddress addr1 = CAddress(CService("250.1.2.1", 8333), 0);
     CNetAddr source1 = CNetAddr("250.1.2.1");
 
     int nId;
@@ -317,7 +317,7 @@ BOOST_AUTO_TEST_CASE(addrman_delete)
 
     BOOST_CHECK(addrman.size() == 0);
 
-    CAddress addr1 = CAddress(CService("250.1.2.1", 8333));
+    CAddress addr1 = CAddress(CService("250.1.2.1", 8333), 0);
     CNetAddr source1 = CNetAddr("250.1.2.1");
 
     int nId;
@@ -344,15 +344,15 @@ BOOST_AUTO_TEST_CASE(addrman_getaddr)
     vector<CAddress> vAddr1 = addrman.GetAddr();
     BOOST_CHECK(vAddr1.size() == 0);
 
-    CAddress addr1 = CAddress(CService("250.250.2.1", 8333));
+    CAddress addr1 = CAddress(CService("250.250.2.1", 8333), 0);
     addr1.nTime = GetAdjustedTime(); // Set time so isTerrible = false
-    CAddress addr2 = CAddress(CService("250.251.2.2", 9999));
+    CAddress addr2 = CAddress(CService("250.251.2.2", 9999), 0);
     addr2.nTime = GetAdjustedTime();
-    CAddress addr3 = CAddress(CService("251.252.2.3", 8333));
+    CAddress addr3 = CAddress(CService("251.252.2.3", 8333), 0);
     addr3.nTime = GetAdjustedTime();
-    CAddress addr4 = CAddress(CService("252.253.3.4", 8333));
+    CAddress addr4 = CAddress(CService("252.253.3.4", 8333), 0);
     addr4.nTime = GetAdjustedTime();
-    CAddress addr5 = CAddress(CService("252.254.4.5", 8333));
+    CAddress addr5 = CAddress(CService("252.254.4.5", 8333), 0);
     addr5.nTime = GetAdjustedTime();
     CNetAddr source1 = CNetAddr("250.1.2.1");
     CNetAddr source2 = CNetAddr("250.2.3.3");
@@ -368,8 +368,8 @@ BOOST_AUTO_TEST_CASE(addrman_getaddr)
     BOOST_CHECK(addrman.GetAddr().size() == 1); 
 
     // Test 24: Ensure GetAddr works with new and tried addresses.
-    addrman.Good(CAddress(addr1));
-    addrman.Good(CAddress(addr2));
+    addrman.Good(CAddress(addr1, 0));
+    addrman.Good(CAddress(addr2, 0));
     BOOST_CHECK(addrman.GetAddr().size() == 1);
 
     // Test 25: Ensure GetAddr still returns 23% when addrman has many addrs.
@@ -378,7 +378,7 @@ BOOST_AUTO_TEST_CASE(addrman_getaddr)
         int octet2 = (i / 256) % 256;
         int octet3 = (i / (256 * 2)) % 256;
         string strAddr = boost::to_string(octet1) + "." + boost::to_string(octet2) + "." + boost::to_string(octet3) + ".23";
-        CAddress addr = CAddress(CService(strAddr));
+        CAddress addr = CAddress(CService(strAddr), 0);
         
         // Ensure that for all addrs in addrman, isTerrible == false.
         addr.nTime = GetAdjustedTime();
@@ -403,8 +403,8 @@ BOOST_AUTO_TEST_CASE(caddrinfo_get_tried_bucket)
     // Set addrman addr placement to be deterministic.
     addrman.MakeDeterministic();
 
-    CAddress addr1 = CAddress(CService("250.1.1.1", 8333));
-    CAddress addr2 = CAddress(CService("250.1.1.1", 9999));
+    CAddress addr1 = CAddress(CService("250.1.1.1", 8333), 0);
+    CAddress addr2 = CAddress(CService("250.1.1.1", 9999), 0);
 
     CNetAddr source1 = CNetAddr("250.1.1.1");
 
@@ -431,7 +431,7 @@ BOOST_AUTO_TEST_CASE(caddrinfo_get_tried_bucket)
     set<int> buckets;
     for (int i = 0; i < 255; i++) {
         CAddrInfo infoi = CAddrInfo(
-            CAddress(CService("250.1.1." + boost::to_string(i))),
+            CAddress(CService("250.1.1." + boost::to_string(i)), 0),
             CNetAddr("250.1.1." + boost::to_string(i)));
         int bucket = infoi.GetTriedBucket(nKey1);
         buckets.insert(bucket);
@@ -443,7 +443,7 @@ BOOST_AUTO_TEST_CASE(caddrinfo_get_tried_bucket)
     buckets.clear();
     for (int j = 0; j < 255; j++) {
         CAddrInfo infoj = CAddrInfo(
-            CAddress(CService("250." + boost::to_string(j) + ".1.1")),
+            CAddress(CService("250." + boost::to_string(j) + ".1.1"), 0),
             CNetAddr("250." + boost::to_string(j) + ".1.1"));
         int bucket = infoj.GetTriedBucket(nKey1);
         buckets.insert(bucket);
@@ -460,8 +460,8 @@ BOOST_AUTO_TEST_CASE(caddrinfo_get_new_bucket)
     // Set addrman addr placement to be deterministic.
     addrman.MakeDeterministic();
 
-    CAddress addr1 = CAddress(CService("250.1.2.1", 8333));
-    CAddress addr2 = CAddress(CService("250.1.2.1", 9999));
+    CAddress addr1 = CAddress(CService("250.1.2.1", 8333), 0);
+    CAddress addr2 = CAddress(CService("250.1.2.1", 9999), 0);
 
     CNetAddr source1 = CNetAddr("250.1.2.1");
 
@@ -484,7 +484,7 @@ BOOST_AUTO_TEST_CASE(caddrinfo_get_new_bucket)
     set<int> buckets;
     for (int i = 0; i < 255; i++) {
         CAddrInfo infoi = CAddrInfo(
-            CAddress(CService("250.1.1." + boost::to_string(i))),
+            CAddress(CService("250.1.1." + boost::to_string(i)), 0),
             CNetAddr("250.1.1." + boost::to_string(i)));
         int bucket = infoi.GetNewBucket(nKey1);
         buckets.insert(bucket);
@@ -497,7 +497,7 @@ BOOST_AUTO_TEST_CASE(caddrinfo_get_new_bucket)
     for (int j = 0; j < 4 * 255; j++) {
         CAddrInfo infoj = CAddrInfo(CAddress(
                                         CService(
-                                            boost::to_string(250 + (j / 255)) + "." + boost::to_string(j % 256) + ".1.1")),
+                                            boost::to_string(250 + (j / 255)) + "." + boost::to_string(j % 256) + ".1.1"), 0),
             CNetAddr("251.4.1.1"));
         int bucket = infoj.GetNewBucket(nKey1);
         buckets.insert(bucket);
@@ -509,7 +509,7 @@ BOOST_AUTO_TEST_CASE(caddrinfo_get_new_bucket)
     buckets.clear();
     for (int p = 0; p < 255; p++) {
         CAddrInfo infoj = CAddrInfo(
-            CAddress(CService("250.1.1.1")),
+            CAddress(CService("250.1.1.1"), 0),
             CNetAddr("250." + boost::to_string(p) + ".1.1"));
         int bucket = infoj.GetNewBucket(nKey1);
         buckets.insert(bucket);
diff --git a/src/test/net_tests.cpp b/src/test/net_tests.cpp
index b38d61f330354..b3d848fcb1ecb 100644
--- a/src/test/net_tests.cpp
+++ b/src/test/net_tests.cpp
@@ -51,7 +51,7 @@ class CAddrManCorrupted : public CAddrManSerializationMock
         int nUBuckets = ADDRMAN_NEW_BUCKET_COUNT ^ (1 << 30);
         s << nUBuckets;
 
-        CAddress addr = CAddress(CService("252.1.1.1", 7777));
+        CAddress addr = CAddress(CService("252.1.1.1", 7777), 0);
         CAddrInfo info = CAddrInfo(addr, CNetAddr("252.2.2.2"));
         s << info;
     }
@@ -79,9 +79,9 @@ BOOST_AUTO_TEST_CASE(caddrdb_read)
     CService addr3 = CService("250.7.3.3", 9999);
 
     // Add three addresses to new table.
-    addrmanUncorrupted.Add(CAddress(addr1), CService("252.5.1.1", 8333));
-    addrmanUncorrupted.Add(CAddress(addr2), CService("252.5.1.1", 8333));
-    addrmanUncorrupted.Add(CAddress(addr3), CService("252.5.1.1", 8333));
+    addrmanUncorrupted.Add(CAddress(addr1, 0), CService("252.5.1.1", 8333));
+    addrmanUncorrupted.Add(CAddress(addr2, 0), CService("252.5.1.1", 8333));
+    addrmanUncorrupted.Add(CAddress(addr3, 0), CService("252.5.1.1", 8333));
 
     // Test that the de-serialization does not throw an exception.
     CDataStream ssPeers1 = AddrmanToStream(addrmanUncorrupted);

From ee06e04369c37da21e048fda849cce2a1f066f84 Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Wed, 8 Jun 2016 19:12:22 +0200
Subject: [PATCH 0474/1802] Introduce enum ServiceFlags for service flags

---
 src/addrman.cpp            |  4 +-
 src/addrman.h              |  4 +-
 src/init.cpp               |  4 +-
 src/main.cpp               |  4 +-
 src/net.cpp                | 24 +++++-----
 src/net.h                  |  8 ++--
 src/protocol.cpp           |  4 +-
 src/protocol.h             | 12 +++--
 src/test/DoS_tests.cpp     |  8 ++--
 src/test/addrman_tests.cpp | 92 +++++++++++++++++++-------------------
 src/test/net_tests.cpp     |  8 ++--
 11 files changed, 89 insertions(+), 83 deletions(-)

diff --git a/src/addrman.cpp b/src/addrman.cpp
index d1e98d8ac0904..cebb1c8e5e708 100644
--- a/src/addrman.cpp
+++ b/src/addrman.cpp
@@ -263,7 +263,7 @@ bool CAddrMan::Add_(const CAddress& addr, const CNetAddr& source, int64_t nTimeP
             pinfo->nTime = std::max((int64_t)0, addr.nTime - nTimePenalty);
 
         // add services
-        pinfo->nServices |= addr.nServices;
+        pinfo->nServices = ServiceFlags(pinfo->nServices | addr.nServices);
 
         // do not update if no new information is present
         if (!addr.nTime || (pinfo->nTime && addr.nTime <= pinfo->nTime))
@@ -502,7 +502,7 @@ void CAddrMan::Connected_(const CService& addr, int64_t nTime)
         info.nTime = nTime;
 }
 
-void CAddrMan::SetServices_(const CService& addr, uint64_t nServices)
+void CAddrMan::SetServices_(const CService& addr, ServiceFlags nServices)
 {
     CAddrInfo* pinfo = Find(addr);
 
diff --git a/src/addrman.h b/src/addrman.h
index 7e36e2228f39e..1caf540758797 100644
--- a/src/addrman.h
+++ b/src/addrman.h
@@ -257,7 +257,7 @@ class CAddrMan
     void Connected_(const CService &addr, int64_t nTime);
 
     //! Update an entry's service bits.
-    void SetServices_(const CService &addr, uint64_t nServices);
+    void SetServices_(const CService &addr, ServiceFlags nServices);
 
 public:
     /**
@@ -592,7 +592,7 @@ class CAddrMan
         }
     }
 
-    void SetServices(const CService &addr, uint64_t nServices)
+    void SetServices(const CService &addr, ServiceFlags nServices)
     {
         LOCK(cs);
         Check();
diff --git a/src/init.cpp b/src/init.cpp
index ec4ce6b6da7b6..c2ba9ae44babe 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -950,7 +950,7 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
     SetMockTime(GetArg("-mocktime", 0)); // SetMockTime(0) is a no-op
 
     if (GetBoolArg("-peerbloomfilters", DEFAULT_PEERBLOOMFILTERS))
-        nLocalServices |= NODE_BLOOM;
+        nLocalServices = ServiceFlags(nLocalServices | NODE_BLOOM);
 
     nMaxTipAge = GetArg("-maxtipage", DEFAULT_MAX_TIP_AGE);
 
@@ -1361,7 +1361,7 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
     // after any wallet rescanning has taken place.
     if (fPruneMode) {
         LogPrintf("Unsetting NODE_NETWORK on prune mode\n");
-        nLocalServices &= ~NODE_NETWORK;
+        nLocalServices = ServiceFlags(nLocalServices & ~NODE_NETWORK);
         if (!fReindex) {
             uiInterface.InitMessage(_("Pruning blockstore..."));
             PruneAndFlush();
diff --git a/src/main.cpp b/src/main.cpp
index bcaf095ab3141..c1569545b4e9f 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -4611,7 +4611,9 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
         CAddress addrMe;
         CAddress addrFrom;
         uint64_t nNonce = 1;
-        vRecv >> pfrom->nVersion >> pfrom->nServices >> nTime >> addrMe;
+        uint64_t nServiceInt;
+        vRecv >> pfrom->nVersion >> nServiceInt >> nTime >> addrMe;
+        pfrom->nServices = ServiceFlags(nServiceInt);
         if (!pfrom->fInbound)
         {
             addrman.SetServices(pfrom->addr, pfrom->nServices);
diff --git a/src/net.cpp b/src/net.cpp
index 80ba7fce2288a..4661974d21561 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -72,14 +72,14 @@ namespace {
 const static std::string NET_MESSAGE_COMMAND_OTHER = "*other*";
 
 /** Services this node implementation cares about */
-static const uint64_t nRelevantServices = NODE_NETWORK;
+static const ServiceFlags nRelevantServices = NODE_NETWORK;
 
 //
 // Global state variables
 //
 bool fDiscover = true;
 bool fListen = true;
-uint64_t nLocalServices = NODE_NETWORK;
+ServiceFlags nLocalServices = NODE_NETWORK;
 bool fRelayTxes = true;
 CCriticalSection cs_mapLocalHost;
 std::map<CNetAddr, LocalServiceInfo> mapLocalHost;
@@ -175,7 +175,7 @@ static std::vector<CAddress> convertSeed6(const std::vector<SeedSpec6> &vSeedsIn
 // one by discovery.
 CAddress GetLocalAddress(const CNetAddr *paddrPeer)
 {
-    CAddress ret(CService("0.0.0.0",GetListenPort()),0);
+    CAddress ret(CService("0.0.0.0",GetListenPort()), NODE_NONE);
     CService addr;
     if (GetLocal(addr, paddrPeer))
     {
@@ -411,7 +411,7 @@ CNode* ConnectNode(CAddress addrConnect, const char *pszDest, bool fCountFailure
             vNodes.push_back(pnode);
         }
 
-        pnode->nServicesExpected = addrConnect.nServices & nRelevantServices;
+        pnode->nServicesExpected = ServiceFlags(addrConnect.nServices & nRelevantServices);
         pnode->nTimeConnected = GetTime();
 
         return pnode;
@@ -464,14 +464,14 @@ void CNode::PushVersion()
     int nBestHeight = GetNodeSignals().GetHeight().get_value_or(0);
 
     int64_t nTime = (fInbound ? GetAdjustedTime() : GetTime());
-    CAddress addrYou = (addr.IsRoutable() && !IsProxy(addr) ? addr : CAddress(CService("0.0.0.0",0), addr.nServices));
+    CAddress addrYou = (addr.IsRoutable() && !IsProxy(addr) ? addr : CAddress(CService("0.0.0.0", 0), addr.nServices));
     CAddress addrMe = GetLocalAddress(&addr);
     GetRandBytes((unsigned char*)&nLocalHostNonce, sizeof(nLocalHostNonce));
     if (fLogIPs)
         LogPrint("net", "send version message: version %d, blocks=%d, us=%s, them=%s, peer=%d\n", PROTOCOL_VERSION, nBestHeight, addrMe.ToString(), addrYou.ToString(), id);
     else
         LogPrint("net", "send version message: version %d, blocks=%d, us=%s, peer=%d\n", PROTOCOL_VERSION, nBestHeight, addrMe.ToString(), id);
-    PushMessage(NetMsgType::VERSION, PROTOCOL_VERSION, nLocalServices, nTime, addrYou, addrMe,
+    PushMessage(NetMsgType::VERSION, PROTOCOL_VERSION, (uint64_t)nLocalServices, nTime, addrYou, addrMe,
                 nLocalHostNonce, strSubVersion, nBestHeight, ::fRelayTxes);
 }
 
@@ -1440,7 +1440,7 @@ void ThreadDNSAddressSeed()
         } else {
             std::vector<CNetAddr> vIPs;
             std::vector<CAddress> vAdd;
-            uint64_t requiredServiceBits = nRelevantServices;
+            ServiceFlags requiredServiceBits = nRelevantServices;
             if (LookupHost(seed.getHost(requiredServiceBits).c_str(), vIPs, 0, true))
             {
                 BOOST_FOREACH(const CNetAddr& ip, vIPs)
@@ -1523,7 +1523,7 @@ void ThreadOpenConnections()
             ProcessOneShot();
             BOOST_FOREACH(const std::string& strAddr, mapMultiArgs["-connect"])
             {
-                CAddress addr(CService(), 0);
+                CAddress addr(CService(), NODE_NONE);
                 OpenNetworkConnection(addr, false, NULL, strAddr.c_str());
                 for (int i = 0; i < 10 && i < nLoop; i++)
                 {
@@ -1674,8 +1674,8 @@ void ThreadOpenAddedConnections()
         {
             CSemaphoreGrant grant(*semOutbound);
             /* We want -addnode to work even for nodes that don't provide all
-             * wanted services, so pass in nServices=0 to CAddress. */
-            OpenNetworkConnection(CAddress(vserv[i % vserv.size()], 0), false, &grant);
+             * wanted services, so pass in nServices=NODE_NONE to CAddress. */
+            OpenNetworkConnection(CAddress(vserv[i % vserv.size()], NODE_NONE), false, &grant);
             MilliSleep(500);
         }
         MilliSleep(120000); // Retry every 2 minutes
@@ -2333,8 +2333,8 @@ CNode::CNode(SOCKET hSocketIn, const CAddress& addrIn, const std::string& addrNa
     addrKnown(5000, 0.001),
     filterInventoryKnown(50000, 0.000001)
 {
-    nServices = 0;
-    nServicesExpected = 0;
+    nServices = NODE_NONE;
+    nServicesExpected = NODE_NONE;
     hSocket = hSocketIn;
     nRecvVersion = INIT_PROTO_VERSION;
     nLastSend = 0;
diff --git a/src/net.h b/src/net.h
index 445d25bf821bd..f5fb8faae2c42 100644
--- a/src/net.h
+++ b/src/net.h
@@ -152,7 +152,7 @@ CAddress GetLocalAddress(const CNetAddr *paddrPeer = NULL);
 
 extern bool fDiscover;
 extern bool fListen;
-extern uint64_t nLocalServices;
+extern ServiceFlags nLocalServices;
 extern bool fRelayTxes;
 extern uint64_t nLocalHostNonce;
 extern CAddrMan addrman;
@@ -186,7 +186,7 @@ class CNodeStats
 {
 public:
     NodeId nodeid;
-    uint64_t nServices;
+    ServiceFlags nServices;
     bool fRelayTxes;
     int64_t nLastSend;
     int64_t nLastRecv;
@@ -316,8 +316,8 @@ class CNode
 {
 public:
     // socket
-    uint64_t nServices;
-    uint64_t nServicesExpected;
+    ServiceFlags nServices;
+    ServiceFlags nServicesExpected;
     SOCKET hSocket;
     CDataStream ssSend;
     size_t nSendSize; // total size of all vSendMsg entries
diff --git a/src/protocol.cpp b/src/protocol.cpp
index a46051b84f2e3..422ef6f636512 100644
--- a/src/protocol.cpp
+++ b/src/protocol.cpp
@@ -133,7 +133,7 @@ CAddress::CAddress() : CService()
     Init();
 }
 
-CAddress::CAddress(CService ipIn, uint64_t nServicesIn) : CService(ipIn)
+CAddress::CAddress(CService ipIn, ServiceFlags nServicesIn) : CService(ipIn)
 {
     Init();
     nServices = nServicesIn;
@@ -141,7 +141,7 @@ CAddress::CAddress(CService ipIn, uint64_t nServicesIn) : CService(ipIn)
 
 void CAddress::Init()
 {
-    nServices = 0;
+    nServices = NODE_NONE;
     nTime = 100000000;
 }
 
diff --git a/src/protocol.h b/src/protocol.h
index c3f819aaee882..ab0a5817839b8 100644
--- a/src/protocol.h
+++ b/src/protocol.h
@@ -223,7 +223,9 @@ extern const char *FEEFILTER;
 const std::vector<std::string> &getAllNetMessageTypes();
 
 /** nServices flags */
-enum {
+enum ServiceFlags : uint64_t {
+    // Nothing
+    NODE_NONE = 0,
     // NODE_NETWORK means that the node is capable of serving the block chain. It is currently
     // set by all Bitcoin Core nodes, and is unset by SPV clients or other peers that just want
     // network services but don't provide them.
@@ -251,7 +253,7 @@ class CAddress : public CService
 {
 public:
     CAddress();
-    explicit CAddress(CService ipIn, uint64_t nServicesIn);
+    explicit CAddress(CService ipIn, ServiceFlags nServicesIn);
 
     void Init();
 
@@ -267,13 +269,15 @@ class CAddress : public CService
         if ((nType & SER_DISK) ||
             (nVersion >= CADDR_TIME_VERSION && !(nType & SER_GETHASH)))
             READWRITE(nTime);
-        READWRITE(nServices);
+        uint64_t nServicesInt = nServices;
+        READWRITE(nServicesInt);
+        nServices = (ServiceFlags)nServicesInt;
         READWRITE(*(CService*)this);
     }
 
     // TODO: make private (improves encapsulation)
 public:
-    uint64_t nServices;
+    ServiceFlags nServices;
 
     // disk and network only
     unsigned int nTime;
diff --git a/src/test/DoS_tests.cpp b/src/test/DoS_tests.cpp
index dc019d6cf5746..4a373fc60b653 100644
--- a/src/test/DoS_tests.cpp
+++ b/src/test/DoS_tests.cpp
@@ -45,7 +45,7 @@ BOOST_FIXTURE_TEST_SUITE(DoS_tests, TestingSetup)
 BOOST_AUTO_TEST_CASE(DoS_banning)
 {
     CNode::ClearBanned();
-    CAddress addr1(ip(0xa0b0c001), 0);
+    CAddress addr1(ip(0xa0b0c001), NODE_NONE);
     CNode dummyNode1(INVALID_SOCKET, addr1, "", true);
     dummyNode1.nVersion = 1;
     Misbehaving(dummyNode1.GetId(), 100); // Should get banned
@@ -53,7 +53,7 @@ BOOST_AUTO_TEST_CASE(DoS_banning)
     BOOST_CHECK(CNode::IsBanned(addr1));
     BOOST_CHECK(!CNode::IsBanned(ip(0xa0b0c001|0x0000ff00))); // Different IP, not banned
 
-    CAddress addr2(ip(0xa0b0c002), 0);
+    CAddress addr2(ip(0xa0b0c002), NODE_NONE);
     CNode dummyNode2(INVALID_SOCKET, addr2, "", true);
     dummyNode2.nVersion = 1;
     Misbehaving(dummyNode2.GetId(), 50);
@@ -69,7 +69,7 @@ BOOST_AUTO_TEST_CASE(DoS_banscore)
 {
     CNode::ClearBanned();
     mapArgs["-banscore"] = "111"; // because 11 is my favorite number
-    CAddress addr1(ip(0xa0b0c001), 0);
+    CAddress addr1(ip(0xa0b0c001), NODE_NONE);
     CNode dummyNode1(INVALID_SOCKET, addr1, "", true);
     dummyNode1.nVersion = 1;
     Misbehaving(dummyNode1.GetId(), 100);
@@ -90,7 +90,7 @@ BOOST_AUTO_TEST_CASE(DoS_bantime)
     int64_t nStartTime = GetTime();
     SetMockTime(nStartTime); // Overrides future calls to GetTime()
 
-    CAddress addr(ip(0xa0b0c001), 0);
+    CAddress addr(ip(0xa0b0c001), NODE_NONE);
     CNode dummyNode(INVALID_SOCKET, addr, "", true);
     dummyNode.nVersion = 1;
 
diff --git a/src/test/addrman_tests.cpp b/src/test/addrman_tests.cpp
index 93c3eba7fe27d..b6cec24b5752a 100644
--- a/src/test/addrman_tests.cpp
+++ b/src/test/addrman_tests.cpp
@@ -68,7 +68,7 @@ BOOST_AUTO_TEST_CASE(addrman_simple)
 
     // Test 2: Does Addrman::Add work as expected.
     CService addr1 = CService("250.1.1.1", 8333);
-    addrman.Add(CAddress(addr1, 0), source);
+    addrman.Add(CAddress(addr1, NODE_NONE), source);
     BOOST_CHECK(addrman.size() == 1);
     CAddrInfo addr_ret1 = addrman.Select();
     BOOST_CHECK(addr_ret1.ToString() == "250.1.1.1:8333");
@@ -76,14 +76,14 @@ BOOST_AUTO_TEST_CASE(addrman_simple)
     // Test 3: Does IP address deduplication work correctly.
     //  Expected dup IP should not be added.
     CService addr1_dup = CService("250.1.1.1", 8333);
-    addrman.Add(CAddress(addr1_dup, 0), source);
+    addrman.Add(CAddress(addr1_dup, NODE_NONE), source);
     BOOST_CHECK(addrman.size() == 1);
 
 
     // Test 5: New table has one addr and we add a diff addr we should
     //  have two addrs.
     CService addr2 = CService("250.1.1.2", 8333);
-    addrman.Add(CAddress(addr2, 0), source);
+    addrman.Add(CAddress(addr2, NODE_NONE), source);
     BOOST_CHECK(addrman.size() == 2);
 
     // Test 6: AddrMan::Clear() should empty the new table.
@@ -106,18 +106,18 @@ BOOST_AUTO_TEST_CASE(addrman_ports)
 
     // Test 7; Addr with same IP but diff port does not replace existing addr.
     CService addr1 = CService("250.1.1.1", 8333);
-    addrman.Add(CAddress(addr1, 0), source);
+    addrman.Add(CAddress(addr1, NODE_NONE), source);
     BOOST_CHECK(addrman.size() == 1);
 
     CService addr1_port = CService("250.1.1.1", 8334);
-    addrman.Add(CAddress(addr1_port, 0), source);
+    addrman.Add(CAddress(addr1_port, NODE_NONE), source);
     BOOST_CHECK(addrman.size() == 1);
     CAddrInfo addr_ret2 = addrman.Select();
     BOOST_CHECK(addr_ret2.ToString() == "250.1.1.1:8333");
 
     // Test 8: Add same IP but diff port to tried table, it doesn't get added.
     //  Perhaps this is not ideal behavior but it is the current behavior.
-    addrman.Good(CAddress(addr1_port, 0));
+    addrman.Good(CAddress(addr1_port, NODE_NONE));
     BOOST_CHECK(addrman.size() == 1);
     bool newOnly = true;
     CAddrInfo addr_ret3 = addrman.Select(newOnly);
@@ -136,7 +136,7 @@ BOOST_AUTO_TEST_CASE(addrman_select)
 
     // Test 9: Select from new with 1 addr in new.
     CService addr1 = CService("250.1.1.1", 8333);
-    addrman.Add(CAddress(addr1, 0), source);
+    addrman.Add(CAddress(addr1, NODE_NONE), source);
     BOOST_CHECK(addrman.size() == 1);
 
     bool newOnly = true;
@@ -144,7 +144,7 @@ BOOST_AUTO_TEST_CASE(addrman_select)
     BOOST_CHECK(addr_ret1.ToString() == "250.1.1.1:8333");
 
     // Test 10: move addr to tried, select from new expected nothing returned.
-    addrman.Good(CAddress(addr1, 0));
+    addrman.Good(CAddress(addr1, NODE_NONE));
     BOOST_CHECK(addrman.size() == 1);
     CAddrInfo addr_ret2 = addrman.Select(newOnly);
     BOOST_CHECK(addr_ret2.ToString() == "[::]:0");
@@ -160,21 +160,21 @@ BOOST_AUTO_TEST_CASE(addrman_select)
     CService addr3 = CService("250.3.2.2", 9999);
     CService addr4 = CService("250.3.3.3", 9999);
 
-    addrman.Add(CAddress(addr2, 0), CService("250.3.1.1", 8333));
-    addrman.Add(CAddress(addr3, 0), CService("250.3.1.1", 8333));
-    addrman.Add(CAddress(addr4, 0), CService("250.4.1.1", 8333));
+    addrman.Add(CAddress(addr2, NODE_NONE), CService("250.3.1.1", 8333));
+    addrman.Add(CAddress(addr3, NODE_NONE), CService("250.3.1.1", 8333));
+    addrman.Add(CAddress(addr4, NODE_NONE), CService("250.4.1.1", 8333));
 
     // Add three addresses to tried table.
     CService addr5 = CService("250.4.4.4", 8333);
     CService addr6 = CService("250.4.5.5", 7777);
     CService addr7 = CService("250.4.6.6", 8333);
 
-    addrman.Add(CAddress(addr5, 0), CService("250.3.1.1", 8333));
-    addrman.Good(CAddress(addr5, 0));
-    addrman.Add(CAddress(addr6, 0), CService("250.3.1.1", 8333));
-    addrman.Good(CAddress(addr6, 0));
-    addrman.Add(CAddress(addr7, 0), CService("250.1.1.3", 8333));
-    addrman.Good(CAddress(addr7, 0));
+    addrman.Add(CAddress(addr5, NODE_NONE), CService("250.3.1.1", 8333));
+    addrman.Good(CAddress(addr5, NODE_NONE));
+    addrman.Add(CAddress(addr6, NODE_NONE), CService("250.3.1.1", 8333));
+    addrman.Good(CAddress(addr6, NODE_NONE));
+    addrman.Add(CAddress(addr7, NODE_NONE), CService("250.1.1.3", 8333));
+    addrman.Good(CAddress(addr7, NODE_NONE));
 
     // Test 11: 6 addrs + 1 addr from last test = 7.
     BOOST_CHECK(addrman.size() == 7);
@@ -199,7 +199,7 @@ BOOST_AUTO_TEST_CASE(addrman_new_collisions)
 
     for (unsigned int i = 1; i < 18; i++) {
         CService addr = CService("250.1.1." + boost::to_string(i));
-        addrman.Add(CAddress(addr, 0), source);
+        addrman.Add(CAddress(addr, NODE_NONE), source);
 
         //Test 13: No collision in new table yet.
         BOOST_CHECK(addrman.size() == i);
@@ -207,11 +207,11 @@ BOOST_AUTO_TEST_CASE(addrman_new_collisions)
 
     //Test 14: new table collision!
     CService addr1 = CService("250.1.1.18");
-    addrman.Add(CAddress(addr1, 0), source);
+    addrman.Add(CAddress(addr1, NODE_NONE), source);
     BOOST_CHECK(addrman.size() == 17);
 
     CService addr2 = CService("250.1.1.19");
-    addrman.Add(CAddress(addr2, 0), source);
+    addrman.Add(CAddress(addr2, NODE_NONE), source);
     BOOST_CHECK(addrman.size() == 18);
 }
 
@@ -228,8 +228,8 @@ BOOST_AUTO_TEST_CASE(addrman_tried_collisions)
 
     for (unsigned int i = 1; i < 80; i++) {
         CService addr = CService("250.1.1." + boost::to_string(i));
-        addrman.Add(CAddress(addr, 0), source);
-        addrman.Good(CAddress(addr, 0));
+        addrman.Add(CAddress(addr, NODE_NONE), source);
+        addrman.Good(CAddress(addr, NODE_NONE));
 
         //Test 15: No collision in tried table yet.
         BOOST_TEST_MESSAGE(addrman.size());
@@ -238,11 +238,11 @@ BOOST_AUTO_TEST_CASE(addrman_tried_collisions)
 
     //Test 16: tried table collision!
     CService addr1 = CService("250.1.1.80");
-    addrman.Add(CAddress(addr1, 0), source);
+    addrman.Add(CAddress(addr1, NODE_NONE), source);
     BOOST_CHECK(addrman.size() == 79);
 
     CService addr2 = CService("250.1.1.81");
-    addrman.Add(CAddress(addr2, 0), source);
+    addrman.Add(CAddress(addr2, NODE_NONE), source);
     BOOST_CHECK(addrman.size() == 80);
 }
 
@@ -255,9 +255,9 @@ BOOST_AUTO_TEST_CASE(addrman_find)
 
     BOOST_CHECK(addrman.size() == 0);
 
-    CAddress addr1 = CAddress(CService("250.1.2.1", 8333), 0);
-    CAddress addr2 = CAddress(CService("250.1.2.1", 9999), 0);
-    CAddress addr3 = CAddress(CService("251.255.2.1", 8333), 0);
+    CAddress addr1 = CAddress(CService("250.1.2.1", 8333), NODE_NONE);
+    CAddress addr2 = CAddress(CService("250.1.2.1", 9999), NODE_NONE);
+    CAddress addr3 = CAddress(CService("251.255.2.1", 8333), NODE_NONE);
 
     CNetAddr source1 = CNetAddr("250.1.2.1");
     CNetAddr source2 = CNetAddr("250.1.2.2");
@@ -294,7 +294,7 @@ BOOST_AUTO_TEST_CASE(addrman_create)
 
     BOOST_CHECK(addrman.size() == 0);
 
-    CAddress addr1 = CAddress(CService("250.1.2.1", 8333), 0);
+    CAddress addr1 = CAddress(CService("250.1.2.1", 8333), NODE_NONE);
     CNetAddr source1 = CNetAddr("250.1.2.1");
 
     int nId;
@@ -317,7 +317,7 @@ BOOST_AUTO_TEST_CASE(addrman_delete)
 
     BOOST_CHECK(addrman.size() == 0);
 
-    CAddress addr1 = CAddress(CService("250.1.2.1", 8333), 0);
+    CAddress addr1 = CAddress(CService("250.1.2.1", 8333), NODE_NONE);
     CNetAddr source1 = CNetAddr("250.1.2.1");
 
     int nId;
@@ -344,15 +344,15 @@ BOOST_AUTO_TEST_CASE(addrman_getaddr)
     vector<CAddress> vAddr1 = addrman.GetAddr();
     BOOST_CHECK(vAddr1.size() == 0);
 
-    CAddress addr1 = CAddress(CService("250.250.2.1", 8333), 0);
+    CAddress addr1 = CAddress(CService("250.250.2.1", 8333), NODE_NONE);
     addr1.nTime = GetAdjustedTime(); // Set time so isTerrible = false
-    CAddress addr2 = CAddress(CService("250.251.2.2", 9999), 0);
+    CAddress addr2 = CAddress(CService("250.251.2.2", 9999), NODE_NONE);
     addr2.nTime = GetAdjustedTime();
-    CAddress addr3 = CAddress(CService("251.252.2.3", 8333), 0);
+    CAddress addr3 = CAddress(CService("251.252.2.3", 8333), NODE_NONE);
     addr3.nTime = GetAdjustedTime();
-    CAddress addr4 = CAddress(CService("252.253.3.4", 8333), 0);
+    CAddress addr4 = CAddress(CService("252.253.3.4", 8333), NODE_NONE);
     addr4.nTime = GetAdjustedTime();
-    CAddress addr5 = CAddress(CService("252.254.4.5", 8333), 0);
+    CAddress addr5 = CAddress(CService("252.254.4.5", 8333), NODE_NONE);
     addr5.nTime = GetAdjustedTime();
     CNetAddr source1 = CNetAddr("250.1.2.1");
     CNetAddr source2 = CNetAddr("250.2.3.3");
@@ -368,8 +368,8 @@ BOOST_AUTO_TEST_CASE(addrman_getaddr)
     BOOST_CHECK(addrman.GetAddr().size() == 1); 
 
     // Test 24: Ensure GetAddr works with new and tried addresses.
-    addrman.Good(CAddress(addr1, 0));
-    addrman.Good(CAddress(addr2, 0));
+    addrman.Good(CAddress(addr1, NODE_NONE));
+    addrman.Good(CAddress(addr2, NODE_NONE));
     BOOST_CHECK(addrman.GetAddr().size() == 1);
 
     // Test 25: Ensure GetAddr still returns 23% when addrman has many addrs.
@@ -378,7 +378,7 @@ BOOST_AUTO_TEST_CASE(addrman_getaddr)
         int octet2 = (i / 256) % 256;
         int octet3 = (i / (256 * 2)) % 256;
         string strAddr = boost::to_string(octet1) + "." + boost::to_string(octet2) + "." + boost::to_string(octet3) + ".23";
-        CAddress addr = CAddress(CService(strAddr), 0);
+        CAddress addr = CAddress(CService(strAddr), NODE_NONE);
         
         // Ensure that for all addrs in addrman, isTerrible == false.
         addr.nTime = GetAdjustedTime();
@@ -403,8 +403,8 @@ BOOST_AUTO_TEST_CASE(caddrinfo_get_tried_bucket)
     // Set addrman addr placement to be deterministic.
     addrman.MakeDeterministic();
 
-    CAddress addr1 = CAddress(CService("250.1.1.1", 8333), 0);
-    CAddress addr2 = CAddress(CService("250.1.1.1", 9999), 0);
+    CAddress addr1 = CAddress(CService("250.1.1.1", 8333), NODE_NONE);
+    CAddress addr2 = CAddress(CService("250.1.1.1", 9999), NODE_NONE);
 
     CNetAddr source1 = CNetAddr("250.1.1.1");
 
@@ -431,7 +431,7 @@ BOOST_AUTO_TEST_CASE(caddrinfo_get_tried_bucket)
     set<int> buckets;
     for (int i = 0; i < 255; i++) {
         CAddrInfo infoi = CAddrInfo(
-            CAddress(CService("250.1.1." + boost::to_string(i)), 0),
+            CAddress(CService("250.1.1." + boost::to_string(i)), NODE_NONE),
             CNetAddr("250.1.1." + boost::to_string(i)));
         int bucket = infoi.GetTriedBucket(nKey1);
         buckets.insert(bucket);
@@ -443,7 +443,7 @@ BOOST_AUTO_TEST_CASE(caddrinfo_get_tried_bucket)
     buckets.clear();
     for (int j = 0; j < 255; j++) {
         CAddrInfo infoj = CAddrInfo(
-            CAddress(CService("250." + boost::to_string(j) + ".1.1"), 0),
+            CAddress(CService("250." + boost::to_string(j) + ".1.1"), NODE_NONE),
             CNetAddr("250." + boost::to_string(j) + ".1.1"));
         int bucket = infoj.GetTriedBucket(nKey1);
         buckets.insert(bucket);
@@ -460,8 +460,8 @@ BOOST_AUTO_TEST_CASE(caddrinfo_get_new_bucket)
     // Set addrman addr placement to be deterministic.
     addrman.MakeDeterministic();
 
-    CAddress addr1 = CAddress(CService("250.1.2.1", 8333), 0);
-    CAddress addr2 = CAddress(CService("250.1.2.1", 9999), 0);
+    CAddress addr1 = CAddress(CService("250.1.2.1", 8333), NODE_NONE);
+    CAddress addr2 = CAddress(CService("250.1.2.1", 9999), NODE_NONE);
 
     CNetAddr source1 = CNetAddr("250.1.2.1");
 
@@ -484,7 +484,7 @@ BOOST_AUTO_TEST_CASE(caddrinfo_get_new_bucket)
     set<int> buckets;
     for (int i = 0; i < 255; i++) {
         CAddrInfo infoi = CAddrInfo(
-            CAddress(CService("250.1.1." + boost::to_string(i)), 0),
+            CAddress(CService("250.1.1." + boost::to_string(i)), NODE_NONE),
             CNetAddr("250.1.1." + boost::to_string(i)));
         int bucket = infoi.GetNewBucket(nKey1);
         buckets.insert(bucket);
@@ -497,7 +497,7 @@ BOOST_AUTO_TEST_CASE(caddrinfo_get_new_bucket)
     for (int j = 0; j < 4 * 255; j++) {
         CAddrInfo infoj = CAddrInfo(CAddress(
                                         CService(
-                                            boost::to_string(250 + (j / 255)) + "." + boost::to_string(j % 256) + ".1.1"), 0),
+                                            boost::to_string(250 + (j / 255)) + "." + boost::to_string(j % 256) + ".1.1"), NODE_NONE),
             CNetAddr("251.4.1.1"));
         int bucket = infoj.GetNewBucket(nKey1);
         buckets.insert(bucket);
@@ -509,7 +509,7 @@ BOOST_AUTO_TEST_CASE(caddrinfo_get_new_bucket)
     buckets.clear();
     for (int p = 0; p < 255; p++) {
         CAddrInfo infoj = CAddrInfo(
-            CAddress(CService("250.1.1.1"), 0),
+            CAddress(CService("250.1.1.1"), NODE_NONE),
             CNetAddr("250." + boost::to_string(p) + ".1.1"));
         int bucket = infoj.GetNewBucket(nKey1);
         buckets.insert(bucket);
diff --git a/src/test/net_tests.cpp b/src/test/net_tests.cpp
index b3d848fcb1ecb..d005d6a1633e9 100644
--- a/src/test/net_tests.cpp
+++ b/src/test/net_tests.cpp
@@ -51,7 +51,7 @@ class CAddrManCorrupted : public CAddrManSerializationMock
         int nUBuckets = ADDRMAN_NEW_BUCKET_COUNT ^ (1 << 30);
         s << nUBuckets;
 
-        CAddress addr = CAddress(CService("252.1.1.1", 7777), 0);
+        CAddress addr = CAddress(CService("252.1.1.1", 7777), NODE_NONE);
         CAddrInfo info = CAddrInfo(addr, CNetAddr("252.2.2.2"));
         s << info;
     }
@@ -79,9 +79,9 @@ BOOST_AUTO_TEST_CASE(caddrdb_read)
     CService addr3 = CService("250.7.3.3", 9999);
 
     // Add three addresses to new table.
-    addrmanUncorrupted.Add(CAddress(addr1, 0), CService("252.5.1.1", 8333));
-    addrmanUncorrupted.Add(CAddress(addr2, 0), CService("252.5.1.1", 8333));
-    addrmanUncorrupted.Add(CAddress(addr3, 0), CService("252.5.1.1", 8333));
+    addrmanUncorrupted.Add(CAddress(addr1, NODE_NONE), CService("252.5.1.1", 8333));
+    addrmanUncorrupted.Add(CAddress(addr2, NODE_NONE), CService("252.5.1.1", 8333));
+    addrmanUncorrupted.Add(CAddress(addr3, NODE_NONE), CService("252.5.1.1", 8333));
 
     // Test that the de-serialization does not throw an exception.
     CDataStream ssPeers1 = AddrmanToStream(addrmanUncorrupted);

From ecd7fd37c888f8ebc64cf3d92272975b37ae54ca Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Mon, 13 Jun 2016 16:01:21 +0200
Subject: [PATCH 0475/1802] Introduce REQUIRED_SERVICES constant

---
 src/main.cpp | 2 +-
 src/net.cpp  | 2 +-
 src/net.h    | 2 ++
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index c1569545b4e9f..62012bf56709f 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -4787,7 +4787,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
         {
             boost::this_thread::interruption_point();
 
-            if (!(addr.nServices & NODE_NETWORK))
+            if ((addr.nServices & REQUIRED_SERVICES) != REQUIRED_SERVICES)
                 continue;
 
             if (addr.nTime <= 100000000 || addr.nTime > nNow + 10 * 60)
diff --git a/src/net.cpp b/src/net.cpp
index 4661974d21561..a390eca776f52 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -1596,7 +1596,7 @@ void ThreadOpenConnections()
                 continue;
 
             // only connect to full nodes
-            if (!(addr.nServices & NODE_NETWORK))
+            if ((addr.nServices & REQUIRED_SERVICES) != REQUIRED_SERVICES)
                 continue;
 
             // only consider very recently tried nodes after 30 failed attempts
diff --git a/src/net.h b/src/net.h
index f5fb8faae2c42..2aaca4888fde9 100644
--- a/src/net.h
+++ b/src/net.h
@@ -72,6 +72,8 @@ static const bool DEFAULT_FORCEDNSSEED = false;
 static const size_t DEFAULT_MAXRECEIVEBUFFER = 5 * 1000;
 static const size_t DEFAULT_MAXSENDBUFFER    = 1 * 1000;
 
+static const ServiceFlags REQUIRED_SERVICES = NODE_NETWORK;
+
 // NOTE: When adjusting this, update rpcnet:setban's help ("24h")
 static const unsigned int DEFAULT_MISBEHAVING_BANTIME = 60 * 60 * 24;  // Default 24-hour ban
 

From fa26c420bfb7dbad6781f31f222a66ef52f2ae45 Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Mon, 13 Jun 2016 19:36:01 +0200
Subject: [PATCH 0476/1802] [qa] util: Move check_fee_amount out of wallet.py

---
 qa/rpc-tests/test_framework/util.py | 9 +++++++++
 qa/rpc-tests/wallet.py              | 7 +------
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/qa/rpc-tests/test_framework/util.py b/qa/rpc-tests/test_framework/util.py
index fc66ef287d715..782df52d62af9 100644
--- a/qa/rpc-tests/test_framework/util.py
+++ b/qa/rpc-tests/test_framework/util.py
@@ -477,6 +477,15 @@ def random_transaction(nodes, amount, min_fee, fee_increment, fee_variants):
 
     return (txid, signresult["hex"], fee)
 
+def assert_fee_amount(fee, tx_size, fee_per_kB):
+    """Assert the fee was in range"""
+    target_fee = tx_size * fee_per_kB / 1000
+    if fee < target_fee:
+        raise AssertionError("Fee of %s BTC too low! (Should be %s BTC)"%(str(fee), str(target_fee)))
+    # allow the wallet's estimation to be at most 2 bytes off
+    if fee > (tx_size + 2) * fee_per_kB / 1000:
+        raise AssertionError("Fee of %s BTC too high! (Should be %s BTC)"%(str(fee), str(target_fee)))
+
 def assert_equal(thing1, thing2):
     if thing1 != thing2:
         raise AssertionError("%s != %s"%(str(thing1),str(thing2)))
diff --git a/qa/rpc-tests/wallet.py b/qa/rpc-tests/wallet.py
index 9dda712f4ff08..0b7eb52f07fd5 100755
--- a/qa/rpc-tests/wallet.py
+++ b/qa/rpc-tests/wallet.py
@@ -11,12 +11,7 @@ class WalletTest (BitcoinTestFramework):
     def check_fee_amount(self, curr_balance, balance_with_fee, fee_per_byte, tx_size):
         """Return curr_balance after asserting the fee was in range"""
         fee = balance_with_fee - curr_balance
-        target_fee = fee_per_byte * tx_size
-        if fee < target_fee:
-            raise AssertionError("Fee of %s BTC too low! (Should be %s BTC)"%(str(fee), str(target_fee)))
-        # allow the node's estimation to be at most 2 bytes off
-        if fee > fee_per_byte * (tx_size + 2):
-            raise AssertionError("Fee of %s BTC too high! (Should be %s BTC)"%(str(fee), str(target_fee)))
+        assert_fee_amount(fee, tx_size, fee_per_byte * 1000)
         return curr_balance
 
     def __init__(self):

From fae1d063fc8a54067a8527d249d8801a00feef03 Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Mon, 13 Jun 2016 19:52:01 +0200
Subject: [PATCH 0477/1802] [qa] fundrawtransaction: Fix race, assert amounts

---
 qa/rpc-tests/fundrawtransaction.py | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/qa/rpc-tests/fundrawtransaction.py b/qa/rpc-tests/fundrawtransaction.py
index 998f822afe81d..228574e671803 100755
--- a/qa/rpc-tests/fundrawtransaction.py
+++ b/qa/rpc-tests/fundrawtransaction.py
@@ -58,7 +58,6 @@ def run_test(self):
         self.nodes[0].sendtoaddress(self.nodes[2].getnewaddress(), 1.0)
         self.nodes[0].sendtoaddress(self.nodes[2].getnewaddress(), 5.0)
 
-        self.sync_all()
         self.nodes[0].generate(1)
         self.sync_all()
 
@@ -552,7 +551,6 @@ def run_test(self):
         self.nodes[1].walletpassphrase("test", 100)
         signedTx = self.nodes[1].signrawtransaction(fundedTx['hex'])
         txId = self.nodes[1].sendrawtransaction(signedTx['hex'])
-        self.sync_all()
         self.nodes[1].generate(1)
         self.sync_all()
 
@@ -572,7 +570,6 @@ def run_test(self):
 
         for i in range(0,20):
             self.nodes[0].sendtoaddress(self.nodes[1].getnewaddress(), 0.01)
-        self.sync_all()
         self.nodes[0].generate(1)
         self.sync_all()
 
@@ -603,7 +600,6 @@ def run_test(self):
 
         for i in range(0,20):
             self.nodes[0].sendtoaddress(self.nodes[1].getnewaddress(), 0.01)
-        self.sync_all()
         self.nodes[0].generate(1)
         self.sync_all()
 
@@ -677,6 +673,15 @@ def run_test(self):
         signedtx = self.nodes[0].signrawtransaction(signedtx["hex"])
         assert(signedtx["complete"])
         self.nodes[0].sendrawtransaction(signedtx["hex"])
+        self.nodes[0].generate(1)
+        self.sync_all()
+
+        #######################
+        # Test feeRate option #
+        #######################
+
+        # Make sure there is exactly one input so coin selection can't skew the result
+        assert_equal(len(self.nodes[3].listunspent(1)), 1)
 
         inputs = []
         outputs = {self.nodes[2].getnewaddress() : 1}
@@ -684,8 +689,9 @@ def run_test(self):
         result = self.nodes[3].fundrawtransaction(rawtx) # uses min_relay_tx_fee (set by settxfee)
         result2 = self.nodes[3].fundrawtransaction(rawtx, {"feeRate": 2*min_relay_tx_fee})
         result3 = self.nodes[3].fundrawtransaction(rawtx, {"feeRate": 10*min_relay_tx_fee})
-        assert_equal(result['fee']*2, result2['fee'])
-        assert_equal(result['fee']*10, result3['fee'])
+        result_fee_rate = result['fee'] * 1000 / count_bytes(result['hex'])
+        assert_fee_amount(result2['fee'], count_bytes(result2['hex']), 2 * result_fee_rate)
+        assert_fee_amount(result3['fee'], count_bytes(result3['hex']), 10 * result_fee_rate)
 
 if __name__ == '__main__':
     RawTransactionsTest().main()

From 1111b80df84aa7bc72fbddcc7bafde43f0835d90 Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Sat, 28 May 2016 15:32:30 +0200
Subject: [PATCH 0478/1802] Rework addnode behaviour

* Use CNode::addeName to track whether a connection to a name is already open
  * A new connection to a previously-connected by-name addednode is only opened when
    the previous one closes (even if the name starts resolving to something else)
  * At most one connection is opened per addednode (even if the name resolves to multiple)
* Unify the code between ThreadOpenAddedNodeConnections and getaddednodeinfo
  * Information about open connections is always returned, and the dns argument becomes a dummy
  * An IP address and inbound/outbound is only reported for the (at most 1) open connection
---
 src/net.cpp     | 107 ++++++++++++++++++++++++++----------------------
 src/net.h       |  10 +++++
 src/rpc/net.cpp |  95 ++++++++++--------------------------------
 3 files changed, 91 insertions(+), 121 deletions(-)

diff --git a/src/net.cpp b/src/net.cpp
index a390eca776f52..4d27db7604d0b 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -1616,68 +1616,79 @@ void ThreadOpenConnections()
     }
 }
 
-void ThreadOpenAddedConnections()
+std::vector<AddedNodeInfo> GetAddedNodeInfo()
 {
+    std::vector<AddedNodeInfo> ret;
+
+    std::list<std::string> lAddresses(0);
     {
         LOCK(cs_vAddedNodes);
-        vAddedNodes = mapMultiArgs["-addnode"];
+        ret.reserve(vAddedNodes.size());
+        BOOST_FOREACH(const std::string& strAddNode, vAddedNodes)
+            lAddresses.push_back(strAddNode);
     }
 
-    if (HaveNameProxy()) {
-        while(true) {
-            std::list<std::string> lAddresses(0);
-            {
-                LOCK(cs_vAddedNodes);
-                BOOST_FOREACH(const std::string& strAddNode, vAddedNodes)
-                    lAddresses.push_back(strAddNode);
+
+    // Build a map of all already connected addresses (by IP:port and by name) to inbound/outbound and resolved CService
+    std::map<CService, bool> mapConnected;
+    std::map<std::string, std::pair<bool, CService>> mapConnectedByName;
+    {
+        LOCK(cs_vNodes);
+        for (const CNode* pnode : vNodes) {
+            if (pnode->addr.IsValid()) {
+                mapConnected[pnode->addr] = pnode->fInbound;
             }
-            BOOST_FOREACH(const std::string& strAddNode, lAddresses) {
-                CAddress addr;
-                CSemaphoreGrant grant(*semOutbound);
-                OpenNetworkConnection(addr, false, &grant, strAddNode.c_str());
-                MilliSleep(500);
+            if (!pnode->addrName.empty()) {
+                mapConnectedByName[pnode->addrName] = std::make_pair(pnode->fInbound, static_cast<const CService&>(pnode->addr));
             }
-            MilliSleep(120000); // Retry every 2 minutes
         }
     }
 
+    BOOST_FOREACH(const std::string& strAddNode, lAddresses) {
+        CService service(strAddNode, Params().GetDefaultPort());
+        if (service.IsValid()) {
+            // strAddNode is an IP:port
+            auto it = mapConnected.find(service);
+            if (it != mapConnected.end()) {
+                ret.push_back(AddedNodeInfo{strAddNode, service, true, it->second});
+            } else {
+                ret.push_back(AddedNodeInfo{strAddNode, CService(), false, false});
+            }
+        } else {
+            // strAddNode is a name
+            auto it = mapConnectedByName.find(strAddNode);
+            if (it != mapConnectedByName.end()) {
+                ret.push_back(AddedNodeInfo{strAddNode, it->second.second, true, it->second.first});
+            } else {
+                ret.push_back(AddedNodeInfo{strAddNode, CService(), false, false});
+            }
+        }
+    }
+
+    return ret;
+}
+
+void ThreadOpenAddedConnections()
+{
+    {
+        LOCK(cs_vAddedNodes);
+        vAddedNodes = mapMultiArgs["-addnode"];
+    }
+
     for (unsigned int i = 0; true; i++)
     {
-        std::list<std::string> lAddresses(0);
-        {
-            LOCK(cs_vAddedNodes);
-            BOOST_FOREACH(const std::string& strAddNode, vAddedNodes)
-                lAddresses.push_back(strAddNode);
+        std::vector<AddedNodeInfo> vInfo = GetAddedNodeInfo();
+        for (const AddedNodeInfo& info : vInfo) {
+            if (!info.fConnected) {
+                CSemaphoreGrant grant(*semOutbound);
+                // If strAddedNode is an IP/port, decode it immediately, so
+                // OpenNetworkConnection can detect existing connections to that IP/port.
+                CService service(info.strAddedNode, Params().GetDefaultPort());
+                OpenNetworkConnection(CAddress(service, NODE_NONE), false, &grant, info.strAddedNode.c_str(), false);
+                MilliSleep(500);
+            }
         }
 
-        std::list<std::vector<CService> > lservAddressesToAdd(0);
-        BOOST_FOREACH(const std::string& strAddNode, lAddresses) {
-            std::vector<CService> vservNode(0);
-            if(Lookup(strAddNode.c_str(), vservNode, Params().GetDefaultPort(), fNameLookup, 0))
-                lservAddressesToAdd.push_back(vservNode);
-        }
-        // Attempt to connect to each IP for each addnode entry until at least one is successful per addnode entry
-        // (keeping in mind that addnode entries can have many IPs if fNameLookup)
-        {
-            LOCK(cs_vNodes);
-            BOOST_FOREACH(CNode* pnode, vNodes)
-                for (std::list<std::vector<CService> >::iterator it = lservAddressesToAdd.begin(); it != lservAddressesToAdd.end(); it++)
-                    BOOST_FOREACH(const CService& addrNode, *(it))
-                        if (pnode->addr == addrNode)
-                        {
-                            it = lservAddressesToAdd.erase(it);
-                            it--;
-                            break;
-                        }
-        }
-        BOOST_FOREACH(std::vector<CService>& vserv, lservAddressesToAdd)
-        {
-            CSemaphoreGrant grant(*semOutbound);
-            /* We want -addnode to work even for nodes that don't provide all
-             * wanted services, so pass in nServices=NODE_NONE to CAddress. */
-            OpenNetworkConnection(CAddress(vserv[i % vserv.size()], NODE_NONE), false, &grant);
-            MilliSleep(500);
-        }
         MilliSleep(120000); // Retry every 2 minutes
     }
 }
diff --git a/src/net.h b/src/net.h
index 2aaca4888fde9..54a86d88dc887 100644
--- a/src/net.h
+++ b/src/net.h
@@ -818,4 +818,14 @@ class CBanDB
 /** Return a timestamp in the future (in microseconds) for exponentially distributed events. */
 int64_t PoissonNextSend(int64_t nNow, int average_interval_seconds);
 
+struct AddedNodeInfo
+{
+    std::string strAddedNode;
+    CService resolvedAddress;
+    bool fConnected;
+    bool fInbound;
+};
+
+std::vector<AddedNodeInfo> GetAddedNodeInfo();
+
 #endif // BITCOIN_NET_H
diff --git a/src/rpc/net.cpp b/src/rpc/net.cpp
index cae964e46df1e..b85c7b2e1aaa5 100644
--- a/src/rpc/net.cpp
+++ b/src/rpc/net.cpp
@@ -271,25 +271,22 @@ UniValue getaddednodeinfo(const UniValue& params, bool fHelp)
 {
     if (fHelp || params.size() < 1 || params.size() > 2)
         throw runtime_error(
-            "getaddednodeinfo dns ( \"node\" )\n"
+            "getaddednodeinfo dummy ( \"node\" )\n"
             "\nReturns information about the given added node, or all added nodes\n"
             "(note that onetry addnodes are not listed here)\n"
-            "If dns is false, only a list of added nodes will be provided,\n"
-            "otherwise connected information will also be available.\n"
             "\nArguments:\n"
-            "1. dns        (boolean, required) If false, only a list of added nodes will be provided, otherwise connected information will also be available.\n"
+            "1. dummy      (boolean, required) Kept for historical purposes but ignored\n"
             "2. \"node\"   (string, optional) If provided, return information about this specific node, otherwise all nodes are returned.\n"
             "\nResult:\n"
             "[\n"
             "  {\n"
-            "    \"addednode\" : \"192.168.0.201\",   (string) The node ip address\n"
+            "    \"addednode\" : \"192.168.0.201\",   (string) The node ip address or name (as provided to addnode)\n"
             "    \"connected\" : true|false,          (boolean) If connected\n"
-            "    \"addresses\" : [\n"
+            "    \"addresses\" : [                    (list of objects) Only when connected = true\n"
             "       {\n"
-            "         \"address\" : \"192.168.0.201:8333\",  (string) The bitcoin server host and port\n"
+            "         \"address\" : \"192.168.0.201:8333\",  (string) The bitcoin server IP and port we're connected to\n"
             "         \"connected\" : \"outbound\"           (string) connection, inbound or outbound\n"
             "       }\n"
-            "       ,...\n"
             "     ]\n"
             "  }\n"
             "  ,...\n"
@@ -300,83 +297,35 @@ UniValue getaddednodeinfo(const UniValue& params, bool fHelp)
             + HelpExampleRpc("getaddednodeinfo", "true, \"192.168.0.201\"")
         );
 
-    bool fDns = params[0].get_bool();
+    std::vector<AddedNodeInfo> vInfo = GetAddedNodeInfo();
 
-    list<string> laddedNodes(0);
-    if (params.size() == 1)
-    {
-        LOCK(cs_vAddedNodes);
-        BOOST_FOREACH(const std::string& strAddNode, vAddedNodes)
-            laddedNodes.push_back(strAddNode);
-    }
-    else
-    {
-        string strNode = params[1].get_str();
-        LOCK(cs_vAddedNodes);
-        BOOST_FOREACH(const std::string& strAddNode, vAddedNodes) {
-            if (strAddNode == strNode)
-            {
-                laddedNodes.push_back(strAddNode);
+    if (params.size() == 2) {
+        bool found = false;
+        for (const AddedNodeInfo& info : vInfo) {
+            if (info.strAddedNode == params[1].get_str()) {
+                vInfo.assign(1, info);
+                found = true;
                 break;
             }
         }
-        if (laddedNodes.size() == 0)
+        if (!found) {
             throw JSONRPCError(RPC_CLIENT_NODE_NOT_ADDED, "Error: Node has not been added.");
-    }
-
-    UniValue ret(UniValue::VARR);
-    if (!fDns)
-    {
-        BOOST_FOREACH (const std::string& strAddNode, laddedNodes) {
-            UniValue obj(UniValue::VOBJ);
-            obj.push_back(Pair("addednode", strAddNode));
-            ret.push_back(obj);
         }
-        return ret;
     }
 
-    list<pair<string, vector<CService> > > laddedAddreses(0);
-    BOOST_FOREACH(const std::string& strAddNode, laddedNodes) {
-        vector<CService> vservNode(0);
-        if(Lookup(strAddNode.c_str(), vservNode, Params().GetDefaultPort(), fNameLookup, 0))
-            laddedAddreses.push_back(make_pair(strAddNode, vservNode));
-        else
-        {
-            UniValue obj(UniValue::VOBJ);
-            obj.push_back(Pair("addednode", strAddNode));
-            obj.push_back(Pair("connected", false));
-            UniValue addresses(UniValue::VARR);
-            obj.push_back(Pair("addresses", addresses));
-            ret.push_back(obj);
-        }
-    }
+    UniValue ret(UniValue::VARR);
 
-    LOCK(cs_vNodes);
-    for (list<pair<string, vector<CService> > >::iterator it = laddedAddreses.begin(); it != laddedAddreses.end(); it++)
-    {
+    for (const AddedNodeInfo& info : vInfo) {
         UniValue obj(UniValue::VOBJ);
-        obj.push_back(Pair("addednode", it->first));
-
+        obj.push_back(Pair("addednode", info.strAddedNode));
+        obj.push_back(Pair("connected", info.fConnected));
         UniValue addresses(UniValue::VARR);
-        bool fConnected = false;
-        BOOST_FOREACH(const CService& addrNode, it->second) {
-            bool fFound = false;
-            UniValue node(UniValue::VOBJ);
-            node.push_back(Pair("address", addrNode.ToString()));
-            BOOST_FOREACH(CNode* pnode, vNodes) {
-                if (pnode->addr == addrNode)
-                {
-                    fFound = true;
-                    fConnected = true;
-                    node.push_back(Pair("connected", pnode->fInbound ? "inbound" : "outbound"));
-                    break;
-                }
-            }
-            if (!fFound)
-                node.push_back(Pair("connected", "false"));
-            addresses.push_back(node);
+        if (info.fConnected) {
+            UniValue address(UniValue::VOBJ);
+            address.push_back(Pair("address", info.resolvedAddress.ToString()));
+            address.push_back(Pair("connected", info.fInbound ? "inbound" : "outbound"));
+            addresses.push_back(address);
         }
-        obj.push_back(Pair("connected", fConnected));
         obj.push_back(Pair("addresses", addresses));
         ret.push_back(obj);
     }

From f9f5cfc50637f2cd1540923caf337e2651ec1625 Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Sat, 28 May 2016 16:22:02 +0200
Subject: [PATCH 0479/1802] Prevent duplicate connections where one is by name
 and another by ip

---
 src/net.cpp | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/src/net.cpp b/src/net.cpp
index 4d27db7604d0b..30a6bc896db22 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -400,6 +400,26 @@ CNode* ConnectNode(CAddress addrConnect, const char *pszDest, bool fCountFailure
             return NULL;
         }
 
+        if (pszDest && addrConnect.IsValid()) {
+            // It is possible that we already have a connection to the IP/port pszDest resolved to.
+            // In that case, drop the connection that was just created, and return the existing CNode instead.
+            // Also store the name we used to connect in that CNode, so that future FindNode() calls to that
+            // name catch this early.
+            CNode* pnode = FindNode((CService)addrConnect);
+            if (pnode)
+            {
+                pnode->AddRef();
+                {
+                    LOCK(cs_vNodes);
+                    if (pnode->addrName.empty()) {
+                        pnode->addrName = std::string(pszDest);
+                    }
+                }
+                CloseSocket(hSocket);
+                return pnode;
+            }
+        }
+
         addrman.Attempt(addrConnect, fCountFailure);
 
         // Add node

From 1a5a4e648873c4cd88b936648ebf2858393e5510 Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Sat, 28 May 2016 16:44:08 +0200
Subject: [PATCH 0480/1802] Randomize name lookup result in ConnectSocketByName

---
 src/netbase.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/netbase.cpp b/src/netbase.cpp
index 572ae70871d40..e2a516986c116 100644
--- a/src/netbase.cpp
+++ b/src/netbase.cpp
@@ -621,10 +621,10 @@ bool ConnectSocketByName(CService &addr, SOCKET& hSocketRet, const char *pszDest
     proxyType nameProxy;
     GetNameProxy(nameProxy);
 
-    CService addrResolved;
-    if (Lookup(strDest.c_str(), addrResolved, port, fNameLookup && !HaveNameProxy())) {
-        if (addrResolved.IsValid()) {
-            addr = addrResolved;
+    std::vector<CService> addrResolved;
+    if (Lookup(strDest.c_str(), addrResolved, port, fNameLookup && !HaveNameProxy(), 256)) {
+        if (addrResolved.size() > 0) {
+            addr = addrResolved[GetRand(addrResolved.size())];
             return ConnectSocket(addr, hSocketRet, nTimeout);
         }
     }

From afcd77e17936f7ec9bbf7b47f55a211eccc08364 Mon Sep 17 00:00:00 2001
From: Jonas Schnelli <dev@jonasschnelli.ch>
Date: Mon, 13 Jun 2016 16:27:41 +0200
Subject: [PATCH 0481/1802] Detect -usehd mismatches when wallet.dat already
 exists

---
 src/wallet/wallet.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index 1c212d01476dd..a4ffdfdb5299e 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -3236,6 +3236,13 @@ bool CWallet::InitLoadWallet()
 
         walletInstance->SetBestChain(chainActive.GetLocator());
     }
+    else if (mapArgs.count("-usehd")) {
+        bool useHD = GetBoolArg("-usehd", DEFAULT_USE_HD_WALLET);
+        if (!walletInstance->hdChain.masterKeyID.IsNull() && !useHD)
+            return InitError(strprintf(_("Error loading %s: You can't disable HD on a already existing HD wallet"), walletFile));
+        if (walletInstance->hdChain.masterKeyID.IsNull() && useHD)
+            return InitError(strprintf(_("Error loading %s: You can't enable HD on a already existing non-HD wallet"), walletFile));
+    }
 
     LogPrintf(" wallet      %15dms\n", GetTimeMillis() - nStart);
 

From ab8be98fdb25b678a8cd7e89adf06d1b1f6bdd62 Mon Sep 17 00:00:00 2001
From: BtcDrak <btcdrak@gmail.com>
Date: Tue, 14 Jun 2016 12:26:59 +0100
Subject: [PATCH 0482/1802] Remove bad chain alert partition check

As per meeting 2016-03-31
https://bitcoincore.org/en/meetings/2016/03/31/#bad-chain-alerts

The partition checker was producing huge number of false-positives
and was disabled in 0.12.1 on the understanding it would either be
fixed in 0.13 or removed entirely from master if not.
---
 src/Makefile.test.include |  1 -
 src/init.cpp              |  6 ---
 src/main.cpp              | 62 ------------------------------
 src/main.h                |  2 -
 src/test/alert_tests.cpp  | 79 ---------------------------------------
 5 files changed, 150 deletions(-)
 delete mode 100644 src/test/alert_tests.cpp

diff --git a/src/Makefile.test.include b/src/Makefile.test.include
index 41d811fb5400f..0b6f306f83e81 100644
--- a/src/Makefile.test.include
+++ b/src/Makefile.test.include
@@ -38,7 +38,6 @@ BITCOIN_TESTS =\
   test/arith_uint256_tests.cpp \
   test/scriptnum10.h \
   test/addrman_tests.cpp \
-  test/alert_tests.cpp \
   test/amount_tests.cpp \
   test/allocator_tests.cpp \
   test/base32_tests.cpp \
diff --git a/src/init.cpp b/src/init.cpp
index c2ba9ae44babe..323d1cedcf2e4 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -1416,12 +1416,6 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
 
     StartNode(threadGroup, scheduler);
 
-    // Monitor the chain, and alert if we get blocks much quicker or slower than expected
-    int64_t nPowTargetSpacing = Params().GetConsensus().nPowTargetSpacing;
-    CScheduler::Function f = boost::bind(&PartitionCheck, &IsInitialBlockDownload,
-                                         boost::ref(cs_main), boost::cref(pindexBestHeader), nPowTargetSpacing);
-    scheduler.scheduleEvery(f, nPowTargetSpacing);
-
     // ********************************************************* Step 12: finished
 
     SetRPCWarmupFinished();
diff --git a/src/main.cpp b/src/main.cpp
index 62012bf56709f..91da3f47a5905 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -2118,68 +2118,6 @@ void ThreadScriptCheck() {
     scriptcheckqueue.Thread();
 }
 
-//
-// Called periodically asynchronously; alerts if it smells like
-// we're being fed a bad chain (blocks being generated much
-// too slowly or too quickly).
-//
-void PartitionCheck(bool (*initialDownloadCheck)(), CCriticalSection& cs, const CBlockIndex *const &bestHeader,
-                    int64_t nPowTargetSpacing)
-{
-    if (bestHeader == NULL || initialDownloadCheck()) return;
-
-    static int64_t lastAlertTime = 0;
-    int64_t now = GetAdjustedTime();
-    if (lastAlertTime > now-60*60*24) return; // Alert at most once per day
-
-    const int SPAN_HOURS=4;
-    const int SPAN_SECONDS=SPAN_HOURS*60*60;
-    int BLOCKS_EXPECTED = SPAN_SECONDS / nPowTargetSpacing;
-
-    boost::math::poisson_distribution<double> poisson(BLOCKS_EXPECTED);
-
-    std::string strWarning;
-    int64_t startTime = GetAdjustedTime()-SPAN_SECONDS;
-
-    LOCK(cs);
-    const CBlockIndex* i = bestHeader;
-    int nBlocks = 0;
-    while (i->GetBlockTime() >= startTime) {
-        ++nBlocks;
-        i = i->pprev;
-        if (i == NULL) return; // Ran out of chain, we must not be fully sync'ed
-    }
-
-    // How likely is it to find that many by chance?
-    double p = boost::math::pdf(poisson, nBlocks);
-
-    LogPrint("partitioncheck", "%s: Found %d blocks in the last %d hours\n", __func__, nBlocks, SPAN_HOURS);
-    LogPrint("partitioncheck", "%s: likelihood: %g\n", __func__, p);
-
-    // Aim for one false-positive about every fifty years of normal running:
-    const int FIFTY_YEARS = 50*365*24*60*60;
-    double alertThreshold = 1.0 / (FIFTY_YEARS / SPAN_SECONDS);
-
-    if (p <= alertThreshold && nBlocks < BLOCKS_EXPECTED)
-    {
-        // Many fewer blocks than expected: alert!
-        strWarning = strprintf(_("WARNING: check your network connection, %d blocks received in the last %d hours (%d expected)"),
-                               nBlocks, SPAN_HOURS, BLOCKS_EXPECTED);
-    }
-    else if (p <= alertThreshold && nBlocks > BLOCKS_EXPECTED)
-    {
-        // Many more blocks than expected: alert!
-        strWarning = strprintf(_("WARNING: abnormally high number of blocks generated, %d blocks received in the last %d hours (%d expected)"),
-                               nBlocks, SPAN_HOURS, BLOCKS_EXPECTED);
-    }
-    if (!strWarning.empty())
-    {
-        strMiscWarning = strWarning;
-        AlertNotify(strWarning);
-        lastAlertTime = now;
-    }
-}
-
 // Protected by cs_main
 VersionBitsCache versionbitscache;
 
diff --git a/src/main.h b/src/main.h
index 9b99ae7c870be..05f7d4d9204a0 100644
--- a/src/main.h
+++ b/src/main.h
@@ -242,8 +242,6 @@ bool ProcessMessages(CNode* pfrom);
 bool SendMessages(CNode* pto);
 /** Run an instance of the script checking thread */
 void ThreadScriptCheck();
-/** Try to detect Partition (network isolation) attacks against us */
-void PartitionCheck(bool (*initialDownloadCheck)(), CCriticalSection& cs, const CBlockIndex *const &bestHeader, int64_t nPowTargetSpacing);
 /** Check whether we are doing an initial block download (synchronizing from disk or network) */
 bool IsInitialBlockDownload();
 /** Format a string that describes several potential problems detected by the core.
diff --git a/src/test/alert_tests.cpp b/src/test/alert_tests.cpp
deleted file mode 100644
index 70f1f12273a82..0000000000000
--- a/src/test/alert_tests.cpp
+++ /dev/null
@@ -1,79 +0,0 @@
-// Copyright (c) 2013-2015 The Bitcoin Core developers
-// Distributed under the MIT software license, see the accompanying
-// file COPYING or http://www.opensource.org/licenses/mit-license.php.
-
-// Unit tests for alert system
-
-#include "chainparams.h"
-#include "main.h" // For PartitionCheck
-
-#include "test/testutil.h"
-#include "test/test_bitcoin.h"
-
-#include <boost/test/unit_test.hpp>
-
-BOOST_FIXTURE_TEST_SUITE(Alert_tests, TestingSetup)
-
-
-static bool falseFunc() { return false; }
-
-BOOST_AUTO_TEST_CASE(PartitionAlert)
-{
-    // Test PartitionCheck
-    CCriticalSection csDummy;
-    CBlockIndex indexDummy[100];
-    CChainParams& params = Params(CBaseChainParams::MAIN);
-    int64_t nPowTargetSpacing = params.GetConsensus().nPowTargetSpacing;
-
-    // Generate fake blockchain timestamps relative to
-    // an arbitrary time:
-    int64_t now = 1427379054;
-    SetMockTime(now);
-    for (int i = 0; i < 100; i++)
-    {
-        indexDummy[i].phashBlock = NULL;
-        if (i == 0) indexDummy[i].pprev = NULL;
-        else indexDummy[i].pprev = &indexDummy[i-1];
-        indexDummy[i].nHeight = i;
-        indexDummy[i].nTime = now - (100-i)*nPowTargetSpacing;
-        // Other members don't matter, the partition check code doesn't
-        // use them
-    }
-
-    strMiscWarning = "";
-
-    // Test 1: chain with blocks every nPowTargetSpacing seconds,
-    // as normal, no worries:
-    PartitionCheck(falseFunc, csDummy, &indexDummy[99], nPowTargetSpacing);
-    BOOST_CHECK_MESSAGE(strMiscWarning.empty(), strMiscWarning);
-
-    // Test 2: go 3.5 hours without a block, expect a warning:
-    now += 3*60*60+30*60;
-    SetMockTime(now);
-    PartitionCheck(falseFunc, csDummy, &indexDummy[99], nPowTargetSpacing);
-    BOOST_CHECK(!strMiscWarning.empty());
-    BOOST_TEST_MESSAGE(std::string("Got alert text: ")+strMiscWarning);
-    strMiscWarning = "";
-
-    // Test 3: test the "partition alerts only go off once per day"
-    // code:
-    now += 60*10;
-    SetMockTime(now);
-    PartitionCheck(falseFunc, csDummy, &indexDummy[99], nPowTargetSpacing);
-    BOOST_CHECK(strMiscWarning.empty());
-
-    // Test 4: get 2.5 times as many blocks as expected:
-    now += 60*60*24; // Pretend it is a day later
-    SetMockTime(now);
-    int64_t quickSpacing = nPowTargetSpacing*2/5;
-    for (int i = 0; i < 100; i++) // Tweak chain timestamps:
-        indexDummy[i].nTime = now - (100-i)*quickSpacing;
-    PartitionCheck(falseFunc, csDummy, &indexDummy[99], nPowTargetSpacing);
-    BOOST_CHECK(!strMiscWarning.empty());
-    BOOST_TEST_MESSAGE(std::string("Got alert text: ")+strMiscWarning);
-    strMiscWarning = "";
-
-    SetMockTime(0);
-}
-
-BOOST_AUTO_TEST_SUITE_END()
\ No newline at end of file

From d80efec3273dfdb88a434474be644cc5c788b617 Mon Sep 17 00:00:00 2001
From: Peter Todd <pete@petertodd.org>
Date: Wed, 15 Jun 2016 00:11:39 -0400
Subject: [PATCH 0483/1802] Update petertodd's testnet seed

New seed with servicebit filtering support.
---
 src/chainparams.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/chainparams.cpp b/src/chainparams.cpp
index 0005115671122..442bc61023826 100644
--- a/src/chainparams.cpp
+++ b/src/chainparams.cpp
@@ -207,7 +207,7 @@ class CTestNetParams : public CChainParams {
         vSeeds.clear();
         // nodes with support for servicebits filtering should be at the top
         vSeeds.push_back(CDNSSeedData("testnetbitcoin.jonasschnelli.ch", "testnet-seed.bitcoin.jonasschnelli.ch", true));
-        vSeeds.push_back(CDNSSeedData("bitcoin.petertodd.org", "testnet-seed.bitcoin.petertodd.org"));
+        vSeeds.push_back(CDNSSeedData("petertodd.org", "seed.tbtc.petertodd.org", true));
         vSeeds.push_back(CDNSSeedData("bluematt.me", "testnet-seed.bluematt.me"));
         vSeeds.push_back(CDNSSeedData("bitcoin.schildbach.de", "testnet-seed.bitcoin.schildbach.de"));
 

From 11cc143895e730002749f0881c4c95635fa54bd5 Mon Sep 17 00:00:00 2001
From: Gregory Maxwell <greg@xiph.org>
Date: Sat, 11 Jun 2016 00:26:16 +0000
Subject: [PATCH 0484/1802] Adds an expiration time for orphan tx.

This prevents higher order orphans and other junk from
 holding positions in the orphan map.  Parents delayed
 twenty minutes are more are unlikely to ever arrive.

The freed space will improve the orphan matching success rate for
 other transactions.
---
 src/main.cpp | 23 ++++++++++++++++++++++-
 src/main.h   |  4 ++++
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/src/main.cpp b/src/main.cpp
index c80a4ac922c83..44d96d614e278 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -100,6 +100,7 @@ struct IteratorComparator
 struct COrphanTx {
     CTransaction tx;
     NodeId fromPeer;
+    int64_t nTimeExpire;
 };
 map<uint256, COrphanTx> mapOrphanTransactions GUARDED_BY(cs_main);
 map<COutPoint, set<map<uint256, COrphanTx>::iterator, IteratorComparator>> mapOrphanTransactionsByPrev GUARDED_BY(cs_main);
@@ -641,7 +642,7 @@ bool AddOrphanTx(const CTransaction& tx, NodeId peer) EXCLUSIVE_LOCKS_REQUIRED(c
         return false;
     }
 
-    auto ret = mapOrphanTransactions.emplace(hash, COrphanTx{tx, peer});
+    auto ret = mapOrphanTransactions.emplace(hash, COrphanTx{tx, peer, GetTime() + ORPHAN_TX_EXPIRE_TIME});
     assert(ret.second);
     BOOST_FOREACH(const CTxIn& txin, tx.vin) {
         mapOrphanTransactionsByPrev[txin.prevout].insert(ret.first);
@@ -689,6 +690,26 @@ void EraseOrphansFor(NodeId peer)
 unsigned int LimitOrphanTxSize(unsigned int nMaxOrphans) EXCLUSIVE_LOCKS_REQUIRED(cs_main)
 {
     unsigned int nEvicted = 0;
+    static int64_t nNextSweep;
+    int64_t nNow = GetTime();
+    if (nNextSweep <= nNow) {
+        // Sweep out expired orphan pool entries:
+        int nErased = 0;
+        int64_t nMinExpTime = nNow + ORPHAN_TX_EXPIRE_TIME - ORPHAN_TX_EXPIRE_INTERVAL;
+        map<uint256, COrphanTx>::iterator iter = mapOrphanTransactions.begin();
+        while (iter != mapOrphanTransactions.end())
+        {
+            map<uint256, COrphanTx>::iterator maybeErase = iter++;
+            if (maybeErase->second.nTimeExpire <= nNow) {
+                nErased += EraseOrphanTx(maybeErase->second.tx.GetHash());
+            } else {
+                nMinExpTime = std::min(maybeErase->second.nTimeExpire, nMinExpTime);
+            }
+        }
+        // Sweep again 5 minutes after the next entry that expires in order to batch the linear scan.
+        nNextSweep = nMinExpTime + ORPHAN_TX_EXPIRE_INTERVAL;
+        if (nErased > 0) LogPrint("mempool", "Erased %d orphan tx due to expiration\n", nErased);
+    }
     while (mapOrphanTransactions.size() > nMaxOrphans)
     {
         // Evict a random orphan:
diff --git a/src/main.h b/src/main.h
index 9b99ae7c870be..191aafe043546 100644
--- a/src/main.h
+++ b/src/main.h
@@ -56,6 +56,10 @@ static const CAmount HIGH_TX_FEE_PER_KB = 0.01 * COIN;
 static const CAmount HIGH_MAX_TX_FEE = 100 * HIGH_TX_FEE_PER_KB;
 /** Default for -maxorphantx, maximum number of orphan transactions kept in memory */
 static const unsigned int DEFAULT_MAX_ORPHAN_TRANSACTIONS = 100;
+/** Expiration time for orphan transactions in seconds */
+static const int64_t ORPHAN_TX_EXPIRE_TIME = 20 * 60;
+/** Minimum time between orphan transactions expire time checks in seconds */
+static const int64_t ORPHAN_TX_EXPIRE_INTERVAL = 5 * 60;
 /** Default for -limitancestorcount, max number of in-mempool ancestors */
 static const unsigned int DEFAULT_ANCESTOR_LIMIT = 25;
 /** Default for -limitancestorsize, maximum kilobytes of tx + all in-mempool ancestors */

From 8c99d1b525562ab3b733e9d7ef770882646bad5c Mon Sep 17 00:00:00 2001
From: Gregory Maxwell <greg@xiph.org>
Date: Mon, 13 Jun 2016 17:27:44 +0000
Subject: [PATCH 0485/1802] Treat orphans as implicit inv for parents, discard
 when parents rejected.

An orphan whos parents were rejected is never going to connect, so there
 is little utility in keeping it.

Orphans also helpfully tell us what we're missing, so go ahead and treat
 it as INVed.
---
 src/main.cpp | 28 ++++++++++++++++++++++------
 1 file changed, 22 insertions(+), 6 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index 44d96d614e278..6a2290bc05e24 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -5156,13 +5156,29 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
         }
         else if (fMissingInputs)
         {
-            AddOrphanTx(tx, pfrom->GetId());
+            bool fRejectedParents = false; // It may be the case that the orphans parents have all been rejected
+            BOOST_FOREACH(const CTxIn& txin, tx.vin) {
+                if (recentRejects->contains(txin.prevout.hash)) {
+                    fRejectedParents = true;
+                    break;
+                }
+            }
+            if (!fRejectedParents) {
+                BOOST_FOREACH(const CTxIn& txin, tx.vin) {
+                    CInv inv(MSG_TX, txin.prevout.hash);
+                    pfrom->AddInventoryKnown(inv);
+                    if (!AlreadyHave(inv)) pfrom->AskFor(inv);
+                }
+                AddOrphanTx(tx, pfrom->GetId());
 
-            // DoS prevention: do not allow mapOrphanTransactions to grow unbounded
-            unsigned int nMaxOrphanTx = (unsigned int)std::max((int64_t)0, GetArg("-maxorphantx", DEFAULT_MAX_ORPHAN_TRANSACTIONS));
-            unsigned int nEvicted = LimitOrphanTxSize(nMaxOrphanTx);
-            if (nEvicted > 0)
-                LogPrint("mempool", "mapOrphan overflow, removed %u tx\n", nEvicted);
+                // DoS prevention: do not allow mapOrphanTransactions to grow unbounded
+                unsigned int nMaxOrphanTx = (unsigned int)std::max((int64_t)0, GetArg("-maxorphantx", DEFAULT_MAX_ORPHAN_TRANSACTIONS));
+                unsigned int nEvicted = LimitOrphanTxSize(nMaxOrphanTx);
+                if (nEvicted > 0)
+                    LogPrint("mempool", "mapOrphan overflow, removed %u tx\n", nEvicted);
+            } else {
+                LogPrint("mempool", "not keeping orphan with rejected parents %s\n",tx.GetHash().ToString());
+            }
         } else {
             assert(recentRejects);
             recentRejects->insert(tx.GetHash());

From 54326a6808a7026eef9d3a26f91f93b77f00a793 Mon Sep 17 00:00:00 2001
From: Gregory Maxwell <greg@xiph.org>
Date: Sat, 11 Jun 2016 00:28:48 +0000
Subject: [PATCH 0486/1802] Increase maximum orphan size to 100,000 bytes.

Although this increases node memory usage in the worst case by perhaps
 30MB, the current behavior causes severe issues with dependent tx relay.
---
 src/main.cpp           | 6 +++---
 src/test/DoS_tests.cpp | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index 6a2290bc05e24..d4ab32744f022 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -633,10 +633,10 @@ bool AddOrphanTx(const CTransaction& tx, NodeId peer) EXCLUSIVE_LOCKS_REQUIRED(c
     // large transaction with a missing parent then we assume
     // it will rebroadcast it later, after the parent transaction(s)
     // have been mined or received.
-    // 10,000 orphans, each of which is at most 5,000 bytes big is
-    // at most 500 megabytes of orphans:
+    // 100 orphans, each of which is at most 99,999 bytes big is
+    // at most 10 megabytes of orphans and somewhat more byprev index (in the worst case):
     unsigned int sz = tx.GetSerializeSize(SER_NETWORK, CTransaction::CURRENT_VERSION);
-    if (sz > 5000)
+    if (sz >= MAX_STANDARD_TX_SIZE)
     {
         LogPrint("mempool", "ignoring large orphan tx (size: %u, hash: %s)\n", sz, hash.ToString());
         return false;
diff --git a/src/test/DoS_tests.cpp b/src/test/DoS_tests.cpp
index 95342498fa782..818128d186c11 100644
--- a/src/test/DoS_tests.cpp
+++ b/src/test/DoS_tests.cpp
@@ -162,7 +162,7 @@ BOOST_AUTO_TEST_CASE(DoS_mapOrphans)
         tx.vout.resize(1);
         tx.vout[0].nValue = 1*CENT;
         tx.vout[0].scriptPubKey = GetScriptForDestination(key.GetPubKey().GetID());
-        tx.vin.resize(500);
+        tx.vin.resize(2777);
         for (unsigned int j = 0; j < tx.vin.size(); j++)
         {
             tx.vin[j].prevout.n = j;

From bc0a895d810107132651c8178e95a981b9f3ff74 Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Wed, 15 Jun 2016 19:31:28 +0200
Subject: [PATCH 0487/1802] Do not set extra flags for unfiltered DNS seed
 results

---
 src/chainparams.cpp |  8 --------
 src/chainparams.h   |  4 +---
 src/net.cpp         | 14 +++++++++++++-
 3 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/src/chainparams.cpp b/src/chainparams.cpp
index 0005115671122..8c27a578bb948 100644
--- a/src/chainparams.cpp
+++ b/src/chainparams.cpp
@@ -16,14 +16,6 @@
 
 #include "chainparamsseeds.h"
 
-std::string CDNSSeedData::getHost(uint64_t requiredServiceBits) const {
-    //use default host for non-filter-capable seeds or if we use the default service bits (NODE_NETWORK)
-    if (!supportsServiceBitsFiltering || requiredServiceBits == NODE_NETWORK)
-        return host;
-    
-    return strprintf("x%x.%s", requiredServiceBits, host);
-}
-
 static CBlock CreateGenesisBlock(const char* pszTimestamp, const CScript& genesisOutputScript, uint32_t nTime, uint32_t nNonce, uint32_t nBits, int32_t nVersion, const CAmount& genesisReward)
 {
     CMutableTransaction txNew;
diff --git a/src/chainparams.h b/src/chainparams.h
index 7168daaf4347c..638893e9ad9b4 100644
--- a/src/chainparams.h
+++ b/src/chainparams.h
@@ -13,11 +13,9 @@
 
 #include <vector>
 
-class CDNSSeedData {
-public:
+struct CDNSSeedData {
     std::string name, host;
     bool supportsServiceBitsFiltering;
-    std::string getHost(uint64_t requiredServiceBits) const;
     CDNSSeedData(const std::string &strName, const std::string &strHost, bool supportsServiceBitsFilteringIn = false) : name(strName), host(strHost), supportsServiceBitsFiltering(supportsServiceBitsFilteringIn) {}
 };
 
diff --git a/src/net.cpp b/src/net.cpp
index a390eca776f52..5e791291c7529 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -1415,6 +1415,18 @@ void MapPort(bool)
 
 
 
+static std::string GetDNSHost(const CDNSSeedData& data, ServiceFlags* requiredServiceBits)
+{
+    //use default host for non-filter-capable seeds or if we use the default service bits (NODE_NETWORK)
+    if (!data.supportsServiceBitsFiltering || *requiredServiceBits == NODE_NETWORK) {
+        *requiredServiceBits = NODE_NETWORK;
+        return data.host;
+    }
+
+    return strprintf("x%x.%s", *requiredServiceBits, data.host);
+}
+
+
 void ThreadDNSAddressSeed()
 {
     // goal: only query DNS seeds if address need is acute
@@ -1441,7 +1453,7 @@ void ThreadDNSAddressSeed()
             std::vector<CNetAddr> vIPs;
             std::vector<CAddress> vAdd;
             ServiceFlags requiredServiceBits = nRelevantServices;
-            if (LookupHost(seed.getHost(requiredServiceBits).c_str(), vIPs, 0, true))
+            if (LookupHost(GetDNSHost(seed, &requiredServiceBits).c_str(), vIPs, 0, true))
             {
                 BOOST_FOREACH(const CNetAddr& ip, vIPs)
                 {

From 5d0ca81f7422b7eac0a5129c6fbccad77e36b85d Mon Sep 17 00:00:00 2001
From: Gregory Maxwell <greg@xiph.org>
Date: Sun, 22 May 2016 05:55:15 +0000
Subject: [PATCH 0488/1802] Add recently accepted blocks and txn to
 AttemptToEvictConnection.

This protects any not-already-protected peers who were the most
 recent four to relay transactions and most recent four to send
 blocks to us.
---
 src/main.cpp | 16 +++++++++++-----
 src/main.h   |  2 +-
 src/net.cpp  | 48 ++++++++++++++++++++++++++++++++++++++++++++----
 src/net.h    |  5 +++++
 4 files changed, 61 insertions(+), 10 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index 6d006e8789db1..24ae61b74de2d 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -3449,8 +3449,9 @@ static bool AcceptBlockHeader(const CBlockHeader& block, CValidationState& state
 }
 
 /** Store block on disk. If dbp is non-NULL, the file is known to already reside on disk */
-static bool AcceptBlock(const CBlock& block, CValidationState& state, const CChainParams& chainparams, CBlockIndex** ppindex, bool fRequested, const CDiskBlockPos* dbp)
+static bool AcceptBlock(const CBlock& block, CValidationState& state, const CChainParams& chainparams, CBlockIndex** ppindex, bool fRequested, const CDiskBlockPos* dbp, bool* fNewBlock)
 {
+    if (fNewBlock) *fNewBlock = false;
     AssertLockHeld(cs_main);
 
     CBlockIndex *pindexDummy = NULL;
@@ -3479,6 +3480,7 @@ static bool AcceptBlock(const CBlock& block, CValidationState& state, const CCha
         if (!fHasMoreWork) return true;     // Don't process less-work chains
         if (fTooFarAhead) return true;      // Block height is too high
     }
+    if (fNewBlock) *fNewBlock = true;
 
     if ((!CheckBlock(block, state, chainparams.GetConsensus(), GetAdjustedTime())) || !ContextualCheckBlock(block, state, pindex->pprev)) {
         if (state.IsInvalid() && !state.CorruptionPossible()) {
@@ -3526,7 +3528,7 @@ static bool IsSuperMajority(int minVersion, const CBlockIndex* pstart, unsigned
 }
 
 
-bool ProcessNewBlock(CValidationState& state, const CChainParams& chainparams, const CNode* pfrom, const CBlock* pblock, bool fForceProcessing, const CDiskBlockPos* dbp)
+bool ProcessNewBlock(CValidationState& state, const CChainParams& chainparams, CNode* pfrom, const CBlock* pblock, bool fForceProcessing, const CDiskBlockPos* dbp)
 {
     {
         LOCK(cs_main);
@@ -3535,9 +3537,11 @@ bool ProcessNewBlock(CValidationState& state, const CChainParams& chainparams, c
 
         // Store to disk
         CBlockIndex *pindex = NULL;
-        bool ret = AcceptBlock(*pblock, state, chainparams, &pindex, fRequested, dbp);
+        bool fNewBlock = false;
+        bool ret = AcceptBlock(*pblock, state, chainparams, &pindex, fRequested, dbp, &fNewBlock);
         if (pindex && pfrom) {
             mapBlockSource[pindex->GetBlockHash()] = pfrom->GetId();
+            if (fNewBlock) pfrom->nLastBlockTime = GetTime();
         }
         CheckBlockIndex(chainparams.GetConsensus());
         if (!ret)
@@ -4107,7 +4111,7 @@ bool LoadExternalBlockFile(const CChainParams& chainparams, FILE* fileIn, CDiskB
                 if (mapBlockIndex.count(hash) == 0 || (mapBlockIndex[hash]->nStatus & BLOCK_HAVE_DATA) == 0) {
                     LOCK(cs_main);
                     CValidationState state;
-                    if (AcceptBlock(block, state, chainparams, NULL, true, dbp))
+                    if (AcceptBlock(block, state, chainparams, NULL, true, dbp, NULL))
                         nLoaded++;
                     if (state.IsError())
                         break;
@@ -4140,7 +4144,7 @@ bool LoadExternalBlockFile(const CChainParams& chainparams, FILE* fileIn, CDiskB
                                     head.ToString());
                             LOCK(cs_main);
                             CValidationState dummy;
-                            if (AcceptBlock(block, dummy, chainparams, NULL, true, &it->second))
+                            if (AcceptBlock(block, dummy, chainparams, NULL, true, &it->second, NULL))
                             {
                                 nLoaded++;
                                 queue.push_back(block.GetHash());
@@ -5040,6 +5044,8 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
             RelayTransaction(tx);
             vWorkQueue.push_back(inv.hash);
 
+            pfrom->nLastTXTime = GetTime();
+
             LogPrint("mempool", "AcceptToMemoryPool: peer=%d: accepted %s (poolsz %u txn, %u kB)\n",
                 pfrom->id,
                 tx.GetHash().ToString(),
diff --git a/src/main.h b/src/main.h
index 9b99ae7c870be..e2bfdfdf6ee36 100644
--- a/src/main.h
+++ b/src/main.h
@@ -215,7 +215,7 @@ void UnregisterNodeSignals(CNodeSignals& nodeSignals);
  * @param[out]  dbp     The already known disk position of pblock, or NULL if not yet stored.
  * @return True if state.IsValid()
  */
-bool ProcessNewBlock(CValidationState& state, const CChainParams& chainparams, const CNode* pfrom, const CBlock* pblock, bool fForceProcessing, const CDiskBlockPos* dbp);
+bool ProcessNewBlock(CValidationState& state, const CChainParams& chainparams, CNode* pfrom, const CBlock* pblock, bool fForceProcessing, const CDiskBlockPos* dbp);
 /** Check whether enough disk space is available for an incoming block */
 bool CheckDiskSpace(uint64_t nAdditionalBytes = 0);
 /** Open a block file (blk?????.dat) */
diff --git a/src/net.cpp b/src/net.cpp
index 173eba57c8669..ec547e8c998eb 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -838,6 +838,11 @@ struct NodeEvictionCandidate
     NodeId id;
     int64_t nTimeConnected;
     int64_t nMinPingUsecTime;
+    int64_t nLastBlockTime;
+    int64_t nLastTXTime;
+    bool fNetworkNode;
+    bool fRelayTxes;
+    bool fBloomFilter;
     CAddress addr;
     uint64_t nKeyedNetGroup;
 };
@@ -854,7 +859,24 @@ static bool ReverseCompareNodeTimeConnected(const NodeEvictionCandidate &a, cons
 
 static bool CompareNetGroupKeyed(const NodeEvictionCandidate &a, const NodeEvictionCandidate &b) {
     return a.nKeyedNetGroup < b.nKeyedNetGroup;
-};
+}
+
+static bool CompareNodeBlockTime(const NodeEvictionCandidate &a, const NodeEvictionCandidate &b)
+{
+    // There is a fall-through here because it is common for a node to have many peers which have not yet relayed a block.
+    if (a.nLastBlockTime != b.nLastBlockTime) return a.nLastBlockTime < b.nLastBlockTime;
+    if (a.fNetworkNode != b.fNetworkNode) return b.fNetworkNode;
+    return a.nTimeConnected > b.nTimeConnected;
+}
+
+static bool CompareNodeTXTime(const NodeEvictionCandidate &a, const NodeEvictionCandidate &b)
+{
+    // There is a fall-through here because it is common for a node to have more than a few peers that have not yet relayed txn.
+    if (a.nLastTXTime != b.nLastTXTime) return a.nLastTXTime < b.nLastTXTime;
+    if (a.fRelayTxes != b.fRelayTxes) return b.fRelayTxes;
+    if (a.fBloomFilter != b.fBloomFilter) return a.fBloomFilter;
+    return a.nTimeConnected > b.nTimeConnected;
+}
 
 /** Try to find a connection to evict when the node is full.
  *  Extreme care must be taken to avoid opening the node to attacker
@@ -864,7 +886,7 @@ static bool CompareNetGroupKeyed(const NodeEvictionCandidate &a, const NodeEvict
  *   to forge.  In order to partition a node the attacker must be
  *   simultaneously better at all of them than honest peers.
  */
-static bool AttemptToEvictConnection(bool fPreferNewConnection) {
+static bool AttemptToEvictConnection() {
     std::vector<NodeEvictionCandidate> vEvictionCandidates;
     {
         LOCK(cs_vNodes);
@@ -876,7 +898,9 @@ static bool AttemptToEvictConnection(bool fPreferNewConnection) {
                 continue;
             if (node->fDisconnect)
                 continue;
-            NodeEvictionCandidate candidate = {node->id, node->nTimeConnected, node->nMinPingUsecTime, node->addr, node->nKeyedNetGroup};
+            NodeEvictionCandidate candidate = {node->id, node->nTimeConnected, node->nMinPingUsecTime,
+                                               node->nLastBlockTime, node->nLastTXTime, node->fNetworkNode,
+                                               node->fRelayTxes, node->pfilter != NULL, node->addr, node->nKeyedNetGroup};
             vEvictionCandidates.push_back(candidate);
         }
     }
@@ -899,6 +923,20 @@ static bool AttemptToEvictConnection(bool fPreferNewConnection) {
 
     if (vEvictionCandidates.empty()) return false;
 
+    // Protect 4 nodes that most recently sent us transactions.
+    // An attacker cannot manipulate this metric without performing useful work.
+    std::sort(vEvictionCandidates.begin(), vEvictionCandidates.end(), CompareNodeTXTime);
+    vEvictionCandidates.erase(vEvictionCandidates.end() - std::min(4, static_cast<int>(vEvictionCandidates.size())), vEvictionCandidates.end());
+
+    if (vEvictionCandidates.empty()) return false;
+
+    // Protect 4 nodes that most recently sent us blocks.
+    // An attacker cannot manipulate this metric without performing useful work.
+    std::sort(vEvictionCandidates.begin(), vEvictionCandidates.end(), CompareNodeBlockTime);
+    vEvictionCandidates.erase(vEvictionCandidates.end() - std::min(4, static_cast<int>(vEvictionCandidates.size())), vEvictionCandidates.end());
+
+    if (vEvictionCandidates.empty()) return false;
+
     // Protect the half of the remaining nodes which have been connected the longest.
     // This replicates the non-eviction implicit behavior, and precludes attacks that start later.
     std::sort(vEvictionCandidates.begin(), vEvictionCandidates.end(), ReverseCompareNodeTimeConnected);
@@ -999,7 +1037,7 @@ static void AcceptConnection(const ListenSocket& hListenSocket) {
 
     if (nInbound >= nMaxInbound)
     {
-        if (!AttemptToEvictConnection(whitelisted)) {
+        if (!AttemptToEvictConnection()) {
             // No connection to evict, disconnect the new connection
             LogPrint("net", "failed to find an eviction candidate - connection dropped (full)\n");
             CloseSocket(hSocket);
@@ -2358,6 +2396,8 @@ CNode::CNode(SOCKET hSocketIn, const CAddress& addrIn, const std::string& addrNa
     fSentAddr = false;
     pfilter = new CBloomFilter();
     timeLastMempoolReq = 0;
+    nLastBlockTime = 0;
+    nLastTXTime = 0;
     nPingNonceSent = 0;
     nPingUsecStart = 0;
     nPingUsecTime = 0;
diff --git a/src/net.h b/src/net.h
index 5c1f7e3e89cbc..2f96c58e305d4 100644
--- a/src/net.h
+++ b/src/net.h
@@ -416,6 +416,11 @@ class CNode
 
     // Last time a "MEMPOOL" request was serviced.
     std::atomic<int64_t> timeLastMempoolReq;
+
+    // Block and TXN accept times
+    std::atomic<int64_t> nLastBlockTime;
+    std::atomic<int64_t> nLastTXTime;
+
     // Ping time measurement:
     // The pong reply we're expecting, or 0 if no pong expected.
     uint64_t nPingNonceSent;

From 6ee7f05622c32431a9815a96b31a6a65a821fdcc Mon Sep 17 00:00:00 2001
From: Gregory Maxwell <greg@xiph.org>
Date: Fri, 10 Jun 2016 03:02:01 +0000
Subject: [PATCH 0489/1802] Allow disconnecting a netgroup with only one member
 in eviction.

With the latest additions there are enough protective measures that
 we can take the training wheels off.
---
 src/net.cpp | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/src/net.cpp b/src/net.cpp
index ec547e8c998eb..89eb55ae94f1b 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -965,13 +965,6 @@ static bool AttemptToEvictConnection() {
     // Reduce to the network group with the most connections
     vEvictionCandidates = std::move(mapAddrCounts[naMostConnections]);
 
-    // Do not disconnect peers if there is only one unprotected connection from their network group.
-    // This step excessively favors netgroup diversity, and should be removed once more protective criteria are established.
-    if (vEvictionCandidates.size() <= 1)
-        // unless we prefer the new connection (for whitelisted peers)
-        if (!fPreferNewConnection)
-            return false;
-
     // Disconnect from the network group with the most connections
     NodeId evicted = vEvictionCandidates.front().id;
     LOCK(cs_vNodes);

From fa58e5ee93b8ab7a5a71cd232d829233ee7f2f56 Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Thu, 16 Jun 2016 10:10:03 +0200
Subject: [PATCH 0490/1802] [doc] Add website links to about dialog

---
 src/init.cpp | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/init.cpp b/src/init.cpp
index c2ba9ae44babe..b572bfc32720a 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -479,11 +479,20 @@ std::string HelpMessage(HelpMessageMode mode)
 
 std::string LicenseInfo()
 {
+    const std::string URL_SOURCE_CODE = "<https://github.com/bitcoin/bitcoin>";
+    const std::string URL_WEBSITE = "<https://bitcoincore.org>";
     // todo: remove urls from translations on next change
     return CopyrightHolders(strprintf(_("Copyright (C) %i-%i"), 2009, COPYRIGHT_YEAR) + " ") + "\n" +
            "\n" +
-           _("This is experimental software.") + "\n" +
+           strprintf(_("Please contribute if you find %s useful. "
+                       "Visit %s for further information about the software."),
+               PACKAGE_NAME, URL_WEBSITE) +
+           "\n" +
+           strprintf(_("The source code is available from %s."),
+               URL_SOURCE_CODE) +
            "\n" +
+           "\n" +
+           _("This is experimental software.") + "\n" +
            _("Distributed under the MIT software license, see the accompanying file COPYING or <http://www.opensource.org/licenses/mit-license.php>.") + "\n" +
            "\n" +
            _("This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit <https://www.openssl.org/> and cryptographic software written by Eric Young and UPnP software written by Thomas Bernard.") +

From c82a4e9a63a28fc8c482c7c8e5b7bfcc51a6805a Mon Sep 17 00:00:00 2001
From: Suhas Daftuar <sdaftuar@chaincode.com>
Date: Sat, 20 Feb 2016 21:02:44 -0500
Subject: [PATCH 0491/1802] Use ancestor-feerate based transaction selection
 for mining

Includes changes by Pieter Wuille
---
 src/miner.cpp | 206 +++++++++++++++++++++++++++++++++++++++++++++++++-
 src/miner.h   | 118 +++++++++++++++++++++++++++++
 2 files changed, 323 insertions(+), 1 deletion(-)

diff --git a/src/miner.cpp b/src/miner.cpp
index 99eb0a2ebd0f7..989ad11a2614d 100644
--- a/src/miner.cpp
+++ b/src/miner.cpp
@@ -25,6 +25,7 @@
 #include "utilmoneystr.h"
 #include "validationinterface.h"
 
+#include <algorithm>
 #include <boost/thread.hpp>
 #include <boost/tuple/tuple.hpp>
 #include <queue>
@@ -134,7 +135,7 @@ CBlockTemplate* BlockAssembler::CreateNewBlock(const CScript& scriptPubKeyIn)
                        : pblock->GetBlockTime();
 
     addPriorityTxs();
-    addScoreTxs();
+    addPackageTxs();
 
     nLastBlockTx = nBlockTx;
     nLastBlockSize = nBlockSize;
@@ -177,7 +178,38 @@ bool BlockAssembler::isStillDependent(CTxMemPool::txiter iter)
     return false;
 }
 
+void BlockAssembler::onlyUnconfirmed(CTxMemPool::setEntries& testSet)
+{
+    for (CTxMemPool::setEntries::iterator iit = testSet.begin(); iit != testSet.end(); ) {
+        // Only test txs not already in the block
+        if (inBlock.count(*iit)) {
+            testSet.erase(iit++);
+        }
+        else {
+            iit++;
+        }
+    }
+}
+
+bool BlockAssembler::TestPackage(uint64_t packageSize, unsigned int packageSigOps)
+{
+    if (nBlockSize + packageSize >= nBlockMaxSize)
+        return false;
+    if (nBlockSigOps + packageSigOps >= MAX_BLOCK_SIGOPS)
+        return false;
+    return true;
+}
 
+// Block size and sigops have already been tested.  Check that all transactions
+// are final.
+bool BlockAssembler::TestPackageFinality(const CTxMemPool::setEntries& package)
+{
+    BOOST_FOREACH (const CTxMemPool::txiter it, package) {
+        if (!IsFinalTx(it->GetTx(), nHeight, nLockTimeCutoff))
+            return false;
+    }
+    return true;
+}
 
 bool BlockAssembler::TestForBlock(CTxMemPool::txiter iter)
 {
@@ -297,6 +329,178 @@ void BlockAssembler::addScoreTxs()
     }
 }
 
+void BlockAssembler::UpdatePackagesForAdded(const CTxMemPool::setEntries& alreadyAdded,
+        indexed_modified_transaction_set &mapModifiedTx)
+{
+    BOOST_FOREACH(const CTxMemPool::txiter it, alreadyAdded) {
+        CTxMemPool::setEntries descendants;
+        mempool.CalculateDescendants(it, descendants);
+        // Insert all descendants (not yet in block) into the modified set
+        BOOST_FOREACH(CTxMemPool::txiter desc, descendants) {
+            if (alreadyAdded.count(desc))
+                continue;
+            modtxiter mit = mapModifiedTx.find(desc);
+            if (mit == mapModifiedTx.end()) {
+                CTxMemPoolModifiedEntry modEntry(desc);
+                modEntry.nSizeWithAncestors -= it->GetTxSize();
+                modEntry.nModFeesWithAncestors -= it->GetModifiedFee();
+                modEntry.nSigOpCountWithAncestors -= it->GetSigOpCount();
+                mapModifiedTx.insert(modEntry);
+            } else {
+                mapModifiedTx.modify(mit, update_for_parent_inclusion(it));
+            }
+        }
+    }
+}
+
+// Skip entries in mapTx that are already in a block or are present
+// in mapModifiedTx (which implies that the mapTx ancestor state is
+// stale due to ancestor inclusion in the block)
+// Also skip transactions that we've already failed to add. This can happen if
+// we consider a transaction in mapModifiedTx and it fails: we can then
+// potentially consider it again while walking mapTx.  It's currently
+// guaranteed to fail again, but as a belt-and-suspenders check we put it in
+// failedTx and avoid re-evaluation, since the re-evaluation would be using
+// cached size/sigops/fee values that are not actually correct.
+bool BlockAssembler::SkipMapTxEntry(CTxMemPool::txiter it, indexed_modified_transaction_set &mapModifiedTx, CTxMemPool::setEntries &failedTx)
+{
+    assert (it != mempool.mapTx.end());
+    if (mapModifiedTx.count(it) || inBlock.count(it) || failedTx.count(it))
+        return true;
+    return false;
+}
+
+void BlockAssembler::SortForBlock(const CTxMemPool::setEntries& package, CTxMemPool::txiter entry, std::vector<CTxMemPool::txiter>& sortedEntries)
+{
+    // Sort package by ancestor count
+    // If a transaction A depends on transaction B, then A's ancestor count
+    // must be greater than B's.  So this is sufficient to validly order the
+    // transactions for block inclusion.
+    sortedEntries.clear();
+    sortedEntries.insert(sortedEntries.begin(), package.begin(), package.end());
+    std::sort(sortedEntries.begin(), sortedEntries.end(), CompareTxIterByAncestorCount());
+}
+
+// This transaction selection algorithm orders the mempool based
+// on feerate of a transaction including all unconfirmed ancestors.
+// Since we don't remove transactions from the mempool as we select them
+// for block inclusion, we need an alternate method of updating the feerate
+// of a transaction with its not-yet-selected ancestors as we go.
+// This is accomplished by walking the in-mempool descendants of selected
+// transactions and storing a temporary modified state in mapModifiedTxs.
+// Each time through the loop, we compare the best transaction in
+// mapModifiedTxs with the next transaction in the mempool to decide what
+// transaction package to work on next.
+void BlockAssembler::addPackageTxs()
+{
+    // mapModifiedTx will store sorted packages after they are modified
+    // because some of their txs are already in the block
+    indexed_modified_transaction_set mapModifiedTx;
+    // Keep track of entries that failed inclusion, to avoid duplicate work
+    CTxMemPool::setEntries failedTx;
+
+    // Start by adding all descendants of previously added txs to mapModifiedTx
+    // and modifying them for their already included ancestors
+    UpdatePackagesForAdded(inBlock, mapModifiedTx);
+
+    CTxMemPool::indexed_transaction_set::index<ancestor_score>::type::iterator mi = mempool.mapTx.get<ancestor_score>().begin();
+    CTxMemPool::txiter iter;
+    while (mi != mempool.mapTx.get<ancestor_score>().end() || !mapModifiedTx.empty())
+    {
+        // First try to find a new transaction in mapTx to evaluate.
+        if (mi != mempool.mapTx.get<ancestor_score>().end() &&
+                SkipMapTxEntry(mempool.mapTx.project<0>(mi), mapModifiedTx, failedTx)) {
+            ++mi;
+            continue;
+        }
+
+        // Now that mi is not stale, determine which transaction to evaluate:
+        // the next entry from mapTx, or the best from mapModifiedTx?
+        bool fUsingModified = false;
+
+        modtxscoreiter modit = mapModifiedTx.get<ancestor_score>().begin();
+        if (mi == mempool.mapTx.get<ancestor_score>().end()) {
+            // We're out of entries in mapTx; use the entry from mapModifiedTx
+            iter = modit->iter;
+            fUsingModified = true;
+        } else {
+            // Try to compare the mapTx entry to the mapModifiedTx entry
+            iter = mempool.mapTx.project<0>(mi);
+            if (modit != mapModifiedTx.get<ancestor_score>().end() &&
+                    CompareModifiedEntry()(*modit, CTxMemPoolModifiedEntry(iter))) {
+                // The best entry in mapModifiedTx has higher score
+                // than the one from mapTx.
+                // Switch which transaction (package) to consider
+                iter = modit->iter;
+                fUsingModified = true;
+            } else {
+                // Either no entry in mapModifiedTx, or it's worse than mapTx.
+                // Increment mi for the next loop iteration.
+                ++mi;
+            }
+        }
+
+        // We skip mapTx entries that are inBlock, and mapModifiedTx shouldn't
+        // contain anything that is inBlock.
+        assert(!inBlock.count(iter));
+
+        uint64_t packageSize = iter->GetSizeWithAncestors();
+        CAmount packageFees = iter->GetModFeesWithAncestors();
+        unsigned int packageSigOps = iter->GetSigOpCountWithAncestors();
+        if (fUsingModified) {
+            packageSize = modit->nSizeWithAncestors;
+            packageFees = modit->nModFeesWithAncestors;
+            packageSigOps = modit->nSigOpCountWithAncestors;
+        }
+
+        if (packageFees < ::minRelayTxFee.GetFee(packageSize) && nBlockSize >= nBlockMinSize) {
+            // Everything else we might consider has a lower fee rate
+            return;
+        }
+
+        if (!TestPackage(packageSize, packageSigOps)) {
+            if (fUsingModified) {
+                // Since we always look at the best entry in mapModifiedTx,
+                // we must erase failed entries so that we can consider the
+                // next best entry on the next loop iteration
+                mapModifiedTx.get<ancestor_score>().erase(modit);
+                failedTx.insert(iter);
+            }
+            continue;
+        }
+
+        CTxMemPool::setEntries ancestors;
+        uint64_t nNoLimit = std::numeric_limits<uint64_t>::max();
+        std::string dummy;
+        mempool.CalculateMemPoolAncestors(*iter, ancestors, nNoLimit, nNoLimit, nNoLimit, nNoLimit, dummy, false);
+
+        onlyUnconfirmed(ancestors);
+        ancestors.insert(iter);
+
+        // Test if all tx's are Final
+        if (!TestPackageFinality(ancestors)) {
+            if (fUsingModified) {
+                mapModifiedTx.get<ancestor_score>().erase(modit);
+                failedTx.insert(iter);
+            }
+            continue;
+        }
+
+        // Package can be added. Sort the entries in a valid order.
+        vector<CTxMemPool::txiter> sortedEntries;
+        SortForBlock(ancestors, iter, sortedEntries);
+
+        for (size_t i=0; i<sortedEntries.size(); ++i) {
+            AddToBlock(sortedEntries[i]);
+            // Erase from the modified set, if present
+            mapModifiedTx.erase(sortedEntries[i]);
+        }
+
+        // Update transactions that depend on each of these
+        UpdatePackagesForAdded(ancestors, mapModifiedTx);
+    }
+}
+
 void BlockAssembler::addPriorityTxs()
 {
     // How much of the block should be dedicated to high-priority transactions,
diff --git a/src/miner.h b/src/miner.h
index 74f19693c4b29..a9fea85304aa6 100644
--- a/src/miner.h
+++ b/src/miner.h
@@ -11,6 +11,8 @@
 
 #include <stdint.h>
 #include <memory>
+#include "boost/multi_index_container.hpp"
+#include "boost/multi_index/ordered_index.hpp"
 
 class CBlockIndex;
 class CChainParams;
@@ -29,6 +31,104 @@ struct CBlockTemplate
     std::vector<int64_t> vTxSigOps;
 };
 
+// Container for tracking updates to ancestor feerate as we include (parent)
+// transactions in a block
+struct CTxMemPoolModifiedEntry {
+    CTxMemPoolModifiedEntry(CTxMemPool::txiter entry)
+    {
+        iter = entry;
+        nSizeWithAncestors = entry->GetSizeWithAncestors();
+        nModFeesWithAncestors = entry->GetModFeesWithAncestors();
+        nSigOpCountWithAncestors = entry->GetSigOpCountWithAncestors();
+    }
+
+    CTxMemPool::txiter iter;
+    uint64_t nSizeWithAncestors;
+    CAmount nModFeesWithAncestors;
+    unsigned int nSigOpCountWithAncestors;
+};
+
+/** Comparator for CTxMemPool::txiter objects.
+ *  It simply compares the internal memory address of the CTxMemPoolEntry object
+ *  pointed to. This means it has no meaning, and is only useful for using them
+ *  as key in other indexes.
+ */
+struct CompareCTxMemPoolIter {
+    bool operator()(const CTxMemPool::txiter& a, const CTxMemPool::txiter& b) const
+    {
+        return &(*a) < &(*b);
+    }
+};
+
+struct modifiedentry_iter {
+    typedef CTxMemPool::txiter result_type;
+    result_type operator() (const CTxMemPoolModifiedEntry &entry) const
+    {
+        return entry.iter;
+    }
+};
+
+// This matches the calculation in CompareTxMemPoolEntryByAncestorFee,
+// except operating on CTxMemPoolModifiedEntry.
+// TODO: refactor to avoid duplication of this logic.
+struct CompareModifiedEntry {
+    bool operator()(const CTxMemPoolModifiedEntry &a, const CTxMemPoolModifiedEntry &b)
+    {
+        double f1 = (double)a.nModFeesWithAncestors * b.nSizeWithAncestors;
+        double f2 = (double)b.nModFeesWithAncestors * a.nSizeWithAncestors;
+        if (f1 == f2) {
+            return CTxMemPool::CompareIteratorByHash()(a.iter, b.iter);
+        }
+        return f1 > f2;
+    }
+};
+
+// A comparator that sorts transactions based on number of ancestors.
+// This is sufficient to sort an ancestor package in an order that is valid
+// to appear in a block.
+struct CompareTxIterByAncestorCount {
+    bool operator()(const CTxMemPool::txiter &a, const CTxMemPool::txiter &b)
+    {
+        if (a->GetCountWithAncestors() != b->GetCountWithAncestors())
+            return a->GetCountWithAncestors() < b->GetCountWithAncestors();
+        return CTxMemPool::CompareIteratorByHash()(a, b);
+    }
+};
+
+typedef boost::multi_index_container<
+    CTxMemPoolModifiedEntry,
+    boost::multi_index::indexed_by<
+        boost::multi_index::ordered_unique<
+            modifiedentry_iter,
+            CompareCTxMemPoolIter
+        >,
+        // sorted by modified ancestor fee rate
+        boost::multi_index::ordered_non_unique<
+            // Reuse same tag from CTxMemPool's similar index
+            boost::multi_index::tag<ancestor_score>,
+            boost::multi_index::identity<CTxMemPoolModifiedEntry>,
+            CompareModifiedEntry
+        >
+    >
+> indexed_modified_transaction_set;
+
+typedef indexed_modified_transaction_set::nth_index<0>::type::iterator modtxiter;
+typedef indexed_modified_transaction_set::index<ancestor_score>::type::iterator modtxscoreiter;
+
+struct update_for_parent_inclusion
+{
+    update_for_parent_inclusion(CTxMemPool::txiter it) : iter(it) {}
+
+    void operator() (CTxMemPoolModifiedEntry &e)
+    {
+        e.nModFeesWithAncestors -= iter->GetFee();
+        e.nSizeWithAncestors -= iter->GetTxSize();
+        e.nSigOpCountWithAncestors -= iter->GetSigOpCount();
+    }
+
+    CTxMemPool::txiter iter;
+};
+
 /** Generate a new block, without valid proof-of-work */
 class BlockAssembler
 {
@@ -74,12 +174,30 @@ class BlockAssembler
     void addScoreTxs();
     /** Add transactions based on tx "priority" */
     void addPriorityTxs();
+    /** Add transactions based on feerate including unconfirmed ancestors */
+    void addPackageTxs();
 
     // helper function for addScoreTxs and addPriorityTxs
     /** Test if tx will still "fit" in the block */
     bool TestForBlock(CTxMemPool::txiter iter);
     /** Test if tx still has unconfirmed parents not yet in block */
     bool isStillDependent(CTxMemPool::txiter iter);
+
+    // helper functions for addPackageTxs()
+    /** Remove confirmed (inBlock) entries from given set */
+    void onlyUnconfirmed(CTxMemPool::setEntries& testSet);
+    /** Test if a new package would "fit" in the block */
+    bool TestPackage(uint64_t packageSize, unsigned int packageSigOps);
+    /** Test if a set of transactions are all final */
+    bool TestPackageFinality(const CTxMemPool::setEntries& package);
+    /** Return true if given transaction from mapTx has already been evaluated,
+      * or if the transaction's cached data in mapTx is incorrect. */
+    bool SkipMapTxEntry(CTxMemPool::txiter it, indexed_modified_transaction_set &mapModifiedTx, CTxMemPool::setEntries &failedTx);
+    /** Sort the package in an order that is valid to appear in a block */
+    void SortForBlock(const CTxMemPool::setEntries& package, CTxMemPool::txiter entry, std::vector<CTxMemPool::txiter>& sortedEntries);
+    /** Add descendants of given transactions to mapModifiedTx with ancestor
+      * state updated assuming given transactions are inBlock. */
+    void UpdatePackagesForAdded(const CTxMemPool::setEntries& alreadyAdded, indexed_modified_transaction_set &mapModifiedTx);
 };
 
 /** Modify the extranonce in a block */

From 29fac19c93fabfed4163ee9ffa85f9188c9ee6ac Mon Sep 17 00:00:00 2001
From: Suhas Daftuar <sdaftuar@chaincode.com>
Date: Sat, 20 Feb 2016 20:58:23 -0500
Subject: [PATCH 0492/1802] Add unit tests for ancestor feerate mining

---
 src/test/miner_tests.cpp | 109 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 109 insertions(+)

diff --git a/src/test/miner_tests.cpp b/src/test/miner_tests.cpp
index 3fb7967881bec..ca8d6d2e05baa 100644
--- a/src/test/miner_tests.cpp
+++ b/src/test/miner_tests.cpp
@@ -71,6 +71,113 @@ bool TestSequenceLocks(const CTransaction &tx, int flags)
     return CheckSequenceLocks(tx, flags);
 }
 
+// Test suite for ancestor feerate transaction selection.
+// Implemented as an additional function, rather than a separate test case,
+// to allow reusing the blockchain created in CreateNewBlock_validity.
+// Note that this test assumes blockprioritysize is 0.
+void TestPackageSelection(const CChainParams& chainparams, CScript scriptPubKey, std::vector<CTransaction *>& txFirst)
+{
+    // Test the ancestor feerate transaction selection.
+    TestMemPoolEntryHelper entry;
+
+    // Test that a medium fee transaction will be selected after a higher fee
+    // rate package with a low fee rate parent.
+    CMutableTransaction tx;
+    tx.vin.resize(1);
+    tx.vin[0].scriptSig = CScript() << OP_1;
+    tx.vin[0].prevout.hash = txFirst[0]->GetHash();
+    tx.vin[0].prevout.n = 0;
+    tx.vout.resize(1);
+    tx.vout[0].nValue = 5000000000LL - 1000;
+    // This tx has a low fee: 1000 satoshis
+    uint256 hashParentTx = tx.GetHash(); // save this txid for later use
+    mempool.addUnchecked(hashParentTx, entry.Fee(1000).Time(GetTime()).SpendsCoinbase(true).FromTx(tx));
+
+    // This tx has a medium fee: 10000 satoshis
+    tx.vin[0].prevout.hash = txFirst[1]->GetHash();
+    tx.vout[0].nValue = 5000000000LL - 10000;
+    uint256 hashMediumFeeTx = tx.GetHash();
+    mempool.addUnchecked(hashMediumFeeTx, entry.Fee(10000).Time(GetTime()).SpendsCoinbase(true).FromTx(tx));
+
+    // This tx has a high fee, but depends on the first transaction
+    tx.vin[0].prevout.hash = hashParentTx;
+    tx.vout[0].nValue = 5000000000LL - 1000 - 50000; // 50k satoshi fee
+    uint256 hashHighFeeTx = tx.GetHash();
+    mempool.addUnchecked(hashHighFeeTx, entry.Fee(50000).Time(GetTime()).SpendsCoinbase(false).FromTx(tx));
+
+    CBlockTemplate *pblocktemplate = BlockAssembler(chainparams).CreateNewBlock(scriptPubKey);
+    BOOST_CHECK(pblocktemplate->block.vtx[1].GetHash() == hashParentTx);
+    BOOST_CHECK(pblocktemplate->block.vtx[2].GetHash() == hashHighFeeTx);
+    BOOST_CHECK(pblocktemplate->block.vtx[3].GetHash() == hashMediumFeeTx);
+
+    // Test that a package below the min relay fee doesn't get included
+    tx.vin[0].prevout.hash = hashHighFeeTx;
+    tx.vout[0].nValue = 5000000000LL - 1000 - 50000; // 0 fee
+    uint256 hashFreeTx = tx.GetHash();
+    mempool.addUnchecked(hashFreeTx, entry.Fee(0).FromTx(tx));
+    size_t freeTxSize = ::GetSerializeSize(tx, SER_NETWORK, PROTOCOL_VERSION);
+
+    // Calculate a fee on child transaction that will put the package just
+    // below the min relay fee (assuming 1 child tx of the same size).
+    CAmount feeToUse = minRelayTxFee.GetFee(2*freeTxSize) - 1;
+
+    tx.vin[0].prevout.hash = hashFreeTx;
+    tx.vout[0].nValue = 5000000000LL - 1000 - 50000 - feeToUse;
+    uint256 hashLowFeeTx = tx.GetHash();
+    mempool.addUnchecked(hashLowFeeTx, entry.Fee(feeToUse).FromTx(tx));
+    pblocktemplate = BlockAssembler(chainparams).CreateNewBlock(scriptPubKey);
+    // Verify that the free tx and the low fee tx didn't get selected
+    for (size_t i=0; i<pblocktemplate->block.vtx.size(); ++i) {
+        BOOST_CHECK(pblocktemplate->block.vtx[i].GetHash() != hashFreeTx);
+        BOOST_CHECK(pblocktemplate->block.vtx[i].GetHash() != hashLowFeeTx);
+    }
+
+    // Test that packages above the min relay fee do get included, even if one
+    // of the transactions is below the min relay fee
+    // Remove the low fee transaction and replace with a higher fee transaction
+    std::list<CTransaction> dummy;
+    mempool.removeRecursive(tx, dummy);
+    tx.vout[0].nValue -= 2; // Now we should be just over the min relay fee
+    hashLowFeeTx = tx.GetHash();
+    mempool.addUnchecked(hashLowFeeTx, entry.Fee(feeToUse+2).FromTx(tx));
+    pblocktemplate = BlockAssembler(chainparams).CreateNewBlock(scriptPubKey);
+    BOOST_CHECK(pblocktemplate->block.vtx[4].GetHash() == hashFreeTx);
+    BOOST_CHECK(pblocktemplate->block.vtx[5].GetHash() == hashLowFeeTx);
+
+    // Test that transaction selection properly updates ancestor fee
+    // calculations as ancestor transactions get included in a block.
+    // Add a 0-fee transaction that has 2 outputs.
+    tx.vin[0].prevout.hash = txFirst[2]->GetHash();
+    tx.vout.resize(2);
+    tx.vout[0].nValue = 5000000000LL - 100000000;
+    tx.vout[1].nValue = 100000000; // 1BTC output
+    uint256 hashFreeTx2 = tx.GetHash();
+    mempool.addUnchecked(hashFreeTx2, entry.Fee(0).SpendsCoinbase(true).FromTx(tx));
+
+    // This tx can't be mined by itself
+    tx.vin[0].prevout.hash = hashFreeTx2;
+    tx.vout.resize(1);
+    feeToUse = minRelayTxFee.GetFee(freeTxSize);
+    tx.vout[0].nValue = 5000000000LL - 100000000 - feeToUse;
+    uint256 hashLowFeeTx2 = tx.GetHash();
+    mempool.addUnchecked(hashLowFeeTx2, entry.Fee(feeToUse).SpendsCoinbase(false).FromTx(tx));
+    pblocktemplate = BlockAssembler(chainparams).CreateNewBlock(scriptPubKey);
+
+    // Verify that this tx isn't selected.
+    for (size_t i=0; i<pblocktemplate->block.vtx.size(); ++i) {
+        BOOST_CHECK(pblocktemplate->block.vtx[i].GetHash() != hashFreeTx2);
+        BOOST_CHECK(pblocktemplate->block.vtx[i].GetHash() != hashLowFeeTx2);
+    }
+
+    // This tx will be mineable, and should cause hashLowFeeTx2 to be selected
+    // as well.
+    tx.vin[0].prevout.n = 1;
+    tx.vout[0].nValue = 100000000 - 10000; // 10k satoshi fee
+    mempool.addUnchecked(tx.GetHash(), entry.Fee(10000).FromTx(tx));
+    pblocktemplate = BlockAssembler(chainparams).CreateNewBlock(scriptPubKey);
+    BOOST_CHECK(pblocktemplate->block.vtx[8].GetHash() == hashLowFeeTx2);
+}
+
 // NOTE: These tests rely on CreateNewBlock doing its own self-validation!
 BOOST_AUTO_TEST_CASE(CreateNewBlock_validity)
 {
@@ -385,6 +492,8 @@ BOOST_AUTO_TEST_CASE(CreateNewBlock_validity)
     SetMockTime(0);
     mempool.clear();
 
+    TestPackageSelection(chainparams, scriptPubKey, txFirst);
+
     BOOST_FOREACH(CTransaction *_tx, txFirst)
         delete _tx;
 

From f25209a3e1e6488d4d44de15b0f113d2302e9aee Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Thu, 9 Jun 2016 12:30:38 -0400
Subject: [PATCH 0493/1802] depends: bump OSX toolchain

clang: 3.7.1
cctools: 877.8
ld64: 253.9
---
 depends/hosts/darwin.mk            |  4 ++--
 depends/packages/native_cctools.mk | 20 +++++++++++---------
 depends/packages/qt.mk             |  1 +
 3 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/depends/hosts/darwin.mk b/depends/hosts/darwin.mk
index dbe6d00795e00..985649619ffec 100644
--- a/depends/hosts/darwin.mk
+++ b/depends/hosts/darwin.mk
@@ -1,7 +1,7 @@
 OSX_MIN_VERSION=10.7
-OSX_SDK_VERSION=10.9
+OSX_SDK_VERSION=10.11
 OSX_SDK=$(SDK_PATH)/MacOSX$(OSX_SDK_VERSION).sdk
-LD64_VERSION=241.9
+LD64_VERSION=253.9
 darwin_CC=clang -target $(host) -mmacosx-version-min=$(OSX_MIN_VERSION) --sysroot $(OSX_SDK) -mlinker-version=$(LD64_VERSION)
 darwin_CXX=clang++ -target $(host) -mmacosx-version-min=$(OSX_MIN_VERSION) --sysroot $(OSX_SDK) -mlinker-version=$(LD64_VERSION) -stdlib=libc++
 
diff --git a/depends/packages/native_cctools.mk b/depends/packages/native_cctools.mk
index b5603a8d48c60..797480c25eb2f 100644
--- a/depends/packages/native_cctools.mk
+++ b/depends/packages/native_cctools.mk
@@ -1,14 +1,14 @@
 package=native_cctools
-$(package)_version=ee31ae567931c426136c94aad457c7b51d844beb
+$(package)_version=807d6fd1be5d2224872e381870c0a75387fe05e6
 $(package)_download_path=https://github.com/theuni/cctools-port/archive
 $(package)_file_name=$($(package)_version).tar.gz
-$(package)_sha256_hash=ef107e6ab1b3994cb22e14f4f5c59ea0c0b5a988e6b21d42ed9616b018bbcbf9
+$(package)_sha256_hash=a09c9ba4684670a0375e42d9d67e7f12c1f62581a27f28f7c825d6d7032ccc6a
 $(package)_build_subdir=cctools
-$(package)_clang_version=3.3
+$(package)_clang_version=3.7.1
 $(package)_clang_download_path=http://llvm.org/releases/$($(package)_clang_version)
-$(package)_clang_download_file=clang+llvm-$($(package)_clang_version)-amd64-Ubuntu-12.04.2.tar.gz
-$(package)_clang_file_name=clang-llvm-$($(package)_clang_version)-amd64-Ubuntu-12.04.2.tar.gz
-$(package)_clang_sha256_hash=60d8f69f032d62ef61bf527857ebb933741ec3352d4d328c5516aa520662dab7
+$(package)_clang_download_file=clang+llvm-$($(package)_clang_version)-x86_64-linux-gnu-ubuntu-14.04.tar.xz
+$(package)_clang_file_name=clang-llvm-$($(package)_clang_version)-x86_64-linux-gnu-ubuntu-14.04.tar.xz
+$(package)_clang_sha256_hash=99b28a6b48e793705228a390471991386daa33a9717cd9ca007fcdde69608fd9
 $(package)_extra_sources=$($(package)_clang_file_name)
 
 define $(package)_fetch_cmds
@@ -23,6 +23,7 @@ define $(package)_extract_cmds
   $(build_SHA256SUM) -c $($(package)_extract_dir)/.$($(package)_file_name).hash && \
   mkdir -p toolchain/bin toolchain/lib/clang/3.5/include && \
   tar --strip-components=1 -C toolchain -xf $($(package)_source_dir)/$($(package)_clang_file_name) && \
+  rm -f toolchain/lib/libc++abi.so* && \
   echo "#!/bin/sh" > toolchain/bin/$(host)-dsymutil && \
   echo "exit 0" >> toolchain/bin/$(host)-dsymutil && \
   chmod +x toolchain/bin/$(host)-dsymutil && \
@@ -30,7 +31,7 @@ define $(package)_extract_cmds
 endef
 
 define $(package)_set_vars
-$(package)_config_opts=--target=$(host) --disable-libuuid
+$(package)_config_opts=--target=$(host) --disable-lto-support
 $(package)_ldflags+=-Wl,-rpath=\\$$$$$$$$\$$$$$$$$ORIGIN/../lib
 $(package)_cc=$($(package)_extract_dir)/toolchain/bin/clang
 $(package)_cxx=$($(package)_extract_dir)/toolchain/bin/clang++
@@ -53,10 +54,11 @@ define $(package)_stage_cmds
   cd $($(package)_extract_dir)/toolchain && \
   mkdir -p $($(package)_staging_prefix_dir)/lib/clang/$($(package)_clang_version)/include && \
   mkdir -p $($(package)_staging_prefix_dir)/bin $($(package)_staging_prefix_dir)/include && \
-  cp -P bin/clang bin/clang++ $($(package)_staging_prefix_dir)/bin/ &&\
+  cp bin/clang $($(package)_staging_prefix_dir)/bin/ &&\
+  cp -P bin/clang++ $($(package)_staging_prefix_dir)/bin/ &&\
   cp lib/libLTO.so $($(package)_staging_prefix_dir)/lib/ && \
   cp -rf lib/clang/$($(package)_clang_version)/include/* $($(package)_staging_prefix_dir)/lib/clang/$($(package)_clang_version)/include/ && \
-  cp bin/$(host)-dsymutil $($(package)_staging_prefix_dir)/bin && \
+  cp bin/llvm-dsymutil $($(package)_staging_prefix_dir)/bin/$(host)-dsymutil && \
   if `test -d include/c++/`; then cp -rf include/c++/ $($(package)_staging_prefix_dir)/include/; fi && \
   if `test -d lib/c++/`; then cp -rf lib/c++/ $($(package)_staging_prefix_dir)/lib/; fi
 endef
diff --git a/depends/packages/qt.mk b/depends/packages/qt.mk
index c1fc8e3058e9e..a8d3439965449 100644
--- a/depends/packages/qt.mk
+++ b/depends/packages/qt.mk
@@ -124,6 +124,7 @@ define $(package)_preprocess_cmds
   sed -i.old "s/src_plugins.depends = src_sql src_xml src_network/src_plugins.depends = src_xml src_network/" qtbase/src/src.pro && \
   sed -i.old "s|X11/extensions/XIproto.h|X11/X.h|" qtbase/src/plugins/platforms/xcb/qxcbxsettings.cpp && \
   sed -i.old 's/if \[ "$$$$XPLATFORM_MAC" = "yes" \]; then xspecvals=$$$$(macSDKify/if \[ "$$$$BUILD_ON_MAC" = "yes" \]; then xspecvals=$$$$(macSDKify/' qtbase/configure && \
+  sed -i.old 's/CGEventCreateMouseEvent(0, kCGEventMouseMoved, pos, 0)/CGEventCreateMouseEvent(0, kCGEventMouseMoved, pos, kCGMouseButtonLeft)/' qtbase/src/plugins/platforms/cocoa/qcocoacursor.mm && \
   mkdir -p qtbase/mkspecs/macx-clang-linux &&\
   cp -f qtbase/mkspecs/macx-clang/Info.plist.lib qtbase/mkspecs/macx-clang-linux/ &&\
   cp -f qtbase/mkspecs/macx-clang/Info.plist.app qtbase/mkspecs/macx-clang-linux/ &&\

From f6eb4e2b62d9c01ae32cf5a742dd86a594849343 Mon Sep 17 00:00:00 2001
From: fanquake <fanquake@gmail.com>
Date: Sat, 14 May 2016 16:38:44 +0800
Subject: [PATCH 0494/1802] [depends] OpenSSL 1.0.1k - update config_opts

---
 depends/packages/openssl.mk | 39 ++++++++++++++++++++++++++++++++++---
 1 file changed, 36 insertions(+), 3 deletions(-)

diff --git a/depends/packages/openssl.mk b/depends/packages/openssl.mk
index c6452820a2de8..5ee9f17a63235 100644
--- a/depends/packages/openssl.mk
+++ b/depends/packages/openssl.mk
@@ -6,9 +6,42 @@ $(package)_sha256_hash=8f9faeaebad088e772f4ef5e38252d472be4d878c6b3a2718c10a4fce
 
 define $(package)_set_vars
 $(package)_config_env=AR="$($(package)_ar)" RANLIB="$($(package)_ranlib)" CC="$($(package)_cc)"
-$(package)_config_opts=--prefix=$(host_prefix) --openssldir=$(host_prefix)/etc/openssl no-zlib no-shared no-dso
-$(package)_config_opts+=no-krb5 no-camellia no-capieng no-cast no-cms no-dtls1 no-gost no-gmp no-heartbeats no-idea no-jpake no-md2
-$(package)_config_opts+=no-mdc2 no-rc5 no-rdrand no-rfc3779 no-rsax no-sctp no-seed no-sha0 no-static_engine no-whirlpool no-rc2 no-rc4 no-ssl2 no-ssl3
+$(package)_config_opts=--prefix=$(host_prefix) --openssldir=$(host_prefix)/etc/openssl
+$(package)_config_opts+=no-camellia
+$(package)_config_opts+=no-capieng
+$(package)_config_opts+=no-cast
+$(package)_config_opts+=no-comp
+$(package)_config_opts+=no-dso
+$(package)_config_opts+=no-dtls1
+$(package)_config_opts+=no-ec_nistp_64_gcc_128
+$(package)_config_opts+=no-gost
+$(package)_config_opts+=no-gmp
+$(package)_config_opts+=no-heartbeats
+$(package)_config_opts+=no-idea
+$(package)_config_opts+=no-jpake
+$(package)_config_opts+=no-krb5
+$(package)_config_opts+=no-libunbound
+$(package)_config_opts+=no-md2
+$(package)_config_opts+=no-mdc2
+$(package)_config_opts+=no-rc4
+$(package)_config_opts+=no-rc5
+$(package)_config_opts+=no-rdrand
+$(package)_config_opts+=no-rfc3779
+$(package)_config_opts+=no-rsax
+$(package)_config_opts+=no-sctp
+$(package)_config_opts+=no-seed
+$(package)_config_opts+=no-sha0
+$(package)_config_opts+=no-shared
+$(package)_config_opts+=no-ssl-trace
+$(package)_config_opts+=no-ssl2
+$(package)_config_opts+=no-ssl3
+$(package)_config_opts+=no-static_engine
+$(package)_config_opts+=no-store
+$(package)_config_opts+=no-unit-test
+$(package)_config_opts+=no-weak-ssl-ciphers
+$(package)_config_opts+=no-whirlpool
+$(package)_config_opts+=no-zlib
+$(package)_config_opts+=no-zlib-dynamic
 $(package)_config_opts+=$($(package)_cflags) $($(package)_cppflags)
 $(package)_config_opts_linux=-fPIC -Wa,--noexecstack
 $(package)_config_opts_x86_64_linux=linux-x86_64

From faa91b12f774d7f459e47f440b7e9fe173d72bb0 Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Tue, 7 Jun 2016 11:22:21 +0200
Subject: [PATCH 0495/1802] [wallet] tests: Don't use floating point

---
 src/wallet/test/wallet_tests.cpp | 46 +++++++++++++++++---------------
 1 file changed, 25 insertions(+), 21 deletions(-)

diff --git a/src/wallet/test/wallet_tests.cpp b/src/wallet/test/wallet_tests.cpp
index 387b223589340..0a4f06ba88175 100644
--- a/src/wallet/test/wallet_tests.cpp
+++ b/src/wallet/test/wallet_tests.cpp
@@ -27,7 +27,7 @@ typedef set<pair<const CWalletTx*,unsigned int> > CoinSet;
 
 BOOST_FIXTURE_TEST_SUITE(wallet_tests, WalletTestingSetup)
 
-static CWallet wallet;
+static const CWallet wallet;
 static vector<COutput> vCoins;
 
 static void add_coin(const CAmount& nValue, int nAge = 6*24, bool fIsFromMe = false, int nInput=0)
@@ -188,11 +188,11 @@ BOOST_AUTO_TEST_CASE(coin_selection_tests)
         // empty the wallet and start again, now with fractions of a cent, to test small change avoidance
 
         empty_wallet();
-        add_coin(0.1*MIN_CHANGE);
-        add_coin(0.2*MIN_CHANGE);
-        add_coin(0.3*MIN_CHANGE);
-        add_coin(0.4*MIN_CHANGE);
-        add_coin(0.5*MIN_CHANGE);
+        add_coin(MIN_CHANGE * 1 / 10);
+        add_coin(MIN_CHANGE * 2 / 10);
+        add_coin(MIN_CHANGE * 3 / 10);
+        add_coin(MIN_CHANGE * 4 / 10);
+        add_coin(MIN_CHANGE * 5 / 10);
 
         // try making 1 * MIN_CHANGE from the 1.5 * MIN_CHANGE
         // we'll get change smaller than MIN_CHANGE whatever happens, so can expect MIN_CHANGE exactly
@@ -207,8 +207,8 @@ BOOST_AUTO_TEST_CASE(coin_selection_tests)
         BOOST_CHECK_EQUAL(nValueRet, 1 * MIN_CHANGE); // we should get the exact amount
 
         // if we add more small coins:
-        add_coin(0.6*MIN_CHANGE);
-        add_coin(0.7*MIN_CHANGE);
+        add_coin(MIN_CHANGE * 6 / 10);
+        add_coin(MIN_CHANGE * 7 / 10);
 
         // and try again to make 1.0 * MIN_CHANGE
         BOOST_CHECK( wallet.SelectCoinsMinConf(1 * MIN_CHANGE, 1, 1, vCoins, setCoinsRet, nValueRet));
@@ -229,9 +229,9 @@ BOOST_AUTO_TEST_CASE(coin_selection_tests)
 
         // sometimes it will fail, and so we use the next biggest coin:
         empty_wallet();
-        add_coin(0.5 * MIN_CHANGE);
-        add_coin(0.6 * MIN_CHANGE);
-        add_coin(0.7 * MIN_CHANGE);
+        add_coin(MIN_CHANGE * 5 / 10);
+        add_coin(MIN_CHANGE * 6 / 10);
+        add_coin(MIN_CHANGE * 7 / 10);
         add_coin(1111 * MIN_CHANGE);
         BOOST_CHECK( wallet.SelectCoinsMinConf(1 * MIN_CHANGE, 1, 1, vCoins, setCoinsRet, nValueRet));
         BOOST_CHECK_EQUAL(nValueRet, 1111 * MIN_CHANGE); // we get the bigger coin
@@ -239,9 +239,9 @@ BOOST_AUTO_TEST_CASE(coin_selection_tests)
 
         // but sometimes it's possible, and we use an exact subset (0.4 + 0.6 = 1.0)
         empty_wallet();
-        add_coin(0.4 * MIN_CHANGE);
-        add_coin(0.6 * MIN_CHANGE);
-        add_coin(0.8 * MIN_CHANGE);
+        add_coin(MIN_CHANGE * 4 / 10);
+        add_coin(MIN_CHANGE * 6 / 10);
+        add_coin(MIN_CHANGE * 8 / 10);
         add_coin(1111 * MIN_CHANGE);
         BOOST_CHECK( wallet.SelectCoinsMinConf(MIN_CHANGE, 1, 1, vCoins, setCoinsRet, nValueRet));
         BOOST_CHECK_EQUAL(nValueRet, MIN_CHANGE);   // we should get the exact amount
@@ -249,17 +249,17 @@ BOOST_AUTO_TEST_CASE(coin_selection_tests)
 
         // test avoiding small change
         empty_wallet();
-        add_coin(0.05 * MIN_CHANGE);
-        add_coin(1    * MIN_CHANGE);
-        add_coin(100  * MIN_CHANGE);
+        add_coin(MIN_CHANGE * 5 / 100);
+        add_coin(MIN_CHANGE * 1);
+        add_coin(MIN_CHANGE * 100);
 
         // trying to make 100.01 from these three coins
-        BOOST_CHECK( wallet.SelectCoinsMinConf(100.01 * MIN_CHANGE, 1, 1, vCoins, setCoinsRet, nValueRet));
-        BOOST_CHECK_EQUAL(nValueRet, 101.05 * MIN_CHANGE);   // we should get all coins
+        BOOST_CHECK(wallet.SelectCoinsMinConf(MIN_CHANGE * 10001 / 100, 1, 1, vCoins, setCoinsRet, nValueRet));
+        BOOST_CHECK_EQUAL(nValueRet, MIN_CHANGE * 10105 / 100); // we should get all coins
         BOOST_CHECK_EQUAL(setCoinsRet.size(), 3U);
 
         // but if we try to make 99.9, we should take the bigger of the two small coins to avoid small change
-        BOOST_CHECK( wallet.SelectCoinsMinConf(99.9 * MIN_CHANGE, 1, 1, vCoins, setCoinsRet, nValueRet));
+        BOOST_CHECK(wallet.SelectCoinsMinConf(MIN_CHANGE * 9990 / 100, 1, 1, vCoins, setCoinsRet, nValueRet));
         BOOST_CHECK_EQUAL(nValueRet, 101 * MIN_CHANGE);
         BOOST_CHECK_EQUAL(setCoinsRet.size(), 2U);
 
@@ -310,7 +310,11 @@ BOOST_AUTO_TEST_CASE(coin_selection_tests)
             // add 75 cents in small change.  not enough to make 90 cents,
             // then try making 90 cents.  there are multiple competing "smallest bigger" coins,
             // one of which should be picked at random
-            add_coin( 5*CENT); add_coin(10*CENT); add_coin(15*CENT); add_coin(20*CENT); add_coin(25*CENT);
+            add_coin(5 * CENT);
+            add_coin(10 * CENT);
+            add_coin(15 * CENT);
+            add_coin(20 * CENT);
+            add_coin(25 * CENT);
 
             fails = 0;
             for (int i = 0; i < RANDOM_REPEATS; i++)

From facb6c0bf8a6ef7081d763d9f33b446276a36635 Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Sun, 22 May 2016 11:37:42 +0200
Subject: [PATCH 0496/1802] [qa] mininode: fail on send_message instead of
 silent return

---
 qa/rpc-tests/test_framework/mininode.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qa/rpc-tests/test_framework/mininode.py b/qa/rpc-tests/test_framework/mininode.py
index c0b59f38579d7..6612b99b84234 100755
--- a/qa/rpc-tests/test_framework/mininode.py
+++ b/qa/rpc-tests/test_framework/mininode.py
@@ -1315,7 +1315,7 @@ def got_data(self):
 
     def send_message(self, message, pushbuf=False):
         if self.state != "connected" and not pushbuf:
-            return
+            raise IOError('Not connected, no pushbuf')
         self.show_debug_msg("Send %s" % repr(message))
         command = message.command
         data = message.serialize()

From fa8ce3b670dd9376d2c13722670b9cc8012011ca Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Sat, 16 Apr 2016 19:11:39 +0200
Subject: [PATCH 0497/1802] [qa] assert 'changePosition out of bounds'

---
 qa/rpc-tests/fundrawtransaction.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/qa/rpc-tests/fundrawtransaction.py b/qa/rpc-tests/fundrawtransaction.py
index 228574e671803..3dfb9e4024f2a 100755
--- a/qa/rpc-tests/fundrawtransaction.py
+++ b/qa/rpc-tests/fundrawtransaction.py
@@ -247,6 +247,12 @@ def run_test(self):
         assert_equal(utx['txid'], dec_tx['vin'][0]['txid'])
 
         change = self.nodes[2].getnewaddress()
+        try:
+            rawtxfund = self.nodes[2].fundrawtransaction(rawtx, {'changeAddress': change, 'changePosition': 2})
+        except JSONRPCException as e:
+            assert('changePosition out of bounds' == e.error['message'])
+        else:
+            assert(False)
         rawtxfund = self.nodes[2].fundrawtransaction(rawtx, {'changeAddress': change, 'changePosition': 0})
         dec_tx  = self.nodes[2].decoderawtransaction(rawtxfund['hex'])
         out = dec_tx['vout'][0];

From fa324653ab7a44a89d6a692ce8f953ded8501e17 Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Sat, 16 Apr 2016 18:36:39 +0200
Subject: [PATCH 0498/1802] [qa] fundrawtransaction: Create get_unspent()

---
 qa/rpc-tests/fundrawtransaction.py | 93 ++++++------------------------
 1 file changed, 19 insertions(+), 74 deletions(-)

diff --git a/qa/rpc-tests/fundrawtransaction.py b/qa/rpc-tests/fundrawtransaction.py
index 3dfb9e4024f2a..eeb8476634fcb 100755
--- a/qa/rpc-tests/fundrawtransaction.py
+++ b/qa/rpc-tests/fundrawtransaction.py
@@ -6,7 +6,14 @@
 from test_framework.test_framework import BitcoinTestFramework
 from test_framework.util import *
 
-# Create one-input, one-output, no-fee transaction:
+
+def get_unspent(listunspent, amount):
+    for utx in listunspent:
+        if utx['amount'] == amount:
+            return utx
+    raise AssertionError('Could not find unspent with amount={}'.format(amount))
+
+
 class RawTransactionsTest(BitcoinTestFramework):
 
     def __init__(self):
@@ -71,7 +78,7 @@ def run_test(self):
         rawtxfund = self.nodes[2].fundrawtransaction(rawtx)
         fee = rawtxfund['fee']
         dec_tx  = self.nodes[2].decoderawtransaction(rawtxfund['hex'])
-        assert(len(dec_tx['vin']) > 0) #test if we have enought inputs
+        assert(len(dec_tx['vin']) > 0) #test that we have enough inputs
 
         ##############################
         # simple test with two coins #
@@ -123,14 +130,7 @@ def run_test(self):
         #########################################################################
         # test a fundrawtransaction with a VIN greater than the required amount #
         #########################################################################
-        utx = False
-        listunspent = self.nodes[2].listunspent()
-        for aUtx in listunspent:
-            if aUtx['amount'] == 5.0:
-                utx = aUtx
-                break
-
-        assert(utx!=False)
+        utx = get_unspent(self.nodes[2].listunspent(), 5)
 
         inputs  = [ {'txid' : utx['txid'], 'vout' : utx['vout']}]
         outputs = { self.nodes[0].getnewaddress() : 1.0 }
@@ -151,14 +151,7 @@ def run_test(self):
         #####################################################################
         # test a fundrawtransaction with which will not get a change output #
         #####################################################################
-        utx = False
-        listunspent = self.nodes[2].listunspent()
-        for aUtx in listunspent:
-            if aUtx['amount'] == 5.0:
-                utx = aUtx
-                break
-
-        assert(utx!=False)
+        utx = get_unspent(self.nodes[2].listunspent(), 5)
 
         inputs  = [ {'txid' : utx['txid'], 'vout' : utx['vout']}]
         outputs = { self.nodes[0].getnewaddress() : Decimal(5.0) - fee - feeTolerance }
@@ -180,14 +173,7 @@ def run_test(self):
         ####################################################
         # test a fundrawtransaction with an invalid option #
         ####################################################
-        utx = False
-        listunspent = self.nodes[2].listunspent()
-        for aUtx in listunspent:
-            if aUtx['amount'] == 5.0:
-                utx = aUtx
-                break
-
-        assert_equal(utx!=False, True)
+        utx = get_unspent(self.nodes[2].listunspent(), 5)
 
         inputs  = [ {'txid' : utx['txid'], 'vout' : utx['vout']} ]
         outputs = { self.nodes[0].getnewaddress() : Decimal(4.0) }
@@ -205,14 +191,7 @@ def run_test(self):
         ############################################################
         # test a fundrawtransaction with an invalid change address #
         ############################################################
-        utx = False
-        listunspent = self.nodes[2].listunspent()
-        for aUtx in listunspent:
-            if aUtx['amount'] == 5.0:
-                utx = aUtx
-                break
-
-        assert_equal(utx!=False, True)
+        utx = get_unspent(self.nodes[2].listunspent(), 5)
 
         inputs  = [ {'txid' : utx['txid'], 'vout' : utx['vout']} ]
         outputs = { self.nodes[0].getnewaddress() : Decimal(4.0) }
@@ -227,18 +206,10 @@ def run_test(self):
             assert("changeAddress must be a valid bitcoin address" in e.error['message'])
 
 
-
         ############################################################
         # test a fundrawtransaction with a provided change address #
         ############################################################
-        utx = False
-        listunspent = self.nodes[2].listunspent()
-        for aUtx in listunspent:
-            if aUtx['amount'] == 5.0:
-                utx = aUtx
-                break
-
-        assert_equal(utx!=False, True)
+        utx = get_unspent(self.nodes[2].listunspent(), 5)
 
         inputs  = [ {'txid' : utx['txid'], 'vout' : utx['vout']} ]
         outputs = { self.nodes[0].getnewaddress() : Decimal(4.0) }
@@ -259,18 +230,10 @@ def run_test(self):
         assert_equal(change, out['scriptPubKey']['addresses'][0])
 
 
-
         #########################################################################
         # test a fundrawtransaction with a VIN smaller than the required amount #
         #########################################################################
-        utx = False
-        listunspent = self.nodes[2].listunspent()
-        for aUtx in listunspent:
-            if aUtx['amount'] == 1.0:
-                utx = aUtx
-                break
-
-        assert(utx!=False)
+        utx = get_unspent(self.nodes[2].listunspent(), 1)
 
         inputs  = [ {'txid' : utx['txid'], 'vout' : utx['vout']}]
         outputs = { self.nodes[0].getnewaddress() : 1.0 }
@@ -305,17 +268,8 @@ def run_test(self):
         ###########################################
         # test a fundrawtransaction with two VINs #
         ###########################################
-        utx  = False
-        utx2 = False
-        listunspent = self.nodes[2].listunspent()
-        for aUtx in listunspent:
-            if aUtx['amount'] == 1.0:
-                utx = aUtx
-            if aUtx['amount'] == 5.0:
-                utx2 = aUtx
-
-
-        assert(utx!=False)
+        utx = get_unspent(self.nodes[2].listunspent(), 1)
+        utx2 = get_unspent(self.nodes[2].listunspent(), 5)
 
         inputs  = [ {'txid' : utx['txid'], 'vout' : utx['vout']},{'txid' : utx2['txid'], 'vout' : utx2['vout']} ]
         outputs = { self.nodes[0].getnewaddress() : 6.0 }
@@ -347,17 +301,8 @@ def run_test(self):
         #########################################################
         # test a fundrawtransaction with two VINs and two vOUTs #
         #########################################################
-        utx  = False
-        utx2 = False
-        listunspent = self.nodes[2].listunspent()
-        for aUtx in listunspent:
-            if aUtx['amount'] == 1.0:
-                utx = aUtx
-            if aUtx['amount'] == 5.0:
-                utx2 = aUtx
-
-
-        assert(utx!=False)
+        utx = get_unspent(self.nodes[2].listunspent(), 1)
+        utx2 = get_unspent(self.nodes[2].listunspent(), 5)
 
         inputs  = [ {'txid' : utx['txid'], 'vout' : utx['vout']},{'txid' : utx2['txid'], 'vout' : utx2['vout']} ]
         outputs = { self.nodes[0].getnewaddress() : 6.0, self.nodes[0].getnewaddress() : 1.0 }

From fa3b3792522681207b3619edec5f3175be6fc841 Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Mon, 9 May 2016 21:29:18 +0200
Subject: [PATCH 0499/1802] [qa] pull-tester: Fix assertion and check for
 run_parallel

---
 qa/pull-tester/rpc-tests.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/qa/pull-tester/rpc-tests.py b/qa/pull-tester/rpc-tests.py
index 57a576f1c7bf0..98823085034af 100755
--- a/qa/pull-tester/rpc-tests.py
+++ b/qa/pull-tester/rpc-tests.py
@@ -191,7 +191,7 @@ def runtests():
     if coverage:
         flags.append(coverage.flag)
 
-    if len(test_list) > 1:
+    if len(test_list) > 1 and run_parallel > 1:
         # Populate cache
         subprocess.check_output([RPC_TESTS_DIR + 'create_cache.py'] + flags)
 
@@ -251,7 +251,7 @@ def get_next(self):
                                                stdout=subprocess.PIPE,
                                                stderr=subprocess.PIPE)))
         if not self.jobs:
-            raise IndexError('%s from empty list' % __name__)
+            raise IndexError('pop from empty list')
         while True:
             # Return first proc that finishes
             time.sleep(.5)

From 6194d9a501901f9fa7b20d2a4c34b31357a6441d Mon Sep 17 00:00:00 2001
From: Jonas Schnelli <dev@jonasschnelli.ch>
Date: Thu, 16 Jun 2016 11:29:44 +0200
Subject: [PATCH 0500/1802] Fix bitcoin_qt.m4 and fix-xcb-include-order.patch

---
 .travis.yml                                   |  2 +-
 build-aux/m4/bitcoin_qt.m4                    |  2 +
 contrib/devtools/symbol-check.py              |  1 +
 contrib/gitian-descriptors/gitian-osx.yml     |  4 +-
 depends/packages/qt.mk                        | 84 ++++++++++---------
 .../patches/qt/fix-xcb-include-order.patch    | 28 ++++---
 depends/patches/qt/fix_qt_pkgconfig.patch     | 11 +++
 7 files changed, 77 insertions(+), 55 deletions(-)
 create mode 100644 depends/patches/qt/fix_qt_pkgconfig.patch

diff --git a/.travis.yml b/.travis.yml
index 64227ac2a883b..a6c51753b6727 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -39,7 +39,7 @@ env:
 # No wallet
     - HOST=x86_64-unknown-linux-gnu PACKAGES=" openjdk-7-jre-headless python3" DEP_OPTS="NO_WALLET=1" RUN_TESTS=true GOAL="install" BITCOIN_CONFIG="--enable-glibc-back-compat --enable-reduce-exports"
 # Cross-Mac
-    - HOST=x86_64-apple-darwin11 PACKAGES="cmake imagemagick libcap-dev librsvg2-bin libz-dev libbz2-dev libtiff-tools python-dev" BITCOIN_CONFIG="--enable-reduce-exports" OSX_SDK=10.9 GOAL="deploy"
+    - HOST=x86_64-apple-darwin11 PACKAGES="cmake imagemagick libcap-dev librsvg2-bin libz-dev libbz2-dev libtiff-tools python-dev" BITCOIN_CONFIG="--enable-reduce-exports" OSX_SDK=10.11 GOAL="deploy"
 
 before_install:
     - export PATH=$(echo $PATH | tr ':' "\n" | sed '/\/opt\/python/d' | tr "\n" ":" | sed "s|::|:|g")
diff --git a/build-aux/m4/bitcoin_qt.m4 b/build-aux/m4/bitcoin_qt.m4
index efffa4887d611..210df3c025d0b 100644
--- a/build-aux/m4/bitcoin_qt.m4
+++ b/build-aux/m4/bitcoin_qt.m4
@@ -342,6 +342,8 @@ AC_DEFUN([_BITCOIN_QT_FIND_STATIC_PLUGINS],[
        elif test x$TARGET_OS = xdarwin; then
          PKG_CHECK_MODULES([QTPRINT], [Qt5PrintSupport], [QT_LIBS="$QTPRINT_LIBS $QT_LIBS"])
        fi
+     else
+       QT_LIBS="-lQt5PlatformSupport $QT_LIBS"
      fi
      ])
   else
diff --git a/contrib/devtools/symbol-check.py b/contrib/devtools/symbol-check.py
index e26c0fbb94455..037b34212151e 100755
--- a/contrib/devtools/symbol-check.py
+++ b/contrib/devtools/symbol-check.py
@@ -68,6 +68,7 @@
 b'libxcb.so.1', # part of X11
 b'libfontconfig.so.1', # font support
 b'libfreetype.so.6', # font parsing
+b'libdbus-1.so.3', # inter process communication (notification system)
 b'libdl.so.2' # programming interface to dynamic linker
 }
 
diff --git a/contrib/gitian-descriptors/gitian-osx.yml b/contrib/gitian-descriptors/gitian-osx.yml
index 536fcfb105d53..991976d59eaa0 100644
--- a/contrib/gitian-descriptors/gitian-osx.yml
+++ b/contrib/gitian-descriptors/gitian-osx.yml
@@ -31,7 +31,7 @@ remotes:
 - "url": "https://github.com/bitcoin/bitcoin.git"
   "dir": "bitcoin"
 files:
-- "MacOSX10.9.sdk.tar.gz"
+- "MacOSX10.11.sdk.tar.gz"
 script: |
   WRAP_DIR=$HOME/wrapped
   HOSTS="x86_64-apple-darwin11"
@@ -87,7 +87,7 @@ script: |
   BASEPREFIX=`pwd`/depends
 
   mkdir -p ${BASEPREFIX}/SDKs
-  tar -C ${BASEPREFIX}/SDKs -xf ${BUILD_DIR}/MacOSX10.9.sdk.tar.gz
+  tar -C ${BASEPREFIX}/SDKs -xf ${BUILD_DIR}/MacOSX10.11.sdk.tar.gz
 
   # Build dependencies for each host
   for i in $HOSTS; do
diff --git a/depends/packages/qt.mk b/depends/packages/qt.mk
index a8d3439965449..c452823a9552e 100644
--- a/depends/packages/qt.mk
+++ b/depends/packages/qt.mk
@@ -1,20 +1,21 @@
 PACKAGE=qt
-$(package)_version=5.5.0
-$(package)_download_path=http://download.qt.io/official_releases/qt/5.5/$($(package)_version)/submodules
+$(package)_version=5.6.1
+$(package)_download_path=http://download.qt.io/official_releases/qt/5.6/$($(package)_version)/submodules
 $(package)_suffix=opensource-src-$($(package)_version).tar.gz
 $(package)_file_name=qtbase-$($(package)_suffix)
-$(package)_sha256_hash=7e82b1318f88e56a2a9376e069aa608d4fd96b48cb0e1b880ae658b0a1af0561
+$(package)_sha256_hash=0ac67cf8d66d52b995f96c31c4b48117a1afb3db99eaa93e20ccd8f7f55f7fde
 $(package)_dependencies=openssl
 $(package)_linux_dependencies=freetype fontconfig dbus libxcb libX11 xproto libXext
 $(package)_build_subdir=qtbase
 $(package)_qt_libs=corelib network widgets gui plugins testlib
-$(package)_patches=mac-qmake.conf fix-xcb-include-order.patch mingw-uuidof.patch pidlist_absolute.patch
+$(package)_patches=mac-qmake.conf mingw-uuidof.patch pidlist_absolute.patch fix-xcb-include-order.patch fix_qt_pkgconfig.patch
 
 $(package)_qttranslations_file_name=qttranslations-$($(package)_suffix)
-$(package)_qttranslations_sha256_hash=c4bd6db6e426965c6f8824c54e81f68bbd61e2bae1bcadc328c6e81c45902a0d
+$(package)_qttranslations_sha256_hash=dcc1534d247babca1840cb6d0a000671801a341ea352d0535474f86adadaf028
+
 
 $(package)_qttools_file_name=qttools-$($(package)_suffix)
-$(package)_qttools_sha256_hash=d9e06bd19ecc86afba5e95d45a906d1bc1ad579aa70001e36143c1aaf695bdd6
+$(package)_qttools_sha256_hash=e0f845de28c31230dfa428f0190ccb3b91d1fc02481b1f064698ae4ef8376aa1
 
 $(package)_extra_sources  = $($(package)_qttranslations_file_name)
 $(package)_extra_sources += $($(package)_qttools_file_name)
@@ -22,21 +23,33 @@ $(package)_extra_sources += $($(package)_qttools_file_name)
 define $(package)_set_vars
 $(package)_config_opts_release = -release
 $(package)_config_opts_debug   = -debug
-$(package)_config_opts += -opensource -confirm-license
+$(package)_config_opts += -bindir $(build_prefix)/bin
+$(package)_config_opts += -c++11
+$(package)_config_opts += -confirm-license
+$(package)_config_opts += -hostprefix $(build_prefix)
+$(package)_config_opts += -no-alsa
 $(package)_config_opts += -no-audio-backend
+$(package)_config_opts += -no-cups
+$(package)_config_opts += -no-egl
+$(package)_config_opts += -no-eglfs
+$(package)_config_opts += -no-feature-style-windowsmobile
+$(package)_config_opts += -no-feature-style-windowsce
+$(package)_config_opts += -no-freetype
+$(package)_config_opts += -no-gif
 $(package)_config_opts += -no-glib
+$(package)_config_opts += -no-gstreamer
 $(package)_config_opts += -no-icu
-$(package)_config_opts += -no-cups
 $(package)_config_opts += -no-iconv
-$(package)_config_opts += -no-gif
-$(package)_config_opts += -no-freetype
+$(package)_config_opts += -no-kms
+$(package)_config_opts += -no-linuxfb
+$(package)_config_opts += -no-libudev
+$(package)_config_opts += -no-mitshm
+$(package)_config_opts += -no-mtdev
 $(package)_config_opts += -no-nis
-$(package)_config_opts += -pch
+$(package)_config_opts += -no-pulseaudio
+$(package)_config_opts += -no-openvg
+$(package)_config_opts += -no-reduce-relocations
 $(package)_config_opts += -no-qml-debug
-$(package)_config_opts += -nomake examples
-$(package)_config_opts += -nomake tests
-$(package)_config_opts += -no-feature-style-windowsmobile
-$(package)_config_opts += -no-feature-style-windowsce
 $(package)_config_opts += -no-sql-db2
 $(package)_config_opts += -no-sql-ibase
 $(package)_config_opts += -no-sql-oci
@@ -46,36 +59,25 @@ $(package)_config_opts += -no-sql-odbc
 $(package)_config_opts += -no-sql-psql
 $(package)_config_opts += -no-sql-sqlite
 $(package)_config_opts += -no-sql-sqlite2
-$(package)_config_opts += -prefix $(host_prefix)
-$(package)_config_opts += -hostprefix $(build_prefix)
-$(package)_config_opts += -bindir $(build_prefix)/bin
-$(package)_config_opts += -c++11
+$(package)_config_opts += -no-use-gold-linker
+$(package)_config_opts += -no-xinput2
+$(package)_config_opts += -no-xrender
+$(package)_config_opts += -nomake examples
+$(package)_config_opts += -nomake tests
+$(package)_config_opts += -opensource
 $(package)_config_opts += -openssl-linked
-$(package)_config_opts += -v
-$(package)_config_opts += -static
-$(package)_config_opts += -silent
+$(package)_config_opts += -optimized-qmake
+$(package)_config_opts += -pch
 $(package)_config_opts += -pkg-config
+$(package)_config_opts += -prefix $(host_prefix)
 $(package)_config_opts += -qt-libpng
 $(package)_config_opts += -qt-libjpeg
-$(package)_config_opts += -qt-zlib
 $(package)_config_opts += -qt-pcre
-$(package)_config_opts += -no-pulseaudio
-$(package)_config_opts += -no-openvg
-$(package)_config_opts += -no-xrender
-$(package)_config_opts += -no-alsa
-$(package)_config_opts += -no-mtdev
-$(package)_config_opts += -no-gstreamer
-$(package)_config_opts += -no-mitshm
-$(package)_config_opts += -no-kms
-$(package)_config_opts += -no-reduce-relocations
-$(package)_config_opts += -no-egl
-$(package)_config_opts += -no-eglfs
-$(package)_config_opts += -no-linuxfb
-$(package)_config_opts += -no-xinput2
-$(package)_config_opts += -no-libudev
-$(package)_config_opts += -no-use-gold-linker
+$(package)_config_opts += -qt-zlib
 $(package)_config_opts += -reduce-exports
-$(package)_config_opts += -optimized-qmake
+$(package)_config_opts += -static
+$(package)_config_opts += -silent
+$(package)_config_opts += -v
 
 ifneq ($(build_os),darwin)
 $(package)_config_opts_darwin = -xplatform macx-clang-linux
@@ -119,6 +121,7 @@ define $(package)_extract_cmds
   tar --strip-components=1 -xf $($(package)_source_dir)/$($(package)_qttools_file_name) -C qttools
 endef
 
+
 define $(package)_preprocess_cmds
   sed -i.old "s|updateqm.commands = \$$$$\$$$$LRELEASE|updateqm.commands = $($(package)_extract_dir)/qttools/bin/lrelease|" qttranslations/translations/translations.pro && \
   sed -i.old "s/src_plugins.depends = src_sql src_xml src_network/src_plugins.depends = src_xml src_network/" qtbase/src/src.pro && \
@@ -130,9 +133,10 @@ define $(package)_preprocess_cmds
   cp -f qtbase/mkspecs/macx-clang/Info.plist.app qtbase/mkspecs/macx-clang-linux/ &&\
   cp -f qtbase/mkspecs/macx-clang/qplatformdefs.h qtbase/mkspecs/macx-clang-linux/ &&\
   cp -f $($(package)_patch_dir)/mac-qmake.conf qtbase/mkspecs/macx-clang-linux/qmake.conf && \
-  patch -p1 < $($(package)_patch_dir)/fix-xcb-include-order.patch && \
   patch -p1 < $($(package)_patch_dir)/mingw-uuidof.patch && \
   patch -p1 < $($(package)_patch_dir)/pidlist_absolute.patch && \
+  patch -p1 < $($(package)_patch_dir)/fix-xcb-include-order.patch && \
+  patch -p1 < $($(package)_patch_dir)/fix_qt_pkgconfig.patch && \
   echo "QMAKE_CFLAGS     += $($(package)_cflags) $($(package)_cppflags)" >> qtbase/mkspecs/common/gcc-base.conf && \
   echo "QMAKE_CXXFLAGS   += $($(package)_cxxflags) $($(package)_cppflags)" >> qtbase/mkspecs/common/gcc-base.conf && \
   echo "QMAKE_LFLAGS     += $($(package)_ldflags)" >> qtbase/mkspecs/common/gcc-base.conf && \
diff --git a/depends/patches/qt/fix-xcb-include-order.patch b/depends/patches/qt/fix-xcb-include-order.patch
index ae469ea94bff0..c7dbebedce831 100644
--- a/depends/patches/qt/fix-xcb-include-order.patch
+++ b/depends/patches/qt/fix-xcb-include-order.patch
@@ -1,15 +1,15 @@
 --- old/qtbase/src/plugins/platforms/xcb/xcb_qpa_lib.pro 2015-03-17 02:06:42.705930685 +0000
 +++ new/qtbase/src/plugins/platforms/xcb/xcb_qpa_lib.pro 2015-03-17 02:08:41.281926351 +0000
-@@ -94,8 +94,6 @@
-
+@@ -74,8 +74,6 @@
+ 
  DEFINES += $$QMAKE_DEFINES_XCB
  LIBS += $$QMAKE_LIBS_XCB
 -QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_XCB
 -QMAKE_CFLAGS += $$QMAKE_CFLAGS_XCB
-
+ 
  CONFIG += qpa/genericunixfontdatabase
-
-@@ -104,7 +102,8 @@
+ 
+@@ -87,7 +85,8 @@
  contains(QT_CONFIG, xcb-qt) {
      DEFINES += XCB_USE_RENDER
      XCB_DIR = ../../../3rdparty/xcb
@@ -18,28 +18,32 @@
 +    QMAKE_CXXFLAGS += -I$$XCB_DIR/include -I$$XCB_DIR/sysinclude $$QMAKE_CFLAGS_XCB
      LIBS += -lxcb -L$$OUT_PWD/xcb-static -lxcb-static
  } else {
-     LIBS += -lxcb -lxcb-image -lxcb-icccm -lxcb-sync -lxcb-xfixes -lxcb-shm -lxcb-randr -lxcb-shape -lxcb-keysyms
+     LIBS += -lxcb -lxcb-image -lxcb-icccm -lxcb-sync -lxcb-xfixes -lxcb-shm -lxcb-randr -lxcb-shape -lxcb-keysyms -lxcb-xinerama
 --- old/qtbase/src/plugins/platforms/xcb/xcb-static/xcb-static.pro      2015-03-17 02:07:04.641929383 +0000
 +++ new/qtbase/src/plugins/platforms/xcb/xcb-static/xcb-static.pro      2015-03-17 02:10:15.485922059 +0000
-@@ -8,7 +8,8 @@
-
+@@ -9,7 +9,8 @@
+ 
  XCB_DIR = ../../../../3rdparty/xcb
-
+ 
 -INCLUDEPATH += $$XCB_DIR/include $$XCB_DIR/include/xcb $$XCB_DIR/sysinclude
 +QMAKE_CFLAGS += -I$$XCB_DIR/include -I$$XCB_DIR/include/xcb -I$$XCB_DIR/sysinclude
 +QMAKE_CXXFLAGS += -I$$XCB_DIR/include -I$$XCB_DIR/include/xcb -I$$XCB_DIR/sysinclude
-
+ 
  QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_XCB
  QMAKE_CFLAGS += $$QMAKE_CFLAGS_XCB
 --- old/qtbase/src/plugins/platforms/xcb/xcb-plugin.pro	2015-07-24 16:02:59.530038830 -0400
 +++ new/qtbase/src/plugins/platforms/xcb/xcb-plugin.pro	2015-07-24 16:01:22.106037459 -0400
-@@ -11,3 +11,9 @@
+@@ -6,6 +6,13 @@
      qxcbmain.cpp
  OTHER_FILES += xcb.json README
-
+ 
 +contains(QT_CONFIG, xcb-qt) {
 +    DEFINES += XCB_USE_RENDER
 +    XCB_DIR = ../../../3rdparty/xcb
 +    QMAKE_CFLAGS += -I$$XCB_DIR/include -I$$XCB_DIR/sysinclude $$QMAKE_CFLAGS_XCB
 +    QMAKE_CXXFLAGS += -I$$XCB_DIR/include -I$$XCB_DIR/sysinclude $$QMAKE_CFLAGS_XCB
 +}
++
+ PLUGIN_TYPE = platforms
+ PLUGIN_CLASS_NAME = QXcbIntegrationPlugin
+ !equals(TARGET, $$QT_DEFAULT_QPA_PLUGIN): PLUGIN_EXTENDS = -
diff --git a/depends/patches/qt/fix_qt_pkgconfig.patch b/depends/patches/qt/fix_qt_pkgconfig.patch
new file mode 100644
index 0000000000000..3772db4f8b804
--- /dev/null
+++ b/depends/patches/qt/fix_qt_pkgconfig.patch
@@ -0,0 +1,11 @@
+--- old/qtbase/mkspecs/features/qt_module.prf 2016-03-17 02:06:42.705930685 +0000
++++ new/qtbase/mkspecs/features/qt_module.prf 2016-03-17 02:06:42.705930685 +0000
+@@ -244,7 +244,7 @@
+ load(qt_targets)
+ 
+ # this builds on top of qt_common
+-!internal_module:!lib_bundle:if(unix|mingw) {
++unix|mingw {
+     CONFIG += create_pc
+     QMAKE_PKGCONFIG_DESTDIR = pkgconfig
+     host_build: \

From 9e3ec74fac76f93bedaca882cc7053cc46199a61 Mon Sep 17 00:00:00 2001
From: Nathaniel Mahieu <nate@mahie.us>
Date: Tue, 14 Jun 2016 17:49:09 -0500
Subject: [PATCH 0501/1802] Clarify documentation for running a tor node

Previous wording suggested that no additional setup was required for a
tor hidden service to be created.
---
 doc/tor.md | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/doc/tor.md b/doc/tor.md
index 43e922718b7dd..79f1563021094 100644
--- a/doc/tor.md
+++ b/doc/tor.md
@@ -95,12 +95,22 @@ Starting with Tor version 0.2.7.1 it is possible, through Tor's control socket
 API, to create and destroy 'ephemeral' hidden services programmatically.
 Bitcoin Core has been updated to make use of this.
 
-This means that if Tor is running (and proper authorization is available),
-Bitcoin Core automatically creates a hidden service to listen on, without
-manual configuration. This will positively affect the number of available
-.onion nodes.
+This means that if Tor is running (and proper authentication has been configured),
+Bitcoin Core automatically creates a hidden service to listen on. This will positively 
+affect the number of available .onion nodes.
 
 This new feature is enabled by default if Bitcoin Core is listening, and
 a connection to Tor can be made. It can be configured with the `-listenonion`,
 `-torcontrol` and `-torpassword` settings. To show verbose debugging
 information, pass `-debug=tor`.
+
+Connecting to Tor's control socket API requires one of two authentication methods to be 
+configured. For cookie authentication the user running bitcoind must have write access 
+to the `CookieAuthFile` specified in Tor configuration. In some cases this is 
+preconfigured and the creation of a hidden service is automatic. If permission problems 
+are seen with `-debug=tor` they can be resolved by adding both the user running tor and 
+the user running bitcoind to the same group and setting permissions appropriately. On 
+Debian-based systems the user running bitcoind can be added to the debian-tor group, 
+which has the appropriate permissions. An alternative authentication method is the use 
+of the `-torpassword` flag and a `hash-password` which can be enabled and specified in 
+Tor configuration.
\ No newline at end of file

From 59d063d07660d6e8d53ed8aa1eb8b0747ea6767c Mon Sep 17 00:00:00 2001
From: Jonas Schnelli <dev@jonasschnelli.ch>
Date: Sat, 18 Jun 2016 13:51:45 +0200
Subject: [PATCH 0502/1802] Use runtime linking of QT libdbus, use custom/temp.
 SDK URL

---
 .travis.yml                      | 2 +-
 contrib/devtools/symbol-check.py | 1 -
 depends/packages/qt.mk           | 3 ++-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a6c51753b6727..af9c476dc1d99 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,7 +22,7 @@ env:
     - CCACHE_TEMPDIR=/tmp/.ccache-temp
     - CCACHE_COMPRESS=1
     - BASE_OUTDIR=$TRAVIS_BUILD_DIR/out
-    - SDK_URL=https://bitcoincore.org/depends-sources/sdks
+    - SDK_URL=https://bitcoin.jonasschnelli.ch/sdks
     - PYTHON_DEBUG=1
     - WINEDEBUG=fixme-all
   matrix:
diff --git a/contrib/devtools/symbol-check.py b/contrib/devtools/symbol-check.py
index 037b34212151e..e26c0fbb94455 100755
--- a/contrib/devtools/symbol-check.py
+++ b/contrib/devtools/symbol-check.py
@@ -68,7 +68,6 @@
 b'libxcb.so.1', # part of X11
 b'libfontconfig.so.1', # font support
 b'libfreetype.so.6', # font parsing
-b'libdbus-1.so.3', # inter process communication (notification system)
 b'libdl.so.2' # programming interface to dynamic linker
 }
 
diff --git a/depends/packages/qt.mk b/depends/packages/qt.mk
index c452823a9552e..d41d0b9ea5b15 100644
--- a/depends/packages/qt.mk
+++ b/depends/packages/qt.mk
@@ -5,7 +5,7 @@ $(package)_suffix=opensource-src-$($(package)_version).tar.gz
 $(package)_file_name=qtbase-$($(package)_suffix)
 $(package)_sha256_hash=0ac67cf8d66d52b995f96c31c4b48117a1afb3db99eaa93e20ccd8f7f55f7fde
 $(package)_dependencies=openssl
-$(package)_linux_dependencies=freetype fontconfig dbus libxcb libX11 xproto libXext
+$(package)_linux_dependencies=freetype fontconfig libxcb libX11 xproto libXext
 $(package)_build_subdir=qtbase
 $(package)_qt_libs=corelib network widgets gui plugins testlib
 $(package)_patches=mac-qmake.conf mingw-uuidof.patch pidlist_absolute.patch fix-xcb-include-order.patch fix_qt_pkgconfig.patch
@@ -26,6 +26,7 @@ $(package)_config_opts_debug   = -debug
 $(package)_config_opts += -bindir $(build_prefix)/bin
 $(package)_config_opts += -c++11
 $(package)_config_opts += -confirm-license
+$(package)_config_opts += -dbus-runtime
 $(package)_config_opts += -hostprefix $(build_prefix)
 $(package)_config_opts += -no-alsa
 $(package)_config_opts += -no-audio-backend

From ad0752e41f7804fd1d0e639c51e927ed4f430e09 Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Sat, 18 Jun 2016 18:16:36 +0200
Subject: [PATCH 0503/1802] Stop trimming when mapTx is empty

---
 src/txmempool.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/txmempool.cpp b/src/txmempool.cpp
index 205ffd6379351..18c54b08bc2d3 100644
--- a/src/txmempool.cpp
+++ b/src/txmempool.cpp
@@ -1075,7 +1075,7 @@ void CTxMemPool::TrimToSize(size_t sizelimit, std::vector<uint256>* pvNoSpendsRe
 
     unsigned nTxnRemoved = 0;
     CFeeRate maxFeeRateRemoved(0);
-    while (DynamicMemoryUsage() > sizelimit) {
+    while (!mapTx.empty() && DynamicMemoryUsage() > sizelimit) {
         indexed_transaction_set::index<descendant_score>::type::iterator it = mapTx.get<descendant_score>().begin();
 
         // We set the new mempool min fee to the feerate of the removed set, plus the

From 3775ff9ea7e92cc1e6a0cdbb15999913d93c87e7 Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Sat, 18 Jun 2016 19:15:03 +0200
Subject: [PATCH 0504/1802] Enable mempool consistency checks in unit tests

---
 src/test/test_bitcoin.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/test/test_bitcoin.cpp b/src/test/test_bitcoin.cpp
index c68320ba8b8e6..3dc59ddd08e76 100644
--- a/src/test/test_bitcoin.cpp
+++ b/src/test/test_bitcoin.cpp
@@ -55,6 +55,7 @@ TestingSetup::TestingSetup(const std::string& chainName) : BasicTestingSetup(cha
         pathTemp = GetTempPath() / strprintf("test_bitcoin_%lu_%i", (unsigned long)GetTime(), (int)(GetRand(100000)));
         boost::filesystem::create_directories(pathTemp);
         mapArgs["-datadir"] = pathTemp.string();
+        mempool.setSanityCheck(1.0);
         pblocktree = new CBlockTreeDB(1 << 20, true);
         pcoinsdbview = new CCoinsViewDB(1 << 23, true);
         pcoinsTip = new CCoinsViewCache(pcoinsdbview);

From 9fce0629b437441cb09c14055ee810b8ee6b7978 Mon Sep 17 00:00:00 2001
From: Daniel Kraft <d@domob.eu>
Date: Sat, 18 Jun 2016 19:38:28 +0200
Subject: [PATCH 0505/1802] [c++11] Use std::unique_ptr for block creation.

CreateNewBlock returns a pointer for which the caller takes ownership.
Use std::unique_ptr to make this explicit and simplify handling of these
objects in getblocktemplate.
---
 src/miner.cpp             |  7 ++++---
 src/miner.h               |  2 +-
 src/rpc/mining.cpp        | 10 +++-------
 src/test/miner_tests.cpp  | 15 ++++-----------
 src/test/test_bitcoin.cpp |  5 +++--
 5 files changed, 15 insertions(+), 24 deletions(-)

diff --git a/src/miner.cpp b/src/miner.cpp
index 989ad11a2614d..d38ccedf554e3 100644
--- a/src/miner.cpp
+++ b/src/miner.cpp
@@ -29,6 +29,7 @@
 #include <boost/thread.hpp>
 #include <boost/tuple/tuple.hpp>
 #include <queue>
+#include <utility>
 
 using namespace std;
 
@@ -102,14 +103,14 @@ void BlockAssembler::resetBlock()
     blockFinished = false;
 }
 
-CBlockTemplate* BlockAssembler::CreateNewBlock(const CScript& scriptPubKeyIn)
+std::unique_ptr<CBlockTemplate> BlockAssembler::CreateNewBlock(const CScript& scriptPubKeyIn)
 {
     resetBlock();
 
     pblocktemplate.reset(new CBlockTemplate());
 
     if(!pblocktemplate.get())
-        return NULL;
+        return nullptr;
     pblock = &pblocktemplate->block; // pointer for convenience
 
     // Add dummy coinbase tx as first transaction
@@ -164,7 +165,7 @@ CBlockTemplate* BlockAssembler::CreateNewBlock(const CScript& scriptPubKeyIn)
         throw std::runtime_error(strprintf("%s: TestBlockValidity failed: %s", __func__, FormatStateMessage(state)));
     }
 
-    return pblocktemplate.release();
+    return std::move(pblocktemplate);
 }
 
 bool BlockAssembler::isStillDependent(CTxMemPool::txiter iter)
diff --git a/src/miner.h b/src/miner.h
index a9fea85304aa6..54c680b5ffd9d 100644
--- a/src/miner.h
+++ b/src/miner.h
@@ -160,7 +160,7 @@ class BlockAssembler
 public:
     BlockAssembler(const CChainParams& chainparams);
     /** Construct a new block template with coinbase to scriptPubKeyIn */
-    CBlockTemplate* CreateNewBlock(const CScript& scriptPubKeyIn);
+    std::unique_ptr<CBlockTemplate> CreateNewBlock(const CScript& scriptPubKeyIn);
 
 private:
     // utility functions
diff --git a/src/rpc/mining.cpp b/src/rpc/mining.cpp
index 94eeea91f39f2..162f4a0721e3b 100644
--- a/src/rpc/mining.cpp
+++ b/src/rpc/mining.cpp
@@ -22,6 +22,7 @@
 #include "utilstrencodings.h"
 #include "validationinterface.h"
 
+#include <memory>
 #include <stdint.h>
 
 #include <boost/assign/list_of.hpp>
@@ -508,12 +509,12 @@ UniValue getblocktemplate(const UniValue& params, bool fHelp)
     // Update block
     static CBlockIndex* pindexPrev;
     static int64_t nStart;
-    static CBlockTemplate* pblocktemplate;
+    static std::unique_ptr<CBlockTemplate> pblocktemplate;
     if (pindexPrev != chainActive.Tip() ||
         (mempool.GetTransactionsUpdated() != nTransactionsUpdatedLast && GetTime() - nStart > 5))
     {
         // Clear pindexPrev so future calls make a new block, despite any failures from here on
-        pindexPrev = NULL;
+        pindexPrev = nullptr;
 
         // Store the pindexBest used before CreateNewBlock, to avoid races
         nTransactionsUpdatedLast = mempool.GetTransactionsUpdated();
@@ -521,11 +522,6 @@ UniValue getblocktemplate(const UniValue& params, bool fHelp)
         nStart = GetTime();
 
         // Create new block
-        if(pblocktemplate)
-        {
-            delete pblocktemplate;
-            pblocktemplate = NULL;
-        }
         CScript scriptDummy = CScript() << OP_TRUE;
         pblocktemplate = BlockAssembler(Params()).CreateNewBlock(scriptDummy);
         if (!pblocktemplate)
diff --git a/src/test/miner_tests.cpp b/src/test/miner_tests.cpp
index ca8d6d2e05baa..7b087763d09d4 100644
--- a/src/test/miner_tests.cpp
+++ b/src/test/miner_tests.cpp
@@ -18,6 +18,8 @@
 
 #include "test/test_bitcoin.h"
 
+#include <memory>
+
 #include <boost/test/unit_test.hpp>
 
 BOOST_FIXTURE_TEST_SUITE(miner_tests, TestingSetup)
@@ -105,7 +107,7 @@ void TestPackageSelection(const CChainParams& chainparams, CScript scriptPubKey,
     uint256 hashHighFeeTx = tx.GetHash();
     mempool.addUnchecked(hashHighFeeTx, entry.Fee(50000).Time(GetTime()).SpendsCoinbase(false).FromTx(tx));
 
-    CBlockTemplate *pblocktemplate = BlockAssembler(chainparams).CreateNewBlock(scriptPubKey);
+    std::unique_ptr<CBlockTemplate> pblocktemplate = BlockAssembler(chainparams).CreateNewBlock(scriptPubKey);
     BOOST_CHECK(pblocktemplate->block.vtx[1].GetHash() == hashParentTx);
     BOOST_CHECK(pblocktemplate->block.vtx[2].GetHash() == hashHighFeeTx);
     BOOST_CHECK(pblocktemplate->block.vtx[3].GetHash() == hashMediumFeeTx);
@@ -183,7 +185,7 @@ BOOST_AUTO_TEST_CASE(CreateNewBlock_validity)
 {
     const CChainParams& chainparams = Params(CBaseChainParams::MAIN);
     CScript scriptPubKey = CScript() << ParseHex("04678afdb0fe5548271967f1a67130b7105cd6a828e03909a67962e0ea1f61deb649f6bc3f4cef38c4f35504e51ec112de5c384df7ba0b8d578a4c702b6bf11d5f") << OP_CHECKSIG;
-    CBlockTemplate *pblocktemplate;
+    std::unique_ptr<CBlockTemplate> pblocktemplate;
     CMutableTransaction tx,tx2;
     CScript script;
     uint256 hash;
@@ -225,11 +227,9 @@ BOOST_AUTO_TEST_CASE(CreateNewBlock_validity)
         BOOST_CHECK(state.IsValid());
         pblock->hashPrevBlock = pblock->GetHash();
     }
-    delete pblocktemplate;
 
     // Just to make sure we can still make simple blocks
     BOOST_CHECK(pblocktemplate = BlockAssembler(chainparams).CreateNewBlock(scriptPubKey));
-    delete pblocktemplate;
 
     const CAmount BLOCKSUBSIDY = 50*COIN;
     const CAmount LOWFEE = CENT;
@@ -268,7 +268,6 @@ BOOST_AUTO_TEST_CASE(CreateNewBlock_validity)
         tx.vin[0].prevout.hash = hash;
     }
     BOOST_CHECK(pblocktemplate = BlockAssembler(chainparams).CreateNewBlock(scriptPubKey));
-    delete pblocktemplate;
     mempool.clear();
 
     // block size > limit
@@ -289,7 +288,6 @@ BOOST_AUTO_TEST_CASE(CreateNewBlock_validity)
         tx.vin[0].prevout.hash = hash;
     }
     BOOST_CHECK(pblocktemplate = BlockAssembler(chainparams).CreateNewBlock(scriptPubKey));
-    delete pblocktemplate;
     mempool.clear();
 
     // orphan in mempool, template creation fails
@@ -313,7 +311,6 @@ BOOST_AUTO_TEST_CASE(CreateNewBlock_validity)
     hash = tx.GetHash();
     mempool.addUnchecked(hash, entry.Fee(HIGHERFEE).Time(GetTime()).SpendsCoinbase(true).FromTx(tx));
     BOOST_CHECK(pblocktemplate = BlockAssembler(chainparams).CreateNewBlock(scriptPubKey));
-    delete pblocktemplate;
     mempool.clear();
 
     // coinbase in mempool, template creation fails
@@ -371,7 +368,6 @@ BOOST_AUTO_TEST_CASE(CreateNewBlock_validity)
         chainActive.SetTip(next);
     }
     BOOST_CHECK(pblocktemplate = BlockAssembler(chainparams).CreateNewBlock(scriptPubKey));
-    delete pblocktemplate;
     // Extend to a 210000-long block chain.
     while (chainActive.Tip()->nHeight < 210000) {
         CBlockIndex* prev = chainActive.Tip();
@@ -384,7 +380,6 @@ BOOST_AUTO_TEST_CASE(CreateNewBlock_validity)
         chainActive.SetTip(next);
     }
     BOOST_CHECK(pblocktemplate = BlockAssembler(chainparams).CreateNewBlock(scriptPubKey));
-    delete pblocktemplate;
     // Delete the dummy blocks again.
     while (chainActive.Tip()->nHeight > nHeight) {
         CBlockIndex* del = chainActive.Tip();
@@ -477,7 +472,6 @@ BOOST_AUTO_TEST_CASE(CreateNewBlock_validity)
     // but relative locked txs will if inconsistently added to mempool.
     // For now these will still generate a valid template until BIP68 soft fork
     BOOST_CHECK_EQUAL(pblocktemplate->block.vtx.size(), 3);
-    delete pblocktemplate;
     // However if we advance height by 1 and time by 512, all of them should be mined
     for (int i = 0; i < CBlockIndex::nMedianTimeSpan; i++)
         chainActive.Tip()->GetAncestor(chainActive.Tip()->nHeight - i)->nTime += 512; //Trick the MedianTimePast
@@ -486,7 +480,6 @@ BOOST_AUTO_TEST_CASE(CreateNewBlock_validity)
 
     BOOST_CHECK(pblocktemplate = BlockAssembler(chainparams).CreateNewBlock(scriptPubKey));
     BOOST_CHECK_EQUAL(pblocktemplate->block.vtx.size(), 5);
-    delete pblocktemplate;
 
     chainActive.Tip()->nHeight--;
     SetMockTime(0);
diff --git a/src/test/test_bitcoin.cpp b/src/test/test_bitcoin.cpp
index c68320ba8b8e6..98b02a1f6fc07 100644
--- a/src/test/test_bitcoin.cpp
+++ b/src/test/test_bitcoin.cpp
@@ -22,6 +22,8 @@
 
 #include "test/testutil.h"
 
+#include <memory>
+
 #include <boost/filesystem.hpp>
 #include <boost/test/unit_test.hpp>
 #include <boost/thread.hpp>
@@ -98,7 +100,7 @@ CBlock
 TestChain100Setup::CreateAndProcessBlock(const std::vector<CMutableTransaction>& txns, const CScript& scriptPubKey)
 {
     const CChainParams& chainparams = Params();
-    CBlockTemplate *pblocktemplate = BlockAssembler(chainparams).CreateNewBlock(scriptPubKey);
+    std::unique_ptr<CBlockTemplate> pblocktemplate = BlockAssembler(chainparams).CreateNewBlock(scriptPubKey);
     CBlock& block = pblocktemplate->block;
 
     // Replace mempool-selected txns with just coinbase plus passed-in txns:
@@ -115,7 +117,6 @@ TestChain100Setup::CreateAndProcessBlock(const std::vector<CMutableTransaction>&
     ProcessNewBlock(state, chainparams, NULL, &block, true, NULL);
 
     CBlock result = block;
-    delete pblocktemplate;
     return result;
 }
 

From 1e9aab0dbfcb844458b5f221a9af0141bba6280f Mon Sep 17 00:00:00 2001
From: Peter Todd <pete@petertodd.org>
Date: Sat, 18 Jun 2016 20:53:17 -0400
Subject: [PATCH 0506/1802] Remove sipa's old revoked key from verify-commits

Now that the trusted root is past all commits signed by that key we don't need
it in the trusted-keys list, nor do we need to whitelist those commits in
allow-revsig-commits
---
 contrib/verify-commits/allow-revsig-commits | 2 --
 contrib/verify-commits/trusted-keys         | 1 -
 2 files changed, 3 deletions(-)

diff --git a/contrib/verify-commits/allow-revsig-commits b/contrib/verify-commits/allow-revsig-commits
index 31aeb8f3d38bb..e69de29bb2d1d 100644
--- a/contrib/verify-commits/allow-revsig-commits
+++ b/contrib/verify-commits/allow-revsig-commits
@@ -1,2 +0,0 @@
-586a29253dabec3ca0f1ccba9091daabd16b8411
-eddaba7b5692288087a926da5733e86b47274e4e
diff --git a/contrib/verify-commits/trusted-keys b/contrib/verify-commits/trusted-keys
index 9c36d58cd2a30..75242c2a9760b 100644
--- a/contrib/verify-commits/trusted-keys
+++ b/contrib/verify-commits/trusted-keys
@@ -1,5 +1,4 @@
 71A3B16735405025D447E8F274810B012346C9A6
-1F4410F6A89268CE3197A84C57896D2FF8F0B657
 3F1888C6DCA92A6499C4911FDBA1A67379A1A931
 32EE5C4C3FA15CCADB46ABE529D4BCB6416F53EC
 FE09B823E6D83A3BC7983EAA2D7F2372E50FE137

From 96806c39f4ef395975c0cd7d654dcb71c4790be2 Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Sat, 18 Jun 2016 18:16:36 +0200
Subject: [PATCH 0507/1802] Stop trimming when mapTx is empty

---
 src/txmempool.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/txmempool.cpp b/src/txmempool.cpp
index 205ffd6379351..18c54b08bc2d3 100644
--- a/src/txmempool.cpp
+++ b/src/txmempool.cpp
@@ -1075,7 +1075,7 @@ void CTxMemPool::TrimToSize(size_t sizelimit, std::vector<uint256>* pvNoSpendsRe
 
     unsigned nTxnRemoved = 0;
     CFeeRate maxFeeRateRemoved(0);
-    while (DynamicMemoryUsage() > sizelimit) {
+    while (!mapTx.empty() && DynamicMemoryUsage() > sizelimit) {
         indexed_transaction_set::index<descendant_score>::type::iterator it = mapTx.get<descendant_score>().begin();
 
         // We set the new mempool min fee to the feerate of the removed set, plus the

From 7c29ec94490a2fb0b5f9aec56c89d0a9a58eec79 Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Sun, 10 Apr 2016 18:52:32 -0700
Subject: [PATCH 0508/1802] If AcceptBlockHeader returns true, pindex will be
 set.

Assert this instead of checking (and then dref'ing later anyway)
to make sure no one thinks they can change that postcondition of
AcceptBlockHeader..
---
 src/main.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index bdb3457f8eeb7..378d2c70227e3 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -5218,10 +5218,10 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
             }
         }
 
-        if (pindexLast)
-            UpdateBlockAvailability(pfrom->GetId(), pindexLast->GetBlockHash());
+        assert(pindexLast);
+        UpdateBlockAvailability(pfrom->GetId(), pindexLast->GetBlockHash());
 
-        if (nCount == MAX_HEADERS_RESULTS && pindexLast && hasNewHeaders) {
+        if (nCount == MAX_HEADERS_RESULTS && hasNewHeaders) {
             // Headers message had its maximum size; the peer may have more headers.
             // TODO: optimize: if pindexLast is an ancestor of chainActive.Tip or pindexBestHeader, continue
             // from there instead.

From cbda71cf04ef6f2abe6eaa56c3140a6f5cff4feb Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Wed, 8 Jun 2016 16:12:52 -0700
Subject: [PATCH 0509/1802] Move context-required checks from CheckBlockHeader
 to Contextual...

---
 src/main.cpp | 28 ++++++++++++++--------------
 src/main.h   |  6 +++---
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index 378d2c70227e3..7d267bef7d984 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -2241,7 +2241,7 @@ bool ConnectBlock(const CBlock& block, CValidationState& state, CBlockIndex* pin
     int64_t nTimeStart = GetTimeMicros();
 
     // Check it again in case a previous version let a bad block in
-    if (!CheckBlock(block, state, chainparams.GetConsensus(), GetAdjustedTime(), !fJustCheck, !fJustCheck))
+    if (!CheckBlock(block, state, chainparams.GetConsensus(), !fJustCheck, !fJustCheck))
         return error("%s: Consensus::CheckBlock: %s", __func__, FormatStateMessage(state));
 
     // verify that the view's current state corresponds to the previous block
@@ -3258,20 +3258,16 @@ bool FindUndoPos(CValidationState &state, int nFile, CDiskBlockPos &pos, unsigne
     return true;
 }
 
-bool CheckBlockHeader(const CBlockHeader& block, CValidationState& state, const Consensus::Params& consensusParams, int64_t nAdjustedTime, bool fCheckPOW)
+bool CheckBlockHeader(const CBlockHeader& block, CValidationState& state, const Consensus::Params& consensusParams, bool fCheckPOW)
 {
     // Check proof of work matches claimed amount
     if (fCheckPOW && !CheckProofOfWork(block.GetHash(), block.nBits, consensusParams))
         return state.DoS(50, false, REJECT_INVALID, "high-hash", false, "proof of work failed");
 
-    // Check timestamp
-    if (block.GetBlockTime() > nAdjustedTime + 2 * 60 * 60)
-        return state.Invalid(false, REJECT_INVALID, "time-too-new", "block timestamp too far in the future");
-
     return true;
 }
 
-bool CheckBlock(const CBlock& block, CValidationState& state, const Consensus::Params& consensusParams, int64_t nAdjustedTime, bool fCheckPOW, bool fCheckMerkleRoot)
+bool CheckBlock(const CBlock& block, CValidationState& state, const Consensus::Params& consensusParams, bool fCheckPOW, bool fCheckMerkleRoot)
 {
     // These are checks that are independent of context.
 
@@ -3280,7 +3276,7 @@ bool CheckBlock(const CBlock& block, CValidationState& state, const Consensus::P
 
     // Check that the header is valid (particularly PoW).  This is mostly
     // redundant with the call in AcceptBlockHeader.
-    if (!CheckBlockHeader(block, state, consensusParams, nAdjustedTime, fCheckPOW))
+    if (!CheckBlockHeader(block, state, consensusParams, fCheckPOW))
         return false;
 
     // Check the merkle root.
@@ -3346,7 +3342,7 @@ static bool CheckIndexAgainstCheckpoint(const CBlockIndex* pindexPrev, CValidati
     return true;
 }
 
-bool ContextualCheckBlockHeader(const CBlockHeader& block, CValidationState& state, const Consensus::Params& consensusParams, CBlockIndex * const pindexPrev)
+bool ContextualCheckBlockHeader(const CBlockHeader& block, CValidationState& state, const Consensus::Params& consensusParams, CBlockIndex * const pindexPrev, int64_t nAdjustedTime)
 {
     // Check proof of work
     if (block.nBits != GetNextWorkRequired(pindexPrev, &block, consensusParams))
@@ -3356,6 +3352,10 @@ bool ContextualCheckBlockHeader(const CBlockHeader& block, CValidationState& sta
     if (block.GetBlockTime() <= pindexPrev->GetMedianTimePast())
         return state.Invalid(false, REJECT_INVALID, "time-too-old", "block's timestamp is too early");
 
+    // Check timestamp
+    if (block.GetBlockTime() > nAdjustedTime + 2 * 60 * 60)
+        return state.Invalid(false, REJECT_INVALID, "time-too-new", "block timestamp too far in the future");
+
     // Reject outdated version blocks when 95% (75% on testnet) of the network has upgraded:
     for (int32_t version = 2; version < 5; ++version) // check for version 2, 3 and 4 upgrades
         if (block.nVersion < version && IsSuperMajority(version, pindexPrev, consensusParams.nMajorityRejectBlockOutdated, consensusParams))
@@ -3420,7 +3420,7 @@ static bool AcceptBlockHeader(const CBlockHeader& block, CValidationState& state
             return true;
         }
 
-        if (!CheckBlockHeader(block, state, chainparams.GetConsensus(), GetAdjustedTime()))
+        if (!CheckBlockHeader(block, state, chainparams.GetConsensus()))
             return error("%s: Consensus::CheckBlockHeader: %s, %s", __func__, hash.ToString(), FormatStateMessage(state));
 
         // Get prev block index
@@ -3436,7 +3436,7 @@ static bool AcceptBlockHeader(const CBlockHeader& block, CValidationState& state
         if (fCheckpointsEnabled && !CheckIndexAgainstCheckpoint(pindexPrev, state, chainparams, hash))
             return error("%s: CheckIndexAgainstCheckpoint(): %s", __func__, state.GetRejectReason().c_str());
 
-        if (!ContextualCheckBlockHeader(block, state, chainparams.GetConsensus(), pindexPrev))
+        if (!ContextualCheckBlockHeader(block, state, chainparams.GetConsensus(), pindexPrev, GetAdjustedTime()))
             return error("%s: Consensus::ContextualCheckBlockHeader: %s, %s", __func__, hash.ToString(), FormatStateMessage(state));
     }
     if (pindex == NULL)
@@ -3569,9 +3569,9 @@ bool TestBlockValidity(CValidationState& state, const CChainParams& chainparams,
     indexDummy.nHeight = pindexPrev->nHeight + 1;
 
     // NOTE: CheckBlockHeader is called by CheckBlock
-    if (!ContextualCheckBlockHeader(block, state, chainparams.GetConsensus(), pindexPrev))
+    if (!ContextualCheckBlockHeader(block, state, chainparams.GetConsensus(), pindexPrev, GetAdjustedTime()))
         return error("%s: Consensus::ContextualCheckBlockHeader: %s", __func__, FormatStateMessage(state));
-    if (!CheckBlock(block, state, chainparams.GetConsensus(), GetAdjustedTime(), fCheckPOW, fCheckMerkleRoot))
+    if (!CheckBlock(block, state, chainparams.GetConsensus(), fCheckPOW, fCheckMerkleRoot))
         return error("%s: Consensus::CheckBlock: %s", __func__, FormatStateMessage(state));
     if (!ContextualCheckBlock(block, state, pindexPrev))
         return error("%s: Consensus::ContextualCheckBlock: %s", __func__, FormatStateMessage(state));
@@ -3916,7 +3916,7 @@ bool CVerifyDB::VerifyDB(const CChainParams& chainparams, CCoinsView *coinsview,
         if (!ReadBlockFromDisk(block, pindex, chainparams.GetConsensus()))
             return error("VerifyDB(): *** ReadBlockFromDisk failed at %d, hash=%s", pindex->nHeight, pindex->GetBlockHash().ToString());
         // check level 1: verify block validity
-        if (nCheckLevel >= 1 && !CheckBlock(block, state, chainparams.GetConsensus(), GetAdjustedTime()))
+        if (nCheckLevel >= 1 && !CheckBlock(block, state, chainparams.GetConsensus()))
             return error("%s: *** found bad block at %d, hash=%s (%s)\n", __func__, 
                          pindex->nHeight, pindex->GetBlockHash().ToString(), FormatStateMessage(state));
         // check level 2: verify undo validity
diff --git a/src/main.h b/src/main.h
index e2bfdfdf6ee36..56e81ec29cd7a 100644
--- a/src/main.h
+++ b/src/main.h
@@ -425,13 +425,13 @@ bool ReadBlockFromDisk(CBlock& block, const CBlockIndex* pindex, const Consensus
 /** Functions for validating blocks and updating the block tree */
 
 /** Context-independent validity checks */
-bool CheckBlockHeader(const CBlockHeader& block, CValidationState& state, const Consensus::Params& consensusParams, int64_t nAdjustedTime, bool fCheckPOW = true);
-bool CheckBlock(const CBlock& block, CValidationState& state, const Consensus::Params& consensusParams, int64_t nAdjustedTime, bool fCheckPOW = true, bool fCheckMerkleRoot = true);
+bool CheckBlockHeader(const CBlockHeader& block, CValidationState& state, const Consensus::Params& consensusParams, bool fCheckPOW = true);
+bool CheckBlock(const CBlock& block, CValidationState& state, const Consensus::Params& consensusParams, bool fCheckPOW = true, bool fCheckMerkleRoot = true);
 
 /** Context-dependent validity checks.
  *  By "context", we mean only the previous block headers, but not the UTXO
  *  set; UTXO-related validity checks are done in ConnectBlock(). */
-bool ContextualCheckBlockHeader(const CBlockHeader& block, CValidationState& state, const Consensus::Params& consensusParams, CBlockIndex* pindexPrev);
+bool ContextualCheckBlockHeader(const CBlockHeader& block, CValidationState& state, const Consensus::Params& consensusParams, CBlockIndex* pindexPrev, int64_t nAdjustedTime);
 bool ContextualCheckBlock(const CBlock& block, CValidationState& state, CBlockIndex *pindexPrev);
 
 /** Apply the effects of this block (with given index) on the UTXO set represented by coins.

From 5249daca5a8c4ebdc6c9a3090af0e1bdddcfba1b Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Wed, 18 May 2016 13:11:42 -0700
Subject: [PATCH 0510/1802] Add COMPACTSIZE wrapper similar to VARINT for
 serialization

---
 src/serialize.h | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/src/serialize.h b/src/serialize.h
index 5c2db9d332ce3..378ed39074ea3 100644
--- a/src/serialize.h
+++ b/src/serialize.h
@@ -373,6 +373,7 @@ I ReadVarInt(Stream& is)
 
 #define FLATDATA(obj) REF(CFlatData((char*)&(obj), (char*)&(obj) + sizeof(obj)))
 #define VARINT(obj) REF(WrapVarInt(REF(obj)))
+#define COMPACTSIZE(obj) REF(CCompactSize(REF(obj)))
 #define LIMITED_STRING(obj,n) REF(LimitedString< n >(REF(obj)))
 
 /** 
@@ -443,6 +444,28 @@ class CVarInt
     }
 };
 
+class CCompactSize
+{
+protected:
+    uint64_t &n;
+public:
+    CCompactSize(uint64_t& nIn) : n(nIn) { }
+
+    unsigned int GetSerializeSize(int, int) const {
+        return GetSizeOfCompactSize(n);
+    }
+
+    template<typename Stream>
+    void Serialize(Stream &s, int, int) const {
+        WriteCompactSize<Stream>(s, n);
+    }
+
+    template<typename Stream>
+    void Unserialize(Stream& s, int, int) {
+        n = ReadCompactSize<Stream>(s);
+    }
+};
+
 template<size_t Limit>
 class LimitedString
 {

From 85ad31ede7bc338079c8ae643542fde7ad83ce55 Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Fri, 15 Apr 2016 12:23:57 -0700
Subject: [PATCH 0511/1802] Add partial-block block encodings API

---
 src/Makefile.am        |   2 +
 src/blockencodings.cpp | 158 +++++++++++++++++++++++++++++++
 src/blockencodings.h   | 205 +++++++++++++++++++++++++++++++++++++++++
 3 files changed, 365 insertions(+)
 create mode 100644 src/blockencodings.cpp
 create mode 100644 src/blockencodings.h

diff --git a/src/Makefile.am b/src/Makefile.am
index 3df8e267bb335..e3eaacdb4c983 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -74,6 +74,7 @@ BITCOIN_CORE_H = \
   addrman.h \
   base58.h \
   bloom.h \
+  blockencodings.h \
   chain.h \
   chainparams.h \
   chainparamsbase.h \
@@ -163,6 +164,7 @@ libbitcoin_server_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
 libbitcoin_server_a_SOURCES = \
   addrman.cpp \
   bloom.cpp \
+  blockencodings.cpp \
   chain.cpp \
   checkpoints.cpp \
   httprpc.cpp \
diff --git a/src/blockencodings.cpp b/src/blockencodings.cpp
new file mode 100644
index 0000000000000..c6b79f4201c55
--- /dev/null
+++ b/src/blockencodings.cpp
@@ -0,0 +1,158 @@
+// Copyright (c) 2016 The Bitcoin Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#include "blockencodings.h"
+#include "consensus/consensus.h"
+#include "consensus/validation.h"
+#include "chainparams.h"
+#include "hash.h"
+#include "random.h"
+#include "streams.h"
+#include "txmempool.h"
+#include "main.h"
+
+#include <unordered_map>
+
+#define MIN_TRANSACTION_SIZE (::GetSerializeSize(CTransaction(), SER_NETWORK, PROTOCOL_VERSION))
+
+CBlockHeaderAndShortTxIDs::CBlockHeaderAndShortTxIDs(const CBlock& block) :
+        nonce(GetRand(std::numeric_limits<uint64_t>::max())),
+        shorttxids(block.vtx.size() - 1), prefilledtxn(1), header(block) {
+    FillShortTxIDSelector();
+    //TODO: Use our mempool prior to block acceptance to predictively fill more than just the coinbase
+    prefilledtxn[0] = {0, block.vtx[0]};
+    for (size_t i = 1; i < block.vtx.size(); i++) {
+        const CTransaction& tx = block.vtx[i];
+        shorttxids[i - 1] = GetShortID(tx.GetHash());
+    }
+}
+
+void CBlockHeaderAndShortTxIDs::FillShortTxIDSelector() const {
+    CDataStream stream(SER_NETWORK, PROTOCOL_VERSION);
+    stream << header << nonce;
+    CSHA256 hasher;
+    hasher.Write((unsigned char*)&(*stream.begin()), stream.end() - stream.begin());
+    uint256 shorttxidhash;
+    hasher.Finalize(shorttxidhash.begin());
+    shorttxidk0 = shorttxidhash.GetUint64(0);
+    shorttxidk1 = shorttxidhash.GetUint64(1);
+}
+
+uint64_t CBlockHeaderAndShortTxIDs::GetShortID(const uint256& txhash) const {
+    static_assert(SHORTTXIDS_LENGTH == 6, "shorttxids calculation assumes 6-byte shorttxids");
+    return SipHashUint256(shorttxidk0, shorttxidk1, txhash) & 0xffffffffffffL;
+}
+
+
+
+ReadStatus PartiallyDownloadedBlock::InitData(const CBlockHeaderAndShortTxIDs& cmpctblock) {
+    if (cmpctblock.header.IsNull() || (cmpctblock.shorttxids.empty() && cmpctblock.prefilledtxn.empty()))
+        return READ_STATUS_INVALID;
+    if (cmpctblock.shorttxids.size() + cmpctblock.prefilledtxn.size() > MAX_BLOCK_SIZE / MIN_TRANSACTION_SIZE)
+        return READ_STATUS_INVALID;
+
+    assert(header.IsNull() && txn_available.empty());
+    header = cmpctblock.header;
+    txn_available.resize(cmpctblock.BlockTxCount());
+
+    int32_t lastprefilledindex = -1;
+    for (size_t i = 0; i < cmpctblock.prefilledtxn.size(); i++) {
+        if (cmpctblock.prefilledtxn[i].tx.IsNull())
+            return READ_STATUS_INVALID;
+
+        lastprefilledindex += cmpctblock.prefilledtxn[i].index + 1; //index is a uint16_t, so cant overflow here
+        if (lastprefilledindex > std::numeric_limits<uint16_t>::max())
+            return READ_STATUS_INVALID;
+        if ((uint32_t)lastprefilledindex > cmpctblock.shorttxids.size() + i) {
+            // If we are inserting a tx at an index greater than our full list of shorttxids
+            // plus the number of prefilled txn we've inserted, then we have txn for which we
+            // have neither a prefilled txn or a shorttxid!
+            return READ_STATUS_INVALID;
+        }
+        txn_available[lastprefilledindex] = std::make_shared<CTransaction>(cmpctblock.prefilledtxn[i].tx);
+    }
+
+    // Calculate map of txids -> positions and check mempool to see what we have (or dont)
+    // Because well-formed cmpctblock messages will have a (relatively) uniform distribution
+    // of short IDs, any highly-uneven distribution of elements can be safely treated as a
+    // READ_STATUS_FAILED.
+    std::unordered_map<uint64_t, uint16_t> shorttxids(cmpctblock.shorttxids.size());
+    uint16_t index_offset = 0;
+    for (size_t i = 0; i < cmpctblock.shorttxids.size(); i++) {
+        while (txn_available[i + index_offset])
+            index_offset++;
+        shorttxids[cmpctblock.shorttxids[i]] = i + index_offset;
+        // Bucket selection is a simple Binomial distribution. If we assume blocks of
+        // 10,000 transactions, allowing up to 12 elements per bucket should only fail
+        // once every ~1.3 million blocks and once every 74,000 blocks in a worst-case
+        // 16,000-transaction block.
+        if (shorttxids.bucket_size(shorttxids.bucket(cmpctblock.shorttxids[i])) > 12)
+            return READ_STATUS_FAILED;
+    }
+    // TODO: in the shortid-collision case, we should instead request both transactions
+    // which collided. Falling back to full-block-request here is overkill.
+    if (shorttxids.size() != cmpctblock.shorttxids.size())
+        return READ_STATUS_FAILED; // Short ID collision
+
+    std::vector<bool> have_txn(txn_available.size());
+    LOCK(pool->cs);
+    for (CTxMemPool::txiter it = pool->mapTx.begin(); it != pool->mapTx.end(); it++) {
+        std::unordered_map<uint64_t, uint16_t>::iterator idit = shorttxids.find(cmpctblock.GetShortID(it->GetTx().GetHash()));
+        if (idit != shorttxids.end()) {
+            if (!have_txn[idit->second]) {
+                txn_available[idit->second] = it->GetSharedTx();
+                have_txn[idit->second]  = true;
+            } else {
+                // If we find two mempool txn that match the short id, just request it.
+                // This should be rare enough that the extra bandwidth doesn't matter,
+                // but eating a round-trip due to FillBlock failure would be annoying
+                txn_available[idit->second].reset();
+            }
+        }
+        // Though ideally we'd continue scanning for the two-txn-match-shortid case,
+        // the performance win of an early exit here is too good to pass up and worth
+        // the extra risk.
+        if (mempool_count == shorttxids.size())
+            break;
+    }
+
+    return READ_STATUS_OK;
+}
+
+bool PartiallyDownloadedBlock::IsTxAvailable(size_t index) const {
+    assert(!header.IsNull());
+    assert(index < txn_available.size());
+    return txn_available[index] ? true : false;
+}
+
+ReadStatus PartiallyDownloadedBlock::FillBlock(CBlock& block, const std::vector<CTransaction>& vtx_missing) const {
+    assert(!header.IsNull());
+    block = header;
+    block.vtx.resize(txn_available.size());
+
+    size_t tx_missing_offset = 0;
+    for (size_t i = 0; i < txn_available.size(); i++) {
+        if (!txn_available[i]) {
+            if (vtx_missing.size() <= tx_missing_offset)
+                return READ_STATUS_INVALID;
+            block.vtx[i] = vtx_missing[tx_missing_offset++];
+        } else
+            block.vtx[i] = *txn_available[i];
+    }
+    if (vtx_missing.size() != tx_missing_offset)
+        return READ_STATUS_INVALID;
+
+    CValidationState state;
+    if (!CheckBlock(block, state, Params().GetConsensus())) {
+        // TODO: We really want to just check merkle tree manually here,
+        // but that is expensive, and CheckBlock caches a block's
+        // "checked-status" (in the CBlock?). CBlock should be able to
+        // check its own merkle root and cache that check.
+        if (state.CorruptionPossible())
+            return READ_STATUS_FAILED; // Possible Short ID collision
+        return READ_STATUS_INVALID;
+    }
+
+    return READ_STATUS_OK;
+}
diff --git a/src/blockencodings.h b/src/blockencodings.h
new file mode 100644
index 0000000000000..adc60c85d0ecf
--- /dev/null
+++ b/src/blockencodings.h
@@ -0,0 +1,205 @@
+// Copyright (c) 2016 The Bitcoin Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#ifndef BITCOIN_BLOCK_ENCODINGS_H
+#define BITCOIN_BLOCK_ENCODINGS_H
+
+#include "primitives/block.h"
+
+#include <memory>
+
+class CTxMemPool;
+
+// Dumb helper to handle CTransaction compression at serialize-time
+struct TransactionCompressor {
+private:
+    CTransaction& tx;
+public:
+    TransactionCompressor(CTransaction& txIn) : tx(txIn) {}
+
+    ADD_SERIALIZE_METHODS;
+
+    template <typename Stream, typename Operation>
+    inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) {
+        READWRITE(tx); //TODO: Compress tx encoding
+    }
+};
+
+class BlockTransactionsRequest {
+public:
+    // A BlockTransactionsRequest message
+    uint256 blockhash;
+    std::vector<uint16_t> indexes;
+
+    ADD_SERIALIZE_METHODS;
+
+    template <typename Stream, typename Operation>
+    inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) {
+        READWRITE(blockhash);
+        uint64_t indexes_size = (uint64_t)indexes.size();
+        READWRITE(COMPACTSIZE(indexes_size));
+        if (ser_action.ForRead()) {
+            size_t i = 0;
+            while (indexes.size() < indexes_size) {
+                indexes.resize(std::min((uint64_t)(1000 + indexes.size()), indexes_size));
+                for (; i < indexes.size(); i++) {
+                    uint64_t index = 0;
+                    READWRITE(COMPACTSIZE(index));
+                    if (index > std::numeric_limits<uint16_t>::max())
+                        throw std::ios_base::failure("index overflowed 16 bits");
+                    indexes[i] = index;
+                }
+            }
+
+            uint16_t offset = 0;
+            for (size_t i = 0; i < indexes.size(); i++) {
+                if (uint64_t(indexes[i]) + uint64_t(offset) > std::numeric_limits<uint16_t>::max())
+                    throw std::ios_base::failure("indexes overflowed 16 bits");
+                indexes[i] = indexes[i] + offset;
+                offset = indexes[i] + 1;
+            }
+        } else {
+            for (size_t i = 0; i < indexes.size(); i++) {
+                uint64_t index = indexes[i] - (i == 0 ? 0 : (indexes[i - 1] + 1));
+                READWRITE(COMPACTSIZE(index));
+            }
+        }
+    }
+};
+
+class BlockTransactions {
+public:
+    // A BlockTransactions message
+    uint256 blockhash;
+    std::vector<CTransaction> txn;
+
+    BlockTransactions() {}
+    BlockTransactions(const BlockTransactionsRequest& req) :
+        blockhash(req.blockhash), txn(req.indexes.size()) {}
+
+    ADD_SERIALIZE_METHODS;
+
+    template <typename Stream, typename Operation>
+    inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) {
+        READWRITE(blockhash);
+        uint64_t txn_size = (uint64_t)txn.size();
+        READWRITE(COMPACTSIZE(txn_size));
+        if (ser_action.ForRead()) {
+            size_t i = 0;
+            while (txn.size() < txn_size) {
+                txn.resize(std::min((uint64_t)(1000 + txn.size()), txn_size));
+                for (; i < txn.size(); i++)
+                    READWRITE(REF(TransactionCompressor(txn[i])));
+            }
+        } else {
+            for (size_t i = 0; i < txn.size(); i++)
+                READWRITE(REF(TransactionCompressor(txn[i])));
+        }
+    }
+};
+
+// Dumb serialization/storage-helper for CBlockHeaderAndShortTxIDs and PartiallyDownlaodedBlock
+struct PrefilledTransaction {
+    // Used as an offset since last prefilled tx in CBlockHeaderAndShortTxIDs,
+    // as a proper transaction-in-block-index in PartiallyDownloadedBlock
+    uint16_t index;
+    CTransaction tx;
+
+    ADD_SERIALIZE_METHODS;
+
+    template <typename Stream, typename Operation>
+    inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) {
+        uint64_t idx = index;
+        READWRITE(COMPACTSIZE(idx));
+        if (idx > std::numeric_limits<uint16_t>::max())
+            throw std::ios_base::failure("index overflowed 16-bits");
+        index = idx;
+        READWRITE(REF(TransactionCompressor(tx)));
+    }
+};
+
+typedef enum ReadStatus_t
+{
+    READ_STATUS_OK,
+    READ_STATUS_INVALID, // Invalid object, peer is sending bogus crap
+    READ_STATUS_FAILED, // Failed to process object
+} ReadStatus;
+
+class CBlockHeaderAndShortTxIDs {
+private:
+    mutable uint64_t shorttxidk0, shorttxidk1;
+    uint64_t nonce;
+
+    void FillShortTxIDSelector() const;
+
+    friend class PartiallyDownloadedBlock;
+
+    static const int SHORTTXIDS_LENGTH = 6;
+protected:
+    std::vector<uint64_t> shorttxids;
+    std::vector<PrefilledTransaction> prefilledtxn;
+
+public:
+    CBlockHeader header;
+
+    // Dummy for deserialization
+    CBlockHeaderAndShortTxIDs() {}
+
+    CBlockHeaderAndShortTxIDs(const CBlock& block);
+
+    uint64_t GetShortID(const uint256& txhash) const;
+
+    size_t BlockTxCount() const { return shorttxids.size() + prefilledtxn.size(); }
+
+    ADD_SERIALIZE_METHODS;
+
+    template <typename Stream, typename Operation>
+    inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) {
+        READWRITE(header);
+        READWRITE(nonce);
+
+        uint64_t shorttxids_size = (uint64_t)shorttxids.size();
+        READWRITE(COMPACTSIZE(shorttxids_size));
+        if (ser_action.ForRead()) {
+            size_t i = 0;
+            while (shorttxids.size() < shorttxids_size) {
+                shorttxids.resize(std::min((uint64_t)(1000 + shorttxids.size()), shorttxids_size));
+                for (; i < shorttxids.size(); i++) {
+                    uint32_t lsb = 0; uint16_t msb = 0;
+                    READWRITE(lsb);
+                    READWRITE(msb);
+                    shorttxids[i] = (uint64_t(msb) << 32) | uint64_t(lsb);
+                    static_assert(SHORTTXIDS_LENGTH == 6, "shorttxids serialization assumes 6-byte shorttxids");
+                }
+            }
+        } else {
+            for (size_t i = 0; i < shorttxids.size(); i++) {
+                uint32_t lsb = shorttxids[i] & 0xffffffff;
+                uint16_t msb = (shorttxids[i] >> 32) & 0xffff;
+                READWRITE(lsb);
+                READWRITE(msb);
+            }
+        }
+
+        READWRITE(prefilledtxn);
+
+        if (ser_action.ForRead())
+            FillShortTxIDSelector();
+    }
+};
+
+class PartiallyDownloadedBlock {
+protected:
+    std::vector<std::shared_ptr<const CTransaction> > txn_available;
+    CTxMemPool* pool;
+public:
+    CBlockHeader header;
+    PartiallyDownloadedBlock(CTxMemPool* poolIn) : pool(poolIn) {}
+
+    ReadStatus InitData(const CBlockHeaderAndShortTxIDs& cmpctblock);
+    bool IsTxAvailable(size_t index) const;
+    ReadStatus FillBlock(CBlock& block, const std::vector<CTransaction>& vtx_missing) const;
+};
+
+#endif

From f4f8f14adc79f71eb3cfd3a8d6dbfe9878d1e3f6 Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Mon, 25 Apr 2016 17:04:13 -0700
Subject: [PATCH 0512/1802] Add TestMemPoolEntryHelper::FromTx version for
 CTransaction

---
 src/test/test_bitcoin.cpp | 6 +++++-
 src/test/test_bitcoin.h   | 1 +
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/test/test_bitcoin.cpp b/src/test/test_bitcoin.cpp
index c68320ba8b8e6..199670918830f 100644
--- a/src/test/test_bitcoin.cpp
+++ b/src/test/test_bitcoin.cpp
@@ -126,7 +126,11 @@ TestChain100Setup::~TestChain100Setup()
 
 CTxMemPoolEntry TestMemPoolEntryHelper::FromTx(CMutableTransaction &tx, CTxMemPool *pool) {
     CTransaction txn(tx);
-    bool hasNoDependencies = pool ? pool->HasNoInputsOf(tx) : hadNoDependencies;
+    return FromTx(txn, pool);
+}
+
+CTxMemPoolEntry TestMemPoolEntryHelper::FromTx(CTransaction &txn, CTxMemPool *pool) {
+    bool hasNoDependencies = pool ? pool->HasNoInputsOf(txn) : hadNoDependencies;
     // Hack to assume either its completely dependent on other mempool txs or not at all
     CAmount inChainValue = hasNoDependencies ? txn.GetValueOut() : 0;
 
diff --git a/src/test/test_bitcoin.h b/src/test/test_bitcoin.h
index 57f66f6c6d0dc..78b87e7109b7d 100644
--- a/src/test/test_bitcoin.h
+++ b/src/test/test_bitcoin.h
@@ -78,6 +78,7 @@ struct TestMemPoolEntryHelper
         hadNoDependencies(false), spendsCoinbase(false), sigOpCount(1) { }
     
     CTxMemPoolEntry FromTx(CMutableTransaction &tx, CTxMemPool *pool = NULL);
+    CTxMemPoolEntry FromTx(CTransaction &tx, CTxMemPool *pool = NULL);
 
     // Change the default value
     TestMemPoolEntryHelper &Fee(CAmount _fee) { nFee = _fee; return *this; }

From e3b2222144a0def7fa61822bdd11fb7e6bdc70ec Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Mon, 25 Apr 2016 15:51:08 -0700
Subject: [PATCH 0513/1802] Add some blockencodings tests

---
 src/Makefile.test.include         |   1 +
 src/test/blockencodings_tests.cpp | 315 ++++++++++++++++++++++++++++++
 2 files changed, 316 insertions(+)
 create mode 100644 src/test/blockencodings_tests.cpp

diff --git a/src/Makefile.test.include b/src/Makefile.test.include
index 41d811fb5400f..c8918eb53f82f 100644
--- a/src/Makefile.test.include
+++ b/src/Makefile.test.include
@@ -45,6 +45,7 @@ BITCOIN_TESTS =\
   test/base58_tests.cpp \
   test/base64_tests.cpp \
   test/bip32_tests.cpp \
+  test/blockencodings_tests.cpp \
   test/bloom_tests.cpp \
   test/Checkpoints_tests.cpp \
   test/coins_tests.cpp \
diff --git a/src/test/blockencodings_tests.cpp b/src/test/blockencodings_tests.cpp
new file mode 100644
index 0000000000000..3884bf3fe37c3
--- /dev/null
+++ b/src/test/blockencodings_tests.cpp
@@ -0,0 +1,315 @@
+// Copyright (c) 2011-2015 The Bitcoin Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#include "blockencodings.h"
+#include "consensus/merkle.h"
+#include "chainparams.h"
+#include "random.h"
+
+#include "test/test_bitcoin.h"
+
+#include <boost/test/unit_test.hpp>
+
+struct RegtestingSetup : public TestingSetup {
+    RegtestingSetup() : TestingSetup(CBaseChainParams::REGTEST) {}
+};
+
+BOOST_FIXTURE_TEST_SUITE(blockencodings_tests, RegtestingSetup)
+
+static CBlock BuildBlockTestCase() {
+    CBlock block;
+    CMutableTransaction tx;
+    tx.vin.resize(1);
+    tx.vin[0].scriptSig.resize(10);
+    tx.vout.resize(1);
+    tx.vout[0].nValue = 42;
+
+    block.vtx.resize(3);
+    block.vtx[0] = tx;
+    block.nVersion = 42;
+    block.hashPrevBlock = GetRandHash();
+    block.nBits = 0x207fffff;
+
+    tx.vin[0].prevout.hash = GetRandHash();
+    tx.vin[0].prevout.n = 0;
+    block.vtx[1] = tx;
+
+    tx.vin.resize(10);
+    for (size_t i = 0; i < tx.vin.size(); i++) {
+        tx.vin[i].prevout.hash = GetRandHash();
+        tx.vin[i].prevout.n = 0;
+    }
+    block.vtx[2] = tx;
+
+    bool mutated;
+    block.hashMerkleRoot = BlockMerkleRoot(block, &mutated);
+    assert(!mutated);
+    while (!CheckProofOfWork(block.GetHash(), block.nBits, Params().GetConsensus())) ++block.nNonce;
+    return block;
+}
+
+// Number of shared use_counts we expect for a tx we havent touched
+// == 2 (mempool + our copy from the GetSharedTx call)
+#define SHARED_TX_OFFSET 2
+
+BOOST_AUTO_TEST_CASE(SimpleRoundTripTest)
+{
+    CTxMemPool pool(CFeeRate(0));
+    TestMemPoolEntryHelper entry;
+    CBlock block(BuildBlockTestCase());
+
+    pool.addUnchecked(block.vtx[2].GetHash(), entry.FromTx(block.vtx[2]));
+    BOOST_CHECK_EQUAL(pool.mapTx.find(block.vtx[2].GetHash())->GetSharedTx().use_count(), SHARED_TX_OFFSET + 0);
+
+    // Do a simple ShortTxIDs RT
+    {
+        CBlockHeaderAndShortTxIDs shortIDs(block);
+
+        CDataStream stream(SER_NETWORK, PROTOCOL_VERSION);
+        stream << shortIDs;
+
+        CBlockHeaderAndShortTxIDs shortIDs2;
+        stream >> shortIDs2;
+
+        PartiallyDownloadedBlock partialBlock(&pool);
+        BOOST_CHECK(partialBlock.InitData(shortIDs2) == READ_STATUS_OK);
+        BOOST_CHECK( partialBlock.IsTxAvailable(0));
+        BOOST_CHECK(!partialBlock.IsTxAvailable(1));
+        BOOST_CHECK( partialBlock.IsTxAvailable(2));
+
+        BOOST_CHECK_EQUAL(pool.mapTx.find(block.vtx[2].GetHash())->GetSharedTx().use_count(), SHARED_TX_OFFSET + 1);
+
+        std::list<CTransaction> removed;
+        pool.removeRecursive(block.vtx[2], removed);
+        BOOST_CHECK_EQUAL(removed.size(), 1);
+
+        CBlock block2;
+        std::vector<CTransaction> vtx_missing;
+        BOOST_CHECK(partialBlock.FillBlock(block2, vtx_missing) == READ_STATUS_INVALID); // No transactions
+
+        vtx_missing.push_back(block.vtx[2]); // Wrong transaction
+        partialBlock.FillBlock(block2, vtx_missing); // Current implementation doesn't check txn here, but don't require that
+        bool mutated;
+        BOOST_CHECK(block.hashMerkleRoot != BlockMerkleRoot(block2, &mutated));
+
+        vtx_missing[0] = block.vtx[1];
+        CBlock block3;
+        BOOST_CHECK(partialBlock.FillBlock(block3, vtx_missing) == READ_STATUS_OK);
+        BOOST_CHECK_EQUAL(block.GetHash().ToString(), block3.GetHash().ToString());
+        BOOST_CHECK_EQUAL(block.hashMerkleRoot.ToString(), BlockMerkleRoot(block3, &mutated).ToString());
+        BOOST_CHECK(!mutated);
+    }
+}
+
+class TestHeaderAndShortIDs {
+    // Utility to encode custom CBlockHeaderAndShortTxIDs
+public:
+    CBlockHeader header;
+    uint64_t nonce;
+    std::vector<uint64_t> shorttxids;
+    std::vector<PrefilledTransaction> prefilledtxn;
+
+    TestHeaderAndShortIDs(const CBlockHeaderAndShortTxIDs& orig) {
+        CDataStream stream(SER_NETWORK, PROTOCOL_VERSION);
+        stream << orig;
+        stream >> *this;
+    }
+    TestHeaderAndShortIDs(const CBlock& block) :
+        TestHeaderAndShortIDs(CBlockHeaderAndShortTxIDs(block)) {}
+
+    uint64_t GetShortID(const uint256& txhash) const {
+        CDataStream stream(SER_NETWORK, PROTOCOL_VERSION);
+        stream << *this;
+        CBlockHeaderAndShortTxIDs base;
+        stream >> base;
+        return base.GetShortID(txhash);
+    }
+
+    ADD_SERIALIZE_METHODS;
+
+    template <typename Stream, typename Operation>
+    inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) {
+        READWRITE(header);
+        READWRITE(nonce);
+        size_t shorttxids_size = shorttxids.size();
+        READWRITE(VARINT(shorttxids_size));
+        shorttxids.resize(shorttxids_size);
+        for (size_t i = 0; i < shorttxids.size(); i++) {
+            uint32_t lsb = shorttxids[i] & 0xffffffff;
+            uint16_t msb = (shorttxids[i] >> 32) & 0xffff;
+            READWRITE(lsb);
+            READWRITE(msb);
+            shorttxids[i] = (uint64_t(msb) << 32) | uint64_t(lsb);
+        }
+        READWRITE(prefilledtxn);
+    }
+};
+
+BOOST_AUTO_TEST_CASE(NonCoinbasePreforwardRTTest)
+{
+    CTxMemPool pool(CFeeRate(0));
+    TestMemPoolEntryHelper entry;
+    CBlock block(BuildBlockTestCase());
+
+    pool.addUnchecked(block.vtx[2].GetHash(), entry.FromTx(block.vtx[2]));
+    BOOST_CHECK_EQUAL(pool.mapTx.find(block.vtx[2].GetHash())->GetSharedTx().use_count(), SHARED_TX_OFFSET + 0);
+
+    // Test with pre-forwarding tx 1, but not coinbase
+    {
+        TestHeaderAndShortIDs shortIDs(block);
+        shortIDs.prefilledtxn.resize(1);
+        shortIDs.prefilledtxn[0] = {1, block.vtx[1]};
+        shortIDs.shorttxids.resize(2);
+        shortIDs.shorttxids[0] = shortIDs.GetShortID(block.vtx[0].GetHash());
+        shortIDs.shorttxids[1] = shortIDs.GetShortID(block.vtx[2].GetHash());
+
+        CDataStream stream(SER_NETWORK, PROTOCOL_VERSION);
+        stream << shortIDs;
+
+        CBlockHeaderAndShortTxIDs shortIDs2;
+        stream >> shortIDs2;
+
+        PartiallyDownloadedBlock partialBlock(&pool);
+        BOOST_CHECK(partialBlock.InitData(shortIDs2) == READ_STATUS_OK);
+        BOOST_CHECK(!partialBlock.IsTxAvailable(0));
+        BOOST_CHECK( partialBlock.IsTxAvailable(1));
+        BOOST_CHECK( partialBlock.IsTxAvailable(2));
+
+        BOOST_CHECK_EQUAL(pool.mapTx.find(block.vtx[2].GetHash())->GetSharedTx().use_count(), SHARED_TX_OFFSET + 1);
+
+        CBlock block2;
+        std::vector<CTransaction> vtx_missing;
+        BOOST_CHECK(partialBlock.FillBlock(block2, vtx_missing) == READ_STATUS_INVALID); // No transactions
+
+        vtx_missing.push_back(block.vtx[1]); // Wrong transaction
+        partialBlock.FillBlock(block2, vtx_missing); // Current implementation doesn't check txn here, but don't require that
+        bool mutated;
+        BOOST_CHECK(block.hashMerkleRoot != BlockMerkleRoot(block2, &mutated));
+
+        vtx_missing[0] = block.vtx[0];
+        CBlock block3;
+        BOOST_CHECK(partialBlock.FillBlock(block3, vtx_missing) == READ_STATUS_OK);
+        BOOST_CHECK_EQUAL(block.GetHash().ToString(), block3.GetHash().ToString());
+        BOOST_CHECK_EQUAL(block.hashMerkleRoot.ToString(), BlockMerkleRoot(block3, &mutated).ToString());
+        BOOST_CHECK(!mutated);
+
+        BOOST_CHECK_EQUAL(pool.mapTx.find(block.vtx[2].GetHash())->GetSharedTx().use_count(), SHARED_TX_OFFSET + 1);
+    }
+    BOOST_CHECK_EQUAL(pool.mapTx.find(block.vtx[2].GetHash())->GetSharedTx().use_count(), SHARED_TX_OFFSET + 0);
+}
+
+BOOST_AUTO_TEST_CASE(SufficientPreforwardRTTest)
+{
+    CTxMemPool pool(CFeeRate(0));
+    TestMemPoolEntryHelper entry;
+    CBlock block(BuildBlockTestCase());
+
+    pool.addUnchecked(block.vtx[1].GetHash(), entry.FromTx(block.vtx[1]));
+    BOOST_CHECK_EQUAL(pool.mapTx.find(block.vtx[1].GetHash())->GetSharedTx().use_count(), SHARED_TX_OFFSET + 0);
+
+    // Test with pre-forwarding coinbase + tx 2 with tx 1 in mempool
+    {
+        TestHeaderAndShortIDs shortIDs(block);
+        shortIDs.prefilledtxn.resize(2);
+        shortIDs.prefilledtxn[0] = {0, block.vtx[0]};
+        shortIDs.prefilledtxn[1] = {1, block.vtx[2]}; // id == 1 as it is 1 after index 1
+        shortIDs.shorttxids.resize(1);
+        shortIDs.shorttxids[0] = shortIDs.GetShortID(block.vtx[1].GetHash());
+
+        CDataStream stream(SER_NETWORK, PROTOCOL_VERSION);
+        stream << shortIDs;
+
+        CBlockHeaderAndShortTxIDs shortIDs2;
+        stream >> shortIDs2;
+
+        PartiallyDownloadedBlock partialBlock(&pool);
+        BOOST_CHECK(partialBlock.InitData(shortIDs2) == READ_STATUS_OK);
+        BOOST_CHECK( partialBlock.IsTxAvailable(0));
+        BOOST_CHECK( partialBlock.IsTxAvailable(1));
+        BOOST_CHECK( partialBlock.IsTxAvailable(2));
+
+        BOOST_CHECK_EQUAL(pool.mapTx.find(block.vtx[1].GetHash())->GetSharedTx().use_count(), SHARED_TX_OFFSET + 1);
+
+        CBlock block2;
+        std::vector<CTransaction> vtx_missing;
+        BOOST_CHECK(partialBlock.FillBlock(block2, vtx_missing) == READ_STATUS_OK);
+        BOOST_CHECK_EQUAL(block.GetHash().ToString(), block2.GetHash().ToString());
+        bool mutated;
+        BOOST_CHECK_EQUAL(block.hashMerkleRoot.ToString(), BlockMerkleRoot(block2, &mutated).ToString());
+        BOOST_CHECK(!mutated);
+
+        BOOST_CHECK_EQUAL(pool.mapTx.find(block.vtx[1].GetHash())->GetSharedTx().use_count(), SHARED_TX_OFFSET + 1);
+    }
+    BOOST_CHECK_EQUAL(pool.mapTx.find(block.vtx[1].GetHash())->GetSharedTx().use_count(), SHARED_TX_OFFSET + 0);
+}
+
+BOOST_AUTO_TEST_CASE(EmptyBlockRoundTripTest)
+{
+    CTxMemPool pool(CFeeRate(0));
+    CMutableTransaction coinbase;
+    coinbase.vin.resize(1);
+    coinbase.vin[0].scriptSig.resize(10);
+    coinbase.vout.resize(1);
+    coinbase.vout[0].nValue = 42;
+
+    CBlock block;
+    block.vtx.resize(1);
+    block.vtx[0] = coinbase;
+    block.nVersion = 42;
+    block.hashPrevBlock = GetRandHash();
+    block.nBits = 0x207fffff;
+
+    bool mutated;
+    block.hashMerkleRoot = BlockMerkleRoot(block, &mutated);
+    assert(!mutated);
+    while (!CheckProofOfWork(block.GetHash(), block.nBits, Params().GetConsensus())) ++block.nNonce;
+
+    // Test simple header round-trip with only coinbase
+    {
+        CBlockHeaderAndShortTxIDs shortIDs(block);
+
+        CDataStream stream(SER_NETWORK, PROTOCOL_VERSION);
+        stream << shortIDs;
+
+        CBlockHeaderAndShortTxIDs shortIDs2;
+        stream >> shortIDs2;
+
+        PartiallyDownloadedBlock partialBlock(&pool);
+        BOOST_CHECK(partialBlock.InitData(shortIDs2) == READ_STATUS_OK);
+        BOOST_CHECK(partialBlock.IsTxAvailable(0));
+
+        CBlock block2;
+        std::vector<CTransaction> vtx_missing;
+        BOOST_CHECK(partialBlock.FillBlock(block2, vtx_missing) == READ_STATUS_OK);
+        BOOST_CHECK_EQUAL(block.GetHash().ToString(), block2.GetHash().ToString());
+        bool mutated;
+        BOOST_CHECK_EQUAL(block.hashMerkleRoot.ToString(), BlockMerkleRoot(block2, &mutated).ToString());
+        BOOST_CHECK(!mutated);
+    }
+}
+
+BOOST_AUTO_TEST_CASE(TransactionsRequestSerializationTest) {
+    BlockTransactionsRequest req1;
+    req1.blockhash = GetRandHash();
+    req1.indexes.resize(4);
+    req1.indexes[0] = 0;
+    req1.indexes[1] = 1;
+    req1.indexes[2] = 3;
+    req1.indexes[3] = 4;
+
+    CDataStream stream(SER_NETWORK, PROTOCOL_VERSION);
+    stream << req1;
+
+    BlockTransactionsRequest req2;
+    stream >> req2;
+
+    BOOST_CHECK_EQUAL(req1.blockhash.ToString(), req2.blockhash.ToString());
+    BOOST_CHECK_EQUAL(req1.indexes.size(), req2.indexes.size());
+    BOOST_CHECK_EQUAL(req1.indexes[0], req2.indexes[0]);
+    BOOST_CHECK_EQUAL(req1.indexes[1], req2.indexes[1]);
+    BOOST_CHECK_EQUAL(req1.indexes[2], req2.indexes[2]);
+    BOOST_CHECK_EQUAL(req1.indexes[3], req2.indexes[3]);
+}
+
+BOOST_AUTO_TEST_SUITE_END()

From 00c40784fe737ca67122fdec6538c450d2a516f3 Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Mon, 6 Jun 2016 01:26:52 -0700
Subject: [PATCH 0514/1802] Add protocol messages for short-ids blocks

---
 src/protocol.cpp | 13 +++++++++++--
 src/protocol.h   | 31 +++++++++++++++++++++++++++++--
 src/version.h    |  5 ++++-
 3 files changed, 44 insertions(+), 5 deletions(-)

diff --git a/src/protocol.cpp b/src/protocol.cpp
index 422ef6f636512..2f90fb764cfbc 100644
--- a/src/protocol.cpp
+++ b/src/protocol.cpp
@@ -35,6 +35,10 @@ const char *FILTERCLEAR="filterclear";
 const char *REJECT="reject";
 const char *SENDHEADERS="sendheaders";
 const char *FEEFILTER="feefilter";
+const char *SENDCMPCT="sendcmpct";
+const char *CMPCTBLOCK="cmpctblock";
+const char *GETBLOCKTXN="getblocktxn";
+const char *BLOCKTXN="blocktxn";
 };
 
 static const char* ppszTypeName[] =
@@ -42,7 +46,8 @@ static const char* ppszTypeName[] =
     "ERROR", // Should never occur
     NetMsgType::TX,
     NetMsgType::BLOCK,
-    "filtered block" // Should never occur
+    "filtered block", // Should never occur
+    "compact block" // Should never occur
 };
 
 /** All known message types. Keep this in the same order as the list of
@@ -70,7 +75,11 @@ const static std::string allNetMessageTypes[] = {
     NetMsgType::FILTERCLEAR,
     NetMsgType::REJECT,
     NetMsgType::SENDHEADERS,
-    NetMsgType::FEEFILTER
+    NetMsgType::FEEFILTER,
+    NetMsgType::SENDCMPCT,
+    NetMsgType::CMPCTBLOCK,
+    NetMsgType::GETBLOCKTXN,
+    NetMsgType::BLOCKTXN,
 };
 const static std::vector<std::string> allNetMessageTypesVec(allNetMessageTypes, allNetMessageTypes+ARRAYLEN(allNetMessageTypes));
 
diff --git a/src/protocol.h b/src/protocol.h
index ab0a5817839b8..a72813e959c64 100644
--- a/src/protocol.h
+++ b/src/protocol.h
@@ -217,6 +217,32 @@ extern const char *SENDHEADERS;
  * @since protocol version 70013 as described by BIP133
  */
 extern const char *FEEFILTER;
+/**
+ * Contains a 1-byte bool and 8-byte LE version number.
+ * Indicates that a node is willing to provide blocks via "cmpctblock" messages.
+ * May indicate that a node prefers to receive new block announcements via a
+ * "cmpctblock" message rather than an "inv", depending on message contents.
+ * @since protocol version 70014 as described by BIP 152
+ */
+extern const char *SENDCMPCT;
+/**
+ * Contains a CBlockHeaderAndShortTxIDs object - providing a header and
+ * list of "short txids".
+ * @since protocol version 70014 as described by BIP 152
+ */
+extern const char *CMPCTBLOCK;
+/**
+ * Contains a BlockTransactionsRequest
+ * Peer should respond with "blocktxn" message.
+ * @since protocol version 70014 as described by BIP 152
+ */
+extern const char *GETBLOCKTXN;
+/**
+ * Contains a BlockTransactions.
+ * Sent in response to a "getblocktxn" message.
+ * @since protocol version 70014 as described by BIP 152
+ */
+extern const char *BLOCKTXN;
 };
 
 /* Get a vector of all valid message types (see above) */
@@ -315,9 +341,10 @@ class CInv
 enum {
     MSG_TX = 1,
     MSG_BLOCK,
-    // Nodes may always request a MSG_FILTERED_BLOCK in a getdata, however,
-    // MSG_FILTERED_BLOCK should not appear in any invs except as a part of getdata.
+    // Nodes may always request a MSG_FILTERED_BLOCK/MSG_CMPCT_BLOCK in a getdata, however,
+    // MSG_FILTERED_BLOCK/MSG_CMPCT_BLOCK should not appear in any invs except as a part of getdata.
     MSG_FILTERED_BLOCK,
+    MSG_CMPCT_BLOCK,
 };
 
 #endif // BITCOIN_PROTOCOL_H
diff --git a/src/version.h b/src/version.h
index 0e1d8a63ced6e..68ccd6d378323 100644
--- a/src/version.h
+++ b/src/version.h
@@ -9,7 +9,7 @@
  * network protocol versioning
  */
 
-static const int PROTOCOL_VERSION = 70013;
+static const int PROTOCOL_VERSION = 70014;
 
 //! initial proto version, to be increased after version/verack negotiation
 static const int INIT_PROTO_VERSION = 209;
@@ -39,4 +39,7 @@ static const int SENDHEADERS_VERSION = 70012;
 //! "feefilter" tells peers to filter invs to you by fee starts with this version
 static const int FEEFILTER_VERSION = 70013;
 
+//! shord-id-based block download starts with this version
+static const int SHORT_IDS_BLOCKS_VERSION = 70014;
+
 #endif // BITCOIN_VERSION_H

From 9c837d5468063917009aef8569ce6ce9ddd340d2 Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Mon, 11 Apr 2016 01:00:17 -0700
Subject: [PATCH 0515/1802] Add sender-side protocol implementation for
 CMPCTBLOCK stuff

---
 src/main.cpp | 110 ++++++++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 95 insertions(+), 15 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index 7d267bef7d984..911c0a648b999 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -274,6 +274,10 @@ struct CNodeState {
     bool fPreferredDownload;
     //! Whether this peer wants invs or headers (when possible) for block announcements.
     bool fPreferHeaders;
+    //! Whether this peer wants invs or cmpctblocks (when possible) for block announcements.
+    bool fPreferHeaderAndIDs;
+    //! Whether this peer will send us cmpctblocks if we request them
+    bool fProvidesHeaderAndIDs;
 
     CNodeState() {
         fCurrentlyConnected = false;
@@ -290,6 +294,8 @@ struct CNodeState {
         nBlocksInFlightValidHeaders = 0;
         fPreferredDownload = false;
         fPreferHeaders = false;
+        fPreferHeaderAndIDs = false;
+        fProvidesHeaderAndIDs = false;
     }
 };
 
@@ -4454,7 +4460,7 @@ void static ProcessGetData(CNode* pfrom, const Consensus::Params& consensusParam
             boost::this_thread::interruption_point();
             it++;
 
-            if (inv.type == MSG_BLOCK || inv.type == MSG_FILTERED_BLOCK)
+            if (inv.type == MSG_BLOCK || inv.type == MSG_FILTERED_BLOCK || inv.type == MSG_CMPCT_BLOCK)
             {
                 bool send = false;
                 BlockMap::iterator mi = mapBlockIndex.find(inv.hash);
@@ -4496,7 +4502,7 @@ void static ProcessGetData(CNode* pfrom, const Consensus::Params& consensusParam
                         assert(!"cannot load block from disk");
                     if (inv.type == MSG_BLOCK)
                         pfrom->PushMessage(NetMsgType::BLOCK, block);
-                    else // MSG_FILTERED_BLOCK)
+                    else if (inv.type == MSG_FILTERED_BLOCK)
                     {
                         LOCK(pfrom->cs_filter);
                         if (pfrom->pfilter)
@@ -4516,6 +4522,18 @@ void static ProcessGetData(CNode* pfrom, const Consensus::Params& consensusParam
                         // else
                             // no response
                     }
+                    else if (inv.type == MSG_CMPCT_BLOCK)
+                    {
+                        // If a peer is asking for old blocks, we're almost guaranteed
+                        // they wont have a useful mempool to match against a compact block,
+                        // and we dont feel like constructing the object for them, so
+                        // instead we respond with the full, non-compact block.
+                        if (mi->second->nHeight >= chainActive.Height() - 10) {
+                            CBlockHeaderAndShortTxIDs cmpctblock(block);
+                            pfrom->PushMessage(NetMsgType::CMPCTBLOCK, cmpctblock);
+                        } else
+                            pfrom->PushMessage(NetMsgType::BLOCK, block);
+                    }
 
                     // Trigger the peer node to send a getblocks request for the next batch of inventory
                     if (inv.hash == pfrom->hashContinue)
@@ -4839,6 +4857,18 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
         State(pfrom->GetId())->fPreferHeaders = true;
     }
 
+    else if (strCommand == NetMsgType::SENDCMPCT)
+    {
+        bool fAnnounceUsingCMPCTBLOCK = false;
+        uint64_t nCMPCTBLOCKVersion = 1;
+        vRecv >> fAnnounceUsingCMPCTBLOCK >> nCMPCTBLOCKVersion;
+        if (nCMPCTBLOCKVersion == 1) {
+            LOCK(cs_main);
+            State(pfrom->GetId())->fProvidesHeaderAndIDs = true;
+            State(pfrom->GetId())->fPreferHeaderAndIDs = fAnnounceUsingCMPCTBLOCK;
+        }
+    }
+
 
     else if (strCommand == NetMsgType::INV)
     {
@@ -4982,6 +5012,39 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
     }
 
 
+    else if (strCommand == NetMsgType::GETBLOCKTXN)
+    {
+        BlockTransactionsRequest req;
+        vRecv >> req;
+
+        BlockMap::iterator it = mapBlockIndex.find(req.blockhash);
+        if (it == mapBlockIndex.end() || !(it->second->nStatus & BLOCK_HAVE_DATA)) {
+            Misbehaving(pfrom->GetId(), 100);
+            LogPrintf("Peer %d sent us a getblocktxn for a block we don't have", pfrom->id);
+            return true;
+        }
+
+        if (it->second->nHeight < chainActive.Height() - 10) {
+            LogPrint("net", "Peer %d sent us a getblocktxn for a block > 10 deep", pfrom->id);
+            return true;
+        }
+
+        CBlock block;
+        assert(ReadBlockFromDisk(block, it->second, chainparams.GetConsensus()));
+
+        BlockTransactions resp(req);
+        for (size_t i = 0; i < req.indexes.size(); i++) {
+            if (req.indexes[i] >= block.vtx.size()) {
+                Misbehaving(pfrom->GetId(), 100);
+                LogPrintf("Peer %d sent us a getblocktxn with out-of-bounds tx indices", pfrom->id);
+                return true;
+            }
+            resp.txn[i] = block.vtx[req.indexes[i]];
+        }
+        pfrom->PushMessage(NetMsgType::BLOCKTXN, resp);
+    }
+
+
     else if (strCommand == NetMsgType::GETHEADERS)
     {
         CBlockLocator locator;
@@ -5824,7 +5887,9 @@ bool SendMessages(CNode* pto)
             // add all to the inv queue.
             LOCK(pto->cs_inventory);
             vector<CBlock> vHeaders;
-            bool fRevertToInv = (!state.fPreferHeaders || pto->vBlockHashesToAnnounce.size() > MAX_BLOCKS_TO_ANNOUNCE);
+            bool fRevertToInv = ((!state.fPreferHeaders &&
+                                 (!state.fPreferHeaderAndIDs || pto->vBlockHashesToAnnounce.size() > 1)) ||
+                                pto->vBlockHashesToAnnounce.size() > MAX_BLOCKS_TO_ANNOUNCE);
             CBlockIndex *pBestIndex = NULL; // last header queued for delivery
             ProcessBlockAvailability(pto->id); // ensure pindexBestKnownBlock is up-to-date
 
@@ -5876,6 +5941,33 @@ bool SendMessages(CNode* pto)
                     }
                 }
             }
+            if (!fRevertToInv && !vHeaders.empty()) {
+                if (vHeaders.size() == 1 && state.fPreferHeaderAndIDs) {
+                    // We only send up to 1 block as header-and-ids, as otherwise
+                    // probably means we're doing an initial-ish-sync or they're slow
+                    LogPrint("net", "%s sending header-and-ids %s to peer %d\n", __func__,
+                            vHeaders.front().GetHash().ToString(), pto->id);
+                    //TODO: Shouldn't need to reload block from disk, but requires refactor
+                    CBlock block;
+                    assert(ReadBlockFromDisk(block, pBestIndex, consensusParams));
+                    CBlockHeaderAndShortTxIDs cmpctblock(block);
+                    pto->PushMessage(NetMsgType::CMPCTBLOCK, cmpctblock);
+                    state.pindexBestHeaderSent = pBestIndex;
+                } else if (state.fPreferHeaders) {
+                    if (vHeaders.size() > 1) {
+                        LogPrint("net", "%s: %u headers, range (%s, %s), to peer=%d\n", __func__,
+                                vHeaders.size(),
+                                vHeaders.front().GetHash().ToString(),
+                                vHeaders.back().GetHash().ToString(), pto->id);
+                    } else {
+                        LogPrint("net", "%s: sending header %s to peer=%d\n", __func__,
+                                vHeaders.front().GetHash().ToString(), pto->id);
+                    }
+                    pto->PushMessage(NetMsgType::HEADERS, vHeaders);
+                    state.pindexBestHeaderSent = pBestIndex;
+                } else
+                    fRevertToInv = true;
+            }
             if (fRevertToInv) {
                 // If falling back to using an inv, just try to inv the tip.
                 // The last entry in vBlockHashesToAnnounce was our tip at some point
@@ -5901,18 +5993,6 @@ bool SendMessages(CNode* pto)
                             pto->id, hashToAnnounce.ToString());
                     }
                 }
-            } else if (!vHeaders.empty()) {
-                if (vHeaders.size() > 1) {
-                    LogPrint("net", "%s: %u headers, range (%s, %s), to peer=%d\n", __func__,
-                            vHeaders.size(),
-                            vHeaders.front().GetHash().ToString(),
-                            vHeaders.back().GetHash().ToString(), pto->id);
-                } else {
-                    LogPrint("net", "%s: sending header %s to peer=%d\n", __func__,
-                            vHeaders.front().GetHash().ToString(), pto->id);
-                }
-                pto->PushMessage(NetMsgType::HEADERS, vHeaders);
-                state.pindexBestHeaderSent = pBestIndex;
             }
             pto->vBlockHashesToAnnounce.clear();
         }

From 7734479a012be173b788e48ef1b99852437fe23c Mon Sep 17 00:00:00 2001
From: Will Binns <binns@21.co>
Date: Sun, 19 Jun 2016 14:15:58 -0600
Subject: [PATCH 0516/1802] readme: Omit phrasing; 'new'

This commit removes the word "new" in reference to describing Bitcoin,
as it has been around for over seven years, now.
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 8e816e7a43fa4..3c41649c1b8d9 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@ https://bitcoincore.org
 What is Bitcoin?
 ----------------
 
-Bitcoin is an experimental new digital currency that enables instant payments to
+Bitcoin is an experimental digital currency that enables instant payments to
 anyone, anywhere in the world. Bitcoin uses peer-to-peer technology to operate
 with no central authority: managing transactions and issuing money are carried
 out collectively by the network. Bitcoin Core is the name of open source

From d25cd3ec4e8961c5f36c29a65395f52d0db294c5 Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Thu, 14 Apr 2016 17:45:49 -0700
Subject: [PATCH 0517/1802] Add receiver-side protocol implementation for
 CMPCTBLOCK stuff

---
 src/main.cpp | 215 +++++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 207 insertions(+), 8 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index 911c0a648b999..26b215f94cc54 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -7,6 +7,7 @@
 
 #include "addrman.h"
 #include "arith_uint256.h"
+#include "blockencodings.h"
 #include "chainparams.h"
 #include "checkpoints.h"
 #include "checkqueue.h"
@@ -197,8 +198,9 @@ namespace {
     /** Blocks that are in flight, and that are in the queue to be downloaded. Protected by cs_main. */
     struct QueuedBlock {
         uint256 hash;
-        CBlockIndex* pindex;     //!< Optional.
-        bool fValidatedHeaders;  //!< Whether this block has validated headers at the time of request.
+        CBlockIndex* pindex;                                     //!< Optional.
+        bool fValidatedHeaders;                                  //!< Whether this block has validated headers at the time of request.
+        std::unique_ptr<PartiallyDownloadedBlock> partialBlock;  //!< Optional, used for CMPCTBLOCK downloads
     };
     map<uint256, pair<NodeId, list<QueuedBlock>::iterator> > mapBlocksInFlight;
 
@@ -364,6 +366,7 @@ void FinalizeNode(NodeId nodeid) {
 
 // Requires cs_main.
 // Returns a bool indicating whether we requested this block.
+// Also used if a block was /not/ received and timed out or started with another peer
 bool MarkBlockAsReceived(const uint256& hash) {
     map<uint256, pair<NodeId, list<QueuedBlock>::iterator> >::iterator itInFlight = mapBlocksInFlight.find(hash);
     if (itInFlight != mapBlocksInFlight.end()) {
@@ -387,17 +390,26 @@ bool MarkBlockAsReceived(const uint256& hash) {
 }
 
 // Requires cs_main.
-void MarkBlockAsInFlight(NodeId nodeid, const uint256& hash, const Consensus::Params& consensusParams, CBlockIndex *pindex = NULL) {
+// returns false, still setting pit, if the block was already in flight from the same peer
+// pit will only be valid as long as the same cs_main lock is being held
+bool MarkBlockAsInFlight(NodeId nodeid, const uint256& hash, const Consensus::Params& consensusParams, CBlockIndex *pindex = NULL, list<QueuedBlock>::iterator **pit = NULL) {
     CNodeState *state = State(nodeid);
     assert(state != NULL);
 
+    // Short-circuit most stuff in case its from the same node
+    map<uint256, pair<NodeId, list<QueuedBlock>::iterator> >::iterator itInFlight = mapBlocksInFlight.find(hash);
+    if (itInFlight != mapBlocksInFlight.end() && itInFlight->second.first == nodeid) {
+        *pit = &itInFlight->second.second;
+        return false;
+    }
+
     // Make sure it's not listed somewhere already.
     MarkBlockAsReceived(hash);
 
-    QueuedBlock newentry = {hash, pindex, pindex != NULL};
-    list<QueuedBlock>::iterator it = state->vBlocksInFlight.insert(state->vBlocksInFlight.end(), newentry);
+    list<QueuedBlock>::iterator it = state->vBlocksInFlight.insert(state->vBlocksInFlight.end(),
+            {hash, pindex, pindex != NULL, std::unique_ptr<PartiallyDownloadedBlock>(pit ? new PartiallyDownloadedBlock(&mempool) : NULL)});
     state->nBlocksInFlight++;
-    state->nBlocksInFlightValidHeaders += newentry.fValidatedHeaders;
+    state->nBlocksInFlightValidHeaders += it->fValidatedHeaders;
     if (state->nBlocksInFlight == 1) {
         // We're starting a block download (batch) from this peer.
         state->nDownloadingSince = GetTimeMicros();
@@ -405,7 +417,10 @@ void MarkBlockAsInFlight(NodeId nodeid, const uint256& hash, const Consensus::Pa
     if (state->nBlocksInFlightValidHeaders == 1 && pindex != NULL) {
         nPeersWithValidatedDownloads++;
     }
-    mapBlocksInFlight[hash] = std::make_pair(nodeid, it);
+    itInFlight = mapBlocksInFlight.insert(std::make_pair(hash, std::make_pair(nodeid, it))).first;
+    if (pit)
+        *pit = &itInFlight->second.second;
+    return true;
 }
 
 /** Check whether the last unknown block a peer advertised is not yet known. */
@@ -4783,6 +4798,16 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
             // nodes)
             pfrom->PushMessage(NetMsgType::SENDHEADERS);
         }
+        if (pfrom->nVersion >= SHORT_IDS_BLOCKS_VERSION) {
+            // Tell our peer we are willing to provide version-1 cmpctblocks
+            // However, we do not request new block announcements using
+            // cmpctblock messages.
+            // We send this to non-NODE NETWORK peers as well, because
+            // they may wish to request compact blocks from us
+            bool fAnnounceUsingCMPCTBLOCK = false;
+            uint64_t nCMPCTBLOCKVersion = 1;
+            pfrom->PushMessage(NetMsgType::SENDCMPCT, fAnnounceUsingCMPCTBLOCK, nCMPCTBLOCKVersion);
+        }
     }
 
 
@@ -4915,7 +4940,10 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
                     CNodeState *nodestate = State(pfrom->GetId());
                     if (CanDirectFetch(chainparams.GetConsensus()) &&
                         nodestate->nBlocksInFlight < MAX_BLOCKS_IN_TRANSIT_PER_PEER) {
-                        vToFetch.push_back(inv);
+                        if (nodestate->fProvidesHeaderAndIDs)
+                            vToFetch.push_back(CInv(MSG_CMPCT_BLOCK, inv.hash));
+                        else
+                            vToFetch.push_back(inv);
                         // Mark block as in flight already, even though the actual "getdata" message only goes out
                         // later (within the same cs_main lock, though).
                         MarkBlockAsInFlight(pfrom->GetId(), inv.hash, chainparams.GetConsensus());
@@ -5232,6 +5260,174 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
     }
 
 
+    else if (strCommand == NetMsgType::CMPCTBLOCK && !fImporting && !fReindex) // Ignore blocks received while importing
+    {
+        CBlockHeaderAndShortTxIDs cmpctblock;
+        vRecv >> cmpctblock;
+
+        LOCK(cs_main);
+
+        if (mapBlockIndex.find(cmpctblock.header.hashPrevBlock) == mapBlockIndex.end()) {
+            // Doesn't connect (or is genesis), instead of DoSing in AcceptBlockHeader, request deeper headers
+            if (!IsInitialBlockDownload())
+                pfrom->PushMessage(NetMsgType::GETHEADERS, chainActive.GetLocator(pindexBestHeader), uint256());
+            return true;
+        }
+
+        CBlockIndex *pindex = NULL;
+        CValidationState state;
+        if (!AcceptBlockHeader(cmpctblock.header, state, chainparams, &pindex)) {
+            int nDoS;
+            if (state.IsInvalid(nDoS)) {
+                if (nDoS > 0)
+                    Misbehaving(pfrom->GetId(), nDoS);
+                LogPrintf("Peer %d sent us invalid header via cmpctblock\n", pfrom->id);
+                return true;
+            }
+        }
+
+        // If AcceptBlockHeader returned true, it set pindex
+        assert(pindex);
+        UpdateBlockAvailability(pfrom->GetId(), pindex->GetBlockHash());
+
+        std::map<uint256, pair<NodeId, list<QueuedBlock>::iterator> >::iterator blockInFlightIt = mapBlocksInFlight.find(pindex->GetBlockHash());
+        bool fAlreadyInFlight = blockInFlightIt != mapBlocksInFlight.end();
+
+        if (pindex->nStatus & BLOCK_HAVE_DATA) // Nothing to do here
+            return true;
+
+        if (pindex->nChainWork <= chainActive.Tip()->nChainWork || // We know something better
+                pindex->nTx != 0) { // We had this block at some point, but pruned it
+            if (fAlreadyInFlight) {
+                // We requested this block for some reason, but our mempool will probably be useless
+                // so we just grab the block via normal getdata
+                std::vector<CInv> vInv(1);
+                vInv[0] = CInv(MSG_BLOCK, cmpctblock.header.GetHash());
+                pfrom->PushMessage(NetMsgType::GETDATA, vInv);
+                return true;
+            }
+        }
+
+        // If we're not close to tip yet, give up and let parallel block fetch work its magic
+        if (!fAlreadyInFlight && !CanDirectFetch(chainparams.GetConsensus()))
+            return true;
+
+        CNodeState *nodestate = State(pfrom->GetId());
+
+        // We want to be a bit conservative just to be extra careful about DoS
+        // possibilities in compact block processing...
+        if (pindex->nHeight <= chainActive.Height() + 2) {
+            if ((!fAlreadyInFlight && nodestate->nBlocksInFlight < MAX_BLOCKS_IN_TRANSIT_PER_PEER) ||
+                 (fAlreadyInFlight && blockInFlightIt->second.first == pfrom->GetId())) {
+                list<QueuedBlock>::iterator *queuedBlockIt = NULL;
+                if (!MarkBlockAsInFlight(pfrom->GetId(), pindex->GetBlockHash(), chainparams.GetConsensus(), pindex, &queuedBlockIt)) {
+                    if (!(*queuedBlockIt)->partialBlock)
+                        (*queuedBlockIt)->partialBlock.reset(new PartiallyDownloadedBlock(&mempool));
+                    else {
+                        // The block was already in flight using compact blocks from the same peer
+                        LogPrint("net", "Peer sent us compact block we were already syncing!\n");
+                        return true;
+                    }
+                }
+
+                PartiallyDownloadedBlock& partialBlock = *(*queuedBlockIt)->partialBlock;
+                ReadStatus status = partialBlock.InitData(cmpctblock);
+                if (status == READ_STATUS_INVALID) {
+                    MarkBlockAsReceived(pindex->GetBlockHash()); // Reset in-flight state in case of whitelist
+                    Misbehaving(pfrom->GetId(), 100);
+                    LogPrintf("Peer %d sent us invalid compact block\n", pfrom->id);
+                    return true;
+                } else if (status == READ_STATUS_FAILED) {
+                    // Duplicate txindexes, the block is now in-flight, so just request it
+                    std::vector<CInv> vInv(1);
+                    vInv[0] = CInv(MSG_BLOCK, cmpctblock.header.GetHash());
+                    pfrom->PushMessage(NetMsgType::GETDATA, vInv);
+                    return true;
+                }
+
+                BlockTransactionsRequest req;
+                for (size_t i = 0; i < cmpctblock.BlockTxCount(); i++) {
+                    if (!partialBlock.IsTxAvailable(i))
+                        req.indexes.push_back(i);
+                }
+                if (req.indexes.empty()) {
+                    // Dirty hack to jump to BLOCKTXN code (TODO: move message handling into their own functions)
+                    BlockTransactions txn;
+                    txn.blockhash = cmpctblock.header.GetHash();
+                    CDataStream blockTxnMsg(SER_NETWORK, PROTOCOL_VERSION);
+                    blockTxnMsg << txn;
+                    return ProcessMessage(pfrom, NetMsgType::BLOCKTXN, blockTxnMsg, nTimeReceived, chainparams);
+                } else {
+                    req.blockhash = pindex->GetBlockHash();
+                    pfrom->PushMessage(NetMsgType::GETBLOCKTXN, req);
+                }
+            }
+        } else {
+            if (fAlreadyInFlight) {
+                // We requested this block, but its far into the future, so our
+                // mempool will probably be useless - request the block normally
+                std::vector<CInv> vInv(1);
+                vInv[0] = CInv(MSG_BLOCK, cmpctblock.header.GetHash());
+                pfrom->PushMessage(NetMsgType::GETDATA, vInv);
+                return true;
+            } else {
+                // If this was an announce-cmpctblock, we want the same treatment as a header message
+                // Dirty hack to process as if it were just a headers message (TODO: move message handling into their own functions)
+                std::vector<CBlock> headers;
+                headers.push_back(cmpctblock.header);
+                CDataStream vHeadersMsg(SER_NETWORK, PROTOCOL_VERSION);
+                vHeadersMsg << headers;
+                return ProcessMessage(pfrom, NetMsgType::HEADERS, vHeadersMsg, nTimeReceived, chainparams);
+            }
+        }
+
+        CheckBlockIndex(chainparams.GetConsensus());
+    }
+
+    else if (strCommand == NetMsgType::BLOCKTXN && !fImporting && !fReindex) // Ignore blocks received while importing
+    {
+        BlockTransactions resp;
+        vRecv >> resp;
+
+        LOCK(cs_main);
+
+        map<uint256, pair<NodeId, list<QueuedBlock>::iterator> >::iterator it = mapBlocksInFlight.find(resp.blockhash);
+        if (it == mapBlocksInFlight.end() || !it->second.second->partialBlock ||
+                it->second.first != pfrom->GetId()) {
+            LogPrint("net", "Peer %d sent us block transactions for block we weren't expecting\n", pfrom->id);
+            return true;
+        }
+
+        PartiallyDownloadedBlock& partialBlock = *it->second.second->partialBlock;
+        CBlock block;
+        ReadStatus status = partialBlock.FillBlock(block, resp.txn);
+        if (status == READ_STATUS_INVALID) {
+            MarkBlockAsReceived(resp.blockhash); // Reset in-flight state in case of whitelist
+            Misbehaving(pfrom->GetId(), 100);
+            LogPrintf("Peer %d sent us invalid compact block/non-matching block transactions\n", pfrom->id);
+            return true;
+        } else if (status == READ_STATUS_FAILED) {
+            // Might have collided, fall back to getdata now :(
+            std::vector<CInv> invs;
+            invs.push_back(CInv(MSG_BLOCK, resp.blockhash));
+            pfrom->PushMessage(NetMsgType::GETDATA, invs);
+        } else {
+            CValidationState state;
+            ProcessNewBlock(state, chainparams, pfrom, &block, false, NULL);
+            int nDoS;
+            if (state.IsInvalid(nDoS)) {
+                assert (state.GetRejectCode() < REJECT_INTERNAL); // Blocks are never rejected with internal reject codes
+                pfrom->PushMessage(NetMsgType::REJECT, strCommand, (unsigned char)state.GetRejectCode(),
+                                   state.GetRejectReason().substr(0, MAX_REJECT_MESSAGE_LENGTH), block.GetHash());
+                if (nDoS > 0) {
+                    LOCK(cs_main);
+                    Misbehaving(pfrom->GetId(), nDoS);
+                }
+            }
+        }
+    }
+
+
     else if (strCommand == NetMsgType::HEADERS && !fImporting && !fReindex) // Ignore headers received while importing
     {
         std::vector<CBlockHeader> headers;
@@ -5334,6 +5530,9 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
                             pindexLast->GetBlockHash().ToString(), pindexLast->nHeight);
                 }
                 if (vGetData.size() > 0) {
+                    if (nodestate->fProvidesHeaderAndIDs && vGetData.size() == 1 && mapBlocksInFlight.size() == 1 && pindexLast->pprev->IsValid(BLOCK_VALID_CHAIN)) {
+                        vGetData[0] = CInv(MSG_CMPCT_BLOCK, vGetData[0].hash);
+                    }
                     pfrom->PushMessage(NetMsgType::GETDATA, vGetData);
                 }
             }

From 927f8eede0c9e0ab9cc2b5e43e39cfe3e1340dd6 Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Fri, 6 May 2016 11:50:24 -0700
Subject: [PATCH 0518/1802] Add ability to fetch CNode by NodeId

---
 src/net.cpp | 10 ++++++++++
 src/net.h   |  5 +++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/net.cpp b/src/net.cpp
index 4eca3d75ccae4..336163a89624d 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -368,6 +368,16 @@ CNode* FindNode(const CService& addr)
     return NULL;
 }
 
+//TODO: This is used in only one place in main, and should be removed
+CNode* FindNode(const NodeId nodeid)
+{
+    LOCK(cs_vNodes);
+    BOOST_FOREACH(CNode* pnode, vNodes)
+        if (pnode->GetId() == nodeid)
+            return (pnode);
+    return NULL;
+}
+
 CNode* ConnectNode(CAddress addrConnect, const char *pszDest, bool fCountFailure)
 {
     if (pszDest == NULL) {
diff --git a/src/net.h b/src/net.h
index 67b95fe0e4a25..aa9b2c11a3c22 100644
--- a/src/net.h
+++ b/src/net.h
@@ -80,12 +80,15 @@ static const unsigned int DEFAULT_MISBEHAVING_BANTIME = 60 * 60 * 24;  // Defaul
 unsigned int ReceiveFloodSize();
 unsigned int SendBufferSize();
 
+typedef int NodeId;
+
 void AddOneShot(const std::string& strDest);
 void AddressCurrentlyConnected(const CService& addr);
 CNode* FindNode(const CNetAddr& ip);
 CNode* FindNode(const CSubNet& subNet);
 CNode* FindNode(const std::string& addrName);
 CNode* FindNode(const CService& ip);
+CNode* FindNode(const NodeId id); //TODO: Remove this
 bool OpenNetworkConnection(const CAddress& addrConnect, bool fCountFailure, CSemaphoreGrant *grantOutbound = NULL, const char *strDest = NULL, bool fOneShot = false);
 void MapPort(bool fUseUPnP);
 unsigned short GetListenPort();
@@ -94,8 +97,6 @@ void StartNode(boost::thread_group& threadGroup, CScheduler& scheduler);
 bool StopNode();
 void SocketSendData(CNode *pnode);
 
-typedef int NodeId;
-
 struct CombinerAll
 {
     typedef bool result_type;

From 2f34a2e476ae9d0585c67e275d238e44119c56cf Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Fri, 6 May 2016 18:33:46 -0400
Subject: [PATCH 0519/1802] Get our "best three" peers to announce blocks using
 cmpctblocks

---
 src/main.cpp | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/src/main.cpp b/src/main.cpp
index 26b215f94cc54..60a33f9c2f97e 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -204,6 +204,9 @@ namespace {
     };
     map<uint256, pair<NodeId, list<QueuedBlock>::iterator> > mapBlocksInFlight;
 
+    /** Stack of nodes which we have set to announce using compact blocks */
+    list<NodeId> lNodesAnnouncingHeaderAndIDs;
+
     /** Number of preferable block download peers. */
     int nPreferredDownload = 0;
 
@@ -456,6 +459,28 @@ void UpdateBlockAvailability(NodeId nodeid, const uint256 &hash) {
     }
 }
 
+void MaybeSetPeerAsAnnouncingHeaderAndIDs(const CNodeState* nodestate, CNode* pfrom) {
+    if (nodestate->fProvidesHeaderAndIDs) {
+        BOOST_FOREACH(const NodeId nodeid, lNodesAnnouncingHeaderAndIDs)
+            if (nodeid == pfrom->GetId())
+                return;
+        bool fAnnounceUsingCMPCTBLOCK = false;
+        uint64_t nCMPCTBLOCKVersion = 1;
+        if (lNodesAnnouncingHeaderAndIDs.size() >= 3) {
+            // As per BIP152, we only get 3 of our peers to announce
+            // blocks using compact encodings.
+            CNode* pnodeStop = FindNode(lNodesAnnouncingHeaderAndIDs.front());
+            if (pnodeStop) {
+                pnodeStop->PushMessage(NetMsgType::SENDCMPCT, fAnnounceUsingCMPCTBLOCK, nCMPCTBLOCKVersion);
+                lNodesAnnouncingHeaderAndIDs.pop_front();
+            }
+        }
+        fAnnounceUsingCMPCTBLOCK = true;
+        pfrom->PushMessage(NetMsgType::SENDCMPCT, fAnnounceUsingCMPCTBLOCK, nCMPCTBLOCKVersion);
+        lNodesAnnouncingHeaderAndIDs.push_back(pfrom->GetId());
+    }
+}
+
 // Requires cs_main
 bool CanDirectFetch(const Consensus::Params &consensusParams)
 {
@@ -5531,6 +5556,10 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
                 }
                 if (vGetData.size() > 0) {
                     if (nodestate->fProvidesHeaderAndIDs && vGetData.size() == 1 && mapBlocksInFlight.size() == 1 && pindexLast->pprev->IsValid(BLOCK_VALID_CHAIN)) {
+                        // We seem to be rather well-synced, so it appears pfrom was the first to provide us
+                        // with this block! Let's get them to announce using compact blocks in the future.
+                        MaybeSetPeerAsAnnouncingHeaderAndIDs(nodestate, pfrom);
+                        // In any case, we want to download using a compact block, not a regular one
                         vGetData[0] = CInv(MSG_CMPCT_BLOCK, vGetData[0].hash);
                     }
                     pfrom->PushMessage(NetMsgType::GETDATA, vGetData);

From 56ba5167272bc5afa8629ad93f16ed5135490bf5 Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Wed, 8 Jun 2016 15:43:50 -0700
Subject: [PATCH 0520/1802] Add reconstruction debug logging

---
 src/blockencodings.cpp | 16 +++++++++++++++-
 src/blockencodings.h   |  1 +
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/blockencodings.cpp b/src/blockencodings.cpp
index c6b79f4201c55..204de45c29fe7 100644
--- a/src/blockencodings.cpp
+++ b/src/blockencodings.cpp
@@ -11,6 +11,7 @@
 #include "streams.h"
 #include "txmempool.h"
 #include "main.h"
+#include "util.h"
 
 #include <unordered_map>
 
@@ -72,6 +73,7 @@ ReadStatus PartiallyDownloadedBlock::InitData(const CBlockHeaderAndShortTxIDs& c
         }
         txn_available[lastprefilledindex] = std::make_shared<CTransaction>(cmpctblock.prefilledtxn[i].tx);
     }
+    prefilled_count = cmpctblock.prefilledtxn.size();
 
     // Calculate map of txids -> positions and check mempool to see what we have (or dont)
     // Because well-formed cmpctblock messages will have a (relatively) uniform distribution
@@ -103,11 +105,15 @@ ReadStatus PartiallyDownloadedBlock::InitData(const CBlockHeaderAndShortTxIDs& c
             if (!have_txn[idit->second]) {
                 txn_available[idit->second] = it->GetSharedTx();
                 have_txn[idit->second]  = true;
+                mempool_count++;
             } else {
                 // If we find two mempool txn that match the short id, just request it.
                 // This should be rare enough that the extra bandwidth doesn't matter,
                 // but eating a round-trip due to FillBlock failure would be annoying
-                txn_available[idit->second].reset();
+                if (txn_available[idit->second]) {
+                    txn_available[idit->second].reset();
+                    mempool_count--;
+                }
             }
         }
         // Though ideally we'd continue scanning for the two-txn-match-shortid case,
@@ -117,6 +123,8 @@ ReadStatus PartiallyDownloadedBlock::InitData(const CBlockHeaderAndShortTxIDs& c
             break;
     }
 
+    LogPrint("cmpctblock", "Initialized PartiallyDownloadedBlock for block %s using a cmpctblock of size %lu\n", cmpctblock.header.GetHash().ToString(), cmpctblock.GetSerializeSize(SER_NETWORK, PROTOCOL_VERSION));
+
     return READ_STATUS_OK;
 }
 
@@ -154,5 +162,11 @@ ReadStatus PartiallyDownloadedBlock::FillBlock(CBlock& block, const std::vector<
         return READ_STATUS_INVALID;
     }
 
+    LogPrint("cmpctblock", "Successfully reconstructed block %s with %lu txn prefilled, %lu txn from mempool and %lu txn requested\n", header.GetHash().ToString(), prefilled_count, mempool_count, vtx_missing.size());
+    if (vtx_missing.size() < 5) {
+        for(const CTransaction& tx : vtx_missing)
+            LogPrint("cmpctblock", "Reconstructed block %s required tx %s\n", header.GetHash().ToString(), tx.GetHash().ToString());
+    }
+
     return READ_STATUS_OK;
 }
diff --git a/src/blockencodings.h b/src/blockencodings.h
index adc60c85d0ecf..b980e9e28660f 100644
--- a/src/blockencodings.h
+++ b/src/blockencodings.h
@@ -192,6 +192,7 @@ class CBlockHeaderAndShortTxIDs {
 class PartiallyDownloadedBlock {
 protected:
     std::vector<std::shared_ptr<const CTransaction> > txn_available;
+    size_t prefilled_count = 0, mempool_count = 0;
     CTxMemPool* pool;
 public:
     CBlockHeader header;

From 678ee9793f6279c07b57c22c3cce983ab1e069d0 Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Mon, 6 Jun 2016 01:15:21 -0700
Subject: [PATCH 0521/1802] Add BIP 152 to implemented BIPs list

---
 doc/bips.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/bips.md b/doc/bips.md
index 1ec03d2fb1dd2..62bde20d944f4 100644
--- a/doc/bips.md
+++ b/doc/bips.md
@@ -26,3 +26,4 @@ BIPs that are implemented by Bitcoin Core (up-to-date up to **v0.13.0**):
 * [`BIP 125`](https://github.com/bitcoin/bips/blob/master/bip-0125.mediawiki): Opt-in full replace-by-fee signaling honoured in mempool and mining as of **v0.12.0** ([PR 6871](https://github.com/bitcoin/bitcoin/pull/6871)).
 * [`BIP 130`](https://github.com/bitcoin/bips/blob/master/bip-0130.mediawiki): direct headers announcement is negotiated with peer versions `>=70012` as of **v0.12.0** ([PR 6494](https://github.com/bitcoin/bitcoin/pull/6494)).
 * [`BIP 133`](https://github.com/bitcoin/bips/blob/master/bip-0133.mediawiki): feefilter messages are respected and sent for peer versions `>=70013` as of **v0.13.0** ([PR 7542](https://github.com/bitcoin/bitcoin/pull/7542)).
+* [`BIP 152`](https://github.com/bitcoin/bips/blob/master/bip-0152.mediawiki): Compact block transfer and related optimizations are used as of **v0.13.0** ([PR 8068](https://github.com/bitcoin/bitcoin/pull/8068)).

From 811902649d6aaddd886cb39b83aa69adf7b441bd Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Tue, 14 Jun 2016 23:59:03 -0700
Subject: [PATCH 0522/1802] Provide a flat list of txid/terators to txn in
 CTxMemPool

---
 src/txmempool.cpp | 14 +++++++++++++-
 src/txmempool.h   |  5 +++++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/src/txmempool.cpp b/src/txmempool.cpp
index 18c54b08bc2d3..ead28546de56a 100644
--- a/src/txmempool.cpp
+++ b/src/txmempool.cpp
@@ -438,6 +438,9 @@ bool CTxMemPool::addUnchecked(const uint256& hash, const CTxMemPoolEntry &entry,
     totalTxSize += entry.GetTxSize();
     minerPolicyEstimator->processTransaction(entry, fCurrentEstimate);
 
+    vTxHashes.emplace_back(hash, newit);
+    newit->vTxHashesIdx = vTxHashes.size() - 1;
+
     return true;
 }
 
@@ -447,6 +450,15 @@ void CTxMemPool::removeUnchecked(txiter it)
     BOOST_FOREACH(const CTxIn& txin, it->GetTx().vin)
         mapNextTx.erase(txin.prevout);
 
+    if (vTxHashes.size() > 1) {
+        vTxHashes[it->vTxHashesIdx] = std::move(vTxHashes.back());
+        vTxHashes[it->vTxHashesIdx].second->vTxHashesIdx = it->vTxHashesIdx;
+        vTxHashes.pop_back();
+        if (vTxHashes.size() * 2 < vTxHashes.capacity())
+            vTxHashes.shrink_to_fit();
+    } else
+        vTxHashes.clear();
+
     totalTxSize -= it->GetTxSize();
     cachedInnerUsage -= it->DynamicMemoryUsage();
     cachedInnerUsage -= memusage::DynamicUsage(mapLinks[it].parents) + memusage::DynamicUsage(mapLinks[it].children);
@@ -965,7 +977,7 @@ bool CCoinsViewMemPool::HaveCoins(const uint256 &txid) const {
 size_t CTxMemPool::DynamicMemoryUsage() const {
     LOCK(cs);
     // Estimate the overhead of mapTx to be 15 pointers + an allocation, as no exact formula for boost::multi_index_contained is implemented.
-    return memusage::MallocUsage(sizeof(CTxMemPoolEntry) + 15 * sizeof(void*)) * mapTx.size() + memusage::DynamicUsage(mapNextTx) + memusage::DynamicUsage(mapDeltas) + memusage::DynamicUsage(mapLinks) + cachedInnerUsage;
+    return memusage::MallocUsage(sizeof(CTxMemPoolEntry) + 15 * sizeof(void*)) * mapTx.size() + memusage::DynamicUsage(mapNextTx) + memusage::DynamicUsage(mapDeltas) + memusage::DynamicUsage(mapLinks) + memusage::DynamicUsage(vTxHashes) + cachedInnerUsage;
 }
 
 void CTxMemPool::RemoveStaged(setEntries &stage, bool updateDescendants) {
diff --git a/src/txmempool.h b/src/txmempool.h
index f0e9b2e2c6975..d6d0d72ff5874 100644
--- a/src/txmempool.h
+++ b/src/txmempool.h
@@ -150,6 +150,8 @@ class CTxMemPoolEntry
     uint64_t GetSizeWithAncestors() const { return nSizeWithAncestors; }
     CAmount GetModFeesWithAncestors() const { return nModFeesWithAncestors; }
     unsigned int GetSigOpCountWithAncestors() const { return nSigOpCountWithAncestors; }
+
+    mutable size_t vTxHashesIdx; //!< Index in mempool's vTxHashes
 };
 
 // Helpers for modifying CTxMemPool::mapTx, which is a boost multi_index.
@@ -457,7 +459,10 @@ class CTxMemPool
 
     mutable CCriticalSection cs;
     indexed_transaction_set mapTx;
+
     typedef indexed_transaction_set::nth_index<0>::type::iterator txiter;
+    std::vector<std::pair<uint256, txiter> > vTxHashes; //!< All tx hashes/entries in mapTx, in random order
+
     struct CompareIteratorByHash {
         bool operator()(const txiter &a, const txiter &b) const {
             return a->GetTx().GetHash() < b->GetTx().GetHash();

From 0d4cb48ef1b916679d9fad9f247a297c85c7fedf Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Sun, 19 Jun 2016 01:31:52 -0700
Subject: [PATCH 0523/1802] Use vTxHashes to optimize InitData significantly

---
 src/blockencodings.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/blockencodings.cpp b/src/blockencodings.cpp
index 204de45c29fe7..9a0805e40050d 100644
--- a/src/blockencodings.cpp
+++ b/src/blockencodings.cpp
@@ -99,11 +99,13 @@ ReadStatus PartiallyDownloadedBlock::InitData(const CBlockHeaderAndShortTxIDs& c
 
     std::vector<bool> have_txn(txn_available.size());
     LOCK(pool->cs);
-    for (CTxMemPool::txiter it = pool->mapTx.begin(); it != pool->mapTx.end(); it++) {
-        std::unordered_map<uint64_t, uint16_t>::iterator idit = shorttxids.find(cmpctblock.GetShortID(it->GetTx().GetHash()));
+    const std::vector<std::pair<uint256, CTxMemPool::txiter> >& vTxHashes = pool->vTxHashes;
+    for (size_t i = 0; i < vTxHashes.size(); i++) {
+        uint64_t shortid = cmpctblock.GetShortID(vTxHashes[i].first);
+        std::unordered_map<uint64_t, uint16_t>::iterator idit = shorttxids.find(shortid);
         if (idit != shorttxids.end()) {
             if (!have_txn[idit->second]) {
-                txn_available[idit->second] = it->GetSharedTx();
+                txn_available[idit->second] = vTxHashes[i].second->GetSharedTx();
                 have_txn[idit->second]  = true;
                 mempool_count++;
             } else {

From ccd06b94f69c3e7758c35ac4bcd36d0e9450e158 Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Sat, 18 Jun 2016 01:36:23 +0200
Subject: [PATCH 0524/1802] Elaborate bucket size math

---
 src/blockencodings.cpp | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/blockencodings.cpp b/src/blockencodings.cpp
index 9a0805e40050d..7fd6a9cf52d81 100644
--- a/src/blockencodings.cpp
+++ b/src/blockencodings.cpp
@@ -85,10 +85,16 @@ ReadStatus PartiallyDownloadedBlock::InitData(const CBlockHeaderAndShortTxIDs& c
         while (txn_available[i + index_offset])
             index_offset++;
         shorttxids[cmpctblock.shorttxids[i]] = i + index_offset;
-        // Bucket selection is a simple Binomial distribution. If we assume blocks of
-        // 10,000 transactions, allowing up to 12 elements per bucket should only fail
-        // once every ~1.3 million blocks and once every 74,000 blocks in a worst-case
-        // 16,000-transaction block.
+        // To determine the chance that the number of entries in a bucket exceeds N,
+        // we use the fact that the number of elements in a single bucket is
+        // binomially distributed (with n = the number of shorttxids S, and p =
+        // 1 / the number of buckets), that in the worst case the number of buckets is
+        // equal to S (due to std::unordered_map having a default load factor of 1.0),
+        // and that the chance for any bucket to exceed N elements is at most
+        // buckets * (the chance that any given bucket is above N elements).
+        // Thus: P(max_elements_per_bucket > N) <= S * (1 - cdf(binomial(n=S,p=1/S), N)).
+        // If we assume blocks of up to 16000, allowing 12 elements per bucket should
+        // only fail once per ~1 million block transfers (per peer and connection).
         if (shorttxids.bucket_size(shorttxids.bucket(cmpctblock.shorttxids[i])) > 12)
             return READ_STATUS_FAILED;
     }

From 2759597bc8617039a7ffa6210f4d49a985a20093 Mon Sep 17 00:00:00 2001
From: Jonas Schnelli <dev@jonasschnelli.ch>
Date: Mon, 20 Jun 2016 10:17:01 +0200
Subject: [PATCH 0525/1802] Only pass -lQt5PlatformSupport if >=Qt5.6

---
 build-aux/m4/bitcoin_qt.m4 | 4 +++-
 src/qt/bitcoin.cpp         | 3 +++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/build-aux/m4/bitcoin_qt.m4 b/build-aux/m4/bitcoin_qt.m4
index 210df3c025d0b..74d910267462e 100644
--- a/build-aux/m4/bitcoin_qt.m4
+++ b/build-aux/m4/bitcoin_qt.m4
@@ -343,7 +343,9 @@ AC_DEFUN([_BITCOIN_QT_FIND_STATIC_PLUGINS],[
          PKG_CHECK_MODULES([QTPRINT], [Qt5PrintSupport], [QT_LIBS="$QTPRINT_LIBS $QT_LIBS"])
        fi
      else
-       QT_LIBS="-lQt5PlatformSupport $QT_LIBS"
+       if ${PKG_CONFIG} --exists "Qt5Core >= 5.6" 2>/dev/null; then
+         QT_LIBS="-lQt5PlatformSupport $QT_LIBS"
+       fi
      fi
      ])
   else
diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp
index 6218ab6ab0542..64b5c83d72a00 100644
--- a/src/qt/bitcoin.cpp
+++ b/src/qt/bitcoin.cpp
@@ -533,6 +533,9 @@ int main(int argc, char *argv[])
     // Generate high-dpi pixmaps
     QApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
 #endif
+#if QT_VERSION >= 0x050600
+    QGuiApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
+#endif
 #ifdef Q_OS_MAC
     QApplication::setAttribute(Qt::AA_DontShowIconsInMenus);
 #endif

From fa58f94ff7f097260ebee791008dab368c7ac318 Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Mon, 20 Jun 2016 11:21:00 +0200
Subject: [PATCH 0526/1802] [qa] pull-tester: Start longest test first

---
 qa/pull-tester/rpc-tests.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/qa/pull-tester/rpc-tests.py b/qa/pull-tester/rpc-tests.py
index 98823085034af..6c0ed4510f103 100755
--- a/qa/pull-tester/rpc-tests.py
+++ b/qa/pull-tester/rpc-tests.py
@@ -101,6 +101,8 @@
 
 #Tests
 testScripts = [
+    # longest test should go first, to favor running tests in parallel
+    'p2p-fullblocktest.py',
     'walletbackup.py',
     'bip68-112-113-p2p.py',
     'wallet.py',
@@ -125,7 +127,6 @@
     'nodehandling.py',
     'reindex.py',
     'decodescript.py',
-    'p2p-fullblocktest.py',
     'blockchain.py',
     'disablewallet.py',
     'sendheaders.py',

From e5a680dc6a69cc5c35f2debeba15d4886fa4f789 Mon Sep 17 00:00:00 2001
From: fanquake <fanquake@gmail.com>
Date: Sun, 12 Jun 2016 12:59:02 +0800
Subject: [PATCH 0527/1802] [Doc] Update OS X build notes for 10.11 SDK

---
 doc/{README_osx.txt => README_osx.md} | 28 +++++++++++++--------------
 doc/build-osx.md                      |  8 +++++---
 doc/release-process.md                | 16 +++++----------
 3 files changed, 24 insertions(+), 28 deletions(-)
 rename doc/{README_osx.txt => README_osx.md} (81%)

diff --git a/doc/README_osx.txt b/doc/README_osx.md
similarity index 81%
rename from doc/README_osx.txt
rename to doc/README_osx.md
index c13efaa145c83..aed3cd97e1ecd 100644
--- a/doc/README_osx.txt
+++ b/doc/README_osx.md
@@ -1,21 +1,19 @@
 Deterministic OS X Dmg Notes.
 
 Working OS X DMGs are created in Linux by combining a recent clang,
-the Apple's binutils (ld, ar, etc), and DMG authoring tools.
+the Apple binutils (ld, ar, etc) and DMG authoring tools.
 
 Apple uses clang extensively for development and has upstreamed the necessary
 functionality so that a vanilla clang can take advantage. It supports the use
 of -F, -target, -mmacosx-version-min, and --sysroot, which are all necessary
-when building for OS X. A pre-compiled version of 3.2 is used because it was not
-available in the Precise repositories at the time this work was started. In the
-future, it can be switched to use system packages instead.
+when building for OS X.
 
 Apple's version of binutils (called cctools) contains lots of functionality
 missing in the FSF's binutils. In addition to extra linker options for
 frameworks and sysroots, several other tools are needed as well such as
 install_name_tool, lipo, and nmedit. These do not build under linux, so they
 have been patched to do so. The work here was used as a starting point:
-https://github.com/mingwandroid/toolchain4
+[mingwandroid/toolchain4](https://github.com/mingwandroid/toolchain4).
 
 In order to build a working toolchain, the following source packages are needed
 from Apple: cctools, dyld, and ld64.
@@ -29,16 +27,19 @@ originally done in toolchain4.
 
 To complicate things further, all builds must target an Apple SDK. These SDKs
 are free to download, but not redistributable.
-To obtain it, register for a developer account, then download the Xcode 6.1.1 dmg:
-https://developer.apple.com/devcenter/download.action?path=/Developer_Tools/xcode_6.1.1/xcode_6.1.1.dmg
+To obtain it, register for a developer account, then download the [Xcode 7.3.1 dmg](https://developer.apple.com/devcenter/download.action?path=/Developer_Tools/Xcode_7.3.1/Xcode_7.3.1.dmg).
 
 This file is several gigabytes in size, but only a single directory inside is
-needed: Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk
+needed:
+```
+Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.11.sdk
+```
 
 Unfortunately, the usual linux tools (7zip, hpmount, loopback mount) are incapable of opening this file.
 To create a tarball suitable for Gitian input, mount the dmg in OS X, then create it with:
-  $ tar -C /Volumes/Xcode/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/ -czf MacOSX10.9.sdk.tar.gz MacOSX10.9.sdk
-
+```
+  $ tar -C /Volumes/Xcode/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/ -czf MacOSX10.11.sdk.tar.gz MacOSX10.11.sdk
+```
 
 The Gitian descriptors build 2 sets of files: Linux tools, then Apple binaries
 which are created using these tools. The build process has been designed to
@@ -48,15 +49,14 @@ fully deterministic and may be freely redistributed.
 genisoimage is used to create the initial DMG. It is not deterministic as-is,
 so it has been patched. A system genisoimage will work fine, but it will not
 be deterministic because the file-order will change between invocations.
-The patch can be seen here:
-https://raw.githubusercontent.com/theuni/osx-cross-depends/master/patches/cdrtools/genisoimage.diff
+The patch can be seen here:  [theuni/osx-cross-depends](https://raw.githubusercontent.com/theuni/osx-cross-depends/master/patches/cdrtools/genisoimage.diff).
 No effort was made to fix this cleanly, so it likely leaks memory badly. But
 it's only used for a single invocation, so that's no real concern.
 
 genisoimage cannot compress DMGs, so afterwards, the 'dmg' tool from the
 libdmg-hfsplus project is used to compress it. There are several bugs in this
 tool and its maintainer has seemingly abandoned the project. It has been forked
-and is available (with fixes) here: https://github.com/theuni/libdmg-hfsplus .
+and is available (with fixes) here: [theuni/libdmg-hfsplus](https://github.com/theuni/libdmg-hfsplus).
 
 The 'dmg' tool has the ability to create DMGs from scratch as well, but this
 functionality is broken. Only the compression feature is currently used.
@@ -77,6 +77,6 @@ build process to remain somewhat deterministic. Here's how it works:
   that have been previously (deterministically) built in order to create a
   final dmg.
 - The Apple keyholder uses this unsigned app to create a detached signature,
-  using the script that is also included there.
+  using the script that is also included there. Detached signatures are available from this [repository](https://github.com/bitcoin-core/bitcoin-detached-sigs).
 - Builders feed the unsigned app + detached signature back into Gitian. It
   uses the pre-built tools to recombine the pieces into a deterministic dmg.
diff --git a/doc/build-osx.md b/doc/build-osx.md
index 89d7816c9a42b..c9eb4225abb5c 100644
--- a/doc/build-osx.md
+++ b/doc/build-osx.md
@@ -5,11 +5,13 @@ The built-in one is located in `/Applications/Utilities/Terminal.app`.
 
 Preparation
 -----------
-Download and install [Xcode](https://developer.apple.com/xcode/download).
+Install the OS X command line tools:
 
-Once installed, run `xcode-select --install` to install the OS X command line tools.
+`xcode-select --install`
 
-Install [Homebrew](http://brew.sh).
+When the popup appears, click `Install`.
+
+Then install [Homebrew](http://brew.sh).
 
 Dependencies
 ----------------------
diff --git a/doc/release-process.md b/doc/release-process.md
index 3bfcc38177bb2..f5d0d836d1ae9 100644
--- a/doc/release-process.md
+++ b/doc/release-process.md
@@ -3,7 +3,7 @@ Release Process
 
 Before every release candidate:
 
-* Update translations (ping wumpus on IRC) see [translation_process.md](https://github.com/bitcoin/bitcoin/blob/master/doc/translation_process.md#syncing-with-transifex)
+* Update translations (ping wumpus on IRC) see [translation_process.md](https://github.com/bitcoin/bitcoin/blob/master/doc/translation_process.md#synchronising-translations).
 
 Before every minor and major release:
 
@@ -13,7 +13,7 @@ Before every minor and major release:
 
 Before every major release:
 
-* Update hardcoded [seeds](/contrib/seeds/README.md), see [this pull request](https://github.com/bitcoin/bitcoin/pull/7415) for an example. 
+* Update hardcoded [seeds](/contrib/seeds/README.md), see [this pull request](https://github.com/bitcoin/bitcoin/pull/7415) for an example.
 
 ### First time / New builders
 
@@ -75,7 +75,7 @@ Ensure your gitian.sigs are up-to-date if you wish to gverify your builds agains
     git pull
     popd
 
-Ensure gitian-builder is up-to-date to take advantage of new caching features (`e9741525c` or later is recommended).
+Ensure gitian-builder is up-to-date:
 
     pushd ./gitian-builder
     git pull
@@ -89,13 +89,7 @@ Ensure gitian-builder is up-to-date to take advantage of new caching features (`
     wget -P inputs http://downloads.sourceforge.net/project/osslsigncode/osslsigncode/osslsigncode-1.7.1.tar.gz
     popd
 
-Register and download the Apple SDK: see [OS X readme](README_osx.txt) for details.
-
-https://developer.apple.com/devcenter/download.action?path=/Developer_Tools/xcode_6.1.1/xcode_6.1.1.dmg
-
-Using a Mac, create a tarball for the 10.9 SDK and copy it to the inputs directory:
-
-    tar -C /Volumes/Xcode/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/ -czf MacOSX10.9.sdk.tar.gz MacOSX10.9.sdk
+Create the OS X SDK tarball, see the [OS X readme](README_osx.md) for details, and copy it into the inputs directory.
 
 ### Optional: Seed the Gitian sources cache and offline git repositories
 
@@ -239,7 +233,7 @@ transmission-show -m <torrent file>
 Insert the magnet URI into the announcement sent to mailing lists. This permits
 people without access to `bitcoin.org` to download the binary distribution.
 Also put it into the `optional_magnetlink:` slot in the YAML file for
-bitcoin.org (see below for bitcoin.org update instructions). 
+bitcoin.org (see below for bitcoin.org update instructions).
 
 - Update bitcoin.org version
 

From fa6ad56948d1163ec7e3a7cd49d7e9d99787e27a Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Mon, 20 Jun 2016 14:57:39 +0200
Subject: [PATCH 0528/1802] [travis] Update SDK_URL

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index af9c476dc1d99..a6c51753b6727 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,7 +22,7 @@ env:
     - CCACHE_TEMPDIR=/tmp/.ccache-temp
     - CCACHE_COMPRESS=1
     - BASE_OUTDIR=$TRAVIS_BUILD_DIR/out
-    - SDK_URL=https://bitcoin.jonasschnelli.ch/sdks
+    - SDK_URL=https://bitcoincore.org/depends-sources/sdks
     - PYTHON_DEBUG=1
     - WINEDEBUG=fixme-all
   matrix:

From bf9c70b1008e1eada462955a6420e79a7d2a8352 Mon Sep 17 00:00:00 2001
From: TheLazieR Yip <thelazier@gmail.com>
Date: Tue, 21 Jun 2016 00:46:59 +0700
Subject: [PATCH 0529/1802] Fix LogPrint to LogPrintf

Printing Log without category defined should use LogPrintf

Github-Pull: #8230
Meta: PR should have been based on master in the first place
---
 src/qt/winshutdownmonitor.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/qt/winshutdownmonitor.cpp b/src/qt/winshutdownmonitor.cpp
index 1bc4f779597bf..a11da50588262 100644
--- a/src/qt/winshutdownmonitor.cpp
+++ b/src/qt/winshutdownmonitor.cpp
@@ -27,7 +27,7 @@ bool WinShutdownMonitor::nativeEventFilter(const QByteArray &eventType, void *pM
             // Warn only once as this is performance-critical
             static bool warned = false;
             if (!warned) {
-                LogPrint("%s: OpenSSL RAND_event() failed to seed OpenSSL PRNG with enough data.\n", __func__);
+                LogPrintf("%s: OpenSSL RAND_event() failed to seed OpenSSL PRNG with enough data.\n", __func__);
                 warned = true;
             }
        }

From b3e1348c46573630e5899b53f77236fd51f78d13 Mon Sep 17 00:00:00 2001
From: Jonas Schnelli <dev@jonasschnelli.ch>
Date: Tue, 21 Jun 2016 10:54:57 +0200
Subject: [PATCH 0530/1802] [Qt] fix a bug where the SplashScreen will not be
 hidden during startup

---
 src/qt/splashscreen.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/qt/splashscreen.cpp b/src/qt/splashscreen.cpp
index b46321fa866f1..e36d86fdddaa0 100644
--- a/src/qt/splashscreen.cpp
+++ b/src/qt/splashscreen.cpp
@@ -141,6 +141,11 @@ SplashScreen::~SplashScreen()
 void SplashScreen::slotFinish(QWidget *mainWin)
 {
     Q_UNUSED(mainWin);
+
+    /* If the window is minimized, hide() will be ignored. */
+    /* Make sure we de-minimize the splashscreen window before hiding */
+    if (isMinimized())
+        showNormal();
     hide();
 }
 

From b7bf037121f0a46ee9f7a31e3c0b78f118dadba2 Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Tue, 21 Jun 2016 14:10:53 +0200
Subject: [PATCH 0531/1802] doc: Mention ARM executables in release process

Mention ARM executables in the release process documentation
(these were introduced in #8188).
As well as that Linux tarballs have changed name to contain an
architecture tuple, instead of `linux32`/`linux64`.
Also mention that `-debug` files should not be uploaded (these were
introduced in #8167).
---
 doc/release-process.md | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/doc/release-process.md b/doc/release-process.md
index 3bfcc38177bb2..0263bdf693a34 100644
--- a/doc/release-process.md
+++ b/doc/release-process.md
@@ -210,8 +210,10 @@ sha256sum * > SHA256SUMS
 
 The list of files should be:
 ```
-bitcoin-${VERSION}-linux32.tar.gz
-bitcoin-${VERSION}-linux64.tar.gz
+bitcoin-${VERSION}-aarch64-linux-gnu.tar.gz
+bitcoin-${VERSION}-arm-linux-gnueabihf.tar.gz
+bitcoin-${VERSION}-i686-pc-linux-gnu.tar.gz
+bitcoin-${VERSION}-x86_64-linux-gnu.tar.gz
 bitcoin-${VERSION}-osx64.tar.gz
 bitcoin-${VERSION}-osx.dmg
 bitcoin-${VERSION}.tar.gz
@@ -220,6 +222,11 @@ bitcoin-${VERSION}-win32.zip
 bitcoin-${VERSION}-win64-setup.exe
 bitcoin-${VERSION}-win64.zip
 ```
+The `*-debug*` files generated by the gitian build contain debug symbols
+for troubleshooting by developers. It is assumed that anyone that is interested
+in debugging can run gitian to generate the files for themselves. To avoid
+end-user confusion about which file to pick, as well as save storage
+space *do not upload these to the bitcoin.org server, nor put them in the torrent*.
 
 - GPG-sign it, delete the unsigned file:
 ```

From 05f64c9940478f3d40104a5083a1b850f0358879 Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Tue, 21 Jun 2016 14:33:13 +0200
Subject: [PATCH 0532/1802] doc: Mention Linux ARM builds in release notes

---
 doc/release-notes.md | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/doc/release-notes.md b/doc/release-notes.md
index 6cc05989dbd6e..df3c265dcdbd2 100644
--- a/doc/release-notes.md
+++ b/doc/release-notes.md
@@ -61,6 +61,26 @@ When cross-compiling for a target that doesn't have C++11 libraries, configure w
 For running the functional tests in `qa/rpc-tests`, Python3.4 or higher is now
 required.
 
+Linux ARM builds
+------------------
+
+Due to popular request, Linux ARM builds have been added to the uploaded
+executables.
+
+The following extra files can be found in the download directory or torrent:
+
+- `bitcoin-${VERSION}-arm-linux-gnueabihf.tar.gz`: Linux binaries for the most
+  common 32-bit ARM architecture.
+- `bitcoin-${VERSION}-aarch64-linux-gnu.tar.gz`: Linux binaries for the most
+  common 64-bit ARM architecture.
+
+ARM builds are still experimental. If you have problems on a certain device or
+Linux distribution combination please report them on the bug tracker, it may be
+possible to resolve them.
+
+Note that Android is not considered ARM Linux in this context. The executables
+are not expected to work out of the box on Android.
+
 0.13.0 Change log
 =================
 

From 4cbe05bf205ceeb23d1d47360693c8235b497ed5 Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Tue, 21 Jun 2016 13:23:39 +0000
Subject: [PATCH 0533/1802] qt: Periodic transifex update

Pulls in the following new languages:

- `af` Afrikaans
- `es_419` Spanish (Latin America)
- `es_AR` Spanish (Argentina)
- `es_CO` Spanish (Colombia)
- `fil` Filipino
- `it_IT` Italian (Italy)
- `ro` Romanian
- `sr@latin` Serbian (Latin)
- `ta` Tamil
- `uz@Latn` Uzbek (Latin)
- `zh_HK` Chinese (Hong Kong)
---
 src/Makefile.qt.include              |   11 +
 src/qt/bitcoin_locale.qrc            |   11 +
 src/qt/bitcoinstrings.cpp            |   10 +
 src/qt/locale/bitcoin_af.ts          |  509 ++++++
 src/qt/locale/bitcoin_af_ZA.ts       |   26 +-
 src/qt/locale/bitcoin_ar.ts          |  152 +-
 src/qt/locale/bitcoin_bg.ts          |   10 +-
 src/qt/locale/bitcoin_ca.ts          |   80 +-
 src/qt/locale/bitcoin_ca@valencia.ts |    8 -
 src/qt/locale/bitcoin_ca_ES.ts       |   76 +-
 src/qt/locale/bitcoin_cs.ts          |  376 ++++-
 src/qt/locale/bitcoin_cs_CZ.ts       |   24 +
 src/qt/locale/bitcoin_da.ts          |   74 +-
 src/qt/locale/bitcoin_de.ts          |  106 +-
 src/qt/locale/bitcoin_el_GR.ts       |   13 +-
 src/qt/locale/bitcoin_en.ts          | 2176 ++++----------------------
 src/qt/locale/bitcoin_en_GB.ts       |   66 +-
 src/qt/locale/bitcoin_eo.ts          |   42 +-
 src/qt/locale/bitcoin_es.ts          |  242 ++-
 src/qt/locale/bitcoin_es_419.ts      |  173 ++
 src/qt/locale/bitcoin_es_AR.ts       |  373 +++++
 src/qt/locale/bitcoin_es_CL.ts       |  120 +-
 src/qt/locale/bitcoin_es_CO.ts       |  542 +++++++
 src/qt/locale/bitcoin_es_DO.ts       |    4 -
 src/qt/locale/bitcoin_es_MX.ts       |  100 +-
 src/qt/locale/bitcoin_et.ts          |    4 -
 src/qt/locale/bitcoin_fa.ts          |    4 -
 src/qt/locale/bitcoin_fi.ts          |   92 +-
 src/qt/locale/bitcoin_fil.ts         |  157 ++
 src/qt/locale/bitcoin_fr.ts          |   60 +-
 src/qt/locale/bitcoin_fr_FR.ts       | 1662 +++++++++++++++++++-
 src/qt/locale/bitcoin_gl.ts          |    4 -
 src/qt/locale/bitcoin_he.ts          |   16 +-
 src/qt/locale/bitcoin_hr.ts          |    4 -
 src/qt/locale/bitcoin_hu.ts          |    8 +-
 src/qt/locale/bitcoin_id_ID.ts       |  302 +++-
 src/qt/locale/bitcoin_it.ts          |   18 +-
 src/qt/locale/bitcoin_it_IT.ts       |  325 ++++
 src/qt/locale/bitcoin_ja.ts          |   64 +-
 src/qt/locale/bitcoin_ka.ts          |    4 -
 src/qt/locale/bitcoin_ko_KR.ts       | 1336 ++++++++++++++--
 src/qt/locale/bitcoin_la.ts          |    4 -
 src/qt/locale/bitcoin_lt.ts          |   24 +-
 src/qt/locale/bitcoin_lv_LV.ts       |    4 -
 src/qt/locale/bitcoin_nb.ts          |   12 -
 src/qt/locale/bitcoin_nl.ts          |   68 +-
 src/qt/locale/bitcoin_pam.ts         |    4 -
 src/qt/locale/bitcoin_pl.ts          |  221 ++-
 src/qt/locale/bitcoin_pt_BR.ts       |  174 +-
 src/qt/locale/bitcoin_pt_PT.ts       |  894 +++++++++--
 src/qt/locale/bitcoin_ro.ts          |  169 ++
 src/qt/locale/bitcoin_ro_RO.ts       |  138 +-
 src/qt/locale/bitcoin_ru.ts          |   36 +-
 src/qt/locale/bitcoin_ru_RU.ts       |   52 +
 src/qt/locale/bitcoin_sk.ts          |  287 +++-
 src/qt/locale/bitcoin_sl_SI.ts       |   20 +-
 src/qt/locale/bitcoin_sq.ts          |    8 +
 src/qt/locale/bitcoin_sr@latin.ts    |  653 ++++++++
 src/qt/locale/bitcoin_sv.ts          |   64 +-
 src/qt/locale/bitcoin_ta.ts          | 1029 ++++++++++++
 src/qt/locale/bitcoin_th_TH.ts       |  182 ++-
 src/qt/locale/bitcoin_tr.ts          |   72 +-
 src/qt/locale/bitcoin_tr_TR.ts       |    8 +
 src/qt/locale/bitcoin_uk.ts          |   16 +-
 src/qt/locale/bitcoin_uz@Cyrl.ts     |    4 -
 src/qt/locale/bitcoin_uz@Latn.ts     |  169 ++
 src/qt/locale/bitcoin_zh_CN.ts       |   80 +-
 src/qt/locale/bitcoin_zh_HK.ts       |  521 ++++++
 src/qt/locale/bitcoin_zh_TW.ts       |  178 ++-
 69 files changed, 11761 insertions(+), 2714 deletions(-)
 create mode 100644 src/qt/locale/bitcoin_af.ts
 create mode 100644 src/qt/locale/bitcoin_es_419.ts
 create mode 100644 src/qt/locale/bitcoin_es_AR.ts
 create mode 100644 src/qt/locale/bitcoin_es_CO.ts
 create mode 100644 src/qt/locale/bitcoin_fil.ts
 create mode 100644 src/qt/locale/bitcoin_it_IT.ts
 create mode 100644 src/qt/locale/bitcoin_ro.ts
 create mode 100644 src/qt/locale/bitcoin_sr@latin.ts
 create mode 100644 src/qt/locale/bitcoin_ta.ts
 create mode 100644 src/qt/locale/bitcoin_uz@Latn.ts
 create mode 100644 src/qt/locale/bitcoin_zh_HK.ts

diff --git a/src/Makefile.qt.include b/src/Makefile.qt.include
index 9381cca9f256c..dc775a3568d78 100644
--- a/src/Makefile.qt.include
+++ b/src/Makefile.qt.include
@@ -3,6 +3,7 @@ EXTRA_LIBRARIES += qt/libbitcoinqt.a
 
 # bitcoin qt core #
 QT_TS = \
+  qt/locale/bitcoin_af.ts \
   qt/locale/bitcoin_af_ZA.ts \
   qt/locale/bitcoin_ar.ts \
   qt/locale/bitcoin_be_BY.ts \
@@ -22,7 +23,10 @@ QT_TS = \
   qt/locale/bitcoin_en_GB.ts \
   qt/locale/bitcoin_en.ts \
   qt/locale/bitcoin_eo.ts \
+  qt/locale/bitcoin_es_419.ts \
+  qt/locale/bitcoin_es_AR.ts \
   qt/locale/bitcoin_es_CL.ts \
+  qt/locale/bitcoin_es_CO.ts \
   qt/locale/bitcoin_es_DO.ts \
   qt/locale/bitcoin_es_ES.ts \
   qt/locale/bitcoin_es_MX.ts \
@@ -33,6 +37,7 @@ QT_TS = \
   qt/locale/bitcoin_eu_ES.ts \
   qt/locale/bitcoin_fa_IR.ts \
   qt/locale/bitcoin_fa.ts \
+  qt/locale/bitcoin_fil.ts \
   qt/locale/bitcoin_fi.ts \
   qt/locale/bitcoin_fr_CA.ts \
   qt/locale/bitcoin_fr_FR.ts \
@@ -43,6 +48,7 @@ QT_TS = \
   qt/locale/bitcoin_hr.ts \
   qt/locale/bitcoin_hu.ts \
   qt/locale/bitcoin_id_ID.ts \
+  qt/locale/bitcoin_it_IT.ts \
   qt/locale/bitcoin_it.ts \
   qt/locale/bitcoin_ja.ts \
   qt/locale/bitcoin_ka.ts \
@@ -62,22 +68,27 @@ QT_TS = \
   qt/locale/bitcoin_pt_BR.ts \
   qt/locale/bitcoin_pt_PT.ts \
   qt/locale/bitcoin_ro_RO.ts \
+  qt/locale/bitcoin_ro.ts \
   qt/locale/bitcoin_ru_RU.ts \
   qt/locale/bitcoin_ru.ts \
   qt/locale/bitcoin_sk.ts \
   qt/locale/bitcoin_sl_SI.ts \
   qt/locale/bitcoin_sq.ts \
+  qt/locale/bitcoin_sr@latin.ts \
   qt/locale/bitcoin_sr.ts \
   qt/locale/bitcoin_sv.ts \
+  qt/locale/bitcoin_ta.ts \
   qt/locale/bitcoin_th_TH.ts \
   qt/locale/bitcoin_tr_TR.ts \
   qt/locale/bitcoin_tr.ts \
   qt/locale/bitcoin_uk.ts \
   qt/locale/bitcoin_ur_PK.ts \
   qt/locale/bitcoin_uz@Cyrl.ts \
+  qt/locale/bitcoin_uz@Latn.ts \
   qt/locale/bitcoin_vi.ts \
   qt/locale/bitcoin_vi_VN.ts \
   qt/locale/bitcoin_zh_CN.ts \
+  qt/locale/bitcoin_zh_HK.ts \
   qt/locale/bitcoin_zh.ts \
   qt/locale/bitcoin_zh_TW.ts
 
diff --git a/src/qt/bitcoin_locale.qrc b/src/qt/bitcoin_locale.qrc
index a8a0253b078ff..1acda7f28caaf 100644
--- a/src/qt/bitcoin_locale.qrc
+++ b/src/qt/bitcoin_locale.qrc
@@ -1,5 +1,6 @@
 <!DOCTYPE RCC><RCC version="1.0">
     <qresource prefix="/translations">
+        <file alias="af">locale/bitcoin_af.qm</file>
         <file alias="af_ZA">locale/bitcoin_af_ZA.qm</file>
         <file alias="ar">locale/bitcoin_ar.qm</file>
         <file alias="be_BY">locale/bitcoin_be_BY.qm</file>
@@ -19,7 +20,10 @@
         <file alias="en_GB">locale/bitcoin_en_GB.qm</file>
         <file alias="en">locale/bitcoin_en.qm</file>
         <file alias="eo">locale/bitcoin_eo.qm</file>
+        <file alias="es_419">locale/bitcoin_es_419.qm</file>
+        <file alias="es_AR">locale/bitcoin_es_AR.qm</file>
         <file alias="es_CL">locale/bitcoin_es_CL.qm</file>
+        <file alias="es_CO">locale/bitcoin_es_CO.qm</file>
         <file alias="es_DO">locale/bitcoin_es_DO.qm</file>
         <file alias="es_ES">locale/bitcoin_es_ES.qm</file>
         <file alias="es_MX">locale/bitcoin_es_MX.qm</file>
@@ -30,6 +34,7 @@
         <file alias="eu_ES">locale/bitcoin_eu_ES.qm</file>
         <file alias="fa_IR">locale/bitcoin_fa_IR.qm</file>
         <file alias="fa">locale/bitcoin_fa.qm</file>
+        <file alias="fil">locale/bitcoin_fil.qm</file>
         <file alias="fi">locale/bitcoin_fi.qm</file>
         <file alias="fr_CA">locale/bitcoin_fr_CA.qm</file>
         <file alias="fr_FR">locale/bitcoin_fr_FR.qm</file>
@@ -40,6 +45,7 @@
         <file alias="hr">locale/bitcoin_hr.qm</file>
         <file alias="hu">locale/bitcoin_hu.qm</file>
         <file alias="id_ID">locale/bitcoin_id_ID.qm</file>
+        <file alias="it_IT">locale/bitcoin_it_IT.qm</file>
         <file alias="it">locale/bitcoin_it.qm</file>
         <file alias="ja">locale/bitcoin_ja.qm</file>
         <file alias="ka">locale/bitcoin_ka.qm</file>
@@ -59,22 +65,27 @@
         <file alias="pt_BR">locale/bitcoin_pt_BR.qm</file>
         <file alias="pt_PT">locale/bitcoin_pt_PT.qm</file>
         <file alias="ro_RO">locale/bitcoin_ro_RO.qm</file>
+        <file alias="ro">locale/bitcoin_ro.qm</file>
         <file alias="ru_RU">locale/bitcoin_ru_RU.qm</file>
         <file alias="ru">locale/bitcoin_ru.qm</file>
         <file alias="sk">locale/bitcoin_sk.qm</file>
         <file alias="sl_SI">locale/bitcoin_sl_SI.qm</file>
         <file alias="sq">locale/bitcoin_sq.qm</file>
+        <file alias="sr@latin">locale/bitcoin_sr@latin.qm</file>
         <file alias="sr">locale/bitcoin_sr.qm</file>
         <file alias="sv">locale/bitcoin_sv.qm</file>
+        <file alias="ta">locale/bitcoin_ta.qm</file>
         <file alias="th_TH">locale/bitcoin_th_TH.qm</file>
         <file alias="tr_TR">locale/bitcoin_tr_TR.qm</file>
         <file alias="tr">locale/bitcoin_tr.qm</file>
         <file alias="uk">locale/bitcoin_uk.qm</file>
         <file alias="ur_PK">locale/bitcoin_ur_PK.qm</file>
         <file alias="uz@Cyrl">locale/bitcoin_uz@Cyrl.qm</file>
+        <file alias="uz@Latn">locale/bitcoin_uz@Latn.qm</file>
         <file alias="vi">locale/bitcoin_vi.qm</file>
         <file alias="vi_VN">locale/bitcoin_vi_VN.qm</file>
         <file alias="zh_CN">locale/bitcoin_zh_CN.qm</file>
+        <file alias="zh_HK">locale/bitcoin_zh_HK.qm</file>
         <file alias="zh">locale/bitcoin_zh.qm</file>
         <file alias="zh_TW">locale/bitcoin_zh_TW.qm</file>
     </qresource>
diff --git a/src/qt/bitcoinstrings.cpp b/src/qt/bitcoinstrings.cpp
index 9e53f19591070..ce8753fc7ddc6 100644
--- a/src/qt/bitcoinstrings.cpp
+++ b/src/qt/bitcoinstrings.cpp
@@ -60,6 +60,8 @@ QT_TRANSLATE_NOOP("bitcoin-core", ""
 QT_TRANSLATE_NOOP("bitcoin-core", ""
 "Do not keep transactions in the mempool longer than <n> hours (default: %u)"),
 QT_TRANSLATE_NOOP("bitcoin-core", ""
+"Error loading %s: You can't enable HD on a already existing non-HD wallet"),
+QT_TRANSLATE_NOOP("bitcoin-core", ""
 "Error reading %s! All keys read correctly, but transaction data or address "
 "book entries might be missing or incorrect."),
 QT_TRANSLATE_NOOP("bitcoin-core", ""
@@ -114,6 +116,9 @@ QT_TRANSLATE_NOOP("bitcoin-core", ""
 "Please check that your computer's date and time are correct! If your clock "
 "is wrong, %s will not work properly."),
 QT_TRANSLATE_NOOP("bitcoin-core", ""
+"Please contribute if you find %s useful. Visit %s for further information "
+"about the software."),
+QT_TRANSLATE_NOOP("bitcoin-core", ""
 "Prune configured below the minimum of %d MiB.  Please use a higher number."),
 QT_TRANSLATE_NOOP("bitcoin-core", ""
 "Prune: last wallet synchronisation goes beyond pruned data. You need to -"
@@ -168,6 +173,9 @@ QT_TRANSLATE_NOOP("bitcoin-core", ""
 QT_TRANSLATE_NOOP("bitcoin-core", ""
 "Use UPnP to map the listening port (default: 1 when listening and no -proxy)"),
 QT_TRANSLATE_NOOP("bitcoin-core", ""
+"Use hierarchical deterministic key generation (HD) after bip32. Only has "
+"effect during wallet creation/first start"),
+QT_TRANSLATE_NOOP("bitcoin-core", ""
 "Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: "
 "%s)"),
 QT_TRANSLATE_NOOP("bitcoin-core", ""
@@ -243,6 +251,7 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Error initializing wallet database environmen
 QT_TRANSLATE_NOOP("bitcoin-core", "Error loading %s"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Error loading %s: Wallet corrupted"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Error loading %s: Wallet requires newer version of %s"),
+QT_TRANSLATE_NOOP("bitcoin-core", "Error loading %s: You can't disable HD on a already existing HD wallet"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Error loading block database"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Error opening block database"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Error reading from database, shutting down."),
@@ -317,6 +326,7 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Specify pid file (default: %s)"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Specify wallet file (within data directory)"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Specify your own public address"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Spend unconfirmed change when sending transactions (default: %u)"),
+QT_TRANSLATE_NOOP("bitcoin-core", "The source code is available from %s."),
 QT_TRANSLATE_NOOP("bitcoin-core", "The transaction amount is too small to pay the fee"),
 QT_TRANSLATE_NOOP("bitcoin-core", "This is experimental software."),
 QT_TRANSLATE_NOOP("bitcoin-core", "Threshold for disconnecting misbehaving peers (default: %u)"),
diff --git a/src/qt/locale/bitcoin_af.ts b/src/qt/locale/bitcoin_af.ts
new file mode 100644
index 0000000000000..492c7bccd4e1b
--- /dev/null
+++ b/src/qt/locale/bitcoin_af.ts
@@ -0,0 +1,509 @@
+<TS language="af" version="2.1">
+<context>
+    <name>AddressBookPage</name>
+    <message>
+        <source>Right-click to edit address or label</source>
+        <translation>Regs-kliek om die adres of etiket te verander</translation>
+    </message>
+    <message>
+        <source>Create a new address</source>
+        <translation>Skep 'n nuwe adres</translation>
+    </message>
+    <message>
+        <source>&amp;New</source>
+        <translation>&amp;Nuut</translation>
+    </message>
+    <message>
+        <source>Copy the currently selected address to the system clipboard</source>
+        <translation>Dupliseer die geselekteerde adres na die sisteem se geheuebord</translation>
+    </message>
+    <message>
+        <source>&amp;Copy</source>
+        <translation>&amp;Dupliseer</translation>
+    </message>
+    <message>
+        <source>&amp;Copy Address</source>
+        <translation>&amp;Dupliseer Adres</translation>
+    </message>
+    <message>
+        <source>Delete the currently selected address from the list</source>
+        <translation>Verwyder die adres wat u gekies het van die lys</translation>
+    </message>
+    <message>
+        <source>Export the data in the current tab to a file</source>
+        <translation>Voer die inligting op hierdie bladsy uit na 'n leer</translation>
+    </message>
+    <message>
+        <source>&amp;Export</source>
+        <translation>&amp;Voer uit</translation>
+    </message>
+    <message>
+        <source>&amp;Delete</source>
+        <translation>&amp;Vee uit</translation>
+    </message>
+    <message>
+        <source>Choose the address to send coins to</source>
+        <translation>Kies die adres waarheen u munte wil stuur</translation>
+    </message>
+    <message>
+        <source>Choose the address to receive coins with</source>
+        <translation>Kies die adres wat die munte moet ontvang</translation>
+    </message>
+    <message>
+        <source>Sending addresses</source>
+        <translation>Stuurders adresse</translation>
+    </message>
+    <message>
+        <source>Receiving addresses</source>
+        <translation>Ontvanger adresse</translation>
+    </message>
+    <message>
+        <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source>
+        <translation>Hierdie is die adresse vanwaar u Bitcoin betalings stuur. U moet altyd die bedrag en die adres van die ontvanger nagaan voordat u enige munte stuur.</translation>
+    </message>
+    <message>
+        <source>These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source>
+        <translation>Hierdie is die adresse waar u Bitcoins sal ontvang. Ons beveel aan dat u 'n nuwe adres kies vir elke transaksie</translation>
+    </message>
+    <message>
+        <source>&amp;Edit</source>
+        <translation>&amp;Verander</translation>
+    </message>
+    <message>
+        <source>Export Address List</source>
+        <translation>Voer adreslys uit</translation>
+    </message>
+    <message>
+        <source>Comma separated file (*.csv)</source>
+        <translation>Comma separated file (*.csv)</translation>
+    </message>
+    <message>
+        <source>Exporting Failed</source>
+        <translation>Uitvoer was onsuksesvol</translation>
+    </message>
+    <message>
+        <source>There was an error trying to save the address list to %1. Please try again.</source>
+        <translation>Die adreslys kon nie in %1  gestoor word nie.  Probeer asseblief weer.</translation>
+    </message>
+</context>
+<context>
+    <name>AddressTableModel</name>
+    <message>
+        <source>Address</source>
+        <translation>Adres</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(geen etiket)</translation>
+    </message>
+</context>
+<context>
+    <name>AskPassphraseDialog</name>
+    <message>
+        <source>Passphrase Dialog</source>
+        <translation>Wagwoord Dialoog</translation>
+    </message>
+    <message>
+        <source>Enter passphrase</source>
+        <translation>Tik u wagwoord in</translation>
+    </message>
+    <message>
+        <source>New passphrase</source>
+        <translation>Nuwe wagwoord</translation>
+    </message>
+    <message>
+        <source>Repeat new passphrase</source>
+        <translation>Herhaal nuwe wagwoord</translation>
+    </message>
+    <message>
+        <source>Encrypt wallet</source>
+        <translation>Kodifiseer beursie</translation>
+    </message>
+    <message>
+        <source>This operation needs your wallet passphrase to unlock the wallet.</source>
+        <translation>U het u beursie se wagwoord nodig om toegang tot u beursie te verkry.</translation>
+    </message>
+    <message>
+        <source>Unlock wallet</source>
+        <translation>Sluit beursie oop</translation>
+    </message>
+    <message>
+        <source>This operation needs your wallet passphrase to decrypt the wallet.</source>
+        <translation>U het u beursie se wagwoord nodig om u beursie se kode te ontsyfer.</translation>
+    </message>
+    <message>
+        <source>Decrypt wallet</source>
+        <translation>Ontsleutel beursie</translation>
+    </message>
+    <message>
+        <source>Change passphrase</source>
+        <translation>Verander wagwoord</translation>
+    </message>
+    <message>
+        <source>Confirm wallet encryption</source>
+        <translation>Bevestig dat die beursie gekodifiseer is</translation>
+    </message>
+    <message>
+        <source>Warning: If you encrypt your wallet and lose your passphrase, you will &lt;b&gt;LOSE ALL OF YOUR BITCOINS&lt;/b&gt;!</source>
+        <translation>Waarskuwing: Indien u die beursie kodifiseer en u vergeet u wagwoord &lt;b&gt;VERLOOR U AL U BITCOINS&lt;/b&gt;!</translation>
+    </message>
+    <message>
+        <source>Are you sure you wish to encrypt your wallet?</source>
+        <translation>Is u seker dat u die beursie wil kodifiseer?</translation>
+    </message>
+    <message>
+        <source>Bitcoin Core will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source>
+        <translation>Bitcoin Kern gaan nou toemaak om die kodifikasie af te handel. Onthou dat die kodifikasie van u beursie nie altyd u munte kan beskerm teen diefstal deur kwaadwillige sagteware op u rekenaar nie.</translation>
+    </message>
+    <message>
+        <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source>
+        <translation>BELANGRIK:  Alle vorige kopieë en rugsteun-weergawes wat u tevore van die gemaak het, moet vervang word met die jongste weergawe van u nuutste gekodifiseerde beursie.  Alle vorige weergawes en rugsteun-kopieë van u beursie sal nutteloos raak die oomblik wat u die nuut-gekodifiseerde beursie begin gebruik.</translation>
+    </message>
+    <message>
+        <source>Warning: The Caps Lock key is on!</source>
+        <translation>WAARSKUWING:  Outomatiese Kapitalisering is aktief op u sleutelbord!</translation>
+    </message>
+    <message>
+        <source>Wallet encrypted</source>
+        <translation>Beursie gekodifiseer</translation>
+    </message>
+    <message>
+        <source>Enter the new passphrase to the wallet.&lt;br/&gt;Please use a passphrase of &lt;b&gt;ten or more random characters&lt;/b&gt;, or &lt;b&gt;eight or more words&lt;/b&gt;.</source>
+        <translation>Tik die nuwe wagwoord vir u beursie.&lt;br/&gt;Gerbuik asseblief 'n wagwoord met &lt;b&gt;tien of meer lukrake karakters&lt;/b&gt;, of &lt;b&gt;agt of meer woorde&lt;/b&gt;.</translation>
+    </message>
+    <message>
+        <source>Enter the old passphrase and new passphrase to the wallet.</source>
+        <translation>Tik die ou en die nuwe wagwoorde vir die beursie.</translation>
+    </message>
+    <message>
+        <source>Wallet encryption failed</source>
+        <translation>Kodifikasie was onsuksesvol</translation>
+    </message>
+    <message>
+        <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
+        <translation>Weens 'n interne fout het kodifikasie het nie geslaag nie.  U beursie is nie gekodifiseer nie</translation>
+    </message>
+    <message>
+        <source>The supplied passphrases do not match.</source>
+        <translation>Die wagwoorde stem nie ooreen nie.</translation>
+    </message>
+    <message>
+        <source>Wallet unlock failed</source>
+        <translation>Die beursie is nie oopgesluit nie</translation>
+    </message>
+    <message>
+        <source>The passphrase entered for the wallet decryption was incorrect.</source>
+        <translation>U het die verkeerde wagwoord ingetik.</translation>
+    </message>
+    </context>
+<context>
+    <name>BanTableModel</name>
+    <message>
+        <source>Banned Until</source>
+        <translation>Verban tot</translation>
+    </message>
+</context>
+<context>
+    <name>BitcoinGUI</name>
+    <message>
+        <source>Synchronizing with network...</source>
+        <translation>Netwerk-sinkronisasie...</translation>
+    </message>
+    <message>
+        <source>&amp;Overview</source>
+        <translation>&amp;Oorsig</translation>
+    </message>
+    <message>
+        <source>Node</source>
+        <translation>Node</translation>
+    </message>
+    <message>
+        <source>Show general overview of wallet</source>
+        <translation>Vertoon 'n algemene oorsig van die beursie</translation>
+    </message>
+    <message>
+        <source>&amp;Transactions</source>
+        <translation>&amp;Transaksies</translation>
+    </message>
+    <message>
+        <source>Quit application</source>
+        <translation>Stop en verlaat die applikasie</translation>
+    </message>
+    <message>
+        <source>&amp;Options...</source>
+        <translation>&amp;Opsies</translation>
+    </message>
+    <message>
+        <source>&amp;Encrypt Wallet...</source>
+        <translation>&amp;Kodifiseer Beursie</translation>
+    </message>
+    <message>
+        <source>&amp;Backup Wallet...</source>
+        <translation>&amp;Rugsteun-kopie van Beursie</translation>
+    </message>
+    <message>
+        <source>&amp;Change Passphrase...</source>
+        <translation>&amp;Verander Wagwoord</translation>
+    </message>
+    <message>
+        <source>&amp;Sending addresses...</source>
+        <translation>&amp;Versending adresse...</translation>
+    </message>
+    <message>
+        <source>&amp;Receiving addresses...</source>
+        <translation>&amp;Ontvanger adresse</translation>
+    </message>
+    <message>
+        <source>Open &amp;URI...</source>
+        <translation>Oop &amp; URI...</translation>
+    </message>
+    <message>
+        <source>Bitcoin Core client</source>
+        <translation>Bitcoin Kern klient</translation>
+    </message>
+    <message>
+        <source>Importing blocks from disk...</source>
+        <translation>Besig om blokke vanaf die hardeskyf in te voer...</translation>
+    </message>
+    <message>
+        <source>Reindexing blocks on disk...</source>
+        <translation>Besig met herindeksering van blokke op hardeskyf...</translation>
+    </message>
+    <message>
+        <source>Send coins to a Bitcoin address</source>
+        <translation>Stuur munte na 'n Bitcoin adres</translation>
+    </message>
+    <message>
+        <source>Backup wallet to another location</source>
+        <translation>Maak 'n rugsteun-kopié van beursie na 'n ander stoorplek</translation>
+    </message>
+    <message>
+        <source>Change the passphrase used for wallet encryption</source>
+        <translation>Verander die wagwoord wat ek vir kodifikasie van my beursie gebruik</translation>
+    </message>
+    <message>
+        <source>Bitcoin</source>
+        <translation>Bitcoin</translation>
+    </message>
+    <message>
+        <source>Wallet</source>
+        <translation>Beursie</translation>
+    </message>
+    <message>
+        <source>&amp;Send</source>
+        <translation>&amp;Stuur</translation>
+    </message>
+    <message>
+        <source>&amp;Receive</source>
+        <translation>&amp;Ontvang</translation>
+    </message>
+    <message>
+        <source>Show information about Bitcoin Core</source>
+        <translation>Vertoon inligting oor Bitcoin Kern</translation>
+    </message>
+    <message>
+        <source>Show or hide the main Window</source>
+        <translation>Wys of versteek die hoofbladsy</translation>
+    </message>
+    <message>
+        <source>Encrypt the private keys that belong to your wallet</source>
+        <translation>Kodifiseer die private sleutes wat aan jou beursie gekoppel is.</translation>
+    </message>
+    <message>
+        <source>Sign messages with your Bitcoin addresses to prove you own them</source>
+        <translation>Onderteken boodskappe met u Bitcoin adresse om u eienaarskap te bewys</translation>
+    </message>
+    <message>
+        <source>Verify messages to ensure they were signed with specified Bitcoin addresses</source>
+        <translation>Verifieër boodskappe om seker te maak dat dit met die gespesifiseerde Bitcoin adresse</translation>
+    </message>
+    <message>
+        <source>&amp;Help</source>
+        <translation>&amp;Help</translation>
+    </message>
+    <message>
+        <source>Bitcoin Core</source>
+        <translation>Bitcoin Kern</translation>
+    </message>
+    <message>
+        <source>Request payments (generates QR codes and bitcoin: URIs)</source>
+        <translation>Versoek betalings (genereer QR-kodes en bitcoin: URI's)</translation>
+    </message>
+    <message>
+        <source>&amp;About Bitcoin Core</source>
+        <translation>&amp;Omtrent Bitcoin Kern</translation>
+    </message>
+    <message>
+        <source>Modify configuration options for Bitcoin Core</source>
+        <translation>Verander konfigurasie-opsies vir Bitcoin Kern</translation>
+    </message>
+    <message>
+        <source>Show the list of used sending addresses and labels</source>
+        <translation>Vertoon die lys van gebruikte versendingsadresse en etikette</translation>
+    </message>
+    <message>
+        <source>Show the list of used receiving addresses and labels</source>
+        <translation>Vertoon die lys van gebruikte ontvangers-adresse en etikette</translation>
+    </message>
+    <message>
+        <source>Open a bitcoin: URI or payment request</source>
+        <translation>Skep 'n bitcoin: URI of betalingsversoek</translation>
+    </message>
+    </context>
+<context>
+    <name>ClientModel</name>
+    </context>
+<context>
+    <name>CoinControlDialog</name>
+    <message>
+        <source>(no label)</source>
+        <translation>(geen etiket)</translation>
+    </message>
+    </context>
+<context>
+    <name>EditAddressDialog</name>
+    </context>
+<context>
+    <name>FreespaceChecker</name>
+    </context>
+<context>
+    <name>HelpMessageDialog</name>
+    <message>
+        <source>Bitcoin Core</source>
+        <translation>Bitcoin Kern</translation>
+    </message>
+    <message>
+        <source>Reset all settings changes made over the GUI</source>
+        <translation>Herstel al my veranderinge aan die stellings terug na die verstek-opsies</translation>
+    </message>
+</context>
+<context>
+    <name>Intro</name>
+    <message>
+        <source>Bitcoin Core</source>
+        <translation>Bitcoin Kern</translation>
+    </message>
+    </context>
+<context>
+    <name>OpenURIDialog</name>
+    </context>
+<context>
+    <name>OptionsDialog</name>
+    </context>
+<context>
+    <name>OverviewPage</name>
+    </context>
+<context>
+    <name>PaymentServer</name>
+    </context>
+<context>
+    <name>PeerTableModel</name>
+    </context>
+<context>
+    <name>QObject</name>
+    </context>
+<context>
+    <name>QRImageWidget</name>
+    </context>
+<context>
+    <name>RPCConsole</name>
+    </context>
+<context>
+    <name>ReceiveCoinsDialog</name>
+    </context>
+<context>
+    <name>ReceiveRequestDialog</name>
+    <message>
+        <source>Address</source>
+        <translation>Adres</translation>
+    </message>
+    </context>
+<context>
+    <name>RecentRequestsTableModel</name>
+    <message>
+        <source>(no label)</source>
+        <translation>(geen etiket)</translation>
+    </message>
+    </context>
+<context>
+    <name>SendCoinsDialog</name>
+    <message>
+        <source>(no label)</source>
+        <translation>(geen etiket)</translation>
+    </message>
+    </context>
+<context>
+    <name>SendCoinsEntry</name>
+    </context>
+<context>
+    <name>ShutdownWindow</name>
+    </context>
+<context>
+    <name>SignVerifyMessageDialog</name>
+    </context>
+<context>
+    <name>SplashScreen</name>
+    <message>
+        <source>Bitcoin Core</source>
+        <translation>Bitcoin Kern</translation>
+    </message>
+    </context>
+<context>
+    <name>TrafficGraphWidget</name>
+    </context>
+<context>
+    <name>TransactionDesc</name>
+    </context>
+<context>
+    <name>TransactionDescDialog</name>
+    </context>
+<context>
+    <name>TransactionTableModel</name>
+    </context>
+<context>
+    <name>TransactionView</name>
+    <message>
+        <source>Exporting Failed</source>
+        <translation>Uitvoer was onsuksesvol</translation>
+    </message>
+    <message>
+        <source>Comma separated file (*.csv)</source>
+        <translation>Comma separated file (*.csv)</translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation>Adres</translation>
+    </message>
+    </context>
+<context>
+    <name>UnitDisplayStatusBarControl</name>
+    </context>
+<context>
+    <name>WalletFrame</name>
+    </context>
+<context>
+    <name>WalletModel</name>
+    </context>
+<context>
+    <name>WalletView</name>
+    <message>
+        <source>&amp;Export</source>
+        <translation>&amp;Voer uit</translation>
+    </message>
+    <message>
+        <source>Export the data in the current tab to a file</source>
+        <translation>Voer die inligting op hierdie bladsy uit na 'n leer</translation>
+    </message>
+    </context>
+<context>
+    <name>bitcoin-core</name>
+    <message>
+        <source>WARNING: check your network connection, %d blocks received in the last %d hours (%d expected)</source>
+        <translation>WAARSKUWING:  toets die status van u netwerk, %d blokke ontvang in die laaste %d ure (%d verwag)</translation>
+    </message>
+    <message>
+        <source>Do not keep transactions in the mempool longer than &lt;n&gt; hours (default: %u)</source>
+        <translation>Moenie transaksies vir langer as &lt;n&gt; ure in die geheuepoel hou nie (verstek: %u)</translation>
+    </message>
+    </context>
+</TS>
\ No newline at end of file
diff --git a/src/qt/locale/bitcoin_af_ZA.ts b/src/qt/locale/bitcoin_af_ZA.ts
index d77aa77f8e6f8..12ac21eb80dcf 100644
--- a/src/qt/locale/bitcoin_af_ZA.ts
+++ b/src/qt/locale/bitcoin_af_ZA.ts
@@ -31,17 +31,21 @@
 </context>
 <context>
     <name>AskPassphraseDialog</name>
+    <message>
+        <source>Passphrase Dialog</source>
+        <translation>Wagfrase Dialoog</translation>
+    </message>
     <message>
         <source>Enter passphrase</source>
-        <translation>Tik Wagwoord in</translation>
+        <translation>Tik wagfrase in</translation>
     </message>
     <message>
         <source>New passphrase</source>
-        <translation>Nuwe wagwoord</translation>
+        <translation>Nuwe wagfrase</translation>
     </message>
     <message>
         <source>Repeat new passphrase</source>
-        <translation>Herhaal nuwe wagwoord</translation>
+        <translation>Herhaal nuwe wagfrase</translation>
     </message>
     <message>
         <source>Encrypt wallet</source>
@@ -65,7 +69,7 @@
     </message>
     <message>
         <source>Change passphrase</source>
-        <translation>Verander wagwoord</translation>
+        <translation>Verander wagfrase</translation>
     </message>
     <message>
         <source>Confirm wallet encryption</source>
@@ -75,6 +79,10 @@
         <source>Wallet encrypted</source>
         <translation>Die beursie is nou bewaak</translation>
     </message>
+    <message>
+        <source>Enter the old passphrase and new passphrase to the wallet.</source>
+        <translation>Tik in die ou wagfrase en die nuwe wagfrase vir die beursie.</translation>
+    </message>
     <message>
         <source>Wallet encryption failed</source>
         <translation>Die beursie kon nie bewaak word nie</translation>
@@ -85,7 +93,7 @@
     </message>
     <message>
         <source>The supplied passphrases do not match.</source>
-        <translation>Die wagwoord stem nie ooreen nie</translation>
+        <translation>Die wagfrase stem nie ooreen nie</translation>
     </message>
     <message>
         <source>Wallet unlock failed</source>
@@ -93,13 +101,17 @@
     </message>
     <message>
         <source>The passphrase entered for the wallet decryption was incorrect.</source>
-        <translation>Die wagwoord wat ingetik was om die beursie oop te sluit, was verkeerd.</translation>
+        <translation>Die wagfrase wat ingetik was om die beursie oop te sluit, was verkeerd.</translation>
     </message>
     <message>
         <source>Wallet decryption failed</source>
         <translation>Beursie dekripsie het misluk</translation>
     </message>
-    </context>
+    <message>
+        <source>Wallet passphrase was successfully changed.</source>
+        <translation>Die beursie se wagfrase verandering was suksesvol.</translation>
+    </message>
+</context>
 <context>
     <name>BanTableModel</name>
     </context>
diff --git a/src/qt/locale/bitcoin_ar.ts b/src/qt/locale/bitcoin_ar.ts
index 88ce05bbd5dbc..1e74564ed3ead 100644
--- a/src/qt/locale/bitcoin_ar.ts
+++ b/src/qt/locale/bitcoin_ar.ts
@@ -222,7 +222,15 @@
 </context>
 <context>
     <name>BanTableModel</name>
-    </context>
+    <message>
+        <source>IP/Netmask</source>
+        <translation>عنوان البروتوكول/قناع</translation>
+    </message>
+    <message>
+        <source>Banned Until</source>
+        <translation>محظور حتى</translation>
+    </message>
+</context>
 <context>
     <name>BitcoinGUI</name>
     <message>
@@ -325,6 +333,10 @@
         <source>&amp;Debug window</source>
         <translation>&amp;نافذة المعالجة</translation>
     </message>
+    <message>
+        <source>Open debugging and diagnostic console</source>
+        <translation>إفتح وحدة التصحيح و التشخيص</translation>
+    </message>
     <message>
         <source>&amp;Verify message...</source>
         <translation>&amp;التحقق من الرسالة...</translation>
@@ -361,6 +373,14 @@
         <source>Encrypt the private keys that belong to your wallet</source>
         <translation>تشفير المفتاح الخاص بمحفظتك</translation>
     </message>
+    <message>
+        <source>Sign messages with your Bitcoin addresses to prove you own them</source>
+        <translation>وقَع الرسائل بواسطة ال: Bitcoin الخاص بك لإثبات امتلاكك لهم</translation>
+    </message>
+    <message>
+        <source>Verify messages to ensure they were signed with specified Bitcoin addresses</source>
+        <translation>تحقق من الرسائل للتأكد من أنَها وُقعت برسائل Bitcoin محدَدة</translation>
+    </message>
     <message>
         <source>&amp;File</source>
         <translation>&amp;ملف</translation>
@@ -381,14 +401,58 @@
         <source>Bitcoin Core</source>
         <translation>جوهر البيت كوين</translation>
     </message>
+    <message>
+        <source>Request payments (generates QR codes and bitcoin: URIs)</source>
+        <translation>أطلب دفعات (يولد كودات الرمز المربع وبيت كوين: العناوين المعطاة)</translation>
+    </message>
     <message>
         <source>&amp;About Bitcoin Core</source>
         <translation>حول bitcoin core</translation>
     </message>
+    <message>
+        <source>Modify configuration options for Bitcoin Core</source>
+        <translation>تغيير خيارات الإعداد لأساس Bitcoin</translation>
+    </message>
+    <message>
+        <source>Show the list of used sending addresses and labels</source>
+        <translation>عرض قائمة عناوين الإرسال المستخدمة والملصقات</translation>
+    </message>
+    <message>
+        <source>Show the list of used receiving addresses and labels</source>
+        <translation>عرض قائمة عناوين الإستقبال المستخدمة والملصقات</translation>
+    </message>
+    <message>
+        <source>Open a bitcoin: URI or payment request</source>
+        <translation>فتح URI : Bitcoin أو طلب دفع</translation>
+    </message>
+    <message>
+        <source>&amp;Command-line options</source>
+        <translation>&amp;خيارات سطر الأوامر</translation>
+    </message>
+    <message>
+        <source>No block source available...</source>
+        <translation>لا يوجد أي مصدر الكتلة</translation>
+    </message>
+    <message numerus="yes">
+        <source>Processed %n block(s) of transaction history.</source>
+        <translation><numerusform>لم يتم معالجة أي كتلة سجل المعاملات</numerusform><numerusform>تم معالجة كتلة واحدة سجل المعاملات</numerusform><numerusform>تم معالجة كتلتين سجل المعاملات</numerusform><numerusform>تم معالجة %n كتل سجل المعاملات</numerusform><numerusform>تم معالجة %n كتلة سجل المعاملات</numerusform><numerusform>تم معالجة %n كتلة سجل المعاملات</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%n hour(s)</source>
+        <translation><numerusform>0 ساعة</numerusform><numerusform>%n ساعة</numerusform><numerusform>%n ساعتين</numerusform><numerusform>%n ساعات</numerusform><numerusform>%n ساعة</numerusform><numerusform>%n ساعات</numerusform></translation>
+    </message>
     <message>
         <source>%1 and %2</source>
         <translation>%1 و %2</translation>
     </message>
+    <message>
+        <source>Last received block was generated %1 ago.</source>
+        <translation>تم توليد الكتلة المستقبلة الأخيرة منذ %1.</translation>
+    </message>
+    <message>
+        <source>Transactions after this will not yet be visible.</source>
+        <translation>المعاملات بعد ذلك لن تكون مريئة بعد.</translation>
+    </message>
     <message>
         <source>Error</source>
         <translation>خطأ</translation>
@@ -463,6 +527,14 @@
         <source>Amount</source>
         <translation>المبلغ</translation>
     </message>
+    <message>
+        <source>Received with label</source>
+        <translation>مستقبل مع ملصق</translation>
+    </message>
+    <message>
+        <source>Received with address</source>
+        <translation>مستقبل مع عنوان</translation>
+    </message>
     <message>
         <source>Date</source>
         <translation>التاريخ</translation>
@@ -531,6 +603,14 @@
         <source>medium-high</source>
         <translation>متوسط-مرتفع</translation>
     </message>
+    <message>
+        <source>medium</source>
+        <translation>متوسط</translation>
+    </message>
+    <message>
+        <source>low-medium</source>
+        <translation>متوسط-منخفض</translation>
+    </message>
     <message>
         <source>low</source>
         <translation>منخفض</translation>
@@ -547,6 +627,10 @@
         <source>none</source>
         <translation>لا شيء</translation>
     </message>
+    <message>
+        <source>This label turns red if the transaction size is greater than 1000 bytes.</source>
+        <translation>هذا الملصق يصبح أخمرا إذا كان حجم المعاملة أكبر من 1000 بايت.</translation>
+    </message>
     <message>
         <source>yes</source>
         <translation>نعم</translation>
@@ -555,6 +639,18 @@
         <source>no</source>
         <translation>لا</translation>
     </message>
+    <message>
+        <source>This means a fee of at least %1 per kB is required.</source>
+        <translation>هذا يعني أن من المطلوب أن يكون الرسم ألى الأقل %1 لكل كيلوبايت.</translation>
+    </message>
+    <message>
+        <source>Can vary +/- 1 byte per input.</source>
+        <translation>يمكن أن يتفاوت بـ 1 بايت لكل مساهمة.</translation>
+    </message>
+    <message>
+        <source>Transactions with higher priority are more likely to get included into a block.</source>
+        <translation>المعاملات التي لديها أولوية أعلى على الأرجح سيتم إنضمامها في الكتلة.</translation>
+    </message>
     <message>
         <source>(no label)</source>
         <translation>(لا وصف)</translation>
@@ -598,6 +694,10 @@
         <source>The entered address "%1" is already in the address book.</source>
         <translation>هدا العنوان "%1" موجود مسبقا في دفتر العناوين</translation>
     </message>
+    <message>
+        <source>The entered address "%1" is not a valid Bitcoin address.</source>
+        <translation>العنوان المدخل "%1" ليس عنوان بيت كوين صحيح.</translation>
+    </message>
     <message>
         <source>Could not unlock wallet.</source>
         <translation> يمكن فتح المحفظة.</translation>
@@ -617,6 +717,14 @@
         <source>name</source>
         <translation>الاسم</translation>
     </message>
+    <message>
+        <source>Directory already exists. Add %1 if you intend to create a new directory here.</source>
+        <translation>الدليل موجوج بالفعل. أضف %1 لو نويت إنشاء دليل جديد هنا.</translation>
+    </message>
+    <message>
+        <source>Path already exists, and is not a directory.</source>
+        <translation>المسار موجود بالفعل، وهو ليس دليلاً.</translation>
+    </message>
     <message>
         <source>Cannot create data directory here.</source>
         <translation>لا يمكن انشاء دليل بيانات هنا .</translation>
@@ -636,11 +744,39 @@
         <source>About Bitcoin Core</source>
         <translation>عن جوهر البيت كوين</translation>
     </message>
+    <message>
+        <source>Command-line options</source>
+        <translation>خيارات سطر الأوامر</translation>
+    </message>
     <message>
         <source>Usage:</source>
         <translation>المستخدم</translation>
     </message>
-    </context>
+    <message>
+        <source>command-line options</source>
+        <translation>خيارات سطر الأوامر</translation>
+    </message>
+    <message>
+        <source>UI Options:</source>
+        <translation>خيارات واجهة المستخدم</translation>
+    </message>
+    <message>
+        <source>Choose data directory on startup (default: %u)</source>
+        <translation>اختر دليل البيانات عند بدء التشغير (افتراضي: %u)</translation>
+    </message>
+    <message>
+        <source>Set SSL root certificates for payment request (default: -system-)</source>
+        <translation>أضع شهادة بروتوكول الشبقة الأمنية لطلب المدفوع (افتراضي: -نظام-)</translation>
+    </message>
+    <message>
+        <source>Show splash screen on startup (default: %u)</source>
+        <translation>أظهر شاشة البداية عند بدء التشغيل (افتراضي: %u)</translation>
+    </message>
+    <message>
+        <source>Reset all settings changes made over the GUI</source>
+        <translation>إعادة تعيين كل الإعدادات تم تغييرها من خلال الواجهة الرسومية</translation>
+    </message>
+</context>
 <context>
     <name>Intro</name>
     <message>
@@ -1793,14 +1929,26 @@
         <source>Invalid -proxy address: '%s'</source>
         <translation>عنوان البروكسي غير صحيح : '%s'</translation>
     </message>
+    <message>
+        <source>Make the wallet broadcast transactions</source>
+        <translation>إنتاج معاملات بث المحفظة</translation>
+    </message>
     <message>
         <source>Insufficient funds</source>
         <translation>اموال غير كافية</translation>
     </message>
+    <message>
+        <source>Loading block index...</source>
+        <translation>تحميل مؤشر الكتلة</translation>
+    </message>
     <message>
         <source>Loading wallet...</source>
         <translation>تحميل المحفظه</translation>
     </message>
+    <message>
+        <source>Cannot downgrade wallet</source>
+        <translation>لا يمكن تخفيض قيمة المحفظة</translation>
+    </message>
     <message>
         <source>Cannot write default address</source>
         <translation>لايمكن كتابة العنوان الافتراضي</translation>
diff --git a/src/qt/locale/bitcoin_bg.ts b/src/qt/locale/bitcoin_bg.ts
index ecd10e5461716..54bf8136a60b4 100644
--- a/src/qt/locale/bitcoin_bg.ts
+++ b/src/qt/locale/bitcoin_bg.ts
@@ -214,7 +214,11 @@
 </context>
 <context>
     <name>BanTableModel</name>
-    </context>
+    <message>
+        <source>Banned Until</source>
+        <translation>Със забранен достъп до</translation>
+    </message>
+</context>
 <context>
     <name>BitcoinGUI</name>
     <message>
@@ -1229,10 +1233,6 @@
         <source>General</source>
         <translation>Основни</translation>
     </message>
-    <message>
-        <source>Using OpenSSL version</source>
-        <translation>Използване на OpenSSL версия</translation>
-    </message>
     <message>
         <source>Using BerkeleyDB version</source>
         <translation>Използване на база данни BerkeleyDB </translation>
diff --git a/src/qt/locale/bitcoin_ca.ts b/src/qt/locale/bitcoin_ca.ts
index 38e770f182242..8bc9281f1daaa 100644
--- a/src/qt/locale/bitcoin_ca.ts
+++ b/src/qt/locale/bitcoin_ca.ts
@@ -1115,6 +1115,22 @@
         <source>Shows, if the supplied default SOCKS5 proxy is used to reach peers via this network type.</source>
         <translation>Mostra si el proxy SOCKS5 per defecte proporcionat s'utilitza per arribar als iguals mitjançant aquest tipus de xarxa.</translation>
     </message>
+    <message>
+        <source>IPv4</source>
+        <translation>IPv4</translation>
+    </message>
+    <message>
+        <source>IPv6</source>
+        <translation>IPv6</translation>
+    </message>
+    <message>
+        <source>Tor</source>
+        <translation>Tor</translation>
+    </message>
+    <message>
+        <source>Connect to the Bitcoin network through a separate SOCKS5 proxy for Tor hidden services.</source>
+        <translation>Conectar a la red de Bitcoin a través de un proxy SOCKS5 per als serveis ocults de Tor</translation>
+    </message>
     <message>
         <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services:</source>
         <translation>Utilitza un proxy SOCKS4 apart per a arribar als iguals a través de serveis ocults de Tor:</translation>
@@ -1457,10 +1473,6 @@
         <source>General</source>
         <translation>General</translation>
     </message>
-    <message>
-        <source>Using OpenSSL version</source>
-        <translation>Utilitzant OpenSSL versió</translation>
-    </message>
     <message>
         <source>Using BerkeleyDB version</source>
         <translation>Utilitzant BerkeleyDB versió</translation>
@@ -1489,6 +1501,18 @@
         <source>Current number of blocks</source>
         <translation>Nombre de blocs actuals</translation>
     </message>
+    <message>
+        <source>Memory Pool</source>
+        <translation>Reserva de memòria</translation>
+    </message>
+    <message>
+        <source>Current number of transactions</source>
+        <translation>Nombre actual de transaccions</translation>
+    </message>
+    <message>
+        <source>Memory usage</source>
+        <translation>Us de memoria</translation>
+    </message>
     <message>
         <source>Open the Bitcoin Core debug log file from the current data directory. This can take a few seconds for large log files.</source>
         <translation>Obre el fitxer de registre de depuració del Bitcoin Core del directori de dades actual. Pot portar uns quants segons per a fitxers de registre grans.</translation>
@@ -2748,6 +2772,10 @@
         <source>Copy transaction ID</source>
         <translation>Copiar ID de transacció</translation>
     </message>
+    <message>
+        <source>Copy raw transaction</source>
+        <translation>Copia la transacció crua</translation>
+    </message>
     <message>
         <source>Edit label</source>
         <translation>Editar etiqueta</translation>
@@ -2895,22 +2923,62 @@
         <source>Accept command line and JSON-RPC commands</source>
         <translation>Accepta la línia d'ordres i ordres JSON-RPC </translation>
     </message>
+    <message>
+        <source>If &lt;category&gt; is not supplied or if &lt;category&gt; = 1, output all debugging information.</source>
+        <translation>Si no es proporciona &lt;category&gt; o si &lt;category&gt; = 1, treu a la sortida tota la informació de depuració.</translation>
+    </message>
     <message>
         <source>Maximum total fees (in %s) to use in a single wallet transaction; setting this too low may abort large transactions (default: %s)</source>
         <translation>Comissions totals màximes (en %s) per utilitzar en una única transacció de moneder; definir-ne una massa baixa pot interrompre les transaccions més grans (per defecte: %s)</translation>
     </message>
+    <message>
+        <source>Please check that your computer's date and time are correct! If your clock is wrong Bitcoin Core will not work properly.</source>
+        <translation>Comproveu que la data i hora de l'ordinador són correctes! Si el vostre rellotge no té l'hora correcta, el Bitcoin Core no funcionarà adequadament.</translation>
+    </message>
+    <message>
+        <source>Prune configured below the minimum of %d MiB.  Please use a higher number.</source>
+        <translation>Poda configurada per sota el mínim de %d MiB. Utilitzeu un nombre superior.</translation>
+    </message>
+    <message>
+        <source>Prune: last wallet synchronisation goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of pruned node)</source>
+        <translation>Poda: la darrera sincronització del moneder va més enllà de les dades podades. Cal que activeu -reindex (baixeu tota la cadena de blocs de nou en cas de node podat)</translation>
+    </message>
+    <message>
+        <source>Reduce storage requirements by pruning (deleting) old blocks. This mode is incompatible with -txindex and -rescan. Warning: Reverting this setting requires re-downloading the entire blockchain. (default: 0 = disable pruning blocks, &gt;%u = target size in MiB to use for block files)</source>
+        <translation>Reduïu els requisits d'emmagatzematge podant (suprimint) els blocs antics. Aquest mode és incompatible amb -txindex i -rescan. Avís: la reversió d'aquest paràmetre implica haver de tornar a baixar la cadena de blocs sencera. (per defecte: 0 = inhabilita la poda de blocs, &gt;%u = mida objectiu en MiB per utilitzar en els fitxers de blocs)</translation>
+    </message>
+    <message>
+        <source>Rescans are not possible in pruned mode. You will need to use -reindex which will download the whole blockchain again.</source>
+        <translation>Els rescanejos no són possible en el mode de poda. Caldrà que utilitzeu -reindex, que tornarà a baixar la cadena de blocs sencera.</translation>
+    </message>
+    <message>
+        <source>Error: A fatal internal error occurred, see debug.log for details</source>
+        <translation>Error: s'ha produït un error intern fatal. Vegeu debug.log per a més detalls</translation>
+    </message>
     <message>
         <source>Fee (in %s/kB) to add to transactions you send (default: %s)</source>
         <translation>Comissió (en %s/kB) per afegir a les transaccions que envieu (per defecte: %s)</translation>
     </message>
+    <message>
+        <source>Pruning blockstore...</source>
+        <translation>S'està podant la cadena de blocs...</translation>
+    </message>
     <message>
         <source>Run in the background as a daemon and accept commands</source>
         <translation>Executa en segon pla com a programa dimoni i accepta ordres</translation>
     </message>
+    <message>
+        <source>Unable to start HTTP server. See debug log for details.</source>
+        <translation>No s'ha pogut iniciar el servidor HTTP. Vegeu debug.log per a més detalls.</translation>
+    </message>
     <message>
         <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
         <translation>Accepta connexions de fora (per defecte: 1 si no -proxy o -connect)</translation>
     </message>
+    <message>
+        <source>-fallbackfee is set very high! This is the transaction fee you may pay when fee estimates are not available.</source>
+        <translation>-fallbackfee és molt elevat. Aquesta és la comissió de transacció que podeu pagar quan les estimacions de comissions no estan disponibles.</translation>
+    </message>
     <message>
         <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source>
         <translation>Vincula a una adreça específica i sempre escolta-hi. Utilitza la notació [host]:port per IPv6</translation>
@@ -3079,10 +3147,6 @@
         <source>Wallet options:</source>
         <translation>Opcions de moneder:</translation>
     </message>
-    <message>
-        <source>Warning: This version is obsolete; upgrade required!</source>
-        <translation>Avís: aquesta versió és obsoleta; cal actualitzar-la!</translation>
-    </message>
     <message>
         <source>You need to rebuild the database using -reindex to change -txindex</source>
         <translation>Cal que reconstruïu la base de dades fent servir -reindex per canviar -txindex</translation>
diff --git a/src/qt/locale/bitcoin_ca@valencia.ts b/src/qt/locale/bitcoin_ca@valencia.ts
index 2c41ec78d4061..e5744fcbbf9b4 100644
--- a/src/qt/locale/bitcoin_ca@valencia.ts
+++ b/src/qt/locale/bitcoin_ca@valencia.ts
@@ -1413,10 +1413,6 @@
         <source>General</source>
         <translation>General</translation>
     </message>
-    <message>
-        <source>Using OpenSSL version</source>
-        <translation>Utilitzant OpenSSL versió</translation>
-    </message>
     <message>
         <source>Using BerkeleyDB version</source>
         <translation>Utilitzant BerkeleyDB versió</translation>
@@ -2959,10 +2955,6 @@
         <source>Wallet options:</source>
         <translation>Opcions de moneder:</translation>
     </message>
-    <message>
-        <source>Warning: This version is obsolete; upgrade required!</source>
-        <translation>Avís: esta versió és obsoleta; cal actualitzar-la!</translation>
-    </message>
     <message>
         <source>You need to rebuild the database using -reindex to change -txindex</source>
         <translation>Cal que reconstruïu la base de dades fent servir -reindex per canviar -txindex</translation>
diff --git a/src/qt/locale/bitcoin_ca_ES.ts b/src/qt/locale/bitcoin_ca_ES.ts
index e6a932ebeeaed..2c238bb44f34a 100644
--- a/src/qt/locale/bitcoin_ca_ES.ts
+++ b/src/qt/locale/bitcoin_ca_ES.ts
@@ -1115,6 +1115,22 @@
         <source>Shows, if the supplied default SOCKS5 proxy is used to reach peers via this network type.</source>
         <translation>Mostra si el proxy SOCKS5 per defecte proporcionat s'utilitza per arribar als iguals mitjançant aquest tipus de xarxa.</translation>
     </message>
+    <message>
+        <source>IPv4</source>
+        <translation>IPv4</translation>
+    </message>
+    <message>
+        <source>IPv6</source>
+        <translation>IPv6</translation>
+    </message>
+    <message>
+        <source>Tor</source>
+        <translation>Tor</translation>
+    </message>
+    <message>
+        <source>Connect to the Bitcoin network through a separate SOCKS5 proxy for Tor hidden services.</source>
+        <translation>Conectar a la red de Bitcoin a través de un proxy SOCKS5 per als serveis ocults de Tor</translation>
+    </message>
     <message>
         <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services:</source>
         <translation>Utilitza un proxy SOCKS4 apart per a arribar als iguals a través de serveis ocults de Tor:</translation>
@@ -1457,10 +1473,6 @@
         <source>General</source>
         <translation>General</translation>
     </message>
-    <message>
-        <source>Using OpenSSL version</source>
-        <translation>Utilitzant OpenSSL versió</translation>
-    </message>
     <message>
         <source>Using BerkeleyDB version</source>
         <translation>Utilitzant BerkeleyDB versió</translation>
@@ -1489,6 +1501,18 @@
         <source>Current number of blocks</source>
         <translation>Nombre de blocs actuals</translation>
     </message>
+    <message>
+        <source>Memory Pool</source>
+        <translation>Reserva de memòria</translation>
+    </message>
+    <message>
+        <source>Current number of transactions</source>
+        <translation>Nombre actual de transaccions</translation>
+    </message>
+    <message>
+        <source>Memory usage</source>
+        <translation>Us de memoria</translation>
+    </message>
     <message>
         <source>Open the Bitcoin Core debug log file from the current data directory. This can take a few seconds for large log files.</source>
         <translation>Obre el fitxer de registre de depuració del Bitcoin Core del directori de dades actual. Pot portar uns quants segons per a fitxers de registre grans.</translation>
@@ -2748,6 +2772,10 @@
         <source>Copy transaction ID</source>
         <translation>Copiar ID de transacció</translation>
     </message>
+    <message>
+        <source>Copy raw transaction</source>
+        <translation>Copia la transacció crua</translation>
+    </message>
     <message>
         <source>Edit label</source>
         <translation>Editar etiqueta</translation>
@@ -2895,18 +2923,54 @@
         <source>Accept command line and JSON-RPC commands</source>
         <translation>Accepta la línia d'ordres i ordres JSON-RPC </translation>
     </message>
+    <message>
+        <source>If &lt;category&gt; is not supplied or if &lt;category&gt; = 1, output all debugging information.</source>
+        <translation>Si no es proporciona &lt;category&gt; o si &lt;category&gt; = 1, treu a la sortida tota la informació de depuració.</translation>
+    </message>
     <message>
         <source>Maximum total fees (in %s) to use in a single wallet transaction; setting this too low may abort large transactions (default: %s)</source>
         <translation>Comissions totals màximes (en %s) per utilitzar en una única transacció de moneder; definir-ne una massa baixa pot interrompre les transaccions més grans (per defecte: %s)</translation>
     </message>
+    <message>
+        <source>Please check that your computer's date and time are correct! If your clock is wrong Bitcoin Core will not work properly.</source>
+        <translation>Comproveu que la data i hora de l'ordinador són correctes! Si el vostre rellotge no té l'hora correcta, el Bitcoin Core no funcionarà adequadament.</translation>
+    </message>
+    <message>
+        <source>Prune configured below the minimum of %d MiB.  Please use a higher number.</source>
+        <translation>Poda configurada per sota el mínim de %d MiB. Utilitzeu un nombre superior.</translation>
+    </message>
+    <message>
+        <source>Prune: last wallet synchronisation goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of pruned node)</source>
+        <translation>Poda: la darrera sincronització del moneder va més enllà de les dades podades. Cal que activeu -reindex (baixeu tota la cadena de blocs de nou en cas de node podat)</translation>
+    </message>
+    <message>
+        <source>Reduce storage requirements by pruning (deleting) old blocks. This mode is incompatible with -txindex and -rescan. Warning: Reverting this setting requires re-downloading the entire blockchain. (default: 0 = disable pruning blocks, &gt;%u = target size in MiB to use for block files)</source>
+        <translation>Reduïu els requisits d'emmagatzematge podant (suprimint) els blocs antics. Aquest mode és incompatible amb -txindex i -rescan. Avís: la reversió d'aquest paràmetre implica haver de tornar a baixar la cadena de blocs sencera. (per defecte: 0 = inhabilita la poda de blocs, &gt;%u = mida objectiu en MiB per utilitzar en els fitxers de blocs)</translation>
+    </message>
+    <message>
+        <source>Rescans are not possible in pruned mode. You will need to use -reindex which will download the whole blockchain again.</source>
+        <translation>Els rescanejos no són possible en el mode de poda. Caldrà que utilitzeu -reindex, que tornarà a baixar la cadena de blocs sencera.</translation>
+    </message>
+    <message>
+        <source>Error: A fatal internal error occurred, see debug.log for details</source>
+        <translation>Error: s'ha produït un error intern fatal. Vegeu debug.log per a més detalls</translation>
+    </message>
     <message>
         <source>Fee (in %s/kB) to add to transactions you send (default: %s)</source>
         <translation>Comissió (en %s/kB) per afegir a les transaccions que envieu (per defecte: %s)</translation>
     </message>
+    <message>
+        <source>Pruning blockstore...</source>
+        <translation>S'està podant la cadena de blocs...</translation>
+    </message>
     <message>
         <source>Run in the background as a daemon and accept commands</source>
         <translation>Executa en segon pla com a programa dimoni i accepta ordres</translation>
     </message>
+    <message>
+        <source>Unable to start HTTP server. See debug log for details.</source>
+        <translation>No s'ha pogut iniciar el servidor HTTP. Vegeu debug.log per a més detalls.</translation>
+    </message>
     <message>
         <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
         <translation>Accepta connexions de fora (per defecte: 1 si no -proxy o -connect)</translation>
@@ -3079,10 +3143,6 @@
         <source>Wallet options:</source>
         <translation>Opcions de moneder:</translation>
     </message>
-    <message>
-        <source>Warning: This version is obsolete; upgrade required!</source>
-        <translation>Avís: aquesta versió és obsoleta; cal actualitzar-la!</translation>
-    </message>
     <message>
         <source>You need to rebuild the database using -reindex to change -txindex</source>
         <translation>Cal que reconstruïu la base de dades fent servir -reindex per canviar -txindex</translation>
diff --git a/src/qt/locale/bitcoin_cs.ts b/src/qt/locale/bitcoin_cs.ts
index ef1903edd168e..d3ff5c1f57d64 100644
--- a/src/qt/locale/bitcoin_cs.ts
+++ b/src/qt/locale/bitcoin_cs.ts
@@ -3,7 +3,7 @@
     <name>AddressBookPage</name>
     <message>
         <source>Right-click to edit address or label</source>
-        <translation>Pravým tlačítkem myši začneš upravovat označení adresy</translation>
+        <translation>Pravým tlačítkem myši můžeš upravit označení adresy</translation>
     </message>
     <message>
         <source>Create a new address</source>
@@ -71,7 +71,7 @@
     </message>
     <message>
         <source>These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source>
-        <translation>Tohle jsou tvé Bitcoinové adresy pro příjem plateb. Je doporučené používat pokaždé novou adresu pro každou transakci.</translation>
+        <translation>Tohle jsou tvé Bitcoinové adresy pro příjem plateb. Nezapomeň si pro každou transakci vždy vygenerovat novou adresu.</translation>
     </message>
     <message>
         <source>Copy &amp;Label</source>
@@ -83,11 +83,11 @@
     </message>
     <message>
         <source>Export Address List</source>
-        <translation>Exportuj seznam adres</translation>
+        <translation>Export seznamu adres</translation>
     </message>
     <message>
         <source>Comma separated file (*.csv)</source>
-        <translation>CSV formát (*.csv)</translation>
+        <translation>Formát CSV (*.csv)</translation>
     </message>
     <message>
         <source>Exporting Failed</source>
@@ -343,7 +343,7 @@
     </message>
     <message>
         <source>&amp;Send</source>
-        <translation>&amp;Pošli</translation>
+        <translation>P&amp;ošli</translation>
     </message>
     <message>
         <source>&amp;Receive</source>
@@ -383,7 +383,7 @@
     </message>
     <message>
         <source>&amp;Help</source>
-        <translation>Ná&amp;pověda</translation>
+        <translation>Nápověd&amp;a</translation>
     </message>
     <message>
         <source>Tabs toolbar</source>
@@ -419,7 +419,7 @@
     </message>
     <message>
         <source>&amp;Command-line options</source>
-        <translation>Ar&amp;gumenty z příkazové řádky</translation>
+        <translation>Ar&amp;gumenty příkazové řádky</translation>
     </message>
     <message>
         <source>Show the Bitcoin Core help message to get a list with possible Bitcoin command-line options</source>
@@ -467,7 +467,7 @@
     </message>
     <message>
         <source>Transactions after this will not yet be visible.</source>
-        <translation>Následné transakce ještě nebudou vidět.</translation>
+        <translation>Novější transakce zatím nejsou vidět.</translation>
     </message>
     <message>
         <source>Error</source>
@@ -806,11 +806,11 @@
     </message>
     <message>
         <source>The entered address "%1" is already in the address book.</source>
-        <translation>Zadaná adresa "%1" už v adresáři je.</translation>
+        <translation>Zadaná adresa „%1“ už v adresáři je.</translation>
     </message>
     <message>
         <source>The entered address "%1" is not a valid Bitcoin address.</source>
-        <translation>Zadaná adresa "%1" není platná Bitcoinová adresa.</translation>
+        <translation>Zadaná adresa „%1“ není platná Bitcoinová adresa.</translation>
     </message>
     <message>
         <source>Could not unlock wallet.</source>
@@ -864,7 +864,7 @@
     </message>
     <message>
         <source>Command-line options</source>
-        <translation>Argumenty z příkazové řádky</translation>
+        <translation>Argumenty příkazové řádky</translation>
     </message>
     <message>
         <source>Usage:</source>
@@ -874,7 +874,35 @@
         <source>command-line options</source>
         <translation>možnosti příkazové řádky</translation>
     </message>
-    </context>
+    <message>
+        <source>UI Options:</source>
+        <translation>Možnosti UI:</translation>
+    </message>
+    <message>
+        <source>Choose data directory on startup (default: %u)</source>
+        <translation>Zvolit při startu adresář pro data (výchozí: %u)</translation>
+    </message>
+    <message>
+        <source>Set language, for example "de_DE" (default: system locale)</source>
+        <translation>Nastavit jazyk, například „de_DE“ (výchozí: systémové nastavení)</translation>
+    </message>
+    <message>
+        <source>Start minimized</source>
+        <translation>Nastartovat minimalizovaně</translation>
+    </message>
+    <message>
+        <source>Set SSL root certificates for payment request (default: -system-)</source>
+        <translation>Nastavit kořenové SSL certifikáty pro platební požadavky (výchozí: -system-)</translation>
+    </message>
+    <message>
+        <source>Show splash screen on startup (default: %u)</source>
+        <translation>Zobrazit startovací obrazovku (výchozí: %u)</translation>
+    </message>
+    <message>
+        <source>Reset all settings changes made over the GUI</source>
+        <translation>Resetovat všechna nastavení provedené v GUI</translation>
+    </message>
+</context>
 <context>
     <name>Intro</name>
     <message>
@@ -989,7 +1017,7 @@
     </message>
     <message>
         <source>Third party URLs (e.g. a block explorer) that appear in the transactions tab as context menu items. %s in the URL is replaced by transaction hash. Multiple URLs are separated by vertical bar |.</source>
-        <translation>URL třetích stran (např. block exploreru), které se zobrazí v kontextovém menu v záložce Transakce. %s v URL se nahradí hashem transakce. Více URL odděl svislítkem |.</translation>
+        <translation>URL třetích stran (např. block exploreru), která se zobrazí v kontextovém menu v záložce Transakce. %s v URL se nahradí hashem transakce. Více URL odděl svislítkem |.</translation>
     </message>
     <message>
         <source>Third party transaction URLs</source>
@@ -997,7 +1025,7 @@
     </message>
     <message>
         <source>Active command-line options that override above options:</source>
-        <translation>Aktivní argumenty z příkazové řádky, které přetloukly tato nastavení:</translation>
+        <translation>Aktivní argumenty z příkazové řádky, které mají přednost před nastavením výše:</translation>
     </message>
     <message>
         <source>Reset all client options to default.</source>
@@ -1029,7 +1057,7 @@
     </message>
     <message>
         <source>Expert</source>
-        <translation>Odborník</translation>
+        <translation>Pokročilá nastavení</translation>
     </message>
     <message>
         <source>Enable coin &amp;control features</source>
@@ -1071,6 +1099,30 @@
         <source>Port of the proxy (e.g. 9050)</source>
         <translation>Port proxy (např. 9050)</translation>
     </message>
+    <message>
+        <source>Used for reaching peers via:</source>
+        <translation>Použije se k připojování k protějškům přes:</translation>
+    </message>
+    <message>
+        <source>Shows, if the supplied default SOCKS5 proxy is used to reach peers via this network type.</source>
+        <translation>Ukazuje, jestli se zadaná výchozí SOCKS5 proxy používá k připojování k peerům v rámci tohoto typu sítě.</translation>
+    </message>
+    <message>
+        <source>IPv4</source>
+        <translation>IPv4</translation>
+    </message>
+    <message>
+        <source>IPv6</source>
+        <translation>IPv6</translation>
+    </message>
+    <message>
+        <source>Tor</source>
+        <translation>Tor</translation>
+    </message>
+    <message>
+        <source>Connect to the Bitcoin network through a separate SOCKS5 proxy for Tor hidden services.</source>
+        <translation>Připojí se do Bitcoinové sítě přes SOCKS5 proxy vyhrazenou pro skryté služby v Tor síti.</translation>
+    </message>
     <message>
         <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services:</source>
         <translation>Použít samostatnou SOCKS5 proxy ke spojení s protějšky přes skryté služby v Toru:</translation>
@@ -1101,7 +1153,7 @@
     </message>
     <message>
         <source>&amp;Unit to show amounts in:</source>
-        <translation>J&amp;ednotka pro částky:</translation>
+        <translation>Je&amp;dnotka pro částky:</translation>
     </message>
     <message>
         <source>Choose the default subdivision unit to show in the interface and when sending coins.</source>
@@ -1113,7 +1165,7 @@
     </message>
     <message>
         <source>&amp;OK</source>
-        <translation>&amp;Budiž</translation>
+        <translation>&amp;Použít</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
@@ -1141,7 +1193,7 @@
     </message>
     <message>
         <source>This change would require a client restart.</source>
-        <translation>Tahle změna bude chtít restartovat klienta.</translation>
+        <translation>Tato změna vyžaduje restart aplikace.</translation>
     </message>
     <message>
         <source>The supplied proxy address is invalid.</source>
@@ -1188,7 +1240,7 @@
     </message>
     <message>
         <source>Balances</source>
-        <translation>Stavy účtů</translation>
+        <translation>Stav účtů</translation>
     </message>
     <message>
         <source>Total:</source>
@@ -1413,10 +1465,6 @@
         <source>General</source>
         <translation>Obecné</translation>
     </message>
-    <message>
-        <source>Using OpenSSL version</source>
-        <translation>Používaná verze OpenSSL</translation>
-    </message>
     <message>
         <source>Using BerkeleyDB version</source>
         <translation>Používaná verze BerkeleyDB</translation>
@@ -1445,6 +1493,10 @@
         <source>Current number of blocks</source>
         <translation>Aktuální počet bloků</translation>
     </message>
+    <message>
+        <source>Memory usage</source>
+        <translation>Využití paměti</translation>
+    </message>
     <message>
         <source>Open the Bitcoin Core debug log file from the current data directory. This can take a few seconds for large log files.</source>
         <translation>Otevři soubor s ladicími záznamy Bitcoin Core z aktuálního datového adresáře. U velkých logů to může pár vteřin zabrat.</translation>
@@ -1549,6 +1601,34 @@
         <source>Clear console</source>
         <translation>Vyčistit konzoli</translation>
     </message>
+    <message>
+        <source>&amp;Disconnect Node</source>
+        <translation>&amp;Odpojit uzel</translation>
+    </message>
+    <message>
+        <source>Ban Node for</source>
+        <translation>Uvalit na uzel klatbu na</translation>
+    </message>
+    <message>
+        <source>1 &amp;hour</source>
+        <translation>1 &amp;hodinu</translation>
+    </message>
+    <message>
+        <source>1 &amp;day</source>
+        <translation>1 &amp;den</translation>
+    </message>
+    <message>
+        <source>1 &amp;week</source>
+        <translation>1 &amp;týden</translation>
+    </message>
+    <message>
+        <source>1 &amp;year</source>
+        <translation>1 &amp;rok</translation>
+    </message>
+    <message>
+        <source>&amp;Unban Node</source>
+        <translation>&amp;Zbavit uzel klatby</translation>
+    </message>
     <message>
         <source>Welcome to the Bitcoin Core RPC console.</source>
         <translation>Vítej v RPC konzoli Bitcoin Core.</translation>
@@ -1577,6 +1657,10 @@
         <source>%1 GB</source>
         <translation>%1 GB</translation>
     </message>
+    <message>
+        <source>(node id: %1)</source>
+        <translation>(id uzlu: %1)</translation>
+    </message>
     <message>
         <source>via %1</source>
         <translation>via %1</translation>
@@ -1630,7 +1714,7 @@
     </message>
     <message>
         <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source>
-        <translation>Volitelná zpráva, která se připojí k platebnímu požadavku a která se zobrazí, když se požadavek otevře. Poznámka: Tahle zpráva se neposílá s platbou po Bitcoinové síti.</translation>
+        <translation>Volitelná zpráva, která se připojí k platebnímu požadavku a která se zobrazí, když se požadavek otevře. Poznámka: tahle zpráva se neposílá s platbou po Bitcoinové síti.</translation>
     </message>
     <message>
         <source>An optional label to associate with the new receiving address.</source>
@@ -1638,7 +1722,7 @@
     </message>
     <message>
         <source>Use this form to request payments. All fields are &lt;b&gt;optional&lt;/b&gt;.</source>
-        <translation>Tímto formulář můžeš požadovat platby. Všechna pole jsou &lt;b&gt;volitelná&lt;/b&gt;.</translation>
+        <translation>Tímto formulářem můžeš požadovat platby. Všechna pole jsou &lt;b&gt;volitelná&lt;/b&gt;.</translation>
     </message>
     <message>
         <source>An optional amount to request. Leave this empty or zero to not request a specific amount.</source>
@@ -1931,7 +2015,7 @@
     </message>
     <message>
         <source>S&amp;end</source>
-        <translation>P&amp;ošli</translation>
+        <translation>Pošl&amp;i</translation>
     </message>
     <message>
         <source>Confirm send coins</source>
@@ -1969,6 +2053,10 @@
         <source>Copy change</source>
         <translation>Kopíruj drobné</translation>
     </message>
+    <message>
+        <source>Total Amount %1</source>
+        <translation>Celková částka %1</translation>
+    </message>
     <message>
         <source>or</source>
         <translation>nebo</translation>
@@ -2001,6 +2089,10 @@
         <source>Payment request expired.</source>
         <translation>Platební požadavek vypršel.</translation>
     </message>
+    <message>
+        <source>Pay only the required fee of %1</source>
+        <translation>Zaplatit pouze vyžadovaný poplatek %1</translation>
+    </message>
     <message numerus="yes">
         <source>Estimated to begin confirmation within %n block(s).</source>
         <translation><numerusform>Potvrzování by podle odhadu mělo začít během %n bloku.</numerusform><numerusform>Potvrzování by podle odhadu mělo začít během %n bloků.</numerusform><numerusform>Potvrzování by podle odhadu mělo začít během %n bloků.</numerusform></translation>
@@ -2090,7 +2182,7 @@
     </message>
     <message>
         <source>S&amp;ubtract fee from amount</source>
-        <translation>&amp;Odečíst poplatek od částky</translation>
+        <translation>Od&amp;ečíst poplatek od částky</translation>
     </message>
     <message>
         <source>Message:</source>
@@ -2176,7 +2268,7 @@
     </message>
     <message>
         <source>Copy the current signature to the system clipboard</source>
-        <translation>Zkopíruj aktuálně vybraný podpis do systémové schránky</translation>
+        <translation>Zkopíruj tento podpis do schránky</translation>
     </message>
     <message>
         <source>Sign the message to prove you own this Bitcoin address</source>
@@ -2220,7 +2312,7 @@
     </message>
     <message>
         <source>Click "Sign Message" to generate signature</source>
-        <translation>Kliknutím na "Podepiš zprávu" vygeneruješ podpis</translation>
+        <translation>Kliknutím na „Podepiš zprávu“ vygeneruješ podpis</translation>
     </message>
     <message>
         <source>The entered address is invalid.</source>
@@ -2248,7 +2340,7 @@
     </message>
     <message>
         <source>Message signed.</source>
-        <translation>Zpráv podepsána.</translation>
+        <translation>Zpráva podepsána.</translation>
     </message>
     <message>
         <source>The signature could not be decoded.</source>
@@ -2405,7 +2497,7 @@
     </message>
     <message>
         <source>Generated coins must mature %1 blocks before they can be spent. When you generated this block, it was broadcast to the network to be added to the block chain. If it fails to get into the chain, its state will change to "not accepted" and it won't be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source>
-        <translation>Vygenerované mince musí čekat %1 bloků, než mohou být utraceny. Když jsi vygeneroval tenhle blok, tak byl rozposlán do sítě, aby byl přidán do řetězce bloků. Pokud se mu nepodaří dostat se do řetězce, změní se na "neakceptovaný" a nepůjde utratit. To se občas může stát, pokud jiný uzel vygeneruje blok zhruba ve stejném okamžiku jako ty.</translation>
+        <translation>Vygenerované mince musí čekat %1 bloků, než mohou být utraceny. Když jsi vygeneroval tenhle blok, tak byl rozposlán do sítě, aby byl přidán do řetězce bloků. Pokud se mu nepodaří dostat se do řetězce, změní se na „neakceptovaný“ a nepůjde utratit. To se občas může stát, pokud jiný uzel vygeneruje blok zhruba ve stejném okamžiku jako ty.</translation>
     </message>
     <message>
         <source>Debug information</source>
@@ -2467,7 +2559,7 @@
     </message>
     <message>
         <source>Immature (%1 confirmations, will be available after %2)</source>
-        <translation>Nedozráno (%1 potvrzení, bude k dispozici za %2)</translation>
+        <translation>Nedozráno (%1 potvrzení, dozraje při %2 potvrzeních)</translation>
     </message>
     <message numerus="yes">
         <source>Open for %n more block(s)</source>
@@ -2636,6 +2728,10 @@
         <source>Copy transaction ID</source>
         <translation>Kopíruj ID transakce</translation>
     </message>
+    <message>
+        <source>Copy raw transaction</source>
+        <translation>Kopíruj surovou transakci</translation>
+    </message>
     <message>
         <source>Edit label</source>
         <translation>Uprav označení</translation>
@@ -2670,7 +2766,7 @@
     </message>
     <message>
         <source>Comma separated file (*.csv)</source>
-        <translation>CSV formát (*.csv)</translation>
+        <translation>Formát CSV (*.csv)</translation>
     </message>
     <message>
         <source>Confirmed</source>
@@ -2783,14 +2879,66 @@
         <source>Accept command line and JSON-RPC commands</source>
         <translation>Akceptovat příkazy z příkazové řádky a přes JSON-RPC</translation>
     </message>
+    <message>
+        <source>If &lt;category&gt; is not supplied or if &lt;category&gt; = 1, output all debugging information.</source>
+        <translation>Pokud není &lt;category&gt; zadána nebo je &lt;category&gt; = 1, bude tisknout veškeré ladicí informace.</translation>
+    </message>
+    <message>
+        <source>Please check that your computer's date and time are correct! If your clock is wrong Bitcoin Core will not work properly.</source>
+        <translation>Prosím zkontrolujte nastavení času na svém počítači. Pokud čas a datum není nastaven správně, Bitcoin Core nebude fungovat!</translation>
+    </message>
+    <message>
+        <source>Prune configured below the minimum of %d MiB.  Please use a higher number.</source>
+        <translation>Prořezávání je nastaveno pod minimum %d MiB.  Použij, prosím, nějaké vyšší číslo.</translation>
+    </message>
+    <message>
+        <source>Prune: last wallet synchronisation goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of pruned node)</source>
+        <translation>Prořezávání: poslední synchronizace peněženky proběhla před už prořezanými daty. Je třeba provést -reindex (tedy v případě prořezávacího režimu stáhnout znovu celý řetězec bloků)</translation>
+    </message>
+    <message>
+        <source>Reduce storage requirements by pruning (deleting) old blocks. This mode is incompatible with -txindex and -rescan. Warning: Reverting this setting requires re-downloading the entire blockchain. (default: 0 = disable pruning blocks, &gt;%u = target size in MiB to use for block files)</source>
+        <translation>Omezit nároky na úložný prostor prořezáváním (mazáním) starých bloků. Tento režim není slučitelný s -txindex ani -rescan. Upozornění: opětovná změna tohoto nastavení bude vyžadovat nové stažení celého řetězce bloků. (výchozí: 0 = bloky neprořezávat, &gt;%u = cílová velikost souborů s bloky, v MiB)</translation>
+    </message>
+    <message>
+        <source>Rescans are not possible in pruned mode. You will need to use -reindex which will download the whole blockchain again.</source>
+        <translation>V prořezávacím režimu není možné přeskenovávat řetězec bloků. Musíš provést -reindex, což znovu stáhne celý řetězec bloků.</translation>
+    </message>
+    <message>
+        <source>Error: A fatal internal error occurred, see debug.log for details</source>
+        <translation>Chyba: Přihodila se závažná vnitřní chyba, podrobnosti viz v debug.log</translation>
+    </message>
+    <message>
+        <source>Fee (in %s/kB) to add to transactions you send (default: %s)</source>
+        <translation>Poplatek (v %s/kB), který se přidá ke každé odeslané transakci (výchozí: %s)</translation>
+    </message>
+    <message>
+        <source>Pruning blockstore...</source>
+        <translation>Prořezávám úložiště bloků...</translation>
+    </message>
     <message>
         <source>Run in the background as a daemon and accept commands</source>
-        <translation>Běžet na pozadí jako démon a akceptovat příkazy</translation>
+        <translation>Běžet na pozadí jako démon a přijímat příkazy</translation>
+    </message>
+    <message>
+        <source>Unable to start HTTP server. See debug log for details.</source>
+        <translation>Nemohu spustit HTTP server. Detaily viz v debug.log.</translation>
     </message>
     <message>
         <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
         <translation>Přijímat spojení zvenčí (výchozí: 1, pokud není zadáno -proxy nebo -connect)</translation>
     </message>
+    <message>
+        <source>-fallbackfee is set very high! This is the transaction fee you may pay when fee estimates are not available.</source>
+        <translation>-fallbackfee je nastaveno velmi vysoko! Toto je transakční poplatek, který bys platil, pokud nebude k dispozici odhad poplatků.</translation>
+    </message>
+    <message>
+        <source>A fee rate (in %s/kB) that will be used when fee estimation has insufficient data (default: %s)</source>
+        <translation>Sazba poplatku (v %s/kB), která se použije, pokud nebude k dispozici dostatek dat pro automatický odhad poplatku (výchozí: %s)</translation>
+    </message>
+    <message>
+        <source>Accept relayed transactions received from whitelisted peers even when not relaying transactions (default: %d)</source>
+        <translation>Přijímat přeposílané transakce obdržené od vždy vítaných protějšků, i když transakce nepřeposíláme (výchozí: %d)</translation>
+    </message>
     <message>
         <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source>
         <translation>Poslouchat na zadané adrese. Pro zápis IPv6 adresy použij notaci [adresa]:port</translation>
@@ -2807,10 +2955,18 @@
         <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source>
         <translation>Spustit příkaz, když se objeví transakce týkající se peněženky (%s se v příkazu nahradí za TxID)</translation>
     </message>
+    <message>
+        <source>Force relay of transactions from whitelisted peers even they violate local relay policy (default: %d)</source>
+        <translation>Vynutit přeposílání transakcí od vždy vítaných protějšků (tj. těch na bílé listině), i když porušují místní zásady pro přeposílání (výchozí: %d)</translation>
+    </message>
     <message>
         <source>Set the number of script verification threads (%u to %d, 0 = auto, &lt;0 = leave that many cores free, default: %d)</source>
         <translation>Nastavení počtu vláken pro verifikaci skriptů (%u až %d, 0 = automaticky, &lt;0 = nechat daný počet jader volný, výchozí: %d)</translation>
     </message>
+    <message>
+        <source>The block database contains a block which appears to be from the future. This may be due to your computer's date and time being set incorrectly. Only rebuild the block database if you are sure that your computer's date and time are correct</source>
+        <translation>Databáze bloků obsahuje blok, který vypadá jako z budoucnosti, což může být kvůli špatně nastavenému datu a času na tvém počítači. Nech databázi bloků přestavět pouze v případě, že si jsi jistý, že máš na počítači správný datum a čas</translation>
+    </message>
     <message>
         <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
         <translation>Tohle je testovací verze – používej ji jen na vlastní riziko, ale rozhodně ji nepoužívej k těžbě nebo pro obchodní aplikace</translation>
@@ -2819,6 +2975,14 @@
         <source>Unable to bind to %s on this computer. Bitcoin Core is probably already running.</source>
         <translation>Nedaří se mi připojit na %s na tomhle počítači. Bitcoin Core už pravděpodobně jednou běží.</translation>
     </message>
+    <message>
+        <source>Unsupported argument -whitelistalwaysrelay ignored, use -whitelistrelay and/or -whitelistforcerelay.</source>
+        <translation>Nepodporovaný argument -whitelistalwaysrelay se ignoruje, použij -whitelistrelay a/nebo -whitelistforcerelay.</translation>
+    </message>
+    <message>
+        <source>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</source>
+        <translation>Použít UPnP k namapování naslouchacího portu (výchozí: 1, pokud naslouchá a nepoužívá -proxy)</translation>
+    </message>
     <message>
         <source>WARNING: abnormally high number of blocks generated, %d blocks received in the last %d hours (%d expected)</source>
         <translation>UPOZORNĚNÍ: vygenerováno nezvykle mnoho bloků – přijato %d bloků jen za posledních %d hodin (očekáváno %d)</translation>
@@ -2837,16 +3001,24 @@
     </message>
     <message>
         <source>Warning: wallet.dat corrupt, data salvaged! Original wallet.dat saved as wallet.{timestamp}.bak in %s; if your balance or transactions are incorrect you should restore from a backup.</source>
-        <translation>Upozornění: soubor wallet.dat je poškozený, data jsou však zachráněna! Původní soubor wallet.dat je uložený jako wallet.{timestamp}.bak v %s. Pokud je stav tvého účtu nebo transakce nesprávné, zřejmě bys měl obnovit zálohu.</translation>
+        <translation>Upozornění: soubor wallet.dat je poškozený, data jsou však zachráněna! Původní soubor wallet.dat je uložený jako wallet.{timestamp}.bak v %s. Pokud jsou stav tvého účtu nebo transakce nesprávné, zřejmě bys měl obnovit zálohu.</translation>
     </message>
     <message>
         <source>Whitelist peers connecting from the given netmask or IP address. Can be specified multiple times.</source>
-        <translation>Umístit na bílou listinu protějšky připojující se z dané podsítě či IP adresy. Lze zadat i vícekrát.</translation>
+        <translation>Vždy vítat protějšky připojující se z dané podsítě či IP adresy. Lze zadat i vícekrát.</translation>
+    </message>
+    <message>
+        <source>-maxmempool must be at least %d MB</source>
+        <translation>-maxmempool musí být alespoň %d MB</translation>
     </message>
     <message>
         <source>&lt;category&gt; can be:</source>
         <translation>&lt;category&gt; může být:</translation>
     </message>
+    <message>
+        <source>Append comment to the user agent string</source>
+        <translation>Připojit komentář k typu klienta</translation>
+    </message>
     <message>
         <source>Block creation options:</source>
         <translation>Možnosti vytváření bloku:</translation>
@@ -2911,6 +3083,22 @@
         <source>Invalid -onion address: '%s'</source>
         <translation>Neplatná -onion adresa: '%s'</translation>
     </message>
+    <message>
+        <source>Invalid amount for -fallbackfee=&lt;amount&gt;: '%s'</source>
+        <translation>Neplatná částka pro -fallbackfee=&lt;částka&gt;: '%s'</translation>
+    </message>
+    <message>
+        <source>Keep the transaction memory pool below &lt;n&gt; megabytes (default: %u)</source>
+        <translation>Udržovat zasobník transakcí menší než &lt;n&gt; megabajtů (výchozí: %u)</translation>
+    </message>
+    <message>
+        <source>Location of the auth cookie (default: data dir)</source>
+        <translation>Místo pro autentizační cookie (výchozí: adresář pro data)</translation>
+    </message>
+    <message>
+        <source>Minimum bytes per sigop in transactions we relay and mine (default: %u)</source>
+        <translation>Minimální počet bajtů na každý sigop v transakcích, které přeposíláme a těžíme (výchozí: %u)</translation>
+    </message>
     <message>
         <source>Not enough file descriptors available.</source>
         <translation>Je nedostatek deskriptorů souborů.</translation>
@@ -2919,6 +3107,10 @@
         <source>Only connect to nodes in network &lt;net&gt; (ipv4, ipv6 or onion)</source>
         <translation>Připojovat se pouze k uzlům v &lt;net&gt; síti (ipv4, ipv6 nebo onion)</translation>
     </message>
+    <message>
+        <source>Print version and exit</source>
+        <translation>Vypsat verzi a skončit</translation>
+    </message>
     <message>
         <source>Prune cannot be configured with a negative value.</source>
         <translation>Prořezávání nemůže být zkonfigurováno s negativní hodnotou.</translation>
@@ -2939,10 +3131,26 @@
         <source>Specify wallet file (within data directory)</source>
         <translation>Udej název souboru s peněženkou (v rámci datového adresáře)</translation>
     </message>
+    <message>
+        <source>Unsupported argument -benchmark ignored, use -debug=bench.</source>
+        <translation>Nepodporovaný argument -benchmark se ignoruje, použij -debug=bench.</translation>
+    </message>
+    <message>
+        <source>Unsupported argument -debugnet ignored, use -debug=net.</source>
+        <translation>Nepodporovaný argument -debugnet se ignoruje, použij -debug=net.</translation>
+    </message>
+    <message>
+        <source>Unsupported argument -tor found, use -onion.</source>
+        <translation>Argument -tor již není podporovaný, použij -onion.</translation>
+    </message>
     <message>
         <source>Use UPnP to map the listening port (default: %u)</source>
         <translation>Použít UPnP k namapování naslouchacího portu (výchozí: %u)</translation>
     </message>
+    <message>
+        <source>User Agent comment (%s) contains unsafe characters.</source>
+        <translation>Komentář u typu klienta (%s) obsahuje riskantní znaky.</translation>
+    </message>
     <message>
         <source>Verifying blocks...</source>
         <translation>Ověřuji bloky...</translation>
@@ -2959,10 +3167,6 @@
         <source>Wallet options:</source>
         <translation>Možnosti peněženky:</translation>
     </message>
-    <message>
-        <source>Warning: This version is obsolete; upgrade required!</source>
-        <translation>Upozornění: tahle verze je zastaralá, měl bys ji aktualizovat!</translation>
-    </message>
     <message>
         <source>You need to rebuild the database using -reindex to change -txindex</source>
         <translation>Je třeba přestavět databázi použitím -reindex, aby bylo možné změnit -txindex</translation>
@@ -2973,7 +3177,7 @@
     </message>
     <message>
         <source>Bind to given address and whitelist peers connecting to it. Use [host]:port notation for IPv6</source>
-        <translation>Obsadit zadanou adresu a protějšky, které se na ní připojí, umístit na bílou listinu. Pro zápis IPv6 adresy použij notaci [adresa]:port</translation>
+        <translation>Obsadit zadanou adresu a vždy vítat protějšky, které se na ni připojí. Pro zápis IPv6 adresy použij notaci [adresa]:port</translation>
     </message>
     <message>
         <source>Bind to given address to listen for JSON-RPC connections. Use [host]:port notation for IPv6. This option can be specified multiple times (default: bind to all interfaces)</source>
@@ -2999,6 +3203,10 @@
         <source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source>
         <translation>Spustit příkaz, když přijde relevantní upozornění nebo když dojde k opravdu dlouhému rozštěpení řetezce bloků (%s se v příkazu nahradí zprávou)</translation>
     </message>
+    <message>
+        <source>Fees (in %s/kB) smaller than this are considered zero fee for relaying, mining and transaction creation (default: %s)</source>
+        <translation>Poplatky (v %s/kB) menší než tato hodnota jsou považovány za nulové pro účely přeposílání, těžení a vytváření transakcí (výchozí: %s)</translation>
+    </message>
     <message>
         <source>If paytxfee is not set, include enough fee so transactions begin confirmation on average within n blocks (default: %u)</source>
         <translation>Pokud paytxfee není nastaveno, platit dostatečný poplatek na to, aby začaly být transakce potvrzovány v průměru během n bloků (výchozí: %u)</translation>
@@ -3037,7 +3245,7 @@
     </message>
     <message>
         <source>Whitelisted peers cannot be DoS banned and their transactions are always relayed, even if they are already in the mempool, useful e.g. for a gateway</source>
-        <translation>Na protějšky na bílé listině se nevztahuje DoS klatba a jejich transakce jsou vždy přeposílány, i když už třeba jsou v mempoolu, což je užitečné např. pro bránu</translation>
+        <translation>Na vždy vítané protějšky se nevztahuje DoS klatba a jejich transakce jsou vždy přeposílány, i když už třeba jsou v transakčním zásobníku, což je užitečné např. pro bránu</translation>
     </message>
     <message>
         <source>You need to rebuild the database using -reindex to go back to unpruned mode.  This will redownload the entire blockchain</source>
@@ -3055,6 +3263,14 @@
         <source>Activating best chain...</source>
         <translation>Aktivuji nejlepší řetězec...</translation>
     </message>
+    <message>
+        <source>Attempt to recover private keys from a corrupt wallet.dat on startup</source>
+        <translation>Pokusit se při startu zachránit soukromé klíče z poškozeného souboru wallet.dat</translation>
+    </message>
+    <message>
+        <source>Automatically create Tor hidden service (default: %d)</source>
+        <translation>Automaticky v Toru vytvářet skryté služby (výchozí: %d)</translation>
+    </message>
     <message>
         <source>Cannot resolve -whitebind address: '%s'</source>
         <translation>Nemohu přeložit -whitebind adresu: '%s'</translation>
@@ -3075,6 +3291,10 @@
         <source>Error reading from database, shutting down.</source>
         <translation>Chyba při čtení z databáze, ukončuji se.</translation>
     </message>
+    <message>
+        <source>Imports blocks from external blk000??.dat file on startup</source>
+        <translation>Importovat při startu bloky z externího souboru blk000??.dat</translation>
+    </message>
     <message>
         <source>Information</source>
         <translation>Informace</translation>
@@ -3127,6 +3347,14 @@
         <source>Receive and display P2P network alerts (default: %u)</source>
         <translation>Přijímat a zobrazovat poplachy z P2P sítě (výchozí: %u)</translation>
     </message>
+    <message>
+        <source>Reducing -maxconnections from %d to %d, because of system limitations.</source>
+        <translation>Omezuji -maxconnections z %d na %d kvůli systémovým omezením.</translation>
+    </message>
+    <message>
+        <source>Rescan the block chain for missing wallet transactions on startup</source>
+        <translation>Přeskenovat při startu řetězec bloků na chybějící transakce tvé pěněženky</translation>
+    </message>
     <message>
         <source>Send trace/debug info to console instead of debug.log file</source>
         <translation>Posílat stopovací/ladicí informace do konzole místo do souboru debug.log</translation>
@@ -3155,6 +3383,14 @@
         <source>This is experimental software.</source>
         <translation>Tohle je experimentální program.</translation>
     </message>
+    <message>
+        <source>Tor control port password (default: empty)</source>
+        <translation>Heslo ovládacího portu Toru (výchozí: prázdné)</translation>
+    </message>
+    <message>
+        <source>Tor control port to use if onion listening enabled (default: %s)</source>
+        <translation>Ovládací port Toru, je-li zapnuté onion naslouchání (výchozí: %s)</translation>
+    </message>
     <message>
         <source>Transaction amount too small</source>
         <translation>Částka v transakci je příliš malá</translation>
@@ -3175,6 +3411,10 @@
         <source>Unable to bind to %s on this computer (bind returned error %s)</source>
         <translation>Nedaří se mi připojit na %s na tomhle počítači (operace bind vrátila chybu %s)</translation>
     </message>
+    <message>
+        <source>Upgrade wallet to latest format on startup</source>
+        <translation>Převést při startu peněženku na nejnovější formát</translation>
+    </message>
     <message>
         <source>Username for JSON-RPC connections</source>
         <translation>Uživatelské jméno pro JSON-RPC spojení</translation>
@@ -3187,10 +3427,18 @@
         <source>Warning</source>
         <translation>Upozornění</translation>
     </message>
+    <message>
+        <source>Whether to operate in a blocks only mode (default: %u)</source>
+        <translation>Zda fungovat v čistě blokovém režimu (výchozí: %u)</translation>
+    </message>
     <message>
         <source>Zapping all transactions from wallet...</source>
         <translation>Vymazat všechny transakce z peněženky...</translation>
     </message>
+    <message>
+        <source>ZeroMQ notification options:</source>
+        <translation>Možnosti ZeroMQ oznámení:</translation>
+    </message>
     <message>
         <source>wallet.dat corrupt, salvage failed</source>
         <translation>Soubor wallet.dat je poškozen, jeho záchrana se nezdařila</translation>
@@ -3223,6 +3471,26 @@
         <source>(1 = keep tx meta data e.g. account owner and payment request information, 2 = drop tx meta data)</source>
         <translation>(1 = ukládat transakční metadata, např. majitele účtu a informace o platebním požadavku, 2 = mazat transakční metadata)</translation>
     </message>
+    <message>
+        <source>-maxtxfee is set very high! Fees this large could be paid on a single transaction.</source>
+        <translation>-maxtxfee je nastaveno velmi vysoko! Takto vysoký poplatek může být zaplacen v jednotlivé transakci.</translation>
+    </message>
+    <message>
+        <source>-paytxfee is set very high! This is the transaction fee you will pay if you send a transaction.</source>
+        <translation>-paytxfee je nastaveno velmi vysoko! Toto je transakční poplatek, který zaplatíš za každou poslanou transakci.</translation>
+    </message>
+    <message>
+        <source>Do not keep transactions in the mempool longer than &lt;n&gt; hours (default: %u)</source>
+        <translation>Nedržet transakce v zásobníku déle než &lt;n&gt; hodin (výchozí: %u)</translation>
+    </message>
+    <message>
+        <source>Error reading wallet.dat! All keys read correctly, but transaction data or address book entries might be missing or incorrect.</source>
+        <translation>Nastala chyba při čtení souboru wallet.dat! Všechny klíče se přečetly správně, ale data o transakcích nebo záznamy v adresáři mohou chybět či být nesprávné.</translation>
+    </message>
+    <message>
+        <source>Fees (in %s/kB) smaller than this are considered zero fee for transaction creation (default: %s)</source>
+        <translation>Poplatky (v %s/kB) menší než tato hodnota jsou považovány za nulové pro účely vytváření transakcí (výchozí: %s)</translation>
+    </message>
     <message>
         <source>How thorough the block verification of -checkblocks is (0-4, default: %u)</source>
         <translation>Jak moc důkladná má být verifikace bloků -checkblocks (0-4, výchozí: %u)</translation>
@@ -3239,10 +3507,30 @@
         <source>Output debugging information (default: %u, supplying &lt;category&gt; is optional)</source>
         <translation>Tisknout ladicí informace (výchozí: %u, zadání &lt;category&gt; je volitelné)</translation>
     </message>
+    <message>
+        <source>Support filtering of blocks and transaction with bloom filters (default: %u)</source>
+        <translation>Umožnit filtrování bloků a transakcí pomocí Bloomova filtru (výchozí: %u)</translation>
+    </message>
+    <message>
+        <source>Total length of network version string (%i) exceeds maximum length (%i). Reduce the number or size of uacomments.</source>
+        <translation>Celková délka síťového identifikačního řetězce (%i) překročila svůj horní limit (%i). Omez počet nebo velikost voleb uacomment.</translation>
+    </message>
+    <message>
+        <source>Tries to keep outbound traffic under the given target (in MiB per 24h), 0 = no limit (default: %d)</source>
+        <translation>Pokusit se udržet odchozí provoz pod stanovenou hodnotou (v MiB za 24 hodin), 0 = bez omezení (výchozí: %d)</translation>
+    </message>
+    <message>
+        <source>Unsupported argument -socks found. Setting SOCKS version isn't possible anymore, only SOCKS5 proxies are supported.</source>
+        <translation>Byl použit nepodporovaný argument -socks. Nastavení verze SOCKS už není možné, podporovány jsou pouze SOCKS5 proxy.</translation>
+    </message>
     <message>
         <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: %s)</source>
         <translation>Použít samostatnou SOCKS5 proxy ke spojení s protějšky přes skryté služby v Toru (výchozí: %s)</translation>
     </message>
+    <message>
+        <source>Username and hashed password for JSON-RPC connections. The field &lt;userpw&gt; comes in the format: &lt;USERNAME&gt;:&lt;SALT&gt;$&lt;HASH&gt;. A canonical python script is included in share/rpcuser. This option can be specified multiple times</source>
+        <translation>Uživatelské jméno a zahašované heslo pro JSON-RPC spojení. Pole &lt;userpw&gt; má formát: &lt;UŽIVATELSKÉ_JMÉNO&gt;:&lt;SŮL&gt;$&lt;HAŠ&gt;. Pomocný pythonní skript je přiložen v share/rpcuser. Tuto volbu lze použít i vícekrát</translation>
+    </message>
     <message>
         <source>(default: %s)</source>
         <translation>(výchozí: %s)</translation>
@@ -3327,10 +3615,6 @@
         <source>Specify connection timeout in milliseconds (minimum: 1, default: %d)</source>
         <translation>Zadej časový limit spojení v milivteřinách (minimum: 1, výchozí: %d)</translation>
     </message>
-    <message>
-        <source>Specify pid file (default: %s)</source>
-        <translation>PID soubor (výchozí: %s)</translation>
-    </message>
     <message>
         <source>Spend unconfirmed change when sending transactions (default: %u)</source>
         <translation>Utrácet i ještě nepotvrzené drobné při posílání transakcí (výchozí: %u)</translation>
diff --git a/src/qt/locale/bitcoin_cs_CZ.ts b/src/qt/locale/bitcoin_cs_CZ.ts
index cc0c791154a90..34d7b4b4a1644 100644
--- a/src/qt/locale/bitcoin_cs_CZ.ts
+++ b/src/qt/locale/bitcoin_cs_CZ.ts
@@ -1,6 +1,10 @@
 <TS language="cs_CZ" version="2.1">
 <context>
     <name>AddressBookPage</name>
+    <message>
+        <source>Right-click to edit address or label</source>
+        <translation>Pravým klikem editujte adresu nebo popisek</translation>
+    </message>
     <message>
         <source>Create a new address</source>
         <translation>Vytvořit novou adresu</translation>
@@ -9,6 +13,18 @@
         <source>Copy the currently selected address to the system clipboard</source>
         <translation>Kopírovat aktuálně vybrané adresy do schránky</translation>
     </message>
+    <message>
+        <source>Delete the currently selected address from the list</source>
+        <translation>Odstraní aktuálně vybrané adresy ze seznamu</translation>
+    </message>
+    <message>
+        <source>Export the data in the current tab to a file</source>
+        <translation>Exportovat aktuální pohled do souboru</translation>
+    </message>
+    <message>
+        <source>&amp;Export</source>
+        <translation>&amp;Exportovat</translation>
+    </message>
     <message>
         <source>&amp;Delete</source>
         <translation>&amp;Odstranit</translation>
@@ -622,6 +638,14 @@
     </context>
 <context>
     <name>WalletView</name>
+    <message>
+        <source>&amp;Export</source>
+        <translation>&amp;Exportovat</translation>
+    </message>
+    <message>
+        <source>Export the data in the current tab to a file</source>
+        <translation>Exportovat aktuální pohled do souboru</translation>
+    </message>
     </context>
 <context>
     <name>bitcoin-core</name>
diff --git a/src/qt/locale/bitcoin_da.ts b/src/qt/locale/bitcoin_da.ts
index aa2724a1e81ca..7d11825a618a7 100644
--- a/src/qt/locale/bitcoin_da.ts
+++ b/src/qt/locale/bitcoin_da.ts
@@ -1017,7 +1017,7 @@
     </message>
     <message>
         <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Exit in the menu.</source>
-        <translation>Minimér i stedet for at lukke applikationen, når vinduet lukkes. Når denne indstilling er slået til, vil applikationen først blive lukket, når Afslut vælges i menuen.</translation>
+        <translation>Minimér i stedet for at lukke applikationen, når vinduet lukkes. Når denne indstilling er aktiveret, vil applikationen først blive lukket, når Afslut vælges i menuen.</translation>
     </message>
     <message>
         <source>The user interface language can be set here. This setting will take effect after restarting Bitcoin Core.</source>
@@ -1069,7 +1069,7 @@
     </message>
     <message>
         <source>Enable coin &amp;control features</source>
-        <translation>Slå egenskaber for &amp;coin-styring til</translation>
+        <translation>Aktivér egenskaber for &amp;coin-styring</translation>
     </message>
     <message>
         <source>If you disable the spending of unconfirmed change, the change from a transaction cannot be used until that transaction has at least one confirmation. This also affects how your balance is computed.</source>
@@ -1473,10 +1473,6 @@
         <source>General</source>
         <translation>Generelt</translation>
     </message>
-    <message>
-        <source>Using OpenSSL version</source>
-        <translation>Anvender OpenSSL-version</translation>
-    </message>
     <message>
         <source>Using BerkeleyDB version</source>
         <translation>Bruger BerkeleyDB version</translation>
@@ -2979,6 +2975,18 @@
         <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
         <translation>Acceptér forbindelser udefra (standard: 1 hvis hverken -proxy eller -connect)</translation>
     </message>
+    <message>
+        <source>-fallbackfee is set very high! This is the transaction fee you may pay when fee estimates are not available.</source>
+        <translation>-fallbackfee er sat meget højt! Dette er transaktionsgebyret, du eventuelt betaler, hvis gebyrestimater ikke er tilgængelige.</translation>
+    </message>
+    <message>
+        <source>A fee rate (in %s/kB) that will be used when fee estimation has insufficient data (default: %s)</source>
+        <translation>En gebyrsats (i %s/kB), som vil blive brugt, hvis gebyrestimering har utilstrækkelig data (standard: %s)</translation>
+    </message>
+    <message>
+        <source>Accept relayed transactions received from whitelisted peers even when not relaying transactions (default: %d)</source>
+        <translation>Acceptér videresendte transaktioner, der modtages fra hvidlistede knuder, selv når transaktioner ikke videresendes (standard: %d)</translation>
+    </message>
     <message>
         <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source>
         <translation>Tildel til den givne adresse og lyt altid på den. Brug [vært]:port-notation for IPv6</translation>
@@ -2995,6 +3003,10 @@
         <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source>
         <translation>Udfør kommando, når en transaktion i tegnebogen ændres (%s i kommandoen erstattes med TxID)</translation>
     </message>
+    <message>
+        <source>Force relay of transactions from whitelisted peers even they violate local relay policy (default: %d)</source>
+        <translation>Gennemtving videresendelse af transaktioner fra hvidlistede knuder, selv om de overtræder lokal videresendelsespolitik (standard: %d)</translation>
+    </message>
     <message>
         <source>Set the number of script verification threads (%u to %d, 0 = auto, &lt;0 = leave that many cores free, default: %d)</source>
         <translation>Sæt antallet af scriptverificeringstråde (%u til %d, 0 = auto, &lt;0 = efterlad det antal kernet fri, standard: %d)</translation>
@@ -3011,6 +3023,10 @@
         <source>Unable to bind to %s on this computer. Bitcoin Core is probably already running.</source>
         <translation>Ikke i stand til at tildele til %s på denne computer. Bitcoin Core kører sansynligvis allerede.</translation>
     </message>
+    <message>
+        <source>Unsupported argument -whitelistalwaysrelay ignored, use -whitelistrelay and/or -whitelistforcerelay.</source>
+        <translation>Argument -whitelistalwaysrelay understøttes ikke og ignoreres; brug -whitelistrelay og/eller -whitelistforcerelay.</translation>
+    </message>
     <message>
         <source>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</source>
         <translation>Brug UPnP for at konfigurere den lyttende port (standard: 1 under lytning og ingen -proxy)</translation>
@@ -3027,6 +3043,10 @@
         <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source>
         <translation>Advarsel: Netværket ser ikke ud til at være fuldt ud enige! Enkelte minere ser ud til at opleve problemer.</translation>
     </message>
+    <message>
+        <source>Warning: Unknown block versions being mined! It's possible unknown rules are in effect</source>
+        <translation>Advarsel: Ukendte blokversioner bliver minet! Det er muligt, at ukendte regler er i brug</translation>
+    </message>
     <message>
         <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source>
         <translation>Advarsel: Vi ser ikke ud til at være fuldt ud enige med andre knuder! Du kan være nødt til at opgradere, eller andre knuder kan være nødt til at opgradere.</translation>
@@ -3047,6 +3067,10 @@
         <source>&lt;category&gt; can be:</source>
         <translation>&lt;kategori&gt; kan være:</translation>
     </message>
+    <message>
+        <source>Append comment to the user agent string</source>
+        <translation>Føj kommentar til brugeragentstrengen</translation>
+    </message>
     <message>
         <source>Block creation options:</source>
         <translation>Blokoprettelsestilvalg:</translation>
@@ -3091,6 +3115,10 @@
         <source>Enable publish raw transaction in &lt;address&gt;</source>
         <translation>Aktivér offentliggørelse af rå transaktion i &lt;address&gt;</translation>
     </message>
+    <message>
+        <source>Enable transaction replacement in the memory pool (default: %u)</source>
+        <translation>Aktivér transaktionserstatning i hukommelsespuljen (standard: %u)</translation>
+    </message>
     <message>
         <source>Error initializing block database</source>
         <translation>Klargøring af blokdatabase mislykkedes</translation>
@@ -3127,10 +3155,22 @@
         <source>Invalid -onion address: '%s'</source>
         <translation>Ugyldig -onion adresse: "%s"</translation>
     </message>
+    <message>
+        <source>Invalid amount for -fallbackfee=&lt;amount&gt;: '%s'</source>
+        <translation>Ugyldigt beløb for -fallbackfee=&lt;beløb&gt;: "%s"</translation>
+    </message>
     <message>
         <source>Keep the transaction memory pool below &lt;n&gt; megabytes (default: %u)</source>
         <translation>Hold hukommelsespuljen med transaktioner under &lt;n&gt; megabyte (standard: %u)</translation>
     </message>
+    <message>
+        <source>Location of the auth cookie (default: data dir)</source>
+        <translation>Placering for autentificerings-cookie (standard: datamappe)</translation>
+    </message>
+    <message>
+        <source>Minimum bytes per sigop in transactions we relay and mine (default: %u)</source>
+        <translation>Minimum bytes pr. sigop i transaktioner, vi videresender og miner (standard: %u)</translation>
+    </message>
     <message>
         <source>Not enough file descriptors available.</source>
         <translation>For få tilgængelige fildeskriptorer.</translation>
@@ -3139,6 +3179,10 @@
         <source>Only connect to nodes in network &lt;net&gt; (ipv4, ipv6 or onion)</source>
         <translation>Tilslut kun til knuder i netværk &lt;net&gt; (IPv4, IPv6 eller Onion)</translation>
     </message>
+    <message>
+        <source>Print version and exit</source>
+        <translation>Udskriv version og afslut</translation>
+    </message>
     <message>
         <source>Prune cannot be configured with a negative value.</source>
         <translation>Beskæring kan ikke opsættes med en negativ værdi.</translation>
@@ -3195,10 +3239,6 @@
         <source>Wallet options:</source>
         <translation>Tilvalg for tegnebog:</translation>
     </message>
-    <message>
-        <source>Warning: This version is obsolete; upgrade required!</source>
-        <translation>Advarsel: Denne version er forældet; opgradering påkrævet!</translation>
-    </message>
     <message>
         <source>You need to rebuild the database using -reindex to change -txindex</source>
         <translation>Du er nødt til at genopbygge databasen ved hjælp af -reindex for at ændre -txindex</translation>
@@ -3257,7 +3297,7 @@
     </message>
     <message>
         <source>Randomize credentials for every proxy connection. This enables Tor stream isolation (default: %u)</source>
-        <translation>Brug tilfældige akkreditiver for hver proxy-forbindelse. Dette tillader strømisolation med Tor (standard: %u)</translation>
+        <translation>Brug tilfældige akkreditiver for hver proxy-forbindelse. Dette aktiverer strømisolation med Tor (standard: %u)</translation>
     </message>
     <message>
         <source>Set maximum size of high-priority/low-fee transactions in bytes (default: %d)</source>
@@ -3277,7 +3317,7 @@
     </message>
     <message>
         <source>Whitelisted peers cannot be DoS banned and their transactions are always relayed, even if they are already in the mempool, useful e.g. for a gateway</source>
-        <translation>Andre knuder på hvidliste kan ikke DoS-bandlyses, og deres transaktioner videresendes altid, selv hvis de allerede er i mempool'en. Brugbart til fx et adgangspunkt</translation>
+        <translation>Andre knuder på hvidliste kan ikke DoS-bandlyses, og deres transaktioner videresendes altid, selv hvis de allerede er i hukommelsespuljen. Brugbart til fx et adgangspunkt</translation>
     </message>
     <message>
         <source>You need to rebuild the database using -reindex to go back to unpruned mode.  This will redownload the entire blockchain</source>
@@ -3295,10 +3335,6 @@
         <source>Activating best chain...</source>
         <translation>Aktiverer bedste kæde…</translation>
     </message>
-    <message>
-        <source>Always relay transactions received from whitelisted peers (default: %d)</source>
-        <translation>Videresend altid transaktioner, der modtages fra hvidlistede knuder (standard: %d)</translation>
-    </message>
     <message>
         <source>Attempt to recover private keys from a corrupt wallet.dat on startup</source>
         <translation>Forsøg at genskabe private nøgler fra en ødelagt wallet.dat under opstart</translation>
@@ -3425,7 +3461,7 @@
     </message>
     <message>
         <source>Tor control port to use if onion listening enabled (default: %s)</source>
-        <translation>Tor kontrolport, der skal bruges, hvis onion-lytning er slået til (standard: %s)</translation>
+        <translation>Tor kontrolport, der skal bruges, hvis onion-lytning er aktiveret (standard: %s)</translation>
     </message>
     <message>
         <source>Transaction amount too small</source>
@@ -3463,6 +3499,10 @@
         <source>Warning</source>
         <translation>Advarsel</translation>
     </message>
+    <message>
+        <source>Warning: unknown new rules activated (versionbit %i)</source>
+        <translation>Advarsel: Ukendte nye regler aktiveret (versionsbit %i)</translation>
+    </message>
     <message>
         <source>Whether to operate in a blocks only mode (default: %u)</source>
         <translation>Hvorvidt der skal arbejdes i kun-blokke-tilstand (standard: %u)</translation>
diff --git a/src/qt/locale/bitcoin_de.ts b/src/qt/locale/bitcoin_de.ts
index 84de80aff50d3..947a471acd1dc 100644
--- a/src/qt/locale/bitcoin_de.ts
+++ b/src/qt/locale/bitcoin_de.ts
@@ -892,7 +892,7 @@
     </message>
     <message>
         <source>Set language, for example "de_DE" (default: system locale)</source>
-        <translation>Sprache einstellen, zum Beispiel "de_DE" (default: system locale)</translation>
+        <translation>Sprache einstellen, zum Beispiel "de_DE" (Standard: Systemgebietsschema)</translation>
     </message>
     <message>
         <source>Start minimized</source>
@@ -1473,10 +1473,6 @@
         <source>General</source>
         <translation>Allgemein</translation>
     </message>
-    <message>
-        <source>Using OpenSSL version</source>
-        <translation>Verwendete OpenSSL-Version</translation>
-    </message>
     <message>
         <source>Using BerkeleyDB version</source>
         <translation>Verwendete BerkeleyDB-Version</translation>
@@ -2927,6 +2923,10 @@
         <source>Accept command line and JSON-RPC commands</source>
         <translation>Kommandozeilen- und JSON-RPC-Befehle annehmen</translation>
     </message>
+    <message>
+        <source>If &lt;category&gt; is not supplied or if &lt;category&gt; = 1, output all debugging information.</source>
+        <translation>Wenn &lt;category&gt; nicht angegeben wird oder &lt;category&gt;=1, jegliche Debugginginformationen ausgeben.</translation>
+    </message>
     <message>
         <source>Maximum total fees (in %s) to use in a single wallet transaction; setting this too low may abort large transactions (default: %s)</source>
         <translation>Maximale Gesamtgebühr (in %s) in einer Börsentransaktion; wird dies zu niedrig gesetzten können große Transaktionen abgebrochen werden (Standard: %s)</translation>
@@ -2935,10 +2935,22 @@
         <source>Please check that your computer's date and time are correct! If your clock is wrong Bitcoin Core will not work properly.</source>
         <translation>Bitte korrigieren Sie die Datums- und Uhrzeiteinstellungen Ihres Computers, da Bitcoin Core ansonsten nicht ordnungsgemäß funktionieren wird.</translation>
     </message>
+    <message>
+        <source>Prune configured below the minimum of %d MiB.  Please use a higher number.</source>
+        <translation>Kürzungsmodus wurde kleiner als das Minimum in Höhe von %d MiB konfiguriert. Bitte verwenden Sie einen größeren Wert.</translation>
+    </message>
+    <message>
+        <source>Reduce storage requirements by pruning (deleting) old blocks. This mode is incompatible with -txindex and -rescan. Warning: Reverting this setting requires re-downloading the entire blockchain. (default: 0 = disable pruning blocks, &gt;%u = target size in MiB to use for block files)</source>
+        <translation>Speicherplatzanforderung durch kürzen (löschen) alter Blöcke reduzieren. Dieser Modus ist nicht mit -txindex und -rescan kompatibel. Warnung: Die Umkehr dieser Einstellung erfordert das erneute Herunterladen der gesamten Blockkette. (Standard: 0 = deaktiviert das Kürzen von Blöcken, &gt;%u = Zielgröße in MiB, die für Blockdateien verwendet werden darf)</translation>
+    </message>
     <message>
         <source>Error: A fatal internal error occurred, see debug.log for details</source>
         <translation>Fehler: Ein schwerer interner Fehler ist aufgetreten, siehe debug.log für Details.</translation>
     </message>
+    <message>
+        <source>Fee (in %s/kB) to add to transactions you send (default: %s)</source>
+        <translation>Gebühr (in %s/kB), die von Ihnen gesendeten Transaktionen hinzugefügt wird (Standard: %s)</translation>
+    </message>
     <message>
         <source>Pruning blockstore...</source>
         <translation>Kürze Blockspeicher...</translation>
@@ -2955,6 +2967,14 @@
         <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
         <translation>Eingehende Verbindungen annehmen (Standard: 1, wenn nicht -proxy oder -connect)</translation>
     </message>
+    <message>
+        <source>-fallbackfee is set very high! This is the transaction fee you may pay when fee estimates are not available.</source>
+        <translation>-fallbackfee ist sehr hoch eingestellt! Das ist die Transaktionsgebühr, welche du zahlen müsstest, wenn die Gebührenschätzungen nicht verfügbar sind.</translation>
+    </message>
+    <message>
+        <source>A fee rate (in %s/kB) that will be used when fee estimation has insufficient data (default: %s)</source>
+        <translation>Eine Transaktionsgebühr (in %s/kB) wird genutzt, wenn für die Gebührenschützung zu wenig Daten vorliegen (Standardwert: %s)</translation>
+    </message>
     <message>
         <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source>
         <translation>An die angegebene Adresse binden und immer abhören. Für IPv6 "[Host]:Port"-Notation verwenden</translation>
@@ -2971,10 +2991,18 @@
         <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source>
         <translation>Befehl ausführen wenn sich eine Wallet-Transaktion verändert (%s im Befehl wird durch die Transaktions-ID ersetzt)</translation>
     </message>
+    <message>
+        <source>Force relay of transactions from whitelisted peers even they violate local relay policy (default: %d)</source>
+        <translation>Leite Transaktionen von Peers auf der Positivliste auf jeden Fall weiter, auch wenn sie die lokale Weiterleitungsregeln verletzen (Standardeinstellung: %d)</translation>
+    </message>
     <message>
         <source>Set the number of script verification threads (%u to %d, 0 = auto, &lt;0 = leave that many cores free, default: %d)</source>
         <translation>Maximale Anzahl an Skript-Verifizierungs-Threads festlegen (%u bis %d, 0 = automatisch, &lt;0 = so viele Kerne frei lassen, Standard: %d)</translation>
     </message>
+    <message>
+        <source>The block database contains a block which appears to be from the future. This may be due to your computer's date and time being set incorrectly. Only rebuild the block database if you are sure that your computer's date and time are correct</source>
+        <translation>Die Block-Datenbank enthält einen Block, der in der Zukunft auftaucht. Dies kann daran liegen, dass die Systemzeit Ihres Computers falsch eingestellt ist. Stellen Sie die Block-Datenbank nur wieder her, wenn Sie sich sicher sind, dass Ihre Systemzeit korrekt eingestellt ist.</translation>
+    </message>
     <message>
         <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
         <translation>Dies ist eine Vorab-Testversion - Verwendung auf eigene Gefahr - nicht für Mining- oder Handelsanwendungen nutzen!</translation>
@@ -2983,6 +3011,14 @@
         <source>Unable to bind to %s on this computer. Bitcoin Core is probably already running.</source>
         <translation>Kann auf diesem Computer nicht an %s binden, da Bitcoin Core wahrscheinlich bereits gestartet wurde.</translation>
     </message>
+    <message>
+        <source>Unsupported argument -whitelistalwaysrelay ignored, use -whitelistrelay and/or -whitelistforcerelay.</source>
+        <translation>Das Argument -whitelistalwaysrelay wird nicht unterstützt und deswegen ignoriert. Benutze -whitelistrelay und/oder -whitelistforcerelay.</translation>
+    </message>
+    <message>
+        <source>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</source>
+        <translation>UPnP verwenden, um eine Portweiterleitung einzurichten (Standard: 1, wenn abgehört wird und -proxy nicht gesetzt ist)</translation>
+    </message>
     <message>
         <source>WARNING: abnormally high number of blocks generated, %d blocks received in the last %d hours (%d expected)</source>
         <translation>Warnung: Es wurde eine ungewöhnlich hohe Anzahl Blöcke erzeugt, %d Blöcke wurden in den letzten %d Stunden empfangen (%d wurden erwartet).</translation>
@@ -2995,6 +3031,10 @@
         <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source>
         <translation>Warnung: Das Netzwerk scheint nicht vollständig übereinzustimmen! Einige Miner scheinen Probleme zu haben.</translation>
     </message>
+    <message>
+        <source>Warning: Unknown block versions being mined! It's possible unknown rules are in effect</source>
+        <translation>Warnung: Unbekannte Blockversion wird durch Mining erzeugt! Es ist möglich, dass unbekannte Regeln in Kraft sind.</translation>
+    </message>
     <message>
         <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source>
         <translation>Warnung: Wir scheinen nicht vollständig mit unseren Gegenstellen übereinzustimmen! Sie oder die anderen Knoten müssen unter Umständen Ihre Client-Software aktualisieren.</translation>
@@ -3015,6 +3055,10 @@
         <source>&lt;category&gt; can be:</source>
         <translation>&lt;category&gt; kann sein:</translation>
     </message>
+    <message>
+        <source>Append comment to the user agent string</source>
+        <translation>Hänge ein Kommentar zur User Agent-Zeichenkette an</translation>
+    </message>
     <message>
         <source>Block creation options:</source>
         <translation>Blockerzeugungsoptionen:</translation>
@@ -3055,6 +3099,10 @@
         <source>Enable publish raw block in &lt;address&gt;</source>
         <translation>Aktiviere das Veröffentlichen des Raw-Blocks in &lt;address&gt;</translation>
     </message>
+    <message>
+        <source>Enable publish raw transaction in &lt;address&gt;</source>
+        <translation>Aktiviere das Veröffentlichen der Roh-Transaktion in &lt;address&gt;</translation>
+    </message>
     <message>
         <source>Error initializing block database</source>
         <translation>Fehler beim Initialisieren der Blockdatenbank</translation>
@@ -3091,6 +3139,18 @@
         <source>Invalid -onion address: '%s'</source>
         <translation>Ungültige "-onion"-Adresse: '%s'</translation>
     </message>
+    <message>
+        <source>Invalid amount for -fallbackfee=&lt;amount&gt;: '%s'</source>
+        <translation>Ungültiger Betrag für -fallbackfee=&lt;amount&gt;: '%s'</translation>
+    </message>
+    <message>
+        <source>Keep the transaction memory pool below &lt;n&gt; megabytes (default: %u)</source>
+        <translation>Halten Sie den Transaktionsspeicherpool unter &lt;n&gt; Megabytes (Voreinstellung: %u)</translation>
+    </message>
+    <message>
+        <source>Location of the auth cookie (default: data dir)</source>
+        <translation>Dateiort für das Auth-Cookie (Standard: Datenverzeichnis)</translation>
+    </message>
     <message>
         <source>Not enough file descriptors available.</source>
         <translation>Nicht genügend Datei-Deskriptoren verfügbar.</translation>
@@ -3099,6 +3159,10 @@
         <source>Only connect to nodes in network &lt;net&gt; (ipv4, ipv6 or onion)</source>
         <translation>Nur zu Knoten des Netzwerktyps &lt;net&gt; verbinden (ipv4, ipv6 oder onion)</translation>
     </message>
+    <message>
+        <source>Print version and exit</source>
+        <translation>Gibt die Versionsnummer aus und beendet das Programm</translation>
+    </message>
     <message>
         <source>Prune cannot be configured with a negative value.</source>
         <translation>Kürzungsmodus kann nicht mit einem negativen Wert konfiguriert werden.</translation>
@@ -3135,6 +3199,10 @@
         <source>Use UPnP to map the listening port (default: %u)</source>
         <translation>UPnP verwenden, um eine Portweiterleitung einzurichten (Standard: %u)</translation>
     </message>
+    <message>
+        <source>User Agent comment (%s) contains unsafe characters.</source>
+        <translation>Der User Agent Kommentar  (%s) enthält unsichere Zeichen.</translation>
+    </message>
     <message>
         <source>Verifying blocks...</source>
         <translation>Verifiziere Blöcke...</translation>
@@ -3151,10 +3219,6 @@
         <source>Wallet options:</source>
         <translation>Wallet-Optionen:</translation>
     </message>
-    <message>
-        <source>Warning: This version is obsolete; upgrade required!</source>
-        <translation>Warnung: Diese Version is veraltet, Aktualisierung erforderlich!</translation>
-    </message>
     <message>
         <source>You need to rebuild the database using -reindex to change -txindex</source>
         <translation>Sie müssen die Datenbank mit Hilfe von -reindex neu aufbauen, um -txindex zu verändern</translation>
@@ -3191,6 +3255,10 @@
         <source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source>
         <translation>Befehl ausführen wenn ein relevanter Alarm empfangen wird oder wir einen wirklich langen Fork entdecken (%s im Befehl wird durch die Nachricht ersetzt)</translation>
     </message>
+    <message>
+        <source>Fees (in %s/kB) smaller than this are considered zero fee for relaying, mining and transaction creation (default: %s)</source>
+        <translation>Niedrigere Gebühren (in %s/Kb) als diese werden bei der Transaktionserstellung als gebührenfrei angesehen (Standard: %s)</translation>
+    </message>
     <message>
         <source>If paytxfee is not set, include enough fee so transactions begin confirmation on average within n blocks (default: %u)</source>
         <translation>Wenn -paytxfee nicht festgelegt wurde Gebühren einschließen, so dass mit der Bestätigung von Transaktionen im Schnitt innerhalb von n Blöcken begonnen wird (Standard: %u)</translation>
@@ -3331,6 +3399,10 @@
         <source>Receive and display P2P network alerts (default: %u)</source>
         <translation>P2P-Netzwerk-Alarme empfangen und anzeigen (Standard: %u)</translation>
     </message>
+    <message>
+        <source>Reducing -maxconnections from %d to %d, because of system limitations.</source>
+        <translation>Reduziere -maxconnections von %d zu %d, aufgrund von Systemlimitierungen.</translation>
+    </message>
     <message>
         <source>Rescan the block chain for missing wallet transactions on startup</source>
         <translation>Blockkette beim Starten erneut nach fehlenden Wallet-Transaktionen durchsuchen</translation>
@@ -3407,6 +3479,10 @@
         <source>Warning</source>
         <translation>Warnung</translation>
     </message>
+    <message>
+        <source>Warning: unknown new rules activated (versionbit %i)</source>
+        <translation>Warnung: Unbekannte neue Regeln aktiviert (Versionsbit %i)</translation>
+    </message>
     <message>
         <source>Whether to operate in a blocks only mode (default: %u)</source>
         <translation>Legt fest ob nur Blöcke Modus aktiv sein soll (Standard: %u)</translation>
@@ -3467,6 +3543,10 @@
         <source>Error reading wallet.dat! All keys read correctly, but transaction data or address book entries might be missing or incorrect.</source>
         <translation>Lesen von wallet.dat fehlgeschlagen! Alle Schlüssel wurden korrekt gelesen, Transaktionsdaten bzw. Adressbucheinträge fehlen aber möglicherweise oder sind inkorrekt.</translation>
     </message>
+    <message>
+        <source>Fees (in %s/kB) smaller than this are considered zero fee for transaction creation (default: %s)</source>
+        <translation>Niedrigere Gebühren (in %s/Kb) als diese werden bei der Transaktionserstellung als gebührenfrei angesehen (Standard: %s)</translation>
+    </message>
     <message>
         <source>How thorough the block verification of -checkblocks is (0-4, default: %u)</source>
         <translation>Legt fest, wie gründlich die Blockverifikation von -checkblocks ist (0-4, Standard: %u)</translation>
@@ -3483,6 +3563,10 @@
         <source>Output debugging information (default: %u, supplying &lt;category&gt; is optional)</source>
         <translation>Debugginginformationen ausgeben (Standard: %u, &lt;category&gt; anzugeben ist optional)</translation>
     </message>
+    <message>
+        <source>Total length of network version string (%i) exceeds maximum length (%i). Reduce the number or size of uacomments.</source>
+        <translation>Gesamtlänge des Netzwerkversionstrings (%i) erreicht die maximale Länge (%i). Reduzieren Sie die Nummer oder die Größe von uacomments.</translation>
+    </message>
     <message>
         <source>Tries to keep outbound traffic under the given target (in MiB per 24h), 0 = no limit (default: %d)</source>
         <translation>Versucht ausgehenden Datenverkehr unter dem gegebenen Wert zu halten (in MiB pro 24h), 0 = kein Limit (default: %d)</translation>
@@ -3495,6 +3579,10 @@
         <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: %s)</source>
         <translation>Separaten SOCKS5-Proxy verwenden, um Gegenstellen über versteckte Tor-Dienste zu erreichen (Standard: %s)</translation>
     </message>
+    <message>
+        <source>Username and hashed password for JSON-RPC connections. The field &lt;userpw&gt; comes in the format: &lt;USERNAME&gt;:&lt;SALT&gt;$&lt;HASH&gt;. A canonical python script is included in share/rpcuser. This option can be specified multiple times</source>
+        <translation>Benutzername und gehashtes Passwort für JSON-RPC Verbindungen. Das Feld &lt;userpw&gt; kommt im Format: &lt;USERNAME&gt;:&lt;SALT&gt;$&lt;HASH&gt;. Ein kanonisches Pythonskript ist in share/rpcuser inbegriffen. Diese Option kann mehrere Male spezifiziert werden</translation>
+    </message>
     <message>
         <source>(default: %s)</source>
         <translation>(Standard: %s)</translation>
diff --git a/src/qt/locale/bitcoin_el_GR.ts b/src/qt/locale/bitcoin_el_GR.ts
index 90c27c43943ac..b5fb22f9739bf 100644
--- a/src/qt/locale/bitcoin_el_GR.ts
+++ b/src/qt/locale/bitcoin_el_GR.ts
@@ -168,6 +168,11 @@
         <source>Are you sure you wish to encrypt your wallet?</source>
         <translation>Είστε σίγουροι ότι θέλετε να κρυπτογραφήσετε το πορτοφόλι σας;</translation>
     </message>
+    <message>
+        <source>Bitcoin Core will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source>
+        <translation>Το Bitcoin Core θα κλεισει τώρα για να τελειώσει την διαδικασία κρυπτογράφησης. Θυμήσου ότι κρυπτογραφώντας το πορτοφόλι σου δεν μπορείς να προστατέψεις πλήρως τα bitcoins σου από κλοπή στην περίπτωση που μολυνθεί ο υπολογιστής σου με κακόβουλο λογισμικό.
+</translation>
+    </message>
     <message>
         <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source>
         <translation>ΣΗΜΑΝΤΙΚΟ: Τα προηγούμενα αντίγραφα ασφαλείας που έχετε κάνει από το αρχείο του πορτοφόλιου σας θα πρέπει να αντικατασταθουν με το νέο που δημιουργείται, κρυπτογραφημένο αρχείο πορτοφόλιου. Για λόγους ασφαλείας, τα προηγούμενα αντίγραφα ασφαλείας του μη κρυπτογραφημένου αρχείου πορτοφόλιου θα καταστουν άχρηστα μόλις αρχίσετε να χρησιμοποιείτε το νέο κρυπτογραφημένο πορτοφόλι. </translation>
@@ -184,6 +189,10 @@
         <source>Enter the new passphrase to the wallet.&lt;br/&gt;Please use a passphrase of &lt;b&gt;ten or more random characters&lt;/b&gt;, or &lt;b&gt;eight or more words&lt;/b&gt;.</source>
         <translation>Εισάγετε τον νέο κωδικό πρόσβασης στον πορτοφόλι &lt;br/&gt; Παρακαλώ χρησιμοποιείστε ένα κωδικό με &lt;b&gt; 10 ή περισσότερους τυχαίους χαρακτήρες&lt;/b&gt; ή &lt;b&gt; οχτώ ή παραπάνω λέξεις&lt;/b&gt;.</translation>
     </message>
+    <message>
+        <source>Enter the old passphrase and new passphrase to the wallet.</source>
+        <translation>Πληκτρολόγησε τον παλιό και τον νέο κωδικό στο πορτοφολι.</translation>
+    </message>
     <message>
         <source>Wallet encryption failed</source>
         <translation>Η κρυπτογραφηση του πορτοφολιού απέτυχε</translation>
@@ -1324,10 +1333,6 @@
         <source>General</source>
         <translation>Γενικά</translation>
     </message>
-    <message>
-        <source>Using OpenSSL version</source>
-        <translation>Χρησιμοποιηση της OpenSSL εκδοσης</translation>
-    </message>
     <message>
         <source>Using BerkeleyDB version</source>
         <translation>Χρήση BerkeleyDB έκδοσης</translation>
diff --git a/src/qt/locale/bitcoin_en.ts b/src/qt/locale/bitcoin_en.ts
index b90221f2c2535..f122273a35216 100644
--- a/src/qt/locale/bitcoin_en.ts
+++ b/src/qt/locale/bitcoin_en.ts
@@ -34,12 +34,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../addressbookpage.cpp" line="+80"/>
-        <source>&amp;Copy Address</source>
-        <translation>&amp;Copy Address</translation>
-    </message>
-    <message>
-        <location filename="../forms/addressbookpage.ui" line="-53"/>
+        <location line="-53"/>
         <source>Delete the currently selected address from the list</source>
         <translation>Delete the currently selected address from the list</translation>
     </message>
@@ -58,89 +53,6 @@
         <source>&amp;Delete</source>
         <translation>&amp;Delete</translation>
     </message>
-    <message>
-        <location filename="../addressbookpage.cpp" line="-30"/>
-        <source>Choose the address to send coins to</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Choose the address to receive coins with</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>C&amp;hoose</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Sending addresses</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Receiving addresses</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source>
-        <translation>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <source>Copy &amp;Label</source>
-        <translation>Copy &amp;Label</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>&amp;Edit</source>
-        <translation>&amp;Edit</translation>
-    </message>
-    <message>
-        <location line="+193"/>
-        <source>Export Address List</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Comma separated file (*.csv)</source>
-        <translation>Comma separated file (*.csv)</translation>
-    </message>
-    <message>
-        <location line="+13"/>
-        <source>Exporting Failed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>There was an error trying to save the address list to %1. Please try again.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>AddressTableModel</name>
-    <message>
-        <location filename="../addresstablemodel.cpp" line="+170"/>
-        <source>Label</source>
-        <translation>Label</translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Address</source>
-        <translation>Address</translation>
-    </message>
-    <message>
-        <location line="+36"/>
-        <source>(no label)</source>
-        <translation>(no label)</translation>
-    </message>
 </context>
 <context>
     <name>AskPassphraseDialog</name>
@@ -164,124 +76,6 @@
         <source>Repeat new passphrase</source>
         <translation>Repeat new passphrase</translation>
     </message>
-    <message>
-        <location filename="../askpassphrasedialog.cpp" line="+49"/>
-        <source>Encrypt wallet</source>
-        <translation>Encrypt wallet</translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>This operation needs your wallet passphrase to unlock the wallet.</source>
-        <translation>This operation needs your wallet passphrase to unlock the wallet.</translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Unlock wallet</source>
-        <translation>Unlock wallet</translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>This operation needs your wallet passphrase to decrypt the wallet.</source>
-        <translation>This operation needs your wallet passphrase to decrypt the wallet.</translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Decrypt wallet</source>
-        <translation>Decrypt wallet</translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Change passphrase</source>
-        <translation>Change passphrase</translation>
-    </message>
-    <message>
-        <location line="+45"/>
-        <source>Confirm wallet encryption</source>
-        <translation>Confirm wallet encryption</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Warning: If you encrypt your wallet and lose your passphrase, you will &lt;b&gt;LOSE ALL OF YOUR BITCOINS&lt;/b&gt;!</source>
-        <translation>Warning: If you encrypt your wallet and lose your passphrase, you will &lt;b&gt;LOSE ALL OF YOUR BITCOINS&lt;/b&gt;!</translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Are you sure you wish to encrypt your wallet?</source>
-        <translation>Are you sure you wish to encrypt your wallet?</translation>
-    </message>
-    <message>
-        <location line="+15"/>
-        <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source>
-        <translation>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</translation>
-    </message>
-    <message>
-        <location line="+100"/>
-        <location line="+24"/>
-        <source>Warning: The Caps Lock key is on!</source>
-        <translation>Warning: The Caps Lock key is on!</translation>
-    </message>
-    <message>
-        <location line="-130"/>
-        <location line="+58"/>
-        <source>Wallet encrypted</source>
-        <translation>Wallet encrypted</translation>
-    </message>
-    <message>
-        <location line="-135"/>
-        <source>Enter the new passphrase to the wallet.&lt;br/&gt;Please use a passphrase of &lt;b&gt;ten or more random characters&lt;/b&gt;, or &lt;b&gt;eight or more words&lt;/b&gt;.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+23"/>
-        <source>Enter the old passphrase and new passphrase to the wallet.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+56"/>
-        <source>%1 will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+13"/>
-        <location line="+7"/>
-        <location line="+42"/>
-        <location line="+6"/>
-        <source>Wallet encryption failed</source>
-        <translation>Wallet encryption failed</translation>
-    </message>
-    <message>
-        <location line="-54"/>
-        <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
-        <translation>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <location line="+48"/>
-        <source>The supplied passphrases do not match.</source>
-        <translation>The supplied passphrases do not match.</translation>
-    </message>
-    <message>
-        <location line="-37"/>
-        <source>Wallet unlock failed</source>
-        <translation>Wallet unlock failed</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <location line="+11"/>
-        <location line="+19"/>
-        <source>The passphrase entered for the wallet decryption was incorrect.</source>
-        <translation>The passphrase entered for the wallet decryption was incorrect.</translation>
-    </message>
-    <message>
-        <location line="-20"/>
-        <source>Wallet decryption failed</source>
-        <translation>Wallet decryption failed</translation>
-    </message>
-    <message>
-        <location line="+14"/>
-        <source>Wallet passphrase was successfully changed.</source>
-        <translation>Wallet passphrase was successfully changed.</translation>
-    </message>
 </context>
 <context>
     <name>BanTableModel</name>
@@ -795,396 +589,173 @@
         <source>Priority</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>EditAddressDialog</name>
     <message>
-        <location filename="../coincontroldialog.cpp" line="+47"/>
-        <source>Copy address</source>
-        <translation type="unfinished">Copy address</translation>
+        <location filename="../forms/editaddressdialog.ui" line="+14"/>
+        <source>Edit Address</source>
+        <translation>Edit Address</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Copy label</source>
-        <translation type="unfinished">Copy label</translation>
+        <location line="+11"/>
+        <source>&amp;Label</source>
+        <translation>&amp;Label</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <location line="+26"/>
-        <source>Copy amount</source>
-        <translation type="unfinished">Copy amount</translation>
+        <location line="+10"/>
+        <source>The label associated with this address list entry</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-25"/>
-        <source>Copy transaction ID</source>
-        <translation type="unfinished">Copy transaction ID</translation>
+        <location line="+17"/>
+        <source>The address associated with this address list entry. This can only be modified for sending addresses.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Lock unspent</source>
-        <translation type="unfinished"></translation>
+        <location line="-10"/>
+        <source>&amp;Address</source>
+        <translation>&amp;Address</translation>
     </message>
+</context>
+<context>
+    <name>FreespaceChecker</name>
     <message>
-        <location line="+1"/>
-        <source>Unlock unspent</source>
-        <translation type="unfinished"></translation>
+        <location filename="../intro.cpp" line="+78"/>
+        <source>A new data directory will be created.</source>
+        <translation>A new data directory will be created.</translation>
     </message>
     <message>
         <location line="+22"/>
-        <source>Copy quantity</source>
-        <translation type="unfinished"></translation>
+        <source>name</source>
+        <translation>name</translation>
     </message>
     <message>
         <location line="+2"/>
-        <source>Copy fee</source>
-        <translation type="unfinished"></translation>
+        <source>Directory already exists. Add %1 if you intend to create a new directory here.</source>
+        <translation>Directory already exists. Add %1 if you intend to create a new directory here.</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Copy after fee</source>
-        <translation type="unfinished"></translation>
+        <location line="+3"/>
+        <source>Path already exists, and is not a directory.</source>
+        <translation>Path already exists, and is not a directory.</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Copy bytes</source>
-        <translation type="unfinished"></translation>
+        <location line="+7"/>
+        <source>Cannot create data directory here.</source>
+        <translation>Cannot create data directory here.</translation>
     </message>
+</context>
+<context>
+    <name>HelpMessageDialog</name>
     <message>
-        <location line="+1"/>
-        <source>Copy priority</source>
-        <translation type="unfinished"></translation>
+        <location filename="../utilitydialog.cpp" line="+40"/>
+        <source>version</source>
+        <translation type="unfinished">version</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Copy dust</source>
+        <location line="+5"/>
+        <location line="+2"/>
+        <source>(%1-bit)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Copy change</source>
+        <location line="+5"/>
+        <source>About %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+349"/>
-        <source>highest</source>
+        <location line="+19"/>
+        <source>Command-line options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>higher</source>
-        <translation type="unfinished"></translation>
+        <source>Usage:</source>
+        <translation type="unfinished">Usage:</translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>high</source>
-        <translation type="unfinished"></translation>
+        <source>command-line options</source>
+        <translation type="unfinished">command-line options</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>medium-high</source>
+        <location line="+9"/>
+        <source>UI Options:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>medium</source>
+        <location line="+4"/>
+        <source>Choose data directory on startup (default: %u)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>low-medium</source>
+        <source>Set language, for example &quot;de_DE&quot; (default: system locale)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>low</source>
+        <source>Start minimized</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>lower</source>
+        <source>Set SSL root certificates for payment request (default: -system-)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>lowest</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>(%1 locked)</source>
+        <source>Show splash screen on startup (default: %u)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
-        <source>none</source>
+        <location line="+1"/>
+        <source>Reset all settings changed in the GUI</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>Intro</name>
     <message>
-        <location line="+161"/>
-        <source>This label turns red if the transaction size is greater than 1000 bytes.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../forms/intro.ui" line="+14"/>
+        <source>Welcome</source>
+        <translation>Welcome</translation>
     </message>
     <message>
-        <location line="+5"/>
-        <source>This label turns red if the priority is smaller than &quot;medium&quot;.</source>
+        <location line="+9"/>
+        <source>Welcome to %1.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+12"/>
-        <source>Can vary +/- %1 satoshi(s) per input.</source>
+        <location line="+26"/>
+        <source>As this is the first time the program is launched, you can choose where %1 will store its data.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-33"/>
-        <source>yes</source>
+        <location line="+10"/>
+        <source>%1 will download and store a copy of the Bitcoin block chain. At least %2GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+0"/>
-        <source>no</source>
-        <translation type="unfinished"></translation>
+        <location line="+10"/>
+        <source>Use the default data directory</source>
+        <translation>Use the default data directory</translation>
     </message>
     <message>
-        <location line="+17"/>
-        <location line="+5"/>
-        <source>This means a fee of at least %1 per kB is required.</source>
-        <translation type="unfinished"></translation>
+        <location line="+7"/>
+        <source>Use a custom data directory:</source>
+        <translation>Use a custom data directory:</translation>
     </message>
     <message>
-        <location line="-4"/>
-        <source>Can vary +/- 1 byte per input.</source>
+        <location filename="../intro.cpp" line="+89"/>
+        <source>Error: Specified data directory &quot;%1&quot; cannot be created.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Transactions with higher priority are more likely to get included into a block.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>This label turns red if any recipient receives an amount smaller than the current dust threshold.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+55"/>
-        <location line="+60"/>
-        <source>(no label)</source>
-        <translation type="unfinished">(no label)</translation>
-    </message>
-    <message>
-        <location line="-7"/>
-        <source>change from %1 (%2)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>(change)</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>EditAddressDialog</name>
-    <message>
-        <location filename="../forms/editaddressdialog.ui" line="+14"/>
-        <source>Edit Address</source>
-        <translation>Edit Address</translation>
-    </message>
-    <message>
-        <location line="+11"/>
-        <source>&amp;Label</source>
-        <translation>&amp;Label</translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>The label associated with this address list entry</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+17"/>
-        <source>The address associated with this address list entry. This can only be modified for sending addresses.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-10"/>
-        <source>&amp;Address</source>
-        <translation>&amp;Address</translation>
-    </message>
-    <message>
-        <location filename="../editaddressdialog.cpp" line="+28"/>
-        <source>New receiving address</source>
-        <translation>New receiving address</translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>New sending address</source>
-        <translation>New sending address</translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Edit receiving address</source>
-        <translation>Edit receiving address</translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Edit sending address</source>
-        <translation>Edit sending address</translation>
-    </message>
-    <message>
-        <location line="+76"/>
-        <source>The entered address &quot;%1&quot; is already in the address book.</source>
-        <translation>The entered address &quot;%1&quot; is already in the address book.</translation>
-    </message>
-    <message>
-        <location line="-5"/>
-        <source>The entered address &quot;%1&quot; is not a valid Bitcoin address.</source>
-        <translation>The entered address &quot;%1&quot; is not a valid Bitcoin address.</translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>Could not unlock wallet.</source>
-        <translation>Could not unlock wallet.</translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>New key generation failed.</source>
-        <translation>New key generation failed.</translation>
-    </message>
-</context>
-<context>
-    <name>FreespaceChecker</name>
-    <message>
-        <location filename="../intro.cpp" line="+78"/>
-        <source>A new data directory will be created.</source>
-        <translation>A new data directory will be created.</translation>
-    </message>
-    <message>
-        <location line="+22"/>
-        <source>name</source>
-        <translation>name</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Directory already exists. Add %1 if you intend to create a new directory here.</source>
-        <translation>Directory already exists. Add %1 if you intend to create a new directory here.</translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Path already exists, and is not a directory.</source>
-        <translation>Path already exists, and is not a directory.</translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <source>Cannot create data directory here.</source>
-        <translation>Cannot create data directory here.</translation>
-    </message>
-</context>
-<context>
-    <name>HelpMessageDialog</name>
-    <message>
-        <location filename="../utilitydialog.cpp" line="+40"/>
-        <source>version</source>
-        <translation type="unfinished">version</translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <location line="+2"/>
-        <source>(%1-bit)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>About %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+19"/>
-        <source>Command-line options</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Usage:</source>
-        <translation type="unfinished">Usage:</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>command-line options</source>
-        <translation type="unfinished">command-line options</translation>
-    </message>
-    <message>
-        <location line="+9"/>
-        <source>UI Options:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Choose data directory on startup (default: %u)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Set language, for example &quot;de_DE&quot; (default: system locale)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Start minimized</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Set SSL root certificates for payment request (default: -system-)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Show splash screen on startup (default: %u)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Reset all settings changed in the GUI</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Intro</name>
-    <message>
-        <location filename="../forms/intro.ui" line="+14"/>
-        <source>Welcome</source>
-        <translation>Welcome</translation>
-    </message>
-    <message>
-        <location line="+9"/>
-        <source>Welcome to %1.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+26"/>
-        <source>As this is the first time the program is launched, you can choose where %1 will store its data.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>%1 will download and store a copy of the Bitcoin block chain. At least %2GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>Use the default data directory</source>
-        <translation>Use the default data directory</translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <source>Use a custom data directory:</source>
-        <translation>Use a custom data directory:</translation>
-    </message>
-    <message>
-        <location filename="../intro.cpp" line="+89"/>
-        <source>Error: Specified data directory &quot;%1&quot; cannot be created.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+24"/>
-        <source>Error</source>
-        <translation>Error</translation>
+        <location line="+24"/>
+        <source>Error</source>
+        <translation>Error</translation>
     </message>
     <message numerus="yes">
         <location line="+9"/>
@@ -1225,11 +796,6 @@
         <source>Select payment request file</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../openuridialog.cpp" line="+47"/>
-        <source>Select payment request file to open</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>OptionsDialog</name>
@@ -1627,218 +1193,69 @@
     </message>
 </context>
 <context>
-    <name>PaymentServer</name>
+    <name>PeerTableModel</name>
     <message>
-        <location filename="../paymentserver.cpp" line="+432"/>
-        <location line="+14"/>
-        <location line="+7"/>
-        <source>URI handling</source>
-        <translation type="unfinished">URI handling</translation>
+        <location filename="../peertablemodel.cpp" line="+117"/>
+        <source>User Agent</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-7"/>
-        <source>Invalid payment address %1</source>
+        <location line="+0"/>
+        <source>Node/Service</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+83"/>
-        <location line="+9"/>
-        <location line="+31"/>
-        <location line="+10"/>
-        <location line="+17"/>
-        <location line="+88"/>
-        <source>Payment request rejected</source>
+        <location line="+0"/>
+        <source>Ping Time</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>QObject</name>
     <message>
-        <location line="-155"/>
-        <source>Payment request network doesn&apos;t match client network.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../bitcoinunits.cpp" line="+176"/>
+        <source>Amount</source>
+        <translation type="unfinished">Amount</translation>
     </message>
     <message>
-        <location line="+15"/>
-        <source>Payment request is not initialized.</source>
+        <location filename="../guiutil.cpp" line="+118"/>
+        <source>Enter a Bitcoin address (e.g. %1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+42"/>
-        <source>Requested payment amount of %1 is too small (considered dust).</source>
+        <location line="+763"/>
+        <source>%1 d</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-258"/>
-        <location line="+216"/>
-        <location line="+42"/>
-        <location line="+113"/>
-        <location line="+14"/>
-        <location line="+18"/>
-        <source>Payment request error</source>
+        <location line="+2"/>
+        <source>%1 h</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-402"/>
-        <source>Cannot start bitcoin: click-to-pay handler</source>
+        <location line="+2"/>
+        <source>%1 m</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+104"/>
-        <source>Payment request fetch URL is invalid: %1</source>
+        <location line="+2"/>
+        <location line="+44"/>
+        <source>%1 s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+21"/>
-        <source>URI cannot be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source>
+        <location line="-10"/>
+        <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+13"/>
-        <source>Payment request file handling</source>
-        <translation type="unfinished"></translation>
+        <location line="+5"/>
+        <source>N/A</source>
+        <translation type="unfinished">N/A</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Payment request file cannot be read! This can be caused by an invalid payment request file.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+70"/>
-        <source>Payment request expired.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+32"/>
-        <source>Unverified payment requests to custom payment scripts are unsupported.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+9"/>
-        <location line="+17"/>
-        <source>Invalid payment request.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+45"/>
-        <source>Refund from %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+44"/>
-        <source>Payment request %1 is too large (%2 bytes, allowed %3 bytes).</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+9"/>
-        <source>Error communicating with %1: %2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
-        <source>Payment request cannot be parsed!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+13"/>
-        <source>Bad response from server %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+33"/>
-        <source>Payment acknowledged</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-11"/>
-        <source>Network request error</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PeerTableModel</name>
-    <message>
-        <location filename="../peertablemodel.cpp" line="+117"/>
-        <source>User Agent</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Node/Service</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Ping Time</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>QObject</name>
-    <message>
-        <location filename="../bitcoinunits.cpp" line="+176"/>
-        <source>Amount</source>
-        <translation type="unfinished">Amount</translation>
-    </message>
-    <message>
-        <location filename="../guiutil.cpp" line="+118"/>
-        <source>Enter a Bitcoin address (e.g. %1)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+763"/>
-        <source>%1 d</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>%1 h</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>%1 m</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <location line="+44"/>
-        <source>%1 s</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-10"/>
-        <source>None</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>N/A</source>
-        <translation type="unfinished">N/A</translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>%1 ms</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>QRImageWidget</name>
-    <message>
-        <location filename="../receiverequestdialog.cpp" line="+36"/>
-        <source>&amp;Save Image...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>&amp;Copy Image</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+32"/>
-        <source>Save QR Code</source>
-        <translation type="unfinished">Save QR Code</translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>PNG Image (*.png)</source>
+        <location line="+0"/>
+        <source>%1 ms</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -2338,21 +1755,6 @@
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../receivecoinsdialog.cpp" line="+46"/>
-        <source>Copy label</source>
-        <translation type="unfinished">Copy label</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Copy message</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Copy amount</source>
-        <translation type="unfinished">Copy amount</translation>
-    </message>
 </context>
 <context>
     <name>ReceiveRequestDialog</name>
@@ -2376,95 +1778,11 @@
         <source>&amp;Save Image...</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../receiverequestdialog.cpp" line="+65"/>
-        <source>Request payment to %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Payment information</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>URI</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Address</source>
-        <translation type="unfinished">Address</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Amount</source>
-        <translation type="unfinished">Amount</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Label</source>
-        <translation type="unfinished">Label</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Message</source>
-        <translation type="unfinished">Message</translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>Resulting URI too long, try to reduce the text for label / message.</source>
-        <translation type="unfinished">Resulting URI too long, try to reduce the text for label / message.</translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Error encoding URI into QR Code.</source>
-        <translation type="unfinished">Error encoding URI into QR Code.</translation>
-    </message>
-</context>
-<context>
-    <name>RecentRequestsTableModel</name>
-    <message>
-        <location filename="../recentrequeststablemodel.cpp" line="+29"/>
-        <source>Date</source>
-        <translation type="unfinished">Date</translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Label</source>
-        <translation type="unfinished">Label</translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Message</source>
-        <translation type="unfinished">Message</translation>
-    </message>
-    <message>
-        <location line="+57"/>
-        <source>(no amount requested)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+42"/>
-        <source>Requested</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-59"/>
-        <source>(no label)</source>
-        <translation type="unfinished">(no label)</translation>
-    </message>
-    <message>
-        <location line="+9"/>
-        <source>(no message)</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>SendCoinsDialog</name>
     <message>
         <location filename="../forms/sendcoinsdialog.ui" line="+14"/>
-        <location filename="../sendcoinsdialog.cpp" line="+543"/>
         <source>Send Coins</source>
         <translation>Send Coins</translation>
     </message>
@@ -2650,190 +1968,39 @@
         <source>S&amp;end</source>
         <translation>S&amp;end</translation>
     </message>
+</context>
+<context>
+    <name>SendCoinsEntry</name>
     <message>
-        <location filename="../sendcoinsdialog.cpp" line="-226"/>
-        <source>Confirm send coins</source>
-        <translation>Confirm send coins</translation>
-    </message>
-    <message>
-        <location line="-49"/>
-        <location line="+5"/>
-        <location line="+5"/>
-        <location line="+4"/>
-        <source>%1 to %2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-215"/>
-        <source>Copy quantity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Copy amount</source>
-        <translation type="unfinished">Copy amount</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Copy fee</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Copy after fee</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Copy bytes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Copy priority</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Copy change</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+238"/>
-        <source>Total Amount %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>or</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+196"/>
-        <source>The amount to pay must be larger than 0.</source>
-        <translation>The amount to pay must be larger than 0.</translation>
+        <location filename="../forms/sendcoinsentry.ui" line="+155"/>
+        <location line="+539"/>
+        <location line="+533"/>
+        <source>A&amp;mount:</source>
+        <translation>A&amp;mount:</translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>The amount exceeds your balance.</source>
-        <translation>The amount exceeds your balance.</translation>
+        <location line="-1185"/>
+        <source>Pay &amp;To:</source>
+        <translation>Pay &amp;To:</translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>The total exceeds your balance when the %1 transaction fee is included.</source>
-        <translation>The total exceeds your balance when the %1 transaction fee is included.</translation>
+        <location line="+93"/>
+        <source>&amp;Label:</source>
+        <translation>&amp;Label:</translation>
     </message>
     <message>
-        <location line="+6"/>
-        <source>Transaction creation failed!</source>
+        <location line="-68"/>
+        <source>Choose previously used address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
-        <source>The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source>
+        <location line="-46"/>
+        <source>This is a normal payment.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
-        <source>A fee higher than %1 is considered an absurdly high fee.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Payment request expired.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+89"/>
-        <source>Pay only the required fee of %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message numerus="yes">
-        <location line="+25"/>
-        <source>Estimated to begin confirmation within %n block(s).</source>
-        <translation type="unfinished">
-            <numerusform>Estimated to begin confirmation within %n block.</numerusform>
-            <numerusform>Estimated to begin confirmation within %n blocks.</numerusform>
-        </translation>
-    </message>
-    <message>
-        <location line="-140"/>
-        <source>The recipient address is not valid. Please recheck.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+12"/>
-        <source>Duplicate address found: addresses should only be used once each.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+234"/>
-        <source>Warning: Invalid Bitcoin address</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+19"/>
-        <source>(no label)</source>
-        <translation type="unfinished">(no label)</translation>
-    </message>
-    <message>
-        <location line="-11"/>
-        <source>Warning: Unknown change address</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-689"/>
-        <source>Copy dust</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+215"/>
-        <source>Are you sure you want to send?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+9"/>
-        <source>added as transaction fee</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>SendCoinsEntry</name>
-    <message>
-        <location filename="../forms/sendcoinsentry.ui" line="+155"/>
-        <location line="+539"/>
-        <location line="+533"/>
-        <source>A&amp;mount:</source>
-        <translation>A&amp;mount:</translation>
-    </message>
-    <message>
-        <location line="-1185"/>
-        <source>Pay &amp;To:</source>
-        <translation>Pay &amp;To:</translation>
-    </message>
-    <message>
-        <location filename="../sendcoinsentry.cpp" line="+37"/>
-        <source>Enter a label for this address to add it to your address book</source>
-        <translation>Enter a label for this address to add it to your address book</translation>
-    </message>
-    <message>
-        <location filename="../forms/sendcoinsentry.ui" line="+93"/>
-        <source>&amp;Label:</source>
-        <translation>&amp;Label:</translation>
-    </message>
-    <message>
-        <location line="-68"/>
-        <source>Choose previously used address</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-46"/>
-        <source>This is a normal payment.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+39"/>
-        <source>The Bitcoin address to send the payment to</source>
+        <location line="+39"/>
+        <source>The Bitcoin address to send the payment to</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -2842,950 +2009,230 @@
         <translation>Alt+A</translation>
     </message>
     <message>
-        <location line="+7"/>
-        <source>Paste address from clipboard</source>
-        <translation>Paste address from clipboard</translation>
-    </message>
-    <message>
-        <location line="+16"/>
-        <source>Alt+P</source>
-        <translation>Alt+P</translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <location line="+548"/>
-        <location line="+533"/>
-        <source>Remove this entry</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-1021"/>
-        <source>The fee will be deducted from the amount being sent. The recipient will receive less bitcoins than you enter in the amount field. If multiple recipients are selected, the fee is split equally.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>S&amp;ubtract fee from amount</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+9"/>
-        <source>Message:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+443"/>
-        <source>This is an unauthenticated payment request.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+529"/>
-        <source>This is an authenticated payment request.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-1009"/>
-        <source>Enter a label for this address to add it to the list of used addresses</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+47"/>
-        <source>A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+448"/>
-        <location line="+529"/>
-        <source>Pay To:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-495"/>
-        <location line="+533"/>
-        <source>Memo:</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>SendConfirmationDialog</name>
-    <message>
-        <location filename="../sendcoinsdialog.cpp" line="+571"/>
-        <location line="+5"/>
-        <source>Yes</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>ShutdownWindow</name>
-    <message>
-        <location filename="../utilitydialog.cpp" line="+78"/>
-        <source>%1 is shutting down...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Do not shut down the computer until this window disappears.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>SignVerifyMessageDialog</name>
-    <message>
-        <location filename="../forms/signverifymessagedialog.ui" line="+14"/>
-        <source>Signatures - Sign / Verify a Message</source>
-        <translation>Signatures - Sign / Verify a Message</translation>
-    </message>
-    <message>
-        <location line="+13"/>
-        <source>&amp;Sign Message</source>
-        <translation>&amp;Sign Message</translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>You can sign messages/agreements with your addresses to prove you can receive bitcoins sent to them. Be careful not to sign anything vague or random, as phishing attacks may try to trick you into signing your identity over to them. Only sign fully-detailed statements you agree to.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+18"/>
-        <source>The Bitcoin address to sign the message with</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <location line="+210"/>
-        <source>Choose previously used address</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-200"/>
-        <location line="+210"/>
-        <source>Alt+A</source>
-        <translation>Alt+A</translation>
-    </message>
-    <message>
-        <location line="-200"/>
-        <source>Paste address from clipboard</source>
-        <translation>Paste address from clipboard</translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>Alt+P</source>
-        <translation>Alt+P</translation>
-    </message>
-    <message>
-        <location line="+12"/>
-        <source>Enter the message you want to sign here</source>
-        <translation>Enter the message you want to sign here</translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <source>Signature</source>
-        <translation>Signature</translation>
-    </message>
-    <message>
-        <location line="+27"/>
-        <source>Copy the current signature to the system clipboard</source>
-        <translation>Copy the current signature to the system clipboard</translation>
-    </message>
-    <message>
-        <location line="+21"/>
-        <source>Sign the message to prove you own this Bitcoin address</source>
-        <translation>Sign the message to prove you own this Bitcoin address</translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Sign &amp;Message</source>
-        <translation>Sign &amp;Message</translation>
-    </message>
-    <message>
-        <location line="+14"/>
-        <source>Reset all sign message fields</source>
-        <translation>Reset all sign message fields</translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <location line="+143"/>
-        <source>Clear &amp;All</source>
-        <translation>Clear &amp;All</translation>
-    </message>
-    <message>
-        <location line="-84"/>
-        <source>&amp;Verify Message</source>
-        <translation>&amp;Verify Message</translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Enter the receiver&apos;s address, message (ensure you copy line breaks, spaces, tabs, etc. exactly) and signature below to verify the message. Be careful not to read more into the signature than what is in the signed message itself, to avoid being tricked by a man-in-the-middle attack. Note that this only proves the signing party receives with the address, it cannot prove sendership of any transaction!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+21"/>
-        <source>The Bitcoin address the message was signed with</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+37"/>
-        <source>Verify the message to ensure it was signed with the specified Bitcoin address</source>
-        <translation>Verify the message to ensure it was signed with the specified Bitcoin address</translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Verify &amp;Message</source>
-        <translation>Verify &amp;Message</translation>
-    </message>
-    <message>
-        <location line="+14"/>
-        <source>Reset all verify message fields</source>
-        <translation>Reset all verify message fields</translation>
-    </message>
-    <message>
-        <location filename="../signverifymessagedialog.cpp" line="+41"/>
-        <source>Click &quot;Sign Message&quot; to generate signature</source>
-        <translation>Click &quot;Sign Message&quot; to generate signature</translation>
-    </message>
-    <message>
-        <location line="+83"/>
-        <location line="+80"/>
-        <source>The entered address is invalid.</source>
-        <translation>The entered address is invalid.</translation>
-    </message>
-    <message>
-        <location line="-80"/>
-        <location line="+8"/>
-        <location line="+72"/>
-        <location line="+8"/>
-        <source>Please check the address and try again.</source>
-        <translation>Please check the address and try again.</translation>
-    </message>
-    <message>
-        <location line="-80"/>
-        <location line="+80"/>
-        <source>The entered address does not refer to a key.</source>
-        <translation>The entered address does not refer to a key.</translation>
-    </message>
-    <message>
-        <location line="-72"/>
-        <source>Wallet unlock was cancelled.</source>
-        <translation>Wallet unlock was cancelled.</translation>
-    </message>
-    <message>
-        <location line="+8"/>
-        <source>Private key for the entered address is not available.</source>
-        <translation>Private key for the entered address is not available.</translation>
-    </message>
-    <message>
-        <location line="+12"/>
-        <source>Message signing failed.</source>
-        <translation>Message signing failed.</translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Message signed.</source>
-        <translation>Message signed.</translation>
-    </message>
-    <message>
-        <location line="+58"/>
-        <source>The signature could not be decoded.</source>
-        <translation>The signature could not be decoded.</translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <location line="+13"/>
-        <source>Please check the signature and try again.</source>
-        <translation>Please check the signature and try again.</translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>The signature did not match the message digest.</source>
-        <translation>The signature did not match the message digest.</translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <source>Message verification failed.</source>
-        <translation>Message verification failed.</translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Message verified.</source>
-        <translation>Message verified.</translation>
-    </message>
-</context>
-<context>
-    <name>SplashScreen</name>
-    <message>
-        <location filename="../networkstyle.cpp" line="+19"/>
-        <source>[testnet]</source>
-        <translation>[testnet]</translation>
-    </message>
-</context>
-<context>
-    <name>TrafficGraphWidget</name>
-    <message>
-        <location filename="../trafficgraphwidget.cpp" line="+79"/>
-        <source>KB/s</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>TransactionDesc</name>
-    <message>
-        <location filename="../transactiondesc.cpp" line="+32"/>
-        <source>Open until %1</source>
-        <translation>Open until %1</translation>
-    </message>
-    <message>
-        <location line="+8"/>
-        <source>%1/offline</source>
-        <translation>%1/offline</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>0/unconfirmed, %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>in memory pool</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>not in memory pool</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>abandoned</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>%1/unconfirmed</source>
-        <translation>%1/unconfirmed</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>%1 confirmations</source>
-        <translation>%1 confirmations</translation>
-    </message>
-    <message>
-        <location line="+17"/>
-        <source>Status</source>
-        <translation>Status</translation>
-    </message>
-    <message numerus="yes">
-        <location line="+7"/>
-        <source>, broadcast through %n node(s)</source>
-        <translation>
-            <numerusform>, broadcast through %n node</numerusform>
-            <numerusform>, broadcast through %n nodes</numerusform>
-        </translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Date</source>
-        <translation>Date</translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <source>Source</source>
-        <translation>Source</translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Generated</source>
-        <translation>Generated</translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <location line="+13"/>
-        <location line="+72"/>
-        <source>From</source>
-        <translation>From</translation>
-    </message>
-    <message>
-        <location line="-71"/>
-        <location line="+20"/>
-        <location line="+69"/>
-        <source>To</source>
-        <translation>To</translation>
-    </message>
-    <message>
-        <location line="-87"/>
-        <source>own address</source>
-        <translation>own address</translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <location line="+69"/>
-        <source>watch-only</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-67"/>
-        <source>label</source>
-        <translation>label</translation>
-    </message>
-    <message>
-        <location line="+34"/>
-        <location line="+12"/>
-        <location line="+53"/>
-        <location line="+26"/>
-        <location line="+54"/>
-        <source>Credit</source>
-        <translation>Credit</translation>
-    </message>
-    <message numerus="yes">
-        <location line="-143"/>
-        <source>matures in %n more block(s)</source>
-        <translation>
-            <numerusform>matures in %n more block</numerusform>
-            <numerusform>matures in %n more blocks</numerusform>
-        </translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>not accepted</source>
-        <translation>not accepted</translation>
-    </message>
-    <message>
-        <location line="+59"/>
-        <location line="+25"/>
-        <location line="+54"/>
-        <source>Debit</source>
-        <translation>Debit</translation>
-    </message>
-    <message>
-        <location line="-69"/>
-        <source>Total debit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Total credit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Transaction fee</source>
-        <translation>Transaction fee</translation>
-    </message>
-    <message>
-        <location line="+16"/>
-        <source>Net amount</source>
-        <translation>Net amount</translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <location line="+10"/>
-        <source>Message</source>
-        <translation>Message</translation>
-    </message>
-    <message>
-        <location line="-8"/>
-        <source>Comment</source>
-        <translation>Comment</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Transaction ID</source>
-        <translation>Transaction ID</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Output index</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+18"/>
-        <source>Merchant</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <source>Generated coins must mature %1 blocks before they can be spent. When you generated this block, it was broadcast to the network to be added to the block chain. If it fails to get into the chain, its state will change to &quot;not accepted&quot; and it won&apos;t be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
-        <source>Debug information</source>
-        <translation>Debug information</translation>
-    </message>
-    <message>
-        <location line="+8"/>
-        <source>Transaction</source>
-        <translation>Transaction</translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Inputs</source>
-        <translation>Inputs</translation>
-    </message>
-    <message>
-        <location line="+21"/>
-        <source>Amount</source>
-        <translation>Amount</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <location line="+1"/>
-        <source>true</source>
-        <translation>true</translation>
-    </message>
-    <message>
-        <location line="-1"/>
-        <location line="+1"/>
-        <source>false</source>
-        <translation>false</translation>
-    </message>
-    <message>
-        <location line="-243"/>
-        <source>, has not been successfully broadcast yet</source>
-        <translation>, has not been successfully broadcast yet</translation>
-    </message>
-    <message numerus="yes">
-        <location line="-38"/>
-        <source>Open for %n more block(s)</source>
-        <translation>
-            <numerusform>Open for %n more block</numerusform>
-            <numerusform>Open for %n more blocks</numerusform>
-        </translation>
-    </message>
-    <message>
-        <location line="+8"/>
-        <source>conflicted with a transaction with %1 confirmations</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+61"/>
-        <source>unknown</source>
-        <translation>unknown</translation>
-    </message>
-</context>
-<context>
-    <name>TransactionDescDialog</name>
-    <message>
-        <location filename="../forms/transactiondescdialog.ui" line="+20"/>
-        <source>This pane shows a detailed description of the transaction</source>
-        <translation>This pane shows a detailed description of the transaction</translation>
-    </message>
-    <message>
-        <location filename="../transactiondescdialog.cpp" line="+17"/>
-        <source>Details for %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>TransactionTableModel</name>
-    <message>
-        <location filename="../transactiontablemodel.cpp" line="+246"/>
-        <source>Date</source>
-        <translation>Date</translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Type</source>
-        <translation>Type</translation>
-    </message>
-    <message>
-        <location line="+82"/>
-        <source>Immature (%1 confirmations, will be available after %2)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message numerus="yes">
-        <location line="-24"/>
-        <source>Open for %n more block(s)</source>
-        <translation>
-            <numerusform>Open for %n more block</numerusform>
-            <numerusform>Open for %n more blocks</numerusform>
-        </translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Open until %1</source>
-        <translation>Open until %1</translation>
-    </message>
-    <message>
-        <location line="+15"/>
-        <source>Confirmed (%1 confirmations)</source>
-        <translation>Confirmed (%1 confirmations)</translation>
-    </message>
-    <message>
-        <location line="+9"/>
-        <source>This block was not received by any other nodes and will probably not be accepted!</source>
-        <translation>This block was not received by any other nodes and will probably not be accepted!</translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Generated but not accepted</source>
-        <translation>Generated but not accepted</translation>
-    </message>
-    <message>
-        <location line="-24"/>
-        <source>Offline</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-64"/>
-        <source>Label</source>
-        <translation type="unfinished">Label</translation>
-    </message>
-    <message>
-        <location line="+67"/>
-        <source>Unconfirmed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Abandoned</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Confirming (%1 of %2 recommended confirmations)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Conflicted</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+48"/>
-        <source>Received with</source>
-        <translation>Received with</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Received from</source>
-        <translation>Received from</translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Sent to</source>
-        <translation>Sent to</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Payment to yourself</source>
-        <translation>Payment to yourself</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Mined</source>
-        <translation>Mined</translation>
-    </message>
-    <message>
-        <location line="+28"/>
-        <source>watch-only</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+15"/>
-        <source>(n/a)</source>
-        <translation>(n/a)</translation>
-    </message>
-    <message>
-        <location line="+213"/>
-        <source>(no label)</source>
-        <translation type="unfinished">(no label)</translation>
-    </message>
-    <message>
-        <location line="+39"/>
-        <source>Transaction status. Hover over this field to show number of confirmations.</source>
-        <translation>Transaction status. Hover over this field to show number of confirmations.</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Date and time that the transaction was received.</source>
-        <translation>Date and time that the transaction was received.</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Type of transaction.</source>
-        <translation>Type of transaction.</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Whether or not a watch-only address is involved in this transaction.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>User-defined intent/purpose of the transaction.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Amount removed from or added to balance.</source>
-        <translation>Amount removed from or added to balance.</translation>
-    </message>
-</context>
-<context>
-    <name>TransactionView</name>
-    <message>
-        <location filename="../transactionview.cpp" line="+69"/>
-        <location line="+16"/>
-        <source>All</source>
-        <translation>All</translation>
-    </message>
-    <message>
-        <location line="-15"/>
-        <source>Today</source>
-        <translation>Today</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>This week</source>
-        <translation>This week</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>This month</source>
-        <translation>This month</translation>
+        <location line="+7"/>
+        <source>Paste address from clipboard</source>
+        <translation>Paste address from clipboard</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Last month</source>
-        <translation>Last month</translation>
+        <location line="+16"/>
+        <source>Alt+P</source>
+        <translation>Alt+P</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>This year</source>
-        <translation>This year</translation>
+        <location line="+7"/>
+        <location line="+548"/>
+        <location line="+533"/>
+        <source>Remove this entry</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Range...</source>
-        <translation>Range...</translation>
+        <location line="-1021"/>
+        <source>The fee will be deducted from the amount being sent. The recipient will receive less bitcoins than you enter in the amount field. If multiple recipients are selected, the fee is split equally.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
-        <source>Received with</source>
-        <translation>Received with</translation>
+        <location line="+3"/>
+        <source>S&amp;ubtract fee from amount</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Sent to</source>
-        <translation>Sent to</translation>
+        <location line="+9"/>
+        <source>Message:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>To yourself</source>
-        <translation>To yourself</translation>
+        <location line="+443"/>
+        <source>This is an unauthenticated payment request.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Mined</source>
-        <translation>Mined</translation>
+        <location line="+529"/>
+        <source>This is an authenticated payment request.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Other</source>
-        <translation>Other</translation>
+        <location line="-1009"/>
+        <source>Enter a label for this address to add it to the list of used addresses</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
-        <source>Enter address or label to search</source>
-        <translation>Enter address or label to search</translation>
+        <location line="+47"/>
+        <source>A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
-        <source>Min amount</source>
-        <translation>Min amount</translation>
+        <location line="+448"/>
+        <location line="+529"/>
+        <source>Pay To:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+36"/>
-        <source>Abandon transaction</source>
+        <location line="-495"/>
+        <location line="+533"/>
+        <source>Memo:</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>ShutdownWindow</name>
     <message>
-        <location line="+1"/>
-        <source>Copy address</source>
-        <translation>Copy address</translation>
+        <location filename="../utilitydialog.cpp" line="+78"/>
+        <source>%1 is shutting down...</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Copy label</source>
-        <translation>Copy label</translation>
+        <source>Do not shut down the computer until this window disappears.</source>
+        <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>SignVerifyMessageDialog</name>
     <message>
-        <location line="+1"/>
-        <source>Copy amount</source>
-        <translation>Copy amount</translation>
+        <location filename="../forms/signverifymessagedialog.ui" line="+14"/>
+        <source>Signatures - Sign / Verify a Message</source>
+        <translation>Signatures - Sign / Verify a Message</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Copy transaction ID</source>
-        <translation>Copy transaction ID</translation>
+        <location line="+13"/>
+        <source>&amp;Sign Message</source>
+        <translation>&amp;Sign Message</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Copy raw transaction</source>
+        <location line="+6"/>
+        <source>You can sign messages/agreements with your addresses to prove you can receive bitcoins sent to them. Be careful not to sign anything vague or random, as phishing attacks may try to trick you into signing your identity over to them. Only sign fully-detailed statements you agree to.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Copy full transaction details</source>
+        <location line="+18"/>
+        <source>The Bitcoin address to sign the message with</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Edit label</source>
-        <translation>Edit label</translation>
+        <location line="+7"/>
+        <location line="+210"/>
+        <source>Choose previously used address</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Show transaction details</source>
-        <translation>Show transaction details</translation>
+        <location line="-200"/>
+        <location line="+210"/>
+        <source>Alt+A</source>
+        <translation>Alt+A</translation>
     </message>
     <message>
-        <location line="+186"/>
-        <source>Export Transaction History</source>
-        <translation type="unfinished"></translation>
+        <location line="-200"/>
+        <source>Paste address from clipboard</source>
+        <translation>Paste address from clipboard</translation>
     </message>
     <message>
-        <location line="+12"/>
-        <source>Watch-only</source>
-        <translation type="unfinished"></translation>
+        <location line="+10"/>
+        <source>Alt+P</source>
+        <translation>Alt+P</translation>
     </message>
     <message>
-        <location line="+9"/>
-        <source>Exporting Failed</source>
-        <translation type="unfinished"></translation>
+        <location line="+12"/>
+        <source>Enter the message you want to sign here</source>
+        <translation>Enter the message you want to sign here</translation>
     </message>
     <message>
-        <location line="+0"/>
-        <source>There was an error trying to save the transaction history to %1.</source>
-        <translation type="unfinished"></translation>
+        <location line="+7"/>
+        <source>Signature</source>
+        <translation>Signature</translation>
     </message>
     <message>
-        <location line="+4"/>
-        <source>Exporting Successful</source>
-        <translation type="unfinished"></translation>
+        <location line="+27"/>
+        <source>Copy the current signature to the system clipboard</source>
+        <translation>Copy the current signature to the system clipboard</translation>
     </message>
     <message>
-        <location line="+0"/>
-        <source>The transaction history was successfully saved to %1.</source>
-        <translation type="unfinished"></translation>
+        <location line="+21"/>
+        <source>Sign the message to prove you own this Bitcoin address</source>
+        <translation>Sign the message to prove you own this Bitcoin address</translation>
     </message>
     <message>
-        <location line="-24"/>
-        <source>Comma separated file (*.csv)</source>
-        <translation>Comma separated file (*.csv)</translation>
+        <location line="+3"/>
+        <source>Sign &amp;Message</source>
+        <translation>Sign &amp;Message</translation>
     </message>
     <message>
-        <location line="+9"/>
-        <source>Confirmed</source>
-        <translation>Confirmed</translation>
+        <location line="+14"/>
+        <source>Reset all sign message fields</source>
+        <translation>Reset all sign message fields</translation>
     </message>
     <message>
         <location line="+3"/>
-        <source>Date</source>
-        <translation>Date</translation>
+        <location line="+143"/>
+        <source>Clear &amp;All</source>
+        <translation>Clear &amp;All</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Type</source>
-        <translation>Type</translation>
+        <location line="-84"/>
+        <source>&amp;Verify Message</source>
+        <translation>&amp;Verify Message</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Label</source>
-        <translation>Label</translation>
+        <location line="+6"/>
+        <source>Enter the receiver&apos;s address, message (ensure you copy line breaks, spaces, tabs, etc. exactly) and signature below to verify the message. Be careful not to read more into the signature than what is in the signed message itself, to avoid being tricked by a man-in-the-middle attack. Note that this only proves the signing party receives with the address, it cannot prove sendership of any transaction!</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Address</source>
-        <translation>Address</translation>
+        <location line="+21"/>
+        <source>The Bitcoin address the message was signed with</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>ID</source>
-        <translation>ID</translation>
+        <location line="+37"/>
+        <source>Verify the message to ensure it was signed with the specified Bitcoin address</source>
+        <translation>Verify the message to ensure it was signed with the specified Bitcoin address</translation>
     </message>
     <message>
-        <location line="+152"/>
-        <source>Range:</source>
-        <translation>Range:</translation>
+        <location line="+3"/>
+        <source>Verify &amp;Message</source>
+        <translation>Verify &amp;Message</translation>
     </message>
     <message>
-        <location line="+8"/>
-        <source>to</source>
-        <translation>to</translation>
+        <location line="+14"/>
+        <source>Reset all verify message fields</source>
+        <translation>Reset all verify message fields</translation>
     </message>
 </context>
 <context>
-    <name>UnitDisplayStatusBarControl</name>
+    <name>SplashScreen</name>
     <message>
-        <location filename="../bitcoingui.cpp" line="+114"/>
-        <source>Unit to show amounts in. Click to select another unit.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../networkstyle.cpp" line="+19"/>
+        <source>[testnet]</source>
+        <translation>[testnet]</translation>
     </message>
 </context>
 <context>
-    <name>WalletFrame</name>
+    <name>TrafficGraphWidget</name>
     <message>
-        <location filename="../walletframe.cpp" line="+27"/>
-        <source>No wallet has been loaded.</source>
+        <location filename="../trafficgraphwidget.cpp" line="+79"/>
+        <source>KB/s</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>WalletModel</name>
+    <name>TransactionDescDialog</name>
     <message>
-        <location filename="../walletmodel.cpp" line="+288"/>
-        <source>Send Coins</source>
-        <translation>Send Coins</translation>
+        <location filename="../forms/transactiondescdialog.ui" line="+20"/>
+        <source>This pane shows a detailed description of the transaction</source>
+        <translation>This pane shows a detailed description of the transaction</translation>
     </message>
 </context>
 <context>
-    <name>WalletView</name>
-    <message>
-        <location filename="../walletview.cpp" line="+46"/>
-        <source>&amp;Export</source>
-        <translation>&amp;Export</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Export the data in the current tab to a file</source>
-        <translation>Export the data in the current tab to a file</translation>
-    </message>
-    <message>
-        <location line="+194"/>
-        <source>Backup Wallet</source>
-        <translation>Backup Wallet</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Wallet Data (*.dat)</source>
-        <translation>Wallet Data (*.dat)</translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Backup Failed</source>
-        <translation>Backup Failed</translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>There was an error trying to save the wallet data to %1.</source>
-        <translation type="unfinished"></translation>
-    </message>
+    <name>UnitDisplayStatusBarControl</name>
     <message>
-        <location line="+4"/>
-        <source>The wallet data was successfully saved to %1.</source>
+        <location filename="../bitcoingui.cpp" line="+114"/>
+        <source>Unit to show amounts in. Click to select another unit.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+0"/>
-        <source>Backup Successful</source>
-        <translation>Backup Successful</translation>
-    </message>
 </context>
 <context>
     <name>bitcoin-core</name>
     <message>
-        <location filename="../bitcoinstrings.cpp" line="+286"/>
+        <location filename="../bitcoinstrings.cpp" line="+295"/>
         <source>Options:</source>
         <translation>Options:</translation>
     </message>
@@ -3795,27 +2242,27 @@
         <translation>Specify data directory</translation>
     </message>
     <message>
-        <location line="-87"/>
+        <location line="-88"/>
         <source>Connect to a node to retrieve peer addresses, and disconnect</source>
         <translation>Connect to a node to retrieve peer addresses, and disconnect</translation>
     </message>
     <message>
-        <location line="+90"/>
+        <location line="+91"/>
         <source>Specify your own public address</source>
         <translation>Specify your own public address</translation>
     </message>
     <message>
-        <location line="-106"/>
+        <location line="-107"/>
         <source>Accept command line and JSON-RPC commands</source>
         <translation>Accept command line and JSON-RPC commands</translation>
     </message>
     <message>
-        <location line="-125"/>
+        <location line="-131"/>
         <source>If &lt;category&gt; is not supplied or if &lt;category&gt; = 1, output all debugging information.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+32"/>
         <source>Prune configured below the minimum of %d MiB.  Please use a higher number.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3835,7 +2282,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+118"/>
+        <location line="+122"/>
         <source>Error: A fatal internal error occurred, see debug.log for details</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3855,17 +2302,17 @@
         <translation>Run in the background as a daemon and accept commands</translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+30"/>
         <source>Unable to start HTTP server. See debug log for details.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-118"/>
+        <location line="-120"/>
         <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
         <translation>Accept connections from outside (default: 1 if no -proxy or -connect)</translation>
     </message>
     <message>
-        <location line="-201"/>
+        <location line="-209"/>
         <source>Bitcoin Core</source>
         <translation type="unfinished">Bitcoin Core</translation>
     </message>
@@ -3911,6 +2358,11 @@
     </message>
     <message>
         <location line="+5"/>
+        <source>Error loading %s: You can&apos;t enable HD on a already existing non-HD wallet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>Error reading %s! All keys read correctly, but transaction data or address book entries might be missing or incorrect.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3939,6 +2391,11 @@
         <source>Please check that your computer&apos;s date and time are correct! If your clock is wrong, %s will not work properly.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+3"/>
+        <source>Please contribute if you find %s useful. Visit %s for further information about the software.</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location line="+24"/>
         <source>Set the number of script verification threads (%u to %d, 0 = auto, &lt;0 = leave that many cores free, default: %d)</source>
@@ -3960,7 +2417,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+2"/>
+        <source>Use hierarchical deterministic key generation (HD) after bip32. Only has effect during wallet creation/first start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
         <source>WARNING: abnormally high number of blocks generated, %d blocks received in the last %d hours (%d expected)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4114,6 +2576,11 @@
         <source>Error loading %s: Wallet requires newer version of %s</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+1"/>
+        <source>Error loading %s: You can&apos;t disable HD on a already existing HD wallet</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location line="+1"/>
         <source>Error loading block database</source>
@@ -4240,7 +2707,12 @@
         <translation>Specify wallet file (within data directory)</translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location line="+3"/>
+        <source>The source code is available from %s.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
         <source>Unable to bind to %s on this computer. %s is probably already running.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4300,7 +2772,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-313"/>
+        <location line="-323"/>
         <source>Allow JSON-RPC connections from specified source. Valid for &lt;ip&gt; are a single IP (e.g. 1.2.3.4), a network/netmask (e.g. 1.2.3.4/255.255.255.0) or a network/CIDR (e.g. 1.2.3.4/24). This option can be specified multiple times</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4325,7 +2797,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
+        <location line="+13"/>
         <source>Error: Listening for incoming connections failed (listen returned error %s)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4355,7 +2827,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+18"/>
+        <location line="+21"/>
         <source>Query for peer addresses via DNS lookup, if low on addresses (default: 1 unless -connect)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4380,7 +2852,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+47"/>
+        <location line="+50"/>
         <source>Whitelisted peers cannot be DoS banned and their transactions are always relayed, even if they are already in the mempool, useful e.g. for a gateway</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4410,7 +2882,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+22"/>
         <source>Error reading from database, shutting down.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4490,7 +2962,7 @@
         <translation>Signing transaction failed</translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="+9"/>
         <source>The transaction amount is too small to pay the fee</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4570,27 +3042,27 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-63"/>
+        <location line="-64"/>
         <source>Password for JSON-RPC connections</source>
         <translation>Password for JSON-RPC connections</translation>
     </message>
     <message>
-        <location line="-214"/>
+        <location line="-221"/>
         <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
         <translation>Execute command when the best block changes (%s in cmd is replaced by block hash)</translation>
     </message>
     <message>
-        <location line="+143"/>
+        <location line="+149"/>
         <source>Allow DNS lookups for -addnode, -seednode and -connect</source>
         <translation>Allow DNS lookups for -addnode, -seednode and -connect</translation>
     </message>
     <message>
-        <location line="+56"/>
+        <location line="+57"/>
         <source>Loading addresses...</source>
         <translation>Loading addresses...</translation>
     </message>
     <message>
-        <location line="-258"/>
+        <location line="-267"/>
         <source>(1 = keep tx meta data e.g. account owner and payment request information, 2 = drop tx meta data)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4610,7 +3082,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+21"/>
         <source>Fees (in %s/kB) smaller than this are considered zero fee for transaction creation (default: %s)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4635,7 +3107,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+32"/>
         <source>Support filtering of blocks and transaction with bloom filters (default: %u)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4660,7 +3132,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+8"/>
         <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: %s)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4690,7 +3162,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+38"/>
         <source>How many blocks to check at startup (default: %u, 0 = all)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4785,7 +3257,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="+4"/>
         <source>Threshold for disconnecting misbehaving peers (default: %u)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4795,7 +3267,7 @@
         <translation>Unknown network specified in -onlynet: &apos;%s&apos;</translation>
     </message>
     <message>
-        <location line="-71"/>
+        <location line="-72"/>
         <source>Insufficient funds</source>
         <translation>Insufficient funds</translation>
     </message>
@@ -4805,17 +3277,17 @@
         <translation>Loading block index...</translation>
     </message>
     <message>
-        <location line="-59"/>
+        <location line="-60"/>
         <source>Add a node to connect to and attempt to keep the connection open</source>
         <translation>Add a node to connect to and attempt to keep the connection open</translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+61"/>
         <source>Loading wallet...</source>
         <translation>Loading wallet...</translation>
     </message>
     <message>
-        <location line="-53"/>
+        <location line="-54"/>
         <source>Cannot downgrade wallet</source>
         <translation>Cannot downgrade wallet</translation>
     </message>
@@ -4825,17 +3297,17 @@
         <translation>Cannot write default address</translation>
     </message>
     <message>
-        <location line="+77"/>
+        <location line="+78"/>
         <source>Rescanning...</source>
         <translation>Rescanning...</translation>
     </message>
     <message>
-        <location line="-66"/>
+        <location line="-67"/>
         <source>Done loading</source>
         <translation>Done loading</translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="+15"/>
         <source>Error</source>
         <translation>Error</translation>
     </message>
diff --git a/src/qt/locale/bitcoin_en_GB.ts b/src/qt/locale/bitcoin_en_GB.ts
index bf912d295e96f..b9c0c82814a54 100644
--- a/src/qt/locale/bitcoin_en_GB.ts
+++ b/src/qt/locale/bitcoin_en_GB.ts
@@ -908,7 +908,7 @@
     </message>
     <message>
         <source>Reset all settings changes made over the GUI</source>
-        <translation>Reset all settings changes made over the GUI</translation>
+        <translation>Reset all setting changes made via the GUI</translation>
     </message>
 </context>
 <context>
@@ -1473,10 +1473,6 @@
         <source>General</source>
         <translation>General</translation>
     </message>
-    <message>
-        <source>Using OpenSSL version</source>
-        <translation>Using OpenSSL version</translation>
-    </message>
     <message>
         <source>Using BerkeleyDB version</source>
         <translation>Using BerkeleyDB version</translation>
@@ -2979,6 +2975,18 @@
         <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
         <translation>Accept connections from outside (default: 1 if no -proxy or -connect)</translation>
     </message>
+    <message>
+        <source>-fallbackfee is set very high! This is the transaction fee you may pay when fee estimates are not available.</source>
+        <translation>-fallbackfee is set very high! This is the transaction fee you may pay when fee estimates are not available.</translation>
+    </message>
+    <message>
+        <source>A fee rate (in %s/kB) that will be used when fee estimation has insufficient data (default: %s)</source>
+        <translation>A fee rate (in %s/kB) that will be used when fee estimation has insufficient data (default: %s)</translation>
+    </message>
+    <message>
+        <source>Accept relayed transactions received from whitelisted peers even when not relaying transactions (default: %d)</source>
+        <translation>Accept relayed transactions received from whitelisted peers even when not relaying transactions (default: %d)</translation>
+    </message>
     <message>
         <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source>
         <translation>Bind to given address and always listen on it. Use [host]:port notation for IPv6</translation>
@@ -2995,6 +3003,10 @@
         <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source>
         <translation>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</translation>
     </message>
+    <message>
+        <source>Force relay of transactions from whitelisted peers even they violate local relay policy (default: %d)</source>
+        <translation>Force relay of transactions from whitelisted peers even they violate local relay policy (default: %d)</translation>
+    </message>
     <message>
         <source>Set the number of script verification threads (%u to %d, 0 = auto, &lt;0 = leave that many cores free, default: %d)</source>
         <translation>Set the number of script verification threads (%u to %d, 0 = auto, &lt;0 = leave that many cores free, default: %d)</translation>
@@ -3011,6 +3023,10 @@
         <source>Unable to bind to %s on this computer. Bitcoin Core is probably already running.</source>
         <translation>Unable to bind to %s on this computer. Bitcoin Core is probably already running.</translation>
     </message>
+    <message>
+        <source>Unsupported argument -whitelistalwaysrelay ignored, use -whitelistrelay and/or -whitelistforcerelay.</source>
+        <translation>Unsupported argument -whitelistalwaysrelay ignored, use -whitelistrelay and/or -whitelistforcerelay.</translation>
+    </message>
     <message>
         <source>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</source>
         <translation>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</translation>
@@ -3027,6 +3043,10 @@
         <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source>
         <translation>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</translation>
     </message>
+    <message>
+        <source>Warning: Unknown block versions being mined! It's possible unknown rules are in effect</source>
+        <translation>Warning: Unknown block versions being mined! It's possible unknown rules are in effect</translation>
+    </message>
     <message>
         <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source>
         <translation>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</translation>
@@ -3047,6 +3067,10 @@
         <source>&lt;category&gt; can be:</source>
         <translation>&lt;category&gt; can be:</translation>
     </message>
+    <message>
+        <source>Append comment to the user agent string</source>
+        <translation>Append comment to the user agent string</translation>
+    </message>
     <message>
         <source>Block creation options:</source>
         <translation>Block creation options:</translation>
@@ -3091,6 +3115,10 @@
         <source>Enable publish raw transaction in &lt;address&gt;</source>
         <translation>Enable publish raw transaction in &lt;address&gt;</translation>
     </message>
+    <message>
+        <source>Enable transaction replacement in the memory pool (default: %u)</source>
+        <translation>Enable transaction replacement in the memory pool (default: %u)</translation>
+    </message>
     <message>
         <source>Error initializing block database</source>
         <translation>Error initialising block database</translation>
@@ -3127,10 +3155,22 @@
         <source>Invalid -onion address: '%s'</source>
         <translation>Invalid -onion address: '%s'</translation>
     </message>
+    <message>
+        <source>Invalid amount for -fallbackfee=&lt;amount&gt;: '%s'</source>
+        <translation>Invalid amount for -fallbackfee=&lt;amount&gt;: '%s'</translation>
+    </message>
     <message>
         <source>Keep the transaction memory pool below &lt;n&gt; megabytes (default: %u)</source>
         <translation>Keep the transaction memory pool below &lt;n&gt; megabytes (default: %u)</translation>
     </message>
+    <message>
+        <source>Location of the auth cookie (default: data dir)</source>
+        <translation>Location of the auth cookie (default: data dir)</translation>
+    </message>
+    <message>
+        <source>Minimum bytes per sigop in transactions we relay and mine (default: %u)</source>
+        <translation>Minimum bytes per sigop in transactions we relay and mine (default: %u)</translation>
+    </message>
     <message>
         <source>Not enough file descriptors available.</source>
         <translation>Not enough file descriptors available.</translation>
@@ -3139,6 +3179,10 @@
         <source>Only connect to nodes in network &lt;net&gt; (ipv4, ipv6 or onion)</source>
         <translation>Only connect to nodes in network &lt;net&gt; (ipv4, ipv6 or onion)</translation>
     </message>
+    <message>
+        <source>Print version and exit</source>
+        <translation>Print version and exit</translation>
+    </message>
     <message>
         <source>Prune cannot be configured with a negative value.</source>
         <translation>Prune cannot be configured with a negative value.</translation>
@@ -3195,10 +3239,6 @@
         <source>Wallet options:</source>
         <translation>Wallet options:</translation>
     </message>
-    <message>
-        <source>Warning: This version is obsolete; upgrade required!</source>
-        <translation>Warning: This version is obsolete; upgrade required!</translation>
-    </message>
     <message>
         <source>You need to rebuild the database using -reindex to change -txindex</source>
         <translation>You need to rebuild the database using -reindex to change -txindex</translation>
@@ -3295,10 +3335,6 @@
         <source>Activating best chain...</source>
         <translation>Activating best chain...</translation>
     </message>
-    <message>
-        <source>Always relay transactions received from whitelisted peers (default: %d)</source>
-        <translation>Always relay transactions received from whitelisted peers (default: %d)</translation>
-    </message>
     <message>
         <source>Attempt to recover private keys from a corrupt wallet.dat on startup</source>
         <translation>Attempt to recover private keys from a corrupt wallet.dat on startup</translation>
@@ -3463,6 +3499,10 @@
         <source>Warning</source>
         <translation>Warning</translation>
     </message>
+    <message>
+        <source>Warning: unknown new rules activated (versionbit %i)</source>
+        <translation>Warning: unknown new rules activated (versionbit %i)</translation>
+    </message>
     <message>
         <source>Whether to operate in a blocks only mode (default: %u)</source>
         <translation>Whether to operate in a blocks only mode (default: %u)</translation>
diff --git a/src/qt/locale/bitcoin_eo.ts b/src/qt/locale/bitcoin_eo.ts
index ab8dd65f81673..2095db34bf32e 100644
--- a/src/qt/locale/bitcoin_eo.ts
+++ b/src/qt/locale/bitcoin_eo.ts
@@ -179,6 +179,10 @@
         <source>Wallet encrypted</source>
         <translation>La monujo estas ĉifrita</translation>
     </message>
+    <message>
+        <source>Enter the old passphrase and new passphrase to the wallet.</source>
+        <translation>Tajpu la malnovan pasvorton kaj la novan pasvorton por la monujo.</translation>
+    </message>
     <message>
         <source>Wallet encryption failed</source>
         <translation>Ĉifrado de la monujo fiaskis</translation>
@@ -409,6 +413,10 @@
         <source>No block source available...</source>
         <translation>Neniu fonto de blokoj trovebla...</translation>
     </message>
+    <message numerus="yes">
+        <source>%n hour(s)</source>
+        <translation><numerusform>%n horo</numerusform><numerusform>%n horoj</numerusform></translation>
+    </message>
     <message numerus="yes">
         <source>%n day(s)</source>
         <translation><numerusform>%n tago</numerusform><numerusform>%n tagoj</numerusform></translation>
@@ -479,6 +487,12 @@
         <source>Label: %1
 </source>
         <translation>Etikedo: %1
+</translation>
+    </message>
+    <message>
+        <source>Address: %1
+</source>
+        <translation>Adreso: %1
 </translation>
     </message>
     <message>
@@ -812,6 +826,10 @@
         <source>command-line options</source>
         <translation>komandliniaj agordaĵoj</translation>
     </message>
+    <message>
+        <source>UI Options:</source>
+        <translation>Uzantinterfaco ebloj:</translation>
+    </message>
     </context>
 <context>
     <name>Intro</name>
@@ -847,6 +865,10 @@
         <source>Error</source>
         <translation>Eraro</translation>
     </message>
+    <message numerus="yes">
+        <source>%n GB of free space available</source>
+        <translation><numerusform>%n gigabajto de libera loko disponeble</numerusform><numerusform>%n gigabajtoj de libera loko disponebla.</numerusform></translation>
+    </message>
     </context>
 <context>
     <name>OpenURIDialog</name>
@@ -1098,6 +1120,10 @@
 </context>
 <context>
     <name>PeerTableModel</name>
+    <message>
+        <source>User Agent</source>
+        <translation>Uzanto Agento</translation>
+    </message>
     </context>
 <context>
     <name>QObject</name>
@@ -1167,10 +1193,6 @@
         <source>General</source>
         <translation>Ĝenerala</translation>
     </message>
-    <message>
-        <source>Using OpenSSL version</source>
-        <translation>uzas OpenSSL-version</translation>
-    </message>
     <message>
         <source>Startup time</source>
         <translation>Horo de lanĉo</translation>
@@ -1203,10 +1225,22 @@
         <source>Sent</source>
         <translation>Sendita</translation>
     </message>
+    <message>
+        <source>&amp;Peers</source>
+        <translation>&amp;Samuloj</translation>
+    </message>
+    <message>
+        <source>Banned peers</source>
+        <translation>Malpermesita samuloj.</translation>
+    </message>
     <message>
         <source>Version</source>
         <translation>Versio</translation>
     </message>
+    <message>
+        <source>User Agent</source>
+        <translation>Uzanto Agento</translation>
+    </message>
     <message>
         <source>Services</source>
         <translation>Servoj</translation>
diff --git a/src/qt/locale/bitcoin_es.ts b/src/qt/locale/bitcoin_es.ts
index 936074210a53d..5322634c5db98 100644
--- a/src/qt/locale/bitcoin_es.ts
+++ b/src/qt/locale/bitcoin_es.ts
@@ -882,6 +882,10 @@
         <source>command-line options</source>
         <translation>opciones de la consola de comandos</translation>
     </message>
+    <message>
+        <source>UI Options:</source>
+        <translation>Opciones de interfaz de usuario:</translation>
+    </message>
     <message>
         <source>Choose data directory on startup (default: %u)</source>
         <translation>Elegir directorio de datos al iniciar (predeterminado: %u)</translation>
@@ -898,7 +902,11 @@
         <source>Set SSL root certificates for payment request (default: -system-)</source>
         <translation>Establecer los certificados raíz SSL para solicitudes de pago (predeterminado: -system-)</translation>
     </message>
-    </context>
+    <message>
+        <source>Reset all settings changes made over the GUI</source>
+        <translation>Resetear los cambios de configuracion hechos por el GUI</translation>
+    </message>
+</context>
 <context>
     <name>Intro</name>
     <message>
@@ -1095,6 +1103,14 @@
         <source>Port of the proxy (e.g. 9050)</source>
         <translation>Puerto del servidor proxy (ej. 9050)</translation>
     </message>
+    <message>
+        <source>Used for reaching peers via:</source>
+        <translation>Usado para alcanzar compañeros via:</translation>
+    </message>
+    <message>
+        <source>Shows, if the supplied default SOCKS5 proxy is used to reach peers via this network type.</source>
+        <translation>Muestra si el proxy SOCKS5 predeterminado es utilizado para llegar a los pares a traves de este tipo de red.</translation>
+    </message>
     <message>
         <source>IPv4</source>
         <translation>IPv4</translation>
@@ -1107,6 +1123,10 @@
         <source>Tor</source>
         <translation>Tor</translation>
     </message>
+    <message>
+        <source>Connect to the Bitcoin network through a separate SOCKS5 proxy for Tor hidden services.</source>
+        <translation>Conectar a la red Bitcoin mediante un proxy SOCKS5 por separado para los servicios ocultos de Tor.</translation>
+    </message>
     <message>
         <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services:</source>
         <translation>Usar distintos proxys SOCKS5 para comunicarse vía Tor de forma anónima:</translation>
@@ -1449,10 +1469,6 @@
         <source>General</source>
         <translation>General</translation>
     </message>
-    <message>
-        <source>Using OpenSSL version</source>
-        <translation>Utilizando la versión de OpenSSL</translation>
-    </message>
     <message>
         <source>Using BerkeleyDB version</source>
         <translation>Utilizando la versión de BerkeleyDB</translation>
@@ -1481,6 +1497,18 @@
         <source>Current number of blocks</source>
         <translation>Número actual de bloques</translation>
     </message>
+    <message>
+        <source>Memory Pool</source>
+        <translation>Piscina de Memoria</translation>
+    </message>
+    <message>
+        <source>Current number of transactions</source>
+        <translation>Número actual de transacciones</translation>
+    </message>
+    <message>
+        <source>Memory usage</source>
+        <translation>Uso de memoria</translation>
+    </message>
     <message>
         <source>Open the Bitcoin Core debug log file from the current data directory. This can take a few seconds for large log files.</source>
         <translation>Abre el archivo de registro de depuración de Bitcoin desde el directorio de datos actual. Esto puede tardar unos segundos para ficheros de registro de gran tamaño.</translation>
@@ -1505,6 +1533,10 @@
         <source>Select a peer to view detailed information.</source>
         <translation>Seleccionar un par para ver su información detallada.</translation>
     </message>
+    <message>
+        <source>Whitelisted</source>
+        <translation>En la lista blanca</translation>
+    </message>
     <message>
         <source>Direction</source>
         <translation>Dirección</translation>
@@ -1553,6 +1585,14 @@
         <source>Ping Time</source>
         <translation>Ping</translation>
     </message>
+    <message>
+        <source>The duration of a currently outstanding ping.</source>
+        <translation>La duración de un ping actualmente en proceso.</translation>
+    </message>
+    <message>
+        <source>Ping Wait</source>
+        <translation>Espera de Ping</translation>
+    </message>
     <message>
         <source>Time Offset</source>
         <translation>Desplazamiento de tiempo</translation>
@@ -1605,6 +1645,10 @@
         <source>&amp;Disconnect Node</source>
         <translation>Nodo &amp;Desconectado</translation>
     </message>
+    <message>
+        <source>Ban Node for</source>
+        <translation>Prohibir Nodo para</translation>
+    </message>
     <message>
         <source>1 &amp;hour</source>
         <translation>1 &amp;hora</translation>
@@ -1621,6 +1665,10 @@
         <source>1 &amp;year</source>
         <translation>1 &amp;año</translation>
     </message>
+    <message>
+        <source>&amp;Unban Node</source>
+        <translation>&amp;Desbanear Nodo</translation>
+    </message>
     <message>
         <source>Welcome to the Bitcoin Core RPC console.</source>
         <translation>Bienvenido a la consola RPC de Bitcoin Core.</translation>
@@ -2720,6 +2768,10 @@
         <source>Copy transaction ID</source>
         <translation>Copiar identificador de transacción</translation>
     </message>
+    <message>
+        <source>Copy raw transaction</source>
+        <translation>Copiar traducción en crudo</translation>
+    </message>
     <message>
         <source>Edit label</source>
         <translation>Editar etiqueta</translation>
@@ -2869,6 +2921,34 @@
         <translation>Aceptar comandos consola y JSON-RPC
 </translation>
     </message>
+    <message>
+        <source>If &lt;category&gt; is not supplied or if &lt;category&gt; = 1, output all debugging information.</source>
+        <translation>Si &lt;category&gt; no es proporcionado o si &lt;category&gt; =1, muestra toda la información de depuración.</translation>
+    </message>
+    <message>
+        <source>Maximum total fees (in %s) to use in a single wallet transaction; setting this too low may abort large transactions (default: %s)</source>
+        <translation>Máximas comisiones totales (en %s) para utilizar en una sola transacción de la cartera; establecer esto demasiado bajo puede abortar grandes transacciones (predeterminado: %s)</translation>
+    </message>
+    <message>
+        <source>Please check that your computer's date and time are correct! If your clock is wrong Bitcoin Core will not work properly.</source>
+        <translation>Por favor, mira si la fecha y la hora en tu computador son correctas! Si tu hara es errónea Bitcoin Core no funcionará correctamente.</translation>
+    </message>
+    <message>
+        <source>Prune configured below the minimum of %d MiB.  Please use a higher number.</source>
+        <translation>La Poda se ha configurado por debajo del minimo de %d MiB. Por favor utiliza un valor mas alto.</translation>
+    </message>
+    <message>
+        <source>Prune: last wallet synchronisation goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of pruned node)</source>
+        <translation>Poda:  la ultima sincronizacion de la cartera sobrepasa los datos podados. Necesitas reindexar con -reindex (o descargar la cadena de bloques de nuevo en el caso de un nodo podado)</translation>
+    </message>
+    <message>
+        <source>Reduce storage requirements by pruning (deleting) old blocks. This mode is incompatible with -txindex and -rescan. Warning: Reverting this setting requires re-downloading the entire blockchain. (default: 0 = disable pruning blocks, &gt;%u = target size in MiB to use for block files)</source>
+        <translation>Reduce los requisitos de almacenaje podando (eliminando) los bloques viejos. Este modo es incompatible con -txindex y -rescan. Advertencia: Revertir este ajuste requiere volver a descargar la cadena de bloques al completo. (predeterminado: 0 = deshabilitar la poda de bloques, &gt;%u = objetivo de tamaño en MiB para usar para los archivos de bloques)</translation>
+    </message>
+    <message>
+        <source>Rescans are not possible in pruned mode. You will need to use -reindex which will download the whole blockchain again.</source>
+        <translation>Nos es posible re-escanear en modo podado.Necesitas utilizar -reindex el cual descargara la cadena de bloques al completo de nuevo.</translation>
+    </message>
     <message>
         <source>Error: A fatal internal error occurred, see debug.log for details</source>
         <translation>Un error interno fatal ocurrió, ver debug.log para detalles</translation>
@@ -2894,6 +2974,18 @@
         <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
         <translation>Aceptar conexiones desde el exterior (predeterminado: 1 si no -proxy o -connect)</translation>
     </message>
+    <message>
+        <source>-fallbackfee is set very high! This is the transaction fee you may pay when fee estimates are not available.</source>
+        <translation>-fallbackfee tiene un ajuste muy alto! Esta es la comisión de transacción que pagarás cuando las estimaciones de comisiones no estén disponibles.</translation>
+    </message>
+    <message>
+        <source>A fee rate (in %s/kB) that will be used when fee estimation has insufficient data (default: %s)</source>
+        <translation>Una comision (en %s/kB) que sera usada cuando las estimacion de comision no disponga de suficientes datos (predeterminado: %s)</translation>
+    </message>
+    <message>
+        <source>Accept relayed transactions received from whitelisted peers even when not relaying transactions (default: %d)</source>
+        <translation>Aceptar transacciones retransmitidas recibidas desde nodos en la lista blanca incluso cuando no estés retransmitiendo transacciones (predeterminado: %d)</translation>
+    </message>
     <message>
         <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source>
         <translation>Vincular a la dirección dada y escuchar siempre en ella. Utilice la notación [host]:port para IPv6</translation>
@@ -2910,10 +3002,18 @@
         <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source>
         <translation>Ejecutar comando cuando una transacción del monedero cambia (%s en cmd se remplazará por TxID)</translation>
     </message>
+    <message>
+        <source>Force relay of transactions from whitelisted peers even they violate local relay policy (default: %d)</source>
+        <translation>Fuerza la retransmisión de transacciones desde nodos en la lista blanca incluso si violan la política de retransmisiones local (predeterminado: %d)</translation>
+    </message>
     <message>
         <source>Set the number of script verification threads (%u to %d, 0 = auto, &lt;0 = leave that many cores free, default: %d)</source>
         <translation>Establecer el número de hilos (threads) de verificación de scripts (entre %u y %d, 0 = automático, &lt;0 = dejar libres ese número de núcleos; predeterminado: %d)</translation>
     </message>
+    <message>
+        <source>The block database contains a block which appears to be from the future. This may be due to your computer's date and time being set incorrectly. Only rebuild the block database if you are sure that your computer's date and time are correct</source>
+        <translation>La base de datos de bloques contiene un bloque que parece ser del futuro. Esto puede ser porque la fecha y hora de tu ordenador están mal ajustados. Reconstruye la base de datos de bloques solo si estas seguro de que la fecha y hora de tu ordenador estan ajustados correctamente.</translation>
+    </message>
     <message>
         <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
         <translation>Esta es una versión de pre-prueba - utilícela bajo su propio riesgo. No la utilice para usos comerciales o de minería.</translation>
@@ -2922,6 +3022,14 @@
         <source>Unable to bind to %s on this computer. Bitcoin Core is probably already running.</source>
         <translation>No se ha podido acceder a %s en esta máquina. Probablemente ya se está ejecutando Bitcoin Core.</translation>
     </message>
+    <message>
+        <source>Unsupported argument -whitelistalwaysrelay ignored, use -whitelistrelay and/or -whitelistforcerelay.</source>
+        <translation>El argumento no soportado -whitelistalwaysrelay ha sido ignorado, utiliza -whitelistrelay  y/o -whitelistforcerelay.</translation>
+    </message>
+    <message>
+        <source>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</source>
+        <translation>Utiliza UPnP para asignar el puerto de escucha (predeterminado: 1 cuando esta escuchando sin -proxy)</translation>
+    </message>
     <message>
         <source>WARNING: abnormally high number of blocks generated, %d blocks received in the last %d hours (%d expected)</source>
         <translation>ADVERTENCIA: anormalmente alto número de bloques generado, %d bloques recibidos en las últimas horas %d (%d espera)</translation>
@@ -2934,6 +3042,10 @@
         <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source>
         <translation>Atención: ¡Parece que la red no está totalmente de acuerdo! Algunos mineros están presentando inconvenientes.</translation>
     </message>
+    <message>
+        <source>Warning: Unknown block versions being mined! It's possible unknown rules are in effect</source>
+        <translation>Advertencia: Se están minando versiones de bloques desconocidas! Es posible que normas desconocidas estén activas</translation>
+    </message>
     <message>
         <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source>
         <translation>Atención: ¡Parece que no estamos completamente de acuerdo con nuestros pares! Podría necesitar una actualización, u otros nodos podrían necesitarla.</translation>
@@ -2954,6 +3066,10 @@
         <source>&lt;category&gt; can be:</source>
         <translation>&lt;category&gt; puede ser:</translation>
     </message>
+    <message>
+        <source>Append comment to the user agent string</source>
+        <translation>Adjunta un comentario a la linea de agente de usuario</translation>
+    </message>
     <message>
         <source>Block creation options:</source>
         <translation>Opciones de creación de bloques:</translation>
@@ -2982,6 +3098,26 @@
         <source>Do you want to rebuild the block database now?</source>
         <translation>¿Quieres reconstruir la base de datos de bloques ahora?</translation>
     </message>
+    <message>
+        <source>Enable publish hash block in &lt;address&gt;</source>
+        <translation>Activar publicar bloque .hash en &lt;.Address&gt;</translation>
+    </message>
+    <message>
+        <source>Enable publish hash transaction in &lt;address&gt;</source>
+        <translation>Activar publicar transacción .hash en &lt;.Address&gt;</translation>
+    </message>
+    <message>
+        <source>Enable publish raw block in &lt;address&gt;</source>
+        <translation>Habilita la publicacion de bloques en bruto en &lt;direccion&gt;</translation>
+    </message>
+    <message>
+        <source>Enable publish raw transaction in &lt;address&gt;</source>
+        <translation>Habilitar publicar transacción en rama en &lt;dirección&gt;</translation>
+    </message>
+    <message>
+        <source>Enable transaction replacement in the memory pool (default: %u)</source>
+        <translation>Habilita el reemplazamiento de transacciones en la piscina de memoria (predeterminado: %u)</translation>
+    </message>
     <message>
         <source>Error initializing block database</source>
         <translation>Error al inicializar la base de datos de bloques</translation>
@@ -3018,6 +3154,22 @@
         <source>Invalid -onion address: '%s'</source>
         <translation>Dirección -onion inválida: '%s'</translation>
     </message>
+    <message>
+        <source>Invalid amount for -fallbackfee=&lt;amount&gt;: '%s'</source>
+        <translation>Cantidad inválida para -fallbackfee=&lt;amount&gt;: '%s'</translation>
+    </message>
+    <message>
+        <source>Keep the transaction memory pool below &lt;n&gt; megabytes (default: %u)</source>
+        <translation>Mantener la memoria de transacciones por debajo de &lt;n&gt; megabytes (predeterminado: %u)</translation>
+    </message>
+    <message>
+        <source>Location of the auth cookie (default: data dir)</source>
+        <translation>Ubicación de la cookie de autenticación (default: data dir)</translation>
+    </message>
+    <message>
+        <source>Minimum bytes per sigop in transactions we relay and mine (default: %u)</source>
+        <translation>Mínimo de bytes por sigop en transacciones que retransmitimos y minamos (predeterminado: %u)</translation>
+    </message>
     <message>
         <source>Not enough file descriptors available.</source>
         <translation>No hay suficientes descriptores de archivo disponibles. </translation>
@@ -3026,6 +3178,10 @@
         <source>Only connect to nodes in network &lt;net&gt; (ipv4, ipv6 or onion)</source>
         <translation>Sólo conectar a nodos en redes &lt;net&gt; (ipv4, ipv6 o onion)</translation>
     </message>
+    <message>
+        <source>Print version and exit</source>
+        <translation>Imprimir versión y salir</translation>
+    </message>
     <message>
         <source>Prune cannot be configured with a negative value.</source>
         <translation>Pode no se puede configurar con un valor negativo.</translation>
@@ -3046,10 +3202,26 @@
         <source>Specify wallet file (within data directory)</source>
         <translation>Especificar archivo de monedero (dentro del directorio de datos)</translation>
     </message>
+    <message>
+        <source>Unsupported argument -benchmark ignored, use -debug=bench.</source>
+        <translation>El argumento -benchmark no es soportado y ha sido ignorado, utiliza -debug=bench</translation>
+    </message>
+    <message>
+        <source>Unsupported argument -debugnet ignored, use -debug=net.</source>
+        <translation>Parámetros no compatibles -debugnet ignorados , use -debug = red.</translation>
+    </message>
+    <message>
+        <source>Unsupported argument -tor found, use -onion.</source>
+        <translation>Parámetros no compatibles -tor encontrados, use -onion .</translation>
+    </message>
     <message>
         <source>Use UPnP to map the listening port (default: %u)</source>
         <translation>Usar UPnP para asignar el puerto de escucha (predeterminado:: %u)</translation>
     </message>
+    <message>
+        <source>User Agent comment (%s) contains unsafe characters.</source>
+        <translation>El comentario del Agente de Usuario (%s) contiene caracteres inseguros.</translation>
+    </message>
     <message>
         <source>Verifying blocks...</source>
         <translation>Verificando bloques...</translation>
@@ -3066,10 +3238,6 @@
         <source>Wallet options:</source>
         <translation>Opciones de monedero:</translation>
     </message>
-    <message>
-        <source>Warning: This version is obsolete; upgrade required!</source>
-        <translation>Peligro: Esta versión es obsoleta; actualización requerida!</translation>
-    </message>
     <message>
         <source>You need to rebuild the database using -reindex to change -txindex</source>
         <translation>Usted necesita reconstruir la base de datos utilizando -reindex para cambiar -txindex</translation>
@@ -3106,6 +3274,10 @@
         <source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source>
         <translation>Ejecutar un comando cuando se reciba una alerta importante o cuando veamos un fork demasiado largo (%s en cmd se reemplazará por el mensaje)</translation>
     </message>
+    <message>
+        <source>Fees (in %s/kB) smaller than this are considered zero fee for relaying, mining and transaction creation (default: %s)</source>
+        <translation>Las comisiones (en %s/kB) mas pequeñas que esto se consideran como cero comisión para la retransmisión, minería y creación de la transacción (predeterminado: %s)</translation>
+    </message>
     <message>
         <source>If paytxfee is not set, include enough fee so transactions begin confirmation on average within n blocks (default: %u)</source>
         <translation>Si el pago de comisión no está establecido, incluir la cuota suficiente para que las transacciones comiencen la confirmación en una media de n bloques ( por defecto :%u)</translation>
@@ -3246,6 +3418,10 @@
         <source>Receive and display P2P network alerts (default: %u)</source>
         <translation>Recibir y mostrar alertas de red P2P (default: %u)</translation>
     </message>
+    <message>
+        <source>Reducing -maxconnections from %d to %d, because of system limitations.</source>
+        <translation>Reduciendo -maxconnections de %d a %d, debido a limitaciones del sistema.</translation>
+    </message>
     <message>
         <source>Rescan the block chain for missing wallet transactions on startup</source>
         <translation>Rescanea la cadena de bloques para transacciones perdidas de la cartera</translation>
@@ -3278,6 +3454,14 @@
         <source>This is experimental software.</source>
         <translation>Este software es experimental.</translation>
     </message>
+    <message>
+        <source>Tor control port password (default: empty)</source>
+        <translation>Contraseña del puerto de control de Tor (predeterminado: vacio)</translation>
+    </message>
+    <message>
+        <source>Tor control port to use if onion listening enabled (default: %s)</source>
+        <translation>Puerto de control de Tor a utilizar si la escucha de onion esta activada (predeterminado: %s)</translation>
+    </message>
     <message>
         <source>Transaction amount too small</source>
         <translation>Cantidad de la transacción demasiado pequeña</translation>
@@ -3315,10 +3499,22 @@
         <source>Warning</source>
         <translation>Aviso</translation>
     </message>
+    <message>
+        <source>Warning: unknown new rules activated (versionbit %i)</source>
+        <translation>Advertencia: nuevas reglas desconocidas activadas (versionbit %i)</translation>
+    </message>
+    <message>
+        <source>Whether to operate in a blocks only mode (default: %u)</source>
+        <translation>Si se debe o no operar en un modo de solo bloques (predeterminado: %u)</translation>
+    </message>
     <message>
         <source>Zapping all transactions from wallet...</source>
         <translation>Eliminando todas las transacciones del monedero...</translation>
     </message>
+    <message>
+        <source>ZeroMQ notification options:</source>
+        <translation>Opciones de notificación ZeroQM:</translation>
+    </message>
     <message>
         <source>wallet.dat corrupt, salvage failed</source>
         <translation>wallet.dat corrupto. Ha fallado la recuperación.</translation>
@@ -3353,6 +3549,26 @@
         <source>(1 = keep tx meta data e.g. account owner and payment request information, 2 = drop tx meta data)</source>
         <translation>(1 = keep tx meta data e.g. account owner and payment request information, 2 = drop tx meta data)</translation>
     </message>
+    <message>
+        <source>-maxtxfee is set very high! Fees this large could be paid on a single transaction.</source>
+        <translation>-maxtxfee tiene un ajuste muy elevado! Las comisiones así de grandes podrían ser pagadas en una única transaccion.</translation>
+    </message>
+    <message>
+        <source>-paytxfee is set very high! This is the transaction fee you will pay if you send a transaction.</source>
+        <translation>-paytxfee tiene un ajuste muy elevado! Esta es la comisión de transacción que pagaras si envías una transaccion.</translation>
+    </message>
+    <message>
+        <source>Do not keep transactions in the mempool longer than &lt;n&gt; hours (default: %u)</source>
+        <translation>No mantener transacciones en la memoria mas de &lt;n&gt; horas (predeterminado: %u)</translation>
+    </message>
+    <message>
+        <source>Error reading wallet.dat! All keys read correctly, but transaction data or address book entries might be missing or incorrect.</source>
+        <translation>Error al leer wallet.dat! Todas las llaves se leyeron correctamente, pero los datos de transacciones o la libreta de direcciones pueden faltar o ser incorrectos.</translation>
+    </message>
+    <message>
+        <source>Fees (in %s/kB) smaller than this are considered zero fee for transaction creation (default: %s)</source>
+        <translation>Las comisiones (en %s/kB) menores que esto son consideradas de cero comision para la creacion de transacciones (predeterminado: %s)</translation>
+    </message>
     <message>
         <source>How thorough the block verification of -checkblocks is (0-4, default: %u)</source>
         <translation>Nivel de rigor en la verificación de bloques de -checkblocks (0-4; predeterminado: %u)</translation>
@@ -3369,10 +3585,18 @@
         <source>Output debugging information (default: %u, supplying &lt;category&gt; is optional)</source>
         <translation>Mostrar depuración (por defecto: %u, proporcionar &lt;category&gt; es opcional)</translation>
     </message>
+    <message>
+        <source>Unsupported argument -socks found. Setting SOCKS version isn't possible anymore, only SOCKS5 proxies are supported.</source>
+        <translation>Error: Unsupported argumento -socks encontrados. SOCKS versión ajuste ya no es posible, sólo SOCKS5 proxies son compatibles.</translation>
+    </message>
     <message>
         <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: %s)</source>
         <translation>Usar distintos proxys SOCKS5 para comunicarse vía Tor de forma anónima (Por defecto: %s)</translation>
     </message>
+    <message>
+        <source>Username and hashed password for JSON-RPC connections. The field &lt;userpw&gt; comes in the format: &lt;USERNAME&gt;:&lt;SALT&gt;$&lt;HASH&gt;. A canonical python script is included in share/rpcuser. This option can be specified multiple times</source>
+        <translation>Nombre de usuario y hash de la contraseña para las conexiones JSON-RPC. El campo &lt;userpw&gt; tiene el formato: &lt;USERNAME&gt;:&lt;SALT&gt;$&lt;HASH&gt;. Se incluye un script python convencional en share/rpcuser. Esta opción puede ser especificada multiples veces</translation>
+    </message>
     <message>
         <source>(default: %s)</source>
         <translation>(predeterminado: %s)</translation>
diff --git a/src/qt/locale/bitcoin_es_419.ts b/src/qt/locale/bitcoin_es_419.ts
new file mode 100644
index 0000000000000..b76915662c114
--- /dev/null
+++ b/src/qt/locale/bitcoin_es_419.ts
@@ -0,0 +1,173 @@
+<TS language="es_419" version="2.1">
+<context>
+    <name>AddressBookPage</name>
+    <message>
+        <source>Right-click to edit address or label</source>
+        <translation>Haga clic para editar la dirección o etiqueta</translation>
+    </message>
+    <message>
+        <source>Create a new address</source>
+        <translation>Crear una nueva dirección</translation>
+    </message>
+    <message>
+        <source>&amp;New</source>
+        <translation>&amp;New</translation>
+    </message>
+    <message>
+        <source>Copy the currently selected address to the system clipboard</source>
+        <translation>Copia la dirección seleccionada al portapapeles del sistema</translation>
+    </message>
+    <message>
+        <source>Choose the address to send coins to</source>
+        <translation>Seleccione la Direccion a la que enviara dinero</translation>
+    </message>
+    <message>
+        <source>Choose the address to receive coins with</source>
+        <translation>Seleccione la direccion de la que recibira dinero</translation>
+    </message>
+    <message>
+        <source>Export Address List</source>
+        <translation>Exportar Lista de Direcciones</translation>
+    </message>
+    </context>
+<context>
+    <name>AddressTableModel</name>
+    <message>
+        <source>Address</source>
+        <translation>Direccion</translation>
+    </message>
+    </context>
+<context>
+    <name>AskPassphraseDialog</name>
+    <message>
+        <source>Decrypt wallet</source>
+        <translation>Desencriptar Monedero</translation>
+    </message>
+    <message>
+        <source>Confirm wallet encryption</source>
+        <translation>Confirmar Encriptacion de Monedero</translation>
+    </message>
+    <message>
+        <source>Warning: The Caps Lock key is on!</source>
+        <translation>Advertencia: La Tecla Caps Lock esta habilitada!</translation>
+    </message>
+    <message>
+        <source>Wallet encrypted</source>
+        <translation>Monedero ha sido encriptado</translation>
+    </message>
+    <message>
+        <source>Wallet encryption failed</source>
+        <translation>La encriptacion del monedero ha fallado</translation>
+    </message>
+    </context>
+<context>
+    <name>BanTableModel</name>
+    </context>
+<context>
+    <name>BitcoinGUI</name>
+    </context>
+<context>
+    <name>ClientModel</name>
+    </context>
+<context>
+    <name>CoinControlDialog</name>
+    </context>
+<context>
+    <name>EditAddressDialog</name>
+    </context>
+<context>
+    <name>FreespaceChecker</name>
+    </context>
+<context>
+    <name>HelpMessageDialog</name>
+    </context>
+<context>
+    <name>Intro</name>
+    </context>
+<context>
+    <name>OpenURIDialog</name>
+    </context>
+<context>
+    <name>OptionsDialog</name>
+    </context>
+<context>
+    <name>OverviewPage</name>
+    </context>
+<context>
+    <name>PaymentServer</name>
+    </context>
+<context>
+    <name>PeerTableModel</name>
+    </context>
+<context>
+    <name>QObject</name>
+    </context>
+<context>
+    <name>QRImageWidget</name>
+    </context>
+<context>
+    <name>RPCConsole</name>
+    </context>
+<context>
+    <name>ReceiveCoinsDialog</name>
+    </context>
+<context>
+    <name>ReceiveRequestDialog</name>
+    <message>
+        <source>Address</source>
+        <translation>Direccion</translation>
+    </message>
+    </context>
+<context>
+    <name>RecentRequestsTableModel</name>
+    </context>
+<context>
+    <name>SendCoinsDialog</name>
+    </context>
+<context>
+    <name>SendCoinsEntry</name>
+    </context>
+<context>
+    <name>ShutdownWindow</name>
+    </context>
+<context>
+    <name>SignVerifyMessageDialog</name>
+    </context>
+<context>
+    <name>SplashScreen</name>
+    </context>
+<context>
+    <name>TrafficGraphWidget</name>
+    </context>
+<context>
+    <name>TransactionDesc</name>
+    </context>
+<context>
+    <name>TransactionDescDialog</name>
+    </context>
+<context>
+    <name>TransactionTableModel</name>
+    </context>
+<context>
+    <name>TransactionView</name>
+    <message>
+        <source>Address</source>
+        <translation>Direccion</translation>
+    </message>
+    </context>
+<context>
+    <name>UnitDisplayStatusBarControl</name>
+    </context>
+<context>
+    <name>WalletFrame</name>
+    </context>
+<context>
+    <name>WalletModel</name>
+    </context>
+<context>
+    <name>WalletView</name>
+    </context>
+<context>
+    <name>bitcoin-core</name>
+    </context>
+</TS>
\ No newline at end of file
diff --git a/src/qt/locale/bitcoin_es_AR.ts b/src/qt/locale/bitcoin_es_AR.ts
new file mode 100644
index 0000000000000..fb9ac895be830
--- /dev/null
+++ b/src/qt/locale/bitcoin_es_AR.ts
@@ -0,0 +1,373 @@
+<TS language="es_AR" version="2.1">
+<context>
+    <name>AddressBookPage</name>
+    <message>
+        <source>Right-click to edit address or label</source>
+        <translation>Hacé click para editar la dirección o etiqueta</translation>
+    </message>
+    <message>
+        <source>Create a new address</source>
+        <translation>Crear una nueva dirección</translation>
+    </message>
+    <message>
+        <source>&amp;New</source>
+        <translation>&amp;Nuevo</translation>
+    </message>
+    <message>
+        <source>Copy the currently selected address to the system clipboard</source>
+        <translation>Copiá la dirección que seleccionaste al portapapeles</translation>
+    </message>
+    <message>
+        <source>&amp;Copy</source>
+        <translation>&amp;Copiar</translation>
+    </message>
+    <message>
+        <source>C&amp;lose</source>
+        <translation>C&amp;lose</translation>
+    </message>
+    <message>
+        <source>&amp;Copy Address</source>
+        <translation>&amp;Copiar Dirección</translation>
+    </message>
+    <message>
+        <source>Delete the currently selected address from the list</source>
+        <translation>Borrar de la lista la dirección seleccionada</translation>
+    </message>
+    <message>
+        <source>Export the data in the current tab to a file</source>
+        <translation>Exportar los datos de la pestaña actual a un archivo</translation>
+    </message>
+    <message>
+        <source>&amp;Export</source>
+        <translation>&amp;Exportar</translation>
+    </message>
+    <message>
+        <source>&amp;Delete</source>
+        <translation>&amp;Borrar</translation>
+    </message>
+    <message>
+        <source>Choose the address to send coins to</source>
+        <translation>Elegir la dirección a donde enviar las monedas (coins)</translation>
+    </message>
+    <message>
+        <source>Choose the address to receive coins with</source>
+        <translation>Elegí la dirección donde recibir las monedas</translation>
+    </message>
+    <message>
+        <source>C&amp;hoose</source>
+        <translation>E&amp;legir</translation>
+    </message>
+    <message>
+        <source>Sending addresses</source>
+        <translation>Direcciones de envío</translation>
+    </message>
+    <message>
+        <source>Receiving addresses</source>
+        <translation>Direcciones de recepción</translation>
+    </message>
+    <message>
+        <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source>
+        <translation>Estas son tus direcciones Bitcoin para enviar pagos. Siempre chequeá el monto y la dirección de recepción antes de mandar monedas.</translation>
+    </message>
+    <message>
+        <source>These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source>
+        <translation>Estas son tus direcciones para recibir pagos. Te recomendamos que uses una dirección de recibir  para cada transacción.</translation>
+    </message>
+    <message>
+        <source>Copy &amp;Label</source>
+        <translation>Copiar &amp;Etiqueta</translation>
+    </message>
+    <message>
+        <source>&amp;Edit</source>
+        <translation>&amp;Editar</translation>
+    </message>
+    <message>
+        <source>Export Address List</source>
+        <translation>Exportar lista de direcciones</translation>
+    </message>
+    <message>
+        <source>Comma separated file (*.csv)</source>
+        <translation>Archivo separado por coma (*.csv)</translation>
+    </message>
+    <message>
+        <source>Exporting Failed</source>
+        <translation>Falló la exportación</translation>
+    </message>
+    <message>
+        <source>There was an error trying to save the address list to %1. Please try again.</source>
+        <translation>Hubo un error al tratar de guardar la lista de direcciones a %1. Por favor tratá de nuevo.</translation>
+    </message>
+</context>
+<context>
+    <name>AddressTableModel</name>
+    <message>
+        <source>Label</source>
+        <translation>Etiqueta</translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation>Dirección</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(sin etiqueta)</translation>
+    </message>
+</context>
+<context>
+    <name>AskPassphraseDialog</name>
+    <message>
+        <source>Passphrase Dialog</source>
+        <translation>Diálogo de Frase de Contraseña</translation>
+    </message>
+    <message>
+        <source>Enter passphrase</source>
+        <translation>Ingresar la Frase de Contraseña</translation>
+    </message>
+    <message>
+        <source>New passphrase</source>
+        <translation>Nueva Frase de Contraseña</translation>
+    </message>
+    <message>
+        <source>Repeat new passphrase</source>
+        <translation>Repetí la nueva Frase de Contraseña</translation>
+    </message>
+    <message>
+        <source>Encrypt wallet</source>
+        <translation>Encriptar la billetera</translation>
+    </message>
+    <message>
+        <source>This operation needs your wallet passphrase to unlock the wallet.</source>
+        <translation>Esta operación necesita tu frase de contraseña para desbloquear tu billetera.</translation>
+    </message>
+    <message>
+        <source>Unlock wallet</source>
+        <translation>Desbloquear la billetera</translation>
+    </message>
+    <message>
+        <source>This operation needs your wallet passphrase to decrypt the wallet.</source>
+        <translation>Esta operación necesita tu Frase de Contraseña de billetera para desencriptar la billetera.</translation>
+    </message>
+    <message>
+        <source>Decrypt wallet</source>
+        <translation>Desencriptar la billetera</translation>
+    </message>
+    <message>
+        <source>Change passphrase</source>
+        <translation>Cambiar la Frase de Contraseña</translation>
+    </message>
+    <message>
+        <source>Confirm wallet encryption</source>
+        <translation>Confirmá la encriptación de la billetera</translation>
+    </message>
+    <message>
+        <source>Warning: If you encrypt your wallet and lose your passphrase, you will &lt;b&gt;LOSE ALL OF YOUR BITCOINS&lt;/b&gt;!</source>
+        <translation>Atención: Si encriptás tu billetera y perdés tu frase de contraseña, vas a &lt;b&gt;PERDER TODOS TUS BITCOINS&lt;/b&gt;!</translation>
+    </message>
+    <message>
+        <source>Are you sure you wish to encrypt your wallet?</source>
+        <translation>¿Estás seguro que querés encriptar tu billetera?</translation>
+    </message>
+    <message>
+        <source>Bitcoin Core will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source>
+        <translation>Bitcoin Core ahora se va a cerrar para terminar el proceso de encriptación. Acordate que encriptar tu billetera no te protege completamente de que algún malware que pueda infectar tu computadora te robe tus bitcoins.</translation>
+    </message>
+    <message>
+        <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source>
+        <translation>IMPORTANTE: Todos los backups que hayas hecho de tu billetera tendrían que ser reemplazados por el archivo encriptado de billetera que generaste. Por razones de seguridad, los backups anteriores del archivo de billetera no encriptado se inutilizan en el momento en que empezás a usar la nueva billetera encriptada</translation>
+    </message>
+    <message>
+        <source>Warning: The Caps Lock key is on!</source>
+        <translation>Atención: Tenés puestas las mayúsculas!</translation>
+    </message>
+    <message>
+        <source>Wallet encrypted</source>
+        <translation>Billetera encriptada</translation>
+    </message>
+    <message>
+        <source>Enter the new passphrase to the wallet.&lt;br/&gt;Please use a passphrase of &lt;b&gt;ten or more random characters&lt;/b&gt;, or &lt;b&gt;eight or more words&lt;/b&gt;.</source>
+        <translation>Ingresá una nueva frase de contraseña para la billetera.&lt;br/&gt;Por favor, fijate de usar una frase de contraseña de &lt;b&gt;diez o más caracteres aleatorios&lt;/b&gt;, o de &lt;b&gt;ocho o más palabras&lt;/b&gt;.</translation>
+    </message>
+    <message>
+        <source>Enter the old passphrase and new passphrase to the wallet.</source>
+        <translation>Ingresá la frase de contraseña  vieja y la nueva para la billetera.</translation>
+    </message>
+    <message>
+        <source>Wallet encryption failed</source>
+        <translation>Falló la encriptación de la billetera</translation>
+    </message>
+    <message>
+        <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
+        <translation>Falló la encriptación de la billetera por un error interno. Tu billetera no está encriptada.</translation>
+    </message>
+    <message>
+        <source>The supplied passphrases do not match.</source>
+        <translation>Las frases de contraseña no son iguales.</translation>
+    </message>
+    <message>
+        <source>Wallet unlock failed</source>
+        <translation>Falló el desbloqueo de la billetera</translation>
+    </message>
+    <message>
+        <source>The passphrase entered for the wallet decryption was incorrect.</source>
+        <translation>La frase de contraseña que ingresaste para desencriptar la billetera es incorrecta.</translation>
+    </message>
+    <message>
+        <source>Wallet decryption failed</source>
+        <translation>Falló la desencriptación de la billetera</translation>
+    </message>
+    </context>
+<context>
+    <name>BanTableModel</name>
+    </context>
+<context>
+    <name>BitcoinGUI</name>
+    </context>
+<context>
+    <name>ClientModel</name>
+    </context>
+<context>
+    <name>CoinControlDialog</name>
+    <message>
+        <source>(no label)</source>
+        <translation>(sin etiqueta)</translation>
+    </message>
+    </context>
+<context>
+    <name>EditAddressDialog</name>
+    </context>
+<context>
+    <name>FreespaceChecker</name>
+    </context>
+<context>
+    <name>HelpMessageDialog</name>
+    </context>
+<context>
+    <name>Intro</name>
+    </context>
+<context>
+    <name>OpenURIDialog</name>
+    </context>
+<context>
+    <name>OptionsDialog</name>
+    </context>
+<context>
+    <name>OverviewPage</name>
+    </context>
+<context>
+    <name>PaymentServer</name>
+    </context>
+<context>
+    <name>PeerTableModel</name>
+    </context>
+<context>
+    <name>QObject</name>
+    </context>
+<context>
+    <name>QRImageWidget</name>
+    </context>
+<context>
+    <name>RPCConsole</name>
+    </context>
+<context>
+    <name>ReceiveCoinsDialog</name>
+    </context>
+<context>
+    <name>ReceiveRequestDialog</name>
+    <message>
+        <source>Address</source>
+        <translation>Dirección</translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation>Etiqueta</translation>
+    </message>
+    </context>
+<context>
+    <name>RecentRequestsTableModel</name>
+    <message>
+        <source>Label</source>
+        <translation>Etiqueta</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(sin etiqueta)</translation>
+    </message>
+    </context>
+<context>
+    <name>SendCoinsDialog</name>
+    <message>
+        <source>(no label)</source>
+        <translation>(sin etiqueta)</translation>
+    </message>
+    </context>
+<context>
+    <name>SendCoinsEntry</name>
+    </context>
+<context>
+    <name>ShutdownWindow</name>
+    </context>
+<context>
+    <name>SignVerifyMessageDialog</name>
+    </context>
+<context>
+    <name>SplashScreen</name>
+    </context>
+<context>
+    <name>TrafficGraphWidget</name>
+    </context>
+<context>
+    <name>TransactionDesc</name>
+    </context>
+<context>
+    <name>TransactionDescDialog</name>
+    </context>
+<context>
+    <name>TransactionTableModel</name>
+    <message>
+        <source>Label</source>
+        <translation>Etiqueta</translation>
+    </message>
+    </context>
+<context>
+    <name>TransactionView</name>
+    <message>
+        <source>Exporting Failed</source>
+        <translation>Falló la exportación</translation>
+    </message>
+    <message>
+        <source>Comma separated file (*.csv)</source>
+        <translation>Archivo separado por coma (*.csv)</translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation>Etiqueta</translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation>Dirección</translation>
+    </message>
+    </context>
+<context>
+    <name>UnitDisplayStatusBarControl</name>
+    </context>
+<context>
+    <name>WalletFrame</name>
+    </context>
+<context>
+    <name>WalletModel</name>
+    </context>
+<context>
+    <name>WalletView</name>
+    <message>
+        <source>&amp;Export</source>
+        <translation>&amp;Exportar</translation>
+    </message>
+    <message>
+        <source>Export the data in the current tab to a file</source>
+        <translation>Exportar los datos de la pestaña actual a un archivo</translation>
+    </message>
+    </context>
+<context>
+    <name>bitcoin-core</name>
+    </context>
+</TS>
\ No newline at end of file
diff --git a/src/qt/locale/bitcoin_es_CL.ts b/src/qt/locale/bitcoin_es_CL.ts
index e6d48a29f07f9..742dee29d0374 100644
--- a/src/qt/locale/bitcoin_es_CL.ts
+++ b/src/qt/locale/bitcoin_es_CL.ts
@@ -7,7 +7,7 @@
     </message>
     <message>
         <source>Create a new address</source>
-        <translation>Crea una nueva direCrea una nueva direccióncción</translation>
+        <translation>Crea una nueva dirección</translation>
     </message>
     <message>
         <source>&amp;New</source>
@@ -45,6 +45,22 @@
         <source>&amp;Delete</source>
         <translation>&amp;Borrar</translation>
     </message>
+    <message>
+        <source>Choose the address to send coins to</source>
+        <translation>Selecciona la direccion para enviar coins</translation>
+    </message>
+    <message>
+        <source>Choose the address to receive coins with</source>
+        <translation>Selecciona la dirección para recibir coins</translation>
+    </message>
+    <message>
+        <source>Sending addresses</source>
+        <translation>Dirección de envio</translation>
+    </message>
+    <message>
+        <source>Receiving addresses</source>
+        <translation>Dirección para recibir</translation>
+    </message>
     <message>
         <source>Copy &amp;Label</source>
         <translation>Copia &amp;etiqueta</translation>
@@ -53,10 +69,18 @@
         <source>&amp;Edit</source>
         <translation>&amp;Editar</translation>
     </message>
+    <message>
+        <source>Export Address List</source>
+        <translation>Exportar lista de direcciones</translation>
+    </message>
     <message>
         <source>Comma separated file (*.csv)</source>
         <translation>Archivos separados por coma (*.csv)</translation>
     </message>
+    <message>
+        <source>Exporting Failed</source>
+        <translation>Exportado fallo</translation>
+    </message>
     </context>
 <context>
     <name>AddressTableModel</name>
@@ -225,6 +249,14 @@
         <source>&amp;Change Passphrase...</source>
         <translation>&amp;Cambiar la contraseña...</translation>
     </message>
+    <message>
+        <source>&amp;Sending addresses...</source>
+        <translation>Mandando direcciones</translation>
+    </message>
+    <message>
+        <source>&amp;Receiving addresses...</source>
+        <translation>Recibiendo direcciones</translation>
+    </message>
     <message>
         <source>Open &amp;URI...</source>
         <translation>Abrir y url...</translation>
@@ -257,6 +289,10 @@
         <source>Open debugging and diagnostic console</source>
         <translation>Abre consola de depuración y diagnóstico</translation>
     </message>
+    <message>
+        <source>&amp;Verify message...</source>
+        <translation>Verificar mensaje....</translation>
+    </message>
     <message>
         <source>Bitcoin</source>
         <translation>Bitcoin</translation>
@@ -273,6 +309,10 @@
         <source>&amp;Receive</source>
         <translation>y recibir</translation>
     </message>
+    <message>
+        <source>Show information about Bitcoin Core</source>
+        <translation>Mostrar informacion sobre Bitcoin Core</translation>
+    </message>
     <message>
         <source>&amp;Show / Hide</source>
         <translation>&amp;Mostrar/Ocultar</translation>
@@ -301,6 +341,18 @@
         <source>Bitcoin Core</source>
         <translation>bitcoin core</translation>
     </message>
+    <message>
+        <source>Request payments (generates QR codes and bitcoin: URIs)</source>
+        <translation>Pide pagos (genera codigos QR and bitcoin: URls)</translation>
+    </message>
+    <message>
+        <source>&amp;About Bitcoin Core</source>
+        <translation>&amp;Sobre Bitcoin Core</translation>
+    </message>
+    <message>
+        <source>Modify configuration options for Bitcoin Core</source>
+        <translation>Modifica las opciones para BitCoin Core</translation>
+    </message>
     <message>
         <source>%1 and %2</source>
         <translation>%1 y %2</translation>
@@ -359,6 +411,11 @@
         <source>Priority:</source>
         <translation>prioridad:</translation>
     </message>
+    <message>
+        <source>Fee:</source>
+        <translation>comisión:
+</translation>
+    </message>
     <message>
         <source>Amount</source>
         <translation>Cantidad</translation>
@@ -367,6 +424,10 @@
         <source>Date</source>
         <translation>Fecha</translation>
     </message>
+    <message>
+        <source>Confirmations</source>
+        <translation>Confirmaciones</translation>
+    </message>
     <message>
         <source>Confirmed</source>
         <translation>Confirmado</translation>
@@ -387,10 +448,26 @@
         <source>Copy amount</source>
         <translation>Copiar Cantidad</translation>
     </message>
+    <message>
+        <source>Copy quantity</source>
+        <translation>copiar cantidad</translation>
+    </message>
+    <message>
+        <source>Copy fee</source>
+        <translation>copiar comision</translation>
+    </message>
+    <message>
+        <source>Copy bytes</source>
+        <translation>copiar bytes</translation>
+    </message>
     <message>
         <source>medium</source>
         <translation>medio</translation>
     </message>
+    <message>
+        <source>low</source>
+        <translation>bajo</translation>
+    </message>
     <message>
         <source>yes</source>
         <translation>si</translation>
@@ -468,6 +545,10 @@
         <source>version</source>
         <translation>versión</translation>
     </message>
+    <message>
+        <source>Command-line options</source>
+        <translation>opciones de linea de comando</translation>
+    </message>
     <message>
         <source>Usage:</source>
         <translation>Uso:</translation>
@@ -793,10 +874,23 @@
         <source>Priority:</source>
         <translation>prioridad:</translation>
     </message>
+    <message>
+        <source>Fee:</source>
+        <translation>comisión:
+</translation>
+    </message>
     <message>
         <source>Transaction Fee:</source>
         <translation>Comisión transacción:</translation>
     </message>
+    <message>
+        <source>normal</source>
+        <translation>normal</translation>
+    </message>
+    <message>
+        <source>fast</source>
+        <translation>rapido</translation>
+    </message>
     <message>
         <source>Send to multiple recipients at once</source>
         <translation>Enviar a múltiples destinatarios</translation>
@@ -825,10 +919,22 @@
         <source>Confirm send coins</source>
         <translation>Confirmar el envio de monedas</translation>
     </message>
+    <message>
+        <source>Copy quantity</source>
+        <translation>copiar cantidad</translation>
+    </message>
     <message>
         <source>Copy amount</source>
         <translation>Copiar Cantidad</translation>
     </message>
+    <message>
+        <source>Copy fee</source>
+        <translation>copiar comision</translation>
+    </message>
+    <message>
+        <source>Copy bytes</source>
+        <translation>copiar bytes</translation>
+    </message>
     <message>
         <source>The amount to pay must be larger than 0.</source>
         <translation>La cantidad por pagar tiene que ser mayor 0.</translation>
@@ -1113,10 +1219,18 @@
         <source>Generated but not accepted</source>
         <translation>Generado pero no acceptado</translation>
     </message>
+    <message>
+        <source>Offline</source>
+        <translation>fuera de linea</translation>
+    </message>
     <message>
         <source>Label</source>
         <translation>Etiqueta</translation>
     </message>
+    <message>
+        <source>Unconfirmed</source>
+        <translation>no confirmado</translation>
+    </message>
     <message>
         <source>Received with</source>
         <translation>Recibido con</translation>
@@ -1236,6 +1350,10 @@
         <source>Show transaction details</source>
         <translation>Mostrar detalles de la transacción</translation>
     </message>
+    <message>
+        <source>Exporting Failed</source>
+        <translation>Exportado fallo</translation>
+    </message>
     <message>
         <source>Comma separated file (*.csv)</source>
         <translation>Archivos separados por coma (*.csv)</translation>
diff --git a/src/qt/locale/bitcoin_es_CO.ts b/src/qt/locale/bitcoin_es_CO.ts
new file mode 100644
index 0000000000000..ea0664636d2d6
--- /dev/null
+++ b/src/qt/locale/bitcoin_es_CO.ts
@@ -0,0 +1,542 @@
+<TS language="es_CO" version="2.1">
+<context>
+    <name>AddressBookPage</name>
+    <message>
+        <source>Right-click to edit address or label</source>
+        <translation>Click derecho para editar la dirección o etiqueta</translation>
+    </message>
+    <message>
+        <source>Create a new address</source>
+        <translation>Crear una nueva dirección</translation>
+    </message>
+    <message>
+        <source>&amp;New</source>
+        <translation>&amp;Nuevo</translation>
+    </message>
+    <message>
+        <source>Copy the currently selected address to the system clipboard</source>
+        <translation>Copiar la dirección actualmente seleccionada al sistema de portapapeles</translation>
+    </message>
+    <message>
+        <source>&amp;Copy</source>
+        <translation>&amp;Copiar</translation>
+    </message>
+    <message>
+        <source>C&amp;lose</source>
+        <translation>C&amp;errar</translation>
+    </message>
+    <message>
+        <source>&amp;Copy Address</source>
+        <translation>&amp;Copiar dirección</translation>
+    </message>
+    <message>
+        <source>Delete the currently selected address from the list</source>
+        <translation>Borrar la dirección actualmente seleccionada de la lista</translation>
+    </message>
+    <message>
+        <source>&amp;Export</source>
+        <translation>&amp;Exportar</translation>
+    </message>
+    <message>
+        <source>&amp;Delete</source>
+        <translation>&amp;Borrar</translation>
+    </message>
+    <message>
+        <source>Choose the address to send coins to</source>
+        <translation>Escoje la dirección para enviar monedas a</translation>
+    </message>
+    <message>
+        <source>Choose the address to receive coins with</source>
+        <translation>Escoje la dirección para recibir monedas con</translation>
+    </message>
+    <message>
+        <source>C&amp;hoose</source>
+        <translation>E&amp;scojer</translation>
+    </message>
+    <message>
+        <source>Sending addresses</source>
+        <translation>Enviando direcciones</translation>
+    </message>
+    <message>
+        <source>Receiving addresses</source>
+        <translation>Recibiendo direcciones</translation>
+    </message>
+    <message>
+        <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source>
+        <translation>
+Estas son las direcciones de Bitcoin para enviar pagos . Siempre verifique la cantidad y la dirección de recepción antes de enviar monedas.</translation>
+    </message>
+    <message>
+        <source>These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source>
+        <translation>Estas son las direcciones de Bitcoin para recibir los pagos . Se recomienda el uso de una nueva dirección de recepción para cada transacción.</translation>
+    </message>
+    <message>
+        <source>Copy &amp;Label</source>
+        <translation>Copiar &amp;Etiqueta</translation>
+    </message>
+    <message>
+        <source>&amp;Edit</source>
+        <translation>&amp;Editar</translation>
+    </message>
+    <message>
+        <source>Export Address List</source>
+        <translation>Exportar lista de direcciones</translation>
+    </message>
+    <message>
+        <source>Comma separated file (*.csv)</source>
+        <translation>Coma(,) archivo separado (*.csv)</translation>
+    </message>
+    <message>
+        <source>Exporting Failed</source>
+        <translation>Exportación Fallida</translation>
+    </message>
+    <message>
+        <source>There was an error trying to save the address list to %1. Please try again.</source>
+        <translation>Hubo un error intentando guardar la lista de direcciones a %1 Inténtelo otravez</translation>
+    </message>
+</context>
+<context>
+    <name>AddressTableModel</name>
+    <message>
+        <source>Label</source>
+        <translation>Etiqueta</translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation>Dirección</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(ninguna dirección)</translation>
+    </message>
+</context>
+<context>
+    <name>AskPassphraseDialog</name>
+    <message>
+        <source>Passphrase Dialog</source>
+        <translation>Diálogo de contraseña</translation>
+    </message>
+    <message>
+        <source>Enter passphrase</source>
+        <translation>Poner contraseña</translation>
+    </message>
+    <message>
+        <source>New passphrase</source>
+        <translation>Nueva contraseña</translation>
+    </message>
+    <message>
+        <source>Repeat new passphrase</source>
+        <translation>Repetir nueva contraseña</translation>
+    </message>
+    <message>
+        <source>Encrypt wallet</source>
+        <translation>Billetera Encriptada</translation>
+    </message>
+    <message>
+        <source>This operation needs your wallet passphrase to unlock the wallet.</source>
+        <translation>Esta operación necesita tu contraseña de la billetera para desbloquear la billetera</translation>
+    </message>
+    <message>
+        <source>Unlock wallet</source>
+        <translation>Billetera Desbloqueada</translation>
+    </message>
+    <message>
+        <source>This operation needs your wallet passphrase to decrypt the wallet.</source>
+        <translation>Esta operación necesita tu contraseña de la billetera para desencriptar la billetera.</translation>
+    </message>
+    <message>
+        <source>Decrypt wallet</source>
+        <translation>Billetera Desencriptada</translation>
+    </message>
+    <message>
+        <source>Change passphrase</source>
+        <translation>Cambiar contraseña</translation>
+    </message>
+    <message>
+        <source>Confirm wallet encryption</source>
+        <translation>Confirmar encriptación de la billetera</translation>
+    </message>
+    <message>
+        <source>Warning: If you encrypt your wallet and lose your passphrase, you will &lt;b&gt;LOSE ALL OF YOUR BITCOINS&lt;/b&gt;!</source>
+        <translation>Precaución: Si tú has encriptado tu billetera y has perdido tu contraseña, usted &lt;b&gt;PERDERÁ TODOS TUS BITCOINS&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <source>Are you sure you wish to encrypt your wallet?</source>
+        <translation>Estas seguro de que deseas encriptar tu billetera?</translation>
+    </message>
+    <message>
+        <source>Bitcoin Core will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source>
+        <translation>Bitcoin Core se cerrará ahora para finalizar el proceso de encriptación. Recuerda que encriptando tu billetera no protegera por completo tus bitcoins desde robos por malware que infectan tu computadora.</translation>
+    </message>
+    <message>
+        <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source>
+        <translation>IMPORTANTE : Cualquier copias de seguridad anteriores que han hecho de su archivo cartera debe ser reemplazado por el archivo de la carpeta recién generado , encriptado . Por razones de seguridad , las copias de seguridad anteriores del archivo cartera sin cifrar se vuelven inútiles , tan pronto como empiece a utilizar el nuevo , carpeta cifrada .</translation>
+    </message>
+    <message>
+        <source>Warning: The Caps Lock key is on!</source>
+        <translation>Ojo: El bloqueo de MAYUSCULAS esta activado!</translation>
+    </message>
+    <message>
+        <source>Wallet encrypted</source>
+        <translation>Billetera encriptada</translation>
+    </message>
+    <message>
+        <source>Enter the new passphrase to the wallet.&lt;br/&gt;Please use a passphrase of &lt;b&gt;ten or more random characters&lt;/b&gt;, or &lt;b&gt;eight or more words&lt;/b&gt;.</source>
+        <translation>Poner la nueva contraseña a la billetera.&lt;br/&gt;Por favor usa una contraseña de &lt;b&gt;diez o más palabras aleatorias&lt;/b&gt;, o &lt;b&gt;nueve o más letras&lt;/b&gt;.</translation>
+    </message>
+    <message>
+        <source>Enter the old passphrase and new passphrase to the wallet.</source>
+        <translation>Poner la antigua contraseña y nueva contraseña a la billetera.</translation>
+    </message>
+    <message>
+        <source>Wallet encryption failed</source>
+        <translation>Encriptación de la billetera fallida</translation>
+    </message>
+    <message>
+        <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
+        <translation>Encriptación de la billetera fallida por un error interno. Tu billetera no ha sido encriptada.</translation>
+    </message>
+    <message>
+        <source>Wallet unlock failed</source>
+        <translation>Falló el desbloqueo de la billetera</translation>
+    </message>
+    <message>
+        <source>The passphrase entered for the wallet decryption was incorrect.</source>
+        <translation>La contraseña tecleada de la desencriptación de la billetera ha sido incorrecta.</translation>
+    </message>
+    <message>
+        <source>Wallet decryption failed</source>
+        <translation>Encriptación de la billetera fallida</translation>
+    </message>
+    <message>
+        <source>Wallet passphrase was successfully changed.</source>
+        <translation>La contraseña de la billetera a sido cambiada exitosamente.</translation>
+    </message>
+</context>
+<context>
+    <name>BanTableModel</name>
+    </context>
+<context>
+    <name>BitcoinGUI</name>
+    <message>
+        <source>Synchronizing with network...</source>
+        <translation>Sincronizando con la red...</translation>
+    </message>
+    <message>
+        <source>Node</source>
+        <translation>Nodo</translation>
+    </message>
+    <message>
+        <source>Show general overview of wallet</source>
+        <translation>Mostrar vista general de la billetera</translation>
+    </message>
+    <message>
+        <source>&amp;Transactions</source>
+        <translation>&amp;Transacciones</translation>
+    </message>
+    <message>
+        <source>E&amp;xit</source>
+        <translation>S&amp;alir</translation>
+    </message>
+    <message>
+        <source>Quit application</source>
+        <translation>Salir de la aplicación</translation>
+    </message>
+    <message>
+        <source>About &amp;Qt</source>
+        <translation>Acerca de &amp;Qt</translation>
+    </message>
+    <message>
+        <source>Show information about Qt</source>
+        <translation>Mostrar información sobre Qt</translation>
+    </message>
+    <message>
+        <source>&amp;Options...</source>
+        <translation>&amp;Opciones</translation>
+    </message>
+    <message>
+        <source>&amp;Encrypt Wallet...</source>
+        <translation>&amp;Billetera Encriptada</translation>
+    </message>
+    <message>
+        <source>&amp;Backup Wallet...</source>
+        <translation>&amp;Billetera Copia de seguridad...</translation>
+    </message>
+    <message>
+        <source>&amp;Change Passphrase...</source>
+        <translation>&amp;Cambiar contraseña...</translation>
+    </message>
+    <message>
+        <source>&amp;Sending addresses...</source>
+        <translation>&amp;Enviando Direcciones...</translation>
+    </message>
+    <message>
+        <source>&amp;Receiving addresses...</source>
+        <translation>&amp;Recibiendo Direcciones...</translation>
+    </message>
+    <message>
+        <source>Open &amp;URI...</source>
+        <translation>Abrir &amp;URL...</translation>
+    </message>
+    <message>
+        <source>Bitcoin Core client</source>
+        <translation>Bitcoin Core cliente</translation>
+    </message>
+    <message>
+        <source>Importing blocks from disk...</source>
+        <translation>Importando bloques desde el disco...</translation>
+    </message>
+    <message>
+        <source>Send coins to a Bitcoin address</source>
+        <translation>Enviando monedas a una dirección de Bitcoin</translation>
+    </message>
+    <message>
+        <source>Change the passphrase used for wallet encryption</source>
+        <translation>Cambiar la contraseña usando la encriptación de la billetera</translation>
+    </message>
+    <message>
+        <source>&amp;Debug window</source>
+        <translation>&amp;Ventana desarrollador</translation>
+    </message>
+    <message>
+        <source>Open debugging and diagnostic console</source>
+        <translation>Abrir consola de diagnóstico y desarrollo</translation>
+    </message>
+    <message>
+        <source>&amp;Verify message...</source>
+        <translation>&amp;Verificar Mensaje...</translation>
+    </message>
+    <message>
+        <source>Bitcoin</source>
+        <translation>Bitcoin</translation>
+    </message>
+    <message>
+        <source>Wallet</source>
+        <translation>Billetera</translation>
+    </message>
+    <message>
+        <source>&amp;Send</source>
+        <translation>&amp;Enviar</translation>
+    </message>
+    <message>
+        <source>&amp;Receive</source>
+        <translation>&amp;Recibir</translation>
+    </message>
+    <message>
+        <source>Show information about Bitcoin Core</source>
+        <translation>Mostrar información sobre Bitcoin Core</translation>
+    </message>
+    <message>
+        <source>&amp;Show / Hide</source>
+        <translation>&amp;Mostrar / Ocultar</translation>
+    </message>
+    <message>
+        <source>Show or hide the main Window</source>
+        <translation>Mostrar u ocultar la Ventana Principal</translation>
+    </message>
+    <message>
+        <source>&amp;File</source>
+        <translation>&amp;Archivo</translation>
+    </message>
+    <message>
+        <source>&amp;Settings</source>
+        <translation>&amp;Configuraciones</translation>
+    </message>
+    <message>
+        <source>&amp;Help</source>
+        <translation>&amp;Ayuda</translation>
+    </message>
+    <message>
+        <source>Bitcoin Core</source>
+        <translation>Bitcoin Core</translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation>Error</translation>
+    </message>
+    </context>
+<context>
+    <name>ClientModel</name>
+    </context>
+<context>
+    <name>CoinControlDialog</name>
+    <message>
+        <source>(no label)</source>
+        <translation>(ninguna dirección)</translation>
+    </message>
+    </context>
+<context>
+    <name>EditAddressDialog</name>
+    </context>
+<context>
+    <name>FreespaceChecker</name>
+    </context>
+<context>
+    <name>HelpMessageDialog</name>
+    <message>
+        <source>Bitcoin Core</source>
+        <translation>Bitcoin Core</translation>
+    </message>
+    </context>
+<context>
+    <name>Intro</name>
+    <message>
+        <source>Bitcoin Core</source>
+        <translation>Bitcoin Core</translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation>Error</translation>
+    </message>
+    </context>
+<context>
+    <name>OpenURIDialog</name>
+    </context>
+<context>
+    <name>OptionsDialog</name>
+    </context>
+<context>
+    <name>OverviewPage</name>
+    </context>
+<context>
+    <name>PaymentServer</name>
+    </context>
+<context>
+    <name>PeerTableModel</name>
+    </context>
+<context>
+    <name>QObject</name>
+    </context>
+<context>
+    <name>QRImageWidget</name>
+    </context>
+<context>
+    <name>RPCConsole</name>
+    </context>
+<context>
+    <name>ReceiveCoinsDialog</name>
+    </context>
+<context>
+    <name>ReceiveRequestDialog</name>
+    <message>
+        <source>Address</source>
+        <translation>Dirección</translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation>Etiqueta</translation>
+    </message>
+    </context>
+<context>
+    <name>RecentRequestsTableModel</name>
+    <message>
+        <source>Label</source>
+        <translation>Etiqueta</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(ninguna dirección)</translation>
+    </message>
+    </context>
+<context>
+    <name>SendCoinsDialog</name>
+    <message>
+        <source>(no label)</source>
+        <translation>(ninguna dirección)</translation>
+    </message>
+    </context>
+<context>
+    <name>SendCoinsEntry</name>
+    </context>
+<context>
+    <name>ShutdownWindow</name>
+    </context>
+<context>
+    <name>SignVerifyMessageDialog</name>
+    </context>
+<context>
+    <name>SplashScreen</name>
+    <message>
+        <source>Bitcoin Core</source>
+        <translation>Bitcoin Core</translation>
+    </message>
+    </context>
+<context>
+    <name>TrafficGraphWidget</name>
+    </context>
+<context>
+    <name>TransactionDesc</name>
+    </context>
+<context>
+    <name>TransactionDescDialog</name>
+    </context>
+<context>
+    <name>TransactionTableModel</name>
+    <message>
+        <source>Label</source>
+        <translation>Etiqueta</translation>
+    </message>
+    </context>
+<context>
+    <name>TransactionView</name>
+    <message>
+        <source>Exporting Failed</source>
+        <translation>Exportación Fallida</translation>
+    </message>
+    <message>
+        <source>Comma separated file (*.csv)</source>
+        <translation>Coma(,) archivo separado (*.csv)</translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation>Etiqueta</translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation>Dirección</translation>
+    </message>
+    </context>
+<context>
+    <name>UnitDisplayStatusBarControl</name>
+    </context>
+<context>
+    <name>WalletFrame</name>
+    </context>
+<context>
+    <name>WalletModel</name>
+    </context>
+<context>
+    <name>WalletView</name>
+    <message>
+        <source>&amp;Export</source>
+        <translation>&amp;Exportar</translation>
+    </message>
+    </context>
+<context>
+    <name>bitcoin-core</name>
+    <message>
+        <source>Insufficient funds</source>
+        <translation>Fondos Insuficientes</translation>
+    </message>
+    <message>
+        <source>Loading wallet...</source>
+        <translation>Cargando billetera...</translation>
+    </message>
+    <message>
+        <source>Cannot write default address</source>
+        <translation>No se puede escribir la dirección por defecto</translation>
+    </message>
+    <message>
+        <source>Rescanning...</source>
+        <translation>Reescaneando</translation>
+    </message>
+    <message>
+        <source>Done loading</source>
+        <translation>Listo Cargando</translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation>Error</translation>
+    </message>
+</context>
+</TS>
\ No newline at end of file
diff --git a/src/qt/locale/bitcoin_es_DO.ts b/src/qt/locale/bitcoin_es_DO.ts
index 0463c0f6e1cdc..b4841ca9b8682 100644
--- a/src/qt/locale/bitcoin_es_DO.ts
+++ b/src/qt/locale/bitcoin_es_DO.ts
@@ -1075,10 +1075,6 @@
         <source>General</source>
         <translation>General</translation>
     </message>
-    <message>
-        <source>Using OpenSSL version</source>
-        <translation>Utilizando la versión OpenSSL</translation>
-    </message>
     <message>
         <source>Startup time</source>
         <translation>Hora de inicio</translation>
diff --git a/src/qt/locale/bitcoin_es_MX.ts b/src/qt/locale/bitcoin_es_MX.ts
index fa2b3c0623be3..b0dfa4ab7c54c 100644
--- a/src/qt/locale/bitcoin_es_MX.ts
+++ b/src/qt/locale/bitcoin_es_MX.ts
@@ -1,6 +1,10 @@
 <TS language="es_MX" version="2.1">
 <context>
     <name>AddressBookPage</name>
+    <message>
+        <source>Right-click to edit address or label</source>
+        <translation>Click derecho para editar tu dirección o etiqueta</translation>
+    </message>
     <message>
         <source>Create a new address</source>
         <translation>Crear una dirección nueva</translation>
@@ -345,6 +349,10 @@
         <source>&amp;About Bitcoin Core</source>
         <translation>Acerca de Bitcoin Core</translation>
     </message>
+    <message>
+        <source>Modify configuration options for Bitcoin Core</source>
+        <translation>Modificar las opciones de configuración de Bitcoin Core</translation>
+    </message>
     <message>
         <source>&amp;Command-line options</source>
         <translation>opciones de la &amp;Linea de comandos</translation>
@@ -353,6 +361,18 @@
         <source>Show the Bitcoin Core help message to get a list with possible Bitcoin command-line options</source>
         <translation>Mostrar mensaje de ayuda del nucleo de Bitcoin para optener una lista con los posibles comandos  de Bitcoin</translation>
     </message>
+    <message>
+        <source>Error</source>
+        <translation>Error</translation>
+    </message>
+    <message>
+        <source>Warning</source>
+        <translation>Aviso</translation>
+    </message>
+    <message>
+        <source>Information</source>
+        <translation>Información </translation>
+    </message>
     <message>
         <source>Up to date</source>
         <translation>Actualizado al dia </translation>
@@ -383,6 +403,10 @@
     </context>
 <context>
     <name>CoinControlDialog</name>
+    <message>
+        <source>Quantity:</source>
+        <translation>Cantidad</translation>
+    </message>
     <message>
         <source>Bytes:</source>
         <translation>Bytes:</translation>
@@ -399,6 +423,14 @@
         <source>Fee:</source>
         <translation>Cuota:</translation>
     </message>
+    <message>
+        <source>After Fee:</source>
+        <translation>Después de los cargos por comisión. </translation>
+    </message>
+    <message>
+        <source>Change:</source>
+        <translation>Cambio</translation>
+    </message>
     <message>
         <source>Amount</source>
         <translation>Monto</translation>
@@ -427,6 +459,10 @@
         <source>Copy amount</source>
         <translation>Copiar monto</translation>
     </message>
+    <message>
+        <source>Copy transaction ID</source>
+        <translation>Copiar identificación de la transacción. </translation>
+    </message>
     <message>
         <source>Copy quantity</source>
         <translation>Copiar cantidad</translation>
@@ -451,11 +487,31 @@
         <source>Copy change</source>
         <translation>Copiar cambio</translation>
     </message>
+    <message>
+        <source>low</source>
+        <translation>Bajo</translation>
+    </message>
+    <message>
+        <source>none</source>
+        <translation>Ninguno </translation>
+    </message>
+    <message>
+        <source>yes</source>
+        <translation>si</translation>
+    </message>
+    <message>
+        <source>no</source>
+        <translation>no</translation>
+    </message>
     <message>
         <source>(no label)</source>
         <translation>(sin etiqueta)</translation>
     </message>
-    </context>
+    <message>
+        <source>(change)</source>
+        <translation>cambio</translation>
+    </message>
+</context>
 <context>
     <name>EditAddressDialog</name>
     <message>
@@ -501,6 +557,10 @@
 </context>
 <context>
     <name>FreespaceChecker</name>
+    <message>
+        <source>name</source>
+        <translation>nombre</translation>
+    </message>
     </context>
 <context>
     <name>HelpMessageDialog</name>
@@ -539,6 +599,10 @@
         <source>Bitcoin Core</source>
         <translation>nucleo Bitcoin</translation>
     </message>
+    <message>
+        <source>Error</source>
+        <translation>Error</translation>
+    </message>
     </context>
 <context>
     <name>OpenURIDialog</name>
@@ -557,6 +621,10 @@
         <source>W&amp;allet</source>
         <translation>Cartera</translation>
     </message>
+    <message>
+        <source>none</source>
+        <translation>Ninguno </translation>
+    </message>
     </context>
 <context>
     <name>OverviewPage</name>
@@ -675,6 +743,10 @@
         <source>Send Coins</source>
         <translation>Enviar monedas</translation>
     </message>
+    <message>
+        <source>Quantity:</source>
+        <translation>Cantidad</translation>
+    </message>
     <message>
         <source>Bytes:</source>
         <translation>Bytes:</translation>
@@ -691,6 +763,14 @@
         <source>Fee:</source>
         <translation>Cuota:</translation>
     </message>
+    <message>
+        <source>After Fee:</source>
+        <translation>Después de los cargos por comisión. </translation>
+    </message>
+    <message>
+        <source>Change:</source>
+        <translation>Cambio</translation>
+    </message>
     <message>
         <source>fast</source>
         <translation>rápido</translation>
@@ -1062,6 +1142,10 @@
         <source>Copy amount</source>
         <translation>copiar monto</translation>
     </message>
+    <message>
+        <source>Copy transaction ID</source>
+        <translation>Copiar identificación de la transacción. </translation>
+    </message>
     <message>
         <source>Edit label</source>
         <translation>Editar capa </translation>
@@ -1177,6 +1261,14 @@
         <source>Wallet options:</source>
         <translation>Opciones de cartera:</translation>
     </message>
+    <message>
+        <source>Information</source>
+        <translation>Información </translation>
+    </message>
+    <message>
+        <source>Warning</source>
+        <translation>Aviso</translation>
+    </message>
     <message>
         <source>Loading addresses...</source>
         <translation>Cargando direcciones...</translation>
@@ -1193,5 +1285,9 @@
         <source>Done loading</source>
         <translation>Carga completa</translation>
     </message>
-    </context>
+    <message>
+        <source>Error</source>
+        <translation>Error</translation>
+    </message>
+</context>
 </TS>
\ No newline at end of file
diff --git a/src/qt/locale/bitcoin_et.ts b/src/qt/locale/bitcoin_et.ts
index 945e4cfa5812c..089f01035d89d 100644
--- a/src/qt/locale/bitcoin_et.ts
+++ b/src/qt/locale/bitcoin_et.ts
@@ -829,10 +829,6 @@
         <source>General</source>
         <translation>Üldine</translation>
     </message>
-    <message>
-        <source>Using OpenSSL version</source>
-        <translation>Kasutan OpenSSL versiooni</translation>
-    </message>
     <message>
         <source>Startup time</source>
         <translation>Käivitamise hetk</translation>
diff --git a/src/qt/locale/bitcoin_fa.ts b/src/qt/locale/bitcoin_fa.ts
index 7ab3b77da3032..02c216765ce83 100644
--- a/src/qt/locale/bitcoin_fa.ts
+++ b/src/qt/locale/bitcoin_fa.ts
@@ -999,10 +999,6 @@
         <source>Debug window</source>
         <translation>پنجرهٔ اشکالزدایی</translation>
     </message>
-    <message>
-        <source>Using OpenSSL version</source>
-        <translation>نسخهٔ OpenSSL استفاده شده</translation>
-    </message>
     <message>
         <source>Startup time</source>
         <translation>زمان آغاز به کار</translation>
diff --git a/src/qt/locale/bitcoin_fi.ts b/src/qt/locale/bitcoin_fi.ts
index 57987b26ec21b..0fb6aebb9fe9a 100644
--- a/src/qt/locale/bitcoin_fi.ts
+++ b/src/qt/locale/bitcoin_fi.ts
@@ -1473,10 +1473,6 @@
         <source>General</source>
         <translation>Yleinen</translation>
     </message>
-    <message>
-        <source>Using OpenSSL version</source>
-        <translation>Käytössä oleva OpenSSL-versio</translation>
-    </message>
     <message>
         <source>Using BerkeleyDB version</source>
         <translation>Käyttää BerkeleyDB-versiota</translation>
@@ -2001,6 +1997,10 @@
         <source>Custom:</source>
         <translation>Muokattu:</translation>
     </message>
+    <message>
+        <source>(Smart fee not initialized yet. This usually takes a few blocks...)</source>
+        <translation>(Älykästä rahansiirtokulua ei ole vielä alustettu. Tähän kuluu yleensä aikaa muutaman lohkon verran...)</translation>
+    </message>
     <message>
         <source>Confirmation time:</source>
         <translation>Vahvistusaika:</translation>
@@ -2907,10 +2907,38 @@
         <source>If &lt;category&gt; is not supplied or if &lt;category&gt; = 1, output all debugging information.</source>
         <translation>Jos &lt;category&gt; on toimittamatta tai jos &lt;category&gt; = 1, tulosta kaikki debug-tieto.</translation>
     </message>
+    <message>
+        <source>Please check that your computer's date and time are correct! If your clock is wrong Bitcoin Core will not work properly.</source>
+        <translation>Tarkistathan että tietokoneesi päivämäärä ja kellonaika ovat oikeassa! Jos kellosi on väärässä, Bitcoin Core ei toimi oikein.</translation>
+    </message>
+    <message>
+        <source>Prune configured below the minimum of %d MiB.  Please use a higher number.</source>
+        <translation>Karsinta konfiguroitu alle minimin %d MiB. Käytä surempaa numeroa.</translation>
+    </message>
+    <message>
+        <source>Prune: last wallet synchronisation goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of pruned node)</source>
+        <translation>Karsinta: viime lompakon synkronisointi menee karsitun datan taakse. Sinun tarvitsee ajaa -reindex (lataa koko lohkoketju uudelleen tapauksessa jossa karsiva noodi)</translation>
+    </message>
+    <message>
+        <source>Reduce storage requirements by pruning (deleting) old blocks. This mode is incompatible with -txindex and -rescan. Warning: Reverting this setting requires re-downloading the entire blockchain. (default: 0 = disable pruning blocks, &gt;%u = target size in MiB to use for block files)</source>
+        <translation>Vähennä levytilan tarvetta karsimalla (poistamalla) vanhoja lohkoja. Tämä tila ei ole yhteensopiva -txindex ja -rescan -parametrien kanssa. Varoitus: Tämän asetuksen peruutus vaatii koko lohkoketjun uudelleenlataamisen. (oletus: 0 = poista karsinta käytöstä, &gt;%u = kohdekoko muodossa MiB jota käytetään lohkotiedostoille) </translation>
+    </message>
+    <message>
+        <source>Rescans are not possible in pruned mode. You will need to use -reindex which will download the whole blockchain again.</source>
+        <translation>Uudelleenskannaukset eivät ole mahdollisia karsivassa tilassa. Sinun täytyy käyttää -reindex joka lataa koko lohkoketjun uudelleen.</translation>
+    </message>
     <message>
         <source>Error: A fatal internal error occurred, see debug.log for details</source>
         <translation>Virhe: Kriittinen sisäinen virhe kohdattiin, katso debug.log lisätietoja varten</translation>
     </message>
+    <message>
+        <source>Fee (in %s/kB) to add to transactions you send (default: %s)</source>
+        <translation>Kulu (muodossa %s/kB) joka lisätään rahansiirtoihin joita lähetät (oletus: %s)</translation>
+    </message>
+    <message>
+        <source>Pruning blockstore...</source>
+        <translation>Karsitaan lohkovarastoa...</translation>
+    </message>
     <message>
         <source>Run in the background as a daemon and accept commands</source>
         <translation>Aja taustalla daemonina ja hyväksy komennot</translation>
@@ -2923,6 +2951,10 @@
         <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
         <translation>Hyväksy yhteyksiä ulkopuolelta (vakioasetus: 1 jos -proxy tai -connect ei määritelty)</translation>
     </message>
+    <message>
+        <source>-fallbackfee is set very high! This is the transaction fee you may pay when fee estimates are not available.</source>
+        <translation>-fallbackfee on asetettu erittäin suureksi! Tämä on rahansiirtokulu jonka voit maksaa kun arvioitu rahansirtokulu ei ole saatavilla.</translation>
+    </message>
     <message>
         <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source>
         <translation>Kytkeydy annettuun osoitteeseen ja pidä linja aina auki. Käytä [host]:portin merkintätapaa IPv6:lle.</translation>
@@ -2967,6 +2999,10 @@
         <source>Warning: wallet.dat corrupt, data salvaged! Original wallet.dat saved as wallet.{timestamp}.bak in %s; if your balance or transactions are incorrect you should restore from a backup.</source>
         <translation>Varoitus: wallet.dat -lompakkotiedosto on korruptoitunut, tiedot pelastettu. Alkuperäinen wallet.dat -lompakkotiedosto on tallennettu wallet.{timestamp}.bak kansioon %s; jos balanssisi tai siirtohistoria on virheellinen, sinun tulisi palauttaa lompakkotiedosto varmuuskopiosta.</translation>
     </message>
+    <message>
+        <source>Whitelist peers connecting from the given netmask or IP address. Can be specified multiple times.</source>
+        <translation>Salli vertaisten yhdistää annetusta verkkomaskista tai IP-osoitteesta. Voidaan määrittää useampia kertoja.</translation>
+    </message>
     <message>
         <source>-maxmempool must be at least %d MB</source>
         <translation>-maxmempool on oltava vähintään %d MB</translation>
@@ -3087,18 +3123,22 @@
         <source>Wallet options:</source>
         <translation>Lompakon valinnat:</translation>
     </message>
-    <message>
-        <source>Warning: This version is obsolete; upgrade required!</source>
-        <translation>Varoitus: Tämä versio on vanhentunut; päivittämistä vaaditaan!</translation>
-    </message>
     <message>
         <source>You need to rebuild the database using -reindex to change -txindex</source>
         <translation>Sinun tulee uudelleenrakentaa tietokanta käyttäen -reindex vaihtaen -txindex</translation>
     </message>
+    <message>
+        <source>Allow JSON-RPC connections from specified source. Valid for &lt;ip&gt; are a single IP (e.g. 1.2.3.4), a network/netmask (e.g. 1.2.3.4/255.255.255.0) or a network/CIDR (e.g. 1.2.3.4/24). This option can be specified multiple times</source>
+        <translation>Salli JSON-RPC-yhteydet määritetystä lähteestä. Kelvolliset arvot &lt;ip&gt; ovat yksittäinen IP (esim. 1.2.3.4), verkko/verkkomaski (esim. 1.2.3.4/255.255.255.0) tai verkko/luokaton reititys (esim. 1.2.3.4/24). Tätä valintatapaa voidaan käyttää useita kertoja</translation>
+    </message>
     <message>
         <source>Cannot obtain a lock on data directory %s. Bitcoin Core is probably already running.</source>
         <translation>Ei voida lukita data-hakemistoa %s. Bitcoin Core on luultavasti jo käynnissä.</translation>
     </message>
+    <message>
+        <source>Discover own IP addresses (default: 1 when listening and no -externalip or -proxy)</source>
+        <translation>Paljasta omat IP-osoitteet (oletus: 1 kun kuunnellaan ja -externalip tai -proxy ei ole käytössä)</translation>
+    </message>
     <message>
         <source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source>
         <translation>Aja komento kun olennainen hälytys vastaanotetaan tai nähdään todella pitkä haara (%s komennossa korvataan viestillä)</translation>
@@ -3163,6 +3203,10 @@
         <source>Invalid amount for -mintxfee=&lt;amount&gt;: '%s'</source>
         <translation>Virheellinen määrä -mintxfee=&lt;amount&gt;: '%s'</translation>
     </message>
+    <message>
+        <source>Keep at most &lt;n&gt; unconnectable transactions in memory (default: %u)</source>
+        <translation>Pidä enimmillään &lt;n&gt; yhdistämiskelvotonta rahansiirtoa muistissa (oletus: %u)</translation>
+    </message>
     <message>
         <source>Node relay options:</source>
         <translation>Välityssolmukohdan asetukset:</translation>
@@ -3283,10 +3327,22 @@
         <source>Error loading wallet.dat: Wallet corrupted</source>
         <translation>Virhe ladattaessa wallet.dat-tiedostoa: Lompakko vioittunut</translation>
     </message>
+    <message>
+        <source>-maxtxfee is set very high! Fees this large could be paid on a single transaction.</source>
+        <translation>-maxtxfee on asetettu erittäin suureksi! Tämänkokoisia kuluja saatetaan maksaa yhdessä rahansiirrossa.</translation>
+    </message>
+    <message>
+        <source>-paytxfee is set very high! This is the transaction fee you will pay if you send a transaction.</source>
+        <translation>-paytxfee on asetettu erittäin suureksi! Tämä on rahansiirtokulu, jonka maksat, mikäli lähetät rahansiirron.</translation>
+    </message>
     <message>
         <source>Do not keep transactions in the mempool longer than &lt;n&gt; hours (default: %u)</source>
         <translation>Älä pidä rahansiirtoja muistivarannoissa kauemmin kuin &lt;n&gt; tuntia (oletus: %u)</translation>
     </message>
+    <message>
+        <source>Error reading wallet.dat! All keys read correctly, but transaction data or address book entries might be missing or incorrect.</source>
+        <translation>Virhe lukiessa wallet.dat-tiedostoa! Kaikki avaimet luettiin onnistuneesti, mutta rahansiirtotiedot tai osoitekirjan sisältö saattavat olla muuttuneita tai vääriä.</translation>
+    </message>
     <message>
         <source>How thorough the block verification of -checkblocks is (0-4, default: %u)</source>
         <translation>Kuinka läpikäyvä lohkojen -checkblocks -todennus on (0-4, oletus: %u)</translation>
@@ -3299,6 +3355,10 @@
         <source>(default: %s)</source>
         <translation>(oletus: %s)</translation>
     </message>
+    <message>
+        <source>Always query for peer addresses via DNS lookup (default: %u)</source>
+        <translation>Pyydä vertaisten osoitteita aina DNS-kyselyjen avulla (oletus: %u)</translation>
+    </message>
     <message>
         <source>Error loading wallet.dat</source>
         <translation>Virhe ladattaessa wallet.dat-tiedostoa</translation>
@@ -3327,6 +3387,10 @@
         <source>Listen for connections on &lt;port&gt; (default: %u or testnet: %u)</source>
         <translation>Kuuntele yhteyksiä portissa &lt;port&gt; (oletus: %u tai testnet: %u)</translation>
     </message>
+    <message>
+        <source>Maintain at most &lt;n&gt; connections to peers (default: %u)</source>
+        <translation>Ylläpidä enimmillään &lt;n&gt; yhteyttä vertaisiin (oletus: %u)</translation>
+    </message>
     <message>
         <source>Make the wallet broadcast transactions</source>
         <translation>Aseta lompakko kuuluttamaan rahansiirtoja</translation>
@@ -3339,6 +3403,10 @@
         <source>Maximum per-connection send buffer, &lt;n&gt;*1000 bytes (default: %u)</source>
         <translation>Maksimi yhteyttä kohden käytettävä lähetyspuskurin koko, &lt;n&gt;*1000 tavua (oletus: %u)</translation>
     </message>
+    <message>
+        <source>Prepend debug output with timestamp (default: %u)</source>
+        <translation>Lisää debug-tietojen alkuun aikaleimat (oletus: %u)</translation>
+    </message>
     <message>
         <source>Relay and mine data carrier transactions (default: %u)</source>
         <translation>Välitä ja louhi dataa kantavia rahansiirtoja (oletus: %u)</translation>
@@ -3363,6 +3431,10 @@
         <source>Specify configuration file (default: %s)</source>
         <translation>Määritä asetustiedosto (oletus: %s)</translation>
     </message>
+    <message>
+        <source>Specify connection timeout in milliseconds (minimum: 1, default: %d)</source>
+        <translation>Määritä yhteyden aikakatkaisu millisekunneissa (minimi: 1, oletus: %d)</translation>
+    </message>
     <message>
         <source>Specify pid file (default: %s)</source>
         <translation>Määritä pid-tiedosto (oletus: %s)</translation>
@@ -3371,6 +3443,10 @@
         <source>Spend unconfirmed change when sending transactions (default: %u)</source>
         <translation>Käytä vahvistamattomia vaihtorahoja lähetettäessä rahansiirtoja (oletus: %u)</translation>
     </message>
+    <message>
+        <source>Threshold for disconnecting misbehaving peers (default: %u)</source>
+        <translation>Aikaväli sopimattomien vertaisten yhteyksien katkaisuun (oletus: %u)</translation>
+    </message>
     <message>
         <source>Unknown network specified in -onlynet: '%s'</source>
         <translation>Tuntematon verkko -onlynet parametrina: '%s'</translation>
diff --git a/src/qt/locale/bitcoin_fil.ts b/src/qt/locale/bitcoin_fil.ts
new file mode 100644
index 0000000000000..fba823837112b
--- /dev/null
+++ b/src/qt/locale/bitcoin_fil.ts
@@ -0,0 +1,157 @@
+<TS language="fil" version="2.1">
+<context>
+    <name>AddressBookPage</name>
+    <message>
+        <source>Create a new address</source>
+        <translation>Gumawa ng bagong address</translation>
+    </message>
+    <message>
+        <source>Copy the currently selected address to the system clipboard</source>
+        <translation>Kopyahin ang napiling tahanan sa clipboard</translation>
+    </message>
+    <message>
+        <source>&amp;Copy</source>
+        <translation>Kumopya</translation>
+    </message>
+    <message>
+        <source>C&amp;lose</source>
+        <translation>Isarado</translation>
+    </message>
+    <message>
+        <source>&amp;Copy Address</source>
+        <translation>Tumulad ng kinatatahanan</translation>
+    </message>
+    <message>
+        <source>Delete the currently selected address from the list</source>
+        <translation>Alisin ang napiling address sa pagpipilian</translation>
+    </message>
+    <message>
+        <source>Choose the address to send coins to</source>
+        <translation>Pumili ng pagpapadalahang address</translation>
+    </message>
+    <message>
+        <source>Choose the address to receive coins with</source>
+        <translation>Piliin ang address ng nagpadala</translation>
+    </message>
+    <message>
+        <source>C&amp;hoose</source>
+        <translation>Piliin</translation>
+    </message>
+    <message>
+        <source>Sending addresses</source>
+        <translation>Address pagpapadala</translation>
+    </message>
+    <message>
+        <source>Receiving addresses</source>
+        <translation>Address bilang pagtanggap</translation>
+    </message>
+    </context>
+<context>
+    <name>AddressTableModel</name>
+    </context>
+<context>
+    <name>AskPassphraseDialog</name>
+    </context>
+<context>
+    <name>BanTableModel</name>
+    </context>
+<context>
+    <name>BitcoinGUI</name>
+    </context>
+<context>
+    <name>ClientModel</name>
+    </context>
+<context>
+    <name>CoinControlDialog</name>
+    </context>
+<context>
+    <name>EditAddressDialog</name>
+    </context>
+<context>
+    <name>FreespaceChecker</name>
+    </context>
+<context>
+    <name>HelpMessageDialog</name>
+    </context>
+<context>
+    <name>Intro</name>
+    </context>
+<context>
+    <name>OpenURIDialog</name>
+    </context>
+<context>
+    <name>OptionsDialog</name>
+    </context>
+<context>
+    <name>OverviewPage</name>
+    </context>
+<context>
+    <name>PaymentServer</name>
+    </context>
+<context>
+    <name>PeerTableModel</name>
+    </context>
+<context>
+    <name>QObject</name>
+    </context>
+<context>
+    <name>QRImageWidget</name>
+    </context>
+<context>
+    <name>RPCConsole</name>
+    </context>
+<context>
+    <name>ReceiveCoinsDialog</name>
+    </context>
+<context>
+    <name>ReceiveRequestDialog</name>
+    </context>
+<context>
+    <name>RecentRequestsTableModel</name>
+    </context>
+<context>
+    <name>SendCoinsDialog</name>
+    </context>
+<context>
+    <name>SendCoinsEntry</name>
+    </context>
+<context>
+    <name>ShutdownWindow</name>
+    </context>
+<context>
+    <name>SignVerifyMessageDialog</name>
+    </context>
+<context>
+    <name>SplashScreen</name>
+    </context>
+<context>
+    <name>TrafficGraphWidget</name>
+    </context>
+<context>
+    <name>TransactionDesc</name>
+    </context>
+<context>
+    <name>TransactionDescDialog</name>
+    </context>
+<context>
+    <name>TransactionTableModel</name>
+    </context>
+<context>
+    <name>TransactionView</name>
+    </context>
+<context>
+    <name>UnitDisplayStatusBarControl</name>
+    </context>
+<context>
+    <name>WalletFrame</name>
+    </context>
+<context>
+    <name>WalletModel</name>
+    </context>
+<context>
+    <name>WalletView</name>
+    </context>
+<context>
+    <name>bitcoin-core</name>
+    </context>
+</TS>
\ No newline at end of file
diff --git a/src/qt/locale/bitcoin_fr.ts b/src/qt/locale/bitcoin_fr.ts
index a0b9feb9adfa0..65808c77406b7 100644
--- a/src/qt/locale/bitcoin_fr.ts
+++ b/src/qt/locale/bitcoin_fr.ts
@@ -1244,7 +1244,7 @@
     </message>
     <message>
         <source>Mined balance that has not yet matured</source>
-        <translation>Le solde généré n'est pas encore mûr</translation>
+        <translation>Le solde miné n'est pas encore mûr</translation>
     </message>
     <message>
         <source>Balances</source>
@@ -1473,10 +1473,6 @@
         <source>General</source>
         <translation>Général</translation>
     </message>
-    <message>
-        <source>Using OpenSSL version</source>
-        <translation>Version d'OpenSSL utilisée</translation>
-    </message>
     <message>
         <source>Using BerkeleyDB version</source>
         <translation>Version BerkeleyDB utilisée</translation>
@@ -2979,6 +2975,18 @@
         <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
         <translation>Accepter les connexions entrantes (par défaut : 1 si aucun -proxy ou -connect )</translation>
     </message>
+    <message>
+        <source>-fallbackfee is set very high! This is the transaction fee you may pay when fee estimates are not available.</source>
+        <translation>La valeur -fallbackfee est très élevée ! Elle représente les frais de transaction que vous pourriez acquitter si aucune estimation de frais n'est proposée.</translation>
+    </message>
+    <message>
+        <source>A fee rate (in %s/kB) that will be used when fee estimation has insufficient data (default: %s)</source>
+        <translation>Un taux de frais (en %s/Ko) qui sera utilisé si l'estimation de frais ne possède pas suffisamment de données (par défaut : %s)</translation>
+    </message>
+    <message>
+        <source>Accept relayed transactions received from whitelisted peers even when not relaying transactions (default: %d)</source>
+        <translation>Accepter les transactions relayées reçues de pairs de la liste blanche même si le nœud ne relaie pas les transactions (par défaut : %d)</translation>
+    </message>
     <message>
         <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source>
         <translation>Se lier à l'adresse donnée et toujours l'écouter. Utilisez la notation [host]:port pour l'IPv6</translation>
@@ -3011,6 +3019,10 @@
         <source>Unable to bind to %s on this computer. Bitcoin Core is probably already running.</source>
         <translation>Impossible de se lier à %s sur cet ordinateur. Bitcoin Core fonctionne probablement déjà.</translation>
     </message>
+    <message>
+        <source>Unsupported argument -whitelistalwaysrelay ignored, use -whitelistrelay and/or -whitelistforcerelay.</source>
+        <translation>Argument non pris charge -whitelistalwaysrelay ignoré, utiliser -whitelistrelay et/ou -whitelistforcerelay.</translation>
+    </message>
     <message>
         <source>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</source>
         <translation>Utiliser l'UPnP pour mapper le port d'écoute (par défaut : 1 lors de l'écoute et pas de mandataire -proxy)</translation>
@@ -3027,6 +3039,10 @@
         <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source>
         <translation>Avertissement : le réseau ne semble pas totalement d'accord ! Quelques mineurs semblent éprouver des difficultés.</translation>
     </message>
+    <message>
+        <source>Warning: Unknown block versions being mined! It's possible unknown rules are in effect</source>
+        <translation>Avertissement : des versions de blocs inconnues sont minées ! Il est possible que des règles inconnues soient en vigeur</translation>
+    </message>
     <message>
         <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source>
         <translation>Avertissement : nous ne semblons pas être en accord complet avec nos pairs ! Vous pourriez avoir besoin d'effectuer une mise à niveau, ou d'autres nœuds du réseau pourraient avoir besoin d'effectuer une mise à niveau.</translation>
@@ -3047,6 +3063,10 @@
         <source>&lt;category&gt; can be:</source>
         <translation>&lt;category&gt; peut être :</translation>
     </message>
+    <message>
+        <source>Append comment to the user agent string</source>
+        <translation>Ajouter un commentaire à la chaîne d'agent utilisateur</translation>
+    </message>
     <message>
         <source>Block creation options:</source>
         <translation>Options de création de bloc :</translation>
@@ -3127,10 +3147,22 @@
         <source>Invalid -onion address: '%s'</source>
         <translation>Adresse -onion invalide : « %s »</translation>
     </message>
+    <message>
+        <source>Invalid amount for -fallbackfee=&lt;amount&gt;: '%s'</source>
+        <translation>Montant invalide pour -fallbackfee=&lt;amount&gt; : « %s »</translation>
+    </message>
     <message>
         <source>Keep the transaction memory pool below &lt;n&gt; megabytes (default: %u)</source>
         <translation>Garder la réserve de mémoire transactionnelle sous &lt;n&gt; mégaoctets (par défaut : %u)</translation>
     </message>
+    <message>
+        <source>Location of the auth cookie (default: data dir)</source>
+        <translation>Emplacement du fichier témoin auth (par défaut : data dir)</translation>
+    </message>
+    <message>
+        <source>Minimum bytes per sigop in transactions we relay and mine (default: %u)</source>
+        <translation>Octets minimaux par sigop dans les transactions que nous relayons et minons (par défaut : %u)</translation>
+    </message>
     <message>
         <source>Not enough file descriptors available.</source>
         <translation>Pas assez de descripteurs de fichiers proposés.</translation>
@@ -3139,6 +3171,10 @@
         <source>Only connect to nodes in network &lt;net&gt; (ipv4, ipv6 or onion)</source>
         <translation>Seulement se connecter aux nœuds du réseau &lt;net&gt; (IPv4, IPv6 ou oignon)</translation>
     </message>
+    <message>
+        <source>Print version and exit</source>
+        <translation>Imprimer la version et quitter</translation>
+    </message>
     <message>
         <source>Prune cannot be configured with a negative value.</source>
         <translation>L'élagage ne peut pas être configuré avec une valeur négative.</translation>
@@ -3195,10 +3231,6 @@
         <source>Wallet options:</source>
         <translation>Options du portefeuille :</translation>
     </message>
-    <message>
-        <source>Warning: This version is obsolete; upgrade required!</source>
-        <translation>Avertissement : cette version est obsolète. Une mise à niveau est exigée !</translation>
-    </message>
     <message>
         <source>You need to rebuild the database using -reindex to change -txindex</source>
         <translation>Vous devez reconstruire la base de données en utilisant -reindex afin de modifier -txindex</translation>
@@ -3295,10 +3327,6 @@
         <source>Activating best chain...</source>
         <translation>Activation de la meilleure chaîne...</translation>
     </message>
-    <message>
-        <source>Always relay transactions received from whitelisted peers (default: %d)</source>
-        <translation>Toujours relayer les transactions reçues des pairs de la liste blanche (par défaut : %d)</translation>
-    </message>
     <message>
         <source>Attempt to recover private keys from a corrupt wallet.dat on startup</source>
         <translation>Tenter de récupérer les clefs privées d'un wallet.dat corrompu lors du démarrage</translation>
@@ -3381,7 +3409,7 @@
     </message>
     <message>
         <source>Receive and display P2P network alerts (default: %u)</source>
-        <translation>Recevoir et afficher les alertes du réseau poste à poste (%u par défaut)</translation>
+        <translation>Recevoir et afficher les alertes du réseau poste à poste (par défaut : %u)</translation>
     </message>
     <message>
         <source>Reducing -maxconnections from %d to %d, because of system limitations.</source>
@@ -3463,6 +3491,10 @@
         <source>Warning</source>
         <translation>Avertissement</translation>
     </message>
+    <message>
+        <source>Warning: unknown new rules activated (versionbit %i)</source>
+        <translation>Avertissement : nouvelles règles inconnues activées (bit de version %i)</translation>
+    </message>
     <message>
         <source>Whether to operate in a blocks only mode (default: %u)</source>
         <translation>Faut-il fonctionner en mode blocs seulement (par défaut : %u)</translation>
diff --git a/src/qt/locale/bitcoin_fr_FR.ts b/src/qt/locale/bitcoin_fr_FR.ts
index df63243353931..9a2ac551c63eb 100644
--- a/src/qt/locale/bitcoin_fr_FR.ts
+++ b/src/qt/locale/bitcoin_fr_FR.ts
@@ -1,27 +1,104 @@
 <TS language="fr_FR" version="2.1">
 <context>
     <name>AddressBookPage</name>
+    <message>
+        <source>Right-click to edit address or label</source>
+        <translation>Double cliquez afin de modifier l'adresse ou l'étiquette</translation>
+    </message>
     <message>
         <source>Create a new address</source>
         <translation>Créer une nouvelle adresse</translation>
     </message>
+    <message>
+        <source>&amp;New</source>
+        <translation>&amp;Nouveau</translation>
+    </message>
     <message>
         <source>Copy the currently selected address to the system clipboard</source>
         <translation>Copier l'adresse surlignée dans votre presse-papiers</translation>
     </message>
+    <message>
+        <source>&amp;Copy</source>
+        <translation>&amp;Copie</translation>
+    </message>
+    <message>
+        <source>C&amp;lose</source>
+        <translation>F&amp;ermer</translation>
+    </message>
+    <message>
+        <source>&amp;Copy Address</source>
+        <translation>&amp;Adresse de copie</translation>
+    </message>
+    <message>
+        <source>Delete the currently selected address from the list</source>
+        <translation>Supprimer l'adresse sélectionnée de la liste</translation>
+    </message>
     <message>
         <source>Export the data in the current tab to a file</source>
         <translation>Exporter les données de l'onglet courant vers un fichier</translation>
     </message>
+    <message>
+        <source>&amp;Export</source>
+        <translation>&amp;Exporter...</translation>
+    </message>
     <message>
         <source>&amp;Delete</source>
         <translation>&amp;Supprimer</translation>
     </message>
+    <message>
+        <source>Choose the address to send coins to</source>
+        <translation>Choisissez une adresse où envoyer les bitcoins</translation>
+    </message>
+    <message>
+        <source>Choose the address to receive coins with</source>
+        <translation>Choisissez une adresse où recevoir les bitcoins</translation>
+    </message>
+    <message>
+        <source>C&amp;hoose</source>
+        <translation>C&amp;oisir</translation>
+    </message>
+    <message>
+        <source>Sending addresses</source>
+        <translation>Adresses d'envoi</translation>
+    </message>
+    <message>
+        <source>Receiving addresses</source>
+        <translation>Adresses de réception</translation>
+    </message>
+    <message>
+        <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source>
+        <translation>Voici vos adresses Bitcoin qui vous permettent d'envoyer des paiements.  Vérifiez toujours le montant et l'adresse de réception avant d'envoyer des pièces.</translation>
+    </message>
+    <message>
+        <source>These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source>
+        <translation>Voici vos adresses Bitcoin qui vous permettent de recevoir des paiements.  Il est recommandé d'utiliser une nouvelle adresse de réception pour chaque transaction</translation>
+    </message>
+    <message>
+        <source>Copy &amp;Label</source>
+        <translation>Copier &amp;Étiquette </translation>
+    </message>
+    <message>
+        <source>&amp;Edit</source>
+        <translation>&amp;Éditer </translation>
+    </message>
+    <message>
+        <source>Export Address List</source>
+        <translation>Exporter la liste d'adresses</translation>
+    </message>
     <message>
         <source>Comma separated file (*.csv)</source>
         <translation>Valeurs séparées par des virgules (*.csv)</translation>
     </message>
-    </context>
+    <message>
+        <source>Exporting Failed</source>
+        <translation>Échec de l'export</translation>
+    </message>
+    <message>
+        <source>There was an error trying to save the address list to %1. Please try again.</source>
+        <translation>Il y a eu une erreur durant la tentative de sauvegarde de la liste d’adresse vers %1.
+Réessayez.</translation>
+    </message>
+</context>
 <context>
     <name>AddressTableModel</name>
     <message>
@@ -39,6 +116,10 @@
 </context>
 <context>
     <name>AskPassphraseDialog</name>
+    <message>
+        <source>Passphrase Dialog</source>
+        <translation>Dialogue mot de passe</translation>
+    </message>
     <message>
         <source>Enter passphrase</source>
         <translation>Entrez la phrase de passe</translation>
@@ -79,10 +160,30 @@
         <source>Confirm wallet encryption</source>
         <translation>Confirmer le chiffrement du porte-monnaie</translation>
     </message>
+    <message>
+        <source>Warning: If you encrypt your wallet and lose your passphrase, you will &lt;b&gt;LOSE ALL OF YOUR BITCOINS&lt;/b&gt;!</source>
+        <translation>Attention: Si vous cryptez votre portefeuille et que vous perdez votre mot de passe vous &lt;b&gt; PERDREZ TOUS VOS BITCOINS&lt;/b&gt;!</translation>
+    </message>
+    <message>
+        <source>Are you sure you wish to encrypt your wallet?</source>
+        <translation>Êtes-vous sûr de de vouloir crypter votre portefeuille ? </translation>
+    </message>
+    <message>
+        <source>Bitcoin Core will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source>
+        <translation>Bitcoin Core fermera maintenant pour finir le processus de chiffrement. Rappelez-vous que crypter votre portefeuille ne protége pas totalement vos bitcoins d'être volé par un malware ayant infecté votre ordinateur. </translation>
+    </message>
+    <message>
+        <source>Warning: The Caps Lock key is on!</source>
+        <translation>Attention : La touche majuscule est enfoncé.</translation>
+    </message>
     <message>
         <source>Wallet encrypted</source>
         <translation>Porte-monnaie chiffré</translation>
     </message>
+    <message>
+        <source>Enter the old passphrase and new passphrase to the wallet.</source>
+        <translation>Entrez l'ancien mot de passe et le nouveau mot de passe pour le portefeuille</translation>
+    </message>
     <message>
         <source>Wallet encryption failed</source>
         <translation>Le chiffrement du porte-monnaie a échoué</translation>
@@ -107,12 +208,28 @@
         <source>Wallet decryption failed</source>
         <translation>Le décryptage du porte-monnaie a échoué</translation>
     </message>
-    </context>
+    <message>
+        <source>Wallet passphrase was successfully changed.</source>
+        <translation>Le changement du mot de passe du portefeuille à été effectué avec succès.</translation>
+    </message>
+</context>
 <context>
     <name>BanTableModel</name>
-    </context>
+    <message>
+        <source>IP/Netmask</source>
+        <translation>IP/Masque de sous réseau</translation>
+    </message>
+    <message>
+        <source>Banned Until</source>
+        <translation>Banni jusque </translation>
+    </message>
+</context>
 <context>
     <name>BitcoinGUI</name>
+    <message>
+        <source>Sign &amp;message...</source>
+        <translation>Signer &amp;message...</translation>
+    </message>
     <message>
         <source>Synchronizing with network...</source>
         <translation>Synchronisation avec le réseau...</translation>
@@ -121,6 +238,10 @@
         <source>&amp;Overview</source>
         <translation>&amp;Vue d'ensemble</translation>
     </message>
+    <message>
+        <source>Node</source>
+        <translation>Nœud</translation>
+    </message>
     <message>
         <source>Show general overview of wallet</source>
         <translation>Affiche une vue d'ensemble du porte-monnaie</translation>
@@ -153,6 +274,46 @@
         <source>&amp;Options...</source>
         <translation>&amp;Options...</translation>
     </message>
+    <message>
+        <source>&amp;Encrypt Wallet...</source>
+        <translation>&amp;Chiffrer le portefeuille </translation>
+    </message>
+    <message>
+        <source>&amp;Backup Wallet...</source>
+        <translation>&amp;Sauvegarder le portefeuille</translation>
+    </message>
+    <message>
+        <source>&amp;Change Passphrase...</source>
+        <translation>&amp;Modifier le mot de passe</translation>
+    </message>
+    <message>
+        <source>&amp;Sending addresses...</source>
+        <translation>&amp;Adresses d'envoi</translation>
+    </message>
+    <message>
+        <source>&amp;Receiving addresses...</source>
+        <translation>&amp;Adresses de réception</translation>
+    </message>
+    <message>
+        <source>Open &amp;URI...</source>
+        <translation>Ouvrir &amp;URI</translation>
+    </message>
+    <message>
+        <source>Bitcoin Core client</source>
+        <translation>Client Bitcoin Core</translation>
+    </message>
+    <message>
+        <source>Importing blocks from disk...</source>
+        <translation>Importer les blocs depuis le disque...</translation>
+    </message>
+    <message>
+        <source>Reindexing blocks on disk...</source>
+        <translation>Réindexer les blocs sur le disque...</translation>
+    </message>
+    <message>
+        <source>Send coins to a Bitcoin address</source>
+        <translation>Envoyer des pièces à une adresse Bitcoin</translation>
+    </message>
     <message>
         <source>Backup wallet to another location</source>
         <translation>Sauvegarder le porte-monnaie à un autre emplacement</translation>
@@ -161,14 +322,54 @@
         <source>Change the passphrase used for wallet encryption</source>
         <translation>Modifier la phrase de passe utilisée pour le cryptage du porte-monnaie</translation>
     </message>
+    <message>
+        <source>&amp;Debug window</source>
+        <translation>&amp;Fenêtre de débogage</translation>
+    </message>
+    <message>
+        <source>Open debugging and diagnostic console</source>
+        <translation>Ouvrir la console de débogage et de diagnostic</translation>
+    </message>
+    <message>
+        <source>&amp;Verify message...</source>
+        <translation>&amp;Vérification du message</translation>
+    </message>
     <message>
         <source>Bitcoin</source>
         <translation>Bitcoin</translation>
     </message>
+    <message>
+        <source>Wallet</source>
+        <translation>Portefeuille</translation>
+    </message>
     <message>
         <source>&amp;Send</source>
         <translation>&amp;Envoyer</translation>
     </message>
+    <message>
+        <source>&amp;Receive</source>
+        <translation>&amp;Réception</translation>
+    </message>
+    <message>
+        <source>Show information about Bitcoin Core</source>
+        <translation>Montrer les informations à propos de Bitcoin Core</translation>
+    </message>
+    <message>
+        <source>&amp;Show / Hide</source>
+        <translation>&amp;Montrer / Cacher</translation>
+    </message>
+    <message>
+        <source>Show or hide the main Window</source>
+        <translation>Montrer ou cacher la fenêtre principale</translation>
+    </message>
+    <message>
+        <source>Encrypt the private keys that belong to your wallet</source>
+        <translation>Crypter les clé privées qui appartiennent votre portefeuille</translation>
+    </message>
+    <message>
+        <source>Sign messages with your Bitcoin addresses to prove you own them</source>
+        <translation>Signer vos messages avec vos adresses Bitcoin pour prouver que vous les détenez</translation>
+    </message>
     <message>
         <source>&amp;File</source>
         <translation>&amp;Fichier</translation>
@@ -185,6 +386,86 @@
         <source>Tabs toolbar</source>
         <translation>Barre d'outils des onglets</translation>
     </message>
+    <message>
+        <source>Bitcoin Core</source>
+        <translation>Bitcoin Core</translation>
+    </message>
+    <message>
+        <source>Request payments (generates QR codes and bitcoin: URIs)</source>
+        <translation>Demander des paiements (générer QR codes et bitcoin: URIs)</translation>
+    </message>
+    <message>
+        <source>&amp;About Bitcoin Core</source>
+        <translation>&amp;À propos de Bitcoin</translation>
+    </message>
+    <message>
+        <source>Modify configuration options for Bitcoin Core</source>
+        <translation>Modifier les options de configuration de Bitcoin Core</translation>
+    </message>
+    <message>
+        <source>Show the list of used sending addresses and labels</source>
+        <translation>Montrer la liste des adresses d'envois utilisées et les étiquettes</translation>
+    </message>
+    <message>
+        <source>Open a bitcoin: URI or payment request</source>
+        <translation>Ouvrir un bitcoin: URI ou demande de paiement</translation>
+    </message>
+    <message>
+        <source>&amp;Command-line options</source>
+        <translation>&amp;Options de ligne de commande</translation>
+    </message>
+    <message numerus="yes">
+        <source>%n active connection(s) to Bitcoin network</source>
+        <translation><numerusform>%n connexion active au réseau Bitcoin</numerusform><numerusform>%n connexions actives au réseau Bitcoin</numerusform></translation>
+    </message>
+    <message>
+        <source>No block source available...</source>
+        <translation>Aucun bloc source disponible</translation>
+    </message>
+    <message numerus="yes">
+        <source>%n hour(s)</source>
+        <translation><numerusform>%n heure</numerusform><numerusform>%n heures</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%n day(s)</source>
+        <translation><numerusform>%n jour</numerusform><numerusform>%n jours</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%n week(s)</source>
+        <translation><numerusform>%n semaine</numerusform><numerusform>%n semaines</numerusform></translation>
+    </message>
+    <message>
+        <source>%1 and %2</source>
+        <translation>%1 et %2</translation>
+    </message>
+    <message numerus="yes">
+        <source>%n year(s)</source>
+        <translation><numerusform>%n an</numerusform><numerusform>%n années</numerusform></translation>
+    </message>
+    <message>
+        <source>%1 behind</source>
+        <translation>en retard de %1</translation>
+    </message>
+    <message>
+        <source>Last received block was generated %1 ago.</source>
+        <translation>Le dernier bloc reçu a été généré %1.</translation>
+    </message>
+    <message>
+        <source>Transactions after this will not yet be visible.</source>
+        <translation>Les transactions ne seront plus visible après ceci.</translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation>Erreur</translation>
+    </message>
+    <message>
+        <source>Warning</source>
+        <translation>Attention</translation>
+    </message>
+    <message>
+        <source>Information</source>
+        <translation>Information</translation>
+    </message>
     <message>
         <source>Up to date</source>
         <translation>À jour</translation>
@@ -193,6 +474,36 @@
         <source>Catching up...</source>
         <translation>Rattrapage...</translation>
     </message>
+    <message>
+        <source>Date: %1
+</source>
+        <translation>Date: %1
+</translation>
+    </message>
+    <message>
+        <source>Amount: %1
+</source>
+        <translation>Montant:%1
+</translation>
+    </message>
+    <message>
+        <source>Type: %1
+</source>
+        <translation>Type: %1
+</translation>
+    </message>
+    <message>
+        <source>Label: %1
+</source>
+        <translation>Étiquette: %1
+</translation>
+    </message>
+    <message>
+        <source>Address: %1
+</source>
+        <translation>Adresse: %1
+</translation>
+    </message>
     <message>
         <source>Sent transaction</source>
         <translation>Transaction envoyée</translation>
@@ -212,25 +523,89 @@
 </context>
 <context>
     <name>ClientModel</name>
-    </context>
+    <message>
+        <source>Network Alert</source>
+        <translation>Alerte réseau</translation>
+    </message>
+</context>
 <context>
     <name>CoinControlDialog</name>
+    <message>
+        <source>Coin Selection</source>
+        <translation>Sélection de pièce </translation>
+    </message>
+    <message>
+        <source>Quantity:</source>
+        <translation>Quantité:</translation>
+    </message>
+    <message>
+        <source>Bytes:</source>
+        <translation>Octets:</translation>
+    </message>
     <message>
         <source>Amount:</source>
         <translation>Montant :</translation>
     </message>
+    <message>
+        <source>Priority:</source>
+        <translation>Priorité:</translation>
+    </message>
+    <message>
+        <source>Fee:</source>
+        <translation>Frais:</translation>
+    </message>
+    <message>
+        <source>Dust:</source>
+        <translation>Poussière: </translation>
+    </message>
+    <message>
+        <source>After Fee:</source>
+        <translation>Après frais:</translation>
+    </message>
+    <message>
+        <source>Change:</source>
+        <translation>Change:</translation>
+    </message>
+    <message>
+        <source>(un)select all</source>
+        <translation>(dé)sélectionné tout:</translation>
+    </message>
+    <message>
+        <source>Tree mode</source>
+        <translation>Mode arbre</translation>
+    </message>
+    <message>
+        <source>List mode</source>
+        <translation>Mode list</translation>
+    </message>
     <message>
         <source>Amount</source>
         <translation>Montant</translation>
     </message>
+    <message>
+        <source>Received with label</source>
+        <translation>Reçu avec : </translation>
+    </message>
+    <message>
+        <source>Received with address</source>
+        <translation>Reçue avec l'adresse</translation>
+    </message>
     <message>
         <source>Date</source>
         <translation>Date</translation>
     </message>
+    <message>
+        <source>Confirmations</source>
+        <translation>Confirmations</translation>
+    </message>
     <message>
         <source>Confirmed</source>
         <translation>Confirmée</translation>
     </message>
+    <message>
+        <source>Priority</source>
+        <translation>Priorité</translation>
+    </message>
     <message>
         <source>Copy address</source>
         <translation>Copier l'adresse</translation>
@@ -243,11 +618,131 @@
         <source>Copy amount</source>
         <translation>Copier le montant</translation>
     </message>
+    <message>
+        <source>Copy transaction ID</source>
+        <translation>Copie ID transaction</translation>
+    </message>
+    <message>
+        <source>Lock unspent</source>
+        <translation>Verrouiller les non dépensés</translation>
+    </message>
+    <message>
+        <source>Unlock unspent</source>
+        <translation>Déverrouiller les non dépensés</translation>
+    </message>
+    <message>
+        <source>Copy quantity</source>
+        <translation>Copier la quantité</translation>
+    </message>
+    <message>
+        <source>Copy fee</source>
+        <translation>Copier les frais</translation>
+    </message>
+    <message>
+        <source>Copy after fee</source>
+        <translation>Copier après les frais</translation>
+    </message>
+    <message>
+        <source>Copy bytes</source>
+        <translation>Copier les octets</translation>
+    </message>
+    <message>
+        <source>Copy priority</source>
+        <translation>Copier la priorité </translation>
+    </message>
+    <message>
+        <source>Copy dust</source>
+        <translation>Copier la poussière </translation>
+    </message>
+    <message>
+        <source>Copy change</source>
+        <translation>Copier changement </translation>
+    </message>
+    <message>
+        <source>highest</source>
+        <translation>le plus élevé</translation>
+    </message>
+    <message>
+        <source>higher</source>
+        <translation>plus haute</translation>
+    </message>
+    <message>
+        <source>high</source>
+        <translation>haut</translation>
+    </message>
+    <message>
+        <source>medium-high</source>
+        <translation>moyen-élevé</translation>
+    </message>
+    <message>
+        <source>medium</source>
+        <translation>moyen</translation>
+    </message>
+    <message>
+        <source>low-medium</source>
+        <translation>bas-moyen</translation>
+    </message>
+    <message>
+        <source>low</source>
+        <translation>bas</translation>
+    </message>
+    <message>
+        <source>lower</source>
+        <translation>inférieur</translation>
+    </message>
+    <message>
+        <source>lowest</source>
+        <translation>le plus bas </translation>
+    </message>
+    <message>
+        <source>(%1 locked)</source>
+        <translation>(%1 verrouillé)</translation>
+    </message>
+    <message>
+        <source>none</source>
+        <translation>aucun</translation>
+    </message>
+    <message>
+        <source>This label turns red if the transaction size is greater than 1000 bytes.</source>
+        <translation>Cette étiquette devient rouge si la taille de la transaction est plus grande que 1000 octets</translation>
+    </message>
+    <message>
+        <source>This label turns red if the priority is smaller than "medium".</source>
+        <translation>Cette étiquette devient rouge si la priorité est plus petite que "moyen"</translation>
+    </message>
+    <message>
+        <source>Can vary +/- %1 satoshi(s) per input.</source>
+        <translation>Peut varier de +/- %1 satoshi(s) par entrée.</translation>
+    </message>
+    <message>
+        <source>yes</source>
+        <translation>oui</translation>
+    </message>
+    <message>
+        <source>no</source>
+        <translation>non</translation>
+    </message>
+    <message>
+        <source>This means a fee of at least %1 per kB is required.</source>
+        <translation>Cela signifie que des frais d'au moins %1 par kO sont requis.</translation>
+    </message>
+    <message>
+        <source>Can vary +/- 1 byte per input.</source>
+        <translation>Peut varier de +/- 1 octet par entrée.</translation>
+    </message>
     <message>
         <source>(no label)</source>
         <translation>(aucune étiquette)</translation>
     </message>
-    </context>
+    <message>
+        <source>change from %1 (%2)</source>
+        <translation>changement de %1 (%2)</translation>
+    </message>
+    <message>
+        <source>(change)</source>
+        <translation>(changement)</translation>
+    </message>
+</context>
 <context>
     <name>EditAddressDialog</name>
     <message>
@@ -282,6 +777,10 @@
         <source>The entered address "%1" is already in the address book.</source>
         <translation>L'adresse fournie « %1 » est déjà présente dans le carnet d'adresses.</translation>
     </message>
+    <message>
+        <source>The entered address "%1" is not a valid Bitcoin address.</source>
+        <translation>L'adresse entrée "%1" n'est pas une adresse Bitcoin valide.</translation>
+    </message>
     <message>
         <source>Could not unlock wallet.</source>
         <translation>Impossible de déverrouiller le porte-monnaie.</translation>
@@ -293,26 +792,174 @@
 </context>
 <context>
     <name>FreespaceChecker</name>
-    </context>
-<context>
-    <name>HelpMessageDialog</name>
     <message>
-        <source>Usage:</source>
-        <translation>Utilisation :</translation>
+        <source>A new data directory will be created.</source>
+        <translation>Un nouveau répertoire de données sera créé. </translation>
+    </message>
+    <message>
+        <source>name</source>
+        <translation>nom</translation>
+    </message>
+    <message>
+        <source>Path already exists, and is not a directory.</source>
+        <translation>Le chemin existe déjà et ce n'est pas un répertoire. </translation>
+    </message>
+    <message>
+        <source>Cannot create data directory here.</source>
+        <translation>Impossible de créer un répertoire ici.</translation>
+    </message>
+</context>
+<context>
+    <name>HelpMessageDialog</name>
+    <message>
+        <source>Bitcoin Core</source>
+        <translation>Bitcoin Core</translation>
+    </message>
+    <message>
+        <source>version</source>
+        <translation>version</translation>
+    </message>
+    <message>
+        <source>(%1-bit)</source>
+        <translation>(%1-bit)</translation>
+    </message>
+    <message>
+        <source>About Bitcoin Core</source>
+        <translation>À propos de Bitcoin Core</translation>
+    </message>
+    <message>
+        <source>Command-line options</source>
+        <translation>Options de ligne de commande</translation>
+    </message>
+    <message>
+        <source>Usage:</source>
+        <translation>Utilisation :</translation>
+    </message>
+    <message>
+        <source>command-line options</source>
+        <translation>Options de ligne de commande</translation>
+    </message>
+    <message>
+        <source>UI Options:</source>
+        <translation>Options interface graphique:</translation>
+    </message>
+    <message>
+        <source>Start minimized</source>
+        <translation>Démarrer sous forme minimisée</translation>
     </message>
     </context>
 <context>
-    <name>Intro</name>
-    </context>
-<context>
+    <name>Intro</name>
+    <message>
+        <source>Welcome</source>
+        <translation>Bienvenue </translation>
+    </message>
+    <message>
+        <source>Welcome to Bitcoin Core.</source>
+        <translation>Bienvenue sur Bitcoin Core.</translation>
+    </message>
+    <message>
+        <source>Use the default data directory</source>
+        <translation>Utiliser le répertoire par défaut </translation>
+    </message>
+    <message>
+        <source>Use a custom data directory:</source>
+        <translation>Utiliser votre propre répertoire</translation>
+    </message>
+    <message>
+        <source>Bitcoin Core</source>
+        <translation>Bitcoin Core</translation>
+    </message>
+    <message>
+        <source>Error: Specified data directory "%1" cannot be created.</source>
+        <translation>Erreur: Le répertoire de données "%1" n'a pas pu être créé. </translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation>Erreur</translation>
+    </message>
+    <message numerus="yes">
+        <source>%n GB of free space available</source>
+        <translation><numerusform>%n GO d'espace libre disponible</numerusform><numerusform>%n GO d'espace libre disponible</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>(of %n GB needed)</source>
+        <translation><numerusform>(%n GB nécessaire)</numerusform><numerusform>(%n GB nécessaire)</numerusform></translation>
+    </message>
+</context>
+<context>
     <name>OpenURIDialog</name>
-    </context>
+    <message>
+        <source>Open URI</source>
+        <translation>Ouvrir URI</translation>
+    </message>
+    <message>
+        <source>Open payment request from URI or file</source>
+        <translation>Ouvrir une demande de paiement depuis une URI ou un fichier</translation>
+    </message>
+    <message>
+        <source>URI:</source>
+        <translation>URI:</translation>
+    </message>
+    <message>
+        <source>Select payment request file</source>
+        <translation>Sélectionner un fichier de demande de paiement</translation>
+    </message>
+    <message>
+        <source>Select payment request file to open</source>
+        <translation>Sélectionnez le fichier de demande de paiement à ouvrir</translation>
+    </message>
+</context>
 <context>
     <name>OptionsDialog</name>
     <message>
         <source>Options</source>
         <translation>Options</translation>
     </message>
+    <message>
+        <source>&amp;Main</source>
+        <translation>&amp;Principal</translation>
+    </message>
+    <message>
+        <source>Size of &amp;database cache</source>
+        <translation>Taille du cache de la base de données.</translation>
+    </message>
+    <message>
+        <source>MB</source>
+        <translation>MO</translation>
+    </message>
+    <message>
+        <source>Accept connections from outside</source>
+        <translation>Accepter les connexions venant de l'extérieur</translation>
+    </message>
+    <message>
+        <source>Allow incoming connections</source>
+        <translation>Autoriser les connexions entrantes</translation>
+    </message>
+    <message>
+        <source>IP address of the proxy (e.g. IPv4: 127.0.0.1 / IPv6: ::1)</source>
+        <translation>Adresse IP du proxy (e.g. IPv4: 127.0.0.1 / IPv6: ::1)</translation>
+    </message>
+    <message>
+        <source>Reset all client options to default.</source>
+        <translation>Réinitialiser toutes les options du client par défaut.</translation>
+    </message>
+    <message>
+        <source>&amp;Reset Options</source>
+        <translation>&amp;Options de réinitialisation </translation>
+    </message>
+    <message>
+        <source>&amp;Network</source>
+        <translation>&amp;Réseau</translation>
+    </message>
+    <message>
+        <source>Automatically start Bitcoin Core after logging in to the system.</source>
+        <translation>Démarrer automatiquement Bitcoin Core après s'être connecté au système. </translation>
+    </message>
+    <message>
+        <source>Expert</source>
+        <translation>Expert</translation>
+    </message>
     <message>
         <source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source>
         <translation>Ouvrir le port du client Bitcoin automatiquement sur le routeur. Cela ne fonctionne que si votre routeur supporte l'UPnP et si la fonctionnalité est activée.</translation>
@@ -321,6 +968,38 @@
         <source>Map port using &amp;UPnP</source>
         <translation>Ouvrir le port avec l'&amp;UPnP</translation>
     </message>
+    <message>
+        <source>Proxy &amp;IP:</source>
+        <translation>Proxy &amp;IP:</translation>
+    </message>
+    <message>
+        <source>&amp;Port:</source>
+        <translation>&amp;Port:</translation>
+    </message>
+    <message>
+        <source>Port of the proxy (e.g. 9050)</source>
+        <translation>Port du proxy (e.g. 9050)</translation>
+    </message>
+    <message>
+        <source>Used for reaching peers via:</source>
+        <translation>Utilisé pour contacter des pairs via:</translation>
+    </message>
+    <message>
+        <source>IPv4</source>
+        <translation>IPv4</translation>
+    </message>
+    <message>
+        <source>IPv6</source>
+        <translation>IPv6</translation>
+    </message>
+    <message>
+        <source>Tor</source>
+        <translation>Tor</translation>
+    </message>
+    <message>
+        <source>&amp;Window</source>
+        <translation>&amp;Fenêtre</translation>
+    </message>
     <message>
         <source>&amp;Minimize to the tray instead of the taskbar</source>
         <translation>&amp;Minimiser dans la barre système au lieu de la barre des tâches</translation>
@@ -329,37 +1008,429 @@
         <source>M&amp;inimize on close</source>
         <translation>Mi&amp;nimiser lors de la fermeture</translation>
     </message>
-    </context>
+    <message>
+        <source>&amp;Display</source>
+        <translation>&amp;Afficher</translation>
+    </message>
+    <message>
+        <source>User Interface &amp;language:</source>
+        <translation>Interface utilisateur &amp;langage:</translation>
+    </message>
+    <message>
+        <source>&amp;OK</source>
+        <translation>&amp;OK</translation>
+    </message>
+    <message>
+        <source>&amp;Cancel</source>
+        <translation>&amp;Annuler </translation>
+    </message>
+    <message>
+        <source>default</source>
+        <translation>defaut</translation>
+    </message>
+    <message>
+        <source>none</source>
+        <translation>aucun</translation>
+    </message>
+    <message>
+        <source>Confirm options reset</source>
+        <translation>Confirmer les options de réinitialisation </translation>
+    </message>
+    <message>
+        <source>Client restart required to activate changes.</source>
+        <translation>Redémarrage du client nécessaire pour activer les changements.</translation>
+    </message>
+    <message>
+        <source>This change would require a client restart.</source>
+        <translation>Ce changement nécessiterait un redémarrage du client.</translation>
+    </message>
+    <message>
+        <source>The supplied proxy address is invalid.</source>
+        <translation>L'adresse du proxy est invalide.</translation>
+    </message>
+</context>
 <context>
     <name>OverviewPage</name>
     <message>
         <source>Form</source>
         <translation>Formulaire</translation>
     </message>
+    <message>
+        <source>Watch-only:</source>
+        <translation>Regarder seulement:</translation>
+    </message>
+    <message>
+        <source>Available:</source>
+        <translation>Disponible: </translation>
+    </message>
+    <message>
+        <source>Pending:</source>
+        <translation>En attente:</translation>
+    </message>
+    <message>
+        <source>Immature:</source>
+        <translation>Immature:</translation>
+    </message>
+    <message>
+        <source>Balances</source>
+        <translation>Balances</translation>
+    </message>
+    <message>
+        <source>Total:</source>
+        <translation>Total:</translation>
+    </message>
+    <message>
+        <source>Your current total balance</source>
+        <translation>Votre balance totale courante</translation>
+    </message>
+    <message>
+        <source>Spendable:</source>
+        <translation>Dépensable: </translation>
+    </message>
+    <message>
+        <source>Recent transactions</source>
+        <translation>Transactions récentes </translation>
+    </message>
     </context>
 <context>
     <name>PaymentServer</name>
-    </context>
+    <message>
+        <source>Invalid payment address %1</source>
+        <translation>Adresse de paiement invalide %1</translation>
+    </message>
+    <message>
+        <source>Payment request rejected</source>
+        <translation>Requête de paiement rejetée </translation>
+    </message>
+    <message>
+        <source>Payment request is not initialized.</source>
+        <translation>La demande de paiement n'a pas été initialisée.</translation>
+    </message>
+    <message>
+        <source>Payment request error</source>
+        <translation>Erreur lors de la requête de paiement</translation>
+    </message>
+    <message>
+        <source>Payment request expired.</source>
+        <translation>Demande de paiement expirée.</translation>
+    </message>
+    <message>
+        <source>Invalid payment request.</source>
+        <translation>Demande de paiement invalide.</translation>
+    </message>
+    <message>
+        <source>Refund from %1</source>
+        <translation>Remboursement de %1</translation>
+    </message>
+    <message>
+        <source>Bad response from server %1</source>
+        <translation>Mauvaise réponse du serveur %1</translation>
+    </message>
+    <message>
+        <source>Network request error</source>
+        <translation>Erreur de demande de réseau</translation>
+    </message>
+</context>
 <context>
     <name>PeerTableModel</name>
-    </context>
+    <message>
+        <source>User Agent</source>
+        <translation>Agent Utilisateur</translation>
+    </message>
+    <message>
+        <source>Node/Service</source>
+        <translation>Nœud/Service </translation>
+    </message>
+    <message>
+        <source>Ping Time</source>
+        <translation>Temps du ping</translation>
+    </message>
+</context>
 <context>
     <name>QObject</name>
     <message>
         <source>Amount</source>
         <translation>Montant</translation>
     </message>
-    </context>
+    <message>
+        <source>Enter a Bitcoin address (e.g. %1)</source>
+        <translation>Entrer une adresse Bitcoin (e.g. %1)</translation>
+    </message>
+    <message>
+        <source>%1 d</source>
+        <translation>%1 j</translation>
+    </message>
+    <message>
+        <source>%1 h</source>
+        <translation>%1 h</translation>
+    </message>
+    <message>
+        <source>%1 m</source>
+        <translation>%1 m</translation>
+    </message>
+    <message>
+        <source>%1 s</source>
+        <translation>%1 s</translation>
+    </message>
+    <message>
+        <source>None</source>
+        <translation>Aucun</translation>
+    </message>
+    <message>
+        <source>N/A</source>
+        <translation>N/A</translation>
+    </message>
+    <message>
+        <source>%1 ms</source>
+        <translation>%1 ms</translation>
+    </message>
+</context>
 <context>
     <name>QRImageWidget</name>
-    </context>
+    <message>
+        <source>&amp;Save Image...</source>
+        <translation>&amp;Sauvegarder image</translation>
+    </message>
+    <message>
+        <source>&amp;Copy Image</source>
+        <translation>&amp;Copier image</translation>
+    </message>
+    <message>
+        <source>Save QR Code</source>
+        <translation>Sauvegarder QR code</translation>
+    </message>
+    <message>
+        <source>PNG Image (*.png)</source>
+        <translation>Image PNG (*.png)</translation>
+    </message>
+</context>
 <context>
     <name>RPCConsole</name>
+    <message>
+        <source>Client name</source>
+        <translation>Nom du client</translation>
+    </message>
+    <message>
+        <source>N/A</source>
+        <translation>N/A </translation>
+    </message>
+    <message>
+        <source>Client version</source>
+        <translation>Version du client</translation>
+    </message>
+    <message>
+        <source>&amp;Information</source>
+        <translation>&amp;Information</translation>
+    </message>
+    <message>
+        <source>Debug window</source>
+        <translation>Fenêtre de débogage </translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>Général</translation>
+    </message>
+    <message>
+        <source>Using BerkeleyDB version</source>
+        <translation>Version BerkeleyDButilisée </translation>
+    </message>
+    <message>
+        <source>Startup time</source>
+        <translation>Le temps de démarrage</translation>
+    </message>
+    <message>
+        <source>Network</source>
+        <translation>Réseau</translation>
+    </message>
     <message>
         <source>Name</source>
         <translation>Nom</translation>
     </message>
-    </context>
+    <message>
+        <source>Number of connections</source>
+        <translation>Nombre de connexions</translation>
+    </message>
+    <message>
+        <source>Block chain</source>
+        <translation>Chaîne de bloc </translation>
+    </message>
+    <message>
+        <source>Current number of blocks</source>
+        <translation>Nombre courant de blocs</translation>
+    </message>
+    <message>
+        <source>Memory Pool</source>
+        <translation>Mémoire du pool</translation>
+    </message>
+    <message>
+        <source>Current number of transactions</source>
+        <translation>Nombre courant de transactions</translation>
+    </message>
+    <message>
+        <source>Memory usage</source>
+        <translation>Usage de la mémoire</translation>
+    </message>
+    <message>
+        <source>Received</source>
+        <translation>Reçu </translation>
+    </message>
+    <message>
+        <source>Sent</source>
+        <translation>Envoyé</translation>
+    </message>
+    <message>
+        <source>&amp;Peers</source>
+        <translation>&amp;Pairs</translation>
+    </message>
+    <message>
+        <source>Banned peers</source>
+        <translation>Pairs bannis</translation>
+    </message>
+    <message>
+        <source>Whitelisted</source>
+        <translation>Autorisé par la liste</translation>
+    </message>
+    <message>
+        <source>Direction</source>
+        <translation>Direction</translation>
+    </message>
+    <message>
+        <source>Version</source>
+        <translation>Version</translation>
+    </message>
+    <message>
+        <source>Starting Block</source>
+        <translation>Bloc de départ</translation>
+    </message>
+    <message>
+        <source>Synced Blocks</source>
+        <translation>Blocs Synchronisés </translation>
+    </message>
+    <message>
+        <source>User Agent</source>
+        <translation>Agent Utilisateur</translation>
+    </message>
+    <message>
+        <source>Services</source>
+        <translation>Services</translation>
+    </message>
+    <message>
+        <source>Ban Score</source>
+        <translation>Score de ban</translation>
+    </message>
+    <message>
+        <source>Connection Time</source>
+        <translation>Temps de connexion</translation>
+    </message>
+    <message>
+        <source>Last Send</source>
+        <translation>Dernier envoyé</translation>
+    </message>
+    <message>
+        <source>Last Receive</source>
+        <translation>Dernier reçu</translation>
+    </message>
+    <message>
+        <source>Ping Time</source>
+        <translation>Temps du ping</translation>
+    </message>
+    <message>
+        <source>Ping Wait</source>
+        <translation>Attente du ping</translation>
+    </message>
+    <message>
+        <source>&amp;Open</source>
+        <translation>&amp;Ouvert</translation>
+    </message>
+    <message>
+        <source>&amp;Console</source>
+        <translation>&amp;Console</translation>
+    </message>
+    <message>
+        <source>&amp;Network Traffic</source>
+        <translation>&amp;Trafic réseau</translation>
+    </message>
+    <message>
+        <source>&amp;Clear</source>
+        <translation>&amp;Nettoyer</translation>
+    </message>
+    <message>
+        <source>Totals</source>
+        <translation>Totaux</translation>
+    </message>
+    <message>
+        <source>In:</source>
+        <translation>Entrée:</translation>
+    </message>
+    <message>
+        <source>Out:</source>
+        <translation>Sortie:</translation>
+    </message>
+    <message>
+        <source>Build date</source>
+        <translation>Date de création</translation>
+    </message>
+    <message>
+        <source>Debug log file</source>
+        <translation>Fichier du journal de débogage</translation>
+    </message>
+    <message>
+        <source>Clear console</source>
+        <translation>Nettoyer la console</translation>
+    </message>
+    <message>
+        <source>1 &amp;hour</source>
+        <translation>1 &amp;heure</translation>
+    </message>
+    <message>
+        <source>1 &amp;day</source>
+        <translation>1 &amp;jour</translation>
+    </message>
+    <message>
+        <source>1 &amp;week</source>
+        <translation>1 &amp;semaine</translation>
+    </message>
+    <message>
+        <source>1 &amp;year</source>
+        <translation>1 &amp;an</translation>
+    </message>
+    <message>
+        <source>%1 B</source>
+        <translation>%1 O</translation>
+    </message>
+    <message>
+        <source>%1 KB</source>
+        <translation>%1 KO</translation>
+    </message>
+    <message>
+        <source>%1 MB</source>
+        <translation>%1 MO</translation>
+    </message>
+    <message>
+        <source>%1 GB</source>
+        <translation>%1 GO</translation>
+    </message>
+    <message>
+        <source>via %1</source>
+        <translation>via %1</translation>
+    </message>
+    <message>
+        <source>never</source>
+        <translation>jamais</translation>
+    </message>
+    <message>
+        <source>Yes</source>
+        <translation>Oui</translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation>Non</translation>
+    </message>
+    <message>
+        <source>Unknown</source>
+        <translation>Inconnu</translation>
+    </message>
+</context>
 <context>
     <name>ReceiveCoinsDialog</name>
     <message>
@@ -374,20 +1445,72 @@
         <source>&amp;Message:</source>
         <translation>Message :</translation>
     </message>
+    <message>
+        <source>Clear all fields of the form.</source>
+        <translation>Nettoyer tous les champs du formulaire.</translation>
+    </message>
+    <message>
+        <source>Clear</source>
+        <translation>Nettoyer</translation>
+    </message>
+    <message>
+        <source>Requested payments history</source>
+        <translation>Historique des demandes de paiements.</translation>
+    </message>
+    <message>
+        <source>&amp;Request payment</source>
+        <translation>&amp;Demande de paiement</translation>
+    </message>
+    <message>
+        <source>Show</source>
+        <translation>Montrer</translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation>Retirer</translation>
+    </message>
     <message>
         <source>Copy label</source>
         <translation>Copier l'étiquette</translation>
     </message>
+    <message>
+        <source>Copy message</source>
+        <translation>Copier message</translation>
+    </message>
     <message>
         <source>Copy amount</source>
         <translation>Copier le montant</translation>
     </message>
-</context>
-<context>
-    <name>ReceiveRequestDialog</name>
+</context>
+<context>
+    <name>ReceiveRequestDialog</name>
+    <message>
+        <source>QR Code</source>
+        <translation>QR Code</translation>
+    </message>
+    <message>
+        <source>Copy &amp;URI</source>
+        <translation>Copier &amp;URI</translation>
+    </message>
+    <message>
+        <source>Copy &amp;Address</source>
+        <translation>Copier &amp;Adresse</translation>
+    </message>
+    <message>
+        <source>&amp;Save Image...</source>
+        <translation>&amp;Sauvegarder image</translation>
+    </message>
+    <message>
+        <source>Request payment to %1</source>
+        <translation>Demande de paiement à %1</translation>
+    </message>
+    <message>
+        <source>Payment information</source>
+        <translation>Informations de paiement</translation>
+    </message>
     <message>
-        <source>QR Code</source>
-        <translation>QR Code</translation>
+        <source>URI</source>
+        <translation>URI</translation>
     </message>
     <message>
         <source>Address</source>
@@ -428,25 +1551,113 @@
         <source>(no label)</source>
         <translation>(aucune étiquette)</translation>
     </message>
-    </context>
+    <message>
+        <source>(no message)</source>
+        <translation>(pas de message)</translation>
+    </message>
+    <message>
+        <source>(no amount)</source>
+        <translation>(pas de montant)</translation>
+    </message>
+</context>
 <context>
     <name>SendCoinsDialog</name>
     <message>
         <source>Send Coins</source>
         <translation>Envoyer des pièces</translation>
     </message>
+    <message>
+        <source>Inputs...</source>
+        <translation>Sorties...</translation>
+    </message>
+    <message>
+        <source>automatically selected</source>
+        <translation>Automatiquement sélectionné </translation>
+    </message>
     <message>
         <source>Insufficient funds!</source>
         <translation>Fonds insuffisants</translation>
     </message>
+    <message>
+        <source>Quantity:</source>
+        <translation>Quantité:</translation>
+    </message>
+    <message>
+        <source>Bytes:</source>
+        <translation>Octets:</translation>
+    </message>
     <message>
         <source>Amount:</source>
         <translation>Montant :</translation>
     </message>
+    <message>
+        <source>Priority:</source>
+        <translation>Priorité:</translation>
+    </message>
+    <message>
+        <source>Fee:</source>
+        <translation>Frais:</translation>
+    </message>
+    <message>
+        <source>After Fee:</source>
+        <translation>Après frais:</translation>
+    </message>
+    <message>
+        <source>Change:</source>
+        <translation>Change:</translation>
+    </message>
+    <message>
+        <source>Transaction Fee:</source>
+        <translation>Frais de transaction</translation>
+    </message>
+    <message>
+        <source>Choose...</source>
+        <translation>Choisir...</translation>
+    </message>
+    <message>
+        <source>per kilobyte</source>
+        <translation>par kilo octet</translation>
+    </message>
+    <message>
+        <source>Hide</source>
+        <translation>Cacher</translation>
+    </message>
+    <message>
+        <source>total at least</source>
+        <translation>Au total au moins</translation>
+    </message>
+    <message>
+        <source>Recommended:</source>
+        <translation>Recommandé: </translation>
+    </message>
+    <message>
+        <source>Confirmation time:</source>
+        <translation>Temps de confirmation:</translation>
+    </message>
+    <message>
+        <source>normal</source>
+        <translation>normal</translation>
+    </message>
+    <message>
+        <source>fast</source>
+        <translation>rapide</translation>
+    </message>
     <message>
         <source>Send to multiple recipients at once</source>
         <translation>Envoyer des pièces à plusieurs destinataires à la fois</translation>
     </message>
+    <message>
+        <source>Clear all fields of the form.</source>
+        <translation>Nettoyer tous les champs du formulaire.</translation>
+    </message>
+    <message>
+        <source>Dust:</source>
+        <translation>Poussière: </translation>
+    </message>
+    <message>
+        <source>Clear &amp;All</source>
+        <translation>Nettoyer &amp;Tout</translation>
+    </message>
     <message>
         <source>Balance:</source>
         <translation>Solde :</translation>
@@ -459,19 +1670,87 @@
         <source>Confirm send coins</source>
         <translation>Confirmer l'envoi des pièces</translation>
     </message>
+    <message>
+        <source>%1 to %2</source>
+        <translation>%1 à %2</translation>
+    </message>
+    <message>
+        <source>Copy quantity</source>
+        <translation>Copier la quantité</translation>
+    </message>
     <message>
         <source>Copy amount</source>
         <translation>Copier le montant</translation>
     </message>
+    <message>
+        <source>Copy fee</source>
+        <translation>Copier les frais</translation>
+    </message>
+    <message>
+        <source>Copy after fee</source>
+        <translation>Copier après les frais</translation>
+    </message>
+    <message>
+        <source>Copy bytes</source>
+        <translation>Copier les octets</translation>
+    </message>
+    <message>
+        <source>Copy priority</source>
+        <translation>Copier la priorité </translation>
+    </message>
+    <message>
+        <source>Copy change</source>
+        <translation>Copier changement </translation>
+    </message>
+    <message>
+        <source>Total Amount %1</source>
+        <translation>Montant Total %1</translation>
+    </message>
+    <message>
+        <source>or</source>
+        <translation>ou</translation>
+    </message>
     <message>
         <source>The amount to pay must be larger than 0.</source>
         <translation>Le montant à payer doit être supérieur à 0.</translation>
     </message>
+    <message>
+        <source>The amount exceeds your balance.</source>
+        <translation>Le montant excède votre balance. </translation>
+    </message>
+    <message>
+        <source>Transaction creation failed!</source>
+        <translation>Échec de la création de la transaction  </translation>
+    </message>
+    <message>
+        <source>Payment request expired.</source>
+        <translation>Demande de paiement expirée. </translation>
+    </message>
+    <message>
+        <source>Pay only the required fee of %1</source>
+        <translation>Payer seulement les frais obligatoire de %1</translation>
+    </message>
+    <message>
+        <source>Warning: Invalid Bitcoin address</source>
+        <translation>Attention: Adresse Bitcoin Invalide</translation>
+    </message>
     <message>
         <source>(no label)</source>
         <translation>(aucune étiquette)</translation>
     </message>
-    </context>
+    <message>
+        <source>Copy dust</source>
+        <translation>Copier la poussière </translation>
+    </message>
+    <message>
+        <source>Are you sure you want to send?</source>
+        <translation>Êtes-vous sûr de vouloir envoyer ?</translation>
+    </message>
+    <message>
+        <source>added as transaction fee</source>
+        <translation>Ajoute en tant que frais de transaction</translation>
+    </message>
+</context>
 <context>
     <name>SendCoinsEntry</name>
     <message>
@@ -490,6 +1769,14 @@
         <source>&amp;Label:</source>
         <translation>&amp;Étiquette :</translation>
     </message>
+    <message>
+        <source>Choose previously used address</source>
+        <translation>Choisir une adresse précédemment utilisée </translation>
+    </message>
+    <message>
+        <source>This is a normal payment.</source>
+        <translation>C'est un paiement normal.</translation>
+    </message>
     <message>
         <source>Alt+A</source>
         <translation>Alt+A</translation>
@@ -502,6 +1789,10 @@
         <source>Alt+P</source>
         <translation>Alt+P</translation>
     </message>
+    <message>
+        <source>Remove this entry</source>
+        <translation>Retirer cette entrée</translation>
+    </message>
     <message>
         <source>Message:</source>
         <translation>Message :</translation>
@@ -510,7 +1801,11 @@
         <source>Pay To:</source>
         <translation>Payer à :</translation>
     </message>
-    </context>
+    <message>
+        <source>Memo:</source>
+        <translation>Memo:</translation>
+    </message>
+</context>
 <context>
     <name>ShutdownWindow</name>
     </context>
@@ -520,6 +1815,10 @@
         <source>&amp;Sign Message</source>
         <translation>&amp;Signer le message</translation>
     </message>
+    <message>
+        <source>Choose previously used address</source>
+        <translation>Choisir une adresse précédemment utilisée </translation>
+    </message>
     <message>
         <source>Alt+A</source>
         <translation>Alt+A</translation>
@@ -536,13 +1835,65 @@
         <source>Enter the message you want to sign here</source>
         <translation>Entrez ici le message que vous désirez signer</translation>
     </message>
+    <message>
+        <source>Signature</source>
+        <translation>Signature</translation>
+    </message>
+    <message>
+        <source>Copy the current signature to the system clipboard</source>
+        <translation>Copier l'adresse courante dans le presse papier</translation>
+    </message>
     <message>
         <source>Sign &amp;Message</source>
         <translation>&amp;Signer le message</translation>
     </message>
-    </context>
+    <message>
+        <source>Clear &amp;All</source>
+        <translation>Nettoyer &amp;Tout</translation>
+    </message>
+    <message>
+        <source>&amp;Verify Message</source>
+        <translation>&amp;Vérifier message</translation>
+    </message>
+    <message>
+        <source>Verify &amp;Message</source>
+        <translation>Vérifier &amp;Message</translation>
+    </message>
+    <message>
+        <source>The entered address is invalid.</source>
+        <translation>L'adresse entrée est invalide. </translation>
+    </message>
+    <message>
+        <source>Please check the address and try again.</source>
+        <translation>Vérifiez l'adresse et réessayer. </translation>
+    </message>
+    <message>
+        <source>Message signed.</source>
+        <translation>Message signé. </translation>
+    </message>
+    <message>
+        <source>Please check the signature and try again.</source>
+        <translation>Vérifiez la signature et réessayer.</translation>
+    </message>
+    <message>
+        <source>Message verification failed.</source>
+        <translation>Vérification du message échouée.</translation>
+    </message>
+    <message>
+        <source>Message verified.</source>
+        <translation>Message vérifié. </translation>
+    </message>
+</context>
 <context>
     <name>SplashScreen</name>
+    <message>
+        <source>Bitcoin Core</source>
+        <translation>Bitcoin Core</translation>
+    </message>
+    <message>
+        <source>The Bitcoin Core developers</source>
+        <translation>Les développeurs de Bitcoin Core</translation>
+    </message>
     <message>
         <source>[testnet]</source>
         <translation>[testnet]</translation>
@@ -550,7 +1901,11 @@
 </context>
 <context>
     <name>TrafficGraphWidget</name>
-    </context>
+    <message>
+        <source>KB/s</source>
+        <translation>KO/s</translation>
+    </message>
+</context>
 <context>
     <name>TransactionDesc</name>
     <message>
@@ -573,30 +1928,110 @@
         <source>Date</source>
         <translation>Date</translation>
     </message>
+    <message>
+        <source>Source</source>
+        <translation>Source</translation>
+    </message>
     <message>
         <source>Generated</source>
         <translation>Généré</translation>
     </message>
+    <message>
+        <source>From</source>
+        <translation>De</translation>
+    </message>
+    <message>
+        <source>To</source>
+        <translation>Á</translation>
+    </message>
+    <message>
+        <source>own address</source>
+        <translation>Votre adresse</translation>
+    </message>
+    <message>
+        <source>watch-only</source>
+        <translation>Lecture uniquement</translation>
+    </message>
+    <message>
+        <source>label</source>
+        <translation>Étiquette </translation>
+    </message>
     <message>
         <source>Credit</source>
         <translation>Crédit</translation>
     </message>
+    <message>
+        <source>not accepted</source>
+        <translation>Pas accepté</translation>
+    </message>
     <message>
         <source>Debit</source>
         <translation>Débit</translation>
     </message>
+    <message>
+        <source>Total debit</source>
+        <translation>Débit total</translation>
+    </message>
+    <message>
+        <source>Total credit</source>
+        <translation>Crédit total </translation>
+    </message>
+    <message>
+        <source>Transaction fee</source>
+        <translation>Frais de transaction</translation>
+    </message>
+    <message>
+        <source>Net amount</source>
+        <translation>Montant net</translation>
+    </message>
     <message>
         <source>Message</source>
         <translation>Message</translation>
     </message>
+    <message>
+        <source>Comment</source>
+        <translation>Commentaire </translation>
+    </message>
+    <message>
+        <source>Transaction ID</source>
+        <translation>ID de transaction</translation>
+    </message>
+    <message>
+        <source>Merchant</source>
+        <translation>Marchant</translation>
+    </message>
+    <message>
+        <source>Debug information</source>
+        <translation>Information de débogage </translation>
+    </message>
+    <message>
+        <source>Transaction</source>
+        <translation>Transaction</translation>
+    </message>
+    <message>
+        <source>Inputs</source>
+        <translation>Entrées </translation>
+    </message>
     <message>
         <source>Amount</source>
         <translation>Montant</translation>
     </message>
+    <message>
+        <source>true</source>
+        <translation>vrai</translation>
+    </message>
+    <message>
+        <source>false</source>
+        <translation>faux</translation>
+    </message>
     <message>
         <source>, has not been successfully broadcast yet</source>
         <translation>, n'a pas encore été diffusée avec succès</translation>
     </message>
+    <message numerus="yes">
+        <source>Open for %n more block(s)</source>
+        <translation><numerusform>Ouvert pour %n bloc de plus</numerusform><numerusform>Ouvert pour %n blocs de plus</numerusform></translation>
+    </message>
     <message>
         <source>unknown</source>
         <translation>inconnue</translation>
@@ -623,6 +2058,10 @@
         <source>Type</source>
         <translation>Type</translation>
     </message>
+    <message numerus="yes">
+        <source>Open for %n more block(s)</source>
+        <translation><numerusform>Ouvert pour %n bloc de plus</numerusform><numerusform>Ouvert pour %n blocs de plus</numerusform></translation>
+    </message>
     <message>
         <source>Open until %1</source>
         <translation>Ouvert jusqu'à %1</translation>
@@ -639,10 +2078,18 @@
         <source>Generated but not accepted</source>
         <translation>Généré mais pas accepté</translation>
     </message>
+    <message>
+        <source>Offline</source>
+        <translation>Hors ligne</translation>
+    </message>
     <message>
         <source>Label</source>
         <translation>Étiquette</translation>
     </message>
+    <message>
+        <source>Unconfirmed</source>
+        <translation>Non Confirmé</translation>
+    </message>
     <message>
         <source>Received with</source>
         <translation>Reçues avec</translation>
@@ -663,6 +2110,10 @@
         <source>Mined</source>
         <translation>Extraction</translation>
     </message>
+    <message>
+        <source>watch-only</source>
+        <translation>Lecture uniquement</translation>
+    </message>
     <message>
         <source>(n/a)</source>
         <translation>(indisponible)</translation>
@@ -754,10 +2205,30 @@
         <source>Copy amount</source>
         <translation>Copier le montant</translation>
     </message>
+    <message>
+        <source>Copy transaction ID</source>
+        <translation>Copie ID transaction</translation>
+    </message>
     <message>
         <source>Edit label</source>
         <translation>Éditer l'étiquette</translation>
     </message>
+    <message>
+        <source>Show transaction details</source>
+        <translation>Afficher les détails de la transaction</translation>
+    </message>
+    <message>
+        <source>Export Transaction History</source>
+        <translation>Exporter l'historique des transactions</translation>
+    </message>
+    <message>
+        <source>Exporting Failed</source>
+        <translation>Échec de l'export</translation>
+    </message>
+    <message>
+        <source>Exporting Successful</source>
+        <translation>Export réalisé avec sucés </translation>
+    </message>
     <message>
         <source>Comma separated file (*.csv)</source>
         <translation>Valeurs séparées par des virgules (*.csv)</translation>
@@ -800,7 +2271,11 @@
     </context>
 <context>
     <name>WalletFrame</name>
-    </context>
+    <message>
+        <source>No wallet has been loaded.</source>
+        <translation>Aucun portefeuille a été chargé.</translation>
+    </message>
+</context>
 <context>
     <name>WalletModel</name>
     <message>
@@ -810,6 +2285,10 @@
 </context>
 <context>
     <name>WalletView</name>
+    <message>
+        <source>&amp;Export</source>
+        <translation>&amp;Exporter...</translation>
+    </message>
     <message>
         <source>Export the data in the current tab to a file</source>
         <translation>Exporter les données de l'onglet courant vers un fichier</translation>
@@ -826,7 +2305,11 @@
         <source>Backup Failed</source>
         <translation>La sauvegarde a échoué</translation>
     </message>
-    </context>
+    <message>
+        <source>Backup Successful</source>
+        <translation>Sauvegarde réussie</translation>
+    </message>
+</context>
 <context>
     <name>bitcoin-core</name>
     <message>
@@ -837,6 +2320,10 @@
         <source>Specify data directory</source>
         <translation>Spécifier le répertoire de données</translation>
     </message>
+    <message>
+        <source>Specify your own public address</source>
+        <translation>Spécifier votre adresse publique </translation>
+    </message>
     <message>
         <source>Accept command line and JSON-RPC commands</source>
         <translation>Accepter les commandes de JSON-RPC et de la ligne de commande</translation>
@@ -845,14 +2332,95 @@
         <source>Run in the background as a daemon and accept commands</source>
         <translation>Fonctionner en arrière-plan en tant que démon et accepter les commandes</translation>
     </message>
+    <message>
+        <source>&lt;category&gt; can be:</source>
+        <translation>&lt;category&gt; peut être:</translation>
+    </message>
+    <message>
+        <source>Block creation options:</source>
+        <translation>Options de création de bloc:</translation>
+    </message>
+    <message>
+        <source>Connection options:</source>
+        <translation>Options de connexion:</translation>
+    </message>
+    <message>
+        <source>Debugging/Testing options:</source>
+        <translation>Options de débogage/test </translation>
+    </message>
+    <message>
+        <source>Importing...</source>
+        <translation>
+Importation ...</translation>
+    </message>
+    <message>
+        <source>Verifying blocks...</source>
+        <translation>Vérifications des blocs...</translation>
+    </message>
+    <message>
+        <source>Verifying wallet...</source>
+        <translation>Vérification du portefeuille...</translation>
+    </message>
+    <message>
+        <source>Wallet options:</source>
+        <translation>Options du portefeuille:</translation>
+    </message>
+    <message>
+        <source>(default: %u)</source>
+        <translation>(défaut: %u)</translation>
+    </message>
+    <message>
+        <source>Connect through SOCKS5 proxy</source>
+        <translation>Connecté au travers du proxy SOCKS5</translation>
+    </message>
+    <message>
+        <source>Information</source>
+        <translation>Information</translation>
+    </message>
+    <message>
+        <source>Node relay options:</source>
+        <translation>Options du relais de nœud: </translation>
+    </message>
+    <message>
+        <source>RPC server options:</source>
+        <translation>Options de serveur RPC:</translation>
+    </message>
     <message>
         <source>Send trace/debug info to console instead of debug.log file</source>
         <translation>Envoyer les informations de débogage/trace à la console au lieu du fichier debug.log</translation>
     </message>
+    <message>
+        <source>Signing transaction failed</source>
+        <translation>Transaction signée échouée</translation>
+    </message>
+    <message>
+        <source>This is experimental software.</source>
+        <translation>C'est un logiciel expérimental.</translation>
+    </message>
+    <message>
+        <source>Transaction amount too small</source>
+        <translation>Montant de la transaction trop bas</translation>
+    </message>
+    <message>
+        <source>Transaction amounts must be positive</source>
+        <translation>Les montants de la transaction doivent être positif</translation>
+    </message>
+    <message>
+        <source>Transaction too large for fee policy</source>
+        <translation>Montant de la transaction trop élevé pour la politique de frais</translation>
+    </message>
+    <message>
+        <source>Transaction too large</source>
+        <translation>Transaction trop grande</translation>
+    </message>
     <message>
         <source>Username for JSON-RPC connections</source>
         <translation>Nom d'utilisateur pour les connexions JSON-RPC</translation>
     </message>
+    <message>
+        <source>Warning</source>
+        <translation>Attention</translation>
+    </message>
     <message>
         <source>Password for JSON-RPC connections</source>
         <translation>Mot de passe pour les connexions JSON-RPC</translation>
@@ -869,10 +2437,26 @@
         <source>Error loading wallet.dat: Wallet corrupted</source>
         <translation>Erreur lors du chargement de wallet.dat : porte-monnaie corrompu</translation>
     </message>
+    <message>
+        <source>(default: %s)</source>
+        <translation>(défaut: %s)</translation>
+    </message>
     <message>
         <source>Error loading wallet.dat</source>
         <translation>Erreur lors du chargement de wallet.dat</translation>
     </message>
+    <message>
+        <source>Generate coins (default: %u)</source>
+        <translation>Générer des pièces (défaut: %u)</translation>
+    </message>
+    <message>
+        <source>Invalid -proxy address: '%s'</source>
+        <translation>Adresse -proxy invalide: '%s'</translation>
+    </message>
+    <message>
+        <source>Specify pid file (default: %s)</source>
+        <translation>Spécifier le pid du fichier (défaut: %s)</translation>
+    </message>
     <message>
         <source>Insufficient funds</source>
         <translation>Fonds insuffisants</translation>
@@ -885,6 +2469,14 @@
         <source>Loading wallet...</source>
         <translation>Chargement du porte-monnaie...</translation>
     </message>
+    <message>
+        <source>Cannot downgrade wallet</source>
+        <translation>Vous ne pouvez pas rétrograder votre portefeuille</translation>
+    </message>
+    <message>
+        <source>Cannot write default address</source>
+        <translation>Impossible d'écrire l'adresse par défaut</translation>
+    </message>
     <message>
         <source>Rescanning...</source>
         <translation>Nouvelle analyse...</translation>
@@ -893,5 +2485,9 @@
         <source>Done loading</source>
         <translation>Chargement terminé</translation>
     </message>
-    </context>
+    <message>
+        <source>Error</source>
+        <translation>Erreur</translation>
+    </message>
+</context>
 </TS>
\ No newline at end of file
diff --git a/src/qt/locale/bitcoin_gl.ts b/src/qt/locale/bitcoin_gl.ts
index 96d4adeba9df8..50b081d20562a 100644
--- a/src/qt/locale/bitcoin_gl.ts
+++ b/src/qt/locale/bitcoin_gl.ts
@@ -983,10 +983,6 @@
         <source>Debug window</source>
         <translation>Ventana de Depuración</translation>
     </message>
-    <message>
-        <source>Using OpenSSL version</source>
-        <translation>Usar versión OpenSSL</translation>
-    </message>
     <message>
         <source>Startup time</source>
         <translation>Tempo de arranque</translation>
diff --git a/src/qt/locale/bitcoin_he.ts b/src/qt/locale/bitcoin_he.ts
index 926d20620694e..d937e211b0f1a 100644
--- a/src/qt/locale/bitcoin_he.ts
+++ b/src/qt/locale/bitcoin_he.ts
@@ -1,6 +1,10 @@
 <TS language="he" version="2.1">
 <context>
     <name>AddressBookPage</name>
+    <message>
+        <source>Right-click to edit address or label</source>
+        <translation>לחץ משק ימני כדי לערוך כתובת או חברה</translation>
+    </message>
     <message>
         <source>Create a new address</source>
         <translation>יצירת כתובת חדשה</translation>
@@ -163,6 +167,10 @@
         <source>Are you sure you wish to encrypt your wallet?</source>
         <translation>האם אכן להצפין את הארנק?</translation>
     </message>
+    <message>
+        <source>Bitcoin Core will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source>
+        <translation>ליבת ביטקוין תיסגר עכשיו כדי לסיים את תליך ההצפנה. זכור כי הצפנה אינה יכולה להגן עלייך באופן מלא מגניבה שמקורה בתוכנות זדוניות המצויות במחשב שלך.</translation>
+    </message>
     <message>
         <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source>
         <translation>לתשומת לבך: כל גיבוי קודם שביצעת לארנק שלך יש להחליף בקובץ הארנק המוצפן שזה עתה נוצר. מטעמי אבטחה, גיבויים קודמים של קובץ הארנק הבלתי-מוצפן יהפכו לחסרי תועלת עם התחלת השימוש בארנק החדש המוצפן.</translation>
@@ -179,6 +187,10 @@
         <source>Enter the new passphrase to the wallet.&lt;br/&gt;Please use a passphrase of &lt;b&gt;ten or more random characters&lt;/b&gt;, or &lt;b&gt;eight or more words&lt;/b&gt;.</source>
         <translation>נא להזין את מילת הצופן החדשה לארנק.&lt;br/&gt;כדאי להשתמש במילת צופן המורכבת מ&lt;b&gt;עשרה תווים אקראיים ומעלה&lt;/b&gt;, או &lt;b&gt;שמונה מילים ומעלה&lt;/b&gt;.</translation>
     </message>
+    <message>
+        <source>Enter the old passphrase and new passphrase to the wallet.</source>
+        <translation>הכנס את מילת הצופן הישנה ומילת צופן חדשה לארנק שלך.</translation>
+    </message>
     <message>
         <source>Wallet encryption failed</source>
         <translation>הצפנת הארנק נכשלה</translation>
@@ -1259,10 +1271,6 @@
         <source>General</source>
         <translation>כללי</translation>
     </message>
-    <message>
-        <source>Using OpenSSL version</source>
-        <translation>שימוש ב־OpenSSL גרסה</translation>
-    </message>
     <message>
         <source>Using BerkeleyDB version</source>
         <translation>שימוש ב־BerkeleyDB גרסה</translation>
diff --git a/src/qt/locale/bitcoin_hr.ts b/src/qt/locale/bitcoin_hr.ts
index 413dc21857344..f9d744aa3ec37 100644
--- a/src/qt/locale/bitcoin_hr.ts
+++ b/src/qt/locale/bitcoin_hr.ts
@@ -1017,10 +1017,6 @@
         <source>Debug window</source>
         <translation>Konzola za dijagnostiku</translation>
     </message>
-    <message>
-        <source>Using OpenSSL version</source>
-        <translation>OpenSSL verzija u upotrebi</translation>
-    </message>
     <message>
         <source>Network</source>
         <translation>Mreža</translation>
diff --git a/src/qt/locale/bitcoin_hu.ts b/src/qt/locale/bitcoin_hu.ts
index ab4517ccfabb0..839ee883bd356 100644
--- a/src/qt/locale/bitcoin_hu.ts
+++ b/src/qt/locale/bitcoin_hu.ts
@@ -963,6 +963,10 @@
         <source>The user interface language can be set here. This setting will take effect after restarting Bitcoin Core.</source>
         <translation>Itt beállíthatod a kezelőfelület nyelvét. A beállítás a Bitcoin újraindítása után lép érvénybe.</translation>
     </message>
+    <message>
+        <source>Third party transaction URLs</source>
+        <translation>Harmadik fél tranzakció URL-ek</translation>
+    </message>
     <message>
         <source>Reset all client options to default.</source>
         <translation>Minden kliensbeállítás alapértelmezettre állítása.</translation>
@@ -1257,10 +1261,6 @@
         <source>General</source>
         <translation>Általános</translation>
     </message>
-    <message>
-        <source>Using OpenSSL version</source>
-        <translation>Használt OpenSSL verzió</translation>
-    </message>
     <message>
         <source>Using BerkeleyDB version</source>
         <translation>Használt BerkeleyDB verzió</translation>
diff --git a/src/qt/locale/bitcoin_id_ID.ts b/src/qt/locale/bitcoin_id_ID.ts
index 1b626fbf239dc..e1ec7ae7fa24a 100644
--- a/src/qt/locale/bitcoin_id_ID.ts
+++ b/src/qt/locale/bitcoin_id_ID.ts
@@ -59,19 +59,19 @@
     </message>
     <message>
         <source>Sending addresses</source>
-        <translation>Alamat-alamat mengirim</translation>
+        <translation>Alamat pengirim</translation>
     </message>
     <message>
         <source>Receiving addresses</source>
-        <translation>Alamat-alamat menerima</translation>
+        <translation>Alamat penerima</translation>
     </message>
     <message>
         <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source>
-        <translation>Alamat-alamat Anda supaya mengirim pembayaran. Periksalah jumlah dan alamat penerima setiap kali Anda mengirim Bitcoin.</translation>
+        <translation>Alamat-alamat Anda untuk mengirim pembayaran. Periksalah jumlah dan alamat penerima setiap kali Anda mengirim Bitcoin.</translation>
     </message>
     <message>
         <source>These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source>
-        <translation>Alamat-alamat Anda supaya menerima pembayaran. Dianjurkan agar Anda menggunakan alamat menerima yang baru untuk setiap transaksi.</translation>
+        <translation>Alamat-alamat Anda untuk menerima pembayaran. Dianjurkan agar Anda menggunakan alamat yang baru untuk setiap transaksi.</translation>
     </message>
     <message>
         <source>Copy &amp;Label</source>
@@ -93,7 +93,11 @@
         <source>Exporting Failed</source>
         <translation>Proses Ekspor Gagal</translation>
     </message>
-    </context>
+    <message>
+        <source>There was an error trying to save the address list to %1. Please try again.</source>
+        <translation>Terjadi kesalahan saat menyimpan daftar alamat ke %1. Silakan coba lagi.</translation>
+    </message>
+</context>
 <context>
     <name>AddressTableModel</name>
     <message>
@@ -133,7 +137,7 @@
     </message>
     <message>
         <source>This operation needs your wallet passphrase to unlock the wallet.</source>
-        <translation>Operasi ini memerlukan kata kunci dompet Anda untuk membuka dompet ini.</translation>
+        <translation>Operasi ini memerlukan kata kunci dompet Anda untuk membuka dompet.</translation>
     </message>
     <message>
         <source>Unlock wallet</source>
@@ -141,7 +145,7 @@
     </message>
     <message>
         <source>This operation needs your wallet passphrase to decrypt the wallet.</source>
-        <translation>Operasi ini memerlukan kata kunci dompet Anda untuk mendekripsi dompet ini.</translation>
+        <translation>Operasi ini memerlukan kata kunci dompet Anda untuk mendekripsi dompet.</translation>
     </message>
     <message>
         <source>Decrypt wallet</source>
@@ -157,11 +161,19 @@
     </message>
     <message>
         <source>Warning: If you encrypt your wallet and lose your passphrase, you will &lt;b&gt;LOSE ALL OF YOUR BITCOINS&lt;/b&gt;!</source>
-        <translation>Perhatian: Jika anda mengenkripsi dompet anda dan lupa kata kuncinya, anda pasti &lt;b&gt;KEHILANGAN SELURUH BITCOIN ANDA&lt;/B&gt;!</translation>
+        <translation>Perhatian: Jika anda mengenkripsi dompet anda dan lupa kata kuncinya, anda akan &lt;b&gt;KEHILANGAN SELURUH BITCOIN ANDA&lt;/b&gt;!</translation>
     </message>
     <message>
         <source>Are you sure you wish to encrypt your wallet?</source>
-        <translation>Apakah kamu yakin ingin mengenkripsi dompet anda?</translation>
+        <translation>Apakah Anda yakin ingin mengenkripsi dompet Anda?</translation>
+    </message>
+    <message>
+        <source>Bitcoin Core will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source>
+        <translation>Bitcoin Core akan ditutup untuk menyelesaikan proses enkripsi. Mohon diingat bahwa mengenkripsi dompet Anda tidak akan sepenuhnya melindungi bitcoin Anda dari virus atau malware yang menginfeksi komputer Anda.</translation>
+    </message>
+    <message>
+        <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source>
+        <translation>PENTING: Setiap back up yang sudah Anda buat sebaiknya diganti dengan data dompet Anda yang baru dan terenkripsi. Untuk alasan keamanan, data back up tidak terenkripsi yang sudah Anda buat sebelumnya tidak akan dapat digunakan setelah Anda mulai menggunakan dompet yang baru dan terenkripsi.</translation>
     </message>
     <message>
         <source>Warning: The Caps Lock key is on!</source>
@@ -171,6 +183,14 @@
         <source>Wallet encrypted</source>
         <translation>Dompet terenkripsi</translation>
     </message>
+    <message>
+        <source>Enter the new passphrase to the wallet.&lt;br/&gt;Please use a passphrase of &lt;b&gt;ten or more random characters&lt;/b&gt;, or &lt;b&gt;eight or more words&lt;/b&gt;.</source>
+        <translation>Masukkan kata kunci untuk dompet Anda.&lt;br/&gt;Mohon gunakan kata kunci &lt;b&gt;yang terdiri dari 10 karakter acak&lt;/b&gt;, atau &lt;b&gt;delapan atau beberapa kata lagi&lt;/b&gt;.</translation>
+    </message>
+    <message>
+        <source>Enter the old passphrase and new passphrase to the wallet.</source>
+        <translation>Masukkan kata kunci lama dan kata kunci baru dompet Anda.</translation>
+    </message>
     <message>
         <source>Wallet encryption failed</source>
         <translation>Enkripsi dompet gagal</translation>
@@ -197,12 +217,20 @@
     </message>
     <message>
         <source>Wallet passphrase was successfully changed.</source>
-        <translation>Kata kunci untuk dompet berubah berhasil.</translation>
+        <translation>Kata kunci dompet Anda berhasil diubah.</translation>
     </message>
 </context>
 <context>
     <name>BanTableModel</name>
-    </context>
+    <message>
+        <source>IP/Netmask</source>
+        <translation>IP/Netmask</translation>
+    </message>
+    <message>
+        <source>Banned Until</source>
+        <translation>Di banned sampai</translation>
+    </message>
+</context>
 <context>
     <name>BitcoinGUI</name>
     <message>
@@ -223,7 +251,7 @@
     </message>
     <message>
         <source>Show general overview of wallet</source>
-        <translation>Tampilkan kilasan umum dari dompet</translation>
+        <translation>Tampilkan gambaran umum dompet Anda</translation>
     </message>
     <message>
         <source>&amp;Transactions</source>
@@ -231,7 +259,7 @@
     </message>
     <message>
         <source>Browse transaction history</source>
-        <translation>Jelajah sejarah transaksi</translation>
+        <translation>Lihat riwayat transaksi</translation>
     </message>
     <message>
         <source>E&amp;xit</source>
@@ -267,11 +295,11 @@
     </message>
     <message>
         <source>&amp;Sending addresses...</source>
-        <translation>Alamat-alamat &amp;Mengirim</translation>
+        <translation>&amp;Alamat-alamat untuk mengirim...</translation>
     </message>
     <message>
         <source>&amp;Receiving addresses...</source>
-        <translation>Alamat-alamat &amp;Menerima</translation>
+        <translation>&amp;Alamat-alamat untuk menerima...</translation>
     </message>
     <message>
         <source>Open &amp;URI...</source>
@@ -279,15 +307,15 @@
     </message>
     <message>
         <source>Bitcoin Core client</source>
-        <translation>Client Bitcoin Inti</translation>
+        <translation>Klien Bitcoin Core</translation>
     </message>
     <message>
         <source>Importing blocks from disk...</source>
-        <translation>Blok-blok sedang di-impor dari disk</translation>
+        <translation>Mengimpor blok dari disk...</translation>
     </message>
     <message>
         <source>Reindexing blocks on disk...</source>
-        <translation>Mengindex ulang block di harddisk...</translation>
+        <translation>Mengindex ulang blok di dalam disk...</translation>
     </message>
     <message>
         <source>Send coins to a Bitcoin address</source>
@@ -331,11 +359,11 @@
     </message>
     <message>
         <source>Show information about Bitcoin Core</source>
-        <translation>Tampilkan informasi tentang Bitcoin Inti</translation>
+        <translation>Tampilkan informasi tentang Bitcoin Core</translation>
     </message>
     <message>
         <source>&amp;Show / Hide</source>
-        <translation>&amp;Sunjukkan / Menyembungi</translation>
+        <translation>&amp;Tampilkan / Sembunyikan</translation>
     </message>
     <message>
         <source>Show or hide the main Window</source>
@@ -343,15 +371,15 @@
     </message>
     <message>
         <source>Encrypt the private keys that belong to your wallet</source>
-        <translation>Mengenkripsi kunci-kunci pribadi yang dipunyai dompetmu</translation>
+        <translation>Enkripsi private key yang dimiliki dompet Anda</translation>
     </message>
     <message>
         <source>Sign messages with your Bitcoin addresses to prove you own them</source>
-        <translation>Tandalah pesanan dengan alamat-alamat Bitcoin Anda supaya membuktikan pesanan itu dikirim oleh Anda</translation>
+        <translation>Tanda tangani sebuah pesan menggunakan alamat Bitcoin Anda untuk membuktikan bahwa Anda adalah pemilik alamat tersebut</translation>
     </message>
     <message>
         <source>Verify messages to ensure they were signed with specified Bitcoin addresses</source>
-        <translation>Periksakan pesan-pesan supaya menjaminkan ditandatangani oleh alamat Bitcoin yang terperinci</translation>
+        <translation>Verifikasi pesan untuk memastikan bahwa pesan tersebut ditanda tangani oleh suatu alamat Bitcoin tertentu</translation>
     </message>
     <message>
         <source>&amp;File</source>
@@ -375,12 +403,16 @@
     </message>
     <message>
         <source>Request payments (generates QR codes and bitcoin: URIs)</source>
-        <translation>Permintaan pembayaran (membangkitkan kode QR dan bitcoin: URIs)</translation>
+        <translation>Permintaan pembayaran (membuat kode QR dan bitcoin: URIs)</translation>
     </message>
     <message>
         <source>&amp;About Bitcoin Core</source>
         <translation>&amp;Mengenai Bitcoin Core</translation>
     </message>
+    <message>
+        <source>Modify configuration options for Bitcoin Core</source>
+        <translation>Modifikasi pengaturan konfigurasi untuk Bitcoin Core</translation>
+    </message>
     <message>
         <source>Show the list of used sending addresses and labels</source>
         <translation>Tampilkan daftar alamat dan label yang terkirim</translation>
@@ -395,20 +427,24 @@
     </message>
     <message>
         <source>&amp;Command-line options</source>
-        <translation>&amp;pilihan Perintah-baris</translation>
+        <translation>&amp;pilihan Command-line</translation>
     </message>
     <message>
         <source>Show the Bitcoin Core help message to get a list with possible Bitcoin command-line options</source>
-        <translation>Tampilkan pesan bantuan Bitcoin Core untuk memberikan daftar pilihan perintah-baris yang memungkinkan dalam aplikasi Bitcoin</translation>
+        <translation>Tampilkan pesan bantuan Bitcoin Core untuk mendapatkan daftar pilihan Command-line</translation>
     </message>
     <message numerus="yes">
         <source>%n active connection(s) to Bitcoin network</source>
-        <translation><numerusform>%n hubungan aktif ke jaringan Bitcoin</numerusform></translation>
+        <translation><numerusform>%n koneksi aktif ke jaringan Bitcoin</numerusform></translation>
     </message>
     <message>
         <source>No block source available...</source>
         <translation>Sumber blok tidak tersedia...</translation>
     </message>
+    <message numerus="yes">
+        <source>Processed %n block(s) of transaction history.</source>
+        <translation><numerusform>%n blok dari riwayat transaksi diproses.</numerusform></translation>
+    </message>
     <message numerus="yes">
         <source>%n hour(s)</source>
         <translation><numerusform>%n jam</numerusform></translation>
@@ -435,15 +471,15 @@
     </message>
     <message>
         <source>Last received block was generated %1 ago.</source>
-        <translation>Blok terakhir dibuat %1 lalu.</translation>
+        <translation>Blok terakhir yang diterima %1 lalu.</translation>
     </message>
     <message>
         <source>Transactions after this will not yet be visible.</source>
-        <translation>Transaksi setelah ini tidak akan ditampilkan</translation>
+        <translation>Transaksi setelah ini belum akan terlihat.</translation>
     </message>
     <message>
         <source>Error</source>
-        <translation>Gagal</translation>
+        <translation>Terjadi sebuah kesalahan</translation>
     </message>
     <message>
         <source>Warning</source>
@@ -531,7 +567,7 @@
     </message>
     <message>
         <source>Amount:</source>
-        <translation>Nilai:</translation>
+        <translation>Jumlah:</translation>
     </message>
     <message>
         <source>Priority:</source>
@@ -541,13 +577,17 @@
         <source>Fee:</source>
         <translation>Biaya:</translation>
     </message>
+    <message>
+        <source>Dust:</source>
+        <translation>Dust:</translation>
+    </message>
     <message>
         <source>After Fee:</source>
         <translation>Dengan Biaya:</translation>
     </message>
     <message>
         <source>Change:</source>
-        <translation>Uang Kembali:</translation>
+        <translation>Kembalian:</translation>
     </message>
     <message>
         <source>(un)select all</source>
@@ -555,7 +595,7 @@
     </message>
     <message>
         <source>Tree mode</source>
-        <translation>mode pohon</translation>
+        <translation>Tree mode</translation>
     </message>
     <message>
         <source>List mode</source>
@@ -563,7 +603,15 @@
     </message>
     <message>
         <source>Amount</source>
-        <translation>Nilai</translation>
+        <translation>Jumlah</translation>
+    </message>
+    <message>
+        <source>Received with label</source>
+        <translation>Diterima dengan label</translation>
+    </message>
+    <message>
+        <source>Received with address</source>
+        <translation>Diterima dengan alamat</translation>
     </message>
     <message>
         <source>Date</source>
@@ -571,7 +619,7 @@
     </message>
     <message>
         <source>Confirmations</source>
-        <translation>Konfirmasi-konfirmasi</translation>
+        <translation>Konfirmasi</translation>
     </message>
     <message>
         <source>Confirmed</source>
@@ -591,19 +639,19 @@
     </message>
     <message>
         <source>Copy amount</source>
-        <translation>Salin nilai</translation>
+        <translation>Salin jumlah</translation>
     </message>
     <message>
         <source>Copy transaction ID</source>
-        <translation>Menyalinkan ID transaksi</translation>
+        <translation>Salin ID transaksi</translation>
     </message>
     <message>
         <source>Lock unspent</source>
-        <translation>Kunci terpakai.</translation>
+        <translation>Kunci unspent.</translation>
     </message>
     <message>
         <source>Unlock unspent</source>
-        <translation>Membuka kunci terpakai</translation>
+        <translation>Buka unspent</translation>
     </message>
     <message>
         <source>Copy quantity</source>
@@ -625,9 +673,13 @@
         <source>Copy priority</source>
         <translation>Salin prioritas</translation>
     </message>
+    <message>
+        <source>Copy dust</source>
+        <translation>Salin dust</translation>
+    </message>
     <message>
         <source>Copy change</source>
-        <translation>Salin uang kembali</translation>
+        <translation>Salin kembalian</translation>
     </message>
     <message>
         <source>highest</source>
@@ -673,6 +725,22 @@
         <source>none</source>
         <translation>tidak satupun</translation>
     </message>
+    <message>
+        <source>This label turns red if the transaction size is greater than 1000 bytes.</source>
+        <translation>Label ini akan menjadi merah apabila ukuran transaksi melebihi 1000 bytes.</translation>
+    </message>
+    <message>
+        <source>This label turns red if the priority is smaller than "medium".</source>
+        <translation>Label ini akan menjadi merah apabila prioritasnya lebih kecil dari "sedang"</translation>
+    </message>
+    <message>
+        <source>This label turns red if any recipient receives an amount smaller than %1.</source>
+        <translation>Label ini akan menjadi merah apabila penerima menerima jumlah yang lebih kecil dari %1.</translation>
+    </message>
+    <message>
+        <source>Can vary +/- %1 satoshi(s) per input.</source>
+        <translation>Dapat beragam +/- %1 satoshi per input.</translation>
+    </message>
     <message>
         <source>yes</source>
         <translation>ya</translation>
@@ -683,15 +751,15 @@
     </message>
     <message>
         <source>This means a fee of at least %1 per kB is required.</source>
-        <translation>Berarti perlu biaya lebih dari %1 untuk setiap kB.</translation>
+        <translation>Perlu biaya lebih dari %1 untuk setiap kB.</translation>
     </message>
     <message>
         <source>Can vary +/- 1 byte per input.</source>
-        <translation>Boleh berbeda +/- 1 byte setiap masukan.</translation>
+        <translation>Dapat beragam +/- 1 byte per input.</translation>
     </message>
     <message>
         <source>Transactions with higher priority are more likely to get included into a block.</source>
-        <translation>Makin penting transaksinya, makin kemungkinan akan termasuk dalam blok.</translation>
+        <translation>Transaksi dengan prioritas lebih tinggi akan lebih cepat dimasukkan kedalam blok.</translation>
     </message>
     <message>
         <source>(no label)</source>
@@ -699,11 +767,11 @@
     </message>
     <message>
         <source>change from %1 (%2)</source>
-        <translation>uang kembali dari %1 (%2)</translation>
+        <translation>kembalian dari %1 (%2)</translation>
     </message>
     <message>
         <source>(change)</source>
-        <translation>(uang kembali)</translation>
+        <translation>(kembalian)</translation>
     </message>
 </context>
 <context>
@@ -718,11 +786,11 @@
     </message>
     <message>
         <source>The label associated with this address list entry</source>
-        <translation>Label yang terkait dengan daftar alamat yang dimasukkan ini</translation>
+        <translation>Label yang terkait dengan daftar alamat</translation>
     </message>
     <message>
         <source>The address associated with this address list entry. This can only be modified for sending addresses.</source>
-        <translation>Alamat yang terkait dengan entri buku alamat ini. Hanya dapat diubah untuk alamat pengirim.</translation>
+        <translation>Alamat yang terkait dengan daftar alamat. Hanya dapat diubah untuk alamat pengirim.</translation>
     </message>
     <message>
         <source>&amp;Address</source>
@@ -773,15 +841,15 @@
     </message>
     <message>
         <source>Directory already exists. Add %1 if you intend to create a new directory here.</source>
-        <translation>Direktori masih ada. Tambahlah %1 kalau ingin membuat direktori baru disini.</translation>
+        <translation>Direktori masih ada. Tambahlah %1 apabila Anda ingin membuat direktori baru disini.</translation>
     </message>
     <message>
         <source>Path already exists, and is not a directory.</source>
-        <translation>Masih ada Path, dan path itu bukan direktori.</translation>
+        <translation>Sudah ada path, dan itu bukan direktori.</translation>
     </message>
     <message>
         <source>Cannot create data directory here.</source>
-        <translation>Tidak busa membuat direktori untuk data disini.</translation>
+        <translation>Tidak bisa membuat direktori data disini.</translation>
     </message>
 </context>
 <context>
@@ -794,13 +862,17 @@
         <source>version</source>
         <translation>versi</translation>
     </message>
+    <message>
+        <source>(%1-bit)</source>
+        <translation>(%1-bit)</translation>
+    </message>
     <message>
         <source>About Bitcoin Core</source>
         <translation>Mengenai Bitcoin Core</translation>
     </message>
     <message>
         <source>Command-line options</source>
-        <translation>pilihan Perintah-baris</translation>
+        <translation>Pilihan Command-line</translation>
     </message>
     <message>
         <source>Usage:</source>
@@ -808,9 +880,37 @@
     </message>
     <message>
         <source>command-line options</source>
-        <translation>pilihan perintah-baris</translation>
+        <translation>pilihan command-line</translation>
     </message>
-    </context>
+    <message>
+        <source>UI Options:</source>
+        <translation>Pilihan UI:</translation>
+    </message>
+    <message>
+        <source>Choose data directory on startup (default: %u)</source>
+        <translation>Pilih direktori data saat memulai (default: %u)</translation>
+    </message>
+    <message>
+        <source>Set language, for example "de_DE" (default: system locale)</source>
+        <translation>Pilih bahasa, contoh "id_ID" (default: system locale)</translation>
+    </message>
+    <message>
+        <source>Start minimized</source>
+        <translation>Start minimized</translation>
+    </message>
+    <message>
+        <source>Set SSL root certificates for payment request (default: -system-)</source>
+        <translation>Pilih sertifikat root SSL untuk permintaan pembayaran {default: -system-)</translation>
+    </message>
+    <message>
+        <source>Show splash screen on startup (default: %u)</source>
+        <translation>Tampilkan layar kilat saat memulai (default: %u)</translation>
+    </message>
+    <message>
+        <source>Reset all settings changes made over the GUI</source>
+        <translation>Reset semua pengaturan yang dibuat dari GUI</translation>
+    </message>
+</context>
 <context>
     <name>Intro</name>
     <message>
@@ -821,27 +921,43 @@
         <source>Welcome to Bitcoin Core.</source>
         <translation>Selamat Datang ke Bitcoin Core</translation>
     </message>
+    <message>
+        <source>As this is the first time the program is launched, you can choose where Bitcoin Core will store its data.</source>
+        <translation>Ini adalah pertama kali program ini dijalankan, Anda dapat memilih dimana Bitcoin Core menyimpan data.</translation>
+    </message>
+    <message>
+        <source>Bitcoin Core will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source>
+        <translation>Bitcoin Core akan mengunduh dan menyimpan salinan dari block chain Bitcoin. Setidaknya %1GB data akan disimpan di direktori ini, dan akan terus bertambah. Dompet Anda juga akan disimpan di direktori ini.</translation>
+    </message>
     <message>
         <source>Use the default data directory</source>
-        <translation>Menggunakan direktori untuk data yang biasa.</translation>
+        <translation>Gunakan direktori data default.</translation>
     </message>
     <message>
         <source>Use a custom data directory:</source>
-        <translation>Menggunakan direktori data yang dipilih Anda:</translation>
+        <translation>Gunakan direktori pilihan Anda:</translation>
     </message>
     <message>
         <source>Bitcoin Core</source>
         <translation>Bitcoin Core</translation>
     </message>
+    <message>
+        <source>Error: Specified data directory "%1" cannot be created.</source>
+        <translation>Kesalahan: Direktori data "%1" tidak dapat dibuat.</translation>
+    </message>
     <message>
         <source>Error</source>
-        <translation>Gagal</translation>
+        <translation>Kesalahan</translation>
     </message>
     <message numerus="yes">
         <source>%n GB of free space available</source>
-        <translation><numerusform>%n GB dari ruang yang tersedia</numerusform></translation>
+        <translation><numerusform>%n GB ruang kosong tersedia.</numerusform></translation>
     </message>
-    </context>
+    <message numerus="yes">
+        <source>(of %n GB needed)</source>
+        <translation><numerusform>(dari %n GB yang dibutuhkan)</numerusform></translation>
+    </message>
+</context>
 <context>
     <name>OpenURIDialog</name>
     <message>
@@ -850,7 +966,7 @@
     </message>
     <message>
         <source>Open payment request from URI or file</source>
-        <translation>Buka permintaan pembayaran dari URI atau arsip</translation>
+        <translation>Buka permintaan pembayaran dari URI atau data</translation>
     </message>
     <message>
         <source>URI:</source>
@@ -858,11 +974,11 @@
     </message>
     <message>
         <source>Select payment request file</source>
-        <translation>Pilihlah arsip permintaan pembayaran</translation>
+        <translation>Pilih data permintaan pembayaran</translation>
     </message>
     <message>
         <source>Select payment request file to open</source>
-        <translation>Pilihlah arsip permintaan pembayaran yang Anda ingin membuka</translation>
+        <translation>Pilih data permintaan pembayaran yang akan dibuka</translation>
     </message>
 </context>
 <context>
@@ -875,25 +991,53 @@
         <source>&amp;Main</source>
         <translation>&amp;Utama</translation>
     </message>
+    <message>
+        <source>Size of &amp;database cache</source>
+        <translation>Ukuran cache &amp;database</translation>
+    </message>
     <message>
         <source>MB</source>
         <translation>MB</translation>
     </message>
+    <message>
+        <source>Number of script &amp;verification threads</source>
+        <translation>Jumlah script &amp;verification threads</translation>
+    </message>
+    <message>
+        <source>Accept connections from outside</source>
+        <translation>Terima koneksi dari luar</translation>
+    </message>
+    <message>
+        <source>Allow incoming connections</source>
+        <translation>Perbolehkan koneksi masuk</translation>
+    </message>
     <message>
         <source>IP address of the proxy (e.g. IPv4: 127.0.0.1 / IPv6: ::1)</source>
         <translation>Alamat IP proxy (cth. IPv4: 127.0.0.1 / IPv6: ::1)</translation>
     </message>
+    <message>
+        <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Exit in the menu.</source>
+        <translation>Minimalisasi aplikasi ketika jendela ditutup. Ketika pilihan ini dipilih, aplikasi akan menutup seluruhnya jika anda memilih Keluar di menu yang tersedia.</translation>
+    </message>
+    <message>
+        <source>The user interface language can be set here. This setting will take effect after restarting Bitcoin Core.</source>
+        <translation>Bahasa interface pengguna bisa diubah disini. Pengaturan ini akan memberikan efek setelah Bitcoin Core di-restart.</translation>
+    </message>
+    <message>
+        <source>Third party URLs (e.g. a block explorer) that appear in the transactions tab as context menu items. %s in the URL is replaced by transaction hash. Multiple URLs are separated by vertical bar |.</source>
+        <translation>URL pihak ketika (misalnya sebuah block explorer) yang mumcul dalam tab transaksi sebagai konteks menu. %s dalam URL diganti dengan kode transaksi. URL dipisahkan dengan tanda vertikal |.</translation>
+    </message>
     <message>
         <source>Third party transaction URLs</source>
-        <translation>Transaksi URLs pihak ketiga</translation>
+        <translation>URL transaksi pihak ketiga</translation>
     </message>
     <message>
         <source>Active command-line options that override above options:</source>
-        <translation>pilihan perintah-baris aktif menimpa atas pilihan-pilihan: </translation>
+        <translation>Pilihan command-line yang aktif menimpa diatas opsi: </translation>
     </message>
     <message>
         <source>Reset all client options to default.</source>
-        <translation>Reset setiap pilihan untuk pilihan biasa</translation>
+        <translation>Kembalikan semua pengaturan ke awal.</translation>
     </message>
     <message>
         <source>&amp;Reset Options</source>
@@ -903,6 +1047,18 @@
         <source>&amp;Network</source>
         <translation>&amp;Jaringan</translation>
     </message>
+    <message>
+        <source>Automatically start Bitcoin Core after logging in to the system.</source>
+        <translation>Buka Bitcoin Core secara otomatis setelah Anda log-in ke sistem Anda.</translation>
+    </message>
+    <message>
+        <source>&amp;Start Bitcoin Core on system login</source>
+        <translation>&amp;Mulai Bitcoin Core saat log-in sistem</translation>
+    </message>
+    <message>
+        <source>(0 = auto, &lt;0 = leave that many cores free)</source>
+        <translation>(0 = auto, &lt;0 = leave that many cores free)</translation>
+    </message>
     <message>
         <source>W&amp;allet</source>
         <translation>D&amp;ompet</translation>
@@ -913,7 +1069,7 @@
     </message>
     <message>
         <source>Enable coin &amp;control features</source>
-        <translation>Nyalain cara &amp;pengaturan koin</translation>
+        <translation>Perbolehkan fitur &amp;pengaturan koin</translation>
     </message>
     <message>
         <source>If you disable the spending of unconfirmed change, the change from a transaction cannot be used until that transaction has at least one confirmation. This also affects how your balance is computed.</source>
@@ -931,6 +1087,10 @@
         <source>Map port using &amp;UPnP</source>
         <translation>Petakan port dengan &amp;UPnP</translation>
     </message>
+    <message>
+        <source>Connect to the Bitcoin network through a SOCKS5 proxy.</source>
+        <translation>Hubungkan ke jaringan Bitcoin melalui SOCKS5 proxy.</translation>
+    </message>
     <message>
         <source>Proxy &amp;IP:</source>
         <translation>IP Proxy:</translation>
@@ -1197,10 +1357,6 @@
         <source>General</source>
         <translation>Umum</translation>
     </message>
-    <message>
-        <source>Using OpenSSL version</source>
-        <translation>Menggunakan versi OpenSSL</translation>
-    </message>
     <message>
         <source>Startup time</source>
         <translation>Waktu nyala</translation>
@@ -1595,6 +1751,10 @@
         <source>Clear all fields of the form.</source>
         <translation>Hapus informasi dari form.</translation>
     </message>
+    <message>
+        <source>Dust:</source>
+        <translation>Dust:</translation>
+    </message>
     <message>
         <source>Clear &amp;All</source>
         <translation>Hapus &amp;Semua</translation>
@@ -1691,6 +1851,10 @@
         <source>(no label)</source>
         <translation>(tidak ada label)</translation>
     </message>
+    <message>
+        <source>Copy dust</source>
+        <translation>Salin dust</translation>
+    </message>
     <message>
         <source>Are you sure you want to send?</source>
         <translation>Apakah Anda yakin ingin kirim?</translation>
diff --git a/src/qt/locale/bitcoin_it.ts b/src/qt/locale/bitcoin_it.ts
index d510b1063b854..2f14c420146c6 100644
--- a/src/qt/locale/bitcoin_it.ts
+++ b/src/qt/locale/bitcoin_it.ts
@@ -949,6 +949,10 @@
         <source>Error</source>
         <translation>Errore</translation>
     </message>
+    <message numerus="yes">
+        <source>%n GB of free space available</source>
+        <translation><numerusform>GB di spazio libero disponibile</numerusform><numerusform>%n GB di spazio disponibile</numerusform></translation>
+    </message>
     <message numerus="yes">
         <source>(of %n GB needed)</source>
         <translation><numerusform>(di %nGB richiesti)</numerusform><numerusform>(%n GB richiesti)</numerusform></translation>
@@ -1470,10 +1474,6 @@ Per specificare più URL separarli con una barra verticale "|".</translation>
         <source>General</source>
         <translation>Generale</translation>
     </message>
-    <message>
-        <source>Using OpenSSL version</source>
-        <translation>Versione OpenSSL in uso</translation>
-    </message>
     <message>
         <source>Using BerkeleyDB version</source>
         <translation>Versione BerkeleyDB in uso</translation>
@@ -2850,7 +2850,7 @@ Per specificare più URL separarli con una barra verticale "|".</translation>
     <name>UnitDisplayStatusBarControl</name>
     <message>
         <source>Unit to show amounts in. Click to select another unit.</source>
-        <translation>Unità con cui visualizzare gli importi. Clicca per selezionare un altra unità.</translation>
+        <translation>Unità con cui visualizzare gli importi. Clicca per selezionare un'altra unità.</translation>
     </message>
 </context>
 <context>
@@ -3192,10 +3192,6 @@ Per specificare più URL separarli con una barra verticale "|".</translation>
         <source>Wallet options:</source>
         <translation>Opzioni portamonete:</translation>
     </message>
-    <message>
-        <source>Warning: This version is obsolete; upgrade required!</source>
-        <translation>Attenzione: questa versione è obsoleta. Aggiornamento necessario!</translation>
-    </message>
     <message>
         <source>You need to rebuild the database using -reindex to change -txindex</source>
         <translation>È necessario ricostruire il database usando -reindex per cambiare -txindex</translation>
@@ -3292,10 +3288,6 @@ Per specificare più URL separarli con una barra verticale "|".</translation>
         <source>Activating best chain...</source>
         <translation>Attivazione della blockchain migliore...</translation>
     </message>
-    <message>
-        <source>Always relay transactions received from whitelisted peers (default: %d)</source>
-        <translation>Trasmetti sempre le transazioni ricevute da peers whitelisted (default: %d)</translation>
-    </message>
     <message>
         <source>Attempt to recover private keys from a corrupt wallet.dat on startup</source>
         <translation>Prova a recuperare le chiavi private da un wallet corrotto all'avvio</translation>
diff --git a/src/qt/locale/bitcoin_it_IT.ts b/src/qt/locale/bitcoin_it_IT.ts
new file mode 100644
index 0000000000000..46ad0e9339df0
--- /dev/null
+++ b/src/qt/locale/bitcoin_it_IT.ts
@@ -0,0 +1,325 @@
+<TS language="it_IT" version="2.1">
+<context>
+    <name>AddressBookPage</name>
+    <message>
+        <source>Right-click to edit address or label</source>
+        <translation>Click destro per modificare indirizzo o etichetta</translation>
+    </message>
+    <message>
+        <source>Create a new address</source>
+        <translation>Crea un nuovo indirizzo</translation>
+    </message>
+    <message>
+        <source>&amp;New</source>
+        <translation>nuovo</translation>
+    </message>
+    <message>
+        <source>Copy the currently selected address to the system clipboard</source>
+        <translation>copia l'indirizzo selezionato correntemente nella clipboard di sistema</translation>
+    </message>
+    <message>
+        <source>&amp;Copy</source>
+        <translation>copia</translation>
+    </message>
+    <message>
+        <source>C&amp;lose</source>
+        <translation>chiudi </translation>
+    </message>
+    <message>
+        <source>&amp;Copy Address</source>
+        <translation>copia indirizzo </translation>
+    </message>
+    <message>
+        <source>Delete the currently selected address from the list</source>
+        <translation>Cancella l'indirizzo attualmente selezionato dalla lista.</translation>
+    </message>
+    <message>
+        <source>Export the data in the current tab to a file</source>
+        <translation>Esportare i dati nella scheda corrente in un file</translation>
+    </message>
+    <message>
+        <source>&amp;Export</source>
+        <translation>Esporta</translation>
+    </message>
+    <message>
+        <source>&amp;Delete</source>
+        <translation>Cancella</translation>
+    </message>
+    <message>
+        <source>Choose the address to send coins to</source>
+        <translation>Scegli l'indirizzo a cui inviare denaro</translation>
+    </message>
+    <message>
+        <source>Choose the address to receive coins with</source>
+        <translation>Scegli l'indirizzo con cui ricevere i coin</translation>
+    </message>
+    <message>
+        <source>C&amp;hoose</source>
+        <translation>Scegli</translation>
+    </message>
+    <message>
+        <source>Sending addresses</source>
+        <translation>Indirizzi mittenti</translation>
+    </message>
+    <message>
+        <source>Receiving addresses</source>
+        <translation>Indirizzi destinatari</translation>
+    </message>
+    <message>
+        <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source>
+        <translation>Questi sono gli indirizzi Bitcoin per l'invio di pagamenti. Controlla sempre la quantità e l'indirizzo di ricezione prima di inviare monete.</translation>
+    </message>
+    <message>
+        <source>These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source>
+        <translation>Questi sono i tuoi indirizzi Bitcoin per ricevere pagamenti. Si raccomanda di generare un nuovo indirizzo per ogni transazione</translation>
+    </message>
+    <message>
+        <source>Copy &amp;Label</source>
+        <translation>copia etichetta</translation>
+    </message>
+    <message>
+        <source>&amp;Edit</source>
+        <translation>Modifica</translation>
+    </message>
+    <message>
+        <source>Export Address List</source>
+        <translation>Esporta lista degli indirizzi</translation>
+    </message>
+    <message>
+        <source>Comma separated file (*.csv)</source>
+        <translation>Contenuto del file separato da virgole (*.csv)</translation>
+    </message>
+    <message>
+        <source>Exporting Failed</source>
+        <translation>Esportazione fallita</translation>
+    </message>
+    </context>
+<context>
+    <name>AddressTableModel</name>
+    <message>
+        <source>Label</source>
+        <translation>Etichetta</translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation>Indirizzo</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(nessuna etichetta)
+</translation>
+    </message>
+</context>
+<context>
+    <name>AskPassphraseDialog</name>
+    <message>
+        <source>Enter passphrase</source>
+        <translation>Invia passphrase</translation>
+    </message>
+    <message>
+        <source>New passphrase</source>
+        <translation>Nuova passphrase</translation>
+    </message>
+    <message>
+        <source>Repeat new passphrase</source>
+        <translation>Ripeti nuova passphrase</translation>
+    </message>
+    <message>
+        <source>Encrypt wallet</source>
+        <translation>Cifra portagoflio</translation>
+    </message>
+    <message>
+        <source>This operation needs your wallet passphrase to unlock the wallet.</source>
+        <translation>Questa operazione richiede la passphrase del tuo portafoglio per sbloccare il portafoglio.</translation>
+    </message>
+    <message>
+        <source>Unlock wallet</source>
+        <translation>Sblocca portafoglio</translation>
+    </message>
+    <message>
+        <source>Decrypt wallet</source>
+        <translation>decifra portafoglio</translation>
+    </message>
+    <message>
+        <source>Change passphrase</source>
+        <translation>cambia passphrase</translation>
+    </message>
+    <message>
+        <source>Confirm wallet encryption</source>
+        <translation>conferma cifrazione del portagoglio</translation>
+    </message>
+    <message>
+        <source>Wallet encrypted</source>
+        <translation>portafoglio cifrato</translation>
+    </message>
+    <message>
+        <source>Wallet unlock failed</source>
+        <translation>sblocco portafoglio fallito</translation>
+    </message>
+    </context>
+<context>
+    <name>BanTableModel</name>
+    <message>
+        <source>Banned Until</source>
+        <translation>bannato fino </translation>
+    </message>
+</context>
+<context>
+    <name>BitcoinGUI</name>
+    <message>
+        <source>&amp;Transactions</source>
+        <translation>Transazioni</translation>
+    </message>
+    </context>
+<context>
+    <name>ClientModel</name>
+    </context>
+<context>
+    <name>CoinControlDialog</name>
+    <message>
+        <source>(no label)</source>
+        <translation>(nessuna etichetta)
+</translation>
+    </message>
+    </context>
+<context>
+    <name>EditAddressDialog</name>
+    </context>
+<context>
+    <name>FreespaceChecker</name>
+    </context>
+<context>
+    <name>HelpMessageDialog</name>
+    </context>
+<context>
+    <name>Intro</name>
+    </context>
+<context>
+    <name>OpenURIDialog</name>
+    </context>
+<context>
+    <name>OptionsDialog</name>
+    </context>
+<context>
+    <name>OverviewPage</name>
+    </context>
+<context>
+    <name>PaymentServer</name>
+    </context>
+<context>
+    <name>PeerTableModel</name>
+    </context>
+<context>
+    <name>QObject</name>
+    </context>
+<context>
+    <name>QRImageWidget</name>
+    </context>
+<context>
+    <name>RPCConsole</name>
+    </context>
+<context>
+    <name>ReceiveCoinsDialog</name>
+    </context>
+<context>
+    <name>ReceiveRequestDialog</name>
+    <message>
+        <source>Address</source>
+        <translation>Indirizzo</translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation>Etichetta</translation>
+    </message>
+    </context>
+<context>
+    <name>RecentRequestsTableModel</name>
+    <message>
+        <source>Label</source>
+        <translation>Etichetta</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(nessuna etichetta)
+</translation>
+    </message>
+    </context>
+<context>
+    <name>SendCoinsDialog</name>
+    <message>
+        <source>(no label)</source>
+        <translation>(nessuna etichetta)
+</translation>
+    </message>
+    </context>
+<context>
+    <name>SendCoinsEntry</name>
+    </context>
+<context>
+    <name>ShutdownWindow</name>
+    </context>
+<context>
+    <name>SignVerifyMessageDialog</name>
+    </context>
+<context>
+    <name>SplashScreen</name>
+    </context>
+<context>
+    <name>TrafficGraphWidget</name>
+    </context>
+<context>
+    <name>TransactionDesc</name>
+    </context>
+<context>
+    <name>TransactionDescDialog</name>
+    </context>
+<context>
+    <name>TransactionTableModel</name>
+    <message>
+        <source>Label</source>
+        <translation>Etichetta</translation>
+    </message>
+    </context>
+<context>
+    <name>TransactionView</name>
+    <message>
+        <source>Exporting Failed</source>
+        <translation>Esportazione fallita</translation>
+    </message>
+    <message>
+        <source>Comma separated file (*.csv)</source>
+        <translation>Contenuto del file separato da virgole (*.csv)</translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation>Etichetta</translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation>Indirizzo</translation>
+    </message>
+    </context>
+<context>
+    <name>UnitDisplayStatusBarControl</name>
+    </context>
+<context>
+    <name>WalletFrame</name>
+    </context>
+<context>
+    <name>WalletModel</name>
+    </context>
+<context>
+    <name>WalletView</name>
+    <message>
+        <source>&amp;Export</source>
+        <translation>Esporta</translation>
+    </message>
+    <message>
+        <source>Export the data in the current tab to a file</source>
+        <translation>Esportare i dati nella scheda corrente in un file</translation>
+    </message>
+    </context>
+<context>
+    <name>bitcoin-core</name>
+    </context>
+</TS>
\ No newline at end of file
diff --git a/src/qt/locale/bitcoin_ja.ts b/src/qt/locale/bitcoin_ja.ts
index 4344fd0436323..06fd27fa161a5 100644
--- a/src/qt/locale/bitcoin_ja.ts
+++ b/src/qt/locale/bitcoin_ja.ts
@@ -1473,10 +1473,6 @@
         <source>General</source>
         <translation>一般</translation>
     </message>
-    <message>
-        <source>Using OpenSSL version</source>
-        <translation>使用中の OpenSSL のバージョン</translation>
-    </message>
     <message>
         <source>Using BerkeleyDB version</source>
         <translation>使用中のBerkleyDBバージョン</translation>
@@ -2979,6 +2975,18 @@
         <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
         <translation>外部からの接続を許可 (初期値:  -proxy または -connect を使用していない場合は1)</translation>
     </message>
+    <message>
+        <source>-fallbackfee is set very high! This is the transaction fee you may pay when fee estimates are not available.</source>
+        <translation>-fallbackfee が高すぎます！これは手数料の推定機能が利用できない場合に支払うトランザクション手数料です。</translation>
+    </message>
+    <message>
+        <source>A fee rate (in %s/kB) that will be used when fee estimation has insufficient data (default: %s)</source>
+        <translation>十分なデータが蓄積されていない場合に手数料推定機能が利用する手数料レート (%s/kB) (デフォルト: %s)</translation>
+    </message>
+    <message>
+        <source>Accept relayed transactions received from whitelisted peers even when not relaying transactions (default: %d)</source>
+        <translation>トランザクションの中継を行っていない場合でも、ホワイトリストのピアから受け取った中継トランザクションは受け取るようにする (デフォルト: %d)</translation>
+    </message>
     <message>
         <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source>
         <translation>指定のアドレスへバインドし、その上で常にリスンします。IPv6 は [ホスト名]:ポート番号 と表記します</translation>
@@ -2995,6 +3003,10 @@
         <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source>
         <translation>ウォレットの取引を変更する際にコマンドを実行 (cmd の %s は TxID に置換される)</translation>
     </message>
+    <message>
+        <source>Force relay of transactions from whitelisted peers even they violate local relay policy (default: %d)</source>
+        <translation>ホワイトリストのピアから受け取ったトランザクションに関しては、たとえローカルの中継ポリシーに違反しているとしても中継を行うようにする (デフォルト: %d)</translation>
+    </message>
     <message>
         <source>Set the number of script verification threads (%u to %d, 0 = auto, &lt;0 = leave that many cores free, default: %d)</source>
         <translation>スクリプト検証スレッドを設定 (%uから%dの間, 0 = 自動, &lt;0 = たくさんのコアを自由にしておく, 初期値: %d)</translation>
@@ -3011,6 +3023,10 @@
         <source>Unable to bind to %s on this computer. Bitcoin Core is probably already running.</source>
         <translation>このコンピュータの %s にバインドすることができません。おそらく Bitcoin Core は既に実行されています。</translation>
     </message>
+    <message>
+        <source>Unsupported argument -whitelistalwaysrelay ignored, use -whitelistrelay and/or -whitelistforcerelay.</source>
+        <translation>サポートされていない引数 -whitelistalwaysrelay は無視されました。-whitelistrelay または -whitelistforcerelay を利用してください</translation>
+    </message>
     <message>
         <source>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</source>
         <translation>リスン ポートの割当に UPnP を使用 (初期値: リスン中および-proxyが指定されていない場合は1)</translation>
@@ -3027,6 +3043,10 @@
         <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source>
         <translation>警告： ネットワークは完全に同意しないみたいです。マイナーは何かの問題を経験してるみたいなんです。</translation>
     </message>
+    <message>
+        <source>Warning: Unknown block versions being mined! It's possible unknown rules are in effect</source>
+        <translation>警告: 未知のバージョンのブロックが採掘されました。未知のルールが導入された可能性があります</translation>
+    </message>
     <message>
         <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source>
         <translation>警告： ピアーと完全に同意しないみたいです！アップグレードは必要かもしれません、それとも他のノードはアップグレードは必要かもしれません。</translation>
@@ -3047,6 +3067,10 @@
         <source>&lt;category&gt; can be:</source>
         <translation>&lt;category&gt;は以下の値を指定できます：</translation>
     </message>
+    <message>
+        <source>Append comment to the user agent string</source>
+        <translation>ユーザエージェント文字列にコメントを</translation>
+    </message>
     <message>
         <source>Block creation options:</source>
         <translation>ブロック作成オプション:</translation>
@@ -3092,6 +3116,10 @@
         <source>Enable publish raw transaction in &lt;address&gt;</source>
         <translation>&lt;address&gt; に対し、生トランザクションの公開を有効にする</translation>
     </message>
+    <message>
+        <source>Enable transaction replacement in the memory pool (default: %u)</source>
+        <translation>メモリプール内のトランザクションの置換を有効化する (デフォルト: %u)</translation>
+    </message>
     <message>
         <source>Error initializing block database</source>
         <translation>ブロック データベースの初期化中にエラー</translation>
@@ -3128,10 +3156,22 @@
         <source>Invalid -onion address: '%s'</source>
         <translation>無効な -onion アドレス：'%s'</translation>
     </message>
+    <message>
+        <source>Invalid amount for -fallbackfee=&lt;amount&gt;: '%s'</source>
+        <translation>不正な額 -fallbackfee=&lt;amount&gt;: '%s'</translation>
+    </message>
     <message>
         <source>Keep the transaction memory pool below &lt;n&gt; megabytes (default: %u)</source>
         <translation>トランザクションのメモリ・プールの総量を &lt;n&gt; メガバイト以下に維持する (初期値: %u)</translation>
     </message>
+    <message>
+        <source>Location of the auth cookie (default: data dir)</source>
+        <translation>認証クッキーの場所 (デフォルト: )</translation>
+    </message>
+    <message>
+        <source>Minimum bytes per sigop in transactions we relay and mine (default: %u)</source>
+        <translation>中継や採掘を行ってもよい、sigopあたりの最小バイト数 (デフォルト: %u)</translation>
+    </message>
     <message>
         <source>Not enough file descriptors available.</source>
         <translation>使用可能なファイルディスクリプタが不足しています。</translation>
@@ -3140,6 +3180,10 @@
         <source>Only connect to nodes in network &lt;net&gt; (ipv4, ipv6 or onion)</source>
         <translation>&lt;net&gt; (ipv4, ipv6 または onion) ネットワーク内のノードだけに接続する</translation>
     </message>
+    <message>
+        <source>Print version and exit</source>
+        <translation>バージョンを表示し終了</translation>
+    </message>
     <message>
         <source>Prune cannot be configured with a negative value.</source>
         <translation>剪定値は負の値に設定できません。</translation>
@@ -3196,10 +3240,6 @@
         <source>Wallet options:</source>
         <translation>ウォレットオプション：</translation>
     </message>
-    <message>
-        <source>Warning: This version is obsolete; upgrade required!</source>
-        <translation>警告: このバージョンはサポートされません。アップグレードが必要です！</translation>
-    </message>
     <message>
         <source>You need to rebuild the database using -reindex to change -txindex</source>
         <translation>-txindex を変更するには -reindex を使用してデータベースを再構築する必要があります</translation>
@@ -3296,10 +3336,6 @@
         <source>Activating best chain...</source>
         <translation>最優良のチェインを有効化しています...</translation>
     </message>
-    <message>
-        <source>Always relay transactions received from whitelisted peers (default: %d)</source>
-        <translation>ホワイトリストにあるピアから受け取ったトランザクションを常にリレーする (初期値: %d)</translation>
-    </message>
     <message>
         <source>Attempt to recover private keys from a corrupt wallet.dat on startup</source>
         <translation>起動時に壊れた wallet.dat から秘密鍵を復旧することを試す</translation>
@@ -3464,6 +3500,10 @@
         <source>Warning</source>
         <translation>警告</translation>
     </message>
+    <message>
+        <source>Warning: unknown new rules activated (versionbit %i)</source>
+        <translation>警告: 未知の新しいルールが有効化されました (バージョンビット %i)</translation>
+    </message>
     <message>
         <source>Whether to operate in a blocks only mode (default: %u)</source>
         <translation>ブロック限定モードにおいて動作を行うかどうか (初期値: %u)</translation>
diff --git a/src/qt/locale/bitcoin_ka.ts b/src/qt/locale/bitcoin_ka.ts
index 11c73ec76794b..1a072d1df116b 100644
--- a/src/qt/locale/bitcoin_ka.ts
+++ b/src/qt/locale/bitcoin_ka.ts
@@ -1111,10 +1111,6 @@
         <source>General</source>
         <translation>საერთო</translation>
     </message>
-    <message>
-        <source>Using OpenSSL version</source>
-        <translation>OpenSSL-ის ვერსია</translation>
-    </message>
     <message>
         <source>Startup time</source>
         <translation>სტარტის დრო</translation>
diff --git a/src/qt/locale/bitcoin_ko_KR.ts b/src/qt/locale/bitcoin_ko_KR.ts
index ce48ce249fffc..34aeafcd5ca94 100644
--- a/src/qt/locale/bitcoin_ko_KR.ts
+++ b/src/qt/locale/bitcoin_ko_KR.ts
@@ -11,7 +11,7 @@
     </message>
     <message>
         <source>&amp;New</source>
-        <translation>새 항목(N)</translation>
+        <translation>새 항목(&amp;N)</translation>
     </message>
     <message>
         <source>Copy the currently selected address to the system clipboard</source>
@@ -19,11 +19,11 @@
     </message>
     <message>
         <source>&amp;Copy</source>
-        <translation>복사</translation>
+        <translation>복사(&amp;C)</translation>
     </message>
     <message>
         <source>C&amp;lose</source>
-        <translation>닫기 (L)</translation>
+        <translation>닫기(&amp;L)</translation>
     </message>
     <message>
         <source>&amp;Copy Address</source>
@@ -39,11 +39,11 @@
     </message>
     <message>
         <source>&amp;Export</source>
-        <translation>&amp;내보내기</translation>
+        <translation>내보내기(&amp;E)</translation>
     </message>
     <message>
         <source>&amp;Delete</source>
-        <translation>&amp;삭제</translation>
+        <translation>삭제(&amp;D)</translation>
     </message>
     <message>
         <source>Choose the address to send coins to</source>
@@ -55,7 +55,7 @@
     </message>
     <message>
         <source>C&amp;hoose</source>
-        <translation>선택하기 (H)</translation>
+        <translation>선택하기(&amp;H)</translation>
     </message>
     <message>
         <source>Sending addresses</source>
@@ -67,7 +67,7 @@
     </message>
     <message>
         <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source>
-        <translation>비트코인을 받는 계좌 주소입니다. 코인을 보내기 전에 잔고와 받는 주소를 항상 확인하세요.</translation>
+        <translation>비트코인을 보내는 계좌 주소입니다. 코인을 보내기 전에 잔고와 받는 주소를 항상 확인하세요.</translation>
     </message>
     <message>
         <source>These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source>
@@ -75,11 +75,11 @@
     </message>
     <message>
         <source>Copy &amp;Label</source>
-        <translation>라벨 복사</translation>
+        <translation>라벨 복사(&amp;L)</translation>
     </message>
     <message>
         <source>&amp;Edit</source>
-        <translation>편집&amp;</translation>
+        <translation>편집(&amp;E)</translation>
     </message>
     <message>
         <source>Export Address List</source>
@@ -167,6 +167,10 @@
         <source>Are you sure you wish to encrypt your wallet?</source>
         <translation>지갑 암호화를 허용하시겠습니까?</translation>
     </message>
+    <message>
+        <source>Bitcoin Core will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source>
+        <translation>비트코인 코어는 암호화 과정을 마무리 하기 위해 종료됩니다. 당신의 지갑을 암호화하는 것이 여러분의 컴퓨터에 해를 끼치는 프로그램으로부터 여러분의 비트코인을 완전히 보호해주지는 못한다는 사실을 기억하십시오.</translation>
+    </message>
     <message>
         <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source>
         <translation>중요: 본인 지갑파일에서 만든 예전 백업들은 새로 생성한 암호화 된 지갑 파일로 교체됩니다. 보안상 이유로 이전에 암호화 하지 않은 지갑 파일 백업은 사용할 수 없게 되니 빠른 시일 내로 새로 암호화 된 지갑을 사용하시기 바랍니다.</translation>
@@ -179,6 +183,10 @@
         <source>Wallet encrypted</source>
         <translation>지갑 암호화 완료</translation>
     </message>
+    <message>
+        <source>Enter the new passphrase to the wallet.&lt;br/&gt;Please use a passphrase of &lt;b&gt;ten or more random characters&lt;/b&gt;, or &lt;b&gt;eight or more words&lt;/b&gt;.</source>
+        <translation>지갑에 새로운 비밀문구를 입력하세요.&lt;br/&gt;비밀문구를 &lt;b&gt;열 개 이상의 무작위 글자&lt;/b&gt; 혹은 &lt;b&gt;여덟개 이상의 단어로&lt;b&gt; 정하세요.</translation>
+    </message>
     <message>
         <source>Enter the old passphrase and new passphrase to the wallet.</source>
         <translation>지갑의 기존 암호와 새로운 암호를 입력해주세요.</translation>
@@ -189,7 +197,7 @@
     </message>
     <message>
         <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
-        <translation>지갑 암호화는 내부 에러로 인해 실패했습니다.  당신의 지갑은 암호화 되지 않았습니다.</translation>
+        <translation>지갑 암호화는 내부 오류로 인해 실패했습니다.  당신의 지갑은 암호화 되지 않았습니다.</translation>
     </message>
     <message>
         <source>The supplied passphrases do not match.</source>
@@ -214,12 +222,20 @@
 </context>
 <context>
     <name>BanTableModel</name>
-    </context>
+    <message>
+        <source>IP/Netmask</source>
+        <translation>IP주소/넷마스크</translation>
+    </message>
+    <message>
+        <source>Banned Until</source>
+        <translation>다음과 같은 상황이 될 때까지 계정 정지됩니다.</translation>
+    </message>
+</context>
 <context>
     <name>BitcoinGUI</name>
     <message>
         <source>Sign &amp;message...</source>
-        <translation>메시지 서명&amp;...</translation>
+        <translation>메시지 서명(&amp;M)...</translation>
     </message>
     <message>
         <source>Synchronizing with network...</source>
@@ -227,7 +243,7 @@
     </message>
     <message>
         <source>&amp;Overview</source>
-        <translation>&amp;개요</translation>
+        <translation>개요(&amp;O)</translation>
     </message>
     <message>
         <source>Node</source>
@@ -239,7 +255,7 @@
     </message>
     <message>
         <source>&amp;Transactions</source>
-        <translation>&amp;거래</translation>
+        <translation>거래(&amp;T)</translation>
     </message>
     <message>
         <source>Browse transaction history</source>
@@ -251,11 +267,11 @@
     </message>
     <message>
         <source>Quit application</source>
-        <translation>적용 중단</translation>
+        <translation>어플리케이션 종료</translation>
     </message>
     <message>
         <source>About &amp;Qt</source>
-        <translation>Qt 정보(&amp;Q)</translation>
+        <translation>&amp;Qt 정보</translation>
     </message>
     <message>
         <source>Show information about Qt</source>
@@ -263,31 +279,31 @@
     </message>
     <message>
         <source>&amp;Options...</source>
-        <translation>&amp;옵션</translation>
+        <translation>옵션(&amp;O)</translation>
     </message>
     <message>
         <source>&amp;Encrypt Wallet...</source>
-        <translation>지갑 암호화&amp;...</translation>
+        <translation>지갑 암호화(&amp;E)...</translation>
     </message>
     <message>
         <source>&amp;Backup Wallet...</source>
-        <translation>지갑 백업&amp;...</translation>
+        <translation>지갑 백업(&amp;B)...</translation>
     </message>
     <message>
         <source>&amp;Change Passphrase...</source>
-        <translation>암호문 변경&amp;...</translation>
+        <translation>암호문 변경(&amp;C)...</translation>
     </message>
     <message>
         <source>&amp;Sending addresses...</source>
-        <translation>&amp;주소 보내는 중</translation>
+        <translation>보내는 주소(&amp;S)</translation>
     </message>
     <message>
         <source>&amp;Receiving addresses...</source>
-        <translation>&amp; 주소 받는 중</translation>
+        <translation>받는 주소(&amp;R)</translation>
     </message>
     <message>
         <source>Open &amp;URI...</source>
-        <translation>URI&amp;열기...</translation>
+        <translation>&amp;URI 열기...</translation>
     </message>
     <message>
         <source>Bitcoin Core client</source>
@@ -315,7 +331,7 @@
     </message>
     <message>
         <source>&amp;Debug window</source>
-        <translation>디버그 창&amp;</translation>
+        <translation>디버그 창(&amp;D)</translation>
     </message>
     <message>
         <source>Open debugging and diagnostic console</source>
@@ -323,7 +339,7 @@
     </message>
     <message>
         <source>&amp;Verify message...</source>
-        <translation>메시지 확인&amp;...</translation>
+        <translation>메시지 확인(&amp;V)...</translation>
     </message>
     <message>
         <source>Bitcoin</source>
@@ -367,15 +383,15 @@
     </message>
     <message>
         <source>&amp;File</source>
-        <translation>&amp;파일</translation>
+        <translation>파일(&amp;F)</translation>
     </message>
     <message>
         <source>&amp;Settings</source>
-        <translation>&amp;설정</translation>
+        <translation>설정(&amp;S)</translation>
     </message>
     <message>
         <source>&amp;Help</source>
-        <translation>&amp;도움말</translation>
+        <translation>도움말(&amp;H)</translation>
     </message>
     <message>
         <source>Tabs toolbar</source>
@@ -391,7 +407,11 @@
     </message>
     <message>
         <source>&amp;About Bitcoin Core</source>
-        <translation>&amp;비트코인 코어 소개</translation>
+        <translation>비트코인 코어 소개(&amp;A)</translation>
+    </message>
+    <message>
+        <source>Modify configuration options for Bitcoin Core</source>
+        <translation>비트코인 코어에 대한 설정을 수정합니다.</translation>
     </message>
     <message>
         <source>Show the list of used sending addresses and labels</source>
@@ -407,16 +427,24 @@
     </message>
     <message>
         <source>&amp;Command-line options</source>
-        <translation>명령어-라인 옵션</translation>
+        <translation>명령줄 옵션(&amp;C)</translation>
     </message>
     <message>
         <source>Show the Bitcoin Core help message to get a list with possible Bitcoin command-line options</source>
-        <translation>사용할 수 있는 비트코인 명령어 옵션 목록을 가져오기 위해 Bitcoin-Qt 도움말 메시지를 표시합니다.</translation>
+        <translation>사용할 수 있는 비트코인 명령줄 옵션 목록을 가져오기 위해 Bitcoin-Qt 도움말 메시지를 표시합니다.</translation>
+    </message>
+    <message numerus="yes">
+        <source>%n active connection(s) to Bitcoin network</source>
+        <translation><numerusform>비트코인 네트워크에 %n개의 연결이 활성화되어 있습니다.</numerusform></translation>
     </message>
     <message>
         <source>No block source available...</source>
         <translation>사용 가능한 블록이 없습니다...</translation>
     </message>
+    <message numerus="yes">
+        <source>Processed %n block(s) of transaction history.</source>
+        <translation><numerusform>%n 블럭 만큼의 거래 기록이 처리됨.</numerusform></translation>
+    </message>
     <message numerus="yes">
         <source>%n hour(s)</source>
         <translation><numerusform>%n시간</numerusform></translation>
@@ -575,7 +603,15 @@
     </message>
     <message>
         <source>Amount</source>
-        <translation>거래량</translation>
+        <translation>거래액</translation>
+    </message>
+    <message>
+        <source>Received with label</source>
+        <translation>입금과 함께 수신된 라벨</translation>
+    </message>
+    <message>
+        <source>Received with address</source>
+        <translation>입금과 함께 수신된 주소</translation>
     </message>
     <message>
         <source>Date</source>
@@ -599,11 +635,11 @@
     </message>
     <message>
         <source>Copy label</source>
-        <translation>표 복사하기</translation>
+        <translation>라벨 복사하기</translation>
     </message>
     <message>
         <source>Copy amount</source>
-        <translation>거래량 복사</translation>
+        <translation>거래액 복사</translation>
     </message>
     <message>
         <source>Copy transaction ID</source>
@@ -637,6 +673,14 @@
         <source>Copy priority</source>
         <translation>우선도 복사</translation>
     </message>
+    <message>
+        <source>Copy dust</source>
+        <translation>더스트 복사</translation>
+    </message>
+    <message>
+        <source>Copy change</source>
+        <translation>잔돈 복사</translation>
+    </message>
     <message>
         <source>highest</source>
         <translation>아주 높음</translation>
@@ -681,6 +725,22 @@
         <source>none</source>
         <translation>없음</translation>
     </message>
+    <message>
+        <source>This label turns red if the transaction size is greater than 1000 bytes.</source>
+        <translation>이 라벨은 1000바이트 이상의 거래가 이루어지면 붉게 변합니다.</translation>
+    </message>
+    <message>
+        <source>This label turns red if the priority is smaller than "medium".</source>
+        <translation>이 라벨은 우선순위가 "보통" 이하인 경우 붉게 변합니다.</translation>
+    </message>
+    <message>
+        <source>This label turns red if any recipient receives an amount smaller than %1.</source>
+        <translation>이 라벨은 수령인이 받은 액수가 잔고의 %1보다 작으면 붉게 변합니다.</translation>
+    </message>
+    <message>
+        <source>Can vary +/- %1 satoshi(s) per input.</source>
+        <translation>입력마다 +/- %1 사토시가 변할 수 있습니다.</translation>
+    </message>
     <message>
         <source>yes</source>
         <translation>예</translation>
@@ -691,7 +751,11 @@
     </message>
     <message>
         <source>This means a fee of at least %1 per kB is required.</source>
-        <translation>이 의미는 수수료가 최소한 %1 per 키로바이트 필요합니다</translation>
+        <translation>이 뜻은 최소한 1kB 당 %1의 수수료가 필요하다는 의미입니다.</translation>
+    </message>
+    <message>
+        <source>Can vary +/- 1 byte per input.</source>
+        <translation>입력마다 +/- 1 바이트가 변할 수 있습니다.</translation>
     </message>
     <message>
         <source>Transactions with higher priority are more likely to get included into a block.</source>
@@ -699,13 +763,17 @@
     </message>
     <message>
         <source>(no label)</source>
-        <translation>(표 없음)</translation>
+        <translation>(라벨 없음)</translation>
     </message>
     <message>
         <source>change from %1 (%2)</source>
         <translation>~로부터 변경 %1 (%2)</translation>
     </message>
-    </context>
+    <message>
+        <source>(change)</source>
+        <translation>(잔돈)</translation>
+    </message>
+</context>
 <context>
     <name>EditAddressDialog</name>
     <message>
@@ -714,15 +782,19 @@
     </message>
     <message>
         <source>&amp;Label</source>
-        <translation>&amp;표</translation>
+        <translation>라벨(&amp;L)</translation>
     </message>
     <message>
         <source>The label associated with this address list entry</source>
         <translation>현재 선택된 주소 필드의 제목입니다. </translation>
     </message>
+    <message>
+        <source>The address associated with this address list entry. This can only be modified for sending addresses.</source>
+        <translation>본 주소록 입력은 주소와 연계되었습니다.  이것은 보내는 주소들에서만 변경될수 있습니다.</translation>
+    </message>
     <message>
         <source>&amp;Address</source>
-        <translation>&amp;주소</translation>
+        <translation>주소(&amp;A)</translation>
     </message>
     <message>
         <source>New receiving address</source>
@@ -754,7 +826,7 @@
     </message>
     <message>
         <source>New key generation failed.</source>
-        <translation>새로운 키 생성이 실패하였습니다</translation>
+        <translation>새로운 키 생성이 실패하였습니다.</translation>
     </message>
 </context>
 <context>
@@ -810,7 +882,35 @@
         <source>command-line options</source>
         <translation>명령줄 옵션</translation>
     </message>
-    </context>
+    <message>
+        <source>UI Options:</source>
+        <translation>UI 옵션:</translation>
+    </message>
+    <message>
+        <source>Choose data directory on startup (default: %u)</source>
+        <translation>실행시 데이터 폴더 선택하기 (기본값: %u)</translation>
+    </message>
+    <message>
+        <source>Set language, for example "de_DE" (default: system locale)</source>
+        <translation>"ko_KR"와 같이 언어를 설정하십시오 (기본값: 시스템 로캘)</translation>
+    </message>
+    <message>
+        <source>Start minimized</source>
+        <translation>최소화된 상태에서 시작</translation>
+    </message>
+    <message>
+        <source>Set SSL root certificates for payment request (default: -system-)</source>
+        <translation>지불 요청을 위한 SSL 루트 인증서 설정 (기본값: -system-)</translation>
+    </message>
+    <message>
+        <source>Show splash screen on startup (default: %u)</source>
+        <translation>실행시 시작화면 보기 (기본값: %u)</translation>
+    </message>
+    <message>
+        <source>Reset all settings changes made over the GUI</source>
+        <translation>GUI를 통해 수정된 모든 설정을 초기화</translation>
+    </message>
+</context>
 <context>
     <name>Intro</name>
     <message>
@@ -819,7 +919,7 @@
     </message>
     <message>
         <source>Welcome to Bitcoin Core.</source>
-        <translation>비트코인 코어에 오신것을 환영합니.</translation>
+        <translation>비트코인 코어에 오신것을 환영합니다.</translation>
     </message>
     <message>
         <source>As this is the first time the program is launched, you can choose where Bitcoin Core will store its data.</source>
@@ -841,11 +941,23 @@
         <source>Bitcoin Core</source>
         <translation>비트코인 코어</translation>
     </message>
+    <message>
+        <source>Error: Specified data directory "%1" cannot be created.</source>
+        <translation>오류: "%1" 지정한 데이터 디렉토리를 생성할 수 없습니다.</translation>
+    </message>
     <message>
         <source>Error</source>
         <translation>오류</translation>
     </message>
-    </context>
+    <message numerus="yes">
+        <source>%n GB of free space available</source>
+        <translation><numerusform>%n GB 사용가능</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>(of %n GB needed)</source>
+        <translation><numerusform>(%n GB가 필요)</numerusform></translation>
+    </message>
+</context>
 <context>
     <name>OpenURIDialog</name>
     <message>
@@ -873,7 +985,7 @@
     <name>OptionsDialog</name>
     <message>
         <source>Options</source>
-        <translation>선택들</translation>
+        <translation>환경설정</translation>
     </message>
     <message>
         <source>&amp;Main</source>
@@ -881,7 +993,7 @@
     </message>
     <message>
         <source>Size of &amp;database cache</source>
-        <translation>데이터베이스 캐시 크기</translation>
+        <translation>데이터베이스 캐시 크기(&amp;D)</translation>
     </message>
     <message>
         <source>MB</source>
@@ -889,7 +1001,7 @@
     </message>
     <message>
         <source>Number of script &amp;verification threads</source>
-        <translation>스크립트 인증 쓰레드의 개수</translation>
+        <translation>스크립트 인증 쓰레드의 개수(&amp;V)</translation>
     </message>
     <message>
         <source>Accept connections from outside</source>
@@ -901,7 +1013,19 @@
     </message>
     <message>
         <source>IP address of the proxy (e.g. IPv4: 127.0.0.1 / IPv6: ::1)</source>
-        <translation>프록시 아이피 주소(예. IPv4:127.0.0.1 / IPv6: ::1)</translation>
+        <translation>프록시 아이피 주소 (예. IPv4:127.0.0.1 / IPv6: ::1)</translation>
+    </message>
+    <message>
+        <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Exit in the menu.</source>
+        <translation>창을 닫으면 종료 대신 트레이로 보내기. 이 옵션을 활성화하면 메뉴에서 종료를 선택한 후에만 어플리케이션이 종료됩니다.</translation>
+    </message>
+    <message>
+        <source>The user interface language can be set here. This setting will take effect after restarting Bitcoin Core.</source>
+        <translation>사용자 인터페이스 언어를 여기서 설정할 수 있습니다. 이 설정은 Bitcoin Core를 다시 시작할 때 적용됩니다.</translation>
+    </message>
+    <message>
+        <source>Third party URLs (e.g. a block explorer) that appear in the transactions tab as context menu items. %s in the URL is replaced by transaction hash. Multiple URLs are separated by vertical bar |.</source>
+        <translation>서드-파티 URLs (예. 블록 탐색기)는 거래 탭의 컨텍스트 메뉴에 나타납니다. URL의 %s는 트랜잭션 해시값으로 대체됩니다. 여러 URLs는 수직 바 | 에서 나누어 집니다.</translation>
     </message>
     <message>
         <source>Third party transaction URLs</source>
@@ -909,7 +1033,7 @@
     </message>
     <message>
         <source>Active command-line options that override above options:</source>
-        <translation>명령어 라인 옵션을 활성화해서 옵션을 우회하시오</translation>
+        <translation>명령줄 옵션 활성화는 위의 옵션들을 대체합니다:</translation>
     </message>
     <message>
         <source>Reset all client options to default.</source>
@@ -923,9 +1047,21 @@
         <source>&amp;Network</source>
         <translation>네트워크(&amp;N)</translation>
     </message>
+    <message>
+        <source>Automatically start Bitcoin Core after logging in to the system.</source>
+        <translation>시스템 로그인 후 자동으로 Bitcoin Core를 실행합니다.</translation>
+    </message>
+    <message>
+        <source>&amp;Start Bitcoin Core on system login</source>
+        <translation>시스템 로그인 후 Bitcoin Core 시작(&amp;S)</translation>
+    </message>
+    <message>
+        <source>(0 = auto, &lt;0 = leave that many cores free)</source>
+        <translation>(0 = 자동, &lt;0 = 지정된 코어 개수만큼 사용 안함)</translation>
+    </message>
     <message>
         <source>W&amp;allet</source>
-        <translation>지갑</translation>
+        <translation>지갑(&amp;A)</translation>
     </message>
     <message>
         <source>Expert</source>
@@ -933,19 +1069,23 @@
     </message>
     <message>
         <source>Enable coin &amp;control features</source>
-        <translation>코인 상세 제어기능을 활성화합니다 - &amp;C</translation>
+        <translation>코인 상세 제어기능을 활성화합니다 (&amp;C)</translation>
+    </message>
+    <message>
+        <source>If you disable the spending of unconfirmed change, the change from a transaction cannot be used until that transaction has at least one confirmation. This also affects how your balance is computed.</source>
+        <translation>검증되지 않은 잔돈 쓰기를 비활성화하면 트랜잭션이 적어도 1회 이상 검증되기 전까지 그 트랜잭션의 거스름돈은 사용할 수 없습니다. 이는 잔액 계산 방법에도 영향을 미칩니다.</translation>
     </message>
     <message>
         <source>&amp;Spend unconfirmed change</source>
-        <translation>&amp;확인되지 않은 돈을 쓰다</translation>
+        <translation>검증되지 않은 잔돈 쓰기 (&amp;S)</translation>
     </message>
     <message>
         <source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source>
-        <translation>라우터의 비트코인 클라이언트 포트를 자동으로 엽니다. 라우터에서 UPnP를 지원하고 활성화 했을 경우에만 동작합니다.</translation>
+        <translation>라우터에서 Bitcoin 클라이언트 포트를 자동적으로 엽니다. 라우터에서 UPnP를 지원하고 활성화 했을 경우에만 동작합니다.</translation>
     </message>
     <message>
         <source>Map port using &amp;UPnP</source>
-        <translation>사용중인 UPnP 포트 매핑(&amp;U)</translation>
+        <translation>사용중인 &amp;UPnP 포트 매핑</translation>
     </message>
     <message>
         <source>Connect to the Bitcoin network through a SOCKS5 proxy.</source>
@@ -953,11 +1093,11 @@
     </message>
     <message>
         <source>&amp;Connect through SOCKS5 proxy (default proxy):</source>
-        <translation>SOCKS5 프록시를 거쳐 연결합니다 (기본값 프록시):</translation>
+        <translation>SOCKS5 프록시를 거쳐 연결합니다(&amp;C) (기본 프록시):</translation>
     </message>
     <message>
         <source>Proxy &amp;IP:</source>
-        <translation>프록시 IP(&amp;I):</translation>
+        <translation>프록시 &amp;IP:</translation>
     </message>
     <message>
         <source>&amp;Port:</source>
@@ -967,6 +1107,14 @@
         <source>Port of the proxy (e.g. 9050)</source>
         <translation>프록시의 포트번호입니다(예: 9050)</translation>
     </message>
+    <message>
+        <source>Used for reaching peers via:</source>
+        <translation>피어에 연결하기 위해 사용된 방법:</translation>
+    </message>
+    <message>
+        <source>Shows, if the supplied default SOCKS5 proxy is used to reach peers via this network type.</source>
+        <translation>이 SOCK5 프록시를 통과해 피어와 접속한 네트워크 유형이 표시됩니다.</translation>
+    </message>
     <message>
         <source>IPv4</source>
         <translation>IPv4</translation>
@@ -979,6 +1127,14 @@
         <source>Tor</source>
         <translation>Tor</translation>
     </message>
+    <message>
+        <source>Connect to the Bitcoin network through a separate SOCKS5 proxy for Tor hidden services.</source>
+        <translation>Tor 서비스를 경유하여 비트코인 네트워크에 연결하기 위해 분리된 SOCKS5 프록시를 사용.</translation>
+    </message>
+    <message>
+        <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services:</source>
+        <translation>Tor 서비스를 이용하여 피어에게 연결하기 위해 분리된 SOCKS5 프록시 사용</translation>
+    </message>
     <message>
         <source>&amp;Window</source>
         <translation>창(&amp;W)</translation>
@@ -1039,6 +1195,10 @@
         <source>Client restart required to activate changes.</source>
         <translation>변경 사항을 적용하기 위해서는 프로그램이 종료 후 재시작되어야 합니다.</translation>
     </message>
+    <message>
+        <source>Client will be shut down. Do you want to proceed?</source>
+        <translation>클라이언트가 종료됩니다, 계속 진행하시겠습니까?</translation>
+    </message>
     <message>
         <source>This change would require a client restart.</source>
         <translation>이 변경 사항 적용을 위해 프로그램 재시작이 필요합니다. </translation>
@@ -1056,7 +1216,7 @@
     </message>
     <message>
         <source>The displayed information may be out of date. Your wallet automatically synchronizes with the Bitcoin network after a connection is established, but this process has not completed yet.</source>
-        <translation>표시한 정보가 오래된 것 같습니다. 비트코인 네트워크에 연결하고 난 다음에 지갑을 자동으로 동기화 하지만, 아직 과정이 끝나지는 않았습니다.</translation>
+        <translation>표시된 정보가 오래된 것 같습니다. 비트코인 네트워크에 연결하고 난 다음에 지갑을 자동으로 동기화 하지만, 아직 과정이 끝나지는 않았습니다.</translation>
     </message>
     <message>
         <source>Watch-only:</source>
@@ -1102,11 +1262,27 @@
         <source>Your current balance in watch-only addresses</source>
         <translation>모니터링 지갑의 현재 잔액</translation>
     </message>
+    <message>
+        <source>Spendable:</source>
+        <translation>사용가능:</translation>
+    </message>
     <message>
         <source>Recent transactions</source>
         <translation>최근 거래</translation>
     </message>
-    </context>
+    <message>
+        <source>Unconfirmed transactions to watch-only addresses</source>
+        <translation>모니터링 지갑의 검증되지 않은 트랜잭션</translation>
+    </message>
+    <message>
+        <source>Mined balance in watch-only addresses that has not yet matured</source>
+        <translation>모니터링 지갑의 채굴된 잔액 중 숙성되지 않은 것</translation>
+    </message>
+    <message>
+        <source>Current total balance in watch-only addresses</source>
+        <translation>모니터링 지갑의 현재 잔액</translation>
+    </message>
+</context>
 <context>
     <name>PaymentServer</name>
     <message>
@@ -1117,13 +1293,25 @@
         <source>Invalid payment address %1</source>
         <translation>잘못된 지불 주소입니다 %1</translation>
     </message>
+    <message>
+        <source>Payment request rejected</source>
+        <translation>지불 요청이 거부됨</translation>
+    </message>
+    <message>
+        <source>Payment request network doesn't match client network.</source>
+        <translation>지급 요청 네트워크가 클라이언트 네트워크와 일치되지 않습니다.</translation>
+    </message>
+    <message>
+        <source>Payment request is not initialized.</source>
+        <translation>지불 요청이 초기화 되지 않았습니다.</translation>
+    </message>
     <message>
         <source>Requested payment amount of %1 is too small (considered dust).</source>
         <translation>요청한 금액 %1의 양이 너무 적습니다. (스팸성 거래로 간주)</translation>
     </message>
     <message>
         <source>Payment request error</source>
-        <translation>지불 요청 애러</translation>
+        <translation>지불 요청 오류</translation>
     </message>
     <message>
         <source>Cannot start bitcoin: click-to-pay handler</source>
@@ -1133,21 +1321,45 @@
         <source>Payment request fetch URL is invalid: %1</source>
         <translation>대금 청구서의 URL이 올바르지 않습니다: %1</translation>
     </message>
+    <message>
+        <source>URI cannot be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source>
+        <translation>URI의 파싱에 문제가 발생했습니다. 잘못된 비트코인 주소나 URI 파라미터 구성에 오류가 존재할 수 있습니다.</translation>
+    </message>
     <message>
         <source>Payment request file handling</source>
         <translation>지불이 파일 처리를 요청합니다</translation>
     </message>
+    <message>
+        <source>Payment request file cannot be read! This can be caused by an invalid payment request file.</source>
+        <translation>지불 요청 파일을 읽을 수 없습니다. 이것은 잘못된 지불 요청 파일에 의해 발생하는 오류일 수 있습니다.</translation>
+    </message>
+    <message>
+        <source>Payment request expired.</source>
+        <translation>지불 요청이 만료됨.</translation>
+    </message>
     <message>
         <source>Unverified payment requests to custom payment scripts are unsupported.</source>
         <translation>임의로 변경한 결제 스크립트 기반의 대금 청구서 양식은 검증되기 전까지는 지원되지 않습니다.</translation>
     </message>
+    <message>
+        <source>Invalid payment request.</source>
+        <translation>잘못된 지불 요청.</translation>
+    </message>
     <message>
         <source>Refund from %1</source>
         <translation>%1 으로부터의 환불</translation>
     </message>
+    <message>
+        <source>Payment request %1 is too large (%2 bytes, allowed %3 bytes).</source>
+        <translation>지불 요청 %1은 너무 큽니다 (%2 바이트, %3 바이트까지 허용됩니다).</translation>
+    </message>
     <message>
         <source>Error communicating with %1: %2</source>
-        <translation>%1과 소통하는데 애러: %2</translation>
+        <translation>%1과 소통하는데 오류: %2</translation>
+    </message>
+    <message>
+        <source>Payment request cannot be parsed!</source>
+        <translation>지불요청을 처리할 수 없습니다.</translation>
     </message>
     <message>
         <source>Bad response from server %1</source>
@@ -1159,22 +1371,38 @@
     </message>
     <message>
         <source>Network request error</source>
-        <translation>네트워크 요청 애러</translation>
+        <translation>네트워크 요청 오류</translation>
     </message>
 </context>
 <context>
     <name>PeerTableModel</name>
-    </context>
+    <message>
+        <source>User Agent</source>
+        <translation>유저 에이전트</translation>
+    </message>
+    <message>
+        <source>Node/Service</source>
+        <translation>노드/서비스</translation>
+    </message>
+    <message>
+        <source>Ping Time</source>
+        <translation>Ping 시간</translation>
+    </message>
+</context>
 <context>
     <name>QObject</name>
     <message>
         <source>Amount</source>
-        <translation>거래량</translation>
+        <translation>거래액</translation>
     </message>
     <message>
         <source>Enter a Bitcoin address (e.g. %1)</source>
         <translation>비트코인 주소를 입력하기 (예. %1)</translation>
     </message>
+    <message>
+        <source>%1 d</source>
+        <translation>%1 일</translation>
+    </message>
     <message>
         <source>%1 h</source>
         <translation>%1 시간</translation>
@@ -1187,6 +1415,10 @@
         <source>%1 s</source>
         <translation>%1 초</translation>
     </message>
+    <message>
+        <source>None</source>
+        <translation>없음</translation>
+    </message>
     <message>
         <source>N/A</source>
         <translation>없음</translation>
@@ -1212,7 +1444,7 @@
     </message>
     <message>
         <source>PNG Image (*.png)</source>
-        <translation>PNG 이미지(*.png)</translation>
+        <translation>PNG 이미지 (*.png)</translation>
     </message>
 </context>
 <context>
@@ -1231,7 +1463,7 @@
     </message>
     <message>
         <source>&amp;Information</source>
-        <translation>정보</translation>
+        <translation>정보(&amp;I)</translation>
     </message>
     <message>
         <source>Debug window</source>
@@ -1241,13 +1473,9 @@
         <source>General</source>
         <translation>일반</translation>
     </message>
-    <message>
-        <source>Using OpenSSL version</source>
-        <translation>사용중인 OpenSSL 버전</translation>
-    </message>
     <message>
         <source>Using BerkeleyDB version</source>
-        <translation>사용중인 BerkeleyDB 버전</translation>
+        <translation>사용 중인 BerkeleyDB 버전</translation>
     </message>
     <message>
         <source>Startup time</source>
@@ -1273,6 +1501,22 @@
         <source>Current number of blocks</source>
         <translation>현재 블럭 수</translation>
     </message>
+    <message>
+        <source>Memory Pool</source>
+        <translation>메모리 풀</translation>
+    </message>
+    <message>
+        <source>Current number of transactions</source>
+        <translation>현재 트랜잭션 수</translation>
+    </message>
+    <message>
+        <source>Memory usage</source>
+        <translation>메모리 사용량</translation>
+    </message>
+    <message>
+        <source>Open the Bitcoin Core debug log file from the current data directory. This can take a few seconds for large log files.</source>
+        <translation>현재의 데이터폴더에서 비트코인 디버그 파일을 엽니다. 용량이 큰 로그 파일은 몇 초가 걸릴 수 있습니다.</translation>
+    </message>
     <message>
         <source>Received</source>
         <translation>받음</translation>
@@ -1283,12 +1527,80 @@
     </message>
     <message>
         <source>&amp;Peers</source>
-        <translation>&amp;피어</translation>
+        <translation>피어(&amp;P)</translation>
+    </message>
+    <message>
+        <source>Banned peers</source>
+        <translation>차단된 피어</translation>
+    </message>
+    <message>
+        <source>Select a peer to view detailed information.</source>
+        <translation>자세한 정보를 보려면 피어를 선택하세요.</translation>
+    </message>
+    <message>
+        <source>Whitelisted</source>
+        <translation>화이트리스트에 포함</translation>
+    </message>
+    <message>
+        <source>Direction</source>
+        <translation>방향</translation>
     </message>
     <message>
         <source>Version</source>
         <translation>버전</translation>
     </message>
+    <message>
+        <source>Starting Block</source>
+        <translation>시작된 블록</translation>
+    </message>
+    <message>
+        <source>Synced Headers</source>
+        <translation>동기화된 헤더</translation>
+    </message>
+    <message>
+        <source>Synced Blocks</source>
+        <translation>동기화된 블록</translation>
+    </message>
+    <message>
+        <source>User Agent</source>
+        <translation>유저 에이전트</translation>
+    </message>
+    <message>
+        <source>Services</source>
+        <translation>서비스</translation>
+    </message>
+    <message>
+        <source>Ban Score</source>
+        <translation>밴 스코어</translation>
+    </message>
+    <message>
+        <source>Connection Time</source>
+        <translation>접속 시간</translation>
+    </message>
+    <message>
+        <source>Last Send</source>
+        <translation>마지막으로 보낸 시간</translation>
+    </message>
+    <message>
+        <source>Last Receive</source>
+        <translation>마지막으로 받은 시간</translation>
+    </message>
+    <message>
+        <source>Ping Time</source>
+        <translation>Ping 시간</translation>
+    </message>
+    <message>
+        <source>The duration of a currently outstanding ping.</source>
+        <translation>현재 진행중인 PING에 걸린 시간.</translation>
+    </message>
+    <message>
+        <source>Ping Wait</source>
+        <translation>Ping 대기</translation>
+    </message>
+    <message>
+        <source>Time Offset</source>
+        <translation>시간 오프셋</translation>
+    </message>
     <message>
         <source>Last block time</source>
         <translation>최종 블럭 시각</translation>
@@ -1303,11 +1615,11 @@
     </message>
     <message>
         <source>&amp;Network Traffic</source>
-        <translation>&amp;네트워크 트래픽</translation>
+        <translation>네트워크 트래픽(&amp;N)</translation>
     </message>
     <message>
         <source>&amp;Clear</source>
-        <translation>&amp;지우기</translation>
+        <translation>지우기(&amp;C)</translation>
     </message>
     <message>
         <source>Totals</source>
@@ -1333,6 +1645,38 @@
         <source>Clear console</source>
         <translation>콘솔 초기화</translation>
     </message>
+    <message>
+        <source>&amp;Disconnect Node</source>
+        <translation>끊긴 노드(&amp;D)</translation>
+    </message>
+    <message>
+        <source>Ban Node for</source>
+        <translation>추방된 노드:</translation>
+    </message>
+    <message>
+        <source>1 &amp;hour</source>
+        <translation>1시간(&amp;H)</translation>
+    </message>
+    <message>
+        <source>1 &amp;day</source>
+        <translation>1일(&amp;D)</translation>
+    </message>
+    <message>
+        <source>1 &amp;week</source>
+        <translation>1주(&amp;W)</translation>
+    </message>
+    <message>
+        <source>1 &amp;year</source>
+        <translation>1년(&amp;Y)</translation>
+    </message>
+    <message>
+        <source>&amp;Unban Node</source>
+        <translation>노드 추방 취소(&amp;U)</translation>
+    </message>
+    <message>
+        <source>Welcome to the Bitcoin Core RPC console.</source>
+        <translation>비트코인 RPC 콘솔에 오신걸 환영합니다</translation>
+    </message>
     <message>
         <source>Use up and down arrows to navigate history, and &lt;b&gt;Ctrl-L&lt;/b&gt; to clear screen.</source>
         <translation>기록을 찾아보려면 위 아래 화살표 키를, 화면을 지우려면 &lt;b&gt;Ctrl-L&lt;/b&gt;키를 사용하십시오.</translation>
@@ -1357,20 +1701,52 @@
         <source>%1 GB</source>
         <translation>%1 기가바이트</translation>
     </message>
-    </context>
+    <message>
+        <source>(node id: %1)</source>
+        <translation>(노드 ID: %1)</translation>
+    </message>
+    <message>
+        <source>via %1</source>
+        <translation>%1 경유</translation>
+    </message>
+    <message>
+        <source>never</source>
+        <translation>없음</translation>
+    </message>
+    <message>
+        <source>Inbound</source>
+        <translation>인바운드</translation>
+    </message>
+    <message>
+        <source>Outbound</source>
+        <translation>아웃바운드</translation>
+    </message>
+    <message>
+        <source>Yes</source>
+        <translation>예</translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation>아니오</translation>
+    </message>
+    <message>
+        <source>Unknown</source>
+        <translation>알수없음</translation>
+    </message>
+</context>
 <context>
     <name>ReceiveCoinsDialog</name>
     <message>
         <source>&amp;Amount:</source>
-        <translation>&amp;거래량:</translation>
+        <translation>거래액(&amp;A):</translation>
     </message>
     <message>
         <source>&amp;Label:</source>
-        <translation>라벨:</translation>
+        <translation>라벨(&amp;L):</translation>
     </message>
     <message>
         <source>&amp;Message:</source>
-        <translation>&amp;메시지:</translation>
+        <translation>메시지(&amp;M):</translation>
     </message>
     <message>
         <source>Reuse one of the previously used receiving addresses. Reusing addresses has security and privacy issues. Do not use this unless re-generating a payment request made before.</source>
@@ -1378,7 +1754,11 @@
     </message>
     <message>
         <source>R&amp;euse an existing receiving address (not recommended)</source>
-        <translation>현재의 수취용 주소를 재사용합니다만 권장하지는 않습니다. (R&amp;)</translation>
+        <translation>현재의 수취용 주소를 재사용하기(&amp;E) (권장하지 않습니다)</translation>
+    </message>
+    <message>
+        <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source>
+        <translation>지불 요청에 첨부되는 선택가능한 메시지 입니다. 이 메세지는 요청이 열릴 때 표시될 것 입니다. 메모: 이 메시지는 비트코인 네트워크로 전송되지 않습니다.</translation>
     </message>
     <message>
         <source>An optional label to associate with the new receiving address.</source>
@@ -1408,6 +1788,10 @@
         <source>&amp;Request payment</source>
         <translation>지불 요청(&amp;R)</translation>
     </message>
+    <message>
+        <source>Show the selected request (does the same as double clicking an entry)</source>
+        <translation>선택된 요청을 표시하기 (더블 클릭으로 항목을 표시할 수 있습니다)</translation>
+    </message>
     <message>
         <source>Show</source>
         <translation>보기</translation>
@@ -1422,7 +1806,7 @@
     </message>
     <message>
         <source>Copy label</source>
-        <translation>표 복사하기</translation>
+        <translation>라벨 복사하기</translation>
     </message>
     <message>
         <source>Copy message</source>
@@ -1430,7 +1814,7 @@
     </message>
     <message>
         <source>Copy amount</source>
-        <translation>거래량 복사</translation>
+        <translation>거래액 복사</translation>
     </message>
 </context>
 <context>
@@ -1469,11 +1853,11 @@
     </message>
     <message>
         <source>Amount</source>
-        <translation>거래량</translation>
+        <translation>거래액</translation>
     </message>
     <message>
         <source>Label</source>
-        <translation>표</translation>
+        <translation>라벨</translation>
     </message>
     <message>
         <source>Message</source>
@@ -1481,7 +1865,7 @@
     </message>
     <message>
         <source>Resulting URI too long, try to reduce the text for label / message.</source>
-        <translation>URI 결과가 너무 길음, 표/메세지의 글을 줄이도록 하세요.</translation>
+        <translation>URI 결과가 너무 길음, 라벨/메세지의 글을 줄이도록 하세요.</translation>
     </message>
     <message>
         <source>Error encoding URI into QR Code.</source>
@@ -1496,7 +1880,7 @@
     </message>
     <message>
         <source>Label</source>
-        <translation>표</translation>
+        <translation>라벨</translation>
     </message>
     <message>
         <source>Message</source>
@@ -1504,7 +1888,7 @@
     </message>
     <message>
         <source>Amount</source>
-        <translation>거래량</translation>
+        <translation>거래액</translation>
     </message>
     <message>
         <source>(no label)</source>
@@ -1516,7 +1900,7 @@
     </message>
     <message>
         <source>(no amount)</source>
-        <translation>(거래량 없음)</translation>
+        <translation>(거래액 없음)</translation>
     </message>
 </context>
 <context>
@@ -1551,7 +1935,7 @@
     </message>
     <message>
         <source>Amount:</source>
-        <translation>거래량:</translation>
+        <translation>거래액:</translation>
     </message>
     <message>
         <source>Priority:</source>
@@ -1569,6 +1953,10 @@
         <source>Change:</source>
         <translation>체인지:</translation>
     </message>
+    <message>
+        <source>If this is activated, but the change address is empty or invalid, change will be sent to a newly generated address.</source>
+        <translation>이 기능이 활성화되면 거스름돈 주소가 공란이거나 무효인 경우, 거스름돈은 새롭게 생성된 주소로 송금됩니다.</translation>
+    </message>
     <message>
         <source>Custom change address</source>
         <translation>주소변경</translation>
@@ -1577,17 +1965,77 @@
         <source>Transaction Fee:</source>
         <translation>거래 수수료:</translation>
     </message>
+    <message>
+        <source>Choose...</source>
+        <translation>선택 하기...</translation>
+    </message>
+    <message>
+        <source>collapse fee-settings</source>
+        <translation>수수료 설정 접기</translation>
+    </message>
+    <message>
+        <source>per kilobyte</source>
+        <translation>킬로바이트 당</translation>
+    </message>
+    <message>
+        <source>If the custom fee is set to 1000 satoshis and the transaction is only 250 bytes, then "per kilobyte" only pays 250 satoshis in fee, while "total at least" pays 1000 satoshis. For transactions bigger than a kilobyte both pay by kilobyte.</source>
+        <translation>사용자 정의 수수료가 1000사토시로 지정된 경우 트랜잭션의 크기가 250바이트 일 경우 1킬로바이트당 250사토시만 지불되지만 "최소 수수료"에선 1000사토시가 지불됩니다. 1킬로바이트가 넘는 트랜잭션인 경우 어떠한 경우에든 1킬로바이트 기준으로 지불됩니다.</translation>
+    </message>
+    <message>
+        <source>Hide</source>
+        <translation>숨기기</translation>
+    </message>
+    <message>
+        <source>total at least</source>
+        <translation>최소 수수료</translation>
+    </message>
+    <message>
+        <source>Paying only the minimum fee is just fine as long as there is less transaction volume than space in the blocks. But be aware that this can end up in a never confirming transaction once there is more demand for bitcoin transactions than the network can process.</source>
+        <translation>블록의 용량보다 트랜잭션의 용량이 작은 경우에는 최소한의 수수료만으로도 충분합니다. 그러나 비트코인 네트워크의 처리량보다 더 많은 트랜잭션 요구는 영원히 검증이 안 될 수도 있습니다.</translation>
+    </message>
+    <message>
+        <source>(read the tooltip)</source>
+        <translation>(툴팁을 읽어보세요)</translation>
+    </message>
     <message>
         <source>Recommended:</source>
         <translation>권장:</translation>
     </message>
+    <message>
+        <source>Custom:</source>
+        <translation>사용자 정의:</translation>
+    </message>
+    <message>
+        <source>(Smart fee not initialized yet. This usually takes a few blocks...)</source>
+        <translation>(Smart fee가 아직 초기화되지 않았습니다. 블록 분석이 완료될 때 까지 기다려주십시오...)</translation>
+    </message>
+    <message>
+        <source>Confirmation time:</source>
+        <translation>승인 시간:</translation>
+    </message>
+    <message>
+        <source>normal</source>
+        <translation>일반</translation>
+    </message>
+    <message>
+        <source>fast</source>
+        <translation>빠름</translation>
+    </message>
+    <message>
+        <source>Send as zero-fee transaction if possible</source>
+        <translation>가능한 경우 수수료 없이 보내기</translation>
+    </message>
+    <message>
+        <source>(confirmation may take longer)</source>
+        <translation>(거래 검증이 오래 걸릴 수 있습니다)</translation>
+    </message>
     <message>
         <source>Send to multiple recipients at once</source>
         <translation>다수의 수령인들에게 한번에 보내기</translation>
     </message>
     <message>
         <source>Add &amp;Recipient</source>
-        <translation>수령인 추가하기</translation>
+        <translation>수령인 추가하기(&amp;R)</translation>
     </message>
     <message>
         <source>Clear all fields of the form.</source>
@@ -1627,7 +2075,7 @@
     </message>
     <message>
         <source>Copy amount</source>
-        <translation>거래량 복사</translation>
+        <translation>거래액 복사</translation>
     </message>
     <message>
         <source>Copy fee</source>
@@ -1645,6 +2093,14 @@
         <source>Copy priority</source>
         <translation>우선도 복사</translation>
     </message>
+    <message>
+        <source>Copy change</source>
+        <translation>잔돈 복사</translation>
+    </message>
+    <message>
+        <source>Total Amount %1</source>
+        <translation>총 액수 %1</translation>
+    </message>
     <message>
         <source>or</source>
         <translation>또는</translation>
@@ -1670,18 +2126,46 @@
         <translation>거래가 거부되었습니다. 몇몇 코인들이 지갑에서 이미 사용된 경우, 예를 들어 코인을 이미 사용한  wallet.dat를 복사해서 사용한 경우 지금 지갑에 기록이 안되있어 이런 일이 생길 수 있습니다.</translation>
     </message>
     <message>
-        <source>Warning: Invalid Bitcoin address</source>
-        <translation>경고: 잘못된 비트코인주소입니다</translation>
+        <source>A fee higher than %1 is considered an absurdly high fee.</source>
+        <translation>%1 보다 높은 수수료는 너무 높은 수수료 입니다.</translation>
     </message>
     <message>
-        <source>(no label)</source>
-        <translation>(표 없음)</translation>
+        <source>Payment request expired.</source>
+        <translation>지불 요청이 만료됨.</translation>
     </message>
     <message>
-        <source>Warning: Unknown change address</source>
-        <translation>경고: 알려지지 않은 주소변경입니다</translation>
+        <source>Pay only the required fee of %1</source>
+        <translation>오직 %1 만의 수수료를 지불하기</translation>
     </message>
-    <message>
+    <message numerus="yes">
+        <source>Estimated to begin confirmation within %n block(s).</source>
+        <translation><numerusform>%n 블록 안에 거래검증이 시작 될것으로 예상합니다.</numerusform></translation>
+    </message>
+    <message>
+        <source>The recipient address is not valid. Please recheck.</source>
+        <translation>수령인 주소가 정확하지 않습니다. 재확인 바랍니다</translation>
+    </message>
+    <message>
+        <source>Duplicate address found: addresses should only be used once each.</source>
+        <translation>두개 이상의 주소입니다: 한번에 하나의 주소에만 작업할 수 있습니다.</translation>
+    </message>
+    <message>
+        <source>Warning: Invalid Bitcoin address</source>
+        <translation>경고: 잘못된 비트코인주소입니다</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(라벨 없음)</translation>
+    </message>
+    <message>
+        <source>Warning: Unknown change address</source>
+        <translation>경고: 알려지지 않은 주소변경입니다</translation>
+    </message>
+    <message>
+        <source>Copy dust</source>
+        <translation>더스트 복사</translation>
+    </message>
+    <message>
         <source>Are you sure you want to send?</source>
         <translation>정말로 보내시겠습니까?</translation>
     </message>
@@ -1694,19 +2178,19 @@
     <name>SendCoinsEntry</name>
     <message>
         <source>A&amp;mount:</source>
-        <translation>금액:</translation>
+        <translation>금액(&amp;M):</translation>
     </message>
     <message>
         <source>Pay &amp;To:</source>
-        <translation>지급&amp;수신:</translation>
+        <translation>송금할 대상(&amp;T) : </translation>
     </message>
     <message>
         <source>Enter a label for this address to add it to your address book</source>
-        <translation>당신의 주소록에 이 주소를 추가하기 위하여 표를 입역하세요 </translation>
+        <translation>주소록에 추가하려면 라벨을 입력하세요</translation>
     </message>
     <message>
         <source>&amp;Label:</source>
-        <translation>표:</translation>
+        <translation>라벨(&amp;L)</translation>
     </message>
     <message>
         <source>Choose previously used address</source>
@@ -1714,7 +2198,11 @@
     </message>
     <message>
         <source>This is a normal payment.</source>
-        <translation>평균지급입니다</translation>
+        <translation>이것은 정상적인 지불입니다.</translation>
+    </message>
+    <message>
+        <source>The Bitcoin address to send the payment to</source>
+        <translation>이 비트코인 주소로 송금됩니다</translation>
     </message>
     <message>
         <source>Alt+A</source>
@@ -1722,7 +2210,7 @@
     </message>
     <message>
         <source>Paste address from clipboard</source>
-        <translation>클립보드로 부터 주소를 붙이세요</translation>
+        <translation>클립보드로 부터 주소 붙여넣기</translation>
     </message>
     <message>
         <source>Alt+P</source>
@@ -1730,15 +2218,31 @@
     </message>
     <message>
         <source>Remove this entry</source>
-        <translation>항목을 지우시오</translation>
+        <translation>항목을 지웁니다</translation>
+    </message>
+    <message>
+        <source>The fee will be deducted from the amount being sent. The recipient will receive less bitcoins than you enter in the amount field. If multiple recipients are selected, the fee is split equally.</source>
+        <translation>수수료가 송금되는 금액에서 공제됩니다. 수령자는 금액 필드에서 입력한 금액보다 적은 금액을 전송받게 됩니다. 받는 사람이 여러 명인 경우 수수료는 균등하게 나누어집니다.</translation>
+    </message>
+    <message>
+        <source>S&amp;ubtract fee from amount</source>
+        <translation>송금액에서 수수료 공제(&amp;U)</translation>
     </message>
     <message>
         <source>Message:</source>
         <translation>메시지:</translation>
     </message>
+    <message>
+        <source>This is an unauthenticated payment request.</source>
+        <translation>인증 되지 않은 지급 요청입니다.</translation>
+    </message>
+    <message>
+        <source>This is an authenticated payment request.</source>
+        <translation>인증 된 지급 요청 입니다.</translation>
+    </message>
     <message>
         <source>Enter a label for this address to add it to the list of used addresses</source>
-        <translation>사용된 주소 목록에 새 주소를 추가하기 위해 제목을 입력합니다. </translation>
+        <translation>사용된 주소 목록에 새 주소를 추가하기 위해 라벨 이름을 입력해 주세요. </translation>
     </message>
     <message>
         <source>A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
@@ -1757,7 +2261,7 @@
     <name>ShutdownWindow</name>
     <message>
         <source>Bitcoin Core is shutting down...</source>
-        <translation>비트코인코어가 닫아지고 있습니다</translation>
+        <translation>Bitcoin Core이 종료 중입니다...</translation>
     </message>
     <message>
         <source>Do not shut down the computer until this window disappears.</source>
@@ -1774,6 +2278,14 @@
         <source>&amp;Sign Message</source>
         <translation>메시지 서명(&amp;S)</translation>
     </message>
+    <message>
+        <source>You can sign messages/agreements with your addresses to prove you can receive bitcoins sent to them. Be careful not to sign anything vague or random, as phishing attacks may try to trick you into signing your identity over to them. Only sign fully-detailed statements you agree to.</source>
+        <translation>여러분 자신을 증명하기 위해 주소를 첨가하고 서명할 수 있습니다. 피싱 공격으로 말미암아 여러분의 서명을 통해 속아 넘어가게 할 수 있으므로, 서명하지 않은 모든 모호한 요소를 주의하십시오. 조항들이 완전 무결한지 확인 후 동의하는 경우에만 서명하십시오.</translation>
+    </message>
+    <message>
+        <source>The Bitcoin address to sign the message with</source>
+        <translation>메세지를 서명한 비트코인 주소</translation>
+    </message>
     <message>
         <source>Choose previously used address</source>
         <translation>이전에 사용한 주소를 선택하십시오</translation>
@@ -1784,7 +2296,7 @@
     </message>
     <message>
         <source>Paste address from clipboard</source>
-        <translation>클립보드로 부터 주소를 붙이세요</translation>
+        <translation>클립보드로 부터 주소를 복사하기</translation>
     </message>
     <message>
         <source>Alt+P</source>
@@ -1822,6 +2334,14 @@
         <source>&amp;Verify Message</source>
         <translation>메시지 검증(&amp;V)</translation>
     </message>
+    <message>
+        <source>Enter the receiver's address, message (ensure you copy line breaks, spaces, tabs, etc. exactly) and signature below to verify the message. Be careful not to read more into the signature than what is in the signed message itself, to avoid being tricked by a man-in-the-middle attack. Note that this only proves the signing party receives with the address, it cannot prove sendership of any transaction!</source>
+        <translation>메시지를 검증하기 위해 아래 칸에 각각 지갑 주소와 메시지, 전자서명을 입력하세요. (메시지 원본의 띄어쓰기, 들여쓰기, 행 나눔 등이 정확하게 입력되어야 하므로 원본을 복사해서 입력하세요) 이 기능은 메시지 검증이 주 목적이며, 네트워크 침입자에 의해 변조되지 않도록 전자서명 해독에 불필요한 시간을 소모하지 마세요. </translation>
+    </message>
+    <message>
+        <source>The Bitcoin address the message was signed with</source>
+        <translation>메세지의 서명에 사용된 비트코인 주소</translation>
+    </message>
     <message>
         <source>Verify the message to ensure it was signed with the specified Bitcoin address</source>
         <translation>정확한 비트코인주소가 입력됬는지 메시지를 확인하시오</translation>
@@ -1935,6 +2455,10 @@
         <source>Status</source>
         <translation>상태</translation>
     </message>
+    <message numerus="yes">
+        <source>, broadcast through %n node(s)</source>
+        <translation><numerusform>%n 노드를 거쳐 전파합니다.</numerusform></translation>
+    </message>
     <message>
         <source>Date</source>
         <translation>날짜</translation>
@@ -1959,6 +2483,10 @@
         <source>own address</source>
         <translation>자신의 주소</translation>
     </message>
+    <message>
+        <source>watch-only</source>
+        <translation>모니터링 지갑</translation>
+    </message>
     <message>
         <source>label</source>
         <translation>라벨</translation>
@@ -1967,6 +2495,10 @@
         <source>Credit</source>
         <translation>예금</translation>
     </message>
+    <message numerus="yes">
+        <source>matures in %n more block(s)</source>
+        <translation><numerusform>%n개 블럭 후에 코인 숙성이 완료됩니다.</numerusform></translation>
+    </message>
     <message>
         <source>not accepted</source>
         <translation>허용되지 않는다</translation>
@@ -1975,13 +2507,21 @@
         <source>Debit</source>
         <translation>차변</translation>
     </message>
+    <message>
+        <source>Total debit</source>
+        <translation>총 출금액</translation>
+    </message>
+    <message>
+        <source>Total credit</source>
+        <translation>총 입금액</translation>
+    </message>
     <message>
         <source>Transaction fee</source>
         <translation>송금 수수료</translation>
     </message>
     <message>
         <source>Net amount</source>
-        <translation>총액</translation>
+        <translation>총 거래액</translation>
     </message>
     <message>
         <source>Message</source>
@@ -2017,7 +2557,7 @@
     </message>
     <message>
         <source>Amount</source>
-        <translation>거래량</translation>
+        <translation>거래액</translation>
     </message>
     <message>
         <source>true</source>
@@ -2031,6 +2571,10 @@
         <source>, has not been successfully broadcast yet</source>
         <translation>. 아직 성공적으로 통보하지 않음</translation>
     </message>
+    <message numerus="yes">
+        <source>Open for %n more block(s)</source>
+        <translation><numerusform>%n 개의 추가 블록을 읽습니다.</numerusform></translation>
+    </message>
     <message>
         <source>unknown</source>
         <translation>알수없음</translation>
@@ -2061,13 +2605,17 @@
         <source>Immature (%1 confirmations, will be available after %2)</source>
         <translation>충분히 숙성되지 않은 상태 (%1 승인, %2 후에 사용 가능합니다)</translation>
     </message>
+    <message numerus="yes">
+        <source>Open for %n more block(s)</source>
+        <translation><numerusform>%n 개의 추가 블록을 읽습니다.</numerusform></translation>
+    </message>
     <message>
         <source>Open until %1</source>
         <translation>%1 까지 열림</translation>
     </message>
     <message>
         <source>Confirmed (%1 confirmations)</source>
-        <translation>확인됨(%1 확인됨)</translation>
+        <translation>확인됨 (%1 확인됨)</translation>
     </message>
     <message>
         <source>This block was not received by any other nodes and will probably not be accepted!</source>
@@ -2083,7 +2631,7 @@
     </message>
     <message>
         <source>Label</source>
-        <translation>표</translation>
+        <translation>라벨</translation>
     </message>
     <message>
         <source>Unconfirmed</source>
@@ -2117,13 +2665,17 @@
         <source>Mined</source>
         <translation>채굴</translation>
     </message>
+    <message>
+        <source>watch-only</source>
+        <translation>모니터링 지갑</translation>
+    </message>
     <message>
         <source>(n/a)</source>
         <translation>(없음)</translation>
     </message>
     <message>
         <source>Transaction status. Hover over this field to show number of confirmations.</source>
-        <translation>거래상황. 마우스를 올리면 승인횟수가 표시됩니다.</translation>
+        <translation>거래상황. 마우스를 올리면 검증횟수가 표시됩니다.</translation>
     </message>
     <message>
         <source>Date and time that the transaction was received.</source>
@@ -2133,6 +2685,14 @@
         <source>Type of transaction.</source>
         <translation>거래의 종류.</translation>
     </message>
+    <message>
+        <source>Whether or not a watch-only address is involved in this transaction.</source>
+        <translation>이 트랜잭션에 모니터링 지갑를 포함할지의 여부입니다.</translation>
+    </message>
+    <message>
+        <source>User-defined intent/purpose of the transaction.</source>
+        <translation>트랜잭션에 대한 사용자 정의 intent/purpose</translation>
+    </message>
     <message>
         <source>Amount removed from or added to balance.</source>
         <translation>변경된 잔고.</translation>
@@ -2194,7 +2754,7 @@
     </message>
     <message>
         <source>Min amount</source>
-        <translation>최소 거래량</translation>
+        <translation>최소 거래액</translation>
     </message>
     <message>
         <source>Copy address</source>
@@ -2202,19 +2762,23 @@
     </message>
     <message>
         <source>Copy label</source>
-        <translation>표 복사하기</translation>
+        <translation>라벨 복사하기</translation>
     </message>
     <message>
         <source>Copy amount</source>
-        <translation>거래량 복사</translation>
+        <translation>거래액 복사</translation>
     </message>
     <message>
         <source>Copy transaction ID</source>
         <translation>거래 아이디 복사</translation>
     </message>
+    <message>
+        <source>Copy raw transaction</source>
+        <translation>로우 트랜잭션 복사</translation>
+    </message>
     <message>
         <source>Edit label</source>
-        <translation>표 수정하기</translation>
+        <translation>라벨 수정하기</translation>
     </message>
     <message>
         <source>Show transaction details</source>
@@ -2234,7 +2798,7 @@
     </message>
     <message>
         <source>There was an error trying to save the transaction history to %1.</source>
-        <translation>%1으로 거래 기록을 저장하는데 애러가 있었습니다.</translation>
+        <translation>%1으로 거래 기록을 저장하는데 오류가 있었습니다.</translation>
     </message>
     <message>
         <source>Exporting Successful</source>
@@ -2262,7 +2826,7 @@
     </message>
     <message>
         <source>Label</source>
-        <translation>표</translation>
+        <translation>라벨</translation>
     </message>
     <message>
         <source>Address</source>
@@ -2283,7 +2847,11 @@
 </context>
 <context>
     <name>UnitDisplayStatusBarControl</name>
-    </context>
+    <message>
+        <source>Unit to show amounts in. Click to select another unit.</source>
+        <translation>거래액을 표시하는 단위. 클릭해서 다른 단위를 선택할 수 있습니다.</translation>
+    </message>
+</context>
 <context>
     <name>WalletFrame</name>
     <message>
@@ -2302,7 +2870,7 @@
     <name>WalletView</name>
     <message>
         <source>&amp;Export</source>
-        <translation>&amp;내보내기</translation>
+        <translation>내보내기(&amp;E)</translation>
     </message>
     <message>
         <source>Export the data in the current tab to a file</source>
@@ -2355,30 +2923,130 @@
         <source>Accept command line and JSON-RPC commands</source>
         <translation>명령줄과 JSON-RPC 명령 수락</translation>
     </message>
+    <message>
+        <source>If &lt;category&gt; is not supplied or if &lt;category&gt; = 1, output all debugging information.</source>
+        <translation>&lt;category&gt;가 제공되지 않거나 &lt;category&gt; = 1 인 경우, 모든 디버깅 정보를 출력</translation>
+    </message>
+    <message>
+        <source>Maximum total fees (in %s) to use in a single wallet transaction; setting this too low may abort large transactions (default: %s)</source>
+        <translation>하나의 지갑 트랜잭션에서의 총 수수료(%s)의 최대치; 너무 낮게 설정하면 큰 트랜잭션이 중지 됩니다 (기본값: %s)</translation>
+    </message>
+    <message>
+        <source>Please check that your computer's date and time are correct! If your clock is wrong Bitcoin Core will not work properly.</source>
+        <translation>컴퓨터의 날짜와 시간이 올바른지 확인하십시오! 시간이 잘못되면 비트코인은 제대로 동작하지 않습니다.</translation>
+    </message>
+    <message>
+        <source>Prune configured below the minimum of %d MiB.  Please use a higher number.</source>
+        <translation>블록 축소가 최소치의 %d MiB 밑으로 설정되어 있습니다. 더 높은 값을 사용해 보세요.</translation>
+    </message>
+    <message>
+        <source>Prune: last wallet synchronisation goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of pruned node)</source>
+        <translation>블록 축소: 마지막 지갑 동기화 지점이 축소된 데이터보다 과거의 것 입니다. -reindex가 필요합니다 (정지된 노드의 경우 모든 블록체인을 재다운로드합니다)</translation>
+    </message>
+    <message>
+        <source>Reduce storage requirements by pruning (deleting) old blocks. This mode is incompatible with -txindex and -rescan. Warning: Reverting this setting requires re-downloading the entire blockchain. (default: 0 = disable pruning blocks, &gt;%u = target size in MiB to use for block files)</source>
+        <translation>오래된 블록을 제거(축소)하여 디스크 용량을 줄입니다. 이 모드는 -txindex 와 -rescan 과 호환되지 않습니다. 경고: 이 모드를 취소하면 모든 블록체인을 다시 다운로드 받아야 합니다. (기본값:0 = 블록 축소 비활성화, &gt;%u = 블록파일에 사용할 용량을 MiB단위로 지정)</translation>
+    </message>
+    <message>
+        <source>Rescans are not possible in pruned mode. You will need to use -reindex which will download the whole blockchain again.</source>
+        <translation>블록 축소 모드에서는 재검색이 불가능 합니다. -reindex 명령을 사용해서 모든 블록체인을 다시 다운로드 해야 합니다.</translation>
+    </message>
+    <message>
+        <source>Error: A fatal internal error occurred, see debug.log for details</source>
+        <translation>에러: 치명적인 내부 오류가 발생했습니다, 자세한 내용은 debug.log 를 확인해주세요.</translation>
+    </message>
+    <message>
+        <source>Fee (in %s/kB) to add to transactions you send (default: %s)</source>
+        <translation>송금 거래시 추가되는 수수료 (%s/kB) (기본값: %s)</translation>
+    </message>
+    <message>
+        <source>Pruning blockstore...</source>
+        <translation>블록 데이터를 축소 중입니다..</translation>
+    </message>
     <message>
         <source>Run in the background as a daemon and accept commands</source>
         <translation>데몬으로 백그라운드에서 실행하고 명령을 허용</translation>
     </message>
+    <message>
+        <source>Unable to start HTTP server. See debug log for details.</source>
+        <translation>HTTP 서버를 시작할 수 없습니다. 자세한 사항은 디버그 로그를 확인 하세요.</translation>
+    </message>
     <message>
         <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
         <translation>외부 접속을 승인합니다</translation>
     </message>
+    <message>
+        <source>-fallbackfee is set very high! This is the transaction fee you may pay when fee estimates are not available.</source>
+        <translation>-fallbackfee은 너무 높습니다! 이것은 수수료 예측을 이용할 수 없을 때 지불되는 트랜잭션 수수료입니다.</translation>
+    </message>
+    <message>
+        <source>A fee rate (in %s/kB) that will be used when fee estimation has insufficient data (default: %s)</source>
+        <translation>충분한 데이터가 축적되지 않은 상태에서의 수수료 추정 기능이 사용하는 수수료 비율(%s/kB) (기본값: %s)</translation>
+    </message>
+    <message>
+        <source>Accept relayed transactions received from whitelisted peers even when not relaying transactions (default: %d)</source>
+        <translation>트랜잭션의 중계를 하지 않더라도 화이트 리스트에 포함된 피어에서 받은 트랜잭션은 중계하기 (기본값: %d)</translation>
+    </message>
     <message>
         <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source>
         <translation>선택된 주소로 고정하며 항상 리슨(Listen)합니다. IPv6 프로토콜인 경우  [host]:port 방식의 명령어 표기법을 사용합니다.</translation>
     </message>
+    <message>
+        <source>Delete all wallet transactions and only recover those parts of the blockchain through -rescan on startup</source>
+        <translation>시작시 모든 지갑 트랜잭션을 삭제하고 -rescan을 통하여 블록체인만 복구합니다.</translation>
+    </message>
+    <message>
+        <source>Distributed under the MIT software license, see the accompanying file COPYING or &lt;http://www.opensource.org/licenses/mit-license.php&gt;.</source>
+        <translation>MIT 소프트웨어 라이센스에 따라 배포됩니다. 동봉된 파일 혹은 &lt;http://www.opensource.org/licenses/mit-license.php&gt;를 참조하세요.</translation>
+    </message>
     <message>
         <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source>
         <translation>지갑 거래가 바뀌면 명령을 실행합니다.(%s 안의 명령어가 TxID로 바뀝니다)</translation>
     </message>
+    <message>
+        <source>Force relay of transactions from whitelisted peers even they violate local relay policy (default: %d)</source>
+        <translation>피어들이 로컬 중계 정책을 위반하더라도 화이트 리스트에 포함된 피어인경우 강제로 중계하기 (기본값: %d)</translation>
+    </message>
+    <message>
+        <source>Set the number of script verification threads (%u to %d, 0 = auto, &lt;0 = leave that many cores free, default: %d)</source>
+        <translation>스크립트 인증 스레드의 갯수 설정 (%u-%d, 0 = 자동, &lt;0 = 지정된 코어 개수만큼 사용 안함, 기본값: %d)</translation>
+    </message>
+    <message>
+        <source>The block database contains a block which appears to be from the future. This may be due to your computer's date and time being set incorrectly. Only rebuild the block database if you are sure that your computer's date and time are correct</source>
+        <translation>블록 데이터베이스에 미래의 블록이 포함되어 있습니다. 이것은 사용자의 컴퓨터의 날짜와 시간이 올바르게 설정되어 있지 않을때 나타날 수 있습니다. 만약 사용자의 컴퓨터의 날짜와 시간이 올바르다고 확신할 때에만 블록 데이터 베이스의 재구성을 하십시오</translation>
+    </message>
     <message>
         <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
         <translation>이 빌드 버전은 정식 출시 전 테스트의 목적이며, 예기치 않은 위험과 오류가 발생할 수 있습니다. 채굴과 상점용 소프트웨어로 사용하는 것을 권하지 않습니다.</translation>
     </message>
+    <message>
+        <source>Unable to bind to %s on this computer. Bitcoin Core is probably already running.</source>
+        <translation>이 컴퓨터의 %s에 바인딩 할 수 없습니다. 아마도 비트코인이 실행중인 것 같습니다.</translation>
+    </message>
+    <message>
+        <source>Unsupported argument -whitelistalwaysrelay ignored, use -whitelistrelay and/or -whitelistforcerelay.</source>
+        <translation>지원하지 않는 인수 -whitelistalwaysrelay 는 무시됩니다,  -whitelistrelay 나 -whitelistforcerelay 를 사용해 주세요.</translation>
+    </message>
+    <message>
+        <source>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</source>
+        <translation>리슨(Listen) 포트를 할당하기 위해 UPnP 사용 (기본값: 열려있거나 -proxy 옵션을 사용하지 않을 시 1)</translation>
+    </message>
+    <message>
+        <source>WARNING: abnormally high number of blocks generated, %d blocks received in the last %d hours (%d expected)</source>
+        <translation>경고: 비정상적으로 많은 블록이 생성되고 있습니다. %d 블록은 마지막 %d에 수신되었습니다 (%d 예측됨)</translation>
+    </message>
+    <message>
+        <source>WARNING: check your network connection, %d blocks received in the last %d hours (%d expected)</source>
+        <translation>경고: 네트워크 연결을 확인해 주세요. %d 블록은 마지막 %d에 수신되었습니다 (%d 예측됨)</translation>
+    </message>
     <message>
         <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source>
         <translation>경고 : 모든 네트워크가 동의해야 하나, 일부 채굴자들에게 문제가 있는 것으로 보입니다. </translation>
     </message>
+    <message>
+        <source>Warning: Unknown block versions being mined! It's possible unknown rules are in effect</source>
+        <translation>경고: 알려지지 않은 버전의 블록이 채굴되었습니다. 알려지지 않은 규칙이 적용되었을 가능성이 있습니다.</translation>
+    </message>
     <message>
         <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source>
         <translation>경고: 현재 비트코인 버전이 다른 네트워크 참여자들과 동일하지 않는 것 같습니다. 당신 또는 다른 참여자들이 동일한 비트코인 버전으로 업그레이드 할 필요가 있습니다.</translation>
@@ -2387,6 +3055,22 @@
         <source>Warning: wallet.dat corrupt, data salvaged! Original wallet.dat saved as wallet.{timestamp}.bak in %s; if your balance or transactions are incorrect you should restore from a backup.</source>
         <translation>경고 : wallet.dat가 손상되어 데이터가 복구되었습니다. 원래의 wallet.dat 파일은 %s 후에 wallet.{timestamp}.bak 이름으로 저장됩니다. 잔액과 거래 내역이 정확하지 않다면 백업 파일로 부터 복원해야 합니다. </translation>
     </message>
+    <message>
+        <source>Whitelist peers connecting from the given netmask or IP address. Can be specified multiple times.</source>
+        <translation>설정된 넷마스크 혹은 IP 주소로 화이트리스트에 포함된 피어에 접속합니다. 이 설정은 복수로 지정 할 수 있습니다.</translation>
+    </message>
+    <message>
+        <source>-maxmempool must be at least %d MB</source>
+        <translation>-maxmempool은 최소한 %d MB가 필요합니다</translation>
+    </message>
+    <message>
+        <source>&lt;category&gt; can be:</source>
+        <translation>&lt;category&gt; 지정 가능:</translation>
+    </message>
+    <message>
+        <source>Append comment to the user agent string</source>
+        <translation>사용자 에이전트 문자열에 코멘트 첨부</translation>
+    </message>
     <message>
         <source>Block creation options:</source>
         <translation>블록 생성 옵션:</translation>
@@ -2415,6 +3099,26 @@
         <source>Do you want to rebuild the block database now?</source>
         <translation>블락 데이터베이스를 다시 생성하시겠습니까?</translation>
     </message>
+    <message>
+        <source>Enable publish hash block in &lt;address&gt;</source>
+        <translation>&lt;address&gt;에 대한 해시 블록 공개 활성화</translation>
+    </message>
+    <message>
+        <source>Enable publish hash transaction in &lt;address&gt;</source>
+        <translation>&lt;address&gt;에 대한 해시 트랙잭션 공개 활성화</translation>
+    </message>
+    <message>
+        <source>Enable publish raw block in &lt;address&gt;</source>
+        <translation>&lt;address&gt;에 대한 로우 블록 공개 활성화</translation>
+    </message>
+    <message>
+        <source>Enable publish raw transaction in &lt;address&gt;</source>
+        <translation>&lt;address&gt;에 대한 로우 트랜잭션 공개 활성화</translation>
+    </message>
+    <message>
+        <source>Enable transaction replacement in the memory pool (default: %u)</source>
+        <translation>메모리 풀(pool) 내의 트랜잭션 치환(replacement) 활성화 (기본값: %u)</translation>
+    </message>
     <message>
         <source>Error initializing block database</source>
         <translation>블록 데이터베이스를 초기화하는데 오류</translation>
@@ -2451,10 +3155,42 @@
         <source>Invalid -onion address: '%s'</source>
         <translation>잘못된 -onion 주소입니다: '%s'</translation>
     </message>
+    <message>
+        <source>Invalid amount for -fallbackfee=&lt;amount&gt;: '%s'</source>
+        <translation>유효하지 않은 금액 -fallbackfee=&lt;amount&gt;: '%s'</translation>
+    </message>
+    <message>
+        <source>Keep the transaction memory pool below &lt;n&gt; megabytes (default: %u)</source>
+        <translation>트랜잭션 메모리 풀의 용량을 &lt;n&gt;메가바이트 아래로 유지하기 (기본값: %u)</translation>
+    </message>
+    <message>
+        <source>Location of the auth cookie (default: data dir)</source>
+        <translation>인증 쿠키의 위치 (기본값: data dir)</translation>
+    </message>
+    <message>
+        <source>Minimum bytes per sigop in transactions we relay and mine (default: %u)</source>
+        <translation>중계 및 채굴을 할 때 트랜잭션에서의 sigop 당 데이터의 최소 크기 (기본값: %u)</translation>
+    </message>
     <message>
         <source>Not enough file descriptors available.</source>
         <translation>사용 가능한 파일 디스크립터-File Descriptor-가 부족합니다. </translation>
     </message>
+    <message>
+        <source>Only connect to nodes in network &lt;net&gt; (ipv4, ipv6 or onion)</source>
+        <translation>오직 &lt;net&gt; 네트워크로 로만 접속 (IPv4, IPv6 혹은 onion)</translation>
+    </message>
+    <message>
+        <source>Print version and exit</source>
+        <translation>버전 출력후 종료</translation>
+    </message>
+    <message>
+        <source>Prune cannot be configured with a negative value.</source>
+        <translation>블록 축소는 음수로 설정할 수 없습니다.</translation>
+    </message>
+    <message>
+        <source>Prune mode is incompatible with -txindex.</source>
+        <translation>블록 축소 모드는 -txindex와 호환되지 않습니다.</translation>
+    </message>
     <message>
         <source>Set database cache size in megabytes (%d to %d, default: %d)</source>
         <translation>데이터베이스 케시 크기를 메가바이트로 설정(%d 부터 %d, 기본값: %d)</translation>
@@ -2467,6 +3203,26 @@
         <source>Specify wallet file (within data directory)</source>
         <translation>데이터 폴더 안에 지갑 파일을 선택하세요.</translation>
     </message>
+    <message>
+        <source>Unsupported argument -benchmark ignored, use -debug=bench.</source>
+        <translation>지원하지 않는 인수 -benchmark 은 무시됩니다, -debug=bench 형태로 사용하세요.</translation>
+    </message>
+    <message>
+        <source>Unsupported argument -debugnet ignored, use -debug=net.</source>
+        <translation>지원하지 않는 인수 -debugnet 은 무시됩니다, -debug=net 형태로 사용하세요.</translation>
+    </message>
+    <message>
+        <source>Unsupported argument -tor found, use -onion.</source>
+        <translation>지원하지 않는 인수 -tor를 찾았습니다. -onion를 사용해주세요.</translation>
+    </message>
+    <message>
+        <source>Use UPnP to map the listening port (default: %u)</source>
+        <translation>리슨(Listen) 포트를 할당하기 위해 UPnP 사용 (기본값: %u)</translation>
+    </message>
+    <message>
+        <source>User Agent comment (%s) contains unsafe characters.</source>
+        <translation>사용자 정의 코멘트 (%s)에 안전하지 못한 글자가 포함되어 있습니다.</translation>
+    </message>
     <message>
         <source>Verifying blocks...</source>
         <translation>블록 검증중...</translation>
@@ -2487,26 +3243,138 @@
         <source>You need to rebuild the database using -reindex to change -txindex</source>
         <translation>-txindex를 바꾸기 위해서는 -reindex를 사용해서 데이터베이스를 재구성해야 합니다. </translation>
     </message>
+    <message>
+        <source>Allow JSON-RPC connections from specified source. Valid for &lt;ip&gt; are a single IP (e.g. 1.2.3.4), a network/netmask (e.g. 1.2.3.4/255.255.255.0) or a network/CIDR (e.g. 1.2.3.4/24). This option can be specified multiple times</source>
+        <translation>특정 소스에서의 JSON-RPC 연결 허가. 유효한 &lt;ip&gt; 같은 하나의 IP주소 (예 1.2.3.4), 네트워크/넷마스크 (예 1.2.3.4/255.255.255.0) 혹은 네트워크/CIDR (예 1.2.3.4/24). 이 옵션은 복수로 설정 할 수 있습니다.</translation>
+    </message>
+    <message>
+        <source>Bind to given address and whitelist peers connecting to it. Use [host]:port notation for IPv6</source>
+        <translation>선택된 주소로 고정하여 화이트리스트에 포함된 피어에 접속합니다. IPv6 프로토콜인 경우 [host]:port 방식의 명령어 표기법을 사용합니다.</translation>
+    </message>
+    <message>
+        <source>Bind to given address to listen for JSON-RPC connections. Use [host]:port notation for IPv6. This option can be specified multiple times (default: bind to all interfaces)</source>
+        <translation>선택된 주소로 고정하여 JSON-RPC 연결을 리슨(Listen)합니다. IPv6 프로토콜인 경우 [host]:port 방식의 명령어 표기법을 사용합니다. 이 옵션은 복수로 지정 할수 있습니다. (기본값: 모든 인터페이스에 고정)</translation>
+    </message>
     <message>
         <source>Cannot obtain a lock on data directory %s. Bitcoin Core is probably already running.</source>
         <translation>데이터 디렉토리 %s에 락을 걸 수 없었습니다. 비트코인 코어가 이미 실행 중인 것으로 보입니다.</translation>
     </message>
+    <message>
+        <source>Create new files with system default permissions, instead of umask 077 (only effective with disabled wallet functionality)</source>
+        <translation>umask 077 대신 시스템 기본 퍼미션으로 새 파일을 만듭니다 (지갑 기능이 비활성화 상태에서만 유효합니다)</translation>
+    </message>
+    <message>
+        <source>Discover own IP addresses (default: 1 when listening and no -externalip or -proxy)</source>
+        <translation>자신의 주소를 탐색 (기본값: 열려있거나 -externalip 나 -proxy 옵션이 없으면 1)</translation>
+    </message>
+    <message>
+        <source>Error: Listening for incoming connections failed (listen returned error %s)</source>
+        <translation>오류: 들어오는 연결을 리슨(Listen)하는데 실패했습니다 (오류 리턴 %s)</translation>
+    </message>
     <message>
         <source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source>
         <translation>이 사항과 관련있는 경고가 발생하거나 아주 긴 포크가 발생했을 때 명령어를 실행해 주세요. (cmd 명령어 목록에서 %s는 메시지로 대체됩니다) </translation>
     </message>
+    <message>
+        <source>Fees (in %s/kB) smaller than this are considered zero fee for relaying, mining and transaction creation (default: %s)</source>
+        <translation>해당 금액(%s/kB) 보다 적은 수수료는 중계, 채굴, 트랜잭션 생성에서 수수료 면제로 간주됩니다 (기본값: %s)</translation>
+    </message>
+    <message>
+        <source>If paytxfee is not set, include enough fee so transactions begin confirmation on average within n blocks (default: %u)</source>
+        <translation>paytxfee가 설정되어 있지 않다면 평균 n 블록안에 승인이 이루어지도록 충분한 수수료가 포함됩니다 (기본값: %u)</translation>
+    </message>
+    <message>
+        <source>Invalid amount for -maxtxfee=&lt;amount&gt;: '%s' (must be at least the minrelay fee of %s to prevent stuck transactions)</source>
+        <translation>유효하지 않은 금액 -maxtxfee=&lt;amount&gt;: '%s' (트랜잭션이 막히는 상황을 방지하게 위해 적어도 %s 의 중계 수수료를 지정해야 합니다)</translation>
+    </message>
+    <message>
+        <source>Maximum size of data in data carrier transactions we relay and mine (default: %u)</source>
+        <translation>중계 및 채굴을 할 때 데이터 운송 트랜잭션에서 데이터의 최대 크기 (기본값: %u)</translation>
+    </message>
+    <message>
+        <source>Query for peer addresses via DNS lookup, if low on addresses (default: 1 unless -connect)</source>
+        <translation>DNS lookup를 통해 피어 주소에 대한 쿼리 보내기 (기본값: 1 -connect 예외)</translation>
+    </message>
+    <message>
+        <source>Randomize credentials for every proxy connection. This enables Tor stream isolation (default: %u)</source>
+        <translation>인증정보를 프록시 연결마다 무작위로 합니다. 이는 Tor 스트림을 격리시킬 수 있습니다 (기본값: %u)</translation>
+    </message>
     <message>
         <source>Set maximum size of high-priority/low-fee transactions in bytes (default: %d)</source>
         <translation>최대 크기를 최우선으로 설정 / 바이트당 최소 수수료로 거래(기본값: %d)</translation>
     </message>
+    <message>
+        <source>Set the number of threads for coin generation if enabled (-1 = all cores, default: %d)</source>
+        <translation>코인 생성에 대한 스레드 갯수 설정 (-1 = 모든 코어, 기본값: %d)</translation>
+    </message>
+    <message>
+        <source>The transaction amount is too small to send after the fee has been deducted</source>
+        <translation>거래액이 수수료를 지불하기엔 너무 작습니다</translation>
+    </message>
+    <message>
+        <source>This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit &lt;https://www.openssl.org/&gt; and cryptographic software written by Eric Young and UPnP software written by Thomas Bernard.</source>
+        <translation>이 프로그램에는 OpenSSL 툴킷&lt;https://www.openssl.org/&gt; 사용 목적으로 개발한 OpenSSL 프로젝트를 포함하고 있으며, 암호화 프로그램은 Eric Young이, UPnP 프로그램은 Thomas Bernard가 작성했습니다.</translation>
+    </message>
+    <message>
+        <source>Whitelisted peers cannot be DoS banned and their transactions are always relayed, even if they are already in the mempool, useful e.g. for a gateway</source>
+        <translation>화이트리스트에 포함된 피어는 이미 메모리풀에 포함되어 있어도 DoS 추방이 되지 않으며 그들의 트랜잭션이 항상 중계됩니다, 이는 예를 들면 게이트웨이에서 유용합니다.</translation>
+    </message>
+    <message>
+        <source>You need to rebuild the database using -reindex to go back to unpruned mode.  This will redownload the entire blockchain</source>
+        <translation>축소 모드를 해제하고 데이터베이스를 재구성 하기 위해 -reindex를 사용해야 합니다. 이 명령은 모든 블록체인을 다시 다운로드 할 것 입니다.</translation>
+    </message>
+    <message>
+        <source>(default: %u)</source>
+        <translation>(기본값: %u)</translation>
+    </message>
+    <message>
+        <source>Accept public REST requests (default: %u)</source>
+        <translation>공개 REST 요청을 허가 (기본값: %u)</translation>
+    </message>
+    <message>
+        <source>Activating best chain...</source>
+        <translation>최적 블록 체인을 활성화하는중...</translation>
+    </message>
+    <message>
+        <source>Attempt to recover private keys from a corrupt wallet.dat on startup</source>
+        <translation>시작시 망가진 wallet.dat에서 개인키 복원을 시도</translation>
+    </message>
+    <message>
+        <source>Automatically create Tor hidden service (default: %d)</source>
+        <translation>Tor서비스를 자동적으로 생성 (기본값: %d)</translation>
+    </message>
     <message>
         <source>Cannot resolve -whitebind address: '%s'</source>
         <translation>-whitebind 주소를 확인할 수 없습니다: '%s'</translation>
     </message>
+    <message>
+        <source>Connect through SOCKS5 proxy</source>
+        <translation>SOCK5 프록시를 통해 연결</translation>
+    </message>
+    <message>
+        <source>Copyright (C) 2009-%i The Bitcoin Core Developers</source>
+        <translation>Copyright (C) 2009-%i The Bitcoin Core Developers</translation>
+    </message>
+    <message>
+        <source>Error loading wallet.dat: Wallet requires newer version of Bitcoin Core</source>
+        <translation>wallet.dat 불러오기 오류: 최신 버전의 Bitcoin Core이 필요합니다.</translation>
+    </message>
+    <message>
+        <source>Error reading from database, shutting down.</source>
+        <translation>블록 데이터베이스를 불러오는데 오류가 발생하였습니다, 종료됩니다.</translation>
+    </message>
+    <message>
+        <source>Imports blocks from external blk000??.dat file on startup</source>
+        <translation>외부 blk000??.dat 파일에서 블록을 가져오기</translation>
+    </message>
     <message>
         <source>Information</source>
         <translation>정보</translation>
     </message>
+    <message>
+        <source>Initialization sanity check failed. Bitcoin Core is shutting down.</source>
+        <translation>무결성 확인 초기화가 실패했습니다. Bitcoin Core가 종료됩니다.</translation>
+    </message>
     <message>
         <source>Invalid amount for -maxtxfee=&lt;amount&gt;: '%s'</source>
         <translation>-maxtxfee=&lt;amount&gt;에 대한 양이 잘못되었습니다: '%s'</translation>
@@ -2519,14 +3387,54 @@
         <source>Invalid amount for -mintxfee=&lt;amount&gt;: '%s'</source>
         <translation>최저 거래 수수료가 부족합니다. -mintxfee=&lt;amount&gt;: '%s'</translation>
     </message>
+    <message>
+        <source>Invalid amount for -paytxfee=&lt;amount&gt;: '%s' (must be at least %s)</source>
+        <translation>유효하지 않은 금액 -paytxfee=&lt;amount&gt;: "%s" (최소 %s 이상이어야 됨)</translation>
+    </message>
+    <message>
+        <source>Invalid netmask specified in -whitelist: '%s'</source>
+        <translation>유효하지 않은 넷마스크가 -whitelist: '%s" 를 통해 지정됨</translation>
+    </message>
+    <message>
+        <source>Keep at most &lt;n&gt; unconnectable transactions in memory (default: %u)</source>
+        <translation>최대 &lt;n&gt;개의 연결할 수 없는 트랜잭션을 메모리에 저장 (기본값: %u)</translation>
+    </message>
+    <message>
+        <source>Need to specify a port with -whitebind: '%s'</source>
+        <translation>-whitebind를 이용하여 포트를 지정해야 합니다: '%s"</translation>
+    </message>
+    <message>
+        <source>Node relay options:</source>
+        <translation>Node 중계 옵션:</translation>
+    </message>
     <message>
         <source>RPC server options:</source>
         <translation>RPC 서버 설정</translation>
     </message>
+    <message>
+        <source>Rebuild block chain index from current blk000??.dat files on startup</source>
+        <translation>현재의 blk000??.dat 파일들로부터 블록체인 색인을 재구성합니다.</translation>
+    </message>
+    <message>
+        <source>Receive and display P2P network alerts (default: %u)</source>
+        <translation>P2P 네트워크 알림을 수신후 표시합니다 (기본값: %u)</translation>
+    </message>
+    <message>
+        <source>Reducing -maxconnections from %d to %d, because of system limitations.</source>
+        <translation>시스템 한계로 인하여 -maxconnections를 %d 에서 %d로 줄였습니다.</translation>
+    </message>
+    <message>
+        <source>Rescan the block chain for missing wallet transactions on startup</source>
+        <translation>시작시 누락된 지갑 트랜잭션에 대해 블록 체인을 다시 검색 합니다</translation>
+    </message>
     <message>
         <source>Send trace/debug info to console instead of debug.log file</source>
         <translation>추적오류 정보를 degug.log 자료로 보내는 대신 콘솔로 보내기</translation>
     </message>
+    <message>
+        <source>Send transactions as zero-fee transactions if possible (default: %u)</source>
+        <translation>가능한 경우 수수료 없이 트랜잭션 보내기 (기본값: %u)</translation>
+    </message>
     <message>
         <source>Show all debugging options (usage: --help -help-debug)</source>
         <translation>모든 디버그 설정 보기(설정: --help -help-debug)</translation>
@@ -2539,30 +3447,70 @@
         <source>Signing transaction failed</source>
         <translation>거래를 서명하는것을 실패하였습니다.</translation>
     </message>
+    <message>
+        <source>The transaction amount is too small to pay the fee</source>
+        <translation>거래액이 수수료를 지불하기엔 너무 작습니다</translation>
+    </message>
+    <message>
+        <source>This is experimental software.</source>
+        <translation>이 소프트웨어는 시험적입니다.</translation>
+    </message>
+    <message>
+        <source>Tor control port password (default: empty)</source>
+        <translation>Tor 관리 포트 암호 (기본값: 공란)</translation>
+    </message>
+    <message>
+        <source>Tor control port to use if onion listening enabled (default: %s)</source>
+        <translation>onion 열림이 활성화시 Tor 관리 포트 사용 (기본값: %s)</translation>
+    </message>
     <message>
         <source>Transaction amount too small</source>
-        <translation>거래량이 너무 적습니다</translation>
+        <translation>거래액이 너무 적습니다</translation>
     </message>
     <message>
         <source>Transaction amounts must be positive</source>
-        <translation>거래량은 반드시 정수여야합니다.</translation>
+        <translation>거래액은 반드시 정수여야합니다.</translation>
+    </message>
+    <message>
+        <source>Transaction too large for fee policy</source>
+        <translation>수수료 정책에 비해 트랜잭션이 너무 큽니다</translation>
     </message>
     <message>
         <source>Transaction too large</source>
         <translation>너무 큰 거래</translation>
     </message>
+    <message>
+        <source>Upgrade wallet to latest format on startup</source>
+        <translation>시작시 지갑 포멧을 최신으로 업그레이드 합니다</translation>
+    </message>
     <message>
         <source>Username for JSON-RPC connections</source>
         <translation>JSON-RPC 연결에 사용할 사용자 이름</translation>
     </message>
+    <message>
+        <source>Wallet needed to be rewritten: restart Bitcoin Core to complete</source>
+        <translation>지갑을 새로 써야 합니다:  완료하기 위하여 Bitcoin Core을 다시 시작하십시오.</translation>
+    </message>
     <message>
         <source>Warning</source>
         <translation>경고</translation>
     </message>
+    <message>
+        <source>Warning: unknown new rules activated (versionbit %i)</source>
+        <translation>경고: 알려지지 않은 새로운 규칙이 활성화되었습니다. (버전비트 %i)</translation>
+    </message>
+    <message>
+        <source>Whether to operate in a blocks only mode (default: %u)</source>
+        <translation>블록 전용 모드로 동작할지 여부 (기본값: %u)</translation>
+    </message>
     <message>
         <source>Zapping all transactions from wallet...</source>
         <translation>지갑의 모든거래내역 건너뛰기...</translation>
     </message>
+    <message>
+        <source>ZeroMQ notification options:</source>
+        <translation>ZeroMQ 알림 옵션:</translation>
+    </message>
     <message>
         <source>wallet.dat corrupt, salvage failed</source>
         <translation>wallet.dat 파일이 손상되었고 복구가 실패하였습니다.</translation>
@@ -2589,16 +3537,160 @@
     </message>
     <message>
         <source>Error loading wallet.dat: Wallet corrupted</source>
-        <translation>wallet.dat 불러오기 에러: 지갑 오류</translation>
+        <translation>wallet.dat 불러오기 오류: 지갑 오류</translation>
+    </message>
+    <message>
+        <source>(1 = keep tx meta data e.g. account owner and payment request information, 2 = drop tx meta data)</source>
+        <translation>(1 = 트랜잭션의 메타 데이터를 유지함 예. 계좌정보 와 지불 요구 정보, 2 = 트랜잭션 메타 데이터 파기)</translation>
+    </message>
+    <message>
+        <source>-maxtxfee is set very high! Fees this large could be paid on a single transaction.</source>
+        <translation>-maxtxfee값이 너무 큽니다!  하나의 트랜잭션에 너무 큰 수수료가 지불 됩니다.</translation>
+    </message>
+    <message>
+        <source>-paytxfee is set very high! This is the transaction fee you will pay if you send a transaction.</source>
+        <translation>-paytxfee값이 너무 큽니다! 이 값은 송금할때 지불할 송금 수수료입니다.</translation>
+    </message>
+    <message>
+        <source>Do not keep transactions in the mempool longer than &lt;n&gt; hours (default: %u)</source>
+        <translation>메모리 풀에 있는 트랜잭션 기록을 &lt;n&gt;시간 후 부터는 유지하지 않기 (기본값: %u)</translation>
+    </message>
+    <message>
+        <source>Error reading wallet.dat! All keys read correctly, but transaction data or address book entries might be missing or incorrect.</source>
+        <translation>경고 : wallet.dat 파일을 읽는 중 오류가 발생했습니다. 주소 키는 모두 정확하게 로딩되었으나 거래 데이터와 주소록 필드에서 누락이나 오류가 존재할 수 있습니다. </translation>
+    </message>
+    <message>
+        <source>Fees (in %s/kB) smaller than this are considered zero fee for transaction creation (default: %s)</source>
+        <translation>해당 금액(%s/kB) 보다 적은 수수료는 수수료 면제로 간주됩니다.(기본값: %s)</translation>
+    </message>
+    <message>
+        <source>How thorough the block verification of -checkblocks is (0-4, default: %u)</source>
+        <translation>-checkblocks을 통한 블록 점검 (0-4, 기본값: %u)</translation>
+    </message>
+    <message>
+        <source>Maintain a full transaction index, used by the getrawtransaction rpc call (default: %u)</source>
+        <translation>getrawtransaction를 RPC CALL를 통해 완전한 트랜잭션 인덱스 유지 (기본값: %u)</translation>
+    </message>
+    <message>
+        <source>Number of seconds to keep misbehaving peers from reconnecting (default: %u)</source>
+        <translation>이상행동을 하는 네트워크 참여자들을 다시 연결시키는데 걸리는 시간 (기본값: %u)</translation>
+    </message>
+    <message>
+        <source>Output debugging information (default: %u, supplying &lt;category&gt; is optional)</source>
+        <translation>디버그 정보 출력 (기본값: %u, &lt;category&gt; 제공은 선택입니다)</translation>
+    </message>
+    <message>
+        <source>Support filtering of blocks and transaction with bloom filters (default: %u)</source>
+        <translation>블룸필터를 통해 블록과 트랜잭션 필터링 지원 (기본값: %u)</translation>
+    </message>
+    <message>
+        <source>Total length of network version string (%i) exceeds maximum length (%i). Reduce the number or size of uacomments.</source>
+        <translation>네트워크 버전 문자 (%i)의 길이가 최대길이 (%i)를 초과합니다. UA코멘트의 갯수나 길이를 줄이세요.</translation>
+    </message>
+    <message>
+        <source>Tries to keep outbound traffic under the given target (in MiB per 24h), 0 = no limit (default: %d)</source>
+        <translation>아웃바운드 트래픽을 설정된 목표치 이하로 유지하기 (24시간당 MiB기준), 0 = 무제한 (기본값: %d)</translation>
+    </message>
+    <message>
+        <source>Unsupported argument -socks found. Setting SOCKS version isn't possible anymore, only SOCKS5 proxies are supported.</source>
+        <translation>지원하지 않는 인수 -socks를 찾았습니다. 설정된 SOCKS의 버전은 더이상 사용할 수 없으며, SOCK5 프록시만을 지원합니다.</translation>
+    </message>
+    <message>
+        <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: %s)</source>
+        <translation>Tor 서비스를 이용하여 피어에게 연결하기 위해 분리된 SOCKS5 프록시를 사용 (기본값: %s)</translation>
+    </message>
+    <message>
+        <source>Username and hashed password for JSON-RPC connections. The field &lt;userpw&gt; comes in the format: &lt;USERNAME&gt;:&lt;SALT&gt;$&lt;HASH&gt;. A canonical python script is included in share/rpcuser. This option can be specified multiple times</source>
+        <translation>JSON-RPC 연결시 사용자 이름과 해시화된 암호문. &lt;userpw&gt; 필드는 &lt;USERNAME&gt;:&lt;SALT&gt;$&lt;HASH&gt; 포멧으로 구성되어 있습니다. 전형적 파이썬 스크립트에선 share/rpcuser가 포함되어 있습니다. 이 옵션은 여러번 지정할 수 있습니다.</translation>
+    </message>
+    <message>
+        <source>Always query for peer addresses via DNS lookup (default: %u)</source>
+        <translation>DNS lookup을 통해 항상 피어주소에 대한 쿼리 보내기 (기본값: %u)</translation>
     </message>
     <message>
         <source>Error loading wallet.dat</source>
-        <translation>wallet.dat 불러오기 에러</translation>
+        <translation>wallet.dat 불러오기 오류</translation>
+    </message>
+    <message>
+        <source>Generate coins (default: %u)</source>
+        <translation>코인 생성 (기본값: %u)</translation>
+    </message>
+    <message>
+        <source>How many blocks to check at startup (default: %u, 0 = all)</source>
+        <translation>시작시 점검할 블록 갯수 (기본값: %u, 0 = 모두)</translation>
+    </message>
+    <message>
+        <source>Include IP addresses in debug output (default: %u)</source>
+        <translation>디버그 출력에 IP주소 포함하기 (기본값: %u)</translation>
     </message>
     <message>
         <source>Invalid -proxy address: '%s'</source>
         <translation>잘못된 -proxy 주소입니다: '%s'</translation>
     </message>
+    <message>
+        <source>Listen for JSON-RPC connections on &lt;port&gt; (default: %u or testnet: %u)</source>
+        <translation>JSON-RPC 연결을 &lt;port&gt;포트로 받기 (기본값: %u 혹은 테스트넷: %u)</translation>
+    </message>
+    <message>
+        <source>Listen for connections on &lt;port&gt; (default: %u or testnet: %u)</source>
+        <translation>&lt;port&gt;포트로 연결 받기 (기본값: %u 혹은 테스트넷: %u)</translation>
+    </message>
+    <message>
+        <source>Maintain at most &lt;n&gt; connections to peers (default: %u)</source>
+        <translation>피어 연결수를 &lt;n&gt;개로 유지 (기본값: %u)</translation>
+    </message>
+    <message>
+        <source>Make the wallet broadcast transactions</source>
+        <translation>지갑 브로드캐스트 트랜잭션을 만들기</translation>
+    </message>
+    <message>
+        <source>Maximum per-connection receive buffer, &lt;n&gt;*1000 bytes (default: %u)</source>
+        <translation>접속별 최대 수신 버퍼. &lt;n&gt; × 1000바이트 (기본값: %u)</translation>
+    </message>
+    <message>
+        <source>Maximum per-connection send buffer, &lt;n&gt;*1000 bytes (default: %u)</source>
+        <translation>접속별 최대 전송 버퍼. &lt;n&gt; × 1000바이트 (기본값: %u)</translation>
+    </message>
+    <message>
+        <source>Prepend debug output with timestamp (default: %u)</source>
+        <translation>디버그 출력에 타임 스탬프 포함하기 (기본값: %u)</translation>
+    </message>
+    <message>
+        <source>Relay and mine data carrier transactions (default: %u)</source>
+        <translation>데이터 운송 트랜잭션을 중계 및 채굴 (기본값: %u)</translation>
+    </message>
+    <message>
+        <source>Relay non-P2SH multisig (default: %u)</source>
+        <translation>비 P2SH 다중서명을 중계 (기본값: %u)</translation>
+    </message>
+    <message>
+        <source>Set key pool size to &lt;n&gt; (default: %u)</source>
+        <translation>키 풀 사이즈를 &lt;n&gt; 로 설정 (기본값: %u)</translation>
+    </message>
+    <message>
+        <source>Set the number of threads to service RPC calls (default: %d)</source>
+        <translation>원격 프로시져 호출 서비스를 위한 쓰레드 개수를 설정 (기본값 : %d)</translation>
+    </message>
+    <message>
+        <source>Specify configuration file (default: %s)</source>
+        <translation>설정파일 지정 (기본값: %s)</translation>
+    </message>
+    <message>
+        <source>Specify connection timeout in milliseconds (minimum: 1, default: %d)</source>
+        <translation>밀리초 단위로 연결 제한시간을 설정 (최소값: 1, 기본값: %d)</translation>
+    </message>
+    <message>
+        <source>Specify pid file (default: %s)</source>
+        <translation>pid 파일 지정 (기본값: %s)</translation>
+    </message>
+    <message>
+        <source>Spend unconfirmed change when sending transactions (default: %u)</source>
+        <translation>트랜잭션을 보낼 때 검증되지 않은 잔돈 쓰기 (기본값: %u)</translation>
+    </message>
+    <message>
+        <source>Threshold for disconnecting misbehaving peers (default: %u)</source>
+        <translation>이상행동 네트워크 참여자의 연결을 차단시키기 위한 한계치 (기본값: %u)</translation>
+    </message>
     <message>
         <source>Unknown network specified in -onlynet: '%s'</source>
         <translation>-onlynet에 지정한 네트워크를 알 수 없습니다: '%s'</translation>
diff --git a/src/qt/locale/bitcoin_la.ts b/src/qt/locale/bitcoin_la.ts
index e3dcd505feaf9..b11027d1ee275 100644
--- a/src/qt/locale/bitcoin_la.ts
+++ b/src/qt/locale/bitcoin_la.ts
@@ -667,10 +667,6 @@
         <source>Debug window</source>
         <translation>Fenestra Debug</translation>
     </message>
-    <message>
-        <source>Using OpenSSL version</source>
-        <translation>Utens OpenSSL versione</translation>
-    </message>
     <message>
         <source>Startup time</source>
         <translation>Tempus initiandi</translation>
diff --git a/src/qt/locale/bitcoin_lt.ts b/src/qt/locale/bitcoin_lt.ts
index b98976dfeaec2..873a6939b7a5c 100644
--- a/src/qt/locale/bitcoin_lt.ts
+++ b/src/qt/locale/bitcoin_lt.ts
@@ -33,6 +33,10 @@
         <source>Delete the currently selected address from the list</source>
         <translation>Ištrinti pasirinktą adresą iš sąrašo</translation>
     </message>
+    <message>
+        <source>Export the data in the current tab to a file</source>
+        <translation>Eksportuoti informaciją iš dabartinės lentelės į failą</translation>
+    </message>
     <message>
         <source>&amp;Export</source>
         <translation>&amp;Eksportuoti</translation>
@@ -45,6 +49,10 @@
         <source>Choose the address to send coins to</source>
         <translation>Pasirinkite adresą kuriam siūsite monetas</translation>
     </message>
+    <message>
+        <source>Choose the address to receive coins with</source>
+        <translation>Pasirinkite adresą su kuriuo gauti monetas</translation>
+    </message>
     <message>
         <source>C&amp;hoose</source>
         <translation>P&amp;asirinkti</translation>
@@ -57,6 +65,14 @@
         <source>Receiving addresses</source>
         <translation>Gaunami adresai</translation>
     </message>
+    <message>
+        <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source>
+        <translation>Tai yra jūsų Bitcoin adresai mokėjimų siuntimui. Visada patikrinkite siunčiamą sumą ir gavėjo adresą prieš siųsdami monetas.</translation>
+    </message>
+    <message>
+        <source>These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source>
+        <translation>Tai yra jūsų Bitcoin adresai mokėjimų gavimui. Rekomenduojame naudoti naujus gavimo adresus kiekvienai tranzakcijai.</translation>
+    </message>
     <message>
         <source>Copy &amp;Label</source>
         <translation>Kopijuoti ž&amp;ymę</translation>
@@ -907,10 +923,6 @@
         <source>Debug window</source>
         <translation>Derinimo langas</translation>
     </message>
-    <message>
-        <source>Using OpenSSL version</source>
-        <translation>Naudojama OpenSSL versija</translation>
-    </message>
     <message>
         <source>Startup time</source>
         <translation>Paleidimo laikas</translation>
@@ -1690,6 +1702,10 @@
         <source>&amp;Export</source>
         <translation>&amp;Eksportuoti</translation>
     </message>
+    <message>
+        <source>Export the data in the current tab to a file</source>
+        <translation>Eksportuoti informaciją iš dabartinės lentelės į failą</translation>
+    </message>
     <message>
         <source>Backup Wallet</source>
         <translation>Backup piniginę</translation>
diff --git a/src/qt/locale/bitcoin_lv_LV.ts b/src/qt/locale/bitcoin_lv_LV.ts
index e01d4c812c5fa..5a59184b0cef8 100644
--- a/src/qt/locale/bitcoin_lv_LV.ts
+++ b/src/qt/locale/bitcoin_lv_LV.ts
@@ -1079,10 +1079,6 @@
         <source>General</source>
         <translation>Vispārējs</translation>
     </message>
-    <message>
-        <source>Using OpenSSL version</source>
-        <translation>Izmantotā OpenSSL versija</translation>
-    </message>
     <message>
         <source>Startup time</source>
         <translation>Sākuma laiks</translation>
diff --git a/src/qt/locale/bitcoin_nb.ts b/src/qt/locale/bitcoin_nb.ts
index 9236ac86fe12d..94e02f8900ed1 100644
--- a/src/qt/locale/bitcoin_nb.ts
+++ b/src/qt/locale/bitcoin_nb.ts
@@ -1473,10 +1473,6 @@
         <source>General</source>
         <translation>Generelt</translation>
     </message>
-    <message>
-        <source>Using OpenSSL version</source>
-        <translation>Bruker OpenSSL versjon</translation>
-    </message>
     <message>
         <source>Using BerkeleyDB version</source>
         <translation>Bruker BerkeleyDB versjon</translation>
@@ -3195,10 +3191,6 @@
         <source>Wallet options:</source>
         <translation>Valg for lommebok:</translation>
     </message>
-    <message>
-        <source>Warning: This version is obsolete; upgrade required!</source>
-        <translation>Advarsel: Denne versjonen er utdatert; oppgradering er påkrevd!</translation>
-    </message>
     <message>
         <source>You need to rebuild the database using -reindex to change -txindex</source>
         <translation>Du må gjenoppbygge databasen med å bruke -reindex for å endre -txindex</translation>
@@ -3295,10 +3287,6 @@
         <source>Activating best chain...</source>
         <translation>Aktiverer beste kjede...</translation>
     </message>
-    <message>
-        <source>Always relay transactions received from whitelisted peers (default: %d)</source>
-        <translation>Alltid videresend transaksjoner mottatt fra hvitlistede noder (standardverdi: %d)</translation>
-    </message>
     <message>
         <source>Attempt to recover private keys from a corrupt wallet.dat on startup</source>
         <translation>Forsøk å berge private nøkler fra en korrupt wallet.dat ved oppstart</translation>
diff --git a/src/qt/locale/bitcoin_nl.ts b/src/qt/locale/bitcoin_nl.ts
index 8457a9ab50265..fe29959abf5ba 100644
--- a/src/qt/locale/bitcoin_nl.ts
+++ b/src/qt/locale/bitcoin_nl.ts
@@ -7,7 +7,7 @@
     </message>
     <message>
         <source>Create a new address</source>
-        <translation>Maak een nieuw adres</translation>
+        <translation>Maak een nieuw adres aan</translation>
     </message>
     <message>
         <source>&amp;New</source>
@@ -169,7 +169,7 @@
     </message>
     <message>
         <source>Bitcoin Core will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source>
-        <translation>Bitcoin Core zal nu afsluiten om het versleutelingsproces te voltooien. Hou er rekening mee dat versleuteling van je portemonnee je niet volledig beschermt tegen diefstal van jouw bitcoins door malware op je computer.</translation>
+        <translation>Bitcoin Core zal nu afsluiten om het versleutelingsproces te voltooien. Hou er rekening mee dat versleuteling van uw portemonnee u niet volledig beschermt tegen diefstal van jouw bitcoins door malware op je computer.</translation>
     </message>
     <message>
         <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source>
@@ -1473,10 +1473,6 @@
         <source>General</source>
         <translation>Algemeen</translation>
     </message>
-    <message>
-        <source>Using OpenSSL version</source>
-        <translation>Gebruikt OpenSSL versie</translation>
-    </message>
     <message>
         <source>Using BerkeleyDB version</source>
         <translation>Gebruikt BerkeleyDB versie</translation>
@@ -2979,6 +2975,18 @@
         <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
         <translation>Accepteer verbindingen van buitenaf (standaard: 1 als geen -proxy of -connect is opgegeven)</translation>
     </message>
+    <message>
+        <source>-fallbackfee is set very high! This is the transaction fee you may pay when fee estimates are not available.</source>
+        <translation>-fallbackfee is zeer hoog ingesteld! Dit zijn de transactie kosten die u mogelijk betaald wanneer de schattingen niet beschikbaar zijn.</translation>
+    </message>
+    <message>
+        <source>A fee rate (in %s/kB) that will be used when fee estimation has insufficient data (default: %s)</source>
+        <translation>Een transactietarief (in %s/kB) dat gebruikt wordt als de transactiekosten schatting niet genoeg data heeft. (normaal: %s)</translation>
+    </message>
+    <message>
+        <source>Accept relayed transactions received from whitelisted peers even when not relaying transactions (default: %d)</source>
+        <translation>Accepteer doorgestuurde transacties ontvangen van goedgekeurde peers, ook wanneer je zelf geen transacties doorstuurt (standaard: %d)</translation>
+    </message>
     <message>
         <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source>
         <translation>Bind aan opgegeven adres en luister er altijd op. Gebruik [host]:port notatie voor IPv6</translation>
@@ -2995,6 +3003,10 @@
         <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source>
         <translation>Voer opdracht uit zodra een portemonneetransactie verandert (%s in cmd wordt vervangen door TxID)</translation>
     </message>
+    <message>
+        <source>Force relay of transactions from whitelisted peers even they violate local relay policy (default: %d)</source>
+        <translation>Forceer het doorsturen van transacties van goedgekeurde peers, zelfs wanneer deze niet voldoen aan de lokale doorstuur regels (standaard: %d)</translation>
+    </message>
     <message>
         <source>Set the number of script verification threads (%u to %d, 0 = auto, &lt;0 = leave that many cores free, default: %d)</source>
         <translation>Kies het aantal scriptverificatie processen (%u tot %d, 0 = auto, &lt;0 = laat dit aantal kernen vrij, standaard: %d)</translation>
@@ -3011,6 +3023,10 @@
         <source>Unable to bind to %s on this computer. Bitcoin Core is probably already running.</source>
         <translation>Niet in staat om %s te verbinden op deze computer. Bitcoin Core draait waarschijnlijk al.</translation>
     </message>
+    <message>
+        <source>Unsupported argument -whitelistalwaysrelay ignored, use -whitelistrelay and/or -whitelistforcerelay.</source>
+        <translation>Niet ondersteund argument -whitelistalwaysrelay genegeerd, gebruik -whitelistrelay en/of -whitelistforcerelay.</translation>
+    </message>
     <message>
         <source>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</source>
         <translation>Gebruik UPnP om de luisterende poort te mappen (standaard: 1 als er geluisterd worden en geen -proxy is meegegeven)</translation>
@@ -3027,6 +3043,10 @@
         <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source>
         <translation>Waarschuwing: Het lijkt erop dat het netwerk geen consensus kan vinden! Sommige delvers lijken problemen te ondervinden.</translation>
     </message>
+    <message>
+        <source>Warning: Unknown block versions being mined! It's possible unknown rules are in effect</source>
+        <translation>Waarschuwing: Onbekende blok versies worden gemined! Er zijn mogelijk onbekende regels in werking getreden</translation>
+    </message>
     <message>
         <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source>
         <translation>Waarschuwing: Het lijkt erop dat we geen consensus kunnen vinden met onze peers! Mogelijk dient u te upgraden, of andere nodes moeten wellicht upgraden.</translation>
@@ -3047,6 +3067,10 @@
         <source>&lt;category&gt; can be:</source>
         <translation>&lt;categorie&gt; kan zijn:</translation>
     </message>
+    <message>
+        <source>Append comment to the user agent string</source>
+        <translation>Voeg commentaar toe aan de user agent string</translation>
+    </message>
     <message>
         <source>Block creation options:</source>
         <translation>Blokcreatie-opties:</translation>
@@ -3091,6 +3115,10 @@
         <source>Enable publish raw transaction in &lt;address&gt;</source>
         <translation>Sta toe ruwe transacties te publiceren in &lt;adres&gt;</translation>
     </message>
+    <message>
+        <source>Enable transaction replacement in the memory pool (default: %u)</source>
+        <translation>Transactie vervanging inschakelen in het geheugen (standaard: %u)</translation>
+    </message>
     <message>
         <source>Error initializing block database</source>
         <translation>Fout bij intialisatie blokkendatabase</translation>
@@ -3127,10 +3155,22 @@
         <source>Invalid -onion address: '%s'</source>
         <translation>Ongeldig -onion adres '%s'</translation>
     </message>
+    <message>
+        <source>Invalid amount for -fallbackfee=&lt;amount&gt;: '%s'</source>
+        <translation>Ongeldig bedrag voor -fallbackfee=&lt;bedrag&gt;: '%s'</translation>
+    </message>
     <message>
         <source>Keep the transaction memory pool below &lt;n&gt; megabytes (default: %u)</source>
         <translation>De transactiegeheugenpool moet onder de &lt;n&gt; megabytes blijven (standaard: %u)</translation>
     </message>
+    <message>
+        <source>Location of the auth cookie (default: data dir)</source>
+        <translation>Locatie van de auth cookie (standaard: data dir)</translation>
+    </message>
+    <message>
+        <source>Minimum bytes per sigop in transactions we relay and mine (default: %u)</source>
+        <translation>Minimum aantal bytes dat er per sigop in een transactie gerelayed en gemined worden (standaard: %u)</translation>
+    </message>
     <message>
         <source>Not enough file descriptors available.</source>
         <translation>Niet genoeg file descriptors beschikbaar.</translation>
@@ -3139,6 +3179,10 @@
         <source>Only connect to nodes in network &lt;net&gt; (ipv4, ipv6 or onion)</source>
         <translation>Verbind alleen met nodes in netwerk &lt;net&gt; (ipv4, ipv6 of onion)</translation>
     </message>
+    <message>
+        <source>Print version and exit</source>
+        <translation>Laat versie zien en sluit af</translation>
+    </message>
     <message>
         <source>Prune cannot be configured with a negative value.</source>
         <translation>Snoeien kan niet worden geconfigureerd met een negatieve waarde.</translation>
@@ -3195,10 +3239,6 @@
         <source>Wallet options:</source>
         <translation>Portemonnee instellingen:</translation>
     </message>
-    <message>
-        <source>Warning: This version is obsolete; upgrade required!</source>
-        <translation>Waarschuwing: Deze versie is verouderd; upgraden verplicht!</translation>
-    </message>
     <message>
         <source>You need to rebuild the database using -reindex to change -txindex</source>
         <translation>Om -txindex te kunnen veranderen dient u de database herbouwen met gebruik van -reindex.</translation>
@@ -3295,10 +3335,6 @@
         <source>Activating best chain...</source>
         <translation>Beste reeks activeren...</translation>
     </message>
-    <message>
-        <source>Always relay transactions received from whitelisted peers (default: %d)</source>
-        <translation>Geef transacties altijd door aan goedgekeurde peers (standaard: %d)</translation>
-    </message>
     <message>
         <source>Attempt to recover private keys from a corrupt wallet.dat on startup</source>
         <translation>Probeer privésleutels te herstellen van een corrupte wallet.dat bij opstarten</translation>
@@ -3463,6 +3499,10 @@
         <source>Warning</source>
         <translation>Waarschuwing</translation>
     </message>
+    <message>
+        <source>Warning: unknown new rules activated (versionbit %i)</source>
+        <translation>Waarschuwing: onbekende nieuwe regels geactiveerd (versionbit %i)</translation>
+    </message>
     <message>
         <source>Whether to operate in a blocks only mode (default: %u)</source>
         <translation>Om in alleen een blokmodus te opereren (standaard: %u)</translation>
diff --git a/src/qt/locale/bitcoin_pam.ts b/src/qt/locale/bitcoin_pam.ts
index 233918ff2ba59..c5a0b17e801fe 100644
--- a/src/qt/locale/bitcoin_pam.ts
+++ b/src/qt/locale/bitcoin_pam.ts
@@ -655,10 +655,6 @@
         <source>Debug window</source>
         <translation>I-Debug ing awang</translation>
     </message>
-    <message>
-        <source>Using OpenSSL version</source>
-        <translation>Gagamit bersion na ning OpenSSL</translation>
-    </message>
     <message>
         <source>Startup time</source>
         <translation>Oras ning umpisa</translation>
diff --git a/src/qt/locale/bitcoin_pl.ts b/src/qt/locale/bitcoin_pl.ts
index 8a8c377480996..ffbacfd4929f4 100644
--- a/src/qt/locale/bitcoin_pl.ts
+++ b/src/qt/locale/bitcoin_pl.ts
@@ -87,11 +87,11 @@
     </message>
     <message>
         <source>Comma separated file (*.csv)</source>
-        <translation>CSV (rozdzielany przecinkami)</translation>
+        <translation>Pliki (*.csv) rozdzielone przecinkami</translation>
     </message>
     <message>
         <source>Exporting Failed</source>
-        <translation>Błąd przy próbie eksportu</translation>
+        <translation>Błąd przy próbie eksportowania</translation>
     </message>
     <message>
         <source>There was an error trying to save the address list to %1. Please try again.</source>
@@ -137,7 +137,7 @@
     </message>
     <message>
         <source>This operation needs your wallet passphrase to unlock the wallet.</source>
-        <translation>Ta operacja wymaga hasła do portfela ażeby odblokować portfel.</translation>
+        <translation>Operacja wymaga hasła portfela, aby go odblokować.</translation>
     </message>
     <message>
         <source>Unlock wallet</source>
@@ -145,7 +145,7 @@
     </message>
     <message>
         <source>This operation needs your wallet passphrase to decrypt the wallet.</source>
-        <translation>Ta operacja wymaga hasła do portfela ażeby odszyfrować portfel.</translation>
+        <translation>Operacja wymaga hasła portfela, aby go odszyfrować.</translation>
     </message>
     <message>
         <source>Decrypt wallet</source>
@@ -161,7 +161,7 @@
     </message>
     <message>
         <source>Warning: If you encrypt your wallet and lose your passphrase, you will &lt;b&gt;LOSE ALL OF YOUR BITCOINS&lt;/b&gt;!</source>
-        <translation>Uwaga: Jeśli zaszyfrujesz swój portfel i zgubisz hasło to &lt;b&gt;STRACISZ WSZYSTKIE SWOJE BITCOIN'Y&lt;/b&gt;!</translation>
+        <translation>Uwaga: jeśli zaszyfrujesz swój portfel i zgubisz hasło &lt;b&gt;STRACISZ WSZYSTKIE SWOJE BITCOINY&lt;/b&gt;!</translation>
     </message>
     <message>
         <source>Are you sure you wish to encrypt your wallet?</source>
@@ -169,15 +169,15 @@
     </message>
     <message>
         <source>Bitcoin Core will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source>
-        <translation>Program Bitcoin Core zamknie się, aby dokończyć proces szyfrowania. Pamiętaj, że szyfrowanie portfela nie zabezpiecza w pełni Twoich bitcoinów przed kradzieżą przez wirusy lub trojany mogące zainfekować Twój komputer.</translation>
+        <translation>Program Bitcoin Core zamknie się, aby dokończyć proces szyfrowania. Pamiętaj, że szyfrowanie portfela nie zabezpiecza w pełni twoich bitcoinów przed kradzieżą przez złośliwe oprogramowanie mogące zainfekować twój komputer.</translation>
     </message>
     <message>
         <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source>
-        <translation>WAŻNE: Wszystkie wykonane wcześniej kopie pliku portfela powinny być zamienione na nowe, szyfrowane pliki. Z powodów bezpieczeństwa, poprzednie kopie nieszyfrowanych plików portfela staną się bezużyteczne jak tylko zaczniesz korzystać z nowego, szyfrowanego portfela.</translation>
+        <translation>WAŻNE: Wszystkie wcześniejsze kopie pliku portfela powinny być zamienione na nowe, szyfrowane pliki. Z powodów bezpieczeństwa, poprzednie kopie nieszyfrowanych plików portfela staną się bezużyteczne jak tylko zaczniesz korzystać z nowego, szyfrowanego portfela.</translation>
     </message>
     <message>
         <source>Warning: The Caps Lock key is on!</source>
-        <translation>Uwaga: Klawisz Caps Lock jest włączony!</translation>
+        <translation>Uwaga: klawisz Caps Lock jest włączony!</translation>
     </message>
     <message>
         <source>Wallet encrypted</source>
@@ -185,7 +185,7 @@
     </message>
     <message>
         <source>Enter the new passphrase to the wallet.&lt;br/&gt;Please use a passphrase of &lt;b&gt;ten or more random characters&lt;/b&gt;, or &lt;b&gt;eight or more words&lt;/b&gt;.</source>
-        <translation>Wprowadź nowe hasło do portfela.&lt;br/&gt;Proszę używać hasła złożonego z &lt;b&gt;10 lub więcej losowych znaków&lt;/b&gt; lub &lt;b&gt;ośmiu lub więcej słów.&lt;/b&gt;</translation>
+        <translation>Wprowadź nowe hasło do portfela.&lt;br/&gt;Proszę używać hasła złożonego z &lt;b&gt;10 lub więcej losowych znaków&lt;/b&gt; albo &lt;b&gt;8 lub więcej słów.&lt;/b&gt;</translation>
     </message>
     <message>
         <source>Enter the old passphrase and new passphrase to the wallet.</source>
@@ -224,7 +224,7 @@
     <name>BanTableModel</name>
     <message>
         <source>IP/Netmask</source>
-        <translation>IP/Maska Sieci</translation>
+        <translation>IP / maska podsieci</translation>
     </message>
     <message>
         <source>Banned Until</source>
@@ -307,7 +307,7 @@
     </message>
     <message>
         <source>Bitcoin Core client</source>
-        <translation>Rdzeń klienta Bitcoin</translation>
+        <translation>Klient Rdzenia Bitcoina</translation>
     </message>
     <message>
         <source>Importing blocks from disk...</source>
@@ -319,7 +319,7 @@
     </message>
     <message>
         <source>Send coins to a Bitcoin address</source>
-        <translation>Wyślij monety na adres Bitcoin</translation>
+        <translation>Wyślij monety na adres bitcoinowy</translation>
     </message>
     <message>
         <source>Backup wallet to another location</source>
@@ -359,7 +359,7 @@
     </message>
     <message>
         <source>Show information about Bitcoin Core</source>
-        <translation>Pokaż informacje o Rdzeniu Bitcoin</translation>
+        <translation>Pokaż informacje o Rdzeniu Bitcoina</translation>
     </message>
     <message>
         <source>&amp;Show / Hide</source>
@@ -371,7 +371,7 @@
     </message>
     <message>
         <source>Encrypt the private keys that belong to your wallet</source>
-        <translation>Szyfruj klucze prywatne, które są w Twoim portfelu</translation>
+        <translation>Szyfruj klucze prywatne, które są w twoim portfelu</translation>
     </message>
     <message>
         <source>Sign messages with your Bitcoin addresses to prove you own them</source>
@@ -379,7 +379,7 @@
     </message>
     <message>
         <source>Verify messages to ensure they were signed with specified Bitcoin addresses</source>
-        <translation>Zweryfikuj wiadomość,  aby upewnić się, że została podpisana podanym adresem Bitcoin.</translation>
+        <translation>Zweryfikuj wiadomość,  aby upewnić się, że została podpisana podanym adresem bitcoinowym.</translation>
     </message>
     <message>
         <source>&amp;File</source>
@@ -399,11 +399,11 @@
     </message>
     <message>
         <source>Bitcoin Core</source>
-        <translation>Rdzeń Bitcoin</translation>
+        <translation>Rdzeń Bitcoina</translation>
     </message>
     <message>
         <source>Request payments (generates QR codes and bitcoin: URIs)</source>
-        <translation>Żądaj płatności (generuje kod QR oraz bitcoin URI)</translation>
+        <translation>Żądaj płatności (generuje kod QR oraz bitcoinowe URI)</translation>
     </message>
     <message>
         <source>&amp;About Bitcoin Core</source>
@@ -449,6 +449,10 @@
         <source>%n hour(s)</source>
         <translation><numerusform>%n godzin</numerusform><numerusform>%n godzin</numerusform><numerusform>%n godzin</numerusform></translation>
     </message>
+    <message numerus="yes">
+        <source>%n day(s)</source>
+        <translation><numerusform>dzień</numerusform><numerusform>%n dni</numerusform><numerusform>%n dni</numerusform></translation>
+    </message>
     <message numerus="yes">
         <source>%n week(s)</source>
         <translation><numerusform>%n tygodni</numerusform><numerusform>%n tygodni</numerusform><numerusform>%n tygodni</numerusform></translation>
@@ -491,7 +495,7 @@
     </message>
     <message>
         <source>Catching up...</source>
-        <translation>Synchronizuję się...</translation>
+        <translation>Trwa synchronizacja…</translation>
     </message>
     <message>
         <source>Date: %1
@@ -810,11 +814,11 @@
     </message>
     <message>
         <source>The entered address "%1" is already in the address book.</source>
-        <translation>Wprowadzony adres "%1" już istnieje w książce adresowej.</translation>
+        <translation>Wprowadzony adres «%1» już istnieje w książce adresowej.</translation>
     </message>
     <message>
         <source>The entered address "%1" is not a valid Bitcoin address.</source>
-        <translation>Wprowadzony adres "%1" nie jest poprawnym adresem Bitcoin.</translation>
+        <translation>Wprowadzony adres «%1"» nie jest poprawnym adresem bitcoinowym.</translation>
     </message>
     <message>
         <source>Could not unlock wallet.</source>
@@ -852,7 +856,7 @@
     <name>HelpMessageDialog</name>
     <message>
         <source>Bitcoin Core</source>
-        <translation>Rdzeń Bitcoin</translation>
+        <translation>Rdzeń Bitcoina</translation>
     </message>
     <message>
         <source>version</source>
@@ -888,7 +892,7 @@
     </message>
     <message>
         <source>Set language, for example "de_DE" (default: system locale)</source>
-        <translation>Wybierz język, na przykład "de_DE" (domyślnie: język systemowy)</translation>
+        <translation>Wybierz język, na przykład «de_DE» (domyślnie: język systemowy)</translation>
     </message>
     <message>
         <source>Start minimized</source>
@@ -915,7 +919,7 @@
     </message>
     <message>
         <source>Welcome to Bitcoin Core.</source>
-        <translation>Witam w Bitcoin Core</translation>
+        <translation>Witaj w Bitcoin Core</translation>
     </message>
     <message>
         <source>As this is the first time the program is launched, you can choose where Bitcoin Core will store its data.</source>
@@ -923,7 +927,7 @@
     </message>
     <message>
         <source>Bitcoin Core will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source>
-        <translation>Program pobierze i będzie przechowywał kopię łańcucha bloków Bitcoin. W wybranym katalogu musi być przynajmniej %1GB miejsca, a z czasem ilość danych będzie rosła. Portfel będzie przechowywany w tym samym katalogu.</translation>
+        <translation>Program pobierze i będzie przechowywał kopię łańcucha bloków bitcoinowych. W wybranym katalogu musi być przynajmniej %1 GB miejsca, a z czasem ilość danych będzie rosła. Portfel będzie przechowywany w tym samym katalogu.</translation>
     </message>
     <message>
         <source>Use the default data directory</source>
@@ -935,11 +939,11 @@
     </message>
     <message>
         <source>Bitcoin Core</source>
-        <translation>Rdzeń Bitcoin</translation>
+        <translation>Rdzeń Bitcoina</translation>
     </message>
     <message>
         <source>Error: Specified data directory "%1" cannot be created.</source>
-        <translation>Błąd: Określony folder danych "%1" nie mógł zostać utworzony.</translation>
+        <translation>Błąd: podany folder danych «%1» nie mógł zostać utworzony.</translation>
     </message>
     <message>
         <source>Error</source>
@@ -1037,7 +1041,7 @@
     </message>
     <message>
         <source>&amp;Reset Options</source>
-        <translation>Z&amp;resetuj Ustawienia</translation>
+        <translation>Z&amp;resetuj ustawienia</translation>
     </message>
     <message>
         <source>&amp;Network</source>
@@ -1049,7 +1053,7 @@
     </message>
     <message>
         <source>&amp;Start Bitcoin Core on system login</source>
-        <translation>Uruchamiaj Bitcoin wraz z zalogowaniem do &amp;systemu</translation>
+        <translation>Uruchamiaj Bitcoin Core wraz z zalogowaniem do &amp;systemu</translation>
     </message>
     <message>
         <source>(0 = auto, &lt;0 = leave that many cores free)</source>
@@ -1093,7 +1097,7 @@
     </message>
     <message>
         <source>Proxy &amp;IP:</source>
-        <translation>Proxy &amp;IP: </translation>
+        <translation>&amp;IP proxy: </translation>
     </message>
     <message>
         <source>&amp;Port:</source>
@@ -1103,6 +1107,10 @@
         <source>Port of the proxy (e.g. 9050)</source>
         <translation>Port proxy (np. 9050)</translation>
     </message>
+    <message>
+        <source>Used for reaching peers via:</source>
+        <translation>Użyto do połączenia z peerami przy pomocy:</translation>
+    </message>
     <message>
         <source>Shows, if the supplied default SOCKS5 proxy is used to reach peers via this network type.</source>
         <translation>Pokazuje, czy wspierane domyślnie proxy SOCKS5 jest używane do łączenia się z peerami w tej sieci</translation>
@@ -1119,9 +1127,13 @@
         <source>Tor</source>
         <translation>Tor</translation>
     </message>
+    <message>
+        <source>Connect to the Bitcoin network through a separate SOCKS5 proxy for Tor hidden services.</source>
+        <translation>Połącz się z siecią Bitcoin przy pomocy oddzielnego SOCKS5 proxy dla sieci TOR</translation>
+    </message>
     <message>
         <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services:</source>
-        <translation>Użyj oddzielnego prozy SOCKS5 aby osiągnąć węzły w ukrytych usługach Tor:</translation>
+        <translation>Użyj oddzielnego proxy SOCKS5 aby osiągnąć węzły w ukrytych usługach Tor:</translation>
     </message>
     <message>
         <source>&amp;Window</source>
@@ -1133,7 +1145,7 @@
     </message>
     <message>
         <source>&amp;Minimize to the tray instead of the taskbar</source>
-        <translation>&amp;Minimalizuj do paska przy zegarku zamiast do paska zadań</translation>
+        <translation>&amp;Minimalizuj do zasobnika systemowego zamiast do paska zadań</translation>
     </message>
     <message>
         <source>M&amp;inimize on close</source>
@@ -1145,7 +1157,7 @@
     </message>
     <message>
         <source>User Interface &amp;language:</source>
-        <translation>Język &amp;Użytkownika:</translation>
+        <translation>Język &amp;użytkownika:</translation>
     </message>
     <message>
         <source>&amp;Unit to show amounts in:</source>
@@ -1240,7 +1252,7 @@
     </message>
     <message>
         <source>Total:</source>
-        <translation>Wynosi ogółem:</translation>
+        <translation>Ogółem:</translation>
     </message>
     <message>
         <source>Your current total balance</source>
@@ -1385,7 +1397,7 @@
     </message>
     <message>
         <source>Enter a Bitcoin address (e.g. %1)</source>
-        <translation>Wprowadź adres Bitcoin (np. %1)</translation>
+        <translation>Wprowadź adres bitcoinowy (np. %1)</translation>
     </message>
     <message>
         <source>%1 d</source>
@@ -1428,7 +1440,7 @@
     </message>
     <message>
         <source>Save QR Code</source>
-        <translation>Zapisz Kod QR</translation>
+        <translation>Zapisz kod QR</translation>
     </message>
     <message>
         <source>PNG Image (*.png)</source>
@@ -1461,10 +1473,6 @@
         <source>General</source>
         <translation>Ogólne</translation>
     </message>
-    <message>
-        <source>Using OpenSSL version</source>
-        <translation>Używana wersja OpenSSL</translation>
-    </message>
     <message>
         <source>Using BerkeleyDB version</source>
         <translation>Używana wersja BerkeleyDB </translation>
@@ -1493,6 +1501,10 @@
         <source>Current number of blocks</source>
         <translation>Aktualna liczba bloków</translation>
     </message>
+    <message>
+        <source>Memory Pool</source>
+        <translation>Memory Pool (obszar pamięci)</translation>
+    </message>
     <message>
         <source>Current number of transactions</source>
         <translation>Obecna liczba transakcji</translation>
@@ -1629,10 +1641,30 @@
         <source>Clear console</source>
         <translation>Wyczyść konsolę</translation>
     </message>
+    <message>
+        <source>&amp;Disconnect Node</source>
+        <translation>Odłącz Nod</translation>
+    </message>
     <message>
         <source>Ban Node for</source>
         <translation>Blokuj węzeł na okres</translation>
     </message>
+    <message>
+        <source>1 &amp;hour</source>
+        <translation>1 &amp;godzina</translation>
+    </message>
+    <message>
+        <source>1 &amp;day</source>
+        <translation>1 &amp;dzień</translation>
+    </message>
+    <message>
+        <source>1 &amp;week</source>
+        <translation>1 &amp;tydzień</translation>
+    </message>
+    <message>
+        <source>1 &amp;year</source>
+        <translation>1 &amp;rok</translation>
+    </message>
     <message>
         <source>&amp;Unban Node</source>
         <translation>Odblokuj węzeł</translation>
@@ -2298,6 +2330,11 @@
         <source>&amp;Verify Message</source>
         <translation>&amp;Zweryfikuj wiadomość</translation>
     </message>
+    <message>
+        <source>Enter the receiver's address, message (ensure you copy line breaks, spaces, tabs, etc. exactly) and signature below to verify the message. Be careful not to read more into the signature than what is in the signed message itself, to avoid being tricked by a man-in-the-middle attack. Note that this only proves the signing party receives with the address, it cannot prove sendership of any transaction!</source>
+        <translation>Wpisz adres, wiadomość oraz sygnaturę (podpis) odbiorcy (upewnij się, że dokładnie skopiujesz wszystkie zakończenia linii, spacje, tabulacje itp.).  Uważaj by nie dodać więcej do podpisu niż do samej podpisywanej wiadomości by uniknąć ataku man-in-the-middle. 
+Zwróć uwagę, że poprawnie zweryfikowana wiadomość potwierdza to, że nadawca posiada klucz do adresu, natomiast nie potwierdza to, że poprawne wysłanie jakiejkolwiek transakcji! </translation>
+    </message>
     <message>
         <source>The Bitcoin address the message was signed with</source>
         <translation>Adres Bitcoin, którym została podpisana wiadomość</translation>
@@ -2371,7 +2408,7 @@
     <name>SplashScreen</name>
     <message>
         <source>Bitcoin Core</source>
-        <translation>Rdzeń Bitcoin</translation>
+        <translation>Rdzeń Bitcoina</translation>
     </message>
     <message>
         <source>The Bitcoin Core developers</source>
@@ -2838,11 +2875,11 @@
     </message>
     <message>
         <source>Backup Wallet</source>
-        <translation>Kopia Zapasowa Portfela</translation>
+        <translation>Kopia zapasowa portfela</translation>
     </message>
     <message>
         <source>Wallet Data (*.dat)</source>
-        <translation>Dane Portfela (*.dat)</translation>
+        <translation>Dane portfela (*.dat)</translation>
     </message>
     <message>
         <source>Backup Failed</source>
@@ -2858,7 +2895,7 @@
     </message>
     <message>
         <source>Backup Successful</source>
-        <translation>Wykonano Kopię Zapasową</translation>
+        <translation>Wykonano kopię zapasową</translation>
     </message>
 </context>
 <context>
@@ -2883,6 +2920,18 @@
         <source>Accept command line and JSON-RPC commands</source>
         <translation>Akceptuj linię poleceń oraz polecenia JSON-RPC</translation>
     </message>
+    <message>
+        <source>If &lt;category&gt; is not supplied or if &lt;category&gt; = 1, output all debugging information.</source>
+        <translation>Jeżeli &lt;category&gt; nie zostanie określona lub &lt;category&gt; = 1, wyświetl wszystkie informacje debugowania.</translation>
+    </message>
+    <message>
+        <source>Please check that your computer's date and time are correct! If your clock is wrong Bitcoin Core will not work properly.</source>
+        <translation>Proszę sprawdzić czy data i czas na Twoim komputerze są poprawne! Jeżeli ustawienia zegara będą złe, Bitcoin Core nie będzie działał prawidłowo.</translation>
+    </message>
+    <message>
+        <source>Prune configured below the minimum of %d MiB.  Please use a higher number.</source>
+        <translation>Przycinanie skonfigurowano poniżej minimalnych %d MiB. Proszę użyć wyższej liczby.</translation>
+    </message>
     <message>
         <source>Error: A fatal internal error occurred, see debug.log for details</source>
         <translation>Błąd: Wystąpił fatalny błąd wewnętrzny, sprawdź szczegóły w debug.log</translation>
@@ -2907,6 +2956,10 @@
         <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
         <translation>Akceptuj połączenia z zewnątrz (domyślnie: 1 jeśli nie ustawiono -proxy lub -connect)</translation>
     </message>
+    <message>
+        <source>-fallbackfee is set very high! This is the transaction fee you may pay when fee estimates are not available.</source>
+        <translation>-fallbackfee ma ustawioną bardzo dużą wartość!  Jest to prowizja za transakcje, którą możesz zapłacić gdy oszacowanie opłaty jest niemożliwe.</translation>
+    </message>
     <message>
         <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source>
         <translation>Skojarz z podanym adresem i nasłuchuj na nim. Użyj formatu [host]:port dla IPv6</translation>
@@ -2923,6 +2976,10 @@
         <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source>
         <translation>Wykonaj polecenie, kiedy transakcja portfela ulegnie zmianie (%s w poleceniu zostanie zastąpione przez TxID)</translation>
     </message>
+    <message>
+        <source>Force relay of transactions from whitelisted peers even they violate local relay policy (default: %d)</source>
+        <translation>Wymuś przekazywanie transakcji od osób z białej listy, nawet jeśli narusza to lokalną politykę przekazywania (default: %d)</translation>
+    </message>
     <message>
         <source>Set the number of script verification threads (%u to %d, 0 = auto, &lt;0 = leave that many cores free, default: %d)</source>
         <translation>Ustaw liczbę wątków skryptu weryfikacyjnego (%u do %d, 0 = auto, &lt;0 = zostaw tyle rdzeni wolnych, domyślnie: %d)</translation>
@@ -2935,6 +2992,14 @@
         <source>Unable to bind to %s on this computer. Bitcoin Core is probably already running.</source>
         <translation>Nie można przywiązać z portem %s na tym komputerze. Bitcoin Core prawdopodobnie już działa.</translation>
     </message>
+    <message>
+        <source>Unsupported argument -whitelistalwaysrelay ignored, use -whitelistrelay and/or -whitelistforcerelay.</source>
+        <translation>Niewspierany argument -whitelistalwaysrelay zignorowany, użyj -whitelistrelay i/lub -whitelistforcerelay.</translation>
+    </message>
+    <message>
+        <source>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</source>
+        <translation>Używaj UPnP do mapowania portu nasłuchu (domyślnie: 1 gdy nasłuchuje i brak -proxy)</translation>
+    </message>
     <message>
         <source>WARNING: abnormally high number of blocks generated, %d blocks received in the last %d hours (%d expected)</source>
         <translation>UWAGA: nienaturalnie duża liczba wygenerowanych bloków, %d bloków otrzymano w ostatnich %d godzinach (%d oczekiwanych)</translation>
@@ -2959,6 +3024,10 @@
         <source>Whitelist peers connecting from the given netmask or IP address. Can be specified multiple times.</source>
         <translation>Dodawaj do białej listy węzły łączące się z podanej maski sieciowej lub adresu IP. Może być określona kilka razy.</translation>
     </message>
+    <message>
+        <source>-maxmempool must be at least %d MB</source>
+        <translation>-maxmempool musi być przynajmniej %d MB</translation>
+    </message>
     <message>
         <source>&lt;category&gt; can be:</source>
         <translation>&lt;category&gt; mogą być:</translation>
@@ -2991,6 +3060,10 @@
         <source>Do you want to rebuild the block database now?</source>
         <translation>Czy chcesz teraz przebudować bazę bloków?</translation>
     </message>
+    <message>
+        <source>Enable publish hash block in &lt;address&gt;</source>
+        <translation>Włącz wyświetlanie hasha bloku w &lt;address&gt;</translation>
+    </message>
     <message>
         <source>Error initializing block database</source>
         <translation>Błąd inicjowania bazy danych bloków</translation>
@@ -3027,6 +3100,14 @@
         <source>Invalid -onion address: '%s'</source>
         <translation>Nieprawidłowy adres -onion: '%s'</translation>
     </message>
+    <message>
+        <source>Invalid amount for -fallbackfee=&lt;amount&gt;: '%s'</source>
+        <translation>Nieprawidłowa kwota dla -fallbackfee=&lt;amount&gt;: '%s'</translation>
+    </message>
+    <message>
+        <source>Keep the transaction memory pool below &lt;n&gt; megabytes (default: %u)</source>
+        <translation>Utrzymuj obszar pamięci dla transakcji poniżej &lt;n&gt; MB (default: %u)</translation>
+    </message>
     <message>
         <source>Not enough file descriptors available.</source>
         <translation>Brak wystarczającej liczby deskryptorów plików. </translation>
@@ -3035,6 +3116,10 @@
         <source>Only connect to nodes in network &lt;net&gt; (ipv4, ipv6 or onion)</source>
         <translation>Łącz z węzłami tylko w sieci &lt;net&gt; (ipv4, piv6 lub onion)</translation>
     </message>
+    <message>
+        <source>Print version and exit</source>
+        <translation>Wyświetl wersję i wyjdź</translation>
+    </message>
     <message>
         <source>Prune cannot be configured with a negative value.</source>
         <translation>Przycinanie nie może być skonfigurowane z negatywną wartością.</translation>
@@ -3063,10 +3148,18 @@
         <source>Unsupported argument -debugnet ignored, use -debug=net.</source>
         <translation>Niewspierany argument -debugnet zignorowany, użyj -debug=net.</translation>
     </message>
+    <message>
+        <source>Unsupported argument -tor found, use -onion.</source>
+        <translation>Znaleziono nieprawidłowy argument -tor, użyj -onion.</translation>
+    </message>
     <message>
         <source>Use UPnP to map the listening port (default: %u)</source>
         <translation>Użyj UPnP do przekazania portu nasłuchu (domyślnie : %u)</translation>
     </message>
+    <message>
+        <source>User Agent comment (%s) contains unsafe characters.</source>
+        <translation>Komentarz User Agent (%s) zawiera niebezpieczne znaki.</translation>
+    </message>
     <message>
         <source>Verifying blocks...</source>
         <translation>Weryfikacja bloków...</translation>
@@ -3083,10 +3176,6 @@
         <source>Wallet options:</source>
         <translation>Opcje portfela:</translation>
     </message>
-    <message>
-        <source>Warning: This version is obsolete; upgrade required!</source>
-        <translation>Uwaga: Ta wersja jest przestarzała, wymagana jest aktualizacja!</translation>
-    </message>
     <message>
         <source>You need to rebuild the database using -reindex to change -txindex</source>
         <translation>Musisz przebudować bazę używając parametru -reindex aby zmienić -txindex</translation>
@@ -3171,10 +3260,6 @@
         <source>Activating best chain...</source>
         <translation>Aktywuje najlepszy łańcuch</translation>
     </message>
-    <message>
-        <source>Always relay transactions received from whitelisted peers (default: %d)</source>
-        <translation>Zawsze przekazuj informacje o transakcjach otrzymanych od osób z białej listy (domyślnie: %d)</translation>
-    </message>
     <message>
         <source>Attempt to recover private keys from a corrupt wallet.dat on startup</source>
         <translation>Próbuj podczas uruchamiania programu odzyskać klucze prywatne z uszkodzonego pliku wallet.dat</translation>
@@ -3259,6 +3344,10 @@
         <source>Receive and display P2P network alerts (default: %u)</source>
         <translation>Odbieranie i wyświetlanie alertów sieci P2P (domyślnie: %u)</translation>
     </message>
+    <message>
+        <source>Reducing -maxconnections from %d to %d, because of system limitations.</source>
+        <translation>Zmniejszanie -maxconnections z %d do %d z powodu ograniczeń systemu.</translation>
+    </message>
     <message>
         <source>Rescan the block chain for missing wallet transactions on startup</source>
         <translation>Przeskanuj podczas ładowania programu łańcuch bloków w poszukiwaniu zaginionych transakcji portfela</translation>
@@ -3335,6 +3424,10 @@
         <source>Zapping all transactions from wallet...</source>
         <translation>Usuwam wszystkie transakcje z portfela...</translation>
     </message>
+    <message>
+        <source>ZeroMQ notification options:</source>
+        <translation>Opcje powiadomień ZeroMQ:</translation>
+    </message>
     <message>
         <source>wallet.dat corrupt, salvage failed</source>
         <translation>wallet.dat uszkodzony, odtworzenie się nie powiodło</translation>
@@ -3367,14 +3460,26 @@
         <source>(1 = keep tx meta data e.g. account owner and payment request information, 2 = drop tx meta data)</source>
         <translation>(1 = zachowaj wysłane metadane np. właściciel konta i informacje o żądaniach płatności, 2 = porzuć wysłane metadane)</translation>
     </message>
+    <message>
+        <source>-maxtxfee is set very high! Fees this large could be paid on a single transaction.</source>
+        <translation>-matxfee jest ustawione bardzo wysokie! Tak wysokie opłaty mogą być zapłacone w jednej transakcji.</translation>
+    </message>
+    <message>
+        <source>-paytxfee is set very high! This is the transaction fee you will pay if you send a transaction.</source>
+        <translation>-paytxfee ma ustawioną bardzo dużą wartość! Jest to prowizja za transakcje, którą płacisz, gdy wysyłasz monety.</translation>
+    </message>
     <message>
         <source>Do not keep transactions in the mempool longer than &lt;n&gt; hours (default: %u)</source>
-        <translation>Nie trzymaj w pamięci transakcji starszych niż &lt;n&gt; godzin (domyślnie: %u)</translation>
+        <translation>Nie trzymaj w pamięci transakcji starszych niż &lt;n&gt; godz. (domyślnie: %u)</translation>
     </message>
     <message>
         <source>Error reading wallet.dat! All keys read correctly, but transaction data or address book entries might be missing or incorrect.</source>
         <translation>Ostrzeżenie: błąd odczytu wallet.dat! Wszystkie klucze zostały odczytane, ale może brakować pewnych danych transakcji lub wpisów w książce adresowej lub mogą one być nieprawidłowe.</translation>
     </message>
+    <message>
+        <source>Fees (in %s/kB) smaller than this are considered zero fee for transaction creation (default: %s)</source>
+        <translation>Opłaty (w %s/Kb) mniejsze niż ta będą traktowane jako bez opłaty przy tworzeniu transakcji (domyślnie: %s)</translation>
+    </message>
     <message>
         <source>How thorough the block verification of -checkblocks is (0-4, default: %u)</source>
         <translation>Jak dokładna jest weryfikacja bloków przy -checkblocks (0-4, domyślnie: %u)</translation>
@@ -3391,6 +3496,18 @@
         <source>Output debugging information (default: %u, supplying &lt;category&gt; is optional)</source>
         <translation>Wypuść informacje debugowania (domyślnie: %u, podanie &lt;category&gt; jest opcjonalne)</translation>
     </message>
+    <message>
+        <source>Support filtering of blocks and transaction with bloom filters (default: %u)</source>
+        <translation>Wspieraj filtrowanie bloków i transakcji używając Filtrów Blooma (domyślnie: %u)</translation>
+    </message>
+    <message>
+        <source>Total length of network version string (%i) exceeds maximum length (%i). Reduce the number or size of uacomments.</source>
+        <translation>Całkowita długość łańcucha wersji (%i) przekracza maksymalną dopuszczalną długość (%i). Zmniejsz ilość lub rozmiar parametru uacomment.</translation>
+    </message>
+    <message>
+        <source>Tries to keep outbound traffic under the given target (in MiB per 24h), 0 = no limit (default: %d)</source>
+        <translation>Próbuje utrzymać ruch wychodzący poniżej zadanego (w MiB na dobę), 0 = bez limitu (domyślnie: %d)</translation>
+    </message>
     <message>
         <source>Unsupported argument -socks found. Setting SOCKS version isn't possible anymore, only SOCKS5 proxies are supported.</source>
         <translation>Znaleziono niewspierany argument -socks. Wybieranie wersji SOCKS nie jest już możliwe, wsparcie programu obejmuje tylko proxy SOCKS5</translation>
diff --git a/src/qt/locale/bitcoin_pt_BR.ts b/src/qt/locale/bitcoin_pt_BR.ts
index 5cea349fbc3f4..1b92395c79809 100644
--- a/src/qt/locale/bitcoin_pt_BR.ts
+++ b/src/qt/locale/bitcoin_pt_BR.ts
@@ -387,7 +387,7 @@
     </message>
     <message>
         <source>&amp;Settings</source>
-        <translation>&amp;definições</translation>
+        <translation>&amp;Definições</translation>
     </message>
     <message>
         <source>&amp;Help</source>
@@ -723,7 +723,7 @@
     </message>
     <message>
         <source>none</source>
-        <translation>nenhum</translation>
+        <translation>Nenhum</translation>
     </message>
     <message>
         <source>This label turns red if the transaction size is greater than 1000 bytes.</source>
@@ -1033,7 +1033,7 @@
     </message>
     <message>
         <source>Active command-line options that override above options:</source>
-        <translation>Ativa as opções de linha de comando que sobrescreve as opções acima:</translation>
+        <translation>Opções de linha de comando ativas que sobrescreve as opções acima:</translation>
     </message>
     <message>
         <source>Reset all client options to default.</source>
@@ -1185,7 +1185,7 @@
     </message>
     <message>
         <source>none</source>
-        <translation>nenhum</translation>
+        <translation>Nenhum</translation>
     </message>
     <message>
         <source>Confirm options reset</source>
@@ -1473,10 +1473,6 @@
         <source>General</source>
         <translation>Geral</translation>
     </message>
-    <message>
-        <source>Using OpenSSL version</source>
-        <translation>Versão do OpenSSL</translation>
-    </message>
     <message>
         <source>Using BerkeleyDB version</source>
         <translation>Versão do BerkeleyDB</translation>
@@ -1975,7 +1971,7 @@
     </message>
     <message>
         <source>collapse fee-settings</source>
-        <translation>colapso Taxa de definições</translation>
+        <translation>Ocultar painel</translation>
     </message>
     <message>
         <source>per kilobyte</source>
@@ -2340,7 +2336,7 @@
     </message>
     <message>
         <source>Enter the receiver's address, message (ensure you copy line breaks, spaces, tabs, etc. exactly) and signature below to verify the message. Be careful not to read more into the signature than what is in the signed message itself, to avoid being tricked by a man-in-the-middle attack. Note that this only proves the signing party receives with the address, it cannot prove sendership of any transaction!</source>
-        <translation>Coloque o endereço do destinatário, a mensagem (certifique-se de copiar toda a mensagem, incluindo quebras de linha, espaços, tabulações, etc.) e a assinatura embaixo para verificar a mensagem. Cuidado para não ler mais da assinatura do que está assinado na mensagem, para evitar ser enganado pelo ataque man-in-the-middle. Note que isso somente prova a propriedade de um endereço, e não o remetende de qualquer transação.</translation>
+        <translation>Coloque o endereço do autor, a mensagem (certifique-se de copiar toda a mensagem, incluindo quebras de linha, espaços, tabulações, etc.) e a assinatura embaixo para verificar a mensagem. Cuidado para não ler mais da assinatura do que está assinado na mensagem, para evitar ser enganado pelo ataque man-in-the-middle. Note que isso somente prova a propriedade de um endereço, e não o remetende de qualquer transação.</translation>
     </message>
     <message>
         <source>The Bitcoin address the message was signed with</source>
@@ -2979,6 +2975,18 @@
         <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
         <translation>Aceitar conexões externas (padrão: 1 se opções -proxy ou -connect não estiverem presentes)</translation>
     </message>
+    <message>
+        <source>-fallbackfee is set very high! This is the transaction fee you may pay when fee estimates are not available.</source>
+        <translation>-fallbackfee está muito alta! Essa é a taxa de transação que você vai pagar quando a taxa estimada não estiver disponível.</translation>
+    </message>
+    <message>
+        <source>A fee rate (in %s/kB) that will be used when fee estimation has insufficient data (default: %s)</source>
+        <translation>A variação da taxa (em %s/kB) que será usada quando não houver dados suficientes para se estimar a taxa (default: %s)</translation>
+    </message>
+    <message>
+        <source>Accept relayed transactions received from whitelisted peers even when not relaying transactions (default: %d)</source>
+        <translation>Aceita transações retransmitidas advindas de pares em lista branca, mesmo quando não estiver retransmitindo transações (padrão: %d)</translation>
+    </message>
     <message>
         <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source>
         <translation>Vincular ao endereço fornecido e sempre escutar nele. Use a notação [host]:port para IPv6</translation>
@@ -2995,6 +3003,10 @@
         <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source>
         <translation>Executa um comando quando uma transação da carteira mudar (%s no comando será substituído por TxID)</translation>
     </message>
+    <message>
+        <source>Force relay of transactions from whitelisted peers even they violate local relay policy (default: %d)</source>
+        <translation>Força a retransmissão de transações de pares da lista branca, mesmo quando violam a política local de retransmissão (default: %d)</translation>
+    </message>
     <message>
         <source>Set the number of script verification threads (%u to %d, 0 = auto, &lt;0 = leave that many cores free, default: %d)</source>
         <translation>Define o número de threads de verificação de script (%u a %d, 0 = automático, &lt;0 = número de cores deixados livres, padrão: %d)</translation>
@@ -3011,6 +3023,10 @@
         <source>Unable to bind to %s on this computer. Bitcoin Core is probably already running.</source>
         <translation>Impossível ouvir em %s neste computador. Provavelmente o Bitcoin já está sendo executado.</translation>
     </message>
+    <message>
+        <source>Unsupported argument -whitelistalwaysrelay ignored, use -whitelistrelay and/or -whitelistforcerelay.</source>
+        <translation>Argumento não suportado -whitelistalwaysrelay foi ignorado, utilize -whitelistrelay e/ou -whitelistforcerelay.</translation>
+    </message>
     <message>
         <source>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</source>
         <translation>Use UPnP para mapear a porta escutada (padrão: 1 quando escutando e sem -proxy)</translation>
@@ -3027,6 +3043,10 @@
         <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source>
         <translation>Atenção: A rede não parecem concordar plenamente! Alguns mineiros parecem estar enfrentando problemas.</translation>
     </message>
+    <message>
+        <source>Warning: Unknown block versions being mined! It's possible unknown rules are in effect</source>
+        <translation>Aviso: Versões de bloco desconhecidas sendo mineradas! É possível que regras estranhas estejam ativas</translation>
+    </message>
     <message>
         <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source>
         <translation>Atenção: Nós não parecemos concordar plenamente com nossos colegas! Você pode precisar atualizar ou outros nós podem precisar atualizar.</translation>
@@ -3047,6 +3067,10 @@
         <source>&lt;category&gt; can be:</source>
         <translation>&lt;category&gt; pode ser:</translation>
     </message>
+    <message>
+        <source>Append comment to the user agent string</source>
+        <translation>Adiciona comentário ao user-agent do navegador</translation>
+    </message>
     <message>
         <source>Block creation options:</source>
         <translation>Opções de criação de blocos:</translation>
@@ -3091,6 +3115,10 @@
         <source>Enable publish raw transaction in &lt;address&gt;</source>
         <translation>Abilitar a publicação dos dados brutos da transação em &lt;endereço&gt;</translation>
     </message>
+    <message>
+        <source>Enable transaction replacement in the memory pool (default: %u)</source>
+        <translation>Habilita substituição de transação em memória (padrão: %u)</translation>
+    </message>
     <message>
         <source>Error initializing block database</source>
         <translation>Erro ao inicializar banco de dados de blocos</translation>
@@ -3127,10 +3155,22 @@
         <source>Invalid -onion address: '%s'</source>
         <translation>Endereço -onion inválido: '%s'</translation>
     </message>
+    <message>
+        <source>Invalid amount for -fallbackfee=&lt;amount&gt;: '%s'</source>
+        <translation>Valor inválido para -fallbackfee=&lt;amount&gt;: '%s'</translation>
+    </message>
     <message>
         <source>Keep the transaction memory pool below &lt;n&gt; megabytes (default: %u)</source>
         <translation>Mantenha a mempool de transações abaixo de &lt;n&gt; megabytes (padrão: %u)</translation>
     </message>
+    <message>
+        <source>Location of the auth cookie (default: data dir)</source>
+        <translation>Localização do cookie de autenticação (padrão: diretório de dados)</translation>
+    </message>
+    <message>
+        <source>Minimum bytes per sigop in transactions we relay and mine (default: %u)</source>
+        <translation>Número mínimo de bytes por sigop em transações que transmitimos e mineramos (default: %u)</translation>
+    </message>
     <message>
         <source>Not enough file descriptors available.</source>
         <translation>Decriptadores de arquivos disponíveis insuficientes.</translation>
@@ -3139,6 +3179,10 @@
         <source>Only connect to nodes in network &lt;net&gt; (ipv4, ipv6 or onion)</source>
         <translation>Somente conectar a clientes na rede &lt;net&gt; (ipv4, ipv6 ou onion)</translation>
     </message>
+    <message>
+        <source>Print version and exit</source>
+        <translation>Mostra a versão e sai</translation>
+    </message>
     <message>
         <source>Prune cannot be configured with a negative value.</source>
         <translation>O modo Prune não pode ser configurado com um valor negativo.</translation>
@@ -3195,10 +3239,6 @@
         <source>Wallet options:</source>
         <translation>Opções da carteira:</translation>
     </message>
-    <message>
-        <source>Warning: This version is obsolete; upgrade required!</source>
-        <translation>Atenção: Essa versão está obsoleta, atualização necessária!</translation>
-    </message>
     <message>
         <source>You need to rebuild the database using -reindex to change -txindex</source>
         <translation>Você precisa reconstruir o banco de dados utilizando -reindex</translation>
@@ -3273,7 +3313,7 @@
     </message>
     <message>
         <source>This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit &lt;https://www.openssl.org/&gt; and cryptographic software written by Eric Young and UPnP software written by Thomas Bernard.</source>
-        <translation>Esse produto inclui software desenvolvido pelo Open SSL Project para uso na OpenSSL Toolkit&lt;https://www.openssl.org/&gt; e software criptográfico escrito por Eric Young e software UPnP escrito por Thomas Bernard. </translation>
+        <translation>Esse produto inclui software desenvolvido pelo Open SSL Project para uso na OpenSSL Toolkit &lt;https://www.openssl.org&gt; e software criptográfico escrito por Eric Young e software UPnP escrito por Thomas Bernard. </translation>
     </message>
     <message>
         <source>Whitelisted peers cannot be DoS banned and their transactions are always relayed, even if they are already in the mempool, useful e.g. for a gateway</source>
@@ -3295,10 +3335,6 @@
         <source>Activating best chain...</source>
         <translation>Ativando a melhor sequência...</translation>
     </message>
-    <message>
-        <source>Always relay transactions received from whitelisted peers (default: %d)</source>
-        <translation>Sempre transmitir transações recebidas de peers confiáveis (padrão: %d)</translation>
-    </message>
     <message>
         <source>Attempt to recover private keys from a corrupt wallet.dat on startup</source>
         <translation>Tentar recuperar na inicialização chaves privadas de um arquivo wallet.dat corrompido</translation>
@@ -3383,6 +3419,14 @@
         <source>Receive and display P2P network alerts (default: %u)</source>
         <translation>Receba e mostre P2P alerta de rede (padrão: %u)</translation>
     </message>
+    <message>
+        <source>Reducing -maxconnections from %d to %d, because of system limitations.</source>
+        <translation>Reduzindo -maxconnections de %d para %d, devido a limitações do sistema</translation>
+    </message>
+    <message>
+        <source>Rescan the block chain for missing wallet transactions on startup</source>
+        <translation>Re-escanear a block-chain por transações faltantes na carteira durante a inicialização</translation>
+    </message>
     <message>
         <source>Send trace/debug info to console instead of debug.log file</source>
         <translation>Mandar informação de trace/debug para o console em vez de para o arquivo debug.log</translation>
@@ -3411,6 +3455,14 @@
         <source>This is experimental software.</source>
         <translation>Este é um software experimental.</translation>
     </message>
+    <message>
+        <source>Tor control port password (default: empty)</source>
+        <translation>Senha da porta de controle do Tor (padrão: vazio)</translation>
+    </message>
+    <message>
+        <source>Tor control port to use if onion listening enabled (default: %s)</source>
+        <translation>Porta de controle a ser usada se o monitoramento onion estiver habilitado (padrão: %s)</translation>
+    </message>
     <message>
         <source>Transaction amount too small</source>
         <translation>Quantidade da transação muito pequena.</translation>
@@ -3431,6 +3483,10 @@
         <source>Unable to bind to %s on this computer (bind returned error %s)</source>
         <translation>Impossível se ligar a %s neste computador (bind retornou erro %s)</translation>
     </message>
+    <message>
+        <source>Upgrade wallet to latest format on startup</source>
+        <translation>Atualizar a carteira para o último formato na inicialização</translation>
+    </message>
     <message>
         <source>Username for JSON-RPC connections</source>
         <translation>Nome de usuário para conexões JSON-RPC</translation>
@@ -3443,10 +3499,22 @@
         <source>Warning</source>
         <translation>Atenção</translation>
     </message>
+    <message>
+        <source>Warning: unknown new rules activated (versionbit %i)</source>
+        <translation>Aviso: Novas regras estranhas foram ativadas (versionbit %i)</translation>
+    </message>
+    <message>
+        <source>Whether to operate in a blocks only mode (default: %u)</source>
+        <translation>Quando operar em modo de blocos somente (padrãp: %u)</translation>
+    </message>
     <message>
         <source>Zapping all transactions from wallet...</source>
         <translation>Aniquilando todas as transações da carteira...</translation>
     </message>
+    <message>
+        <source>ZeroMQ notification options:</source>
+        <translation>Opções de notificação ZeroMQ:</translation>
+    </message>
     <message>
         <source>wallet.dat corrupt, salvage failed</source>
         <translation>wallet.dat corrompido, recuperação falhou</translation>
@@ -3475,14 +3543,70 @@
         <source>Error loading wallet.dat: Wallet corrupted</source>
         <translation>Erro ao carregar wallet.dat: Carteira corrompida</translation>
     </message>
+    <message>
+        <source>(1 = keep tx meta data e.g. account owner and payment request information, 2 = drop tx meta data)</source>
+        <translation>(1 = manter metadados tx e.g. informação do dono da conta e requisição de pagamente, 2 = descartar metadados tx)</translation>
+    </message>
+    <message>
+        <source>-maxtxfee is set very high! Fees this large could be paid on a single transaction.</source>
+        <translation>-maxtxfee é muito alto! Essa quantia poderia ser paga em uma única transação.</translation>
+    </message>
+    <message>
+        <source>-paytxfee is set very high! This is the transaction fee you will pay if you send a transaction.</source>
+        <translation>-paytxfee é muito alto! Este é o valor da taxa de transação que você irá pagar se enviar a transação.</translation>
+    </message>
+    <message>
+        <source>Do not keep transactions in the mempool longer than &lt;n&gt; hours (default: %u)</source>
+        <translation>Não manter transações na mempool por mais que &lt;n&gt; horas (padrão: %u)</translation>
+    </message>
+    <message>
+        <source>Error reading wallet.dat! All keys read correctly, but transaction data or address book entries might be missing or incorrect.</source>
+        <translation>Erro ao ler o arquivo wallet.dat! Todas as chaves foram lidas corretamente, mas os dados de transações ou o livro de endereços podem estar faltando ou ser incorretos.</translation>
+    </message>
     <message>
         <source>Fees (in %s/kB) smaller than this are considered zero fee for transaction creation (default: %s)</source>
         <translation>Comissões (em %s/kB) menores serão consideradas como zero para criação de transação (padrão %s)</translation>
     </message>
+    <message>
+        <source>How thorough the block verification of -checkblocks is (0-4, default: %u)</source>
+        <translation>Quão completa a verificação de blocos do -checkblocks é (0-4, padrão: %u)</translation>
+    </message>
+    <message>
+        <source>Maintain a full transaction index, used by the getrawtransaction rpc call (default: %u)</source>
+        <translation>Mantém um índice completo de transações, usado pela chamada rpc getrawtransaction (padrão: %u)</translation>
+    </message>
+    <message>
+        <source>Number of seconds to keep misbehaving peers from reconnecting (default: %u)</source>
+        <translation>Número de segundos para impedir que peers mal comportados reconectem (padrão %u)</translation>
+    </message>
+    <message>
+        <source>Output debugging information (default: %u, supplying &lt;category&gt; is optional)</source>
+        <translation>Informação de saída de debug (padrão: %u, definir &lt;category&gt; é opcional)</translation>
+    </message>
+    <message>
+        <source>Support filtering of blocks and transaction with bloom filters (default: %u)</source>
+        <translation>Suportar filtragem de blocos e transações com filtros bloom (padrão: %u)</translation>
+    </message>
+    <message>
+        <source>Total length of network version string (%i) exceeds maximum length (%i). Reduce the number or size of uacomments.</source>
+        <translation>O tamanho total da string de versão da rede (%i) excede o tamanho máximo (%i). Reduza o numero ou tamanho de uacomments.</translation>
+    </message>
+    <message>
+        <source>Tries to keep outbound traffic under the given target (in MiB per 24h), 0 = no limit (default: %d)</source>
+        <translation>Tenta manter tráfego fora dos limites dentro do alvo especificado (em MiB por 24h), 0 = sem limite (padrão: %d)</translation>
+    </message>
+    <message>
+        <source>Unsupported argument -socks found. Setting SOCKS version isn't possible anymore, only SOCKS5 proxies are supported.</source>
+        <translation>Argumento inválido -socks encontrado. Definir a versão do SOCKS não é mais possível, somente proxys SOCK5 são suportados.</translation>
+    </message>
     <message>
         <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: %s)</source>
         <translation>Use um proxy SOCKS5 separado para alcançar participantes da rede via serviços ocultos Tor (padrão: %s)</translation>
     </message>
+    <message>
+        <source>Username and hashed password for JSON-RPC connections. The field &lt;userpw&gt; comes in the format: &lt;USERNAME&gt;:&lt;SALT&gt;$&lt;HASH&gt;. A canonical python script is included in share/rpcuser. This option can be specified multiple times</source>
+        <translation>Nome de usuário e senha hash para conexões JSON-RPC. O campo &lt;userpw&gt; vem com o formato: &lt;USERNAME&gt;:&lt;SALT&gt;$&lt;HASH&gt;. Um script python canônico é incluído em share/rpcuser. Essa opção pode ser especificada múltiplas vezes.</translation>
+    </message>
     <message>
         <source>(default: %s)</source>
         <translation>(padrão: %s)</translation>
@@ -3531,10 +3655,18 @@
         <source>Maximum per-connection receive buffer, &lt;n&gt;*1000 bytes (default: %u)</source>
         <translation>Buffer máximo de recebimento por conexão, &lt;n&gt;*1000 bytes (padrão: %u)</translation>
     </message>
+    <message>
+        <source>Maximum per-connection send buffer, &lt;n&gt;*1000 bytes (default: %u)</source>
+        <translation>Buffer máximo de envio por conexão, &lt;n&gt;*1000 bytes (padrão: %u)</translation>
+    </message>
     <message>
         <source>Prepend debug output with timestamp (default: %u)</source>
         <translation>Adiciona timestamp como prefixo no debug (padrão: %u)</translation>
     </message>
+    <message>
+        <source>Relay and mine data carrier transactions (default: %u)</source>
+        <translation>Transações de dados de operadora (padrão: %u)</translation>
+    </message>
     <message>
         <source>Relay non-P2SH multisig (default: %u)</source>
         <translation>Retransmitir P2SH não multisig (padrão: %u)</translation>
@@ -3567,6 +3699,10 @@
         <source>Spend unconfirmed change when sending transactions (default: %u)</source>
         <translation>Gastar troco não confirmado quando enviar transações (padrão: %u)</translation>
     </message>
+    <message>
+        <source>Threshold for disconnecting misbehaving peers (default: %u)</source>
+        <translation>Limite para desconectar peers mal comportados (padrão: %u)</translation>
+    </message>
     <message>
         <source>Unknown network specified in -onlynet: '%s'</source>
         <translation>Rede desconhecida especificada em -onlynet: '%s'</translation>
diff --git a/src/qt/locale/bitcoin_pt_PT.ts b/src/qt/locale/bitcoin_pt_PT.ts
index ffed44a61c20c..362769138a842 100644
--- a/src/qt/locale/bitcoin_pt_PT.ts
+++ b/src/qt/locale/bitcoin_pt_PT.ts
@@ -3,7 +3,7 @@
     <name>AddressBookPage</name>
     <message>
         <source>Right-click to edit address or label</source>
-        <translation>Clique á direita para editar endereço ou rótulo</translation>
+        <translation>Clique com o botão direito para editar o endereço ou rótulo</translation>
     </message>
     <message>
         <source>Create a new address</source>
@@ -31,11 +31,11 @@
     </message>
     <message>
         <source>Delete the currently selected address from the list</source>
-        <translation>Apagar o endereço selecionado da lista</translation>
+        <translation>Eliminar o endereço selecionado da lista</translation>
     </message>
     <message>
         <source>Export the data in the current tab to a file</source>
-        <translation>Exportar os dados no separador actual para um ficheiro</translation>
+        <translation>Exportar os dados no separador atual para um ficheiro</translation>
     </message>
     <message>
         <source>&amp;Export</source>
@@ -43,15 +43,15 @@
     </message>
     <message>
         <source>&amp;Delete</source>
-        <translation>&amp;Eliminar\</translation>
+        <translation>&amp;Eliminar</translation>
     </message>
     <message>
         <source>Choose the address to send coins to</source>
-        <translation>Escolha o endereço para o qual pretende enviar moedas</translation>
+        <translation>Escolha o endereço para enviar as moedas</translation>
     </message>
     <message>
         <source>Choose the address to receive coins with</source>
-        <translation>Escolha o endereço com o qual pretende receber moedas</translation>
+        <translation>Escolha o endereço para receber as moedas com</translation>
     </message>
     <message>
         <source>C&amp;hoose</source>
@@ -63,7 +63,7 @@
     </message>
     <message>
         <source>Receiving addresses</source>
-        <translation>Endereços de depósito</translation>
+        <translation>Endereços de a receber</translation>
     </message>
     <message>
         <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source>
@@ -71,7 +71,7 @@
     </message>
     <message>
         <source>These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source>
-        <translation>Estes são os seus endereços Bitcoin para receber pagamentos. É recomendado que utilize um endereço novo para cada transacção.</translation>
+        <translation>Estes são os seus endereços do Bitcoin para receber pagamentos. É recomendado que utilize um novo endereço para cada transação.</translation>
     </message>
     <message>
         <source>Copy &amp;Label</source>
@@ -91,7 +91,7 @@
     </message>
     <message>
         <source>Exporting Failed</source>
-        <translation>A Exportação Falhou</translation>
+        <translation>Exportação Falhou</translation>
     </message>
     <message>
         <source>There was an error trying to save the address list to %1. Please try again.</source>
@@ -102,7 +102,7 @@
     <name>AddressTableModel</name>
     <message>
         <source>Label</source>
-        <translation>Rótulo</translation>
+        <translation>Etiqueta</translation>
     </message>
     <message>
         <source>Address</source>
@@ -110,26 +110,26 @@
     </message>
     <message>
         <source>(no label)</source>
-        <translation>(sem rótulo)</translation>
+        <translation>(sem etiqueta)</translation>
     </message>
 </context>
 <context>
     <name>AskPassphraseDialog</name>
     <message>
         <source>Passphrase Dialog</source>
-        <translation>Diálogo de frase de segurança</translation>
+        <translation>Janela da frase de palavra-passe</translation>
     </message>
     <message>
         <source>Enter passphrase</source>
-        <translation>Insira a frase de segurança</translation>
+        <translation>Insira a frase de palavra-passe</translation>
     </message>
     <message>
         <source>New passphrase</source>
-        <translation>Nova frase de segurança</translation>
+        <translation>Nova frase de palavra-passe</translation>
     </message>
     <message>
         <source>Repeat new passphrase</source>
-        <translation>Repita a nova frase de segurança</translation>
+        <translation>Repita a nova frase de palavra-passe</translation>
     </message>
     <message>
         <source>Encrypt wallet</source>
@@ -137,7 +137,7 @@
     </message>
     <message>
         <source>This operation needs your wallet passphrase to unlock the wallet.</source>
-        <translation>A sua frase de segurança é necessária para desbloquear a carteira.</translation>
+        <translation>Esta operação precisa da sua frase de palavra-passe da carteira para desbloquear a mesma.</translation>
     </message>
     <message>
         <source>Unlock wallet</source>
@@ -145,7 +145,7 @@
     </message>
     <message>
         <source>This operation needs your wallet passphrase to decrypt the wallet.</source>
-        <translation>A sua frase de segurança é necessária para desencriptar a carteira.</translation>
+        <translation>Esta operação precisa da sua frase de palavra-passe da carteira para desencriptar a mesma.</translation>
     </message>
     <message>
         <source>Decrypt wallet</source>
@@ -153,7 +153,7 @@
     </message>
     <message>
         <source>Change passphrase</source>
-        <translation>Alterar frase de segurança</translation>
+        <translation>Alterar frase de palavra-passe</translation>
     </message>
     <message>
         <source>Confirm wallet encryption</source>
@@ -161,7 +161,7 @@
     </message>
     <message>
         <source>Warning: If you encrypt your wallet and lose your passphrase, you will &lt;b&gt;LOSE ALL OF YOUR BITCOINS&lt;/b&gt;!</source>
-        <translation>Atenção: Se encriptar a carteira e perder a sua senha irá &lt;b&gt;PERDER TODOS OS SEUS BITCOINS&lt;/b&gt;!</translation>
+        <translation>Aviso: se encriptar a sua carteira e perder a sua frase de de palavra-passe, irá &lt;b&gt;PERDER TODOS OS SEUS BITCOINS&lt;/b&gt;!</translation>
     </message>
     <message>
         <source>Are you sure you wish to encrypt your wallet?</source>
@@ -177,7 +177,7 @@
     </message>
     <message>
         <source>Warning: The Caps Lock key is on!</source>
-        <translation>Atenção: A tecla Caps Lock está activa!</translation>
+        <translation>Atenção: a tecla Caps Lock está ativada!</translation>
     </message>
     <message>
         <source>Wallet encrypted</source>
@@ -185,11 +185,11 @@
     </message>
     <message>
         <source>Enter the new passphrase to the wallet.&lt;br/&gt;Please use a passphrase of &lt;b&gt;ten or more random characters&lt;/b&gt;, or &lt;b&gt;eight or more words&lt;/b&gt;.</source>
-        <translation>Escreva a nova frase de seguraça da sua carteira. &lt;br/&gt; Por favor, use uma frase de &lt;b&gt;10 ou mais caracteres aleatórios,&lt;/b&gt; ou &lt;b&gt;oito ou mais palavras&lt;/b&gt;.</translation>
+        <translation>Insira a nova frase de palavra-passe da sua carteira. &lt;br/&gt; Por favor, utilize uma frase de palavra-passe com &lt;b&gt;mais de 10 ou mais carateres aleatórios,&lt;/b&gt; ou &lt;b&gt;oito ou mais palavras&lt;/b&gt;.</translation>
     </message>
     <message>
         <source>Enter the old passphrase and new passphrase to the wallet.</source>
-        <translation>Escreva a antiga frase de segurança da carteira, seguida da nova.</translation>
+        <translation>Insira a frase de palavra-passe antiga e a nova frase de palavra-passe para carteira.</translation>
     </message>
     <message>
         <source>Wallet encryption failed</source>
@@ -201,7 +201,7 @@
     </message>
     <message>
         <source>The supplied passphrases do not match.</source>
-        <translation>As frases de segurança fornecidas não coincidem.</translation>
+        <translation>As frases de palavra-passe inseridas não coincidem.</translation>
     </message>
     <message>
         <source>Wallet unlock failed</source>
@@ -209,7 +209,7 @@
     </message>
     <message>
         <source>The passphrase entered for the wallet decryption was incorrect.</source>
-        <translation>A frase de segurança introduzida para a desencriptação da carteira estava incorreta.</translation>
+        <translation>A frase de palavra-passe inserida para a desencriptação da carteira estava incorreta.</translation>
     </message>
     <message>
         <source>Wallet decryption failed</source>
@@ -217,12 +217,20 @@
     </message>
     <message>
         <source>Wallet passphrase was successfully changed.</source>
-        <translation>A frase de segurança da carteira foi alterada com êxito.</translation>
+        <translation>A frase de palavra-passe da carteira foi alterada com sucesso.</translation>
     </message>
 </context>
 <context>
     <name>BanTableModel</name>
-    </context>
+    <message>
+        <source>IP/Netmask</source>
+        <translation>IP/Máscara de Rede</translation>
+    </message>
+    <message>
+        <source>Banned Until</source>
+        <translation>Banido Até</translation>
+    </message>
+</context>
 <context>
     <name>BitcoinGUI</name>
     <message>
@@ -235,7 +243,7 @@
     </message>
     <message>
         <source>&amp;Overview</source>
-        <translation>Visã&amp;o geral</translation>
+        <translation>&amp;Sinopse</translation>
     </message>
     <message>
         <source>Node</source>
@@ -243,7 +251,7 @@
     </message>
     <message>
         <source>Show general overview of wallet</source>
-        <translation>Mostrar visão geral da carteira</translation>
+        <translation>Mostrar sinopse geral da carteira</translation>
     </message>
     <message>
         <source>&amp;Transactions</source>
@@ -251,7 +259,7 @@
     </message>
     <message>
         <source>Browse transaction history</source>
-        <translation>Navegar pelo histórico de transações</translation>
+        <translation>Explorar histórico das transações</translation>
     </message>
     <message>
         <source>E&amp;xit</source>
@@ -283,15 +291,15 @@
     </message>
     <message>
         <source>&amp;Change Passphrase...</source>
-        <translation>Mudar &amp;Palavra-passe...</translation>
+        <translation>Alterar &amp;Frase de Palavra-passe...</translation>
     </message>
     <message>
         <source>&amp;Sending addresses...</source>
-        <translation>A &amp;enviar endereços...</translation>
+        <translation>A &amp;enviar os endereços...</translation>
     </message>
     <message>
         <source>&amp;Receiving addresses...</source>
-        <translation>A &amp;receber endereços...</translation>
+        <translation>A &amp;receber os endereços...</translation>
     </message>
     <message>
         <source>Open &amp;URI...</source>
@@ -299,15 +307,15 @@
     </message>
     <message>
         <source>Bitcoin Core client</source>
-        <translation>Cliente Bitcoin Core</translation>
+        <translation>Cliente do Bitcoin Core</translation>
     </message>
     <message>
         <source>Importing blocks from disk...</source>
-        <translation>A importar blocos do disco...</translation>
+        <translation>A importar os blocos do disco...</translation>
     </message>
     <message>
         <source>Reindexing blocks on disk...</source>
-        <translation>A reindexar blocos no disco...</translation>
+        <translation>A reindexar os blocos no disco...</translation>
     </message>
     <message>
         <source>Send coins to a Bitcoin address</source>
@@ -315,11 +323,11 @@
     </message>
     <message>
         <source>Backup wallet to another location</source>
-        <translation>Faça uma cópia de segurança da carteira para outra localização</translation>
+        <translation>Efetue uma cópia de segurança da carteira para outra localização</translation>
     </message>
     <message>
         <source>Change the passphrase used for wallet encryption</source>
-        <translation>Mudar a frase de segurança utilizada na encriptação da carteira</translation>
+        <translation>Alterar a frase de palavra-passe utilizada na encriptação da carteira</translation>
     </message>
     <message>
         <source>&amp;Debug window</source>
@@ -351,7 +359,7 @@
     </message>
     <message>
         <source>Show information about Bitcoin Core</source>
-        <translation>Mostrar informação sobre Bitcoin Core</translation>
+        <translation>Mostrar informação sobre o Bitcoin Core</translation>
     </message>
     <message>
         <source>&amp;Show / Hide</source>
@@ -359,7 +367,7 @@
     </message>
     <message>
         <source>Show or hide the main Window</source>
-        <translation>Mostrar ou esconder a janela principal</translation>
+        <translation>Mostrar ou ocultar a janela principal</translation>
     </message>
     <message>
         <source>Encrypt the private keys that belong to your wallet</source>
@@ -387,7 +395,7 @@
     </message>
     <message>
         <source>Tabs toolbar</source>
-        <translation>Barra de separadores</translation>
+        <translation>Barra de ferramentas dos separadores</translation>
     </message>
     <message>
         <source>Bitcoin Core</source>
@@ -395,7 +403,7 @@
     </message>
     <message>
         <source>Request payments (generates QR codes and bitcoin: URIs)</source>
-        <translation>Solicitar pagamentos (gera códigos QR e URIs bitcoin:)</translation>
+        <translation>Solicitar pagamentos (gera códigos QR e bitcoin: URIs)</translation>
     </message>
     <message>
         <source>&amp;About Bitcoin Core</source>
@@ -403,7 +411,7 @@
     </message>
     <message>
         <source>Modify configuration options for Bitcoin Core</source>
-        <translation>Modificar opções de configuração de Bitcoin Core</translation>
+        <translation>Modificar as opções de configuração do Bitcoin Core</translation>
     </message>
     <message>
         <source>Show the list of used sending addresses and labels</source>
@@ -419,11 +427,11 @@
     </message>
     <message>
         <source>&amp;Command-line options</source>
-        <translation>&amp;Opções da linha de &amp;comandos</translation>
+        <translation>&amp;Opções da linha de &amp;comando</translation>
     </message>
     <message>
         <source>Show the Bitcoin Core help message to get a list with possible Bitcoin command-line options</source>
-        <translation>Mostrar a mensagem de ajuda do Bitcoin Core para obter uma lista com possíveis opções de linha de comandos</translation>
+        <translation>Mostrar a mensagem de ajuda do Bitcoin Core para obter uma lista com possíveis opções de linha de comando do Bitcoin</translation>
     </message>
     <message numerus="yes">
         <source>%n active connection(s) to Bitcoin network</source>
@@ -463,11 +471,11 @@
     </message>
     <message>
         <source>Last received block was generated %1 ago.</source>
-        <translation>O último bloco recebido foi gerado %1 atrás.</translation>
+        <translation>O último bloco recebido foi gerado há %1.</translation>
     </message>
     <message>
         <source>Transactions after this will not yet be visible.</source>
-        <translation>Transações posteriores não serão visíveis por enquanto.</translation>
+        <translation>As transações depois de isto ainda não serão visíveis.</translation>
     </message>
     <message>
         <source>Error</source>
@@ -498,7 +506,7 @@
     <message>
         <source>Amount: %1
 </source>
-        <translation>Quantia: %1
+        <translation>Valor: %1
 </translation>
     </message>
     <message>
@@ -510,7 +518,7 @@
     <message>
         <source>Label: %1
 </source>
-        <translation>Rótulo: %1
+        <translation>Etiqueta: %1
 </translation>
     </message>
     <message>
@@ -547,7 +555,7 @@
     <name>CoinControlDialog</name>
     <message>
         <source>Coin Selection</source>
-        <translation>Seleção de moeda</translation>
+        <translation>Seleção de Moeda</translation>
     </message>
     <message>
         <source>Quantity:</source>
@@ -559,7 +567,7 @@
     </message>
     <message>
         <source>Amount:</source>
-        <translation>Quantia:</translation>
+        <translation>Valor:</translation>
     </message>
     <message>
         <source>Priority:</source>
@@ -575,7 +583,7 @@
     </message>
     <message>
         <source>After Fee:</source>
-        <translation>Depois da Taxa:</translation>
+        <translation>Depois da taxa:</translation>
     </message>
     <message>
         <source>Change:</source>
@@ -583,23 +591,23 @@
     </message>
     <message>
         <source>(un)select all</source>
-        <translation>(des)seleccionar todos</translation>
+        <translation>(des)selecionar todos</translation>
     </message>
     <message>
         <source>Tree mode</source>
-        <translation>Modo árvore</translation>
+        <translation>Modo de árvore</translation>
     </message>
     <message>
         <source>List mode</source>
-        <translation>Modo lista</translation>
+        <translation>Modo de lista</translation>
     </message>
     <message>
         <source>Amount</source>
-        <translation>Quantia</translation>
+        <translation>Valor</translation>
     </message>
     <message>
         <source>Received with label</source>
-        <translation>Recebido com rótulo</translation>
+        <translation>Recebido com etiqueta</translation>
     </message>
     <message>
         <source>Received with address</source>
@@ -611,7 +619,7 @@
     </message>
     <message>
         <source>Confirmations</source>
-        <translation>Confirmados</translation>
+        <translation>Confirmações</translation>
     </message>
     <message>
         <source>Confirmed</source>
@@ -627,23 +635,23 @@
     </message>
     <message>
         <source>Copy label</source>
-        <translation>Copiar rótulo</translation>
+        <translation>Copiar etiqueta</translation>
     </message>
     <message>
         <source>Copy amount</source>
-        <translation>Copiar quantia</translation>
+        <translation>Copiar valor</translation>
     </message>
     <message>
         <source>Copy transaction ID</source>
-        <translation>Copiar ID da transação</translation>
+        <translation>Copiar id. da transação</translation>
     </message>
     <message>
         <source>Lock unspent</source>
-        <translation>Bloquear não gastos</translation>
+        <translation>Bloquear não gastas</translation>
     </message>
     <message>
         <source>Unlock unspent</source>
-        <translation>Desbloquear não gastos</translation>
+        <translation>Desbloquear não gastas</translation>
     </message>
     <message>
         <source>Copy quantity</source>
@@ -655,7 +663,7 @@
     </message>
     <message>
         <source>Copy after fee</source>
-        <translation>Copiar valor após taxa</translation>
+        <translation>Copiar depois da taxa</translation>
     </message>
     <message>
         <source>Copy bytes</source>
@@ -687,7 +695,7 @@
     </message>
     <message>
         <source>medium-high</source>
-        <translation>média-alta</translation>
+        <translation>média alta</translation>
     </message>
     <message>
         <source>medium</source>
@@ -695,7 +703,7 @@
     </message>
     <message>
         <source>low-medium</source>
-        <translation>média-baixa</translation>
+        <translation>média baixa</translation>
     </message>
     <message>
         <source>low</source>
@@ -707,7 +715,7 @@
     </message>
     <message>
         <source>lowest</source>
-        <translation>muito alta</translation>
+        <translation>muito baixa</translation>
     </message>
     <message>
         <source>(%1 locked)</source>
@@ -719,15 +727,15 @@
     </message>
     <message>
         <source>This label turns red if the transaction size is greater than 1000 bytes.</source>
-        <translation>Este rótulo fica vermelho se o tamanho da transacção exceder os 1000 bytes.</translation>
+        <translation>Esta etiqueta fica vermelha se o tamanho da transação exceder os 1000 bytes.</translation>
     </message>
     <message>
         <source>This label turns red if the priority is smaller than "medium".</source>
-        <translation>Esta legenda fica vermelha se a prioridade for menor que "média".</translation>
+        <translation>Esta etiqueta fica vermelha se a prioridade for menor que "média".</translation>
     </message>
     <message>
         <source>This label turns red if any recipient receives an amount smaller than %1.</source>
-        <translation>Este rótulo fica vermelho se algum recipiente receber uma quantia menor que %1.</translation>
+        <translation>Esta etiqueta fica vermelha se qualquer recipiente receber uma quantia menor que %1.</translation>
     </message>
     <message>
         <source>Can vary +/- %1 satoshi(s) per input.</source>
@@ -755,7 +763,7 @@
     </message>
     <message>
         <source>(no label)</source>
-        <translation>(sem rótulo)</translation>
+        <translation>(sem etiqueta)</translation>
     </message>
     <message>
         <source>change from %1 (%2)</source>
@@ -774,15 +782,15 @@
     </message>
     <message>
         <source>&amp;Label</source>
-        <translation>&amp;Rótulo</translation>
+        <translation>&amp;Etiqueta</translation>
     </message>
     <message>
         <source>The label associated with this address list entry</source>
-        <translation>O rótulo associado com esta entrada no livro de endereços</translation>
+        <translation>A etiqueta associada com esta entrada da lista de endereços</translation>
     </message>
     <message>
         <source>The address associated with this address list entry. This can only be modified for sending addresses.</source>
-        <translation>O endereço associado com o esta entrada no livro de endereços. Isto só pode ser modificado para endereços de saída.</translation>
+        <translation>O endereço associado com o esta entrada da lista de endereços. Isto só pode ser modificado para os endereços de envio.</translation>
     </message>
     <message>
         <source>&amp;Address</source>
@@ -825,7 +833,7 @@
     <name>FreespaceChecker</name>
     <message>
         <source>A new data directory will be created.</source>
-        <translation>Uma nova pasta de dados será criada.</translation>
+        <translation>Irá ser criada uma nova diretoria de dados.</translation>
     </message>
     <message>
         <source>name</source>
@@ -841,7 +849,7 @@
     </message>
     <message>
         <source>Cannot create data directory here.</source>
-        <translation>Não pode ser criada uma pasta de dados aqui.</translation>
+        <translation>Não é possível criar aqui uma diretoria de dados.</translation>
     </message>
 </context>
 <context>
@@ -864,7 +872,7 @@
     </message>
     <message>
         <source>Command-line options</source>
-        <translation>Opções de linha de comandos</translation>
+        <translation>Opções da linha de comando</translation>
     </message>
     <message>
         <source>Usage:</source>
@@ -872,9 +880,37 @@
     </message>
     <message>
         <source>command-line options</source>
-        <translation>opções da linha de comandos</translation>
+        <translation>opções da linha de comando</translation>
     </message>
-    </context>
+    <message>
+        <source>UI Options:</source>
+        <translation>Opções da IU:</translation>
+    </message>
+    <message>
+        <source>Choose data directory on startup (default: %u)</source>
+        <translation>Escolha a diretoria dos dados no arranque (predefinição: %u)</translation>
+    </message>
+    <message>
+        <source>Set language, for example "de_DE" (default: system locale)</source>
+        <translation>Definir linguagem, por exemplo "pt_PT" (por defeito: linguagem do sistema)</translation>
+    </message>
+    <message>
+        <source>Start minimized</source>
+        <translation>Iniciar minimizado</translation>
+    </message>
+    <message>
+        <source>Set SSL root certificates for payment request (default: -system-)</source>
+        <translation>Configurar certificados SSL root para pedido de pagamento (default: -system-)</translation>
+    </message>
+    <message>
+        <source>Show splash screen on startup (default: %u)</source>
+        <translation>Mostrar o ecrã de abertura no arranque (predefinição: %u)</translation>
+    </message>
+    <message>
+        <source>Reset all settings changes made over the GUI</source>
+        <translation>Reiniciar as alterações das configurações efetuadas na GUI</translation>
+    </message>
+</context>
 <context>
     <name>Intro</name>
     <message>
@@ -887,19 +923,19 @@
     </message>
     <message>
         <source>As this is the first time the program is launched, you can choose where Bitcoin Core will store its data.</source>
-        <translation>Sendo esta a primeira vez que o programa é iniciado, poderá escolher onde o Bitcoin Core irá guardar os seus dados.</translation>
+        <translation>Como esta é a primeira vez que o programa é iniciado, pode escolher onde guardar os seus dados do Bitcoin Core.</translation>
     </message>
     <message>
         <source>Bitcoin Core will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source>
-        <translation>O Bitcoin Core vai transferir e armazenar uma cópia do "block chain" (cadeia de blocos). Pelo menos %1GB de dados serão armazenados nesta pasta, e vão crescer ao longo do tempo. A sua carteira também irá ser armazenada nesta pasta.</translation>
+        <translation>O Bitcoin Core irá transferir e guardar uma cópia da cadeia de bloco do Bitcoin. Pelo menos %1GB de dados serão guardados nesta diretoria, e estes irão crescer ao longo do tempo. A sua carteira também será guardada nesta diretoria.</translation>
     </message>
     <message>
         <source>Use the default data directory</source>
-        <translation>Utilizar a pasta de dados padrão</translation>
+        <translation>Utilizar a diretoria de dados predefinida</translation>
     </message>
     <message>
         <source>Use a custom data directory:</source>
-        <translation>Utilizar uma pasta de dados personalizada:</translation>
+        <translation>Utilizar uma diretoria de dados personalizada:</translation>
     </message>
     <message>
         <source>Bitcoin Core</source>
@@ -907,7 +943,7 @@
     </message>
     <message>
         <source>Error: Specified data directory "%1" cannot be created.</source>
-        <translation>Erro: Pasta de dados especificada como "%1, não pode ser criada.</translation>
+        <translation>Erro: não pode ser criada a diretoria de dados especificada como "%1.</translation>
     </message>
     <message>
         <source>Error</source>
@@ -915,7 +951,7 @@
     </message>
     <message numerus="yes">
         <source>%n GB of free space available</source>
-        <translation><numerusform>%n GB de espaço livre disponível </numerusform><numerusform>%n GB de espaço livre disponível </numerusform></translation>
+        <translation><numerusform>%n GB de espaço livre disponível</numerusform><numerusform>%n GB de espaço livre disponível</numerusform></translation>
     </message>
     <message numerus="yes">
         <source>(of %n GB needed)</source>
@@ -969,11 +1005,11 @@
     </message>
     <message>
         <source>Accept connections from outside</source>
-        <translation>Aceitar conceções externas</translation>
+        <translation>Aceitar ligações externas</translation>
     </message>
     <message>
         <source>Allow incoming connections</source>
-        <translation>Permitir conexão</translation>
+        <translation>Permitir ligação a receber</translation>
     </message>
     <message>
         <source>IP address of the proxy (e.g. IPv4: 127.0.0.1 / IPv6: ::1)</source>
@@ -985,7 +1021,7 @@
     </message>
     <message>
         <source>The user interface language can be set here. This setting will take effect after restarting Bitcoin Core.</source>
-        <translation>A linguagem da interface do utilizador pode ser definida aqui. Esta definição entrará em efeito após reiniciar o Bitcoin Core.</translation>
+        <translation>O idioma da da interface do utilizador pode ser definida aqui. Esta definição será aplicada depois de reiniciar o Bitcoin Core.</translation>
     </message>
     <message>
         <source>Third party URLs (e.g. a block explorer) that appear in the transactions tab as context menu items. %s in the URL is replaced by transaction hash. Multiple URLs are separated by vertical bar |.</source>
@@ -994,15 +1030,15 @@
     </message>
     <message>
         <source>Third party transaction URLs</source>
-        <translation>URLs de transação de outrem</translation>
+        <translation>URLs de transação de terceiros</translation>
     </message>
     <message>
         <source>Active command-line options that override above options:</source>
-        <translation>Opções de linha de comandos ativas que se sobrepõem ás opções anteriores:</translation>
+        <translation>Ativar as opções da linha de comando que se sobrepõem às opções acima:</translation>
     </message>
     <message>
         <source>Reset all client options to default.</source>
-        <translation>Repor todas as opções do cliente.</translation>
+        <translation>Repor todas as opções de cliente para a predefinição.</translation>
     </message>
     <message>
         <source>&amp;Reset Options</source>
@@ -1014,15 +1050,15 @@
     </message>
     <message>
         <source>Automatically start Bitcoin Core after logging in to the system.</source>
-        <translation>Começar o Bitcoin Core automaticamente ao iniciar sessão no sistema.</translation>
+        <translation>Iniciar automaticamente o Bitcoin Core depois de iniciar a sessão no sistema.</translation>
     </message>
     <message>
         <source>&amp;Start Bitcoin Core on system login</source>
-        <translation>&amp;Começar o Bitcoin Core ao iniciar o sistema</translation>
+        <translation>&amp;Iniciar o Bitcoin Core ao iniciar a sessão no sistema</translation>
     </message>
     <message>
         <source>(0 = auto, &lt;0 = leave that many cores free)</source>
-        <translation>(0 = auto, &lt;0 = Deixar essa quantidade de núcleos livre)</translation>
+        <translation>(0 = automático, &lt;0 = deixar essa quantidade de núcleos livre)</translation>
     </message>
     <message>
         <source>W&amp;allet</source>
@@ -1030,11 +1066,11 @@
     </message>
     <message>
         <source>Expert</source>
-        <translation>Especialista</translation>
+        <translation> Especialistas </translation>
     </message>
     <message>
         <source>Enable coin &amp;control features</source>
-        <translation>Ativar funcionalidades de controlo de transação.</translation>
+        <translation>Ativar as funcionalidades de controlo de moedas</translation>
     </message>
     <message>
         <source>If you disable the spending of unconfirmed change, the change from a transaction cannot be used until that transaction has at least one confirmation. This also affects how your balance is computed.</source>
@@ -1050,7 +1086,7 @@
     </message>
     <message>
         <source>Map port using &amp;UPnP</source>
-        <translation>Mapear porta usando &amp;UPnP</translation>
+        <translation>Mapear porta, utilizando &amp;UPnP</translation>
     </message>
     <message>
         <source>Connect to the Bitcoin network through a SOCKS5 proxy.</source>
@@ -1072,6 +1108,34 @@
         <source>Port of the proxy (e.g. 9050)</source>
         <translation>Porto do proxy (p.ex. 9050)</translation>
     </message>
+    <message>
+        <source>Used for reaching peers via:</source>
+        <translation>Usado para alcançar nós via:</translation>
+    </message>
+    <message>
+        <source>Shows, if the supplied default SOCKS5 proxy is used to reach peers via this network type.</source>
+        <translation>Mostra, caso o proxy SOCKS5 predefinido submetido seja usado para alcançar nós através deste tipo de rede.</translation>
+    </message>
+    <message>
+        <source>IPv4</source>
+        <translation>IPv4</translation>
+    </message>
+    <message>
+        <source>IPv6</source>
+        <translation>IPv6</translation>
+    </message>
+    <message>
+        <source>Tor</source>
+        <translation>Tor</translation>
+    </message>
+    <message>
+        <source>Connect to the Bitcoin network through a separate SOCKS5 proxy for Tor hidden services.</source>
+        <translation>Ligar à rede Bitcoin através de um proxy SOCKS5 separado para utilizar os serviços ocultos do Tor.</translation>
+    </message>
+    <message>
+        <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services:</source>
+        <translation>Utilizar um proxy SOCKS5 separado para alcançar nós via serviços ocultos do Tor:</translation>
+    </message>
     <message>
         <source>&amp;Window</source>
         <translation>&amp;Janela</translation>
@@ -1102,11 +1166,11 @@
     </message>
     <message>
         <source>Choose the default subdivision unit to show in the interface and when sending coins.</source>
-        <translation>Escolha a subdivisão unitária a ser mostrada por defeito na aplicação e ao enviar moedas.</translation>
+        <translation>Escolha a unidade da subdivisão predefinida para ser mostrada na interface e quando enviar as moedas.</translation>
     </message>
     <message>
         <source>Whether to show coin control features or not.</source>
-        <translation>Escolha para mostrar funcionalidades de Coin Control ou não.</translation>
+        <translation>Escolha se deve mostrar as funcionalidades de controlo de moedas ou não.</translation>
     </message>
     <message>
         <source>&amp;OK</source>
@@ -1118,7 +1182,7 @@
     </message>
     <message>
         <source>default</source>
-        <translation>padrão</translation>
+        <translation>predefinição</translation>
     </message>
     <message>
         <source>none</source>
@@ -1126,7 +1190,7 @@
     </message>
     <message>
         <source>Confirm options reset</source>
-        <translation>Confirme a reposição de opções</translation>
+        <translation>Confirme a reposição das opções</translation>
     </message>
     <message>
         <source>Client restart required to activate changes.</source>
@@ -1252,7 +1316,7 @@
     </message>
     <message>
         <source>Cannot start bitcoin: click-to-pay handler</source>
-        <translation>Impossível iniciar o controlador de bitcoin: click-to-pay</translation>
+        <translation>Não é possível iniciar o Bitcoin: utilizador clique-para-pagar</translation>
     </message>
     <message>
         <source>Payment request fetch URL is invalid: %1</source>
@@ -1410,17 +1474,13 @@
         <source>General</source>
         <translation>Geral</translation>
     </message>
-    <message>
-        <source>Using OpenSSL version</source>
-        <translation>Usando versão OpenSSL</translation>
-    </message>
     <message>
         <source>Using BerkeleyDB version</source>
         <translation>Versão BerkeleyDB em uso</translation>
     </message>
     <message>
         <source>Startup time</source>
-        <translation>Hora de inicialização</translation>
+        <translation>Hora de Arranque</translation>
     </message>
     <message>
         <source>Network</source>
@@ -1442,6 +1502,22 @@
         <source>Current number of blocks</source>
         <translation>Número actual de blocos</translation>
     </message>
+    <message>
+        <source>Memory Pool</source>
+        <translation>Banco de Memória</translation>
+    </message>
+    <message>
+        <source>Current number of transactions</source>
+        <translation>Número actual de transacções</translation>
+    </message>
+    <message>
+        <source>Memory usage</source>
+        <translation>Utilização de memória</translation>
+    </message>
+    <message>
+        <source>Open the Bitcoin Core debug log file from the current data directory. This can take a few seconds for large log files.</source>
+        <translation>Abrir o ficheiro de registo de depuração da pasta de dados actual. Isto pode demorar alguns segundos para ficheiros de registo grandes.</translation>
+    </message>
     <message>
         <source>Received</source>
         <translation>Recebido</translation>
@@ -1452,12 +1528,20 @@
     </message>
     <message>
         <source>&amp;Peers</source>
-        <translation>&amp;Conexção</translation>
+        <translation>&amp;Conexão</translation>
+    </message>
+    <message>
+        <source>Banned peers</source>
+        <translation>Nós banidos</translation>
     </message>
     <message>
         <source>Select a peer to view detailed information.</source>
         <translation>Selecione uma conexação para ver informação em detalhe.</translation>
     </message>
+    <message>
+        <source>Whitelisted</source>
+        <translation>Permitido por si</translation>
+    </message>
     <message>
         <source>Direction</source>
         <translation>Direcção</translation>
@@ -1466,6 +1550,18 @@
         <source>Version</source>
         <translation>Versão</translation>
     </message>
+    <message>
+        <source>Starting Block</source>
+        <translation>Bloco Inicial</translation>
+    </message>
+    <message>
+        <source>Synced Headers</source>
+        <translation>Cabeçalhos Sincronizados</translation>
+    </message>
+    <message>
+        <source>Synced Blocks</source>
+        <translation>Blocos Sincronizados</translation>
+    </message>
     <message>
         <source>User Agent</source>
         <translation>Agente Usuário</translation>
@@ -1480,7 +1576,7 @@
     </message>
     <message>
         <source>Connection Time</source>
-        <translation>Tempo de Conexção</translation>
+        <translation>Tempo de Ligação</translation>
     </message>
     <message>
         <source>Last Send</source>
@@ -1494,6 +1590,18 @@
         <source>Ping Time</source>
         <translation>Tempo de Latência</translation>
     </message>
+    <message>
+        <source>The duration of a currently outstanding ping.</source>
+        <translation>A duração de um ping atualmente pendente.</translation>
+    </message>
+    <message>
+        <source>Ping Wait</source>
+        <translation>Espera do Ping</translation>
+    </message>
+    <message>
+        <source>Time Offset</source>
+        <translation>Fuso Horário</translation>
+    </message>
     <message>
         <source>Last block time</source>
         <translation>Data do último bloco</translation>
@@ -1538,6 +1646,34 @@
         <source>Clear console</source>
         <translation>Limpar consola</translation>
     </message>
+    <message>
+        <source>&amp;Disconnect Node</source>
+        <translation>&amp;Desligar Nó</translation>
+    </message>
+    <message>
+        <source>Ban Node for</source>
+        <translation>Banir Nó por</translation>
+    </message>
+    <message>
+        <source>1 &amp;hour</source>
+        <translation>1 &amp;hora</translation>
+    </message>
+    <message>
+        <source>1 &amp;day</source>
+        <translation>1 &amp;dia</translation>
+    </message>
+    <message>
+        <source>1 &amp;week</source>
+        <translation>1 &amp;semana</translation>
+    </message>
+    <message>
+        <source>1 &amp;year</source>
+        <translation>1 &amp;ano</translation>
+    </message>
+    <message>
+        <source>&amp;Unban Node</source>
+        <translation>&amp;Desbloquear Nó</translation>
+    </message>
     <message>
         <source>Welcome to the Bitcoin Core RPC console.</source>
         <translation>Bem-vindo à consola RPC do Bitcoin Core.</translation>
@@ -1566,6 +1702,10 @@
         <source>%1 GB</source>
         <translation>%1 GB</translation>
     </message>
+    <message>
+        <source>(node id: %1)</source>
+        <translation>(id nó: %1)</translation>
+    </message>
     <message>
         <source>via %1</source>
         <translation>via %1</translation>
@@ -1582,6 +1722,14 @@
         <source>Outbound</source>
         <translation>Saída</translation>
     </message>
+    <message>
+        <source>Yes</source>
+        <translation>Sim</translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation>Não</translation>
+    </message>
     <message>
         <source>Unknown</source>
         <translation>Desconhecido</translation>
@@ -1764,7 +1912,7 @@
     </message>
     <message>
         <source>Coin Control Features</source>
-        <translation>Funcionalidades de Coin Control:</translation>
+        <translation>Funcionalidades do Controlo de Moedas:</translation>
     </message>
     <message>
         <source>Inputs...</source>
@@ -1820,7 +1968,7 @@
     </message>
     <message>
         <source>Choose...</source>
-        <translation>Escolha...</translation>
+        <translation>Escolher...</translation>
     </message>
     <message>
         <source>collapse fee-settings</source>
@@ -1950,6 +2098,10 @@
         <source>Copy change</source>
         <translation>Copiar alteração</translation>
     </message>
+    <message>
+        <source>Total Amount %1</source>
+        <translation>Quantia Total %1</translation>
+    </message>
     <message>
         <source>or</source>
         <translation>ou</translation>
@@ -1974,10 +2126,26 @@
         <source>The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source>
         <translation>A transação foi rejeitada! Isto poderá acontecer se algumas das moedas na sua carteira já tiverem sido gastas, se por exemplo tiver usado uma cópia do ficheiro wallet.dat e as moedas tiverem sido gastas na cópia mas não tiverem sido marcadas como gastas aqui.</translation>
     </message>
+    <message>
+        <source>A fee higher than %1 is considered an absurdly high fee.</source>
+        <translation>Uma taxa superior a %1 é considerada muito alta.</translation>
+    </message>
     <message>
         <source>Payment request expired.</source>
         <translation>Pedido de pagamento expirou.</translation>
     </message>
+    <message>
+        <source>Pay only the required fee of %1</source>
+        <translation>Pagar somente a taxa mínima de %1</translation>
+    </message>
+    <message>
+        <source>The recipient address is not valid. Please recheck.</source>
+        <translation>O endereço de destino não é válido. Por favor, verifique novamente.</translation>
+    </message>
+    <message>
+        <source>Duplicate address found: addresses should only be used once each.</source>
+        <translation>Endereço duplicado encontrado: cada endereço só poderá ser usado uma vez.</translation>
+    </message>
     <message>
         <source>Warning: Invalid Bitcoin address</source>
         <translation>Aviso: Endereço Bitcoin inválido</translation>
@@ -2023,7 +2191,7 @@
     </message>
     <message>
         <source>Choose previously used address</source>
-        <translation>Escolher endereço usado previamente</translation>
+        <translation>Escolha o endereço utilizado anteriormente</translation>
     </message>
     <message>
         <source>This is a normal payment.</source>
@@ -2049,10 +2217,26 @@
         <source>Remove this entry</source>
         <translation>Remover esta entrada</translation>
     </message>
+    <message>
+        <source>The fee will be deducted from the amount being sent. The recipient will receive less bitcoins than you enter in the amount field. If multiple recipients are selected, the fee is split equally.</source>
+        <translation>A taxa será deduzida ao montante enviado. O destinatário irá receber menos bitcoins do que as que introduziu no campo montante. Caso sejam seleccionados múltiplos destinatários, a taxa será repartida equitativamente.</translation>
+    </message>
+    <message>
+        <source>S&amp;ubtract fee from amount</source>
+        <translation>S&amp;ubtrair taxa ao montante</translation>
+    </message>
     <message>
         <source>Message:</source>
         <translation>Mensagem:</translation>
     </message>
+    <message>
+        <source>This is an unauthenticated payment request.</source>
+        <translation>Pedido de pagamento não autenticado.</translation>
+    </message>
+    <message>
+        <source>This is an authenticated payment request.</source>
+        <translation>Pedido de pagamento autenticado.</translation>
+    </message>
     <message>
         <source>Enter a label for this address to add it to the list of used addresses</source>
         <translation>Introduza um rótulo para este endereço para o adicionar à sua lista de endereços usados</translation>
@@ -2091,13 +2275,17 @@
         <source>&amp;Sign Message</source>
         <translation>&amp;Assinar Mensagem</translation>
     </message>
+    <message>
+        <source>You can sign messages/agreements with your addresses to prove you can receive bitcoins sent to them. Be careful not to sign anything vague or random, as phishing attacks may try to trick you into signing your identity over to them. Only sign fully-detailed statements you agree to.</source>
+        <translation>Pode assinar mensagens com os seus endereços para provar que são seus. Tenha atenção ao assinar mensagens ambíguas, pois ataques de phishing podem tentar enganá-lo de modo a assinar a sua identidade para os atacantes. Apenas assine declarações detalhadas com as quais concorde.</translation>
+    </message>
     <message>
         <source>The Bitcoin address to sign the message with</source>
         <translation>O endereço Bitcoin para designar a mensagem</translation>
     </message>
     <message>
         <source>Choose previously used address</source>
-        <translation>Escolher endereço usado previamente</translation>
+        <translation>Escolha o endereço utilizado anteriormente</translation>
     </message>
     <message>
         <source>Alt+A</source>
@@ -2143,6 +2331,10 @@
         <source>&amp;Verify Message</source>
         <translation>&amp;Verificar Mensagem</translation>
     </message>
+    <message>
+        <source>Enter the receiver's address, message (ensure you copy line breaks, spaces, tabs, etc. exactly) and signature below to verify the message. Be careful not to read more into the signature than what is in the signed message itself, to avoid being tricked by a man-in-the-middle attack. Note that this only proves the signing party receives with the address, it cannot prove sendership of any transaction!</source>
+        <translation>Introduza o endereço de assinatura, mensagem (assegure-se que copia quebras de linha, espaços, tabulações, etc. exactamente) e assinatura abaixo para verificar a mensagem. Tenha atenção para não ler mais na assinatura do que o que estiver na mensagem assinada, para evitar ser enganado por um atacante que se encontre entre si e quem assinou a mensagem.</translation>
+    </message>
     <message>
         <source>The Bitcoin address the message was signed with</source>
         <translation>O endereço Bitcoin com que a mensagem foi designada</translation>
@@ -2494,6 +2686,10 @@
         <source>Whether or not a watch-only address is involved in this transaction.</source>
         <translation>Desde que um endereço de modo-verificação faça parte ou não desta transação</translation>
     </message>
+    <message>
+        <source>User-defined intent/purpose of the transaction.</source>
+        <translation>Motivo da transacção definido pelo utilizador.</translation>
+    </message>
     <message>
         <source>Amount removed from or added to balance.</source>
         <translation>Quantia retirada ou adicionada ao saldo.</translation>
@@ -2573,6 +2769,10 @@
         <source>Copy transaction ID</source>
         <translation>Copiar ID da Transação</translation>
     </message>
+    <message>
+        <source>Copy raw transaction</source>
+        <translation>Copiar dados brutos da transacção</translation>
+    </message>
     <message>
         <source>Edit label</source>
         <translation>Editar rótulo</translation>
@@ -2653,7 +2853,7 @@
     <name>WalletFrame</name>
     <message>
         <source>No wallet has been loaded.</source>
-        <translation>Nenhuma carteira foi carregada.</translation>
+        <translation>Não foi carregada nenhuma carteira.</translation>
     </message>
 </context>
 <context>
@@ -2720,14 +2920,70 @@
         <source>Accept command line and JSON-RPC commands</source>
         <translation>Aceitar comandos de linha de comandos e JSON-RPC</translation>
     </message>
+    <message>
+        <source>If &lt;category&gt; is not supplied or if &lt;category&gt; = 1, output all debugging information.</source>
+        <translation>Se &lt;category&gt; não é fornecida ou &lt;category&gt; = 1, imprimir toda a informação de depuração.</translation>
+    </message>
+    <message>
+        <source>Maximum total fees (in %s) to use in a single wallet transaction; setting this too low may abort large transactions (default: %s)</source>
+        <translation>Total máximo de taxas (em %s) a utilizar numa única transacção; definir este valor demasiado baixo pode abortar transacções grandes (padrão: %s)</translation>
+    </message>
+    <message>
+        <source>Please check that your computer's date and time are correct! If your clock is wrong Bitcoin Core will not work properly.</source>
+        <translation>Por favor verifique que a data e hora do seu computador estão correctas! Se o seu relógio não estiver certo o Bitcoin Core não irá funcionar correctamente.</translation>
+    </message>
+    <message>
+        <source>Prune configured below the minimum of %d MiB.  Please use a higher number.</source>
+        <translation>Poda configurada abaixo do mínimo de %d MiB.  Por favor, utilize um valor mais elevado.</translation>
+    </message>
+    <message>
+        <source>Prune: last wallet synchronisation goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of pruned node)</source>
+        <translation>Suprimir: a última sincronização da carteira vai além dos dados suprimidos. O que precisa para -reindex (transferir novamente toda a cadeia de blocos, no caso de nó suprimido)</translation>
+    </message>
+    <message>
+        <source>Reduce storage requirements by pruning (deleting) old blocks. This mode is incompatible with -txindex and -rescan. Warning: Reverting this setting requires re-downloading the entire blockchain. (default: 0 = disable pruning blocks, &gt;%u = target size in MiB to use for block files)</source>
+        <translation>Reduza os requisitos de armazenamento podando (eliminando) blocos antigos. Este modo é incompatível com -txindex e -rescan. Aviso: Reverter esta opção requer um novo descarregamento da cadeia de blocos completa. (padrão: 0 = desactivar poda de blocos, &gt;%u = tamanho desejado em MiB para utilizar em ficheiros de blocos)</translation>
+    </message>
+    <message>
+        <source>Rescans are not possible in pruned mode. You will need to use -reindex which will download the whole blockchain again.</source>
+        <translation>Reanálises não são possíveis no modo de suprimir. Para isso terá de utilizar -reindex que irá transferir novamente toda a cadeia de blocos.</translation>
+    </message>
+    <message>
+        <source>Error: A fatal internal error occurred, see debug.log for details</source>
+        <translation>Erro: Um erro fatal interno ocorreu, verificar debug.log para mais informação</translation>
+    </message>
+    <message>
+        <source>Fee (in %s/kB) to add to transactions you send (default: %s)</source>
+        <translation>Taxa (em %s/kB) a adicionar às transacções que envia (padrão: %s)</translation>
+    </message>
+    <message>
+        <source>Pruning blockstore...</source>
+        <translation>A podar a blockstore...</translation>
+    </message>
     <message>
         <source>Run in the background as a daemon and accept commands</source>
         <translation>Correr o processo em segundo plano e aceitar comandos</translation>
     </message>
+    <message>
+        <source>Unable to start HTTP server. See debug log for details.</source>
+        <translation>Não é possível iniciar o servidor HTTP. Verifique o debug.log para detalhes.</translation>
+    </message>
     <message>
         <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
         <translation>Aceitar ligações externas (padrão: 1 sem -proxy ou -connect)</translation>
     </message>
+    <message>
+        <source>-fallbackfee is set very high! This is the transaction fee you may pay when fee estimates are not available.</source>
+        <translation>-fallbackfee está definida muito elevada! Esta é a taxa de transação pode poderá pagar quando as estimativas de taxas não estão disponíveis.</translation>
+    </message>
+    <message>
+        <source>A fee rate (in %s/kB) that will be used when fee estimation has insufficient data (default: %s)</source>
+        <translation>Uma percentagem da taxa (em %s/kB) que será utilizada quando a estimativa da taxa tiver dados insuficientes (predefinição: %s)</translation>
+    </message>
+    <message>
+        <source>Accept relayed transactions received from whitelisted peers even when not relaying transactions (default: %d)</source>
+        <translation>Aceitar as transações retransmitidas recebidas dos pares na lista branca, mesmo quando não retransmitir as transações (predefinição: %d)</translation>
+    </message>
     <message>
         <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source>
         <translation>Associar a endereço específico e escutar sempre nele. Use a notação [anfitrião]:porta para IPv6</translation>
@@ -2744,10 +3000,18 @@
         <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source>
         <translation>Executar comando quando uma das transações na carteira mudar (no comando, %s é substituído pelo ID da Transação)</translation>
     </message>
+    <message>
+        <source>Force relay of transactions from whitelisted peers even they violate local relay policy (default: %d)</source>
+        <translation>Forçar retransmissão das transações a partir dos pares da lista branca, mesmo que estes violem a política de retransmissão local (predefinição: %d)</translation>
+    </message>
     <message>
         <source>Set the number of script verification threads (%u to %d, 0 = auto, &lt;0 = leave that many cores free, default: %d)</source>
         <translation>Defina o número de processos de verificação (%u até %d, 0 = automático, &lt;0 = ldisponibiliza esse número de núcleos livres, por defeito: %d)</translation>
     </message>
+    <message>
+        <source>The block database contains a block which appears to be from the future. This may be due to your computer's date and time being set incorrectly. Only rebuild the block database if you are sure that your computer's date and time are correct</source>
+        <translation>A base de dados de blocos contém um bloco que aparenta ser do futuro. Isto pode ser causado por uma data incorrecta definida no seu computador. Reconstrua apenas a base de dados de blocos caso tenha a certeza de que a data e hora do seu computador estão correctos.</translation>
+    </message>
     <message>
         <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
         <translation>Esta é uma versão de testes pré-lançamento - use à sua responsabilidade - não usar para minar ou aplicações comerciais</translation>
@@ -2756,10 +3020,30 @@
         <source>Unable to bind to %s on this computer. Bitcoin Core is probably already running.</source>
         <translation>Incapaz de vincular à porta %s neste computador. O Bitcoin Core provavelmente já está a correr.</translation>
     </message>
+    <message>
+        <source>Unsupported argument -whitelistalwaysrelay ignored, use -whitelistrelay and/or -whitelistforcerelay.</source>
+        <translation>Argumento não suportado -whitelistalwaysrelay ignorado, utilize -whitelistrelay e/ou -whitelistforcerelay.</translation>
+    </message>
+    <message>
+        <source>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</source>
+        <translation>Utilizar UPnP para mapear a porta de escuta (predefinição: 1 quando escutar e sem -proxy)</translation>
+    </message>
+    <message>
+        <source>WARNING: abnormally high number of blocks generated, %d blocks received in the last %d hours (%d expected)</source>
+        <translation>AVISO: gerado um número anormalmente elevado de blocos, %d blocos recebidos nas últimas %d horas (%d esperados)</translation>
+    </message>
+    <message>
+        <source>WARNING: check your network connection, %d blocks received in the last %d hours (%d expected)</source>
+        <translation>AVISO: verifique a sua conexão à rede, %d blocos recebidos nas últimas %d horas (%d esperados)</translation>
+    </message>
     <message>
         <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source>
         <translation>Aviso: A rede não parece estar completamente de acordo! Parece que alguns mineiros estão com dificuldades técnicas.</translation>
     </message>
+    <message>
+        <source>Warning: Unknown block versions being mined! It's possible unknown rules are in effect</source>
+        <translation>Atenção: Versões desconhecidas de blocos estão a ser mineradas! É possível que regras desconhecias estão a ser efetuadas</translation>
+    </message>
     <message>
         <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source>
         <translation>Atenção: Parecemos não estar de acordo com os nossos pares! Poderá ter que atualizar o seu cliente, ou outros nós poderão ter que atualizar os seus clientes.</translation>
@@ -2772,13 +3056,21 @@
         <source>Whitelist peers connecting from the given netmask or IP address. Can be specified multiple times.</source>
         <translation>Ligações na lista branca conectam desde a seguinte netmask ou endereço IP. Posse ser especificado varias vezes.</translation>
     </message>
+    <message>
+        <source>-maxmempool must be at least %d MB</source>
+        <translation>- máximo do banco de memória deverá ser pelo menos %d MB</translation>
+    </message>
     <message>
         <source>&lt;category&gt; can be:</source>
         <translation>&lt;categoria&gt; pode ser:</translation>
     </message>
+    <message>
+        <source>Append comment to the user agent string</source>
+        <translation>Anexar um comentário para a entrada de agente do utilizador</translation>
+    </message>
     <message>
         <source>Block creation options:</source>
-        <translation>Opções de criação de bloco:</translation>
+        <translation>Opções da criação de bloco:</translation>
     </message>
     <message>
         <source>Connect only to the specified node(s)</source>
@@ -2786,7 +3078,7 @@
     </message>
     <message>
         <source>Connection options:</source>
-        <translation>Opcões de conexção:</translation>
+        <translation>Opções de ligação:</translation>
     </message>
     <message>
         <source>Corrupted block database detected</source>
@@ -2794,16 +3086,36 @@
     </message>
     <message>
         <source>Debugging/Testing options:</source>
-        <translation>Depuração/Opções teste:</translation>
+        <translation>Opções de Depuração/Teste:</translation>
     </message>
     <message>
         <source>Do not load the wallet and disable wallet RPC calls</source>
-        <translation>Não carregar a carteira e desativar chamadas RPC de carteira.</translation>
+        <translation>Não carregar a carteira e desativar as chamadas de RPC da carteira.</translation>
     </message>
     <message>
         <source>Do you want to rebuild the block database now?</source>
         <translation>Deseja reconstruir agora a base de dados de blocos.</translation>
     </message>
+    <message>
+        <source>Enable publish hash block in &lt;address&gt;</source>
+        <translation>Activar publicação do hash do bloco em &lt;address&gt;</translation>
+    </message>
+    <message>
+        <source>Enable publish hash transaction in &lt;address&gt;</source>
+        <translation>Activar publicação do hash da transacção em &lt;address&gt;</translation>
+    </message>
+    <message>
+        <source>Enable publish raw block in &lt;address&gt;</source>
+        <translation>Activar publicação de dados brutos do bloco em &lt;address&gt;</translation>
+    </message>
+    <message>
+        <source>Enable publish raw transaction in &lt;address&gt;</source>
+        <translation>Activar publicação de dados brutos da transacção em &lt;address&gt;</translation>
+    </message>
+    <message>
+        <source>Enable transaction replacement in the memory pool (default: %u)</source>
+        <translation>Ativar substituição da transação no banco de memória (predefinição: %u)</translation>
+    </message>
     <message>
         <source>Error initializing block database</source>
         <translation>Erro ao inicializar a cadeia de blocos</translation>
@@ -2840,6 +3152,22 @@
         <source>Invalid -onion address: '%s'</source>
         <translation>Endereço -onion inválido: '%s'</translation>
     </message>
+    <message>
+        <source>Invalid amount for -fallbackfee=&lt;amount&gt;: '%s'</source>
+        <translation>Valor inválido para -fallbackfee=&lt;amount&gt;: '%s'</translation>
+    </message>
+    <message>
+        <source>Keep the transaction memory pool below &lt;n&gt; megabytes (default: %u)</source>
+        <translation>Manter o banco de memória da transação abaixo de &lt;n&gt; megabytes (predefinição: %u)</translation>
+    </message>
+    <message>
+        <source>Location of the auth cookie (default: data dir)</source>
+        <translation>Localização de cookie de autorização (predefinição: diretoria de dados)</translation>
+    </message>
+    <message>
+        <source>Minimum bytes per sigop in transactions we relay and mine (default: %u)</source>
+        <translation>Mínimo de bytes por sigop nas transações que nós transmitimos e mine (predefinição: %u)</translation>
+    </message>
     <message>
         <source>Not enough file descriptors available.</source>
         <translation>Os descritores de ficheiros disponíveis são insuficientes.</translation>
@@ -2848,6 +3176,18 @@
         <source>Only connect to nodes in network &lt;net&gt; (ipv4, ipv6 or onion)</source>
         <translation>Somente conectar aos nodes na rede &lt;net&gt; (ipv4, ipv6 ou onion)</translation>
     </message>
+    <message>
+        <source>Print version and exit</source>
+        <translation>Imprimir versão e sair</translation>
+    </message>
+    <message>
+        <source>Prune cannot be configured with a negative value.</source>
+        <translation>Poda não pode ser configurada com um valor negativo.</translation>
+    </message>
+    <message>
+        <source>Prune mode is incompatible with -txindex.</source>
+        <translation>Modo poda é incompatível com -txindex.</translation>
+    </message>
     <message>
         <source>Set database cache size in megabytes (%d to %d, default: %d)</source>
         <translation>Definir o tamanho da cache de base de dados em megabytes (%d a %d, padrão: %d)</translation>
@@ -2860,9 +3200,25 @@
         <source>Specify wallet file (within data directory)</source>
         <translation>Especifique ficheiro de carteira (dentro da pasta de dados)</translation>
     </message>
+    <message>
+        <source>Unsupported argument -benchmark ignored, use -debug=bench.</source>
+        <translation>Argumento não suportado -benchmark ignorado, use -debug=bench.</translation>
+    </message>
+    <message>
+        <source>Unsupported argument -debugnet ignored, use -debug=net.</source>
+        <translation>Argumento não suportado -debugnet ignorado, use -debug=net.</translation>
+    </message>
+    <message>
+        <source>Unsupported argument -tor found, use -onion.</source>
+        <translation>Argumento não suportado -tor encontrado, use -onion.</translation>
+    </message>
     <message>
         <source>Use UPnP to map the listening port (default: %u)</source>
-        <translation>Use UPnP para mapear a porto de escuta (default: %u)</translation>
+        <translation>Utilizar UPnP para mapear a porta de escuta (predefinição: %u)</translation>
+    </message>
+    <message>
+        <source>User Agent comment (%s) contains unsafe characters.</source>
+        <translation>Comentário no User Agent (%s) contém caracteres inseguros.</translation>
     </message>
     <message>
         <source>Verifying blocks...</source>
@@ -2880,10 +3236,6 @@
         <source>Wallet options:</source>
         <translation>Opções da carteira:</translation>
     </message>
-    <message>
-        <source>Warning: This version is obsolete; upgrade required!</source>
-        <translation>Aviso: Esta versão está desatualizada; atualização necessária!</translation>
-    </message>
     <message>
         <source>You need to rebuild the database using -reindex to change -txindex</source>
         <translation>É necessário reconstruir as bases de dados usando -reindex para mudar o -txindex</translation>
@@ -2904,34 +3256,122 @@
         <source>Cannot obtain a lock on data directory %s. Bitcoin Core is probably already running.</source>
         <translation>Impossível trancar a pasta de dados %s. Provavelmente o Bitcoin Core já está a ser executado.</translation>
     </message>
+    <message>
+        <source>Create new files with system default permissions, instead of umask 077 (only effective with disabled wallet functionality)</source>
+        <translation>Crie ficheiros novos com as permisões predefinidas do sistema, em vez de umask 077 (apenas eficaz caso a funcionalidade carteira esteja desactivada)</translation>
+    </message>
+    <message>
+        <source>Discover own IP addresses (default: 1 when listening and no -externalip or -proxy)</source>
+        <translation>Descobrir o próprio endereço IP (padrão: 1 ao escutar e sem -externalip ou -proxy)</translation>
+    </message>
+    <message>
+        <source>Error: Listening for incoming connections failed (listen returned error %s)</source>
+        <translation>Erro: A escuta de ligações de entrada falhou (escuta devolveu erro %s)</translation>
+    </message>
     <message>
         <source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source>
         <translation>Executar comando quando um alerta relevante for recebido ou em caso de uma divisão longa da cadeia de blocos (no comando, %s é substituído pela mensagem)</translation>
     </message>
+    <message>
+        <source>Fees (in %s/kB) smaller than this are considered zero fee for relaying, mining and transaction creation (default: %s)</source>
+        <translation>Taxas (em %s/kB) abaixo deste valor são consideradas nulas para propagação, mineração e criação de transacções (padrão: %s)</translation>
+    </message>
+    <message>
+        <source>If paytxfee is not set, include enough fee so transactions begin confirmation on average within n blocks (default: %u)</source>
+        <translation>Caso o paytxfee não seja definido, inclua uma taxa suficiente para que as transacções comecem a ser confirmadas, em média, dentro de n blocos (padrão: %u)</translation>
+    </message>
+    <message>
+        <source>Invalid amount for -maxtxfee=&lt;amount&gt;: '%s' (must be at least the minrelay fee of %s to prevent stuck transactions)</source>
+        <translation>Montante inválido para -maxtxfee=&lt;amount&gt;: '%s' (deverá ser, no mínimo , a taxa mínima de propagação de %s, de modo a evitar transações bloqueadas)</translation>
+    </message>
+    <message>
+        <source>Maximum size of data in data carrier transactions we relay and mine (default: %u)</source>
+        <translation>Tamanho máximo dos dados em transacções que incluem dados que propagamos e mineramos (padrão: %u)</translation>
+    </message>
+    <message>
+        <source>Query for peer addresses via DNS lookup, if low on addresses (default: 1 unless -connect)</source>
+        <translation>Encontrar pares usando DNS lookup, caso o número de endereços seja reduzido (padrão: 1 excepto -connect)</translation>
+    </message>
+    <message>
+        <source>Randomize credentials for every proxy connection. This enables Tor stream isolation (default: %u)</source>
+        <translation>Usar credenciais aleatórias por cada ligação proxy. Permite que o Tor use stream isolation (padrão: %u)</translation>
+    </message>
     <message>
         <source>Set maximum size of high-priority/low-fee transactions in bytes (default: %d)</source>
         <translation>Definir tamanho máximo de transações com alta-prioridade/baixa-taxa em bytes (por defeito: %d)</translation>
     </message>
+    <message>
+        <source>Set the number of threads for coin generation if enabled (-1 = all cores, default: %d)</source>
+        <translation>Definir o número threads para a geração de moedas, caso activo (-1 = todos os cores, padrão: %d)</translation>
+    </message>
+    <message>
+        <source>The transaction amount is too small to send after the fee has been deducted</source>
+        <translation>O montante da transacção é demasiado baixo após a dedução da taxa</translation>
+    </message>
+    <message>
+        <source>This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit &lt;https://www.openssl.org/&gt; and cryptographic software written by Eric Young and UPnP software written by Thomas Bernard.</source>
+        <translation>Este produto inclui software desenvolvido pelo OpenSSL Project para utilização no OpenSSL Toolkit &lt;https://www.openssl.org/&gt;  e software criptográfico escrito por Eric Young e software UPnP escrito por Thomas Bernard.</translation>
+    </message>
+    <message>
+        <source>Whitelisted peers cannot be DoS banned and their transactions are always relayed, even if they are already in the mempool, useful e.g. for a gateway</source>
+        <translation>Os pares enviados para a lista branca não podem ser DoS banidos e as suas transações são sempre retransmitidas, mesmo que já estejam no banco de memória, útil, por exemplo, para um acesso</translation>
+    </message>
+    <message>
+        <source>You need to rebuild the database using -reindex to go back to unpruned mode.  This will redownload the entire blockchain</source>
+        <translation>É necessário reconstruir a base de dados, utilizando -reindex para voltar ao modo de suprimir. Isto irá transferir novamente a cadeia de blocos completa</translation>
+    </message>
     <message>
         <source>(default: %u)</source>
-        <translation>(por defeito: %u)</translation>
+        <translation>(predefinição: %u)</translation>
+    </message>
+    <message>
+        <source>Accept public REST requests (default: %u)</source>
+        <translation>Aceitar pedidos REST públicos (predefinição: %u)</translation>
+    </message>
+    <message>
+        <source>Activating best chain...</source>
+        <translation>A activar a melhor cadeia...</translation>
+    </message>
+    <message>
+        <source>Attempt to recover private keys from a corrupt wallet.dat on startup</source>
+        <translation>Tentar recuperar chaves privadas de um wallet.dat corrompido ao iniciar</translation>
+    </message>
+    <message>
+        <source>Automatically create Tor hidden service (default: %d)</source>
+        <translation>Criar automaticamente o serviço Tor oculto (predefinição: %d)</translation>
     </message>
     <message>
         <source>Cannot resolve -whitebind address: '%s'</source>
         <translation>Não foi possível resolver o endereço -whitebind: '%s'</translation>
     </message>
+    <message>
+        <source>Connect through SOCKS5 proxy</source>
+        <translation>Ligar através de um proxy SOCKS5</translation>
+    </message>
     <message>
         <source>Copyright (C) 2009-%i The Bitcoin Core Developers</source>
         <translation>Copyright (C) 2009-%i Os Programadores do Bitcoin Core</translation>
     </message>
     <message>
         <source>Error loading wallet.dat: Wallet requires newer version of Bitcoin Core</source>
-        <translation>Erro ao carregar wallet.dat: A Carteira requer uma versão mais recente do Bitcoin Core</translation>
+        <translation>Erro ao carregar wallet.dat: A carteira requer uma versão mais recente do Bitcoin Core</translation>
+    </message>
+    <message>
+        <source>Error reading from database, shutting down.</source>
+        <translation>Erro ao ler da base de dados, encerrando.</translation>
+    </message>
+    <message>
+        <source>Imports blocks from external blk000??.dat file on startup</source>
+        <translation>Importar blocos de um ficheiro blk000??.dat externo ao iniciar</translation>
     </message>
     <message>
         <source>Information</source>
         <translation>Informação</translation>
     </message>
+    <message>
+        <source>Initialization sanity check failed. Bitcoin Core is shutting down.</source>
+        <translation>Falha na prova real inicial. Bitcoin Core está a desligar.</translation>
+    </message>
     <message>
         <source>Invalid amount for -maxtxfee=&lt;amount&gt;: '%s'</source>
         <translation>Quantia inválida para -maxtxfee=&lt;quantidade&gt;: '%s'</translation>
@@ -2944,10 +3384,58 @@
         <source>Invalid amount for -mintxfee=&lt;amount&gt;: '%s'</source>
         <translation>Quantia inválida para -mintxfee=&lt;quantidade&gt;: '%s'</translation>
     </message>
+    <message>
+        <source>Invalid amount for -paytxfee=&lt;amount&gt;: '%s' (must be at least %s)</source>
+        <translation>Montante inválido para -paytxfee=&lt;amount&gt;: '%s' (deverá ser no mínimo %s)</translation>
+    </message>
+    <message>
+        <source>Invalid netmask specified in -whitelist: '%s'</source>
+        <translation>Máscara de rede inválida especificada em -whitelist: '%s'</translation>
+    </message>
+    <message>
+        <source>Keep at most &lt;n&gt; unconnectable transactions in memory (default: %u)</source>
+        <translation>Manter no máximo &lt;n&gt; transacções órfãs em memória (padrão: %u)</translation>
+    </message>
+    <message>
+        <source>Need to specify a port with -whitebind: '%s'</source>
+        <translation>Necessário especificar uma porta com -whitebind: '%s'</translation>
+    </message>
+    <message>
+        <source>Node relay options:</source>
+        <translation>Opções da transmissão de nós:</translation>
+    </message>
+    <message>
+        <source>RPC server options:</source>
+        <translation>Opções do servidor RPC:</translation>
+    </message>
+    <message>
+        <source>Rebuild block chain index from current blk000??.dat files on startup</source>
+        <translation>Reconstruir a cadeia de blocos a partir dos ficheiros blk000??.dat actuais ao iniciar</translation>
+    </message>
+    <message>
+        <source>Receive and display P2P network alerts (default: %u)</source>
+        <translation>Receber e mostrar alertas da rede P2P (padrão: %u)</translation>
+    </message>
+    <message>
+        <source>Reducing -maxconnections from %d to %d, because of system limitations.</source>
+        <translation>Reduzindo -maxconnections de %d para %d, devido a limitações no sistema.</translation>
+    </message>
+    <message>
+        <source>Rescan the block chain for missing wallet transactions on startup</source>
+        <translation>Procurar transacções em falta na cadeia de blocos ao iniciar</translation>
+    </message>
     <message>
         <source>Send trace/debug info to console instead of debug.log file</source>
         <translation>Enviar informação de rastreio/depuração para a consola e não para o ficheiro debug.log</translation>
     </message>
+    <message>
+        <source>Send transactions as zero-fee transactions if possible (default: %u)</source>
+        <translation>Enviar como uma transacção a custo zero se possível (padrão: %u)</translation>
+    </message>
+    <message>
+        <source>Show all debugging options (usage: --help -help-debug)</source>
+        <translation>Mostrar todas as opções de depuração (utilização: --help -help-debug)</translation>
+    </message>
     <message>
         <source>Shrink debug.log file on client startup (default: 1 when no -debug)</source>
         <translation>Encolher ficheiro debug.log ao iniciar o cliente (por defeito: 1 sem -debug definido)</translation>
@@ -2956,6 +3444,22 @@
         <source>Signing transaction failed</source>
         <translation>Falhou assinatura da transação</translation>
     </message>
+    <message>
+        <source>The transaction amount is too small to pay the fee</source>
+        <translation>O montante da transacção é demasiado baixo para pagar a taxa</translation>
+    </message>
+    <message>
+        <source>This is experimental software.</source>
+        <translation>Isto é software experimental.</translation>
+    </message>
+    <message>
+        <source>Tor control port password (default: empty)</source>
+        <translation>Palavra-passe da porta de controlo Tor (predefinição: vazio)</translation>
+    </message>
+    <message>
+        <source>Tor control port to use if onion listening enabled (default: %s)</source>
+        <translation>Porta de controlo Tor a utilizar se a escuta cebola estiver ativada (predefinição: %s)</translation>
+    </message>
     <message>
         <source>Transaction amount too small</source>
         <translation>Quantia da transação é muito baixa</translation>
@@ -2964,10 +3468,22 @@
         <source>Transaction amounts must be positive</source>
         <translation>Quantia da transação deverá ser positiva</translation>
     </message>
+    <message>
+        <source>Transaction too large for fee policy</source>
+        <translation>Transacção demasiado grande para a política de taxas</translation>
+    </message>
     <message>
         <source>Transaction too large</source>
         <translation>Transação grande demais</translation>
     </message>
+    <message>
+        <source>Unable to bind to %s on this computer (bind returned error %s)</source>
+        <translation>Incapaz de vincular à porta %s neste computador (vínculo retornou erro %s)</translation>
+    </message>
+    <message>
+        <source>Upgrade wallet to latest format on startup</source>
+        <translation>Actualizar carteira para o formato mais recente ao iniciar</translation>
+    </message>
     <message>
         <source>Username for JSON-RPC connections</source>
         <translation>Nome de utilizador para ligações JSON-RPC</translation>
@@ -2980,10 +3496,22 @@
         <source>Warning</source>
         <translation>Aviso</translation>
     </message>
+    <message>
+        <source>Warning: unknown new rules activated (versionbit %i)</source>
+        <translation>Aviso: ativadas novas regras desconhecidas (versionbit %i)</translation>
+    </message>
+    <message>
+        <source>Whether to operate in a blocks only mode (default: %u)</source>
+        <translation>Se operar apenas num modo de blocos (predefinição: %u)</translation>
+    </message>
     <message>
         <source>Zapping all transactions from wallet...</source>
         <translation>A limpar todas as transações da carteira...</translation>
     </message>
+    <message>
+        <source>ZeroMQ notification options:</source>
+        <translation>Opções de notificação ZeroMQ:</translation>
+    </message>
     <message>
         <source>wallet.dat corrupt, salvage failed</source>
         <translation>wallet.dat corrompido, recuperação falhou</translation>
@@ -3006,27 +3534,107 @@
     </message>
     <message>
         <source>Loading addresses...</source>
-        <translation>A carregar endereços...</translation>
+        <translation>A carregar os endereços...</translation>
     </message>
     <message>
         <source>Error loading wallet.dat: Wallet corrupted</source>
         <translation>Erro ao carregar wallet.dat: Carteira danificada</translation>
     </message>
+    <message>
+        <source>(1 = keep tx meta data e.g. account owner and payment request information, 2 = drop tx meta data)</source>
+        <translation>(1 = guardar metadados da transacção ex: proprietário da conta e informação do pedido de pagamento, 2 = descartar metadados da transacção)</translation>
+    </message>
+    <message>
+        <source>-maxtxfee is set very high! Fees this large could be paid on a single transaction.</source>
+        <translation>-maxtxfee está definido com um valor muito alto! Taxas desta magnitude podem ser pagas numa única transacção.</translation>
+    </message>
+    <message>
+        <source>-paytxfee is set very high! This is the transaction fee you will pay if you send a transaction.</source>
+        <translation>-paytxfee está definido com um valor muito alto! Esta é a taxa que irá pagar se enviar uma transacção.</translation>
+    </message>
+    <message>
+        <source>Do not keep transactions in the mempool longer than &lt;n&gt; hours (default: %u)</source>
+        <translation>Não guardar transações no banco de memória por mais de &lt;n&gt; horas (predefinição: %u)</translation>
+    </message>
+    <message>
+        <source>Error reading wallet.dat! All keys read correctly, but transaction data or address book entries might be missing or incorrect.</source>
+        <translation>Erro ao ler wallet.dat! Todas as chaves foram lidas correctamente, mas os dados das transacções ou do livro de endereços podem estar em falta ou incorrectos.</translation>
+    </message>
+    <message>
+        <source>Fees (in %s/kB) smaller than this are considered zero fee for transaction creation (default: %s)</source>
+        <translation>Taxas (em %s/kB) abaixo deste valor são consideradas nulas para a criação de transacções (padrão: %s)</translation>
+    </message>
+    <message>
+        <source>How thorough the block verification of -checkblocks is (0-4, default: %u)</source>
+        <translation>Minuciosidade da verificação de blocos para -checkblocks é (0-4, padrão: %u)</translation>
+    </message>
+    <message>
+        <source>Maintain a full transaction index, used by the getrawtransaction rpc call (default: %u)</source>
+        <translation>Manter um índice de transacções completo, usado pela chamada RPC getrawtransaction (padrão: %u)</translation>
+    </message>
+    <message>
+        <source>Number of seconds to keep misbehaving peers from reconnecting (default: %u)</source>
+        <translation>Número de segundos a impedir que pares com comportamento indesejado se liguem de novo (padrão: %u)</translation>
+    </message>
+    <message>
+        <source>Output debugging information (default: %u, supplying &lt;category&gt; is optional)</source>
+        <translation>Informação de depuração (padrão: %u, fornecer uma &lt;category&gt; é opcional)</translation>
+    </message>
+    <message>
+        <source>Support filtering of blocks and transaction with bloom filters (default: %u)</source>
+        <translation>Suportar filtragem de blocos e transacções com fitros bloom (padrão: %u)</translation>
+    </message>
+    <message>
+        <source>Total length of network version string (%i) exceeds maximum length (%i). Reduce the number or size of uacomments.</source>
+        <translation>Comprimento total da entrada da versão de rede (%i) excede o comprimento máximo (%i). Reduzir o número ou o tamanho de uacomments.</translation>
+    </message>
+    <message>
+        <source>Tries to keep outbound traffic under the given target (in MiB per 24h), 0 = no limit (default: %d)</source>
+        <translation>Tenta manter o tráfego externo abaixo do limite especificado (em MiB por 24h), 0 = sem limite (padrão: %d)</translation>
+    </message>
+    <message>
+        <source>Unsupported argument -socks found. Setting SOCKS version isn't possible anymore, only SOCKS5 proxies are supported.</source>
+        <translation>Encontrado um argumento não suportado -socks. Definir a versão do SOCKS já não é possível, apenas proxies SOCKS5 são suportados.</translation>
+    </message>
+    <message>
+        <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: %s)</source>
+        <translation>Use um proxy SOCKS5 separado para alcançar pares via serviços ocultos do Tor (padrão: %s)</translation>
+    </message>
+    <message>
+        <source>Username and hashed password for JSON-RPC connections. The field &lt;userpw&gt; comes in the format: &lt;USERNAME&gt;:&lt;SALT&gt;$&lt;HASH&gt;. A canonical python script is included in share/rpcuser. This option can be specified multiple times</source>
+        <translation>Username e hash da password para ligações JSON-RPC. O campo &lt;userpw&gt; está no formato: &lt;USERNAME&gt;:&lt;SALT&gt;$&lt;HASH&gt;. Um script python está incluido em share/rpcuser. Esta opção pode ser especificada múltiplas vezes.</translation>
+    </message>
     <message>
         <source>(default: %s)</source>
-        <translation>(por defeito: %s)</translation>
+        <translation>(predefinição: %s)</translation>
+    </message>
+    <message>
+        <source>Always query for peer addresses via DNS lookup (default: %u)</source>
+        <translation>Utilizar sempre a consulta de DNS para endereços de pares (predefinição: %u)</translation>
     </message>
     <message>
         <source>Error loading wallet.dat</source>
         <translation>Erro ao carregar wallet.dat</translation>
     </message>
+    <message>
+        <source>Generate coins (default: %u)</source>
+        <translation>Gerar moedas (predefinição: %u)</translation>
+    </message>
+    <message>
+        <source>How many blocks to check at startup (default: %u, 0 = all)</source>
+        <translation>Quantos blocos para verificar no arranque (predefinição: %u, 0 = todos)</translation>
+    </message>
+    <message>
+        <source>Include IP addresses in debug output (default: %u)</source>
+        <translation>Incluir endereços de IP na informação de depuração (predefinição: %u)</translation>
+    </message>
     <message>
         <source>Invalid -proxy address: '%s'</source>
         <translation>Endereço -proxy inválido: '%s'</translation>
     </message>
     <message>
         <source>Listen for JSON-RPC connections on &lt;port&gt; (default: %u or testnet: %u)</source>
-        <translation>Escutar por ligações JSON-RPC na porta &lt;port&gt; (por defeito: %u ou rede de testes: %u)</translation>
+        <translation>Escutar por ligações JSON-RPC na porta &lt;port&gt; (predefinição: %u ou rede de testes: %u)</translation>
     </message>
     <message>
         <source>Listen for connections on &lt;port&gt; (default: %u or testnet: %u)</source>
@@ -3036,6 +3644,10 @@
         <source>Maintain at most &lt;n&gt; connections to peers (default: %u)</source>
         <translation>Manter no máximo &lt;n&gt; ligações a outros nós da rede (por defeito: %u)</translation>
     </message>
+    <message>
+        <source>Make the wallet broadcast transactions</source>
+        <translation>Colocar a carteira a transmitir transacções</translation>
+    </message>
     <message>
         <source>Maximum per-connection receive buffer, &lt;n&gt;*1000 bytes (default: %u)</source>
         <translation>Maximo armazenamento intermédio de recepção por ligação, &lt;n&gt;*1000 bytes (por defeito: %u)</translation>
@@ -3048,9 +3660,17 @@
         <source>Prepend debug output with timestamp (default: %u)</source>
         <translation>Adicionar data e hora à informação de depuração (por defeito: %u)</translation>
     </message>
+    <message>
+        <source>Relay and mine data carrier transactions (default: %u)</source>
+        <translation>Propagar e minerar transacções que incluem dados (padrão: %u)</translation>
+    </message>
+    <message>
+        <source>Relay non-P2SH multisig (default: %u)</source>
+        <translation>Propagar não P2SH multisig (predefinição: %u)</translation>
+    </message>
     <message>
         <source>Set key pool size to &lt;n&gt; (default: %u)</source>
-        <translation>Definir o tamanho da memória de chaves para &lt;n&gt; (por defeito: %u)</translation>
+        <translation>Definir tamanho do banco de memória da chave para &lt;n&gt; (predefinição: %u)</translation>
     </message>
     <message>
         <source>Set minimum block size in bytes (default: %u)</source>
@@ -3068,6 +3688,18 @@
         <source>Specify connection timeout in milliseconds (minimum: 1, default: %d)</source>
         <translation>Especificar tempo de espera da ligação em milissegundos (mínimo 1, por defeito: %d)</translation>
     </message>
+    <message>
+        <source>Specify pid file (default: %s)</source>
+        <translation>Especificar ficheiro pid (padrão: %s)</translation>
+    </message>
+    <message>
+        <source>Spend unconfirmed change when sending transactions (default: %u)</source>
+        <translation>Gastar troco não confirmado ao enviar transacções (padrão: %u)</translation>
+    </message>
+    <message>
+        <source>Threshold for disconnecting misbehaving peers (default: %u)</source>
+        <translation>Tolerância para desligar nós com comportamento indesejável (padrão: %u)</translation>
+    </message>
     <message>
         <source>Unknown network specified in -onlynet: '%s'</source>
         <translation>Rede desconhecida especificada em -onlynet: '%s'</translation>
@@ -3090,7 +3722,7 @@
     </message>
     <message>
         <source>Loading block index...</source>
-        <translation>A carregar índice de blocos...</translation>
+        <translation>A carregar o índice de blocos...</translation>
     </message>
     <message>
         <source>Add a node to connect to and attempt to keep the connection open</source>
@@ -3098,7 +3730,7 @@
     </message>
     <message>
         <source>Loading wallet...</source>
-        <translation>A carregar carteira...</translation>
+        <translation>A carregar a carteira...</translation>
     </message>
     <message>
         <source>Cannot downgrade wallet</source>
@@ -3114,7 +3746,7 @@
     </message>
     <message>
         <source>Done loading</source>
-        <translation>Carregamento completo</translation>
+        <translation>Carregamento concluído</translation>
     </message>
     <message>
         <source>Error</source>
diff --git a/src/qt/locale/bitcoin_ro.ts b/src/qt/locale/bitcoin_ro.ts
new file mode 100644
index 0000000000000..11ac69f0f2dd1
--- /dev/null
+++ b/src/qt/locale/bitcoin_ro.ts
@@ -0,0 +1,169 @@
+<TS language="ro" version="2.1">
+<context>
+    <name>AddressBookPage</name>
+    <message>
+        <source>Right-click to edit address or label</source>
+        <translation>Click dreapta pentru a modifica adresa o eticheta</translation>
+    </message>
+    <message>
+        <source>Create a new address</source>
+        <translation>Crează o nouă adresă</translation>
+    </message>
+    <message>
+        <source>&amp;New</source>
+        <translation>&amp;Nou</translation>
+    </message>
+    <message>
+        <source>Copy the currently selected address to the system clipboard</source>
+        <translation>Copiază în notițe adresa selectată în prezent</translation>
+    </message>
+    <message>
+        <source>&amp;Copy</source>
+        <translation>&amp;Copiază</translation>
+    </message>
+    <message>
+        <source>C&amp;lose</source>
+        <translation>Î&amp;nchide</translation>
+    </message>
+    <message>
+        <source>&amp;Copy Address</source>
+        <translation>&amp;Copiază Adresa</translation>
+    </message>
+    <message>
+        <source>Delete the currently selected address from the list</source>
+        <translation>Șterge adresa curentă selectata din listă</translation>
+    </message>
+    <message>
+        <source>Export the data in the current tab to a file</source>
+        <translation>Exportă datele din tabul curent in fisier</translation>
+    </message>
+    <message>
+        <source>&amp;Export</source>
+        <translation>&amp;Exportă</translation>
+    </message>
+    <message>
+        <source>Choose the address to send coins to</source>
+        <translation>Indică adresa de expediere a monedelor</translation>
+    </message>
+    <message>
+        <source>Choose the address to receive coins with</source>
+        <translation>Indică adresa de a primi monedele</translation>
+    </message>
+    </context>
+<context>
+    <name>AddressTableModel</name>
+    </context>
+<context>
+    <name>AskPassphraseDialog</name>
+    </context>
+<context>
+    <name>BanTableModel</name>
+    </context>
+<context>
+    <name>BitcoinGUI</name>
+    </context>
+<context>
+    <name>ClientModel</name>
+    </context>
+<context>
+    <name>CoinControlDialog</name>
+    </context>
+<context>
+    <name>EditAddressDialog</name>
+    </context>
+<context>
+    <name>FreespaceChecker</name>
+    </context>
+<context>
+    <name>HelpMessageDialog</name>
+    </context>
+<context>
+    <name>Intro</name>
+    </context>
+<context>
+    <name>OpenURIDialog</name>
+    </context>
+<context>
+    <name>OptionsDialog</name>
+    </context>
+<context>
+    <name>OverviewPage</name>
+    </context>
+<context>
+    <name>PaymentServer</name>
+    </context>
+<context>
+    <name>PeerTableModel</name>
+    </context>
+<context>
+    <name>QObject</name>
+    </context>
+<context>
+    <name>QRImageWidget</name>
+    </context>
+<context>
+    <name>RPCConsole</name>
+    </context>
+<context>
+    <name>ReceiveCoinsDialog</name>
+    </context>
+<context>
+    <name>ReceiveRequestDialog</name>
+    </context>
+<context>
+    <name>RecentRequestsTableModel</name>
+    </context>
+<context>
+    <name>SendCoinsDialog</name>
+    </context>
+<context>
+    <name>SendCoinsEntry</name>
+    </context>
+<context>
+    <name>ShutdownWindow</name>
+    </context>
+<context>
+    <name>SignVerifyMessageDialog</name>
+    </context>
+<context>
+    <name>SplashScreen</name>
+    </context>
+<context>
+    <name>TrafficGraphWidget</name>
+    </context>
+<context>
+    <name>TransactionDesc</name>
+    </context>
+<context>
+    <name>TransactionDescDialog</name>
+    </context>
+<context>
+    <name>TransactionTableModel</name>
+    </context>
+<context>
+    <name>TransactionView</name>
+    </context>
+<context>
+    <name>UnitDisplayStatusBarControl</name>
+    </context>
+<context>
+    <name>WalletFrame</name>
+    </context>
+<context>
+    <name>WalletModel</name>
+    </context>
+<context>
+    <name>WalletView</name>
+    <message>
+        <source>&amp;Export</source>
+        <translation>&amp;Exportă</translation>
+    </message>
+    <message>
+        <source>Export the data in the current tab to a file</source>
+        <translation>Exportă datele din tabul curent in fisier</translation>
+    </message>
+    </context>
+<context>
+    <name>bitcoin-core</name>
+    </context>
+</TS>
\ No newline at end of file
diff --git a/src/qt/locale/bitcoin_ro_RO.ts b/src/qt/locale/bitcoin_ro_RO.ts
index 8bccf037a73c7..502052dffb296 100644
--- a/src/qt/locale/bitcoin_ro_RO.ts
+++ b/src/qt/locale/bitcoin_ro_RO.ts
@@ -27,7 +27,7 @@
     </message>
     <message>
         <source>&amp;Copy Address</source>
-        <translation>&amp;Copiază adresa</translation>
+        <translation>&amp;Copiază Adresa</translation>
     </message>
     <message>
         <source>Delete the currently selected address from the list</source>
@@ -43,15 +43,15 @@
     </message>
     <message>
         <source>&amp;Delete</source>
-        <translation>Şterge</translation>
+        <translation>&amp;Şterge</translation>
     </message>
     <message>
         <source>Choose the address to send coins to</source>
-        <translation>Alegeţi adresa unde vreţi să trimiteţi monezile</translation>
+        <translation>Alegeţi adresa unde vreţi să trimiteţi monedele</translation>
     </message>
     <message>
         <source>Choose the address to receive coins with</source>
-        <translation>Alegeţi adresa unde vreţi să primiţi monezile</translation>
+        <translation>Alegeţi adresa unde vreţi să primiţi monedele</translation>
     </message>
     <message>
         <source>C&amp;hoose</source>
@@ -67,7 +67,7 @@
     </message>
     <message>
         <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source>
-        <translation>Acestea sînt adresele dumneavoastră Bitcoin pentru efectuarea plăţilor. Verificaţi întotdeauna cantitatea şi adresa de primire înainte de a trimite monezi.</translation>
+        <translation>Acestea sînt adresele dumneavoastră Bitcoin pentru efectuarea plăţilor. Verificaţi întotdeauna cantitatea şi adresa de primire înainte de a trimite monede.</translation>
     </message>
     <message>
         <source>These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source>
@@ -222,7 +222,15 @@
 </context>
 <context>
     <name>BanTableModel</name>
-    </context>
+    <message>
+        <source>IP/Netmask</source>
+        <translation>IP/Netmask</translation>
+    </message>
+    <message>
+        <source>Banned Until</source>
+        <translation>Banat până la</translation>
+    </message>
+</context>
 <context>
     <name>BitcoinGUI</name>
     <message>
@@ -547,7 +555,7 @@
     <name>CoinControlDialog</name>
     <message>
         <source>Coin Selection</source>
-        <translation>Selectarea monezii</translation>
+        <translation>Selectarea monedei</translation>
     </message>
     <message>
         <source>Quantity:</source>
@@ -874,7 +882,35 @@
         <source>command-line options</source>
         <translation>Opţiuni linie de comandă</translation>
     </message>
-    </context>
+    <message>
+        <source>UI Options:</source>
+        <translation>Opţiuni UI:</translation>
+    </message>
+    <message>
+        <source>Choose data directory on startup (default: %u)</source>
+        <translation>Alege dosarul de date la pornire (implicit: %u)</translation>
+    </message>
+    <message>
+        <source>Set language, for example "de_DE" (default: system locale)</source>
+        <translation>Setează limba, de exemplu: "ro_RO" (implicit: sistem local)</translation>
+    </message>
+    <message>
+        <source>Start minimized</source>
+        <translation>Porniţi minimizat</translation>
+    </message>
+    <message>
+        <source>Set SSL root certificates for payment request (default: -system-)</source>
+        <translation>Setare rădăcină certificat SSL pentru cerere de plată (implicit: -sistem- )</translation>
+    </message>
+    <message>
+        <source>Show splash screen on startup (default: %u)</source>
+        <translation>Afişează ecran splash la pornire (implicit: %u)</translation>
+    </message>
+    <message>
+        <source>Reset all settings changes made over the GUI</source>
+        <translation>Resetează toate schimbările făcute în GUI</translation>
+    </message>
+</context>
 <context>
     <name>Intro</name>
     <message>
@@ -1011,6 +1047,10 @@
         <source>&amp;Network</source>
         <translation>Reţea</translation>
     </message>
+    <message>
+        <source>Automatically start Bitcoin Core after logging in to the system.</source>
+        <translation>Porneşte automat Bitcoin Core după logarea în sistem.</translation>
+    </message>
     <message>
         <source>&amp;Start Bitcoin Core on system login</source>
         <translation>Porneşte Nucleul Bitcoin la pornirea sistemului</translation>
@@ -1067,6 +1107,18 @@
         <source>Port of the proxy (e.g. 9050)</source>
         <translation>Portul proxy (de exemplu: 9050)</translation>
     </message>
+    <message>
+        <source>IPv4</source>
+        <translation>IPv4</translation>
+    </message>
+    <message>
+        <source>IPv6</source>
+        <translation>IPv6</translation>
+    </message>
+    <message>
+        <source>Tor</source>
+        <translation>Tor</translation>
+    </message>
     <message>
         <source>&amp;Window</source>
         <translation>&amp;Fereastră</translation>
@@ -1312,6 +1364,10 @@
         <source>User Agent</source>
         <translation>Agent utilizator</translation>
     </message>
+    <message>
+        <source>Node/Service</source>
+        <translation>Nod/Serviciu</translation>
+    </message>
     <message>
         <source>Ping Time</source>
         <translation>Timp ping</translation>
@@ -1401,10 +1457,6 @@
         <source>General</source>
         <translation>General</translation>
     </message>
-    <message>
-        <source>Using OpenSSL version</source>
-        <translation>Foloseşte OpenSSL versiunea</translation>
-    </message>
     <message>
         <source>Using BerkeleyDB version</source>
         <translation>Foloseşte BerkeleyDB versiunea</translation>
@@ -1433,6 +1485,14 @@
         <source>Current number of blocks</source>
         <translation>Numărul curent de blocuri</translation>
     </message>
+    <message>
+        <source>Current number of transactions</source>
+        <translation>Numărul curent de tranzacţii</translation>
+    </message>
+    <message>
+        <source>Memory usage</source>
+        <translation>Memorie folosită</translation>
+    </message>
     <message>
         <source>Received</source>
         <translation>Recepţionat</translation>
@@ -1449,6 +1509,10 @@
         <source>Select a peer to view detailed information.</source>
         <translation>Selectaţi un partener pentru a vedea informaţiile detaliate.</translation>
     </message>
+    <message>
+        <source>Whitelisted</source>
+        <translation>Whitelisted</translation>
+    </message>
     <message>
         <source>Direction</source>
         <translation>Direcţie</translation>
@@ -1457,6 +1521,18 @@
         <source>Version</source>
         <translation>Versiune</translation>
     </message>
+    <message>
+        <source>Starting Block</source>
+        <translation>Bloc de început</translation>
+    </message>
+    <message>
+        <source>Synced Headers</source>
+        <translation>Headere Sincronizate</translation>
+    </message>
+    <message>
+        <source>Synced Blocks</source>
+        <translation>Blocuri Sincronizate</translation>
+    </message>
     <message>
         <source>User Agent</source>
         <translation>Agent utilizator</translation>
@@ -1525,6 +1601,26 @@
         <source>Clear console</source>
         <translation>Curăţă consola</translation>
     </message>
+    <message>
+        <source>&amp;Disconnect Node</source>
+        <translation>&amp;Deconectare nod</translation>
+    </message>
+    <message>
+        <source>1 &amp;hour</source>
+        <translation>1 &amp;oră</translation>
+    </message>
+    <message>
+        <source>1 &amp;day</source>
+        <translation>1 &amp;zi</translation>
+    </message>
+    <message>
+        <source>1 &amp;week</source>
+        <translation>1 &amp;săptămână</translation>
+    </message>
+    <message>
+        <source>1 &amp;year</source>
+        <translation>1 &amp;an</translation>
+    </message>
     <message>
         <source>Welcome to the Bitcoin Core RPC console.</source>
         <translation>Bun venit la consola Nucleului Bitcoin RPC.</translation>
@@ -1569,6 +1665,14 @@
         <source>Outbound</source>
         <translation>Ieşire</translation>
     </message>
+    <message>
+        <source>Yes</source>
+        <translation>Da</translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation>Nu</translation>
+    </message>
     <message>
         <source>Unknown</source>
         <translation>Necunoscut</translation>
@@ -1917,6 +2021,10 @@
         <source>Copy change</source>
         <translation>Copiază rest</translation>
     </message>
+    <message>
+        <source>Total Amount %1</source>
+        <translation>Suma totală %1</translation>
+    </message>
     <message>
         <source>or</source>
         <translation>sau</translation>
@@ -1949,6 +2057,10 @@
         <source>The recipient address is not valid. Please recheck.</source>
         <translation>Adresa destinatarului nu este validă, vă rugăm să o verificaţi.</translation>
     </message>
+    <message>
+        <source>Duplicate address found: addresses should only be used once each.</source>
+        <translation>Adresă duplicat găsită: fiecare adresă ar trebui folosită o singură dată.</translation>
+    </message>
     <message>
         <source>Warning: Invalid Bitcoin address</source>
         <translation>Atenţie: Adresa bitcoin nevalidă!</translation>
@@ -2317,7 +2429,7 @@
     </message>
     <message>
         <source>Generated coins must mature %1 blocks before they can be spent. When you generated this block, it was broadcast to the network to be added to the block chain. If it fails to get into the chain, its state will change to "not accepted" and it won't be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source>
-        <translation>Monezile generate trebuie să crească %1 blocuri înainte să poată fi cheltuite. Cînd aţi generat acest bloc, a fost transmis reţelei pentru a fi adaugat la lanţul de blocuri. Aceasta  se poate întîmpla ocazional dacă alt nod generează un bloc la numai cîteva secunde de al dvs.</translation>
+        <translation>Monedele generate trebuie să crească %1 blocuri înainte să poată fi cheltuite. Cînd aţi generat acest bloc, a fost transmis reţelei pentru a fi adaugat la lanţul de blocuri. Aceasta se poate întîmpla ocazional dacă alt nod generează un bloc la numai cîteva secunde de al dvs.</translation>
     </message>
     <message>
         <source>Debug information</source>
diff --git a/src/qt/locale/bitcoin_ru.ts b/src/qt/locale/bitcoin_ru.ts
index 00dfd833abfa2..b4546a21578f4 100644
--- a/src/qt/locale/bitcoin_ru.ts
+++ b/src/qt/locale/bitcoin_ru.ts
@@ -1473,10 +1473,6 @@
         <source>General</source>
         <translation>Общие</translation>
     </message>
-    <message>
-        <source>Using OpenSSL version</source>
-        <translation>Используется версия OpenSSL</translation>
-    </message>
     <message>
         <source>Using BerkeleyDB version</source>
         <translation>Используется версия BerkeleyDB</translation>
@@ -2995,6 +2991,10 @@
         <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source>
         <translation>Выполнить команду, когда меняется транзакция в бумажнике (%s в команде заменяется на TxID)</translation>
     </message>
+    <message>
+        <source>Force relay of transactions from whitelisted peers even they violate local relay policy (default: %d)</source>
+        <translation>Всегда разрешать транзакции, полученные от участников из белого списка (по умолчанию: %d)</translation>
+    </message>
     <message>
         <source>Set the number of script verification threads (%u to %d, 0 = auto, &lt;0 = leave that many cores free, default: %d)</source>
         <translation>Задать число потоков проверки скрипта (от %u до %d, 0=авто, &lt;0 = оставить столько ядер свободными, по умолчанию: %d)</translation>
@@ -3027,6 +3027,10 @@
         <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source>
         <translation>Внимание: похоже, в сети нет полного согласия! Некоторый майнеры, возможно, испытывают проблемы.</translation>
     </message>
+    <message>
+        <source>Warning: Unknown block versions being mined! It's possible unknown rules are in effect</source>
+        <translation>Внимание: Получена неизвестная версия блока! Возможно неизвестные правила вступили в силу.</translation>
+    </message>
     <message>
         <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source>
         <translation>Внимание: мы не полностью согласны с подключенными участниками! Вам или другим участникам, возможно, следует обновиться.</translation>
@@ -3047,6 +3051,10 @@
         <source>&lt;category&gt; can be:</source>
         <translation>&lt;category&gt; может быть:</translation>
     </message>
+    <message>
+        <source>Append comment to the user agent string</source>
+        <translation>Добавить комментарий к строке пользовательского агента</translation>
+    </message>
     <message>
         <source>Block creation options:</source>
         <translation>Параметры создания блоков:</translation>
@@ -3131,6 +3139,10 @@
         <source>Keep the transaction memory pool below &lt;n&gt; megabytes (default: %u)</source>
         <translation>Сбрасывать транзакции из памяти на диск каждые &lt;n&gt; мегабайт (по умолчанию: %u)</translation>
     </message>
+    <message>
+        <source>Location of the auth cookie (default: data dir)</source>
+        <translation>Расположение куки входы(по умолчанию: data dir)</translation>
+    </message>
     <message>
         <source>Not enough file descriptors available.</source>
         <translation>Недостаточно файловых дескрипторов.</translation>
@@ -3139,6 +3151,10 @@
         <source>Only connect to nodes in network &lt;net&gt; (ipv4, ipv6 or onion)</source>
         <translation>Соединяться только по сети &lt;net&gt; (ipv4, ipv6 или onion)</translation>
     </message>
+    <message>
+        <source>Print version and exit</source>
+        <translation>Написать версию и выйти</translation>
+    </message>
     <message>
         <source>Prune cannot be configured with a negative value.</source>
         <translation>Удаление блоков не может использовать отрицательное значение.</translation>
@@ -3195,10 +3211,6 @@
         <source>Wallet options:</source>
         <translation>Настройки бумажника:</translation>
     </message>
-    <message>
-        <source>Warning: This version is obsolete; upgrade required!</source>
-        <translation>Внимание: эта версия устарела; требуется обновление!</translation>
-    </message>
     <message>
         <source>You need to rebuild the database using -reindex to change -txindex</source>
         <translation>Вам необходимо пересобрать базы данных с помощью -reindex, чтобы изменить -txindex</translation>
@@ -3295,10 +3307,6 @@
         <source>Activating best chain...</source>
         <translation>Активируется лучшая цепь...</translation>
     </message>
-    <message>
-        <source>Always relay transactions received from whitelisted peers (default: %d)</source>
-        <translation>Всегда транслировать транзакции, полученные из белого списка участников (по умолчанию: %d)</translation>
-    </message>
     <message>
         <source>Attempt to recover private keys from a corrupt wallet.dat on startup</source>
         <translation>Попытаться восстановить приватные ключи из повреждённого wallet.dat при запуске</translation>
@@ -3463,6 +3471,10 @@
         <source>Warning</source>
         <translation>Внимание</translation>
     </message>
+    <message>
+        <source>Warning: unknown new rules activated (versionbit %i)</source>
+        <translation>Внимание: неизвестные правила вступили в силу(versionbit %i)</translation>
+    </message>
     <message>
         <source>Whether to operate in a blocks only mode (default: %u)</source>
         <translation>Будет работать в режиме только блоков (по умолчанию: %u)</translation>
diff --git a/src/qt/locale/bitcoin_ru_RU.ts b/src/qt/locale/bitcoin_ru_RU.ts
index 53a1c1d8a40b9..41e467e496e82 100644
--- a/src/qt/locale/bitcoin_ru_RU.ts
+++ b/src/qt/locale/bitcoin_ru_RU.ts
@@ -1,6 +1,50 @@
 <TS language="ru_RU" version="2.1">
 <context>
     <name>AddressBookPage</name>
+    <message>
+        <source>Create a new address</source>
+        <translation>Создать новый адрес</translation>
+    </message>
+    <message>
+        <source>&amp;New</source>
+        <translation>Новый</translation>
+    </message>
+    <message>
+        <source>Copy the currently selected address to the system clipboard</source>
+        <translation>Copy the currently selected address to the system clipboardый адрес в буфер</translation>
+    </message>
+    <message>
+        <source>&amp;Copy</source>
+        <translation>Копировать</translation>
+    </message>
+    <message>
+        <source>C&amp;lose</source>
+        <translation>Закрыть</translation>
+    </message>
+    <message>
+        <source>&amp;Copy Address</source>
+        <translation>Копировать адрес</translation>
+    </message>
+    <message>
+        <source>Delete the currently selected address from the list</source>
+        <translation>Удалить выбранный адрес из списка</translation>
+    </message>
+    <message>
+        <source>Export the data in the current tab to a file</source>
+        <translation>Экспортировать данные текущей вкладки в файл</translation>
+    </message>
+    <message>
+        <source>&amp;Export</source>
+        <translation>Экспортировать</translation>
+    </message>
+    <message>
+        <source>&amp;Delete</source>
+        <translation>Удалить</translation>
+    </message>
+    <message>
+        <source>C&amp;hoose</source>
+        <translation>Выбрать</translation>
+    </message>
     </context>
 <context>
     <name>AddressTableModel</name>
@@ -226,6 +270,14 @@
     </context>
 <context>
     <name>WalletView</name>
+    <message>
+        <source>&amp;Export</source>
+        <translation>Экспорт</translation>
+    </message>
+    <message>
+        <source>Export the data in the current tab to a file</source>
+        <translation>Экспортировать данные текущей вкладки в файл</translation>
+    </message>
     </context>
 <context>
     <name>bitcoin-core</name>
diff --git a/src/qt/locale/bitcoin_sk.ts b/src/qt/locale/bitcoin_sk.ts
index 8c779cbe98665..9addbdaa8a10e 100644
--- a/src/qt/locale/bitcoin_sk.ts
+++ b/src/qt/locale/bitcoin_sk.ts
@@ -63,7 +63,7 @@
     </message>
     <message>
         <source>Receiving addresses</source>
-        <translation>Adresa prijatia</translation>
+        <translation>Prijímacia adresa</translation>
     </message>
     <message>
         <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source>
@@ -222,7 +222,15 @@
 </context>
 <context>
     <name>BanTableModel</name>
-    </context>
+    <message>
+        <source>IP/Netmask</source>
+        <translation>IP/Maska stiete</translation>
+    </message>
+    <message>
+        <source>Banned Until</source>
+        <translation>Blokovaný do</translation>
+    </message>
+</context>
 <context>
     <name>BitcoinGUI</name>
     <message>
@@ -874,7 +882,35 @@
         <source>command-line options</source>
         <translation>voľby príkazového riadku</translation>
     </message>
-    </context>
+    <message>
+        <source>UI Options:</source>
+        <translation>Možnosti používateľského rozhrania:</translation>
+    </message>
+    <message>
+        <source>Choose data directory on startup (default: %u)</source>
+        <translation>Vyberte dátový priečinok pri štarte (predvolené: %u)</translation>
+    </message>
+    <message>
+        <source>Set language, for example "de_DE" (default: system locale)</source>
+        <translation>Nastavte jazyk, napríklad "de_DE" (predvolené: podľa systému)</translation>
+    </message>
+    <message>
+        <source>Start minimized</source>
+        <translation>Spustiť minimalizované</translation>
+    </message>
+    <message>
+        <source>Set SSL root certificates for payment request (default: -system-)</source>
+        <translation>Nastaviť SSL root certifikáty pre vyžiadanie platby (predvolené: -system-)</translation>
+    </message>
+    <message>
+        <source>Show splash screen on startup (default: %u)</source>
+        <translation>Zobraziť uvítaciu obrazovku pri štarte (predvolené: %u)</translation>
+    </message>
+    <message>
+        <source>Reset all settings changes made over the GUI</source>
+        <translation>Reštartovať všetky nastavenia urobené v používateľskom rozhraní.</translation>
+    </message>
+</context>
 <context>
     <name>Intro</name>
     <message>
@@ -1009,7 +1045,7 @@
     </message>
     <message>
         <source>&amp;Network</source>
-        <translation>Sieť</translation>
+        <translation>&amp;Sieť</translation>
     </message>
     <message>
         <source>Automatically start Bitcoin Core after logging in to the system.</source>
@@ -1025,7 +1061,7 @@
     </message>
     <message>
         <source>W&amp;allet</source>
-        <translation>Peňaženka</translation>
+        <translation>&amp;Peňaženka</translation>
     </message>
     <message>
         <source>Expert</source>
@@ -1071,13 +1107,37 @@
         <source>Port of the proxy (e.g. 9050)</source>
         <translation>Port proxy (napr. 9050)</translation>
     </message>
+    <message>
+        <source>Used for reaching peers via:</source>
+        <translation>Použité pre získavanie peerov cez:</translation>
+    </message>
+    <message>
+        <source>Shows, if the supplied default SOCKS5 proxy is used to reach peers via this network type.</source>
+        <translation>Zobrazuje, či je poskytované predvolené SOCKS5 proxy používané pre získavanie peerov cez tento typ siete.</translation>
+    </message>
+    <message>
+        <source>IPv4</source>
+        <translation>IPv4</translation>
+    </message>
+    <message>
+        <source>IPv6</source>
+        <translation>IPv6</translation>
+    </message>
+    <message>
+        <source>Tor</source>
+        <translation>Tor</translation>
+    </message>
+    <message>
+        <source>Connect to the Bitcoin network through a separate SOCKS5 proxy for Tor hidden services.</source>
+        <translation>Pripojiť k Bitcoinovej sieti cez separované SOCKS5 proxy pre skrytú službu Tor.</translation>
+    </message>
     <message>
         <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services:</source>
         <translation>Použiť samostatný SOCKS5 proxy server na dosiahnutie počítačov cez skryté služby Tor:</translation>
     </message>
     <message>
         <source>&amp;Window</source>
-        <translation>Okno</translation>
+        <translation>&amp;Okno</translation>
     </message>
     <message>
         <source>Show only a tray icon after minimizing the window.</source>
@@ -1093,7 +1153,7 @@
     </message>
     <message>
         <source>&amp;Display</source>
-        <translation>&amp;Displej</translation>
+        <translation>&amp;Zobrazenie</translation>
     </message>
     <message>
         <source>User Interface &amp;language:</source>
@@ -1413,10 +1473,6 @@
         <source>General</source>
         <translation>Všeobecné</translation>
     </message>
-    <message>
-        <source>Using OpenSSL version</source>
-        <translation>Používa OpenSSL verziu</translation>
-    </message>
     <message>
         <source>Using BerkeleyDB version</source>
         <translation>Používa BerkeleyDB verziu</translation>
@@ -1445,6 +1501,18 @@
         <source>Current number of blocks</source>
         <translation>Aktuálny počet blokov</translation>
     </message>
+    <message>
+        <source>Memory Pool</source>
+        <translation>Pamäť Poolu</translation>
+    </message>
+    <message>
+        <source>Current number of transactions</source>
+        <translation>Aktuálny počet tranzakcií</translation>
+    </message>
+    <message>
+        <source>Memory usage</source>
+        <translation>Využitie pamäte</translation>
+    </message>
     <message>
         <source>Open the Bitcoin Core debug log file from the current data directory. This can take a few seconds for large log files.</source>
         <translation>Otvoriť Bitcoin log súbor pre ladenie z aktuálneho dátového adresára. Toto môže trvať niekoľko sekúnd pre veľké súbory.</translation>
@@ -1461,10 +1529,18 @@
         <source>&amp;Peers</source>
         <translation>&amp;Partneri</translation>
     </message>
+    <message>
+        <source>Banned peers</source>
+        <translation>Zablokované spojenia</translation>
+    </message>
     <message>
         <source>Select a peer to view detailed information.</source>
         <translation>Vyberte počítač pre zobrazenie podrobností.</translation>
     </message>
+    <message>
+        <source>Whitelisted</source>
+        <translation>Povolené</translation>
+    </message>
     <message>
         <source>Direction</source>
         <translation>Smer</translation>
@@ -1473,6 +1549,19 @@
         <source>Version</source>
         <translation>Verzia</translation>
     </message>
+    <message>
+        <source>Starting Block</source>
+        <translation>Počiatočný Blok</translation>
+    </message>
+    <message>
+        <source>Synced Headers</source>
+        <translation>Synchronizované hlavičky
+</translation>
+    </message>
+    <message>
+        <source>Synced Blocks</source>
+        <translation>Synchronizované bloky</translation>
+    </message>
     <message>
         <source>User Agent</source>
         <translation>Aplikácia</translation>
@@ -1501,6 +1590,10 @@
         <source>Ping Time</source>
         <translation>Čas odozvy</translation>
     </message>
+    <message>
+        <source>Ping Wait</source>
+        <translation>Čakanie na ping</translation>
+    </message>
     <message>
         <source>Time Offset</source>
         <translation>Časový posun</translation>
@@ -1549,6 +1642,34 @@
         <source>Clear console</source>
         <translation>Vymazať konzolu</translation>
     </message>
+    <message>
+        <source>&amp;Disconnect Node</source>
+        <translation>&amp;Odpojené uzly</translation>
+    </message>
+    <message>
+        <source>Ban Node for</source>
+        <translation>Blokovať uzol na</translation>
+    </message>
+    <message>
+        <source>1 &amp;hour</source>
+        <translation>1 &amp;hodinu</translation>
+    </message>
+    <message>
+        <source>1 &amp;day</source>
+        <translation>1 &amp;deň</translation>
+    </message>
+    <message>
+        <source>1 &amp;week</source>
+        <translation>1 &amp;týždeň</translation>
+    </message>
+    <message>
+        <source>1 &amp;year</source>
+        <translation>1 &amp;rok</translation>
+    </message>
+    <message>
+        <source>&amp;Unban Node</source>
+        <translation>&amp;odblokovať uzol</translation>
+    </message>
     <message>
         <source>Welcome to the Bitcoin Core RPC console.</source>
         <translation>Vitajte v RPC konzole pre Jadro Bitcoin.</translation>
@@ -1577,6 +1698,10 @@
         <source>%1 GB</source>
         <translation>%1 GB</translation>
     </message>
+    <message>
+        <source>(node id: %1)</source>
+        <translation>(ID uzlu: %1)</translation>
+    </message>
     <message>
         <source>via %1</source>
         <translation>cez %1</translation>
@@ -1593,6 +1718,14 @@
         <source>Outbound</source>
         <translation>Odchádzajúce</translation>
     </message>
+    <message>
+        <source>Yes</source>
+        <translation>Áno</translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation>Nie</translation>
+    </message>
     <message>
         <source>Unknown</source>
         <translation>neznámy</translation>
@@ -1961,6 +2094,10 @@
         <source>Copy change</source>
         <translation>Kopírovať zmenu</translation>
     </message>
+    <message>
+        <source>Total Amount %1</source>
+        <translation>Celkové množstvo %1</translation>
+    </message>
     <message>
         <source>or</source>
         <translation>alebo</translation>
@@ -1993,6 +2130,10 @@
         <source>Payment request expired.</source>
         <translation>Vypršala platnosť požiadavky na platbu.</translation>
     </message>
+    <message>
+        <source>Pay only the required fee of %1</source>
+        <translation>Zaplatiť len vyžadovaný poplatok z %1</translation>
+    </message>
     <message>
         <source>The recipient address is not valid. Please recheck.</source>
         <translation>Adresa príjemcu je neplatná. Prosím, overte ju.</translation>
@@ -2072,6 +2213,10 @@
         <source>Remove this entry</source>
         <translation>Odstrániť túto položku</translation>
     </message>
+    <message>
+        <source>The fee will be deducted from the amount being sent. The recipient will receive less bitcoins than you enter in the amount field. If multiple recipients are selected, the fee is split equally.</source>
+        <translation>Poplatok sa odpočíta od čiastky, ktorú odosielate. Príjemca dostane menej bitcoinov ako zadáte. Ak je vybraných viacero príjemcov, poplatok je rozdelený rovným dielom.</translation>
+    </message>
     <message>
         <source>S&amp;ubtract fee from amount</source>
         <translation>Odpočítať poplatok od s&amp;umy</translation>
@@ -2126,6 +2271,10 @@
         <source>&amp;Sign Message</source>
         <translation>&amp;Podpísať Správu</translation>
     </message>
+    <message>
+        <source>The Bitcoin address to sign the message with</source>
+        <translation>Bitcoin adresa pre podpísanie správy s</translation>
+    </message>
     <message>
         <source>Choose previously used address</source>
         <translation>Vybrať predtým použitú adresu</translation>
@@ -2600,6 +2749,10 @@
         <source>Copy transaction ID</source>
         <translation>Kopírovať ID transakcie</translation>
     </message>
+    <message>
+        <source>Copy raw transaction</source>
+        <translation>Kopírovať celú tranzakciu</translation>
+    </message>
     <message>
         <source>Edit label</source>
         <translation>Editovať popis</translation>
@@ -2747,10 +2900,30 @@
         <source>Accept command line and JSON-RPC commands</source>
         <translation>Prijímať príkazy z príkazového riadku a JSON-RPC</translation>
     </message>
+    <message>
+        <source>Please check that your computer's date and time are correct! If your clock is wrong Bitcoin Core will not work properly.</source>
+        <translation>Skontrolujte správnosť nastavenia dátumu a času na vašom počítači! Ak je čas nesprávny Jadro Bitcoin nebude správne fungovať.</translation>
+    </message>
+    <message>
+        <source>Error: A fatal internal error occurred, see debug.log for details</source>
+        <translation>Chyba: Vyskytla sa interná chyba, pre viac informácií zobrazte debug.log</translation>
+    </message>
+    <message>
+        <source>Fee (in %s/kB) to add to transactions you send (default: %s)</source>
+        <translation>Poplatok (za %s/kB) pridaný do tranzakcie, ktorú posielate (predvolené: %s)</translation>
+    </message>
+    <message>
+        <source>Pruning blockstore...</source>
+        <translation>Redukovanie blockstore...</translation>
+    </message>
     <message>
         <source>Run in the background as a daemon and accept commands</source>
         <translation>Bežať na pozadí ako démon a prijímať príkazy</translation>
     </message>
+    <message>
+        <source>Unable to start HTTP server. See debug log for details.</source>
+        <translation>Nepodarilo sa spustiť HTTP server. Pre viac detailov zobrazte debug log.</translation>
+    </message>
     <message>
         <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
         <translation>Prijať spojenia zvonku (predvolené: 1 ak žiadne -proxy alebo -connect)</translation>
@@ -2783,6 +2956,14 @@
         <source>Unable to bind to %s on this computer. Bitcoin Core is probably already running.</source>
         <translation>Nepodarilo sa pripojiť na %s na tomto počítači. Bitcoin Jadro je už pravdepodobne spustené.</translation>
     </message>
+    <message>
+        <source>WARNING: abnormally high number of blocks generated, %d blocks received in the last %d hours (%d expected)</source>
+        <translation>VAROVANIE: príliš veľa vygenerovaných blokov; %d prijatých blokov v posledných %d hodinách (očakávaných %d)</translation>
+    </message>
+    <message>
+        <source>WARNING: check your network connection, %d blocks received in the last %d hours (%d expected)</source>
+        <translation>VAROVANIE: skontrolujte sieťové pripojenie, %d prijatých blokov za posledných %d hodín (očakávané %d)</translation>
+    </message>
     <message>
         <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source>
         <translation>Varovanie: Javí sa že sieť sieť úplne nesúhlasí! Niektorí mineri zjavne majú ťažkosti.
@@ -2801,6 +2982,10 @@ The network does not appear to fully agree! Some miners appear to be experiencin
         <source>Whitelist peers connecting from the given netmask or IP address. Can be specified multiple times.</source>
         <translation>Uzle na zoznam povolených, ktoré sa pripájajú z danej netmask alebo IP adresy. Môže byť zadané viac krát.</translation>
     </message>
+    <message>
+        <source>-maxmempool must be at least %d MB</source>
+        <translation>-maxmempool musí byť najmenej %d MB</translation>
+    </message>
     <message>
         <source>&lt;category&gt; can be:</source>
         <translation>&lt;category&gt; môže byť:</translation>
@@ -2833,6 +3018,18 @@ The network does not appear to fully agree! Some miners appear to be experiencin
         <source>Do you want to rebuild the block database now?</source>
         <translation>Chcete znovu zostaviť databázu blokov?</translation>
     </message>
+    <message>
+        <source>Enable publish hash block in &lt;address&gt;</source>
+        <translation>Povoliť zverejneneie hash blokov pre &lt;address&gt;</translation>
+    </message>
+    <message>
+        <source>Enable publish hash transaction in &lt;address&gt;</source>
+        <translation>Povoliť zverejnenie hash tranzakcií pre &lt;address&gt;</translation>
+    </message>
+    <message>
+        <source>Enable publish raw block in &lt;address&gt;</source>
+        <translation>Povoliť zverejnenie raw bloku pre &lt;address&gt;</translation>
+    </message>
     <message>
         <source>Error initializing block database</source>
         <translation>Chyba inicializácie databázy blokov</translation>
@@ -2869,6 +3066,10 @@ The network does not appear to fully agree! Some miners appear to be experiencin
         <source>Invalid -onion address: '%s'</source>
         <translation>Neplatná -onion adresa:  '%s'</translation>
     </message>
+    <message>
+        <source>Invalid amount for -fallbackfee=&lt;amount&gt;: '%s'</source>
+        <translation>Neplatná suma pre -fallbackfee=&lt;amount&gt;: '%s'</translation>
+    </message>
     <message>
         <source>Not enough file descriptors available.</source>
         <translation>Nedostatok kľúčových slov súboru.</translation>
@@ -2877,6 +3078,14 @@ The network does not appear to fully agree! Some miners appear to be experiencin
         <source>Only connect to nodes in network &lt;net&gt; (ipv4, ipv6 or onion)</source>
         <translation>Pripojiť iba k uzlom v sieti &lt;net&gt; (ipv4, ipv6, alebo onion)</translation>
     </message>
+    <message>
+        <source>Prune cannot be configured with a negative value.</source>
+        <translation>Redukovanie nemôže byť nastavené na zápornú hodnotu.</translation>
+    </message>
+    <message>
+        <source>Prune mode is incompatible with -txindex.</source>
+        <translation>Redukovanie je nekompatibilné s -txindex.</translation>
+    </message>
     <message>
         <source>Set database cache size in megabytes (%d to %d, default: %d)</source>
         <translation>Nastaviť veľkosť pomocnej pamäti databázy v megabajtoch (%d do %d, prednastavené: %d)</translation>
@@ -2889,6 +3098,18 @@ The network does not appear to fully agree! Some miners appear to be experiencin
         <source>Specify wallet file (within data directory)</source>
         <translation>Označ súbor peňaženky (v priečinku s dátami)</translation>
     </message>
+    <message>
+        <source>Unsupported argument -benchmark ignored, use -debug=bench.</source>
+        <translation>Nepodporovaný parameter -benchmark bol ignorovaný, použite -debug=bench.</translation>
+    </message>
+    <message>
+        <source>Unsupported argument -debugnet ignored, use -debug=net.</source>
+        <translation>Nepodporovaný argument -debugnet bol ignorovaný, použite -debug=net.</translation>
+    </message>
+    <message>
+        <source>Unsupported argument -tor found, use -onion.</source>
+        <translation>Nepodporovaný argument -tor, použite -onion.</translation>
+    </message>
     <message>
         <source>Use UPnP to map the listening port (default: %u)</source>
         <translation>Použiť UPnP pre mapovanie počúvajúceho portu (predvolené: %u)</translation>
@@ -2933,6 +3154,10 @@ The network does not appear to fully agree! Some miners appear to be experiencin
         <source>Create new files with system default permissions, instead of umask 077 (only effective with disabled wallet functionality)</source>
         <translation>Vytvoriť nové súbory z predvolenými systémovými právami, namiesto umask 077 (funguje iba z vypnutou funkcionalitou peňaženky)</translation>
     </message>
+    <message>
+        <source>Discover own IP addresses (default: 1 when listening and no -externalip or -proxy)</source>
+        <translation>Zisti vlastnú IP adresu (predvolené: 1 pre listen a -externalip alebo -proxy)</translation>
+    </message>
     <message>
         <source>Error: Listening for incoming connections failed (listen returned error %s)</source>
         <translation>Chyba: Počúvanie prichádzajúcich spojení zlyhalo (vrátená chyba je %s)</translation>
@@ -2965,6 +3190,10 @@ The network does not appear to fully agree! Some miners appear to be experiencin
         <source>Set the number of threads for coin generation if enabled (-1 = all cores, default: %d)</source>
         <translation>Nastaviť počet vlákien pre generáciu mincí (-1 = všetky jadrá, predvolené: %d)</translation>
     </message>
+    <message>
+        <source>The transaction amount is too small to send after the fee has been deducted</source>
+        <translation>Suma je príliš malá pre odoslanie tranzakcie</translation>
+    </message>
     <message>
         <source>This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit &lt;https://www.openssl.org/&gt; and cryptographic software written by Eric Young and UPnP software written by Thomas Bernard.</source>
         <translation>Tento produkt obsahuje softvér vyvinutý projektom OpenSSL pre použitie sady nástrojov OpenSSL &lt;https://www.openssl.org/&gt; a kryptografického softvéru napísaného Eric Young a UPnP softvér napísaný Thomas Bernard.</translation>
@@ -2981,6 +3210,18 @@ The network does not appear to fully agree! Some miners appear to be experiencin
         <source>Accept public REST requests (default: %u)</source>
         <translation>Akceptovať verejné REST žiadosti (predvolené: %u)</translation>
     </message>
+    <message>
+        <source>Activating best chain...</source>
+        <translation>Aktivácia najlepšej reťaze...</translation>
+    </message>
+    <message>
+        <source>Attempt to recover private keys from a corrupt wallet.dat on startup</source>
+        <translation>Pokus o obnovenie privátnych kľúčov z poškodenej wallet.dat pri spustení</translation>
+    </message>
+    <message>
+        <source>Automatically create Tor hidden service (default: %d)</source>
+        <translation>Automaticky vytvoriť skrytú službu Tor (predvolené: %d)</translation>
+    </message>
     <message>
         <source>Cannot resolve -whitebind address: '%s'</source>
         <translation>Nedá sa vyriešiť -whitebind adresa: '%s'</translation>
@@ -3001,10 +3242,18 @@ The network does not appear to fully agree! Some miners appear to be experiencin
         <source>Error reading from database, shutting down.</source>
         <translation>Chyba pri načítaní z databázy, ukončuje sa.</translation>
     </message>
+    <message>
+        <source>Imports blocks from external blk000??.dat file on startup</source>
+        <translation>Importovať bloky z externého súboru blk000??.dat pri štarte</translation>
+    </message>
     <message>
         <source>Information</source>
         <translation>Informácia</translation>
     </message>
+    <message>
+        <source>Initialization sanity check failed. Bitcoin Core is shutting down.</source>
+        <translation>Inicializačná kontrola zlyhala. Jadro Bitcoin sa ukončuje.</translation>
+    </message>
     <message>
         <source>Invalid amount for -maxtxfee=&lt;amount&gt;: '%s'</source>
         <translation>Neplatná suma pre -maxtxfee=&lt;amount&gt;: '%s'</translation>
@@ -3065,10 +3314,18 @@ The network does not appear to fully agree! Some miners appear to be experiencin
         <source>Signing transaction failed</source>
         <translation>Podpísanie správy zlyhalo</translation>
     </message>
+    <message>
+        <source>The transaction amount is too small to pay the fee</source>
+        <translation>Suma tranzakcie je príliš malá na zaplatenie poplatku</translation>
+    </message>
     <message>
         <source>This is experimental software.</source>
         <translation>Toto je experimentálny softvér.</translation>
     </message>
+    <message>
+        <source>Tor control port password (default: empty)</source>
+        <translation>Heslo na kontrolu portu pre Tor (predvolené: žiadne)</translation>
+    </message>
     <message>
         <source>Transaction amount too small</source>
         <translation>Suma transakcie príliš malá</translation>
@@ -3089,10 +3346,18 @@ The network does not appear to fully agree! Some miners appear to be experiencin
         <source>Unable to bind to %s on this computer (bind returned error %s)</source>
         <translation>Na tomto počítači sa nedá vytvoriť väzba %s (vytvorenie väzby vrátilo chybu %s)</translation>
     </message>
+    <message>
+        <source>Upgrade wallet to latest format on startup</source>
+        <translation>Aktualizovať peňaženku na posledný formát pri štarte</translation>
+    </message>
     <message>
         <source>Username for JSON-RPC connections</source>
         <translation>Užívateľské meno pre JSON-RPC spojenia</translation>
     </message>
+    <message>
+        <source>Wallet needed to be rewritten: restart Bitcoin Core to complete</source>
+        <translation>Peňaženka musí byť prepísaná: pre dokončenie reštartujte Jadro Bitcoin</translation>
+    </message>
     <message>
         <source>Warning</source>
         <translation>Upozornenie</translation>
diff --git a/src/qt/locale/bitcoin_sl_SI.ts b/src/qt/locale/bitcoin_sl_SI.ts
index c62c8cf273054..1b540a7310f08 100644
--- a/src/qt/locale/bitcoin_sl_SI.ts
+++ b/src/qt/locale/bitcoin_sl_SI.ts
@@ -427,7 +427,7 @@
     </message>
     <message numerus="yes">
         <source>%n active connection(s) to Bitcoin network</source>
-        <translation><numerusform>%n aktivna povezava v bitcoin omrežje</numerusform><numerusform>%n aktivni povezavi v bitcoin omrežje</numerusform><numerusform>%n aktivne povezave v bitcoin omrežje</numerusform><numerusform>%n aktivnih povezav v bitcoin omrežje</numerusform></translation>
+        <translation><numerusform>%n aktivna povezava v omrežje Bitcoin</numerusform><numerusform>%n aktivni povezavi v omrežje Bitcoin</numerusform><numerusform>%n aktivne povezave v omrežje Bitcoin</numerusform><numerusform>%n aktivnih povezav v omrežje Bitcoin</numerusform></translation>
     </message>
     <message>
         <source>No block source available...</source>
@@ -463,7 +463,7 @@
     </message>
     <message>
         <source>Last received block was generated %1 ago.</source>
-        <translation>Zadnji prejeti blok je bil ustvarjen %1 nazaj.</translation>
+        <translation>Zadnji prejeti blok je star %1.</translation>
     </message>
     <message>
         <source>Transactions after this will not yet be visible.</source>
@@ -1322,7 +1322,7 @@
     </message>
     <message>
         <source>Node/Service</source>
-        <translation>Vozlišče/Storitev</translation>
+        <translation>Naslov</translation>
     </message>
     <message>
         <source>Ping Time</source>
@@ -1413,10 +1413,6 @@
         <source>General</source>
         <translation>Splošno</translation>
     </message>
-    <message>
-        <source>Using OpenSSL version</source>
-        <translation>OpenSSL različica v rabi</translation>
-    </message>
     <message>
         <source>Using BerkeleyDB version</source>
         <translation>BerkeleyDB različica v rabi</translation>
@@ -2437,7 +2433,7 @@
     </message>
     <message numerus="yes">
         <source>Open for %n more block(s)</source>
-        <translation><numerusform>Odprto še %n blok</numerusform><numerusform>Odprto še %n bloka</numerusform><numerusform>Odprto še %n bloke</numerusform><numerusform>Odprto še %n blokov</numerusform></translation>
+        <translation><numerusform>Še %n blok do potrditve</numerusform><numerusform>Še %n bloka do potrditve</numerusform><numerusform>Še %n bloki do potrditve</numerusform><numerusform>Še %n blokov do potrditve</numerusform></translation>
     </message>
     <message>
         <source>unknown</source>
@@ -2471,7 +2467,7 @@
     </message>
     <message numerus="yes">
         <source>Open for %n more block(s)</source>
-        <translation><numerusform>Odprto še %n blok</numerusform><numerusform>Odprto še %n bloka</numerusform><numerusform>Odprto še %n bloke</numerusform><numerusform>Odprto še %n blokov</numerusform></translation>
+        <translation><numerusform>Še %n blok do potrditve</numerusform><numerusform>Še %n bloka do potrditve</numerusform><numerusform>Še %n bloki do potrditve</numerusform><numerusform>Še %n blokov do potrditve</numerusform></translation>
     </message>
     <message>
         <source>Open until %1</source>
@@ -2955,10 +2951,6 @@
         <source>Wallet options:</source>
         <translation>Izbire denarnice:</translation>
     </message>
-    <message>
-        <source>Warning: This version is obsolete; upgrade required!</source>
-        <translation>Opozorilo: Različica vašega odjemalca je zastarela. Potrebna je nadgradnja!</translation>
-    </message>
     <message>
         <source>You need to rebuild the database using -reindex to change -txindex</source>
         <translation>Ob spremembi vrednosti opcije -txindex boste morali obnoviti bazo podatkov z uporabo opcije -reindex</translation>
@@ -3009,7 +3001,7 @@
     </message>
     <message>
         <source>Activating best chain...</source>
-        <translation>Preklapljam na najboljšo verigo ...</translation>
+        <translation>Prehajam na najboljšo verigo ...</translation>
     </message>
     <message>
         <source>Cannot resolve -whitebind address: '%s'</source>
diff --git a/src/qt/locale/bitcoin_sq.ts b/src/qt/locale/bitcoin_sq.ts
index 994b065994e38..d87bd9db5811a 100644
--- a/src/qt/locale/bitcoin_sq.ts
+++ b/src/qt/locale/bitcoin_sq.ts
@@ -29,6 +29,10 @@
         <source>Delete the currently selected address from the list</source>
         <translation>Fshi adresen e selektuar nga lista</translation>
     </message>
+    <message>
+        <source>Export the data in the current tab to a file</source>
+        <translation>Eksporto të dhënat e skedës korrente në një skedar</translation>
+    </message>
     <message>
         <source>&amp;Delete</source>
         <translation>&amp;Fshi</translation>
@@ -790,6 +794,10 @@
 </context>
 <context>
     <name>WalletView</name>
+    <message>
+        <source>Export the data in the current tab to a file</source>
+        <translation>Eksporto të dhënat e skedës korrente në një skedar</translation>
+    </message>
     </context>
 <context>
     <name>bitcoin-core</name>
diff --git a/src/qt/locale/bitcoin_sr@latin.ts b/src/qt/locale/bitcoin_sr@latin.ts
new file mode 100644
index 0000000000000..c836c8ddbaedb
--- /dev/null
+++ b/src/qt/locale/bitcoin_sr@latin.ts
@@ -0,0 +1,653 @@
+<TS language="sr@latin" version="2.1">
+<context>
+    <name>AddressBookPage</name>
+    <message>
+        <source>Right-click to edit address or label</source>
+        <translation>Klikni desnim tasterom za uređivanje adrese ili oznake</translation>
+    </message>
+    <message>
+        <source>Create a new address</source>
+        <translation>Kreiraj novu adresu</translation>
+    </message>
+    <message>
+        <source>&amp;New</source>
+        <translation>&amp;Novi</translation>
+    </message>
+    <message>
+        <source>Copy the currently selected address to the system clipboard</source>
+        <translation>Kopiraj selektovanu adresu u sistemski klipbord</translation>
+    </message>
+    <message>
+        <source>&amp;Copy</source>
+        <translation>&amp;Kopiraj</translation>
+    </message>
+    <message>
+        <source>C&amp;lose</source>
+        <translation>Zatvori</translation>
+    </message>
+    <message>
+        <source>&amp;Copy Address</source>
+        <translation>Kopiraj adresu</translation>
+    </message>
+    <message>
+        <source>Delete the currently selected address from the list</source>
+        <translation>Briše trenutno izabranu adresu sa liste</translation>
+    </message>
+    <message>
+        <source>Export the data in the current tab to a file</source>
+        <translation>Izvoz podataka iz trenutne kartice u datoteku</translation>
+    </message>
+    <message>
+        <source>&amp;Export</source>
+        <translation>&amp;Izvoz</translation>
+    </message>
+    <message>
+        <source>&amp;Delete</source>
+        <translation>&amp;Izbrisati</translation>
+    </message>
+    <message>
+        <source>Choose the address to send coins to</source>
+        <translation>Izaberi adresu za slanje bitkoina</translation>
+    </message>
+    <message>
+        <source>Choose the address to receive coins with</source>
+        <translation>Izaberi adresu za primanje bitkoina</translation>
+    </message>
+    <message>
+        <source>C&amp;hoose</source>
+        <translation>I&amp;zaberi</translation>
+    </message>
+    <message>
+        <source>Sending addresses</source>
+        <translation>Adrese za slanje</translation>
+    </message>
+    <message>
+        <source>Receiving addresses</source>
+        <translation>Adrese za primanje</translation>
+    </message>
+    <message>
+        <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source>
+        <translation>Ovo su vase Bitkoin adrese za slanje bitkoina. Uvek proverite unetu kolicinu bitkoina i adresu za slanje bitkoin pre slanja.</translation>
+    </message>
+    <message>
+        <source>These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source>
+        <translation>Ovo su vase Bitkoin adrese za primanje bitkoina. Preporuceno je da koristite drugaciju adresu za primanje kod svake transakcije.</translation>
+    </message>
+    <message>
+        <source>&amp;Edit</source>
+        <translation>&amp;Izmeni</translation>
+    </message>
+    <message>
+        <source>Export Address List</source>
+        <translation>Izvezi listu adresa</translation>
+    </message>
+    <message>
+        <source>Comma separated file (*.csv)</source>
+        <translation>Zapetom odvojene ('.csv) datoteke</translation>
+    </message>
+    <message>
+        <source>Exporting Failed</source>
+        <translation>Izvoz nije uspeo</translation>
+    </message>
+    <message>
+        <source>There was an error trying to save the address list to %1. Please try again.</source>
+        <translation>Dogodila se greska prilikom cuvanja adrese u %1. Molimo pokusajte ponovo.</translation>
+    </message>
+</context>
+<context>
+    <name>AddressTableModel</name>
+    <message>
+        <source>Label</source>
+        <translation>Etiketa</translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation>Adresa</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(bez etikete)</translation>
+    </message>
+</context>
+<context>
+    <name>AskPassphraseDialog</name>
+    <message>
+        <source>Passphrase Dialog</source>
+        <translation>Dialog pristupne fraze</translation>
+    </message>
+    <message>
+        <source>Enter passphrase</source>
+        <translation>Unesi pristupnu frazu</translation>
+    </message>
+    <message>
+        <source>New passphrase</source>
+        <translation>Nova pristupna fraza</translation>
+    </message>
+    <message>
+        <source>Repeat new passphrase</source>
+        <translation>Ponovo unesite pristupnu frazu</translation>
+    </message>
+    <message>
+        <source>Encrypt wallet</source>
+        <translation>Enkriptuj/Sifruj novcanik</translation>
+    </message>
+    <message>
+        <source>This operation needs your wallet passphrase to unlock the wallet.</source>
+        <translation>Da bi ste otkljucali novcanik potrebno je da unesete pristupnu frazu</translation>
+    </message>
+    <message>
+        <source>Unlock wallet</source>
+        <translation>Otkljucaj novcanik</translation>
+    </message>
+    <message>
+        <source>This operation needs your wallet passphrase to decrypt the wallet.</source>
+        <translation>Da bi ste dekriptovali/desifrovali novcanik potrebno je da unesete pristupnu frazu</translation>
+    </message>
+    <message>
+        <source>Decrypt wallet</source>
+        <translation>Dekriptuj/Desifruj novcanik</translation>
+    </message>
+    <message>
+        <source>Change passphrase</source>
+        <translation>Izmeni pristupnu frazu</translation>
+    </message>
+    <message>
+        <source>Confirm wallet encryption</source>
+        <translation>Potvrdite enkripciju/sifrovanje novcanika</translation>
+    </message>
+    <message>
+        <source>Warning: If you encrypt your wallet and lose your passphrase, you will &lt;b&gt;LOSE ALL OF YOUR BITCOINS&lt;/b&gt;!</source>
+        <translation>Upozorenje: Ako ekriptujete/sifrujete novcanik, a izgubite pristupnu frazu &lt;b&gt;IZGUBICETE SVE VASE BITKOINE&lt;/b&gt;!</translation>
+    </message>
+    <message>
+        <source>Are you sure you wish to encrypt your wallet?</source>
+        <translation>Da li ste sigurni da zelite da enkriptujete/sifrujete novcanik?</translation>
+    </message>
+    <message>
+        <source>Bitcoin Core will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source>
+        <translation>Bitcoin Core ce se sada zatvoriti radi zavrsavanje procesa enkripcije/sifrovanja novcanika. Zapamtite da enkriptovanje/sifrovanje novcanika ne moze u potpunosti da zastiti vase bitkoine od kradje od strane virusa koji su zarazili vas racunar.</translation>
+    </message>
+    <message>
+        <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source>
+        <translation>VAZNO : Bilo koja prethodne rezervne kopije koje ste nacinili od svoje datoteke novcanika treba da se zamene sa novogenerisanom, sifrovanom datotekom novcanika. Iz bezbednosnih razloga, prethodne rezervne kopije su nezasifrovanih datoteka novcanika ce postati beskorisne cim pocnete da koristite novi, sifrovani novčanik.</translation>
+    </message>
+    <message>
+        <source>Warning: The Caps Lock key is on!</source>
+        <translation>Upozorenje: Dugme Caps Lock je upaljeno</translation>
+    </message>
+    <message>
+        <source>Wallet encrypted</source>
+        <translation>Novcanik je enkriptovan/sifrovan</translation>
+    </message>
+    <message>
+        <source>Enter the new passphrase to the wallet.&lt;br/&gt;Please use a passphrase of &lt;b&gt;ten or more random characters&lt;/b&gt;, or &lt;b&gt;eight or more words&lt;/b&gt;.</source>
+        <translation>Unesite novu pristupnu frazu u novcanik.&lt;br/&gt;Molimo koristite pristupnu frazu od &lt;br/&gt;deset ili vise nasumicnih karaktera &lt;br/&gt;, ili &lt;b&gt;osm ili vise reci &lt;/b&gt;.</translation>
+    </message>
+    <message>
+        <source>Enter the old passphrase and new passphrase to the wallet.</source>
+        <translation>Unesite staru pristupnu frazu i novu pristupnu frazu u novcanik.</translation>
+    </message>
+    <message>
+        <source>Wallet encryption failed</source>
+        <translation>Ekripcija/Sifrovanje novcanika nije uspelo</translation>
+    </message>
+    <message>
+        <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
+        <translation>Enkriptovanje/Sifrovanje novcanika nije uspelo zbog greske. Vas novcanik nije enkriptovan/sifrovan.</translation>
+    </message>
+    <message>
+        <source>The supplied passphrases do not match.</source>
+        <translation>Uneta pristupne fraze se ne podudaraju</translation>
+    </message>
+    <message>
+        <source>Wallet unlock failed</source>
+        <translation>Otkljucavanje novcanika nije uspelo</translation>
+    </message>
+    <message>
+        <source>The passphrase entered for the wallet decryption was incorrect.</source>
+        <translation>Pristupna fraza za dekriptovanje/desifrovanje novcanika nije tacna.</translation>
+    </message>
+    <message>
+        <source>Wallet decryption failed</source>
+        <translation>Dekriptovanje/desifrovanje novcanika nije uspelo</translation>
+    </message>
+    <message>
+        <source>Wallet passphrase was successfully changed.</source>
+        <translation>Pristupna fraza novcanika je uspesno promenjena.</translation>
+    </message>
+</context>
+<context>
+    <name>BanTableModel</name>
+    <message>
+        <source>IP/Netmask</source>
+        <translation>IP/Netmask</translation>
+    </message>
+    <message>
+        <source>Banned Until</source>
+        <translation>Banovani ste do</translation>
+    </message>
+</context>
+<context>
+    <name>BitcoinGUI</name>
+    <message>
+        <source>Bitcoin Core</source>
+        <translation>Bitcoin Core</translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation>Greska</translation>
+    </message>
+    </context>
+<context>
+    <name>ClientModel</name>
+    </context>
+<context>
+    <name>CoinControlDialog</name>
+    <message>
+        <source>Amount</source>
+        <translation>Kolicina</translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation>Datum</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(bez etikete)</translation>
+    </message>
+    </context>
+<context>
+    <name>EditAddressDialog</name>
+    </context>
+<context>
+    <name>FreespaceChecker</name>
+    </context>
+<context>
+    <name>HelpMessageDialog</name>
+    <message>
+        <source>Bitcoin Core</source>
+        <translation>Bitcoin Core</translation>
+    </message>
+    </context>
+<context>
+    <name>Intro</name>
+    <message>
+        <source>Bitcoin Core</source>
+        <translation>Bitcoin Core</translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation>Greska</translation>
+    </message>
+    </context>
+<context>
+    <name>OpenURIDialog</name>
+    </context>
+<context>
+    <name>OptionsDialog</name>
+    </context>
+<context>
+    <name>OverviewPage</name>
+    </context>
+<context>
+    <name>PaymentServer</name>
+    </context>
+<context>
+    <name>PeerTableModel</name>
+    </context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Amount</source>
+        <translation>Kolicina</translation>
+    </message>
+    </context>
+<context>
+    <name>QRImageWidget</name>
+    </context>
+<context>
+    <name>RPCConsole</name>
+    </context>
+<context>
+    <name>ReceiveCoinsDialog</name>
+    </context>
+<context>
+    <name>ReceiveRequestDialog</name>
+    <message>
+        <source>Address</source>
+        <translation>Adresa</translation>
+    </message>
+    <message>
+        <source>Amount</source>
+        <translation>Kolicina</translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation>Etiketa</translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation>Poruka</translation>
+    </message>
+    </context>
+<context>
+    <name>RecentRequestsTableModel</name>
+    <message>
+        <source>Date</source>
+        <translation>Datum</translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation>Etiketa</translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation>Poruka</translation>
+    </message>
+    <message>
+        <source>Amount</source>
+        <translation>Kolicina</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(bez etikete)</translation>
+    </message>
+    </context>
+<context>
+    <name>SendCoinsDialog</name>
+    <message>
+        <source>(no label)</source>
+        <translation>(bez etikete)</translation>
+    </message>
+    </context>
+<context>
+    <name>SendCoinsEntry</name>
+    </context>
+<context>
+    <name>ShutdownWindow</name>
+    </context>
+<context>
+    <name>SignVerifyMessageDialog</name>
+    </context>
+<context>
+    <name>SplashScreen</name>
+    <message>
+        <source>Bitcoin Core</source>
+        <translation>Bitcoin Core</translation>
+    </message>
+    <message>
+        <source>The Bitcoin Core developers</source>
+        <translation>Razvojni tim Bitcoin Core</translation>
+    </message>
+    </context>
+<context>
+    <name>TrafficGraphWidget</name>
+    </context>
+<context>
+    <name>TransactionDesc</name>
+    <message>
+        <source>%1/offline</source>
+        <translation>%1/van mreze</translation>
+    </message>
+    <message>
+        <source>%1/unconfirmed</source>
+        <translation>%1/nepotvrdjeno</translation>
+    </message>
+    <message>
+        <source>%1 confirmations</source>
+        <translation>%1 potvrdjeno/ih</translation>
+    </message>
+    <message>
+        <source>Status</source>
+        <translation>Stanje/Status</translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation>Datum</translation>
+    </message>
+    <message>
+        <source>Source</source>
+        <translation>Izvor</translation>
+    </message>
+    <message>
+        <source>Generated</source>
+        <translation>Generisano</translation>
+    </message>
+    <message>
+        <source>From</source>
+        <translation>Od</translation>
+    </message>
+    <message>
+        <source>To</source>
+        <translation>Kome</translation>
+    </message>
+    <message>
+        <source>own address</source>
+        <translation>sopstvena adresa</translation>
+    </message>
+    <message>
+        <source>watch-only</source>
+        <translation>samo za gledanje</translation>
+    </message>
+    <message>
+        <source>label</source>
+        <translation>etiketa</translation>
+    </message>
+    <message>
+        <source>Credit</source>
+        <translation>Kredit</translation>
+    </message>
+    <message>
+        <source>not accepted</source>
+        <translation>nije prihvaceno</translation>
+    </message>
+    <message>
+        <source>Debit</source>
+        <translation>Zaduzenje</translation>
+    </message>
+    <message>
+        <source>Total debit</source>
+        <translation>Ukupno zaduzenje</translation>
+    </message>
+    <message>
+        <source>Total credit</source>
+        <translation>Totalni kredit</translation>
+    </message>
+    <message>
+        <source>Transaction fee</source>
+        <translation>Taksa transakcije</translation>
+    </message>
+    <message>
+        <source>Net amount</source>
+        <translation>Neto iznos</translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation>Poruka</translation>
+    </message>
+    <message>
+        <source>Comment</source>
+        <translation>Komentar</translation>
+    </message>
+    <message>
+        <source>Transaction ID</source>
+        <translation>ID Transakcije</translation>
+    </message>
+    <message>
+        <source>Merchant</source>
+        <translation>Trgovac</translation>
+    </message>
+    <message>
+        <source>Debug information</source>
+        <translation>Informacije debugovanja</translation>
+    </message>
+    <message>
+        <source>Transaction</source>
+        <translation>Transakcije</translation>
+    </message>
+    <message>
+        <source>Inputs</source>
+        <translation>Unosi</translation>
+    </message>
+    <message>
+        <source>Amount</source>
+        <translation>Kolicina</translation>
+    </message>
+    <message>
+        <source>true</source>
+        <translation>tacno</translation>
+    </message>
+    <message>
+        <source>false</source>
+        <translation>netacno</translation>
+    </message>
+    <message>
+        <source>, has not been successfully broadcast yet</source>
+        <translation>, nisu uspesno jos emitovano</translation>
+    </message>
+    <message>
+        <source>unknown</source>
+        <translation>nepoznato</translation>
+    </message>
+</context>
+<context>
+    <name>TransactionDescDialog</name>
+    <message>
+        <source>Transaction details</source>
+        <translation>Detalji transakcije</translation>
+    </message>
+    </context>
+<context>
+    <name>TransactionTableModel</name>
+    <message>
+        <source>Date</source>
+        <translation>Datum</translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation>Tip</translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation>Etiketa</translation>
+    </message>
+    <message>
+        <source>Received with</source>
+        <translation>Primljeno uz</translation>
+    </message>
+    <message>
+        <source>Received from</source>
+        <translation>Primljeno od</translation>
+    </message>
+    <message>
+        <source>Sent to</source>
+        <translation>Poslat</translation>
+    </message>
+    <message>
+        <source>Payment to yourself</source>
+        <translation>Placanje samom sebi</translation>
+    </message>
+    <message>
+        <source>Mined</source>
+        <translation>Iskopano</translation>
+    </message>
+    <message>
+        <source>watch-only</source>
+        <translation>samo za gledanje</translation>
+    </message>
+    </context>
+<context>
+    <name>TransactionView</name>
+    <message>
+        <source>Received with</source>
+        <translation>Primljeno uz</translation>
+    </message>
+    <message>
+        <source>Sent to</source>
+        <translation>Poslat</translation>
+    </message>
+    <message>
+        <source>Mined</source>
+        <translation>Iskopano</translation>
+    </message>
+    <message>
+        <source>Exporting Failed</source>
+        <translation>Izvoz nije uspeo</translation>
+    </message>
+    <message>
+        <source>Comma separated file (*.csv)</source>
+        <translation>Zarezom odvojene ('.csv) datoteke</translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation>Datum</translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation>Tip</translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation>Etiketa</translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation>Adresa</translation>
+    </message>
+    </context>
+<context>
+    <name>UnitDisplayStatusBarControl</name>
+    </context>
+<context>
+    <name>WalletFrame</name>
+    </context>
+<context>
+    <name>WalletModel</name>
+    </context>
+<context>
+    <name>WalletView</name>
+    <message>
+        <source>&amp;Export</source>
+        <translation>&amp;Izvoz</translation>
+    </message>
+    <message>
+        <source>Export the data in the current tab to a file</source>
+        <translation>Izvoz podataka iz trenutne kartice u datoteku</translation>
+    </message>
+    </context>
+<context>
+    <name>bitcoin-core</name>
+    <message>
+        <source>Insufficient funds</source>
+        <translation>Nedovoljno sredstava</translation>
+    </message>
+    <message>
+        <source>Loading block index...</source>
+        <translation>Ucitavanje indeksa bloka...</translation>
+    </message>
+    <message>
+        <source>Add a node to connect to and attempt to keep the connection open</source>
+        <translation>Dodajte cvor za povezivanje, da bi pokusali da odrzite vezu otvorenom</translation>
+    </message>
+    <message>
+        <source>Loading wallet...</source>
+        <translation>Ucitavanje novcanika...</translation>
+    </message>
+    <message>
+        <source>Cannot write default address</source>
+        <translation>Nije moguce ispisivanje podrazumevane adrese</translation>
+    </message>
+    <message>
+        <source>Rescanning...</source>
+        <translation>Ponovno skeniranje...</translation>
+    </message>
+    <message>
+        <source>Done loading</source>
+        <translation>Zavrseno ucitavanje</translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation>Greska</translation>
+    </message>
+</context>
+</TS>
\ No newline at end of file
diff --git a/src/qt/locale/bitcoin_sv.ts b/src/qt/locale/bitcoin_sv.ts
index 756114351f880..acf37bd1d4eee 100644
--- a/src/qt/locale/bitcoin_sv.ts
+++ b/src/qt/locale/bitcoin_sv.ts
@@ -1474,10 +1474,6 @@ Var vänlig och försök igen.</translation>
         <source>General</source>
         <translation>Generell</translation>
     </message>
-    <message>
-        <source>Using OpenSSL version</source>
-        <translation>Använder OpenSSL version</translation>
-    </message>
     <message>
         <source>Using BerkeleyDB version</source>
         <translation>Använder BerkeleyDB versionen</translation>
@@ -2980,6 +2976,18 @@ Var vänlig och försök igen.</translation>
         <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
         <translation>Acceptera anslutningar utifrån (förvalt: 1 om ingen -proxy eller -connect)</translation>
     </message>
+    <message>
+        <source>-fallbackfee is set very high! This is the transaction fee you may pay when fee estimates are not available.</source>
+        <translation>-fallbackfee är satt väldigt högt! Detta är avgiften du kan komma att betala om uppskattad avgift inte finns tillgänglig.</translation>
+    </message>
+    <message>
+        <source>A fee rate (in %s/kB) that will be used when fee estimation has insufficient data (default: %s)</source>
+        <translation>En avgiftskurs (i %s/kB) som används när det inte finns tillräcklig data för att uppskatta avgiften (förvalt: %s)</translation>
+    </message>
+    <message>
+        <source>Accept relayed transactions received from whitelisted peers even when not relaying transactions (default: %d)</source>
+        <translation>Acceptera vidarebefodrade transaktioner från vitlistade noder även när transaktioner inte vidarebefodras (förvalt: %d)</translation>
+    </message>
     <message>
         <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source>
         <translation>Bind till given adress och lyssna alltid på den. Använd [värd]:port notation för IPv6</translation>
@@ -2996,6 +3004,10 @@ Var vänlig och försök igen.</translation>
         <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source>
         <translation>Exekvera kommando när en plånbokstransaktion ändras (%s i cmd är ersatt av TxID)</translation>
     </message>
+    <message>
+        <source>Force relay of transactions from whitelisted peers even they violate local relay policy (default: %d)</source>
+        <translation>Vidarebefodra alltid transaktioner från vitlistade noder även om de bryter mot lokala reläpolicyn (förvalt: %d)</translation>
+    </message>
     <message>
         <source>Set the number of script verification threads (%u to %d, 0 = auto, &lt;0 = leave that many cores free, default: %d)</source>
         <translation>Ange antalet skriptkontrolltrådar (%u till %d, 0 = auto, &lt;0 = lämna så många kärnor lediga, förval: %d)</translation>
@@ -3012,6 +3024,10 @@ Var vänlig och försök igen.</translation>
         <source>Unable to bind to %s on this computer. Bitcoin Core is probably already running.</source>
         <translation>Det går inte att binda till %s på den här datorn. Bitcoin Core är förmodligen redan igång.</translation>
     </message>
+    <message>
+        <source>Unsupported argument -whitelistalwaysrelay ignored, use -whitelistrelay and/or -whitelistforcerelay.</source>
+        <translation>Argumentet -whitelistalwaysrelay stöds inte utan ignoreras, använd -whitelistrelay och/eller -whitelistforcerelay.</translation>
+    </message>
     <message>
         <source>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</source>
         <translation>Använd UPnP för att mappa den lyssnande porten (förvalt: 1 när lyssning aktiverat och utan -proxy)</translation>
@@ -3028,6 +3044,10 @@ Var vänlig och försök igen.</translation>
         <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source>
         <translation>Varning: Nätverket verkar inte vara helt överens! Några miners verkar ha problem.</translation>
     </message>
+    <message>
+        <source>Warning: Unknown block versions being mined! It's possible unknown rules are in effect</source>
+        <translation>Varning: Okända blockversioner bryts! Det är möjligt att okända regler används</translation>
+    </message>
     <message>
         <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source>
         <translation>Varning: Vi verkar inte helt överens med våra peers! Du kan behöva uppgradera, eller andra noder kan behöva uppgradera.</translation>
@@ -3048,6 +3068,10 @@ Var vänlig och försök igen.</translation>
         <source>&lt;category&gt; can be:</source>
         <translation>&lt;category&gt; Kan vara:</translation>
     </message>
+    <message>
+        <source>Append comment to the user agent string</source>
+        <translation>Lägg till kommentar till user-agent-strängen</translation>
+    </message>
     <message>
         <source>Block creation options:</source>
         <translation>Block skapande inställningar:</translation>
@@ -3092,6 +3116,10 @@ Var vänlig och försök igen.</translation>
         <source>Enable publish raw transaction in &lt;address&gt;</source>
         <translation>Aktivera publicering av råa transaktioner i &lt;adress&gt;</translation>
     </message>
+    <message>
+        <source>Enable transaction replacement in the memory pool (default: %u)</source>
+        <translation>Aktivera byte av transaktioner i minnespoolen (förvalt: %u)</translation>
+    </message>
     <message>
         <source>Error initializing block database</source>
         <translation>Fel vid initiering av blockdatabasen</translation>
@@ -3128,10 +3156,22 @@ Var vänlig och försök igen.</translation>
         <source>Invalid -onion address: '%s'</source>
         <translation>Ogiltig -onion adress:'%s'</translation>
     </message>
+    <message>
+        <source>Invalid amount for -fallbackfee=&lt;amount&gt;: '%s'</source>
+        <translation>Ogiltigt belopp för -fallbackfee=&lt;belopp&gt;: '%s'</translation>
+    </message>
     <message>
         <source>Keep the transaction memory pool below &lt;n&gt; megabytes (default: %u)</source>
         <translation>Håll minnespoolen över transaktioner under &lt;n&gt; megabyte (förvalt: %u)</translation>
     </message>
+    <message>
+        <source>Location of the auth cookie (default: data dir)</source>
+        <translation>Plats för authcookie (förvalt: datamapp)</translation>
+    </message>
+    <message>
+        <source>Minimum bytes per sigop in transactions we relay and mine (default: %u)</source>
+        <translation>Minimum antal byte per sigop i transaktioner som vi reläar och bryter (förvalt: %u)</translation>
+    </message>
     <message>
         <source>Not enough file descriptors available.</source>
         <translation>Inte tillräckligt med filbeskrivningar tillgängliga.</translation>
@@ -3140,6 +3180,10 @@ Var vänlig och försök igen.</translation>
         <source>Only connect to nodes in network &lt;net&gt; (ipv4, ipv6 or onion)</source>
         <translation>Anslut enbart till noder i nätverket &lt;net&gt; (IPv4, IPv6 eller onion)</translation>
     </message>
+    <message>
+        <source>Print version and exit</source>
+        <translation>Visa version och avsluta</translation>
+    </message>
     <message>
         <source>Prune cannot be configured with a negative value.</source>
         <translation>Beskärning kan inte konfigureras med ett negativt värde.</translation>
@@ -3196,10 +3240,6 @@ Var vänlig och försök igen.</translation>
         <source>Wallet options:</source>
         <translation>Plånboksinställningar:</translation>
     </message>
-    <message>
-        <source>Warning: This version is obsolete; upgrade required!</source>
-        <translation>Varning: Denna version är föråldrad; uppgradering krävs!</translation>
-    </message>
     <message>
         <source>You need to rebuild the database using -reindex to change -txindex</source>
         <translation>Du måste återskapa databasen med -reindex för att ändra -txindex</translation>
@@ -3296,10 +3336,6 @@ Var vänlig och försök igen.</translation>
         <source>Activating best chain...</source>
         <translation>Aktiverar bästa kedjan...</translation>
     </message>
-    <message>
-        <source>Always relay transactions received from whitelisted peers (default: %d)</source>
-        <translation>Vidarebefordra alltid transaktioner från vitlistade noder (förval: %d)</translation>
-    </message>
     <message>
         <source>Attempt to recover private keys from a corrupt wallet.dat on startup</source>
         <translation>Försök att rädda privata nycklar från en korrupt wallet.dat vid uppstart</translation>
@@ -3464,6 +3500,10 @@ Var vänlig och försök igen.</translation>
         <source>Warning</source>
         <translation>Varning</translation>
     </message>
+    <message>
+        <source>Warning: unknown new rules activated (versionbit %i)</source>
+        <translation>Varning: okända nya regler aktiverade (versionsbit %i)</translation>
+    </message>
     <message>
         <source>Whether to operate in a blocks only mode (default: %u)</source>
         <translation>Ska allt göras i endast block-läge (förval: %u)</translation>
diff --git a/src/qt/locale/bitcoin_ta.ts b/src/qt/locale/bitcoin_ta.ts
new file mode 100644
index 0000000000000..c93524cdacc2f
--- /dev/null
+++ b/src/qt/locale/bitcoin_ta.ts
@@ -0,0 +1,1029 @@
+<TS language="ta" version="2.1">
+<context>
+    <name>AddressBookPage</name>
+    <message>
+        <source>Create a new address</source>
+        <translation>ஒரு புதிய முகவரியை உருவாக்கு</translation>
+    </message>
+    <message>
+        <source>&amp;New</source>
+        <translation>&amp;புதிய</translation>
+    </message>
+    <message>
+        <source>&amp;Copy</source>
+        <translation>&amp;நகல்</translation>
+    </message>
+    <message>
+        <source>C&amp;lose</source>
+        <translation>&amp;மூடு</translation>
+    </message>
+    <message>
+        <source>&amp;Copy Address</source>
+        <translation>&amp;முகவரியை நகலெடு</translation>
+    </message>
+    <message>
+        <source>&amp;Export</source>
+        <translation>&amp;ஏற்றுமதி</translation>
+    </message>
+    <message>
+        <source>&amp;Delete</source>
+        <translation>&amp;அழி</translation>
+    </message>
+    <message>
+        <source>C&amp;hoose</source>
+        <translation>&amp;தேர்ந்தெடு</translation>
+    </message>
+    <message>
+        <source>Sending addresses</source>
+        <translation>அனுப்பும் முகவரிகள்</translation>
+    </message>
+    <message>
+        <source>Receiving addresses</source>
+        <translation>பெறும் முகவரிகள்</translation>
+    </message>
+    <message>
+        <source>&amp;Edit</source>
+        <translation>&amp;தொகு</translation>
+    </message>
+    </context>
+<context>
+    <name>AddressTableModel</name>
+    <message>
+        <source>Label</source>
+        <translation>லேபிள்</translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation>விலாசம்</translation>
+    </message>
+    </context>
+<context>
+    <name>AskPassphraseDialog</name>
+    <message>
+        <source>Encrypt wallet</source>
+        <translation>என்க்ரிப்ட் பணப்பை</translation>
+    </message>
+    <message>
+        <source>Decrypt wallet</source>
+        <translation>டிக்ரிப்ட் பணப்பை</translation>
+    </message>
+    </context>
+<context>
+    <name>BanTableModel</name>
+    <message>
+        <source>IP/Netmask</source>
+        <translation>IP/Netmask</translation>
+    </message>
+    </context>
+<context>
+    <name>BitcoinGUI</name>
+    <message>
+        <source>&amp;Overview</source>
+        <translation>&amp;கண்ணோட்டம்</translation>
+    </message>
+    <message>
+        <source>&amp;Transactions</source>
+        <translation>&amp;பரிவர்த்தனைகள்</translation>
+    </message>
+    <message>
+        <source>E&amp;xit</source>
+        <translation>&amp;வெளியேறு</translation>
+    </message>
+    <message>
+        <source>Quit application</source>
+        <translation>விலகு</translation>
+    </message>
+    <message>
+        <source>About &amp;Qt</source>
+        <translation>&amp;Qt-ஐ பற்றி</translation>
+    </message>
+    <message>
+        <source>&amp;Options...</source>
+        <translation>&amp;விருப்பங்கள்...</translation>
+    </message>
+    <message>
+        <source>&amp;Encrypt Wallet...</source>
+        <translation>&amp;என்க்ரிப்ட் பணப்பை...</translation>
+    </message>
+    <message>
+        <source>Open &amp;URI...</source>
+        <translation>&amp;URI-ஐ திற</translation>
+    </message>
+    <message>
+        <source>&amp;Verify message...</source>
+        <translation>&amp;செய்தியை சரிசெய்...</translation>
+    </message>
+    <message>
+        <source>Bitcoin</source>
+        <translation>Bitcoin</translation>
+    </message>
+    <message>
+        <source>Wallet</source>
+        <translation>பணப்பை</translation>
+    </message>
+    <message>
+        <source>&amp;Send</source>
+        <translation>&amp;அனுப்பு</translation>
+    </message>
+    <message>
+        <source>&amp;Receive</source>
+        <translation>&amp;பெறு</translation>
+    </message>
+    <message>
+        <source>&amp;Show / Hide</source>
+        <translation>&amp;காட்டு/மறை</translation>
+    </message>
+    <message>
+        <source>&amp;File</source>
+        <translation>&amp;கோப்பு</translation>
+    </message>
+    <message>
+        <source>&amp;Settings</source>
+        <translation>&amp;அமைப்பு</translation>
+    </message>
+    <message>
+        <source>&amp;Help</source>
+        <translation>&amp;உதவி</translation>
+    </message>
+    <message>
+        <source>Bitcoin Core</source>
+        <translation>Bitcoin மையம்</translation>
+    </message>
+    <message numerus="yes">
+        <source>%n hour(s)</source>
+        <translation><numerusform>%n மணி</numerusform><numerusform>%n மணி</numerusform></translation>
+    </message>
+    <message>
+        <source>%1 and %2</source>
+        <translation>%1 மற்றும் %2</translation>
+    </message>
+    <message>
+        <source>%1 behind</source>
+        <translation>%1 பின்னால்</translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation>தவறு</translation>
+    </message>
+    <message>
+        <source>Warning</source>
+        <translation>எச்சரிக்கை</translation>
+    </message>
+    <message>
+        <source>Information</source>
+        <translation>தகவல்</translation>
+    </message>
+    <message>
+        <source>Date: %1
+</source>
+        <translation>தேதி: %1
+</translation>
+    </message>
+    <message>
+        <source>Amount: %1
+</source>
+        <translation>தொகை: %1
+</translation>
+    </message>
+    <message>
+        <source>Type: %1
+</source>
+        <translation>வகை: %1
+</translation>
+    </message>
+    <message>
+        <source>Address: %1
+</source>
+        <translation>முகவரி: %1
+</translation>
+    </message>
+    <message>
+        <source>Sent transaction</source>
+        <translation>அனுப்பிய பரிவர்த்தனை</translation>
+    </message>
+    </context>
+<context>
+    <name>ClientModel</name>
+    <message>
+        <source>Network Alert</source>
+        <translation>பிணைய எச்சரிக்கை</translation>
+    </message>
+</context>
+<context>
+    <name>CoinControlDialog</name>
+    <message>
+        <source>Quantity:</source>
+        <translation>அளவு</translation>
+    </message>
+    <message>
+        <source>Amount:</source>
+        <translation>விலை:</translation>
+    </message>
+    <message>
+        <source>Priority:</source>
+        <translation>முன்னுரிமை</translation>
+    </message>
+    <message>
+        <source>Fee:</source>
+        <translation>கட்டணம்:</translation>
+    </message>
+    <message>
+        <source>After Fee:</source>
+        <translation>கட்டணத்திறகுப் பின்:</translation>
+    </message>
+    <message>
+        <source>Change:</source>
+        <translation>மாற்று:</translation>
+    </message>
+    <message>
+        <source>Amount</source>
+        <translation>விலை</translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation>தேதி</translation>
+    </message>
+    <message>
+        <source>Confirmations</source>
+        <translation>உறுதிப்படுத்தல்கள்</translation>
+    </message>
+    <message>
+        <source>Confirmed</source>
+        <translation>உறுதியாக</translation>
+    </message>
+    <message>
+        <source>Priority</source>
+        <translation>முன்னுரிமை</translation>
+    </message>
+    <message>
+        <source>Copy address</source>
+        <translation>பிரதியை முகவரியை</translation>
+    </message>
+    <message>
+        <source>Copy amount</source>
+        <translation>நகலை தொகை</translation>
+    </message>
+    <message>
+        <source>none</source>
+        <translation>none</translation>
+    </message>
+    <message>
+        <source>yes</source>
+        <translation>ஆம்</translation>
+    </message>
+    <message>
+        <source>no</source>
+        <translation>இல்லை</translation>
+    </message>
+    </context>
+<context>
+    <name>EditAddressDialog</name>
+    </context>
+<context>
+    <name>FreespaceChecker</name>
+    <message>
+        <source>name</source>
+        <translation>பெயர்</translation>
+    </message>
+    </context>
+<context>
+    <name>HelpMessageDialog</name>
+    <message>
+        <source>Bitcoin Core</source>
+        <translation>Bitcoin மையம்</translation>
+    </message>
+    <message>
+        <source>About Bitcoin Core</source>
+        <translation>Bitcoin மையம் பற்றி</translation>
+    </message>
+    </context>
+<context>
+    <name>Intro</name>
+    <message>
+        <source>Welcome</source>
+        <translation>நல்வரவு</translation>
+    </message>
+    <message>
+        <source>Bitcoin Core</source>
+        <translation>Bitcoin மையம்</translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation>தவறு</translation>
+    </message>
+    </context>
+<context>
+    <name>OpenURIDialog</name>
+    <message>
+        <source>Open URI</source>
+        <translation>URI-ஐ திற</translation>
+    </message>
+    <message>
+        <source>URI:</source>
+        <translation>URI:</translation>
+    </message>
+    </context>
+<context>
+    <name>OptionsDialog</name>
+    <message>
+        <source>Options</source>
+        <translation>விருப்பத்தேர்வு</translation>
+    </message>
+    <message>
+        <source>&amp;Main</source>
+        <translation>&amp;தலைமை</translation>
+    </message>
+    <message>
+        <source>MB</source>
+        <translation>MB</translation>
+    </message>
+    <message>
+        <source>&amp;Network</source>
+        <translation>&amp;பிணையம்</translation>
+    </message>
+    <message>
+        <source>W&amp;allet</source>
+        <translation>&amp;பணப்பை</translation>
+    </message>
+    <message>
+        <source>Expert</source>
+        <translation>வல்லுநர்</translation>
+    </message>
+    <message>
+        <source>IPv4</source>
+        <translation>IPv4</translation>
+    </message>
+    <message>
+        <source>IPv6</source>
+        <translation>IPv6</translation>
+    </message>
+    <message>
+        <source>Tor</source>
+        <translation>Tor</translation>
+    </message>
+    <message>
+        <source>&amp;Window</source>
+        <translation>&amp;சாளரம்</translation>
+    </message>
+    <message>
+        <source>&amp;Display</source>
+        <translation>&amp;காட்டு</translation>
+    </message>
+    <message>
+        <source>&amp;OK</source>
+        <translation>&amp;சரி</translation>
+    </message>
+    <message>
+        <source>&amp;Cancel</source>
+        <translation>&amp;ரத்து</translation>
+    </message>
+    <message>
+        <source>default</source>
+        <translation>இயல்புநிலை</translation>
+    </message>
+    <message>
+        <source>none</source>
+        <translation>none</translation>
+    </message>
+    </context>
+<context>
+    <name>OverviewPage</name>
+    <message>
+        <source>Form</source>
+        <translation>படிவம்</translation>
+    </message>
+    <message>
+        <source>Available:</source>
+        <translation>கிடைக்ககூடிய:</translation>
+    </message>
+    <message>
+        <source>Pending:</source>
+        <translation>நிலுவையில்:</translation>
+    </message>
+    <message>
+        <source>Immature:</source>
+        <translation>முதிராத:</translation>
+    </message>
+    <message>
+        <source>Balances</source>
+        <translation>மீதி</translation>
+    </message>
+    <message>
+        <source>Total:</source>
+        <translation>மொத்தம்:</translation>
+    </message>
+    </context>
+<context>
+    <name>PaymentServer</name>
+    </context>
+<context>
+    <name>PeerTableModel</name>
+    <message>
+        <source>User Agent</source>
+        <translation>பயனர் முகவர்</translation>
+    </message>
+    <message>
+        <source>Ping Time</source>
+        <translation>பிங் நேரம்</translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Amount</source>
+        <translation>விலை</translation>
+    </message>
+    <message>
+        <source>%1 d</source>
+        <translation>%1 d</translation>
+    </message>
+    <message>
+        <source>%1 h</source>
+        <translation>%1 h</translation>
+    </message>
+    <message>
+        <source>%1 s</source>
+        <translation>%1 s</translation>
+    </message>
+    <message>
+        <source>N/A</source>
+        <translation>N/A</translation>
+    </message>
+    <message>
+        <source>%1 ms</source>
+        <translation>%1 ms</translation>
+    </message>
+</context>
+<context>
+    <name>QRImageWidget</name>
+    <message>
+        <source>&amp;Save Image...</source>
+        <translation>&amp;படத்தை சேமி...</translation>
+    </message>
+    <message>
+        <source>&amp;Copy Image</source>
+        <translation>&amp;படத்தை</translation>
+    </message>
+    <message>
+        <source>Save QR Code</source>
+        <translation>QR குறியீடு காப்பாற்ற</translation>
+    </message>
+    <message>
+        <source>PNG Image (*.png)</source>
+        <translation>PNG படத்தை (*.png)</translation>
+    </message>
+</context>
+<context>
+    <name>RPCConsole</name>
+    <message>
+        <source>Client name</source>
+        <translation>வாடிக்கையாளர் பெயர்</translation>
+    </message>
+    <message>
+        <source>N/A</source>
+        <translation>N/A</translation>
+    </message>
+    <message>
+        <source>Client version</source>
+        <translation>வாடிக்கையாளர் பதிப்பு</translation>
+    </message>
+    <message>
+        <source>&amp;Information</source>
+        <translation>&amp;தகவல்</translation>
+    </message>
+    <message>
+        <source>Network</source>
+        <translation>பிணையம்</translation>
+    </message>
+    <message>
+        <source>Name</source>
+        <translation>பெயர்</translation>
+    </message>
+    <message>
+        <source>Memory Pool</source>
+        <translation>நினைவக குளம்</translation>
+    </message>
+    <message>
+        <source>Memory usage</source>
+        <translation>நினைவக பயன்பாடு</translation>
+    </message>
+    <message>
+        <source>Sent</source>
+        <translation>அனுப்பிய</translation>
+    </message>
+    <message>
+        <source>Direction</source>
+        <translation>திசை</translation>
+    </message>
+    <message>
+        <source>Version</source>
+        <translation>பதிப்பு</translation>
+    </message>
+    <message>
+        <source>User Agent</source>
+        <translation>பயனர் முகவர்</translation>
+    </message>
+    <message>
+        <source>Ping Time</source>
+        <translation>பிங் நேரம்</translation>
+    </message>
+    <message>
+        <source>&amp;Open</source>
+        <translation>&amp;திற</translation>
+    </message>
+    <message>
+        <source>&amp;Console</source>
+        <translation>&amp;பணியகம்</translation>
+    </message>
+    <message>
+        <source>&amp;Clear</source>
+        <translation>&amp;வழுநீக்கு</translation>
+    </message>
+    <message>
+        <source>Totals</source>
+        <translation>மொத்தம்</translation>
+    </message>
+    <message>
+        <source>In:</source>
+        <translation>உள்ளே:</translation>
+    </message>
+    <message>
+        <source>Out:</source>
+        <translation>வெளியே:</translation>
+    </message>
+    <message>
+        <source>1 &amp;hour</source>
+        <translation>1 &amp;மணி</translation>
+    </message>
+    <message>
+        <source>1 &amp;day</source>
+        <translation>1 &amp;நாள்</translation>
+    </message>
+    <message>
+        <source>1 &amp;week</source>
+        <translation>1 &amp;வாரம்</translation>
+    </message>
+    <message>
+        <source>1 &amp;year</source>
+        <translation>1 &amp;ஆண்டு</translation>
+    </message>
+    <message>
+        <source>%1 B</source>
+        <translation>%1 B</translation>
+    </message>
+    <message>
+        <source>%1 KB</source>
+        <translation>%1 KB</translation>
+    </message>
+    <message>
+        <source>%1 MB</source>
+        <translation>%1 MB</translation>
+    </message>
+    <message>
+        <source>%1 GB</source>
+        <translation>%1 GB</translation>
+    </message>
+    <message>
+        <source>via %1</source>
+        <translation>via %1</translation>
+    </message>
+    <message>
+        <source>never</source>
+        <translation>ஒருபோதும்</translation>
+    </message>
+    <message>
+        <source>Inbound</source>
+        <translation>உள்வரும்</translation>
+    </message>
+    <message>
+        <source>Outbound</source>
+        <translation>வெளி செல்லும்</translation>
+    </message>
+    <message>
+        <source>Yes</source>
+        <translation>ஆம்</translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation>மறு</translation>
+    </message>
+    <message>
+        <source>Unknown</source>
+        <translation>அறியப்படாத</translation>
+    </message>
+</context>
+<context>
+    <name>ReceiveCoinsDialog</name>
+    <message>
+        <source>&amp;Amount:</source>
+        <translation>&amp;தொகை:</translation>
+    </message>
+    <message>
+        <source>&amp;Label:</source>
+        <translation>&amp;சிட்டை:</translation>
+    </message>
+    <message>
+        <source>&amp;Message:</source>
+        <translation>&amp;செய்தி:</translation>
+    </message>
+    <message>
+        <source>Clear</source>
+        <translation>நீக்கு</translation>
+    </message>
+    <message>
+        <source>Show</source>
+        <translation>காண்பி</translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation>நீக்கு</translation>
+    </message>
+    <message>
+        <source>Copy message</source>
+        <translation>நகலை செய்தி</translation>
+    </message>
+    <message>
+        <source>Copy amount</source>
+        <translation>நகலை தொகை</translation>
+    </message>
+</context>
+<context>
+    <name>ReceiveRequestDialog</name>
+    <message>
+        <source>QR Code</source>
+        <translation>QR குறியீடு</translation>
+    </message>
+    <message>
+        <source>Copy &amp;URI</source>
+        <translation>நகலை &amp;URI</translation>
+    </message>
+    <message>
+        <source>Copy &amp;Address</source>
+        <translation>நகலை விலாசம்</translation>
+    </message>
+    <message>
+        <source>&amp;Save Image...</source>
+        <translation>&amp;படத்தை சேமி...</translation>
+    </message>
+    <message>
+        <source>URI</source>
+        <translation>URI</translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation>விலாசம்</translation>
+    </message>
+    <message>
+        <source>Amount</source>
+        <translation>விலை</translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation>லேபிள்</translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation>செய்தி</translation>
+    </message>
+    </context>
+<context>
+    <name>RecentRequestsTableModel</name>
+    <message>
+        <source>Date</source>
+        <translation>தேதி</translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation>லேபிள்</translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation>செய்தி</translation>
+    </message>
+    <message>
+        <source>Amount</source>
+        <translation>விலை</translation>
+    </message>
+    </context>
+<context>
+    <name>SendCoinsDialog</name>
+    <message>
+        <source>Quantity:</source>
+        <translation>அளவு</translation>
+    </message>
+    <message>
+        <source>Amount:</source>
+        <translation>விலை</translation>
+    </message>
+    <message>
+        <source>Priority:</source>
+        <translation>முன்னுரிமை</translation>
+    </message>
+    <message>
+        <source>Fee:</source>
+        <translation>கட்டணம்:</translation>
+    </message>
+    <message>
+        <source>After Fee:</source>
+        <translation>கட்டணத்திறகுப் பின்:</translation>
+    </message>
+    <message>
+        <source>Change:</source>
+        <translation>மாற்று:</translation>
+    </message>
+    <message>
+        <source>Choose...</source>
+        <translation>தேர்ந்தெடு...</translation>
+    </message>
+    <message>
+        <source>Hide</source>
+        <translation>மறை</translation>
+    </message>
+    <message>
+        <source>normal</source>
+        <translation>இயல்பான</translation>
+    </message>
+    <message>
+        <source>fast</source>
+        <translation>வேகமாக</translation>
+    </message>
+    <message>
+        <source>Balance:</source>
+        <translation>மீதி:</translation>
+    </message>
+    <message>
+        <source>S&amp;end</source>
+        <translation>&amp;அனுப்பு</translation>
+    </message>
+    <message>
+        <source>%1 to %2</source>
+        <translation>%1 to %2</translation>
+    </message>
+    <message>
+        <source>Copy amount</source>
+        <translation>நகலை தொகை</translation>
+    </message>
+    <message>
+        <source>or</source>
+        <translation>அல்லது</translation>
+    </message>
+    </context>
+<context>
+    <name>SendCoinsEntry</name>
+    <message>
+        <source>A&amp;mount:</source>
+        <translation>&amp;தொகை:</translation>
+    </message>
+    <message>
+        <source>&amp;Label:</source>
+        <translation>&amp;சிட்டை:</translation>
+    </message>
+    <message>
+        <source>Alt+A</source>
+        <translation>Alt+A</translation>
+    </message>
+    <message>
+        <source>Alt+P</source>
+        <translation>Alt+P</translation>
+    </message>
+    <message>
+        <source>Message:</source>
+        <translation>செய்தி:</translation>
+    </message>
+    </context>
+<context>
+    <name>ShutdownWindow</name>
+    </context>
+<context>
+    <name>SignVerifyMessageDialog</name>
+    <message>
+        <source>Alt+A</source>
+        <translation>Alt+A</translation>
+    </message>
+    <message>
+        <source>Alt+P</source>
+        <translation>Alt+P</translation>
+    </message>
+    <message>
+        <source>Signature</source>
+        <translation>கையொப்பம்</translation>
+    </message>
+    </context>
+<context>
+    <name>SplashScreen</name>
+    <message>
+        <source>Bitcoin Core</source>
+        <translation>Bitcoin மையம்</translation>
+    </message>
+    </context>
+<context>
+    <name>TrafficGraphWidget</name>
+    <message>
+        <source>KB/s</source>
+        <translation>KB/s</translation>
+    </message>
+</context>
+<context>
+    <name>TransactionDesc</name>
+    <message>
+        <source>Status</source>
+        <translation>நிலை</translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation>தேதி</translation>
+    </message>
+    <message>
+        <source>Source</source>
+        <translation>மூலம்</translation>
+    </message>
+    <message>
+        <source>Credit</source>
+        <translation>கடன்</translation>
+    </message>
+    <message>
+        <source>Debit</source>
+        <translation>பற்று</translation>
+    </message>
+    <message>
+        <source>Total debit</source>
+        <translation>மொத்த பற்று</translation>
+    </message>
+    <message>
+        <source>Total credit</source>
+        <translation>மொத்த கடன்</translation>
+    </message>
+    <message>
+        <source>Net amount</source>
+        <translation>நிகர தொகை</translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation>செய்தி</translation>
+    </message>
+    <message>
+        <source>Comment</source>
+        <translation>கருத்து</translation>
+    </message>
+    <message>
+        <source>Transaction ID</source>
+        <translation>பரிவர்த்தனை ID</translation>
+    </message>
+    <message>
+        <source>Merchant</source>
+        <translation>வணிகர்</translation>
+    </message>
+    <message>
+        <source>Debug information</source>
+        <translation>சரிசெய்வதற்கான தகவல்</translation>
+    </message>
+    <message>
+        <source>Transaction</source>
+        <translation>பரிவர்த்தனை</translation>
+    </message>
+    <message>
+        <source>Inputs</source>
+        <translation>உள்ளீடுகள்</translation>
+    </message>
+    <message>
+        <source>Amount</source>
+        <translation>விலை</translation>
+    </message>
+    <message>
+        <source>true</source>
+        <translation>உண்மை</translation>
+    </message>
+    <message>
+        <source>false</source>
+        <translation>தவறான</translation>
+    </message>
+    </context>
+<context>
+    <name>TransactionDescDialog</name>
+    </context>
+<context>
+    <name>TransactionTableModel</name>
+    <message>
+        <source>Date</source>
+        <translation>தேதி</translation>
+    </message>
+    <message>
+        <source>Offline</source>
+        <translation>ஆஃப்லைன்</translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation>லேபிள்</translation>
+    </message>
+    <message>
+        <source>(n/a)</source>
+        <translation>(n/a)</translation>
+    </message>
+    </context>
+<context>
+    <name>TransactionView</name>
+    <message>
+        <source>All</source>
+        <translation>முழுவதும்</translation>
+    </message>
+    <message>
+        <source>Today</source>
+        <translation>இன்று</translation>
+    </message>
+    <message>
+        <source>This week</source>
+        <translation>இந்த வாரம்</translation>
+    </message>
+    <message>
+        <source>This month</source>
+        <translation>இந்த மாதம்</translation>
+    </message>
+    <message>
+        <source>Last month</source>
+        <translation>கடந்த மாதம்</translation>
+    </message>
+    <message>
+        <source>This year</source>
+        <translation>இந்த வருடம்</translation>
+    </message>
+    <message>
+        <source>Range...</source>
+        <translation>எல்லை...</translation>
+    </message>
+    <message>
+        <source>Other</source>
+        <translation>வேறு</translation>
+    </message>
+    <message>
+        <source>Copy address</source>
+        <translation>பிரதியை முகவரியை</translation>
+    </message>
+    <message>
+        <source>Copy amount</source>
+        <translation>நகலை தொகை</translation>
+    </message>
+    <message>
+        <source>Confirmed</source>
+        <translation>உறுதியாக</translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation>தேதி</translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation>லேபிள்</translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation>விலாசம்</translation>
+    </message>
+    <message>
+        <source>ID</source>
+        <translation>ID</translation>
+    </message>
+    <message>
+        <source>Range:</source>
+        <translation>எல்லை:</translation>
+    </message>
+    </context>
+<context>
+    <name>UnitDisplayStatusBarControl</name>
+    </context>
+<context>
+    <name>WalletFrame</name>
+    </context>
+<context>
+    <name>WalletModel</name>
+    </context>
+<context>
+    <name>WalletView</name>
+    <message>
+        <source>&amp;Export</source>
+        <translation>&amp;ஏற்றுமதி</translation>
+    </message>
+    </context>
+<context>
+    <name>bitcoin-core</name>
+    <message>
+        <source>(default: %u)</source>
+        <translation>(default: %u)</translation>
+    </message>
+    <message>
+        <source>Information</source>
+        <translation>தகவல்</translation>
+    </message>
+    <message>
+        <source>Warning</source>
+        <translation>எச்சரிக்கை</translation>
+    </message>
+    <message>
+        <source>(default: %s)</source>
+        <translation>(default: %s)</translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation>தவறு</translation>
+    </message>
+</context>
+</TS>
\ No newline at end of file
diff --git a/src/qt/locale/bitcoin_th_TH.ts b/src/qt/locale/bitcoin_th_TH.ts
index 79a55cdd518b5..ba3b1e8741baa 100644
--- a/src/qt/locale/bitcoin_th_TH.ts
+++ b/src/qt/locale/bitcoin_th_TH.ts
@@ -1,23 +1,99 @@
 <TS language="th_TH" version="2.1">
 <context>
     <name>AddressBookPage</name>
+    <message>
+        <source>Right-click to edit address or label</source>
+        <translation>คลิกขวาเพื่อแก้ไขที่อยู่ หรือป้ายชื่อ</translation>
+    </message>
     <message>
         <source>Create a new address</source>
         <translation>สร้างที่อยู่ใหม่</translation>
     </message>
+    <message>
+        <source>&amp;New</source>
+        <translation>&amp;สร้างใหม่</translation>
+    </message>
     <message>
         <source>Copy the currently selected address to the system clipboard</source>
         <translation>คัดลอกที่อยู่ที่ถูกเลือกไปยัง คลิปบอร์ดของระบบ</translation>
     </message>
+    <message>
+        <source>&amp;Copy</source>
+        <translation>&amp;คัดลอก</translation>
+    </message>
+    <message>
+        <source>C&amp;lose</source>
+        <translation>&amp;ปิด</translation>
+    </message>
+    <message>
+        <source>&amp;Copy Address</source>
+        <translation>&amp;คัดลอกที่อยู่</translation>
+    </message>
+    <message>
+        <source>Delete the currently selected address from the list</source>
+        <translation>ลบที่อยู่ที่เลือกไว้ในขณะนี้จากรายการ</translation>
+    </message>
+    <message>
+        <source>Export the data in the current tab to a file</source>
+        <translation>ส่งออกข้อมูลที่อยู่ในแท็บไปที่ไฟล์</translation>
+    </message>
+    <message>
+        <source>&amp;Export</source>
+        <translation>&amp;ส่งออก</translation>
+    </message>
     <message>
         <source>&amp;Delete</source>
         <translation>&amp;ลบ</translation>
     </message>
+    <message>
+        <source>Choose the address to send coins to</source>
+        <translation>เลือกที่อยู่เพื่อส่งเหรียญไปไว้</translation>
+    </message>
+    <message>
+        <source>Choose the address to receive coins with</source>
+        <translation>เลือกที่อยู่เพื่อรับเหรียญไว้</translation>
+    </message>
+    <message>
+        <source>C&amp;hoose</source>
+        <translation>&amp;เลือก</translation>
+    </message>
+    <message>
+        <source>Sending addresses</source>
+        <translation>ส่งที่อยู่</translation>
+    </message>
+    <message>
+        <source>Receiving addresses</source>
+        <translation>กำลังรับที่อยู่</translation>
+    </message>
+    <message>
+        <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source>
+        <translation>ที่อยู่เหล่านี้เป็นที่อยู่ Bitcoin ของคุณ สำหรับใช้เพื่อส่งเงิน กรุณาตรวจสอบจำนวนเงินและที่อยู่สำหรับรับเงินก่อนส่งเหรียญไป</translation>
+    </message>
+    <message>
+        <source>Copy &amp;Label</source>
+        <translation>คัดลอก &amp;ป้ายชื่อ</translation>
+    </message>
+    <message>
+        <source>&amp;Edit</source>
+        <translation>&amp;แก้ไข</translation>
+    </message>
+    <message>
+        <source>Export Address List</source>
+        <translation>ส่งออกรายการที่อยู่</translation>
+    </message>
     <message>
         <source>Comma separated file (*.csv)</source>
         <translation>คั่นไฟล์ด้วยเครื่องหมายจุลภาค (*.csv)</translation>
     </message>
-    </context>
+    <message>
+        <source>Exporting Failed</source>
+        <translation>ส่งออกข้อมูลล้มเหลว</translation>
+    </message>
+    <message>
+        <source>There was an error trying to save the address list to %1. Please try again.</source>
+        <translation>พบข้อผิดพลาดบางกระการในการพยายามบันทึกรายชื่อที่อยู่ไปยัง %1. กรุณาลองใหม่อีกครั้ง</translation>
+    </message>
+</context>
 <context>
     <name>AddressTableModel</name>
     <message>
@@ -75,6 +151,10 @@
         <source>Confirm wallet encryption</source>
         <translation>ยืนยันการเข้ารหัสกระเป๋าสตางค์</translation>
     </message>
+    <message>
+        <source>Are you sure you wish to encrypt your wallet?</source>
+        <translation>คุณแน่ใจแล้วหรือว่าต้องการเข้ารหัสกระเป๋าสตางค์ของคุณ?</translation>
+    </message>
     <message>
         <source>Wallet encrypted</source>
         <translation>กระเป๋าสตางค์ถูกเข้ารหัสเรียบร้อยแล้ว</translation>
@@ -129,10 +209,18 @@
         <source>Browse transaction history</source>
         <translation>เรียกดูประวัติการทำธุรกรรม</translation>
     </message>
+    <message>
+        <source>E&amp;xit</source>
+        <translation>E&amp;ออก</translation>
+    </message>
     <message>
         <source>Quit application</source>
         <translation>ออกจากโปรแกรม</translation>
     </message>
+    <message>
+        <source>About &amp;Qt</source>
+        <translation>เกี่ยวกับ &amp;Qt</translation>
+    </message>
     <message>
         <source>&amp;Options...</source>
         <translation>&amp;ตัวเลือก...</translation>
@@ -141,6 +229,30 @@
         <source>Change the passphrase used for wallet encryption</source>
         <translation>เปลี่ยนรหัสผ่านที่ใช้สำหรับการเข้ารหัสกระเป๋าเงิน</translation>
     </message>
+    <message>
+        <source>&amp;Debug window</source>
+        <translation>&amp;หน้าต่างตรวจสอบข้อผิดพลาด</translation>
+    </message>
+    <message>
+        <source>&amp;Verify message...</source>
+        <translation>&amp;ยืนยันข้อความ...</translation>
+    </message>
+    <message>
+        <source>Bitcoin</source>
+        <translation>Bitcoin</translation>
+    </message>
+    <message>
+        <source>Wallet</source>
+        <translation>กระเป๋าสตางค์</translation>
+    </message>
+    <message>
+        <source>&amp;Send</source>
+        <translation>&amp;ส่ง</translation>
+    </message>
+    <message>
+        <source>&amp;Receive</source>
+        <translation>&amp;รับ</translation>
+    </message>
     <message>
         <source>&amp;File</source>
         <translation>&amp;ไฟล์</translation>
@@ -191,6 +303,26 @@
     </context>
 <context>
     <name>CoinControlDialog</name>
+    <message>
+        <source>Amount</source>
+        <translation>จำนวน</translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation>วันที่</translation>
+    </message>
+    <message>
+        <source>Confirmations</source>
+        <translation>การยืนยัน</translation>
+    </message>
+    <message>
+        <source>Confirmed</source>
+        <translation>ยืนยันแล้ว</translation>
+    </message>
+    <message>
+        <source>Priority</source>
+        <translation>ระดับความสำคัญ</translation>
+    </message>
     <message>
         <source>(no label)</source>
         <translation>(ไม่มีชื่อ)</translation>
@@ -273,6 +405,10 @@
     </context>
 <context>
     <name>QObject</name>
+    <message>
+        <source>Amount</source>
+        <translation>จำนวน</translation>
+    </message>
     </context>
 <context>
     <name>QRImageWidget</name>
@@ -293,6 +429,10 @@
         <source>Address</source>
         <translation>ที่อยู่</translation>
     </message>
+    <message>
+        <source>Amount</source>
+        <translation>จำนวน</translation>
+    </message>
     <message>
         <source>Label</source>
         <translation>ชื่อ</translation>
@@ -300,10 +440,18 @@
     </context>
 <context>
     <name>RecentRequestsTableModel</name>
+    <message>
+        <source>Date</source>
+        <translation>วันที่</translation>
+    </message>
     <message>
         <source>Label</source>
         <translation>ชื่อ</translation>
     </message>
+    <message>
+        <source>Amount</source>
+        <translation>จำนวน</translation>
+    </message>
     <message>
         <source>(no label)</source>
         <translation>(ไม่มีชื่อ)</translation>
@@ -345,12 +493,24 @@
     </context>
 <context>
     <name>TransactionDesc</name>
+    <message>
+        <source>Date</source>
+        <translation>วันที่</translation>
+    </message>
+    <message>
+        <source>Amount</source>
+        <translation>จำนวน</translation>
+    </message>
     </context>
 <context>
     <name>TransactionDescDialog</name>
     </context>
 <context>
     <name>TransactionTableModel</name>
+    <message>
+        <source>Date</source>
+        <translation>วันที่</translation>
+    </message>
     <message>
         <source>Label</source>
         <translation>ชื่อ</translation>
@@ -362,10 +522,22 @@
         <source>Today</source>
         <translation>วันนี้</translation>
     </message>
+    <message>
+        <source>Exporting Failed</source>
+        <translation>ส่งออกข้อมูลล้มเหลว</translation>
+    </message>
     <message>
         <source>Comma separated file (*.csv)</source>
         <translation>คั่นไฟล์ด้วยเครื่องหมายจุลภาค (*.csv)</translation>
     </message>
+    <message>
+        <source>Confirmed</source>
+        <translation>ยืนยันแล้ว</translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation>วันที่</translation>
+    </message>
     <message>
         <source>Label</source>
         <translation>ชื่อ</translation>
@@ -390,6 +562,14 @@
 </context>
 <context>
     <name>WalletView</name>
+    <message>
+        <source>&amp;Export</source>
+        <translation>&amp;ส่งออก</translation>
+    </message>
+    <message>
+        <source>Export the data in the current tab to a file</source>
+        <translation>ส่งออกข้อมูลที่อยู่ในแท็บไปที่ไฟล์</translation>
+    </message>
     </context>
 <context>
     <name>bitcoin-core</name>
diff --git a/src/qt/locale/bitcoin_tr.ts b/src/qt/locale/bitcoin_tr.ts
index 96fca8bb24f44..2406776773624 100644
--- a/src/qt/locale/bitcoin_tr.ts
+++ b/src/qt/locale/bitcoin_tr.ts
@@ -1473,10 +1473,6 @@
         <source>General</source>
         <translation>Genel</translation>
     </message>
-    <message>
-        <source>Using OpenSSL version</source>
-        <translation>Kullanılan OpenSSL sürümü</translation>
-    </message>
     <message>
         <source>Using BerkeleyDB version</source>
         <translation>Kullanılan BerkeleyDB sürümü</translation>
@@ -2941,7 +2937,7 @@
     </message>
     <message>
         <source>Prune configured below the minimum of %d MiB.  Please use a higher number.</source>
-        <translation>Prune, asgari değer olan %d MiB'den düşük olarak ayarlanmıştır. Lütfen daha yüksek bir sayı kullanınız.</translation>
+        <translation>Budama, asgari değer olan %d MiB'den düşük olarak ayarlanmıştır. Lütfen daha yüksek bir sayı kullanınız.</translation>
     </message>
     <message>
         <source>Prune: last wallet synchronisation goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of pruned node)</source>
@@ -2979,6 +2975,18 @@
         <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
         <translation>Dışarıdan gelen bağlantıları kabul et (varsayılan: -proxy veya -connect yoksa 1)</translation>
     </message>
+    <message>
+        <source>-fallbackfee is set very high! This is the transaction fee you may pay when fee estimates are not available.</source>
+        <translation>-fallbackfee çok yüksek bir değere ayarlanmış! Ücret tahminleri mevcut değilken ödeyebileceğiniz muamele ücretidir bu.</translation>
+    </message>
+    <message>
+        <source>A fee rate (in %s/kB) that will be used when fee estimation has insufficient data (default: %s)</source>
+        <translation>Ücret tahmini için yetersiz veri bulunduğunda kullanılacak ücret oranı (%s/kB olarak) (varsayılan: %s)</translation>
+    </message>
+    <message>
+        <source>Accept relayed transactions received from whitelisted peers even when not relaying transactions (default: %d)</source>
+        <translation>Muameleler aktarılmadığında dahi beyaz listedeki eşlerden aktarılan muameleleri kabul et (varsayılan: %d)</translation>
+    </message>
     <message>
         <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source>
         <translation>Belirtilen adrese bağlan ve daima ondan dinle. IPv6 için [makine]:port yazımını kullanınız</translation>
@@ -2995,6 +3003,10 @@
         <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source>
         <translation>Bir cüzdan muamelesi değiştiğinde komutu çalıştır (komuttaki %s muamele kimliği ile değiştirilecektir)</translation>
     </message>
+    <message>
+        <source>Force relay of transactions from whitelisted peers even they violate local relay policy (default: %d)</source>
+        <translation>Yerel aktarma politikasını ihlal ettiklerinde bile beyaz listedeki eşlerden gelen muamelelerin aktarılmasını zorla (varsayılan: %d)</translation>
+    </message>
     <message>
         <source>Set the number of script verification threads (%u to %d, 0 = auto, &lt;0 = leave that many cores free, default: %d)</source>
         <translation>Betik kontrolü iş parçacıklarının sayısını belirler (%u ilâ %d, 0 = otomatik, &lt;0 = bu sayıda çekirdeği kullanma, varsayılan: %d)</translation>
@@ -3011,6 +3023,10 @@
         <source>Unable to bind to %s on this computer. Bitcoin Core is probably already running.</source>
         <translation>Bu bilgisayarda %s unsuruna bağlanılamadı. Bitcoin Çekirdeği muhtemelen hâlihazırda çalışmaktadır.</translation>
     </message>
+    <message>
+        <source>Unsupported argument -whitelistalwaysrelay ignored, use -whitelistrelay and/or -whitelistforcerelay.</source>
+        <translation>Desteklenmeyen argüman -whitelistalwaysrelay görmezden gelindi, -whitelistrelay ve/veya -whitelistforcerelay kullanın.</translation>
+    </message>
     <message>
         <source>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</source>
         <translation>Dinlenecek portu haritalamak için UPnP kullan (varsayılan: dinlenildiğinde ve -proxy olmadığında 1)</translation>
@@ -3027,6 +3043,10 @@
         <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source>
         <translation>Uyarı: şebeke tamamen mutabık değil gibi görünüyor! Bazı madenciler sorun yaşıyor gibi görünüyor.</translation>
     </message>
+    <message>
+        <source>Warning: Unknown block versions being mined! It's possible unknown rules are in effect</source>
+        <translation>İkaz: bilinmeyen blok sürümü oluşturulmaya çalışılıyor. Bilinmeyen kuralların işlemesi mümkündür.</translation>
+    </message>
     <message>
         <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source>
         <translation>Uyarı: eşlerimizle tamamen mutabık değiliz gibi görünüyor! Güncelleme yapmanız gerekebilir ya da diğer düğümlerin güncelleme yapmaları gerekebilir.</translation>
@@ -3047,6 +3067,10 @@
         <source>&lt;category&gt; can be:</source>
         <translation>&lt;kategori&gt; şunlar olabilir:</translation>
     </message>
+    <message>
+        <source>Append comment to the user agent string</source>
+        <translation>Kullanıcı aracı zincirine yorumu ekle</translation>
+    </message>
     <message>
         <source>Block creation options:</source>
         <translation>Blok oluşturma seçenekleri:</translation>
@@ -3091,6 +3115,10 @@
         <source>Enable publish raw transaction in &lt;address&gt;</source>
         <translation>Ham muamelenin &lt;adres&gt;te yayınlanmasını etkinleştir</translation>
     </message>
+    <message>
+        <source>Enable transaction replacement in the memory pool (default: %u)</source>
+        <translation>Bellek alanında muamele değiştirmeyi etkinleştir (varsayılan: %u)</translation>
+    </message>
     <message>
         <source>Error initializing block database</source>
         <translation>Blok veritabanını başlatılırken bir hata meydana geldi</translation>
@@ -3127,10 +3155,22 @@
         <source>Invalid -onion address: '%s'</source>
         <translation>Geçersiz -onion adresi: '%s'</translation>
     </message>
+    <message>
+        <source>Invalid amount for -fallbackfee=&lt;amount&gt;: '%s'</source>
+        <translation> -fallbackfee=&lt;meblağ&gt; için geçersiz meblağ: '%s'</translation>
+    </message>
     <message>
         <source>Keep the transaction memory pool below &lt;n&gt; megabytes (default: %u)</source>
         <translation>Muamele bellek alanını &lt;n&gt; megabayttan düşük tut (varsayılan: %u)</translation>
     </message>
+    <message>
+        <source>Location of the auth cookie (default: data dir)</source>
+        <translation>auth çerezinin konumu (varsayılan: veri klasörü)</translation>
+    </message>
+    <message>
+        <source>Minimum bytes per sigop in transactions we relay and mine (default: %u)</source>
+        <translation>Aktardığımız ve oluşturduğumuz muamelelerdeki sigop başına asgari bayt (varsayılan: %u)</translation>
+    </message>
     <message>
         <source>Not enough file descriptors available.</source>
         <translation>Kafi derecede dosya tanımlayıcıları mevcut değil.</translation>
@@ -3139,13 +3179,17 @@
         <source>Only connect to nodes in network &lt;net&gt; (ipv4, ipv6 or onion)</source>
         <translation>Sadece &lt;net&gt; şebekesindeki düğümlere bağlan (ipv4, ipv6 veya onion)</translation>
     </message>
+    <message>
+        <source>Print version and exit</source>
+        <translation>Sürümü yaz ve çık</translation>
+    </message>
     <message>
         <source>Prune cannot be configured with a negative value.</source>
-        <translation>Prune negatif bir değerle yapılandırılamaz.</translation>
+        <translation>Budama negatif bir değerle yapılandırılamaz.</translation>
     </message>
     <message>
         <source>Prune mode is incompatible with -txindex.</source>
-        <translation>Prune kipi -txindex ile uyumsuzdur.</translation>
+        <translation>Budama kipi -txindex ile uyumsuzdur.</translation>
     </message>
     <message>
         <source>Set database cache size in megabytes (%d to %d, default: %d)</source>
@@ -3195,10 +3239,6 @@
         <source>Wallet options:</source>
         <translation>Cüzdan seçenekleri:</translation>
     </message>
-    <message>
-        <source>Warning: This version is obsolete; upgrade required!</source>
-        <translation>Uyarı: Bu sürüm çok eskidir; güncellemeniz gerekir!</translation>
-    </message>
     <message>
         <source>You need to rebuild the database using -reindex to change -txindex</source>
         <translation>-txindex'i değiştirmek için veritabanını -reindex kullanarak tekrar inşa etmeniz gerekmektedir</translation>
@@ -3281,7 +3321,7 @@
     </message>
     <message>
         <source>You need to rebuild the database using -reindex to go back to unpruned mode.  This will redownload the entire blockchain</source>
-        <translation>Prune olmayan kipe dönmek için veritabanını -reindex ile tekrar derlemeniz gerekir. Bu, tüm blok zincirini tekrar indirecektir</translation>
+        <translation>Budama olmayan kipe dönmek için veritabanını -reindex ile tekrar derlemeniz gerekir. Bu, tüm blok zincirini tekrar indirecektir</translation>
     </message>
     <message>
         <source>(default: %u)</source>
@@ -3295,10 +3335,6 @@
         <source>Activating best chain...</source>
         <translation>En iyi zincir etkinleştiriliyor...</translation>
     </message>
-    <message>
-        <source>Always relay transactions received from whitelisted peers (default: %d)</source>
-        <translation>Beyaz listedeki eşlerden gelen muameleleri daima aktar (varsayılan: %d)</translation>
-    </message>
     <message>
         <source>Attempt to recover private keys from a corrupt wallet.dat on startup</source>
         <translation>Başlangıçta bozuk bir wallet.dat dosyasından özel anahtarları geri kazanmayı dene</translation>
@@ -3463,6 +3499,10 @@
         <source>Warning</source>
         <translation>Uyarı</translation>
     </message>
+    <message>
+        <source>Warning: unknown new rules activated (versionbit %i)</source>
+        <translation>İkaz: bilinmeyen yeni kurallar etkinleştirilmiştir (versionbit %i)</translation>
+    </message>
     <message>
         <source>Whether to operate in a blocks only mode (default: %u)</source>
         <translation>Salt blok kipinde çalışılıp çalışılmayacağı (varsayılan: %u)</translation>
diff --git a/src/qt/locale/bitcoin_tr_TR.ts b/src/qt/locale/bitcoin_tr_TR.ts
index 10866b011b867..979aeea03811f 100644
--- a/src/qt/locale/bitcoin_tr_TR.ts
+++ b/src/qt/locale/bitcoin_tr_TR.ts
@@ -85,6 +85,10 @@
         <source>Export Address List</source>
         <translation>Adres Listesini Dışa Aktar</translation>
     </message>
+    <message>
+        <source>Comma separated file (*.csv)</source>
+        <translation>Virgül ile ayrılmış dosya (*.csv)</translation>
+    </message>
     <message>
         <source>Exporting Failed</source>
         <translation>Dışa Aktarma Başarısız Oldu</translation>
@@ -246,6 +250,10 @@
         <source>Exporting Failed</source>
         <translation>Dışa Aktarma Başarısız Oldu</translation>
     </message>
+    <message>
+        <source>Comma separated file (*.csv)</source>
+        <translation>Virgül ile ayrılmış dosya (*.csv)</translation>
+    </message>
     <message>
         <source>Label</source>
         <translation>Etiket</translation>
diff --git a/src/qt/locale/bitcoin_uk.ts b/src/qt/locale/bitcoin_uk.ts
index ea783aa8569ca..64df7b5ba5780 100644
--- a/src/qt/locale/bitcoin_uk.ts
+++ b/src/qt/locale/bitcoin_uk.ts
@@ -1473,10 +1473,6 @@
         <source>General</source>
         <translation>Загальна</translation>
     </message>
-    <message>
-        <source>Using OpenSSL version</source>
-        <translation>Використовується OpenSSL версії</translation>
-    </message>
     <message>
         <source>Using BerkeleyDB version</source>
         <translation>Використовується BerkeleyDB версії</translation>
@@ -3139,6 +3135,10 @@
         <source>Only connect to nodes in network &lt;net&gt; (ipv4, ipv6 or onion)</source>
         <translation>Підключатися тільки до вузлів в мережі &lt;net&gt; (ipv4, ipv6 або onion)</translation>
     </message>
+    <message>
+        <source>Print version and exit</source>
+        <translation>Версія для друку і виходу</translation>
+    </message>
     <message>
         <source>Prune cannot be configured with a negative value.</source>
         <translation>Розмір скороченого ланцюжка блоків не може бути від'ємним. </translation>
@@ -3195,10 +3195,6 @@
         <source>Wallet options:</source>
         <translation>Параметри гаманця:</translation>
     </message>
-    <message>
-        <source>Warning: This version is obsolete; upgrade required!</source>
-        <translation>Увага: Поточна версія застаріла, необхідне оновлення!</translation>
-    </message>
     <message>
         <source>You need to rebuild the database using -reindex to change -txindex</source>
         <translation>Вам необхідно перебудувати базу даних з використанням -reindex для того, щоб змінити -txindex</translation>
@@ -3295,10 +3291,6 @@
         <source>Activating best chain...</source>
         <translation>Активація найкращого ланцюжка...</translation>
     </message>
-    <message>
-        <source>Always relay transactions received from whitelisted peers (default: %d)</source>
-        <translation>Завжди передавайте транзакції отримані від пірів з білого списку (типово: %d)</translation>
-    </message>
     <message>
         <source>Attempt to recover private keys from a corrupt wallet.dat on startup</source>
         <translation>Спочатку спробуйте відновити приватні ключі в пошкодженому wallet.dat </translation>
diff --git a/src/qt/locale/bitcoin_uz@Cyrl.ts b/src/qt/locale/bitcoin_uz@Cyrl.ts
index 86724564ffc07..a9f9af6683e50 100644
--- a/src/qt/locale/bitcoin_uz@Cyrl.ts
+++ b/src/qt/locale/bitcoin_uz@Cyrl.ts
@@ -1167,10 +1167,6 @@
         <source>General</source>
         <translation>Асосий</translation>
     </message>
-    <message>
-        <source>Using OpenSSL version</source>
-        <translation>Фойдаланилаётган OpenSSL версияси</translation>
-    </message>
     <message>
         <source>Using BerkeleyDB version</source>
         <translation>Фойдаланилаётган BerkeleyDB версияси</translation>
diff --git a/src/qt/locale/bitcoin_uz@Latn.ts b/src/qt/locale/bitcoin_uz@Latn.ts
new file mode 100644
index 0000000000000..2e4dabb59fb78
--- /dev/null
+++ b/src/qt/locale/bitcoin_uz@Latn.ts
@@ -0,0 +1,169 @@
+<TS language="uz@Latn" version="2.1">
+<context>
+    <name>AddressBookPage</name>
+    <message>
+        <source>Create a new address</source>
+        <translation>Yangi manzil yaratish</translation>
+    </message>
+    <message>
+        <source>&amp;New</source>
+        <translation>&amp;Yangi</translation>
+    </message>
+    <message>
+        <source>&amp;Copy</source>
+        <translation>&amp;Nusxalash</translation>
+    </message>
+    <message>
+        <source>C&amp;lose</source>
+        <translation>Yo&amp;pish</translation>
+    </message>
+    <message>
+        <source>&amp;Copy Address</source>
+        <translation>&amp;Manzillarni nusxalash</translation>
+    </message>
+    <message>
+        <source>&amp;Delete</source>
+        <translation>&amp;O'chirish</translation>
+    </message>
+    </context>
+<context>
+    <name>AddressTableModel</name>
+    <message>
+        <source>Label</source>
+        <translation>Yorliq</translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation>Manzil</translation>
+    </message>
+    </context>
+<context>
+    <name>AskPassphraseDialog</name>
+    </context>
+<context>
+    <name>BanTableModel</name>
+    </context>
+<context>
+    <name>BitcoinGUI</name>
+    </context>
+<context>
+    <name>ClientModel</name>
+    </context>
+<context>
+    <name>CoinControlDialog</name>
+    </context>
+<context>
+    <name>EditAddressDialog</name>
+    </context>
+<context>
+    <name>FreespaceChecker</name>
+    </context>
+<context>
+    <name>HelpMessageDialog</name>
+    </context>
+<context>
+    <name>Intro</name>
+    </context>
+<context>
+    <name>OpenURIDialog</name>
+    </context>
+<context>
+    <name>OptionsDialog</name>
+    </context>
+<context>
+    <name>OverviewPage</name>
+    </context>
+<context>
+    <name>PaymentServer</name>
+    </context>
+<context>
+    <name>PeerTableModel</name>
+    </context>
+<context>
+    <name>QObject</name>
+    </context>
+<context>
+    <name>QRImageWidget</name>
+    </context>
+<context>
+    <name>RPCConsole</name>
+    </context>
+<context>
+    <name>ReceiveCoinsDialog</name>
+    </context>
+<context>
+    <name>ReceiveRequestDialog</name>
+    <message>
+        <source>Address</source>
+        <translation>Manzil</translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation>Yorliq</translation>
+    </message>
+    </context>
+<context>
+    <name>RecentRequestsTableModel</name>
+    <message>
+        <source>Label</source>
+        <translation>Yorliq</translation>
+    </message>
+    </context>
+<context>
+    <name>SendCoinsDialog</name>
+    </context>
+<context>
+    <name>SendCoinsEntry</name>
+    </context>
+<context>
+    <name>ShutdownWindow</name>
+    </context>
+<context>
+    <name>SignVerifyMessageDialog</name>
+    </context>
+<context>
+    <name>SplashScreen</name>
+    </context>
+<context>
+    <name>TrafficGraphWidget</name>
+    </context>
+<context>
+    <name>TransactionDesc</name>
+    </context>
+<context>
+    <name>TransactionDescDialog</name>
+    </context>
+<context>
+    <name>TransactionTableModel</name>
+    <message>
+        <source>Label</source>
+        <translation>Yorliq</translation>
+    </message>
+    </context>
+<context>
+    <name>TransactionView</name>
+    <message>
+        <source>Label</source>
+        <translation>Yorliq</translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation>Manzil</translation>
+    </message>
+    </context>
+<context>
+    <name>UnitDisplayStatusBarControl</name>
+    </context>
+<context>
+    <name>WalletFrame</name>
+    </context>
+<context>
+    <name>WalletModel</name>
+    </context>
+<context>
+    <name>WalletView</name>
+    </context>
+<context>
+    <name>bitcoin-core</name>
+    </context>
+</TS>
\ No newline at end of file
diff --git a/src/qt/locale/bitcoin_zh_CN.ts b/src/qt/locale/bitcoin_zh_CN.ts
index 0ae2c95c62a1a..cc1b03356480e 100644
--- a/src/qt/locale/bitcoin_zh_CN.ts
+++ b/src/qt/locale/bitcoin_zh_CN.ts
@@ -1473,10 +1473,6 @@
         <source>General</source>
         <translation>常规</translation>
     </message>
-    <message>
-        <source>Using OpenSSL version</source>
-        <translation>使用 OpenSSL 版本</translation>
-    </message>
     <message>
         <source>Using BerkeleyDB version</source>
         <translation>使用的 BerkeleyDB 版本</translation>
@@ -2942,6 +2938,14 @@
         <source>Prune configured below the minimum of %d MiB.  Please use a higher number.</source>
         <translation>修剪值被设置为低于最小值%d MiB，请使用更大的数值。</translation>
     </message>
+    <message>
+        <source>Prune: last wallet synchronisation goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of pruned node)</source>
+        <translation>修剪：最后的钱包同步超过了修剪的数据。你需要通过 -reindex (重新下载整个区块链以防修剪节点)</translation>
+    </message>
+    <message>
+        <source>Reduce storage requirements by pruning (deleting) old blocks. This mode is incompatible with -txindex and -rescan. Warning: Reverting this setting requires re-downloading the entire blockchain. (default: 0 = disable pruning blocks, &gt;%u = target size in MiB to use for block files)</source>
+        <translation>通过修剪(删除)旧数据块减少存储需求。此模式与 -txindex 和 -rescan不兼容。警告：还原此设置需要重新下载整个区块链。(默认: 0 = 禁用修剪数据块， &gt;%u = 数据块文件目标大小，单位 MiB)</translation>
+    </message>
     <message>
         <source>Rescans are not possible in pruned mode. You will need to use -reindex which will download the whole blockchain again.</source>
         <translation>无法在开启修剪的状态下重扫描，请使用 -reindex重新下载完整的区块链。</translation>
@@ -2972,6 +2976,18 @@
         <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
         <translation>接受来自外部的连接 (缺省: 如果不带 -proxy or -connect 参数设置为1)</translation>
     </message>
+    <message>
+        <source>-fallbackfee is set very high! This is the transaction fee you may pay when fee estimates are not available.</source>
+        <translation>-fallbackfree 交易费设置得很高！这是在费用估计不可用时你可能会支付的交易费。</translation>
+    </message>
+    <message>
+        <source>A fee rate (in %s/kB) that will be used when fee estimation has insufficient data (default: %s)</source>
+        <translation>当费用估计数据(default: %s)不足时将会启用的费率 (in %s/kB) </translation>
+    </message>
+    <message>
+        <source>Accept relayed transactions received from whitelisted peers even when not relaying transactions (default: %d)</source>
+        <translation>即使在无关联交易(默认: %d)时也接受来自白名单同行的关联交易</translation>
+    </message>
     <message>
         <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source>
         <translation>绑定指定的IP地址开始监听。IPv6地址请使用[host]:port 格式</translation>
@@ -2988,6 +3004,10 @@
         <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source>
         <translation>当最佳区块变化时执行命令 (命令行中的 %s 会被替换成区块哈希值)</translation>
     </message>
+    <message>
+        <source>Force relay of transactions from whitelisted peers even they violate local relay policy (default: %d)</source>
+        <translation>强制关联来自白名单同行的交易即使他们违反本地关联政策(默认: %d)</translation>
+    </message>
     <message>
         <source>Set the number of script verification threads (%u to %d, 0 = auto, &lt;0 = leave that many cores free, default: %d)</source>
         <translation>设置脚本验证的程序 (%u 到 %d, 0 = 自动, &lt;0 = 保留自由的核心, 默认值: %d)</translation>
@@ -3004,6 +3024,10 @@
         <source>Unable to bind to %s on this computer. Bitcoin Core is probably already running.</source>
         <translation>无法 %s的绑定到电脑上，比特币核心钱包可能已经在运行。</translation>
     </message>
+    <message>
+        <source>Unsupported argument -whitelistalwaysrelay ignored, use -whitelistrelay and/or -whitelistforcerelay.</source>
+        <translation>一个不被支持的参数 -whitelistalwaysrelay 被忽略了。请使用 -whitelistrelay 或者 -whitelistforcerelay.</translation>
+    </message>
     <message>
         <source>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</source>
         <translation>使用UPnP暴露本机监听端口（默认：1 当正在监听且不使用代理）</translation>
@@ -3020,6 +3044,10 @@
         <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source>
         <translation>警告：网络似乎并不完全同意！有些矿工似乎遇到了问题。</translation>
     </message>
+    <message>
+        <source>Warning: Unknown block versions being mined! It's possible unknown rules are in effect</source>
+        <translation>警告: 未知的区块版本被挖掘！未知规则可能已生效</translation>
+    </message>
     <message>
         <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source>
         <translation>警告：我们的同行似乎不完全同意！您可能需要升级，或者其他节点可能需要升级。</translation>
@@ -3040,6 +3068,10 @@
         <source>&lt;category&gt; can be:</source>
         <translation>&lt;category&gt; 可能是：</translation>
     </message>
+    <message>
+        <source>Append comment to the user agent string</source>
+        <translation>为用户代理字符串附加说明</translation>
+    </message>
     <message>
         <source>Block creation options:</source>
         <translation>数据块创建选项：</translation>
@@ -3084,6 +3116,10 @@
         <source>Enable publish raw transaction in &lt;address&gt;</source>
         <translation>允许在&lt;address&gt;广播原始交易</translation>
     </message>
+    <message>
+        <source>Enable transaction replacement in the memory pool (default: %u)</source>
+        <translation>保证内存池中的交易更换(默认：%u)</translation>
+    </message>
     <message>
         <source>Error initializing block database</source>
         <translation>初始化数据块数据库出错</translation>
@@ -3120,10 +3156,22 @@
         <source>Invalid -onion address: '%s'</source>
         <translation>无效的 -onion 地址：“%s”</translation>
     </message>
+    <message>
+        <source>Invalid amount for -fallbackfee=&lt;amount&gt;: '%s'</source>
+        <translation>-fallbackfee 的无效数额=&lt;amount&gt;: '%s'</translation>
+    </message>
     <message>
         <source>Keep the transaction memory pool below &lt;n&gt; megabytes (default: %u)</source>
         <translation>保持交易内存池大小低于&lt;n&gt;MB（默认：%u）</translation>
     </message>
+    <message>
+        <source>Location of the auth cookie (default: data dir)</source>
+        <translation>认证Cookie的位置 (默认: data目录)</translation>
+    </message>
+    <message>
+        <source>Minimum bytes per sigop in transactions we relay and mine (default: %u)</source>
+        <translation>我们关联和挖掘的每sigop的最低交易字节(默认: %u)</translation>
+    </message>
     <message>
         <source>Not enough file descriptors available.</source>
         <translation>没有足够的文件描述符可用。</translation>
@@ -3132,6 +3180,10 @@
         <source>Only connect to nodes in network &lt;net&gt; (ipv4, ipv6 or onion)</source>
         <translation>只连接 &lt;net&gt;网络中的节点 (ipv4, ipv6 或 onion) </translation>
     </message>
+    <message>
+        <source>Print version and exit</source>
+        <translation>打印版本信息并退出</translation>
+    </message>
     <message>
         <source>Prune cannot be configured with a negative value.</source>
         <translation>修剪不能配置一个负数。</translation>
@@ -3168,6 +3220,10 @@
         <source>Use UPnP to map the listening port (default: %u)</source>
         <translation>使用UPnp映射监听端口 (默认: %u) </translation>
     </message>
+    <message>
+        <source>User Agent comment (%s) contains unsafe characters.</source>
+        <translation>用户代理评论(%s)包含不安全的字符。</translation>
+    </message>
     <message>
         <source>Verifying blocks...</source>
         <translation>正在验证数据库的完整性...</translation>
@@ -3184,10 +3240,6 @@
         <source>Wallet options:</source>
         <translation>钱包选项:</translation>
     </message>
-    <message>
-        <source>Warning: This version is obsolete; upgrade required!</source>
-        <translation>警告：此版本已过时，必须升级！</translation>
-    </message>
     <message>
         <source>You need to rebuild the database using -reindex to change -txindex</source>
         <translation>您需要将 -reindex 改为 -txindex 以重建数据库</translation>
@@ -3224,6 +3276,10 @@
         <source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source>
         <translation>当收到相关提醒或者我们看到一个长分叉时执行命令（%s 将替换为消息）</translation>
     </message>
+    <message>
+        <source>Fees (in %s/kB) smaller than this are considered zero fee for relaying, mining and transaction creation (default: %s)</source>
+        <translation>交易费(in %s/kB)比这更小的在关联、挖掘和生成交易时将被视为零费交易 (默认: %s)</translation>
+    </message>
     <message>
         <source>If paytxfee is not set, include enough fee so transactions begin confirmation on average within n blocks (default: %u)</source>
         <translation>如果未设置交易费用，自动添加足够的交易费以确保交易在平均n个数据块内被确认 (默认: %u) </translation>
@@ -3280,6 +3336,14 @@
         <source>Activating best chain...</source>
         <translation>正在激活最佳数据链...</translation>
     </message>
+    <message>
+        <source>Attempt to recover private keys from a corrupt wallet.dat on startup</source>
+        <translation>尝试从启动页上的损坏钱包文件中恢复私钥</translation>
+    </message>
+    <message>
+        <source>Automatically create Tor hidden service (default: %d)</source>
+        <translation>自动建立Tor隐藏服务 (默认:%d)</translation>
+    </message>
     <message>
         <source>Cannot resolve -whitebind address: '%s'</source>
         <translation>无法解析 -whitebind 地址: '%s'</translation>
diff --git a/src/qt/locale/bitcoin_zh_HK.ts b/src/qt/locale/bitcoin_zh_HK.ts
new file mode 100644
index 0000000000000..740a86e117024
--- /dev/null
+++ b/src/qt/locale/bitcoin_zh_HK.ts
@@ -0,0 +1,521 @@
+<TS language="zh_HK" version="2.1">
+<context>
+    <name>AddressBookPage</name>
+    <message>
+        <source>Right-click to edit address or label</source>
+        <translation>按右擊修改位址或標記</translation>
+    </message>
+    <message>
+        <source>Create a new address</source>
+        <translation>新增一個位址</translation>
+    </message>
+    <message>
+        <source>&amp;New</source>
+        <translation>新增 &amp;N</translation>
+    </message>
+    <message>
+        <source>Copy the currently selected address to the system clipboard</source>
+        <translation>複製目前選擇的位址到系統剪貼簿</translation>
+    </message>
+    <message>
+        <source>&amp;Copy</source>
+        <translation>複製 &amp;C</translation>
+    </message>
+    <message>
+        <source>C&amp;lose</source>
+        <translation>關閉 &amp;l</translation>
+    </message>
+    <message>
+        <source>&amp;Copy Address</source>
+        <translation>複製位址 &amp;C</translation>
+    </message>
+    <message>
+        <source>Delete the currently selected address from the list</source>
+        <translation>把目前選擇的位址從列表中刪除</translation>
+    </message>
+    <message>
+        <source>Export the data in the current tab to a file</source>
+        <translation>把目前分頁的資料匯出至檔案</translation>
+    </message>
+    <message>
+        <source>&amp;Export</source>
+        <translation>匯出 &amp;E</translation>
+    </message>
+    <message>
+        <source>&amp;Delete</source>
+        <translation>刪除 &amp;D</translation>
+    </message>
+    <message>
+        <source>Choose the address to send coins to</source>
+        <translation>選擇要付錢過去的位址</translation>
+    </message>
+    <message>
+        <source>Choose the address to receive coins with</source>
+        <translation>選擇要收錢的位址</translation>
+    </message>
+    <message>
+        <source>C&amp;hoose</source>
+        <translation>選取 &amp;h</translation>
+    </message>
+    <message>
+        <source>Sending addresses</source>
+        <translation>付款位址</translation>
+    </message>
+    <message>
+        <source>Receiving addresses</source>
+        <translation>收款位址</translation>
+    </message>
+    <message>
+        <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source>
+        <translation>這些是你要付款過去的 Bitcoin 位址。在付款之前，務必要檢查金額和收款位址是否正確。</translation>
+    </message>
+    <message>
+        <source>These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source>
+        <translation>這些是你用來收款的 Bitcoin 位址。建議在每次交易時，都使用一個新的收款位址。</translation>
+    </message>
+    <message>
+        <source>Copy &amp;Label</source>
+        <translation>複製標記 &amp;L</translation>
+    </message>
+    <message>
+        <source>&amp;Edit</source>
+        <translation>編輯 &amp;E</translation>
+    </message>
+    <message>
+        <source>Export Address List</source>
+        <translation>匯出位址清單</translation>
+    </message>
+    <message>
+        <source>Comma separated file (*.csv)</source>
+        <translation>逗號分隔檔(*.csv)</translation>
+    </message>
+    <message>
+        <source>Exporting Failed</source>
+        <translation>匯出失敗</translation>
+    </message>
+    <message>
+        <source>There was an error trying to save the address list to %1. Please try again.</source>
+        <translation>儲存位址列表到 %1 時發生錯誤。請再試一次。</translation>
+    </message>
+</context>
+<context>
+    <name>AddressTableModel</name>
+    <message>
+        <source>Label</source>
+        <translation>標記</translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation>位址</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(無標記)</translation>
+    </message>
+</context>
+<context>
+    <name>AskPassphraseDialog</name>
+    <message>
+        <source>Passphrase Dialog</source>
+        <translation>複雜密碼對話方塊</translation>
+    </message>
+    <message>
+        <source>Enter passphrase</source>
+        <translation>請輸入密碼</translation>
+    </message>
+    <message>
+        <source>New passphrase</source>
+        <translation>新密碼</translation>
+    </message>
+    <message>
+        <source>Repeat new passphrase</source>
+        <translation>重複新密碼</translation>
+    </message>
+    <message>
+        <source>Encrypt wallet</source>
+        <translation>加密錢包</translation>
+    </message>
+    <message>
+        <source>This operation needs your wallet passphrase to unlock the wallet.</source>
+        <translation>這個動作需要你的錢包密碼來將錢包解鎖。</translation>
+    </message>
+    <message>
+        <source>Unlock wallet</source>
+        <translation>解鎖錢包</translation>
+    </message>
+    <message>
+        <source>This operation needs your wallet passphrase to decrypt the wallet.</source>
+        <translation>這個動作需要你的錢包密碼來將錢包解密。</translation>
+    </message>
+    <message>
+        <source>Decrypt wallet</source>
+        <translation>解密錢包</translation>
+    </message>
+    <message>
+        <source>Change passphrase</source>
+        <translation>改變密碼</translation>
+    </message>
+    <message>
+        <source>Confirm wallet encryption</source>
+        <translation>確認錢包加密</translation>
+    </message>
+    <message>
+        <source>Warning: If you encrypt your wallet and lose your passphrase, you will &lt;b&gt;LOSE ALL OF YOUR BITCOINS&lt;/b&gt;!</source>
+        <translation>警告: 如果把錢包加密後又忘記密碼，你就會&lt;b&gt;失去所有 Bitcoin 了&lt;/b&gt;！</translation>
+    </message>
+    <message>
+        <source>Are you sure you wish to encrypt your wallet?</source>
+        <translation>你確定要把錢包加密嗎？</translation>
+    </message>
+    <message>
+        <source>Bitcoin Core will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source>
+        <translation>Bitcoin Core 現在要關閉以完成加密程序。請記得將錢包加密不能完全防止你的 Bitcoin 經被入侵電腦的惡意程式偷取。</translation>
+    </message>
+    <message>
+        <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source>
+        <translation>重要: 請改用新產生的加密錢包檔，來取代所以舊錢包檔的備份。為安全計，當你開始使用新的加密錢包檔後，舊錢包檔的備份就不能再使用了。</translation>
+    </message>
+    <message>
+        <source>Warning: The Caps Lock key is on!</source>
+        <translation>警告: Caps Lock 已啟用！</translation>
+    </message>
+    <message>
+        <source>Wallet encrypted</source>
+        <translation>錢包已加密</translation>
+    </message>
+    <message>
+        <source>Enter the new passphrase to the wallet.&lt;br/&gt;Please use a passphrase of &lt;b&gt;ten or more random characters&lt;/b&gt;, or &lt;b&gt;eight or more words&lt;/b&gt;.</source>
+        <translation>輸入錢包的新密碼。&lt;br/&gt;密碼請用&lt;b&gt;10 個或以上的隨機字元&lt;/b&gt;，或是&lt;b&gt;8 個或以上的字詞&lt;/b&gt;。</translation>
+    </message>
+    <message>
+        <source>Enter the old passphrase and new passphrase to the wallet.</source>
+        <translation>請輸入舊密碼和新密碼至錢包。</translation>
+    </message>
+    <message>
+        <source>Wallet encryption failed</source>
+        <translation>錢包加密失敗</translation>
+    </message>
+    <message>
+        <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
+        <translation>因內部錯誤導致錢包加密失敗。你的錢包尚未加密。</translation>
+    </message>
+    <message>
+        <source>The supplied passphrases do not match.</source>
+        <translation>提供的密碼不一樣。</translation>
+    </message>
+    <message>
+        <source>Wallet unlock failed</source>
+        <translation>錢包解鎖失敗</translation>
+    </message>
+    <message>
+        <source>The passphrase entered for the wallet decryption was incorrect.</source>
+        <translation>用來解密錢包的密碼不對。</translation>
+    </message>
+    <message>
+        <source>Wallet decryption failed</source>
+        <translation>錢包解密失敗</translation>
+    </message>
+    <message>
+        <source>Wallet passphrase was successfully changed.</source>
+        <translation>錢包密碼已成功更改。</translation>
+    </message>
+</context>
+<context>
+    <name>BanTableModel</name>
+    <message>
+        <source>IP/Netmask</source>
+        <translation>IP位址/遮罩</translation>
+    </message>
+    <message>
+        <source>Banned Until</source>
+        <translation>封鎖至</translation>
+    </message>
+</context>
+<context>
+    <name>BitcoinGUI</name>
+    <message>
+        <source>Sign &amp;message...</source>
+        <translation>簽署訊息... &amp;m</translation>
+    </message>
+    <message>
+        <source>Synchronizing with network...</source>
+        <translation>與網絡同步中...</translation>
+    </message>
+    <message>
+        <source>&amp;Overview</source>
+        <translation>總覽 &amp;O</translation>
+    </message>
+    <message>
+        <source>Node</source>
+        <translation>節點</translation>
+    </message>
+    <message>
+        <source>Show general overview of wallet</source>
+        <translation>顯示錢包一般總覽</translation>
+    </message>
+    <message>
+        <source>&amp;Transactions</source>
+        <translation>交易 &amp;T</translation>
+    </message>
+    <message>
+        <source>Browse transaction history</source>
+        <translation>瀏覽交易紀錄</translation>
+    </message>
+    <message>
+        <source>E&amp;xit</source>
+        <translation>結束 &amp;x</translation>
+    </message>
+    <message>
+        <source>Quit application</source>
+        <translation>結束應用程式</translation>
+    </message>
+    <message>
+        <source>About &amp;Qt</source>
+        <translation>關於 Qt &amp;Q</translation>
+    </message>
+    <message>
+        <source>Show information about Qt</source>
+        <translation>顯示 Qt 相關資訊</translation>
+    </message>
+    <message>
+        <source>&amp;Options...</source>
+        <translation>選項... &amp;O</translation>
+    </message>
+    <message>
+        <source>&amp;Encrypt Wallet...</source>
+        <translation>加密錢包... &amp;E</translation>
+    </message>
+    <message>
+        <source>&amp;Backup Wallet...</source>
+        <translation>備份錢包... &amp;B</translation>
+    </message>
+    <message>
+        <source>&amp;Change Passphrase...</source>
+        <translation>改變密碼... &amp;C</translation>
+    </message>
+    <message>
+        <source>&amp;Sending addresses...</source>
+        <translation>付款位址... &amp;S</translation>
+    </message>
+    <message>
+        <source>&amp;Receiving addresses...</source>
+        <translation>收款位址... &amp;R</translation>
+    </message>
+    <message>
+        <source>Open &amp;URI...</source>
+        <translation>開啓網址... &amp;U</translation>
+    </message>
+    <message>
+        <source>Bitcoin Core client</source>
+        <translation>Bitcoin Core 客戶端</translation>
+    </message>
+    <message>
+        <source>Importing blocks from disk...</source>
+        <translation>正在從磁碟匯入區塊資料...</translation>
+    </message>
+    <message>
+        <source>Reindexing blocks on disk...</source>
+        <translation>正在為磁碟區塊重建索引...</translation>
+    </message>
+    <message>
+        <source>Send coins to a Bitcoin address</source>
+        <translation>付款至一個 Bitcoin 位址</translation>
+    </message>
+    <message>
+        <source>Backup wallet to another location</source>
+        <translation>把錢包備份到其它地方</translation>
+    </message>
+    <message>
+        <source>Change the passphrase used for wallet encryption</source>
+        <translation>改變錢包加密用的密碼</translation>
+    </message>
+    <message>
+        <source>&amp;Debug window</source>
+        <translation>除錯視窗 &amp;D</translation>
+    </message>
+    <message>
+        <source>Open debugging and diagnostic console</source>
+        <translation>開啓除錯和診斷主控台</translation>
+    </message>
+    <message>
+        <source>&amp;Verify message...</source>
+        <translation>驗證訊息... &amp;V</translation>
+    </message>
+    <message>
+        <source>Bitcoin</source>
+        <translation>Bitcoin</translation>
+    </message>
+    <message>
+        <source>Wallet</source>
+        <translation>錢包</translation>
+    </message>
+    <message>
+        <source>&amp;Send</source>
+        <translation>付款 &amp;S</translation>
+    </message>
+    <message>
+        <source>&amp;Receive</source>
+        <translation>收款 &amp;R</translation>
+    </message>
+    <message>
+        <source>Show information about Bitcoin Core</source>
+        <translation>顯示 Bitcoin Core 的相關資訊</translation>
+    </message>
+    <message>
+        <source>&amp;Show / Hide</source>
+        <translation>顯示 / 隱藏 &amp;S</translation>
+    </message>
+    <message>
+        <source>Show or hide the main Window</source>
+        <translation>顯示或隱藏主視窗</translation>
+    </message>
+    </context>
+<context>
+    <name>ClientModel</name>
+    </context>
+<context>
+    <name>CoinControlDialog</name>
+    <message>
+        <source>(no label)</source>
+        <translation>(無標記)</translation>
+    </message>
+    </context>
+<context>
+    <name>EditAddressDialog</name>
+    </context>
+<context>
+    <name>FreespaceChecker</name>
+    </context>
+<context>
+    <name>HelpMessageDialog</name>
+    </context>
+<context>
+    <name>Intro</name>
+    </context>
+<context>
+    <name>OpenURIDialog</name>
+    </context>
+<context>
+    <name>OptionsDialog</name>
+    </context>
+<context>
+    <name>OverviewPage</name>
+    </context>
+<context>
+    <name>PaymentServer</name>
+    </context>
+<context>
+    <name>PeerTableModel</name>
+    </context>
+<context>
+    <name>QObject</name>
+    </context>
+<context>
+    <name>QRImageWidget</name>
+    </context>
+<context>
+    <name>RPCConsole</name>
+    </context>
+<context>
+    <name>ReceiveCoinsDialog</name>
+    </context>
+<context>
+    <name>ReceiveRequestDialog</name>
+    <message>
+        <source>Address</source>
+        <translation>位址</translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation>標記</translation>
+    </message>
+    </context>
+<context>
+    <name>RecentRequestsTableModel</name>
+    <message>
+        <source>Label</source>
+        <translation>標記</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(無標記)</translation>
+    </message>
+    </context>
+<context>
+    <name>SendCoinsDialog</name>
+    <message>
+        <source>(no label)</source>
+        <translation>(無標記)</translation>
+    </message>
+    </context>
+<context>
+    <name>SendCoinsEntry</name>
+    </context>
+<context>
+    <name>ShutdownWindow</name>
+    </context>
+<context>
+    <name>SignVerifyMessageDialog</name>
+    </context>
+<context>
+    <name>SplashScreen</name>
+    </context>
+<context>
+    <name>TrafficGraphWidget</name>
+    </context>
+<context>
+    <name>TransactionDesc</name>
+    </context>
+<context>
+    <name>TransactionDescDialog</name>
+    </context>
+<context>
+    <name>TransactionTableModel</name>
+    <message>
+        <source>Label</source>
+        <translation>標記</translation>
+    </message>
+    </context>
+<context>
+    <name>TransactionView</name>
+    <message>
+        <source>Exporting Failed</source>
+        <translation>匯出失敗</translation>
+    </message>
+    <message>
+        <source>Comma separated file (*.csv)</source>
+        <translation>逗號分隔檔(*.csv)</translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation>標記</translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation>位址</translation>
+    </message>
+    </context>
+<context>
+    <name>UnitDisplayStatusBarControl</name>
+    </context>
+<context>
+    <name>WalletFrame</name>
+    </context>
+<context>
+    <name>WalletModel</name>
+    </context>
+<context>
+    <name>WalletView</name>
+    <message>
+        <source>&amp;Export</source>
+        <translation>匯出 &amp;E</translation>
+    </message>
+    <message>
+        <source>Export the data in the current tab to a file</source>
+        <translation>把目前分頁的資料匯出至檔案</translation>
+    </message>
+    </context>
+<context>
+    <name>bitcoin-core</name>
+    </context>
+</TS>
\ No newline at end of file
diff --git a/src/qt/locale/bitcoin_zh_TW.ts b/src/qt/locale/bitcoin_zh_TW.ts
index 4026095928ab9..107e7034e5bc9 100644
--- a/src/qt/locale/bitcoin_zh_TW.ts
+++ b/src/qt/locale/bitcoin_zh_TW.ts
@@ -7,7 +7,7 @@
     </message>
     <message>
         <source>Create a new address</source>
-        <translation>新增新的位址</translation>
+        <translation>產生一個新位址</translation>
     </message>
     <message>
         <source>&amp;New</source>
@@ -67,11 +67,11 @@
     </message>
     <message>
         <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source>
-        <translation>這些是你要付款過去的位元幣位址。在付錢之前，務必要檢查金額和收款位址是否正確。</translation>
+        <translation>這些是你要付款過去的 Bitcoin 位址。在付錢之前，務必要檢查金額和收款位址是否正確。</translation>
     </message>
     <message>
         <source>These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source>
-        <translation>這些是你用來收款的位元幣位址。建議在每次交易時，都使用一個新的收款位址。</translation>
+        <translation>這些是你用來收款的 Bitcoin 位址。建議在每次交易時，都使用一個新的收款位址。</translation>
     </message>
     <message>
         <source>Copy &amp;Label</source>
@@ -161,7 +161,7 @@
     </message>
     <message>
         <source>Warning: If you encrypt your wallet and lose your passphrase, you will &lt;b&gt;LOSE ALL OF YOUR BITCOINS&lt;/b&gt;!</source>
-        <translation>警告: 如果把錢包加密後又忘記密碼，你就會從此&lt;b&gt;失去其中所有的位元幣了&lt;/b&gt;！</translation>
+        <translation>警告: 如果把錢包加密後又忘記密碼，你就會從此&lt;b&gt;失去其中所有的 Bitcoin 了&lt;/b&gt;！</translation>
     </message>
     <message>
         <source>Are you sure you wish to encrypt your wallet?</source>
@@ -169,7 +169,7 @@
     </message>
     <message>
         <source>Bitcoin Core will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source>
-        <translation>位元幣核心現在要關閉，好完成加密程序。請注意，加密錢包不能完全防止入侵你的電腦的惡意程式偷取位元幣。</translation>
+        <translation>Bitcoin Core 現在要關閉，好完成加密程序。請注意，加密錢包不能完全防止入侵你的電腦的惡意程式偷取錢幣。</translation>
     </message>
     <message>
         <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source>
@@ -307,7 +307,7 @@
     </message>
     <message>
         <source>Bitcoin Core client</source>
-        <translation>位元幣核心客戶端軟體</translation>
+        <translation>Bitcoin Core 客戶端軟體</translation>
     </message>
     <message>
         <source>Importing blocks from disk...</source>
@@ -319,7 +319,7 @@
     </message>
     <message>
         <source>Send coins to a Bitcoin address</source>
-        <translation>付錢給一個位元幣位址</translation>
+        <translation>付錢給一個 Bitcoin 位址</translation>
     </message>
     <message>
         <source>Backup wallet to another location</source>
@@ -343,7 +343,7 @@
     </message>
     <message>
         <source>Bitcoin</source>
-        <translation>位元幣</translation>
+        <translation>Bitcoin</translation>
     </message>
     <message>
         <source>Wallet</source>
@@ -359,7 +359,7 @@
     </message>
     <message>
         <source>Show information about Bitcoin Core</source>
-        <translation>顯示位元幣核心的相關資訊</translation>
+        <translation>顯示 Bitcoin Core 的相關資訊</translation>
     </message>
     <message>
         <source>&amp;Show / Hide</source>
@@ -375,11 +375,11 @@
     </message>
     <message>
         <source>Sign messages with your Bitcoin addresses to prove you own them</source>
-        <translation>用位元幣位址簽署訊息來證明位址是你的</translation>
+        <translation>用 Bitcoin 位址簽署訊息來證明位址是你的</translation>
     </message>
     <message>
         <source>Verify messages to ensure they were signed with specified Bitcoin addresses</source>
-        <translation>驗證訊息是用來確定訊息是用指定的位元幣位址簽署的</translation>
+        <translation>驗證訊息是用來確定訊息是用指定的 Bitcoin 位址簽署的</translation>
     </message>
     <message>
         <source>&amp;File</source>
@@ -399,19 +399,19 @@
     </message>
     <message>
         <source>Bitcoin Core</source>
-        <translation>位元幣核心</translation>
+        <translation>Bitcoin Core</translation>
     </message>
     <message>
         <source>Request payments (generates QR codes and bitcoin: URIs)</source>
-        <translation>要求付款(產生 QR Code 和位元幣付款協議的資源識別碼: URI)</translation>
+        <translation>要求付款(產生 QR Code 和 bitcoin 付款協議的資源識別碼: URI)</translation>
     </message>
     <message>
         <source>&amp;About Bitcoin Core</source>
-        <translation>關於位元幣核心</translation>
+        <translation>關於 Bitcoin Core</translation>
     </message>
     <message>
         <source>Modify configuration options for Bitcoin Core</source>
-        <translation>修改位元幣核心的設定選項</translation>
+        <translation>修改 Bitcoin Core 的設定選項</translation>
     </message>
     <message>
         <source>Show the list of used sending addresses and labels</source>
@@ -431,11 +431,11 @@
     </message>
     <message>
         <source>Show the Bitcoin Core help message to get a list with possible Bitcoin command-line options</source>
-        <translation>顯示位元幣核心的說明訊息，來取得可用命令列選項的列表</translation>
+        <translation>顯示 Bitcoin Core 的說明訊息，來取得可用命令列選項的列表</translation>
     </message>
     <message numerus="yes">
         <source>%n active connection(s) to Bitcoin network</source>
-        <translation><numerusform>%n 個運作中的位元幣網路連線</numerusform></translation>
+        <translation><numerusform>%n 個運作中的 Bitcoin 網路連線</numerusform></translation>
     </message>
     <message>
         <source>No block source available...</source>
@@ -818,7 +818,7 @@
     </message>
     <message>
         <source>The entered address "%1" is not a valid Bitcoin address.</source>
-        <translation>輸入的位址 %1 並不是有效的位元幣位址。</translation>
+        <translation>輸入的位址 %1 並不是有效的 Bitcoin 位址。</translation>
     </message>
     <message>
         <source>Could not unlock wallet.</source>
@@ -856,7 +856,7 @@
     <name>HelpMessageDialog</name>
     <message>
         <source>Bitcoin Core</source>
-        <translation>位元幣核心</translation>
+        <translation>Bitcoin Core</translation>
     </message>
     <message>
         <source>version</source>
@@ -868,7 +868,7 @@
     </message>
     <message>
         <source>About Bitcoin Core</source>
-        <translation>關於位元幣核心</translation>
+        <translation>關於 Bitcoin Core</translation>
     </message>
     <message>
         <source>Command-line options</source>
@@ -919,15 +919,15 @@
     </message>
     <message>
         <source>Welcome to Bitcoin Core.</source>
-        <translation>歡迎使用位元幣核心</translation>
+        <translation>歡迎使用 Bitcoin Core</translation>
     </message>
     <message>
         <source>As this is the first time the program is launched, you can choose where Bitcoin Core will store its data.</source>
-        <translation>因為這是程式第一次啓動，你可以選擇位元幣核心儲存資料的地方。</translation>
+        <translation>因為這是程式第一次啓動，你可以選擇 Bitcoin Core 儲存資料的地方。</translation>
     </message>
     <message>
         <source>Bitcoin Core will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source>
-        <translation>位元幣核心會下載並儲存一份位元幣區塊鏈的拷貝。至少有 %1GB 的資料會儲存到這個目錄中，並且還會持續增長。另外錢包資料也會儲存在這個目錄。</translation>
+        <translation>Bitcoin Core 會下載並儲存一份 Bitcoin 區塊鏈的拷貝。至少有 %1GB 的資料會儲存到這個目錄中，並且還會持續增長。另外錢包資料也會儲存在這個目錄。</translation>
     </message>
     <message>
         <source>Use the default data directory</source>
@@ -939,7 +939,7 @@
     </message>
     <message>
         <source>Bitcoin Core</source>
-        <translation>位元幣核心</translation>
+        <translation>Bitcoin Core</translation>
     </message>
     <message>
         <source>Error: Specified data directory "%1" cannot be created.</source>
@@ -1021,7 +1021,7 @@
     </message>
     <message>
         <source>The user interface language can be set here. This setting will take effect after restarting Bitcoin Core.</source>
-        <translation>可以在這裡設定使用者介面的語言。這個設定在重啓位元幣核心後才會生效。</translation>
+        <translation>可以在這裡設定使用者介面的語言。這個設定在重啓 Bitcoin Core 後才會生效。</translation>
     </message>
     <message>
         <source>Third party URLs (e.g. a block explorer) that appear in the transactions tab as context menu items. %s in the URL is replaced by transaction hash. Multiple URLs are separated by vertical bar |.</source>
@@ -1049,11 +1049,11 @@
     </message>
     <message>
         <source>Automatically start Bitcoin Core after logging in to the system.</source>
-        <translation>在登入系統後自動啓動位元幣核心。</translation>
+        <translation>在登入系統後自動啓動 Bitcoin Core。</translation>
     </message>
     <message>
         <source>&amp;Start Bitcoin Core on system login</source>
-        <translation>系統登入時啟動位元幣核心</translation>
+        <translation>系統登入時啟動 Bitcoin Core</translation>
     </message>
     <message>
         <source>(0 = auto, &lt;0 = leave that many cores free)</source>
@@ -1081,7 +1081,7 @@
     </message>
     <message>
         <source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source>
-        <translation>自動在路由器上開放位元幣的客戶端通訊埠。只有在你的路由器支援且開啓「通用即插即用」協定(UPnP)時才有作用。</translation>
+        <translation>自動在路由器上開放 Bitcoin 的客戶端通訊埠。只有在你的路由器支援且開啓「通用即插即用」協定(UPnP)時才有作用。</translation>
     </message>
     <message>
         <source>Map port using &amp;UPnP</source>
@@ -1089,7 +1089,7 @@
     </message>
     <message>
         <source>Connect to the Bitcoin network through a SOCKS5 proxy.</source>
-        <translation>透過 SOCKS5 代理伺服器來連線到位元幣網路。</translation>
+        <translation>透過 SOCKS5 代理伺服器來連線到 Bitcoin 網路。</translation>
     </message>
     <message>
         <source>&amp;Connect through SOCKS5 proxy (default proxy):</source>
@@ -1129,7 +1129,7 @@
     </message>
     <message>
         <source>Connect to the Bitcoin network through a separate SOCKS5 proxy for Tor hidden services.</source>
-        <translation>透過另外的 SOCKS5 代理伺服器來連線到位元幣網路中的 Tor 隱藏服務。</translation>
+        <translation>透過另外的 SOCKS5 代理伺服器來連線到 Bitcoin 網路中的 Tor 隱藏服務。</translation>
     </message>
     <message>
         <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services:</source>
@@ -1216,7 +1216,7 @@
     </message>
     <message>
         <source>The displayed information may be out of date. Your wallet automatically synchronizes with the Bitcoin network after a connection is established, but this process has not completed yet.</source>
-        <translation>顯示的資訊可能是過期的。跟位元幣網路的連線建立後，你的錢包會自動和網路同步，但是這個步驟還沒完成。</translation>
+        <translation>顯示的資訊可能是過期的。跟 Bitcoin 網路的連線建立後，你的錢包會自動和網路同步，但是這個步驟還沒完成。</translation>
     </message>
     <message>
         <source>Watch-only:</source>
@@ -1323,7 +1323,7 @@
     </message>
     <message>
         <source>URI cannot be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source>
-        <translation>沒辦法解析資源識別碼(URI)！可能是因為位元幣位址無效，或是 URI 參數格式錯誤。</translation>
+        <translation>沒辦法解析資源識別碼(URI)！可能是因為 Bitcoin 位址無效，或是 URI 參數格式錯誤。</translation>
     </message>
     <message>
         <source>Payment request file handling</source>
@@ -1397,7 +1397,7 @@
     </message>
     <message>
         <source>Enter a Bitcoin address (e.g. %1)</source>
-        <translation>輸入位元幣位址 (比如說 %1)</translation>
+        <translation>輸入 Bitcoin 位址 (比如說 %1)</translation>
     </message>
     <message>
         <source>%1 d</source>
@@ -1473,10 +1473,6 @@
         <source>General</source>
         <translation>普通</translation>
     </message>
-    <message>
-        <source>Using OpenSSL version</source>
-        <translation>使用的 OpenSSL 版本</translation>
-    </message>
     <message>
         <source>Using BerkeleyDB version</source>
         <translation>使用 BerkeleyDB 版本</translation>
@@ -1519,7 +1515,7 @@
     </message>
     <message>
         <source>Open the Bitcoin Core debug log file from the current data directory. This can take a few seconds for large log files.</source>
-        <translation>從目前的資料目錄下開啓位元幣核心的除錯紀錄檔。當紀錄檔很大時，可能會花好幾秒的時間。</translation>
+        <translation>從目前的資料目錄下開啓 Bitcoin Core 的除錯紀錄檔。當紀錄檔很大時，可能會花好幾秒的時間。</translation>
     </message>
     <message>
         <source>Received</source>
@@ -1679,7 +1675,7 @@
     </message>
     <message>
         <source>Welcome to the Bitcoin Core RPC console.</source>
-        <translation>歡迎使用位元幣核心 RPC 主控台。</translation>
+        <translation>歡迎使用 Bitcoin Core 的 RPC 主控台。</translation>
     </message>
     <message>
         <source>Use up and down arrows to navigate history, and &lt;b&gt;Ctrl-L&lt;/b&gt; to clear screen.</source>
@@ -1762,7 +1758,7 @@
     </message>
     <message>
         <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source>
-        <translation>附加在付款要求中的訊息，可以不填，打開要求內容時會顯示。注意: 這個訊息不會隨著付款送到位元幣網路上。</translation>
+        <translation>附加在付款要求中的訊息，可以不填，打開要求內容時會顯示。注意: 這個訊息不會隨著付款送到 Bitcoin 網路上。</translation>
     </message>
     <message>
         <source>An optional label to associate with the new receiving address.</source>
@@ -2155,7 +2151,7 @@
     </message>
     <message>
         <source>Warning: Invalid Bitcoin address</source>
-        <translation>警告: 位元幣位址無效</translation>
+        <translation>警告: Bitcoin 位址無效</translation>
     </message>
     <message>
         <source>(no label)</source>
@@ -2206,7 +2202,7 @@
     </message>
     <message>
         <source>The Bitcoin address to send the payment to</source>
-        <translation>接收付款的位元幣位址</translation>
+        <translation>接收付款的 Bitcoin 位址</translation>
     </message>
     <message>
         <source>Alt+A</source>
@@ -2226,7 +2222,7 @@
     </message>
     <message>
         <source>The fee will be deducted from the amount being sent. The recipient will receive less bitcoins than you enter in the amount field. If multiple recipients are selected, the fee is split equally.</source>
-        <translation>手續費會從要付款出去的金額中扣掉。因此收款人會收到比輸入的金額還要少的位元幣。如果有多個收款人的話，手續費會平均分配來扣除。</translation>
+        <translation>手續費會從要付款出去的金額中扣掉。因此收款人會收到比輸入的金額還要少的 bitcoin。如果有多個收款人的話，手續費會平均分配來扣除。</translation>
     </message>
     <message>
         <source>S&amp;ubtract fee from amount</source>
@@ -2250,7 +2246,7 @@
     </message>
     <message>
         <source>A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
-        <translation>附加在位元幣付款協議的資源識別碼(URI)中的訊息，會和交易內容一起存起來，給你自己做參考。注意: 這個訊息不會送到位元幣網路上。</translation>
+        <translation>附加在 Bitcoin 付款協議的資源識別碼(URI)中的訊息，會和交易內容一起存起來，給你自己做參考。注意: 這個訊息不會送到 Bitcoin 網路上。</translation>
     </message>
     <message>
         <source>Pay To:</source>
@@ -2265,7 +2261,7 @@
     <name>ShutdownWindow</name>
     <message>
         <source>Bitcoin Core is shutting down...</source>
-        <translation>正在關閉位元幣核心中...</translation>
+        <translation>正在關閉 Bitcoin Core 中...</translation>
     </message>
     <message>
         <source>Do not shut down the computer until this window disappears.</source>
@@ -2288,7 +2284,7 @@
     </message>
     <message>
         <source>The Bitcoin address to sign the message with</source>
-        <translation>用來簽署訊息的位元幣位址</translation>
+        <translation>用來簽署訊息的 Bitcoin 位址</translation>
     </message>
     <message>
         <source>Choose previously used address</source>
@@ -2320,7 +2316,7 @@
     </message>
     <message>
         <source>Sign the message to prove you own this Bitcoin address</source>
-        <translation>簽署這個訊息來證明這個位元幣位址是你的</translation>
+        <translation>簽署這個訊息來證明這個 Bitcoin 位址是你的</translation>
     </message>
     <message>
         <source>Sign &amp;Message</source>
@@ -2344,11 +2340,11 @@
     </message>
     <message>
         <source>The Bitcoin address the message was signed with</source>
-        <translation>簽署這個訊息的位元幣位址</translation>
+        <translation>簽署這個訊息的 Bitcoin 位址</translation>
     </message>
     <message>
         <source>Verify the message to ensure it was signed with the specified Bitcoin address</source>
-        <translation>驗證這個訊息來確定是用指定的位元幣位址簽署的</translation>
+        <translation>驗證這個訊息來確定是用指定的 Bitcoin 位址簽署的</translation>
     </message>
     <message>
         <source>Verify &amp;Message</source>
@@ -2415,11 +2411,11 @@
     <name>SplashScreen</name>
     <message>
         <source>Bitcoin Core</source>
-        <translation>位元幣核心</translation>
+        <translation>Bitcoin Core</translation>
     </message>
     <message>
         <source>The Bitcoin Core developers</source>
-        <translation>位元幣核心開發人員</translation>
+        <translation>Bitcoin Core 開發人員</translation>
     </message>
     <message>
         <source>[testnet]</source>
@@ -2938,7 +2934,7 @@
     </message>
     <message>
         <source>Please check that your computer's date and time are correct! If your clock is wrong Bitcoin Core will not work properly.</source>
-        <translation>請檢查電腦日期和時間是否正確！位元幣核心沒辦法在時鐘不準的情況下正常運作。</translation>
+        <translation>請檢查電腦日期和時間是否正確！Bitcoin Core 沒辦法在時鐘不準的情況下正常運作。</translation>
     </message>
     <message>
         <source>Prune configured below the minimum of %d MiB.  Please use a higher number.</source>
@@ -2970,7 +2966,7 @@
     </message>
     <message>
         <source>Run in the background as a daemon and accept commands</source>
-        <translation>用護靈模式在背後執行並接受指令</translation>
+        <translation>用護靈模式在背景執行並接受指令</translation>
     </message>
     <message>
         <source>Unable to start HTTP server. See debug log for details.</source>
@@ -2980,6 +2976,18 @@
         <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
         <translation>是否接受外來連線(預設值: 當沒有 -proxy 或 -connect 時為 1)</translation>
     </message>
+    <message>
+        <source>-fallbackfee is set very high! This is the transaction fee you may pay when fee estimates are not available.</source>
+        <translation>警告: -fallbackfee 設定了很高的金額！這是當預估手續費還沒計算出來時，交易付款預設會付的手續費。</translation>
+    </message>
+    <message>
+        <source>A fee rate (in %s/kB) that will be used when fee estimation has insufficient data (default: %s)</source>
+        <translation>當沒有足夠的資料計算預估手續費時，所使用的手續費費率(單位是 %s/kB, 預設值: %s)</translation>
+    </message>
+    <message>
+        <source>Accept relayed transactions received from whitelisted peers even when not relaying transactions (default: %d)</source>
+        <translation>接受從白名點節點收到的轉發交易，即使沒有(符合準則)轉發出去(預設值: %d)</translation>
+    </message>
     <message>
         <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source>
         <translation>和指定的位址繫結，並且一直在指定位址聽候連線。IPv6 請用 [主機]:通訊埠 這種格式</translation>
@@ -2996,6 +3004,10 @@
         <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source>
         <translation>當錢包有交易改變時要執行的指令(指令中的 %s 會被取代成交易識別碼)</translation>
     </message>
+    <message>
+        <source>Force relay of transactions from whitelisted peers even they violate local relay policy (default: %d)</source>
+        <translation>強制轉發從白名點節點收到的交易，即使它們違反了本機的轉發準則(預設值: %d)</translation>
+    </message>
     <message>
         <source>Set the number of script verification threads (%u to %d, 0 = auto, &lt;0 = leave that many cores free, default: %d)</source>
         <translation>設定指令碼驗證的執行緒數目 (%u 到 %d，0 表示程式自動決定，小於 0 表示保留處理器核心不用的數目，預設值: %d)</translation>
@@ -3010,7 +3022,11 @@
     </message>
     <message>
         <source>Unable to bind to %s on this computer. Bitcoin Core is probably already running.</source>
-        <translation>沒辦法繫結在這台電腦上的 %s 。位元幣核心可能已經在執行了。</translation>
+        <translation>沒辦法繫結在這台電腦上的 %s 。Bitcoin Core 可能已經在執行了。</translation>
+    </message>
+    <message>
+        <source>Unsupported argument -whitelistalwaysrelay ignored, use -whitelistrelay and/or -whitelistforcerelay.</source>
+        <translation>忽略不支援的參數 -whitelistalwaysrelay，請改用 -whitelistrelay 和 -whitelistforcerelay​ 的組合。</translation>
     </message>
     <message>
         <source>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</source>
@@ -3026,7 +3042,11 @@
     </message>
     <message>
         <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source>
-        <translation>警告: 位元幣網路對於區塊鏈結的決定目前有分歧！看來有些礦工會有問題。</translation>
+        <translation>警告: 節點網路對於區塊鏈結的決定目前有分歧！看來有些礦工會有問題。</translation>
+    </message>
+    <message>
+        <source>Warning: Unknown block versions being mined! It's possible unknown rules are in effect</source>
+        <translation>警告: 有礦工正在開採不明版本的區塊！這表示有不明的交易規則正在作用中</translation>
     </message>
     <message>
         <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source>
@@ -3048,6 +3068,10 @@
         <source>&lt;category&gt; can be:</source>
         <translation>&lt;category&gt; 可以是:</translation>
     </message>
+    <message>
+        <source>Append comment to the user agent string</source>
+        <translation>對使用者代理字串添加註解</translation>
+    </message>
     <message>
         <source>Block creation options:</source>
         <translation>區塊製造選項:</translation>
@@ -3092,6 +3116,10 @@
         <source>Enable publish raw transaction in &lt;address&gt;</source>
         <translation>開啟傳送交易原始資料到目標 ZeroMQ 位址 &lt;address&gt; 去</translation>
     </message>
+    <message>
+        <source>Enable transaction replacement in the memory pool (default: %u)</source>
+        <translation>對交易暫存池啟用替代交易(預設值: %u)</translation>
+    </message>
     <message>
         <source>Error initializing block database</source>
         <translation>初始化區塊資料庫時發生錯誤</translation>
@@ -3128,10 +3156,22 @@
         <source>Invalid -onion address: '%s'</source>
         <translation>無效的 -onion 位址: '%s'</translation>
     </message>
+    <message>
+        <source>Invalid amount for -fallbackfee=&lt;amount&gt;: '%s'</source>
+        <translation>設定 -fallbackfee=&lt;金額&gt; 的金額無效: '%s'</translation>
+    </message>
     <message>
         <source>Keep the transaction memory pool below &lt;n&gt; megabytes (default: %u)</source>
         <translation>在記憶體暫存池中保持最多 &lt;n&gt; 個百萬位元組的交易(預設值: %u)</translation>
     </message>
+    <message>
+        <source>Location of the auth cookie (default: data dir)</source>
+        <translation>認證 cookie 資料的位置(預設值: 同資料目錄)</translation>
+    </message>
+    <message>
+        <source>Minimum bytes per sigop in transactions we relay and mine (default: %u)</source>
+        <translation>轉發和開採時，對交易資料的 sigop 平均位元組數下限(預設值: %u)</translation>
+    </message>
     <message>
         <source>Not enough file descriptors available.</source>
         <translation>檔案描述元不足。</translation>
@@ -3140,6 +3180,10 @@
         <source>Only connect to nodes in network &lt;net&gt; (ipv4, ipv6 or onion)</source>
         <translation>只和 &lt;net&gt; 網路上的節點連線(ipv4, ipv6, 或 onion)</translation>
     </message>
+    <message>
+        <source>Print version and exit</source>
+        <translation>顯示版本後結束</translation>
+    </message>
     <message>
         <source>Prune cannot be configured with a negative value.</source>
         <translation>修剪值不能設定為負的。</translation>
@@ -3196,10 +3240,6 @@
         <source>Wallet options:</source>
         <translation>錢包選項:</translation>
     </message>
-    <message>
-        <source>Warning: This version is obsolete; upgrade required!</source>
-        <translation>警告: 這個版本已經被淘汰了；必須要升級！</translation>
-    </message>
     <message>
         <source>You need to rebuild the database using -reindex to change -txindex</source>
         <translation>改變 -txindex 參數後，必須要用 -reindex 參數來重建資料庫</translation>
@@ -3218,7 +3258,7 @@
     </message>
     <message>
         <source>Cannot obtain a lock on data directory %s. Bitcoin Core is probably already running.</source>
-        <translation>沒辦法鎖定資料目錄 %s。位元幣核心可能已經在執行了。</translation>
+        <translation>沒辦法鎖定資料目錄 %s。Bitcoin Core 可能已經在執行了。</translation>
     </message>
     <message>
         <source>Create new files with system default permissions, instead of umask 077 (only effective with disabled wallet functionality)</source>
@@ -3296,10 +3336,6 @@
         <source>Activating best chain...</source>
         <translation>啟用最佳鏈結...</translation>
     </message>
-    <message>
-        <source>Always relay transactions received from whitelisted peers (default: %d)</source>
-        <translation>無條件轉發從白名點節點收到的交易(預設值: %d)</translation>
-    </message>
     <message>
         <source>Attempt to recover private keys from a corrupt wallet.dat on startup</source>
         <translation>啟動時嘗試從壞掉的錢包檔 wallet.dat 復原密鑰</translation>
@@ -3318,11 +3354,11 @@
     </message>
     <message>
         <source>Copyright (C) 2009-%i The Bitcoin Core Developers</source>
-        <translation>版權為位元幣核心開發人員自西元 2009 至 %i 年起所有</translation>
+        <translation>版權為 Bitcoin Core 開發人員自西元 2009 至 %i 年起所有</translation>
     </message>
     <message>
         <source>Error loading wallet.dat: Wallet requires newer version of Bitcoin Core</source>
-        <translation>載入 wallet.dat 檔案時發生錯誤: 這個錢包需要新版的位元幣核心</translation>
+        <translation>載入 wallet.dat 檔案時發生錯誤: 這個錢包需要新版的 Bitcoin Core</translation>
     </message>
     <message>
         <source>Error reading from database, shutting down.</source>
@@ -3338,7 +3374,7 @@
     </message>
     <message>
         <source>Initialization sanity check failed. Bitcoin Core is shutting down.</source>
-        <translation>初始化時的基本檢查失敗了。位元幣核心就要關閉了。</translation>
+        <translation>初始化時的基本檢查失敗了。Bitcoin Core 就要關閉了。</translation>
     </message>
     <message>
         <source>Invalid amount for -maxtxfee=&lt;amount&gt;: '%s'</source>
@@ -3458,12 +3494,16 @@
     </message>
     <message>
         <source>Wallet needed to be rewritten: restart Bitcoin Core to complete</source>
-        <translation>錢包需要重寫: 請重新啓動位元幣核心來完成</translation>
+        <translation>錢包需要重寫: 請重新啓動 Bitcoin Core 來完成</translation>
     </message>
     <message>
         <source>Warning</source>
         <translation>警告</translation>
     </message>
+    <message>
+        <source>Warning: unknown new rules activated (versionbit %i)</source>
+        <translation>警告: 不明的交易規則被啟用了(versionbit %i)</translation>
+    </message>
     <message>
         <source>Whether to operate in a blocks only mode (default: %u)</source>
         <translation>是否要用只要區塊模式運作(預設值: %u)</translation>
@@ -3582,7 +3622,7 @@
     </message>
     <message>
         <source>Generate coins (default: %u)</source>
-        <translation>生產位元幣(預設值: %u)</translation>
+        <translation>生產錢幣(預設值: %u)</translation>
     </message>
     <message>
         <source>How many blocks to check at startup (default: %u, 0 = all)</source>

From 48efec82f3a18364c019577495914fcebb425e35 Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Tue, 21 Jun 2016 16:09:46 -0700
Subject: [PATCH 0534/1802] Fix some minor compact block issues that came up in
 review

---
 src/main.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index 60a33f9c2f97e..f5b1410114c7f 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -4613,7 +4613,7 @@ void static ProcessGetData(CNode* pfrom, const Consensus::Params& consensusParam
             // Track requests for our stuff.
             GetMainSignals().Inventory(inv.hash);
 
-            if (inv.type == MSG_BLOCK || inv.type == MSG_FILTERED_BLOCK)
+            if (inv.type == MSG_BLOCK || inv.type == MSG_FILTERED_BLOCK || inv.type == MSG_CMPCT_BLOCK)
                 break;
         }
     }
@@ -5077,8 +5077,8 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
             return true;
         }
 
-        if (it->second->nHeight < chainActive.Height() - 10) {
-            LogPrint("net", "Peer %d sent us a getblocktxn for a block > 10 deep", pfrom->id);
+        if (it->second->nHeight < chainActive.Height() - 15) {
+            LogPrint("net", "Peer %d sent us a getblocktxn for a block > 15 deep", pfrom->id);
             return true;
         }
 

From 06f40ef324ce0d4e43b89f7106e50965263aa2c7 Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Wed, 22 Jun 2016 14:37:39 +0200
Subject: [PATCH 0535/1802] depends: Mention aarch64 as common cross-compile
 target

---
 depends/README.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/depends/README.md b/depends/README.md
index 271bbd80bfc4a..6053c531b46a7 100644
--- a/depends/README.md
+++ b/depends/README.md
@@ -23,7 +23,8 @@ Common `host-platform-triplets` for cross compilation are:
 - `i686-w64-mingw32` for Win32
 - `x86_64-w64-mingw32` for Win64
 - `x86_64-apple-darwin11` for MacOSX
-- `arm-linux-gnueabihf` for Linux ARM
+- `arm-linux-gnueabihf` for Linux ARM 32 bit
+- `aarch64-linux-gnu` for Linux ARM 64 bit
 
 No other options are needed, the paths are automatically configured.
 

From ecacfd98e657c5819a1bcb1da93b25d3ad4e5045 Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Thu, 31 Mar 2016 14:43:23 +0200
Subject: [PATCH 0536/1802] --- [SEGWIT] begin: P2P/node/consensus ---


From 7030d9eb47254499bba14f1c00abc6bf493efd91 Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Fri, 6 Nov 2015 01:32:04 +0100
Subject: [PATCH 0537/1802] BIP144: Serialization, hashes, relay (sender side)

Contains refactorings by Eric Lombrozo.
Contains fixup by Nicolas Dorier.
Contains cleanup of CInv::GetCommand by Alex Morcos
---
 src/core_io.h                     |   2 +-
 src/core_memusage.h               |  24 ++++-
 src/core_read.cpp                 |  16 +++-
 src/main.cpp                      |  28 +++---
 src/net.h                         |  17 ++++
 src/primitives/block.h            |   2 -
 src/primitives/transaction.cpp    |  16 +++-
 src/primitives/transaction.h      | 151 +++++++++++++++++++++++++++---
 src/protocol.cpp                  |  46 +++------
 src/protocol.h                    |  30 +++---
 src/qt/coincontroldialog.cpp      |  18 +++-
 src/qt/walletmodeltransaction.cpp |   3 +-
 src/rpc/rawtransaction.cpp        |   6 +-
 src/script/script.cpp             |  12 +++
 src/script/script.h               |  14 +++
 src/streams.h                     |  33 +++++++
 src/test/data/tx_invalid.json     |   4 -
 src/test/sighash_tests.cpp        |   2 +-
 src/test/transaction_tests.cpp    |   2 +-
 src/wallet/rpcwallet.cpp          |   2 +-
 src/wallet/walletdb.h             |   1 +
 21 files changed, 339 insertions(+), 90 deletions(-)

diff --git a/src/core_io.h b/src/core_io.h
index e8c0c49e84d53..b559d44bf5a8a 100644
--- a/src/core_io.h
+++ b/src/core_io.h
@@ -17,7 +17,7 @@ class UniValue;
 // core_read.cpp
 extern CScript ParseScript(const std::string& s);
 extern std::string ScriptToAsmStr(const CScript& script, const bool fAttemptSighashDecode = false);
-extern bool DecodeHexTx(CTransaction& tx, const std::string& strHexTx);
+extern bool DecodeHexTx(CTransaction& tx, const std::string& strHexTx, bool fTryNoWitness = false);
 extern bool DecodeHexBlk(CBlock&, const std::string& strHexBlk);
 extern uint256 ParseHashUV(const UniValue& v, const std::string& strName);
 extern uint256 ParseHashStr(const std::string&, const std::string& strName);
diff --git a/src/core_memusage.h b/src/core_memusage.h
index 450537d059c20..dd86f805fe457 100644
--- a/src/core_memusage.h
+++ b/src/core_memusage.h
@@ -25,8 +25,28 @@ static inline size_t RecursiveDynamicUsage(const CTxOut& out) {
     return RecursiveDynamicUsage(out.scriptPubKey);
 }
 
+static inline size_t RecursiveDynamicUsage(const CScriptWitness& scriptWit) {
+    size_t mem = memusage::DynamicUsage(scriptWit.stack);
+    for (std::vector<std::vector<unsigned char> >::const_iterator it = scriptWit.stack.begin(); it != scriptWit.stack.end(); it++) {
+        mem += memusage::DynamicUsage(*it);
+    }
+    return mem;
+}
+
+static inline size_t RecursiveDynamicUsage(const CTxinWitness& txinwit) {
+    return RecursiveDynamicUsage(txinwit.scriptWitness);
+}
+
+static inline size_t RecursiveDynamicUsage(const CTxWitness& txwit) {
+    size_t mem = memusage::DynamicUsage(txwit.vtxinwit);
+    for (std::vector<CTxinWitness>::const_iterator it = txwit.vtxinwit.begin(); it != txwit.vtxinwit.end(); it++) {
+        mem += RecursiveDynamicUsage(*it);
+    }
+    return mem;
+}
+
 static inline size_t RecursiveDynamicUsage(const CTransaction& tx) {
-    size_t mem = memusage::DynamicUsage(tx.vin) + memusage::DynamicUsage(tx.vout);
+    size_t mem = memusage::DynamicUsage(tx.vin) + memusage::DynamicUsage(tx.vout) + RecursiveDynamicUsage(tx.wit);
     for (std::vector<CTxIn>::const_iterator it = tx.vin.begin(); it != tx.vin.end(); it++) {
         mem += RecursiveDynamicUsage(*it);
     }
@@ -37,7 +57,7 @@ static inline size_t RecursiveDynamicUsage(const CTransaction& tx) {
 }
 
 static inline size_t RecursiveDynamicUsage(const CMutableTransaction& tx) {
-    size_t mem = memusage::DynamicUsage(tx.vin) + memusage::DynamicUsage(tx.vout);
+    size_t mem = memusage::DynamicUsage(tx.vin) + memusage::DynamicUsage(tx.vout) + RecursiveDynamicUsage(tx.wit);
     for (std::vector<CTxIn>::const_iterator it = tx.vin.begin(); it != tx.vin.end(); it++) {
         mem += RecursiveDynamicUsage(*it);
     }
diff --git a/src/core_read.cpp b/src/core_read.cpp
index 444a4c7eba195..7cfda6dd6d894 100644
--- a/src/core_read.cpp
+++ b/src/core_read.cpp
@@ -90,12 +90,26 @@ CScript ParseScript(const std::string& s)
     return result;
 }
 
-bool DecodeHexTx(CTransaction& tx, const std::string& strHexTx)
+bool DecodeHexTx(CTransaction& tx, const std::string& strHexTx, bool fTryNoWitness)
 {
     if (!IsHex(strHexTx))
         return false;
 
     vector<unsigned char> txData(ParseHex(strHexTx));
+
+    if (fTryNoWitness) {
+        CDataStream ssData(txData, SER_NETWORK, PROTOCOL_VERSION | SERIALIZE_TRANSACTION_NO_WITNESS);
+        try {
+            ssData >> tx;
+            if (ssData.eof()) {
+                return true;
+            }
+        }
+        catch (const std::exception&) {
+            // Fall through.
+        }
+    }
+
     CDataStream ssData(txData, SER_NETWORK, PROTOCOL_VERSION);
     try {
         ssData >> tx;
diff --git a/src/main.cpp b/src/main.cpp
index ae195ecc40f36..2184940232bc8 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1029,8 +1029,8 @@ bool CheckTransaction(const CTransaction& tx, CValidationState &state)
         return state.DoS(10, false, REJECT_INVALID, "bad-txns-vin-empty");
     if (tx.vout.empty())
         return state.DoS(10, false, REJECT_INVALID, "bad-txns-vout-empty");
-    // Size limits
-    if (::GetSerializeSize(tx, SER_NETWORK, PROTOCOL_VERSION) > MAX_BLOCK_SIZE)
+    // Size limits (this doesn't take the witness into account, as that hasn't been checked for malleability)
+    if (::GetSerializeSize(tx, SER_NETWORK, PROTOCOL_VERSION | SERIALIZE_TRANSACTION_NO_WITNESS) > MAX_BLOCK_SIZE)
         return state.DoS(100, false, REJECT_INVALID, "bad-txns-oversize");
 
     // Check for negative or overflow output values
@@ -3396,7 +3396,7 @@ bool CheckBlock(const CBlock& block, CValidationState& state, const Consensus::P
     // because we receive the wrong transactions for it.
 
     // Size limits
-    if (block.vtx.empty() || block.vtx.size() > MAX_BLOCK_SIZE || ::GetSerializeSize(block, SER_NETWORK, PROTOCOL_VERSION) > MAX_BLOCK_SIZE)
+    if (block.vtx.empty() || block.vtx.size() > MAX_BLOCK_SIZE || ::GetSerializeSize(block, SER_NETWORK, PROTOCOL_VERSION | SERIALIZE_TRANSACTION_NO_WITNESS) > MAX_BLOCK_SIZE)
         return state.DoS(100, false, REJECT_INVALID, "bad-blk-length", false, "size limits failed");
 
     // First transaction must be coinbase, the rest must not be
@@ -4508,6 +4508,7 @@ bool static AlreadyHave(const CInv& inv) EXCLUSIVE_LOCKS_REQUIRED(cs_main)
     switch (inv.type)
     {
     case MSG_TX:
+    case MSG_WITNESS_TX:
         {
             assert(recentRejects);
             if (chainActive.Tip()->GetBlockHash() != hashRecentRejectsChainTip)
@@ -4528,6 +4529,7 @@ bool static AlreadyHave(const CInv& inv) EXCLUSIVE_LOCKS_REQUIRED(cs_main)
                    pcoinsTip->HaveCoinsInCache(inv.hash);
         }
     case MSG_BLOCK:
+    case MSG_WITNESS_BLOCK:
         return mapBlockIndex.count(inv.hash);
     }
     // Don't know what it is, just say we already got one
@@ -4552,7 +4554,7 @@ void static ProcessGetData(CNode* pfrom, const Consensus::Params& consensusParam
             boost::this_thread::interruption_point();
             it++;
 
-            if (inv.type == MSG_BLOCK || inv.type == MSG_FILTERED_BLOCK || inv.type == MSG_CMPCT_BLOCK)
+            if (inv.type == MSG_BLOCK || inv.type == MSG_FILTERED_BLOCK || inv.type == MSG_CMPCT_BLOCK || inv.type == MSG_WITNESS_BLOCK)
             {
                 bool send = false;
                 BlockMap::iterator mi = mapBlockIndex.find(inv.hash);
@@ -4593,6 +4595,8 @@ void static ProcessGetData(CNode* pfrom, const Consensus::Params& consensusParam
                     if (!ReadBlockFromDisk(block, (*mi).second, consensusParams))
                         assert(!"cannot load block from disk");
                     if (inv.type == MSG_BLOCK)
+                        pfrom->PushMessageWithFlag(SERIALIZE_TRANSACTION_NO_WITNESS, NetMsgType::BLOCK, block);
+                    else if (inv.type == MSG_WITNESS_BLOCK)
                         pfrom->PushMessage(NetMsgType::BLOCK, block);
                     else if (inv.type == MSG_FILTERED_BLOCK)
                     {
@@ -4609,7 +4613,7 @@ void static ProcessGetData(CNode* pfrom, const Consensus::Params& consensusParam
                             // however we MUST always provide at least what the remote peer needs
                             typedef std::pair<unsigned int, uint256> PairType;
                             BOOST_FOREACH(PairType& pair, merkleBlock.vMatchedTxn)
-                                pfrom->PushMessage(NetMsgType::TX, block.vtx[pair.first]);
+                                pfrom->PushMessageWithFlag(SERIALIZE_TRANSACTION_NO_WITNESS, NetMsgType::TX, block.vtx[pair.first]);
                         }
                         // else
                             // no response
@@ -4622,9 +4626,9 @@ void static ProcessGetData(CNode* pfrom, const Consensus::Params& consensusParam
                         // instead we respond with the full, non-compact block.
                         if (mi->second->nHeight >= chainActive.Height() - 10) {
                             CBlockHeaderAndShortTxIDs cmpctblock(block);
-                            pfrom->PushMessage(NetMsgType::CMPCTBLOCK, cmpctblock);
+                            pfrom->PushMessageWithFlag(SERIALIZE_TRANSACTION_NO_WITNESS, NetMsgType::CMPCTBLOCK, cmpctblock);
                         } else
-                            pfrom->PushMessage(NetMsgType::BLOCK, block);
+                            pfrom->PushMessageWithFlag(SERIALIZE_TRANSACTION_NO_WITNESS, NetMsgType::BLOCK, block);
                     }
 
                     // Trigger the peer node to send a getblocks request for the next batch of inventory
@@ -4640,20 +4644,20 @@ void static ProcessGetData(CNode* pfrom, const Consensus::Params& consensusParam
                     }
                 }
             }
-            else if (inv.type == MSG_TX)
+            else if (inv.type == MSG_TX || inv.type == MSG_WITNESS_TX)
             {
                 // Send stream from relay memory
                 bool push = false;
                 auto mi = mapRelay.find(inv.hash);
                 if (mi != mapRelay.end()) {
-                    pfrom->PushMessage(NetMsgType::TX, *mi->second);
+                    pfrom->PushMessageWithFlag(inv.type == MSG_TX ? SERIALIZE_TRANSACTION_NO_WITNESS : 0, NetMsgType::TX, *mi->second);
                     push = true;
                 } else if (pfrom->timeLastMempoolReq) {
                     auto txinfo = mempool.info(inv.hash);
                     // To protect privacy, do not answer getdata using the mempool when
                     // that TX couldn't have been INVed in reply to a MEMPOOL request.
                     if (txinfo.tx && txinfo.nTime <= pfrom->timeLastMempoolReq) {
-                        pfrom->PushMessage(NetMsgType::TX, *txinfo.tx);
+                        pfrom->PushMessageWithFlag(inv.type == MSG_TX ? SERIALIZE_TRANSACTION_NO_WITNESS : 0, NetMsgType::TX, *txinfo.tx);
                         push = true;
                     }
                 }
@@ -4665,7 +4669,7 @@ void static ProcessGetData(CNode* pfrom, const Consensus::Params& consensusParam
             // Track requests for our stuff.
             GetMainSignals().Inventory(inv.hash);
 
-            if (inv.type == MSG_BLOCK || inv.type == MSG_FILTERED_BLOCK || inv.type == MSG_CMPCT_BLOCK)
+            if (inv.type == MSG_BLOCK || inv.type == MSG_FILTERED_BLOCK || inv.type == MSG_CMPCT_BLOCK || inv.type == MSG_WITNESS_BLOCK)
                 break;
         }
     }
@@ -5146,7 +5150,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
             }
             resp.txn[i] = block.vtx[req.indexes[i]];
         }
-        pfrom->PushMessage(NetMsgType::BLOCKTXN, resp);
+        pfrom->PushMessageWithFlag(SERIALIZE_TRANSACTION_NO_WITNESS, NetMsgType::BLOCKTXN, resp);
     }
 
 
diff --git a/src/net.h b/src/net.h
index aa9b2c11a3c22..cb35d8c4f28c3 100644
--- a/src/net.h
+++ b/src/net.h
@@ -598,6 +598,23 @@ class CNode
         }
     }
 
+    /** Send a message containing a1, serialized with flag flag. */
+    template<typename T1>
+    void PushMessageWithFlag(int flag, const char* pszCommand, const T1& a1)
+    {
+        try
+        {
+            BeginMessage(pszCommand);
+            WithOrVersion(&ssSend, flag) << a1;
+            EndMessage(pszCommand);
+        }
+        catch (...)
+        {
+            AbortMessage();
+            throw;
+        }
+    }
+
     template<typename T1, typename T2>
     void PushMessage(const char* pszCommand, const T1& a1, const T2& a2)
     {
diff --git a/src/primitives/block.h b/src/primitives/block.h
index 42276b2bc26bc..29307aed5be48 100644
--- a/src/primitives/block.h
+++ b/src/primitives/block.h
@@ -38,7 +38,6 @@ class CBlockHeader
     template <typename Stream, typename Operation>
     inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) {
         READWRITE(this->nVersion);
-        nVersion = this->nVersion;
         READWRITE(hashPrevBlock);
         READWRITE(hashMerkleRoot);
         READWRITE(nTime);
@@ -120,7 +119,6 @@ class CBlock : public CBlockHeader
     std::string ToString() const;
 };
 
-
 /** Describes a place in the block chain to another node such that if the
  * other node doesn't have the same branch, it can find a recent common trunk.
  * The further back it is, the further before the fork it may be.
diff --git a/src/primitives/transaction.cpp b/src/primitives/transaction.cpp
index 947f2e6a73baf..b0230530e804f 100644
--- a/src/primitives/transaction.cpp
+++ b/src/primitives/transaction.cpp
@@ -60,21 +60,26 @@ std::string CTxOut::ToString() const
 }
 
 CMutableTransaction::CMutableTransaction() : nVersion(CTransaction::CURRENT_VERSION), nLockTime(0) {}
-CMutableTransaction::CMutableTransaction(const CTransaction& tx) : nVersion(tx.nVersion), vin(tx.vin), vout(tx.vout), nLockTime(tx.nLockTime) {}
+CMutableTransaction::CMutableTransaction(const CTransaction& tx) : nVersion(tx.nVersion), vin(tx.vin), vout(tx.vout), wit(tx.wit), nLockTime(tx.nLockTime) {}
 
 uint256 CMutableTransaction::GetHash() const
 {
-    return SerializeHash(*this);
+    return SerializeHash(*this, SER_GETHASH, SERIALIZE_TRANSACTION_NO_WITNESS);
 }
 
 void CTransaction::UpdateHash() const
 {
-    *const_cast<uint256*>(&hash) = SerializeHash(*this);
+    *const_cast<uint256*>(&hash) = SerializeHash(*this, SER_GETHASH, SERIALIZE_TRANSACTION_NO_WITNESS);
+}
+
+uint256 CTransaction::GetWitnessHash() const
+{
+    return SerializeHash(*this, SER_GETHASH, 0);
 }
 
 CTransaction::CTransaction() : nVersion(CTransaction::CURRENT_VERSION), vin(), vout(), nLockTime(0) { }
 
-CTransaction::CTransaction(const CMutableTransaction &tx) : nVersion(tx.nVersion), vin(tx.vin), vout(tx.vout), nLockTime(tx.nLockTime) {
+CTransaction::CTransaction(const CMutableTransaction &tx) : nVersion(tx.nVersion), vin(tx.vin), vout(tx.vout), wit(tx.wit), nLockTime(tx.nLockTime) {
     UpdateHash();
 }
 
@@ -82,6 +87,7 @@ CTransaction& CTransaction::operator=(const CTransaction &tx) {
     *const_cast<int*>(&nVersion) = tx.nVersion;
     *const_cast<std::vector<CTxIn>*>(&vin) = tx.vin;
     *const_cast<std::vector<CTxOut>*>(&vout) = tx.vout;
+    *const_cast<CTxWitness*>(&wit) = tx.wit;
     *const_cast<unsigned int*>(&nLockTime) = tx.nLockTime;
     *const_cast<uint256*>(&hash) = tx.hash;
     return *this;
@@ -136,6 +142,8 @@ std::string CTransaction::ToString() const
         nLockTime);
     for (unsigned int i = 0; i < vin.size(); i++)
         str += "    " + vin[i].ToString() + "\n";
+    for (unsigned int i = 0; i < wit.vtxinwit.size(); i++)
+        str += "    " + wit.vtxinwit[i].scriptWitness.ToString() + "\n";
     for (unsigned int i = 0; i < vout.size(); i++)
         str += "    " + vout[i].ToString() + "\n";
     return str;
diff --git a/src/primitives/transaction.h b/src/primitives/transaction.h
index 149816406a831..d8ae41ad78da3 100644
--- a/src/primitives/transaction.h
+++ b/src/primitives/transaction.h
@@ -11,6 +11,8 @@
 #include "serialize.h"
 #include "uint256.h"
 
+static const int SERIALIZE_TRANSACTION_NO_WITNESS = 0x40000000;
+
 /** An outpoint - a combination of a transaction hash and an index n into its vout */
 class COutPoint
 {
@@ -194,8 +196,137 @@ class CTxOut
     std::string ToString() const;
 };
 
+class CTxinWitness
+{
+public:
+    CScriptWitness scriptWitness;
+
+    ADD_SERIALIZE_METHODS;
+
+    template <typename Stream, typename Operation>
+    inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion)
+    {
+        READWRITE(scriptWitness.stack);
+    }
+
+    bool IsNull() const { return scriptWitness.IsNull(); }
+
+    CTxinWitness() { }
+};
+
+class CTxWitness
+{
+public:
+    /** In case vtxinwit is missing, all entries are treated as if they were empty CTxInWitnesses */
+    std::vector<CTxinWitness> vtxinwit;
+
+    ADD_SERIALIZE_METHODS;
+
+    bool IsEmpty() const { return vtxinwit.empty(); }
+
+    bool IsNull() const
+    {
+        for (size_t n = 0; n < vtxinwit.size(); n++) {
+            if (!vtxinwit[n].IsNull()) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    void SetNull()
+    {
+        vtxinwit.clear();
+    }
+
+    template <typename Stream, typename Operation>
+    inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion)
+    {
+        for (size_t n = 0; n < vtxinwit.size(); n++) {
+            READWRITE(vtxinwit[n]);
+        }
+        if (IsNull()) {
+            /* It's illegal to encode a witness when all vtxinwit entries are empty. */
+            throw std::ios_base::failure("Superfluous witness record");
+        }
+    }
+};
+
 struct CMutableTransaction;
 
+/**
+ * Basic transaction serialization format:
+ * - int32_t nVersion
+ * - std::vector<CTxIn> vin
+ * - std::vector<CTxOut> vout
+ * - uint32_t nLockTime
+ *
+ * Extended transaction serialization format:
+ * - int32_t nVersion
+ * - unsigned char dummy = 0x00
+ * - unsigned char flags (!= 0)
+ * - std::vector<CTxIn> vin
+ * - std::vector<CTxOut> vout
+ * - if (flags & 1):
+ *   - CTxWitness wit;
+ * - uint32_t nLockTime
+ */
+template<typename Stream, typename Operation, typename TxType>
+inline void SerializeTransaction(TxType& tx, Stream& s, Operation ser_action, int nType, int nVersion) {
+    READWRITE(*const_cast<int32_t*>(&tx.nVersion));
+    unsigned char flags = 0;
+    if (ser_action.ForRead()) {
+        const_cast<std::vector<CTxIn>*>(&tx.vin)->clear();
+        const_cast<std::vector<CTxOut>*>(&tx.vout)->clear();
+        const_cast<CTxWitness*>(&tx.wit)->SetNull();
+        /* Try to read the vin. In case the dummy is there, this will be read as an empty vector. */
+        READWRITE(*const_cast<std::vector<CTxIn>*>(&tx.vin));
+        if (tx.vin.size() == 0 && !(nVersion & SERIALIZE_TRANSACTION_NO_WITNESS)) {
+            /* We read a dummy or an empty vin. */
+            READWRITE(flags);
+            if (flags != 0) {
+                READWRITE(*const_cast<std::vector<CTxIn>*>(&tx.vin));
+                READWRITE(*const_cast<std::vector<CTxOut>*>(&tx.vout));
+            }
+        } else {
+            /* We read a non-empty vin. Assume a normal vout follows. */
+            READWRITE(*const_cast<std::vector<CTxOut>*>(&tx.vout));
+        }
+        if ((flags & 1) && !(nVersion & SERIALIZE_TRANSACTION_NO_WITNESS)) {
+            /* The witness flag is present, and we support witnesses. */
+            flags ^= 1;
+            const_cast<CTxWitness*>(&tx.wit)->vtxinwit.resize(tx.vin.size());
+            READWRITE(tx.wit);
+        }
+        if (flags) {
+            /* Unknown flag in the serialization */
+            throw std::ios_base::failure("Unknown transaction optional data");
+        }
+    } else {
+        // Consistency check
+        assert(tx.wit.vtxinwit.size() <= tx.vin.size());
+        if (!(nVersion & SERIALIZE_TRANSACTION_NO_WITNESS)) {
+            /* Check whether witnesses need to be serialized. */
+            if (!tx.wit.IsNull()) {
+                flags |= 1;
+            }
+        }
+        if (flags) {
+            /* Use extended format in case witnesses are to be serialized. */
+            std::vector<CTxIn> vinDummy;
+            READWRITE(vinDummy);
+            READWRITE(flags);
+        }
+        READWRITE(*const_cast<std::vector<CTxIn>*>(&tx.vin));
+        READWRITE(*const_cast<std::vector<CTxOut>*>(&tx.vout));
+        if (flags & 1) {
+            const_cast<CTxWitness*>(&tx.wit)->vtxinwit.resize(tx.vin.size());
+            READWRITE(tx.wit);
+        }
+    }
+    READWRITE(*const_cast<uint32_t*>(&tx.nLockTime));
+}
+
 /** The basic transaction that is broadcasted on the network and contained in
  * blocks.  A transaction can contain multiple inputs and outputs.
  */
@@ -224,6 +355,7 @@ class CTransaction
     const int32_t nVersion;
     const std::vector<CTxIn> vin;
     const std::vector<CTxOut> vout;
+    CTxWitness wit; // Not const: can change without invalidating the txid cache
     const uint32_t nLockTime;
 
     /** Construct a CTransaction that qualifies as IsNull() */
@@ -238,13 +370,10 @@ class CTransaction
 
     template <typename Stream, typename Operation>
     inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) {
-        READWRITE(*const_cast<int32_t*>(&this->nVersion));
-        nVersion = this->nVersion;
-        READWRITE(*const_cast<std::vector<CTxIn>*>(&vin));
-        READWRITE(*const_cast<std::vector<CTxOut>*>(&vout));
-        READWRITE(*const_cast<uint32_t*>(&nLockTime));
-        if (ser_action.ForRead())
+        SerializeTransaction(*this, s, ser_action, nType, nVersion);
+        if (ser_action.ForRead()) {
             UpdateHash();
+        }
     }
 
     bool IsNull() const {
@@ -255,6 +384,9 @@ class CTransaction
         return hash;
     }
 
+    // Compute a hash that includes both transaction and witness data
+    uint256 GetWitnessHash() const;
+
     // Return sum of txouts.
     CAmount GetValueOut() const;
     // GetValueIn() is a method on CCoinsViewCache, because
@@ -290,6 +422,7 @@ struct CMutableTransaction
     int32_t nVersion;
     std::vector<CTxIn> vin;
     std::vector<CTxOut> vout;
+    CTxWitness wit;
     uint32_t nLockTime;
 
     CMutableTransaction();
@@ -299,11 +432,7 @@ struct CMutableTransaction
 
     template <typename Stream, typename Operation>
     inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) {
-        READWRITE(this->nVersion);
-        nVersion = this->nVersion;
-        READWRITE(vin);
-        READWRITE(vout);
-        READWRITE(nLockTime);
+        SerializeTransaction(*this, s, ser_action, nType, nVersion);
     }
 
     /** Compute the hash of this CMutableTransaction. This is computed on the
diff --git a/src/protocol.cpp b/src/protocol.cpp
index 2f90fb764cfbc..247c6c212073e 100644
--- a/src/protocol.cpp
+++ b/src/protocol.cpp
@@ -41,15 +41,6 @@ const char *GETBLOCKTXN="getblocktxn";
 const char *BLOCKTXN="blocktxn";
 };
 
-static const char* ppszTypeName[] =
-{
-    "ERROR", // Should never occur
-    NetMsgType::TX,
-    NetMsgType::BLOCK,
-    "filtered block", // Should never occur
-    "compact block" // Should never occur
-};
-
 /** All known message types. Keep this in the same order as the list of
  * messages above and in protocol.h.
  */
@@ -166,37 +157,26 @@ CInv::CInv(int typeIn, const uint256& hashIn)
     hash = hashIn;
 }
 
-CInv::CInv(const std::string& strType, const uint256& hashIn)
-{
-    unsigned int i;
-    for (i = 1; i < ARRAYLEN(ppszTypeName); i++)
-    {
-        if (strType == ppszTypeName[i])
-        {
-            type = i;
-            break;
-        }
-    }
-    if (i == ARRAYLEN(ppszTypeName))
-        throw std::out_of_range(strprintf("CInv::CInv(string, uint256): unknown type '%s'", strType));
-    hash = hashIn;
-}
-
 bool operator<(const CInv& a, const CInv& b)
 {
     return (a.type < b.type || (a.type == b.type && a.hash < b.hash));
 }
 
-bool CInv::IsKnownType() const
+std::string CInv::GetCommand() const
 {
-    return (type >= 1 && type < (int)ARRAYLEN(ppszTypeName));
-}
-
-const char* CInv::GetCommand() const
-{
-    if (!IsKnownType())
+    std::string cmd;
+    if (type & MSG_WITNESS_FLAG)
+        cmd.append("witness-");
+    int masked = type & MSG_TYPE_MASK;
+    switch (masked)
+    {
+    case MSG_TX:             return cmd.append(NetMsgType::TX);
+    case MSG_BLOCK:          return cmd.append(NetMsgType::BLOCK);
+    case MSG_FILTERED_BLOCK: return cmd.append(NetMsgType::MERKLEBLOCK);
+    case MSG_CMPCT_BLOCK:    return cmd.append(NetMsgType::CMPCTBLOCK);
+    default:
         throw std::out_of_range(strprintf("CInv::GetCommand(): type=%d unknown type", type));
-    return ppszTypeName[type];
+    }
 }
 
 std::string CInv::ToString() const
diff --git a/src/protocol.h b/src/protocol.h
index a72813e959c64..dd07092f5f8d9 100644
--- a/src/protocol.h
+++ b/src/protocol.h
@@ -309,13 +309,29 @@ class CAddress : public CService
     unsigned int nTime;
 };
 
+/** getdata message types */
+const uint32_t MSG_WITNESS_FLAG = 1 << 30;
+const uint32_t MSG_TYPE_MASK    = 0xffffffff >> 2;
+enum GetDataMsg
+{
+    UNDEFINED = 0,
+    MSG_TX,
+    MSG_BLOCK,
+    MSG_TYPE_MAX = MSG_BLOCK,
+    // The following can only occur in getdata. Invs always use TX or BLOCK.
+    MSG_FILTERED_BLOCK,
+    MSG_CMPCT_BLOCK,
+    MSG_WITNESS_BLOCK = MSG_BLOCK | MSG_WITNESS_FLAG,
+    MSG_WITNESS_TX = MSG_TX | MSG_WITNESS_FLAG,
+    MSG_FILTERED_WITNESS_BLOCK = MSG_FILTERED_BLOCK | MSG_WITNESS_FLAG,
+};
+
 /** inv message data */
 class CInv
 {
 public:
     CInv();
     CInv(int typeIn, const uint256& hashIn);
-    CInv(const std::string& strType, const uint256& hashIn);
 
     ADD_SERIALIZE_METHODS;
 
@@ -328,8 +344,7 @@ class CInv
 
     friend bool operator<(const CInv& a, const CInv& b);
 
-    bool IsKnownType() const;
-    const char* GetCommand() const;
+    std::string GetCommand() const;
     std::string ToString() const;
 
     // TODO: make private (improves encapsulation)
@@ -338,13 +353,4 @@ class CInv
     uint256 hash;
 };
 
-enum {
-    MSG_TX = 1,
-    MSG_BLOCK,
-    // Nodes may always request a MSG_FILTERED_BLOCK/MSG_CMPCT_BLOCK in a getdata, however,
-    // MSG_FILTERED_BLOCK/MSG_CMPCT_BLOCK should not appear in any invs except as a part of getdata.
-    MSG_FILTERED_BLOCK,
-    MSG_CMPCT_BLOCK,
-};
-
 #endif // BITCOIN_PROTOCOL_H
diff --git a/src/qt/coincontroldialog.cpp b/src/qt/coincontroldialog.cpp
index f909499952c7e..837f8ba6c18f5 100644
--- a/src/qt/coincontroldialog.cpp
+++ b/src/qt/coincontroldialog.cpp
@@ -485,6 +485,7 @@ void CoinControlDialog::updateLabels(WalletModel *model, QDialog* dialog)
     unsigned int nQuantity      = 0;
     int nQuantityUncompressed   = 0;
     bool fAllowFree             = false;
+    bool fWitness               = false;
 
     std::vector<COutPoint> vCoinControl;
     std::vector<COutput>   vOutputs;
@@ -513,7 +514,14 @@ void CoinControlDialog::updateLabels(WalletModel *model, QDialog* dialog)
 
         // Bytes
         CTxDestination address;
-        if(ExtractDestination(out.tx->vout[out.i].scriptPubKey, address))
+        int witnessversion = 0;
+        std::vector<unsigned char> witnessprogram;
+        if (out.tx->vout[out.i].scriptPubKey.IsWitnessProgram(witnessversion, witnessprogram))
+        {
+            nBytesInputs += (32 + 4 + 1 + (107 / WITNESS_SCALE_FACTOR) + 4);
+            fWitness = true;
+        }
+        else if(ExtractDestination(out.tx->vout[out.i].scriptPubKey, address))
         {
             CPubKey pubkey;
             CKeyID *keyid = boost::get<CKeyID>(&address);
@@ -534,6 +542,14 @@ void CoinControlDialog::updateLabels(WalletModel *model, QDialog* dialog)
     {
         // Bytes
         nBytes = nBytesInputs + ((CoinControlDialog::payAmounts.size() > 0 ? CoinControlDialog::payAmounts.size() + 1 : 2) * 34) + 10; // always assume +1 output for change here
+        if (fWitness)
+        {
+            // there is some fudging in these numbers related to the actual virtual transaction size calculation that will keep this estimate from being exact.
+            // usually, the result will be an overestimate within a couple of satoshis so that the confirmation dialog ends up displaying a slightly smaller fee.
+            // also, the witness stack size value value is a variable sized integer. usually, the number of stack items will be well under the single byte var int limit.
+            nBytes += 2; // account for the serialized marker and flag bytes
+            nBytes += nQuantity; // account for the witness byte that holds the number of stack items for each input.
+        }
 
         // Priority
         double mempoolEstimatePriority = mempool.estimateSmartPriority(nTxConfirmTarget);
diff --git a/src/qt/walletmodeltransaction.cpp b/src/qt/walletmodeltransaction.cpp
index 8c970ee8aabe9..ffadf89cc8536 100644
--- a/src/qt/walletmodeltransaction.cpp
+++ b/src/qt/walletmodeltransaction.cpp
@@ -4,6 +4,7 @@
 
 #include "walletmodeltransaction.h"
 
+#include "policy/policy.h"
 #include "wallet/wallet.h"
 
 WalletModelTransaction::WalletModelTransaction(const QList<SendCoinsRecipient> &recipients) :
@@ -33,7 +34,7 @@ CWalletTx *WalletModelTransaction::getTransaction()
 
 unsigned int WalletModelTransaction::getTransactionSize()
 {
-    return (!walletTransaction ? 0 : (::GetSerializeSize(*(CTransaction*)walletTransaction, SER_NETWORK, PROTOCOL_VERSION)));
+    return (!walletTransaction ? 0 : ::GetVirtualTransactionSize(*walletTransaction));
 }
 
 CAmount WalletModelTransaction::getTransactionFee()
diff --git a/src/rpc/rawtransaction.cpp b/src/rpc/rawtransaction.cpp
index 9723e394d6509..e4a6e0f39b388 100644
--- a/src/rpc/rawtransaction.cpp
+++ b/src/rpc/rawtransaction.cpp
@@ -276,7 +276,7 @@ UniValue gettxoutproof(const UniValue& params, bool fHelp)
     if (ntxFound != setTxids.size())
         throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "(Not all) transactions not found in specified block");
 
-    CDataStream ssMB(SER_NETWORK, PROTOCOL_VERSION);
+    CDataStream ssMB(SER_NETWORK, PROTOCOL_VERSION | SERIALIZE_TRANSACTION_NO_WITNESS);
     CMerkleBlock mb(block, setTxids);
     ssMB << mb;
     std::string strHex = HexStr(ssMB.begin(), ssMB.end());
@@ -296,7 +296,7 @@ UniValue verifytxoutproof(const UniValue& params, bool fHelp)
             "[\"txid\"]      (array, strings) The txid(s) which the proof commits to, or empty array if the proof is invalid\n"
         );
 
-    CDataStream ssMB(ParseHexV(params[0], "proof"), SER_NETWORK, PROTOCOL_VERSION);
+    CDataStream ssMB(ParseHexV(params[0], "proof"), SER_NETWORK, PROTOCOL_VERSION | SERIALIZE_TRANSACTION_NO_WITNESS);
     CMerkleBlock merkleBlock;
     ssMB >> merkleBlock;
 
@@ -487,7 +487,7 @@ UniValue decoderawtransaction(const UniValue& params, bool fHelp)
 
     CTransaction tx;
 
-    if (!DecodeHexTx(tx, params[0].get_str()))
+    if (!DecodeHexTx(tx, params[0].get_str(), true))
         throw JSONRPCError(RPC_DESERIALIZATION_ERROR, "TX decode failed");
 
     UniValue result(UniValue::VOBJ);
diff --git a/src/script/script.cpp b/src/script/script.cpp
index 9f2809e593756..6b1eb52bbf8c2 100644
--- a/src/script/script.cpp
+++ b/src/script/script.cpp
@@ -231,3 +231,15 @@ bool CScript::IsPushOnly() const
 {
     return this->IsPushOnly(begin());
 }
+
+std::string CScriptWitness::ToString() const
+{
+    std::string ret = "CScriptWitness(";
+    for (unsigned int i = 0; i < stack.size(); i++) {
+        if (i) {
+            ret += ", ";
+        }
+        ret += HexStr(stack[i]);
+    }
+    return ret + ")";
+}
diff --git a/src/script/script.h b/src/script/script.h
index a2941ce9019d0..0b6d822d81ae0 100644
--- a/src/script/script.h
+++ b/src/script/script.h
@@ -643,6 +643,20 @@ class CScript : public CScriptBase
     }
 };
 
+struct CScriptWitness
+{
+    // Note that this encodes the data elements being pushed, rather than
+    // encoding them as a CScript that pushes them.
+    std::vector<std::vector<unsigned char> > stack;
+
+    // Some compilers complain without a default constructor
+    CScriptWitness() { }
+
+    bool IsNull() const { return stack.empty(); }
+
+    std::string ToString() const;
+};
+
 class CReserveScript
 {
 public:
diff --git a/src/streams.h b/src/streams.h
index ed14f3f412172..7132364eb1951 100644
--- a/src/streams.h
+++ b/src/streams.h
@@ -22,6 +22,39 @@
 #include <utility>
 #include <vector>
 
+template<typename Stream>
+class OverrideStream
+{
+    Stream* stream;
+public:
+    const int nType;
+    const int nVersion;
+
+    OverrideStream(Stream* stream_, int nType_, int nVersion_) : stream(stream_), nType(nType_), nVersion(nVersion_) {}
+
+    template<typename T>
+    OverrideStream<Stream>& operator<<(const T& obj)
+    {
+        // Serialize to this stream
+        ::Serialize(*this->stream, obj, nType, nVersion);
+        return (*this);
+    }
+
+    template<typename T>
+    OverrideStream<Stream>& operator>>(T& obj)
+    {
+        // Unserialize from this stream
+        ::Unserialize(*this->stream, obj, nType, nVersion);
+        return (*this);
+    }
+};
+
+template<typename S>
+OverrideStream<S> WithOrVersion(S* s, int nVersionFlag)
+{
+    return OverrideStream<S>(s, s->GetType(), s->GetVersion() | nVersionFlag);
+}
+
 /** Double ended buffer combining vector and stream-like interfaces.
  *
  * >> and << read and write unformatted data using the above serialization templates.
diff --git a/src/test/data/tx_invalid.json b/src/test/data/tx_invalid.json
index 2d7d9b958514b..4719f2b38877a 100644
--- a/src/test/data/tx_invalid.json
+++ b/src/test/data/tx_invalid.json
@@ -30,10 +30,6 @@
 "010000000100010000000000000000000000000000000000000000000000000000000000000000000009085768617420697320ffffffff010000000000000000015100000000", "P2SH"],
 
 ["Tests for CheckTransaction()"],
-["No inputs"],
-[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "HASH160 0x14 0x7a052c840ba73af26755de42cf01cc9e0a49fef0 EQUAL"]],
-"0100000000010000000000000000015100000000", "P2SH"],
-
 ["No outputs"],
 [[["0000000000000000000000000000000000000000000000000000000000000100", 0, "HASH160 0x14 0x05ab9e14d983742513f0f451e105ffb4198d1dd4 EQUAL"]],
 "01000000010001000000000000000000000000000000000000000000000000000000000000000000006d483045022100f16703104aab4e4088317c862daec83440242411b039d14280e03dd33b487ab802201318a7be236672c5c56083eb7a5a195bc57a40af7923ff8545016cd3b571e2a601232103c40e5d339df3f30bf753e7e04450ae4ef76c9e45587d1d993bdc4cd06f0651c7acffffffff0000000000", "P2SH"],
diff --git a/src/test/sighash_tests.cpp b/src/test/sighash_tests.cpp
index e43b2ff6c45dc..375accbac7206 100644
--- a/src/test/sighash_tests.cpp
+++ b/src/test/sighash_tests.cpp
@@ -82,7 +82,7 @@ uint256 static SignatureHashOld(CScript scriptCode, const CTransaction& txTo, un
     }
 
     // Serialize and hash
-    CHashWriter ss(SER_GETHASH, 0);
+    CHashWriter ss(SER_GETHASH, SERIALIZE_TRANSACTION_NO_WITNESS);
     ss << txTmp << nHashType;
     return ss.GetHash();
 }
diff --git a/src/test/transaction_tests.cpp b/src/test/transaction_tests.cpp
index d9195bf345ca4..318fddc1ae9f9 100644
--- a/src/test/transaction_tests.cpp
+++ b/src/test/transaction_tests.cpp
@@ -208,7 +208,7 @@ BOOST_AUTO_TEST_CASE(tx_invalid)
             }
 
             string transaction = test[1].get_str();
-            CDataStream stream(ParseHex(transaction), SER_NETWORK, PROTOCOL_VERSION);
+            CDataStream stream(ParseHex(transaction), SER_NETWORK, PROTOCOL_VERSION );
             CTransaction tx;
             stream >> tx;
 
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index 2d4e95911dd0f..3666c37ac3eda 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -2451,7 +2451,7 @@ UniValue fundrawtransaction(const UniValue& params, bool fHelp)
 
     // parse hex string from parameter
     CTransaction origTx;
-    if (!DecodeHexTx(origTx, params[0].get_str()))
+    if (!DecodeHexTx(origTx, params[0].get_str(), true))
         throw JSONRPCError(RPC_DESERIALIZATION_ERROR, "TX decode failed");
 
     if (origTx.vout.size() == 0)
diff --git a/src/wallet/walletdb.h b/src/wallet/walletdb.h
index 71b0ff26db173..d083722dd23ac 100644
--- a/src/wallet/walletdb.h
+++ b/src/wallet/walletdb.h
@@ -7,6 +7,7 @@
 #define BITCOIN_WALLET_WALLETDB_H
 
 #include "amount.h"
+#include "primitives/transaction.h"
 #include "wallet/db.h"
 #include "key.h"
 

From 449f9b8debcceb61a92043bc7031528a53627c47 Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Sun, 8 Nov 2015 01:16:45 +0100
Subject: [PATCH 0538/1802] BIP141: Witness program

---
 src/bitcoin-tx.cpp              |   2 +-
 src/main.cpp                    |   3 +-
 src/policy/policy.h             |   4 +-
 src/rpc/rawtransaction.cpp      |   2 +-
 src/script/bitcoinconsensus.cpp |   2 +-
 src/script/interpreter.cpp      | 111 +++++++++++++++++++++++++++++++-
 src/script/interpreter.h        |  12 +++-
 src/script/script.cpp           |  18 ++++++
 src/script/script.h             |   1 +
 src/script/script_error.cpp     |  14 ++++
 src/script/script_error.h       |   9 +++
 src/script/sign.cpp             |   2 +-
 src/test/multisig_tests.cpp     |  16 ++---
 src/test/script_P2SH_tests.cpp  |   2 +-
 src/test/script_tests.cpp       |  36 ++++++-----
 src/test/transaction_tests.cpp  |   4 +-
 16 files changed, 201 insertions(+), 37 deletions(-)

diff --git a/src/bitcoin-tx.cpp b/src/bitcoin-tx.cpp
index f9ea94b9f42d3..82a5583dda6e5 100644
--- a/src/bitcoin-tx.cpp
+++ b/src/bitcoin-tx.cpp
@@ -472,7 +472,7 @@ static void MutateTxSign(CMutableTransaction& tx, const string& flagStr)
         BOOST_FOREACH(const CTransaction& txv, txVariants) {
             txin.scriptSig = CombineSignatures(prevPubKey, mergedTx, i, txin.scriptSig, txv.vin[i].scriptSig);
         }
-        if (!VerifyScript(txin.scriptSig, prevPubKey, STANDARD_SCRIPT_VERIFY_FLAGS, MutableTransactionSignatureChecker(&mergedTx, i)))
+        if (!VerifyScript(txin.scriptSig, prevPubKey, mergedTx.wit.vtxinwit.size() > i ? &mergedTx.wit.vtxinwit[i].scriptWitness : NULL, STANDARD_SCRIPT_VERIFY_FLAGS, MutableTransactionSignatureChecker(&mergedTx, i)))
             fComplete = false;
     }
 
diff --git a/src/main.cpp b/src/main.cpp
index 2184940232bc8..d1945a509429c 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1867,7 +1867,8 @@ void UpdateCoins(const CTransaction& tx, CCoinsViewCache& inputs, int nHeight)
 
 bool CScriptCheck::operator()() {
     const CScript &scriptSig = ptxTo->vin[nIn].scriptSig;
-    if (!VerifyScript(scriptSig, scriptPubKey, nFlags, CachingTransactionSignatureChecker(ptxTo, nIn, cacheStore), &error)) {
+    const CScriptWitness *witness = (nIn < ptxTo->wit.vtxinwit.size()) ? &ptxTo->wit.vtxinwit[nIn].scriptWitness : NULL;
+    if (!VerifyScript(scriptSig, scriptPubKey, witness, nFlags, CachingTransactionSignatureChecker(ptxTo, nIn, cacheStore), &error)) {
         return false;
     }
     return true;
diff --git a/src/policy/policy.h b/src/policy/policy.h
index 4f9354e36fe71..a6bcc777ff51d 100644
--- a/src/policy/policy.h
+++ b/src/policy/policy.h
@@ -41,7 +41,9 @@ static const unsigned int STANDARD_SCRIPT_VERIFY_FLAGS = MANDATORY_SCRIPT_VERIFY
                                                          SCRIPT_VERIFY_CLEANSTACK |
                                                          SCRIPT_VERIFY_CHECKLOCKTIMEVERIFY |
                                                          SCRIPT_VERIFY_CHECKSEQUENCEVERIFY |
-                                                         SCRIPT_VERIFY_LOW_S;
+                                                         SCRIPT_VERIFY_LOW_S |
+                                                         SCRIPT_VERIFY_WITNESS |
+                                                         SCRIPT_VERIFY_DISCOURAGE_UPGRADABLE_WITNESS_PROGRAM;
 
 /** For convenience, standard but not mandatory verify flags. */
 static const unsigned int STANDARD_NOT_MANDATORY_VERIFY_FLAGS = STANDARD_SCRIPT_VERIFY_FLAGS & ~MANDATORY_SCRIPT_VERIFY_FLAGS;
diff --git a/src/rpc/rawtransaction.cpp b/src/rpc/rawtransaction.cpp
index e4a6e0f39b388..17c9a84602e35 100644
--- a/src/rpc/rawtransaction.cpp
+++ b/src/rpc/rawtransaction.cpp
@@ -789,7 +789,7 @@ UniValue signrawtransaction(const UniValue& params, bool fHelp)
             txin.scriptSig = CombineSignatures(prevPubKey, txConst, i, txin.scriptSig, txv.vin[i].scriptSig);
         }
         ScriptError serror = SCRIPT_ERR_OK;
-        if (!VerifyScript(txin.scriptSig, prevPubKey, STANDARD_SCRIPT_VERIFY_FLAGS, TransactionSignatureChecker(&txConst, i), &serror)) {
+        if (!VerifyScript(txin.scriptSig, prevPubKey, mergedTx.wit.vtxinwit.size() > i ? &mergedTx.wit.vtxinwit[i].scriptWitness : NULL, STANDARD_SCRIPT_VERIFY_FLAGS, TransactionSignatureChecker(&txConst, i), &serror)) {
             TxInErrorToJSON(txin, vErrors, ScriptErrorString(serror));
         }
     }
diff --git a/src/script/bitcoinconsensus.cpp b/src/script/bitcoinconsensus.cpp
index 47ad1d08073b9..5c9e7c0a571a5 100644
--- a/src/script/bitcoinconsensus.cpp
+++ b/src/script/bitcoinconsensus.cpp
@@ -85,7 +85,7 @@ int bitcoinconsensus_verify_script(const unsigned char *scriptPubKey, unsigned i
          // Regardless of the verification result, the tx did not error.
          set_error(err, bitcoinconsensus_ERR_OK);
 
-        return VerifyScript(tx.vin[nIn].scriptSig, CScript(scriptPubKey, scriptPubKey + scriptPubKeyLen), flags, TransactionSignatureChecker(&tx, nIn), NULL);
+        return VerifyScript(tx.vin[nIn].scriptSig, CScript(scriptPubKey, scriptPubKey + scriptPubKeyLen), nIn < tx.wit.vtxinwit.size() ? &tx.wit.vtxinwit[nIn].scriptWitness : NULL, flags, TransactionSignatureChecker(&tx, nIn), NULL);
     } catch (const std::exception&) {
         return set_error(err, bitcoinconsensus_ERR_TX_DESERIALIZE); // Error deserializing
     }
diff --git a/src/script/interpreter.cpp b/src/script/interpreter.cpp
index fd4a5674cfea1..be649fca20d3d 100644
--- a/src/script/interpreter.cpp
+++ b/src/script/interpreter.cpp
@@ -1239,8 +1239,67 @@ bool TransactionSignatureChecker::CheckSequence(const CScriptNum& nSequence) con
     return true;
 }
 
-bool VerifyScript(const CScript& scriptSig, const CScript& scriptPubKey, unsigned int flags, const BaseSignatureChecker& checker, ScriptError* serror)
+static bool VerifyWitnessProgram(const CScriptWitness& witness, int witversion, const std::vector<unsigned char>& program, unsigned int flags, const BaseSignatureChecker& checker, ScriptError* serror)
 {
+    vector<vector<unsigned char> > stack;
+    CScript scriptPubKey;
+
+    if (witversion == 0) {
+        if (program.size() == 32) {
+            // Version 0 segregated witness program: SHA256(CScript) inside the program, CScript + inputs in witness
+            if (witness.stack.size() == 0) {
+                return set_error(serror, SCRIPT_ERR_WITNESS_PROGRAM_WITNESS_EMPTY);
+            }
+            scriptPubKey = CScript(witness.stack.back().begin(), witness.stack.back().end());
+            stack = std::vector<std::vector<unsigned char> >(witness.stack.begin(), witness.stack.end() - 1);
+            uint256 hashScriptPubKey;
+            CSHA256().Write(&scriptPubKey[0], scriptPubKey.size()).Finalize(hashScriptPubKey.begin());
+            if (memcmp(hashScriptPubKey.begin(), &program[0], 32)) {
+                return set_error(serror, SCRIPT_ERR_WITNESS_PROGRAM_MISMATCH);
+            }
+        } else if (program.size() == 20) {
+            // Special case for pay-to-pubkeyhash; signature + pubkey in witness
+            if (witness.stack.size() != 2) {
+                return set_error(serror, SCRIPT_ERR_WITNESS_PROGRAM_MISMATCH); // 2 items in witness
+            }
+            scriptPubKey << OP_DUP << OP_HASH160 << program << OP_EQUALVERIFY << OP_CHECKSIG;
+            stack = witness.stack;
+        } else {
+            return set_error(serror, SCRIPT_ERR_WITNESS_PROGRAM_WRONG_LENGTH);
+        }
+    } else if (flags & SCRIPT_VERIFY_DISCOURAGE_UPGRADABLE_WITNESS_PROGRAM) {
+        return set_error(serror, SCRIPT_ERR_DISCOURAGE_UPGRADABLE_WITNESS_PROGRAM);
+    } else {
+        // Higher version witness scripts return true for future softfork compatibility
+        return set_success(serror);
+    }
+
+    // Disallow stack item size > MAX_SCRIPT_ELEMENT_SIZE in witness stack
+    for (unsigned int i = 0; i < stack.size(); i++) {
+        if (stack.at(i).size() > MAX_SCRIPT_ELEMENT_SIZE)
+            return set_error(serror, SCRIPT_ERR_PUSH_SIZE);
+    }
+
+    if (!EvalScript(stack, scriptPubKey, flags, checker, serror)) {
+        return false;
+    }
+
+    // Scripts inside witness implicitly require cleanstack behaviour
+    if (stack.size() != 1)
+        return set_error(serror, SCRIPT_ERR_EVAL_FALSE);
+    if (!CastToBool(stack.back()))
+        return set_error(serror, SCRIPT_ERR_EVAL_FALSE);
+    return true;
+}
+
+bool VerifyScript(const CScript& scriptSig, const CScript& scriptPubKey, const CScriptWitness* witness, unsigned int flags, const BaseSignatureChecker& checker, ScriptError* serror)
+{
+    static const CScriptWitness emptyWitness;
+    if (witness == NULL) {
+        witness = &emptyWitness;
+    }
+    bool hadWitness = false;
+
     set_error(serror, SCRIPT_ERR_UNKNOWN_ERROR);
 
     if ((flags & SCRIPT_VERIFY_SIGPUSHONLY) != 0 && !scriptSig.IsPushOnly()) {
@@ -1261,6 +1320,25 @@ bool VerifyScript(const CScript& scriptSig, const CScript& scriptPubKey, unsigne
     if (CastToBool(stack.back()) == false)
         return set_error(serror, SCRIPT_ERR_EVAL_FALSE);
 
+    // Bare witness programs
+    int witnessversion;
+    std::vector<unsigned char> witnessprogram;
+    if (flags & SCRIPT_VERIFY_WITNESS) {
+        if (scriptPubKey.IsWitnessProgram(witnessversion, witnessprogram)) {
+            hadWitness = true;
+            if (scriptSig.size() != 0) {
+                // The scriptSig must be _exactly_ CScript(), otherwise we reintroduce malleability.
+                return set_error(serror, SCRIPT_ERR_WITNESS_MALLEATED);
+            }
+            if (!VerifyWitnessProgram(*witness, witnessversion, witnessprogram, flags, checker, serror)) {
+                return false;
+            }
+            // Bypass the cleanstack check at the end. The actual stack is obviously not clean
+            // for witness programs.
+            stack.resize(1);
+        }
+    }
+
     // Additional validation for spend-to-script-hash transactions:
     if ((flags & SCRIPT_VERIFY_P2SH) && scriptPubKey.IsPayToScriptHash())
     {
@@ -1287,19 +1365,48 @@ bool VerifyScript(const CScript& scriptSig, const CScript& scriptPubKey, unsigne
             return set_error(serror, SCRIPT_ERR_EVAL_FALSE);
         if (!CastToBool(stack.back()))
             return set_error(serror, SCRIPT_ERR_EVAL_FALSE);
+
+        // P2SH witness program
+        if (flags & SCRIPT_VERIFY_WITNESS) {
+            if (pubKey2.IsWitnessProgram(witnessversion, witnessprogram)) {
+                hadWitness = true;
+                if (scriptSig != CScript() << std::vector<unsigned char>(pubKey2.begin(), pubKey2.end())) {
+                    // The scriptSig must be _exactly_ a single push of the redeemScript. Otherwise we
+                    // reintroduce malleability.
+                    return set_error(serror, SCRIPT_ERR_WITNESS_MALLEATED_P2SH);
+                }
+                if (!VerifyWitnessProgram(*witness, witnessversion, witnessprogram, flags, checker, serror)) {
+                    return false;
+                }
+                // Bypass the cleanstack check at the end. The actual stack is obviously not clean
+                // for witness programs.
+                stack.resize(1);
+            }
+        }
     }
 
     // The CLEANSTACK check is only performed after potential P2SH evaluation,
     // as the non-P2SH evaluation of a P2SH script will obviously not result in
-    // a clean stack (the P2SH inputs remain).
+    // a clean stack (the P2SH inputs remain). The same holds for witness evaluation.
     if ((flags & SCRIPT_VERIFY_CLEANSTACK) != 0) {
         // Disallow CLEANSTACK without P2SH, as otherwise a switch CLEANSTACK->P2SH+CLEANSTACK
         // would be possible, which is not a softfork (and P2SH should be one).
         assert((flags & SCRIPT_VERIFY_P2SH) != 0);
+        assert((flags & SCRIPT_VERIFY_WITNESS) != 0);
         if (stack.size() != 1) {
             return set_error(serror, SCRIPT_ERR_CLEANSTACK);
         }
     }
 
+    if (flags & SCRIPT_VERIFY_WITNESS) {
+        // We can't check for correct unexpected witness data if P2SH was off, so require
+        // that WITNESS implies P2SH. Otherwise, going from WITNESS->P2SH+WITNESS would be
+        // possible, which is not a softfork.
+        assert((flags & SCRIPT_VERIFY_P2SH) != 0);
+        if (!hadWitness && !witness->IsNull()) {
+            return set_error(serror, SCRIPT_ERR_WITNESS_UNEXPECTED);
+        }
+    }
+
     return set_success(serror);
 }
diff --git a/src/script/interpreter.h b/src/script/interpreter.h
index e5cb7290f2225..d1459ed620f6b 100644
--- a/src/script/interpreter.h
+++ b/src/script/interpreter.h
@@ -74,7 +74,7 @@ enum
     // "At least one stack element must remain, and when interpreted as a boolean, it must be true" to
     // "Exactly one stack element must remain, and when interpreted as a boolean, it must be true".
     // (softfork safe, BIP62 rule 6)
-    // Note: CLEANSTACK should never be used without P2SH.
+    // Note: CLEANSTACK should never be used without P2SH or WITNESS.
     SCRIPT_VERIFY_CLEANSTACK = (1U << 8),
 
     // Verify CHECKLOCKTIMEVERIFY
@@ -86,6 +86,14 @@ enum
     //
     // See BIP112 for details
     SCRIPT_VERIFY_CHECKSEQUENCEVERIFY = (1U << 10),
+
+    // Support segregated witness
+    //
+    SCRIPT_VERIFY_WITNESS = (1U << 11),
+
+    // Making v1-v16 witness program non-standard
+    //
+    SCRIPT_VERIFY_DISCOURAGE_UPGRADABLE_WITNESS_PROGRAM = (1U << 12),
 };
 
 bool CheckSignatureEncoding(const std::vector<unsigned char> &vchSig, unsigned int flags, ScriptError* serror);
@@ -139,6 +147,6 @@ class MutableTransactionSignatureChecker : public TransactionSignatureChecker
 };
 
 bool EvalScript(std::vector<std::vector<unsigned char> >& stack, const CScript& script, unsigned int flags, const BaseSignatureChecker& checker, ScriptError* error = NULL);
-bool VerifyScript(const CScript& scriptSig, const CScript& scriptPubKey, unsigned int flags, const BaseSignatureChecker& checker, ScriptError* error = NULL);
+bool VerifyScript(const CScript& scriptSig, const CScript& scriptPubKey, const CScriptWitness* witness, unsigned int flags, const BaseSignatureChecker& checker, ScriptError* serror = NULL);
 
 #endif // BITCOIN_SCRIPT_INTERPRETER_H
diff --git a/src/script/script.cpp b/src/script/script.cpp
index 6b1eb52bbf8c2..73f5a61bf68bd 100644
--- a/src/script/script.cpp
+++ b/src/script/script.cpp
@@ -210,6 +210,24 @@ bool CScript::IsPayToScriptHash() const
             (*this)[22] == OP_EQUAL);
 }
 
+// A witness program is any valid CScript that consists of a 1-byte push opcode
+// followed by a data push between 2 and 40 bytes.
+bool CScript::IsWitnessProgram(int& version, std::vector<unsigned char>& program) const
+{
+    if (this->size() < 4 || this->size() > 42) {
+        return false;
+    }
+    if ((*this)[0] != OP_0 && ((*this)[0] < OP_1 || (*this)[0] > OP_16)) {
+        return false;
+    }
+    if ((size_t)((*this)[1] + 2) == this->size()) {
+        version = DecodeOP_N((opcodetype)(*this)[0]);
+        program = std::vector<unsigned char>(this->begin() + 2, this->end());
+        return true;
+    }
+    return false;
+}
+
 bool CScript::IsPushOnly(const_iterator pc) const
 {
     while (pc < end())
diff --git a/src/script/script.h b/src/script/script.h
index 0b6d822d81ae0..b9b5be901389c 100644
--- a/src/script/script.h
+++ b/src/script/script.h
@@ -621,6 +621,7 @@ class CScript : public CScriptBase
     unsigned int GetSigOpCount(const CScript& scriptSig) const;
 
     bool IsPayToScriptHash() const;
+    bool IsWitnessProgram(int& version, std::vector<unsigned char>& program) const;
 
     /** Called by IsStandardTx and P2SH/BIP62 VerifyScript (which makes it consensus-critical). */
     bool IsPushOnly(const_iterator pc) const;
diff --git a/src/script/script_error.cpp b/src/script/script_error.cpp
index f1aa1fb408ae5..cef807edcf475 100644
--- a/src/script/script_error.cpp
+++ b/src/script/script_error.cpp
@@ -65,8 +65,22 @@ const char* ScriptErrorString(const ScriptError serror)
             return "Dummy CHECKMULTISIG argument must be zero";
         case SCRIPT_ERR_DISCOURAGE_UPGRADABLE_NOPS:
             return "NOPx reserved for soft-fork upgrades";
+        case SCRIPT_ERR_DISCOURAGE_UPGRADABLE_WITNESS_PROGRAM:
+            return "Witness version reserved for soft-fork upgrades";
         case SCRIPT_ERR_PUBKEYTYPE:
             return "Public key is neither compressed or uncompressed";
+        case SCRIPT_ERR_WITNESS_PROGRAM_WRONG_LENGTH:
+            return "Witness program has incorrect length";
+        case SCRIPT_ERR_WITNESS_PROGRAM_WITNESS_EMPTY:
+            return "Witness program was passed an empty witness";
+        case SCRIPT_ERR_WITNESS_PROGRAM_MISMATCH:
+            return "Witness program hash mismatch";
+        case SCRIPT_ERR_WITNESS_MALLEATED:
+            return "Witness requires empty scriptSig";
+        case SCRIPT_ERR_WITNESS_MALLEATED_P2SH:
+            return "Witness requires only-redeemscript scriptSig";
+        case SCRIPT_ERR_WITNESS_UNEXPECTED:
+            return "Witness provided for non-witness script";
         case SCRIPT_ERR_UNKNOWN_ERROR:
         case SCRIPT_ERR_ERROR_COUNT:
         default: break;
diff --git a/src/script/script_error.h b/src/script/script_error.h
index 26df33932fdd6..09dc6945adb45 100644
--- a/src/script/script_error.h
+++ b/src/script/script_error.h
@@ -51,6 +51,15 @@ typedef enum ScriptError_t
 
     /* softfork safeness */
     SCRIPT_ERR_DISCOURAGE_UPGRADABLE_NOPS,
+    SCRIPT_ERR_DISCOURAGE_UPGRADABLE_WITNESS_PROGRAM,
+
+    /* segregated witness */
+    SCRIPT_ERR_WITNESS_PROGRAM_WRONG_LENGTH,
+    SCRIPT_ERR_WITNESS_PROGRAM_WITNESS_EMPTY,
+    SCRIPT_ERR_WITNESS_PROGRAM_MISMATCH,
+    SCRIPT_ERR_WITNESS_MALLEATED,
+    SCRIPT_ERR_WITNESS_MALLEATED_P2SH,
+    SCRIPT_ERR_WITNESS_UNEXPECTED,
 
     SCRIPT_ERR_ERROR_COUNT
 } ScriptError;
diff --git a/src/script/sign.cpp b/src/script/sign.cpp
index 2f4111f786420..37b702de17cb6 100644
--- a/src/script/sign.cpp
+++ b/src/script/sign.cpp
@@ -123,7 +123,7 @@ bool ProduceSignature(const BaseSignatureCreator& creator, const CScript& fromPu
     }
 
     // Test solution
-    return VerifyScript(scriptSig, fromPubKey, STANDARD_SCRIPT_VERIFY_FLAGS, creator.Checker());
+    return VerifyScript(scriptSig, fromPubKey, NULL, STANDARD_SCRIPT_VERIFY_FLAGS, creator.Checker());
 }
 
 bool SignSignature(const CKeyStore &keystore, const CScript& fromPubKey, CMutableTransaction& txTo, unsigned int nIn, int nHashType)
diff --git a/src/test/multisig_tests.cpp b/src/test/multisig_tests.cpp
index d48a68ba547c5..a6435d94d3ad4 100644
--- a/src/test/multisig_tests.cpp
+++ b/src/test/multisig_tests.cpp
@@ -81,20 +81,20 @@ BOOST_AUTO_TEST_CASE(multisig_verify)
     keys.assign(1,key[0]);
     keys.push_back(key[1]);
     s = sign_multisig(a_and_b, keys, txTo[0], 0);
-    BOOST_CHECK(VerifyScript(s, a_and_b, flags, MutableTransactionSignatureChecker(&txTo[0], 0), &err));
+    BOOST_CHECK(VerifyScript(s, a_and_b, NULL, flags, MutableTransactionSignatureChecker(&txTo[0], 0), &err));
     BOOST_CHECK_MESSAGE(err == SCRIPT_ERR_OK, ScriptErrorString(err));
 
     for (int i = 0; i < 4; i++)
     {
         keys.assign(1,key[i]);
         s = sign_multisig(a_and_b, keys, txTo[0], 0);
-        BOOST_CHECK_MESSAGE(!VerifyScript(s, a_and_b, flags, MutableTransactionSignatureChecker(&txTo[0], 0), &err), strprintf("a&b 1: %d", i));
+        BOOST_CHECK_MESSAGE(!VerifyScript(s, a_and_b, NULL, flags, MutableTransactionSignatureChecker(&txTo[0], 0), &err), strprintf("a&b 1: %d", i));
         BOOST_CHECK_MESSAGE(err == SCRIPT_ERR_INVALID_STACK_OPERATION, ScriptErrorString(err));
 
         keys.assign(1,key[1]);
         keys.push_back(key[i]);
         s = sign_multisig(a_and_b, keys, txTo[0], 0);
-        BOOST_CHECK_MESSAGE(!VerifyScript(s, a_and_b, flags, MutableTransactionSignatureChecker(&txTo[0], 0), &err), strprintf("a&b 2: %d", i));
+        BOOST_CHECK_MESSAGE(!VerifyScript(s, a_and_b, NULL, flags, MutableTransactionSignatureChecker(&txTo[0], 0), &err), strprintf("a&b 2: %d", i));
         BOOST_CHECK_MESSAGE(err == SCRIPT_ERR_EVAL_FALSE, ScriptErrorString(err));
     }
 
@@ -105,18 +105,18 @@ BOOST_AUTO_TEST_CASE(multisig_verify)
         s = sign_multisig(a_or_b, keys, txTo[1], 0);
         if (i == 0 || i == 1)
         {
-            BOOST_CHECK_MESSAGE(VerifyScript(s, a_or_b, flags, MutableTransactionSignatureChecker(&txTo[1], 0), &err), strprintf("a|b: %d", i));
+            BOOST_CHECK_MESSAGE(VerifyScript(s, a_or_b, NULL, flags, MutableTransactionSignatureChecker(&txTo[1], 0), &err), strprintf("a|b: %d", i));
             BOOST_CHECK_MESSAGE(err == SCRIPT_ERR_OK, ScriptErrorString(err));
         }
         else
         {
-            BOOST_CHECK_MESSAGE(!VerifyScript(s, a_or_b, flags, MutableTransactionSignatureChecker(&txTo[1], 0), &err), strprintf("a|b: %d", i));
+            BOOST_CHECK_MESSAGE(!VerifyScript(s, a_or_b, NULL, flags, MutableTransactionSignatureChecker(&txTo[1], 0), &err), strprintf("a|b: %d", i));
             BOOST_CHECK_MESSAGE(err == SCRIPT_ERR_EVAL_FALSE, ScriptErrorString(err));
         }
     }
     s.clear();
     s << OP_0 << OP_1;
-    BOOST_CHECK(!VerifyScript(s, a_or_b, flags, MutableTransactionSignatureChecker(&txTo[1], 0), &err));
+    BOOST_CHECK(!VerifyScript(s, a_or_b, NULL, flags, MutableTransactionSignatureChecker(&txTo[1], 0), &err));
     BOOST_CHECK_MESSAGE(err == SCRIPT_ERR_SIG_DER, ScriptErrorString(err));
 
 
@@ -128,12 +128,12 @@ BOOST_AUTO_TEST_CASE(multisig_verify)
             s = sign_multisig(escrow, keys, txTo[2], 0);
             if (i < j && i < 3 && j < 3)
             {
-                BOOST_CHECK_MESSAGE(VerifyScript(s, escrow, flags, MutableTransactionSignatureChecker(&txTo[2], 0), &err), strprintf("escrow 1: %d %d", i, j));
+                BOOST_CHECK_MESSAGE(VerifyScript(s, escrow, NULL, flags, MutableTransactionSignatureChecker(&txTo[2], 0), &err), strprintf("escrow 1: %d %d", i, j));
                 BOOST_CHECK_MESSAGE(err == SCRIPT_ERR_OK, ScriptErrorString(err));
             }
             else
             {
-                BOOST_CHECK_MESSAGE(!VerifyScript(s, escrow, flags, MutableTransactionSignatureChecker(&txTo[2], 0), &err), strprintf("escrow 2: %d %d", i, j));
+                BOOST_CHECK_MESSAGE(!VerifyScript(s, escrow, NULL, flags, MutableTransactionSignatureChecker(&txTo[2], 0), &err), strprintf("escrow 2: %d %d", i, j));
                 BOOST_CHECK_MESSAGE(err == SCRIPT_ERR_EVAL_FALSE, ScriptErrorString(err));
             }
         }
diff --git a/src/test/script_P2SH_tests.cpp b/src/test/script_P2SH_tests.cpp
index d10284fe940e5..d6b5f41d44ac5 100644
--- a/src/test/script_P2SH_tests.cpp
+++ b/src/test/script_P2SH_tests.cpp
@@ -42,7 +42,7 @@ Verify(const CScript& scriptSig, const CScript& scriptPubKey, bool fStrict, Scri
     txTo.vin[0].scriptSig = scriptSig;
     txTo.vout[0].nValue = 1;
 
-    return VerifyScript(scriptSig, scriptPubKey, fStrict ? SCRIPT_VERIFY_P2SH : SCRIPT_VERIFY_NONE, MutableTransactionSignatureChecker(&txTo, 0), &err);
+    return VerifyScript(scriptSig, scriptPubKey, NULL, fStrict ? SCRIPT_VERIFY_P2SH : SCRIPT_VERIFY_NONE, MutableTransactionSignatureChecker(&txTo, 0), &err);
 }
 
 
diff --git a/src/test/script_tests.cpp b/src/test/script_tests.cpp
index 39089f103d0c2..d402ba56bbbf6 100644
--- a/src/test/script_tests.cpp
+++ b/src/test/script_tests.cpp
@@ -147,10 +147,14 @@ CMutableTransaction BuildSpendingTransaction(const CScript& scriptSig, const CMu
 void DoTest(const CScript& scriptPubKey, const CScript& scriptSig, int flags, const std::string& message, int scriptError)
 {
     bool expect = (scriptError == SCRIPT_ERR_OK);
+    if (flags & SCRIPT_VERIFY_CLEANSTACK) {
+        flags |= SCRIPT_VERIFY_P2SH;
+        flags |= SCRIPT_VERIFY_WITNESS;
+    }
     ScriptError err;
     CMutableTransaction tx = BuildSpendingTransaction(scriptSig, BuildCreditingTransaction(scriptPubKey));
     CMutableTransaction tx2 = tx;
-    BOOST_CHECK_MESSAGE(VerifyScript(scriptSig, scriptPubKey, flags, MutableTransactionSignatureChecker(&tx, 0), &err) == expect, message);
+    BOOST_CHECK_MESSAGE(VerifyScript(scriptSig, scriptPubKey, NULL, flags, MutableTransactionSignatureChecker(&tx, 0), &err) == expect, message);
     BOOST_CHECK_MESSAGE(err == scriptError, std::string(FormatScriptError(err)) + " where " + std::string(FormatScriptError((ScriptError_t)scriptError)) + " expected: " + message);
 #if defined(HAVE_CONSENSUS_LIB)
     CDataStream stream(SER_NETWORK, PROTOCOL_VERSION);
@@ -799,18 +803,18 @@ BOOST_AUTO_TEST_CASE(script_CHECKMULTISIG12)
     CMutableTransaction txTo12 = BuildSpendingTransaction(CScript(), txFrom12);
 
     CScript goodsig1 = sign_multisig(scriptPubKey12, key1, txTo12);
-    BOOST_CHECK(VerifyScript(goodsig1, scriptPubKey12, flags, MutableTransactionSignatureChecker(&txTo12, 0), &err));
+    BOOST_CHECK(VerifyScript(goodsig1, scriptPubKey12, NULL, flags, MutableTransactionSignatureChecker(&txTo12, 0), &err));
     BOOST_CHECK_MESSAGE(err == SCRIPT_ERR_OK, ScriptErrorString(err));
     txTo12.vout[0].nValue = 2;
-    BOOST_CHECK(!VerifyScript(goodsig1, scriptPubKey12, flags, MutableTransactionSignatureChecker(&txTo12, 0), &err));
+    BOOST_CHECK(!VerifyScript(goodsig1, scriptPubKey12, NULL, flags, MutableTransactionSignatureChecker(&txTo12, 0), &err));
     BOOST_CHECK_MESSAGE(err == SCRIPT_ERR_EVAL_FALSE, ScriptErrorString(err));
 
     CScript goodsig2 = sign_multisig(scriptPubKey12, key2, txTo12);
-    BOOST_CHECK(VerifyScript(goodsig2, scriptPubKey12, flags, MutableTransactionSignatureChecker(&txTo12, 0), &err));
+    BOOST_CHECK(VerifyScript(goodsig2, scriptPubKey12, NULL, flags, MutableTransactionSignatureChecker(&txTo12, 0), &err));
     BOOST_CHECK_MESSAGE(err == SCRIPT_ERR_OK, ScriptErrorString(err));
 
     CScript badsig1 = sign_multisig(scriptPubKey12, key3, txTo12);
-    BOOST_CHECK(!VerifyScript(badsig1, scriptPubKey12, flags, MutableTransactionSignatureChecker(&txTo12, 0), &err));
+    BOOST_CHECK(!VerifyScript(badsig1, scriptPubKey12, NULL, flags, MutableTransactionSignatureChecker(&txTo12, 0), &err));
     BOOST_CHECK_MESSAGE(err == SCRIPT_ERR_EVAL_FALSE, ScriptErrorString(err));
 }
 
@@ -832,54 +836,54 @@ BOOST_AUTO_TEST_CASE(script_CHECKMULTISIG23)
     std::vector<CKey> keys;
     keys.push_back(key1); keys.push_back(key2);
     CScript goodsig1 = sign_multisig(scriptPubKey23, keys, txTo23);
-    BOOST_CHECK(VerifyScript(goodsig1, scriptPubKey23, flags, MutableTransactionSignatureChecker(&txTo23, 0), &err));
+    BOOST_CHECK(VerifyScript(goodsig1, scriptPubKey23, NULL, flags, MutableTransactionSignatureChecker(&txTo23, 0), &err));
     BOOST_CHECK_MESSAGE(err == SCRIPT_ERR_OK, ScriptErrorString(err));
 
     keys.clear();
     keys.push_back(key1); keys.push_back(key3);
     CScript goodsig2 = sign_multisig(scriptPubKey23, keys, txTo23);
-    BOOST_CHECK(VerifyScript(goodsig2, scriptPubKey23, flags, MutableTransactionSignatureChecker(&txTo23, 0), &err));
+    BOOST_CHECK(VerifyScript(goodsig2, scriptPubKey23, NULL, flags, MutableTransactionSignatureChecker(&txTo23, 0), &err));
     BOOST_CHECK_MESSAGE(err == SCRIPT_ERR_OK, ScriptErrorString(err));
 
     keys.clear();
     keys.push_back(key2); keys.push_back(key3);
     CScript goodsig3 = sign_multisig(scriptPubKey23, keys, txTo23);
-    BOOST_CHECK(VerifyScript(goodsig3, scriptPubKey23, flags, MutableTransactionSignatureChecker(&txTo23, 0), &err));
+    BOOST_CHECK(VerifyScript(goodsig3, scriptPubKey23, NULL, flags, MutableTransactionSignatureChecker(&txTo23, 0), &err));
     BOOST_CHECK_MESSAGE(err == SCRIPT_ERR_OK, ScriptErrorString(err));
 
     keys.clear();
     keys.push_back(key2); keys.push_back(key2); // Can't re-use sig
     CScript badsig1 = sign_multisig(scriptPubKey23, keys, txTo23);
-    BOOST_CHECK(!VerifyScript(badsig1, scriptPubKey23, flags, MutableTransactionSignatureChecker(&txTo23, 0), &err));
+    BOOST_CHECK(!VerifyScript(badsig1, scriptPubKey23, NULL, flags, MutableTransactionSignatureChecker(&txTo23, 0), &err));
     BOOST_CHECK_MESSAGE(err == SCRIPT_ERR_EVAL_FALSE, ScriptErrorString(err));
 
     keys.clear();
     keys.push_back(key2); keys.push_back(key1); // sigs must be in correct order
     CScript badsig2 = sign_multisig(scriptPubKey23, keys, txTo23);
-    BOOST_CHECK(!VerifyScript(badsig2, scriptPubKey23, flags, MutableTransactionSignatureChecker(&txTo23, 0), &err));
+    BOOST_CHECK(!VerifyScript(badsig2, scriptPubKey23, NULL, flags, MutableTransactionSignatureChecker(&txTo23, 0), &err));
     BOOST_CHECK_MESSAGE(err == SCRIPT_ERR_EVAL_FALSE, ScriptErrorString(err));
 
     keys.clear();
     keys.push_back(key3); keys.push_back(key2); // sigs must be in correct order
     CScript badsig3 = sign_multisig(scriptPubKey23, keys, txTo23);
-    BOOST_CHECK(!VerifyScript(badsig3, scriptPubKey23, flags, MutableTransactionSignatureChecker(&txTo23, 0), &err));
+    BOOST_CHECK(!VerifyScript(badsig3, scriptPubKey23, NULL, flags, MutableTransactionSignatureChecker(&txTo23, 0), &err));
     BOOST_CHECK_MESSAGE(err == SCRIPT_ERR_EVAL_FALSE, ScriptErrorString(err));
 
     keys.clear();
     keys.push_back(key4); keys.push_back(key2); // sigs must match pubkeys
     CScript badsig4 = sign_multisig(scriptPubKey23, keys, txTo23);
-    BOOST_CHECK(!VerifyScript(badsig4, scriptPubKey23, flags, MutableTransactionSignatureChecker(&txTo23, 0), &err));
+    BOOST_CHECK(!VerifyScript(badsig4, scriptPubKey23, NULL, flags, MutableTransactionSignatureChecker(&txTo23, 0), &err));
     BOOST_CHECK_MESSAGE(err == SCRIPT_ERR_EVAL_FALSE, ScriptErrorString(err));
 
     keys.clear();
     keys.push_back(key1); keys.push_back(key4); // sigs must match pubkeys
     CScript badsig5 = sign_multisig(scriptPubKey23, keys, txTo23);
-    BOOST_CHECK(!VerifyScript(badsig5, scriptPubKey23, flags, MutableTransactionSignatureChecker(&txTo23, 0), &err));
+    BOOST_CHECK(!VerifyScript(badsig5, scriptPubKey23, NULL, flags, MutableTransactionSignatureChecker(&txTo23, 0), &err));
     BOOST_CHECK_MESSAGE(err == SCRIPT_ERR_EVAL_FALSE, ScriptErrorString(err));
 
     keys.clear(); // Must have signatures
     CScript badsig6 = sign_multisig(scriptPubKey23, keys, txTo23);
-    BOOST_CHECK(!VerifyScript(badsig6, scriptPubKey23, flags, MutableTransactionSignatureChecker(&txTo23, 0), &err));
+    BOOST_CHECK(!VerifyScript(badsig6, scriptPubKey23, NULL, flags, MutableTransactionSignatureChecker(&txTo23, 0), &err));
     BOOST_CHECK_MESSAGE(err == SCRIPT_ERR_INVALID_STACK_OPERATION, ScriptErrorString(err));
 }
 
@@ -999,7 +1003,7 @@ BOOST_AUTO_TEST_CASE(script_standard_push)
         CScript script;
         script << i;
         BOOST_CHECK_MESSAGE(script.IsPushOnly(), "Number " << i << " is not pure push.");
-        BOOST_CHECK_MESSAGE(VerifyScript(script, CScript() << OP_1, SCRIPT_VERIFY_MINIMALDATA, BaseSignatureChecker(), &err), "Number " << i << " push is not minimal data.");
+        BOOST_CHECK_MESSAGE(VerifyScript(script, CScript() << OP_1, NULL, SCRIPT_VERIFY_MINIMALDATA, BaseSignatureChecker(), &err), "Number " << i << " push is not minimal data.");
         BOOST_CHECK_MESSAGE(err == SCRIPT_ERR_OK, ScriptErrorString(err));
     }
 
@@ -1008,7 +1012,7 @@ BOOST_AUTO_TEST_CASE(script_standard_push)
         CScript script;
         script << data;
         BOOST_CHECK_MESSAGE(script.IsPushOnly(), "Length " << i << " is not pure push.");
-        BOOST_CHECK_MESSAGE(VerifyScript(script, CScript() << OP_1, SCRIPT_VERIFY_MINIMALDATA, BaseSignatureChecker(), &err), "Length " << i << " push is not minimal data.");
+        BOOST_CHECK_MESSAGE(VerifyScript(script, CScript() << OP_1, NULL, SCRIPT_VERIFY_MINIMALDATA, BaseSignatureChecker(), &err), "Length " << i << " push is not minimal data.");
         BOOST_CHECK_MESSAGE(err == SCRIPT_ERR_OK, ScriptErrorString(err));
     }
 }
diff --git a/src/test/transaction_tests.cpp b/src/test/transaction_tests.cpp
index 318fddc1ae9f9..9a24a613e5164 100644
--- a/src/test/transaction_tests.cpp
+++ b/src/test/transaction_tests.cpp
@@ -151,7 +151,7 @@ BOOST_AUTO_TEST_CASE(tx_valid)
 
                 unsigned int verify_flags = ParseScriptFlags(test[2].get_str());
                 BOOST_CHECK_MESSAGE(VerifyScript(tx.vin[i].scriptSig, mapprevOutScriptPubKeys[tx.vin[i].prevout],
-                                                 verify_flags, TransactionSignatureChecker(&tx, i), &err),
+                                                 NULL, verify_flags, TransactionSignatureChecker(&tx, i), &err),
                                     strTest);
                 BOOST_CHECK_MESSAGE(err == SCRIPT_ERR_OK, ScriptErrorString(err));
             }
@@ -225,7 +225,7 @@ BOOST_AUTO_TEST_CASE(tx_invalid)
 
                 unsigned int verify_flags = ParseScriptFlags(test[2].get_str());
                 fValid = VerifyScript(tx.vin[i].scriptSig, mapprevOutScriptPubKeys[tx.vin[i].prevout],
-                                      verify_flags, TransactionSignatureChecker(&tx, i), &err);
+                                      NULL, verify_flags, TransactionSignatureChecker(&tx, i), &err);
             }
             BOOST_CHECK_MESSAGE(!fValid, strTest);
             BOOST_CHECK_MESSAGE(err != SCRIPT_ERR_OK, ScriptErrorString(err));

From 8b49040854be2e26b66366aeae1cba4716f93d93 Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Fri, 6 Nov 2015 01:42:38 +0100
Subject: [PATCH 0539/1802] BIP141: Commitment structure and deployment

Includes a fix by Suhas Daftuar and LongShao007
---
 src/chainparams.cpp          |  14 ++++
 src/consensus/merkle.cpp     |  11 +++
 src/consensus/merkle.h       |   6 ++
 src/consensus/params.h       |   1 +
 src/consensus/validation.h   |   3 +
 src/main.cpp                 | 146 +++++++++++++++++++++++++++++++++--
 src/main.h                   |   9 +++
 src/miner.cpp                |  18 +++++
 src/miner.h                  |   2 +
 src/primitives/transaction.h |   3 +-
 src/rpc/blockchain.cpp       |   1 +
 src/rpc/mining.cpp           |  20 ++++-
 src/versionbits.cpp          |   4 +
 13 files changed, 225 insertions(+), 13 deletions(-)

diff --git a/src/chainparams.cpp b/src/chainparams.cpp
index 8c27a578bb948..2a198e8554c93 100644
--- a/src/chainparams.cpp
+++ b/src/chainparams.cpp
@@ -92,6 +92,11 @@ class CMainParams : public CChainParams {
         consensus.vDeployments[Consensus::DEPLOYMENT_CSV].nStartTime = 1462060800; // May 1st, 2016
         consensus.vDeployments[Consensus::DEPLOYMENT_CSV].nTimeout = 1493596800; // May 1st, 2017
 
+        // Deployment of SegWit (BIP141 and BIP143)
+        consensus.vDeployments[Consensus::DEPLOYMENT_SEGWIT].bit = 1;
+        consensus.vDeployments[Consensus::DEPLOYMENT_SEGWIT].nStartTime = 0;
+        consensus.vDeployments[Consensus::DEPLOYMENT_SEGWIT].nTimeout = 0; // Never / undefined
+
         /**
          * The message start string is designed to be unlikely to occur in normal data.
          * The characters are rarely used upper ASCII, not valid as UTF-8, and produce
@@ -183,6 +188,11 @@ class CTestNetParams : public CChainParams {
         consensus.vDeployments[Consensus::DEPLOYMENT_CSV].nStartTime = 1456790400; // March 1st, 2016
         consensus.vDeployments[Consensus::DEPLOYMENT_CSV].nTimeout = 1493596800; // May 1st, 2017
 
+        // Deployment of SegWit (BIP141 and BIP143)
+        consensus.vDeployments[Consensus::DEPLOYMENT_SEGWIT].bit = 1;
+        consensus.vDeployments[Consensus::DEPLOYMENT_SEGWIT].nStartTime = 2000000000; // Far in the future
+        consensus.vDeployments[Consensus::DEPLOYMENT_SEGWIT].nTimeout = 2100000000;
+
         pchMessageStart[0] = 0x0b;
         pchMessageStart[1] = 0x11;
         pchMessageStart[2] = 0x09;
@@ -255,6 +265,9 @@ class CRegTestParams : public CChainParams {
         consensus.vDeployments[Consensus::DEPLOYMENT_CSV].bit = 0;
         consensus.vDeployments[Consensus::DEPLOYMENT_CSV].nStartTime = 0;
         consensus.vDeployments[Consensus::DEPLOYMENT_CSV].nTimeout = 999999999999ULL;
+        consensus.vDeployments[Consensus::DEPLOYMENT_SEGWIT].bit = 1;
+        consensus.vDeployments[Consensus::DEPLOYMENT_SEGWIT].nStartTime = 0;
+        consensus.vDeployments[Consensus::DEPLOYMENT_SEGWIT].nTimeout = 999999999999ULL;
 
         pchMessageStart[0] = 0xfa;
         pchMessageStart[1] = 0xbf;
@@ -317,3 +330,4 @@ void SelectParams(const std::string& network)
     SelectBaseParams(network);
     pCurrentParams = &Params(network);
 }
+ 
diff --git a/src/consensus/merkle.cpp b/src/consensus/merkle.cpp
index 22eb7159a28f9..35f7d2e05a937 100644
--- a/src/consensus/merkle.cpp
+++ b/src/consensus/merkle.cpp
@@ -165,6 +165,17 @@ uint256 BlockMerkleRoot(const CBlock& block, bool* mutated)
     return ComputeMerkleRoot(leaves, mutated);
 }
 
+uint256 BlockWitnessMerkleRoot(const CBlock& block, bool* mutated)
+{
+    std::vector<uint256> leaves;
+    leaves.resize(block.vtx.size());
+    leaves[0].SetNull(); // The witness hash of the coinbase is 0.
+    for (size_t s = 1; s < block.vtx.size(); s++) {
+        leaves[s] = block.vtx[s].GetWitnessHash();
+    }
+    return ComputeMerkleRoot(leaves, mutated);
+}
+
 std::vector<uint256> BlockMerkleBranch(const CBlock& block, uint32_t position)
 {
     std::vector<uint256> leaves;
diff --git a/src/consensus/merkle.h b/src/consensus/merkle.h
index 6ef59745ac653..194aea9b75dc3 100644
--- a/src/consensus/merkle.h
+++ b/src/consensus/merkle.h
@@ -22,6 +22,12 @@ uint256 ComputeMerkleRootFromBranch(const uint256& leaf, const std::vector<uint2
  */
 uint256 BlockMerkleRoot(const CBlock& block, bool* mutated = NULL);
 
+/*
+ * Compute the Merkle root of the witness transactions in a block.
+ * *mutated is set to true if a duplicated subtree was found.
+ */
+uint256 BlockWitnessMerkleRoot(const CBlock& block, bool* mutated = NULL);
+
 /*
  * Compute the Merkle branch for the tree of transactions in a block, for a
  * given position.
diff --git a/src/consensus/params.h b/src/consensus/params.h
index 6c4cc49479ba1..822ec87d69e86 100644
--- a/src/consensus/params.h
+++ b/src/consensus/params.h
@@ -16,6 +16,7 @@ enum DeploymentPos
 {
     DEPLOYMENT_TESTDUMMY,
     DEPLOYMENT_CSV, // Deployment of BIP68, BIP112, and BIP113.
+    DEPLOYMENT_SEGWIT, // Deployment of BIP141 and BIP143
     // NOTE: Also add new deployments to VersionBitsDeploymentInfo in versionbits.cpp
     MAX_VERSION_BITS_DEPLOYMENTS
 };
diff --git a/src/consensus/validation.h b/src/consensus/validation.h
index d7e57f5b5ebdd..000b197270271 100644
--- a/src/consensus/validation.h
+++ b/src/consensus/validation.h
@@ -77,6 +77,9 @@ class CValidationState {
     bool CorruptionPossible() const {
         return corruptionPossible;
     }
+    void SetCorruptionPossible() {
+        corruptionPossible = true;
+    }
     unsigned int GetRejectCode() const { return chRejectCode; }
     std::string GetRejectReason() const { return strRejectReason; }
     std::string GetDebugMessage() const { return strDebugMessage; }
diff --git a/src/main.cpp b/src/main.cpp
index d1945a509429c..8d91d6d625b7a 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -293,6 +293,8 @@ struct CNodeState {
     bool fPreferHeaderAndIDs;
     //! Whether this peer will send us cmpctblocks if we request them
     bool fProvidesHeaderAndIDs;
+    //! Whether this peer can give us witnesses
+    bool fHaveWitness;
 
     CNodeState() {
         fCurrentlyConnected = false;
@@ -1119,6 +1121,11 @@ bool AcceptToMemoryPoolWorker(CTxMemPool& pool, CValidationState& state, const C
         return state.DoS(0, false, REJECT_NONSTANDARD, "premature-version2-tx");
     }
 
+    // Don't accept witness transactions before the final threshold passes
+    if (!tx.wit.IsNull() && !IsWitnessEnabled(chainActive.Tip(), Params().GetConsensus())) {
+        return state.DoS(0, false, REJECT_NONSTANDARD, "no-witness-yet", true);
+    }
+
     // Only accept nLockTime-using transactions that can be mined in the next
     // block; we don't want our mempool filled up with transactions that can't
     // be mined yet.
@@ -1459,8 +1466,17 @@ bool AcceptToMemoryPoolWorker(CTxMemPool& pool, CValidationState& state, const C
 
         // Check against previous transactions
         // This is done last to help prevent CPU exhaustion denial-of-service attacks.
-        if (!CheckInputs(tx, state, view, true, STANDARD_SCRIPT_VERIFY_FLAGS, true))
-            return false; // state filled in by CheckInputs
+        if (!CheckInputs(tx, state, view, true, STANDARD_SCRIPT_VERIFY_FLAGS, true)) {
+            // SCRIPT_VERIFY_CLEANSTACK requires SCRIPT_VERIFY_WITNESS, so we
+            // need to turn both off, and compare against just turning off CLEANSTACK
+            // to see if the failure is specifically due to witness validation.
+            if (CheckInputs(tx, state, view, true, STANDARD_SCRIPT_VERIFY_FLAGS & ~(SCRIPT_VERIFY_WITNESS | SCRIPT_VERIFY_CLEANSTACK), true) &&
+                !CheckInputs(tx, state, view, true, STANDARD_SCRIPT_VERIFY_FLAGS & ~SCRIPT_VERIFY_CLEANSTACK, true)) {
+                // Only the witness is wrong, so the transaction itself may be fine.
+                state.SetCorruptionPossible();
+            }
+            return false;
+        }
 
         // Check again against just the consensus-critical mandatory script
         // verification flags, in case of bugs in the standard flags that cause
@@ -2406,6 +2422,11 @@ bool ConnectBlock(const CBlock& block, CValidationState& state, CBlockIndex* pin
         nLockTimeFlags |= LOCKTIME_VERIFY_SEQUENCE;
     }
 
+    // Start enforcing WITNESS rules using versionbits logic.
+    if (IsWitnessEnabled(pindex->pprev, chainparams.GetConsensus())) {
+        flags |= SCRIPT_VERIFY_WITNESS;
+    }
+
     int64_t nTime2 = GetTimeMicros(); nTimeForks += nTime2 - nTime1;
     LogPrint("bench", "    - Fork checks: %.2fms [%.2fs]\n", 0.001 * (nTime2 - nTime1), nTimeForks * 0.000001);
 
@@ -3441,6 +3462,71 @@ static bool CheckIndexAgainstCheckpoint(const CBlockIndex* pindexPrev, CValidati
     return true;
 }
 
+bool IsWitnessEnabled(const CBlockIndex* pindexPrev, const Consensus::Params& params)
+{
+    LOCK(cs_main);
+    return (VersionBitsState(pindexPrev, params, Consensus::DEPLOYMENT_SEGWIT, versionbitscache) == THRESHOLD_ACTIVE);
+}
+
+// Compute at which vout of the block's coinbase transaction the witness
+// commitment occurs, or -1 if not found.
+static int GetWitnessCommitmentIndex(const CBlock& block)
+{
+    int commitpos = -1;
+    for (size_t o = 0; o < block.vtx[0].vout.size(); o++) {
+        if (block.vtx[0].vout[o].scriptPubKey.size() >= 38 && block.vtx[0].vout[o].scriptPubKey[0] == OP_RETURN && block.vtx[0].vout[o].scriptPubKey[1] == 0x24 && block.vtx[0].vout[o].scriptPubKey[2] == 0xaa && block.vtx[0].vout[o].scriptPubKey[3] == 0x21 && block.vtx[0].vout[o].scriptPubKey[4] == 0xa9 && block.vtx[0].vout[o].scriptPubKey[5] == 0xed) {
+            commitpos = o;
+        }
+    }
+    return commitpos;
+}
+
+void UpdateUncommittedBlockStructures(CBlock& block, const CBlockIndex* pindexPrev, const Consensus::Params& consensusParams)
+{
+    int commitpos = GetWitnessCommitmentIndex(block);
+    static const std::vector<unsigned char> nonce(32, 0x00);
+    if (commitpos != -1 && IsWitnessEnabled(pindexPrev, consensusParams) && block.vtx[0].wit.IsEmpty()) {
+        block.vtx[0].wit.vtxinwit.resize(1);
+        block.vtx[0].wit.vtxinwit[0].scriptWitness.stack.resize(1);
+        block.vtx[0].wit.vtxinwit[0].scriptWitness.stack[0] = nonce;
+    }
+}
+
+std::vector<unsigned char> GenerateCoinbaseCommitment(CBlock& block, const CBlockIndex* pindexPrev, const Consensus::Params& consensusParams)
+{
+    std::vector<unsigned char> commitment;
+    int commitpos = GetWitnessCommitmentIndex(block);
+    bool fHaveWitness = false;
+    for (size_t t = 1; t < block.vtx.size(); t++) {
+        if (!block.vtx[t].wit.IsNull()) {
+            fHaveWitness = true;
+            break;
+        }
+    }
+    std::vector<unsigned char> ret(32, 0x00);
+    if (fHaveWitness && IsWitnessEnabled(pindexPrev, consensusParams)) {
+        if (commitpos == -1) {
+            uint256 witnessroot = BlockWitnessMerkleRoot(block, NULL);
+            CHash256().Write(witnessroot.begin(), 32).Write(&ret[0], 32).Finalize(witnessroot.begin());
+            CTxOut out;
+            out.nValue = 0;
+            out.scriptPubKey.resize(38);
+            out.scriptPubKey[0] = OP_RETURN;
+            out.scriptPubKey[1] = 0x24;
+            out.scriptPubKey[2] = 0xaa;
+            out.scriptPubKey[3] = 0x21;
+            out.scriptPubKey[4] = 0xa9;
+            out.scriptPubKey[5] = 0xed;
+            memcpy(&out.scriptPubKey[6], witnessroot.begin(), 32);
+            commitment = std::vector<unsigned char>(out.scriptPubKey.begin(), out.scriptPubKey.end());
+            const_cast<std::vector<CTxOut>*>(&block.vtx[0].vout)->push_back(out);
+            block.vtx[0].UpdateHash();
+        }
+    }
+    UpdateUncommittedBlockStructures(block, pindexPrev, consensusParams);
+    return commitment;
+}
+
 bool ContextualCheckBlockHeader(const CBlockHeader& block, CValidationState& state, const Consensus::Params& consensusParams, CBlockIndex * const pindexPrev, int64_t nAdjustedTime)
 {
     // Check proof of work
@@ -3497,6 +3583,43 @@ bool ContextualCheckBlock(const CBlock& block, CValidationState& state, CBlockIn
         }
     }
 
+    // Validation for witness commitments.
+    // * We compute the witness hash (which is the hash including witnesses) of all the block's transactions, except the
+    //   coinbase (where 0x0000....0000 is used instead).
+    // * The coinbase scriptWitness is a stack of a single 32-byte vector, containing a witness nonce (unconstrained).
+    // * We build a merkle tree with all those witness hashes as leaves (similar to the hashMerkleRoot in the block header).
+    // * There must be at least one output whose scriptPubKey is a single 36-byte push, the first 4 bytes of which are
+    //   {0xaa, 0x21, 0xa9, 0xed}, and the following 32 bytes are SHA256^2(witness root, witness nonce). In case there are
+    //   multiple, the last one is used.
+    bool fHaveWitness = false;
+    if (IsWitnessEnabled(pindexPrev, consensusParams)) {
+        int commitpos = GetWitnessCommitmentIndex(block);
+        if (commitpos != -1) {
+            bool malleated = false;
+            uint256 hashWitness = BlockWitnessMerkleRoot(block, &malleated);
+            // The malleation check is ignored; as the transaction tree itself
+            // already does not permit it, it is impossible to trigger in the
+            // witness tree.
+            if (block.vtx[0].wit.vtxinwit.size() != 1 || block.vtx[0].wit.vtxinwit[0].scriptWitness.stack.size() != 1 || block.vtx[0].wit.vtxinwit[0].scriptWitness.stack[0].size() != 32) {
+                return state.DoS(100, error("%s : invalid witness nonce size", __func__), REJECT_INVALID, "bad-witness-nonce-size", true);
+            }
+            CHash256().Write(hashWitness.begin(), 32).Write(&block.vtx[0].wit.vtxinwit[0].scriptWitness.stack[0][0], 32).Finalize(hashWitness.begin());
+            if (memcmp(hashWitness.begin(), &block.vtx[0].vout[commitpos].scriptPubKey[6], 32)) {
+                return state.DoS(100, error("%s : witness merkle commitment mismatch", __func__), REJECT_INVALID, "bad-witness-merkle-match", true);
+            }
+            fHaveWitness = true;
+        }
+    }
+
+    // No witness data is allowed in blocks that don't commit to witness data, as this would otherwise leave room for spam
+    if (!fHaveWitness) {
+        for (size_t i = 0; i < block.vtx.size(); i++) {
+            if (!block.vtx[i].wit.IsNull()) {
+                return state.DoS(100, error("%s : unexpected witness data found", __func__), REJECT_INVALID, "unexpected-witness", true);
+            }
+        }
+    }
+
     return true;
 }
 
@@ -5278,7 +5401,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
                     else if (!fMissingInputs2)
                     {
                         int nDos = 0;
-                        if (stateDummy.IsInvalid(nDos) && nDos > 0)
+                        if (stateDummy.IsInvalid(nDos) && nDos > 0 && (!state.CorruptionPossible() || State(fromPeer)->fHaveWitness))
                         {
                             // Punish peer that gave us an invalid orphan tx
                             Misbehaving(fromPeer, nDos);
@@ -5289,8 +5412,10 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
                         // Probably non-standard or insufficient fee/priority
                         LogPrint("mempool", "   removed orphan tx %s\n", orphanHash.ToString());
                         vEraseQueue.push_back(orphanHash);
-                        assert(recentRejects);
-                        recentRejects->insert(orphanHash);
+                        if (!stateDummy.CorruptionPossible()) {
+                            assert(recentRejects);
+                            recentRejects->insert(orphanHash);
+                        }
                     }
                     mempool.check(pcoinsTip);
                 }
@@ -5325,8 +5450,10 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
                 LogPrint("mempool", "not keeping orphan with rejected parents %s\n",tx.GetHash().ToString());
             }
         } else {
-            assert(recentRejects);
-            recentRejects->insert(tx.GetHash());
+            if (!state.CorruptionPossible()) {
+                assert(recentRejects);
+                recentRejects->insert(tx.GetHash());
+            }
 
             if (pfrom->fWhitelisted && GetBoolArg("-whitelistforcerelay", DEFAULT_WHITELISTFORCERELAY)) {
                 // Always relay transactions received from whitelisted peers, even
@@ -5355,8 +5482,11 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
             if (state.GetRejectCode() < REJECT_INTERNAL) // Never send AcceptToMemoryPool's internal codes over P2P
                 pfrom->PushMessage(NetMsgType::REJECT, strCommand, (unsigned char)state.GetRejectCode(),
                                    state.GetRejectReason().substr(0, MAX_REJECT_MESSAGE_LENGTH), inv.hash);
-            if (nDoS > 0)
+            if (nDoS > 0 && (!state.CorruptionPossible() || State(pfrom->id)->fHaveWitness)) {
+                // When a non-witness-supporting peer gives us a transaction that would
+                // be accepted if witness validation was off, we can't blame them for it.
                 Misbehaving(pfrom->GetId(), nDoS);
+            }
         }
         FlushStateToDisk(state, FLUSH_STATE_PERIODIC);
     }
diff --git a/src/main.h b/src/main.h
index f004a29bb1a13..d0dce7068700c 100644
--- a/src/main.h
+++ b/src/main.h
@@ -453,6 +453,15 @@ bool DisconnectBlock(const CBlock& block, CValidationState& state, const CBlockI
 /** Check a block is completely valid from start to finish (only works on top of our current best block, with cs_main held) */
 bool TestBlockValidity(CValidationState& state, const CChainParams& chainparams, const CBlock& block, CBlockIndex* pindexPrev, bool fCheckPOW = true, bool fCheckMerkleRoot = true);
 
+/** Check whether witness commitments are required for block. */
+bool IsWitnessEnabled(const CBlockIndex* pindexPrev, const Consensus::Params& params);
+
+/** Update uncommitted block structures (currently: only the witness nonce). This is safe for submitted blocks. */
+void UpdateUncommittedBlockStructures(CBlock& block, const CBlockIndex* pindexPrev, const Consensus::Params& consensusParams);
+
+/** Produce the necessary coinbase commitment for a block (modifies the hash, don't call for mined blocks). */
+std::vector<unsigned char> GenerateCoinbaseCommitment(CBlock& block, const CBlockIndex* pindexPrev, const Consensus::Params& consensusParams);
+
 /** RAII wrapper for VerifyDB: Verify consistency of the block and coin databases */
 class CVerifyDB {
 public:
diff --git a/src/miner.cpp b/src/miner.cpp
index 989ad11a2614d..a7bf9ae84ccd7 100644
--- a/src/miner.cpp
+++ b/src/miner.cpp
@@ -93,6 +93,7 @@ void BlockAssembler::resetBlock()
     // Reserve space for coinbase tx
     nBlockSize = 1000;
     nBlockSigOps = 100;
+    fIncludeWitness = false;
 
     // These counters do not include coinbase tx
     nBlockTx = 0;
@@ -134,6 +135,14 @@ CBlockTemplate* BlockAssembler::CreateNewBlock(const CScript& scriptPubKeyIn)
                        ? nMedianTimePast
                        : pblock->GetBlockTime();
 
+    // Decide whether to include witness transactions
+    // This is only needed in case the witness softfork activation is reverted
+    // (which would require a very deep reorganization) or when
+    // -promiscuousmempoolflags is used.
+    // TODO: replace this with a call to main to assess validity of a mempool
+    // transaction (which in most cases can be a no-op).
+    fIncludeWitness = IsWitnessEnabled(pindexPrev, chainparams.GetConsensus());
+
     addPriorityTxs();
     addPackageTxs();
 
@@ -150,6 +159,7 @@ CBlockTemplate* BlockAssembler::CreateNewBlock(const CScript& scriptPubKeyIn)
     coinbaseTx.vout[0].nValue = nFees + GetBlockSubsidy(nHeight, chainparams.GetConsensus());
     coinbaseTx.vin[0].scriptSig = CScript() << nHeight << OP_0;
     pblock->vtx[0] = coinbaseTx;
+    pblocktemplate->vchCoinbaseCommitment = GenerateCoinbaseCommitment(*pblock, pindexPrev, chainparams.GetConsensus());
     pblocktemplate->vTxFees[0] = -nFees;
 
     // Fill in header
@@ -299,6 +309,10 @@ void BlockAssembler::addScoreTxs()
             continue;
         }
 
+        // cannot accept witness transactions into a non-witness block
+        if (!fIncludeWitness && !iter->GetTx().wit.IsNull())
+            continue;
+
         // If tx is dependent on other mempool txs which haven't yet been included
         // then put it in the waitSet
         if (isStillDependent(iter)) {
@@ -543,6 +557,10 @@ void BlockAssembler::addPriorityTxs()
             continue;
         }
 
+        // cannot accept witness transactions into a non-witness block
+        if (!fIncludeWitness && !iter->GetTx().wit.IsNull())
+            continue;
+
         // If tx is dependent on other mempool txs which haven't yet been included
         // then put it in the waitSet
         if (isStillDependent(iter)) {
diff --git a/src/miner.h b/src/miner.h
index a9fea85304aa6..8bfc1493db19b 100644
--- a/src/miner.h
+++ b/src/miner.h
@@ -29,6 +29,7 @@ struct CBlockTemplate
     CBlock block;
     std::vector<CAmount> vTxFees;
     std::vector<int64_t> vTxSigOps;
+    std::vector<unsigned char> vchCoinbaseCommitment;
 };
 
 // Container for tracking updates to ancestor feerate as we include (parent)
@@ -139,6 +140,7 @@ class BlockAssembler
     CBlock* pblock;
 
     // Configuration parameters for the block size
+    bool fIncludeWitness;
     unsigned int nBlockMaxSize, nBlockMinSize;
 
     // Information on the current status of the block
diff --git a/src/primitives/transaction.h b/src/primitives/transaction.h
index d8ae41ad78da3..5a58241347b49 100644
--- a/src/primitives/transaction.h
+++ b/src/primitives/transaction.h
@@ -335,7 +335,6 @@ class CTransaction
 private:
     /** Memory only. */
     const uint256 hash;
-    void UpdateHash() const;
 
 public:
     // Default transaction version.
@@ -414,6 +413,8 @@ class CTransaction
     }
 
     std::string ToString() const;
+
+    void UpdateHash() const;
 };
 
 /** A mutable version of CTransaction. */
diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp
index 1bb365d36cdad..dae283fb6fea7 100644
--- a/src/rpc/blockchain.cpp
+++ b/src/rpc/blockchain.cpp
@@ -930,6 +930,7 @@ UniValue getblockchaininfo(const UniValue& params, bool fHelp)
     softforks.push_back(SoftForkDesc("bip66", 3, tip, consensusParams));
     softforks.push_back(SoftForkDesc("bip65", 4, tip, consensusParams));
     bip9_softforks.push_back(Pair("csv", BIP9SoftForkDesc(consensusParams, Consensus::DEPLOYMENT_CSV)));
+    bip9_softforks.push_back(Pair("segwit", BIP9SoftForkDesc(consensusParams, Consensus::DEPLOYMENT_SEGWIT)));
     obj.push_back(Pair("softforks",             softforks));
     obj.push_back(Pair("bip9_softforks", bip9_softforks));
 
diff --git a/src/rpc/mining.cpp b/src/rpc/mining.cpp
index 94eeea91f39f2..291314b8b57fa 100644
--- a/src/rpc/mining.cpp
+++ b/src/rpc/mining.cpp
@@ -348,7 +348,8 @@ UniValue getblocktemplate(const UniValue& params, bool fHelp)
             "  \"transactions\" : [                (array) contents of non-coinbase transactions that should be included in the next block\n"
             "      {\n"
             "         \"data\" : \"xxxx\",          (string) transaction data encoded in hexadecimal (byte-for-byte)\n"
-            "         \"hash\" : \"xxxx\",          (string) hash/id encoded in little-endian hexadecimal\n"
+            "         \"txid\" : \"xxxx\",          (string) transaction id encoded in little-endian hexadecimal\n"
+            "         \"hash\" : \"xxxx\",          (string) hash encoded in little-endian hexadecimal\n"
             "         \"depends\" : [              (array) array of numbers \n"
             "             n                        (numeric) transactions before this one (by 1-based index in 'transactions' list) that must be present in the final block if this one is\n"
             "             ,...\n"
@@ -546,7 +547,7 @@ UniValue getblocktemplate(const UniValue& params, bool fHelp)
     UniValue transactions(UniValue::VARR);
     map<uint256, int64_t> setTxIndex;
     int i = 0;
-    BOOST_FOREACH (const CTransaction& tx, pblock->vtx) {
+    BOOST_FOREACH (CTransaction& tx, pblock->vtx) {
         uint256 txHash = tx.GetHash();
         setTxIndex[txHash] = i++;
 
@@ -556,8 +557,8 @@ UniValue getblocktemplate(const UniValue& params, bool fHelp)
         UniValue entry(UniValue::VOBJ);
 
         entry.push_back(Pair("data", EncodeHexTx(tx)));
-
-        entry.push_back(Pair("hash", txHash.GetHex()));
+        entry.push_back(Pair("txid", txHash.GetHex()));
+        entry.push_back(Pair("hash", tx.GetWitnessHash().GetHex()));
 
         UniValue deps(UniValue::VARR);
         BOOST_FOREACH (const CTxIn &in, tx.vin)
@@ -656,6 +657,9 @@ UniValue getblocktemplate(const UniValue& params, bool fHelp)
     result.push_back(Pair("curtime", pblock->GetBlockTime()));
     result.push_back(Pair("bits", strprintf("%08x", pblock->nBits)));
     result.push_back(Pair("height", (int64_t)(pindexPrev->nHeight+1)));
+    if (!pblocktemplate->vchCoinbaseCommitment.empty()) {
+        result.push_back(Pair("default_witness_commitment", HexStr(pblocktemplate->vchCoinbaseCommitment.begin(), pblocktemplate->vchCoinbaseCommitment.end())));
+    }
 
     return result;
 }
@@ -719,6 +723,14 @@ UniValue submitblock(const UniValue& params, bool fHelp)
         }
     }
 
+    {
+        LOCK(cs_main);
+        BlockMap::iterator mi = mapBlockIndex.find(block.hashPrevBlock);
+        if (mi != mapBlockIndex.end()) {
+            UpdateUncommittedBlockStructures(block, mi->second, Params().GetConsensus());
+        }
+    }
+
     CValidationState state;
     submitblock_StateCatcher sc(block.GetHash());
     RegisterValidationInterface(&sc);
diff --git a/src/versionbits.cpp b/src/versionbits.cpp
index 043819c654b23..bf32ae6627945 100644
--- a/src/versionbits.cpp
+++ b/src/versionbits.cpp
@@ -14,6 +14,10 @@ const struct BIP9DeploymentInfo VersionBitsDeploymentInfo[Consensus::MAX_VERSION
     {
         /*.name =*/ "csv",
         /*.gbt_force =*/ true,
+    },
+    {
+        /*.name =*/ "segwit",
+        /*.gbt_force =*/ false,
     }
 };
 

From b8a97498df1e83f8dcc49bc3fa4344f9e9799242 Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Tue, 17 Nov 2015 00:20:49 +0100
Subject: [PATCH 0540/1802] BIP144: Handshake and relay (receiver side)

Service bit logic by Nicolas Dorier.

Only download blocks from witness peers after fork.
---
 src/init.cpp       | 12 ++++++++++++
 src/main.cpp       | 44 ++++++++++++++++++++++++++++++++++++--------
 src/net.cpp        |  6 +++++-
 src/net.h          |  1 +
 src/protocol.h     |  3 +++
 src/qt/guiutil.cpp |  3 +++
 6 files changed, 60 insertions(+), 9 deletions(-)

diff --git a/src/init.cpp b/src/init.cpp
index b572bfc32720a..6bce0a9b49b51 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -1377,6 +1377,18 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
         }
     }
 
+    if (Params().GetConsensus().vDeployments[Consensus::DEPLOYMENT_SEGWIT].nTimeout != 0) {
+        // Only advertize witness capabilities if they have a reasonable start time.
+        // This allows us to have the code merged without a defined softfork, by setting its
+        // end time to 0.
+        // Note that setting NODE_WITNESS is never required: the only downside from not
+        // doing so is that after activation, no upgraded nodes will fetch from you.
+        nLocalServices = ServiceFlags(nLocalServices | NODE_WITNESS);
+        // Only care about others providing witness capabilities if there is a softfork
+        // defined.
+        nRelevantServices = ServiceFlags(nRelevantServices | NODE_WITNESS);
+    }
+
     // ********************************************************* Step 10: import blocks
 
     if (mapArgs.count("-blocknotify"))
diff --git a/src/main.cpp b/src/main.cpp
index 8d91d6d625b7a..73e4c8f51c48f 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -313,6 +313,7 @@ struct CNodeState {
         fPreferHeaders = false;
         fPreferHeaderAndIDs = false;
         fProvidesHeaderAndIDs = false;
+        fHaveWitness = false;
     }
 };
 
@@ -4812,6 +4813,14 @@ void static ProcessGetData(CNode* pfrom, const Consensus::Params& consensusParam
     }
 }
 
+uint32_t GetFetchFlags(CNode* pfrom, CBlockIndex* pprev, const Consensus::Params& chainparams) {
+    uint32_t nFetchFlags = 0;
+    if (IsWitnessEnabled(pprev, chainparams) && State(pfrom->GetId())->fHaveWitness) {
+        nFetchFlags |= MSG_WITNESS_FLAG;
+    }
+    return nFetchFlags;
+}
+
 bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv, int64_t nTimeReceived, const CChainParams& chainparams)
 {
     LogPrint("net", "received: %s (%u bytes) peer=%d\n", SanitizeString(strCommand), vRecv.size(), pfrom->id);
@@ -4918,6 +4927,12 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
 
         pfrom->fClient = !(pfrom->nServices & NODE_NETWORK);
 
+        if((pfrom->nServices & NODE_WITNESS))
+        {
+            LOCK(cs_main);
+            State(pfrom->GetId())->fHaveWitness = true;
+        }
+
         // Potentially mark this peer as a preferred download peer.
         {
         LOCK(cs_main);
@@ -5119,17 +5134,23 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
 
         LOCK(cs_main);
 
+        uint32_t nFetchFlags = GetFetchFlags(pfrom, chainActive.Tip(), chainparams.GetConsensus());
+
         std::vector<CInv> vToFetch;
 
         for (unsigned int nInv = 0; nInv < vInv.size(); nInv++)
         {
-            const CInv &inv = vInv[nInv];
+            CInv &inv = vInv[nInv];
 
             boost::this_thread::interruption_point();
 
             bool fAlreadyHave = AlreadyHave(inv);
             LogPrint("net", "got inv: %s  %s peer=%d\n", inv.ToString(), fAlreadyHave ? "have" : "new", pfrom->id);
 
+            if (inv.type == MSG_TX) {
+                inv.type |= nFetchFlags;
+            }
+
             if (inv.type == MSG_BLOCK) {
                 UpdateBlockAvailability(pfrom->GetId(), inv.hash);
                 if (!fAlreadyHave && !fImporting && !fReindex && !mapBlocksInFlight.count(inv.hash)) {
@@ -5144,7 +5165,9 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
                     pfrom->PushMessage(NetMsgType::GETHEADERS, chainActive.GetLocator(pindexBestHeader), inv.hash);
                     CNodeState *nodestate = State(pfrom->GetId());
                     if (CanDirectFetch(chainparams.GetConsensus()) &&
-                        nodestate->nBlocksInFlight < MAX_BLOCKS_IN_TRANSIT_PER_PEER) {
+                        nodestate->nBlocksInFlight < MAX_BLOCKS_IN_TRANSIT_PER_PEER &&
+                        (!IsWitnessEnabled(chainActive.Tip(), chainparams.GetConsensus()) || State(pfrom->GetId())->fHaveWitness)) {
+                        inv.type |= nFetchFlags;
                         if (nodestate->fProvidesHeaderAndIDs)
                             vToFetch.push_back(CInv(MSG_CMPCT_BLOCK, inv.hash));
                         else
@@ -5730,7 +5753,8 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
             // Calculate all the blocks we'd need to switch to pindexLast, up to a limit.
             while (pindexWalk && !chainActive.Contains(pindexWalk) && vToFetch.size() <= MAX_BLOCKS_IN_TRANSIT_PER_PEER) {
                 if (!(pindexWalk->nStatus & BLOCK_HAVE_DATA) &&
-                        !mapBlocksInFlight.count(pindexWalk->GetBlockHash())) {
+                        !mapBlocksInFlight.count(pindexWalk->GetBlockHash()) &&
+                        (!IsWitnessEnabled(pindexWalk->pprev, chainparams.GetConsensus()) || State(pfrom->GetId())->fHaveWitness)) {
                     // We don't have this block, and it's not yet in flight.
                     vToFetch.push_back(pindexWalk);
                 }
@@ -5752,7 +5776,8 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
                         // Can't download any more from this peer
                         break;
                     }
-                    vGetData.push_back(CInv(MSG_BLOCK, pindex->GetBlockHash()));
+                    uint32_t nFetchFlags = GetFetchFlags(pfrom, pindex->pprev, chainparams.GetConsensus());
+                    vGetData.push_back(CInv(MSG_BLOCK | nFetchFlags, pindex->GetBlockHash()));
                     MarkBlockAsInFlight(pfrom->GetId(), pindex->GetBlockHash(), chainparams.GetConsensus(), pindex);
                     LogPrint("net", "Requesting block %s from  peer=%d\n",
                             pindex->GetBlockHash().ToString(), pfrom->id);
@@ -6598,10 +6623,13 @@ bool SendMessages(CNode* pto)
             NodeId staller = -1;
             FindNextBlocksToDownload(pto->GetId(), MAX_BLOCKS_IN_TRANSIT_PER_PEER - state.nBlocksInFlight, vToDownload, staller);
             BOOST_FOREACH(CBlockIndex *pindex, vToDownload) {
-                vGetData.push_back(CInv(MSG_BLOCK, pindex->GetBlockHash()));
-                MarkBlockAsInFlight(pto->GetId(), pindex->GetBlockHash(), consensusParams, pindex);
-                LogPrint("net", "Requesting block %s (%d) peer=%d\n", pindex->GetBlockHash().ToString(),
-                    pindex->nHeight, pto->id);
+                if (State(pto->GetId())->fHaveWitness || !IsWitnessEnabled(pindex->pprev, consensusParams)) {
+                    uint32_t nFetchFlags = GetFetchFlags(pto, pindex->pprev, consensusParams);
+                    vGetData.push_back(CInv(MSG_BLOCK | nFetchFlags, pindex->GetBlockHash()));
+                    MarkBlockAsInFlight(pto->GetId(), pindex->GetBlockHash(), consensusParams, pindex);
+                    LogPrint("net", "Requesting block %s (%d) peer=%d\n", pindex->GetBlockHash().ToString(),
+                        pindex->nHeight, pto->id);
+                }
             }
             if (state.nBlocksInFlight == 0 && staller != -1) {
                 if (State(staller)->nStallingSince == 0) {
diff --git a/src/net.cpp b/src/net.cpp
index 336163a89624d..dc83f19be48c8 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -72,7 +72,7 @@ namespace {
 const static std::string NET_MESSAGE_COMMAND_OTHER = "*other*";
 
 /** Services this node implementation cares about */
-static const ServiceFlags nRelevantServices = NODE_NETWORK;
+ServiceFlags nRelevantServices = NODE_NETWORK;
 
 //
 // Global state variables
@@ -1676,6 +1676,10 @@ void ThreadOpenConnections()
             if (nANow - addr.nLastTry < 600 && nTries < 30)
                 continue;
 
+            // only consider nodes missing relevant services after 40 failed attemps
+            if ((addr.nServices & nRelevantServices) != nRelevantServices && nTries < 40)
+                continue;
+
             // do not allow non-default ports, unless after 50 invalid addresses selected already
             if (addr.GetPort() != Params().GetDefaultPort() && nTries < 50)
                 continue;
diff --git a/src/net.h b/src/net.h
index cb35d8c4f28c3..7ed18b2050a38 100644
--- a/src/net.h
+++ b/src/net.h
@@ -156,6 +156,7 @@ CAddress GetLocalAddress(const CNetAddr *paddrPeer = NULL);
 extern bool fDiscover;
 extern bool fListen;
 extern ServiceFlags nLocalServices;
+extern ServiceFlags nRelevantServices;
 extern bool fRelayTxes;
 extern uint64_t nLocalHostNonce;
 extern CAddrMan addrman;
diff --git a/src/protocol.h b/src/protocol.h
index dd07092f5f8d9..15f27e2d2fbcb 100644
--- a/src/protocol.h
+++ b/src/protocol.h
@@ -264,6 +264,9 @@ enum ServiceFlags : uint64_t {
     // Bitcoin Core nodes used to support this by default, without advertising this bit,
     // but no longer do as of protocol version 70011 (= NO_BLOOM_VERSION)
     NODE_BLOOM = (1 << 2),
+    // Indicates that a node can be asked for blocks and transactions including
+    // witness data.
+    NODE_WITNESS = (1 << 3),
 
     // Bits 24-31 are reserved for temporary experiments. Just pick a bit that
     // isn't getting used, or one not being used much, and notify the
diff --git a/src/qt/guiutil.cpp b/src/qt/guiutil.cpp
index ff4320b36a480..4327de9b0c86d 100644
--- a/src/qt/guiutil.cpp
+++ b/src/qt/guiutil.cpp
@@ -909,6 +909,9 @@ QString formatServicesStr(quint64 mask)
             case NODE_BLOOM:
                 strList.append("BLOOM");
                 break;
+            case NODE_WITNESS:
+                strList.append("WITNESS");
+                break;
             default:
                 strList.append(QString("%1[%2]").arg("UNKNOWN").arg(check));
             }

From 0ef1dd3e11dd573b6e443852ef0c72e34093ac68 Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Thu, 31 Mar 2016 14:51:29 +0200
Subject: [PATCH 0541/1802] Refactor script validation to observe amounts

This is a preparation for BIP143 support.
---
 src/bitcoin-tx.cpp              |  3 ++-
 src/main.cpp                    |  2 +-
 src/main.h                      |  6 ++++--
 src/rpc/rawtransaction.cpp      |  3 ++-
 src/script/bitcoinconsensus.cpp |  3 ++-
 src/script/bitcoinconsensus.h   |  2 ++
 src/script/interpreter.h        |  4 ++--
 src/script/sigcache.h           |  2 +-
 src/script/sign.cpp             |  5 +++--
 src/test/multisig_tests.cpp     | 17 +++++++++--------
 src/test/script_P2SH_tests.cpp  |  2 +-
 src/test/script_tests.cpp       | 29 +++++++++++++++--------------
 src/test/transaction_tests.cpp  |  6 ++++--
 13 files changed, 48 insertions(+), 36 deletions(-)

diff --git a/src/bitcoin-tx.cpp b/src/bitcoin-tx.cpp
index 82a5583dda6e5..68c069659baca 100644
--- a/src/bitcoin-tx.cpp
+++ b/src/bitcoin-tx.cpp
@@ -462,6 +462,7 @@ static void MutateTxSign(CMutableTransaction& tx, const string& flagStr)
             continue;
         }
         const CScript& prevPubKey = coins->vout[txin.prevout.n].scriptPubKey;
+        const CAmount& amount = coins->vout[txin.prevout.n].nValue;
 
         txin.scriptSig.clear();
         // Only sign SIGHASH_SINGLE if there's a corresponding output:
@@ -472,7 +473,7 @@ static void MutateTxSign(CMutableTransaction& tx, const string& flagStr)
         BOOST_FOREACH(const CTransaction& txv, txVariants) {
             txin.scriptSig = CombineSignatures(prevPubKey, mergedTx, i, txin.scriptSig, txv.vin[i].scriptSig);
         }
-        if (!VerifyScript(txin.scriptSig, prevPubKey, mergedTx.wit.vtxinwit.size() > i ? &mergedTx.wit.vtxinwit[i].scriptWitness : NULL, STANDARD_SCRIPT_VERIFY_FLAGS, MutableTransactionSignatureChecker(&mergedTx, i)))
+        if (!VerifyScript(txin.scriptSig, prevPubKey, mergedTx.wit.vtxinwit.size() > i ? &mergedTx.wit.vtxinwit[i].scriptWitness : NULL, STANDARD_SCRIPT_VERIFY_FLAGS, MutableTransactionSignatureChecker(&mergedTx, i, amount)))
             fComplete = false;
     }
 
diff --git a/src/main.cpp b/src/main.cpp
index 73e4c8f51c48f..c22faf6db6f58 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1885,7 +1885,7 @@ void UpdateCoins(const CTransaction& tx, CCoinsViewCache& inputs, int nHeight)
 bool CScriptCheck::operator()() {
     const CScript &scriptSig = ptxTo->vin[nIn].scriptSig;
     const CScriptWitness *witness = (nIn < ptxTo->wit.vtxinwit.size()) ? &ptxTo->wit.vtxinwit[nIn].scriptWitness : NULL;
-    if (!VerifyScript(scriptSig, scriptPubKey, witness, nFlags, CachingTransactionSignatureChecker(ptxTo, nIn, cacheStore), &error)) {
+    if (!VerifyScript(scriptSig, scriptPubKey, witness, nFlags, CachingTransactionSignatureChecker(ptxTo, nIn, amount, cacheStore), &error)) {
         return false;
     }
     return true;
diff --git a/src/main.h b/src/main.h
index d0dce7068700c..6dd4b1aa3d0a2 100644
--- a/src/main.h
+++ b/src/main.h
@@ -394,6 +394,7 @@ class CScriptCheck
 {
 private:
     CScript scriptPubKey;
+    CAmount amount;
     const CTransaction *ptxTo;
     unsigned int nIn;
     unsigned int nFlags;
@@ -401,9 +402,9 @@ class CScriptCheck
     ScriptError error;
 
 public:
-    CScriptCheck(): ptxTo(0), nIn(0), nFlags(0), cacheStore(false), error(SCRIPT_ERR_UNKNOWN_ERROR) {}
+    CScriptCheck(): amount(0), ptxTo(0), nIn(0), nFlags(0), cacheStore(false), error(SCRIPT_ERR_UNKNOWN_ERROR) {}
     CScriptCheck(const CCoins& txFromIn, const CTransaction& txToIn, unsigned int nInIn, unsigned int nFlagsIn, bool cacheIn) :
-        scriptPubKey(txFromIn.vout[txToIn.vin[nInIn].prevout.n].scriptPubKey),
+        scriptPubKey(txFromIn.vout[txToIn.vin[nInIn].prevout.n].scriptPubKey), amount(txFromIn.vout[txToIn.vin[nInIn].prevout.n].nValue),
         ptxTo(&txToIn), nIn(nInIn), nFlags(nFlagsIn), cacheStore(cacheIn), error(SCRIPT_ERR_UNKNOWN_ERROR) { }
 
     bool operator()();
@@ -411,6 +412,7 @@ class CScriptCheck
     void swap(CScriptCheck &check) {
         scriptPubKey.swap(check.scriptPubKey);
         std::swap(ptxTo, check.ptxTo);
+        std::swap(amount, check.amount);
         std::swap(nIn, check.nIn);
         std::swap(nFlags, check.nFlags);
         std::swap(cacheStore, check.cacheStore);
diff --git a/src/rpc/rawtransaction.cpp b/src/rpc/rawtransaction.cpp
index 17c9a84602e35..ebfc828d4585b 100644
--- a/src/rpc/rawtransaction.cpp
+++ b/src/rpc/rawtransaction.cpp
@@ -778,6 +778,7 @@ UniValue signrawtransaction(const UniValue& params, bool fHelp)
             continue;
         }
         const CScript& prevPubKey = coins->vout[txin.prevout.n].scriptPubKey;
+        const CAmount& amount = coins->vout[txin.prevout.n].nValue;
 
         txin.scriptSig.clear();
         // Only sign SIGHASH_SINGLE if there's a corresponding output:
@@ -789,7 +790,7 @@ UniValue signrawtransaction(const UniValue& params, bool fHelp)
             txin.scriptSig = CombineSignatures(prevPubKey, txConst, i, txin.scriptSig, txv.vin[i].scriptSig);
         }
         ScriptError serror = SCRIPT_ERR_OK;
-        if (!VerifyScript(txin.scriptSig, prevPubKey, mergedTx.wit.vtxinwit.size() > i ? &mergedTx.wit.vtxinwit[i].scriptWitness : NULL, STANDARD_SCRIPT_VERIFY_FLAGS, TransactionSignatureChecker(&txConst, i), &serror)) {
+        if (!VerifyScript(txin.scriptSig, prevPubKey, mergedTx.wit.vtxinwit.size() > i ? &mergedTx.wit.vtxinwit[i].scriptWitness : NULL, STANDARD_SCRIPT_VERIFY_FLAGS, TransactionSignatureChecker(&txConst, i, amount), &serror)) {
             TxInErrorToJSON(txin, vErrors, ScriptErrorString(serror));
         }
     }
diff --git a/src/script/bitcoinconsensus.cpp b/src/script/bitcoinconsensus.cpp
index 5c9e7c0a571a5..26e7a85b7b722 100644
--- a/src/script/bitcoinconsensus.cpp
+++ b/src/script/bitcoinconsensus.cpp
@@ -85,7 +85,8 @@ int bitcoinconsensus_verify_script(const unsigned char *scriptPubKey, unsigned i
          // Regardless of the verification result, the tx did not error.
          set_error(err, bitcoinconsensus_ERR_OK);
 
-        return VerifyScript(tx.vin[nIn].scriptSig, CScript(scriptPubKey, scriptPubKey + scriptPubKeyLen), nIn < tx.wit.vtxinwit.size() ? &tx.wit.vtxinwit[nIn].scriptWitness : NULL, flags, TransactionSignatureChecker(&tx, nIn), NULL);
+        CAmount am(0);
+        return VerifyScript(tx.vin[nIn].scriptSig, CScript(scriptPubKey, scriptPubKey + scriptPubKeyLen), nIn < tx.wit.vtxinwit.size() ? &tx.wit.vtxinwit[nIn].scriptWitness : NULL, flags, TransactionSignatureChecker(&tx, nIn, am), NULL);
     } catch (const std::exception&) {
         return set_error(err, bitcoinconsensus_ERR_TX_DESERIALIZE); // Error deserializing
     }
diff --git a/src/script/bitcoinconsensus.h b/src/script/bitcoinconsensus.h
index 5b8c33c6bf42e..cd3e2f773177b 100644
--- a/src/script/bitcoinconsensus.h
+++ b/src/script/bitcoinconsensus.h
@@ -6,6 +6,8 @@
 #ifndef BITCOIN_BITCOINCONSENSUS_H
 #define BITCOIN_BITCOINCONSENSUS_H
 
+#include <stdint.h>
+
 #if defined(BUILD_BITCOIN_INTERNAL) && defined(HAVE_CONFIG_H)
 #include "config/bitcoin-config.h"
   #if defined(_WIN32)
diff --git a/src/script/interpreter.h b/src/script/interpreter.h
index d1459ed620f6b..6f13e75d78f62 100644
--- a/src/script/interpreter.h
+++ b/src/script/interpreter.h
@@ -131,7 +131,7 @@ class TransactionSignatureChecker : public BaseSignatureChecker
     virtual bool VerifySignature(const std::vector<unsigned char>& vchSig, const CPubKey& vchPubKey, const uint256& sighash) const;
 
 public:
-    TransactionSignatureChecker(const CTransaction* txToIn, unsigned int nInIn) : txTo(txToIn), nIn(nInIn) {}
+    TransactionSignatureChecker(const CTransaction* txToIn, unsigned int nInIn, const CAmount& amount) : txTo(txToIn), nIn(nInIn) {}
     bool CheckSig(const std::vector<unsigned char>& scriptSig, const std::vector<unsigned char>& vchPubKey, const CScript& scriptCode) const;
     bool CheckLockTime(const CScriptNum& nLockTime) const;
     bool CheckSequence(const CScriptNum& nSequence) const;
@@ -143,7 +143,7 @@ class MutableTransactionSignatureChecker : public TransactionSignatureChecker
     const CTransaction txTo;
 
 public:
-    MutableTransactionSignatureChecker(const CMutableTransaction* txToIn, unsigned int nInIn) : TransactionSignatureChecker(&txTo, nInIn), txTo(*txToIn) {}
+    MutableTransactionSignatureChecker(const CMutableTransaction* txToIn, unsigned int nInIn, const CAmount& amount) : TransactionSignatureChecker(&txTo, nInIn, amount), txTo(*txToIn) {}
 };
 
 bool EvalScript(std::vector<std::vector<unsigned char> >& stack, const CScript& script, unsigned int flags, const BaseSignatureChecker& checker, ScriptError* error = NULL);
diff --git a/src/script/sigcache.h b/src/script/sigcache.h
index be1df09c2ade2..050bf8cc42290 100644
--- a/src/script/sigcache.h
+++ b/src/script/sigcache.h
@@ -22,7 +22,7 @@ class CachingTransactionSignatureChecker : public TransactionSignatureChecker
     bool store;
 
 public:
-    CachingTransactionSignatureChecker(const CTransaction* txToIn, unsigned int nInIn, bool storeIn=true) : TransactionSignatureChecker(txToIn, nInIn), store(storeIn) {}
+    CachingTransactionSignatureChecker(const CTransaction* txToIn, unsigned int nInIn, const CAmount& amount, bool storeIn) : TransactionSignatureChecker(txToIn, nInIn, amount), store(storeIn) {}
 
     bool VerifySignature(const std::vector<unsigned char>& vchSig, const CPubKey& vchPubKey, const uint256& sighash) const;
 };
diff --git a/src/script/sign.cpp b/src/script/sign.cpp
index 37b702de17cb6..62d874eed4584 100644
--- a/src/script/sign.cpp
+++ b/src/script/sign.cpp
@@ -18,7 +18,8 @@ using namespace std;
 
 typedef std::vector<unsigned char> valtype;
 
-TransactionSignatureCreator::TransactionSignatureCreator(const CKeyStore* keystoreIn, const CTransaction* txToIn, unsigned int nInIn, int nHashTypeIn) : BaseSignatureCreator(keystoreIn), txTo(txToIn), nIn(nInIn), nHashType(nHashTypeIn), checker(txTo, nIn) {}
+static const CAmount amountZero = 0;
+TransactionSignatureCreator::TransactionSignatureCreator(const CKeyStore* keystoreIn, const CTransaction* txToIn, unsigned int nInIn, int nHashTypeIn) : BaseSignatureCreator(keystoreIn), txTo(txToIn), nIn(nInIn), nHashType(nHashTypeIn), checker(txTo, nIn, amountZero) {}
 
 bool TransactionSignatureCreator::CreateSig(std::vector<unsigned char>& vchSig, const CKeyID& address, const CScript& scriptCode) const
 {
@@ -258,7 +259,7 @@ static CScript CombineSignatures(const CScript& scriptPubKey, const BaseSignatur
 CScript CombineSignatures(const CScript& scriptPubKey, const CTransaction& txTo, unsigned int nIn,
                           const CScript& scriptSig1, const CScript& scriptSig2)
 {
-    TransactionSignatureChecker checker(&txTo, nIn);
+    TransactionSignatureChecker checker(&txTo, nIn, amountZero);
     return CombineSignatures(scriptPubKey, checker, scriptSig1, scriptSig2);
 }
 
diff --git a/src/test/multisig_tests.cpp b/src/test/multisig_tests.cpp
index a6435d94d3ad4..8c95601ea1a08 100644
--- a/src/test/multisig_tests.cpp
+++ b/src/test/multisig_tests.cpp
@@ -46,6 +46,7 @@ BOOST_AUTO_TEST_CASE(multisig_verify)
 
     ScriptError err;
     CKey key[4];
+    CAmount amount = 0;
     for (int i = 0; i < 4; i++)
         key[i].MakeNewKey(true);
 
@@ -81,20 +82,20 @@ BOOST_AUTO_TEST_CASE(multisig_verify)
     keys.assign(1,key[0]);
     keys.push_back(key[1]);
     s = sign_multisig(a_and_b, keys, txTo[0], 0);
-    BOOST_CHECK(VerifyScript(s, a_and_b, NULL, flags, MutableTransactionSignatureChecker(&txTo[0], 0), &err));
+    BOOST_CHECK(VerifyScript(s, a_and_b, NULL, flags, MutableTransactionSignatureChecker(&txTo[0], 0, amount), &err));
     BOOST_CHECK_MESSAGE(err == SCRIPT_ERR_OK, ScriptErrorString(err));
 
     for (int i = 0; i < 4; i++)
     {
         keys.assign(1,key[i]);
         s = sign_multisig(a_and_b, keys, txTo[0], 0);
-        BOOST_CHECK_MESSAGE(!VerifyScript(s, a_and_b, NULL, flags, MutableTransactionSignatureChecker(&txTo[0], 0), &err), strprintf("a&b 1: %d", i));
+        BOOST_CHECK_MESSAGE(!VerifyScript(s, a_and_b, NULL, flags, MutableTransactionSignatureChecker(&txTo[0], 0, amount), &err), strprintf("a&b 1: %d", i));
         BOOST_CHECK_MESSAGE(err == SCRIPT_ERR_INVALID_STACK_OPERATION, ScriptErrorString(err));
 
         keys.assign(1,key[1]);
         keys.push_back(key[i]);
         s = sign_multisig(a_and_b, keys, txTo[0], 0);
-        BOOST_CHECK_MESSAGE(!VerifyScript(s, a_and_b, NULL, flags, MutableTransactionSignatureChecker(&txTo[0], 0), &err), strprintf("a&b 2: %d", i));
+        BOOST_CHECK_MESSAGE(!VerifyScript(s, a_and_b, NULL, flags, MutableTransactionSignatureChecker(&txTo[0], 0, amount), &err), strprintf("a&b 2: %d", i));
         BOOST_CHECK_MESSAGE(err == SCRIPT_ERR_EVAL_FALSE, ScriptErrorString(err));
     }
 
@@ -105,18 +106,18 @@ BOOST_AUTO_TEST_CASE(multisig_verify)
         s = sign_multisig(a_or_b, keys, txTo[1], 0);
         if (i == 0 || i == 1)
         {
-            BOOST_CHECK_MESSAGE(VerifyScript(s, a_or_b, NULL, flags, MutableTransactionSignatureChecker(&txTo[1], 0), &err), strprintf("a|b: %d", i));
+            BOOST_CHECK_MESSAGE(VerifyScript(s, a_or_b, NULL, flags, MutableTransactionSignatureChecker(&txTo[1], 0, amount), &err), strprintf("a|b: %d", i));
             BOOST_CHECK_MESSAGE(err == SCRIPT_ERR_OK, ScriptErrorString(err));
         }
         else
         {
-            BOOST_CHECK_MESSAGE(!VerifyScript(s, a_or_b, NULL, flags, MutableTransactionSignatureChecker(&txTo[1], 0), &err), strprintf("a|b: %d", i));
+            BOOST_CHECK_MESSAGE(!VerifyScript(s, a_or_b, NULL, flags, MutableTransactionSignatureChecker(&txTo[1], 0, amount), &err), strprintf("a|b: %d", i));
             BOOST_CHECK_MESSAGE(err == SCRIPT_ERR_EVAL_FALSE, ScriptErrorString(err));
         }
     }
     s.clear();
     s << OP_0 << OP_1;
-    BOOST_CHECK(!VerifyScript(s, a_or_b, NULL, flags, MutableTransactionSignatureChecker(&txTo[1], 0), &err));
+    BOOST_CHECK(!VerifyScript(s, a_or_b, NULL, flags, MutableTransactionSignatureChecker(&txTo[1], 0, amount), &err));
     BOOST_CHECK_MESSAGE(err == SCRIPT_ERR_SIG_DER, ScriptErrorString(err));
 
 
@@ -128,12 +129,12 @@ BOOST_AUTO_TEST_CASE(multisig_verify)
             s = sign_multisig(escrow, keys, txTo[2], 0);
             if (i < j && i < 3 && j < 3)
             {
-                BOOST_CHECK_MESSAGE(VerifyScript(s, escrow, NULL, flags, MutableTransactionSignatureChecker(&txTo[2], 0), &err), strprintf("escrow 1: %d %d", i, j));
+                BOOST_CHECK_MESSAGE(VerifyScript(s, escrow, NULL, flags, MutableTransactionSignatureChecker(&txTo[2], 0, amount), &err), strprintf("escrow 1: %d %d", i, j));
                 BOOST_CHECK_MESSAGE(err == SCRIPT_ERR_OK, ScriptErrorString(err));
             }
             else
             {
-                BOOST_CHECK_MESSAGE(!VerifyScript(s, escrow, NULL, flags, MutableTransactionSignatureChecker(&txTo[2], 0), &err), strprintf("escrow 2: %d %d", i, j));
+                BOOST_CHECK_MESSAGE(!VerifyScript(s, escrow, NULL, flags, MutableTransactionSignatureChecker(&txTo[2], 0, amount), &err), strprintf("escrow 2: %d %d", i, j));
                 BOOST_CHECK_MESSAGE(err == SCRIPT_ERR_EVAL_FALSE, ScriptErrorString(err));
             }
         }
diff --git a/src/test/script_P2SH_tests.cpp b/src/test/script_P2SH_tests.cpp
index d6b5f41d44ac5..62deb736aad22 100644
--- a/src/test/script_P2SH_tests.cpp
+++ b/src/test/script_P2SH_tests.cpp
@@ -42,7 +42,7 @@ Verify(const CScript& scriptSig, const CScript& scriptPubKey, bool fStrict, Scri
     txTo.vin[0].scriptSig = scriptSig;
     txTo.vout[0].nValue = 1;
 
-    return VerifyScript(scriptSig, scriptPubKey, NULL, fStrict ? SCRIPT_VERIFY_P2SH : SCRIPT_VERIFY_NONE, MutableTransactionSignatureChecker(&txTo, 0), &err);
+    return VerifyScript(scriptSig, scriptPubKey, NULL, fStrict ? SCRIPT_VERIFY_P2SH : SCRIPT_VERIFY_NONE, MutableTransactionSignatureChecker(&txTo, 0, txFrom.vout[0].nValue), &err);
 }
 
 
diff --git a/src/test/script_tests.cpp b/src/test/script_tests.cpp
index d402ba56bbbf6..9587fecfdf471 100644
--- a/src/test/script_tests.cpp
+++ b/src/test/script_tests.cpp
@@ -154,7 +154,8 @@ void DoTest(const CScript& scriptPubKey, const CScript& scriptSig, int flags, co
     ScriptError err;
     CMutableTransaction tx = BuildSpendingTransaction(scriptSig, BuildCreditingTransaction(scriptPubKey));
     CMutableTransaction tx2 = tx;
-    BOOST_CHECK_MESSAGE(VerifyScript(scriptSig, scriptPubKey, NULL, flags, MutableTransactionSignatureChecker(&tx, 0), &err) == expect, message);
+    static const CAmount amountZero = 0;
+    BOOST_CHECK_MESSAGE(VerifyScript(scriptSig, scriptPubKey, NULL, flags, MutableTransactionSignatureChecker(&tx, 0, amountZero), &err) == expect, message);
     BOOST_CHECK_MESSAGE(err == scriptError, std::string(FormatScriptError(err)) + " where " + std::string(FormatScriptError((ScriptError_t)scriptError)) + " expected: " + message);
 #if defined(HAVE_CONSENSUS_LIB)
     CDataStream stream(SER_NETWORK, PROTOCOL_VERSION);
@@ -803,18 +804,18 @@ BOOST_AUTO_TEST_CASE(script_CHECKMULTISIG12)
     CMutableTransaction txTo12 = BuildSpendingTransaction(CScript(), txFrom12);
 
     CScript goodsig1 = sign_multisig(scriptPubKey12, key1, txTo12);
-    BOOST_CHECK(VerifyScript(goodsig1, scriptPubKey12, NULL, flags, MutableTransactionSignatureChecker(&txTo12, 0), &err));
+    BOOST_CHECK(VerifyScript(goodsig1, scriptPubKey12, NULL, flags, MutableTransactionSignatureChecker(&txTo12, 0, txFrom12.vout[0].nValue), &err));
     BOOST_CHECK_MESSAGE(err == SCRIPT_ERR_OK, ScriptErrorString(err));
     txTo12.vout[0].nValue = 2;
-    BOOST_CHECK(!VerifyScript(goodsig1, scriptPubKey12, NULL, flags, MutableTransactionSignatureChecker(&txTo12, 0), &err));
+    BOOST_CHECK(!VerifyScript(goodsig1, scriptPubKey12, NULL, flags, MutableTransactionSignatureChecker(&txTo12, 0, txFrom12.vout[0].nValue), &err));
     BOOST_CHECK_MESSAGE(err == SCRIPT_ERR_EVAL_FALSE, ScriptErrorString(err));
 
     CScript goodsig2 = sign_multisig(scriptPubKey12, key2, txTo12);
-    BOOST_CHECK(VerifyScript(goodsig2, scriptPubKey12, NULL, flags, MutableTransactionSignatureChecker(&txTo12, 0), &err));
+    BOOST_CHECK(VerifyScript(goodsig2, scriptPubKey12, NULL, flags, MutableTransactionSignatureChecker(&txTo12, 0, txFrom12.vout[0].nValue), &err));
     BOOST_CHECK_MESSAGE(err == SCRIPT_ERR_OK, ScriptErrorString(err));
 
     CScript badsig1 = sign_multisig(scriptPubKey12, key3, txTo12);
-    BOOST_CHECK(!VerifyScript(badsig1, scriptPubKey12, NULL, flags, MutableTransactionSignatureChecker(&txTo12, 0), &err));
+    BOOST_CHECK(!VerifyScript(badsig1, scriptPubKey12, NULL, flags, MutableTransactionSignatureChecker(&txTo12, 0, txFrom12.vout[0].nValue), &err));
     BOOST_CHECK_MESSAGE(err == SCRIPT_ERR_EVAL_FALSE, ScriptErrorString(err));
 }
 
@@ -836,54 +837,54 @@ BOOST_AUTO_TEST_CASE(script_CHECKMULTISIG23)
     std::vector<CKey> keys;
     keys.push_back(key1); keys.push_back(key2);
     CScript goodsig1 = sign_multisig(scriptPubKey23, keys, txTo23);
-    BOOST_CHECK(VerifyScript(goodsig1, scriptPubKey23, NULL, flags, MutableTransactionSignatureChecker(&txTo23, 0), &err));
+    BOOST_CHECK(VerifyScript(goodsig1, scriptPubKey23, NULL, flags, MutableTransactionSignatureChecker(&txTo23, 0, txFrom23.vout[0].nValue), &err));
     BOOST_CHECK_MESSAGE(err == SCRIPT_ERR_OK, ScriptErrorString(err));
 
     keys.clear();
     keys.push_back(key1); keys.push_back(key3);
     CScript goodsig2 = sign_multisig(scriptPubKey23, keys, txTo23);
-    BOOST_CHECK(VerifyScript(goodsig2, scriptPubKey23, NULL, flags, MutableTransactionSignatureChecker(&txTo23, 0), &err));
+    BOOST_CHECK(VerifyScript(goodsig2, scriptPubKey23, NULL, flags, MutableTransactionSignatureChecker(&txTo23, 0, txFrom23.vout[0].nValue), &err));
     BOOST_CHECK_MESSAGE(err == SCRIPT_ERR_OK, ScriptErrorString(err));
 
     keys.clear();
     keys.push_back(key2); keys.push_back(key3);
     CScript goodsig3 = sign_multisig(scriptPubKey23, keys, txTo23);
-    BOOST_CHECK(VerifyScript(goodsig3, scriptPubKey23, NULL, flags, MutableTransactionSignatureChecker(&txTo23, 0), &err));
+    BOOST_CHECK(VerifyScript(goodsig3, scriptPubKey23, NULL, flags, MutableTransactionSignatureChecker(&txTo23, 0, txFrom23.vout[0].nValue), &err));
     BOOST_CHECK_MESSAGE(err == SCRIPT_ERR_OK, ScriptErrorString(err));
 
     keys.clear();
     keys.push_back(key2); keys.push_back(key2); // Can't re-use sig
     CScript badsig1 = sign_multisig(scriptPubKey23, keys, txTo23);
-    BOOST_CHECK(!VerifyScript(badsig1, scriptPubKey23, NULL, flags, MutableTransactionSignatureChecker(&txTo23, 0), &err));
+    BOOST_CHECK(!VerifyScript(badsig1, scriptPubKey23, NULL, flags, MutableTransactionSignatureChecker(&txTo23, 0, txFrom23.vout[0].nValue), &err));
     BOOST_CHECK_MESSAGE(err == SCRIPT_ERR_EVAL_FALSE, ScriptErrorString(err));
 
     keys.clear();
     keys.push_back(key2); keys.push_back(key1); // sigs must be in correct order
     CScript badsig2 = sign_multisig(scriptPubKey23, keys, txTo23);
-    BOOST_CHECK(!VerifyScript(badsig2, scriptPubKey23, NULL, flags, MutableTransactionSignatureChecker(&txTo23, 0), &err));
+    BOOST_CHECK(!VerifyScript(badsig2, scriptPubKey23, NULL, flags, MutableTransactionSignatureChecker(&txTo23, 0, txFrom23.vout[0].nValue), &err));
     BOOST_CHECK_MESSAGE(err == SCRIPT_ERR_EVAL_FALSE, ScriptErrorString(err));
 
     keys.clear();
     keys.push_back(key3); keys.push_back(key2); // sigs must be in correct order
     CScript badsig3 = sign_multisig(scriptPubKey23, keys, txTo23);
-    BOOST_CHECK(!VerifyScript(badsig3, scriptPubKey23, NULL, flags, MutableTransactionSignatureChecker(&txTo23, 0), &err));
+    BOOST_CHECK(!VerifyScript(badsig3, scriptPubKey23, NULL, flags, MutableTransactionSignatureChecker(&txTo23, 0, txFrom23.vout[0].nValue), &err));
     BOOST_CHECK_MESSAGE(err == SCRIPT_ERR_EVAL_FALSE, ScriptErrorString(err));
 
     keys.clear();
     keys.push_back(key4); keys.push_back(key2); // sigs must match pubkeys
     CScript badsig4 = sign_multisig(scriptPubKey23, keys, txTo23);
-    BOOST_CHECK(!VerifyScript(badsig4, scriptPubKey23, NULL, flags, MutableTransactionSignatureChecker(&txTo23, 0), &err));
+    BOOST_CHECK(!VerifyScript(badsig4, scriptPubKey23, NULL, flags, MutableTransactionSignatureChecker(&txTo23, 0, txFrom23.vout[0].nValue), &err));
     BOOST_CHECK_MESSAGE(err == SCRIPT_ERR_EVAL_FALSE, ScriptErrorString(err));
 
     keys.clear();
     keys.push_back(key1); keys.push_back(key4); // sigs must match pubkeys
     CScript badsig5 = sign_multisig(scriptPubKey23, keys, txTo23);
-    BOOST_CHECK(!VerifyScript(badsig5, scriptPubKey23, NULL, flags, MutableTransactionSignatureChecker(&txTo23, 0), &err));
+    BOOST_CHECK(!VerifyScript(badsig5, scriptPubKey23, NULL, flags, MutableTransactionSignatureChecker(&txTo23, 0, txFrom23.vout[0].nValue), &err));
     BOOST_CHECK_MESSAGE(err == SCRIPT_ERR_EVAL_FALSE, ScriptErrorString(err));
 
     keys.clear(); // Must have signatures
     CScript badsig6 = sign_multisig(scriptPubKey23, keys, txTo23);
-    BOOST_CHECK(!VerifyScript(badsig6, scriptPubKey23, NULL, flags, MutableTransactionSignatureChecker(&txTo23, 0), &err));
+    BOOST_CHECK(!VerifyScript(badsig6, scriptPubKey23, NULL, flags, MutableTransactionSignatureChecker(&txTo23, 0, txFrom23.vout[0].nValue), &err));
     BOOST_CHECK_MESSAGE(err == SCRIPT_ERR_INVALID_STACK_OPERATION, ScriptErrorString(err));
 }
 
diff --git a/src/test/transaction_tests.cpp b/src/test/transaction_tests.cpp
index 9a24a613e5164..9fb23d8edfab7 100644
--- a/src/test/transaction_tests.cpp
+++ b/src/test/transaction_tests.cpp
@@ -149,9 +149,10 @@ BOOST_AUTO_TEST_CASE(tx_valid)
                     break;
                 }
 
+                CAmount amount = 0;
                 unsigned int verify_flags = ParseScriptFlags(test[2].get_str());
                 BOOST_CHECK_MESSAGE(VerifyScript(tx.vin[i].scriptSig, mapprevOutScriptPubKeys[tx.vin[i].prevout],
-                                                 NULL, verify_flags, TransactionSignatureChecker(&tx, i), &err),
+                                                 NULL, verify_flags, TransactionSignatureChecker(&tx, i, amount), &err),
                                     strTest);
                 BOOST_CHECK_MESSAGE(err == SCRIPT_ERR_OK, ScriptErrorString(err));
             }
@@ -224,8 +225,9 @@ BOOST_AUTO_TEST_CASE(tx_invalid)
                 }
 
                 unsigned int verify_flags = ParseScriptFlags(test[2].get_str());
+                CAmount amount = 0;
                 fValid = VerifyScript(tx.vin[i].scriptSig, mapprevOutScriptPubKeys[tx.vin[i].prevout],
-                                      NULL, verify_flags, TransactionSignatureChecker(&tx, i), &err);
+                                      NULL, verify_flags, TransactionSignatureChecker(&tx, i, amount), &err);
             }
             BOOST_CHECK_MESSAGE(!fValid, strTest);
             BOOST_CHECK_MESSAGE(err != SCRIPT_ERR_OK, ScriptErrorString(err));

From 3dd410294d42f251e4808ef1dfcfcd64817edbac Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Sun, 27 Dec 2015 19:49:08 +0100
Subject: [PATCH 0542/1802] BIP143: Verification logic

Includes simplifications by Eric Lombrozo.
---
 src/bitcoin-tx.cpp                   |  2 +-
 src/policy/policy.cpp                |  2 +-
 src/rpc/rawtransaction.cpp           |  2 +-
 src/script/interpreter.cpp           | 84 ++++++++++++++++++++++++----
 src/script/interpreter.h             | 17 ++++--
 src/script/sign.cpp                  | 17 +++---
 src/script/sign.h                    |  5 +-
 src/test/multisig_tests.cpp          |  2 +-
 src/test/script_tests.cpp            | 57 +++++++++----------
 src/test/sighash_tests.cpp           |  4 +-
 src/test/txvalidationcache_tests.cpp |  2 +-
 11 files changed, 131 insertions(+), 63 deletions(-)

diff --git a/src/bitcoin-tx.cpp b/src/bitcoin-tx.cpp
index 68c069659baca..424812a6dfbc5 100644
--- a/src/bitcoin-tx.cpp
+++ b/src/bitcoin-tx.cpp
@@ -471,7 +471,7 @@ static void MutateTxSign(CMutableTransaction& tx, const string& flagStr)
 
         // ... and merge in other signatures:
         BOOST_FOREACH(const CTransaction& txv, txVariants) {
-            txin.scriptSig = CombineSignatures(prevPubKey, mergedTx, i, txin.scriptSig, txv.vin[i].scriptSig);
+            txin.scriptSig = CombineSignatures(prevPubKey, mergedTx, i, amount, txin.scriptSig, txv.vin[i].scriptSig);
         }
         if (!VerifyScript(txin.scriptSig, prevPubKey, mergedTx.wit.vtxinwit.size() > i ? &mergedTx.wit.vtxinwit[i].scriptWitness : NULL, STANDARD_SCRIPT_VERIFY_FLAGS, MutableTransactionSignatureChecker(&mergedTx, i, amount)))
             fComplete = false;
diff --git a/src/policy/policy.cpp b/src/policy/policy.cpp
index d1a15451dc1f6..67434a38fa3c1 100644
--- a/src/policy/policy.cpp
+++ b/src/policy/policy.cpp
@@ -137,7 +137,7 @@ bool AreInputsStandard(const CTransaction& tx, const CCoinsViewCache& mapInputs)
         {
             std::vector<std::vector<unsigned char> > stack;
             // convert the scriptSig into a stack, so we can inspect the redeemScript
-            if (!EvalScript(stack, tx.vin[i].scriptSig, SCRIPT_VERIFY_NONE, BaseSignatureChecker(), 0))
+            if (!EvalScript(stack, tx.vin[i].scriptSig, SCRIPT_VERIFY_NONE, BaseSignatureChecker(), SIGVERSION_BASE))
                 return false;
             if (stack.empty())
                 return false;
diff --git a/src/rpc/rawtransaction.cpp b/src/rpc/rawtransaction.cpp
index ebfc828d4585b..38fd98055c42f 100644
--- a/src/rpc/rawtransaction.cpp
+++ b/src/rpc/rawtransaction.cpp
@@ -787,7 +787,7 @@ UniValue signrawtransaction(const UniValue& params, bool fHelp)
 
         // ... and merge in other signatures:
         BOOST_FOREACH(const CMutableTransaction& txv, txVariants) {
-            txin.scriptSig = CombineSignatures(prevPubKey, txConst, i, txin.scriptSig, txv.vin[i].scriptSig);
+            txin.scriptSig = CombineSignatures(prevPubKey, txConst, i, amount, txin.scriptSig, txv.vin[i].scriptSig);
         }
         ScriptError serror = SCRIPT_ERR_OK;
         if (!VerifyScript(txin.scriptSig, prevPubKey, mergedTx.wit.vtxinwit.size() > i ? &mergedTx.wit.vtxinwit[i].scriptWitness : NULL, STANDARD_SCRIPT_VERIFY_FLAGS, TransactionSignatureChecker(&txConst, i, amount), &serror)) {
diff --git a/src/script/interpreter.cpp b/src/script/interpreter.cpp
index be649fca20d3d..4deebd050d45e 100644
--- a/src/script/interpreter.cpp
+++ b/src/script/interpreter.cpp
@@ -229,7 +229,7 @@ bool static CheckMinimalPush(const valtype& data, opcodetype opcode) {
     return true;
 }
 
-bool EvalScript(vector<vector<unsigned char> >& stack, const CScript& script, unsigned int flags, const BaseSignatureChecker& checker, ScriptError* serror)
+bool EvalScript(vector<vector<unsigned char> >& stack, const CScript& script, unsigned int flags, const BaseSignatureChecker& checker, SigVersion sigversion, ScriptError* serror)
 {
     static const CScriptNum bnZero(0);
     static const CScriptNum bnOne(1);
@@ -869,13 +869,15 @@ bool EvalScript(vector<vector<unsigned char> >& stack, const CScript& script, un
                     CScript scriptCode(pbegincodehash, pend);
 
                     // Drop the signature, since there's no way for a signature to sign itself
-                    scriptCode.FindAndDelete(CScript(vchSig));
+                    if (sigversion == SIGVERSION_BASE) {
+                        scriptCode.FindAndDelete(CScript(vchSig));
+                    }
 
                     if (!CheckSignatureEncoding(vchSig, flags, serror) || !CheckPubKeyEncoding(vchPubKey, flags, serror)) {
                         //serror is set
                         return false;
                     }
-                    bool fSuccess = checker.CheckSig(vchSig, vchPubKey, scriptCode);
+                    bool fSuccess = checker.CheckSig(vchSig, vchPubKey, scriptCode, sigversion);
 
                     popstack(stack);
                     popstack(stack);
@@ -925,7 +927,9 @@ bool EvalScript(vector<vector<unsigned char> >& stack, const CScript& script, un
                     for (int k = 0; k < nSigsCount; k++)
                     {
                         valtype& vchSig = stacktop(-isig-k);
-                        scriptCode.FindAndDelete(CScript(vchSig));
+                        if (sigversion == SIGVERSION_BASE) {
+                            scriptCode.FindAndDelete(CScript(vchSig));
+                        }
                     }
 
                     bool fSuccess = true;
@@ -943,7 +947,7 @@ bool EvalScript(vector<vector<unsigned char> >& stack, const CScript& script, un
                         }
 
                         // Check signature
-                        bool fOk = checker.CheckSig(vchSig, vchPubKey, scriptCode);
+                        bool fOk = checker.CheckSig(vchSig, vchPubKey, scriptCode, sigversion);
 
                         if (fOk) {
                             isig++;
@@ -1106,8 +1110,64 @@ class CTransactionSignatureSerializer {
 
 } // anon namespace
 
-uint256 SignatureHash(const CScript& scriptCode, const CTransaction& txTo, unsigned int nIn, int nHashType)
+uint256 SignatureHash(const CScript& scriptCode, const CTransaction& txTo, unsigned int nIn, int nHashType, const CAmount& amount, SigVersion sigversion)
 {
+    if (sigversion == SIGVERSION_WITNESS_V0) {
+        uint256 hashPrevouts;
+        uint256 hashSequence;
+        uint256 hashOutputs;
+
+        if (!(nHashType & SIGHASH_ANYONECANPAY)) {
+            CHashWriter ss(SER_GETHASH, 0);
+            for (unsigned int n = 0; n < txTo.vin.size(); n++) {
+                ss << txTo.vin[n].prevout;
+            }
+            hashPrevouts = ss.GetHash(); // TODO: cache this value for all signatures in a transaction
+        }
+
+        if (!(nHashType & SIGHASH_ANYONECANPAY) && (nHashType & 0x1f) != SIGHASH_SINGLE && (nHashType & 0x1f) != SIGHASH_NONE) {
+            CHashWriter ss(SER_GETHASH, 0);
+            for (unsigned int n = 0; n < txTo.vin.size(); n++) {
+                ss << txTo.vin[n].nSequence;
+            }
+            hashSequence = ss.GetHash(); // TODO: cache this value for all signatures in a transaction
+        }
+
+        if ((nHashType & 0x1f) != SIGHASH_SINGLE && (nHashType & 0x1f) != SIGHASH_NONE) {
+            CHashWriter ss(SER_GETHASH, 0);
+            for (unsigned int n = 0; n < txTo.vout.size(); n++) {
+                ss << txTo.vout[n];
+            }
+            hashOutputs = ss.GetHash(); // TODO: cache this value for all signatures in a transaction
+        } else if ((nHashType & 0x1f) == SIGHASH_SINGLE && nIn < txTo.vout.size()) {
+            CHashWriter ss(SER_GETHASH, 0);
+            ss << txTo.vout[nIn];
+            hashOutputs = ss.GetHash();
+        }
+
+        CHashWriter ss(SER_GETHASH, 0);
+        // Version
+        ss << txTo.nVersion;
+        // Input prevouts/nSequence (none/all, depending on flags)
+        ss << hashPrevouts;
+        ss << hashSequence;
+        // The input being signed (replacing the scriptSig with scriptCode + amount)
+        // The prevout may already be contained in hashPrevout, and the nSequence
+        // may already be contain in hashSequence.
+        ss << txTo.vin[nIn].prevout;
+        ss << static_cast<const CScriptBase&>(scriptCode);
+        ss << amount;
+        ss << txTo.vin[nIn].nSequence;
+        // Outputs (none/one/all, depending on flags)
+        ss << hashOutputs;
+        // Locktime
+        ss << txTo.nLockTime;
+        // Sighash type
+        ss << nHashType;
+
+        return ss.GetHash();
+    }
+
     static const uint256 one(uint256S("0000000000000000000000000000000000000000000000000000000000000001"));
     if (nIn >= txTo.vin.size()) {
         //  nIn out of range
@@ -1136,7 +1196,7 @@ bool TransactionSignatureChecker::VerifySignature(const std::vector<unsigned cha
     return pubkey.Verify(sighash, vchSig);
 }
 
-bool TransactionSignatureChecker::CheckSig(const vector<unsigned char>& vchSigIn, const vector<unsigned char>& vchPubKey, const CScript& scriptCode) const
+bool TransactionSignatureChecker::CheckSig(const vector<unsigned char>& vchSigIn, const vector<unsigned char>& vchPubKey, const CScript& scriptCode, SigVersion sigversion) const
 {
     CPubKey pubkey(vchPubKey);
     if (!pubkey.IsValid())
@@ -1149,7 +1209,7 @@ bool TransactionSignatureChecker::CheckSig(const vector<unsigned char>& vchSigIn
     int nHashType = vchSig.back();
     vchSig.pop_back();
 
-    uint256 sighash = SignatureHash(scriptCode, *txTo, nIn, nHashType);
+    uint256 sighash = SignatureHash(scriptCode, *txTo, nIn, nHashType, amount, sigversion);
 
     if (!VerifySignature(vchSig, pubkey, sighash))
         return false;
@@ -1280,7 +1340,7 @@ static bool VerifyWitnessProgram(const CScriptWitness& witness, int witversion,
             return set_error(serror, SCRIPT_ERR_PUSH_SIZE);
     }
 
-    if (!EvalScript(stack, scriptPubKey, flags, checker, serror)) {
+    if (!EvalScript(stack, scriptPubKey, flags, checker, SIGVERSION_WITNESS_V0, serror)) {
         return false;
     }
 
@@ -1307,12 +1367,12 @@ bool VerifyScript(const CScript& scriptSig, const CScript& scriptPubKey, const C
     }
 
     vector<vector<unsigned char> > stack, stackCopy;
-    if (!EvalScript(stack, scriptSig, flags, checker, serror))
+    if (!EvalScript(stack, scriptSig, flags, checker, SIGVERSION_BASE, serror))
         // serror is set
         return false;
     if (flags & SCRIPT_VERIFY_P2SH)
         stackCopy = stack;
-    if (!EvalScript(stack, scriptPubKey, flags, checker, serror))
+    if (!EvalScript(stack, scriptPubKey, flags, checker, SIGVERSION_BASE, serror))
         // serror is set
         return false;
     if (stack.empty())
@@ -1358,7 +1418,7 @@ bool VerifyScript(const CScript& scriptSig, const CScript& scriptPubKey, const C
         CScript pubKey2(pubKeySerialized.begin(), pubKeySerialized.end());
         popstack(stack);
 
-        if (!EvalScript(stack, pubKey2, flags, checker, serror))
+        if (!EvalScript(stack, pubKey2, flags, checker, SIGVERSION_BASE, serror))
             // serror is set
             return false;
         if (stack.empty())
diff --git a/src/script/interpreter.h b/src/script/interpreter.h
index 6f13e75d78f62..86437294253e9 100644
--- a/src/script/interpreter.h
+++ b/src/script/interpreter.h
@@ -98,12 +98,18 @@ enum
 
 bool CheckSignatureEncoding(const std::vector<unsigned char> &vchSig, unsigned int flags, ScriptError* serror);
 
-uint256 SignatureHash(const CScript &scriptCode, const CTransaction& txTo, unsigned int nIn, int nHashType);
+enum SigVersion
+{
+    SIGVERSION_BASE = 0,
+    SIGVERSION_WITNESS_V0 = 1,
+};
+
+uint256 SignatureHash(const CScript &scriptCode, const CTransaction& txTo, unsigned int nIn, int nHashType, const CAmount& amount, SigVersion sigversion);
 
 class BaseSignatureChecker
 {
 public:
-    virtual bool CheckSig(const std::vector<unsigned char>& scriptSig, const std::vector<unsigned char>& vchPubKey, const CScript& scriptCode) const
+    virtual bool CheckSig(const std::vector<unsigned char>& scriptSig, const std::vector<unsigned char>& vchPubKey, const CScript& scriptCode, SigVersion sigversion) const
     {
         return false;
     }
@@ -126,13 +132,14 @@ class TransactionSignatureChecker : public BaseSignatureChecker
 private:
     const CTransaction* txTo;
     unsigned int nIn;
+    const CAmount amount;
 
 protected:
     virtual bool VerifySignature(const std::vector<unsigned char>& vchSig, const CPubKey& vchPubKey, const uint256& sighash) const;
 
 public:
-    TransactionSignatureChecker(const CTransaction* txToIn, unsigned int nInIn, const CAmount& amount) : txTo(txToIn), nIn(nInIn) {}
-    bool CheckSig(const std::vector<unsigned char>& scriptSig, const std::vector<unsigned char>& vchPubKey, const CScript& scriptCode) const;
+    TransactionSignatureChecker(const CTransaction* txToIn, unsigned int nInIn, const CAmount& amountIn) : txTo(txToIn), nIn(nInIn), amount(amountIn) {}
+    bool CheckSig(const std::vector<unsigned char>& scriptSig, const std::vector<unsigned char>& vchPubKey, const CScript& scriptCode, SigVersion sigversion) const;
     bool CheckLockTime(const CScriptNum& nLockTime) const;
     bool CheckSequence(const CScriptNum& nSequence) const;
 };
@@ -146,7 +153,7 @@ class MutableTransactionSignatureChecker : public TransactionSignatureChecker
     MutableTransactionSignatureChecker(const CMutableTransaction* txToIn, unsigned int nInIn, const CAmount& amount) : TransactionSignatureChecker(&txTo, nInIn, amount), txTo(*txToIn) {}
 };
 
-bool EvalScript(std::vector<std::vector<unsigned char> >& stack, const CScript& script, unsigned int flags, const BaseSignatureChecker& checker, ScriptError* error = NULL);
+bool EvalScript(std::vector<std::vector<unsigned char> >& stack, const CScript& script, unsigned int flags, const BaseSignatureChecker& checker, SigVersion sigversion, ScriptError* error = NULL);
 bool VerifyScript(const CScript& scriptSig, const CScript& scriptPubKey, const CScriptWitness* witness, unsigned int flags, const BaseSignatureChecker& checker, ScriptError* serror = NULL);
 
 #endif // BITCOIN_SCRIPT_INTERPRETER_H
diff --git a/src/script/sign.cpp b/src/script/sign.cpp
index 62d874eed4584..83bb0cfa29f58 100644
--- a/src/script/sign.cpp
+++ b/src/script/sign.cpp
@@ -18,8 +18,7 @@ using namespace std;
 
 typedef std::vector<unsigned char> valtype;
 
-static const CAmount amountZero = 0;
-TransactionSignatureCreator::TransactionSignatureCreator(const CKeyStore* keystoreIn, const CTransaction* txToIn, unsigned int nInIn, int nHashTypeIn) : BaseSignatureCreator(keystoreIn), txTo(txToIn), nIn(nInIn), nHashType(nHashTypeIn), checker(txTo, nIn, amountZero) {}
+TransactionSignatureCreator::TransactionSignatureCreator(const CKeyStore* keystoreIn, const CTransaction* txToIn, unsigned int nInIn, const CAmount& amountIn, int nHashTypeIn) : BaseSignatureCreator(keystoreIn), txTo(txToIn), nIn(nInIn), nHashType(nHashTypeIn), amount(amountIn), checker(txTo, nIn, amountIn) {}
 
 bool TransactionSignatureCreator::CreateSig(std::vector<unsigned char>& vchSig, const CKeyID& address, const CScript& scriptCode) const
 {
@@ -27,7 +26,7 @@ bool TransactionSignatureCreator::CreateSig(std::vector<unsigned char>& vchSig,
     if (!keystore->GetKey(address, key))
         return false;
 
-    uint256 hash = SignatureHash(scriptCode, *txTo, nIn, nHashType);
+    uint256 hash = SignatureHash(scriptCode, *txTo, nIn, nHashType, amount, SIGVERSION_BASE);
     if (!key.Sign(hash, vchSig))
         return false;
     vchSig.push_back((unsigned char)nHashType);
@@ -186,7 +185,7 @@ static CScript CombineMultisig(const CScript& scriptPubKey, const BaseSignatureC
             if (sigs.count(pubkey))
                 continue; // Already got a sig for this pubkey
 
-            if (checker.CheckSig(sig, pubkey, scriptPubKey))
+            if (checker.CheckSig(sig, pubkey, scriptPubKey, SIGVERSION_BASE))
             {
                 sigs[pubkey] = sig;
                 break;
@@ -256,10 +255,10 @@ static CScript CombineSignatures(const CScript& scriptPubKey, const BaseSignatur
     return CScript();
 }
 
-CScript CombineSignatures(const CScript& scriptPubKey, const CTransaction& txTo, unsigned int nIn,
+CScript CombineSignatures(const CScript& scriptPubKey, const CTransaction& txTo, unsigned int nIn, const CAmount& amount,
                           const CScript& scriptSig1, const CScript& scriptSig2)
 {
-    TransactionSignatureChecker checker(&txTo, nIn, amountZero);
+    TransactionSignatureChecker checker(&txTo, nIn, amount);
     return CombineSignatures(scriptPubKey, checker, scriptSig1, scriptSig2);
 }
 
@@ -271,9 +270,9 @@ CScript CombineSignatures(const CScript& scriptPubKey, const BaseSignatureChecke
     Solver(scriptPubKey, txType, vSolutions);
 
     vector<valtype> stack1;
-    EvalScript(stack1, scriptSig1, SCRIPT_VERIFY_STRICTENC, BaseSignatureChecker());
+    EvalScript(stack1, scriptSig1, SCRIPT_VERIFY_STRICTENC, BaseSignatureChecker(), SIGVERSION_BASE);
     vector<valtype> stack2;
-    EvalScript(stack2, scriptSig2, SCRIPT_VERIFY_STRICTENC, BaseSignatureChecker());
+    EvalScript(stack2, scriptSig2, SCRIPT_VERIFY_STRICTENC, BaseSignatureChecker(), SIGVERSION_BASE);
 
     return CombineSignatures(scriptPubKey, checker, txType, vSolutions, stack1, stack2);
 }
@@ -285,7 +284,7 @@ class DummySignatureChecker : public BaseSignatureChecker
 public:
     DummySignatureChecker() {}
 
-    bool CheckSig(const std::vector<unsigned char>& scriptSig, const std::vector<unsigned char>& vchPubKey, const CScript& scriptCode) const
+    bool CheckSig(const std::vector<unsigned char>& scriptSig, const std::vector<unsigned char>& vchPubKey, const CScript& scriptCode, SigVersion sigversion) const
     {
         return true;
     }
diff --git a/src/script/sign.h b/src/script/sign.h
index 47a9cde7f4304..f54511f7a67f5 100644
--- a/src/script/sign.h
+++ b/src/script/sign.h
@@ -35,10 +35,11 @@ class TransactionSignatureCreator : public BaseSignatureCreator {
     const CTransaction* txTo;
     unsigned int nIn;
     int nHashType;
+    CAmount amount;
     const TransactionSignatureChecker checker;
 
 public:
-    TransactionSignatureCreator(const CKeyStore* keystoreIn, const CTransaction* txToIn, unsigned int nInIn, int nHashTypeIn=SIGHASH_ALL);
+    TransactionSignatureCreator(const CKeyStore* keystoreIn, const CTransaction* txToIn, unsigned int nInIn, const CAmount& amountIn, int nHashTypeIn=SIGHASH_ALL);
     const BaseSignatureChecker& Checker() const { return checker; }
     bool CreateSig(std::vector<unsigned char>& vchSig, const CKeyID& keyid, const CScript& scriptCode) const;
 };
@@ -62,6 +63,6 @@ bool SignSignature(const CKeyStore& keystore, const CTransaction& txFrom, CMutab
 CScript CombineSignatures(const CScript& scriptPubKey, const BaseSignatureChecker& checker, const CScript& scriptSig1, const CScript& scriptSig2);
 
 /** Combine two script signatures on transactions. */
-CScript CombineSignatures(const CScript& scriptPubKey, const CTransaction& txTo, unsigned int nIn, const CScript& scriptSig1, const CScript& scriptSig2);
+CScript CombineSignatures(const CScript& scriptPubKey, const CTransaction& txTo, unsigned int nIn, const CAmount& amount, const CScript& scriptSig1, const CScript& scriptSig2);
 
 #endif // BITCOIN_SCRIPT_SIGN_H
diff --git a/src/test/multisig_tests.cpp b/src/test/multisig_tests.cpp
index 8c95601ea1a08..876b90e4b99ed 100644
--- a/src/test/multisig_tests.cpp
+++ b/src/test/multisig_tests.cpp
@@ -26,7 +26,7 @@ BOOST_FIXTURE_TEST_SUITE(multisig_tests, BasicTestingSetup)
 CScript
 sign_multisig(CScript scriptPubKey, vector<CKey> keys, CTransaction transaction, int whichIn)
 {
-    uint256 hash = SignatureHash(scriptPubKey, transaction, whichIn, SIGHASH_ALL);
+    uint256 hash = SignatureHash(scriptPubKey, transaction, whichIn, SIGHASH_ALL, 0, SIGVERSION_BASE);
 
     CScript result;
     result << OP_0; // CHECKMULTISIG bug workaround
diff --git a/src/test/script_tests.cpp b/src/test/script_tests.cpp
index 9587fecfdf471..c56b9da4e5ab5 100644
--- a/src/test/script_tests.cpp
+++ b/src/test/script_tests.cpp
@@ -306,7 +306,7 @@ class TestBuilder
 
     TestBuilder& PushSig(const CKey& key, int nHashType = SIGHASH_ALL, unsigned int lenR = 32, unsigned int lenS = 32)
     {
-        uint256 hash = SignatureHash(scriptPubKey, spendTx, 0, nHashType);
+        uint256 hash = SignatureHash(scriptPubKey, spendTx, 0, nHashType, 0, SIGVERSION_BASE);
         std::vector<unsigned char> vchSig, r, s;
         uint32_t iter = 0;
         do {
@@ -738,21 +738,21 @@ BOOST_AUTO_TEST_CASE(script_PushData)
 
     ScriptError err;
     vector<vector<unsigned char> > directStack;
-    BOOST_CHECK(EvalScript(directStack, CScript(&direct[0], &direct[sizeof(direct)]), SCRIPT_VERIFY_P2SH, BaseSignatureChecker(), &err));
+    BOOST_CHECK(EvalScript(directStack, CScript(&direct[0], &direct[sizeof(direct)]), SCRIPT_VERIFY_P2SH, BaseSignatureChecker(), SIGVERSION_BASE, &err));
     BOOST_CHECK_MESSAGE(err == SCRIPT_ERR_OK, ScriptErrorString(err));
 
     vector<vector<unsigned char> > pushdata1Stack;
-    BOOST_CHECK(EvalScript(pushdata1Stack, CScript(&pushdata1[0], &pushdata1[sizeof(pushdata1)]), SCRIPT_VERIFY_P2SH, BaseSignatureChecker(), &err));
+    BOOST_CHECK(EvalScript(pushdata1Stack, CScript(&pushdata1[0], &pushdata1[sizeof(pushdata1)]), SCRIPT_VERIFY_P2SH, BaseSignatureChecker(), SIGVERSION_BASE, &err));
     BOOST_CHECK(pushdata1Stack == directStack);
     BOOST_CHECK_MESSAGE(err == SCRIPT_ERR_OK, ScriptErrorString(err));
 
     vector<vector<unsigned char> > pushdata2Stack;
-    BOOST_CHECK(EvalScript(pushdata2Stack, CScript(&pushdata2[0], &pushdata2[sizeof(pushdata2)]), SCRIPT_VERIFY_P2SH, BaseSignatureChecker(), &err));
+    BOOST_CHECK(EvalScript(pushdata2Stack, CScript(&pushdata2[0], &pushdata2[sizeof(pushdata2)]), SCRIPT_VERIFY_P2SH, BaseSignatureChecker(), SIGVERSION_BASE, &err));
     BOOST_CHECK(pushdata2Stack == directStack);
     BOOST_CHECK_MESSAGE(err == SCRIPT_ERR_OK, ScriptErrorString(err));
 
     vector<vector<unsigned char> > pushdata4Stack;
-    BOOST_CHECK(EvalScript(pushdata4Stack, CScript(&pushdata4[0], &pushdata4[sizeof(pushdata4)]), SCRIPT_VERIFY_P2SH, BaseSignatureChecker(), &err));
+    BOOST_CHECK(EvalScript(pushdata4Stack, CScript(&pushdata4[0], &pushdata4[sizeof(pushdata4)]), SCRIPT_VERIFY_P2SH, BaseSignatureChecker(), SIGVERSION_BASE, &err));
     BOOST_CHECK(pushdata4Stack == directStack);
     BOOST_CHECK_MESSAGE(err == SCRIPT_ERR_OK, ScriptErrorString(err));
 }
@@ -760,7 +760,7 @@ BOOST_AUTO_TEST_CASE(script_PushData)
 CScript
 sign_multisig(CScript scriptPubKey, std::vector<CKey> keys, CTransaction transaction)
 {
-    uint256 hash = SignatureHash(scriptPubKey, transaction, 0, SIGHASH_ALL);
+    uint256 hash = SignatureHash(scriptPubKey, transaction, 0, SIGHASH_ALL, 0, SIGVERSION_BASE);
 
     CScript result;
     //
@@ -891,6 +891,7 @@ BOOST_AUTO_TEST_CASE(script_CHECKMULTISIG23)
 BOOST_AUTO_TEST_CASE(script_combineSigs)
 {
     // Test the CombineSignatures function
+    CAmount amount;
     CBasicKeyStore keystore;
     vector<CKey> keys;
     vector<CPubKey> pubkeys;
@@ -909,19 +910,19 @@ BOOST_AUTO_TEST_CASE(script_combineSigs)
     CScript& scriptSig = txTo.vin[0].scriptSig;
 
     CScript empty;
-    CScript combined = CombineSignatures(scriptPubKey, txTo, 0, empty, empty);
+    CScript combined = CombineSignatures(scriptPubKey, txTo, 0, amount, empty, empty);
     BOOST_CHECK(combined.empty());
 
     // Single signature case:
     SignSignature(keystore, txFrom, txTo, 0); // changes scriptSig
-    combined = CombineSignatures(scriptPubKey, txTo, 0, scriptSig, empty);
+    combined = CombineSignatures(scriptPubKey, txTo, 0, amount, scriptSig, empty);
     BOOST_CHECK(combined == scriptSig);
-    combined = CombineSignatures(scriptPubKey, txTo, 0, empty, scriptSig);
+    combined = CombineSignatures(scriptPubKey, txTo, 0, amount, empty, scriptSig);
     BOOST_CHECK(combined == scriptSig);
     CScript scriptSigCopy = scriptSig;
     // Signing again will give a different, valid signature:
     SignSignature(keystore, txFrom, txTo, 0);
-    combined = CombineSignatures(scriptPubKey, txTo, 0, scriptSigCopy, scriptSig);
+    combined = CombineSignatures(scriptPubKey, txTo, 0, amount, scriptSigCopy, scriptSig);
     BOOST_CHECK(combined == scriptSigCopy || combined == scriptSig);
 
     // P2SH, single-signature case:
@@ -929,41 +930,41 @@ BOOST_AUTO_TEST_CASE(script_combineSigs)
     keystore.AddCScript(pkSingle);
     scriptPubKey = GetScriptForDestination(CScriptID(pkSingle));
     SignSignature(keystore, txFrom, txTo, 0);
-    combined = CombineSignatures(scriptPubKey, txTo, 0, scriptSig, empty);
+    combined = CombineSignatures(scriptPubKey, txTo, 0, amount, scriptSig, empty);
     BOOST_CHECK(combined == scriptSig);
-    combined = CombineSignatures(scriptPubKey, txTo, 0, empty, scriptSig);
+    combined = CombineSignatures(scriptPubKey, txTo, 0, amount, empty, scriptSig);
     BOOST_CHECK(combined == scriptSig);
     scriptSigCopy = scriptSig;
     SignSignature(keystore, txFrom, txTo, 0);
-    combined = CombineSignatures(scriptPubKey, txTo, 0, scriptSigCopy, scriptSig);
+    combined = CombineSignatures(scriptPubKey, txTo, 0, amount, scriptSigCopy, scriptSig);
     BOOST_CHECK(combined == scriptSigCopy || combined == scriptSig);
     // dummy scriptSigCopy with placeholder, should always choose non-placeholder:
     scriptSigCopy = CScript() << OP_0 << vector<unsigned char>(pkSingle.begin(), pkSingle.end());
-    combined = CombineSignatures(scriptPubKey, txTo, 0, scriptSigCopy, scriptSig);
+    combined = CombineSignatures(scriptPubKey, txTo, 0, amount, scriptSigCopy, scriptSig);
     BOOST_CHECK(combined == scriptSig);
-    combined = CombineSignatures(scriptPubKey, txTo, 0, scriptSig, scriptSigCopy);
+    combined = CombineSignatures(scriptPubKey, txTo, 0, amount, scriptSig, scriptSigCopy);
     BOOST_CHECK(combined == scriptSig);
 
     // Hardest case:  Multisig 2-of-3
     scriptPubKey = GetScriptForMultisig(2, pubkeys);
     keystore.AddCScript(scriptPubKey);
     SignSignature(keystore, txFrom, txTo, 0);
-    combined = CombineSignatures(scriptPubKey, txTo, 0, scriptSig, empty);
+    combined = CombineSignatures(scriptPubKey, txTo, 0, amount, scriptSig, empty);
     BOOST_CHECK(combined == scriptSig);
-    combined = CombineSignatures(scriptPubKey, txTo, 0, empty, scriptSig);
+    combined = CombineSignatures(scriptPubKey, txTo, 0, amount, empty, scriptSig);
     BOOST_CHECK(combined == scriptSig);
 
     // A couple of partially-signed versions:
     vector<unsigned char> sig1;
-    uint256 hash1 = SignatureHash(scriptPubKey, txTo, 0, SIGHASH_ALL);
+    uint256 hash1 = SignatureHash(scriptPubKey, txTo, 0, SIGHASH_ALL, 0, SIGVERSION_BASE);
     BOOST_CHECK(keys[0].Sign(hash1, sig1));
     sig1.push_back(SIGHASH_ALL);
     vector<unsigned char> sig2;
-    uint256 hash2 = SignatureHash(scriptPubKey, txTo, 0, SIGHASH_NONE);
+    uint256 hash2 = SignatureHash(scriptPubKey, txTo, 0, SIGHASH_NONE, 0, SIGVERSION_BASE);
     BOOST_CHECK(keys[1].Sign(hash2, sig2));
     sig2.push_back(SIGHASH_NONE);
     vector<unsigned char> sig3;
-    uint256 hash3 = SignatureHash(scriptPubKey, txTo, 0, SIGHASH_SINGLE);
+    uint256 hash3 = SignatureHash(scriptPubKey, txTo, 0, SIGHASH_SINGLE, 0, SIGVERSION_BASE);
     BOOST_CHECK(keys[2].Sign(hash3, sig3));
     sig3.push_back(SIGHASH_SINGLE);
 
@@ -979,21 +980,21 @@ BOOST_AUTO_TEST_CASE(script_combineSigs)
     CScript complete13 = CScript() << OP_0 << sig1 << sig3;
     CScript complete23 = CScript() << OP_0 << sig2 << sig3;
 
-    combined = CombineSignatures(scriptPubKey, txTo, 0, partial1a, partial1b);
+    combined = CombineSignatures(scriptPubKey, txTo, 0, amount, partial1a, partial1b);
     BOOST_CHECK(combined == partial1a);
-    combined = CombineSignatures(scriptPubKey, txTo, 0, partial1a, partial2a);
+    combined = CombineSignatures(scriptPubKey, txTo, 0, amount, partial1a, partial2a);
     BOOST_CHECK(combined == complete12);
-    combined = CombineSignatures(scriptPubKey, txTo, 0, partial2a, partial1a);
+    combined = CombineSignatures(scriptPubKey, txTo, 0, amount, partial2a, partial1a);
     BOOST_CHECK(combined == complete12);
-    combined = CombineSignatures(scriptPubKey, txTo, 0, partial1b, partial2b);
+    combined = CombineSignatures(scriptPubKey, txTo, 0, amount, partial1b, partial2b);
     BOOST_CHECK(combined == complete12);
-    combined = CombineSignatures(scriptPubKey, txTo, 0, partial3b, partial1b);
+    combined = CombineSignatures(scriptPubKey, txTo, 0, amount, partial3b, partial1b);
     BOOST_CHECK(combined == complete13);
-    combined = CombineSignatures(scriptPubKey, txTo, 0, partial2a, partial3a);
+    combined = CombineSignatures(scriptPubKey, txTo, 0, amount, partial2a, partial3a);
     BOOST_CHECK(combined == complete23);
-    combined = CombineSignatures(scriptPubKey, txTo, 0, partial3b, partial2b);
+    combined = CombineSignatures(scriptPubKey, txTo, 0, amount, partial3b, partial2b);
     BOOST_CHECK(combined == complete23);
-    combined = CombineSignatures(scriptPubKey, txTo, 0, partial3b, partial3a);
+    combined = CombineSignatures(scriptPubKey, txTo, 0, amount, partial3b, partial3a);
     BOOST_CHECK(combined == partial3c);
 }
 
diff --git a/src/test/sighash_tests.cpp b/src/test/sighash_tests.cpp
index 375accbac7206..4a48347b702dd 100644
--- a/src/test/sighash_tests.cpp
+++ b/src/test/sighash_tests.cpp
@@ -143,7 +143,7 @@ BOOST_AUTO_TEST_CASE(sighash_test)
 
         uint256 sh, sho;
         sho = SignatureHashOld(scriptCode, txTo, nIn, nHashType);
-        sh = SignatureHash(scriptCode, txTo, nIn, nHashType);
+        sh = SignatureHash(scriptCode, txTo, nIn, nHashType, 0, SIGVERSION_BASE);
         #if defined(PRINT_SIGHASH_JSON)
         CDataStream ss(SER_NETWORK, PROTOCOL_VERSION);
         ss << txTo;
@@ -209,7 +209,7 @@ BOOST_AUTO_TEST_CASE(sighash_from_data)
           continue;
         }
 
-        sh = SignatureHash(scriptCode, tx, nIn, nHashType);
+        sh = SignatureHash(scriptCode, tx, nIn, nHashType, 0, SIGVERSION_BASE);
         BOOST_CHECK_MESSAGE(sh.GetHex() == sigHashHex, strTest);
     }
 }
diff --git a/src/test/txvalidationcache_tests.cpp b/src/test/txvalidationcache_tests.cpp
index c29e30792a2a9..76e4e7a4be865 100644
--- a/src/test/txvalidationcache_tests.cpp
+++ b/src/test/txvalidationcache_tests.cpp
@@ -48,7 +48,7 @@ BOOST_FIXTURE_TEST_CASE(tx_mempool_block_doublespend, TestChain100Setup)
 
         // Sign:
         std::vector<unsigned char> vchSig;
-        uint256 hash = SignatureHash(scriptPubKey, spends[i], 0, SIGHASH_ALL);
+        uint256 hash = SignatureHash(scriptPubKey, spends[i], 0, SIGHASH_ALL, 0, SIGVERSION_BASE);
         BOOST_CHECK(coinbaseKey.Sign(hash, vchSig));
         vchSig.push_back((unsigned char)SIGHASH_ALL);
         spends[i].vin[0].scriptSig << vchSig;

From 7c4bf779e8b74e474551982a24f5acc265293abd Mon Sep 17 00:00:00 2001
From: Johnson Lau <jl2012@users.noreply.github.com>
Date: Sat, 23 Jan 2016 01:46:11 +0800
Subject: [PATCH 0543/1802] [RPC] Return witness data in blockchain RPCs

Includes RPC field name changes by Luke-jr.
---
 src/rpc/blockchain.cpp     |  2 ++
 src/rpc/rawtransaction.cpp | 22 ++++++++++++++++++++--
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp
index dae283fb6fea7..f11af876f917c 100644
--- a/src/rpc/blockchain.cpp
+++ b/src/rpc/blockchain.cpp
@@ -99,6 +99,7 @@ UniValue blockToJSON(const CBlock& block, const CBlockIndex* blockindex, bool tx
     if (chainActive.Contains(blockindex))
         confirmations = chainActive.Height() - blockindex->nHeight + 1;
     result.push_back(Pair("confirmations", confirmations));
+    result.push_back(Pair("strippedsize", (int)::GetSerializeSize(block, SER_NETWORK, PROTOCOL_VERSION | SERIALIZE_TRANSACTION_NO_WITNESS)));
     result.push_back(Pair("size", (int)::GetSerializeSize(block, SER_NETWORK, PROTOCOL_VERSION)));
     result.push_back(Pair("height", blockindex->nHeight));
     result.push_back(Pair("version", block.nVersion));
@@ -558,6 +559,7 @@ UniValue getblock(const UniValue& params, bool fHelp)
             "  \"hash\" : \"hash\",     (string) the block hash (same as provided)\n"
             "  \"confirmations\" : n,   (numeric) The number of confirmations, or -1 if the block is not on the main chain\n"
             "  \"size\" : n,            (numeric) The block size\n"
+            "  \"strippedsize\" : n,    (numeric) The block size excluding witness data\n"
             "  \"height\" : n,          (numeric) The block height or index\n"
             "  \"version\" : n,         (numeric) The block version\n"
             "  \"versionHex\" : \"00000000\", (string) The block version formatted in hexadecimal\n"
diff --git a/src/rpc/rawtransaction.cpp b/src/rpc/rawtransaction.cpp
index 38fd98055c42f..12e3eaa9201da 100644
--- a/src/rpc/rawtransaction.cpp
+++ b/src/rpc/rawtransaction.cpp
@@ -62,11 +62,14 @@ void ScriptPubKeyToJSON(const CScript& scriptPubKey, UniValue& out, bool fInclud
 void TxToJSON(const CTransaction& tx, const uint256 hashBlock, UniValue& entry)
 {
     entry.push_back(Pair("txid", tx.GetHash().GetHex()));
+    entry.push_back(Pair("hash", tx.GetWitnessHash().GetHex()));
     entry.push_back(Pair("size", (int)::GetSerializeSize(tx, SER_NETWORK, PROTOCOL_VERSION)));
     entry.push_back(Pair("version", tx.nVersion));
     entry.push_back(Pair("locktime", (int64_t)tx.nLockTime));
+
     UniValue vin(UniValue::VARR);
-    BOOST_FOREACH(const CTxIn& txin, tx.vin) {
+    for (unsigned int i = 0; i < tx.vin.size(); i++) {
+        const CTxIn& txin = tx.vin[i];
         UniValue in(UniValue::VOBJ);
         if (tx.IsCoinBase())
             in.push_back(Pair("coinbase", HexStr(txin.scriptSig.begin(), txin.scriptSig.end())));
@@ -78,6 +81,17 @@ void TxToJSON(const CTransaction& tx, const uint256 hashBlock, UniValue& entry)
             o.push_back(Pair("hex", HexStr(txin.scriptSig.begin(), txin.scriptSig.end())));
             in.push_back(Pair("scriptSig", o));
         }
+        if (!tx.wit.IsNull()) {
+            if (!tx.wit.vtxinwit[i].IsNull()) {
+                UniValue txinwitness(UniValue::VARR);
+                for (unsigned int j = 0; j < tx.wit.vtxinwit[i].scriptWitness.stack.size(); j++) {
+                    std::vector<unsigned char> item = tx.wit.vtxinwit[i].scriptWitness.stack[j];
+                    txinwitness.push_back(HexStr(item.begin(), item.end()));
+                }
+                in.push_back(Pair("txinwitness", txinwitness));
+            }
+
+        }
         in.push_back(Pair("sequence", (int64_t)txin.nSequence));
         vin.push_back(in);
     }
@@ -134,7 +148,8 @@ UniValue getrawtransaction(const UniValue& params, bool fHelp)
             "{\n"
             "  \"hex\" : \"data\",       (string) The serialized, hex-encoded data for 'txid'\n"
             "  \"txid\" : \"id\",        (string) The transaction id (same as provided)\n"
-            "  \"size\" : n,             (numeric) The transaction size\n"
+            "  \"hash\" : \"id\",        (string) The transaction hash (differs from txid for witness transactions)\n"
+            "  \"size\" : n,             (numeric) The serialized transaction size\n"
             "  \"version\" : n,          (numeric) The version\n"
             "  \"locktime\" : ttt,       (numeric) The lock time\n"
             "  \"vin\" : [               (array of json objects)\n"
@@ -146,6 +161,7 @@ UniValue getrawtransaction(const UniValue& params, bool fHelp)
             "         \"hex\": \"hex\"   (string) hex\n"
             "       },\n"
             "       \"sequence\": n      (numeric) The script sequence number\n"
+            "       \"txinwitness\": [\"hex\", ...] (array of string) hex-encoded witness data (if any)\n"
             "     }\n"
             "     ,...\n"
             "  ],\n"
@@ -443,6 +459,7 @@ UniValue decoderawtransaction(const UniValue& params, bool fHelp)
             "\nResult:\n"
             "{\n"
             "  \"txid\" : \"id\",        (string) The transaction id\n"
+            "  \"hash\" : \"id\",        (string) The transaction hash (differs from txid for witness transactions)\n"
             "  \"size\" : n,             (numeric) The transaction size\n"
             "  \"version\" : n,          (numeric) The version\n"
             "  \"locktime\" : ttt,       (numeric) The lock time\n"
@@ -454,6 +471,7 @@ UniValue decoderawtransaction(const UniValue& params, bool fHelp)
             "         \"asm\": \"asm\",  (string) asm\n"
             "         \"hex\": \"hex\"   (string) hex\n"
             "       },\n"
+            "       \"txinwitness\": [\"hex\", ...] (array of string) hex-encoded witness data (if any)\n"
             "       \"sequence\": n     (numeric) The script sequence number\n"
             "     }\n"
             "     ,...\n"

From 2b1f6f9ccf36f1e0a2c9d99154e1642f796d7c2b Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Sun, 3 Jan 2016 18:54:50 +0100
Subject: [PATCH 0544/1802] BIP141: Other consensus critical limits, and BIP145

Includes changes by Suhas Daftuar, Luke-jr, and mruddy.
---
 qa/rpc-tests/maxuploadtarget.py    |  14 ++--
 src/bitcoin-tx.cpp                 |   2 +-
 src/blockencodings.cpp             |   4 +-
 src/consensus/consensus.h          |  12 +++-
 src/init.cpp                       |   1 +
 src/main.cpp                       |  78 ++++++++++++++--------
 src/main.h                         |   1 +
 src/merkleblock.cpp                |   2 +-
 src/miner.cpp                      | 101 +++++++++++++++++++++--------
 src/miner.h                        |  16 +++--
 src/net.cpp                        |   4 +-
 src/net.h                          |   4 +-
 src/policy/policy.cpp              |  14 +++-
 src/policy/policy.h                |  10 ++-
 src/primitives/block.cpp           |   9 +++
 src/primitives/block.h             |   3 +
 src/primitives/transaction.cpp     |   7 +-
 src/primitives/transaction.h       |  28 ++++++--
 src/rpc/blockchain.cpp             |   2 +
 src/rpc/mining.cpp                 |  18 +++--
 src/rpc/rawtransaction.cpp         |   3 +
 src/script/interpreter.cpp         |  47 ++++++++++++++
 src/script/interpreter.h           |   2 +
 src/test/mempool_tests.cpp         |  11 ++--
 src/test/miner_tests.cpp           |   5 +-
 src/test/policyestimator_tests.cpp |   3 +-
 src/test/test_bitcoin.cpp          |   2 +-
 src/test/test_bitcoin.h            |   6 +-
 src/txmempool.cpp                  |  44 +++++++------
 src/txmempool.h                    |  23 +++----
 src/wallet/wallet.cpp              |   4 +-
 31 files changed, 344 insertions(+), 136 deletions(-)

diff --git a/qa/rpc-tests/maxuploadtarget.py b/qa/rpc-tests/maxuploadtarget.py
index 5087f0762033a..125d4eb275190 100755
--- a/qa/rpc-tests/maxuploadtarget.py
+++ b/qa/rpc-tests/maxuploadtarget.py
@@ -97,7 +97,7 @@ def __init__(self):
     def setup_network(self):
         # Start a node with maxuploadtarget of 200 MB (/24h)
         self.nodes = []
-        self.nodes.append(start_node(0, self.options.tmpdir, ["-debug", "-maxuploadtarget=200", "-blockmaxsize=999000"]))
+        self.nodes.append(start_node(0, self.options.tmpdir, ["-debug", "-maxuploadtarget=800", "-blockmaxsize=999000"]))
 
     def mine_full_block(self, node, address):
         # Want to create a full block
@@ -175,13 +175,13 @@ def run_test(self):
         getdata_request = msg_getdata()
         getdata_request.inv.append(CInv(2, big_old_block))
 
-        max_bytes_per_day = 200*1024*1024
-        daily_buffer = 144 * MAX_BLOCK_SIZE
+        max_bytes_per_day = 800*1024*1024
+        daily_buffer = 144 * 4000000
         max_bytes_available = max_bytes_per_day - daily_buffer
         success_count = max_bytes_available // old_block_size
 
-        # 144MB will be reserved for relaying new blocks, so expect this to
-        # succeed for ~70 tries.
+        # 576MB will be reserved for relaying new blocks, so expect this to
+        # succeed for ~235 tries.
         for i in range(success_count):
             test_nodes[0].send_message(getdata_request)
             test_nodes[0].sync_with_ping()
@@ -198,9 +198,9 @@ def run_test(self):
 
         # Requesting the current block on test_nodes[1] should succeed indefinitely,
         # even when over the max upload target.
-        # We'll try 200 times
+        # We'll try 800 times
         getdata_request.inv = [CInv(2, big_new_block)]
-        for i in range(200):
+        for i in range(800):
             test_nodes[1].send_message(getdata_request)
             test_nodes[1].sync_with_ping()
             assert_equal(test_nodes[1].block_receive_map[big_new_block], i+1)
diff --git a/src/bitcoin-tx.cpp b/src/bitcoin-tx.cpp
index 424812a6dfbc5..e77aa6c72eea2 100644
--- a/src/bitcoin-tx.cpp
+++ b/src/bitcoin-tx.cpp
@@ -195,7 +195,7 @@ static void MutateTxAddInput(CMutableTransaction& tx, const string& strInput)
     uint256 txid(uint256S(strTxid));
 
     static const unsigned int minTxOutSz = 9;
-    static const unsigned int maxVout = MAX_BLOCK_SIZE / minTxOutSz;
+    static const unsigned int maxVout = MAX_BLOCK_BASE_SIZE / minTxOutSz;
 
     // extract and validate vout
     string strVout = vStrInputParts[1];
diff --git a/src/blockencodings.cpp b/src/blockencodings.cpp
index 7fd6a9cf52d81..5c4c3bd27487c 100644
--- a/src/blockencodings.cpp
+++ b/src/blockencodings.cpp
@@ -15,7 +15,7 @@
 
 #include <unordered_map>
 
-#define MIN_TRANSACTION_SIZE (::GetSerializeSize(CTransaction(), SER_NETWORK, PROTOCOL_VERSION))
+#define MIN_TRANSACTION_BASE_SIZE (::GetSerializeSize(CTransaction(), SER_NETWORK, PROTOCOL_VERSION | SERIALIZE_TRANSACTION_NO_WITNESS))
 
 CBlockHeaderAndShortTxIDs::CBlockHeaderAndShortTxIDs(const CBlock& block) :
         nonce(GetRand(std::numeric_limits<uint64_t>::max())),
@@ -50,7 +50,7 @@ uint64_t CBlockHeaderAndShortTxIDs::GetShortID(const uint256& txhash) const {
 ReadStatus PartiallyDownloadedBlock::InitData(const CBlockHeaderAndShortTxIDs& cmpctblock) {
     if (cmpctblock.header.IsNull() || (cmpctblock.shorttxids.empty() && cmpctblock.prefilledtxn.empty()))
         return READ_STATUS_INVALID;
-    if (cmpctblock.shorttxids.size() + cmpctblock.prefilledtxn.size() > MAX_BLOCK_SIZE / MIN_TRANSACTION_SIZE)
+    if (cmpctblock.shorttxids.size() + cmpctblock.prefilledtxn.size() > MAX_BLOCK_BASE_SIZE / MIN_TRANSACTION_BASE_SIZE)
         return READ_STATUS_INVALID;
 
     assert(header.IsNull() && txn_available.empty());
diff --git a/src/consensus/consensus.h b/src/consensus/consensus.h
index ad9cc26175351..81f40593b21a6 100644
--- a/src/consensus/consensus.h
+++ b/src/consensus/consensus.h
@@ -6,10 +6,16 @@
 #ifndef BITCOIN_CONSENSUS_CONSENSUS_H
 #define BITCOIN_CONSENSUS_CONSENSUS_H
 
-/** The maximum allowed size for a serialized block, in bytes (network rule) */
-static const unsigned int MAX_BLOCK_SIZE = 1000000;
+#include <stdint.h>
+
+/** The maximum allowed size for a serialized block, in bytes (only for buffer size limits) */
+static const unsigned int MAX_BLOCK_SERIALIZED_SIZE = 4000000;
+/** The maximum allowed cost for a block, see BIP 141 (network rule) */
+static const unsigned int MAX_BLOCK_COST = 4000000;
+/** The maximum allowed size for a block excluding witness data, in bytes (network rule) */
+static const unsigned int MAX_BLOCK_BASE_SIZE = 1000000;
 /** The maximum allowed number of signature check operations in a block (network rule) */
-static const unsigned int MAX_BLOCK_SIGOPS = MAX_BLOCK_SIZE/50;
+static const int64_t MAX_BLOCK_SIGOPS_COST = 80000;
 /** Coinbase transaction outputs can only be spent after this number of new blocks (network rule) */
 static const int COINBASE_MATURITY = 100;
 
diff --git a/src/init.cpp b/src/init.cpp
index 6bce0a9b49b51..e924d504bdd82 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -452,6 +452,7 @@ std::string HelpMessage(HelpMessageMode mode)
     strUsage += HelpMessageOpt("-mempoolreplacement", strprintf(_("Enable transaction replacement in the memory pool (default: %u)"), DEFAULT_ENABLE_REPLACEMENT));
 
     strUsage += HelpMessageGroup(_("Block creation options:"));
+    strUsage += HelpMessageOpt("-blockmaxcost=<n>", strprintf(_("Set maximum block cost (default: %d)"), DEFAULT_BLOCK_MAX_COST));
     strUsage += HelpMessageOpt("-blockminsize=<n>", strprintf(_("Set minimum block size in bytes (default: %u)"), DEFAULT_BLOCK_MIN_SIZE));
     strUsage += HelpMessageOpt("-blockmaxsize=<n>", strprintf(_("Set maximum block size in bytes (default: %d)"), DEFAULT_BLOCK_MAX_SIZE));
     strUsage += HelpMessageOpt("-blockprioritysize=<n>", strprintf(_("Set maximum size of high-priority/low-fee transactions in bytes (default: %d)"), DEFAULT_BLOCK_PRIORITY_SIZE));
diff --git a/src/main.cpp b/src/main.cpp
index c22faf6db6f58..df758bc41f0b5 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -684,8 +684,8 @@ bool AddOrphanTx(const CTransaction& tx, NodeId peer) EXCLUSIVE_LOCKS_REQUIRED(c
     // have been mined or received.
     // 100 orphans, each of which is at most 99,999 bytes big is
     // at most 10 megabytes of orphans and somewhat more byprev index (in the worst case):
-    unsigned int sz = tx.GetSerializeSize(SER_NETWORK, CTransaction::CURRENT_VERSION);
-    if (sz >= MAX_STANDARD_TX_SIZE)
+    unsigned int sz = GetTransactionCost(tx);
+    if (sz >= MAX_STANDARD_TX_COST)
     {
         LogPrint("mempool", "ignoring large orphan tx (size: %u, hash: %s)\n", sz, hash.ToString());
         return false;
@@ -1018,8 +1018,24 @@ unsigned int GetP2SHSigOpCount(const CTransaction& tx, const CCoinsViewCache& in
     return nSigOps;
 }
 
+int64_t GetTransactionSigOpCost(const CTransaction& tx, const CCoinsViewCache& inputs, int flags)
+{
+    int64_t nSigOps = GetLegacySigOpCount(tx) * WITNESS_SCALE_FACTOR;
+
+    if (tx.IsCoinBase())
+        return nSigOps;
 
+    if (flags & SCRIPT_VERIFY_P2SH) {
+        nSigOps += GetP2SHSigOpCount(tx, inputs) * WITNESS_SCALE_FACTOR;
+    }
 
+    for (unsigned int i = 0; i < tx.vin.size(); i++)
+    {
+        const CTxOut &prevout = inputs.GetOutputFor(tx.vin[i]);
+        nSigOps += CountWitnessSigOps(tx.vin[i].scriptSig, prevout.scriptPubKey, i < tx.wit.vtxinwit.size() ? &tx.wit.vtxinwit[i].scriptWitness : NULL, flags);
+    }
+    return nSigOps;
+}
 
 
 
@@ -1033,7 +1049,7 @@ bool CheckTransaction(const CTransaction& tx, CValidationState &state)
     if (tx.vout.empty())
         return state.DoS(10, false, REJECT_INVALID, "bad-txns-vout-empty");
     // Size limits (this doesn't take the witness into account, as that hasn't been checked for malleability)
-    if (::GetSerializeSize(tx, SER_NETWORK, PROTOCOL_VERSION | SERIALIZE_TRANSACTION_NO_WITNESS) > MAX_BLOCK_SIZE)
+    if (::GetSerializeSize(tx, SER_NETWORK, PROTOCOL_VERSION | SERIALIZE_TRANSACTION_NO_WITNESS) > MAX_BLOCK_BASE_SIZE)
         return state.DoS(100, false, REJECT_INVALID, "bad-txns-oversize");
 
     // Check for negative or overflow output values
@@ -1239,8 +1255,7 @@ bool AcceptToMemoryPoolWorker(CTxMemPool& pool, CValidationState& state, const C
         if (fRequireStandard && !AreInputsStandard(tx, view))
             return state.Invalid(false, REJECT_NONSTANDARD, "bad-txns-nonstandard-inputs");
 
-        unsigned int nSigOps = GetLegacySigOpCount(tx);
-        nSigOps += GetP2SHSigOpCount(tx, view);
+        int64_t nSigOpsCost = GetTransactionSigOpCost(tx, view, STANDARD_SCRIPT_VERIFY_FLAGS);
 
         CAmount nValueOut = tx.GetValueOut();
         CAmount nFees = nValueIn-nValueOut;
@@ -1263,7 +1278,7 @@ bool AcceptToMemoryPoolWorker(CTxMemPool& pool, CValidationState& state, const C
             }
         }
 
-        CTxMemPoolEntry entry(tx, nFees, GetTime(), dPriority, chainActive.Height(), pool.HasNoInputsOf(tx), inChainInputValue, fSpendsCoinbase, nSigOps, lp);
+        CTxMemPoolEntry entry(tx, nFees, GetTime(), dPriority, chainActive.Height(), pool.HasNoInputsOf(tx), inChainInputValue, fSpendsCoinbase, nSigOpsCost, lp);
         unsigned int nSize = entry.GetTxSize();
 
         // Check that the transaction doesn't have an excessive number of
@@ -1271,9 +1286,9 @@ bool AcceptToMemoryPoolWorker(CTxMemPool& pool, CValidationState& state, const C
         // itself can contain sigops MAX_STANDARD_TX_SIGOPS is less than
         // MAX_BLOCK_SIGOPS; we still consider this an invalid rather than
         // merely non-standard transaction.
-        if ((nSigOps > MAX_STANDARD_TX_SIGOPS) || (nBytesPerSigOp && nSigOps > nSize / nBytesPerSigOp))
+        if ((nSigOpsCost > MAX_STANDARD_TX_SIGOPS_COST) || (nBytesPerSigOp && nSigOpsCost > nSize * WITNESS_SCALE_FACTOR / nBytesPerSigOp))
             return state.DoS(0, false, REJECT_NONSTANDARD, "bad-txns-too-many-sigops", false,
-                strprintf("%d", nSigOps));
+                strprintf("%d", nSigOpsCost));
 
         CAmount mempoolRejectFee = pool.GetMinFee(GetArg("-maxmempool", DEFAULT_MAX_MEMPOOL_SIZE) * 1000000).GetFee(nSize);
         if (mempoolRejectFee > 0 && nModifiedFees < mempoolRejectFee) {
@@ -2439,7 +2454,7 @@ bool ConnectBlock(const CBlock& block, CValidationState& state, CBlockIndex* pin
     std::vector<int> prevheights;
     CAmount nFees = 0;
     int nInputs = 0;
-    unsigned int nSigOps = 0;
+    int64_t nSigOpsCost = 0;
     CDiskTxPos pos(pindex->GetBlockPos(), GetSizeOfCompactSize(block.vtx.size()));
     std::vector<std::pair<uint256, CDiskTxPos> > vPos;
     vPos.reserve(block.vtx.size());
@@ -2449,10 +2464,6 @@ bool ConnectBlock(const CBlock& block, CValidationState& state, CBlockIndex* pin
         const CTransaction &tx = block.vtx[i];
 
         nInputs += tx.vin.size();
-        nSigOps += GetLegacySigOpCount(tx);
-        if (nSigOps > MAX_BLOCK_SIGOPS)
-            return state.DoS(100, error("ConnectBlock(): too many sigops"),
-                             REJECT_INVALID, "bad-blk-sigops");
 
         if (!tx.IsCoinBase())
         {
@@ -2483,18 +2494,19 @@ bool ConnectBlock(const CBlock& block, CValidationState& state, CBlockIndex* pin
                 return state.DoS(100, error("%s: contains a non-BIP68-final transaction", __func__),
                                  REJECT_INVALID, "bad-txns-nonfinal");
             }
+        }
 
-            if (fStrictPayToScriptHash)
-            {
-                // Add in sigops done by pay-to-script-hash inputs;
-                // this is to prevent a "rogue miner" from creating
-                // an incredibly-expensive-to-validate block.
-                nSigOps += GetP2SHSigOpCount(tx, view);
-                if (nSigOps > MAX_BLOCK_SIGOPS)
-                    return state.DoS(100, error("ConnectBlock(): too many sigops"),
-                                     REJECT_INVALID, "bad-blk-sigops");
-            }
+        // GetTransactionSigOpCost counts 3 types of sigops:
+        // * legacy (always)
+        // * p2sh (when P2SH enabled in flags and excludes coinbase)
+        // * witness (when witness enabled in flags and excludes coinbase)
+        nSigOpsCost += GetTransactionSigOpCost(tx, view, flags);
+        if (nSigOpsCost > MAX_BLOCK_SIGOPS_COST)
+            return state.DoS(100, error("ConnectBlock(): too many sigops"),
+                             REJECT_INVALID, "bad-blk-sigops");
 
+        if (!tx.IsCoinBase())
+        {
             nFees += view.GetValueIn(tx)-tx.GetValueOut();
 
             std::vector<CScriptCheck> vChecks;
@@ -3417,9 +3429,11 @@ bool CheckBlock(const CBlock& block, CValidationState& state, const Consensus::P
     // All potential-corruption validation must be done before we do any
     // transaction validation, as otherwise we may mark the header as invalid
     // because we receive the wrong transactions for it.
+    // Note that witness malleability is checked in ContextualCheckBlock, so no
+    // checks that use witness data may be performed here.
 
     // Size limits
-    if (block.vtx.empty() || block.vtx.size() > MAX_BLOCK_SIZE || ::GetSerializeSize(block, SER_NETWORK, PROTOCOL_VERSION | SERIALIZE_TRANSACTION_NO_WITNESS) > MAX_BLOCK_SIZE)
+    if (block.vtx.empty() || block.vtx.size() > MAX_BLOCK_BASE_SIZE || ::GetSerializeSize(block, SER_NETWORK, PROTOCOL_VERSION | SERIALIZE_TRANSACTION_NO_WITNESS) > MAX_BLOCK_BASE_SIZE)
         return state.DoS(100, false, REJECT_INVALID, "bad-blk-length", false, "size limits failed");
 
     // First transaction must be coinbase, the rest must not be
@@ -3440,7 +3454,7 @@ bool CheckBlock(const CBlock& block, CValidationState& state, const Consensus::P
     {
         nSigOps += GetLegacySigOpCount(tx);
     }
-    if (nSigOps > MAX_BLOCK_SIGOPS)
+    if (nSigOps * WITNESS_SCALE_FACTOR > MAX_BLOCK_SIGOPS_COST)
         return state.DoS(100, false, REJECT_INVALID, "bad-blk-sigops", false, "out-of-bounds SigOpCount");
 
     if (fCheckPOW && fCheckMerkleRoot)
@@ -3621,6 +3635,16 @@ bool ContextualCheckBlock(const CBlock& block, CValidationState& state, CBlockIn
         }
     }
 
+    // After the coinbase witness nonce and commitment are verified,
+    // we can check if the block cost passes (before we've checked the
+    // coinbase witness, it would be possible for the cost to be too
+    // large by filling up the coinbase witness, which doesn't change
+    // the block hash, so we couldn't mark the block as permanently
+    // failed).
+    if (GetBlockCost(block) > MAX_BLOCK_COST) {
+        return state.DoS(100, error("ContextualCheckBlock(): cost limit failed"), REJECT_INVALID, "bad-blk-cost");
+    }
+
     return true;
 }
 
@@ -4284,7 +4308,7 @@ bool LoadExternalBlockFile(const CChainParams& chainparams, FILE* fileIn, CDiskB
     int nLoaded = 0;
     try {
         // This takes over fileIn and calls fclose() on it in the CBufferedFile destructor
-        CBufferedFile blkdat(fileIn, 2*MAX_BLOCK_SIZE, MAX_BLOCK_SIZE+8, SER_DISK, CLIENT_VERSION);
+        CBufferedFile blkdat(fileIn, 2*MAX_BLOCK_SERIALIZED_SIZE, MAX_BLOCK_SERIALIZED_SIZE+8, SER_DISK, CLIENT_VERSION);
         uint64_t nRewind = blkdat.GetPos();
         while (!blkdat.eof()) {
             boost::this_thread::interruption_point();
@@ -4303,7 +4327,7 @@ bool LoadExternalBlockFile(const CChainParams& chainparams, FILE* fileIn, CDiskB
                     continue;
                 // read size
                 blkdat >> nSize;
-                if (nSize < 80 || nSize > MAX_BLOCK_SIZE)
+                if (nSize < 80 || nSize > MAX_BLOCK_SERIALIZED_SIZE)
                     continue;
             } catch (const std::exception&) {
                 // no valid block header found; don't complain
diff --git a/src/main.h b/src/main.h
index 6dd4b1aa3d0a2..317470e3c8694 100644
--- a/src/main.h
+++ b/src/main.h
@@ -152,6 +152,7 @@ typedef boost::unordered_map<uint256, CBlockIndex*, BlockHasher> BlockMap;
 extern BlockMap mapBlockIndex;
 extern uint64_t nLastBlockTx;
 extern uint64_t nLastBlockSize;
+extern uint64_t nLastBlockCost;
 extern const std::string strMessageMagic;
 extern CWaitableCriticalSection csBestBlock;
 extern CConditionVariable cvBlockChange;
diff --git a/src/merkleblock.cpp b/src/merkleblock.cpp
index dca4973cc4d88..31332526a916e 100644
--- a/src/merkleblock.cpp
+++ b/src/merkleblock.cpp
@@ -155,7 +155,7 @@ uint256 CPartialMerkleTree::ExtractMatches(std::vector<uint256> &vMatch, std::ve
     if (nTransactions == 0)
         return uint256();
     // check for excessively high numbers of transactions
-    if (nTransactions > MAX_BLOCK_SIZE / 60) // 60 is the lower bound for the size of a serialized CTransaction
+    if (nTransactions > MAX_BLOCK_BASE_SIZE / 60) // 60 is the lower bound for the size of a serialized CTransaction
         return uint256();
     // there can never be more hashes provided than one for every txid
     if (vHash.size() > nTransactions)
diff --git a/src/miner.cpp b/src/miner.cpp
index a7bf9ae84ccd7..cfc2dae56ee49 100644
--- a/src/miner.cpp
+++ b/src/miner.cpp
@@ -45,6 +45,7 @@ using namespace std;
 
 uint64_t nLastBlockTx = 0;
 uint64_t nLastBlockSize = 0;
+uint64_t nLastBlockCost = 0;
 
 class ScoreCompare
 {
@@ -75,15 +76,36 @@ int64_t UpdateTime(CBlockHeader* pblock, const Consensus::Params& consensusParam
 BlockAssembler::BlockAssembler(const CChainParams& _chainparams)
     : chainparams(_chainparams)
 {
-    // Largest block you're willing to create:
-    nBlockMaxSize = GetArg("-blockmaxsize", DEFAULT_BLOCK_MAX_SIZE);
-    // Limit to between 1K and MAX_BLOCK_SIZE-1K for sanity:
-    nBlockMaxSize = std::max((unsigned int)1000, std::min((unsigned int)(MAX_BLOCK_SIZE-1000), nBlockMaxSize));
+    // Block resource limits
+    // If neither -blockmaxsize or -blockmaxcost is given, limit to DEFAULT_BLOCK_MAX_*
+    // If only one is given, only restrict the specified resource.
+    // If both are given, restrict both.
+    nBlockMaxCost = DEFAULT_BLOCK_MAX_COST;
+    nBlockMaxSize = DEFAULT_BLOCK_MAX_SIZE;
+    bool fCostSet = false;
+    if (mapArgs.count("-blockmaxcost")) {
+        nBlockMaxCost = GetArg("-blockmaxcost", DEFAULT_BLOCK_MAX_COST);
+        nBlockMaxSize = MAX_BLOCK_SERIALIZED_SIZE;
+        fCostSet = true;
+    }
+    if (mapArgs.count("-blockmaxsize")) {
+        nBlockMaxSize = GetArg("-blockmaxsize", DEFAULT_BLOCK_MAX_SIZE);
+        if (!fCostSet) {
+            nBlockMaxCost = nBlockMaxSize * WITNESS_SCALE_FACTOR;
+        }
+    }
+    // Limit cost to between 4K and MAX_BLOCK_COST-4K for sanity:
+    nBlockMaxCost = std::max((unsigned int)4000, std::min((unsigned int)(MAX_BLOCK_COST-4000), nBlockMaxCost));
+    // Limit size to between 1K and MAX_BLOCK_SERIALIZED_SIZE-1K for sanity:
+    nBlockMaxSize = std::max((unsigned int)1000, std::min((unsigned int)(MAX_BLOCK_SERIALIZED_SIZE-1000), nBlockMaxSize));
 
     // Minimum block size you want to create; block will be filled with free transactions
     // until there are no more or the block reaches this size:
     nBlockMinSize = GetArg("-blockminsize", DEFAULT_BLOCK_MIN_SIZE);
     nBlockMinSize = std::min(nBlockMaxSize, nBlockMinSize);
+
+    // Whether we need to account for byte usage (in addition to cost usage)
+    fNeedSizeAccounting = (nBlockMaxSize < MAX_BLOCK_SERIALIZED_SIZE-1000) || (nBlockMinSize > 0);
 }
 
 void BlockAssembler::resetBlock()
@@ -92,7 +114,8 @@ void BlockAssembler::resetBlock()
 
     // Reserve space for coinbase tx
     nBlockSize = 1000;
-    nBlockSigOps = 100;
+    nBlockCost = 4000;
+    nBlockSigOpsCost = 400;
     fIncludeWitness = false;
 
     // These counters do not include coinbase tx
@@ -116,7 +139,7 @@ CBlockTemplate* BlockAssembler::CreateNewBlock(const CScript& scriptPubKeyIn)
     // Add dummy coinbase tx as first transaction
     pblock->vtx.push_back(CTransaction());
     pblocktemplate->vTxFees.push_back(-1); // updated at end
-    pblocktemplate->vTxSigOps.push_back(-1); // updated at end
+    pblocktemplate->vTxSigOpsCost.push_back(-1); // updated at end
 
     LOCK2(cs_main, mempool.cs);
     CBlockIndex* pindexPrev = chainActive.Tip();
@@ -144,11 +167,18 @@ CBlockTemplate* BlockAssembler::CreateNewBlock(const CScript& scriptPubKeyIn)
     fIncludeWitness = IsWitnessEnabled(pindexPrev, chainparams.GetConsensus());
 
     addPriorityTxs();
-    addPackageTxs();
+    if (fNeedSizeAccounting) {
+        // addPackageTxs (the CPFP-based algorithm) cannot deal with size based
+        // accounting, so fall back to the old algorithm.
+        addScoreTxs();
+    } else {
+        addPackageTxs();
+    }
 
     nLastBlockTx = nBlockTx;
     nLastBlockSize = nBlockSize;
-    LogPrintf("CreateNewBlock(): total size %u txs: %u fees: %ld sigops %d\n", nBlockSize, nBlockTx, nFees, nBlockSigOps);
+    nLastBlockCost = nBlockCost;
+    LogPrintf("CreateNewBlock(): total size %u txs: %u fees: %ld sigops %d\n", nBlockSize, nBlockTx, nFees, nBlockSigOpsCost);
 
     // Create coinbase transaction.
     CMutableTransaction coinbaseTx;
@@ -167,7 +197,7 @@ CBlockTemplate* BlockAssembler::CreateNewBlock(const CScript& scriptPubKeyIn)
     UpdateTime(pblock, chainparams.GetConsensus(), pindexPrev);
     pblock->nBits          = GetNextWorkRequired(pindexPrev, pblock, chainparams.GetConsensus());
     pblock->nNonce         = 0;
-    pblocktemplate->vTxSigOps[0] = GetLegacySigOpCount(pblock->vtx[0]);
+    pblocktemplate->vTxSigOpsCost[0] = GetLegacySigOpCount(pblock->vtx[0]);
 
     CValidationState state;
     if (!TestBlockValidity(state, chainparams, *pblock, pindexPrev, false, false)) {
@@ -201,11 +231,12 @@ void BlockAssembler::onlyUnconfirmed(CTxMemPool::setEntries& testSet)
     }
 }
 
-bool BlockAssembler::TestPackage(uint64_t packageSize, unsigned int packageSigOps)
+bool BlockAssembler::TestPackage(uint64_t packageSize, int64_t packageSigOpsCost)
 {
-    if (nBlockSize + packageSize >= nBlockMaxSize)
+    // TODO: switch to cost-based accounting for packages instead of vsize-based accounting.
+    if (nBlockCost + WITNESS_SCALE_FACTOR * packageSize >= nBlockMaxCost)
         return false;
-    if (nBlockSigOps + packageSigOps >= MAX_BLOCK_SIGOPS)
+    if (nBlockSigOpsCost + packageSigOpsCost >= MAX_BLOCK_SIGOPS_COST)
         return false;
     return true;
 }
@@ -223,26 +254,39 @@ bool BlockAssembler::TestPackageFinality(const CTxMemPool::setEntries& package)
 
 bool BlockAssembler::TestForBlock(CTxMemPool::txiter iter)
 {
-    if (nBlockSize + iter->GetTxSize() >= nBlockMaxSize) {
+    if (nBlockCost + iter->GetTxCost() >= nBlockMaxCost) {
         // If the block is so close to full that no more txs will fit
         // or if we've tried more than 50 times to fill remaining space
         // then flag that the block is finished
-        if (nBlockSize >  nBlockMaxSize - 100 || lastFewTxs > 50) {
+        if (nBlockCost >  nBlockMaxCost - 400 || lastFewTxs > 50) {
              blockFinished = true;
              return false;
         }
-        // Once we're within 1000 bytes of a full block, only look at 50 more txs
+        // Once we're within 4000 cost of a full block, only look at 50 more txs
         // to try to fill the remaining space.
-        if (nBlockSize > nBlockMaxSize - 1000) {
+        if (nBlockCost > nBlockMaxCost - 4000) {
             lastFewTxs++;
         }
         return false;
     }
 
-    if (nBlockSigOps + iter->GetSigOpCount() >= MAX_BLOCK_SIGOPS) {
+    if (fNeedSizeAccounting) {
+        if (nBlockSize + ::GetSerializeSize(iter->GetTx(), SER_NETWORK, PROTOCOL_VERSION) >= nBlockMaxSize) {
+            if (nBlockSize >  nBlockMaxSize - 100 || lastFewTxs > 50) {
+                 blockFinished = true;
+                 return false;
+            }
+            if (nBlockSize > nBlockMaxSize - 1000) {
+                lastFewTxs++;
+            }
+            return false;
+        }
+    }
+
+    if (nBlockSigOpsCost + iter->GetSigOpCost() >= MAX_BLOCK_SIGOPS_COST) {
         // If the block has room for no more sig ops then
         // flag that the block is finished
-        if (nBlockSigOps > MAX_BLOCK_SIGOPS - 2) {
+        if (nBlockSigOpsCost > MAX_BLOCK_SIGOPS_COST - 8) {
             blockFinished = true;
             return false;
         }
@@ -264,10 +308,13 @@ void BlockAssembler::AddToBlock(CTxMemPool::txiter iter)
 {
     pblock->vtx.push_back(iter->GetTx());
     pblocktemplate->vTxFees.push_back(iter->GetFee());
-    pblocktemplate->vTxSigOps.push_back(iter->GetSigOpCount());
-    nBlockSize += iter->GetTxSize();
+    pblocktemplate->vTxSigOpsCost.push_back(iter->GetSigOpCost());
+    if (fNeedSizeAccounting) {
+        nBlockSize += ::GetSerializeSize(iter->GetTx(), SER_NETWORK, PROTOCOL_VERSION);
+    }
+    nBlockCost += iter->GetTxCost();
     ++nBlockTx;
-    nBlockSigOps += iter->GetSigOpCount();
+    nBlockSigOpsCost += iter->GetSigOpCost();
     nFees += iter->GetFee();
     inBlock.insert(iter);
 
@@ -358,7 +405,7 @@ void BlockAssembler::UpdatePackagesForAdded(const CTxMemPool::setEntries& alread
                 CTxMemPoolModifiedEntry modEntry(desc);
                 modEntry.nSizeWithAncestors -= it->GetTxSize();
                 modEntry.nModFeesWithAncestors -= it->GetModifiedFee();
-                modEntry.nSigOpCountWithAncestors -= it->GetSigOpCount();
+                modEntry.nSigOpCostWithAncestors -= it->GetSigOpCost();
                 mapModifiedTx.insert(modEntry);
             } else {
                 mapModifiedTx.modify(mit, update_for_parent_inclusion(it));
@@ -460,19 +507,19 @@ void BlockAssembler::addPackageTxs()
 
         uint64_t packageSize = iter->GetSizeWithAncestors();
         CAmount packageFees = iter->GetModFeesWithAncestors();
-        unsigned int packageSigOps = iter->GetSigOpCountWithAncestors();
+        int64_t packageSigOpsCost = iter->GetSigOpCostWithAncestors();
         if (fUsingModified) {
             packageSize = modit->nSizeWithAncestors;
             packageFees = modit->nModFeesWithAncestors;
-            packageSigOps = modit->nSigOpCountWithAncestors;
+            packageSigOpsCost = modit->nSigOpCostWithAncestors;
         }
 
-        if (packageFees < ::minRelayTxFee.GetFee(packageSize) && nBlockSize >= nBlockMinSize) {
+        if (packageFees < ::minRelayTxFee.GetFee(packageSize)) {
             // Everything else we might consider has a lower fee rate
             return;
         }
 
-        if (!TestPackage(packageSize, packageSigOps)) {
+        if (!TestPackage(packageSize, packageSigOpsCost)) {
             if (fUsingModified) {
                 // Since we always look at the best entry in mapModifiedTx,
                 // we must erase failed entries so that we can consider the
@@ -526,6 +573,8 @@ void BlockAssembler::addPriorityTxs()
         return;
     }
 
+    fNeedSizeAccounting = true;
+
     // This vector will be sorted into a priority queue:
     vector<TxCoinAgePriority> vecPriority;
     TxCoinAgePriorityCompare pricomparer;
diff --git a/src/miner.h b/src/miner.h
index 8bfc1493db19b..b303a8fa3ceb7 100644
--- a/src/miner.h
+++ b/src/miner.h
@@ -28,7 +28,7 @@ struct CBlockTemplate
 {
     CBlock block;
     std::vector<CAmount> vTxFees;
-    std::vector<int64_t> vTxSigOps;
+    std::vector<int64_t> vTxSigOpsCost;
     std::vector<unsigned char> vchCoinbaseCommitment;
 };
 
@@ -40,13 +40,13 @@ struct CTxMemPoolModifiedEntry {
         iter = entry;
         nSizeWithAncestors = entry->GetSizeWithAncestors();
         nModFeesWithAncestors = entry->GetModFeesWithAncestors();
-        nSigOpCountWithAncestors = entry->GetSigOpCountWithAncestors();
+        nSigOpCostWithAncestors = entry->GetSigOpCostWithAncestors();
     }
 
     CTxMemPool::txiter iter;
     uint64_t nSizeWithAncestors;
     CAmount nModFeesWithAncestors;
-    unsigned int nSigOpCountWithAncestors;
+    int64_t nSigOpCostWithAncestors;
 };
 
 /** Comparator for CTxMemPool::txiter objects.
@@ -124,7 +124,7 @@ struct update_for_parent_inclusion
     {
         e.nModFeesWithAncestors -= iter->GetFee();
         e.nSizeWithAncestors -= iter->GetTxSize();
-        e.nSigOpCountWithAncestors -= iter->GetSigOpCount();
+        e.nSigOpCostWithAncestors -= iter->GetSigOpCost();
     }
 
     CTxMemPool::txiter iter;
@@ -141,12 +141,14 @@ class BlockAssembler
 
     // Configuration parameters for the block size
     bool fIncludeWitness;
-    unsigned int nBlockMaxSize, nBlockMinSize;
+    unsigned int nBlockMaxCost, nBlockMaxSize, nBlockMinSize;
+    bool fNeedSizeAccounting;
 
     // Information on the current status of the block
+    uint64_t nBlockCost;
     uint64_t nBlockSize;
     uint64_t nBlockTx;
-    unsigned int nBlockSigOps;
+    uint64_t nBlockSigOpsCost;
     CAmount nFees;
     CTxMemPool::setEntries inBlock;
 
@@ -189,7 +191,7 @@ class BlockAssembler
     /** Remove confirmed (inBlock) entries from given set */
     void onlyUnconfirmed(CTxMemPool::setEntries& testSet);
     /** Test if a new package would "fit" in the block */
-    bool TestPackage(uint64_t packageSize, unsigned int packageSigOps);
+    bool TestPackage(uint64_t packageSize, int64_t packageSigOpsCost);
     /** Test if a set of transactions are all final */
     bool TestPackageFinality(const CTxMemPool::setEntries& package);
     /** Return true if given transaction from mapTx has already been evaluated,
diff --git a/src/net.cpp b/src/net.cpp
index dc83f19be48c8..4cbc43e4d8425 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -2182,7 +2182,7 @@ void CNode::RecordBytesSent(uint64_t bytes)
 void CNode::SetMaxOutboundTarget(uint64_t limit)
 {
     LOCK(cs_totalBytesSent);
-    uint64_t recommendedMinimum = (nMaxOutboundTimeframe / 600) * MAX_BLOCK_SIZE;
+    uint64_t recommendedMinimum = (nMaxOutboundTimeframe / 600) * MAX_BLOCK_SERIALIZED_SIZE;
     nMaxOutboundLimit = limit;
 
     if (limit > 0 && limit < recommendedMinimum)
@@ -2237,7 +2237,7 @@ bool CNode::OutboundTargetReached(bool historicalBlockServingLimit)
     {
         // keep a large enough buffer to at least relay each block once
         uint64_t timeLeftInCycle = GetMaxOutboundTimeLeftInCycle();
-        uint64_t buffer = timeLeftInCycle / 600 * MAX_BLOCK_SIZE;
+        uint64_t buffer = timeLeftInCycle / 600 * MAX_BLOCK_SERIALIZED_SIZE;
         if (buffer >= nMaxOutboundLimit || nMaxOutboundTotalBytesSentInCycle >= nMaxOutboundLimit - buffer)
             return true;
     }
diff --git a/src/net.h b/src/net.h
index 7ed18b2050a38..41315fc9b9fcc 100644
--- a/src/net.h
+++ b/src/net.h
@@ -45,8 +45,8 @@ static const int TIMEOUT_INTERVAL = 20 * 60;
 static const unsigned int MAX_INV_SZ = 50000;
 /** The maximum number of new addresses to accumulate before announcing. */
 static const unsigned int MAX_ADDR_TO_SEND = 1000;
-/** Maximum length of incoming protocol messages (no message over 2 MiB is currently acceptable). */
-static const unsigned int MAX_PROTOCOL_MESSAGE_LENGTH = 2 * 1024 * 1024;
+/** Maximum length of incoming protocol messages (no message over 4 MB is currently acceptable). */
+static const unsigned int MAX_PROTOCOL_MESSAGE_LENGTH = 4 * 1000 * 1000;
 /** Maximum length of strSubVer in `version` message */
 static const unsigned int MAX_SUBVERSION_LENGTH = 256;
 /** -listen default */
diff --git a/src/policy/policy.cpp b/src/policy/policy.cpp
index 67434a38fa3c1..f2148bfe1057d 100644
--- a/src/policy/policy.cpp
+++ b/src/policy/policy.cpp
@@ -64,8 +64,8 @@ bool IsStandardTx(const CTransaction& tx, std::string& reason)
     // almost as much to process as they cost the sender in fees, because
     // computing signature hashes is O(ninputs*txsize). Limiting transactions
     // to MAX_STANDARD_TX_SIZE mitigates CPU exhaustion attacks.
-    unsigned int sz = tx.GetSerializeSize(SER_NETWORK, CTransaction::CURRENT_VERSION);
-    if (sz >= MAX_STANDARD_TX_SIZE) {
+    unsigned int sz = GetTransactionCost(tx);
+    if (sz >= MAX_STANDARD_TX_COST) {
         reason = "tx-size";
         return false;
     }
@@ -150,3 +150,13 @@ bool AreInputsStandard(const CTransaction& tx, const CCoinsViewCache& mapInputs)
 
     return true;
 }
+
+int64_t GetVirtualTransactionSize(int64_t nCost)
+{
+    return (nCost + WITNESS_SCALE_FACTOR - 1) / WITNESS_SCALE_FACTOR;
+}
+
+int64_t GetVirtualTransactionSize(const CTransaction& tx)
+{
+    return GetVirtualTransactionSize(GetTransactionCost(tx));
+}
diff --git a/src/policy/policy.h b/src/policy/policy.h
index a6bcc777ff51d..fefb562ff9318 100644
--- a/src/policy/policy.h
+++ b/src/policy/policy.h
@@ -19,12 +19,14 @@ static const unsigned int DEFAULT_BLOCK_MAX_SIZE = 750000;
 static const unsigned int DEFAULT_BLOCK_MIN_SIZE = 0;
 /** Default for -blockprioritysize, maximum space for zero/low-fee transactions **/
 static const unsigned int DEFAULT_BLOCK_PRIORITY_SIZE = 0;
+/** Default for -blockmaxcost, which control the range of block costs the mining code will create **/
+static const unsigned int DEFAULT_BLOCK_MAX_COST = 3000000;
 /** The maximum size for transactions we're willing to relay/mine */
-static const unsigned int MAX_STANDARD_TX_SIZE = 100000;
+static const unsigned int MAX_STANDARD_TX_COST = 400000;
 /** Maximum number of signature check operations in an IsStandard() P2SH script */
 static const unsigned int MAX_P2SH_SIGOPS = 15;
 /** The maximum number of sigops we're willing to relay/mine in a single tx */
-static const unsigned int MAX_STANDARD_TX_SIGOPS = MAX_BLOCK_SIGOPS/5;
+static const unsigned int MAX_STANDARD_TX_SIGOPS_COST = MAX_BLOCK_SIGOPS_COST/5;
 /** Default for -maxmempool, maximum megabytes of mempool memory usage */
 static const unsigned int DEFAULT_MAX_MEMPOOL_SIZE = 300;
 /**
@@ -65,4 +67,8 @@ bool IsStandardTx(const CTransaction& tx, std::string& reason);
      */
 bool AreInputsStandard(const CTransaction& tx, const CCoinsViewCache& mapInputs);
 
+/** Compute the virtual transaction size (cost reinterpreted as bytes). */
+int64_t GetVirtualTransactionSize(int64_t nCost);
+int64_t GetVirtualTransactionSize(const CTransaction& tx);
+
 #endif // BITCOIN_POLICY_POLICY_H
diff --git a/src/primitives/block.cpp b/src/primitives/block.cpp
index 6fb33230a53e0..df900388f2678 100644
--- a/src/primitives/block.cpp
+++ b/src/primitives/block.cpp
@@ -31,3 +31,12 @@ std::string CBlock::ToString() const
     }
     return s.str();
 }
+
+int64_t GetBlockCost(const CBlock& block)
+{
+    // This implements the cost = (stripped_size * 4) + witness_size formula,
+    // using only serialization with and without witness data. As witness_size
+    // is equal to total_size - stripped_size, this formula is identical to:
+    // cost = (stripped_size * 3) + total_size.
+    return ::GetSerializeSize(block, SER_NETWORK, PROTOCOL_VERSION | SERIALIZE_TRANSACTION_NO_WITNESS) * (WITNESS_SCALE_FACTOR - 1) + ::GetSerializeSize(block, SER_NETWORK, PROTOCOL_VERSION);
+}
diff --git a/src/primitives/block.h b/src/primitives/block.h
index 29307aed5be48..e2a309e63d821 100644
--- a/src/primitives/block.h
+++ b/src/primitives/block.h
@@ -154,4 +154,7 @@ struct CBlockLocator
     }
 };
 
+/** Compute the consensus-critical block cost (see BIP 141). */
+int64_t GetBlockCost(const CBlock& tx);
+
 #endif // BITCOIN_PRIMITIVES_BLOCK_H
diff --git a/src/primitives/transaction.cpp b/src/primitives/transaction.cpp
index b0230530e804f..7f10409c05397 100644
--- a/src/primitives/transaction.cpp
+++ b/src/primitives/transaction.cpp
@@ -121,7 +121,7 @@ unsigned int CTransaction::CalculateModifiedSize(unsigned int nTxSize) const
     // Providing any more cleanup incentive than making additional inputs free would
     // risk encouraging people to create junk outputs to redeem later.
     if (nTxSize == 0)
-        nTxSize = ::GetSerializeSize(*this, SER_NETWORK, PROTOCOL_VERSION);
+        nTxSize = (GetTransactionCost(*this) + WITNESS_SCALE_FACTOR - 1) / WITNESS_SCALE_FACTOR;
     for (std::vector<CTxIn>::const_iterator it(vin.begin()); it != vin.end(); ++it)
     {
         unsigned int offset = 41U + std::min(110U, (unsigned int)it->scriptSig.size());
@@ -148,3 +148,8 @@ std::string CTransaction::ToString() const
         str += "    " + vout[i].ToString() + "\n";
     return str;
 }
+
+int64_t GetTransactionCost(const CTransaction& tx)
+{
+    return ::GetSerializeSize(tx, SER_NETWORK, PROTOCOL_VERSION | SERIALIZE_TRANSACTION_NO_WITNESS) * (WITNESS_SCALE_FACTOR -1) + ::GetSerializeSize(tx, SER_NETWORK, PROTOCOL_VERSION);
+}
diff --git a/src/primitives/transaction.h b/src/primitives/transaction.h
index 5a58241347b49..e87ad90f0d498 100644
--- a/src/primitives/transaction.h
+++ b/src/primitives/transaction.h
@@ -13,6 +13,8 @@
 
 static const int SERIALIZE_TRANSACTION_NO_WITNESS = 0x40000000;
 
+static const int WITNESS_SCALE_FACTOR = 4;
+
 /** An outpoint - a combination of a transaction hash and an index n into its vout */
 class COutPoint
 {
@@ -166,15 +168,30 @@ class CTxOut
         // which has units satoshis-per-kilobyte.
         // If you'd pay more than 1/3 in fees
         // to spend something, then we consider it dust.
-        // A typical spendable txout is 34 bytes big, and will
+        // A typical spendable non-segwit txout is 34 bytes big, and will
         // need a CTxIn of at least 148 bytes to spend:
         // so dust is a spendable txout less than
-        // 546*minRelayTxFee/1000 (in satoshis)
+        // 546*minRelayTxFee/1000 (in satoshis).
+        // A typical spendable segwit txout is 31 bytes big, and will
+        // need a CTxIn of at least 67 bytes to spend:
+        // so dust is a spendable txout less than
+        // 294*minRelayTxFee/1000 (in satoshis).
         if (scriptPubKey.IsUnspendable())
             return 0;
 
-        size_t nSize = GetSerializeSize(SER_DISK,0)+148u;
-        return 3*minRelayTxFee.GetFee(nSize);
+        size_t nSize = GetSerializeSize(SER_DISK, 0);
+        int witnessversion = 0;
+        std::vector<unsigned char> witnessprogram;
+
+        if (scriptPubKey.IsWitnessProgram(witnessversion, witnessprogram)) {
+            // sum the sizes of the parts of a transaction input
+            // with 75% segwit discount applied to the script size.
+            nSize += (32 + 4 + 1 + (107 / WITNESS_SCALE_FACTOR) + 4);
+        } else {
+            nSize += (32 + 4 + 1 + 107 + 4); // the 148 mentioned above
+        }
+
+        return 3 * minRelayTxFee.GetFee(nSize);
     }
 
     bool IsDust(const CFeeRate &minRelayTxFee) const
@@ -442,4 +459,7 @@ struct CMutableTransaction
     uint256 GetHash() const;
 };
 
+/** Compute the cost of a transaction, as defined by BIP 141 */
+int64_t GetTransactionCost(const CTransaction &tx);
+
 #endif // BITCOIN_PRIMITIVES_TRANSACTION_H
diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp
index f11af876f917c..43ba4edd78c19 100644
--- a/src/rpc/blockchain.cpp
+++ b/src/rpc/blockchain.cpp
@@ -101,6 +101,7 @@ UniValue blockToJSON(const CBlock& block, const CBlockIndex* blockindex, bool tx
     result.push_back(Pair("confirmations", confirmations));
     result.push_back(Pair("strippedsize", (int)::GetSerializeSize(block, SER_NETWORK, PROTOCOL_VERSION | SERIALIZE_TRANSACTION_NO_WITNESS)));
     result.push_back(Pair("size", (int)::GetSerializeSize(block, SER_NETWORK, PROTOCOL_VERSION)));
+    result.push_back(Pair("cost", (int)::GetBlockCost(block)));
     result.push_back(Pair("height", blockindex->nHeight));
     result.push_back(Pair("version", block.nVersion));
     result.push_back(Pair("versionHex", strprintf("%08x", block.nVersion)));
@@ -560,6 +561,7 @@ UniValue getblock(const UniValue& params, bool fHelp)
             "  \"confirmations\" : n,   (numeric) The number of confirmations, or -1 if the block is not on the main chain\n"
             "  \"size\" : n,            (numeric) The block size\n"
             "  \"strippedsize\" : n,    (numeric) The block size excluding witness data\n"
+            "  \"cost\" : n             (numeric) The block cost\n"
             "  \"height\" : n,          (numeric) The block height or index\n"
             "  \"version\" : n,         (numeric) The block version\n"
             "  \"versionHex\" : \"00000000\", (string) The block version formatted in hexadecimal\n"
diff --git a/src/rpc/mining.cpp b/src/rpc/mining.cpp
index 291314b8b57fa..4c4e5997818ef 100644
--- a/src/rpc/mining.cpp
+++ b/src/rpc/mining.cpp
@@ -224,6 +224,7 @@ UniValue getmininginfo(const UniValue& params, bool fHelp)
             "{\n"
             "  \"blocks\": nnn,             (numeric) The current block\n"
             "  \"currentblocksize\": nnn,   (numeric) The last block size\n"
+            "  \"currentblockcost\": nnn,   (numeric) The last block cost\n"
             "  \"currentblocktx\": nnn,     (numeric) The last block transaction\n"
             "  \"difficulty\": xxx.xxxxx    (numeric) The current difficulty\n"
             "  \"errors\": \"...\"          (string) Current errors\n"
@@ -242,6 +243,7 @@ UniValue getmininginfo(const UniValue& params, bool fHelp)
     UniValue obj(UniValue::VOBJ);
     obj.push_back(Pair("blocks",           (int)chainActive.Height()));
     obj.push_back(Pair("currentblocksize", (uint64_t)nLastBlockSize));
+    obj.push_back(Pair("currentblockcost", (uint64_t)nLastBlockCost));
     obj.push_back(Pair("currentblocktx",   (uint64_t)nLastBlockTx));
     obj.push_back(Pair("difficulty",       (double)GetDifficulty()));
     obj.push_back(Pair("errors",           GetWarnings("statusbar")));
@@ -349,13 +351,14 @@ UniValue getblocktemplate(const UniValue& params, bool fHelp)
             "      {\n"
             "         \"data\" : \"xxxx\",          (string) transaction data encoded in hexadecimal (byte-for-byte)\n"
             "         \"txid\" : \"xxxx\",          (string) transaction id encoded in little-endian hexadecimal\n"
-            "         \"hash\" : \"xxxx\",          (string) hash encoded in little-endian hexadecimal\n"
+            "         \"hash\" : \"xxxx\",          (string) hash encoded in little-endian hexadecimal (including witness data)\n"
             "         \"depends\" : [              (array) array of numbers \n"
             "             n                        (numeric) transactions before this one (by 1-based index in 'transactions' list) that must be present in the final block if this one is\n"
             "             ,...\n"
             "         ],\n"
             "         \"fee\": n,                   (numeric) difference in value between transaction inputs and outputs (in Satoshis); for coinbase transactions, this is a negative Number of the total collected block fees (ie, not including the block subsidy); if key is not present, fee is unknown and clients MUST NOT assume there isn't one\n"
-            "         \"sigops\" : n,               (numeric) total number of SigOps, as counted for purposes of block limits; if key is not present, sigop count is unknown and clients MUST NOT assume there aren't any\n"
+            "         \"sigops\" : n,               (numeric) total SigOps cost, as counted for purposes of block limits; if key is not present, sigop cost is unknown and clients MUST NOT assume it is zero\n"
+            "         \"cost\" : n,                 (numeric) total transaction size cost, as counted for purposes of block limits\n"
             "         \"required\" : true|false     (boolean) if provided and true, this transaction must be in the final block\n"
             "      }\n"
             "      ,...\n"
@@ -372,8 +375,9 @@ UniValue getblocktemplate(const UniValue& params, bool fHelp)
             "     ,...\n"
             "  ],\n"
             "  \"noncerange\" : \"00000000ffffffff\",   (string) A range of valid nonces\n"
-            "  \"sigoplimit\" : n,                 (numeric) limit of sigops in blocks\n"
+            "  \"sigoplimit\" : n,                 (numeric) cost limit of sigops in blocks\n"
             "  \"sizelimit\" : n,                  (numeric) limit of block size\n"
+            "  \"costlimit\" : n,                  (numeric) limit of block cost\n"
             "  \"curtime\" : ttt,                  (numeric) current timestamp in seconds since epoch (Jan 1 1970 GMT)\n"
             "  \"bits\" : \"xxx\",                 (string) compressed target of next block\n"
             "  \"height\" : n                      (numeric) The height of the next block\n"
@@ -570,7 +574,8 @@ UniValue getblocktemplate(const UniValue& params, bool fHelp)
 
         int index_in_template = i - 1;
         entry.push_back(Pair("fee", pblocktemplate->vTxFees[index_in_template]));
-        entry.push_back(Pair("sigops", pblocktemplate->vTxSigOps[index_in_template]));
+        entry.push_back(Pair("sigops", pblocktemplate->vTxSigOpsCost[index_in_template]));
+        entry.push_back(Pair("cost", GetTransactionCost(tx)));
 
         transactions.push_back(entry);
     }
@@ -652,8 +657,9 @@ UniValue getblocktemplate(const UniValue& params, bool fHelp)
     result.push_back(Pair("mintime", (int64_t)pindexPrev->GetMedianTimePast()+1));
     result.push_back(Pair("mutable", aMutable));
     result.push_back(Pair("noncerange", "00000000ffffffff"));
-    result.push_back(Pair("sigoplimit", (int64_t)MAX_BLOCK_SIGOPS));
-    result.push_back(Pair("sizelimit", (int64_t)MAX_BLOCK_SIZE));
+    result.push_back(Pair("sigoplimit", (int64_t)MAX_BLOCK_SIGOPS_COST));
+    result.push_back(Pair("sizelimit", (int64_t)MAX_BLOCK_SERIALIZED_SIZE));
+    result.push_back(Pair("costlimit", (int64_t)MAX_BLOCK_COST));
     result.push_back(Pair("curtime", pblock->GetBlockTime()));
     result.push_back(Pair("bits", strprintf("%08x", pblock->nBits)));
     result.push_back(Pair("height", (int64_t)(pindexPrev->nHeight+1)));
diff --git a/src/rpc/rawtransaction.cpp b/src/rpc/rawtransaction.cpp
index 12e3eaa9201da..b36179943f4db 100644
--- a/src/rpc/rawtransaction.cpp
+++ b/src/rpc/rawtransaction.cpp
@@ -64,6 +64,7 @@ void TxToJSON(const CTransaction& tx, const uint256 hashBlock, UniValue& entry)
     entry.push_back(Pair("txid", tx.GetHash().GetHex()));
     entry.push_back(Pair("hash", tx.GetWitnessHash().GetHex()));
     entry.push_back(Pair("size", (int)::GetSerializeSize(tx, SER_NETWORK, PROTOCOL_VERSION)));
+    entry.push_back(Pair("vsize", (int)::GetVirtualTransactionSize(tx)));
     entry.push_back(Pair("version", tx.nVersion));
     entry.push_back(Pair("locktime", (int64_t)tx.nLockTime));
 
@@ -150,6 +151,7 @@ UniValue getrawtransaction(const UniValue& params, bool fHelp)
             "  \"txid\" : \"id\",        (string) The transaction id (same as provided)\n"
             "  \"hash\" : \"id\",        (string) The transaction hash (differs from txid for witness transactions)\n"
             "  \"size\" : n,             (numeric) The serialized transaction size\n"
+            "  \"vsize\" : n,            (numeric) The virtual transaction size (differs from size for witness transactions)\n"
             "  \"version\" : n,          (numeric) The version\n"
             "  \"locktime\" : ttt,       (numeric) The lock time\n"
             "  \"vin\" : [               (array of json objects)\n"
@@ -461,6 +463,7 @@ UniValue decoderawtransaction(const UniValue& params, bool fHelp)
             "  \"txid\" : \"id\",        (string) The transaction id\n"
             "  \"hash\" : \"id\",        (string) The transaction hash (differs from txid for witness transactions)\n"
             "  \"size\" : n,             (numeric) The transaction size\n"
+            "  \"vsize\" : n,            (numeric) The virtual transaction size (differs from size for witness transactions)\n"
             "  \"version\" : n,          (numeric) The version\n"
             "  \"locktime\" : ttt,       (numeric) The lock time\n"
             "  \"vin\" : [               (array of json objects)\n"
diff --git a/src/script/interpreter.cpp b/src/script/interpreter.cpp
index 4deebd050d45e..bc027e9f0c113 100644
--- a/src/script/interpreter.cpp
+++ b/src/script/interpreter.cpp
@@ -1470,3 +1470,50 @@ bool VerifyScript(const CScript& scriptSig, const CScript& scriptPubKey, const C
 
     return set_success(serror);
 }
+
+size_t static WitnessSigOps(int witversion, const std::vector<unsigned char>& witprogram, const CScriptWitness& witness, int flags)
+{
+    if (witversion == 0) {
+        if (witprogram.size() == 20)
+            return 1;
+
+        if (witprogram.size() == 32 && witness.stack.size() > 0) {
+            CScript subscript(witness.stack.back().begin(), witness.stack.back().end());
+            return subscript.GetSigOpCount(true);
+        }
+    }
+
+    // Future flags may be implemented here.
+    return 0;
+}
+
+size_t CountWitnessSigOps(const CScript& scriptSig, const CScript& scriptPubKey, const CScriptWitness* witness, unsigned int flags)
+{
+    static const CScriptWitness witnessEmpty;
+
+    if ((flags & SCRIPT_VERIFY_WITNESS) == 0) {
+        return 0;
+    }
+    assert((flags & SCRIPT_VERIFY_P2SH) != 0);
+
+    int witnessversion;
+    std::vector<unsigned char> witnessprogram;
+    if (scriptPubKey.IsWitnessProgram(witnessversion, witnessprogram)) {
+        return WitnessSigOps(witnessversion, witnessprogram, witness ? *witness : witnessEmpty, flags);
+    }
+
+    if (scriptPubKey.IsPayToScriptHash() && scriptSig.IsPushOnly()) {
+        CScript::const_iterator pc = scriptSig.begin();
+        vector<unsigned char> data;
+        while (pc < scriptSig.end()) {
+            opcodetype opcode;
+            scriptSig.GetOp(pc, opcode, data);
+        }
+        CScript subscript(data.begin(), data.end());
+        if (subscript.IsWitnessProgram(witnessversion, witnessprogram)) {
+            return WitnessSigOps(witnessversion, witnessprogram, witness ? *witness : witnessEmpty, flags);
+        }
+    }
+
+    return 0;
+}
diff --git a/src/script/interpreter.h b/src/script/interpreter.h
index 86437294253e9..bd2f21166368a 100644
--- a/src/script/interpreter.h
+++ b/src/script/interpreter.h
@@ -156,4 +156,6 @@ class MutableTransactionSignatureChecker : public TransactionSignatureChecker
 bool EvalScript(std::vector<std::vector<unsigned char> >& stack, const CScript& script, unsigned int flags, const BaseSignatureChecker& checker, SigVersion sigversion, ScriptError* error = NULL);
 bool VerifyScript(const CScript& scriptSig, const CScript& scriptPubKey, const CScriptWitness* witness, unsigned int flags, const BaseSignatureChecker& checker, ScriptError* serror = NULL);
 
+size_t CountWitnessSigOps(const CScript& scriptSig, const CScript& scriptPubKey, const CScriptWitness* witness, unsigned int flags);
+
 #endif // BITCOIN_SCRIPT_INTERPRETER_H
diff --git a/src/test/mempool_tests.cpp b/src/test/mempool_tests.cpp
index c8b43df26ca27..033a50f94f578 100644
--- a/src/test/mempool_tests.cpp
+++ b/src/test/mempool_tests.cpp
@@ -2,6 +2,7 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
+#include "policy/policy.h"
 #include "txmempool.h"
 #include "util.h"
 
@@ -336,7 +337,7 @@ BOOST_AUTO_TEST_CASE(MempoolAncestorIndexingTest)
     tx2.vout[0].scriptPubKey = CScript() << OP_11 << OP_EQUAL;
     tx2.vout[0].nValue = 2 * COIN;
     pool.addUnchecked(tx2.GetHash(), entry.Fee(20000LL).Priority(9.0).FromTx(tx2));
-    uint64_t tx2Size = ::GetSerializeSize(tx2, SER_NETWORK, PROTOCOL_VERSION);
+    uint64_t tx2Size = GetVirtualTransactionSize(tx2);
 
     /* lowest fee */
     CMutableTransaction tx3 = CMutableTransaction();
@@ -384,7 +385,7 @@ BOOST_AUTO_TEST_CASE(MempoolAncestorIndexingTest)
     tx6.vout.resize(1);
     tx6.vout[0].scriptPubKey = CScript() << OP_11 << OP_EQUAL;
     tx6.vout[0].nValue = 20 * COIN;
-    uint64_t tx6Size = ::GetSerializeSize(tx6, SER_NETWORK, PROTOCOL_VERSION);
+    uint64_t tx6Size = GetVirtualTransactionSize(tx6);
 
     pool.addUnchecked(tx6.GetHash(), entry.Fee(0LL).FromTx(tx6));
     BOOST_CHECK_EQUAL(pool.size(), 6);
@@ -398,7 +399,7 @@ BOOST_AUTO_TEST_CASE(MempoolAncestorIndexingTest)
     tx7.vout.resize(1);
     tx7.vout[0].scriptPubKey = CScript() << OP_11 << OP_EQUAL;
     tx7.vout[0].nValue = 10 * COIN;
-    uint64_t tx7Size = ::GetSerializeSize(tx7, SER_NETWORK, PROTOCOL_VERSION);
+    uint64_t tx7Size = GetVirtualTransactionSize(tx7);
 
     /* set the fee to just below tx2's feerate when including ancestor */
     CAmount fee = (20000/tx2Size)*(tx7Size + tx6Size) - 1;
@@ -467,12 +468,12 @@ BOOST_AUTO_TEST_CASE(MempoolSizeLimitTest)
     BOOST_CHECK(pool.exists(tx2.GetHash()));
     BOOST_CHECK(pool.exists(tx3.GetHash()));
 
-    pool.TrimToSize(::GetSerializeSize(CTransaction(tx1), SER_NETWORK, PROTOCOL_VERSION)); // mempool is limited to tx1's size in memory usage, so nothing fits
+    pool.TrimToSize(GetVirtualTransactionSize(tx1)); // mempool is limited to tx1's size in memory usage, so nothing fits
     BOOST_CHECK(!pool.exists(tx1.GetHash()));
     BOOST_CHECK(!pool.exists(tx2.GetHash()));
     BOOST_CHECK(!pool.exists(tx3.GetHash()));
 
-    CFeeRate maxFeeRateRemoved(25000, ::GetSerializeSize(CTransaction(tx3), SER_NETWORK, PROTOCOL_VERSION) + ::GetSerializeSize(CTransaction(tx2), SER_NETWORK, PROTOCOL_VERSION));
+    CFeeRate maxFeeRateRemoved(25000, GetVirtualTransactionSize(tx3) + GetVirtualTransactionSize(tx2));
     BOOST_CHECK_EQUAL(pool.GetMinFee(1).GetFeePerK(), maxFeeRateRemoved.GetFeePerK() + 1000);
 
     CMutableTransaction tx4 = CMutableTransaction();
diff --git a/src/test/miner_tests.cpp b/src/test/miner_tests.cpp
index ca8d6d2e05baa..fd581db52ea28 100644
--- a/src/test/miner_tests.cpp
+++ b/src/test/miner_tests.cpp
@@ -181,6 +181,9 @@ void TestPackageSelection(const CChainParams& chainparams, CScript scriptPubKey,
 // NOTE: These tests rely on CreateNewBlock doing its own self-validation!
 BOOST_AUTO_TEST_CASE(CreateNewBlock_validity)
 {
+    // Disable size accounting (CPFP does not support it)
+    mapArgs["-blockmaxsize"] = strprintf("%u", MAX_BLOCK_SERIALIZED_SIZE);
+
     const CChainParams& chainparams = Params(CBaseChainParams::MAIN);
     CScript scriptPubKey = CScript() << ParseHex("04678afdb0fe5548271967f1a67130b7105cd6a828e03909a67962e0ea1f61deb649f6bc3f4cef38c4f35504e51ec112de5c384df7ba0b8d578a4c702b6bf11d5f") << OP_CHECKSIG;
     CBlockTemplate *pblocktemplate;
@@ -264,7 +267,7 @@ BOOST_AUTO_TEST_CASE(CreateNewBlock_validity)
         hash = tx.GetHash();
         bool spendsCoinbase = (i == 0) ? true : false; // only first tx spends coinbase
         // If we do set the # of sig ops in the CTxMemPoolEntry, template creation passes
-        mempool.addUnchecked(hash, entry.Fee(LOWFEE).Time(GetTime()).SpendsCoinbase(spendsCoinbase).SigOps(20).FromTx(tx));
+        mempool.addUnchecked(hash, entry.Fee(LOWFEE).Time(GetTime()).SpendsCoinbase(spendsCoinbase).SigOpsCost(80).FromTx(tx));
         tx.vin[0].prevout.hash = hash;
     }
     BOOST_CHECK(pblocktemplate = BlockAssembler(chainparams).CreateNewBlock(scriptPubKey));
diff --git a/src/test/policyestimator_tests.cpp b/src/test/policyestimator_tests.cpp
index 2b00e6f567fa8..5c902387f1214 100644
--- a/src/test/policyestimator_tests.cpp
+++ b/src/test/policyestimator_tests.cpp
@@ -2,6 +2,7 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
+#include "policy/policy.h"
 #include "policy/fees.h"
 #include "txmempool.h"
 #include "uint256.h"
@@ -50,7 +51,7 @@ BOOST_AUTO_TEST_CASE(BlockPolicyEstimates)
     tx.vin[0].scriptSig = garbage;
     tx.vout.resize(1);
     tx.vout[0].nValue=0LL;
-    CFeeRate baseRate(basefee, ::GetSerializeSize(tx, SER_NETWORK, PROTOCOL_VERSION));
+    CFeeRate baseRate(basefee, GetVirtualTransactionSize(tx));
 
     // Create a fake block
     std::vector<CTransaction> block;
diff --git a/src/test/test_bitcoin.cpp b/src/test/test_bitcoin.cpp
index 1f3b198800222..856f9b842300c 100644
--- a/src/test/test_bitcoin.cpp
+++ b/src/test/test_bitcoin.cpp
@@ -136,7 +136,7 @@ CTxMemPoolEntry TestMemPoolEntryHelper::FromTx(CTransaction &txn, CTxMemPool *po
     CAmount inChainValue = hasNoDependencies ? txn.GetValueOut() : 0;
 
     return CTxMemPoolEntry(txn, nFee, nTime, dPriority, nHeight,
-                           hasNoDependencies, inChainValue, spendsCoinbase, sigOpCount, lp);
+                           hasNoDependencies, inChainValue, spendsCoinbase, sigOpCost, lp);
 }
 
 void Shutdown(void* parg)
diff --git a/src/test/test_bitcoin.h b/src/test/test_bitcoin.h
index 78b87e7109b7d..bc0d2fe316aa5 100644
--- a/src/test/test_bitcoin.h
+++ b/src/test/test_bitcoin.h
@@ -70,12 +70,12 @@ struct TestMemPoolEntryHelper
     unsigned int nHeight;
     bool hadNoDependencies;
     bool spendsCoinbase;
-    unsigned int sigOpCount;
+    unsigned int sigOpCost;
     LockPoints lp;
 
     TestMemPoolEntryHelper() :
         nFee(0), nTime(0), dPriority(0.0), nHeight(1),
-        hadNoDependencies(false), spendsCoinbase(false), sigOpCount(1) { }
+        hadNoDependencies(false), spendsCoinbase(false), sigOpCost(4) { }
     
     CTxMemPoolEntry FromTx(CMutableTransaction &tx, CTxMemPool *pool = NULL);
     CTxMemPoolEntry FromTx(CTransaction &tx, CTxMemPool *pool = NULL);
@@ -87,6 +87,6 @@ struct TestMemPoolEntryHelper
     TestMemPoolEntryHelper &Height(unsigned int _height) { nHeight = _height; return *this; }
     TestMemPoolEntryHelper &HadNoDependencies(bool _hnd) { hadNoDependencies = _hnd; return *this; }
     TestMemPoolEntryHelper &SpendsCoinbase(bool _flag) { spendsCoinbase = _flag; return *this; }
-    TestMemPoolEntryHelper &SigOps(unsigned int _sigops) { sigOpCount = _sigops; return *this; }
+    TestMemPoolEntryHelper &SigOpsCost(unsigned int _sigopsCost) { sigOpCost = _sigopsCost; return *this; }
 };
 #endif
diff --git a/src/txmempool.cpp b/src/txmempool.cpp
index ead28546de56a..a48a6d94659b5 100644
--- a/src/txmempool.cpp
+++ b/src/txmempool.cpp
@@ -9,6 +9,7 @@
 #include "consensus/consensus.h"
 #include "consensus/validation.h"
 #include "main.h"
+#include "policy/policy.h"
 #include "policy/fees.h"
 #include "streams.h"
 #include "timedata.h"
@@ -22,17 +23,17 @@ using namespace std;
 CTxMemPoolEntry::CTxMemPoolEntry(const CTransaction& _tx, const CAmount& _nFee,
                                  int64_t _nTime, double _entryPriority, unsigned int _entryHeight,
                                  bool poolHasNoInputsOf, CAmount _inChainInputValue,
-                                 bool _spendsCoinbase, unsigned int _sigOps, LockPoints lp):
+                                 bool _spendsCoinbase, int64_t _sigOpsCost, LockPoints lp):
     tx(std::make_shared<CTransaction>(_tx)), nFee(_nFee), nTime(_nTime), entryPriority(_entryPriority), entryHeight(_entryHeight),
     hadNoDependencies(poolHasNoInputsOf), inChainInputValue(_inChainInputValue),
-    spendsCoinbase(_spendsCoinbase), sigOpCount(_sigOps), lockPoints(lp)
+    spendsCoinbase(_spendsCoinbase), sigOpCost(_sigOpsCost), lockPoints(lp)
 {
-    nTxSize = ::GetSerializeSize(_tx, SER_NETWORK, PROTOCOL_VERSION);
-    nModSize = _tx.CalculateModifiedSize(nTxSize);
+    nTxCost = GetTransactionCost(_tx);
+    nModSize = _tx.CalculateModifiedSize(GetTxSize());
     nUsageSize = RecursiveDynamicUsage(*tx) + memusage::DynamicUsage(tx);
 
     nCountWithDescendants = 1;
-    nSizeWithDescendants = nTxSize;
+    nSizeWithDescendants = GetTxSize();
     nModFeesWithDescendants = nFee;
     CAmount nValueIn = _tx.GetValueOut()+nFee;
     assert(inChainInputValue <= nValueIn);
@@ -40,9 +41,9 @@ CTxMemPoolEntry::CTxMemPoolEntry(const CTransaction& _tx, const CAmount& _nFee,
     feeDelta = 0;
 
     nCountWithAncestors = 1;
-    nSizeWithAncestors = nTxSize;
+    nSizeWithAncestors = GetTxSize();
     nModFeesWithAncestors = nFee;
-    nSigOpCountWithAncestors = sigOpCount;
+    nSigOpCostWithAncestors = sigOpCost;
 }
 
 CTxMemPoolEntry::CTxMemPoolEntry(const CTxMemPoolEntry& other)
@@ -72,6 +73,11 @@ void CTxMemPoolEntry::UpdateLockPoints(const LockPoints& lp)
     lockPoints = lp;
 }
 
+size_t CTxMemPoolEntry::GetTxSize() const
+{
+    return GetVirtualTransactionSize(nTxCost);
+}
+
 // Update the given tx for any in-mempool descendants.
 // Assumes that setMemPoolChildren is correct for the given tx and all
 // descendants.
@@ -111,7 +117,7 @@ void CTxMemPool::UpdateForDescendants(txiter updateIt, cacheMap &cachedDescendan
             modifyCount++;
             cachedDescendants[updateIt].insert(cit);
             // Update ancestor state for each descendant
-            mapTx.modify(cit, update_ancestor_state(updateIt->GetTxSize(), updateIt->GetModifiedFee(), 1, updateIt->GetSigOpCount()));
+            mapTx.modify(cit, update_ancestor_state(updateIt->GetTxSize(), updateIt->GetModifiedFee(), 1, updateIt->GetSigOpCost()));
         }
     }
     mapTx.modify(updateIt, update_descendant_state(modifySize, modifyFee, modifyCount));
@@ -247,13 +253,13 @@ void CTxMemPool::UpdateEntryForAncestors(txiter it, const setEntries &setAncesto
     int64_t updateCount = setAncestors.size();
     int64_t updateSize = 0;
     CAmount updateFee = 0;
-    int updateSigOps = 0;
+    int64_t updateSigOpsCost = 0;
     BOOST_FOREACH(txiter ancestorIt, setAncestors) {
         updateSize += ancestorIt->GetTxSize();
         updateFee += ancestorIt->GetModifiedFee();
-        updateSigOps += ancestorIt->GetSigOpCount();
+        updateSigOpsCost += ancestorIt->GetSigOpCost();
     }
-    mapTx.modify(it, update_ancestor_state(updateSize, updateFee, updateCount, updateSigOps));
+    mapTx.modify(it, update_ancestor_state(updateSize, updateFee, updateCount, updateSigOpsCost));
 }
 
 void CTxMemPool::UpdateChildrenForRemoval(txiter it)
@@ -282,7 +288,7 @@ void CTxMemPool::UpdateForRemoveFromMempool(const setEntries &entriesToRemove, b
             setDescendants.erase(removeIt); // don't update state for self
             int64_t modifySize = -((int64_t)removeIt->GetTxSize());
             CAmount modifyFee = -removeIt->GetModifiedFee();
-            int modifySigOps = -removeIt->GetSigOpCount();
+            int modifySigOps = -removeIt->GetSigOpCost();
             BOOST_FOREACH(txiter dit, setDescendants) {
                 mapTx.modify(dit, update_ancestor_state(modifySize, modifyFee, -1, modifySigOps));
             }
@@ -338,8 +344,8 @@ void CTxMemPoolEntry::UpdateAncestorState(int64_t modifySize, CAmount modifyFee,
     nModFeesWithAncestors += modifyFee;
     nCountWithAncestors += modifyCount;
     assert(int64_t(nCountWithAncestors) > 0);
-    nSigOpCountWithAncestors += modifySigOps;
-    assert(int(nSigOpCountWithAncestors) >= 0);
+    nSigOpCostWithAncestors += modifySigOps;
+    assert(int(nSigOpCostWithAncestors) >= 0);
 }
 
 CTxMemPool::CTxMemPool(const CFeeRate& _minReasonableRelayFee) :
@@ -666,7 +672,7 @@ void CTxMemPool::check(const CCoinsViewCache *pcoins) const
         bool fDependsWait = false;
         setEntries setParentCheck;
         int64_t parentSizes = 0;
-        unsigned int parentSigOpCount = 0;
+        int64_t parentSigOpCost = 0;
         BOOST_FOREACH(const CTxIn &txin, tx.vin) {
             // Check that every mempool transaction's inputs refer to available coins, or other mempool tx's.
             indexed_transaction_set::const_iterator it2 = mapTx.find(txin.prevout.hash);
@@ -676,7 +682,7 @@ void CTxMemPool::check(const CCoinsViewCache *pcoins) const
                 fDependsWait = true;
                 if (setParentCheck.insert(it2).second) {
                     parentSizes += it2->GetTxSize();
-                    parentSigOpCount += it2->GetSigOpCount();
+                    parentSigOpCost += it2->GetSigOpCost();
                 }
             } else {
                 const CCoins* coins = pcoins->AccessCoins(txin.prevout.hash);
@@ -698,17 +704,17 @@ void CTxMemPool::check(const CCoinsViewCache *pcoins) const
         uint64_t nCountCheck = setAncestors.size() + 1;
         uint64_t nSizeCheck = it->GetTxSize();
         CAmount nFeesCheck = it->GetModifiedFee();
-        unsigned int nSigOpCheck = it->GetSigOpCount();
+        int64_t nSigOpCheck = it->GetSigOpCost();
 
         BOOST_FOREACH(txiter ancestorIt, setAncestors) {
             nSizeCheck += ancestorIt->GetTxSize();
             nFeesCheck += ancestorIt->GetModifiedFee();
-            nSigOpCheck += ancestorIt->GetSigOpCount();
+            nSigOpCheck += ancestorIt->GetSigOpCost();
         }
 
         assert(it->GetCountWithAncestors() == nCountCheck);
         assert(it->GetSizeWithAncestors() == nSizeCheck);
-        assert(it->GetSigOpCountWithAncestors() == nSigOpCheck);
+        assert(it->GetSigOpCostWithAncestors() == nSigOpCheck);
         assert(it->GetModFeesWithAncestors() == nFeesCheck);
 
         // Check children against mapNextTx
diff --git a/src/txmempool.h b/src/txmempool.h
index d6d0d72ff5874..e5a500e19d433 100644
--- a/src/txmempool.h
+++ b/src/txmempool.h
@@ -78,7 +78,7 @@ class CTxMemPoolEntry
 private:
     std::shared_ptr<const CTransaction> tx;
     CAmount nFee;              //!< Cached to avoid expensive parent-transaction lookups
-    size_t nTxSize;            //!< ... and avoid recomputing tx size
+    size_t nTxCost;            //!< ... and avoid recomputing tx cost (also used for GetTxSize())
     size_t nModSize;           //!< ... and modified size for priority
     size_t nUsageSize;         //!< ... and total memory usage
     int64_t nTime;             //!< Local time when entering the mempool
@@ -87,7 +87,7 @@ class CTxMemPoolEntry
     bool hadNoDependencies;    //!< Not dependent on any other txs when it entered the mempool
     CAmount inChainInputValue; //!< Sum of all txin values that are already in blockchain
     bool spendsCoinbase;       //!< keep track of transactions that spend a coinbase
-    unsigned int sigOpCount;   //!< Legacy sig ops plus P2SH sig op count
+    int64_t sigOpCost;         //!< Total sigop cost
     int64_t feeDelta;          //!< Used for determining the priority of the transaction for mining in a block
     LockPoints lockPoints;     //!< Track the height and time at which tx was final
 
@@ -104,13 +104,13 @@ class CTxMemPoolEntry
     uint64_t nCountWithAncestors;
     uint64_t nSizeWithAncestors;
     CAmount nModFeesWithAncestors;
-    unsigned int nSigOpCountWithAncestors;
+    int64_t nSigOpCostWithAncestors;
 
 public:
     CTxMemPoolEntry(const CTransaction& _tx, const CAmount& _nFee,
                     int64_t _nTime, double _entryPriority, unsigned int _entryHeight,
                     bool poolHasNoInputsOf, CAmount _inChainInputValue, bool spendsCoinbase,
-                    unsigned int nSigOps, LockPoints lp);
+                    int64_t nSigOpsCost, LockPoints lp);
     CTxMemPoolEntry(const CTxMemPoolEntry& other);
 
     const CTransaction& GetTx() const { return *this->tx; }
@@ -121,11 +121,12 @@ class CTxMemPoolEntry
      */
     double GetPriority(unsigned int currentHeight) const;
     const CAmount& GetFee() const { return nFee; }
-    size_t GetTxSize() const { return nTxSize; }
+    size_t GetTxSize() const;
+    size_t GetTxCost() const { return nTxCost; }
     int64_t GetTime() const { return nTime; }
     unsigned int GetHeight() const { return entryHeight; }
     bool WasClearAtEntry() const { return hadNoDependencies; }
-    unsigned int GetSigOpCount() const { return sigOpCount; }
+    int64_t GetSigOpCost() const { return sigOpCost; }
     int64_t GetModifiedFee() const { return nFee + feeDelta; }
     size_t DynamicMemoryUsage() const { return nUsageSize; }
     const LockPoints& GetLockPoints() const { return lockPoints; }
@@ -149,7 +150,7 @@ class CTxMemPoolEntry
     uint64_t GetCountWithAncestors() const { return nCountWithAncestors; }
     uint64_t GetSizeWithAncestors() const { return nSizeWithAncestors; }
     CAmount GetModFeesWithAncestors() const { return nModFeesWithAncestors; }
-    unsigned int GetSigOpCountWithAncestors() const { return nSigOpCountWithAncestors; }
+    int64_t GetSigOpCostWithAncestors() const { return nSigOpCostWithAncestors; }
 
     mutable size_t vTxHashesIdx; //!< Index in mempool's vTxHashes
 };
@@ -172,18 +173,18 @@ struct update_descendant_state
 
 struct update_ancestor_state
 {
-    update_ancestor_state(int64_t _modifySize, CAmount _modifyFee, int64_t _modifyCount, int _modifySigOps) :
-        modifySize(_modifySize), modifyFee(_modifyFee), modifyCount(_modifyCount), modifySigOps(_modifySigOps)
+    update_ancestor_state(int64_t _modifySize, CAmount _modifyFee, int64_t _modifyCount, int64_t _modifySigOpsCost) :
+        modifySize(_modifySize), modifyFee(_modifyFee), modifyCount(_modifyCount), modifySigOpsCost(_modifySigOpsCost)
     {}
 
     void operator() (CTxMemPoolEntry &e)
-        { e.UpdateAncestorState(modifySize, modifyFee, modifyCount, modifySigOps); }
+        { e.UpdateAncestorState(modifySize, modifyFee, modifyCount, modifySigOpsCost); }
 
     private:
         int64_t modifySize;
         CAmount modifyFee;
         int64_t modifyCount;
-        int modifySigOps;
+        int64_t modifySigOpsCost;
 };
 
 struct update_fee_delta
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index 723b2eceff7b2..babde1a02c3c4 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -2348,7 +2348,7 @@ bool CWallet::CreateTransaction(const vector<CRecipient>& vecSend, CWalletTx& wt
                     nIn++;
                 }
 
-                unsigned int nBytes = ::GetSerializeSize(txNew, SER_NETWORK, PROTOCOL_VERSION);
+                unsigned int nBytes = GetVirtualTransactionSize(txNew);
 
                 // Remove scriptSigs if we used dummy signatures for fee calculation
                 if (!sign) {
@@ -2360,7 +2360,7 @@ bool CWallet::CreateTransaction(const vector<CRecipient>& vecSend, CWalletTx& wt
                 *static_cast<CTransaction*>(&wtxNew) = CTransaction(txNew);
 
                 // Limit size
-                if (nBytes >= MAX_STANDARD_TX_SIZE)
+                if (GetTransactionCost(txNew) >= MAX_STANDARD_TX_COST)
                 {
                     strFailReason = _("Transaction too large");
                     return false;

From b7dbeb24ebff16198b2925d906c06771e167bd9e Mon Sep 17 00:00:00 2001
From: Thomas Kerin <afk11@users.noreply.github.com>
Date: Sun, 24 Jan 2016 16:29:39 +0000
Subject: [PATCH 0545/1802] [libconsensus] Script verification API with amounts

script_tests: always test bitcoinconsensus_verify_script_with_amount if VERIFY_WITNESS isn't set

Rename internal method + make it static

trim bitcoinconsensus_ prefix

Add SERIALIZE_TRANSACTION_WITNESS flag
---
 src/script/bitcoinconsensus.cpp | 30 +++++++++++++++++++++++++-----
 src/script/bitcoinconsensus.h   |  8 +++++++-
 src/test/script_tests.cpp       |  7 ++++++-
 3 files changed, 38 insertions(+), 7 deletions(-)

diff --git a/src/script/bitcoinconsensus.cpp b/src/script/bitcoinconsensus.cpp
index 26e7a85b7b722..62fd9031f853a 100644
--- a/src/script/bitcoinconsensus.cpp
+++ b/src/script/bitcoinconsensus.cpp
@@ -69,7 +69,7 @@ struct ECCryptoClosure
 ECCryptoClosure instance_of_eccryptoclosure;
 }
 
-int bitcoinconsensus_verify_script(const unsigned char *scriptPubKey, unsigned int scriptPubKeyLen,
+static int verify_script(const unsigned char *scriptPubKey, unsigned int scriptPubKeyLen, CAmount amount,
                                     const unsigned char *txTo        , unsigned int txToLen,
                                     unsigned int nIn, unsigned int flags, bitcoinconsensus_error* err)
 {
@@ -82,16 +82,36 @@ int bitcoinconsensus_verify_script(const unsigned char *scriptPubKey, unsigned i
         if (tx.GetSerializeSize(SER_NETWORK, PROTOCOL_VERSION) != txToLen)
             return set_error(err, bitcoinconsensus_ERR_TX_SIZE_MISMATCH);
 
-         // Regardless of the verification result, the tx did not error.
-         set_error(err, bitcoinconsensus_ERR_OK);
+        // Regardless of the verification result, the tx did not error.
+        set_error(err, bitcoinconsensus_ERR_OK);
 
-        CAmount am(0);
-        return VerifyScript(tx.vin[nIn].scriptSig, CScript(scriptPubKey, scriptPubKey + scriptPubKeyLen), nIn < tx.wit.vtxinwit.size() ? &tx.wit.vtxinwit[nIn].scriptWitness : NULL, flags, TransactionSignatureChecker(&tx, nIn, am), NULL);
+        return VerifyScript(tx.vin[nIn].scriptSig, CScript(scriptPubKey, scriptPubKey + scriptPubKeyLen), nIn < tx.wit.vtxinwit.size() ? &tx.wit.vtxinwit[nIn].scriptWitness : NULL, flags, TransactionSignatureChecker(&tx, nIn, amount), NULL);
     } catch (const std::exception&) {
         return set_error(err, bitcoinconsensus_ERR_TX_DESERIALIZE); // Error deserializing
     }
 }
 
+int bitcoinconsensus_verify_script_with_amount(const unsigned char *scriptPubKey, unsigned int scriptPubKeyLen, int64_t amount,
+                                    const unsigned char *txTo        , unsigned int txToLen,
+                                    unsigned int nIn, unsigned int flags, bitcoinconsensus_error* err)
+{
+    CAmount am(amount);
+    return ::verify_script(scriptPubKey, scriptPubKeyLen, am, txTo, txToLen, nIn, flags, err);
+}
+
+
+int bitcoinconsensus_verify_script(const unsigned char *scriptPubKey, unsigned int scriptPubKeyLen,
+                                   const unsigned char *txTo        , unsigned int txToLen,
+                                   unsigned int nIn, unsigned int flags, bitcoinconsensus_error* err)
+{
+    if (flags & bitcoinconsensus_SCRIPT_FLAGS_VERIFY_WITNESS) {
+        return set_error(err, bitcoinconsensus_ERR_AMOUNT_REQUIRED);
+    }
+
+    CAmount am(0);
+    return ::verify_script(scriptPubKey, scriptPubKeyLen, am, txTo, txToLen, nIn, flags, err);
+}
+
 unsigned int bitcoinconsensus_version()
 {
     // Just use the API version for now
diff --git a/src/script/bitcoinconsensus.h b/src/script/bitcoinconsensus.h
index cd3e2f773177b..6f868d0d6d6ab 100644
--- a/src/script/bitcoinconsensus.h
+++ b/src/script/bitcoinconsensus.h
@@ -33,7 +33,7 @@
 extern "C" {
 #endif
 
-#define BITCOINCONSENSUS_API_VER 0
+#define BITCOINCONSENSUS_API_VER 1
 
 typedef enum bitcoinconsensus_error_t
 {
@@ -41,6 +41,7 @@ typedef enum bitcoinconsensus_error_t
     bitcoinconsensus_ERR_TX_INDEX,
     bitcoinconsensus_ERR_TX_SIZE_MISMATCH,
     bitcoinconsensus_ERR_TX_DESERIALIZE,
+    bitcoinconsensus_ERR_AMOUNT_REQUIRED,
 } bitcoinconsensus_error;
 
 /** Script verification flags */
@@ -50,6 +51,7 @@ enum
     bitcoinconsensus_SCRIPT_FLAGS_VERIFY_P2SH                = (1U << 0), // evaluate P2SH (BIP16) subscripts
     bitcoinconsensus_SCRIPT_FLAGS_VERIFY_DERSIG              = (1U << 2), // enforce strict DER (BIP66) compliance
     bitcoinconsensus_SCRIPT_FLAGS_VERIFY_CHECKLOCKTIMEVERIFY = (1U << 9), // enable CHECKLOCKTIMEVERIFY (BIP65)
+    bitcoinconsensus_SCRIPT_FLAGS_VERIFY_WITNESS             = (1U << 11), // enable WITNESS (BIP141)
 };
 
 /// Returns 1 if the input nIn of the serialized transaction pointed to by
@@ -57,6 +59,10 @@ enum
 /// the additional constraints specified by flags.
 /// If not NULL, err will contain an error/success code for the operation
 EXPORT_SYMBOL int bitcoinconsensus_verify_script(const unsigned char *scriptPubKey, unsigned int scriptPubKeyLen,
+                                                 const unsigned char *txTo        , unsigned int txToLen,
+                                                 unsigned int nIn, unsigned int flags, bitcoinconsensus_error* err);
+
+EXPORT_SYMBOL int bitcoinconsensus_verify_script_with_amount(const unsigned char *scriptPubKey, unsigned int scriptPubKeyLen, int64_t amount,
                                     const unsigned char *txTo        , unsigned int txToLen,
                                     unsigned int nIn, unsigned int flags, bitcoinconsensus_error* err);
 
diff --git a/src/test/script_tests.cpp b/src/test/script_tests.cpp
index c56b9da4e5ab5..7fd7614e2cfc0 100644
--- a/src/test/script_tests.cpp
+++ b/src/test/script_tests.cpp
@@ -160,7 +160,12 @@ void DoTest(const CScript& scriptPubKey, const CScript& scriptSig, int flags, co
 #if defined(HAVE_CONSENSUS_LIB)
     CDataStream stream(SER_NETWORK, PROTOCOL_VERSION);
     stream << tx2;
-    BOOST_CHECK_MESSAGE(bitcoinconsensus_verify_script(begin_ptr(scriptPubKey), scriptPubKey.size(), (const unsigned char*)&stream[0], stream.size(), 0, flags, NULL) == expect,message);
+    if (flags & bitcoinconsensus_SCRIPT_FLAGS_VERIFY_WITNESS) {
+        BOOST_CHECK_MESSAGE(bitcoinconsensus_verify_script_with_amount(begin_ptr(scriptPubKey), scriptPubKey.size(), amountZero, (const unsigned char*)&stream[0], stream.size(), 0, flags, NULL) == expect, message);
+    } else {
+        BOOST_CHECK_MESSAGE(bitcoinconsensus_verify_script_with_amount(begin_ptr(scriptPubKey), scriptPubKey.size(), 0, (const unsigned char*)&stream[0], stream.size(), 0, flags, NULL) == expect, message);
+        BOOST_CHECK_MESSAGE(bitcoinconsensus_verify_script(begin_ptr(scriptPubKey), scriptPubKey.size(), (const unsigned char*)&stream[0], stream.size(), 0, flags, NULL) == expect,message);
+    }
 #endif
 }
 

From 6032f6930a56c107dad8f30c05fec4aab79c8c22 Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Fri, 18 Mar 2016 17:20:12 +0100
Subject: [PATCH 0546/1802] Add rewind logic to deal with post-fork software
 updates

Includes logic for dealing with pruning by Suhas Daftuar.
---
 src/chain.h  |   2 +
 src/init.cpp |   8 ++++
 src/main.cpp | 132 +++++++++++++++++++++++++++++++++++++++++++--------
 src/main.h   |   3 ++
 4 files changed, 126 insertions(+), 19 deletions(-)

diff --git a/src/chain.h b/src/chain.h
index a13dae33d188a..76a774c1238f1 100644
--- a/src/chain.h
+++ b/src/chain.h
@@ -144,6 +144,8 @@ enum BlockStatus: uint32_t {
     BLOCK_FAILED_VALID       =   32, //! stage after last reached validness failed
     BLOCK_FAILED_CHILD       =   64, //! descends from failed block
     BLOCK_FAILED_MASK        =   BLOCK_FAILED_VALID | BLOCK_FAILED_CHILD,
+
+    BLOCK_OPT_WITNESS       =   128, //! block data in blk*.data was received with a witness-enforcing client
 };
 
 /** The block chain is a tree shaped structure starting with the
diff --git a/src/init.cpp b/src/init.cpp
index e924d504bdd82..5d29f14eb8821 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -1284,6 +1284,14 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
                     break;
                 }
 
+                if (!fReindex) {
+                    uiInterface.InitMessage(_("Rewinding blocks..."));
+                    if (!RewindBlockIndex(chainparams)) {
+                        strLoadError = _("Unable to rewind the database to a pre-fork state. You will need to redownload the blockchain");
+                        break;
+                    }
+                }
+
                 uiInterface.InitMessage(_("Verifying blocks..."));
                 if (fHavePruned && GetArg("-checkblocks", DEFAULT_CHECKBLOCKS) > MIN_BLOCKS_TO_KEEP) {
                     LogPrintf("Prune: pruned datadir may not have more than %d blocks; only checking available blocks",
diff --git a/src/main.cpp b/src/main.cpp
index df758bc41f0b5..ec43a667017e3 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -658,6 +658,9 @@ CBlockIndex* FindForkInGlobalIndex(const CChain& chain, const CBlockLocator& loc
             CBlockIndex* pindex = (*mi).second;
             if (chain.Contains(pindex))
                 return pindex;
+            if (pindex->GetAncestor(chain.Height()) == chain.Tip()) {
+                return chain.Tip();
+            }
         }
     }
     return chain.Genesis();
@@ -2777,7 +2780,7 @@ void static UpdateTip(CBlockIndex *pindexNew, const CChainParams& chainParams) {
 }
 
 /** Disconnect chainActive's tip. You probably want to call mempool.removeForReorg and manually re-limit mempool size after this, with cs_main held. */
-bool static DisconnectTip(CValidationState& state, const CChainParams& chainparams)
+bool static DisconnectTip(CValidationState& state, const CChainParams& chainparams, bool fBare = false)
 {
     CBlockIndex *pindexDelete = chainActive.Tip();
     assert(pindexDelete);
@@ -2797,24 +2800,28 @@ bool static DisconnectTip(CValidationState& state, const CChainParams& chainpara
     // Write the chain state to disk, if necessary.
     if (!FlushStateToDisk(state, FLUSH_STATE_IF_NEEDED))
         return false;
-    // Resurrect mempool transactions from the disconnected block.
-    std::vector<uint256> vHashUpdate;
-    BOOST_FOREACH(const CTransaction &tx, block.vtx) {
-        // ignore validation errors in resurrected transactions
-        list<CTransaction> removed;
-        CValidationState stateDummy;
-        if (tx.IsCoinBase() || !AcceptToMemoryPool(mempool, stateDummy, tx, false, NULL, true)) {
-            mempool.removeRecursive(tx, removed);
-        } else if (mempool.exists(tx.GetHash())) {
-            vHashUpdate.push_back(tx.GetHash());
-        }
-    }
-    // AcceptToMemoryPool/addUnchecked all assume that new mempool entries have
-    // no in-mempool children, which is generally not true when adding
-    // previously-confirmed transactions back to the mempool.
-    // UpdateTransactionsFromBlock finds descendants of any transactions in this
-    // block that were added back and cleans up the mempool state.
-    mempool.UpdateTransactionsFromBlock(vHashUpdate);
+
+    if (!fBare) {
+        // Resurrect mempool transactions from the disconnected block.
+        std::vector<uint256> vHashUpdate;
+        BOOST_FOREACH(const CTransaction &tx, block.vtx) {
+            // ignore validation errors in resurrected transactions
+            list<CTransaction> removed;
+            CValidationState stateDummy;
+            if (tx.IsCoinBase() || !AcceptToMemoryPool(mempool, stateDummy, tx, false, NULL, true)) {
+                mempool.removeRecursive(tx, removed);
+            } else if (mempool.exists(tx.GetHash())) {
+                vHashUpdate.push_back(tx.GetHash());
+            }
+        }
+        // AcceptToMemoryPool/addUnchecked all assume that new mempool entries have
+        // no in-mempool children, which is generally not true when adding
+        // previously-confirmed transactions back to the mempool.
+        // UpdateTransactionsFromBlock finds descendants of any transactions in this
+        // block that were added back and cleans up the mempool state.
+        mempool.UpdateTransactionsFromBlock(vHashUpdate);
+    }
+
     // Update chainActive and related variables.
     UpdateTip(pindexDelete->pprev, chainparams);
     // Let wallets know transactions went from 1-confirmed to
@@ -3266,6 +3273,9 @@ bool ReceivedBlockTransactions(const CBlock &block, CValidationState& state, CBl
     pindexNew->nDataPos = pos.nPos;
     pindexNew->nUndoPos = 0;
     pindexNew->nStatus |= BLOCK_HAVE_DATA;
+    if (IsWitnessEnabled(pindexNew->pprev, Params().GetConsensus())) {
+        pindexNew->nStatus |= BLOCK_OPT_WITNESS;
+    }
     pindexNew->RaiseValidity(BLOCK_VALID_TRANSACTIONS);
     setDirtyBlockIndex.insert(pindexNew);
 
@@ -4214,6 +4224,90 @@ bool CVerifyDB::VerifyDB(const CChainParams& chainparams, CCoinsView *coinsview,
     return true;
 }
 
+bool RewindBlockIndex(const CChainParams& params)
+{
+    LOCK(cs_main);
+
+    int nHeight = 1;
+    while (nHeight <= chainActive.Height()) {
+        if (IsWitnessEnabled(chainActive[nHeight - 1], params.GetConsensus()) && !(chainActive[nHeight]->nStatus & BLOCK_OPT_WITNESS)) {
+            break;
+        }
+        nHeight++;
+    }
+
+    // nHeight is now the height of the first insufficiently-validated block, or tipheight + 1
+    CValidationState state;
+    CBlockIndex* pindex = chainActive.Tip();
+    while (chainActive.Height() >= nHeight) {
+        if (fPruneMode && !(chainActive.Tip()->nStatus & BLOCK_HAVE_DATA)) {
+            // If pruning, don't try rewinding past the HAVE_DATA point;
+            // since older blocks can't be served anyway, there's
+            // no need to walk further, and trying to DisconnectTip()
+            // will fail (and require a needless reindex/redownload
+            // of the blockchain).
+            break;
+        }
+        if (!DisconnectTip(state, params, true)) {
+            return error("RewindBlockIndex: unable to disconnect block at height %i", pindex->nHeight);
+        }
+        // Occasionally flush state to disk.
+        if (!FlushStateToDisk(state, FLUSH_STATE_PERIODIC))
+            return false;
+    }
+
+    // Reduce validity flag and have-data flags.
+    // We do this after actual disconnecting, otherwise we'll end up writing the lack of data
+    // to disk before writing the chainstate, resulting in a failure to continue if interrupted.
+    for (BlockMap::iterator it = mapBlockIndex.begin(); it != mapBlockIndex.end(); it++) {
+        CBlockIndex* pindexIter = it->second;
+
+        // Note: If we encounter an insufficiently validated block that
+        // is on chainActive, it must be because we are a pruning node, and
+        // this block or some successor doesn't HAVE_DATA, so we were unable to
+        // rewind all the way.  Blocks remaining on chainActive at this point
+        // must not have their validity reduced.
+        if (IsWitnessEnabled(pindexIter->pprev, params.GetConsensus()) && !(pindexIter->nStatus & BLOCK_OPT_WITNESS) && !chainActive.Contains(pindexIter)) {
+            // Reduce validity
+            pindexIter->nStatus = std::min<unsigned int>(pindexIter->nStatus & BLOCK_VALID_MASK, BLOCK_VALID_TREE) | (pindexIter->nStatus & ~BLOCK_VALID_MASK);
+            // Remove have-data flags.
+            pindexIter->nStatus &= ~(BLOCK_HAVE_DATA | BLOCK_HAVE_UNDO);
+            // Remove storage location.
+            pindexIter->nFile = 0;
+            pindexIter->nDataPos = 0;
+            pindexIter->nUndoPos = 0;
+            // Remove various other things
+            pindexIter->nTx = 0;
+            pindexIter->nChainTx = 0;
+            pindexIter->nSequenceId = 0;
+            // Make sure it gets written.
+            setDirtyBlockIndex.insert(pindexIter);
+            // Update indexes
+            setBlockIndexCandidates.erase(pindexIter);
+            std::pair<std::multimap<CBlockIndex*, CBlockIndex*>::iterator, std::multimap<CBlockIndex*, CBlockIndex*>::iterator> ret = mapBlocksUnlinked.equal_range(pindexIter->pprev);
+            while (ret.first != ret.second) {
+                if (ret.first->second == pindexIter) {
+                    mapBlocksUnlinked.erase(ret.first++);
+                } else {
+                    ++ret.first;
+                }
+            }
+        } else if (pindexIter->IsValid(BLOCK_VALID_TRANSACTIONS) && pindexIter->nChainTx) {
+            setBlockIndexCandidates.insert(pindexIter);
+        }
+    }
+
+    PruneBlockIndexCandidates();
+
+    CheckBlockIndex(params.GetConsensus());
+
+    if (!FlushStateToDisk(state, FLUSH_STATE_ALWAYS)) {
+        return false;
+    }
+
+    return true;
+}
+
 void UnloadBlockIndex()
 {
     LOCK(cs_main);
diff --git a/src/main.h b/src/main.h
index 317470e3c8694..84a6044bc9dde 100644
--- a/src/main.h
+++ b/src/main.h
@@ -459,6 +459,9 @@ bool TestBlockValidity(CValidationState& state, const CChainParams& chainparams,
 /** Check whether witness commitments are required for block. */
 bool IsWitnessEnabled(const CBlockIndex* pindexPrev, const Consensus::Params& params);
 
+/** When there are blocks in the active chain with missing data, rewind the chainstate and remove them from the block index */
+bool RewindBlockIndex(const CChainParams& params);
+
 /** Update uncommitted block structures (currently: only the witness nonce). This is safe for submitted blocks. */
 void UpdateUncommittedBlockStructures(CBlock& block, const CBlockIndex* pindexPrev, const Consensus::Params& consensusParams);
 

From af87a67eff8ce7bf2c7fb29f760da9fc610f162f Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Wed, 22 Jun 2016 15:39:26 +0200
Subject: [PATCH 0547/1802] Do not use compact blocks when segwit is enabled

---
 src/main.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index ec43a667017e3..d1ba70313e3b3 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -473,6 +473,10 @@ void UpdateBlockAvailability(NodeId nodeid, const uint256 &hash) {
 }
 
 void MaybeSetPeerAsAnnouncingHeaderAndIDs(const CNodeState* nodestate, CNode* pfrom) {
+    if (nLocalServices & NODE_WITNESS) {
+        // Don't ever request compact blocks when segwit is enabled.
+        return;
+    }
     if (nodestate->fProvidesHeaderAndIDs) {
         BOOST_FOREACH(const NodeId nodeid, lNodesAnnouncingHeaderAndIDs)
             if (nodeid == pfrom->GetId())
@@ -5286,7 +5290,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
                         nodestate->nBlocksInFlight < MAX_BLOCKS_IN_TRANSIT_PER_PEER &&
                         (!IsWitnessEnabled(chainActive.Tip(), chainparams.GetConsensus()) || State(pfrom->GetId())->fHaveWitness)) {
                         inv.type |= nFetchFlags;
-                        if (nodestate->fProvidesHeaderAndIDs)
+                        if (nodestate->fProvidesHeaderAndIDs && !(nLocalServices & NODE_WITNESS))
                             vToFetch.push_back(CInv(MSG_CMPCT_BLOCK, inv.hash));
                         else
                             vToFetch.push_back(inv);
@@ -5905,7 +5909,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
                             pindexLast->GetBlockHash().ToString(), pindexLast->nHeight);
                 }
                 if (vGetData.size() > 0) {
-                    if (nodestate->fProvidesHeaderAndIDs && vGetData.size() == 1 && mapBlocksInFlight.size() == 1 && pindexLast->pprev->IsValid(BLOCK_VALID_CHAIN)) {
+                    if (nodestate->fProvidesHeaderAndIDs && vGetData.size() == 1 && mapBlocksInFlight.size() == 1 && pindexLast->pprev->IsValid(BLOCK_VALID_CHAIN) && !(nLocalServices & NODE_WITNESS)) {
                         // We seem to be rather well-synced, so it appears pfrom was the first to provide us
                         // with this block! Let's get them to announce using compact blocks in the future.
                         MaybeSetPeerAsAnnouncingHeaderAndIDs(nodestate, pfrom);

From 9757b57c25c67de611b8f5d0a19f409c2e8753a6 Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Thu, 31 Mar 2016 14:43:39 +0200
Subject: [PATCH 0548/1802] --- [SEGWIT] begin: wallet ---


From 605e8473a7ddca13b24a4020c7bd630aa5d374e2 Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Thu, 31 Mar 2016 14:54:58 +0200
Subject: [PATCH 0549/1802] BIP143: Signing logic

---
 src/bitcoin-tx.cpp             |  28 +++-
 src/rpc/rawtransaction.cpp     |  17 +-
 src/script/ismine.cpp          |  19 ++-
 src/script/sign.cpp            | 279 +++++++++++++++++++++++----------
 src/script/sign.h              |  34 ++--
 src/script/standard.cpp        |  41 +++++
 src/script/standard.h          |   3 +
 src/test/DoS_tests.cpp         |   4 +-
 src/test/multisig_tests.cpp    |   2 +-
 src/test/script_P2SH_tests.cpp |  11 +-
 src/test/script_tests.cpp      | 100 ++++++------
 src/wallet/wallet.cpp          |  10 +-
 12 files changed, 382 insertions(+), 166 deletions(-)

diff --git a/src/bitcoin-tx.cpp b/src/bitcoin-tx.cpp
index e77aa6c72eea2..f457ea2bce4d7 100644
--- a/src/bitcoin-tx.cpp
+++ b/src/bitcoin-tx.cpp
@@ -363,6 +363,18 @@ vector<unsigned char> ParseHexUO(map<string,UniValue>& o, string strKey)
     return ParseHexUV(o[strKey], strKey);
 }
 
+static CAmount AmountFromValue(const UniValue& value)
+{
+    if (!value.isNum() && !value.isStr())
+        throw runtime_error("Amount is not a number or string");
+    CAmount amount;
+    if (!ParseFixedPoint(value.getValStr(), 8, &amount))
+        throw runtime_error("Invalid amount");
+    if (!MoneyRange(amount))
+        throw runtime_error("Amount out of range");
+    return amount;
+}
+
 static void MutateTxSign(CMutableTransaction& tx, const string& flagStr)
 {
     int nHashType = SIGHASH_ALL;
@@ -434,7 +446,10 @@ static void MutateTxSign(CMutableTransaction& tx, const string& flagStr)
                 if ((unsigned int)nOut >= coins->vout.size())
                     coins->vout.resize(nOut+1);
                 coins->vout[nOut].scriptPubKey = scriptPubKey;
-                coins->vout[nOut].nValue = 0; // we don't know the actual output value
+                coins->vout[nOut].nValue = 0;
+                if (prevOut.exists("amount")) {
+                    coins->vout[nOut].nValue = AmountFromValue(prevOut["amount"]);
+                }
             }
 
             // if redeemScript given and private keys given,
@@ -464,15 +479,16 @@ static void MutateTxSign(CMutableTransaction& tx, const string& flagStr)
         const CScript& prevPubKey = coins->vout[txin.prevout.n].scriptPubKey;
         const CAmount& amount = coins->vout[txin.prevout.n].nValue;
 
-        txin.scriptSig.clear();
+        SignatureData sigdata;
         // Only sign SIGHASH_SINGLE if there's a corresponding output:
         if (!fHashSingle || (i < mergedTx.vout.size()))
-            SignSignature(keystore, prevPubKey, mergedTx, i, nHashType);
+            ProduceSignature(MutableTransactionSignatureCreator(&keystore, &mergedTx, i, amount, nHashType), prevPubKey, sigdata);
 
         // ... and merge in other signatures:
-        BOOST_FOREACH(const CTransaction& txv, txVariants) {
-            txin.scriptSig = CombineSignatures(prevPubKey, mergedTx, i, amount, txin.scriptSig, txv.vin[i].scriptSig);
-        }
+        BOOST_FOREACH(const CTransaction& txv, txVariants)
+            sigdata = CombineSignatures(prevPubKey, MutableTransactionSignatureChecker(&mergedTx, i, amount), sigdata, DataFromTransaction(txv, i));
+        UpdateTransaction(mergedTx, i, sigdata);
+
         if (!VerifyScript(txin.scriptSig, prevPubKey, mergedTx.wit.vtxinwit.size() > i ? &mergedTx.wit.vtxinwit[i].scriptWitness : NULL, STANDARD_SCRIPT_VERIFY_FLAGS, MutableTransactionSignatureChecker(&mergedTx, i, amount)))
             fComplete = false;
     }
diff --git a/src/rpc/rawtransaction.cpp b/src/rpc/rawtransaction.cpp
index b36179943f4db..56ba805b1f6ab 100644
--- a/src/rpc/rawtransaction.cpp
+++ b/src/rpc/rawtransaction.cpp
@@ -592,7 +592,8 @@ UniValue signrawtransaction(const UniValue& params, bool fHelp)
             "         \"txid\":\"id\",             (string, required) The transaction id\n"
             "         \"vout\":n,                  (numeric, required) The output number\n"
             "         \"scriptPubKey\": \"hex\",   (string, required) script key\n"
-            "         \"redeemScript\": \"hex\"    (string, required for P2SH) redeem script\n"
+            "         \"redeemScript\": \"hex\",   (string, required for P2SH) redeem script\n"
+            "         \"amount\": value            (numeric, required) The amount spent\n"
             "       }\n"
             "       ,...\n"
             "    ]\n"
@@ -735,7 +736,10 @@ UniValue signrawtransaction(const UniValue& params, bool fHelp)
                 if ((unsigned int)nOut >= coins->vout.size())
                     coins->vout.resize(nOut+1);
                 coins->vout[nOut].scriptPubKey = scriptPubKey;
-                coins->vout[nOut].nValue = 0; // we don't know the actual output value
+                coins->vout[nOut].nValue = 0;
+                if (prevOut.exists("amount")) {
+                    coins->vout[nOut].nValue = AmountFromValue(find_value(prevOut, "amount"));
+                }
             }
 
             // if redeemScript given and not using the local wallet (private keys
@@ -801,15 +805,18 @@ UniValue signrawtransaction(const UniValue& params, bool fHelp)
         const CScript& prevPubKey = coins->vout[txin.prevout.n].scriptPubKey;
         const CAmount& amount = coins->vout[txin.prevout.n].nValue;
 
-        txin.scriptSig.clear();
+        SignatureData sigdata;
         // Only sign SIGHASH_SINGLE if there's a corresponding output:
         if (!fHashSingle || (i < mergedTx.vout.size()))
-            SignSignature(keystore, prevPubKey, mergedTx, i, nHashType);
+            ProduceSignature(MutableTransactionSignatureCreator(&keystore, &mergedTx, i, amount, nHashType), prevPubKey, sigdata);
 
         // ... and merge in other signatures:
         BOOST_FOREACH(const CMutableTransaction& txv, txVariants) {
-            txin.scriptSig = CombineSignatures(prevPubKey, txConst, i, amount, txin.scriptSig, txv.vin[i].scriptSig);
+            sigdata = CombineSignatures(prevPubKey, TransactionSignatureChecker(&txConst, i, amount), sigdata, DataFromTransaction(txv, i));
         }
+
+        UpdateTransaction(mergedTx, i, sigdata);
+
         ScriptError serror = SCRIPT_ERR_OK;
         if (!VerifyScript(txin.scriptSig, prevPubKey, mergedTx.wit.vtxinwit.size() > i ? &mergedTx.wit.vtxinwit[i].scriptWitness : NULL, STANDARD_SCRIPT_VERIFY_FLAGS, TransactionSignatureChecker(&txConst, i, amount), &serror)) {
             TxInErrorToJSON(txin, vErrors, ScriptErrorString(serror));
diff --git a/src/script/ismine.cpp b/src/script/ismine.cpp
index 535c56b57a06a..0bf180341e4cc 100644
--- a/src/script/ismine.cpp
+++ b/src/script/ismine.cpp
@@ -57,6 +57,7 @@ isminetype IsMine(const CKeyStore &keystore, const CScript& scriptPubKey)
             return ISMINE_SPENDABLE;
         break;
     case TX_PUBKEYHASH:
+    case TX_WITNESS_V0_KEYHASH:
         keyID = CKeyID(uint160(vSolutions[0]));
         if (keystore.HaveKey(keyID))
             return ISMINE_SPENDABLE;
@@ -72,6 +73,20 @@ isminetype IsMine(const CKeyStore &keystore, const CScript& scriptPubKey)
         }
         break;
     }
+    case TX_WITNESS_V0_SCRIPTHASH:
+    {
+        uint160 hash;
+        CRIPEMD160().Write(&vSolutions[0][0], vSolutions[0].size()).Finalize(hash.begin());
+        CScriptID scriptID = CScriptID(hash);
+        CScript subscript;
+        if (keystore.GetCScript(scriptID, subscript)) {
+            isminetype ret = IsMine(keystore, subscript);
+            if (ret == ISMINE_SPENDABLE)
+                return ret;
+        }
+        break;
+    }
+
     case TX_MULTISIG:
     {
         // Only consider transactions "mine" if we own ALL the
@@ -88,8 +103,8 @@ isminetype IsMine(const CKeyStore &keystore, const CScript& scriptPubKey)
 
     if (keystore.HaveWatchOnly(scriptPubKey)) {
         // TODO: This could be optimized some by doing some work after the above solver
-        CScript scriptSig;
-        return ProduceSignature(DummySignatureCreator(&keystore), scriptPubKey, scriptSig) ? ISMINE_WATCH_SOLVABLE : ISMINE_WATCH_UNSOLVABLE;
+        SignatureData sigs;
+        return ProduceSignature(DummySignatureCreator(&keystore), scriptPubKey, sigs) ? ISMINE_WATCH_SOLVABLE : ISMINE_WATCH_UNSOLVABLE;
     }
     return ISMINE_NO;
 }
diff --git a/src/script/sign.cpp b/src/script/sign.cpp
index 83bb0cfa29f58..87f38d9c72565 100644
--- a/src/script/sign.cpp
+++ b/src/script/sign.cpp
@@ -20,29 +20,29 @@ typedef std::vector<unsigned char> valtype;
 
 TransactionSignatureCreator::TransactionSignatureCreator(const CKeyStore* keystoreIn, const CTransaction* txToIn, unsigned int nInIn, const CAmount& amountIn, int nHashTypeIn) : BaseSignatureCreator(keystoreIn), txTo(txToIn), nIn(nInIn), nHashType(nHashTypeIn), amount(amountIn), checker(txTo, nIn, amountIn) {}
 
-bool TransactionSignatureCreator::CreateSig(std::vector<unsigned char>& vchSig, const CKeyID& address, const CScript& scriptCode) const
+bool TransactionSignatureCreator::CreateSig(std::vector<unsigned char>& vchSig, const CKeyID& address, const CScript& scriptCode, SigVersion sigversion) const
 {
     CKey key;
     if (!keystore->GetKey(address, key))
         return false;
 
-    uint256 hash = SignatureHash(scriptCode, *txTo, nIn, nHashType, amount, SIGVERSION_BASE);
+    uint256 hash = SignatureHash(scriptCode, *txTo, nIn, nHashType, amount, sigversion);
     if (!key.Sign(hash, vchSig))
         return false;
     vchSig.push_back((unsigned char)nHashType);
     return true;
 }
 
-static bool Sign1(const CKeyID& address, const BaseSignatureCreator& creator, const CScript& scriptCode, CScript& scriptSigRet)
+static bool Sign1(const CKeyID& address, const BaseSignatureCreator& creator, const CScript& scriptCode, std::vector<valtype>& ret, SigVersion sigversion)
 {
     vector<unsigned char> vchSig;
-    if (!creator.CreateSig(vchSig, address, scriptCode))
+    if (!creator.CreateSig(vchSig, address, scriptCode, sigversion))
         return false;
-    scriptSigRet << vchSig;
+    ret.push_back(vchSig);
     return true;
 }
 
-static bool SignN(const vector<valtype>& multisigdata, const BaseSignatureCreator& creator, const CScript& scriptCode, CScript& scriptSigRet)
+static bool SignN(const vector<valtype>& multisigdata, const BaseSignatureCreator& creator, const CScript& scriptCode, std::vector<valtype>& ret, SigVersion sigversion)
 {
     int nSigned = 0;
     int nRequired = multisigdata.front()[0];
@@ -50,7 +50,7 @@ static bool SignN(const vector<valtype>& multisigdata, const BaseSignatureCreato
     {
         const valtype& pubkey = multisigdata[i];
         CKeyID keyID = CPubKey(pubkey).GetID();
-        if (Sign1(keyID, creator, scriptCode, scriptSigRet))
+        if (Sign1(keyID, creator, scriptCode, ret, sigversion))
             ++nSigned;
     }
     return nSigned==nRequired;
@@ -63,9 +63,11 @@ static bool SignN(const vector<valtype>& multisigdata, const BaseSignatureCreato
  * Returns false if scriptPubKey could not be completely satisfied.
  */
 static bool SignStep(const BaseSignatureCreator& creator, const CScript& scriptPubKey,
-                     CScript& scriptSigRet, txnouttype& whichTypeRet)
+                     std::vector<valtype>& ret, txnouttype& whichTypeRet, SigVersion sigversion)
 {
-    scriptSigRet.clear();
+    CScript scriptRet;
+    uint160 h160;
+    ret.clear();
 
     vector<valtype> vSolutions;
     if (!Solver(scriptPubKey, whichTypeRet, vSolutions))
@@ -79,62 +81,142 @@ static bool SignStep(const BaseSignatureCreator& creator, const CScript& scriptP
         return false;
     case TX_PUBKEY:
         keyID = CPubKey(vSolutions[0]).GetID();
-        return Sign1(keyID, creator, scriptPubKey, scriptSigRet);
+        return Sign1(keyID, creator, scriptPubKey, ret, sigversion);
     case TX_PUBKEYHASH:
         keyID = CKeyID(uint160(vSolutions[0]));
-        if (!Sign1(keyID, creator, scriptPubKey, scriptSigRet))
+        if (!Sign1(keyID, creator, scriptPubKey, ret, sigversion))
             return false;
         else
         {
             CPubKey vch;
             creator.KeyStore().GetPubKey(keyID, vch);
-            scriptSigRet << ToByteVector(vch);
+            ret.push_back(ToByteVector(vch));
         }
         return true;
     case TX_SCRIPTHASH:
-        return creator.KeyStore().GetCScript(uint160(vSolutions[0]), scriptSigRet);
+        if (creator.KeyStore().GetCScript(uint160(vSolutions[0]), scriptRet)) {
+            ret.push_back(std::vector<unsigned char>(scriptRet.begin(), scriptRet.end()));
+            return true;
+        }
+        return false;
 
     case TX_MULTISIG:
-        scriptSigRet << OP_0; // workaround CHECKMULTISIG bug
-        return (SignN(vSolutions, creator, scriptPubKey, scriptSigRet));
+        ret.push_back(valtype()); // workaround CHECKMULTISIG bug
+        return (SignN(vSolutions, creator, scriptPubKey, ret, sigversion));
+
+    case TX_WITNESS_V0_KEYHASH:
+        ret.push_back(vSolutions[0]);
+        return true;
+
+    case TX_WITNESS_V0_SCRIPTHASH:
+        CRIPEMD160().Write(&vSolutions[0][0], vSolutions[0].size()).Finalize(h160.begin());
+        if (creator.KeyStore().GetCScript(h160, scriptRet)) {
+            ret.push_back(std::vector<unsigned char>(scriptRet.begin(), scriptRet.end()));
+            return true;
+        }
+        return false;
+
+    default:
+        return false;
     }
-    return false;
 }
 
-bool ProduceSignature(const BaseSignatureCreator& creator, const CScript& fromPubKey, CScript& scriptSig)
+static CScript PushAll(const vector<valtype>& values)
 {
+    CScript result;
+    BOOST_FOREACH(const valtype& v, values) {
+        if (v.size() == 0) {
+            result << OP_0;
+        } else if (v.size() == 1 && v[0] >= 1 && v[0] <= 16) {
+            result << CScript::EncodeOP_N(v[0]);
+        } else {
+            result << v;
+        }
+    }
+    return result;
+}
+
+bool ProduceSignature(const BaseSignatureCreator& creator, const CScript& fromPubKey, SignatureData& sigdata)
+{
+    CScript script = fromPubKey;
+    bool solved = true;
+    std::vector<valtype> result;
     txnouttype whichType;
-    if (!SignStep(creator, fromPubKey, scriptSig, whichType))
-        return false;
+    solved = SignStep(creator, script, result, whichType, SIGVERSION_BASE);
+    bool P2SH = false;
+    CScript subscript;
+    sigdata.scriptWitness.stack.clear();
 
-    if (whichType == TX_SCRIPTHASH)
+    if (solved && whichType == TX_SCRIPTHASH)
     {
-        // Solver returns the subscript that need to be evaluated;
+        // Solver returns the subscript that needs to be evaluated;
         // the final scriptSig is the signatures from that
         // and then the serialized subscript:
-        CScript subscript = scriptSig;
+        script = subscript = CScript(result[0].begin(), result[0].end());
+        solved = solved && SignStep(creator, script, result, whichType, SIGVERSION_BASE) && whichType != TX_SCRIPTHASH;
+        P2SH = true;
+    }
 
+    if (solved && whichType == TX_WITNESS_V0_KEYHASH)
+    {
+        CScript witnessscript;
+        witnessscript << OP_DUP << OP_HASH160 << ToByteVector(result[0]) << OP_EQUALVERIFY << OP_CHECKSIG;
         txnouttype subType;
-        bool fSolved =
-            SignStep(creator, subscript, scriptSig, subType) && subType != TX_SCRIPTHASH;
-        // Append serialized subscript whether or not it is completely signed:
-        scriptSig << valtype(subscript.begin(), subscript.end());
-        if (!fSolved) return false;
+        solved = solved && SignStep(creator, witnessscript, result, subType, SIGVERSION_WITNESS_V0);
+        sigdata.scriptWitness.stack = result;
+        result.clear();
+    }
+    else if (solved && whichType == TX_WITNESS_V0_SCRIPTHASH)
+    {
+        CScript witnessscript(result[0].begin(), result[0].end());
+        txnouttype subType;
+        solved = solved && SignStep(creator, witnessscript, result, subType, SIGVERSION_WITNESS_V0) && subType != TX_SCRIPTHASH && subType != TX_WITNESS_V0_SCRIPTHASH && subType != TX_WITNESS_V0_KEYHASH;
+        result.push_back(std::vector<unsigned char>(witnessscript.begin(), witnessscript.end()));
+        sigdata.scriptWitness.stack = result;
+        result.clear();
     }
 
+    if (P2SH) {
+        result.push_back(std::vector<unsigned char>(subscript.begin(), subscript.end()));
+    }
+    sigdata.scriptSig = PushAll(result);
+
     // Test solution
-    return VerifyScript(scriptSig, fromPubKey, NULL, STANDARD_SCRIPT_VERIFY_FLAGS, creator.Checker());
+    return solved && VerifyScript(sigdata.scriptSig, fromPubKey, &sigdata.scriptWitness, STANDARD_SCRIPT_VERIFY_FLAGS, creator.Checker());
+}
+
+SignatureData DataFromTransaction(const CMutableTransaction& tx, unsigned int nIn)
+{
+    SignatureData data;
+    assert(tx.vin.size() > nIn);
+    data.scriptSig = tx.vin[nIn].scriptSig;
+    if (tx.wit.vtxinwit.size() > nIn) {
+        data.scriptWitness = tx.wit.vtxinwit[nIn].scriptWitness;
+    }
+    return data;
+}
+
+void UpdateTransaction(CMutableTransaction& tx, unsigned int nIn, const SignatureData& data)
+{
+    assert(tx.vin.size() > nIn);
+    tx.vin[nIn].scriptSig = data.scriptSig;
+    if (!data.scriptWitness.IsNull() || tx.wit.vtxinwit.size() > nIn) {
+        tx.wit.vtxinwit.resize(tx.vin.size());
+        tx.wit.vtxinwit[nIn].scriptWitness = data.scriptWitness;
+    }
 }
 
-bool SignSignature(const CKeyStore &keystore, const CScript& fromPubKey, CMutableTransaction& txTo, unsigned int nIn, int nHashType)
+bool SignSignature(const CKeyStore &keystore, const CScript& fromPubKey, CMutableTransaction& txTo, unsigned int nIn, const CAmount& amount, int nHashType)
 {
     assert(nIn < txTo.vin.size());
-    CTxIn& txin = txTo.vin[nIn];
 
     CTransaction txToConst(txTo);
-    TransactionSignatureCreator creator(&keystore, &txToConst, nIn, nHashType);
+    TransactionSignatureCreator creator(&keystore, &txToConst, nIn, amount, nHashType);
 
-    return ProduceSignature(creator, fromPubKey, txin.scriptSig);
+    SignatureData sigdata;
+    bool ret = ProduceSignature(creator, fromPubKey, sigdata);
+    UpdateTransaction(txTo, nIn, sigdata);
+    return ret;
 }
 
 bool SignSignature(const CKeyStore &keystore, const CTransaction& txFrom, CMutableTransaction& txTo, unsigned int nIn, int nHashType)
@@ -144,20 +226,12 @@ bool SignSignature(const CKeyStore &keystore, const CTransaction& txFrom, CMutab
     assert(txin.prevout.n < txFrom.vout.size());
     const CTxOut& txout = txFrom.vout[txin.prevout.n];
 
-    return SignSignature(keystore, txout.scriptPubKey, txTo, nIn, nHashType);
-}
-
-static CScript PushAll(const vector<valtype>& values)
-{
-    CScript result;
-    BOOST_FOREACH(const valtype& v, values)
-        result << v;
-    return result;
+    return SignSignature(keystore, txout.scriptPubKey, txTo, nIn, txout.nValue, nHashType);
 }
 
-static CScript CombineMultisig(const CScript& scriptPubKey, const BaseSignatureChecker& checker,
+static vector<valtype> CombineMultisig(const CScript& scriptPubKey, const BaseSignatureChecker& checker,
                                const vector<valtype>& vSolutions,
-                               const vector<valtype>& sigs1, const vector<valtype>& sigs2)
+                               const vector<valtype>& sigs1, const vector<valtype>& sigs2, SigVersion sigversion)
 {
     // Combine all the signatures we've got:
     set<valtype> allsigs;
@@ -185,7 +259,7 @@ static CScript CombineMultisig(const CScript& scriptPubKey, const BaseSignatureC
             if (sigs.count(pubkey))
                 continue; // Already got a sig for this pubkey
 
-            if (checker.CheckSig(sig, pubkey, scriptPubKey, SIGVERSION_BASE))
+            if (checker.CheckSig(sig, pubkey, scriptPubKey, sigversion))
             {
                 sigs[pubkey] = sig;
                 break;
@@ -194,87 +268,126 @@ static CScript CombineMultisig(const CScript& scriptPubKey, const BaseSignatureC
     }
     // Now build a merged CScript:
     unsigned int nSigsHave = 0;
-    CScript result; result << OP_0; // pop-one-too-many workaround
+    std::vector<valtype> result; result.push_back(valtype()); // pop-one-too-many workaround
     for (unsigned int i = 0; i < nPubKeys && nSigsHave < nSigsRequired; i++)
     {
         if (sigs.count(vSolutions[i+1]))
         {
-            result << sigs[vSolutions[i+1]];
+            result.push_back(sigs[vSolutions[i+1]]);
             ++nSigsHave;
         }
     }
     // Fill any missing with OP_0:
     for (unsigned int i = nSigsHave; i < nSigsRequired; i++)
-        result << OP_0;
+        result.push_back(valtype());
 
     return result;
 }
 
-static CScript CombineSignatures(const CScript& scriptPubKey, const BaseSignatureChecker& checker,
+namespace
+{
+struct Stacks
+{
+    std::vector<valtype> script;
+    std::vector<valtype> witness;
+
+    Stacks() {}
+    explicit Stacks(const std::vector<valtype>& scriptSigStack_) : script(scriptSigStack_), witness() {}
+    explicit Stacks(const SignatureData& data) : witness(data.scriptWitness.stack) {
+        EvalScript(script, data.scriptSig, SCRIPT_VERIFY_STRICTENC, BaseSignatureChecker(), SIGVERSION_BASE);
+    }
+
+    SignatureData Output() const {
+        SignatureData result;
+        result.scriptSig = PushAll(script);
+        result.scriptWitness.stack = witness;
+        return result;
+    }
+};
+}
+
+static Stacks CombineSignatures(const CScript& scriptPubKey, const BaseSignatureChecker& checker,
                                  const txnouttype txType, const vector<valtype>& vSolutions,
-                                 vector<valtype>& sigs1, vector<valtype>& sigs2)
+                                 Stacks sigs1, Stacks sigs2, SigVersion sigversion)
 {
     switch (txType)
     {
     case TX_NONSTANDARD:
     case TX_NULL_DATA:
         // Don't know anything about this, assume bigger one is correct:
-        if (sigs1.size() >= sigs2.size())
-            return PushAll(sigs1);
-        return PushAll(sigs2);
+        if (sigs1.script.size() >= sigs2.script.size())
+            return sigs1;
+        return sigs2;
     case TX_PUBKEY:
     case TX_PUBKEYHASH:
         // Signatures are bigger than placeholders or empty scripts:
-        if (sigs1.empty() || sigs1[0].empty())
-            return PushAll(sigs2);
-        return PushAll(sigs1);
+        if (sigs1.script.empty() || sigs1.script[0].empty())
+            return sigs2;
+        return sigs1;
+    case TX_WITNESS_V0_KEYHASH:
+        // Signatures are bigger than placeholders or empty scripts:
+        if (sigs1.witness.empty() || sigs1.witness[0].empty())
+            return sigs2;
+        return sigs1;
     case TX_SCRIPTHASH:
-        if (sigs1.empty() || sigs1.back().empty())
-            return PushAll(sigs2);
-        else if (sigs2.empty() || sigs2.back().empty())
-            return PushAll(sigs1);
+        if (sigs1.script.empty() || sigs1.script.back().empty())
+            return sigs2;
+        else if (sigs2.script.empty() || sigs2.script.back().empty())
+            return sigs1;
         else
         {
             // Recur to combine:
-            valtype spk = sigs1.back();
+            valtype spk = sigs1.script.back();
             CScript pubKey2(spk.begin(), spk.end());
 
             txnouttype txType2;
             vector<vector<unsigned char> > vSolutions2;
             Solver(pubKey2, txType2, vSolutions2);
-            sigs1.pop_back();
-            sigs2.pop_back();
-            CScript result = CombineSignatures(pubKey2, checker, txType2, vSolutions2, sigs1, sigs2);
-            result << spk;
+            sigs1.script.pop_back();
+            sigs2.script.pop_back();
+            Stacks result = CombineSignatures(pubKey2, checker, txType2, vSolutions2, sigs1, sigs2, sigversion);
+            result.script.push_back(spk);
             return result;
         }
     case TX_MULTISIG:
-        return CombineMultisig(scriptPubKey, checker, vSolutions, sigs1, sigs2);
+        return Stacks(CombineMultisig(scriptPubKey, checker, vSolutions, sigs1.script, sigs2.script, sigversion));
+    case TX_WITNESS_V0_SCRIPTHASH:
+        if (sigs1.witness.empty() || sigs1.witness.back().empty())
+            return sigs2;
+        else if (sigs2.witness.empty() || sigs2.witness.back().empty())
+            return sigs1;
+        else
+        {
+            // Recur to combine:
+            CScript pubKey2(sigs1.witness.back().begin(), sigs1.witness.back().end());
+            txnouttype txType2;
+            vector<valtype> vSolutions2;
+            Solver(pubKey2, txType2, vSolutions2);
+            sigs1.witness.pop_back();
+            sigs1.script = sigs1.witness;
+            sigs1.witness.clear();
+            sigs2.witness.pop_back();
+            sigs2.script = sigs2.witness;
+            sigs2.witness.clear();
+            Stacks result = CombineSignatures(pubKey2, checker, txType2, vSolutions2, sigs1, sigs2, SIGVERSION_WITNESS_V0);
+            result.witness = result.script;
+            result.script.clear();
+            result.witness.push_back(valtype(pubKey2.begin(), pubKey2.end()));
+            return result;
+        }
+    default:
+        return Stacks();
     }
-
-    return CScript();
 }
 
-CScript CombineSignatures(const CScript& scriptPubKey, const CTransaction& txTo, unsigned int nIn, const CAmount& amount,
-                          const CScript& scriptSig1, const CScript& scriptSig2)
-{
-    TransactionSignatureChecker checker(&txTo, nIn, amount);
-    return CombineSignatures(scriptPubKey, checker, scriptSig1, scriptSig2);
-}
-
-CScript CombineSignatures(const CScript& scriptPubKey, const BaseSignatureChecker& checker,
-                          const CScript& scriptSig1, const CScript& scriptSig2)
+SignatureData CombineSignatures(const CScript& scriptPubKey, const BaseSignatureChecker& checker,
+                          const SignatureData& scriptSig1, const SignatureData& scriptSig2)
 {
     txnouttype txType;
     vector<vector<unsigned char> > vSolutions;
     Solver(scriptPubKey, txType, vSolutions);
 
-    vector<valtype> stack1;
-    EvalScript(stack1, scriptSig1, SCRIPT_VERIFY_STRICTENC, BaseSignatureChecker(), SIGVERSION_BASE);
-    vector<valtype> stack2;
-    EvalScript(stack2, scriptSig2, SCRIPT_VERIFY_STRICTENC, BaseSignatureChecker(), SIGVERSION_BASE);
-
-    return CombineSignatures(scriptPubKey, checker, txType, vSolutions, stack1, stack2);
+    return CombineSignatures(scriptPubKey, checker, txType, vSolutions, Stacks(scriptSig1), Stacks(scriptSig2), SIGVERSION_BASE).Output();
 }
 
 namespace {
@@ -297,7 +410,7 @@ const BaseSignatureChecker& DummySignatureCreator::Checker() const
     return dummyChecker;
 }
 
-bool DummySignatureCreator::CreateSig(std::vector<unsigned char>& vchSig, const CKeyID& keyid, const CScript& scriptCode) const
+bool DummySignatureCreator::CreateSig(std::vector<unsigned char>& vchSig, const CKeyID& keyid, const CScript& scriptCode, SigVersion sigversion) const
 {
     // Create a dummy signature that is a valid DER-encoding
     vchSig.assign(72, '\000');
diff --git a/src/script/sign.h b/src/script/sign.h
index f54511f7a67f5..6404b4523ecaa 100644
--- a/src/script/sign.h
+++ b/src/script/sign.h
@@ -27,7 +27,7 @@ class BaseSignatureCreator {
     virtual const BaseSignatureChecker& Checker() const =0;
 
     /** Create a singular (non-script) signature. */
-    virtual bool CreateSig(std::vector<unsigned char>& vchSig, const CKeyID& keyid, const CScript& scriptCode) const =0;
+    virtual bool CreateSig(std::vector<unsigned char>& vchSig, const CKeyID& keyid, const CScript& scriptCode, SigVersion sigversion) const =0;
 };
 
 /** A signature creator for transactions. */
@@ -41,7 +41,14 @@ class TransactionSignatureCreator : public BaseSignatureCreator {
 public:
     TransactionSignatureCreator(const CKeyStore* keystoreIn, const CTransaction* txToIn, unsigned int nInIn, const CAmount& amountIn, int nHashTypeIn=SIGHASH_ALL);
     const BaseSignatureChecker& Checker() const { return checker; }
-    bool CreateSig(std::vector<unsigned char>& vchSig, const CKeyID& keyid, const CScript& scriptCode) const;
+    bool CreateSig(std::vector<unsigned char>& vchSig, const CKeyID& keyid, const CScript& scriptCode, SigVersion sigversion) const;
+};
+
+class MutableTransactionSignatureCreator : public TransactionSignatureCreator {
+    CTransaction tx;
+
+public:
+    MutableTransactionSignatureCreator(const CKeyStore* keystoreIn, const CMutableTransaction* txToIn, unsigned int nInIn, const CAmount& amount, int nHashTypeIn) : TransactionSignatureCreator(keystoreIn, &tx, nInIn, amount, nHashTypeIn), tx(*txToIn) {}
 };
 
 /** A signature creator that just produces 72-byte empty signatyres. */
@@ -49,20 +56,29 @@ class DummySignatureCreator : public BaseSignatureCreator {
 public:
     DummySignatureCreator(const CKeyStore* keystoreIn) : BaseSignatureCreator(keystoreIn) {}
     const BaseSignatureChecker& Checker() const;
-    bool CreateSig(std::vector<unsigned char>& vchSig, const CKeyID& keyid, const CScript& scriptCode) const;
+    bool CreateSig(std::vector<unsigned char>& vchSig, const CKeyID& keyid, const CScript& scriptCode, SigVersion sigversion) const;
+};
+
+struct SignatureData {
+    CScript scriptSig;
+    CScriptWitness scriptWitness;
+
+    SignatureData() {}
+    explicit SignatureData(const CScript& script) : scriptSig(script) {}
 };
 
 /** Produce a script signature using a generic signature creator. */
-bool ProduceSignature(const BaseSignatureCreator& creator, const CScript& scriptPubKey, CScript& scriptSig);
+bool ProduceSignature(const BaseSignatureCreator& creator, const CScript& scriptPubKey, SignatureData& sigdata);
 
 /** Produce a script signature for a transaction. */
-bool SignSignature(const CKeyStore& keystore, const CScript& fromPubKey, CMutableTransaction& txTo, unsigned int nIn, int nHashType=SIGHASH_ALL);
-bool SignSignature(const CKeyStore& keystore, const CTransaction& txFrom, CMutableTransaction& txTo, unsigned int nIn, int nHashType=SIGHASH_ALL);
+bool SignSignature(const CKeyStore &keystore, const CScript& fromPubKey, CMutableTransaction& txTo, unsigned int nIn, const CAmount& amount, int nHashType);
+bool SignSignature(const CKeyStore& keystore, const CTransaction& txFrom, CMutableTransaction& txTo, unsigned int nIn, int nHashType);
 
 /** Combine two script signatures using a generic signature checker, intelligently, possibly with OP_0 placeholders. */
-CScript CombineSignatures(const CScript& scriptPubKey, const BaseSignatureChecker& checker, const CScript& scriptSig1, const CScript& scriptSig2);
+SignatureData CombineSignatures(const CScript& scriptPubKey, const BaseSignatureChecker& checker, const SignatureData& scriptSig1, const SignatureData& scriptSig2);
 
-/** Combine two script signatures on transactions. */
-CScript CombineSignatures(const CScript& scriptPubKey, const CTransaction& txTo, unsigned int nIn, const CAmount& amount, const CScript& scriptSig1, const CScript& scriptSig2);
+/** Extract signature data from a transaction, and insert it. */
+SignatureData DataFromTransaction(const CMutableTransaction& tx, unsigned int nIn);
+void UpdateTransaction(CMutableTransaction& tx, unsigned int nIn, const SignatureData& data);
 
 #endif // BITCOIN_SCRIPT_SIGN_H
diff --git a/src/script/standard.cpp b/src/script/standard.cpp
index 67b6af327ae37..bb178f49fe9f2 100644
--- a/src/script/standard.cpp
+++ b/src/script/standard.cpp
@@ -31,6 +31,8 @@ const char* GetTxnOutputType(txnouttype t)
     case TX_SCRIPTHASH: return "scripthash";
     case TX_MULTISIG: return "multisig";
     case TX_NULL_DATA: return "nulldata";
+    case TX_WITNESS_V0_KEYHASH: return "witness_v0_keyhash";
+    case TX_WITNESS_V0_SCRIPTHASH: return "witness_v0_scripthash";
     }
     return NULL;
 }
@@ -66,6 +68,22 @@ bool Solver(const CScript& scriptPubKey, txnouttype& typeRet, vector<vector<unsi
         return true;
     }
 
+    int witnessversion;
+    std::vector<unsigned char> witnessprogram;
+    if (scriptPubKey.IsWitnessProgram(witnessversion, witnessprogram)) {
+        if (witnessversion == 0 && witnessprogram.size() == 20) {
+            typeRet = TX_WITNESS_V0_KEYHASH;
+            vSolutionsRet.push_back(witnessprogram);
+            return true;
+        }
+        if (witnessversion == 0 && witnessprogram.size() == 32) {
+            typeRet = TX_WITNESS_V0_SCRIPTHASH;
+            vSolutionsRet.push_back(witnessprogram);
+            return true;
+        }
+        return false;
+    }
+
     // Provably prunable, data-carrying output
     //
     // So long as script passes the IsUnspendable() test and all but the first
@@ -282,3 +300,26 @@ CScript GetScriptForMultisig(int nRequired, const std::vector<CPubKey>& keys)
     script << CScript::EncodeOP_N(keys.size()) << OP_CHECKMULTISIG;
     return script;
 }
+
+CScript GetScriptForWitness(const CScript& redeemscript)
+{
+    CScript ret;
+
+    txnouttype typ;
+    std::vector<std::vector<unsigned char> > vSolutions;
+    if (Solver(redeemscript, typ, vSolutions)) {
+        if (typ == TX_PUBKEY) {
+            unsigned char h160[20];
+            CHash160().Write(&vSolutions[0][0], vSolutions[0].size()).Finalize(h160);
+            ret << OP_0 << std::vector<unsigned char>(&h160[0], &h160[20]);
+            return ret;
+        } else if (typ == TX_PUBKEYHASH) {
+           ret << OP_0 << vSolutions[0];
+           return ret;
+        }
+    }
+    uint256 hash;
+    CSHA256().Write(&redeemscript[0], redeemscript.size()).Finalize(hash.begin());
+    ret << OP_0 << ToByteVector(hash);
+    return ret;
+}
diff --git a/src/script/standard.h b/src/script/standard.h
index f348da8e1982b..72aaea0b7bebe 100644
--- a/src/script/standard.h
+++ b/src/script/standard.h
@@ -51,6 +51,8 @@ enum txnouttype
     TX_SCRIPTHASH,
     TX_MULTISIG,
     TX_NULL_DATA,
+    TX_WITNESS_V0_SCRIPTHASH,
+    TX_WITNESS_V0_KEYHASH,
 };
 
 class CNoDestination {
@@ -77,5 +79,6 @@ bool ExtractDestinations(const CScript& scriptPubKey, txnouttype& typeRet, std::
 CScript GetScriptForDestination(const CTxDestination& dest);
 CScript GetScriptForRawPubKey(const CPubKey& pubkey);
 CScript GetScriptForMultisig(int nRequired, const std::vector<CPubKey>& keys);
+CScript GetScriptForWitness(const CScript& redeemscript);
 
 #endif // BITCOIN_SCRIPT_STANDARD_H
diff --git a/src/test/DoS_tests.cpp b/src/test/DoS_tests.cpp
index 93f7ae09da741..a8c5f95ace4af 100644
--- a/src/test/DoS_tests.cpp
+++ b/src/test/DoS_tests.cpp
@@ -148,7 +148,7 @@ BOOST_AUTO_TEST_CASE(DoS_mapOrphans)
         tx.vout.resize(1);
         tx.vout[0].nValue = 1*CENT;
         tx.vout[0].scriptPubKey = GetScriptForDestination(key.GetPubKey().GetID());
-        SignSignature(keystore, txPrev, tx, 0);
+        SignSignature(keystore, txPrev, tx, 0, SIGHASH_ALL);
 
         AddOrphanTx(tx, i);
     }
@@ -168,7 +168,7 @@ BOOST_AUTO_TEST_CASE(DoS_mapOrphans)
             tx.vin[j].prevout.n = j;
             tx.vin[j].prevout.hash = txPrev.GetHash();
         }
-        SignSignature(keystore, txPrev, tx, 0);
+        SignSignature(keystore, txPrev, tx, 0, SIGHASH_ALL);
         // Re-use same signature for other inputs
         // (they don't have to be valid for this test)
         for (unsigned int j = 1; j < tx.vin.size(); j++)
diff --git a/src/test/multisig_tests.cpp b/src/test/multisig_tests.cpp
index 876b90e4b99ed..581b0cee1ec87 100644
--- a/src/test/multisig_tests.cpp
+++ b/src/test/multisig_tests.cpp
@@ -303,7 +303,7 @@ BOOST_AUTO_TEST_CASE(multisig_Sign)
 
     for (int i = 0; i < 3; i++)
     {
-        BOOST_CHECK_MESSAGE(SignSignature(keystore, txFrom, txTo[i], 0), strprintf("SignSignature %d", i));
+        BOOST_CHECK_MESSAGE(SignSignature(keystore, txFrom, txTo[i], 0, SIGHASH_ALL), strprintf("SignSignature %d", i));
     }
 }
 
diff --git a/src/test/script_P2SH_tests.cpp b/src/test/script_P2SH_tests.cpp
index 62deb736aad22..5224b57ca4479 100644
--- a/src/test/script_P2SH_tests.cpp
+++ b/src/test/script_P2SH_tests.cpp
@@ -2,6 +2,7 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
+#include "core_io.h"
 #include "key.h"
 #include "keystore.h"
 #include "main.h"
@@ -102,7 +103,7 @@ BOOST_AUTO_TEST_CASE(sign)
     }
     for (int i = 0; i < 8; i++)
     {
-        BOOST_CHECK_MESSAGE(SignSignature(keystore, txFrom, txTo[i], 0), strprintf("SignSignature %d", i));
+        BOOST_CHECK_MESSAGE(SignSignature(keystore, txFrom, txTo[i], 0, SIGHASH_ALL), strprintf("SignSignature %d", i));
     }
     // All of the above should be OK, and the txTos have valid signatures
     // Check to make sure signature verification fails if we use the wrong ScriptSig:
@@ -197,7 +198,7 @@ BOOST_AUTO_TEST_CASE(set)
     }
     for (int i = 0; i < 4; i++)
     {
-        BOOST_CHECK_MESSAGE(SignSignature(keystore, txFrom, txTo[i], 0), strprintf("SignSignature %d", i));
+        BOOST_CHECK_MESSAGE(SignSignature(keystore, txFrom, txTo[i], 0, SIGHASH_ALL), strprintf("SignSignature %d", i));
         BOOST_CHECK_MESSAGE(IsStandardTx(txTo[i], reason), strprintf("txTo[%d].IsStandard", i));
     }
 }
@@ -326,9 +327,9 @@ BOOST_AUTO_TEST_CASE(AreInputsStandard)
         txTo.vin[i].prevout.n = i;
         txTo.vin[i].prevout.hash = txFrom.GetHash();
     }
-    BOOST_CHECK(SignSignature(keystore, txFrom, txTo, 0));
-    BOOST_CHECK(SignSignature(keystore, txFrom, txTo, 1));
-    BOOST_CHECK(SignSignature(keystore, txFrom, txTo, 2));
+    BOOST_CHECK(SignSignature(keystore, txFrom, txTo, 0, SIGHASH_ALL));
+    BOOST_CHECK(SignSignature(keystore, txFrom, txTo, 1, SIGHASH_ALL));
+    BOOST_CHECK(SignSignature(keystore, txFrom, txTo, 2, SIGHASH_ALL));
     // SignSignature doesn't know how to sign these. We're
     // not testing validating signatures, so just create
     // dummy signatures that DO include the correct P2SH scripts:
diff --git a/src/test/script_tests.cpp b/src/test/script_tests.cpp
index 7fd7614e2cfc0..1d69194c3e89c 100644
--- a/src/test/script_tests.cpp
+++ b/src/test/script_tests.cpp
@@ -152,16 +152,16 @@ void DoTest(const CScript& scriptPubKey, const CScript& scriptSig, int flags, co
         flags |= SCRIPT_VERIFY_WITNESS;
     }
     ScriptError err;
-    CMutableTransaction tx = BuildSpendingTransaction(scriptSig, BuildCreditingTransaction(scriptPubKey));
+    CMutableTransaction txCredit = BuildCreditingTransaction(scriptPubKey);
+    CMutableTransaction tx = BuildSpendingTransaction(scriptSig, txCredit);
     CMutableTransaction tx2 = tx;
-    static const CAmount amountZero = 0;
-    BOOST_CHECK_MESSAGE(VerifyScript(scriptSig, scriptPubKey, NULL, flags, MutableTransactionSignatureChecker(&tx, 0, amountZero), &err) == expect, message);
+    BOOST_CHECK_MESSAGE(VerifyScript(scriptSig, scriptPubKey, NULL, flags, MutableTransactionSignatureChecker(&tx, 0, txCredit.vout[0].nValue), &err) == expect, message);
     BOOST_CHECK_MESSAGE(err == scriptError, std::string(FormatScriptError(err)) + " where " + std::string(FormatScriptError((ScriptError_t)scriptError)) + " expected: " + message);
 #if defined(HAVE_CONSENSUS_LIB)
     CDataStream stream(SER_NETWORK, PROTOCOL_VERSION);
     stream << tx2;
     if (flags & bitcoinconsensus_SCRIPT_FLAGS_VERIFY_WITNESS) {
-        BOOST_CHECK_MESSAGE(bitcoinconsensus_verify_script_with_amount(begin_ptr(scriptPubKey), scriptPubKey.size(), amountZero, (const unsigned char*)&stream[0], stream.size(), 0, flags, NULL) == expect, message);
+        BOOST_CHECK_MESSAGE(bitcoinconsensus_verify_script_with_amount(begin_ptr(scriptPubKey), scriptPubKey.size(), txCredit.vout[0].nValue, (const unsigned char*)&stream[0], stream.size(), 0, flags, NULL) == expect, message);
     } else {
         BOOST_CHECK_MESSAGE(bitcoinconsensus_verify_script_with_amount(begin_ptr(scriptPubKey), scriptPubKey.size(), 0, (const unsigned char*)&stream[0], stream.size(), 0, flags, NULL) == expect, message);
         BOOST_CHECK_MESSAGE(bitcoinconsensus_verify_script(begin_ptr(scriptPubKey), scriptPubKey.size(), (const unsigned char*)&stream[0], stream.size(), 0, flags, NULL) == expect,message);
@@ -896,7 +896,7 @@ BOOST_AUTO_TEST_CASE(script_CHECKMULTISIG23)
 BOOST_AUTO_TEST_CASE(script_combineSigs)
 {
     // Test the CombineSignatures function
-    CAmount amount;
+    CAmount amount = 0;
     CBasicKeyStore keystore;
     vector<CKey> keys;
     vector<CPubKey> pubkeys;
@@ -914,50 +914,50 @@ BOOST_AUTO_TEST_CASE(script_combineSigs)
     CScript& scriptPubKey = txFrom.vout[0].scriptPubKey;
     CScript& scriptSig = txTo.vin[0].scriptSig;
 
-    CScript empty;
-    CScript combined = CombineSignatures(scriptPubKey, txTo, 0, amount, empty, empty);
-    BOOST_CHECK(combined.empty());
+    SignatureData empty;
+    SignatureData combined = CombineSignatures(scriptPubKey, MutableTransactionSignatureChecker(&txTo, 0, amount), empty, empty);
+    BOOST_CHECK(combined.scriptSig.empty());
 
     // Single signature case:
-    SignSignature(keystore, txFrom, txTo, 0); // changes scriptSig
-    combined = CombineSignatures(scriptPubKey, txTo, 0, amount, scriptSig, empty);
-    BOOST_CHECK(combined == scriptSig);
-    combined = CombineSignatures(scriptPubKey, txTo, 0, amount, empty, scriptSig);
-    BOOST_CHECK(combined == scriptSig);
+    SignSignature(keystore, txFrom, txTo, 0, SIGHASH_ALL); // changes scriptSig
+    combined = CombineSignatures(scriptPubKey, MutableTransactionSignatureChecker(&txTo, 0, amount), SignatureData(scriptSig), empty);
+    BOOST_CHECK(combined.scriptSig == scriptSig);
+    combined = CombineSignatures(scriptPubKey, MutableTransactionSignatureChecker(&txTo, 0, amount), empty, SignatureData(scriptSig));
+    BOOST_CHECK(combined.scriptSig == scriptSig);
     CScript scriptSigCopy = scriptSig;
     // Signing again will give a different, valid signature:
-    SignSignature(keystore, txFrom, txTo, 0);
-    combined = CombineSignatures(scriptPubKey, txTo, 0, amount, scriptSigCopy, scriptSig);
-    BOOST_CHECK(combined == scriptSigCopy || combined == scriptSig);
+    SignSignature(keystore, txFrom, txTo, 0, SIGHASH_ALL);
+    combined = CombineSignatures(scriptPubKey, MutableTransactionSignatureChecker(&txTo, 0, amount), SignatureData(scriptSigCopy), SignatureData(scriptSig));
+    BOOST_CHECK(combined.scriptSig == scriptSigCopy || combined.scriptSig == scriptSig);
 
     // P2SH, single-signature case:
     CScript pkSingle; pkSingle << ToByteVector(keys[0].GetPubKey()) << OP_CHECKSIG;
     keystore.AddCScript(pkSingle);
     scriptPubKey = GetScriptForDestination(CScriptID(pkSingle));
-    SignSignature(keystore, txFrom, txTo, 0);
-    combined = CombineSignatures(scriptPubKey, txTo, 0, amount, scriptSig, empty);
-    BOOST_CHECK(combined == scriptSig);
-    combined = CombineSignatures(scriptPubKey, txTo, 0, amount, empty, scriptSig);
-    BOOST_CHECK(combined == scriptSig);
+    SignSignature(keystore, txFrom, txTo, 0, SIGHASH_ALL);
+    combined = CombineSignatures(scriptPubKey, MutableTransactionSignatureChecker(&txTo, 0, amount), SignatureData(scriptSig), empty);
+    BOOST_CHECK(combined.scriptSig == scriptSig);
+    combined = CombineSignatures(scriptPubKey, MutableTransactionSignatureChecker(&txTo, 0, amount), empty, SignatureData(scriptSig));
+    BOOST_CHECK(combined.scriptSig == scriptSig);
     scriptSigCopy = scriptSig;
-    SignSignature(keystore, txFrom, txTo, 0);
-    combined = CombineSignatures(scriptPubKey, txTo, 0, amount, scriptSigCopy, scriptSig);
-    BOOST_CHECK(combined == scriptSigCopy || combined == scriptSig);
+    SignSignature(keystore, txFrom, txTo, 0, SIGHASH_ALL);
+    combined = CombineSignatures(scriptPubKey, MutableTransactionSignatureChecker(&txTo, 0, amount), SignatureData(scriptSigCopy), SignatureData(scriptSig));
+    BOOST_CHECK(combined.scriptSig == scriptSigCopy || combined.scriptSig == scriptSig);
     // dummy scriptSigCopy with placeholder, should always choose non-placeholder:
-    scriptSigCopy = CScript() << OP_0 << vector<unsigned char>(pkSingle.begin(), pkSingle.end());
-    combined = CombineSignatures(scriptPubKey, txTo, 0, amount, scriptSigCopy, scriptSig);
-    BOOST_CHECK(combined == scriptSig);
-    combined = CombineSignatures(scriptPubKey, txTo, 0, amount, scriptSig, scriptSigCopy);
-    BOOST_CHECK(combined == scriptSig);
+    scriptSigCopy = CScript() << OP_0 << std::vector<unsigned char>(pkSingle.begin(), pkSingle.end());
+    combined = CombineSignatures(scriptPubKey, MutableTransactionSignatureChecker(&txTo, 0, amount), SignatureData(scriptSigCopy), SignatureData(scriptSig));
+    BOOST_CHECK(combined.scriptSig == scriptSig);
+    combined = CombineSignatures(scriptPubKey, MutableTransactionSignatureChecker(&txTo, 0, amount), SignatureData(scriptSig), SignatureData(scriptSigCopy));
+    BOOST_CHECK(combined.scriptSig == scriptSig);
 
     // Hardest case:  Multisig 2-of-3
     scriptPubKey = GetScriptForMultisig(2, pubkeys);
     keystore.AddCScript(scriptPubKey);
-    SignSignature(keystore, txFrom, txTo, 0);
-    combined = CombineSignatures(scriptPubKey, txTo, 0, amount, scriptSig, empty);
-    BOOST_CHECK(combined == scriptSig);
-    combined = CombineSignatures(scriptPubKey, txTo, 0, amount, empty, scriptSig);
-    BOOST_CHECK(combined == scriptSig);
+    SignSignature(keystore, txFrom, txTo, 0, SIGHASH_ALL);
+    combined = CombineSignatures(scriptPubKey, MutableTransactionSignatureChecker(&txTo, 0, amount), SignatureData(scriptSig), empty);
+    BOOST_CHECK(combined.scriptSig == scriptSig);
+    combined = CombineSignatures(scriptPubKey, MutableTransactionSignatureChecker(&txTo, 0, amount), empty, SignatureData(scriptSig));
+    BOOST_CHECK(combined.scriptSig == scriptSig);
 
     // A couple of partially-signed versions:
     vector<unsigned char> sig1;
@@ -985,22 +985,22 @@ BOOST_AUTO_TEST_CASE(script_combineSigs)
     CScript complete13 = CScript() << OP_0 << sig1 << sig3;
     CScript complete23 = CScript() << OP_0 << sig2 << sig3;
 
-    combined = CombineSignatures(scriptPubKey, txTo, 0, amount, partial1a, partial1b);
-    BOOST_CHECK(combined == partial1a);
-    combined = CombineSignatures(scriptPubKey, txTo, 0, amount, partial1a, partial2a);
-    BOOST_CHECK(combined == complete12);
-    combined = CombineSignatures(scriptPubKey, txTo, 0, amount, partial2a, partial1a);
-    BOOST_CHECK(combined == complete12);
-    combined = CombineSignatures(scriptPubKey, txTo, 0, amount, partial1b, partial2b);
-    BOOST_CHECK(combined == complete12);
-    combined = CombineSignatures(scriptPubKey, txTo, 0, amount, partial3b, partial1b);
-    BOOST_CHECK(combined == complete13);
-    combined = CombineSignatures(scriptPubKey, txTo, 0, amount, partial2a, partial3a);
-    BOOST_CHECK(combined == complete23);
-    combined = CombineSignatures(scriptPubKey, txTo, 0, amount, partial3b, partial2b);
-    BOOST_CHECK(combined == complete23);
-    combined = CombineSignatures(scriptPubKey, txTo, 0, amount, partial3b, partial3a);
-    BOOST_CHECK(combined == partial3c);
+    combined = CombineSignatures(scriptPubKey, MutableTransactionSignatureChecker(&txTo, 0, amount), SignatureData(partial1a), SignatureData(partial1b));
+    BOOST_CHECK(combined.scriptSig == partial1a);
+    combined = CombineSignatures(scriptPubKey, MutableTransactionSignatureChecker(&txTo, 0, amount), SignatureData(partial1a), SignatureData(partial2a));
+    BOOST_CHECK(combined.scriptSig == complete12);
+    combined = CombineSignatures(scriptPubKey, MutableTransactionSignatureChecker(&txTo, 0, amount), SignatureData(partial2a), SignatureData(partial1a));
+    BOOST_CHECK(combined.scriptSig == complete12);
+    combined = CombineSignatures(scriptPubKey, MutableTransactionSignatureChecker(&txTo, 0, amount), SignatureData(partial1b), SignatureData(partial2b));
+    BOOST_CHECK(combined.scriptSig == complete12);
+    combined = CombineSignatures(scriptPubKey, MutableTransactionSignatureChecker(&txTo, 0, amount), SignatureData(partial3b), SignatureData(partial1b));
+    BOOST_CHECK(combined.scriptSig == complete13);
+    combined = CombineSignatures(scriptPubKey, MutableTransactionSignatureChecker(&txTo, 0, amount), SignatureData(partial2a), SignatureData(partial3a));
+    BOOST_CHECK(combined.scriptSig == complete23);
+    combined = CombineSignatures(scriptPubKey, MutableTransactionSignatureChecker(&txTo, 0, amount), SignatureData(partial3b), SignatureData(partial2b));
+    BOOST_CHECK(combined.scriptSig == complete23);
+    combined = CombineSignatures(scriptPubKey, MutableTransactionSignatureChecker(&txTo, 0, amount), SignatureData(partial3b), SignatureData(partial3a));
+    BOOST_CHECK(combined.scriptSig == partial3c);
 }
 
 BOOST_AUTO_TEST_CASE(script_standard_push)
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index babde1a02c3c4..b36c6f0259f68 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -2334,17 +2334,20 @@ bool CWallet::CreateTransaction(const vector<CRecipient>& vecSend, CWalletTx& wt
                 {
                     bool signSuccess;
                     const CScript& scriptPubKey = coin.first->vout[coin.second].scriptPubKey;
-                    CScript& scriptSigRes = txNew.vin[nIn].scriptSig;
+                    SignatureData sigdata;
                     if (sign)
-                        signSuccess = ProduceSignature(TransactionSignatureCreator(this, &txNewConst, nIn, SIGHASH_ALL), scriptPubKey, scriptSigRes);
+                        signSuccess = ProduceSignature(TransactionSignatureCreator(this, &txNewConst, nIn, coin.first->vout[coin.second].nValue, SIGHASH_ALL), scriptPubKey, sigdata);
                     else
-                        signSuccess = ProduceSignature(DummySignatureCreator(this), scriptPubKey, scriptSigRes);
+                        signSuccess = ProduceSignature(DummySignatureCreator(this), scriptPubKey, sigdata);
 
                     if (!signSuccess)
                     {
                         strFailReason = _("Signing transaction failed");
                         return false;
+                    } else {
+                        UpdateTransaction(txNew, nIn, sigdata);
                     }
+
                     nIn++;
                 }
 
@@ -2354,6 +2357,7 @@ bool CWallet::CreateTransaction(const vector<CRecipient>& vecSend, CWalletTx& wt
                 if (!sign) {
                     BOOST_FOREACH (CTxIn& vin, txNew.vin)
                         vin.scriptSig = CScript();
+                    txNew.wit.SetNull();
                 }
 
                 // Embed the constructed transaction data in wtxNew.

From f4691ab3a9d4f3321afa024984c03fe6e10bfdbc Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Wed, 30 Dec 2015 01:13:08 +0100
Subject: [PATCH 0550/1802] [RPC] Add wallet support for witness transactions
 (using P2SH)

Includes support for pushkeyhash wit v0 by Alex Morcos.
---
 src/rpc/misc.cpp         | 38 +++++++++++++++++++
 src/wallet/rpcwallet.cpp | 80 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 118 insertions(+)

diff --git a/src/rpc/misc.cpp b/src/rpc/misc.cpp
index 09f51857815e2..f2a29416e675d 100644
--- a/src/rpc/misc.cpp
+++ b/src/rpc/misc.cpp
@@ -312,6 +312,43 @@ UniValue createmultisig(const UniValue& params, bool fHelp)
     return result;
 }
 
+UniValue createwitnessaddress(const UniValue& params, bool fHelp)
+{
+    if (fHelp || params.size() < 1 || params.size() > 1)
+    {
+        string msg = "createwitnessaddress \"script\"\n"
+            "\nCreates a witness address for a particular script.\n"
+            "It returns a json object with the address and witness script.\n"
+
+            "\nArguments:\n"
+            "1. \"script\"       (string, required) A hex encoded script\n"
+
+            "\nResult:\n"
+            "{\n"
+            "  \"address\":\"multisigaddress\",  (string) The value of the new address (P2SH of witness script).\n"
+            "  \"witnessScript\":\"script\"      (string) The string value of the hex-encoded witness script.\n"
+            "}\n"
+        ;
+        throw runtime_error(msg);
+    }
+
+    if (!IsHex(params[0].get_str())) {
+        throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Script must be hex-encoded");
+    }
+
+    std::vector<unsigned char> code = ParseHex(params[0].get_str());
+    CScript script(code.begin(), code.end());
+    CScript witscript = GetScriptForWitness(script);
+    CScriptID witscriptid(witscript);
+    CBitcoinAddress address(witscriptid);
+
+    UniValue result(UniValue::VOBJ);
+    result.push_back(Pair("address", address.ToString()));
+    result.push_back(Pair("witnessScript", HexStr(witscript.begin(), witscript.end())));
+
+    return result;
+}
+
 UniValue verifymessage(const UniValue& params, bool fHelp)
 {
     if (fHelp || params.size() != 3)
@@ -445,6 +482,7 @@ static const CRPCCommand commands[] =
     { "control",            "getinfo",                &getinfo,                true  }, /* uses wallet if enabled */
     { "util",               "validateaddress",        &validateaddress,        true  }, /* uses wallet if enabled */
     { "util",               "createmultisig",         &createmultisig,         true  },
+    { "util",               "createwitnessaddress",   &createwitnessaddress,   true  },
     { "util",               "verifymessage",          &verifymessage,          true  },
     { "util",               "signmessagewithprivkey", &signmessagewithprivkey, true  },
 
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index 3666c37ac3eda..afbb9a1113f48 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -1011,6 +1011,85 @@ UniValue addmultisigaddress(const UniValue& params, bool fHelp)
     return CBitcoinAddress(innerID).ToString();
 }
 
+class Witnessifier : public boost::static_visitor<bool>
+{
+public:
+    CScriptID result;
+
+    bool operator()(const CNoDestination &dest) const { return false; }
+
+    bool operator()(const CKeyID &keyID) {
+        CPubKey pubkey;
+        if (pwalletMain && pwalletMain->GetPubKey(keyID, pubkey)) {
+            CScript basescript;
+            basescript << ToByteVector(pubkey) << OP_CHECKSIG;
+            CScript witscript = GetScriptForWitness(basescript);
+            pwalletMain->AddCScript(witscript);
+            result = CScriptID(witscript);
+            return true;
+        }
+        return false;
+    }
+
+    bool operator()(const CScriptID &scriptID) {
+        CScript subscript;
+        if (pwalletMain && pwalletMain->GetCScript(scriptID, subscript)) {
+            int witnessversion;
+            std::vector<unsigned char> witprog;
+            if (subscript.IsWitnessProgram(witnessversion, witprog)) {
+                result = scriptID;
+                return true;
+            }
+            CScript witscript = GetScriptForWitness(subscript);
+            pwalletMain->AddCScript(witscript);
+            result = CScriptID(witscript);
+            return true;
+        }
+        return false;
+    }
+};
+
+UniValue addwitnessaddress(const UniValue& params, bool fHelp)
+{
+    if (!EnsureWalletIsAvailable(fHelp))
+        return NullUniValue;
+
+    if (fHelp || params.size() < 1 || params.size() > 1)
+    {
+        string msg = "addwitnessaddress \"address\"\n"
+            "\nAdd a witness address for a script (with pubkey or redeemscript known).\n"
+            "It returns the witness script.\n"
+
+            "\nArguments:\n"
+            "1. \"address\"       (string, required) An address known to the wallet\n"
+
+            "\nResult:\n"
+            "\"witnessaddress\",  (string) The value of the new address (P2SH of witness script).\n"
+            "}\n"
+        ;
+        throw runtime_error(msg);
+    }
+
+    {
+        LOCK(cs_main);
+        if (!IsWitnessEnabled(chainActive.Tip(), Params().GetConsensus())) {
+            throw JSONRPCError(RPC_WALLET_ERROR, "Segregated witness not enabled on network");
+        }
+    }
+
+    CBitcoinAddress address(params[0].get_str());
+    if (!address.IsValid())
+        throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid Bitcoin address");
+
+    Witnessifier w;
+    CTxDestination dest = address.Get();
+    bool ret = boost::apply_visitor(w, dest);
+    if (!ret) {
+        throw JSONRPCError(RPC_WALLET_ERROR, "Public key or redeemscript not known to wallet");
+    }
+
+    return CBitcoinAddress(w.result).ToString();
+}
 
 struct tallyitem
 {
@@ -2491,6 +2570,7 @@ static const CRPCCommand commands[] =
     { "hidden",             "resendwallettransactions", &resendwallettransactions, true  },
     { "wallet",             "abandontransaction",       &abandontransaction,       false },
     { "wallet",             "addmultisigaddress",       &addmultisigaddress,       true  },
+    { "wallet",             "addwitnessaddress",        &addwitnessaddress,        true  },
     { "wallet",             "backupwallet",             &backupwallet,             true  },
     { "wallet",             "dumpprivkey",              &dumpprivkey,              true  },
     { "wallet",             "dumpwallet",               &dumpwallet,               true  },

From 745eb678ef5d52c74edcd9c322ebd1f3232a9310 Mon Sep 17 00:00:00 2001
From: NicolasDorier <nicolas.dorier@gmail.com>
Date: Sun, 10 Apr 2016 15:59:23 +0900
Subject: [PATCH 0551/1802] [RPC] signrawtransaction can sign P2WSH

---
 src/bitcoin-tx.cpp         | 2 +-
 src/rpc/rawtransaction.cpp | 4 ++--
 src/script/script.cpp      | 8 ++++++++
 src/script/script.h        | 1 +
 4 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/bitcoin-tx.cpp b/src/bitcoin-tx.cpp
index f457ea2bce4d7..8e8ac47455cbe 100644
--- a/src/bitcoin-tx.cpp
+++ b/src/bitcoin-tx.cpp
@@ -454,7 +454,7 @@ static void MutateTxSign(CMutableTransaction& tx, const string& flagStr)
 
             // if redeemScript given and private keys given,
             // add redeemScript to the tempKeystore so it can be signed:
-            if (fGivenKeys && scriptPubKey.IsPayToScriptHash() &&
+            if (fGivenKeys && (scriptPubKey.IsPayToScriptHash() || scriptPubKey.IsPayToWitnessScriptHash()) &&
                 prevOut.exists("redeemScript")) {
                 UniValue v = prevOut["redeemScript"];
                 vector<unsigned char> rsData(ParseHexUV(v, "redeemScript"));
diff --git a/src/rpc/rawtransaction.cpp b/src/rpc/rawtransaction.cpp
index 56ba805b1f6ab..3270cd384f4b6 100644
--- a/src/rpc/rawtransaction.cpp
+++ b/src/rpc/rawtransaction.cpp
@@ -592,7 +592,7 @@ UniValue signrawtransaction(const UniValue& params, bool fHelp)
             "         \"txid\":\"id\",             (string, required) The transaction id\n"
             "         \"vout\":n,                  (numeric, required) The output number\n"
             "         \"scriptPubKey\": \"hex\",   (string, required) script key\n"
-            "         \"redeemScript\": \"hex\",   (string, required for P2SH) redeem script\n"
+            "         \"redeemScript\": \"hex\",   (string, required for P2SH or P2WSH) redeem script\n"
             "         \"amount\": value            (numeric, required) The amount spent\n"
             "       }\n"
             "       ,...\n"
@@ -744,7 +744,7 @@ UniValue signrawtransaction(const UniValue& params, bool fHelp)
 
             // if redeemScript given and not using the local wallet (private keys
             // given), add redeemScript to the tempKeystore so it can be signed:
-            if (fGivenKeys && scriptPubKey.IsPayToScriptHash()) {
+            if (fGivenKeys && (scriptPubKey.IsPayToScriptHash() || scriptPubKey.IsPayToWitnessScriptHash())) {
                 RPCTypeCheckObj(prevOut,
                     {
                         {"txid", UniValueType(UniValue::VSTR)},
diff --git a/src/script/script.cpp b/src/script/script.cpp
index 73f5a61bf68bd..da551c23ee678 100644
--- a/src/script/script.cpp
+++ b/src/script/script.cpp
@@ -210,6 +210,14 @@ bool CScript::IsPayToScriptHash() const
             (*this)[22] == OP_EQUAL);
 }
 
+bool CScript::IsPayToWitnessScriptHash() const
+{
+    // Extra-fast test for pay-to-witness-script-hash CScripts:
+    return (this->size() == 34 &&
+            (*this)[0] == OP_0 &&
+            (*this)[1] == 0x20);
+}
+
 // A witness program is any valid CScript that consists of a 1-byte push opcode
 // followed by a data push between 2 and 40 bytes.
 bool CScript::IsWitnessProgram(int& version, std::vector<unsigned char>& program) const
diff --git a/src/script/script.h b/src/script/script.h
index b9b5be901389c..71af3754bcd17 100644
--- a/src/script/script.h
+++ b/src/script/script.h
@@ -621,6 +621,7 @@ class CScript : public CScriptBase
     unsigned int GetSigOpCount(const CScript& scriptSig) const;
 
     bool IsPayToScriptHash() const;
+    bool IsPayToWitnessScriptHash() const;
     bool IsWitnessProgram(int& version, std::vector<unsigned char>& program) const;
 
     /** Called by IsStandardTx and P2SH/BIP62 VerifyScript (which makes it consensus-critical). */

From 978e2004ad659ad216d820dbd79e212e276405f4 Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Thu, 31 Mar 2016 14:43:46 +0200
Subject: [PATCH 0552/1802] --- [SEGWIT] begin: tests ---


From 0aa92074516c37a10d4150d68918e20db91289a5 Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Fri, 20 Nov 2015 16:22:47 +0100
Subject: [PATCH 0553/1802] [qa] Witness version 0 signing unit tests

---
 src/test/transaction_tests.cpp | 276 +++++++++++++++++++++++++++++++++
 1 file changed, 276 insertions(+)

diff --git a/src/test/transaction_tests.cpp b/src/test/transaction_tests.cpp
index 9fb23d8edfab7..76f998ac24eec 100644
--- a/src/test/transaction_tests.cpp
+++ b/src/test/transaction_tests.cpp
@@ -14,7 +14,9 @@
 #include "main.h" // For CheckTransaction
 #include "policy/policy.h"
 #include "script/script.h"
+#include "script/sign.h"
 #include "script/script_error.h"
+#include "script/standard.h"
 #include "utilstrencodings.h"
 
 #include <map>
@@ -25,11 +27,14 @@
 #include <boost/assign/list_of.hpp>
 #include <boost/test/unit_test.hpp>
 #include <boost/assign/list_of.hpp>
+#include <boost/foreach.hpp>
 
 #include <univalue.h>
 
 using namespace std;
 
+typedef vector<unsigned char> valtype;
+
 // In script_tests.cpp
 extern UniValue read_json(const std::string& jsondata);
 
@@ -315,6 +320,277 @@ BOOST_AUTO_TEST_CASE(test_Get)
     BOOST_CHECK_EQUAL(coins.GetValueIn(t1), (50+21+22)*CENT);
 }
 
+void CreateCreditAndSpend(const CKeyStore& keystore, const CScript& outscript, CTransaction& output, CMutableTransaction& input, bool success = true)
+{
+    CMutableTransaction outputm;
+    outputm.nVersion = 1;
+    outputm.vin.resize(1);
+    outputm.vin[0].prevout.SetNull();
+    outputm.vin[0].scriptSig = CScript();
+    outputm.wit.vtxinwit.resize(1);
+    outputm.vout.resize(1);
+    outputm.vout[0].nValue = 1;
+    outputm.vout[0].scriptPubKey = outscript;
+    CDataStream ssout(SER_NETWORK, PROTOCOL_VERSION);
+    ssout << outputm;
+    ssout >> output;
+    assert(output.vin.size() == 1);
+    assert(output.vin[0] == outputm.vin[0]);
+    assert(output.vout.size() == 1);
+    assert(output.vout[0] == outputm.vout[0]);
+    assert(output.wit.vtxinwit.size() == 0);
+
+    CMutableTransaction inputm;
+    inputm.nVersion = 1;
+    inputm.vin.resize(1);
+    inputm.vin[0].prevout.hash = output.GetHash();
+    inputm.vin[0].prevout.n = 0;
+    inputm.wit.vtxinwit.resize(1);
+    inputm.vout.resize(1);
+    inputm.vout[0].nValue = 1;
+    inputm.vout[0].scriptPubKey = CScript();
+    bool ret = SignSignature(keystore, output, inputm, 0, SIGHASH_ALL);
+    assert(ret == success);
+    CDataStream ssin(SER_NETWORK, PROTOCOL_VERSION);
+    ssin << inputm;
+    ssin >> input;
+    assert(input.vin.size() == 1);
+    assert(input.vin[0] == inputm.vin[0]);
+    assert(input.vout.size() == 1);
+    assert(input.vout[0] == inputm.vout[0]);
+    if (inputm.wit.IsNull()) {
+        assert(input.wit.IsNull());
+    } else {
+        assert(!input.wit.IsNull());
+        assert(input.wit.vtxinwit.size() == 1);
+        assert(input.wit.vtxinwit[0].scriptWitness.stack == inputm.wit.vtxinwit[0].scriptWitness.stack);
+    }
+}
+
+void CheckWithFlag(const CTransaction& output, const CMutableTransaction& input, int flags, bool success)
+{
+    ScriptError error;
+    CTransaction inputi(input);
+    bool ret = VerifyScript(inputi.vin[0].scriptSig, output.vout[0].scriptPubKey, inputi.wit.vtxinwit.size() > 0 ? &inputi.wit.vtxinwit[0].scriptWitness : NULL, flags, TransactionSignatureChecker(&inputi, 0, output.vout[0].nValue), &error);
+    assert(ret == success);
+}
+
+static CScript PushAll(const vector<valtype>& values)
+{
+    CScript result;
+    BOOST_FOREACH(const valtype& v, values) {
+        if (v.size() == 0) {
+            result << OP_0;
+        } else if (v.size() == 1 && v[0] >= 1 && v[0] <= 16) {
+            result << CScript::EncodeOP_N(v[0]);
+        } else {
+            result << v;
+        }
+    }
+    return result;
+}
+
+void ReplaceRedeemScript(CScript& script, const CScript& redeemScript)
+{
+    vector<valtype> stack;
+    EvalScript(stack, script, SCRIPT_VERIFY_STRICTENC, BaseSignatureChecker(), SIGVERSION_BASE);
+    assert(stack.size() > 0);
+    stack.back() = std::vector<unsigned char>(redeemScript.begin(), redeemScript.end());
+    script = PushAll(stack);
+}
+
+BOOST_AUTO_TEST_CASE(test_witness)
+{
+    CBasicKeyStore keystore, keystore2;
+    CKey key1, key2, key3, key1L, key2L;
+    CPubKey pubkey1, pubkey2, pubkey3, pubkey1L, pubkey2L;
+    key1.MakeNewKey(true);
+    key2.MakeNewKey(true);
+    key3.MakeNewKey(true);
+    key1L.MakeNewKey(false);
+    key2L.MakeNewKey(false);
+    pubkey1 = key1.GetPubKey();
+    pubkey2 = key2.GetPubKey();
+    pubkey3 = key3.GetPubKey();
+    pubkey1L = key1L.GetPubKey();
+    pubkey2L = key2L.GetPubKey();
+    keystore.AddKeyPubKey(key1, pubkey1);
+    keystore.AddKeyPubKey(key2, pubkey2);
+    keystore.AddKeyPubKey(key1L, pubkey1L);
+    keystore.AddKeyPubKey(key2L, pubkey2L);
+    CScript scriptPubkey1, scriptPubkey2, scriptPubkey1L, scriptPubkey2L, scriptMulti;
+    scriptPubkey1 << ToByteVector(pubkey1) << OP_CHECKSIG;
+    scriptPubkey2 << ToByteVector(pubkey2) << OP_CHECKSIG;
+    scriptPubkey1L << ToByteVector(pubkey1L) << OP_CHECKSIG;
+    scriptPubkey2L << ToByteVector(pubkey2L) << OP_CHECKSIG; 
+    std::vector<CPubKey> oneandthree;
+    oneandthree.push_back(pubkey1);
+    oneandthree.push_back(pubkey3);
+    scriptMulti = GetScriptForMultisig(2, oneandthree);
+    keystore.AddCScript(scriptPubkey1);
+    keystore.AddCScript(scriptPubkey2);
+    keystore.AddCScript(scriptPubkey1L);
+    keystore.AddCScript(scriptPubkey2L);
+    keystore.AddCScript(scriptMulti);
+    keystore.AddCScript(GetScriptForWitness(scriptPubkey1));
+    keystore.AddCScript(GetScriptForWitness(scriptPubkey2));
+    keystore.AddCScript(GetScriptForWitness(scriptPubkey1L));
+    keystore.AddCScript(GetScriptForWitness(scriptPubkey2L));
+    keystore.AddCScript(GetScriptForWitness(scriptMulti));
+    keystore2.AddCScript(scriptMulti);
+    keystore2.AddCScript(GetScriptForWitness(scriptMulti));
+    keystore2.AddKeyPubKey(key3, pubkey3);
+
+    CTransaction output1, output2;
+    CMutableTransaction input1, input2;
+    SignatureData sigdata;
+
+    // Normal pay-to-compressed-pubkey.
+    CreateCreditAndSpend(keystore, scriptPubkey1, output1, input1);
+    CreateCreditAndSpend(keystore, scriptPubkey2, output2, input2);
+    CheckWithFlag(output1, input1, 0, true);
+    CheckWithFlag(output1, input1, SCRIPT_VERIFY_P2SH, true);
+    CheckWithFlag(output1, input1, SCRIPT_VERIFY_WITNESS | SCRIPT_VERIFY_P2SH, true);
+    CheckWithFlag(output1, input1, STANDARD_SCRIPT_VERIFY_FLAGS, true);
+    CheckWithFlag(output1, input2, 0, false);
+    CheckWithFlag(output1, input2, SCRIPT_VERIFY_P2SH, false);
+    CheckWithFlag(output1, input2, SCRIPT_VERIFY_WITNESS | SCRIPT_VERIFY_P2SH, false);
+    CheckWithFlag(output1, input2, STANDARD_SCRIPT_VERIFY_FLAGS, false);
+
+    // P2SH pay-to-compressed-pubkey.
+    CreateCreditAndSpend(keystore, GetScriptForDestination(CScriptID(scriptPubkey1)), output1, input1);
+    CreateCreditAndSpend(keystore, GetScriptForDestination(CScriptID(scriptPubkey2)), output2, input2);
+    ReplaceRedeemScript(input2.vin[0].scriptSig, scriptPubkey1);
+    CheckWithFlag(output1, input1, 0, true);
+    CheckWithFlag(output1, input1, SCRIPT_VERIFY_P2SH, true);
+    CheckWithFlag(output1, input1, SCRIPT_VERIFY_WITNESS | SCRIPT_VERIFY_P2SH, true);
+    CheckWithFlag(output1, input1, STANDARD_SCRIPT_VERIFY_FLAGS, true);
+    CheckWithFlag(output1, input2, 0, true);
+    CheckWithFlag(output1, input2, SCRIPT_VERIFY_P2SH, false);
+    CheckWithFlag(output1, input2, SCRIPT_VERIFY_WITNESS | SCRIPT_VERIFY_P2SH, false);
+    CheckWithFlag(output1, input2, STANDARD_SCRIPT_VERIFY_FLAGS, false);
+
+    // Witness pay-to-compressed-pubkey (v0).
+    CreateCreditAndSpend(keystore, GetScriptForWitness(scriptPubkey1), output1, input1);
+    CreateCreditAndSpend(keystore, GetScriptForWitness(scriptPubkey2), output2, input2);
+    CheckWithFlag(output1, input1, 0, true);
+    CheckWithFlag(output1, input1, SCRIPT_VERIFY_P2SH, true);
+    CheckWithFlag(output1, input1, SCRIPT_VERIFY_WITNESS | SCRIPT_VERIFY_P2SH, true);
+    CheckWithFlag(output1, input1, STANDARD_SCRIPT_VERIFY_FLAGS, true);
+    CheckWithFlag(output1, input2, 0, true);
+    CheckWithFlag(output1, input2, SCRIPT_VERIFY_P2SH, true);
+    CheckWithFlag(output1, input2, SCRIPT_VERIFY_WITNESS | SCRIPT_VERIFY_P2SH, false);
+    CheckWithFlag(output1, input2, STANDARD_SCRIPT_VERIFY_FLAGS, false);
+
+    // P2SH witness pay-to-compressed-pubkey (v0).
+    CreateCreditAndSpend(keystore, GetScriptForDestination(CScriptID(GetScriptForWitness(scriptPubkey1))), output1, input1);
+    CreateCreditAndSpend(keystore, GetScriptForDestination(CScriptID(GetScriptForWitness(scriptPubkey2))), output2, input2);
+    ReplaceRedeemScript(input2.vin[0].scriptSig, GetScriptForWitness(scriptPubkey1));
+    CheckWithFlag(output1, input1, 0, true);
+    CheckWithFlag(output1, input1, SCRIPT_VERIFY_P2SH, true);
+    CheckWithFlag(output1, input1, SCRIPT_VERIFY_WITNESS | SCRIPT_VERIFY_P2SH, true);
+    CheckWithFlag(output1, input1, STANDARD_SCRIPT_VERIFY_FLAGS, true);
+    CheckWithFlag(output1, input2, 0, true);
+    CheckWithFlag(output1, input2, SCRIPT_VERIFY_P2SH, true);
+    CheckWithFlag(output1, input2, SCRIPT_VERIFY_WITNESS | SCRIPT_VERIFY_P2SH, false);
+    CheckWithFlag(output1, input2, STANDARD_SCRIPT_VERIFY_FLAGS, false);
+
+    // Normal pay-to-uncompressed-pubkey.
+    CreateCreditAndSpend(keystore, scriptPubkey1L, output1, input1);
+    CreateCreditAndSpend(keystore, scriptPubkey2L, output2, input2);
+    CheckWithFlag(output1, input1, 0, true);
+    CheckWithFlag(output1, input1, SCRIPT_VERIFY_P2SH, true);
+    CheckWithFlag(output1, input1, SCRIPT_VERIFY_WITNESS | SCRIPT_VERIFY_P2SH, true);
+    CheckWithFlag(output1, input1, STANDARD_SCRIPT_VERIFY_FLAGS, true);
+    CheckWithFlag(output1, input2, 0, false);
+    CheckWithFlag(output1, input2, SCRIPT_VERIFY_P2SH, false);
+    CheckWithFlag(output1, input2, SCRIPT_VERIFY_WITNESS | SCRIPT_VERIFY_P2SH, false);
+    CheckWithFlag(output1, input2, STANDARD_SCRIPT_VERIFY_FLAGS, false);
+
+    // P2SH pay-to-uncompressed-pubkey.
+    CreateCreditAndSpend(keystore, GetScriptForDestination(CScriptID(scriptPubkey1L)), output1, input1);
+    CreateCreditAndSpend(keystore, GetScriptForDestination(CScriptID(scriptPubkey2L)), output2, input2);
+    ReplaceRedeemScript(input2.vin[0].scriptSig, scriptPubkey1L);
+    CheckWithFlag(output1, input1, 0, true);
+    CheckWithFlag(output1, input1, SCRIPT_VERIFY_P2SH, true);
+    CheckWithFlag(output1, input1, SCRIPT_VERIFY_WITNESS | SCRIPT_VERIFY_P2SH, true);
+    CheckWithFlag(output1, input1, STANDARD_SCRIPT_VERIFY_FLAGS, true);
+    CheckWithFlag(output1, input2, 0, true);
+    CheckWithFlag(output1, input2, SCRIPT_VERIFY_P2SH, false);
+    CheckWithFlag(output1, input2, SCRIPT_VERIFY_WITNESS | SCRIPT_VERIFY_P2SH, false);
+    CheckWithFlag(output1, input2, STANDARD_SCRIPT_VERIFY_FLAGS, false);
+
+    // Witness pay-to-uncompressed-pubkey (v1).
+    CreateCreditAndSpend(keystore, GetScriptForWitness(scriptPubkey1L), output1, input1);
+    CreateCreditAndSpend(keystore, GetScriptForWitness(scriptPubkey2L), output2, input2);
+    CheckWithFlag(output1, input1, 0, true);
+    CheckWithFlag(output1, input1, SCRIPT_VERIFY_P2SH, true);
+    CheckWithFlag(output1, input1, SCRIPT_VERIFY_WITNESS | SCRIPT_VERIFY_P2SH, true);
+    CheckWithFlag(output1, input1, STANDARD_SCRIPT_VERIFY_FLAGS, true);
+    CheckWithFlag(output1, input2, 0, true);
+    CheckWithFlag(output1, input2, SCRIPT_VERIFY_P2SH, true);
+    CheckWithFlag(output1, input2, SCRIPT_VERIFY_WITNESS | SCRIPT_VERIFY_P2SH, false);
+    CheckWithFlag(output1, input2, STANDARD_SCRIPT_VERIFY_FLAGS, false);
+
+    // P2SH witness pay-to-uncompressed-pubkey (v1).
+    CreateCreditAndSpend(keystore, GetScriptForDestination(CScriptID(GetScriptForWitness(scriptPubkey1L))), output1, input1);
+    CreateCreditAndSpend(keystore, GetScriptForDestination(CScriptID(GetScriptForWitness(scriptPubkey2L))), output2, input2);
+    ReplaceRedeemScript(input2.vin[0].scriptSig, GetScriptForWitness(scriptPubkey1L));
+    CheckWithFlag(output1, input1, 0, true);
+    CheckWithFlag(output1, input1, SCRIPT_VERIFY_P2SH, true);
+    CheckWithFlag(output1, input1, SCRIPT_VERIFY_WITNESS | SCRIPT_VERIFY_P2SH, true);
+    CheckWithFlag(output1, input1, STANDARD_SCRIPT_VERIFY_FLAGS, true);
+    CheckWithFlag(output1, input2, 0, true);
+    CheckWithFlag(output1, input2, SCRIPT_VERIFY_P2SH, true);
+    CheckWithFlag(output1, input2, SCRIPT_VERIFY_WITNESS | SCRIPT_VERIFY_P2SH, false);
+    CheckWithFlag(output1, input2, STANDARD_SCRIPT_VERIFY_FLAGS, false);
+
+    // Normal 2-of-2 multisig
+    CreateCreditAndSpend(keystore, scriptMulti, output1, input1, false);
+    CheckWithFlag(output1, input1, 0, false);
+    CreateCreditAndSpend(keystore2, scriptMulti, output2, input2, false);
+    CheckWithFlag(output2, input2, 0, false);
+    BOOST_CHECK(output1 == output2);
+    UpdateTransaction(input1, 0, CombineSignatures(output1.vout[0].scriptPubKey, MutableTransactionSignatureChecker(&input1, 0, output1.vout[0].nValue), DataFromTransaction(input1, 0), DataFromTransaction(input2, 0)));
+    CheckWithFlag(output1, input1, STANDARD_SCRIPT_VERIFY_FLAGS, true);
+
+    // P2SH 2-of-2 multisig
+    CreateCreditAndSpend(keystore, GetScriptForDestination(CScriptID(scriptMulti)), output1, input1, false);
+    CheckWithFlag(output1, input1, 0, true);
+    CheckWithFlag(output1, input1, SCRIPT_VERIFY_P2SH, false);
+    CreateCreditAndSpend(keystore2, GetScriptForDestination(CScriptID(scriptMulti)), output2, input2, false);
+    CheckWithFlag(output2, input2, 0, true);
+    CheckWithFlag(output2, input2, SCRIPT_VERIFY_P2SH, false);
+    BOOST_CHECK(output1 == output2);
+    UpdateTransaction(input1, 0, CombineSignatures(output1.vout[0].scriptPubKey, MutableTransactionSignatureChecker(&input1, 0, output1.vout[0].nValue), DataFromTransaction(input1, 0), DataFromTransaction(input2, 0)));
+    CheckWithFlag(output1, input1, SCRIPT_VERIFY_P2SH, true);
+    CheckWithFlag(output1, input1, STANDARD_SCRIPT_VERIFY_FLAGS, true);
+
+    // Witness 2-of-2 multisig
+    CreateCreditAndSpend(keystore, GetScriptForWitness(scriptMulti), output1, input1, false);
+    CheckWithFlag(output1, input1, 0, true);
+    CheckWithFlag(output1, input1, SCRIPT_VERIFY_P2SH | SCRIPT_VERIFY_WITNESS, false);
+    CreateCreditAndSpend(keystore2, GetScriptForWitness(scriptMulti), output2, input2, false);
+    CheckWithFlag(output2, input2, 0, true);
+    CheckWithFlag(output2, input2, SCRIPT_VERIFY_P2SH | SCRIPT_VERIFY_WITNESS, false);
+    BOOST_CHECK(output1 == output2);
+    UpdateTransaction(input1, 0, CombineSignatures(output1.vout[0].scriptPubKey, MutableTransactionSignatureChecker(&input1, 0, output1.vout[0].nValue), DataFromTransaction(input1, 0), DataFromTransaction(input2, 0)));
+    CheckWithFlag(output1, input1, SCRIPT_VERIFY_P2SH | SCRIPT_VERIFY_WITNESS, true);
+    CheckWithFlag(output1, input1, STANDARD_SCRIPT_VERIFY_FLAGS, true);
+
+    // P2SH witness 2-of-2 multisig
+    CreateCreditAndSpend(keystore, GetScriptForDestination(CScriptID(GetScriptForWitness(scriptMulti))), output1, input1, false);
+    CheckWithFlag(output1, input1, SCRIPT_VERIFY_P2SH, true);
+    CheckWithFlag(output1, input1, SCRIPT_VERIFY_P2SH | SCRIPT_VERIFY_WITNESS, false);
+    CreateCreditAndSpend(keystore2, GetScriptForDestination(CScriptID(GetScriptForWitness(scriptMulti))), output2, input2, false);
+    CheckWithFlag(output2, input2, SCRIPT_VERIFY_P2SH, true);
+    CheckWithFlag(output2, input2, SCRIPT_VERIFY_P2SH | SCRIPT_VERIFY_WITNESS, false);
+    BOOST_CHECK(output1 == output2);
+    UpdateTransaction(input1, 0, CombineSignatures(output1.vout[0].scriptPubKey, MutableTransactionSignatureChecker(&input1, 0, output1.vout[0].nValue), DataFromTransaction(input1, 0), DataFromTransaction(input2, 0)));
+    CheckWithFlag(output1, input1, SCRIPT_VERIFY_P2SH | SCRIPT_VERIFY_WITNESS, true);
+    CheckWithFlag(output1, input1, STANDARD_SCRIPT_VERIFY_FLAGS, true);
+}
+
 BOOST_AUTO_TEST_CASE(test_IsStandard)
 {
     LOCK(cs_main);

From 00f46cbcd9d33fadfeb391e764bda3ac220be3ea Mon Sep 17 00:00:00 2001
From: NicolasDorier <nicolas.dorier@gmail.com>
Date: Sun, 3 Apr 2016 23:48:50 +0900
Subject: [PATCH 0554/1802] [qa] Add transaction tests for segwit

Including BIP143 P2WSH examples by jl2012.
---
 src/test/data/tx_invalid.json  |  63 ++++++++++++
 src/test/data/tx_valid.json    | 170 +++++++++++++++++++++++++++++++++
 src/test/transaction_tests.cpp |  40 ++++++--
 3 files changed, 263 insertions(+), 10 deletions(-)

diff --git a/src/test/data/tx_invalid.json b/src/test/data/tx_invalid.json
index 4719f2b38877a..05502a83f73b1 100644
--- a/src/test/data/tx_invalid.json
+++ b/src/test/data/tx_invalid.json
@@ -251,5 +251,68 @@
 [[["0000000000000000000000000000000000000000000000000000000000000100", 0, "4194304 NOP3 1"]],
 "010000000100010000000000000000000000000000000000000000000000000000000000000000000000000040000100000000000000000000000000", "P2SH,CHECKSEQUENCEVERIFY"],
 
+["Unknown witness program version (with DISCOURAGE_UPGRADABLE_WITNESS_PROGRAM)"],
+[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "0x51", 1000],
+["0000000000000000000000000000000000000000000000000000000000000100", 1, "0x60 0x14 0x4c9c3dfac4207d5d8cb89df5722cb3d712385e3f", 2000],
+["0000000000000000000000000000000000000000000000000000000000000100", 2, "0x51", 3000]],
+"0100000000010300010000000000000000000000000000000000000000000000000000000000000000000000ffffffff00010000000000000000000000000000000000000000000000000000000000000100000000ffffffff00010000000000000000000000000000000000000000000000000000000000000200000000ffffffff03e8030000000000000151d0070000000000000151b80b00000000000001510002483045022100a3cec69b52cba2d2de623ffffffffff1606184ea55476c0f8189fda231bc9cbb022003181ad597f7c380a7d1c740286b1d022b8b04ded028b833282e055e03b8efef812103596d3451025c19dbbdeb932d6bf8bfb4ad499b95b6f88db8899efac102e5fc710000000000", "P2SH,WITNESS,DISCOURAGE_UPGRADABLE_WITNESS_PROGRAM"],
+
+["Unknown length for witness program v0"],
+[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "0x51", 1000],
+["0000000000000000000000000000000000000000000000000000000000000100", 1, "0x00 0x15 0x4c9c3dfac4207d5d8cb89df5722cb3d712385e3fff", 2000],
+["0000000000000000000000000000000000000000000000000000000000000100", 2, "0x51", 3000]],
+"0100000000010300010000000000000000000000000000000000000000000000000000000000000000000000ffffffff00010000000000000000000000000000000000000000000000000000000000000100000000ffffffff00010000000000000000000000000000000000000000000000000000000000000200000000ffffffff04b60300000000000001519e070000000000000151860b0000000000000100960000000000000001510002473044022022fceb54f62f8feea77faac7083c3b56c4676a78f93745adc8a35800bc36adfa022026927df9abcf0a8777829bcfcce3ff0a385fa54c3f9df577405e3ef24ee56479022103596d3451025c19dbbdeb932d6bf8bfb4ad499b95b6f88db8899efac102e5fc710000000000", "P2SH,WITNESS"],
+
+["Witness with SigHash Single|AnyoneCanPay (same index output value changed)"],
+[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "0x51", 1000],
+["0000000000000000000000000000000000000000000000000000000000000100", 1, "0x00 0x14 0x4c9c3dfac4207d5d8cb89df5722cb3d712385e3f", 2000],
+["0000000000000000000000000000000000000000000000000000000000000100", 2, "0x51", 3000]],
+"0100000000010300010000000000000000000000000000000000000000000000000000000000000000000000ffffffff00010000000000000000000000000000000000000000000000000000000000000100000000ffffffff00010000000000000000000000000000000000000000000000000000000000000200000000ffffffff03e80300000000000001516c070000000000000151b80b0000000000000151000248304502210092f4777a0f17bf5aeb8ae768dec5f2c14feabf9d1fe2c89c78dfed0f13fdb86902206da90a86042e252bcd1e80a168c719e4a1ddcc3cebea24b9812c5453c79107e9832103596d3451025c19dbbdeb932d6bf8bfb4ad499b95b6f88db8899efac102e5fc710000000000", "P2SH,WITNESS"],
+
+["Witness with SigHash None|AnyoneCanPay (input sequence changed)"],
+[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "0x51", 1000],
+["0000000000000000000000000000000000000000000000000000000000000100", 1, "0x00 0x14 0x4c9c3dfac4207d5d8cb89df5722cb3d712385e3f", 2000],
+["0000000000000000000000000000000000000000000000000000000000000100", 2, "0x51", 3000]],
+"0100000000010300010000000000000000000000000000000000000000000000000000000000000000000000ffffffff000100000000000000000000000000000000000000000000000000000000000001000000000100000000010000000000000000000000000000000000000000000000000000000000000200000000ffffffff00000248304502210091b32274295c2a3fa02f5bce92fb2789e3fc6ea947fbe1a76e52ea3f4ef2381a022079ad72aefa3837a2e0c033a8652a59731da05fa4a813f4fc48e87c075037256b822103596d3451025c19dbbdeb932d6bf8bfb4ad499b95b6f88db8899efac102e5fc710000000000", "P2SH,WITNESS"],
+
+["Witness with SigHash All|AnyoneCanPay (third output value changed)"],
+[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "0x51", 1000],
+["0000000000000000000000000000000000000000000000000000000000000100", 1, "0x00 0x14 0x4c9c3dfac4207d5d8cb89df5722cb3d712385e3f", 2000],
+["0000000000000000000000000000000000000000000000000000000000000100", 2, "0x51", 3000]],
+"0100000000010300010000000000000000000000000000000000000000000000000000000000000000000000ffffffff00010000000000000000000000000000000000000000000000000000000000000100000000ffffffff00010000000000000000000000000000000000000000000000000000000000000200000000ffffffff03e8030000000000000151d0070000000000000151540b00000000000001510002483045022100a3cec69b52cba2d2de623eeef89e0ba1606184ea55476c0f8189fda231bc9cbb022003181ad597f7c380a7d1c740286b1d022b8b04ded028b833282e055e03b8efef812103596d3451025c19dbbdeb932d6bf8bfb4ad499b95b6f88db8899efac102e5fc710000000000", "P2SH,WITNESS"],
+
+["Witness with a push of 521 bytes"],
+[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "0x00 0x20 0x33198a9bfef674ebddb9ffaa52928017b8472791e54c609cb95f278ac6b1e349", 1000]],
+"0100000000010100010000000000000000000000000000000000000000000000000000000000000000000000ffffffff010000000000000000015102fd0902000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002755100000000", "P2SH,WITNESS"],
+
+["Witness with unknown version which push false on the stack should be invalid (even without DISCOURAGE_UPGRADABLE_WITNESS_PROGRAM)"],
+[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "0x60 0x02 0x0000", 2000]],
+"0100000000010100010000000000000000000000000000000000000000000000000000000000000000000000ffffffff010000000000000000015101010100000000", "P2SH,WITNESS"],
+
+["Witness program should leave clean stack"],
+[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "0x00 0x20 0x2f04a3aa051f1f60d695f6c44c0c3d383973dfd446ace8962664a76bb10e31a8", 2000]],
+"0100000000010100010000000000000000000000000000000000000000000000000000000000000000000000ffffffff01000000000000000001510102515100000000", "P2SH,WITNESS"],
+
+["Witness v0 with a push of 2 bytes"],
+[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "0x00 0x02 0x0001", 2000]],
+"0100000000010100010000000000000000000000000000000000000000000000000000000000000000000000ffffffff010000000000000000015101040002000100000000", "P2SH,WITNESS"],
+
+["Unknown witness version with non empty scriptSig"],
+[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "0x60 0x02 0x0001", 2000]],
+"01000000010001000000000000000000000000000000000000000000000000000000000000000000000151ffffffff010000000000000000015100000000", "P2SH,WITNESS"],
+
+["Non witness Single|AnyoneCanPay hash input's position (permutation)"],
+[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "0x21 0x03596d3451025c19dbbdeb932d6bf8bfb4ad499b95b6f88db8899efac102e5fc71 CHECKSIG", 1000],
+["0000000000000000000000000000000000000000000000000000000000000100", 1, "0x21 0x03596d3451025c19dbbdeb932d6bf8bfb4ad499b95b6f88db8899efac102e5fc71 CHECKSIG", 1001]],
+"010000000200010000000000000000000000000000000000000000000000000000000000000100000049483045022100acb96cfdbda6dc94b489fd06f2d720983b5f350e31ba906cdbd800773e80b21c02200d74ea5bdf114212b4bbe9ed82c36d2e369e302dff57cb60d01c428f0bd3daab83ffffffff0001000000000000000000000000000000000000000000000000000000000000000000004847304402202a0b4b1294d70540235ae033d78e64b4897ec859c7b6f1b2b1d8a02e1d46006702201445e756d2254b0f1dfda9ab8e1e1bc26df9668077403204f32d16a49a36eb6983ffffffff02e9030000000000000151e803000000000000015100000000", "P2SH,WITNESS"],
+
+["P2WSH with a redeem representing a witness scriptPubKey should fail"],
+[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "0x00 0x20 0x34b6c399093e06cf9f0f7f660a1abcfe78fcf7b576f43993208edd9518a0ae9b", 1000]],
+"0100000000010100010000000000000000000000000000000000000000000000000000000000000000000000ffffffff0001045102010100000000", "P2SH,WITNESS"],
+
+["33 bytes push should be considered a witness scriptPubKey"],
+[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "0x60 0x21 0xff25429251b5a84f452230a3c75fd886b7fc5a7865ce4a7bb7a9d7c5be6da3dbff", 1000]],
+"010000000100010000000000000000000000000000000000000000000000000000000000000000000000ffffffff01e803000000000000015100000000", "P2SH,WITNESS,DISCOURAGE_UPGRADABLE_WITNESS_PROGRAM"],
+
 ["Make diffs cleaner by leaving a comment here without comma at the end"]
 ]
diff --git a/src/test/data/tx_valid.json b/src/test/data/tx_valid.json
index 717ad19549eb9..c9fe4e313a2eb 100644
--- a/src/test/data/tx_valid.json
+++ b/src/test/data/tx_valid.json
@@ -317,5 +317,175 @@
 [[["0000000000000000000000000000000000000000000000000000000000000100", 0, "HASH160 0x14 0x7c17aff532f22beb54069942f9bf567a66133eaf EQUAL"]],
 "0200000001000100000000000000000000000000000000000000000000000000000000000000000000030251b2010000000100000000000000000000000000", "P2SH,CHECKSEQUENCEVERIFY"],
 
+["Valid P2WPKH (Private key of segwit tests is L5AQtV2HDm4xGsseLokK2VAT2EtYKcTm3c7HwqnJBFt9LdaQULsM)"],
+[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "0x00 0x14 0x4c9c3dfac4207d5d8cb89df5722cb3d712385e3f", 1000]],
+"0100000000010100010000000000000000000000000000000000000000000000000000000000000000000000ffffffff01e8030000000000001976a9144c9c3dfac4207d5d8cb89df5722cb3d712385e3f88ac02483045022100cfb07164b36ba64c1b1e8c7720a56ad64d96f6ef332d3d37f9cb3c96477dc44502200a464cd7a9cf94cd70f66ce4f4f0625ef650052c7afcfe29d7d7e01830ff91ed012103596d3451025c19dbbdeb932d6bf8bfb4ad499b95b6f88db8899efac102e5fc7100000000", "P2SH,WITNESS"],
+
+["Valid P2WSH"],
+[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "0x00 0x20 0xff25429251b5a84f452230a3c75fd886b7fc5a7865ce4a7bb7a9d7c5be6da3db", 1000]],
+"0100000000010100010000000000000000000000000000000000000000000000000000000000000000000000ffffffff01e8030000000000001976a9144c9c3dfac4207d5d8cb89df5722cb3d712385e3f88ac02483045022100aa5d8aa40a90f23ce2c3d11bc845ca4a12acd99cbea37de6b9f6d86edebba8cb022022dedc2aa0a255f74d04c0b76ece2d7c691f9dd11a64a8ac49f62a99c3a05f9d01232103596d3451025c19dbbdeb932d6bf8bfb4ad499b95b6f88db8899efac102e5fc71ac00000000", "P2SH,WITNESS"],
+
+["Valid P2SH(P2WPKH)"],
+[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "HASH160 0x14 0xfe9c7dacc9fcfbf7e3b7d5ad06aa2b28c5a7b7e3 EQUAL", 1000]],
+"01000000000101000100000000000000000000000000000000000000000000000000000000000000000000171600144c9c3dfac4207d5d8cb89df5722cb3d712385e3fffffffff01e8030000000000001976a9144c9c3dfac4207d5d8cb89df5722cb3d712385e3f88ac02483045022100cfb07164b36ba64c1b1e8c7720a56ad64d96f6ef332d3d37f9cb3c96477dc44502200a464cd7a9cf94cd70f66ce4f4f0625ef650052c7afcfe29d7d7e01830ff91ed012103596d3451025c19dbbdeb932d6bf8bfb4ad499b95b6f88db8899efac102e5fc7100000000", "P2SH,WITNESS"],
+
+["Valid P2SH(P2WSH)"],
+[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "HASH160 0x14 0x2135ab4f0981830311e35600eebc7376dce3a914 EQUAL", 1000]],
+"0100000000010100010000000000000000000000000000000000000000000000000000000000000000000023220020ff25429251b5a84f452230a3c75fd886b7fc5a7865ce4a7bb7a9d7c5be6da3dbffffffff01e8030000000000001976a9144c9c3dfac4207d5d8cb89df5722cb3d712385e3f88ac02483045022100aa5d8aa40a90f23ce2c3d11bc845ca4a12acd99cbea37de6b9f6d86edebba8cb022022dedc2aa0a255f74d04c0b76ece2d7c691f9dd11a64a8ac49f62a99c3a05f9d01232103596d3451025c19dbbdeb932d6bf8bfb4ad499b95b6f88db8899efac102e5fc71ac00000000", "P2SH,WITNESS"],
+
+["Witness with SigHash Single|AnyoneCanPay"],
+[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "0x51", 1100],
+["0000000000000000000000000000000000000000000000000000000000000100", 1, "0x00 0x14 0x4c9c3dfac4207d5d8cb89df5722cb3d712385e3f", 2000],
+["0000000000000000000000000000000000000000000000000000000000000100", 2, "0x51", 3100],
+["0000000000000000000000000000000000000000000000000000000000000100", 3, "0x51", 4100]],
+"0100000000010400010000000000000000000000000000000000000000000000000000000000000200000000ffffffff00010000000000000000000000000000000000000000000000000000000000000100000000ffffffff00010000000000000000000000000000000000000000000000000000000000000000000000ffffffff00010000000000000000000000000000000000000000000000000000000000000300000000ffffffff05540b0000000000000151d0070000000000000151840300000000000001513c0f00000000000001512c010000000000000151000248304502210092f4777a0f17bf5aeb8ae768dec5f2c14feabf9d1fe2c89c78dfed0f13fdb86902206da90a86042e252bcd1e80a168c719e4a1ddcc3cebea24b9812c5453c79107e9832103596d3451025c19dbbdeb932d6bf8bfb4ad499b95b6f88db8899efac102e5fc71000000000000", "P2SH,WITNESS"],
+
+["Witness with SigHash Single|AnyoneCanPay (same signature as previous)"],
+[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "0x51", 1000],
+["0000000000000000000000000000000000000000000000000000000000000100", 1, "0x00 0x14 0x4c9c3dfac4207d5d8cb89df5722cb3d712385e3f", 2000],
+["0000000000000000000000000000000000000000000000000000000000000100", 2, "0x51", 3000]],
+"0100000000010300010000000000000000000000000000000000000000000000000000000000000000000000ffffffff00010000000000000000000000000000000000000000000000000000000000000100000000ffffffff00010000000000000000000000000000000000000000000000000000000000000200000000ffffffff03e8030000000000000151d0070000000000000151b80b0000000000000151000248304502210092f4777a0f17bf5aeb8ae768dec5f2c14feabf9d1fe2c89c78dfed0f13fdb86902206da90a86042e252bcd1e80a168c719e4a1ddcc3cebea24b9812c5453c79107e9832103596d3451025c19dbbdeb932d6bf8bfb4ad499b95b6f88db8899efac102e5fc710000000000", "P2SH,WITNESS"],
+
+["Witness with SigHash Single"],
+[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "0x51", 1000],
+["0000000000000000000000000000000000000000000000000000000000000100", 1, "0x00 0x14 0x4c9c3dfac4207d5d8cb89df5722cb3d712385e3f", 2000],
+["0000000000000000000000000000000000000000000000000000000000000100", 2, "0x51", 3000]],
+"0100000000010300010000000000000000000000000000000000000000000000000000000000000000000000ffffffff00010000000000000000000000000000000000000000000000000000000000000100000000ffffffff00010000000000000000000000000000000000000000000000000000000000000200000000ffffffff0484030000000000000151d0070000000000000151540b0000000000000151c800000000000000015100024730440220699e6b0cfe015b64ca3283e6551440a34f901ba62dd4c72fe1cb815afb2e6761022021cc5e84db498b1479de14efda49093219441adc6c543e5534979605e273d80b032103596d3451025c19dbbdeb932d6bf8bfb4ad499b95b6f88db8899efac102e5fc710000000000", "P2SH,WITNESS"],
+
+["Witness with SigHash Single (same signature as previous)"],
+[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "0x51", 1000],
+["0000000000000000000000000000000000000000000000000000000000000100", 1, "0x00 0x14 0x4c9c3dfac4207d5d8cb89df5722cb3d712385e3f", 2000],
+["0000000000000000000000000000000000000000000000000000000000000100", 2, "0x51", 3000]],
+"0100000000010300010000000000000000000000000000000000000000000000000000000000000000000000ffffffff00010000000000000000000000000000000000000000000000000000000000000100000000ffffffff00010000000000000000000000000000000000000000000000000000000000000200000000ffffffff03e8030000000000000151d0070000000000000151b80b000000000000015100024730440220699e6b0cfe015b64ca3283e6551440a34f901ba62dd4c72fe1cb815afb2e6761022021cc5e84db498b1479de14efda49093219441adc6c543e5534979605e273d80b032103596d3451025c19dbbdeb932d6bf8bfb4ad499b95b6f88db8899efac102e5fc710000000000", "P2SH,WITNESS"],
+
+["Witness with SigHash None|AnyoneCanPay"],
+[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "0x51", 1100],
+["0000000000000000000000000000000000000000000000000000000000000100", 1, "0x00 0x14 0x4c9c3dfac4207d5d8cb89df5722cb3d712385e3f", 2000],
+["0000000000000000000000000000000000000000000000000000000000000100", 2, "0x51", 3100],
+["0000000000000000000000000000000000000000000000000000000000000100", 3, "0x51", 4100]],
+"0100000000010400010000000000000000000000000000000000000000000000000000000000000200000000ffffffff00010000000000000000000000000000000000000000000000000000000000000000000000ffffffff00010000000000000000000000000000000000000000000000000000000000000100000000ffffffff00010000000000000000000000000000000000000000000000000000000000000300000000ffffffff04b60300000000000001519e070000000000000151860b00000000000001009600000000000000015100000248304502210091b32274295c2a3fa02f5bce92fb2789e3fc6ea947fbe1a76e52ea3f4ef2381a022079ad72aefa3837a2e0c033a8652a59731da05fa4a813f4fc48e87c075037256b822103596d3451025c19dbbdeb932d6bf8bfb4ad499b95b6f88db8899efac102e5fc710000000000", "P2SH,WITNESS"],
+
+["Witness with SigHash None|AnyoneCanPay (same signature as previous)"],
+[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "0x51", 1000],
+["0000000000000000000000000000000000000000000000000000000000000100", 1, "0x00 0x14 0x4c9c3dfac4207d5d8cb89df5722cb3d712385e3f", 2000],
+["0000000000000000000000000000000000000000000000000000000000000100", 2, "0x51", 3000]],
+"0100000000010300010000000000000000000000000000000000000000000000000000000000000000000000ffffffff00010000000000000000000000000000000000000000000000000000000000000100000000ffffffff00010000000000000000000000000000000000000000000000000000000000000200000000ffffffff03e8030000000000000151d0070000000000000151b80b0000000000000151000248304502210091b32274295c2a3fa02f5bce92fb2789e3fc6ea947fbe1a76e52ea3f4ef2381a022079ad72aefa3837a2e0c033a8652a59731da05fa4a813f4fc48e87c075037256b822103596d3451025c19dbbdeb932d6bf8bfb4ad499b95b6f88db8899efac102e5fc710000000000", "P2SH,WITNESS"],
+
+["Witness with SigHash None"],
+[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "0x51", 1000],
+["0000000000000000000000000000000000000000000000000000000000000100", 1, "0x00 0x14 0x4c9c3dfac4207d5d8cb89df5722cb3d712385e3f", 2000],
+["0000000000000000000000000000000000000000000000000000000000000100", 2, "0x51", 3000]],
+"0100000000010300010000000000000000000000000000000000000000000000000000000000000000000000ffffffff00010000000000000000000000000000000000000000000000000000000000000100000000ffffffff00010000000000000000000000000000000000000000000000000000000000000200000000ffffffff04b60300000000000001519e070000000000000151860b0000000000000100960000000000000001510002473044022022fceb54f62f8feea77faac7083c3b56c4676a78f93745adc8a35800bc36adfa022026927df9abcf0a8777829bcfcce3ff0a385fa54c3f9df577405e3ef24ee56479022103596d3451025c19dbbdeb932d6bf8bfb4ad499b95b6f88db8899efac102e5fc710000000000", "P2SH,WITNESS"],
+
+["Witness with SigHash None (same signature as previous)"],
+[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "0x51", 1000],
+["0000000000000000000000000000000000000000000000000000000000000100", 1, "0x00 0x14 0x4c9c3dfac4207d5d8cb89df5722cb3d712385e3f", 2000],
+["0000000000000000000000000000000000000000000000000000000000000100", 2, "0x51", 3000]],
+"0100000000010300010000000000000000000000000000000000000000000000000000000000000000000000ffffffff00010000000000000000000000000000000000000000000000000000000000000100000000ffffffff00010000000000000000000000000000000000000000000000000000000000000200000000ffffffff03e8030000000000000151d0070000000000000151b80b00000000000001510002473044022022fceb54f62f8feea77faac7083c3b56c4676a78f93745adc8a35800bc36adfa022026927df9abcf0a8777829bcfcce3ff0a385fa54c3f9df577405e3ef24ee56479022103596d3451025c19dbbdeb932d6bf8bfb4ad499b95b6f88db8899efac102e5fc710000000000", "P2SH,WITNESS"],
+
+["Witness with SigHash None (same signature, only sequences changed)"],
+[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "0x51", 1000],
+["0000000000000000000000000000000000000000000000000000000000000100", 1, "0x00 0x14 0x4c9c3dfac4207d5d8cb89df5722cb3d712385e3f", 2000],
+["0000000000000000000000000000000000000000000000000000000000000100", 2, "0x51", 3000]],
+"01000000000103000100000000000000000000000000000000000000000000000000000000000000000000000200000000010000000000000000000000000000000000000000000000000000000000000100000000ffffffff000100000000000000000000000000000000000000000000000000000000000002000000000200000003e8030000000000000151d0070000000000000151b80b00000000000001510002473044022022fceb54f62f8feea77faac7083c3b56c4676a78f93745adc8a35800bc36adfa022026927df9abcf0a8777829bcfcce3ff0a385fa54c3f9df577405e3ef24ee56479022103596d3451025c19dbbdeb932d6bf8bfb4ad499b95b6f88db8899efac102e5fc710000000000", "P2SH,WITNESS"],
+
+["Witness with SigHash All|AnyoneCanPay"],
+[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "0x51", 1100],
+["0000000000000000000000000000000000000000000000000000000000000100", 1, "0x00 0x14 0x4c9c3dfac4207d5d8cb89df5722cb3d712385e3f", 2000],
+["0000000000000000000000000000000000000000000000000000000000000100", 2, "0x51", 3100],
+["0000000000000000000000000000000000000000000000000000000000000100", 3, "0x51", 4100]],
+"0100000000010400010000000000000000000000000000000000000000000000000000000000000200000000ffffffff00010000000000000000000000000000000000000000000000000000000000000000000000ffffffff00010000000000000000000000000000000000000000000000000000000000000100000000ffffffff00010000000000000000000000000000000000000000000000000000000000000300000000ffffffff03e8030000000000000151d0070000000000000151b80b0000000000000151000002483045022100a3cec69b52cba2d2de623eeef89e0ba1606184ea55476c0f8189fda231bc9cbb022003181ad597f7c380a7d1c740286b1d022b8b04ded028b833282e055e03b8efef812103596d3451025c19dbbdeb932d6bf8bfb4ad499b95b6f88db8899efac102e5fc710000000000", "P2SH,WITNESS"],
+
+["Witness with SigHash All|AnyoneCanPay (same signature as previous)"],
+[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "0x51", 1000],
+["0000000000000000000000000000000000000000000000000000000000000100", 1, "0x00 0x14 0x4c9c3dfac4207d5d8cb89df5722cb3d712385e3f", 2000],
+["0000000000000000000000000000000000000000000000000000000000000100", 2, "0x51", 3000]],
+"0100000000010300010000000000000000000000000000000000000000000000000000000000000000000000ffffffff00010000000000000000000000000000000000000000000000000000000000000100000000ffffffff00010000000000000000000000000000000000000000000000000000000000000200000000ffffffff03e8030000000000000151d0070000000000000151b80b00000000000001510002483045022100a3cec69b52cba2d2de623eeef89e0ba1606184ea55476c0f8189fda231bc9cbb022003181ad597f7c380a7d1c740286b1d022b8b04ded028b833282e055e03b8efef812103596d3451025c19dbbdeb932d6bf8bfb4ad499b95b6f88db8899efac102e5fc710000000000", "P2SH,WITNESS"],
+
+["Unknown witness program version  (without DISCOURAGE_UPGRADABLE_WITNESS_PROGRAM)"],
+[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "0x51", 1000],
+["0000000000000000000000000000000000000000000000000000000000000100", 1, "0x60 0x14 0x4c9c3dfac4207d5d8cb89df5722cb3d712385e3f", 2000],
+["0000000000000000000000000000000000000000000000000000000000000100", 2, "0x51", 3000]],
+"0100000000010300010000000000000000000000000000000000000000000000000000000000000000000000ffffffff00010000000000000000000000000000000000000000000000000000000000000100000000ffffffff00010000000000000000000000000000000000000000000000000000000000000200000000ffffffff03e8030000000000000151d0070000000000000151b80b00000000000001510002483045022100a3cec69b52cba2d2de623ffffffffff1606184ea55476c0f8189fda231bc9cbb022003181ad597f7c380a7d1c740286b1d022b8b04ded028b833282e055e03b8efef812103596d3451025c19dbbdeb932d6bf8bfb4ad499b95b6f88db8899efac102e5fc710000000000", "P2SH,WITNESS"],
+
+["Witness with a push of 520 bytes"],
+[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "0x00 0x20 0x33198a9bfef674ebddb9ffaa52928017b8472791e54c609cb95f278ac6b1e349", 1000]],
+"0100000000010100010000000000000000000000000000000000000000000000000000000000000000000000ffffffff010000000000000000015102fd08020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002755100000000", "P2SH,WITNESS"],
+
+["Transaction mixing all SigHash, segwit and normal inputs"],
+[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "0x00 0x14 0x4c9c3dfac4207d5d8cb89df5722cb3d712385e3f", 1000],
+["0000000000000000000000000000000000000000000000000000000000000100", 1, "0x00 0x14 0x4c9c3dfac4207d5d8cb89df5722cb3d712385e3f", 1001],
+["0000000000000000000000000000000000000000000000000000000000000100", 2, "DUP HASH160 0x14 0x4c9c3dfac4207d5d8cb89df5722cb3d712385e3f EQUALVERIFY CHECKSIG", 1002],
+["0000000000000000000000000000000000000000000000000000000000000100", 3, "DUP HASH160 0x14 0x4c9c3dfac4207d5d8cb89df5722cb3d712385e3f EQUALVERIFY CHECKSIG", 1003],
+["0000000000000000000000000000000000000000000000000000000000000100", 4, "DUP HASH160 0x14 0x4c9c3dfac4207d5d8cb89df5722cb3d712385e3f EQUALVERIFY CHECKSIG", 1004],
+["0000000000000000000000000000000000000000000000000000000000000100", 5, "DUP HASH160 0x14 0x4c9c3dfac4207d5d8cb89df5722cb3d712385e3f EQUALVERIFY CHECKSIG", 1005],
+["0000000000000000000000000000000000000000000000000000000000000100", 6, "DUP HASH160 0x14 0x4c9c3dfac4207d5d8cb89df5722cb3d712385e3f EQUALVERIFY CHECKSIG", 1006],
+["0000000000000000000000000000000000000000000000000000000000000100", 7, "0x00 0x14 0x4c9c3dfac4207d5d8cb89df5722cb3d712385e3f", 1007],
+["0000000000000000000000000000000000000000000000000000000000000100", 8, "0x00 0x14 0x4c9c3dfac4207d5d8cb89df5722cb3d712385e3f", 1008],
+["0000000000000000000000000000000000000000000000000000000000000100", 9, "0x00 0x14 0x4c9c3dfac4207d5d8cb89df5722cb3d712385e3f", 1009],
+["0000000000000000000000000000000000000000000000000000000000000100", 10, "0x00 0x14 0x4c9c3dfac4207d5d8cb89df5722cb3d712385e3f", 1010],
+["0000000000000000000000000000000000000000000000000000000000000100", 11, "DUP HASH160 0x14 0x4c9c3dfac4207d5d8cb89df5722cb3d712385e3f EQUALVERIFY CHECKSIG", 1011]],
+"0100000000010c00010000000000000000000000000000000000000000000000000000000000000000000000ffffffff00010000000000000000000000000000000000000000000000000000000000000100000000ffffffff0001000000000000000000000000000000000000000000000000000000000000020000006a473044022026c2e65b33fcd03b2a3b0f25030f0244bd23cc45ae4dec0f48ae62255b1998a00220463aa3982b718d593a6b9e0044513fd67a5009c2fdccc59992cffc2b167889f4012103596d3451025c19dbbdeb932d6bf8bfb4ad499b95b6f88db8899efac102e5fc71ffffffff0001000000000000000000000000000000000000000000000000000000000000030000006a4730440220008bd8382911218dcb4c9f2e75bf5c5c3635f2f2df49b36994fde85b0be21a1a02205a539ef10fb4c778b522c1be852352ea06c67ab74200977c722b0bc68972575a012103596d3451025c19dbbdeb932d6bf8bfb4ad499b95b6f88db8899efac102e5fc71ffffffff0001000000000000000000000000000000000000000000000000000000000000040000006b483045022100d9436c32ff065127d71e1a20e319e4fe0a103ba0272743dbd8580be4659ab5d302203fd62571ee1fe790b182d078ecfd092a509eac112bea558d122974ef9cc012c7012103596d3451025c19dbbdeb932d6bf8bfb4ad499b95b6f88db8899efac102e5fc71ffffffff0001000000000000000000000000000000000000000000000000000000000000050000006a47304402200e2c149b114ec546015c13b2b464bbcb0cdc5872e6775787527af6cbc4830b6c02207e9396c6979fb15a9a2b96ca08a633866eaf20dc0ff3c03e512c1d5a1654f148012103596d3451025c19dbbdeb932d6bf8bfb4ad499b95b6f88db8899efac102e5fc71ffffffff0001000000000000000000000000000000000000000000000000000000000000060000006b483045022100b20e70d897dc15420bccb5e0d3e208d27bdd676af109abbd3f88dbdb7721e6d6022005836e663173fbdfe069f54cde3c2decd3d0ea84378092a5d9d85ec8642e8a41012103596d3451025c19dbbdeb932d6bf8bfb4ad499b95b6f88db8899efac102e5fc71ffffffff00010000000000000000000000000000000000000000000000000000000000000700000000ffffffff00010000000000000000000000000000000000000000000000000000000000000800000000ffffffff00010000000000000000000000000000000000000000000000000000000000000900000000ffffffff00010000000000000000000000000000000000000000000000000000000000000a00000000ffffffff00010000000000000000000000000000000000000000000000000000000000000b0000006a47304402206639c6e05e3b9d2675a7f3876286bdf7584fe2bbd15e0ce52dd4e02c0092cdc60220757d60b0a61fc95ada79d23746744c72bac1545a75ff6c2c7cdb6ae04e7e9592012103596d3451025c19dbbdeb932d6bf8bfb4ad499b95b6f88db8899efac102e5fc71ffffffff0ce8030000000000000151e9030000000000000151ea030000000000000151eb030000000000000151ec030000000000000151ed030000000000000151ee030000000000000151ef030000000000000151f0030000000000000151f1030000000000000151f2030000000000000151f30300000000000001510248304502210082219a54f61bf126bfc3fa068c6e33831222d1d7138c6faa9d33ca87fd4202d6022063f9902519624254d7c2c8ea7ba2d66ae975e4e229ae38043973ec707d5d4a83012103596d3451025c19dbbdeb932d6bf8bfb4ad499b95b6f88db8899efac102e5fc7102473044022017fb58502475848c1b09f162cb1688d0920ff7f142bed0ef904da2ccc88b168f02201798afa61850c65e77889cbcd648a5703b487895517c88f85cdd18b021ee246a012103596d3451025c19dbbdeb932d6bf8bfb4ad499b95b6f88db8899efac102e5fc7100000000000247304402202830b7926e488da75782c81a54cd281720890d1af064629ebf2e31bf9f5435f30220089afaa8b455bbeb7d9b9c3fe1ed37d07685ade8455c76472cda424d93e4074a012103596d3451025c19dbbdeb932d6bf8bfb4ad499b95b6f88db8899efac102e5fc7102473044022026326fcdae9207b596c2b05921dbac11d81040c4d40378513670f19d9f4af893022034ecd7a282c0163b89aaa62c22ec202cef4736c58cd251649bad0d8139bcbf55012103596d3451025c19dbbdeb932d6bf8bfb4ad499b95b6f88db8899efac102e5fc71024730440220214978daeb2f38cd426ee6e2f44131a33d6b191af1c216247f1dd7d74c16d84a02205fdc05529b0bc0c430b4d5987264d9d075351c4f4484c16e91662e90a72aab24012103596d3451025c19dbbdeb932d6bf8bfb4ad499b95b6f88db8899efac102e5fc710247304402204a6e9f199dc9672cf2ff8094aaa784363be1eb62b679f7ff2df361124f1dca3302205eeb11f70fab5355c9c8ad1a0700ea355d315e334822fa182227e9815308ee8f012103596d3451025c19dbbdeb932d6bf8bfb4ad499b95b6f88db8899efac102e5fc710000000000", "P2SH,WITNESS"],
+
+["Unknown version witness program with empty witness"],
+[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "0x60 0x14 0x4c9c3dfac4207d5d8cb89df5722cb3d712385e3f", 1000]],
+"010000000100010000000000000000000000000000000000000000000000000000000000000000000000ffffffff01e803000000000000015100000000", "P2SH,WITNESS"],
+
+["Witness SIGHASH_SINGLE with output out of bound"],
+[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "0x51", 1000],
+["0000000000000000000000000000000000000000000000000000000000000100", 1, "0x00 0x20 0x4d6c2a32c87821d68fc016fca70797abdb80df6cd84651d40a9300c6bad79e62", 1000]],
+"0100000000010200010000000000000000000000000000000000000000000000000000000000000000000000ffffffff00010000000000000000000000000000000000000000000000000000000000000100000000ffffffff01d00700000000000001510003483045022100e078de4e96a0e05dcdc0a414124dd8475782b5f3f0ed3f607919e9a5eeeb22bf02201de309b3a3109adb3de8074b3610d4cf454c49b61247a2779a0bcbf31c889333032103596d3451025c19dbbdeb932d6bf8bfb4ad499b95b6f88db8899efac102e5fc711976a9144c9c3dfac4207d5d8cb89df5722cb3d712385e3f88ac00000000", "P2SH,WITNESS"],
+
+["1 byte push should not be considered a witness scriptPubKey"],
+[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "0x60 0x01 0x01", 1000]],
+"010000000100010000000000000000000000000000000000000000000000000000000000000000000000ffffffff01e803000000000000015100000000", "P2SH,WITNESS,DISCOURAGE_UPGRADABLE_WITNESS_PROGRAM"],
+
+["41 bytes push should not be considered a witness scriptPubKey"],
+[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "0x60 0x29 0xff25429251b5a84f452230a3c75fd886b7fc5a7865ce4a7bb7a9d7c5be6da3dbff0000000000000000", 1000]],
+"010000000100010000000000000000000000000000000000000000000000000000000000000000000000ffffffff01e803000000000000015100000000", "P2SH,WITNESS,DISCOURAGE_UPGRADABLE_WITNESS_PROGRAM"],
+
+["The witness version must use OP_1 to OP_16 only"],
+[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "0x01 0x10 0x02 0x0001", 1000]],
+"010000000100010000000000000000000000000000000000000000000000000000000000000000000000ffffffff01e803000000000000015100000000", "P2SH,WITNESS,DISCOURAGE_UPGRADABLE_WITNESS_PROGRAM"],
+
+["The witness program push must be canonical"],
+[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "0x60 0x4c02 0x0001", 1000]],
+"010000000100010000000000000000000000000000000000000000000000000000000000000000000000ffffffff01e803000000000000015100000000", "P2SH,WITNESS,DISCOURAGE_UPGRADABLE_WITNESS_PROGRAM"],
+
+["Witness Single|AnyoneCanPay does not hash input's position"],
+[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "0x00 0x14 0x4c9c3dfac4207d5d8cb89df5722cb3d712385e3f", 1000],
+["0000000000000000000000000000000000000000000000000000000000000100", 1, "0x00 0x14 0x4c9c3dfac4207d5d8cb89df5722cb3d712385e3f", 1001]],
+"0100000000010200010000000000000000000000000000000000000000000000000000000000000000000000ffffffff00010000000000000000000000000000000000000000000000000000000000000100000000ffffffff02e8030000000000000151e90300000000000001510247304402206d59682663faab5e4cb733c562e22cdae59294895929ec38d7c016621ff90da0022063ef0af5f970afe8a45ea836e3509b8847ed39463253106ac17d19c437d3d56b832103596d3451025c19dbbdeb932d6bf8bfb4ad499b95b6f88db8899efac102e5fc710248304502210085001a820bfcbc9f9de0298af714493f8a37b3b354bfd21a7097c3e009f2018c022050a8b4dbc8155d4d04da2f5cdd575dcf8dd0108de8bec759bd897ea01ecb3af7832103596d3451025c19dbbdeb932d6bf8bfb4ad499b95b6f88db8899efac102e5fc7100000000", "P2SH,WITNESS"],
+
+["Witness Single|AnyoneCanPay does not hash input's position (permutation)"],
+[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "0x00 0x14 0x4c9c3dfac4207d5d8cb89df5722cb3d712385e3f", 1000],
+["0000000000000000000000000000000000000000000000000000000000000100", 1, "0x00 0x14 0x4c9c3dfac4207d5d8cb89df5722cb3d712385e3f", 1001]],
+"0100000000010200010000000000000000000000000000000000000000000000000000000000000100000000ffffffff00010000000000000000000000000000000000000000000000000000000000000000000000ffffffff02e9030000000000000151e80300000000000001510248304502210085001a820bfcbc9f9de0298af714493f8a37b3b354bfd21a7097c3e009f2018c022050a8b4dbc8155d4d04da2f5cdd575dcf8dd0108de8bec759bd897ea01ecb3af7832103596d3451025c19dbbdeb932d6bf8bfb4ad499b95b6f88db8899efac102e5fc710247304402206d59682663faab5e4cb733c562e22cdae59294895929ec38d7c016621ff90da0022063ef0af5f970afe8a45ea836e3509b8847ed39463253106ac17d19c437d3d56b832103596d3451025c19dbbdeb932d6bf8bfb4ad499b95b6f88db8899efac102e5fc7100000000", "P2SH,WITNESS"],
+
+["Non witness Single|AnyoneCanPay hash input's position"],
+[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "0x21 0x03596d3451025c19dbbdeb932d6bf8bfb4ad499b95b6f88db8899efac102e5fc71 CHECKSIG", 1000],
+["0000000000000000000000000000000000000000000000000000000000000100", 1, "0x21 0x03596d3451025c19dbbdeb932d6bf8bfb4ad499b95b6f88db8899efac102e5fc71 CHECKSIG", 1001]],
+"01000000020001000000000000000000000000000000000000000000000000000000000000000000004847304402202a0b4b1294d70540235ae033d78e64b4897ec859c7b6f1b2b1d8a02e1d46006702201445e756d2254b0f1dfda9ab8e1e1bc26df9668077403204f32d16a49a36eb6983ffffffff00010000000000000000000000000000000000000000000000000000000000000100000049483045022100acb96cfdbda6dc94b489fd06f2d720983b5f350e31ba906cdbd800773e80b21c02200d74ea5bdf114212b4bbe9ed82c36d2e369e302dff57cb60d01c428f0bd3daab83ffffffff02e8030000000000000151e903000000000000015100000000", "P2SH,WITNESS"],
+
+["BIP143 examples: details and private keys are available in BIP143"],
+["BIP143 example: P2WSH with OP_CODESEPARATOR and out-of-range SIGHASH_SINGLE."],
+[[["6eb316926b1c5d567cd6f5e6a84fec606fc53d7b474526d1fff3948020c93dfe", 0, "0x21 0x036d5c20fa14fb2f635474c1dc4ef5909d4568e5569b79fc94d3448486e14685f8 CHECKSIG", 156250000],
+["f825690aee1b3dc247da796cacb12687a5e802429fd291cfd63e010f02cf1508", 0, "0x00 0x20 0x5d1b56b63d714eebe542309525f484b7e9d6f686b3781b6f61ef925d66d6f6a0", 4900000000]],
+"01000000000102fe3dc9208094f3ffd12645477b3dc56f60ec4fa8e6f5d67c565d1c6b9216b36e000000004847304402200af4e47c9b9629dbecc21f73af989bdaa911f7e6f6c2e9394588a3aa68f81e9902204f3fcf6ade7e5abb1295b6774c8e0abd94ae62217367096bc02ee5e435b67da201ffffffff0815cf020f013ed6cf91d29f4202e8a58726b1ac6c79da47c23d1bee0a6925f80000000000ffffffff0100f2052a010000001976a914a30741f8145e5acadf23f751864167f32e0963f788ac000347304402200de66acf4527789bfda55fc5459e214fa6083f936b430a762c629656216805ac0220396f550692cd347171cbc1ef1f51e15282e837bb2b30860dc77c8f78bc8501e503473044022027dc95ad6b740fe5129e7e62a75dd00f291a2aeb1200b84b09d9e3789406b6c002201a9ecd315dd6a0e632ab20bbb98948bc0c6fb204f2c286963bb48517a7058e27034721026dccc749adc2a9d0d89497ac511f760f45c47dc5ed9cf352a58ac706453880aeadab210255a9626aebf5e29c0e6538428ba0d1dcf6ca98ffdf086aa8ced5e0d0215ea465ac00000000", "P2SH,WITNESS"],
+
+["BIP143 example: P2WSH with unexecuted OP_CODESEPARATOR and SINGLE|ANYONECANPAY"],
+[[["01c0cf7fba650638e55eb91261b183251fbb466f90dff17f10086817c542b5e9", 0, "0x00 0x20 0xba468eea561b26301e4cf69fa34bde4ad60c81e70f059f045ca9a79931004a4d", 16777215],
+["1b2a9a426ba603ba357ce7773cb5805cb9c7c2b386d100d1fc9263513188e680", 0, "0x00 0x20 0xd9bbfbe56af7c4b7f960a70d7ea107156913d9e5a26b0a71429df5e097ca6537", 16777215]],
+"01000000000102e9b542c5176808107ff1df906f46bb1f2583b16112b95ee5380665ba7fcfc0010000000000ffffffff80e68831516392fcd100d186b3c2c7b95c80b53c77e77c35ba03a66b429a2a1b0000000000ffffffff0280969800000000001976a914de4b231626ef508c9a74a8517e6783c0546d6b2888ac80969800000000001976a9146648a8cd4531e1ec47f35916de8e259237294d1e88ac02483045022100f6a10b8604e6dc910194b79ccfc93e1bc0ec7c03453caaa8987f7d6c3413566002206216229ede9b4d6ec2d325be245c5b508ff0339bf1794078e20bfe0babc7ffe683270063ab68210392972e2eb617b2388771abe27235fd5ac44af8e61693261550447a4c3e39da98ac024730440220032521802a76ad7bf74d0e2c218b72cf0cbc867066e2e53db905ba37f130397e02207709e2188ed7f08f4c952d9d13986da504502b8c3be59617e043552f506c46ff83275163ab68210392972e2eb617b2388771abe27235fd5ac44af8e61693261550447a4c3e39da98ac00000000", "P2SH,WITNESS"],
+
+["BIP143 example: Same as the previous example with input-output paris swapped"],
+[[["1b2a9a426ba603ba357ce7773cb5805cb9c7c2b386d100d1fc9263513188e680", 0, "0x00 0x20 0xd9bbfbe56af7c4b7f960a70d7ea107156913d9e5a26b0a71429df5e097ca6537", 16777215],
+["01c0cf7fba650638e55eb91261b183251fbb466f90dff17f10086817c542b5e9", 0, "0x00 0x20 0xba468eea561b26301e4cf69fa34bde4ad60c81e70f059f045ca9a79931004a4d", 16777215]],
+"0100000000010280e68831516392fcd100d186b3c2c7b95c80b53c77e77c35ba03a66b429a2a1b0000000000ffffffffe9b542c5176808107ff1df906f46bb1f2583b16112b95ee5380665ba7fcfc0010000000000ffffffff0280969800000000001976a9146648a8cd4531e1ec47f35916de8e259237294d1e88ac80969800000000001976a914de4b231626ef508c9a74a8517e6783c0546d6b2888ac024730440220032521802a76ad7bf74d0e2c218b72cf0cbc867066e2e53db905ba37f130397e02207709e2188ed7f08f4c952d9d13986da504502b8c3be59617e043552f506c46ff83275163ab68210392972e2eb617b2388771abe27235fd5ac44af8e61693261550447a4c3e39da98ac02483045022100f6a10b8604e6dc910194b79ccfc93e1bc0ec7c03453caaa8987f7d6c3413566002206216229ede9b4d6ec2d325be245c5b508ff0339bf1794078e20bfe0babc7ffe683270063ab68210392972e2eb617b2388771abe27235fd5ac44af8e61693261550447a4c3e39da98ac00000000", "P2SH,WITNESS"],
+
+["BIP143 example: P2SH-P2WSH 6-of-6 multisig signed with 6 different SIGHASH types"],
+[[["6eb98797a21c6c10aa74edf29d618be109f48a8e94c694f3701e08ca69186436", 1, "HASH160 0x14 0x9993a429037b5d912407a71c252019287b8d27a5 EQUAL", 987654321]],
+"0100000000010136641869ca081e70f394c6948e8af409e18b619df2ed74aa106c1ca29787b96e0100000023220020a16b5755f7f6f96dbd65f5f0d6ab9418b89af4b1f14a1bb8a09062c35f0dcb54ffffffff0200e9a435000000001976a914389ffce9cd9ae88dcc0631e88a821ffdbe9bfe2688acc0832f05000000001976a9147480a33f950689af511e6e84c138dbbd3c3ee41588ac080047304402206ac44d672dac41f9b00e28f4df20c52eeb087207e8d758d76d92c6fab3b73e2b0220367750dbbe19290069cba53d096f44530e4f98acaa594810388cf7409a1870ce01473044022068c7946a43232757cbdf9176f009a928e1cd9a1a8c212f15c1e11ac9f2925d9002205b75f937ff2f9f3c1246e547e54f62e027f64eefa2695578cc6432cdabce271502473044022059ebf56d98010a932cf8ecfec54c48e6139ed6adb0728c09cbe1e4fa0915302e022007cd986c8fa870ff5d2b3a89139c9fe7e499259875357e20fcbb15571c76795403483045022100fbefd94bd0a488d50b79102b5dad4ab6ced30c4069f1eaa69a4b5a763414067e02203156c6a5c9cf88f91265f5a942e96213afae16d83321c8b31bb342142a14d16381483045022100a5263ea0553ba89221984bd7f0b13613db16e7a70c549a86de0cc0444141a407022005c360ef0ae5a5d4f9f2f87a56c1546cc8268cab08c73501d6b3be2e1e1a8a08824730440220525406a1482936d5a21888260dc165497a90a15669636d8edca6b9fe490d309c022032af0c646a34a44d1f4576bf6a4a74b67940f8faa84c7df9abe12a01a11e2b4783cf56210307b8ae49ac90a048e9b53357a2354b3334e9c8bee813ecb98e99a7e07e8c3ba32103b28f0c28bfab54554ae8c658ac5c3e0ce6e79ad336331f78c428dd43eea8449b21034b8113d703413d57761b8b9781957b8c0ac1dfe69f492580ca4195f50376ba4a21033400f6afecb833092a9a21cfdf1ed1376e58c5d1f47de74683123987e967a8f42103a6d48b1131e94ba04d9737d61acdaa1322008af9602b3b14862c07a1789aac162102d8b661b0b3302ee2f162b09e07a55ad5dfbe673a9f01d9f0c19617681024306b56ae00000000", "P2SH,WITNESS"],
+
 ["Make diffs cleaner by leaving a comment here without comma at the end"]
 ]
diff --git a/src/test/transaction_tests.cpp b/src/test/transaction_tests.cpp
index 76f998ac24eec..fd4f174b40c80 100644
--- a/src/test/transaction_tests.cpp
+++ b/src/test/transaction_tests.cpp
@@ -50,7 +50,9 @@ static std::map<string, unsigned int> mapFlagNames = boost::assign::map_list_of
     (string("DISCOURAGE_UPGRADABLE_NOPS"), (unsigned int)SCRIPT_VERIFY_DISCOURAGE_UPGRADABLE_NOPS)
     (string("CLEANSTACK"), (unsigned int)SCRIPT_VERIFY_CLEANSTACK)
     (string("CHECKLOCKTIMEVERIFY"), (unsigned int)SCRIPT_VERIFY_CHECKLOCKTIMEVERIFY)
-    (string("CHECKSEQUENCEVERIFY"), (unsigned int)SCRIPT_VERIFY_CHECKSEQUENCEVERIFY);
+    (string("CHECKSEQUENCEVERIFY"), (unsigned int)SCRIPT_VERIFY_CHECKSEQUENCEVERIFY)
+    (string("WITNESS"), (unsigned int)SCRIPT_VERIFY_WITNESS)
+    (string("DISCOURAGE_UPGRADABLE_WITNESS_PROGRAM"), (unsigned int)SCRIPT_VERIFY_DISCOURAGE_UPGRADABLE_WITNESS_PROGRAM);
 
 unsigned int ParseScriptFlags(string strFlags)
 {
@@ -113,6 +115,7 @@ BOOST_AUTO_TEST_CASE(tx_valid)
             }
 
             map<COutPoint, CScript> mapprevOutScriptPubKeys;
+            map<COutPoint, int64_t> mapprevOutValues;
             UniValue inputs = test[0].get_array();
             bool fValid = true;
 	    for (unsigned int inpIdx = 0; inpIdx < inputs.size(); inpIdx++) {
@@ -123,13 +126,17 @@ BOOST_AUTO_TEST_CASE(tx_valid)
                     break;
                 }
                 UniValue vinput = input.get_array();
-                if (vinput.size() != 3)
+                if (vinput.size() < 3 || vinput.size() > 4)
                 {
                     fValid = false;
                     break;
                 }
-
-                mapprevOutScriptPubKeys[COutPoint(uint256S(vinput[0].get_str()), vinput[1].get_int())] = ParseScript(vinput[2].get_str());
+                COutPoint outpoint(uint256S(vinput[0].get_str()), vinput[1].get_int());
+                mapprevOutScriptPubKeys[outpoint] = ParseScript(vinput[2].get_str());
+                if (vinput.size() >= 4)
+                {
+                    mapprevOutValues[outpoint] = vinput[3].get_int64();
+                }
             }
             if (!fValid)
             {
@@ -155,9 +162,13 @@ BOOST_AUTO_TEST_CASE(tx_valid)
                 }
 
                 CAmount amount = 0;
+                if (mapprevOutValues.count(tx.vin[i].prevout)) {
+                    amount = mapprevOutValues[tx.vin[i].prevout];
+                }
                 unsigned int verify_flags = ParseScriptFlags(test[2].get_str());
+                const CScriptWitness *witness = (i < tx.wit.vtxinwit.size()) ? &tx.wit.vtxinwit[i].scriptWitness : NULL;
                 BOOST_CHECK_MESSAGE(VerifyScript(tx.vin[i].scriptSig, mapprevOutScriptPubKeys[tx.vin[i].prevout],
-                                                 NULL, verify_flags, TransactionSignatureChecker(&tx, i, amount), &err),
+                                                 witness, verify_flags, TransactionSignatureChecker(&tx, i, amount), &err),
                                     strTest);
                 BOOST_CHECK_MESSAGE(err == SCRIPT_ERR_OK, ScriptErrorString(err));
             }
@@ -189,6 +200,7 @@ BOOST_AUTO_TEST_CASE(tx_invalid)
             }
 
             map<COutPoint, CScript> mapprevOutScriptPubKeys;
+            map<COutPoint, int64_t> mapprevOutValues;
             UniValue inputs = test[0].get_array();
             bool fValid = true;
 	    for (unsigned int inpIdx = 0; inpIdx < inputs.size(); inpIdx++) {
@@ -199,13 +211,17 @@ BOOST_AUTO_TEST_CASE(tx_invalid)
                     break;
                 }
                 UniValue vinput = input.get_array();
-                if (vinput.size() != 3)
+                if (vinput.size() < 3 || vinput.size() > 4)
                 {
                     fValid = false;
                     break;
                 }
-
-                mapprevOutScriptPubKeys[COutPoint(uint256S(vinput[0].get_str()), vinput[1].get_int())] = ParseScript(vinput[2].get_str());
+                COutPoint outpoint(uint256S(vinput[0].get_str()), vinput[1].get_int());
+                mapprevOutScriptPubKeys[outpoint] = ParseScript(vinput[2].get_str());
+                if (vinput.size() >= 4)
+                {
+                    mapprevOutValues[outpoint] = vinput[3].get_int64();
+                }
             }
             if (!fValid)
             {
@@ -231,8 +247,12 @@ BOOST_AUTO_TEST_CASE(tx_invalid)
 
                 unsigned int verify_flags = ParseScriptFlags(test[2].get_str());
                 CAmount amount = 0;
+                if (mapprevOutValues.count(tx.vin[i].prevout)) {
+                    amount = mapprevOutValues[tx.vin[i].prevout];
+                }
+                const CScriptWitness *witness = (i < tx.wit.vtxinwit.size()) ? &tx.wit.vtxinwit[i].scriptWitness : NULL;
                 fValid = VerifyScript(tx.vin[i].scriptSig, mapprevOutScriptPubKeys[tx.vin[i].prevout],
-                                      NULL, verify_flags, TransactionSignatureChecker(&tx, i, amount), &err);
+                                      witness, verify_flags, TransactionSignatureChecker(&tx, i, amount), &err);
             }
             BOOST_CHECK_MESSAGE(!fValid, strTest);
             BOOST_CHECK_MESSAGE(err != SCRIPT_ERR_OK, ScriptErrorString(err));
@@ -422,7 +442,7 @@ BOOST_AUTO_TEST_CASE(test_witness)
     scriptPubkey1 << ToByteVector(pubkey1) << OP_CHECKSIG;
     scriptPubkey2 << ToByteVector(pubkey2) << OP_CHECKSIG;
     scriptPubkey1L << ToByteVector(pubkey1L) << OP_CHECKSIG;
-    scriptPubkey2L << ToByteVector(pubkey2L) << OP_CHECKSIG; 
+    scriptPubkey2L << ToByteVector(pubkey2L) << OP_CHECKSIG;
     std::vector<CPubKey> oneandthree;
     oneandthree.push_back(pubkey1);
     oneandthree.push_back(pubkey3);

From 06d3805c1a44aae39ad95538063e6882249b7633 Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Mon, 4 Apr 2016 16:01:27 +0200
Subject: [PATCH 0555/1802] [qa] Add segwit support to script_tests

Contains fix by Johnson Lau.
---
 src/test/data/script_tests.json |  8 ++++-
 src/test/script_tests.cpp       | 53 ++++++++++++++++++++++-----------
 2 files changed, 42 insertions(+), 19 deletions(-)

diff --git a/src/test/data/script_tests.json b/src/test/data/script_tests.json
index 0bdac182e0079..f6ee7ade42530 100644
--- a/src/test/data/script_tests.json
+++ b/src/test/data/script_tests.json
@@ -1,5 +1,5 @@
 [
-["Format is: [scriptSig, scriptPubKey, flags, expected_scripterror, ... comments]"],
+["Format is: [[wit...]?, 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"],
@@ -1253,6 +1253,12 @@
 ["0x17 0x3014021077777777777777777777777777777777020001", "0 CHECKSIG NOT", "DERSIG", "SIG_DER", "Zero-length S is incorrectly encoded for DERSIG"],
 ["0x27 0x302402107777777777777777777777777777777702108777777777777777777777777777777701", "0 CHECKSIG NOT", "DERSIG", "SIG_DER", "Negative S is incorrectly encoded for DERSIG"],
 
+["Some basic segwit checks"],
+[["00"], "", "0 0x206e340b9cffb37a989ca544e6bb780a2c78901d3fb33738768511a30617afa01d", "P2SH,WITNESS", "EVAL_FALSE", "Invalid witness script"],
+[["51"], "", "0 0x206e340b9cffb37a989ca544e6bb780a2c78901d3fb33738768511a30617afa01d", "P2SH,WITNESS", "WITNESS_PROGRAM_MISMATCH", "Witness script hash mismatch"],
+[["00"], "", "0 0x206e340b9cffb37a989ca544e6bb780a2c78901d3fb33738768511a30617afa01d", "", "OK", "Invalid witness script without WITNESS"],
+[["51"], "", "0 0x206e340b9cffb37a989ca544e6bb780a2c78901d3fb33738768511a30617afa01d", "", "OK", "Witness script hash mismatch without WITNESS"],
+
 ["Automatically generated test cases"],
 [
     "0x47 0x304402200a5c6163f07b8d3b013c4d1d6dba25e780b39658d79ba37af7057a3b7f15ffa102201fd9b4eaa9943f734928b99a83592c2e7bf342ea2680f6a2bb705167966b742001",
diff --git a/src/test/script_tests.cpp b/src/test/script_tests.cpp
index 1d69194c3e89c..88f1562b103b0 100644
--- a/src/test/script_tests.cpp
+++ b/src/test/script_tests.cpp
@@ -88,7 +88,14 @@ static ScriptErrorDesc script_errors[]={
     {SCRIPT_ERR_SIG_NULLDUMMY, "SIG_NULLDUMMY"},
     {SCRIPT_ERR_PUBKEYTYPE, "PUBKEYTYPE"},
     {SCRIPT_ERR_CLEANSTACK, "CLEANSTACK"},
-    {SCRIPT_ERR_DISCOURAGE_UPGRADABLE_NOPS, "DISCOURAGE_UPGRADABLE_NOPS"}
+    {SCRIPT_ERR_DISCOURAGE_UPGRADABLE_NOPS, "DISCOURAGE_UPGRADABLE_NOPS"},
+    {SCRIPT_ERR_DISCOURAGE_UPGRADABLE_WITNESS_PROGRAM, "DISCOURAGE_UPGRADABLE_WITNESS_PROGRAM"},
+    {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"},
 };
 
 const char *FormatScriptError(ScriptError_t err)
@@ -127,13 +134,15 @@ CMutableTransaction BuildCreditingTransaction(const CScript& scriptPubKey)
     return txCredit;
 }
 
-CMutableTransaction BuildSpendingTransaction(const CScript& scriptSig, const CMutableTransaction& txCredit)
+CMutableTransaction BuildSpendingTransaction(const CScript& scriptSig, const CScriptWitness& scriptWitness, const CMutableTransaction& txCredit)
 {
     CMutableTransaction txSpend;
     txSpend.nVersion = 1;
     txSpend.nLockTime = 0;
     txSpend.vin.resize(1);
     txSpend.vout.resize(1);
+    txSpend.wit.vtxinwit.resize(1);
+    txSpend.wit.vtxinwit[0].scriptWitness = scriptWitness;
     txSpend.vin[0].prevout.hash = txCredit.GetHash();
     txSpend.vin[0].prevout.n = 0;
     txSpend.vin[0].scriptSig = scriptSig;
@@ -144,7 +153,7 @@ CMutableTransaction BuildSpendingTransaction(const CScript& scriptSig, const CMu
     return txSpend;
 }
 
-void DoTest(const CScript& scriptPubKey, const CScript& scriptSig, int flags, const std::string& message, int scriptError)
+void DoTest(const CScript& scriptPubKey, const CScript& scriptSig, const CScriptWitness& scriptWitness, int flags, const std::string& message, int scriptError)
 {
     bool expect = (scriptError == SCRIPT_ERR_OK);
     if (flags & SCRIPT_VERIFY_CLEANSTACK) {
@@ -153,12 +162,12 @@ void DoTest(const CScript& scriptPubKey, const CScript& scriptSig, int flags, co
     }
     ScriptError err;
     CMutableTransaction txCredit = BuildCreditingTransaction(scriptPubKey);
-    CMutableTransaction tx = BuildSpendingTransaction(scriptSig, txCredit);
+    CMutableTransaction tx = BuildSpendingTransaction(scriptSig, scriptWitness, txCredit);
     CMutableTransaction tx2 = tx;
-    BOOST_CHECK_MESSAGE(VerifyScript(scriptSig, scriptPubKey, NULL, flags, MutableTransactionSignatureChecker(&tx, 0, txCredit.vout[0].nValue), &err) == expect, message);
+    BOOST_CHECK_MESSAGE(VerifyScript(scriptSig, scriptPubKey, &scriptWitness, flags, MutableTransactionSignatureChecker(&tx, 0, txCredit.vout[0].nValue), &err) == expect, message);
     BOOST_CHECK_MESSAGE(err == scriptError, std::string(FormatScriptError(err)) + " where " + std::string(FormatScriptError((ScriptError_t)scriptError)) + " expected: " + message);
 #if defined(HAVE_CONSENSUS_LIB)
-    CDataStream stream(SER_NETWORK, PROTOCOL_VERSION);
+    CDataStream stream(SER_NETWORK, PROTOCOL_VERSION | SERIALIZE_TRANSACTION_WITNESS);
     stream << tx2;
     if (flags & bitcoinconsensus_SCRIPT_FLAGS_VERIFY_WITNESS) {
         BOOST_CHECK_MESSAGE(bitcoinconsensus_verify_script_with_amount(begin_ptr(scriptPubKey), scriptPubKey.size(), txCredit.vout[0].nValue, (const unsigned char*)&stream[0], stream.size(), 0, flags, NULL) == expect, message);
@@ -280,7 +289,7 @@ class TestBuilder
         } else {
             creditTx = BuildCreditingTransaction(redeemScript);
         }
-        spendTx = BuildSpendingTransaction(CScript(), creditTx);
+        spendTx = BuildSpendingTransaction(CScript(), CScriptWitness(), creditTx);
     }
 
     TestBuilder& ScriptError(ScriptError_t err)
@@ -363,7 +372,7 @@ class TestBuilder
     {
         TestBuilder copy = *this; // Make a copy so we can rollback the push.
         DoPush();
-        DoTest(creditTx.vout[0].scriptPubKey, spendTx.vin[0].scriptSig, flags, comment, scriptError);
+        DoTest(creditTx.vout[0].scriptPubKey, spendTx.vin[0].scriptSig, CScriptWitness(), flags, comment, scriptError);
         *this = copy;
         return *this;
     }
@@ -706,7 +715,7 @@ BOOST_AUTO_TEST_CASE(script_json_test)
 {
     // Read tests from test/data/script_tests.json
     // Format is an array of arrays
-    // Inner arrays are [ "scriptSig", "scriptPubKey", "flags", "expected_scripterror" ]
+    // Inner arrays are [ ["wit"...]?, "scriptSig", "scriptPubKey", "flags", "expected_scripterror" ]
     // ... where scriptSig and scriptPubKey are stringified
     // scripts.
     UniValue tests = read_json(std::string(json_tests::script_tests, json_tests::script_tests + sizeof(json_tests::script_tests)));
@@ -714,21 +723,29 @@ BOOST_AUTO_TEST_CASE(script_json_test)
     for (unsigned int idx = 0; idx < tests.size(); idx++) {
         UniValue test = tests[idx];
         string strTest = test.write();
-        if (test.size() < 4) // Allow size > 3; extra stuff ignored (useful for comments)
+        CScriptWitness witness;
+        unsigned int pos = 0;
+        if (test.size() > 0 && test[pos].isArray()) {
+            for (unsigned int i = 0; i < test[pos].size(); i++) {
+                witness.stack.push_back(ParseHex(test[pos][i].get_str()));
+            }
+            pos++;
+        }
+        if (test.size() < 4 + pos) // Allow size > 3; extra stuff ignored (useful for comments)
         {
             if (test.size() != 1) {
                 BOOST_ERROR("Bad test: " << strTest);
             }
             continue;
         }
-        string scriptSigString = test[0].get_str();
+        string scriptSigString = test[pos++].get_str();
         CScript scriptSig = ParseScript(scriptSigString);
-        string scriptPubKeyString = test[1].get_str();
+        string scriptPubKeyString = test[pos++].get_str();
         CScript scriptPubKey = ParseScript(scriptPubKeyString);
-        unsigned int scriptflags = ParseScriptFlags(test[2].get_str());
-        int scriptError = ParseScriptError(test[3].get_str());
+        unsigned int scriptflags = ParseScriptFlags(test[pos++].get_str());
+        int scriptError = ParseScriptError(test[pos++].get_str());
 
-        DoTest(scriptPubKey, scriptSig, scriptflags, strTest, scriptError);
+        DoTest(scriptPubKey, scriptSig, witness, scriptflags, strTest, scriptError);
     }
 }
 
@@ -806,7 +823,7 @@ BOOST_AUTO_TEST_CASE(script_CHECKMULTISIG12)
     scriptPubKey12 << OP_1 << ToByteVector(key1.GetPubKey()) << ToByteVector(key2.GetPubKey()) << OP_2 << OP_CHECKMULTISIG;
 
     CMutableTransaction txFrom12 = BuildCreditingTransaction(scriptPubKey12);
-    CMutableTransaction txTo12 = BuildSpendingTransaction(CScript(), txFrom12);
+    CMutableTransaction txTo12 = BuildSpendingTransaction(CScript(), CScriptWitness(), txFrom12);
 
     CScript goodsig1 = sign_multisig(scriptPubKey12, key1, txTo12);
     BOOST_CHECK(VerifyScript(goodsig1, scriptPubKey12, NULL, flags, MutableTransactionSignatureChecker(&txTo12, 0, txFrom12.vout[0].nValue), &err));
@@ -837,7 +854,7 @@ BOOST_AUTO_TEST_CASE(script_CHECKMULTISIG23)
     scriptPubKey23 << OP_2 << ToByteVector(key1.GetPubKey()) << ToByteVector(key2.GetPubKey()) << ToByteVector(key3.GetPubKey()) << OP_3 << OP_CHECKMULTISIG;
 
     CMutableTransaction txFrom23 = BuildCreditingTransaction(scriptPubKey23);
-    CMutableTransaction txTo23 = BuildSpendingTransaction(CScript(), txFrom23);
+    CMutableTransaction txTo23 = BuildSpendingTransaction(CScript(), CScriptWitness(), txFrom23);
 
     std::vector<CKey> keys;
     keys.push_back(key1); keys.push_back(key2);
@@ -910,7 +927,7 @@ BOOST_AUTO_TEST_CASE(script_combineSigs)
     }
 
     CMutableTransaction txFrom = BuildCreditingTransaction(GetScriptForDestination(keys[0].GetPubKey().GetID()));
-    CMutableTransaction txTo = BuildSpendingTransaction(CScript(), txFrom);
+    CMutableTransaction txTo = BuildSpendingTransaction(CScript(), CScriptWitness(), txFrom);
     CScript& scriptPubKey = txFrom.vout[0].scriptPubKey;
     CScript& scriptSig = txTo.vin[0].scriptSig;
 

From 66cca79130a204277e61088b7844b405dc3868a5 Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Tue, 5 Apr 2016 13:37:24 +0200
Subject: [PATCH 0556/1802] [qa] Autogeneration support for witness in
 script_tests

---
 src/test/data/script_tests.json | 132 ++++++++++++++++++++++++++++++++
 src/test/script_tests.cpp       | 105 ++++++++++++++++++++++---
 2 files changed, 227 insertions(+), 10 deletions(-)

diff --git a/src/test/data/script_tests.json b/src/test/data/script_tests.json
index f6ee7ade42530..4311b0923fbec 100644
--- a/src/test/data/script_tests.json
+++ b/src/test/data/script_tests.json
@@ -1834,6 +1834,138 @@
     "OK",
     "P2SH with CLEANSTACK"
 ],
+[
+    [
+        "3044022039105b995a5f448639a997a5c90fda06f50b49df30c3bdb6663217bf79323db002206fecd54269dec569fcc517178880eb58bb40f381a282bb75766ff3637d5f4b4301",
+        "410479be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8ac"
+    ],
+    "",
+    "0 0x20 0xb95237b48faaa69eb078e1170be3b5cbb3fddf16d0a991e14ad274f7b33a4f64",
+    "P2SH,WITNESS",
+    "OK",
+    "Basic P2WSH"
+],
+[
+    [
+        "304402201a96950593cb0af32d080b0f193517f4559241a8ebd1e95e414533ad64a3f423022047f4f6d3095c23235bdff3aeff480d0529c027a3f093cb265b7cbf148553b85101",
+        "0479be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8"
+    ],
+    "",
+    "0 0x14 0x91b24bf9f5288532960ac687abb035127b1d28a5",
+    "P2SH,WITNESS",
+    "OK",
+    "Basic P2WPKH"
+],
+[
+    [
+        "3044022061fc1a144e221ec77a58a4281936eb6a1b715b9349e446e74d106ec26c8633ba022008064a0d112e8ad514440fcdfaa1006e48305d6844f50a65873fb4b2cf9c035f01",
+        "410479be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8ac"
+    ],
+    "0x22 0x0020b95237b48faaa69eb078e1170be3b5cbb3fddf16d0a991e14ad274f7b33a4f64",
+    "HASH160 0x14 0xf386c2ba255cc56d20cfa6ea8b062f8b59945518 EQUAL",
+    "P2SH,WITNESS",
+    "OK",
+    "Basic P2SH(P2WSH)"
+],
+[
+    [
+        "3044022014e69768e174972f21d32d93002ca6fc26133cb9e819ceef7efb970798bde7b4022078b86849dbbec692ec9355aa2a763fce7ea11bf72fdd8ea5ea8083de6f8a77fe01",
+        "0479be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8"
+    ],
+    "0x16 0x001491b24bf9f5288532960ac687abb035127b1d28a5",
+    "HASH160 0x14 0x17743beb429c55c942d2ec703b98c4d57c2df5c6 EQUAL",
+    "P2SH,WITNESS",
+    "OK",
+    "Basic P2SH(P2WPKH)"
+],
+[
+    [
+        "304402202589f0512cb2408fb08ed9bd24f85eb3059744d9e4f2262d0b7f1338cff6e8b902206c0978f449693e0578c71bc543b11079fd0baae700ee5e9a6bee94db490af9fc01",
+        "41048282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f5150811f8a8098557dfe45e8256e830b60ace62d613ac2f7b17bed31b6eaff6e26cafac"
+    ],
+    "",
+    "0 0x20 0xac8ebd9e52c17619a381fa4f71aebb696087c6ef17c960fd0587addad99c0610",
+    "P2SH,WITNESS",
+    "EVAL_FALSE",
+    "Basic P2WSH with the wrong key"
+],
+[
+    [
+        "304402206ef7fdb2986325d37c6eb1a8bb24aeb46dede112ed8fc76c7d7500b9b83c0d3d02201edc2322c794fe2d6b0bd73ed319e714aa9b86d8891961530d5c9b7156b60d4e01",
+        "048282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f5150811f8a8098557dfe45e8256e830b60ace62d613ac2f7b17bed31b6eaff6e26caf"
+    ],
+    "",
+    "0 0x14 0x7cf9c846cd4882efec4bf07e44ebdad495c94f4b",
+    "P2SH,WITNESS",
+    "EVAL_FALSE",
+    "Basic P2WPKH with the wrong key"
+],
+[
+    [
+        "30440220069ea3581afaf8187f63feee1fd2bd1f9c0dc71ea7d6e8a8b07ee2ebcf824bf402201a4fdef4c532eae59223be1eda6a397fc835142d4ddc6c74f4aa85b766a5c16f01",
+        "41048282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f5150811f8a8098557dfe45e8256e830b60ace62d613ac2f7b17bed31b6eaff6e26cafac"
+    ],
+    "0x22 0x0020ac8ebd9e52c17619a381fa4f71aebb696087c6ef17c960fd0587addad99c0610",
+    "HASH160 0x14 0x61039a003883787c0d6ebc66d97fdabe8e31449d EQUAL",
+    "P2SH,WITNESS",
+    "EVAL_FALSE",
+    "Basic P2SH(P2WSH) with the wrong key"
+],
+[
+    [
+        "304402204209e49457c2358f80d0256bc24535b8754c14d08840fc4be762d6f5a0aed80b02202eaf7d8fc8d62f60c67adcd99295528d0e491ae93c195cec5a67e7a09532a88001",
+        "048282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f5150811f8a8098557dfe45e8256e830b60ace62d613ac2f7b17bed31b6eaff6e26caf"
+    ],
+    "0x16 0x00147cf9c846cd4882efec4bf07e44ebdad495c94f4b",
+    "HASH160 0x14 0x4e0c2aed91315303fc6a1dc4c7bc21c88f75402e EQUAL",
+    "P2SH,WITNESS",
+    "EVAL_FALSE",
+    "Basic P2SH(P2WPKH) with the wrong key"
+],
+[
+    [
+        "304402202589f0512cb2408fb08ed9bd24f85eb3059744d9e4f2262d0b7f1338cff6e8b902206c0978f449693e0578c71bc543b11079fd0baae700ee5e9a6bee94db490af9fc01",
+        "41048282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f5150811f8a8098557dfe45e8256e830b60ace62d613ac2f7b17bed31b6eaff6e26cafac"
+    ],
+    "",
+    "0 0x20 0xac8ebd9e52c17619a381fa4f71aebb696087c6ef17c960fd0587addad99c0610",
+    "P2SH",
+    "OK",
+    "Basic P2WSH with the wrong key but no WITNESS"
+],
+[
+    [
+        "304402206ef7fdb2986325d37c6eb1a8bb24aeb46dede112ed8fc76c7d7500b9b83c0d3d02201edc2322c794fe2d6b0bd73ed319e714aa9b86d8891961530d5c9b7156b60d4e01",
+        "048282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f5150811f8a8098557dfe45e8256e830b60ace62d613ac2f7b17bed31b6eaff6e26caf"
+    ],
+    "",
+    "0 0x14 0x7cf9c846cd4882efec4bf07e44ebdad495c94f4b",
+    "P2SH",
+    "OK",
+    "Basic P2WPKH with the wrong key but no WITNESS"
+],
+[
+    [
+        "30440220069ea3581afaf8187f63feee1fd2bd1f9c0dc71ea7d6e8a8b07ee2ebcf824bf402201a4fdef4c532eae59223be1eda6a397fc835142d4ddc6c74f4aa85b766a5c16f01",
+        "41048282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f5150811f8a8098557dfe45e8256e830b60ace62d613ac2f7b17bed31b6eaff6e26cafac"
+    ],
+    "0x22 0x0020ac8ebd9e52c17619a381fa4f71aebb696087c6ef17c960fd0587addad99c0610",
+    "HASH160 0x14 0x61039a003883787c0d6ebc66d97fdabe8e31449d EQUAL",
+    "P2SH",
+    "OK",
+    "Basic P2SH(P2WSH) with the wrong key but no WITNESS"
+],
+[
+    [
+        "304402204209e49457c2358f80d0256bc24535b8754c14d08840fc4be762d6f5a0aed80b02202eaf7d8fc8d62f60c67adcd99295528d0e491ae93c195cec5a67e7a09532a88001",
+        "048282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f5150811f8a8098557dfe45e8256e830b60ace62d613ac2f7b17bed31b6eaff6e26caf"
+    ],
+    "0x16 0x00147cf9c846cd4882efec4bf07e44ebdad495c94f4b",
+    "HASH160 0x14 0x4e0c2aed91315303fc6a1dc4c7bc21c88f75402e EQUAL",
+    "P2SH",
+    "OK",
+    "Basic P2SH(P2WPKH) with the wrong key but no WITNESS"
+],
 
 ["CHECKSEQUENCEVERIFY tests"], 
 ["", "NOP3", "CHECKSEQUENCEVERIFY", "INVALID_STACK_OPERATION", "CSV automatically fails on a empty stack"],
diff --git a/src/test/script_tests.cpp b/src/test/script_tests.cpp
index 88f1562b103b0..ab373edc90cf5 100644
--- a/src/test/script_tests.cpp
+++ b/src/test/script_tests.cpp
@@ -167,7 +167,7 @@ void DoTest(const CScript& scriptPubKey, const CScript& scriptSig, const CScript
     BOOST_CHECK_MESSAGE(VerifyScript(scriptSig, scriptPubKey, &scriptWitness, flags, MutableTransactionSignatureChecker(&tx, 0, txCredit.vout[0].nValue), &err) == expect, message);
     BOOST_CHECK_MESSAGE(err == scriptError, std::string(FormatScriptError(err)) + " where " + std::string(FormatScriptError((ScriptError_t)scriptError)) + " expected: " + message);
 #if defined(HAVE_CONSENSUS_LIB)
-    CDataStream stream(SER_NETWORK, PROTOCOL_VERSION | SERIALIZE_TRANSACTION_WITNESS);
+    CDataStream stream(SER_NETWORK, PROTOCOL_VERSION);
     stream << tx2;
     if (flags & bitcoinconsensus_SCRIPT_FLAGS_VERIFY_WITNESS) {
         BOOST_CHECK_MESSAGE(bitcoinconsensus_verify_script_with_amount(begin_ptr(scriptPubKey), scriptPubKey.size(), txCredit.vout[0].nValue, (const unsigned char*)&stream[0], stream.size(), 0, flags, NULL) == expect, message);
@@ -253,11 +253,22 @@ struct KeyData
     }
 };
 
+enum WitnessMode {
+    WITNESS_NONE,
+    WITNESS_PKH,
+    WITNESS_SH
+};
 
 class TestBuilder
 {
 private:
-    CScript scriptPubKey;
+    //! Actually executed script
+    CScript script;
+    //! The P2SH redeemscript
+    CScript redeemscript;
+    //! The Witness embedded script
+    CScript witscript;
+    CScriptWitness scriptWitness;
     CTransaction creditTx;
     CMutableTransaction spendTx;
     bool havePush;
@@ -282,13 +293,25 @@ class TestBuilder
     }
 
 public:
-    TestBuilder(const CScript& redeemScript, const std::string& comment_, int flags_, bool P2SH = false) : scriptPubKey(redeemScript), havePush(false), comment(comment_), flags(flags_), scriptError(SCRIPT_ERR_OK)
+    TestBuilder(const CScript& script_, const std::string& comment_, int flags_, bool P2SH = false, WitnessMode wm = WITNESS_NONE) : script(script_), havePush(false), comment(comment_), flags(flags_), scriptError(SCRIPT_ERR_OK)
     {
+        CScript scriptPubKey = script;
+        if (wm == WITNESS_PKH) {
+            uint160 hash;
+            CHash160().Write(&script[1], script.size() - 1).Finalize(hash.begin());
+            script = CScript() << OP_DUP << OP_HASH160 << ToByteVector(hash) << OP_EQUALVERIFY << OP_CHECKSIG;
+            scriptPubKey = CScript() << OP_0 << ToByteVector(hash);
+        } else if (wm == WITNESS_SH) {
+            witscript = scriptPubKey;
+            uint256 hash;
+            CSHA256().Write(&witscript[0], witscript.size()).Finalize(hash.begin());
+            scriptPubKey = CScript() << OP_0 << ToByteVector(hash);
+        }
         if (P2SH) {
-            creditTx = BuildCreditingTransaction(CScript() << OP_HASH160 << ToByteVector(CScriptID(redeemScript)) << OP_EQUAL);
-        } else {
-            creditTx = BuildCreditingTransaction(redeemScript);
+            redeemscript = scriptPubKey;
+            scriptPubKey = CScript() << OP_HASH160 << ToByteVector(CScriptID(redeemscript)) << OP_EQUAL;
         }
+        creditTx = BuildCreditingTransaction(scriptPubKey);
         spendTx = BuildSpendingTransaction(CScript(), CScriptWitness(), creditTx);
     }
 
@@ -318,9 +341,9 @@ class TestBuilder
         return *this;
     }
 
-    TestBuilder& PushSig(const CKey& key, int nHashType = SIGHASH_ALL, unsigned int lenR = 32, unsigned int lenS = 32)
+    TestBuilder& PushSig(const CKey& key, int nHashType = SIGHASH_ALL, unsigned int lenR = 32, unsigned int lenS = 32, SigVersion sigversion = SIGVERSION_BASE)
     {
-        uint256 hash = SignatureHash(scriptPubKey, spendTx, 0, nHashType, 0, SIGVERSION_BASE);
+        uint256 hash = SignatureHash(script, spendTx, 0, nHashType, 0, sigversion);
         std::vector<unsigned char> vchSig, r, s;
         uint32_t iter = 0;
         do {
@@ -336,6 +359,11 @@ class TestBuilder
         return *this;
     }
 
+    TestBuilder& PushWitSig(const CKey& key, int nHashType = SIGHASH_ALL, unsigned int lenR = 32, unsigned int lenS = 32, SigVersion sigversion = SIGVERSION_WITNESS_V0)
+    {
+        return PushSig(key, nHashType, lenR, lenS, sigversion).AsWit();
+    }
+
     TestBuilder& Push(const CPubKey& pubkey)
     {
         DoPush(std::vector<unsigned char>(pubkey.begin(), pubkey.end()));
@@ -344,10 +372,16 @@ class TestBuilder
 
     TestBuilder& PushRedeem()
     {
-        DoPush(std::vector<unsigned char>(scriptPubKey.begin(), scriptPubKey.end()));
+        DoPush(std::vector<unsigned char>(redeemscript.begin(), redeemscript.end()));
         return *this;
     }
 
+    TestBuilder& PushWitRedeem()
+    {
+        DoPush(std::vector<unsigned char>(witscript.begin(), witscript.end()));
+        return AsWit();
+    }
+
     TestBuilder& EditPush(unsigned int pos, const std::string& hexin, const std::string& hexout)
     {
         assert(havePush);
@@ -372,15 +406,30 @@ class TestBuilder
     {
         TestBuilder copy = *this; // Make a copy so we can rollback the push.
         DoPush();
-        DoTest(creditTx.vout[0].scriptPubKey, spendTx.vin[0].scriptSig, CScriptWitness(), flags, comment, scriptError);
+        DoTest(creditTx.vout[0].scriptPubKey, spendTx.vin[0].scriptSig, scriptWitness, flags, comment, scriptError);
         *this = copy;
         return *this;
     }
 
+    TestBuilder& AsWit()
+    {
+        assert(havePush);
+        scriptWitness.stack.push_back(push);
+        havePush = false;
+        return *this;
+    }
+
     UniValue GetJSON()
     {
         DoPush();
         UniValue array(UniValue::VARR);
+        if (!scriptWitness.stack.empty()) {
+            UniValue wit(UniValue::VARR);
+            for (unsigned i = 0; i < scriptWitness.stack.size(); i++) {
+                wit.push_back(HexStr(scriptWitness.stack[i]));
+            }
+            array.push_back(wit);
+        }
         array.push_back(FormatScript(spendTx.vin[0].scriptSig));
         array.push_back(FormatScript(creditTx.vout[0].scriptPubKey));
         array.push_back(FormatScriptFlags(flags));
@@ -679,6 +728,42 @@ BOOST_AUTO_TEST_CASE(script_build)
                                 "P2SH with CLEANSTACK", SCRIPT_VERIFY_CLEANSTACK | SCRIPT_VERIFY_P2SH, true
                                ).PushSig(keys.key0).PushRedeem());
 
+    tests.push_back(TestBuilder(CScript() << ToByteVector(keys.pubkey0) << OP_CHECKSIG,
+                                "Basic P2WSH", SCRIPT_VERIFY_WITNESS | SCRIPT_VERIFY_P2SH, false, WITNESS_SH
+                               ).PushWitSig(keys.key0).PushWitRedeem());
+    tests.push_back(TestBuilder(CScript() << ToByteVector(keys.pubkey0),
+                                "Basic P2WPKH", SCRIPT_VERIFY_WITNESS | SCRIPT_VERIFY_P2SH, false, WITNESS_PKH
+                               ).PushWitSig(keys.key0).Push(keys.pubkey0).AsWit());
+    tests.push_back(TestBuilder(CScript() << ToByteVector(keys.pubkey0) << OP_CHECKSIG,
+                                "Basic P2SH(P2WSH)", SCRIPT_VERIFY_WITNESS | SCRIPT_VERIFY_P2SH, true, WITNESS_SH
+                               ).PushWitSig(keys.key0).PushWitRedeem().PushRedeem());
+    tests.push_back(TestBuilder(CScript() << ToByteVector(keys.pubkey0),
+                                "Basic P2SH(P2WPKH)", SCRIPT_VERIFY_WITNESS | SCRIPT_VERIFY_P2SH, true, WITNESS_PKH
+                               ).PushWitSig(keys.key0).Push(keys.pubkey0).AsWit().PushRedeem());
+    tests.push_back(TestBuilder(CScript() << ToByteVector(keys.pubkey1) << OP_CHECKSIG,
+                                "Basic P2WSH with the wrong key", SCRIPT_VERIFY_WITNESS | SCRIPT_VERIFY_P2SH, false, WITNESS_SH
+                               ).PushWitSig(keys.key0).PushWitRedeem().ScriptError(SCRIPT_ERR_EVAL_FALSE));
+    tests.push_back(TestBuilder(CScript() << ToByteVector(keys.pubkey1),
+                                "Basic P2WPKH with the wrong key", SCRIPT_VERIFY_WITNESS | SCRIPT_VERIFY_P2SH, false, WITNESS_PKH
+                               ).PushWitSig(keys.key0).Push(keys.pubkey1).AsWit().ScriptError(SCRIPT_ERR_EVAL_FALSE));
+    tests.push_back(TestBuilder(CScript() << ToByteVector(keys.pubkey1) << OP_CHECKSIG,
+                                "Basic P2SH(P2WSH) with the wrong key", SCRIPT_VERIFY_WITNESS | SCRIPT_VERIFY_P2SH, true, WITNESS_SH
+                               ).PushWitSig(keys.key0).PushWitRedeem().PushRedeem().ScriptError(SCRIPT_ERR_EVAL_FALSE));
+    tests.push_back(TestBuilder(CScript() << ToByteVector(keys.pubkey1),
+                                "Basic P2SH(P2WPKH) with the wrong key", SCRIPT_VERIFY_WITNESS | SCRIPT_VERIFY_P2SH, true, WITNESS_PKH
+                               ).PushWitSig(keys.key0).Push(keys.pubkey1).AsWit().PushRedeem().ScriptError(SCRIPT_ERR_EVAL_FALSE));
+    tests.push_back(TestBuilder(CScript() << ToByteVector(keys.pubkey1) << OP_CHECKSIG,
+                                "Basic P2WSH with the wrong key but no WITNESS", SCRIPT_VERIFY_P2SH, false, WITNESS_SH
+                               ).PushWitSig(keys.key0).PushWitRedeem());
+    tests.push_back(TestBuilder(CScript() << ToByteVector(keys.pubkey1),
+                                "Basic P2WPKH with the wrong key but no WITNESS", SCRIPT_VERIFY_P2SH, false, WITNESS_PKH
+                               ).PushWitSig(keys.key0).Push(keys.pubkey1).AsWit());
+    tests.push_back(TestBuilder(CScript() << ToByteVector(keys.pubkey1) << OP_CHECKSIG,
+                                "Basic P2SH(P2WSH) with the wrong key but no WITNESS", SCRIPT_VERIFY_P2SH, true, WITNESS_SH
+                               ).PushWitSig(keys.key0).PushWitRedeem().PushRedeem());
+    tests.push_back(TestBuilder(CScript() << ToByteVector(keys.pubkey1),
+                                "Basic P2SH(P2WPKH) with the wrong key but no WITNESS", SCRIPT_VERIFY_P2SH, true, WITNESS_PKH
+                               ).PushWitSig(keys.key0).Push(keys.pubkey1).AsWit().PushRedeem());
 
     std::set<std::string> tests_set;
 

From 4f7ff00497803fddc5a0fb5340502a73e395134d Mon Sep 17 00:00:00 2001
From: Alex Morcos <morcos@chaincode.com>
Date: Fri, 1 Jan 2016 23:18:34 -0600
Subject: [PATCH 0557/1802] [qa] Add rpc test for segwit

Amended by Pieter Wuille to use multisig 1-of-1 for P2WSH tests, and BIP9
based switchover logic.

Fixes and py3 conversion by Marco Falke.
---
 contrib/devtools/check-doc.py |   2 +-
 qa/pull-tester/rpc-tests.py   |   1 +
 qa/rpc-tests/segwit.py        | 209 ++++++++++++++++++++++++++++++++++
 src/main.cpp                  |  15 ++-
 src/wallet/rpcwallet.cpp      |   2 +-
 5 files changed, 222 insertions(+), 7 deletions(-)
 create mode 100755 qa/rpc-tests/segwit.py

diff --git a/contrib/devtools/check-doc.py b/contrib/devtools/check-doc.py
index 8c73cf1e8a735..06c9551cebae5 100755
--- a/contrib/devtools/check-doc.py
+++ b/contrib/devtools/check-doc.py
@@ -21,7 +21,7 @@
 REGEX_ARG = re.compile(r'(?:map(?:Multi)?Args(?:\.count\(|\[)|Get(?:Bool)?Arg\()\"(\-[^\"]+?)\"')
 REGEX_DOC = re.compile(r'HelpMessageOpt\(\"(\-[^\"=]+?)(?:=|\")')
 # list unsupported, deprecated and duplicate args as they need no documentation
-SET_DOC_OPTIONAL = set(['-rpcssl', '-benchmark', '-h', '-help', '-socks', '-tor', '-debugnet', '-whitelistalwaysrelay'])
+SET_DOC_OPTIONAL = set(['-rpcssl', '-benchmark', '-h', '-help', '-socks', '-tor', '-debugnet', '-whitelistalwaysrelay', '-prematurewitness', '-walletprematurewitness', '-promiscuousmempoolflags'])
 
 def main():
   used = check_output(CMD_GREP_ARGS, shell=True)
diff --git a/qa/pull-tester/rpc-tests.py b/qa/pull-tester/rpc-tests.py
index 6c0ed4510f103..8fa20945e665b 100755
--- a/qa/pull-tester/rpc-tests.py
+++ b/qa/pull-tester/rpc-tests.py
@@ -136,6 +136,7 @@
     'invalidtxrequest.py',
     'abandonconflict.py',
     'p2p-versionbits-warning.py',
+    'segwit.py',
     'importprunedfunds.py',
     'signmessages.py',
 ]
diff --git a/qa/rpc-tests/segwit.py b/qa/rpc-tests/segwit.py
new file mode 100755
index 0000000000000..d4c9a8afed32c
--- /dev/null
+++ b/qa/rpc-tests/segwit.py
@@ -0,0 +1,209 @@
+#!/usr/bin/env python3
+# Copyright (c) 2016 The Bitcoin Core developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#
+# Test the SegWit changeover logic
+#
+
+from test_framework.test_framework import BitcoinTestFramework
+from test_framework.util import *
+from test_framework.mininode import sha256, ripemd160
+import os
+import shutil
+
+NODE_0 = 0
+NODE_1 = 1
+NODE_2 = 2
+WIT_V0 = 0
+WIT_V1 = 1
+
+def witness_script(version, pubkey):
+    if (version == 0):
+        pubkeyhash = bytes_to_hex_str(ripemd160(sha256(hex_str_to_bytes(pubkey))))
+        pkscript = "0014" + pubkeyhash
+    elif (version == 1):
+        # 1-of-1 multisig
+        scripthash = bytes_to_hex_str(sha256(hex_str_to_bytes("5121" + pubkey + "51ae")))
+        pkscript = "0020" + scripthash
+    else:
+        assert("Wrong version" == "0 or 1")
+    return pkscript
+
+def addlength(script):
+    scriptlen = format(len(script)//2, 'x')
+    assert(len(scriptlen) == 2)
+    return scriptlen + script
+
+def create_witnessprogram(version, node, utxo, pubkey, encode_p2sh, amount):
+    pkscript = witness_script(version, pubkey);
+    if (encode_p2sh):
+        p2sh_hash = bytes_to_hex_str(ripemd160(sha256(hex_str_to_bytes(pkscript))))
+        pkscript = "a914"+p2sh_hash+"87"
+    inputs = []
+    outputs = {}
+    inputs.append({ "txid" : utxo["txid"], "vout" : utxo["vout"]} )
+    DUMMY_P2SH = "2MySexEGVzZpRgNQ1JdjdP5bRETznm3roQ2" # P2SH of "OP_1 OP_DROP"
+    outputs[DUMMY_P2SH] = amount
+    tx_to_witness = node.createrawtransaction(inputs,outputs)
+    #replace dummy output with our own
+    tx_to_witness = tx_to_witness[0:110] + addlength(pkscript) + tx_to_witness[-8:]
+    return tx_to_witness
+
+def send_to_witness(version, node, utxo, pubkey, encode_p2sh, amount, sign=True, insert_redeem_script=""):
+    tx_to_witness = create_witnessprogram(version, node, utxo, pubkey, encode_p2sh, amount)
+    if (sign):
+        signed = node.signrawtransaction(tx_to_witness)
+        assert("errors" not in signed or len(["errors"]) == 0)
+        return node.sendrawtransaction(signed["hex"])
+    else:
+        if (insert_redeem_script):
+            tx_to_witness = tx_to_witness[0:82] + addlength(insert_redeem_script) + tx_to_witness[84:]
+
+    return node.sendrawtransaction(tx_to_witness)
+
+def getutxo(txid):
+    utxo = {}
+    utxo["vout"] = 0
+    utxo["txid"] = txid
+    return utxo
+
+class SegWitTest(BitcoinTestFramework):
+
+    def setup_chain(self):
+        print("Initializing test directory "+self.options.tmpdir)
+        initialize_chain_clean(self.options.tmpdir, 3)
+
+    def setup_network(self):
+        self.nodes = []
+        self.nodes.append(start_node(0, self.options.tmpdir, ["-logtimemicros", "-debug", "-walletprematurewitness"]))
+        self.nodes.append(start_node(1, self.options.tmpdir, ["-logtimemicros", "-debug", "-blockversion=4", "-promiscuousmempoolflags=517", "-prematurewitness", "-walletprematurewitness"]))
+        self.nodes.append(start_node(2, self.options.tmpdir, ["-logtimemicros", "-debug", "-blockversion=536870915", "-promiscuousmempoolflags=517", "-prematurewitness", "-walletprematurewitness"]))
+        connect_nodes(self.nodes[1], 0)
+        connect_nodes(self.nodes[2], 1)
+        connect_nodes(self.nodes[0], 2)
+        self.is_network_split = False
+        self.sync_all()
+
+    def success_mine(self, node, txid, sign, redeem_script=""):
+        send_to_witness(1, node, getutxo(txid), self.pubkey[0], False, Decimal("49.998"), sign, redeem_script)
+        block = node.generate(1)
+        assert_equal(len(node.getblock(block[0])["tx"]), 2)
+        sync_blocks(self.nodes)
+
+    def skip_mine(self, node, txid, sign, redeem_script=""):
+        send_to_witness(1, node, getutxo(txid), self.pubkey[0], False, Decimal("49.998"), sign, redeem_script)
+        block = node.generate(1)
+        assert_equal(len(node.getblock(block[0])["tx"]), 1)
+        sync_blocks(self.nodes)
+
+    def fail_accept(self, node, txid, sign, redeem_script=""):
+        try:
+            send_to_witness(1, node, getutxo(txid), self.pubkey[0], False, Decimal("49.998"), sign, redeem_script)
+        except JSONRPCException as exp:
+            assert(exp.error["code"] == -26)
+        else:
+            raise AssertionError("Tx should not have been accepted")
+
+    def fail_mine(self, node, txid, sign, redeem_script=""):
+        send_to_witness(1, node, getutxo(txid), self.pubkey[0], False, Decimal("49.998"), sign, redeem_script)
+        try:
+            node.generate(1)
+        except JSONRPCException as exp:
+            assert(exp.error["code"] == -1)
+        else:
+            raise AssertionError("Created valid block when TestBlockValidity should have failed")
+        sync_blocks(self.nodes)
+
+    def run_test(self):
+        self.nodes[0].generate(160) #block 160
+
+        self.pubkey = []
+        p2sh_ids = [] # p2sh_ids[NODE][VER] is an array of txids that spend to a witness version VER pkscript to an address for NODE embedded in p2sh
+        wit_ids = [] # wit_ids[NODE][VER] is an array of txids that spend to a witness version VER pkscript to an address for NODE via bare witness
+        for i in range(3):
+            newaddress = self.nodes[i].getnewaddress()
+            self.pubkey.append(self.nodes[i].validateaddress(newaddress)["pubkey"])
+            multiaddress = self.nodes[i].addmultisigaddress(1, [self.pubkey[-1]])
+            self.nodes[i].addwitnessaddress(newaddress)
+            self.nodes[i].addwitnessaddress(multiaddress)
+            p2sh_ids.append([])
+            wit_ids.append([])
+            for v in range(2):
+                p2sh_ids[i].append([])
+                wit_ids[i].append([])
+
+        for i in range(5):
+            for n in range(3):
+                for v in range(2):
+                    wit_ids[n][v].append(send_to_witness(v, self.nodes[0], self.nodes[0].listunspent()[0], self.pubkey[n], False, Decimal("49.999")))
+                    p2sh_ids[n][v].append(send_to_witness(v, self.nodes[0], self.nodes[0].listunspent()[0], self.pubkey[n], True, Decimal("49.999")))
+
+        self.nodes[0].generate(1) #block 161
+        sync_blocks(self.nodes)
+
+        # Make sure all nodes recognize the transactions as theirs
+        assert_equal(self.nodes[0].getbalance(), 60*50 - 60*50 + 20*Decimal("49.999") + 50)
+        assert_equal(self.nodes[1].getbalance(), 20*Decimal("49.999"))
+        assert_equal(self.nodes[2].getbalance(), 20*Decimal("49.999"))
+
+        self.nodes[0].generate(262) #block 423
+        sync_blocks(self.nodes)
+
+        print("Verify default node can't accept any witness format txs before fork")
+        # unsigned, no scriptsig
+        self.fail_accept(self.nodes[0], wit_ids[NODE_0][WIT_V0][0], False)
+        self.fail_accept(self.nodes[0], wit_ids[NODE_0][WIT_V1][0], False)
+        self.fail_accept(self.nodes[0], p2sh_ids[NODE_0][WIT_V0][0], False)
+        self.fail_accept(self.nodes[0], p2sh_ids[NODE_0][WIT_V1][0], False)
+        # unsigned with redeem script
+        self.fail_accept(self.nodes[0], p2sh_ids[NODE_0][WIT_V0][0], False, addlength(witness_script(0, self.pubkey[0])))
+        self.fail_accept(self.nodes[0], p2sh_ids[NODE_0][WIT_V1][0], False, addlength(witness_script(1, self.pubkey[0])))
+        # signed
+        self.fail_accept(self.nodes[0], wit_ids[NODE_0][WIT_V0][0], True)
+        self.fail_accept(self.nodes[0], wit_ids[NODE_0][WIT_V1][0], True)
+        self.fail_accept(self.nodes[0], p2sh_ids[NODE_0][WIT_V0][0], True)
+        self.fail_accept(self.nodes[0], p2sh_ids[NODE_0][WIT_V1][0], True)
+
+        print("Verify witness txs are skipped for mining before the fork")
+        self.skip_mine(self.nodes[2], wit_ids[NODE_2][WIT_V0][0], True) #block 424
+        self.skip_mine(self.nodes[2], wit_ids[NODE_2][WIT_V1][0], True) #block 425
+        self.skip_mine(self.nodes[2], p2sh_ids[NODE_2][WIT_V0][0], True) #block 426
+        self.skip_mine(self.nodes[2], p2sh_ids[NODE_2][WIT_V1][0], True) #block 427
+
+        # TODO: An old node would see these txs without witnesses and be able to mine them
+
+        print("Verify unsigned bare witness txs in versionbits-setting blocks are valid before the fork")
+        self.success_mine(self.nodes[2], wit_ids[NODE_2][WIT_V0][1], False) #block 428
+        self.success_mine(self.nodes[2], wit_ids[NODE_2][WIT_V1][1], False) #block 429
+
+        print("Verify unsigned p2sh witness txs without a redeem script are invalid")
+        self.fail_accept(self.nodes[2], p2sh_ids[NODE_2][WIT_V0][1], False)
+        self.fail_accept(self.nodes[2], p2sh_ids[NODE_2][WIT_V1][1], False)
+
+        print("Verify unsigned p2sh witness txs with a redeem script in versionbits-settings blocks are valid before the fork")
+        self.success_mine(self.nodes[2], p2sh_ids[NODE_2][WIT_V0][1], False, addlength(witness_script(0, self.pubkey[2]))) #block 430
+        self.success_mine(self.nodes[2], p2sh_ids[NODE_2][WIT_V1][1], False, addlength(witness_script(1, self.pubkey[2]))) #block 431
+
+        print("Verify previous witness txs skipped for mining can now be mined")
+        assert_equal(len(self.nodes[2].getrawmempool()), 4)
+        block = self.nodes[2].generate(1) #block 432 (first block with new rules; 432 = 144 * 3)
+        sync_blocks(self.nodes)
+        assert_equal(len(self.nodes[2].getrawmempool()), 0)
+        assert_equal(len(self.nodes[2].getblock(block[0])["tx"]), 5)
+
+        print("Verify witness txs without witness data are invalid after the fork")
+        self.fail_mine(self.nodes[2], wit_ids[NODE_2][WIT_V0][2], False)
+        self.fail_mine(self.nodes[2], wit_ids[NODE_2][WIT_V1][2], False)
+        self.fail_mine(self.nodes[2], p2sh_ids[NODE_2][WIT_V0][2], False, addlength(witness_script(0, self.pubkey[2])))
+        self.fail_mine(self.nodes[2], p2sh_ids[NODE_2][WIT_V1][2], False, addlength(witness_script(1, self.pubkey[2])))
+
+        print("Verify default node can now use witness txs")
+        self.success_mine(self.nodes[0], wit_ids[NODE_0][WIT_V0][0], True) #block 432
+        self.success_mine(self.nodes[0], wit_ids[NODE_0][WIT_V1][0], True) #block 433
+        self.success_mine(self.nodes[0], p2sh_ids[NODE_0][WIT_V0][0], True) #block 434
+        self.success_mine(self.nodes[0], p2sh_ids[NODE_0][WIT_V1][0], True) #block 435
+
+if __name__ == '__main__':
+    SegWitTest().main()
diff --git a/src/main.cpp b/src/main.cpp
index d1ba70313e3b3..6cdd55e3979df 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1145,8 +1145,8 @@ bool AcceptToMemoryPoolWorker(CTxMemPool& pool, CValidationState& state, const C
         return state.DoS(0, false, REJECT_NONSTANDARD, "premature-version2-tx");
     }
 
-    // Don't accept witness transactions before the final threshold passes
-    if (!tx.wit.IsNull() && !IsWitnessEnabled(chainActive.Tip(), Params().GetConsensus())) {
+    // Reject transactions with witness before segregated witness activates (override with -prematurewitness)
+    if (!GetBoolArg("-prematurewitness",false) && !tx.wit.IsNull() && !IsWitnessEnabled(chainActive.Tip(), Params().GetConsensus())) {
         return state.DoS(0, false, REJECT_NONSTANDARD, "no-witness-yet", true);
     }
 
@@ -1487,14 +1487,19 @@ bool AcceptToMemoryPoolWorker(CTxMemPool& pool, CValidationState& state, const C
             }
         }
 
+        unsigned int scriptVerifyFlags = STANDARD_SCRIPT_VERIFY_FLAGS;
+        if (!Params().RequireStandard()) {
+            scriptVerifyFlags = GetArg("-promiscuousmempoolflags", scriptVerifyFlags);
+        }
+
         // Check against previous transactions
         // This is done last to help prevent CPU exhaustion denial-of-service attacks.
-        if (!CheckInputs(tx, state, view, true, STANDARD_SCRIPT_VERIFY_FLAGS, true)) {
+        if (!CheckInputs(tx, state, view, true, scriptVerifyFlags, true)) {
             // SCRIPT_VERIFY_CLEANSTACK requires SCRIPT_VERIFY_WITNESS, so we
             // need to turn both off, and compare against just turning off CLEANSTACK
             // to see if the failure is specifically due to witness validation.
-            if (CheckInputs(tx, state, view, true, STANDARD_SCRIPT_VERIFY_FLAGS & ~(SCRIPT_VERIFY_WITNESS | SCRIPT_VERIFY_CLEANSTACK), true) &&
-                !CheckInputs(tx, state, view, true, STANDARD_SCRIPT_VERIFY_FLAGS & ~SCRIPT_VERIFY_CLEANSTACK, true)) {
+            if (CheckInputs(tx, state, view, true, scriptVerifyFlags & ~(SCRIPT_VERIFY_WITNESS | SCRIPT_VERIFY_CLEANSTACK), true) &&
+                !CheckInputs(tx, state, view, true, scriptVerifyFlags & ~SCRIPT_VERIFY_CLEANSTACK, true)) {
                 // Only the witness is wrong, so the transaction itself may be fine.
                 state.SetCorruptionPossible();
             }
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index afbb9a1113f48..8538f880ff636 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -1072,7 +1072,7 @@ UniValue addwitnessaddress(const UniValue& params, bool fHelp)
 
     {
         LOCK(cs_main);
-        if (!IsWitnessEnabled(chainActive.Tip(), Params().GetConsensus())) {
+        if (!IsWitnessEnabled(chainActive.Tip(), Params().GetConsensus()) && !GetBoolArg("-walletprematurewitness", false)) {
             throw JSONRPCError(RPC_WALLET_ERROR, "Segregated witness not enabled on network");
         }
     }

From 330b0f31ee5719d94f9e52dfc83c5d82168241f9 Mon Sep 17 00:00:00 2001
From: Suhas Daftuar <sdaftuar@chaincode.com>
Date: Fri, 8 Apr 2016 21:02:24 -0400
Subject: [PATCH 0558/1802] [qa] p2p segwit tests

mininode now supports witness transactions/blocks, blocktools
has a helper for adding witness commitments to blocks, and script
has a function to calculate hashes for signature under sigversion
1, used by segwit.

Py3 conversion by Marco Falke

Test to make sure upgraded nodes don't ask for non-wit blocks by
Gregory Sanders.
---
 qa/pull-tester/rpc-tests.py               |    1 +
 qa/rpc-tests/p2p-segwit.py                | 1646 +++++++++++++++++++++
 qa/rpc-tests/test_framework/blocktools.py |   25 +-
 qa/rpc-tests/test_framework/mininode.py   |  212 ++-
 qa/rpc-tests/test_framework/script.py     |   52 +-
 src/test/data/script_tests.json           |   84 ++
 src/test/script_tests.cpp                 |   47 +-
 7 files changed, 2037 insertions(+), 30 deletions(-)
 create mode 100755 qa/rpc-tests/p2p-segwit.py

diff --git a/qa/pull-tester/rpc-tests.py b/qa/pull-tester/rpc-tests.py
index 8fa20945e665b..37979a933fc29 100755
--- a/qa/pull-tester/rpc-tests.py
+++ b/qa/pull-tester/rpc-tests.py
@@ -136,6 +136,7 @@
     'invalidtxrequest.py',
     'abandonconflict.py',
     'p2p-versionbits-warning.py',
+    'p2p-segwit.py',
     'segwit.py',
     'importprunedfunds.py',
     'signmessages.py',
diff --git a/qa/rpc-tests/p2p-segwit.py b/qa/rpc-tests/p2p-segwit.py
new file mode 100755
index 0000000000000..cf78954f286bc
--- /dev/null
+++ b/qa/rpc-tests/p2p-segwit.py
@@ -0,0 +1,1646 @@
+#!/usr/bin/env python3
+# Copyright (c) 2016 The Bitcoin Core developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+from test_framework.mininode import *
+from test_framework.test_framework import BitcoinTestFramework
+from test_framework.util import *
+from test_framework.script import *
+from test_framework.blocktools import create_block, create_coinbase, add_witness_commitment, WITNESS_COMMITMENT_HEADER
+from test_framework.key import CECKey, CPubKey
+import time
+import random
+from binascii import hexlify
+
+# The versionbit bit used to signal activation of SegWit
+VB_WITNESS_BIT = 1
+VB_PERIOD = 144
+VB_ACTIVATION_THRESHOLD = 108
+VB_TOP_BITS = 0x20000000
+
+MAX_SIGOP_COST = 80000
+
+'''
+SegWit p2p test.
+'''
+
+# Calculate the virtual size of a witness block:
+# (base + witness/4)
+def get_virtual_size(witness_block):
+    base_size = len(witness_block.serialize())
+    total_size = len(witness_block.serialize(with_witness=True))
+    # the "+3" is so we round up
+    vsize = int((3*base_size + total_size + 3)/4)
+    return vsize
+
+# Note: we can reduce code by using SingleNodeConnCB (in master, not 0.12)
+class TestNode(NodeConnCB):
+    def __init__(self):
+        NodeConnCB.__init__(self)
+        self.connection = None
+        self.ping_counter = 1
+        self.last_pong = msg_pong(0)
+        self.sleep_time = 0.05
+        self.getdataset = set()
+
+    def add_connection(self, conn):
+        self.connection = conn
+
+    # Wrapper for the NodeConn's send_message function
+    def send_message(self, message):
+        self.connection.send_message(message)
+
+    def on_inv(self, conn, message):
+        self.last_inv = message
+
+    def on_block(self, conn, message):
+        self.last_block = message.block
+        self.last_block.calc_sha256()
+
+    def on_getdata(self, conn, message):
+        for inv in message.inv:
+            self.getdataset.add(inv.hash)
+        self.last_getdata = message
+
+    def on_pong(self, conn, message):
+        self.last_pong = message
+
+    def on_reject(self, conn, message):
+        self.last_reject = message
+        #print message
+
+    # Syncing helpers
+    def sync(self, test_function, timeout=60):
+        while timeout > 0:
+            with mininode_lock:
+                if test_function():
+                    return
+            time.sleep(self.sleep_time)
+            timeout -= self.sleep_time
+        raise AssertionError("Sync failed to complete")
+        
+    def sync_with_ping(self, timeout=60):
+        self.send_message(msg_ping(nonce=self.ping_counter))
+        test_function = lambda: self.last_pong.nonce == self.ping_counter
+        self.sync(test_function, timeout)
+        self.ping_counter += 1
+        return
+
+    def wait_for_block(self, blockhash, timeout=60):
+        test_function = lambda: self.last_block != None and self.last_block.sha256 == blockhash
+        self.sync(test_function, timeout)
+        return
+
+    def wait_for_getdata(self, timeout=60):
+        test_function = lambda: self.last_getdata != None
+        self.sync(test_function, timeout)
+
+    def wait_for_inv(self, expected_inv, timeout=60):
+        test_function = lambda: self.last_inv != expected_inv
+        self.sync(test_function, timeout)
+
+    def announce_tx_and_wait_for_getdata(self, tx, timeout=60):
+        with mininode_lock:
+            self.last_getdata = None
+        self.send_message(msg_inv(inv=[CInv(1, tx.sha256)]))
+        self.wait_for_getdata(timeout)
+        return
+
+    def announce_block_and_wait_for_getdata(self, block, use_header, timeout=60):
+        with mininode_lock:
+            self.last_getdata = None
+        if use_header:
+            msg = msg_headers()
+            msg.headers = [ CBlockHeader(block) ]
+            self.send_message(msg)
+        else:
+            self.send_message(msg_inv(inv=[CInv(2, block.sha256)]))
+        self.wait_for_getdata()
+        return
+
+    def announce_block(self, block, use_header):
+        with mininode_lock:
+            self.last_getdata = None
+        if use_header:
+            msg = msg_headers()
+            msg.headers = [ CBlockHeader(block) ]
+            self.send_message(msg)
+        else:
+            self.send_message(msg_inv(inv=[CInv(2, block.sha256)]))
+
+    def request_block(self, blockhash, inv_type, timeout=60):
+        with mininode_lock:
+            self.last_block = None
+        self.send_message(msg_getdata(inv=[CInv(inv_type, blockhash)]))
+        self.wait_for_block(blockhash, timeout)
+        return self.last_block
+
+    def test_transaction_acceptance(self, tx, with_witness, accepted):
+        tx_message = msg_tx(tx)
+        if with_witness:
+            tx_message = msg_witness_tx(tx)
+        self.send_message(tx_message)
+        self.sync_with_ping()
+        assert_equal(tx.hash in self.connection.rpc.getrawmempool(), accepted)
+
+    # Test whether a witness block had the correct effect on the tip
+    def test_witness_block(self, block, accepted, with_witness=True):
+        if with_witness:
+            self.send_message(msg_witness_block(block))
+        else:
+            self.send_message(msg_block(block))
+        self.sync_with_ping()
+        assert_equal(self.connection.rpc.getbestblockhash() == block.hash, accepted)
+
+
+# Used to keep track of anyone-can-spend outputs that we can use in the tests
+class UTXO(object):
+    def __init__(self, sha256, n, nValue):
+        self.sha256 = sha256
+        self.n = n
+        self.nValue = nValue
+
+
+class SegWitTest(BitcoinTestFramework):
+    def setup_chain(self):
+        initialize_chain_clean(self.options.tmpdir, 3)
+
+    def add_options(self, parser):
+        parser.add_option("--oldbinary", dest="oldbinary",
+                          default=None,
+                          help="pre-segwit bitcoind binary for upgrade testing")
+
+    def setup_network(self):
+        self.nodes = []
+        self.nodes.append(start_node(0, self.options.tmpdir, ["-debug", "-logtimemicros=1", "-whitelist=127.0.0.1"]))
+        # Start a node for testing IsStandard rules.
+        self.nodes.append(start_node(1, self.options.tmpdir, ["-debug", "-logtimemicros=1", "-whitelist=127.0.0.1", "-acceptnonstdtxn=0"]))
+        connect_nodes(self.nodes[0], 1)
+
+        # If an old bitcoind is given, do the upgrade-after-activation test.
+        self.test_upgrade = False
+        if (self.options.oldbinary != None):
+            self.nodes.append(start_node(2, self.options.tmpdir, ["-debug", "-whitelist=127.0.0.1"], binary=self.options.oldbinary))
+            connect_nodes(self.nodes[0], 2)
+            self.test_upgrade = True
+
+    ''' Helpers '''
+    # Build a block on top of node0's tip.
+    def build_next_block(self, nVersion=4):
+        tip = self.nodes[0].getbestblockhash()
+        height = self.nodes[0].getblockcount() + 1
+        block_time = self.nodes[0].getblockheader(tip)["mediantime"] + 1
+        block = create_block(int(tip, 16), create_coinbase(height), block_time)
+        block.nVersion = nVersion
+        block.rehash()
+        return block
+
+    # Adds list of transactions to block, adds witness commitment, then solves.
+    def update_witness_block_with_transactions(self, block, tx_list, nonce=0):
+        block.vtx.extend(tx_list)
+        add_witness_commitment(block, nonce)
+        block.solve()
+        return
+
+    ''' Individual tests '''
+    def test_witness_services(self):
+        print("\tVerifying NODE_WITNESS service bit")
+        assert((self.test_node.connection.nServices & NODE_WITNESS) != 0)
+
+
+    # See if sending a regular transaction works, and create a utxo
+    # to use in later tests.
+    def test_non_witness_transaction(self):
+        # Mine a block with an anyone-can-spend coinbase,
+        # let it mature, then try to spend it.
+        print("\tTesting non-witness transaction")
+        block = self.build_next_block(nVersion=1)
+        block.solve()
+        self.test_node.send_message(msg_block(block))
+        self.test_node.sync_with_ping() # make sure the block was processed
+        txid = block.vtx[0].sha256
+
+        self.nodes[0].generate(99) # let the block mature
+
+        # Create a transaction that spends the coinbase
+        tx = CTransaction()
+        tx.vin.append(CTxIn(COutPoint(txid, 0), b""))
+        tx.vout.append(CTxOut(49*100000000, CScript([OP_TRUE])))
+        tx.calc_sha256()
+
+        # Check that serializing it with or without witness is the same
+        # This is a sanity check of our testing framework.
+        assert_equal(msg_tx(tx).serialize(), msg_witness_tx(tx).serialize())
+
+        self.test_node.send_message(msg_witness_tx(tx))
+        self.test_node.sync_with_ping() # make sure the tx was processed
+        assert(tx.hash in self.nodes[0].getrawmempool())
+        # Save this transaction for later
+        self.utxo.append(UTXO(tx.sha256, 0, 49*100000000))
+        self.nodes[0].generate(1)
+
+
+    # Verify that blocks with witnesses are rejected before activation.
+    def test_unnecessary_witness_before_segwit_activation(self):
+        print("\tTesting behavior of unnecessary witnesses")
+        # For now, rely on earlier tests to have created at least one utxo for
+        # us to use
+        assert(len(self.utxo) > 0)
+        assert(get_bip9_status(self.nodes[0], 'segwit')['status'] != 'active')
+
+        tx = CTransaction()
+        tx.vin.append(CTxIn(COutPoint(self.utxo[0].sha256, self.utxo[0].n), b""))
+        tx.vout.append(CTxOut(self.utxo[0].nValue-1000, CScript([OP_TRUE])))
+        tx.wit.vtxinwit.append(CTxinWitness())
+        tx.wit.vtxinwit[0].scriptWitness.stack = [CScript([CScriptNum(1)])]
+
+        # Verify the hash with witness differs from the txid
+        # (otherwise our testing framework must be broken!)
+        tx.rehash()
+        assert(tx.sha256 != tx.calc_sha256(with_witness=True))
+
+        # Construct a segwit-signaling block that includes the transaction.
+        block = self.build_next_block(nVersion=(VB_TOP_BITS|(1 << VB_WITNESS_BIT)))
+        self.update_witness_block_with_transactions(block, [tx])
+        # Sending witness data before activation is not allowed (anti-spam
+        # rule).
+        self.test_node.test_witness_block(block, accepted=False)
+        # TODO: fix synchronization so we can test reject reason
+        # Right now, bitcoind delays sending reject messages for blocks
+        # until the future, making synchronization here difficult.
+        #assert_equal(self.test_node.last_reject.reason, "unexpected-witness")
+
+        # But it should not be permanently marked bad...
+        # Resend without witness information.
+        self.test_node.send_message(msg_block(block))
+        self.test_node.sync_with_ping()
+        assert_equal(self.nodes[0].getbestblockhash(), block.hash)
+
+        # Update our utxo list; we spent the first entry.
+        self.utxo.pop(0)
+        self.utxo.append(UTXO(tx.sha256, 0, tx.vout[0].nValue))
+
+
+    # Mine enough blocks for segwit's vb state to be 'started'.
+    def advance_to_segwit_started(self):
+        height = self.nodes[0].getblockcount()
+        # Will need to rewrite the tests here if we are past the first period
+        assert(height < VB_PERIOD - 1)
+        # Genesis block is 'defined'.
+        assert_equal(get_bip9_status(self.nodes[0], 'segwit')['status'], 'defined')
+        # Advance to end of period, status should now be 'started'
+        self.nodes[0].generate(VB_PERIOD-height-1)
+        assert_equal(get_bip9_status(self.nodes[0], 'segwit')['status'], 'started')
+
+    # Mine enough blocks to lock in segwit, but don't activate.
+    # TODO: we could verify that lockin only happens at the right threshold of
+    # signalling blocks, rather than just at the right period boundary.
+    def advance_to_segwit_lockin(self):
+        height = self.nodes[0].getblockcount()
+        assert_equal(get_bip9_status(self.nodes[0], 'segwit')['status'], 'started')
+        # Advance to end of period, and verify lock-in happens at the end
+        self.nodes[0].generate(VB_PERIOD-1)
+        height = self.nodes[0].getblockcount()
+        assert((height % VB_PERIOD) == VB_PERIOD - 2)
+        assert_equal(get_bip9_status(self.nodes[0], 'segwit')['status'], 'started')
+        self.nodes[0].generate(1)
+        assert_equal(get_bip9_status(self.nodes[0], 'segwit')['status'], 'locked_in')
+
+
+    # Mine enough blocks to activate segwit.
+    # TODO: we could verify that activation only happens at the right threshold
+    # of signalling blocks, rather than just at the right period boundary.
+    def advance_to_segwit_active(self):
+        assert_equal(get_bip9_status(self.nodes[0], 'segwit')['status'], 'locked_in')
+        height = self.nodes[0].getblockcount()
+        self.nodes[0].generate(VB_PERIOD - (height%VB_PERIOD) - 2)
+        assert_equal(get_bip9_status(self.nodes[0], 'segwit')['status'], 'locked_in')
+        self.nodes[0].generate(1)
+        assert_equal(get_bip9_status(self.nodes[0], 'segwit')['status'], 'active')
+
+
+    # This test can only be run after segwit has activated
+    def test_witness_commitments(self):
+        print("\tTesting witness commitments")
+
+        # First try a correct witness commitment.
+        block = self.build_next_block()
+        add_witness_commitment(block)
+        block.solve()
+
+        # Test the test -- witness serialization should be different
+        assert(msg_witness_block(block).serialize() != msg_block(block).serialize())
+
+        # This empty block should be valid.
+        self.test_node.test_witness_block(block, accepted=True)
+
+        # Try to tweak the nonce
+        block_2 = self.build_next_block()
+        add_witness_commitment(block_2, nonce=28)
+        block_2.solve()
+
+        # The commitment should have changed!
+        assert(block_2.vtx[0].vout[-1] != block.vtx[0].vout[-1])
+
+        # This should also be valid.
+        self.test_node.test_witness_block(block_2, accepted=True)
+
+        # Now test commitments with actual transactions
+        assert (len(self.utxo) > 0)
+        tx = CTransaction()
+        tx.vin.append(CTxIn(COutPoint(self.utxo[0].sha256, self.utxo[0].n), b""))
+
+        # Let's construct a witness program
+        witness_program = CScript([OP_TRUE])
+        witness_hash = sha256(witness_program)
+        scriptPubKey = CScript([OP_0, witness_hash])
+        tx.vout.append(CTxOut(self.utxo[0].nValue-1000, scriptPubKey))
+        tx.rehash()
+
+        # tx2 will spend tx1, and send back to a regular anyone-can-spend address
+        tx2 = CTransaction()
+        tx2.vin.append(CTxIn(COutPoint(tx.sha256, 0), b""))
+        tx2.vout.append(CTxOut(tx.vout[0].nValue-1000, witness_program))
+        tx2.wit.vtxinwit.append(CTxinWitness())
+        tx2.wit.vtxinwit[0].scriptWitness.stack = [witness_program]
+        tx2.rehash()
+
+        block_3 = self.build_next_block()
+        self.update_witness_block_with_transactions(block_3, [tx, tx2], nonce=1)
+        # Add an extra OP_RETURN output that matches the witness commitment template,
+        # even though it has extra data after the incorrect commitment.
+        # This block should fail.
+        block_3.vtx[0].vout.append(CTxOut(0, CScript([OP_RETURN, WITNESS_COMMITMENT_HEADER + ser_uint256(2), 10])))
+        block_3.vtx[0].rehash()
+        block_3.hashMerkleRoot = block_3.calc_merkle_root()
+        block_3.rehash()
+        block_3.solve()
+
+        self.test_node.test_witness_block(block_3, accepted=False)
+
+        # Add a different commitment with different nonce, but in the
+        # right location, and with some funds burned(!).
+        # This should succeed (nValue shouldn't affect finding the
+        # witness commitment).
+        add_witness_commitment(block_3, nonce=0)
+        block_3.vtx[0].vout[0].nValue -= 1
+        block_3.vtx[0].vout[-1].nValue += 1
+        block_3.vtx[0].rehash()
+        block_3.hashMerkleRoot = block_3.calc_merkle_root()
+        block_3.rehash()
+        assert(len(block_3.vtx[0].vout) == 4) # 3 OP_returns
+        block_3.solve()
+        self.test_node.test_witness_block(block_3, accepted=True)
+
+        # Finally test that a block with no witness transactions can
+        # omit the commitment.
+        block_4 = self.build_next_block()
+        tx3 = CTransaction()
+        tx3.vin.append(CTxIn(COutPoint(tx2.sha256, 0), b""))
+        tx3.vout.append(CTxOut(tx.vout[0].nValue-1000, witness_program))
+        tx3.rehash()
+        block_4.vtx.append(tx3)
+        block_4.hashMerkleRoot = block_4.calc_merkle_root()
+        block_4.solve()
+        self.test_node.test_witness_block(block_4, with_witness=False, accepted=True)
+
+        # Update available utxo's for use in later test.
+        self.utxo.pop(0)
+        self.utxo.append(UTXO(tx3.sha256, 0, tx3.vout[0].nValue))
+
+
+    def test_block_malleability(self):
+        print("\tTesting witness block malleability")
+
+        # Make sure that a block that has too big a virtual size
+        # because of a too-large coinbase witness is not permanently
+        # marked bad.
+        block = self.build_next_block()
+        add_witness_commitment(block)
+        block.solve()
+
+        block.vtx[0].wit.vtxinwit[0].scriptWitness.stack.append(b'a'*5000000)
+        assert(get_virtual_size(block) > MAX_BLOCK_SIZE)
+
+        # We can't send over the p2p network, because this is too big to relay
+        # TODO: repeat this test with a block that can be relayed
+        self.nodes[0].submitblock(bytes_to_hex_str(block.serialize(True)))
+
+        assert(self.nodes[0].getbestblockhash() != block.hash)
+
+        block.vtx[0].wit.vtxinwit[0].scriptWitness.stack.pop()
+        assert(get_virtual_size(block) < MAX_BLOCK_SIZE)
+        self.nodes[0].submitblock(bytes_to_hex_str(block.serialize(True)))
+
+        assert(self.nodes[0].getbestblockhash() == block.hash)
+
+        # Now make sure that malleating the witness nonce doesn't
+        # result in a block permanently marked bad.
+        block = self.build_next_block()
+        add_witness_commitment(block)
+        block.solve()
+
+        # Change the nonce -- should not cause the block to be permanently
+        # failed
+        block.vtx[0].wit.vtxinwit[0].scriptWitness.stack = [ ser_uint256(1) ]
+        self.test_node.test_witness_block(block, accepted=False)
+
+        # Changing the witness nonce doesn't change the block hash
+        block.vtx[0].wit.vtxinwit[0].scriptWitness.stack = [ ser_uint256(0) ]
+        self.test_node.test_witness_block(block, accepted=True)
+
+
+    def test_witness_block_size(self):
+        print("\tTesting witness block size limit")
+        # TODO: Test that non-witness carrying blocks can't exceed 1MB
+        # Skipping this test for now; this is covered in p2p-fullblocktest.py
+
+        # Test that witness-bearing blocks are limited at ceil(base + wit/4) <= 1MB.
+        block = self.build_next_block()
+
+        assert(len(self.utxo) > 0)
+        
+        # Create a P2WSH transaction.
+        # The witness program will be a bunch of OP_2DROP's, followed by OP_TRUE.
+        # This should give us plenty of room to tweak the spending tx's
+        # virtual size.
+        NUM_DROPS = 200 # 201 max ops per script!
+        NUM_OUTPUTS = 50
+
+        witness_program = CScript([OP_2DROP]*NUM_DROPS + [OP_TRUE])
+        witness_hash = uint256_from_str(sha256(witness_program))
+        scriptPubKey = CScript([OP_0, ser_uint256(witness_hash)])
+
+        prevout = COutPoint(self.utxo[0].sha256, self.utxo[0].n)
+        value = self.utxo[0].nValue
+
+        parent_tx = CTransaction()
+        parent_tx.vin.append(CTxIn(prevout, b""))
+        child_value = int(value/NUM_OUTPUTS)
+        for i in range(NUM_OUTPUTS):
+            parent_tx.vout.append(CTxOut(child_value, scriptPubKey))
+        parent_tx.vout[0].nValue -= 50000
+        assert(parent_tx.vout[0].nValue > 0)
+        parent_tx.rehash()
+
+        child_tx = CTransaction()
+        for i in range(NUM_OUTPUTS):
+            child_tx.vin.append(CTxIn(COutPoint(parent_tx.sha256, i), b""))
+        child_tx.vout = [CTxOut(value - 100000, CScript([OP_TRUE]))]
+        for i in range(NUM_OUTPUTS):
+            child_tx.wit.vtxinwit.append(CTxinWitness())
+            child_tx.wit.vtxinwit[-1].scriptWitness.stack = [b'a'*195]*(2*NUM_DROPS) + [witness_program]
+        child_tx.rehash()
+        self.update_witness_block_with_transactions(block, [parent_tx, child_tx])
+
+        vsize = get_virtual_size(block)
+        additional_bytes = (MAX_BLOCK_SIZE - vsize)*4
+        i = 0
+        while additional_bytes > 0:
+            # Add some more bytes to each input until we hit MAX_BLOCK_SIZE+1
+            extra_bytes = min(additional_bytes+1, 55)
+            block.vtx[-1].wit.vtxinwit[int(i/(2*NUM_DROPS))].scriptWitness.stack[i%(2*NUM_DROPS)] = b'a'*(195+extra_bytes)
+            additional_bytes -= extra_bytes
+            i += 1
+
+        block.vtx[0].vout.pop()  # Remove old commitment
+        add_witness_commitment(block)
+        block.solve()
+        vsize = get_virtual_size(block)
+        assert_equal(vsize, MAX_BLOCK_SIZE + 1)
+        # Make sure that our test case would exceed the old max-network-message
+        # limit
+        assert(len(block.serialize(True)) > 2*1024*1024)
+
+        self.test_node.test_witness_block(block, accepted=False)
+
+        # Now resize the second transaction to make the block fit.
+        cur_length = len(block.vtx[-1].wit.vtxinwit[0].scriptWitness.stack[0])
+        block.vtx[-1].wit.vtxinwit[0].scriptWitness.stack[0] = b'a'*(cur_length-1)
+        block.vtx[0].vout.pop()
+        add_witness_commitment(block)
+        block.solve()
+        assert(get_virtual_size(block) == MAX_BLOCK_SIZE)
+
+        self.test_node.test_witness_block(block, accepted=True)
+
+        # Update available utxo's
+        self.utxo.pop(0)
+        self.utxo.append(UTXO(block.vtx[-1].sha256, 0, block.vtx[-1].vout[0].nValue))
+
+
+    # submitblock will try to add the nonce automatically, so that mining
+    # software doesn't need to worry about doing so itself.
+    def test_submit_block(self):
+        block = self.build_next_block()
+
+        # Try using a custom nonce and then don't supply it.
+        # This shouldn't possibly work.
+        add_witness_commitment(block, nonce=1)
+        block.vtx[0].wit = CTxWitness() # drop the nonce
+        block.solve()
+        self.nodes[0].submitblock(bytes_to_hex_str(block.serialize(True)))
+        assert(self.nodes[0].getbestblockhash() != block.hash)
+
+        # Now redo commitment with the standard nonce, but let bitcoind fill it in.
+        add_witness_commitment(block, nonce=0)
+        block.vtx[0].wit = CTxWitness()
+        block.solve()
+        self.nodes[0].submitblock(bytes_to_hex_str(block.serialize(True)))
+        assert_equal(self.nodes[0].getbestblockhash(), block.hash)
+
+        # This time, add a tx with non-empty witness, but don't supply
+        # the commitment.
+        block_2 = self.build_next_block()
+
+        add_witness_commitment(block_2)
+
+        block_2.solve()
+
+        # Drop commitment and nonce -- submitblock should not fill in.
+        block_2.vtx[0].vout.pop()
+        block_2.vtx[0].wit = CTxWitness()
+
+        self.nodes[0].submitblock(bytes_to_hex_str(block_2.serialize(True)))
+        # Tip should not advance!
+        assert(self.nodes[0].getbestblockhash() != block_2.hash)
+
+
+    # Consensus tests of extra witness data in a transaction.
+    def test_extra_witness_data(self):
+        print("\tTesting extra witness data in tx")
+
+        assert(len(self.utxo) > 0)
+        
+        block = self.build_next_block()
+
+        witness_program = CScript([OP_DROP, OP_TRUE])
+        witness_hash = sha256(witness_program)
+        scriptPubKey = CScript([OP_0, witness_hash])
+
+        # First try extra witness data on a tx that doesn't require a witness
+        tx = CTransaction()
+        tx.vin.append(CTxIn(COutPoint(self.utxo[0].sha256, self.utxo[0].n), b""))
+        tx.vout.append(CTxOut(self.utxo[0].nValue-2000, scriptPubKey))
+        tx.vout.append(CTxOut(1000, CScript([OP_TRUE]))) # non-witness output
+        tx.wit.vtxinwit.append(CTxinWitness())
+        tx.wit.vtxinwit[0].scriptWitness.stack = [CScript([])]
+        tx.rehash()
+        self.update_witness_block_with_transactions(block, [tx])
+
+        # Extra witness data should not be allowed.
+        self.test_node.test_witness_block(block, accepted=False)
+
+        # Try extra signature data.  Ok if we're not spending a witness output.
+        block.vtx[1].wit.vtxinwit = []
+        block.vtx[1].vin[0].scriptSig = CScript([OP_0])
+        block.vtx[1].rehash()
+        add_witness_commitment(block)
+        block.solve()
+
+        self.test_node.test_witness_block(block, accepted=True)
+
+        # Now try extra witness/signature data on an input that DOES require a
+        # witness
+        tx2 = CTransaction()
+        tx2.vin.append(CTxIn(COutPoint(tx.sha256, 0), b"")) # witness output
+        tx2.vin.append(CTxIn(COutPoint(tx.sha256, 1), b"")) # non-witness
+        tx2.vout.append(CTxOut(tx.vout[0].nValue, CScript([OP_TRUE])))
+        tx2.wit.vtxinwit.extend([CTxinWitness(), CTxinWitness()])
+        tx2.wit.vtxinwit[0].scriptWitness.stack = [ CScript([CScriptNum(1)]), CScript([CScriptNum(1)]), witness_program ]
+        tx2.wit.vtxinwit[1].scriptWitness.stack = [ CScript([OP_TRUE]) ]
+
+        block = self.build_next_block()
+        self.update_witness_block_with_transactions(block, [tx2])
+
+        # This has extra witness data, so it should fail.
+        self.test_node.test_witness_block(block, accepted=False)
+
+        # Now get rid of the extra witness, but add extra scriptSig data
+        tx2.vin[0].scriptSig = CScript([OP_TRUE])
+        tx2.vin[1].scriptSig = CScript([OP_TRUE])
+        tx2.wit.vtxinwit[0].scriptWitness.stack.pop(0)
+        tx2.wit.vtxinwit[1].scriptWitness.stack = []
+        tx2.rehash()
+        add_witness_commitment(block)
+        block.solve()
+
+        # This has extra signature data for a witness input, so it should fail.
+        self.test_node.test_witness_block(block, accepted=False)
+
+        # Now get rid of the extra scriptsig on the witness input, and verify
+        # success (even with extra scriptsig data in the non-witness input)
+        tx2.vin[0].scriptSig = b""
+        tx2.rehash()
+        add_witness_commitment(block)
+        block.solve()
+
+        self.test_node.test_witness_block(block, accepted=True)
+
+        # Update utxo for later tests
+        self.utxo.pop(0)
+        self.utxo.append(UTXO(tx2.sha256, 0, tx2.vout[0].nValue))
+
+
+    def test_max_witness_push_length(self):
+        ''' Should only allow up to 520 byte pushes in witness stack '''
+        print("\tTesting maximum witness push size")
+        MAX_SCRIPT_ELEMENT_SIZE = 520
+        assert(len(self.utxo))
+
+        block = self.build_next_block()
+
+        witness_program = CScript([OP_DROP, OP_TRUE])
+        witness_hash = sha256(witness_program)
+        scriptPubKey = CScript([OP_0, witness_hash])
+
+        tx = CTransaction()
+        tx.vin.append(CTxIn(COutPoint(self.utxo[0].sha256, self.utxo[0].n), b""))
+        tx.vout.append(CTxOut(self.utxo[0].nValue-1000, scriptPubKey))
+        tx.rehash()
+
+        tx2 = CTransaction()
+        tx2.vin.append(CTxIn(COutPoint(tx.sha256, 0), b""))
+        tx2.vout.append(CTxOut(tx.vout[0].nValue-1000, CScript([OP_TRUE])))
+        tx2.wit.vtxinwit.append(CTxinWitness())
+        # First try a 521-byte stack element
+        tx2.wit.vtxinwit[0].scriptWitness.stack = [ b'a'*(MAX_SCRIPT_ELEMENT_SIZE+1), witness_program ]
+        tx2.rehash()
+
+        self.update_witness_block_with_transactions(block, [tx, tx2])
+        self.test_node.test_witness_block(block, accepted=False)
+
+        # Now reduce the length of the stack element
+        tx2.wit.vtxinwit[0].scriptWitness.stack[0] = b'a'*(MAX_SCRIPT_ELEMENT_SIZE)
+
+        add_witness_commitment(block)
+        block.solve()
+        self.test_node.test_witness_block(block, accepted=True)
+
+        # Update the utxo for later tests
+        self.utxo.pop()
+        self.utxo.append(UTXO(tx2.sha256, 0, tx2.vout[0].nValue))
+
+    def test_max_witness_program_length(self):
+        # Can create witness outputs that are long, but can't be greater than
+        # 10k bytes to successfully spend
+        print("\tTesting maximum witness program length")
+        assert(len(self.utxo))
+        MAX_PROGRAM_LENGTH = 10000
+
+        # This program is 19 max pushes (9937 bytes), then 64 more opcode-bytes.
+        long_witness_program = CScript([b'a'*520]*19 + [OP_DROP]*63 + [OP_TRUE])
+        assert(len(long_witness_program) == MAX_PROGRAM_LENGTH+1)
+        long_witness_hash = sha256(long_witness_program)
+        long_scriptPubKey = CScript([OP_0, long_witness_hash])
+
+        block = self.build_next_block()
+
+        tx = CTransaction()
+        tx.vin.append(CTxIn(COutPoint(self.utxo[0].sha256, self.utxo[0].n), b""))
+        tx.vout.append(CTxOut(self.utxo[0].nValue-1000, long_scriptPubKey))
+        tx.rehash()
+
+        tx2 = CTransaction()
+        tx2.vin.append(CTxIn(COutPoint(tx.sha256, 0), b""))
+        tx2.vout.append(CTxOut(tx.vout[0].nValue-1000, CScript([OP_TRUE])))
+        tx2.wit.vtxinwit.append(CTxinWitness())
+        tx2.wit.vtxinwit[0].scriptWitness.stack = [b'a']*44 + [long_witness_program]
+        tx2.rehash()
+
+        self.update_witness_block_with_transactions(block, [tx, tx2])
+
+        self.test_node.test_witness_block(block, accepted=False)
+
+        # Try again with one less byte in the witness program
+        witness_program = CScript([b'a'*520]*19 + [OP_DROP]*62 + [OP_TRUE])
+        assert(len(witness_program) == MAX_PROGRAM_LENGTH)
+        witness_hash = sha256(witness_program)
+        scriptPubKey = CScript([OP_0, witness_hash])
+
+        tx.vout[0] = CTxOut(tx.vout[0].nValue, scriptPubKey)
+        tx.rehash()
+        tx2.vin[0].prevout.hash = tx.sha256
+        tx2.wit.vtxinwit[0].scriptWitness.stack = [b'a']*43 + [witness_program]
+        tx2.rehash()
+        block.vtx = [block.vtx[0]]
+        self.update_witness_block_with_transactions(block, [tx, tx2])
+        self.test_node.test_witness_block(block, accepted=True)
+
+        self.utxo.pop()
+        self.utxo.append(UTXO(tx2.sha256, 0, tx2.vout[0].nValue))
+
+
+    def test_witness_input_length(self):
+        ''' Ensure that vin length must match vtxinwit length '''
+        print("\tTesting witness input length")
+        assert(len(self.utxo))
+
+        witness_program = CScript([OP_DROP, OP_TRUE])
+        witness_hash = sha256(witness_program)
+        scriptPubKey = CScript([OP_0, witness_hash])
+        
+        # Create a transaction that splits our utxo into many outputs
+        tx = CTransaction()
+        tx.vin.append(CTxIn(COutPoint(self.utxo[0].sha256, self.utxo[0].n), b""))
+        nValue = self.utxo[0].nValue
+        for i in range(10):
+            tx.vout.append(CTxOut(int(nValue/10), scriptPubKey))
+        tx.vout[0].nValue -= 1000
+        assert(tx.vout[0].nValue >= 0)
+
+        block = self.build_next_block()
+        self.update_witness_block_with_transactions(block, [tx])
+        self.test_node.test_witness_block(block, accepted=True)
+
+        # Try various ways to spend tx that should all break.
+        # This "broken" transaction serializer will not normalize
+        # the length of vtxinwit.
+        class BrokenCTransaction(CTransaction):
+            def serialize_with_witness(self):
+                flags = 0
+                if not self.wit.is_null():
+                    flags |= 1
+                r = b""
+                r += struct.pack("<i", self.nVersion)
+                if flags:
+                    dummy = []
+                    r += ser_vector(dummy)
+                    r += struct.pack("<B", flags)
+                r += ser_vector(self.vin)
+                r += ser_vector(self.vout)
+                if flags & 1:
+                    r += self.wit.serialize()
+                r += struct.pack("<I", self.nLockTime)
+                return r
+
+        tx2 = BrokenCTransaction()
+        for i in range(10):
+            tx2.vin.append(CTxIn(COutPoint(tx.sha256, i), b""))
+        tx2.vout.append(CTxOut(nValue-3000, CScript([OP_TRUE])))
+
+        # First try using a too long vtxinwit
+        for i in range(11):
+            tx2.wit.vtxinwit.append(CTxinWitness())
+            tx2.wit.vtxinwit[i].scriptWitness.stack = [b'a', witness_program]
+
+        block = self.build_next_block()
+        self.update_witness_block_with_transactions(block, [tx2])
+        self.test_node.test_witness_block(block, accepted=False)
+
+        # Now try using a too short vtxinwit
+        tx2.wit.vtxinwit.pop()
+        tx2.wit.vtxinwit.pop()
+
+        block.vtx = [block.vtx[0]]
+        self.update_witness_block_with_transactions(block, [tx2])
+        self.test_node.test_witness_block(block, accepted=False)
+
+        # Now make one of the intermediate witnesses be incorrect
+        tx2.wit.vtxinwit.append(CTxinWitness())
+        tx2.wit.vtxinwit[-1].scriptWitness.stack = [b'a', witness_program]
+        tx2.wit.vtxinwit[5].scriptWitness.stack = [ witness_program ]
+
+        block.vtx = [block.vtx[0]]
+        self.update_witness_block_with_transactions(block, [tx2])
+        self.test_node.test_witness_block(block, accepted=False)
+
+        # Fix the broken witness and the block should be accepted.
+        tx2.wit.vtxinwit[5].scriptWitness.stack = [b'a', witness_program]
+        block.vtx = [block.vtx[0]]
+        self.update_witness_block_with_transactions(block, [tx2])
+        self.test_node.test_witness_block(block, accepted=True)
+
+        self.utxo.pop()
+        self.utxo.append(UTXO(tx2.sha256, 0, tx2.vout[0].nValue))
+
+
+    def test_witness_tx_relay_before_segwit_activation(self):
+        print("\tTesting relay of witness transactions")
+        # Generate a transaction that doesn't require a witness, but send it
+        # with a witness.  Should be rejected for premature-witness, but should
+        # not be added to recently rejected list.
+        assert(len(self.utxo))
+        tx = CTransaction()
+        tx.vin.append(CTxIn(COutPoint(self.utxo[0].sha256, self.utxo[0].n), b""))
+        tx.vout.append(CTxOut(self.utxo[0].nValue-1000, CScript([OP_TRUE])))
+        tx.wit.vtxinwit.append(CTxinWitness())
+        tx.wit.vtxinwit[0].scriptWitness.stack = [ b'a' ]
+        tx.rehash()
+
+        tx_hash = tx.sha256
+        tx_value = tx.vout[0].nValue
+
+        # Verify that if a peer doesn't set nServices to include NODE_WITNESS,
+        # the getdata is just for the non-witness portion.
+        self.old_node.announce_tx_and_wait_for_getdata(tx)
+        assert(self.old_node.last_getdata.inv[0].type == 1)
+
+        # Since we haven't delivered the tx yet, inv'ing the same tx from
+        # a witness transaction ought not result in a getdata.
+        try:
+            self.test_node.announce_tx_and_wait_for_getdata(tx, timeout=2)
+            print("Error: duplicate tx getdata!")
+            assert(False)
+        except AssertionError as e:
+            pass
+
+        # Delivering this transaction with witness should fail (no matter who
+        # its from)
+        assert_equal(len(self.nodes[0].getrawmempool()), 0)
+        assert_equal(len(self.nodes[1].getrawmempool()), 0)
+        self.old_node.test_transaction_acceptance(tx, with_witness=True, accepted=False)
+        self.test_node.test_transaction_acceptance(tx, with_witness=True, accepted=False)
+
+        # But eliminating the witness should fix it
+        self.test_node.test_transaction_acceptance(tx, with_witness=False, accepted=True)
+
+        # Verify that inv's to test_node come with getdata's for non-witness tx's
+        # Just tweak the transaction, announce it, and verify we get a getdata
+        # for a normal tx
+        tx.vout[0].scriptPubKey = CScript([OP_TRUE, OP_TRUE])
+        tx.rehash()
+        self.test_node.announce_tx_and_wait_for_getdata(tx)
+        assert(self.test_node.last_getdata.inv[0].type == 1)
+
+        # Cleanup: mine the first transaction and update utxo
+        self.nodes[0].generate(1)
+        assert_equal(len(self.nodes[0].getrawmempool()),  0)
+
+        self.utxo.pop(0)
+        self.utxo.append(UTXO(tx_hash, 0, tx_value))
+
+
+    # After segwit activates, verify that mempool:
+    # - rejects transactions with unnecessary/extra witnesses
+    # - accepts transactions with valid witnesses
+    # and that witness transactions are relayed to non-upgraded peers.
+    def test_tx_relay_after_segwit_activation(self):
+        print("\tTesting relay of witness transactions")
+        # Generate a transaction that doesn't require a witness, but send it
+        # with a witness.  Should be rejected because we can't use a witness
+        # when spending a non-witness output.
+        assert(len(self.utxo))
+        tx = CTransaction()
+        tx.vin.append(CTxIn(COutPoint(self.utxo[0].sha256, self.utxo[0].n), b""))
+        tx.vout.append(CTxOut(self.utxo[0].nValue-1000, CScript([OP_TRUE])))
+        tx.wit.vtxinwit.append(CTxinWitness())
+        tx.wit.vtxinwit[0].scriptWitness.stack = [ b'a' ]
+        tx.rehash()
+
+        tx_hash = tx.sha256
+        tx_value = tx.vout[0].nValue
+
+        # Verify that unnecessary witnesses are rejected.
+        self.test_node.announce_tx_and_wait_for_getdata(tx)
+        assert_equal(len(self.nodes[0].getrawmempool()), 0)
+        self.test_node.test_transaction_acceptance(tx, with_witness=True, accepted=False)
+
+        # Verify that removing the witness succeeds.
+        # Re-announcing won't result in a getdata for ~2.5 minutes, so just
+        # deliver the modified transaction.
+        self.test_node.test_transaction_acceptance(tx, with_witness=False, accepted=True)
+
+        # Now try to add extra witness data to a valid witness tx.
+        witness_program = CScript([OP_TRUE])
+        witness_hash = sha256(witness_program)
+        scriptPubKey = CScript([OP_0, witness_hash])
+        tx2 = CTransaction()
+        tx2.vin.append(CTxIn(COutPoint(tx_hash, 0), b""))
+        tx2.vout.append(CTxOut(tx.vout[0].nValue-1000, scriptPubKey))
+        tx2.rehash()
+
+        tx3 = CTransaction()
+        tx3.vin.append(CTxIn(COutPoint(tx2.sha256, 0), b""))
+        tx3.vout.append(CTxOut(tx2.vout[0].nValue-1000, CScript([OP_TRUE])))
+        tx3.wit.vtxinwit.append(CTxinWitness())
+        tx3.wit.vtxinwit[0].scriptWitness.stack = [CScript([CScriptNum(1)]), witness_program ]
+        tx3.rehash()
+
+        self.test_node.test_transaction_acceptance(tx2, with_witness=True, accepted=True)
+        self.test_node.test_transaction_acceptance(tx3, with_witness=True, accepted=False)
+
+        # Get rid of the extra witness, and verify acceptance.
+        tx3.wit.vtxinwit[0].scriptWitness.stack = [ witness_program ]
+        # Also check that old_node gets a tx announcement, even though this is
+        # a witness transaction.
+        self.old_node.wait_for_inv(CInv(1, tx2.sha256)) # wait until tx2 was inv'ed
+        self.test_node.test_transaction_acceptance(tx3, with_witness=True, accepted=True)
+        self.old_node.wait_for_inv(CInv(1, tx3.sha256))
+
+        # Test that getrawtransaction returns correct witness information
+        # hash, size, vsize
+        raw_tx = self.nodes[0].getrawtransaction(tx3.hash, 1)
+        assert_equal(int(raw_tx["hash"], 16), tx3.calc_sha256(True))
+        assert_equal(raw_tx["size"], len(tx3.serialize_with_witness()))
+        vsize = (len(tx3.serialize_with_witness()) + 3*len(tx3.serialize_without_witness()) + 3) / 4
+        assert_equal(raw_tx["vsize"], vsize)
+        assert_equal(len(raw_tx["vin"][0]["txinwitness"]), 1)
+        assert_equal(raw_tx["vin"][0]["txinwitness"][0], hexlify(witness_program).decode('ascii'))
+        assert(vsize != raw_tx["size"])
+
+        # Cleanup: mine the transactions and update utxo for next test
+        self.nodes[0].generate(1)
+        assert_equal(len(self.nodes[0].getrawmempool()),  0)
+
+        self.utxo.pop(0)
+        self.utxo.append(UTXO(tx3.sha256, 0, tx3.vout[0].nValue))
+
+
+    # Test that block requests to NODE_WITNESS peer are with MSG_WITNESS_FLAG
+    # This is true regardless of segwit activation.
+    # Also test that we don't ask for blocks from unupgraded peers
+    def test_block_relay(self, segwit_activated):
+        print("\tTesting block relay")
+
+        blocktype = 2|MSG_WITNESS_FLAG if segwit_activated else 2
+
+        # test_node has set NODE_WITNESS, so all getdata requests should be for
+        # witness blocks.
+        # Test announcing a block via inv results in a getdata, and that
+        # announcing a version 4 or random VB block with a header results in a getdata
+        block1 = self.build_next_block()
+        block1.solve()
+
+        self.test_node.announce_block_and_wait_for_getdata(block1, use_header=False)
+        assert(self.test_node.last_getdata.inv[0].type == blocktype)
+        self.test_node.test_witness_block(block1, True)
+
+        block2 = self.build_next_block(nVersion=4)
+        block2.solve()
+
+        self.test_node.announce_block_and_wait_for_getdata(block2, use_header=True)
+        assert(self.test_node.last_getdata.inv[0].type == blocktype)
+        self.test_node.test_witness_block(block2, True)
+
+        block3 = self.build_next_block(nVersion=(VB_TOP_BITS | (1<<15)))
+        block3.solve()
+        self.test_node.announce_block_and_wait_for_getdata(block3, use_header=True)
+        assert(self.test_node.last_getdata.inv[0].type == blocktype)
+        self.test_node.test_witness_block(block3, True)
+
+        # Check that we can getdata for witness blocks or regular blocks,
+        # and the right thing happens.
+        if segwit_activated == False:
+            # Before activation, we should be able to request old blocks with
+            # or without witness, and they should be the same.
+            chain_height = self.nodes[0].getblockcount()
+            # Pick 10 random blocks on main chain, and verify that getdata's
+            # for MSG_BLOCK, MSG_WITNESS_BLOCK, and rpc getblock() are equal.
+            all_heights = list(range(chain_height+1))
+            random.shuffle(all_heights)
+            all_heights = all_heights[0:10]
+            for height in all_heights:
+                block_hash = self.nodes[0].getblockhash(height)
+                rpc_block = self.nodes[0].getblock(block_hash, False)
+                block_hash = int(block_hash, 16)
+                block = self.test_node.request_block(block_hash, 2)
+                wit_block = self.test_node.request_block(block_hash, 2|MSG_WITNESS_FLAG)
+                assert_equal(block.serialize(True), wit_block.serialize(True))
+                assert_equal(block.serialize(), hex_str_to_bytes(rpc_block))
+        else:
+            # After activation, witness blocks and non-witness blocks should
+            # be different.  Verify rpc getblock() returns witness blocks, while
+            # getdata respects the requested type.
+            block = self.build_next_block()
+            self.update_witness_block_with_transactions(block, [])
+            # This gives us a witness commitment.
+            assert(len(block.vtx[0].wit.vtxinwit) == 1)
+            assert(len(block.vtx[0].wit.vtxinwit[0].scriptWitness.stack) == 1)
+            self.test_node.test_witness_block(block, accepted=True)
+            # Now try to retrieve it...
+            rpc_block = self.nodes[0].getblock(block.hash, False)
+            non_wit_block = self.test_node.request_block(block.sha256, 2)
+            wit_block = self.test_node.request_block(block.sha256, 2|MSG_WITNESS_FLAG)
+            assert_equal(wit_block.serialize(True), hex_str_to_bytes(rpc_block))
+            assert_equal(wit_block.serialize(False), non_wit_block.serialize())
+            assert_equal(wit_block.serialize(True), block.serialize(True))
+
+            # Test size, vsize, cost
+            rpc_details = self.nodes[0].getblock(block.hash, True)
+            assert_equal(rpc_details["size"], len(block.serialize(True)))
+            assert_equal(rpc_details["strippedsize"], len(block.serialize(False)))
+            cost = 3*len(block.serialize(False)) + len(block.serialize(True))
+            assert_equal(rpc_details["cost"], cost)
+
+            # Upgraded node should not ask for blocks from unupgraded
+            block4 = self.build_next_block(nVersion=4)
+            block4.solve()
+            self.old_node.getdataset = set()
+            # Blocks can be requested via direct-fetch (immediately upon processing the announcement)
+            # or via parallel download (with an indeterminate delay from processing the announcement)
+            # so to test that a block is NOT requested, we could guess a time period to sleep for,
+            # and then check. We can avoid the sleep() by taking advantage of transaction getdata's
+            # being processed after block getdata's, and announce a transaction as well,
+            # and then check to see if that particular getdata has been received.
+            self.old_node.announce_block(block4, use_header=False)
+            self.old_node.announce_tx_and_wait_for_getdata(block4.vtx[0])
+            assert(block4.sha256 not in self.old_node.getdataset)
+
+    # Verify that future segwit upgraded transactions are non-standard,
+    # but valid in blocks. Can run this before and after segwit activation.
+    def test_segwit_versions(self):
+        print("\tTesting standardness/consensus for segwit versions (0-16)")
+        assert(len(self.utxo))
+        NUM_TESTS = 17 # will test OP_0, OP1, ..., OP_16
+        if (len(self.utxo) < NUM_TESTS):
+            tx = CTransaction()
+            tx.vin.append(CTxIn(COutPoint(self.utxo[0].sha256, self.utxo[0].n), b""))
+            split_value = (self.utxo[0].nValue - 4000) // NUM_TESTS
+            for i in range(NUM_TESTS):
+                tx.vout.append(CTxOut(split_value, CScript([OP_TRUE])))
+            tx.rehash()
+            block = self.build_next_block()
+            self.update_witness_block_with_transactions(block, [tx])
+            self.test_node.test_witness_block(block, accepted=True)
+            self.utxo.pop(0)
+            for i in range(NUM_TESTS):
+                self.utxo.append(UTXO(tx.sha256, i, split_value))
+
+        sync_blocks(self.nodes)
+        temp_utxo = []
+        tx = CTransaction()
+        count = 0
+        witness_program = CScript([OP_TRUE])
+        witness_hash = sha256(witness_program)
+        assert_equal(len(self.nodes[1].getrawmempool()), 0)
+        for version in list(range(OP_1, OP_16+1)) + [OP_0]:
+            count += 1
+            # First try to spend to a future version segwit scriptPubKey.
+            scriptPubKey = CScript([CScriptOp(version), witness_hash])
+            tx.vin = [CTxIn(COutPoint(self.utxo[0].sha256, self.utxo[0].n), b"")]
+            tx.vout = [CTxOut(self.utxo[0].nValue-1000, scriptPubKey)]
+            tx.rehash()
+            self.std_node.test_transaction_acceptance(tx, with_witness=True, accepted=False)
+            self.test_node.test_transaction_acceptance(tx, with_witness=True, accepted=True)
+            self.utxo.pop(0)
+            temp_utxo.append(UTXO(tx.sha256, 0, tx.vout[0].nValue))
+
+        self.nodes[0].generate(1) # Mine all the transactions
+        sync_blocks(self.nodes)
+        assert(len(self.nodes[0].getrawmempool()) == 0)
+
+        # Finally, verify that version 0 -> version 1 transactions
+        # are non-standard
+        scriptPubKey = CScript([CScriptOp(OP_1), witness_hash])
+        tx2 = CTransaction()
+        tx2.vin = [CTxIn(COutPoint(tx.sha256, 0), b"")]
+        tx2.vout = [CTxOut(tx.vout[0].nValue-1000, scriptPubKey)]
+        tx2.wit.vtxinwit.append(CTxinWitness())
+        tx2.wit.vtxinwit[0].scriptWitness.stack = [ witness_program ]
+        tx2.rehash()
+        # Gets accepted to test_node, because standardness of outputs isn't
+        # checked with fRequireStandard
+        self.test_node.test_transaction_acceptance(tx2, with_witness=True, accepted=True)
+        self.std_node.test_transaction_acceptance(tx2, with_witness=True, accepted=False)
+        temp_utxo.pop() # last entry in temp_utxo was the output we just spent
+        temp_utxo.append(UTXO(tx2.sha256, 0, tx2.vout[0].nValue))
+
+        # Spend everything in temp_utxo back to an OP_TRUE output.
+        tx3 = CTransaction()
+        total_value = 0
+        for i in temp_utxo:
+            tx3.vin.append(CTxIn(COutPoint(i.sha256, i.n), b""))
+            tx3.wit.vtxinwit.append(CTxinWitness())
+            total_value += i.nValue
+        tx3.wit.vtxinwit[-1].scriptWitness.stack = [witness_program]
+        tx3.vout.append(CTxOut(total_value - 1000, CScript([OP_TRUE])))
+        tx3.rehash()
+        # Spending a higher version witness output is not allowed by policy,
+        # even with fRequireStandard=false.
+        self.test_node.test_transaction_acceptance(tx3, with_witness=True, accepted=False)
+        self.test_node.sync_with_ping()
+        with mininode_lock:
+            assert(b"reserved for soft-fork upgrades" in self.test_node.last_reject.reason)
+
+        # Building a block with the transaction must be valid, however.
+        block = self.build_next_block()
+        self.update_witness_block_with_transactions(block, [tx2, tx3])
+        self.test_node.test_witness_block(block, accepted=True)
+        sync_blocks(self.nodes)
+
+        # Add utxo to our list
+        self.utxo.append(UTXO(tx3.sha256, 0, tx3.vout[0].nValue))
+
+
+    def test_premature_coinbase_witness_spend(self):
+        print("\tTesting premature coinbase witness spend")
+        block = self.build_next_block()
+        # Change the output of the block to be a witness output.
+        witness_program = CScript([OP_TRUE])
+        witness_hash = sha256(witness_program)
+        scriptPubKey = CScript([OP_0, witness_hash])
+        block.vtx[0].vout[0].scriptPubKey = scriptPubKey
+        # This next line will rehash the coinbase and update the merkle
+        # root, and solve.
+        self.update_witness_block_with_transactions(block, [])
+        self.test_node.test_witness_block(block, accepted=True)
+
+        spend_tx = CTransaction()
+        spend_tx.vin = [CTxIn(COutPoint(block.vtx[0].sha256, 0), b"")]
+        spend_tx.vout = [CTxOut(block.vtx[0].vout[0].nValue, witness_program)]
+        spend_tx.wit.vtxinwit.append(CTxinWitness())
+        spend_tx.wit.vtxinwit[0].scriptWitness.stack = [ witness_program ]
+        spend_tx.rehash()
+
+        # Now test a premature spend.
+        self.nodes[0].generate(98)
+        sync_blocks(self.nodes)
+        block2 = self.build_next_block()
+        self.update_witness_block_with_transactions(block2, [spend_tx])
+        self.test_node.test_witness_block(block2, accepted=False)
+
+        # Advancing one more block should allow the spend.
+        self.nodes[0].generate(1)
+        block2 = self.build_next_block()
+        self.update_witness_block_with_transactions(block2, [spend_tx])
+        self.test_node.test_witness_block(block2, accepted=True)
+        sync_blocks(self.nodes)
+
+
+    def test_signature_version_1(self):
+        print("\tTesting segwit signature hash version 1")
+        key = CECKey()
+        key.set_secretbytes(b"9")
+        pubkey = CPubKey(key.get_pubkey())
+
+        witness_program = CScript([pubkey, CScriptOp(OP_CHECKSIG)])
+        witness_hash = sha256(witness_program)
+        scriptPubKey = CScript([OP_0, witness_hash])
+
+        # First create a witness output for use in the tests.
+        assert(len(self.utxo))
+        tx = CTransaction()
+        tx.vin.append(CTxIn(COutPoint(self.utxo[0].sha256, self.utxo[0].n), b""))
+        tx.vout.append(CTxOut(self.utxo[0].nValue-1000, scriptPubKey))
+        tx.rehash()
+
+        self.test_node.test_transaction_acceptance(tx, with_witness=True, accepted=True)
+        # Mine this transaction in preparation for following tests.
+        block = self.build_next_block()
+        self.update_witness_block_with_transactions(block, [tx])
+        self.test_node.test_witness_block(block, accepted=True)
+        sync_blocks(self.nodes)
+        self.utxo.pop(0)
+
+        # Add signature for a P2PK witness program.
+        def sign_P2PK_witness_input(script, txTo, inIdx, hashtype, value, key):
+            tx_hash = SegwitVersion1SignatureHash(script, txTo, inIdx, hashtype, value)
+            signature = key.sign(tx_hash) + chr(hashtype).encode('latin-1')
+            txTo.wit.vtxinwit[inIdx].scriptWitness.stack = [signature, script]
+            txTo.rehash()
+
+        # Test each hashtype
+        prev_utxo = UTXO(tx.sha256, 0, tx.vout[0].nValue)
+        for sigflag in [ 0, SIGHASH_ANYONECANPAY ]:
+            for hashtype in [SIGHASH_ALL, SIGHASH_NONE, SIGHASH_SINGLE]:
+                hashtype |= sigflag
+                block = self.build_next_block()
+                tx = CTransaction()
+                tx.vin.append(CTxIn(COutPoint(prev_utxo.sha256, prev_utxo.n), b""))
+                tx.vout.append(CTxOut(prev_utxo.nValue - 1000, scriptPubKey))
+                tx.wit.vtxinwit.append(CTxinWitness())
+                # Too-large input value
+                sign_P2PK_witness_input(witness_program, tx, 0, hashtype, prev_utxo.nValue+1, key)
+                self.update_witness_block_with_transactions(block, [tx])
+                self.test_node.test_witness_block(block, accepted=False)
+
+                # Too-small input value
+                sign_P2PK_witness_input(witness_program, tx, 0, hashtype, prev_utxo.nValue-1, key)
+                block.vtx.pop() # remove last tx
+                self.update_witness_block_with_transactions(block, [tx])
+                self.test_node.test_witness_block(block, accepted=False)
+
+                # Now try correct value
+                sign_P2PK_witness_input(witness_program, tx, 0, hashtype, prev_utxo.nValue, key)
+                block.vtx.pop()
+                self.update_witness_block_with_transactions(block, [tx])
+                self.test_node.test_witness_block(block, accepted=True)
+
+                prev_utxo = UTXO(tx.sha256, 0, tx.vout[0].nValue)
+
+        # Test combinations of signature hashes.
+        # Split the utxo into a lot of outputs.
+        # Randomly choose up to 10 to spend, sign with different hashtypes, and
+        # output to a random number of outputs.  Repeat NUM_TESTS times.
+        # Ensure that we've tested a situation where we use SIGHASH_SINGLE with
+        # an input index > number of outputs.
+        NUM_TESTS = 500
+        temp_utxos = []
+        tx = CTransaction()
+        tx.vin.append(CTxIn(COutPoint(prev_utxo.sha256, prev_utxo.n), b""))
+        split_value = prev_utxo.nValue // NUM_TESTS
+        for i in range(NUM_TESTS):
+            tx.vout.append(CTxOut(split_value, scriptPubKey))
+        tx.wit.vtxinwit.append(CTxinWitness())
+        sign_P2PK_witness_input(witness_program, tx, 0, SIGHASH_ALL, prev_utxo.nValue, key)
+        for i in range(NUM_TESTS):
+            temp_utxos.append(UTXO(tx.sha256, i, split_value))
+
+        block = self.build_next_block()
+        self.update_witness_block_with_transactions(block, [tx])
+        self.test_node.test_witness_block(block, accepted=True)
+
+        block = self.build_next_block()
+        used_sighash_single_out_of_bounds = False
+        for i in range(NUM_TESTS):
+            # Choose random number of inputs to use.
+            num_inputs = random.randint(1, 10)
+            # Create a slight bias for producing more utxos
+            num_outputs = random.randint(1, 11)
+            random.shuffle(temp_utxos)
+            assert(len(temp_utxos) > num_inputs)
+            tx = CTransaction()
+            total_value = 0
+            for i in range(num_inputs):
+                tx.vin.append(CTxIn(COutPoint(temp_utxos[i].sha256, temp_utxos[i].n), b""))
+                tx.wit.vtxinwit.append(CTxinWitness())
+                total_value += temp_utxos[i].nValue
+            split_value = total_value // num_outputs
+            for i in range(num_outputs):
+                tx.vout.append(CTxOut(split_value, scriptPubKey))
+            for i in range(num_inputs):
+                # Now try to sign each input, using a random hashtype.
+                anyonecanpay = 0
+                if random.randint(0, 1):
+                    anyonecanpay = SIGHASH_ANYONECANPAY
+                hashtype = random.randint(1, 3) | anyonecanpay
+                sign_P2PK_witness_input(witness_program, tx, i, hashtype, temp_utxos[i].nValue, key)
+                if (hashtype == SIGHASH_SINGLE and i >= num_outputs):
+                    used_sighash_single_out_of_bounds = True
+            tx.rehash()
+            for i in range(num_outputs):
+                temp_utxos.append(UTXO(tx.sha256, i, split_value))
+            temp_utxos = temp_utxos[num_inputs:]
+
+            block.vtx.append(tx)
+
+            # Test the block periodically, if we're close to maxblocksize
+            if (get_virtual_size(block) > MAX_BLOCK_SIZE - 1000):
+                self.update_witness_block_with_transactions(block, [])
+                self.test_node.test_witness_block(block, accepted=True)
+                block = self.build_next_block()
+
+        if (not used_sighash_single_out_of_bounds):
+            print("WARNING: this test run didn't attempt SIGHASH_SINGLE with out-of-bounds index value")
+        # Test the transactions we've added to the block
+        if (len(block.vtx) > 1):
+            self.update_witness_block_with_transactions(block, [])
+            self.test_node.test_witness_block(block, accepted=True)
+
+        # Now test witness version 0 P2PKH transactions
+        pubkeyhash = hash160(pubkey)
+        scriptPKH = CScript([OP_0, pubkeyhash])
+        tx = CTransaction()
+        tx.vin.append(CTxIn(COutPoint(temp_utxos[0].sha256, temp_utxos[0].n), b""))
+        tx.vout.append(CTxOut(temp_utxos[0].nValue, scriptPKH))
+        tx.wit.vtxinwit.append(CTxinWitness())
+        sign_P2PK_witness_input(witness_program, tx, 0, SIGHASH_ALL, temp_utxos[0].nValue, key)
+        tx2 = CTransaction()
+        tx2.vin.append(CTxIn(COutPoint(tx.sha256, 0), b""))
+        tx2.vout.append(CTxOut(tx.vout[0].nValue, CScript([OP_TRUE])))
+
+        script = CScript([CScriptOp(OP_DUP), CScriptOp(OP_HASH160), pubkeyhash, CScriptOp(OP_EQUALVERIFY), CScriptOp(OP_CHECKSIG)])
+        sig_hash = SegwitVersion1SignatureHash(script, tx2, 0, SIGHASH_ALL, tx.vout[0].nValue)
+        signature = key.sign(sig_hash) + b'\x01' # 0x1 is SIGHASH_ALL
+
+        # Check that we can't have a scriptSig
+        tx2.vin[0].scriptSig = CScript([signature, pubkey])
+        block = self.build_next_block()
+        self.update_witness_block_with_transactions(block, [tx, tx2])
+        self.test_node.test_witness_block(block, accepted=False)
+
+        # Move the signature to the witness.
+        block.vtx.pop()
+        tx2.wit.vtxinwit.append(CTxinWitness())
+        tx2.wit.vtxinwit[0].scriptWitness.stack = [signature, pubkey]
+        tx2.vin[0].scriptSig = b""
+        tx2.rehash()
+
+        self.update_witness_block_with_transactions(block, [tx2])
+        self.test_node.test_witness_block(block, accepted=True)
+
+        temp_utxos.pop(0)
+
+        # Update self.utxos for later tests. Just spend everything in
+        # temp_utxos to a corresponding entry in self.utxos
+        tx = CTransaction()
+        index = 0
+        for i in temp_utxos:
+            # Just spend to our usual anyone-can-spend output
+            # Use SIGHASH_SINGLE|SIGHASH_ANYONECANPAY so we can build up
+            # the signatures as we go.
+            tx.vin.append(CTxIn(COutPoint(i.sha256, i.n), b""))
+            tx.vout.append(CTxOut(i.nValue, CScript([OP_TRUE])))
+            tx.wit.vtxinwit.append(CTxinWitness())
+            sign_P2PK_witness_input(witness_program, tx, index, SIGHASH_SINGLE|SIGHASH_ANYONECANPAY, i.nValue, key)
+            index += 1
+        block = self.build_next_block()
+        self.update_witness_block_with_transactions(block, [tx])
+        self.test_node.test_witness_block(block, accepted=True)
+
+        for i in range(len(tx.vout)):
+            self.utxo.append(UTXO(tx.sha256, i, tx.vout[i].nValue))
+
+
+    # Test P2SH wrapped witness programs.
+    def test_p2sh_witness(self, segwit_activated):
+        print("\tTesting P2SH witness transactions")
+
+        assert(len(self.utxo))
+
+        # Prepare the p2sh-wrapped witness output
+        witness_program = CScript([OP_DROP, OP_TRUE])
+        witness_hash = sha256(witness_program)
+        p2wsh_pubkey = CScript([OP_0, witness_hash])
+        p2sh_witness_hash = hash160(p2wsh_pubkey)
+        scriptPubKey = CScript([OP_HASH160, p2sh_witness_hash, OP_EQUAL])
+        scriptSig = CScript([p2wsh_pubkey]) # a push of the redeem script
+
+        # Fund the P2SH output
+        tx = CTransaction()
+        tx.vin.append(CTxIn(COutPoint(self.utxo[0].sha256, self.utxo[0].n), b""))
+        tx.vout.append(CTxOut(self.utxo[0].nValue-1000, scriptPubKey))
+        tx.rehash()
+
+        # Verify mempool acceptance and block validity
+        self.test_node.test_transaction_acceptance(tx, with_witness=False, accepted=True)
+        block = self.build_next_block()
+        self.update_witness_block_with_transactions(block, [tx])
+        self.test_node.test_witness_block(block, accepted=True, with_witness=segwit_activated)
+        sync_blocks(self.nodes)
+
+        # Now test attempts to spend the output.
+        spend_tx = CTransaction()
+        spend_tx.vin.append(CTxIn(COutPoint(tx.sha256, 0), scriptSig))
+        spend_tx.vout.append(CTxOut(tx.vout[0].nValue-1000, CScript([OP_TRUE])))
+        spend_tx.rehash()
+
+        # This transaction should not be accepted into the mempool pre- or
+        # post-segwit.  Mempool acceptance will use SCRIPT_VERIFY_WITNESS which
+        # will require a witness to spend a witness program regardless of
+        # segwit activation.  Note that older bitcoind's that are not
+        # segwit-aware would also reject this for failing CLEANSTACK.
+        self.test_node.test_transaction_acceptance(spend_tx, with_witness=False, accepted=False)
+
+        # Try to put the witness script in the scriptSig, should also fail.
+        spend_tx.vin[0].scriptSig = CScript([p2wsh_pubkey, b'a'])
+        spend_tx.rehash()
+        self.test_node.test_transaction_acceptance(spend_tx, with_witness=False, accepted=False)
+
+        # Now put the witness script in the witness, should succeed after
+        # segwit activates.
+        spend_tx.vin[0].scriptSig = scriptSig
+        spend_tx.rehash()
+        spend_tx.wit.vtxinwit.append(CTxinWitness())
+        spend_tx.wit.vtxinwit[0].scriptWitness.stack = [ b'a', witness_program ]
+
+        # Verify mempool acceptance
+        self.test_node.test_transaction_acceptance(spend_tx, with_witness=True, accepted=segwit_activated)
+        block = self.build_next_block()
+        self.update_witness_block_with_transactions(block, [spend_tx])
+
+        # If we're before activation, then sending this without witnesses
+        # should be valid.  If we're after activation, then sending this with
+        # witnesses should be valid.
+        if segwit_activated:
+            self.test_node.test_witness_block(block, accepted=True)
+        else:
+            self.test_node.test_witness_block(block, accepted=True, with_witness=False)
+
+        # Update self.utxo
+        self.utxo.pop(0)
+        self.utxo.append(UTXO(spend_tx.sha256, 0, spend_tx.vout[0].nValue))
+
+    # Test the behavior of starting up a segwit-aware node after the softfork
+    # has activated.  As segwit requires different block data than pre-segwit
+    # nodes would have stored, this requires special handling.
+    # To enable this test, pass --oldbinary=<path-to-pre-segwit-bitcoind> to
+    # the test.
+    def test_upgrade_after_activation(self, node, node_id):
+        print("\tTesting software upgrade after softfork activation")
+
+        assert(node_id != 0) # node0 is assumed to be a segwit-active bitcoind
+
+        # Make sure the nodes are all up
+        sync_blocks(self.nodes)
+
+        # Restart with the new binary
+        stop_node(node, node_id)
+        self.nodes[node_id] = start_node(node_id, self.options.tmpdir, ["-debug"])
+        connect_nodes(self.nodes[0], node_id)
+
+        sync_blocks(self.nodes)
+
+        # Make sure that this peer thinks segwit has activated.
+        assert(get_bip9_status(node, 'segwit')['status'] == "active")
+
+        # Make sure this peers blocks match those of node0.
+        height = node.getblockcount()
+        while height >= 0:
+            block_hash = node.getblockhash(height)
+            assert_equal(block_hash, self.nodes[0].getblockhash(height))
+            assert_equal(self.nodes[0].getblock(block_hash), node.getblock(block_hash))
+            height -= 1
+
+
+    def test_witness_sigops(self):
+        '''Ensure sigop counting is correct inside witnesses.'''
+        print("\tTesting sigops limit")
+
+        assert(len(self.utxo))
+
+        # Keep this under MAX_OPS_PER_SCRIPT (201)
+        witness_program = CScript([OP_TRUE, OP_IF, OP_TRUE, OP_ELSE] + [OP_CHECKMULTISIG]*5 + [OP_CHECKSIG]*193 + [OP_ENDIF])
+        witness_hash = sha256(witness_program)
+        scriptPubKey = CScript([OP_0, witness_hash])
+
+        sigops_per_script = 20*5 + 193*1
+        # We'll produce 2 extra outputs, one with a program that would take us
+        # over max sig ops, and one with a program that would exactly reach max
+        # sig ops
+        outputs = (MAX_SIGOP_COST // sigops_per_script) + 2
+        extra_sigops_available = MAX_SIGOP_COST % sigops_per_script
+
+        # We chose the number of checkmultisigs/checksigs to make this work:
+        assert(extra_sigops_available < 100) # steer clear of MAX_OPS_PER_SCRIPT
+
+        # This script, when spent with the first
+        # N(=MAX_SIGOP_COST//sigops_per_script) outputs of our transaction,
+        # would push us just over the block sigop limit.
+        witness_program_toomany = CScript([OP_TRUE, OP_IF, OP_TRUE, OP_ELSE] + [OP_CHECKSIG]*(extra_sigops_available + 1) + [OP_ENDIF])
+        witness_hash_toomany = sha256(witness_program_toomany)
+        scriptPubKey_toomany = CScript([OP_0, witness_hash_toomany])
+
+        # If we spend this script instead, we would exactly reach our sigop
+        # limit (for witness sigops).
+        witness_program_justright = CScript([OP_TRUE, OP_IF, OP_TRUE, OP_ELSE] + [OP_CHECKSIG]*(extra_sigops_available) + [OP_ENDIF])
+        witness_hash_justright = sha256(witness_program_justright)
+        scriptPubKey_justright = CScript([OP_0, witness_hash_justright])
+
+        # First split our available utxo into a bunch of outputs
+        split_value = self.utxo[0].nValue // outputs
+        tx = CTransaction()
+        tx.vin.append(CTxIn(COutPoint(self.utxo[0].sha256, self.utxo[0].n), b""))
+        for i in range(outputs):
+            tx.vout.append(CTxOut(split_value, scriptPubKey))
+        tx.vout[-2].scriptPubKey = scriptPubKey_toomany
+        tx.vout[-1].scriptPubKey = scriptPubKey_justright
+        tx.rehash()
+
+        block_1 = self.build_next_block()
+        self.update_witness_block_with_transactions(block_1, [tx])
+        self.test_node.test_witness_block(block_1, accepted=True)
+
+        tx2 = CTransaction()
+        # If we try to spend the first n-1 outputs from tx, that should be
+        # too many sigops.
+        total_value = 0
+        for i in range(outputs-1):
+            tx2.vin.append(CTxIn(COutPoint(tx.sha256, i), b""))
+            tx2.wit.vtxinwit.append(CTxinWitness())
+            tx2.wit.vtxinwit[-1].scriptWitness.stack = [ witness_program ]
+            total_value += tx.vout[i].nValue
+        tx2.wit.vtxinwit[-1].scriptWitness.stack = [ witness_program_toomany ] 
+        tx2.vout.append(CTxOut(total_value, CScript([OP_TRUE])))
+        tx2.rehash()
+
+        block_2 = self.build_next_block()
+        self.update_witness_block_with_transactions(block_2, [tx2])
+        self.test_node.test_witness_block(block_2, accepted=False)
+
+        # Try dropping the last input in tx2, and add an output that has
+        # too many sigops (contributing to legacy sigop count).
+        checksig_count = (extra_sigops_available // 4) + 1
+        scriptPubKey_checksigs = CScript([OP_CHECKSIG]*checksig_count)
+        tx2.vout.append(CTxOut(0, scriptPubKey_checksigs));
+        tx2.vin.pop()
+        tx2.wit.vtxinwit.pop()
+        tx2.vout[0].nValue -= tx.vout[-2].nValue
+        tx2.rehash()
+        block_3 = self.build_next_block()
+        self.update_witness_block_with_transactions(block_3, [tx2])
+        self.test_node.test_witness_block(block_3, accepted=False)
+
+        # If we drop the last checksig in this output, the tx should succeed.
+        block_4 = self.build_next_block()
+        tx2.vout[-1].scriptPubKey = CScript([OP_CHECKSIG]*(checksig_count-1))
+        tx2.rehash()
+        self.update_witness_block_with_transactions(block_4, [tx2])
+        self.test_node.test_witness_block(block_4, accepted=True)
+
+        # Reset the tip back down for the next test
+        sync_blocks(self.nodes)
+        for x in self.nodes:
+            x.invalidateblock(block_4.hash)
+
+        # Try replacing the last input of tx2 to be spending the last
+        # output of tx
+        block_5 = self.build_next_block()
+        tx2.vout.pop()
+        tx2.vin.append(CTxIn(COutPoint(tx.sha256, outputs-1), b""))
+        tx2.wit.vtxinwit.append(CTxinWitness())
+        tx2.wit.vtxinwit[-1].scriptWitness.stack = [ witness_program_justright ]
+        tx2.rehash()
+        self.update_witness_block_with_transactions(block_5, [tx2])
+        self.test_node.test_witness_block(block_5, accepted=True)
+
+        # TODO: test p2sh sigop counting
+
+    def test_getblocktemplate_before_lockin(self):
+        print("\tTesting getblocktemplate setting of segwit versionbit (before lockin)")
+        block_version = (self.nodes[0].getblocktemplate())['version']
+        assert_equal(block_version & (1 << VB_WITNESS_BIT), 0)
+
+        # Workaround:
+        # Can either change the tip, or change the mempool and wait 5 seconds
+        # to trigger a recomputation of getblocktemplate.
+        self.nodes[0].sendtoaddress(self.nodes[0].getnewaddress(), 1)
+        # Using mocktime lets us avoid sleep()
+        self.nodes[0].setmocktime(int(time.time())+10)
+
+        block_version = self.nodes[0].getblocktemplate({"rules" : ["segwit"]})['version']
+        assert(block_version & (1 << VB_WITNESS_BIT) != 0)
+        self.nodes[0].setmocktime(0) # undo mocktime
+
+    def run_test(self):
+        # Setup the p2p connections and start up the network thread.
+        self.test_node = TestNode() # sets NODE_WITNESS|NODE_NETWORK
+        self.old_node = TestNode()  # only NODE_NETWORK
+        self.std_node = TestNode() # for testing node1 (fRequireStandard=true)
+
+        self.p2p_connections = [self.test_node, self.old_node]
+
+        self.connections = []
+        self.connections.append(NodeConn('127.0.0.1', p2p_port(0), self.nodes[0], self.test_node, services=NODE_NETWORK|NODE_WITNESS))
+        self.connections.append(NodeConn('127.0.0.1', p2p_port(0), self.nodes[0], self.old_node, services=NODE_NETWORK))
+        self.connections.append(NodeConn('127.0.0.1', p2p_port(1), self.nodes[1], self.std_node, services=NODE_NETWORK|NODE_WITNESS))
+        self.test_node.add_connection(self.connections[0])
+        self.old_node.add_connection(self.connections[1])
+        self.std_node.add_connection(self.connections[2])
+
+        NetworkThread().start() # Start up network handling in another thread
+
+        # Keep a place to store utxo's that can be used in later tests
+        self.utxo = []
+
+        # Test logic begins here
+        self.test_node.wait_for_verack()
+
+        print("\nStarting tests before segwit lock in:")
+
+        self.test_witness_services() # Verifies NODE_WITNESS
+        self.test_non_witness_transaction() # non-witness tx's are accepted
+        self.test_unnecessary_witness_before_segwit_activation()
+        self.test_block_relay(segwit_activated=False)
+
+        # Advance to segwit being 'started'
+        self.advance_to_segwit_started()
+        self.test_getblocktemplate_before_lockin()
+
+        sync_blocks(self.nodes)
+
+        # At lockin, nothing should change.
+        print("\nTesting behavior post lockin, pre-activation")
+        self.advance_to_segwit_lockin()
+
+        # Retest unnecessary witnesses
+        self.test_unnecessary_witness_before_segwit_activation()
+        self.test_witness_tx_relay_before_segwit_activation()
+        self.test_block_relay(segwit_activated=False)
+        self.test_p2sh_witness(segwit_activated=False)
+
+        sync_blocks(self.nodes)
+
+        # Now activate segwit
+        print("\nTesting behavior after segwit activation")
+        self.advance_to_segwit_active()
+
+        sync_blocks(self.nodes)
+
+        # Test P2SH witness handling again
+        self.test_p2sh_witness(segwit_activated=True)
+        self.test_witness_commitments()
+        self.test_block_malleability()
+        self.test_witness_block_size()
+        self.test_submit_block()
+        self.test_extra_witness_data()
+        self.test_max_witness_push_length()
+        self.test_max_witness_program_length()
+        self.test_witness_input_length()
+        self.test_block_relay(segwit_activated=True)
+        self.test_tx_relay_after_segwit_activation()
+        self.test_segwit_versions()
+        self.test_premature_coinbase_witness_spend()
+        self.test_signature_version_1()
+        sync_blocks(self.nodes)
+        if self.test_upgrade:
+            self.test_upgrade_after_activation(self.nodes[2], 2)
+        else:
+            print("\tSkipping upgrade-after-activation test (use --oldbinary to enable)")
+        self.test_witness_sigops()
+
+
+if __name__ == '__main__':
+    SegWitTest().main()
diff --git a/qa/rpc-tests/test_framework/blocktools.py b/qa/rpc-tests/test_framework/blocktools.py
index 26cc3963151ed..df4fe13e5c1c6 100644
--- a/qa/rpc-tests/test_framework/blocktools.py
+++ b/qa/rpc-tests/test_framework/blocktools.py
@@ -5,7 +5,7 @@
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 from .mininode import *
-from .script import CScript, OP_TRUE, OP_CHECKSIG
+from .script import CScript, OP_TRUE, OP_CHECKSIG, OP_RETURN
 
 # Create a block (with regtest difficulty)
 def create_block(hashprev, coinbase, nTime=None):
@@ -22,6 +22,29 @@ def create_block(hashprev, coinbase, nTime=None):
     block.calc_sha256()
     return block
 
+# From BIP141
+WITNESS_COMMITMENT_HEADER = b"\xaa\x21\xa9\xed"
+
+# According to BIP141, blocks with witness rules active must commit to the
+# hash of all in-block transactions including witness.
+def add_witness_commitment(block, nonce=0):
+    # First calculate the merkle root of the block's
+    # transactions, with witnesses.
+    witness_nonce = nonce
+    witness_root = block.calc_witness_merkle_root()
+    witness_commitment = uint256_from_str(hash256(ser_uint256(witness_root)+ser_uint256(witness_nonce)))
+    # witness_nonce should go to coinbase witness.
+    block.vtx[0].wit.vtxinwit = [CTxinWitness()]
+    block.vtx[0].wit.vtxinwit[0].scriptWitness.stack = [ser_uint256(witness_nonce)]
+
+    # witness commitment is the last OP_RETURN output in coinbase
+    output_data = WITNESS_COMMITMENT_HEADER + ser_uint256(witness_commitment)
+    block.vtx[0].vout.append(CTxOut(0, CScript([OP_RETURN, output_data])))
+    block.vtx[0].rehash()
+    block.hashMerkleRoot = block.calc_merkle_root()
+    block.rehash()
+
+
 def serialize_script_num(value):
     r = bytearray(0)
     if value == 0:
diff --git a/qa/rpc-tests/test_framework/mininode.py b/qa/rpc-tests/test_framework/mininode.py
index 6612b99b84234..4548e2e7c080f 100755
--- a/qa/rpc-tests/test_framework/mininode.py
+++ b/qa/rpc-tests/test_framework/mininode.py
@@ -28,7 +28,7 @@
 import time
 import sys
 import random
-from binascii import hexlify, unhexlify
+from .util import hex_str_to_bytes, bytes_to_hex_str
 from io import BytesIO
 from codecs import encode
 import hashlib
@@ -46,6 +46,11 @@
 
 COIN = 100000000 # 1 btc in satoshis
 
+NODE_NETWORK = (1 << 0)
+NODE_GETUTXO = (1 << 1)
+NODE_BLOOM = (1 << 2)
+NODE_WITNESS = (1 << 3)
+
 # Keep our own socket map for asyncore, so that we can track disconnects
 # ourselves (to workaround an issue with closing an asyncore socket when 
 # using select)
@@ -63,6 +68,8 @@
 def sha256(s):
     return hashlib.new('sha256', s).digest()
 
+def ripemd160(s):
+    return hashlib.new('ripemd160', s).digest()
 
 def hash256(s):
     return sha256(sha256(s))
@@ -133,7 +140,10 @@ def deser_vector(f, c):
     return r
 
 
-def ser_vector(l):
+# ser_function_name: Allow for an alternate serialization function on the
+# entries in the vector (we use this for serializing the vector of transactions
+# for a witness block).
+def ser_vector(l, ser_function_name=None):
     r = b""
     if len(l) < 253:
         r = struct.pack("B", len(l))
@@ -144,7 +154,10 @@ def ser_vector(l):
     else:
         r = struct.pack("<BQ", 255, len(l))
     for i in l:
-        r += i.serialize()
+        if ser_function_name:
+            r += getattr(i, ser_function_name)()
+        else:
+            r += i.serialize()
     return r
 
 
@@ -239,12 +252,12 @@ def ser_int_vector(l):
 
 # Deserialize from a hex string representation (eg from RPC)
 def FromHex(obj, hex_string):
-    obj.deserialize(BytesIO(unhexlify(hex_string.encode('ascii'))))
+    obj.deserialize(BytesIO(hex_str_to_bytes(hex_string)))
     return obj
 
 # Convert a binary-serializable object to hex (eg for submission via RPC)
 def ToHex(obj):
-    return hexlify(obj.serialize()).decode('ascii')
+    return bytes_to_hex_str(obj.serialize())
 
 # Objects that map to bitcoind objects, which can be serialized/deserialized
 
@@ -273,12 +286,16 @@ def __repr__(self):
         return "CAddress(nServices=%i ip=%s port=%i)" % (self.nServices,
                                                          self.ip, self.port)
 
+MSG_WITNESS_FLAG = 1<<30
 
 class CInv(object):
     typemap = {
         0: "Error",
         1: "TX",
-        2: "Block"}
+        2: "Block",
+        1|MSG_WITNESS_FLAG: "WitnessTx",
+        2|MSG_WITNESS_FLAG : "WitnessBlock"
+    }
 
     def __init__(self, t=0, h=0):
         self.type = t
@@ -362,7 +379,7 @@ def serialize(self):
 
     def __repr__(self):
         return "CTxIn(prevout=%s scriptSig=%s nSequence=%i)" \
-            % (repr(self.prevout), hexlify(self.scriptSig),
+            % (repr(self.prevout), bytes_to_hex_str(self.scriptSig),
                self.nSequence)
 
 
@@ -384,7 +401,67 @@ def serialize(self):
     def __repr__(self):
         return "CTxOut(nValue=%i.%08i scriptPubKey=%s)" \
             % (self.nValue // COIN, self.nValue % COIN,
-               hexlify(self.scriptPubKey))
+               bytes_to_hex_str(self.scriptPubKey))
+
+
+class CScriptWitness(object):
+    def __init__(self):
+        # stack is a vector of strings
+        self.stack = []
+
+    def __repr__(self):
+        return "CScriptWitness(%s)" % \
+               (",".join([bytes_to_hex_str(x) for x in self.stack]))
+
+    def is_null(self):
+        if self.stack:
+            return False
+        return True
+
+
+class CTxinWitness(object):
+    def __init__(self):
+        self.scriptWitness = CScriptWitness()
+
+    def deserialize(self, f):
+        self.scriptWitness.stack = deser_string_vector(f)
+
+    def serialize(self):
+        return ser_string_vector(self.scriptWitness.stack)
+
+    def __repr__(self):
+        return repr(self.scriptWitness)
+
+    def is_null(self):
+        return self.scriptWitness.is_null()
+
+
+class CTxWitness(object):
+    def __init__(self):
+        self.vtxinwit = []
+
+    def deserialize(self, f):
+        for i in range(len(self.vtxinwit)):
+            self.vtxinwit[i].deserialize(f)
+
+    def serialize(self):
+        r = b""
+        # This is different than the usual vector serialization --
+        # we omit the length of the vector, which is required to be
+        # the same length as the transaction's vin vector.
+        for x in self.vtxinwit:
+            r += x.serialize()
+        return r
+
+    def __repr__(self):
+        return "CTxWitness(%s)" % \
+               (';'.join([repr(x) for x in self.vtxinwit]))
+
+    def is_null(self):
+        for x in self.vtxinwit:
+            if not x.is_null():
+                return False
+        return True
 
 
 class CTransaction(object):
@@ -393,6 +470,7 @@ def __init__(self, tx=None):
             self.nVersion = 1
             self.vin = []
             self.vout = []
+            self.wit = CTxWitness()
             self.nLockTime = 0
             self.sha256 = None
             self.hash = None
@@ -401,32 +479,80 @@ def __init__(self, tx=None):
             self.vin = copy.deepcopy(tx.vin)
             self.vout = copy.deepcopy(tx.vout)
             self.nLockTime = tx.nLockTime
-            self.sha256 = None
-            self.hash = None
+            self.sha256 = tx.sha256
+            self.hash = tx.hash
+            self.wit = copy.deepcopy(tx.wit)
 
     def deserialize(self, f):
         self.nVersion = struct.unpack("<i", f.read(4))[0]
         self.vin = deser_vector(f, CTxIn)
-        self.vout = deser_vector(f, CTxOut)
+        flags = 0
+        if len(self.vin) == 0:
+            flags = struct.unpack("<B", f.read(1))[0]
+            # Not sure why flags can't be zero, but this
+            # matches the implementation in bitcoind
+            if (flags != 0):
+                self.vin = deser_vector(f, CTxIn)
+                self.vout = deser_vector(f, CTxOut)
+        else:
+            self.vout = deser_vector(f, CTxOut)
+        if flags != 0:
+            self.wit.vtxinwit = [CTxinWitness()]*len(self.vin)
+            self.wit.deserialize(f)
         self.nLockTime = struct.unpack("<I", f.read(4))[0]
         self.sha256 = None
         self.hash = None
 
-    def serialize(self):
+    def serialize_without_witness(self):
+        r = b""
+        r += struct.pack("<i", self.nVersion)
+        r += ser_vector(self.vin)
+        r += ser_vector(self.vout)
+        r += struct.pack("<I", self.nLockTime)
+        return r
+
+    # Only serialize with witness when explicitly called for
+    def serialize_with_witness(self):
+        flags = 0
+        if not self.wit.is_null():
+            flags |= 1
         r = b""
         r += struct.pack("<i", self.nVersion)
+        if flags:
+            dummy = []
+            r += ser_vector(dummy)
+            r += struct.pack("<B", flags)
         r += ser_vector(self.vin)
         r += ser_vector(self.vout)
+        if flags & 1:
+            if (len(self.wit.vtxinwit) != len(self.vin)):
+                # vtxinwit must have the same length as vin
+                self.wit.vtxinwit = self.wit.vtxinwit[:len(self.vin)]
+                for i in range(len(self.wit.vtxinwit), len(self.vin)):
+                    self.wit.vtxinwit.append(CTxinWitness())
+            r += self.wit.serialize()
         r += struct.pack("<I", self.nLockTime)
         return r
 
+    # Regular serialization is without witness -- must explicitly
+    # call serialize_with_witness to include witness data.
+    def serialize(self):
+        return self.serialize_without_witness()
+
+    # Recalculate the txid (transaction hash without witness)
     def rehash(self):
         self.sha256 = None
         self.calc_sha256()
 
-    def calc_sha256(self):
+    # We will only cache the serialization without witness in
+    # self.sha256 and self.hash -- those are expected to be the txid.
+    def calc_sha256(self, with_witness=False):
+        if with_witness:
+            # Don't cache the result, just return it
+            return uint256_from_str(hash256(self.serialize_with_witness()))
+
         if self.sha256 is None:
-            self.sha256 = uint256_from_str(hash256(self.serialize()))
+            self.sha256 = uint256_from_str(hash256(self.serialize_without_witness()))
         self.hash = encode(hash256(self.serialize())[::-1], 'hex_codec').decode('ascii')
 
     def is_valid(self):
@@ -518,17 +644,17 @@ def deserialize(self, f):
         super(CBlock, self).deserialize(f)
         self.vtx = deser_vector(f, CTransaction)
 
-    def serialize(self):
+    def serialize(self, with_witness=False):
         r = b""
         r += super(CBlock, self).serialize()
-        r += ser_vector(self.vtx)
+        if with_witness:
+            r += ser_vector(self.vtx, "serialize_with_witness")
+        else:
+            r += ser_vector(self.vtx)
         return r
 
-    def calc_merkle_root(self):
-        hashes = []
-        for tx in self.vtx:
-            tx.calc_sha256()
-            hashes.append(ser_uint256(tx.sha256))
+    # Calculate the merkle root given a vector of transaction hashes
+    def get_merkle_root(self, hashes):
         while len(hashes) > 1:
             newhashes = []
             for i in range(0, len(hashes), 2):
@@ -537,6 +663,24 @@ def calc_merkle_root(self):
             hashes = newhashes
         return uint256_from_str(hashes[0])
 
+    def calc_merkle_root(self):
+        hashes = []
+        for tx in self.vtx:
+            tx.calc_sha256()
+            hashes.append(ser_uint256(tx.sha256))
+        return self.get_merkle_root(hashes)
+
+    def calc_witness_merkle_root(self):
+        # For witness root purposes, the hash of the
+        # coinbase, with witness, is defined to be 0...0
+        hashes = [ser_uint256(0)]
+
+        for tx in self.vtx[1:]:
+            # Calculate the hashes with witness data
+            hashes.append(ser_uint256(tx.calc_sha256(True)))
+
+        return self.get_merkle_root(hashes)
+
     def is_valid(self):
         self.calc_sha256()
         target = uint256_from_compact(self.nBits)
@@ -812,11 +956,16 @@ def deserialize(self, f):
         self.tx.deserialize(f)
 
     def serialize(self):
-        return self.tx.serialize()
+        return self.tx.serialize_without_witness()
 
     def __repr__(self):
         return "msg_tx(tx=%s)" % (repr(self.tx))
 
+class msg_witness_tx(msg_tx):
+
+    def serialize(self):
+        return self.tx.serialize_with_witness()
+
 
 class msg_block(object):
     command = b"block"
@@ -849,6 +998,12 @@ def serialize(self):
     def __repr__(self):
         return "msg_generic()"
 
+class msg_witness_block(msg_block):
+
+    def serialize(self):
+        r = self.block.serialize(with_witness=True)
+        return r
+
 class msg_getaddr(object):
     command = b"getaddr"
 
@@ -947,6 +1102,7 @@ def serialize(self):
     def __repr__(self):
         return "msg_sendheaders()"
 
+
 # getheaders message has
 # number of entries
 # vector of hashes
@@ -1068,6 +1224,8 @@ def __init__(self):
         # tests; it causes message delivery to sleep for the specified time
         # before acquiring the global lock and delivering the next message.
         self.deliver_sleep_time = None
+        # Remember the services our peer has advertised
+        self.peer_services = None
 
     def set_deliver_sleep_time(self, value):
         with mininode_lock:
@@ -1105,6 +1263,7 @@ def on_version(self, conn, message):
         conn.ver_send = min(MY_VERSION, message.nVersion)
         if message.nVersion < 209:
             conn.ver_recv = conn.ver_send
+        conn.nServices = message.nServices
 
     def on_verack(self, conn, message):
         conn.ver_recv = conn.ver_send
@@ -1135,6 +1294,7 @@ def on_close(self, conn): pass
     def on_mempool(self, conn): pass
     def on_pong(self, conn, message): pass
     def on_feefilter(self, conn, message): pass
+    def on_sendheaders(self, conn, message): pass
 
 # More useful callbacks and functions for NodeConnCB's which have a single NodeConn
 class SingleNodeConnCB(NodeConnCB):
@@ -1183,15 +1343,16 @@ class NodeConn(asyncore.dispatcher):
         b"getheaders": msg_getheaders,
         b"reject": msg_reject,
         b"mempool": msg_mempool,
-        b"feefilter": msg_feefilter
+        b"feefilter": msg_feefilter,
+        b"sendheaders": msg_sendheaders
     }
     MAGIC_BYTES = {
         "mainnet": b"\xf9\xbe\xb4\xd9",   # mainnet
         "testnet3": b"\x0b\x11\x09\x07",  # testnet3
-        "regtest": b"\xfa\xbf\xb5\xda"    # regtest
+        "regtest": b"\xfa\xbf\xb5\xda",   # regtest
     }
 
-    def __init__(self, dstaddr, dstport, rpc, callback, net="regtest", services=1):
+    def __init__(self, dstaddr, dstport, rpc, callback, net="regtest", services=NODE_NETWORK):
         asyncore.dispatcher.__init__(self, map=mininode_socket_map)
         self.log = logging.getLogger("NodeConn(%s:%d)" % (dstaddr, dstport))
         self.dstaddr = dstaddr
@@ -1206,6 +1367,7 @@ def __init__(self, dstaddr, dstport, rpc, callback, net="regtest", services=1):
         self.network = net
         self.cb = callback
         self.disconnect = False
+        self.nServices = 0
 
         # stuff version msg into sendbuf
         vt = msg_version()
diff --git a/qa/rpc-tests/test_framework/script.py b/qa/rpc-tests/test_framework/script.py
index 44a894fc8f488..7678228c42bb5 100644
--- a/qa/rpc-tests/test_framework/script.py
+++ b/qa/rpc-tests/test_framework/script.py
@@ -15,8 +15,9 @@
 """
 
 
-from .mininode import CTransaction, CTxOut, hash256
+from .mininode import CTransaction, CTxOut, sha256, hash256, uint256_from_str, ser_uint256, ser_string
 from binascii import hexlify
+import hashlib
 
 import sys
 bchr = chr
@@ -36,6 +37,10 @@
 
 OPCODE_NAMES = {}
 
+def hash160(s):
+    return hashlib.new('ripemd160', sha256(s)).digest()
+
+
 _opcode_instances = []
 class CScriptOp(int):
     """A single script opcode"""
@@ -895,3 +900,48 @@ def SignatureHash(script, txTo, inIdx, hashtype):
     hash = hash256(s)
 
     return (hash, None)
+
+# TODO: Allow cached hashPrevouts/hashSequence/hashOutputs to be provided.
+# Performance optimization probably not necessary for python tests, however.
+# Note that this corresponds to sigversion == 1 in EvalScript, which is used
+# for version 0 witnesses.
+def SegwitVersion1SignatureHash(script, txTo, inIdx, hashtype, amount):
+
+    hashPrevouts = 0
+    hashSequence = 0
+    hashOutputs = 0
+
+    if not (hashtype & SIGHASH_ANYONECANPAY):
+        serialize_prevouts = bytes()
+        for i in txTo.vin:
+            serialize_prevouts += i.prevout.serialize()
+        hashPrevouts = uint256_from_str(hash256(serialize_prevouts))
+
+    if (not (hashtype & SIGHASH_ANYONECANPAY) and (hashtype & 0x1f) != SIGHASH_SINGLE and (hashtype & 0x1f) != SIGHASH_NONE):
+        serialize_sequence = bytes()
+        for i in txTo.vin:
+            serialize_sequence += struct.pack("<I", i.nSequence)
+        hashSequence = uint256_from_str(hash256(serialize_sequence))
+
+    if ((hashtype & 0x1f) != SIGHASH_SINGLE and (hashtype & 0x1f) != SIGHASH_NONE):
+        serialize_outputs = bytes()
+        for o in txTo.vout:
+            serialize_outputs += o.serialize()
+        hashOutputs = uint256_from_str(hash256(serialize_outputs))
+    elif ((hashtype & 0x1f) == SIGHASH_SINGLE and inIdx < len(txTo.vout)):
+        serialize_outputs = txTo.vout[inIdx].serialize()
+        hashOutputs = uint256_from_str(hash256(serialize_outputs))
+
+    ss = bytes()
+    ss += struct.pack("<i", txTo.nVersion)
+    ss += ser_uint256(hashPrevouts)
+    ss += ser_uint256(hashSequence)
+    ss += txTo.vin[inIdx].prevout.serialize()
+    ss += ser_string(script)
+    ss += struct.pack("<q", amount)
+    ss += struct.pack("<I", txTo.vin[inIdx].nSequence)
+    ss += ser_uint256(hashOutputs)
+    ss += struct.pack("<i", txTo.nLockTime)
+    ss += struct.pack("<I", hashtype)
+
+    return hash256(ss)
diff --git a/src/test/data/script_tests.json b/src/test/data/script_tests.json
index 4311b0923fbec..a59e1389f9bfb 100644
--- a/src/test/data/script_tests.json
+++ b/src/test/data/script_tests.json
@@ -1966,6 +1966,90 @@
     "OK",
     "Basic P2SH(P2WPKH) with the wrong key but no WITNESS"
 ],
+[
+    [
+        "304402205ae57ae0534c05ca9981c8a6cdf353b505eaacb7375f96681a2d1a4ba6f02f84022056248e68643b7d8ce7c7d128c9f1f348bcab8be15d094ad5cadd24251a28df8001",
+        "0479be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8"
+    ],
+    "",
+    "1 0x14 0x91b24bf9f5288532960ac687abb035127b1d28a5",
+    "DISCOURAGE_UPGRADABLE_WITNESS_PROGRAM,P2SH,WITNESS",
+    "DISCOURAGE_UPGRADABLE_WITNESS_PROGRAM",
+    "P2WPKH with future witness version"
+],
+[
+    [
+        "3044022064100ca0e2a33332136775a86cd83d0230e58b9aebb889c5ac952abff79a46ef02205f1bf900e022039ad3091bdaf27ac2aef3eae9ed9f190d821d3e508405b9513101",
+        "0479be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8"
+    ],
+    "",
+    "0 0x1f 0xb34b78da162751647974d5cb7410aa428ad339dbf7d1e16e833f68a0cbf1c3",
+    "P2SH,WITNESS",
+    "WITNESS_PROGRAM_WRONG_LENGTH",
+    "P2WPKH with wrong witness program length"
+],
+[
+    "",
+    "0 0x20 0xb95237b48faaa69eb078e1170be3b5cbb3fddf16d0a991e14ad274f7b33a4f64",
+    "P2SH,WITNESS",
+    "WITNESS_PROGRAM_WITNESS_EMPTY",
+    "P2WSH with empty witness"
+],
+[
+    [
+        "3044022039105b995a5f448639a997a5c90fda06f50b49df30c3bdb6663217bf79323db002206fecd54269dec569fcc517178880eb58bb40f381a282bb75766ff3637d5f4b4301",
+        "400479be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8ac"
+    ],
+    "",
+    "0 0x20 0xb95237b48faaa69eb078e1170be3b5cbb3fddf16d0a991e14ad274f7b33a4f64",
+    "P2SH,WITNESS",
+    "WITNESS_PROGRAM_MISMATCH",
+    "P2WSH with witness program mismatch"
+],
+[
+    [
+        "304402201a96950593cb0af32d080b0f193517f4559241a8ebd1e95e414533ad64a3f423022047f4f6d3095c23235bdff3aeff480d0529c027a3f093cb265b7cbf148553b85101",
+        "0479be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8",
+        ""
+    ],
+    "",
+    "0 0x14 0x91b24bf9f5288532960ac687abb035127b1d28a5",
+    "P2SH,WITNESS",
+    "WITNESS_PROGRAM_MISMATCH",
+    "P2WPKH with witness program mismatch"
+],
+[
+    [
+        "304402201a96950593cb0af32d080b0f193517f4559241a8ebd1e95e414533ad64a3f423022047f4f6d3095c23235bdff3aeff480d0529c027a3f093cb265b7cbf148553b85101",
+        "0479be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8"
+    ],
+    "11",
+    "0 0x14 0x91b24bf9f5288532960ac687abb035127b1d28a5",
+    "P2SH,WITNESS",
+    "WITNESS_MALLEATED",
+    "P2WPKH with non-empty scriptSig"
+],
+[
+    [
+        "304402204209e49457c2358f80d0256bc24535b8754c14d08840fc4be762d6f5a0aed80b02202eaf7d8fc8d62f60c67adcd99295528d0e491ae93c195cec5a67e7a09532a88001",
+        "048282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f5150811f8a8098557dfe45e8256e830b60ace62d613ac2f7b17bed31b6eaff6e26caf"
+    ],
+    "11 0x16 0x00147cf9c846cd4882efec4bf07e44ebdad495c94f4b",
+    "HASH160 0x14 0x4e0c2aed91315303fc6a1dc4c7bc21c88f75402e EQUAL",
+    "P2SH,WITNESS",
+    "WITNESS_MALLEATED_P2SH",
+    "P2SH(P2WPKH) with superfluous push in scriptSig"
+],
+[
+    [
+        ""
+    ],
+    "0x47 0x304402200a5c6163f07b8d3b013c4d1d6dba25e780b39658d79ba37af7057a3b7f15ffa102201fd9b4eaa9943f734928b99a83592c2e7bf342ea2680f6a2bb705167966b742001",
+    "0x41 0x0479be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8 CHECKSIG",
+    "P2SH,WITNESS",
+    "WITNESS_UNEXPECTED",
+    "P2PK with witness"
+],
 
 ["CHECKSEQUENCEVERIFY tests"], 
 ["", "NOP3", "CHECKSEQUENCEVERIFY", "INVALID_STACK_OPERATION", "CSV automatically fails on a empty stack"],
diff --git a/src/test/script_tests.cpp b/src/test/script_tests.cpp
index ab373edc90cf5..1497bde9d1550 100644
--- a/src/test/script_tests.cpp
+++ b/src/test/script_tests.cpp
@@ -293,19 +293,19 @@ class TestBuilder
     }
 
 public:
-    TestBuilder(const CScript& script_, const std::string& comment_, int flags_, bool P2SH = false, WitnessMode wm = WITNESS_NONE) : script(script_), havePush(false), comment(comment_), flags(flags_), scriptError(SCRIPT_ERR_OK)
+    TestBuilder(const CScript& script_, const std::string& comment_, int flags_, bool P2SH = false, WitnessMode wm = WITNESS_NONE, int witnessversion = 0) : script(script_), havePush(false), comment(comment_), flags(flags_), scriptError(SCRIPT_ERR_OK)
     {
         CScript scriptPubKey = script;
         if (wm == WITNESS_PKH) {
             uint160 hash;
             CHash160().Write(&script[1], script.size() - 1).Finalize(hash.begin());
             script = CScript() << OP_DUP << OP_HASH160 << ToByteVector(hash) << OP_EQUALVERIFY << OP_CHECKSIG;
-            scriptPubKey = CScript() << OP_0 << ToByteVector(hash);
+            scriptPubKey = CScript() << witnessversion << ToByteVector(hash);
         } else if (wm == WITNESS_SH) {
             witscript = scriptPubKey;
             uint256 hash;
             CSHA256().Write(&witscript[0], witscript.size()).Finalize(hash.begin());
-            scriptPubKey = CScript() << OP_0 << ToByteVector(hash);
+            scriptPubKey = CScript() << witnessversion << ToByteVector(hash);
         }
         if (P2SH) {
             redeemscript = scriptPubKey;
@@ -341,6 +341,11 @@ class TestBuilder
         return *this;
     }
 
+    TestBuilder& Push(const CScript& script) {
+         DoPush(std::vector<unsigned char>(script.begin(), script.end()));
+        return *this;
+    }
+
     TestBuilder& PushSig(const CKey& key, int nHashType = SIGHASH_ALL, unsigned int lenR = 32, unsigned int lenS = 32, SigVersion sigversion = SIGVERSION_BASE)
     {
         uint256 hash = SignatureHash(script, spendTx, 0, nHashType, 0, sigversion);
@@ -765,6 +770,42 @@ BOOST_AUTO_TEST_CASE(script_build)
                                 "Basic P2SH(P2WPKH) with the wrong key but no WITNESS", SCRIPT_VERIFY_P2SH, true, WITNESS_PKH
                                ).PushWitSig(keys.key0).Push(keys.pubkey1).AsWit().PushRedeem());
 
+    tests.push_back(TestBuilder(CScript() << ToByteVector(keys.pubkey0),
+                                "P2WPKH with future witness version", SCRIPT_VERIFY_WITNESS | SCRIPT_VERIFY_P2SH |
+                                SCRIPT_VERIFY_DISCOURAGE_UPGRADABLE_WITNESS_PROGRAM, false, WITNESS_PKH, 1
+                               ).PushWitSig(keys.key0).Push(keys.pubkey0).AsWit().ScriptError(SCRIPT_ERR_DISCOURAGE_UPGRADABLE_WITNESS_PROGRAM));
+    {
+        CScript witscript = CScript() << ToByteVector(keys.pubkey0);
+        uint256 hash;
+        CSHA256().Write(&witscript[0], witscript.size()).Finalize(hash.begin());
+        vector<unsigned char> hashBytes = ToByteVector(hash);
+        hashBytes.pop_back();
+        tests.push_back(TestBuilder(CScript() << OP_0 << hashBytes,
+                                    "P2WPKH with wrong witness program length", SCRIPT_VERIFY_WITNESS | SCRIPT_VERIFY_P2SH, false
+                                   ).PushWitSig(keys.key0).Push(keys.pubkey0).AsWit().ScriptError(SCRIPT_ERR_WITNESS_PROGRAM_WRONG_LENGTH));
+    }
+    tests.push_back(TestBuilder(CScript() << ToByteVector(keys.pubkey0) << OP_CHECKSIG,
+                                "P2WSH with empty witness", SCRIPT_VERIFY_WITNESS | SCRIPT_VERIFY_P2SH, false, WITNESS_SH
+                               ).ScriptError(SCRIPT_ERR_WITNESS_PROGRAM_WITNESS_EMPTY));
+    {
+        CScript witscript = CScript() << ToByteVector(keys.pubkey0) << OP_CHECKSIG;
+        tests.push_back(TestBuilder(witscript,
+                                    "P2WSH with witness program mismatch", SCRIPT_VERIFY_WITNESS | SCRIPT_VERIFY_P2SH, false, WITNESS_SH
+                                   ).PushWitSig(keys.key0).Push(witscript).DamagePush(0).AsWit().ScriptError(SCRIPT_ERR_WITNESS_PROGRAM_MISMATCH));
+    }
+    tests.push_back(TestBuilder(CScript() << ToByteVector(keys.pubkey0),
+                                "P2WPKH with witness program mismatch", SCRIPT_VERIFY_WITNESS | SCRIPT_VERIFY_P2SH, false, WITNESS_PKH
+                               ).PushWitSig(keys.key0).Push(keys.pubkey0).AsWit().Push("0").AsWit().ScriptError(SCRIPT_ERR_WITNESS_PROGRAM_MISMATCH));
+    tests.push_back(TestBuilder(CScript() << ToByteVector(keys.pubkey0),
+                                "P2WPKH with non-empty scriptSig", SCRIPT_VERIFY_WITNESS | SCRIPT_VERIFY_P2SH, false, WITNESS_PKH
+                               ).PushWitSig(keys.key0).Push(keys.pubkey0).AsWit().Num(11).ScriptError(SCRIPT_ERR_WITNESS_MALLEATED));
+    tests.push_back(TestBuilder(CScript() << ToByteVector(keys.pubkey1),
+                                "P2SH(P2WPKH) with superfluous push in scriptSig", SCRIPT_VERIFY_WITNESS | SCRIPT_VERIFY_P2SH, true, WITNESS_PKH
+                               ).PushWitSig(keys.key0).Push(keys.pubkey1).AsWit().Num(11).PushRedeem().ScriptError(SCRIPT_ERR_WITNESS_MALLEATED_P2SH));
+    tests.push_back(TestBuilder(CScript() << ToByteVector(keys.pubkey0) << OP_CHECKSIG,
+                                "P2PK with witness", SCRIPT_VERIFY_WITNESS | SCRIPT_VERIFY_P2SH
+                               ).PushSig(keys.key0).Push("0").AsWit().ScriptError(SCRIPT_ERR_WITNESS_UNEXPECTED));
+
     std::set<std::string> tests_set;
 
     {

From d846e0237256a4105199673d2eb90ed1dbb55b35 Mon Sep 17 00:00:00 2001
From: Suhas Daftuar <sdaftuar@chaincode.com>
Date: Sun, 22 May 2016 07:35:43 -0400
Subject: [PATCH 0559/1802] [qa] script_tests: witness tests can specify tx
 amount

Add tests that witness signatures cover value
---
 src/test/data/script_tests.json | 123 ++++++++++++++++++++++++--------
 src/test/script_tests.cpp       |  68 ++++++++++++------
 2 files changed, 140 insertions(+), 51 deletions(-)

diff --git a/src/test/data/script_tests.json b/src/test/data/script_tests.json
index a59e1389f9bfb..9b81e0c77ddf7 100644
--- a/src/test/data/script_tests.json
+++ b/src/test/data/script_tests.json
@@ -1,5 +1,5 @@
 [
-["Format is: [[wit...]?, scriptSig, scriptPubKey, flags, expected_scripterror, ... comments]"],
+["Format is: [[wit..., amount]?, 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"],
@@ -1254,10 +1254,10 @@
 ["0x27 0x302402107777777777777777777777777777777702108777777777777777777777777777777701", "0 CHECKSIG NOT", "DERSIG", "SIG_DER", "Negative S is incorrectly encoded for DERSIG"],
 
 ["Some basic segwit checks"],
-[["00"], "", "0 0x206e340b9cffb37a989ca544e6bb780a2c78901d3fb33738768511a30617afa01d", "P2SH,WITNESS", "EVAL_FALSE", "Invalid witness script"],
-[["51"], "", "0 0x206e340b9cffb37a989ca544e6bb780a2c78901d3fb33738768511a30617afa01d", "P2SH,WITNESS", "WITNESS_PROGRAM_MISMATCH", "Witness script hash mismatch"],
-[["00"], "", "0 0x206e340b9cffb37a989ca544e6bb780a2c78901d3fb33738768511a30617afa01d", "", "OK", "Invalid witness script without WITNESS"],
-[["51"], "", "0 0x206e340b9cffb37a989ca544e6bb780a2c78901d3fb33738768511a30617afa01d", "", "OK", "Witness script hash mismatch without WITNESS"],
+[["00", 0.00000000 ], "", "0 0x206e340b9cffb37a989ca544e6bb780a2c78901d3fb33738768511a30617afa01d", "P2SH,WITNESS", "EVAL_FALSE", "Invalid witness script"],
+[["51", 0.00000000 ], "", "0 0x206e340b9cffb37a989ca544e6bb780a2c78901d3fb33738768511a30617afa01d", "P2SH,WITNESS", "WITNESS_PROGRAM_MISMATCH", "Witness script hash mismatch"],
+[["00", 0.00000000 ], "", "0 0x206e340b9cffb37a989ca544e6bb780a2c78901d3fb33738768511a30617afa01d", "", "OK", "Invalid witness script without WITNESS"],
+[["51", 0.00000000 ], "", "0 0x206e340b9cffb37a989ca544e6bb780a2c78901d3fb33738768511a30617afa01d", "", "OK", "Witness script hash mismatch without WITNESS"],
 
 ["Automatically generated test cases"],
 [
@@ -1836,8 +1836,9 @@
 ],
 [
     [
-        "3044022039105b995a5f448639a997a5c90fda06f50b49df30c3bdb6663217bf79323db002206fecd54269dec569fcc517178880eb58bb40f381a282bb75766ff3637d5f4b4301",
-        "410479be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8ac"
+        "304402200d461c140cfdfcf36b94961db57ae8c18d1cb80e9d95a9e47ac22470c1bf125502201c8dc1cbfef6a3ef90acbbb992ca22fe9466ee6f9d4898eda277a7ac3ab4b25101",
+        "410479be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8ac",
+        0.00000001
     ],
     "",
     "0 0x20 0xb95237b48faaa69eb078e1170be3b5cbb3fddf16d0a991e14ad274f7b33a4f64",
@@ -1847,8 +1848,9 @@
 ],
 [
     [
-        "304402201a96950593cb0af32d080b0f193517f4559241a8ebd1e95e414533ad64a3f423022047f4f6d3095c23235bdff3aeff480d0529c027a3f093cb265b7cbf148553b85101",
-        "0479be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8"
+        "304402201e7216e5ccb3b61d46946ec6cc7e8c4e0117d13ac2fd4b152197e4805191c74202203e9903e33e84d9ee1dd13fb057afb7ccfb47006c23f6a067185efbc9dd780fc501",
+        "0479be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8",
+        0.00000001
     ],
     "",
     "0 0x14 0x91b24bf9f5288532960ac687abb035127b1d28a5",
@@ -1858,8 +1860,9 @@
 ],
 [
     [
-        "3044022061fc1a144e221ec77a58a4281936eb6a1b715b9349e446e74d106ec26c8633ba022008064a0d112e8ad514440fcdfaa1006e48305d6844f50a65873fb4b2cf9c035f01",
-        "410479be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8ac"
+        "3044022066e02c19a513049d49349cf5311a1b012b7c4fae023795a18ab1d91c23496c22022025e216342c8e07ce8ef51e8daee88f84306a9de66236cab230bb63067ded1ad301",
+        "410479be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8ac",
+        0.00000001
     ],
     "0x22 0x0020b95237b48faaa69eb078e1170be3b5cbb3fddf16d0a991e14ad274f7b33a4f64",
     "HASH160 0x14 0xf386c2ba255cc56d20cfa6ea8b062f8b59945518 EQUAL",
@@ -1869,8 +1872,9 @@
 ],
 [
     [
-        "3044022014e69768e174972f21d32d93002ca6fc26133cb9e819ceef7efb970798bde7b4022078b86849dbbec692ec9355aa2a763fce7ea11bf72fdd8ea5ea8083de6f8a77fe01",
-        "0479be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8"
+        "304402200929d11561cd958460371200f82e9cae64c727a495715a31828e27a7ad57b36d0220361732ced04a6f97351ecca21a56d0b8cd4932c1da1f8f569a2b68e5e48aed7801",
+        "0479be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8",
+        0.00000001
     ],
     "0x16 0x001491b24bf9f5288532960ac687abb035127b1d28a5",
     "HASH160 0x14 0x17743beb429c55c942d2ec703b98c4d57c2df5c6 EQUAL",
@@ -1881,7 +1885,8 @@
 [
     [
         "304402202589f0512cb2408fb08ed9bd24f85eb3059744d9e4f2262d0b7f1338cff6e8b902206c0978f449693e0578c71bc543b11079fd0baae700ee5e9a6bee94db490af9fc01",
-        "41048282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f5150811f8a8098557dfe45e8256e830b60ace62d613ac2f7b17bed31b6eaff6e26cafac"
+        "41048282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f5150811f8a8098557dfe45e8256e830b60ace62d613ac2f7b17bed31b6eaff6e26cafac",
+        0.00000000
     ],
     "",
     "0 0x20 0xac8ebd9e52c17619a381fa4f71aebb696087c6ef17c960fd0587addad99c0610",
@@ -1892,7 +1897,8 @@
 [
     [
         "304402206ef7fdb2986325d37c6eb1a8bb24aeb46dede112ed8fc76c7d7500b9b83c0d3d02201edc2322c794fe2d6b0bd73ed319e714aa9b86d8891961530d5c9b7156b60d4e01",
-        "048282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f5150811f8a8098557dfe45e8256e830b60ace62d613ac2f7b17bed31b6eaff6e26caf"
+        "048282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f5150811f8a8098557dfe45e8256e830b60ace62d613ac2f7b17bed31b6eaff6e26caf",
+        0.00000000
     ],
     "",
     "0 0x14 0x7cf9c846cd4882efec4bf07e44ebdad495c94f4b",
@@ -1903,7 +1909,8 @@
 [
     [
         "30440220069ea3581afaf8187f63feee1fd2bd1f9c0dc71ea7d6e8a8b07ee2ebcf824bf402201a4fdef4c532eae59223be1eda6a397fc835142d4ddc6c74f4aa85b766a5c16f01",
-        "41048282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f5150811f8a8098557dfe45e8256e830b60ace62d613ac2f7b17bed31b6eaff6e26cafac"
+        "41048282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f5150811f8a8098557dfe45e8256e830b60ace62d613ac2f7b17bed31b6eaff6e26cafac",
+        0.00000000
     ],
     "0x22 0x0020ac8ebd9e52c17619a381fa4f71aebb696087c6ef17c960fd0587addad99c0610",
     "HASH160 0x14 0x61039a003883787c0d6ebc66d97fdabe8e31449d EQUAL",
@@ -1914,7 +1921,8 @@
 [
     [
         "304402204209e49457c2358f80d0256bc24535b8754c14d08840fc4be762d6f5a0aed80b02202eaf7d8fc8d62f60c67adcd99295528d0e491ae93c195cec5a67e7a09532a88001",
-        "048282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f5150811f8a8098557dfe45e8256e830b60ace62d613ac2f7b17bed31b6eaff6e26caf"
+        "048282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f5150811f8a8098557dfe45e8256e830b60ace62d613ac2f7b17bed31b6eaff6e26caf",
+        0.00000000
     ],
     "0x16 0x00147cf9c846cd4882efec4bf07e44ebdad495c94f4b",
     "HASH160 0x14 0x4e0c2aed91315303fc6a1dc4c7bc21c88f75402e EQUAL",
@@ -1925,7 +1933,8 @@
 [
     [
         "304402202589f0512cb2408fb08ed9bd24f85eb3059744d9e4f2262d0b7f1338cff6e8b902206c0978f449693e0578c71bc543b11079fd0baae700ee5e9a6bee94db490af9fc01",
-        "41048282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f5150811f8a8098557dfe45e8256e830b60ace62d613ac2f7b17bed31b6eaff6e26cafac"
+        "41048282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f5150811f8a8098557dfe45e8256e830b60ace62d613ac2f7b17bed31b6eaff6e26cafac",
+        0.00000000
     ],
     "",
     "0 0x20 0xac8ebd9e52c17619a381fa4f71aebb696087c6ef17c960fd0587addad99c0610",
@@ -1936,7 +1945,8 @@
 [
     [
         "304402206ef7fdb2986325d37c6eb1a8bb24aeb46dede112ed8fc76c7d7500b9b83c0d3d02201edc2322c794fe2d6b0bd73ed319e714aa9b86d8891961530d5c9b7156b60d4e01",
-        "048282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f5150811f8a8098557dfe45e8256e830b60ace62d613ac2f7b17bed31b6eaff6e26caf"
+        "048282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f5150811f8a8098557dfe45e8256e830b60ace62d613ac2f7b17bed31b6eaff6e26caf",
+        0.00000000
     ],
     "",
     "0 0x14 0x7cf9c846cd4882efec4bf07e44ebdad495c94f4b",
@@ -1947,7 +1957,8 @@
 [
     [
         "30440220069ea3581afaf8187f63feee1fd2bd1f9c0dc71ea7d6e8a8b07ee2ebcf824bf402201a4fdef4c532eae59223be1eda6a397fc835142d4ddc6c74f4aa85b766a5c16f01",
-        "41048282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f5150811f8a8098557dfe45e8256e830b60ace62d613ac2f7b17bed31b6eaff6e26cafac"
+        "41048282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f5150811f8a8098557dfe45e8256e830b60ace62d613ac2f7b17bed31b6eaff6e26cafac",
+        0.00000000
     ],
     "0x22 0x0020ac8ebd9e52c17619a381fa4f71aebb696087c6ef17c960fd0587addad99c0610",
     "HASH160 0x14 0x61039a003883787c0d6ebc66d97fdabe8e31449d EQUAL",
@@ -1958,7 +1969,8 @@
 [
     [
         "304402204209e49457c2358f80d0256bc24535b8754c14d08840fc4be762d6f5a0aed80b02202eaf7d8fc8d62f60c67adcd99295528d0e491ae93c195cec5a67e7a09532a88001",
-        "048282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f5150811f8a8098557dfe45e8256e830b60ace62d613ac2f7b17bed31b6eaff6e26caf"
+        "048282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f5150811f8a8098557dfe45e8256e830b60ace62d613ac2f7b17bed31b6eaff6e26caf",
+        0.00000000
     ],
     "0x16 0x00147cf9c846cd4882efec4bf07e44ebdad495c94f4b",
     "HASH160 0x14 0x4e0c2aed91315303fc6a1dc4c7bc21c88f75402e EQUAL",
@@ -1966,10 +1978,59 @@
     "OK",
     "Basic P2SH(P2WPKH) with the wrong key but no WITNESS"
 ],
+[
+    [
+        "3044022066faa86e74e8b30e82691b985b373de4f9e26dc144ec399c4f066aa59308e7c202204712b86f28c32503faa051dbeabff2c238ece861abc36c5e0b40b1139ca222f001",
+        "410479be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8ac",
+        0.00000000
+    ],
+    "",
+    "0 0x20 0xb95237b48faaa69eb078e1170be3b5cbb3fddf16d0a991e14ad274f7b33a4f64",
+    "P2SH,WITNESS",
+    "EVAL_FALSE",
+    "Basic P2WSH with wrong value"
+],
+[
+    [
+        "304402203b3389b87448d7dfdb5e82fb854fcf92d7925f9938ea5444e36abef02c3d6a9602202410bc3265049abb07fd2e252c65ab7034d95c9d5acccabe9fadbdc63a52712601",
+        "0479be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8",
+        0.00000000
+    ],
+    "",
+    "0 0x14 0x91b24bf9f5288532960ac687abb035127b1d28a5",
+    "P2SH,WITNESS",
+    "EVAL_FALSE",
+    "Basic P2WPKH with wrong value"
+],
+[
+    [
+        "3044022000a30c4cfc10e4387be528613575434826ad3c15587475e0df8ce3b1746aa210022008149265e4f8e9dafe1f3ea50d90cb425e9e40ea7ebdd383069a7cfa2b77004701",
+        "410479be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8ac",
+        0.00000000
+    ],
+    "0x22 0x0020b95237b48faaa69eb078e1170be3b5cbb3fddf16d0a991e14ad274f7b33a4f64",
+    "HASH160 0x14 0xf386c2ba255cc56d20cfa6ea8b062f8b59945518 EQUAL",
+    "P2SH,WITNESS",
+    "EVAL_FALSE",
+    "Basic P2SH(P2WSH) with wrong value"
+],
+[
+    [
+        "304402204fc3a2cd61a47913f2a5f9107d0ad4a504c7b31ee2d6b3b2f38c2b10ee031e940220055d58b7c3c281aaa381d8f486ac0f3e361939acfd568046cb6a311cdfa974cf01",
+        "0479be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8",
+        0.00000000
+    ],
+    "0x16 0x001491b24bf9f5288532960ac687abb035127b1d28a5",
+    "HASH160 0x14 0x17743beb429c55c942d2ec703b98c4d57c2df5c6 EQUAL",
+    "P2SH,WITNESS",
+    "EVAL_FALSE",
+    "Basic P2SH(P2WPKH) with wrong value"
+],
 [
     [
         "304402205ae57ae0534c05ca9981c8a6cdf353b505eaacb7375f96681a2d1a4ba6f02f84022056248e68643b7d8ce7c7d128c9f1f348bcab8be15d094ad5cadd24251a28df8001",
-        "0479be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8"
+        "0479be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8",
+        0.00000000
     ],
     "",
     "1 0x14 0x91b24bf9f5288532960ac687abb035127b1d28a5",
@@ -1980,7 +2041,8 @@
 [
     [
         "3044022064100ca0e2a33332136775a86cd83d0230e58b9aebb889c5ac952abff79a46ef02205f1bf900e022039ad3091bdaf27ac2aef3eae9ed9f190d821d3e508405b9513101",
-        "0479be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8"
+        "0479be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8",
+        0.00000000
     ],
     "",
     "0 0x1f 0xb34b78da162751647974d5cb7410aa428ad339dbf7d1e16e833f68a0cbf1c3",
@@ -1998,7 +2060,8 @@
 [
     [
         "3044022039105b995a5f448639a997a5c90fda06f50b49df30c3bdb6663217bf79323db002206fecd54269dec569fcc517178880eb58bb40f381a282bb75766ff3637d5f4b4301",
-        "400479be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8ac"
+        "400479be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8ac",
+        0.00000000
     ],
     "",
     "0 0x20 0xb95237b48faaa69eb078e1170be3b5cbb3fddf16d0a991e14ad274f7b33a4f64",
@@ -2010,7 +2073,8 @@
     [
         "304402201a96950593cb0af32d080b0f193517f4559241a8ebd1e95e414533ad64a3f423022047f4f6d3095c23235bdff3aeff480d0529c027a3f093cb265b7cbf148553b85101",
         "0479be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8",
-        ""
+        "",
+        0.00000000
     ],
     "",
     "0 0x14 0x91b24bf9f5288532960ac687abb035127b1d28a5",
@@ -2021,7 +2085,8 @@
 [
     [
         "304402201a96950593cb0af32d080b0f193517f4559241a8ebd1e95e414533ad64a3f423022047f4f6d3095c23235bdff3aeff480d0529c027a3f093cb265b7cbf148553b85101",
-        "0479be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8"
+        "0479be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8",
+        0.00000000
     ],
     "11",
     "0 0x14 0x91b24bf9f5288532960ac687abb035127b1d28a5",
@@ -2032,7 +2097,8 @@
 [
     [
         "304402204209e49457c2358f80d0256bc24535b8754c14d08840fc4be762d6f5a0aed80b02202eaf7d8fc8d62f60c67adcd99295528d0e491ae93c195cec5a67e7a09532a88001",
-        "048282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f5150811f8a8098557dfe45e8256e830b60ace62d613ac2f7b17bed31b6eaff6e26caf"
+        "048282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f5150811f8a8098557dfe45e8256e830b60ace62d613ac2f7b17bed31b6eaff6e26caf",
+        0.00000000
     ],
     "11 0x16 0x00147cf9c846cd4882efec4bf07e44ebdad495c94f4b",
     "HASH160 0x14 0x4e0c2aed91315303fc6a1dc4c7bc21c88f75402e EQUAL",
@@ -2042,7 +2108,8 @@
 ],
 [
     [
-        ""
+        "",
+        0.00000000
     ],
     "0x47 0x304402200a5c6163f07b8d3b013c4d1d6dba25e780b39658d79ba37af7057a3b7f15ffa102201fd9b4eaa9943f734928b99a83592c2e7bf342ea2680f6a2bb705167966b742001",
     "0x41 0x0479be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8 CHECKSIG",
diff --git a/src/test/script_tests.cpp b/src/test/script_tests.cpp
index 1497bde9d1550..5a9aaf9bc0738 100644
--- a/src/test/script_tests.cpp
+++ b/src/test/script_tests.cpp
@@ -13,6 +13,7 @@
 #include "util.h"
 #include "utilstrencodings.h"
 #include "test/test_bitcoin.h"
+#include "rpc/server.h"
 
 #if defined(HAVE_CONSENSUS_LIB)
 #include "script/bitcoinconsensus.h"
@@ -118,7 +119,7 @@ ScriptError_t ParseScriptError(const std::string &name)
 
 BOOST_FIXTURE_TEST_SUITE(script_tests, BasicTestingSetup)
 
-CMutableTransaction BuildCreditingTransaction(const CScript& scriptPubKey)
+CMutableTransaction BuildCreditingTransaction(const CScript& scriptPubKey, int nValue = 0)
 {
     CMutableTransaction txCredit;
     txCredit.nVersion = 1;
@@ -129,7 +130,7 @@ CMutableTransaction BuildCreditingTransaction(const CScript& scriptPubKey)
     txCredit.vin[0].scriptSig = CScript() << CScriptNum(0) << CScriptNum(0);
     txCredit.vin[0].nSequence = CTxIn::SEQUENCE_FINAL;
     txCredit.vout[0].scriptPubKey = scriptPubKey;
-    txCredit.vout[0].nValue = 0;
+    txCredit.vout[0].nValue = nValue;
 
     return txCredit;
 }
@@ -148,12 +149,12 @@ CMutableTransaction BuildSpendingTransaction(const CScript& scriptSig, const CSc
     txSpend.vin[0].scriptSig = scriptSig;
     txSpend.vin[0].nSequence = CTxIn::SEQUENCE_FINAL;
     txSpend.vout[0].scriptPubKey = CScript();
-    txSpend.vout[0].nValue = 0;
+    txSpend.vout[0].nValue = txCredit.vout[0].nValue;
 
     return txSpend;
 }
 
-void DoTest(const CScript& scriptPubKey, const CScript& scriptSig, const CScriptWitness& scriptWitness, int flags, const std::string& message, int scriptError)
+void DoTest(const CScript& scriptPubKey, const CScript& scriptSig, const CScriptWitness& scriptWitness, int flags, const std::string& message, int scriptError, CAmount nValue = 0)
 {
     bool expect = (scriptError == SCRIPT_ERR_OK);
     if (flags & SCRIPT_VERIFY_CLEANSTACK) {
@@ -161,7 +162,7 @@ void DoTest(const CScript& scriptPubKey, const CScript& scriptSig, const CScript
         flags |= SCRIPT_VERIFY_WITNESS;
     }
     ScriptError err;
-    CMutableTransaction txCredit = BuildCreditingTransaction(scriptPubKey);
+    CMutableTransaction txCredit = BuildCreditingTransaction(scriptPubKey, nValue);
     CMutableTransaction tx = BuildSpendingTransaction(scriptSig, scriptWitness, txCredit);
     CMutableTransaction tx2 = tx;
     BOOST_CHECK_MESSAGE(VerifyScript(scriptSig, scriptPubKey, &scriptWitness, flags, MutableTransactionSignatureChecker(&tx, 0, txCredit.vout[0].nValue), &err) == expect, message);
@@ -276,6 +277,7 @@ class TestBuilder
     std::string comment;
     int flags;
     int scriptError;
+    CAmount nValue;
 
     void DoPush()
     {
@@ -293,7 +295,7 @@ class TestBuilder
     }
 
 public:
-    TestBuilder(const CScript& script_, const std::string& comment_, int flags_, bool P2SH = false, WitnessMode wm = WITNESS_NONE, int witnessversion = 0) : script(script_), havePush(false), comment(comment_), flags(flags_), scriptError(SCRIPT_ERR_OK)
+    TestBuilder(const CScript& script_, const std::string& comment_, int flags_, bool P2SH = false, WitnessMode wm = WITNESS_NONE, int witnessversion = 0, CAmount nValue_ = 0) : script(script_), havePush(false), comment(comment_), flags(flags_), scriptError(SCRIPT_ERR_OK), nValue(nValue_)
     {
         CScript scriptPubKey = script;
         if (wm == WITNESS_PKH) {
@@ -311,7 +313,7 @@ class TestBuilder
             redeemscript = scriptPubKey;
             scriptPubKey = CScript() << OP_HASH160 << ToByteVector(CScriptID(redeemscript)) << OP_EQUAL;
         }
-        creditTx = BuildCreditingTransaction(scriptPubKey);
+        creditTx = BuildCreditingTransaction(scriptPubKey, nValue);
         spendTx = BuildSpendingTransaction(CScript(), CScriptWitness(), creditTx);
     }
 
@@ -346,9 +348,9 @@ class TestBuilder
         return *this;
     }
 
-    TestBuilder& PushSig(const CKey& key, int nHashType = SIGHASH_ALL, unsigned int lenR = 32, unsigned int lenS = 32, SigVersion sigversion = SIGVERSION_BASE)
+    TestBuilder& PushSig(const CKey& key, int nHashType = SIGHASH_ALL, unsigned int lenR = 32, unsigned int lenS = 32, SigVersion sigversion = SIGVERSION_BASE, CAmount amount = 0)
     {
-        uint256 hash = SignatureHash(script, spendTx, 0, nHashType, 0, sigversion);
+        uint256 hash = SignatureHash(script, spendTx, 0, nHashType, amount, sigversion);
         std::vector<unsigned char> vchSig, r, s;
         uint32_t iter = 0;
         do {
@@ -364,9 +366,11 @@ class TestBuilder
         return *this;
     }
 
-    TestBuilder& PushWitSig(const CKey& key, int nHashType = SIGHASH_ALL, unsigned int lenR = 32, unsigned int lenS = 32, SigVersion sigversion = SIGVERSION_WITNESS_V0)
+    TestBuilder& PushWitSig(const CKey& key, CAmount amount = -1, int nHashType = SIGHASH_ALL, unsigned int lenR = 32, unsigned int lenS = 32, SigVersion sigversion = SIGVERSION_WITNESS_V0)
     {
-        return PushSig(key, nHashType, lenR, lenS, sigversion).AsWit();
+        if (amount == -1)
+            amount = nValue;
+        return PushSig(key, nHashType, lenR, lenS, sigversion, amount).AsWit();
     }
 
     TestBuilder& Push(const CPubKey& pubkey)
@@ -411,7 +415,7 @@ class TestBuilder
     {
         TestBuilder copy = *this; // Make a copy so we can rollback the push.
         DoPush();
-        DoTest(creditTx.vout[0].scriptPubKey, spendTx.vin[0].scriptSig, scriptWitness, flags, comment, scriptError);
+        DoTest(creditTx.vout[0].scriptPubKey, spendTx.vin[0].scriptSig, scriptWitness, flags, comment, scriptError, nValue);
         *this = copy;
         return *this;
     }
@@ -433,6 +437,7 @@ class TestBuilder
             for (unsigned i = 0; i < scriptWitness.stack.size(); i++) {
                 wit.push_back(HexStr(scriptWitness.stack[i]));
             }
+            wit.push_back(ValueFromAmount(nValue));
             array.push_back(wit);
         }
         array.push_back(FormatScript(spendTx.vin[0].scriptSig));
@@ -734,17 +739,17 @@ BOOST_AUTO_TEST_CASE(script_build)
                                ).PushSig(keys.key0).PushRedeem());
 
     tests.push_back(TestBuilder(CScript() << ToByteVector(keys.pubkey0) << OP_CHECKSIG,
-                                "Basic P2WSH", SCRIPT_VERIFY_WITNESS | SCRIPT_VERIFY_P2SH, false, WITNESS_SH
-                               ).PushWitSig(keys.key0).PushWitRedeem());
+                                "Basic P2WSH", SCRIPT_VERIFY_WITNESS | SCRIPT_VERIFY_P2SH, false, WITNESS_SH,
+                                0, 1).PushWitSig(keys.key0).PushWitRedeem());
     tests.push_back(TestBuilder(CScript() << ToByteVector(keys.pubkey0),
-                                "Basic P2WPKH", SCRIPT_VERIFY_WITNESS | SCRIPT_VERIFY_P2SH, false, WITNESS_PKH
-                               ).PushWitSig(keys.key0).Push(keys.pubkey0).AsWit());
+                                "Basic P2WPKH", SCRIPT_VERIFY_WITNESS | SCRIPT_VERIFY_P2SH, false, WITNESS_PKH,
+                                0, 1).PushWitSig(keys.key0).Push(keys.pubkey0).AsWit());
     tests.push_back(TestBuilder(CScript() << ToByteVector(keys.pubkey0) << OP_CHECKSIG,
-                                "Basic P2SH(P2WSH)", SCRIPT_VERIFY_WITNESS | SCRIPT_VERIFY_P2SH, true, WITNESS_SH
-                               ).PushWitSig(keys.key0).PushWitRedeem().PushRedeem());
+                                "Basic P2SH(P2WSH)", SCRIPT_VERIFY_WITNESS | SCRIPT_VERIFY_P2SH, true, WITNESS_SH,
+                                0, 1).PushWitSig(keys.key0).PushWitRedeem().PushRedeem());
     tests.push_back(TestBuilder(CScript() << ToByteVector(keys.pubkey0),
-                                "Basic P2SH(P2WPKH)", SCRIPT_VERIFY_WITNESS | SCRIPT_VERIFY_P2SH, true, WITNESS_PKH
-                               ).PushWitSig(keys.key0).Push(keys.pubkey0).AsWit().PushRedeem());
+                                "Basic P2SH(P2WPKH)", SCRIPT_VERIFY_WITNESS | SCRIPT_VERIFY_P2SH, true, WITNESS_PKH,
+                                0, 1).PushWitSig(keys.key0).Push(keys.pubkey0).AsWit().PushRedeem());
     tests.push_back(TestBuilder(CScript() << ToByteVector(keys.pubkey1) << OP_CHECKSIG,
                                 "Basic P2WSH with the wrong key", SCRIPT_VERIFY_WITNESS | SCRIPT_VERIFY_P2SH, false, WITNESS_SH
                                ).PushWitSig(keys.key0).PushWitRedeem().ScriptError(SCRIPT_ERR_EVAL_FALSE));
@@ -769,6 +774,18 @@ BOOST_AUTO_TEST_CASE(script_build)
     tests.push_back(TestBuilder(CScript() << ToByteVector(keys.pubkey1),
                                 "Basic P2SH(P2WPKH) with the wrong key but no WITNESS", SCRIPT_VERIFY_P2SH, true, WITNESS_PKH
                                ).PushWitSig(keys.key0).Push(keys.pubkey1).AsWit().PushRedeem());
+    tests.push_back(TestBuilder(CScript() << ToByteVector(keys.pubkey0) << OP_CHECKSIG,
+                                "Basic P2WSH with wrong value", SCRIPT_VERIFY_WITNESS | SCRIPT_VERIFY_P2SH, false, WITNESS_SH,
+                                0, 0).PushWitSig(keys.key0, 1).PushWitRedeem().ScriptError(SCRIPT_ERR_EVAL_FALSE));
+    tests.push_back(TestBuilder(CScript() << ToByteVector(keys.pubkey0),
+                                "Basic P2WPKH with wrong value", SCRIPT_VERIFY_WITNESS | SCRIPT_VERIFY_P2SH, false, WITNESS_PKH,
+                                0, 0).PushWitSig(keys.key0, 1).Push(keys.pubkey0).AsWit().ScriptError(SCRIPT_ERR_EVAL_FALSE));
+    tests.push_back(TestBuilder(CScript() << ToByteVector(keys.pubkey0) << OP_CHECKSIG,
+                                "Basic P2SH(P2WSH) with wrong value", SCRIPT_VERIFY_WITNESS | SCRIPT_VERIFY_P2SH, true, WITNESS_SH,
+                                0, 0).PushWitSig(keys.key0, 1).PushWitRedeem().PushRedeem().ScriptError(SCRIPT_ERR_EVAL_FALSE));
+    tests.push_back(TestBuilder(CScript() << ToByteVector(keys.pubkey0),
+                                "Basic P2SH(P2WPKH) with wrong value", SCRIPT_VERIFY_WITNESS | SCRIPT_VERIFY_P2SH, true, WITNESS_PKH,
+                                0, 0).PushWitSig(keys.key0, 1).Push(keys.pubkey0).AsWit().PushRedeem().ScriptError(SCRIPT_ERR_EVAL_FALSE));
 
     tests.push_back(TestBuilder(CScript() << ToByteVector(keys.pubkey0),
                                 "P2WPKH with future witness version", SCRIPT_VERIFY_WITNESS | SCRIPT_VERIFY_P2SH |
@@ -841,20 +858,25 @@ BOOST_AUTO_TEST_CASE(script_json_test)
 {
     // Read tests from test/data/script_tests.json
     // Format is an array of arrays
-    // Inner arrays are [ ["wit"...]?, "scriptSig", "scriptPubKey", "flags", "expected_scripterror" ]
+    // Inner arrays are [ ["wit"..., nValue]?, "scriptSig", "scriptPubKey", "flags", "expected_scripterror" ]
     // ... where scriptSig and scriptPubKey are stringified
     // scripts.
+    // If a witness is given, then the last value in the array should be the
+    // amount (nValue) to use in the crediting tx
     UniValue tests = read_json(std::string(json_tests::script_tests, json_tests::script_tests + sizeof(json_tests::script_tests)));
 
     for (unsigned int idx = 0; idx < tests.size(); idx++) {
         UniValue test = tests[idx];
         string strTest = test.write();
         CScriptWitness witness;
+        CAmount nValue = 0;
         unsigned int pos = 0;
         if (test.size() > 0 && test[pos].isArray()) {
-            for (unsigned int i = 0; i < test[pos].size(); i++) {
+            unsigned int i=0;
+            for (i = 0; i < test[pos].size()-1; i++) {
                 witness.stack.push_back(ParseHex(test[pos][i].get_str()));
             }
+            nValue = AmountFromValue(test[pos][i]);
             pos++;
         }
         if (test.size() < 4 + pos) // Allow size > 3; extra stuff ignored (useful for comments)
@@ -871,7 +893,7 @@ BOOST_AUTO_TEST_CASE(script_json_test)
         unsigned int scriptflags = ParseScriptFlags(test[pos++].get_str());
         int scriptError = ParseScriptError(test[pos++].get_str());
 
-        DoTest(scriptPubKey, scriptSig, witness, scriptflags, strTest, scriptError);
+        DoTest(scriptPubKey, scriptSig, witness, scriptflags, strTest, scriptError, nValue);
     }
 }
 

From fdb43df23eb507d1c79b7ae9cc2e61c3e52c8988 Mon Sep 17 00:00:00 2001
From: Jonas Nick <jonasd.nick@gmail.com>
Date: Sat, 28 May 2016 19:22:13 +0200
Subject: [PATCH 0560/1802] [qa] Add GetTransactionSigOpCost unit tests

---
 src/main.h                    |   8 ++
 src/test/sigopcount_tests.cpp | 177 ++++++++++++++++++++++++++++++++++
 2 files changed, 185 insertions(+)

diff --git a/src/main.h b/src/main.h
index 84a6044bc9dde..2ffe5770dccb0 100644
--- a/src/main.h
+++ b/src/main.h
@@ -333,6 +333,14 @@ unsigned int GetLegacySigOpCount(const CTransaction& tx);
  */
 unsigned int GetP2SHSigOpCount(const CTransaction& tx, const CCoinsViewCache& mapInputs);
 
+/**
+ * Compute total signature operation cost of a transaction.
+ * @param[in] tx     Transaction for which we are computing the cost
+ * @param[in] inputs Map of previous transactions that have outputs we're spending
+ * @param[out] flags Script verification flags
+ * @return Total signature operation cost of tx
+ */
+int64_t GetTransactionSigOpCost(const CTransaction& tx, const CCoinsViewCache& inputs, int flags);
 
 /**
  * Check whether all inputs of this transaction are valid (no double spends, scripts & sigs, amounts)
diff --git a/src/test/sigopcount_tests.cpp b/src/test/sigopcount_tests.cpp
index a207fd9216a10..8dea388332b21 100644
--- a/src/test/sigopcount_tests.cpp
+++ b/src/test/sigopcount_tests.cpp
@@ -2,6 +2,7 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
+#include "main.h"
 #include "pubkey.h"
 #include "key.h"
 #include "script/script.h"
@@ -64,4 +65,180 @@ BOOST_AUTO_TEST_CASE(GetSigOpCount)
     BOOST_CHECK_EQUAL(p2sh.GetSigOpCount(scriptSig2), 3U);
 }
 
+/**
+ * Verifies script execution of the zeroth scriptPubKey of tx output and
+ * zeroth scriptSig and witness of tx input.
+ */
+ScriptError VerifyWithFlag(const CTransaction& output, const CMutableTransaction& input, int flags)
+{
+    ScriptError error;
+    CTransaction inputi(input);
+    bool ret = VerifyScript(inputi.vin[0].scriptSig, output.vout[0].scriptPubKey, inputi.wit.vtxinwit.size() > 0 ? &inputi.wit.vtxinwit[0].scriptWitness : NULL, flags, TransactionSignatureChecker(&inputi, 0, output.vout[0].nValue), &error);
+    BOOST_CHECK((ret == true) == (error == SCRIPT_ERR_OK));
+
+    return error;
+}
+
+/**
+ * Builds a creationTx from scriptPubKey and a spendingTx from scriptSig
+ * and witness such that spendingTx spends output zero of creationTx.
+ * Also inserts creationTx's output into the coins view.
+ */
+void BuildTxs(CMutableTransaction& spendingTx, CCoinsViewCache& coins, CMutableTransaction& creationTx, const CScript& scriptPubKey, const CScript& scriptSig, const CTxinWitness& witness)
+{
+    creationTx.nVersion = 1;
+    creationTx.vin.resize(1);
+    creationTx.vin[0].prevout.SetNull();
+    creationTx.vin[0].scriptSig = CScript();
+    creationTx.wit.vtxinwit.resize(1);
+    creationTx.vout.resize(1);
+    creationTx.vout[0].nValue = 1;
+    creationTx.vout[0].scriptPubKey = scriptPubKey;
+
+    spendingTx.nVersion = 1;
+    spendingTx.vin.resize(1);
+    spendingTx.vin[0].prevout.hash = creationTx.GetHash();
+    spendingTx.vin[0].prevout.n = 0;
+    spendingTx.vin[0].scriptSig = scriptSig;
+    spendingTx.wit.vtxinwit.resize(1);
+    spendingTx.wit.vtxinwit[0] = witness;
+    spendingTx.vout.resize(1);
+    spendingTx.vout[0].nValue = 1;
+    spendingTx.vout[0].scriptPubKey = CScript();
+
+    coins.ModifyCoins(creationTx.GetHash())->FromTx(creationTx, 0);
+}
+
+BOOST_AUTO_TEST_CASE(GetTxSigOpCost)
+{
+    // Transaction creates outputs
+    CMutableTransaction creationTx;
+    // Transaction that spends outputs and whose
+    // sig op cost is going to be tested
+    CMutableTransaction spendingTx;
+
+    // Create utxo set
+    CCoinsView coinsDummy;
+    CCoinsViewCache coins(&coinsDummy);
+    // Create key
+    CKey key;
+    key.MakeNewKey(true);
+    CPubKey pubkey = key.GetPubKey();
+    // Default flags
+    int flags = SCRIPT_VERIFY_WITNESS | SCRIPT_VERIFY_P2SH;
+
+    // Multisig script (legacy counting)
+    {
+        CScript scriptPubKey = CScript() << 1 << ToByteVector(pubkey) << ToByteVector(pubkey) << 2 << OP_CHECKMULTISIGVERIFY;
+        // Do not use a valid signature to avoid using wallet operations.
+        CScript scriptSig = CScript() << OP_0 << OP_0;
+
+        BuildTxs(spendingTx, coins, creationTx, scriptPubKey, scriptSig, CTxinWitness());
+        // Legacy counting only includes signature operations in scriptSigs and scriptPubKeys
+        // of a transaction and does not take the actual executed sig operations into account.
+        // spendingTx in itself does not contain a signature operation.
+        assert(GetTransactionSigOpCost(CTransaction(spendingTx), coins, flags) == 0);
+        // creationTx contains two signature operations in its scriptPubKey, but legacy counting
+        // is not accurate.
+        assert(GetTransactionSigOpCost(CTransaction(creationTx), coins, flags) == MAX_PUBKEYS_PER_MULTISIG * WITNESS_SCALE_FACTOR);
+        // Sanity check: script verification fails because of an invalid signature.
+        assert(VerifyWithFlag(creationTx, spendingTx, flags) == SCRIPT_ERR_CHECKMULTISIGVERIFY);
+    }
+
+    // Multisig nested in P2SH
+    {
+        CScript redeemScript = CScript() << 1 << ToByteVector(pubkey) << ToByteVector(pubkey) << 2 << OP_CHECKMULTISIGVERIFY;
+        CScript scriptPubKey = GetScriptForDestination(CScriptID(redeemScript));
+        CScript scriptSig = CScript() << OP_0 << OP_0 << ToByteVector(redeemScript);
+
+        BuildTxs(spendingTx, coins, creationTx, scriptPubKey, scriptSig, CTxinWitness());
+        assert(GetTransactionSigOpCost(CTransaction(spendingTx), coins, flags) == 2 * WITNESS_SCALE_FACTOR);
+        assert(VerifyWithFlag(creationTx, spendingTx, flags) == SCRIPT_ERR_CHECKMULTISIGVERIFY);
+    }
+
+    // P2WPKH witness program
+    {
+        CScript p2pk = CScript() << ToByteVector(pubkey) << OP_CHECKSIG;
+        CScript scriptPubKey = GetScriptForWitness(p2pk);
+        CScript scriptSig = CScript();
+        CTxinWitness witness;
+        CScriptWitness scriptWitness;
+        scriptWitness.stack.push_back(vector<unsigned char>(0));
+        scriptWitness.stack.push_back(vector<unsigned char>(0));
+        witness.scriptWitness = scriptWitness;
+
+
+        BuildTxs(spendingTx, coins, creationTx, scriptPubKey, scriptSig, witness);
+        assert(GetTransactionSigOpCost(CTransaction(spendingTx), coins, flags) == 1);
+        // No signature operations if we don't verify the witness.
+        assert(GetTransactionSigOpCost(CTransaction(spendingTx), coins, flags & ~SCRIPT_VERIFY_WITNESS) == 0);
+        assert(VerifyWithFlag(creationTx, spendingTx, flags) == SCRIPT_ERR_EQUALVERIFY);
+
+        // The sig op cost for witness version != 0 is zero.
+        assert(scriptPubKey[0] == 0x00);
+        scriptPubKey[0] = 0x51;
+        BuildTxs(spendingTx, coins, creationTx, scriptPubKey, scriptSig, witness);
+        assert(GetTransactionSigOpCost(CTransaction(spendingTx), coins, flags) == 0);
+        scriptPubKey[0] = 0x00;
+        BuildTxs(spendingTx, coins, creationTx, scriptPubKey, scriptSig, witness);
+
+        // The witness of a coinbase transaction is not taken into account.
+        spendingTx.vin[0].prevout.SetNull();
+        assert(GetTransactionSigOpCost(CTransaction(spendingTx), coins, flags) == 0);
+    }
+
+    // P2WPKH nested in P2SH
+    {
+        CScript p2pk = CScript() << ToByteVector(pubkey) << OP_CHECKSIG;
+        CScript scriptSig = GetScriptForWitness(p2pk);
+        CScript scriptPubKey = GetScriptForDestination(CScriptID(scriptSig));
+        scriptSig = CScript() << ToByteVector(scriptSig);
+        CTxinWitness witness;
+        CScriptWitness scriptWitness;
+        scriptWitness.stack.push_back(vector<unsigned char>(0));
+        scriptWitness.stack.push_back(vector<unsigned char>(0));
+        witness.scriptWitness = scriptWitness;
+
+        BuildTxs(spendingTx, coins, creationTx, scriptPubKey, scriptSig, witness);
+        assert(GetTransactionSigOpCost(CTransaction(spendingTx), coins, flags) == 1);
+        assert(VerifyWithFlag(creationTx, spendingTx, flags) == SCRIPT_ERR_EQUALVERIFY);
+    }
+
+    // P2WSH witness program
+    {
+        CScript witnessScript = CScript() << 1 << ToByteVector(pubkey) << ToByteVector(pubkey) << 2 << OP_CHECKMULTISIGVERIFY;
+        CScript scriptPubKey = GetScriptForWitness(witnessScript);
+        CScript scriptSig = CScript();
+        CTxinWitness witness;
+        CScriptWitness scriptWitness;
+        scriptWitness.stack.push_back(vector<unsigned char>(0));
+        scriptWitness.stack.push_back(vector<unsigned char>(0));
+        scriptWitness.stack.push_back(vector<unsigned char>(witnessScript.begin(), witnessScript.end()));
+        witness.scriptWitness = scriptWitness;
+
+        BuildTxs(spendingTx, coins, creationTx, scriptPubKey, scriptSig, witness);
+        assert(GetTransactionSigOpCost(CTransaction(spendingTx), coins, flags) == 2);
+        assert(GetTransactionSigOpCost(CTransaction(spendingTx), coins, flags & ~SCRIPT_VERIFY_WITNESS) == 0);
+        assert(VerifyWithFlag(creationTx, spendingTx, flags) == SCRIPT_ERR_CHECKMULTISIGVERIFY);
+    }
+
+    // P2WSH nested in P2SH
+    {
+        CScript witnessScript = CScript() << 1 << ToByteVector(pubkey) << ToByteVector(pubkey) << 2 << OP_CHECKMULTISIGVERIFY;
+        CScript redeemScript = GetScriptForWitness(witnessScript);
+        CScript scriptPubKey = GetScriptForDestination(CScriptID(redeemScript));
+        CScript scriptSig = CScript() << ToByteVector(redeemScript);
+        CTxinWitness witness;
+        CScriptWitness scriptWitness;
+        scriptWitness.stack.push_back(vector<unsigned char>(0));
+        scriptWitness.stack.push_back(vector<unsigned char>(0));
+        scriptWitness.stack.push_back(vector<unsigned char>(witnessScript.begin(), witnessScript.end()));
+        witness.scriptWitness = scriptWitness;
+
+        BuildTxs(spendingTx, coins, creationTx, scriptPubKey, scriptSig, witness);
+        assert(GetTransactionSigOpCost(CTransaction(spendingTx), coins, flags) == 2);
+        assert(VerifyWithFlag(creationTx, spendingTx, flags) == SCRIPT_ERR_CHECKMULTISIGVERIFY);
+    }
+}
+
 BOOST_AUTO_TEST_SUITE_END()

From 070dbc48a9338375fd7ce0a86ee05b476cf487a4 Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Sat, 4 Jun 2016 22:38:36 +0200
Subject: [PATCH 0561/1802] --- [SEGWIT] begin: deployment ---


From f8528134fc188abc5c7175a19680206964a8fade Mon Sep 17 00:00:00 2001
From: Johnson Lau <jl2012@users.noreply.github.com>
Date: Fri, 6 May 2016 07:29:34 +0200
Subject: [PATCH 0562/1802] BIP9 parameters for testnet

---
 src/chainparams.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/chainparams.cpp b/src/chainparams.cpp
index 2a198e8554c93..69d4a9ecbeb6e 100644
--- a/src/chainparams.cpp
+++ b/src/chainparams.cpp
@@ -190,8 +190,8 @@ class CTestNetParams : public CChainParams {
 
         // Deployment of SegWit (BIP141 and BIP143)
         consensus.vDeployments[Consensus::DEPLOYMENT_SEGWIT].bit = 1;
-        consensus.vDeployments[Consensus::DEPLOYMENT_SEGWIT].nStartTime = 2000000000; // Far in the future
-        consensus.vDeployments[Consensus::DEPLOYMENT_SEGWIT].nTimeout = 2100000000;
+        consensus.vDeployments[Consensus::DEPLOYMENT_SEGWIT].nStartTime = 1462060800; // May 1st 2016
+        consensus.vDeployments[Consensus::DEPLOYMENT_SEGWIT].nTimeout = 1493596800; // May 1st 2017
 
         pchMessageStart[0] = 0x0b;
         pchMessageStart[1] = 0x11;

From 27f8126ff37ec590c266adc6228d216857606536 Mon Sep 17 00:00:00 2001
From: Daniel Cousens <dcousens@users.noreply.github.com>
Date: Thu, 23 Jun 2016 12:44:53 +1000
Subject: [PATCH 0563/1802] remove unnecessary LOCK(cs_main)

---
 src/rpc/blockchain.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp
index 1bb365d36cdad..e63232b4805d9 100644
--- a/src/rpc/blockchain.cpp
+++ b/src/rpc/blockchain.cpp
@@ -289,8 +289,6 @@ UniValue getrawmempool(const UniValue& params, bool fHelp)
             + HelpExampleRpc("getrawmempool", "true")
         );
 
-    LOCK(cs_main);
-
     bool fVerbose = false;
     if (params.size() > 0)
         fVerbose = params[0].get_bool();

From a1c92c29fd1c242831867ede4c67e544377ae473 Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Thu, 23 Jun 2016 12:25:04 +0200
Subject: [PATCH 0564/1802] trivial: capitalize BIP32 in option help

For consistency, BIP32 should be in uppercase in translation message.

Reported by @pryds on Transifex.
---
 src/qt/bitcoinstrings.cpp   |  2 +-
 src/qt/locale/bitcoin_en.ts | 14 +++++++-------
 src/wallet/wallet.cpp       |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/qt/bitcoinstrings.cpp b/src/qt/bitcoinstrings.cpp
index ce8753fc7ddc6..83901732acf17 100644
--- a/src/qt/bitcoinstrings.cpp
+++ b/src/qt/bitcoinstrings.cpp
@@ -173,7 +173,7 @@ QT_TRANSLATE_NOOP("bitcoin-core", ""
 QT_TRANSLATE_NOOP("bitcoin-core", ""
 "Use UPnP to map the listening port (default: 1 when listening and no -proxy)"),
 QT_TRANSLATE_NOOP("bitcoin-core", ""
-"Use hierarchical deterministic key generation (HD) after bip32. Only has "
+"Use hierarchical deterministic key generation (HD) after BIP32. Only has "
 "effect during wallet creation/first start"),
 QT_TRANSLATE_NOOP("bitcoin-core", ""
 "Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: "
diff --git a/src/qt/locale/bitcoin_en.ts b/src/qt/locale/bitcoin_en.ts
index f122273a35216..4e4c9f45e6ccd 100644
--- a/src/qt/locale/bitcoin_en.ts
+++ b/src/qt/locale/bitcoin_en.ts
@@ -2417,12 +2417,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Use hierarchical deterministic key generation (HD) after bip32. Only has effect during wallet creation/first start</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
+        <location line="+12"/>
         <source>WARNING: abnormally high number of blocks generated, %d blocks received in the last %d hours (%d expected)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2852,7 +2847,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+50"/>
+        <location line="+18"/>
+        <source>Use hierarchical deterministic key generation (HD) after BIP32. Only has effect during wallet creation/first start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+32"/>
         <source>Whitelisted peers cannot be DoS banned and their transactions are always relayed, even if they are already in the mempool, useful e.g. for a gateway</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index 723b2eceff7b2..ba5f92a987991 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -3209,7 +3209,7 @@ std::string CWallet::GetWalletHelpString(bool showDebug)
         strUsage += HelpMessageOpt("-sendfreetransactions", strprintf(_("Send transactions as zero-fee transactions if possible (default: %u)"), DEFAULT_SEND_FREE_TRANSACTIONS));
     strUsage += HelpMessageOpt("-spendzeroconfchange", strprintf(_("Spend unconfirmed change when sending transactions (default: %u)"), DEFAULT_SPEND_ZEROCONF_CHANGE));
     strUsage += HelpMessageOpt("-txconfirmtarget=<n>", strprintf(_("If paytxfee is not set, include enough fee so transactions begin confirmation on average within n blocks (default: %u)"), DEFAULT_TX_CONFIRM_TARGET));
-    strUsage += HelpMessageOpt("-usehd", _("Use hierarchical deterministic key generation (HD) after bip32. Only has effect during wallet creation/first start") + " " + strprintf(_("(default: %u)"), DEFAULT_USE_HD_WALLET));
+    strUsage += HelpMessageOpt("-usehd", _("Use hierarchical deterministic key generation (HD) after BIP32. Only has effect during wallet creation/first start") + " " + strprintf(_("(default: %u)"), DEFAULT_USE_HD_WALLET));
     strUsage += HelpMessageOpt("-upgradewallet", _("Upgrade wallet to latest format on startup"));
     strUsage += HelpMessageOpt("-wallet=<file>", _("Specify wallet file (within data directory)") + " " + strprintf(_("(default: %s)"), DEFAULT_WALLET_DAT));
     strUsage += HelpMessageOpt("-walletbroadcast", _("Make the wallet broadcast transactions") + " " + strprintf(_("(default: %u)"), DEFAULT_WALLETBROADCAST));

From 133deb83dfedb09d1c5c477a01fb12665cbae16f Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Thu, 23 Jun 2016 15:44:35 +0200
Subject: [PATCH 0565/1802] Mark my dnsseed as supporting filtering

---
 src/chainparams.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/chainparams.cpp b/src/chainparams.cpp
index 6eb66c78e2b6f..d888aae0963da 100644
--- a/src/chainparams.cpp
+++ b/src/chainparams.cpp
@@ -109,7 +109,7 @@ class CMainParams : public CChainParams {
         assert(consensus.hashGenesisBlock == uint256S("0x000000000019d6689c085ae165831e934ff763ae46a2a6c172b3f1b60a8ce26f"));
         assert(genesis.hashMerkleRoot == uint256S("0x4a5e1e4baab89f3a32518a88c31bc87f618f76673e2cc77ab2127b7afdeda33b"));
 
-        vSeeds.push_back(CDNSSeedData("bitcoin.sipa.be", "seed.bitcoin.sipa.be")); // Pieter Wuille
+        vSeeds.push_back(CDNSSeedData("bitcoin.sipa.be", "seed.bitcoin.sipa.be", true)); // Pieter Wuille
         vSeeds.push_back(CDNSSeedData("bluematt.me", "dnsseed.bluematt.me")); // Matt Corallo
         vSeeds.push_back(CDNSSeedData("dashjr.org", "dnsseed.bitcoin.dashjr.org")); // Luke Dashjr
         vSeeds.push_back(CDNSSeedData("bitcoinstats.com", "seed.bitcoinstats.com")); // Christian Decker

From be1d451225cc6d1e4bfe08ac7e67ad0780450f04 Mon Sep 17 00:00:00 2001
From: Will Binns <binns@21.co>
Date: Sun, 19 Jun 2016 17:15:36 -0600
Subject: [PATCH 0566/1802] contributing.md: Fix formatting

This commit contains two changes to CONTRIBUTING.md that:

Fix line line lengths. There were several instances where line lengths
were well over 80 characters. This commit adjusts them to make them
conform to formatting best practices, to stay under 80 characters when
possible.

Adhere to consist use of quotes. There are a few instances where smart
quotes are used (perhaps because it was pasted from a word processor).
This commit replaces them with dumb quotes to keep it consistent with
the quotation formatting found in the rest of the document.
---
 CONTRIBUTING.md | 142 +++++++++++++++++++++++++++++++++++++-----------
 1 file changed, 109 insertions(+), 33 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 5c1138b812d47..62ebc7917aad4 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,15 +1,26 @@
 Contributing to Bitcoin Core
 ============================
 
-The Bitcoin Core project operates an open contributor model where anyone is welcome to contribute towards development in the form of peer review, testing and patches. This document explains the practical process and guidelines for contributing.
+The Bitcoin Core project operates an open contributor model where anyone is
+welcome to contribute towards development in the form of peer review, testing
+and patches. This document explains the practical process and guidelines for
+contributing.
 
-Firstly in terms of structure, there is no particular concept of “Core developers” in the sense of privileged people. Open source often naturally revolves around meritocracy where longer term contributors gain more trust from the developer community. However, some hierarchy is necessary for practical purposes. As such there are repository “maintainers” who are responsible for merging pull requests as well as a “lead maintainer” who is responsible for the release cycle, overall merging, moderation and appointment of maintainers.
+Firstly in terms of structure, there is no particular concept of "Core
+developers" in the sense of privileged people. Open source often naturally
+revolves around meritocracy where longer term contributors gain more trust from
+the developer community. However, some hierarchy is necessary for practical
+purposes. As such there are repository "maintainers" who are responsible for
+merging pull requests as well as a "lead maintainer" who is responsible for the
+release cycle, overall merging, moderation and appointment of maintainers.
 
 
 Contributor Workflow
 --------------------
 
-The codebase is maintained using the “contributor workflow” where everyone without exception contributes patch proposals using “pull requests”. This facilitates social contribution, easy testing and peer review.
+The codebase is maintained using the "contributor workflow" where everyone
+without exception contributes patch proposals using "pull requests". This
+facilitates social contribution, easy testing and peer review.
 
 To contribute a patch, the workflow is as follows:
 
@@ -17,35 +28,56 @@ To contribute a patch, the workflow is as follows:
   - Create topic branch
   - Commit patches
 
-The project coding conventions in the [developer notes](doc/developer-notes.md) must be adhered to.
+The project coding conventions in the [developer notes](doc/developer-notes.md)
+must be adhered to.
 
-In general [commits should be atomic](https://en.wikipedia.org/wiki/Atomic_commit#Atomic_commit_convention) and diffs should be easy to read. For this reason do not mix any formatting fixes or code moves with actual code changes.
+In general [commits should be atomic](https://en.wikipedia.org/wiki/Atomic_commit#Atomic_commit_convention)
+and diffs should be easy to read. For this reason do not mix any formatting
+fixes or code moves with actual code changes.
 
-Commit messages should be verbose by default consisting of a short subject line (50 chars max), a blank line and detailed explanatory text as separate paragraph(s); unless the title alone is self-explanatory (like "Corrected typo in main.cpp") then a single title line is sufficient. Commit messages should be helpful to people reading your code in the future, so explain the reasoning for your decisions. Further explanation [here](http://chris.beams.io/posts/git-commit/).
+Commit messages should be verbose by default consisting of a short subject line
+(50 chars max), a blank line and detailed explanatory text as separate
+paragraph(s); unless the title alone is self-explanatory (like "Corrected typo
+in main.cpp") then a single title line is sufficient. Commit messages should be
+helpful to people reading your code in the future, so explain the reasoning for
+your decisions. Further explanation [here](http://chris.beams.io/posts/git-commit/).
 
-If a particular commit references another issue, please add the reference, for example `refs #1234`, or `fixes #4321`. Using the `fixes` or `closes` keywords will cause the corresponding issue to be closed when the pull request is merged.
+If a particular commit references another issue, please add the reference, for
+example `refs #1234`, or `fixes #4321`. Using the `fixes` or `closes` keywords
+will cause the corresponding issue to be closed when the pull request is merged.
 
-Please refer to the [Git manual](https://git-scm.com/doc) for more information about Git.
+Please refer to the [Git manual](https://git-scm.com/doc) for more information
+about Git.
 
   - Push changes to your fork
   - Create pull request
 
-The title of the pull request should be prefixed by the component or area that the pull request affects. Examples:
+The title of the pull request should be prefixed by the component or area that
+the pull request affects. Examples:
 
     Consensus: Add new opcode for BIP-XXXX OP_CHECKAWESOMESIG
     Net: Automatically create hidden service, listen on Tor
     Qt: Add feed bump button
     Trivial: Fix typo in main.cpp
 
-If a pull request is specifically not to be considered for merging (yet) please prefix the title with [WIP] or use [Tasks Lists](https://help.github.com/articles/basic-writing-and-formatting-syntax/#task-lists) in the body of the pull request to indicate tasks are pending.
+If a pull request is specifically not to be considered for merging (yet) please
+prefix the title with [WIP] or use [Tasks Lists](https://help.github.com/articles/basic-writing-and-formatting-syntax/#task-lists)
+in the body of the pull request to indicate tasks are pending.
 
-The body of the pull request should contain enough description about what the patch does together with any justification/reasoning. You should include references to any discussions (for example other tickets or mailing list discussions).
+The body of the pull request should contain enough description about what the
+patch does together with any justification/reasoning. You should include
+references to any discussions (for example other tickets or mailing list
+discussions).
 
-At this stage one should expect comments and review from other contributors. You can add more commits to your pull request by committing them locally and pushing to your fork until you have satisfied all feedback.
+At this stage one should expect comments and review from other contributors. You
+can add more commits to your pull request by committing them locally and pushing
+to your fork until you have satisfied all feedback.
 
 Squashing Commits
 ---------------------------
-If your pull request is accepted for merging, you may be asked by a maintainer to squash and or [rebase](https://git-scm.com/docs/git-rebase) your commits before it will be merged. The basic squashing workflow is shown below.
+If your pull request is accepted for merging, you may be asked by a maintainer
+to squash and or [rebase](https://git-scm.com/docs/git-rebase) your commits
+before it will be merged. The basic squashing workflow is shown below.
 
     git checkout your_branch_name
     git rebase -i HEAD~n
@@ -55,67 +87,111 @@ If your pull request is accepted for merging, you may be asked by a maintainer t
     # save and quit
     git push -f # (force push to GitHub)
 
-The length of time required for peer review is unpredictable and will vary from pull request to pull request.
+The length of time required for peer review is unpredictable and will vary from
+pull request to pull request.
 
 
 Pull Request Philosophy
 -----------------------
 
-Patchsets should always be focused. For example, a pull request could add a feature, fix a bug, or refactor code; but not a mixture. Please also avoid super pull requests which attempt to do too much, are overly large, or overly complex as this makes review difficult.
+Patchsets should always be focused. For example, a pull request could add a
+feature, fix a bug, or refactor code; but not a mixture. Please also avoid super
+pull requests which attempt to do too much, are overly large, or overly complex
+as this makes review difficult.
 
 
 ###Features
 
-When adding a new feature, thought must be given to the long term technical debt and maintenance that feature may require after inclusion. Before proposing a new feature that will require maintenance, please consider if you are willing to maintain it (including bug fixing). If features get orphaned with no maintainer in the future, they may be removed by the Repository Maintainer.
+When adding a new feature, thought must be given to the long term technical debt
+and maintenance that feature may require after inclusion. Before proposing a new
+feature that will require maintenance, please consider if you are willing to
+maintain it (including bug fixing). If features get orphaned with no maintainer
+in the future, they may be removed by the Repository Maintainer.
 
 
 ###Refactoring
 
-Refactoring is a necessary part of any software project's evolution. The following guidelines cover refactoring pull requests for the project.
+Refactoring is a necessary part of any software project's evolution. The
+following guidelines cover refactoring pull requests for the project.
 
-There are three categories of refactoring, code only moves, code style fixes, code refactoring. In general refactoring pull requests should not mix these three kinds of activity in order to make refactoring pull requests easy to review and uncontroversial. In all cases, refactoring PRs must not change the behaviour of code within the pull request (bugs must be preserved as is).
+There are three categories of refactoring, code only moves, code style fixes,
+code refactoring. In general refactoring pull requests should not mix these
+three kinds of activity in order to make refactoring pull requests easy to
+review and uncontroversial. In all cases, refactoring PRs must not change the
+behaviour of code within the pull request (bugs must be preserved as is).
 
-Project maintainers aim for a quick turnaround on refactoring pull requests, so where possible keep them short, uncomplex and easy to verify.
+Project maintainers aim for a quick turnaround on refactoring pull requests, so
+where possible keep them short, uncomplex and easy to verify.
 
 
 "Decision Making" Process
 -------------------------
 
-The following applies to code changes to the Bitcoin Core project (and related projects such as libsecp256k1), and is not to be confused with overall Bitcoin Network Protocol consensus changes.
+The following applies to code changes to the Bitcoin Core project (and related
+projects such as libsecp256k1), and is not to be confused with overall Bitcoin
+Network Protocol consensus changes.
 
-Whether a pull request is merged into Bitcoin Core rests with the project merge maintainers and ultimately the project lead.
+Whether a pull request is merged into Bitcoin Core rests with the project merge
+maintainers and ultimately the project lead.
 
-Maintainers will take into consideration if a patch is in line with the general principles of the project; meets the minimum standards for inclusion; and will judge the general consensus of contributors.
+Maintainers will take into consideration if a patch is in line with the general
+principles of the project; meets the minimum standards for inclusion; and will
+judge the general consensus of contributors.
 
 In general, all pull requests must:
 
-  - have a clear use case, fix a demonstrable bug or serve the greater good of the project (for example refactoring for modularisation);
+  - have a clear use case, fix a demonstrable bug or serve the greater good of
+    the project (for example refactoring for modularisation);
   - be well peer reviewed;
   - have unit tests and functional tests where appropriate;
   - follow code style guidelines;
   - not break the existing test suite;
-  - where bugs are fixed, where possible, there should be unit tests demonstrating the bug and also proving the fix. This helps prevent regression.
+  - where bugs are fixed, where possible, there should be unit tests
+    demonstrating the bug and also proving the fix. This helps prevent regression.
 
-Patches that change Bitcoin consensus rules are considerably more involved than normal because they affect the entire ecosystem and so must be preceded by extensive mailing list discussions and have a numbered BIP. While each case will be different, one should be prepared to expend more time and effort than for other kinds of patches because of increased peer review and consensus building requirements.
+Patches that change Bitcoin consensus rules are considerably more involved than
+normal because they affect the entire ecosystem and so must be preceded by
+extensive mailing list discussions and have a numbered BIP. While each case will
+be different, one should be prepared to expend more time and effort than for
+other kinds of patches because of increased peer review and consensus building
+requirements.
 
 
 ###Peer Review
 
-Anyone may participate in peer review which is expressed by comments in the pull request. Typically reviewers will review the code for obvious errors, as well as test out the patch set and opine on the technical merits of the patch. Project maintainers take into account the peer review when determining if there is consensus to merge a pull request (remember that discussions may have been spread out over github, mailing list and IRC discussions). The following language is used within pull-request comments:
+Anyone may participate in peer review which is expressed by comments in the pull
+request. Typically reviewers will review the code for obvious errors, as well as
+test out the patch set and opine on the technical merits of the patch. Project
+maintainers take into account the peer review when determining if there is
+consensus to merge a pull request (remember that discussions may have been
+spread out over github, mailing list and IRC discussions). The following
+language is used within pull-request comments:
 
   - ACK means "I have tested the code and I agree it should be merged";
-  - NACK means "I disagree this should be merged", and must be accompanied by sound technical justification. NACKs without accompanying reasoning may be disregarded;
-  - utACK means "I have not tested the code, but I have reviewed it and it looks OK, I agree it can be merged";
+  - NACK means "I disagree this should be merged", and must be accompanied by
+    sound technical justification. NACKs without accompanying reasoning may be disregarded;
+  - utACK means "I have not tested the code, but I have reviewed it and it looks
+    OK, I agree it can be merged";
   - Concept ACK means "I agree in the general principle of this pull request";
   - Nit refers to trivial, often non-blocking issues.
 
 Reviewers should include the commit hash which they reviewed in their comments.
 
-Project maintainers reserve the right to weigh the opinions of peer reviewers using common sense judgement and also may weight based on meritocracy: Those that have demonstrated a deeper commitment and understanding towards the project (over time) or have clear domain expertise may naturally have more weight, as one would expect in all walks of life.
-
-Where a patch set affects consensus critical code, the bar will be set much higher in terms of discussion and peer review requirements, keeping in mind that mistakes could be very costly to the wider community. This includes refactoring of consensus critical code.
-
-Where a patch set proposes to change the Bitcoin consensus, it must have been discussed extensively on the mailing list and IRC, be accompanied by a widely discussed BIP and have a generally widely perceived technical consensus of being a worthwhile change based on the judgement of the maintainers.
+Project maintainers reserve the right to weigh the opinions of peer reviewers
+using common sense judgement and also may weight based on meritocracy: Those
+that have demonstrated a deeper commitment and understanding towards the project
+(over time) or have clear domain expertise may naturally have more weight, as
+one would expect in all walks of life.
+
+Where a patch set affects consensus critical code, the bar will be set much
+higher in terms of discussion and peer review requirements, keeping in mind that
+mistakes could be very costly to the wider community. This includes refactoring
+of consensus critical code.
+
+Where a patch set proposes to change the Bitcoin consensus, it must have been
+discussed extensively on the mailing list and IRC, be accompanied by a widely
+discussed BIP and have a generally widely perceived technical consensus of being
+a worthwhile change based on the judgement of the maintainers.
 
 
 Release Policy

From f70bcfc6c052bab8c7f78fae8aa69bbe64adaa94 Mon Sep 17 00:00:00 2001
From: fanquake <fanquake@gmail.com>
Date: Fri, 24 Jun 2016 15:01:45 +0800
Subject: [PATCH 0567/1802] [trivial] Add aarch64 to depends .gitignore

---
 depends/.gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/depends/.gitignore b/depends/.gitignore
index 1f163897b9ef7..3cb4b9ac15557 100644
--- a/depends/.gitignore
+++ b/depends/.gitignore
@@ -7,3 +7,4 @@ x86_64*
 i686*
 mips*
 arm*
+aarch64*

From d24148742e2e3df1011a65c1b4c5589609bab05e Mon Sep 17 00:00:00 2001
From: fanquake <fanquake@gmail.com>
Date: Fri, 24 Jun 2016 15:32:48 +0800
Subject: [PATCH 0568/1802] [doc] Add OS X ZMQ requirement to QA readme

---
 qa/README.md | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/qa/README.md b/qa/README.md
index 7489eb5130ac0..723660c6c857e 100644
--- a/qa/README.md
+++ b/qa/README.md
@@ -16,6 +16,12 @@ The python3-zmq library is required. On Ubuntu or Debian it can be installed via
 sudo apt-get install python3-zmq
 ```
 
+OS X
+------
+```
+pip3 install pyzmq
+```
+
 Running tests
 =============
 
@@ -36,7 +42,7 @@ Run all possible tests with
     qa/pull-tester/rpc-tests.py -extended
 
 By default, tests will be run in parallel if you want to specify how many
-tests should be run in parallel, append `-paralell=n` (default n=4).
+tests should be run in parallel, append `-parallel=n` (default n=4).
 
 If you want to create a basic coverage report for the rpc test suite, append `--coverage`.
 

From d7828abd5b08ae17a42a7b8efe3b546fe2d09f4b Mon Sep 17 00:00:00 2001
From: fsb4000 <fsb4000@yandex.ru>
Date: Fri, 24 Jun 2016 17:05:45 +0700
Subject: [PATCH 0569/1802] check that
 transactionView->selectionModel()->selectedRows(0) exists

---
 src/qt/transactionview.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/qt/transactionview.cpp b/src/qt/transactionview.cpp
index 199a7b2d77b1b..48cf94050297b 100644
--- a/src/qt/transactionview.cpp
+++ b/src/qt/transactionview.cpp
@@ -365,6 +365,8 @@ void TransactionView::contextualMenu(const QPoint &point)
 {
     QModelIndex index = transactionView->indexAt(point);
     QModelIndexList selection = transactionView->selectionModel()->selectedRows(0);
+    if (selection.empty())
+        return;
 
     // check if transaction can be abandoned, disable context menu action in case it doesn't
     uint256 hash;

From 1acf1db76fc3e07deb8f0f837934ea90383fedb5 Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Fri, 24 Jun 2016 16:35:21 +0200
Subject: [PATCH 0570/1802] Do not ask a UI question from bitcoind

---
 src/init.cpp          | 3 ++-
 src/noui.cpp          | 6 ++++++
 src/qt/bitcoingui.cpp | 2 ++
 src/ui_interface.h    | 3 +++
 4 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/init.cpp b/src/init.cpp
index b572bfc32720a..fe367c6a33315 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -1317,8 +1317,9 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
         if (!fLoaded) {
             // first suggest a reindex
             if (!fReset) {
-                bool fRet = uiInterface.ThreadSafeMessageBox(
+                bool fRet = uiInterface.ThreadSafeQuestion(
                     strLoadError + ".\n\n" + _("Do you want to rebuild the block database now?"),
+                    strLoadError + ".\nPlease restart with -reindex or -reindex-chainstate to recover.",
                     "", CClientUIInterface::MSG_ERROR | CClientUIInterface::BTN_ABORT);
                 if (fRet) {
                     fReindex = true;
diff --git a/src/noui.cpp b/src/noui.cpp
index 3a77361919e63..0d9207c11a319 100644
--- a/src/noui.cpp
+++ b/src/noui.cpp
@@ -39,6 +39,11 @@ static bool noui_ThreadSafeMessageBox(const std::string& message, const std::str
     return false;
 }
 
+static bool noui_ThreadSafeQuestion(const std::string& /* ignored interactive message */, const std::string& message, const std::string& caption, unsigned int style)
+{
+    return noui_ThreadSafeMessageBox(message, caption, style);
+}
+
 static void noui_InitMessage(const std::string& message)
 {
     LogPrintf("init message: %s\n", message);
@@ -48,5 +53,6 @@ void noui_connect()
 {
     // Connect bitcoind signal handlers
     uiInterface.ThreadSafeMessageBox.connect(noui_ThreadSafeMessageBox);
+    uiInterface.ThreadSafeQuestion.connect(noui_ThreadSafeQuestion);
     uiInterface.InitMessage.connect(noui_InitMessage);
 }
diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp
index 50c19c3848046..9042e3b56a3b8 100644
--- a/src/qt/bitcoingui.cpp
+++ b/src/qt/bitcoingui.cpp
@@ -1105,12 +1105,14 @@ void BitcoinGUI::subscribeToCoreSignals()
 {
     // Connect signals to client
     uiInterface.ThreadSafeMessageBox.connect(boost::bind(ThreadSafeMessageBox, this, _1, _2, _3));
+    uiInterface.ThreadSafeQuestion.connect(boost::bind(ThreadSafeMessageBox, this, _1, _3, _4));
 }
 
 void BitcoinGUI::unsubscribeFromCoreSignals()
 {
     // Disconnect signals from client
     uiInterface.ThreadSafeMessageBox.disconnect(boost::bind(ThreadSafeMessageBox, this, _1, _2, _3));
+    uiInterface.ThreadSafeQuestion.disconnect(boost::bind(ThreadSafeMessageBox, this, _1, _3, _4));
 }
 
 UnitDisplayStatusBarControl::UnitDisplayStatusBarControl(const PlatformStyle *platformStyle) :
diff --git a/src/ui_interface.h b/src/ui_interface.h
index 7ebfc17e5dd52..7e6557f8e21b0 100644
--- a/src/ui_interface.h
+++ b/src/ui_interface.h
@@ -76,6 +76,9 @@ class CClientUIInterface
     /** Show message box. */
     boost::signals2::signal<bool (const std::string& message, const std::string& caption, unsigned int style), boost::signals2::last_value<bool> > ThreadSafeMessageBox;
 
+    /** If possible, ask the user a question. If not, falls back to ThreadSafeMessageBox(noninteractive_message, caption, style) and returns false. */
+    boost::signals2::signal<bool (const std::string& message, const std::string& noninteractive_message, const std::string& caption, unsigned int style), boost::signals2::last_value<bool> > ThreadSafeQuestion;
+
     /** Progress message during initialization. */
     boost::signals2::signal<void (const std::string &message)> InitMessage;
 

From b0be3a0186114c8f566292fc9001debcbe79a663 Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Wed, 22 Jun 2016 16:29:00 +0200
Subject: [PATCH 0571/1802] doc: Mention Windows XP end of support in release
 notes

Closes #7681.
---
 doc/release-notes.md | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/doc/release-notes.md b/doc/release-notes.md
index df3c265dcdbd2..6e4f390cbcc75 100644
--- a/doc/release-notes.md
+++ b/doc/release-notes.md
@@ -16,6 +16,28 @@ To receive security and update notifications, please subscribe to:
 
   <https://bitcoincore.org/en/list/announcements/join/>
 
+Compatibility
+==============
+
+Microsoft ended support for Windows XP on [April 8th, 2014](https://www.microsoft.com/en-us/WindowsForBusiness/end-of-xp-support),
+an OS initially released in 2001. This means that not even critical security
+updates will be released anymore. Without security updates, using a bitcoin
+wallet on a XP machine is irresponsible at least.
+
+In addition to that, with 0.12.x there have been varied reports of Bitcoin Core
+randomly crashing on Windows XP. It is [not clear](https://github.com/bitcoin/bitcoin/issues/7681#issuecomment-217439891)
+what the source of these crashes is, but it is likely that upstream
+libraries such as Qt are no longer being tested on XP.
+
+We do not have time nor resources to provide support for an OS that is
+end-of-life. From 0.13.0 on, Windows XP is no longer supported. Users are
+suggested to upgrade to a newer verion of Windows, or install an alternative OS
+that is supported.
+
+No attempt is made to prevent installing or running the software on Windows XP,
+you can still do so at your own risk, but do not expect it to work: do not
+report issues about Windows XP to the issue tracker.
+
 Notable changes
 ===============
 

From 409f83322e9fe3257cf9f3f61813195ac1aaa20c Mon Sep 17 00:00:00 2001
From: jl2012 <jl2012@xbt.hk>
Date: Sat, 25 Jun 2016 00:55:07 +0800
Subject: [PATCH 0572/1802] RPC: Hide softfork if timeout is 0

---
 src/rpc/blockchain.cpp | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp
index 43ba4edd78c19..60462b9f87aaa 100644
--- a/src/rpc/blockchain.cpp
+++ b/src/rpc/blockchain.cpp
@@ -868,6 +868,15 @@ static UniValue BIP9SoftForkDesc(const Consensus::Params& consensusParams, Conse
     return rv;
 }
 
+void BIP9SoftForkDescPushBack(UniValue& bip9_softforks, const std::string &name, const Consensus::Params& consensusParams, Consensus::DeploymentPos id)
+{
+    // Deployments with timeout value of 0 are hidden.
+    // A timeout value of 0 guarantees a softfork will never be activated.
+    // This is used when softfork codes are merged without specifying the deployment schedule.
+    if (consensusParams.vDeployments[id].nTimeout > 0)
+        bip9_softforks.push_back(Pair(name, BIP9SoftForkDesc(consensusParams, id)));
+}
+
 UniValue getblockchaininfo(const UniValue& params, bool fHelp)
 {
     if (fHelp || params.size() != 0)
@@ -901,7 +910,7 @@ UniValue getblockchaininfo(const UniValue& params, bool fHelp)
             "  ],\n"
             "  \"bip9_softforks\": {          (object) status of BIP9 softforks in progress\n"
             "     \"xxxx\" : {                (string) name of the softfork\n"
-            "        \"status\": \"xxxx\",    (string) one of \"defined\", \"started\", \"lockedin\", \"active\", \"failed\"\n"
+            "        \"status\": \"xxxx\",    (string) one of \"defined\", \"started\", \"locked_in\", \"active\", \"failed\"\n"
             "        \"bit\": xx,             (numeric) the bit, 0-28, in the block version field used to signal this soft fork\n"
             "        \"startTime\": xx,       (numeric) the minimum median time past of a block at which the bit gains its meaning\n"
             "        \"timeout\": xx          (numeric) the median time past of a block at which the deployment is considered failed if not yet locked in\n"
@@ -933,8 +942,8 @@ UniValue getblockchaininfo(const UniValue& params, bool fHelp)
     softforks.push_back(SoftForkDesc("bip34", 2, tip, consensusParams));
     softforks.push_back(SoftForkDesc("bip66", 3, tip, consensusParams));
     softforks.push_back(SoftForkDesc("bip65", 4, tip, consensusParams));
-    bip9_softforks.push_back(Pair("csv", BIP9SoftForkDesc(consensusParams, Consensus::DEPLOYMENT_CSV)));
-    bip9_softforks.push_back(Pair("segwit", BIP9SoftForkDesc(consensusParams, Consensus::DEPLOYMENT_SEGWIT)));
+    BIP9SoftForkDescPushBack(bip9_softforks, "csv", consensusParams, Consensus::DEPLOYMENT_CSV);
+    BIP9SoftForkDescPushBack(bip9_softforks, "segwit", consensusParams, Consensus::DEPLOYMENT_SEGWIT);
     obj.push_back(Pair("softforks",             softforks));
     obj.push_back(Pair("bip9_softforks", bip9_softforks));
 

From 873e81f89b3197580aca3dd4a591d00e41696a89 Mon Sep 17 00:00:00 2001
From: Matthew King <chohag@jtan.com>
Date: Sun, 26 Jun 2016 16:47:03 +0300
Subject: [PATCH 0573/1802] Use portable #! in python scripts (/usr/bin/env)

---
 contrib/devtools/security-check.py      | 2 +-
 contrib/devtools/symbol-check.py        | 2 +-
 contrib/devtools/test-security-check.py | 2 +-
 contrib/devtools/update-translations.py | 2 +-
 contrib/linearize/linearize-data.py     | 2 +-
 contrib/linearize/linearize-hashes.py   | 2 +-
 contrib/seeds/generate-seeds.py         | 2 +-
 share/qt/extract_strings_qt.py          | 2 +-
 src/test/bitcoin-util-test.py           | 2 +-
 src/test/buildenv.py.in                 | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/contrib/devtools/security-check.py b/contrib/devtools/security-check.py
index 301fea85c1f6f..24e44cf5d8628 100755
--- a/contrib/devtools/security-check.py
+++ b/contrib/devtools/security-check.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python2
+#!/usr/bin/env python2
 '''
 Perform basic ELF security checks on a series of executables.
 Exit status will be 0 if successful, and the program will be silent.
diff --git a/contrib/devtools/symbol-check.py b/contrib/devtools/symbol-check.py
index e26c0fbb94455..8c064a1822b00 100755
--- a/contrib/devtools/symbol-check.py
+++ b/contrib/devtools/symbol-check.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python2
+#!/usr/bin/env python2
 # Copyright (c) 2014 Wladimir J. van der Laan
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
diff --git a/contrib/devtools/test-security-check.py b/contrib/devtools/test-security-check.py
index fed7626aabaaf..324b7bcd85ae3 100755
--- a/contrib/devtools/test-security-check.py
+++ b/contrib/devtools/test-security-check.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python2
+#!/usr/bin/env python2
 '''
 Test script for security-check.py
 '''
diff --git a/contrib/devtools/update-translations.py b/contrib/devtools/update-translations.py
index 2b6e807b4718c..78b9f9d179eb6 100755
--- a/contrib/devtools/update-translations.py
+++ b/contrib/devtools/update-translations.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 # Copyright (c) 2014 Wladimir J. van der Laan
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
diff --git a/contrib/linearize/linearize-data.py b/contrib/linearize/linearize-data.py
index 0f6fde2a6e052..8badb4b318b01 100755
--- a/contrib/linearize/linearize-data.py
+++ b/contrib/linearize/linearize-data.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 #
 # linearize-data.py: Construct a linear, no-fork version of the chain.
 #
diff --git a/contrib/linearize/linearize-hashes.py b/contrib/linearize/linearize-hashes.py
index 854cf1f9eeb3d..cb40c664fafde 100755
--- a/contrib/linearize/linearize-hashes.py
+++ b/contrib/linearize/linearize-hashes.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 #
 # linearize-hashes.py:  List blocks in a linear, no-fork version of the chain.
 #
diff --git a/contrib/seeds/generate-seeds.py b/contrib/seeds/generate-seeds.py
index a3d035218789b..f43dc0b218adb 100755
--- a/contrib/seeds/generate-seeds.py
+++ b/contrib/seeds/generate-seeds.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 # Copyright (c) 2014 Wladimir J. van der Laan
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
diff --git a/share/qt/extract_strings_qt.py b/share/qt/extract_strings_qt.py
index 2ba8bb9b3acb7..9624abf1fcdd3 100755
--- a/share/qt/extract_strings_qt.py
+++ b/share/qt/extract_strings_qt.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 '''
 Extract _("...") strings for translation and convert to Qt stringdefs so that
 they can be picked up by Qt linguist.
diff --git a/src/test/bitcoin-util-test.py b/src/test/bitcoin-util-test.py
index 95dd3e81b4369..882b5c67b862d 100755
--- a/src/test/bitcoin-util-test.py
+++ b/src/test/bitcoin-util-test.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 # Copyright 2014 BitPay, Inc.
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
diff --git a/src/test/buildenv.py.in b/src/test/buildenv.py.in
index 1618bdeb764b8..153f34a3dbc71 100644
--- a/src/test/buildenv.py.in
+++ b/src/test/buildenv.py.in
@@ -1,2 +1,2 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 exeext="@EXEEXT@"

From 252675efc69ec0638d96a69fbc349a612cd1e2b7 Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Sun, 26 Jun 2016 20:19:00 +0200
Subject: [PATCH 0574/1802] Do not send witnesses in cmpctblock

---
 src/main.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main.cpp b/src/main.cpp
index 6cdd55e3979df..0bc90ab4a7224 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -6538,7 +6538,7 @@ bool SendMessages(CNode* pto)
                     CBlock block;
                     assert(ReadBlockFromDisk(block, pBestIndex, consensusParams));
                     CBlockHeaderAndShortTxIDs cmpctblock(block);
-                    pto->PushMessage(NetMsgType::CMPCTBLOCK, cmpctblock);
+                    pto->PushMessageWithFlag(SERIALIZE_TRANSACTION_NO_WITNESS, NetMsgType::CMPCTBLOCK, cmpctblock);
                     state.pindexBestHeaderSent = pBestIndex;
                 } else if (state.fPreferHeaders) {
                     if (vHeaders.size() > 1) {

From f15c2cde455174c7c899833fd5792460ed49a472 Mon Sep 17 00:00:00 2001
From: Suhas Daftuar <sdaftuar@gmail.com>
Date: Mon, 27 Jun 2016 10:58:58 -0400
Subject: [PATCH 0575/1802] CreateNewBlock: add support for size-accounting to
 addPackageTxs

Includes a change to not continue to use size-accounting in addScoreTxs
or addPackageTxs just because addPriorityTxs() is used.
---
 src/miner.cpp | 25 +++++++++++++++----------
 src/miner.h   |  2 +-
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/src/miner.cpp b/src/miner.cpp
index cfc2dae56ee49..a3e29431d7552 100644
--- a/src/miner.cpp
+++ b/src/miner.cpp
@@ -94,6 +94,7 @@ BlockAssembler::BlockAssembler(const CChainParams& _chainparams)
             nBlockMaxCost = nBlockMaxSize * WITNESS_SCALE_FACTOR;
         }
     }
+
     // Limit cost to between 4K and MAX_BLOCK_COST-4K for sanity:
     nBlockMaxCost = std::max((unsigned int)4000, std::min((unsigned int)(MAX_BLOCK_COST-4000), nBlockMaxCost));
     // Limit size to between 1K and MAX_BLOCK_SERIALIZED_SIZE-1K for sanity:
@@ -167,13 +168,7 @@ CBlockTemplate* BlockAssembler::CreateNewBlock(const CScript& scriptPubKeyIn)
     fIncludeWitness = IsWitnessEnabled(pindexPrev, chainparams.GetConsensus());
 
     addPriorityTxs();
-    if (fNeedSizeAccounting) {
-        // addPackageTxs (the CPFP-based algorithm) cannot deal with size based
-        // accounting, so fall back to the old algorithm.
-        addScoreTxs();
-    } else {
-        addPackageTxs();
-    }
+    addPackageTxs();
 
     nLastBlockTx = nBlockTx;
     nLastBlockSize = nBlockSize;
@@ -243,11 +238,19 @@ bool BlockAssembler::TestPackage(uint64_t packageSize, int64_t packageSigOpsCost
 
 // Block size and sigops have already been tested.  Check that all transactions
 // are final.
-bool BlockAssembler::TestPackageFinality(const CTxMemPool::setEntries& package)
+bool BlockAssembler::TestPackageFinalityAndSerializedSize(const CTxMemPool::setEntries& package)
 {
+    uint64_t nPotentialBlockSize = nBlockSize; // only used with fNeedSizeAccounting
     BOOST_FOREACH (const CTxMemPool::txiter it, package) {
         if (!IsFinalTx(it->GetTx(), nHeight, nLockTimeCutoff))
             return false;
+        if (fNeedSizeAccounting) {
+            uint64_t nTxSize = ::GetSerializeSize(it->GetTx(), SER_NETWORK, PROTOCOL_VERSION);
+            if (nPotentialBlockSize + nTxSize >= nBlockMaxSize) {
+                return false;
+            }
+            nPotentialBlockSize += nTxSize;
+        }
     }
     return true;
 }
@@ -539,7 +542,7 @@ void BlockAssembler::addPackageTxs()
         ancestors.insert(iter);
 
         // Test if all tx's are Final
-        if (!TestPackageFinality(ancestors)) {
+        if (!TestPackageFinalityAndSerializedSize(ancestors)) {
             if (fUsingModified) {
                 mapModifiedTx.get<ancestor_score>().erase(modit);
                 failedTx.insert(iter);
@@ -573,6 +576,7 @@ void BlockAssembler::addPriorityTxs()
         return;
     }
 
+    bool fSizeAccounting = fNeedSizeAccounting;
     fNeedSizeAccounting = true;
 
     // This vector will be sorted into a priority queue:
@@ -624,7 +628,7 @@ void BlockAssembler::addPriorityTxs()
             // If now that this txs is added we've surpassed our desired priority size
             // or have dropped below the AllowFreeThreshold, then we're done adding priority txs
             if (nBlockSize >= nBlockPrioritySize || !AllowFree(actualPriority)) {
-                return;
+                break;
             }
 
             // This tx was successfully added, so
@@ -640,6 +644,7 @@ void BlockAssembler::addPriorityTxs()
             }
         }
     }
+    fNeedSizeAccounting = fSizeAccounting;
 }
 
 void IncrementExtraNonce(CBlock* pblock, const CBlockIndex* pindexPrev, unsigned int& nExtraNonce)
diff --git a/src/miner.h b/src/miner.h
index b303a8fa3ceb7..bc4da63da074f 100644
--- a/src/miner.h
+++ b/src/miner.h
@@ -193,7 +193,7 @@ class BlockAssembler
     /** Test if a new package would "fit" in the block */
     bool TestPackage(uint64_t packageSize, int64_t packageSigOpsCost);
     /** Test if a set of transactions are all final */
-    bool TestPackageFinality(const CTxMemPool::setEntries& package);
+    bool TestPackageFinalityAndSerializedSize(const CTxMemPool::setEntries& package);
     /** Return true if given transaction from mapTx has already been evaluated,
       * or if the transaction's cached data in mapTx is incorrect. */
     bool SkipMapTxEntry(CTxMemPool::txiter it, indexed_modified_transaction_set &mapModifiedTx, CTxMemPool::setEntries &failedTx);

From 695041e4952ea40e02e3b0431d04ca6af7ec9711 Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Mon, 27 Jun 2016 17:06:47 +0200
Subject: [PATCH 0576/1802] util: Update tinyformat

Updates `tinyformat.h` to commit
https://github.com/c42f/tinyformat/commit/3a33bbf65442432277eee079e83d3e8fac51730c upstream.

Makes sure that our local changes are kept:

- #3767 1b8fd35aadfad6a1e55391f02add6076c8c9ea8f Make tinyformat errors raise an exception instead of assert()ing
- #4735 9b6d4c5cdc1ad7b12b8b7ba05125dad9ba2d396e Move strprintf define to tinyformat.h
- #4748 6e5fd003e04b81115b6b164b21f048472d575535 include stdexcept (for std::exception)
- #8000 9eaa0afa6ec5d3dd01e4d01121314ef51f2bc305 force USE_VARIADIC_TEMPLATES
- Add `std::string format(const std::string &fmt...` added this
  at the time, as we want to be able to do `strprintf(_(...), ...)`

Inspired by #8264.
---
 src/tinyformat.h | 700 +++++++++++++++++++++++++----------------------
 1 file changed, 368 insertions(+), 332 deletions(-)

diff --git a/src/tinyformat.h b/src/tinyformat.h
index c6ec0419b3943..17f0360c42f24 100644
--- a/src/tinyformat.h
+++ b/src/tinyformat.h
@@ -67,7 +67,9 @@
 //                                  weekday, month, day, hour, min);
 //   std::cout << date;
 //
-// These are the three primary interface functions.
+// These are the three primary interface functions.  There is also a
+// convenience function printfln() which appends a newline to the usual result
+// of printf() for super simple logging.
 //
 //
 // User defined format functions
@@ -86,6 +88,18 @@
 // defined function bodies, use the macro TINYFORMAT_FOREACH_ARGNUM.  For an
 // example, see the implementation of printf() at the end of the source file.
 //
+// Sometimes it's useful to be able to pass a list of format arguments through
+// to a non-template function.  The FormatList class is provided as a way to do
+// this by storing the argument list in a type-opaque way.  Continuing the
+// example from above, we construct a FormatList using makeFormatList():
+//
+//   FormatListRef formatList = tfm::makeFormatList(weekday, month, day, hour, min);
+//
+// The format list can now be passed into any non-template function and used
+// via a call to the vformat() function:
+//
+//   tfm::vformat(std::cout, "%s, %s %d, %.2d:%.2d\n", formatList);
+//
 //
 // Additional API information
 // --------------------------
@@ -118,6 +132,7 @@ namespace tfm = tinyformat;
 
 //------------------------------------------------------------------------------
 // Implementation details.
+#include <algorithm>
 #include <cassert>
 #include <iostream>
 #include <sstream>
@@ -133,20 +148,20 @@ namespace tfm = tinyformat;
 #   endif
 #endif
 
-#ifdef __GNUC__
-#   define TINYFORMAT_NOINLINE __attribute__((noinline))
-#elif defined(_MSC_VER)
-#   define TINYFORMAT_NOINLINE __declspec(noinline)
-#else
-#   define TINYFORMAT_NOINLINE
-#endif
-
 #if defined(__GLIBCXX__) && __GLIBCXX__ < 20080201
 //  std::showpos is broken on old libstdc++ as provided with OSX.  See
 //  http://gcc.gnu.org/ml/libstdc++/2007-11/msg00075.html
 #   define TINYFORMAT_OLD_LIBSTDCPLUSPLUS_WORKAROUND
 #endif
 
+#ifdef __APPLE__
+// Workaround OSX linker warning: xcode uses different default symbol
+// visibilities for static libs vs executables (see issue #25)
+#   define TINYFORMAT_HIDDEN __attribute__((visibility("hidden")))
+#else
+#   define TINYFORMAT_HIDDEN
+#endif
+
 namespace tinyformat {
 
 //------------------------------------------------------------------------------
@@ -247,6 +262,29 @@ struct convertToInt<T,true>
     static int invoke(const T& value) { return static_cast<int>(value); }
 };
 
+// Format at most ntrunc characters to the given stream.
+template<typename T>
+inline void formatTruncated(std::ostream& out, const T& value, int ntrunc)
+{
+    std::ostringstream tmp;
+    tmp << value;
+    std::string result = tmp.str();
+    out.write(result.c_str(), (std::min)(ntrunc, static_cast<int>(result.size())));
+}
+#define TINYFORMAT_DEFINE_FORMAT_TRUNCATED_CSTR(type)       \
+inline void formatTruncated(std::ostream& out, type* value, int ntrunc) \
+{                                                           \
+    std::streamsize len = 0;                                \
+    while(len < ntrunc && value[len] != 0)                  \
+        ++len;                                              \
+    out.write(value, len);                                  \
+}
+// Overload for const char* and char*.  Could overload for signed & unsigned
+// char too, but these are technically unneeded for printf compatibility.
+TINYFORMAT_DEFINE_FORMAT_TRUNCATED_CSTR(const char)
+TINYFORMAT_DEFINE_FORMAT_TRUNCATED_CSTR(char)
+#undef TINYFORMAT_DEFINE_FORMAT_TRUNCATED_CSTR
+
 } // namespace detail
 
 
@@ -255,18 +293,20 @@ struct convertToInt<T,true>
 // desired.
 
 
-// Format a value into a stream. Called from format() for all types by default.
-//
-// Users may override this for their own types.  When this function is called,
-// the stream flags will have been modified according to the format string.
-// The format specification is provided in the range [fmtBegin, fmtEnd).
-//
-// By default, formatValue() uses the usual stream insertion operator
-// operator<< to format the type T, with special cases for the %c and %p
-// conversions.
+/// Format a value into a stream, delegating to operator<< by default.
+///
+/// Users may override this for their own types.  When this function is called,
+/// the stream flags will have been modified according to the format string.
+/// The format specification is provided in the range [fmtBegin, fmtEnd).  For
+/// truncating conversions, ntrunc is set to the desired maximum number of
+/// characters, for example "%.7s" calls formatValue with ntrunc = 7.
+///
+/// By default, formatValue() uses the usual stream insertion operator
+/// operator<< to format the type T, with special cases for the %c and %p
+/// conversions.
 template<typename T>
 inline void formatValue(std::ostream& out, const char* /*fmtBegin*/,
-                        const char* fmtEnd, const T& value)
+                        const char* fmtEnd, int ntrunc, const T& value)
 {
 #ifndef TINYFORMAT_ALLOW_WCHAR_STRINGS
     // Since we don't support printing of wchar_t using "%ls", make it fail at
@@ -288,6 +328,12 @@ inline void formatValue(std::ostream& out, const char* /*fmtBegin*/,
 #ifdef TINYFORMAT_OLD_LIBSTDCPLUSPLUS_WORKAROUND
     else if(detail::formatZeroIntegerWorkaround<T>::invoke(out, value)) /**/;
 #endif
+    else if(ntrunc >= 0)
+    {
+        // Take care not to overread C strings in truncating conversions like
+        // "%.4s" where at most 4 characters may be read.
+        detail::formatTruncated(out, value, ntrunc);
+    }
     else
         out << value;
 }
@@ -296,7 +342,7 @@ inline void formatValue(std::ostream& out, const char* /*fmtBegin*/,
 // Overloaded version for char types to support printing as an integer
 #define TINYFORMAT_DEFINE_FORMATVALUE_CHAR(charType)                  \
 inline void formatValue(std::ostream& out, const char* /*fmtBegin*/,  \
-                        const char* fmtEnd, charType value)           \
+                        const char* fmtEnd, int /**/, charType value) \
 {                                                                     \
     switch(*(fmtEnd-1))                                               \
     {                                                                 \
@@ -435,225 +481,91 @@ cog.outl('#define TINYFORMAT_FOREACH_ARGNUM(m) \\\n    ' +
 
 namespace detail {
 
-// Class holding current position in format string and an output stream into
-// which arguments are formatted.
-class FormatIterator
+// Type-opaque holder for an argument to format(), with associated actions on
+// the type held as explicit function pointers.  This allows FormatArg's for
+// each argument to be allocated as a homogenous array inside FormatList
+// whereas a naive implementation based on inheritance does not.
+class FormatArg
 {
     public:
-        // Flags for features not representable with standard stream state
-        enum ExtraFormatFlags
-        {
-            Flag_None                = 0,
-            Flag_TruncateToPrecision = 1<<0, // truncate length to stream precision()
-            Flag_SpacePadPositive    = 1<<1, // pad positive values with spaces
-            Flag_VariableWidth       = 1<<2, // variable field width in arg list
-            Flag_VariablePrecision   = 1<<3  // variable field precision in arg list
-        };
-
-        // out is the output stream, fmt is the full format string
-        FormatIterator(std::ostream& out, const char* fmt)
-            : m_out(out),
-            m_fmt(fmt),
-            m_extraFlags(Flag_None),
-            m_wantWidth(false),
-            m_wantPrecision(false),
-            m_variableWidth(0),
-            m_variablePrecision(0),
-            m_origWidth(out.width()),
-            m_origPrecision(out.precision()),
-            m_origFlags(out.flags()),
-            m_origFill(out.fill())
+        FormatArg() {}
+
+        template<typename T>
+        FormatArg(const T& value)
+            : m_value(static_cast<const void*>(&value)),
+            m_formatImpl(&formatImpl<T>),
+            m_toIntImpl(&toIntImpl<T>)
         { }
 
-        // Print remaining part of format string.
-        void finish()
+        void format(std::ostream& out, const char* fmtBegin,
+                    const char* fmtEnd, int ntrunc) const
         {
-            // It would be nice if we could do this from the destructor, but we
-            // can't if TINFORMAT_ERROR is used to throw an exception!
-            m_fmt = printFormatStringLiteral(m_out, m_fmt);
-            if(*m_fmt != '\0')
-                TINYFORMAT_ERROR("tinyformat: Too many conversion specifiers in format string");
+            m_formatImpl(out, fmtBegin, fmtEnd, ntrunc, m_value);
         }
 
-        ~FormatIterator()
+        int toInt() const
         {
-            // Restore stream state
-            m_out.width(m_origWidth);
-            m_out.precision(m_origPrecision);
-            m_out.flags(m_origFlags);
-            m_out.fill(m_origFill);
+            return m_toIntImpl(m_value);
         }
 
-        template<typename T>
-        void accept(const T& value);
-
     private:
-        // Parse and return an integer from the string c, as atoi()
-        // On return, c is set to one past the end of the integer.
-        static int parseIntAndAdvance(const char*& c)
+        template<typename T>
+        TINYFORMAT_HIDDEN static void formatImpl(std::ostream& out, const char* fmtBegin,
+                        const char* fmtEnd, int ntrunc, const void* value)
         {
-            int i = 0;
-            for(;*c >= '0' && *c <= '9'; ++c)
-                i = 10*i + (*c - '0');
-            return i;
+            formatValue(out, fmtBegin, fmtEnd, ntrunc, *static_cast<const T*>(value));
         }
 
-        // Format at most truncLen characters of a C string to the given
-        // stream.  Return true if formatting proceeded (generic version always
-        // returns false)
         template<typename T>
-        static bool formatCStringTruncate(std::ostream& /*out*/, const T& /*value*/,
-                                        std::streamsize /*truncLen*/)
+        TINYFORMAT_HIDDEN static int toIntImpl(const void* value)
         {
-            return false;
-        }
-#       define TINYFORMAT_DEFINE_FORMAT_C_STRING_TRUNCATE(type)            \
-        static bool formatCStringTruncate(std::ostream& out, type* value,  \
-                                        std::streamsize truncLen)          \
-        {                                                                  \
-            std::streamsize len = 0;                                       \
-            while(len < truncLen && value[len] != 0)                       \
-                ++len;                                                     \
-            out.write(value, len);                                         \
-            return true;                                                   \
-        }
-        // Overload for const char* and char*.  Could overload for signed &
-        // unsigned char too, but these are technically unneeded for printf
-        // compatibility.
-        TINYFORMAT_DEFINE_FORMAT_C_STRING_TRUNCATE(const char)
-        TINYFORMAT_DEFINE_FORMAT_C_STRING_TRUNCATE(char)
-#       undef TINYFORMAT_DEFINE_FORMAT_C_STRING_TRUNCATE
-
-        // Print literal part of format string and return next format spec
-        // position.
-        //
-        // Skips over any occurrences of '%%', printing a literal '%' to the
-        // output.  The position of the first % character of the next
-        // nontrivial format spec is returned, or the end of string.
-        static const char* printFormatStringLiteral(std::ostream& out,
-                                                    const char* fmt)
-        {
-            const char* c = fmt;
-            for(; true; ++c)
-            {
-                switch(*c)
-                {
-                    case '\0':
-                        out.write(fmt, static_cast<std::streamsize>(c - fmt));
-                        return c;
-                    case '%':
-                        out.write(fmt, static_cast<std::streamsize>(c - fmt));
-                        if(*(c+1) != '%')
-                            return c;
-                        // for "%%", tack trailing % onto next literal section.
-                        fmt = ++c;
-                        break;
-                }
-            }
+            return convertToInt<T>::invoke(*static_cast<const T*>(value));
         }
 
-        static const char* streamStateFromFormat(std::ostream& out,
-                                                 unsigned int& extraFlags,
-                                                 const char* fmtStart,
-                                                 int variableWidth,
-                                                 int variablePrecision);
-
-        // Private copy & assign: Kill gcc warnings with -Weffc++
-        FormatIterator(const FormatIterator&);
-        FormatIterator& operator=(const FormatIterator&);
-
-        // Stream, current format string & state
-        std::ostream& m_out;
-        const char* m_fmt;
-        unsigned int m_extraFlags;
-        // State machine info for handling of variable width & precision
-        bool m_wantWidth;
-        bool m_wantPrecision;
-        int m_variableWidth;
-        int m_variablePrecision;
-        // Saved stream state
-        std::streamsize m_origWidth;
-        std::streamsize m_origPrecision;
-        std::ios::fmtflags m_origFlags;
-        char m_origFill;
+        const void* m_value;
+        void (*m_formatImpl)(std::ostream& out, const char* fmtBegin,
+                             const char* fmtEnd, int ntrunc, const void* value);
+        int (*m_toIntImpl)(const void* value);
 };
 
 
-// Accept a value for formatting into the internal stream.
-template<typename T>
-TINYFORMAT_NOINLINE  // < greatly reduces bloat in optimized builds
-void FormatIterator::accept(const T& value)
+// Parse and return an integer from the string c, as atoi()
+// On return, c is set to one past the end of the integer.
+inline int parseIntAndAdvance(const char*& c)
 {
-    // Parse the format string
-    const char* fmtEnd = 0;
-    if(m_extraFlags == Flag_None && !m_wantWidth && !m_wantPrecision)
-    {
-        m_fmt = printFormatStringLiteral(m_out, m_fmt);
-        fmtEnd = streamStateFromFormat(m_out, m_extraFlags, m_fmt, 0, 0);
-        m_wantWidth     = (m_extraFlags & Flag_VariableWidth) != 0;
-        m_wantPrecision = (m_extraFlags & Flag_VariablePrecision) != 0;
-    }
-    // Consume value as variable width and precision specifier if necessary
-    if(m_extraFlags & (Flag_VariableWidth | Flag_VariablePrecision))
-    {
-        if(m_wantWidth || m_wantPrecision)
-        {
-            int v = convertToInt<T>::invoke(value);
-            if(m_wantWidth)
-            {
-                m_variableWidth = v;
-                m_wantWidth = false;
-            }
-            else if(m_wantPrecision)
-            {
-                m_variablePrecision = v;
-                m_wantPrecision = false;
-            }
-            return;
-        }
-        // If we get here, we've set both the variable precision and width as
-        // required and we need to rerun the stream state setup to insert these.
-        fmtEnd = streamStateFromFormat(m_out, m_extraFlags, m_fmt,
-                                       m_variableWidth, m_variablePrecision);
-    }
+    int i = 0;
+    for(;*c >= '0' && *c <= '9'; ++c)
+        i = 10*i + (*c - '0');
+    return i;
+}
 
-    // Format the value into the stream.
-    if(!(m_extraFlags & (Flag_SpacePadPositive | Flag_TruncateToPrecision)))
-        formatValue(m_out, m_fmt, fmtEnd, value);
-    else
+// Print literal part of format string and return next format spec
+// position.
+//
+// Skips over any occurrences of '%%', printing a literal '%' to the
+// output.  The position of the first % character of the next
+// nontrivial format spec is returned, or the end of string.
+inline const char* printFormatStringLiteral(std::ostream& out, const char* fmt)
+{
+    const char* c = fmt;
+    for(;; ++c)
     {
-        // The following are special cases where there's no direct
-        // correspondence between stream formatting and the printf() behaviour.
-        // Instead, we simulate the behaviour crudely by formatting into a
-        // temporary string stream and munging the resulting string.
-        std::ostringstream tmpStream;
-        tmpStream.copyfmt(m_out);
-        if(m_extraFlags & Flag_SpacePadPositive)
-            tmpStream.setf(std::ios::showpos);
-        // formatCStringTruncate is required for truncating conversions like
-        // "%.4s" where at most 4 characters of the c-string should be read.
-        // If we didn't include this special case, we might read off the end.
-        if(!( (m_extraFlags & Flag_TruncateToPrecision) &&
-             formatCStringTruncate(tmpStream, value, m_out.precision()) ))
-        {
-            // Not a truncated c-string; just format normally.
-            formatValue(tmpStream, m_fmt, fmtEnd, value);
-        }
-        std::string result = tmpStream.str(); // allocates... yuck.
-        if(m_extraFlags & Flag_SpacePadPositive)
+        switch(*c)
         {
-            for(size_t i = 0, iend = result.size(); i < iend; ++i)
-                if(result[i] == '+')
-                    result[i] = ' ';
+            case '\0':
+                out.write(fmt, c - fmt);
+                return c;
+            case '%':
+                out.write(fmt, c - fmt);
+                if(*(c+1) != '%')
+                    return c;
+                // for "%%", tack trailing % onto next literal section.
+                fmt = ++c;
+                break;
+            default:
+                break;
         }
-        if((m_extraFlags & Flag_TruncateToPrecision) &&
-           (int)result.size() > (int)m_out.precision())
-            m_out.write(result.c_str(), m_out.precision());
-        else
-            m_out << result;
     }
-    m_extraFlags = Flag_None;
-    m_fmt = fmtEnd;
 }
 
 
@@ -663,13 +575,14 @@ void FormatIterator::accept(const T& value)
 // with the form "%[flags][width][.precision][length]type".
 //
 // Formatting options which can't be natively represented using the ostream
-// state are returned in the extraFlags parameter which is a bitwise
-// combination of values from the ExtraFormatFlags enum.
-inline const char* FormatIterator::streamStateFromFormat(std::ostream& out,
-                                                         unsigned int& extraFlags,
-                                                         const char* fmtStart,
-                                                         int variableWidth,
-                                                         int variablePrecision)
+// state are returned in spacePadPositive (for space padded positive numbers)
+// and ntrunc (for truncating conversions).  argIndex is incremented if
+// necessary to pull out variable width and precision .  The function returns a
+// pointer to the character after the end of the current format spec.
+inline const char* streamStateFromFormat(std::ostream& out, bool& spacePadPositive,
+                                         int& ntrunc, const char* fmtStart,
+                                         const detail::FormatArg* formatters,
+                                         int& argIndex, int numFormatters)
 {
     if(*fmtStart != '%')
     {
@@ -684,9 +597,9 @@ inline const char* FormatIterator::streamStateFromFormat(std::ostream& out,
     out.unsetf(std::ios::adjustfield | std::ios::basefield |
                std::ios::floatfield | std::ios::showbase | std::ios::boolalpha |
                std::ios::showpoint | std::ios::showpos | std::ios::uppercase);
-    extraFlags = Flag_None;
     bool precisionSet = false;
     bool widthSet = false;
+    int widthExtra = 0;
     const char* c = fmtStart + 1;
     // 1) Parse flags
     for(;; ++c)
@@ -713,12 +626,15 @@ inline const char* FormatIterator::streamStateFromFormat(std::ostream& out,
             case ' ':
                 // overridden by show positive sign, '+' flag.
                 if(!(out.flags() & std::ios::showpos))
-                    extraFlags |= Flag_SpacePadPositive;
+                    spacePadPositive = true;
                 continue;
             case '+':
                 out.setf(std::ios::showpos);
-                extraFlags &= ~Flag_SpacePadPositive;
+                spacePadPositive = false;
+                widthExtra = 1;
                 continue;
+            default:
+                break;
         }
         break;
     }
@@ -731,15 +647,19 @@ inline const char* FormatIterator::streamStateFromFormat(std::ostream& out,
     if(*c == '*')
     {
         widthSet = true;
-        if(variableWidth < 0)
+        int width = 0;
+        if(argIndex < numFormatters)
+            width = formatters[argIndex++].toInt();
+        else
+            TINYFORMAT_ERROR("tinyformat: Not enough arguments to read variable width");
+        if(width < 0)
         {
             // negative widths correspond to '-' flag set
             out.fill(' ');
             out.setf(std::ios::left, std::ios::adjustfield);
-            variableWidth = -variableWidth;
+            width = -width;
         }
-        out.width(variableWidth);
-        extraFlags |= Flag_VariableWidth;
+        out.width(width);
         ++c;
     }
     // 3) Parse precision
@@ -750,8 +670,10 @@ inline const char* FormatIterator::streamStateFromFormat(std::ostream& out,
         if(*c == '*')
         {
             ++c;
-            extraFlags |= Flag_VariablePrecision;
-            precision = variablePrecision;
+            if(argIndex < numFormatters)
+                precision = formatters[argIndex++].toInt();
+            else
+                TINYFORMAT_ERROR("tinyformat: Not enough arguments to read variable precision");
         }
         else
         {
@@ -814,7 +736,7 @@ inline const char* FormatIterator::streamStateFromFormat(std::ostream& out,
             break;
         case 's':
             if(precisionSet)
-                extraFlags |= Flag_TruncateToPrecision;
+                ntrunc = static_cast<int>(out.precision());
             // Make %s print booleans as "true" and "false"
             out.setf(std::ios::boolalpha);
             break;
@@ -826,6 +748,8 @@ inline const char* FormatIterator::streamStateFromFormat(std::ostream& out,
             TINYFORMAT_ERROR("tinyformat: Conversion spec incorrectly "
                              "terminated by end of string");
             return c;
+        default:
+            break;
     }
     if(intConversion && precisionSet && !widthSet)
     {
@@ -833,7 +757,7 @@ inline const char* FormatIterator::streamStateFromFormat(std::ostream& out,
         // padded with zeros on the left).  This isn't really supported by the
         // iostreams, but we can approximately simulate it with the width if
         // the width isn't otherwise used.
-        out.width(out.precision());
+        out.width(out.precision() + widthExtra);
         out.setf(std::ios::internal, std::ios::adjustfield);
         out.fill('0');
     }
@@ -841,170 +765,282 @@ inline const char* FormatIterator::streamStateFromFormat(std::ostream& out,
 }
 
 
-
 //------------------------------------------------------------------------------
-// Private format function on top of which the public interface is implemented.
-// We enforce a mimimum of one value to be formatted to prevent bugs looking like
-//
-//   const char* myStr = "100% broken";
-//   printf(myStr);   // Parses % as a format specifier
-#ifdef TINYFORMAT_USE_VARIADIC_TEMPLATES
-
-template<typename T1>
-void format(FormatIterator& fmtIter, const T1& value1)
+inline void formatImpl(std::ostream& out, const char* fmt,
+                       const detail::FormatArg* formatters,
+                       int numFormatters)
 {
-    fmtIter.accept(value1);
-    fmtIter.finish();
+    // Saved stream state
+    std::streamsize origWidth = out.width();
+    std::streamsize origPrecision = out.precision();
+    std::ios::fmtflags origFlags = out.flags();
+    char origFill = out.fill();
+
+    for (int argIndex = 0; argIndex < numFormatters; ++argIndex)
+    {
+        // Parse the format string
+        fmt = printFormatStringLiteral(out, fmt);
+        bool spacePadPositive = false;
+        int ntrunc = -1;
+        const char* fmtEnd = streamStateFromFormat(out, spacePadPositive, ntrunc, fmt,
+                                                   formatters, argIndex, numFormatters);
+        if (argIndex >= numFormatters)
+        {
+            // Check args remain after reading any variable width/precision
+            TINYFORMAT_ERROR("tinyformat: Not enough format arguments");
+            return;
+        }
+        const FormatArg& arg = formatters[argIndex];
+        // Format the arg into the stream.
+        if(!spacePadPositive)
+            arg.format(out, fmt, fmtEnd, ntrunc);
+        else
+        {
+            // The following is a special case with no direct correspondence
+            // between stream formatting and the printf() behaviour.  Simulate
+            // it crudely by formatting into a temporary string stream and
+            // munging the resulting string.
+            std::ostringstream tmpStream;
+            tmpStream.copyfmt(out);
+            tmpStream.setf(std::ios::showpos);
+            arg.format(tmpStream, fmt, fmtEnd, ntrunc);
+            std::string result = tmpStream.str(); // allocates... yuck.
+            for(size_t i = 0, iend = result.size(); i < iend; ++i)
+                if(result[i] == '+') result[i] = ' ';
+            out << result;
+        }
+        fmt = fmtEnd;
+    }
+
+    // Print remaining part of format string.
+    fmt = printFormatStringLiteral(out, fmt);
+    if(*fmt != '\0')
+        TINYFORMAT_ERROR("tinyformat: Too many conversion specifiers in format string");
+
+    // Restore stream state
+    out.width(origWidth);
+    out.precision(origPrecision);
+    out.flags(origFlags);
+    out.fill(origFill);
 }
 
-// General version for C++11
-template<typename T1, typename... Args>
-void format(FormatIterator& fmtIter, const T1& value1, const Args&... args)
+} // namespace detail
+
+
+/// List of template arguments format(), held in a type-opaque way.
+///
+/// A const reference to FormatList (typedef'd as FormatListRef) may be
+/// conveniently used to pass arguments to non-template functions: All type
+/// information has been stripped from the arguments, leaving just enough of a
+/// common interface to perform formatting as required.
+class FormatList
 {
-    fmtIter.accept(value1);
-    format(fmtIter, args...);
-}
+    public:
+        FormatList(detail::FormatArg* formatters, int N)
+            : m_formatters(formatters), m_N(N) { }
 
-#else
+        friend void vformat(std::ostream& out, const char* fmt,
+                            const FormatList& list);
 
-inline void format(FormatIterator& fmtIter)
+    private:
+        const detail::FormatArg* m_formatters;
+        int m_N;
+};
+
+/// Reference to type-opaque format list for passing to vformat()
+typedef const FormatList& FormatListRef;
+
+
+namespace detail {
+
+// Format list subclass with fixed storage to avoid dynamic allocation
+template<int N>
+class FormatListN : public FormatList
 {
-    fmtIter.finish();
-}
+    public:
+#ifdef TINYFORMAT_USE_VARIADIC_TEMPLATES
+        template<typename... Args>
+        FormatListN(const Args&... args)
+            : FormatList(&m_formatterStore[0], N),
+            m_formatterStore { FormatArg(args)... }
+        { static_assert(sizeof...(args) == N, "Number of args must be N"); }
+#else // C++98 version
+        void init(int) {}
+#       define TINYFORMAT_MAKE_FORMATLIST_CONSTRUCTOR(n)       \
+                                                               \
+        template<TINYFORMAT_ARGTYPES(n)>                       \
+        FormatListN(TINYFORMAT_VARARGS(n))                     \
+            : FormatList(&m_formatterStore[0], n)              \
+        { assert(n == N); init(0, TINYFORMAT_PASSARGS(n)); }   \
+                                                               \
+        template<TINYFORMAT_ARGTYPES(n)>                       \
+        void init(int i, TINYFORMAT_VARARGS(n))                \
+        {                                                      \
+            m_formatterStore[i] = FormatArg(v1);               \
+            init(i+1 TINYFORMAT_PASSARGS_TAIL(n));             \
+        }
 
-// General version for C++98
-#define TINYFORMAT_MAKE_FORMAT_DETAIL(n)                                  \
-template<TINYFORMAT_ARGTYPES(n)>                                          \
-void format(detail::FormatIterator& fmtIter, TINYFORMAT_VARARGS(n))       \
-{                                                                         \
-    fmtIter.accept(v1);                                                   \
-    format(fmtIter TINYFORMAT_PASSARGS_TAIL(n));                          \
-}
+        TINYFORMAT_FOREACH_ARGNUM(TINYFORMAT_MAKE_FORMATLIST_CONSTRUCTOR)
+#       undef TINYFORMAT_MAKE_FORMATLIST_CONSTRUCTOR
+#endif
 
-TINYFORMAT_FOREACH_ARGNUM(TINYFORMAT_MAKE_FORMAT_DETAIL)
-#undef TINYFORMAT_MAKE_FORMAT_DETAIL
+    private:
+        FormatArg m_formatterStore[N];
+};
 
-#endif // End C++98 variadic template emulation for format()
+// Special 0-arg version - MSVC says zero-sized C array in struct is nonstandard
+template<> class FormatListN<0> : public FormatList
+{
+    public: FormatListN() : FormatList(0, 0) {}
+};
 
 } // namespace detail
 
 
 //------------------------------------------------------------------------------
-// Implement all the main interface functions here in terms of detail::format()
+// Primary API functions
 
 #ifdef TINYFORMAT_USE_VARIADIC_TEMPLATES
 
-// C++11 - the simple case
-template<typename T1, typename... Args>
-void format(std::ostream& out, const char* fmt, const T1& v1, const Args&... args)
+/// Make type-agnostic format list from list of template arguments.
+///
+/// The exact return type of this function is an implementation detail and
+/// shouldn't be relied upon.  Instead it should be stored as a FormatListRef:
+///
+///   FormatListRef formatList = makeFormatList( /*...*/ );
+template<typename... Args>
+detail::FormatListN<sizeof...(Args)> makeFormatList(const Args&... args)
 {
-    detail::FormatIterator fmtIter(out, fmt);
-    format(fmtIter, v1, args...);
+    return detail::FormatListN<sizeof...(args)>(args...);
 }
 
-template<typename T1, typename... Args>
-std::string format(const char* fmt, const T1& v1, const Args&... args)
+#else // C++98 version
+
+inline detail::FormatListN<0> makeFormatList()
+{
+    return detail::FormatListN<0>();
+}
+#define TINYFORMAT_MAKE_MAKEFORMATLIST(n)                     \
+template<TINYFORMAT_ARGTYPES(n)>                              \
+detail::FormatListN<n> makeFormatList(TINYFORMAT_VARARGS(n))  \
+{                                                             \
+    return detail::FormatListN<n>(TINYFORMAT_PASSARGS(n));    \
+}
+TINYFORMAT_FOREACH_ARGNUM(TINYFORMAT_MAKE_MAKEFORMATLIST)
+#undef TINYFORMAT_MAKE_MAKEFORMATLIST
+
+#endif
+
+/// Format list of arguments to the stream according to the given format string.
+///
+/// The name vformat() is chosen for the semantic similarity to vprintf(): the
+/// list of format arguments is held in a single function argument.
+inline void vformat(std::ostream& out, const char* fmt, FormatListRef list)
+{
+    detail::formatImpl(out, fmt, list.m_formatters, list.m_N);
+}
+
+
+#ifdef TINYFORMAT_USE_VARIADIC_TEMPLATES
+
+/// Format list of arguments to the stream according to given format string.
+template<typename... Args>
+void format(std::ostream& out, const char* fmt, const Args&... args)
+{
+    vformat(out, fmt, makeFormatList(args...));
+}
+
+/// Format list of arguments according to the given format string and return
+/// the result as a string.
+template<typename... Args>
+std::string format(const char* fmt, const Args&... args)
 {
     std::ostringstream oss;
-    format(oss, fmt, v1, args...);
+    format(oss, fmt, args...);
     return oss.str();
 }
 
-template<typename T1, typename... Args>
-std::string format(const std::string &fmt, const T1& v1, const Args&... args)
+/// Format list of arguments to std::cout, according to the given format string
+template<typename... Args>
+void printf(const char* fmt, const Args&... args)
+{
+    format(std::cout, fmt, args...);
+}
+
+template<typename... Args>
+void printfln(const char* fmt, const Args&... args)
+{
+    format(std::cout, fmt, args...);
+    std::cout << '\n';
+}
+
+#else // C++98 version
+
+inline void format(std::ostream& out, const char* fmt)
+{
+    vformat(out, fmt, makeFormatList());
+}
+
+inline std::string format(const char* fmt)
 {
     std::ostringstream oss;
-    format(oss, fmt.c_str(), v1, args...);
+    format(oss, fmt);
     return oss.str();
 }
 
-template<typename T1, typename... Args>
-void printf(const char* fmt, const T1& v1, const Args&... args)
+inline void printf(const char* fmt)
 {
-    format(std::cout, fmt, v1, args...);
+    format(std::cout, fmt);
 }
 
-#else
+inline void printfln(const char* fmt)
+{
+    format(std::cout, fmt);
+    std::cout << '\n';
+}
 
-// C++98 - define the interface functions using the wrapping macros
 #define TINYFORMAT_MAKE_FORMAT_FUNCS(n)                                   \
                                                                           \
 template<TINYFORMAT_ARGTYPES(n)>                                          \
 void format(std::ostream& out, const char* fmt, TINYFORMAT_VARARGS(n))    \
 {                                                                         \
-    tinyformat::detail::FormatIterator fmtIter(out, fmt);                 \
-    tinyformat::detail::format(fmtIter, TINYFORMAT_PASSARGS(n));          \
+    vformat(out, fmt, makeFormatList(TINYFORMAT_PASSARGS(n)));            \
 }                                                                         \
                                                                           \
 template<TINYFORMAT_ARGTYPES(n)>                                          \
 std::string format(const char* fmt, TINYFORMAT_VARARGS(n))                \
 {                                                                         \
     std::ostringstream oss;                                               \
-    tinyformat::format(oss, fmt, TINYFORMAT_PASSARGS(n));                 \
+    format(oss, fmt, TINYFORMAT_PASSARGS(n));                             \
     return oss.str();                                                     \
 }                                                                         \
                                                                           \
 template<TINYFORMAT_ARGTYPES(n)>                                          \
-std::string format(const std::string &fmt, TINYFORMAT_VARARGS(n))         \
+void printf(const char* fmt, TINYFORMAT_VARARGS(n))                       \
 {                                                                         \
-    std::ostringstream oss;                                               \
-    tinyformat::format(oss, fmt.c_str(), TINYFORMAT_PASSARGS(n));         \
-    return oss.str();                                                     \
+    format(std::cout, fmt, TINYFORMAT_PASSARGS(n));                       \
 }                                                                         \
                                                                           \
 template<TINYFORMAT_ARGTYPES(n)>                                          \
-void printf(const char* fmt, TINYFORMAT_VARARGS(n))                       \
+void printfln(const char* fmt, TINYFORMAT_VARARGS(n))                     \
 {                                                                         \
-    tinyformat::format(std::cout, fmt, TINYFORMAT_PASSARGS(n));           \
+    format(std::cout, fmt, TINYFORMAT_PASSARGS(n));                       \
+    std::cout << '\n';                                                    \
 }
 
 TINYFORMAT_FOREACH_ARGNUM(TINYFORMAT_MAKE_FORMAT_FUNCS)
 #undef TINYFORMAT_MAKE_FORMAT_FUNCS
-#endif
-
 
-//------------------------------------------------------------------------------
-// Define deprecated wrapping macro for backward compatibility in tinyformat
-// 1.x.  Will be removed in version 2!
-#define TINYFORMAT_WRAP_FORMAT_EXTRA_ARGS
-#define TINYFORMAT_WRAP_FORMAT_N(n, returnType, funcName, funcDeclSuffix,  \
-                                 bodyPrefix, streamName, bodySuffix)       \
-template<TINYFORMAT_ARGTYPES(n)>                                           \
-returnType funcName(TINYFORMAT_WRAP_FORMAT_EXTRA_ARGS const char* fmt,     \
-                    TINYFORMAT_VARARGS(n)) funcDeclSuffix                  \
-{                                                                          \
-    bodyPrefix                                                             \
-    tinyformat::format(streamName, fmt, TINYFORMAT_PASSARGS(n));           \
-    bodySuffix                                                             \
-}                                                                          \
-
-#define TINYFORMAT_WRAP_FORMAT(returnType, funcName, funcDeclSuffix,       \
-                               bodyPrefix, streamName, bodySuffix)         \
-inline                                                                     \
-returnType funcName(TINYFORMAT_WRAP_FORMAT_EXTRA_ARGS const char* fmt      \
-                    ) funcDeclSuffix                                       \
-{                                                                          \
-    bodyPrefix                                                             \
-    tinyformat::detail::FormatIterator(streamName, fmt).finish();          \
-    bodySuffix                                                             \
-}                                                                          \
-TINYFORMAT_WRAP_FORMAT_N(1 , returnType, funcName, funcDeclSuffix, bodyPrefix, streamName, bodySuffix) \
-TINYFORMAT_WRAP_FORMAT_N(2 , returnType, funcName, funcDeclSuffix, bodyPrefix, streamName, bodySuffix) \
-TINYFORMAT_WRAP_FORMAT_N(3 , returnType, funcName, funcDeclSuffix, bodyPrefix, streamName, bodySuffix) \
-TINYFORMAT_WRAP_FORMAT_N(4 , returnType, funcName, funcDeclSuffix, bodyPrefix, streamName, bodySuffix) \
-TINYFORMAT_WRAP_FORMAT_N(5 , returnType, funcName, funcDeclSuffix, bodyPrefix, streamName, bodySuffix) \
-TINYFORMAT_WRAP_FORMAT_N(6 , returnType, funcName, funcDeclSuffix, bodyPrefix, streamName, bodySuffix) \
-TINYFORMAT_WRAP_FORMAT_N(7 , returnType, funcName, funcDeclSuffix, bodyPrefix, streamName, bodySuffix) \
-TINYFORMAT_WRAP_FORMAT_N(8 , returnType, funcName, funcDeclSuffix, bodyPrefix, streamName, bodySuffix) \
-TINYFORMAT_WRAP_FORMAT_N(9 , returnType, funcName, funcDeclSuffix, bodyPrefix, streamName, bodySuffix) \
-TINYFORMAT_WRAP_FORMAT_N(10, returnType, funcName, funcDeclSuffix, bodyPrefix, streamName, bodySuffix) \
-TINYFORMAT_WRAP_FORMAT_N(11, returnType, funcName, funcDeclSuffix, bodyPrefix, streamName, bodySuffix) \
-TINYFORMAT_WRAP_FORMAT_N(12, returnType, funcName, funcDeclSuffix, bodyPrefix, streamName, bodySuffix) \
-TINYFORMAT_WRAP_FORMAT_N(13, returnType, funcName, funcDeclSuffix, bodyPrefix, streamName, bodySuffix) \
-TINYFORMAT_WRAP_FORMAT_N(14, returnType, funcName, funcDeclSuffix, bodyPrefix, streamName, bodySuffix) \
-TINYFORMAT_WRAP_FORMAT_N(15, returnType, funcName, funcDeclSuffix, bodyPrefix, streamName, bodySuffix) \
-TINYFORMAT_WRAP_FORMAT_N(16, returnType, funcName, funcDeclSuffix, bodyPrefix, streamName, bodySuffix) \
+#endif
 
+// Added for Bitcoin Core
+template<typename... Args>
+std::string format(const std::string &fmt, const Args&... args)
+{
+    std::ostringstream oss;
+    format(oss, fmt.c_str(), args...);
+    return oss.str();
+}
 
 } // namespace tinyformat
 

From a5072a773071b8f4b644f84a77643e2ad18dba3a Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Mon, 27 Jun 2016 18:39:25 +0200
Subject: [PATCH 0577/1802] util: Remove zero-argument versions of LogPrint and
 error

Changes in tinyformat, recently imported from upstream have made the
zero-argument versions of formatting functions unnecessary. Remove them.

This is a slight semantic change: `%` characters in the zero-argument
call are now regarded and need to be escaped. As for as I know, the only
use of this is in `main.cpp`.
---
 src/main.cpp |  2 +-
 src/util.h   | 28 ++++++----------------------
 2 files changed, 7 insertions(+), 23 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index 6cdd55e3979df..bb65fc0de3eb8 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -4159,7 +4159,7 @@ bool CVerifyDB::VerifyDB(const CChainParams& chainparams, CCoinsView *coinsview,
     int nGoodTransactions = 0;
     CValidationState state;
     int reportDone = 0;
-    LogPrintf("[0%]...");
+    LogPrintf("[0%%]...");
     for (CBlockIndex* pindex = chainActive.Tip(); pindex && pindex->pprev; pindex = pindex->pprev)
     {
         boost::this_thread::interruption_point();
diff --git a/src/util.h b/src/util.h
index ac4b947785f43..39328b51ef154 100644
--- a/src/util.h
+++ b/src/util.h
@@ -77,33 +77,17 @@ int LogPrintStr(const std::string &str);
 
 #define LogPrintf(...) LogPrint(NULL, __VA_ARGS__)
 
-template<typename T1, typename... Args>
-static inline int LogPrint(const char* category, const char* fmt, const T1& v1, const Args&... args)
+template<typename... Args>
+static inline int LogPrint(const char* category, const char* fmt, const Args&... args)
 {
     if(!LogAcceptCategory(category)) return 0;                            \
-    return LogPrintStr(tfm::format(fmt, v1, args...));
+    return LogPrintStr(tfm::format(fmt, args...));
 }
 
-template<typename T1, typename... Args>
-bool error(const char* fmt, const T1& v1, const Args&... args)
+template<typename... Args>
+bool error(const char* fmt, const Args&... args)
 {
-    LogPrintStr("ERROR: " + tfm::format(fmt, v1, args...) + "\n");
-    return false;
-}
-
-/**
- * Zero-arg versions of logging and error, these are not covered by
- * the variadic templates above (and don't take format arguments but
- * bare strings).
- */
-static inline int LogPrint(const char* category, const char* s)
-{
-    if(!LogAcceptCategory(category)) return 0;
-    return LogPrintStr(s);
-}
-static inline bool error(const char* s)
-{
-    LogPrintStr(std::string("ERROR: ") + s + "\n");
+    LogPrintStr("ERROR: " + tfm::format(fmt, args...) + "\n");
     return false;
 }
 

From 2129fcea69ee0cf71c5e082607d101c3680af84c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pavel=20Jan=C3=ADk?= <Pavel@Janik.cz>
Date: Sat, 25 Jun 2016 08:19:36 +0200
Subject: [PATCH 0578/1802] The bit field is shown only when status is
 "started"

---
 src/rpc/blockchain.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp
index 9d1d12a47edbb..20eefa1c574c5 100644
--- a/src/rpc/blockchain.cpp
+++ b/src/rpc/blockchain.cpp
@@ -909,7 +909,7 @@ UniValue getblockchaininfo(const UniValue& params, bool fHelp)
             "  \"bip9_softforks\": {          (object) status of BIP9 softforks in progress\n"
             "     \"xxxx\" : {                (string) name of the softfork\n"
             "        \"status\": \"xxxx\",    (string) one of \"defined\", \"started\", \"locked_in\", \"active\", \"failed\"\n"
-            "        \"bit\": xx,             (numeric) the bit, 0-28, in the block version field used to signal this soft fork\n"
+            "        \"bit\": xx,             (numeric) the bit (0-28) in the block version field used to signal this softfork (only for \"started\" status)\n"
             "        \"startTime\": xx,       (numeric) the minimum median time past of a block at which the bit gains its meaning\n"
             "        \"timeout\": xx          (numeric) the median time past of a block at which the deployment is considered failed if not yet locked in\n"
             "     }\n"

From 9a227e95bb1dee07d20d1042f48f12db8cc048a6 Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Mon, 27 Jun 2016 12:49:40 +0000
Subject: [PATCH 0579/1802] tx: change slug to `bitcoin.qt-translation-013x`

Fetch the 0.13 translations, not the 0.12 translations.
---
 .tx/config | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.tx/config b/.tx/config
index d6cc3aab8879c..3ce2ae71d0adb 100644
--- a/.tx/config
+++ b/.tx/config
@@ -1,7 +1,7 @@
 [main]
 host = https://www.transifex.com
 
-[bitcoin.qt-translation-012x]
+[bitcoin.qt-translation-013x]
 file_filter = src/qt/locale/bitcoin_<lang>.ts
 source_file = src/qt/locale/bitcoin_en.ts
 source_lang = en

From 3b2dadc8d5bbe1f2485fd9e9cef0df31dffa2f57 Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Tue, 28 Jun 2016 09:47:37 +0000
Subject: [PATCH 0580/1802] qt: Periodic translations update

---
 src/Makefile.qt.include              |    6 +-
 src/qt/bitcoin_locale.qrc            |    6 +-
 src/qt/bitcoinstrings.cpp            |    5 +
 src/qt/locale/bitcoin_af.ts          |  251 +---
 src/qt/locale/bitcoin_af_ZA.ts       |  403 +-----
 src/qt/locale/bitcoin_ar.ts          |  945 +------------
 src/qt/locale/bitcoin_be_BY.ts       |  725 +---------
 src/qt/locale/bitcoin_bg.ts          | 1153 +---------------
 src/qt/locale/bitcoin_bg_BG.ts       |  157 ---
 src/qt/locale/bitcoin_bs.ts          |  169 ---
 src/qt/locale/bitcoin_ca.ts          | 1535 ++-------------------
 src/qt/locale/bitcoin_ca@valencia.ts | 1755 +++---------------------
 src/qt/locale/bitcoin_ca_ES.ts       | 1531 ++-------------------
 src/qt/locale/bitcoin_cs.ts          | 1759 +++---------------------
 src/qt/locale/bitcoin_cs_CZ.ts       |  371 +----
 src/qt/locale/bitcoin_cy.ts          |  333 +----
 src/qt/locale/bitcoin_da.ts          | 1805 +++++--------------------
 src/qt/locale/bitcoin_de.ts          | 1801 ++++---------------------
 src/qt/locale/bitcoin_el.ts          |  149 +-
 src/qt/locale/bitcoin_el_GR.ts       | 1204 +----------------
 src/qt/locale/bitcoin_en.ts          |   69 +-
 src/qt/locale/bitcoin_en_GB.ts       | 1811 +++++--------------------
 src/qt/locale/bitcoin_eo.ts          | 1107 +--------------
 src/qt/locale/bitcoin_es.ts          | 1802 +++++--------------------
 src/qt/locale/bitcoin_es_419.ts      |  173 ---
 src/qt/locale/bitcoin_es_AR.ts       |  239 +---
 src/qt/locale/bitcoin_es_CL.ts       |  768 +----------
 src/qt/locale/bitcoin_es_CO.ts       |  264 +---
 src/qt/locale/bitcoin_es_DO.ts       | 1124 +--------------
 src/qt/locale/bitcoin_es_ES.ts       |  251 +---
 src/qt/locale/bitcoin_es_MX.ts       |  695 +---------
 src/qt/locale/bitcoin_es_UY.ts       |  274 +---
 src/qt/locale/bitcoin_es_VE.ts       |  583 +-------
 src/qt/locale/bitcoin_et.ts          |  837 +-----------
 src/qt/locale/bitcoin_eu_ES.ts       |  479 +------
 src/qt/locale/bitcoin_fa.ts          | 1121 +++------------
 src/qt/locale/bitcoin_fa_IR.ts       |  579 +-------
 src/qt/locale/bitcoin_fi.ts          | 1523 ++-------------------
 src/qt/locale/bitcoin_fil.ts         |  157 ---
 src/qt/locale/bitcoin_fr.ts          | 1875 +++++---------------------
 src/qt/locale/bitcoin_fr_CA.ts       |  121 +-
 src/qt/locale/bitcoin_fr_FR.ts       | 1084 +--------------
 src/qt/locale/bitcoin_gl.ts          | 1049 +-------------
 src/qt/locale/bitcoin_he.ts          | 1535 ++++-----------------
 src/qt/locale/bitcoin_hi_IN.ts       |  461 +------
 src/qt/locale/bitcoin_hr.ts          |  835 +-----------
 src/qt/locale/bitcoin_hu.ts          | 1085 +--------------
 src/qt/locale/bitcoin_id_ID.ts       | 1203 +----------------
 src/qt/locale/bitcoin_it.ts          | 1765 +++---------------------
 src/qt/locale/bitcoin_it_IT.ts       |  187 +--
 src/qt/locale/bitcoin_ja.ts          | 1809 +++++--------------------
 src/qt/locale/bitcoin_ka.ts          | 1163 +---------------
 src/qt/locale/bitcoin_kk_KZ.ts       |  159 +--
 src/qt/locale/bitcoin_ko_KR.ts       | 1765 +++---------------------
 src/qt/locale/bitcoin_ku_IQ.ts       |  272 ++++
 src/qt/locale/bitcoin_ky.ts          |  101 +-
 src/qt/locale/bitcoin_la.ts          |  749 +---------
 src/qt/locale/bitcoin_lt.ts          |  887 +-----------
 src/qt/locale/bitcoin_lv_LV.ts       | 1123 +--------------
 src/qt/locale/bitcoin_mk_MK.ts       |  471 +------
 src/qt/locale/bitcoin_mn.ts          |  561 +-------
 src/qt/locale/bitcoin_ms_MY.ts       |   77 +-
 src/qt/locale/bitcoin_nb.ts          | 1763 +++---------------------
 src/qt/locale/bitcoin_nl.ts          | 1817 +++++--------------------
 src/qt/locale/bitcoin_pam.ts         |  705 +---------
 src/qt/locale/bitcoin_pl.ts          | 1827 +++++--------------------
 src/qt/locale/bitcoin_pt_BR.ts       | 1783 ++++--------------------
 src/qt/locale/bitcoin_pt_PT.ts       | 1783 ++++--------------------
 src/qt/locale/bitcoin_ro.ts          |   81 +-
 src/qt/locale/bitcoin_ro_RO.ts       | 1483 ++------------------
 src/qt/locale/bitcoin_ru.ts          | 1773 +++---------------------
 src/qt/locale/bitcoin_ru_RU.ts       |  113 +-
 src/qt/locale/bitcoin_sk.ts          | 1535 ++-------------------
 src/qt/locale/bitcoin_sl_SI.ts       | 1475 ++------------------
 src/qt/locale/bitcoin_sq.ts          |  407 +-----
 src/qt/locale/bitcoin_sr.ts          |  447 +-----
 src/qt/locale/bitcoin_sr@latin.ts    |  459 +------
 src/qt/locale/bitcoin_sv.ts          | 1812 +++++--------------------
 src/qt/locale/bitcoin_ta.ts          |  351 +----
 src/qt/locale/bitcoin_th_TH.ts       |  821 +++++++----
 src/qt/locale/bitcoin_tr.ts          | 1809 +++++--------------------
 src/qt/locale/bitcoin_tr_TR.ts       |  155 +--
 src/qt/locale/bitcoin_uk.ts          | 1767 +++---------------------
 src/qt/locale/bitcoin_ur_PK.ts       |  209 +--
 src/qt/locale/bitcoin_uz@Cyrl.ts     |  965 +------------
 src/qt/locale/bitcoin_uz@Latn.ts     |  169 ---
 src/qt/locale/bitcoin_vi.ts          |  107 +-
 src/qt/locale/bitcoin_vi_VN.ts       |  293 +---
 src/qt/locale/bitcoin_zh.ts          |   77 --
 src/qt/locale/bitcoin_zh_CN.ts       | 1756 +++---------------------
 src/qt/locale/bitcoin_zh_HK.ts       |  253 ----
 src/qt/locale/bitcoin_zh_TW.ts       | 1793 +++++-------------------
 92 files changed, 7965 insertions(+), 72079 deletions(-)
 delete mode 100644 src/qt/locale/bitcoin_bg_BG.ts
 delete mode 100644 src/qt/locale/bitcoin_bs.ts
 delete mode 100644 src/qt/locale/bitcoin_es_419.ts
 delete mode 100644 src/qt/locale/bitcoin_fil.ts
 create mode 100644 src/qt/locale/bitcoin_ku_IQ.ts
 delete mode 100644 src/qt/locale/bitcoin_uz@Latn.ts

diff --git a/src/Makefile.qt.include b/src/Makefile.qt.include
index dc775a3568d78..36a21dd06fec1 100644
--- a/src/Makefile.qt.include
+++ b/src/Makefile.qt.include
@@ -7,9 +7,7 @@ QT_TS = \
   qt/locale/bitcoin_af_ZA.ts \
   qt/locale/bitcoin_ar.ts \
   qt/locale/bitcoin_be_BY.ts \
-  qt/locale/bitcoin_bg_BG.ts \
   qt/locale/bitcoin_bg.ts \
-  qt/locale/bitcoin_bs.ts \
   qt/locale/bitcoin_ca_ES.ts \
   qt/locale/bitcoin_ca.ts \
   qt/locale/bitcoin_ca@valencia.ts \
@@ -23,7 +21,6 @@ QT_TS = \
   qt/locale/bitcoin_en_GB.ts \
   qt/locale/bitcoin_en.ts \
   qt/locale/bitcoin_eo.ts \
-  qt/locale/bitcoin_es_419.ts \
   qt/locale/bitcoin_es_AR.ts \
   qt/locale/bitcoin_es_CL.ts \
   qt/locale/bitcoin_es_CO.ts \
@@ -37,7 +34,6 @@ QT_TS = \
   qt/locale/bitcoin_eu_ES.ts \
   qt/locale/bitcoin_fa_IR.ts \
   qt/locale/bitcoin_fa.ts \
-  qt/locale/bitcoin_fil.ts \
   qt/locale/bitcoin_fi.ts \
   qt/locale/bitcoin_fr_CA.ts \
   qt/locale/bitcoin_fr_FR.ts \
@@ -54,6 +50,7 @@ QT_TS = \
   qt/locale/bitcoin_ka.ts \
   qt/locale/bitcoin_kk_KZ.ts \
   qt/locale/bitcoin_ko_KR.ts \
+  qt/locale/bitcoin_ku_IQ.ts \
   qt/locale/bitcoin_ky.ts \
   qt/locale/bitcoin_la.ts \
   qt/locale/bitcoin_lt.ts \
@@ -84,7 +81,6 @@ QT_TS = \
   qt/locale/bitcoin_uk.ts \
   qt/locale/bitcoin_ur_PK.ts \
   qt/locale/bitcoin_uz@Cyrl.ts \
-  qt/locale/bitcoin_uz@Latn.ts \
   qt/locale/bitcoin_vi.ts \
   qt/locale/bitcoin_vi_VN.ts \
   qt/locale/bitcoin_zh_CN.ts \
diff --git a/src/qt/bitcoin_locale.qrc b/src/qt/bitcoin_locale.qrc
index 1acda7f28caaf..54d36ac0118fa 100644
--- a/src/qt/bitcoin_locale.qrc
+++ b/src/qt/bitcoin_locale.qrc
@@ -4,9 +4,7 @@
         <file alias="af_ZA">locale/bitcoin_af_ZA.qm</file>
         <file alias="ar">locale/bitcoin_ar.qm</file>
         <file alias="be_BY">locale/bitcoin_be_BY.qm</file>
-        <file alias="bg_BG">locale/bitcoin_bg_BG.qm</file>
         <file alias="bg">locale/bitcoin_bg.qm</file>
-        <file alias="bs">locale/bitcoin_bs.qm</file>
         <file alias="ca_ES">locale/bitcoin_ca_ES.qm</file>
         <file alias="ca">locale/bitcoin_ca.qm</file>
         <file alias="ca@valencia">locale/bitcoin_ca@valencia.qm</file>
@@ -20,7 +18,6 @@
         <file alias="en_GB">locale/bitcoin_en_GB.qm</file>
         <file alias="en">locale/bitcoin_en.qm</file>
         <file alias="eo">locale/bitcoin_eo.qm</file>
-        <file alias="es_419">locale/bitcoin_es_419.qm</file>
         <file alias="es_AR">locale/bitcoin_es_AR.qm</file>
         <file alias="es_CL">locale/bitcoin_es_CL.qm</file>
         <file alias="es_CO">locale/bitcoin_es_CO.qm</file>
@@ -34,7 +31,6 @@
         <file alias="eu_ES">locale/bitcoin_eu_ES.qm</file>
         <file alias="fa_IR">locale/bitcoin_fa_IR.qm</file>
         <file alias="fa">locale/bitcoin_fa.qm</file>
-        <file alias="fil">locale/bitcoin_fil.qm</file>
         <file alias="fi">locale/bitcoin_fi.qm</file>
         <file alias="fr_CA">locale/bitcoin_fr_CA.qm</file>
         <file alias="fr_FR">locale/bitcoin_fr_FR.qm</file>
@@ -51,6 +47,7 @@
         <file alias="ka">locale/bitcoin_ka.qm</file>
         <file alias="kk_KZ">locale/bitcoin_kk_KZ.qm</file>
         <file alias="ko_KR">locale/bitcoin_ko_KR.qm</file>
+        <file alias="ku_IQ">locale/bitcoin_ku_IQ.qm</file>
         <file alias="ky">locale/bitcoin_ky.qm</file>
         <file alias="la">locale/bitcoin_la.qm</file>
         <file alias="lt">locale/bitcoin_lt.qm</file>
@@ -81,7 +78,6 @@
         <file alias="uk">locale/bitcoin_uk.qm</file>
         <file alias="ur_PK">locale/bitcoin_ur_PK.qm</file>
         <file alias="uz@Cyrl">locale/bitcoin_uz@Cyrl.qm</file>
-        <file alias="uz@Latn">locale/bitcoin_uz@Latn.qm</file>
         <file alias="vi">locale/bitcoin_vi.qm</file>
         <file alias="vi_VN">locale/bitcoin_vi_VN.qm</file>
         <file alias="zh_CN">locale/bitcoin_zh_CN.qm</file>
diff --git a/src/qt/bitcoinstrings.cpp b/src/qt/bitcoinstrings.cpp
index 83901732acf17..7cf32cd34e8f7 100644
--- a/src/qt/bitcoinstrings.cpp
+++ b/src/qt/bitcoinstrings.cpp
@@ -165,6 +165,9 @@ QT_TRANSLATE_NOOP("bitcoin-core", ""
 "Tries to keep outbound traffic under the given target (in MiB per 24h), 0 = "
 "no limit (default: %d)"),
 QT_TRANSLATE_NOOP("bitcoin-core", ""
+"Unable to rewind the database to a pre-fork state. You will need to "
+"redownload the blockchain"),
+QT_TRANSLATE_NOOP("bitcoin-core", ""
 "Unsupported argument -socks found. Setting SOCKS version isn't possible "
 "anymore, only SOCKS5 proxies are supported."),
 QT_TRANSLATE_NOOP("bitcoin-core", ""
@@ -308,11 +311,13 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Relay and mine data carrier transactions (def
 QT_TRANSLATE_NOOP("bitcoin-core", "Relay non-P2SH multisig (default: %u)"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Rescan the block chain for missing wallet transactions on startup"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Rescanning..."),
+QT_TRANSLATE_NOOP("bitcoin-core", "Rewinding blocks..."),
 QT_TRANSLATE_NOOP("bitcoin-core", "Run in the background as a daemon and accept commands"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Send trace/debug info to console instead of debug.log file"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Send transactions as zero-fee transactions if possible (default: %u)"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Set database cache size in megabytes (%d to %d, default: %d)"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Set key pool size to <n> (default: %u)"),
+QT_TRANSLATE_NOOP("bitcoin-core", "Set maximum block cost (default: %d)"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Set maximum block size in bytes (default: %d)"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Set minimum block size in bytes (default: %u)"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Set the number of threads to service RPC calls (default: %d)"),
diff --git a/src/qt/locale/bitcoin_af.ts b/src/qt/locale/bitcoin_af.ts
index 492c7bccd4e1b..7c2d294c7e8ff 100644
--- a/src/qt/locale/bitcoin_af.ts
+++ b/src/qt/locale/bitcoin_af.ts
@@ -21,10 +21,6 @@
         <source>&amp;Copy</source>
         <translation>&amp;Dupliseer</translation>
     </message>
-    <message>
-        <source>&amp;Copy Address</source>
-        <translation>&amp;Dupliseer Adres</translation>
-    </message>
     <message>
         <source>Delete the currently selected address from the list</source>
         <translation>Verwyder die adres wat u gekies het van die lys</translation>
@@ -41,61 +37,6 @@
         <source>&amp;Delete</source>
         <translation>&amp;Vee uit</translation>
     </message>
-    <message>
-        <source>Choose the address to send coins to</source>
-        <translation>Kies die adres waarheen u munte wil stuur</translation>
-    </message>
-    <message>
-        <source>Choose the address to receive coins with</source>
-        <translation>Kies die adres wat die munte moet ontvang</translation>
-    </message>
-    <message>
-        <source>Sending addresses</source>
-        <translation>Stuurders adresse</translation>
-    </message>
-    <message>
-        <source>Receiving addresses</source>
-        <translation>Ontvanger adresse</translation>
-    </message>
-    <message>
-        <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source>
-        <translation>Hierdie is die adresse vanwaar u Bitcoin betalings stuur. U moet altyd die bedrag en die adres van die ontvanger nagaan voordat u enige munte stuur.</translation>
-    </message>
-    <message>
-        <source>These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source>
-        <translation>Hierdie is die adresse waar u Bitcoins sal ontvang. Ons beveel aan dat u 'n nuwe adres kies vir elke transaksie</translation>
-    </message>
-    <message>
-        <source>&amp;Edit</source>
-        <translation>&amp;Verander</translation>
-    </message>
-    <message>
-        <source>Export Address List</source>
-        <translation>Voer adreslys uit</translation>
-    </message>
-    <message>
-        <source>Comma separated file (*.csv)</source>
-        <translation>Comma separated file (*.csv)</translation>
-    </message>
-    <message>
-        <source>Exporting Failed</source>
-        <translation>Uitvoer was onsuksesvol</translation>
-    </message>
-    <message>
-        <source>There was an error trying to save the address list to %1. Please try again.</source>
-        <translation>Die adreslys kon nie in %1  gestoor word nie.  Probeer asseblief weer.</translation>
-    </message>
-</context>
-<context>
-    <name>AddressTableModel</name>
-    <message>
-        <source>Address</source>
-        <translation>Adres</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(geen etiket)</translation>
-    </message>
 </context>
 <context>
     <name>AskPassphraseDialog</name>
@@ -115,87 +56,7 @@
         <source>Repeat new passphrase</source>
         <translation>Herhaal nuwe wagwoord</translation>
     </message>
-    <message>
-        <source>Encrypt wallet</source>
-        <translation>Kodifiseer beursie</translation>
-    </message>
-    <message>
-        <source>This operation needs your wallet passphrase to unlock the wallet.</source>
-        <translation>U het u beursie se wagwoord nodig om toegang tot u beursie te verkry.</translation>
-    </message>
-    <message>
-        <source>Unlock wallet</source>
-        <translation>Sluit beursie oop</translation>
-    </message>
-    <message>
-        <source>This operation needs your wallet passphrase to decrypt the wallet.</source>
-        <translation>U het u beursie se wagwoord nodig om u beursie se kode te ontsyfer.</translation>
-    </message>
-    <message>
-        <source>Decrypt wallet</source>
-        <translation>Ontsleutel beursie</translation>
-    </message>
-    <message>
-        <source>Change passphrase</source>
-        <translation>Verander wagwoord</translation>
-    </message>
-    <message>
-        <source>Confirm wallet encryption</source>
-        <translation>Bevestig dat die beursie gekodifiseer is</translation>
-    </message>
-    <message>
-        <source>Warning: If you encrypt your wallet and lose your passphrase, you will &lt;b&gt;LOSE ALL OF YOUR BITCOINS&lt;/b&gt;!</source>
-        <translation>Waarskuwing: Indien u die beursie kodifiseer en u vergeet u wagwoord &lt;b&gt;VERLOOR U AL U BITCOINS&lt;/b&gt;!</translation>
-    </message>
-    <message>
-        <source>Are you sure you wish to encrypt your wallet?</source>
-        <translation>Is u seker dat u die beursie wil kodifiseer?</translation>
-    </message>
-    <message>
-        <source>Bitcoin Core will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source>
-        <translation>Bitcoin Kern gaan nou toemaak om die kodifikasie af te handel. Onthou dat die kodifikasie van u beursie nie altyd u munte kan beskerm teen diefstal deur kwaadwillige sagteware op u rekenaar nie.</translation>
-    </message>
-    <message>
-        <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source>
-        <translation>BELANGRIK:  Alle vorige kopieë en rugsteun-weergawes wat u tevore van die gemaak het, moet vervang word met die jongste weergawe van u nuutste gekodifiseerde beursie.  Alle vorige weergawes en rugsteun-kopieë van u beursie sal nutteloos raak die oomblik wat u die nuut-gekodifiseerde beursie begin gebruik.</translation>
-    </message>
-    <message>
-        <source>Warning: The Caps Lock key is on!</source>
-        <translation>WAARSKUWING:  Outomatiese Kapitalisering is aktief op u sleutelbord!</translation>
-    </message>
-    <message>
-        <source>Wallet encrypted</source>
-        <translation>Beursie gekodifiseer</translation>
-    </message>
-    <message>
-        <source>Enter the new passphrase to the wallet.&lt;br/&gt;Please use a passphrase of &lt;b&gt;ten or more random characters&lt;/b&gt;, or &lt;b&gt;eight or more words&lt;/b&gt;.</source>
-        <translation>Tik die nuwe wagwoord vir u beursie.&lt;br/&gt;Gerbuik asseblief 'n wagwoord met &lt;b&gt;tien of meer lukrake karakters&lt;/b&gt;, of &lt;b&gt;agt of meer woorde&lt;/b&gt;.</translation>
-    </message>
-    <message>
-        <source>Enter the old passphrase and new passphrase to the wallet.</source>
-        <translation>Tik die ou en die nuwe wagwoorde vir die beursie.</translation>
-    </message>
-    <message>
-        <source>Wallet encryption failed</source>
-        <translation>Kodifikasie was onsuksesvol</translation>
-    </message>
-    <message>
-        <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
-        <translation>Weens 'n interne fout het kodifikasie het nie geslaag nie.  U beursie is nie gekodifiseer nie</translation>
-    </message>
-    <message>
-        <source>The supplied passphrases do not match.</source>
-        <translation>Die wagwoorde stem nie ooreen nie.</translation>
-    </message>
-    <message>
-        <source>Wallet unlock failed</source>
-        <translation>Die beursie is nie oopgesluit nie</translation>
-    </message>
-    <message>
-        <source>The passphrase entered for the wallet decryption was incorrect.</source>
-        <translation>U het die verkeerde wagwoord ingetik.</translation>
-    </message>
-    </context>
+</context>
 <context>
     <name>BanTableModel</name>
     <message>
@@ -257,14 +118,6 @@
         <source>Open &amp;URI...</source>
         <translation>Oop &amp; URI...</translation>
     </message>
-    <message>
-        <source>Bitcoin Core client</source>
-        <translation>Bitcoin Kern klient</translation>
-    </message>
-    <message>
-        <source>Importing blocks from disk...</source>
-        <translation>Besig om blokke vanaf die hardeskyf in te voer...</translation>
-    </message>
     <message>
         <source>Reindexing blocks on disk...</source>
         <translation>Besig met herindeksering van blokke op hardeskyf...</translation>
@@ -297,10 +150,6 @@
         <source>&amp;Receive</source>
         <translation>&amp;Ontvang</translation>
     </message>
-    <message>
-        <source>Show information about Bitcoin Core</source>
-        <translation>Vertoon inligting oor Bitcoin Kern</translation>
-    </message>
     <message>
         <source>Show or hide the main Window</source>
         <translation>Wys of versteek die hoofbladsy</translation>
@@ -321,22 +170,10 @@
         <source>&amp;Help</source>
         <translation>&amp;Help</translation>
     </message>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Bitcoin Kern</translation>
-    </message>
     <message>
         <source>Request payments (generates QR codes and bitcoin: URIs)</source>
         <translation>Versoek betalings (genereer QR-kodes en bitcoin: URI's)</translation>
     </message>
-    <message>
-        <source>&amp;About Bitcoin Core</source>
-        <translation>&amp;Omtrent Bitcoin Kern</translation>
-    </message>
-    <message>
-        <source>Modify configuration options for Bitcoin Core</source>
-        <translation>Verander konfigurasie-opsies vir Bitcoin Kern</translation>
-    </message>
     <message>
         <source>Show the list of used sending addresses and labels</source>
         <translation>Vertoon die lys van gebruikte versendingsadresse en etikette</translation>
@@ -350,15 +187,8 @@
         <translation>Skep 'n bitcoin: URI of betalingsversoek</translation>
     </message>
     </context>
-<context>
-    <name>ClientModel</name>
-    </context>
 <context>
     <name>CoinControlDialog</name>
-    <message>
-        <source>(no label)</source>
-        <translation>(geen etiket)</translation>
-    </message>
     </context>
 <context>
     <name>EditAddressDialog</name>
@@ -368,21 +198,9 @@
     </context>
 <context>
     <name>HelpMessageDialog</name>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Bitcoin Kern</translation>
-    </message>
-    <message>
-        <source>Reset all settings changes made over the GUI</source>
-        <translation>Herstel al my veranderinge aan die stellings terug na die verstek-opsies</translation>
-    </message>
-</context>
+    </context>
 <context>
     <name>Intro</name>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Bitcoin Kern</translation>
-    </message>
     </context>
 <context>
     <name>OpenURIDialog</name>
@@ -393,18 +211,12 @@
 <context>
     <name>OverviewPage</name>
     </context>
-<context>
-    <name>PaymentServer</name>
-    </context>
 <context>
     <name>PeerTableModel</name>
     </context>
 <context>
     <name>QObject</name>
     </context>
-<context>
-    <name>QRImageWidget</name>
-    </context>
 <context>
     <name>RPCConsole</name>
     </context>
@@ -413,24 +225,9 @@
     </context>
 <context>
     <name>ReceiveRequestDialog</name>
-    <message>
-        <source>Address</source>
-        <translation>Adres</translation>
-    </message>
-    </context>
-<context>
-    <name>RecentRequestsTableModel</name>
-    <message>
-        <source>(no label)</source>
-        <translation>(geen etiket)</translation>
-    </message>
     </context>
 <context>
     <name>SendCoinsDialog</name>
-    <message>
-        <source>(no label)</source>
-        <translation>(geen etiket)</translation>
-    </message>
     </context>
 <context>
     <name>SendCoinsEntry</name>
@@ -443,60 +240,22 @@
     </context>
 <context>
     <name>SplashScreen</name>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Bitcoin Kern</translation>
-    </message>
     </context>
 <context>
     <name>TrafficGraphWidget</name>
     </context>
-<context>
-    <name>TransactionDesc</name>
-    </context>
 <context>
     <name>TransactionDescDialog</name>
     </context>
-<context>
-    <name>TransactionTableModel</name>
-    </context>
-<context>
-    <name>TransactionView</name>
-    <message>
-        <source>Exporting Failed</source>
-        <translation>Uitvoer was onsuksesvol</translation>
-    </message>
-    <message>
-        <source>Comma separated file (*.csv)</source>
-        <translation>Comma separated file (*.csv)</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>Adres</translation>
-    </message>
-    </context>
 <context>
     <name>UnitDisplayStatusBarControl</name>
     </context>
 <context>
-    <name>WalletFrame</name>
-    </context>
-<context>
-    <name>WalletModel</name>
-    </context>
-<context>
-    <name>WalletView</name>
-    <message>
-        <source>&amp;Export</source>
-        <translation>&amp;Voer uit</translation>
-    </message>
+    <name>bitcoin-core</name>
     <message>
-        <source>Export the data in the current tab to a file</source>
-        <translation>Voer die inligting op hierdie bladsy uit na 'n leer</translation>
+        <source>Bitcoin Core</source>
+        <translation>Bitcoin Kern</translation>
     </message>
-    </context>
-<context>
-    <name>bitcoin-core</name>
     <message>
         <source>WARNING: check your network connection, %d blocks received in the last %d hours (%d expected)</source>
         <translation>WAARSKUWING:  toets die status van u netwerk, %d blokke ontvang in die laaste %d ure (%d verwag)</translation>
diff --git a/src/qt/locale/bitcoin_af_ZA.ts b/src/qt/locale/bitcoin_af_ZA.ts
index 12ac21eb80dcf..e553fc775936f 100644
--- a/src/qt/locale/bitcoin_af_ZA.ts
+++ b/src/qt/locale/bitcoin_af_ZA.ts
@@ -13,21 +13,6 @@
         <source>&amp;Delete</source>
         <translation>&amp;Verwyder</translation>
     </message>
-    </context>
-<context>
-    <name>AddressTableModel</name>
-    <message>
-        <source>Label</source>
-        <translation>Etiket</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>Adres</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(geen etiket)</translation>
-    </message>
 </context>
 <context>
     <name>AskPassphraseDialog</name>
@@ -47,70 +32,6 @@
         <source>Repeat new passphrase</source>
         <translation>Herhaal nuwe wagfrase</translation>
     </message>
-    <message>
-        <source>Encrypt wallet</source>
-        <translation>Enkripteer beursie</translation>
-    </message>
-    <message>
-        <source>This operation needs your wallet passphrase to unlock the wallet.</source>
-        <translation>Hierdie operasie benodig 'n wagwoord om die beursie oop te sluit.</translation>
-    </message>
-    <message>
-        <source>Unlock wallet</source>
-        <translation>Sluit beursie oop</translation>
-    </message>
-    <message>
-        <source>This operation needs your wallet passphrase to decrypt the wallet.</source>
-        <translation>Hierdie operasie benodig 'n wagwoord om die beursie oop te sluit.</translation>
-    </message>
-    <message>
-        <source>Decrypt wallet</source>
-        <translation>Sluit beursie oop</translation>
-    </message>
-    <message>
-        <source>Change passphrase</source>
-        <translation>Verander wagfrase</translation>
-    </message>
-    <message>
-        <source>Confirm wallet encryption</source>
-        <translation>Bevestig beursie enkripsie.</translation>
-    </message>
-    <message>
-        <source>Wallet encrypted</source>
-        <translation>Die beursie is nou bewaak</translation>
-    </message>
-    <message>
-        <source>Enter the old passphrase and new passphrase to the wallet.</source>
-        <translation>Tik in die ou wagfrase en die nuwe wagfrase vir die beursie.</translation>
-    </message>
-    <message>
-        <source>Wallet encryption failed</source>
-        <translation>Die beursie kon nie bewaak word nie</translation>
-    </message>
-    <message>
-        <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
-        <translation>Beursie bewaaking het misluk as gevolg van 'n interne fout. Die beursie is nie bewaak nie!</translation>
-    </message>
-    <message>
-        <source>The supplied passphrases do not match.</source>
-        <translation>Die wagfrase stem nie ooreen nie</translation>
-    </message>
-    <message>
-        <source>Wallet unlock failed</source>
-        <translation>Beursie oopsluiting het misluk</translation>
-    </message>
-    <message>
-        <source>The passphrase entered for the wallet decryption was incorrect.</source>
-        <translation>Die wagfrase wat ingetik was om die beursie oop te sluit, was verkeerd.</translation>
-    </message>
-    <message>
-        <source>Wallet decryption failed</source>
-        <translation>Beursie dekripsie het misluk</translation>
-    </message>
-    <message>
-        <source>Wallet passphrase was successfully changed.</source>
-        <translation>Die beursie se wagfrase verandering was suksesvol.</translation>
-    </message>
 </context>
 <context>
     <name>BanTableModel</name>
@@ -194,9 +115,6 @@
         <translation>Informasie</translation>
     </message>
     </context>
-<context>
-    <name>ClientModel</name>
-    </context>
 <context>
     <name>CoinControlDialog</name>
     <message>
@@ -211,18 +129,6 @@
         <source>Date</source>
         <translation>Datum</translation>
     </message>
-    <message>
-        <source>Copy address</source>
-        <translation>Maak kopie van adres</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>Kopieer bedrag</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(geen etiket)</translation>
-    </message>
     </context>
 <context>
     <name>EditAddressDialog</name>
@@ -234,27 +140,7 @@
         <source>&amp;Address</source>
         <translation>&amp;Adres</translation>
     </message>
-    <message>
-        <source>New receiving address</source>
-        <translation>Nuwe ontvangende adres</translation>
-    </message>
-    <message>
-        <source>New sending address</source>
-        <translation>Nuwe stuurende adres</translation>
-    </message>
-    <message>
-        <source>Edit receiving address</source>
-        <translation>Wysig ontvangende adres</translation>
-    </message>
-    <message>
-        <source>Edit sending address</source>
-        <translation>Wysig stuurende adres</translation>
-    </message>
-    <message>
-        <source>Could not unlock wallet.</source>
-        <translation>Kon nie die beursie oopsluit nie.</translation>
-    </message>
-    </context>
+</context>
 <context>
     <name>FreespaceChecker</name>
     </context>
@@ -293,9 +179,6 @@
         <translation>Vorm</translation>
     </message>
     </context>
-<context>
-    <name>PaymentServer</name>
-    </context>
 <context>
     <name>PeerTableModel</name>
     </context>
@@ -306,9 +189,6 @@
         <translation>Bedrag</translation>
     </message>
     </context>
-<context>
-    <name>QRImageWidget</name>
-    </context>
 <context>
     <name>RPCConsole</name>
     <message>
@@ -326,52 +206,9 @@
         <source>&amp;Message:</source>
         <translation>&amp;Boodskap:</translation>
     </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>Kopieer bedrag</translation>
-    </message>
-</context>
-<context>
-    <name>ReceiveRequestDialog</name>
-    <message>
-        <source>Address</source>
-        <translation>Adres</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>Bedrag</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Etiket</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>Boodskap</translation>
-    </message>
     </context>
 <context>
-    <name>RecentRequestsTableModel</name>
-    <message>
-        <source>Date</source>
-        <translation>Datum</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Etiket</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>Boodskap</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>Bedrag</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(geen etiket)</translation>
-    </message>
+    <name>ReceiveRequestDialog</name>
     </context>
 <context>
     <name>SendCoinsDialog</name>
@@ -403,15 +240,7 @@
         <source>S&amp;end</source>
         <translation>S&amp;tuur</translation>
     </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>Kopieer bedrag</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(geen etiket)</translation>
-    </message>
-    </context>
+</context>
 <context>
     <name>SendCoinsEntry</name>
     <message>
@@ -447,234 +276,12 @@
 <context>
     <name>TrafficGraphWidget</name>
     </context>
-<context>
-    <name>TransactionDesc</name>
-    <message>
-        <source>Date</source>
-        <translation>Datum</translation>
-    </message>
-    <message>
-        <source>From</source>
-        <translation>Van</translation>
-    </message>
-    <message>
-        <source>To</source>
-        <translation>Na</translation>
-    </message>
-    <message>
-        <source>own address</source>
-        <translation>eie adres</translation>
-    </message>
-    <message>
-        <source>label</source>
-        <translation>etiket</translation>
-    </message>
-    <message>
-        <source>Credit</source>
-        <translation>Krediet</translation>
-    </message>
-    <message>
-        <source>not accepted</source>
-        <translation>nie aanvaar nie</translation>
-    </message>
-    <message>
-        <source>Debit</source>
-        <translation>Debiet</translation>
-    </message>
-    <message>
-        <source>Transaction fee</source>
-        <translation>Transaksie fooi</translation>
-    </message>
-    <message>
-        <source>Net amount</source>
-        <translation>Netto bedrag</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>Boodskap</translation>
-    </message>
-    <message>
-        <source>Transaction ID</source>
-        <translation>Transaksie ID</translation>
-    </message>
-    <message>
-        <source>Transaction</source>
-        <translation>Transaksie</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>Bedrag</translation>
-    </message>
-    <message>
-        <source>true</source>
-        <translation>waar</translation>
-    </message>
-    <message>
-        <source>false</source>
-        <translation>onwaar</translation>
-    </message>
-    <message>
-        <source>unknown</source>
-        <translation>onbekend</translation>
-    </message>
-</context>
 <context>
     <name>TransactionDescDialog</name>
     </context>
-<context>
-    <name>TransactionTableModel</name>
-    <message>
-        <source>Date</source>
-        <translation>Datum</translation>
-    </message>
-    <message>
-        <source>Type</source>
-        <translation>Tipe</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Etiket</translation>
-    </message>
-    <message>
-        <source>Received with</source>
-        <translation>Ontvang met</translation>
-    </message>
-    <message>
-        <source>Received from</source>
-        <translation>Ontvang van</translation>
-    </message>
-    <message>
-        <source>Sent to</source>
-        <translation>Gestuur na</translation>
-    </message>
-    <message>
-        <source>Payment to yourself</source>
-        <translation>Betalings Aan/na jouself</translation>
-    </message>
-    <message>
-        <source>Mined</source>
-        <translation>Gemyn</translation>
-    </message>
-    <message>
-        <source>(n/a)</source>
-        <translation>(n.v.t)</translation>
-    </message>
-    <message>
-        <source>Date and time that the transaction was received.</source>
-        <translation>Datum en tyd wat die transaksie ontvang was.</translation>
-    </message>
-    <message>
-        <source>Type of transaction.</source>
-        <translation>Tipe transaksie.</translation>
-    </message>
-    </context>
-<context>
-    <name>TransactionView</name>
-    <message>
-        <source>All</source>
-        <translation>Alles</translation>
-    </message>
-    <message>
-        <source>Today</source>
-        <translation>Vandag</translation>
-    </message>
-    <message>
-        <source>This week</source>
-        <translation>Hierdie week</translation>
-    </message>
-    <message>
-        <source>This month</source>
-        <translation>Hierdie maand</translation>
-    </message>
-    <message>
-        <source>Last month</source>
-        <translation>Verlede maand</translation>
-    </message>
-    <message>
-        <source>This year</source>
-        <translation>Hierdie jaar</translation>
-    </message>
-    <message>
-        <source>Range...</source>
-        <translation>Reeks...</translation>
-    </message>
-    <message>
-        <source>Received with</source>
-        <translation>Ontvang met</translation>
-    </message>
-    <message>
-        <source>Sent to</source>
-        <translation>Gestuur na</translation>
-    </message>
-    <message>
-        <source>To yourself</source>
-        <translation>Aan/na jouself</translation>
-    </message>
-    <message>
-        <source>Mined</source>
-        <translation>Gemyn</translation>
-    </message>
-    <message>
-        <source>Other</source>
-        <translation>Ander</translation>
-    </message>
-    <message>
-        <source>Min amount</source>
-        <translation>Min bedrag</translation>
-    </message>
-    <message>
-        <source>Copy address</source>
-        <translation>Maak kopie van adres</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>Kopieer bedrag</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation>Datum</translation>
-    </message>
-    <message>
-        <source>Type</source>
-        <translation>Tipe</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Etiket</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>Adres</translation>
-    </message>
-    <message>
-        <source>ID</source>
-        <translation>ID</translation>
-    </message>
-    <message>
-        <source>Range:</source>
-        <translation>Reeks:</translation>
-    </message>
-    <message>
-        <source>to</source>
-        <translation>aan</translation>
-    </message>
-</context>
 <context>
     <name>UnitDisplayStatusBarControl</name>
     </context>
-<context>
-    <name>WalletFrame</name>
-    </context>
-<context>
-    <name>WalletModel</name>
-    <message>
-        <source>Send Coins</source>
-        <translation>Stuur Munstukke</translation>
-    </message>
-</context>
-<context>
-    <name>WalletView</name>
-    </context>
 <context>
     <name>bitcoin-core</name>
     <message>
@@ -689,10 +296,6 @@
         <source>Information</source>
         <translation>Informasie</translation>
     </message>
-    <message>
-        <source>This help message</source>
-        <translation>Hierdie help boodskap</translation>
-    </message>
     <message>
         <source>Loading addresses...</source>
         <translation>Laai adresse...</translation>
diff --git a/src/qt/locale/bitcoin_ar.ts b/src/qt/locale/bitcoin_ar.ts
index 1e74564ed3ead..78fd074434316 100644
--- a/src/qt/locale/bitcoin_ar.ts
+++ b/src/qt/locale/bitcoin_ar.ts
@@ -25,10 +25,6 @@
         <source>C&amp;lose</source>
         <translation>&amp;اغلاق</translation>
     </message>
-    <message>
-        <source>&amp;Copy Address</source>
-        <translation>انسخ العنوان</translation>
-    </message>
     <message>
         <source>Delete the currently selected address from the list</source>
         <translation>حذف العنوان المحدد من القائمة</translation>
@@ -45,73 +41,6 @@
         <source>&amp;Delete</source>
         <translation>&amp;أمسح</translation>
     </message>
-    <message>
-        <source>Choose the address to send coins to</source>
-        <translation>اختر العنوان الذي سترسل له العملات</translation>
-    </message>
-    <message>
-        <source>Choose the address to receive coins with</source>
-        <translation>اختر العنوان الذي تستقبل عليه العملات</translation>
-    </message>
-    <message>
-        <source>C&amp;hoose</source>
-        <translation>&amp;اختر</translation>
-    </message>
-    <message>
-        <source>Sending addresses</source>
-        <translation>ارسال العناوين</translation>
-    </message>
-    <message>
-        <source>Receiving addresses</source>
-        <translation>استقبال العناوين</translation>
-    </message>
-    <message>
-        <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source>
-        <translation>هذه هي عناوين Bitcion التابعة لك من أجل إرسال الدفعات. تحقق دائما من المبلغ و عنوان المرسل المستقبل قبل إرسال العملات</translation>
-    </message>
-    <message>
-        <source>These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source>
-        <translation>هذه هي عناوين Bitcion التابعة لك من أجل إستقبال الدفعات. ينصح استخدام عنوان جديد من أجل كل صفقة</translation>
-    </message>
-    <message>
-        <source>Copy &amp;Label</source>
-        <translation>نسخ &amp;الوصف</translation>
-    </message>
-    <message>
-        <source>&amp;Edit</source>
-        <translation>تعديل</translation>
-    </message>
-    <message>
-        <source>Export Address List</source>
-        <translation>تصدير قائمة العناوين</translation>
-    </message>
-    <message>
-        <source>Comma separated file (*.csv)</source>
-        <translation>ملف مفصول بفواصل (*.csv)</translation>
-    </message>
-    <message>
-        <source>Exporting Failed</source>
-        <translation>فشل التصدير</translation>
-    </message>
-    <message>
-        <source>There was an error trying to save the address list to %1. Please try again.</source>
-        <translation>لقد حدث خطأ أثناء  حفظ قائمة العناوين إلى %1. يرجى المحاولة مرة أخرى.</translation>
-    </message>
-</context>
-<context>
-    <name>AddressTableModel</name>
-    <message>
-        <source>Label</source>
-        <translation>وصف</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>عنوان</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(لا وصف)</translation>
-    </message>
 </context>
 <context>
     <name>AskPassphraseDialog</name>
@@ -131,94 +60,6 @@
         <source>Repeat new passphrase</source>
         <translation>ادخل كلمة المرور الجديدة مرة أخرى</translation>
     </message>
-    <message>
-        <source>Encrypt wallet</source>
-        <translation>تشفير المحفظة</translation>
-    </message>
-    <message>
-        <source>This operation needs your wallet passphrase to unlock the wallet.</source>
-        <translation>هذه العملية تحتاج كلمة مرور محفظتك لفتحها</translation>
-    </message>
-    <message>
-        <source>Unlock wallet</source>
-        <translation>إفتح المحفظة</translation>
-    </message>
-    <message>
-        <source>This operation needs your wallet passphrase to decrypt the wallet.</source>
-        <translation>هذه العملية تحتاج كلمة مرور محفظتك لفك تشفيرها </translation>
-    </message>
-    <message>
-        <source>Decrypt wallet</source>
-        <translation>فك تشفير المحفظة</translation>
-    </message>
-    <message>
-        <source>Change passphrase</source>
-        <translation>تغيير كلمة المرور</translation>
-    </message>
-    <message>
-        <source>Confirm wallet encryption</source>
-        <translation>تأكيد تشفير المحفظة</translation>
-    </message>
-    <message>
-        <source>Warning: If you encrypt your wallet and lose your passphrase, you will &lt;b&gt;LOSE ALL OF YOUR BITCOINS&lt;/b&gt;!</source>
-        <translation>تحذير: إذا قمت بتشفير محفظتك وفقدت كلمة المرور الخاص بك, ستفقد كل عملات BITCOINS الخاصة بك.</translation>
-    </message>
-    <message>
-        <source>Are you sure you wish to encrypt your wallet?</source>
-        <translation>هل أنت متأكد من رغبتك في تشفير محفظتك ؟</translation>
-    </message>
-    <message>
-        <source>Bitcoin Core will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source>
-        <translation>بتكوين سوف يغلق الآن لإنهاء عملية التشفير. تذكر أن التشفير لا يستطيع حماية محفظتك تمامًا من السرقة من خلال البرمجيات الخبيثة التي تصيب جهازك </translation>
-    </message>
-    <message>
-        <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source>
-        <translation>هام: أي نسخة إحتياطية سابقة  قمت بها لمحفظتك يجب استبدالها  بأخرى حديثة، مشفرة. لأسباب أمنية، النسخ الاحتياطية السابقة لملفات المحفظة الغير مشفرة تصبح عديمة الفائدة مع بداية استخدام المحفظة المشفرة الجديدة.</translation>
-    </message>
-    <message>
-        <source>Warning: The Caps Lock key is on!</source>
-        <translation>تحذير: مفتاح الحروف الكبيرة مفعل</translation>
-    </message>
-    <message>
-        <source>Wallet encrypted</source>
-        <translation>محفظة مشفرة</translation>
-    </message>
-    <message>
-        <source>Enter the new passphrase to the wallet.&lt;br/&gt;Please use a passphrase of &lt;b&gt;ten or more random characters&lt;/b&gt;, or &lt;b&gt;eight or more words&lt;/b&gt;.</source>
-        <translation>أدخل عبارة مرور جديدة إلى المحفظة. الرجاء استخدام عبارة مرور تتكون من10 حروف عشوائية على الاقل, أو أكثر من 7 كلمات</translation>
-    </message>
-    <message>
-        <source>Enter the old passphrase and new passphrase to the wallet.</source>
-        <translation>أدخل كلمة المرور القديمة والجديدة للمحفظة.</translation>
-    </message>
-    <message>
-        <source>Wallet encryption failed</source>
-        <translation>فشل تشفير المحفظة</translation>
-    </message>
-    <message>
-        <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
-        <translation>فشل تشفير المحفظة بسبب خطأ داخلي. لم يتم تشفير محفظتك.</translation>
-    </message>
-    <message>
-        <source>The supplied passphrases do not match.</source>
-        <translation>كلمتي المرور ليستا متطابقتان</translation>
-    </message>
-    <message>
-        <source>Wallet unlock failed</source>
-        <translation>فشل فتح المحفظة</translation>
-    </message>
-    <message>
-        <source>The passphrase entered for the wallet decryption was incorrect.</source>
-        <translation>كلمة المرور التي تم إدخالها لفك تشفير المحفظة غير صحيحة.</translation>
-    </message>
-    <message>
-        <source>Wallet decryption failed</source>
-        <translation>فشل   فك التشفير المحفظة</translation>
-    </message>
-    <message>
-        <source>Wallet passphrase was successfully changed.</source>
-        <translation>لقد تم تغير عبارة مرور المحفظة بنجاح</translation>
-    </message>
 </context>
 <context>
     <name>BanTableModel</name>
@@ -269,9 +110,17 @@
         <source>Quit application</source>
         <translation>الخروج من التطبيق</translation>
     </message>
+    <message>
+        <source>&amp;About %1</source>
+        <translation>&amp;عن %1</translation>
+    </message>
+    <message>
+        <source>Show information about %1</source>
+        <translation>أظهر المعلومات حولة %1</translation>
+    </message>
     <message>
         <source>About &amp;Qt</source>
-        <translation>عن</translation>
+        <translation>عن &amp;Qt</translation>
     </message>
     <message>
         <source>Show information about Qt</source>
@@ -305,14 +154,6 @@
         <source>Open &amp;URI...</source>
         <translation>افتح &amp;URI...</translation>
     </message>
-    <message>
-        <source>Bitcoin Core client</source>
-        <translation>عميل bitcion core</translation>
-    </message>
-    <message>
-        <source>Importing blocks from disk...</source>
-        <translation>استيراد كتل من القرص ...</translation>
-    </message>
     <message>
         <source>Reindexing blocks on disk...</source>
         <translation>إعادة الفهرسة الكتل على القرص ...</translation>
@@ -357,10 +198,6 @@
         <source>&amp;Receive</source>
         <translation>&amp;استقبل</translation>
     </message>
-    <message>
-        <source>Show information about Bitcoin Core</source>
-        <translation>  اظهار معلومات حول bitcion core</translation>
-    </message>
     <message>
         <source>&amp;Show / Hide</source>
         <translation>&amp;عرض / اخفاء</translation>
@@ -397,22 +234,10 @@
         <source>Tabs toolbar</source>
         <translation>شريط أدوات علامات التبويب</translation>
     </message>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>جوهر البيت كوين</translation>
-    </message>
     <message>
         <source>Request payments (generates QR codes and bitcoin: URIs)</source>
         <translation>أطلب دفعات (يولد كودات الرمز المربع وبيت كوين: العناوين المعطاة)</translation>
     </message>
-    <message>
-        <source>&amp;About Bitcoin Core</source>
-        <translation>حول bitcoin core</translation>
-    </message>
-    <message>
-        <source>Modify configuration options for Bitcoin Core</source>
-        <translation>تغيير خيارات الإعداد لأساس Bitcoin</translation>
-    </message>
     <message>
         <source>Show the list of used sending addresses and labels</source>
         <translation>عرض قائمة عناوين الإرسال المستخدمة والملصقات</translation>
@@ -429,6 +254,14 @@
         <source>&amp;Command-line options</source>
         <translation>&amp;خيارات سطر الأوامر</translation>
     </message>
+    <message>
+        <source>Indexing blocks on disk...</source>
+        <translation>ترتيب الفهرسة الكتل على القرص...</translation>
+    </message>
+    <message>
+        <source>Processing blocks on disk...</source>
+        <translation>معالجة الكتل على القرص...</translation>
+    </message>
     <message>
         <source>No block source available...</source>
         <translation>لا يوجد أي مصدر الكتلة</translation>
@@ -490,13 +323,6 @@
         <translation>المحفظة &lt;b&gt;مشفرة&lt;/b&gt; و &lt;b&gt;مقفلة&lt;/b&gt; حاليا</translation>
     </message>
 </context>
-<context>
-    <name>ClientModel</name>
-    <message>
-        <source>Network Alert</source>
-        <translation>تنبيه من الشبكة</translation>
-    </message>
-</context>
 <context>
     <name>CoinControlDialog</name>
     <message>
@@ -551,114 +377,6 @@
         <source>Priority</source>
         <translation>أفضلية</translation>
     </message>
-    <message>
-        <source>Copy address</source>
-        <translation>  انسخ عنوان</translation>
-    </message>
-    <message>
-        <source>Copy label</source>
-        <translation> انسخ التسمية</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>نسخ الكمية</translation>
-    </message>
-    <message>
-        <source>Copy transaction ID</source>
-        <translation>نسخ رقم العملية</translation>
-    </message>
-    <message>
-        <source>Copy quantity</source>
-        <translation>نسخ الكمية </translation>
-    </message>
-    <message>
-        <source>Copy fee</source>
-        <translation>نسخ الرسوم</translation>
-    </message>
-    <message>
-        <source>Copy after fee</source>
-        <translation>نسخ بعد الرسوم</translation>
-    </message>
-    <message>
-        <source>Copy priority</source>
-        <translation>نسخ الافضلية</translation>
-    </message>
-    <message>
-        <source>Copy change</source>
-        <translation>نسخ التعديل</translation>
-    </message>
-    <message>
-        <source>highest</source>
-        <translation>الاعلى</translation>
-    </message>
-    <message>
-        <source>higher</source>
-        <translation>اعلى</translation>
-    </message>
-    <message>
-        <source>high</source>
-        <translation>عالي</translation>
-    </message>
-    <message>
-        <source>medium-high</source>
-        <translation>متوسط-مرتفع</translation>
-    </message>
-    <message>
-        <source>medium</source>
-        <translation>متوسط</translation>
-    </message>
-    <message>
-        <source>low-medium</source>
-        <translation>متوسط-منخفض</translation>
-    </message>
-    <message>
-        <source>low</source>
-        <translation>منخفض</translation>
-    </message>
-    <message>
-        <source>lower</source>
-        <translation>أدنى</translation>
-    </message>
-    <message>
-        <source>lowest</source>
-        <translation>الأدنى</translation>
-    </message>
-    <message>
-        <source>none</source>
-        <translation>لا شيء</translation>
-    </message>
-    <message>
-        <source>This label turns red if the transaction size is greater than 1000 bytes.</source>
-        <translation>هذا الملصق يصبح أخمرا إذا كان حجم المعاملة أكبر من 1000 بايت.</translation>
-    </message>
-    <message>
-        <source>yes</source>
-        <translation>نعم</translation>
-    </message>
-    <message>
-        <source>no</source>
-        <translation>لا</translation>
-    </message>
-    <message>
-        <source>This means a fee of at least %1 per kB is required.</source>
-        <translation>هذا يعني أن من المطلوب أن يكون الرسم ألى الأقل %1 لكل كيلوبايت.</translation>
-    </message>
-    <message>
-        <source>Can vary +/- 1 byte per input.</source>
-        <translation>يمكن أن يتفاوت بـ 1 بايت لكل مساهمة.</translation>
-    </message>
-    <message>
-        <source>Transactions with higher priority are more likely to get included into a block.</source>
-        <translation>المعاملات التي لديها أولوية أعلى على الأرجح سيتم إنضمامها في الكتلة.</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(لا وصف)</translation>
-    </message>
-    <message>
-        <source>(change)</source>
-        <translation>(تغير)</translation>
-    </message>
 </context>
 <context>
     <name>EditAddressDialog</name>
@@ -674,38 +392,6 @@
         <source>&amp;Address</source>
         <translation>&amp;العنوان</translation>
     </message>
-    <message>
-        <source>New receiving address</source>
-        <translation>عنوان أستلام جديد</translation>
-    </message>
-    <message>
-        <source>New sending address</source>
-        <translation>عنوان إرسال جديد</translation>
-    </message>
-    <message>
-        <source>Edit receiving address</source>
-        <translation>تعديل عنوان الأستلام</translation>
-    </message>
-    <message>
-        <source>Edit sending address</source>
-        <translation>تعديل عنوان الارسال</translation>
-    </message>
-    <message>
-        <source>The entered address "%1" is already in the address book.</source>
-        <translation>هدا العنوان "%1" موجود مسبقا في دفتر العناوين</translation>
-    </message>
-    <message>
-        <source>The entered address "%1" is not a valid Bitcoin address.</source>
-        <translation>العنوان المدخل "%1" ليس عنوان بيت كوين صحيح.</translation>
-    </message>
-    <message>
-        <source>Could not unlock wallet.</source>
-        <translation> يمكن فتح المحفظة.</translation>
-    </message>
-    <message>
-        <source>New key generation failed.</source>
-        <translation>فشل توليد مفتاح جديد.</translation>
-    </message>
 </context>
 <context>
     <name>FreespaceChecker</name>
@@ -732,18 +418,10 @@
 </context>
 <context>
     <name>HelpMessageDialog</name>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>جوهر البيت كوين</translation>
-    </message>
     <message>
         <source>version</source>
         <translation>النسخة</translation>
     </message>
-    <message>
-        <source>About Bitcoin Core</source>
-        <translation>عن جوهر البيت كوين</translation>
-    </message>
     <message>
         <source>Command-line options</source>
         <translation>خيارات سطر الأوامر</translation>
@@ -772,11 +450,7 @@
         <source>Show splash screen on startup (default: %u)</source>
         <translation>أظهر شاشة البداية عند بدء التشغيل (افتراضي: %u)</translation>
     </message>
-    <message>
-        <source>Reset all settings changes made over the GUI</source>
-        <translation>إعادة تعيين كل الإعدادات تم تغييرها من خلال الواجهة الرسومية</translation>
-    </message>
-</context>
+    </context>
 <context>
     <name>Intro</name>
     <message>
@@ -791,10 +465,6 @@
         <source>Use a custom data directory:</source>
         <translation>استخدام دليل بيانات مخصص:</translation>
     </message>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>جوهر البيت كوين</translation>
-    </message>
     <message>
         <source>Error</source>
         <translation>خطأ</translation>
@@ -806,10 +476,6 @@
         <source>Select payment request file</source>
         <translation>حدد ملف طلب الدفع</translation>
     </message>
-    <message>
-        <source>Select payment request file to open</source>
-        <translation>حدد ملف طلب الدفع لفتحه</translation>
-    </message>
 </context>
 <context>
     <name>OptionsDialog</name>
@@ -925,13 +591,6 @@
         <translation>رصيدك الكلي الحالي</translation>
     </message>
     </context>
-<context>
-    <name>PaymentServer</name>
-    <message>
-        <source>Bad response from server %1</source>
-        <translation>استجابة سيئة من الملقم %1</translation>
-    </message>
-    </context>
 <context>
     <name>PeerTableModel</name>
     </context>
@@ -954,25 +613,6 @@
         <translation>غير معروف</translation>
     </message>
     </context>
-<context>
-    <name>QRImageWidget</name>
-    <message>
-        <source>&amp;Save Image...</source>
-        <translation>&amp;حفظ الصورة</translation>
-    </message>
-    <message>
-        <source>&amp;Copy Image</source>
-        <translation>&amp;نسخ الصورة</translation>
-    </message>
-    <message>
-        <source>Save QR Code</source>
-        <translation>حفظ رمز الاستجابة السريعة QR</translation>
-    </message>
-    <message>
-        <source>PNG Image (*.png)</source>
-        <translation>صورة PNG (*.png)</translation>
-    </message>
-</context>
 <context>
     <name>RPCConsole</name>
     <message>
@@ -1063,10 +703,6 @@
         <source>Out:</source>
         <translation>خارج:</translation>
     </message>
-    <message>
-        <source>Build date</source>
-        <translation>وقت البناء</translation>
-    </message>
     <message>
         <source>Use up and down arrows to navigate history, and &lt;b&gt;Ctrl-L&lt;/b&gt; to clear screen.</source>
         <translation>استخدم اسهم الاعلى و الاسفل للتنقل بين السجلات و &lt;b&gt;Ctrl-L&lt;/b&gt;  لمسح الشاشة</translation>
@@ -1134,18 +770,6 @@
         <source>Remove</source>
         <translation>ازل</translation>
     </message>
-    <message>
-        <source>Copy label</source>
-        <translation> انسخ التسمية</translation>
-    </message>
-    <message>
-        <source>Copy message</source>
-        <translation>انسخ الرسالة</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>نسخ الكمية</translation>
-    </message>
 </context>
 <context>
     <name>ReceiveRequestDialog</name>
@@ -1165,58 +789,7 @@
         <source>&amp;Save Image...</source>
         <translation>&amp;حفظ الصورة</translation>
     </message>
-    <message>
-        <source>Payment information</source>
-        <translation>معلومات الدفع</translation>
-    </message>
-    <message>
-        <source>URI</source>
-        <translation> URI</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>عنوان</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>المبلغ</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>وصف</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>رسالة </translation>
-    </message>
-    </context>
-<context>
-    <name>RecentRequestsTableModel</name>
-    <message>
-        <source>Date</source>
-        <translation>التاريخ</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>وصف</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>رسالة </translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>المبلغ</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(لا وصف)</translation>
-    </message>
-    <message>
-        <source>(no message)</source>
-        <translation>( لا رسائل )</translation>
-    </message>
-    </context>
+</context>
 <context>
     <name>SendCoinsDialog</name>
     <message>
@@ -1260,7 +833,11 @@
         <translation>رسوم المعاملة:</translation>
     </message>
     <message>
-        <source>Send to multiple recipients at once</source>
+        <source>Hide</source>
+        <translation>إخفاء</translation>
+    </message>
+    <message>
+        <source>Send to multiple recipients at once</source>
         <translation>إرسال إلى عدة مستلمين في وقت واحد</translation>
     </message>
     <message>
@@ -1287,59 +864,7 @@
         <source>S&amp;end</source>
         <translation>&amp;ارسال</translation>
     </message>
-    <message>
-        <source>Confirm send coins</source>
-        <translation>تأكيد الإرسال Coins</translation>
-    </message>
-    <message>
-        <source>%1 to %2</source>
-        <translation>%1 الى %2</translation>
-    </message>
-    <message>
-        <source>Copy quantity</source>
-        <translation>نسخ الكمية </translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>نسخ الكمية</translation>
-    </message>
-    <message>
-        <source>Copy fee</source>
-        <translation>نسخ الرسوم</translation>
-    </message>
-    <message>
-        <source>Copy after fee</source>
-        <translation>نسخ بعد الرسوم</translation>
-    </message>
-    <message>
-        <source>Copy priority</source>
-        <translation>نسخ الافضلية</translation>
-    </message>
-    <message>
-        <source>Copy change</source>
-        <translation>نسخ التعديل</translation>
-    </message>
-    <message>
-        <source>or</source>
-        <translation>أو</translation>
-    </message>
-    <message>
-        <source>The amount to pay must be larger than 0.</source>
-        <translation>المبلغ المدفوع يجب ان يكون اكبر من 0</translation>
-    </message>
-    <message>
-        <source>The amount exceeds your balance.</source>
-        <translation>القيمة تتجاوز رصيدك</translation>
-    </message>
-    <message>
-        <source>The total exceeds your balance when the %1 transaction fee is included.</source>
-        <translation>المجموع يتجاوز رصيدك عندما يتم اضافة %1 رسوم العملية</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(لا وصف)</translation>
-    </message>
-    </context>
+</context>
 <context>
     <name>SendCoinsEntry</name>
     <message>
@@ -1350,10 +875,6 @@
         <source>Pay &amp;To:</source>
         <translation>ادفع &amp;الى :</translation>
     </message>
-    <message>
-        <source>Enter a label for this address to add it to your address book</source>
-        <translation>إدخال تسمية لهذا العنوان لإضافته إلى دفتر العناوين الخاص بك</translation>
-    </message>
     <message>
         <source>&amp;Label:</source>
         <translation>&amp;وصف :</translation>
@@ -1432,61 +953,9 @@
         <source>Verify &amp;Message</source>
         <translation>تحقق &amp;الرسالة</translation>
     </message>
-    <message>
-        <source>Click "Sign Message" to generate signature</source>
-        <translation>اضغط  "توقيع الرسالة" لتوليد التوقيع</translation>
-    </message>
-    <message>
-        <source>The entered address is invalid.</source>
-        <translation>العنوان المدخل غير صالح</translation>
-    </message>
-    <message>
-        <source>Please check the address and try again.</source>
-        <translation>الرجاء التأكد من العنوان والمحاولة مرة اخرى</translation>
-    </message>
-    <message>
-        <source>The entered address does not refer to a key.</source>
-        <translation>العنوان المدخل لا يشير الى مفتاح</translation>
-    </message>
-    <message>
-        <source>Wallet unlock was cancelled.</source>
-        <translation>تم الغاء عملية فتح المحفظة</translation>
-    </message>
-    <message>
-        <source>Private key for the entered address is not available.</source>
-        <translation>المفتاح الخاص للعنوان المدخل غير موجود.</translation>
-    </message>
-    <message>
-        <source>Message signing failed.</source>
-        <translation>فشل توقيع الرسالة.</translation>
-    </message>
-    <message>
-        <source>Message signed.</source>
-        <translation>الرسالة موقعة.</translation>
-    </message>
-    <message>
-        <source>Please check the signature and try again.</source>
-        <translation>فضلا تاكد من التوقيع وحاول مرة اخرى</translation>
-    </message>
-    <message>
-        <source>Message verification failed.</source>
-        <translation>فشلت عملية التأكد من الرسالة.</translation>
-    </message>
-    <message>
-        <source>Message verified.</source>
-        <translation>تم تأكيد الرسالة.</translation>
-    </message>
-</context>
+    </context>
 <context>
     <name>SplashScreen</name>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>جوهر البيت كوين</translation>
-    </message>
-    <message>
-        <source>The Bitcoin Core developers</source>
-        <translation>مطوري جوهر البيت كوين</translation>
-    </message>
     <message>
         <source>[testnet]</source>
         <translation>[testnet]</translation>
@@ -1495,362 +964,16 @@
 <context>
     <name>TrafficGraphWidget</name>
     </context>
-<context>
-    <name>TransactionDesc</name>
-    <message>
-        <source>Open until %1</source>
-        <translation>مفتوح حتى %1</translation>
-    </message>
-    <message>
-        <source>conflicted</source>
-        <translation>يتعارض</translation>
-    </message>
-    <message>
-        <source>%1/offline</source>
-        <translation>%1 غير متواجد</translation>
-    </message>
-    <message>
-        <source>%1/unconfirmed</source>
-        <translation>غير مؤكدة/%1</translation>
-    </message>
-    <message>
-        <source>%1 confirmations</source>
-        <translation>تأكيد %1</translation>
-    </message>
-    <message>
-        <source>Status</source>
-        <translation>الحالة.</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation>التاريخ</translation>
-    </message>
-    <message>
-        <source>Source</source>
-        <translation>المصدر</translation>
-    </message>
-    <message>
-        <source>Generated</source>
-        <translation>تم اصداره.</translation>
-    </message>
-    <message>
-        <source>From</source>
-        <translation>من</translation>
-    </message>
-    <message>
-        <source>To</source>
-        <translation>الى</translation>
-    </message>
-    <message>
-        <source>own address</source>
-        <translation>عنوانه</translation>
-    </message>
-    <message>
-        <source>label</source>
-        <translation>علامة</translation>
-    </message>
-    <message>
-        <source>not accepted</source>
-        <translation>غير مقبولة</translation>
-    </message>
-    <message>
-        <source>Debit</source>
-        <translation>دين</translation>
-    </message>
-    <message>
-        <source>Transaction fee</source>
-        <translation>رسوم المعاملة</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>رسالة </translation>
-    </message>
-    <message>
-        <source>Comment</source>
-        <translation>تعليق</translation>
-    </message>
-    <message>
-        <source>Transaction ID</source>
-        <translation>رقم المعاملة</translation>
-    </message>
-    <message>
-        <source>Merchant</source>
-        <translation>تاجر</translation>
-    </message>
-    <message>
-        <source>Transaction</source>
-        <translation>معاملة</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>المبلغ</translation>
-    </message>
-    <message>
-        <source>true</source>
-        <translation>صحيح</translation>
-    </message>
-    <message>
-        <source>false</source>
-        <translation>خاطئ</translation>
-    </message>
-    <message>
-        <source>, has not been successfully broadcast yet</source>
-        <translation>,  لم يتم حتى الآن البث بنجاح</translation>
-    </message>
-    <message>
-        <source>unknown</source>
-        <translation>غير معروف</translation>
-    </message>
-</context>
 <context>
     <name>TransactionDescDialog</name>
-    <message>
-        <source>Transaction details</source>
-        <translation>تفاصيل المعاملة</translation>
-    </message>
     <message>
         <source>This pane shows a detailed description of the transaction</source>
         <translation>يبين هذا الجزء وصفا مفصلا لهده المعاملة</translation>
     </message>
 </context>
-<context>
-    <name>TransactionTableModel</name>
-    <message>
-        <source>Date</source>
-        <translation>التاريخ</translation>
-    </message>
-    <message>
-        <source>Type</source>
-        <translation>النوع</translation>
-    </message>
-    <message>
-        <source>Open until %1</source>
-        <translation>مفتوح حتى %1</translation>
-    </message>
-    <message>
-        <source>This block was not received by any other nodes and will probably not be accepted!</source>
-        <translation>لم يتم تلقى هذه الكتلة (Block) من قبل أي العقد الأخرى وربما لن تكون مقبولة!</translation>
-    </message>
-    <message>
-        <source>Generated but not accepted</source>
-        <translation>ولدت ولكن لم تقبل</translation>
-    </message>
-    <message>
-        <source>Offline</source>
-        <translation>غير متصل</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>وصف</translation>
-    </message>
-    <message>
-        <source>Conflicted</source>
-        <translation>يتعارض</translation>
-    </message>
-    <message>
-        <source>Received with</source>
-        <translation>استقبل مع</translation>
-    </message>
-    <message>
-        <source>Received from</source>
-        <translation>استقبل من</translation>
-    </message>
-    <message>
-        <source>Sent to</source>
-        <translation>أرسل إلى</translation>
-    </message>
-    <message>
-        <source>Payment to yourself</source>
-        <translation>دفع لنفسك</translation>
-    </message>
-    <message>
-        <source>Mined</source>
-        <translation>Mined</translation>
-    </message>
-    <message>
-        <source>(n/a)</source>
-        <translation>غير متوفر</translation>
-    </message>
-    <message>
-        <source>Transaction status. Hover over this field to show number of confirmations.</source>
-        <translation>حالة المعاملة. تحوم حول هذا الحقل لعرض عدد  التأكيدات.</translation>
-    </message>
-    <message>
-        <source>Date and time that the transaction was received.</source>
-        <translation>التاريخ والوقت الذي تم فيه تلقي المعاملة.</translation>
-    </message>
-    <message>
-        <source>Type of transaction.</source>
-        <translation>نوع المعاملات</translation>
-    </message>
-    <message>
-        <source>Amount removed from or added to balance.</source>
-        <translation>المبلغ الذي أزيل أو أضيف الى الرصيد</translation>
-    </message>
-</context>
-<context>
-    <name>TransactionView</name>
-    <message>
-        <source>All</source>
-        <translation>الكل</translation>
-    </message>
-    <message>
-        <source>Today</source>
-        <translation>اليوم</translation>
-    </message>
-    <message>
-        <source>This week</source>
-        <translation>هدا الاسبوع</translation>
-    </message>
-    <message>
-        <source>This month</source>
-        <translation>هدا الشهر</translation>
-    </message>
-    <message>
-        <source>Last month</source>
-        <translation>الشهر الماضي</translation>
-    </message>
-    <message>
-        <source>This year</source>
-        <translation>هدا العام</translation>
-    </message>
-    <message>
-        <source>Range...</source>
-        <translation>المدى...</translation>
-    </message>
-    <message>
-        <source>Received with</source>
-        <translation>استقبل مع</translation>
-    </message>
-    <message>
-        <source>Sent to</source>
-        <translation>أرسل إلى</translation>
-    </message>
-    <message>
-        <source>To yourself</source>
-        <translation>إليك</translation>
-    </message>
-    <message>
-        <source>Mined</source>
-        <translation>Mined</translation>
-    </message>
-    <message>
-        <source>Other</source>
-        <translation>اخرى</translation>
-    </message>
-    <message>
-        <source>Enter address or label to search</source>
-        <translation>ادخل عنوان أووصف للبحث</translation>
-    </message>
-    <message>
-        <source>Min amount</source>
-        <translation>الحد الأدنى</translation>
-    </message>
-    <message>
-        <source>Copy address</source>
-        <translation>  انسخ عنوان</translation>
-    </message>
-    <message>
-        <source>Copy label</source>
-        <translation> انسخ التسمية</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>نسخ الكمية</translation>
-    </message>
-    <message>
-        <source>Copy transaction ID</source>
-        <translation>نسخ رقم العملية</translation>
-    </message>
-    <message>
-        <source>Edit label</source>
-        <translation>عدل الوصف</translation>
-    </message>
-    <message>
-        <source>Show transaction details</source>
-        <translation>عرض تفاصيل المعاملة</translation>
-    </message>
-    <message>
-        <source>Exporting Failed</source>
-        <translation>فشل التصدير</translation>
-    </message>
-    <message>
-        <source>Exporting Successful</source>
-        <translation>نجح التصدير</translation>
-    </message>
-    <message>
-        <source>Comma separated file (*.csv)</source>
-        <translation>ملف مفصول بفواصل (*.csv)</translation>
-    </message>
-    <message>
-        <source>Confirmed</source>
-        <translation>تأكيد</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation>التاريخ</translation>
-    </message>
-    <message>
-        <source>Type</source>
-        <translation>النوع</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>وصف</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>عنوان</translation>
-    </message>
-    <message>
-        <source>ID</source>
-        <translation>العنوان</translation>
-    </message>
-    <message>
-        <source>Range:</source>
-        <translation>المدى:</translation>
-    </message>
-    <message>
-        <source>to</source>
-        <translation>الى</translation>
-    </message>
-</context>
 <context>
     <name>UnitDisplayStatusBarControl</name>
     </context>
-<context>
-    <name>WalletFrame</name>
-    </context>
-<context>
-    <name>WalletModel</name>
-    <message>
-        <source>Send Coins</source>
-        <translation>إرسال Coins</translation>
-    </message>
-</context>
-<context>
-    <name>WalletView</name>
-    <message>
-        <source>&amp;Export</source>
-        <translation>&amp;تصدير</translation>
-    </message>
-    <message>
-        <source>Export the data in the current tab to a file</source>
-        <translation>تحميل البيانات في علامة التبويب الحالية إلى ملف.</translation>
-    </message>
-    <message>
-        <source>Backup Wallet</source>
-        <translation>نسخ احتياط للمحفظة</translation>
-    </message>
-    <message>
-        <source>Backup Failed</source>
-        <translation>فشل النسخ الاحتياطي</translation>
-    </message>
-    <message>
-        <source>Backup Successful</source>
-        <translation>نجاح  النسخ الاحتياطي</translation>
-    </message>
-</context>
 <context>
     <name>bitcoin-core</name>
     <message>
@@ -1865,6 +988,10 @@
         <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
         <translation>قبول الاتصالات من خارج</translation>
     </message>
+    <message>
+        <source>Bitcoin Core</source>
+        <translation>جوهر البيت كوين</translation>
+    </message>
     <message>
         <source>Error: Disk space is low!</source>
         <translation>تحذير: مساحة القرص منخفضة</translation>
@@ -1909,22 +1036,10 @@
         <source>Warning</source>
         <translation>تحذير</translation>
     </message>
-    <message>
-        <source>This help message</source>
-        <translation>رسالة المساعدة هذه</translation>
-    </message>
     <message>
         <source>Loading addresses...</source>
         <translation>تحميل العنوان</translation>
     </message>
-    <message>
-        <source>Error loading wallet.dat: Wallet corrupted</source>
-        <translation>خطأ عند تنزيل wallet.dat: المحفظة تالفة</translation>
-    </message>
-    <message>
-        <source>Error loading wallet.dat</source>
-        <translation>خطأ عند تنزيل wallet.dat</translation>
-    </message>
     <message>
         <source>Invalid -proxy address: '%s'</source>
         <translation>عنوان البروكسي غير صحيح : '%s'</translation>
diff --git a/src/qt/locale/bitcoin_be_BY.ts b/src/qt/locale/bitcoin_be_BY.ts
index 2709ff37e5157..5894148fe0342 100644
--- a/src/qt/locale/bitcoin_be_BY.ts
+++ b/src/qt/locale/bitcoin_be_BY.ts
@@ -25,10 +25,6 @@
         <source>C&amp;lose</source>
         <translation>Зачыніць</translation>
     </message>
-    <message>
-        <source>&amp;Copy Address</source>
-        <translation>Капіяваць адрас</translation>
-    </message>
     <message>
         <source>Delete the currently selected address from the list</source>
         <translation>Выдаліць абраны адрас са спісу</translation>
@@ -45,73 +41,6 @@
         <source>&amp;Delete</source>
         <translation>Выдаліць</translation>
     </message>
-    <message>
-        <source>Choose the address to send coins to</source>
-        <translation>Выбраць адрас, куды выслаць сродкі</translation>
-    </message>
-    <message>
-        <source>Choose the address to receive coins with</source>
-        <translation>Выбраць адрас, на які атрымаць сродкі</translation>
-    </message>
-    <message>
-        <source>C&amp;hoose</source>
-        <translation>Выбраць</translation>
-    </message>
-    <message>
-        <source>Sending addresses</source>
-        <translation>адрасы Адпраўкі</translation>
-    </message>
-    <message>
-        <source>Receiving addresses</source>
-        <translation>адрасы Прымання</translation>
-    </message>
-    <message>
-        <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source>
-        <translation>Тут знаходзяцца Біткойн-адрасы для высылання плацяжоў. Заўсёды спраўджвайце колькасць і адрас прызначэння перад здзяйсненнем транзакцыі.</translation>
-    </message>
-    <message>
-        <source>These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source>
-        <translation>Тут знаходзяцца Біткойн-адрасы для прымання плацяжоў. Пажадана выкарыстоўваць новы адрас для кожнай транзакцыі.</translation>
-    </message>
-    <message>
-        <source>Copy &amp;Label</source>
-        <translation>Капіяваць Метку</translation>
-    </message>
-    <message>
-        <source>&amp;Edit</source>
-        <translation>Рэдагаваць</translation>
-    </message>
-    <message>
-        <source>Export Address List</source>
-        <translation>Экспартаваць Спіс Адрасоў</translation>
-    </message>
-    <message>
-        <source>Comma separated file (*.csv)</source>
-        <translation>Коскамі падзелены файл (*.csv)</translation>
-    </message>
-    <message>
-        <source>Exporting Failed</source>
-        <translation>Экспартаванне няўдалае</translation>
-    </message>
-    <message>
-        <source>There was an error trying to save the address list to %1. Please try again.</source>
-        <translation>Адбылася памылка падчас спробы захаваць адрас у %1. Паспрабуйце зноў.</translation>
-    </message>
-</context>
-<context>
-    <name>AddressTableModel</name>
-    <message>
-        <source>Label</source>
-        <translation>Метка</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>Адрас</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>непазначаны</translation>
-    </message>
 </context>
 <context>
     <name>AskPassphraseDialog</name>
@@ -131,94 +60,6 @@
         <source>Repeat new passphrase</source>
         <translation>Паўтарыце новую кодавую фразу</translation>
     </message>
-    <message>
-        <source>Encrypt wallet</source>
-        <translation>Зашыфраваць гаманец.</translation>
-    </message>
-    <message>
-        <source>This operation needs your wallet passphrase to unlock the wallet.</source>
-        <translation>Гэтая аперацыя патрабуе кодавую фразу, каб рзблакаваць гаманец.</translation>
-    </message>
-    <message>
-        <source>Unlock wallet</source>
-        <translation>Разблакаваць гаманец</translation>
-    </message>
-    <message>
-        <source>This operation needs your wallet passphrase to decrypt the wallet.</source>
-        <translation>Гэтая аперацыя патрабуе пароль каб расшыфраваць гаманец.</translation>
-    </message>
-    <message>
-        <source>Decrypt wallet</source>
-        <translation>Рачшыфраваць гаманец</translation>
-    </message>
-    <message>
-        <source>Change passphrase</source>
-        <translation>Змяніць пароль</translation>
-    </message>
-    <message>
-        <source>Confirm wallet encryption</source>
-        <translation>Пацвердзіце шыфраванне гаманца</translation>
-    </message>
-    <message>
-        <source>Warning: If you encrypt your wallet and lose your passphrase, you will &lt;b&gt;LOSE ALL OF YOUR BITCOINS&lt;/b&gt;!</source>
-        <translation>Увага: калі вы зашыфруеце свой гаманец і страціце парольную фразу, то &lt;b&gt;СТРАЦІЦЕ ЎСЕ СВАЕ БІТКОЙНЫ&lt;/b&gt;!</translation>
-    </message>
-    <message>
-        <source>Are you sure you wish to encrypt your wallet?</source>
-        <translation>Ці ўпэўненыя вы, што жадаеце зашыфраваць свой гаманец?</translation>
-    </message>
-    <message>
-        <source>Bitcoin Core will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source>
-        <translation>Bitcoin Core зараз будзе зачынены, каб фіналізаваць працэс шыфравання. Памятайце, што шыфраванне вашага гаманца не гарантуе абсалютную абарону ад магчымасці крадзяжу біткойнаў шкоднымі праграмамі, якія могуць інфікаваць ваш камп'ютар.</translation>
-    </message>
-    <message>
-        <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source>
-        <translation>ВАЖНА: Усе папярэднія копіі гаманца варта замяніць новым зашыфраваным файлам. У мэтах бяспекі папярэднія копіі незашыфраванага файла-гаманца стануць неўжывальнымі, калі вы станеце карыстацца новым зашыфраваным гаманцом.</translation>
-    </message>
-    <message>
-        <source>Warning: The Caps Lock key is on!</source>
-        <translation>Увага: Caps Lock уключаны!</translation>
-    </message>
-    <message>
-        <source>Wallet encrypted</source>
-        <translation>Гаманец зашыфраваны</translation>
-    </message>
-    <message>
-        <source>Enter the new passphrase to the wallet.&lt;br/&gt;Please use a passphrase of &lt;b&gt;ten or more random characters&lt;/b&gt;, or &lt;b&gt;eight or more words&lt;/b&gt;.</source>
-        <translation>Увядзіце новы пароль для гаманца.&lt;br/&gt;Парольная фраза павинна складацца&lt;b&gt; не меньш чым з дзесяці сімвалаў&lt;/b&gt;, ці &lt;b&gt;больш чым з васьмі слоў&lt;/b&gt;.</translation>
-    </message>
-    <message>
-        <source>Enter the old passphrase and new passphrase to the wallet.</source>
-        <translation>Увядзіце стары пароль і новы пароль для гаманца.</translation>
-    </message>
-    <message>
-        <source>Wallet encryption failed</source>
-        <translation>Шыфраванне гаманца няўдалае</translation>
-    </message>
-    <message>
-        <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
-        <translation>Шыфраванне гаманца не адбылося з-за ўнутранай памылкі. Гаманец незашыфраваны.</translation>
-    </message>
-    <message>
-        <source>The supplied passphrases do not match.</source>
-        <translation>Уведдзеныя паролі не супадаюць</translation>
-    </message>
-    <message>
-        <source>Wallet unlock failed</source>
-        <translation>Разблакаванне гаманца няўдалае</translation>
-    </message>
-    <message>
-        <source>The passphrase entered for the wallet decryption was incorrect.</source>
-        <translation>Уведзены пароль  для расшыфравання гаманца памылковы</translation>
-    </message>
-    <message>
-        <source>Wallet decryption failed</source>
-        <translation>Расшыфраванне гаманца няўдалае</translation>
-    </message>
-    <message>
-        <source>Wallet passphrase was successfully changed.</source>
-        <translation>Парольная фраза гаманца паспяхова зменена.</translation>
-    </message>
 </context>
 <context>
     <name>BanTableModel</name>
@@ -297,14 +138,6 @@
         <source>Open &amp;URI...</source>
         <translation>Адчыниць &amp;URI...</translation>
     </message>
-    <message>
-        <source>Bitcoin Core client</source>
-        <translation>Bitcoin Core кліент</translation>
-    </message>
-    <message>
-        <source>Importing blocks from disk...</source>
-        <translation>Імпартуюцца блокі з дыску...</translation>
-    </message>
     <message>
         <source>Reindexing blocks on disk...</source>
         <translation>Пераіндэксацыя блокаў на дыску...</translation>
@@ -349,10 +182,6 @@
         <source>&amp;Receive</source>
         <translation>Атрымаць</translation>
     </message>
-    <message>
-        <source>Show information about Bitcoin Core</source>
-        <translation>Паказаць інфармацыю аб Bitcoin Core</translation>
-    </message>
     <message>
         <source>&amp;Show / Hide</source>
         <translation>&amp;Паказаць / Схаваць</translation>
@@ -385,22 +214,10 @@
         <source>&amp;Help</source>
         <translation>Дапамога</translation>
     </message>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Bitcoin Core</translation>
-    </message>
     <message>
         <source>Request payments (generates QR codes and bitcoin: URIs)</source>
         <translation>Запатрабаваць плацёж (генеруецца QR-код для біткойн URI)</translation>
     </message>
-    <message>
-        <source>&amp;About Bitcoin Core</source>
-        <translation>Аб Bitcoin Core</translation>
-    </message>
-    <message>
-        <source>Modify configuration options for Bitcoin Core</source>
-        <translation>Мадыфікаваць опцыі канфігурацыі Bitcoin Core</translation>
-    </message>
     <message>
         <source>Show the list of used sending addresses and labels</source>
         <translation>Паказаць спіс адрасоў і метак для дасылання</translation>
@@ -417,10 +234,6 @@
         <source>&amp;Command-line options</source>
         <translation>Опцыі каманднага радка</translation>
     </message>
-    <message>
-        <source>Show the Bitcoin Core help message to get a list with possible Bitcoin command-line options</source>
-        <translation>Паказваць даведку Bitcoin Core каб атрымаць спіс магчымых опцый каманднага радка</translation>
-    </message>
     <message numerus="yes">
         <source>%n active connection(s) to Bitcoin network</source>
         <translation><numerusform>%n актыўнае злучэнне з сецівам Bitcoin</numerusform><numerusform>%n актыўных злучэнняў з сецівам Bitcoin</numerusform><numerusform>%n актыўных злучэнняў з сецівам Bitcoin</numerusform><numerusform>%n актыўных злучэнняў з сецівам Bitcoin</numerusform></translation>
@@ -532,13 +345,6 @@
         <translation>Гаманец &lt;b&gt;зашыфраваны&lt;/b&gt; і зараз &lt;b&gt;заблакаваны&lt;/b&gt;</translation>
     </message>
 </context>
-<context>
-    <name>ClientModel</name>
-    <message>
-        <source>Network Alert</source>
-        <translation>Трывога Сеціва</translation>
-    </message>
-</context>
 <context>
     <name>CoinControlDialog</name>
     <message>
@@ -609,111 +415,7 @@
         <source>Priority</source>
         <translation>Прыярытэт</translation>
     </message>
-    <message>
-        <source>Copy address</source>
-        <translation>Капіяваць адрас</translation>
-    </message>
-    <message>
-        <source>Copy label</source>
-        <translation>Капіяваць пазнаку</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>Капіяваць колькасць</translation>
-    </message>
-    <message>
-        <source>Copy transaction ID</source>
-        <translation>Капіяваць ID транзакцыі</translation>
-    </message>
-    <message>
-        <source>Lock unspent</source>
-        <translation>Замкнуць непатрачанае</translation>
-    </message>
-    <message>
-        <source>Unlock unspent</source>
-        <translation>Адамкнуць непатрачанае</translation>
-    </message>
-    <message>
-        <source>Copy quantity</source>
-        <translation>Капіяваць колькасць</translation>
-    </message>
-    <message>
-        <source>Copy fee</source>
-        <translation>Капіяваць камісію</translation>
-    </message>
-    <message>
-        <source>Copy after fee</source>
-        <translation>Капіяваць з выняткам камісіі</translation>
-    </message>
-    <message>
-        <source>Copy bytes</source>
-        <translation>Капіяваць байты</translation>
-    </message>
-    <message>
-        <source>Copy priority</source>
-        <translation>Капіяваць прыярытэт</translation>
-    </message>
-    <message>
-        <source>Copy dust</source>
-        <translation>Капіяваць пыл</translation>
-    </message>
-    <message>
-        <source>highest</source>
-        <translation>найвышэйшы</translation>
-    </message>
-    <message>
-        <source>higher</source>
-        <translation>вышэйшы</translation>
-    </message>
-    <message>
-        <source>high</source>
-        <translation>высокі</translation>
-    </message>
-    <message>
-        <source>medium-high</source>
-        <translation>вышэй сярэдняга</translation>
-    </message>
-    <message>
-        <source>medium</source>
-        <translation>сярэдні</translation>
-    </message>
-    <message>
-        <source>low-medium</source>
-        <translation>ніжэй сярэдняга</translation>
-    </message>
-    <message>
-        <source>low</source>
-        <translation>нізкі</translation>
-    </message>
-    <message>
-        <source>lower</source>
-        <translation>ніжэйшы</translation>
-    </message>
-    <message>
-        <source>lowest</source>
-        <translation>найніжэйшы</translation>
-    </message>
-    <message>
-        <source>yes</source>
-        <translation>так</translation>
-    </message>
-    <message>
-        <source>no</source>
-        <translation>не</translation>
-    </message>
-    <message>
-        <source>This means a fee of at least %1 per kB is required.</source>
-        <translation>Гэта значыць патрэбную камісію мінімум %1 на Кб.</translation>
-    </message>
-    <message>
-        <source>Transactions with higher priority are more likely to get included into a block.</source>
-        <translation>Транзакцыя большага прыярытэту больш прываблівая для ўключэння ў блок.</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>непазначаны</translation>
-    </message>
-    </context>
+</context>
 <context>
     <name>EditAddressDialog</name>
     <message>
@@ -728,34 +430,6 @@
         <source>&amp;Address</source>
         <translation>Адрас</translation>
     </message>
-    <message>
-        <source>New receiving address</source>
-        <translation>Новы адрас для атрымання</translation>
-    </message>
-    <message>
-        <source>New sending address</source>
-        <translation>Новы адрас для дасылання</translation>
-    </message>
-    <message>
-        <source>Edit receiving address</source>
-        <translation>Рэдагаваць адрас прымання</translation>
-    </message>
-    <message>
-        <source>Edit sending address</source>
-        <translation>Рэдагаваць адрас дасылання</translation>
-    </message>
-    <message>
-        <source>The entered address "%1" is already in the address book.</source>
-        <translation>Уведзены адрас "%1" ужо ў кніге адрасоў</translation>
-    </message>
-    <message>
-        <source>Could not unlock wallet.</source>
-        <translation>Немагчыма разблакаваць гаманец</translation>
-    </message>
-    <message>
-        <source>New key generation failed.</source>
-        <translation>Генерацыя новага ключа няўдалая</translation>
-    </message>
 </context>
 <context>
     <name>FreespaceChecker</name>
@@ -774,18 +448,10 @@
     </context>
 <context>
     <name>HelpMessageDialog</name>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Bitcoin Core</translation>
-    </message>
     <message>
         <source>(%1-bit)</source>
         <translation>(%1-біт)</translation>
     </message>
-    <message>
-        <source>About Bitcoin Core</source>
-        <translation>Аб Bitcoin Core</translation>
-    </message>
     <message>
         <source>Command-line options</source>
         <translation>Опцыі каманднага радка</translation>
@@ -805,14 +471,6 @@
         <source>Welcome</source>
         <translation>Вітаем</translation>
     </message>
-    <message>
-        <source>Welcome to Bitcoin Core.</source>
-        <translation>Вітаем у Bitcoin Core.</translation>
-    </message>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Bitcoin Core</translation>
-    </message>
     <message>
         <source>Error</source>
         <translation>Памылка</translation>
@@ -855,9 +513,6 @@
         <translation>Форма</translation>
     </message>
     </context>
-<context>
-    <name>PaymentServer</name>
-    </context>
 <context>
     <name>PeerTableModel</name>
     </context>
@@ -868,9 +523,6 @@
         <translation>Колькасць</translation>
     </message>
     </context>
-<context>
-    <name>QRImageWidget</name>
-    </context>
 <context>
     <name>RPCConsole</name>
     <message>
@@ -892,60 +544,13 @@
         <source>&amp;Label:</source>
         <translation>Метка:</translation>
     </message>
-    <message>
-        <source>Copy label</source>
-        <translation>Капіяваць пазнаку</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>Капіяваць колькасць</translation>
-    </message>
-</context>
+    </context>
 <context>
     <name>ReceiveRequestDialog</name>
     <message>
         <source>Copy &amp;Address</source>
         <translation>Капіяваць адрас</translation>
     </message>
-    <message>
-        <source>Address</source>
-        <translation>Адрас</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>Колькасць</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Метка</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>Паведамленне</translation>
-    </message>
-    </context>
-<context>
-    <name>RecentRequestsTableModel</name>
-    <message>
-        <source>Date</source>
-        <translation>Дата</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Метка</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>Паведамленне</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>Колькасць</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>непазначаны</translation>
-    </message>
     </context>
 <context>
     <name>SendCoinsDialog</name>
@@ -997,46 +602,6 @@
         <source>Confirm the send action</source>
         <translation>Пацвердзіць дасыланне</translation>
     </message>
-    <message>
-        <source>Confirm send coins</source>
-        <translation>Пацвердзіць дасыланне манет</translation>
-    </message>
-    <message>
-        <source>Copy quantity</source>
-        <translation>Капіяваць колькасць</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>Капіяваць колькасць</translation>
-    </message>
-    <message>
-        <source>Copy fee</source>
-        <translation>Капіяваць камісію</translation>
-    </message>
-    <message>
-        <source>Copy after fee</source>
-        <translation>Капіяваць з выняткам камісіі</translation>
-    </message>
-    <message>
-        <source>Copy bytes</source>
-        <translation>Капіяваць байты</translation>
-    </message>
-    <message>
-        <source>Copy priority</source>
-        <translation>Капіяваць прыярытэт</translation>
-    </message>
-    <message>
-        <source>The amount to pay must be larger than 0.</source>
-        <translation>Велічыня плацяжу мае быць больш за 0.</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>непазначаны</translation>
-    </message>
-    <message>
-        <source>Copy dust</source>
-        <translation>Капіяваць пыл</translation>
-    </message>
     </context>
 <context>
     <name>SendCoinsEntry</name>
@@ -1048,10 +613,6 @@
         <source>Pay &amp;To:</source>
         <translation>Заплаціць да:</translation>
     </message>
-    <message>
-        <source>Enter a label for this address to add it to your address book</source>
-        <translation>Увядзіце пазнаку гэтаму адрасу, каб дадаць яго ў адрасную кнігу</translation>
-    </message>
     <message>
         <source>&amp;Label:</source>
         <translation>Метка:</translation>
@@ -1101,14 +662,6 @@
     </context>
 <context>
     <name>SplashScreen</name>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Bitcoin Core</translation>
-    </message>
-    <message>
-        <source>The Bitcoin Core developers</source>
-        <translation>Распрацоўнікі Bitcoin Core</translation>
-    </message>
     <message>
         <source>[testnet]</source>
         <translation>[testnet]</translation>
@@ -1121,274 +674,16 @@
         <translation>Кб/с</translation>
     </message>
 </context>
-<context>
-    <name>TransactionDesc</name>
-    <message>
-        <source>%1/offline</source>
-        <translation>%1/offline</translation>
-    </message>
-    <message>
-        <source>%1/unconfirmed</source>
-        <translation>%1/непацверджана</translation>
-    </message>
-    <message>
-        <source>%1 confirmations</source>
-        <translation>%1 пацверджанняў</translation>
-    </message>
-    <message>
-        <source>Status</source>
-        <translation>Статус</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation>Дата</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>Паведамленне</translation>
-    </message>
-    <message>
-        <source>Comment</source>
-        <translation>Каментар</translation>
-    </message>
-    <message>
-        <source>Transaction ID</source>
-        <translation>ID</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>Колькасць</translation>
-    </message>
-    <message>
-        <source>, has not been successfully broadcast yet</source>
-        <translation>, пакуль не было паспяхова транслявана</translation>
-    </message>
-    <message>
-        <source>unknown</source>
-        <translation>невядома</translation>
-    </message>
-</context>
 <context>
     <name>TransactionDescDialog</name>
-    <message>
-        <source>Transaction details</source>
-        <translation>Дэталі транзакцыі</translation>
-    </message>
     <message>
         <source>This pane shows a detailed description of the transaction</source>
         <translation>Гэтая панэль паказвае дэтальнае апісанне транзакцыі</translation>
     </message>
 </context>
-<context>
-    <name>TransactionTableModel</name>
-    <message>
-        <source>Date</source>
-        <translation>Дата</translation>
-    </message>
-    <message>
-        <source>Type</source>
-        <translation>Тып</translation>
-    </message>
-    <message>
-        <source>Confirmed (%1 confirmations)</source>
-        <translation>Пацверджана (%1 пацверджанняў)</translation>
-    </message>
-    <message>
-        <source>This block was not received by any other nodes and will probably not be accepted!</source>
-        <translation>Гэты блок не быў прыняты іншымі вузламі і магчыма не будзе ўхвалены!</translation>
-    </message>
-    <message>
-        <source>Generated but not accepted</source>
-        <translation>Згенеравана, але не прынята</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Метка</translation>
-    </message>
-    <message>
-        <source>Received with</source>
-        <translation>Прынята з</translation>
-    </message>
-    <message>
-        <source>Received from</source>
-        <translation>Прынята ад</translation>
-    </message>
-    <message>
-        <source>Sent to</source>
-        <translation>Даслана да</translation>
-    </message>
-    <message>
-        <source>Payment to yourself</source>
-        <translation>Плацёж самому сабе</translation>
-    </message>
-    <message>
-        <source>Mined</source>
-        <translation>Здабыта</translation>
-    </message>
-    <message>
-        <source>(n/a)</source>
-        <translation>(n/a)</translation>
-    </message>
-    <message>
-        <source>Transaction status. Hover over this field to show number of confirmations.</source>
-        <translation>Статус транзакцыі. Навядзіце курсар на гэтае поле, каб паказаць колькасць пацверджанняў.</translation>
-    </message>
-    <message>
-        <source>Date and time that the transaction was received.</source>
-        <translation>Дата і час, калі транзакцыя была прынята.</translation>
-    </message>
-    <message>
-        <source>Type of transaction.</source>
-        <translation>Тып транзакцыі</translation>
-    </message>
-    <message>
-        <source>Amount removed from or added to balance.</source>
-        <translation>Колькасць аднятая ці даданая да балансу.</translation>
-    </message>
-</context>
-<context>
-    <name>TransactionView</name>
-    <message>
-        <source>All</source>
-        <translation>Усё</translation>
-    </message>
-    <message>
-        <source>Today</source>
-        <translation>Сёння</translation>
-    </message>
-    <message>
-        <source>This week</source>
-        <translation>Гэты тыдзень</translation>
-    </message>
-    <message>
-        <source>This month</source>
-        <translation>Гэты месяц</translation>
-    </message>
-    <message>
-        <source>Last month</source>
-        <translation>Мінулы месяц</translation>
-    </message>
-    <message>
-        <source>This year</source>
-        <translation>Гэты год</translation>
-    </message>
-    <message>
-        <source>Range...</source>
-        <translation>Прамежак...</translation>
-    </message>
-    <message>
-        <source>Received with</source>
-        <translation>Прынята з</translation>
-    </message>
-    <message>
-        <source>Sent to</source>
-        <translation>Даслана да</translation>
-    </message>
-    <message>
-        <source>To yourself</source>
-        <translation>Да сябе</translation>
-    </message>
-    <message>
-        <source>Mined</source>
-        <translation>Здабыта</translation>
-    </message>
-    <message>
-        <source>Other</source>
-        <translation>Іншыя</translation>
-    </message>
-    <message>
-        <source>Enter address or label to search</source>
-        <translation>Увядзіце адрас ці пазнаку для пошуку</translation>
-    </message>
-    <message>
-        <source>Min amount</source>
-        <translation>Мін. колькасць</translation>
-    </message>
-    <message>
-        <source>Copy address</source>
-        <translation>Капіяваць адрас</translation>
-    </message>
-    <message>
-        <source>Copy label</source>
-        <translation>Капіяваць пазнаку</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>Капіяваць колькасць</translation>
-    </message>
-    <message>
-        <source>Copy transaction ID</source>
-        <translation>Капіяваць ID транзакцыі</translation>
-    </message>
-    <message>
-        <source>Edit label</source>
-        <translation>Рэдагаваць пазнаку</translation>
-    </message>
-    <message>
-        <source>Exporting Failed</source>
-        <translation>Экспартаванне няўдалае</translation>
-    </message>
-    <message>
-        <source>Comma separated file (*.csv)</source>
-        <translation>Коскамі падзелены файл (*.csv)</translation>
-    </message>
-    <message>
-        <source>Confirmed</source>
-        <translation>Пацверджана</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation>Дата</translation>
-    </message>
-    <message>
-        <source>Type</source>
-        <translation>Тып</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Метка</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>Адрас</translation>
-    </message>
-    <message>
-        <source>ID</source>
-        <translation>ID</translation>
-    </message>
-    <message>
-        <source>Range:</source>
-        <translation>Прамежак:</translation>
-    </message>
-    <message>
-        <source>to</source>
-        <translation>да</translation>
-    </message>
-</context>
 <context>
     <name>UnitDisplayStatusBarControl</name>
     </context>
-<context>
-    <name>WalletFrame</name>
-    </context>
-<context>
-    <name>WalletModel</name>
-    <message>
-        <source>Send Coins</source>
-        <translation>Даслаць Манеты</translation>
-    </message>
-</context>
-<context>
-    <name>WalletView</name>
-    <message>
-        <source>&amp;Export</source>
-        <translation>Экспарт</translation>
-    </message>
-    <message>
-        <source>Export the data in the current tab to a file</source>
-        <translation>Экспартаваць гэтыя звесткі у файл</translation>
-    </message>
-    </context>
 <context>
     <name>bitcoin-core</name>
     <message>
@@ -1407,6 +702,10 @@
         <source>Run in the background as a daemon and accept commands</source>
         <translation>Запусціць у фоне як дэман і прымаць каманды</translation>
     </message>
+    <message>
+        <source>Bitcoin Core</source>
+        <translation>Bitcoin Core</translation>
+    </message>
     <message>
         <source>Do you want to rebuild the block database now?</source>
         <translation>Ці жадаеце вы перабудаваць зараз базу звестак блокаў?</translation>
@@ -1455,10 +754,6 @@
         <source>Wallet options:</source>
         <translation>Опцыі гаманца:</translation>
     </message>
-    <message>
-        <source>Activating best chain...</source>
-        <translation>Актывацыя лепшага ланцуга...</translation>
-    </message>
     <message>
         <source>Information</source>
         <translation>Інфармацыя</translation>
@@ -1507,14 +802,6 @@
         <source>Loading addresses...</source>
         <translation>Загружаем адрасы...</translation>
     </message>
-    <message>
-        <source>Error loading wallet.dat: Wallet corrupted</source>
-        <translation>Памылка загрузкі wallet.dat: гаманец пашкоджаны</translation>
-    </message>
-    <message>
-        <source>Error loading wallet.dat</source>
-        <translation>Памылка загрузкі wallet.dat</translation>
-    </message>
     <message>
         <source>Insufficient funds</source>
         <translation>Недастаткова сродкаў</translation>
diff --git a/src/qt/locale/bitcoin_bg.ts b/src/qt/locale/bitcoin_bg.ts
index 54bf8136a60b4..3bb881318288f 100644
--- a/src/qt/locale/bitcoin_bg.ts
+++ b/src/qt/locale/bitcoin_bg.ts
@@ -25,10 +25,6 @@
         <source>C&amp;lose</source>
         <translation>Затвори</translation>
     </message>
-    <message>
-        <source>&amp;Copy Address</source>
-        <translation>&amp;Копирай адрес</translation>
-    </message>
     <message>
         <source>Delete the currently selected address from the list</source>
         <translation>Изтрий избрания адрес от списъка</translation>
@@ -45,73 +41,6 @@
         <source>&amp;Delete</source>
         <translation>&amp;Изтриване</translation>
     </message>
-    <message>
-        <source>Choose the address to send coins to</source>
-        <translation>Изберете адрес, на който да се изпращат монети</translation>
-    </message>
-    <message>
-        <source>Choose the address to receive coins with</source>
-        <translation>Изберете адрес, на който ще получавате монети</translation>
-    </message>
-    <message>
-        <source>C&amp;hoose</source>
-        <translation>Избери</translation>
-    </message>
-    <message>
-        <source>Sending addresses</source>
-        <translation>Адреси за изпращане</translation>
-    </message>
-    <message>
-        <source>Receiving addresses</source>
-        <translation>Адреси за получаване</translation>
-    </message>
-    <message>
-        <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source>
-        <translation>Това са адресите на получателите на плащания. Винаги проверявайте размера на сумата и адреса на получателя, преди да изпратите монети.</translation>
-    </message>
-    <message>
-        <source>These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source>
-        <translation>Това са Вашите Биткойн адреси,благодарение на които ще получавате плащания.Препоръчително е да използвате нови адреси за получаване на всяка транзакция.</translation>
-    </message>
-    <message>
-        <source>Copy &amp;Label</source>
-        <translation>Копирай &amp;име</translation>
-    </message>
-    <message>
-        <source>&amp;Edit</source>
-        <translation>&amp;Редактирай</translation>
-    </message>
-    <message>
-        <source>Export Address List</source>
-        <translation>Изнасяне на списъка с адреси</translation>
-    </message>
-    <message>
-        <source>Comma separated file (*.csv)</source>
-        <translation>CSV файл (*.csv)</translation>
-    </message>
-    <message>
-        <source>Exporting Failed</source>
-        <translation>Грешка при изнасянето</translation>
-    </message>
-    <message>
-        <source>There was an error trying to save the address list to %1. Please try again.</source>
-        <translation>Възникна грешка при опита за запазване на списъка с адреси в %1.Моля опитайте отново.</translation>
-    </message>
-</context>
-<context>
-    <name>AddressTableModel</name>
-    <message>
-        <source>Label</source>
-        <translation>Име</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>Адрес</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(без име)</translation>
-    </message>
 </context>
 <context>
     <name>AskPassphraseDialog</name>
@@ -131,86 +60,6 @@
         <source>Repeat new passphrase</source>
         <translation>Въведете новата парола повторно</translation>
     </message>
-    <message>
-        <source>Encrypt wallet</source>
-        <translation>Шифриране на портфейла</translation>
-    </message>
-    <message>
-        <source>This operation needs your wallet passphrase to unlock the wallet.</source>
-        <translation>Тази операция изисква Вашата парола за отключване на портфейла.</translation>
-    </message>
-    <message>
-        <source>Unlock wallet</source>
-        <translation>Отключване на портфейла</translation>
-    </message>
-    <message>
-        <source>This operation needs your wallet passphrase to decrypt the wallet.</source>
-        <translation>Тази операция изисква Вашата парола за дешифриране на портфейла.</translation>
-    </message>
-    <message>
-        <source>Decrypt wallet</source>
-        <translation>Дешифриране на портфейла</translation>
-    </message>
-    <message>
-        <source>Change passphrase</source>
-        <translation>Смяна на паролата</translation>
-    </message>
-    <message>
-        <source>Confirm wallet encryption</source>
-        <translation>Потвърдете на шифрирането на портфейла</translation>
-    </message>
-    <message>
-        <source>Warning: If you encrypt your wallet and lose your passphrase, you will &lt;b&gt;LOSE ALL OF YOUR BITCOINS&lt;/b&gt;!</source>
-        <translation>ВНИМАНИЕ: Ако шифрирате вашият портфейл и изгубите паролата си, &lt;b&gt;ЩЕ ИЗГУБИТЕ ВСИЧКИТЕ СИ БИТКОИНИ&lt;/b&gt;!</translation>
-    </message>
-    <message>
-        <source>Are you sure you wish to encrypt your wallet?</source>
-        <translation>Наистина ли желаете да шифрирате портфейла си?</translation>
-    </message>
-    <message>
-        <source>Bitcoin Core will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source>
-        <translation>Биткоин сега ще се затоври за да завърши процеса на криптиране. Запомнете, че криптирането на вашия портефейл не може напълно да предпази вашите монети от кражба чрез зловреден софтуер, инфектирал вашия компютър</translation>
-    </message>
-    <message>
-        <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source>
-        <translation>ВАЖНО: Всички стари запазвания, които сте направили на Вашият портфейл трябва да замените с запазване на новополучения, шифриран портфейл. От съображения за сигурност, предишните запазвания на нешифрирани портфейли ще станат неизползваеми веднага, щом започнете да използвате новият, шифриран портфейл.</translation>
-    </message>
-    <message>
-        <source>Warning: The Caps Lock key is on!</source>
-        <translation>Внимание: Caps Lock (главни букви) е включен.</translation>
-    </message>
-    <message>
-        <source>Wallet encrypted</source>
-        <translation>Портфейлът е шифриран</translation>
-    </message>
-    <message>
-        <source>Wallet encryption failed</source>
-        <translation>Шифрирането беше неуспешно</translation>
-    </message>
-    <message>
-        <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
-        <translation>Шифрирането на портфейла беше неуспешно, поради софтуерен проблем. Портфейлът не е шифриран.</translation>
-    </message>
-    <message>
-        <source>The supplied passphrases do not match.</source>
-        <translation>Паролите не съвпадат</translation>
-    </message>
-    <message>
-        <source>Wallet unlock failed</source>
-        <translation>Неуспешно отключване на портфейла</translation>
-    </message>
-    <message>
-        <source>The passphrase entered for the wallet decryption was incorrect.</source>
-        <translation>Паролата въведена за дешифриране на портфейла е грешна.</translation>
-    </message>
-    <message>
-        <source>Wallet decryption failed</source>
-        <translation>Дешифрирането на портфейла беше неуспешно</translation>
-    </message>
-    <message>
-        <source>Wallet passphrase was successfully changed.</source>
-        <translation>Паролата на портфейла беше променена успешно.</translation>
-    </message>
 </context>
 <context>
     <name>BanTableModel</name>
@@ -293,10 +142,6 @@
         <source>Open &amp;URI...</source>
         <translation>Отвори &amp;URI...</translation>
     </message>
-    <message>
-        <source>Bitcoin Core client</source>
-        <translation>Bitcoin Core клиент</translation>
-    </message>
     <message>
         <source>Send coins to a Bitcoin address</source>
         <translation>Изпращане към Биткоин адрес</translation>
@@ -337,10 +182,6 @@
         <source>&amp;Receive</source>
         <translation>&amp;Получаване</translation>
     </message>
-    <message>
-        <source>Show information about Bitcoin Core</source>
-        <translation>Покажете информация за Биткойн ядрото</translation>
-    </message>
     <message>
         <source>&amp;Show / Hide</source>
         <translation>&amp;Показване / Скриване</translation>
@@ -377,18 +218,10 @@
         <source>Tabs toolbar</source>
         <translation>Раздели</translation>
     </message>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Биткойн ядро</translation>
-    </message>
     <message>
         <source>Request payments (generates QR codes and bitcoin: URIs)</source>
         <translation>Изискване на плащания(генерира QR кодове и биткойн: URIs)</translation>
     </message>
-    <message>
-        <source>&amp;About Bitcoin Core</source>
-        <translation>&amp;Относно Bitcoin Core</translation>
-    </message>
     <message>
         <source>Show the list of used sending addresses and labels</source>
         <translation>Показване на списъка с използвани адреси и имена</translation>
@@ -405,10 +238,6 @@
         <source>&amp;Command-line options</source>
         <translation>&amp;Налични команди</translation>
     </message>
-    <message>
-        <source>Show the Bitcoin Core help message to get a list with possible Bitcoin command-line options</source>
-        <translation>Покажи помощните съобщения на Биткойн за да видиш наличните и валидни команди</translation>
-    </message>
     <message>
         <source>No block source available...</source>
         <translation>Липсва източник на блоковете...</translation>
@@ -496,13 +325,6 @@
         <translation>Портфейлът е &lt;b&gt;криптиран&lt;/b&gt; и &lt;b&gt;заключен&lt;/b&gt;</translation>
     </message>
 </context>
-<context>
-    <name>ClientModel</name>
-    <message>
-        <source>Network Alert</source>
-        <translation>Мрежови проблем</translation>
-    </message>
-</context>
 <context>
     <name>CoinControlDialog</name>
     <message>
@@ -581,134 +403,6 @@
         <source>Priority</source>
         <translation>Приоритет</translation>
     </message>
-    <message>
-        <source>Copy address</source>
-        <translation>Копирай адрес</translation>
-    </message>
-    <message>
-        <source>Copy label</source>
-        <translation>Копирай име</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>Копирай сума</translation>
-    </message>
-    <message>
-        <source>Copy transaction ID</source>
-        <translation>Копирай транзакция с ID</translation>
-    </message>
-    <message>
-        <source>Lock unspent</source>
-        <translation>Заключване на неизхарченото</translation>
-    </message>
-    <message>
-        <source>Unlock unspent</source>
-        <translation>Отключване на неизхарченото</translation>
-    </message>
-    <message>
-        <source>Copy quantity</source>
-        <translation>Копиране на количеството</translation>
-    </message>
-    <message>
-        <source>Copy fee</source>
-        <translation>Копиране на данък добавена стойност</translation>
-    </message>
-    <message>
-        <source>Copy after fee</source>
-        <translation>Копиране след прилагане на данък добавена стойност</translation>
-    </message>
-    <message>
-        <source>Copy bytes</source>
-        <translation>Копиране на байтовете</translation>
-    </message>
-    <message>
-        <source>Copy priority</source>
-        <translation>Копиране на приоритет</translation>
-    </message>
-    <message>
-        <source>Copy dust</source>
-        <translation>Копирай прахта:</translation>
-    </message>
-    <message>
-        <source>Copy change</source>
-        <translation>Копирай рестото</translation>
-    </message>
-    <message>
-        <source>highest</source>
-        <translation>Най-висок</translation>
-    </message>
-    <message>
-        <source>higher</source>
-        <translation>По-висок</translation>
-    </message>
-    <message>
-        <source>high</source>
-        <translation>Висок</translation>
-    </message>
-    <message>
-        <source>medium-high</source>
-        <translation>Средно-висок</translation>
-    </message>
-    <message>
-        <source>medium</source>
-        <translation>Среден</translation>
-    </message>
-    <message>
-        <source>low-medium</source>
-        <translation>Ниско-среден</translation>
-    </message>
-    <message>
-        <source>low</source>
-        <translation>Нисък</translation>
-    </message>
-    <message>
-        <source>lower</source>
-        <translation>По-нисък</translation>
-    </message>
-    <message>
-        <source>lowest</source>
-        <translation>Най-нисък</translation>
-    </message>
-    <message>
-        <source>(%1 locked)</source>
-        <translation>(%1 заключен)</translation>
-    </message>
-    <message>
-        <source>none</source>
-        <translation>нищо</translation>
-    </message>
-    <message>
-        <source>This label turns red if the transaction size is greater than 1000 bytes.</source>
-        <translation>Този етикет става червен, когато размера на транзакцията е по-голяма от 1000 бита.</translation>
-    </message>
-    <message>
-        <source>yes</source>
-        <translation>да</translation>
-    </message>
-    <message>
-        <source>no</source>
-        <translation>не</translation>
-    </message>
-    <message>
-        <source>This means a fee of at least %1 per kB is required.</source>
-        <translation>Това означава че се изисква такса от поне %1 на килобайт.</translation>
-    </message>
-    <message>
-        <source>Can vary +/- 1 byte per input.</source>
-        <translation>Може да варира с +-1 байт</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(без име)</translation>
-    </message>
-    <message>
-        <source>change from %1 (%2)</source>
-        <translation>ресто от %1 (%2)</translation>
-    </message>
-    <message>
-        <source>(change)</source>
-        <translation>(промени)</translation>
-    </message>
 </context>
 <context>
     <name>EditAddressDialog</name>
@@ -724,38 +418,6 @@
         <source>&amp;Address</source>
         <translation>&amp;Адрес</translation>
     </message>
-    <message>
-        <source>New receiving address</source>
-        <translation>Нов адрес за получаване</translation>
-    </message>
-    <message>
-        <source>New sending address</source>
-        <translation>Нов адрес за изпращане</translation>
-    </message>
-    <message>
-        <source>Edit receiving address</source>
-        <translation>Редактиране на адрес за получаване</translation>
-    </message>
-    <message>
-        <source>Edit sending address</source>
-        <translation>Редактиране на адрес за изпращане</translation>
-    </message>
-    <message>
-        <source>The entered address "%1" is already in the address book.</source>
-        <translation>Вече има адрес "%1" в списъка с адреси.</translation>
-    </message>
-    <message>
-        <source>The entered address "%1" is not a valid Bitcoin address.</source>
-        <translation>"%1" не е валиден Биткоин адрес.</translation>
-    </message>
-    <message>
-        <source>Could not unlock wallet.</source>
-        <translation>Отключването на портфейла беше неуспешно.</translation>
-    </message>
-    <message>
-        <source>New key generation failed.</source>
-        <translation>Създаването на ключ беше неуспешно.</translation>
-    </message>
 </context>
 <context>
     <name>FreespaceChecker</name>
@@ -782,10 +444,6 @@
 </context>
 <context>
     <name>HelpMessageDialog</name>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Биткойн ядро</translation>
-    </message>
     <message>
         <source>version</source>
         <translation>версия</translation>
@@ -794,10 +452,6 @@
         <source>(%1-bit)</source>
         <translation>(%1-битов)</translation>
     </message>
-    <message>
-        <source>About Bitcoin Core</source>
-        <translation>Относно Bitcoin Core</translation>
-    </message>
     <message>
         <source>Command-line options</source>
         <translation>Списък с команди</translation>
@@ -817,14 +471,6 @@
         <source>Welcome</source>
         <translation>Добре дошли</translation>
     </message>
-    <message>
-        <source>Welcome to Bitcoin Core.</source>
-        <translation>Добре дошли в Биткойн ядрото.</translation>
-    </message>
-    <message>
-        <source>As this is the first time the program is launched, you can choose where Bitcoin Core will store its data.</source>
-        <translation>Тъй като това е първото стартиране на програмата можете да изберете къде Биткон ядрото да запази данните си.</translation>
-    </message>
     <message>
         <source>Use the default data directory</source>
         <translation>Използване на директория по подразбиране</translation>
@@ -833,10 +479,6 @@
         <source>Use a custom data directory:</source>
         <translation>Използване на директория ръчно</translation>
     </message>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Биткойн ядро</translation>
-    </message>
     <message>
         <source>Error</source>
         <translation>Грешка</translation>
@@ -899,10 +541,6 @@
         <source>&amp;Network</source>
         <translation>&amp;Мрежа</translation>
     </message>
-    <message>
-        <source>Automatically start Bitcoin Core after logging in to the system.</source>
-        <translation>Автоматично стартиране на Bitcoin Core след влизане в системата.</translation>
-    </message>
     <message>
         <source>W&amp;allet</source>
         <translation>По&amp;ртфейл</translation>
@@ -1071,73 +709,6 @@
         <translation>Скорошни транзакции</translation>
     </message>
     </context>
-<context>
-    <name>PaymentServer</name>
-    <message>
-        <source>URI handling</source>
-        <translation>Справяне с URI</translation>
-    </message>
-    <message>
-        <source>Invalid payment address %1</source>
-        <translation>Невалиден адрес на плащане %1</translation>
-    </message>
-    <message>
-        <source>Payment request rejected</source>
-        <translation>Заявката за плащане беше отхвърлена</translation>
-    </message>
-    <message>
-        <source>Payment request network doesn't match client network.</source>
-        <translation>Мрежата от която се извършва заявката за плащане не съвпада с мрежата на клиента.</translation>
-    </message>
-    <message>
-        <source>Requested payment amount of %1 is too small (considered dust).</source>
-        <translation>Заявената сума за плащане: %1 е твърде малка (счита се за отпадък)</translation>
-    </message>
-    <message>
-        <source>Payment request error</source>
-        <translation>Възникна грешка по време назаявката за плащане</translation>
-    </message>
-    <message>
-        <source>Cannot start bitcoin: click-to-pay handler</source>
-        <translation>Биткойн не можe да се стартира: click-to-pay handler</translation>
-    </message>
-    <message>
-        <source>Payment request file handling</source>
-        <translation>Файл за справяне със заявки</translation>
-    </message>
-    <message>
-        <source>Payment request expired.</source>
-        <translation>Заявката за плащане е изтекла.</translation>
-    </message>
-    <message>
-        <source>Invalid payment request.</source>
-        <translation>Невалидна заявка за плащане.</translation>
-    </message>
-    <message>
-        <source>Refund from %1</source>
-        <translation>Възстановяване на сума от %1</translation>
-    </message>
-    <message>
-        <source>Payment request %1 is too large (%2 bytes, allowed %3 bytes).</source>
-        <translation>Заявката за плащане %1 е твърде голям (%2 байта, позволени %3 байта).</translation>
-    </message>
-    <message>
-        <source>Error communicating with %1: %2</source>
-        <translation>Грешка при комуникацията с %1: %2</translation>
-    </message>
-    <message>
-        <source>Bad response from server %1</source>
-        <translation>Възникна проблем при свързването със сървър %1</translation>
-    </message>
-    <message>
-        <source>Payment acknowledged</source>
-        <translation>Плащането е прието</translation>
-    </message>
-    <message>
-        <source>Network request error</source>
-        <translation>Грешка в мрежата по време на заявката</translation>
-    </message>
-</context>
 <context>
     <name>PeerTableModel</name>
     <message>
@@ -1188,25 +759,6 @@
         <translation>%1 милисекунда</translation>
     </message>
 </context>
-<context>
-    <name>QRImageWidget</name>
-    <message>
-        <source>&amp;Save Image...</source>
-        <translation>&amp;Запиши изображение...</translation>
-    </message>
-    <message>
-        <source>&amp;Copy Image</source>
-        <translation>&amp;Копирай изображение</translation>
-    </message>
-    <message>
-        <source>Save QR Code</source>
-        <translation>Запази QR Код</translation>
-    </message>
-    <message>
-        <source>PNG Image (*.png)</source>
-        <translation>PNG Изображение (*.png)</translation>
-    </message>
-</context>
 <context>
     <name>RPCConsole</name>
     <message>
@@ -1337,10 +889,6 @@
         <source>Out:</source>
         <translation>Изходящи</translation>
     </message>
-    <message>
-        <source>Build date</source>
-        <translation>Дата на създаване</translation>
-    </message>
     <message>
         <source>Debug log file</source>
         <translation>Лог файл,съдържащ грешките</translation>
@@ -1448,18 +996,6 @@
         <source>Remove</source>
         <translation>Премахване</translation>
     </message>
-    <message>
-        <source>Copy label</source>
-        <translation>Копирай име</translation>
-    </message>
-    <message>
-        <source>Copy message</source>
-        <translation>Копиране на съобщението</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>Копирай сума</translation>
-    </message>
 </context>
 <context>
     <name>ReceiveRequestDialog</name>
@@ -1479,79 +1015,20 @@
         <source>&amp;Save Image...</source>
         <translation>&amp;Запиши изображение...</translation>
     </message>
+</context>
+<context>
+    <name>SendCoinsDialog</name>
     <message>
-        <source>Request payment to %1</source>
-        <translation>Изискване на плащане от %1</translation>
+        <source>Send Coins</source>
+        <translation>Изпращане</translation>
     </message>
     <message>
-        <source>Payment information</source>
-        <translation>Данни за плащането</translation>
+        <source>Coin Control Features</source>
+        <translation>Настройки за контрол на монетите</translation>
     </message>
     <message>
-        <source>Address</source>
-        <translation>Адрес</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>Сума</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Име</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>Съобщение</translation>
-    </message>
-    <message>
-        <source>Error encoding URI into QR Code.</source>
-        <translation>Грешка при създаването на QR Code от URI.</translation>
-    </message>
-</context>
-<context>
-    <name>RecentRequestsTableModel</name>
-    <message>
-        <source>Date</source>
-        <translation>Дата</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Име</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>Съобщение</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>Сума</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(без име)</translation>
-    </message>
-    <message>
-        <source>(no message)</source>
-        <translation>(без съобщение)</translation>
-    </message>
-    <message>
-        <source>(no amount)</source>
-        <translation>(липсва сума)</translation>
-    </message>
-</context>
-<context>
-    <name>SendCoinsDialog</name>
-    <message>
-        <source>Send Coins</source>
-        <translation>Изпращане</translation>
-    </message>
-    <message>
-        <source>Coin Control Features</source>
-        <translation>Настройки за контрол на монетите</translation>
-    </message>
-    <message>
-        <source>automatically selected</source>
-        <translation>астоматично избран</translation>
+        <source>automatically selected</source>
+        <translation>астоматично избран</translation>
     </message>
     <message>
         <source>Insufficient funds!</source>
@@ -1661,86 +1138,6 @@
         <source>S&amp;end</source>
         <translation>И&amp;зпрати</translation>
     </message>
-    <message>
-        <source>Confirm send coins</source>
-        <translation>Потвърждаване</translation>
-    </message>
-    <message>
-        <source>Copy quantity</source>
-        <translation>Копиране на количеството</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>Копирай сума</translation>
-    </message>
-    <message>
-        <source>Copy fee</source>
-        <translation>Копиране на данък добавена стойност</translation>
-    </message>
-    <message>
-        <source>Copy after fee</source>
-        <translation>Копиране след прилагане на данък добавена стойност</translation>
-    </message>
-    <message>
-        <source>Copy bytes</source>
-        <translation>Копиране на байтовете</translation>
-    </message>
-    <message>
-        <source>Copy priority</source>
-        <translation>Копиране на приоритет</translation>
-    </message>
-    <message>
-        <source>Copy change</source>
-        <translation>Копирай рестото</translation>
-    </message>
-    <message>
-        <source>or</source>
-        <translation>или</translation>
-    </message>
-    <message>
-        <source>The amount to pay must be larger than 0.</source>
-        <translation>Сумата трябва да е по-голяма от 0.</translation>
-    </message>
-    <message>
-        <source>The amount exceeds your balance.</source>
-        <translation>Сумата надвишава текущия баланс</translation>
-    </message>
-    <message>
-        <source>The total exceeds your balance when the %1 transaction fee is included.</source>
-        <translation>Сумата при добавяне на данък добавена стойност по %1 транзакцията надвишава сумата по вашата сметка.</translation>
-    </message>
-    <message>
-        <source>Transaction creation failed!</source>
-        <translation>Грешка при създаването на транзакция!</translation>
-    </message>
-    <message>
-        <source>Payment request expired.</source>
-        <translation>Заявката за плащане е изтекла.</translation>
-    </message>
-    <message>
-        <source>Warning: Invalid Bitcoin address</source>
-        <translation>Внимание: Невалиден Биткойн адрес</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(без име)</translation>
-    </message>
-    <message>
-        <source>Warning: Unknown change address</source>
-        <translation>Внимание:Неизвестен адрес за промяна</translation>
-    </message>
-    <message>
-        <source>Copy dust</source>
-        <translation>Копирай прахта:</translation>
-    </message>
-    <message>
-        <source>Are you sure you want to send?</source>
-        <translation>Наистина ли искате да изпратите?</translation>
-    </message>
-    <message>
-        <source>added as transaction fee</source>
-        <translation>добавено като такса за транзакция</translation>
-    </message>
 </context>
 <context>
     <name>SendCoinsEntry</name>
@@ -1752,10 +1149,6 @@
         <source>Pay &amp;To:</source>
         <translation>Плати &amp;На:</translation>
     </message>
-    <message>
-        <source>Enter a label for this address to add it to your address book</source>
-        <translation>Въведете име за този адрес, за да го добавите в списъка с адреси</translation>
-    </message>
     <message>
         <source>&amp;Label:</source>
         <translation>&amp;Име:</translation>
@@ -1799,10 +1192,6 @@
 </context>
 <context>
     <name>ShutdownWindow</name>
-    <message>
-        <source>Bitcoin Core is shutting down...</source>
-        <translation>Биткойн ядрото се изключва...</translation>
-    </message>
     <message>
         <source>Do not shut down the computer until this window disappears.</source>
         <translation>Не изключвайте компютъра докато този прозорец не изчезне.</translation>
@@ -1870,69 +1259,9 @@
         <source>Verify &amp;Message</source>
         <translation>Потвърди &amp;съобщението</translation>
     </message>
-    <message>
-        <source>Click "Sign Message" to generate signature</source>
-        <translation>Натиснете "Подписване на съобщение" за да създадете подпис</translation>
-    </message>
-    <message>
-        <source>The entered address is invalid.</source>
-        <translation>Въведеният адрес е невалиден.</translation>
-    </message>
-    <message>
-        <source>Please check the address and try again.</source>
-        <translation>Моля проверете адреса и опитайте отново.</translation>
-    </message>
-    <message>
-        <source>The entered address does not refer to a key.</source>
-        <translation>Въведеният адрес не може да се съпостави с валиден ключ.</translation>
-    </message>
-    <message>
-        <source>Wallet unlock was cancelled.</source>
-        <translation>Отключването на портфейла беше отменено.</translation>
-    </message>
-    <message>
-        <source>Private key for the entered address is not available.</source>
-        <translation>Не е наличен частен ключ за въведеният адрес.</translation>
-    </message>
-    <message>
-        <source>Message signing failed.</source>
-        <translation>Подписването на съобщение беше неуспешно.</translation>
-    </message>
-    <message>
-        <source>Message signed.</source>
-        <translation>Съобщението е подписано.</translation>
-    </message>
-    <message>
-        <source>The signature could not be decoded.</source>
-        <translation>Подписът не може да бъде декодиран.</translation>
-    </message>
-    <message>
-        <source>Please check the signature and try again.</source>
-        <translation>Проверете подписа и опитайте отново.</translation>
-    </message>
-    <message>
-        <source>The signature did not match the message digest.</source>
-        <translation>Подписът не отговаря на комбинацията от съобщение и адрес.</translation>
-    </message>
-    <message>
-        <source>Message verification failed.</source>
-        <translation>Проверката на съобщението беше неуспешна.</translation>
-    </message>
-    <message>
-        <source>Message verified.</source>
-        <translation>Съобщението е потвърдено.</translation>
-    </message>
-</context>
+    </context>
 <context>
     <name>SplashScreen</name>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Биткойн ядро</translation>
-    </message>
-    <message>
-        <source>The Bitcoin Core developers</source>
-        <translation>Разработчици на Bitcoin Core</translation>
-    </message>
     <message>
         <source>[testnet]</source>
         <translation>[testnet]</translation>
@@ -1945,438 +1274,16 @@
         <translation>Килобайта в секунда</translation>
     </message>
 </context>
-<context>
-    <name>TransactionDesc</name>
-    <message>
-        <source>Open until %1</source>
-        <translation>Подлежи на промяна до %1</translation>
-    </message>
-    <message>
-        <source>conflicted</source>
-        <translation>припокриващ се</translation>
-    </message>
-    <message>
-        <source>%1/offline</source>
-        <translation>%1/офлайн</translation>
-    </message>
-    <message>
-        <source>%1/unconfirmed</source>
-        <translation>%1/непотвърдени</translation>
-    </message>
-    <message>
-        <source>%1 confirmations</source>
-        <translation>включена в %1 блока</translation>
-    </message>
-    <message>
-        <source>Status</source>
-        <translation>Статус</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation>Дата</translation>
-    </message>
-    <message>
-        <source>Source</source>
-        <translation>Източник</translation>
-    </message>
-    <message>
-        <source>Generated</source>
-        <translation>Издадени</translation>
-    </message>
-    <message>
-        <source>From</source>
-        <translation>От</translation>
-    </message>
-    <message>
-        <source>To</source>
-        <translation>За</translation>
-    </message>
-    <message>
-        <source>own address</source>
-        <translation>собствен адрес</translation>
-    </message>
-    <message>
-        <source>watch-only</source>
-        <translation>само гледане</translation>
-    </message>
-    <message>
-        <source>label</source>
-        <translation>име</translation>
-    </message>
-    <message>
-        <source>Credit</source>
-        <translation>Кредит</translation>
-    </message>
-    <message>
-        <source>not accepted</source>
-        <translation>не е приет</translation>
-    </message>
-    <message>
-        <source>Debit</source>
-        <translation>Дебит</translation>
-    </message>
-    <message>
-        <source>Total debit</source>
-        <translation>Общ дълг</translation>
-    </message>
-    <message>
-        <source>Total credit</source>
-        <translation>Общ дълг</translation>
-    </message>
-    <message>
-        <source>Transaction fee</source>
-        <translation>Такса</translation>
-    </message>
-    <message>
-        <source>Net amount</source>
-        <translation>Нетна сума</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>Съобщение</translation>
-    </message>
-    <message>
-        <source>Comment</source>
-        <translation>Коментар</translation>
-    </message>
-    <message>
-        <source>Transaction ID</source>
-        <translation>ID</translation>
-    </message>
-    <message>
-        <source>Merchant</source>
-        <translation>Търговец</translation>
-    </message>
-    <message>
-        <source>Generated coins must mature %1 blocks before they can be spent. When you generated this block, it was broadcast to the network to be added to the block chain. If it fails to get into the chain, its state will change to "not accepted" and it won't be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source>
-        <translation>Генерираните монети трябва да отлежат %1 блока преди да могат да бъдат похарчени. Когато генерираш блока, той се разпространява в мрежата, за да се добави в блок-веригата. Ако не успее да се добави във веригата, неговия статус  ще се стане "неприет" и няма да може да се похарчи. Това е възможно да се случи случайно, ако друг възел генерира блок няколко секунди след твоя.</translation>
-    </message>
-    <message>
-        <source>Debug information</source>
-        <translation>Информация за грешките</translation>
-    </message>
-    <message>
-        <source>Transaction</source>
-        <translation>Транзакция</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>Сума</translation>
-    </message>
-    <message>
-        <source>true</source>
-        <translation>true</translation>
-    </message>
-    <message>
-        <source>false</source>
-        <translation>false</translation>
-    </message>
-    <message>
-        <source>, has not been successfully broadcast yet</source>
-        <translation>, все още не е изпратено</translation>
-    </message>
-    <message>
-        <source>unknown</source>
-        <translation>неизвестен</translation>
-    </message>
-</context>
 <context>
     <name>TransactionDescDialog</name>
-    <message>
-        <source>Transaction details</source>
-        <translation>Транзакция</translation>
-    </message>
     <message>
         <source>This pane shows a detailed description of the transaction</source>
         <translation>Описание на транзакцията</translation>
     </message>
 </context>
-<context>
-    <name>TransactionTableModel</name>
-    <message>
-        <source>Date</source>
-        <translation>Дата</translation>
-    </message>
-    <message>
-        <source>Type</source>
-        <translation>Тип</translation>
-    </message>
-    <message>
-        <source>Immature (%1 confirmations, will be available after %2)</source>
-        <translation>Неплатим (%1 потвърждения, ще бъде платим след %2)</translation>
-    </message>
-    <message>
-        <source>Open until %1</source>
-        <translation>Подлежи на промяна до %1</translation>
-    </message>
-    <message>
-        <source>Confirmed (%1 confirmations)</source>
-        <translation>Потвърдени (%1 потвърждения)</translation>
-    </message>
-    <message>
-        <source>This block was not received by any other nodes and will probably not be accepted!</source>
-        <translation>Блокът не е получен от останалите участници и най-вероятно няма да бъде одобрен.</translation>
-    </message>
-    <message>
-        <source>Generated but not accepted</source>
-        <translation>Генерирана, но отхвърлена от мрежата</translation>
-    </message>
-    <message>
-        <source>Offline</source>
-        <translation>Извън линия</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Име</translation>
-    </message>
-    <message>
-        <source>Unconfirmed</source>
-        <translation>Непотвърдено</translation>
-    </message>
-    <message>
-        <source>Confirming (%1 of %2 recommended confirmations)</source>
-        <translation>Потвърждаване (%1 от %2 препоръчвани потвърждения)</translation>
-    </message>
-    <message>
-        <source>Conflicted</source>
-        <translation>Конфликтно</translation>
-    </message>
-    <message>
-        <source>Received with</source>
-        <translation>Получени</translation>
-    </message>
-    <message>
-        <source>Received from</source>
-        <translation>Получен от</translation>
-    </message>
-    <message>
-        <source>Sent to</source>
-        <translation>Изпратени на</translation>
-    </message>
-    <message>
-        <source>Payment to yourself</source>
-        <translation>Плащане към себе си</translation>
-    </message>
-    <message>
-        <source>Mined</source>
-        <translation>Емитирани</translation>
-    </message>
-    <message>
-        <source>watch-only</source>
-        <translation>само гледане</translation>
-    </message>
-    <message>
-        <source>(n/a)</source>
-        <translation>(n/a)</translation>
-    </message>
-    <message>
-        <source>Transaction status. Hover over this field to show number of confirmations.</source>
-        <translation>Състояние на транзакцията. Задръжте върху това поле за брой потвърждения.</translation>
-    </message>
-    <message>
-        <source>Date and time that the transaction was received.</source>
-        <translation>Дата и час на получаване на транзакцията.</translation>
-    </message>
-    <message>
-        <source>Type of transaction.</source>
-        <translation>Вид транзакция.</translation>
-    </message>
-    <message>
-        <source>Amount removed from or added to balance.</source>
-        <translation>Сума извадена или добавена към баланса.</translation>
-    </message>
-</context>
-<context>
-    <name>TransactionView</name>
-    <message>
-        <source>All</source>
-        <translation>Всички</translation>
-    </message>
-    <message>
-        <source>Today</source>
-        <translation>Днес</translation>
-    </message>
-    <message>
-        <source>This week</source>
-        <translation>Тази седмица</translation>
-    </message>
-    <message>
-        <source>This month</source>
-        <translation>Този месец</translation>
-    </message>
-    <message>
-        <source>Last month</source>
-        <translation>Предния месец</translation>
-    </message>
-    <message>
-        <source>This year</source>
-        <translation>Тази година</translation>
-    </message>
-    <message>
-        <source>Range...</source>
-        <translation>От - до...</translation>
-    </message>
-    <message>
-        <source>Received with</source>
-        <translation>Получени</translation>
-    </message>
-    <message>
-        <source>Sent to</source>
-        <translation>Изпратени на</translation>
-    </message>
-    <message>
-        <source>To yourself</source>
-        <translation>Собствени</translation>
-    </message>
-    <message>
-        <source>Mined</source>
-        <translation>Емитирани</translation>
-    </message>
-    <message>
-        <source>Other</source>
-        <translation>Други</translation>
-    </message>
-    <message>
-        <source>Enter address or label to search</source>
-        <translation>Търсене по адрес или име</translation>
-    </message>
-    <message>
-        <source>Min amount</source>
-        <translation>Минимална сума</translation>
-    </message>
-    <message>
-        <source>Copy address</source>
-        <translation>Копирай адрес</translation>
-    </message>
-    <message>
-        <source>Copy label</source>
-        <translation>Копирай име</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>Копирай сума</translation>
-    </message>
-    <message>
-        <source>Copy transaction ID</source>
-        <translation>Копирай транзакция с ID</translation>
-    </message>
-    <message>
-        <source>Edit label</source>
-        <translation>Редактирай име</translation>
-    </message>
-    <message>
-        <source>Show transaction details</source>
-        <translation>Подробности за транзакцията</translation>
-    </message>
-    <message>
-        <source>Export Transaction History</source>
-        <translation>Изнасяне историята на транзакциите</translation>
-    </message>
-    <message>
-        <source>Watch-only</source>
-        <translation>само гледане</translation>
-    </message>
-    <message>
-        <source>Exporting Failed</source>
-        <translation>Грешка при изнасянето</translation>
-    </message>
-    <message>
-        <source>Exporting Successful</source>
-        <translation>Изнасянето е успешна</translation>
-    </message>
-    <message>
-        <source>The transaction history was successfully saved to %1.</source>
-        <translation>Историята с транзакциите беше успешно запазена в %1.</translation>
-    </message>
-    <message>
-        <source>Comma separated file (*.csv)</source>
-        <translation>CSV файл (*.csv)</translation>
-    </message>
-    <message>
-        <source>Confirmed</source>
-        <translation>Потвърдени</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation>Дата</translation>
-    </message>
-    <message>
-        <source>Type</source>
-        <translation>Тип</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Име</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>Адрес</translation>
-    </message>
-    <message>
-        <source>ID</source>
-        <translation>ИД</translation>
-    </message>
-    <message>
-        <source>Range:</source>
-        <translation>От:</translation>
-    </message>
-    <message>
-        <source>to</source>
-        <translation>до</translation>
-    </message>
-</context>
 <context>
     <name>UnitDisplayStatusBarControl</name>
     </context>
-<context>
-    <name>WalletFrame</name>
-    <message>
-        <source>No wallet has been loaded.</source>
-        <translation>Няма зареден портфейл.</translation>
-    </message>
-</context>
-<context>
-    <name>WalletModel</name>
-    <message>
-        <source>Send Coins</source>
-        <translation>Изпращане</translation>
-    </message>
-</context>
-<context>
-    <name>WalletView</name>
-    <message>
-        <source>&amp;Export</source>
-        <translation>Изнеси</translation>
-    </message>
-    <message>
-        <source>Export the data in the current tab to a file</source>
-        <translation>Запишете данните от текущия раздел във файл</translation>
-    </message>
-    <message>
-        <source>Backup Wallet</source>
-        <translation>Запазване на портфейла</translation>
-    </message>
-    <message>
-        <source>Wallet Data (*.dat)</source>
-        <translation>Информация за портфейла (*.dat)</translation>
-    </message>
-    <message>
-        <source>Backup Failed</source>
-        <translation>Неуспешно запазване на портфейла</translation>
-    </message>
-    <message>
-        <source>There was an error trying to save the wallet data to %1.</source>
-        <translation>Възникна грешка при запазването на информацията за портфейла в %1.</translation>
-    </message>
-    <message>
-        <source>The wallet data was successfully saved to %1.</source>
-        <translation>Информацията за портфейла беше успешно запазена в %1.</translation>
-    </message>
-    <message>
-        <source>Backup Successful</source>
-        <translation>Успешно запазване на портфейла</translation>
-    </message>
-</context>
 <context>
     <name>bitcoin-core</name>
     <message>
@@ -2399,6 +1306,10 @@
         <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
         <translation>Приемайте връзки отвън.(по подразбиране:1 в противен случай -proxy или -connect)</translation>
     </message>
+    <message>
+        <source>Bitcoin Core</source>
+        <translation>Биткойн ядро</translation>
+    </message>
     <message>
         <source>Whitelist peers connecting from the given netmask or IP address. Can be specified multiple times.</source>
         <translation>Сложете в бял списък пиъри,свързващи се от дадената интернет маска или айпи адрес.Може да бъде заложено неколкократно.</translation>
@@ -2443,34 +1354,14 @@
         <source>Wallet options:</source>
         <translation>Настройки на портфейла:</translation>
     </message>
-    <message>
-        <source>Set the number of threads for coin generation if enabled (-1 = all cores, default: %d)</source>
-        <translation>Заложете броя на нишки за генерация на монети ако е включено(-1 = всички ядра, по подразбиране: %d)</translation>
-    </message>
     <message>
         <source>Connect through SOCKS5 proxy</source>
         <translation>Свързване чрез SOCKS5  прокси</translation>
     </message>
-    <message>
-        <source>Copyright (C) 2009-%i The Bitcoin Core Developers</source>
-        <translation>Всички права запазени (C) 2009-%i Доставчиците на Биткойн</translation>
-    </message>
     <message>
         <source>Information</source>
         <translation>Информация</translation>
     </message>
-    <message>
-        <source>Invalid amount for -maxtxfee=&lt;amount&gt;: '%s'</source>
-        <translation>Невалидна сума за -maxtxfee=&lt;amount&gt;: '%s'</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -minrelaytxfee=&lt;amount&gt;: '%s'</source>
-        <translation>Невалидна сума за -minrelaytxfee=&lt;amount&gt;: '%s'</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -mintxfee=&lt;amount&gt;: '%s'</source>
-        <translation>Невалидна сума за -mintxfee=&lt;amount&gt;: '%s'</translation>
-    </message>
     <message>
         <source>Send trace/debug info to console instead of debug.log file</source>
         <translation>Изпрати локализиращата или дебъг информацията към конзолата, вместо файлът debug.log</translation>
@@ -2503,22 +1394,10 @@
         <source>Password for JSON-RPC connections</source>
         <translation>Парола за  JSON-RPC връзките</translation>
     </message>
-    <message>
-        <source>This help message</source>
-        <translation>Това помощно съобщение</translation>
-    </message>
     <message>
         <source>Loading addresses...</source>
         <translation>Зареждане на адреси...</translation>
     </message>
-    <message>
-        <source>Error loading wallet.dat: Wallet corrupted</source>
-        <translation>Грешка при зареждане на wallet.dat: портфейлът е повреден</translation>
-    </message>
-    <message>
-        <source>Error loading wallet.dat</source>
-        <translation>Грешка при зареждане на wallet.dat</translation>
-    </message>
     <message>
         <source>Invalid -proxy address: '%s'</source>
         <translation>Невалиден -proxy address: '%s'</translation>
@@ -2535,10 +1414,6 @@
         <source>Specify pid file (default: %s)</source>
         <translation>Задайте pid  файл(по подразбиране: %s)</translation>
     </message>
-    <message>
-        <source>Invalid amount for -paytxfee=&lt;amount&gt;: '%s'</source>
-        <translation>Невалидна сума за -paytxfee=&lt;amount&gt;: '%s'</translation>
-    </message>
     <message>
         <source>Insufficient funds</source>
         <translation>Недостатъчно средства</translation>
diff --git a/src/qt/locale/bitcoin_bg_BG.ts b/src/qt/locale/bitcoin_bg_BG.ts
deleted file mode 100644
index 353f6d7715ec9..0000000000000
--- a/src/qt/locale/bitcoin_bg_BG.ts
+++ /dev/null
@@ -1,157 +0,0 @@
-<TS language="bg_BG" version="2.1">
-<context>
-    <name>AddressBookPage</name>
-    <message>
-        <source>Right-click to edit address or label</source>
-        <translation>Клик с десен бутон на мишката за промяна на адрес или етикет</translation>
-    </message>
-    <message>
-        <source>Create a new address</source>
-        <translation>Създай нов адрес</translation>
-    </message>
-    <message>
-        <source>&amp;New</source>
-        <translation>Нов</translation>
-    </message>
-    <message>
-        <source>&amp;Copy</source>
-        <translation>Копирай</translation>
-    </message>
-    <message>
-        <source>C&amp;lose</source>
-        <translation>Затвори</translation>
-    </message>
-    </context>
-<context>
-    <name>AddressTableModel</name>
-    </context>
-<context>
-    <name>AskPassphraseDialog</name>
-    </context>
-<context>
-    <name>BanTableModel</name>
-    </context>
-<context>
-    <name>BitcoinGUI</name>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Биткойн ядро</translation>
-    </message>
-    <message>
-        <source>&amp;About Bitcoin Core</source>
-        <translation>За Биткойн ядрото</translation>
-    </message>
-    </context>
-<context>
-    <name>ClientModel</name>
-    </context>
-<context>
-    <name>CoinControlDialog</name>
-    </context>
-<context>
-    <name>EditAddressDialog</name>
-    </context>
-<context>
-    <name>FreespaceChecker</name>
-    </context>
-<context>
-    <name>HelpMessageDialog</name>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Биткойн ядро</translation>
-    </message>
-    <message>
-        <source>About Bitcoin Core</source>
-        <translation>За Биткойн ядрото</translation>
-    </message>
-    </context>
-<context>
-    <name>Intro</name>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Биткойн ядро</translation>
-    </message>
-    </context>
-<context>
-    <name>OpenURIDialog</name>
-    </context>
-<context>
-    <name>OptionsDialog</name>
-    </context>
-<context>
-    <name>OverviewPage</name>
-    </context>
-<context>
-    <name>PaymentServer</name>
-    </context>
-<context>
-    <name>PeerTableModel</name>
-    </context>
-<context>
-    <name>QObject</name>
-    </context>
-<context>
-    <name>QRImageWidget</name>
-    </context>
-<context>
-    <name>RPCConsole</name>
-    </context>
-<context>
-    <name>ReceiveCoinsDialog</name>
-    </context>
-<context>
-    <name>ReceiveRequestDialog</name>
-    </context>
-<context>
-    <name>RecentRequestsTableModel</name>
-    </context>
-<context>
-    <name>SendCoinsDialog</name>
-    </context>
-<context>
-    <name>SendCoinsEntry</name>
-    </context>
-<context>
-    <name>ShutdownWindow</name>
-    </context>
-<context>
-    <name>SignVerifyMessageDialog</name>
-    </context>
-<context>
-    <name>SplashScreen</name>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Биткойн ядро</translation>
-    </message>
-    </context>
-<context>
-    <name>TrafficGraphWidget</name>
-    </context>
-<context>
-    <name>TransactionDesc</name>
-    </context>
-<context>
-    <name>TransactionDescDialog</name>
-    </context>
-<context>
-    <name>TransactionTableModel</name>
-    </context>
-<context>
-    <name>TransactionView</name>
-    </context>
-<context>
-    <name>UnitDisplayStatusBarControl</name>
-    </context>
-<context>
-    <name>WalletFrame</name>
-    </context>
-<context>
-    <name>WalletModel</name>
-    </context>
-<context>
-    <name>WalletView</name>
-    </context>
-<context>
-    <name>bitcoin-core</name>
-    </context>
-</TS>
\ No newline at end of file
diff --git a/src/qt/locale/bitcoin_bs.ts b/src/qt/locale/bitcoin_bs.ts
deleted file mode 100644
index a186842201f02..0000000000000
--- a/src/qt/locale/bitcoin_bs.ts
+++ /dev/null
@@ -1,169 +0,0 @@
-<TS language="bs" version="2.1">
-<context>
-    <name>AddressBookPage</name>
-    </context>
-<context>
-    <name>AddressTableModel</name>
-    </context>
-<context>
-    <name>AskPassphraseDialog</name>
-    </context>
-<context>
-    <name>BanTableModel</name>
-    </context>
-<context>
-    <name>BitcoinGUI</name>
-    <message>
-        <source>Bitcoin</source>
-        <translation>Bitcoin</translation>
-    </message>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Bitcoin Jezrga</translation>
-    </message>
-    </context>
-<context>
-    <name>ClientModel</name>
-    </context>
-<context>
-    <name>CoinControlDialog</name>
-    </context>
-<context>
-    <name>EditAddressDialog</name>
-    </context>
-<context>
-    <name>FreespaceChecker</name>
-    </context>
-<context>
-    <name>HelpMessageDialog</name>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Bitcoin Jezrga</translation>
-    </message>
-    </context>
-<context>
-    <name>Intro</name>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Bitcoin Jezrga</translation>
-    </message>
-    </context>
-<context>
-    <name>OpenURIDialog</name>
-    </context>
-<context>
-    <name>OptionsDialog</name>
-    </context>
-<context>
-    <name>OverviewPage</name>
-    </context>
-<context>
-    <name>PaymentServer</name>
-    </context>
-<context>
-    <name>PeerTableModel</name>
-    </context>
-<context>
-    <name>QObject</name>
-    </context>
-<context>
-    <name>QRImageWidget</name>
-    </context>
-<context>
-    <name>RPCConsole</name>
-    </context>
-<context>
-    <name>ReceiveCoinsDialog</name>
-    </context>
-<context>
-    <name>ReceiveRequestDialog</name>
-    </context>
-<context>
-    <name>RecentRequestsTableModel</name>
-    </context>
-<context>
-    <name>SendCoinsDialog</name>
-    </context>
-<context>
-    <name>SendCoinsEntry</name>
-    <message>
-        <source>Alt+A</source>
-        <translation>Alt+A</translation>
-    </message>
-    <message>
-        <source>Alt+P</source>
-        <translation>Alt+P</translation>
-    </message>
-    </context>
-<context>
-    <name>ShutdownWindow</name>
-    </context>
-<context>
-    <name>SignVerifyMessageDialog</name>
-    <message>
-        <source>Alt+A</source>
-        <translation>Alt+A</translation>
-    </message>
-    <message>
-        <source>Alt+P</source>
-        <translation>Alt+P</translation>
-    </message>
-    </context>
-<context>
-    <name>SplashScreen</name>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Bitcoin Jezrga</translation>
-    </message>
-    </context>
-<context>
-    <name>TrafficGraphWidget</name>
-    </context>
-<context>
-    <name>TransactionDesc</name>
-    </context>
-<context>
-    <name>TransactionDescDialog</name>
-    </context>
-<context>
-    <name>TransactionTableModel</name>
-    </context>
-<context>
-    <name>TransactionView</name>
-    <message>
-        <source>All</source>
-        <translation>Sve</translation>
-    </message>
-    <message>
-        <source>Today</source>
-        <translation>Danas</translation>
-    </message>
-    <message>
-        <source>This month</source>
-        <translation>Ovaj mjesec</translation>
-    </message>
-    <message>
-        <source>Last month</source>
-        <translation>Prošli mjesec</translation>
-    </message>
-    <message>
-        <source>This year</source>
-        <translation>Ove godine</translation>
-    </message>
-    </context>
-<context>
-    <name>UnitDisplayStatusBarControl</name>
-    </context>
-<context>
-    <name>WalletFrame</name>
-    </context>
-<context>
-    <name>WalletModel</name>
-    </context>
-<context>
-    <name>WalletView</name>
-    </context>
-<context>
-    <name>bitcoin-core</name>
-    </context>
-</TS>
\ No newline at end of file
diff --git a/src/qt/locale/bitcoin_ca.ts b/src/qt/locale/bitcoin_ca.ts
index 8bc9281f1daaa..3eb384868ed43 100644
--- a/src/qt/locale/bitcoin_ca.ts
+++ b/src/qt/locale/bitcoin_ca.ts
@@ -25,10 +25,6 @@
         <source>C&amp;lose</source>
         <translation>&amp;Tanca</translation>
     </message>
-    <message>
-        <source>&amp;Copy Address</source>
-        <translation>&amp;Copia l'adreça</translation>
-    </message>
     <message>
         <source>Delete the currently selected address from the list</source>
         <translation>Elimina l'adreça sel·leccionada actualment de la llista</translation>
@@ -45,73 +41,6 @@
         <source>&amp;Delete</source>
         <translation>&amp;Elimina</translation>
     </message>
-    <message>
-        <source>Choose the address to send coins to</source>
-        <translation>Trieu una adreça on voleu enviar monedes</translation>
-    </message>
-    <message>
-        <source>Choose the address to receive coins with</source>
-        <translation>Trieu l'adreça on voleu rebre monedes</translation>
-    </message>
-    <message>
-        <source>C&amp;hoose</source>
-        <translation>T&amp;ria</translation>
-    </message>
-    <message>
-        <source>Sending addresses</source>
-        <translation>S'estan enviant les adreces</translation>
-    </message>
-    <message>
-        <source>Receiving addresses</source>
-        <translation>S'estan rebent les adreces</translation>
-    </message>
-    <message>
-        <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source>
-        <translation>Aquestes són les vostres adreces de Bitcoin per enviar els pagaments. Sempre reviseu l'import i l'adreça del destinatari abans de transferir monedes.</translation>
-    </message>
-    <message>
-        <source>These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source>
-        <translation>Aquestes són les vostres adreces Bitcoin per rebre pagaments. Es recomana utilitzar una adreça nova de recepció per a cada transacció.</translation>
-    </message>
-    <message>
-        <source>Copy &amp;Label</source>
-        <translation>Copia l'&amp;etiqueta</translation>
-    </message>
-    <message>
-        <source>&amp;Edit</source>
-        <translation>&amp;Edita</translation>
-    </message>
-    <message>
-        <source>Export Address List</source>
-        <translation>Exporta la llista d'adreces</translation>
-    </message>
-    <message>
-        <source>Comma separated file (*.csv)</source>
-        <translation>Fitxer de separació amb comes (*.csv)</translation>
-    </message>
-    <message>
-        <source>Exporting Failed</source>
-        <translation>L'exportació ha fallat</translation>
-    </message>
-    <message>
-        <source>There was an error trying to save the address list to %1. Please try again.</source>
-        <translation>S'ha produït un error en desar la llista d'adreces a %1. Torneu-ho a provar.</translation>
-    </message>
-</context>
-<context>
-    <name>AddressTableModel</name>
-    <message>
-        <source>Label</source>
-        <translation>Etiqueta</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>Adreça</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(sense etiqueta)</translation>
-    </message>
 </context>
 <context>
     <name>AskPassphraseDialog</name>
@@ -131,94 +60,6 @@
         <source>Repeat new passphrase</source>
         <translation>Repetiu la nova contrasenya</translation>
     </message>
-    <message>
-        <source>Encrypt wallet</source>
-        <translation>Encripta el moneder</translation>
-    </message>
-    <message>
-        <source>This operation needs your wallet passphrase to unlock the wallet.</source>
-        <translation>Aquesta operació requereix la contrasenya del moneder per a desbloquejar-lo.</translation>
-    </message>
-    <message>
-        <source>Unlock wallet</source>
-        <translation>Desbloqueja el moneder</translation>
-    </message>
-    <message>
-        <source>This operation needs your wallet passphrase to decrypt the wallet.</source>
-        <translation>Aquesta operació requereix la contrasenya del moneder per desencriptar-lo.</translation>
-    </message>
-    <message>
-        <source>Decrypt wallet</source>
-        <translation>Desencripta el moneder</translation>
-    </message>
-    <message>
-        <source>Change passphrase</source>
-        <translation>Canvia la contrasenya</translation>
-    </message>
-    <message>
-        <source>Confirm wallet encryption</source>
-        <translation>Confirma l'encriptació del moneder</translation>
-    </message>
-    <message>
-        <source>Warning: If you encrypt your wallet and lose your passphrase, you will &lt;b&gt;LOSE ALL OF YOUR BITCOINS&lt;/b&gt;!</source>
-        <translation>Avís: si encripteu el vostre moneder i perdeu la contrasenya, &lt;b&gt;PERDREU TOTS ELS VOSTRES BITCOINS&lt;/b&gt;!</translation>
-    </message>
-    <message>
-        <source>Are you sure you wish to encrypt your wallet?</source>
-        <translation>Esteu segur que voleu encriptar el vostre moneder?</translation>
-    </message>
-    <message>
-        <source>Bitcoin Core will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source>
-        <translation>Ara es tancarà el Bitcoin Core per finalitzar el procés d'encriptació. Tingueu present que encriptar el vostre moneder no garanteix que les vostres bitcoins no puguin ser robades per programari maliciós que infecti l'ordinador.</translation>
-    </message>
-    <message>
-        <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source>
-        <translation>IMPORTANT: Tota copia de seguretat que hàgiu realitzat hauria de ser reemplaçada pel, recentment generat, fitxer encriptat del moneder.</translation>
-    </message>
-    <message>
-        <source>Warning: The Caps Lock key is on!</source>
-        <translation>Avís: Les lletres majúscules estan activades!</translation>
-    </message>
-    <message>
-        <source>Wallet encrypted</source>
-        <translation>Moneder encriptat</translation>
-    </message>
-    <message>
-        <source>Enter the new passphrase to the wallet.&lt;br/&gt;Please use a passphrase of &lt;b&gt;ten or more random characters&lt;/b&gt;, or &lt;b&gt;eight or more words&lt;/b&gt;.</source>
-        <translation>Introduïu la contrasenya nova al moneder.&lt;br/&gt;Utilitzeu una contrasenya de &lt;b&gt;deu o més caràcters aleatoris&lt;/b&gt;, o &lt;b&gt;vuit o més paraules&lt;/b&gt;.</translation>
-    </message>
-    <message>
-        <source>Enter the old passphrase and new passphrase to the wallet.</source>
-        <translation>Introduïu la contrasenya antiga i la contrasenya nova al moneder.</translation>
-    </message>
-    <message>
-        <source>Wallet encryption failed</source>
-        <translation>L'encriptació del moneder ha fallat</translation>
-    </message>
-    <message>
-        <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
-        <translation>L'encriptació del moneder ha fallat per un error intern. El moneder no ha estat encriptat.</translation>
-    </message>
-    <message>
-        <source>The supplied passphrases do not match.</source>
-        <translation>La contrasenya introduïda no coincideix.</translation>
-    </message>
-    <message>
-        <source>Wallet unlock failed</source>
-        <translation>El desbloqueig del moneder ha fallat</translation>
-    </message>
-    <message>
-        <source>The passphrase entered for the wallet decryption was incorrect.</source>
-        <translation>La contrasenya introduïda per a desencriptar el moneder és incorrecta.</translation>
-    </message>
-    <message>
-        <source>Wallet decryption failed</source>
-        <translation>La desencriptació del moneder ha fallat</translation>
-    </message>
-    <message>
-        <source>Wallet passphrase was successfully changed.</source>
-        <translation>La contrasenya del moneder ha estat modificada correctament.</translation>
-    </message>
 </context>
 <context>
     <name>BanTableModel</name>
@@ -305,14 +146,6 @@
         <source>Open &amp;URI...</source>
         <translation>Obre un &amp;URI...</translation>
     </message>
-    <message>
-        <source>Bitcoin Core client</source>
-        <translation>Client del Bitcoin Core</translation>
-    </message>
-    <message>
-        <source>Importing blocks from disk...</source>
-        <translation>S'estan important els blocs del disc...</translation>
-    </message>
     <message>
         <source>Reindexing blocks on disk...</source>
         <translation>S'estan reindexant els blocs al disc...</translation>
@@ -357,10 +190,6 @@
         <source>&amp;Receive</source>
         <translation>&amp;Rep</translation>
     </message>
-    <message>
-        <source>Show information about Bitcoin Core</source>
-        <translation>Mostra informació del Bitcoin Core</translation>
-    </message>
     <message>
         <source>&amp;Show / Hide</source>
         <translation>&amp;Mostra / Amaga</translation>
@@ -397,22 +226,10 @@
         <source>Tabs toolbar</source>
         <translation>Barra d'eines de les pestanyes</translation>
     </message>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Nucli de Bitcoin</translation>
-    </message>
     <message>
         <source>Request payments (generates QR codes and bitcoin: URIs)</source>
         <translation>Sol·licita pagaments (genera codis QR i bitcoin: URI)</translation>
     </message>
-    <message>
-        <source>&amp;About Bitcoin Core</source>
-        <translation>&amp;Quant al Bitcoin Core</translation>
-    </message>
-    <message>
-        <source>Modify configuration options for Bitcoin Core</source>
-        <translation>Modifica les opcions de configuració del Bitcoin Core</translation>
-    </message>
     <message>
         <source>Show the list of used sending addresses and labels</source>
         <translation>Mostra la llista d'adreces d'enviament i etiquetes utilitzades</translation>
@@ -429,10 +246,6 @@
         <source>&amp;Command-line options</source>
         <translation>Opcions de la &amp;línia d'ordres</translation>
     </message>
-    <message>
-        <source>Show the Bitcoin Core help message to get a list with possible Bitcoin command-line options</source>
-        <translation>Mostra el missatge d'ajuda del Bitcoin Core per obtenir una llista amb les possibles opcions de línia d'ordres de Bitcoin</translation>
-    </message>
     <message numerus="yes">
         <source>%n active connection(s) to Bitcoin network</source>
         <translation><numerusform>%n connexió activa a la xarxa Bitcoin</numerusform><numerusform>%n connexions actives a la xarxa Bitcoin</numerusform></translation>
@@ -544,13 +357,6 @@
         <translation>El moneder està &lt;b&gt;encriptat&lt;/b&gt; i actualment &lt;b&gt;bloquejat&lt;/b&gt;</translation>
     </message>
 </context>
-<context>
-    <name>ClientModel</name>
-    <message>
-        <source>Network Alert</source>
-        <translation>Alerta de xarxa</translation>
-    </message>
-</context>
 <context>
     <name>CoinControlDialog</name>
     <message>
@@ -629,150 +435,6 @@
         <source>Priority</source>
         <translation>Prioritat</translation>
     </message>
-    <message>
-        <source>Copy address</source>
-        <translation>Copiar adreça </translation>
-    </message>
-    <message>
-        <source>Copy label</source>
-        <translation>Copiar etiqueta</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>Copia l'import</translation>
-    </message>
-    <message>
-        <source>Copy transaction ID</source>
-        <translation>Copiar ID de transacció</translation>
-    </message>
-    <message>
-        <source>Lock unspent</source>
-        <translation>Bloqueja sense gastar</translation>
-    </message>
-    <message>
-        <source>Unlock unspent</source>
-        <translation>Desbloqueja sense gastar</translation>
-    </message>
-    <message>
-        <source>Copy quantity</source>
-        <translation>Copia la quantitat</translation>
-    </message>
-    <message>
-        <source>Copy fee</source>
-        <translation>Copia la comissió</translation>
-    </message>
-    <message>
-        <source>Copy after fee</source>
-        <translation>Copia la comissió posterior</translation>
-    </message>
-    <message>
-        <source>Copy bytes</source>
-        <translation>Copia els bytes</translation>
-    </message>
-    <message>
-        <source>Copy priority</source>
-        <translation>Copia la prioritat</translation>
-    </message>
-    <message>
-        <source>Copy dust</source>
-        <translation>Copia el polsim</translation>
-    </message>
-    <message>
-        <source>Copy change</source>
-        <translation>Copia el canvi</translation>
-    </message>
-    <message>
-        <source>highest</source>
-        <translation>El més alt</translation>
-    </message>
-    <message>
-        <source>higher</source>
-        <translation>Més alt</translation>
-    </message>
-    <message>
-        <source>high</source>
-        <translation>Alt</translation>
-    </message>
-    <message>
-        <source>medium-high</source>
-        <translation>mig-alt</translation>
-    </message>
-    <message>
-        <source>medium</source>
-        <translation>mig</translation>
-    </message>
-    <message>
-        <source>low-medium</source>
-        <translation>baix-mig</translation>
-    </message>
-    <message>
-        <source>low</source>
-        <translation>baix</translation>
-    </message>
-    <message>
-        <source>lower</source>
-        <translation>més baix</translation>
-    </message>
-    <message>
-        <source>lowest</source>
-        <translation>el més baix</translation>
-    </message>
-    <message>
-        <source>(%1 locked)</source>
-        <translation>(%1 bloquejada)</translation>
-    </message>
-    <message>
-        <source>none</source>
-        <translation>cap</translation>
-    </message>
-    <message>
-        <source>This label turns red if the transaction size is greater than 1000 bytes.</source>
-        <translation>Aquesta etiqueta es torna en vermell si la transacció és superior a 1000 bytes.</translation>
-    </message>
-    <message>
-        <source>This label turns red if the priority is smaller than "medium".</source>
-        <translation>Aquesta etiqueta es torna en vermell si la propietat és inferior que la «mitjana».</translation>
-    </message>
-    <message>
-        <source>This label turns red if any recipient receives an amount smaller than %1.</source>
-        <translation>Aquesta etiqueta es torna vermella si el destinatari rep un import inferior de %1.</translation>
-    </message>
-    <message>
-        <source>Can vary +/- %1 satoshi(s) per input.</source>
-        <translation>Pot variar +/- %1 satoshi(s) per entrada.</translation>
-    </message>
-    <message>
-        <source>yes</source>
-        <translation>sí</translation>
-    </message>
-    <message>
-        <source>no</source>
-        <translation>no</translation>
-    </message>
-    <message>
-        <source>This means a fee of at least %1 per kB is required.</source>
-        <translation>Això comporta una comissió d'almenys %1 per kB.</translation>
-    </message>
-    <message>
-        <source>Can vary +/- 1 byte per input.</source>
-        <translation>Pot variar +/- 1 byte per entrada.</translation>
-    </message>
-    <message>
-        <source>Transactions with higher priority are more likely to get included into a block.</source>
-        <translation>Les transaccions amb una major prioritat són més propenses a ser incloses en un bloc.</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(sense etiqueta)</translation>
-    </message>
-    <message>
-        <source>change from %1 (%2)</source>
-        <translation>canvia de %1 (%2)</translation>
-    </message>
-    <message>
-        <source>(change)</source>
-        <translation>(canvia)</translation>
-    </message>
 </context>
 <context>
     <name>EditAddressDialog</name>
@@ -796,38 +458,6 @@
         <source>&amp;Address</source>
         <translation>&amp;Adreça</translation>
     </message>
-    <message>
-        <source>New receiving address</source>
-        <translation>Nova adreça de recepció.</translation>
-    </message>
-    <message>
-        <source>New sending address</source>
-        <translation>Nova adreça d'enviament</translation>
-    </message>
-    <message>
-        <source>Edit receiving address</source>
-        <translation>Edita les adreces de recepció</translation>
-    </message>
-    <message>
-        <source>Edit sending address</source>
-        <translation>Edita les adreces d'enviament</translation>
-    </message>
-    <message>
-        <source>The entered address "%1" is already in the address book.</source>
-        <translation>L'adreça introduïda «%1» ja és present a la llibreta d'adreces.</translation>
-    </message>
-    <message>
-        <source>The entered address "%1" is not a valid Bitcoin address.</source>
-        <translation>L'adreça introduïda «%1» no és una adreça de Bitcoin vàlida.</translation>
-    </message>
-    <message>
-        <source>Could not unlock wallet.</source>
-        <translation>No s'ha pogut desbloquejar el moneder.</translation>
-    </message>
-    <message>
-        <source>New key generation failed.</source>
-        <translation>Ha fallat la generació d'una nova clau.</translation>
-    </message>
 </context>
 <context>
     <name>FreespaceChecker</name>
@@ -854,10 +484,6 @@
 </context>
 <context>
     <name>HelpMessageDialog</name>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Nucli de Bitcoin</translation>
-    </message>
     <message>
         <source>version</source>
         <translation>versió</translation>
@@ -866,10 +492,6 @@
         <source>(%1-bit)</source>
         <translation>(%1-bit)</translation>
     </message>
-    <message>
-        <source>About Bitcoin Core</source>
-        <translation>Quant al Bitcoin Core</translation>
-    </message>
     <message>
         <source>Command-line options</source>
         <translation>Opcions de línia d'ordres</translation>
@@ -906,29 +528,13 @@
         <source>Show splash screen on startup (default: %u)</source>
         <translation>Mostra la pantalla de benvinguda a l'inici (per defecte: %u)</translation>
     </message>
-    <message>
-        <source>Reset all settings changes made over the GUI</source>
-        <translation>Reinicialitza tots els canvis de configuració fets des de la interfície gràfica</translation>
-    </message>
-</context>
+    </context>
 <context>
     <name>Intro</name>
     <message>
         <source>Welcome</source>
         <translation>Us donem la benviguda</translation>
     </message>
-    <message>
-        <source>Welcome to Bitcoin Core.</source>
-        <translation>Us donem la benvinguda al Bitcoin Core.</translation>
-    </message>
-    <message>
-        <source>As this is the first time the program is launched, you can choose where Bitcoin Core will store its data.</source>
-        <translation>Atès que és la primera vegada que executeu el programa, podeu triar on emmagatzemarà el Bitcoin Core les dades.</translation>
-    </message>
-    <message>
-        <source>Bitcoin Core will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source>
-        <translation>El Bitcoin Core descarregarà i emmagatzemarà una còpia de la cadena de blocs de Bitcoin. Com a mínim s'emmagatzemaran %1 GB de dades en aquest directori, que seguiran creixent gradualment. També s'hi emmagatzemarà el moneder.</translation>
-    </message>
     <message>
         <source>Use the default data directory</source>
         <translation>Utilitza el directori de dades per defecte</translation>
@@ -937,10 +543,6 @@
         <source>Use a custom data directory:</source>
         <translation>Utilitza un directori de dades personalitzat:</translation>
     </message>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Nucli de Bitcoin</translation>
-    </message>
     <message>
         <source>Error: Specified data directory "%1" cannot be created.</source>
         <translation>Error: el directori de dades «%1» especificat no pot ser creat.</translation>
@@ -976,10 +578,6 @@
         <source>Select payment request file</source>
         <translation>Selecciona un fitxer de sol·licitud de pagament</translation>
     </message>
-    <message>
-        <source>Select payment request file to open</source>
-        <translation>Selecciona el fitxer de sol·licitud de pagament per obrir</translation>
-    </message>
 </context>
 <context>
     <name>OptionsDialog</name>
@@ -1019,10 +617,6 @@
         <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Exit in the menu.</source>
         <translation>Minimitza en comptes de sortir de l'aplicació quan la finestra es tanca. Quan s'habilita aquesta opció l'aplicació es tancara només quan se selecciona Surt del menú. </translation>
     </message>
-    <message>
-        <source>The user interface language can be set here. This setting will take effect after restarting Bitcoin Core.</source>
-        <translation>La interfície d'usuari pot definir-se des d'aquí. El paràmetre tindrà efecte després de reiniciar el Bitcoin Core.</translation>
-    </message>
     <message>
         <source>Third party URLs (e.g. a block explorer) that appear in the transactions tab as context menu items. %s in the URL is replaced by transaction hash. Multiple URLs are separated by vertical bar |.</source>
         <translation>URL de terceres parts (p. ex. explorador de blocs) que apareix en la pestanya de transaccions com elements del menú contextual. %s en l'URL es reemplaçat pel resum de la transacció. Diferents URL estan separades per una barra vertical |.</translation>
@@ -1047,14 +641,6 @@
         <source>&amp;Network</source>
         <translation>&amp;Xarxa</translation>
     </message>
-    <message>
-        <source>Automatically start Bitcoin Core after logging in to the system.</source>
-        <translation>Inicia el Bitcoin Core automàticament després d'iniciar una sessió en el sistema.</translation>
-    </message>
-    <message>
-        <source>&amp;Start Bitcoin Core on system login</source>
-        <translation>&amp;Inicia el Bitcoin Core en inciar el sistema</translation>
-    </message>
     <message>
         <source>(0 = auto, &lt;0 = leave that many cores free)</source>
         <translation>(0 = auto, &lt;0 = deixa tants nuclis lliures)</translation>
@@ -1284,190 +870,80 @@
     </message>
 </context>
 <context>
-    <name>PaymentServer</name>
+    <name>PeerTableModel</name>
     <message>
-        <source>URI handling</source>
-        <translation>Gestió d'URI</translation>
+        <source>User Agent</source>
+        <translation>Agent d'usuari</translation>
     </message>
     <message>
-        <source>Invalid payment address %1</source>
-        <translation>Adreça de pagament no vàlida %1</translation>
+        <source>Node/Service</source>
+        <translation>Node/Servei</translation>
     </message>
     <message>
-        <source>Payment request rejected</source>
-        <translation>La sol·licitud de pagament s'ha rebutjat</translation>
+        <source>Ping Time</source>
+        <translation>Temps de ping</translation>
     </message>
+</context>
+<context>
+    <name>QObject</name>
     <message>
-        <source>Payment request network doesn't match client network.</source>
-        <translation>La xarxa de la sol·licitud de pagament no coincideix amb la xarxa del client.</translation>
+        <source>Amount</source>
+        <translation>Import</translation>
     </message>
     <message>
-        <source>Payment request is not initialized.</source>
-        <translation>La sol·licitud de pagament no està inicialitzada.</translation>
+        <source>Enter a Bitcoin address (e.g. %1)</source>
+        <translation>Introduïu una adreça de Bitcoin (p. ex. %1)</translation>
     </message>
     <message>
-        <source>Requested payment amount of %1 is too small (considered dust).</source>
-        <translation>L'import de pagament sol·licitat %1 és massa petit (es considera polsim).</translation>
+        <source>%1 d</source>
+        <translation>%1 d</translation>
     </message>
     <message>
-        <source>Payment request error</source>
-        <translation>Error en la sol·licitud de pagament</translation>
+        <source>%1 h</source>
+        <translation>%1 h</translation>
     </message>
     <message>
-        <source>Cannot start bitcoin: click-to-pay handler</source>
-        <translation>No es pot iniciar bitcoin: gestor clica-per-pagar</translation>
+        <source>%1 m</source>
+        <translation>%1 m</translation>
     </message>
     <message>
-        <source>Payment request fetch URL is invalid: %1</source>
-        <translation>L'URL de recuperació de la sol·licitud de pagament no és vàlida: %1</translation>
+        <source>%1 s</source>
+        <translation>%1 s</translation>
     </message>
     <message>
-        <source>URI cannot be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source>
-        <translation>L'URI no pot ser analitzat! Això pot ser a causa d'una adreça de Bitcoin no vàlida o per paràmetres URI amb mal format.</translation>
+        <source>None</source>
+        <translation>Cap</translation>
     </message>
     <message>
-        <source>Payment request file handling</source>
-        <translation>Gestió de fitxers de les sol·licituds de pagament</translation>
+        <source>N/A</source>
+        <translation>N/A</translation>
     </message>
     <message>
-        <source>Payment request file cannot be read! This can be caused by an invalid payment request file.</source>
-        <translation>No es pot llegir el fitxer de la sol·licitud de pagament. Això pot ser causat per un fitxer de sol·licitud de pagament no vàlid.</translation>
+        <source>%1 ms</source>
+        <translation>%1 ms</translation>
     </message>
+</context>
+<context>
+    <name>RPCConsole</name>
     <message>
-        <source>Payment request expired.</source>
-        <translation>La sol·licitud de pagament ha vençut.</translation>
+        <source>Client name</source>
+        <translation>Nom del client</translation>
     </message>
     <message>
-        <source>Unverified payment requests to custom payment scripts are unsupported.</source>
-        <translation>No s'accepten sol·licituds de pagament no verificades a scripts de pagament personalitzats.</translation>
+        <source>N/A</source>
+        <translation>N/A</translation>
     </message>
     <message>
-        <source>Invalid payment request.</source>
-        <translation>Sol·licitud de pagament no vàlida.</translation>
+        <source>Client version</source>
+        <translation>Versió del client</translation>
     </message>
     <message>
-        <source>Refund from %1</source>
-        <translation>Reemborsament de %1</translation>
+        <source>&amp;Information</source>
+        <translation>&amp;Informació</translation>
     </message>
     <message>
-        <source>Payment request %1 is too large (%2 bytes, allowed %3 bytes).</source>
-        <translation>La sol·licitud de pagament %1 és massa gran (%2 bytes, permès %3 bytes).</translation>
-    </message>
-    <message>
-        <source>Error communicating with %1: %2</source>
-        <translation>Error en comunicar amb %1: %2</translation>
-    </message>
-    <message>
-        <source>Payment request cannot be parsed!</source>
-        <translation>No es pot analitzar la sol·licitud de pagament!</translation>
-    </message>
-    <message>
-        <source>Bad response from server %1</source>
-        <translation>Mala resposta del servidor %1</translation>
-    </message>
-    <message>
-        <source>Payment acknowledged</source>
-        <translation>Pagament reconegut</translation>
-    </message>
-    <message>
-        <source>Network request error</source>
-        <translation>Error en la sol·licitud de xarxa</translation>
-    </message>
-</context>
-<context>
-    <name>PeerTableModel</name>
-    <message>
-        <source>User Agent</source>
-        <translation>Agent d'usuari</translation>
-    </message>
-    <message>
-        <source>Node/Service</source>
-        <translation>Node/Servei</translation>
-    </message>
-    <message>
-        <source>Ping Time</source>
-        <translation>Temps de ping</translation>
-    </message>
-</context>
-<context>
-    <name>QObject</name>
-    <message>
-        <source>Amount</source>
-        <translation>Import</translation>
-    </message>
-    <message>
-        <source>Enter a Bitcoin address (e.g. %1)</source>
-        <translation>Introduïu una adreça de Bitcoin (p. ex. %1)</translation>
-    </message>
-    <message>
-        <source>%1 d</source>
-        <translation>%1 d</translation>
-    </message>
-    <message>
-        <source>%1 h</source>
-        <translation>%1 h</translation>
-    </message>
-    <message>
-        <source>%1 m</source>
-        <translation>%1 m</translation>
-    </message>
-    <message>
-        <source>%1 s</source>
-        <translation>%1 s</translation>
-    </message>
-    <message>
-        <source>None</source>
-        <translation>Cap</translation>
-    </message>
-    <message>
-        <source>N/A</source>
-        <translation>N/A</translation>
-    </message>
-    <message>
-        <source>%1 ms</source>
-        <translation>%1 ms</translation>
-    </message>
-</context>
-<context>
-    <name>QRImageWidget</name>
-    <message>
-        <source>&amp;Save Image...</source>
-        <translation>De&amp;sa la imatge...</translation>
-    </message>
-    <message>
-        <source>&amp;Copy Image</source>
-        <translation>&amp;Copia la imatge</translation>
-    </message>
-    <message>
-        <source>Save QR Code</source>
-        <translation>Desa el codi QR</translation>
-    </message>
-    <message>
-        <source>PNG Image (*.png)</source>
-        <translation>Imatge PNG (*.png)</translation>
-    </message>
-</context>
-<context>
-    <name>RPCConsole</name>
-    <message>
-        <source>Client name</source>
-        <translation>Nom del client</translation>
-    </message>
-    <message>
-        <source>N/A</source>
-        <translation>N/A</translation>
-    </message>
-    <message>
-        <source>Client version</source>
-        <translation>Versió del client</translation>
-    </message>
-    <message>
-        <source>&amp;Information</source>
-        <translation>&amp;Informació</translation>
-    </message>
-    <message>
-        <source>Debug window</source>
-        <translation>Finestra de depuració</translation>
+        <source>Debug window</source>
+        <translation>Finestra de depuració</translation>
     </message>
     <message>
         <source>General</source>
@@ -1513,10 +989,6 @@
         <source>Memory usage</source>
         <translation>Us de memoria</translation>
     </message>
-    <message>
-        <source>Open the Bitcoin Core debug log file from the current data directory. This can take a few seconds for large log files.</source>
-        <translation>Obre el fitxer de registre de depuració del Bitcoin Core del directori de dades actual. Pot portar uns quants segons per a fitxers de registre grans.</translation>
-    </message>
     <message>
         <source>Received</source>
         <translation>Rebut</translation>
@@ -1633,10 +1105,6 @@
         <source>Out:</source>
         <translation>Fora:</translation>
     </message>
-    <message>
-        <source>Build date</source>
-        <translation>Data de compilació</translation>
-    </message>
     <message>
         <source>Debug log file</source>
         <translation>Fitxer de registre de depuració</translation>
@@ -1673,10 +1141,6 @@
         <source>&amp;Unban Node</source>
         <translation>&amp;Desbandeja el node</translation>
     </message>
-    <message>
-        <source>Welcome to the Bitcoin Core RPC console.</source>
-        <translation>Us donem la benviguda a la consola RPC del Bitcoin Core.</translation>
-    </message>
     <message>
         <source>Use up and down arrows to navigate history, and &lt;b&gt;Ctrl-L&lt;/b&gt; to clear screen.</source>
         <translation>Utilitza les fletxes d'amunt i avall per navegar per l'historial, i &lt;b&gt;Ctrl-L&lt;\b&gt; per netejar la pantalla.</translation>
@@ -1804,18 +1268,6 @@
         <source>Remove</source>
         <translation>Esborra</translation>
     </message>
-    <message>
-        <source>Copy label</source>
-        <translation>Copia l'etiqueta</translation>
-    </message>
-    <message>
-        <source>Copy message</source>
-        <translation>Copia el missatge</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>Copia l'import</translation>
-    </message>
 </context>
 <context>
     <name>ReceiveRequestDialog</name>
@@ -1835,73 +1287,6 @@
         <source>&amp;Save Image...</source>
         <translation>De&amp;sa la imatge...</translation>
     </message>
-    <message>
-        <source>Request payment to %1</source>
-        <translation>Sol·licita un pagament a %1</translation>
-    </message>
-    <message>
-        <source>Payment information</source>
-        <translation>Informació de pagament</translation>
-    </message>
-    <message>
-        <source>URI</source>
-        <translation>URI</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>Adreça</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>Import</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Etiqueta</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>Missatge</translation>
-    </message>
-    <message>
-        <source>Resulting URI too long, try to reduce the text for label / message.</source>
-        <translation>URI resultant massa llarga, intenta reduir el text per a la etiqueta / missatge</translation>
-    </message>
-    <message>
-        <source>Error encoding URI into QR Code.</source>
-        <translation>Error en codificar l'URI en un codi QR.</translation>
-    </message>
-</context>
-<context>
-    <name>RecentRequestsTableModel</name>
-    <message>
-        <source>Date</source>
-        <translation>Data</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Etiqueta</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>Missatge</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>Import</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(sense etiqueta)</translation>
-    </message>
-    <message>
-        <source>(no message)</source>
-        <translation>(sense missatge)</translation>
-    </message>
-    <message>
-        <source>(no amount)</source>
-        <translation>(sense import)</translation>
-    </message>
 </context>
 <context>
     <name>SendCoinsDialog</name>
@@ -2021,14 +1406,6 @@
         <source>fast</source>
         <translation>ràpid</translation>
     </message>
-    <message>
-        <source>Send as zero-fee transaction if possible</source>
-        <translation>Envia com a transacció de comissió zero si és possible</translation>
-    </message>
-    <message>
-        <source>(confirmation may take longer)</source>
-        <translation>(la confirmació pot trigar més temps)</translation>
-    </message>
     <message>
         <source>Send to multiple recipients at once</source>
         <translation>Envia a múltiples destinataris al mateix temps</translation>
@@ -2061,118 +1438,6 @@
         <source>S&amp;end</source>
         <translation>E&amp;nvia</translation>
     </message>
-    <message>
-        <source>Confirm send coins</source>
-        <translation>Confirma l'enviament de monedes</translation>
-    </message>
-    <message>
-        <source>%1 to %2</source>
-        <translation>%1 a %2</translation>
-    </message>
-    <message>
-        <source>Copy quantity</source>
-        <translation>Copia la quantitat</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>Copia l'import</translation>
-    </message>
-    <message>
-        <source>Copy fee</source>
-        <translation>Copia la comissió</translation>
-    </message>
-    <message>
-        <source>Copy after fee</source>
-        <translation>Copia la comissió posterior</translation>
-    </message>
-    <message>
-        <source>Copy bytes</source>
-        <translation>Copia els bytes</translation>
-    </message>
-    <message>
-        <source>Copy priority</source>
-        <translation>Copia la prioritat</translation>
-    </message>
-    <message>
-        <source>Copy change</source>
-        <translation>Copia el canvi</translation>
-    </message>
-    <message>
-        <source>Total Amount %1</source>
-        <translation>Import total %1</translation>
-    </message>
-    <message>
-        <source>or</source>
-        <translation>o</translation>
-    </message>
-    <message>
-        <source>The amount to pay must be larger than 0.</source>
-        <translation>L'import a pagar ha de ser major que 0.</translation>
-    </message>
-    <message>
-        <source>The amount exceeds your balance.</source>
-        <translation>L'import supera el vostre balanç.</translation>
-    </message>
-    <message>
-        <source>The total exceeds your balance when the %1 transaction fee is included.</source>
-        <translation>El total excedeix el teu balanç quan s'afegeix la comissió a la transacció %1.</translation>
-    </message>
-    <message>
-        <source>Transaction creation failed!</source>
-        <translation>Ha fallat la creació de la transacció!</translation>
-    </message>
-    <message>
-        <source>The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source>
-        <translation>S'ha rebutjat la transacció! Això pot passar si alguna de les monedes del vostre moneder ja s'han gastat; per exemple, si heu fet servir una còpia de seguretat del fitxer wallet.dat i s'haguessin gastat monedes de la còpia però sense marcar-les-hi com a gastades.</translation>
-    </message>
-    <message>
-        <source>A fee higher than %1 is considered an absurdly high fee.</source>
-        <translation>Una comissió superior a %1 es considera una comissió absurdament alta.</translation>
-    </message>
-    <message>
-        <source>Payment request expired.</source>
-        <translation>La sol·licitud de pagament ha vençut.</translation>
-    </message>
-    <message>
-        <source>Pay only the required fee of %1</source>
-        <translation>Paga només la comissió necessària de %1</translation>
-    </message>
-    <message numerus="yes">
-        <source>Estimated to begin confirmation within %n block(s).</source>
-        <translation><numerusform>Estimat per començar la confirmació en %n bloc.</numerusform><numerusform>Estimat per començar la confirmació en %n blocs.</numerusform></translation>
-    </message>
-    <message>
-        <source>The recipient address is not valid. Please recheck.</source>
-        <translation>L'adreça de destinatari no és vàlida. Torneu-la a comprovar.</translation>
-    </message>
-    <message>
-        <source>Duplicate address found: addresses should only be used once each.</source>
-        <translation>S'ha trobat una adreça duplicada: cal utilitzar les adreces només un cop cada vegada.</translation>
-    </message>
-    <message>
-        <source>Warning: Invalid Bitcoin address</source>
-        <translation>Avís: adreça Bitcoin no vàlida</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(sense etiqueta)</translation>
-    </message>
-    <message>
-        <source>Warning: Unknown change address</source>
-        <translation>Avís: adreça de canvi desconeguda</translation>
-    </message>
-    <message>
-        <source>Copy dust</source>
-        <translation>Copia el polsim</translation>
-    </message>
-    <message>
-        <source>Are you sure you want to send?</source>
-        <translation>Esteu segur que ho voleu enviar?</translation>
-    </message>
-    <message>
-        <source>added as transaction fee</source>
-        <translation>S'ha afegit una taxa de transacció</translation>
-    </message>
 </context>
 <context>
     <name>SendCoinsEntry</name>
@@ -2184,10 +1449,6 @@
         <source>Pay &amp;To:</source>
         <translation>Paga &amp;a:</translation>
     </message>
-    <message>
-        <source>Enter a label for this address to add it to your address book</source>
-        <translation>Introduïu una etiqueta per a aquesta adreça per afegir-la a la llibreta d'adreces</translation>
-    </message>
     <message>
         <source>&amp;Label:</source>
         <translation>&amp;Etiqueta:</translation>
@@ -2259,10 +1520,6 @@
 </context>
 <context>
     <name>ShutdownWindow</name>
-    <message>
-        <source>Bitcoin Core is shutting down...</source>
-        <translation>S'està aturant el Bitcoin Core...</translation>
-    </message>
     <message>
         <source>Do not shut down the computer until this window disappears.</source>
         <translation>No apagueu l'ordinador fins que no desaparegui aquesta finestra.</translation>
@@ -2354,598 +1611,72 @@
         <source>Reset all verify message fields</source>
         <translation>Neteja tots els camps de verificació de missatge</translation>
     </message>
+</context>
+<context>
+    <name>SplashScreen</name>
     <message>
-        <source>Click "Sign Message" to generate signature</source>
-        <translation>Feu clic a «Signa el missatge» per a generar una signatura</translation>
+        <source>[testnet]</source>
+        <translation>[testnet]</translation>
     </message>
+</context>
+<context>
+    <name>TrafficGraphWidget</name>
     <message>
-        <source>The entered address is invalid.</source>
-        <translation>L'adreça introduïda no és vàlida.</translation>
+        <source>KB/s</source>
+        <translation>KB/s</translation>
     </message>
+</context>
+<context>
+    <name>TransactionDescDialog</name>
     <message>
-        <source>Please check the address and try again.</source>
-        <translation>Comproveu l'adreça i torneu-ho a provar.</translation>
+        <source>This pane shows a detailed description of the transaction</source>
+        <translation>Aquest panell mostra una descripció detallada de la transacció</translation>
     </message>
+</context>
+<context>
+    <name>UnitDisplayStatusBarControl</name>
     <message>
-        <source>The entered address does not refer to a key.</source>
-        <translation>L'adreça introduïda no referencia a cap clau.</translation>
+        <source>Unit to show amounts in. Click to select another unit.</source>
+        <translation>Unitat en què mostrar els imports. Feu clic per seleccionar una altra unitat.</translation>
     </message>
+</context>
+<context>
+    <name>bitcoin-core</name>
     <message>
-        <source>Wallet unlock was cancelled.</source>
-        <translation>El desbloqueig del moneder ha estat cancelat.</translation>
+        <source>Options:</source>
+        <translation>Opcions:</translation>
     </message>
     <message>
-        <source>Private key for the entered address is not available.</source>
-        <translation>La clau privada per a la adreça introduïda no està disponible.</translation>
+        <source>Specify data directory</source>
+        <translation>Especifica el directori de dades</translation>
     </message>
     <message>
-        <source>Message signing failed.</source>
-        <translation>La signatura del missatge ha fallat.</translation>
+        <source>Connect to a node to retrieve peer addresses, and disconnect</source>
+        <translation>Connecta al node per obtenir les adreces de les connexions, i desconnecta</translation>
     </message>
     <message>
-        <source>Message signed.</source>
-        <translation>Missatge signat.</translation>
+        <source>Specify your own public address</source>
+        <translation>Especifiqueu la vostra adreça pública</translation>
     </message>
     <message>
-        <source>The signature could not be decoded.</source>
-        <translation>La signatura no s'ha pogut descodificar.</translation>
+        <source>Accept command line and JSON-RPC commands</source>
+        <translation>Accepta la línia d'ordres i ordres JSON-RPC </translation>
     </message>
     <message>
-        <source>Please check the signature and try again.</source>
-        <translation>Comproveu la signatura i torneu-ho a provar.</translation>
+        <source>If &lt;category&gt; is not supplied or if &lt;category&gt; = 1, output all debugging information.</source>
+        <translation>Si no es proporciona &lt;category&gt; o si &lt;category&gt; = 1, treu a la sortida tota la informació de depuració.</translation>
     </message>
     <message>
-        <source>The signature did not match the message digest.</source>
-        <translation>La signatura no coincideix amb el resum del missatge.</translation>
+        <source>Prune configured below the minimum of %d MiB.  Please use a higher number.</source>
+        <translation>Poda configurada per sota el mínim de %d MiB. Utilitzeu un nombre superior.</translation>
     </message>
     <message>
-        <source>Message verification failed.</source>
-        <translation>Ha fallat la verificació del missatge.</translation>
+        <source>Prune: last wallet synchronisation goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of pruned node)</source>
+        <translation>Poda: la darrera sincronització del moneder va més enllà de les dades podades. Cal que activeu -reindex (baixeu tota la cadena de blocs de nou en cas de node podat)</translation>
     </message>
     <message>
-        <source>Message verified.</source>
-        <translation>Missatge verificat.</translation>
-    </message>
-</context>
-<context>
-    <name>SplashScreen</name>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Bitcoin Core</translation>
-    </message>
-    <message>
-        <source>The Bitcoin Core developers</source>
-        <translation>Els desenvolupadors del Bitcoin Core</translation>
-    </message>
-    <message>
-        <source>[testnet]</source>
-        <translation>[testnet]</translation>
-    </message>
-</context>
-<context>
-    <name>TrafficGraphWidget</name>
-    <message>
-        <source>KB/s</source>
-        <translation>KB/s</translation>
-    </message>
-</context>
-<context>
-    <name>TransactionDesc</name>
-    <message>
-        <source>Open until %1</source>
-        <translation>Obert fins %1</translation>
-    </message>
-    <message>
-        <source>conflicted</source>
-        <translation>en conflicte</translation>
-    </message>
-    <message>
-        <source>%1/offline</source>
-        <translation>%1/fora de línia</translation>
-    </message>
-    <message>
-        <source>%1/unconfirmed</source>
-        <translation>%1/sense confirmar</translation>
-    </message>
-    <message>
-        <source>%1 confirmations</source>
-        <translation>%1 confirmacions</translation>
-    </message>
-    <message>
-        <source>Status</source>
-        <translation>Estat</translation>
-    </message>
-    <message numerus="yes">
-        <source>, broadcast through %n node(s)</source>
-        <translation><numerusform>, difusió a través de %n node</numerusform><numerusform>, difusió a través de %n nodes</numerusform></translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation>Data</translation>
-    </message>
-    <message>
-        <source>Source</source>
-        <translation>Font</translation>
-    </message>
-    <message>
-        <source>Generated</source>
-        <translation>Generat</translation>
-    </message>
-    <message>
-        <source>From</source>
-        <translation>Des de</translation>
-    </message>
-    <message>
-        <source>To</source>
-        <translation>A</translation>
-    </message>
-    <message>
-        <source>own address</source>
-        <translation>Adreça pròpia</translation>
-    </message>
-    <message>
-        <source>watch-only</source>
-        <translation>només lectura</translation>
-    </message>
-    <message>
-        <source>label</source>
-        <translation>etiqueta</translation>
-    </message>
-    <message>
-        <source>Credit</source>
-        <translation>Crèdit</translation>
-    </message>
-    <message numerus="yes">
-        <source>matures in %n more block(s)</source>
-        <translation><numerusform>disponible en %n bloc més</numerusform><numerusform>disponibles en %n blocs més</numerusform></translation>
-    </message>
-    <message>
-        <source>not accepted</source>
-        <translation>no acceptat</translation>
-    </message>
-    <message>
-        <source>Debit</source>
-        <translation>Dèbit</translation>
-    </message>
-    <message>
-        <source>Total debit</source>
-        <translation>Dèbit total</translation>
-    </message>
-    <message>
-        <source>Total credit</source>
-        <translation>Crèdit total</translation>
-    </message>
-    <message>
-        <source>Transaction fee</source>
-        <translation>Comissió de transacció</translation>
-    </message>
-    <message>
-        <source>Net amount</source>
-        <translation>Import net</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>Missatge</translation>
-    </message>
-    <message>
-        <source>Comment</source>
-        <translation>Comentar</translation>
-    </message>
-    <message>
-        <source>Transaction ID</source>
-        <translation>ID de transacció</translation>
-    </message>
-    <message>
-        <source>Merchant</source>
-        <translation>Mercader</translation>
-    </message>
-    <message>
-        <source>Generated coins must mature %1 blocks before they can be spent. When you generated this block, it was broadcast to the network to be added to the block chain. If it fails to get into the chain, its state will change to "not accepted" and it won't be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source>
-        <translation>Les monedes generades han de madurar %1 blocs abans de poder ser gastades. Quan genereu aquest bloc, es farà saber a la xarxa per tal d'afegir-lo a la cadena de blocs. Si no pot fer-se lloc a la cadena, el seu estat canviarà a «no acceptat» i no es podrà gastar. Això pot passar ocasionalment si un altre node genera un bloc en un marge de segons respecte al vostre.</translation>
-    </message>
-    <message>
-        <source>Debug information</source>
-        <translation>Informació de depuració</translation>
-    </message>
-    <message>
-        <source>Transaction</source>
-        <translation>Transacció</translation>
-    </message>
-    <message>
-        <source>Inputs</source>
-        <translation>Entrades</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>Import</translation>
-    </message>
-    <message>
-        <source>true</source>
-        <translation>cert</translation>
-    </message>
-    <message>
-        <source>false</source>
-        <translation>fals</translation>
-    </message>
-    <message>
-        <source>, has not been successfully broadcast yet</source>
-        <translation>, encara no ha estat emès correctement</translation>
-    </message>
-    <message numerus="yes">
-        <source>Open for %n more block(s)</source>
-        <translation><numerusform>Obre per %n bloc més</numerusform><numerusform>Obre per %n blocs més</numerusform></translation>
-    </message>
-    <message>
-        <source>unknown</source>
-        <translation>desconegut</translation>
-    </message>
-</context>
-<context>
-    <name>TransactionDescDialog</name>
-    <message>
-        <source>Transaction details</source>
-        <translation>Detall de la transacció</translation>
-    </message>
-    <message>
-        <source>This pane shows a detailed description of the transaction</source>
-        <translation>Aquest panell mostra una descripció detallada de la transacció</translation>
-    </message>
-</context>
-<context>
-    <name>TransactionTableModel</name>
-    <message>
-        <source>Date</source>
-        <translation>Data</translation>
-    </message>
-    <message>
-        <source>Type</source>
-        <translation>Tipus</translation>
-    </message>
-    <message>
-        <source>Immature (%1 confirmations, will be available after %2)</source>
-        <translation>Immadur (%1 confirmacions, serà disponible després de %2)</translation>
-    </message>
-    <message numerus="yes">
-        <source>Open for %n more block(s)</source>
-        <translation><numerusform>Obre per %n bloc més</numerusform><numerusform>Obre per %n blocs més</numerusform></translation>
-    </message>
-    <message>
-        <source>Open until %1</source>
-        <translation>Obert fins %1</translation>
-    </message>
-    <message>
-        <source>Confirmed (%1 confirmations)</source>
-        <translation>Confirmat (%1 confirmacions)</translation>
-    </message>
-    <message>
-        <source>This block was not received by any other nodes and will probably not be accepted!</source>
-        <translation>Aquest bloc no ha estat rebut per cap altre node i probablement no serà acceptat!</translation>
-    </message>
-    <message>
-        <source>Generated but not accepted</source>
-        <translation>Generat però no acceptat</translation>
-    </message>
-    <message>
-        <source>Offline</source>
-        <translation>Fora de línia</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Etiqueta</translation>
-    </message>
-    <message>
-        <source>Unconfirmed</source>
-        <translation>Sense confirmar</translation>
-    </message>
-    <message>
-        <source>Confirming (%1 of %2 recommended confirmations)</source>
-        <translation>Confirmant (%1 de %2 confirmacions recomanades)</translation>
-    </message>
-    <message>
-        <source>Conflicted</source>
-        <translation>En conflicte</translation>
-    </message>
-    <message>
-        <source>Received with</source>
-        <translation>Rebut amb</translation>
-    </message>
-    <message>
-        <source>Received from</source>
-        <translation>Rebut de</translation>
-    </message>
-    <message>
-        <source>Sent to</source>
-        <translation>Enviat a</translation>
-    </message>
-    <message>
-        <source>Payment to yourself</source>
-        <translation>Pagament a un mateix</translation>
-    </message>
-    <message>
-        <source>Mined</source>
-        <translation>Minat</translation>
-    </message>
-    <message>
-        <source>watch-only</source>
-        <translation>només lectura</translation>
-    </message>
-    <message>
-        <source>(n/a)</source>
-        <translation>(n/a)</translation>
-    </message>
-    <message>
-        <source>Transaction status. Hover over this field to show number of confirmations.</source>
-        <translation>Estat de la transacció. Desplaceu-vos sobre aquest camp per mostrar el nombre de confirmacions.</translation>
-    </message>
-    <message>
-        <source>Date and time that the transaction was received.</source>
-        <translation>Data i hora en que la transacció va ser rebuda.</translation>
-    </message>
-    <message>
-        <source>Type of transaction.</source>
-        <translation>Tipus de transacció.</translation>
-    </message>
-    <message>
-        <source>Whether or not a watch-only address is involved in this transaction.</source>
-        <translation>Si està implicada o no una adreça només de lectura en la transacció.</translation>
-    </message>
-    <message>
-        <source>User-defined intent/purpose of the transaction.</source>
-        <translation>Intenció/propòsit de la transacció definida per l'usuari.</translation>
-    </message>
-    <message>
-        <source>Amount removed from or added to balance.</source>
-        <translation>Import extret o afegit del balanç.</translation>
-    </message>
-</context>
-<context>
-    <name>TransactionView</name>
-    <message>
-        <source>All</source>
-        <translation>Tot</translation>
-    </message>
-    <message>
-        <source>Today</source>
-        <translation>Avui</translation>
-    </message>
-    <message>
-        <source>This week</source>
-        <translation>Aquesta setmana</translation>
-    </message>
-    <message>
-        <source>This month</source>
-        <translation>Aquest mes</translation>
-    </message>
-    <message>
-        <source>Last month</source>
-        <translation>El mes passat</translation>
-    </message>
-    <message>
-        <source>This year</source>
-        <translation>Enguany</translation>
-    </message>
-    <message>
-        <source>Range...</source>
-        <translation>Rang...</translation>
-    </message>
-    <message>
-        <source>Received with</source>
-        <translation>Rebut amb</translation>
-    </message>
-    <message>
-        <source>Sent to</source>
-        <translation>Enviat a</translation>
-    </message>
-    <message>
-        <source>To yourself</source>
-        <translation>A un mateix</translation>
-    </message>
-    <message>
-        <source>Mined</source>
-        <translation>Minat</translation>
-    </message>
-    <message>
-        <source>Other</source>
-        <translation>Altres</translation>
-    </message>
-    <message>
-        <source>Enter address or label to search</source>
-        <translation>Introduïu una adreça o una etiqueta per cercar</translation>
-    </message>
-    <message>
-        <source>Min amount</source>
-        <translation>Import mínim</translation>
-    </message>
-    <message>
-        <source>Copy address</source>
-        <translation>Copia l'adreça</translation>
-    </message>
-    <message>
-        <source>Copy label</source>
-        <translation>Copiar etiqueta</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>Copia l'import</translation>
-    </message>
-    <message>
-        <source>Copy transaction ID</source>
-        <translation>Copiar ID de transacció</translation>
-    </message>
-    <message>
-        <source>Copy raw transaction</source>
-        <translation>Copia la transacció crua</translation>
-    </message>
-    <message>
-        <source>Edit label</source>
-        <translation>Editar etiqueta</translation>
-    </message>
-    <message>
-        <source>Show transaction details</source>
-        <translation>Mostra detalls de la transacció</translation>
-    </message>
-    <message>
-        <source>Export Transaction History</source>
-        <translation>Exporta l'historial de transacció</translation>
-    </message>
-    <message>
-        <source>Watch-only</source>
-        <translation>Només de lectura</translation>
-    </message>
-    <message>
-        <source>Exporting Failed</source>
-        <translation>L'exportació ha fallat</translation>
-    </message>
-    <message>
-        <source>There was an error trying to save the transaction history to %1.</source>
-        <translation>S'ha produït un error en provar de desar l'historial de transacció a %1.</translation>
-    </message>
-    <message>
-        <source>Exporting Successful</source>
-        <translation>Exportació amb èxit</translation>
-    </message>
-    <message>
-        <source>The transaction history was successfully saved to %1.</source>
-        <translation>L'historial de transaccions s'ha desat correctament a %1.</translation>
-    </message>
-    <message>
-        <source>Comma separated file (*.csv)</source>
-        <translation>Fitxer separat per comes (*.csv)</translation>
-    </message>
-    <message>
-        <source>Confirmed</source>
-        <translation>Confirmat</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation>Data</translation>
-    </message>
-    <message>
-        <source>Type</source>
-        <translation>Tipus</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Etiqueta</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>Adreça</translation>
-    </message>
-    <message>
-        <source>ID</source>
-        <translation>ID</translation>
-    </message>
-    <message>
-        <source>Range:</source>
-        <translation>Rang:</translation>
-    </message>
-    <message>
-        <source>to</source>
-        <translation>a</translation>
-    </message>
-</context>
-<context>
-    <name>UnitDisplayStatusBarControl</name>
-    <message>
-        <source>Unit to show amounts in. Click to select another unit.</source>
-        <translation>Unitat en què mostrar els imports. Feu clic per seleccionar una altra unitat.</translation>
-    </message>
-</context>
-<context>
-    <name>WalletFrame</name>
-    <message>
-        <source>No wallet has been loaded.</source>
-        <translation>No s'ha carregat cap moneder.</translation>
-    </message>
-</context>
-<context>
-    <name>WalletModel</name>
-    <message>
-        <source>Send Coins</source>
-        <translation>Envia monedes</translation>
-    </message>
-</context>
-<context>
-    <name>WalletView</name>
-    <message>
-        <source>&amp;Export</source>
-        <translation>&amp;Exporta</translation>
-    </message>
-    <message>
-        <source>Export the data in the current tab to a file</source>
-        <translation>Exporta les dades de la pestanya actual a un fitxer</translation>
-    </message>
-    <message>
-        <source>Backup Wallet</source>
-        <translation>Còpia de seguretat del moneder</translation>
-    </message>
-    <message>
-        <source>Wallet Data (*.dat)</source>
-        <translation>Dades del moneder (*.dat)</translation>
-    </message>
-    <message>
-        <source>Backup Failed</source>
-        <translation>Ha fallat la còpia de seguretat</translation>
-    </message>
-    <message>
-        <source>There was an error trying to save the wallet data to %1.</source>
-        <translation>S'ha produït un error en provar de desar les dades del moneder a %1.</translation>
-    </message>
-    <message>
-        <source>The wallet data was successfully saved to %1.</source>
-        <translation>S'han desat les dades del moneder correctament a %1.</translation>
-    </message>
-    <message>
-        <source>Backup Successful</source>
-        <translation>La còpia de seguretat s'ha realitzat correctament</translation>
-    </message>
-</context>
-<context>
-    <name>bitcoin-core</name>
-    <message>
-        <source>Options:</source>
-        <translation>Opcions:</translation>
-    </message>
-    <message>
-        <source>Specify data directory</source>
-        <translation>Especifica el directori de dades</translation>
-    </message>
-    <message>
-        <source>Connect to a node to retrieve peer addresses, and disconnect</source>
-        <translation>Connecta al node per obtenir les adreces de les connexions, i desconnecta</translation>
-    </message>
-    <message>
-        <source>Specify your own public address</source>
-        <translation>Especifiqueu la vostra adreça pública</translation>
-    </message>
-    <message>
-        <source>Accept command line and JSON-RPC commands</source>
-        <translation>Accepta la línia d'ordres i ordres JSON-RPC </translation>
-    </message>
-    <message>
-        <source>If &lt;category&gt; is not supplied or if &lt;category&gt; = 1, output all debugging information.</source>
-        <translation>Si no es proporciona &lt;category&gt; o si &lt;category&gt; = 1, treu a la sortida tota la informació de depuració.</translation>
-    </message>
-    <message>
-        <source>Maximum total fees (in %s) to use in a single wallet transaction; setting this too low may abort large transactions (default: %s)</source>
-        <translation>Comissions totals màximes (en %s) per utilitzar en una única transacció de moneder; definir-ne una massa baixa pot interrompre les transaccions més grans (per defecte: %s)</translation>
-    </message>
-    <message>
-        <source>Please check that your computer's date and time are correct! If your clock is wrong Bitcoin Core will not work properly.</source>
-        <translation>Comproveu que la data i hora de l'ordinador són correctes! Si el vostre rellotge no té l'hora correcta, el Bitcoin Core no funcionarà adequadament.</translation>
-    </message>
-    <message>
-        <source>Prune configured below the minimum of %d MiB.  Please use a higher number.</source>
-        <translation>Poda configurada per sota el mínim de %d MiB. Utilitzeu un nombre superior.</translation>
-    </message>
-    <message>
-        <source>Prune: last wallet synchronisation goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of pruned node)</source>
-        <translation>Poda: la darrera sincronització del moneder va més enllà de les dades podades. Cal que activeu -reindex (baixeu tota la cadena de blocs de nou en cas de node podat)</translation>
-    </message>
-    <message>
-        <source>Reduce storage requirements by pruning (deleting) old blocks. This mode is incompatible with -txindex and -rescan. Warning: Reverting this setting requires re-downloading the entire blockchain. (default: 0 = disable pruning blocks, &gt;%u = target size in MiB to use for block files)</source>
-        <translation>Reduïu els requisits d'emmagatzematge podant (suprimint) els blocs antics. Aquest mode és incompatible amb -txindex i -rescan. Avís: la reversió d'aquest paràmetre implica haver de tornar a baixar la cadena de blocs sencera. (per defecte: 0 = inhabilita la poda de blocs, &gt;%u = mida objectiu en MiB per utilitzar en els fitxers de blocs)</translation>
+        <source>Reduce storage requirements by pruning (deleting) old blocks. This mode is incompatible with -txindex and -rescan. Warning: Reverting this setting requires re-downloading the entire blockchain. (default: 0 = disable pruning blocks, &gt;%u = target size in MiB to use for block files)</source>
+        <translation>Reduïu els requisits d'emmagatzematge podant (suprimint) els blocs antics. Aquest mode és incompatible amb -txindex i -rescan. Avís: la reversió d'aquest paràmetre implica haver de tornar a baixar la cadena de blocs sencera. (per defecte: 0 = inhabilita la poda de blocs, &gt;%u = mida objectiu en MiB per utilitzar en els fitxers de blocs)</translation>
     </message>
     <message>
         <source>Rescans are not possible in pruned mode. You will need to use -reindex which will download the whole blockchain again.</source>
@@ -2975,6 +1706,10 @@
         <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
         <translation>Accepta connexions de fora (per defecte: 1 si no -proxy o -connect)</translation>
     </message>
+    <message>
+        <source>Bitcoin Core</source>
+        <translation>Bitcoin Core</translation>
+    </message>
     <message>
         <source>-fallbackfee is set very high! This is the transaction fee you may pay when fee estimates are not available.</source>
         <translation>-fallbackfee és molt elevat. Aquesta és la comissió de transacció que podeu pagar quan les estimacions de comissions no estan disponibles.</translation>
@@ -3003,10 +1738,6 @@
         <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
         <translation>Aquesta és una versió de pre-llançament - utilitza-la sota la teva responsabilitat - No usar per a minería o aplicacions de compra-venda</translation>
     </message>
-    <message>
-        <source>Unable to bind to %s on this computer. Bitcoin Core is probably already running.</source>
-        <translation>No es pot enllaçar %s a aquest ordinador. El Bitcoin Core probablement ja estigui executant-s'hi.</translation>
-    </message>
     <message>
         <source>WARNING: abnormally high number of blocks generated, %d blocks received in the last %d hours (%d expected)</source>
         <translation>AVÍS: s'ha generat un nombre anòmalament alt de blocs, %d blocs rebuts en les darreres %d hores (se n'esperaven %d)</translation>
@@ -3023,10 +1754,6 @@
         <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source>
         <translation>Avís: sembla que no estem plenament d'acord amb els nostres iguals! Podria caler que actualitzar l'aplicació, o potser que ho facin altres nodes.</translation>
     </message>
-    <message>
-        <source>Warning: wallet.dat corrupt, data salvaged! Original wallet.dat saved as wallet.{timestamp}.bak in %s; if your balance or transactions are incorrect you should restore from a backup.</source>
-        <translation>Avís: el fitxer wallet.dat és corrupte, dades rescatades! L'arxiu wallet.dat original ha estat desat com wallet.{estampa_temporal}.bak al directori %s; si el teu balanç o transaccions son incorrectes hauries de restaurar-lo de un backup.</translation>
-    </message>
     <message>
         <source>Whitelist peers connecting from the given netmask or IP address. Can be specified multiple times.</source>
         <translation>Afegeix a la llista blanca els iguals que es connecten de la màscara de xarxa o adreça IP donada. Es pot especificar moltes vegades.</translation>
@@ -3147,10 +1874,6 @@
         <source>Wallet options:</source>
         <translation>Opcions de moneder:</translation>
     </message>
-    <message>
-        <source>You need to rebuild the database using -reindex to change -txindex</source>
-        <translation>Cal que reconstruïu la base de dades fent servir -reindex per canviar -txindex</translation>
-    </message>
     <message>
         <source>Allow JSON-RPC connections from specified source. Valid for &lt;ip&gt; are a single IP (e.g. 1.2.3.4), a network/netmask (e.g. 1.2.3.4/255.255.255.0) or a network/CIDR (e.g. 1.2.3.4/24). This option can be specified multiple times</source>
         <translation>Permet les connexions JSON-RPC d'una font específica. Vàlid per a &lt;ip&gt; són una IP individual (p. ex., 1.2.3.4), una xarxa / màscara de xarxa (p. ex., 1.2.3.4/255.255.255.0) o una xarxa/CIDR (p. ex., 1.2.3.4/24). Es pot especificar aquesta opció moltes vegades</translation>
@@ -3163,10 +1886,6 @@
         <source>Bind to given address to listen for JSON-RPC connections. Use [host]:port notation for IPv6. This option can be specified multiple times (default: bind to all interfaces)</source>
         <translation>Vincula a l'adreça donada per a escoltar les connexions JSON-RPC. Feu servir la notació [host]:port per a IPv6. Aquesta opció pot ser especificada moltes vegades (per defecte: vincula a totes les interfícies)</translation>
     </message>
-    <message>
-        <source>Cannot obtain a lock on data directory %s. Bitcoin Core is probably already running.</source>
-        <translation>No es pot obtenir un bloqueig del directori de dades %s. El Bitcoin Core probablement ja s'estigui executant.</translation>
-    </message>
     <message>
         <source>Create new files with system default permissions, instead of umask 077 (only effective with disabled wallet functionality)</source>
         <translation>Crea fitxers nous amb els permisos per defecte del sistema, en comptes de l'umask 077 (només efectiu amb la funcionalitat de moneder inhabilitada)</translation>
@@ -3207,10 +1926,6 @@
         <source>Set maximum size of high-priority/low-fee transactions in bytes (default: %d)</source>
         <translation>Defineix la mida màxima de transaccions d'alta prioritat / baixa comissió en bytes (per defecte: %d)</translation>
     </message>
-    <message>
-        <source>Set the number of threads for coin generation if enabled (-1 = all cores, default: %d)</source>
-        <translation>Defineix el nombre de fils per a la generació de moneda si està habilitat (-1 = tots els nuclis, per defecte: %d)</translation>
-    </message>
     <message>
         <source>The transaction amount is too small to send after the fee has been deducted</source>
         <translation>L'import de la transacció és massa petit per enviar-la després que se'n dedueixi la comissió</translation>
@@ -3235,26 +1950,10 @@
         <source>Accept public REST requests (default: %u)</source>
         <translation>Accepta sol·licituds REST públiques (per defecte: %u)</translation>
     </message>
-    <message>
-        <source>Activating best chain...</source>
-        <translation>S'està activant la millor cadena...</translation>
-    </message>
-    <message>
-        <source>Cannot resolve -whitebind address: '%s'</source>
-        <translation>No es pot resoldre l'adreça -whitebind: «%s»</translation>
-    </message>
     <message>
         <source>Connect through SOCKS5 proxy</source>
         <translation>Connecta a través del proxy SOCKS5</translation>
     </message>
-    <message>
-        <source>Copyright (C) 2009-%i The Bitcoin Core Developers</source>
-        <translation>Copyright (C) 2009-%i Els desenvolupadors del Bitcoin Core</translation>
-    </message>
-    <message>
-        <source>Error loading wallet.dat: Wallet requires newer version of Bitcoin Core</source>
-        <translation>Error en carregar wallet.dat: el moneder requereix una versió més nova del Bitcoin core</translation>
-    </message>
     <message>
         <source>Error reading from database, shutting down.</source>
         <translation>Error en llegir la base de dades, tancant.</translation>
@@ -3263,22 +1962,6 @@
         <source>Information</source>
         <translation>&amp;Informació</translation>
     </message>
-    <message>
-        <source>Initialization sanity check failed. Bitcoin Core is shutting down.</source>
-        <translation>Ha fallat la inicialització de la comprovació de validesa. El Bitcoin Core s'està aturant.</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -maxtxfee=&lt;amount&gt;: '%s'</source>
-        <translation>Import no vàlid per a -maxtxfee=&lt;amount&gt;: '%s'</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -minrelaytxfee=&lt;amount&gt;: '%s'</source>
-        <translation>Import no vàlid per a -minrelaytxfee=&lt;amount&gt;: «%s»</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -mintxfee=&lt;amount&gt;: '%s'</source>
-        <translation>Import no vàlid per a -mintxfee=&lt;amount&gt;: «%s»</translation>
-    </message>
     <message>
         <source>Invalid amount for -paytxfee=&lt;amount&gt;: '%s' (must be at least %s)</source>
         <translation>Import no vàlid per a -paytxfee=&lt;amount&gt;: «%s» (ha de ser com a mínim %s)</translation>
@@ -3303,14 +1986,6 @@
         <source>RPC server options:</source>
         <translation>Opcions del servidor RPC:</translation>
     </message>
-    <message>
-        <source>Rebuild block chain index from current blk000??.dat files on startup</source>
-        <translation>Reconstrueix l'índex de la cadena de blocs dels fitxers blk000??.dat actuals a l'inici.</translation>
-    </message>
-    <message>
-        <source>Receive and display P2P network alerts (default: %u)</source>
-        <translation>Rep i mostra avisos de la xarxa P2P (per defecte: %u)</translation>
-    </message>
     <message>
         <source>Send trace/debug info to console instead of debug.log file</source>
         <translation>Envia informació de traça/depuració a la consola en comptes del fitxer debug.log</translation>
@@ -3363,10 +2038,6 @@
         <source>Username for JSON-RPC connections</source>
         <translation>Nom d'usuari per a connexions JSON-RPC</translation>
     </message>
-    <message>
-        <source>Wallet needed to be rewritten: restart Bitcoin Core to complete</source>
-        <translation>Cal reescriure el moneder: reiniceu el Bitcoin Core per completar-ho.</translation>
-    </message>
     <message>
         <source>Warning</source>
         <translation>Avís</translation>
@@ -3375,10 +2046,6 @@
         <source>Zapping all transactions from wallet...</source>
         <translation>Se suprimeixen totes les transaccions del moneder...</translation>
     </message>
-    <message>
-        <source>wallet.dat corrupt, salvage failed</source>
-        <translation>El fitxer wallet.data és corrupte. El rescat de les dades ha fallat</translation>
-    </message>
     <message>
         <source>Password for JSON-RPC connections</source>
         <translation>Contrasenya per a connexions JSON-RPC</translation>
@@ -3387,10 +2054,6 @@
         <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
         <translation>Executa l'ordre quan el millor bloc canviï (%s en cmd es reemplaça per un resum de bloc)</translation>
     </message>
-    <message>
-        <source>This help message</source>
-        <translation>Aquest misatge d'ajuda</translation>
-    </message>
     <message>
         <source>Allow DNS lookups for -addnode, -seednode and -connect</source>
         <translation>Permet consultes DNS per a -addnode, -seednode i -connect</translation>
@@ -3399,10 +2062,6 @@
         <source>Loading addresses...</source>
         <translation>S'estan carregant les adreces...</translation>
     </message>
-    <message>
-        <source>Error loading wallet.dat: Wallet corrupted</source>
-        <translation>Error en carregar wallet.dat: Moneder corrupte</translation>
-    </message>
     <message>
         <source>(1 = keep tx meta data e.g. account owner and payment request information, 2 = drop tx meta data)</source>
         <translation>(1 = manté les metadades de les tx, p. ex., propietari del compte i informació de sol·licitud del pagament, 2 = prescindeix de les metadades de les tx)</translation>
@@ -3435,14 +2094,6 @@
         <source>Always query for peer addresses via DNS lookup (default: %u)</source>
         <translation>Demana sempre les adreces dels iguals a través de consultes DNS (per defecte: %u)</translation>
     </message>
-    <message>
-        <source>Error loading wallet.dat</source>
-        <translation>Error en carregar wallet.dat</translation>
-    </message>
-    <message>
-        <source>Generate coins (default: %u)</source>
-        <translation>Genera monedes (per defecte: %u)</translation>
-    </message>
     <message>
         <source>How many blocks to check at startup (default: %u, 0 = all)</source>
         <translation>Quants blocs per comprovar a l'inici (per defecte: %u, 0 = tots)</translation>
@@ -3527,18 +2178,6 @@
         <source>Unknown network specified in -onlynet: '%s'</source>
         <translation>Xarxa desconeguda especificada a -onlynet: '%s'</translation>
     </message>
-    <message>
-        <source>Cannot resolve -bind address: '%s'</source>
-        <translation>No es pot resoldre l'adreça -bind: '%s'</translation>
-    </message>
-    <message>
-        <source>Cannot resolve -externalip address: '%s'</source>
-        <translation>No es pot resoldre l'adreça -externalip: '%s'</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -paytxfee=&lt;amount&gt;: '%s'</source>
-        <translation>Import no vàlid per a -paytxfee=&lt;amount&gt;: «%s»</translation>
-    </message>
     <message>
         <source>Insufficient funds</source>
         <translation>Balanç insuficient</translation>
diff --git a/src/qt/locale/bitcoin_ca@valencia.ts b/src/qt/locale/bitcoin_ca@valencia.ts
index e5744fcbbf9b4..1fdf0249a5b73 100644
--- a/src/qt/locale/bitcoin_ca@valencia.ts
+++ b/src/qt/locale/bitcoin_ca@valencia.ts
@@ -25,10 +25,6 @@
         <source>C&amp;lose</source>
         <translation>&amp;Tanca</translation>
     </message>
-    <message>
-        <source>&amp;Copy Address</source>
-        <translation>&amp;Copia l'adreça</translation>
-    </message>
     <message>
         <source>Delete the currently selected address from the list</source>
         <translation>Elimina l'adreça sel·leccionada actualment de la llista</translation>
@@ -45,73 +41,6 @@
         <source>&amp;Delete</source>
         <translation>&amp;Elimina</translation>
     </message>
-    <message>
-        <source>Choose the address to send coins to</source>
-        <translation>Trieu una adreça on voleu enviar monedes</translation>
-    </message>
-    <message>
-        <source>Choose the address to receive coins with</source>
-        <translation>Trieu l'adreça on voleu rebre monedes</translation>
-    </message>
-    <message>
-        <source>C&amp;hoose</source>
-        <translation>T&amp;ria</translation>
-    </message>
-    <message>
-        <source>Sending addresses</source>
-        <translation>S'estan enviant les adreces</translation>
-    </message>
-    <message>
-        <source>Receiving addresses</source>
-        <translation>S'estan rebent les adreces</translation>
-    </message>
-    <message>
-        <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source>
-        <translation>Estes són les vostres adreces de Bitcoin per enviar els pagaments. Sempre reviseu l'import i l'adreça del destinatari abans de transferir monedes.</translation>
-    </message>
-    <message>
-        <source>These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source>
-        <translation>Estes són les vostres adreces Bitcoin per rebre pagaments. Es recomana utilitzar una adreça nova de recepció per a cada transacció.</translation>
-    </message>
-    <message>
-        <source>Copy &amp;Label</source>
-        <translation>Copia l'&amp;etiqueta</translation>
-    </message>
-    <message>
-        <source>&amp;Edit</source>
-        <translation>&amp;Edita</translation>
-    </message>
-    <message>
-        <source>Export Address List</source>
-        <translation>Exporta la llista d'adreces</translation>
-    </message>
-    <message>
-        <source>Comma separated file (*.csv)</source>
-        <translation>Fitxer de separació amb comes (*.csv)</translation>
-    </message>
-    <message>
-        <source>Exporting Failed</source>
-        <translation>L'exportació ha fallat</translation>
-    </message>
-    <message>
-        <source>There was an error trying to save the address list to %1. Please try again.</source>
-        <translation>S'ha produït un error en guardar la llista d'adreces a %1. Torneu-ho a provar.</translation>
-    </message>
-</context>
-<context>
-    <name>AddressTableModel</name>
-    <message>
-        <source>Label</source>
-        <translation>Etiqueta</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>Adreça</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(sense etiqueta)</translation>
-    </message>
 </context>
 <context>
     <name>AskPassphraseDialog</name>
@@ -131,94 +60,6 @@
         <source>Repeat new passphrase</source>
         <translation>Repetiu la nova contrasenya</translation>
     </message>
-    <message>
-        <source>Encrypt wallet</source>
-        <translation>Encripta el moneder</translation>
-    </message>
-    <message>
-        <source>This operation needs your wallet passphrase to unlock the wallet.</source>
-        <translation>Esta operació requereix la contrasenya del moneder per a desbloquejar-lo.</translation>
-    </message>
-    <message>
-        <source>Unlock wallet</source>
-        <translation>Desbloqueja el moneder</translation>
-    </message>
-    <message>
-        <source>This operation needs your wallet passphrase to decrypt the wallet.</source>
-        <translation>Esta operació requereix la contrasenya del moneder per desencriptar-lo.</translation>
-    </message>
-    <message>
-        <source>Decrypt wallet</source>
-        <translation>Desencripta el moneder</translation>
-    </message>
-    <message>
-        <source>Change passphrase</source>
-        <translation>Canvia la contrasenya</translation>
-    </message>
-    <message>
-        <source>Confirm wallet encryption</source>
-        <translation>Confirma l'encriptació del moneder</translation>
-    </message>
-    <message>
-        <source>Warning: If you encrypt your wallet and lose your passphrase, you will &lt;b&gt;LOSE ALL OF YOUR BITCOINS&lt;/b&gt;!</source>
-        <translation>Avís: si encripteu el vostre moneder i perdeu la contrasenya, &lt;b&gt;PERDREU TOTS ELS VOSTRES BITCOINS&lt;/b&gt;!</translation>
-    </message>
-    <message>
-        <source>Are you sure you wish to encrypt your wallet?</source>
-        <translation>Esteu segur que voleu encriptar el vostre moneder?</translation>
-    </message>
-    <message>
-        <source>Bitcoin Core will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source>
-        <translation>Ara es tancarà el Bitcoin Core per finalitzar el procés d'encriptació. Tingueu present que encriptar el vostre moneder no garanteix que les vostres bitcoins no puguen ser robades per programari maliciós que infecti l'ordinador.</translation>
-    </message>
-    <message>
-        <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source>
-        <translation>IMPORTANT: Tota copia de seguretat que hàgeu realitzat hauria de ser reemplaçada pel, recentment generat, fitxer encriptat del moneder.</translation>
-    </message>
-    <message>
-        <source>Warning: The Caps Lock key is on!</source>
-        <translation>Avís: Les lletres majúscules estan activades!</translation>
-    </message>
-    <message>
-        <source>Wallet encrypted</source>
-        <translation>Moneder encriptat</translation>
-    </message>
-    <message>
-        <source>Enter the new passphrase to the wallet.&lt;br/&gt;Please use a passphrase of &lt;b&gt;ten or more random characters&lt;/b&gt;, or &lt;b&gt;eight or more words&lt;/b&gt;.</source>
-        <translation>Introduïu la contrasenya nova al moneder.&lt;br/&gt;Utilitzeu una contrasenya de &lt;b&gt;deu o més caràcters aleatoris&lt;/b&gt;, o &lt;b&gt;vuit o més paraules&lt;/b&gt;.</translation>
-    </message>
-    <message>
-        <source>Enter the old passphrase and new passphrase to the wallet.</source>
-        <translation>Introduïu la contrasenya antiga i la contrasenya nova al moneder.</translation>
-    </message>
-    <message>
-        <source>Wallet encryption failed</source>
-        <translation>L'encriptació del moneder ha fallat</translation>
-    </message>
-    <message>
-        <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
-        <translation>L'encriptació del moneder ha fallat per un error intern. El moneder no ha estat encriptat.</translation>
-    </message>
-    <message>
-        <source>The supplied passphrases do not match.</source>
-        <translation>La contrasenya introduïda no coincideix.</translation>
-    </message>
-    <message>
-        <source>Wallet unlock failed</source>
-        <translation>El desbloqueig del moneder ha fallat</translation>
-    </message>
-    <message>
-        <source>The passphrase entered for the wallet decryption was incorrect.</source>
-        <translation>La contrasenya introduïda per a desencriptar el moneder és incorrecta.</translation>
-    </message>
-    <message>
-        <source>Wallet decryption failed</source>
-        <translation>La desencriptació del moneder ha fallat</translation>
-    </message>
-    <message>
-        <source>Wallet passphrase was successfully changed.</source>
-        <translation>La contrasenya del moneder ha estat modificada correctament.</translation>
-    </message>
 </context>
 <context>
     <name>BanTableModel</name>
@@ -297,14 +138,6 @@
         <source>Open &amp;URI...</source>
         <translation>Obri un &amp;URI...</translation>
     </message>
-    <message>
-        <source>Bitcoin Core client</source>
-        <translation>Client del Bitcoin Core</translation>
-    </message>
-    <message>
-        <source>Importing blocks from disk...</source>
-        <translation>S'estan important els blocs del disc...</translation>
-    </message>
     <message>
         <source>Reindexing blocks on disk...</source>
         <translation>S'estan reindexant els blocs al disc...</translation>
@@ -349,10 +182,6 @@
         <source>&amp;Receive</source>
         <translation>&amp;Rep</translation>
     </message>
-    <message>
-        <source>Show information about Bitcoin Core</source>
-        <translation>Mostra informació del Bitcoin Core</translation>
-    </message>
     <message>
         <source>&amp;Show / Hide</source>
         <translation>&amp;Mostra / Amaga</translation>
@@ -389,22 +218,10 @@
         <source>Tabs toolbar</source>
         <translation>Barra d'eines de les pestanyes</translation>
     </message>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Nucli de Bitcoin</translation>
-    </message>
     <message>
         <source>Request payments (generates QR codes and bitcoin: URIs)</source>
         <translation>Sol·licita pagaments (genera codis QR i bitcoin: URI)</translation>
     </message>
-    <message>
-        <source>&amp;About Bitcoin Core</source>
-        <translation>&amp;Quant al Bitcoin Core</translation>
-    </message>
-    <message>
-        <source>Modify configuration options for Bitcoin Core</source>
-        <translation>Modifica les opcions de configuració del Bitcoin Core</translation>
-    </message>
     <message>
         <source>Show the list of used sending addresses and labels</source>
         <translation>Mostra la llista d'adreces d'enviament i etiquetes utilitzades</translation>
@@ -421,10 +238,6 @@
         <source>&amp;Command-line options</source>
         <translation>Opcions de la &amp;línia d'ordes</translation>
     </message>
-    <message>
-        <source>Show the Bitcoin Core help message to get a list with possible Bitcoin command-line options</source>
-        <translation>Mostra el missatge d'ajuda del Bitcoin Core per obtindre una llista amb les possibles opcions de línia d'ordes de Bitcoin</translation>
-    </message>
     <message numerus="yes">
         <source>%n active connection(s) to Bitcoin network</source>
         <translation><numerusform>%n connexió activa a la xarxa Bitcoin</numerusform><numerusform>%n connexions actives a la xarxa Bitcoin</numerusform></translation>
@@ -536,13 +349,6 @@
         <translation>El moneder està &lt;b&gt;encriptat&lt;/b&gt; i actualment &lt;b&gt;bloquejat&lt;/b&gt;</translation>
     </message>
 </context>
-<context>
-    <name>ClientModel</name>
-    <message>
-        <source>Network Alert</source>
-        <translation>Alerta de xarxa</translation>
-    </message>
-</context>
 <context>
     <name>CoinControlDialog</name>
     <message>
@@ -621,150 +427,6 @@
         <source>Priority</source>
         <translation>Prioritat</translation>
     </message>
-    <message>
-        <source>Copy address</source>
-        <translation>Copiar adreça </translation>
-    </message>
-    <message>
-        <source>Copy label</source>
-        <translation>Copiar etiqueta</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>Copia l'import</translation>
-    </message>
-    <message>
-        <source>Copy transaction ID</source>
-        <translation>Copiar ID de transacció</translation>
-    </message>
-    <message>
-        <source>Lock unspent</source>
-        <translation>Bloqueja sense gastar</translation>
-    </message>
-    <message>
-        <source>Unlock unspent</source>
-        <translation>Desbloqueja sense gastar</translation>
-    </message>
-    <message>
-        <source>Copy quantity</source>
-        <translation>Copia la quantitat</translation>
-    </message>
-    <message>
-        <source>Copy fee</source>
-        <translation>Copia la comissió</translation>
-    </message>
-    <message>
-        <source>Copy after fee</source>
-        <translation>Copia la comissió posterior</translation>
-    </message>
-    <message>
-        <source>Copy bytes</source>
-        <translation>Copia els bytes</translation>
-    </message>
-    <message>
-        <source>Copy priority</source>
-        <translation>Copia la prioritat</translation>
-    </message>
-    <message>
-        <source>Copy dust</source>
-        <translation>Copia el polsim</translation>
-    </message>
-    <message>
-        <source>Copy change</source>
-        <translation>Copia el canvi</translation>
-    </message>
-    <message>
-        <source>highest</source>
-        <translation>El més alt</translation>
-    </message>
-    <message>
-        <source>higher</source>
-        <translation>Més alt</translation>
-    </message>
-    <message>
-        <source>high</source>
-        <translation>Alt</translation>
-    </message>
-    <message>
-        <source>medium-high</source>
-        <translation>mig-alt</translation>
-    </message>
-    <message>
-        <source>medium</source>
-        <translation>mig</translation>
-    </message>
-    <message>
-        <source>low-medium</source>
-        <translation>baix-mig</translation>
-    </message>
-    <message>
-        <source>low</source>
-        <translation>baix</translation>
-    </message>
-    <message>
-        <source>lower</source>
-        <translation>més baix</translation>
-    </message>
-    <message>
-        <source>lowest</source>
-        <translation>el més baix</translation>
-    </message>
-    <message>
-        <source>(%1 locked)</source>
-        <translation>(%1 bloquejada)</translation>
-    </message>
-    <message>
-        <source>none</source>
-        <translation>cap</translation>
-    </message>
-    <message>
-        <source>This label turns red if the transaction size is greater than 1000 bytes.</source>
-        <translation>Esta etiqueta es torna en roig si la transacció és superior a 1000 bytes.</translation>
-    </message>
-    <message>
-        <source>This label turns red if the priority is smaller than "medium".</source>
-        <translation>Esta etiqueta es torna en roig si la propietat és inferior que la «mitjana».</translation>
-    </message>
-    <message>
-        <source>This label turns red if any recipient receives an amount smaller than %1.</source>
-        <translation>Esta etiqueta es torna roja si el destinatari rep un import inferior de %1.</translation>
-    </message>
-    <message>
-        <source>Can vary +/- %1 satoshi(s) per input.</source>
-        <translation>Pot variar +/- %1 satoshi(s) per entrada.</translation>
-    </message>
-    <message>
-        <source>yes</source>
-        <translation>sí</translation>
-    </message>
-    <message>
-        <source>no</source>
-        <translation>no</translation>
-    </message>
-    <message>
-        <source>This means a fee of at least %1 per kB is required.</source>
-        <translation>Això comporta una comissió d'almenys %1 per kB.</translation>
-    </message>
-    <message>
-        <source>Can vary +/- 1 byte per input.</source>
-        <translation>Pot variar +/- 1 byte per entrada.</translation>
-    </message>
-    <message>
-        <source>Transactions with higher priority are more likely to get included into a block.</source>
-        <translation>Les transaccions amb una major prioritat són més propenses a ser incloses en un bloc.</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(sense etiqueta)</translation>
-    </message>
-    <message>
-        <source>change from %1 (%2)</source>
-        <translation>canvia de %1 (%2)</translation>
-    </message>
-    <message>
-        <source>(change)</source>
-        <translation>(canvia)</translation>
-    </message>
 </context>
 <context>
     <name>EditAddressDialog</name>
@@ -788,38 +450,6 @@
         <source>&amp;Address</source>
         <translation>&amp;Adreça</translation>
     </message>
-    <message>
-        <source>New receiving address</source>
-        <translation>Nova adreça de recepció.</translation>
-    </message>
-    <message>
-        <source>New sending address</source>
-        <translation>Nova adreça d'enviament</translation>
-    </message>
-    <message>
-        <source>Edit receiving address</source>
-        <translation>Edita les adreces de recepció</translation>
-    </message>
-    <message>
-        <source>Edit sending address</source>
-        <translation>Edita les adreces d'enviament</translation>
-    </message>
-    <message>
-        <source>The entered address "%1" is already in the address book.</source>
-        <translation>L'adreça introduïda «%1» ja és present a la llibreta d'adreces.</translation>
-    </message>
-    <message>
-        <source>The entered address "%1" is not a valid Bitcoin address.</source>
-        <translation>L'adreça introduïda «%1» no és una adreça de Bitcoin vàlida.</translation>
-    </message>
-    <message>
-        <source>Could not unlock wallet.</source>
-        <translation>No s'ha pogut desbloquejar el moneder.</translation>
-    </message>
-    <message>
-        <source>New key generation failed.</source>
-        <translation>Ha fallat la generació d'una nova clau.</translation>
-    </message>
 </context>
 <context>
     <name>FreespaceChecker</name>
@@ -846,10 +476,6 @@
 </context>
 <context>
     <name>HelpMessageDialog</name>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Nucli de Bitcoin</translation>
-    </message>
     <message>
         <source>version</source>
         <translation>versió</translation>
@@ -858,10 +484,6 @@
         <source>(%1-bit)</source>
         <translation>(%1-bit)</translation>
     </message>
-    <message>
-        <source>About Bitcoin Core</source>
-        <translation>Quant al Bitcoin Core</translation>
-    </message>
     <message>
         <source>Command-line options</source>
         <translation>Opcions de línia d'ordes</translation>
@@ -881,18 +503,6 @@
         <source>Welcome</source>
         <translation>Vos donem la benviguda</translation>
     </message>
-    <message>
-        <source>Welcome to Bitcoin Core.</source>
-        <translation>Vos donem la benvinguda al Bitcoin Core.</translation>
-    </message>
-    <message>
-        <source>As this is the first time the program is launched, you can choose where Bitcoin Core will store its data.</source>
-        <translation>Atès que és la primera vegada que executeu el programa, podeu triar on emmagatzemarà el Bitcoin Core les dades.</translation>
-    </message>
-    <message>
-        <source>Bitcoin Core will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source>
-        <translation>El Bitcoin Core descarregarà i emmagatzemarà una còpia de la cadena de blocs de Bitcoin. Com a mínim s'emmagatzemaran %1 GB de dades en este directori, que seguiran creixent gradualment. També s'hi emmagatzemarà el moneder.</translation>
-    </message>
     <message>
         <source>Use the default data directory</source>
         <translation>Utilitza el directori de dades per defecte</translation>
@@ -901,10 +511,6 @@
         <source>Use a custom data directory:</source>
         <translation>Utilitza un directori de dades personalitzat:</translation>
     </message>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Nucli de Bitcoin</translation>
-    </message>
     <message>
         <source>Error: Specified data directory "%1" cannot be created.</source>
         <translation>Error: el directori de dades «%1» especificat no pot ser creat.</translation>
@@ -940,10 +546,6 @@
         <source>Select payment request file</source>
         <translation>Selecciona un fitxer de sol·licitud de pagament</translation>
     </message>
-    <message>
-        <source>Select payment request file to open</source>
-        <translation>Selecciona el fitxer de sol·licitud de pagament per obrir</translation>
-    </message>
 </context>
 <context>
     <name>OptionsDialog</name>
@@ -983,10 +585,6 @@
         <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Exit in the menu.</source>
         <translation>Minimitza en comptes d'eixir de l'aplicació quan la finestra es tanca. Quan s'habilita esta opció l'aplicació es tancara només quan se selecciona Ix del menú. </translation>
     </message>
-    <message>
-        <source>The user interface language can be set here. This setting will take effect after restarting Bitcoin Core.</source>
-        <translation>La interfície d'usuari pot definir-se des d'ací. El paràmetre tindrà efecte després de reiniciar el Bitcoin Core.</translation>
-    </message>
     <message>
         <source>Third party URLs (e.g. a block explorer) that appear in the transactions tab as context menu items. %s in the URL is replaced by transaction hash. Multiple URLs are separated by vertical bar |.</source>
         <translation>URL de terceres parts (p. ex. explorador de blocs) que apareix en la pestanya de transaccions com elements del menú contextual. %s en l'URL es reemplaçat pel resum de la transacció. Diferents URL estan separades per una barra vertical |.</translation>
@@ -1011,14 +609,6 @@
         <source>&amp;Network</source>
         <translation>&amp;Xarxa</translation>
     </message>
-    <message>
-        <source>Automatically start Bitcoin Core after logging in to the system.</source>
-        <translation>Inicia el Bitcoin Core automàticament després d'iniciar una sessió en el sistema.</translation>
-    </message>
-    <message>
-        <source>&amp;Start Bitcoin Core on system login</source>
-        <translation>&amp;Inicia el Bitcoin Core en inciar el sistema</translation>
-    </message>
     <message>
         <source>(0 = auto, &lt;0 = leave that many cores free)</source>
         <translation>(0 = auto, &lt;0 = deixa tants nuclis lliures)</translation>
@@ -1224,198 +814,88 @@
     </message>
 </context>
 <context>
-    <name>PaymentServer</name>
+    <name>PeerTableModel</name>
     <message>
-        <source>URI handling</source>
-        <translation>Gestió d'URI</translation>
+        <source>User Agent</source>
+        <translation>Agent d'usuari</translation>
     </message>
     <message>
-        <source>Invalid payment address %1</source>
-        <translation>Adreça de pagament no vàlida %1</translation>
+        <source>Node/Service</source>
+        <translation>Node/Servei</translation>
     </message>
     <message>
-        <source>Payment request rejected</source>
-        <translation>La sol·licitud de pagament s'ha rebutjat</translation>
+        <source>Ping Time</source>
+        <translation>Temps de ping</translation>
     </message>
+</context>
+<context>
+    <name>QObject</name>
     <message>
-        <source>Payment request network doesn't match client network.</source>
-        <translation>La xarxa de la sol·licitud de pagament no coincideix amb la xarxa del client.</translation>
+        <source>Amount</source>
+        <translation>Import</translation>
     </message>
     <message>
-        <source>Payment request is not initialized.</source>
-        <translation>La sol·licitud de pagament no està inicialitzada.</translation>
+        <source>Enter a Bitcoin address (e.g. %1)</source>
+        <translation>Introduïu una adreça de Bitcoin (p. ex. %1)</translation>
     </message>
     <message>
-        <source>Requested payment amount of %1 is too small (considered dust).</source>
-        <translation>L'import de pagament sol·licitat %1 és massa petit (es considera polsim).</translation>
+        <source>%1 d</source>
+        <translation>%1 d</translation>
     </message>
     <message>
-        <source>Payment request error</source>
-        <translation>Error en la sol·licitud de pagament</translation>
+        <source>%1 h</source>
+        <translation>%1 h</translation>
     </message>
     <message>
-        <source>Cannot start bitcoin: click-to-pay handler</source>
-        <translation>No es pot iniciar bitcoin: gestor clica-per-pagar</translation>
+        <source>%1 m</source>
+        <translation>%1 m</translation>
     </message>
     <message>
-        <source>Payment request fetch URL is invalid: %1</source>
-        <translation>L'URL de recuperació de la sol·licitud de pagament no és vàlida: %1</translation>
+        <source>%1 s</source>
+        <translation>%1 s</translation>
     </message>
     <message>
-        <source>URI cannot be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source>
-        <translation>L'URI no pot ser analitzat! Això pot ser a causa d'una adreça de Bitcoin no vàlida o per paràmetres URI amb mal format.</translation>
+        <source>None</source>
+        <translation>Cap</translation>
     </message>
     <message>
-        <source>Payment request file handling</source>
-        <translation>Gestió de fitxers de les sol·licituds de pagament</translation>
+        <source>N/A</source>
+        <translation>N/A</translation>
     </message>
     <message>
-        <source>Payment request file cannot be read! This can be caused by an invalid payment request file.</source>
-        <translation>No es pot llegir el fitxer de la sol·licitud de pagament. Això pot ser causat per un fitxer de sol·licitud de pagament no vàlid.</translation>
+        <source>%1 ms</source>
+        <translation>%1 ms</translation>
     </message>
+</context>
+<context>
+    <name>RPCConsole</name>
     <message>
-        <source>Payment request expired.</source>
-        <translation>La sol·licitud de pagament ha vençut.</translation>
+        <source>Client name</source>
+        <translation>Nom del client</translation>
     </message>
     <message>
-        <source>Unverified payment requests to custom payment scripts are unsupported.</source>
-        <translation>No s'accepten sol·licituds de pagament no verificades a scripts de pagament personalitzats.</translation>
+        <source>N/A</source>
+        <translation>N/A</translation>
     </message>
     <message>
-        <source>Invalid payment request.</source>
-        <translation>Sol·licitud de pagament no vàlida.</translation>
+        <source>Client version</source>
+        <translation>Versió del client</translation>
     </message>
     <message>
-        <source>Refund from %1</source>
-        <translation>Reemborsament de %1</translation>
+        <source>&amp;Information</source>
+        <translation>&amp;Informació</translation>
     </message>
     <message>
-        <source>Payment request %1 is too large (%2 bytes, allowed %3 bytes).</source>
-        <translation>La sol·licitud de pagament %1 és massa gran (%2 bytes, permés %3 bytes).</translation>
+        <source>Debug window</source>
+        <translation>Finestra de depuració</translation>
     </message>
     <message>
-        <source>Error communicating with %1: %2</source>
-        <translation>Error en comunicar amb %1: %2</translation>
+        <source>General</source>
+        <translation>General</translation>
     </message>
     <message>
-        <source>Payment request cannot be parsed!</source>
-        <translation>No es pot analitzar la sol·licitud de pagament!</translation>
-    </message>
-    <message>
-        <source>Bad response from server %1</source>
-        <translation>Mala resposta del servidor %1</translation>
-    </message>
-    <message>
-        <source>Payment acknowledged</source>
-        <translation>Pagament reconegut</translation>
-    </message>
-    <message>
-        <source>Network request error</source>
-        <translation>Error en la sol·licitud de xarxa</translation>
-    </message>
-</context>
-<context>
-    <name>PeerTableModel</name>
-    <message>
-        <source>User Agent</source>
-        <translation>Agent d'usuari</translation>
-    </message>
-    <message>
-        <source>Node/Service</source>
-        <translation>Node/Servei</translation>
-    </message>
-    <message>
-        <source>Ping Time</source>
-        <translation>Temps de ping</translation>
-    </message>
-</context>
-<context>
-    <name>QObject</name>
-    <message>
-        <source>Amount</source>
-        <translation>Import</translation>
-    </message>
-    <message>
-        <source>Enter a Bitcoin address (e.g. %1)</source>
-        <translation>Introduïu una adreça de Bitcoin (p. ex. %1)</translation>
-    </message>
-    <message>
-        <source>%1 d</source>
-        <translation>%1 d</translation>
-    </message>
-    <message>
-        <source>%1 h</source>
-        <translation>%1 h</translation>
-    </message>
-    <message>
-        <source>%1 m</source>
-        <translation>%1 m</translation>
-    </message>
-    <message>
-        <source>%1 s</source>
-        <translation>%1 s</translation>
-    </message>
-    <message>
-        <source>None</source>
-        <translation>Cap</translation>
-    </message>
-    <message>
-        <source>N/A</source>
-        <translation>N/A</translation>
-    </message>
-    <message>
-        <source>%1 ms</source>
-        <translation>%1 ms</translation>
-    </message>
-</context>
-<context>
-    <name>QRImageWidget</name>
-    <message>
-        <source>&amp;Save Image...</source>
-        <translation>&amp;Guarda la imatge...</translation>
-    </message>
-    <message>
-        <source>&amp;Copy Image</source>
-        <translation>&amp;Copia la imatge</translation>
-    </message>
-    <message>
-        <source>Save QR Code</source>
-        <translation>Guarda el codi QR</translation>
-    </message>
-    <message>
-        <source>PNG Image (*.png)</source>
-        <translation>Imatge PNG (*.png)</translation>
-    </message>
-</context>
-<context>
-    <name>RPCConsole</name>
-    <message>
-        <source>Client name</source>
-        <translation>Nom del client</translation>
-    </message>
-    <message>
-        <source>N/A</source>
-        <translation>N/A</translation>
-    </message>
-    <message>
-        <source>Client version</source>
-        <translation>Versió del client</translation>
-    </message>
-    <message>
-        <source>&amp;Information</source>
-        <translation>&amp;Informació</translation>
-    </message>
-    <message>
-        <source>Debug window</source>
-        <translation>Finestra de depuració</translation>
-    </message>
-    <message>
-        <source>General</source>
-        <translation>General</translation>
-    </message>
-    <message>
-        <source>Using BerkeleyDB version</source>
-        <translation>Utilitzant BerkeleyDB versió</translation>
+        <source>Using BerkeleyDB version</source>
+        <translation>Utilitzant BerkeleyDB versió</translation>
     </message>
     <message>
         <source>Startup time</source>
@@ -1441,10 +921,6 @@
         <source>Current number of blocks</source>
         <translation>Nombre de blocs actuals</translation>
     </message>
-    <message>
-        <source>Open the Bitcoin Core debug log file from the current data directory. This can take a few seconds for large log files.</source>
-        <translation>Obri el fitxer de registre de depuració del Bitcoin Core del directori de dades actual. Pot portar uns quants segons per a fitxers de registre grans.</translation>
-    </message>
     <message>
         <source>Received</source>
         <translation>Rebut</translation>
@@ -1533,10 +1009,6 @@
         <source>Out:</source>
         <translation>Fora:</translation>
     </message>
-    <message>
-        <source>Build date</source>
-        <translation>Data de compilació</translation>
-    </message>
     <message>
         <source>Debug log file</source>
         <translation>Fitxer de registre de depuració</translation>
@@ -1545,10 +1017,6 @@
         <source>Clear console</source>
         <translation>Neteja la consola</translation>
     </message>
-    <message>
-        <source>Welcome to the Bitcoin Core RPC console.</source>
-        <translation>Vos donem la benviguda a la consola RPC del Bitcoin Core.</translation>
-    </message>
     <message>
         <source>Use up and down arrows to navigate history, and &lt;b&gt;Ctrl-L&lt;/b&gt; to clear screen.</source>
         <translation>Utilitza les fletxes d'amunt i avall per navegar per l'historial, i &lt;b&gt;Ctrl-L&lt;\b&gt; per netejar la pantalla.</translation>
@@ -1672,18 +1140,6 @@
         <source>Remove</source>
         <translation>Esborra</translation>
     </message>
-    <message>
-        <source>Copy label</source>
-        <translation>Copia l'etiqueta</translation>
-    </message>
-    <message>
-        <source>Copy message</source>
-        <translation>Copia el missatge</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>Copia l'import</translation>
-    </message>
 </context>
 <context>
     <name>ReceiveRequestDialog</name>
@@ -1703,73 +1159,6 @@
         <source>&amp;Save Image...</source>
         <translation>&amp;Guarda la imatge...</translation>
     </message>
-    <message>
-        <source>Request payment to %1</source>
-        <translation>Sol·licita un pagament a %1</translation>
-    </message>
-    <message>
-        <source>Payment information</source>
-        <translation>Informació de pagament</translation>
-    </message>
-    <message>
-        <source>URI</source>
-        <translation>URI</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>Adreça</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>Import</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Etiqueta</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>Missatge</translation>
-    </message>
-    <message>
-        <source>Resulting URI too long, try to reduce the text for label / message.</source>
-        <translation>URI resultant massa llarga, intenta reduir el text per a la etiqueta / missatge</translation>
-    </message>
-    <message>
-        <source>Error encoding URI into QR Code.</source>
-        <translation>Error en codificar l'URI en un codi QR.</translation>
-    </message>
-</context>
-<context>
-    <name>RecentRequestsTableModel</name>
-    <message>
-        <source>Date</source>
-        <translation>Data</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Etiqueta</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>Missatge</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>Import</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(sense etiqueta)</translation>
-    </message>
-    <message>
-        <source>(no message)</source>
-        <translation>(sense missatge)</translation>
-    </message>
-    <message>
-        <source>(no amount)</source>
-        <translation>(sense import)</translation>
-    </message>
 </context>
 <context>
     <name>SendCoinsDialog</name>
@@ -1807,954 +1196,320 @@
     </message>
     <message>
         <source>Priority:</source>
-        <translation>Prioritat:</translation>
-    </message>
-    <message>
-        <source>Fee:</source>
-        <translation>Comissió:</translation>
-    </message>
-    <message>
-        <source>After Fee:</source>
-        <translation>Comissió posterior:</translation>
-    </message>
-    <message>
-        <source>Change:</source>
-        <translation>Canvi:</translation>
-    </message>
-    <message>
-        <source>If this is activated, but the change address is empty or invalid, change will be sent to a newly generated address.</source>
-        <translation>Si s'activa això, però l'adreça de canvi està buida o bé no és vàlida, el canvi s'enviarà a una adreça generada de nou.</translation>
-    </message>
-    <message>
-        <source>Custom change address</source>
-        <translation>Personalitza l'adreça de canvi</translation>
-    </message>
-    <message>
-        <source>Transaction Fee:</source>
-        <translation>Comissió de transacció</translation>
-    </message>
-    <message>
-        <source>Choose...</source>
-        <translation>Tria...</translation>
-    </message>
-    <message>
-        <source>collapse fee-settings</source>
-        <translation>redueix els paràmetres de comissió</translation>
-    </message>
-    <message>
-        <source>per kilobyte</source>
-        <translation>per kilobyte</translation>
-    </message>
-    <message>
-        <source>If the custom fee is set to 1000 satoshis and the transaction is only 250 bytes, then "per kilobyte" only pays 250 satoshis in fee, while "total at least" pays 1000 satoshis. For transactions bigger than a kilobyte both pay by kilobyte.</source>
-        <translation>Si la comissió personalitzada es defineix a 1000 satoshis i la transacció és de només 250 bytes, llavors «per kilobyte» només es paguen 250 satoshis en una comissió, mentre que amb la de «total com a mínim» es pagarien 1000 satoshis. Per a transaccions superiors al kilobyte, en tots dos casos es paga per kilobyte.</translation>
-    </message>
-    <message>
-        <source>Hide</source>
-        <translation>Amaga</translation>
-    </message>
-    <message>
-        <source>total at least</source>
-        <translation>total com a mínim</translation>
-    </message>
-    <message>
-        <source>Paying only the minimum fee is just fine as long as there is less transaction volume than space in the blocks. But be aware that this can end up in a never confirming transaction once there is more demand for bitcoin transactions than the network can process.</source>
-        <translation>No hi ha cap problema en pagar només la comissió mínima sempre que hi haja menys volum de transacció que espai en els blocs. Però tingueu present que això pot acabar en una transacció que mai es confirme una vegada hi haja més demanda de transaccions de bitcoins que la xarxa puga processar.</translation>
-    </message>
-    <message>
-        <source>(read the tooltip)</source>
-        <translation>(llegiu l'indicador de funció)</translation>
-    </message>
-    <message>
-        <source>Recommended:</source>
-        <translation>Recomanada:</translation>
-    </message>
-    <message>
-        <source>Custom:</source>
-        <translation>Personalitzada:</translation>
-    </message>
-    <message>
-        <source>(Smart fee not initialized yet. This usually takes a few blocks...)</source>
-        <translation>(No s'ha inicialitzat encara la comissió intel·ligent. Normalment pren uns pocs blocs...)</translation>
-    </message>
-    <message>
-        <source>Confirmation time:</source>
-        <translation>Temps de confirmació:</translation>
-    </message>
-    <message>
-        <source>normal</source>
-        <translation>normal</translation>
-    </message>
-    <message>
-        <source>fast</source>
-        <translation>ràpid</translation>
-    </message>
-    <message>
-        <source>Send as zero-fee transaction if possible</source>
-        <translation>Envia com a transacció de comissió zero si és possible</translation>
-    </message>
-    <message>
-        <source>(confirmation may take longer)</source>
-        <translation>(la confirmació pot trigar més temps)</translation>
-    </message>
-    <message>
-        <source>Send to multiple recipients at once</source>
-        <translation>Envia a múltiples destinataris al mateix temps</translation>
-    </message>
-    <message>
-        <source>Add &amp;Recipient</source>
-        <translation>Afig &amp;destinatari</translation>
-    </message>
-    <message>
-        <source>Clear all fields of the form.</source>
-        <translation>Netejar tots els camps del formulari.</translation>
-    </message>
-    <message>
-        <source>Dust:</source>
-        <translation>Polsim:</translation>
-    </message>
-    <message>
-        <source>Clear &amp;All</source>
-        <translation>Neteja-ho &amp;tot</translation>
-    </message>
-    <message>
-        <source>Balance:</source>
-        <translation>Balanç:</translation>
-    </message>
-    <message>
-        <source>Confirm the send action</source>
-        <translation>Confirma l'acció d'enviament</translation>
-    </message>
-    <message>
-        <source>S&amp;end</source>
-        <translation>E&amp;nvia</translation>
-    </message>
-    <message>
-        <source>Confirm send coins</source>
-        <translation>Confirma l'enviament de monedes</translation>
-    </message>
-    <message>
-        <source>%1 to %2</source>
-        <translation>%1 a %2</translation>
-    </message>
-    <message>
-        <source>Copy quantity</source>
-        <translation>Copia la quantitat</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>Copia l'import</translation>
-    </message>
-    <message>
-        <source>Copy fee</source>
-        <translation>Copia la comissió</translation>
-    </message>
-    <message>
-        <source>Copy after fee</source>
-        <translation>Copia la comissió posterior</translation>
-    </message>
-    <message>
-        <source>Copy bytes</source>
-        <translation>Copia els bytes</translation>
-    </message>
-    <message>
-        <source>Copy priority</source>
-        <translation>Copia la prioritat</translation>
-    </message>
-    <message>
-        <source>Copy change</source>
-        <translation>Copia el canvi</translation>
-    </message>
-    <message>
-        <source>or</source>
-        <translation>o</translation>
-    </message>
-    <message>
-        <source>The amount to pay must be larger than 0.</source>
-        <translation>L'import a pagar ha de ser major que 0.</translation>
-    </message>
-    <message>
-        <source>The amount exceeds your balance.</source>
-        <translation>L'import supera el vostre balanç.</translation>
-    </message>
-    <message>
-        <source>The total exceeds your balance when the %1 transaction fee is included.</source>
-        <translation>El total excedeix el teu balanç quan s'afig la comissió a la transacció %1.</translation>
-    </message>
-    <message>
-        <source>Transaction creation failed!</source>
-        <translation>Ha fallat la creació de la transacció!</translation>
-    </message>
-    <message>
-        <source>The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source>
-        <translation>S'ha rebutjat la transacció! Això pot passar si alguna de les monedes del vostre moneder ja s'han gastat; per exemple, si heu fet servir una còpia de seguretat del fitxer wallet.dat i s'hagueren gastat monedes de la còpia però sense marcar-les-hi com a gastades.</translation>
-    </message>
-    <message>
-        <source>A fee higher than %1 is considered an absurdly high fee.</source>
-        <translation>Una comissió superior a %1 es considera una comissió absurdament alta.</translation>
-    </message>
-    <message>
-        <source>Payment request expired.</source>
-        <translation>La sol·licitud de pagament ha vençut.</translation>
-    </message>
-    <message numerus="yes">
-        <source>Estimated to begin confirmation within %n block(s).</source>
-        <translation><numerusform>Estimat per començar la confirmació en %n bloc.</numerusform><numerusform>Estimat per començar la confirmació en %n blocs.</numerusform></translation>
-    </message>
-    <message>
-        <source>The recipient address is not valid. Please recheck.</source>
-        <translation>L'adreça de destinatari no és vàlida. Torneu-la a comprovar.</translation>
-    </message>
-    <message>
-        <source>Duplicate address found: addresses should only be used once each.</source>
-        <translation>S'ha trobat una adreça duplicada: cal utilitzar les adreces només un cop cada vegada.</translation>
-    </message>
-    <message>
-        <source>Warning: Invalid Bitcoin address</source>
-        <translation>Avís: adreça Bitcoin no vàlida</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(sense etiqueta)</translation>
-    </message>
-    <message>
-        <source>Warning: Unknown change address</source>
-        <translation>Avís: adreça de canvi desconeguda</translation>
-    </message>
-    <message>
-        <source>Copy dust</source>
-        <translation>Copia el polsim</translation>
-    </message>
-    <message>
-        <source>Are you sure you want to send?</source>
-        <translation>Esteu segur que ho voleu enviar?</translation>
-    </message>
-    <message>
-        <source>added as transaction fee</source>
-        <translation>S'ha afegit una taxa de transacció</translation>
-    </message>
-</context>
-<context>
-    <name>SendCoinsEntry</name>
-    <message>
-        <source>A&amp;mount:</source>
-        <translation>Q&amp;uantitat:</translation>
-    </message>
-    <message>
-        <source>Pay &amp;To:</source>
-        <translation>Paga &amp;a:</translation>
-    </message>
-    <message>
-        <source>Enter a label for this address to add it to your address book</source>
-        <translation>Introduïu una etiqueta per a esta adreça per afegir-la a la llibreta d'adreces</translation>
-    </message>
-    <message>
-        <source>&amp;Label:</source>
-        <translation>&amp;Etiqueta:</translation>
-    </message>
-    <message>
-        <source>Choose previously used address</source>
-        <translation>Trieu una adreça feta servir anteriorment</translation>
-    </message>
-    <message>
-        <source>This is a normal payment.</source>
-        <translation>Això és un pagament normal.</translation>
-    </message>
-    <message>
-        <source>The Bitcoin address to send the payment to</source>
-        <translation>L'adreça Bitcoin on enviar el pagament</translation>
-    </message>
-    <message>
-        <source>Alt+A</source>
-        <translation>Alta+A</translation>
-    </message>
-    <message>
-        <source>Paste address from clipboard</source>
-        <translation>Apegar adreça del porta-retalls</translation>
-    </message>
-    <message>
-        <source>Alt+P</source>
-        <translation>Alt+P</translation>
-    </message>
-    <message>
-        <source>Remove this entry</source>
-        <translation>Elimina esta entrada</translation>
-    </message>
-    <message>
-        <source>The fee will be deducted from the amount being sent. The recipient will receive less bitcoins than you enter in the amount field. If multiple recipients are selected, the fee is split equally.</source>
-        <translation>La comissió es deduirà de l'import que s'enviarà. El destinatari rebrà menys bitcoins que les que introduïu al camp d'import. Si se seleccionen múltiples destinataris, la comissió es dividirà per igual.</translation>
-    </message>
-    <message>
-        <source>S&amp;ubtract fee from amount</source>
-        <translation>S&amp;ubstreu la comissió de l'import</translation>
-    </message>
-    <message>
-        <source>Message:</source>
-        <translation>Missatge:</translation>
-    </message>
-    <message>
-        <source>This is an unauthenticated payment request.</source>
-        <translation>Esta és una sol·licitud de pagament no autenticada.</translation>
-    </message>
-    <message>
-        <source>This is an authenticated payment request.</source>
-        <translation>Esta és una sol·licitud de pagament autenticada.</translation>
-    </message>
-    <message>
-        <source>Enter a label for this address to add it to the list of used addresses</source>
-        <translation>Introduïu una etiqueta per a esta adreça per afegir-la a la llista d'adreces utilitzades</translation>
-    </message>
-    <message>
-        <source>A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
-        <translation>Un missatge que s'ha adjuntat al bitcoin: URI que s'emmagatzemarà amb la transacció per a la vostra referència. Nota: el missatge no s'enviarà a través de la xarxa Bitcoin.</translation>
-    </message>
-    <message>
-        <source>Pay To:</source>
-        <translation>Paga a:</translation>
-    </message>
-    <message>
-        <source>Memo:</source>
-        <translation>Memo:</translation>
-    </message>
-</context>
-<context>
-    <name>ShutdownWindow</name>
-    <message>
-        <source>Bitcoin Core is shutting down...</source>
-        <translation>S'està parant el Bitcoin Core...</translation>
-    </message>
-    <message>
-        <source>Do not shut down the computer until this window disappears.</source>
-        <translation>No apagueu l'ordinador fins que no desaparegui esta finestra.</translation>
-    </message>
-</context>
-<context>
-    <name>SignVerifyMessageDialog</name>
-    <message>
-        <source>Signatures - Sign / Verify a Message</source>
-        <translation>Signatures - Signa / verifica un missatge</translation>
-    </message>
-    <message>
-        <source>&amp;Sign Message</source>
-        <translation>&amp;Signa el missatge</translation>
-    </message>
-    <message>
-        <source>You can sign messages/agreements with your addresses to prove you can receive bitcoins sent to them. Be careful not to sign anything vague or random, as phishing attacks may try to trick you into signing your identity over to them. Only sign fully-detailed statements you agree to.</source>
-        <translation>Podeu signar missatges/acords amb les vostres adreces per provar que rebeu les bitcoins que s'hi envien. Aneu amb compte no signar res que siga vague o aleatori, perquè en alguns atacs de suplantació es pot provar que hi signeu la vostra identitat. Només signeu aquelles declaracions completament detallades en què hi esteu d'acord. </translation>
-    </message>
-    <message>
-        <source>The Bitcoin address to sign the message with</source>
-        <translation>L'adreça Bitcoin amb què signar el missatge</translation>
-    </message>
-    <message>
-        <source>Choose previously used address</source>
-        <translation>Tria les adreces fetes servir amb anterioritat</translation>
-    </message>
-    <message>
-        <source>Alt+A</source>
-        <translation>Alt+A</translation>
-    </message>
-    <message>
-        <source>Paste address from clipboard</source>
-        <translation>Apega l'adreça del porta-retalls</translation>
-    </message>
-    <message>
-        <source>Alt+P</source>
-        <translation>Alt+P</translation>
-    </message>
-    <message>
-        <source>Enter the message you want to sign here</source>
-        <translation>Introduïu ací el missatge que voleu signar</translation>
-    </message>
-    <message>
-        <source>Signature</source>
-        <translation>Signatura</translation>
-    </message>
-    <message>
-        <source>Copy the current signature to the system clipboard</source>
-        <translation>Copia la signatura actual al porta-retalls del sistema</translation>
-    </message>
-    <message>
-        <source>Sign the message to prove you own this Bitcoin address</source>
-        <translation>Signa el missatge per provar que ets propietari d'esta adreça Bitcoin</translation>
-    </message>
-    <message>
-        <source>Sign &amp;Message</source>
-        <translation>Signa el &amp;missatge</translation>
-    </message>
-    <message>
-        <source>Reset all sign message fields</source>
-        <translation>Neteja tots els camps de clau</translation>
-    </message>
-    <message>
-        <source>Clear &amp;All</source>
-        <translation>Neteja-ho &amp;tot</translation>
-    </message>
-    <message>
-        <source>&amp;Verify Message</source>
-        <translation>&amp;Verifica el missatge</translation>
-    </message>
-    <message>
-        <source>Enter the receiver's address, message (ensure you copy line breaks, spaces, tabs, etc. exactly) and signature below to verify the message. Be careful not to read more into the signature than what is in the signed message itself, to avoid being tricked by a man-in-the-middle attack. Note that this only proves the signing party receives with the address, it cannot prove sendership of any transaction!</source>
-        <translation>Introduïu l'adreça del receptor, el missatge (assegureu-vos de copiar els salts de línia, espais, tabuladors, etc. exactament) i signatura de sota per verificar el missatge. Tingueu cura de no llegir més en la signatura del que està al missatge signat, per evitar ser enganyat per un atac d'home-en-el-mig. Tingueu en compte que això només demostra que la part que signa rep amb l'adreça, i no es pot provar l'enviament de qualsevol transacció!</translation>
-    </message>
-    <message>
-        <source>The Bitcoin address the message was signed with</source>
-        <translation>L'adreça Bitcoin amb què va ser signat el missatge</translation>
-    </message>
-    <message>
-        <source>Verify the message to ensure it was signed with the specified Bitcoin address</source>
-        <translation>Verificar el missatge per assegurar-se que ha estat signat amb una adreça Bitcoin específica</translation>
-    </message>
-    <message>
-        <source>Verify &amp;Message</source>
-        <translation>Verifica el &amp;missatge</translation>
-    </message>
-    <message>
-        <source>Reset all verify message fields</source>
-        <translation>Neteja tots els camps de verificació de missatge</translation>
-    </message>
-    <message>
-        <source>Click "Sign Message" to generate signature</source>
-        <translation>Feu clic a «Signa el missatge» per a generar una signatura</translation>
-    </message>
-    <message>
-        <source>The entered address is invalid.</source>
-        <translation>L'adreça introduïda no és vàlida.</translation>
-    </message>
-    <message>
-        <source>Please check the address and try again.</source>
-        <translation>Comproveu l'adreça i torneu-ho a provar.</translation>
-    </message>
-    <message>
-        <source>The entered address does not refer to a key.</source>
-        <translation>L'adreça introduïda no referencia a cap clau.</translation>
-    </message>
-    <message>
-        <source>Wallet unlock was cancelled.</source>
-        <translation>El desbloqueig del moneder ha estat cancelat.</translation>
-    </message>
-    <message>
-        <source>Private key for the entered address is not available.</source>
-        <translation>La clau privada per a la adreça introduïda no està disponible.</translation>
-    </message>
-    <message>
-        <source>Message signing failed.</source>
-        <translation>La signatura del missatge ha fallat.</translation>
-    </message>
-    <message>
-        <source>Message signed.</source>
-        <translation>Missatge signat.</translation>
-    </message>
-    <message>
-        <source>The signature could not be decoded.</source>
-        <translation>La signatura no s'ha pogut descodificar.</translation>
-    </message>
-    <message>
-        <source>Please check the signature and try again.</source>
-        <translation>Comproveu la signatura i torneu-ho a provar.</translation>
-    </message>
-    <message>
-        <source>The signature did not match the message digest.</source>
-        <translation>La signatura no coincideix amb el resum del missatge.</translation>
-    </message>
-    <message>
-        <source>Message verification failed.</source>
-        <translation>Ha fallat la verificació del missatge.</translation>
-    </message>
-    <message>
-        <source>Message verified.</source>
-        <translation>Missatge verificat.</translation>
-    </message>
-</context>
-<context>
-    <name>SplashScreen</name>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Bitcoin Core</translation>
-    </message>
-    <message>
-        <source>The Bitcoin Core developers</source>
-        <translation>Els desenvolupadors del Bitcoin Core</translation>
-    </message>
-    <message>
-        <source>[testnet]</source>
-        <translation>[testnet]</translation>
-    </message>
-</context>
-<context>
-    <name>TrafficGraphWidget</name>
-    <message>
-        <source>KB/s</source>
-        <translation>KB/s</translation>
-    </message>
-</context>
-<context>
-    <name>TransactionDesc</name>
-    <message>
-        <source>Open until %1</source>
-        <translation>Obert fins %1</translation>
-    </message>
-    <message>
-        <source>conflicted</source>
-        <translation>en conflicte</translation>
-    </message>
-    <message>
-        <source>%1/offline</source>
-        <translation>%1/fora de línia</translation>
-    </message>
-    <message>
-        <source>%1/unconfirmed</source>
-        <translation>%1/sense confirmar</translation>
-    </message>
-    <message>
-        <source>%1 confirmations</source>
-        <translation>%1 confirmacions</translation>
-    </message>
-    <message>
-        <source>Status</source>
-        <translation>Estat</translation>
-    </message>
-    <message numerus="yes">
-        <source>, broadcast through %n node(s)</source>
-        <translation><numerusform>, difusió a través de %n node</numerusform><numerusform>, difusió a través de %n nodes</numerusform></translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation>Data</translation>
-    </message>
-    <message>
-        <source>Source</source>
-        <translation>Font</translation>
-    </message>
-    <message>
-        <source>Generated</source>
-        <translation>Generat</translation>
-    </message>
-    <message>
-        <source>From</source>
-        <translation>Des de</translation>
-    </message>
-    <message>
-        <source>To</source>
-        <translation>A</translation>
-    </message>
-    <message>
-        <source>own address</source>
-        <translation>Adreça pròpia</translation>
-    </message>
-    <message>
-        <source>watch-only</source>
-        <translation>només lectura</translation>
-    </message>
-    <message>
-        <source>label</source>
-        <translation>etiqueta</translation>
-    </message>
-    <message>
-        <source>Credit</source>
-        <translation>Crèdit</translation>
-    </message>
-    <message numerus="yes">
-        <source>matures in %n more block(s)</source>
-        <translation><numerusform>madura en %n bloc més</numerusform><numerusform>madura en %n blocs més</numerusform></translation>
-    </message>
-    <message>
-        <source>not accepted</source>
-        <translation>no acceptat</translation>
-    </message>
-    <message>
-        <source>Debit</source>
-        <translation>Dèbit</translation>
-    </message>
-    <message>
-        <source>Total debit</source>
-        <translation>Dèbit total</translation>
-    </message>
-    <message>
-        <source>Total credit</source>
-        <translation>Crèdit total</translation>
-    </message>
-    <message>
-        <source>Transaction fee</source>
-        <translation>Comissió de transacció</translation>
-    </message>
-    <message>
-        <source>Net amount</source>
-        <translation>Import net</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>Missatge</translation>
-    </message>
-    <message>
-        <source>Comment</source>
-        <translation>Comentar</translation>
-    </message>
-    <message>
-        <source>Transaction ID</source>
-        <translation>ID de transacció</translation>
-    </message>
-    <message>
-        <source>Merchant</source>
-        <translation>Mercader</translation>
-    </message>
-    <message>
-        <source>Generated coins must mature %1 blocks before they can be spent. When you generated this block, it was broadcast to the network to be added to the block chain. If it fails to get into the chain, its state will change to "not accepted" and it won't be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source>
-        <translation>Les monedes generades han de madurar %1 blocs abans de poder ser gastades. Quan genereu este bloc, es farà saber a la xarxa per tal d'afegir-lo a la cadena de blocs. Si no pot fer-se lloc a la cadena, el seu estat canviarà a «no acceptat» i no es podrà gastar. Això pot passar ocasionalment si un altre node genera un bloc en un marge de segons respecte al vostre.</translation>
-    </message>
-    <message>
-        <source>Debug information</source>
-        <translation>Informació de depuració</translation>
+        <translation>Prioritat:</translation>
     </message>
     <message>
-        <source>Transaction</source>
-        <translation>Transacció</translation>
+        <source>Fee:</source>
+        <translation>Comissió:</translation>
     </message>
     <message>
-        <source>Inputs</source>
-        <translation>Entrades</translation>
+        <source>After Fee:</source>
+        <translation>Comissió posterior:</translation>
     </message>
     <message>
-        <source>Amount</source>
-        <translation>Import</translation>
+        <source>Change:</source>
+        <translation>Canvi:</translation>
     </message>
     <message>
-        <source>true</source>
-        <translation>cert</translation>
+        <source>If this is activated, but the change address is empty or invalid, change will be sent to a newly generated address.</source>
+        <translation>Si s'activa això, però l'adreça de canvi està buida o bé no és vàlida, el canvi s'enviarà a una adreça generada de nou.</translation>
     </message>
     <message>
-        <source>false</source>
-        <translation>fals</translation>
+        <source>Custom change address</source>
+        <translation>Personalitza l'adreça de canvi</translation>
     </message>
     <message>
-        <source>, has not been successfully broadcast yet</source>
-        <translation>, encara no ha estat emés correctement</translation>
-    </message>
-    <message numerus="yes">
-        <source>Open for %n more block(s)</source>
-        <translation><numerusform>Obri per %n bloc més</numerusform><numerusform>Obri per %n blocs més</numerusform></translation>
+        <source>Transaction Fee:</source>
+        <translation>Comissió de transacció</translation>
     </message>
     <message>
-        <source>unknown</source>
-        <translation>desconegut</translation>
+        <source>Choose...</source>
+        <translation>Tria...</translation>
     </message>
-</context>
-<context>
-    <name>TransactionDescDialog</name>
     <message>
-        <source>Transaction details</source>
-        <translation>Detall de la transacció</translation>
+        <source>collapse fee-settings</source>
+        <translation>redueix els paràmetres de comissió</translation>
     </message>
     <message>
-        <source>This pane shows a detailed description of the transaction</source>
-        <translation>Este panell mostra una descripció detallada de la transacció</translation>
+        <source>per kilobyte</source>
+        <translation>per kilobyte</translation>
     </message>
-</context>
-<context>
-    <name>TransactionTableModel</name>
     <message>
-        <source>Date</source>
-        <translation>Data</translation>
+        <source>If the custom fee is set to 1000 satoshis and the transaction is only 250 bytes, then "per kilobyte" only pays 250 satoshis in fee, while "total at least" pays 1000 satoshis. For transactions bigger than a kilobyte both pay by kilobyte.</source>
+        <translation>Si la comissió personalitzada es defineix a 1000 satoshis i la transacció és de només 250 bytes, llavors «per kilobyte» només es paguen 250 satoshis en una comissió, mentre que amb la de «total com a mínim» es pagarien 1000 satoshis. Per a transaccions superiors al kilobyte, en tots dos casos es paga per kilobyte.</translation>
     </message>
     <message>
-        <source>Type</source>
-        <translation>Tipus</translation>
+        <source>Hide</source>
+        <translation>Amaga</translation>
     </message>
     <message>
-        <source>Immature (%1 confirmations, will be available after %2)</source>
-        <translation>Immadur (%1 confirmacions, serà disponible després de %2)</translation>
-    </message>
-    <message numerus="yes">
-        <source>Open for %n more block(s)</source>
-        <translation><numerusform>Obri per %n bloc més</numerusform><numerusform>Obri per %n blocs més</numerusform></translation>
+        <source>total at least</source>
+        <translation>total com a mínim</translation>
     </message>
     <message>
-        <source>Open until %1</source>
-        <translation>Obert fins %1</translation>
+        <source>Paying only the minimum fee is just fine as long as there is less transaction volume than space in the blocks. But be aware that this can end up in a never confirming transaction once there is more demand for bitcoin transactions than the network can process.</source>
+        <translation>No hi ha cap problema en pagar només la comissió mínima sempre que hi haja menys volum de transacció que espai en els blocs. Però tingueu present que això pot acabar en una transacció que mai es confirme una vegada hi haja més demanda de transaccions de bitcoins que la xarxa puga processar.</translation>
     </message>
     <message>
-        <source>Confirmed (%1 confirmations)</source>
-        <translation>Confirmat (%1 confirmacions)</translation>
+        <source>(read the tooltip)</source>
+        <translation>(llegiu l'indicador de funció)</translation>
     </message>
     <message>
-        <source>This block was not received by any other nodes and will probably not be accepted!</source>
-        <translation>Este bloc no ha estat rebut per cap altre node i probablement no serà acceptat!</translation>
+        <source>Recommended:</source>
+        <translation>Recomanada:</translation>
     </message>
     <message>
-        <source>Generated but not accepted</source>
-        <translation>Generat però no acceptat</translation>
+        <source>Custom:</source>
+        <translation>Personalitzada:</translation>
     </message>
     <message>
-        <source>Offline</source>
-        <translation>Fora de línia</translation>
+        <source>(Smart fee not initialized yet. This usually takes a few blocks...)</source>
+        <translation>(No s'ha inicialitzat encara la comissió intel·ligent. Normalment pren uns pocs blocs...)</translation>
     </message>
     <message>
-        <source>Label</source>
-        <translation>Etiqueta</translation>
+        <source>Confirmation time:</source>
+        <translation>Temps de confirmació:</translation>
     </message>
     <message>
-        <source>Unconfirmed</source>
-        <translation>Sense confirmar</translation>
+        <source>normal</source>
+        <translation>normal</translation>
     </message>
     <message>
-        <source>Confirming (%1 of %2 recommended confirmations)</source>
-        <translation>Confirmant (%1 de %2 confirmacions recomanades)</translation>
+        <source>fast</source>
+        <translation>ràpid</translation>
     </message>
     <message>
-        <source>Conflicted</source>
-        <translation>En conflicte</translation>
+        <source>Send to multiple recipients at once</source>
+        <translation>Envia a múltiples destinataris al mateix temps</translation>
     </message>
     <message>
-        <source>Received with</source>
-        <translation>Rebut amb</translation>
+        <source>Add &amp;Recipient</source>
+        <translation>Afig &amp;destinatari</translation>
     </message>
     <message>
-        <source>Received from</source>
-        <translation>Rebut de</translation>
+        <source>Clear all fields of the form.</source>
+        <translation>Netejar tots els camps del formulari.</translation>
     </message>
     <message>
-        <source>Sent to</source>
-        <translation>Enviat a</translation>
+        <source>Dust:</source>
+        <translation>Polsim:</translation>
     </message>
     <message>
-        <source>Payment to yourself</source>
-        <translation>Pagament a un mateix</translation>
+        <source>Clear &amp;All</source>
+        <translation>Neteja-ho &amp;tot</translation>
     </message>
     <message>
-        <source>Mined</source>
-        <translation>Minat</translation>
+        <source>Balance:</source>
+        <translation>Balanç:</translation>
     </message>
     <message>
-        <source>watch-only</source>
-        <translation>només lectura</translation>
+        <source>Confirm the send action</source>
+        <translation>Confirma l'acció d'enviament</translation>
     </message>
     <message>
-        <source>(n/a)</source>
-        <translation>(n/a)</translation>
+        <source>S&amp;end</source>
+        <translation>E&amp;nvia</translation>
     </message>
+</context>
+<context>
+    <name>SendCoinsEntry</name>
     <message>
-        <source>Transaction status. Hover over this field to show number of confirmations.</source>
-        <translation>Estat de la transacció. Desplaceu-vos sobre este camp per mostrar el nombre de confirmacions.</translation>
+        <source>A&amp;mount:</source>
+        <translation>Q&amp;uantitat:</translation>
     </message>
     <message>
-        <source>Date and time that the transaction was received.</source>
-        <translation>Data i hora en que la transacció va ser rebuda.</translation>
+        <source>Pay &amp;To:</source>
+        <translation>Paga &amp;a:</translation>
     </message>
     <message>
-        <source>Type of transaction.</source>
-        <translation>Tipus de transacció.</translation>
+        <source>&amp;Label:</source>
+        <translation>&amp;Etiqueta:</translation>
     </message>
     <message>
-        <source>Whether or not a watch-only address is involved in this transaction.</source>
-        <translation>Si està implicada o no una adreça només de lectura en la transacció.</translation>
+        <source>Choose previously used address</source>
+        <translation>Trieu una adreça feta servir anteriorment</translation>
     </message>
     <message>
-        <source>User-defined intent/purpose of the transaction.</source>
-        <translation>Intenció/propòsit de la transacció definida per l'usuari.</translation>
+        <source>This is a normal payment.</source>
+        <translation>Això és un pagament normal.</translation>
     </message>
     <message>
-        <source>Amount removed from or added to balance.</source>
-        <translation>Import extret o afegit del balanç.</translation>
+        <source>The Bitcoin address to send the payment to</source>
+        <translation>L'adreça Bitcoin on enviar el pagament</translation>
     </message>
-</context>
-<context>
-    <name>TransactionView</name>
     <message>
-        <source>All</source>
-        <translation>Tot</translation>
+        <source>Alt+A</source>
+        <translation>Alta+A</translation>
     </message>
     <message>
-        <source>Today</source>
-        <translation>Hui</translation>
+        <source>Paste address from clipboard</source>
+        <translation>Apegar adreça del porta-retalls</translation>
     </message>
     <message>
-        <source>This week</source>
-        <translation>Esta setmana</translation>
+        <source>Alt+P</source>
+        <translation>Alt+P</translation>
     </message>
     <message>
-        <source>This month</source>
-        <translation>Este mes</translation>
+        <source>Remove this entry</source>
+        <translation>Elimina esta entrada</translation>
     </message>
     <message>
-        <source>Last month</source>
-        <translation>El mes passat</translation>
+        <source>The fee will be deducted from the amount being sent. The recipient will receive less bitcoins than you enter in the amount field. If multiple recipients are selected, the fee is split equally.</source>
+        <translation>La comissió es deduirà de l'import que s'enviarà. El destinatari rebrà menys bitcoins que les que introduïu al camp d'import. Si se seleccionen múltiples destinataris, la comissió es dividirà per igual.</translation>
     </message>
     <message>
-        <source>This year</source>
-        <translation>Enguany</translation>
+        <source>S&amp;ubtract fee from amount</source>
+        <translation>S&amp;ubstreu la comissió de l'import</translation>
     </message>
     <message>
-        <source>Range...</source>
-        <translation>Rang...</translation>
+        <source>Message:</source>
+        <translation>Missatge:</translation>
     </message>
     <message>
-        <source>Received with</source>
-        <translation>Rebut amb</translation>
+        <source>This is an unauthenticated payment request.</source>
+        <translation>Esta és una sol·licitud de pagament no autenticada.</translation>
     </message>
     <message>
-        <source>Sent to</source>
-        <translation>Enviat a</translation>
+        <source>This is an authenticated payment request.</source>
+        <translation>Esta és una sol·licitud de pagament autenticada.</translation>
     </message>
     <message>
-        <source>To yourself</source>
-        <translation>A un mateix</translation>
+        <source>Enter a label for this address to add it to the list of used addresses</source>
+        <translation>Introduïu una etiqueta per a esta adreça per afegir-la a la llista d'adreces utilitzades</translation>
     </message>
     <message>
-        <source>Mined</source>
-        <translation>Minat</translation>
+        <source>A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
+        <translation>Un missatge que s'ha adjuntat al bitcoin: URI que s'emmagatzemarà amb la transacció per a la vostra referència. Nota: el missatge no s'enviarà a través de la xarxa Bitcoin.</translation>
     </message>
     <message>
-        <source>Other</source>
-        <translation>Altres</translation>
+        <source>Pay To:</source>
+        <translation>Paga a:</translation>
     </message>
     <message>
-        <source>Enter address or label to search</source>
-        <translation>Introduïu una adreça o una etiqueta per cercar</translation>
+        <source>Memo:</source>
+        <translation>Memo:</translation>
     </message>
+</context>
+<context>
+    <name>ShutdownWindow</name>
     <message>
-        <source>Min amount</source>
-        <translation>Import mínim</translation>
+        <source>Do not shut down the computer until this window disappears.</source>
+        <translation>No apagueu l'ordinador fins que no desaparegui esta finestra.</translation>
     </message>
+</context>
+<context>
+    <name>SignVerifyMessageDialog</name>
     <message>
-        <source>Copy address</source>
-        <translation>Copia l'adreça</translation>
+        <source>Signatures - Sign / Verify a Message</source>
+        <translation>Signatures - Signa / verifica un missatge</translation>
     </message>
     <message>
-        <source>Copy label</source>
-        <translation>Copiar etiqueta</translation>
+        <source>&amp;Sign Message</source>
+        <translation>&amp;Signa el missatge</translation>
     </message>
     <message>
-        <source>Copy amount</source>
-        <translation>Copia l'import</translation>
+        <source>You can sign messages/agreements with your addresses to prove you can receive bitcoins sent to them. Be careful not to sign anything vague or random, as phishing attacks may try to trick you into signing your identity over to them. Only sign fully-detailed statements you agree to.</source>
+        <translation>Podeu signar missatges/acords amb les vostres adreces per provar que rebeu les bitcoins que s'hi envien. Aneu amb compte no signar res que siga vague o aleatori, perquè en alguns atacs de suplantació es pot provar que hi signeu la vostra identitat. Només signeu aquelles declaracions completament detallades en què hi esteu d'acord. </translation>
     </message>
     <message>
-        <source>Copy transaction ID</source>
-        <translation>Copiar ID de transacció</translation>
+        <source>The Bitcoin address to sign the message with</source>
+        <translation>L'adreça Bitcoin amb què signar el missatge</translation>
     </message>
     <message>
-        <source>Edit label</source>
-        <translation>Editar etiqueta</translation>
+        <source>Choose previously used address</source>
+        <translation>Tria les adreces fetes servir amb anterioritat</translation>
     </message>
     <message>
-        <source>Show transaction details</source>
-        <translation>Mostra detalls de la transacció</translation>
+        <source>Alt+A</source>
+        <translation>Alt+A</translation>
     </message>
     <message>
-        <source>Export Transaction History</source>
-        <translation>Exporta l'historial de transacció</translation>
+        <source>Paste address from clipboard</source>
+        <translation>Apega l'adreça del porta-retalls</translation>
     </message>
     <message>
-        <source>Watch-only</source>
-        <translation>Només de lectura</translation>
+        <source>Alt+P</source>
+        <translation>Alt+P</translation>
     </message>
     <message>
-        <source>Exporting Failed</source>
-        <translation>L'exportació ha fallat</translation>
+        <source>Enter the message you want to sign here</source>
+        <translation>Introduïu ací el missatge que voleu signar</translation>
     </message>
     <message>
-        <source>There was an error trying to save the transaction history to %1.</source>
-        <translation>S'ha produït un error en provar de guardar l'historial de transacció a %1.</translation>
+        <source>Signature</source>
+        <translation>Signatura</translation>
     </message>
     <message>
-        <source>Exporting Successful</source>
-        <translation>Exportació amb èxit</translation>
+        <source>Copy the current signature to the system clipboard</source>
+        <translation>Copia la signatura actual al porta-retalls del sistema</translation>
     </message>
     <message>
-        <source>The transaction history was successfully saved to %1.</source>
-        <translation>L'historial de transaccions s'ha guardat correctament a %1.</translation>
+        <source>Sign the message to prove you own this Bitcoin address</source>
+        <translation>Signa el missatge per provar que ets propietari d'esta adreça Bitcoin</translation>
     </message>
     <message>
-        <source>Comma separated file (*.csv)</source>
-        <translation>Fitxer separat per comes (*.csv)</translation>
+        <source>Sign &amp;Message</source>
+        <translation>Signa el &amp;missatge</translation>
     </message>
     <message>
-        <source>Confirmed</source>
-        <translation>Confirmat</translation>
+        <source>Reset all sign message fields</source>
+        <translation>Neteja tots els camps de clau</translation>
     </message>
     <message>
-        <source>Date</source>
-        <translation>Data</translation>
+        <source>Clear &amp;All</source>
+        <translation>Neteja-ho &amp;tot</translation>
     </message>
     <message>
-        <source>Type</source>
-        <translation>Tipus</translation>
+        <source>&amp;Verify Message</source>
+        <translation>&amp;Verifica el missatge</translation>
     </message>
     <message>
-        <source>Label</source>
-        <translation>Etiqueta</translation>
+        <source>Enter the receiver's address, message (ensure you copy line breaks, spaces, tabs, etc. exactly) and signature below to verify the message. Be careful not to read more into the signature than what is in the signed message itself, to avoid being tricked by a man-in-the-middle attack. Note that this only proves the signing party receives with the address, it cannot prove sendership of any transaction!</source>
+        <translation>Introduïu l'adreça del receptor, el missatge (assegureu-vos de copiar els salts de línia, espais, tabuladors, etc. exactament) i signatura de sota per verificar el missatge. Tingueu cura de no llegir més en la signatura del que està al missatge signat, per evitar ser enganyat per un atac d'home-en-el-mig. Tingueu en compte que això només demostra que la part que signa rep amb l'adreça, i no es pot provar l'enviament de qualsevol transacció!</translation>
     </message>
     <message>
-        <source>Address</source>
-        <translation>Adreça</translation>
+        <source>The Bitcoin address the message was signed with</source>
+        <translation>L'adreça Bitcoin amb què va ser signat el missatge</translation>
     </message>
     <message>
-        <source>ID</source>
-        <translation>ID</translation>
+        <source>Verify the message to ensure it was signed with the specified Bitcoin address</source>
+        <translation>Verificar el missatge per assegurar-se que ha estat signat amb una adreça Bitcoin específica</translation>
     </message>
     <message>
-        <source>Range:</source>
-        <translation>Rang:</translation>
+        <source>Verify &amp;Message</source>
+        <translation>Verifica el &amp;missatge</translation>
     </message>
     <message>
-        <source>to</source>
-        <translation>a</translation>
+        <source>Reset all verify message fields</source>
+        <translation>Neteja tots els camps de verificació de missatge</translation>
     </message>
 </context>
 <context>
-    <name>UnitDisplayStatusBarControl</name>
+    <name>SplashScreen</name>
     <message>
-        <source>Unit to show amounts in. Click to select another unit.</source>
-        <translation>Unitat en què mostrar els imports. Feu clic per seleccionar una altra unitat.</translation>
+        <source>[testnet]</source>
+        <translation>[testnet]</translation>
     </message>
 </context>
 <context>
-    <name>WalletFrame</name>
+    <name>TrafficGraphWidget</name>
     <message>
-        <source>No wallet has been loaded.</source>
-        <translation>No s'ha carregat cap moneder.</translation>
+        <source>KB/s</source>
+        <translation>KB/s</translation>
     </message>
 </context>
 <context>
-    <name>WalletModel</name>
+    <name>TransactionDescDialog</name>
     <message>
-        <source>Send Coins</source>
-        <translation>Envia monedes</translation>
+        <source>This pane shows a detailed description of the transaction</source>
+        <translation>Este panell mostra una descripció detallada de la transacció</translation>
     </message>
 </context>
 <context>
-    <name>WalletView</name>
-    <message>
-        <source>&amp;Export</source>
-        <translation>&amp;Exporta</translation>
-    </message>
-    <message>
-        <source>Export the data in the current tab to a file</source>
-        <translation>Exporta les dades de la pestanya actual a un fitxer</translation>
-    </message>
-    <message>
-        <source>Backup Wallet</source>
-        <translation>Còpia de seguretat del moneder</translation>
-    </message>
-    <message>
-        <source>Wallet Data (*.dat)</source>
-        <translation>Dades del moneder (*.dat)</translation>
-    </message>
-    <message>
-        <source>Backup Failed</source>
-        <translation>Ha fallat la còpia de seguretat</translation>
-    </message>
-    <message>
-        <source>There was an error trying to save the wallet data to %1.</source>
-        <translation>S'ha produït un error en provar de guardar les dades del moneder a %1.</translation>
-    </message>
-    <message>
-        <source>The wallet data was successfully saved to %1.</source>
-        <translation>S'han guardat les dades del moneder correctament a %1.</translation>
-    </message>
+    <name>UnitDisplayStatusBarControl</name>
     <message>
-        <source>Backup Successful</source>
-        <translation>La còpia de seguretat s'ha realitzat correctament</translation>
+        <source>Unit to show amounts in. Click to select another unit.</source>
+        <translation>Unitat en què mostrar els imports. Feu clic per seleccionar una altra unitat.</translation>
     </message>
 </context>
 <context>
@@ -2787,6 +1542,10 @@
         <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
         <translation>Accepta connexions de fora (per defecte: 1 si no -proxy o -connect)</translation>
     </message>
+    <message>
+        <source>Bitcoin Core</source>
+        <translation>Bitcoin Core</translation>
+    </message>
     <message>
         <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source>
         <translation>Vincula a una adreça específica i sempre escolta-hi. Utilitza la notació [host]:port per IPv6</translation>
@@ -2811,10 +1570,6 @@
         <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
         <translation>Esta és una versió de pre-llançament - utilitza-la sota la teva responsabilitat - No usar per a minería o aplicacions de compra-venda</translation>
     </message>
-    <message>
-        <source>Unable to bind to %s on this computer. Bitcoin Core is probably already running.</source>
-        <translation>No es pot enllaçar %s a este ordinador. El Bitcoin Core probablement ja estiga executant-s'hi.</translation>
-    </message>
     <message>
         <source>WARNING: abnormally high number of blocks generated, %d blocks received in the last %d hours (%d expected)</source>
         <translation>AVÍS: s'ha generat un nombre anòmalament alt de blocs, %d blocs rebuts en les darreres %d hores (se n'esperaven %d)</translation>
@@ -2831,10 +1586,6 @@
         <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source>
         <translation>Avís: pareix que no estem plenament d'acord amb els nostres iguals! Podria caldre que actualitzar l'aplicació, o potser que ho facen altres nodes.</translation>
     </message>
-    <message>
-        <source>Warning: wallet.dat corrupt, data salvaged! Original wallet.dat saved as wallet.{timestamp}.bak in %s; if your balance or transactions are incorrect you should restore from a backup.</source>
-        <translation>Avís: el fitxer wallet.dat és corrupte, dades rescatades! L'arxiu wallet.dat original ha estat guardat com wallet.{estampa_temporal}.bak al directori %s; si el teu balanç o transaccions son incorrectes hauries de restaurar-lo de un backup.</translation>
-    </message>
     <message>
         <source>Whitelist peers connecting from the given netmask or IP address. Can be specified multiple times.</source>
         <translation>Afig a la llista blanca els iguals que es connecten de la màscara de xarxa o adreça IP donada. Es pot especificar moltes vegades.</translation>
@@ -2955,10 +1706,6 @@
         <source>Wallet options:</source>
         <translation>Opcions de moneder:</translation>
     </message>
-    <message>
-        <source>You need to rebuild the database using -reindex to change -txindex</source>
-        <translation>Cal que reconstruïu la base de dades fent servir -reindex per canviar -txindex</translation>
-    </message>
     <message>
         <source>Allow JSON-RPC connections from specified source. Valid for &lt;ip&gt; are a single IP (e.g. 1.2.3.4), a network/netmask (e.g. 1.2.3.4/255.255.255.0) or a network/CIDR (e.g. 1.2.3.4/24). This option can be specified multiple times</source>
         <translation>Permet les connexions JSON-RPC d'una font específica. Vàlid per a &lt;ip&gt; són una IP individual (p. ex., 1.2.3.4), una xarxa / màscara de xarxa (p. ex., 1.2.3.4/255.255.255.0) o una xarxa/CIDR (p. ex., 1.2.3.4/24). Es pot especificar esta opció moltes vegades</translation>
@@ -2971,10 +1718,6 @@
         <source>Bind to given address to listen for JSON-RPC connections. Use [host]:port notation for IPv6. This option can be specified multiple times (default: bind to all interfaces)</source>
         <translation>Vincula a l'adreça donada per a escoltar les connexions JSON-RPC. Feu servir la notació [host]:port per a IPv6. Esta opció pot ser especificada moltes vegades (per defecte: vincula a totes les interfícies)</translation>
     </message>
-    <message>
-        <source>Cannot obtain a lock on data directory %s. Bitcoin Core is probably already running.</source>
-        <translation>No es pot obtindre un bloqueig del directori de dades %s. El Bitcoin Core probablement ja s'estiga executant.</translation>
-    </message>
     <message>
         <source>Create new files with system default permissions, instead of umask 077 (only effective with disabled wallet functionality)</source>
         <translation>Crea fitxers nous amb els permisos per defecte del sistema, en comptes de l'umask 077 (només efectiu amb la funcionalitat de moneder inhabilitada)</translation>
@@ -3015,10 +1758,6 @@
         <source>Set maximum size of high-priority/low-fee transactions in bytes (default: %d)</source>
         <translation>Defineix la mida màxima de transaccions d'alta prioritat / baixa comissió en bytes (per defecte: %d)</translation>
     </message>
-    <message>
-        <source>Set the number of threads for coin generation if enabled (-1 = all cores, default: %d)</source>
-        <translation>Defineix el nombre de fils per a la generació de moneda si està habilitat (-1 = tots els nuclis, per defecte: %d)</translation>
-    </message>
     <message>
         <source>The transaction amount is too small to send after the fee has been deducted</source>
         <translation>L'import de la transacció és massa petit per enviar-la després que se'n deduïsca la comissió</translation>
@@ -3043,26 +1782,10 @@
         <source>Accept public REST requests (default: %u)</source>
         <translation>Accepta sol·licituds REST públiques (per defecte: %u)</translation>
     </message>
-    <message>
-        <source>Activating best chain...</source>
-        <translation>S'està activant la millor cadena...</translation>
-    </message>
-    <message>
-        <source>Cannot resolve -whitebind address: '%s'</source>
-        <translation>No es pot resoldre l'adreça -whitebind: «%s»</translation>
-    </message>
     <message>
         <source>Connect through SOCKS5 proxy</source>
         <translation>Connecta a través del proxy SOCKS5</translation>
     </message>
-    <message>
-        <source>Copyright (C) 2009-%i The Bitcoin Core Developers</source>
-        <translation>Copyright (C) 2009-%i Els desenvolupadors del Bitcoin Core</translation>
-    </message>
-    <message>
-        <source>Error loading wallet.dat: Wallet requires newer version of Bitcoin Core</source>
-        <translation>Error en carregar wallet.dat: el moneder requereix una versió més nova del Bitcoin core</translation>
-    </message>
     <message>
         <source>Error reading from database, shutting down.</source>
         <translation>Error en llegir la base de dades, tancant.</translation>
@@ -3071,22 +1794,6 @@
         <source>Information</source>
         <translation>&amp;Informació</translation>
     </message>
-    <message>
-        <source>Initialization sanity check failed. Bitcoin Core is shutting down.</source>
-        <translation>Ha fallat la inicialització de la comprovació de validesa. El Bitcoin Core s'està parant.</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -maxtxfee=&lt;amount&gt;: '%s'</source>
-        <translation>Import no vàlid per a -maxtxfee=&lt;amount&gt;: '%s'</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -minrelaytxfee=&lt;amount&gt;: '%s'</source>
-        <translation>Import no vàlid per a -minrelaytxfee=&lt;amount&gt;: «%s»</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -mintxfee=&lt;amount&gt;: '%s'</source>
-        <translation>Import no vàlid per a -mintxfee=&lt;amount&gt;: «%s»</translation>
-    </message>
     <message>
         <source>Invalid amount for -paytxfee=&lt;amount&gt;: '%s' (must be at least %s)</source>
         <translation>Import no vàlid per a -paytxfee=&lt;amount&gt;: «%s» (ha de ser com a mínim %s)</translation>
@@ -3111,14 +1818,6 @@
         <source>RPC server options:</source>
         <translation>Opcions del servidor RPC:</translation>
     </message>
-    <message>
-        <source>Rebuild block chain index from current blk000??.dat files on startup</source>
-        <translation>Reconstrueix l'índex de la cadena de blocs dels fitxers blk000??.dat actuals a l'inici.</translation>
-    </message>
-    <message>
-        <source>Receive and display P2P network alerts (default: %u)</source>
-        <translation>Rep i mostra avisos de la xarxa P2P (per defecte: %u)</translation>
-    </message>
     <message>
         <source>Send trace/debug info to console instead of debug.log file</source>
         <translation>Envia informació de traça/depuració a la consola en comptes del fitxer debug.log</translation>
@@ -3171,10 +1870,6 @@
         <source>Username for JSON-RPC connections</source>
         <translation>Nom d'usuari per a connexions JSON-RPC</translation>
     </message>
-    <message>
-        <source>Wallet needed to be rewritten: restart Bitcoin Core to complete</source>
-        <translation>Cal reescriure el moneder: reiniceu el Bitcoin Core per completar-ho.</translation>
-    </message>
     <message>
         <source>Warning</source>
         <translation>Avís</translation>
@@ -3183,10 +1878,6 @@
         <source>Zapping all transactions from wallet...</source>
         <translation>Se suprimeixen totes les transaccions del moneder...</translation>
     </message>
-    <message>
-        <source>wallet.dat corrupt, salvage failed</source>
-        <translation>El fitxer wallet.data és corrupte. El rescat de les dades ha fallat</translation>
-    </message>
     <message>
         <source>Password for JSON-RPC connections</source>
         <translation>Contrasenya per a connexions JSON-RPC</translation>
@@ -3195,10 +1886,6 @@
         <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
         <translation>Executa l'orde quan el millor bloc canvie (%s en cmd es reemplaça per un resum de bloc)</translation>
     </message>
-    <message>
-        <source>This help message</source>
-        <translation>Este misatge d'ajuda</translation>
-    </message>
     <message>
         <source>Allow DNS lookups for -addnode, -seednode and -connect</source>
         <translation>Permet consultes DNS per a -addnode, -seednode i -connect</translation>
@@ -3207,10 +1894,6 @@
         <source>Loading addresses...</source>
         <translation>S'estan carregant les adreces...</translation>
     </message>
-    <message>
-        <source>Error loading wallet.dat: Wallet corrupted</source>
-        <translation>Error en carregar wallet.dat: Moneder corrupte</translation>
-    </message>
     <message>
         <source>(1 = keep tx meta data e.g. account owner and payment request information, 2 = drop tx meta data)</source>
         <translation>(1 = manté les metadades de les tx, p. ex., propietari del compte i informació de sol·licitud del pagament, 2 = prescindeix de les metadades de les tx)</translation>
@@ -3243,14 +1926,6 @@
         <source>Always query for peer addresses via DNS lookup (default: %u)</source>
         <translation>Demana sempre les adreces dels iguals a través de consultes DNS (per defecte: %u)</translation>
     </message>
-    <message>
-        <source>Error loading wallet.dat</source>
-        <translation>Error en carregar wallet.dat</translation>
-    </message>
-    <message>
-        <source>Generate coins (default: %u)</source>
-        <translation>Genera monedes (per defecte: %u)</translation>
-    </message>
     <message>
         <source>How many blocks to check at startup (default: %u, 0 = all)</source>
         <translation>Quants blocs per comprovar a l'inici (per defecte: %u, 0 = tots)</translation>
@@ -3335,18 +2010,6 @@
         <source>Unknown network specified in -onlynet: '%s'</source>
         <translation>Xarxa desconeguda especificada a -onlynet: '%s'</translation>
     </message>
-    <message>
-        <source>Cannot resolve -bind address: '%s'</source>
-        <translation>No es pot resoldre l'adreça -bind: '%s'</translation>
-    </message>
-    <message>
-        <source>Cannot resolve -externalip address: '%s'</source>
-        <translation>No es pot resoldre l'adreça -externalip: '%s'</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -paytxfee=&lt;amount&gt;: '%s'</source>
-        <translation>Import no vàlid per a -paytxfee=&lt;amount&gt;: «%s»</translation>
-    </message>
     <message>
         <source>Insufficient funds</source>
         <translation>Balanç insuficient</translation>
diff --git a/src/qt/locale/bitcoin_ca_ES.ts b/src/qt/locale/bitcoin_ca_ES.ts
index 2c238bb44f34a..30004e10e405a 100644
--- a/src/qt/locale/bitcoin_ca_ES.ts
+++ b/src/qt/locale/bitcoin_ca_ES.ts
@@ -25,10 +25,6 @@
         <source>C&amp;lose</source>
         <translation>&amp;Tanca</translation>
     </message>
-    <message>
-        <source>&amp;Copy Address</source>
-        <translation>&amp;Copia l'adreça</translation>
-    </message>
     <message>
         <source>Delete the currently selected address from the list</source>
         <translation>Elimina l'adreça sel·leccionada actualment de la llista</translation>
@@ -45,73 +41,6 @@
         <source>&amp;Delete</source>
         <translation>&amp;Elimina</translation>
     </message>
-    <message>
-        <source>Choose the address to send coins to</source>
-        <translation>Trieu una adreça on voleu enviar monedes</translation>
-    </message>
-    <message>
-        <source>Choose the address to receive coins with</source>
-        <translation>Trieu l'adreça on voleu rebre monedes</translation>
-    </message>
-    <message>
-        <source>C&amp;hoose</source>
-        <translation>T&amp;ria</translation>
-    </message>
-    <message>
-        <source>Sending addresses</source>
-        <translation>S'estan enviant les adreces</translation>
-    </message>
-    <message>
-        <source>Receiving addresses</source>
-        <translation>S'estan rebent les adreces</translation>
-    </message>
-    <message>
-        <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source>
-        <translation>Aquestes són les vostres adreces de Bitcoin per enviar els pagaments. Sempre reviseu l'import i l'adreça del destinatari abans de transferir monedes.</translation>
-    </message>
-    <message>
-        <source>These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source>
-        <translation>Aquestes són les vostres adreces Bitcoin per rebre pagaments. Es recomana utilitzar una adreça nova de recepció per a cada transacció.</translation>
-    </message>
-    <message>
-        <source>Copy &amp;Label</source>
-        <translation>Copia l'&amp;etiqueta</translation>
-    </message>
-    <message>
-        <source>&amp;Edit</source>
-        <translation>&amp;Edita</translation>
-    </message>
-    <message>
-        <source>Export Address List</source>
-        <translation>Exporta la llista d'adreces</translation>
-    </message>
-    <message>
-        <source>Comma separated file (*.csv)</source>
-        <translation>Fitxer de separació amb comes (*.csv)</translation>
-    </message>
-    <message>
-        <source>Exporting Failed</source>
-        <translation>L'exportació ha fallat</translation>
-    </message>
-    <message>
-        <source>There was an error trying to save the address list to %1. Please try again.</source>
-        <translation>S'ha produït un error en desar la llista d'adreces a %1. Torneu-ho a provar.</translation>
-    </message>
-</context>
-<context>
-    <name>AddressTableModel</name>
-    <message>
-        <source>Label</source>
-        <translation>Etiqueta</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>Adreça</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(sense etiqueta)</translation>
-    </message>
 </context>
 <context>
     <name>AskPassphraseDialog</name>
@@ -131,94 +60,6 @@
         <source>Repeat new passphrase</source>
         <translation>Repetiu la nova contrasenya</translation>
     </message>
-    <message>
-        <source>Encrypt wallet</source>
-        <translation>Encripta el moneder</translation>
-    </message>
-    <message>
-        <source>This operation needs your wallet passphrase to unlock the wallet.</source>
-        <translation>Aquesta operació requereix la contrasenya del moneder per a desbloquejar-lo.</translation>
-    </message>
-    <message>
-        <source>Unlock wallet</source>
-        <translation>Desbloqueja el moneder</translation>
-    </message>
-    <message>
-        <source>This operation needs your wallet passphrase to decrypt the wallet.</source>
-        <translation>Aquesta operació requereix la contrasenya del moneder per desencriptar-lo.</translation>
-    </message>
-    <message>
-        <source>Decrypt wallet</source>
-        <translation>Desencripta el moneder</translation>
-    </message>
-    <message>
-        <source>Change passphrase</source>
-        <translation>Canvia la contrasenya</translation>
-    </message>
-    <message>
-        <source>Confirm wallet encryption</source>
-        <translation>Confirma l'encriptació del moneder</translation>
-    </message>
-    <message>
-        <source>Warning: If you encrypt your wallet and lose your passphrase, you will &lt;b&gt;LOSE ALL OF YOUR BITCOINS&lt;/b&gt;!</source>
-        <translation>Avís: si encripteu el vostre moneder i perdeu la contrasenya, &lt;b&gt;PERDREU TOTS ELS VOSTRES BITCOINS&lt;/b&gt;!</translation>
-    </message>
-    <message>
-        <source>Are you sure you wish to encrypt your wallet?</source>
-        <translation>Esteu segur que voleu encriptar el vostre moneder?</translation>
-    </message>
-    <message>
-        <source>Bitcoin Core will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source>
-        <translation>Ara es tancarà el Bitcoin Core per finalitzar el procés d'encriptació. Tingueu present que encriptar el vostre moneder no garanteix que les vostres bitcoins no puguin ser robades per programari maliciós que infecti l'ordinador.</translation>
-    </message>
-    <message>
-        <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source>
-        <translation>IMPORTANT: Tota copia de seguretat que hàgiu realitzat hauria de ser reemplaçada pel, recentment generat, fitxer encriptat del moneder.</translation>
-    </message>
-    <message>
-        <source>Warning: The Caps Lock key is on!</source>
-        <translation>Avís: Les lletres majúscules estan activades!</translation>
-    </message>
-    <message>
-        <source>Wallet encrypted</source>
-        <translation>Moneder encriptat</translation>
-    </message>
-    <message>
-        <source>Enter the new passphrase to the wallet.&lt;br/&gt;Please use a passphrase of &lt;b&gt;ten or more random characters&lt;/b&gt;, or &lt;b&gt;eight or more words&lt;/b&gt;.</source>
-        <translation>Introduïu la contrasenya nova al moneder.&lt;br/&gt;Utilitzeu una contrasenya de &lt;b&gt;deu o més caràcters aleatoris&lt;/b&gt;, o &lt;b&gt;vuit o més paraules&lt;/b&gt;.</translation>
-    </message>
-    <message>
-        <source>Enter the old passphrase and new passphrase to the wallet.</source>
-        <translation>Introduïu la contrasenya antiga i la contrasenya nova al moneder.</translation>
-    </message>
-    <message>
-        <source>Wallet encryption failed</source>
-        <translation>L'encriptació del moneder ha fallat</translation>
-    </message>
-    <message>
-        <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
-        <translation>L'encriptació del moneder ha fallat per un error intern. El moneder no ha estat encriptat.</translation>
-    </message>
-    <message>
-        <source>The supplied passphrases do not match.</source>
-        <translation>La contrasenya introduïda no coincideix.</translation>
-    </message>
-    <message>
-        <source>Wallet unlock failed</source>
-        <translation>El desbloqueig del moneder ha fallat</translation>
-    </message>
-    <message>
-        <source>The passphrase entered for the wallet decryption was incorrect.</source>
-        <translation>La contrasenya introduïda per a desencriptar el moneder és incorrecta.</translation>
-    </message>
-    <message>
-        <source>Wallet decryption failed</source>
-        <translation>La desencriptació del moneder ha fallat</translation>
-    </message>
-    <message>
-        <source>Wallet passphrase was successfully changed.</source>
-        <translation>La contrasenya del moneder ha estat modificada correctament.</translation>
-    </message>
 </context>
 <context>
     <name>BanTableModel</name>
@@ -305,14 +146,6 @@
         <source>Open &amp;URI...</source>
         <translation>Obre un &amp;URI...</translation>
     </message>
-    <message>
-        <source>Bitcoin Core client</source>
-        <translation>Client del Bitcoin Core</translation>
-    </message>
-    <message>
-        <source>Importing blocks from disk...</source>
-        <translation>S'estan important els blocs del disc...</translation>
-    </message>
     <message>
         <source>Reindexing blocks on disk...</source>
         <translation>S'estan reindexant els blocs al disc...</translation>
@@ -357,10 +190,6 @@
         <source>&amp;Receive</source>
         <translation>&amp;Rep</translation>
     </message>
-    <message>
-        <source>Show information about Bitcoin Core</source>
-        <translation>Mostra informació del Bitcoin Core</translation>
-    </message>
     <message>
         <source>&amp;Show / Hide</source>
         <translation>&amp;Mostra / Amaga</translation>
@@ -397,22 +226,10 @@
         <source>Tabs toolbar</source>
         <translation>Barra d'eines de les pestanyes</translation>
     </message>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Nucli de Bitcoin</translation>
-    </message>
     <message>
         <source>Request payments (generates QR codes and bitcoin: URIs)</source>
         <translation>Sol·licita pagaments (genera codis QR i bitcoin: URI)</translation>
     </message>
-    <message>
-        <source>&amp;About Bitcoin Core</source>
-        <translation>&amp;Quant al Bitcoin Core</translation>
-    </message>
-    <message>
-        <source>Modify configuration options for Bitcoin Core</source>
-        <translation>Modifica les opcions de configuració del Bitcoin Core</translation>
-    </message>
     <message>
         <source>Show the list of used sending addresses and labels</source>
         <translation>Mostra la llista d'adreces d'enviament i etiquetes utilitzades</translation>
@@ -429,10 +246,6 @@
         <source>&amp;Command-line options</source>
         <translation>Opcions de la &amp;línia d'ordres</translation>
     </message>
-    <message>
-        <source>Show the Bitcoin Core help message to get a list with possible Bitcoin command-line options</source>
-        <translation>Mostra el missatge d'ajuda del Bitcoin Core per obtenir una llista amb les possibles opcions de línia d'ordres de Bitcoin</translation>
-    </message>
     <message numerus="yes">
         <source>%n active connection(s) to Bitcoin network</source>
         <translation><numerusform>%n connexió activa a la xarxa Bitcoin</numerusform><numerusform>%n connexions actives a la xarxa Bitcoin</numerusform></translation>
@@ -544,13 +357,6 @@
         <translation>El moneder està &lt;b&gt;encriptat&lt;/b&gt; i actualment &lt;b&gt;bloquejat&lt;/b&gt;</translation>
     </message>
 </context>
-<context>
-    <name>ClientModel</name>
-    <message>
-        <source>Network Alert</source>
-        <translation>Alerta de xarxa</translation>
-    </message>
-</context>
 <context>
     <name>CoinControlDialog</name>
     <message>
@@ -629,150 +435,6 @@
         <source>Priority</source>
         <translation>Prioritat</translation>
     </message>
-    <message>
-        <source>Copy address</source>
-        <translation>Copiar adreça </translation>
-    </message>
-    <message>
-        <source>Copy label</source>
-        <translation>Copiar etiqueta</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>Copia l'import</translation>
-    </message>
-    <message>
-        <source>Copy transaction ID</source>
-        <translation>Copiar ID de transacció</translation>
-    </message>
-    <message>
-        <source>Lock unspent</source>
-        <translation>Bloqueja sense gastar</translation>
-    </message>
-    <message>
-        <source>Unlock unspent</source>
-        <translation>Desbloqueja sense gastar</translation>
-    </message>
-    <message>
-        <source>Copy quantity</source>
-        <translation>Copia la quantitat</translation>
-    </message>
-    <message>
-        <source>Copy fee</source>
-        <translation>Copia la comissió</translation>
-    </message>
-    <message>
-        <source>Copy after fee</source>
-        <translation>Copia la comissió posterior</translation>
-    </message>
-    <message>
-        <source>Copy bytes</source>
-        <translation>Copia els bytes</translation>
-    </message>
-    <message>
-        <source>Copy priority</source>
-        <translation>Copia la prioritat</translation>
-    </message>
-    <message>
-        <source>Copy dust</source>
-        <translation>Copia el polsim</translation>
-    </message>
-    <message>
-        <source>Copy change</source>
-        <translation>Copia el canvi</translation>
-    </message>
-    <message>
-        <source>highest</source>
-        <translation>El més alt</translation>
-    </message>
-    <message>
-        <source>higher</source>
-        <translation>Més alt</translation>
-    </message>
-    <message>
-        <source>high</source>
-        <translation>Alt</translation>
-    </message>
-    <message>
-        <source>medium-high</source>
-        <translation>mig-alt</translation>
-    </message>
-    <message>
-        <source>medium</source>
-        <translation>mig</translation>
-    </message>
-    <message>
-        <source>low-medium</source>
-        <translation>baix-mig</translation>
-    </message>
-    <message>
-        <source>low</source>
-        <translation>baix</translation>
-    </message>
-    <message>
-        <source>lower</source>
-        <translation>més baix</translation>
-    </message>
-    <message>
-        <source>lowest</source>
-        <translation>el més baix</translation>
-    </message>
-    <message>
-        <source>(%1 locked)</source>
-        <translation>(%1 bloquejada)</translation>
-    </message>
-    <message>
-        <source>none</source>
-        <translation>cap</translation>
-    </message>
-    <message>
-        <source>This label turns red if the transaction size is greater than 1000 bytes.</source>
-        <translation>Aquesta etiqueta es torna en vermell si la transacció és superior a 1000 bytes.</translation>
-    </message>
-    <message>
-        <source>This label turns red if the priority is smaller than "medium".</source>
-        <translation>Aquesta etiqueta es torna en vermell si la propietat és inferior que la «mitjana».</translation>
-    </message>
-    <message>
-        <source>This label turns red if any recipient receives an amount smaller than %1.</source>
-        <translation>Aquesta etiqueta es torna vermella si el destinatari rep un import inferior de %1.</translation>
-    </message>
-    <message>
-        <source>Can vary +/- %1 satoshi(s) per input.</source>
-        <translation>Pot variar +/- %1 satoshi(s) per entrada.</translation>
-    </message>
-    <message>
-        <source>yes</source>
-        <translation>sí</translation>
-    </message>
-    <message>
-        <source>no</source>
-        <translation>no</translation>
-    </message>
-    <message>
-        <source>This means a fee of at least %1 per kB is required.</source>
-        <translation>Això comporta una comissió d'almenys %1 per kB.</translation>
-    </message>
-    <message>
-        <source>Can vary +/- 1 byte per input.</source>
-        <translation>Pot variar +/- 1 byte per entrada.</translation>
-    </message>
-    <message>
-        <source>Transactions with higher priority are more likely to get included into a block.</source>
-        <translation>Les transaccions amb una major prioritat són més propenses a ser incloses en un bloc.</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(sense etiqueta)</translation>
-    </message>
-    <message>
-        <source>change from %1 (%2)</source>
-        <translation>canvia de %1 (%2)</translation>
-    </message>
-    <message>
-        <source>(change)</source>
-        <translation>(canvia)</translation>
-    </message>
 </context>
 <context>
     <name>EditAddressDialog</name>
@@ -796,38 +458,6 @@
         <source>&amp;Address</source>
         <translation>&amp;Adreça</translation>
     </message>
-    <message>
-        <source>New receiving address</source>
-        <translation>Nova adreça de recepció.</translation>
-    </message>
-    <message>
-        <source>New sending address</source>
-        <translation>Nova adreça d'enviament</translation>
-    </message>
-    <message>
-        <source>Edit receiving address</source>
-        <translation>Edita les adreces de recepció</translation>
-    </message>
-    <message>
-        <source>Edit sending address</source>
-        <translation>Edita les adreces d'enviament</translation>
-    </message>
-    <message>
-        <source>The entered address "%1" is already in the address book.</source>
-        <translation>L'adreça introduïda «%1» ja és present a la llibreta d'adreces.</translation>
-    </message>
-    <message>
-        <source>The entered address "%1" is not a valid Bitcoin address.</source>
-        <translation>L'adreça introduïda «%1» no és una adreça de Bitcoin vàlida.</translation>
-    </message>
-    <message>
-        <source>Could not unlock wallet.</source>
-        <translation>No s'ha pogut desbloquejar el moneder.</translation>
-    </message>
-    <message>
-        <source>New key generation failed.</source>
-        <translation>Ha fallat la generació d'una nova clau.</translation>
-    </message>
 </context>
 <context>
     <name>FreespaceChecker</name>
@@ -854,10 +484,6 @@
 </context>
 <context>
     <name>HelpMessageDialog</name>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Nucli de Bitcoin</translation>
-    </message>
     <message>
         <source>version</source>
         <translation>versió</translation>
@@ -866,10 +492,6 @@
         <source>(%1-bit)</source>
         <translation>(%1-bit)</translation>
     </message>
-    <message>
-        <source>About Bitcoin Core</source>
-        <translation>Quant al Bitcoin Core</translation>
-    </message>
     <message>
         <source>Command-line options</source>
         <translation>Opcions de línia d'ordres</translation>
@@ -906,29 +528,13 @@
         <source>Show splash screen on startup (default: %u)</source>
         <translation>Mostra la pantalla de benvinguda a l'inici (per defecte: %u)</translation>
     </message>
-    <message>
-        <source>Reset all settings changes made over the GUI</source>
-        <translation>Reinicialitza tots els canvis de configuració fets des de la interfície gràfica</translation>
-    </message>
-</context>
+    </context>
 <context>
     <name>Intro</name>
     <message>
         <source>Welcome</source>
         <translation>Us donem la benviguda</translation>
     </message>
-    <message>
-        <source>Welcome to Bitcoin Core.</source>
-        <translation>Us donem la benvinguda al Bitcoin Core.</translation>
-    </message>
-    <message>
-        <source>As this is the first time the program is launched, you can choose where Bitcoin Core will store its data.</source>
-        <translation>Atès que és la primera vegada que executeu el programa, podeu triar on emmagatzemarà el Bitcoin Core les dades.</translation>
-    </message>
-    <message>
-        <source>Bitcoin Core will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source>
-        <translation>El Bitcoin Core descarregarà i emmagatzemarà una còpia de la cadena de blocs de Bitcoin. Com a mínim s'emmagatzemaran %1 GB de dades en aquest directori, que seguiran creixent gradualment. També s'hi emmagatzemarà el moneder.</translation>
-    </message>
     <message>
         <source>Use the default data directory</source>
         <translation>Utilitza el directori de dades per defecte</translation>
@@ -937,10 +543,6 @@
         <source>Use a custom data directory:</source>
         <translation>Utilitza un directori de dades personalitzat:</translation>
     </message>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Nucli de Bitcoin</translation>
-    </message>
     <message>
         <source>Error: Specified data directory "%1" cannot be created.</source>
         <translation>Error: el directori de dades «%1» especificat no pot ser creat.</translation>
@@ -976,10 +578,6 @@
         <source>Select payment request file</source>
         <translation>Selecciona un fitxer de sol·licitud de pagament</translation>
     </message>
-    <message>
-        <source>Select payment request file to open</source>
-        <translation>Selecciona el fitxer de sol·licitud de pagament per obrir</translation>
-    </message>
 </context>
 <context>
     <name>OptionsDialog</name>
@@ -1019,10 +617,6 @@
         <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Exit in the menu.</source>
         <translation>Minimitza en comptes de sortir de l'aplicació quan la finestra es tanca. Quan s'habilita aquesta opció l'aplicació es tancara només quan se selecciona Surt del menú. </translation>
     </message>
-    <message>
-        <source>The user interface language can be set here. This setting will take effect after restarting Bitcoin Core.</source>
-        <translation>La interfície d'usuari pot definir-se des d'aquí. El paràmetre tindrà efecte després de reiniciar el Bitcoin Core.</translation>
-    </message>
     <message>
         <source>Third party URLs (e.g. a block explorer) that appear in the transactions tab as context menu items. %s in the URL is replaced by transaction hash. Multiple URLs are separated by vertical bar |.</source>
         <translation>URL de terceres parts (p. ex. explorador de blocs) que apareix en la pestanya de transaccions com elements del menú contextual. %s en l'URL es reemplaçat pel resum de la transacció. Diferents URL estan separades per una barra vertical |.</translation>
@@ -1047,14 +641,6 @@
         <source>&amp;Network</source>
         <translation>&amp;Xarxa</translation>
     </message>
-    <message>
-        <source>Automatically start Bitcoin Core after logging in to the system.</source>
-        <translation>Inicia el Bitcoin Core automàticament després d'iniciar una sessió en el sistema.</translation>
-    </message>
-    <message>
-        <source>&amp;Start Bitcoin Core on system login</source>
-        <translation>&amp;Inicia el Bitcoin Core en inciar el sistema</translation>
-    </message>
     <message>
         <source>(0 = auto, &lt;0 = leave that many cores free)</source>
         <translation>(0 = auto, &lt;0 = deixa tants nuclis lliures)</translation>
@@ -1284,186 +870,76 @@
     </message>
 </context>
 <context>
-    <name>PaymentServer</name>
+    <name>PeerTableModel</name>
     <message>
-        <source>URI handling</source>
-        <translation>Gestió d'URI</translation>
+        <source>User Agent</source>
+        <translation>Agent d'usuari</translation>
     </message>
     <message>
-        <source>Invalid payment address %1</source>
-        <translation>Adreça de pagament no vàlida %1</translation>
+        <source>Node/Service</source>
+        <translation>Node/Servei</translation>
     </message>
     <message>
-        <source>Payment request rejected</source>
-        <translation>La sol·licitud de pagament s'ha rebutjat</translation>
+        <source>Ping Time</source>
+        <translation>Temps de ping</translation>
     </message>
+</context>
+<context>
+    <name>QObject</name>
     <message>
-        <source>Payment request network doesn't match client network.</source>
-        <translation>La xarxa de la sol·licitud de pagament no coincideix amb la xarxa del client.</translation>
+        <source>Amount</source>
+        <translation>Import</translation>
     </message>
     <message>
-        <source>Payment request is not initialized.</source>
-        <translation>La sol·licitud de pagament no està inicialitzada.</translation>
+        <source>Enter a Bitcoin address (e.g. %1)</source>
+        <translation>Introduïu una adreça de Bitcoin (p. ex. %1)</translation>
     </message>
     <message>
-        <source>Requested payment amount of %1 is too small (considered dust).</source>
-        <translation>L'import de pagament sol·licitat %1 és massa petit (es considera polsim).</translation>
+        <source>%1 d</source>
+        <translation>%1 d</translation>
     </message>
     <message>
-        <source>Payment request error</source>
-        <translation>Error en la sol·licitud de pagament</translation>
+        <source>%1 h</source>
+        <translation>%1 h</translation>
     </message>
     <message>
-        <source>Cannot start bitcoin: click-to-pay handler</source>
-        <translation>No es pot iniciar bitcoin: gestor clica-per-pagar</translation>
+        <source>%1 m</source>
+        <translation>%1 m</translation>
     </message>
     <message>
-        <source>Payment request fetch URL is invalid: %1</source>
-        <translation>L'URL de recuperació de la sol·licitud de pagament no és vàlida: %1</translation>
+        <source>%1 s</source>
+        <translation>%1 s</translation>
     </message>
     <message>
-        <source>URI cannot be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source>
-        <translation>L'URI no pot ser analitzat! Això pot ser a causa d'una adreça de Bitcoin no vàlida o per paràmetres URI amb mal format.</translation>
+        <source>None</source>
+        <translation>Cap</translation>
     </message>
     <message>
-        <source>Payment request file handling</source>
-        <translation>Gestió de fitxers de les sol·licituds de pagament</translation>
+        <source>N/A</source>
+        <translation>N/A</translation>
     </message>
     <message>
-        <source>Payment request file cannot be read! This can be caused by an invalid payment request file.</source>
-        <translation>No es pot llegir el fitxer de la sol·licitud de pagament. Això pot ser causat per un fitxer de sol·licitud de pagament no vàlid.</translation>
+        <source>%1 ms</source>
+        <translation>%1 ms</translation>
     </message>
+</context>
+<context>
+    <name>RPCConsole</name>
     <message>
-        <source>Payment request expired.</source>
-        <translation>La sol·licitud de pagament ha vençut.</translation>
+        <source>Client name</source>
+        <translation>Nom del client</translation>
     </message>
     <message>
-        <source>Unverified payment requests to custom payment scripts are unsupported.</source>
-        <translation>No s'accepten sol·licituds de pagament no verificades a scripts de pagament personalitzats.</translation>
+        <source>N/A</source>
+        <translation>N/A</translation>
     </message>
     <message>
-        <source>Invalid payment request.</source>
-        <translation>Sol·licitud de pagament no vàlida.</translation>
+        <source>Client version</source>
+        <translation>Versió del client</translation>
     </message>
     <message>
-        <source>Refund from %1</source>
-        <translation>Reemborsament de %1</translation>
-    </message>
-    <message>
-        <source>Payment request %1 is too large (%2 bytes, allowed %3 bytes).</source>
-        <translation>La sol·licitud de pagament %1 és massa gran (%2 bytes, permès %3 bytes).</translation>
-    </message>
-    <message>
-        <source>Error communicating with %1: %2</source>
-        <translation>Error en comunicar amb %1: %2</translation>
-    </message>
-    <message>
-        <source>Payment request cannot be parsed!</source>
-        <translation>No es pot analitzar la sol·licitud de pagament!</translation>
-    </message>
-    <message>
-        <source>Bad response from server %1</source>
-        <translation>Mala resposta del servidor %1</translation>
-    </message>
-    <message>
-        <source>Payment acknowledged</source>
-        <translation>Pagament reconegut</translation>
-    </message>
-    <message>
-        <source>Network request error</source>
-        <translation>Error en la sol·licitud de xarxa</translation>
-    </message>
-</context>
-<context>
-    <name>PeerTableModel</name>
-    <message>
-        <source>User Agent</source>
-        <translation>Agent d'usuari</translation>
-    </message>
-    <message>
-        <source>Node/Service</source>
-        <translation>Node/Servei</translation>
-    </message>
-    <message>
-        <source>Ping Time</source>
-        <translation>Temps de ping</translation>
-    </message>
-</context>
-<context>
-    <name>QObject</name>
-    <message>
-        <source>Amount</source>
-        <translation>Import</translation>
-    </message>
-    <message>
-        <source>Enter a Bitcoin address (e.g. %1)</source>
-        <translation>Introduïu una adreça de Bitcoin (p. ex. %1)</translation>
-    </message>
-    <message>
-        <source>%1 d</source>
-        <translation>%1 d</translation>
-    </message>
-    <message>
-        <source>%1 h</source>
-        <translation>%1 h</translation>
-    </message>
-    <message>
-        <source>%1 m</source>
-        <translation>%1 m</translation>
-    </message>
-    <message>
-        <source>%1 s</source>
-        <translation>%1 s</translation>
-    </message>
-    <message>
-        <source>None</source>
-        <translation>Cap</translation>
-    </message>
-    <message>
-        <source>N/A</source>
-        <translation>N/A</translation>
-    </message>
-    <message>
-        <source>%1 ms</source>
-        <translation>%1 ms</translation>
-    </message>
-</context>
-<context>
-    <name>QRImageWidget</name>
-    <message>
-        <source>&amp;Save Image...</source>
-        <translation>De&amp;sa la imatge...</translation>
-    </message>
-    <message>
-        <source>&amp;Copy Image</source>
-        <translation>&amp;Copia la imatge</translation>
-    </message>
-    <message>
-        <source>Save QR Code</source>
-        <translation>Desa el codi QR</translation>
-    </message>
-    <message>
-        <source>PNG Image (*.png)</source>
-        <translation>Imatge PNG (*.png)</translation>
-    </message>
-</context>
-<context>
-    <name>RPCConsole</name>
-    <message>
-        <source>Client name</source>
-        <translation>Nom del client</translation>
-    </message>
-    <message>
-        <source>N/A</source>
-        <translation>N/A</translation>
-    </message>
-    <message>
-        <source>Client version</source>
-        <translation>Versió del client</translation>
-    </message>
-    <message>
-        <source>&amp;Information</source>
-        <translation>&amp;Informació</translation>
+        <source>&amp;Information</source>
+        <translation>&amp;Informació</translation>
     </message>
     <message>
         <source>Debug window</source>
@@ -1513,10 +989,6 @@
         <source>Memory usage</source>
         <translation>Us de memoria</translation>
     </message>
-    <message>
-        <source>Open the Bitcoin Core debug log file from the current data directory. This can take a few seconds for large log files.</source>
-        <translation>Obre el fitxer de registre de depuració del Bitcoin Core del directori de dades actual. Pot portar uns quants segons per a fitxers de registre grans.</translation>
-    </message>
     <message>
         <source>Received</source>
         <translation>Rebut</translation>
@@ -1633,10 +1105,6 @@
         <source>Out:</source>
         <translation>Fora:</translation>
     </message>
-    <message>
-        <source>Build date</source>
-        <translation>Data de compilació</translation>
-    </message>
     <message>
         <source>Debug log file</source>
         <translation>Fitxer de registre de depuració</translation>
@@ -1673,10 +1141,6 @@
         <source>&amp;Unban Node</source>
         <translation>&amp;Desbandeja el node</translation>
     </message>
-    <message>
-        <source>Welcome to the Bitcoin Core RPC console.</source>
-        <translation>Us donem la benviguda a la consola RPC del Bitcoin Core.</translation>
-    </message>
     <message>
         <source>Use up and down arrows to navigate history, and &lt;b&gt;Ctrl-L&lt;/b&gt; to clear screen.</source>
         <translation>Utilitza les fletxes d'amunt i avall per navegar per l'historial, i &lt;b&gt;Ctrl-L&lt;\b&gt; per netejar la pantalla.</translation>
@@ -1804,18 +1268,6 @@
         <source>Remove</source>
         <translation>Esborra</translation>
     </message>
-    <message>
-        <source>Copy label</source>
-        <translation>Copia l'etiqueta</translation>
-    </message>
-    <message>
-        <source>Copy message</source>
-        <translation>Copia el missatge</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>Copia l'import</translation>
-    </message>
 </context>
 <context>
     <name>ReceiveRequestDialog</name>
@@ -1835,73 +1287,6 @@
         <source>&amp;Save Image...</source>
         <translation>De&amp;sa la imatge...</translation>
     </message>
-    <message>
-        <source>Request payment to %1</source>
-        <translation>Sol·licita un pagament a %1</translation>
-    </message>
-    <message>
-        <source>Payment information</source>
-        <translation>Informació de pagament</translation>
-    </message>
-    <message>
-        <source>URI</source>
-        <translation>URI</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>Adreça</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>Import</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Etiqueta</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>Missatge</translation>
-    </message>
-    <message>
-        <source>Resulting URI too long, try to reduce the text for label / message.</source>
-        <translation>URI resultant massa llarga, intenta reduir el text per a la etiqueta / missatge</translation>
-    </message>
-    <message>
-        <source>Error encoding URI into QR Code.</source>
-        <translation>Error en codificar l'URI en un codi QR.</translation>
-    </message>
-</context>
-<context>
-    <name>RecentRequestsTableModel</name>
-    <message>
-        <source>Date</source>
-        <translation>Data</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Etiqueta</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>Missatge</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>Import</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(sense etiqueta)</translation>
-    </message>
-    <message>
-        <source>(no message)</source>
-        <translation>(sense missatge)</translation>
-    </message>
-    <message>
-        <source>(no amount)</source>
-        <translation>(sense import)</translation>
-    </message>
 </context>
 <context>
     <name>SendCoinsDialog</name>
@@ -2021,14 +1406,6 @@
         <source>fast</source>
         <translation>ràpid</translation>
     </message>
-    <message>
-        <source>Send as zero-fee transaction if possible</source>
-        <translation>Envia com a transacció de comissió zero si és possible</translation>
-    </message>
-    <message>
-        <source>(confirmation may take longer)</source>
-        <translation>(la confirmació pot trigar més temps)</translation>
-    </message>
     <message>
         <source>Send to multiple recipients at once</source>
         <translation>Envia a múltiples destinataris al mateix temps</translation>
@@ -2061,118 +1438,6 @@
         <source>S&amp;end</source>
         <translation>E&amp;nvia</translation>
     </message>
-    <message>
-        <source>Confirm send coins</source>
-        <translation>Confirma l'enviament de monedes</translation>
-    </message>
-    <message>
-        <source>%1 to %2</source>
-        <translation>%1 a %2</translation>
-    </message>
-    <message>
-        <source>Copy quantity</source>
-        <translation>Copia la quantitat</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>Copia l'import</translation>
-    </message>
-    <message>
-        <source>Copy fee</source>
-        <translation>Copia la comissió</translation>
-    </message>
-    <message>
-        <source>Copy after fee</source>
-        <translation>Copia la comissió posterior</translation>
-    </message>
-    <message>
-        <source>Copy bytes</source>
-        <translation>Copia els bytes</translation>
-    </message>
-    <message>
-        <source>Copy priority</source>
-        <translation>Copia la prioritat</translation>
-    </message>
-    <message>
-        <source>Copy change</source>
-        <translation>Copia el canvi</translation>
-    </message>
-    <message>
-        <source>Total Amount %1</source>
-        <translation>Import total %1</translation>
-    </message>
-    <message>
-        <source>or</source>
-        <translation>o</translation>
-    </message>
-    <message>
-        <source>The amount to pay must be larger than 0.</source>
-        <translation>L'import a pagar ha de ser major que 0.</translation>
-    </message>
-    <message>
-        <source>The amount exceeds your balance.</source>
-        <translation>L'import supera el vostre balanç.</translation>
-    </message>
-    <message>
-        <source>The total exceeds your balance when the %1 transaction fee is included.</source>
-        <translation>El total excedeix el teu balanç quan s'afegeix la comissió a la transacció %1.</translation>
-    </message>
-    <message>
-        <source>Transaction creation failed!</source>
-        <translation>Ha fallat la creació de la transacció!</translation>
-    </message>
-    <message>
-        <source>The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source>
-        <translation>S'ha rebutjat la transacció! Això pot passar si alguna de les monedes del vostre moneder ja s'han gastat; per exemple, si heu fet servir una còpia de seguretat del fitxer wallet.dat i s'haguessin gastat monedes de la còpia però sense marcar-les-hi com a gastades.</translation>
-    </message>
-    <message>
-        <source>A fee higher than %1 is considered an absurdly high fee.</source>
-        <translation>Una comissió superior a %1 es considera una comissió absurdament alta.</translation>
-    </message>
-    <message>
-        <source>Payment request expired.</source>
-        <translation>La sol·licitud de pagament ha vençut.</translation>
-    </message>
-    <message>
-        <source>Pay only the required fee of %1</source>
-        <translation>Paga només la comissió necessària de %1</translation>
-    </message>
-    <message numerus="yes">
-        <source>Estimated to begin confirmation within %n block(s).</source>
-        <translation><numerusform>Estimat per començar la confirmació en %n bloc.</numerusform><numerusform>Estimat per començar la confirmació en %n blocs.</numerusform></translation>
-    </message>
-    <message>
-        <source>The recipient address is not valid. Please recheck.</source>
-        <translation>L'adreça de destinatari no és vàlida. Torneu-la a comprovar.</translation>
-    </message>
-    <message>
-        <source>Duplicate address found: addresses should only be used once each.</source>
-        <translation>S'ha trobat una adreça duplicada: cal utilitzar les adreces només un cop cada vegada.</translation>
-    </message>
-    <message>
-        <source>Warning: Invalid Bitcoin address</source>
-        <translation>Avís: adreça Bitcoin no vàlida</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(sense etiqueta)</translation>
-    </message>
-    <message>
-        <source>Warning: Unknown change address</source>
-        <translation>Avís: adreça de canvi desconeguda</translation>
-    </message>
-    <message>
-        <source>Copy dust</source>
-        <translation>Copia el polsim</translation>
-    </message>
-    <message>
-        <source>Are you sure you want to send?</source>
-        <translation>Esteu segur que ho voleu enviar?</translation>
-    </message>
-    <message>
-        <source>added as transaction fee</source>
-        <translation>S'ha afegit una taxa de transacció</translation>
-    </message>
 </context>
 <context>
     <name>SendCoinsEntry</name>
@@ -2184,10 +1449,6 @@
         <source>Pay &amp;To:</source>
         <translation>Paga &amp;a:</translation>
     </message>
-    <message>
-        <source>Enter a label for this address to add it to your address book</source>
-        <translation>Introduïu una etiqueta per a aquesta adreça per afegir-la a la llibreta d'adreces</translation>
-    </message>
     <message>
         <source>&amp;Label:</source>
         <translation>&amp;Etiqueta:</translation>
@@ -2259,10 +1520,6 @@
 </context>
 <context>
     <name>ShutdownWindow</name>
-    <message>
-        <source>Bitcoin Core is shutting down...</source>
-        <translation>S'està aturant el Bitcoin Core...</translation>
-    </message>
     <message>
         <source>Do not shut down the computer until this window disappears.</source>
         <translation>No apagueu l'ordinador fins que no desaparegui aquesta finestra.</translation>
@@ -2354,598 +1611,72 @@
         <source>Reset all verify message fields</source>
         <translation>Neteja tots els camps de verificació de missatge</translation>
     </message>
+</context>
+<context>
+    <name>SplashScreen</name>
     <message>
-        <source>Click "Sign Message" to generate signature</source>
-        <translation>Feu clic a «Signa el missatge» per a generar una signatura</translation>
+        <source>[testnet]</source>
+        <translation>[testnet]</translation>
     </message>
+</context>
+<context>
+    <name>TrafficGraphWidget</name>
     <message>
-        <source>The entered address is invalid.</source>
-        <translation>L'adreça introduïda no és vàlida.</translation>
+        <source>KB/s</source>
+        <translation>KB/s</translation>
     </message>
+</context>
+<context>
+    <name>TransactionDescDialog</name>
     <message>
-        <source>Please check the address and try again.</source>
-        <translation>Comproveu l'adreça i torneu-ho a provar.</translation>
+        <source>This pane shows a detailed description of the transaction</source>
+        <translation>Aquest panell mostra una descripció detallada de la transacció</translation>
     </message>
+</context>
+<context>
+    <name>UnitDisplayStatusBarControl</name>
     <message>
-        <source>The entered address does not refer to a key.</source>
-        <translation>L'adreça introduïda no referencia a cap clau.</translation>
+        <source>Unit to show amounts in. Click to select another unit.</source>
+        <translation>Unitat en què mostrar els imports. Feu clic per seleccionar una altra unitat.</translation>
     </message>
+</context>
+<context>
+    <name>bitcoin-core</name>
     <message>
-        <source>Wallet unlock was cancelled.</source>
-        <translation>El desbloqueig del moneder ha estat cancelat.</translation>
+        <source>Options:</source>
+        <translation>Opcions:</translation>
     </message>
     <message>
-        <source>Private key for the entered address is not available.</source>
-        <translation>La clau privada per a la adreça introduïda no està disponible.</translation>
+        <source>Specify data directory</source>
+        <translation>Especifica el directori de dades</translation>
     </message>
     <message>
-        <source>Message signing failed.</source>
-        <translation>La signatura del missatge ha fallat.</translation>
+        <source>Connect to a node to retrieve peer addresses, and disconnect</source>
+        <translation>Connecta al node per obtenir les adreces de les connexions, i desconnecta</translation>
     </message>
     <message>
-        <source>Message signed.</source>
-        <translation>Missatge signat.</translation>
+        <source>Specify your own public address</source>
+        <translation>Especifiqueu la vostra adreça pública</translation>
     </message>
     <message>
-        <source>The signature could not be decoded.</source>
-        <translation>La signatura no s'ha pogut descodificar.</translation>
+        <source>Accept command line and JSON-RPC commands</source>
+        <translation>Accepta la línia d'ordres i ordres JSON-RPC </translation>
     </message>
     <message>
-        <source>Please check the signature and try again.</source>
-        <translation>Comproveu la signatura i torneu-ho a provar.</translation>
+        <source>If &lt;category&gt; is not supplied or if &lt;category&gt; = 1, output all debugging information.</source>
+        <translation>Si no es proporciona &lt;category&gt; o si &lt;category&gt; = 1, treu a la sortida tota la informació de depuració.</translation>
     </message>
     <message>
-        <source>The signature did not match the message digest.</source>
-        <translation>La signatura no coincideix amb el resum del missatge.</translation>
+        <source>Prune configured below the minimum of %d MiB.  Please use a higher number.</source>
+        <translation>Poda configurada per sota el mínim de %d MiB. Utilitzeu un nombre superior.</translation>
     </message>
     <message>
-        <source>Message verification failed.</source>
-        <translation>Ha fallat la verificació del missatge.</translation>
+        <source>Prune: last wallet synchronisation goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of pruned node)</source>
+        <translation>Poda: la darrera sincronització del moneder va més enllà de les dades podades. Cal que activeu -reindex (baixeu tota la cadena de blocs de nou en cas de node podat)</translation>
     </message>
     <message>
-        <source>Message verified.</source>
-        <translation>Missatge verificat.</translation>
-    </message>
-</context>
-<context>
-    <name>SplashScreen</name>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Bitcoin Core</translation>
-    </message>
-    <message>
-        <source>The Bitcoin Core developers</source>
-        <translation>Els desenvolupadors del Bitcoin Core</translation>
-    </message>
-    <message>
-        <source>[testnet]</source>
-        <translation>[testnet]</translation>
-    </message>
-</context>
-<context>
-    <name>TrafficGraphWidget</name>
-    <message>
-        <source>KB/s</source>
-        <translation>KB/s</translation>
-    </message>
-</context>
-<context>
-    <name>TransactionDesc</name>
-    <message>
-        <source>Open until %1</source>
-        <translation>Obert fins %1</translation>
-    </message>
-    <message>
-        <source>conflicted</source>
-        <translation>en conflicte</translation>
-    </message>
-    <message>
-        <source>%1/offline</source>
-        <translation>%1/fora de línia</translation>
-    </message>
-    <message>
-        <source>%1/unconfirmed</source>
-        <translation>%1/sense confirmar</translation>
-    </message>
-    <message>
-        <source>%1 confirmations</source>
-        <translation>%1 confirmacions</translation>
-    </message>
-    <message>
-        <source>Status</source>
-        <translation>Estat</translation>
-    </message>
-    <message numerus="yes">
-        <source>, broadcast through %n node(s)</source>
-        <translation><numerusform>, difusió a través de %n node</numerusform><numerusform>, difusió a través de %n nodes</numerusform></translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation>Data</translation>
-    </message>
-    <message>
-        <source>Source</source>
-        <translation>Font</translation>
-    </message>
-    <message>
-        <source>Generated</source>
-        <translation>Generat</translation>
-    </message>
-    <message>
-        <source>From</source>
-        <translation>Des de</translation>
-    </message>
-    <message>
-        <source>To</source>
-        <translation>A</translation>
-    </message>
-    <message>
-        <source>own address</source>
-        <translation>Adreça pròpia</translation>
-    </message>
-    <message>
-        <source>watch-only</source>
-        <translation>només lectura</translation>
-    </message>
-    <message>
-        <source>label</source>
-        <translation>etiqueta</translation>
-    </message>
-    <message>
-        <source>Credit</source>
-        <translation>Crèdit</translation>
-    </message>
-    <message numerus="yes">
-        <source>matures in %n more block(s)</source>
-        <translation><numerusform>disponible en %n bloc més</numerusform><numerusform>disponibles en %n blocs més</numerusform></translation>
-    </message>
-    <message>
-        <source>not accepted</source>
-        <translation>no acceptat</translation>
-    </message>
-    <message>
-        <source>Debit</source>
-        <translation>Dèbit</translation>
-    </message>
-    <message>
-        <source>Total debit</source>
-        <translation>Dèbit total</translation>
-    </message>
-    <message>
-        <source>Total credit</source>
-        <translation>Crèdit total</translation>
-    </message>
-    <message>
-        <source>Transaction fee</source>
-        <translation>Comissió de transacció</translation>
-    </message>
-    <message>
-        <source>Net amount</source>
-        <translation>Import net</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>Missatge</translation>
-    </message>
-    <message>
-        <source>Comment</source>
-        <translation>Comentar</translation>
-    </message>
-    <message>
-        <source>Transaction ID</source>
-        <translation>ID de transacció</translation>
-    </message>
-    <message>
-        <source>Merchant</source>
-        <translation>Mercader</translation>
-    </message>
-    <message>
-        <source>Generated coins must mature %1 blocks before they can be spent. When you generated this block, it was broadcast to the network to be added to the block chain. If it fails to get into the chain, its state will change to "not accepted" and it won't be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source>
-        <translation>Les monedes generades han de madurar %1 blocs abans de poder ser gastades. Quan genereu aquest bloc, es farà saber a la xarxa per tal d'afegir-lo a la cadena de blocs. Si no pot fer-se lloc a la cadena, el seu estat canviarà a «no acceptat» i no es podrà gastar. Això pot passar ocasionalment si un altre node genera un bloc en un marge de segons respecte al vostre.</translation>
-    </message>
-    <message>
-        <source>Debug information</source>
-        <translation>Informació de depuració</translation>
-    </message>
-    <message>
-        <source>Transaction</source>
-        <translation>Transacció</translation>
-    </message>
-    <message>
-        <source>Inputs</source>
-        <translation>Entrades</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>Import</translation>
-    </message>
-    <message>
-        <source>true</source>
-        <translation>cert</translation>
-    </message>
-    <message>
-        <source>false</source>
-        <translation>fals</translation>
-    </message>
-    <message>
-        <source>, has not been successfully broadcast yet</source>
-        <translation>, encara no ha estat emès correctement</translation>
-    </message>
-    <message numerus="yes">
-        <source>Open for %n more block(s)</source>
-        <translation><numerusform>Obre per %n bloc més</numerusform><numerusform>Obre per %n blocs més</numerusform></translation>
-    </message>
-    <message>
-        <source>unknown</source>
-        <translation>desconegut</translation>
-    </message>
-</context>
-<context>
-    <name>TransactionDescDialog</name>
-    <message>
-        <source>Transaction details</source>
-        <translation>Detall de la transacció</translation>
-    </message>
-    <message>
-        <source>This pane shows a detailed description of the transaction</source>
-        <translation>Aquest panell mostra una descripció detallada de la transacció</translation>
-    </message>
-</context>
-<context>
-    <name>TransactionTableModel</name>
-    <message>
-        <source>Date</source>
-        <translation>Data</translation>
-    </message>
-    <message>
-        <source>Type</source>
-        <translation>Tipus</translation>
-    </message>
-    <message>
-        <source>Immature (%1 confirmations, will be available after %2)</source>
-        <translation>Immadur (%1 confirmacions, serà disponible després de %2)</translation>
-    </message>
-    <message numerus="yes">
-        <source>Open for %n more block(s)</source>
-        <translation><numerusform>Obre per %n bloc més</numerusform><numerusform>Obre per %n blocs més</numerusform></translation>
-    </message>
-    <message>
-        <source>Open until %1</source>
-        <translation>Obert fins %1</translation>
-    </message>
-    <message>
-        <source>Confirmed (%1 confirmations)</source>
-        <translation>Confirmat (%1 confirmacions)</translation>
-    </message>
-    <message>
-        <source>This block was not received by any other nodes and will probably not be accepted!</source>
-        <translation>Aquest bloc no ha estat rebut per cap altre node i probablement no serà acceptat!</translation>
-    </message>
-    <message>
-        <source>Generated but not accepted</source>
-        <translation>Generat però no acceptat</translation>
-    </message>
-    <message>
-        <source>Offline</source>
-        <translation>Fora de línia</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Etiqueta</translation>
-    </message>
-    <message>
-        <source>Unconfirmed</source>
-        <translation>Sense confirmar</translation>
-    </message>
-    <message>
-        <source>Confirming (%1 of %2 recommended confirmations)</source>
-        <translation>Confirmant (%1 de %2 confirmacions recomanades)</translation>
-    </message>
-    <message>
-        <source>Conflicted</source>
-        <translation>En conflicte</translation>
-    </message>
-    <message>
-        <source>Received with</source>
-        <translation>Rebut amb</translation>
-    </message>
-    <message>
-        <source>Received from</source>
-        <translation>Rebut de</translation>
-    </message>
-    <message>
-        <source>Sent to</source>
-        <translation>Enviat a</translation>
-    </message>
-    <message>
-        <source>Payment to yourself</source>
-        <translation>Pagament a un mateix</translation>
-    </message>
-    <message>
-        <source>Mined</source>
-        <translation>Minat</translation>
-    </message>
-    <message>
-        <source>watch-only</source>
-        <translation>només lectura</translation>
-    </message>
-    <message>
-        <source>(n/a)</source>
-        <translation>(n/a)</translation>
-    </message>
-    <message>
-        <source>Transaction status. Hover over this field to show number of confirmations.</source>
-        <translation>Estat de la transacció. Desplaceu-vos sobre aquest camp per mostrar el nombre de confirmacions.</translation>
-    </message>
-    <message>
-        <source>Date and time that the transaction was received.</source>
-        <translation>Data i hora en que la transacció va ser rebuda.</translation>
-    </message>
-    <message>
-        <source>Type of transaction.</source>
-        <translation>Tipus de transacció.</translation>
-    </message>
-    <message>
-        <source>Whether or not a watch-only address is involved in this transaction.</source>
-        <translation>Si està implicada o no una adreça només de lectura en la transacció.</translation>
-    </message>
-    <message>
-        <source>User-defined intent/purpose of the transaction.</source>
-        <translation>Intenció/propòsit de la transacció definida per l'usuari.</translation>
-    </message>
-    <message>
-        <source>Amount removed from or added to balance.</source>
-        <translation>Import extret o afegit del balanç.</translation>
-    </message>
-</context>
-<context>
-    <name>TransactionView</name>
-    <message>
-        <source>All</source>
-        <translation>Tot</translation>
-    </message>
-    <message>
-        <source>Today</source>
-        <translation>Avui</translation>
-    </message>
-    <message>
-        <source>This week</source>
-        <translation>Aquesta setmana</translation>
-    </message>
-    <message>
-        <source>This month</source>
-        <translation>Aquest mes</translation>
-    </message>
-    <message>
-        <source>Last month</source>
-        <translation>El mes passat</translation>
-    </message>
-    <message>
-        <source>This year</source>
-        <translation>Enguany</translation>
-    </message>
-    <message>
-        <source>Range...</source>
-        <translation>Rang...</translation>
-    </message>
-    <message>
-        <source>Received with</source>
-        <translation>Rebut amb</translation>
-    </message>
-    <message>
-        <source>Sent to</source>
-        <translation>Enviat a</translation>
-    </message>
-    <message>
-        <source>To yourself</source>
-        <translation>A un mateix</translation>
-    </message>
-    <message>
-        <source>Mined</source>
-        <translation>Minat</translation>
-    </message>
-    <message>
-        <source>Other</source>
-        <translation>Altres</translation>
-    </message>
-    <message>
-        <source>Enter address or label to search</source>
-        <translation>Introduïu una adreça o una etiqueta per cercar</translation>
-    </message>
-    <message>
-        <source>Min amount</source>
-        <translation>Import mínim</translation>
-    </message>
-    <message>
-        <source>Copy address</source>
-        <translation>Copia l'adreça</translation>
-    </message>
-    <message>
-        <source>Copy label</source>
-        <translation>Copiar etiqueta</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>Copia l'import</translation>
-    </message>
-    <message>
-        <source>Copy transaction ID</source>
-        <translation>Copiar ID de transacció</translation>
-    </message>
-    <message>
-        <source>Copy raw transaction</source>
-        <translation>Copia la transacció crua</translation>
-    </message>
-    <message>
-        <source>Edit label</source>
-        <translation>Editar etiqueta</translation>
-    </message>
-    <message>
-        <source>Show transaction details</source>
-        <translation>Mostra detalls de la transacció</translation>
-    </message>
-    <message>
-        <source>Export Transaction History</source>
-        <translation>Exporta l'historial de transacció</translation>
-    </message>
-    <message>
-        <source>Watch-only</source>
-        <translation>Només de lectura</translation>
-    </message>
-    <message>
-        <source>Exporting Failed</source>
-        <translation>L'exportació ha fallat</translation>
-    </message>
-    <message>
-        <source>There was an error trying to save the transaction history to %1.</source>
-        <translation>S'ha produït un error en provar de desar l'historial de transacció a %1.</translation>
-    </message>
-    <message>
-        <source>Exporting Successful</source>
-        <translation>Exportació amb èxit</translation>
-    </message>
-    <message>
-        <source>The transaction history was successfully saved to %1.</source>
-        <translation>L'historial de transaccions s'ha desat correctament a %1.</translation>
-    </message>
-    <message>
-        <source>Comma separated file (*.csv)</source>
-        <translation>Fitxer separat per comes (*.csv)</translation>
-    </message>
-    <message>
-        <source>Confirmed</source>
-        <translation>Confirmat</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation>Data</translation>
-    </message>
-    <message>
-        <source>Type</source>
-        <translation>Tipus</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Etiqueta</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>Adreça</translation>
-    </message>
-    <message>
-        <source>ID</source>
-        <translation>ID</translation>
-    </message>
-    <message>
-        <source>Range:</source>
-        <translation>Rang:</translation>
-    </message>
-    <message>
-        <source>to</source>
-        <translation>a</translation>
-    </message>
-</context>
-<context>
-    <name>UnitDisplayStatusBarControl</name>
-    <message>
-        <source>Unit to show amounts in. Click to select another unit.</source>
-        <translation>Unitat en què mostrar els imports. Feu clic per seleccionar una altra unitat.</translation>
-    </message>
-</context>
-<context>
-    <name>WalletFrame</name>
-    <message>
-        <source>No wallet has been loaded.</source>
-        <translation>No s'ha carregat cap moneder.</translation>
-    </message>
-</context>
-<context>
-    <name>WalletModel</name>
-    <message>
-        <source>Send Coins</source>
-        <translation>Envia monedes</translation>
-    </message>
-</context>
-<context>
-    <name>WalletView</name>
-    <message>
-        <source>&amp;Export</source>
-        <translation>&amp;Exporta</translation>
-    </message>
-    <message>
-        <source>Export the data in the current tab to a file</source>
-        <translation>Exporta les dades de la pestanya actual a un fitxer</translation>
-    </message>
-    <message>
-        <source>Backup Wallet</source>
-        <translation>Còpia de seguretat del moneder</translation>
-    </message>
-    <message>
-        <source>Wallet Data (*.dat)</source>
-        <translation>Dades del moneder (*.dat)</translation>
-    </message>
-    <message>
-        <source>Backup Failed</source>
-        <translation>Ha fallat la còpia de seguretat</translation>
-    </message>
-    <message>
-        <source>There was an error trying to save the wallet data to %1.</source>
-        <translation>S'ha produït un error en provar de desar les dades del moneder a %1.</translation>
-    </message>
-    <message>
-        <source>The wallet data was successfully saved to %1.</source>
-        <translation>S'han desat les dades del moneder correctament a %1.</translation>
-    </message>
-    <message>
-        <source>Backup Successful</source>
-        <translation>La còpia de seguretat s'ha realitzat correctament</translation>
-    </message>
-</context>
-<context>
-    <name>bitcoin-core</name>
-    <message>
-        <source>Options:</source>
-        <translation>Opcions:</translation>
-    </message>
-    <message>
-        <source>Specify data directory</source>
-        <translation>Especifica el directori de dades</translation>
-    </message>
-    <message>
-        <source>Connect to a node to retrieve peer addresses, and disconnect</source>
-        <translation>Connecta al node per obtenir les adreces de les connexions, i desconnecta</translation>
-    </message>
-    <message>
-        <source>Specify your own public address</source>
-        <translation>Especifiqueu la vostra adreça pública</translation>
-    </message>
-    <message>
-        <source>Accept command line and JSON-RPC commands</source>
-        <translation>Accepta la línia d'ordres i ordres JSON-RPC </translation>
-    </message>
-    <message>
-        <source>If &lt;category&gt; is not supplied or if &lt;category&gt; = 1, output all debugging information.</source>
-        <translation>Si no es proporciona &lt;category&gt; o si &lt;category&gt; = 1, treu a la sortida tota la informació de depuració.</translation>
-    </message>
-    <message>
-        <source>Maximum total fees (in %s) to use in a single wallet transaction; setting this too low may abort large transactions (default: %s)</source>
-        <translation>Comissions totals màximes (en %s) per utilitzar en una única transacció de moneder; definir-ne una massa baixa pot interrompre les transaccions més grans (per defecte: %s)</translation>
-    </message>
-    <message>
-        <source>Please check that your computer's date and time are correct! If your clock is wrong Bitcoin Core will not work properly.</source>
-        <translation>Comproveu que la data i hora de l'ordinador són correctes! Si el vostre rellotge no té l'hora correcta, el Bitcoin Core no funcionarà adequadament.</translation>
-    </message>
-    <message>
-        <source>Prune configured below the minimum of %d MiB.  Please use a higher number.</source>
-        <translation>Poda configurada per sota el mínim de %d MiB. Utilitzeu un nombre superior.</translation>
-    </message>
-    <message>
-        <source>Prune: last wallet synchronisation goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of pruned node)</source>
-        <translation>Poda: la darrera sincronització del moneder va més enllà de les dades podades. Cal que activeu -reindex (baixeu tota la cadena de blocs de nou en cas de node podat)</translation>
-    </message>
-    <message>
-        <source>Reduce storage requirements by pruning (deleting) old blocks. This mode is incompatible with -txindex and -rescan. Warning: Reverting this setting requires re-downloading the entire blockchain. (default: 0 = disable pruning blocks, &gt;%u = target size in MiB to use for block files)</source>
-        <translation>Reduïu els requisits d'emmagatzematge podant (suprimint) els blocs antics. Aquest mode és incompatible amb -txindex i -rescan. Avís: la reversió d'aquest paràmetre implica haver de tornar a baixar la cadena de blocs sencera. (per defecte: 0 = inhabilita la poda de blocs, &gt;%u = mida objectiu en MiB per utilitzar en els fitxers de blocs)</translation>
+        <source>Reduce storage requirements by pruning (deleting) old blocks. This mode is incompatible with -txindex and -rescan. Warning: Reverting this setting requires re-downloading the entire blockchain. (default: 0 = disable pruning blocks, &gt;%u = target size in MiB to use for block files)</source>
+        <translation>Reduïu els requisits d'emmagatzematge podant (suprimint) els blocs antics. Aquest mode és incompatible amb -txindex i -rescan. Avís: la reversió d'aquest paràmetre implica haver de tornar a baixar la cadena de blocs sencera. (per defecte: 0 = inhabilita la poda de blocs, &gt;%u = mida objectiu en MiB per utilitzar en els fitxers de blocs)</translation>
     </message>
     <message>
         <source>Rescans are not possible in pruned mode. You will need to use -reindex which will download the whole blockchain again.</source>
@@ -2975,6 +1706,10 @@
         <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
         <translation>Accepta connexions de fora (per defecte: 1 si no -proxy o -connect)</translation>
     </message>
+    <message>
+        <source>Bitcoin Core</source>
+        <translation>Nucli de Bitcoin</translation>
+    </message>
     <message>
         <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source>
         <translation>Vincula a una adreça específica i sempre escolta-hi. Utilitza la notació [host]:port per IPv6</translation>
@@ -2999,10 +1734,6 @@
         <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
         <translation>Aquesta és una versió de pre-llançament - utilitza-la sota la teva responsabilitat - No usar per a minería o aplicacions de compra-venda</translation>
     </message>
-    <message>
-        <source>Unable to bind to %s on this computer. Bitcoin Core is probably already running.</source>
-        <translation>No es pot enllaçar %s a aquest ordinador. El Bitcoin Core probablement ja estigui executant-s'hi.</translation>
-    </message>
     <message>
         <source>WARNING: abnormally high number of blocks generated, %d blocks received in the last %d hours (%d expected)</source>
         <translation>AVÍS: s'ha generat un nombre anòmalament alt de blocs, %d blocs rebuts en les darreres %d hores (se n'esperaven %d)</translation>
@@ -3019,10 +1750,6 @@
         <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source>
         <translation>Avís: sembla que no estem plenament d'acord amb els nostres iguals! Podria caler que actualitzar l'aplicació, o potser que ho facin altres nodes.</translation>
     </message>
-    <message>
-        <source>Warning: wallet.dat corrupt, data salvaged! Original wallet.dat saved as wallet.{timestamp}.bak in %s; if your balance or transactions are incorrect you should restore from a backup.</source>
-        <translation>Avís: el fitxer wallet.dat és corrupte, dades rescatades! L'arxiu wallet.dat original ha estat desat com wallet.{estampa_temporal}.bak al directori %s; si el teu balanç o transaccions son incorrectes hauries de restaurar-lo de un backup.</translation>
-    </message>
     <message>
         <source>Whitelist peers connecting from the given netmask or IP address. Can be specified multiple times.</source>
         <translation>Afegeix a la llista blanca els iguals que es connecten de la màscara de xarxa o adreça IP donada. Es pot especificar moltes vegades.</translation>
@@ -3143,10 +1870,6 @@
         <source>Wallet options:</source>
         <translation>Opcions de moneder:</translation>
     </message>
-    <message>
-        <source>You need to rebuild the database using -reindex to change -txindex</source>
-        <translation>Cal que reconstruïu la base de dades fent servir -reindex per canviar -txindex</translation>
-    </message>
     <message>
         <source>Allow JSON-RPC connections from specified source. Valid for &lt;ip&gt; are a single IP (e.g. 1.2.3.4), a network/netmask (e.g. 1.2.3.4/255.255.255.0) or a network/CIDR (e.g. 1.2.3.4/24). This option can be specified multiple times</source>
         <translation>Permet les connexions JSON-RPC d'una font específica. Vàlid per a &lt;ip&gt; són una IP individual (p. ex., 1.2.3.4), una xarxa / màscara de xarxa (p. ex., 1.2.3.4/255.255.255.0) o una xarxa/CIDR (p. ex., 1.2.3.4/24). Es pot especificar aquesta opció moltes vegades</translation>
@@ -3159,10 +1882,6 @@
         <source>Bind to given address to listen for JSON-RPC connections. Use [host]:port notation for IPv6. This option can be specified multiple times (default: bind to all interfaces)</source>
         <translation>Vincula a l'adreça donada per a escoltar les connexions JSON-RPC. Feu servir la notació [host]:port per a IPv6. Aquesta opció pot ser especificada moltes vegades (per defecte: vincula a totes les interfícies)</translation>
     </message>
-    <message>
-        <source>Cannot obtain a lock on data directory %s. Bitcoin Core is probably already running.</source>
-        <translation>No es pot obtenir un bloqueig del directori de dades %s. El Bitcoin Core probablement ja s'estigui executant.</translation>
-    </message>
     <message>
         <source>Create new files with system default permissions, instead of umask 077 (only effective with disabled wallet functionality)</source>
         <translation>Crea fitxers nous amb els permisos per defecte del sistema, en comptes de l'umask 077 (només efectiu amb la funcionalitat de moneder inhabilitada)</translation>
@@ -3203,10 +1922,6 @@
         <source>Set maximum size of high-priority/low-fee transactions in bytes (default: %d)</source>
         <translation>Defineix la mida màxima de transaccions d'alta prioritat / baixa comissió en bytes (per defecte: %d)</translation>
     </message>
-    <message>
-        <source>Set the number of threads for coin generation if enabled (-1 = all cores, default: %d)</source>
-        <translation>Defineix el nombre de fils per a la generació de moneda si està habilitat (-1 = tots els nuclis, per defecte: %d)</translation>
-    </message>
     <message>
         <source>The transaction amount is too small to send after the fee has been deducted</source>
         <translation>L'import de la transacció és massa petit per enviar-la després que se'n dedueixi la comissió</translation>
@@ -3231,26 +1946,10 @@
         <source>Accept public REST requests (default: %u)</source>
         <translation>Accepta sol·licituds REST públiques (per defecte: %u)</translation>
     </message>
-    <message>
-        <source>Activating best chain...</source>
-        <translation>S'està activant la millor cadena...</translation>
-    </message>
-    <message>
-        <source>Cannot resolve -whitebind address: '%s'</source>
-        <translation>No es pot resoldre l'adreça -whitebind: «%s»</translation>
-    </message>
     <message>
         <source>Connect through SOCKS5 proxy</source>
         <translation>Connecta a través del proxy SOCKS5</translation>
     </message>
-    <message>
-        <source>Copyright (C) 2009-%i The Bitcoin Core Developers</source>
-        <translation>Copyright (C) 2009-%i Els desenvolupadors del Bitcoin Core</translation>
-    </message>
-    <message>
-        <source>Error loading wallet.dat: Wallet requires newer version of Bitcoin Core</source>
-        <translation>Error en carregar wallet.dat: el moneder requereix una versió més nova del Bitcoin core</translation>
-    </message>
     <message>
         <source>Error reading from database, shutting down.</source>
         <translation>Error en llegir la base de dades, tancant.</translation>
@@ -3259,22 +1958,6 @@
         <source>Information</source>
         <translation>&amp;Informació</translation>
     </message>
-    <message>
-        <source>Initialization sanity check failed. Bitcoin Core is shutting down.</source>
-        <translation>Ha fallat la inicialització de la comprovació de validesa. El Bitcoin Core s'està aturant.</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -maxtxfee=&lt;amount&gt;: '%s'</source>
-        <translation>Import no vàlid per a -maxtxfee=&lt;amount&gt;: '%s'</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -minrelaytxfee=&lt;amount&gt;: '%s'</source>
-        <translation>Import no vàlid per a -minrelaytxfee=&lt;amount&gt;: «%s»</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -mintxfee=&lt;amount&gt;: '%s'</source>
-        <translation>Import no vàlid per a -mintxfee=&lt;amount&gt;: «%s»</translation>
-    </message>
     <message>
         <source>Invalid amount for -paytxfee=&lt;amount&gt;: '%s' (must be at least %s)</source>
         <translation>Import no vàlid per a -paytxfee=&lt;amount&gt;: «%s» (ha de ser com a mínim %s)</translation>
@@ -3299,14 +1982,6 @@
         <source>RPC server options:</source>
         <translation>Opcions del servidor RPC:</translation>
     </message>
-    <message>
-        <source>Rebuild block chain index from current blk000??.dat files on startup</source>
-        <translation>Reconstrueix l'índex de la cadena de blocs dels fitxers blk000??.dat actuals a l'inici.</translation>
-    </message>
-    <message>
-        <source>Receive and display P2P network alerts (default: %u)</source>
-        <translation>Rep i mostra avisos de la xarxa P2P (per defecte: %u)</translation>
-    </message>
     <message>
         <source>Send trace/debug info to console instead of debug.log file</source>
         <translation>Envia informació de traça/depuració a la consola en comptes del fitxer debug.log</translation>
@@ -3359,10 +2034,6 @@
         <source>Username for JSON-RPC connections</source>
         <translation>Nom d'usuari per a connexions JSON-RPC</translation>
     </message>
-    <message>
-        <source>Wallet needed to be rewritten: restart Bitcoin Core to complete</source>
-        <translation>Cal reescriure el moneder: reiniceu el Bitcoin Core per completar-ho.</translation>
-    </message>
     <message>
         <source>Warning</source>
         <translation>Avís</translation>
@@ -3371,10 +2042,6 @@
         <source>Zapping all transactions from wallet...</source>
         <translation>Se suprimeixen totes les transaccions del moneder...</translation>
     </message>
-    <message>
-        <source>wallet.dat corrupt, salvage failed</source>
-        <translation>El fitxer wallet.data és corrupte. El rescat de les dades ha fallat</translation>
-    </message>
     <message>
         <source>Password for JSON-RPC connections</source>
         <translation>Contrasenya per a connexions JSON-RPC</translation>
@@ -3383,10 +2050,6 @@
         <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
         <translation>Executa l'ordre quan el millor bloc canviï (%s en cmd es reemplaça per un resum de bloc)</translation>
     </message>
-    <message>
-        <source>This help message</source>
-        <translation>Aquest misatge d'ajuda</translation>
-    </message>
     <message>
         <source>Allow DNS lookups for -addnode, -seednode and -connect</source>
         <translation>Permet consultes DNS per a -addnode, -seednode i -connect</translation>
@@ -3395,10 +2058,6 @@
         <source>Loading addresses...</source>
         <translation>S'estan carregant les adreces...</translation>
     </message>
-    <message>
-        <source>Error loading wallet.dat: Wallet corrupted</source>
-        <translation>Error en carregar wallet.dat: Moneder corrupte</translation>
-    </message>
     <message>
         <source>(1 = keep tx meta data e.g. account owner and payment request information, 2 = drop tx meta data)</source>
         <translation>(1 = manté les metadades de les tx, p. ex., propietari del compte i informació de sol·licitud del pagament, 2 = prescindeix de les metadades de les tx)</translation>
@@ -3431,14 +2090,6 @@
         <source>Always query for peer addresses via DNS lookup (default: %u)</source>
         <translation>Demana sempre les adreces dels iguals a través de consultes DNS (per defecte: %u)</translation>
     </message>
-    <message>
-        <source>Error loading wallet.dat</source>
-        <translation>Error en carregar wallet.dat</translation>
-    </message>
-    <message>
-        <source>Generate coins (default: %u)</source>
-        <translation>Genera monedes (per defecte: %u)</translation>
-    </message>
     <message>
         <source>How many blocks to check at startup (default: %u, 0 = all)</source>
         <translation>Quants blocs per comprovar a l'inici (per defecte: %u, 0 = tots)</translation>
@@ -3523,18 +2174,6 @@
         <source>Unknown network specified in -onlynet: '%s'</source>
         <translation>Xarxa desconeguda especificada a -onlynet: '%s'</translation>
     </message>
-    <message>
-        <source>Cannot resolve -bind address: '%s'</source>
-        <translation>No es pot resoldre l'adreça -bind: '%s'</translation>
-    </message>
-    <message>
-        <source>Cannot resolve -externalip address: '%s'</source>
-        <translation>No es pot resoldre l'adreça -externalip: '%s'</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -paytxfee=&lt;amount&gt;: '%s'</source>
-        <translation>Import no vàlid per a -paytxfee=&lt;amount&gt;: «%s»</translation>
-    </message>
     <message>
         <source>Insufficient funds</source>
         <translation>Balanç insuficient</translation>
diff --git a/src/qt/locale/bitcoin_cs.ts b/src/qt/locale/bitcoin_cs.ts
index d3ff5c1f57d64..d76839723fc0e 100644
--- a/src/qt/locale/bitcoin_cs.ts
+++ b/src/qt/locale/bitcoin_cs.ts
@@ -25,10 +25,6 @@
         <source>C&amp;lose</source>
         <translation>&amp;Zavřít</translation>
     </message>
-    <message>
-        <source>&amp;Copy Address</source>
-        <translation>&amp;Kopíruj adresu</translation>
-    </message>
     <message>
         <source>Delete the currently selected address from the list</source>
         <translation>Smaž zvolenou adresu ze seznamu</translation>
@@ -45,73 +41,6 @@
         <source>&amp;Delete</source>
         <translation>S&amp;maž</translation>
     </message>
-    <message>
-        <source>Choose the address to send coins to</source>
-        <translation>Zvol adresu, na kterou pošleš mince</translation>
-    </message>
-    <message>
-        <source>Choose the address to receive coins with</source>
-        <translation>Zvol adres na příjem mincí</translation>
-    </message>
-    <message>
-        <source>C&amp;hoose</source>
-        <translation>&amp;Zvol</translation>
-    </message>
-    <message>
-        <source>Sending addresses</source>
-        <translation>Odesílací adresy</translation>
-    </message>
-    <message>
-        <source>Receiving addresses</source>
-        <translation>Přijímací adresy</translation>
-    </message>
-    <message>
-        <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source>
-        <translation>Tohle jsou tvé Bitcoinové adresy pro posílání plateb. Před odesláním mincí si vždy zkontroluj částku a cílovou adresu.</translation>
-    </message>
-    <message>
-        <source>These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source>
-        <translation>Tohle jsou tvé Bitcoinové adresy pro příjem plateb. Nezapomeň si pro každou transakci vždy vygenerovat novou adresu.</translation>
-    </message>
-    <message>
-        <source>Copy &amp;Label</source>
-        <translation>Kopíruj &amp;označení</translation>
-    </message>
-    <message>
-        <source>&amp;Edit</source>
-        <translation>&amp;Uprav</translation>
-    </message>
-    <message>
-        <source>Export Address List</source>
-        <translation>Export seznamu adres</translation>
-    </message>
-    <message>
-        <source>Comma separated file (*.csv)</source>
-        <translation>Formát CSV (*.csv)</translation>
-    </message>
-    <message>
-        <source>Exporting Failed</source>
-        <translation>Exportování selhalo</translation>
-    </message>
-    <message>
-        <source>There was an error trying to save the address list to %1. Please try again.</source>
-        <translation>Při ukládání seznamu adres do %1 se přihodila nějaká chyba. Zkus to prosím znovu.</translation>
-    </message>
-</context>
-<context>
-    <name>AddressTableModel</name>
-    <message>
-        <source>Label</source>
-        <translation>Označení</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>Adresa</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(bez označení)</translation>
-    </message>
 </context>
 <context>
     <name>AskPassphraseDialog</name>
@@ -131,94 +60,6 @@
         <source>Repeat new passphrase</source>
         <translation>Totéž heslo ještě jednou</translation>
     </message>
-    <message>
-        <source>Encrypt wallet</source>
-        <translation>Zašifruj peněženku</translation>
-    </message>
-    <message>
-        <source>This operation needs your wallet passphrase to unlock the wallet.</source>
-        <translation>K provedení této operace musíš zadat heslo k peněžence, aby se mohla odemknout.</translation>
-    </message>
-    <message>
-        <source>Unlock wallet</source>
-        <translation>Odemkni peněženku</translation>
-    </message>
-    <message>
-        <source>This operation needs your wallet passphrase to decrypt the wallet.</source>
-        <translation>K provedení této operace musíš zadat heslo k peněžence, aby se mohla dešifrovat.</translation>
-    </message>
-    <message>
-        <source>Decrypt wallet</source>
-        <translation>Dešifruj peněženku</translation>
-    </message>
-    <message>
-        <source>Change passphrase</source>
-        <translation>Změň heslo</translation>
-    </message>
-    <message>
-        <source>Confirm wallet encryption</source>
-        <translation>Potvrď zašifrování peněženky</translation>
-    </message>
-    <message>
-        <source>Warning: If you encrypt your wallet and lose your passphrase, you will &lt;b&gt;LOSE ALL OF YOUR BITCOINS&lt;/b&gt;!</source>
-        <translation>Upozornění: Pokud si zašifruješ peněženku a ztratíš či zapomeneš heslo, &lt;b&gt;PŘIJDEŠ O VŠECHNY BITCOINY&lt;/b&gt;!</translation>
-    </message>
-    <message>
-        <source>Are you sure you wish to encrypt your wallet?</source>
-        <translation>Jsi si jistý, že chceš peněženku zašifrovat?</translation>
-    </message>
-    <message>
-        <source>Bitcoin Core will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source>
-        <translation>Bitcoin Core se teď ukončí, aby dokončil zašifrování. Pamatuj však, že pouhé zašifrování peněženky nemůže zabránit krádeži tvých bitcoinů malwarem, kterým se může počítač nakazit.</translation>
-    </message>
-    <message>
-        <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source>
-        <translation>DŮLEŽITÉ: Všechny předchozí zálohy peněženky by měly být nahrazeny nově vygenerovanou, zašifrovanou peněženkou. Z bezpečnostních důvodů budou předchozí zálohy nešifrované peněženky nepoužitelné, jakmile začneš používat novou zašifrovanou peněženku.</translation>
-    </message>
-    <message>
-        <source>Warning: The Caps Lock key is on!</source>
-        <translation>Upozornění: Caps Lock je zapnutý!</translation>
-    </message>
-    <message>
-        <source>Wallet encrypted</source>
-        <translation>Peněženka je zašifrována</translation>
-    </message>
-    <message>
-        <source>Enter the new passphrase to the wallet.&lt;br/&gt;Please use a passphrase of &lt;b&gt;ten or more random characters&lt;/b&gt;, or &lt;b&gt;eight or more words&lt;/b&gt;.</source>
-        <translation>Zadej nové heslo k peněžence.&lt;br/&gt;Použij &lt;b&gt;alespoň deset náhodných znaků&lt;/b&gt; nebo &lt;b&gt;alespoň osm slov&lt;/b&gt;.</translation>
-    </message>
-    <message>
-        <source>Enter the old passphrase and new passphrase to the wallet.</source>
-        <translation>Zadej staré a nové heslo k peněžence.</translation>
-    </message>
-    <message>
-        <source>Wallet encryption failed</source>
-        <translation>Zašifrování peněženky selhalo</translation>
-    </message>
-    <message>
-        <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
-        <translation>Zašifrování peněženky selhalo kvůli vnitřní chybě. Tvá peněženka tedy nebyla zašifrována.</translation>
-    </message>
-    <message>
-        <source>The supplied passphrases do not match.</source>
-        <translation>Zadaná hesla nejsou shodná.</translation>
-    </message>
-    <message>
-        <source>Wallet unlock failed</source>
-        <translation>Nepodařilo se odemknout peněženku</translation>
-    </message>
-    <message>
-        <source>The passphrase entered for the wallet decryption was incorrect.</source>
-        <translation>Nezadal jsi správné heslo pro dešifrování peněženky.</translation>
-    </message>
-    <message>
-        <source>Wallet decryption failed</source>
-        <translation>Nepodařilo se dešifrovat peněženku</translation>
-    </message>
-    <message>
-        <source>Wallet passphrase was successfully changed.</source>
-        <translation>Heslo k peněžence bylo v pořádku změněno.</translation>
-    </message>
 </context>
 <context>
     <name>BanTableModel</name>
@@ -297,14 +138,6 @@
         <source>Open &amp;URI...</source>
         <translation>Načíst &amp;URI...</translation>
     </message>
-    <message>
-        <source>Bitcoin Core client</source>
-        <translation>Bitcoin Core klient</translation>
-    </message>
-    <message>
-        <source>Importing blocks from disk...</source>
-        <translation>Importuji bloky z disku...</translation>
-    </message>
     <message>
         <source>Reindexing blocks on disk...</source>
         <translation>Vytvářím nový index bloků na disku...</translation>
@@ -349,10 +182,6 @@
         <source>&amp;Receive</source>
         <translation>Při&amp;jmi</translation>
     </message>
-    <message>
-        <source>Show information about Bitcoin Core</source>
-        <translation>Zobraz informace o Bitcoin Core</translation>
-    </message>
     <message>
         <source>&amp;Show / Hide</source>
         <translation>&amp;Zobraz/Skryj</translation>
@@ -389,22 +218,10 @@
         <source>Tabs toolbar</source>
         <translation>Panel s listy</translation>
     </message>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Bitcoin Core</translation>
-    </message>
     <message>
         <source>Request payments (generates QR codes and bitcoin: URIs)</source>
         <translation>Požaduj platby (generuje QR kódy a bitcoin: URI)</translation>
     </message>
-    <message>
-        <source>&amp;About Bitcoin Core</source>
-        <translation>O &amp;Bitcoin Core</translation>
-    </message>
-    <message>
-        <source>Modify configuration options for Bitcoin Core</source>
-        <translation>Uprav nastavení Bitcoin Core</translation>
-    </message>
     <message>
         <source>Show the list of used sending addresses and labels</source>
         <translation>Ukaž seznam použitých odesílacích adres a jejich označení</translation>
@@ -421,10 +238,6 @@
         <source>&amp;Command-line options</source>
         <translation>Ar&amp;gumenty příkazové řádky</translation>
     </message>
-    <message>
-        <source>Show the Bitcoin Core help message to get a list with possible Bitcoin command-line options</source>
-        <translation>Seznam argumentů Bitcoinu pro příkazovou řádku získáš v nápovědě Bitcoinu Core</translation>
-    </message>
     <message numerus="yes">
         <source>%n active connection(s) to Bitcoin network</source>
         <translation><numerusform>%n aktivní spojení do Bitcoinové sítě</numerusform><numerusform>%n aktivní spojení do Bitcoinové sítě</numerusform><numerusform>%n aktivních spojení do Bitcoinové sítě</numerusform></translation>
@@ -536,13 +349,6 @@
         <translation>Peněženka je &lt;b&gt;zašifrovaná&lt;/b&gt; a momentálně &lt;b&gt;zamčená&lt;/b&gt;</translation>
     </message>
 </context>
-<context>
-    <name>ClientModel</name>
-    <message>
-        <source>Network Alert</source>
-        <translation>Upozornění sítě</translation>
-    </message>
-</context>
 <context>
     <name>CoinControlDialog</name>
     <message>
@@ -621,150 +427,6 @@
         <source>Priority</source>
         <translation>Priorita</translation>
     </message>
-    <message>
-        <source>Copy address</source>
-        <translation>Kopíruj adresu</translation>
-    </message>
-    <message>
-        <source>Copy label</source>
-        <translation>Kopíruj její označení</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>Kopíruj částku</translation>
-    </message>
-    <message>
-        <source>Copy transaction ID</source>
-        <translation>Kopíruj ID transakce</translation>
-    </message>
-    <message>
-        <source>Lock unspent</source>
-        <translation>Zamkni neutracené</translation>
-    </message>
-    <message>
-        <source>Unlock unspent</source>
-        <translation>Odemkni k utracení</translation>
-    </message>
-    <message>
-        <source>Copy quantity</source>
-        <translation>Kopíruj počet</translation>
-    </message>
-    <message>
-        <source>Copy fee</source>
-        <translation>Kopíruj poplatek</translation>
-    </message>
-    <message>
-        <source>Copy after fee</source>
-        <translation>Kopíruj čistou částku</translation>
-    </message>
-    <message>
-        <source>Copy bytes</source>
-        <translation>Kopíruj bajty</translation>
-    </message>
-    <message>
-        <source>Copy priority</source>
-        <translation>Kopíruj prioritu</translation>
-    </message>
-    <message>
-        <source>Copy dust</source>
-        <translation>Kopíruj prach</translation>
-    </message>
-    <message>
-        <source>Copy change</source>
-        <translation>Kopíruj drobné</translation>
-    </message>
-    <message>
-        <source>highest</source>
-        <translation>nejvyšší</translation>
-    </message>
-    <message>
-        <source>higher</source>
-        <translation>vyšší</translation>
-    </message>
-    <message>
-        <source>high</source>
-        <translation>vysoká</translation>
-    </message>
-    <message>
-        <source>medium-high</source>
-        <translation>vyšší střední</translation>
-    </message>
-    <message>
-        <source>medium</source>
-        <translation>střední</translation>
-    </message>
-    <message>
-        <source>low-medium</source>
-        <translation>nižší střední</translation>
-    </message>
-    <message>
-        <source>low</source>
-        <translation>nízká</translation>
-    </message>
-    <message>
-        <source>lower</source>
-        <translation>nižší</translation>
-    </message>
-    <message>
-        <source>lowest</source>
-        <translation>nejnižší</translation>
-    </message>
-    <message>
-        <source>(%1 locked)</source>
-        <translation>(%1 zamčeno)</translation>
-    </message>
-    <message>
-        <source>none</source>
-        <translation>žádná</translation>
-    </message>
-    <message>
-        <source>This label turns red if the transaction size is greater than 1000 bytes.</source>
-        <translation>Popisek zčervená, pokud je velikost transakce větší než 1000 bajtů.</translation>
-    </message>
-    <message>
-        <source>This label turns red if the priority is smaller than "medium".</source>
-        <translation>Popisek zčervená, pokud je priorita menší než „střední“.</translation>
-    </message>
-    <message>
-        <source>This label turns red if any recipient receives an amount smaller than %1.</source>
-        <translation>Popisek zčervená, pokud má některý příjemce obdržet částku menší než %1.</translation>
-    </message>
-    <message>
-        <source>Can vary +/- %1 satoshi(s) per input.</source>
-        <translation>Může se lišit o +/– %1 satoshi na každý vstup.</translation>
-    </message>
-    <message>
-        <source>yes</source>
-        <translation>ano</translation>
-    </message>
-    <message>
-        <source>no</source>
-        <translation>ne</translation>
-    </message>
-    <message>
-        <source>This means a fee of at least %1 per kB is required.</source>
-        <translation>To znamená, že je vyžadován poplatek alespoň %1 za kB.</translation>
-    </message>
-    <message>
-        <source>Can vary +/- 1 byte per input.</source>
-        <translation>Může se lišit o +/– 1 bajt na každý vstup.</translation>
-    </message>
-    <message>
-        <source>Transactions with higher priority are more likely to get included into a block.</source>
-        <translation>Transakce s vyšší prioritou mají větší šanci na zařazení do bloku.</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(bez označení)</translation>
-    </message>
-    <message>
-        <source>change from %1 (%2)</source>
-        <translation>drobné z %1 (%2)</translation>
-    </message>
-    <message>
-        <source>(change)</source>
-        <translation>(drobné)</translation>
-    </message>
 </context>
 <context>
     <name>EditAddressDialog</name>
@@ -788,38 +450,6 @@
         <source>&amp;Address</source>
         <translation>&amp;Adresa</translation>
     </message>
-    <message>
-        <source>New receiving address</source>
-        <translation>Nová přijímací adresa</translation>
-    </message>
-    <message>
-        <source>New sending address</source>
-        <translation>Nová odesílací adresa</translation>
-    </message>
-    <message>
-        <source>Edit receiving address</source>
-        <translation>Uprav přijímací adresu</translation>
-    </message>
-    <message>
-        <source>Edit sending address</source>
-        <translation>Uprav odesílací adresu</translation>
-    </message>
-    <message>
-        <source>The entered address "%1" is already in the address book.</source>
-        <translation>Zadaná adresa „%1“ už v adresáři je.</translation>
-    </message>
-    <message>
-        <source>The entered address "%1" is not a valid Bitcoin address.</source>
-        <translation>Zadaná adresa „%1“ není platná Bitcoinová adresa.</translation>
-    </message>
-    <message>
-        <source>Could not unlock wallet.</source>
-        <translation>Nemohu odemknout peněženku.</translation>
-    </message>
-    <message>
-        <source>New key generation failed.</source>
-        <translation>Nepodařilo se mi vygenerovat nový klíč.</translation>
-    </message>
 </context>
 <context>
     <name>FreespaceChecker</name>
@@ -846,10 +476,6 @@
 </context>
 <context>
     <name>HelpMessageDialog</name>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Bitcoin Core</translation>
-    </message>
     <message>
         <source>version</source>
         <translation>verze</translation>
@@ -858,10 +484,6 @@
         <source>(%1-bit)</source>
         <translation>(%1-bit)</translation>
     </message>
-    <message>
-        <source>About Bitcoin Core</source>
-        <translation>O Bitcoin Core</translation>
-    </message>
     <message>
         <source>Command-line options</source>
         <translation>Argumenty příkazové řádky</translation>
@@ -898,29 +520,13 @@
         <source>Show splash screen on startup (default: %u)</source>
         <translation>Zobrazit startovací obrazovku (výchozí: %u)</translation>
     </message>
-    <message>
-        <source>Reset all settings changes made over the GUI</source>
-        <translation>Resetovat všechna nastavení provedené v GUI</translation>
-    </message>
-</context>
+    </context>
 <context>
     <name>Intro</name>
     <message>
         <source>Welcome</source>
         <translation>Vítej</translation>
     </message>
-    <message>
-        <source>Welcome to Bitcoin Core.</source>
-        <translation>Vítej v Bitcoin Core.</translation>
-    </message>
-    <message>
-        <source>As this is the first time the program is launched, you can choose where Bitcoin Core will store its data.</source>
-        <translation>Tohle je poprvé, co spouštíš Bitcoin Core, takže si můžeš zvolit, kam bude ukládat svá data.</translation>
-    </message>
-    <message>
-        <source>Bitcoin Core will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source>
-        <translation>Bitcoin Core bude stahovat kopii řetězce bloků. Proto bude potřeba do tohoto adresáře uložit nejméně %1 GB dat – toto číslo bude navíc v průběhu času pomalu růst. Tvá peněženka bude rovněž uložena v tomto adresáři.</translation>
-    </message>
     <message>
         <source>Use the default data directory</source>
         <translation>Použij výchozí adresář pro data</translation>
@@ -929,10 +535,6 @@
         <source>Use a custom data directory:</source>
         <translation>Použij tento adresář pro data:</translation>
     </message>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Bitcoin Core</translation>
-    </message>
     <message>
         <source>Error: Specified data directory "%1" cannot be created.</source>
         <translation>Chyba: Nejde vytvořit požadovaný adresář pro data „%1“.</translation>
@@ -968,10 +570,6 @@
         <source>Select payment request file</source>
         <translation>Vyber soubor platebního požadavku</translation>
     </message>
-    <message>
-        <source>Select payment request file to open</source>
-        <translation>Vyber soubor platebního požadavku k načtení</translation>
-    </message>
 </context>
 <context>
     <name>OptionsDialog</name>
@@ -1011,10 +609,6 @@
         <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Exit in the menu.</source>
         <translation>Zavřením se aplikace minimalizuje. Pokud je tato volba zaškrtnuta, tak se aplikace ukončí pouze zvolením Konec v menu.</translation>
     </message>
-    <message>
-        <source>The user interface language can be set here. This setting will take effect after restarting Bitcoin Core.</source>
-        <translation>Tady lze nastavit jazyk uživatelského rozhraní. Nastavení se projeví až po restartování Bitcoin Core.</translation>
-    </message>
     <message>
         <source>Third party URLs (e.g. a block explorer) that appear in the transactions tab as context menu items. %s in the URL is replaced by transaction hash. Multiple URLs are separated by vertical bar |.</source>
         <translation>URL třetích stran (např. block exploreru), která se zobrazí v kontextovém menu v záložce Transakce. %s v URL se nahradí hashem transakce. Více URL odděl svislítkem |.</translation>
@@ -1039,14 +633,6 @@
         <source>&amp;Network</source>
         <translation>&amp;Síť</translation>
     </message>
-    <message>
-        <source>Automatically start Bitcoin Core after logging in to the system.</source>
-        <translation>Automaticky spustí Bitcoin Core po přihlášení do systému.</translation>
-    </message>
-    <message>
-        <source>&amp;Start Bitcoin Core on system login</source>
-        <translation>S&amp;pustit Bitcoin Core po přihlášení do systému</translation>
-    </message>
     <message>
         <source>(0 = auto, &lt;0 = leave that many cores free)</source>
         <translation>(0 = automaticky, &lt;0 = nechat daný počet jader volný, výchozí: 0)</translation>
@@ -1276,186 +862,76 @@
     </message>
 </context>
 <context>
-    <name>PaymentServer</name>
+    <name>PeerTableModel</name>
     <message>
-        <source>URI handling</source>
-        <translation>Zpracování URI</translation>
+        <source>User Agent</source>
+        <translation>Typ klienta</translation>
     </message>
     <message>
-        <source>Invalid payment address %1</source>
-        <translation>Neplatná platební adresa %1</translation>
+        <source>Node/Service</source>
+        <translation>Uzel/Služba</translation>
     </message>
     <message>
-        <source>Payment request rejected</source>
-        <translation>Platební požadavek byl odmítnut</translation>
+        <source>Ping Time</source>
+        <translation>Odezva</translation>
     </message>
+</context>
+<context>
+    <name>QObject</name>
     <message>
-        <source>Payment request network doesn't match client network.</source>
-        <translation>Síť platebního požadavku neodpovídá síti klienta.</translation>
+        <source>Amount</source>
+        <translation>Částka</translation>
     </message>
     <message>
-        <source>Payment request is not initialized.</source>
-        <translation>Platební požadavek není zahájený.</translation>
+        <source>Enter a Bitcoin address (e.g. %1)</source>
+        <translation>Zadej Bitcoinovou adresu (např. %1)</translation>
     </message>
     <message>
-        <source>Requested payment amount of %1 is too small (considered dust).</source>
-        <translation>Požadovaná platební částka %1 je příliš malá (je považována za prach).</translation>
+        <source>%1 d</source>
+        <translation>%1 d</translation>
     </message>
     <message>
-        <source>Payment request error</source>
-        <translation>Chyba platebního požadavku</translation>
+        <source>%1 h</source>
+        <translation>%1 h</translation>
     </message>
     <message>
-        <source>Cannot start bitcoin: click-to-pay handler</source>
-        <translation>Nemůžu spustit bitcoin: obsluha click-to-pay</translation>
+        <source>%1 m</source>
+        <translation>%1 m</translation>
     </message>
     <message>
-        <source>Payment request fetch URL is invalid: %1</source>
-        <translation>Zdrojová URL platebního požadavku není platná: %1</translation>
+        <source>%1 s</source>
+        <translation>%1 s</translation>
     </message>
     <message>
-        <source>URI cannot be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source>
-        <translation>Nepodařilo se analyzovat URI! Důvodem může být neplatná Bitcoinová adresa nebo poškozené parametry URI.</translation>
+        <source>None</source>
+        <translation>Žádné</translation>
     </message>
     <message>
-        <source>Payment request file handling</source>
-        <translation>Zpracování souboru platebního požadavku</translation>
+        <source>N/A</source>
+        <translation>N/A</translation>
     </message>
     <message>
-        <source>Payment request file cannot be read! This can be caused by an invalid payment request file.</source>
-        <translation>Soubor platebního požadavku nejde přečíst nebo zpracovat! Příčinou může být špatný soubor platebního požadavku.</translation>
+        <source>%1 ms</source>
+        <translation>%1 ms</translation>
     </message>
+</context>
+<context>
+    <name>RPCConsole</name>
     <message>
-        <source>Payment request expired.</source>
-        <translation>Platební požadavek vypršel.</translation>
+        <source>Client name</source>
+        <translation>Název klienta</translation>
     </message>
     <message>
-        <source>Unverified payment requests to custom payment scripts are unsupported.</source>
-        <translation>Neověřené platební požadavky k uživatelským platebním skriptům nejsou podporované.</translation>
+        <source>N/A</source>
+        <translation>N/A</translation>
     </message>
     <message>
-        <source>Invalid payment request.</source>
-        <translation>Neplatný platební požadavek.</translation>
+        <source>Client version</source>
+        <translation>Verze klienta</translation>
     </message>
     <message>
-        <source>Refund from %1</source>
-        <translation>Vrácení peněz od %1</translation>
-    </message>
-    <message>
-        <source>Payment request %1 is too large (%2 bytes, allowed %3 bytes).</source>
-        <translation>Platební požadavek %1 je moc velký (%2 bajtů, povoleno %3 bajtů).</translation>
-    </message>
-    <message>
-        <source>Error communicating with %1: %2</source>
-        <translation>Chyba při komunikaci s %1: %2</translation>
-    </message>
-    <message>
-        <source>Payment request cannot be parsed!</source>
-        <translation>Platební požadavek je nečitelný!</translation>
-    </message>
-    <message>
-        <source>Bad response from server %1</source>
-        <translation>Chybná odpověď ze serveru %1</translation>
-    </message>
-    <message>
-        <source>Payment acknowledged</source>
-        <translation>Platba potvrzena</translation>
-    </message>
-    <message>
-        <source>Network request error</source>
-        <translation>Chyba síťového požadavku</translation>
-    </message>
-</context>
-<context>
-    <name>PeerTableModel</name>
-    <message>
-        <source>User Agent</source>
-        <translation>Typ klienta</translation>
-    </message>
-    <message>
-        <source>Node/Service</source>
-        <translation>Uzel/Služba</translation>
-    </message>
-    <message>
-        <source>Ping Time</source>
-        <translation>Odezva</translation>
-    </message>
-</context>
-<context>
-    <name>QObject</name>
-    <message>
-        <source>Amount</source>
-        <translation>Částka</translation>
-    </message>
-    <message>
-        <source>Enter a Bitcoin address (e.g. %1)</source>
-        <translation>Zadej Bitcoinovou adresu (např. %1)</translation>
-    </message>
-    <message>
-        <source>%1 d</source>
-        <translation>%1 d</translation>
-    </message>
-    <message>
-        <source>%1 h</source>
-        <translation>%1 h</translation>
-    </message>
-    <message>
-        <source>%1 m</source>
-        <translation>%1 m</translation>
-    </message>
-    <message>
-        <source>%1 s</source>
-        <translation>%1 s</translation>
-    </message>
-    <message>
-        <source>None</source>
-        <translation>Žádné</translation>
-    </message>
-    <message>
-        <source>N/A</source>
-        <translation>N/A</translation>
-    </message>
-    <message>
-        <source>%1 ms</source>
-        <translation>%1 ms</translation>
-    </message>
-</context>
-<context>
-    <name>QRImageWidget</name>
-    <message>
-        <source>&amp;Save Image...</source>
-        <translation>&amp;Ulož obrázek...</translation>
-    </message>
-    <message>
-        <source>&amp;Copy Image</source>
-        <translation>&amp;Kopíruj obrázek</translation>
-    </message>
-    <message>
-        <source>Save QR Code</source>
-        <translation>Ulož QR kód</translation>
-    </message>
-    <message>
-        <source>PNG Image (*.png)</source>
-        <translation>PNG obrázek (*.png)</translation>
-    </message>
-</context>
-<context>
-    <name>RPCConsole</name>
-    <message>
-        <source>Client name</source>
-        <translation>Název klienta</translation>
-    </message>
-    <message>
-        <source>N/A</source>
-        <translation>N/A</translation>
-    </message>
-    <message>
-        <source>Client version</source>
-        <translation>Verze klienta</translation>
-    </message>
-    <message>
-        <source>&amp;Information</source>
-        <translation>&amp;Informace</translation>
+        <source>&amp;Information</source>
+        <translation>&amp;Informace</translation>
     </message>
     <message>
         <source>Debug window</source>
@@ -1497,10 +973,6 @@
         <source>Memory usage</source>
         <translation>Využití paměti</translation>
     </message>
-    <message>
-        <source>Open the Bitcoin Core debug log file from the current data directory. This can take a few seconds for large log files.</source>
-        <translation>Otevři soubor s ladicími záznamy Bitcoin Core z aktuálního datového adresáře. U velkých logů to může pár vteřin zabrat.</translation>
-    </message>
     <message>
         <source>Received</source>
         <translation>Přijato</translation>
@@ -1589,10 +1061,6 @@
         <source>Out:</source>
         <translation>Ven:</translation>
     </message>
-    <message>
-        <source>Build date</source>
-        <translation>Datum kompilace</translation>
-    </message>
     <message>
         <source>Debug log file</source>
         <translation>Soubor s ladicími záznamy</translation>
@@ -1629,10 +1097,6 @@
         <source>&amp;Unban Node</source>
         <translation>&amp;Zbavit uzel klatby</translation>
     </message>
-    <message>
-        <source>Welcome to the Bitcoin Core RPC console.</source>
-        <translation>Vítej v RPC konzoli Bitcoin Core.</translation>
-    </message>
     <message>
         <source>Use up and down arrows to navigate history, and &lt;b&gt;Ctrl-L&lt;/b&gt; to clear screen.</source>
         <translation>V historii se pohybuješ šipkami nahoru a dolů a pomocí &lt;b&gt;Ctrl-L&lt;/b&gt; čistíš obrazovku.</translation>
@@ -1760,18 +1224,6 @@
         <source>Remove</source>
         <translation>Smazat</translation>
     </message>
-    <message>
-        <source>Copy label</source>
-        <translation>Kopíruj její označení</translation>
-    </message>
-    <message>
-        <source>Copy message</source>
-        <translation>Kopíruj zprávu</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>Kopíruj částku</translation>
-    </message>
 </context>
 <context>
     <name>ReceiveRequestDialog</name>
@@ -1791,73 +1243,6 @@
         <source>&amp;Save Image...</source>
         <translation>&amp;Ulož obrázek...</translation>
     </message>
-    <message>
-        <source>Request payment to %1</source>
-        <translation>Platební požadavek: %1</translation>
-    </message>
-    <message>
-        <source>Payment information</source>
-        <translation>Informace o platbě</translation>
-    </message>
-    <message>
-        <source>URI</source>
-        <translation>URI</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>Adresa</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>Částka</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Označení</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>Zpráva</translation>
-    </message>
-    <message>
-        <source>Resulting URI too long, try to reduce the text for label / message.</source>
-        <translation>Výsledná URI je příliš dlouhá, zkus zkrátit text označení/zprávy.</translation>
-    </message>
-    <message>
-        <source>Error encoding URI into QR Code.</source>
-        <translation>Chyba při kódování URI do QR kódu.</translation>
-    </message>
-</context>
-<context>
-    <name>RecentRequestsTableModel</name>
-    <message>
-        <source>Date</source>
-        <translation>Datum</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Označení</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>Zpráva</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>Částka</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(bez označení)</translation>
-    </message>
-    <message>
-        <source>(no message)</source>
-        <translation>(bez zprávy)</translation>
-    </message>
-    <message>
-        <source>(no amount)</source>
-        <translation>(bez částky)</translation>
-    </message>
 </context>
 <context>
     <name>SendCoinsDialog</name>
@@ -1918,943 +1303,297 @@
         <translation>Vlastní adresa pro drobné</translation>
     </message>
     <message>
-        <source>Transaction Fee:</source>
-        <translation>Transakční poplatek:</translation>
-    </message>
-    <message>
-        <source>Choose...</source>
-        <translation>Zvol...</translation>
-    </message>
-    <message>
-        <source>collapse fee-settings</source>
-        <translation>sbal nastavení poplatků</translation>
-    </message>
-    <message>
-        <source>per kilobyte</source>
-        <translation>za kilobajt</translation>
-    </message>
-    <message>
-        <source>If the custom fee is set to 1000 satoshis and the transaction is only 250 bytes, then "per kilobyte" only pays 250 satoshis in fee, while "total at least" pays 1000 satoshis. For transactions bigger than a kilobyte both pay by kilobyte.</source>
-        <translation>Pokud je vlastní poplatek nastavený na 1000 satoshi a transakce má pouze 250 bajtů, tak „za kilobajt“ zaplatí poplatek jen 250 satoshi, zatímco „přinejmenším“ zaplatí 1000 satoshi. Pro transakce větší než kilobajt obě možnosti platí za kilobajt.</translation>
-    </message>
-    <message>
-        <source>Hide</source>
-        <translation>Skryj</translation>
-    </message>
-    <message>
-        <source>total at least</source>
-        <translation>přinejmenším</translation>
-    </message>
-    <message>
-        <source>Paying only the minimum fee is just fine as long as there is less transaction volume than space in the blocks. But be aware that this can end up in a never confirming transaction once there is more demand for bitcoin transactions than the network can process.</source>
-        <translation>Platit jen minimální poplatek je v pořádku, pokud je zrovna méně transakcí než místa v blocích. Ale počítej s tím, že to také může skončit transakcí, která nikdy nebude potvrzena, pokud je větší poptávka po bitcoinových transakcích, než síť zvládne zpracovat.</translation>
-    </message>
-    <message>
-        <source>(read the tooltip)</source>
-        <translation>(viz bublina)</translation>
-    </message>
-    <message>
-        <source>Recommended:</source>
-        <translation>Doporučený:</translation>
-    </message>
-    <message>
-        <source>Custom:</source>
-        <translation>Vlastní:</translation>
-    </message>
-    <message>
-        <source>(Smart fee not initialized yet. This usually takes a few blocks...)</source>
-        <translation>(Inteligentní poplatek ještě není inicializovaný. Obvykle mu to tak pár bloků trvá...)</translation>
-    </message>
-    <message>
-        <source>Confirmation time:</source>
-        <translation>Rychlost potvrzení:</translation>
-    </message>
-    <message>
-        <source>normal</source>
-        <translation>normální</translation>
-    </message>
-    <message>
-        <source>fast</source>
-        <translation>rychlá</translation>
-    </message>
-    <message>
-        <source>Send as zero-fee transaction if possible</source>
-        <translation>Pošli transakci pokud možno bez poplatku</translation>
-    </message>
-    <message>
-        <source>(confirmation may take longer)</source>
-        <translation>(potvrzení může trvat déle)</translation>
-    </message>
-    <message>
-        <source>Send to multiple recipients at once</source>
-        <translation>Pošli více příjemcům naráz</translation>
-    </message>
-    <message>
-        <source>Add &amp;Recipient</source>
-        <translation>Při&amp;dej příjemce</translation>
-    </message>
-    <message>
-        <source>Clear all fields of the form.</source>
-        <translation>Promaž obsah ze všech formulářových políček.</translation>
-    </message>
-    <message>
-        <source>Dust:</source>
-        <translation>Prach:</translation>
-    </message>
-    <message>
-        <source>Clear &amp;All</source>
-        <translation>Všechno s&amp;maž</translation>
-    </message>
-    <message>
-        <source>Balance:</source>
-        <translation>Stav účtu:</translation>
-    </message>
-    <message>
-        <source>Confirm the send action</source>
-        <translation>Potvrď odeslání</translation>
-    </message>
-    <message>
-        <source>S&amp;end</source>
-        <translation>Pošl&amp;i</translation>
-    </message>
-    <message>
-        <source>Confirm send coins</source>
-        <translation>Potvrď odeslání mincí</translation>
-    </message>
-    <message>
-        <source>%1 to %2</source>
-        <translation>%1 pro %2</translation>
-    </message>
-    <message>
-        <source>Copy quantity</source>
-        <translation>Kopíruj počet</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>Kopíruj částku</translation>
-    </message>
-    <message>
-        <source>Copy fee</source>
-        <translation>Kopíruj poplatek</translation>
-    </message>
-    <message>
-        <source>Copy after fee</source>
-        <translation>Kopíruj čistou částku</translation>
-    </message>
-    <message>
-        <source>Copy bytes</source>
-        <translation>Kopíruj bajty</translation>
-    </message>
-    <message>
-        <source>Copy priority</source>
-        <translation>Kopíruj prioritu</translation>
-    </message>
-    <message>
-        <source>Copy change</source>
-        <translation>Kopíruj drobné</translation>
-    </message>
-    <message>
-        <source>Total Amount %1</source>
-        <translation>Celková částka %1</translation>
-    </message>
-    <message>
-        <source>or</source>
-        <translation>nebo</translation>
-    </message>
-    <message>
-        <source>The amount to pay must be larger than 0.</source>
-        <translation>Odesílaná částka musí být větší než 0.</translation>
-    </message>
-    <message>
-        <source>The amount exceeds your balance.</source>
-        <translation>Částka překračuje stav účtu.</translation>
-    </message>
-    <message>
-        <source>The total exceeds your balance when the %1 transaction fee is included.</source>
-        <translation>Celková částka při připočítání poplatku %1 překročí stav účtu.</translation>
-    </message>
-    <message>
-        <source>Transaction creation failed!</source>
-        <translation>Vytvoření transakce selhalo!</translation>
-    </message>
-    <message>
-        <source>The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source>
-        <translation>Transakce byla odmítnuta! Tohle může nastat, pokud nějaké mince z tvé peněženky už jednou byly utraceny, například pokud používáš kopii souboru wallet.dat a mince byly utraceny v druhé kopii, ale nebyly označeny jako utracené v této.</translation>
-    </message>
-    <message>
-        <source>A fee higher than %1 is considered an absurdly high fee.</source>
-        <translation>Poplatek vyšší než %1 je považován za absurdně vysoký.</translation>
-    </message>
-    <message>
-        <source>Payment request expired.</source>
-        <translation>Platební požadavek vypršel.</translation>
-    </message>
-    <message>
-        <source>Pay only the required fee of %1</source>
-        <translation>Zaplatit pouze vyžadovaný poplatek %1</translation>
-    </message>
-    <message numerus="yes">
-        <source>Estimated to begin confirmation within %n block(s).</source>
-        <translation><numerusform>Potvrzování by podle odhadu mělo začít během %n bloku.</numerusform><numerusform>Potvrzování by podle odhadu mělo začít během %n bloků.</numerusform><numerusform>Potvrzování by podle odhadu mělo začít během %n bloků.</numerusform></translation>
-    </message>
-    <message>
-        <source>The recipient address is not valid. Please recheck.</source>
-        <translation>Adresa příjemce je neplatná – překontroluj ji prosím.</translation>
-    </message>
-    <message>
-        <source>Duplicate address found: addresses should only be used once each.</source>
-        <translation>Zaznamenána duplicitní adresa: každá adresa by ale měla být použita vždy jen jednou.</translation>
-    </message>
-    <message>
-        <source>Warning: Invalid Bitcoin address</source>
-        <translation>Upozornění: Neplatná Bitcoinová adresa</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(bez označení)</translation>
-    </message>
-    <message>
-        <source>Warning: Unknown change address</source>
-        <translation>Upozornění: Neznámá adresa pro drobné</translation>
-    </message>
-    <message>
-        <source>Copy dust</source>
-        <translation>Kopíruj prach</translation>
-    </message>
-    <message>
-        <source>Are you sure you want to send?</source>
-        <translation>Jsi si jistý, že to chceš poslat?</translation>
-    </message>
-    <message>
-        <source>added as transaction fee</source>
-        <translation>přidán jako transakční poplatek</translation>
-    </message>
-</context>
-<context>
-    <name>SendCoinsEntry</name>
-    <message>
-        <source>A&amp;mount:</source>
-        <translation>Čás&amp;tka:</translation>
-    </message>
-    <message>
-        <source>Pay &amp;To:</source>
-        <translation>&amp;Komu:</translation>
-    </message>
-    <message>
-        <source>Enter a label for this address to add it to your address book</source>
-        <translation>Zadej označení této adresy; obojí se ti pak uloží do adresáře</translation>
-    </message>
-    <message>
-        <source>&amp;Label:</source>
-        <translation>O&amp;značení:</translation>
-    </message>
-    <message>
-        <source>Choose previously used address</source>
-        <translation>Vyber již použitou adresu</translation>
-    </message>
-    <message>
-        <source>This is a normal payment.</source>
-        <translation>Tohle je normální platba.</translation>
-    </message>
-    <message>
-        <source>The Bitcoin address to send the payment to</source>
-        <translation>Bitcoinová adresa příjemce</translation>
-    </message>
-    <message>
-        <source>Alt+A</source>
-        <translation>Alt+A</translation>
-    </message>
-    <message>
-        <source>Paste address from clipboard</source>
-        <translation>Vlož adresu ze schránky</translation>
-    </message>
-    <message>
-        <source>Alt+P</source>
-        <translation>Alt+P</translation>
-    </message>
-    <message>
-        <source>Remove this entry</source>
-        <translation>Smaž tento záznam</translation>
-    </message>
-    <message>
-        <source>The fee will be deducted from the amount being sent. The recipient will receive less bitcoins than you enter in the amount field. If multiple recipients are selected, the fee is split equally.</source>
-        <translation>Poplatek se odečte od posílané částky. Příjemce tak dostane méně bitcoinů, než zadáš do pole Částka. Pokud vybereš více příjemců, tak se poplatek rovnoměrně rozloží.</translation>
-    </message>
-    <message>
-        <source>S&amp;ubtract fee from amount</source>
-        <translation>Od&amp;ečíst poplatek od částky</translation>
-    </message>
-    <message>
-        <source>Message:</source>
-        <translation>Zpráva:</translation>
-    </message>
-    <message>
-        <source>This is an unauthenticated payment request.</source>
-        <translation>Tohle je neověřený platební požadavek.</translation>
-    </message>
-    <message>
-        <source>This is an authenticated payment request.</source>
-        <translation>Tohle je ověřený platební požadavek.</translation>
-    </message>
-    <message>
-        <source>Enter a label for this address to add it to the list of used addresses</source>
-        <translation>Zadej označení této adresy; obojí se ti pak uloží do adresáře</translation>
-    </message>
-    <message>
-        <source>A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
-        <translation>Zpráva, která byla připojena k bitcoin: URI a která se ti pro přehled uloží k transakci. Poznámka: Tahle zpráva se neposílá s platbou po Bitcoinové síti.</translation>
-    </message>
-    <message>
-        <source>Pay To:</source>
-        <translation>Komu:</translation>
-    </message>
-    <message>
-        <source>Memo:</source>
-        <translation>Poznámka:</translation>
-    </message>
-</context>
-<context>
-    <name>ShutdownWindow</name>
-    <message>
-        <source>Bitcoin Core is shutting down...</source>
-        <translation>Bitcoin Core se ukončuje...</translation>
-    </message>
-    <message>
-        <source>Do not shut down the computer until this window disappears.</source>
-        <translation>Nevypínej počítač, dokud toto okno nezmizí.</translation>
-    </message>
-</context>
-<context>
-    <name>SignVerifyMessageDialog</name>
-    <message>
-        <source>Signatures - Sign / Verify a Message</source>
-        <translation>Podpisy - podepsat/ověřit zprávu</translation>
-    </message>
-    <message>
-        <source>&amp;Sign Message</source>
-        <translation>&amp;Podepiš zprávu</translation>
-    </message>
-    <message>
-        <source>You can sign messages/agreements with your addresses to prove you can receive bitcoins sent to them. Be careful not to sign anything vague or random, as phishing attacks may try to trick you into signing your identity over to them. Only sign fully-detailed statements you agree to.</source>
-        <translation>Podepsáním zprávy/smlouvy svými adresami můžeš prokázat, že jsi na ně schopen přijmout bitcoiny. Buď opatrný a nepodepisuj nic vágního nebo náhodného; například při phishingových útocích můžeš být lákán, abys něco takového podepsal. Podepisuj pouze naprosto úplná a detailní prohlášení, se kterými souhlasíš.</translation>
-    </message>
-    <message>
-        <source>The Bitcoin address to sign the message with</source>
-        <translation>Bitcoinová adresa, kterou se zpráva podepíše</translation>
-    </message>
-    <message>
-        <source>Choose previously used address</source>
-        <translation>Vyber již použitou adresu</translation>
-    </message>
-    <message>
-        <source>Alt+A</source>
-        <translation>Alt+A</translation>
-    </message>
-    <message>
-        <source>Paste address from clipboard</source>
-        <translation>Vlož adresu ze schránky</translation>
-    </message>
-    <message>
-        <source>Alt+P</source>
-        <translation>Alt+P</translation>
-    </message>
-    <message>
-        <source>Enter the message you want to sign here</source>
-        <translation>Sem vepiš zprávu, kterou chceš podepsat</translation>
-    </message>
-    <message>
-        <source>Signature</source>
-        <translation>Podpis</translation>
-    </message>
-    <message>
-        <source>Copy the current signature to the system clipboard</source>
-        <translation>Zkopíruj tento podpis do schránky</translation>
-    </message>
-    <message>
-        <source>Sign the message to prove you own this Bitcoin address</source>
-        <translation>Podepiš zprávu, čímž prokážeš, že jsi vlastníkem této Bitcoinové adresy</translation>
-    </message>
-    <message>
-        <source>Sign &amp;Message</source>
-        <translation>Po&amp;depiš zprávu</translation>
-    </message>
-    <message>
-        <source>Reset all sign message fields</source>
-        <translation>Vymaž všechna pole formuláře pro podepsání zrávy</translation>
-    </message>
-    <message>
-        <source>Clear &amp;All</source>
-        <translation>Všechno &amp;smaž</translation>
-    </message>
-    <message>
-        <source>&amp;Verify Message</source>
-        <translation>&amp;Ověř zprávu</translation>
-    </message>
-    <message>
-        <source>Enter the receiver's address, message (ensure you copy line breaks, spaces, tabs, etc. exactly) and signature below to verify the message. Be careful not to read more into the signature than what is in the signed message itself, to avoid being tricked by a man-in-the-middle attack. Note that this only proves the signing party receives with the address, it cannot prove sendership of any transaction!</source>
-        <translation>K ověření podpisu zprávy zadej adresu příjemce, zprávu (ověř si, že správně kopíruješ zalomení řádků, mezery, tabulátory apod.) a podpis. Dávej pozor na to, abys nezkopíroval do podpisu víc, než co je v samotné podepsané zprávě, abys nebyl napálen man-in-the-middle útokem. Poznamenejme však, že takto lze pouze prokázat, že podepisující je schopný na dané adrese přijmout platbu, ale není možnéprokázat, že odeslal jakoukoli transakci!</translation>
-    </message>
-    <message>
-        <source>The Bitcoin address the message was signed with</source>
-        <translation>Bitcoinová adresa, kterou je zpráva podepsána</translation>
-    </message>
-    <message>
-        <source>Verify the message to ensure it was signed with the specified Bitcoin address</source>
-        <translation>Ověř zprávu, aby ses ujistil, že byla podepsána danou Bitcoinovou adresou</translation>
-    </message>
-    <message>
-        <source>Verify &amp;Message</source>
-        <translation>O&amp;věř zprávu</translation>
-    </message>
-    <message>
-        <source>Reset all verify message fields</source>
-        <translation>Vymaž všechna pole formuláře pro ověření zrávy</translation>
-    </message>
-    <message>
-        <source>Click "Sign Message" to generate signature</source>
-        <translation>Kliknutím na „Podepiš zprávu“ vygeneruješ podpis</translation>
-    </message>
-    <message>
-        <source>The entered address is invalid.</source>
-        <translation>Zadaná adresa je neplatná.</translation>
-    </message>
-    <message>
-        <source>Please check the address and try again.</source>
-        <translation>Zkontroluj ji prosím a zkus to pak znovu.</translation>
-    </message>
-    <message>
-        <source>The entered address does not refer to a key.</source>
-        <translation>Zadaná adresa nepasuje ke klíči.</translation>
-    </message>
-    <message>
-        <source>Wallet unlock was cancelled.</source>
-        <translation>Odemčení peněženky bylo zrušeno.</translation>
-    </message>
-    <message>
-        <source>Private key for the entered address is not available.</source>
-        <translation>Soukromý klíč pro zadanou adresu není dostupný.</translation>
-    </message>
-    <message>
-        <source>Message signing failed.</source>
-        <translation>Nepodařilo se podepsat zprávu.</translation>
-    </message>
-    <message>
-        <source>Message signed.</source>
-        <translation>Zpráva podepsána.</translation>
-    </message>
-    <message>
-        <source>The signature could not be decoded.</source>
-        <translation>Podpis nejde dekódovat.</translation>
-    </message>
-    <message>
-        <source>Please check the signature and try again.</source>
-        <translation>Zkontroluj ho prosím a zkus to pak znovu.</translation>
-    </message>
-    <message>
-        <source>The signature did not match the message digest.</source>
-        <translation>Podpis se neshoduje s hašem zprávy.</translation>
-    </message>
-    <message>
-        <source>Message verification failed.</source>
-        <translation>Nepodařilo se ověřit zprávu.</translation>
-    </message>
-    <message>
-        <source>Message verified.</source>
-        <translation>Zpráva ověřena.</translation>
-    </message>
-</context>
-<context>
-    <name>SplashScreen</name>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Bitcoin Core</translation>
-    </message>
-    <message>
-        <source>The Bitcoin Core developers</source>
-        <translation>Vývojáři Bitcoin Core</translation>
-    </message>
-    <message>
-        <source>[testnet]</source>
-        <translation>[testnet]</translation>
-    </message>
-</context>
-<context>
-    <name>TrafficGraphWidget</name>
-    <message>
-        <source>KB/s</source>
-        <translation>kB/s</translation>
-    </message>
-</context>
-<context>
-    <name>TransactionDesc</name>
-    <message>
-        <source>Open until %1</source>
-        <translation>Otřevřeno dokud %1</translation>
-    </message>
-    <message>
-        <source>conflicted</source>
-        <translation>kolidující</translation>
-    </message>
-    <message>
-        <source>%1/offline</source>
-        <translation>%1/offline</translation>
-    </message>
-    <message>
-        <source>%1/unconfirmed</source>
-        <translation>%1/nepotvrzeno</translation>
-    </message>
-    <message>
-        <source>%1 confirmations</source>
-        <translation>%1 potvrzení</translation>
-    </message>
-    <message>
-        <source>Status</source>
-        <translation>Stav</translation>
-    </message>
-    <message numerus="yes">
-        <source>, broadcast through %n node(s)</source>
-        <translation><numerusform>, rozesláno přes %n uzel</numerusform><numerusform>, rozesláno přes %n uzly</numerusform><numerusform>, rozesláno přes %n uzlů</numerusform></translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation>Datum</translation>
-    </message>
-    <message>
-        <source>Source</source>
-        <translation>Zdroj</translation>
-    </message>
-    <message>
-        <source>Generated</source>
-        <translation>Vygenerováno</translation>
-    </message>
-    <message>
-        <source>From</source>
-        <translation>Od</translation>
-    </message>
-    <message>
-        <source>To</source>
-        <translation>Pro</translation>
-    </message>
-    <message>
-        <source>own address</source>
-        <translation>vlastní adresa</translation>
-    </message>
-    <message>
-        <source>watch-only</source>
-        <translation>sledovaná</translation>
-    </message>
-    <message>
-        <source>label</source>
-        <translation>označení</translation>
-    </message>
-    <message>
-        <source>Credit</source>
-        <translation>Příjem</translation>
-    </message>
-    <message numerus="yes">
-        <source>matures in %n more block(s)</source>
-        <translation><numerusform>dozraje po %n bloku</numerusform><numerusform>dozraje po %n blocích</numerusform><numerusform>dozraje po %n blocích</numerusform></translation>
-    </message>
-    <message>
-        <source>not accepted</source>
-        <translation>neakceptováno</translation>
-    </message>
-    <message>
-        <source>Debit</source>
-        <translation>Výdaj</translation>
-    </message>
-    <message>
-        <source>Total debit</source>
-        <translation>Celkové výdaje</translation>
-    </message>
-    <message>
-        <source>Total credit</source>
-        <translation>Celkové příjmy</translation>
-    </message>
-    <message>
-        <source>Transaction fee</source>
-        <translation>Transakční poplatek</translation>
-    </message>
-    <message>
-        <source>Net amount</source>
-        <translation>Čistá částka</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>Zpráva</translation>
-    </message>
-    <message>
-        <source>Comment</source>
-        <translation>Komentář</translation>
-    </message>
-    <message>
-        <source>Transaction ID</source>
-        <translation>ID transakce</translation>
-    </message>
-    <message>
-        <source>Merchant</source>
-        <translation>Obchodník</translation>
-    </message>
-    <message>
-        <source>Generated coins must mature %1 blocks before they can be spent. When you generated this block, it was broadcast to the network to be added to the block chain. If it fails to get into the chain, its state will change to "not accepted" and it won't be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source>
-        <translation>Vygenerované mince musí čekat %1 bloků, než mohou být utraceny. Když jsi vygeneroval tenhle blok, tak byl rozposlán do sítě, aby byl přidán do řetězce bloků. Pokud se mu nepodaří dostat se do řetězce, změní se na „neakceptovaný“ a nepůjde utratit. To se občas může stát, pokud jiný uzel vygeneruje blok zhruba ve stejném okamžiku jako ty.</translation>
-    </message>
-    <message>
-        <source>Debug information</source>
-        <translation>Ladicí informace</translation>
-    </message>
-    <message>
-        <source>Transaction</source>
-        <translation>Transakce</translation>
-    </message>
-    <message>
-        <source>Inputs</source>
-        <translation>Vstupy</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>Částka</translation>
-    </message>
-    <message>
-        <source>true</source>
-        <translation>true</translation>
-    </message>
-    <message>
-        <source>false</source>
-        <translation>false</translation>
-    </message>
-    <message>
-        <source>, has not been successfully broadcast yet</source>
-        <translation>, ještě nebylo rozesláno</translation>
-    </message>
-    <message numerus="yes">
-        <source>Open for %n more block(s)</source>
-        <translation><numerusform>Otevřeno pro %n další blok</numerusform><numerusform>Otevřeno pro %n další bloky</numerusform><numerusform>Otevřeno pro %n dalších bloků</numerusform></translation>
-    </message>
-    <message>
-        <source>unknown</source>
-        <translation>neznámo</translation>
+        <source>Transaction Fee:</source>
+        <translation>Transakční poplatek:</translation>
     </message>
-</context>
-<context>
-    <name>TransactionDescDialog</name>
     <message>
-        <source>Transaction details</source>
-        <translation>Detaily transakce</translation>
+        <source>Choose...</source>
+        <translation>Zvol...</translation>
     </message>
     <message>
-        <source>This pane shows a detailed description of the transaction</source>
-        <translation>Toto okno zobrazuje detailní popis transakce</translation>
+        <source>collapse fee-settings</source>
+        <translation>sbal nastavení poplatků</translation>
     </message>
-</context>
-<context>
-    <name>TransactionTableModel</name>
     <message>
-        <source>Date</source>
-        <translation>Datum</translation>
+        <source>per kilobyte</source>
+        <translation>za kilobajt</translation>
     </message>
     <message>
-        <source>Type</source>
-        <translation>Typ</translation>
+        <source>If the custom fee is set to 1000 satoshis and the transaction is only 250 bytes, then "per kilobyte" only pays 250 satoshis in fee, while "total at least" pays 1000 satoshis. For transactions bigger than a kilobyte both pay by kilobyte.</source>
+        <translation>Pokud je vlastní poplatek nastavený na 1000 satoshi a transakce má pouze 250 bajtů, tak „za kilobajt“ zaplatí poplatek jen 250 satoshi, zatímco „přinejmenším“ zaplatí 1000 satoshi. Pro transakce větší než kilobajt obě možnosti platí za kilobajt.</translation>
     </message>
     <message>
-        <source>Immature (%1 confirmations, will be available after %2)</source>
-        <translation>Nedozráno (%1 potvrzení, dozraje při %2 potvrzeních)</translation>
-    </message>
-    <message numerus="yes">
-        <source>Open for %n more block(s)</source>
-        <translation><numerusform>Otevřeno pro %n další blok</numerusform><numerusform>Otevřeno pro %n další bloky</numerusform><numerusform>Otevřeno pro %n dalších bloků</numerusform></translation>
+        <source>Hide</source>
+        <translation>Skryj</translation>
     </message>
     <message>
-        <source>Open until %1</source>
-        <translation>Otřevřeno dokud %1</translation>
+        <source>total at least</source>
+        <translation>přinejmenším</translation>
     </message>
     <message>
-        <source>Confirmed (%1 confirmations)</source>
-        <translation>Potvrzeno (%1 potvrzení)</translation>
+        <source>Paying only the minimum fee is just fine as long as there is less transaction volume than space in the blocks. But be aware that this can end up in a never confirming transaction once there is more demand for bitcoin transactions than the network can process.</source>
+        <translation>Platit jen minimální poplatek je v pořádku, pokud je zrovna méně transakcí než místa v blocích. Ale počítej s tím, že to také může skončit transakcí, která nikdy nebude potvrzena, pokud je větší poptávka po bitcoinových transakcích, než síť zvládne zpracovat.</translation>
     </message>
     <message>
-        <source>This block was not received by any other nodes and will probably not be accepted!</source>
-        <translation>Tento blok nedostal žádný jiný uzel a pravděpodobně nebude akceptován!</translation>
+        <source>(read the tooltip)</source>
+        <translation>(viz bublina)</translation>
     </message>
     <message>
-        <source>Generated but not accepted</source>
-        <translation>Vygenerováno, ale neakceptováno</translation>
+        <source>Recommended:</source>
+        <translation>Doporučený:</translation>
     </message>
     <message>
-        <source>Offline</source>
-        <translation>Offline</translation>
+        <source>Custom:</source>
+        <translation>Vlastní:</translation>
     </message>
     <message>
-        <source>Label</source>
-        <translation>Označení</translation>
+        <source>(Smart fee not initialized yet. This usually takes a few blocks...)</source>
+        <translation>(Inteligentní poplatek ještě není inicializovaný. Obvykle mu to tak pár bloků trvá...)</translation>
     </message>
     <message>
-        <source>Unconfirmed</source>
-        <translation>Nepotvrzeno</translation>
+        <source>Confirmation time:</source>
+        <translation>Rychlost potvrzení:</translation>
     </message>
     <message>
-        <source>Confirming (%1 of %2 recommended confirmations)</source>
-        <translation>Potvrzuje se (%1 z %2 doporučených potvrzení)</translation>
+        <source>normal</source>
+        <translation>normální</translation>
     </message>
     <message>
-        <source>Conflicted</source>
-        <translation>V kolizi</translation>
+        <source>fast</source>
+        <translation>rychlá</translation>
     </message>
     <message>
-        <source>Received with</source>
-        <translation>Přijato do</translation>
+        <source>Send to multiple recipients at once</source>
+        <translation>Pošli více příjemcům naráz</translation>
     </message>
     <message>
-        <source>Received from</source>
-        <translation>Přijato od</translation>
+        <source>Add &amp;Recipient</source>
+        <translation>Při&amp;dej příjemce</translation>
     </message>
     <message>
-        <source>Sent to</source>
-        <translation>Posláno na</translation>
+        <source>Clear all fields of the form.</source>
+        <translation>Promaž obsah ze všech formulářových políček.</translation>
     </message>
     <message>
-        <source>Payment to yourself</source>
-        <translation>Platba sama sobě</translation>
+        <source>Dust:</source>
+        <translation>Prach:</translation>
     </message>
     <message>
-        <source>Mined</source>
-        <translation>Vytěženo</translation>
+        <source>Clear &amp;All</source>
+        <translation>Všechno s&amp;maž</translation>
     </message>
     <message>
-        <source>watch-only</source>
-        <translation>sledovací</translation>
+        <source>Balance:</source>
+        <translation>Stav účtu:</translation>
     </message>
     <message>
-        <source>(n/a)</source>
-        <translation>(n/a)</translation>
+        <source>Confirm the send action</source>
+        <translation>Potvrď odeslání</translation>
     </message>
     <message>
-        <source>Transaction status. Hover over this field to show number of confirmations.</source>
-        <translation>Stav transakce. Najetím myši na toto políčko si zobrazíš počet potvrzení.</translation>
+        <source>S&amp;end</source>
+        <translation>Pošl&amp;i</translation>
     </message>
+</context>
+<context>
+    <name>SendCoinsEntry</name>
     <message>
-        <source>Date and time that the transaction was received.</source>
-        <translation>Datum a čas přijetí transakce.</translation>
+        <source>A&amp;mount:</source>
+        <translation>Čás&amp;tka:</translation>
     </message>
     <message>
-        <source>Type of transaction.</source>
-        <translation>Druh transakce.</translation>
+        <source>Pay &amp;To:</source>
+        <translation>&amp;Komu:</translation>
     </message>
     <message>
-        <source>Whether or not a watch-only address is involved in this transaction.</source>
-        <translation>Zda tato transakce zahrnuje i některou sledovanou adresu.</translation>
+        <source>&amp;Label:</source>
+        <translation>O&amp;značení:</translation>
     </message>
     <message>
-        <source>User-defined intent/purpose of the transaction.</source>
-        <translation>Uživatelsky určený účel transakce.</translation>
+        <source>Choose previously used address</source>
+        <translation>Vyber již použitou adresu</translation>
     </message>
     <message>
-        <source>Amount removed from or added to balance.</source>
-        <translation>Částka odečtená z nebo přičtená k účtu.</translation>
+        <source>This is a normal payment.</source>
+        <translation>Tohle je normální platba.</translation>
     </message>
-</context>
-<context>
-    <name>TransactionView</name>
     <message>
-        <source>All</source>
-        <translation>Vše</translation>
+        <source>The Bitcoin address to send the payment to</source>
+        <translation>Bitcoinová adresa příjemce</translation>
     </message>
     <message>
-        <source>Today</source>
-        <translation>Dnes</translation>
+        <source>Alt+A</source>
+        <translation>Alt+A</translation>
     </message>
     <message>
-        <source>This week</source>
-        <translation>Tento týden</translation>
+        <source>Paste address from clipboard</source>
+        <translation>Vlož adresu ze schránky</translation>
     </message>
     <message>
-        <source>This month</source>
-        <translation>Tento měsíc</translation>
+        <source>Alt+P</source>
+        <translation>Alt+P</translation>
     </message>
     <message>
-        <source>Last month</source>
-        <translation>Minulý měsíc</translation>
+        <source>Remove this entry</source>
+        <translation>Smaž tento záznam</translation>
     </message>
     <message>
-        <source>This year</source>
-        <translation>Letos</translation>
+        <source>The fee will be deducted from the amount being sent. The recipient will receive less bitcoins than you enter in the amount field. If multiple recipients are selected, the fee is split equally.</source>
+        <translation>Poplatek se odečte od posílané částky. Příjemce tak dostane méně bitcoinů, než zadáš do pole Částka. Pokud vybereš více příjemců, tak se poplatek rovnoměrně rozloží.</translation>
     </message>
     <message>
-        <source>Range...</source>
-        <translation>Rozsah...</translation>
+        <source>S&amp;ubtract fee from amount</source>
+        <translation>Od&amp;ečíst poplatek od částky</translation>
     </message>
     <message>
-        <source>Received with</source>
-        <translation>Přijato</translation>
+        <source>Message:</source>
+        <translation>Zpráva:</translation>
     </message>
     <message>
-        <source>Sent to</source>
-        <translation>Posláno</translation>
+        <source>This is an unauthenticated payment request.</source>
+        <translation>Tohle je neověřený platební požadavek.</translation>
     </message>
     <message>
-        <source>To yourself</source>
-        <translation>Sám sobě</translation>
+        <source>This is an authenticated payment request.</source>
+        <translation>Tohle je ověřený platební požadavek.</translation>
     </message>
     <message>
-        <source>Mined</source>
-        <translation>Vytěženo</translation>
+        <source>Enter a label for this address to add it to the list of used addresses</source>
+        <translation>Zadej označení této adresy; obojí se ti pak uloží do adresáře</translation>
     </message>
     <message>
-        <source>Other</source>
-        <translation>Ostatní</translation>
+        <source>A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
+        <translation>Zpráva, která byla připojena k bitcoin: URI a která se ti pro přehled uloží k transakci. Poznámka: Tahle zpráva se neposílá s platbou po Bitcoinové síti.</translation>
     </message>
     <message>
-        <source>Enter address or label to search</source>
-        <translation>Zadej adresu nebo označení pro její vyhledání</translation>
+        <source>Pay To:</source>
+        <translation>Komu:</translation>
     </message>
     <message>
-        <source>Min amount</source>
-        <translation>Minimální částka</translation>
+        <source>Memo:</source>
+        <translation>Poznámka:</translation>
     </message>
+</context>
+<context>
+    <name>ShutdownWindow</name>
     <message>
-        <source>Copy address</source>
-        <translation>Kopíruj adresu</translation>
+        <source>Do not shut down the computer until this window disappears.</source>
+        <translation>Nevypínej počítač, dokud toto okno nezmizí.</translation>
     </message>
+</context>
+<context>
+    <name>SignVerifyMessageDialog</name>
     <message>
-        <source>Copy label</source>
-        <translation>Kopíruj její označení</translation>
+        <source>Signatures - Sign / Verify a Message</source>
+        <translation>Podpisy - podepsat/ověřit zprávu</translation>
     </message>
     <message>
-        <source>Copy amount</source>
-        <translation>Kopíruj částku</translation>
+        <source>&amp;Sign Message</source>
+        <translation>&amp;Podepiš zprávu</translation>
     </message>
     <message>
-        <source>Copy transaction ID</source>
-        <translation>Kopíruj ID transakce</translation>
+        <source>You can sign messages/agreements with your addresses to prove you can receive bitcoins sent to them. Be careful not to sign anything vague or random, as phishing attacks may try to trick you into signing your identity over to them. Only sign fully-detailed statements you agree to.</source>
+        <translation>Podepsáním zprávy/smlouvy svými adresami můžeš prokázat, že jsi na ně schopen přijmout bitcoiny. Buď opatrný a nepodepisuj nic vágního nebo náhodného; například při phishingových útocích můžeš být lákán, abys něco takového podepsal. Podepisuj pouze naprosto úplná a detailní prohlášení, se kterými souhlasíš.</translation>
     </message>
     <message>
-        <source>Copy raw transaction</source>
-        <translation>Kopíruj surovou transakci</translation>
+        <source>The Bitcoin address to sign the message with</source>
+        <translation>Bitcoinová adresa, kterou se zpráva podepíše</translation>
     </message>
     <message>
-        <source>Edit label</source>
-        <translation>Uprav označení</translation>
+        <source>Choose previously used address</source>
+        <translation>Vyber již použitou adresu</translation>
     </message>
     <message>
-        <source>Show transaction details</source>
-        <translation>Zobraz detaily transakce</translation>
+        <source>Alt+A</source>
+        <translation>Alt+A</translation>
     </message>
     <message>
-        <source>Export Transaction History</source>
-        <translation>Exportuj transakční historii</translation>
+        <source>Paste address from clipboard</source>
+        <translation>Vlož adresu ze schránky</translation>
     </message>
     <message>
-        <source>Watch-only</source>
-        <translation>Sledovaná</translation>
+        <source>Alt+P</source>
+        <translation>Alt+P</translation>
     </message>
     <message>
-        <source>Exporting Failed</source>
-        <translation>Exportování selhalo</translation>
+        <source>Enter the message you want to sign here</source>
+        <translation>Sem vepiš zprávu, kterou chceš podepsat</translation>
     </message>
     <message>
-        <source>There was an error trying to save the transaction history to %1.</source>
-        <translation>Při ukládání transakční historie do %1 se přihodila nějaká chyba.</translation>
+        <source>Signature</source>
+        <translation>Podpis</translation>
     </message>
     <message>
-        <source>Exporting Successful</source>
-        <translation>Úspěšně vyexportováno</translation>
+        <source>Copy the current signature to the system clipboard</source>
+        <translation>Zkopíruj tento podpis do schránky</translation>
     </message>
     <message>
-        <source>The transaction history was successfully saved to %1.</source>
-        <translation>Transakční historie byla v pořádku uložena do %1.</translation>
+        <source>Sign the message to prove you own this Bitcoin address</source>
+        <translation>Podepiš zprávu, čímž prokážeš, že jsi vlastníkem této Bitcoinové adresy</translation>
     </message>
     <message>
-        <source>Comma separated file (*.csv)</source>
-        <translation>Formát CSV (*.csv)</translation>
+        <source>Sign &amp;Message</source>
+        <translation>Po&amp;depiš zprávu</translation>
     </message>
     <message>
-        <source>Confirmed</source>
-        <translation>Potvrzeno</translation>
+        <source>Reset all sign message fields</source>
+        <translation>Vymaž všechna pole formuláře pro podepsání zrávy</translation>
     </message>
     <message>
-        <source>Date</source>
-        <translation>Datum</translation>
+        <source>Clear &amp;All</source>
+        <translation>Všechno &amp;smaž</translation>
     </message>
     <message>
-        <source>Type</source>
-        <translation>Typ</translation>
+        <source>&amp;Verify Message</source>
+        <translation>&amp;Ověř zprávu</translation>
     </message>
     <message>
-        <source>Label</source>
-        <translation>Označení</translation>
+        <source>Enter the receiver's address, message (ensure you copy line breaks, spaces, tabs, etc. exactly) and signature below to verify the message. Be careful not to read more into the signature than what is in the signed message itself, to avoid being tricked by a man-in-the-middle attack. Note that this only proves the signing party receives with the address, it cannot prove sendership of any transaction!</source>
+        <translation>K ověření podpisu zprávy zadej adresu příjemce, zprávu (ověř si, že správně kopíruješ zalomení řádků, mezery, tabulátory apod.) a podpis. Dávej pozor na to, abys nezkopíroval do podpisu víc, než co je v samotné podepsané zprávě, abys nebyl napálen man-in-the-middle útokem. Poznamenejme však, že takto lze pouze prokázat, že podepisující je schopný na dané adrese přijmout platbu, ale není možnéprokázat, že odeslal jakoukoli transakci!</translation>
     </message>
     <message>
-        <source>Address</source>
-        <translation>Adresa</translation>
+        <source>The Bitcoin address the message was signed with</source>
+        <translation>Bitcoinová adresa, kterou je zpráva podepsána</translation>
     </message>
     <message>
-        <source>ID</source>
-        <translation>ID</translation>
+        <source>Verify the message to ensure it was signed with the specified Bitcoin address</source>
+        <translation>Ověř zprávu, aby ses ujistil, že byla podepsána danou Bitcoinovou adresou</translation>
     </message>
     <message>
-        <source>Range:</source>
-        <translation>Rozsah:</translation>
+        <source>Verify &amp;Message</source>
+        <translation>O&amp;věř zprávu</translation>
     </message>
     <message>
-        <source>to</source>
-        <translation>až</translation>
+        <source>Reset all verify message fields</source>
+        <translation>Vymaž všechna pole formuláře pro ověření zrávy</translation>
     </message>
 </context>
 <context>
-    <name>UnitDisplayStatusBarControl</name>
+    <name>SplashScreen</name>
     <message>
-        <source>Unit to show amounts in. Click to select another unit.</source>
-        <translation>Jednotka pro částky. Klikni pro výběr nějaké jiné.</translation>
+        <source>[testnet]</source>
+        <translation>[testnet]</translation>
     </message>
 </context>
 <context>
-    <name>WalletFrame</name>
+    <name>TrafficGraphWidget</name>
     <message>
-        <source>No wallet has been loaded.</source>
-        <translation>Žádná peněženka se nenačetla.</translation>
+        <source>KB/s</source>
+        <translation>kB/s</translation>
     </message>
 </context>
 <context>
-    <name>WalletModel</name>
+    <name>TransactionDescDialog</name>
     <message>
-        <source>Send Coins</source>
-        <translation>Pošli mince</translation>
+        <source>This pane shows a detailed description of the transaction</source>
+        <translation>Toto okno zobrazuje detailní popis transakce</translation>
     </message>
 </context>
 <context>
-    <name>WalletView</name>
-    <message>
-        <source>&amp;Export</source>
-        <translation>&amp;Export</translation>
-    </message>
-    <message>
-        <source>Export the data in the current tab to a file</source>
-        <translation>Exportuj data z tohoto panelu do souboru</translation>
-    </message>
-    <message>
-        <source>Backup Wallet</source>
-        <translation>Záloha peněženky</translation>
-    </message>
-    <message>
-        <source>Wallet Data (*.dat)</source>
-        <translation>Data peněženky (*.dat)</translation>
-    </message>
-    <message>
-        <source>Backup Failed</source>
-        <translation>Zálohování selhalo</translation>
-    </message>
-    <message>
-        <source>There was an error trying to save the wallet data to %1.</source>
-        <translation>Při ukládání peněženky do %1 se přihodila nějaká chyba.</translation>
-    </message>
-    <message>
-        <source>The wallet data was successfully saved to %1.</source>
-        <translation>Data z peněženky byla v pořádku uložena do %1.</translation>
-    </message>
+    <name>UnitDisplayStatusBarControl</name>
     <message>
-        <source>Backup Successful</source>
-        <translation>Úspěšně zazálohováno</translation>
+        <source>Unit to show amounts in. Click to select another unit.</source>
+        <translation>Jednotka pro částky. Klikni pro výběr nějaké jiné.</translation>
     </message>
 </context>
 <context>
@@ -2883,10 +1622,6 @@
         <source>If &lt;category&gt; is not supplied or if &lt;category&gt; = 1, output all debugging information.</source>
         <translation>Pokud není &lt;category&gt; zadána nebo je &lt;category&gt; = 1, bude tisknout veškeré ladicí informace.</translation>
     </message>
-    <message>
-        <source>Please check that your computer's date and time are correct! If your clock is wrong Bitcoin Core will not work properly.</source>
-        <translation>Prosím zkontrolujte nastavení času na svém počítači. Pokud čas a datum není nastaven správně, Bitcoin Core nebude fungovat!</translation>
-    </message>
     <message>
         <source>Prune configured below the minimum of %d MiB.  Please use a higher number.</source>
         <translation>Prořezávání je nastaveno pod minimum %d MiB.  Použij, prosím, nějaké vyšší číslo.</translation>
@@ -2927,6 +1662,10 @@
         <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
         <translation>Přijímat spojení zvenčí (výchozí: 1, pokud není zadáno -proxy nebo -connect)</translation>
     </message>
+    <message>
+        <source>Bitcoin Core</source>
+        <translation>Bitcoin Core</translation>
+    </message>
     <message>
         <source>-fallbackfee is set very high! This is the transaction fee you may pay when fee estimates are not available.</source>
         <translation>-fallbackfee je nastaveno velmi vysoko! Toto je transakční poplatek, který bys platil, pokud nebude k dispozici odhad poplatků.</translation>
@@ -2971,14 +1710,6 @@
         <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
         <translation>Tohle je testovací verze – používej ji jen na vlastní riziko, ale rozhodně ji nepoužívej k těžbě nebo pro obchodní aplikace</translation>
     </message>
-    <message>
-        <source>Unable to bind to %s on this computer. Bitcoin Core is probably already running.</source>
-        <translation>Nedaří se mi připojit na %s na tomhle počítači. Bitcoin Core už pravděpodobně jednou běží.</translation>
-    </message>
-    <message>
-        <source>Unsupported argument -whitelistalwaysrelay ignored, use -whitelistrelay and/or -whitelistforcerelay.</source>
-        <translation>Nepodporovaný argument -whitelistalwaysrelay se ignoruje, použij -whitelistrelay a/nebo -whitelistforcerelay.</translation>
-    </message>
     <message>
         <source>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</source>
         <translation>Použít UPnP k namapování naslouchacího portu (výchozí: 1, pokud naslouchá a nepoužívá -proxy)</translation>
@@ -2999,10 +1730,6 @@
         <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source>
         <translation>Upozornění: Nesouhlasím zcela se svými protějšky! Možná potřebuji aktualizovat nebo ostatní uzly potřebují aktualizovat.</translation>
     </message>
-    <message>
-        <source>Warning: wallet.dat corrupt, data salvaged! Original wallet.dat saved as wallet.{timestamp}.bak in %s; if your balance or transactions are incorrect you should restore from a backup.</source>
-        <translation>Upozornění: soubor wallet.dat je poškozený, data jsou však zachráněna! Původní soubor wallet.dat je uložený jako wallet.{timestamp}.bak v %s. Pokud jsou stav tvého účtu nebo transakce nesprávné, zřejmě bys měl obnovit zálohu.</translation>
-    </message>
     <message>
         <source>Whitelist peers connecting from the given netmask or IP address. Can be specified multiple times.</source>
         <translation>Vždy vítat protějšky připojující se z dané podsítě či IP adresy. Lze zadat i vícekrát.</translation>
@@ -3167,10 +1894,6 @@
         <source>Wallet options:</source>
         <translation>Možnosti peněženky:</translation>
     </message>
-    <message>
-        <source>You need to rebuild the database using -reindex to change -txindex</source>
-        <translation>Je třeba přestavět databázi použitím -reindex, aby bylo možné změnit -txindex</translation>
-    </message>
     <message>
         <source>Allow JSON-RPC connections from specified source. Valid for &lt;ip&gt; are a single IP (e.g. 1.2.3.4), a network/netmask (e.g. 1.2.3.4/255.255.255.0) or a network/CIDR (e.g. 1.2.3.4/24). This option can be specified multiple times</source>
         <translation>Povolit JSON-RPC spojení ze specifikovaného zdroje. Platnou hodnotou &lt;ip&gt; je jednotlivá IP adresa (např. 1.2.3.4), síť/maska (např. 1.2.3.4/255.255.255.0) nebo síť/CIDR (např. 1.2.3.4/24). Tuto volbu lze použít i vícekrát</translation>
@@ -3183,10 +1906,6 @@
         <source>Bind to given address to listen for JSON-RPC connections. Use [host]:port notation for IPv6. This option can be specified multiple times (default: bind to all interfaces)</source>
         <translation>Čekat na zadané adrese na JSON-RPC spojení. Pro zápis IPv6 adresy použij notaci [adresa]:port. Tuto volbu lze použít i vícekrát (výchozí: poslouchat na všech rozhraních)</translation>
     </message>
-    <message>
-        <source>Cannot obtain a lock on data directory %s. Bitcoin Core is probably already running.</source>
-        <translation>Nedaří se mi získat zámek na datový adresář %s. Bitcoin Core pravděpodobně už jednou běží.</translation>
-    </message>
     <message>
         <source>Create new files with system default permissions, instead of umask 077 (only effective with disabled wallet functionality)</source>
         <translation>Vytvářet nové soubory s výchozími systémovými právy namísto umask 077 (uplatní se, pouze pokud je vypnutá funkce peněženky)</translation>
@@ -3231,10 +1950,6 @@
         <source>Set maximum size of high-priority/low-fee transactions in bytes (default: %d)</source>
         <translation>Nastavit maximální velikost prioritních/nízkopoplatkových transakcí v bajtech (výchozí: %d)</translation>
     </message>
-    <message>
-        <source>Set the number of threads for coin generation if enabled (-1 = all cores, default: %d)</source>
-        <translation>Nastavení počtu vláken pro těžení, je-li zapnuté (-1 = všechna jádra, výchozí: %d)</translation>
-    </message>
     <message>
         <source>The transaction amount is too small to send after the fee has been deducted</source>
         <translation>Částka v transakci po odečtení poplatku je příliš malá na odeslání</translation>
@@ -3259,34 +1974,14 @@
         <source>Accept public REST requests (default: %u)</source>
         <translation>Přijímat veřejné REST požadavky (výchozí: %u)</translation>
     </message>
-    <message>
-        <source>Activating best chain...</source>
-        <translation>Aktivuji nejlepší řetězec...</translation>
-    </message>
-    <message>
-        <source>Attempt to recover private keys from a corrupt wallet.dat on startup</source>
-        <translation>Pokusit se při startu zachránit soukromé klíče z poškozeného souboru wallet.dat</translation>
-    </message>
     <message>
         <source>Automatically create Tor hidden service (default: %d)</source>
         <translation>Automaticky v Toru vytvářet skryté služby (výchozí: %d)</translation>
     </message>
-    <message>
-        <source>Cannot resolve -whitebind address: '%s'</source>
-        <translation>Nemohu přeložit -whitebind adresu: '%s'</translation>
-    </message>
     <message>
         <source>Connect through SOCKS5 proxy</source>
         <translation>Připojit se přes SOCKS5 proxy</translation>
     </message>
-    <message>
-        <source>Copyright (C) 2009-%i The Bitcoin Core Developers</source>
-        <translation>Copyright (C) 2009-%i Vývojáři Bitcoin Core</translation>
-    </message>
-    <message>
-        <source>Error loading wallet.dat: Wallet requires newer version of Bitcoin Core</source>
-        <translation>Chyba při načítání wallet.dat: peněženka vyžaduje novější verzi Bitcoin Core</translation>
-    </message>
     <message>
         <source>Error reading from database, shutting down.</source>
         <translation>Chyba při čtení z databáze, ukončuji se.</translation>
@@ -3299,22 +1994,6 @@
         <source>Information</source>
         <translation>Informace</translation>
     </message>
-    <message>
-        <source>Initialization sanity check failed. Bitcoin Core is shutting down.</source>
-        <translation>Selhala úvodní zevrubná prověrka. Bitcoin Core se ukončuje.</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -maxtxfee=&lt;amount&gt;: '%s'</source>
-        <translation>Neplatná částka pro -maxtxfee=&lt;amount&gt;: '%s'</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -minrelaytxfee=&lt;amount&gt;: '%s'</source>
-        <translation>Neplatná částka pro -minrelaytxfee=&lt;částka&gt;: '%s'</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -mintxfee=&lt;amount&gt;: '%s'</source>
-        <translation>Neplatná částka pro -mintxfee=&lt;částka&gt;: '%s'</translation>
-    </message>
     <message>
         <source>Invalid amount for -paytxfee=&lt;amount&gt;: '%s' (must be at least %s)</source>
         <translation>Neplatná částka pro -paytxfee=&lt;částka&gt;: '%s' (musí být alespoň %s)</translation>
@@ -3339,14 +2018,6 @@
         <source>RPC server options:</source>
         <translation>Možnosti RPC serveru:</translation>
     </message>
-    <message>
-        <source>Rebuild block chain index from current blk000??.dat files on startup</source>
-        <translation>Při startu znovu vytvořit index řetězce bloků z aktuálních blk000??.dat souborů</translation>
-    </message>
-    <message>
-        <source>Receive and display P2P network alerts (default: %u)</source>
-        <translation>Přijímat a zobrazovat poplachy z P2P sítě (výchozí: %u)</translation>
-    </message>
     <message>
         <source>Reducing -maxconnections from %d to %d, because of system limitations.</source>
         <translation>Omezuji -maxconnections z %d na %d kvůli systémovým omezením.</translation>
@@ -3419,10 +2090,6 @@
         <source>Username for JSON-RPC connections</source>
         <translation>Uživatelské jméno pro JSON-RPC spojení</translation>
     </message>
-    <message>
-        <source>Wallet needed to be rewritten: restart Bitcoin Core to complete</source>
-        <translation>Soubor s peněženkou potřeboval přepsat: restartuj Bitcoin Core, aby se operace dokončila</translation>
-    </message>
     <message>
         <source>Warning</source>
         <translation>Upozornění</translation>
@@ -3439,10 +2106,6 @@
         <source>ZeroMQ notification options:</source>
         <translation>Možnosti ZeroMQ oznámení:</translation>
     </message>
-    <message>
-        <source>wallet.dat corrupt, salvage failed</source>
-        <translation>Soubor wallet.dat je poškozen, jeho záchrana se nezdařila</translation>
-    </message>
     <message>
         <source>Password for JSON-RPC connections</source>
         <translation>Heslo pro JSON-RPC spojení</translation>
@@ -3451,10 +2114,6 @@
         <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
         <translation>Spustit příkaz, když se změní nejlepší blok (%s se v příkazu nahradí hashem bloku)</translation>
     </message>
-    <message>
-        <source>This help message</source>
-        <translation>Tato nápověda</translation>
-    </message>
     <message>
         <source>Allow DNS lookups for -addnode, -seednode and -connect</source>
         <translation>Povolit DNS dotazy pro -addnode (přidání uzlu), -seednode a -connect (připojení)</translation>
@@ -3463,10 +2122,6 @@
         <source>Loading addresses...</source>
         <translation>Načítám adresy...</translation>
     </message>
-    <message>
-        <source>Error loading wallet.dat: Wallet corrupted</source>
-        <translation>Chyba při načítání wallet.dat: peněženka je poškozená</translation>
-    </message>
     <message>
         <source>(1 = keep tx meta data e.g. account owner and payment request information, 2 = drop tx meta data)</source>
         <translation>(1 = ukládat transakční metadata, např. majitele účtu a informace o platebním požadavku, 2 = mazat transakční metadata)</translation>
@@ -3483,10 +2138,6 @@
         <source>Do not keep transactions in the mempool longer than &lt;n&gt; hours (default: %u)</source>
         <translation>Nedržet transakce v zásobníku déle než &lt;n&gt; hodin (výchozí: %u)</translation>
     </message>
-    <message>
-        <source>Error reading wallet.dat! All keys read correctly, but transaction data or address book entries might be missing or incorrect.</source>
-        <translation>Nastala chyba při čtení souboru wallet.dat! Všechny klíče se přečetly správně, ale data o transakcích nebo záznamy v adresáři mohou chybět či být nesprávné.</translation>
-    </message>
     <message>
         <source>Fees (in %s/kB) smaller than this are considered zero fee for transaction creation (default: %s)</source>
         <translation>Poplatky (v %s/kB) menší než tato hodnota jsou považovány za nulové pro účely vytváření transakcí (výchozí: %s)</translation>
@@ -3523,6 +2174,10 @@
         <source>Unsupported argument -socks found. Setting SOCKS version isn't possible anymore, only SOCKS5 proxies are supported.</source>
         <translation>Byl použit nepodporovaný argument -socks. Nastavení verze SOCKS už není možné, podporovány jsou pouze SOCKS5 proxy.</translation>
     </message>
+    <message>
+        <source>Unsupported argument -whitelistalwaysrelay ignored, use -whitelistrelay and/or -whitelistforcerelay.</source>
+        <translation>Nepodporovaný argument -whitelistalwaysrelay se ignoruje, použij -whitelistrelay a/nebo -whitelistforcerelay.</translation>
+    </message>
     <message>
         <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: %s)</source>
         <translation>Použít samostatnou SOCKS5 proxy ke spojení s protějšky přes skryté služby v Toru (výchozí: %s)</translation>
@@ -3539,14 +2194,6 @@
         <source>Always query for peer addresses via DNS lookup (default: %u)</source>
         <translation>Vždy získávat adresy dalších protějšků přes DNS (výchozí: %u)</translation>
     </message>
-    <message>
-        <source>Error loading wallet.dat</source>
-        <translation>Chyba při načítání wallet.dat</translation>
-    </message>
-    <message>
-        <source>Generate coins (default: %u)</source>
-        <translation>Těžit (výchozí: %u)</translation>
-    </message>
     <message>
         <source>How many blocks to check at startup (default: %u, 0 = all)</source>
         <translation>Kolik bloků při startu zkontrolovat (výchozí: %u, 0 = všechny)</translation>
@@ -3627,18 +2274,6 @@
         <source>Unknown network specified in -onlynet: '%s'</source>
         <translation>V -onlynet byla uvedena neznámá síť: '%s'</translation>
     </message>
-    <message>
-        <source>Cannot resolve -bind address: '%s'</source>
-        <translation>Nemohu přeložit -bind adresu: '%s'</translation>
-    </message>
-    <message>
-        <source>Cannot resolve -externalip address: '%s'</source>
-        <translation>Nemohu přeložit -externalip adresu: '%s'</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -paytxfee=&lt;amount&gt;: '%s'</source>
-        <translation>Neplatná částka pro -paytxfee=&lt;částka&gt;: '%s'</translation>
-    </message>
     <message>
         <source>Insufficient funds</source>
         <translation>Nedostatek prostředků</translation>
diff --git a/src/qt/locale/bitcoin_cs_CZ.ts b/src/qt/locale/bitcoin_cs_CZ.ts
index 34d7b4b4a1644..70aa981f5036d 100644
--- a/src/qt/locale/bitcoin_cs_CZ.ts
+++ b/src/qt/locale/bitcoin_cs_CZ.ts
@@ -29,25 +29,6 @@
         <source>&amp;Delete</source>
         <translation>&amp;Odstranit</translation>
     </message>
-    <message>
-        <source>Comma separated file (*.csv)</source>
-        <translation>Textový soubor oddělený středníkem (*.csv)</translation>
-    </message>
-    </context>
-<context>
-    <name>AddressTableModel</name>
-    <message>
-        <source>Label</source>
-        <translation>Popis</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>Adresa</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(bez popisu)</translation>
-    </message>
 </context>
 <context>
     <name>AskPassphraseDialog</name>
@@ -63,63 +44,7 @@
         <source>Repeat new passphrase</source>
         <translation>Zopakujte nové heslo</translation>
     </message>
-    <message>
-        <source>Encrypt wallet</source>
-        <translation>Zašifrovat peněženku</translation>
-    </message>
-    <message>
-        <source>This operation needs your wallet passphrase to unlock the wallet.</source>
-        <translation>Tato operace vyžaduje heslo k odemknutí peněženky.</translation>
-    </message>
-    <message>
-        <source>Unlock wallet</source>
-        <translation>Odemknout peněženku</translation>
-    </message>
-    <message>
-        <source>This operation needs your wallet passphrase to decrypt the wallet.</source>
-        <translation>Tato operace vyžaduje heslo k dešifrování peněženky.</translation>
-    </message>
-    <message>
-        <source>Decrypt wallet</source>
-        <translation>Dešifrovat peněženku</translation>
-    </message>
-    <message>
-        <source>Change passphrase</source>
-        <translation>Změnit heslo</translation>
-    </message>
-    <message>
-        <source>Confirm wallet encryption</source>
-        <translation>Potvrďte zašifrování peněženky</translation>
-    </message>
-    <message>
-        <source>Wallet encrypted</source>
-        <translation>Peněženka zašifrována</translation>
-    </message>
-    <message>
-        <source>Wallet encryption failed</source>
-        <translation>Zašifrování peněženky selhalo</translation>
-    </message>
-    <message>
-        <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
-        <translation>Šifrování peněženky selhalo vinou vnitřní chyby. Vaše peněženka nebyla zašifrována.</translation>
-    </message>
-    <message>
-        <source>The supplied passphrases do not match.</source>
-        <translation>Zadaná hesla nejsou shodná.</translation>
-    </message>
-    <message>
-        <source>Wallet unlock failed</source>
-        <translation>Odemčení peněženky selhalo</translation>
-    </message>
-    <message>
-        <source>The passphrase entered for the wallet decryption was incorrect.</source>
-        <translation>Heslo zadané k dešifrování peněženky nebylo správné</translation>
-    </message>
-    <message>
-        <source>Wallet decryption failed</source>
-        <translation>Deěifrování peněženky selhalo</translation>
-    </message>
-    </context>
+</context>
 <context>
     <name>BanTableModel</name>
     </context>
@@ -202,9 +127,6 @@
         <translation>Peněženka je &lt;b&gt;zašifrována&lt;/b&gt; a momentálně &lt;b&gt;uzamčená&lt;/b&gt;</translation>
     </message>
 </context>
-<context>
-    <name>ClientModel</name>
-    </context>
 <context>
     <name>CoinControlDialog</name>
     <message>
@@ -223,18 +145,6 @@
         <source>Confirmed</source>
         <translation>Potvrzeno</translation>
     </message>
-    <message>
-        <source>Copy address</source>
-        <translation>Kopírovat sdresu</translation>
-    </message>
-    <message>
-        <source>Copy label</source>
-        <translation>Kopírovat popis</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(bez popisu)</translation>
-    </message>
     </context>
 <context>
     <name>EditAddressDialog</name>
@@ -250,34 +160,6 @@
         <source>&amp;Address</source>
         <translation>&amp;Adresa</translation>
     </message>
-    <message>
-        <source>New receiving address</source>
-        <translation>Nová adresa pro příjem</translation>
-    </message>
-    <message>
-        <source>New sending address</source>
-        <translation>Nová adresa k odeslání</translation>
-    </message>
-    <message>
-        <source>Edit receiving address</source>
-        <translation>Upravit adresu pro příjem</translation>
-    </message>
-    <message>
-        <source>Edit sending address</source>
-        <translation>Upravit adresu k odeslání</translation>
-    </message>
-    <message>
-        <source>The entered address "%1" is already in the address book.</source>
-        <translation>Zadaná adresa "%1" se již v seznamu adres nachází.</translation>
-    </message>
-    <message>
-        <source>Could not unlock wallet.</source>
-        <translation>Nemohu odemknout peněženku</translation>
-    </message>
-    <message>
-        <source>New key generation failed.</source>
-        <translation>Generování nového klíče selhalo.</translation>
-    </message>
 </context>
 <context>
     <name>FreespaceChecker</name>
@@ -317,9 +199,6 @@
 <context>
     <name>OverviewPage</name>
     </context>
-<context>
-    <name>PaymentServer</name>
-    </context>
 <context>
     <name>PeerTableModel</name>
     </context>
@@ -330,9 +209,6 @@
         <translation>Množství</translation>
     </message>
     </context>
-<context>
-    <name>QRImageWidget</name>
-    </context>
 <context>
     <name>RPCConsole</name>
     <message>
@@ -350,52 +226,9 @@
         <source>&amp;Message:</source>
         <translation>Zpráva:</translation>
     </message>
-    <message>
-        <source>Copy label</source>
-        <translation>Kopírovat popis</translation>
-    </message>
     </context>
 <context>
     <name>ReceiveRequestDialog</name>
-    <message>
-        <source>Address</source>
-        <translation>Adresa</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>Množství</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Popis</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>Zpráva</translation>
-    </message>
-    </context>
-<context>
-    <name>RecentRequestsTableModel</name>
-    <message>
-        <source>Date</source>
-        <translation>Datum</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Popis</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>Zpráva</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>Množství</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(bez popisu)</translation>
-    </message>
     </context>
 <context>
     <name>SendCoinsDialog</name>
@@ -407,14 +240,6 @@
         <source>Balance:</source>
         <translation>Zůstatek:</translation>
     </message>
-    <message>
-        <source>The amount to pay must be larger than 0.</source>
-        <translation>Částka k zaplacení musí být větší než 0.</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(bez popisu)</translation>
-    </message>
     </context>
 <context>
     <name>SendCoinsEntry</name>
@@ -443,210 +268,16 @@
 <context>
     <name>TrafficGraphWidget</name>
     </context>
-<context>
-    <name>TransactionDesc</name>
-    <message>
-        <source>%1/unconfirmed</source>
-        <translation>%1 potvrzeno</translation>
-    </message>
-    <message>
-        <source>%1 confirmations</source>
-        <translation>%1 potvrzení</translation>
-    </message>
-    <message>
-        <source>Status</source>
-        <translation>Stav</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation>Datum</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>Zpráva</translation>
-    </message>
-    <message>
-        <source>Transaction</source>
-        <translation>Transakce</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>Množství</translation>
-    </message>
-    </context>
 <context>
     <name>TransactionDescDialog</name>
-    <message>
-        <source>Transaction details</source>
-        <translation>Detaily transakce</translation>
-    </message>
     <message>
         <source>This pane shows a detailed description of the transaction</source>
         <translation>Toto podokno zobrazuje detailní popis transakce</translation>
     </message>
 </context>
-<context>
-    <name>TransactionTableModel</name>
-    <message>
-        <source>Date</source>
-        <translation>Datum</translation>
-    </message>
-    <message>
-        <source>Type</source>
-        <translation>Typ</translation>
-    </message>
-    <message>
-        <source>Confirmed (%1 confirmations)</source>
-        <translation>Potvrzeno (%1 potvrzení)</translation>
-    </message>
-    <message>
-        <source>This block was not received by any other nodes and will probably not be accepted!</source>
-        <translation>Tento blok nebyl přijat žádným dalším uzlem a pravděpodobně nebude akceptován!</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Popis</translation>
-    </message>
-    <message>
-        <source>Received with</source>
-        <translation>Přijato s</translation>
-    </message>
-    <message>
-        <source>Sent to</source>
-        <translation>Odesláno na</translation>
-    </message>
-    <message>
-        <source>Payment to yourself</source>
-        <translation>Platba sobě samému</translation>
-    </message>
-    <message>
-        <source>Mined</source>
-        <translation>Vytěženo</translation>
-    </message>
-    <message>
-        <source>Type of transaction.</source>
-        <translation>Typ transakce.</translation>
-    </message>
-    </context>
-<context>
-    <name>TransactionView</name>
-    <message>
-        <source>All</source>
-        <translation>Vše</translation>
-    </message>
-    <message>
-        <source>Today</source>
-        <translation>Dnes</translation>
-    </message>
-    <message>
-        <source>This week</source>
-        <translation>Tento týden</translation>
-    </message>
-    <message>
-        <source>This month</source>
-        <translation>Tento měsíc</translation>
-    </message>
-    <message>
-        <source>Last month</source>
-        <translation>Minulý měsíc</translation>
-    </message>
-    <message>
-        <source>This year</source>
-        <translation>Tento rok</translation>
-    </message>
-    <message>
-        <source>Range...</source>
-        <translation>Rozsah...</translation>
-    </message>
-    <message>
-        <source>Received with</source>
-        <translation>Přijato s</translation>
-    </message>
-    <message>
-        <source>Sent to</source>
-        <translation>Odesláno na</translation>
-    </message>
-    <message>
-        <source>To yourself</source>
-        <translation>Sobě samému</translation>
-    </message>
-    <message>
-        <source>Mined</source>
-        <translation>Vytěženo</translation>
-    </message>
-    <message>
-        <source>Other</source>
-        <translation>Ostatní</translation>
-    </message>
-    <message>
-        <source>Min amount</source>
-        <translation>Min. množství</translation>
-    </message>
-    <message>
-        <source>Copy address</source>
-        <translation>Kopírovat sdresu</translation>
-    </message>
-    <message>
-        <source>Copy label</source>
-        <translation>Kopírovat popis</translation>
-    </message>
-    <message>
-        <source>Edit label</source>
-        <translation>Upravit popis</translation>
-    </message>
-    <message>
-        <source>Comma separated file (*.csv)</source>
-        <translation>Textový soubor oddělený středníkem (*.csv)</translation>
-    </message>
-    <message>
-        <source>Confirmed</source>
-        <translation>Potvrzeno</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation>Datum</translation>
-    </message>
-    <message>
-        <source>Type</source>
-        <translation>Typ</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Popis</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>Adresa</translation>
-    </message>
-    <message>
-        <source>ID</source>
-        <translation>ID</translation>
-    </message>
-    <message>
-        <source>Range:</source>
-        <translation>Rozsah:</translation>
-    </message>
-    </context>
 <context>
     <name>UnitDisplayStatusBarControl</name>
     </context>
-<context>
-    <name>WalletFrame</name>
-    </context>
-<context>
-    <name>WalletModel</name>
-    </context>
-<context>
-    <name>WalletView</name>
-    <message>
-        <source>&amp;Export</source>
-        <translation>&amp;Exportovat</translation>
-    </message>
-    <message>
-        <source>Export the data in the current tab to a file</source>
-        <translation>Exportovat aktuální pohled do souboru</translation>
-    </message>
-    </context>
 <context>
     <name>bitcoin-core</name>
     <message>
diff --git a/src/qt/locale/bitcoin_cy.ts b/src/qt/locale/bitcoin_cy.ts
index c32d236a919e2..38bc45775bc1a 100644
--- a/src/qt/locale/bitcoin_cy.ts
+++ b/src/qt/locale/bitcoin_cy.ts
@@ -21,10 +21,6 @@
         <source>C&amp;lose</source>
         <translation>C&amp;au</translation>
     </message>
-    <message>
-        <source>&amp;Copy Address</source>
-        <translation>&amp;Cyfeiriad Copi</translation>
-    </message>
     <message>
         <source>&amp;Export</source>
         <translation>&amp;Allforio</translation>
@@ -33,49 +29,6 @@
         <source>&amp;Delete</source>
         <translation>&amp;Dileu</translation>
     </message>
-    <message>
-        <source>C&amp;hoose</source>
-        <translation>&amp;Dewis</translation>
-    </message>
-    <message>
-        <source>Sending addresses</source>
-        <translation>Cyfeiriadau anfon</translation>
-    </message>
-    <message>
-        <source>Receiving addresses</source>
-        <translation>Cyfeiriadau derbyn</translation>
-    </message>
-    <message>
-        <source>Copy &amp;Label</source>
-        <translation>Copïo &amp;Label</translation>
-    </message>
-    <message>
-        <source>&amp;Edit</source>
-        <translation>&amp;Golygu</translation>
-    </message>
-    <message>
-        <source>Export Address List</source>
-        <translation>Allforio Rhestr Cyfeiriad</translation>
-    </message>
-    <message>
-        <source>Exporting Failed</source>
-        <translation>Methodd Allfor</translation>
-    </message>
-    </context>
-<context>
-    <name>AddressTableModel</name>
-    <message>
-        <source>Label</source>
-        <translation>Label</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>Cyfeiriad</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(heb label)</translation>
-    </message>
 </context>
 <context>
     <name>AskPassphraseDialog</name>
@@ -91,63 +44,7 @@
         <source>Repeat new passphrase</source>
         <translation>Ailadroddwch gyfrinymadrodd newydd</translation>
     </message>
-    <message>
-        <source>Encrypt wallet</source>
-        <translation>Amgryptio'r waled</translation>
-    </message>
-    <message>
-        <source>This operation needs your wallet passphrase to unlock the wallet.</source>
-        <translation>Mae angen i'r gweithred hon ddefnyddio'ch cyfrinymadrodd er mwyn datgloi'r waled.</translation>
-    </message>
-    <message>
-        <source>Unlock wallet</source>
-        <translation>Datgloi'r waled</translation>
-    </message>
-    <message>
-        <source>This operation needs your wallet passphrase to decrypt the wallet.</source>
-        <translation>Mae angen i'r gweithred hon ddefnyddio'ch cyfrinymadrodd er mwyn dadgryptio'r waled.</translation>
-    </message>
-    <message>
-        <source>Decrypt wallet</source>
-        <translation>Dadgryptio'r waled</translation>
-    </message>
-    <message>
-        <source>Change passphrase</source>
-        <translation>Newid cyfrinymadrodd</translation>
-    </message>
-    <message>
-        <source>Confirm wallet encryption</source>
-        <translation>Cadarnau amgryptiad y waled</translation>
-    </message>
-    <message>
-        <source>Are you sure you wish to encrypt your wallet?</source>
-        <translation>Ydych chi'n siwr eich bod chi eisiau amgryptio dy waled di?</translation>
-    </message>
-    <message>
-        <source>Wallet encrypted</source>
-        <translation>Waled wedi'i amgryptio</translation>
-    </message>
-    <message>
-        <source>Wallet encryption failed</source>
-        <translation>Amgryptiad waled wedi methu</translation>
-    </message>
-    <message>
-        <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
-        <translation>Methodd amgryptiad y waled oherwydd gwall mewnol. Ni amgryptwyd eich waled.</translation>
-    </message>
-    <message>
-        <source>The supplied passphrases do not match.</source>
-        <translation>Dydy'r cyfrinymadroddion a ddarparwyd ddim yn cyd-fynd â'u gilydd.</translation>
-    </message>
-    <message>
-        <source>Wallet unlock failed</source>
-        <translation>Methodd ddatgloi'r waled</translation>
-    </message>
-    <message>
-        <source>Wallet decryption failed</source>
-        <translation>Methodd dadgryptiad y waled</translation>
-    </message>
-    </context>
+</context>
 <context>
     <name>BanTableModel</name>
     </context>
@@ -229,10 +126,6 @@
         <source>&amp;Receive</source>
         <translation>&amp;Derbyn</translation>
     </message>
-    <message>
-        <source>Show information about Bitcoin Core</source>
-        <translation>Dangos gwybodaeth am Graidd Bitcoin</translation>
-    </message>
     <message>
         <source>&amp;Show / Hide</source>
         <translation>&amp;Dangos / Cuddio</translation>
@@ -253,14 +146,6 @@
         <source>Tabs toolbar</source>
         <translation>Bar offer tabiau</translation>
     </message>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Craidd Bitcoin</translation>
-    </message>
-    <message>
-        <source>&amp;About Bitcoin Core</source>
-        <translation>&amp;Ynghylch Craidd Bitcoin</translation>
-    </message>
     <message numerus="yes">
         <source>%n hour(s)</source>
         <translation><numerusform>%n awr</numerusform><numerusform>%n awr</numerusform><numerusform>%n awr</numerusform><numerusform>%n awr</numerusform></translation>
@@ -342,9 +227,6 @@
         <translation>Mae'r waled &lt;b&gt;wedi'i amgryptio&lt;/b&gt; ac &lt;b&gt;ar glo&lt;/b&gt; ar hyn o bryd</translation>
     </message>
 </context>
-<context>
-    <name>ClientModel</name>
-    </context>
 <context>
     <name>CoinControlDialog</name>
     <message>
@@ -355,23 +237,7 @@
         <source>Date</source>
         <translation>Dyddiad</translation>
     </message>
-    <message>
-        <source>Copy address</source>
-        <translation>Cyfeiriad copi</translation>
-    </message>
-    <message>
-        <source>Copy label</source>
-        <translation>Copïo label</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(heb label)</translation>
-    </message>
-    <message>
-        <source>(change)</source>
-        <translation>(newid)</translation>
-    </message>
-</context>
+    </context>
 <context>
     <name>EditAddressDialog</name>
     <message>
@@ -386,34 +252,6 @@
         <source>&amp;Address</source>
         <translation>&amp;Cyfeiriad</translation>
     </message>
-    <message>
-        <source>New receiving address</source>
-        <translation>Cyfeiriad derbyn newydd</translation>
-    </message>
-    <message>
-        <source>New sending address</source>
-        <translation>Cyfeiriad anfon newydd</translation>
-    </message>
-    <message>
-        <source>Edit receiving address</source>
-        <translation>Golygu'r cyfeiriad derbyn</translation>
-    </message>
-    <message>
-        <source>Edit sending address</source>
-        <translation>Golygu'r cyfeiriad anfon</translation>
-    </message>
-    <message>
-        <source>The entered address "%1" is already in the address book.</source>
-        <translation>Mae'r cyfeiriad "%1" sydd newydd gael ei geisio gennych yn y llyfr cyfeiriad yn barod.</translation>
-    </message>
-    <message>
-        <source>Could not unlock wallet.</source>
-        <translation>Methodd ddatgloi'r waled.</translation>
-    </message>
-    <message>
-        <source>New key generation failed.</source>
-        <translation>Methodd gynhyrchu allwedd newydd.</translation>
-    </message>
 </context>
 <context>
     <name>FreespaceChecker</name>
@@ -424,14 +262,6 @@
     </context>
 <context>
     <name>HelpMessageDialog</name>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Craidd Bitcoin</translation>
-    </message>
-    <message>
-        <source>About Bitcoin Core</source>
-        <translation>Ynghylch Craidd Bitcoin</translation>
-    </message>
     <message>
         <source>Usage:</source>
         <translation>Cynefod:</translation>
@@ -443,14 +273,6 @@
         <source>Welcome</source>
         <translation>Croeso</translation>
     </message>
-    <message>
-        <source>Welcome to Bitcoin Core.</source>
-        <translation>Croeso i Graidd Bitcoin</translation>
-    </message>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Craidd Bitcoin</translation>
-    </message>
     <message>
         <source>Error</source>
         <translation>Gwall</translation>
@@ -509,18 +331,12 @@
         <translation>Ffurflen</translation>
     </message>
     </context>
-<context>
-    <name>PaymentServer</name>
-    </context>
 <context>
     <name>PeerTableModel</name>
     </context>
 <context>
     <name>QObject</name>
     </context>
-<context>
-    <name>QRImageWidget</name>
-    </context>
 <context>
     <name>RPCConsole</name>
     <message>
@@ -542,10 +358,6 @@
         <source>&amp;Label:</source>
         <translation>&amp;Label:</translation>
     </message>
-    <message>
-        <source>Copy label</source>
-        <translation>Copïo label</translation>
-    </message>
     </context>
 <context>
     <name>ReceiveRequestDialog</name>
@@ -553,37 +365,6 @@
         <source>Copy &amp;Address</source>
         <translation>&amp;Cyfeiriad Copi</translation>
     </message>
-    <message>
-        <source>Address</source>
-        <translation>Cyfeiriad</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Label</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>Neges</translation>
-    </message>
-    </context>
-<context>
-    <name>RecentRequestsTableModel</name>
-    <message>
-        <source>Date</source>
-        <translation>Dyddiad</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Label</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>Neges</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(heb label)</translation>
-    </message>
     </context>
 <context>
     <name>SendCoinsDialog</name>
@@ -607,14 +388,6 @@
         <source>Confirm the send action</source>
         <translation>Cadarnhau'r gweithrediad anfon</translation>
     </message>
-    <message>
-        <source>%1 to %2</source>
-        <translation>%1 i %2</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(heb label)</translation>
-    </message>
     </context>
 <context>
     <name>SendCoinsEntry</name>
@@ -663,14 +436,6 @@
     </context>
 <context>
     <name>SplashScreen</name>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Craidd Bitcoin</translation>
-    </message>
-    <message>
-        <source>The Bitcoin Core developers</source>
-        <translation>Datblygwyr Graidd Bitcoin</translation>
-    </message>
     <message>
         <source>[testnet]</source>
         <translation>[testnet]</translation>
@@ -679,108 +444,22 @@
 <context>
     <name>TrafficGraphWidget</name>
     </context>
-<context>
-    <name>TransactionDesc</name>
-    <message>
-        <source>Open until %1</source>
-        <translation>Agor tan %1</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation>Dyddiad</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>Neges</translation>
-    </message>
-    </context>
 <context>
     <name>TransactionDescDialog</name>
     </context>
-<context>
-    <name>TransactionTableModel</name>
-    <message>
-        <source>Date</source>
-        <translation>Dyddiad</translation>
-    </message>
-    <message>
-        <source>Type</source>
-        <translation>Math</translation>
-    </message>
-    <message>
-        <source>Open until %1</source>
-        <translation>Agor tan %1</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Label</translation>
-    </message>
-    </context>
-<context>
-    <name>TransactionView</name>
-    <message>
-        <source>Today</source>
-        <translation>Heddiw</translation>
-    </message>
-    <message>
-        <source>This year</source>
-        <translation>Eleni</translation>
-    </message>
-    <message>
-        <source>Copy address</source>
-        <translation>Cyfeiriad copi</translation>
-    </message>
-    <message>
-        <source>Copy label</source>
-        <translation>Copïo label</translation>
-    </message>
-    <message>
-        <source>Exporting Failed</source>
-        <translation>Methodd Allfor</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation>Dyddiad</translation>
-    </message>
-    <message>
-        <source>Type</source>
-        <translation>Math</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Label</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>Cyfeiriad</translation>
-    </message>
-    </context>
 <context>
     <name>UnitDisplayStatusBarControl</name>
     </context>
-<context>
-    <name>WalletFrame</name>
-    </context>
-<context>
-    <name>WalletModel</name>
-    <message>
-        <source>Send Coins</source>
-        <translation>Anfon arian</translation>
-    </message>
-</context>
-<context>
-    <name>WalletView</name>
-    <message>
-        <source>&amp;Export</source>
-        <translation>&amp;Allforio</translation>
-    </message>
-    </context>
 <context>
     <name>bitcoin-core</name>
     <message>
         <source>Options:</source>
         <translation>Opsiynau:</translation>
     </message>
+    <message>
+        <source>Bitcoin Core</source>
+        <translation>Craidd Bitcoin</translation>
+    </message>
     <message>
         <source>Information</source>
         <translation>Gwybodaeth</translation>
diff --git a/src/qt/locale/bitcoin_da.ts b/src/qt/locale/bitcoin_da.ts
index 7d11825a618a7..91903088cf5a4 100644
--- a/src/qt/locale/bitcoin_da.ts
+++ b/src/qt/locale/bitcoin_da.ts
@@ -25,10 +25,6 @@
         <source>C&amp;lose</source>
         <translation>&amp;Luk</translation>
     </message>
-    <message>
-        <source>&amp;Copy Address</source>
-        <translation>&amp;Kopiér adresse</translation>
-    </message>
     <message>
         <source>Delete the currently selected address from the list</source>
         <translation>Slet den markerede adresse fra listen</translation>
@@ -45,73 +41,6 @@
         <source>&amp;Delete</source>
         <translation>&amp;Slet</translation>
     </message>
-    <message>
-        <source>Choose the address to send coins to</source>
-        <translation>Vælg adresse at sende bitcoins til</translation>
-    </message>
-    <message>
-        <source>Choose the address to receive coins with</source>
-        <translation>Vælg adresse at modtage bitcoins med</translation>
-    </message>
-    <message>
-        <source>C&amp;hoose</source>
-        <translation>&amp;Vælg</translation>
-    </message>
-    <message>
-        <source>Sending addresses</source>
-        <translation>Afsendelsesadresser</translation>
-    </message>
-    <message>
-        <source>Receiving addresses</source>
-        <translation>Modtagelsesadresser</translation>
-    </message>
-    <message>
-        <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source>
-        <translation>Disse er dine Bitcoin-adresser for at sende betalinger. Tjek altid beløb og modtageradresse, inden du sender bitcoins.</translation>
-    </message>
-    <message>
-        <source>These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source>
-        <translation>Dette er dine Bitcoin-adresser til at modtage betalinger med. Det anbefales are bruge en ny modtagelsesadresse for hver transaktion.</translation>
-    </message>
-    <message>
-        <source>Copy &amp;Label</source>
-        <translation>Kopiér &amp;mærkat</translation>
-    </message>
-    <message>
-        <source>&amp;Edit</source>
-        <translation>&amp;Redigér</translation>
-    </message>
-    <message>
-        <source>Export Address List</source>
-        <translation>Eksportér adresseliste</translation>
-    </message>
-    <message>
-        <source>Comma separated file (*.csv)</source>
-        <translation>Kommasepareret fil (*.csv)</translation>
-    </message>
-    <message>
-        <source>Exporting Failed</source>
-        <translation>Eksport mislykkedes</translation>
-    </message>
-    <message>
-        <source>There was an error trying to save the address list to %1. Please try again.</source>
-        <translation>Der opstod en fejl under gemning af adresselisten til %1. Prøv venligst igen.</translation>
-    </message>
-</context>
-<context>
-    <name>AddressTableModel</name>
-    <message>
-        <source>Label</source>
-        <translation>Mærkat</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>Adresse</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(ingen mærkat)</translation>
-    </message>
 </context>
 <context>
     <name>AskPassphraseDialog</name>
@@ -131,94 +60,6 @@
         <source>Repeat new passphrase</source>
         <translation>Gentag ny adgangskode</translation>
     </message>
-    <message>
-        <source>Encrypt wallet</source>
-        <translation>Kryptér tegnebog</translation>
-    </message>
-    <message>
-        <source>This operation needs your wallet passphrase to unlock the wallet.</source>
-        <translation>Denne funktion har brug for din tegnebogs adgangskode for at låse tegnebogen op.</translation>
-    </message>
-    <message>
-        <source>Unlock wallet</source>
-        <translation>Lås tegnebog op</translation>
-    </message>
-    <message>
-        <source>This operation needs your wallet passphrase to decrypt the wallet.</source>
-        <translation>Denne funktion har brug for din tegnebogs adgangskode for at dekryptere tegnebogen.</translation>
-    </message>
-    <message>
-        <source>Decrypt wallet</source>
-        <translation>Dekryptér tegnebog</translation>
-    </message>
-    <message>
-        <source>Change passphrase</source>
-        <translation>Skift adgangskode</translation>
-    </message>
-    <message>
-        <source>Confirm wallet encryption</source>
-        <translation>Bekræft tegnebogskryptering</translation>
-    </message>
-    <message>
-        <source>Warning: If you encrypt your wallet and lose your passphrase, you will &lt;b&gt;LOSE ALL OF YOUR BITCOINS&lt;/b&gt;!</source>
-        <translation>Advarsel: Hvis du krypterer din tegnebog og mister din adgangskode, vil du &lt;b&gt;MISTE ALLE DINE BITCOINS&lt;/b&gt;!</translation>
-    </message>
-    <message>
-        <source>Are you sure you wish to encrypt your wallet?</source>
-        <translation>Er du sikker på, at du ønsker at kryptere din tegnebog?</translation>
-    </message>
-    <message>
-        <source>Bitcoin Core will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source>
-        <translation>Bitcoin Core vil nu lukke for at færdiggøre krypteringsprocessen. Husk at kryptering af din tegnebog kan ikke beskytte dine bitcoin fuldt ud mod at blive stjålet af eventuel malware, der måtte have inficeret din computer.</translation>
-    </message>
-    <message>
-        <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source>
-        <translation>VIGTIGT: Enhver tidligere sikkerhedskopi, som du har lavet af tegnebogsfilen, bør blive erstattet af den nyligt genererede, krypterede tegnebogsfil. Af sikkerhedsmæssige årsager vil tidligere sikkerhedskopier af den ikke-krypterede tegnebogsfil blive ubrugelige i det øjeblik, du starter med at anvende den nye, krypterede tegnebog.</translation>
-    </message>
-    <message>
-        <source>Warning: The Caps Lock key is on!</source>
-        <translation>Advarsel: Caps Lock-tasten er aktiveret!</translation>
-    </message>
-    <message>
-        <source>Wallet encrypted</source>
-        <translation>Tegnebog krypteret</translation>
-    </message>
-    <message>
-        <source>Enter the new passphrase to the wallet.&lt;br/&gt;Please use a passphrase of &lt;b&gt;ten or more random characters&lt;/b&gt;, or &lt;b&gt;eight or more words&lt;/b&gt;.</source>
-        <translation>Indtast det nye kodeord til tegnebogen.&lt;br/&gt;Brug venligst et kodeord på &lt;b&gt;ti eller flere tilfældige tegn&lt;/b&gt; eller &lt;b&gt;otte eller flere ord&lt;/b&gt;.</translation>
-    </message>
-    <message>
-        <source>Enter the old passphrase and new passphrase to the wallet.</source>
-        <translation>Indtast den gamle adgangskode og en ny adgangskode til tegnebogen.</translation>
-    </message>
-    <message>
-        <source>Wallet encryption failed</source>
-        <translation>Tegnebogskryptering mislykkedes</translation>
-    </message>
-    <message>
-        <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
-        <translation>Tegnebogskryptering mislykkedes på grund af en intern fejl. Din tegnebog blev ikke krypteret.</translation>
-    </message>
-    <message>
-        <source>The supplied passphrases do not match.</source>
-        <translation>De angivne adgangskoder stemmer ikke overens.</translation>
-    </message>
-    <message>
-        <source>Wallet unlock failed</source>
-        <translation>Tegnebogsoplåsning mislykkedes</translation>
-    </message>
-    <message>
-        <source>The passphrase entered for the wallet decryption was incorrect.</source>
-        <translation>Den angivne adgangskode for tegnebogsdekrypteringen er forkert.</translation>
-    </message>
-    <message>
-        <source>Wallet decryption failed</source>
-        <translation>Tegnebogsdekryptering mislykkedes</translation>
-    </message>
-    <message>
-        <source>Wallet passphrase was successfully changed.</source>
-        <translation>Tegnebogens adgangskode blev ændret.</translation>
-    </message>
 </context>
 <context>
     <name>BanTableModel</name>
@@ -269,6 +110,14 @@
         <source>Quit application</source>
         <translation>Afslut program</translation>
     </message>
+    <message>
+        <source>&amp;About %1</source>
+        <translation>&amp;Om %1</translation>
+    </message>
+    <message>
+        <source>Show information about %1</source>
+        <translation>Vis informationer om %1</translation>
+    </message>
     <message>
         <source>About &amp;Qt</source>
         <translation>Om &amp;Qt</translation>
@@ -281,6 +130,10 @@
         <source>&amp;Options...</source>
         <translation>&amp;Indstillinger…</translation>
     </message>
+    <message>
+        <source>Modify configuration options for %1</source>
+        <translation>Redigér konfigurationsindstillinger for %1</translation>
+    </message>
     <message>
         <source>&amp;Encrypt Wallet...</source>
         <translation>&amp;Kryptér tegnebog…</translation>
@@ -305,14 +158,6 @@
         <source>Open &amp;URI...</source>
         <translation>&amp;Åbn URI…</translation>
     </message>
-    <message>
-        <source>Bitcoin Core client</source>
-        <translation>Bitcoin Core-klient</translation>
-    </message>
-    <message>
-        <source>Importing blocks from disk...</source>
-        <translation>Importerer blokke fra disken…</translation>
-    </message>
     <message>
         <source>Reindexing blocks on disk...</source>
         <translation>Genindekserer blokke på disken…</translation>
@@ -357,10 +202,6 @@
         <source>&amp;Receive</source>
         <translation>&amp;Modtag</translation>
     </message>
-    <message>
-        <source>Show information about Bitcoin Core</source>
-        <translation>Vis oplysninger om Bitcoin Core</translation>
-    </message>
     <message>
         <source>&amp;Show / Hide</source>
         <translation>&amp;Vis / skjul</translation>
@@ -397,22 +238,10 @@
         <source>Tabs toolbar</source>
         <translation>Faneværktøjslinje</translation>
     </message>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Bitcoin Core</translation>
-    </message>
     <message>
         <source>Request payments (generates QR codes and bitcoin: URIs)</source>
         <translation>Anmod om betalinger (genererer QR-koder og "bitcoin:"-URI'er)</translation>
     </message>
-    <message>
-        <source>&amp;About Bitcoin Core</source>
-        <translation>&amp;Om Bitcoin Core</translation>
-    </message>
-    <message>
-        <source>Modify configuration options for Bitcoin Core</source>
-        <translation>Ændr opsætning af Bitcoin Core</translation>
-    </message>
     <message>
         <source>Show the list of used sending addresses and labels</source>
         <translation>Vis listen over brugte afsendelsesadresser og -mærkater</translation>
@@ -429,14 +258,18 @@
         <source>&amp;Command-line options</source>
         <translation>Tilvalg for &amp;kommandolinje</translation>
     </message>
-    <message>
-        <source>Show the Bitcoin Core help message to get a list with possible Bitcoin command-line options</source>
-        <translation>Vis Bitcoin Core hjælpebesked for at få en liste over mulige tilvalg for Bitcoin kommandolinje</translation>
-    </message>
     <message numerus="yes">
         <source>%n active connection(s) to Bitcoin network</source>
         <translation><numerusform>%n aktiv forbindelse til Bitcoin-netværket</numerusform><numerusform>%n aktive forbindelser til Bitcoin-netværket</numerusform></translation>
     </message>
+    <message>
+        <source>Indexing blocks on disk...</source>
+        <translation>Genindekserer blokke på disken…</translation>
+    </message>
+    <message>
+        <source>Processing blocks on disk...</source>
+        <translation>Bearbejder blokke på disken…</translation>
+    </message>
     <message>
         <source>No block source available...</source>
         <translation>Ingen blokkilde tilgængelig…</translation>
@@ -493,6 +326,14 @@
         <source>Up to date</source>
         <translation>Opdateret</translation>
     </message>
+    <message>
+        <source>Show the %1 help message to get a list with possible Bitcoin command-line options</source>
+        <translation>Vis %1 hjælpebesked for at få en liste over mulige tilvalg for Bitcoin kommandolinje</translation>
+    </message>
+    <message>
+        <source>%1 client</source>
+        <translation>%1-klient</translation>
+    </message>
     <message>
         <source>Catching up...</source>
         <translation>Indhenter…</translation>
@@ -544,13 +385,6 @@
         <translation>Tegnebog er &lt;b&gt;krypteret&lt;/b&gt; og i øjeblikket &lt;b&gt;låst&lt;/b&gt;</translation>
     </message>
 </context>
-<context>
-    <name>ClientModel</name>
-    <message>
-        <source>Network Alert</source>
-        <translation>Netværksadvarsel</translation>
-    </message>
-</context>
 <context>
     <name>CoinControlDialog</name>
     <message>
@@ -629,150 +463,6 @@
         <source>Priority</source>
         <translation>Prioritet</translation>
     </message>
-    <message>
-        <source>Copy address</source>
-        <translation>Kopiér adresse</translation>
-    </message>
-    <message>
-        <source>Copy label</source>
-        <translation>Kopiér mærkat</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>Kopiér beløb</translation>
-    </message>
-    <message>
-        <source>Copy transaction ID</source>
-        <translation>Kopiér transaktions-ID</translation>
-    </message>
-    <message>
-        <source>Lock unspent</source>
-        <translation>Fastlås ubrugte</translation>
-    </message>
-    <message>
-        <source>Unlock unspent</source>
-        <translation>Lås ubrugte op</translation>
-    </message>
-    <message>
-        <source>Copy quantity</source>
-        <translation>Kopiér mængde</translation>
-    </message>
-    <message>
-        <source>Copy fee</source>
-        <translation>Kopiér gebyr</translation>
-    </message>
-    <message>
-        <source>Copy after fee</source>
-        <translation>Kopiér efter-gebyr</translation>
-    </message>
-    <message>
-        <source>Copy bytes</source>
-        <translation>Kopiér byte</translation>
-    </message>
-    <message>
-        <source>Copy priority</source>
-        <translation>Kopiér prioritet</translation>
-    </message>
-    <message>
-        <source>Copy dust</source>
-        <translation>Kopiér støv</translation>
-    </message>
-    <message>
-        <source>Copy change</source>
-        <translation>Kopiér byttepenge</translation>
-    </message>
-    <message>
-        <source>highest</source>
-        <translation>højest</translation>
-    </message>
-    <message>
-        <source>higher</source>
-        <translation>højere</translation>
-    </message>
-    <message>
-        <source>high</source>
-        <translation>højt</translation>
-    </message>
-    <message>
-        <source>medium-high</source>
-        <translation>mellemhøj</translation>
-    </message>
-    <message>
-        <source>medium</source>
-        <translation>medium</translation>
-    </message>
-    <message>
-        <source>low-medium</source>
-        <translation>mellemlav</translation>
-    </message>
-    <message>
-        <source>low</source>
-        <translation>lav</translation>
-    </message>
-    <message>
-        <source>lower</source>
-        <translation>lavere</translation>
-    </message>
-    <message>
-        <source>lowest</source>
-        <translation>lavest</translation>
-    </message>
-    <message>
-        <source>(%1 locked)</source>
-        <translation>(%1 fastlåst)</translation>
-    </message>
-    <message>
-        <source>none</source>
-        <translation>ingen</translation>
-    </message>
-    <message>
-        <source>This label turns red if the transaction size is greater than 1000 bytes.</source>
-        <translation>Denne mærkat bliver rød, hvis transaktionsstørrelsen er større end 1000 byte.</translation>
-    </message>
-    <message>
-        <source>This label turns red if the priority is smaller than "medium".</source>
-        <translation>Denne mærkat bliver rød, hvis prioriteten er mindre end "medium".</translation>
-    </message>
-    <message>
-        <source>This label turns red if any recipient receives an amount smaller than %1.</source>
-        <translation>Denne mærkat bliver rød, hvis en eller flere modtagere modtager et beløb, der er mindre end %1.</translation>
-    </message>
-    <message>
-        <source>Can vary +/- %1 satoshi(s) per input.</source>
-        <translation>Kan variere med +/- %1 satoshi per input.</translation>
-    </message>
-    <message>
-        <source>yes</source>
-        <translation>ja</translation>
-    </message>
-    <message>
-        <source>no</source>
-        <translation>nej</translation>
-    </message>
-    <message>
-        <source>This means a fee of at least %1 per kB is required.</source>
-        <translation>Dette betyder, at et gebyr på mindst %1 pr. kB er nødvendigt.</translation>
-    </message>
-    <message>
-        <source>Can vary +/- 1 byte per input.</source>
-        <translation>Kan variere ±1 byte pr. input.</translation>
-    </message>
-    <message>
-        <source>Transactions with higher priority are more likely to get included into a block.</source>
-        <translation>Transaktioner med højere prioritet har højere sansynlighed for at blive inkluderet i en blok.</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(ingen mærkat)</translation>
-    </message>
-    <message>
-        <source>change from %1 (%2)</source>
-        <translation>byttepenge fra %1 (%2)</translation>
-    </message>
-    <message>
-        <source>(change)</source>
-        <translation>(byttepange)</translation>
-    </message>
 </context>
 <context>
     <name>EditAddressDialog</name>
@@ -796,38 +486,6 @@
         <source>&amp;Address</source>
         <translation>&amp;Adresse</translation>
     </message>
-    <message>
-        <source>New receiving address</source>
-        <translation>Ny modtagelsesadresse</translation>
-    </message>
-    <message>
-        <source>New sending address</source>
-        <translation>Ny afsendelsesadresse</translation>
-    </message>
-    <message>
-        <source>Edit receiving address</source>
-        <translation>Redigér modtagelsesadresse</translation>
-    </message>
-    <message>
-        <source>Edit sending address</source>
-        <translation>Redigér afsendelsesadresse</translation>
-    </message>
-    <message>
-        <source>The entered address "%1" is already in the address book.</source>
-        <translation>Den indtastede adresse "%1" er allerede i adressebogen.</translation>
-    </message>
-    <message>
-        <source>The entered address "%1" is not a valid Bitcoin address.</source>
-        <translation>Den indtastede adresse "%1" er ikke en gyldig Bitcoin-adresse.</translation>
-    </message>
-    <message>
-        <source>Could not unlock wallet.</source>
-        <translation>Kunne ikke låse tegnebog op.</translation>
-    </message>
-    <message>
-        <source>New key generation failed.</source>
-        <translation>Ny nøglegenerering mislykkedes.</translation>
-    </message>
 </context>
 <context>
     <name>FreespaceChecker</name>
@@ -854,10 +512,6 @@
 </context>
 <context>
     <name>HelpMessageDialog</name>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Bitcoin Core</translation>
-    </message>
     <message>
         <source>version</source>
         <translation>version</translation>
@@ -867,8 +521,8 @@
         <translation>(%1-bit)</translation>
     </message>
     <message>
-        <source>About Bitcoin Core</source>
-        <translation>Om Bitcoin Core</translation>
+        <source>About %1</source>
+        <translation>Om %1</translation>
     </message>
     <message>
         <source>Command-line options</source>
@@ -907,7 +561,7 @@
         <translation>Vis startskærm under opstart (standard: %u)</translation>
     </message>
     <message>
-        <source>Reset all settings changes made over the GUI</source>
+        <source>Reset all settings changed in the GUI</source>
         <translation>Nulstil alle indstillinger, der er foretaget i den grafiske brugerflade</translation>
     </message>
 </context>
@@ -918,16 +572,16 @@
         <translation>Velkommen</translation>
     </message>
     <message>
-        <source>Welcome to Bitcoin Core.</source>
-        <translation>Velkommen til Bitcoin Core.</translation>
+        <source>Welcome to %1.</source>
+        <translation>Velkommen til %1.</translation>
     </message>
     <message>
-        <source>As this is the first time the program is launched, you can choose where Bitcoin Core will store its data.</source>
-        <translation>Siden dette er første gang, programmet startes, kan du vælge, hvor Bitcoin Core skal gemme sin data.</translation>
+        <source>As this is the first time the program is launched, you can choose where %1 will store its data.</source>
+        <translation>Siden dette er første gang, programmet startes, kan du vælge, hvor %1 skal gemme sin data.</translation>
     </message>
     <message>
-        <source>Bitcoin Core will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source>
-        <translation>Bitcoin Core vil downloade og gemme et kopi af Bitcoin-blokkæden. Mindst %1 GB data vil blive gemt i denne mappe, og den vil vokse over tid. Tegnebogen vil også blive gemt i denne mappe.</translation>
+        <source>%1 will download and store a copy of the Bitcoin block chain. At least %2GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source>
+        <translation>%1 vil downloade og gemme et kopi af Bitcoin-blokkæden. Mindst %2 GB data vil blive gemt i denne mappe, og den vil vokse over tid. Tegnebogen vil også blive gemt i denne mappe.</translation>
     </message>
     <message>
         <source>Use the default data directory</source>
@@ -937,10 +591,6 @@
         <source>Use a custom data directory:</source>
         <translation>Brug tilpasset mappe for data:</translation>
     </message>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Bitcoin Core</translation>
-    </message>
     <message>
         <source>Error: Specified data directory "%1" cannot be created.</source>
         <translation>Fejl: Angivet datamappe "%1" kan ikke oprettes.</translation>
@@ -976,10 +626,6 @@
         <source>Select payment request file</source>
         <translation>Vælg fil for betalingsanmodning</translation>
     </message>
-    <message>
-        <source>Select payment request file to open</source>
-        <translation>Vælg fil for betalingsanmodning til åbning</translation>
-    </message>
 </context>
 <context>
     <name>OptionsDialog</name>
@@ -991,6 +637,14 @@
         <source>&amp;Main</source>
         <translation>&amp;Generelt</translation>
     </message>
+    <message>
+        <source>Automatically start %1 after logging in to the system.</source>
+        <translation>Start %1 automatisk, når der logges ind på systemet.</translation>
+    </message>
+    <message>
+        <source>&amp;Start %1 on system login</source>
+        <translation>&amp;Start %1 ved systemlogin</translation>
+    </message>
     <message>
         <source>Size of &amp;database cache</source>
         <translation>Størrelsen på &amp;databasens cache</translation>
@@ -1019,10 +673,6 @@
         <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Exit in the menu.</source>
         <translation>Minimér i stedet for at lukke applikationen, når vinduet lukkes. Når denne indstilling er aktiveret, vil applikationen først blive lukket, når Afslut vælges i menuen.</translation>
     </message>
-    <message>
-        <source>The user interface language can be set here. This setting will take effect after restarting Bitcoin Core.</source>
-        <translation>Sproget for brugerfladen kan vælges her. Denne indstilling vil træde i kraft efter genstart af Bitcoin Core.</translation>
-    </message>
     <message>
         <source>Third party URLs (e.g. a block explorer) that appear in the transactions tab as context menu items. %s in the URL is replaced by transaction hash. Multiple URLs are separated by vertical bar |.</source>
         <translation>Tredjeparts-URL'er (fx et blokhåndteringsværktøj), der vises i transaktionsfanen som genvejsmenupunkter. %s i URL'en erstattes med transaktionens hash. Flere URL'er separeres med en lodret streg |.</translation>
@@ -1047,14 +697,6 @@
         <source>&amp;Network</source>
         <translation>&amp;Netværk</translation>
     </message>
-    <message>
-        <source>Automatically start Bitcoin Core after logging in to the system.</source>
-        <translation>Start Bitcoin Core automatisk efter der logges ind på systemet.</translation>
-    </message>
-    <message>
-        <source>&amp;Start Bitcoin Core on system login</source>
-        <translation>&amp;Start Bitcoin Core ved system-login</translation>
-    </message>
     <message>
         <source>(0 = auto, &lt;0 = leave that many cores free)</source>
         <translation>(0 = auto, &lt;0 = efterlad så mange kerner fri)</translation>
@@ -1139,6 +781,14 @@
         <source>&amp;Window</source>
         <translation>&amp;Vindue</translation>
     </message>
+    <message>
+        <source>&amp;Hide the icon from the system tray.</source>
+        <translation>&amp;Skjul ikonet fra statusbaren.</translation>
+    </message>
+    <message>
+        <source>Hide tray icon</source>
+        <translation>Skjul statusikon</translation>
+    </message>
     <message>
         <source>Show only a tray icon after minimizing the window.</source>
         <translation>Vis kun et statusikon efter minimering af vinduet.</translation>
@@ -1159,6 +809,10 @@
         <source>User Interface &amp;language:</source>
         <translation>&amp;Sprog for brugergrænseflade:</translation>
     </message>
+    <message>
+        <source>The user interface language can be set here. This setting will take effect after restarting %1.</source>
+        <translation>Sproget for brugerfladen kan vælges her. Denne indstilling vil træde i kraft efter genstart af %1.</translation>
+    </message>
     <message>
         <source>&amp;Unit to show amounts in:</source>
         <translation>&amp;Enhed, som beløb vises i:</translation>
@@ -1284,140 +938,49 @@
     </message>
 </context>
 <context>
-    <name>PaymentServer</name>
+    <name>PeerTableModel</name>
     <message>
-        <source>URI handling</source>
-        <translation>URI-håndtering</translation>
+        <source>User Agent</source>
+        <translation>Brugeragent</translation>
     </message>
     <message>
-        <source>Invalid payment address %1</source>
-        <translation>Ugyldig betalingsadresse %1</translation>
+        <source>Node/Service</source>
+        <translation>Knude/tjeneste</translation>
     </message>
     <message>
-        <source>Payment request rejected</source>
-        <translation>Betalingsanmodning afvist</translation>
+        <source>Ping Time</source>
+        <translation>Ping-tid</translation>
     </message>
+</context>
+<context>
+    <name>QObject</name>
     <message>
-        <source>Payment request network doesn't match client network.</source>
-        <translation>Netværk for betalingsanmodning stemmer ikke overens med klientens netværk.</translation>
+        <source>Amount</source>
+        <translation>Beløb</translation>
     </message>
     <message>
-        <source>Payment request is not initialized.</source>
-        <translation>Betalingsanmodning er ikke klargjort.</translation>
+        <source>Enter a Bitcoin address (e.g. %1)</source>
+        <translation>Indtast en Bitcoin-adresse (fx %1)</translation>
     </message>
     <message>
-        <source>Requested payment amount of %1 is too small (considered dust).</source>
-        <translation>Anmodet betalingsbeløb på %1 er for lille (regnes som støv).</translation>
+        <source>%1 d</source>
+        <translation>%1 d</translation>
     </message>
     <message>
-        <source>Payment request error</source>
-        <translation>Fejl i betalingsanmodning</translation>
+        <source>%1 h</source>
+        <translation>%1 t</translation>
     </message>
     <message>
-        <source>Cannot start bitcoin: click-to-pay handler</source>
-        <translation>Kan ikke starte bitcoin: click-to-pay-håndtering</translation>
+        <source>%1 m</source>
+        <translation>%1 m</translation>
     </message>
     <message>
-        <source>Payment request fetch URL is invalid: %1</source>
-        <translation>Hentnings-URL for betalingsanmodning er ugyldig: %1</translation>
+        <source>%1 s</source>
+        <translation>%1 s</translation>
     </message>
     <message>
-        <source>URI cannot be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source>
-        <translation>URI kan ikke tolkes! Dette kan skyldes en ugyldig Bitcoin-adresse eller forkert udformede URL-parametre.</translation>
-    </message>
-    <message>
-        <source>Payment request file handling</source>
-        <translation>Filhåndtering for betalingsanmodninger</translation>
-    </message>
-    <message>
-        <source>Payment request file cannot be read! This can be caused by an invalid payment request file.</source>
-        <translation>Fil for betalingsanmodning kan ikke læses! Dette kan skyldes en ugyldig fil for betalingsanmodning.</translation>
-    </message>
-    <message>
-        <source>Payment request expired.</source>
-        <translation>Betalingsanmodning er udløbet.</translation>
-    </message>
-    <message>
-        <source>Unverified payment requests to custom payment scripts are unsupported.</source>
-        <translation>Ikke-verificerede betalingsanmodninger for tilpassede betalings-scripts understøttes ikke.</translation>
-    </message>
-    <message>
-        <source>Invalid payment request.</source>
-        <translation>Ugyldig betalingsanmodning.</translation>
-    </message>
-    <message>
-        <source>Refund from %1</source>
-        <translation>Tilbagebetaling fra %1</translation>
-    </message>
-    <message>
-        <source>Payment request %1 is too large (%2 bytes, allowed %3 bytes).</source>
-        <translation>Betalingsanmodning %1 er for stor (%2 byte, %3 byte tilladt).</translation>
-    </message>
-    <message>
-        <source>Error communicating with %1: %2</source>
-        <translation>Fejl under kommunikation med %1: %2</translation>
-    </message>
-    <message>
-        <source>Payment request cannot be parsed!</source>
-        <translation>Betalingsanmodning kan ikke tolkes!</translation>
-    </message>
-    <message>
-        <source>Bad response from server %1</source>
-        <translation>Fejlagtigt svar fra server %1</translation>
-    </message>
-    <message>
-        <source>Payment acknowledged</source>
-        <translation>Betaling anerkendt</translation>
-    </message>
-    <message>
-        <source>Network request error</source>
-        <translation>Fejl i netværksforespørgsel</translation>
-    </message>
-</context>
-<context>
-    <name>PeerTableModel</name>
-    <message>
-        <source>User Agent</source>
-        <translation>Brugeragent</translation>
-    </message>
-    <message>
-        <source>Node/Service</source>
-        <translation>Knude/tjeneste</translation>
-    </message>
-    <message>
-        <source>Ping Time</source>
-        <translation>Ping-tid</translation>
-    </message>
-</context>
-<context>
-    <name>QObject</name>
-    <message>
-        <source>Amount</source>
-        <translation>Beløb</translation>
-    </message>
-    <message>
-        <source>Enter a Bitcoin address (e.g. %1)</source>
-        <translation>Indtast en Bitcoin-adresse (fx %1)</translation>
-    </message>
-    <message>
-        <source>%1 d</source>
-        <translation>%1 d</translation>
-    </message>
-    <message>
-        <source>%1 h</source>
-        <translation>%1 t</translation>
-    </message>
-    <message>
-        <source>%1 m</source>
-        <translation>%1 m</translation>
-    </message>
-    <message>
-        <source>%1 s</source>
-        <translation>%1 s</translation>
-    </message>
-    <message>
-        <source>None</source>
-        <translation>Ingen</translation>
+        <source>None</source>
+        <translation>Ingen</translation>
     </message>
     <message>
         <source>N/A</source>
@@ -1428,25 +991,6 @@
         <translation>%1 ms</translation>
     </message>
 </context>
-<context>
-    <name>QRImageWidget</name>
-    <message>
-        <source>&amp;Save Image...</source>
-        <translation>&amp;Gem billede…</translation>
-    </message>
-    <message>
-        <source>&amp;Copy Image</source>
-        <translation>&amp;Kopiér foto</translation>
-    </message>
-    <message>
-        <source>Save QR Code</source>
-        <translation>Gem QR-kode</translation>
-    </message>
-    <message>
-        <source>PNG Image (*.png)</source>
-        <translation>PNG-billede (*.png)</translation>
-    </message>
-</context>
 <context>
     <name>RPCConsole</name>
     <message>
@@ -1477,6 +1021,10 @@
         <source>Using BerkeleyDB version</source>
         <translation>Bruger BerkeleyDB version</translation>
     </message>
+    <message>
+        <source>Datadir</source>
+        <translation>Datamappe</translation>
+    </message>
     <message>
         <source>Startup time</source>
         <translation>Opstartstidspunkt</translation>
@@ -1513,10 +1061,6 @@
         <source>Memory usage</source>
         <translation>Hukommelsesforbrug</translation>
     </message>
-    <message>
-        <source>Open the Bitcoin Core debug log file from the current data directory. This can take a few seconds for large log files.</source>
-        <translation>Åbn Bitcoin Cores fejlsøgningslogfil fra den aktuelle datamappe. Dette kan tage nogle få sekunder for store logfiler.</translation>
-    </message>
     <message>
         <source>Received</source>
         <translation>Modtaget</translation>
@@ -1565,6 +1109,18 @@
         <source>User Agent</source>
         <translation>Brugeragent</translation>
     </message>
+    <message>
+        <source>Open the %1 debug log file from the current data directory. This can take a few seconds for large log files.</source>
+        <translation>Åbn %1s fejlsøgningslogfil fra den aktuelle datamappe. Dette kan tage nogle få sekunder for store logfiler.</translation>
+    </message>
+    <message>
+        <source>Decrease font size</source>
+        <translation>Formindsk skrifttypestørrelse</translation>
+    </message>
+    <message>
+        <source>Increase font size</source>
+        <translation>Forstør skrifttypestørrelse</translation>
+    </message>
     <message>
         <source>Services</source>
         <translation>Tjenester</translation>
@@ -1633,10 +1189,6 @@
         <source>Out:</source>
         <translation>Udgående:</translation>
     </message>
-    <message>
-        <source>Build date</source>
-        <translation>Byggedato</translation>
-    </message>
     <message>
         <source>Debug log file</source>
         <translation>Fejlsøgningslogfil</translation>
@@ -1674,8 +1226,8 @@
         <translation>&amp;Fjern bandlysning af knude</translation>
     </message>
     <message>
-        <source>Welcome to the Bitcoin Core RPC console.</source>
-        <translation>Velkommen til Bitcoin Cores RPC-konsol.</translation>
+        <source>Welcome to the %1 RPC console.</source>
+        <translation>Velkommen til %1s RPC-konsol.</translation>
     </message>
     <message>
         <source>Use up and down arrows to navigate history, and &lt;b&gt;Ctrl-L&lt;/b&gt; to clear screen.</source>
@@ -1804,18 +1356,6 @@
         <source>Remove</source>
         <translation>Fjern</translation>
     </message>
-    <message>
-        <source>Copy label</source>
-        <translation>Kopiér mærkat</translation>
-    </message>
-    <message>
-        <source>Copy message</source>
-        <translation>Kopiér besked</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>Kopier beløb</translation>
-    </message>
 </context>
 <context>
     <name>ReceiveRequestDialog</name>
@@ -1835,73 +1375,6 @@
         <source>&amp;Save Image...</source>
         <translation>&amp;Gem billede…</translation>
     </message>
-    <message>
-        <source>Request payment to %1</source>
-        <translation>Anmod om betaling til %1</translation>
-    </message>
-    <message>
-        <source>Payment information</source>
-        <translation>Betalingsinformation</translation>
-    </message>
-    <message>
-        <source>URI</source>
-        <translation>URI</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>Adresse</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>Beløb</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Mærkat</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>Besked</translation>
-    </message>
-    <message>
-        <source>Resulting URI too long, try to reduce the text for label / message.</source>
-        <translation>Resulterende URI var for lang; prøv at forkorte teksten til mærkaten/beskeden.</translation>
-    </message>
-    <message>
-        <source>Error encoding URI into QR Code.</source>
-        <translation>Fejl ved kodning fra URI til QR-kode.</translation>
-    </message>
-</context>
-<context>
-    <name>RecentRequestsTableModel</name>
-    <message>
-        <source>Date</source>
-        <translation>Dato</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Mærkat</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>Besked</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>Beløb</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(ingen mærkat)</translation>
-    </message>
-    <message>
-        <source>(no message)</source>
-        <translation>(ingen besked)</translation>
-    </message>
-    <message>
-        <source>(no amount)</source>
-        <translation>(intet beløb)</translation>
-    </message>
 </context>
 <context>
     <name>SendCoinsDialog</name>
@@ -2021,14 +1494,6 @@
         <source>fast</source>
         <translation>hurtig</translation>
     </message>
-    <message>
-        <source>Send as zero-fee transaction if possible</source>
-        <translation>Send som nul-gebyr-transaktion hvis muligt</translation>
-    </message>
-    <message>
-        <source>(confirmation may take longer)</source>
-        <translation>(bekræftelse kan tage længere)</translation>
-    </message>
     <message>
         <source>Send to multiple recipients at once</source>
         <translation>Send til flere modtagere på en gang</translation>
@@ -2061,118 +1526,6 @@
         <source>S&amp;end</source>
         <translation>&amp;Afsend</translation>
     </message>
-    <message>
-        <source>Confirm send coins</source>
-        <translation>Bekræft afsendelse af bitcoins</translation>
-    </message>
-    <message>
-        <source>%1 to %2</source>
-        <translation>%1 til %2</translation>
-    </message>
-    <message>
-        <source>Copy quantity</source>
-        <translation>Kopiér mængde</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>Kopier beløb</translation>
-    </message>
-    <message>
-        <source>Copy fee</source>
-        <translation>Kopiér gebyr</translation>
-    </message>
-    <message>
-        <source>Copy after fee</source>
-        <translation>Kopiér efter-gebyr</translation>
-    </message>
-    <message>
-        <source>Copy bytes</source>
-        <translation>Kopiér byte</translation>
-    </message>
-    <message>
-        <source>Copy priority</source>
-        <translation>Kopiér prioritet</translation>
-    </message>
-    <message>
-        <source>Copy change</source>
-        <translation>Kopiér byttepenge</translation>
-    </message>
-    <message>
-        <source>Total Amount %1</source>
-        <translation>Totalbeløb %1</translation>
-    </message>
-    <message>
-        <source>or</source>
-        <translation>eller</translation>
-    </message>
-    <message>
-        <source>The amount to pay must be larger than 0.</source>
-        <translation>Beløbet til betaling skal være større end 0.</translation>
-    </message>
-    <message>
-        <source>The amount exceeds your balance.</source>
-        <translation>Beløbet overstiger din saldo.</translation>
-    </message>
-    <message>
-        <source>The total exceeds your balance when the %1 transaction fee is included.</source>
-        <translation>Totalen overstiger din saldo, når transaktionsgebyret på %1 er inkluderet.</translation>
-    </message>
-    <message>
-        <source>Transaction creation failed!</source>
-        <translation>Oprettelse af transaktion mislykkedes!</translation>
-    </message>
-    <message>
-        <source>The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source>
-        <translation>Transaktionen blev afvist! Dette kan ske, hvis nogle af dine bitcoins i din tegnebog allerede er brugt, som hvis du brugte en kopi af wallet.dat og dine bitcoins er blevet brugt i kopien, men ikke er markeret som brugt her.</translation>
-    </message>
-    <message>
-        <source>A fee higher than %1 is considered an absurdly high fee.</source>
-        <translation>Et gebyr højere end %1 opfattes som et absurd højt gebyr.</translation>
-    </message>
-    <message>
-        <source>Payment request expired.</source>
-        <translation>Betalingsanmodning er udløbet.</translation>
-    </message>
-    <message>
-        <source>Pay only the required fee of %1</source>
-        <translation>Betal kun det påkrævede gebyr på %1</translation>
-    </message>
-    <message numerus="yes">
-        <source>Estimated to begin confirmation within %n block(s).</source>
-        <translation><numerusform>Bekræftelse estimeres til at begynde inden for %n blok.</numerusform><numerusform>Bekræftelse estimeres til at begynde inden for %n blokke.</numerusform></translation>
-    </message>
-    <message>
-        <source>The recipient address is not valid. Please recheck.</source>
-        <translation>Modtageradressen er ikke gyldig. Tjek venligst igen.</translation>
-    </message>
-    <message>
-        <source>Duplicate address found: addresses should only be used once each.</source>
-        <translation>Adressegenganger fundet. Adresser bør kun bruges én gang hver.</translation>
-    </message>
-    <message>
-        <source>Warning: Invalid Bitcoin address</source>
-        <translation>Advarsel: Ugyldig Bitcoin-adresse</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(ingen mærkat)</translation>
-    </message>
-    <message>
-        <source>Warning: Unknown change address</source>
-        <translation>Advarsel: Ukendt byttepengeadresse</translation>
-    </message>
-    <message>
-        <source>Copy dust</source>
-        <translation>Kopiér støv</translation>
-    </message>
-    <message>
-        <source>Are you sure you want to send?</source>
-        <translation>Er du sikker på, at du vil sende?</translation>
-    </message>
-    <message>
-        <source>added as transaction fee</source>
-        <translation>tilføjet som transaktionsgebyr</translation>
-    </message>
 </context>
 <context>
     <name>SendCoinsEntry</name>
@@ -2184,10 +1537,6 @@
         <source>Pay &amp;To:</source>
         <translation>Betal &amp;til:</translation>
     </message>
-    <message>
-        <source>Enter a label for this address to add it to your address book</source>
-        <translation>Indtast en mærkat for denne adresse for at føje den til din adressebog</translation>
-    </message>
     <message>
         <source>&amp;Label:</source>
         <translation>&amp;Mærkat:</translation>
@@ -2198,707 +1547,189 @@
     </message>
     <message>
         <source>This is a normal payment.</source>
-        <translation>Dette er en normal betaling.</translation>
-    </message>
-    <message>
-        <source>The Bitcoin address to send the payment to</source>
-        <translation>Bitcoin-adresse, som betalingen skal sendes til</translation>
-    </message>
-    <message>
-        <source>Alt+A</source>
-        <translation>Alt+A</translation>
-    </message>
-    <message>
-        <source>Paste address from clipboard</source>
-        <translation>Indsæt adresse fra udklipsholderen</translation>
-    </message>
-    <message>
-        <source>Alt+P</source>
-        <translation>Alt+P</translation>
-    </message>
-    <message>
-        <source>Remove this entry</source>
-        <translation>Fjern denne indgang</translation>
-    </message>
-    <message>
-        <source>The fee will be deducted from the amount being sent. The recipient will receive less bitcoins than you enter in the amount field. If multiple recipients are selected, the fee is split equally.</source>
-        <translation>Gebyret vil blive trukket fra det sendte beløb. Modtageren vil modtage færre bitcoin, end du indtaster i beløbfeltet. Hvis flere modtagere vælges, vil gebyret deles ligeligt.</translation>
-    </message>
-    <message>
-        <source>S&amp;ubtract fee from amount</source>
-        <translation>&amp;Træk gebyr fra beløb</translation>
-    </message>
-    <message>
-        <source>Message:</source>
-        <translation>Besked:</translation>
-    </message>
-    <message>
-        <source>This is an unauthenticated payment request.</source>
-        <translation>Dette er en uautentificeret betalingsanmodning.</translation>
-    </message>
-    <message>
-        <source>This is an authenticated payment request.</source>
-        <translation>Dette er en autentificeret betalingsanmodning.</translation>
-    </message>
-    <message>
-        <source>Enter a label for this address to add it to the list of used addresses</source>
-        <translation>Indtast et mærkat for denne adresse for at føje den til listen over brugte adresser</translation>
-    </message>
-    <message>
-        <source>A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
-        <translation>En besked, som blev føjet til "bitcon:"-URI'en, som vil gemmes med transaktionen til din reference. Bemærk: Denne besked vil ikke blive sendt over Bitcoin-netværket.</translation>
-    </message>
-    <message>
-        <source>Pay To:</source>
-        <translation>Betal til:</translation>
-    </message>
-    <message>
-        <source>Memo:</source>
-        <translation>Memo:</translation>
-    </message>
-</context>
-<context>
-    <name>ShutdownWindow</name>
-    <message>
-        <source>Bitcoin Core is shutting down...</source>
-        <translation>Bitcoin Core lukker ned…</translation>
-    </message>
-    <message>
-        <source>Do not shut down the computer until this window disappears.</source>
-        <translation>Luk ikke computeren ned, før dette vindue forsvinder.</translation>
-    </message>
-</context>
-<context>
-    <name>SignVerifyMessageDialog</name>
-    <message>
-        <source>Signatures - Sign / Verify a Message</source>
-        <translation>Signature - Underskriv/verificér en besked</translation>
-    </message>
-    <message>
-        <source>&amp;Sign Message</source>
-        <translation>&amp;Underskriv besked</translation>
-    </message>
-    <message>
-        <source>You can sign messages/agreements with your addresses to prove you can receive bitcoins sent to them. Be careful not to sign anything vague or random, as phishing attacks may try to trick you into signing your identity over to them. Only sign fully-detailed statements you agree to.</source>
-        <translation>Du kan signere beskeder/aftaler med dine adresser for at bevise, at du kan modtage bitcoin, der bliver sendt til adresserne. Vær forsigtig med ikke at signere noget vagt eller tilfældigt, da eventuelle phishing-angreb kan snyde dig til at overlade din identitet til dem. Signér kun fuldt ud detaljerede udsagn, som du er enig i.</translation>
-    </message>
-    <message>
-        <source>The Bitcoin address to sign the message with</source>
-        <translation>Bitcoin-adresse, som beskeden skal signeres med</translation>
-    </message>
-    <message>
-        <source>Choose previously used address</source>
-        <translation>Vælg tidligere brugt adresse</translation>
-    </message>
-    <message>
-        <source>Alt+A</source>
-        <translation>Alt+A</translation>
-    </message>
-    <message>
-        <source>Paste address from clipboard</source>
-        <translation>Indsæt adresse fra udklipsholderen</translation>
-    </message>
-    <message>
-        <source>Alt+P</source>
-        <translation>Alt+P</translation>
-    </message>
-    <message>
-        <source>Enter the message you want to sign here</source>
-        <translation>Indtast her beskeden, du ønsker at underskrive</translation>
-    </message>
-    <message>
-        <source>Signature</source>
-        <translation>Underskrift</translation>
-    </message>
-    <message>
-        <source>Copy the current signature to the system clipboard</source>
-        <translation>Kopiér den nuværende underskrift til systemets udklipsholder</translation>
-    </message>
-    <message>
-        <source>Sign the message to prove you own this Bitcoin address</source>
-        <translation>Underskriv denne besked for at bevise, at Bitcoin-adressen tilhører dig</translation>
-    </message>
-    <message>
-        <source>Sign &amp;Message</source>
-        <translation>Underskriv &amp;besked</translation>
-    </message>
-    <message>
-        <source>Reset all sign message fields</source>
-        <translation>Nulstil alle "underskriv besked"-felter</translation>
-    </message>
-    <message>
-        <source>Clear &amp;All</source>
-        <translation>Ryd &amp;alle</translation>
-    </message>
-    <message>
-        <source>&amp;Verify Message</source>
-        <translation>&amp;Verificér besked</translation>
-    </message>
-    <message>
-        <source>Enter the receiver's address, message (ensure you copy line breaks, spaces, tabs, etc. exactly) and signature below to verify the message. Be careful not to read more into the signature than what is in the signed message itself, to avoid being tricked by a man-in-the-middle attack. Note that this only proves the signing party receives with the address, it cannot prove sendership of any transaction!</source>
-        <translation>Indtast modtagerens adresse, besked (vær sikker på at kopiere linjeskift, mellemrum, tabuleringer, etc. præcist) og signatur herunder for at verificere beskeden. Vær forsigtig med ikke at læse noget ud fra signaturen, som ikke står i selve beskeden, for at undgå at blive snydt af et eventuelt man-in-the-middle-angreb. Bemærk, at dette kun beviser, at den signerende person kan modtage med adressen; det kan ikke bevise hvem der har sendt en given transaktion!</translation>
-    </message>
-    <message>
-        <source>The Bitcoin address the message was signed with</source>
-        <translation>Bitcoin-adressen, som beskeden blev signeret med</translation>
-    </message>
-    <message>
-        <source>Verify the message to ensure it was signed with the specified Bitcoin address</source>
-        <translation>Verificér beskeden for at sikre, at den er underskrevet med den angivne Bitcoin-adresse</translation>
-    </message>
-    <message>
-        <source>Verify &amp;Message</source>
-        <translation>Verificér &amp;besked</translation>
-    </message>
-    <message>
-        <source>Reset all verify message fields</source>
-        <translation>Nulstil alle "verificér besked"-felter</translation>
-    </message>
-    <message>
-        <source>Click "Sign Message" to generate signature</source>
-        <translation>Klik "Underskriv besked" for at generere underskriften</translation>
-    </message>
-    <message>
-        <source>The entered address is invalid.</source>
-        <translation>Den indtastede adresse er ugyldig.</translation>
-    </message>
-    <message>
-        <source>Please check the address and try again.</source>
-        <translation>Tjek venligst adressen og forsøg igen.</translation>
-    </message>
-    <message>
-        <source>The entered address does not refer to a key.</source>
-        <translation>Den indtastede adresse henviser ikke til en nøgle.</translation>
-    </message>
-    <message>
-        <source>Wallet unlock was cancelled.</source>
-        <translation>Tegnebogsoplåsning annulleret.</translation>
-    </message>
-    <message>
-        <source>Private key for the entered address is not available.</source>
-        <translation>Den private nøgle for den indtastede adresse er ikke tilgængelig.</translation>
-    </message>
-    <message>
-        <source>Message signing failed.</source>
-        <translation>Underskrivning af besked mislykkedes.</translation>
-    </message>
-    <message>
-        <source>Message signed.</source>
-        <translation>Besked underskrevet.</translation>
-    </message>
-    <message>
-        <source>The signature could not be decoded.</source>
-        <translation>Underskriften kunne ikke afkodes.</translation>
-    </message>
-    <message>
-        <source>Please check the signature and try again.</source>
-        <translation>Tjek venligst underskriften, og forsøg igen.</translation>
-    </message>
-    <message>
-        <source>The signature did not match the message digest.</source>
-        <translation>Underskriften matcher ikke beskedens indhold.</translation>
-    </message>
-    <message>
-        <source>Message verification failed.</source>
-        <translation>Verificering af besked mislykkedes.</translation>
-    </message>
-    <message>
-        <source>Message verified.</source>
-        <translation>Besked verificeret.</translation>
-    </message>
-</context>
-<context>
-    <name>SplashScreen</name>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Bitcoin Core</translation>
-    </message>
-    <message>
-        <source>The Bitcoin Core developers</source>
-        <translation>Udviklerne af Bitcoin Core</translation>
-    </message>
-    <message>
-        <source>[testnet]</source>
-        <translation>[testnetværk]</translation>
-    </message>
-</context>
-<context>
-    <name>TrafficGraphWidget</name>
-    <message>
-        <source>KB/s</source>
-        <translation>KB/s</translation>
-    </message>
-</context>
-<context>
-    <name>TransactionDesc</name>
-    <message>
-        <source>Open until %1</source>
-        <translation>Åben indtil %1</translation>
-    </message>
-    <message>
-        <source>conflicted</source>
-        <translation>konflikt</translation>
-    </message>
-    <message>
-        <source>%1/offline</source>
-        <translation>%1/offline</translation>
-    </message>
-    <message>
-        <source>%1/unconfirmed</source>
-        <translation>%1/ubekræftet</translation>
-    </message>
-    <message>
-        <source>%1 confirmations</source>
-        <translation>%1 bekræftelser</translation>
-    </message>
-    <message>
-        <source>Status</source>
-        <translation>Status</translation>
-    </message>
-    <message numerus="yes">
-        <source>, broadcast through %n node(s)</source>
-        <translation><numerusform>, transmitteret igennem %n knude</numerusform><numerusform>, transmitteret igennem %n knuder</numerusform></translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation>Dato</translation>
-    </message>
-    <message>
-        <source>Source</source>
-        <translation>Kilde</translation>
-    </message>
-    <message>
-        <source>Generated</source>
-        <translation>Genereret</translation>
-    </message>
-    <message>
-        <source>From</source>
-        <translation>Fra</translation>
-    </message>
-    <message>
-        <source>To</source>
-        <translation>Til</translation>
-    </message>
-    <message>
-        <source>own address</source>
-        <translation>egen adresse</translation>
-    </message>
-    <message>
-        <source>watch-only</source>
-        <translation>kigge</translation>
-    </message>
-    <message>
-        <source>label</source>
-        <translation>mærkat</translation>
-    </message>
-    <message>
-        <source>Credit</source>
-        <translation>Kredit</translation>
-    </message>
-    <message numerus="yes">
-        <source>matures in %n more block(s)</source>
-        <translation><numerusform>modner efter yderligere %n blok</numerusform><numerusform>modner efter yderligere %n blokke</numerusform></translation>
-    </message>
-    <message>
-        <source>not accepted</source>
-        <translation>ikke accepteret</translation>
-    </message>
-    <message>
-        <source>Debit</source>
-        <translation>Debet</translation>
-    </message>
-    <message>
-        <source>Total debit</source>
-        <translation>Total debet</translation>
-    </message>
-    <message>
-        <source>Total credit</source>
-        <translation>Total kredit</translation>
-    </message>
-    <message>
-        <source>Transaction fee</source>
-        <translation>Transaktionsgebyr</translation>
-    </message>
-    <message>
-        <source>Net amount</source>
-        <translation>Nettobeløb</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>Besked</translation>
-    </message>
-    <message>
-        <source>Comment</source>
-        <translation>Kommentar</translation>
-    </message>
-    <message>
-        <source>Transaction ID</source>
-        <translation>Transaktions-ID</translation>
-    </message>
-    <message>
-        <source>Merchant</source>
-        <translation>Forretningsdrivende</translation>
-    </message>
-    <message>
-        <source>Generated coins must mature %1 blocks before they can be spent. When you generated this block, it was broadcast to the network to be added to the block chain. If it fails to get into the chain, its state will change to "not accepted" and it won't be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source>
-        <translation>Minede bitcoins skal modne %1 blokke, før de kan bruges. Da du genererede denne blok, blev den transmitteret til netværket for at blive føjet til blokkæden. Hvis det ikke lykkes at få den i kæden, vil dens tilstand ændres til "ikke accepteret", og den vil ikke kunne bruges. Dette kan ske nu og da, hvis en anden knude udvinder en blok inden for nogle få sekunder fra din.</translation>
-    </message>
-    <message>
-        <source>Debug information</source>
-        <translation>Fejlsøgningsinformation</translation>
-    </message>
-    <message>
-        <source>Transaction</source>
-        <translation>Transaktion</translation>
-    </message>
-    <message>
-        <source>Inputs</source>
-        <translation>Input</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>Beløb</translation>
-    </message>
-    <message>
-        <source>true</source>
-        <translation>sand</translation>
-    </message>
-    <message>
-        <source>false</source>
-        <translation>falsk</translation>
-    </message>
-    <message>
-        <source>, has not been successfully broadcast yet</source>
-        <translation>, er ikke blevet transmitteret endnu</translation>
-    </message>
-    <message numerus="yes">
-        <source>Open for %n more block(s)</source>
-        <translation><numerusform>Åbn yderligere %n blok</numerusform><numerusform>Åbn yderligere %n blokke</numerusform></translation>
-    </message>
-    <message>
-        <source>unknown</source>
-        <translation>ukendt</translation>
-    </message>
-</context>
-<context>
-    <name>TransactionDescDialog</name>
-    <message>
-        <source>Transaction details</source>
-        <translation>Transaktionsdetaljer</translation>
-    </message>
-    <message>
-        <source>This pane shows a detailed description of the transaction</source>
-        <translation>Denne rude viser en detaljeret beskrivelse af transaktionen</translation>
-    </message>
-</context>
-<context>
-    <name>TransactionTableModel</name>
-    <message>
-        <source>Date</source>
-        <translation>Dato</translation>
-    </message>
-    <message>
-        <source>Type</source>
-        <translation>Type</translation>
-    </message>
-    <message>
-        <source>Immature (%1 confirmations, will be available after %2)</source>
-        <translation>Umoden (%1 bekræftelser; vil være tilgængelig efter %2)</translation>
-    </message>
-    <message numerus="yes">
-        <source>Open for %n more block(s)</source>
-        <translation><numerusform>Åbn yderligere %n blok</numerusform><numerusform>Åbn yderligere %n blokke</numerusform></translation>
-    </message>
-    <message>
-        <source>Open until %1</source>
-        <translation>Åben indtil %1</translation>
-    </message>
-    <message>
-        <source>Confirmed (%1 confirmations)</source>
-        <translation>Bekræftet (%1 bekræftelser)</translation>
-    </message>
-    <message>
-        <source>This block was not received by any other nodes and will probably not be accepted!</source>
-        <translation>Denne blok blev ikke modtaget af nogen andre knuder og vil formentlig ikke blive accepteret!</translation>
-    </message>
-    <message>
-        <source>Generated but not accepted</source>
-        <translation>Genereret, men ikke accepteret</translation>
-    </message>
-    <message>
-        <source>Offline</source>
-        <translation>Offline</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Mærkat</translation>
-    </message>
-    <message>
-        <source>Unconfirmed</source>
-        <translation>Ubekræftet</translation>
-    </message>
-    <message>
-        <source>Confirming (%1 of %2 recommended confirmations)</source>
-        <translation>Bekræfter (%1 af %2 anbefalede bekræftelser)</translation>
-    </message>
-    <message>
-        <source>Conflicted</source>
-        <translation>Konflikt</translation>
-    </message>
-    <message>
-        <source>Received with</source>
-        <translation>Modtaget med</translation>
-    </message>
-    <message>
-        <source>Received from</source>
-        <translation>Modtaget fra</translation>
-    </message>
-    <message>
-        <source>Sent to</source>
-        <translation>Sendt til</translation>
-    </message>
-    <message>
-        <source>Payment to yourself</source>
-        <translation>Betaling til dig selv</translation>
-    </message>
-    <message>
-        <source>Mined</source>
-        <translation>Minet</translation>
-    </message>
-    <message>
-        <source>watch-only</source>
-        <translation>kigge</translation>
-    </message>
-    <message>
-        <source>(n/a)</source>
-        <translation>(n/a)</translation>
-    </message>
-    <message>
-        <source>Transaction status. Hover over this field to show number of confirmations.</source>
-        <translation>Transaktionsstatus. Hold musen over dette felt for at vise antallet af bekræftelser.</translation>
-    </message>
-    <message>
-        <source>Date and time that the transaction was received.</source>
-        <translation>Dato og klokkeslæt for modtagelse af transaktionen.</translation>
-    </message>
-    <message>
-        <source>Type of transaction.</source>
-        <translation>Transaktionstype.</translation>
-    </message>
-    <message>
-        <source>Whether or not a watch-only address is involved in this transaction.</source>
-        <translation>Afgør hvorvidt en kigge-adresse er involveret i denne transaktion.</translation>
-    </message>
-    <message>
-        <source>User-defined intent/purpose of the transaction.</source>
-        <translation>Brugerdefineret hensigt/formål med transaktionen.</translation>
+        <translation>Dette er en normal betaling.</translation>
     </message>
     <message>
-        <source>Amount removed from or added to balance.</source>
-        <translation>Beløb trukket fra eller tilføjet balance.</translation>
+        <source>The Bitcoin address to send the payment to</source>
+        <translation>Bitcoin-adresse, som betalingen skal sendes til</translation>
     </message>
-</context>
-<context>
-    <name>TransactionView</name>
     <message>
-        <source>All</source>
-        <translation>Alle</translation>
+        <source>Alt+A</source>
+        <translation>Alt+A</translation>
     </message>
     <message>
-        <source>Today</source>
-        <translation>I dag</translation>
+        <source>Paste address from clipboard</source>
+        <translation>Indsæt adresse fra udklipsholderen</translation>
     </message>
     <message>
-        <source>This week</source>
-        <translation>Denne uge</translation>
+        <source>Alt+P</source>
+        <translation>Alt+P</translation>
     </message>
     <message>
-        <source>This month</source>
-        <translation>Denne måned</translation>
+        <source>Remove this entry</source>
+        <translation>Fjern denne indgang</translation>
     </message>
     <message>
-        <source>Last month</source>
-        <translation>Sidste måned</translation>
+        <source>The fee will be deducted from the amount being sent. The recipient will receive less bitcoins than you enter in the amount field. If multiple recipients are selected, the fee is split equally.</source>
+        <translation>Gebyret vil blive trukket fra det sendte beløb. Modtageren vil modtage færre bitcoin, end du indtaster i beløbfeltet. Hvis flere modtagere vælges, vil gebyret deles ligeligt.</translation>
     </message>
     <message>
-        <source>This year</source>
-        <translation>Dette år</translation>
+        <source>S&amp;ubtract fee from amount</source>
+        <translation>&amp;Træk gebyr fra beløb</translation>
     </message>
     <message>
-        <source>Range...</source>
-        <translation>Interval…</translation>
+        <source>Message:</source>
+        <translation>Besked:</translation>
     </message>
     <message>
-        <source>Received with</source>
-        <translation>Modtaget med</translation>
+        <source>This is an unauthenticated payment request.</source>
+        <translation>Dette er en uautentificeret betalingsanmodning.</translation>
     </message>
     <message>
-        <source>Sent to</source>
-        <translation>Sendt til</translation>
+        <source>This is an authenticated payment request.</source>
+        <translation>Dette er en autentificeret betalingsanmodning.</translation>
     </message>
     <message>
-        <source>To yourself</source>
-        <translation>Til dig selv</translation>
+        <source>Enter a label for this address to add it to the list of used addresses</source>
+        <translation>Indtast et mærkat for denne adresse for at føje den til listen over brugte adresser</translation>
     </message>
     <message>
-        <source>Mined</source>
-        <translation>Minet</translation>
+        <source>A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
+        <translation>En besked, som blev føjet til "bitcon:"-URI'en, som vil gemmes med transaktionen til din reference. Bemærk: Denne besked vil ikke blive sendt over Bitcoin-netværket.</translation>
     </message>
     <message>
-        <source>Other</source>
-        <translation>Andet</translation>
+        <source>Pay To:</source>
+        <translation>Betal til:</translation>
     </message>
     <message>
-        <source>Enter address or label to search</source>
-        <translation>Indtast adresse eller mærkat for at søge</translation>
+        <source>Memo:</source>
+        <translation>Memo:</translation>
     </message>
+</context>
+<context>
+    <name>ShutdownWindow</name>
     <message>
-        <source>Min amount</source>
-        <translation>Minimumsbeløb</translation>
+        <source>%1 is shutting down...</source>
+        <translation>%1 lukker ned…</translation>
     </message>
     <message>
-        <source>Copy address</source>
-        <translation>Kopiér adresse</translation>
+        <source>Do not shut down the computer until this window disappears.</source>
+        <translation>Luk ikke computeren ned, før dette vindue forsvinder.</translation>
     </message>
+</context>
+<context>
+    <name>SignVerifyMessageDialog</name>
     <message>
-        <source>Copy label</source>
-        <translation>Kopiér mærkat</translation>
+        <source>Signatures - Sign / Verify a Message</source>
+        <translation>Signature - Underskriv/verificér en besked</translation>
     </message>
     <message>
-        <source>Copy amount</source>
-        <translation>Kopiér beløb</translation>
+        <source>&amp;Sign Message</source>
+        <translation>&amp;Underskriv besked</translation>
     </message>
     <message>
-        <source>Copy transaction ID</source>
-        <translation>Kopiér transaktions-ID</translation>
+        <source>You can sign messages/agreements with your addresses to prove you can receive bitcoins sent to them. Be careful not to sign anything vague or random, as phishing attacks may try to trick you into signing your identity over to them. Only sign fully-detailed statements you agree to.</source>
+        <translation>Du kan signere beskeder/aftaler med dine adresser for at bevise, at du kan modtage bitcoin, der bliver sendt til adresserne. Vær forsigtig med ikke at signere noget vagt eller tilfældigt, da eventuelle phishing-angreb kan snyde dig til at overlade din identitet til dem. Signér kun fuldt ud detaljerede udsagn, som du er enig i.</translation>
     </message>
     <message>
-        <source>Copy raw transaction</source>
-        <translation>Kopiér rå transaktion</translation>
+        <source>The Bitcoin address to sign the message with</source>
+        <translation>Bitcoin-adresse, som beskeden skal signeres med</translation>
     </message>
     <message>
-        <source>Edit label</source>
-        <translation>Redigér mærkat</translation>
+        <source>Choose previously used address</source>
+        <translation>Vælg tidligere brugt adresse</translation>
     </message>
     <message>
-        <source>Show transaction details</source>
-        <translation>Vis transaktionsdetaljer</translation>
+        <source>Alt+A</source>
+        <translation>Alt+A</translation>
     </message>
     <message>
-        <source>Export Transaction History</source>
-        <translation>Historik for eksport af transaktioner</translation>
+        <source>Paste address from clipboard</source>
+        <translation>Indsæt adresse fra udklipsholderen</translation>
     </message>
     <message>
-        <source>Watch-only</source>
-        <translation>Kigge</translation>
+        <source>Alt+P</source>
+        <translation>Alt+P</translation>
     </message>
     <message>
-        <source>Exporting Failed</source>
-        <translation>Eksport mislykkedes</translation>
+        <source>Enter the message you want to sign here</source>
+        <translation>Indtast her beskeden, du ønsker at underskrive</translation>
     </message>
     <message>
-        <source>There was an error trying to save the transaction history to %1.</source>
-        <translation>En fejl opstod under gemning af transaktionshistorik til %1.</translation>
+        <source>Signature</source>
+        <translation>Underskrift</translation>
     </message>
     <message>
-        <source>Exporting Successful</source>
-        <translation>Eksport problemfri</translation>
+        <source>Copy the current signature to the system clipboard</source>
+        <translation>Kopiér den nuværende underskrift til systemets udklipsholder</translation>
     </message>
     <message>
-        <source>The transaction history was successfully saved to %1.</source>
-        <translation>Transaktionshistorikken blev gemt til %1 med succes.</translation>
+        <source>Sign the message to prove you own this Bitcoin address</source>
+        <translation>Underskriv denne besked for at bevise, at Bitcoin-adressen tilhører dig</translation>
     </message>
     <message>
-        <source>Comma separated file (*.csv)</source>
-        <translation>Kommasepareret fil (*.csv)</translation>
+        <source>Sign &amp;Message</source>
+        <translation>Underskriv &amp;besked</translation>
     </message>
     <message>
-        <source>Confirmed</source>
-        <translation>Bekræftet</translation>
+        <source>Reset all sign message fields</source>
+        <translation>Nulstil alle "underskriv besked"-felter</translation>
     </message>
     <message>
-        <source>Date</source>
-        <translation>Dato</translation>
+        <source>Clear &amp;All</source>
+        <translation>Ryd &amp;alle</translation>
     </message>
     <message>
-        <source>Type</source>
-        <translation>Type</translation>
+        <source>&amp;Verify Message</source>
+        <translation>&amp;Verificér besked</translation>
     </message>
     <message>
-        <source>Label</source>
-        <translation>Mærkat</translation>
+        <source>Enter the receiver's address, message (ensure you copy line breaks, spaces, tabs, etc. exactly) and signature below to verify the message. Be careful not to read more into the signature than what is in the signed message itself, to avoid being tricked by a man-in-the-middle attack. Note that this only proves the signing party receives with the address, it cannot prove sendership of any transaction!</source>
+        <translation>Indtast modtagerens adresse, besked (vær sikker på at kopiere linjeskift, mellemrum, tabuleringer, etc. præcist) og signatur herunder for at verificere beskeden. Vær forsigtig med ikke at læse noget ud fra signaturen, som ikke står i selve beskeden, for at undgå at blive snydt af et eventuelt man-in-the-middle-angreb. Bemærk, at dette kun beviser, at den signerende person kan modtage med adressen; det kan ikke bevise hvem der har sendt en given transaktion!</translation>
     </message>
     <message>
-        <source>Address</source>
-        <translation>Adresse</translation>
+        <source>The Bitcoin address the message was signed with</source>
+        <translation>Bitcoin-adressen, som beskeden blev signeret med</translation>
     </message>
     <message>
-        <source>ID</source>
-        <translation>ID</translation>
+        <source>Verify the message to ensure it was signed with the specified Bitcoin address</source>
+        <translation>Verificér beskeden for at sikre, at den er underskrevet med den angivne Bitcoin-adresse</translation>
     </message>
     <message>
-        <source>Range:</source>
-        <translation>Interval:</translation>
+        <source>Verify &amp;Message</source>
+        <translation>Verificér &amp;besked</translation>
     </message>
     <message>
-        <source>to</source>
-        <translation>til</translation>
+        <source>Reset all verify message fields</source>
+        <translation>Nulstil alle "verificér besked"-felter</translation>
     </message>
 </context>
 <context>
-    <name>UnitDisplayStatusBarControl</name>
+    <name>SplashScreen</name>
     <message>
-        <source>Unit to show amounts in. Click to select another unit.</source>
-        <translation>Enhed, som beløb vises i. Klik for at vælge en anden enhed.</translation>
+        <source>[testnet]</source>
+        <translation>[testnetværk]</translation>
     </message>
 </context>
 <context>
-    <name>WalletFrame</name>
+    <name>TrafficGraphWidget</name>
     <message>
-        <source>No wallet has been loaded.</source>
-        <translation>Ingen tegnebog er indlæst.</translation>
+        <source>KB/s</source>
+        <translation>KB/s</translation>
     </message>
 </context>
 <context>
-    <name>WalletModel</name>
+    <name>TransactionDescDialog</name>
     <message>
-        <source>Send Coins</source>
-        <translation>Send bitcoins</translation>
+        <source>This pane shows a detailed description of the transaction</source>
+        <translation>Denne rude viser en detaljeret beskrivelse af transaktionen</translation>
     </message>
 </context>
 <context>
-    <name>WalletView</name>
-    <message>
-        <source>&amp;Export</source>
-        <translation>&amp;Eksportér</translation>
-    </message>
-    <message>
-        <source>Export the data in the current tab to a file</source>
-        <translation>Eksportér den aktuelle visning til en fil</translation>
-    </message>
-    <message>
-        <source>Backup Wallet</source>
-        <translation>Sikkerhedskopiér tegnebog</translation>
-    </message>
-    <message>
-        <source>Wallet Data (*.dat)</source>
-        <translation>Tegnebogsdata (*.dat)</translation>
-    </message>
-    <message>
-        <source>Backup Failed</source>
-        <translation>Sikkerhedskopiering mislykkedes</translation>
-    </message>
-    <message>
-        <source>There was an error trying to save the wallet data to %1.</source>
-        <translation>Der skete en fejl under gemning af tegnebogsdata til %1.</translation>
-    </message>
-    <message>
-        <source>The wallet data was successfully saved to %1.</source>
-        <translation>Tegnebogsdata blev gemt til %1 med succes.</translation>
-    </message>
+    <name>UnitDisplayStatusBarControl</name>
     <message>
-        <source>Backup Successful</source>
-        <translation>Sikkerhedskopiering problemfri</translation>
+        <source>Unit to show amounts in. Click to select another unit.</source>
+        <translation>Enhed, som beløb vises i. Klik for at vælge en anden enhed.</translation>
     </message>
 </context>
 <context>
@@ -2927,14 +1758,6 @@
         <source>If &lt;category&gt; is not supplied or if &lt;category&gt; = 1, output all debugging information.</source>
         <translation>Hvis &lt;category&gt; ikke angives eller hvis &lt;category&gt; = 1, udskriv al fejlretningsinformation.</translation>
     </message>
-    <message>
-        <source>Maximum total fees (in %s) to use in a single wallet transaction; setting this too low may abort large transactions (default: %s)</source>
-        <translation>Maksimalt totalgebyr (i %s) for brug i en enkelt tegnebogstransaktion; ved at sætte dette for lavt, kan store transaktioner afbrydes (standard: %s)</translation>
-    </message>
-    <message>
-        <source>Please check that your computer's date and time are correct! If your clock is wrong Bitcoin Core will not work properly.</source>
-        <translation>Kontrollér venligst, at din computers dato og tid er korrekt! Hvis uret ikke passer, vil Bitcoin Core ikke fungere korrekt.</translation>
-    </message>
     <message>
         <source>Prune configured below the minimum of %d MiB.  Please use a higher number.</source>
         <translation>Beskæring er sat under minimumsgrænsen på %d MiB. Brug venligst et større tal.</translation>
@@ -2975,6 +1798,14 @@
         <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
         <translation>Acceptér forbindelser udefra (standard: 1 hvis hverken -proxy eller -connect)</translation>
     </message>
+    <message>
+        <source>Bitcoin Core</source>
+        <translation>Bitcoin Core</translation>
+    </message>
+    <message>
+        <source>The %s developers</source>
+        <translation>Udviklerne af %s</translation>
+    </message>
     <message>
         <source>-fallbackfee is set very high! This is the transaction fee you may pay when fee estimates are not available.</source>
         <translation>-fallbackfee er sat meget højt! Dette er transaktionsgebyret, du eventuelt betaler, hvis gebyrestimater ikke er tilgængelige.</translation>
@@ -2991,6 +1822,10 @@
         <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source>
         <translation>Tildel til den givne adresse og lyt altid på den. Brug [vært]:port-notation for IPv6</translation>
     </message>
+    <message>
+        <source>Cannot obtain a lock on data directory %s. %s is probably already running.</source>
+        <translation>Kan ikke opnå en lås på datamappe %s. %s kører sansynligvis allerede.</translation>
+    </message>
     <message>
         <source>Delete all wallet transactions and only recover those parts of the blockchain through -rescan on startup</source>
         <translation>Slet alle transaktioner i tegnebogen og genskab kun disse dele af blokkæden gennem -rescan under opstart</translation>
@@ -2999,6 +1834,14 @@
         <source>Distributed under the MIT software license, see the accompanying file COPYING or &lt;http://www.opensource.org/licenses/mit-license.php&gt;.</source>
         <translation>Distribueret under MIT-softwarelicensen; se den vedlagte fil COPYING eller &lt;http://www.opensource.org/licenses/mit-license.php&gt;.</translation>
     </message>
+    <message>
+        <source>Error loading %s: You can't enable HD on a already existing non-HD wallet</source>
+        <translation>Fejl under indlæsning af %s: Du kan ikke aktivere HD på en allerede eksisterende ikke-HD-tegnebog</translation>
+    </message>
+    <message>
+        <source>Error reading %s! All keys read correctly, but transaction data or address book entries might be missing or incorrect.</source>
+        <translation>Fejl under læsning af %s! Alle nøgler blev læst korrekt, men transaktionsdata eller indgange i adressebogen kan mangle eller være ukorrekte.</translation>
+    </message>
     <message>
         <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source>
         <translation>Udfør kommando, når en transaktion i tegnebogen ændres (%s i kommandoen erstattes med TxID)</translation>
@@ -3007,6 +1850,22 @@
         <source>Force relay of transactions from whitelisted peers even they violate local relay policy (default: %d)</source>
         <translation>Gennemtving videresendelse af transaktioner fra hvidlistede knuder, selv om de overtræder lokal videresendelsespolitik (standard: %d)</translation>
     </message>
+    <message>
+        <source>Maximum allowed median peer time offset adjustment. Local perspective of time may be influenced by peers forward or backward by this amount. (default: %u seconds)</source>
+        <translation>Justering af maksimalt tilladt gennemsnitlig afvigelse fra peer-tid. Den lokale opfattelse af tid kan blive påvirket frem eller tilbage af peers med denne mængde tid. (standard: %u sekunder)</translation>
+    </message>
+    <message>
+        <source>Maximum total fees (in %s) to use in a single wallet transaction or raw transaction; setting this too low may abort large transactions (default: %s)</source>
+        <translation>Maksimalt totalgebyr (i %s) der må bruges i en enkelt tegnebogstransaktion eller rå transaktion; en for lav en værdi kan afbryde store transaktioner (standard: %s)</translation>
+    </message>
+    <message>
+        <source>Please check that your computer's date and time are correct! If your clock is wrong, %s will not work properly.</source>
+        <translation>Undersøg venligst at din computers dato og klokkeslet er korrekt indstillet! Hvis der er fejl i disse, vil %s ikke fungere korrekt.</translation>
+    </message>
+    <message>
+        <source>Please contribute if you find %s useful. Visit %s for further information about the software.</source>
+        <translation>Overvej venligst at bidrage til udviklingen, hvis du finder %s brugbar. Besøg %s for yderligere information om softwaren.</translation>
+    </message>
     <message>
         <source>Set the number of script verification threads (%u to %d, 0 = auto, &lt;0 = leave that many cores free, default: %d)</source>
         <translation>Sæt antallet af scriptverificeringstråde (%u til %d, 0 = auto, &lt;0 = efterlad det antal kernet fri, standard: %d)</translation>
@@ -3019,14 +1878,6 @@
         <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
         <translation>Dette er en foreløbig testudgivelse - brug på eget ansvar - brug ikke til udvinding eller handelsprogrammer</translation>
     </message>
-    <message>
-        <source>Unable to bind to %s on this computer. Bitcoin Core is probably already running.</source>
-        <translation>Ikke i stand til at tildele til %s på denne computer. Bitcoin Core kører sansynligvis allerede.</translation>
-    </message>
-    <message>
-        <source>Unsupported argument -whitelistalwaysrelay ignored, use -whitelistrelay and/or -whitelistforcerelay.</source>
-        <translation>Argument -whitelistalwaysrelay understøttes ikke og ignoreres; brug -whitelistrelay og/eller -whitelistforcerelay.</translation>
-    </message>
     <message>
         <source>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</source>
         <translation>Brug UPnP for at konfigurere den lyttende port (standard: 1 under lytning og ingen -proxy)</translation>
@@ -3043,22 +1894,22 @@
         <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source>
         <translation>Advarsel: Netværket ser ikke ud til at være fuldt ud enige! Enkelte minere ser ud til at opleve problemer.</translation>
     </message>
-    <message>
-        <source>Warning: Unknown block versions being mined! It's possible unknown rules are in effect</source>
-        <translation>Advarsel: Ukendte blokversioner bliver minet! Det er muligt, at ukendte regler er i brug</translation>
-    </message>
     <message>
         <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source>
         <translation>Advarsel: Vi ser ikke ud til at være fuldt ud enige med andre knuder! Du kan være nødt til at opgradere, eller andre knuder kan være nødt til at opgradere.</translation>
     </message>
-    <message>
-        <source>Warning: wallet.dat corrupt, data salvaged! Original wallet.dat saved as wallet.{timestamp}.bak in %s; if your balance or transactions are incorrect you should restore from a backup.</source>
-        <translation>Advarsel: wallet.dat ødelagt, data reddet! Oprindelig wallet.dat gemt som wallet.{timestamp}.bak i %s; hvis din saldo eller dine transaktioner er forkert, bør du genskabe fra en sikkerhedskopi.</translation>
-    </message>
     <message>
         <source>Whitelist peers connecting from the given netmask or IP address. Can be specified multiple times.</source>
         <translation>Sæt andre knuder, der forbinder fra den angivne netmaske eller IP, på hvidliste. Kan angives flere gange.</translation>
     </message>
+    <message>
+        <source>You need to rebuild the database using -reindex-chainstate to change -txindex</source>
+        <translation>Du er nødt til at genopbygge databasen ved hjælp af -reindex-chainstate for at ændre -txindex</translation>
+    </message>
+    <message>
+        <source>%s corrupt, salvage failed</source>
+        <translation>%s ødelagt, redning af data mislykkedes</translation>
+    </message>
     <message>
         <source>-maxmempool must be at least %d MB</source>
         <translation>-maxmempool skal være mindst %d MB</translation>
@@ -3071,10 +1922,22 @@
         <source>Append comment to the user agent string</source>
         <translation>Føj kommentar til brugeragentstrengen</translation>
     </message>
+    <message>
+        <source>Attempt to recover private keys from a corrupt wallet on startup</source>
+        <translation>Forsøg at genskabe private nøgler fra en ødelagt tegnebog under opstart</translation>
+    </message>
     <message>
         <source>Block creation options:</source>
         <translation>Blokoprettelsestilvalg:</translation>
     </message>
+    <message>
+        <source>Cannot resolve -%s address: '%s'</source>
+        <translation>Kan ikke finde -%s-adressen: "%s"</translation>
+    </message>
+    <message>
+        <source>Change index out of range</source>
+        <translation>Ændr indeks uden for interval</translation>
+    </message>
     <message>
         <source>Connect only to the specified node(s)</source>
         <translation>Tilslut kun til de(n) angivne knude(r)</translation>
@@ -3083,6 +1946,10 @@
         <source>Connection options:</source>
         <translation>Tilvalg for forbindelser:</translation>
     </message>
+    <message>
+        <source>Copyright (C) %i-%i</source>
+        <translation>Ophavsret © %i-%i</translation>
+    </message>
     <message>
         <source>Corrupted block database detected</source>
         <translation>Ødelagt blokdatabase opdaget</translation>
@@ -3127,6 +1994,22 @@
         <source>Error initializing wallet database environment %s!</source>
         <translation>Klargøring af tegnebogsdatabasemiljøet %s mislykkedes!</translation>
     </message>
+    <message>
+        <source>Error loading %s</source>
+        <translation>Fejl under indlæsning af %s</translation>
+    </message>
+    <message>
+        <source>Error loading %s: Wallet corrupted</source>
+        <translation>Fejl under indlæsning af %s: Tegnebog ødelagt</translation>
+    </message>
+    <message>
+        <source>Error loading %s: Wallet requires newer version of %s</source>
+        <translation>Fejl under indlæsning af %s: Tegnebog kræver nyere version af %s</translation>
+    </message>
+    <message>
+        <source>Error loading %s: You can't disable HD on a already existing HD wallet</source>
+        <translation>Fejl under indlæsning af %s: Du kan ikke deaktivere HD på en allerede eksisterende HD-tegnebog</translation>
+    </message>
     <message>
         <source>Error loading block database</source>
         <translation>Indlæsning af blokdatabase mislykkedes</translation>
@@ -3151,10 +2034,18 @@
         <source>Incorrect or no genesis block found. Wrong datadir for network?</source>
         <translation>Ukorrekt eller ingen tilblivelsesblok fundet. Forkert datamappe for netværk?</translation>
     </message>
+    <message>
+        <source>Initialization sanity check failed. %s is shutting down.</source>
+        <translation>Klargøring af sundhedstjek mislykkedes. %s lukker ned.</translation>
+    </message>
     <message>
         <source>Invalid -onion address: '%s'</source>
         <translation>Ugyldig -onion adresse: "%s"</translation>
     </message>
+    <message>
+        <source>Invalid amount for -%s=&lt;amount&gt;: '%s'</source>
+        <translation>Ugyldigt beløb for -%s=&lt;beløb&gt;: "%s"</translation>
+    </message>
     <message>
         <source>Invalid amount for -fallbackfee=&lt;amount&gt;: '%s'</source>
         <translation>Ugyldigt beløb for -fallbackfee=&lt;beløb&gt;: "%s"</translation>
@@ -3163,6 +2054,10 @@
         <source>Keep the transaction memory pool below &lt;n&gt; megabytes (default: %u)</source>
         <translation>Hold hukommelsespuljen med transaktioner under &lt;n&gt; megabyte (standard: %u)</translation>
     </message>
+    <message>
+        <source>Loading banlist...</source>
+        <translation>Indlæser bandlysningsliste…</translation>
+    </message>
     <message>
         <source>Location of the auth cookie (default: data dir)</source>
         <translation>Placering for autentificerings-cookie (standard: datamappe)</translation>
@@ -3179,6 +2074,10 @@
         <source>Only connect to nodes in network &lt;net&gt; (ipv4, ipv6 or onion)</source>
         <translation>Tilslut kun til knuder i netværk &lt;net&gt; (IPv4, IPv6 eller Onion)</translation>
     </message>
+    <message>
+        <source>Print this help message and exit</source>
+        <translation>Udskriv denne hjælpetekst og afslut</translation>
+    </message>
     <message>
         <source>Print version and exit</source>
         <translation>Udskriv version og afslut</translation>
@@ -3191,6 +2090,14 @@
         <source>Prune mode is incompatible with -txindex.</source>
         <translation>Beskæringstilstand er ikke kompatibel med -txindex.</translation>
     </message>
+    <message>
+        <source>Rebuild chain state and block index from the blk*.dat files on disk</source>
+        <translation>Genopbyg kædetilstand og blokindeks fra blk*.dat-filerne på disken</translation>
+    </message>
+    <message>
+        <source>Rebuild chain state from the currently indexed blocks</source>
+        <translation>Genopbyg kædetilstand ud fra de aktuelt indekserede blokke</translation>
+    </message>
     <message>
         <source>Set database cache size in megabytes (%d to %d, default: %d)</source>
         <translation>Sæt cache-størrelse for database i megabytes (%d til %d; standard: %d)</translation>
@@ -3203,6 +2110,14 @@
         <source>Specify wallet file (within data directory)</source>
         <translation>Angiv tegnebogsfil (inden for datamappe)</translation>
     </message>
+    <message>
+        <source>The source code is available from %s.</source>
+        <translation>Kildekoden er tilgængelig fra %s.</translation>
+    </message>
+    <message>
+        <source>Unable to bind to %s on this computer. %s is probably already running.</source>
+        <translation>Ikke i stand til at tildele til %s på denne computer. %s kører formodentlig allerede.</translation>
+    </message>
     <message>
         <source>Unsupported argument -benchmark ignored, use -debug=bench.</source>
         <translation>Argument -benchmark understøttes ikke og ignoreres; brug -debug=bench.</translation>
@@ -3236,12 +2151,16 @@
         <translation>Tegnebog %s findes uden for datamappe %s</translation>
     </message>
     <message>
-        <source>Wallet options:</source>
-        <translation>Tilvalg for tegnebog:</translation>
+        <source>Wallet debugging/testing options:</source>
+        <translation>Tilvalg for fejlfinding/test af tegnebog:</translation>
+    </message>
+    <message>
+        <source>Wallet needed to be rewritten: restart %s to complete</source>
+        <translation>Det var nødvendigt at genskrive tegnebogen: Genstart %s for at gennemføre</translation>
     </message>
     <message>
-        <source>You need to rebuild the database using -reindex to change -txindex</source>
-        <translation>Du er nødt til at genopbygge databasen ved hjælp af -reindex for at ændre -txindex</translation>
+        <source>Wallet options:</source>
+        <translation>Tilvalg for tegnebog:</translation>
     </message>
     <message>
         <source>Allow JSON-RPC connections from specified source. Valid for &lt;ip&gt; are a single IP (e.g. 1.2.3.4), a network/netmask (e.g. 1.2.3.4/255.255.255.0) or a network/CIDR (e.g. 1.2.3.4/24). This option can be specified multiple times</source>
@@ -3255,10 +2174,6 @@
         <source>Bind to given address to listen for JSON-RPC connections. Use [host]:port notation for IPv6. This option can be specified multiple times (default: bind to all interfaces)</source>
         <translation>Tildel til den givne adresse for at lytte efter JSON-RPC-forbindelser. Brug [vært]:port-notation for IPv6. Denne valgmulighed kan angives flere gange (standard: tildel til alle grænseflader)</translation>
     </message>
-    <message>
-        <source>Cannot obtain a lock on data directory %s. Bitcoin Core is probably already running.</source>
-        <translation>Kan ikke opnå en lås på datamappe %s. Bitcoin Core kører sansynligvis allerede.</translation>
-    </message>
     <message>
         <source>Create new files with system default permissions, instead of umask 077 (only effective with disabled wallet functionality)</source>
         <translation>Opret nye filer med systemstandard for rettigheder i stedet for umask 077 (kun virksomt med tegnebogsfunktionalitet slået fra)</translation>
@@ -3303,10 +2218,6 @@
         <source>Set maximum size of high-priority/low-fee transactions in bytes (default: %d)</source>
         <translation>Sæt maksimumstørrelse for højprioritet/lavgebyr-transaktioner i byte (standard: %d)</translation>
     </message>
-    <message>
-        <source>Set the number of threads for coin generation if enabled (-1 = all cores, default: %d)</source>
-        <translation>Sæt antaller af tråde for coin-generering, hvis aktiveret (-1 = alle kerner, standard: %d)</translation>
-    </message>
     <message>
         <source>The transaction amount is too small to send after the fee has been deducted</source>
         <translation>Transaktionsbeløbet er for lille til at sende, når gebyret er trukket fra</translation>
@@ -3315,6 +2226,10 @@
         <source>This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit &lt;https://www.openssl.org/&gt; and cryptographic software written by Eric Young and UPnP software written by Thomas Bernard.</source>
         <translation>Dette produkt indeholder software, der er udviklet af OpenSSL-projektet for brug i OpenSSL-værktøjskassen &lt;https://www.openssl.org/&gt;, samt kryptografisk software, der er skrevet af Eric Young, samt UPnP-software, der er skrevet af Thomas Bernard.</translation>
     </message>
+    <message>
+        <source>Use hierarchical deterministic key generation (HD) after BIP32. Only has effect during wallet creation/first start</source>
+        <translation>Brug hierarkisk deterministisk nøglegenerering (HD) efter BIP32. Har kun effekt ved generering af ny tegnebog og under første opstart</translation>
+    </message>
     <message>
         <source>Whitelisted peers cannot be DoS banned and their transactions are always relayed, even if they are already in the mempool, useful e.g. for a gateway</source>
         <translation>Andre knuder på hvidliste kan ikke DoS-bandlyses, og deres transaktioner videresendes altid, selv hvis de allerede er i hukommelsespuljen. Brugbart til fx et adgangspunkt</translation>
@@ -3331,34 +2246,14 @@
         <source>Accept public REST requests (default: %u)</source>
         <translation>Acceptér offentlige REST-anmodninger (standard: %u)</translation>
     </message>
-    <message>
-        <source>Activating best chain...</source>
-        <translation>Aktiverer bedste kæde…</translation>
-    </message>
-    <message>
-        <source>Attempt to recover private keys from a corrupt wallet.dat on startup</source>
-        <translation>Forsøg at genskabe private nøgler fra en ødelagt wallet.dat under opstart</translation>
-    </message>
     <message>
         <source>Automatically create Tor hidden service (default: %d)</source>
         <translation>Opret automatisk skjult Tor-tjeneste (standard: %d)</translation>
     </message>
-    <message>
-        <source>Cannot resolve -whitebind address: '%s'</source>
-        <translation>Kan ikke løse -whitebind adresse: "%s"</translation>
-    </message>
     <message>
         <source>Connect through SOCKS5 proxy</source>
         <translation>Forbind gennem SOCKS5-proxy</translation>
     </message>
-    <message>
-        <source>Copyright (C) 2009-%i The Bitcoin Core Developers</source>
-        <translation>Ophavsret © 2009-%i Udviklerne af Bitcoin Core</translation>
-    </message>
-    <message>
-        <source>Error loading wallet.dat: Wallet requires newer version of Bitcoin Core</source>
-        <translation>Fejl ved indlæsning af wallet.dat: Tegnebog kræver en nyere version af Bitcoin Core</translation>
-    </message>
     <message>
         <source>Error reading from database, shutting down.</source>
         <translation>Fejl under læsning fra database; lukker ned.</translation>
@@ -3371,22 +2266,6 @@
         <source>Information</source>
         <translation>Information</translation>
     </message>
-    <message>
-        <source>Initialization sanity check failed. Bitcoin Core is shutting down.</source>
-        <translation>Sundhedstjek under klargøring mislykkedes. Bitcoin Core lukker ned.</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -maxtxfee=&lt;amount&gt;: '%s'</source>
-        <translation>Ugyldigt beløb for -maxtxfee=&lt;beløb&gt;: "%s"</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -minrelaytxfee=&lt;amount&gt;: '%s'</source>
-        <translation>Ugyldigt beløb til -minrelaytxfee=&lt;beløb&gt;: "%s"</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -mintxfee=&lt;amount&gt;: '%s'</source>
-        <translation>Ugyldigt beløb til -mintxfee=&lt;beløb&gt;: "%s"</translation>
-    </message>
     <message>
         <source>Invalid amount for -paytxfee=&lt;amount&gt;: '%s' (must be at least %s)</source>
         <translation>Ugyldigt beløb for -paytxfee=&lt;beløb&gt;: "%s" (skal være mindst %s)</translation>
@@ -3411,14 +2290,6 @@
         <source>RPC server options:</source>
         <translation>Tilvalg for RPC-server:</translation>
     </message>
-    <message>
-        <source>Rebuild block chain index from current blk000??.dat files on startup</source>
-        <translation>Genopbyg blokkædeindeks fra nuværende blk000??.dat-filer ved opstart</translation>
-    </message>
-    <message>
-        <source>Receive and display P2P network alerts (default: %u)</source>
-        <translation>Modtag og vis P2P-netværksadvarsler (standard: %u)</translation>
-    </message>
     <message>
         <source>Reducing -maxconnections from %d to %d, because of system limitations.</source>
         <translation>Reducerer -maxconnections fra %d til %d på grund af systembegrænsninger.</translation>
@@ -3491,10 +2362,6 @@
         <source>Username for JSON-RPC connections</source>
         <translation>Brugernavn til JSON-RPC-forbindelser</translation>
     </message>
-    <message>
-        <source>Wallet needed to be rewritten: restart Bitcoin Core to complete</source>
-        <translation>Det var nødvendigt at genskrive tegnebogen: genstart Bitcoin Core for at gennemføre</translation>
-    </message>
     <message>
         <source>Warning</source>
         <translation>Advarsel</translation>
@@ -3515,10 +2382,6 @@
         <source>ZeroMQ notification options:</source>
         <translation>ZeroMQ-notifikationsindstillinger:</translation>
     </message>
-    <message>
-        <source>wallet.dat corrupt, salvage failed</source>
-        <translation>wallet.dat ødelagt, redning af data mislykkedes</translation>
-    </message>
     <message>
         <source>Password for JSON-RPC connections</source>
         <translation>Adgangskode til JSON-RPC-forbindelser</translation>
@@ -3527,10 +2390,6 @@
         <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
         <translation>Udfør kommando, når den bedste blok ændres (%s i kommandoen erstattes med blokhash)</translation>
     </message>
-    <message>
-        <source>This help message</source>
-        <translation>Denne hjælpebesked</translation>
-    </message>
     <message>
         <source>Allow DNS lookups for -addnode, -seednode and -connect</source>
         <translation>Tillad DNS-opslag for -addnode, -seednode og -connect</translation>
@@ -3539,10 +2398,6 @@
         <source>Loading addresses...</source>
         <translation>Indlæser adresser…</translation>
     </message>
-    <message>
-        <source>Error loading wallet.dat: Wallet corrupted</source>
-        <translation>Fejl ved indlæsning af wallet.dat: Tegnebog ødelagt</translation>
-    </message>
     <message>
         <source>(1 = keep tx meta data e.g. account owner and payment request information, 2 = drop tx meta data)</source>
         <translation>(1 = behold metadata for transaktion, fx kontoindehaver og information om betalingsanmodning, 2 = drop metadata for transaktion)</translation>
@@ -3559,10 +2414,6 @@
         <source>Do not keep transactions in the mempool longer than &lt;n&gt; hours (default: %u)</source>
         <translation>Behold ikke transaktioner i hukommelsespuljen i mere end &lt;n&gt; timer (default: %u)</translation>
     </message>
-    <message>
-        <source>Error reading wallet.dat! All keys read correctly, but transaction data or address book entries might be missing or incorrect.</source>
-        <translation>Fejl under læsning af wallet.dat! Alle nøgler blev læst korrekt, men transaktionsdata eller indgange i adressebogen kan mangle eller være ukorrekte.</translation>
-    </message>
     <message>
         <source>Fees (in %s/kB) smaller than this are considered zero fee for transaction creation (default: %s)</source>
         <translation>Gebyrer (i %s/kB) mindre end dette opfattes som intet gebyr under oprettelse af transaktioner (standard: %s)</translation>
@@ -3599,6 +2450,10 @@
         <source>Unsupported argument -socks found. Setting SOCKS version isn't possible anymore, only SOCKS5 proxies are supported.</source>
         <translation>Argument -socks understøttes ikke. Det er ikke længere muligt at sætte SOCKS-version; kun SOCKS5-proxier understøttes.</translation>
     </message>
+    <message>
+        <source>Unsupported argument -whitelistalwaysrelay ignored, use -whitelistrelay and/or -whitelistforcerelay.</source>
+        <translation>Argument -whitelistalwaysrelay understøttes ikke og ignoreres; brug -whitelistrelay og/eller -whitelistforcerelay.</translation>
+    </message>
     <message>
         <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: %s)</source>
         <translation>Brug separat SOCS5-proxy for at nå knuder via skjulte Tor-tjenester (standard: %s)</translation>
@@ -3608,20 +2463,20 @@
         <translation>Brugernavn og hashet adgangskode for JSON-RPC-forbindelser. Feltet &lt;userpw&gt; er i formatet: &lt;BRUGERNAVN&gt;:&lt;SALT&gt;$&lt;HASH&gt;. Et kanonisk Python-skript inkluderes i share/rpcuser. Dette tilvalg kan angives flere gange</translation>
     </message>
     <message>
-        <source>(default: %s)</source>
-        <translation>(standard: %s)</translation>
+        <source>Warning: Unknown block versions being mined! It's possible unknown rules are in effect</source>
+        <translation>Advarsel: Ukendte blokversioner bliver minet! Det er muligt, at ukendte regler er i brug</translation>
     </message>
     <message>
-        <source>Always query for peer addresses via DNS lookup (default: %u)</source>
-        <translation>Forespørg altid adresser på andre knuder via DNS-opslag (default: %u)</translation>
+        <source>Warning: Wallet file corrupt, data salvaged! Original %s saved as %s in %s; if your balance or transactions are incorrect you should restore from a backup.</source>
+        <translation>Advarsel: Tegnebogsfil ødelagt, data reddet! Oprindelig %s gemt som %s i %s; hvis din saldo eller dine transaktioner er forkert, bør du genskabe fra en sikkerhedskopi.</translation>
     </message>
     <message>
-        <source>Error loading wallet.dat</source>
-        <translation>Fejl ved indlæsning af wallet.dat</translation>
+        <source>(default: %s)</source>
+        <translation>(standard: %s)</translation>
     </message>
     <message>
-        <source>Generate coins (default: %u)</source>
-        <translation>Generér bitcoins (standard: %u)</translation>
+        <source>Always query for peer addresses via DNS lookup (default: %u)</source>
+        <translation>Forespørg altid adresser på andre knuder via DNS-opslag (default: %u)</translation>
     </message>
     <message>
         <source>How many blocks to check at startup (default: %u, 0 = all)</source>
@@ -3708,18 +2563,6 @@
         <source>Unknown network specified in -onlynet: '%s'</source>
         <translation>Ukendt netværk anført i -onlynet: "%s"</translation>
     </message>
-    <message>
-        <source>Cannot resolve -bind address: '%s'</source>
-        <translation>Kan ikke finde -bind adressen: "%s"</translation>
-    </message>
-    <message>
-        <source>Cannot resolve -externalip address: '%s'</source>
-        <translation>Kan ikke finde -externalip adressen: "%s"</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -paytxfee=&lt;amount&gt;: '%s'</source>
-        <translation>Ugyldigt beløb for -paytxfee=&lt;beløb&gt;: "%s"</translation>
-    </message>
     <message>
         <source>Insufficient funds</source>
         <translation>Manglende dækning</translation>
diff --git a/src/qt/locale/bitcoin_de.ts b/src/qt/locale/bitcoin_de.ts
index 947a471acd1dc..639bc3cf2f72e 100644
--- a/src/qt/locale/bitcoin_de.ts
+++ b/src/qt/locale/bitcoin_de.ts
@@ -25,10 +25,6 @@
         <source>C&amp;lose</source>
         <translation>&amp;Schließen</translation>
     </message>
-    <message>
-        <source>&amp;Copy Address</source>
-        <translation>Adresse &amp;kopieren</translation>
-    </message>
     <message>
         <source>Delete the currently selected address from the list</source>
         <translation>Ausgewählte Adresse aus der Liste entfernen</translation>
@@ -45,73 +41,6 @@
         <source>&amp;Delete</source>
         <translation>&amp;Löschen</translation>
     </message>
-    <message>
-        <source>Choose the address to send coins to</source>
-        <translation>Wählen Sie die Adresse aus, an die Sie Bitcoins überweisen möchten</translation>
-    </message>
-    <message>
-        <source>Choose the address to receive coins with</source>
-        <translation>Wählen Sie die Adresse aus, über die Sie Bitcoins empfangen wollen</translation>
-    </message>
-    <message>
-        <source>C&amp;hoose</source>
-        <translation>&amp;Auswählen</translation>
-    </message>
-    <message>
-        <source>Sending addresses</source>
-        <translation>Zahlungsadressen</translation>
-    </message>
-    <message>
-        <source>Receiving addresses</source>
-        <translation>Empfangsadressen</translation>
-    </message>
-    <message>
-        <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source>
-        <translation>Dies sind Ihre Bitcoin-Adressen zum Tätigen von Überweisungen. Bitte prüfen Sie den Betrag und die Empfangsadresse, bevor Sie Bitcoins überweisen.</translation>
-    </message>
-    <message>
-        <source>These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source>
-        <translation>Dies sind Ihre Bitcoin-Adressen zum Empfangen von Zahlungen. Es wird empfohlen für jede Transaktion eine neue Empfangsadresse zu verwenden.</translation>
-    </message>
-    <message>
-        <source>Copy &amp;Label</source>
-        <translation>&amp;Bezeichnung kopieren</translation>
-    </message>
-    <message>
-        <source>&amp;Edit</source>
-        <translation>&amp;Editieren</translation>
-    </message>
-    <message>
-        <source>Export Address List</source>
-        <translation>Addressliste exportieren</translation>
-    </message>
-    <message>
-        <source>Comma separated file (*.csv)</source>
-        <translation>Kommagetrennte-Datei (*.csv)</translation>
-    </message>
-    <message>
-        <source>Exporting Failed</source>
-        <translation>Exportieren fehlgeschlagen</translation>
-    </message>
-    <message>
-        <source>There was an error trying to save the address list to %1. Please try again.</source>
-        <translation>Beim Speichern der Adressliste nach %1 ist ein Fehler aufgetreten. Bitte versuchen Sie es erneut.</translation>
-    </message>
-</context>
-<context>
-    <name>AddressTableModel</name>
-    <message>
-        <source>Label</source>
-        <translation>Bezeichnung</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>Adresse</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(keine Bezeichnung)</translation>
-    </message>
 </context>
 <context>
     <name>AskPassphraseDialog</name>
@@ -131,94 +60,6 @@
         <source>Repeat new passphrase</source>
         <translation>Neue Passphrase bestätigen</translation>
     </message>
-    <message>
-        <source>Encrypt wallet</source>
-        <translation>Wallet verschlüsseln</translation>
-    </message>
-    <message>
-        <source>This operation needs your wallet passphrase to unlock the wallet.</source>
-        <translation>Dieser Vorgang benötigt Ihre Passphrase, um die Wallet zu entsperren.</translation>
-    </message>
-    <message>
-        <source>Unlock wallet</source>
-        <translation>Wallet entsperren</translation>
-    </message>
-    <message>
-        <source>This operation needs your wallet passphrase to decrypt the wallet.</source>
-        <translation>Dieser Vorgang benötigt Ihre Passphrase, um die Wallet zu entschlüsseln.</translation>
-    </message>
-    <message>
-        <source>Decrypt wallet</source>
-        <translation>Wallet entschlüsseln</translation>
-    </message>
-    <message>
-        <source>Change passphrase</source>
-        <translation>Passphrase ändern</translation>
-    </message>
-    <message>
-        <source>Confirm wallet encryption</source>
-        <translation>Wallet-Verschlüsselung bestätigen</translation>
-    </message>
-    <message>
-        <source>Warning: If you encrypt your wallet and lose your passphrase, you will &lt;b&gt;LOSE ALL OF YOUR BITCOINS&lt;/b&gt;!</source>
-        <translation>Warnung: Wenn Sie Ihre Wallet verschlüsseln und Ihre Passphrase verlieren, werden Sie &lt;b&gt;alle Ihre Bitcoins verlieren&lt;/b&gt;!</translation>
-    </message>
-    <message>
-        <source>Are you sure you wish to encrypt your wallet?</source>
-        <translation>Sind Sie sich sicher, dass Sie Ihre Wallet verschlüsseln möchten?</translation>
-    </message>
-    <message>
-        <source>Bitcoin Core will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source>
-        <translation>Bitcoin Core wird jetzt beendet, um den Verschlüsselungsprozess abzuschließen. Vergessen Sie nicht, dass eine Wallet-Verschlüsselung nicht vollständig vor Diebstahl Ihrer Bitcoins durch Schadsoftware schützen kann, die Ihren Computer infiziert.</translation>
-    </message>
-    <message>
-        <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source>
-        <translation>WICHTIG: Alle vorherigen Wallet-Sicherungen sollten durch die neu erzeugte, verschlüsselte Wallet ersetzt werden. Aus Sicherheitsgründen werden vorherige Sicherungen der unverschlüsselten Wallet nutzlos, sobald Sie die neue, verschlüsselte Wallet verwenden.</translation>
-    </message>
-    <message>
-        <source>Warning: The Caps Lock key is on!</source>
-        <translation>Warnung: Die Feststelltaste ist aktiviert!</translation>
-    </message>
-    <message>
-        <source>Wallet encrypted</source>
-        <translation>Wallet verschlüsselt</translation>
-    </message>
-    <message>
-        <source>Enter the new passphrase to the wallet.&lt;br/&gt;Please use a passphrase of &lt;b&gt;ten or more random characters&lt;/b&gt;, or &lt;b&gt;eight or more words&lt;/b&gt;.</source>
-        <translation>Geben Sie die neue Passphrase für die Wallet ein.&lt;br&gt;Bitte benutzen Sie eine Passphrase bestehend aus &lt;b&gt;zehn oder mehr zufälligen Zeichen&lt;/b&gt; oder &lt;b&gt;acht oder mehr Wörtern&lt;/b&gt;.</translation>
-    </message>
-    <message>
-        <source>Enter the old passphrase and new passphrase to the wallet.</source>
-        <translation>Geben Sie die alte und neue Wallet-Passphrase ein.</translation>
-    </message>
-    <message>
-        <source>Wallet encryption failed</source>
-        <translation>Wallet-Verschlüsselung fehlgeschlagen</translation>
-    </message>
-    <message>
-        <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
-        <translation>Die Wallet-Verschlüsselung ist aufgrund eines internen Fehlers fehlgeschlagen. Ihre Wallet wurde nicht verschlüsselt.</translation>
-    </message>
-    <message>
-        <source>The supplied passphrases do not match.</source>
-        <translation>Die eingegebenen Passphrasen stimmen nicht überein.</translation>
-    </message>
-    <message>
-        <source>Wallet unlock failed</source>
-        <translation>Wallet-Entsperrung fehlgeschlagen</translation>
-    </message>
-    <message>
-        <source>The passphrase entered for the wallet decryption was incorrect.</source>
-        <translation>Die eingegebene Passphrase zur Wallet-Entschlüsselung war nicht korrekt.</translation>
-    </message>
-    <message>
-        <source>Wallet decryption failed</source>
-        <translation>Wallet-Entschlüsselung fehlgeschlagen</translation>
-    </message>
-    <message>
-        <source>Wallet passphrase was successfully changed.</source>
-        <translation>Die Wallet-Passphrase wurde erfolgreich geändert.</translation>
-    </message>
 </context>
 <context>
     <name>BanTableModel</name>
@@ -269,6 +110,14 @@
         <source>Quit application</source>
         <translation>Anwendung beenden</translation>
     </message>
+    <message>
+        <source>&amp;About %1</source>
+        <translation>&amp;Über %1</translation>
+    </message>
+    <message>
+        <source>Show information about %1</source>
+        <translation>Informationen über %1 anzeigen</translation>
+    </message>
     <message>
         <source>About &amp;Qt</source>
         <translation>Über &amp;Qt</translation>
@@ -281,6 +130,10 @@
         <source>&amp;Options...</source>
         <translation>&amp;Konfiguration...</translation>
     </message>
+    <message>
+        <source>Modify configuration options for %1</source>
+        <translation>Konfiguration von %1 bearbeiten</translation>
+    </message>
     <message>
         <source>&amp;Encrypt Wallet...</source>
         <translation>Wallet &amp;verschlüsseln...</translation>
@@ -305,14 +158,6 @@
         <source>Open &amp;URI...</source>
         <translation>&amp;URI öffnen...</translation>
     </message>
-    <message>
-        <source>Bitcoin Core client</source>
-        <translation>"Bitcoin Core"-Client</translation>
-    </message>
-    <message>
-        <source>Importing blocks from disk...</source>
-        <translation>Importiere Blöcke von Datenträger...</translation>
-    </message>
     <message>
         <source>Reindexing blocks on disk...</source>
         <translation>Reindiziere Blöcke auf Datenträger...</translation>
@@ -357,10 +202,6 @@
         <source>&amp;Receive</source>
         <translation>&amp;Empfangen</translation>
     </message>
-    <message>
-        <source>Show information about Bitcoin Core</source>
-        <translation>Informationen über Bitcoin Core anzeigen</translation>
-    </message>
     <message>
         <source>&amp;Show / Hide</source>
         <translation>&amp;Anzeigen / Verstecken</translation>
@@ -397,22 +238,10 @@
         <source>Tabs toolbar</source>
         <translation>Registerkartenleiste</translation>
     </message>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Bitcoin Core</translation>
-    </message>
     <message>
         <source>Request payments (generates QR codes and bitcoin: URIs)</source>
         <translation>Zahlungen anfordern (erzeugt QR-Codes und "bitcoin:"-URIs)</translation>
     </message>
-    <message>
-        <source>&amp;About Bitcoin Core</source>
-        <translation>&amp;Über Bitcoin Core</translation>
-    </message>
-    <message>
-        <source>Modify configuration options for Bitcoin Core</source>
-        <translation>Konfiguration von Bitcoin Core bearbeiten</translation>
-    </message>
     <message>
         <source>Show the list of used sending addresses and labels</source>
         <translation>Liste verwendeter Zahlungsadressen und Bezeichnungen anzeigen</translation>
@@ -429,14 +258,18 @@
         <source>&amp;Command-line options</source>
         <translation>&amp;Kommandozeilenoptionen</translation>
     </message>
-    <message>
-        <source>Show the Bitcoin Core help message to get a list with possible Bitcoin command-line options</source>
-        <translation>Zeige den "Bitcoin Core"-Hilfetext, um eine Liste mit möglichen Kommandozeilenoptionen zu erhalten</translation>
-    </message>
     <message numerus="yes">
         <source>%n active connection(s) to Bitcoin network</source>
         <translation><numerusform>%n aktive Verbindung zum Bitcoin-Netzwerk</numerusform><numerusform>%n aktive Verbindungen zum Bitcoin-Netzwerk</numerusform></translation>
     </message>
+    <message>
+        <source>Indexing blocks on disk...</source>
+        <translation>Reindiziere Blöcke auf Datenträger...</translation>
+    </message>
+    <message>
+        <source>Processing blocks on disk...</source>
+        <translation>Verarbeite Blöcke auf Datenträger...</translation>
+    </message>
     <message>
         <source>No block source available...</source>
         <translation>Keine Blockquelle verfügbar...</translation>
@@ -493,6 +326,14 @@
         <source>Up to date</source>
         <translation>Auf aktuellem Stand</translation>
     </message>
+    <message>
+        <source>Show the %1 help message to get a list with possible Bitcoin command-line options</source>
+        <translation>Zeige den "%1"-Hilfetext, um eine Liste mit möglichen Kommandozeilenoptionen zu erhalten</translation>
+    </message>
+    <message>
+        <source>%1 client</source>
+        <translation>%1 Client</translation>
+    </message>
     <message>
         <source>Catching up...</source>
         <translation>Hole auf...</translation>
@@ -544,13 +385,6 @@
         <translation>Wallet ist &lt;b&gt;verschlüsselt&lt;/b&gt; und aktuell &lt;b&gt;gesperrt&lt;/b&gt;</translation>
     </message>
 </context>
-<context>
-    <name>ClientModel</name>
-    <message>
-        <source>Network Alert</source>
-        <translation>Netzwerkalarm</translation>
-    </message>
-</context>
 <context>
     <name>CoinControlDialog</name>
     <message>
@@ -629,150 +463,6 @@
         <source>Priority</source>
         <translation>Priorität</translation>
     </message>
-    <message>
-        <source>Copy address</source>
-        <translation>Adresse kopieren</translation>
-    </message>
-    <message>
-        <source>Copy label</source>
-        <translation>Bezeichnung kopieren</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>Betrag kopieren</translation>
-    </message>
-    <message>
-        <source>Copy transaction ID</source>
-        <translation>Transaktions-ID kopieren</translation>
-    </message>
-    <message>
-        <source>Lock unspent</source>
-        <translation>Nicht ausgegebenen Betrag sperren</translation>
-    </message>
-    <message>
-        <source>Unlock unspent</source>
-        <translation>Nicht ausgegebenen Betrag entsperren</translation>
-    </message>
-    <message>
-        <source>Copy quantity</source>
-        <translation>Anzahl kopieren</translation>
-    </message>
-    <message>
-        <source>Copy fee</source>
-        <translation>Gebühr kopieren</translation>
-    </message>
-    <message>
-        <source>Copy after fee</source>
-        <translation>Abzüglich Gebühr kopieren</translation>
-    </message>
-    <message>
-        <source>Copy bytes</source>
-        <translation>Byte kopieren</translation>
-    </message>
-    <message>
-        <source>Copy priority</source>
-        <translation>Priorität kopieren</translation>
-    </message>
-    <message>
-        <source>Copy dust</source>
-        <translation>"Dust" kopieren</translation>
-    </message>
-    <message>
-        <source>Copy change</source>
-        <translation>Wechselgeld kopieren</translation>
-    </message>
-    <message>
-        <source>highest</source>
-        <translation>am höchsten</translation>
-    </message>
-    <message>
-        <source>higher</source>
-        <translation>höher</translation>
-    </message>
-    <message>
-        <source>high</source>
-        <translation>hoch</translation>
-    </message>
-    <message>
-        <source>medium-high</source>
-        <translation>mittel-hoch</translation>
-    </message>
-    <message>
-        <source>medium</source>
-        <translation>mittel</translation>
-    </message>
-    <message>
-        <source>low-medium</source>
-        <translation>niedrig-mittel</translation>
-    </message>
-    <message>
-        <source>low</source>
-        <translation>niedrig</translation>
-    </message>
-    <message>
-        <source>lower</source>
-        <translation>niedriger</translation>
-    </message>
-    <message>
-        <source>lowest</source>
-        <translation>am niedrigsten</translation>
-    </message>
-    <message>
-        <source>(%1 locked)</source>
-        <translation>(%1 gesperrt)</translation>
-    </message>
-    <message>
-        <source>none</source>
-        <translation>keine</translation>
-    </message>
-    <message>
-        <source>This label turns red if the transaction size is greater than 1000 bytes.</source>
-        <translation>Diese Bezeichnung wird rot, wenn die Transaktion größer als 1000 Byte ist.</translation>
-    </message>
-    <message>
-        <source>This label turns red if the priority is smaller than "medium".</source>
-        <translation>Diese Bezeichnung wird rot, wenn die Priorität niedriger als "mittel" ist.</translation>
-    </message>
-    <message>
-        <source>This label turns red if any recipient receives an amount smaller than %1.</source>
-        <translation>Diese Bezeichnung wird rot, wenn irgendein Empfänger einen Betrag kleiner als %1 erhält.</translation>
-    </message>
-    <message>
-        <source>Can vary +/- %1 satoshi(s) per input.</source>
-        <translation>Kann pro Eingabe um +/- %1 Satoshi(s) abweichen.</translation>
-    </message>
-    <message>
-        <source>yes</source>
-        <translation>ja</translation>
-    </message>
-    <message>
-        <source>no</source>
-        <translation>nein</translation>
-    </message>
-    <message>
-        <source>This means a fee of at least %1 per kB is required.</source>
-        <translation>Das bedeutet, dass eine Gebühr von mindestens %1 pro kB erforderlich ist.</translation>
-    </message>
-    <message>
-        <source>Can vary +/- 1 byte per input.</source>
-        <translation>Kann um +/- 1 Byte pro Eingabe variieren.</translation>
-    </message>
-    <message>
-        <source>Transactions with higher priority are more likely to get included into a block.</source>
-        <translation>Transaktionen mit höherer Priorität haben eine größere Chance in einen Block aufgenommen zu werden.</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(keine Bezeichnung)</translation>
-    </message>
-    <message>
-        <source>change from %1 (%2)</source>
-        <translation>Wechselgeld von %1 (%2)</translation>
-    </message>
-    <message>
-        <source>(change)</source>
-        <translation>(Wechselgeld)</translation>
-    </message>
 </context>
 <context>
     <name>EditAddressDialog</name>
@@ -796,38 +486,6 @@
         <source>&amp;Address</source>
         <translation>&amp;Adresse</translation>
     </message>
-    <message>
-        <source>New receiving address</source>
-        <translation>Neue Empfangsadresse</translation>
-    </message>
-    <message>
-        <source>New sending address</source>
-        <translation>Neue Zahlungsadresse</translation>
-    </message>
-    <message>
-        <source>Edit receiving address</source>
-        <translation>Empfangsadresse bearbeiten</translation>
-    </message>
-    <message>
-        <source>Edit sending address</source>
-        <translation>Zahlungsadresse bearbeiten</translation>
-    </message>
-    <message>
-        <source>The entered address "%1" is already in the address book.</source>
-        <translation>Die eingegebene Adresse "%1" befindet sich bereits im Adressbuch.</translation>
-    </message>
-    <message>
-        <source>The entered address "%1" is not a valid Bitcoin address.</source>
-        <translation>Die eingegebene Adresse "%1" ist keine gültige Bitcoin-Adresse.</translation>
-    </message>
-    <message>
-        <source>Could not unlock wallet.</source>
-        <translation>Wallet konnte nicht entsperrt werden.</translation>
-    </message>
-    <message>
-        <source>New key generation failed.</source>
-        <translation>Erzeugung eines neuen Schlüssels fehlgeschlagen.</translation>
-    </message>
 </context>
 <context>
     <name>FreespaceChecker</name>
@@ -854,10 +512,6 @@
 </context>
 <context>
     <name>HelpMessageDialog</name>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Bitcoin Core</translation>
-    </message>
     <message>
         <source>version</source>
         <translation>Version</translation>
@@ -867,8 +521,8 @@
         <translation>(%1-Bit)</translation>
     </message>
     <message>
-        <source>About Bitcoin Core</source>
-        <translation>Über Bitcoin Core</translation>
+        <source>About %1</source>
+        <translation>Über %1</translation>
     </message>
     <message>
         <source>Command-line options</source>
@@ -892,7 +546,7 @@
     </message>
     <message>
         <source>Set language, for example "de_DE" (default: system locale)</source>
-        <translation>Sprache einstellen, zum Beispiel "de_DE" (Standard: Systemgebietsschema)</translation>
+        <translation>Sprache einstellen, zum Beispiel "de_DE" (default: system locale)</translation>
     </message>
     <message>
         <source>Start minimized</source>
@@ -907,7 +561,7 @@
         <translation>Startbildschirm beim Starten anzeigen (Standard: %u)</translation>
     </message>
     <message>
-        <source>Reset all settings changes made over the GUI</source>
+        <source>Reset all settings changed in the GUI</source>
         <translation>Setze alle Einstellungen zurück, die über die grafische Oberfläche geändert wurden.</translation>
     </message>
 </context>
@@ -918,16 +572,16 @@
         <translation>Willkommen</translation>
     </message>
     <message>
-        <source>Welcome to Bitcoin Core.</source>
-        <translation>Willkommen zu Bitcoin Core.</translation>
+        <source>Welcome to %1.</source>
+        <translation>Willkommen zu %1.</translation>
     </message>
     <message>
-        <source>As this is the first time the program is launched, you can choose where Bitcoin Core will store its data.</source>
-        <translation>Da Sie das Programm gerade zum ersten Mal starten, können Sie nun auswählen wo Bitcoin Core seine Daten ablegen soll.</translation>
+        <source>As this is the first time the program is launched, you can choose where %1 will store its data.</source>
+        <translation>Da Sie das Programm gerade zum ersten Mal starten, können Sie nun auswählen wo %1 seine Daten ablegen wird.</translation>
     </message>
     <message>
-        <source>Bitcoin Core will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source>
-        <translation>Bitcoin Core wird eine Kopie der Blockkette herunterladen und speichern. Mindestens %1GB Daten werden in diesem Verzeichnis abgelegt und die Datenmenge wächst über die Zeit an. Auch die Wallet wird in diesem Verzeichnis abgelegt.</translation>
+        <source>%1 will download and store a copy of the Bitcoin block chain. At least %2GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source>
+        <translation>%1 wird eine Kopie der Blockkette herunterladen und speichern. Mindestens %2GB Daten werden in diesem Verzeichnis abgelegt und die Datenmenge wächst über die Zeit an. Auch die Wallet wird in diesem Verzeichnis abgelegt.</translation>
     </message>
     <message>
         <source>Use the default data directory</source>
@@ -937,10 +591,6 @@
         <source>Use a custom data directory:</source>
         <translation>Ein benutzerdefiniertes Datenverzeichnis verwenden:</translation>
     </message>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Bitcoin Core</translation>
-    </message>
     <message>
         <source>Error: Specified data directory "%1" cannot be created.</source>
         <translation>Fehler: Angegebenes Datenverzeichnis "%1" kann nicht angelegt werden.</translation>
@@ -976,10 +626,6 @@
         <source>Select payment request file</source>
         <translation>Zahlungsanforderungsdatei auswählen</translation>
     </message>
-    <message>
-        <source>Select payment request file to open</source>
-        <translation>Zu öffnende Zahlungsanforderungsdatei auswählen</translation>
-    </message>
 </context>
 <context>
     <name>OptionsDialog</name>
@@ -991,6 +637,14 @@
         <source>&amp;Main</source>
         <translation>&amp;Allgemein</translation>
     </message>
+    <message>
+        <source>Automatically start %1 after logging in to the system.</source>
+        <translation>%1 nach der Anmeldung am System automatisch ausführen.</translation>
+    </message>
+    <message>
+        <source>&amp;Start %1 on system login</source>
+        <translation>&amp;Starte %1 nach Systemanmeldung</translation>
+    </message>
     <message>
         <source>Size of &amp;database cache</source>
         <translation>Größe des &amp;Datenbankcaches</translation>
@@ -1019,10 +673,6 @@
         <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Exit in the menu.</source>
         <translation>Minimiert die Anwendung anstatt sie zu beenden wenn das Fenster geschlossen wird. Wenn dies aktiviert ist, müssen Sie die Anwendung über "Beenden" im Menü schließen.</translation>
     </message>
-    <message>
-        <source>The user interface language can be set here. This setting will take effect after restarting Bitcoin Core.</source>
-        <translation>Legt die Sprache der Benutzeroberfläche fest. Diese Einstellung wird erst nach einem Neustart von Bitcoin Core aktiv.</translation>
-    </message>
     <message>
         <source>Third party URLs (e.g. a block explorer) that appear in the transactions tab as context menu items. %s in the URL is replaced by transaction hash. Multiple URLs are separated by vertical bar |.</source>
         <translation>Externe URLs (z.B. ein Block-Explorer), die im Kontextmenü des Transaktionsverlaufs eingefügt werden. In der URL wird %s durch den Transaktionshash ersetzt. Bei Angabe mehrerer URLs müssen diese durch "|" voneinander getrennt werden.</translation>
@@ -1047,14 +697,6 @@
         <source>&amp;Network</source>
         <translation>&amp;Netzwerk</translation>
     </message>
-    <message>
-        <source>Automatically start Bitcoin Core after logging in to the system.</source>
-        <translation>Bitcoin Core nach der Anmeldung am System automatisch starten.</translation>
-    </message>
-    <message>
-        <source>&amp;Start Bitcoin Core on system login</source>
-        <translation>&amp;Bitcoin Core nach Systemanmeldung starten</translation>
-    </message>
     <message>
         <source>(0 = auto, &lt;0 = leave that many cores free)</source>
         <translation>(0 = automatisch, &lt;0 = so viele Kerne frei lassen)</translation>
@@ -1284,171 +926,61 @@
     </message>
 </context>
 <context>
-    <name>PaymentServer</name>
+    <name>PeerTableModel</name>
     <message>
-        <source>URI handling</source>
-        <translation>URI-Verarbeitung</translation>
+        <source>User Agent</source>
+        <translation>User-Agent</translation>
     </message>
     <message>
-        <source>Invalid payment address %1</source>
-        <translation>Ungültige Zahlungsadresse %1</translation>
+        <source>Node/Service</source>
+        <translation>Knoten/Dienst</translation>
     </message>
     <message>
-        <source>Payment request rejected</source>
-        <translation>Zahlungsanforderung abgelehnt</translation>
+        <source>Ping Time</source>
+        <translation>Pingzeit</translation>
     </message>
+</context>
+<context>
+    <name>QObject</name>
     <message>
-        <source>Payment request network doesn't match client network.</source>
-        <translation>Netzwerk der Zahlungsanforderung stimmt nicht mit dem Client-Netzwerk überein.</translation>
+        <source>Amount</source>
+        <translation>Betrag</translation>
     </message>
     <message>
-        <source>Payment request is not initialized.</source>
-        <translation>Zahlungsanforderung ist nicht initialisiert.</translation>
+        <source>Enter a Bitcoin address (e.g. %1)</source>
+        <translation>Bitcoin-Adresse eingeben (z.B. %1)</translation>
     </message>
     <message>
-        <source>Requested payment amount of %1 is too small (considered dust).</source>
-        <translation>Angeforderter Zahlungsbetrag in Höhe von %1 ist zu niedrig und wurde als "Dust" eingestuft.</translation>
+        <source>%1 d</source>
+        <translation>%1 d</translation>
     </message>
     <message>
-        <source>Payment request error</source>
-        <translation>fehlerhafte Zahlungsanforderung</translation>
+        <source>%1 h</source>
+        <translation>%1 h</translation>
     </message>
     <message>
-        <source>Cannot start bitcoin: click-to-pay handler</source>
-        <translation>"bitcoin: Klicken-zum-Bezahlen"-Handler konnte nicht gestartet werden</translation>
+        <source>%1 m</source>
+        <translation>%1 m</translation>
     </message>
     <message>
-        <source>Payment request fetch URL is invalid: %1</source>
-        <translation>Abruf-URL der Zahlungsanforderung ist ungültig: %1</translation>
+        <source>%1 s</source>
+        <translation>%1 s</translation>
     </message>
     <message>
-        <source>URI cannot be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source>
-        <translation>URI kann nicht analysiert werden! Dies kann durch eine ungültige Bitcoin-Adresse oder fehlerhafte URI-Parameter verursacht werden.</translation>
+        <source>None</source>
+        <translation>Keine</translation>
     </message>
     <message>
-        <source>Payment request file handling</source>
-        <translation>Zahlungsanforderungsdatei-Verarbeitung</translation>
+        <source>N/A</source>
+        <translation>k.A.</translation>
     </message>
     <message>
-        <source>Payment request file cannot be read! This can be caused by an invalid payment request file.</source>
-        <translation>Zahlungsanforderungsdatei kann nicht gelesen werden! Dies kann durch eine ungültige Zahlungsanforderungsdatei verursacht werden.</translation>
+        <source>%1 ms</source>
+        <translation>%1 ms</translation>
     </message>
-    <message>
-        <source>Payment request expired.</source>
-        <translation>Zahlungsanforderung abgelaufen.</translation>
-    </message>
-    <message>
-        <source>Unverified payment requests to custom payment scripts are unsupported.</source>
-        <translation>Unverifizierte Zahlungsanforderungen an benutzerdefinierte Zahlungsskripte werden nicht unterstützt.</translation>
-    </message>
-    <message>
-        <source>Invalid payment request.</source>
-        <translation>Ungültige Zahlungsanforderung.</translation>
-    </message>
-    <message>
-        <source>Refund from %1</source>
-        <translation>Rücküberweisung von %1</translation>
-    </message>
-    <message>
-        <source>Payment request %1 is too large (%2 bytes, allowed %3 bytes).</source>
-        <translation>Zahlungsanforderung %1 ist zu groß (%2 Byte, erlaubt sind %3 Byte).</translation>
-    </message>
-    <message>
-        <source>Error communicating with %1: %2</source>
-        <translation>Kommunikationsfehler mit %1: %2</translation>
-    </message>
-    <message>
-        <source>Payment request cannot be parsed!</source>
-        <translation>Zahlungsanforderung kann nicht verarbeitet werden!</translation>
-    </message>
-    <message>
-        <source>Bad response from server %1</source>
-        <translation>Fehlerhafte Antwort vom Server: %1</translation>
-    </message>
-    <message>
-        <source>Payment acknowledged</source>
-        <translation>Zahlung bestätigt</translation>
-    </message>
-    <message>
-        <source>Network request error</source>
-        <translation>fehlerhafte Netzwerkanfrage</translation>
-    </message>
-</context>
-<context>
-    <name>PeerTableModel</name>
-    <message>
-        <source>User Agent</source>
-        <translation>User-Agent</translation>
-    </message>
-    <message>
-        <source>Node/Service</source>
-        <translation>Knoten/Dienst</translation>
-    </message>
-    <message>
-        <source>Ping Time</source>
-        <translation>Pingzeit</translation>
-    </message>
-</context>
-<context>
-    <name>QObject</name>
-    <message>
-        <source>Amount</source>
-        <translation>Betrag</translation>
-    </message>
-    <message>
-        <source>Enter a Bitcoin address (e.g. %1)</source>
-        <translation>Bitcoin-Adresse eingeben (z.B. %1)</translation>
-    </message>
-    <message>
-        <source>%1 d</source>
-        <translation>%1 d</translation>
-    </message>
-    <message>
-        <source>%1 h</source>
-        <translation>%1 h</translation>
-    </message>
-    <message>
-        <source>%1 m</source>
-        <translation>%1 m</translation>
-    </message>
-    <message>
-        <source>%1 s</source>
-        <translation>%1 s</translation>
-    </message>
-    <message>
-        <source>None</source>
-        <translation>Keine</translation>
-    </message>
-    <message>
-        <source>N/A</source>
-        <translation>k.A.</translation>
-    </message>
-    <message>
-        <source>%1 ms</source>
-        <translation>%1 ms</translation>
-    </message>
-</context>
-<context>
-    <name>QRImageWidget</name>
-    <message>
-        <source>&amp;Save Image...</source>
-        <translation>Grafik &amp;speichern...</translation>
-    </message>
-    <message>
-        <source>&amp;Copy Image</source>
-        <translation>Grafik &amp;kopieren</translation>
-    </message>
-    <message>
-        <source>Save QR Code</source>
-        <translation>QR-Code speichern</translation>
-    </message>
-    <message>
-        <source>PNG Image (*.png)</source>
-        <translation>PNG-Grafik (*.png)</translation>
-    </message>
-</context>
-<context>
-    <name>RPCConsole</name>
+</context>
+<context>
+    <name>RPCConsole</name>
     <message>
         <source>Client name</source>
         <translation>Clientname</translation>
@@ -1513,10 +1045,6 @@
         <source>Memory usage</source>
         <translation>Speichernutzung</translation>
     </message>
-    <message>
-        <source>Open the Bitcoin Core debug log file from the current data directory. This can take a few seconds for large log files.</source>
-        <translation>Öffnet die "Bitcoin Core"-Debugprotokolldatei aus dem aktuellen Datenverzeichnis. Dies kann bei großen Protokolldateien einige Sekunden dauern.</translation>
-    </message>
     <message>
         <source>Received</source>
         <translation>Empfangen</translation>
@@ -1565,6 +1093,14 @@
         <source>User Agent</source>
         <translation>User-Agent</translation>
     </message>
+    <message>
+        <source>Decrease font size</source>
+        <translation>Schrift verkleinern</translation>
+    </message>
+    <message>
+        <source>Increase font size</source>
+        <translation>Schrift vergrößern</translation>
+    </message>
     <message>
         <source>Services</source>
         <translation>Dienste</translation>
@@ -1633,10 +1169,6 @@
         <source>Out:</source>
         <translation>ausgehend:</translation>
     </message>
-    <message>
-        <source>Build date</source>
-        <translation>Erstellungsdatum</translation>
-    </message>
     <message>
         <source>Debug log file</source>
         <translation>Debugprotokolldatei</translation>
@@ -1674,8 +1206,8 @@
         <translation>&amp;Node entsperren</translation>
     </message>
     <message>
-        <source>Welcome to the Bitcoin Core RPC console.</source>
-        <translation>Willkommen in der "Bitcoin Core"-RPC-Konsole.</translation>
+        <source>Welcome to the %1 RPC console.</source>
+        <translation>Willkommen in der %1 RPC Konsole.</translation>
     </message>
     <message>
         <source>Use up and down arrows to navigate history, and &lt;b&gt;Ctrl-L&lt;/b&gt; to clear screen.</source>
@@ -1804,18 +1336,6 @@
         <source>Remove</source>
         <translation>Entfernen</translation>
     </message>
-    <message>
-        <source>Copy label</source>
-        <translation>Bezeichnung kopieren</translation>
-    </message>
-    <message>
-        <source>Copy message</source>
-        <translation>Nachricht kopieren</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>Betrag kopieren</translation>
-    </message>
 </context>
 <context>
     <name>ReceiveRequestDialog</name>
@@ -1835,73 +1355,6 @@
         <source>&amp;Save Image...</source>
         <translation>Grafik &amp;speichern...</translation>
     </message>
-    <message>
-        <source>Request payment to %1</source>
-        <translation>Zahlung anfordern an %1</translation>
-    </message>
-    <message>
-        <source>Payment information</source>
-        <translation>Zahlungsinformationen</translation>
-    </message>
-    <message>
-        <source>URI</source>
-        <translation>URI</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>Adresse</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>Betrag</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Bezeichnung</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>Nachricht</translation>
-    </message>
-    <message>
-        <source>Resulting URI too long, try to reduce the text for label / message.</source>
-        <translation>Resultierende URI ist zu lang, bitte den Text für Bezeichnung/Nachricht kürzen.</translation>
-    </message>
-    <message>
-        <source>Error encoding URI into QR Code.</source>
-        <translation>Beim Enkodieren der URI in den QR-Code ist ein Fehler aufgetreten.</translation>
-    </message>
-</context>
-<context>
-    <name>RecentRequestsTableModel</name>
-    <message>
-        <source>Date</source>
-        <translation>Datum</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Bezeichnung</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>Nachricht</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>Betrag</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(keine Bezeichnung)</translation>
-    </message>
-    <message>
-        <source>(no message)</source>
-        <translation>(keine Nachricht)</translation>
-    </message>
-    <message>
-        <source>(no amount)</source>
-        <translation>(kein Betrag)</translation>
-    </message>
 </context>
 <context>
     <name>SendCoinsDialog</name>
@@ -1986,919 +1439,277 @@
         <translation>Ausblenden</translation>
     </message>
     <message>
-        <source>total at least</source>
-        <translation>Mindestbetrag</translation>
-    </message>
-    <message>
-        <source>Paying only the minimum fee is just fine as long as there is less transaction volume than space in the blocks. But be aware that this can end up in a never confirming transaction once there is more demand for bitcoin transactions than the network can process.</source>
-        <translation>Nur die minimale Gebühr zu bezahlen ist so lange in Ordnung, wie weniger Transaktionsvolumen als Platz in den Blöcken vorhanden ist. Aber Vorsicht, diese Option kann dazu führen, dass Transaktionen nicht bestätigt werden, wenn mehr Bedarf an Bitcoin-Transaktionen besteht als das Netzwerk verarbeiten kann.</translation>
-    </message>
-    <message>
-        <source>(read the tooltip)</source>
-        <translation>(den Hinweistext lesen)</translation>
-    </message>
-    <message>
-        <source>Recommended:</source>
-        <translation>Empfehlungen:</translation>
-    </message>
-    <message>
-        <source>Custom:</source>
-        <translation>Benutzerdefiniert:</translation>
-    </message>
-    <message>
-        <source>(Smart fee not initialized yet. This usually takes a few blocks...)</source>
-        <translation>(Intelligente Gebührenlogik ist noch nicht verfügbar. Normalerweise dauert dies einige Blöcke lang...)</translation>
-    </message>
-    <message>
-        <source>Confirmation time:</source>
-        <translation>Bestätigungszeit:</translation>
-    </message>
-    <message>
-        <source>normal</source>
-        <translation>normal</translation>
-    </message>
-    <message>
-        <source>fast</source>
-        <translation>schnell</translation>
-    </message>
-    <message>
-        <source>Send as zero-fee transaction if possible</source>
-        <translation>Wenn möglich als gebührenfreie Transaktion senden</translation>
-    </message>
-    <message>
-        <source>(confirmation may take longer)</source>
-        <translation>(Bestätigung kann länger dauern)</translation>
-    </message>
-    <message>
-        <source>Send to multiple recipients at once</source>
-        <translation>An mehrere Empfänger auf einmal überweisen</translation>
-    </message>
-    <message>
-        <source>Add &amp;Recipient</source>
-        <translation>Empfänger &amp;hinzufügen</translation>
-    </message>
-    <message>
-        <source>Clear all fields of the form.</source>
-        <translation>Alle Formularfelder zurücksetzen.</translation>
-    </message>
-    <message>
-        <source>Dust:</source>
-        <translation>"Dust":</translation>
-    </message>
-    <message>
-        <source>Clear &amp;All</source>
-        <translation>&amp;Zurücksetzen</translation>
-    </message>
-    <message>
-        <source>Balance:</source>
-        <translation>Kontostand:</translation>
-    </message>
-    <message>
-        <source>Confirm the send action</source>
-        <translation>Überweisung bestätigen</translation>
-    </message>
-    <message>
-        <source>S&amp;end</source>
-        <translation>&amp;Überweisen</translation>
-    </message>
-    <message>
-        <source>Confirm send coins</source>
-        <translation>Überweisung bestätigen</translation>
-    </message>
-    <message>
-        <source>%1 to %2</source>
-        <translation>%1 an %2</translation>
-    </message>
-    <message>
-        <source>Copy quantity</source>
-        <translation>Anzahl kopieren</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>Betrag kopieren</translation>
-    </message>
-    <message>
-        <source>Copy fee</source>
-        <translation>Gebühr kopieren</translation>
-    </message>
-    <message>
-        <source>Copy after fee</source>
-        <translation>Abzüglich Gebühr kopieren</translation>
-    </message>
-    <message>
-        <source>Copy bytes</source>
-        <translation>Byte kopieren</translation>
-    </message>
-    <message>
-        <source>Copy priority</source>
-        <translation>Priorität kopieren</translation>
-    </message>
-    <message>
-        <source>Copy change</source>
-        <translation>Wechselgeld kopieren</translation>
-    </message>
-    <message>
-        <source>Total Amount %1</source>
-        <translation>Gesamtbetrag %1</translation>
-    </message>
-    <message>
-        <source>or</source>
-        <translation>oder</translation>
-    </message>
-    <message>
-        <source>The amount to pay must be larger than 0.</source>
-        <translation>Der zu zahlende Betrag muss größer als 0 sein.</translation>
-    </message>
-    <message>
-        <source>The amount exceeds your balance.</source>
-        <translation>Der angegebene Betrag übersteigt Ihren Kontostand.</translation>
-    </message>
-    <message>
-        <source>The total exceeds your balance when the %1 transaction fee is included.</source>
-        <translation>Der angegebene Betrag übersteigt aufgrund der Transaktionsgebühr in Höhe von %1 Ihren Kontostand.</translation>
-    </message>
-    <message>
-        <source>Transaction creation failed!</source>
-        <translation>Transaktionserstellung fehlgeschlagen!</translation>
-    </message>
-    <message>
-        <source>The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source>
-        <translation>Die Transaktion wurde abgelehnt! Dies kann passieren, wenn einige Bitcoins aus Ihrer Wallet bereits ausgegeben wurden. Beispielsweise weil Sie eine Kopie Ihrer wallet.dat genutzt, die Bitcoins dort ausgegeben haben und dies daher in der derzeit aktiven Wallet nicht vermerkt ist.</translation>
-    </message>
-    <message>
-        <source>A fee higher than %1 is considered an absurdly high fee.</source>
-        <translation>Eine höhere Gebühr als %1 wird als unsinnig hohe Gebühr angesehen.</translation>
-    </message>
-    <message>
-        <source>Payment request expired.</source>
-        <translation>Zahlungsanforderung abgelaufen.</translation>
-    </message>
-    <message>
-        <source>Pay only the required fee of %1</source>
-        <translation>Nur die notwendige Gebühr in Höhe von %1 zahlen</translation>
-    </message>
-    <message numerus="yes">
-        <source>Estimated to begin confirmation within %n block(s).</source>
-        <translation><numerusform>Voraussichtlicher Beginn der Bestätigung innerhalb von %n Block.</numerusform><numerusform>Voraussichtlicher Beginn der Bestätigung innerhalb von %n Blöcken.</numerusform></translation>
-    </message>
-    <message>
-        <source>The recipient address is not valid. Please recheck.</source>
-        <translation>Die Zahlungsadresse ist ungültig, bitte nochmals überprüfen.</translation>
-    </message>
-    <message>
-        <source>Duplicate address found: addresses should only be used once each.</source>
-        <translation>Doppelte Adresse entdeckt: Adressen dürfen jeweils nur einmal vorkommen.</translation>
-    </message>
-    <message>
-        <source>Warning: Invalid Bitcoin address</source>
-        <translation>Warnung: Ungültige Bitcoin-Adresse</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(keine Bezeichnung)</translation>
-    </message>
-    <message>
-        <source>Warning: Unknown change address</source>
-        <translation>Warnung: Unbekannte Wechselgeld-Adresse</translation>
-    </message>
-    <message>
-        <source>Copy dust</source>
-        <translation>"Dust" kopieren</translation>
-    </message>
-    <message>
-        <source>Are you sure you want to send?</source>
-        <translation>Wollen Sie die Überweisung ausführen?</translation>
-    </message>
-    <message>
-        <source>added as transaction fee</source>
-        <translation>als Transaktionsgebühr hinzugefügt</translation>
-    </message>
-</context>
-<context>
-    <name>SendCoinsEntry</name>
-    <message>
-        <source>A&amp;mount:</source>
-        <translation>Betra&amp;g:</translation>
-    </message>
-    <message>
-        <source>Pay &amp;To:</source>
-        <translation>E&amp;mpfänger:</translation>
-    </message>
-    <message>
-        <source>Enter a label for this address to add it to your address book</source>
-        <translation>Adressbezeichnung eingeben (diese wird zusammen mit der Adresse dem Adressbuch hinzugefügt)</translation>
-    </message>
-    <message>
-        <source>&amp;Label:</source>
-        <translation>&amp;Bezeichnung:</translation>
-    </message>
-    <message>
-        <source>Choose previously used address</source>
-        <translation>Bereits verwendete Adresse auswählen</translation>
-    </message>
-    <message>
-        <source>This is a normal payment.</source>
-        <translation>Dies ist eine normale Überweisung.</translation>
-    </message>
-    <message>
-        <source>The Bitcoin address to send the payment to</source>
-        <translation>Die Zahlungsadresse der Überweisung</translation>
-    </message>
-    <message>
-        <source>Alt+A</source>
-        <translation>Alt+A</translation>
-    </message>
-    <message>
-        <source>Paste address from clipboard</source>
-        <translation>Adresse aus der Zwischenablage einfügen</translation>
-    </message>
-    <message>
-        <source>Alt+P</source>
-        <translation>Alt+P</translation>
-    </message>
-    <message>
-        <source>Remove this entry</source>
-        <translation>Diesen Eintrag entfernen</translation>
-    </message>
-    <message>
-        <source>The fee will be deducted from the amount being sent. The recipient will receive less bitcoins than you enter in the amount field. If multiple recipients are selected, the fee is split equally.</source>
-        <translation>Die Gebühr wird vom zu überweisenden Betrag abgezogen. Der Empfänger wird also weniger Bitcoins erhalten, als Sie im Betrags-Feld eingegeben haben. Falls mehrere Empfänger ausgewählt wurden, wird die Gebühr gleichmäßig verteilt.</translation>
-    </message>
-    <message>
-        <source>S&amp;ubtract fee from amount</source>
-        <translation>Gebühr vom Betrag ab&amp;ziehen</translation>
-    </message>
-    <message>
-        <source>Message:</source>
-        <translation>Nachricht:</translation>
-    </message>
-    <message>
-        <source>This is an unauthenticated payment request.</source>
-        <translation>Dies ist keine beglaubigte Zahlungsanforderung.</translation>
-    </message>
-    <message>
-        <source>This is an authenticated payment request.</source>
-        <translation>Dies ist eine beglaubigte Zahlungsanforderung.</translation>
-    </message>
-    <message>
-        <source>Enter a label for this address to add it to the list of used addresses</source>
-        <translation>Adressbezeichnung eingeben, die dann zusammen mit der Adresse der Liste bereits verwendeter Adressen hinzugefügt wird.</translation>
-    </message>
-    <message>
-        <source>A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
-        <translation>Eine an die "bitcoin:"-URI angefügte Nachricht, die zusammen mit der Transaktion gespeichert wird. Hinweis: Diese Nachricht wird nicht über das Bitcoin-Netzwerk gesendet.</translation>
-    </message>
-    <message>
-        <source>Pay To:</source>
-        <translation>Empfänger:</translation>
-    </message>
-    <message>
-        <source>Memo:</source>
-        <translation>Memo:</translation>
-    </message>
-</context>
-<context>
-    <name>ShutdownWindow</name>
-    <message>
-        <source>Bitcoin Core is shutting down...</source>
-        <translation>Bitcoin Core wird beendet...</translation>
-    </message>
-    <message>
-        <source>Do not shut down the computer until this window disappears.</source>
-        <translation>Fahren Sie den Computer nicht herunter, bevor dieses Fenster verschwindet.</translation>
-    </message>
-</context>
-<context>
-    <name>SignVerifyMessageDialog</name>
-    <message>
-        <source>Signatures - Sign / Verify a Message</source>
-        <translation>Signaturen - eine Nachricht signieren / verifizieren</translation>
-    </message>
-    <message>
-        <source>&amp;Sign Message</source>
-        <translation>Nachricht &amp;signieren</translation>
-    </message>
-    <message>
-        <source>You can sign messages/agreements with your addresses to prove you can receive bitcoins sent to them. Be careful not to sign anything vague or random, as phishing attacks may try to trick you into signing your identity over to them. Only sign fully-detailed statements you agree to.</source>
-        <translation>Sie können Nachrichten/Vereinbarungen mit Hilfe Ihrer Adressen signieren, um zu beweisen, dass Sie Bitcoins empfangen können, die an diese Adressen überwiesen werden. Seien Sie vorsichtig und signieren Sie nichts Vages oder Willkürliches, um Ihre Indentität vor Phishingangriffen zu schützen. Signieren Sie nur vollständig-detaillierte Aussagen, mit denen Sie auch einverstanden sind.</translation>
-    </message>
-    <message>
-        <source>The Bitcoin address to sign the message with</source>
-        <translation>Die Bitcoin-Adresse mit der die Nachricht signiert wird</translation>
-    </message>
-    <message>
-        <source>Choose previously used address</source>
-        <translation>Bereits verwendete Adresse auswählen</translation>
-    </message>
-    <message>
-        <source>Alt+A</source>
-        <translation>Alt+A</translation>
-    </message>
-    <message>
-        <source>Paste address from clipboard</source>
-        <translation>Adresse aus der Zwischenablage einfügen</translation>
-    </message>
-    <message>
-        <source>Alt+P</source>
-        <translation>Alt+P</translation>
-    </message>
-    <message>
-        <source>Enter the message you want to sign here</source>
-        <translation>Zu signierende Nachricht hier eingeben</translation>
-    </message>
-    <message>
-        <source>Signature</source>
-        <translation>Signatur</translation>
-    </message>
-    <message>
-        <source>Copy the current signature to the system clipboard</source>
-        <translation>Aktuelle Signatur in die Zwischenablage kopieren</translation>
-    </message>
-    <message>
-        <source>Sign the message to prove you own this Bitcoin address</source>
-        <translation>Die Nachricht signieren, um den Besitz dieser Bitcoin-Adresse zu beweisen</translation>
-    </message>
-    <message>
-        <source>Sign &amp;Message</source>
-        <translation>&amp;Nachricht signieren</translation>
-    </message>
-    <message>
-        <source>Reset all sign message fields</source>
-        <translation>Alle "Nachricht signieren"-Felder zurücksetzen</translation>
-    </message>
-    <message>
-        <source>Clear &amp;All</source>
-        <translation>&amp;Zurücksetzen</translation>
-    </message>
-    <message>
-        <source>&amp;Verify Message</source>
-        <translation>Nachricht &amp;verifizieren</translation>
-    </message>
-    <message>
-        <source>Enter the receiver's address, message (ensure you copy line breaks, spaces, tabs, etc. exactly) and signature below to verify the message. Be careful not to read more into the signature than what is in the signed message itself, to avoid being tricked by a man-in-the-middle attack. Note that this only proves the signing party receives with the address, it cannot prove sendership of any transaction!</source>
-        <translation>Geben Sie die Zahlungsadresse des Empfängers, Nachricht (achten Sie darauf Zeilenumbrüche, Leerzeichen, Tabulatoren usw. exakt zu kopieren) und Signatur unten ein, um die Nachricht zu verifizieren. Vorsicht, interpretieren Sie nicht mehr in die Signatur hinein, als in der signierten Nachricht selber enthalten ist, um nicht von einem Man-in-the-middle-Angriff hinters Licht geführt zu werden. Beachten Sie dass dies nur beweißt, dass die signierende Partei über diese Adresse Überweisungen empfangen kann.</translation>
-    </message>
-    <message>
-        <source>The Bitcoin address the message was signed with</source>
-        <translation>Die Bitcoin-Adresse mit der die Nachricht signiert wurde</translation>
-    </message>
-    <message>
-        <source>Verify the message to ensure it was signed with the specified Bitcoin address</source>
-        <translation>Die Nachricht verifizieren, um sicherzustellen, dass diese mit der angegebenen Bitcoin-Adresse signiert wurde</translation>
-    </message>
-    <message>
-        <source>Verify &amp;Message</source>
-        <translation>&amp;Nachricht verifizieren</translation>
-    </message>
-    <message>
-        <source>Reset all verify message fields</source>
-        <translation>Alle "Nachricht verifizieren"-Felder zurücksetzen</translation>
-    </message>
-    <message>
-        <source>Click "Sign Message" to generate signature</source>
-        <translation>Auf "Nachricht signieren" klicken, um die Signatur zu erzeugen</translation>
-    </message>
-    <message>
-        <source>The entered address is invalid.</source>
-        <translation>Die eingegebene Adresse ist ungültig.</translation>
-    </message>
-    <message>
-        <source>Please check the address and try again.</source>
-        <translation>Bitte überprüfen Sie die Adresse und versuchen Sie es erneut.</translation>
-    </message>
-    <message>
-        <source>The entered address does not refer to a key.</source>
-        <translation>Die eingegebene Adresse verweist nicht auf einen Schlüssel.</translation>
-    </message>
-    <message>
-        <source>Wallet unlock was cancelled.</source>
-        <translation>Wallet-Entsperrung wurde abgebrochen.</translation>
-    </message>
-    <message>
-        <source>Private key for the entered address is not available.</source>
-        <translation>Privater Schlüssel zur eingegebenen Adresse ist nicht verfügbar.</translation>
-    </message>
-    <message>
-        <source>Message signing failed.</source>
-        <translation>Signierung der Nachricht fehlgeschlagen.</translation>
-    </message>
-    <message>
-        <source>Message signed.</source>
-        <translation>Nachricht signiert.</translation>
-    </message>
-    <message>
-        <source>The signature could not be decoded.</source>
-        <translation>Die Signatur konnte nicht dekodiert werden.</translation>
-    </message>
-    <message>
-        <source>Please check the signature and try again.</source>
-        <translation>Bitte überprüfen Sie die Signatur und versuchen Sie es erneut.</translation>
-    </message>
-    <message>
-        <source>The signature did not match the message digest.</source>
-        <translation>Die Signatur entspricht nicht dem "Message Digest".</translation>
-    </message>
-    <message>
-        <source>Message verification failed.</source>
-        <translation>Verifikation der Nachricht fehlgeschlagen.</translation>
-    </message>
-    <message>
-        <source>Message verified.</source>
-        <translation>Nachricht verifiziert.</translation>
-    </message>
-</context>
-<context>
-    <name>SplashScreen</name>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Bitcoin Core</translation>
-    </message>
-    <message>
-        <source>The Bitcoin Core developers</source>
-        <translation>Die "Bitcoin Core"-Entwickler</translation>
-    </message>
-    <message>
-        <source>[testnet]</source>
-        <translation>[Testnetz]</translation>
-    </message>
-</context>
-<context>
-    <name>TrafficGraphWidget</name>
-    <message>
-        <source>KB/s</source>
-        <translation>KB/s</translation>
-    </message>
-</context>
-<context>
-    <name>TransactionDesc</name>
-    <message>
-        <source>Open until %1</source>
-        <translation>Offen bis %1</translation>
-    </message>
-    <message>
-        <source>conflicted</source>
-        <translation>in Konflikt stehend</translation>
-    </message>
-    <message>
-        <source>%1/offline</source>
-        <translation>%1/offline</translation>
-    </message>
-    <message>
-        <source>%1/unconfirmed</source>
-        <translation>%1/unbestätigt</translation>
-    </message>
-    <message>
-        <source>%1 confirmations</source>
-        <translation>%1 Bestätigungen</translation>
-    </message>
-    <message>
-        <source>Status</source>
-        <translation>Status</translation>
-    </message>
-    <message numerus="yes">
-        <source>, broadcast through %n node(s)</source>
-        <translation><numerusform>, über %n Knoten übertragen</numerusform><numerusform>, über %n Knoten übertragen</numerusform></translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation>Datum</translation>
-    </message>
-    <message>
-        <source>Source</source>
-        <translation>Quelle</translation>
-    </message>
-    <message>
-        <source>Generated</source>
-        <translation>Erzeugt</translation>
-    </message>
-    <message>
-        <source>From</source>
-        <translation>Von</translation>
-    </message>
-    <message>
-        <source>To</source>
-        <translation>An</translation>
-    </message>
-    <message>
-        <source>own address</source>
-        <translation>eigene Adresse</translation>
-    </message>
-    <message>
-        <source>watch-only</source>
-        <translation>beobachtet</translation>
-    </message>
-    <message>
-        <source>label</source>
-        <translation>Bezeichnung</translation>
-    </message>
-    <message>
-        <source>Credit</source>
-        <translation>Gutschrift</translation>
-    </message>
-    <message numerus="yes">
-        <source>matures in %n more block(s)</source>
-        <translation><numerusform>reift noch %n weiteren Block</numerusform><numerusform>reift noch %n weitere Blöcke</numerusform></translation>
-    </message>
-    <message>
-        <source>not accepted</source>
-        <translation>nicht angenommen</translation>
-    </message>
-    <message>
-        <source>Debit</source>
-        <translation>Belastung</translation>
-    </message>
-    <message>
-        <source>Total debit</source>
-        <translation>Gesamtbelastung</translation>
-    </message>
-    <message>
-        <source>Total credit</source>
-        <translation>Gesamtgutschrift</translation>
-    </message>
-    <message>
-        <source>Transaction fee</source>
-        <translation>Transaktionsgebühr</translation>
-    </message>
-    <message>
-        <source>Net amount</source>
-        <translation>Nettobetrag</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>Nachricht</translation>
-    </message>
-    <message>
-        <source>Comment</source>
-        <translation>Kommentar</translation>
-    </message>
-    <message>
-        <source>Transaction ID</source>
-        <translation>Transaktions-ID</translation>
-    </message>
-    <message>
-        <source>Merchant</source>
-        <translation>Händler</translation>
-    </message>
-    <message>
-        <source>Generated coins must mature %1 blocks before they can be spent. When you generated this block, it was broadcast to the network to be added to the block chain. If it fails to get into the chain, its state will change to "not accepted" and it won't be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source>
-        <translation>Erzeugte Bitcoins müssen %1 Blöcke lang reifen, bevor sie ausgegeben werden können. Als Sie diesen Block erzeugten, wurde er an das Netzwerk übertragen, um ihn der Blockkette hinzuzufügen. Falls dies fehlschlägt wird der Status in "nicht angenommen" geändert und Sie werden keine Bitcoins gutgeschrieben bekommen. Das kann gelegentlich passieren, wenn ein anderer Knoten einen Block fast zeitgleich erzeugt.</translation>
-    </message>
-    <message>
-        <source>Debug information</source>
-        <translation>Debuginformationen</translation>
-    </message>
-    <message>
-        <source>Transaction</source>
-        <translation>Transaktion</translation>
-    </message>
-    <message>
-        <source>Inputs</source>
-        <translation>Eingaben</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>Betrag</translation>
-    </message>
-    <message>
-        <source>true</source>
-        <translation>wahr</translation>
-    </message>
-    <message>
-        <source>false</source>
-        <translation>falsch</translation>
-    </message>
-    <message>
-        <source>, has not been successfully broadcast yet</source>
-        <translation>, wurde noch nicht erfolgreich übertragen</translation>
-    </message>
-    <message numerus="yes">
-        <source>Open for %n more block(s)</source>
-        <translation><numerusform>Offen für %n weiteren Block</numerusform><numerusform>Offen für %n weitere Blöcke</numerusform></translation>
-    </message>
-    <message>
-        <source>unknown</source>
-        <translation>unbekannt</translation>
-    </message>
-</context>
-<context>
-    <name>TransactionDescDialog</name>
-    <message>
-        <source>Transaction details</source>
-        <translation>Transaktionsdetails</translation>
-    </message>
-    <message>
-        <source>This pane shows a detailed description of the transaction</source>
-        <translation>Dieser Bereich zeigt eine detaillierte Beschreibung der Transaktion an</translation>
-    </message>
-</context>
-<context>
-    <name>TransactionTableModel</name>
-    <message>
-        <source>Date</source>
-        <translation>Datum</translation>
-    </message>
-    <message>
-        <source>Type</source>
-        <translation>Typ</translation>
-    </message>
-    <message>
-        <source>Immature (%1 confirmations, will be available after %2)</source>
-        <translation>Unreif (%1 Bestätigungen, wird verfügbar sein nach %2)</translation>
-    </message>
-    <message numerus="yes">
-        <source>Open for %n more block(s)</source>
-        <translation><numerusform>Offen für %n weiteren Block</numerusform><numerusform>Offen für %n weitere Blöcke</numerusform></translation>
+        <source>total at least</source>
+        <translation>Mindestbetrag</translation>
     </message>
     <message>
-        <source>Open until %1</source>
-        <translation>Offen bis %1</translation>
+        <source>Paying only the minimum fee is just fine as long as there is less transaction volume than space in the blocks. But be aware that this can end up in a never confirming transaction once there is more demand for bitcoin transactions than the network can process.</source>
+        <translation>Nur die minimale Gebühr zu bezahlen ist so lange in Ordnung, wie weniger Transaktionsvolumen als Platz in den Blöcken vorhanden ist. Aber Vorsicht, diese Option kann dazu führen, dass Transaktionen nicht bestätigt werden, wenn mehr Bedarf an Bitcoin-Transaktionen besteht als das Netzwerk verarbeiten kann.</translation>
     </message>
     <message>
-        <source>Confirmed (%1 confirmations)</source>
-        <translation>Bestätigt (%1 Bestätigungen)</translation>
+        <source>(read the tooltip)</source>
+        <translation>(den Hinweistext lesen)</translation>
     </message>
     <message>
-        <source>This block was not received by any other nodes and will probably not be accepted!</source>
-        <translation>Dieser Block wurde von keinem anderen Knoten empfangen und wird wahrscheinlich nicht angenommen werden!</translation>
+        <source>Recommended:</source>
+        <translation>Empfehlungen:</translation>
     </message>
     <message>
-        <source>Generated but not accepted</source>
-        <translation>Erzeugt, jedoch nicht angenommen</translation>
+        <source>Custom:</source>
+        <translation>Benutzerdefiniert:</translation>
     </message>
     <message>
-        <source>Offline</source>
-        <translation>Offline</translation>
+        <source>(Smart fee not initialized yet. This usually takes a few blocks...)</source>
+        <translation>(Intelligente Gebührenlogik ist noch nicht verfügbar. Normalerweise dauert dies einige Blöcke lang...)</translation>
     </message>
     <message>
-        <source>Label</source>
-        <translation>Bezeichnung</translation>
+        <source>Confirmation time:</source>
+        <translation>Bestätigungszeit:</translation>
     </message>
     <message>
-        <source>Unconfirmed</source>
-        <translation>Unbestätigt</translation>
+        <source>normal</source>
+        <translation>normal</translation>
     </message>
     <message>
-        <source>Confirming (%1 of %2 recommended confirmations)</source>
-        <translation>Wird bestätigt (%1 von %2 empfohlenen Bestätigungen)</translation>
+        <source>fast</source>
+        <translation>schnell</translation>
     </message>
     <message>
-        <source>Conflicted</source>
-        <translation>in Konflikt stehend</translation>
+        <source>Send to multiple recipients at once</source>
+        <translation>An mehrere Empfänger auf einmal überweisen</translation>
     </message>
     <message>
-        <source>Received with</source>
-        <translation>Empfangen über</translation>
+        <source>Add &amp;Recipient</source>
+        <translation>Empfänger &amp;hinzufügen</translation>
     </message>
     <message>
-        <source>Received from</source>
-        <translation>Empfangen von</translation>
+        <source>Clear all fields of the form.</source>
+        <translation>Alle Formularfelder zurücksetzen.</translation>
     </message>
     <message>
-        <source>Sent to</source>
-        <translation>Überwiesen an</translation>
+        <source>Dust:</source>
+        <translation>"Dust":</translation>
     </message>
     <message>
-        <source>Payment to yourself</source>
-        <translation>Eigenüberweisung</translation>
+        <source>Clear &amp;All</source>
+        <translation>&amp;Zurücksetzen</translation>
     </message>
     <message>
-        <source>Mined</source>
-        <translation>Erarbeitet</translation>
+        <source>Balance:</source>
+        <translation>Kontostand:</translation>
     </message>
     <message>
-        <source>watch-only</source>
-        <translation>beobachtet</translation>
+        <source>Confirm the send action</source>
+        <translation>Überweisung bestätigen</translation>
     </message>
     <message>
-        <source>(n/a)</source>
-        <translation>(k.A.)</translation>
+        <source>S&amp;end</source>
+        <translation>&amp;Überweisen</translation>
     </message>
+</context>
+<context>
+    <name>SendCoinsEntry</name>
     <message>
-        <source>Transaction status. Hover over this field to show number of confirmations.</source>
-        <translation>Transaktionsstatus, fahren Sie mit der Maus über dieses Feld, um die Anzahl der Bestätigungen zu sehen.</translation>
+        <source>A&amp;mount:</source>
+        <translation>Betra&amp;g:</translation>
     </message>
     <message>
-        <source>Date and time that the transaction was received.</source>
-        <translation>Datum und Uhrzeit zu der die Transaktion empfangen wurde.</translation>
+        <source>Pay &amp;To:</source>
+        <translation>E&amp;mpfänger:</translation>
     </message>
     <message>
-        <source>Type of transaction.</source>
-        <translation>Art der Transaktion</translation>
+        <source>&amp;Label:</source>
+        <translation>&amp;Bezeichnung:</translation>
     </message>
     <message>
-        <source>Whether or not a watch-only address is involved in this transaction.</source>
-        <translation>Zeigt an, ob eine beobachtete Adresse in diese Transaktion involviert ist.</translation>
+        <source>Choose previously used address</source>
+        <translation>Bereits verwendete Adresse auswählen</translation>
     </message>
     <message>
-        <source>User-defined intent/purpose of the transaction.</source>
-        <translation>Benutzerdefinierte Absicht bzw. Verwendungszweck der Transaktion</translation>
+        <source>This is a normal payment.</source>
+        <translation>Dies ist eine normale Überweisung.</translation>
     </message>
     <message>
-        <source>Amount removed from or added to balance.</source>
-        <translation>Der Betrag, der dem Kontostand abgezogen oder hinzugefügt wurde.</translation>
+        <source>The Bitcoin address to send the payment to</source>
+        <translation>Die Zahlungsadresse der Überweisung</translation>
     </message>
-</context>
-<context>
-    <name>TransactionView</name>
     <message>
-        <source>All</source>
-        <translation>Alle</translation>
+        <source>Alt+A</source>
+        <translation>Alt+A</translation>
     </message>
     <message>
-        <source>Today</source>
-        <translation>Heute</translation>
+        <source>Paste address from clipboard</source>
+        <translation>Adresse aus der Zwischenablage einfügen</translation>
     </message>
     <message>
-        <source>This week</source>
-        <translation>Diese Woche</translation>
+        <source>Alt+P</source>
+        <translation>Alt+P</translation>
     </message>
     <message>
-        <source>This month</source>
-        <translation>Diesen Monat</translation>
+        <source>Remove this entry</source>
+        <translation>Diesen Eintrag entfernen</translation>
     </message>
     <message>
-        <source>Last month</source>
-        <translation>Letzten Monat</translation>
+        <source>The fee will be deducted from the amount being sent. The recipient will receive less bitcoins than you enter in the amount field. If multiple recipients are selected, the fee is split equally.</source>
+        <translation>Die Gebühr wird vom zu überweisenden Betrag abgezogen. Der Empfänger wird also weniger Bitcoins erhalten, als Sie im Betrags-Feld eingegeben haben. Falls mehrere Empfänger ausgewählt wurden, wird die Gebühr gleichmäßig verteilt.</translation>
     </message>
     <message>
-        <source>This year</source>
-        <translation>Dieses Jahr</translation>
+        <source>S&amp;ubtract fee from amount</source>
+        <translation>Gebühr vom Betrag ab&amp;ziehen</translation>
     </message>
     <message>
-        <source>Range...</source>
-        <translation>Zeitraum</translation>
+        <source>Message:</source>
+        <translation>Nachricht:</translation>
     </message>
     <message>
-        <source>Received with</source>
-        <translation>Empfangen über</translation>
+        <source>This is an unauthenticated payment request.</source>
+        <translation>Dies ist keine beglaubigte Zahlungsanforderung.</translation>
     </message>
     <message>
-        <source>Sent to</source>
-        <translation>Überwiesen an</translation>
+        <source>This is an authenticated payment request.</source>
+        <translation>Dies ist eine beglaubigte Zahlungsanforderung.</translation>
     </message>
     <message>
-        <source>To yourself</source>
-        <translation>Eigenüberweisung</translation>
+        <source>Enter a label for this address to add it to the list of used addresses</source>
+        <translation>Adressbezeichnung eingeben, die dann zusammen mit der Adresse der Liste bereits verwendeter Adressen hinzugefügt wird.</translation>
     </message>
     <message>
-        <source>Mined</source>
-        <translation>Erarbeitet</translation>
+        <source>A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
+        <translation>Eine an die "bitcoin:"-URI angefügte Nachricht, die zusammen mit der Transaktion gespeichert wird. Hinweis: Diese Nachricht wird nicht über das Bitcoin-Netzwerk gesendet.</translation>
     </message>
     <message>
-        <source>Other</source>
-        <translation>Andere</translation>
+        <source>Pay To:</source>
+        <translation>Empfänger:</translation>
     </message>
     <message>
-        <source>Enter address or label to search</source>
-        <translation>Zu suchende Adresse oder Bezeichnung eingeben</translation>
+        <source>Memo:</source>
+        <translation>Memo:</translation>
     </message>
+</context>
+<context>
+    <name>ShutdownWindow</name>
     <message>
-        <source>Min amount</source>
-        <translation>Minimaler Betrag</translation>
+        <source>%1 is shutting down...</source>
+        <translation>%1 wird beendet...</translation>
     </message>
     <message>
-        <source>Copy address</source>
-        <translation>Adresse kopieren</translation>
+        <source>Do not shut down the computer until this window disappears.</source>
+        <translation>Fahren Sie den Computer nicht herunter, bevor dieses Fenster verschwindet.</translation>
     </message>
+</context>
+<context>
+    <name>SignVerifyMessageDialog</name>
     <message>
-        <source>Copy label</source>
-        <translation>Bezeichnung kopieren</translation>
+        <source>Signatures - Sign / Verify a Message</source>
+        <translation>Signaturen - eine Nachricht signieren / verifizieren</translation>
     </message>
     <message>
-        <source>Copy amount</source>
-        <translation>Betrag kopieren</translation>
+        <source>&amp;Sign Message</source>
+        <translation>Nachricht &amp;signieren</translation>
     </message>
     <message>
-        <source>Copy transaction ID</source>
-        <translation>Transaktions-ID kopieren</translation>
+        <source>You can sign messages/agreements with your addresses to prove you can receive bitcoins sent to them. Be careful not to sign anything vague or random, as phishing attacks may try to trick you into signing your identity over to them. Only sign fully-detailed statements you agree to.</source>
+        <translation>Sie können Nachrichten/Vereinbarungen mit Hilfe Ihrer Adressen signieren, um zu beweisen, dass Sie Bitcoins empfangen können, die an diese Adressen überwiesen werden. Seien Sie vorsichtig und signieren Sie nichts Vages oder Willkürliches, um Ihre Indentität vor Phishingangriffen zu schützen. Signieren Sie nur vollständig-detaillierte Aussagen, mit denen Sie auch einverstanden sind.</translation>
     </message>
     <message>
-        <source>Copy raw transaction</source>
-        <translation>Kopiere rohe Transaktion</translation>
+        <source>The Bitcoin address to sign the message with</source>
+        <translation>Die Bitcoin-Adresse mit der die Nachricht signiert wird</translation>
     </message>
     <message>
-        <source>Edit label</source>
-        <translation>Bezeichnung bearbeiten</translation>
+        <source>Choose previously used address</source>
+        <translation>Bereits verwendete Adresse auswählen</translation>
     </message>
     <message>
-        <source>Show transaction details</source>
-        <translation>Transaktionsdetails anzeigen</translation>
+        <source>Alt+A</source>
+        <translation>Alt+A</translation>
     </message>
     <message>
-        <source>Export Transaction History</source>
-        <translation>Transaktionsverlauf exportieren</translation>
+        <source>Paste address from clipboard</source>
+        <translation>Adresse aus der Zwischenablage einfügen</translation>
     </message>
     <message>
-        <source>Watch-only</source>
-        <translation>Beobachtet</translation>
+        <source>Alt+P</source>
+        <translation>Alt+P</translation>
     </message>
     <message>
-        <source>Exporting Failed</source>
-        <translation>Exportieren fehlgeschlagen</translation>
+        <source>Enter the message you want to sign here</source>
+        <translation>Zu signierende Nachricht hier eingeben</translation>
     </message>
     <message>
-        <source>There was an error trying to save the transaction history to %1.</source>
-        <translation>Beim Speichern des Transaktionsverlaufs nach %1 ist ein Fehler aufgetreten.</translation>
+        <source>Signature</source>
+        <translation>Signatur</translation>
     </message>
     <message>
-        <source>Exporting Successful</source>
-        <translation>Exportieren erfolgreich</translation>
+        <source>Copy the current signature to the system clipboard</source>
+        <translation>Aktuelle Signatur in die Zwischenablage kopieren</translation>
     </message>
     <message>
-        <source>The transaction history was successfully saved to %1.</source>
-        <translation>Speichern des Transaktionsverlaufs nach %1 war erfolgreich.</translation>
+        <source>Sign the message to prove you own this Bitcoin address</source>
+        <translation>Die Nachricht signieren, um den Besitz dieser Bitcoin-Adresse zu beweisen</translation>
     </message>
     <message>
-        <source>Comma separated file (*.csv)</source>
-        <translation>Kommagetrennte-Datei (*.csv)</translation>
+        <source>Sign &amp;Message</source>
+        <translation>&amp;Nachricht signieren</translation>
     </message>
     <message>
-        <source>Confirmed</source>
-        <translation>Bestätigt</translation>
+        <source>Reset all sign message fields</source>
+        <translation>Alle "Nachricht signieren"-Felder zurücksetzen</translation>
     </message>
     <message>
-        <source>Date</source>
-        <translation>Datum</translation>
+        <source>Clear &amp;All</source>
+        <translation>&amp;Zurücksetzen</translation>
     </message>
     <message>
-        <source>Type</source>
-        <translation>Typ</translation>
+        <source>&amp;Verify Message</source>
+        <translation>Nachricht &amp;verifizieren</translation>
     </message>
     <message>
-        <source>Label</source>
-        <translation>Bezeichnung</translation>
+        <source>Enter the receiver's address, message (ensure you copy line breaks, spaces, tabs, etc. exactly) and signature below to verify the message. Be careful not to read more into the signature than what is in the signed message itself, to avoid being tricked by a man-in-the-middle attack. Note that this only proves the signing party receives with the address, it cannot prove sendership of any transaction!</source>
+        <translation>Geben Sie die Zahlungsadresse des Empfängers, Nachricht (achten Sie darauf Zeilenumbrüche, Leerzeichen, Tabulatoren usw. exakt zu kopieren) und Signatur unten ein, um die Nachricht zu verifizieren. Vorsicht, interpretieren Sie nicht mehr in die Signatur hinein, als in der signierten Nachricht selber enthalten ist, um nicht von einem Man-in-the-middle-Angriff hinters Licht geführt zu werden. Beachten Sie dass dies nur beweißt, dass die signierende Partei über diese Adresse Überweisungen empfangen kann.</translation>
     </message>
     <message>
-        <source>Address</source>
-        <translation>Adresse</translation>
+        <source>The Bitcoin address the message was signed with</source>
+        <translation>Die Bitcoin-Adresse mit der die Nachricht signiert wurde</translation>
     </message>
     <message>
-        <source>ID</source>
-        <translation>ID</translation>
+        <source>Verify the message to ensure it was signed with the specified Bitcoin address</source>
+        <translation>Die Nachricht verifizieren, um sicherzustellen, dass diese mit der angegebenen Bitcoin-Adresse signiert wurde</translation>
     </message>
     <message>
-        <source>Range:</source>
-        <translation>Zeitraum:</translation>
+        <source>Verify &amp;Message</source>
+        <translation>&amp;Nachricht verifizieren</translation>
     </message>
     <message>
-        <source>to</source>
-        <translation>bis</translation>
+        <source>Reset all verify message fields</source>
+        <translation>Alle "Nachricht verifizieren"-Felder zurücksetzen</translation>
     </message>
 </context>
 <context>
-    <name>UnitDisplayStatusBarControl</name>
+    <name>SplashScreen</name>
     <message>
-        <source>Unit to show amounts in. Click to select another unit.</source>
-        <translation>Die Einheit in der Beträge angezeigt werden. Klicken, um eine andere Einheit auszuwählen.</translation>
+        <source>[testnet]</source>
+        <translation>[Testnetz]</translation>
     </message>
 </context>
 <context>
-    <name>WalletFrame</name>
+    <name>TrafficGraphWidget</name>
     <message>
-        <source>No wallet has been loaded.</source>
-        <translation>Es wurde keine Wallet geladen.</translation>
+        <source>KB/s</source>
+        <translation>KB/s</translation>
     </message>
 </context>
 <context>
-    <name>WalletModel</name>
+    <name>TransactionDescDialog</name>
     <message>
-        <source>Send Coins</source>
-        <translation>Bitcoins überweisen</translation>
+        <source>This pane shows a detailed description of the transaction</source>
+        <translation>Dieser Bereich zeigt eine detaillierte Beschreibung der Transaktion an</translation>
     </message>
 </context>
 <context>
-    <name>WalletView</name>
-    <message>
-        <source>&amp;Export</source>
-        <translation>E&amp;xportieren</translation>
-    </message>
-    <message>
-        <source>Export the data in the current tab to a file</source>
-        <translation>Daten der aktuellen Ansicht in eine Datei exportieren</translation>
-    </message>
-    <message>
-        <source>Backup Wallet</source>
-        <translation>Wallet sichern</translation>
-    </message>
-    <message>
-        <source>Wallet Data (*.dat)</source>
-        <translation>Wallet-Daten (*.dat)</translation>
-    </message>
-    <message>
-        <source>Backup Failed</source>
-        <translation>Sicherung fehlgeschlagen</translation>
-    </message>
-    <message>
-        <source>There was an error trying to save the wallet data to %1.</source>
-        <translation>Beim Speichern der Wallet-Daten nach %1 ist ein Fehler aufgetreten.</translation>
-    </message>
-    <message>
-        <source>The wallet data was successfully saved to %1.</source>
-        <translation>Speichern der Wallet-Daten nach %1 war erfolgreich.</translation>
-    </message>
+    <name>UnitDisplayStatusBarControl</name>
     <message>
-        <source>Backup Successful</source>
-        <translation>Sicherung erfolgreich</translation>
+        <source>Unit to show amounts in. Click to select another unit.</source>
+        <translation>Die Einheit in der Beträge angezeigt werden. Klicken, um eine andere Einheit auszuwählen.</translation>
     </message>
 </context>
 <context>
@@ -2927,14 +1738,6 @@
         <source>If &lt;category&gt; is not supplied or if &lt;category&gt; = 1, output all debugging information.</source>
         <translation>Wenn &lt;category&gt; nicht angegeben wird oder &lt;category&gt;=1, jegliche Debugginginformationen ausgeben.</translation>
     </message>
-    <message>
-        <source>Maximum total fees (in %s) to use in a single wallet transaction; setting this too low may abort large transactions (default: %s)</source>
-        <translation>Maximale Gesamtgebühr (in %s) in einer Börsentransaktion; wird dies zu niedrig gesetzten können große Transaktionen abgebrochen werden (Standard: %s)</translation>
-    </message>
-    <message>
-        <source>Please check that your computer's date and time are correct! If your clock is wrong Bitcoin Core will not work properly.</source>
-        <translation>Bitte korrigieren Sie die Datums- und Uhrzeiteinstellungen Ihres Computers, da Bitcoin Core ansonsten nicht ordnungsgemäß funktionieren wird.</translation>
-    </message>
     <message>
         <source>Prune configured below the minimum of %d MiB.  Please use a higher number.</source>
         <translation>Kürzungsmodus wurde kleiner als das Minimum in Höhe von %d MiB konfiguriert. Bitte verwenden Sie einen größeren Wert.</translation>
@@ -2967,6 +1770,10 @@
         <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
         <translation>Eingehende Verbindungen annehmen (Standard: 1, wenn nicht -proxy oder -connect)</translation>
     </message>
+    <message>
+        <source>Bitcoin Core</source>
+        <translation>Bitcoin Core</translation>
+    </message>
     <message>
         <source>-fallbackfee is set very high! This is the transaction fee you may pay when fee estimates are not available.</source>
         <translation>-fallbackfee ist sehr hoch eingestellt! Das ist die Transaktionsgebühr, welche du zahlen müsstest, wenn die Gebührenschätzungen nicht verfügbar sind.</translation>
@@ -3007,14 +1814,6 @@
         <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
         <translation>Dies ist eine Vorab-Testversion - Verwendung auf eigene Gefahr - nicht für Mining- oder Handelsanwendungen nutzen!</translation>
     </message>
-    <message>
-        <source>Unable to bind to %s on this computer. Bitcoin Core is probably already running.</source>
-        <translation>Kann auf diesem Computer nicht an %s binden, da Bitcoin Core wahrscheinlich bereits gestartet wurde.</translation>
-    </message>
-    <message>
-        <source>Unsupported argument -whitelistalwaysrelay ignored, use -whitelistrelay and/or -whitelistforcerelay.</source>
-        <translation>Das Argument -whitelistalwaysrelay wird nicht unterstützt und deswegen ignoriert. Benutze -whitelistrelay und/oder -whitelistforcerelay.</translation>
-    </message>
     <message>
         <source>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</source>
         <translation>UPnP verwenden, um eine Portweiterleitung einzurichten (Standard: 1, wenn abgehört wird und -proxy nicht gesetzt ist)</translation>
@@ -3031,18 +1830,10 @@
         <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source>
         <translation>Warnung: Das Netzwerk scheint nicht vollständig übereinzustimmen! Einige Miner scheinen Probleme zu haben.</translation>
     </message>
-    <message>
-        <source>Warning: Unknown block versions being mined! It's possible unknown rules are in effect</source>
-        <translation>Warnung: Unbekannte Blockversion wird durch Mining erzeugt! Es ist möglich, dass unbekannte Regeln in Kraft sind.</translation>
-    </message>
     <message>
         <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source>
         <translation>Warnung: Wir scheinen nicht vollständig mit unseren Gegenstellen übereinzustimmen! Sie oder die anderen Knoten müssen unter Umständen Ihre Client-Software aktualisieren.</translation>
     </message>
-    <message>
-        <source>Warning: wallet.dat corrupt, data salvaged! Original wallet.dat saved as wallet.{timestamp}.bak in %s; if your balance or transactions are incorrect you should restore from a backup.</source>
-        <translation>Warnung: wallet.dat beschädigt, Datenrettung erfolgreich! Original wallet.dat wurde als wallet.{Zeitstempel}.dat in %s gespeichert. Falls Ihr Kontostand oder Transaktionen nicht korrekt sind, sollten Sie von einer Datensicherung wiederherstellen.</translation>
-    </message>
     <message>
         <source>Whitelist peers connecting from the given netmask or IP address. Can be specified multiple times.</source>
         <translation>Gegenstellen die sich von der angegebenen Netzmaske oder IP-Adresse aus verbinden immer zulassen. Kann mehrmals angegeben werden.</translation>
@@ -3063,6 +1854,10 @@
         <source>Block creation options:</source>
         <translation>Blockerzeugungsoptionen:</translation>
     </message>
+    <message>
+        <source>Cannot resolve -%s address: '%s'</source>
+        <translation>Kann Adresse in -%s nicht auflösen: '%s'</translation>
+    </message>
     <message>
         <source>Connect only to the specified node(s)</source>
         <translation>Mit nur dem oder den angegebenen Knoten verbinden</translation>
@@ -3071,6 +1866,10 @@
         <source>Connection options:</source>
         <translation>Verbindungsoptionen:</translation>
     </message>
+    <message>
+        <source>Copyright (C) %i-%i</source>
+        <translation>Copyright (C) %i-%i</translation>
+    </message>
     <message>
         <source>Corrupted block database detected</source>
         <translation>Beschädigte Blockdatenbank erkannt</translation>
@@ -3111,6 +1910,10 @@
         <source>Error initializing wallet database environment %s!</source>
         <translation>Fehler beim Initialisieren der Wallet-Datenbankumgebung %s!</translation>
     </message>
+    <message>
+        <source>Error loading %s</source>
+        <translation>Fehler beim Laden von %s</translation>
+    </message>
     <message>
         <source>Error loading block database</source>
         <translation>Fehler beim Laden der Blockdatenbank</translation>
@@ -3139,6 +1942,10 @@
         <source>Invalid -onion address: '%s'</source>
         <translation>Ungültige "-onion"-Adresse: '%s'</translation>
     </message>
+    <message>
+        <source>Invalid amount for -%s=&lt;amount&gt;: '%s'</source>
+        <translation>Ungültiger Betrag für -%s=&lt;amount&gt;: '%s'</translation>
+    </message>
     <message>
         <source>Invalid amount for -fallbackfee=&lt;amount&gt;: '%s'</source>
         <translation>Ungültiger Betrag für -fallbackfee=&lt;amount&gt;: '%s'</translation>
@@ -3147,6 +1954,10 @@
         <source>Keep the transaction memory pool below &lt;n&gt; megabytes (default: %u)</source>
         <translation>Halten Sie den Transaktionsspeicherpool unter &lt;n&gt; Megabytes (Voreinstellung: %u)</translation>
     </message>
+    <message>
+        <source>Loading banlist...</source>
+        <translation>Lade Sperrliste...</translation>
+    </message>
     <message>
         <source>Location of the auth cookie (default: data dir)</source>
         <translation>Dateiort für das Auth-Cookie (Standard: Datenverzeichnis)</translation>
@@ -3183,6 +1994,14 @@
         <source>Specify wallet file (within data directory)</source>
         <translation>Wallet-Datei angeben (innerhalb des Datenverzeichnisses)</translation>
     </message>
+    <message>
+        <source>The source code is available from %s.</source>
+        <translation>Der Quellcode ist von %s verfügbar.</translation>
+    </message>
+    <message>
+        <source>Unable to bind to %s on this computer. %s is probably already running.</source>
+        <translation>Kann auf diesem Computer nicht an %s binden. Evtl. wurde %s bereits gestartet.</translation>
+    </message>
     <message>
         <source>Unsupported argument -benchmark ignored, use -debug=bench.</source>
         <translation>Nicht unterstütztes Argument -benchmark wurde ignoriert, bitte -debug=bench verwenden.</translation>
@@ -3219,10 +2038,6 @@
         <source>Wallet options:</source>
         <translation>Wallet-Optionen:</translation>
     </message>
-    <message>
-        <source>You need to rebuild the database using -reindex to change -txindex</source>
-        <translation>Sie müssen die Datenbank mit Hilfe von -reindex neu aufbauen, um -txindex zu verändern</translation>
-    </message>
     <message>
         <source>Allow JSON-RPC connections from specified source. Valid for &lt;ip&gt; are a single IP (e.g. 1.2.3.4), a network/netmask (e.g. 1.2.3.4/255.255.255.0) or a network/CIDR (e.g. 1.2.3.4/24). This option can be specified multiple times</source>
         <translation>JSON-RPC-Verbindungen von der angegeben Quelle erlauben. Gültig für &lt;ip&gt; ist eine einzelne IP-Adresse (z.B. 1.2.3.4), ein Netzwerk bzw. eine Netzmaske (z.B. 1.2.3.4/255.255.255.0), oder die CIDR-Notation (z.B. 1.2.3.4/24). Kann mehrmals angegeben werden.</translation>
@@ -3235,10 +2050,6 @@
         <source>Bind to given address to listen for JSON-RPC connections. Use [host]:port notation for IPv6. This option can be specified multiple times (default: bind to all interfaces)</source>
         <translation>An die angegebene Adresse binden und nach eingehenden JSON-RPC-Verbindungen abhören. Für IPv6 "[Host]:Port"-Notation verwenden. Kann mehrmals angegeben werden. (Standard: an alle Schnittstellen binden)</translation>
     </message>
-    <message>
-        <source>Cannot obtain a lock on data directory %s. Bitcoin Core is probably already running.</source>
-        <translation>Datenverzeichnis %s kann nicht gesperrt werden, da Bitcoin Core wahrscheinlich bereits gestartet wurde.</translation>
-    </message>
     <message>
         <source>Create new files with system default permissions, instead of umask 077 (only effective with disabled wallet functionality)</source>
         <translation>Neue Dateien mit Standard-Systemrechten erzeugen, anstatt mit umask 077 (nur mit deaktivierter Walletfunktion nutzbar)</translation>
@@ -3283,10 +2094,6 @@
         <source>Set maximum size of high-priority/low-fee transactions in bytes (default: %d)</source>
         <translation>Maximale Größe in Byte von "high-priority/low-fee"-Transaktionen festlegen (Standard: %d)</translation>
     </message>
-    <message>
-        <source>Set the number of threads for coin generation if enabled (-1 = all cores, default: %d)</source>
-        <translation>Maximale Anzahl an Threads zur Bitcoinerzeugung, wenn aktiviert, festlegen (-1 = alle Kerne, Standard: %d)</translation>
-    </message>
     <message>
         <source>The transaction amount is too small to send after the fee has been deducted</source>
         <translation>Der Transaktionsbetrag ist zum senden zu niedrig, nachdem die Gebühr abgezogen wurde.</translation>
@@ -3311,34 +2118,14 @@
         <source>Accept public REST requests (default: %u)</source>
         <translation>Öffentliche REST-Anfragen annehmen (Standard: %u)</translation>
     </message>
-    <message>
-        <source>Activating best chain...</source>
-        <translation>Aktiviere beste Blockkette...</translation>
-    </message>
-    <message>
-        <source>Attempt to recover private keys from a corrupt wallet.dat on startup</source>
-        <translation>Versuchen, private Schlüssel beim Starten aus einer beschädigten wallet.dat wiederherzustellen</translation>
-    </message>
     <message>
         <source>Automatically create Tor hidden service (default: %d)</source>
         <translation>Automatisch versteckten Tor-Dienst erstellen (Standard: %d)</translation>
     </message>
-    <message>
-        <source>Cannot resolve -whitebind address: '%s'</source>
-        <translation>Kann Adresse in -whitebind nicht auflösen: '%s'</translation>
-    </message>
     <message>
         <source>Connect through SOCKS5 proxy</source>
         <translation>Über einen SOCKS5-Proxy &amp;verbinden</translation>
     </message>
-    <message>
-        <source>Copyright (C) 2009-%i The Bitcoin Core Developers</source>
-        <translation>Urheberrecht (C) 2009-%i Die "Bitcoin Core"-Entwickler</translation>
-    </message>
-    <message>
-        <source>Error loading wallet.dat: Wallet requires newer version of Bitcoin Core</source>
-        <translation>Fehler beim Laden von wallet.dat: Wallet benötigt neuere Version von Bitcoin Core</translation>
-    </message>
     <message>
         <source>Error reading from database, shutting down.</source>
         <translation>Fehler beim lesen der Datenbank, Ausführung wird beendet.</translation>
@@ -3351,22 +2138,6 @@
         <source>Information</source>
         <translation>Hinweis</translation>
     </message>
-    <message>
-        <source>Initialization sanity check failed. Bitcoin Core is shutting down.</source>
-        <translation>Initialisierungsplausibilitätsprüfung fehlgeschlagen. Bitcoin Core wird beendet.</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -maxtxfee=&lt;amount&gt;: '%s'</source>
-        <translation>Ungültiger Betrag für -maxtxfee=&lt;amount&gt;: '%s'</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -minrelaytxfee=&lt;amount&gt;: '%s'</source>
-        <translation>Ungültiger Betrag für -minrelaytxfee=&lt;amount&gt;: '%s'</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -mintxfee=&lt;amount&gt;: '%s'</source>
-        <translation>Ungültiger Betrag für -mintxfee=&lt;amount&gt;: '%s'</translation>
-    </message>
     <message>
         <source>Invalid amount for -paytxfee=&lt;amount&gt;: '%s' (must be at least %s)</source>
         <translation>Ungültiger Betrag für -paytxfee=&lt;amount&gt;: '%s' (muss mindestens %s sein)</translation>
@@ -3391,14 +2162,6 @@
         <source>RPC server options:</source>
         <translation>RPC-Serveroptionen:</translation>
     </message>
-    <message>
-        <source>Rebuild block chain index from current blk000??.dat files on startup</source>
-        <translation>Blockkettenindex aus aktuellen Dateien blk000??.dat beim Starten wiederaufbauen</translation>
-    </message>
-    <message>
-        <source>Receive and display P2P network alerts (default: %u)</source>
-        <translation>P2P-Netzwerk-Alarme empfangen und anzeigen (Standard: %u)</translation>
-    </message>
     <message>
         <source>Reducing -maxconnections from %d to %d, because of system limitations.</source>
         <translation>Reduziere -maxconnections von %d zu %d, aufgrund von Systemlimitierungen.</translation>
@@ -3471,10 +2234,6 @@
         <source>Username for JSON-RPC connections</source>
         <translation>Benutzername für JSON-RPC-Verbindungen</translation>
     </message>
-    <message>
-        <source>Wallet needed to be rewritten: restart Bitcoin Core to complete</source>
-        <translation>Wallet musste neu geschrieben werden: starten Sie Bitcoin Core zur Fertigstellung neu</translation>
-    </message>
     <message>
         <source>Warning</source>
         <translation>Warnung</translation>
@@ -3495,10 +2254,6 @@
         <source>ZeroMQ notification options:</source>
         <translation>ZeroMQ-Benachrichtigungsoptionen:</translation>
     </message>
-    <message>
-        <source>wallet.dat corrupt, salvage failed</source>
-        <translation>wallet.dat beschädigt, Datenrettung fehlgeschlagen</translation>
-    </message>
     <message>
         <source>Password for JSON-RPC connections</source>
         <translation>Passwort für JSON-RPC-Verbindungen</translation>
@@ -3507,10 +2262,6 @@
         <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
         <translation>Befehl ausführen wenn der beste Block wechselt (%s im Befehl wird durch den Hash des Blocks ersetzt)</translation>
     </message>
-    <message>
-        <source>This help message</source>
-        <translation>Dieser Hilfetext</translation>
-    </message>
     <message>
         <source>Allow DNS lookups for -addnode, -seednode and -connect</source>
         <translation>Erlaube DNS-Abfragen für -addnode, -seednode und -connect</translation>
@@ -3519,10 +2270,6 @@
         <source>Loading addresses...</source>
         <translation>Lade Adressen...</translation>
     </message>
-    <message>
-        <source>Error loading wallet.dat: Wallet corrupted</source>
-        <translation>Fehler beim Laden von wallet.dat: Wallet beschädigt</translation>
-    </message>
     <message>
         <source>(1 = keep tx meta data e.g. account owner and payment request information, 2 = drop tx meta data)</source>
         <translation>(1 = TX-Metadaten wie z.B. Accountbesitzer und Zahlungsanforderungsinformationen behalten, 2 = TX-Metadaten verwerfen)</translation>
@@ -3539,10 +2286,6 @@
         <source>Do not keep transactions in the mempool longer than &lt;n&gt; hours (default: %u)</source>
         <translation>Die Transaktion nicht länger im Speicherpool behalten als &lt;n&gt; Stunden (Standard: %u)</translation>
     </message>
-    <message>
-        <source>Error reading wallet.dat! All keys read correctly, but transaction data or address book entries might be missing or incorrect.</source>
-        <translation>Lesen von wallet.dat fehlgeschlagen! Alle Schlüssel wurden korrekt gelesen, Transaktionsdaten bzw. Adressbucheinträge fehlen aber möglicherweise oder sind inkorrekt.</translation>
-    </message>
     <message>
         <source>Fees (in %s/kB) smaller than this are considered zero fee for transaction creation (default: %s)</source>
         <translation>Niedrigere Gebühren (in %s/Kb) als diese werden bei der Transaktionserstellung als gebührenfrei angesehen (Standard: %s)</translation>
@@ -3575,6 +2318,10 @@
         <source>Unsupported argument -socks found. Setting SOCKS version isn't possible anymore, only SOCKS5 proxies are supported.</source>
         <translation>Nicht unterstütztes Argument -socks gefunden. Das Festlegen der SOCKS-Version ist nicht mehr möglich, nur noch SOCKS5-Proxies werden unterstützt.</translation>
     </message>
+    <message>
+        <source>Unsupported argument -whitelistalwaysrelay ignored, use -whitelistrelay and/or -whitelistforcerelay.</source>
+        <translation>Das Argument -whitelistalwaysrelay wird nicht unterstützt und deswegen ignoriert. Benutze -whitelistrelay und/oder -whitelistforcerelay.</translation>
+    </message>
     <message>
         <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: %s)</source>
         <translation>Separaten SOCKS5-Proxy verwenden, um Gegenstellen über versteckte Tor-Dienste zu erreichen (Standard: %s)</translation>
@@ -3583,6 +2330,10 @@
         <source>Username and hashed password for JSON-RPC connections. The field &lt;userpw&gt; comes in the format: &lt;USERNAME&gt;:&lt;SALT&gt;$&lt;HASH&gt;. A canonical python script is included in share/rpcuser. This option can be specified multiple times</source>
         <translation>Benutzername und gehashtes Passwort für JSON-RPC Verbindungen. Das Feld &lt;userpw&gt; kommt im Format: &lt;USERNAME&gt;:&lt;SALT&gt;$&lt;HASH&gt;. Ein kanonisches Pythonskript ist in share/rpcuser inbegriffen. Diese Option kann mehrere Male spezifiziert werden</translation>
     </message>
+    <message>
+        <source>Warning: Unknown block versions being mined! It's possible unknown rules are in effect</source>
+        <translation>Warnung: Unbekannte Blockversion wird durch Mining erzeugt! Es ist möglich, dass unbekannte Regeln in Kraft sind.</translation>
+    </message>
     <message>
         <source>(default: %s)</source>
         <translation>(Standard: %s)</translation>
@@ -3591,14 +2342,6 @@
         <source>Always query for peer addresses via DNS lookup (default: %u)</source>
         <translation>Adressen von Gegenstellen immer über DNS-Namensauflösung abfragen (Standard: %u)</translation>
     </message>
-    <message>
-        <source>Error loading wallet.dat</source>
-        <translation>Fehler beim Laden von wallet.dat</translation>
-    </message>
-    <message>
-        <source>Generate coins (default: %u)</source>
-        <translation>Bitcoins erzeugen (Standard: %u)</translation>
-    </message>
     <message>
         <source>How many blocks to check at startup (default: %u, 0 = all)</source>
         <translation>Wieviele Blöcke beim Starten geprüft werden sollen (Standard: %u, 0 = alle)</translation>
@@ -3683,18 +2426,6 @@
         <source>Unknown network specified in -onlynet: '%s'</source>
         <translation>Unbekannter Netztyp in -onlynet angegeben: '%s'</translation>
     </message>
-    <message>
-        <source>Cannot resolve -bind address: '%s'</source>
-        <translation>Kann Adresse in -bind nicht auflösen: '%s'</translation>
-    </message>
-    <message>
-        <source>Cannot resolve -externalip address: '%s'</source>
-        <translation>Kann Adresse in -externalip nicht auflösen: '%s'</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -paytxfee=&lt;amount&gt;: '%s'</source>
-        <translation>Ungültiger Betrag für -paytxfee=&lt;amount&gt;: '%s'</translation>
-    </message>
     <message>
         <source>Insufficient funds</source>
         <translation>Unzureichender Kontostand</translation>
diff --git a/src/qt/locale/bitcoin_el.ts b/src/qt/locale/bitcoin_el.ts
index 6777961cbc309..de76a110cfc4a 100644
--- a/src/qt/locale/bitcoin_el.ts
+++ b/src/qt/locale/bitcoin_el.ts
@@ -6,17 +6,6 @@
         <translation>Δημιουργία νέου λογαριασμού</translation>
     </message>
     </context>
-<context>
-    <name>AddressTableModel</name>
-    <message>
-        <source>Label</source>
-        <translation>Ετικέτα</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>Διεύθυνση</translation>
-    </message>
-    </context>
 <context>
     <name>AskPassphraseDialog</name>
     <message>
@@ -31,11 +20,7 @@
         <source>Repeat new passphrase</source>
         <translation>Επαναλάβετε νέο συνθηματικό</translation>
     </message>
-    <message>
-        <source>Change passphrase</source>
-        <translation>Αλλαγή συνθηματικού</translation>
-    </message>
-    </context>
+</context>
 <context>
     <name>BanTableModel</name>
     </context>
@@ -54,31 +39,12 @@
         <translation>Σφάλμα</translation>
     </message>
     </context>
-<context>
-    <name>ClientModel</name>
-    </context>
 <context>
     <name>CoinControlDialog</name>
     <message>
         <source>Date</source>
         <translation>Ημερομηνία</translation>
     </message>
-    <message>
-        <source>Copy address</source>
-        <translation>Αντιγραφή διεύθυνσης</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>Αντιγραφή ποσού</translation>
-    </message>
-    <message>
-        <source>Copy quantity</source>
-        <translation>Αντιγραφή ποσότητας</translation>
-    </message>
-    <message>
-        <source>Copy change</source>
-        <translation>Αντιγραφή αλλαγής</translation>
-    </message>
     </context>
 <context>
     <name>EditAddressDialog</name>
@@ -90,7 +56,7 @@
         <source>&amp;Address</source>
         <translation>Διεύθυνση</translation>
     </message>
-    </context>
+</context>
 <context>
     <name>FreespaceChecker</name>
     </context>
@@ -125,18 +91,12 @@
 <context>
     <name>OverviewPage</name>
     </context>
-<context>
-    <name>PaymentServer</name>
-    </context>
 <context>
     <name>PeerTableModel</name>
     </context>
 <context>
     <name>QObject</name>
     </context>
-<context>
-    <name>QRImageWidget</name>
-    </context>
 <context>
     <name>RPCConsole</name>
     <message>
@@ -150,48 +110,9 @@
         <source>Remove</source>
         <translation>Αφαίρεση</translation>
     </message>
-    <message>
-        <source>Copy message</source>
-        <translation>Αντιγραφή μηνύματος</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>Αντιγραφή ποσού</translation>
-    </message>
 </context>
 <context>
     <name>ReceiveRequestDialog</name>
-    <message>
-        <source>Address</source>
-        <translation>Διεύθυνση</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Ετικέτα</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>Μήνυμα</translation>
-    </message>
-    </context>
-<context>
-    <name>RecentRequestsTableModel</name>
-    <message>
-        <source>Date</source>
-        <translation>Ημερομηνία</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Ετικέτα</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>Μήνυμα</translation>
-    </message>
-    <message>
-        <source>(no message)</source>
-        <translation>(κανένα μήνυμα)</translation>
-    </message>
     </context>
 <context>
     <name>SendCoinsDialog</name>
@@ -203,18 +124,6 @@
         <source>Recommended:</source>
         <translation>Συνίσταται:</translation>
     </message>
-    <message>
-        <source>Copy quantity</source>
-        <translation>Αντιγραφή ποσότητας</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>Αντιγραφή ποσού</translation>
-    </message>
-    <message>
-        <source>Copy change</source>
-        <translation>Αντιγραφή αλλαγής</translation>
-    </message>
     </context>
 <context>
     <name>SendCoinsEntry</name>
@@ -235,66 +144,12 @@
 <context>
     <name>TrafficGraphWidget</name>
     </context>
-<context>
-    <name>TransactionDesc</name>
-    <message>
-        <source>Date</source>
-        <translation>Ημερομηνία</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>Μήνυμα</translation>
-    </message>
-    </context>
 <context>
     <name>TransactionDescDialog</name>
     </context>
-<context>
-    <name>TransactionTableModel</name>
-    <message>
-        <source>Date</source>
-        <translation>Ημερομηνία</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Ετικέτα</translation>
-    </message>
-    </context>
-<context>
-    <name>TransactionView</name>
-    <message>
-        <source>Copy address</source>
-        <translation>Αντιγραφή διεύθυνσης</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>Αντιγραφή ποσού</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation>Ημερομηνία</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Ετικέτα</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>Διεύθυνση</translation>
-    </message>
-    </context>
 <context>
     <name>UnitDisplayStatusBarControl</name>
     </context>
-<context>
-    <name>WalletFrame</name>
-    </context>
-<context>
-    <name>WalletModel</name>
-    </context>
-<context>
-    <name>WalletView</name>
-    </context>
 <context>
     <name>bitcoin-core</name>
     <message>
diff --git a/src/qt/locale/bitcoin_el_GR.ts b/src/qt/locale/bitcoin_el_GR.ts
index b5fb22f9739bf..59779692d9028 100644
--- a/src/qt/locale/bitcoin_el_GR.ts
+++ b/src/qt/locale/bitcoin_el_GR.ts
@@ -25,10 +25,6 @@
         <source>C&amp;lose</source>
         <translation>Κ&amp;λείσιμο</translation>
     </message>
-    <message>
-        <source>&amp;Copy Address</source>
-        <translation>&amp;Αντιγραφή διεύθυνσης</translation>
-    </message>
     <message>
         <source>Delete the currently selected address from the list</source>
         <translation>Αντιγραφη της επιλεγμενης διεύθυνσης στο πρόχειρο του συστηματος</translation>
@@ -45,73 +41,6 @@
         <source>&amp;Delete</source>
         <translation>&amp;Διαγραφή</translation>
     </message>
-    <message>
-        <source>Choose the address to send coins to</source>
-        <translation>Επιλογή διεύθυνσης όπου θα σταλθούν νομίσματα</translation>
-    </message>
-    <message>
-        <source>Choose the address to receive coins with</source>
-        <translation>Επιλογή διεύθυνσης απ' όπου θα ληφθούν νομίσματα</translation>
-    </message>
-    <message>
-        <source>C&amp;hoose</source>
-        <translation>Ε&amp;πιλογή</translation>
-    </message>
-    <message>
-        <source>Sending addresses</source>
-        <translation>Διευθύνσεις αποστολής</translation>
-    </message>
-    <message>
-        <source>Receiving addresses</source>
-        <translation>Διευθύνσεις λήψης</translation>
-    </message>
-    <message>
-        <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source>
-        <translation>Αυτές είναι οι Bitcoin διευθύνσεις σας για να λαμβάνετε πληρωμές. Δίνοντας μία ξεχωριστή διεύθυνση σε κάθε αποστολέα, θα μπορείτε να ελέγχετε ποιος σας πληρώνει.</translation>
-    </message>
-    <message>
-        <source>These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source>
-        <translation>Αυτές είναι οι Bitcoin διευθύνσεις σας για να λαμβάνετε πληρωμές. Δίνοντας μία ξεχωριστή διεύθυνση σε κάθε αποστολέα, θα μπορείτε να ελέγχετε ποιος σας πληρώνει.</translation>
-    </message>
-    <message>
-        <source>Copy &amp;Label</source>
-        <translation>Αντιγραφή &amp;επιγραφής</translation>
-    </message>
-    <message>
-        <source>&amp;Edit</source>
-        <translation>&amp;Επεξεργασία</translation>
-    </message>
-    <message>
-        <source>Export Address List</source>
-        <translation>Εξαγωγή της λίστας διευθύνσεων</translation>
-    </message>
-    <message>
-        <source>Comma separated file (*.csv)</source>
-        <translation>Αρχείο οριοθετημένο με κόμματα (*.csv)</translation>
-    </message>
-    <message>
-        <source>Exporting Failed</source>
-        <translation>Η Εξαγωγή Απέτυχε</translation>
-    </message>
-    <message>
-        <source>There was an error trying to save the address list to %1. Please try again.</source>
-        <translation>Παρουσιάστηκε σφάλμα κατά την αποθήκευση της λίστας πορτοφολιών στο %1. Παρακαλώ δοκιμάστε ξανά</translation>
-    </message>
-</context>
-<context>
-    <name>AddressTableModel</name>
-    <message>
-        <source>Label</source>
-        <translation>Επιγραφή</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>Διεύθυνση</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(χωρίς ετικέτα)</translation>
-    </message>
 </context>
 <context>
     <name>AskPassphraseDialog</name>
@@ -131,96 +60,6 @@
         <source>Repeat new passphrase</source>
         <translation>Επανέλαβε τον νέο κωδικό πρόσβασης</translation>
     </message>
-    <message>
-        <source>Encrypt wallet</source>
-        <translation>&amp;Κρυπτογράφηση πορτοφολιού</translation>
-    </message>
-    <message>
-        <source>This operation needs your wallet passphrase to unlock the wallet.</source>
-        <translation>Αυτη η ενεργεία χρειάζεται τον κωδικό του πορτοφολιού  για να ξεκλειδώσει το πορτοφόλι.</translation>
-    </message>
-    <message>
-        <source>Unlock wallet</source>
-        <translation>Ξεκλειδωσε το πορτοφολι</translation>
-    </message>
-    <message>
-        <source>This operation needs your wallet passphrase to decrypt the wallet.</source>
-        <translation>Αυτη η ενεργεια χρειάζεται τον κωδικο του πορτοφολιου  για να αποκρυπτογραφησειι το πορτοφολι.</translation>
-    </message>
-    <message>
-        <source>Decrypt wallet</source>
-        <translation>Αποκρυπτογράφησε το πορτοφολι</translation>
-    </message>
-    <message>
-        <source>Change passphrase</source>
-        <translation>Άλλαξε κωδικο πρόσβασης</translation>
-    </message>
-    <message>
-        <source>Confirm wallet encryption</source>
-        <translation>Επιβεβαίωσε την κρυπτογραφηση του πορτοφολιού</translation>
-    </message>
-    <message>
-        <source>Warning: If you encrypt your wallet and lose your passphrase, you will &lt;b&gt;LOSE ALL OF YOUR BITCOINS&lt;/b&gt;!</source>
-        <translation>Προσοχη: Εαν κρυπτογραφησεις το πορτοφολι σου και χάσεις τον κωδικο σου θα χάσεις &lt;b&gt; ΟΛΑ ΣΟΥ ΤΑ BITCOINS&lt;/b&gt;!
-Είσαι σίγουρος ότι θέλεις να κρυπτογραφησεις το πορτοφολι;</translation>
-    </message>
-    <message>
-        <source>Are you sure you wish to encrypt your wallet?</source>
-        <translation>Είστε σίγουροι ότι θέλετε να κρυπτογραφήσετε το πορτοφόλι σας;</translation>
-    </message>
-    <message>
-        <source>Bitcoin Core will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source>
-        <translation>Το Bitcoin Core θα κλεισει τώρα για να τελειώσει την διαδικασία κρυπτογράφησης. Θυμήσου ότι κρυπτογραφώντας το πορτοφόλι σου δεν μπορείς να προστατέψεις πλήρως τα bitcoins σου από κλοπή στην περίπτωση που μολυνθεί ο υπολογιστής σου με κακόβουλο λογισμικό.
-</translation>
-    </message>
-    <message>
-        <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source>
-        <translation>ΣΗΜΑΝΤΙΚΟ: Τα προηγούμενα αντίγραφα ασφαλείας που έχετε κάνει από το αρχείο του πορτοφόλιου σας θα πρέπει να αντικατασταθουν με το νέο που δημιουργείται, κρυπτογραφημένο αρχείο πορτοφόλιου. Για λόγους ασφαλείας, τα προηγούμενα αντίγραφα ασφαλείας του μη κρυπτογραφημένου αρχείου πορτοφόλιου θα καταστουν άχρηστα μόλις αρχίσετε να χρησιμοποιείτε το νέο κρυπτογραφημένο πορτοφόλι. </translation>
-    </message>
-    <message>
-        <source>Warning: The Caps Lock key is on!</source>
-        <translation>Προσοχη: το πλήκτρο Caps Lock είναι ενεργο.</translation>
-    </message>
-    <message>
-        <source>Wallet encrypted</source>
-        <translation>Κρυπτογραφημενο πορτοφολι</translation>
-    </message>
-    <message>
-        <source>Enter the new passphrase to the wallet.&lt;br/&gt;Please use a passphrase of &lt;b&gt;ten or more random characters&lt;/b&gt;, or &lt;b&gt;eight or more words&lt;/b&gt;.</source>
-        <translation>Εισάγετε τον νέο κωδικό πρόσβασης στον πορτοφόλι &lt;br/&gt; Παρακαλώ χρησιμοποιείστε ένα κωδικό με &lt;b&gt; 10 ή περισσότερους τυχαίους χαρακτήρες&lt;/b&gt; ή &lt;b&gt; οχτώ ή παραπάνω λέξεις&lt;/b&gt;.</translation>
-    </message>
-    <message>
-        <source>Enter the old passphrase and new passphrase to the wallet.</source>
-        <translation>Πληκτρολόγησε τον παλιό και τον νέο κωδικό στο πορτοφολι.</translation>
-    </message>
-    <message>
-        <source>Wallet encryption failed</source>
-        <translation>Η κρυπτογραφηση του πορτοφολιού απέτυχε</translation>
-    </message>
-    <message>
-        <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
-        <translation>Η κρυπτογράφηση του πορτοφολιού απέτυχε λογω εσωτερικού σφάλματος. Το πορτοφολι δεν κρυπτογραφηθηκε.</translation>
-    </message>
-    <message>
-        <source>The supplied passphrases do not match.</source>
-        <translation>Οι εισαχθέντες κωδικοί δεν ταιριάζουν.</translation>
-    </message>
-    <message>
-        <source>Wallet unlock failed</source>
-        <translation>το ξεκλείδωμα του πορτοφολιού απέτυχε</translation>
-    </message>
-    <message>
-        <source>The passphrase entered for the wallet decryption was incorrect.</source>
-        <translation>Ο κωδικος που εισήχθη για την αποκρυπτογραφηση του πορτοφολιού ήταν λαθος.</translation>
-    </message>
-    <message>
-        <source>Wallet decryption failed</source>
-        <translation>Η αποκρυπτογραφηση του πορτοφολιού απέτυχε</translation>
-    </message>
-    <message>
-        <source>Wallet passphrase was successfully changed.</source>
-        <translation>Ο κωδικος του πορτοφολιού άλλαξε με επιτυχία.</translation>
-    </message>
 </context>
 <context>
     <name>BanTableModel</name>
@@ -263,6 +102,10 @@
         <source>Quit application</source>
         <translation>Εξοδος από την εφαρμογή</translation>
     </message>
+    <message>
+        <source>&amp;About %1</source>
+        <translation>&amp;Περί %1</translation>
+    </message>
     <message>
         <source>About &amp;Qt</source>
         <translation>Σχετικά με &amp;Qt</translation>
@@ -299,14 +142,6 @@
         <source>Open &amp;URI...</source>
         <translation>'Ανοιγμα &amp;URI</translation>
     </message>
-    <message>
-        <source>Bitcoin Core client</source>
-        <translation>Εφαρμογή Bitcoin Core</translation>
-    </message>
-    <message>
-        <source>Importing blocks from disk...</source>
-        <translation>Εισαγωγή μπλοκ από τον σκληρο δίσκο ... </translation>
-    </message>
     <message>
         <source>Reindexing blocks on disk...</source>
         <translation>Φόρτωση ευρετηρίου μπλοκ στον σκληρο δισκο...</translation>
@@ -351,10 +186,6 @@
         <source>&amp;Receive</source>
         <translation>&amp;Παραλαβή </translation>
     </message>
-    <message>
-        <source>Show information about Bitcoin Core</source>
-        <translation>Σχετικά με το Bitcoin Core</translation>
-    </message>
     <message>
         <source>&amp;Show / Hide</source>
         <translation>&amp;Εμφάνισε/Κρύψε</translation>
@@ -391,18 +222,10 @@
         <source>Tabs toolbar</source>
         <translation>Εργαλειοθήκη καρτελών</translation>
     </message>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Bitcoin Core</translation>
-    </message>
     <message>
         <source>Request payments (generates QR codes and bitcoin: URIs)</source>
         <translation>Αίτηση πληρωμών (δημιουργεί QR codes και διευθύνσεις bitcoin: )</translation>
     </message>
-    <message>
-        <source>&amp;About Bitcoin Core</source>
-        <translation>&amp;Σχετικά με το Bitcoin Core</translation>
-    </message>
     <message>
         <source>Show the list of used sending addresses and labels</source>
         <translation>Προβολή της λίστας των χρησιμοποιημένων διευθύνσεων και ετικετών αποστολής</translation>
@@ -419,10 +242,6 @@
         <source>&amp;Command-line options</source>
         <translation>&amp;Επιλογές γραμμής εντολών</translation>
     </message>
-    <message>
-        <source>Show the Bitcoin Core help message to get a list with possible Bitcoin command-line options</source>
-        <translation>Εμφανιση του Bitcoin-Qt μήνυματος βοήθειας για να πάρετε μια λίστα με τις πιθανές επιλογές Bitcoin γραμμής εντολών.</translation>
-    </message>
     <message>
         <source>No block source available...</source>
         <translation>Η πηγή του μπλοκ δεν ειναι διαθέσιμη... </translation>
@@ -510,13 +329,6 @@
         <translation>Το πορτοφόλι είναι &lt;b&gt;κρυπτογραφημένο&lt;/b&gt; και &lt;b&gt;κλειδωμένο&lt;/b&gt;</translation>
     </message>
 </context>
-<context>
-    <name>ClientModel</name>
-    <message>
-        <source>Network Alert</source>
-        <translation>Ειδοποίηση Δικτύου</translation>
-    </message>
-</context>
 <context>
     <name>CoinControlDialog</name>
     <message>
@@ -595,151 +407,6 @@
         <source>Priority</source>
         <translation>Προτεραιότητα</translation>
     </message>
-    <message>
-        <source>Copy address</source>
-        <translation>Αντιγραφή διεύθυνσης</translation>
-    </message>
-    <message>
-        <source>Copy label</source>
-        <translation>Αντιγραφή επιγραφής</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>Αντιγραφή ποσού</translation>
-    </message>
-    <message>
-        <source>Copy transaction ID</source>
-        <translation>Αντιγραφη του ID Συναλλαγής</translation>
-    </message>
-    <message>
-        <source>Lock unspent</source>
-        <translation>Κλείδωμα αξόδευτων</translation>
-    </message>
-    <message>
-        <source>Unlock unspent</source>
-        <translation>Ξεκλείδωμα αξόδευτων</translation>
-    </message>
-    <message>
-        <source>Copy quantity</source>
-        <translation>Αντιγραφή ποσότητας</translation>
-    </message>
-    <message>
-        <source>Copy fee</source>
-        <translation>Αντιγραφή ταρίφας</translation>
-    </message>
-    <message>
-        <source>Copy after fee</source>
-        <translation>Αντιγραφή μετα-ταρίφας</translation>
-    </message>
-    <message>
-        <source>Copy bytes</source>
-        <translation>Αντιγραφή των byte</translation>
-    </message>
-    <message>
-        <source>Copy priority</source>
-        <translation>Αντιγραφή προτεραιότητας</translation>
-    </message>
-    <message>
-        <source>Copy dust</source>
-        <translation>Αντιγραφή 'σκόνης'</translation>
-    </message>
-    <message>
-        <source>Copy change</source>
-        <translation>Αντιγραφή των ρέστων</translation>
-    </message>
-    <message>
-        <source>highest</source>
-        <translation>ύψιστη</translation>
-    </message>
-    <message>
-        <source>higher</source>
-        <translation>υψηλότερη</translation>
-    </message>
-    <message>
-        <source>high</source>
-        <translation>ψηλή</translation>
-    </message>
-    <message>
-        <source>medium-high</source>
-        <translation>μεσαία-ψηλή</translation>
-    </message>
-    <message>
-        <source>medium</source>
-        <translation>μεσαία</translation>
-    </message>
-    <message>
-        <source>low-medium</source>
-        <translation>μεσαία-χαμηλή</translation>
-    </message>
-    <message>
-        <source>low</source>
-        <translation>χαμηλή</translation>
-    </message>
-    <message>
-        <source>lower</source>
-        <translation>χαμηλότερη</translation>
-    </message>
-    <message>
-        <source>lowest</source>
-        <translation>χαμηλότατη</translation>
-    </message>
-    <message>
-        <source>(%1 locked)</source>
-        <translation>(%1 κλειδωμένο)</translation>
-    </message>
-    <message>
-        <source>none</source>
-        <translation>κανένα</translation>
-    </message>
-    <message>
-        <source>This label turns red if the transaction size is greater than 1000 bytes.</source>
-        <translation>Αυτή η ετικέτα γίνεται κόκκινη αν το μέγεθος της συναλλαγής είναι μεγαλύτερο από 1000 bytes.</translation>
-    </message>
-    <message>
-        <source>This label turns red if the priority is smaller than "medium".</source>
-        <translation>Αυτή η ετικέτα γίνεται κόκκινη αν η προτεραιότητα είναι μικρότερη από "μεσαία".</translation>
-    </message>
-    <message>
-        <source>This label turns red if any recipient receives an amount smaller than %1.</source>
-        <translation>Αυτή η ετικέτα γίνεται κόκκινη αν οποιοσδήποτε παραλήπτης λάβει ποσό μικρότερο από %1.</translation>
-    </message>
-    <message>
-        <source>Can vary +/- %1 satoshi(s) per input.</source>
-        <translation>Μπορεί να διαφέρει +/- %1 Satoshi (ες) ανά εγγραφή.</translation>
-    </message>
-    <message>
-        <source>yes</source>
-        <translation>ναι</translation>
-    </message>
-    <message>
-        <source>no</source>
-        <translation>όχι</translation>
-    </message>
-    <message>
-        <source>This means a fee of at least %1 per kB is required.</source>
-        <translation>Ελάχιστο χρεώσιμο ποσό τουλάχιστο %1 ανα kB</translation>
-    </message>
-    <message>
-        <source>Can vary +/- 1 byte per input.</source>
-        <translation>Μπορεί να διαφέρει +/- 1 byte ανά εγγραφή.</translation>
-    </message>
-    <message>
-        <source>Transactions with higher priority are more likely to get included into a block.</source>
-        <translation>Συναλλαγές με υψηλότερη προτεραιότητα είναι πιο πιθανό να περιλαμβάνονται σε ένα μπλοκ.</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(χωρίς ετικέτα)</translation>
-    </message>
-    <message>
-        <source>change from %1 (%2)</source>
-        <translation>ρέστα από %1 (%2) </translation>
-    </message>
-    <message>
-        <source>(change)</source>
-        <translation>(ρέστα)
-</translation>
-    </message>
 </context>
 <context>
     <name>EditAddressDialog</name>
@@ -763,38 +430,6 @@
         <source>&amp;Address</source>
         <translation>&amp;Διεύθυνση</translation>
     </message>
-    <message>
-        <source>New receiving address</source>
-        <translation>Νέα διεύθυνση λήψης</translation>
-    </message>
-    <message>
-        <source>New sending address</source>
-        <translation>Νέα διεύθυνση αποστολής</translation>
-    </message>
-    <message>
-        <source>Edit receiving address</source>
-        <translation>Επεξεργασία διεύθυνσης λήψης</translation>
-    </message>
-    <message>
-        <source>Edit sending address</source>
-        <translation>Επεξεργασία διεύθυνσης αποστολής</translation>
-    </message>
-    <message>
-        <source>The entered address "%1" is already in the address book.</source>
-        <translation>Η διεύθυνση "%1" βρίσκεται ήδη στο βιβλίο διευθύνσεων.</translation>
-    </message>
-    <message>
-        <source>The entered address "%1" is not a valid Bitcoin address.</source>
-        <translation>Η διεύθυνση "%1" δεν είναι έγκυρη Bitcoin διεύθυνση.</translation>
-    </message>
-    <message>
-        <source>Could not unlock wallet.</source>
-        <translation>Δεν είναι δυνατό το ξεκλείδωμα του πορτοφολιού.</translation>
-    </message>
-    <message>
-        <source>New key generation failed.</source>
-        <translation>Η δημιουργία νέου κλειδιού απέτυχε.</translation>
-    </message>
 </context>
 <context>
     <name>FreespaceChecker</name>
@@ -821,10 +456,6 @@
 </context>
 <context>
     <name>HelpMessageDialog</name>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Bitcoin Core</translation>
-    </message>
     <message>
         <source>version</source>
         <translation>έκδοση</translation>
@@ -833,10 +464,6 @@
         <source>(%1-bit)</source>
         <translation>(%1-bit)</translation>
     </message>
-    <message>
-        <source>About Bitcoin Core</source>
-        <translation>Σχετικά με το Bitcoin Core</translation>
-    </message>
     <message>
         <source>Command-line options</source>
         <translation>επιλογής γραμμής εντολών</translation>
@@ -856,18 +483,6 @@
         <source>Welcome</source>
         <translation>Καλώς ήρθατε</translation>
     </message>
-    <message>
-        <source>Welcome to Bitcoin Core.</source>
-        <translation>Καλώς ήρθατε στο Bitcoin Core.</translation>
-    </message>
-    <message>
-        <source>As this is the first time the program is launched, you can choose where Bitcoin Core will store its data.</source>
-        <translation>Καθώς αυτή είναι η πρώτη φορά που εκκινείται το πρόγραμμα, μπορείτε να διαλέξετε πού θα αποθηκεύει το Bitcoin Core τα δεδομένα του.</translation>
-    </message>
-    <message>
-        <source>Bitcoin Core will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source>
-        <translation>O πυρήνας Bitcoin θα κατεβάσει και να αποθηκεύσει ένα αντίγραφο της αλυσίδας μπλοκ Bitcoin. Τουλάχιστον %1GB δεδομένων θα αποθηκευτούν σε αυτόν τον κατάλογο, και θα αυξηθεί με την πάροδο του χρόνου. Το πορτοφόλι θα αποθηκευτεί σε αυτόν τον κατάλογο.</translation>
-    </message>
     <message>
         <source>Use the default data directory</source>
         <translation>Χρήση του προεπιλεγμένου φακέλου δεδομένων</translation>
@@ -876,10 +491,6 @@
         <source>Use a custom data directory:</source>
         <translation>Προσαρμογή του φακέλου δεδομένων: </translation>
     </message>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Bitcoin Core</translation>
-    </message>
     <message>
         <source>Error: Specified data directory "%1" cannot be created.</source>
         <translation>Σφάλμα: Ο καθορισμένος φάκελος δεδομένων "%1" δεν μπορεί να δημιουργηθεί.</translation>
@@ -915,10 +526,6 @@
         <source>Select payment request file</source>
         <translation>Επιλέξτε πληρωμή αρχείου αίτησης</translation>
     </message>
-    <message>
-        <source>Select payment request file to open</source>
-        <translation>Επιλέξτε αρχείο πληρωμής για άνοιγμα.</translation>
-    </message>
 </context>
 <context>
     <name>OptionsDialog</name>
@@ -1179,69 +786,6 @@
         <translation>Το τρέχον συνολικό υπόλοιπο σε διευθύνσεις παρακολούθησης μόνο</translation>
     </message>
 </context>
-<context>
-    <name>PaymentServer</name>
-    <message>
-        <source>URI handling</source>
-        <translation>Χειρισμός URI</translation>
-    </message>
-    <message>
-        <source>Invalid payment address %1</source>
-        <translation>Μη έγκυρη διεύθυνση πληρωμής %1</translation>
-    </message>
-    <message>
-        <source>Payment request rejected</source>
-        <translation>Η αίτηση πληρωμής έχει αρνηθεί.</translation>
-    </message>
-    <message>
-        <source>Payment request is not initialized.</source>
-        <translation>Η αίτηση πληρωμής δεν έχει αρχίζει ακόμα.</translation>
-    </message>
-    <message>
-        <source>Requested payment amount of %1 is too small (considered dust).</source>
-        <translation>Το ζητούμενο ποσό πληρωμής του %1 είναι πολύ μικρό (θεωρείται σκόνη)</translation>
-    </message>
-    <message>
-        <source>Payment request error</source>
-        <translation>Σφάλμα αιτήματος πληρωμής</translation>
-    </message>
-    <message>
-        <source>Cannot start bitcoin: click-to-pay handler</source>
-        <translation>Δεν είναι δυνατή η εκκίνηση του Bitcoin: click-to-pay handler</translation>
-    </message>
-    <message>
-        <source>Payment request fetch URL is invalid: %1</source>
-        <translation>Η διεύθυνση πληρωμής (URL) δεν είναι έγκυρη: %1</translation>
-    </message>
-    <message>
-        <source>Payment request file handling</source>
-        <translation>Επιλέξτε αρχείο πληρωμής για άνοιγμα.</translation>
-    </message>
-    <message>
-        <source>Refund from %1</source>
-        <translation>Επιστροφή ποσού από %1</translation>
-    </message>
-    <message>
-        <source>Error communicating with %1: %2</source>
-        <translation>Σφάλμα επικοινωνίας με %1: %2</translation>
-    </message>
-    <message>
-        <source>Payment request cannot be parsed!</source>
-        <translation>Η αίτηση πληρωμής δεν μπορεί να αναλυθεί!</translation>
-    </message>
-    <message>
-        <source>Bad response from server %1</source>
-        <translation>Κακή απάντηση από διακομιστή %1</translation>
-    </message>
-    <message>
-        <source>Payment acknowledged</source>
-        <translation>Πληρωμή αναγνωρίστηκε</translation>
-    </message>
-    <message>
-        <source>Network request error</source>
-        <translation>Σφάλμα αιτήματος δικτύου</translation>
-    </message>
-</context>
 <context>
     <name>PeerTableModel</name>
     <message>
@@ -1288,25 +832,6 @@
         <translation>%1 ms</translation>
     </message>
 </context>
-<context>
-    <name>QRImageWidget</name>
-    <message>
-        <source>&amp;Save Image...</source>
-        <translation>&amp;Αποθήκευση εικόνας...</translation>
-    </message>
-    <message>
-        <source>&amp;Copy Image</source>
-        <translation>&amp;Αντιγραφή εικόνας</translation>
-    </message>
-    <message>
-        <source>Save QR Code</source>
-        <translation>Αποθήκευση κώδικα QR</translation>
-    </message>
-    <message>
-        <source>PNG Image (*.png)</source>
-        <translation>Εικόνες PNG (*.png)</translation>
-    </message>
-</context>
 <context>
     <name>RPCConsole</name>
     <message>
@@ -1437,10 +962,6 @@
         <source>Out:</source>
         <translation>Εξερχόμενα:</translation>
     </message>
-    <message>
-        <source>Build date</source>
-        <translation>Ημερομηνία κατασκευής</translation>
-    </message>
     <message>
         <source>Debug log file</source>
         <translation>Αρχείο καταγραφής εντοπισμού σφαλμάτων </translation>
@@ -1536,18 +1057,6 @@
         <source>Remove</source>
         <translation>Αφαίρεση</translation>
     </message>
-    <message>
-        <source>Copy label</source>
-        <translation>Αντιγραφή επιγραφής</translation>
-    </message>
-    <message>
-        <source>Copy message</source>
-        <translation>Αντιγραφή μηνύματος</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>Αντιγραφή ποσού</translation>
-    </message>
 </context>
 <context>
     <name>ReceiveRequestDialog</name>
@@ -1567,73 +1076,6 @@
         <source>&amp;Save Image...</source>
         <translation>&amp;Αποθήκευση εικόνας...</translation>
     </message>
-    <message>
-        <source>Request payment to %1</source>
-        <translation>Αίτηση πληρωμής για %1</translation>
-    </message>
-    <message>
-        <source>Payment information</source>
-        <translation>Πληροφορίες πληρωμής</translation>
-    </message>
-    <message>
-        <source>URI</source>
-        <translation>URI:</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>Διεύθυνση</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>Ποσό</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Επιγραφή</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>Μήνυμα</translation>
-    </message>
-    <message>
-        <source>Resulting URI too long, try to reduce the text for label / message.</source>
-        <translation>Το αποτέλεσμα της διεύθυνσης είναι πολύ μεγάλο. Μειώστε το μέγεθος για το κείμενο της ετικέτας/ μηνύματος.</translation>
-    </message>
-    <message>
-        <source>Error encoding URI into QR Code.</source>
-        <translation>Σφάλμα κατά την κωδικοποίηση του URI σε κώδικα QR</translation>
-    </message>
-</context>
-<context>
-    <name>RecentRequestsTableModel</name>
-    <message>
-        <source>Date</source>
-        <translation>Ημερομηνία</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Επιγραφή</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>Μήνυμα</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>Ποσό</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(χωρίς ετικέτα)</translation>
-    </message>
-    <message>
-        <source>(no message)</source>
-        <translation>(κανένα μήνυμα)</translation>
-    </message>
-    <message>
-        <source>(no amount)</source>
-        <translation>(κανένα ποσό)</translation>
-    </message>
 </context>
 <context>
     <name>SendCoinsDialog</name>
@@ -1733,10 +1175,6 @@
         <source>fast</source>
         <translation>Γρήγορο</translation>
     </message>
-    <message>
-        <source>(confirmation may take longer)</source>
-        <translation>(η επικύρωση ίσως χρειαστεί περισσότερο χρόνο)</translation>
-    </message>
     <message>
         <source>Send to multiple recipients at once</source>
         <translation>Αποστολή σε πολλούς αποδέκτες ταυτόχρονα</translation>
@@ -1769,82 +1207,6 @@
         <source>S&amp;end</source>
         <translation>Αποστολη</translation>
     </message>
-    <message>
-        <source>Confirm send coins</source>
-        <translation>Επιβεβαίωση αποστολής νομισμάτων</translation>
-    </message>
-    <message>
-        <source>%1 to %2</source>
-        <translation>%1 σε %2</translation>
-    </message>
-    <message>
-        <source>Copy quantity</source>
-        <translation>Αντιγραφή ποσότητας</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>Αντιγραφή ποσού</translation>
-    </message>
-    <message>
-        <source>Copy fee</source>
-        <translation>Αντιγραφή ταρίφας</translation>
-    </message>
-    <message>
-        <source>Copy after fee</source>
-        <translation>Αντιγραφή μετα-ταρίφας</translation>
-    </message>
-    <message>
-        <source>Copy bytes</source>
-        <translation>Αντιγραφή των byte</translation>
-    </message>
-    <message>
-        <source>Copy priority</source>
-        <translation>Αντιγραφή προτεραιότητας</translation>
-    </message>
-    <message>
-        <source>Copy change</source>
-        <translation>Αντιγραφή των ρέστων</translation>
-    </message>
-    <message>
-        <source>or</source>
-        <translation>ή</translation>
-    </message>
-    <message>
-        <source>The amount to pay must be larger than 0.</source>
-        <translation>Το ποσό πληρωμής πρέπει να είναι μεγαλύτερο από 0.</translation>
-    </message>
-    <message>
-        <source>The amount exceeds your balance.</source>
-        <translation>Το ποσό ξεπερνάει το διαθέσιμο υπόλοιπο</translation>
-    </message>
-    <message>
-        <source>The total exceeds your balance when the %1 transaction fee is included.</source>
-        <translation>Το σύνολο υπερβαίνει το υπόλοιπό σας όταν συμπεριληφθεί και η αμοιβή %1</translation>
-    </message>
-    <message>
-        <source>Transaction creation failed!</source>
-        <translation>Η δημιουργία της συναλλαγής απέτυχε!</translation>
-    </message>
-    <message>
-        <source>Warning: Invalid Bitcoin address</source>
-        <translation>Προειδοποίηση: Μη έγκυρη διεύθυνση Bitcoin</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(χωρίς ετικέτα)</translation>
-    </message>
-    <message>
-        <source>Copy dust</source>
-        <translation>Αντιγραφή 'σκόνης'</translation>
-    </message>
-    <message>
-        <source>Are you sure you want to send?</source>
-        <translation>Είστε βέβαιοι για την αποστολή;</translation>
-    </message>
-    <message>
-        <source>added as transaction fee</source>
-        <translation>προστέθηκαν ως αμοιβή συναλλαγής</translation>
-    </message>
 </context>
 <context>
     <name>SendCoinsEntry</name>
@@ -1856,10 +1218,6 @@
         <source>Pay &amp;To:</source>
         <translation>Πληρωμή &amp;σε:</translation>
     </message>
-    <message>
-        <source>Enter a label for this address to add it to your address book</source>
-        <translation>Εισάγετε μια επιγραφή για αυτή τη διεύθυνση ώστε να καταχωρηθεί στο βιβλίο διευθύνσεων</translation>
-    </message>
     <message>
         <source>&amp;Label:</source>
         <translation>&amp;Επιγραφή</translation>
@@ -1911,10 +1269,6 @@
 </context>
 <context>
     <name>ShutdownWindow</name>
-    <message>
-        <source>Bitcoin Core is shutting down...</source>
-        <translation>Το Bitcoin Core τερματίζεται...</translation>
-    </message>
     <message>
         <source>Do not shut down the computer until this window disappears.</source>
         <translation>Μην απενεργοποιήσετε τον υπολογιστή μέχρι να κλείσει αυτό το παράθυρο.</translation>
@@ -1998,69 +1352,9 @@
         <source>Reset all verify message fields</source>
         <translation>Επαναφορά όλων επαλήθευμενων πεδίων μήνυματος </translation>
     </message>
-    <message>
-        <source>Click "Sign Message" to generate signature</source>
-        <translation>Κάντε κλικ στο "Υπογραφή Μηνύματος" για να λάβετε την υπογραφή</translation>
-    </message>
-    <message>
-        <source>The entered address is invalid.</source>
-        <translation>Η διεύθυνση που εισήχθη είναι λάθος.</translation>
-    </message>
-    <message>
-        <source>Please check the address and try again.</source>
-        <translation>Παρακαλούμε ελέγξτε την διεύθυνση και δοκιμάστε ξανά.</translation>
-    </message>
-    <message>
-        <source>The entered address does not refer to a key.</source>
-        <translation>Η διεύθυνση που έχει εισαχθεί δεν αναφέρεται σε ένα πλήκτρο.</translation>
-    </message>
-    <message>
-        <source>Wallet unlock was cancelled.</source>
-        <translation>το ξεκλείδωμα του πορτοφολιού απέτυχε</translation>
-    </message>
-    <message>
-        <source>Private key for the entered address is not available.</source>
-        <translation>Το προσωπικό κλειδί εισαγμενης διευθυνσης δεν είναι διαθέσιμο.</translation>
-    </message>
-    <message>
-        <source>Message signing failed.</source>
-        <translation>Η υπογραφή του μηνύματος απέτυχε.</translation>
-    </message>
-    <message>
-        <source>Message signed.</source>
-        <translation>Μήνυμα υπεγράφη.</translation>
-    </message>
-    <message>
-        <source>The signature could not be decoded.</source>
-        <translation>Η υπογραφή δεν μπόρεσε να αποκρυπτογραφηθεί.</translation>
-    </message>
-    <message>
-        <source>Please check the signature and try again.</source>
-        <translation>Παρακαλούμε ελέγξτε την υπογραφή και δοκιμάστε ξανά.</translation>
-    </message>
-    <message>
-        <source>The signature did not match the message digest.</source>
-        <translation>Η υπογραφή δεν ταιριάζει με το μήνυμα. </translation>
-    </message>
-    <message>
-        <source>Message verification failed.</source>
-        <translation>Η επιβεβαίωση του μηνύματος απέτυχε</translation>
-    </message>
-    <message>
-        <source>Message verified.</source>
-        <translation>Μήνυμα επιβεβαιώθηκε.</translation>
-    </message>
 </context>
 <context>
     <name>SplashScreen</name>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Bitcoin Core</translation>
-    </message>
-    <message>
-        <source>The Bitcoin Core developers</source>
-        <translation>Οι προγραμματιστές του Bitcoin Core</translation>
-    </message>
     <message>
         <source>[testnet]</source>
         <translation>[testnet]</translation>
@@ -2073,386 +1367,13 @@
         <translation>KB/s</translation>
     </message>
 </context>
-<context>
-    <name>TransactionDesc</name>
-    <message>
-        <source>Open until %1</source>
-        <translation>Ανοιχτό μέχρι %1</translation>
-    </message>
-    <message>
-        <source>conflicted</source>
-        <translation>σύγκρουση</translation>
-    </message>
-    <message>
-        <source>%1/offline</source>
-        <translation>%1/χωρίς σύνδεση;</translation>
-    </message>
-    <message>
-        <source>%1/unconfirmed</source>
-        <translation>%1/χωρίς επιβεβαίωση</translation>
-    </message>
-    <message>
-        <source>%1 confirmations</source>
-        <translation>%1 επιβεβαιώσεις</translation>
-    </message>
-    <message>
-        <source>Status</source>
-        <translation>Κατάσταση</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation>Ημερομηνία</translation>
-    </message>
-    <message>
-        <source>Source</source>
-        <translation>Πηγή</translation>
-    </message>
-    <message>
-        <source>Generated</source>
-        <translation>Δημιουργία </translation>
-    </message>
-    <message>
-        <source>From</source>
-        <translation>Από</translation>
-    </message>
-    <message>
-        <source>To</source>
-        <translation>Προς</translation>
-    </message>
-    <message>
-        <source>own address</source>
-        <translation> δική σας διεύθυνση </translation>
-    </message>
-    <message>
-        <source>watch-only</source>
-        <translation>Επίβλεψη μόνο:</translation>
-    </message>
-    <message>
-        <source>label</source>
-        <translation>eπιγραφή</translation>
-    </message>
-    <message>
-        <source>Credit</source>
-        <translation>Πίστωση </translation>
-    </message>
-    <message>
-        <source>not accepted</source>
-        <translation>μη αποδεκτό</translation>
-    </message>
-    <message>
-        <source>Debit</source>
-        <translation>Debit</translation>
-    </message>
-    <message>
-        <source>Total debit</source>
-        <translation>Σύνολο χρέωσης</translation>
-    </message>
-    <message>
-        <source>Total credit</source>
-        <translation>Συνολική πίστωση</translation>
-    </message>
-    <message>
-        <source>Transaction fee</source>
-        <translation>Τέλος συναλλαγής </translation>
-    </message>
-    <message>
-        <source>Net amount</source>
-        <translation>Καθαρό ποσό</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>Μήνυμα</translation>
-    </message>
-    <message>
-        <source>Comment</source>
-        <translation>Σχόλιο:</translation>
-    </message>
-    <message>
-        <source>Transaction ID</source>
-        <translation>ID Συναλλαγής:</translation>
-    </message>
-    <message>
-        <source>Merchant</source>
-        <translation>Έμπορος</translation>
-    </message>
-    <message>
-        <source>Generated coins must mature %1 blocks before they can be spent. When you generated this block, it was broadcast to the network to be added to the block chain. If it fails to get into the chain, its state will change to "not accepted" and it won't be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source>
-        <translation>Πρέπει να περιμένετε %1 μπλοκ πριν μπορέσετε να χρησιμοποιήσετε τα νομίσματα που έχετε δημιουργήσει. Το μπλοκ που δημιουργήσατε μεταδόθηκε στο δίκτυο για να συμπεριληφθεί στην αλυσίδα των μπλοκ. Αν δεν μπει σε αυτή θα μετατραπεί σε "μη αποδεκτό" και δε θα μπορεί να καταναλωθεί. Αυτό συμβαίνει σπάνια όταν κάποιος άλλος κόμβος δημιουργήσει ένα μπλοκ λίγα δευτερόλεπτα πριν από εσάς.</translation>
-    </message>
-    <message>
-        <source>Debug information</source>
-        <translation>Πληροφορίες αποσφαλμάτωσης</translation>
-    </message>
-    <message>
-        <source>Transaction</source>
-        <translation>Συναλλαγή</translation>
-    </message>
-    <message>
-        <source>Inputs</source>
-        <translation>εισροές </translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>Ποσό</translation>
-    </message>
-    <message>
-        <source>true</source>
-        <translation>αληθής</translation>
-    </message>
-    <message>
-        <source>false</source>
-        <translation>αναληθής </translation>
-    </message>
-    <message>
-        <source>, has not been successfully broadcast yet</source>
-        <translation>, δεν έχει ακόμα μεταδοθεί μ' επιτυχία</translation>
-    </message>
-    <message>
-        <source>unknown</source>
-        <translation>άγνωστο</translation>
-    </message>
-</context>
 <context>
     <name>TransactionDescDialog</name>
-    <message>
-        <source>Transaction details</source>
-        <translation>Λεπτομέρειες συναλλαγής</translation>
-    </message>
     <message>
         <source>This pane shows a detailed description of the transaction</source>
         <translation>Αυτό το παράθυρο δείχνει μια λεπτομερή περιγραφή της συναλλαγής</translation>
     </message>
 </context>
-<context>
-    <name>TransactionTableModel</name>
-    <message>
-        <source>Date</source>
-        <translation>Ημερομηνία</translation>
-    </message>
-    <message>
-        <source>Type</source>
-        <translation>Τύπος</translation>
-    </message>
-    <message>
-        <source>Open until %1</source>
-        <translation>Ανοιχτό μέχρι %1</translation>
-    </message>
-    <message>
-        <source>Confirmed (%1 confirmations)</source>
-        <translation>Επικυρωμένη (%1 επικυρώσεις)</translation>
-    </message>
-    <message>
-        <source>This block was not received by any other nodes and will probably not be accepted!</source>
-        <translation>Αυτό το μπλοκ δεν έχει παραληφθεί από κανέναν άλλο κόμβο και κατά πάσα πιθανότητα θα απορριφθεί!</translation>
-    </message>
-    <message>
-        <source>Generated but not accepted</source>
-        <translation>Δημιουργήθηκε αλλά απορρίφθηκε</translation>
-    </message>
-    <message>
-        <source>Offline</source>
-        <translation>Offline</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Επιγραφή</translation>
-    </message>
-    <message>
-        <source>Unconfirmed</source>
-        <translation>Ανεπιβεβαίωτες</translation>
-    </message>
-    <message>
-        <source>Conflicted</source>
-        <translation>Σύγκρουση</translation>
-    </message>
-    <message>
-        <source>Received with</source>
-        <translation>Ελήφθη με</translation>
-    </message>
-    <message>
-        <source>Received from</source>
-        <translation>Ελήφθη από</translation>
-    </message>
-    <message>
-        <source>Sent to</source>
-        <translation>Απεστάλη προς</translation>
-    </message>
-    <message>
-        <source>Payment to yourself</source>
-        <translation>Πληρωμή προς εσάς</translation>
-    </message>
-    <message>
-        <source>Mined</source>
-        <translation>Εξόρυξη</translation>
-    </message>
-    <message>
-        <source>watch-only</source>
-        <translation>Επίβλεψη μόνο:</translation>
-    </message>
-    <message>
-        <source>(n/a)</source>
-        <translation>(δ/α)</translation>
-    </message>
-    <message>
-        <source>Transaction status. Hover over this field to show number of confirmations.</source>
-        <translation>Κατάσταση συναλλαγής. Πηγαίνετε το ποντίκι πάνω από αυτό το πεδίο για να δείτε τον αριθμό των επικυρώσεων</translation>
-    </message>
-    <message>
-        <source>Date and time that the transaction was received.</source>
-        <translation>Ημερομηνία κι ώρα λήψης της συναλλαγής.</translation>
-    </message>
-    <message>
-        <source>Type of transaction.</source>
-        <translation>Είδος συναλλαγής.</translation>
-    </message>
-    <message>
-        <source>Amount removed from or added to balance.</source>
-        <translation>Ποσό που αφαιρέθηκε ή προστέθηκε στο υπόλοιπο.</translation>
-    </message>
-</context>
-<context>
-    <name>TransactionView</name>
-    <message>
-        <source>All</source>
-        <translation>Όλα</translation>
-    </message>
-    <message>
-        <source>Today</source>
-        <translation>Σήμερα</translation>
-    </message>
-    <message>
-        <source>This week</source>
-        <translation>Αυτή την εβδομάδα</translation>
-    </message>
-    <message>
-        <source>This month</source>
-        <translation>Αυτόν τον μήνα</translation>
-    </message>
-    <message>
-        <source>Last month</source>
-        <translation>Τον προηγούμενο μήνα</translation>
-    </message>
-    <message>
-        <source>This year</source>
-        <translation>Αυτό το έτος</translation>
-    </message>
-    <message>
-        <source>Range...</source>
-        <translation>Έκταση...</translation>
-    </message>
-    <message>
-        <source>Received with</source>
-        <translation>Ελήφθη με</translation>
-    </message>
-    <message>
-        <source>Sent to</source>
-        <translation>Απεστάλη προς</translation>
-    </message>
-    <message>
-        <source>To yourself</source>
-        <translation>Προς εσάς</translation>
-    </message>
-    <message>
-        <source>Mined</source>
-        <translation>Εξόρυξη</translation>
-    </message>
-    <message>
-        <source>Other</source>
-        <translation>Άλλο</translation>
-    </message>
-    <message>
-        <source>Enter address or label to search</source>
-        <translation>Αναζήτηση με βάση τη διεύθυνση ή την επιγραφή</translation>
-    </message>
-    <message>
-        <source>Min amount</source>
-        <translation>Ελάχιστο ποσό</translation>
-    </message>
-    <message>
-        <source>Copy address</source>
-        <translation>Αντιγραφή διεύθυνσης</translation>
-    </message>
-    <message>
-        <source>Copy label</source>
-        <translation>Αντιγραφή επιγραφής</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>Αντιγραφή ποσού</translation>
-    </message>
-    <message>
-        <source>Copy transaction ID</source>
-        <translation>Αντιγραφη του ID Συναλλαγής</translation>
-    </message>
-    <message>
-        <source>Edit label</source>
-        <translation>Επεξεργασία επιγραφής</translation>
-    </message>
-    <message>
-        <source>Show transaction details</source>
-        <translation>Εμφάνιση λεπτομερειών συναλλαγής</translation>
-    </message>
-    <message>
-        <source>Export Transaction History</source>
-        <translation>Εξαγωγή Ιστορικού Συναλλαγών</translation>
-    </message>
-    <message>
-        <source>Watch-only</source>
-        <translation>Επίβλεψη μόνο:</translation>
-    </message>
-    <message>
-        <source>Exporting Failed</source>
-        <translation>Η Εξαγωγή Απέτυχε</translation>
-    </message>
-    <message>
-        <source>There was an error trying to save the transaction history to %1.</source>
-        <translation>Yπήρξε σφάλμα κατά την προσπάθεια αποθήκευσης του ιστορικού συναλλαγών στο %1.</translation>
-    </message>
-    <message>
-        <source>Exporting Successful</source>
-        <translation>Επιτυχής εξαγωγή</translation>
-    </message>
-    <message>
-        <source>The transaction history was successfully saved to %1.</source>
-        <translation>Το ιστορικό συναλλαγών αποθηκεύτηκε επιτυχώς στο %1.</translation>
-    </message>
-    <message>
-        <source>Comma separated file (*.csv)</source>
-        <translation>Αρχείο οριοθετημένο με κόμματα (*.csv)</translation>
-    </message>
-    <message>
-        <source>Confirmed</source>
-        <translation>Επικυρωμένες</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation>Ημερομηνία</translation>
-    </message>
-    <message>
-        <source>Type</source>
-        <translation>Τύπος</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Επιγραφή</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>Διεύθυνση</translation>
-    </message>
-    <message>
-        <source>ID</source>
-        <translation>ID</translation>
-    </message>
-    <message>
-        <source>Range:</source>
-        <translation>Έκταση:</translation>
-    </message>
-    <message>
-        <source>to</source>
-        <translation>έως</translation>
-    </message>
-</context>
 <context>
     <name>UnitDisplayStatusBarControl</name>
     <message>
@@ -2460,55 +1381,6 @@
         <translation>Μονάδα μέτρησης προβολής ποσών. Κάντε κλικ για επιλογή άλλης μονάδας.</translation>
     </message>
 </context>
-<context>
-    <name>WalletFrame</name>
-    <message>
-        <source>No wallet has been loaded.</source>
-        <translation>Δεν έχει φορτωθεί πορτοφόλι</translation>
-    </message>
-</context>
-<context>
-    <name>WalletModel</name>
-    <message>
-        <source>Send Coins</source>
-        <translation>Αποστολή νομισμάτων</translation>
-    </message>
-</context>
-<context>
-    <name>WalletView</name>
-    <message>
-        <source>&amp;Export</source>
-        <translation>&amp;Εξαγωγή</translation>
-    </message>
-    <message>
-        <source>Export the data in the current tab to a file</source>
-        <translation>Εξαγωγή δεδομένων καρτέλας σε αρχείο</translation>
-    </message>
-    <message>
-        <source>Backup Wallet</source>
-        <translation>Αντίγραφο ασφαλείας του πορτοφολιού</translation>
-    </message>
-    <message>
-        <source>Wallet Data (*.dat)</source>
-        <translation>Αρχεία δεδομένων πορτοφολιού (*.dat)</translation>
-    </message>
-    <message>
-        <source>Backup Failed</source>
-        <translation>Αποτυχία κατά τη δημιουργία αντιγράφου</translation>
-    </message>
-    <message>
-        <source>There was an error trying to save the wallet data to %1.</source>
-        <translation>Παρουσιάστηκε σφάλμα κατά την αποθήκευση των δεδομένων πορτοφολιού στο %1.</translation>
-    </message>
-    <message>
-        <source>The wallet data was successfully saved to %1.</source>
-        <translation>Τα δεδομένα πορτοφολιού αποθηκεύτηκαν με επιτυχία στο %1.</translation>
-    </message>
-    <message>
-        <source>Backup Successful</source>
-        <translation>Η δημιουργια αντιγραφου ασφαλειας πετυχε</translation>
-    </message>
-</context>
 <context>
     <name>bitcoin-core</name>
     <message>
@@ -2539,6 +1411,10 @@
         <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
         <translation>Να δέχεσαι συνδέσεις από έξω(προεπιλογή:1)</translation>
     </message>
+    <message>
+        <source>Bitcoin Core</source>
+        <translation>Bitcoin Core</translation>
+    </message>
     <message>
         <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source>
         <translation>Αποθηκευση σε συγκεκριμένη διεύθυνση. Χρησιμοποιήστε τα πλήκτρα [Host] : συμβολισμός θύρα για IPv6</translation>
@@ -2551,10 +1427,6 @@
         <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
         <translation>Αυτό είναι ένα προ-τεστ κυκλοφορίας - χρησιμοποιήστε το με δική σας ευθύνη - δεν χρησιμοποιείτε για εξόρυξη ή για αλλες εφαρμογές</translation>
     </message>
-    <message>
-        <source>Warning: wallet.dat corrupt, data salvaged! Original wallet.dat saved as wallet.{timestamp}.bak in %s; if your balance or transactions are incorrect you should restore from a backup.</source>
-        <translation>Προειδοποίηση : το αρχειο wallet.dat ειναι διεφθαρμένο, τα δεδομένα σώζονται ! Original wallet.dat αποθηκεύονται ως wallet.{timestamp}.bak στο %s . Αν το υπόλοιπο του ή τις συναλλαγές σας, είναι λάθος θα πρέπει να επαναφέρετε από ένα αντίγραφο ασφαλείας</translation>
-    </message>
     <message>
         <source>Block creation options:</source>
         <translation>Αποκλεισμός επιλογων δημιουργίας: </translation>
@@ -2639,22 +1511,10 @@
         <source>Wallet options:</source>
         <translation>Επιλογές πορτοφολιού:</translation>
     </message>
-    <message>
-        <source>Cannot obtain a lock on data directory %s. Bitcoin Core is probably already running.</source>
-        <translation>Αδυναμία κλειδώματος του φακέλου δεδομένων %s. Πιθανώς το Bitcoin να είναι ήδη ενεργό.</translation>
-    </message>
     <message>
         <source>Connect through SOCKS5 proxy</source>
         <translation>Σύνδεση μέσω διαμεσολαβητή SOCKS5</translation>
     </message>
-    <message>
-        <source>Copyright (C) 2009-%i The Bitcoin Core Developers</source>
-        <translation>Πνευματικά δικαιώματα 2009-%i Οι προγραμματιστές του Bitcoin Core</translation>
-    </message>
-    <message>
-        <source>Error loading wallet.dat: Wallet requires newer version of Bitcoin Core</source>
-        <translation>Σφάλμα φόρτωσης wallet.dat: Το Πορτοφόλι απαιτεί μια νεότερη έκδοση του Bitcoin</translation>
-    </message>
     <message>
         <source>Error reading from database, shutting down.</source>
         <translation>Σφάλμα ανάγνωσης από τη βάση δεδομένων, γίνεται τερματισμός.</translation>
@@ -2663,22 +1523,6 @@
         <source>Information</source>
         <translation>Πληροφορία</translation>
     </message>
-    <message>
-        <source>Initialization sanity check failed. Bitcoin Core is shutting down.</source>
-        <translation>Η εκκίνηση ελέγχου ορθότητας απέτυχε.  Γίνεται τερματισμός του Bitcoin Core.</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -maxtxfee=&lt;amount&gt;: '%s'</source>
-        <translation>Μη έγκυρο ποσό για την παράμετρο -maxtxfee=&lt;amount&gt;: '%s'</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -minrelaytxfee=&lt;amount&gt;: '%s'</source>
-        <translation>Μη έγκυρο ποσό για την παράμετρο -paytxfee=&lt;amount&gt;: '%s'</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -mintxfee=&lt;amount&gt;: '%s'</source>
-        <translation>Μη έγκυρο ποσό για την παράμετρο -paytxfee=&lt;amount&gt;: '%s'</translation>
-    </message>
     <message>
         <source>Node relay options:</source>
         <translation>Επιλογές αναμετάδοσης κόμβου: </translation>
@@ -2731,10 +1575,6 @@
         <source>Zapping all transactions from wallet...</source>
         <translation>Μεταφορά όλων των συναλλαγών απο το πορτοφόλι</translation>
     </message>
-    <message>
-        <source>wallet.dat corrupt, salvage failed</source>
-        <translation>Το αρχειο wallet.dat ειναι διεφθαρμένο, η διάσωση απέτυχε</translation>
-    </message>
     <message>
         <source>Password for JSON-RPC connections</source>
         <translation>Κωδικός για τις συνδέσεις JSON-RPC</translation>
@@ -2743,10 +1583,6 @@
         <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
         <translation>Εκτέλεσε την εντολή όταν το καλύτερο μπλοκ αλλάξει(%s στην εντολή αντικαθίσταται από το hash του μπλοκ)</translation>
     </message>
-    <message>
-        <source>This help message</source>
-        <translation>Αυτό το κείμενο βοήθειας</translation>
-    </message>
     <message>
         <source>Allow DNS lookups for -addnode, -seednode and -connect</source>
         <translation>Να επιτρέπονται οι έλεγχοι DNS για προσθήκη και σύνδεση κόμβων</translation>
@@ -2755,10 +1591,6 @@
         <source>Loading addresses...</source>
         <translation>Φόρτωση διευθύνσεων...</translation>
     </message>
-    <message>
-        <source>Error loading wallet.dat: Wallet corrupted</source>
-        <translation>Σφάλμα φόρτωσης wallet.dat: Κατεστραμμένο Πορτοφόλι</translation>
-    </message>
     <message>
         <source>How thorough the block verification of -checkblocks is (0-4, default: %u)</source>
         <translation>Πόσο εξονυχιστική να είναι η επιβεβαίωση του μπλοκ (0-4, προεπιλογή: %u)</translation>
@@ -2771,14 +1603,6 @@
         <source>Number of seconds to keep misbehaving peers from reconnecting (default: %u)</source>
         <translation>Δευτερόλεπτα πριν επιτραπεί ξανά η σύνδεση των προβληματικών peers (προεπιλογή: %u)</translation>
     </message>
-    <message>
-        <source>Error loading wallet.dat</source>
-        <translation>Σφάλμα φόρτωσης αρχείου wallet.dat</translation>
-    </message>
-    <message>
-        <source>Generate coins (default: %u)</source>
-        <translation>Δημιουργία νομισμάτων (προκαθορισμος: %u)</translation>
-    </message>
     <message>
         <source>How many blocks to check at startup (default: %u, 0 = all)</source>
         <translation>Πόσα μπλοκ να ελέγχθουν κατά την εκκίνηση (προεπιλογή: %u, 0 = όλα)</translation>
@@ -2815,18 +1639,6 @@
         <source>Unknown network specified in -onlynet: '%s'</source>
         <translation>Άγνωστo δίκτυο ορίζεται σε onlynet: '%s'</translation>
     </message>
-    <message>
-        <source>Cannot resolve -bind address: '%s'</source>
-        <translation>Δεν μπορώ να γράψω την προεπιλεγμένη διεύθυνση: '%s'</translation>
-    </message>
-    <message>
-        <source>Cannot resolve -externalip address: '%s'</source>
-        <translation>Δεν μπορώ να γράψω την προεπιλεγμένη διεύθυνση: '%s'</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -paytxfee=&lt;amount&gt;: '%s'</source>
-        <translation>Μη έγκυρο ποσό για την παράμετρο -paytxfee=&lt;amount&gt;: '%s'</translation>
-    </message>
     <message>
         <source>Insufficient funds</source>
         <translation>Ανεπαρκές κεφάλαιο</translation>
diff --git a/src/qt/locale/bitcoin_en.ts b/src/qt/locale/bitcoin_en.ts
index 4e4c9f45e6ccd..9723ffa3949ba 100644
--- a/src/qt/locale/bitcoin_en.ts
+++ b/src/qt/locale/bitcoin_en.ts
@@ -1239,7 +1239,7 @@
     </message>
     <message>
         <location line="+2"/>
-        <location line="+44"/>
+        <location line="+47"/>
         <source>%1 s</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2224,7 +2224,7 @@
 <context>
     <name>UnitDisplayStatusBarControl</name>
     <message>
-        <location filename="../bitcoingui.cpp" line="+114"/>
+        <location filename="../bitcoingui.cpp" line="+116"/>
         <source>Unit to show amounts in. Click to select another unit.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2232,32 +2232,32 @@
 <context>
     <name>bitcoin-core</name>
     <message>
-        <location filename="../bitcoinstrings.cpp" line="+295"/>
+        <location filename="../bitcoinstrings.cpp" line="+298"/>
         <source>Options:</source>
         <translation>Options:</translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+31"/>
         <source>Specify data directory</source>
         <translation>Specify data directory</translation>
     </message>
     <message>
-        <location line="-88"/>
+        <location line="-90"/>
         <source>Connect to a node to retrieve peer addresses, and disconnect</source>
         <translation>Connect to a node to retrieve peer addresses, and disconnect</translation>
     </message>
     <message>
-        <location line="+91"/>
+        <location line="+93"/>
         <source>Specify your own public address</source>
         <translation>Specify your own public address</translation>
     </message>
     <message>
-        <location line="-107"/>
+        <location line="-109"/>
         <source>Accept command line and JSON-RPC commands</source>
         <translation>Accept command line and JSON-RPC commands</translation>
     </message>
     <message>
-        <location line="-131"/>
+        <location line="-134"/>
         <source>If &lt;category&gt; is not supplied or if &lt;category&gt; = 1, output all debugging information.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2282,7 +2282,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+122"/>
+        <location line="+125"/>
         <source>Error: A fatal internal error occurred, see debug.log for details</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2297,22 +2297,22 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+10"/>
         <source>Run in the background as a daemon and accept commands</source>
         <translation>Run in the background as a daemon and accept commands</translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+31"/>
         <source>Unable to start HTTP server. See debug log for details.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-120"/>
+        <location line="-122"/>
         <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
         <translation>Accept connections from outside (default: 1 if no -proxy or -connect)</translation>
     </message>
     <message>
-        <location line="-209"/>
+        <location line="-212"/>
         <source>Bitcoin Core</source>
         <translation type="unfinished">Bitcoin Core</translation>
     </message>
@@ -2412,7 +2412,12 @@
         <translation>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+13"/>
+        <source>Unable to rewind the database to a pre-fork state. You will need to redownload the blockchain</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
         <source>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2687,12 +2692,22 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+6"/>
+        <source>Rewinding blocks...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
         <source>Set database cache size in megabytes (%d to %d, default: %d)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+2"/>
+        <source>Set maximum block cost (default: %d)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
         <source>Set maximum block size in bytes (default: %d)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2767,7 +2782,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-323"/>
+        <location line="-328"/>
         <source>Allow JSON-RPC connections from specified source. Valid for &lt;ip&gt; are a single IP (e.g. 1.2.3.4), a network/netmask (e.g. 1.2.3.4/255.255.255.0) or a network/CIDR (e.g. 1.2.3.4/24). This option can be specified multiple times</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2847,7 +2862,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+18"/>
+        <location line="+21"/>
         <source>Use hierarchical deterministic key generation (HD) after BIP32. Only has effect during wallet creation/first start</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2937,7 +2952,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="+4"/>
         <source>Send trace/debug info to console instead of debug.log file</source>
         <translation>Send trace/debug info to console instead of debug.log file</translation>
     </message>
@@ -2947,7 +2962,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+7"/>
         <source>Show all debugging options (usage: --help -help-debug)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3042,17 +3057,17 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-64"/>
+        <location line="-66"/>
         <source>Password for JSON-RPC connections</source>
         <translation>Password for JSON-RPC connections</translation>
     </message>
     <message>
-        <location line="-221"/>
+        <location line="-224"/>
         <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
         <translation>Execute command when the best block changes (%s in cmd is replaced by block hash)</translation>
     </message>
     <message>
-        <location line="+149"/>
+        <location line="+152"/>
         <source>Allow DNS lookups for -addnode, -seednode and -connect</source>
         <translation>Allow DNS lookups for -addnode, -seednode and -connect</translation>
     </message>
@@ -3062,7 +3077,7 @@
         <translation>Loading addresses...</translation>
     </message>
     <message>
-        <location line="-267"/>
+        <location line="-270"/>
         <source>(1 = keep tx meta data e.g. account owner and payment request information, 2 = drop tx meta data)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3122,7 +3137,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="+6"/>
         <source>Unsupported argument -socks found. Setting SOCKS version isn&apos;t possible anymore, only SOCKS5 proxies are supported.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3222,12 +3237,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+8"/>
         <source>Set key pool size to &lt;n&gt; (default: %u)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+3"/>
         <source>Set minimum block size in bytes (default: %u)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3267,7 +3282,7 @@
         <translation>Unknown network specified in -onlynet: &apos;%s&apos;</translation>
     </message>
     <message>
-        <location line="-72"/>
+        <location line="-74"/>
         <source>Insufficient funds</source>
         <translation>Insufficient funds</translation>
     </message>
diff --git a/src/qt/locale/bitcoin_en_GB.ts b/src/qt/locale/bitcoin_en_GB.ts
index b9c0c82814a54..89653e7aafd69 100644
--- a/src/qt/locale/bitcoin_en_GB.ts
+++ b/src/qt/locale/bitcoin_en_GB.ts
@@ -25,10 +25,6 @@
         <source>C&amp;lose</source>
         <translation>C&amp;lose</translation>
     </message>
-    <message>
-        <source>&amp;Copy Address</source>
-        <translation>&amp;Copy Address</translation>
-    </message>
     <message>
         <source>Delete the currently selected address from the list</source>
         <translation>Delete the currently selected address from the list</translation>
@@ -45,73 +41,6 @@
         <source>&amp;Delete</source>
         <translation>&amp;Delete</translation>
     </message>
-    <message>
-        <source>Choose the address to send coins to</source>
-        <translation>Choose the address to send coins to</translation>
-    </message>
-    <message>
-        <source>Choose the address to receive coins with</source>
-        <translation>Choose the address to receive coins with</translation>
-    </message>
-    <message>
-        <source>C&amp;hoose</source>
-        <translation>C&amp;hoose</translation>
-    </message>
-    <message>
-        <source>Sending addresses</source>
-        <translation>Sending addresses</translation>
-    </message>
-    <message>
-        <source>Receiving addresses</source>
-        <translation>Receiving addresses</translation>
-    </message>
-    <message>
-        <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source>
-        <translation>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</translation>
-    </message>
-    <message>
-        <source>These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source>
-        <translation>These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</translation>
-    </message>
-    <message>
-        <source>Copy &amp;Label</source>
-        <translation>Copy &amp;Label</translation>
-    </message>
-    <message>
-        <source>&amp;Edit</source>
-        <translation>&amp;Edit</translation>
-    </message>
-    <message>
-        <source>Export Address List</source>
-        <translation>Export Address List</translation>
-    </message>
-    <message>
-        <source>Comma separated file (*.csv)</source>
-        <translation>Comma separated file (*.csv)</translation>
-    </message>
-    <message>
-        <source>Exporting Failed</source>
-        <translation>Exporting Failed</translation>
-    </message>
-    <message>
-        <source>There was an error trying to save the address list to %1. Please try again.</source>
-        <translation>There was an error trying to save the address list to %1. Please try again.</translation>
-    </message>
-</context>
-<context>
-    <name>AddressTableModel</name>
-    <message>
-        <source>Label</source>
-        <translation>Label</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>Address</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(no label)</translation>
-    </message>
 </context>
 <context>
     <name>AskPassphraseDialog</name>
@@ -131,94 +60,6 @@
         <source>Repeat new passphrase</source>
         <translation>Repeat new passphrase</translation>
     </message>
-    <message>
-        <source>Encrypt wallet</source>
-        <translation>Encrypt wallet</translation>
-    </message>
-    <message>
-        <source>This operation needs your wallet passphrase to unlock the wallet.</source>
-        <translation>This operation needs your wallet passphrase to unlock the wallet.</translation>
-    </message>
-    <message>
-        <source>Unlock wallet</source>
-        <translation>Unlock wallet</translation>
-    </message>
-    <message>
-        <source>This operation needs your wallet passphrase to decrypt the wallet.</source>
-        <translation>This operation needs your wallet passphrase to decrypt the wallet.</translation>
-    </message>
-    <message>
-        <source>Decrypt wallet</source>
-        <translation>Decrypt wallet</translation>
-    </message>
-    <message>
-        <source>Change passphrase</source>
-        <translation>Change passphrase</translation>
-    </message>
-    <message>
-        <source>Confirm wallet encryption</source>
-        <translation>Confirm wallet encryption</translation>
-    </message>
-    <message>
-        <source>Warning: If you encrypt your wallet and lose your passphrase, you will &lt;b&gt;LOSE ALL OF YOUR BITCOINS&lt;/b&gt;!</source>
-        <translation>Warning: If you encrypt your wallet and lose your passphrase, you will &lt;b&gt;LOSE ALL OF YOUR BITCOINS&lt;/b&gt;!</translation>
-    </message>
-    <message>
-        <source>Are you sure you wish to encrypt your wallet?</source>
-        <translation>Are you sure you wish to encrypt your wallet?</translation>
-    </message>
-    <message>
-        <source>Bitcoin Core will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source>
-        <translation>Bitcoin Core will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</translation>
-    </message>
-    <message>
-        <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source>
-        <translation>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</translation>
-    </message>
-    <message>
-        <source>Warning: The Caps Lock key is on!</source>
-        <translation>Warning: The Caps Lock key is on!</translation>
-    </message>
-    <message>
-        <source>Wallet encrypted</source>
-        <translation>Wallet encrypted</translation>
-    </message>
-    <message>
-        <source>Enter the new passphrase to the wallet.&lt;br/&gt;Please use a passphrase of &lt;b&gt;ten or more random characters&lt;/b&gt;, or &lt;b&gt;eight or more words&lt;/b&gt;.</source>
-        <translation>Enter the new passphrase to the wallet.&lt;br/&gt;Please use a passphrase of &lt;b&gt;ten or more random characters&lt;/b&gt;, or &lt;b&gt;eight or more words&lt;/b&gt;.</translation>
-    </message>
-    <message>
-        <source>Enter the old passphrase and new passphrase to the wallet.</source>
-        <translation>Enter the old passphrase and new passphrase to the wallet.</translation>
-    </message>
-    <message>
-        <source>Wallet encryption failed</source>
-        <translation>Wallet encryption failed</translation>
-    </message>
-    <message>
-        <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
-        <translation>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</translation>
-    </message>
-    <message>
-        <source>The supplied passphrases do not match.</source>
-        <translation>The supplied passphrases do not match.</translation>
-    </message>
-    <message>
-        <source>Wallet unlock failed</source>
-        <translation>Wallet unlock failed</translation>
-    </message>
-    <message>
-        <source>The passphrase entered for the wallet decryption was incorrect.</source>
-        <translation>The passphrase entered for the wallet decryption was incorrect.</translation>
-    </message>
-    <message>
-        <source>Wallet decryption failed</source>
-        <translation>Wallet decryption failed</translation>
-    </message>
-    <message>
-        <source>Wallet passphrase was successfully changed.</source>
-        <translation>Wallet passphrase was successfully changed.</translation>
-    </message>
 </context>
 <context>
     <name>BanTableModel</name>
@@ -269,6 +110,14 @@
         <source>Quit application</source>
         <translation>Quit application</translation>
     </message>
+    <message>
+        <source>&amp;About %1</source>
+        <translation>&amp;About %1</translation>
+    </message>
+    <message>
+        <source>Show information about %1</source>
+        <translation>Show information about %1</translation>
+    </message>
     <message>
         <source>About &amp;Qt</source>
         <translation>About &amp;Qt</translation>
@@ -281,6 +130,10 @@
         <source>&amp;Options...</source>
         <translation>&amp;Options...</translation>
     </message>
+    <message>
+        <source>Modify configuration options for %1</source>
+        <translation>Modify configuration options for %1</translation>
+    </message>
     <message>
         <source>&amp;Encrypt Wallet...</source>
         <translation>&amp;Encrypt Wallet...</translation>
@@ -305,14 +158,6 @@
         <source>Open &amp;URI...</source>
         <translation>Open &amp;URI...</translation>
     </message>
-    <message>
-        <source>Bitcoin Core client</source>
-        <translation>Bitcoin Core client</translation>
-    </message>
-    <message>
-        <source>Importing blocks from disk...</source>
-        <translation>Importing blocks from disk...</translation>
-    </message>
     <message>
         <source>Reindexing blocks on disk...</source>
         <translation>Reindexing blocks on disk...</translation>
@@ -357,10 +202,6 @@
         <source>&amp;Receive</source>
         <translation>&amp;Receive</translation>
     </message>
-    <message>
-        <source>Show information about Bitcoin Core</source>
-        <translation>Show information about Bitcoin Core</translation>
-    </message>
     <message>
         <source>&amp;Show / Hide</source>
         <translation>&amp;Show / Hide</translation>
@@ -397,22 +238,10 @@
         <source>Tabs toolbar</source>
         <translation>Tabs toolbar</translation>
     </message>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Bitcoin Core</translation>
-    </message>
     <message>
         <source>Request payments (generates QR codes and bitcoin: URIs)</source>
         <translation>Request payments (generates QR codes and bitcoin: URIs)</translation>
     </message>
-    <message>
-        <source>&amp;About Bitcoin Core</source>
-        <translation>&amp;About Bitcoin Core</translation>
-    </message>
-    <message>
-        <source>Modify configuration options for Bitcoin Core</source>
-        <translation>Modify configuration options for Bitcoin Core</translation>
-    </message>
     <message>
         <source>Show the list of used sending addresses and labels</source>
         <translation>Show the list of used sending addresses and labels</translation>
@@ -429,14 +258,18 @@
         <source>&amp;Command-line options</source>
         <translation>&amp;Command-line options</translation>
     </message>
-    <message>
-        <source>Show the Bitcoin Core help message to get a list with possible Bitcoin command-line options</source>
-        <translation>Show the Bitcoin Core help message to get a list with possible Bitcoin command-line options</translation>
-    </message>
     <message numerus="yes">
         <source>%n active connection(s) to Bitcoin network</source>
         <translation><numerusform>%n active connection to Bitcoin network</numerusform><numerusform>%n active connections to Bitcoin network</numerusform></translation>
     </message>
+    <message>
+        <source>Indexing blocks on disk...</source>
+        <translation>Indexing blocks on disk...</translation>
+    </message>
+    <message>
+        <source>Processing blocks on disk...</source>
+        <translation>Processing blocks on disk...</translation>
+    </message>
     <message>
         <source>No block source available...</source>
         <translation>No block source available...</translation>
@@ -493,6 +326,14 @@
         <source>Up to date</source>
         <translation>Up to date</translation>
     </message>
+    <message>
+        <source>Show the %1 help message to get a list with possible Bitcoin command-line options</source>
+        <translation>Show the %1 help message to get a list with possible Bitcoin command-line options</translation>
+    </message>
+    <message>
+        <source>%1 client</source>
+        <translation>%1 client</translation>
+    </message>
     <message>
         <source>Catching up...</source>
         <translation>Catching up...</translation>
@@ -544,13 +385,6 @@
         <translation>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;locked&lt;/b&gt;</translation>
     </message>
 </context>
-<context>
-    <name>ClientModel</name>
-    <message>
-        <source>Network Alert</source>
-        <translation>Network Alert</translation>
-    </message>
-</context>
 <context>
     <name>CoinControlDialog</name>
     <message>
@@ -629,150 +463,6 @@
         <source>Priority</source>
         <translation>Priority</translation>
     </message>
-    <message>
-        <source>Copy address</source>
-        <translation>Copy address</translation>
-    </message>
-    <message>
-        <source>Copy label</source>
-        <translation>Copy label</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>Copy amount</translation>
-    </message>
-    <message>
-        <source>Copy transaction ID</source>
-        <translation>Copy transaction ID</translation>
-    </message>
-    <message>
-        <source>Lock unspent</source>
-        <translation>Lock unspent</translation>
-    </message>
-    <message>
-        <source>Unlock unspent</source>
-        <translation>Unlock unspent</translation>
-    </message>
-    <message>
-        <source>Copy quantity</source>
-        <translation>Copy quantity</translation>
-    </message>
-    <message>
-        <source>Copy fee</source>
-        <translation>Copy fee</translation>
-    </message>
-    <message>
-        <source>Copy after fee</source>
-        <translation>Copy after fee</translation>
-    </message>
-    <message>
-        <source>Copy bytes</source>
-        <translation>Copy bytes</translation>
-    </message>
-    <message>
-        <source>Copy priority</source>
-        <translation>Copy priority</translation>
-    </message>
-    <message>
-        <source>Copy dust</source>
-        <translation>Copy dust</translation>
-    </message>
-    <message>
-        <source>Copy change</source>
-        <translation>Copy change</translation>
-    </message>
-    <message>
-        <source>highest</source>
-        <translation>highest</translation>
-    </message>
-    <message>
-        <source>higher</source>
-        <translation>higher</translation>
-    </message>
-    <message>
-        <source>high</source>
-        <translation>high</translation>
-    </message>
-    <message>
-        <source>medium-high</source>
-        <translation>medium-high</translation>
-    </message>
-    <message>
-        <source>medium</source>
-        <translation>medium</translation>
-    </message>
-    <message>
-        <source>low-medium</source>
-        <translation>low-medium</translation>
-    </message>
-    <message>
-        <source>low</source>
-        <translation>low</translation>
-    </message>
-    <message>
-        <source>lower</source>
-        <translation>lower</translation>
-    </message>
-    <message>
-        <source>lowest</source>
-        <translation>lowest</translation>
-    </message>
-    <message>
-        <source>(%1 locked)</source>
-        <translation>(%1 locked)</translation>
-    </message>
-    <message>
-        <source>none</source>
-        <translation>none</translation>
-    </message>
-    <message>
-        <source>This label turns red if the transaction size is greater than 1000 bytes.</source>
-        <translation>This label turns red if the transaction size is greater than 1000 bytes.</translation>
-    </message>
-    <message>
-        <source>This label turns red if the priority is smaller than "medium".</source>
-        <translation>This label turns red if the priority is smaller than "medium".</translation>
-    </message>
-    <message>
-        <source>This label turns red if any recipient receives an amount smaller than %1.</source>
-        <translation>This label turns red if any recipient receives an amount smaller than %1.</translation>
-    </message>
-    <message>
-        <source>Can vary +/- %1 satoshi(s) per input.</source>
-        <translation>Can vary +/- %1 satoshi(s) per input.</translation>
-    </message>
-    <message>
-        <source>yes</source>
-        <translation>yes</translation>
-    </message>
-    <message>
-        <source>no</source>
-        <translation>no</translation>
-    </message>
-    <message>
-        <source>This means a fee of at least %1 per kB is required.</source>
-        <translation>This means a fee of at least %1 per kB is required.</translation>
-    </message>
-    <message>
-        <source>Can vary +/- 1 byte per input.</source>
-        <translation>Can vary +/- 1 byte per input.</translation>
-    </message>
-    <message>
-        <source>Transactions with higher priority are more likely to get included into a block.</source>
-        <translation>Transactions with higher priority are more likely to get included into a block.</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(no label)</translation>
-    </message>
-    <message>
-        <source>change from %1 (%2)</source>
-        <translation>change from %1 (%2)</translation>
-    </message>
-    <message>
-        <source>(change)</source>
-        <translation>(change)</translation>
-    </message>
 </context>
 <context>
     <name>EditAddressDialog</name>
@@ -796,38 +486,6 @@
         <source>&amp;Address</source>
         <translation>&amp;Address</translation>
     </message>
-    <message>
-        <source>New receiving address</source>
-        <translation>New receiving address</translation>
-    </message>
-    <message>
-        <source>New sending address</source>
-        <translation>New sending address</translation>
-    </message>
-    <message>
-        <source>Edit receiving address</source>
-        <translation>Edit receiving address</translation>
-    </message>
-    <message>
-        <source>Edit sending address</source>
-        <translation>Edit sending address</translation>
-    </message>
-    <message>
-        <source>The entered address "%1" is already in the address book.</source>
-        <translation>The entered address "%1" is already in the address book.</translation>
-    </message>
-    <message>
-        <source>The entered address "%1" is not a valid Bitcoin address.</source>
-        <translation>The entered address "%1" is not a valid Bitcoin address.</translation>
-    </message>
-    <message>
-        <source>Could not unlock wallet.</source>
-        <translation>Could not unlock wallet.</translation>
-    </message>
-    <message>
-        <source>New key generation failed.</source>
-        <translation>New key generation failed.</translation>
-    </message>
 </context>
 <context>
     <name>FreespaceChecker</name>
@@ -854,10 +512,6 @@
 </context>
 <context>
     <name>HelpMessageDialog</name>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Bitcoin Core</translation>
-    </message>
     <message>
         <source>version</source>
         <translation>version</translation>
@@ -867,8 +521,8 @@
         <translation>(%1-bit)</translation>
     </message>
     <message>
-        <source>About Bitcoin Core</source>
-        <translation>About Bitcoin Core</translation>
+        <source>About %1</source>
+        <translation>About %1</translation>
     </message>
     <message>
         <source>Command-line options</source>
@@ -907,8 +561,8 @@
         <translation>Show splash screen on startup (default: %u)</translation>
     </message>
     <message>
-        <source>Reset all settings changes made over the GUI</source>
-        <translation>Reset all setting changes made via the GUI</translation>
+        <source>Reset all settings changed in the GUI</source>
+        <translation>Reset all settings changed in the GUI</translation>
     </message>
 </context>
 <context>
@@ -918,16 +572,16 @@
         <translation>Welcome</translation>
     </message>
     <message>
-        <source>Welcome to Bitcoin Core.</source>
-        <translation>Welcome to Bitcoin Core.</translation>
+        <source>Welcome to %1.</source>
+        <translation>Welcome to %1.</translation>
     </message>
     <message>
-        <source>As this is the first time the program is launched, you can choose where Bitcoin Core will store its data.</source>
-        <translation>As this is the first time the program is launched, you can choose where Bitcoin Core will store its data.</translation>
+        <source>As this is the first time the program is launched, you can choose where %1 will store its data.</source>
+        <translation>As this is the first time the program is launched, you can choose where %1 will store its data.</translation>
     </message>
     <message>
-        <source>Bitcoin Core will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source>
-        <translation>Bitcoin Core will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</translation>
+        <source>%1 will download and store a copy of the Bitcoin block chain. At least %2GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source>
+        <translation>%1 will download and store a copy of the Bitcoin block chain. At least %2GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</translation>
     </message>
     <message>
         <source>Use the default data directory</source>
@@ -937,10 +591,6 @@
         <source>Use a custom data directory:</source>
         <translation>Use a custom data directory:</translation>
     </message>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Bitcoin Core</translation>
-    </message>
     <message>
         <source>Error: Specified data directory "%1" cannot be created.</source>
         <translation>Error: Specified data directory "%1" cannot be created.</translation>
@@ -976,10 +626,6 @@
         <source>Select payment request file</source>
         <translation>Select payment request file</translation>
     </message>
-    <message>
-        <source>Select payment request file to open</source>
-        <translation>Select payment request file to open</translation>
-    </message>
 </context>
 <context>
     <name>OptionsDialog</name>
@@ -991,6 +637,14 @@
         <source>&amp;Main</source>
         <translation>&amp;Main</translation>
     </message>
+    <message>
+        <source>Automatically start %1 after logging in to the system.</source>
+        <translation>Automatically start %1 after logging in to the system.</translation>
+    </message>
+    <message>
+        <source>&amp;Start %1 on system login</source>
+        <translation>&amp;Start %1 on system login</translation>
+    </message>
     <message>
         <source>Size of &amp;database cache</source>
         <translation>Size of &amp;database cache</translation>
@@ -1019,10 +673,6 @@
         <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Exit in the menu.</source>
         <translation>Minimise instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Exit in the menu.</translation>
     </message>
-    <message>
-        <source>The user interface language can be set here. This setting will take effect after restarting Bitcoin Core.</source>
-        <translation>The user interface language can be set here. This setting will take effect after restarting Bitcoin Core.</translation>
-    </message>
     <message>
         <source>Third party URLs (e.g. a block explorer) that appear in the transactions tab as context menu items. %s in the URL is replaced by transaction hash. Multiple URLs are separated by vertical bar |.</source>
         <translation>Third party URLs (e.g. a block explorer) that appear in the transactions tab as context menu items. %s in the URL is replaced by transaction hash. Multiple URLs are separated by vertical bar |.</translation>
@@ -1047,14 +697,6 @@
         <source>&amp;Network</source>
         <translation>&amp;Network</translation>
     </message>
-    <message>
-        <source>Automatically start Bitcoin Core after logging in to the system.</source>
-        <translation>Automatically start Bitcoin Core after logging in to the system.</translation>
-    </message>
-    <message>
-        <source>&amp;Start Bitcoin Core on system login</source>
-        <translation>&amp;Start Bitcoin Core on system login</translation>
-    </message>
     <message>
         <source>(0 = auto, &lt;0 = leave that many cores free)</source>
         <translation>(0 = auto, &lt;0 = leave that many cores free)</translation>
@@ -1139,6 +781,14 @@
         <source>&amp;Window</source>
         <translation>&amp;Window</translation>
     </message>
+    <message>
+        <source>&amp;Hide the icon from the system tray.</source>
+        <translation>&amp;Hide the icon from the system tray.</translation>
+    </message>
+    <message>
+        <source>Hide tray icon</source>
+        <translation>Hide tray icon</translation>
+    </message>
     <message>
         <source>Show only a tray icon after minimizing the window.</source>
         <translation>Show on a tray icon after minimising the window.</translation>
@@ -1159,6 +809,10 @@
         <source>User Interface &amp;language:</source>
         <translation>User Interface &amp;language:</translation>
     </message>
+    <message>
+        <source>The user interface language can be set here. This setting will take effect after restarting %1.</source>
+        <translation>The user interface language can be set here. This setting will take effect after restarting %1.</translation>
+    </message>
     <message>
         <source>&amp;Unit to show amounts in:</source>
         <translation>&amp;Unit to show amounts in:</translation>
@@ -1284,169 +938,59 @@
     </message>
 </context>
 <context>
-    <name>PaymentServer</name>
+    <name>PeerTableModel</name>
     <message>
-        <source>URI handling</source>
-        <translation>URI handling</translation>
+        <source>User Agent</source>
+        <translation>User Agent</translation>
     </message>
     <message>
-        <source>Invalid payment address %1</source>
-        <translation>Invalid payment address %1</translation>
+        <source>Node/Service</source>
+        <translation>Node/Service</translation>
     </message>
     <message>
-        <source>Payment request rejected</source>
-        <translation>Payment request rejected</translation>
+        <source>Ping Time</source>
+        <translation>Ping Time</translation>
     </message>
+</context>
+<context>
+    <name>QObject</name>
     <message>
-        <source>Payment request network doesn't match client network.</source>
-        <translation>Payment request network doesn't match client network.</translation>
+        <source>Amount</source>
+        <translation>Amount</translation>
     </message>
     <message>
-        <source>Payment request is not initialized.</source>
-        <translation>Payment request is not initialised.</translation>
+        <source>Enter a Bitcoin address (e.g. %1)</source>
+        <translation>Enter a Bitcoin address (e.g. %1)</translation>
     </message>
     <message>
-        <source>Requested payment amount of %1 is too small (considered dust).</source>
-        <translation>Requested payment amount of %1 is too small (considered dust).</translation>
+        <source>%1 d</source>
+        <translation>%1 d</translation>
     </message>
     <message>
-        <source>Payment request error</source>
-        <translation>Payment request error</translation>
+        <source>%1 h</source>
+        <translation>%1 h</translation>
     </message>
     <message>
-        <source>Cannot start bitcoin: click-to-pay handler</source>
-        <translation>Cannot start bitcoin: click-to-pay handler</translation>
+        <source>%1 m</source>
+        <translation>%1 m</translation>
     </message>
     <message>
-        <source>Payment request fetch URL is invalid: %1</source>
-        <translation>Payment request fetch URL is invalid: %1</translation>
+        <source>%1 s</source>
+        <translation>%1 s</translation>
     </message>
     <message>
-        <source>URI cannot be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source>
-        <translation>URI cannot be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</translation>
+        <source>None</source>
+        <translation>None</translation>
     </message>
     <message>
-        <source>Payment request file handling</source>
-        <translation>Payment request file handling</translation>
-    </message>
-    <message>
-        <source>Payment request file cannot be read! This can be caused by an invalid payment request file.</source>
-        <translation>Payment request file cannot be read! This can be caused by an invalid payment request file.</translation>
-    </message>
-    <message>
-        <source>Payment request expired.</source>
-        <translation>Payment request expired.</translation>
-    </message>
-    <message>
-        <source>Unverified payment requests to custom payment scripts are unsupported.</source>
-        <translation>Unverified payment requests to custom payment scripts are unsupported.</translation>
-    </message>
-    <message>
-        <source>Invalid payment request.</source>
-        <translation>Invalid payment request.</translation>
-    </message>
-    <message>
-        <source>Refund from %1</source>
-        <translation>Refund from %1</translation>
-    </message>
-    <message>
-        <source>Payment request %1 is too large (%2 bytes, allowed %3 bytes).</source>
-        <translation>Payment request %1 is too large (%2 bytes, allowed %3 bytes).</translation>
-    </message>
-    <message>
-        <source>Error communicating with %1: %2</source>
-        <translation>Error communicating with %1: %2</translation>
-    </message>
-    <message>
-        <source>Payment request cannot be parsed!</source>
-        <translation>Payment request cannot be parsed!</translation>
-    </message>
-    <message>
-        <source>Bad response from server %1</source>
-        <translation>Bad response from server %1</translation>
-    </message>
-    <message>
-        <source>Payment acknowledged</source>
-        <translation>Payment acknowledged</translation>
-    </message>
-    <message>
-        <source>Network request error</source>
-        <translation>Network request error</translation>
-    </message>
-</context>
-<context>
-    <name>PeerTableModel</name>
-    <message>
-        <source>User Agent</source>
-        <translation>User Agent</translation>
-    </message>
-    <message>
-        <source>Node/Service</source>
-        <translation>Node/Service</translation>
-    </message>
-    <message>
-        <source>Ping Time</source>
-        <translation>Ping Time</translation>
-    </message>
-</context>
-<context>
-    <name>QObject</name>
-    <message>
-        <source>Amount</source>
-        <translation>Amount</translation>
-    </message>
-    <message>
-        <source>Enter a Bitcoin address (e.g. %1)</source>
-        <translation>Enter a Bitcoin address (e.g. %1)</translation>
-    </message>
-    <message>
-        <source>%1 d</source>
-        <translation>%1 d</translation>
-    </message>
-    <message>
-        <source>%1 h</source>
-        <translation>%1 h</translation>
-    </message>
-    <message>
-        <source>%1 m</source>
-        <translation>%1 m</translation>
-    </message>
-    <message>
-        <source>%1 s</source>
-        <translation>%1 s</translation>
-    </message>
-    <message>
-        <source>None</source>
-        <translation>None</translation>
-    </message>
-    <message>
-        <source>N/A</source>
-        <translation>N/A</translation>
+        <source>N/A</source>
+        <translation>N/A</translation>
     </message>
     <message>
         <source>%1 ms</source>
         <translation>%1 ms</translation>
     </message>
 </context>
-<context>
-    <name>QRImageWidget</name>
-    <message>
-        <source>&amp;Save Image...</source>
-        <translation>&amp;Save Image...</translation>
-    </message>
-    <message>
-        <source>&amp;Copy Image</source>
-        <translation>&amp;Copy Image</translation>
-    </message>
-    <message>
-        <source>Save QR Code</source>
-        <translation>Save QR Code</translation>
-    </message>
-    <message>
-        <source>PNG Image (*.png)</source>
-        <translation>PNG Image (*.png)</translation>
-    </message>
-</context>
 <context>
     <name>RPCConsole</name>
     <message>
@@ -1477,6 +1021,10 @@
         <source>Using BerkeleyDB version</source>
         <translation>Using BerkeleyDB version</translation>
     </message>
+    <message>
+        <source>Datadir</source>
+        <translation>Datadir</translation>
+    </message>
     <message>
         <source>Startup time</source>
         <translation>Startup time</translation>
@@ -1513,10 +1061,6 @@
         <source>Memory usage</source>
         <translation>Memory usage</translation>
     </message>
-    <message>
-        <source>Open the Bitcoin Core debug log file from the current data directory. This can take a few seconds for large log files.</source>
-        <translation>Open the Bitcoin Core debug log file from the current data directory. This can take a few seconds for large log files.</translation>
-    </message>
     <message>
         <source>Received</source>
         <translation>Received</translation>
@@ -1565,6 +1109,18 @@
         <source>User Agent</source>
         <translation>User Agent</translation>
     </message>
+    <message>
+        <source>Open the %1 debug log file from the current data directory. This can take a few seconds for large log files.</source>
+        <translation>Open the %1 debug log file from the current data directory. This can take a few seconds for large log files.</translation>
+    </message>
+    <message>
+        <source>Decrease font size</source>
+        <translation>Decrease font size</translation>
+    </message>
+    <message>
+        <source>Increase font size</source>
+        <translation>Increase font size</translation>
+    </message>
     <message>
         <source>Services</source>
         <translation>Services</translation>
@@ -1633,10 +1189,6 @@
         <source>Out:</source>
         <translation>Out:</translation>
     </message>
-    <message>
-        <source>Build date</source>
-        <translation>Build date</translation>
-    </message>
     <message>
         <source>Debug log file</source>
         <translation>Debug log file</translation>
@@ -1674,8 +1226,8 @@
         <translation>&amp;Unban Node</translation>
     </message>
     <message>
-        <source>Welcome to the Bitcoin Core RPC console.</source>
-        <translation>Welcome to the Bitcoin Core RPC console.</translation>
+        <source>Welcome to the %1 RPC console.</source>
+        <translation>Welcome to the %1 RPC console.</translation>
     </message>
     <message>
         <source>Use up and down arrows to navigate history, and &lt;b&gt;Ctrl-L&lt;/b&gt; to clear screen.</source>
@@ -1804,18 +1356,6 @@
         <source>Remove</source>
         <translation>Remove</translation>
     </message>
-    <message>
-        <source>Copy label</source>
-        <translation>Copy label</translation>
-    </message>
-    <message>
-        <source>Copy message</source>
-        <translation>Copy message</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>Copy amount</translation>
-    </message>
 </context>
 <context>
     <name>ReceiveRequestDialog</name>
@@ -1835,73 +1375,6 @@
         <source>&amp;Save Image...</source>
         <translation>&amp;Save Image...</translation>
     </message>
-    <message>
-        <source>Request payment to %1</source>
-        <translation>Request payment to %1</translation>
-    </message>
-    <message>
-        <source>Payment information</source>
-        <translation>Payment information</translation>
-    </message>
-    <message>
-        <source>URI</source>
-        <translation>URI</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>Address</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>Amount</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Label</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>Message</translation>
-    </message>
-    <message>
-        <source>Resulting URI too long, try to reduce the text for label / message.</source>
-        <translation>Resulting URI too long, try to reduce the text for label / message.</translation>
-    </message>
-    <message>
-        <source>Error encoding URI into QR Code.</source>
-        <translation>Error encoding URI into QR Code.</translation>
-    </message>
-</context>
-<context>
-    <name>RecentRequestsTableModel</name>
-    <message>
-        <source>Date</source>
-        <translation>Date</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Label</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>Message</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>Amount</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(no label)</translation>
-    </message>
-    <message>
-        <source>(no message)</source>
-        <translation>(no message)</translation>
-    </message>
-    <message>
-        <source>(no amount)</source>
-        <translation>(no amount)</translation>
-    </message>
 </context>
 <context>
     <name>SendCoinsDialog</name>
@@ -2021,14 +1494,6 @@
         <source>fast</source>
         <translation>fast</translation>
     </message>
-    <message>
-        <source>Send as zero-fee transaction if possible</source>
-        <translation>Send as zero-fee transaction if possible</translation>
-    </message>
-    <message>
-        <source>(confirmation may take longer)</source>
-        <translation>(confirmation may take longer)</translation>
-    </message>
     <message>
         <source>Send to multiple recipients at once</source>
         <translation>Send to multiple recipients at once</translation>
@@ -2061,118 +1526,6 @@
         <source>S&amp;end</source>
         <translation>S&amp;end</translation>
     </message>
-    <message>
-        <source>Confirm send coins</source>
-        <translation>Confirm send coins</translation>
-    </message>
-    <message>
-        <source>%1 to %2</source>
-        <translation>%1 to %2</translation>
-    </message>
-    <message>
-        <source>Copy quantity</source>
-        <translation>Copy quantity</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>Copy amount</translation>
-    </message>
-    <message>
-        <source>Copy fee</source>
-        <translation>Copy fee</translation>
-    </message>
-    <message>
-        <source>Copy after fee</source>
-        <translation>Copy after fee</translation>
-    </message>
-    <message>
-        <source>Copy bytes</source>
-        <translation>Copy bytes</translation>
-    </message>
-    <message>
-        <source>Copy priority</source>
-        <translation>Copy priority</translation>
-    </message>
-    <message>
-        <source>Copy change</source>
-        <translation>Copy change</translation>
-    </message>
-    <message>
-        <source>Total Amount %1</source>
-        <translation>Total Amount %1</translation>
-    </message>
-    <message>
-        <source>or</source>
-        <translation>or</translation>
-    </message>
-    <message>
-        <source>The amount to pay must be larger than 0.</source>
-        <translation>The amount to pay must be larger than 0.</translation>
-    </message>
-    <message>
-        <source>The amount exceeds your balance.</source>
-        <translation>The amount exceeds your balance.</translation>
-    </message>
-    <message>
-        <source>The total exceeds your balance when the %1 transaction fee is included.</source>
-        <translation>The total exceeds your balance when the %1 transaction fee is included.</translation>
-    </message>
-    <message>
-        <source>Transaction creation failed!</source>
-        <translation>Transaction creation failed!</translation>
-    </message>
-    <message>
-        <source>The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source>
-        <translation>The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</translation>
-    </message>
-    <message>
-        <source>A fee higher than %1 is considered an absurdly high fee.</source>
-        <translation>A fee higher than %1 is considered an absurdly high fee.</translation>
-    </message>
-    <message>
-        <source>Payment request expired.</source>
-        <translation>Payment request expired.</translation>
-    </message>
-    <message>
-        <source>Pay only the required fee of %1</source>
-        <translation>Pay only the required fee of %1</translation>
-    </message>
-    <message numerus="yes">
-        <source>Estimated to begin confirmation within %n block(s).</source>
-        <translation><numerusform>Estimated to begin confirmation within %n block.</numerusform><numerusform>Estimated to begin confirmation within %n blocks.</numerusform></translation>
-    </message>
-    <message>
-        <source>The recipient address is not valid. Please recheck.</source>
-        <translation>The recipient address is not valid. Please recheck.</translation>
-    </message>
-    <message>
-        <source>Duplicate address found: addresses should only be used once each.</source>
-        <translation>Duplicate address found: addresses should only be used once each.</translation>
-    </message>
-    <message>
-        <source>Warning: Invalid Bitcoin address</source>
-        <translation>Warning: Invalid Bitcoin address</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(no label)</translation>
-    </message>
-    <message>
-        <source>Warning: Unknown change address</source>
-        <translation>Warning: Unknown change address</translation>
-    </message>
-    <message>
-        <source>Copy dust</source>
-        <translation>Copy dust</translation>
-    </message>
-    <message>
-        <source>Are you sure you want to send?</source>
-        <translation>Are you sure you want to send?</translation>
-    </message>
-    <message>
-        <source>added as transaction fee</source>
-        <translation>added as transaction fee</translation>
-    </message>
 </context>
 <context>
     <name>SendCoinsEntry</name>
@@ -2184,10 +1537,6 @@
         <source>Pay &amp;To:</source>
         <translation>Pay &amp;To:</translation>
     </message>
-    <message>
-        <source>Enter a label for this address to add it to your address book</source>
-        <translation>Enter a label for this address to add it to your address book</translation>
-    </message>
     <message>
         <source>&amp;Label:</source>
         <translation>&amp;Label:</translation>
@@ -2198,707 +1547,189 @@
     </message>
     <message>
         <source>This is a normal payment.</source>
-        <translation>This is a normal payment.</translation>
-    </message>
-    <message>
-        <source>The Bitcoin address to send the payment to</source>
-        <translation>The Bitcoin address to send the payment to</translation>
-    </message>
-    <message>
-        <source>Alt+A</source>
-        <translation>Alt+A</translation>
-    </message>
-    <message>
-        <source>Paste address from clipboard</source>
-        <translation>Paste address from clipboard</translation>
-    </message>
-    <message>
-        <source>Alt+P</source>
-        <translation>Alt+P</translation>
-    </message>
-    <message>
-        <source>Remove this entry</source>
-        <translation>Remove this entry</translation>
-    </message>
-    <message>
-        <source>The fee will be deducted from the amount being sent. The recipient will receive less bitcoins than you enter in the amount field. If multiple recipients are selected, the fee is split equally.</source>
-        <translation>The fee will be deducted from the amount being sent. The recipient will receive less bitcoins than you enter in the amount field. If multiple recipients are selected, the fee is split equally.</translation>
-    </message>
-    <message>
-        <source>S&amp;ubtract fee from amount</source>
-        <translation>S&amp;ubtract fee from amount</translation>
-    </message>
-    <message>
-        <source>Message:</source>
-        <translation>Message:</translation>
-    </message>
-    <message>
-        <source>This is an unauthenticated payment request.</source>
-        <translation>This is an unauthenticated payment request.</translation>
-    </message>
-    <message>
-        <source>This is an authenticated payment request.</source>
-        <translation>This is an authenticated payment request.</translation>
-    </message>
-    <message>
-        <source>Enter a label for this address to add it to the list of used addresses</source>
-        <translation>Enter a label for this address to add it to the list of used addresses</translation>
-    </message>
-    <message>
-        <source>A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
-        <translation>A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</translation>
-    </message>
-    <message>
-        <source>Pay To:</source>
-        <translation>Pay To:</translation>
-    </message>
-    <message>
-        <source>Memo:</source>
-        <translation>Memo:</translation>
-    </message>
-</context>
-<context>
-    <name>ShutdownWindow</name>
-    <message>
-        <source>Bitcoin Core is shutting down...</source>
-        <translation>Bitcoin Core is shutting down...</translation>
-    </message>
-    <message>
-        <source>Do not shut down the computer until this window disappears.</source>
-        <translation>Do not shut down the computer until this window disappears.</translation>
-    </message>
-</context>
-<context>
-    <name>SignVerifyMessageDialog</name>
-    <message>
-        <source>Signatures - Sign / Verify a Message</source>
-        <translation>Signatures - Sign / Verify a Message</translation>
-    </message>
-    <message>
-        <source>&amp;Sign Message</source>
-        <translation>&amp;Sign Message</translation>
-    </message>
-    <message>
-        <source>You can sign messages/agreements with your addresses to prove you can receive bitcoins sent to them. Be careful not to sign anything vague or random, as phishing attacks may try to trick you into signing your identity over to them. Only sign fully-detailed statements you agree to.</source>
-        <translation>You can sign messages/agreements with your addresses to prove you can receive bitcoins sent to them. Be careful not to sign anything vague or random, as phishing attacks may try to trick you into signing your identity over to them. Only sign fully-detailed statements you agree to.</translation>
-    </message>
-    <message>
-        <source>The Bitcoin address to sign the message with</source>
-        <translation>The Bitcoin address to sign the message with</translation>
-    </message>
-    <message>
-        <source>Choose previously used address</source>
-        <translation>Choose previously used address</translation>
-    </message>
-    <message>
-        <source>Alt+A</source>
-        <translation>Alt+A</translation>
-    </message>
-    <message>
-        <source>Paste address from clipboard</source>
-        <translation>Paste address from clipboard</translation>
-    </message>
-    <message>
-        <source>Alt+P</source>
-        <translation>Alt+P</translation>
-    </message>
-    <message>
-        <source>Enter the message you want to sign here</source>
-        <translation>Enter the message you want to sign here</translation>
-    </message>
-    <message>
-        <source>Signature</source>
-        <translation>Signature</translation>
-    </message>
-    <message>
-        <source>Copy the current signature to the system clipboard</source>
-        <translation>Copy the current signature to the system clipboard</translation>
-    </message>
-    <message>
-        <source>Sign the message to prove you own this Bitcoin address</source>
-        <translation>Sign the message to prove you own this Bitcoin address</translation>
-    </message>
-    <message>
-        <source>Sign &amp;Message</source>
-        <translation>Sign &amp;Message</translation>
-    </message>
-    <message>
-        <source>Reset all sign message fields</source>
-        <translation>Reset all sign message fields</translation>
-    </message>
-    <message>
-        <source>Clear &amp;All</source>
-        <translation>Clear &amp;All</translation>
-    </message>
-    <message>
-        <source>&amp;Verify Message</source>
-        <translation>&amp;Verify Message</translation>
-    </message>
-    <message>
-        <source>Enter the receiver's address, message (ensure you copy line breaks, spaces, tabs, etc. exactly) and signature below to verify the message. Be careful not to read more into the signature than what is in the signed message itself, to avoid being tricked by a man-in-the-middle attack. Note that this only proves the signing party receives with the address, it cannot prove sendership of any transaction!</source>
-        <translation>Enter the receiver's address, message (ensure you copy line breaks, spaces, tabs, etc. exactly) and signature below to verify the message. Be careful not to read more into the signature than what is in the signed message itself, to avoid being tricked by a man-in-the-middle attack. Note that this only proves the signing party receives with the address, it cannot prove sendership of any transaction!</translation>
-    </message>
-    <message>
-        <source>The Bitcoin address the message was signed with</source>
-        <translation>The Bitcoin address the message was signed with</translation>
-    </message>
-    <message>
-        <source>Verify the message to ensure it was signed with the specified Bitcoin address</source>
-        <translation>Verify the message to ensure it was signed with the specified Bitcoin address</translation>
-    </message>
-    <message>
-        <source>Verify &amp;Message</source>
-        <translation>Verify &amp;Message</translation>
-    </message>
-    <message>
-        <source>Reset all verify message fields</source>
-        <translation>Reset all verify message fields</translation>
-    </message>
-    <message>
-        <source>Click "Sign Message" to generate signature</source>
-        <translation>Click "Sign Message" to generate signature</translation>
-    </message>
-    <message>
-        <source>The entered address is invalid.</source>
-        <translation>The entered address is invalid.</translation>
-    </message>
-    <message>
-        <source>Please check the address and try again.</source>
-        <translation>Please check the address and try again.</translation>
-    </message>
-    <message>
-        <source>The entered address does not refer to a key.</source>
-        <translation>The entered address does not refer to a key.</translation>
-    </message>
-    <message>
-        <source>Wallet unlock was cancelled.</source>
-        <translation>Wallet unlock was cancelled.</translation>
-    </message>
-    <message>
-        <source>Private key for the entered address is not available.</source>
-        <translation>Private key for the entered address is not available.</translation>
-    </message>
-    <message>
-        <source>Message signing failed.</source>
-        <translation>Message signing failed.</translation>
-    </message>
-    <message>
-        <source>Message signed.</source>
-        <translation>Message signed.</translation>
-    </message>
-    <message>
-        <source>The signature could not be decoded.</source>
-        <translation>The signature could not be decoded.</translation>
-    </message>
-    <message>
-        <source>Please check the signature and try again.</source>
-        <translation>Please check the signature and try again.</translation>
-    </message>
-    <message>
-        <source>The signature did not match the message digest.</source>
-        <translation>The signature did not match the message digest.</translation>
-    </message>
-    <message>
-        <source>Message verification failed.</source>
-        <translation>Message verification failed.</translation>
-    </message>
-    <message>
-        <source>Message verified.</source>
-        <translation>Message verified.</translation>
-    </message>
-</context>
-<context>
-    <name>SplashScreen</name>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Bitcoin Core</translation>
-    </message>
-    <message>
-        <source>The Bitcoin Core developers</source>
-        <translation>The Bitcoin Core developers</translation>
-    </message>
-    <message>
-        <source>[testnet]</source>
-        <translation>[testnet]</translation>
-    </message>
-</context>
-<context>
-    <name>TrafficGraphWidget</name>
-    <message>
-        <source>KB/s</source>
-        <translation>KB/s</translation>
-    </message>
-</context>
-<context>
-    <name>TransactionDesc</name>
-    <message>
-        <source>Open until %1</source>
-        <translation>Open until %1</translation>
-    </message>
-    <message>
-        <source>conflicted</source>
-        <translation>conflicted</translation>
-    </message>
-    <message>
-        <source>%1/offline</source>
-        <translation>%1/offline</translation>
-    </message>
-    <message>
-        <source>%1/unconfirmed</source>
-        <translation>%1/unconfirmed</translation>
-    </message>
-    <message>
-        <source>%1 confirmations</source>
-        <translation>%1 confirmations</translation>
-    </message>
-    <message>
-        <source>Status</source>
-        <translation>Status</translation>
-    </message>
-    <message numerus="yes">
-        <source>, broadcast through %n node(s)</source>
-        <translation><numerusform>, broadcast through %n node</numerusform><numerusform>, broadcast through %n nodes</numerusform></translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation>Date</translation>
-    </message>
-    <message>
-        <source>Source</source>
-        <translation>Source</translation>
-    </message>
-    <message>
-        <source>Generated</source>
-        <translation>Generated</translation>
-    </message>
-    <message>
-        <source>From</source>
-        <translation>From</translation>
-    </message>
-    <message>
-        <source>To</source>
-        <translation>To</translation>
-    </message>
-    <message>
-        <source>own address</source>
-        <translation>own address</translation>
-    </message>
-    <message>
-        <source>watch-only</source>
-        <translation>watch-only</translation>
-    </message>
-    <message>
-        <source>label</source>
-        <translation>label</translation>
-    </message>
-    <message>
-        <source>Credit</source>
-        <translation>Credit</translation>
-    </message>
-    <message numerus="yes">
-        <source>matures in %n more block(s)</source>
-        <translation><numerusform>matures in %n more block</numerusform><numerusform>matures in %n more blocks</numerusform></translation>
-    </message>
-    <message>
-        <source>not accepted</source>
-        <translation>not accepted</translation>
-    </message>
-    <message>
-        <source>Debit</source>
-        <translation>Debit</translation>
-    </message>
-    <message>
-        <source>Total debit</source>
-        <translation>Total debit</translation>
-    </message>
-    <message>
-        <source>Total credit</source>
-        <translation>Total credit</translation>
-    </message>
-    <message>
-        <source>Transaction fee</source>
-        <translation>Transaction fee</translation>
-    </message>
-    <message>
-        <source>Net amount</source>
-        <translation>Net amount</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>Message</translation>
-    </message>
-    <message>
-        <source>Comment</source>
-        <translation>Comment</translation>
-    </message>
-    <message>
-        <source>Transaction ID</source>
-        <translation>Transaction ID</translation>
-    </message>
-    <message>
-        <source>Merchant</source>
-        <translation>Merchant</translation>
-    </message>
-    <message>
-        <source>Generated coins must mature %1 blocks before they can be spent. When you generated this block, it was broadcast to the network to be added to the block chain. If it fails to get into the chain, its state will change to "not accepted" and it won't be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source>
-        <translation>Generated coins must mature %1 blocks before they can be spent. When you generated this block, it was broadcast to the network to be added to the block chain. If it fails to get into the chain, its state will change to "not accepted" and it won't be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</translation>
-    </message>
-    <message>
-        <source>Debug information</source>
-        <translation>Debug information</translation>
-    </message>
-    <message>
-        <source>Transaction</source>
-        <translation>Transaction</translation>
-    </message>
-    <message>
-        <source>Inputs</source>
-        <translation>Inputs</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>Amount</translation>
-    </message>
-    <message>
-        <source>true</source>
-        <translation>true</translation>
-    </message>
-    <message>
-        <source>false</source>
-        <translation>false</translation>
-    </message>
-    <message>
-        <source>, has not been successfully broadcast yet</source>
-        <translation>, has not been successfully broadcast yet</translation>
-    </message>
-    <message numerus="yes">
-        <source>Open for %n more block(s)</source>
-        <translation><numerusform>Open for %n more block</numerusform><numerusform>Open for %n more blocks</numerusform></translation>
-    </message>
-    <message>
-        <source>unknown</source>
-        <translation>unknown</translation>
-    </message>
-</context>
-<context>
-    <name>TransactionDescDialog</name>
-    <message>
-        <source>Transaction details</source>
-        <translation>Transaction details</translation>
-    </message>
-    <message>
-        <source>This pane shows a detailed description of the transaction</source>
-        <translation>This pane shows a detailed description of the transaction</translation>
-    </message>
-</context>
-<context>
-    <name>TransactionTableModel</name>
-    <message>
-        <source>Date</source>
-        <translation>Date</translation>
-    </message>
-    <message>
-        <source>Type</source>
-        <translation>Type</translation>
-    </message>
-    <message>
-        <source>Immature (%1 confirmations, will be available after %2)</source>
-        <translation>Immature (%1 confirmations, will be available after %2)</translation>
-    </message>
-    <message numerus="yes">
-        <source>Open for %n more block(s)</source>
-        <translation><numerusform>Open for %n more block</numerusform><numerusform>Open for %n more blocks</numerusform></translation>
-    </message>
-    <message>
-        <source>Open until %1</source>
-        <translation>Open until %1</translation>
-    </message>
-    <message>
-        <source>Confirmed (%1 confirmations)</source>
-        <translation>Confirmed (%1 confirmations)</translation>
-    </message>
-    <message>
-        <source>This block was not received by any other nodes and will probably not be accepted!</source>
-        <translation>This block was not received by any other nodes and will probably not be accepted!</translation>
-    </message>
-    <message>
-        <source>Generated but not accepted</source>
-        <translation>Generated but not accepted</translation>
-    </message>
-    <message>
-        <source>Offline</source>
-        <translation>Offline</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Label</translation>
-    </message>
-    <message>
-        <source>Unconfirmed</source>
-        <translation>Unconfirmed</translation>
-    </message>
-    <message>
-        <source>Confirming (%1 of %2 recommended confirmations)</source>
-        <translation>Confirming (%1 of %2 recommended confirmations)</translation>
-    </message>
-    <message>
-        <source>Conflicted</source>
-        <translation>Conflicted</translation>
-    </message>
-    <message>
-        <source>Received with</source>
-        <translation>Received with</translation>
-    </message>
-    <message>
-        <source>Received from</source>
-        <translation>Received from</translation>
-    </message>
-    <message>
-        <source>Sent to</source>
-        <translation>Sent to</translation>
-    </message>
-    <message>
-        <source>Payment to yourself</source>
-        <translation>Payment to yourself</translation>
-    </message>
-    <message>
-        <source>Mined</source>
-        <translation>Mined</translation>
-    </message>
-    <message>
-        <source>watch-only</source>
-        <translation>watch-only</translation>
-    </message>
-    <message>
-        <source>(n/a)</source>
-        <translation>(n/a)</translation>
-    </message>
-    <message>
-        <source>Transaction status. Hover over this field to show number of confirmations.</source>
-        <translation>Transaction status. Hover over this field to show number of confirmations.</translation>
-    </message>
-    <message>
-        <source>Date and time that the transaction was received.</source>
-        <translation>Date and time that the transaction was received.</translation>
-    </message>
-    <message>
-        <source>Type of transaction.</source>
-        <translation>Type of transaction.</translation>
-    </message>
-    <message>
-        <source>Whether or not a watch-only address is involved in this transaction.</source>
-        <translation>Whether or not a watch-only address is involved in this transaction.</translation>
-    </message>
-    <message>
-        <source>User-defined intent/purpose of the transaction.</source>
-        <translation>User-defined intent/purpose of the transaction.</translation>
+        <translation>This is a normal payment.</translation>
     </message>
     <message>
-        <source>Amount removed from or added to balance.</source>
-        <translation>Amount removed from or added to balance.</translation>
+        <source>The Bitcoin address to send the payment to</source>
+        <translation>The Bitcoin address to send the payment to</translation>
     </message>
-</context>
-<context>
-    <name>TransactionView</name>
     <message>
-        <source>All</source>
-        <translation>All</translation>
+        <source>Alt+A</source>
+        <translation>Alt+A</translation>
     </message>
     <message>
-        <source>Today</source>
-        <translation>Today</translation>
+        <source>Paste address from clipboard</source>
+        <translation>Paste address from clipboard</translation>
     </message>
     <message>
-        <source>This week</source>
-        <translation>This week</translation>
+        <source>Alt+P</source>
+        <translation>Alt+P</translation>
     </message>
     <message>
-        <source>This month</source>
-        <translation>This month</translation>
+        <source>Remove this entry</source>
+        <translation>Remove this entry</translation>
     </message>
     <message>
-        <source>Last month</source>
-        <translation>Last month</translation>
+        <source>The fee will be deducted from the amount being sent. The recipient will receive less bitcoins than you enter in the amount field. If multiple recipients are selected, the fee is split equally.</source>
+        <translation>The fee will be deducted from the amount being sent. The recipient will receive less bitcoins than you enter in the amount field. If multiple recipients are selected, the fee is split equally.</translation>
     </message>
     <message>
-        <source>This year</source>
-        <translation>This year</translation>
+        <source>S&amp;ubtract fee from amount</source>
+        <translation>S&amp;ubtract fee from amount</translation>
     </message>
     <message>
-        <source>Range...</source>
-        <translation>Range...</translation>
+        <source>Message:</source>
+        <translation>Message:</translation>
     </message>
     <message>
-        <source>Received with</source>
-        <translation>Received with</translation>
+        <source>This is an unauthenticated payment request.</source>
+        <translation>This is an unauthenticated payment request.</translation>
     </message>
     <message>
-        <source>Sent to</source>
-        <translation>Sent to</translation>
+        <source>This is an authenticated payment request.</source>
+        <translation>This is an authenticated payment request.</translation>
     </message>
     <message>
-        <source>To yourself</source>
-        <translation>To yourself</translation>
+        <source>Enter a label for this address to add it to the list of used addresses</source>
+        <translation>Enter a label for this address to add it to the list of used addresses</translation>
     </message>
     <message>
-        <source>Mined</source>
-        <translation>Mined</translation>
+        <source>A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
+        <translation>A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</translation>
     </message>
     <message>
-        <source>Other</source>
-        <translation>Other</translation>
+        <source>Pay To:</source>
+        <translation>Pay To:</translation>
     </message>
     <message>
-        <source>Enter address or label to search</source>
-        <translation>Enter address or label to search</translation>
+        <source>Memo:</source>
+        <translation>Memo:</translation>
     </message>
+</context>
+<context>
+    <name>ShutdownWindow</name>
     <message>
-        <source>Min amount</source>
-        <translation>Min amount</translation>
+        <source>%1 is shutting down...</source>
+        <translation>%1 is shutting down...</translation>
     </message>
     <message>
-        <source>Copy address</source>
-        <translation>Copy address</translation>
+        <source>Do not shut down the computer until this window disappears.</source>
+        <translation>Do not shut down the computer until this window disappears.</translation>
     </message>
+</context>
+<context>
+    <name>SignVerifyMessageDialog</name>
     <message>
-        <source>Copy label</source>
-        <translation>Copy label</translation>
+        <source>Signatures - Sign / Verify a Message</source>
+        <translation>Signatures - Sign / Verify a Message</translation>
     </message>
     <message>
-        <source>Copy amount</source>
-        <translation>Copy amount</translation>
+        <source>&amp;Sign Message</source>
+        <translation>&amp;Sign Message</translation>
     </message>
     <message>
-        <source>Copy transaction ID</source>
-        <translation>Copy transaction ID</translation>
+        <source>You can sign messages/agreements with your addresses to prove you can receive bitcoins sent to them. Be careful not to sign anything vague or random, as phishing attacks may try to trick you into signing your identity over to them. Only sign fully-detailed statements you agree to.</source>
+        <translation>You can sign messages/agreements with your addresses to prove you can receive bitcoins sent to them. Be careful not to sign anything vague or random, as phishing attacks may try to trick you into signing your identity over to them. Only sign fully-detailed statements you agree to.</translation>
     </message>
     <message>
-        <source>Copy raw transaction</source>
-        <translation>Copy raw transaction</translation>
+        <source>The Bitcoin address to sign the message with</source>
+        <translation>The Bitcoin address to sign the message with</translation>
     </message>
     <message>
-        <source>Edit label</source>
-        <translation>Edit label</translation>
+        <source>Choose previously used address</source>
+        <translation>Choose previously used address</translation>
     </message>
     <message>
-        <source>Show transaction details</source>
-        <translation>Show transaction details</translation>
+        <source>Alt+A</source>
+        <translation>Alt+A</translation>
     </message>
     <message>
-        <source>Export Transaction History</source>
-        <translation>Export Transaction History</translation>
+        <source>Paste address from clipboard</source>
+        <translation>Paste address from clipboard</translation>
     </message>
     <message>
-        <source>Watch-only</source>
-        <translation>Watch-only</translation>
+        <source>Alt+P</source>
+        <translation>Alt+P</translation>
     </message>
     <message>
-        <source>Exporting Failed</source>
-        <translation>Exporting Failed</translation>
+        <source>Enter the message you want to sign here</source>
+        <translation>Enter the message you want to sign here</translation>
     </message>
     <message>
-        <source>There was an error trying to save the transaction history to %1.</source>
-        <translation>There was an error trying to save the transaction history to %1.</translation>
+        <source>Signature</source>
+        <translation>Signature</translation>
     </message>
     <message>
-        <source>Exporting Successful</source>
-        <translation>Exporting Successful</translation>
+        <source>Copy the current signature to the system clipboard</source>
+        <translation>Copy the current signature to the system clipboard</translation>
     </message>
     <message>
-        <source>The transaction history was successfully saved to %1.</source>
-        <translation>The transaction history was successfully saved to %1.</translation>
+        <source>Sign the message to prove you own this Bitcoin address</source>
+        <translation>Sign the message to prove you own this Bitcoin address</translation>
     </message>
     <message>
-        <source>Comma separated file (*.csv)</source>
-        <translation>Comma separated file (*.csv)</translation>
+        <source>Sign &amp;Message</source>
+        <translation>Sign &amp;Message</translation>
     </message>
     <message>
-        <source>Confirmed</source>
-        <translation>Confirmed</translation>
+        <source>Reset all sign message fields</source>
+        <translation>Reset all sign message fields</translation>
     </message>
     <message>
-        <source>Date</source>
-        <translation>Date</translation>
+        <source>Clear &amp;All</source>
+        <translation>Clear &amp;All</translation>
     </message>
     <message>
-        <source>Type</source>
-        <translation>Type</translation>
+        <source>&amp;Verify Message</source>
+        <translation>&amp;Verify Message</translation>
     </message>
     <message>
-        <source>Label</source>
-        <translation>Label</translation>
+        <source>Enter the receiver's address, message (ensure you copy line breaks, spaces, tabs, etc. exactly) and signature below to verify the message. Be careful not to read more into the signature than what is in the signed message itself, to avoid being tricked by a man-in-the-middle attack. Note that this only proves the signing party receives with the address, it cannot prove sendership of any transaction!</source>
+        <translation>Enter the receiver's address, message (ensure you copy line breaks, spaces, tabs, etc. exactly) and signature below to verify the message. Be careful not to read more into the signature than what is in the signed message itself, to avoid being tricked by a man-in-the-middle attack. Note that this only proves the signing party receives with the address, it cannot prove sendership of any transaction!</translation>
     </message>
     <message>
-        <source>Address</source>
-        <translation>Address</translation>
+        <source>The Bitcoin address the message was signed with</source>
+        <translation>The Bitcoin address the message was signed with</translation>
     </message>
     <message>
-        <source>ID</source>
-        <translation>ID</translation>
+        <source>Verify the message to ensure it was signed with the specified Bitcoin address</source>
+        <translation>Verify the message to ensure it was signed with the specified Bitcoin address</translation>
     </message>
     <message>
-        <source>Range:</source>
-        <translation>Range:</translation>
+        <source>Verify &amp;Message</source>
+        <translation>Verify &amp;Message</translation>
     </message>
     <message>
-        <source>to</source>
-        <translation>to</translation>
+        <source>Reset all verify message fields</source>
+        <translation>Reset all verify message fields</translation>
     </message>
 </context>
 <context>
-    <name>UnitDisplayStatusBarControl</name>
+    <name>SplashScreen</name>
     <message>
-        <source>Unit to show amounts in. Click to select another unit.</source>
-        <translation>Unit to show amounts in. Click to select another unit.</translation>
+        <source>[testnet]</source>
+        <translation>[testnet]</translation>
     </message>
 </context>
 <context>
-    <name>WalletFrame</name>
+    <name>TrafficGraphWidget</name>
     <message>
-        <source>No wallet has been loaded.</source>
-        <translation>No wallet has been loaded.</translation>
+        <source>KB/s</source>
+        <translation>KB/s</translation>
     </message>
 </context>
 <context>
-    <name>WalletModel</name>
+    <name>TransactionDescDialog</name>
     <message>
-        <source>Send Coins</source>
-        <translation>Send Coins</translation>
+        <source>This pane shows a detailed description of the transaction</source>
+        <translation>This pane shows a detailed description of the transaction</translation>
     </message>
 </context>
 <context>
-    <name>WalletView</name>
-    <message>
-        <source>&amp;Export</source>
-        <translation>&amp;Export</translation>
-    </message>
-    <message>
-        <source>Export the data in the current tab to a file</source>
-        <translation>Export the data in the current tab to a file</translation>
-    </message>
-    <message>
-        <source>Backup Wallet</source>
-        <translation>Backup Wallet</translation>
-    </message>
-    <message>
-        <source>Wallet Data (*.dat)</source>
-        <translation>Wallet Data (*.dat)</translation>
-    </message>
-    <message>
-        <source>Backup Failed</source>
-        <translation>Backup Failed</translation>
-    </message>
-    <message>
-        <source>There was an error trying to save the wallet data to %1.</source>
-        <translation>There was an error trying to save the wallet data to %1.</translation>
-    </message>
-    <message>
-        <source>The wallet data was successfully saved to %1.</source>
-        <translation>The wallet data was successfully saved to %1.</translation>
-    </message>
+    <name>UnitDisplayStatusBarControl</name>
     <message>
-        <source>Backup Successful</source>
-        <translation>Backup Successful</translation>
+        <source>Unit to show amounts in. Click to select another unit.</source>
+        <translation>Unit to show amounts in. Click to select another unit.</translation>
     </message>
 </context>
 <context>
@@ -2927,14 +1758,6 @@
         <source>If &lt;category&gt; is not supplied or if &lt;category&gt; = 1, output all debugging information.</source>
         <translation>If &lt;category&gt; is not supplied or if &lt;category&gt; = 1, output all debugging information.</translation>
     </message>
-    <message>
-        <source>Maximum total fees (in %s) to use in a single wallet transaction; setting this too low may abort large transactions (default: %s)</source>
-        <translation>Maximum total fees (in %s) to use in a single wallet transaction; setting this too low may abort large transactions (default: %s)</translation>
-    </message>
-    <message>
-        <source>Please check that your computer's date and time are correct! If your clock is wrong Bitcoin Core will not work properly.</source>
-        <translation>Please check that your computer's date and time are correct! If your clock is wrong Bitcoin Core will not work properly.</translation>
-    </message>
     <message>
         <source>Prune configured below the minimum of %d MiB.  Please use a higher number.</source>
         <translation>Prune configured below the minimum of %d MiB.  Please use a higher number.</translation>
@@ -2975,6 +1798,14 @@
         <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
         <translation>Accept connections from outside (default: 1 if no -proxy or -connect)</translation>
     </message>
+    <message>
+        <source>Bitcoin Core</source>
+        <translation>Bitcoin Core</translation>
+    </message>
+    <message>
+        <source>The %s developers</source>
+        <translation>The %s developers</translation>
+    </message>
     <message>
         <source>-fallbackfee is set very high! This is the transaction fee you may pay when fee estimates are not available.</source>
         <translation>-fallbackfee is set very high! This is the transaction fee you may pay when fee estimates are not available.</translation>
@@ -2991,6 +1822,10 @@
         <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source>
         <translation>Bind to given address and always listen on it. Use [host]:port notation for IPv6</translation>
     </message>
+    <message>
+        <source>Cannot obtain a lock on data directory %s. %s is probably already running.</source>
+        <translation>Cannot obtain a lock on data directory %s. %s is probably already running.</translation>
+    </message>
     <message>
         <source>Delete all wallet transactions and only recover those parts of the blockchain through -rescan on startup</source>
         <translation>Delete all wallet transactions and only recover those parts of the blockchain through -rescan on startup</translation>
@@ -2999,6 +1834,14 @@
         <source>Distributed under the MIT software license, see the accompanying file COPYING or &lt;http://www.opensource.org/licenses/mit-license.php&gt;.</source>
         <translation>Distributed under the MIT software license, see the accompanying file COPYING or &lt;http://www.opensource.org/licenses/mit-license.php&gt;.</translation>
     </message>
+    <message>
+        <source>Error loading %s: You can't enable HD on a already existing non-HD wallet</source>
+        <translation>Error loading %s: You can't enable HD on a already existing non-HD wallet</translation>
+    </message>
+    <message>
+        <source>Error reading %s! All keys read correctly, but transaction data or address book entries might be missing or incorrect.</source>
+        <translation>Error reading %s! All keys read correctly, but transaction data or address book entries might be missing or incorrect.</translation>
+    </message>
     <message>
         <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source>
         <translation>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</translation>
@@ -3007,6 +1850,22 @@
         <source>Force relay of transactions from whitelisted peers even they violate local relay policy (default: %d)</source>
         <translation>Force relay of transactions from whitelisted peers even they violate local relay policy (default: %d)</translation>
     </message>
+    <message>
+        <source>Maximum allowed median peer time offset adjustment. Local perspective of time may be influenced by peers forward or backward by this amount. (default: %u seconds)</source>
+        <translation>Maximum allowed median peer time offset adjustment. Local perspective of time may be influenced by peers forward or backward by this amount. (default: %u seconds)</translation>
+    </message>
+    <message>
+        <source>Maximum total fees (in %s) to use in a single wallet transaction or raw transaction; setting this too low may abort large transactions (default: %s)</source>
+        <translation>Maximum total fees (in %s) to use in a single wallet transaction or raw transaction; setting this too low may abort large transactions (default: %s)</translation>
+    </message>
+    <message>
+        <source>Please check that your computer's date and time are correct! If your clock is wrong, %s will not work properly.</source>
+        <translation>Please check that your computer's date and time are correct! If your clock is wrong, %s will not work properly.</translation>
+    </message>
+    <message>
+        <source>Please contribute if you find %s useful. Visit %s for further information about the software.</source>
+        <translation>Please contribute if you find %s useful. Visit %s for further information about the software.</translation>
+    </message>
     <message>
         <source>Set the number of script verification threads (%u to %d, 0 = auto, &lt;0 = leave that many cores free, default: %d)</source>
         <translation>Set the number of script verification threads (%u to %d, 0 = auto, &lt;0 = leave that many cores free, default: %d)</translation>
@@ -3019,14 +1878,6 @@
         <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
         <translation>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</translation>
     </message>
-    <message>
-        <source>Unable to bind to %s on this computer. Bitcoin Core is probably already running.</source>
-        <translation>Unable to bind to %s on this computer. Bitcoin Core is probably already running.</translation>
-    </message>
-    <message>
-        <source>Unsupported argument -whitelistalwaysrelay ignored, use -whitelistrelay and/or -whitelistforcerelay.</source>
-        <translation>Unsupported argument -whitelistalwaysrelay ignored, use -whitelistrelay and/or -whitelistforcerelay.</translation>
-    </message>
     <message>
         <source>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</source>
         <translation>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</translation>
@@ -3043,22 +1894,22 @@
         <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source>
         <translation>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</translation>
     </message>
-    <message>
-        <source>Warning: Unknown block versions being mined! It's possible unknown rules are in effect</source>
-        <translation>Warning: Unknown block versions being mined! It's possible unknown rules are in effect</translation>
-    </message>
     <message>
         <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source>
         <translation>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</translation>
     </message>
-    <message>
-        <source>Warning: wallet.dat corrupt, data salvaged! Original wallet.dat saved as wallet.{timestamp}.bak in %s; if your balance or transactions are incorrect you should restore from a backup.</source>
-        <translation>Warning: wallet.dat corrupt, data salvaged! Original wallet.dat saved as wallet.{timestamp}.bak in %s; if your balance or transactions are incorrect you should restore from a backup.</translation>
-    </message>
     <message>
         <source>Whitelist peers connecting from the given netmask or IP address. Can be specified multiple times.</source>
         <translation>Whitelist peers connecting from the given netmask or IP address. Can be specified multiple times.</translation>
     </message>
+    <message>
+        <source>You need to rebuild the database using -reindex-chainstate to change -txindex</source>
+        <translation>You need to rebuild the database using -reindex-chainstate to change -txindex</translation>
+    </message>
+    <message>
+        <source>%s corrupt, salvage failed</source>
+        <translation>%s corrupt, salvage failed</translation>
+    </message>
     <message>
         <source>-maxmempool must be at least %d MB</source>
         <translation>-maxmempool must be at least %d MB</translation>
@@ -3071,10 +1922,22 @@
         <source>Append comment to the user agent string</source>
         <translation>Append comment to the user agent string</translation>
     </message>
+    <message>
+        <source>Attempt to recover private keys from a corrupt wallet on startup</source>
+        <translation>Attempt to recover private keys from a corrupt wallet on startup</translation>
+    </message>
     <message>
         <source>Block creation options:</source>
         <translation>Block creation options:</translation>
     </message>
+    <message>
+        <source>Cannot resolve -%s address: '%s'</source>
+        <translation>Cannot resolve -%s address: '%s'</translation>
+    </message>
+    <message>
+        <source>Change index out of range</source>
+        <translation>Change index out of range</translation>
+    </message>
     <message>
         <source>Connect only to the specified node(s)</source>
         <translation>Connect only to the specified node(s)</translation>
@@ -3083,6 +1946,10 @@
         <source>Connection options:</source>
         <translation>Connection options:</translation>
     </message>
+    <message>
+        <source>Copyright (C) %i-%i</source>
+        <translation>Copyright (C) %i-%i</translation>
+    </message>
     <message>
         <source>Corrupted block database detected</source>
         <translation>Corrupted block database detected</translation>
@@ -3127,6 +1994,22 @@
         <source>Error initializing wallet database environment %s!</source>
         <translation>Error initialising wallet database environment %s!</translation>
     </message>
+    <message>
+        <source>Error loading %s</source>
+        <translation>Error loading %s</translation>
+    </message>
+    <message>
+        <source>Error loading %s: Wallet corrupted</source>
+        <translation>Error loading %s: Wallet corrupted</translation>
+    </message>
+    <message>
+        <source>Error loading %s: Wallet requires newer version of %s</source>
+        <translation>Error loading %s: Wallet requires newer version of %s</translation>
+    </message>
+    <message>
+        <source>Error loading %s: You can't disable HD on a already existing HD wallet</source>
+        <translation>Error loading %s: You can't disable HD on a already existing HD wallet</translation>
+    </message>
     <message>
         <source>Error loading block database</source>
         <translation>Error loading block database</translation>
@@ -3151,10 +2034,18 @@
         <source>Incorrect or no genesis block found. Wrong datadir for network?</source>
         <translation>Incorrect or no genesis block found. Wrong datadir for network?</translation>
     </message>
+    <message>
+        <source>Initialization sanity check failed. %s is shutting down.</source>
+        <translation>Initialisation sanity check failed. %s is shutting down.</translation>
+    </message>
     <message>
         <source>Invalid -onion address: '%s'</source>
         <translation>Invalid -onion address: '%s'</translation>
     </message>
+    <message>
+        <source>Invalid amount for -%s=&lt;amount&gt;: '%s'</source>
+        <translation>Invalid amount for -%s=&lt;amount&gt;: '%s'</translation>
+    </message>
     <message>
         <source>Invalid amount for -fallbackfee=&lt;amount&gt;: '%s'</source>
         <translation>Invalid amount for -fallbackfee=&lt;amount&gt;: '%s'</translation>
@@ -3163,6 +2054,10 @@
         <source>Keep the transaction memory pool below &lt;n&gt; megabytes (default: %u)</source>
         <translation>Keep the transaction memory pool below &lt;n&gt; megabytes (default: %u)</translation>
     </message>
+    <message>
+        <source>Loading banlist...</source>
+        <translation>Loading banlist...</translation>
+    </message>
     <message>
         <source>Location of the auth cookie (default: data dir)</source>
         <translation>Location of the auth cookie (default: data dir)</translation>
@@ -3179,6 +2074,10 @@
         <source>Only connect to nodes in network &lt;net&gt; (ipv4, ipv6 or onion)</source>
         <translation>Only connect to nodes in network &lt;net&gt; (ipv4, ipv6 or onion)</translation>
     </message>
+    <message>
+        <source>Print this help message and exit</source>
+        <translation>Print this help message and exit</translation>
+    </message>
     <message>
         <source>Print version and exit</source>
         <translation>Print version and exit</translation>
@@ -3191,6 +2090,14 @@
         <source>Prune mode is incompatible with -txindex.</source>
         <translation>Prune mode is incompatible with -txindex.</translation>
     </message>
+    <message>
+        <source>Rebuild chain state and block index from the blk*.dat files on disk</source>
+        <translation>Rebuild chain state and block index from the blk*.dat files on disk</translation>
+    </message>
+    <message>
+        <source>Rebuild chain state from the currently indexed blocks</source>
+        <translation>Rebuild chain state from the currently indexed blocks</translation>
+    </message>
     <message>
         <source>Set database cache size in megabytes (%d to %d, default: %d)</source>
         <translation>Set database cache size in megabytes (%d to %d, default: %d)</translation>
@@ -3203,6 +2110,14 @@
         <source>Specify wallet file (within data directory)</source>
         <translation>Specify wallet file (within data directory)</translation>
     </message>
+    <message>
+        <source>The source code is available from %s.</source>
+        <translation>The source code is available from %s.</translation>
+    </message>
+    <message>
+        <source>Unable to bind to %s on this computer. %s is probably already running.</source>
+        <translation>Unable to bind to %s on this computer. %s is probably already running.</translation>
+    </message>
     <message>
         <source>Unsupported argument -benchmark ignored, use -debug=bench.</source>
         <translation>Unsupported argument -benchmark ignored, use -debug=bench.</translation>
@@ -3236,12 +2151,16 @@
         <translation>Wallet %s resides outside data directory %s</translation>
     </message>
     <message>
-        <source>Wallet options:</source>
-        <translation>Wallet options:</translation>
+        <source>Wallet debugging/testing options:</source>
+        <translation>Wallet debugging/testing options:</translation>
+    </message>
+    <message>
+        <source>Wallet needed to be rewritten: restart %s to complete</source>
+        <translation>Wallet needed to be rewritten: restart %s to complete</translation>
     </message>
     <message>
-        <source>You need to rebuild the database using -reindex to change -txindex</source>
-        <translation>You need to rebuild the database using -reindex to change -txindex</translation>
+        <source>Wallet options:</source>
+        <translation>Wallet options:</translation>
     </message>
     <message>
         <source>Allow JSON-RPC connections from specified source. Valid for &lt;ip&gt; are a single IP (e.g. 1.2.3.4), a network/netmask (e.g. 1.2.3.4/255.255.255.0) or a network/CIDR (e.g. 1.2.3.4/24). This option can be specified multiple times</source>
@@ -3255,10 +2174,6 @@
         <source>Bind to given address to listen for JSON-RPC connections. Use [host]:port notation for IPv6. This option can be specified multiple times (default: bind to all interfaces)</source>
         <translation>Bind to given address to listen for JSON-RPC connections. Use [host]:port notation for IPv6. This option can be specified multiple times (default: bind to all interfaces)</translation>
     </message>
-    <message>
-        <source>Cannot obtain a lock on data directory %s. Bitcoin Core is probably already running.</source>
-        <translation>Cannot obtain a lock on data directory %s. Bitcoin Core is probably already running.</translation>
-    </message>
     <message>
         <source>Create new files with system default permissions, instead of umask 077 (only effective with disabled wallet functionality)</source>
         <translation>Create new files with system default permissions, instead of umask 077 (only effective with disabled wallet functionality)</translation>
@@ -3303,10 +2218,6 @@
         <source>Set maximum size of high-priority/low-fee transactions in bytes (default: %d)</source>
         <translation>Set maximum size of high-priority/low-fee transactions in bytes (default: %d)</translation>
     </message>
-    <message>
-        <source>Set the number of threads for coin generation if enabled (-1 = all cores, default: %d)</source>
-        <translation>Set the number of threads for coin generation if enabled (-1 = all cores, default: %d)</translation>
-    </message>
     <message>
         <source>The transaction amount is too small to send after the fee has been deducted</source>
         <translation>The transaction amount is too small to send after the fee has been deducted</translation>
@@ -3315,6 +2226,10 @@
         <source>This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit &lt;https://www.openssl.org/&gt; and cryptographic software written by Eric Young and UPnP software written by Thomas Bernard.</source>
         <translation>This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit &lt;https://www.openssl.org/&gt; and cryptographic software written by Eric Young and UPnP software written by Thomas Bernard.</translation>
     </message>
+    <message>
+        <source>Use hierarchical deterministic key generation (HD) after BIP32. Only has effect during wallet creation/first start</source>
+        <translation>Use hierarchical deterministic key generation (HD) after BIP32. Only has effect during wallet creation/first start</translation>
+    </message>
     <message>
         <source>Whitelisted peers cannot be DoS banned and their transactions are always relayed, even if they are already in the mempool, useful e.g. for a gateway</source>
         <translation>Whitelisted peers cannot be DoS banned and their transactions are always relayed, even if they are already in the mempool, useful e.g. for a gateway</translation>
@@ -3331,34 +2246,14 @@
         <source>Accept public REST requests (default: %u)</source>
         <translation>Accept public REST requests (default: %u)</translation>
     </message>
-    <message>
-        <source>Activating best chain...</source>
-        <translation>Activating best chain...</translation>
-    </message>
-    <message>
-        <source>Attempt to recover private keys from a corrupt wallet.dat on startup</source>
-        <translation>Attempt to recover private keys from a corrupt wallet.dat on startup</translation>
-    </message>
     <message>
         <source>Automatically create Tor hidden service (default: %d)</source>
         <translation>Automatically create Tor hidden service (default: %d)</translation>
     </message>
-    <message>
-        <source>Cannot resolve -whitebind address: '%s'</source>
-        <translation>Cannot resolve -whitebind address: '%s'</translation>
-    </message>
     <message>
         <source>Connect through SOCKS5 proxy</source>
         <translation>Connect through SOCKS5 proxy</translation>
     </message>
-    <message>
-        <source>Copyright (C) 2009-%i The Bitcoin Core Developers</source>
-        <translation>Copyright (C) 2009-%i The Bitcoin Core Developers</translation>
-    </message>
-    <message>
-        <source>Error loading wallet.dat: Wallet requires newer version of Bitcoin Core</source>
-        <translation>Error loading wallet.dat: Wallet requires newer version of Bitcoin Core</translation>
-    </message>
     <message>
         <source>Error reading from database, shutting down.</source>
         <translation>Error reading from database, shutting down.</translation>
@@ -3371,22 +2266,6 @@
         <source>Information</source>
         <translation>Information</translation>
     </message>
-    <message>
-        <source>Initialization sanity check failed. Bitcoin Core is shutting down.</source>
-        <translation>Initialisation sanity check failed. Bitcoin Core is shutting down.</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -maxtxfee=&lt;amount&gt;: '%s'</source>
-        <translation>Invalid amount for -maxtxfee=&lt;amount&gt;: '%s'</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -minrelaytxfee=&lt;amount&gt;: '%s'</source>
-        <translation>Invalid amount for -minrelaytxfee=&lt;amount&gt;: '%s'</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -mintxfee=&lt;amount&gt;: '%s'</source>
-        <translation>Invalid amount for -mintxfee=&lt;amount&gt;: '%s'</translation>
-    </message>
     <message>
         <source>Invalid amount for -paytxfee=&lt;amount&gt;: '%s' (must be at least %s)</source>
         <translation>Invalid amount for -paytxfee=&lt;amount&gt;: '%s' (must be at least %s)</translation>
@@ -3411,14 +2290,6 @@
         <source>RPC server options:</source>
         <translation>RPC server options:</translation>
     </message>
-    <message>
-        <source>Rebuild block chain index from current blk000??.dat files on startup</source>
-        <translation>Rebuild block chain index from current blk000??.dat files on startup</translation>
-    </message>
-    <message>
-        <source>Receive and display P2P network alerts (default: %u)</source>
-        <translation>Receive and display P2P network alerts (default: %u)</translation>
-    </message>
     <message>
         <source>Reducing -maxconnections from %d to %d, because of system limitations.</source>
         <translation>Reducing -maxconnections from %d to %d, because of system limitations.</translation>
@@ -3491,10 +2362,6 @@
         <source>Username for JSON-RPC connections</source>
         <translation>Username for JSON-RPC connections</translation>
     </message>
-    <message>
-        <source>Wallet needed to be rewritten: restart Bitcoin Core to complete</source>
-        <translation>Wallet needed to be rewritten: restart Bitcoin Core to complete</translation>
-    </message>
     <message>
         <source>Warning</source>
         <translation>Warning</translation>
@@ -3515,10 +2382,6 @@
         <source>ZeroMQ notification options:</source>
         <translation>ZeroMQ notification options:</translation>
     </message>
-    <message>
-        <source>wallet.dat corrupt, salvage failed</source>
-        <translation>wallet.dat corrupt, salvage failed</translation>
-    </message>
     <message>
         <source>Password for JSON-RPC connections</source>
         <translation>Password for JSON-RPC connections</translation>
@@ -3527,10 +2390,6 @@
         <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
         <translation>Execute command when the best block changes (%s in cmd is replaced by block hash)</translation>
     </message>
-    <message>
-        <source>This help message</source>
-        <translation>This help message</translation>
-    </message>
     <message>
         <source>Allow DNS lookups for -addnode, -seednode and -connect</source>
         <translation>Allow DNS lookups for -addnode, -seednode and -connect</translation>
@@ -3539,10 +2398,6 @@
         <source>Loading addresses...</source>
         <translation>Loading addresses...</translation>
     </message>
-    <message>
-        <source>Error loading wallet.dat: Wallet corrupted</source>
-        <translation>Error loading wallet.dat: Wallet corrupted</translation>
-    </message>
     <message>
         <source>(1 = keep tx meta data e.g. account owner and payment request information, 2 = drop tx meta data)</source>
         <translation>(1 = keep tx meta data e.g. account owner and payment request information, 2 = drop tx meta data)</translation>
@@ -3559,10 +2414,6 @@
         <source>Do not keep transactions in the mempool longer than &lt;n&gt; hours (default: %u)</source>
         <translation>Do not keep transactions in the mempool longer than &lt;n&gt; hours (default: %u)</translation>
     </message>
-    <message>
-        <source>Error reading wallet.dat! All keys read correctly, but transaction data or address book entries might be missing or incorrect.</source>
-        <translation>Error reading wallet.dat! All keys read correctly, but transaction data or address book entries might be missing or incorrect.</translation>
-    </message>
     <message>
         <source>Fees (in %s/kB) smaller than this are considered zero fee for transaction creation (default: %s)</source>
         <translation>Fees (in %s/kB) smaller than this are considered zero fee for transaction creation (default: %s)</translation>
@@ -3599,6 +2450,10 @@
         <source>Unsupported argument -socks found. Setting SOCKS version isn't possible anymore, only SOCKS5 proxies are supported.</source>
         <translation>Unsupported argument -socks found. Setting SOCKS version isn't possible anymore, only SOCKS5 proxies are supported.</translation>
     </message>
+    <message>
+        <source>Unsupported argument -whitelistalwaysrelay ignored, use -whitelistrelay and/or -whitelistforcerelay.</source>
+        <translation>Unsupported argument -whitelistalwaysrelay ignored, use -whitelistrelay and/or -whitelistforcerelay.</translation>
+    </message>
     <message>
         <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: %s)</source>
         <translation>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: %s)</translation>
@@ -3608,20 +2463,20 @@
         <translation>Username and hashed password for JSON-RPC connections. The field &lt;userpw&gt; comes in the format: &lt;USERNAME&gt;:&lt;SALT&gt;$&lt;HASH&gt;. A canonical python script is included in share/rpcuser. This option can be specified multiple times</translation>
     </message>
     <message>
-        <source>(default: %s)</source>
-        <translation>(default: %s)</translation>
+        <source>Warning: Unknown block versions being mined! It's possible unknown rules are in effect</source>
+        <translation>Warning: Unknown block versions being mined! It's possible unknown rules are in effect</translation>
     </message>
     <message>
-        <source>Always query for peer addresses via DNS lookup (default: %u)</source>
-        <translation>Always query for peer addresses via DNS lookup (default: %u)</translation>
+        <source>Warning: Wallet file corrupt, data salvaged! Original %s saved as %s in %s; if your balance or transactions are incorrect you should restore from a backup.</source>
+        <translation>Warning: Wallet file corrupt, data salvaged! Original %s saved as %s in %s; if your balance or transactions are incorrect you should restore from a backup.</translation>
     </message>
     <message>
-        <source>Error loading wallet.dat</source>
-        <translation>Error loading wallet.dat</translation>
+        <source>(default: %s)</source>
+        <translation>(default: %s)</translation>
     </message>
     <message>
-        <source>Generate coins (default: %u)</source>
-        <translation>Generate coins (default: %u)</translation>
+        <source>Always query for peer addresses via DNS lookup (default: %u)</source>
+        <translation>Always query for peer addresses via DNS lookup (default: %u)</translation>
     </message>
     <message>
         <source>How many blocks to check at startup (default: %u, 0 = all)</source>
@@ -3707,18 +2562,6 @@
         <source>Unknown network specified in -onlynet: '%s'</source>
         <translation>Unknown network specified in -onlynet: '%s'</translation>
     </message>
-    <message>
-        <source>Cannot resolve -bind address: '%s'</source>
-        <translation>Cannot resolve -bind address: '%s'</translation>
-    </message>
-    <message>
-        <source>Cannot resolve -externalip address: '%s'</source>
-        <translation>Cannot resolve -externalip address: '%s'</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -paytxfee=&lt;amount&gt;: '%s'</source>
-        <translation>Invalid amount for -paytxfee=&lt;amount&gt;: '%s'</translation>
-    </message>
     <message>
         <source>Insufficient funds</source>
         <translation>Insufficient funds</translation>
diff --git a/src/qt/locale/bitcoin_eo.ts b/src/qt/locale/bitcoin_eo.ts
index 2095db34bf32e..043b28abc6ac6 100644
--- a/src/qt/locale/bitcoin_eo.ts
+++ b/src/qt/locale/bitcoin_eo.ts
@@ -25,10 +25,6 @@
         <source>C&amp;lose</source>
         <translation>&amp;Fermi</translation>
     </message>
-    <message>
-        <source>&amp;Copy Address</source>
-        <translation>&amp;Kopii Adreson</translation>
-    </message>
     <message>
         <source>Delete the currently selected address from the list</source>
         <translation>Forigi la elektitan adreson el la listo</translation>
@@ -45,73 +41,6 @@
         <source>&amp;Delete</source>
         <translation>&amp;Forigi</translation>
     </message>
-    <message>
-        <source>Choose the address to send coins to</source>
-        <translation>Elektu la alsendotan adreson</translation>
-    </message>
-    <message>
-        <source>Choose the address to receive coins with</source>
-        <translation>Elektu la ricevontan adreson</translation>
-    </message>
-    <message>
-        <source>C&amp;hoose</source>
-        <translation>&amp;Elekti</translation>
-    </message>
-    <message>
-        <source>Sending addresses</source>
-        <translation>Sendaj adresoj</translation>
-    </message>
-    <message>
-        <source>Receiving addresses</source>
-        <translation>Ricevaj adresoj</translation>
-    </message>
-    <message>
-        <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source>
-        <translation>Jen viaj Bitmon-adresoj por sendi pagojn. Zorge kontrolu la sumon kaj la alsendan adreson antaŭ ol sendi.</translation>
-    </message>
-    <message>
-        <source>These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source>
-        <translation>Jen viaj bitmonaj adresoj por ricevi pagojn. Estas konsilinde uzi apartan ricevan adreson por ĉiu transakcio.</translation>
-    </message>
-    <message>
-        <source>Copy &amp;Label</source>
-        <translation>Kopii &amp;Etikedon</translation>
-    </message>
-    <message>
-        <source>&amp;Edit</source>
-        <translation>&amp;Redakti</translation>
-    </message>
-    <message>
-        <source>Export Address List</source>
-        <translation>Eksporti Adresliston</translation>
-    </message>
-    <message>
-        <source>Comma separated file (*.csv)</source>
-        <translation>Perkome disigita dosiero (*.csv)</translation>
-    </message>
-    <message>
-        <source>Exporting Failed</source>
-        <translation>ekspotado malsukcesinta</translation>
-    </message>
-    <message>
-        <source>There was an error trying to save the address list to %1. Please try again.</source>
-        <translation>Okazis eraron dum konservo de adreslisto al %1. Bonvolu provi denove.</translation>
-    </message>
-</context>
-<context>
-    <name>AddressTableModel</name>
-    <message>
-        <source>Label</source>
-        <translation>Etikedo</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>Adreso</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(neniu etikedo)</translation>
-    </message>
 </context>
 <context>
     <name>AskPassphraseDialog</name>
@@ -131,86 +60,6 @@
         <source>Repeat new passphrase</source>
         <translation>Ripetu la novan pasfrazon</translation>
     </message>
-    <message>
-        <source>Encrypt wallet</source>
-        <translation>Ĉifri la monujon</translation>
-    </message>
-    <message>
-        <source>This operation needs your wallet passphrase to unlock the wallet.</source>
-        <translation>Ĉi tiu operacio bezonas vian monujan pasfrazon, por malŝlosi la monujon.</translation>
-    </message>
-    <message>
-        <source>Unlock wallet</source>
-        <translation>Malŝlosi la monujon</translation>
-    </message>
-    <message>
-        <source>This operation needs your wallet passphrase to decrypt the wallet.</source>
-        <translation>Ĉi tiu operacio bezonas vian monujan pasfrazon, por malĉifri la monujon.</translation>
-    </message>
-    <message>
-        <source>Decrypt wallet</source>
-        <translation>Malĉifri la monujon</translation>
-    </message>
-    <message>
-        <source>Change passphrase</source>
-        <translation>Ŝanĝi la pasfrazon</translation>
-    </message>
-    <message>
-        <source>Confirm wallet encryption</source>
-        <translation>Konfirmo de ĉifrado de la monujo</translation>
-    </message>
-    <message>
-        <source>Warning: If you encrypt your wallet and lose your passphrase, you will &lt;b&gt;LOSE ALL OF YOUR BITCOINS&lt;/b&gt;!</source>
-        <translation>Atentu! Se vi ĉifras vian monujon kaj perdas la pasfrazon, vi &lt;b&gt;PERDOS LA TUTON DE VIA BITMONO&lt;b&gt;!</translation>
-    </message>
-    <message>
-        <source>Are you sure you wish to encrypt your wallet?</source>
-        <translation>Ĉu vi certas, ke vi volas ĉifri la monujon?</translation>
-    </message>
-    <message>
-        <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source>
-        <translation>GRAVE: antaŭaj sekur-kopioj de via monujo-dosiero estas forigindaj kiam vi havas nove kreitan ĉifritan monujo-dosieron. Pro sekureco, antaŭaj kopioj de la neĉifrita dosiero ne plu funkcios tuj kiam vi ekuzos la novan ĉifritan dosieron.</translation>
-    </message>
-    <message>
-        <source>Warning: The Caps Lock key is on!</source>
-        <translation>Atentu: la majuskla baskulo estas ŝaltita!</translation>
-    </message>
-    <message>
-        <source>Wallet encrypted</source>
-        <translation>La monujo estas ĉifrita</translation>
-    </message>
-    <message>
-        <source>Enter the old passphrase and new passphrase to the wallet.</source>
-        <translation>Tajpu la malnovan pasvorton kaj la novan pasvorton por la monujo.</translation>
-    </message>
-    <message>
-        <source>Wallet encryption failed</source>
-        <translation>Ĉifrado de la monujo fiaskis</translation>
-    </message>
-    <message>
-        <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
-        <translation>Ĉifrado de monujo fiaskis pro interna eraro. Via monujo ne estas ĉifrita.</translation>
-    </message>
-    <message>
-        <source>The supplied passphrases do not match.</source>
-        <translation>La pasfrazoj entajpitaj ne samas.</translation>
-    </message>
-    <message>
-        <source>Wallet unlock failed</source>
-        <translation>Malŝloso de la monujo fiaskis</translation>
-    </message>
-    <message>
-        <source>The passphrase entered for the wallet decryption was incorrect.</source>
-        <translation>La pasfrazo enigita por ĉifrado de monujo ne ĝustas.</translation>
-    </message>
-    <message>
-        <source>Wallet decryption failed</source>
-        <translation>Malĉifrado de la monujo fiaskis</translation>
-    </message>
-    <message>
-        <source>Wallet passphrase was successfully changed.</source>
-        <translation>Vi sukcese ŝanĝis la pasfrazon de la monujo.</translation>
-    </message>
 </context>
 <context>
     <name>BanTableModel</name>
@@ -289,14 +138,6 @@
         <source>Open &amp;URI...</source>
         <translation>Malfermi &amp;URI-on...</translation>
     </message>
-    <message>
-        <source>Bitcoin Core client</source>
-        <translation>kliento de bitmon-kerno</translation>
-    </message>
-    <message>
-        <source>Importing blocks from disk...</source>
-        <translation>Importado de blokoj el disko...</translation>
-    </message>
     <message>
         <source>Reindexing blocks on disk...</source>
         <translation>Reindeksado de blokoj sur disko...</translation>
@@ -341,10 +182,6 @@
         <source>&amp;Receive</source>
         <translation>&amp;Ricevi</translation>
     </message>
-    <message>
-        <source>Show information about Bitcoin Core</source>
-        <translation>Vidigi informon pri Bitmona Kerno</translation>
-    </message>
     <message>
         <source>&amp;Show / Hide</source>
         <translation>&amp;Montri / Kaŝi</translation>
@@ -381,18 +218,10 @@
         <source>Tabs toolbar</source>
         <translation>Langeto-breto</translation>
     </message>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Kerno de Bitmono</translation>
-    </message>
     <message>
         <source>Request payments (generates QR codes and bitcoin: URIs)</source>
         <translation>Peti pagon (kreas QR-kodojn kaj URI-ojn kun prefikso bitcoin:)</translation>
     </message>
-    <message>
-        <source>&amp;About Bitcoin Core</source>
-        <translation>&amp;Pri la Bitmona Kerno</translation>
-    </message>
     <message>
         <source>Show the list of used sending addresses and labels</source>
         <translation>Vidigi la liston de uzitaj sendaj adresoj kaj etikedoj</translation>
@@ -512,13 +341,6 @@
         <translation>Monujo estas &lt;b&gt;ĉifrita&lt;/b&gt; kaj aktuale &lt;b&gt;ŝlosita&lt;/b&gt;</translation>
     </message>
 </context>
-<context>
-    <name>ClientModel</name>
-    <message>
-        <source>Network Alert</source>
-        <translation>Reta Averto</translation>
-    </message>
-</context>
 <context>
     <name>CoinControlDialog</name>
     <message>
@@ -593,134 +415,6 @@
         <source>Priority</source>
         <translation>Prioritato</translation>
     </message>
-    <message>
-        <source>Copy address</source>
-        <translation>Kopii adreson</translation>
-    </message>
-    <message>
-        <source>Copy label</source>
-        <translation>Kopii etikedon</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>Kopii sumon</translation>
-    </message>
-    <message>
-        <source>Copy transaction ID</source>
-        <translation>Kopii transakcian ID-on</translation>
-    </message>
-    <message>
-        <source>Lock unspent</source>
-        <translation>Ŝlosi la neelspezitajn</translation>
-    </message>
-    <message>
-        <source>Unlock unspent</source>
-        <translation>Malŝlosi la neelspezitajn</translation>
-    </message>
-    <message>
-        <source>Copy quantity</source>
-        <translation>Kopii kvanton</translation>
-    </message>
-    <message>
-        <source>Copy fee</source>
-        <translation>Kopii krompagon</translation>
-    </message>
-    <message>
-        <source>Copy after fee</source>
-        <translation>Kopii post krompago</translation>
-    </message>
-    <message>
-        <source>Copy bytes</source>
-        <translation>Kopii bajtojn</translation>
-    </message>
-    <message>
-        <source>Copy priority</source>
-        <translation>Kopii prioritaton</translation>
-    </message>
-    <message>
-        <source>Copy dust</source>
-        <translation>Kopii polvon</translation>
-    </message>
-    <message>
-        <source>Copy change</source>
-        <translation>Kopii restmonon</translation>
-    </message>
-    <message>
-        <source>highest</source>
-        <translation>plej alta</translation>
-    </message>
-    <message>
-        <source>higher</source>
-        <translation>pli alta</translation>
-    </message>
-    <message>
-        <source>high</source>
-        <translation>alta</translation>
-    </message>
-    <message>
-        <source>medium-high</source>
-        <translation>mezalta</translation>
-    </message>
-    <message>
-        <source>medium</source>
-        <translation>meza</translation>
-    </message>
-    <message>
-        <source>low-medium</source>
-        <translation>mezmalalta</translation>
-    </message>
-    <message>
-        <source>low</source>
-        <translation>malalta</translation>
-    </message>
-    <message>
-        <source>lower</source>
-        <translation>pli malalta</translation>
-    </message>
-    <message>
-        <source>lowest</source>
-        <translation>plej malalta</translation>
-    </message>
-    <message>
-        <source>(%1 locked)</source>
-        <translation>(%1 ŝlosita)</translation>
-    </message>
-    <message>
-        <source>none</source>
-        <translation>neniu</translation>
-    </message>
-    <message>
-        <source>yes</source>
-        <translation>jes</translation>
-    </message>
-    <message>
-        <source>no</source>
-        <translation>ne</translation>
-    </message>
-    <message>
-        <source>This means a fee of at least %1 per kB is required.</source>
-        <translation>Tio signifas, ke krompago de almenaŭ po %1 por ĉiu kB estas deviga.</translation>
-    </message>
-    <message>
-        <source>Can vary +/- 1 byte per input.</source>
-        <translation>Povas varii po +/- 1 bajton por ĉiu enigo.</translation>
-    </message>
-    <message>
-        <source>Transactions with higher priority are more likely to get included into a block.</source>
-        <translation>Transakcioj kun pli alta prioritato havas pli altan ŝancon inkluziviĝi en bloko.</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(neniu etikedo)</translation>
-    </message>
-    <message>
-        <source>change from %1 (%2)</source>
-        <translation>restmono de %1 (%2)</translation>
-    </message>
-    <message>
-        <source>(change)</source>
-        <translation>(restmono)</translation>
-    </message>
 </context>
 <context>
     <name>EditAddressDialog</name>
@@ -744,38 +438,6 @@
         <source>&amp;Address</source>
         <translation>&amp;Adreso</translation>
     </message>
-    <message>
-        <source>New receiving address</source>
-        <translation>Nova adreso por ricevi</translation>
-    </message>
-    <message>
-        <source>New sending address</source>
-        <translation>Nova adreso por sendi</translation>
-    </message>
-    <message>
-        <source>Edit receiving address</source>
-        <translation>Redakti adreson por ricevi</translation>
-    </message>
-    <message>
-        <source>Edit sending address</source>
-        <translation>Redakti adreson por sendi</translation>
-    </message>
-    <message>
-        <source>The entered address "%1" is already in the address book.</source>
-        <translation>La adreso enigita "%1" jam ekzistas en la adresaro.</translation>
-    </message>
-    <message>
-        <source>The entered address "%1" is not a valid Bitcoin address.</source>
-        <translation>La adreso enigita "%1" ne estas valida Bitmon-adreso.</translation>
-    </message>
-    <message>
-        <source>Could not unlock wallet.</source>
-        <translation>Ne eblis malŝlosi monujon.</translation>
-    </message>
-    <message>
-        <source>New key generation failed.</source>
-        <translation>Fiaskis kreo de nova ŝlosilo.</translation>
-    </message>
 </context>
 <context>
     <name>FreespaceChecker</name>
@@ -802,18 +464,10 @@
 </context>
 <context>
     <name>HelpMessageDialog</name>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Kerno de Bitmono</translation>
-    </message>
     <message>
         <source>version</source>
         <translation>versio</translation>
     </message>
-    <message>
-        <source>About Bitcoin Core</source>
-        <translation>Pri la Bitmona Kerno</translation>
-    </message>
     <message>
         <source>Command-line options</source>
         <translation>Komandliniaj agordaĵoj</translation>
@@ -837,18 +491,6 @@
         <source>Welcome</source>
         <translation>Bonvenon</translation>
     </message>
-    <message>
-        <source>Welcome to Bitcoin Core.</source>
-        <translation>Bonvenon al la bitmona kerno, Bitcoin Core.</translation>
-    </message>
-    <message>
-        <source>As this is the first time the program is launched, you can choose where Bitcoin Core will store its data.</source>
-        <translation>Dum tiu ĉi unua uzo de la programo, vi povas elekti lokon, kie Bitcoin Core stokos siajn datumojn.</translation>
-    </message>
-    <message>
-        <source>Bitcoin Core will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source>
-        <translation>Bitcoin Core elŝutos kaj konservos kopion de la bitmona blokĉeno. Almenaŭ %1GB da datumoj konserviĝos en tiu loko, kaj tio poiome kreskos. Ankaŭ via monujo konserviĝos en tiu dosierujo.</translation>
-    </message>
     <message>
         <source>Use the default data directory</source>
         <translation>Uzi la defaŭltan dosierujon por datumoj</translation>
@@ -857,10 +499,6 @@
         <source>Use a custom data directory:</source>
         <translation>Uzi alian dosierujon por datumoj:</translation>
     </message>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Kerno de Bitmono</translation>
-    </message>
     <message>
         <source>Error</source>
         <translation>Eraro</translation>
@@ -888,10 +526,6 @@
         <source>Select payment request file</source>
         <translation>Elektu la dosieron de la pagpeto</translation>
     </message>
-    <message>
-        <source>Select payment request file to open</source>
-        <translation>Elektu la malfermotan dosieron de la pagpeto</translation>
-    </message>
 </context>
 <context>
     <name>OptionsDialog</name>
@@ -1075,49 +709,6 @@
         <translation>Lastaj transakcioj</translation>
     </message>
     </context>
-<context>
-    <name>PaymentServer</name>
-    <message>
-        <source>URI handling</source>
-        <translation>Traktado de URI-oj</translation>
-    </message>
-    <message>
-        <source>Invalid payment address %1</source>
-        <translation>Nevalida pagadreso %1</translation>
-    </message>
-    <message>
-        <source>Requested payment amount of %1 is too small (considered dust).</source>
-        <translation>La petita pagosumo de %1 estas tro malgranda (konsiderata kiel polvo).</translation>
-    </message>
-    <message>
-        <source>Payment request error</source>
-        <translation>Eraro dum pagopeto</translation>
-    </message>
-    <message>
-        <source>Cannot start bitcoin: click-to-pay handler</source>
-        <translation>Ne eblas lanĉi la ilon 'klaki-por-pagi'</translation>
-    </message>
-    <message>
-        <source>Refund from %1</source>
-        <translation>Repago de %1</translation>
-    </message>
-    <message>
-        <source>Error communicating with %1: %2</source>
-        <translation>Eraro dum komunikado kun %1: %2</translation>
-    </message>
-    <message>
-        <source>Bad response from server %1</source>
-        <translation>Malbona respondo de la servilo %1</translation>
-    </message>
-    <message>
-        <source>Payment acknowledged</source>
-        <translation>Pago agnoskita</translation>
-    </message>
-    <message>
-        <source>Network request error</source>
-        <translation>Eraro dum ret-peto</translation>
-    </message>
-</context>
 <context>
     <name>PeerTableModel</name>
     <message>
@@ -1148,25 +739,6 @@
         <translation>neaplikebla</translation>
     </message>
     </context>
-<context>
-    <name>QRImageWidget</name>
-    <message>
-        <source>&amp;Save Image...</source>
-        <translation>&amp;Konservi Bildon...</translation>
-    </message>
-    <message>
-        <source>&amp;Copy Image</source>
-        <translation>&amp;Kopii Bildon</translation>
-    </message>
-    <message>
-        <source>Save QR Code</source>
-        <translation>Konservi QR-kodon</translation>
-    </message>
-    <message>
-        <source>PNG Image (*.png)</source>
-        <translation>PNG-bildo (*.png)</translation>
-    </message>
-</context>
 <context>
     <name>RPCConsole</name>
     <message>
@@ -1277,10 +849,6 @@
         <source>Out:</source>
         <translation>El:</translation>
     </message>
-    <message>
-        <source>Build date</source>
-        <translation>Dato de kompilado</translation>
-    </message>
     <message>
         <source>Debug log file</source>
         <translation>Sencimiga protokoldosiero</translation>
@@ -1356,18 +924,6 @@
         <source>Remove</source>
         <translation>Forigi</translation>
     </message>
-    <message>
-        <source>Copy label</source>
-        <translation>Kopii etikedon</translation>
-    </message>
-    <message>
-        <source>Copy message</source>
-        <translation>Kopiu mesaĝon</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>Kopii sumon</translation>
-    </message>
 </context>
 <context>
     <name>ReceiveRequestDialog</name>
@@ -1387,103 +943,40 @@
         <source>&amp;Save Image...</source>
         <translation>&amp;Konservi Bildon...</translation>
     </message>
+</context>
+<context>
+    <name>SendCoinsDialog</name>
     <message>
-        <source>Request payment to %1</source>
-        <translation>Peti pagon al %1</translation>
+        <source>Send Coins</source>
+        <translation>Sendi Bitmonon</translation>
     </message>
     <message>
-        <source>Payment information</source>
-        <translation>Paginformoj</translation>
+        <source>Coin Control Features</source>
+        <translation>Monregaj Opcioj</translation>
     </message>
     <message>
-        <source>URI</source>
-        <translation>URI</translation>
+        <source>Inputs...</source>
+        <translation>Enigoj...</translation>
     </message>
     <message>
-        <source>Address</source>
-        <translation>Adreso</translation>
+        <source>Insufficient funds!</source>
+        <translation>Nesufiĉa mono!</translation>
     </message>
     <message>
-        <source>Amount</source>
-        <translation>Sumo</translation>
+        <source>Quantity:</source>
+        <translation>Kvanto:</translation>
     </message>
     <message>
-        <source>Label</source>
-        <translation>Etikedo</translation>
+        <source>Bytes:</source>
+        <translation>Bajtoj:</translation>
     </message>
     <message>
-        <source>Message</source>
-        <translation>Mesaĝo</translation>
+        <source>Amount:</source>
+        <translation>Sumo:</translation>
     </message>
     <message>
-        <source>Resulting URI too long, try to reduce the text for label / message.</source>
-        <translation>La rezultanta URI estas tro longa. Provu malplilongigi la tekston de la etikedo / mesaĝo.</translation>
-    </message>
-    <message>
-        <source>Error encoding URI into QR Code.</source>
-        <translation>Eraro de kodigo de URI en la QR-kodon.</translation>
-    </message>
-</context>
-<context>
-    <name>RecentRequestsTableModel</name>
-    <message>
-        <source>Date</source>
-        <translation>Dato</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Etikedo</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>Mesaĝo</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>Sumo</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(neniu etikedo)</translation>
-    </message>
-    <message>
-        <source>(no message)</source>
-        <translation>(neniu mesaĝo)</translation>
-    </message>
-    </context>
-<context>
-    <name>SendCoinsDialog</name>
-    <message>
-        <source>Send Coins</source>
-        <translation>Sendi Bitmonon</translation>
-    </message>
-    <message>
-        <source>Coin Control Features</source>
-        <translation>Monregaj Opcioj</translation>
-    </message>
-    <message>
-        <source>Inputs...</source>
-        <translation>Enigoj...</translation>
-    </message>
-    <message>
-        <source>Insufficient funds!</source>
-        <translation>Nesufiĉa mono!</translation>
-    </message>
-    <message>
-        <source>Quantity:</source>
-        <translation>Kvanto:</translation>
-    </message>
-    <message>
-        <source>Bytes:</source>
-        <translation>Bajtoj:</translation>
-    </message>
-    <message>
-        <source>Amount:</source>
-        <translation>Sumo:</translation>
-    </message>
-    <message>
-        <source>Priority:</source>
-        <translation>Prioritato:</translation>
+        <source>Priority:</source>
+        <translation>Prioritato:</translation>
     </message>
     <message>
         <source>Fee:</source>
@@ -1533,82 +1026,6 @@
         <source>S&amp;end</source>
         <translation>Ŝendi</translation>
     </message>
-    <message>
-        <source>Confirm send coins</source>
-        <translation>Konfirmi sendon de bitmono</translation>
-    </message>
-    <message>
-        <source>%1 to %2</source>
-        <translation>%1 al %2</translation>
-    </message>
-    <message>
-        <source>Copy quantity</source>
-        <translation>Kopii kvanton</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>Kopii sumon</translation>
-    </message>
-    <message>
-        <source>Copy fee</source>
-        <translation>Kopii krompagon</translation>
-    </message>
-    <message>
-        <source>Copy after fee</source>
-        <translation>Kopii post krompago</translation>
-    </message>
-    <message>
-        <source>Copy bytes</source>
-        <translation>Kopii bajtojn</translation>
-    </message>
-    <message>
-        <source>Copy priority</source>
-        <translation>Kopii prioritaton</translation>
-    </message>
-    <message>
-        <source>Copy change</source>
-        <translation>Kopii restmonon</translation>
-    </message>
-    <message>
-        <source>or</source>
-        <translation>aŭ</translation>
-    </message>
-    <message>
-        <source>The amount to pay must be larger than 0.</source>
-        <translation>La pagenda sumo devas esti pli ol 0.</translation>
-    </message>
-    <message>
-        <source>The amount exceeds your balance.</source>
-        <translation>La sumo estas pli granda ol via saldo.</translation>
-    </message>
-    <message>
-        <source>The total exceeds your balance when the %1 transaction fee is included.</source>
-        <translation>La sumo kun la %1 krompago estas pli granda ol via saldo.</translation>
-    </message>
-    <message>
-        <source>Transaction creation failed!</source>
-        <translation>Kreo de transakcio fiaskis!</translation>
-    </message>
-    <message>
-        <source>Warning: Invalid Bitcoin address</source>
-        <translation>Averto: Nevalida Bitmon-adreso</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(neniu etikedo)</translation>
-    </message>
-    <message>
-        <source>Copy dust</source>
-        <translation>Kopii polvon</translation>
-    </message>
-    <message>
-        <source>Are you sure you want to send?</source>
-        <translation>Ĉu vi certas, ke vi volas sendi?</translation>
-    </message>
-    <message>
-        <source>added as transaction fee</source>
-        <translation>aldonita kiel krompago</translation>
-    </message>
 </context>
 <context>
     <name>SendCoinsEntry</name>
@@ -1620,10 +1037,6 @@
         <source>Pay &amp;To:</source>
         <translation>&amp;Ricevonto:</translation>
     </message>
-    <message>
-        <source>Enter a label for this address to add it to your address book</source>
-        <translation>Tajpu etikedon por tiu ĉi adreso kaj aldonu ĝin al via adresaro</translation>
-    </message>
     <message>
         <source>&amp;Label:</source>
         <translation>&amp;Etikedo:</translation>
@@ -1746,69 +1159,9 @@
         <source>Reset all verify message fields</source>
         <translation>Reagordigi ĉiujn prikontrolajn kampojn</translation>
     </message>
-    <message>
-        <source>Click "Sign Message" to generate signature</source>
-        <translation>Klaku "Subskribi Mesaĝon" por krei subskribon</translation>
-    </message>
-    <message>
-        <source>The entered address is invalid.</source>
-        <translation>La adreso, kiun vi enmetis, estas nevalida.</translation>
-    </message>
-    <message>
-        <source>Please check the address and try again.</source>
-        <translation>Bonvolu kontroli la adreson kaj reprovi.</translation>
-    </message>
-    <message>
-        <source>The entered address does not refer to a key.</source>
-        <translation>La adreso, kiun vi enmetis, referencas neniun ŝlosilon.</translation>
-    </message>
-    <message>
-        <source>Wallet unlock was cancelled.</source>
-        <translation>Malŝloso de monujo estas nuligita.</translation>
-    </message>
-    <message>
-        <source>Private key for the entered address is not available.</source>
-        <translation>La privata ŝlosilo por la enigita adreso ne disponeblas.</translation>
-    </message>
-    <message>
-        <source>Message signing failed.</source>
-        <translation>Subskribo de mesaĝo fiaskis.</translation>
-    </message>
-    <message>
-        <source>Message signed.</source>
-        <translation>Mesaĝo estas subskribita.</translation>
-    </message>
-    <message>
-        <source>The signature could not be decoded.</source>
-        <translation>Ne eblis malĉifri la subskribon.</translation>
-    </message>
-    <message>
-        <source>Please check the signature and try again.</source>
-        <translation>Bonvolu kontroli la subskribon kaj reprovu.</translation>
-    </message>
-    <message>
-        <source>The signature did not match the message digest.</source>
-        <translation>La subskribo ne kongruis kun la mesaĝ-kompilaĵo.</translation>
-    </message>
-    <message>
-        <source>Message verification failed.</source>
-        <translation>Kontrolo de mesaĝo malsukcesis.</translation>
-    </message>
-    <message>
-        <source>Message verified.</source>
-        <translation>Mesaĝo sukcese kontrolita.</translation>
-    </message>
 </context>
 <context>
     <name>SplashScreen</name>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Kerno de Bitmono</translation>
-    </message>
-    <message>
-        <source>The Bitcoin Core developers</source>
-        <translation>La programistoj de Bitmona Kerno</translation>
-    </message>
     <message>
         <source>[testnet]</source>
         <translation>[testnet]</translation>
@@ -1821,382 +1174,16 @@
         <translation>KB/s</translation>
     </message>
 </context>
-<context>
-    <name>TransactionDesc</name>
-    <message>
-        <source>Open until %1</source>
-        <translation>Malferma ĝis %1</translation>
-    </message>
-    <message>
-        <source>%1/offline</source>
-        <translation>%1/senkonekte</translation>
-    </message>
-    <message>
-        <source>%1/unconfirmed</source>
-        <translation>%1/nekonfirmite</translation>
-    </message>
-    <message>
-        <source>%1 confirmations</source>
-        <translation>%1 konfirmoj</translation>
-    </message>
-    <message>
-        <source>Status</source>
-        <translation>Stato</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation>Dato</translation>
-    </message>
-    <message>
-        <source>Source</source>
-        <translation>Fonto</translation>
-    </message>
-    <message>
-        <source>Generated</source>
-        <translation>Kreita</translation>
-    </message>
-    <message>
-        <source>From</source>
-        <translation>De</translation>
-    </message>
-    <message>
-        <source>To</source>
-        <translation>Al</translation>
-    </message>
-    <message>
-        <source>own address</source>
-        <translation>propra adreso</translation>
-    </message>
-    <message>
-        <source>label</source>
-        <translation>etikedo</translation>
-    </message>
-    <message>
-        <source>Credit</source>
-        <translation>Kredito</translation>
-    </message>
-    <message>
-        <source>not accepted</source>
-        <translation>ne akceptita</translation>
-    </message>
-    <message>
-        <source>Debit</source>
-        <translation>Debeto</translation>
-    </message>
-    <message>
-        <source>Transaction fee</source>
-        <translation>Krompago</translation>
-    </message>
-    <message>
-        <source>Net amount</source>
-        <translation>Neta sumo</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>Mesaĝo</translation>
-    </message>
-    <message>
-        <source>Comment</source>
-        <translation>Komento</translation>
-    </message>
-    <message>
-        <source>Transaction ID</source>
-        <translation>Transakcia ID</translation>
-    </message>
-    <message>
-        <source>Merchant</source>
-        <translation>Vendisto</translation>
-    </message>
-    <message>
-        <source>Generated coins must mature %1 blocks before they can be spent. When you generated this block, it was broadcast to the network to be added to the block chain. If it fails to get into the chain, its state will change to "not accepted" and it won't be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source>
-        <translation>Kreitaj moneroj devas esti maturaj je %1 blokoj antaŭ ol eblas elspezi ilin. Kiam vi generis tiun ĉi blokon, ĝi estis elsendita al la reto por aldono al la blokĉeno. Se tiu aldono malsukcesas, ĝia stato ŝanĝiĝos al "neakceptita" kaj ne eblos elspezi ĝin. Tio estas malofta, sed povas okazi se alia bloko estas kreita je preskaŭ la sama momento kiel la via.</translation>
-    </message>
-    <message>
-        <source>Debug information</source>
-        <translation>Sencimigaj informoj</translation>
-    </message>
-    <message>
-        <source>Transaction</source>
-        <translation>Transakcio</translation>
-    </message>
-    <message>
-        <source>Inputs</source>
-        <translation>Enigoj</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>Sumo</translation>
-    </message>
-    <message>
-        <source>true</source>
-        <translation>vera</translation>
-    </message>
-    <message>
-        <source>false</source>
-        <translation>malvera</translation>
-    </message>
-    <message>
-        <source>, has not been successfully broadcast yet</source>
-        <translation>, ankoraŭ ne elsendita sukcese</translation>
-    </message>
-    <message>
-        <source>unknown</source>
-        <translation>nekonata</translation>
-    </message>
-</context>
 <context>
     <name>TransactionDescDialog</name>
-    <message>
-        <source>Transaction details</source>
-        <translation>Transakciaj detaloj</translation>
-    </message>
     <message>
         <source>This pane shows a detailed description of the transaction</source>
         <translation>Tiu ĉi panelo montras detalan priskribon de la transakcio</translation>
     </message>
 </context>
-<context>
-    <name>TransactionTableModel</name>
-    <message>
-        <source>Date</source>
-        <translation>Dato</translation>
-    </message>
-    <message>
-        <source>Type</source>
-        <translation>Tipo</translation>
-    </message>
-    <message>
-        <source>Open until %1</source>
-        <translation>Malferma ĝis %1</translation>
-    </message>
-    <message>
-        <source>Confirmed (%1 confirmations)</source>
-        <translation>Konfirmita (%1 konfirmoj)</translation>
-    </message>
-    <message>
-        <source>This block was not received by any other nodes and will probably not be accepted!</source>
-        <translation>Tiun ĉi blokon ne ricevis ajna alia nodo, kaj ĝi verŝajne ne akceptiĝos!</translation>
-    </message>
-    <message>
-        <source>Generated but not accepted</source>
-        <translation>Kreita sed ne akceptita</translation>
-    </message>
-    <message>
-        <source>Offline</source>
-        <translation>Senkonekte</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Etikedo</translation>
-    </message>
-    <message>
-        <source>Unconfirmed</source>
-        <translation>Nekonfirmita</translation>
-    </message>
-    <message>
-        <source>Received with</source>
-        <translation>Ricevita kun</translation>
-    </message>
-    <message>
-        <source>Received from</source>
-        <translation>Ricevita de</translation>
-    </message>
-    <message>
-        <source>Sent to</source>
-        <translation>Sendita al</translation>
-    </message>
-    <message>
-        <source>Payment to yourself</source>
-        <translation>Pago al vi mem</translation>
-    </message>
-    <message>
-        <source>Mined</source>
-        <translation>Minita</translation>
-    </message>
-    <message>
-        <source>(n/a)</source>
-        <translation>neaplikebla</translation>
-    </message>
-    <message>
-        <source>Transaction status. Hover over this field to show number of confirmations.</source>
-        <translation>Transakcia stato. Ŝvebi super tiu ĉi kampo por montri la nombron de konfirmoj.</translation>
-    </message>
-    <message>
-        <source>Date and time that the transaction was received.</source>
-        <translation>Dato kaj horo kiam la transakcio alvenis.</translation>
-    </message>
-    <message>
-        <source>Type of transaction.</source>
-        <translation>Tipo de transakcio.</translation>
-    </message>
-    <message>
-        <source>Amount removed from or added to balance.</source>
-        <translation>Sumo elprenita de aŭ aldonita al la saldo.</translation>
-    </message>
-</context>
-<context>
-    <name>TransactionView</name>
-    <message>
-        <source>All</source>
-        <translation>Ĉiuj</translation>
-    </message>
-    <message>
-        <source>Today</source>
-        <translation>Hodiaŭ</translation>
-    </message>
-    <message>
-        <source>This week</source>
-        <translation>Ĉi-semajne</translation>
-    </message>
-    <message>
-        <source>This month</source>
-        <translation>Ĉi-monate</translation>
-    </message>
-    <message>
-        <source>Last month</source>
-        <translation>Pasintmonate</translation>
-    </message>
-    <message>
-        <source>This year</source>
-        <translation>Ĉi-jare</translation>
-    </message>
-    <message>
-        <source>Range...</source>
-        <translation>Intervalo...</translation>
-    </message>
-    <message>
-        <source>Received with</source>
-        <translation>Ricevita kun</translation>
-    </message>
-    <message>
-        <source>Sent to</source>
-        <translation>Sendita al</translation>
-    </message>
-    <message>
-        <source>To yourself</source>
-        <translation>Al vi mem</translation>
-    </message>
-    <message>
-        <source>Mined</source>
-        <translation>Minita</translation>
-    </message>
-    <message>
-        <source>Other</source>
-        <translation>Aliaj</translation>
-    </message>
-    <message>
-        <source>Enter address or label to search</source>
-        <translation>Tajpu adreson aŭ etikedon por serĉi</translation>
-    </message>
-    <message>
-        <source>Min amount</source>
-        <translation>Minimuma sumo</translation>
-    </message>
-    <message>
-        <source>Copy address</source>
-        <translation>Kopii adreson</translation>
-    </message>
-    <message>
-        <source>Copy label</source>
-        <translation>Kopii etikedon</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>Kopii sumon</translation>
-    </message>
-    <message>
-        <source>Copy transaction ID</source>
-        <translation>Kopii transakcian ID-on</translation>
-    </message>
-    <message>
-        <source>Edit label</source>
-        <translation>Redakti etikedon</translation>
-    </message>
-    <message>
-        <source>Show transaction details</source>
-        <translation>Montri detalojn de transakcio</translation>
-    </message>
-    <message>
-        <source>Exporting Failed</source>
-        <translation>ekspotado malsukcesinta</translation>
-    </message>
-    <message>
-        <source>Comma separated file (*.csv)</source>
-        <translation>Perkome disigita dosiero (*.csv)</translation>
-    </message>
-    <message>
-        <source>Confirmed</source>
-        <translation>Konfirmita</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation>Dato</translation>
-    </message>
-    <message>
-        <source>Type</source>
-        <translation>Tipo</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Etikedo</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>Adreso</translation>
-    </message>
-    <message>
-        <source>ID</source>
-        <translation>ID</translation>
-    </message>
-    <message>
-        <source>Range:</source>
-        <translation>Intervalo:</translation>
-    </message>
-    <message>
-        <source>to</source>
-        <translation>al</translation>
-    </message>
-</context>
 <context>
     <name>UnitDisplayStatusBarControl</name>
     </context>
-<context>
-    <name>WalletFrame</name>
-    </context>
-<context>
-    <name>WalletModel</name>
-    <message>
-        <source>Send Coins</source>
-        <translation>Sendi Bitmonon</translation>
-    </message>
-</context>
-<context>
-    <name>WalletView</name>
-    <message>
-        <source>&amp;Export</source>
-        <translation>&amp;Eksporti</translation>
-    </message>
-    <message>
-        <source>Export the data in the current tab to a file</source>
-        <translation>Eksporti la datumojn el la aktuala langeto al dosiero</translation>
-    </message>
-    <message>
-        <source>Backup Wallet</source>
-        <translation>Krei sekurkopion de monujo</translation>
-    </message>
-    <message>
-        <source>Wallet Data (*.dat)</source>
-        <translation>Monuj-datumoj (*.dat)</translation>
-    </message>
-    <message>
-        <source>Backup Failed</source>
-        <translation>Malsukcesis sekurkopio</translation>
-    </message>
-    <message>
-        <source>Backup Successful</source>
-        <translation>Sukcesis krei sekurkopion</translation>
-    </message>
-</context>
 <context>
     <name>bitcoin-core</name>
     <message>
@@ -2227,6 +1214,10 @@
         <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
         <translation>Akcepti konektojn el ekstere (defaŭlte: 1 se ne estas -proxy nek -connect)</translation>
     </message>
+    <message>
+        <source>Bitcoin Core</source>
+        <translation>Kerno de Bitmono</translation>
+    </message>
     <message>
         <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source>
         <translation>Bindi al donita adreso kaj ĉiam aŭskulti per ĝi. Uzu la formaton [gastigo]:pordo por IPv6</translation>
@@ -2247,10 +1238,6 @@
         <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source>
         <translation>Averto: ŝajne ni ne tute konsentas kun niaj samtavolanoj! Eble vi devas ĝisdatigi vian klienton, aŭ eble aliaj nodoj faru same.</translation>
     </message>
-    <message>
-        <source>Warning: wallet.dat corrupt, data salvaged! Original wallet.dat saved as wallet.{timestamp}.bak in %s; if your balance or transactions are incorrect you should restore from a backup.</source>
-        <translation>Averto: via wallet.dat estas difektita, sed la datumoj sukcese saviĝis! La originala wallet.dat estas nun konservita kiel wallet.{timestamp}.bak en %s; se via saldo aŭ transakcioj estas malĝustaj vi devus restaŭri per alia sekurkopio.</translation>
-    </message>
     <message>
         <source>&lt;category&gt; can be:</source>
         <translation>&lt;category&gt; povas esti:</translation>
@@ -2327,34 +1314,14 @@
         <source>Wallet options:</source>
         <translation>Monujaj opcioj:</translation>
     </message>
-    <message>
-        <source>You need to rebuild the database using -reindex to change -txindex</source>
-        <translation>Vi devas rekontrui la datumbazon kun -reindex por ŝanĝi -txindex</translation>
-    </message>
     <message>
         <source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source>
         <translation>Plenumi komandon kiam rilata alerto riceviĝas, aŭ kiam ni vidas tre longan forkon (%s en cms anstataŭiĝas per mesaĝo)</translation>
     </message>
-    <message>
-        <source>Cannot resolve -whitebind address: '%s'</source>
-        <translation>Ne eblas trovi la adreson -whitebind: '%s'</translation>
-    </message>
     <message>
         <source>Information</source>
         <translation>Informoj</translation>
     </message>
-    <message>
-        <source>Invalid amount for -maxtxfee=&lt;amount&gt;: '%s'</source>
-        <translation>Nevalida sumo por -maxtxfee=&lt;amount&gt;: '%s'</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -minrelaytxfee=&lt;amount&gt;: '%s'</source>
-        <translation>Nevalida sumo por -minrelaytxfee=&lt;amount&gt;: '%s'</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -mintxfee=&lt;amount&gt;: '%s'</source>
-        <translation>Nevalida sumo por -mintxfee=&lt;amount&gt;: '%s'</translation>
-    </message>
     <message>
         <source>Send trace/debug info to console instead of debug.log file</source>
         <translation>Sendi spurajn/sencimigajn informojn al la konzolo anstataŭ al dosiero debug.log</translation>
@@ -2391,10 +1358,6 @@
         <source>Warning</source>
         <translation>Averto</translation>
     </message>
-    <message>
-        <source>wallet.dat corrupt, salvage failed</source>
-        <translation>wallet.dat estas difektita, riparo malsukcesis</translation>
-    </message>
     <message>
         <source>Password for JSON-RPC connections</source>
         <translation>Pasvorto por konektoj JSON-RPC</translation>
@@ -2403,10 +1366,6 @@
         <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
         <translation>Plenumi komandon kiam plej bona bloko ŝanĝiĝas (%s en cmd anstataŭiĝas per bloka haketaĵo)</translation>
     </message>
-    <message>
-        <source>This help message</source>
-        <translation>Tiu ĉi helpmesaĝo</translation>
-    </message>
     <message>
         <source>Allow DNS lookups for -addnode, -seednode and -connect</source>
         <translation>Permesi DNS-elserĉojn por -addnote, -seednote kaj -connect</translation>
@@ -2415,14 +1374,6 @@
         <source>Loading addresses...</source>
         <translation>Ŝarĝante adresojn...</translation>
     </message>
-    <message>
-        <source>Error loading wallet.dat: Wallet corrupted</source>
-        <translation>Eraro dum ŝargado de wallet.dat: monujo difektita</translation>
-    </message>
-    <message>
-        <source>Error loading wallet.dat</source>
-        <translation>Eraro dum ŝargado de wallet.dat</translation>
-    </message>
     <message>
         <source>Invalid -proxy address: '%s'</source>
         <translation>Nevalid adreso -proxy: '%s'</translation>
@@ -2431,18 +1382,6 @@
         <source>Unknown network specified in -onlynet: '%s'</source>
         <translation>Nekonata reto specifita en -onlynet: '%s'</translation>
     </message>
-    <message>
-        <source>Cannot resolve -bind address: '%s'</source>
-        <translation>Ne eblas trovi la adreson -bind: '%s'</translation>
-    </message>
-    <message>
-        <source>Cannot resolve -externalip address: '%s'</source>
-        <translation>Ne eblas trovi la adreson -externalip: '%s'</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -paytxfee=&lt;amount&gt;: '%s'</source>
-        <translation>Nevalida sumo por -paytxfee=&lt;amount&gt;: '%s'</translation>
-    </message>
     <message>
         <source>Insufficient funds</source>
         <translation>Nesufiĉa mono</translation>
diff --git a/src/qt/locale/bitcoin_es.ts b/src/qt/locale/bitcoin_es.ts
index 5322634c5db98..fc430e86b3c04 100644
--- a/src/qt/locale/bitcoin_es.ts
+++ b/src/qt/locale/bitcoin_es.ts
@@ -25,10 +25,6 @@
         <source>C&amp;lose</source>
         <translation>C&amp;errar</translation>
     </message>
-    <message>
-        <source>&amp;Copy Address</source>
-        <translation>&amp;Copiar dirección</translation>
-    </message>
     <message>
         <source>Delete the currently selected address from the list</source>
         <translation>Eliminar la dirección seleccionada de la lista</translation>
@@ -45,73 +41,6 @@
         <source>&amp;Delete</source>
         <translation>&amp;Eliminar</translation>
     </message>
-    <message>
-        <source>Choose the address to send coins to</source>
-        <translation>Elija la dirección para enviar monedas a</translation>
-    </message>
-    <message>
-        <source>Choose the address to receive coins with</source>
-        <translation>Elija la dirección para recibir monedas con</translation>
-    </message>
-    <message>
-        <source>C&amp;hoose</source>
-        <translation>E&amp;scoger</translation>
-    </message>
-    <message>
-        <source>Sending addresses</source>
-        <translation>Direcciones de envío</translation>
-    </message>
-    <message>
-        <source>Receiving addresses</source>
-        <translation>Direcciones de recepción</translation>
-    </message>
-    <message>
-        <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source>
-        <translation>Estas son tus direcciones Bitcoin para enviar los pagos. Comprueba siempre la cantidad y la dirección receptora antes de enviar las monedas.</translation>
-    </message>
-    <message>
-        <source>These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source>
-        <translation>Estas son tus direcciones de Bitcoin para recibir los pagos. Se recomienda utilizar una nueva dirección de recepción para cada transacción.</translation>
-    </message>
-    <message>
-        <source>Copy &amp;Label</source>
-        <translation>Copiar &amp;Etiqueta</translation>
-    </message>
-    <message>
-        <source>&amp;Edit</source>
-        <translation>&amp;Editar</translation>
-    </message>
-    <message>
-        <source>Export Address List</source>
-        <translation>Exportar la lista de direcciones </translation>
-    </message>
-    <message>
-        <source>Comma separated file (*.csv)</source>
-        <translation>Archivos separados por coma (*.csv)</translation>
-    </message>
-    <message>
-        <source>Exporting Failed</source>
-        <translation>Fallo al exportar</translation>
-    </message>
-    <message>
-        <source>There was an error trying to save the address list to %1. Please try again.</source>
-        <translation>Hubo un error al tratar de guardar en la lista de direcciones a %1 . Por favor, vuelve a intentarlo .</translation>
-    </message>
-</context>
-<context>
-    <name>AddressTableModel</name>
-    <message>
-        <source>Label</source>
-        <translation>Etiqueta</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>Dirección</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(sin etiqueta)</translation>
-    </message>
 </context>
 <context>
     <name>AskPassphraseDialog</name>
@@ -131,94 +60,6 @@
         <source>Repeat new passphrase</source>
         <translation>Repita la nueva contraseña</translation>
     </message>
-    <message>
-        <source>Encrypt wallet</source>
-        <translation>Cifrar el monedero</translation>
-    </message>
-    <message>
-        <source>This operation needs your wallet passphrase to unlock the wallet.</source>
-        <translation>Esta operación requiere su contraseña para desbloquear el monedero.</translation>
-    </message>
-    <message>
-        <source>Unlock wallet</source>
-        <translation>Desbloquear monedero</translation>
-    </message>
-    <message>
-        <source>This operation needs your wallet passphrase to decrypt the wallet.</source>
-        <translation>Esta operación requiere su contraseña para descifrar el monedero.</translation>
-    </message>
-    <message>
-        <source>Decrypt wallet</source>
-        <translation>Descifrar el monedero</translation>
-    </message>
-    <message>
-        <source>Change passphrase</source>
-        <translation>Cambiar contraseña</translation>
-    </message>
-    <message>
-        <source>Confirm wallet encryption</source>
-        <translation>Confirmar cifrado del monedero</translation>
-    </message>
-    <message>
-        <source>Warning: If you encrypt your wallet and lose your passphrase, you will &lt;b&gt;LOSE ALL OF YOUR BITCOINS&lt;/b&gt;!</source>
-        <translation>Atencion: ¡Si cifra su monedero y pierde la contraseña perderá &lt;b&gt;TODOS SUS BITCOINS&lt;/b&gt;!"</translation>
-    </message>
-    <message>
-        <source>Are you sure you wish to encrypt your wallet?</source>
-        <translation>¿Estás seguro que deseas cifrar tu monedero ?</translation>
-    </message>
-    <message>
-        <source>Bitcoin Core will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source>
-        <translation>Bitcoin Core se cerrará ahora para completar el procedo de encriptación. Recuerda que encriptar tu cartera no te protegerá completamente de la pérdida de bitcoins por infección de malware en tu computadora.</translation>
-    </message>
-    <message>
-        <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source>
-        <translation>IMPORTANTE: Cualquier copia de seguridad que haya realizado previamente de su archivo de monedero debe reemplazarse con el nuevo archivo de monedero cifrado. Por razones de seguridad, las copias de seguridad previas del archivo de monedero no cifradas serán inservibles en cuanto comience a usar el nuevo monedero cifrado.</translation>
-    </message>
-    <message>
-        <source>Warning: The Caps Lock key is on!</source>
-        <translation>Aviso: ¡La tecla de Mayúsculas está activada!</translation>
-    </message>
-    <message>
-        <source>Wallet encrypted</source>
-        <translation>Monedero cifrado</translation>
-    </message>
-    <message>
-        <source>Enter the new passphrase to the wallet.&lt;br/&gt;Please use a passphrase of &lt;b&gt;ten or more random characters&lt;/b&gt;, or &lt;b&gt;eight or more words&lt;/b&gt;.</source>
-        <translation>Introduzca la nueva contraseña para el monedero.&lt;br/&gt;Utilice por favor una contraseña con &lt;b&gt;diez o más caracteres aleatorios&lt;/b&gt; o con &lt;b&gt;ocho o más palabras&lt;/b&gt;.</translation>
-    </message>
-    <message>
-        <source>Enter the old passphrase and new passphrase to the wallet.</source>
-        <translation>Introduce la antigua y la nueva contraseña de la cartera.</translation>
-    </message>
-    <message>
-        <source>Wallet encryption failed</source>
-        <translation>Ha fallado el cifrado del monedero</translation>
-    </message>
-    <message>
-        <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
-        <translation>Ha fallado el cifrado del monedero debido a un error interno. El monedero no ha sido cifrado.</translation>
-    </message>
-    <message>
-        <source>The supplied passphrases do not match.</source>
-        <translation>Las contraseñas no coinciden.</translation>
-    </message>
-    <message>
-        <source>Wallet unlock failed</source>
-        <translation>Ha fallado el desbloqueo del monedero</translation>
-    </message>
-    <message>
-        <source>The passphrase entered for the wallet decryption was incorrect.</source>
-        <translation>La contraseña introducida para descifrar el monedero es incorrecta.</translation>
-    </message>
-    <message>
-        <source>Wallet decryption failed</source>
-        <translation>Ha fallado el descifrado del monedero</translation>
-    </message>
-    <message>
-        <source>Wallet passphrase was successfully changed.</source>
-        <translation>Se ha cambiado correctamente la contraseña del monedero.</translation>
-    </message>
 </context>
 <context>
     <name>BanTableModel</name>
@@ -269,6 +110,14 @@
         <source>Quit application</source>
         <translation>Salir de la aplicación</translation>
     </message>
+    <message>
+        <source>&amp;About %1</source>
+        <translation>&amp;Acerca de %1</translation>
+    </message>
+    <message>
+        <source>Show information about %1</source>
+        <translation>Mostrar información acerca de %1</translation>
+    </message>
     <message>
         <source>About &amp;Qt</source>
         <translation>Acerca de &amp;Qt</translation>
@@ -281,6 +130,10 @@
         <source>&amp;Options...</source>
         <translation>&amp;Opciones...</translation>
     </message>
+    <message>
+        <source>Modify configuration options for %1</source>
+        <translation>Modificar las opciones de configuración para %1</translation>
+    </message>
     <message>
         <source>&amp;Encrypt Wallet...</source>
         <translation>&amp;Cifrar monedero…</translation>
@@ -305,14 +158,6 @@
         <source>Open &amp;URI...</source>
         <translation>Abrir &amp;URI...</translation>
     </message>
-    <message>
-        <source>Bitcoin Core client</source>
-        <translation>Cliente Bitcoin Core</translation>
-    </message>
-    <message>
-        <source>Importing blocks from disk...</source>
-        <translation>Importando bloques de disco...</translation>
-    </message>
     <message>
         <source>Reindexing blocks on disk...</source>
         <translation>Reindexando bloques en disco...</translation>
@@ -357,10 +202,6 @@
         <source>&amp;Receive</source>
         <translation>&amp;Recibir</translation>
     </message>
-    <message>
-        <source>Show information about Bitcoin Core</source>
-        <translation>Mostrar información acerca de Bitcoin Core</translation>
-    </message>
     <message>
         <source>&amp;Show / Hide</source>
         <translation>&amp;Mostrar / Ocultar</translation>
@@ -397,22 +238,10 @@
         <source>Tabs toolbar</source>
         <translation>Barra de pestañas</translation>
     </message>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Bitcoin Core</translation>
-    </message>
     <message>
         <source>Request payments (generates QR codes and bitcoin: URIs)</source>
         <translation>Solicitar pagos (generando códigos QR e identificadores URI "bitcoin:")</translation>
     </message>
-    <message>
-        <source>&amp;About Bitcoin Core</source>
-        <translation>&amp;Acerca de Bitcoin Core</translation>
-    </message>
-    <message>
-        <source>Modify configuration options for Bitcoin Core</source>
-        <translation>Modificar las opciones de configuración de Bitcoin</translation>
-    </message>
     <message>
         <source>Show the list of used sending addresses and labels</source>
         <translation>Mostrar la lista de direcciones de envío y etiquetas</translation>
@@ -429,14 +258,18 @@
         <source>&amp;Command-line options</source>
         <translation>&amp;Opciones de consola de comandos</translation>
     </message>
-    <message>
-        <source>Show the Bitcoin Core help message to get a list with possible Bitcoin command-line options</source>
-        <translation>Mostrar el mensaje de ayuda de Bitcoin Core con una lista de las posibles opciones de la consola de comandos de Bitcoin</translation>
-    </message>
     <message numerus="yes">
         <source>%n active connection(s) to Bitcoin network</source>
         <translation><numerusform>%n conexión activa hacia la red Bitcoin</numerusform><numerusform>%n conexiones activas hacia la red Bitcoin</numerusform></translation>
     </message>
+    <message>
+        <source>Indexing blocks on disk...</source>
+        <translation>Indexando bloques en disco...</translation>
+    </message>
+    <message>
+        <source>Processing blocks on disk...</source>
+        <translation>Procesando bloques en disco...</translation>
+    </message>
     <message>
         <source>No block source available...</source>
         <translation>Ninguna fuente de bloques disponible ...</translation>
@@ -493,6 +326,14 @@
         <source>Up to date</source>
         <translation>Actualizado</translation>
     </message>
+    <message>
+        <source>Show the %1 help message to get a list with possible Bitcoin command-line options</source>
+        <translation>Mostrar el mensaje de ayuda %1 para obtener una lista de los posibles comandos de linea de comandos de Bitcoin</translation>
+    </message>
+    <message>
+        <source>%1 client</source>
+        <translation>%1 cliente</translation>
+    </message>
     <message>
         <source>Catching up...</source>
         <translation>Actualizando...</translation>
@@ -544,13 +385,6 @@
         <translation>El monedero está &lt;b&gt;cifrado&lt;/b&gt; y actualmente &lt;b&gt;bloqueado&lt;/b&gt;</translation>
     </message>
 </context>
-<context>
-    <name>ClientModel</name>
-    <message>
-        <source>Network Alert</source>
-        <translation>Alerta de red</translation>
-    </message>
-</context>
 <context>
     <name>CoinControlDialog</name>
     <message>
@@ -629,150 +463,6 @@
         <source>Priority</source>
         <translation>Prioridad</translation>
     </message>
-    <message>
-        <source>Copy address</source>
-        <translation>Copiar dirección</translation>
-    </message>
-    <message>
-        <source>Copy label</source>
-        <translation>Copiar etiqueta</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>Copiar cuantía</translation>
-    </message>
-    <message>
-        <source>Copy transaction ID</source>
-        <translation>Copiar identificador de transacción</translation>
-    </message>
-    <message>
-        <source>Lock unspent</source>
-        <translation>Bloquear lo no gastado</translation>
-    </message>
-    <message>
-        <source>Unlock unspent</source>
-        <translation>Desbloquear lo no gastado</translation>
-    </message>
-    <message>
-        <source>Copy quantity</source>
-        <translation>Copiar cantidad</translation>
-    </message>
-    <message>
-        <source>Copy fee</source>
-        <translation>Copiar comisión</translation>
-    </message>
-    <message>
-        <source>Copy after fee</source>
-        <translation>Copiar después de aplicar comisión</translation>
-    </message>
-    <message>
-        <source>Copy bytes</source>
-        <translation>Copiar bytes</translation>
-    </message>
-    <message>
-        <source>Copy priority</source>
-        <translation>Copiar prioridad</translation>
-    </message>
-    <message>
-        <source>Copy dust</source>
-        <translation>Copiar polvo</translation>
-    </message>
-    <message>
-        <source>Copy change</source>
-        <translation>Copiar cambio</translation>
-    </message>
-    <message>
-        <source>highest</source>
-        <translation>lo más alto</translation>
-    </message>
-    <message>
-        <source>higher</source>
-        <translation>más alto</translation>
-    </message>
-    <message>
-        <source>high</source>
-        <translation>alto</translation>
-    </message>
-    <message>
-        <source>medium-high</source>
-        <translation>medio-alto</translation>
-    </message>
-    <message>
-        <source>medium</source>
-        <translation>medio</translation>
-    </message>
-    <message>
-        <source>low-medium</source>
-        <translation>bajo-medio</translation>
-    </message>
-    <message>
-        <source>low</source>
-        <translation>bajo</translation>
-    </message>
-    <message>
-        <source>lower</source>
-        <translation>más bajo</translation>
-    </message>
-    <message>
-        <source>lowest</source>
-        <translation>lo más bajo</translation>
-    </message>
-    <message>
-        <source>(%1 locked)</source>
-        <translation>(%1 bloqueado)</translation>
-    </message>
-    <message>
-        <source>none</source>
-        <translation>ninguna</translation>
-    </message>
-    <message>
-        <source>This label turns red if the transaction size is greater than 1000 bytes.</source>
-        <translation>Esta etiqueta se mostrará en rojo si el tamaño de la transacción es mayor de 1000 bytes.</translation>
-    </message>
-    <message>
-        <source>This label turns red if the priority is smaller than "medium".</source>
-        <translation>Esta etiqueta se mostrará en rojo si la prioridad es menor a "media"</translation>
-    </message>
-    <message>
-        <source>This label turns red if any recipient receives an amount smaller than %1.</source>
-        <translation>Esta etiqueta se vuelve roja si el cambio es menor que %1</translation>
-    </message>
-    <message>
-        <source>Can vary +/- %1 satoshi(s) per input.</source>
-        <translation>Puede variar en +/- %1 satoshi(s) por entrada.</translation>
-    </message>
-    <message>
-        <source>yes</source>
-        <translation>si</translation>
-    </message>
-    <message>
-        <source>no</source>
-        <translation>no</translation>
-    </message>
-    <message>
-        <source>This means a fee of at least %1 per kB is required.</source>
-        <translation>Esto implica que se requiere una comisión de al menos %1 por kB</translation>
-    </message>
-    <message>
-        <source>Can vary +/- 1 byte per input.</source>
-        <translation>Puede variar en +/- 1 byte por entrada.</translation>
-    </message>
-    <message>
-        <source>Transactions with higher priority are more likely to get included into a block.</source>
-        <translation>Las transacciones con mayor prioridad tienen mayor probabilidad de ser incluidas en un bloque.</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(sin etiqueta)</translation>
-    </message>
-    <message>
-        <source>change from %1 (%2)</source>
-        <translation>Cambio desde %1 (%2)</translation>
-    </message>
-    <message>
-        <source>(change)</source>
-        <translation>(cambio)</translation>
-    </message>
 </context>
 <context>
     <name>EditAddressDialog</name>
@@ -796,38 +486,6 @@
         <source>&amp;Address</source>
         <translation>&amp;Dirección</translation>
     </message>
-    <message>
-        <source>New receiving address</source>
-        <translation>Nueva dirección de recepción</translation>
-    </message>
-    <message>
-        <source>New sending address</source>
-        <translation>Nueva dirección de envío</translation>
-    </message>
-    <message>
-        <source>Edit receiving address</source>
-        <translation>Editar dirección de recepción</translation>
-    </message>
-    <message>
-        <source>Edit sending address</source>
-        <translation>Editar dirección de envío</translation>
-    </message>
-    <message>
-        <source>The entered address "%1" is already in the address book.</source>
-        <translation>La dirección introducida "%1" ya está presente en la libreta de direcciones.</translation>
-    </message>
-    <message>
-        <source>The entered address "%1" is not a valid Bitcoin address.</source>
-        <translation>La dirección introducida "%1" no es una dirección Bitcoin válida.</translation>
-    </message>
-    <message>
-        <source>Could not unlock wallet.</source>
-        <translation>No se pudo desbloquear el monedero.</translation>
-    </message>
-    <message>
-        <source>New key generation failed.</source>
-        <translation>Ha fallado la generación de la nueva clave.</translation>
-    </message>
 </context>
 <context>
     <name>FreespaceChecker</name>
@@ -854,10 +512,6 @@
 </context>
 <context>
     <name>HelpMessageDialog</name>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Bitcoin Core</translation>
-    </message>
     <message>
         <source>version</source>
         <translation>versión</translation>
@@ -867,8 +521,8 @@
         <translation>(%1-bit)</translation>
     </message>
     <message>
-        <source>About Bitcoin Core</source>
-        <translation>Acerca de Bitcoin Core</translation>
+        <source>About %1</source>
+        <translation>Acerda de %1</translation>
     </message>
     <message>
         <source>Command-line options</source>
@@ -903,8 +557,8 @@
         <translation>Establecer los certificados raíz SSL para solicitudes de pago (predeterminado: -system-)</translation>
     </message>
     <message>
-        <source>Reset all settings changes made over the GUI</source>
-        <translation>Resetear los cambios de configuracion hechos por el GUI</translation>
+        <source>Reset all settings changed in the GUI</source>
+        <translation>Reiniciar todos los ajustes modificados en el GUI</translation>
     </message>
 </context>
 <context>
@@ -914,16 +568,16 @@
         <translation>Bienvenido</translation>
     </message>
     <message>
-        <source>Welcome to Bitcoin Core.</source>
-        <translation>Bienvenido a Bitcoin Core</translation>
+        <source>Welcome to %1.</source>
+        <translation>Bienvenido a %1</translation>
     </message>
     <message>
-        <source>As this is the first time the program is launched, you can choose where Bitcoin Core will store its data.</source>
-        <translation>Al ser la primera vez que se ejecuta el programa, puede elegir dónde almacenará sus datos Bitcoin Core.</translation>
+        <source>As this is the first time the program is launched, you can choose where %1 will store its data.</source>
+        <translation>Al ser la primera vez que se ejecuta el programa, puede elegir donde %1 almacenara sus datos</translation>
     </message>
     <message>
-        <source>Bitcoin Core will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source>
-        <translation>Bitcoin Core va a descargar y guardar una copia de la cadena de bloques de Bitcoin. Se almacenará al menos %1GB de datos en este directorio, que irá creciendo con el tiempo. El monedero se guardará también en este directorio.</translation>
+        <source>%1 will download and store a copy of the Bitcoin block chain. At least %2GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source>
+        <translation>%1 va a descargar y almacenar una copia de la cadena de bloques de Bitcoin. Al menos %2GB de datos seran almacenados en este directorio, que ira creciendo con el tiempo. El monedero se guardara tambien en ese directorio. </translation>
     </message>
     <message>
         <source>Use the default data directory</source>
@@ -933,10 +587,6 @@
         <source>Use a custom data directory:</source>
         <translation>Utilizar un directorio de datos personalizado:</translation>
     </message>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Bitcoin Core</translation>
-    </message>
     <message>
         <source>Error: Specified data directory "%1" cannot be created.</source>
         <translation>Error: no ha podido crearse el directorio de datos especificado "%1".</translation>
@@ -972,10 +622,6 @@
         <source>Select payment request file</source>
         <translation>Seleccionar archivo de sulicitud de pago</translation>
     </message>
-    <message>
-        <source>Select payment request file to open</source>
-        <translation>Seleccionar el archivo de solicitud de pago para abrir</translation>
-    </message>
 </context>
 <context>
     <name>OptionsDialog</name>
@@ -987,6 +633,14 @@
         <source>&amp;Main</source>
         <translation>&amp;Principal</translation>
     </message>
+    <message>
+        <source>Automatically start %1 after logging in to the system.</source>
+        <translation>Iniciar automaticamente  %1 al encender el sistema.</translation>
+    </message>
+    <message>
+        <source>&amp;Start %1 on system login</source>
+        <translation>&amp;Iniciar %1 al iniciar el sistema</translation>
+    </message>
     <message>
         <source>Size of &amp;database cache</source>
         <translation>Tamaño de cache de la &amp;base de datos</translation>
@@ -1015,10 +669,6 @@
         <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Exit in the menu.</source>
         <translation>Minimizar en lugar de salir de la aplicación cuando la ventana está cerrada. Cuando se activa esta opción, la aplicación sólo se cerrará después de seleccionar Salir en el menú.</translation>
     </message>
-    <message>
-        <source>The user interface language can be set here. This setting will take effect after restarting Bitcoin Core.</source>
-        <translation>El idioma de la interfaz de usuario puede establecerse aquí. Este ajuste se aplicará cuando se reinicie Bitcoin.</translation>
-    </message>
     <message>
         <source>Third party URLs (e.g. a block explorer) that appear in the transactions tab as context menu items. %s in the URL is replaced by transaction hash. Multiple URLs are separated by vertical bar |.</source>
         <translation>Identificadores URL de terceros (por ejemplo, un explorador de bloques) que aparecen en la pestaña de transacciones como elementos del menú contextual. El %s en la URL es reemplazado por el valor hash de la transacción. Se pueden separar URL múltiples por una barra vertical |.</translation>
@@ -1043,14 +693,6 @@
         <source>&amp;Network</source>
         <translation>&amp;Red</translation>
     </message>
-    <message>
-        <source>Automatically start Bitcoin Core after logging in to the system.</source>
-        <translation>Iniciar automáticamente Bitcoin Core al iniciar el sistema.</translation>
-    </message>
-    <message>
-        <source>&amp;Start Bitcoin Core on system login</source>
-        <translation>&amp;Iniciar Bitcoin Core al inicio del sistema</translation>
-    </message>
     <message>
         <source>(0 = auto, &lt;0 = leave that many cores free)</source>
         <translation>(0 = automático, &lt;0 = dejar libres ese número de núcleos)</translation>
@@ -1135,6 +777,14 @@
         <source>&amp;Window</source>
         <translation>&amp;Ventana</translation>
     </message>
+    <message>
+        <source>&amp;Hide the icon from the system tray.</source>
+        <translation>&amp;Ocultar el icono de la barra de tareas</translation>
+    </message>
+    <message>
+        <source>Hide tray icon</source>
+        <translation>Ocultar barra de tareas</translation>
+    </message>
     <message>
         <source>Show only a tray icon after minimizing the window.</source>
         <translation>Minimizar la ventana a la bandeja de iconos del sistema.</translation>
@@ -1155,6 +805,10 @@
         <source>User Interface &amp;language:</source>
         <translation>I&amp;dioma de la interfaz de usuario</translation>
     </message>
+    <message>
+        <source>The user interface language can be set here. This setting will take effect after restarting %1.</source>
+        <translation>El idioma de la interfaz de usuario puede establecerse aquí. Esta configuración tendrá efecto tras reiniciar %1.</translation>
+    </message>
     <message>
         <source>&amp;Unit to show amounts in:</source>
         <translation>Mostrar las cantidades en la &amp;unidad:</translation>
@@ -1280,140 +934,49 @@
     </message>
 </context>
 <context>
-    <name>PaymentServer</name>
+    <name>PeerTableModel</name>
     <message>
-        <source>URI handling</source>
-        <translation>Gestión de URI</translation>
+        <source>User Agent</source>
+        <translation>User Agent</translation>
     </message>
     <message>
-        <source>Invalid payment address %1</source>
-        <translation>Dirección de pago no válida %1</translation>
+        <source>Node/Service</source>
+        <translation>Nodo/Servicio</translation>
     </message>
     <message>
-        <source>Payment request rejected</source>
-        <translation>Solicitud de pago rechazada</translation>
+        <source>Ping Time</source>
+        <translation>Ping</translation>
     </message>
+</context>
+<context>
+    <name>QObject</name>
     <message>
-        <source>Payment request network doesn't match client network.</source>
-        <translation>La red de solicitud de pago no coincide con la red cliente</translation>
+        <source>Amount</source>
+        <translation>Cantidad</translation>
     </message>
     <message>
-        <source>Payment request is not initialized.</source>
-        <translation>La solicitud de pago no está inicializada</translation>
+        <source>Enter a Bitcoin address (e.g. %1)</source>
+        <translation>Introducir una dirección Bitcoin (p. ej. %1)</translation>
     </message>
     <message>
-        <source>Requested payment amount of %1 is too small (considered dust).</source>
-        <translation>La cantidad del pago solicitado (%1) es demasiado pequeña (considerada polvo).</translation>
+        <source>%1 d</source>
+        <translation>%1 d</translation>
     </message>
     <message>
-        <source>Payment request error</source>
-        <translation>Error en solicitud de pago</translation>
+        <source>%1 h</source>
+        <translation>%1 h</translation>
     </message>
     <message>
-        <source>Cannot start bitcoin: click-to-pay handler</source>
-        <translation>No se puede iniciar el gestor de identificadores "bitcoin:" de clic-para-pagar</translation>
+        <source>%1 m</source>
+        <translation>%1 m</translation>
     </message>
     <message>
-        <source>Payment request fetch URL is invalid: %1</source>
-        <translation>La URL de obtención de la solicitud de pago es inválida: %1</translation>
+        <source>%1 s</source>
+        <translation>%1 s</translation>
     </message>
     <message>
-        <source>URI cannot be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source>
-        <translation>¡No se puede leer el identificador URI! Esto puede deberse a una dirección Bitcoin inválida o a parámetros de la URI mal formados</translation>
-    </message>
-    <message>
-        <source>Payment request file handling</source>
-        <translation>Procesado del archivo de solicitud de pago</translation>
-    </message>
-    <message>
-        <source>Payment request file cannot be read! This can be caused by an invalid payment request file.</source>
-        <translation>¡No puede leerse el archivo de solicitud de pago! Esto puede deberse a un archivo inválido de solicitud de pago.</translation>
-    </message>
-    <message>
-        <source>Payment request expired.</source>
-        <translation>Solicitud de pago caducada.</translation>
-    </message>
-    <message>
-        <source>Unverified payment requests to custom payment scripts are unsupported.</source>
-        <translation>No están soportadas las peticiones inseguras a scripts de pago personalizados</translation>
-    </message>
-    <message>
-        <source>Invalid payment request.</source>
-        <translation>Petición de pago no válida.</translation>
-    </message>
-    <message>
-        <source>Refund from %1</source>
-        <translation>Devolución desde %1</translation>
-    </message>
-    <message>
-        <source>Payment request %1 is too large (%2 bytes, allowed %3 bytes).</source>
-        <translation>La petición de pago %1 es demasiado grande (%2 bytes, permitidos %3 bytes).</translation>
-    </message>
-    <message>
-        <source>Error communicating with %1: %2</source>
-        <translation>Error en la comunicación con %1: %2</translation>
-    </message>
-    <message>
-        <source>Payment request cannot be parsed!</source>
-        <translation>¡No puede leerse la solicitud de pago!</translation>
-    </message>
-    <message>
-        <source>Bad response from server %1</source>
-        <translation>Respuesta errónea del servidor %1</translation>
-    </message>
-    <message>
-        <source>Payment acknowledged</source>
-        <translation>Pago aceptado</translation>
-    </message>
-    <message>
-        <source>Network request error</source>
-        <translation>Error en petición de red</translation>
-    </message>
-</context>
-<context>
-    <name>PeerTableModel</name>
-    <message>
-        <source>User Agent</source>
-        <translation>User Agent</translation>
-    </message>
-    <message>
-        <source>Node/Service</source>
-        <translation>Nodo/Servicio</translation>
-    </message>
-    <message>
-        <source>Ping Time</source>
-        <translation>Ping</translation>
-    </message>
-</context>
-<context>
-    <name>QObject</name>
-    <message>
-        <source>Amount</source>
-        <translation>Cantidad</translation>
-    </message>
-    <message>
-        <source>Enter a Bitcoin address (e.g. %1)</source>
-        <translation>Introducir una dirección Bitcoin (p. ej. %1)</translation>
-    </message>
-    <message>
-        <source>%1 d</source>
-        <translation>%1 d</translation>
-    </message>
-    <message>
-        <source>%1 h</source>
-        <translation>%1 h</translation>
-    </message>
-    <message>
-        <source>%1 m</source>
-        <translation>%1 m</translation>
-    </message>
-    <message>
-        <source>%1 s</source>
-        <translation>%1 s</translation>
-    </message>
-    <message>
-        <source>None</source>
-        <translation>Ninguno</translation>
+        <source>None</source>
+        <translation>Ninguno</translation>
     </message>
     <message>
         <source>N/A</source>
@@ -1424,25 +987,6 @@
         <translation>%1 ms</translation>
     </message>
 </context>
-<context>
-    <name>QRImageWidget</name>
-    <message>
-        <source>&amp;Save Image...</source>
-        <translation>Guardar Imagen...</translation>
-    </message>
-    <message>
-        <source>&amp;Copy Image</source>
-        <translation>Copiar imagen</translation>
-    </message>
-    <message>
-        <source>Save QR Code</source>
-        <translation>Guardar código QR</translation>
-    </message>
-    <message>
-        <source>PNG Image (*.png)</source>
-        <translation>Imágenes PNG (*.png)</translation>
-    </message>
-</context>
 <context>
     <name>RPCConsole</name>
     <message>
@@ -1473,6 +1017,10 @@
         <source>Using BerkeleyDB version</source>
         <translation>Utilizando la versión de BerkeleyDB</translation>
     </message>
+    <message>
+        <source>Datadir</source>
+        <translation>Datadir</translation>
+    </message>
     <message>
         <source>Startup time</source>
         <translation>Hora de inicio</translation>
@@ -1509,10 +1057,6 @@
         <source>Memory usage</source>
         <translation>Uso de memoria</translation>
     </message>
-    <message>
-        <source>Open the Bitcoin Core debug log file from the current data directory. This can take a few seconds for large log files.</source>
-        <translation>Abre el archivo de registro de depuración de Bitcoin desde el directorio de datos actual. Esto puede tardar unos segundos para ficheros de registro de gran tamaño.</translation>
-    </message>
     <message>
         <source>Received</source>
         <translation>Recibido</translation>
@@ -1561,6 +1105,18 @@
         <source>User Agent</source>
         <translation>User Agent</translation>
     </message>
+    <message>
+        <source>Open the %1 debug log file from the current data directory. This can take a few seconds for large log files.</source>
+        <translation>Abrir el archivo de depuración %1 desde el directorio de datos actual. Puede tardar unos segundos para ficheros de gran tamaño.</translation>
+    </message>
+    <message>
+        <source>Decrease font size</source>
+        <translation>Disminuir tamaño de letra</translation>
+    </message>
+    <message>
+        <source>Increase font size</source>
+        <translation>Aumentar tamaño de letra</translation>
+    </message>
     <message>
         <source>Services</source>
         <translation>Servicios</translation>
@@ -1629,10 +1185,6 @@
         <source>Out:</source>
         <translation>Saliente:</translation>
     </message>
-    <message>
-        <source>Build date</source>
-        <translation>Fecha de compilación</translation>
-    </message>
     <message>
         <source>Debug log file</source>
         <translation>Archivo de registro de depuración</translation>
@@ -1670,8 +1222,8 @@
         <translation>&amp;Desbanear Nodo</translation>
     </message>
     <message>
-        <source>Welcome to the Bitcoin Core RPC console.</source>
-        <translation>Bienvenido a la consola RPC de Bitcoin Core.</translation>
+        <source>Welcome to the %1 RPC console.</source>
+        <translation>Bienvenido a la consola RPC %1.</translation>
     </message>
     <message>
         <source>Use up and down arrows to navigate history, and &lt;b&gt;Ctrl-L&lt;/b&gt; to clear screen.</source>
@@ -1800,18 +1352,6 @@
         <source>Remove</source>
         <translation>Eliminar</translation>
     </message>
-    <message>
-        <source>Copy label</source>
-        <translation>Copiar etiqueta</translation>
-    </message>
-    <message>
-        <source>Copy message</source>
-        <translation>Mensaje</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>Copiar cuantía</translation>
-    </message>
 </context>
 <context>
     <name>ReceiveRequestDialog</name>
@@ -1831,73 +1371,6 @@
         <source>&amp;Save Image...</source>
         <translation>Guardar Imagen...</translation>
     </message>
-    <message>
-        <source>Request payment to %1</source>
-        <translation>Solicitar pago a %1</translation>
-    </message>
-    <message>
-        <source>Payment information</source>
-        <translation>Información de pago</translation>
-    </message>
-    <message>
-        <source>URI</source>
-        <translation>URI</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>Dirección</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>Cantidad</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Etiqueta</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>Mensaje</translation>
-    </message>
-    <message>
-        <source>Resulting URI too long, try to reduce the text for label / message.</source>
-        <translation>URI resultante demasiado larga. Intente reducir el texto de la etiqueta / mensaje.</translation>
-    </message>
-    <message>
-        <source>Error encoding URI into QR Code.</source>
-        <translation>Error al codificar la URI en el código QR.</translation>
-    </message>
-</context>
-<context>
-    <name>RecentRequestsTableModel</name>
-    <message>
-        <source>Date</source>
-        <translation>Fecha</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Etiqueta</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>Mensaje</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>Cantidad</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(sin etiqueta)</translation>
-    </message>
-    <message>
-        <source>(no message)</source>
-        <translation>(Ningun mensaje)</translation>
-    </message>
-    <message>
-        <source>(no amount)</source>
-        <translation>(sin cantidad)</translation>
-    </message>
 </context>
 <context>
     <name>SendCoinsDialog</name>
@@ -2017,14 +1490,6 @@
         <source>fast</source>
         <translation>rápido</translation>
     </message>
-    <message>
-        <source>Send as zero-fee transaction if possible</source>
-        <translation>Enviar transacción, si es posible, sin comisión</translation>
-    </message>
-    <message>
-        <source>(confirmation may take longer)</source>
-        <translation>(confirmación puede tardar más tiempo)</translation>
-    </message>
     <message>
         <source>Send to multiple recipients at once</source>
         <translation>Enviar a múltiples destinatarios de una vez</translation>
@@ -2057,118 +1522,6 @@
         <source>S&amp;end</source>
         <translation>&amp;Enviar</translation>
     </message>
-    <message>
-        <source>Confirm send coins</source>
-        <translation>Confirmar el envío de bitcoins</translation>
-    </message>
-    <message>
-        <source>%1 to %2</source>
-        <translation>%1 a %2</translation>
-    </message>
-    <message>
-        <source>Copy quantity</source>
-        <translation>Copiar cantidad</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>Copiar cuantía</translation>
-    </message>
-    <message>
-        <source>Copy fee</source>
-        <translation>Copiar donación</translation>
-    </message>
-    <message>
-        <source>Copy after fee</source>
-        <translation>Copiar después de aplicar donación</translation>
-    </message>
-    <message>
-        <source>Copy bytes</source>
-        <translation>Copiar bytes</translation>
-    </message>
-    <message>
-        <source>Copy priority</source>
-        <translation>Copiar prioridad</translation>
-    </message>
-    <message>
-        <source>Copy change</source>
-        <translation>Copiar Cambio</translation>
-    </message>
-    <message>
-        <source>Total Amount %1</source>
-        <translation>Monto Total %1</translation>
-    </message>
-    <message>
-        <source>or</source>
-        <translation>o</translation>
-    </message>
-    <message>
-        <source>The amount to pay must be larger than 0.</source>
-        <translation>La cantidad por pagar tiene que ser mayor de 0.</translation>
-    </message>
-    <message>
-        <source>The amount exceeds your balance.</source>
-        <translation>La cantidad sobrepasa su saldo.</translation>
-    </message>
-    <message>
-        <source>The total exceeds your balance when the %1 transaction fee is included.</source>
-        <translation>El total sobrepasa su saldo cuando se incluye la tasa de envío de %1</translation>
-    </message>
-    <message>
-        <source>Transaction creation failed!</source>
-        <translation>¡Ha fallado la creación de la transacción!</translation>
-    </message>
-    <message>
-        <source>The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source>
-        <translation>¡La transacción fue rechazada! Esto puede haber ocurrido si alguno de los bitcoins de su monedero ya estaba gastado o si ha usado una copia de wallet.dat y los bitcoins estaban gastados en la copia pero no se habían marcado como gastados aqui.</translation>
-    </message>
-    <message>
-        <source>A fee higher than %1 is considered an absurdly high fee.</source>
-        <translation>Una comisión mayor al %1 se considera demasiado alta.</translation>
-    </message>
-    <message>
-        <source>Payment request expired.</source>
-        <translation>Solicitud de pago caducada.</translation>
-    </message>
-    <message>
-        <source>Pay only the required fee of %1</source>
-        <translation>Paga sólo la cuota mínima de %1</translation>
-    </message>
-    <message numerus="yes">
-        <source>Estimated to begin confirmation within %n block(s).</source>
-        <translation><numerusform>Estimado para empezar la confirmación dentro de %n bloque.</numerusform><numerusform>Estimado para empezar la confirmación dentro de %n bloques.</numerusform></translation>
-    </message>
-    <message>
-        <source>The recipient address is not valid. Please recheck.</source>
-        <translation>La dirección del destinatario no es válida. Por favor, compruébela de nuevo.</translation>
-    </message>
-    <message>
-        <source>Duplicate address found: addresses should only be used once each.</source>
-        <translation>Se ha encontrado una dirección duplicada. Solo se puede enviar a cada dirección una vez por operación de envío.</translation>
-    </message>
-    <message>
-        <source>Warning: Invalid Bitcoin address</source>
-        <translation>Alerta: Dirección de Bitcoin inválida</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(sin etiqueta)</translation>
-    </message>
-    <message>
-        <source>Warning: Unknown change address</source>
-        <translation>Alerta: Dirección de Bitcoin inválida</translation>
-    </message>
-    <message>
-        <source>Copy dust</source>
-        <translation>Copiar polvo</translation>
-    </message>
-    <message>
-        <source>Are you sure you want to send?</source>
-        <translation>¿Está seguro que desea enviar?</translation>
-    </message>
-    <message>
-        <source>added as transaction fee</source>
-        <translation>añadido como comisión de transacción</translation>
-    </message>
 </context>
 <context>
     <name>SendCoinsEntry</name>
@@ -2180,10 +1533,6 @@
         <source>Pay &amp;To:</source>
         <translation>&amp;Pagar a:</translation>
     </message>
-    <message>
-        <source>Enter a label for this address to add it to your address book</source>
-        <translation>Etiquete esta dirección para añadirla a la libreta</translation>
-    </message>
     <message>
         <source>&amp;Label:</source>
         <translation>&amp;Etiqueta:</translation>
@@ -2201,700 +1550,182 @@
         <translation>Dirección Bitcoin a la que enviar el pago</translation>
     </message>
     <message>
-        <source>Alt+A</source>
-        <translation>Alt+A</translation>
-    </message>
-    <message>
-        <source>Paste address from clipboard</source>
-        <translation>Pegar dirección desde portapapeles</translation>
-    </message>
-    <message>
-        <source>Alt+P</source>
-        <translation>Alt+P</translation>
-    </message>
-    <message>
-        <source>Remove this entry</source>
-        <translation>Eliminar esta transacción</translation>
-    </message>
-    <message>
-        <source>The fee will be deducted from the amount being sent. The recipient will receive less bitcoins than you enter in the amount field. If multiple recipients are selected, the fee is split equally.</source>
-        <translation>La cuota será deducida de la cantidad que sea mandada. El destinatario recibirá menos bitcoins de los que entres en el  </translation>
-    </message>
-    <message>
-        <source>S&amp;ubtract fee from amount</source>
-        <translation>Restar comisiones a la cantidad</translation>
-    </message>
-    <message>
-        <source>Message:</source>
-        <translation>Mensaje:</translation>
-    </message>
-    <message>
-        <source>This is an unauthenticated payment request.</source>
-        <translation>Esta es una petición de pago no autentificada.</translation>
-    </message>
-    <message>
-        <source>This is an authenticated payment request.</source>
-        <translation>Esta es una petición de pago autentificada.</translation>
-    </message>
-    <message>
-        <source>Enter a label for this address to add it to the list of used addresses</source>
-        <translation>Introduce una etiqueta para esta dirección para añadirla a la lista de direcciones utilizadas</translation>
-    </message>
-    <message>
-        <source>A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
-        <translation>Un mensaje que se adjuntó a la bitcoin: URL que será almacenada con la transacción para su referencia. Nota: Este mensaje no se envía a través de la red Bitcoin.</translation>
-    </message>
-    <message>
-        <source>Pay To:</source>
-        <translation>Paga a:</translation>
-    </message>
-    <message>
-        <source>Memo:</source>
-        <translation>Memo:</translation>
-    </message>
-</context>
-<context>
-    <name>ShutdownWindow</name>
-    <message>
-        <source>Bitcoin Core is shutting down...</source>
-        <translation>Bitcoin Core se está cerrando...</translation>
-    </message>
-    <message>
-        <source>Do not shut down the computer until this window disappears.</source>
-        <translation>No apague el equipo hasta que desaparezca esta ventana.</translation>
-    </message>
-</context>
-<context>
-    <name>SignVerifyMessageDialog</name>
-    <message>
-        <source>Signatures - Sign / Verify a Message</source>
-        <translation>Firmas - Firmar / verificar un mensaje</translation>
-    </message>
-    <message>
-        <source>&amp;Sign Message</source>
-        <translation>&amp;Firmar mensaje</translation>
-    </message>
-    <message>
-        <source>You can sign messages/agreements with your addresses to prove you can receive bitcoins sent to them. Be careful not to sign anything vague or random, as phishing attacks may try to trick you into signing your identity over to them. Only sign fully-detailed statements you agree to.</source>
-        <translation>Puede firmar los mensajes con sus direcciones para demostrar que las posee. Tenga cuidado de no firmar cualquier cosa de manera vaga o aleatoria, pues los ataques de phishing pueden tratar de engañarle firmando su identidad a través de ellos. Sólo firme declaraciones totalmente detalladas con las que usted esté de acuerdo.</translation>
-    </message>
-    <message>
-        <source>The Bitcoin address to sign the message with</source>
-        <translation>Dirección Bitcoin con la que firmar el mensaje</translation>
-    </message>
-    <message>
-        <source>Choose previously used address</source>
-        <translation>Escoger dirección previamente usada</translation>
-    </message>
-    <message>
-        <source>Alt+A</source>
-        <translation>Alt+A</translation>
-    </message>
-    <message>
-        <source>Paste address from clipboard</source>
-        <translation>Pegar dirección desde portapapeles</translation>
-    </message>
-    <message>
-        <source>Alt+P</source>
-        <translation>Alt+P</translation>
-    </message>
-    <message>
-        <source>Enter the message you want to sign here</source>
-        <translation>Introduzca el mensaje que desea firmar aquí</translation>
-    </message>
-    <message>
-        <source>Signature</source>
-        <translation>Firma</translation>
-    </message>
-    <message>
-        <source>Copy the current signature to the system clipboard</source>
-        <translation>Copiar la firma actual al portapapeles del sistema</translation>
-    </message>
-    <message>
-        <source>Sign the message to prove you own this Bitcoin address</source>
-        <translation>Firmar el mensaje para demostrar que se posee esta dirección Bitcoin</translation>
-    </message>
-    <message>
-        <source>Sign &amp;Message</source>
-        <translation>Firmar &amp;mensaje</translation>
-    </message>
-    <message>
-        <source>Reset all sign message fields</source>
-        <translation>Vaciar todos los campos de la firma de mensaje</translation>
-    </message>
-    <message>
-        <source>Clear &amp;All</source>
-        <translation>Vaciar &amp;todo</translation>
-    </message>
-    <message>
-        <source>&amp;Verify Message</source>
-        <translation>&amp;Verificar mensaje</translation>
-    </message>
-    <message>
-        <source>Enter the receiver's address, message (ensure you copy line breaks, spaces, tabs, etc. exactly) and signature below to verify the message. Be careful not to read more into the signature than what is in the signed message itself, to avoid being tricked by a man-in-the-middle attack. Note that this only proves the signing party receives with the address, it cannot prove sendership of any transaction!</source>
-        <translation>Introduzca la dirección para la firma, el mensaje (asegurándose de copiar tal cual los saltos de línea, espacios, tabulaciones, etc.) y la firma a continuación para verificar el mensaje. Tenga cuidado de no asumir más información de lo que dice el propio mensaje firmado para evitar fraudes basados en ataques de tipo man-in-the-middle. </translation>
-    </message>
-    <message>
-        <source>The Bitcoin address the message was signed with</source>
-        <translation>La dirección Bitcoin con la que se firmó el mensaje</translation>
-    </message>
-    <message>
-        <source>Verify the message to ensure it was signed with the specified Bitcoin address</source>
-        <translation>Verificar el mensaje para comprobar que fue firmado con la dirección Bitcoin indicada</translation>
-    </message>
-    <message>
-        <source>Verify &amp;Message</source>
-        <translation>Verificar &amp;mensaje</translation>
-    </message>
-    <message>
-        <source>Reset all verify message fields</source>
-        <translation>Vaciar todos los campos de la verificación de mensaje</translation>
-    </message>
-    <message>
-        <source>Click "Sign Message" to generate signature</source>
-        <translation>Haga clic en "Firmar mensaje" para generar la firma</translation>
-    </message>
-    <message>
-        <source>The entered address is invalid.</source>
-        <translation>La dirección introducida es inválida.</translation>
-    </message>
-    <message>
-        <source>Please check the address and try again.</source>
-        <translation>Verifique la dirección e inténtelo de nuevo.</translation>
-    </message>
-    <message>
-        <source>The entered address does not refer to a key.</source>
-        <translation>La dirección introducida no corresponde a una clave.</translation>
-    </message>
-    <message>
-        <source>Wallet unlock was cancelled.</source>
-        <translation>Se ha cancelado el desbloqueo del monedero. </translation>
-    </message>
-    <message>
-        <source>Private key for the entered address is not available.</source>
-        <translation>No se dispone de la clave privada para la dirección introducida.</translation>
-    </message>
-    <message>
-        <source>Message signing failed.</source>
-        <translation>Ha fallado la firma del mensaje.</translation>
-    </message>
-    <message>
-        <source>Message signed.</source>
-        <translation>Mensaje firmado.</translation>
-    </message>
-    <message>
-        <source>The signature could not be decoded.</source>
-        <translation>No se puede decodificar la firma.</translation>
-    </message>
-    <message>
-        <source>Please check the signature and try again.</source>
-        <translation>Compruebe la firma e inténtelo de nuevo.</translation>
-    </message>
-    <message>
-        <source>The signature did not match the message digest.</source>
-        <translation>La firma no coincide con el resumen del mensaje.</translation>
-    </message>
-    <message>
-        <source>Message verification failed.</source>
-        <translation>La verificación del mensaje ha fallado.</translation>
-    </message>
-    <message>
-        <source>Message verified.</source>
-        <translation>Mensaje verificado.</translation>
-    </message>
-</context>
-<context>
-    <name>SplashScreen</name>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Bitcoin Core</translation>
-    </message>
-    <message>
-        <source>The Bitcoin Core developers</source>
-        <translation>Los desarrolladores de Bitcoin Core</translation>
-    </message>
-    <message>
-        <source>[testnet]</source>
-        <translation>[testnet]</translation>
-    </message>
-</context>
-<context>
-    <name>TrafficGraphWidget</name>
-    <message>
-        <source>KB/s</source>
-        <translation>KB/s</translation>
-    </message>
-</context>
-<context>
-    <name>TransactionDesc</name>
-    <message>
-        <source>Open until %1</source>
-        <translation>Abierto hasta %1</translation>
-    </message>
-    <message>
-        <source>conflicted</source>
-        <translation>en conflicto</translation>
-    </message>
-    <message>
-        <source>%1/offline</source>
-        <translation>%1/fuera de línea</translation>
-    </message>
-    <message>
-        <source>%1/unconfirmed</source>
-        <translation>%1/no confirmado</translation>
-    </message>
-    <message>
-        <source>%1 confirmations</source>
-        <translation>%1 confirmaciones</translation>
-    </message>
-    <message>
-        <source>Status</source>
-        <translation>Estado</translation>
-    </message>
-    <message numerus="yes">
-        <source>, broadcast through %n node(s)</source>
-        <translation><numerusform>, transmitir a través de %n nodo</numerusform><numerusform>, transmitir a través de %n nodos</numerusform></translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation>Fecha</translation>
-    </message>
-    <message>
-        <source>Source</source>
-        <translation>Fuente</translation>
-    </message>
-    <message>
-        <source>Generated</source>
-        <translation>Generado</translation>
-    </message>
-    <message>
-        <source>From</source>
-        <translation>De</translation>
-    </message>
-    <message>
-        <source>To</source>
-        <translation>Para</translation>
-    </message>
-    <message>
-        <source>own address</source>
-        <translation>dirección propia</translation>
-    </message>
-    <message>
-        <source>watch-only</source>
-        <translation>de observación</translation>
-    </message>
-    <message>
-        <source>label</source>
-        <translation>etiqueta</translation>
-    </message>
-    <message>
-        <source>Credit</source>
-        <translation>Crédito</translation>
-    </message>
-    <message numerus="yes">
-        <source>matures in %n more block(s)</source>
-        <translation><numerusform>disponible en %n bloque más</numerusform><numerusform>disponible en %n bloques más</numerusform></translation>
-    </message>
-    <message>
-        <source>not accepted</source>
-        <translation>no aceptada</translation>
-    </message>
-    <message>
-        <source>Debit</source>
-        <translation>Débito</translation>
-    </message>
-    <message>
-        <source>Total debit</source>
-        <translation>Débito total</translation>
-    </message>
-    <message>
-        <source>Total credit</source>
-        <translation>Crédito total</translation>
-    </message>
-    <message>
-        <source>Transaction fee</source>
-        <translation>Comisión de transacción</translation>
-    </message>
-    <message>
-        <source>Net amount</source>
-        <translation>Cantidad neta</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>Mensaje</translation>
-    </message>
-    <message>
-        <source>Comment</source>
-        <translation>Comentario</translation>
-    </message>
-    <message>
-        <source>Transaction ID</source>
-        <translation>Identificador de transacción</translation>
-    </message>
-    <message>
-        <source>Merchant</source>
-        <translation>Vendedor</translation>
-    </message>
-    <message>
-        <source>Generated coins must mature %1 blocks before they can be spent. When you generated this block, it was broadcast to the network to be added to the block chain. If it fails to get into the chain, its state will change to "not accepted" and it won't be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source>
-        <translation>Los bitcoins generados deben madurar %1 bloques antes de que puedan gastarse. Cuando generó este bloque, se transmitió a la red para que se añadiera a la cadena de bloques. Si no consigue entrar en la cadena, su estado cambiará a "no aceptado" y ya no se podrá gastar. Esto puede ocurrir ocasionalmente si otro nodo genera un bloque a pocos segundos del suyo.</translation>
-    </message>
-    <message>
-        <source>Debug information</source>
-        <translation>Información de depuración</translation>
-    </message>
-    <message>
-        <source>Transaction</source>
-        <translation>Transacción</translation>
-    </message>
-    <message>
-        <source>Inputs</source>
-        <translation>entradas</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>Cantidad</translation>
-    </message>
-    <message>
-        <source>true</source>
-        <translation>verdadero</translation>
-    </message>
-    <message>
-        <source>false</source>
-        <translation>falso</translation>
-    </message>
-    <message>
-        <source>, has not been successfully broadcast yet</source>
-        <translation>, todavía no se ha sido difundido satisfactoriamente</translation>
-    </message>
-    <message numerus="yes">
-        <source>Open for %n more block(s)</source>
-        <translation><numerusform>Abrir para %n bloque más</numerusform><numerusform>Abrir para %n bloques más</numerusform></translation>
-    </message>
-    <message>
-        <source>unknown</source>
-        <translation>desconocido</translation>
-    </message>
-</context>
-<context>
-    <name>TransactionDescDialog</name>
-    <message>
-        <source>Transaction details</source>
-        <translation>Detalles de transacción</translation>
-    </message>
-    <message>
-        <source>This pane shows a detailed description of the transaction</source>
-        <translation>Esta ventana muestra información detallada sobre la transacción</translation>
-    </message>
-</context>
-<context>
-    <name>TransactionTableModel</name>
-    <message>
-        <source>Date</source>
-        <translation>Fecha</translation>
-    </message>
-    <message>
-        <source>Type</source>
-        <translation>Tipo</translation>
-    </message>
-    <message>
-        <source>Immature (%1 confirmations, will be available after %2)</source>
-        <translation>No vencidos (%1 confirmaciones. Estarán disponibles al cabo de %2)</translation>
-    </message>
-    <message numerus="yes">
-        <source>Open for %n more block(s)</source>
-        <translation><numerusform>Abrir para %n bloque más</numerusform><numerusform>Abrir para %n bloques más</numerusform></translation>
-    </message>
-    <message>
-        <source>Open until %1</source>
-        <translation>Abierto hasta %1</translation>
-    </message>
-    <message>
-        <source>Confirmed (%1 confirmations)</source>
-        <translation>Confirmado (%1 confirmaciones)</translation>
-    </message>
-    <message>
-        <source>This block was not received by any other nodes and will probably not be accepted!</source>
-        <translation>Este bloque no ha sido recibido por otros nodos y probablemente no sea aceptado!</translation>
-    </message>
-    <message>
-        <source>Generated but not accepted</source>
-        <translation>Generado pero no aceptado</translation>
-    </message>
-    <message>
-        <source>Offline</source>
-        <translation>Sin conexión</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Etiqueta</translation>
-    </message>
-    <message>
-        <source>Unconfirmed</source>
-        <translation>Sin confirmar</translation>
-    </message>
-    <message>
-        <source>Confirming (%1 of %2 recommended confirmations)</source>
-        <translation>Confirmando (%1 de %2 confirmaciones recomendadas)</translation>
-    </message>
-    <message>
-        <source>Conflicted</source>
-        <translation>En conflicto</translation>
-    </message>
-    <message>
-        <source>Received with</source>
-        <translation>Recibido con</translation>
-    </message>
-    <message>
-        <source>Received from</source>
-        <translation>Recibidos de</translation>
-    </message>
-    <message>
-        <source>Sent to</source>
-        <translation>Enviado a</translation>
-    </message>
-    <message>
-        <source>Payment to yourself</source>
-        <translation>Pago propio</translation>
-    </message>
-    <message>
-        <source>Mined</source>
-        <translation>Minado</translation>
-    </message>
-    <message>
-        <source>watch-only</source>
-        <translation>de observación</translation>
-    </message>
-    <message>
-        <source>(n/a)</source>
-        <translation>(nd)</translation>
-    </message>
-    <message>
-        <source>Transaction status. Hover over this field to show number of confirmations.</source>
-        <translation>Estado de transacción. Pasa el ratón sobre este campo para ver el número de confirmaciones.</translation>
-    </message>
-    <message>
-        <source>Date and time that the transaction was received.</source>
-        <translation>Fecha y hora en que se recibió la transacción.</translation>
-    </message>
-    <message>
-        <source>Type of transaction.</source>
-        <translation>Tipo de transacción.</translation>
-    </message>
-    <message>
-        <source>Whether or not a watch-only address is involved in this transaction.</source>
-        <translation>Sea o no una dirección sólo está involucrada en esta transacción.</translation>
-    </message>
-    <message>
-        <source>User-defined intent/purpose of the transaction.</source>
-        <translation>intento/propósito de la transacción definido por el usuario.</translation>
-    </message>
-    <message>
-        <source>Amount removed from or added to balance.</source>
-        <translation>Cantidad retirada o añadida al saldo.</translation>
-    </message>
-</context>
-<context>
-    <name>TransactionView</name>
-    <message>
-        <source>All</source>
-        <translation>Todo</translation>
+        <source>Alt+A</source>
+        <translation>Alt+A</translation>
     </message>
     <message>
-        <source>Today</source>
-        <translation>Hoy</translation>
+        <source>Paste address from clipboard</source>
+        <translation>Pegar dirección desde portapapeles</translation>
     </message>
     <message>
-        <source>This week</source>
-        <translation>Esta semana</translation>
+        <source>Alt+P</source>
+        <translation>Alt+P</translation>
     </message>
     <message>
-        <source>This month</source>
-        <translation>Este mes</translation>
+        <source>Remove this entry</source>
+        <translation>Eliminar esta transacción</translation>
     </message>
     <message>
-        <source>Last month</source>
-        <translation>Mes pasado</translation>
+        <source>The fee will be deducted from the amount being sent. The recipient will receive less bitcoins than you enter in the amount field. If multiple recipients are selected, the fee is split equally.</source>
+        <translation>La cuota será deducida de la cantidad que sea mandada. El destinatario recibirá menos bitcoins de los que entres en el  </translation>
     </message>
     <message>
-        <source>This year</source>
-        <translation>Este año</translation>
+        <source>S&amp;ubtract fee from amount</source>
+        <translation>Restar comisiones a la cantidad</translation>
     </message>
     <message>
-        <source>Range...</source>
-        <translation>Rango...</translation>
+        <source>Message:</source>
+        <translation>Mensaje:</translation>
     </message>
     <message>
-        <source>Received with</source>
-        <translation>Recibido con</translation>
+        <source>This is an unauthenticated payment request.</source>
+        <translation>Esta es una petición de pago no autentificada.</translation>
     </message>
     <message>
-        <source>Sent to</source>
-        <translation>Enviado a</translation>
+        <source>This is an authenticated payment request.</source>
+        <translation>Esta es una petición de pago autentificada.</translation>
     </message>
     <message>
-        <source>To yourself</source>
-        <translation>A usted mismo</translation>
+        <source>Enter a label for this address to add it to the list of used addresses</source>
+        <translation>Introduce una etiqueta para esta dirección para añadirla a la lista de direcciones utilizadas</translation>
     </message>
     <message>
-        <source>Mined</source>
-        <translation>Minado</translation>
+        <source>A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
+        <translation>Un mensaje que se adjuntó a la bitcoin: URL que será almacenada con la transacción para su referencia. Nota: Este mensaje no se envía a través de la red Bitcoin.</translation>
     </message>
     <message>
-        <source>Other</source>
-        <translation>Otra</translation>
+        <source>Pay To:</source>
+        <translation>Paga a:</translation>
     </message>
     <message>
-        <source>Enter address or label to search</source>
-        <translation>Introduzca una dirección o etiqueta que buscar</translation>
+        <source>Memo:</source>
+        <translation>Memo:</translation>
     </message>
+</context>
+<context>
+    <name>ShutdownWindow</name>
     <message>
-        <source>Min amount</source>
-        <translation>Cantidad mínima</translation>
+        <source>%1 is shutting down...</source>
+        <translation>%1 se esta cerrando...</translation>
     </message>
     <message>
-        <source>Copy address</source>
-        <translation>Copiar dirección</translation>
+        <source>Do not shut down the computer until this window disappears.</source>
+        <translation>No apague el equipo hasta que desaparezca esta ventana.</translation>
     </message>
+</context>
+<context>
+    <name>SignVerifyMessageDialog</name>
     <message>
-        <source>Copy label</source>
-        <translation>Copiar etiqueta</translation>
+        <source>Signatures - Sign / Verify a Message</source>
+        <translation>Firmas - Firmar / verificar un mensaje</translation>
     </message>
     <message>
-        <source>Copy amount</source>
-        <translation>Copiar cuantía</translation>
+        <source>&amp;Sign Message</source>
+        <translation>&amp;Firmar mensaje</translation>
     </message>
     <message>
-        <source>Copy transaction ID</source>
-        <translation>Copiar identificador de transacción</translation>
+        <source>You can sign messages/agreements with your addresses to prove you can receive bitcoins sent to them. Be careful not to sign anything vague or random, as phishing attacks may try to trick you into signing your identity over to them. Only sign fully-detailed statements you agree to.</source>
+        <translation>Puede firmar los mensajes con sus direcciones para demostrar que las posee. Tenga cuidado de no firmar cualquier cosa de manera vaga o aleatoria, pues los ataques de phishing pueden tratar de engañarle firmando su identidad a través de ellos. Sólo firme declaraciones totalmente detalladas con las que usted esté de acuerdo.</translation>
     </message>
     <message>
-        <source>Copy raw transaction</source>
-        <translation>Copiar traducción en crudo</translation>
+        <source>The Bitcoin address to sign the message with</source>
+        <translation>Dirección Bitcoin con la que firmar el mensaje</translation>
     </message>
     <message>
-        <source>Edit label</source>
-        <translation>Editar etiqueta</translation>
+        <source>Choose previously used address</source>
+        <translation>Escoger dirección previamente usada</translation>
     </message>
     <message>
-        <source>Show transaction details</source>
-        <translation>Mostrar detalles de la transacción</translation>
+        <source>Alt+A</source>
+        <translation>Alt+A</translation>
     </message>
     <message>
-        <source>Export Transaction History</source>
-        <translation>Exportar historial de transacciones</translation>
+        <source>Paste address from clipboard</source>
+        <translation>Pegar dirección desde portapapeles</translation>
     </message>
     <message>
-        <source>Watch-only</source>
-        <translation>De observación</translation>
+        <source>Alt+P</source>
+        <translation>Alt+P</translation>
     </message>
     <message>
-        <source>Exporting Failed</source>
-        <translation>Error exportando</translation>
+        <source>Enter the message you want to sign here</source>
+        <translation>Introduzca el mensaje que desea firmar aquí</translation>
     </message>
     <message>
-        <source>There was an error trying to save the transaction history to %1.</source>
-        <translation>Ha habido un error al intentar guardar la transacción con %1.</translation>
+        <source>Signature</source>
+        <translation>Firma</translation>
     </message>
     <message>
-        <source>Exporting Successful</source>
-        <translation>Exportación finalizada</translation>
+        <source>Copy the current signature to the system clipboard</source>
+        <translation>Copiar la firma actual al portapapeles del sistema</translation>
     </message>
     <message>
-        <source>The transaction history was successfully saved to %1.</source>
-        <translation>La transacción ha sido guardada en %1.</translation>
+        <source>Sign the message to prove you own this Bitcoin address</source>
+        <translation>Firmar el mensaje para demostrar que se posee esta dirección Bitcoin</translation>
     </message>
     <message>
-        <source>Comma separated file (*.csv)</source>
-        <translation>Archivos de columnas separadas por coma (*.csv)</translation>
+        <source>Sign &amp;Message</source>
+        <translation>Firmar &amp;mensaje</translation>
     </message>
     <message>
-        <source>Confirmed</source>
-        <translation>Confirmado</translation>
+        <source>Reset all sign message fields</source>
+        <translation>Vaciar todos los campos de la firma de mensaje</translation>
     </message>
     <message>
-        <source>Date</source>
-        <translation>Fecha</translation>
+        <source>Clear &amp;All</source>
+        <translation>Vaciar &amp;todo</translation>
     </message>
     <message>
-        <source>Type</source>
-        <translation>Tipo</translation>
+        <source>&amp;Verify Message</source>
+        <translation>&amp;Verificar mensaje</translation>
     </message>
     <message>
-        <source>Label</source>
-        <translation>Etiqueta</translation>
+        <source>Enter the receiver's address, message (ensure you copy line breaks, spaces, tabs, etc. exactly) and signature below to verify the message. Be careful not to read more into the signature than what is in the signed message itself, to avoid being tricked by a man-in-the-middle attack. Note that this only proves the signing party receives with the address, it cannot prove sendership of any transaction!</source>
+        <translation>Introduzca la dirección para la firma, el mensaje (asegurándose de copiar tal cual los saltos de línea, espacios, tabulaciones, etc.) y la firma a continuación para verificar el mensaje. Tenga cuidado de no asumir más información de lo que dice el propio mensaje firmado para evitar fraudes basados en ataques de tipo man-in-the-middle. </translation>
     </message>
     <message>
-        <source>Address</source>
-        <translation>Dirección</translation>
+        <source>The Bitcoin address the message was signed with</source>
+        <translation>La dirección Bitcoin con la que se firmó el mensaje</translation>
     </message>
     <message>
-        <source>ID</source>
-        <translation>ID</translation>
+        <source>Verify the message to ensure it was signed with the specified Bitcoin address</source>
+        <translation>Verificar el mensaje para comprobar que fue firmado con la dirección Bitcoin indicada</translation>
     </message>
     <message>
-        <source>Range:</source>
-        <translation>Rango:</translation>
+        <source>Verify &amp;Message</source>
+        <translation>Verificar &amp;mensaje</translation>
     </message>
     <message>
-        <source>to</source>
-        <translation>para</translation>
+        <source>Reset all verify message fields</source>
+        <translation>Vaciar todos los campos de la verificación de mensaje</translation>
     </message>
 </context>
 <context>
-    <name>UnitDisplayStatusBarControl</name>
+    <name>SplashScreen</name>
     <message>
-        <source>Unit to show amounts in. Click to select another unit.</source>
-        <translation>Unidad en la que se muestran las cantidades. Haga clic para seleccionar otra unidad.</translation>
+        <source>[testnet]</source>
+        <translation>[testnet]</translation>
     </message>
 </context>
 <context>
-    <name>WalletFrame</name>
+    <name>TrafficGraphWidget</name>
     <message>
-        <source>No wallet has been loaded.</source>
-        <translation>No se ha cargado ningún monedero</translation>
+        <source>KB/s</source>
+        <translation>KB/s</translation>
     </message>
 </context>
 <context>
-    <name>WalletModel</name>
+    <name>TransactionDescDialog</name>
     <message>
-        <source>Send Coins</source>
-        <translation>Enviar bitcoins</translation>
+        <source>This pane shows a detailed description of the transaction</source>
+        <translation>Esta ventana muestra información detallada sobre la transacción</translation>
     </message>
 </context>
 <context>
-    <name>WalletView</name>
-    <message>
-        <source>&amp;Export</source>
-        <translation>&amp;Exportar</translation>
-    </message>
-    <message>
-        <source>Export the data in the current tab to a file</source>
-        <translation>Exportar a un archivo los datos de esta pestaña</translation>
-    </message>
-    <message>
-        <source>Backup Wallet</source>
-        <translation>Copia de seguridad del monedero</translation>
-    </message>
-    <message>
-        <source>Wallet Data (*.dat)</source>
-        <translation>Datos de monedero (*.dat)</translation>
-    </message>
-    <message>
-        <source>Backup Failed</source>
-        <translation>Ha fallado el respaldo</translation>
-    </message>
-    <message>
-        <source>There was an error trying to save the wallet data to %1.</source>
-        <translation>Ha habido un error al intentar guardar los datos del monedero en %1.</translation>
-    </message>
-    <message>
-        <source>The wallet data was successfully saved to %1.</source>
-        <translation>Los datos del monedero se han guardado con éxito en %1.</translation>
-    </message>
+    <name>UnitDisplayStatusBarControl</name>
     <message>
-        <source>Backup Successful</source>
-        <translation>Se ha completado la copia de seguridad del monedero</translation>
+        <source>Unit to show amounts in. Click to select another unit.</source>
+        <translation>Unidad en la que se muestran las cantidades. Haga clic para seleccionar otra unidad.</translation>
     </message>
 </context>
 <context>
@@ -2925,14 +1756,6 @@
         <source>If &lt;category&gt; is not supplied or if &lt;category&gt; = 1, output all debugging information.</source>
         <translation>Si &lt;category&gt; no es proporcionado o si &lt;category&gt; =1, muestra toda la información de depuración.</translation>
     </message>
-    <message>
-        <source>Maximum total fees (in %s) to use in a single wallet transaction; setting this too low may abort large transactions (default: %s)</source>
-        <translation>Máximas comisiones totales (en %s) para utilizar en una sola transacción de la cartera; establecer esto demasiado bajo puede abortar grandes transacciones (predeterminado: %s)</translation>
-    </message>
-    <message>
-        <source>Please check that your computer's date and time are correct! If your clock is wrong Bitcoin Core will not work properly.</source>
-        <translation>Por favor, mira si la fecha y la hora en tu computador son correctas! Si tu hara es errónea Bitcoin Core no funcionará correctamente.</translation>
-    </message>
     <message>
         <source>Prune configured below the minimum of %d MiB.  Please use a higher number.</source>
         <translation>La Poda se ha configurado por debajo del minimo de %d MiB. Por favor utiliza un valor mas alto.</translation>
@@ -2974,6 +1797,14 @@
         <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
         <translation>Aceptar conexiones desde el exterior (predeterminado: 1 si no -proxy o -connect)</translation>
     </message>
+    <message>
+        <source>Bitcoin Core</source>
+        <translation>Bitcoin Core</translation>
+    </message>
+    <message>
+        <source>The %s developers</source>
+        <translation>Los %s desarrolladores</translation>
+    </message>
     <message>
         <source>-fallbackfee is set very high! This is the transaction fee you may pay when fee estimates are not available.</source>
         <translation>-fallbackfee tiene un ajuste muy alto! Esta es la comisión de transacción que pagarás cuando las estimaciones de comisiones no estén disponibles.</translation>
@@ -2990,6 +1821,10 @@
         <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source>
         <translation>Vincular a la dirección dada y escuchar siempre en ella. Utilice la notación [host]:port para IPv6</translation>
     </message>
+    <message>
+        <source>Cannot obtain a lock on data directory %s. %s is probably already running.</source>
+        <translation>No se puede bloquear el directorio %s. %s ya se está ejecutando.</translation>
+    </message>
     <message>
         <source>Delete all wallet transactions and only recover those parts of the blockchain through -rescan on startup</source>
         <translation>Borrar todas las transacciones del monedero y sólo recuperar aquellas partes de la cadena de bloques por medio de -rescan on startup.</translation>
@@ -2998,6 +1833,14 @@
         <source>Distributed under the MIT software license, see the accompanying file COPYING or &lt;http://www.opensource.org/licenses/mit-license.php&gt;.</source>
         <translation>Distribuido bajo la licencia de software MIT, vea la copia del archivo adjunto o &lt;http://www.opensource.org/licenses/mit-license.php&gt;.</translation>
     </message>
+    <message>
+        <source>Error loading %s: You can't enable HD on a already existing non-HD wallet</source>
+        <translation>Error cargando %s: No puede habilitar HD en un monedero existente que no es HD</translation>
+    </message>
+    <message>
+        <source>Error reading %s! All keys read correctly, but transaction data or address book entries might be missing or incorrect.</source>
+        <translation>Error leyendo %s!. Todas las claves se han leido correctamente, pero los datos de transacciones o la libreta de direcciones pueden faltar o ser incorrectos.</translation>
+    </message>
     <message>
         <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source>
         <translation>Ejecutar comando cuando una transacción del monedero cambia (%s en cmd se remplazará por TxID)</translation>
@@ -3006,6 +1849,22 @@
         <source>Force relay of transactions from whitelisted peers even they violate local relay policy (default: %d)</source>
         <translation>Fuerza la retransmisión de transacciones desde nodos en la lista blanca incluso si violan la política de retransmisiones local (predeterminado: %d)</translation>
     </message>
+    <message>
+        <source>Maximum allowed median peer time offset adjustment. Local perspective of time may be influenced by peers forward or backward by this amount. (default: %u seconds)</source>
+        <translation>Ajuste máximo permitido del tiempo offset medio de pares. La perspectiva local de tiempo se verá influenciada por los pares anteriores y posteriores a esta cantidad. (Por defecto: %u segundos)</translation>
+    </message>
+    <message>
+        <source>Maximum total fees (in %s) to use in a single wallet transaction or raw transaction; setting this too low may abort large transactions (default: %s)</source>
+        <translation>Máximas comisiones totales (en %s) para utilizar en una sola transacción de la cartera; establecer esto demasiado bajo puede abortar grandes transacciones (predeterminado: %s)</translation>
+    </message>
+    <message>
+        <source>Please check that your computer's date and time are correct! If your clock is wrong, %s will not work properly.</source>
+        <translation>Por favor, compruebe si la fecha y hora en su computadora son correctas! Si su reloj esta mal, %s no trabajara correctamente. </translation>
+    </message>
+    <message>
+        <source>Please contribute if you find %s useful. Visit %s for further information about the software.</source>
+        <translation>Contribuya si encuentra %s de utilidad. Visite %s para mas información acerca del programa.</translation>
+    </message>
     <message>
         <source>Set the number of script verification threads (%u to %d, 0 = auto, &lt;0 = leave that many cores free, default: %d)</source>
         <translation>Establecer el número de hilos (threads) de verificación de scripts (entre %u y %d, 0 = automático, &lt;0 = dejar libres ese número de núcleos; predeterminado: %d)</translation>
@@ -3018,14 +1877,6 @@
         <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
         <translation>Esta es una versión de pre-prueba - utilícela bajo su propio riesgo. No la utilice para usos comerciales o de minería.</translation>
     </message>
-    <message>
-        <source>Unable to bind to %s on this computer. Bitcoin Core is probably already running.</source>
-        <translation>No se ha podido acceder a %s en esta máquina. Probablemente ya se está ejecutando Bitcoin Core.</translation>
-    </message>
-    <message>
-        <source>Unsupported argument -whitelistalwaysrelay ignored, use -whitelistrelay and/or -whitelistforcerelay.</source>
-        <translation>El argumento no soportado -whitelistalwaysrelay ha sido ignorado, utiliza -whitelistrelay  y/o -whitelistforcerelay.</translation>
-    </message>
     <message>
         <source>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</source>
         <translation>Utiliza UPnP para asignar el puerto de escucha (predeterminado: 1 cuando esta escuchando sin -proxy)</translation>
@@ -3042,22 +1893,22 @@
         <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source>
         <translation>Atención: ¡Parece que la red no está totalmente de acuerdo! Algunos mineros están presentando inconvenientes.</translation>
     </message>
-    <message>
-        <source>Warning: Unknown block versions being mined! It's possible unknown rules are in effect</source>
-        <translation>Advertencia: Se están minando versiones de bloques desconocidas! Es posible que normas desconocidas estén activas</translation>
-    </message>
     <message>
         <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source>
         <translation>Atención: ¡Parece que no estamos completamente de acuerdo con nuestros pares! Podría necesitar una actualización, u otros nodos podrían necesitarla.</translation>
     </message>
-    <message>
-        <source>Warning: wallet.dat corrupt, data salvaged! Original wallet.dat saved as wallet.{timestamp}.bak in %s; if your balance or transactions are incorrect you should restore from a backup.</source>
-        <translation>Aviso: ¡Recuperados datos de wallet.dat corrupto! El wallet.dat original se ha guardado como wallet.{timestamp}.bak en %s; si hubiera errores en su saldo o transacciones, deberá restaurar una copia de seguridad.</translation>
-    </message>
     <message>
         <source>Whitelist peers connecting from the given netmask or IP address. Can be specified multiple times.</source>
         <translation>Poner en lista blanca a los equipos que se conecten desde la máscara de subred o dirección IP especificada. Se puede especificar múltiples veces.</translation>
     </message>
+    <message>
+        <source>You need to rebuild the database using -reindex-chainstate to change -txindex</source>
+        <translation>Necesita reconstruir la base de datos usando -reindex-chainstate para cambiar -txindex</translation>
+    </message>
+    <message>
+        <source>%s corrupt, salvage failed</source>
+        <translation>%s corrupto. Fracasó la recuperacion</translation>
+    </message>
     <message>
         <source>-maxmempool must be at least %d MB</source>
         <translation>-maxmempool debe ser por lo menos de %d MB</translation>
@@ -3070,10 +1921,22 @@
         <source>Append comment to the user agent string</source>
         <translation>Adjunta un comentario a la linea de agente de usuario</translation>
     </message>
+    <message>
+        <source>Attempt to recover private keys from a corrupt wallet on startup</source>
+        <translation>Intento de recuperar claves privadas de un monedero corrupto en arranque</translation>
+    </message>
     <message>
         <source>Block creation options:</source>
         <translation>Opciones de creación de bloques:</translation>
     </message>
+    <message>
+        <source>Cannot resolve -%s address: '%s'</source>
+        <translation>No se puede resolver -%s direccion: '%s'</translation>
+    </message>
+    <message>
+        <source>Change index out of range</source>
+        <translation>Cambio de indice fuera de rango</translation>
+    </message>
     <message>
         <source>Connect only to the specified node(s)</source>
         <translation>Conectar sólo a los nodos (o nodo) especificados</translation>
@@ -3082,6 +1945,10 @@
         <source>Connection options:</source>
         <translation>Opciones de conexión:</translation>
     </message>
+    <message>
+        <source>Copyright (C) %i-%i</source>
+        <translation>Copyright (C) %i-%i</translation>
+    </message>
     <message>
         <source>Corrupted block database detected</source>
         <translation>Corrupción de base de datos de bloques detectada.</translation>
@@ -3126,6 +1993,22 @@
         <source>Error initializing wallet database environment %s!</source>
         <translation>Error al inicializar el entorno de la base de datos del monedero  %s</translation>
     </message>
+    <message>
+        <source>Error loading %s</source>
+        <translation>Error cargando %s</translation>
+    </message>
+    <message>
+        <source>Error loading %s: Wallet corrupted</source>
+        <translation>Error cargando %s: Monedero dañado</translation>
+    </message>
+    <message>
+        <source>Error loading %s: Wallet requires newer version of %s</source>
+        <translation>Error cargando %s: Monedero requiere un versión mas reciente de %s</translation>
+    </message>
+    <message>
+        <source>Error loading %s: You can't disable HD on a already existing HD wallet</source>
+        <translation>Error cargando %s: No puede deshabilitar HD en un monedero existente que ya es HD</translation>
+    </message>
     <message>
         <source>Error loading block database</source>
         <translation>Error cargando base de datos de bloques</translation>
@@ -3150,10 +2033,18 @@
         <source>Incorrect or no genesis block found. Wrong datadir for network?</source>
         <translation>Incorrecto o bloque de génesis no encontrado. Datadir equivocada para la red?</translation>
     </message>
+    <message>
+        <source>Initialization sanity check failed. %s is shutting down.</source>
+        <translation>La inicialización de la verificación de validez falló. Se está apagando %s.</translation>
+    </message>
     <message>
         <source>Invalid -onion address: '%s'</source>
         <translation>Dirección -onion inválida: '%s'</translation>
     </message>
+    <message>
+        <source>Invalid amount for -%s=&lt;amount&gt;: '%s'</source>
+        <translation>Cantidad no valida para -%s=&lt;amount&gt;: '%s'</translation>
+    </message>
     <message>
         <source>Invalid amount for -fallbackfee=&lt;amount&gt;: '%s'</source>
         <translation>Cantidad inválida para -fallbackfee=&lt;amount&gt;: '%s'</translation>
@@ -3162,6 +2053,10 @@
         <source>Keep the transaction memory pool below &lt;n&gt; megabytes (default: %u)</source>
         <translation>Mantener la memoria de transacciones por debajo de &lt;n&gt; megabytes (predeterminado: %u)</translation>
     </message>
+    <message>
+        <source>Loading banlist...</source>
+        <translation>Cargando banlist...</translation>
+    </message>
     <message>
         <source>Location of the auth cookie (default: data dir)</source>
         <translation>Ubicación de la cookie de autenticación (default: data dir)</translation>
@@ -3178,6 +2073,10 @@
         <source>Only connect to nodes in network &lt;net&gt; (ipv4, ipv6 or onion)</source>
         <translation>Sólo conectar a nodos en redes &lt;net&gt; (ipv4, ipv6 o onion)</translation>
     </message>
+    <message>
+        <source>Print this help message and exit</source>
+        <translation>Imprimir este mensaje de ayuda y salir</translation>
+    </message>
     <message>
         <source>Print version and exit</source>
         <translation>Imprimir versión y salir</translation>
@@ -3190,6 +2089,14 @@
         <source>Prune mode is incompatible with -txindex.</source>
         <translation>El modo recorte es incompatible con -txindex.</translation>
     </message>
+    <message>
+        <source>Rebuild chain state and block index from the blk*.dat files on disk</source>
+        <translation>Reconstruir el estado de la cadena e indice de bloques a partir de los ficheros blk*.dat en disco</translation>
+    </message>
+    <message>
+        <source>Rebuild chain state from the currently indexed blocks</source>
+        <translation>Reconstruir el estado de la cadena a partir de los bloques indexados</translation>
+    </message>
     <message>
         <source>Set database cache size in megabytes (%d to %d, default: %d)</source>
         <translation>Asignar tamaño de cache en megabytes (entre %d y %d; predeterminado: %d)</translation>
@@ -3202,6 +2109,14 @@
         <source>Specify wallet file (within data directory)</source>
         <translation>Especificar archivo de monedero (dentro del directorio de datos)</translation>
     </message>
+    <message>
+        <source>The source code is available from %s.</source>
+        <translation>El código fuente esta disponible desde %s.</translation>
+    </message>
+    <message>
+        <source>Unable to bind to %s on this computer. %s is probably already running.</source>
+        <translation>No se ha podido conectar con %s en este equipo. %s es posible que este todavia en ejecución.</translation>
+    </message>
     <message>
         <source>Unsupported argument -benchmark ignored, use -debug=bench.</source>
         <translation>El argumento -benchmark no es soportado y ha sido ignorado, utiliza -debug=bench</translation>
@@ -3235,12 +2150,16 @@
         <translation>El monedero %s se encuentra fuera del directorio de datos %s</translation>
     </message>
     <message>
-        <source>Wallet options:</source>
-        <translation>Opciones de monedero:</translation>
+        <source>Wallet debugging/testing options:</source>
+        <translation>Opciones de depuración/pruebas de monedero:</translation>
+    </message>
+    <message>
+        <source>Wallet needed to be rewritten: restart %s to complete</source>
+        <translation>Es necesario reescribir el monedero: reiniciar %s para completar</translation>
     </message>
     <message>
-        <source>You need to rebuild the database using -reindex to change -txindex</source>
-        <translation>Usted necesita reconstruir la base de datos utilizando -reindex para cambiar -txindex</translation>
+        <source>Wallet options:</source>
+        <translation>Opciones de monedero:</translation>
     </message>
     <message>
         <source>Allow JSON-RPC connections from specified source. Valid for &lt;ip&gt; are a single IP (e.g. 1.2.3.4), a network/netmask (e.g. 1.2.3.4/255.255.255.0) or a network/CIDR (e.g. 1.2.3.4/24). This option can be specified multiple times</source>
@@ -3254,10 +2173,6 @@
         <source>Bind to given address to listen for JSON-RPC connections. Use [host]:port notation for IPv6. This option can be specified multiple times (default: bind to all interfaces)</source>
         <translation>Ligar a las direcciones especificadas para escuchar por conexiones JSON-RPC. Usar la notación para IPv6 [host]:puerto. Esta opción se puede especificar múltiples veces (por defecto: ligar a todas las interfaces)</translation>
     </message>
-    <message>
-        <source>Cannot obtain a lock on data directory %s. Bitcoin Core is probably already running.</source>
-        <translation>No se ha podido bloquear el directorio de datos %s. Probablemente ya se está ejecutando Bitcoin Core.</translation>
-    </message>
     <message>
         <source>Create new files with system default permissions, instead of umask 077 (only effective with disabled wallet functionality)</source>
         <translation>Crear nuevos archivos con permisos por defecto del sistema, en lugar de umask 077 (sólo efectivo con la funcionalidad de monedero desactivada)</translation>
@@ -3302,10 +2217,6 @@
         <source>Set maximum size of high-priority/low-fee transactions in bytes (default: %d)</source>
         <translation>Establecer tamaño máximo de las transacciones de alta prioridad/baja comisión en bytes (predeterminado: %d)</translation>
     </message>
-    <message>
-        <source>Set the number of threads for coin generation if enabled (-1 = all cores, default: %d)</source>
-        <translation>Ajuste el número de hilos para la generación de moneda si está habilitado  (-1 = all cores, default: %d)</translation>
-    </message>
     <message>
         <source>The transaction amount is too small to send after the fee has been deducted</source>
         <translation>Monto de transacción muy pequeña luego de la deducción por comisión</translation>
@@ -3314,6 +2225,10 @@
         <source>This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit &lt;https://www.openssl.org/&gt; and cryptographic software written by Eric Young and UPnP software written by Thomas Bernard.</source>
         <translation>Este producto incluye software desarrollado por el OpenSSL Project para su uso en OpenSSL Toolkit &lt;https://www.openssl.org/&gt;, software de cifrado escrito por Eric Young y software UPnP escrito por Thomas Bernard.</translation>
     </message>
+    <message>
+        <source>Use hierarchical deterministic key generation (HD) after BIP32. Only has effect during wallet creation/first start</source>
+        <translation>Usar tras BIP32 la generación de llave determinística jerárquica (HD) . Solo tiene efecto durante el primer inicio/generación del monedero</translation>
+    </message>
     <message>
         <source>Whitelisted peers cannot be DoS banned and their transactions are always relayed, even if they are already in the mempool, useful e.g. for a gateway</source>
         <translation>A los equipos en lista blanca no se les pueden prohibir los ataques DoS y sus transacciones siempre son retransmitidas, incluso si ya están en el mempool, es útil por ejemplo para un gateway.</translation>
@@ -3330,34 +2245,14 @@
         <source>Accept public REST requests (default: %u)</source>
         <translation>Aceptar solicitudes públicas en FERIADOS (por defecto: %u)</translation>
     </message>
-    <message>
-        <source>Activating best chain...</source>
-        <translation>Activando la mejor cadena...</translation>
-    </message>
-    <message>
-        <source>Attempt to recover private keys from a corrupt wallet.dat on startup</source>
-        <translation>Intento de recuperar claves privadas de un wallet.dat corrupto</translation>
-    </message>
     <message>
         <source>Automatically create Tor hidden service (default: %d)</source>
         <translation>Automáticamente crea el servicio Tor oculto (por defecto: %d)</translation>
     </message>
-    <message>
-        <source>Cannot resolve -whitebind address: '%s'</source>
-        <translation>No se puede resolver -whitebind address: '%s'</translation>
-    </message>
     <message>
         <source>Connect through SOCKS5 proxy</source>
         <translation>Conectar usando SOCKS5 proxy</translation>
     </message>
-    <message>
-        <source>Copyright (C) 2009-%i The Bitcoin Core Developers</source>
-        <translation>Copyright (C) 2009-%i The Bitcoin Core Developers</translation>
-    </message>
-    <message>
-        <source>Error loading wallet.dat: Wallet requires newer version of Bitcoin Core</source>
-        <translation>Error al cargar wallet.dat: El monedero requiere una versión más reciente de Bitcoin Core</translation>
-    </message>
     <message>
         <source>Error reading from database, shutting down.</source>
         <translation>Error al leer la base de datos, cerrando.</translation>
@@ -3370,22 +2265,6 @@
         <source>Information</source>
         <translation>Información</translation>
     </message>
-    <message>
-        <source>Initialization sanity check failed. Bitcoin Core is shutting down.</source>
-        <translation>La inicialización de la verificación de validez falló. Se está apagando Bitcoin Core.</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -maxtxfee=&lt;amount&gt;: '%s'</source>
-        <translation>Monto inválido para -maxtxfee=&lt;amount&gt;: '%s'</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -minrelaytxfee=&lt;amount&gt;: '%s'</source>
-        <translation>Cantidad inválida para -minrelaytxfee=&lt;amount&gt;: '%s'</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -mintxfee=&lt;amount&gt;: '%s'</source>
-        <translation>Cantidad inválida para -mintxfee=&lt;amount&gt;: '%s'</translation>
-    </message>
     <message>
         <source>Invalid amount for -paytxfee=&lt;amount&gt;: '%s' (must be at least %s)</source>
         <translation>Cantidad inválida para -paytxfee=&lt;amount&gt;: '%s' (debe ser por lo menos %s)</translation>
@@ -3410,14 +2289,6 @@
         <source>RPC server options:</source>
         <translation>Opciones de servidor RPC:</translation>
     </message>
-    <message>
-        <source>Rebuild block chain index from current blk000??.dat files on startup</source>
-        <translation>Reconstruir el índice de la cadena de bloques en el arranque desde los actuales ficheros blk000??.dat</translation>
-    </message>
-    <message>
-        <source>Receive and display P2P network alerts (default: %u)</source>
-        <translation>Recibir y mostrar alertas de red P2P (default: %u)</translation>
-    </message>
     <message>
         <source>Reducing -maxconnections from %d to %d, because of system limitations.</source>
         <translation>Reduciendo -maxconnections de %d a %d, debido a limitaciones del sistema.</translation>
@@ -3491,10 +2362,6 @@
         <translation>Nombre de usuario para las conexiones JSON-RPC
 </translation>
     </message>
-    <message>
-        <source>Wallet needed to be rewritten: restart Bitcoin Core to complete</source>
-        <translation>Monedero es necesario volver a escribir: reiniciar Bitcoin Core para completar</translation>
-    </message>
     <message>
         <source>Warning</source>
         <translation>Aviso</translation>
@@ -3515,10 +2382,6 @@
         <source>ZeroMQ notification options:</source>
         <translation>Opciones de notificación ZeroQM:</translation>
     </message>
-    <message>
-        <source>wallet.dat corrupt, salvage failed</source>
-        <translation>wallet.dat corrupto. Ha fallado la recuperación.</translation>
-    </message>
     <message>
         <source>Password for JSON-RPC connections</source>
         <translation>Contraseña para las conexiones JSON-RPC
@@ -3528,11 +2391,6 @@
         <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
         <translation>Ejecutar un comando cuando cambia el mejor bloque (%s en cmd se sustituye por el hash de bloque)</translation>
     </message>
-    <message>
-        <source>This help message</source>
-        <translation>Este mensaje de ayuda
-</translation>
-    </message>
     <message>
         <source>Allow DNS lookups for -addnode, -seednode and -connect</source>
         <translation>Permitir búsquedas DNS para -addnode, -seednode y -connect</translation>
@@ -3541,10 +2399,6 @@
         <source>Loading addresses...</source>
         <translation>Cargando direcciones...</translation>
     </message>
-    <message>
-        <source>Error loading wallet.dat: Wallet corrupted</source>
-        <translation>Error al cargar wallet.dat: el monedero está dañado</translation>
-    </message>
     <message>
         <source>(1 = keep tx meta data e.g. account owner and payment request information, 2 = drop tx meta data)</source>
         <translation>(1 = keep tx meta data e.g. account owner and payment request information, 2 = drop tx meta data)</translation>
@@ -3561,10 +2415,6 @@
         <source>Do not keep transactions in the mempool longer than &lt;n&gt; hours (default: %u)</source>
         <translation>No mantener transacciones en la memoria mas de &lt;n&gt; horas (predeterminado: %u)</translation>
     </message>
-    <message>
-        <source>Error reading wallet.dat! All keys read correctly, but transaction data or address book entries might be missing or incorrect.</source>
-        <translation>Error al leer wallet.dat! Todas las llaves se leyeron correctamente, pero los datos de transacciones o la libreta de direcciones pueden faltar o ser incorrectos.</translation>
-    </message>
     <message>
         <source>Fees (in %s/kB) smaller than this are considered zero fee for transaction creation (default: %s)</source>
         <translation>Las comisiones (en %s/kB) menores que esto son consideradas de cero comision para la creacion de transacciones (predeterminado: %s)</translation>
@@ -3589,6 +2439,10 @@
         <source>Unsupported argument -socks found. Setting SOCKS version isn't possible anymore, only SOCKS5 proxies are supported.</source>
         <translation>Error: Unsupported argumento -socks encontrados. SOCKS versión ajuste ya no es posible, sólo SOCKS5 proxies son compatibles.</translation>
     </message>
+    <message>
+        <source>Unsupported argument -whitelistalwaysrelay ignored, use -whitelistrelay and/or -whitelistforcerelay.</source>
+        <translation>El argumento no soportado -whitelistalwaysrelay ha sido ignorado, utiliza -whitelistrelay  y/o -whitelistforcerelay.</translation>
+    </message>
     <message>
         <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: %s)</source>
         <translation>Usar distintos proxys SOCKS5 para comunicarse vía Tor de forma anónima (Por defecto: %s)</translation>
@@ -3598,20 +2452,20 @@
         <translation>Nombre de usuario y hash de la contraseña para las conexiones JSON-RPC. El campo &lt;userpw&gt; tiene el formato: &lt;USERNAME&gt;:&lt;SALT&gt;$&lt;HASH&gt;. Se incluye un script python convencional en share/rpcuser. Esta opción puede ser especificada multiples veces</translation>
     </message>
     <message>
-        <source>(default: %s)</source>
-        <translation>(predeterminado: %s)</translation>
+        <source>Warning: Unknown block versions being mined! It's possible unknown rules are in effect</source>
+        <translation>Advertencia: Se están minando versiones de bloques desconocidas! Es posible que normas desconocidas estén activas</translation>
     </message>
     <message>
-        <source>Always query for peer addresses via DNS lookup (default: %u)</source>
-        <translation>Siempre consultar direcciones de otros equipos por medio de DNS lookup (por defecto: %u)</translation>
+        <source>Warning: Wallet file corrupt, data salvaged! Original %s saved as %s in %s; if your balance or transactions are incorrect you should restore from a backup.</source>
+        <translation>Aviso: fichero de monedero corrupto, datos recuperados! Original %s guardado como %s en %s; si su balance de transacciones es incorrecto, debe restaurar desde una copia de seguridad.</translation>
     </message>
     <message>
-        <source>Error loading wallet.dat</source>
-        <translation>Error al cargar wallet.dat</translation>
+        <source>(default: %s)</source>
+        <translation>(predeterminado: %s)</translation>
     </message>
     <message>
-        <source>Generate coins (default: %u)</source>
-        <translation>Generar monedas (por defecto: %u)</translation>
+        <source>Always query for peer addresses via DNS lookup (default: %u)</source>
+        <translation>Siempre consultar direcciones de otros equipos por medio de DNS lookup (por defecto: %u)</translation>
     </message>
     <message>
         <source>How many blocks to check at startup (default: %u, 0 = all)</source>
@@ -3697,18 +2551,6 @@
         <source>Unknown network specified in -onlynet: '%s'</source>
         <translation>La red especificada en -onlynet '%s' es desconocida</translation>
     </message>
-    <message>
-        <source>Cannot resolve -bind address: '%s'</source>
-        <translation>No se puede resolver la dirección de -bind: '%s'</translation>
-    </message>
-    <message>
-        <source>Cannot resolve -externalip address: '%s'</source>
-        <translation>No se puede resolver la dirección de -externalip: '%s'</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -paytxfee=&lt;amount&gt;: '%s'</source>
-        <translation>Cantidad inválida para -paytxfee=&lt;amount&gt;: '%s'</translation>
-    </message>
     <message>
         <source>Insufficient funds</source>
         <translation>Fondos insuficientes</translation>
diff --git a/src/qt/locale/bitcoin_es_419.ts b/src/qt/locale/bitcoin_es_419.ts
deleted file mode 100644
index b76915662c114..0000000000000
--- a/src/qt/locale/bitcoin_es_419.ts
+++ /dev/null
@@ -1,173 +0,0 @@
-<TS language="es_419" version="2.1">
-<context>
-    <name>AddressBookPage</name>
-    <message>
-        <source>Right-click to edit address or label</source>
-        <translation>Haga clic para editar la dirección o etiqueta</translation>
-    </message>
-    <message>
-        <source>Create a new address</source>
-        <translation>Crear una nueva dirección</translation>
-    </message>
-    <message>
-        <source>&amp;New</source>
-        <translation>&amp;New</translation>
-    </message>
-    <message>
-        <source>Copy the currently selected address to the system clipboard</source>
-        <translation>Copia la dirección seleccionada al portapapeles del sistema</translation>
-    </message>
-    <message>
-        <source>Choose the address to send coins to</source>
-        <translation>Seleccione la Direccion a la que enviara dinero</translation>
-    </message>
-    <message>
-        <source>Choose the address to receive coins with</source>
-        <translation>Seleccione la direccion de la que recibira dinero</translation>
-    </message>
-    <message>
-        <source>Export Address List</source>
-        <translation>Exportar Lista de Direcciones</translation>
-    </message>
-    </context>
-<context>
-    <name>AddressTableModel</name>
-    <message>
-        <source>Address</source>
-        <translation>Direccion</translation>
-    </message>
-    </context>
-<context>
-    <name>AskPassphraseDialog</name>
-    <message>
-        <source>Decrypt wallet</source>
-        <translation>Desencriptar Monedero</translation>
-    </message>
-    <message>
-        <source>Confirm wallet encryption</source>
-        <translation>Confirmar Encriptacion de Monedero</translation>
-    </message>
-    <message>
-        <source>Warning: The Caps Lock key is on!</source>
-        <translation>Advertencia: La Tecla Caps Lock esta habilitada!</translation>
-    </message>
-    <message>
-        <source>Wallet encrypted</source>
-        <translation>Monedero ha sido encriptado</translation>
-    </message>
-    <message>
-        <source>Wallet encryption failed</source>
-        <translation>La encriptacion del monedero ha fallado</translation>
-    </message>
-    </context>
-<context>
-    <name>BanTableModel</name>
-    </context>
-<context>
-    <name>BitcoinGUI</name>
-    </context>
-<context>
-    <name>ClientModel</name>
-    </context>
-<context>
-    <name>CoinControlDialog</name>
-    </context>
-<context>
-    <name>EditAddressDialog</name>
-    </context>
-<context>
-    <name>FreespaceChecker</name>
-    </context>
-<context>
-    <name>HelpMessageDialog</name>
-    </context>
-<context>
-    <name>Intro</name>
-    </context>
-<context>
-    <name>OpenURIDialog</name>
-    </context>
-<context>
-    <name>OptionsDialog</name>
-    </context>
-<context>
-    <name>OverviewPage</name>
-    </context>
-<context>
-    <name>PaymentServer</name>
-    </context>
-<context>
-    <name>PeerTableModel</name>
-    </context>
-<context>
-    <name>QObject</name>
-    </context>
-<context>
-    <name>QRImageWidget</name>
-    </context>
-<context>
-    <name>RPCConsole</name>
-    </context>
-<context>
-    <name>ReceiveCoinsDialog</name>
-    </context>
-<context>
-    <name>ReceiveRequestDialog</name>
-    <message>
-        <source>Address</source>
-        <translation>Direccion</translation>
-    </message>
-    </context>
-<context>
-    <name>RecentRequestsTableModel</name>
-    </context>
-<context>
-    <name>SendCoinsDialog</name>
-    </context>
-<context>
-    <name>SendCoinsEntry</name>
-    </context>
-<context>
-    <name>ShutdownWindow</name>
-    </context>
-<context>
-    <name>SignVerifyMessageDialog</name>
-    </context>
-<context>
-    <name>SplashScreen</name>
-    </context>
-<context>
-    <name>TrafficGraphWidget</name>
-    </context>
-<context>
-    <name>TransactionDesc</name>
-    </context>
-<context>
-    <name>TransactionDescDialog</name>
-    </context>
-<context>
-    <name>TransactionTableModel</name>
-    </context>
-<context>
-    <name>TransactionView</name>
-    <message>
-        <source>Address</source>
-        <translation>Direccion</translation>
-    </message>
-    </context>
-<context>
-    <name>UnitDisplayStatusBarControl</name>
-    </context>
-<context>
-    <name>WalletFrame</name>
-    </context>
-<context>
-    <name>WalletModel</name>
-    </context>
-<context>
-    <name>WalletView</name>
-    </context>
-<context>
-    <name>bitcoin-core</name>
-    </context>
-</TS>
\ No newline at end of file
diff --git a/src/qt/locale/bitcoin_es_AR.ts b/src/qt/locale/bitcoin_es_AR.ts
index fb9ac895be830..40ebaf88560ad 100644
--- a/src/qt/locale/bitcoin_es_AR.ts
+++ b/src/qt/locale/bitcoin_es_AR.ts
@@ -25,10 +25,6 @@
         <source>C&amp;lose</source>
         <translation>C&amp;lose</translation>
     </message>
-    <message>
-        <source>&amp;Copy Address</source>
-        <translation>&amp;Copiar Dirección</translation>
-    </message>
     <message>
         <source>Delete the currently selected address from the list</source>
         <translation>Borrar de la lista la dirección seleccionada</translation>
@@ -45,73 +41,6 @@
         <source>&amp;Delete</source>
         <translation>&amp;Borrar</translation>
     </message>
-    <message>
-        <source>Choose the address to send coins to</source>
-        <translation>Elegir la dirección a donde enviar las monedas (coins)</translation>
-    </message>
-    <message>
-        <source>Choose the address to receive coins with</source>
-        <translation>Elegí la dirección donde recibir las monedas</translation>
-    </message>
-    <message>
-        <source>C&amp;hoose</source>
-        <translation>E&amp;legir</translation>
-    </message>
-    <message>
-        <source>Sending addresses</source>
-        <translation>Direcciones de envío</translation>
-    </message>
-    <message>
-        <source>Receiving addresses</source>
-        <translation>Direcciones de recepción</translation>
-    </message>
-    <message>
-        <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source>
-        <translation>Estas son tus direcciones Bitcoin para enviar pagos. Siempre chequeá el monto y la dirección de recepción antes de mandar monedas.</translation>
-    </message>
-    <message>
-        <source>These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source>
-        <translation>Estas son tus direcciones para recibir pagos. Te recomendamos que uses una dirección de recibir  para cada transacción.</translation>
-    </message>
-    <message>
-        <source>Copy &amp;Label</source>
-        <translation>Copiar &amp;Etiqueta</translation>
-    </message>
-    <message>
-        <source>&amp;Edit</source>
-        <translation>&amp;Editar</translation>
-    </message>
-    <message>
-        <source>Export Address List</source>
-        <translation>Exportar lista de direcciones</translation>
-    </message>
-    <message>
-        <source>Comma separated file (*.csv)</source>
-        <translation>Archivo separado por coma (*.csv)</translation>
-    </message>
-    <message>
-        <source>Exporting Failed</source>
-        <translation>Falló la exportación</translation>
-    </message>
-    <message>
-        <source>There was an error trying to save the address list to %1. Please try again.</source>
-        <translation>Hubo un error al tratar de guardar la lista de direcciones a %1. Por favor tratá de nuevo.</translation>
-    </message>
-</context>
-<context>
-    <name>AddressTableModel</name>
-    <message>
-        <source>Label</source>
-        <translation>Etiqueta</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>Dirección</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(sin etiqueta)</translation>
-    </message>
 </context>
 <context>
     <name>AskPassphraseDialog</name>
@@ -131,106 +60,15 @@
         <source>Repeat new passphrase</source>
         <translation>Repetí la nueva Frase de Contraseña</translation>
     </message>
-    <message>
-        <source>Encrypt wallet</source>
-        <translation>Encriptar la billetera</translation>
-    </message>
-    <message>
-        <source>This operation needs your wallet passphrase to unlock the wallet.</source>
-        <translation>Esta operación necesita tu frase de contraseña para desbloquear tu billetera.</translation>
-    </message>
-    <message>
-        <source>Unlock wallet</source>
-        <translation>Desbloquear la billetera</translation>
-    </message>
-    <message>
-        <source>This operation needs your wallet passphrase to decrypt the wallet.</source>
-        <translation>Esta operación necesita tu Frase de Contraseña de billetera para desencriptar la billetera.</translation>
-    </message>
-    <message>
-        <source>Decrypt wallet</source>
-        <translation>Desencriptar la billetera</translation>
-    </message>
-    <message>
-        <source>Change passphrase</source>
-        <translation>Cambiar la Frase de Contraseña</translation>
-    </message>
-    <message>
-        <source>Confirm wallet encryption</source>
-        <translation>Confirmá la encriptación de la billetera</translation>
-    </message>
-    <message>
-        <source>Warning: If you encrypt your wallet and lose your passphrase, you will &lt;b&gt;LOSE ALL OF YOUR BITCOINS&lt;/b&gt;!</source>
-        <translation>Atención: Si encriptás tu billetera y perdés tu frase de contraseña, vas a &lt;b&gt;PERDER TODOS TUS BITCOINS&lt;/b&gt;!</translation>
-    </message>
-    <message>
-        <source>Are you sure you wish to encrypt your wallet?</source>
-        <translation>¿Estás seguro que querés encriptar tu billetera?</translation>
-    </message>
-    <message>
-        <source>Bitcoin Core will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source>
-        <translation>Bitcoin Core ahora se va a cerrar para terminar el proceso de encriptación. Acordate que encriptar tu billetera no te protege completamente de que algún malware que pueda infectar tu computadora te robe tus bitcoins.</translation>
-    </message>
-    <message>
-        <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source>
-        <translation>IMPORTANTE: Todos los backups que hayas hecho de tu billetera tendrían que ser reemplazados por el archivo encriptado de billetera que generaste. Por razones de seguridad, los backups anteriores del archivo de billetera no encriptado se inutilizan en el momento en que empezás a usar la nueva billetera encriptada</translation>
-    </message>
-    <message>
-        <source>Warning: The Caps Lock key is on!</source>
-        <translation>Atención: Tenés puestas las mayúsculas!</translation>
-    </message>
-    <message>
-        <source>Wallet encrypted</source>
-        <translation>Billetera encriptada</translation>
-    </message>
-    <message>
-        <source>Enter the new passphrase to the wallet.&lt;br/&gt;Please use a passphrase of &lt;b&gt;ten or more random characters&lt;/b&gt;, or &lt;b&gt;eight or more words&lt;/b&gt;.</source>
-        <translation>Ingresá una nueva frase de contraseña para la billetera.&lt;br/&gt;Por favor, fijate de usar una frase de contraseña de &lt;b&gt;diez o más caracteres aleatorios&lt;/b&gt;, o de &lt;b&gt;ocho o más palabras&lt;/b&gt;.</translation>
-    </message>
-    <message>
-        <source>Enter the old passphrase and new passphrase to the wallet.</source>
-        <translation>Ingresá la frase de contraseña  vieja y la nueva para la billetera.</translation>
-    </message>
-    <message>
-        <source>Wallet encryption failed</source>
-        <translation>Falló la encriptación de la billetera</translation>
-    </message>
-    <message>
-        <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
-        <translation>Falló la encriptación de la billetera por un error interno. Tu billetera no está encriptada.</translation>
-    </message>
-    <message>
-        <source>The supplied passphrases do not match.</source>
-        <translation>Las frases de contraseña no son iguales.</translation>
-    </message>
-    <message>
-        <source>Wallet unlock failed</source>
-        <translation>Falló el desbloqueo de la billetera</translation>
-    </message>
-    <message>
-        <source>The passphrase entered for the wallet decryption was incorrect.</source>
-        <translation>La frase de contraseña que ingresaste para desencriptar la billetera es incorrecta.</translation>
-    </message>
-    <message>
-        <source>Wallet decryption failed</source>
-        <translation>Falló la desencriptación de la billetera</translation>
-    </message>
-    </context>
+</context>
 <context>
     <name>BanTableModel</name>
     </context>
 <context>
     <name>BitcoinGUI</name>
     </context>
-<context>
-    <name>ClientModel</name>
-    </context>
 <context>
     <name>CoinControlDialog</name>
-    <message>
-        <source>(no label)</source>
-        <translation>(sin etiqueta)</translation>
-    </message>
     </context>
 <context>
     <name>EditAddressDialog</name>
@@ -253,18 +91,12 @@
 <context>
     <name>OverviewPage</name>
     </context>
-<context>
-    <name>PaymentServer</name>
-    </context>
 <context>
     <name>PeerTableModel</name>
     </context>
 <context>
     <name>QObject</name>
     </context>
-<context>
-    <name>QRImageWidget</name>
-    </context>
 <context>
     <name>RPCConsole</name>
     </context>
@@ -273,32 +105,9 @@
     </context>
 <context>
     <name>ReceiveRequestDialog</name>
-    <message>
-        <source>Address</source>
-        <translation>Dirección</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Etiqueta</translation>
-    </message>
-    </context>
-<context>
-    <name>RecentRequestsTableModel</name>
-    <message>
-        <source>Label</source>
-        <translation>Etiqueta</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(sin etiqueta)</translation>
-    </message>
     </context>
 <context>
     <name>SendCoinsDialog</name>
-    <message>
-        <source>(no label)</source>
-        <translation>(sin etiqueta)</translation>
-    </message>
     </context>
 <context>
     <name>SendCoinsEntry</name>
@@ -315,58 +124,12 @@
 <context>
     <name>TrafficGraphWidget</name>
     </context>
-<context>
-    <name>TransactionDesc</name>
-    </context>
 <context>
     <name>TransactionDescDialog</name>
     </context>
-<context>
-    <name>TransactionTableModel</name>
-    <message>
-        <source>Label</source>
-        <translation>Etiqueta</translation>
-    </message>
-    </context>
-<context>
-    <name>TransactionView</name>
-    <message>
-        <source>Exporting Failed</source>
-        <translation>Falló la exportación</translation>
-    </message>
-    <message>
-        <source>Comma separated file (*.csv)</source>
-        <translation>Archivo separado por coma (*.csv)</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Etiqueta</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>Dirección</translation>
-    </message>
-    </context>
 <context>
     <name>UnitDisplayStatusBarControl</name>
     </context>
-<context>
-    <name>WalletFrame</name>
-    </context>
-<context>
-    <name>WalletModel</name>
-    </context>
-<context>
-    <name>WalletView</name>
-    <message>
-        <source>&amp;Export</source>
-        <translation>&amp;Exportar</translation>
-    </message>
-    <message>
-        <source>Export the data in the current tab to a file</source>
-        <translation>Exportar los datos de la pestaña actual a un archivo</translation>
-    </message>
-    </context>
 <context>
     <name>bitcoin-core</name>
     </context>
diff --git a/src/qt/locale/bitcoin_es_CL.ts b/src/qt/locale/bitcoin_es_CL.ts
index 742dee29d0374..ff0fce61192f7 100644
--- a/src/qt/locale/bitcoin_es_CL.ts
+++ b/src/qt/locale/bitcoin_es_CL.ts
@@ -25,10 +25,6 @@
         <source>C&amp;lose</source>
         <translation>C y perder</translation>
     </message>
-    <message>
-        <source>&amp;Copy Address</source>
-        <translation>&amp;Copia dirección</translation>
-    </message>
     <message>
         <source>Delete the currently selected address from the list</source>
         <translation>Eliminar la dirección seleccionada de la lista</translation>
@@ -45,57 +41,6 @@
         <source>&amp;Delete</source>
         <translation>&amp;Borrar</translation>
     </message>
-    <message>
-        <source>Choose the address to send coins to</source>
-        <translation>Selecciona la direccion para enviar coins</translation>
-    </message>
-    <message>
-        <source>Choose the address to receive coins with</source>
-        <translation>Selecciona la dirección para recibir coins</translation>
-    </message>
-    <message>
-        <source>Sending addresses</source>
-        <translation>Dirección de envio</translation>
-    </message>
-    <message>
-        <source>Receiving addresses</source>
-        <translation>Dirección para recibir</translation>
-    </message>
-    <message>
-        <source>Copy &amp;Label</source>
-        <translation>Copia &amp;etiqueta</translation>
-    </message>
-    <message>
-        <source>&amp;Edit</source>
-        <translation>&amp;Editar</translation>
-    </message>
-    <message>
-        <source>Export Address List</source>
-        <translation>Exportar lista de direcciones</translation>
-    </message>
-    <message>
-        <source>Comma separated file (*.csv)</source>
-        <translation>Archivos separados por coma (*.csv)</translation>
-    </message>
-    <message>
-        <source>Exporting Failed</source>
-        <translation>Exportado fallo</translation>
-    </message>
-    </context>
-<context>
-    <name>AddressTableModel</name>
-    <message>
-        <source>Label</source>
-        <translation>Etiqueta</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>Dirección</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(sin etiqueta)</translation>
-    </message>
 </context>
 <context>
     <name>AskPassphraseDialog</name>
@@ -111,82 +56,6 @@
         <source>Repeat new passphrase</source>
         <translation>Repite nueva contraseña</translation>
     </message>
-    <message>
-        <source>Encrypt wallet</source>
-        <translation>Codificar billetera</translation>
-    </message>
-    <message>
-        <source>This operation needs your wallet passphrase to unlock the wallet.</source>
-        <translation>Esta operación necesita la contraseña para desbloquear la billetera.</translation>
-    </message>
-    <message>
-        <source>Unlock wallet</source>
-        <translation>Desbloquea billetera</translation>
-    </message>
-    <message>
-        <source>This operation needs your wallet passphrase to decrypt the wallet.</source>
-        <translation>Esta operación necesita la contraseña para decodificar la billetara.</translation>
-    </message>
-    <message>
-        <source>Decrypt wallet</source>
-        <translation>Decodificar cartera</translation>
-    </message>
-    <message>
-        <source>Change passphrase</source>
-        <translation>Cambia contraseña</translation>
-    </message>
-    <message>
-        <source>Confirm wallet encryption</source>
-        <translation>Confirma la codificación de cartera</translation>
-    </message>
-    <message>
-        <source>Warning: If you encrypt your wallet and lose your passphrase, you will &lt;b&gt;LOSE ALL OF YOUR BITCOINS&lt;/b&gt;!</source>
-        <translation>Atención: ¡Si codificas tu billetera y pierdes la contraseña perderás &lt;b&gt;TODOS TUS BITCOINS&lt;/b&gt;!</translation>
-    </message>
-    <message>
-        <source>Are you sure you wish to encrypt your wallet?</source>
-        <translation>¿Seguro que quieres seguir codificando la billetera?</translation>
-    </message>
-    <message>
-        <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source>
-        <translation>IMPORTANTE: Cualquier versión anterior que hayas realizado de tu archivo de billetera será reemplazada por el nuevo archivo de billetera encriptado. Por razones de seguridad, los respaldos anteriores de los archivos de billetera se volverán inútiles en tanto comiences a usar la nueva billetera encriptada.</translation>
-    </message>
-    <message>
-        <source>Warning: The Caps Lock key is on!</source>
-        <translation>Precaucion: Mayúsculas Activadas</translation>
-    </message>
-    <message>
-        <source>Wallet encrypted</source>
-        <translation>Billetera codificada</translation>
-    </message>
-    <message>
-        <source>Wallet encryption failed</source>
-        <translation>Falló la codificación de la billetera</translation>
-    </message>
-    <message>
-        <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
-        <translation>La codificación de la billetera falló debido a un error interno. Tu billetera no ha sido codificada.</translation>
-    </message>
-    <message>
-        <source>The supplied passphrases do not match.</source>
-        <translation>Las contraseñas no coinciden.</translation>
-    </message>
-    <message>
-        <source>Wallet unlock failed</source>
-        <translation>Ha fallado el desbloqueo de la billetera</translation>
-    </message>
-    <message>
-        <source>The passphrase entered for the wallet decryption was incorrect.</source>
-        <translation>La contraseña introducida para decodificar la billetera es incorrecta.</translation>
-    </message>
-    <message>
-        <source>Wallet decryption failed</source>
-        <translation>Ha fallado la decodificación de la billetera</translation>
-    </message>
-    <message>
-        <source>Wallet passphrase was successfully changed.</source>
-        <translation>La contraseña de billetera ha sido cambiada con éxito.</translation>
-    </message>
 </context>
 <context>
     <name>BanTableModel</name>
@@ -225,6 +94,10 @@
         <source>Quit application</source>
         <translation>Salir del programa</translation>
     </message>
+    <message>
+        <source>&amp;About %1</source>
+        <translation>S&amp;obre %1</translation>
+    </message>
     <message>
         <source>About &amp;Qt</source>
         <translation>Acerca de</translation>
@@ -261,10 +134,6 @@
         <source>Open &amp;URI...</source>
         <translation>Abrir y url...</translation>
     </message>
-    <message>
-        <source>Bitcoin Core client</source>
-        <translation>cliente bitcoin core</translation>
-    </message>
     <message>
         <source>Reindexing blocks on disk...</source>
         <translation>Cargando el index de bloques...</translation>
@@ -309,10 +178,6 @@
         <source>&amp;Receive</source>
         <translation>y recibir</translation>
     </message>
-    <message>
-        <source>Show information about Bitcoin Core</source>
-        <translation>Mostrar informacion sobre Bitcoin Core</translation>
-    </message>
     <message>
         <source>&amp;Show / Hide</source>
         <translation>&amp;Mostrar/Ocultar</translation>
@@ -337,22 +202,10 @@
         <source>Tabs toolbar</source>
         <translation>Barra de pestañas</translation>
     </message>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>bitcoin core</translation>
-    </message>
     <message>
         <source>Request payments (generates QR codes and bitcoin: URIs)</source>
         <translation>Pide pagos (genera codigos QR and bitcoin: URls)</translation>
     </message>
-    <message>
-        <source>&amp;About Bitcoin Core</source>
-        <translation>&amp;Sobre Bitcoin Core</translation>
-    </message>
-    <message>
-        <source>Modify configuration options for Bitcoin Core</source>
-        <translation>Modifica las opciones para BitCoin Core</translation>
-    </message>
     <message>
         <source>%1 and %2</source>
         <translation>%1 y %2</translation>
@@ -394,13 +247,6 @@
         <translation>La billetera esta &lt;b&gt;codificada&lt;/b&gt; y actualmente &lt;b&gt;bloqueda&lt;/b&gt;</translation>
     </message>
 </context>
-<context>
-    <name>ClientModel</name>
-    <message>
-        <source>Network Alert</source>
-        <translation>Alerta de Red</translation>
-    </message>
-</context>
 <context>
     <name>CoinControlDialog</name>
     <message>
@@ -436,51 +282,7 @@
         <source>Priority</source>
         <translation>prioridad</translation>
     </message>
-    <message>
-        <source>Copy address</source>
-        <translation>Copia dirección</translation>
-    </message>
-    <message>
-        <source>Copy label</source>
-        <translation>Copia etiqueta</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>Copiar Cantidad</translation>
-    </message>
-    <message>
-        <source>Copy quantity</source>
-        <translation>copiar cantidad</translation>
-    </message>
-    <message>
-        <source>Copy fee</source>
-        <translation>copiar comision</translation>
-    </message>
-    <message>
-        <source>Copy bytes</source>
-        <translation>copiar bytes</translation>
-    </message>
-    <message>
-        <source>medium</source>
-        <translation>medio</translation>
-    </message>
-    <message>
-        <source>low</source>
-        <translation>bajo</translation>
-    </message>
-    <message>
-        <source>yes</source>
-        <translation>si</translation>
-    </message>
-    <message>
-        <source>no</source>
-        <translation>no</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(sin etiqueta)</translation>
-    </message>
-    </context>
+</context>
 <context>
     <name>EditAddressDialog</name>
     <message>
@@ -495,38 +297,6 @@
         <source>&amp;Address</source>
         <translation>&amp;Dirección</translation>
     </message>
-    <message>
-        <source>New receiving address</source>
-        <translation>Nueva dirección para recibir</translation>
-    </message>
-    <message>
-        <source>New sending address</source>
-        <translation>Nueva dirección para enviar</translation>
-    </message>
-    <message>
-        <source>Edit receiving address</source>
-        <translation>Editar dirección de recepción</translation>
-    </message>
-    <message>
-        <source>Edit sending address</source>
-        <translation>Editar dirección de envio</translation>
-    </message>
-    <message>
-        <source>The entered address "%1" is already in the address book.</source>
-        <translation>La dirección introducida "%1" ya esta guardada en la libreta de direcciones.</translation>
-    </message>
-    <message>
-        <source>The entered address "%1" is not a valid Bitcoin address.</source>
-        <translation>La dirección introducida "%1" no es una dirección Bitcoin valida.</translation>
-    </message>
-    <message>
-        <source>Could not unlock wallet.</source>
-        <translation>No se pudo desbloquear la billetera.</translation>
-    </message>
-    <message>
-        <source>New key generation failed.</source>
-        <translation>La generación de nueva clave falló.</translation>
-    </message>
 </context>
 <context>
     <name>FreespaceChecker</name>
@@ -537,10 +307,6 @@
     </context>
 <context>
     <name>HelpMessageDialog</name>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>bitcoin core</translation>
-    </message>
     <message>
         <source>version</source>
         <translation>versión</translation>
@@ -560,10 +326,6 @@
         <source>Welcome</source>
         <translation>bienvenido</translation>
     </message>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>bitcoin core</translation>
-    </message>
     <message>
         <source>Error</source>
         <translation>Error</translation>
@@ -679,13 +441,6 @@
         <translation>Total:</translation>
     </message>
     </context>
-<context>
-    <name>PaymentServer</name>
-    <message>
-        <source>Payment acknowledged</source>
-        <translation>Pago completado</translation>
-    </message>
-    </context>
 <context>
     <name>PeerTableModel</name>
     </context>
@@ -700,17 +455,6 @@
         <translation>N/A</translation>
     </message>
     </context>
-<context>
-    <name>QRImageWidget</name>
-    <message>
-        <source>&amp;Save Image...</source>
-        <translation>Guardar imagen...</translation>
-    </message>
-    <message>
-        <source>&amp;Copy Image</source>
-        <translation>Copiar Imagen</translation>
-    </message>
-    </context>
 <context>
     <name>RPCConsole</name>
     <message>
@@ -793,15 +537,7 @@
         <source>&amp;Message:</source>
         <translation>&amp;mensaje</translation>
     </message>
-    <message>
-        <source>Copy label</source>
-        <translation>Copia etiqueta</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>Copiar Cantidad</translation>
-    </message>
-</context>
+    </context>
 <context>
     <name>ReceiveRequestDialog</name>
     <message>
@@ -816,46 +552,7 @@
         <source>&amp;Save Image...</source>
         <translation>Guardar imagen...</translation>
     </message>
-    <message>
-        <source>Address</source>
-        <translation>Dirección</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>Cantidad</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Etiqueta</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>Mensaje</translation>
-    </message>
-    </context>
-<context>
-    <name>RecentRequestsTableModel</name>
-    <message>
-        <source>Date</source>
-        <translation>Fecha</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Etiqueta</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>Mensaje</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>Cantidad</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(sin etiqueta)</translation>
-    </message>
-    </context>
+</context>
 <context>
     <name>SendCoinsDialog</name>
     <message>
@@ -915,43 +612,7 @@
         <source>S&amp;end</source>
         <translation>&amp;Envía</translation>
     </message>
-    <message>
-        <source>Confirm send coins</source>
-        <translation>Confirmar el envio de monedas</translation>
-    </message>
-    <message>
-        <source>Copy quantity</source>
-        <translation>copiar cantidad</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>Copiar Cantidad</translation>
-    </message>
-    <message>
-        <source>Copy fee</source>
-        <translation>copiar comision</translation>
-    </message>
-    <message>
-        <source>Copy bytes</source>
-        <translation>copiar bytes</translation>
-    </message>
-    <message>
-        <source>The amount to pay must be larger than 0.</source>
-        <translation>La cantidad por pagar tiene que ser mayor 0.</translation>
-    </message>
-    <message>
-        <source>The amount exceeds your balance.</source>
-        <translation>La cantidad sobrepasa tu saldo.</translation>
-    </message>
-    <message>
-        <source>The total exceeds your balance when the %1 transaction fee is included.</source>
-        <translation>El total sobrepasa tu saldo cuando se incluyen %1 como tasa de envio.</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(sin etiqueta)</translation>
-    </message>
-    </context>
+</context>
 <context>
     <name>SendCoinsEntry</name>
     <message>
@@ -962,10 +623,6 @@
         <source>Pay &amp;To:</source>
         <translation>&amp;Pagar a:</translation>
     </message>
-    <message>
-        <source>Enter a label for this address to add it to your address book</source>
-        <translation>Introduce una etiqueta a esta dirección para añadirla a tu guia</translation>
-    </message>
     <message>
         <source>&amp;Label:</source>
         <translation>&amp;Etiqueta:</translation>
@@ -1040,41 +697,9 @@
         <source>Verify &amp;Message</source>
         <translation>&amp;Firmar Mensaje</translation>
     </message>
-    <message>
-        <source>Click "Sign Message" to generate signature</source>
-        <translation>Click en "Firmar Mensage" para conseguir firma</translation>
-    </message>
-    <message>
-        <source>The entered address is invalid.</source>
-        <translation>La dirección introducida no es una valida.</translation>
-    </message>
-    <message>
-        <source>Please check the address and try again.</source>
-        <translation>Por favor, revise la dirección Bitcoin e inténtelo denuevo</translation>
-    </message>
-    <message>
-        <source>Wallet unlock was cancelled.</source>
-        <translation>Ha fallado el desbloqueo de la billetera</translation>
-    </message>
-    <message>
-        <source>Message signing failed.</source>
-        <translation>Firma fallida</translation>
-    </message>
-    <message>
-        <source>Message signed.</source>
-        <translation>Mensaje firmado</translation>
-    </message>
-    <message>
-        <source>Message verified.</source>
-        <translation>Mensaje comprobado</translation>
-    </message>
-</context>
+    </context>
 <context>
     <name>SplashScreen</name>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>bitcoin core</translation>
-    </message>
     <message>
         <source>[testnet]</source>
         <translation>[red-de-pruebas]</translation>
@@ -1087,346 +712,16 @@
         <translation>KB/s</translation>
     </message>
 </context>
-<context>
-    <name>TransactionDesc</name>
-    <message>
-        <source>Open until %1</source>
-        <translation>Abierto hasta %1</translation>
-    </message>
-    <message>
-        <source>%1/offline</source>
-        <translation>%1/fuera de linea</translation>
-    </message>
-    <message>
-        <source>%1/unconfirmed</source>
-        <translation>%1/no confirmado</translation>
-    </message>
-    <message>
-        <source>%1 confirmations</source>
-        <translation>%1 confirmaciónes</translation>
-    </message>
-    <message>
-        <source>Status</source>
-        <translation>Estado</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation>Fecha</translation>
-    </message>
-    <message>
-        <source>Generated</source>
-        <translation>Generado</translation>
-    </message>
-    <message>
-        <source>From</source>
-        <translation>De</translation>
-    </message>
-    <message>
-        <source>To</source>
-        <translation>A</translation>
-    </message>
-    <message>
-        <source>own address</source>
-        <translation>propia dirección</translation>
-    </message>
-    <message>
-        <source>label</source>
-        <translation>etiqueta</translation>
-    </message>
-    <message>
-        <source>Credit</source>
-        <translation>Credito</translation>
-    </message>
-    <message>
-        <source>not accepted</source>
-        <translation>no aceptada</translation>
-    </message>
-    <message>
-        <source>Debit</source>
-        <translation>Debito</translation>
-    </message>
-    <message>
-        <source>Transaction fee</source>
-        <translation>Comisión transacción</translation>
-    </message>
-    <message>
-        <source>Net amount</source>
-        <translation>Cantidad total</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>Mensaje</translation>
-    </message>
-    <message>
-        <source>Comment</source>
-        <translation>Comentario</translation>
-    </message>
-    <message>
-        <source>Transaction ID</source>
-        <translation>ID de Transacción</translation>
-    </message>
-    <message>
-        <source>Transaction</source>
-        <translation>Transacción</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>Cantidad</translation>
-    </message>
-    <message>
-        <source>, has not been successfully broadcast yet</source>
-        <translation>, no ha sido emitido satisfactoriamente todavía</translation>
-    </message>
-    <message>
-        <source>unknown</source>
-        <translation>desconocido</translation>
-    </message>
-</context>
 <context>
     <name>TransactionDescDialog</name>
-    <message>
-        <source>Transaction details</source>
-        <translation>Detalles de transacción</translation>
-    </message>
     <message>
         <source>This pane shows a detailed description of the transaction</source>
         <translation>Esta ventana muestra información detallada sobre la transacción</translation>
     </message>
 </context>
-<context>
-    <name>TransactionTableModel</name>
-    <message>
-        <source>Date</source>
-        <translation>Fecha</translation>
-    </message>
-    <message>
-        <source>Type</source>
-        <translation>Tipo</translation>
-    </message>
-    <message>
-        <source>Open until %1</source>
-        <translation>Abierto hasta %1</translation>
-    </message>
-    <message>
-        <source>Confirmed (%1 confirmations)</source>
-        <translation>Confirmado (%1 confirmaciones)</translation>
-    </message>
-    <message>
-        <source>This block was not received by any other nodes and will probably not be accepted!</source>
-        <translation>Este bloque no ha sido recibido por otros nodos y probablemente no sea aceptado !</translation>
-    </message>
-    <message>
-        <source>Generated but not accepted</source>
-        <translation>Generado pero no acceptado</translation>
-    </message>
-    <message>
-        <source>Offline</source>
-        <translation>fuera de linea</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Etiqueta</translation>
-    </message>
-    <message>
-        <source>Unconfirmed</source>
-        <translation>no confirmado</translation>
-    </message>
-    <message>
-        <source>Received with</source>
-        <translation>Recibido con</translation>
-    </message>
-    <message>
-        <source>Received from</source>
-        <translation>Recibido de</translation>
-    </message>
-    <message>
-        <source>Sent to</source>
-        <translation>Enviado a</translation>
-    </message>
-    <message>
-        <source>Payment to yourself</source>
-        <translation>Pagar a usted mismo</translation>
-    </message>
-    <message>
-        <source>Mined</source>
-        <translation>Minado</translation>
-    </message>
-    <message>
-        <source>(n/a)</source>
-        <translation>(n/a)</translation>
-    </message>
-    <message>
-        <source>Transaction status. Hover over this field to show number of confirmations.</source>
-        <translation>Estado de transacción. Pasa el raton sobre este campo para ver el numero de confirmaciónes.</translation>
-    </message>
-    <message>
-        <source>Date and time that the transaction was received.</source>
-        <translation>Fecha y hora cuando se recibió la transaccion</translation>
-    </message>
-    <message>
-        <source>Type of transaction.</source>
-        <translation>Tipo de transacción.</translation>
-    </message>
-    <message>
-        <source>Amount removed from or added to balance.</source>
-        <translation>Cantidad restada o añadida al balance</translation>
-    </message>
-</context>
-<context>
-    <name>TransactionView</name>
-    <message>
-        <source>All</source>
-        <translation>Todo</translation>
-    </message>
-    <message>
-        <source>Today</source>
-        <translation>Hoy</translation>
-    </message>
-    <message>
-        <source>This week</source>
-        <translation>Esta semana</translation>
-    </message>
-    <message>
-        <source>This month</source>
-        <translation>Esta mes</translation>
-    </message>
-    <message>
-        <source>Last month</source>
-        <translation>Mes pasado</translation>
-    </message>
-    <message>
-        <source>This year</source>
-        <translation>Este año</translation>
-    </message>
-    <message>
-        <source>Range...</source>
-        <translation>Rango...</translation>
-    </message>
-    <message>
-        <source>Received with</source>
-        <translation>Recibido con</translation>
-    </message>
-    <message>
-        <source>Sent to</source>
-        <translation>Enviado a</translation>
-    </message>
-    <message>
-        <source>To yourself</source>
-        <translation>A ti mismo</translation>
-    </message>
-    <message>
-        <source>Mined</source>
-        <translation>Minado</translation>
-    </message>
-    <message>
-        <source>Other</source>
-        <translation>Otra</translation>
-    </message>
-    <message>
-        <source>Enter address or label to search</source>
-        <translation>Introduce una dirección o etiqueta para  buscar</translation>
-    </message>
-    <message>
-        <source>Min amount</source>
-        <translation>Cantidad minima</translation>
-    </message>
-    <message>
-        <source>Copy address</source>
-        <translation>Copia dirección</translation>
-    </message>
-    <message>
-        <source>Copy label</source>
-        <translation>Copia etiqueta</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>Copiar Cantidad</translation>
-    </message>
-    <message>
-        <source>Edit label</source>
-        <translation>Edita etiqueta</translation>
-    </message>
-    <message>
-        <source>Show transaction details</source>
-        <translation>Mostrar detalles de la transacción</translation>
-    </message>
-    <message>
-        <source>Exporting Failed</source>
-        <translation>Exportado fallo</translation>
-    </message>
-    <message>
-        <source>Comma separated file (*.csv)</source>
-        <translation>Archivos separados por coma (*.csv)</translation>
-    </message>
-    <message>
-        <source>Confirmed</source>
-        <translation>Confirmado</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation>Fecha</translation>
-    </message>
-    <message>
-        <source>Type</source>
-        <translation>Tipo</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Etiqueta</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>Dirección</translation>
-    </message>
-    <message>
-        <source>ID</source>
-        <translation>ID</translation>
-    </message>
-    <message>
-        <source>Range:</source>
-        <translation>Rango:</translation>
-    </message>
-    <message>
-        <source>to</source>
-        <translation>para</translation>
-    </message>
-</context>
 <context>
     <name>UnitDisplayStatusBarControl</name>
     </context>
-<context>
-    <name>WalletFrame</name>
-    </context>
-<context>
-    <name>WalletModel</name>
-    <message>
-        <source>Send Coins</source>
-        <translation>Enviar monedas</translation>
-    </message>
-</context>
-<context>
-    <name>WalletView</name>
-    <message>
-        <source>&amp;Export</source>
-        <translation>y exportar</translation>
-    </message>
-    <message>
-        <source>Export the data in the current tab to a file</source>
-        <translation>Exportar los datos de la pestaña actual a un archivo</translation>
-    </message>
-    <message>
-        <source>Backup Wallet</source>
-        <translation>Respaldar billetera</translation>
-    </message>
-    <message>
-        <source>Wallet Data (*.dat)</source>
-        <translation>Datos de billetera (*.dat)</translation>
-    </message>
-    <message>
-        <source>Backup Failed</source>
-        <translation>Ha fallado el respaldo</translation>
-    </message>
-    </context>
 <context>
     <name>bitcoin-core</name>
     <message>
@@ -1449,6 +744,10 @@
         <translation>Correr como demonio y acepta comandos
 </translation>
     </message>
+    <message>
+        <source>Bitcoin Core</source>
+        <translation>bitcoin core</translation>
+    </message>
     <message>
         <source>Connect only to the specified node(s)</source>
         <translation>Conecta solo al nodo especificado
@@ -1466,18 +765,6 @@
         <source>Information</source>
         <translation>Información</translation>
     </message>
-    <message>
-        <source>Invalid amount for -maxtxfee=&lt;amount&gt;: '%s'</source>
-        <translation>Cantidad inválida para -maxtxfee=&lt;amount&gt;: '%s'</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -minrelaytxfee=&lt;amount&gt;: '%s'</source>
-        <translation>Cantidad inválida para -minrelaytxfee=&lt;amount&gt;: '%s'</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -mintxfee=&lt;amount&gt;: '%s'</source>
-        <translation>Cantidad inválida para -mintxfee=&lt;amount&gt;: '%s'</translation>
-    </message>
     <message>
         <source>Send trace/debug info to console instead of debug.log file</source>
         <translation>Enviar informacion de seguimiento a la consola en vez del archivo debug.log</translation>
@@ -1491,18 +778,9 @@
         <source>Warning</source>
         <translation>Atención</translation>
     </message>
-    <message>
-        <source>wallet.dat corrupt, salvage failed</source>
-        <translation>wallet.dat corrompió, guardado fallido</translation>
-    </message>
     <message>
         <source>Password for JSON-RPC connections</source>
         <translation>Contraseña para las conexiones JSON-RPC
-</translation>
-    </message>
-    <message>
-        <source>This help message</source>
-        <translation>Este mensaje de ayuda
 </translation>
     </message>
     <message>
@@ -1514,30 +792,10 @@
         <source>Loading addresses...</source>
         <translation>Cargando direcciónes...</translation>
     </message>
-    <message>
-        <source>Error loading wallet.dat: Wallet corrupted</source>
-        <translation>Error cargando wallet.dat: Billetera corrupta</translation>
-    </message>
-    <message>
-        <source>Error loading wallet.dat</source>
-        <translation>Error cargando wallet.dat</translation>
-    </message>
     <message>
         <source>Invalid -proxy address: '%s'</source>
         <translation>Dirección -proxy invalida: '%s'</translation>
     </message>
-    <message>
-        <source>Cannot resolve -bind address: '%s'</source>
-        <translation>No se pudo resolver la dirección fija: '%s'</translation>
-    </message>
-    <message>
-        <source>Cannot resolve -externalip address: '%s'</source>
-        <translation>No se pudo resolver la dirección ip: '%s'</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -paytxfee=&lt;amount&gt;: '%s'</source>
-        <translation>Cantidad inválida para -paytxfee=&lt;amount&gt;: '%s'</translation>
-    </message>
     <message>
         <source>Insufficient funds</source>
         <translation>Fondos insuficientes</translation>
diff --git a/src/qt/locale/bitcoin_es_CO.ts b/src/qt/locale/bitcoin_es_CO.ts
index ea0664636d2d6..df189190f602b 100644
--- a/src/qt/locale/bitcoin_es_CO.ts
+++ b/src/qt/locale/bitcoin_es_CO.ts
@@ -25,10 +25,6 @@
         <source>C&amp;lose</source>
         <translation>C&amp;errar</translation>
     </message>
-    <message>
-        <source>&amp;Copy Address</source>
-        <translation>&amp;Copiar dirección</translation>
-    </message>
     <message>
         <source>Delete the currently selected address from the list</source>
         <translation>Borrar la dirección actualmente seleccionada de la lista</translation>
@@ -41,74 +37,6 @@
         <source>&amp;Delete</source>
         <translation>&amp;Borrar</translation>
     </message>
-    <message>
-        <source>Choose the address to send coins to</source>
-        <translation>Escoje la dirección para enviar monedas a</translation>
-    </message>
-    <message>
-        <source>Choose the address to receive coins with</source>
-        <translation>Escoje la dirección para recibir monedas con</translation>
-    </message>
-    <message>
-        <source>C&amp;hoose</source>
-        <translation>E&amp;scojer</translation>
-    </message>
-    <message>
-        <source>Sending addresses</source>
-        <translation>Enviando direcciones</translation>
-    </message>
-    <message>
-        <source>Receiving addresses</source>
-        <translation>Recibiendo direcciones</translation>
-    </message>
-    <message>
-        <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source>
-        <translation>
-Estas son las direcciones de Bitcoin para enviar pagos . Siempre verifique la cantidad y la dirección de recepción antes de enviar monedas.</translation>
-    </message>
-    <message>
-        <source>These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source>
-        <translation>Estas son las direcciones de Bitcoin para recibir los pagos . Se recomienda el uso de una nueva dirección de recepción para cada transacción.</translation>
-    </message>
-    <message>
-        <source>Copy &amp;Label</source>
-        <translation>Copiar &amp;Etiqueta</translation>
-    </message>
-    <message>
-        <source>&amp;Edit</source>
-        <translation>&amp;Editar</translation>
-    </message>
-    <message>
-        <source>Export Address List</source>
-        <translation>Exportar lista de direcciones</translation>
-    </message>
-    <message>
-        <source>Comma separated file (*.csv)</source>
-        <translation>Coma(,) archivo separado (*.csv)</translation>
-    </message>
-    <message>
-        <source>Exporting Failed</source>
-        <translation>Exportación Fallida</translation>
-    </message>
-    <message>
-        <source>There was an error trying to save the address list to %1. Please try again.</source>
-        <translation>Hubo un error intentando guardar la lista de direcciones a %1 Inténtelo otravez</translation>
-    </message>
-</context>
-<context>
-    <name>AddressTableModel</name>
-    <message>
-        <source>Label</source>
-        <translation>Etiqueta</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>Dirección</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(ninguna dirección)</translation>
-    </message>
 </context>
 <context>
     <name>AskPassphraseDialog</name>
@@ -128,90 +56,6 @@ Estas son las direcciones de Bitcoin para enviar pagos . Siempre verifique la ca
         <source>Repeat new passphrase</source>
         <translation>Repetir nueva contraseña</translation>
     </message>
-    <message>
-        <source>Encrypt wallet</source>
-        <translation>Billetera Encriptada</translation>
-    </message>
-    <message>
-        <source>This operation needs your wallet passphrase to unlock the wallet.</source>
-        <translation>Esta operación necesita tu contraseña de la billetera para desbloquear la billetera</translation>
-    </message>
-    <message>
-        <source>Unlock wallet</source>
-        <translation>Billetera Desbloqueada</translation>
-    </message>
-    <message>
-        <source>This operation needs your wallet passphrase to decrypt the wallet.</source>
-        <translation>Esta operación necesita tu contraseña de la billetera para desencriptar la billetera.</translation>
-    </message>
-    <message>
-        <source>Decrypt wallet</source>
-        <translation>Billetera Desencriptada</translation>
-    </message>
-    <message>
-        <source>Change passphrase</source>
-        <translation>Cambiar contraseña</translation>
-    </message>
-    <message>
-        <source>Confirm wallet encryption</source>
-        <translation>Confirmar encriptación de la billetera</translation>
-    </message>
-    <message>
-        <source>Warning: If you encrypt your wallet and lose your passphrase, you will &lt;b&gt;LOSE ALL OF YOUR BITCOINS&lt;/b&gt;!</source>
-        <translation>Precaución: Si tú has encriptado tu billetera y has perdido tu contraseña, usted &lt;b&gt;PERDERÁ TODOS TUS BITCOINS&lt;/b&gt;</translation>
-    </message>
-    <message>
-        <source>Are you sure you wish to encrypt your wallet?</source>
-        <translation>Estas seguro de que deseas encriptar tu billetera?</translation>
-    </message>
-    <message>
-        <source>Bitcoin Core will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source>
-        <translation>Bitcoin Core se cerrará ahora para finalizar el proceso de encriptación. Recuerda que encriptando tu billetera no protegera por completo tus bitcoins desde robos por malware que infectan tu computadora.</translation>
-    </message>
-    <message>
-        <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source>
-        <translation>IMPORTANTE : Cualquier copias de seguridad anteriores que han hecho de su archivo cartera debe ser reemplazado por el archivo de la carpeta recién generado , encriptado . Por razones de seguridad , las copias de seguridad anteriores del archivo cartera sin cifrar se vuelven inútiles , tan pronto como empiece a utilizar el nuevo , carpeta cifrada .</translation>
-    </message>
-    <message>
-        <source>Warning: The Caps Lock key is on!</source>
-        <translation>Ojo: El bloqueo de MAYUSCULAS esta activado!</translation>
-    </message>
-    <message>
-        <source>Wallet encrypted</source>
-        <translation>Billetera encriptada</translation>
-    </message>
-    <message>
-        <source>Enter the new passphrase to the wallet.&lt;br/&gt;Please use a passphrase of &lt;b&gt;ten or more random characters&lt;/b&gt;, or &lt;b&gt;eight or more words&lt;/b&gt;.</source>
-        <translation>Poner la nueva contraseña a la billetera.&lt;br/&gt;Por favor usa una contraseña de &lt;b&gt;diez o más palabras aleatorias&lt;/b&gt;, o &lt;b&gt;nueve o más letras&lt;/b&gt;.</translation>
-    </message>
-    <message>
-        <source>Enter the old passphrase and new passphrase to the wallet.</source>
-        <translation>Poner la antigua contraseña y nueva contraseña a la billetera.</translation>
-    </message>
-    <message>
-        <source>Wallet encryption failed</source>
-        <translation>Encriptación de la billetera fallida</translation>
-    </message>
-    <message>
-        <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
-        <translation>Encriptación de la billetera fallida por un error interno. Tu billetera no ha sido encriptada.</translation>
-    </message>
-    <message>
-        <source>Wallet unlock failed</source>
-        <translation>Falló el desbloqueo de la billetera</translation>
-    </message>
-    <message>
-        <source>The passphrase entered for the wallet decryption was incorrect.</source>
-        <translation>La contraseña tecleada de la desencriptación de la billetera ha sido incorrecta.</translation>
-    </message>
-    <message>
-        <source>Wallet decryption failed</source>
-        <translation>Encriptación de la billetera fallida</translation>
-    </message>
-    <message>
-        <source>Wallet passphrase was successfully changed.</source>
-        <translation>La contraseña de la billetera a sido cambiada exitosamente.</translation>
-    </message>
 </context>
 <context>
     <name>BanTableModel</name>
@@ -278,14 +122,6 @@ Estas son las direcciones de Bitcoin para enviar pagos . Siempre verifique la ca
         <source>Open &amp;URI...</source>
         <translation>Abrir &amp;URL...</translation>
     </message>
-    <message>
-        <source>Bitcoin Core client</source>
-        <translation>Bitcoin Core cliente</translation>
-    </message>
-    <message>
-        <source>Importing blocks from disk...</source>
-        <translation>Importando bloques desde el disco...</translation>
-    </message>
     <message>
         <source>Send coins to a Bitcoin address</source>
         <translation>Enviando monedas a una dirección de Bitcoin</translation>
@@ -322,10 +158,6 @@ Estas son las direcciones de Bitcoin para enviar pagos . Siempre verifique la ca
         <source>&amp;Receive</source>
         <translation>&amp;Recibir</translation>
     </message>
-    <message>
-        <source>Show information about Bitcoin Core</source>
-        <translation>Mostrar información sobre Bitcoin Core</translation>
-    </message>
     <message>
         <source>&amp;Show / Hide</source>
         <translation>&amp;Mostrar / Ocultar</translation>
@@ -346,24 +178,13 @@ Estas son las direcciones de Bitcoin para enviar pagos . Siempre verifique la ca
         <source>&amp;Help</source>
         <translation>&amp;Ayuda</translation>
     </message>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Bitcoin Core</translation>
-    </message>
     <message>
         <source>Error</source>
         <translation>Error</translation>
     </message>
     </context>
-<context>
-    <name>ClientModel</name>
-    </context>
 <context>
     <name>CoinControlDialog</name>
-    <message>
-        <source>(no label)</source>
-        <translation>(ninguna dirección)</translation>
-    </message>
     </context>
 <context>
     <name>EditAddressDialog</name>
@@ -373,17 +194,9 @@ Estas son las direcciones de Bitcoin para enviar pagos . Siempre verifique la ca
     </context>
 <context>
     <name>HelpMessageDialog</name>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Bitcoin Core</translation>
-    </message>
     </context>
 <context>
     <name>Intro</name>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Bitcoin Core</translation>
-    </message>
     <message>
         <source>Error</source>
         <translation>Error</translation>
@@ -398,18 +211,12 @@ Estas son las direcciones de Bitcoin para enviar pagos . Siempre verifique la ca
 <context>
     <name>OverviewPage</name>
     </context>
-<context>
-    <name>PaymentServer</name>
-    </context>
 <context>
     <name>PeerTableModel</name>
     </context>
 <context>
     <name>QObject</name>
     </context>
-<context>
-    <name>QRImageWidget</name>
-    </context>
 <context>
     <name>RPCConsole</name>
     </context>
@@ -418,32 +225,9 @@ Estas son las direcciones de Bitcoin para enviar pagos . Siempre verifique la ca
     </context>
 <context>
     <name>ReceiveRequestDialog</name>
-    <message>
-        <source>Address</source>
-        <translation>Dirección</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Etiqueta</translation>
-    </message>
-    </context>
-<context>
-    <name>RecentRequestsTableModel</name>
-    <message>
-        <source>Label</source>
-        <translation>Etiqueta</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(ninguna dirección)</translation>
-    </message>
     </context>
 <context>
     <name>SendCoinsDialog</name>
-    <message>
-        <source>(no label)</source>
-        <translation>(ninguna dirección)</translation>
-    </message>
     </context>
 <context>
     <name>SendCoinsEntry</name>
@@ -456,64 +240,22 @@ Estas son las direcciones de Bitcoin para enviar pagos . Siempre verifique la ca
     </context>
 <context>
     <name>SplashScreen</name>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Bitcoin Core</translation>
-    </message>
     </context>
 <context>
     <name>TrafficGraphWidget</name>
     </context>
-<context>
-    <name>TransactionDesc</name>
-    </context>
 <context>
     <name>TransactionDescDialog</name>
     </context>
-<context>
-    <name>TransactionTableModel</name>
-    <message>
-        <source>Label</source>
-        <translation>Etiqueta</translation>
-    </message>
-    </context>
-<context>
-    <name>TransactionView</name>
-    <message>
-        <source>Exporting Failed</source>
-        <translation>Exportación Fallida</translation>
-    </message>
-    <message>
-        <source>Comma separated file (*.csv)</source>
-        <translation>Coma(,) archivo separado (*.csv)</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Etiqueta</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>Dirección</translation>
-    </message>
-    </context>
 <context>
     <name>UnitDisplayStatusBarControl</name>
     </context>
 <context>
-    <name>WalletFrame</name>
-    </context>
-<context>
-    <name>WalletModel</name>
-    </context>
-<context>
-    <name>WalletView</name>
+    <name>bitcoin-core</name>
     <message>
-        <source>&amp;Export</source>
-        <translation>&amp;Exportar</translation>
+        <source>Bitcoin Core</source>
+        <translation>Bitcoin Core</translation>
     </message>
-    </context>
-<context>
-    <name>bitcoin-core</name>
     <message>
         <source>Insufficient funds</source>
         <translation>Fondos Insuficientes</translation>
diff --git a/src/qt/locale/bitcoin_es_DO.ts b/src/qt/locale/bitcoin_es_DO.ts
index b4841ca9b8682..3f4380840a068 100644
--- a/src/qt/locale/bitcoin_es_DO.ts
+++ b/src/qt/locale/bitcoin_es_DO.ts
@@ -21,10 +21,6 @@
         <source>C&amp;lose</source>
         <translation>&amp;Cerrar</translation>
     </message>
-    <message>
-        <source>&amp;Copy Address</source>
-        <translation>&amp;Copiar dirección</translation>
-    </message>
     <message>
         <source>Delete the currently selected address from the list</source>
         <translation>Borrar de la lista la dirección seleccionada</translation>
@@ -41,69 +37,6 @@
         <source>&amp;Delete</source>
         <translation>&amp;Eliminar</translation>
     </message>
-    <message>
-        <source>Choose the address to send coins to</source>
-        <translation>Escoja la dirección para enviar monedas</translation>
-    </message>
-    <message>
-        <source>Choose the address to receive coins with</source>
-        <translation>Escoja la dirección para recibir monedas</translation>
-    </message>
-    <message>
-        <source>C&amp;hoose</source>
-        <translation>&amp;Escoger</translation>
-    </message>
-    <message>
-        <source>Sending addresses</source>
-        <translation>Enviando dirección</translation>
-    </message>
-    <message>
-        <source>Receiving addresses</source>
-        <translation>Recibiendo dirección</translation>
-    </message>
-    <message>
-        <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source>
-        <translation>Estas son sus direcciones Bitcoin para enviar pagos. Compruebe siempre la cantidad y la dirección receptora antes de transferir monedas.</translation>
-    </message>
-    <message>
-        <source>These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source>
-        <translation>Estas son sus direcciones de Bitcoin para recibir pagos. Se recomienda utilizar una nueva dirección de recepción para cada transacción.</translation>
-    </message>
-    <message>
-        <source>Copy &amp;Label</source>
-        <translation>Copiar &amp;etiqueta</translation>
-    </message>
-    <message>
-        <source>&amp;Edit</source>
-        <translation>&amp;Editar</translation>
-    </message>
-    <message>
-        <source>Export Address List</source>
-        <translation>Exportar la lista de direcciones </translation>
-    </message>
-    <message>
-        <source>Comma separated file (*.csv)</source>
-        <translation>Archivos de columnas separadas por coma (*.csv)</translation>
-    </message>
-    <message>
-        <source>Exporting Failed</source>
-        <translation>Error exportando</translation>
-    </message>
-    </context>
-<context>
-    <name>AddressTableModel</name>
-    <message>
-        <source>Label</source>
-        <translation>Etiqueta</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>Dirección</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(sin etiqueta)</translation>
-    </message>
 </context>
 <context>
     <name>AskPassphraseDialog</name>
@@ -123,82 +56,6 @@
         <source>Repeat new passphrase</source>
         <translation>Repita la nueva contraseña</translation>
     </message>
-    <message>
-        <source>Encrypt wallet</source>
-        <translation>Cifrar la cartera</translation>
-    </message>
-    <message>
-        <source>This operation needs your wallet passphrase to unlock the wallet.</source>
-        <translation>Esta operación requiere su contraseña para desbloquear la cartera</translation>
-    </message>
-    <message>
-        <source>Unlock wallet</source>
-        <translation>Desbloquear cartera</translation>
-    </message>
-    <message>
-        <source>This operation needs your wallet passphrase to decrypt the wallet.</source>
-        <translation>Esta operación requiere su contraseña para descifrar la cartera.</translation>
-    </message>
-    <message>
-        <source>Decrypt wallet</source>
-        <translation>Descifrar la certare</translation>
-    </message>
-    <message>
-        <source>Change passphrase</source>
-        <translation>Cambiar contraseña</translation>
-    </message>
-    <message>
-        <source>Confirm wallet encryption</source>
-        <translation>Confirmar cifrado de la cartera</translation>
-    </message>
-    <message>
-        <source>Warning: If you encrypt your wallet and lose your passphrase, you will &lt;b&gt;LOSE ALL OF YOUR BITCOINS&lt;/b&gt;!</source>
-        <translation>Atencion: ¡Si cifra su monedero y pierde la contraseña perderá &lt;b&gt;TODOS SUS BITCOINS&lt;/b&gt;!"</translation>
-    </message>
-    <message>
-        <source>Are you sure you wish to encrypt your wallet?</source>
-        <translation>¿Seguro que desea cifrar su monedero?</translation>
-    </message>
-    <message>
-        <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source>
-        <translation>IMPORTANTE: Cualquier copia de seguridad que haya realizado previamente de su archivo de monedero debe reemplazarse con el nuevo archivo de monedero cifrado. Por razones de seguridad, las copias de seguridad previas del archivo de monedero no cifradas serán inservibles en cuanto comience a usar el nuevo monedero cifrado.</translation>
-    </message>
-    <message>
-        <source>Warning: The Caps Lock key is on!</source>
-        <translation>Aviso: ¡La tecla de bloqueo de mayúsculas está activada!</translation>
-    </message>
-    <message>
-        <source>Wallet encrypted</source>
-        <translation>Monedero cifrado</translation>
-    </message>
-    <message>
-        <source>Wallet encryption failed</source>
-        <translation>Ha fallado el cifrado del monedero</translation>
-    </message>
-    <message>
-        <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
-        <translation>Ha fallado el cifrado del monedero debido a un error interno. El monedero no ha sido cifrado.</translation>
-    </message>
-    <message>
-        <source>The supplied passphrases do not match.</source>
-        <translation>Las contraseñas no coinciden.</translation>
-    </message>
-    <message>
-        <source>Wallet unlock failed</source>
-        <translation>Ha fallado el desbloqueo del monedero</translation>
-    </message>
-    <message>
-        <source>The passphrase entered for the wallet decryption was incorrect.</source>
-        <translation>La contraseña introducida para descifrar el monedero es incorrecta.</translation>
-    </message>
-    <message>
-        <source>Wallet decryption failed</source>
-        <translation>Ha fallado el descifrado del monedero</translation>
-    </message>
-    <message>
-        <source>Wallet passphrase was successfully changed.</source>
-        <translation>Se ha cambiado correctamente la contraseña del monedero.</translation>
-    </message>
 </context>
 <context>
     <name>BanTableModel</name>
@@ -277,10 +134,6 @@
         <source>Open &amp;URI...</source>
         <translation>Abrir URI...</translation>
     </message>
-    <message>
-        <source>Importing blocks from disk...</source>
-        <translation>Importando bloques de disco...</translation>
-    </message>
     <message>
         <source>Reindexing blocks on disk...</source>
         <translation>Reindexando bloques en disco...</translation>
@@ -361,18 +214,10 @@
         <source>Tabs toolbar</source>
         <translation>Barra de pestañas</translation>
     </message>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Núcleo de Bitcoin</translation>
-    </message>
     <message>
         <source>Request payments (generates QR codes and bitcoin: URIs)</source>
         <translation>Solicitar pagos (genera codigo QR y URL's de Bitcoin)</translation>
     </message>
-    <message>
-        <source>&amp;About Bitcoin Core</source>
-        <translation>&amp;Acerca del Núcleo de Bitcoin</translation>
-    </message>
     <message>
         <source>Show the list of used sending addresses and labels</source>
         <translation>Mostrar la lista de direcciones de envío y etiquetas</translation>
@@ -442,13 +287,6 @@
         <translation>El monedero está &lt;b&gt;cifrado&lt;/b&gt; y actualmente &lt;b&gt;bloqueado&lt;/b&gt;</translation>
     </message>
 </context>
-<context>
-    <name>ClientModel</name>
-    <message>
-        <source>Network Alert</source>
-        <translation>Alerta de red</translation>
-    </message>
-</context>
 <context>
     <name>CoinControlDialog</name>
     <message>
@@ -511,130 +349,6 @@
         <source>Priority</source>
         <translation>Prioridad</translation>
     </message>
-    <message>
-        <source>Copy address</source>
-        <translation>Copiar dirección</translation>
-    </message>
-    <message>
-        <source>Copy label</source>
-        <translation>Copiar etiqueta</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>Copiar cantidad</translation>
-    </message>
-    <message>
-        <source>Copy transaction ID</source>
-        <translation>Copiar identificador de transacción</translation>
-    </message>
-    <message>
-        <source>Lock unspent</source>
-        <translation>Bloquear lo no gastado</translation>
-    </message>
-    <message>
-        <source>Unlock unspent</source>
-        <translation>Desbloquear lo no gastado</translation>
-    </message>
-    <message>
-        <source>Copy quantity</source>
-        <translation>Copiar cantidad</translation>
-    </message>
-    <message>
-        <source>Copy fee</source>
-        <translation>Copiar donación</translation>
-    </message>
-    <message>
-        <source>Copy after fee</source>
-        <translation>Copiar después de aplicar donación</translation>
-    </message>
-    <message>
-        <source>Copy bytes</source>
-        <translation>Copiar bytes</translation>
-    </message>
-    <message>
-        <source>Copy priority</source>
-        <translation>Copiar prioridad</translation>
-    </message>
-    <message>
-        <source>Copy change</source>
-        <translation>Copiar Cambio</translation>
-    </message>
-    <message>
-        <source>highest</source>
-        <translation>lo más alto</translation>
-    </message>
-    <message>
-        <source>higher</source>
-        <translation>más alto</translation>
-    </message>
-    <message>
-        <source>high</source>
-        <translation>alto</translation>
-    </message>
-    <message>
-        <source>medium-high</source>
-        <translation>medio-alto</translation>
-    </message>
-    <message>
-        <source>medium</source>
-        <translation>medio</translation>
-    </message>
-    <message>
-        <source>low-medium</source>
-        <translation>bajo-medio</translation>
-    </message>
-    <message>
-        <source>low</source>
-        <translation>bajo</translation>
-    </message>
-    <message>
-        <source>lower</source>
-        <translation>más bajo</translation>
-    </message>
-    <message>
-        <source>lowest</source>
-        <translation>lo más bajo</translation>
-    </message>
-    <message>
-        <source>(%1 locked)</source>
-        <translation>(%1 bloqueado)</translation>
-    </message>
-    <message>
-        <source>none</source>
-        <translation>ninguno</translation>
-    </message>
-    <message>
-        <source>yes</source>
-        <translation>si</translation>
-    </message>
-    <message>
-        <source>no</source>
-        <translation>no</translation>
-    </message>
-    <message>
-        <source>This means a fee of at least %1 per kB is required.</source>
-        <translation>Esto implica que se requiere una tarifa de al menos %1 por kB</translation>
-    </message>
-    <message>
-        <source>Can vary +/- 1 byte per input.</source>
-        <translation>Puede variar +/- 1 byte por entrada.</translation>
-    </message>
-    <message>
-        <source>Transactions with higher priority are more likely to get included into a block.</source>
-        <translation>Las transacciones con alta prioridad son más propensas a ser incluidas dentro de un bloque.</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(sin etiqueta)</translation>
-    </message>
-    <message>
-        <source>change from %1 (%2)</source>
-        <translation>Enviar desde %1 (%2)</translation>
-    </message>
-    <message>
-        <source>(change)</source>
-        <translation>(cambio)</translation>
-    </message>
 </context>
 <context>
     <name>EditAddressDialog</name>
@@ -658,38 +372,6 @@
         <source>&amp;Address</source>
         <translation>&amp;Dirección</translation>
     </message>
-    <message>
-        <source>New receiving address</source>
-        <translation>Nueva dirección de recepción</translation>
-    </message>
-    <message>
-        <source>New sending address</source>
-        <translation>Nueva dirección de envío</translation>
-    </message>
-    <message>
-        <source>Edit receiving address</source>
-        <translation>Editar dirección de recepción</translation>
-    </message>
-    <message>
-        <source>Edit sending address</source>
-        <translation>Editar dirección de envío</translation>
-    </message>
-    <message>
-        <source>The entered address "%1" is already in the address book.</source>
-        <translation>La dirección introducida "%1" ya está presente en la libreta de direcciones.</translation>
-    </message>
-    <message>
-        <source>The entered address "%1" is not a valid Bitcoin address.</source>
-        <translation>La dirección introducida "%1" no es una dirección Bitcoin válida.</translation>
-    </message>
-    <message>
-        <source>Could not unlock wallet.</source>
-        <translation>No se pudo desbloquear el monedero.</translation>
-    </message>
-    <message>
-        <source>New key generation failed.</source>
-        <translation>Ha fallado la generación de la nueva clave.</translation>
-    </message>
 </context>
 <context>
     <name>FreespaceChecker</name>
@@ -716,18 +398,10 @@
 </context>
 <context>
     <name>HelpMessageDialog</name>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Núcleo de Bitcoin</translation>
-    </message>
     <message>
         <source>version</source>
         <translation>versión</translation>
     </message>
-    <message>
-        <source>About Bitcoin Core</source>
-        <translation>Acerca del Núcleo de Bitcoin</translation>
-    </message>
     <message>
         <source>Command-line options</source>
         <translation>Opciones de la línea de órdenes</translation>
@@ -747,18 +421,6 @@
         <source>Welcome</source>
         <translation>Bienvenido</translation>
     </message>
-    <message>
-        <source>Welcome to Bitcoin Core.</source>
-        <translation>Bienvenido al Núcleo de Bitcoin</translation>
-    </message>
-    <message>
-        <source>As this is the first time the program is launched, you can choose where Bitcoin Core will store its data.</source>
-        <translation>Al ser la primera vez que se ejecuta el programa, puede elegir dónde almacenará sus datos Bitcoin-Qt.</translation>
-    </message>
-    <message>
-        <source>Bitcoin Core will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source>
-        <translation>Bitcoin-Qt va a descargar y guardar una copia de la cadena de bloques de Bitcoin. Se almacenará al menos %1GB de datos en este directorio, que irá creciendo con el tiempo. El monedero se guardará también en este directorio.</translation>
-    </message>
     <message>
         <source>Use the default data directory</source>
         <translation>Utilizar el directorio de datos predeterminado</translation>
@@ -767,10 +429,6 @@
         <source>Use a custom data directory:</source>
         <translation>Utilice un directorio de datos personalizado:</translation>
     </message>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Núcleo de Bitcoin</translation>
-    </message>
     <message>
         <source>Error</source>
         <translation>Error</translation>
@@ -794,10 +452,6 @@
         <source>Select payment request file</source>
         <translation>Seleccione archivo de sulicitud de pago</translation>
     </message>
-    <message>
-        <source>Select payment request file to open</source>
-        <translation>Abrir archivo de solicitud de pago</translation>
-    </message>
 </context>
 <context>
     <name>OptionsDialog</name>
@@ -961,53 +615,6 @@
         <translation>Su balance actual total</translation>
     </message>
     </context>
-<context>
-    <name>PaymentServer</name>
-    <message>
-        <source>URI handling</source>
-        <translation>Gestión de URI</translation>
-    </message>
-    <message>
-        <source>Invalid payment address %1</source>
-        <translation>Dirección de pago no válida %1</translation>
-    </message>
-    <message>
-        <source>Requested payment amount of %1 is too small (considered dust).</source>
-        <translation>La cantidad del pago solicitado (%1) es demasiado pequeña (considerada polvo).</translation>
-    </message>
-    <message>
-        <source>Payment request error</source>
-        <translation>Error en petición de pago</translation>
-    </message>
-    <message>
-        <source>Cannot start bitcoin: click-to-pay handler</source>
-        <translation>No se pudo iniciar bitcoin: manejador de pago-al-clic</translation>
-    </message>
-    <message>
-        <source>Unverified payment requests to custom payment scripts are unsupported.</source>
-        <translation>No están soportadas las peticiones inseguras a scripts de pago personalizados</translation>
-    </message>
-    <message>
-        <source>Refund from %1</source>
-        <translation>Devolución de %1</translation>
-    </message>
-    <message>
-        <source>Error communicating with %1: %2</source>
-        <translation>Error en la comunicación con %1: %2</translation>
-    </message>
-    <message>
-        <source>Bad response from server %1</source>
-        <translation>Respuesta errónea del servidor %1</translation>
-    </message>
-    <message>
-        <source>Payment acknowledged</source>
-        <translation>Pago aceptado</translation>
-    </message>
-    <message>
-        <source>Network request error</source>
-        <translation>Error en petición de red</translation>
-    </message>
-</context>
 <context>
     <name>PeerTableModel</name>
     </context>
@@ -1030,25 +637,6 @@
         <translation>N/D</translation>
     </message>
     </context>
-<context>
-    <name>QRImageWidget</name>
-    <message>
-        <source>&amp;Save Image...</source>
-        <translation>Guardar Imagen...</translation>
-    </message>
-    <message>
-        <source>&amp;Copy Image</source>
-        <translation>Copiar imagen</translation>
-    </message>
-    <message>
-        <source>Save QR Code</source>
-        <translation>Guardar código QR</translation>
-    </message>
-    <message>
-        <source>PNG Image (*.png)</source>
-        <translation>Imágenes PNG (*.png)</translation>
-    </message>
-</context>
 <context>
     <name>RPCConsole</name>
     <message>
@@ -1131,10 +719,6 @@
         <source>Out:</source>
         <translation>Fuera:</translation>
     </message>
-    <message>
-        <source>Build date</source>
-        <translation>Fecha de compilación</translation>
-    </message>
     <message>
         <source>Debug log file</source>
         <translation>Archivo de registro de depuración</translation>
@@ -1218,14 +802,6 @@
         <source>Remove</source>
         <translation>Eliminar</translation>
     </message>
-    <message>
-        <source>Copy label</source>
-        <translation>Copiar etiqueta</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>Copiar cantidad</translation>
-    </message>
 </context>
 <context>
     <name>ReceiveRequestDialog</name>
@@ -1245,115 +821,52 @@
         <source>&amp;Save Image...</source>
         <translation>Guardar Imagen...</translation>
     </message>
+</context>
+<context>
+    <name>SendCoinsDialog</name>
     <message>
-        <source>Request payment to %1</source>
-        <translation>Solicitar pago a %1</translation>
+        <source>Send Coins</source>
+        <translation>Enviar monedas</translation>
     </message>
     <message>
-        <source>Payment information</source>
-        <translation>Información de pago</translation>
+        <source>Coin Control Features</source>
+        <translation>Características de control de la moneda</translation>
     </message>
     <message>
-        <source>URI</source>
-        <translation>URI</translation>
+        <source>Inputs...</source>
+        <translation>Entradas...</translation>
     </message>
     <message>
-        <source>Address</source>
-        <translation>Dirección</translation>
+        <source>automatically selected</source>
+        <translation>Seleccionado automaticamente</translation>
     </message>
     <message>
-        <source>Amount</source>
-        <translation>Cantidad</translation>
+        <source>Insufficient funds!</source>
+        <translation>Fondos insuficientes!</translation>
     </message>
     <message>
-        <source>Label</source>
-        <translation>Etiqueta</translation>
+        <source>Quantity:</source>
+        <translation>Cantidad:</translation>
     </message>
     <message>
-        <source>Message</source>
-        <translation>Mensaje</translation>
+        <source>Bytes:</source>
+        <translation>Bytes:</translation>
     </message>
     <message>
-        <source>Resulting URI too long, try to reduce the text for label / message.</source>
-        <translation>URI resultante demasiado larga. Intente reducir el texto de la etiqueta / mensaje.</translation>
+        <source>Amount:</source>
+        <translation>Cuantía:</translation>
     </message>
     <message>
-        <source>Error encoding URI into QR Code.</source>
-        <translation>Error al codificar la URI en el código QR.</translation>
+        <source>Priority:</source>
+        <translation>Prioridad:</translation>
     </message>
-</context>
-<context>
-    <name>RecentRequestsTableModel</name>
     <message>
-        <source>Date</source>
-        <translation>Fecha</translation>
+        <source>Fee:</source>
+        <translation>Tasa:</translation>
     </message>
     <message>
-        <source>Label</source>
-        <translation>Etiqueta</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>Mensaje</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>Cantidad</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(sin etiqueta)</translation>
-    </message>
-    <message>
-        <source>(no message)</source>
-        <translation>(Ningun mensaje)</translation>
-    </message>
-    </context>
-<context>
-    <name>SendCoinsDialog</name>
-    <message>
-        <source>Send Coins</source>
-        <translation>Enviar monedas</translation>
-    </message>
-    <message>
-        <source>Coin Control Features</source>
-        <translation>Características de control de la moneda</translation>
-    </message>
-    <message>
-        <source>Inputs...</source>
-        <translation>Entradas...</translation>
-    </message>
-    <message>
-        <source>automatically selected</source>
-        <translation>Seleccionado automaticamente</translation>
-    </message>
-    <message>
-        <source>Insufficient funds!</source>
-        <translation>Fondos insuficientes!</translation>
-    </message>
-    <message>
-        <source>Quantity:</source>
-        <translation>Cantidad:</translation>
-    </message>
-    <message>
-        <source>Bytes:</source>
-        <translation>Bytes:</translation>
-    </message>
-    <message>
-        <source>Amount:</source>
-        <translation>Cuantía:</translation>
-    </message>
-    <message>
-        <source>Priority:</source>
-        <translation>Prioridad:</translation>
-    </message>
-    <message>
-        <source>Fee:</source>
-        <translation>Tasa:</translation>
-    </message>
-    <message>
-        <source>After Fee:</source>
-        <translation>Después de tasas:</translation>
+        <source>After Fee:</source>
+        <translation>Después de tasas:</translation>
     </message>
     <message>
         <source>Change:</source>
@@ -1399,86 +912,6 @@
         <source>S&amp;end</source>
         <translation>&amp;Enviar</translation>
     </message>
-    <message>
-        <source>Confirm send coins</source>
-        <translation>Confirmar el envío de monedas</translation>
-    </message>
-    <message>
-        <source>%1 to %2</source>
-        <translation>%1 a %2</translation>
-    </message>
-    <message>
-        <source>Copy quantity</source>
-        <translation>Copiar cantidad</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>Copiar cantidad</translation>
-    </message>
-    <message>
-        <source>Copy fee</source>
-        <translation>Copiar donación</translation>
-    </message>
-    <message>
-        <source>Copy after fee</source>
-        <translation>Copiar después de aplicar donación</translation>
-    </message>
-    <message>
-        <source>Copy bytes</source>
-        <translation>Copiar bytes</translation>
-    </message>
-    <message>
-        <source>Copy priority</source>
-        <translation>Copiar prioridad</translation>
-    </message>
-    <message>
-        <source>Copy change</source>
-        <translation>Copiar Cambio</translation>
-    </message>
-    <message>
-        <source>or</source>
-        <translation>o</translation>
-    </message>
-    <message>
-        <source>The amount to pay must be larger than 0.</source>
-        <translation>La cantidad por pagar tiene que ser mayor de 0.</translation>
-    </message>
-    <message>
-        <source>The amount exceeds your balance.</source>
-        <translation>La cantidad sobrepasa su saldo.</translation>
-    </message>
-    <message>
-        <source>The total exceeds your balance when the %1 transaction fee is included.</source>
-        <translation>El total sobrepasa su saldo cuando se incluye la tasa de envío de %1</translation>
-    </message>
-    <message>
-        <source>Transaction creation failed!</source>
-        <translation>¡Ha fallado la creación de la transacción!</translation>
-    </message>
-    <message>
-        <source>The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source>
-        <translation>La transacción fue rechazada. Esto puede haber ocurrido si alguna de las monedas ya estaba gastada o si ha usado una copia de wallet.dat y las monedas se gastaron en la copia pero no se han marcado como gastadas aqui.</translation>
-    </message>
-    <message>
-        <source>Warning: Invalid Bitcoin address</source>
-        <translation>Alerta: Dirección de Bitcoin inválida</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(sin etiqueta)</translation>
-    </message>
-    <message>
-        <source>Warning: Unknown change address</source>
-        <translation>Alerta: Dirección de Bitcoin inválida</translation>
-    </message>
-    <message>
-        <source>Are you sure you want to send?</source>
-        <translation>¿Está seguro que desea enviar?</translation>
-    </message>
-    <message>
-        <source>added as transaction fee</source>
-        <translation>añadido como comisión de transacción</translation>
-    </message>
 </context>
 <context>
     <name>SendCoinsEntry</name>
@@ -1490,10 +923,6 @@
         <source>Pay &amp;To:</source>
         <translation>&amp;Pagar a:</translation>
     </message>
-    <message>
-        <source>Enter a label for this address to add it to your address book</source>
-        <translation>Etiquete esta dirección para añadirla a la libreta</translation>
-    </message>
     <message>
         <source>&amp;Label:</source>
         <translation>&amp;Etiqueta:</translation>
@@ -1612,69 +1041,9 @@
         <source>Reset all verify message fields</source>
         <translation>Limpiar todos los campos de la verificación de mensaje</translation>
     </message>
-    <message>
-        <source>Click "Sign Message" to generate signature</source>
-        <translation>Haga clic en "Firmar mensaje" para generar la firma</translation>
-    </message>
-    <message>
-        <source>The entered address is invalid.</source>
-        <translation>La dirección introducida es inválida.</translation>
-    </message>
-    <message>
-        <source>Please check the address and try again.</source>
-        <translation>Verifique la dirección e inténtelo de nuevo.</translation>
-    </message>
-    <message>
-        <source>The entered address does not refer to a key.</source>
-        <translation>La dirección introducida no corresponde a una clave.</translation>
-    </message>
-    <message>
-        <source>Wallet unlock was cancelled.</source>
-        <translation>Se ha cancelado el desbloqueo del monedero. </translation>
-    </message>
-    <message>
-        <source>Private key for the entered address is not available.</source>
-        <translation>No se dispone de la clave privada para la dirección introducida.</translation>
-    </message>
-    <message>
-        <source>Message signing failed.</source>
-        <translation>Ha fallado la firma del mensaje.</translation>
-    </message>
-    <message>
-        <source>Message signed.</source>
-        <translation>Mensaje firmado.</translation>
-    </message>
-    <message>
-        <source>The signature could not be decoded.</source>
-        <translation>No se puede decodificar la firma.</translation>
-    </message>
-    <message>
-        <source>Please check the signature and try again.</source>
-        <translation>Compruebe la firma e inténtelo de nuevo.</translation>
-    </message>
-    <message>
-        <source>The signature did not match the message digest.</source>
-        <translation>La firma no coincide con el resumen del mensaje.</translation>
-    </message>
-    <message>
-        <source>Message verification failed.</source>
-        <translation>La verificación del mensaje ha fallado.</translation>
-    </message>
-    <message>
-        <source>Message verified.</source>
-        <translation>Mensaje verificado.</translation>
-    </message>
 </context>
 <context>
     <name>SplashScreen</name>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Núcleo de Bitcoin</translation>
-    </message>
-    <message>
-        <source>The Bitcoin Core developers</source>
-        <translation>Los desarrolladores del Núcleo de Bitcoin</translation>
-    </message>
     <message>
         <source>[testnet]</source>
         <translation>[testnet]</translation>
@@ -1687,402 +1056,16 @@
         <translation>KB/s</translation>
     </message>
 </context>
-<context>
-    <name>TransactionDesc</name>
-    <message>
-        <source>Open until %1</source>
-        <translation>Abierto hasta %1</translation>
-    </message>
-    <message>
-        <source>%1/offline</source>
-        <translation>%1/fuera de línea</translation>
-    </message>
-    <message>
-        <source>%1/unconfirmed</source>
-        <translation>%1/no confirmado</translation>
-    </message>
-    <message>
-        <source>%1 confirmations</source>
-        <translation>%1 confirmaciones</translation>
-    </message>
-    <message>
-        <source>Status</source>
-        <translation>Estado</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation>Fecha</translation>
-    </message>
-    <message>
-        <source>Source</source>
-        <translation>Fuente</translation>
-    </message>
-    <message>
-        <source>Generated</source>
-        <translation>Generado</translation>
-    </message>
-    <message>
-        <source>From</source>
-        <translation>De</translation>
-    </message>
-    <message>
-        <source>To</source>
-        <translation>Para</translation>
-    </message>
-    <message>
-        <source>own address</source>
-        <translation>dirección propia</translation>
-    </message>
-    <message>
-        <source>label</source>
-        <translation>etiqueta</translation>
-    </message>
-    <message>
-        <source>Credit</source>
-        <translation>Crédito</translation>
-    </message>
-    <message>
-        <source>not accepted</source>
-        <translation>no aceptada</translation>
-    </message>
-    <message>
-        <source>Debit</source>
-        <translation>Débito</translation>
-    </message>
-    <message>
-        <source>Transaction fee</source>
-        <translation>Comisión de transacción</translation>
-    </message>
-    <message>
-        <source>Net amount</source>
-        <translation>Cantidad neta</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>Mensaje</translation>
-    </message>
-    <message>
-        <source>Comment</source>
-        <translation>Comentario</translation>
-    </message>
-    <message>
-        <source>Transaction ID</source>
-        <translation>ID</translation>
-    </message>
-    <message>
-        <source>Merchant</source>
-        <translation>Vendedor</translation>
-    </message>
-    <message>
-        <source>Generated coins must mature %1 blocks before they can be spent. When you generated this block, it was broadcast to the network to be added to the block chain. If it fails to get into the chain, its state will change to "not accepted" and it won't be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source>
-        <translation>Las monedas generadas deben madurar %1 bloques antes de que puedan ser gastadas. Una vez que generas este bloque, es propagado por la red para ser añadido a la cadena de bloques. Si falla el intento de meterse en la cadena, su estado cambiará a "no aceptado" y ya no se puede gastar. Esto puede ocurrir ocasionalmente si otro nodo genera un bloque a pocos segundos del tuyo.</translation>
-    </message>
-    <message>
-        <source>Debug information</source>
-        <translation>Información de depuración</translation>
-    </message>
-    <message>
-        <source>Transaction</source>
-        <translation>Transacción</translation>
-    </message>
-    <message>
-        <source>Inputs</source>
-        <translation>entradas</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>Cantidad</translation>
-    </message>
-    <message>
-        <source>true</source>
-        <translation>verdadero</translation>
-    </message>
-    <message>
-        <source>false</source>
-        <translation>falso</translation>
-    </message>
-    <message>
-        <source>, has not been successfully broadcast yet</source>
-        <translation>, todavía no se ha sido difundido satisfactoriamente</translation>
-    </message>
-    <message>
-        <source>unknown</source>
-        <translation>desconocido</translation>
-    </message>
-</context>
 <context>
     <name>TransactionDescDialog</name>
-    <message>
-        <source>Transaction details</source>
-        <translation>Detalles de transacción</translation>
-    </message>
     <message>
         <source>This pane shows a detailed description of the transaction</source>
         <translation>Esta ventana muestra información detallada sobre la transacción</translation>
     </message>
 </context>
-<context>
-    <name>TransactionTableModel</name>
-    <message>
-        <source>Date</source>
-        <translation>Fecha</translation>
-    </message>
-    <message>
-        <source>Type</source>
-        <translation>Tipo</translation>
-    </message>
-    <message>
-        <source>Open until %1</source>
-        <translation>Abierto hasta %1</translation>
-    </message>
-    <message>
-        <source>Confirmed (%1 confirmations)</source>
-        <translation>Confirmado (%1 confirmaciones)</translation>
-    </message>
-    <message>
-        <source>This block was not received by any other nodes and will probably not be accepted!</source>
-        <translation>Este bloque no ha sido recibido por otros nodos y probablemente no sea aceptado!</translation>
-    </message>
-    <message>
-        <source>Generated but not accepted</source>
-        <translation>Generado pero no aceptado</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Etiqueta</translation>
-    </message>
-    <message>
-        <source>Received with</source>
-        <translation>Recibido con</translation>
-    </message>
-    <message>
-        <source>Received from</source>
-        <translation>Recibidos de</translation>
-    </message>
-    <message>
-        <source>Sent to</source>
-        <translation>Enviado a</translation>
-    </message>
-    <message>
-        <source>Payment to yourself</source>
-        <translation>Pago propio</translation>
-    </message>
-    <message>
-        <source>Mined</source>
-        <translation>Minado</translation>
-    </message>
-    <message>
-        <source>(n/a)</source>
-        <translation>(nd)</translation>
-    </message>
-    <message>
-        <source>Transaction status. Hover over this field to show number of confirmations.</source>
-        <translation>Estado de transacción. Pasa el ratón sobre este campo para ver el número de confirmaciones.</translation>
-    </message>
-    <message>
-        <source>Date and time that the transaction was received.</source>
-        <translation>Fecha y hora en que se recibió la transacción.</translation>
-    </message>
-    <message>
-        <source>Type of transaction.</source>
-        <translation>Tipo de transacción.</translation>
-    </message>
-    <message>
-        <source>Amount removed from or added to balance.</source>
-        <translation>Cantidad retirada o añadida al saldo.</translation>
-    </message>
-</context>
-<context>
-    <name>TransactionView</name>
-    <message>
-        <source>All</source>
-        <translation>Todo</translation>
-    </message>
-    <message>
-        <source>Today</source>
-        <translation>Hoy</translation>
-    </message>
-    <message>
-        <source>This week</source>
-        <translation>Esta semana</translation>
-    </message>
-    <message>
-        <source>This month</source>
-        <translation>Este mes</translation>
-    </message>
-    <message>
-        <source>Last month</source>
-        <translation>Mes pasado</translation>
-    </message>
-    <message>
-        <source>This year</source>
-        <translation>Este año</translation>
-    </message>
-    <message>
-        <source>Range...</source>
-        <translation>Rango...</translation>
-    </message>
-    <message>
-        <source>Received with</source>
-        <translation>Recibido con</translation>
-    </message>
-    <message>
-        <source>Sent to</source>
-        <translation>Enviado a</translation>
-    </message>
-    <message>
-        <source>To yourself</source>
-        <translation>A usted mismo</translation>
-    </message>
-    <message>
-        <source>Mined</source>
-        <translation>Minado</translation>
-    </message>
-    <message>
-        <source>Other</source>
-        <translation>Otra</translation>
-    </message>
-    <message>
-        <source>Enter address or label to search</source>
-        <translation>Introduzca una dirección o etiqueta que buscar</translation>
-    </message>
-    <message>
-        <source>Min amount</source>
-        <translation>Cantidad mínima</translation>
-    </message>
-    <message>
-        <source>Copy address</source>
-        <translation>Copiar dirección</translation>
-    </message>
-    <message>
-        <source>Copy label</source>
-        <translation>Copiar etiqueta</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>Copiar cantidad</translation>
-    </message>
-    <message>
-        <source>Copy transaction ID</source>
-        <translation>Copiar identificador de transacción</translation>
-    </message>
-    <message>
-        <source>Edit label</source>
-        <translation>Editar etiqueta</translation>
-    </message>
-    <message>
-        <source>Show transaction details</source>
-        <translation>Mostrar detalles de la transacción</translation>
-    </message>
-    <message>
-        <source>Export Transaction History</source>
-        <translation>Exportar historial de transacciones</translation>
-    </message>
-    <message>
-        <source>Exporting Failed</source>
-        <translation>Error exportando</translation>
-    </message>
-    <message>
-        <source>There was an error trying to save the transaction history to %1.</source>
-        <translation>Ha habido un error al intentar guardar la transacción con %1.</translation>
-    </message>
-    <message>
-        <source>Exporting Successful</source>
-        <translation>Exportación finalizada</translation>
-    </message>
-    <message>
-        <source>The transaction history was successfully saved to %1.</source>
-        <translation>La transacción ha sido guardada en %1.</translation>
-    </message>
-    <message>
-        <source>Comma separated file (*.csv)</source>
-        <translation>Archivos de columnas separadas por coma (*.csv)</translation>
-    </message>
-    <message>
-        <source>Confirmed</source>
-        <translation>Confirmado</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation>Fecha</translation>
-    </message>
-    <message>
-        <source>Type</source>
-        <translation>Tipo</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Etiqueta</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>Dirección</translation>
-    </message>
-    <message>
-        <source>ID</source>
-        <translation>ID</translation>
-    </message>
-    <message>
-        <source>Range:</source>
-        <translation>Rango:</translation>
-    </message>
-    <message>
-        <source>to</source>
-        <translation>para</translation>
-    </message>
-</context>
 <context>
     <name>UnitDisplayStatusBarControl</name>
     </context>
-<context>
-    <name>WalletFrame</name>
-    <message>
-        <source>No wallet has been loaded.</source>
-        <translation>No se ha cargado ningún monedero</translation>
-    </message>
-</context>
-<context>
-    <name>WalletModel</name>
-    <message>
-        <source>Send Coins</source>
-        <translation>Enviar monedas</translation>
-    </message>
-</context>
-<context>
-    <name>WalletView</name>
-    <message>
-        <source>&amp;Export</source>
-        <translation>&amp;Exportar</translation>
-    </message>
-    <message>
-        <source>Export the data in the current tab to a file</source>
-        <translation>Exportar a un archivo los datos de esta pestaña</translation>
-    </message>
-    <message>
-        <source>Backup Wallet</source>
-        <translation>Respaldo de monedero</translation>
-    </message>
-    <message>
-        <source>Wallet Data (*.dat)</source>
-        <translation>Datos de monedero (*.dat)</translation>
-    </message>
-    <message>
-        <source>Backup Failed</source>
-        <translation>Ha fallado el respaldo</translation>
-    </message>
-    <message>
-        <source>There was an error trying to save the wallet data to %1.</source>
-        <translation>Ha habido un error al intentar guardar los datos del monedero en %1.</translation>
-    </message>
-    <message>
-        <source>The wallet data was successfully saved to %1.</source>
-        <translation>Los datos del monedero se han guardado con éxito en %1.</translation>
-    </message>
-    <message>
-        <source>Backup Successful</source>
-        <translation>Se ha completado con éxito la copia de respaldo</translation>
-    </message>
-</context>
 <context>
     <name>bitcoin-core</name>
     <message>
@@ -2116,6 +1099,10 @@
         <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
         <translation>Aceptar conexiones desde el exterior (predeterminado: 1 si no -proxy o -connect)</translation>
     </message>
+    <message>
+        <source>Bitcoin Core</source>
+        <translation>Núcleo de Bitcoin</translation>
+    </message>
     <message>
         <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source>
         <translation>Vincular a la dirección dada y escuchar siempre en ella. Utilice la notación [host]:port para IPv6</translation>
@@ -2136,10 +1123,6 @@
         <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source>
         <translation>Atención: ¡Parece que no estamos completamente de acuerdo con nuestros pares! Podría necesitar una actualización, u otros nodos podrían necesitarla.</translation>
     </message>
-    <message>
-        <source>Warning: wallet.dat corrupt, data salvaged! Original wallet.dat saved as wallet.{timestamp}.bak in %s; if your balance or transactions are incorrect you should restore from a backup.</source>
-        <translation>Aviso: ¡Recuperados datos de wallet.dat corrupto! El wallet.dat original se ha guardado como wallet.{timestamp}.bak en %s; si hubiera errores en su saldo o transacciones, deberá restaurar una copia de seguridad.</translation>
-    </message>
     <message>
         <source>&lt;category&gt; can be:</source>
         <translation>&lt;category&gt; puede ser:</translation>
@@ -2216,10 +1199,6 @@
         <source>Wallet %s resides outside data directory %s</source>
         <translation>El monedero %s se encuentra fuera del directorio de datos %s</translation>
     </message>
-    <message>
-        <source>You need to rebuild the database using -reindex to change -txindex</source>
-        <translation>Usted necesita reconstruir la base de datos utilizando -reindex para cambiar -txindex</translation>
-    </message>
     <message>
         <source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source>
         <translation>Ejecutar un comando cuando se reciba una alerta importante o cuando veamos un fork demasiado largo (%s en cmd se reemplazará por el mensaje)</translation>
@@ -2228,26 +1207,10 @@
         <source>Set maximum size of high-priority/low-fee transactions in bytes (default: %d)</source>
         <translation>Establecer tamaño máximo de las transacciones de alta prioridad/comisión baja en bytes (por defecto: %d)</translation>
     </message>
-    <message>
-        <source>Cannot resolve -whitebind address: '%s'</source>
-        <translation>No se puede resolver la dirección de -whitebind: '%s'</translation>
-    </message>
     <message>
         <source>Information</source>
         <translation>Información</translation>
     </message>
-    <message>
-        <source>Invalid amount for -maxtxfee=&lt;amount&gt;: '%s'</source>
-        <translation>Inválido por el monto -maxtxfee=&lt;amount&gt;: '%s'</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -minrelaytxfee=&lt;amount&gt;: '%s'</source>
-        <translation>Inválido por el monto -minrelaytxfee=&lt;amount&gt;: '%s'</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -mintxfee=&lt;amount&gt;: '%s'</source>
-        <translation>Inválido por el monto -mintxfee=&lt;amount&gt;: '%s'</translation>
-    </message>
     <message>
         <source>RPC server options:</source>
         <translation>Opciones del sservidor RPC:</translation>
@@ -2289,10 +1252,6 @@
         <source>Warning</source>
         <translation>Aviso</translation>
     </message>
-    <message>
-        <source>wallet.dat corrupt, salvage failed</source>
-        <translation>wallet.dat corrupto. Ha fallado la recuperación.</translation>
-    </message>
     <message>
         <source>Password for JSON-RPC connections</source>
         <translation>Contraseña para las conexiones JSON-RPC
@@ -2302,11 +1261,6 @@
         <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
         <translation>Ejecutar un comando cuando cambia el mejor bloque (%s en cmd se sustituye por el hash de bloque)</translation>
     </message>
-    <message>
-        <source>This help message</source>
-        <translation>Este mensaje de ayuda
-</translation>
-    </message>
     <message>
         <source>Allow DNS lookups for -addnode, -seednode and -connect</source>
         <translation>Permitir búsquedas DNS para -addnode, -seednode y -connect</translation>
@@ -2315,14 +1269,6 @@
         <source>Loading addresses...</source>
         <translation>Cargando direcciones...</translation>
     </message>
-    <message>
-        <source>Error loading wallet.dat: Wallet corrupted</source>
-        <translation>Error al cargar wallet.dat: el monedero está dañado</translation>
-    </message>
-    <message>
-        <source>Error loading wallet.dat</source>
-        <translation>Error al cargar wallet.dat</translation>
-    </message>
     <message>
         <source>Invalid -proxy address: '%s'</source>
         <translation>Dirección -proxy inválida: '%s'</translation>
@@ -2331,18 +1277,6 @@
         <source>Unknown network specified in -onlynet: '%s'</source>
         <translation>La red especificada en -onlynet '%s' es desconocida</translation>
     </message>
-    <message>
-        <source>Cannot resolve -bind address: '%s'</source>
-        <translation>No se puede resolver la dirección de -bind: '%s'</translation>
-    </message>
-    <message>
-        <source>Cannot resolve -externalip address: '%s'</source>
-        <translation>No se puede resolver la dirección de -externalip: '%s'</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -paytxfee=&lt;amount&gt;: '%s'</source>
-        <translation>Cantidad inválida para -paytxfee=&lt;amount&gt;: '%s'</translation>
-    </message>
     <message>
         <source>Insufficient funds</source>
         <translation>Fondos insuficientes</translation>
diff --git a/src/qt/locale/bitcoin_es_ES.ts b/src/qt/locale/bitcoin_es_ES.ts
index bdbfed4ec634f..c66a477cc2994 100644
--- a/src/qt/locale/bitcoin_es_ES.ts
+++ b/src/qt/locale/bitcoin_es_ES.ts
@@ -25,10 +25,6 @@
         <source>C&amp;lose</source>
         <translation>C&amp;errar</translation>
     </message>
-    <message>
-        <source>&amp;Copy Address</source>
-        <translation>&amp;Copiar Direccón</translation>
-    </message>
     <message>
         <source>Delete the currently selected address from the list</source>
         <translation>Elimina la dirección seleccionada de la lista</translation>
@@ -45,73 +41,6 @@
         <source>&amp;Delete</source>
         <translation>&amp;Eliminar</translation>
     </message>
-    <message>
-        <source>Choose the address to send coins to</source>
-        <translation>Elige la dirección a la que enviar las monedas</translation>
-    </message>
-    <message>
-        <source>Choose the address to receive coins with</source>
-        <translation>Elige la direccón con la que recibir monedas</translation>
-    </message>
-    <message>
-        <source>C&amp;hoose</source>
-        <translation>E&amp;legir</translation>
-    </message>
-    <message>
-        <source>Sending addresses</source>
-        <translation>Enviando direcciones</translation>
-    </message>
-    <message>
-        <source>Receiving addresses</source>
-        <translation>Recibiendo direcciones</translation>
-    </message>
-    <message>
-        <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source>
-        <translation>Estas son tus direcciones de Bitcoin para enviar pagos. Comprueba siempre la cantidad y la dirección receptora antes de enviar monedas.</translation>
-    </message>
-    <message>
-        <source>These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source>
-        <translation>Estas son tus direcciones de Bitcoin para recibir pagos. Se recomienda usar una nueva dirección receptora para cada transacción</translation>
-    </message>
-    <message>
-        <source>Copy &amp;Label</source>
-        <translation>Copiar &amp;Etiqueta</translation>
-    </message>
-    <message>
-        <source>&amp;Edit</source>
-        <translation>&amp;Editar</translation>
-    </message>
-    <message>
-        <source>Export Address List</source>
-        <translation>Exportar Lista de Direcciones</translation>
-    </message>
-    <message>
-        <source>Comma separated file (*.csv)</source>
-        <translation>Archivo separado por comas (*.csv)</translation>
-    </message>
-    <message>
-        <source>Exporting Failed</source>
-        <translation>Exportacón Fallida</translation>
-    </message>
-    <message>
-        <source>There was an error trying to save the address list to %1. Please try again.</source>
-        <translation>Ha ocurrido un error intentando guardar la lista de direcciones en %1. Por favor intentalo de nuevo.</translation>
-    </message>
-</context>
-<context>
-    <name>AddressTableModel</name>
-    <message>
-        <source>Label</source>
-        <translation>Etiqueta</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>Dirección</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(sin etiqueta)</translation>
-    </message>
 </context>
 <context>
     <name>AskPassphraseDialog</name>
@@ -131,94 +60,6 @@
         <source>Repeat new passphrase</source>
         <translation>Repite la nueva contraseña</translation>
     </message>
-    <message>
-        <source>Encrypt wallet</source>
-        <translation>Encriptar cartera</translation>
-    </message>
-    <message>
-        <source>This operation needs your wallet passphrase to unlock the wallet.</source>
-        <translation>Esta operacón necesita tu contraseña de la cartera para desbloquear la cartera.</translation>
-    </message>
-    <message>
-        <source>Unlock wallet</source>
-        <translation>Desbloquear cartera</translation>
-    </message>
-    <message>
-        <source>This operation needs your wallet passphrase to decrypt the wallet.</source>
-        <translation>Esta operación requiere tu contraseña de la cartera para desencriptar la cartera.</translation>
-    </message>
-    <message>
-        <source>Decrypt wallet</source>
-        <translation>Desencriptar cartera</translation>
-    </message>
-    <message>
-        <source>Change passphrase</source>
-        <translation>Cambiar contraseña</translation>
-    </message>
-    <message>
-        <source>Confirm wallet encryption</source>
-        <translation>Confirmar encriptación de la cartera</translation>
-    </message>
-    <message>
-        <source>Warning: If you encrypt your wallet and lose your passphrase, you will &lt;b&gt;LOSE ALL OF YOUR BITCOINS&lt;/b&gt;!</source>
-        <translation>Advertencia: Si encriptas tu cartera y pierdes tu contraseña, &lt;b&gt;PERDERÁS TODOS TUS BITCOINS&lt;/B&gt;</translation>
-    </message>
-    <message>
-        <source>Are you sure you wish to encrypt your wallet?</source>
-        <translation>Estás seguro ue deseas encriptar tu cartera?</translation>
-    </message>
-    <message>
-        <source>Bitcoin Core will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source>
-        <translation>Bitcoin Core se cerrará ahora para finalizar el proceso de encriptación. Recuerda que encriptar tu cartera no protege completamente tus bitcoins de ser robados por malware infectando tu ordenador.</translation>
-    </message>
-    <message>
-        <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source>
-        <translation>IMPORTANTE: Cualquier copia de seguridad anterior del archivo de tu cartera debería ser remplazado con el nuevo archivo encriptado. Por motivos de seguridad, las copias de seguridad anteriores de la cartera desencriptada quedaran inusables tan pronto como empieces a usar la nueva cartera encriptada.</translation>
-    </message>
-    <message>
-        <source>Warning: The Caps Lock key is on!</source>
-        <translation>Advertencia: La Tecla de Bloqueo de Mayusculas esta activada!</translation>
-    </message>
-    <message>
-        <source>Wallet encrypted</source>
-        <translation>Cartera encriptada</translation>
-    </message>
-    <message>
-        <source>Enter the new passphrase to the wallet.&lt;br/&gt;Please use a passphrase of &lt;b&gt;ten or more random characters&lt;/b&gt;, or &lt;b&gt;eight or more words&lt;/b&gt;.</source>
-        <translation>Introduzca la nueva contraseña de la cartera. &lt;br/&gt;Por favor utilice una contraseña de &lt;b&gt;diez o mas caracteres aleatorios&lt;/b&gt;, o &lt;b&gt;ocho o mas palabras&lt;/b&gt;.</translation>
-    </message>
-    <message>
-        <source>Enter the old passphrase and new passphrase to the wallet.</source>
-        <translation>Introduzca la antigua contraseña y la nueva contraseña en la cartera.</translation>
-    </message>
-    <message>
-        <source>Wallet encryption failed</source>
-        <translation>Encriptación de la cartera fallida</translation>
-    </message>
-    <message>
-        <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
-        <translation>La encriptación de la cartera ha fallado debido a un error interno. Tu cartera no ha sido encriptada.</translation>
-    </message>
-    <message>
-        <source>The supplied passphrases do not match.</source>
-        <translation>Las contraseñas proporcianadas no se corresponden.</translation>
-    </message>
-    <message>
-        <source>Wallet unlock failed</source>
-        <translation>Desbloqueo de la cartera fallido</translation>
-    </message>
-    <message>
-        <source>The passphrase entered for the wallet decryption was incorrect.</source>
-        <translation>La contraseña introducida para desencriptar la cartera es incorrecta.</translation>
-    </message>
-    <message>
-        <source>Wallet decryption failed</source>
-        <translation>Desencriptación de la cartera fallida</translation>
-    </message>
-    <message>
-        <source>Wallet passphrase was successfully changed.</source>
-        <translation>Contraseña de la cartera cambiada correctamente</translation>
-    </message>
 </context>
 <context>
     <name>BanTableModel</name>
@@ -297,14 +138,6 @@
         <source>Open &amp;URI...</source>
         <translation>Abrir &amp;URI...</translation>
     </message>
-    <message>
-        <source>Bitcoin Core client</source>
-        <translation>Cliente Bitcoin Core</translation>
-    </message>
-    <message>
-        <source>Importing blocks from disk...</source>
-        <translation>Importando bloques desde disco...</translation>
-    </message>
     <message>
         <source>Reindexing blocks on disk...</source>
         <translation>Reindexando bloques en el disco...</translation>
@@ -318,15 +151,8 @@
         <translation>Crea una copia de seguridad de tu cartera en otra ubicación</translation>
     </message>
     </context>
-<context>
-    <name>ClientModel</name>
-    </context>
 <context>
     <name>CoinControlDialog</name>
-    <message>
-        <source>(no label)</source>
-        <translation>(sin etiqueta)</translation>
-    </message>
     </context>
 <context>
     <name>EditAddressDialog</name>
@@ -338,7 +164,7 @@
         <source>&amp;Address</source>
         <translation>Dirección</translation>
     </message>
-    </context>
+</context>
 <context>
     <name>FreespaceChecker</name>
     </context>
@@ -357,18 +183,12 @@
 <context>
     <name>OverviewPage</name>
     </context>
-<context>
-    <name>PaymentServer</name>
-    </context>
 <context>
     <name>PeerTableModel</name>
     </context>
 <context>
     <name>QObject</name>
     </context>
-<context>
-    <name>QRImageWidget</name>
-    </context>
 <context>
     <name>RPCConsole</name>
     </context>
@@ -381,32 +201,9 @@
         <source>Copy &amp;Address</source>
         <translation>&amp;Copiar Direccón</translation>
     </message>
-    <message>
-        <source>Address</source>
-        <translation>Dirección</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Etiqueta</translation>
-    </message>
-    </context>
-<context>
-    <name>RecentRequestsTableModel</name>
-    <message>
-        <source>Label</source>
-        <translation>Etiqueta</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(sin etiqueta)</translation>
-    </message>
     </context>
 <context>
     <name>SendCoinsDialog</name>
-    <message>
-        <source>(no label)</source>
-        <translation>(sin etiqueta)</translation>
-    </message>
     </context>
 <context>
     <name>SendCoinsEntry</name>
@@ -423,58 +220,12 @@
 <context>
     <name>TrafficGraphWidget</name>
     </context>
-<context>
-    <name>TransactionDesc</name>
-    </context>
 <context>
     <name>TransactionDescDialog</name>
     </context>
-<context>
-    <name>TransactionTableModel</name>
-    <message>
-        <source>Label</source>
-        <translation>Etiqueta</translation>
-    </message>
-    </context>
-<context>
-    <name>TransactionView</name>
-    <message>
-        <source>Exporting Failed</source>
-        <translation>Exportacón Fallida</translation>
-    </message>
-    <message>
-        <source>Comma separated file (*.csv)</source>
-        <translation>Archivo separado por comas (*.csv)</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Etiqueta</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>Dirección</translation>
-    </message>
-    </context>
 <context>
     <name>UnitDisplayStatusBarControl</name>
     </context>
-<context>
-    <name>WalletFrame</name>
-    </context>
-<context>
-    <name>WalletModel</name>
-    </context>
-<context>
-    <name>WalletView</name>
-    <message>
-        <source>&amp;Export</source>
-        <translation>&amp;Exportar</translation>
-    </message>
-    <message>
-        <source>Export the data in the current tab to a file</source>
-        <translation>Exporta los datos de la pestaña actual a un archivo</translation>
-    </message>
-    </context>
 <context>
     <name>bitcoin-core</name>
     </context>
diff --git a/src/qt/locale/bitcoin_es_MX.ts b/src/qt/locale/bitcoin_es_MX.ts
index b0dfa4ab7c54c..26432190a27cd 100644
--- a/src/qt/locale/bitcoin_es_MX.ts
+++ b/src/qt/locale/bitcoin_es_MX.ts
@@ -25,10 +25,6 @@
         <source>C&amp;lose</source>
         <translation>Cerrar</translation>
     </message>
-    <message>
-        <source>&amp;Copy Address</source>
-        <translation>&amp;Copiar dirección</translation>
-    </message>
     <message>
         <source>Delete the currently selected address from the list</source>
         <translation>Eliminar la dirección actualmente seleccionada de la lista</translation>
@@ -45,69 +41,6 @@
         <source>&amp;Delete</source>
         <translation>&amp;Borrar</translation>
     </message>
-    <message>
-        <source>Choose the address to send coins to</source>
-        <translation>Elija una dirección a la cual enviar monedas</translation>
-    </message>
-    <message>
-        <source>Choose the address to receive coins with</source>
-        <translation>Elija la dirección con la cual recibir monedas</translation>
-    </message>
-    <message>
-        <source>C&amp;hoose</source>
-        <translation>Elegir</translation>
-    </message>
-    <message>
-        <source>Sending addresses</source>
-        <translation>Enviando direcciones</translation>
-    </message>
-    <message>
-        <source>Receiving addresses</source>
-        <translation>Recibiendo direcciones</translation>
-    </message>
-    <message>
-        <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source>
-        <translation>Estas son tus direcciones de Bitcoin para enviar pagos. Siempre revise la cantidad y la dirección receptora antes de enviar monedas</translation>
-    </message>
-    <message>
-        <source>These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source>
-        <translation>Estas son tus direcciones Bitcoin para recibir pagos. Es recomendado usar una nueva dirección receptora para cada transacción.</translation>
-    </message>
-    <message>
-        <source>Copy &amp;Label</source>
-        <translation>Copiar &amp;Etiqueta</translation>
-    </message>
-    <message>
-        <source>&amp;Edit</source>
-        <translation>&amp;Editar</translation>
-    </message>
-    <message>
-        <source>Export Address List</source>
-        <translation>Exportar Lista de direcciones</translation>
-    </message>
-    <message>
-        <source>Comma separated file (*.csv)</source>
-        <translation>Archivo separado por comas (*.CSV)</translation>
-    </message>
-    <message>
-        <source>Exporting Failed</source>
-        <translation>Exportación fallida</translation>
-    </message>
-    </context>
-<context>
-    <name>AddressTableModel</name>
-    <message>
-        <source>Label</source>
-        <translation>Etiqueta</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>Dirección</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(sin etiqueta)</translation>
-    </message>
 </context>
 <context>
     <name>AskPassphraseDialog</name>
@@ -123,78 +56,6 @@
         <source>Repeat new passphrase</source>
         <translation>Repita la nueva contraseña</translation>
     </message>
-    <message>
-        <source>Encrypt wallet</source>
-        <translation>Encriptar cartera.</translation>
-    </message>
-    <message>
-        <source>This operation needs your wallet passphrase to unlock the wallet.</source>
-        <translation>Esta operación necesita la contraseña de su cartera para desbloquear su cartera.</translation>
-    </message>
-    <message>
-        <source>Unlock wallet</source>
-        <translation>Desbloquear cartera.</translation>
-    </message>
-    <message>
-        <source>This operation needs your wallet passphrase to decrypt the wallet.</source>
-        <translation>Esta operación necesita la contraseña de su cartera para desencriptar su cartera.</translation>
-    </message>
-    <message>
-        <source>Decrypt wallet</source>
-        <translation>Desencriptar cartera</translation>
-    </message>
-    <message>
-        <source>Change passphrase</source>
-        <translation>Cambiar contraseña</translation>
-    </message>
-    <message>
-        <source>Confirm wallet encryption</source>
-        <translation>Confirmar la encriptación de cartera</translation>
-    </message>
-    <message>
-        <source>Warning: If you encrypt your wallet and lose your passphrase, you will &lt;b&gt;LOSE ALL OF YOUR BITCOINS&lt;/b&gt;!</source>
-        <translation>Advertencia: Si encripta su cartera y pierde su contraseña, &lt;b&gt;PERDERÁ TODOS SUS BITCOINS&lt;/b&gt;!</translation>
-    </message>
-    <message>
-        <source>Are you sure you wish to encrypt your wallet?</source>
-        <translation>¿Está seguro que desea encriptar su cartera?</translation>
-    </message>
-    <message>
-        <source>Warning: The Caps Lock key is on!</source>
-        <translation>Advertencia: ¡La tecla Bloq Mayus está activada!</translation>
-    </message>
-    <message>
-        <source>Wallet encrypted</source>
-        <translation>Cartera encriptada</translation>
-    </message>
-    <message>
-        <source>Wallet encryption failed</source>
-        <translation>La encriptación de la cartera fallo</translation>
-    </message>
-    <message>
-        <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
-        <translation>La encriptación de la cartera falló debido a un error interno. Su cartera no fue encriptada.</translation>
-    </message>
-    <message>
-        <source>The supplied passphrases do not match.</source>
-        <translation>Las contraseñas dadas no coinciden</translation>
-    </message>
-    <message>
-        <source>Wallet unlock failed</source>
-        <translation>El desbloqueo de la cartera falló</translation>
-    </message>
-    <message>
-        <source>The passphrase entered for the wallet decryption was incorrect.</source>
-        <translation>La contraseña ingresada para la desencriptación de la cartera es incorrecta</translation>
-    </message>
-    <message>
-        <source>Wallet decryption failed</source>
-        <translation>La desencriptación de la cartera fallo</translation>
-    </message>
-    <message>
-        <source>Wallet passphrase was successfully changed.</source>
-        <translation>La contraseña de la cartera ha sido exitosamente cambiada.</translation>
-    </message>
 </context>
 <context>
     <name>BanTableModel</name>
@@ -273,14 +134,6 @@
         <source>Open &amp;URI...</source>
         <translation>Abrir &amp;URL...</translation>
     </message>
-    <message>
-        <source>Bitcoin Core client</source>
-        <translation>cliente Bitcoin Core</translation>
-    </message>
-    <message>
-        <source>Importing blocks from disk...</source>
-        <translation>Importando bloques desde el disco...</translation>
-    </message>
     <message>
         <source>Reindexing blocks on disk...</source>
         <translation>Reindexando bloques en el disco...</translation>
@@ -341,26 +194,10 @@
         <source>Tabs toolbar</source>
         <translation>Pestañas</translation>
     </message>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>nucleo Bitcoin</translation>
-    </message>
-    <message>
-        <source>&amp;About Bitcoin Core</source>
-        <translation>Acerca de Bitcoin Core</translation>
-    </message>
-    <message>
-        <source>Modify configuration options for Bitcoin Core</source>
-        <translation>Modificar las opciones de configuración de Bitcoin Core</translation>
-    </message>
     <message>
         <source>&amp;Command-line options</source>
         <translation>opciones de la &amp;Linea de comandos</translation>
     </message>
-    <message>
-        <source>Show the Bitcoin Core help message to get a list with possible Bitcoin command-line options</source>
-        <translation>Mostrar mensaje de ayuda del nucleo de Bitcoin para optener una lista con los posibles comandos  de Bitcoin</translation>
-    </message>
     <message>
         <source>Error</source>
         <translation>Error</translation>
@@ -398,9 +235,6 @@
         <translation>La cartera esta &lt;b&gt;encriptada&lt;/b&gt; y &lt;b&gt;bloqueada&lt;/b&gt; actualmente </translation>
     </message>
 </context>
-<context>
-    <name>ClientModel</name>
-    </context>
 <context>
     <name>CoinControlDialog</name>
     <message>
@@ -447,70 +281,6 @@
         <source>Priority</source>
         <translation>Prioridad</translation>
     </message>
-    <message>
-        <source>Copy address</source>
-        <translation>Copiar dirección </translation>
-    </message>
-    <message>
-        <source>Copy label</source>
-        <translation>Copiar etiqueta</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>Copiar monto</translation>
-    </message>
-    <message>
-        <source>Copy transaction ID</source>
-        <translation>Copiar identificación de la transacción. </translation>
-    </message>
-    <message>
-        <source>Copy quantity</source>
-        <translation>Copiar cantidad</translation>
-    </message>
-    <message>
-        <source>Copy fee</source>
-        <translation>Copiar cuota</translation>
-    </message>
-    <message>
-        <source>Copy after fee</source>
-        <translation>Copiar después de cuota</translation>
-    </message>
-    <message>
-        <source>Copy bytes</source>
-        <translation>Copiar bytes</translation>
-    </message>
-    <message>
-        <source>Copy priority</source>
-        <translation>Copiar prioridad</translation>
-    </message>
-    <message>
-        <source>Copy change</source>
-        <translation>Copiar cambio</translation>
-    </message>
-    <message>
-        <source>low</source>
-        <translation>Bajo</translation>
-    </message>
-    <message>
-        <source>none</source>
-        <translation>Ninguno </translation>
-    </message>
-    <message>
-        <source>yes</source>
-        <translation>si</translation>
-    </message>
-    <message>
-        <source>no</source>
-        <translation>no</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(sin etiqueta)</translation>
-    </message>
-    <message>
-        <source>(change)</source>
-        <translation>cambio</translation>
-    </message>
 </context>
 <context>
     <name>EditAddressDialog</name>
@@ -526,34 +296,6 @@
         <source>&amp;Address</source>
         <translation>&amp;Dirección</translation>
     </message>
-    <message>
-        <source>New receiving address</source>
-        <translation>Nueva dirección de recepción</translation>
-    </message>
-    <message>
-        <source>New sending address</source>
-        <translation>Nueva dirección de envío</translation>
-    </message>
-    <message>
-        <source>Edit receiving address</source>
-        <translation>Editar dirección de recepción</translation>
-    </message>
-    <message>
-        <source>Edit sending address</source>
-        <translation>Editar dirección de envío</translation>
-    </message>
-    <message>
-        <source>The entered address "%1" is already in the address book.</source>
-        <translation>La dirección ingresada "%1" ya existe en la libreta de direcciones</translation>
-    </message>
-    <message>
-        <source>Could not unlock wallet.</source>
-        <translation>No se puede desbloquear la cartera</translation>
-    </message>
-    <message>
-        <source>New key generation failed.</source>
-        <translation>La generación de la nueva clave fallo</translation>
-    </message>
 </context>
 <context>
     <name>FreespaceChecker</name>
@@ -564,10 +306,6 @@
     </context>
 <context>
     <name>HelpMessageDialog</name>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>nucleo Bitcoin</translation>
-    </message>
     <message>
         <source>version</source>
         <translation>versión</translation>
@@ -576,10 +314,6 @@
         <source>(%1-bit)</source>
         <translation>(%1-bit)</translation>
     </message>
-    <message>
-        <source>About Bitcoin Core</source>
-        <translation>Acerca de Bitcoin Core</translation>
-    </message>
     <message>
         <source>Command-line options</source>
         <translation>opciones de la Linea de comandos</translation>
@@ -595,10 +329,6 @@
     </context>
 <context>
     <name>Intro</name>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>nucleo Bitcoin</translation>
-    </message>
     <message>
         <source>Error</source>
         <translation>Error</translation>
@@ -633,9 +363,6 @@
         <translation>Formulario</translation>
     </message>
     </context>
-<context>
-    <name>PaymentServer</name>
-    </context>
 <context>
     <name>PeerTableModel</name>
     </context>
@@ -646,9 +373,6 @@
         <translation>Monto</translation>
     </message>
     </context>
-<context>
-    <name>QRImageWidget</name>
-    </context>
 <context>
     <name>RPCConsole</name>
     <message>
@@ -682,60 +406,13 @@
         <source>An optional amount to request. Leave this empty or zero to not request a specific amount.</source>
         <translation>Monto opcional a solicitar. Dejarlo vacion o en cero no solicita un monto especifico.</translation>
     </message>
-    <message>
-        <source>Copy label</source>
-        <translation>Copiar etiqueta</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>Copiar monto</translation>
-    </message>
-</context>
+    </context>
 <context>
     <name>ReceiveRequestDialog</name>
     <message>
         <source>Copy &amp;Address</source>
         <translation>&amp;Copiar dirección</translation>
     </message>
-    <message>
-        <source>Address</source>
-        <translation>Dirección</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>Monto</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Etiqueta</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>Mensaje</translation>
-    </message>
-    </context>
-<context>
-    <name>RecentRequestsTableModel</name>
-    <message>
-        <source>Date</source>
-        <translation>Fecha</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Etiqueta</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>Mensaje</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>Monto</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(sin etiqueta)</translation>
-    </message>
     </context>
 <context>
     <name>SendCoinsDialog</name>
@@ -787,66 +464,6 @@
         <source>Confirm the send action</source>
         <translation>Confirme la acción de enviar</translation>
     </message>
-    <message>
-        <source>Confirm send coins</source>
-        <translation>Confirme para enviar monedas</translation>
-    </message>
-    <message>
-        <source>Copy quantity</source>
-        <translation>Copiar cantidad</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>Copiar monto</translation>
-    </message>
-    <message>
-        <source>Copy fee</source>
-        <translation>Copiar cuota</translation>
-    </message>
-    <message>
-        <source>Copy after fee</source>
-        <translation>Copiar después de cuota</translation>
-    </message>
-    <message>
-        <source>Copy bytes</source>
-        <translation>Copiar bytes</translation>
-    </message>
-    <message>
-        <source>Copy priority</source>
-        <translation>Copiar prioridad</translation>
-    </message>
-    <message>
-        <source>Copy change</source>
-        <translation>Copiar cambio</translation>
-    </message>
-    <message>
-        <source>or</source>
-        <translation>o</translation>
-    </message>
-    <message>
-        <source>The amount to pay must be larger than 0.</source>
-        <translation>El monto a pagar debe ser mayor a 0</translation>
-    </message>
-    <message>
-        <source>Transaction creation failed!</source>
-        <translation>¡La creación de la transación falló!</translation>
-    </message>
-    <message>
-        <source>The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source>
-        <translation>¡La transación fue rechazada! Esto puede ocurrir si algunas de tus monedas en tu cartera han sido gastadas, al igual que si usas una cartera copiada y la monedas fueron gastadas en la copia pero no se marcaron como gastadas.</translation>
-    </message>
-    <message>
-        <source>Warning: Invalid Bitcoin address</source>
-        <translation>Advertencia: Dirección de Bitcoin invalida</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(sin etiqueta)</translation>
-    </message>
-    <message>
-        <source>Warning: Unknown change address</source>
-        <translation>Advertencia: Cambio de dirección desconocido</translation>
-    </message>
     </context>
 <context>
     <name>SendCoinsEntry</name>
@@ -858,10 +475,6 @@
         <source>Pay &amp;To:</source>
         <translation>Pagar &amp;a:</translation>
     </message>
-    <message>
-        <source>Enter a label for this address to add it to your address book</source>
-        <translation>Ingrese una etiqueta para esta dirección para agregarlo en su libreta de direcciones.</translation>
-    </message>
     <message>
         <source>&amp;Label:</source>
         <translation>&amp;Etiqueta</translation>
@@ -897,10 +510,6 @@
     </context>
 <context>
     <name>ShutdownWindow</name>
-    <message>
-        <source>Bitcoin Core is shutting down...</source>
-        <translation>Apagando el nucleo de Bitcoin...</translation>
-    </message>
     <message>
         <source>Do not shut down the computer until this window disappears.</source>
         <translation>No apague su computadora hasta que esta ventana desaparesca.</translation>
@@ -927,324 +536,30 @@
     </context>
 <context>
     <name>SplashScreen</name>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Bitcoin Core</translation>
-    </message>
-    <message>
-        <source>The Bitcoin Core developers</source>
-        <translation>Los desarrolladores de Bitcoin Core</translation>
-    </message>
     </context>
 <context>
     <name>TrafficGraphWidget</name>
     </context>
-<context>
-    <name>TransactionDesc</name>
-    <message>
-        <source>Open until %1</source>
-        <translation>Abrir hasta %1</translation>
-    </message>
-    <message>
-        <source>%1/unconfirmed</source>
-        <translation>%1/No confirmado</translation>
-    </message>
-    <message>
-        <source>%1 confirmations</source>
-        <translation>%1 confirmaciones</translation>
-    </message>
-    <message>
-        <source>Status</source>
-        <translation>Estado</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation>Fecha</translation>
-    </message>
-    <message>
-        <source>From</source>
-        <translation>De</translation>
-    </message>
-    <message>
-        <source>To</source>
-        <translation>Para</translation>
-    </message>
-    <message>
-        <source>label</source>
-        <translation>etiqueta</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>Mensaje</translation>
-    </message>
-    <message>
-        <source>Comment</source>
-        <translation>Comentario</translation>
-    </message>
-    <message>
-        <source>Transaction ID</source>
-        <translation>ID</translation>
-    </message>
-    <message>
-        <source>Transaction</source>
-        <translation>Transacción</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>Monto</translation>
-    </message>
-    <message>
-        <source>, has not been successfully broadcast yet</source>
-        <translation>, no ha sido transmitido aun</translation>
-    </message>
-    <message>
-        <source>unknown</source>
-        <translation>desconocido</translation>
-    </message>
-</context>
 <context>
     <name>TransactionDescDialog</name>
-    <message>
-        <source>Transaction details</source>
-        <translation>Detalles de la transacción</translation>
-    </message>
     <message>
         <source>This pane shows a detailed description of the transaction</source>
         <translation>Este panel muestras una descripción detallada de la transacción</translation>
     </message>
 </context>
-<context>
-    <name>TransactionTableModel</name>
-    <message>
-        <source>Date</source>
-        <translation>Fecha</translation>
-    </message>
-    <message>
-        <source>Type</source>
-        <translation>Tipo</translation>
-    </message>
-    <message>
-        <source>Open until %1</source>
-        <translation>Abrir hasta %1</translation>
-    </message>
-    <message>
-        <source>Confirmed (%1 confirmations)</source>
-        <translation>Confimado (%1 confirmaciones)</translation>
-    </message>
-    <message>
-        <source>This block was not received by any other nodes and will probably not be accepted!</source>
-        <translation>Este bloque no fue recibido por ningun nodo y probablemente no fue aceptado !</translation>
-    </message>
-    <message>
-        <source>Generated but not accepted</source>
-        <translation>Generado pero no aprovado</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Etiqueta</translation>
-    </message>
-    <message>
-        <source>Received with</source>
-        <translation>Recibido con</translation>
-    </message>
-    <message>
-        <source>Sent to</source>
-        <translation>Enviar a</translation>
-    </message>
-    <message>
-        <source>Payment to yourself</source>
-        <translation>Pagar a si mismo</translation>
-    </message>
-    <message>
-        <source>Mined</source>
-        <translation>Minado </translation>
-    </message>
-    <message>
-        <source>(n/a)</source>
-        <translation>(n/a)</translation>
-    </message>
-    <message>
-        <source>Date and time that the transaction was received.</source>
-        <translation>Fecha y hora en que la transacción fue recibida </translation>
-    </message>
-    <message>
-        <source>Type of transaction.</source>
-        <translation>Escriba una transacción</translation>
-    </message>
-    <message>
-        <source>Amount removed from or added to balance.</source>
-        <translation>Cantidad removida del saldo o agregada </translation>
-    </message>
-</context>
-<context>
-    <name>TransactionView</name>
-    <message>
-        <source>All</source>
-        <translation>Todo</translation>
-    </message>
-    <message>
-        <source>Today</source>
-        <translation>Hoy</translation>
-    </message>
-    <message>
-        <source>This week</source>
-        <translation>Esta semana </translation>
-    </message>
-    <message>
-        <source>This month</source>
-        <translation>Este mes </translation>
-    </message>
-    <message>
-        <source>Last month</source>
-        <translation>El mes pasado </translation>
-    </message>
-    <message>
-        <source>This year</source>
-        <translation>Este año</translation>
-    </message>
-    <message>
-        <source>Received with</source>
-        <translation>Recibido con</translation>
-    </message>
-    <message>
-        <source>Sent to</source>
-        <translation>Enviar a</translation>
-    </message>
-    <message>
-        <source>To yourself</source>
-        <translation>Para ti mismo</translation>
-    </message>
-    <message>
-        <source>Mined</source>
-        <translation>Minado </translation>
-    </message>
-    <message>
-        <source>Other</source>
-        <translation>Otro</translation>
-    </message>
-    <message>
-        <source>Enter address or label to search</source>
-        <translation>Ingrese dirección o capa a buscar </translation>
-    </message>
-    <message>
-        <source>Min amount</source>
-        <translation>Monto minimo </translation>
-    </message>
-    <message>
-        <source>Copy address</source>
-        <translation>Copiar dirección </translation>
-    </message>
-    <message>
-        <source>Copy label</source>
-        <translation>Copiar capa </translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>copiar monto</translation>
-    </message>
-    <message>
-        <source>Copy transaction ID</source>
-        <translation>Copiar identificación de la transacción. </translation>
-    </message>
-    <message>
-        <source>Edit label</source>
-        <translation>Editar capa </translation>
-    </message>
-    <message>
-        <source>Export Transaction History</source>
-        <translation>Exportar el historial de transacción</translation>
-    </message>
-    <message>
-        <source>Exporting Failed</source>
-        <translation>Exportación fallida</translation>
-    </message>
-    <message>
-        <source>There was an error trying to save the transaction history to %1.</source>
-        <translation>Ocurrio un error intentando guardar el historial de transaciones a %1</translation>
-    </message>
-    <message>
-        <source>Exporting Successful</source>
-        <translation>Exportacion satisfactoria</translation>
-    </message>
-    <message>
-        <source>The transaction history was successfully saved to %1.</source>
-        <translation>el historial de transaciones ha sido guardado exitosamente en %1</translation>
-    </message>
-    <message>
-        <source>Comma separated file (*.csv)</source>
-        <translation>Arhchivo separado por comas (*.CSV)</translation>
-    </message>
-    <message>
-        <source>Confirmed</source>
-        <translation>Confirmado </translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation>Fecha</translation>
-    </message>
-    <message>
-        <source>Type</source>
-        <translation>Tipo</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Etiqueta</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>Domicilio</translation>
-    </message>
-    <message>
-        <source>ID</source>
-        <translation>ID</translation>
-    </message>
-    <message>
-        <source>to</source>
-        <translation>Para</translation>
-    </message>
-</context>
 <context>
     <name>UnitDisplayStatusBarControl</name>
     </context>
-<context>
-    <name>WalletFrame</name>
-    <message>
-        <source>No wallet has been loaded.</source>
-        <translation>No se há cargado la cartera.</translation>
-    </message>
-</context>
-<context>
-    <name>WalletModel</name>
-    <message>
-        <source>Send Coins</source>
-        <translation>Mandar monedas</translation>
-    </message>
-</context>
-<context>
-    <name>WalletView</name>
-    <message>
-        <source>&amp;Export</source>
-        <translation>&amp;Exportar</translation>
-    </message>
-    <message>
-        <source>Export the data in the current tab to a file</source>
-        <translation>Exportar la información en la tabla actual a un archivo</translation>
-    </message>
-    <message>
-        <source>There was an error trying to save the wallet data to %1.</source>
-        <translation>Ocurrio un error tratando de guardar la información de la cartera %1</translation>
-    </message>
-    <message>
-        <source>The wallet data was successfully saved to %1.</source>
-        <translation>La información de la cartera fué guardada exitosamente a %1</translation>
-    </message>
-    </context>
 <context>
     <name>bitcoin-core</name>
     <message>
         <source>Options:</source>
         <translation>Opciones:</translation>
     </message>
+    <message>
+        <source>Bitcoin Core</source>
+        <translation>nucleo Bitcoin</translation>
+    </message>
     <message>
         <source>&lt;category&gt; can be:</source>
         <translation>&lt;categoria&gt; puede ser:</translation>
diff --git a/src/qt/locale/bitcoin_es_UY.ts b/src/qt/locale/bitcoin_es_UY.ts
index 32d433d6ec3d6..8d361620de1b3 100644
--- a/src/qt/locale/bitcoin_es_UY.ts
+++ b/src/qt/locale/bitcoin_es_UY.ts
@@ -25,10 +25,6 @@
         <source>C&amp;lose</source>
         <translation>Cerrar</translation>
     </message>
-    <message>
-        <source>&amp;Copy Address</source>
-        <translation>Copiar Dirección</translation>
-    </message>
     <message>
         <source>&amp;Export</source>
         <translation>Exportar</translation>
@@ -37,50 +33,6 @@
         <source>&amp;Delete</source>
         <translation>&amp;Borrar</translation>
     </message>
-    <message>
-        <source>Choose the address to send coins to</source>
-        <translation>Elige una dirección donde enviar monedas a</translation>
-    </message>
-    <message>
-        <source>Sending addresses</source>
-        <translation>Enviando direcciones</translation>
-    </message>
-    <message>
-        <source>Receiving addresses</source>
-        <translation>Recibiendo direcciones
-</translation>
-    </message>
-    <message>
-        <source>&amp;Edit</source>
-        <translation>Editar</translation>
-    </message>
-    <message>
-        <source>Export Address List</source>
-        <translation>Exportar Lista de Direcciones</translation>
-    </message>
-    <message>
-        <source>Comma separated file (*.csv)</source>
-        <translation>Archivos separados por coma (*.csv)</translation>
-    </message>
-    <message>
-        <source>Exporting Failed</source>
-        <translation>Exportación fallida</translation>
-    </message>
-    </context>
-<context>
-    <name>AddressTableModel</name>
-    <message>
-        <source>Label</source>
-        <translation>Etiqueta</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>Direccion </translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(Sin etiqueta)</translation>
-    </message>
 </context>
 <context>
     <name>AskPassphraseDialog</name>
@@ -96,71 +48,7 @@
         <source>Repeat new passphrase</source>
         <translation>Repetir nueva contraseña</translation>
     </message>
-    <message>
-        <source>Encrypt wallet</source>
-        <translation>Monedero cifrado</translation>
-    </message>
-    <message>
-        <source>This operation needs your wallet passphrase to unlock the wallet.</source>
-        <translation>Esta operacion necesita la contraseña del monedero para desbloquear el mismo</translation>
-    </message>
-    <message>
-        <source>Unlock wallet</source>
-        <translation>Monedero destrabado</translation>
-    </message>
-    <message>
-        <source>This operation needs your wallet passphrase to decrypt the wallet.</source>
-        <translation>Esta operacion necesita la contraseña del monedero para descifrar el mismo</translation>
-    </message>
-    <message>
-        <source>Decrypt wallet</source>
-        <translation>Monedero descifrado</translation>
-    </message>
-    <message>
-        <source>Change passphrase</source>
-        <translation>Cambiar contraseña</translation>
-    </message>
-    <message>
-        <source>Confirm wallet encryption</source>
-        <translation>Confirme el cifrado del monedero</translation>
-    </message>
-    <message>
-        <source>Are you sure you wish to encrypt your wallet?</source>
-        <translation>Estas seguro que deseas encriptar tu billetera?</translation>
-    </message>
-    <message>
-        <source>Warning: The Caps Lock key is on!</source>
-        <translation>Atención: la tecla Mayusculas esta activa!</translation>
-    </message>
-    <message>
-        <source>Wallet encrypted</source>
-        <translation>Monedero cifrado</translation>
-    </message>
-    <message>
-        <source>Wallet encryption failed</source>
-        <translation>Fallo en el cifrado del monedero</translation>
-    </message>
-    <message>
-        <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
-        <translation>Fallo en el cifrado del monedero a causa de un error interno. Su monedero no esta cifrado</translation>
-    </message>
-    <message>
-        <source>The supplied passphrases do not match.</source>
-        <translation>Las contraseñas suministradas no coinciden.</translation>
-    </message>
-    <message>
-        <source>Wallet unlock failed</source>
-        <translation>Fallo en el desbloqueo del mondero</translation>
-    </message>
-    <message>
-        <source>The passphrase entered for the wallet decryption was incorrect.</source>
-        <translation>La contraseña introducida para el descifrado del monedero es incorrecta.</translation>
-    </message>
-    <message>
-        <source>Wallet decryption failed</source>
-        <translation>Fallo en el descifrado del monedero</translation>
-    </message>
-    </context>
+</context>
 <context>
     <name>BanTableModel</name>
     </context>
@@ -302,9 +190,6 @@
         <translation>El Monedero esta &lt;b&gt;cifrado&lt;/b&gt; y actualmente &lt;b&gt;bloqueado&lt;/b&gt;</translation>
     </message>
 </context>
-<context>
-    <name>ClientModel</name>
-    </context>
 <context>
     <name>CoinControlDialog</name>
     <message>
@@ -339,11 +224,7 @@
         <source>Priority</source>
         <translation>Prioridad</translation>
     </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(Sin etiqueta)</translation>
-    </message>
-    </context>
+</context>
 <context>
     <name>EditAddressDialog</name>
     <message>
@@ -358,34 +239,6 @@
         <source>&amp;Address</source>
         <translation>&amp;Direccion </translation>
     </message>
-    <message>
-        <source>New receiving address</source>
-        <translation>Nueva dirección de recepción </translation>
-    </message>
-    <message>
-        <source>New sending address</source>
-        <translation>Nueva dirección de envío </translation>
-    </message>
-    <message>
-        <source>Edit receiving address</source>
-        <translation>Editar dirección de recepcion </translation>
-    </message>
-    <message>
-        <source>Edit sending address</source>
-        <translation>Editar dirección de envío </translation>
-    </message>
-    <message>
-        <source>The entered address "%1" is already in the address book.</source>
-        <translation>La dirección introducida "%1" ya está en la libreta de direcciones.</translation>
-    </message>
-    <message>
-        <source>Could not unlock wallet.</source>
-        <translation>No se puede abrir el monedero.</translation>
-    </message>
-    <message>
-        <source>New key generation failed.</source>
-        <translation>Fallo en la nueva clave generada.</translation>
-    </message>
 </context>
 <context>
     <name>FreespaceChecker</name>
@@ -421,18 +274,12 @@
         <translation>Formulario</translation>
     </message>
     </context>
-<context>
-    <name>PaymentServer</name>
-    </context>
 <context>
     <name>PeerTableModel</name>
     </context>
 <context>
     <name>QObject</name>
     </context>
-<context>
-    <name>QRImageWidget</name>
-    </context>
 <context>
     <name>RPCConsole</name>
     <message>
@@ -453,29 +300,6 @@
         <source>Copy &amp;Address</source>
         <translation>Copiar Dirección</translation>
     </message>
-    <message>
-        <source>Address</source>
-        <translation>Direccion </translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Etiqueta</translation>
-    </message>
-    </context>
-<context>
-    <name>RecentRequestsTableModel</name>
-    <message>
-        <source>Date</source>
-        <translation>Fecha</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Etiqueta</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(Sin etiqueta)</translation>
-    </message>
     </context>
 <context>
     <name>SendCoinsDialog</name>
@@ -515,18 +339,6 @@
         <source>Confirm the send action</source>
         <translation>Confirmar el envío</translation>
     </message>
-    <message>
-        <source>Confirm send coins</source>
-        <translation>Confirmar el envio de monedas</translation>
-    </message>
-    <message>
-        <source>The amount to pay must be larger than 0.</source>
-        <translation>La cantidad a pagar debe ser mayor que 0.</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(Sin etiqueta)</translation>
-    </message>
     </context>
 <context>
     <name>SendCoinsEntry</name>
@@ -538,10 +350,6 @@
         <source>Pay &amp;To:</source>
         <translation>Pagar &amp;A:</translation>
     </message>
-    <message>
-        <source>Enter a label for this address to add it to your address book</source>
-        <translation>Introduzca una etiqueta para esta dirección para añadirla a su libreta de direcciones</translation>
-    </message>
     <message>
         <source>&amp;Label:</source>
         <translation>&amp;Etiqueta:</translation>
@@ -591,90 +399,12 @@
 <context>
     <name>TrafficGraphWidget</name>
     </context>
-<context>
-    <name>TransactionDesc</name>
-    <message>
-        <source>Open until %1</source>
-        <translation>Abrir hasta %1</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation>Fecha</translation>
-    </message>
-    <message>
-        <source>Transaction</source>
-        <translation>Transaccion</translation>
-    </message>
-    <message>
-        <source>unknown</source>
-        <translation>desconocido</translation>
-    </message>
-</context>
 <context>
     <name>TransactionDescDialog</name>
     </context>
-<context>
-    <name>TransactionTableModel</name>
-    <message>
-        <source>Date</source>
-        <translation>Fecha</translation>
-    </message>
-    <message>
-        <source>Open until %1</source>
-        <translation>Abrir hasta %1</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Etiqueta</translation>
-    </message>
-    </context>
-<context>
-    <name>TransactionView</name>
-    <message>
-        <source>Exporting Failed</source>
-        <translation>Exportación fallida</translation>
-    </message>
-    <message>
-        <source>Comma separated file (*.csv)</source>
-        <translation>Archivos separados por coma (*.csv)</translation>
-    </message>
-    <message>
-        <source>Confirmed</source>
-        <translation>Confirmado</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation>Fecha</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Etiqueta</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>Direccion </translation>
-    </message>
-    </context>
 <context>
     <name>UnitDisplayStatusBarControl</name>
     </context>
-<context>
-    <name>WalletFrame</name>
-    </context>
-<context>
-    <name>WalletModel</name>
-    <message>
-        <source>Send Coins</source>
-        <translation>Enviar monedas</translation>
-    </message>
-</context>
-<context>
-    <name>WalletView</name>
-    <message>
-        <source>&amp;Export</source>
-        <translation>Exportar</translation>
-    </message>
-    </context>
 <context>
     <name>bitcoin-core</name>
     <message>
diff --git a/src/qt/locale/bitcoin_es_VE.ts b/src/qt/locale/bitcoin_es_VE.ts
index 582e72884607f..432adc57eeaa0 100644
--- a/src/qt/locale/bitcoin_es_VE.ts
+++ b/src/qt/locale/bitcoin_es_VE.ts
@@ -22,8 +22,8 @@
         <translation>&amp;Copiar</translation>
     </message>
     <message>
-        <source>&amp;Copy Address</source>
-        <translation>&amp;Copiar Dirección</translation>
+        <source>C&amp;lose</source>
+        <translation>C&amp;errar</translation>
     </message>
     <message>
         <source>Delete the currently selected address from the list</source>
@@ -41,69 +41,6 @@
         <source>&amp;Delete</source>
         <translation>&amp;Borrar</translation>
     </message>
-    <message>
-        <source>Choose the address to send coins to</source>
-        <translation>Elige la dirección para enviar monedas</translation>
-    </message>
-    <message>
-        <source>Choose the address to receive coins with</source>
-        <translation>Elige la dirección para recibir monedas</translation>
-    </message>
-    <message>
-        <source>Sending addresses</source>
-        <translation>Envío de direcciones</translation>
-    </message>
-    <message>
-        <source>Receiving addresses</source>
-        <translation>Recepción de direcciones</translation>
-    </message>
-    <message>
-        <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source>
-        <translation>Estas son tus direcciones Bitcoin para realizar pagos. Siempre checa el monto y la dirección de recepción antes de enviar monedas.</translation>
-    </message>
-    <message>
-        <source>These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source>
-        <translation>Estas son tus direcciones Bitcoin para recibir pagos. Es recomendable usar una nueva dirección para cada transacción.</translation>
-    </message>
-    <message>
-        <source>Copy &amp;Label</source>
-        <translation>Copiar &amp;Etiqueta</translation>
-    </message>
-    <message>
-        <source>&amp;Edit</source>
-        <translation>&amp;Editar</translation>
-    </message>
-    <message>
-        <source>Export Address List</source>
-        <translation>Exportar lista de direcciones</translation>
-    </message>
-    <message>
-        <source>Comma separated file (*.csv)</source>
-        <translation>Archivo separado por comas (*.csv)</translation>
-    </message>
-    <message>
-        <source>Exporting Failed</source>
-        <translation>Exportación fallida</translation>
-    </message>
-    <message>
-        <source>There was an error trying to save the address list to %1. Please try again.</source>
-        <translation>Hubo un error intentando guardar la lista de direcciones al %1. Por favor intente nuevamente.</translation>
-    </message>
-</context>
-<context>
-    <name>AddressTableModel</name>
-    <message>
-        <source>Label</source>
-        <translation>Etiqueta</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>Dirección</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(sin etiqueta)</translation>
-    </message>
 </context>
 <context>
     <name>AskPassphraseDialog</name>
@@ -123,86 +60,6 @@
         <source>Repeat new passphrase</source>
         <translation>Repetir nueva frase de contraseña</translation>
     </message>
-    <message>
-        <source>Encrypt wallet</source>
-        <translation>Encriptar billetera</translation>
-    </message>
-    <message>
-        <source>This operation needs your wallet passphrase to unlock the wallet.</source>
-        <translation>Esta operación necesita tu frase de contraseña de la billetera para desbloquearla.</translation>
-    </message>
-    <message>
-        <source>Unlock wallet</source>
-        <translation>Desbloquear billetera</translation>
-    </message>
-    <message>
-        <source>This operation needs your wallet passphrase to decrypt the wallet.</source>
-        <translation>Esta operacción necesita tu frase de contraseña para desepcriptar la billetera</translation>
-    </message>
-    <message>
-        <source>Decrypt wallet</source>
-        <translation>Desencriptar billetera</translation>
-    </message>
-    <message>
-        <source>Change passphrase</source>
-        <translation>Cambiar frase secreta</translation>
-    </message>
-    <message>
-        <source>Confirm wallet encryption</source>
-        <translation>Confirmar encriptación de billetera</translation>
-    </message>
-    <message>
-        <source>Warning: If you encrypt your wallet and lose your passphrase, you will &lt;b&gt;LOSE ALL OF YOUR BITCOINS&lt;/b&gt;!</source>
-        <translation>Aviso: Si encriptas tu billetera y pierdes tu frase secreta, ¡PERDERÁS TODOS TUS BITCOINS!</translation>
-    </message>
-    <message>
-        <source>Are you sure you wish to encrypt your wallet?</source>
-        <translation>¿Está seguro que desea encriptar su billetera?</translation>
-    </message>
-    <message>
-        <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source>
-        <translation>IMPORTANTE: Algunas copias de seguridad que hayas hecho de tu archivo de billetera deberían ser reemplazadas con la billetera encriptada generada recientemente. Por razones de seguridad, las copias de seguridad previas del archivo de billetera sin cifrar serán inútiles tan pronto uses la nueva billetera encriptada.</translation>
-    </message>
-    <message>
-        <source>Warning: The Caps Lock key is on!</source>
-        <translation>Aviso: El bloqueo de mayúsculas está activado.</translation>
-    </message>
-    <message>
-        <source>Wallet encrypted</source>
-        <translation>Billetera encriptada</translation>
-    </message>
-    <message>
-        <source>Enter the new passphrase to the wallet.&lt;br/&gt;Please use a passphrase of &lt;b&gt;ten or more random characters&lt;/b&gt;, or &lt;b&gt;eight or more words&lt;/b&gt;.</source>
-        <translation>Introduce la nueva frase secreta a la billetera. Por favor use una frase secreta de diez o más caracteres aleatorios, u ocho o más palabras.</translation>
-    </message>
-    <message>
-        <source>Wallet encryption failed</source>
-        <translation>Encriptación de billetera fallida</translation>
-    </message>
-    <message>
-        <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
-        <translation>Encriptación de billetera fallida debido a un error interno. Tu billetera no fue encriptada.</translation>
-    </message>
-    <message>
-        <source>The supplied passphrases do not match.</source>
-        <translation>Las frases secretas introducidas no concuerdan.</translation>
-    </message>
-    <message>
-        <source>Wallet unlock failed</source>
-        <translation>Desbloqueo de billetera fallido</translation>
-    </message>
-    <message>
-        <source>The passphrase entered for the wallet decryption was incorrect.</source>
-        <translation>La frase secreta introducida para la desencriptación de la billetera fué incorrecta.</translation>
-    </message>
-    <message>
-        <source>Wallet decryption failed</source>
-        <translation>Desencriptación de billetera fallida</translation>
-    </message>
-    <message>
-        <source>Wallet passphrase was successfully changed.</source>
-        <translation>La frase secreta de la billetera fué cambiada exitosamente.</translation>
-    </message>
 </context>
 <context>
     <name>BanTableModel</name>
@@ -234,20 +91,20 @@
         <translation>Buscar historial de transacciones</translation>
     </message>
     <message>
-        <source>Quit application</source>
-        <translation>Quitar aplicación</translation>
+        <source>E&amp;xit</source>
+        <translation>S&amp;alir</translation>
     </message>
     <message>
-        <source>&amp;Receiving addresses...</source>
-        <translation>Recepción de direcciones</translation>
+        <source>Quit application</source>
+        <translation>Quitar aplicación</translation>
     </message>
     <message>
-        <source>Bitcoin Core client</source>
-        <translation>Cliente Bitcoin Core</translation>
+        <source>&amp;Options...</source>
+        <translation>&amp;Opciones...</translation>
     </message>
     <message>
-        <source>Importing blocks from disk...</source>
-        <translation>Importando bloques desde el disco...</translation>
+        <source>&amp;Receiving addresses...</source>
+        <translation>Recepción de direcciones</translation>
     </message>
     <message>
         <source>Reindexing blocks on disk...</source>
@@ -285,10 +142,6 @@
         <source>&amp;Receive</source>
         <translation>&amp;Recibir</translation>
     </message>
-    <message>
-        <source>Show information about Bitcoin Core</source>
-        <translation>Mostrar información acerca de Bitcoin Core</translation>
-    </message>
     <message>
         <source>&amp;Show / Hide</source>
         <translation>&amp;Mostar / Ocultar</translation>
@@ -317,14 +170,6 @@
         <source>&amp;Settings</source>
         <translation>&amp;Configuración</translation>
     </message>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Bitcoin Core</translation>
-    </message>
-    <message>
-        <source>&amp;About Bitcoin Core</source>
-        <translation>Acerca de Bitcoin Core</translation>
-    </message>
     <message>
         <source>&amp;Command-line options</source>
         <translation>Opciones de línea de comandos</translation>
@@ -382,13 +227,6 @@
         <translation>La billetera está encriptada y bloqueada recientemente</translation>
     </message>
 </context>
-<context>
-    <name>ClientModel</name>
-    <message>
-        <source>Network Alert</source>
-        <translation>Alerta de red</translation>
-    </message>
-</context>
 <context>
     <name>CoinControlDialog</name>
     <message>
@@ -463,134 +301,6 @@
         <source>Priority</source>
         <translation>Prioridad</translation>
     </message>
-    <message>
-        <source>Copy address</source>
-        <translation>Copiar dirección</translation>
-    </message>
-    <message>
-        <source>Copy label</source>
-        <translation>Copiar etiqueta</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>Copiar monto</translation>
-    </message>
-    <message>
-        <source>Copy transaction ID</source>
-        <translation>Copiar ID de la transacción</translation>
-    </message>
-    <message>
-        <source>Lock unspent</source>
-        <translation>Bloqueo no gastado</translation>
-    </message>
-    <message>
-        <source>Unlock unspent</source>
-        <translation>Desbloqueo no gastado</translation>
-    </message>
-    <message>
-        <source>Copy quantity</source>
-        <translation>Copiar cantidad</translation>
-    </message>
-    <message>
-        <source>Copy fee</source>
-        <translation>Copiar comisión</translation>
-    </message>
-    <message>
-        <source>Copy bytes</source>
-        <translation>Copiar bytes</translation>
-    </message>
-    <message>
-        <source>Copy priority</source>
-        <translation>Copiar prioridad</translation>
-    </message>
-    <message>
-        <source>Copy dust</source>
-        <translation>Copiar dust</translation>
-    </message>
-    <message>
-        <source>Copy change</source>
-        <translation>Copiar cambio</translation>
-    </message>
-    <message>
-        <source>highest</source>
-        <translation>Más alto</translation>
-    </message>
-    <message>
-        <source>higher</source>
-        <translation>superior</translation>
-    </message>
-    <message>
-        <source>high</source>
-        <translation>alto</translation>
-    </message>
-    <message>
-        <source>medium-high</source>
-        <translation>medio-alto</translation>
-    </message>
-    <message>
-        <source>medium</source>
-        <translation>medio</translation>
-    </message>
-    <message>
-        <source>low-medium</source>
-        <translation>bajo-medio</translation>
-    </message>
-    <message>
-        <source>low</source>
-        <translation>bajo</translation>
-    </message>
-    <message>
-        <source>lower</source>
-        <translation>inferior</translation>
-    </message>
-    <message>
-        <source>lowest</source>
-        <translation>más bajo</translation>
-    </message>
-    <message>
-        <source>(%1 locked)</source>
-        <translation>(%1 bloqueado)</translation>
-    </message>
-    <message>
-        <source>none</source>
-        <translation>ninguno</translation>
-    </message>
-    <message>
-        <source>Can vary +/- %1 satoshi(s) per input.</source>
-        <translation>Puede variar +/- %1 satoshi(s) por entrada.</translation>
-    </message>
-    <message>
-        <source>yes</source>
-        <translation>si</translation>
-    </message>
-    <message>
-        <source>no</source>
-        <translation>no</translation>
-    </message>
-    <message>
-        <source>This means a fee of at least %1 per kB is required.</source>
-        <translation>Esto significa que se requiere al menos de una comisión de %1 por kB</translation>
-    </message>
-    <message>
-        <source>Can vary +/- 1 byte per input.</source>
-        <translation>Puede variar +/- 1 byte por entrada.</translation>
-    </message>
-    <message>
-        <source>Transactions with higher priority are more likely to get included into a block.</source>
-        <translation>Transacciones con mayor prioridad son más probables de ser incluidas en un bloque.</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(sin etiqueta)</translation>
-    </message>
-    <message>
-        <source>change from %1 (%2)</source>
-        <translation>Cambio desde %1 (%2)</translation>
-    </message>
-    <message>
-        <source>(change)</source>
-        <translation>(cambio)</translation>
-    </message>
 </context>
 <context>
     <name>EditAddressDialog</name>
@@ -614,38 +324,6 @@
         <source>&amp;Address</source>
         <translation>&amp;Dirección</translation>
     </message>
-    <message>
-        <source>New receiving address</source>
-        <translation>Nueva dirección de recibo</translation>
-    </message>
-    <message>
-        <source>New sending address</source>
-        <translation>Nueva dirección de envío</translation>
-    </message>
-    <message>
-        <source>Edit receiving address</source>
-        <translation>Editar dirección de envío</translation>
-    </message>
-    <message>
-        <source>Edit sending address</source>
-        <translation>Editar dirección de envío</translation>
-    </message>
-    <message>
-        <source>The entered address "%1" is already in the address book.</source>
-        <translation>La dirección introducida "%1" ya está en el libro de direcciones.</translation>
-    </message>
-    <message>
-        <source>The entered address "%1" is not a valid Bitcoin address.</source>
-        <translation>La dirección introducida "%1" no es una dirección Bitcoin válida.</translation>
-    </message>
-    <message>
-        <source>Could not unlock wallet.</source>
-        <translation>No se pudo desbloquear la billetera.</translation>
-    </message>
-    <message>
-        <source>New key generation failed.</source>
-        <translation>Creación de la nueva llave fallida</translation>
-    </message>
 </context>
 <context>
     <name>FreespaceChecker</name>
@@ -672,10 +350,6 @@
 </context>
 <context>
     <name>HelpMessageDialog</name>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Bitcoin Core</translation>
-    </message>
     <message>
         <source>version</source>
         <translation>versión</translation>
@@ -684,10 +358,6 @@
         <source>(%1-bit)</source>
         <translation>(%1-bit)</translation>
     </message>
-    <message>
-        <source>About Bitcoin Core</source>
-        <translation>Acerca de Bitcoin Core</translation>
-    </message>
     <message>
         <source>Command-line options</source>
         <translation>Opciones de línea de comandos</translation>
@@ -703,10 +373,6 @@
     </context>
 <context>
     <name>Intro</name>
-    <message>
-        <source>Bitcoin Core will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source>
-        <translation>Bitcoin Core descargará y almacenará una copia de la cadena de bloques Bitcoin. Al menos %1GB de datos serán almacenados en este directorio, y crecerá con el tiempo. La billetera será también almacenada en este directorio.</translation>
-    </message>
     <message>
         <source>Use the default data directory</source>
         <translation>Usar el directorio de datos por defecto</translation>
@@ -715,10 +381,6 @@
         <source>Use a custom data directory:</source>
         <translation>Usa un directorio de datos personalizado:</translation>
     </message>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Bitcoin Core</translation>
-    </message>
     <message>
         <source>Error: Specified data directory "%1" cannot be created.</source>
         <translation>Error: Directorio de datos especificado "%1" no puede ser creado.</translation>
@@ -746,10 +408,6 @@
         <source>Select payment request file</source>
         <translation>Seleccionar archivo de solicitud de pago</translation>
     </message>
-    <message>
-        <source>Select payment request file to open</source>
-        <translation>Seleccionar archivo de solicitud de pago para abrir</translation>
-    </message>
 </context>
 <context>
     <name>OptionsDialog</name>
@@ -761,10 +419,18 @@
         <source>&amp;Main</source>
         <translation>&amp;Main</translation>
     </message>
+    <message>
+        <source>&amp;Network</source>
+        <translation>&amp;Red</translation>
+    </message>
     <message>
         <source>W&amp;allet</source>
         <translation>Billetera</translation>
     </message>
+    <message>
+        <source>Expert</source>
+        <translation>Experto</translation>
+    </message>
     <message>
         <source>none</source>
         <translation>ninguno</translation>
@@ -772,9 +438,14 @@
     </context>
 <context>
     <name>OverviewPage</name>
-    </context>
-<context>
-    <name>PaymentServer</name>
+    <message>
+        <source>Available:</source>
+        <translation>Disponible:</translation>
+    </message>
+    <message>
+        <source>Pending:</source>
+        <translation>Pendiente:</translation>
+    </message>
     </context>
 <context>
     <name>PeerTableModel</name>
@@ -786,15 +457,20 @@
         <translation>Monto</translation>
     </message>
     </context>
-<context>
-    <name>QRImageWidget</name>
-    </context>
 <context>
     <name>RPCConsole</name>
     <message>
         <source>&amp;Information</source>
         <translation>Información</translation>
     </message>
+    <message>
+        <source>In:</source>
+        <translation>Entrada:</translation>
+    </message>
+    <message>
+        <source>Out:</source>
+        <translation>Salida:</translation>
+    </message>
     </context>
 <context>
     <name>ReceiveCoinsDialog</name>
@@ -807,51 +483,16 @@
         <translation>&amp;Etiqueta:</translation>
     </message>
     <message>
-        <source>Copy label</source>
-        <translation>Copiar etiqueta</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>Copiar monto</translation>
+        <source>Show</source>
+        <translation>Mostrar</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>ReceiveRequestDialog</name>
     <message>
         <source>Copy &amp;Address</source>
         <translation>&amp;Copiar Dirección</translation>
     </message>
-    <message>
-        <source>Address</source>
-        <translation>Dirección</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>Monto</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Etiqueta</translation>
-    </message>
-    </context>
-<context>
-    <name>RecentRequestsTableModel</name>
-    <message>
-        <source>Date</source>
-        <translation>Fecha</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Etiqueta</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>Monto</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(sin etiqueta)</translation>
-    </message>
     </context>
 <context>
     <name>SendCoinsDialog</name>
@@ -883,38 +524,6 @@
         <source>Dust:</source>
         <translation>Polvo:</translation>
     </message>
-    <message>
-        <source>Copy quantity</source>
-        <translation>Copiar cantidad</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>Copiar monto</translation>
-    </message>
-    <message>
-        <source>Copy fee</source>
-        <translation>Copiar comisión</translation>
-    </message>
-    <message>
-        <source>Copy bytes</source>
-        <translation>Copiar bytes</translation>
-    </message>
-    <message>
-        <source>Copy priority</source>
-        <translation>Copiar prioridad</translation>
-    </message>
-    <message>
-        <source>Copy change</source>
-        <translation>Copiar cambio</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(sin etiqueta)</translation>
-    </message>
-    <message>
-        <source>Copy dust</source>
-        <translation>Copiar dust</translation>
-    </message>
     </context>
 <context>
     <name>SendCoinsEntry</name>
@@ -935,122 +544,16 @@
     </context>
 <context>
     <name>SplashScreen</name>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Bitcoin Core</translation>
-    </message>
     </context>
 <context>
     <name>TrafficGraphWidget</name>
     </context>
-<context>
-    <name>TransactionDesc</name>
-    <message>
-        <source>Date</source>
-        <translation>Fecha</translation>
-    </message>
-    <message>
-        <source>Transaction</source>
-        <translation>Transacción</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>Monto</translation>
-    </message>
-    </context>
 <context>
     <name>TransactionDescDialog</name>
     </context>
-<context>
-    <name>TransactionTableModel</name>
-    <message>
-        <source>Date</source>
-        <translation>Fecha</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Etiqueta</translation>
-    </message>
-    </context>
-<context>
-    <name>TransactionView</name>
-    <message>
-        <source>Copy address</source>
-        <translation>Copiar dirección</translation>
-    </message>
-    <message>
-        <source>Copy label</source>
-        <translation>Copiar etiqueta</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>Copiar monto</translation>
-    </message>
-    <message>
-        <source>Copy transaction ID</source>
-        <translation>Copiar ID de la transacción</translation>
-    </message>
-    <message>
-        <source>Exporting Failed</source>
-        <translation>Exportación fallida</translation>
-    </message>
-    <message>
-        <source>Comma separated file (*.csv)</source>
-        <translation>Archivo separado por comas (*.csv)</translation>
-    </message>
-    <message>
-        <source>Confirmed</source>
-        <translation>Confirmado</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation>Fecha</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Etiqueta</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>Dirección</translation>
-    </message>
-    </context>
 <context>
     <name>UnitDisplayStatusBarControl</name>
     </context>
-<context>
-    <name>WalletFrame</name>
-    </context>
-<context>
-    <name>WalletModel</name>
-    </context>
-<context>
-    <name>WalletView</name>
-    <message>
-        <source>&amp;Export</source>
-        <translation>&amp;Exportar</translation>
-    </message>
-    <message>
-        <source>Export the data in the current tab to a file</source>
-        <translation>Exportar los datos en la pestaña actual a un archivo</translation>
-    </message>
-    <message>
-        <source>Backup Failed</source>
-        <translation>Copia de seguridad fallida</translation>
-    </message>
-    <message>
-        <source>There was an error trying to save the wallet data to %1.</source>
-        <translation>Hubo un error intentando guardar los datos de la billetera al %1</translation>
-    </message>
-    <message>
-        <source>The wallet data was successfully saved to %1.</source>
-        <translation>Los datos de la billetera fueron guardados exitosamente al %1</translation>
-    </message>
-    <message>
-        <source>Backup Successful</source>
-        <translation>Copia de seguridad completada</translation>
-    </message>
-</context>
 <context>
     <name>bitcoin-core</name>
     <message>
@@ -1077,6 +580,10 @@
         <source>Run in the background as a daemon and accept commands</source>
         <translation>Correr en segundo plano como daemon y aceptar comandos</translation>
     </message>
+    <message>
+        <source>Bitcoin Core</source>
+        <translation>Bitcoin Core</translation>
+    </message>
     <message>
         <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source>
         <translation>Enlazar dirección dada y siempre escuchar en ella. Usar [host]:port notación para IPv6</translation>
@@ -1101,10 +608,6 @@
         <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
         <translation>Esta es una compilación de prueba pre-lanzamiento - use bajo su propio riesgo - no utilizar para aplicaciones de minería o mercantes</translation>
     </message>
-    <message>
-        <source>Unable to bind to %s on this computer. Bitcoin Core is probably already running.</source>
-        <translation>Deshabilitar para enlezar a %s en esta computadora. Bitcoin Core probablemente ya está ejecutándose.</translation>
-    </message>
     <message>
         <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source>
         <translation>Aviso: ¡La red no parece estar totalmente de acuerdo! Algunos mineros parecen estar teniendo inconvenientes.</translation>
@@ -1113,10 +616,6 @@
         <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source>
         <translation>Aviso: ¡No parecen estar totalmente de acuerdo con nuestros compañeros! Puede que tengas que actualizar, u otros nodos tengan que actualizarce.</translation>
     </message>
-    <message>
-        <source>Warning: wallet.dat corrupt, data salvaged! Original wallet.dat saved as wallet.{timestamp}.bak in %s; if your balance or transactions are incorrect you should restore from a backup.</source>
-        <translation>Aviso: wallet.dat está corrupto, ¡datos salvados! wallet.dat original guardado como wallet.{timestamp}.bak en %s; si tus transacciones o balance está incorrecto deberías restaurarlo desde una copia de seguridad.</translation>
-    </message>
     <message>
         <source>Information</source>
         <translation>Información</translation>
diff --git a/src/qt/locale/bitcoin_et.ts b/src/qt/locale/bitcoin_et.ts
index 089f01035d89d..e861d4e472312 100644
--- a/src/qt/locale/bitcoin_et.ts
+++ b/src/qt/locale/bitcoin_et.ts
@@ -21,10 +21,6 @@
         <source>C&amp;lose</source>
         <translation>S&amp;ulge</translation>
     </message>
-    <message>
-        <source>&amp;Copy Address</source>
-        <translation>&amp;Kopeeri Aadress</translation>
-    </message>
     <message>
         <source>Delete the currently selected address from the list</source>
         <translation>Kustuta märgistatud aadress loetelust</translation>
@@ -41,45 +37,6 @@
         <source>&amp;Delete</source>
         <translation>&amp;Kustuta</translation>
     </message>
-    <message>
-        <source>C&amp;hoose</source>
-        <translation>V&amp;ali</translation>
-    </message>
-    <message>
-        <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source>
-        <translation>Need on sinu Bitcoini aadressid maksete saatmiseks. Müntide saatmisel kontrolli alati summat ning saaja aadressi.</translation>
-    </message>
-    <message>
-        <source>Copy &amp;Label</source>
-        <translation>&amp;Märgise kopeerimine</translation>
-    </message>
-    <message>
-        <source>&amp;Edit</source>
-        <translation>&amp;Muuda</translation>
-    </message>
-    <message>
-        <source>Comma separated file (*.csv)</source>
-        <translation>Komaeraldatud fail (*.csv)</translation>
-    </message>
-    <message>
-        <source>Exporting Failed</source>
-        <translation>Eksportimine Ebaõnnestus</translation>
-    </message>
-    </context>
-<context>
-    <name>AddressTableModel</name>
-    <message>
-        <source>Label</source>
-        <translation>Silt</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>Aadress</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(silti pole)</translation>
-    </message>
 </context>
 <context>
     <name>AskPassphraseDialog</name>
@@ -99,82 +56,6 @@
         <source>Repeat new passphrase</source>
         <translation>Korda salafraasi</translation>
     </message>
-    <message>
-        <source>Encrypt wallet</source>
-        <translation>Krüpteeri rahakott</translation>
-    </message>
-    <message>
-        <source>This operation needs your wallet passphrase to unlock the wallet.</source>
-        <translation>See toiming nõuab sinu rahakoti salafraasi.</translation>
-    </message>
-    <message>
-        <source>Unlock wallet</source>
-        <translation>Tee rahakott lukust lahti.</translation>
-    </message>
-    <message>
-        <source>This operation needs your wallet passphrase to decrypt the wallet.</source>
-        <translation>See toiming nõuab sinu rahakoti salafraasi.</translation>
-    </message>
-    <message>
-        <source>Decrypt wallet</source>
-        <translation>Dekrüpteeri rahakott.</translation>
-    </message>
-    <message>
-        <source>Change passphrase</source>
-        <translation>Muuda salafraasi</translation>
-    </message>
-    <message>
-        <source>Confirm wallet encryption</source>
-        <translation>Kinnita rahakoti krüpteering</translation>
-    </message>
-    <message>
-        <source>Warning: If you encrypt your wallet and lose your passphrase, you will &lt;b&gt;LOSE ALL OF YOUR BITCOINS&lt;/b&gt;!</source>
-        <translation>Hoiatus: Kui sa kaotad oma, rahakoti krüpteerimisel kasutatud, salafraasi, siis &lt;b&gt;KAOTAD KA KÕIK OMA BITCOINID&lt;/b&gt;!</translation>
-    </message>
-    <message>
-        <source>Are you sure you wish to encrypt your wallet?</source>
-        <translation>Kas soovid oma rahakoti krüpteerida?</translation>
-    </message>
-    <message>
-        <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source>
-        <translation>TÄHTIS: Kõik varasemad rahakoti varundfailid tuleks üle kirjutada äsja loodud krüpteeritud rahakoti failiga. Turvakaalutlustel tühistatakse krüpteerimata rahakoti failid alates uue, krüpteeritud rahakoti, kasutusele võtust.</translation>
-    </message>
-    <message>
-        <source>Warning: The Caps Lock key is on!</source>
-        <translation>Hoiatus: Caps Lock on sisse lülitatud!</translation>
-    </message>
-    <message>
-        <source>Wallet encrypted</source>
-        <translation>Rahakott krüpteeritud</translation>
-    </message>
-    <message>
-        <source>Wallet encryption failed</source>
-        <translation>Tõrge rahakoti krüpteerimisel</translation>
-    </message>
-    <message>
-        <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
-        <translation>Rahakoti krüpteering ebaõnnestus tõrke tõttu. Sinu rahakotti ei krüpteeritud.</translation>
-    </message>
-    <message>
-        <source>The supplied passphrases do not match.</source>
-        <translation>Salafraasid ei kattu.</translation>
-    </message>
-    <message>
-        <source>Wallet unlock failed</source>
-        <translation>Rahakoti avamine ebaõnnestus</translation>
-    </message>
-    <message>
-        <source>The passphrase entered for the wallet decryption was incorrect.</source>
-        <translation>Rahakoti salafraas ei ole õige.</translation>
-    </message>
-    <message>
-        <source>Wallet decryption failed</source>
-        <translation>Rahakoti dekrüpteerimine ei õnnestunud</translation>
-    </message>
-    <message>
-        <source>Wallet passphrase was successfully changed.</source>
-        <translation>Rahakoti salafraasi muutmine õnnestus.</translation>
-    </message>
 </context>
 <context>
     <name>BanTableModel</name>
@@ -241,10 +122,6 @@
         <source>Open &amp;URI...</source>
         <translation>Ava &amp;URI...</translation>
     </message>
-    <message>
-        <source>Importing blocks from disk...</source>
-        <translation>Impordi blokid kettalt...</translation>
-    </message>
     <message>
         <source>Reindexing blocks on disk...</source>
         <translation>Kettal olevate blokkide re-indekseerimine...</translation>
@@ -325,14 +202,6 @@
         <source>Tabs toolbar</source>
         <translation>Vahelehe tööriistariba</translation>
     </message>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Bitcoini tuumik</translation>
-    </message>
-    <message>
-        <source>&amp;About Bitcoin Core</source>
-        <translation>Kirjeldus Bitcoini Tuumast</translation>
-    </message>
     <message>
         <source>&amp;Command-line options</source>
         <translation>Käsurea valikud</translation>
@@ -436,13 +305,6 @@
         <translation>Rahakott on &lt;b&gt;krüpteeritud&lt;/b&gt; ning hetkel &lt;b&gt;suletud&lt;/b&gt;</translation>
     </message>
 </context>
-<context>
-    <name>ClientModel</name>
-    <message>
-        <source>Network Alert</source>
-        <translation>Võrgu Häire</translation>
-    </message>
-</context>
 <context>
     <name>CoinControlDialog</name>
     <message>
@@ -469,70 +331,6 @@
         <source>Confirmed</source>
         <translation>Kinnitatud</translation>
     </message>
-    <message>
-        <source>Copy address</source>
-        <translation>Aadressi kopeerimine</translation>
-    </message>
-    <message>
-        <source>Copy label</source>
-        <translation>Märgise kopeerimine</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>Kopeeri summa</translation>
-    </message>
-    <message>
-        <source>Copy transaction ID</source>
-        <translation>Kopeeri tehingu ID</translation>
-    </message>
-    <message>
-        <source>Copy fee</source>
-        <translation>Kopeeri tasu</translation>
-    </message>
-    <message>
-        <source>highest</source>
-        <translation>kõrgeim</translation>
-    </message>
-    <message>
-        <source>higher</source>
-        <translation>kõrgem</translation>
-    </message>
-    <message>
-        <source>high</source>
-        <translation>kõrge</translation>
-    </message>
-    <message>
-        <source>medium</source>
-        <translation>keskmine</translation>
-    </message>
-    <message>
-        <source>low</source>
-        <translation>madal</translation>
-    </message>
-    <message>
-        <source>lower</source>
-        <translation>madalam</translation>
-    </message>
-    <message>
-        <source>lowest</source>
-        <translation>madalaim</translation>
-    </message>
-    <message>
-        <source>(%1 locked)</source>
-        <translation>(%1 lukustatud)</translation>
-    </message>
-    <message>
-        <source>yes</source>
-        <translation>jah</translation>
-    </message>
-    <message>
-        <source>no</source>
-        <translation>ei</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(silti pole)</translation>
-    </message>
     </context>
 <context>
     <name>EditAddressDialog</name>
@@ -548,38 +346,6 @@
         <source>&amp;Address</source>
         <translation>&amp;Aadress</translation>
     </message>
-    <message>
-        <source>New receiving address</source>
-        <translation>Uus sissetulev aadress</translation>
-    </message>
-    <message>
-        <source>New sending address</source>
-        <translation>Uus väljaminev aadress</translation>
-    </message>
-    <message>
-        <source>Edit receiving address</source>
-        <translation>Sissetulevate aadresside muutmine</translation>
-    </message>
-    <message>
-        <source>Edit sending address</source>
-        <translation>Väljaminevate aadresside muutmine</translation>
-    </message>
-    <message>
-        <source>The entered address "%1" is already in the address book.</source>
-        <translation>Selline aadress on juba olemas: "%1"</translation>
-    </message>
-    <message>
-        <source>The entered address "%1" is not a valid Bitcoin address.</source>
-        <translation>Sisestatud aadress "%1" ei ole Bitcoinis kehtiv.</translation>
-    </message>
-    <message>
-        <source>Could not unlock wallet.</source>
-        <translation>Rahakotti ei avatud</translation>
-    </message>
-    <message>
-        <source>New key generation failed.</source>
-        <translation>Tõrge uue võtme loomisel.</translation>
-    </message>
 </context>
 <context>
     <name>FreespaceChecker</name>
@@ -590,18 +356,10 @@
     </context>
 <context>
     <name>HelpMessageDialog</name>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Bitcoini tuumik</translation>
-    </message>
     <message>
         <source>version</source>
         <translation>versioon</translation>
     </message>
-    <message>
-        <source>About Bitcoin Core</source>
-        <translation>Kirjeldus Bitcoini Tuumast</translation>
-    </message>
     <message>
         <source>Command-line options</source>
         <translation>Käsurea valikud</translation>
@@ -621,10 +379,6 @@
         <source>Welcome</source>
         <translation>Teretulemast</translation>
     </message>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Bitcoini tuumik</translation>
-    </message>
     <message>
         <source>Error</source>
         <translation>Tõrge</translation>
@@ -771,17 +525,6 @@
         <translation>Hiljutised tehingud</translation>
     </message>
     </context>
-<context>
-    <name>PaymentServer</name>
-    <message>
-        <source>URI handling</source>
-        <translation>URI käsitsemine</translation>
-    </message>
-    <message>
-        <source>Cannot start bitcoin: click-to-pay handler</source>
-        <translation>Bitcoin ei käivitu: vajuta-maksa toiming</translation>
-    </message>
-    </context>
 <context>
     <name>PeerTableModel</name>
     </context>
@@ -796,13 +539,6 @@
         <translation>N/A</translation>
     </message>
     </context>
-<context>
-    <name>QRImageWidget</name>
-    <message>
-        <source>Save QR Code</source>
-        <translation>Salvesta QR kood</translation>
-    </message>
-    </context>
 <context>
     <name>RPCConsole</name>
     <message>
@@ -885,10 +621,6 @@
         <source>&amp;Console</source>
         <translation>&amp;Konsool</translation>
     </message>
-    <message>
-        <source>Build date</source>
-        <translation>Valmistusaeg</translation>
-    </message>
     <message>
         <source>Debug log file</source>
         <translation>Debugimise logifail</translation>
@@ -944,18 +676,6 @@
         <source>Remove</source>
         <translation>Eemalda</translation>
     </message>
-    <message>
-        <source>Copy label</source>
-        <translation>Märgise kopeerimine</translation>
-    </message>
-    <message>
-        <source>Copy message</source>
-        <translation>Kopeeri sõnum</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>Kopeeri summa</translation>
-    </message>
 </context>
 <context>
     <name>ReceiveRequestDialog</name>
@@ -963,62 +683,7 @@
         <source>Copy &amp;Address</source>
         <translation>&amp;Kopeeri Aadress</translation>
     </message>
-    <message>
-        <source>Address</source>
-        <translation>Aadress</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>Kogus</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Silt</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>Sõnum</translation>
-    </message>
-    <message>
-        <source>Resulting URI too long, try to reduce the text for label / message.</source>
-        <translation>Tulemuseks on liiga pikk URL, püüa lühendada märgise/teate teksti.</translation>
-    </message>
-    <message>
-        <source>Error encoding URI into QR Code.</source>
-        <translation>Tõrge URI'st QR koodi loomisel</translation>
-    </message>
-</context>
-<context>
-    <name>RecentRequestsTableModel</name>
-    <message>
-        <source>Date</source>
-        <translation>Kuupäev</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Silt</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>Sõnum</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>Kogus</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(silti pole)</translation>
-    </message>
-    <message>
-        <source>(no message)</source>
-        <translation>(sõnum puudub)</translation>
-    </message>
-    <message>
-        <source>(no amount)</source>
-        <translation>(summa puudub)</translation>
-    </message>
-</context>
+    </context>
 <context>
     <name>SendCoinsDialog</name>
     <message>
@@ -1089,39 +754,7 @@
         <source>S&amp;end</source>
         <translation>S&amp;aada</translation>
     </message>
-    <message>
-        <source>Confirm send coins</source>
-        <translation>Müntide saatmise kinnitamine</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>Kopeeri summa</translation>
-    </message>
-    <message>
-        <source>Copy fee</source>
-        <translation>Kopeeri tasu</translation>
-    </message>
-    <message>
-        <source>or</source>
-        <translation>või</translation>
-    </message>
-    <message>
-        <source>The amount to pay must be larger than 0.</source>
-        <translation>Makstav summa peab olema suurem kui 0.</translation>
-    </message>
-    <message>
-        <source>The amount exceeds your balance.</source>
-        <translation>Summa ületab jäägi.</translation>
-    </message>
-    <message>
-        <source>The total exceeds your balance when the %1 transaction fee is included.</source>
-        <translation>Summa koos tehingu tasuga %1 ületab sinu jääki.</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(silti pole)</translation>
-    </message>
-    </context>
+</context>
 <context>
     <name>SendCoinsEntry</name>
     <message>
@@ -1132,10 +765,6 @@
         <source>Pay &amp;To:</source>
         <translation>Maksa &amp;:</translation>
     </message>
-    <message>
-        <source>Enter a label for this address to add it to your address book</source>
-        <translation>Aadressiraamatusse sisestamiseks märgista aadress</translation>
-    </message>
     <message>
         <source>&amp;Label:</source>
         <translation>&amp;Märgis</translation>
@@ -1230,69 +859,9 @@
         <source>Reset all verify message fields</source>
         <translation>Tühjenda kõik sõnumi kinnitamise väljad</translation>
     </message>
-    <message>
-        <source>Click "Sign Message" to generate signature</source>
-        <translation>Signatuuri genereerimiseks vajuta "Allkirjasta Sõnum"</translation>
-    </message>
-    <message>
-        <source>The entered address is invalid.</source>
-        <translation>Sisestatud aadress ei kehti.</translation>
-    </message>
-    <message>
-        <source>Please check the address and try again.</source>
-        <translation>Palun kontrolli aadressi ning proovi uuesti.</translation>
-    </message>
-    <message>
-        <source>The entered address does not refer to a key.</source>
-        <translation>Sisestatud aadress ei viita võtmele.</translation>
-    </message>
-    <message>
-        <source>Wallet unlock was cancelled.</source>
-        <translation>Rahakoti avamine katkestati.</translation>
-    </message>
-    <message>
-        <source>Private key for the entered address is not available.</source>
-        <translation>Sisestatud aadressi privaatvõti ei ole saadaval.</translation>
-    </message>
-    <message>
-        <source>Message signing failed.</source>
-        <translation>Sõnumi signeerimine ebaõnnestus.</translation>
-    </message>
-    <message>
-        <source>Message signed.</source>
-        <translation>Sõnum signeeritud.</translation>
-    </message>
-    <message>
-        <source>The signature could not be decoded.</source>
-        <translation>Signatuuri ei õnnestunud dekodeerida.</translation>
-    </message>
-    <message>
-        <source>Please check the signature and try again.</source>
-        <translation>Palun kontrolli signatuuri ning proovi uuesti.</translation>
-    </message>
-    <message>
-        <source>The signature did not match the message digest.</source>
-        <translation>Signatuur ei kattunud sõnumi kokkuvõttega.</translation>
-    </message>
-    <message>
-        <source>Message verification failed.</source>
-        <translation>Sõnumi kontroll ebaõnnestus.</translation>
-    </message>
-    <message>
-        <source>Message verified.</source>
-        <translation>Sõnum kontrollitud.</translation>
-    </message>
 </context>
 <context>
     <name>SplashScreen</name>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Bitcoini tuumik</translation>
-    </message>
-    <message>
-        <source>The Bitcoin Core developers</source>
-        <translation>Bitcoini Tuuma arendajad</translation>
-    </message>
     <message>
         <source>[testnet]</source>
         <translation>[testnet]</translation>
@@ -1305,366 +874,16 @@
         <translation>KB/s</translation>
     </message>
 </context>
-<context>
-    <name>TransactionDesc</name>
-    <message>
-        <source>Open until %1</source>
-        <translation>Avatud kuni %1</translation>
-    </message>
-    <message>
-        <source>%1/offline</source>
-        <translation>%1/offline'is</translation>
-    </message>
-    <message>
-        <source>%1/unconfirmed</source>
-        <translation>%1/kinnitamata</translation>
-    </message>
-    <message>
-        <source>%1 confirmations</source>
-        <translation>%1 kinnitust</translation>
-    </message>
-    <message>
-        <source>Status</source>
-        <translation>Staatus</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation>Kuupäev</translation>
-    </message>
-    <message>
-        <source>Source</source>
-        <translation>Allikas</translation>
-    </message>
-    <message>
-        <source>Generated</source>
-        <translation>Genereeritud</translation>
-    </message>
-    <message>
-        <source>From</source>
-        <translation>Saatja</translation>
-    </message>
-    <message>
-        <source>To</source>
-        <translation>Saaja</translation>
-    </message>
-    <message>
-        <source>own address</source>
-        <translation>oma aadress</translation>
-    </message>
-    <message>
-        <source>label</source>
-        <translation>märgis</translation>
-    </message>
-    <message>
-        <source>Credit</source>
-        <translation>Krediit</translation>
-    </message>
-    <message>
-        <source>not accepted</source>
-        <translation>mitte aktsepteeritud</translation>
-    </message>
-    <message>
-        <source>Debit</source>
-        <translation>Deebet</translation>
-    </message>
-    <message>
-        <source>Transaction fee</source>
-        <translation>Tehingu tasu</translation>
-    </message>
-    <message>
-        <source>Net amount</source>
-        <translation>Neto summa</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>Sõnum</translation>
-    </message>
-    <message>
-        <source>Comment</source>
-        <translation>Kommentaar</translation>
-    </message>
-    <message>
-        <source>Transaction ID</source>
-        <translation>Tehingu ID</translation>
-    </message>
-    <message>
-        <source>Debug information</source>
-        <translation>Debug'imise info</translation>
-    </message>
-    <message>
-        <source>Transaction</source>
-        <translation>Tehing</translation>
-    </message>
-    <message>
-        <source>Inputs</source>
-        <translation>Sisendid</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>Kogus</translation>
-    </message>
-    <message>
-        <source>true</source>
-        <translation>õige</translation>
-    </message>
-    <message>
-        <source>false</source>
-        <translation>vale</translation>
-    </message>
-    <message>
-        <source>, has not been successfully broadcast yet</source>
-        <translation>, veel esitlemata</translation>
-    </message>
-    <message>
-        <source>unknown</source>
-        <translation>tundmatu</translation>
-    </message>
-</context>
 <context>
     <name>TransactionDescDialog</name>
-    <message>
-        <source>Transaction details</source>
-        <translation>Tehingu üksikasjad</translation>
-    </message>
     <message>
         <source>This pane shows a detailed description of the transaction</source>
         <translation>Paan kuvab tehingu detailid</translation>
     </message>
 </context>
-<context>
-    <name>TransactionTableModel</name>
-    <message>
-        <source>Date</source>
-        <translation>Kuupäev</translation>
-    </message>
-    <message>
-        <source>Type</source>
-        <translation>Tüüp</translation>
-    </message>
-    <message>
-        <source>Open until %1</source>
-        <translation>Avatud kuni %1</translation>
-    </message>
-    <message>
-        <source>Confirmed (%1 confirmations)</source>
-        <translation>Kinnitatud (%1 kinnitust)</translation>
-    </message>
-    <message>
-        <source>This block was not received by any other nodes and will probably not be accepted!</source>
-        <translation>Antud klotsi pole saanud ükski osapool ning tõenäoliselt seda ei aktsepteerita!</translation>
-    </message>
-    <message>
-        <source>Generated but not accepted</source>
-        <translation>Loodud, kuid aktsepteerimata</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Silt</translation>
-    </message>
-    <message>
-        <source>Received with</source>
-        <translation>Saadud koos</translation>
-    </message>
-    <message>
-        <source>Received from</source>
-        <translation>Kellelt saadud</translation>
-    </message>
-    <message>
-        <source>Sent to</source>
-        <translation>Saadetud</translation>
-    </message>
-    <message>
-        <source>Payment to yourself</source>
-        <translation>Makse iseendale</translation>
-    </message>
-    <message>
-        <source>Mined</source>
-        <translation>Mine'itud</translation>
-    </message>
-    <message>
-        <source>(n/a)</source>
-        <translation>(n/a)</translation>
-    </message>
-    <message>
-        <source>Transaction status. Hover over this field to show number of confirmations.</source>
-        <translation>Tehingu staatus. Kinnituste arvu kuvamiseks liigu hiire noolega selle peale.</translation>
-    </message>
-    <message>
-        <source>Date and time that the transaction was received.</source>
-        <translation>Tehingu saamise kuupäev ning kellaaeg.</translation>
-    </message>
-    <message>
-        <source>Type of transaction.</source>
-        <translation>Tehingu tüüp.</translation>
-    </message>
-    <message>
-        <source>Amount removed from or added to balance.</source>
-        <translation>Jäägile lisatud või eemaldatud summa.</translation>
-    </message>
-</context>
-<context>
-    <name>TransactionView</name>
-    <message>
-        <source>All</source>
-        <translation>Kõik</translation>
-    </message>
-    <message>
-        <source>Today</source>
-        <translation>Täna</translation>
-    </message>
-    <message>
-        <source>This week</source>
-        <translation>Jooksev nädal</translation>
-    </message>
-    <message>
-        <source>This month</source>
-        <translation>Jooksev kuu</translation>
-    </message>
-    <message>
-        <source>Last month</source>
-        <translation>Eelmine kuu</translation>
-    </message>
-    <message>
-        <source>This year</source>
-        <translation>Jooksev aasta</translation>
-    </message>
-    <message>
-        <source>Range...</source>
-        <translation>Ulatus...</translation>
-    </message>
-    <message>
-        <source>Received with</source>
-        <translation>Saadud koos</translation>
-    </message>
-    <message>
-        <source>Sent to</source>
-        <translation>Saadetud</translation>
-    </message>
-    <message>
-        <source>To yourself</source>
-        <translation>Iseendale</translation>
-    </message>
-    <message>
-        <source>Mined</source>
-        <translation>Mine'itud</translation>
-    </message>
-    <message>
-        <source>Other</source>
-        <translation>Muu</translation>
-    </message>
-    <message>
-        <source>Enter address or label to search</source>
-        <translation>Otsimiseks sisesta märgis või aadress</translation>
-    </message>
-    <message>
-        <source>Min amount</source>
-        <translation>Vähim summa</translation>
-    </message>
-    <message>
-        <source>Copy address</source>
-        <translation>Aadressi kopeerimine</translation>
-    </message>
-    <message>
-        <source>Copy label</source>
-        <translation>Märgise kopeerimine</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>Kopeeri summa</translation>
-    </message>
-    <message>
-        <source>Copy transaction ID</source>
-        <translation>Kopeeri tehingu ID</translation>
-    </message>
-    <message>
-        <source>Edit label</source>
-        <translation>Märgise muutmine</translation>
-    </message>
-    <message>
-        <source>Show transaction details</source>
-        <translation>Kuva tehingu detailid</translation>
-    </message>
-    <message>
-        <source>Exporting Failed</source>
-        <translation>Eksportimine Ebaõnnestus</translation>
-    </message>
-    <message>
-        <source>Comma separated file (*.csv)</source>
-        <translation>Komaeraldatud fail (*.csv)</translation>
-    </message>
-    <message>
-        <source>Confirmed</source>
-        <translation>Kinnitatud</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation>Kuupäev</translation>
-    </message>
-    <message>
-        <source>Type</source>
-        <translation>Tüüp</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Silt</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>Aadress</translation>
-    </message>
-    <message>
-        <source>ID</source>
-        <translation>ID</translation>
-    </message>
-    <message>
-        <source>Range:</source>
-        <translation>Ulatus:</translation>
-    </message>
-    <message>
-        <source>to</source>
-        <translation>saaja</translation>
-    </message>
-</context>
 <context>
     <name>UnitDisplayStatusBarControl</name>
     </context>
-<context>
-    <name>WalletFrame</name>
-    </context>
-<context>
-    <name>WalletModel</name>
-    <message>
-        <source>Send Coins</source>
-        <translation>Müntide saatmine</translation>
-    </message>
-</context>
-<context>
-    <name>WalletView</name>
-    <message>
-        <source>&amp;Export</source>
-        <translation>&amp;Ekspordi</translation>
-    </message>
-    <message>
-        <source>Export the data in the current tab to a file</source>
-        <translation>Ekspordi kuvatava vahelehe sisu faili</translation>
-    </message>
-    <message>
-        <source>Backup Wallet</source>
-        <translation>Varundatud Rahakott</translation>
-    </message>
-    <message>
-        <source>Wallet Data (*.dat)</source>
-        <translation>Rahakoti andmed (*.dat)</translation>
-    </message>
-    <message>
-        <source>Backup Failed</source>
-        <translation>Varundamine nurjus</translation>
-    </message>
-    <message>
-        <source>Backup Successful</source>
-        <translation>Varundamine õnnestus</translation>
-    </message>
-</context>
 <context>
     <name>bitcoin-core</name>
     <message>
@@ -1695,6 +914,10 @@
         <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
         <translation>Luba välisühendusi (vaikeväärtus: 1 kui puudub -proxy või -connect)</translation>
     </message>
+    <message>
+        <source>Bitcoin Core</source>
+        <translation>Bitcoini tuumik</translation>
+    </message>
     <message>
         <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source>
         <translation>Määratud aadressiga sidumine ning sellelt kuulamine. IPv6 jaoks kasuta vormingut [host]:port</translation>
@@ -1707,10 +930,6 @@
         <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
         <translation>See on test-versioon - kasutamine omal riisikol - ära kasuta mining'uks ega kaupmeeste programmides</translation>
     </message>
-    <message>
-        <source>Warning: wallet.dat corrupt, data salvaged! Original wallet.dat saved as wallet.{timestamp}.bak in %s; if your balance or transactions are incorrect you should restore from a backup.</source>
-        <translation>Hoiatus: toimus wallet.dat faili andmete päästmine! Originaal wallet.dat nimetati kaustas %s ümber wallet.{ajatempel}.bak'iks, jäägi või tehingute ebakõlade puhul tuleks teha backup'ist taastamine.</translation>
-    </message>
     <message>
         <source>Block creation options:</source>
         <translation>Blokeeri loomise valikud:</translation>
@@ -1767,26 +986,10 @@
         <source>(default: %u)</source>
         <translation>(vaikimisi: %u)</translation>
     </message>
-    <message>
-        <source>Cannot resolve -whitebind address: '%s'</source>
-        <translation>Tundmatu -whitebind aadress: '%s'</translation>
-    </message>
     <message>
         <source>Information</source>
         <translation>Informatsioon</translation>
     </message>
-    <message>
-        <source>Invalid amount for -maxtxfee=&lt;amount&gt;: '%s'</source>
-        <translation>-maxtxfee=&lt;amount&gt; jaoks vigane kogus: '%s'</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -minrelaytxfee=&lt;amount&gt;: '%s'</source>
-        <translation>-minrelaytxfee=&lt;amount&gt; jaoks vigane kogus: '%s'</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -mintxfee=&lt;amount&gt;: '%s'</source>
-        <translation>-mintxfee=&lt;amount&gt; jaoks vigane kogus: '%s'</translation>
-    </message>
     <message>
         <source>RPC server options:</source>
         <translation>RPC serveri valikud:</translation>
@@ -1823,10 +1026,6 @@
         <source>Warning</source>
         <translation>Hoiatus</translation>
     </message>
-    <message>
-        <source>wallet.dat corrupt, salvage failed</source>
-        <translation>wallet.dat fail on katki, päästmine ebaõnnestus</translation>
-    </message>
     <message>
         <source>Password for JSON-RPC connections</source>
         <translation>JSON-RPC ühenduste salasõna</translation>
@@ -1835,10 +1034,6 @@
         <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
         <translation>Käivita käsklus, kui parim plokk muutub (käskluse %s asendatakse ploki hash'iga)</translation>
     </message>
-    <message>
-        <source>This help message</source>
-        <translation>Käesolev abitekst</translation>
-    </message>
     <message>
         <source>Allow DNS lookups for -addnode, -seednode and -connect</source>
         <translation>-addnode, -seednode ja -connect tohivad kasutada DNS lookup'i</translation>
@@ -1847,18 +1042,10 @@
         <source>Loading addresses...</source>
         <translation>Aadresside laadimine...</translation>
     </message>
-    <message>
-        <source>Error loading wallet.dat: Wallet corrupted</source>
-        <translation>Viga wallet.dat käivitamisel. Vigane rahakkott</translation>
-    </message>
     <message>
         <source>(default: %s)</source>
         <translation>(vaikimisi: %s)</translation>
     </message>
-    <message>
-        <source>Error loading wallet.dat</source>
-        <translation>Viga wallet.dat käivitamisel</translation>
-    </message>
     <message>
         <source>Invalid -proxy address: '%s'</source>
         <translation>Vigane -proxi aadress: '%s'</translation>
@@ -1867,18 +1054,6 @@
         <source>Unknown network specified in -onlynet: '%s'</source>
         <translation>Kirjeldatud tundmatu võrgustik -onlynet'is: '%s'</translation>
     </message>
-    <message>
-        <source>Cannot resolve -bind address: '%s'</source>
-        <translation>Tundmatu -bind aadress: '%s'</translation>
-    </message>
-    <message>
-        <source>Cannot resolve -externalip address: '%s'</source>
-        <translation>Tundmatu -externalip aadress: '%s'</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -paytxfee=&lt;amount&gt;: '%s'</source>
-        <translation>-paytxfee=&lt;amount&gt; jaoks vigane kogus: '%s'</translation>
-    </message>
     <message>
         <source>Insufficient funds</source>
         <translation>Liiga suur summa</translation>
diff --git a/src/qt/locale/bitcoin_eu_ES.ts b/src/qt/locale/bitcoin_eu_ES.ts
index ca6b6489d17c8..cbe246f443814 100644
--- a/src/qt/locale/bitcoin_eu_ES.ts
+++ b/src/qt/locale/bitcoin_eu_ES.ts
@@ -25,10 +25,6 @@
         <source>C&amp;lose</source>
         <translation>&amp;Itxi</translation>
     </message>
-    <message>
-        <source>&amp;Copy Address</source>
-        <translation>&amp;Kopiatu helbidea</translation>
-    </message>
     <message>
         <source>Delete the currently selected address from the list</source>
         <translation>Ezabatu aukeratutako helbideak listatik</translation>
@@ -45,73 +41,6 @@
         <source>&amp;Delete</source>
         <translation>&amp;Ezabatu</translation>
     </message>
-    <message>
-        <source>Choose the address to send coins to</source>
-        <translation>Aukeratu helbidea txanponak bidaltzeko</translation>
-    </message>
-    <message>
-        <source>Choose the address to receive coins with</source>
-        <translation>Aukeratu helbidea txanponak jasotzeko</translation>
-    </message>
-    <message>
-        <source>C&amp;hoose</source>
-        <translation>&amp;Aukeratu</translation>
-    </message>
-    <message>
-        <source>Sending addresses</source>
-        <translation>Helbideak bidaltzen</translation>
-    </message>
-    <message>
-        <source>Receiving addresses</source>
-        <translation>Helbideak jasotzen</translation>
-    </message>
-    <message>
-        <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source>
-        <translation>Hauek dira zure Bitcoin helbideak dirua bidaltzeko. Beti egiaztatu diru-kantitatea eta jasotzeko helbidea bidali baino lehen.</translation>
-    </message>
-    <message>
-        <source>These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source>
-        <translation>Hauek dira zure Bitcoin helbideak dirua jasotzeko. Gomendagarria da erabiltzea jasotzeko helbide berri bat operazio bakoitzeko.</translation>
-    </message>
-    <message>
-        <source>Copy &amp;Label</source>
-        <translation>Kopiatu &amp;Etiketa</translation>
-    </message>
-    <message>
-        <source>&amp;Edit</source>
-        <translation>&amp;Editatu</translation>
-    </message>
-    <message>
-        <source>Export Address List</source>
-        <translation>Esportatu helbide lista</translation>
-    </message>
-    <message>
-        <source>Comma separated file (*.csv)</source>
-        <translation>Komaz bereizitako artxiboa (*.csv)</translation>
-    </message>
-    <message>
-        <source>Exporting Failed</source>
-        <translation>Esportatua okerra</translation>
-    </message>
-    <message>
-        <source>There was an error trying to save the address list to %1. Please try again.</source>
-        <translation>Errakuntza bat egon da gordetzen %1 helbide listan. Mesedez, saiatu berriro.</translation>
-    </message>
-</context>
-<context>
-    <name>AddressTableModel</name>
-    <message>
-        <source>Label</source>
-        <translation>Etiketa</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>Helbidea</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(etiketarik ez)</translation>
-    </message>
 </context>
 <context>
     <name>AskPassphraseDialog</name>
@@ -131,79 +60,7 @@
         <source>Repeat new passphrase</source>
         <translation>Errepikatu pasahitz berria</translation>
     </message>
-    <message>
-        <source>Encrypt wallet</source>
-        <translation>Enkriptatu zorroa</translation>
-    </message>
-    <message>
-        <source>This operation needs your wallet passphrase to unlock the wallet.</source>
-        <translation>Eragiketa honek zorroaren pasahitza behar du zorroa desblokeatzeko.</translation>
-    </message>
-    <message>
-        <source>Unlock wallet</source>
-        <translation>Desblokeatu zorroa</translation>
-    </message>
-    <message>
-        <source>This operation needs your wallet passphrase to decrypt the wallet.</source>
-        <translation>Eragiketa honek zure zorroaren pasahitza behar du, zorroa desenkriptatzeko.</translation>
-    </message>
-    <message>
-        <source>Decrypt wallet</source>
-        <translation>Desenkriptatu zorroa</translation>
-    </message>
-    <message>
-        <source>Change passphrase</source>
-        <translation>Aldatu pasahitza</translation>
-    </message>
-    <message>
-        <source>Confirm wallet encryption</source>
-        <translation>Berretsi zorroaren enkriptazioa</translation>
-    </message>
-    <message>
-        <source>Warning: If you encrypt your wallet and lose your passphrase, you will &lt;b&gt;LOSE ALL OF YOUR BITCOINS&lt;/b&gt;!</source>
-        <translation>Abisua: Zuk enkriptatzen baduzu zure diruzorroa eta zure pasahitza galtzen baduzu, &lt;b&gt;BITCOIN GUZTIAK GALDUKO DITUZU&lt;/b&gt;!</translation>
-    </message>
-    <message>
-        <source>Are you sure you wish to encrypt your wallet?</source>
-        <translation>Seguru zaude nahi duzula zure diruzorroa enkriptatu?</translation>
-    </message>
-    <message>
-        <source>Bitcoin Core will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source>
-        <translation>Bitcoin Core orain itxiko da enkriptazio prozezua amaitzeko. Gogoratu enkriptatzean zure diruzorroa ez duzula guztiz babesten zure Bitcoinak lapurretatik infektatzen zure ordenagailua Malwareekin.</translation>
-    </message>
-    <message>
-        <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source>
-        <translation>GARRANTZITSUA: Aurreko seguritate-kopiak ordeztuko dire berriekin, enkriptatutak. Segurtasun arrazoigaitik, aurreko kopiak ezin dira erabili hasiko zarenean zure diruzorro enkriptatu berriarekin.</translation>
-    </message>
-    <message>
-        <source>Wallet encrypted</source>
-        <translation>Zorroa enkriptatuta</translation>
-    </message>
-    <message>
-        <source>Wallet encryption failed</source>
-        <translation>Zorroaren enkriptazioak huts egin du</translation>
-    </message>
-    <message>
-        <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
-        <translation>Zorroaren enkriptazioak huts egin du barne-errore baten ondorioz. Zure zorroa ez da enkriptatu.</translation>
-    </message>
-    <message>
-        <source>The supplied passphrases do not match.</source>
-        <translation>Eman dituzun pasahitzak ez datoz bat.</translation>
-    </message>
-    <message>
-        <source>Wallet unlock failed</source>
-        <translation>Zorroaren desblokeoak huts egin du</translation>
-    </message>
-    <message>
-        <source>The passphrase entered for the wallet decryption was incorrect.</source>
-        <translation>Zorroa desenkriptatzeko sartutako pasahitza okerra da.</translation>
-    </message>
-    <message>
-        <source>Wallet decryption failed</source>
-        <translation>Zorroaren desenkriptazioak huts egin du</translation>
-    </message>
-    </context>
+</context>
 <context>
     <name>BanTableModel</name>
     </context>
@@ -298,9 +155,6 @@
         <translation>Zorroa &lt;b&gt;enkriptatuta&lt;/b&gt; eta &lt;b&gt;blokeatuta&lt;/b&gt; dago une honetan</translation>
     </message>
 </context>
-<context>
-    <name>ClientModel</name>
-    </context>
 <context>
     <name>CoinControlDialog</name>
     <message>
@@ -315,18 +169,6 @@
         <source>Date</source>
         <translation>Data</translation>
     </message>
-    <message>
-        <source>Copy address</source>
-        <translation>Kopiatu helbidea</translation>
-    </message>
-    <message>
-        <source>Copy label</source>
-        <translation>Kopiatu etiketa</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(etiketarik ez)</translation>
-    </message>
     </context>
 <context>
     <name>EditAddressDialog</name>
@@ -342,34 +184,6 @@
         <source>&amp;Address</source>
         <translation>&amp;Helbidea</translation>
     </message>
-    <message>
-        <source>New receiving address</source>
-        <translation>Jasotzeko helbide berria</translation>
-    </message>
-    <message>
-        <source>New sending address</source>
-        <translation>Bidaltzeko helbide berria</translation>
-    </message>
-    <message>
-        <source>Edit receiving address</source>
-        <translation>Editatu jasotzeko helbidea</translation>
-    </message>
-    <message>
-        <source>Edit sending address</source>
-        <translation>Editatu bidaltzeko helbidea</translation>
-    </message>
-    <message>
-        <source>The entered address "%1" is already in the address book.</source>
-        <translation>Sartu berri den helbidea, "%1", helbide-liburuan dago jadanik.</translation>
-    </message>
-    <message>
-        <source>Could not unlock wallet.</source>
-        <translation>Ezin desblokeatu zorroa.</translation>
-    </message>
-    <message>
-        <source>New key generation failed.</source>
-        <translation>Gako berriaren sorrerak huts egin du.</translation>
-    </message>
 </context>
 <context>
     <name>FreespaceChecker</name>
@@ -397,9 +211,6 @@
         <translation>Inprimakia</translation>
     </message>
     </context>
-<context>
-    <name>PaymentServer</name>
-    </context>
 <context>
     <name>PeerTableModel</name>
     </context>
@@ -410,9 +221,6 @@
         <translation>Kopurua</translation>
     </message>
     </context>
-<context>
-    <name>QRImageWidget</name>
-    </context>
 <context>
     <name>RPCConsole</name>
     </context>
@@ -430,10 +238,6 @@
         <source>&amp;Message:</source>
         <translation>Mezua</translation>
     </message>
-    <message>
-        <source>Copy label</source>
-        <translation>Kopiatu etiketa</translation>
-    </message>
     </context>
 <context>
     <name>ReceiveRequestDialog</name>
@@ -441,45 +245,6 @@
         <source>Copy &amp;Address</source>
         <translation>&amp;Kopiatu helbidea</translation>
     </message>
-    <message>
-        <source>Address</source>
-        <translation>Helbidea</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>Kopurua</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Etiketa</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>Mezua</translation>
-    </message>
-    </context>
-<context>
-    <name>RecentRequestsTableModel</name>
-    <message>
-        <source>Date</source>
-        <translation>Data</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Etiketa</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>Mezua</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>Kopurua</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(etiketarik ez)</translation>
-    </message>
     </context>
 <context>
     <name>SendCoinsDialog</name>
@@ -503,18 +268,6 @@
         <source>Confirm the send action</source>
         <translation>Berretsi bidaltzeko ekintza</translation>
     </message>
-    <message>
-        <source>Confirm send coins</source>
-        <translation>Berretsi txanponak bidaltzea</translation>
-    </message>
-    <message>
-        <source>The amount to pay must be larger than 0.</source>
-        <translation>Ordaintzeko kopurua 0 baino handiagoa izan behar du.</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(etiketarik ez)</translation>
-    </message>
     </context>
 <context>
     <name>SendCoinsEntry</name>
@@ -526,10 +279,6 @@
         <source>Pay &amp;To:</source>
         <translation>Ordaindu &amp;honi:</translation>
     </message>
-    <message>
-        <source>Enter a label for this address to add it to your address book</source>
-        <translation>Sartu etiketa bat helbide honetarako, eta gehitu zure helbide-liburuan</translation>
-    </message>
     <message>
         <source>&amp;Label:</source>
         <translation>&amp;Etiketa:</translation>
@@ -583,248 +332,22 @@
 <context>
     <name>TrafficGraphWidget</name>
     </context>
-<context>
-    <name>TransactionDesc</name>
-    <message>
-        <source>Open until %1</source>
-        <translation>Zabalik %1 arte</translation>
-    </message>
-    <message>
-        <source>%1/unconfirmed</source>
-        <translation>%1/konfirmatu gabe</translation>
-    </message>
-    <message>
-        <source>%1 confirmations</source>
-        <translation>%1 konfirmazioak</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation>Data</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>Mezua</translation>
-    </message>
-    <message>
-        <source>Transaction</source>
-        <translation>Transakzioaren</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>Kopurua</translation>
-    </message>
-    <message>
-        <source>, has not been successfully broadcast yet</source>
-        <translation>, ez da arrakastaz emititu oraindik</translation>
-    </message>
-    <message>
-        <source>unknown</source>
-        <translation>ezezaguna</translation>
-    </message>
-</context>
 <context>
     <name>TransactionDescDialog</name>
-    <message>
-        <source>Transaction details</source>
-        <translation>Transakzioaren xehetasunak</translation>
-    </message>
     <message>
         <source>This pane shows a detailed description of the transaction</source>
         <translation>Panel honek transakzioaren deskribapen xehea erakusten du</translation>
     </message>
 </context>
-<context>
-    <name>TransactionTableModel</name>
-    <message>
-        <source>Date</source>
-        <translation>Data</translation>
-    </message>
-    <message>
-        <source>Type</source>
-        <translation>Mota</translation>
-    </message>
-    <message>
-        <source>Open until %1</source>
-        <translation>Zabalik %1 arte</translation>
-    </message>
-    <message>
-        <source>Confirmed (%1 confirmations)</source>
-        <translation>Konfirmatuta (%1 konfirmazio)</translation>
-    </message>
-    <message>
-        <source>This block was not received by any other nodes and will probably not be accepted!</source>
-        <translation>Bloke hau ez du beste inongo nodorik jaso, eta seguruenik ez da onartuko!</translation>
-    </message>
-    <message>
-        <source>Generated but not accepted</source>
-        <translation>Sortua, baina ez onartua</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Etiketa</translation>
-    </message>
-    <message>
-        <source>Received with</source>
-        <translation>Jasota honekin: </translation>
-    </message>
-    <message>
-        <source>Sent to</source>
-        <translation>Hona bidalia: </translation>
-    </message>
-    <message>
-        <source>Payment to yourself</source>
-        <translation>Ordainketa zeure buruari</translation>
-    </message>
-    <message>
-        <source>Mined</source>
-        <translation>Bildua</translation>
-    </message>
-    <message>
-        <source>(n/a)</source>
-        <translation>(n/a)</translation>
-    </message>
-    <message>
-        <source>Transaction status. Hover over this field to show number of confirmations.</source>
-        <translation>Transakzioaren egoera. Pasatu sagua gainetik konfirmazio kopurua ikusteko.</translation>
-    </message>
-    <message>
-        <source>Date and time that the transaction was received.</source>
-        <translation>Transakzioa jasotako data eta ordua.</translation>
-    </message>
-    <message>
-        <source>Type of transaction.</source>
-        <translation>Transakzio mota.</translation>
-    </message>
-    <message>
-        <source>Amount removed from or added to balance.</source>
-        <translation>Saldoan kendu edo gehitutako kopurua.</translation>
-    </message>
-</context>
-<context>
-    <name>TransactionView</name>
-    <message>
-        <source>All</source>
-        <translation>Denak</translation>
-    </message>
-    <message>
-        <source>Today</source>
-        <translation>Gaur</translation>
-    </message>
-    <message>
-        <source>This week</source>
-        <translation>Aste honetan</translation>
-    </message>
-    <message>
-        <source>This month</source>
-        <translation>Hil honetan</translation>
-    </message>
-    <message>
-        <source>Last month</source>
-        <translation>Azken hilean</translation>
-    </message>
-    <message>
-        <source>This year</source>
-        <translation>Aurten</translation>
-    </message>
-    <message>
-        <source>Range...</source>
-        <translation>Muga...</translation>
-    </message>
-    <message>
-        <source>Received with</source>
-        <translation>Jasota honekin: </translation>
-    </message>
-    <message>
-        <source>Sent to</source>
-        <translation>Hona bidalia: </translation>
-    </message>
-    <message>
-        <source>To yourself</source>
-        <translation>Zeure buruari</translation>
-    </message>
-    <message>
-        <source>Mined</source>
-        <translation>Bildua</translation>
-    </message>
-    <message>
-        <source>Other</source>
-        <translation>Beste</translation>
-    </message>
-    <message>
-        <source>Enter address or label to search</source>
-        <translation>Sartu bilatzeko helbide edo etiketa</translation>
-    </message>
-    <message>
-        <source>Min amount</source>
-        <translation>Kopuru minimoa</translation>
-    </message>
-    <message>
-        <source>Copy address</source>
-        <translation>Kopiatu helbidea</translation>
-    </message>
-    <message>
-        <source>Copy label</source>
-        <translation>Kopiatu etiketa</translation>
-    </message>
-    <message>
-        <source>Exporting Failed</source>
-        <translation>Esportatua okerra</translation>
-    </message>
-    <message>
-        <source>Comma separated file (*.csv)</source>
-        <translation>Komaz bereizitako artxiboa (*.csv)</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation>Data</translation>
-    </message>
-    <message>
-        <source>Type</source>
-        <translation>Mota</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Etiketa</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>Helbidea</translation>
-    </message>
-    </context>
 <context>
     <name>UnitDisplayStatusBarControl</name>
     </context>
-<context>
-    <name>WalletFrame</name>
-    </context>
-<context>
-    <name>WalletModel</name>
-    <message>
-        <source>Send Coins</source>
-        <translation>Bidali txanponak</translation>
-    </message>
-</context>
-<context>
-    <name>WalletView</name>
-    <message>
-        <source>&amp;Export</source>
-        <translation>&amp;Esportatu</translation>
-    </message>
-    <message>
-        <source>Export the data in the current tab to a file</source>
-        <translation>Esportatu datuak uneko fitxategian</translation>
-    </message>
-    </context>
 <context>
     <name>bitcoin-core</name>
     <message>
         <source>Options:</source>
         <translation>Aukerak</translation>
     </message>
-    <message>
-        <source>This help message</source>
-        <translation>Laguntza mezu hau</translation>
-    </message>
     <message>
         <source>Rescanning...</source>
         <translation>Birbilatzen...</translation>
diff --git a/src/qt/locale/bitcoin_fa.ts b/src/qt/locale/bitcoin_fa.ts
index 02c216765ce83..5bebb35822c23 100644
--- a/src/qt/locale/bitcoin_fa.ts
+++ b/src/qt/locale/bitcoin_fa.ts
@@ -15,27 +15,23 @@
     </message>
     <message>
         <source>Copy the currently selected address to the system clipboard</source>
-        <translation>کپی نشانی انتخاب شده به حافظهٔ سیستم</translation>
+        <translation>کپی نشانی انتخاب شده کنونی به حافظه‌ی سیستم</translation>
     </message>
     <message>
         <source>&amp;Copy</source>
-        <translation>&amp;رونوشت</translation>
+        <translation>&amp;کپی</translation>
     </message>
     <message>
         <source>C&amp;lose</source>
         <translation>&amp;بستن</translation>
     </message>
-    <message>
-        <source>&amp;Copy Address</source>
-        <translation>&amp;کپی نشانی</translation>
-    </message>
     <message>
         <source>Delete the currently selected address from the list</source>
-        <translation>حذف نشانی انتخاب‌شده از لیست</translation>
+        <translation>حذف نشانی انتخاب‌شده کنونی از لیست</translation>
     </message>
     <message>
         <source>Export the data in the current tab to a file</source>
-        <translation>خروجی گرفتن داده‌های برگهٔ فعلی به یک پرونده</translation>
+        <translation>خروجی گرفتن داده‌های برگه‌ی فعلی به یک فایل</translation>
     </message>
     <message>
         <source>&amp;Export</source>
@@ -45,69 +41,6 @@
         <source>&amp;Delete</source>
         <translation>&amp;حذف</translation>
     </message>
-    <message>
-        <source>Choose the address to send coins to</source>
-        <translation>آدرس مورد نظر برای ارسال کوین ها را انتخاب کنید</translation>
-    </message>
-    <message>
-        <source>Choose the address to receive coins with</source>
-        <translation>آدرس موردنظر برای دریافت کوین ها را انتخاب کنید.</translation>
-    </message>
-    <message>
-        <source>Sending addresses</source>
-        <translation>آدرس های ارسال کننده</translation>
-    </message>
-    <message>
-        <source>Receiving addresses</source>
-        <translation>آدرس های دریافت کننده</translation>
-    </message>
-    <message>
-        <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source>
-        <translation>این‌ها نشانی‌های بیت‌کوین شما برای ارسال وجود هستند. همیشه قبل از ارسال سکه‌ها، نشانی دریافت‌کننده و مقدار ارسالی را بررسی کنید.</translation>
-    </message>
-    <message>
-        <source>These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source>
-        <translation>این‌ها نشانی‌های بیت‌کوین شما برای دریافت وجوه هستند. توصیه می‌شود یک نشانی دریافت جدید برای هر تبادل استفاده کنید.</translation>
-    </message>
-    <message>
-        <source>Copy &amp;Label</source>
-        <translation>کپی و برچسب‌&amp;گذاری</translation>
-    </message>
-    <message>
-        <source>&amp;Edit</source>
-        <translation>&amp;ویرایش</translation>
-    </message>
-    <message>
-        <source>Export Address List</source>
-        <translation>استخراج لیست آدرس</translation>
-    </message>
-    <message>
-        <source>Comma separated file (*.csv)</source>
-        <translation>پروندهٔ نوع CSV جداشونده با کاما (*.csv)</translation>
-    </message>
-    <message>
-        <source>Exporting Failed</source>
-        <translation>استخراج انجام نشد</translation>
-    </message>
-    <message>
-        <source>There was an error trying to save the address list to %1. Please try again.</source>
-        <translation>خطایی هنگام تلاش برای ذخیرهٔ لیست آدرس ها در %1 رخ داد.</translation>
-    </message>
-</context>
-<context>
-    <name>AddressTableModel</name>
-    <message>
-        <source>Label</source>
-        <translation>برچسب</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>آدرس</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(بدون برچسب)</translation>
-    </message>
 </context>
 <context>
     <name>AskPassphraseDialog</name>
@@ -127,97 +60,13 @@
         <source>Repeat new passphrase</source>
         <translation>تکرار گذرواژهٔ جدید</translation>
     </message>
-    <message>
-        <source>Encrypt wallet</source>
-        <translation>رمزنگاری کیف پول</translation>
-    </message>
-    <message>
-        <source>This operation needs your wallet passphrase to unlock the wallet.</source>
-        <translation>انجام این عملیات نیازمند گذرواژهٔ کیف پول شما برای باز کردن قفل آن است.</translation>
-    </message>
-    <message>
-        <source>Unlock wallet</source>
-        <translation>باز کردن قفل کیف پول</translation>
-    </message>
-    <message>
-        <source>This operation needs your wallet passphrase to decrypt the wallet.</source>
-        <translation>انجام این عملیات نیازمند گذرواژهٔ کیف پول شما برای رمزگشایی کردن آن است.</translation>
-    </message>
-    <message>
-        <source>Decrypt wallet</source>
-        <translation>رمزگشایی کیف پول</translation>
-    </message>
-    <message>
-        <source>Change passphrase</source>
-        <translation>تغییر گذرواژه</translation>
-    </message>
-    <message>
-        <source>Confirm wallet encryption</source>
-        <translation>تأیید رمزنگاری کیف پول</translation>
-    </message>
-    <message>
-        <source>Warning: If you encrypt your wallet and lose your passphrase, you will &lt;b&gt;LOSE ALL OF YOUR BITCOINS&lt;/b&gt;!</source>
-        <translation>هشدار: اگر کیف پول خود را رمزنگاری کنید و گذرواژه را فراموش کنید، &lt;b&gt;تمام دارایی بیت‌کوین خود را از دست خواهید داد&lt;/b&gt;!</translation>
-    </message>
-    <message>
-        <source>Are you sure you wish to encrypt your wallet?</source>
-        <translation>آیا مطمئن هستید که می‌خواهید کیف پول خود را رمزنگاری کنید؟</translation>
-    </message>
-    <message>
-        <source>Bitcoin Core will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source>
-        <translation>هسته بیت‌کوین هم اکنون بسته می‌شود تا فرایند رمزگذاری را تمام کند. به خاطر داشته باشید که رمزگذاری کردن کیف پول‌تان نمی‌تواند به طور کامل بیت‌کوین‌های شما را در برابر دزدیده شدن توسط بدافزارهایی که رایانه‌ی شما را آلوده می‌کنند، محافظت نماید.</translation>
-    </message>
-    <message>
-        <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source>
-        <translation>مهم: هر نسخهٔ پشتیبانی که تا کنون از کیف پول خود تهیه کرده‌اید، باید با کیف پول رمزنگاری شدهٔ جدید جایگزین شود. به دلایل امنیتی، پروندهٔ قدیمی کیف پول بدون رمزنگاری، تا زمانی که از کیف پول رمزنگاری‌شدهٔ جدید استفاده نکنید، غیرقابل استفاده خواهد بود.</translation>
-    </message>
-    <message>
-        <source>Warning: The Caps Lock key is on!</source>
-        <translation>هشدار: کلید Caps Lock روشن است!</translation>
-    </message>
-    <message>
-        <source>Wallet encrypted</source>
-        <translation>کیف پول رمزنگاری شد</translation>
-    </message>
-    <message>
-        <source>Enter the new passphrase to the wallet.&lt;br/&gt;Please use a passphrase of &lt;b&gt;ten or more random characters&lt;/b&gt;, or &lt;b&gt;eight or more words&lt;/b&gt;.</source>
-        <translation>رمز جدید کیف پول خود را وارد کنید.&lt;br/&gt;از رمز عبوری استفاده کنید که&lt;b&gt; حداقل 10  کاراکتر تصادفی &lt;/b&gt; و یا &lt;b&gt; حداقل 8 حرف داشته باشد.&lt;/b&gt;</translation>
-    </message>
-    <message>
-        <source>Enter the old passphrase and new passphrase to the wallet.</source>
-        <translation>رمز عبور قدیمی و رمز عبور جدید کیف پول خود را وارد گنید.</translation>
-    </message>
-    <message>
-        <source>Wallet encryption failed</source>
-        <translation>رمزنگاری کیف پول با شکست مواجه شد</translation>
-    </message>
-    <message>
-        <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
-        <translation>رمزنگاری کیف پول بنا به یک خطای داخلی با شکست مواجه شد. کیف پول شما رمزنگاری نشد.</translation>
-    </message>
-    <message>
-        <source>The supplied passphrases do not match.</source>
-        <translation>گذرواژه‌های داده شده با هم تطابق ندارند.</translation>
-    </message>
-    <message>
-        <source>Wallet unlock failed</source>
-        <translation>بازگشایی قفل کیف‌پول با شکست مواجه شد</translation>
-    </message>
-    <message>
-        <source>The passphrase entered for the wallet decryption was incorrect.</source>
-        <translation>گذرواژهٔ وارد شده برای رمزگشایی کیف پول نادرست بود.</translation>
-    </message>
-    <message>
-        <source>Wallet decryption failed</source>
-        <translation>رمزگشایی ناموفق کیف پول</translation>
-    </message>
-    <message>
-        <source>Wallet passphrase was successfully changed.</source>
-        <translation>گذرواژهٔ کیف پول با موفقیت عوض شد.</translation>
-    </message>
 </context>
 <context>
     <name>BanTableModel</name>
+    <message>
+        <source>IP/Netmask</source>
+        <translation>آی‌پی/نت‌ماسک</translation>
+    </message>
     </context>
 <context>
     <name>BitcoinGUI</name>
@@ -257,6 +106,10 @@
         <source>Quit application</source>
         <translation>خروج از برنامه</translation>
     </message>
+    <message>
+        <source>&amp;About %1</source>
+        <translation>&amp;حدود%1</translation>
+    </message>
     <message>
         <source>About &amp;Qt</source>
         <translation>دربارهٔ &amp;کیوت</translation>
@@ -293,10 +146,6 @@
         <source>Open &amp;URI...</source>
         <translation>باز کردن &amp;آدرس</translation>
     </message>
-    <message>
-        <source>Importing blocks from disk...</source>
-        <translation>دریافت بلوک‌ها از دیسک...</translation>
-    </message>
     <message>
         <source>Reindexing blocks on disk...</source>
         <translation>بازنشانی بلوک‌ها روی دیسک...</translation>
@@ -341,10 +190,6 @@
         <source>&amp;Receive</source>
         <translation>&amp;دریافت</translation>
     </message>
-    <message>
-        <source>Show information about Bitcoin Core</source>
-        <translation>نمایش اطلاعات در مورد بیت‌کوین</translation>
-    </message>
     <message>
         <source>&amp;Show / Hide</source>
         <translation>&amp;نمایش/ عدم نمایش</translation>
@@ -381,14 +226,6 @@
         <source>Tabs toolbar</source>
         <translation>نوارابزار برگه‌ها</translation>
     </message>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation> هسته Bitcoin </translation>
-    </message>
-    <message>
-        <source>&amp;About Bitcoin Core</source>
-        <translation>درباره هسته ی بیت کوین</translation>
-    </message>
     <message>
         <source>Show the list of used sending addresses and labels</source>
         <translation>نمایش لیست آدرس های ارسال و لیبل ها</translation>
@@ -461,6 +298,36 @@
         <source>Catching up...</source>
         <translation>به‌روز رسانی...</translation>
     </message>
+    <message>
+        <source>Date: %1
+</source>
+        <translation>تاریخ: %1
+</translation>
+    </message>
+    <message>
+        <source>Amount: %1
+</source>
+        <translation>مقدار: %1
+</translation>
+    </message>
+    <message>
+        <source>Type: %1
+</source>
+        <translation>نوع: %1
+</translation>
+    </message>
+    <message>
+        <source>Label: %1
+</source>
+        <translation>برچسب: %1
+</translation>
+    </message>
+    <message>
+        <source>Address: %1
+</source>
+        <translation>نشانی: %1
+</translation>
+    </message>
     <message>
         <source>Sent transaction</source>
         <translation>تراکنش ارسال شد</translation>
@@ -478,13 +345,6 @@
         <translation>کیف پول &lt;b&gt;رمزنگاری شده&lt;/b&gt; است و هم‌اکنون &lt;b&gt;قفل&lt;/b&gt; است</translation>
     </message>
 </context>
-<context>
-    <name>ClientModel</name>
-    <message>
-        <source>Network Alert</source>
-        <translation>پیام شبکه</translation>
-    </message>
-</context>
 <context>
     <name>CoinControlDialog</name>
     <message>
@@ -519,6 +379,10 @@
         <source>Change:</source>
         <translation>پول خورد:</translation>
     </message>
+    <message>
+        <source>(un)select all</source>
+        <translation>(لغو)انتخاب همه</translation>
+    </message>
     <message>
         <source>Tree mode</source>
         <translation>مدل درختی</translation>
@@ -555,78 +419,6 @@
         <source>Priority</source>
         <translation>اولویت</translation>
     </message>
-    <message>
-        <source>Copy address</source>
-        <translation>کپی نشانی</translation>
-    </message>
-    <message>
-        <source>Copy label</source>
-        <translation>کپی برچسب</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>کپی مقدار</translation>
-    </message>
-    <message>
-        <source>Copy transaction ID</source>
-        <translation>کپی شناسهٔ تراکنش</translation>
-    </message>
-    <message>
-        <source>highest</source>
-        <translation>بیشترین</translation>
-    </message>
-    <message>
-        <source>higher</source>
-        <translation>بیشتر</translation>
-    </message>
-    <message>
-        <source>high</source>
-        <translation>زیاد</translation>
-    </message>
-    <message>
-        <source>medium-high</source>
-        <translation>متوسط متمایل به زیاد</translation>
-    </message>
-    <message>
-        <source>medium</source>
-        <translation>متوسط</translation>
-    </message>
-    <message>
-        <source>low-medium</source>
-        <translation>متوسط متمایل به کم</translation>
-    </message>
-    <message>
-        <source>low</source>
-        <translation>کم</translation>
-    </message>
-    <message>
-        <source>lower</source>
-        <translation>کمتر</translation>
-    </message>
-    <message>
-        <source>lowest</source>
-        <translation>کمترین</translation>
-    </message>
-    <message>
-        <source>none</source>
-        <translation>هیچکدام</translation>
-    </message>
-    <message>
-        <source>yes</source>
-        <translation>بله</translation>
-    </message>
-    <message>
-        <source>no</source>
-        <translation>خیر</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(بدون برچسب)</translation>
-    </message>
-    <message>
-        <source>(change)</source>
-        <translation>(تغییر)</translation>
-    </message>
 </context>
 <context>
     <name>EditAddressDialog</name>
@@ -642,38 +434,6 @@
         <source>&amp;Address</source>
         <translation>&amp;نشانی</translation>
     </message>
-    <message>
-        <source>New receiving address</source>
-        <translation>نشانی دریافتی جدید</translation>
-    </message>
-    <message>
-        <source>New sending address</source>
-        <translation>نشانی ارسالی جدید</translation>
-    </message>
-    <message>
-        <source>Edit receiving address</source>
-        <translation>ویرایش نشانی دریافتی</translation>
-    </message>
-    <message>
-        <source>Edit sending address</source>
-        <translation>ویرایش نشانی ارسالی</translation>
-    </message>
-    <message>
-        <source>The entered address "%1" is already in the address book.</source>
-        <translation>نشانی وارد شده «%1» در حال حاضر در دفترچه وجود دارد.</translation>
-    </message>
-    <message>
-        <source>The entered address "%1" is not a valid Bitcoin address.</source>
-        <translation>نشانی وارد شده «%1» یک نشانی معتبر بیت‌کوین نیست.</translation>
-    </message>
-    <message>
-        <source>Could not unlock wallet.</source>
-        <translation>نمی‌توان کیف پول را رمزگشایی کرد.</translation>
-    </message>
-    <message>
-        <source>New key generation failed.</source>
-        <translation>ایجاد کلید جدید با شکست مواجه شد.</translation>
-    </message>
 </context>
 <context>
     <name>FreespaceChecker</name>
@@ -700,17 +460,13 @@
 </context>
 <context>
     <name>HelpMessageDialog</name>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation> هسته Bitcoin </translation>
-    </message>
     <message>
         <source>version</source>
         <translation>نسخه</translation>
     </message>
     <message>
-        <source>About Bitcoin Core</source>
-        <translation>درباره هسته ی بیت کوین</translation>
+        <source>About %1</source>
+        <translation>درباره %1</translation>
     </message>
     <message>
         <source>Command-line options</source>
@@ -732,12 +488,8 @@
         <translation>خوش‌آمدید</translation>
     </message>
     <message>
-        <source>Welcome to Bitcoin Core.</source>
-        <translation>به هسته بیت کوین خوش آمدید.</translation>
-    </message>
-    <message>
-        <source>As this is the first time the program is launched, you can choose where Bitcoin Core will store its data.</source>
-        <translation>از آنجایی که این اولین اجرای برنامه است، شما می‌توانید مسیر ذخیرهٔ داده‌ها را انتخاب کنید.</translation>
+        <source>Welcome to %1.</source>
+        <translation>به %1 خوش‌آمدید.</translation>
     </message>
     <message>
         <source>Use the default data directory</source>
@@ -747,10 +499,6 @@
         <source>Use a custom data directory:</source>
         <translation>استفاده از یک مسیر سفارشی:</translation>
     </message>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation> هسته Bitcoin </translation>
-    </message>
     <message>
         <source>Error</source>
         <translation>خطا</translation>
@@ -773,6 +521,10 @@
         <source>&amp;Main</source>
         <translation>&amp;عمومی</translation>
     </message>
+    <message>
+        <source>Accept connections from outside</source>
+        <translation>پذیرش اتصالات از بیرون</translation>
+    </message>
     <message>
         <source>Reset all client options to default.</source>
         <translation>بازنشانی تمام تنظیمات به پیش‌فرض.</translation>
@@ -813,6 +565,18 @@
         <source>Port of the proxy (e.g. 9050)</source>
         <translation>درگاه پراکسی (مثال 9050)</translation>
     </message>
+    <message>
+        <source>IPv4</source>
+        <translation>آی‌پی نسخه 4</translation>
+    </message>
+    <message>
+        <source>IPv6</source>
+        <translation>آی‌پی نسخه 6</translation>
+    </message>
+    <message>
+        <source>Tor</source>
+        <translation>تور</translation>
+    </message>
     <message>
         <source>&amp;Window</source>
         <translation>&amp;پنجره</translation>
@@ -926,40 +690,29 @@
     </message>
     </context>
 <context>
-    <name>PaymentServer</name>
-    <message>
-        <source>URI handling</source>
-        <translation>مدیریت URI</translation>
-    </message>
-    <message>
-        <source>Payment request rejected</source>
-        <translation>درخواست پرداخت رد شد.</translation>
-    </message>
+    <name>PeerTableModel</name>
+    </context>
+<context>
+    <name>QObject</name>
     <message>
-        <source>Payment request error</source>
-        <translation>خطای درخواست پرداخت</translation>
+        <source>Amount</source>
+        <translation>مبلغ</translation>
     </message>
     <message>
-        <source>Cannot start bitcoin: click-to-pay handler</source>
-        <translation>نمی‌توان بیت‌کوین را اجرا کرد: کنترل‌کنندهٔ کلیک-و-پرداخت</translation>
+        <source>%1 d</source>
+        <translation>%1 روز</translation>
     </message>
     <message>
-        <source>Payment request expired.</source>
-        <translation>درخواست پرداخت منقضی شد.</translation>
+        <source>%1 h</source>
+        <translation>%1 ساعت</translation>
     </message>
     <message>
-        <source>Invalid payment request.</source>
-        <translation>درخواست پرداخت نامعتبر</translation>
+        <source>%1 m</source>
+        <translation>%1 دقیقه</translation>
     </message>
-    </context>
-<context>
-    <name>PeerTableModel</name>
-    </context>
-<context>
-    <name>QObject</name>
     <message>
-        <source>Amount</source>
-        <translation>مبلغ</translation>
+        <source>%1 s</source>
+        <translation>%1 ثانیه</translation>
     </message>
     <message>
         <source>None</source>
@@ -969,14 +722,11 @@
         <source>N/A</source>
         <translation>ناموجود</translation>
     </message>
-    </context>
-<context>
-    <name>QRImageWidget</name>
     <message>
-        <source>Save QR Code</source>
-        <translation>ذخیرهٔ کد QR</translation>
+        <source>%1 ms</source>
+        <translation>%1 میلیونم ثانیه</translation>
     </message>
-    </context>
+</context>
 <context>
     <name>RPCConsole</name>
     <message>
@@ -999,6 +749,10 @@
         <source>Debug window</source>
         <translation>پنجرهٔ اشکالزدایی</translation>
     </message>
+    <message>
+        <source>General</source>
+        <translation>عمومی</translation>
+    </message>
     <message>
         <source>Startup time</source>
         <translation>زمان آغاز به کار</translation>
@@ -1023,6 +777,10 @@
         <source>Current number of blocks</source>
         <translation>تعداد فعلی بلوک‌ها</translation>
     </message>
+    <message>
+        <source>Memory usage</source>
+        <translation>مصرف حافظه</translation>
+    </message>
     <message>
         <source>Received</source>
         <translation>دریافتی</translation>
@@ -1039,6 +797,10 @@
         <source>Services</source>
         <translation>سرویس ها</translation>
     </message>
+    <message>
+        <source>Last Receive</source>
+        <translation>آخرین دریافتی</translation>
+    </message>
     <message>
         <source>Last block time</source>
         <translation>زمان آخرین بلوک</translation>
@@ -1056,8 +818,8 @@
         <translation>جمع کل:</translation>
     </message>
     <message>
-        <source>Build date</source>
-        <translation>ساخت تاریخ</translation>
+        <source>In:</source>
+        <translation>در:</translation>
     </message>
     <message>
         <source>Debug log file</source>
@@ -1067,10 +829,6 @@
         <source>Clear console</source>
         <translation>پاکسازی کنسول</translation>
     </message>
-    <message>
-        <source>Welcome to the Bitcoin Core RPC console.</source>
-        <translation>به کنسول RPC هسته بیت کوین خوش آمدید.</translation>
-    </message>
     <message>
         <source>Use up and down arrows to navigate history, and &lt;b&gt;Ctrl-L&lt;/b&gt; to clear screen.</source>
         <translation>دکمه‌های بالا و پایین برای پیمایش تاریخچه و &lt;b&gt;Ctrl-L&lt;/b&gt; برای پاک کردن صفحه.</translation>
@@ -1079,6 +837,18 @@
         <source>Type &lt;b&gt;help&lt;/b&gt; for an overview of available commands.</source>
         <translation>برای نمایش یک مرور کلی از دستورات ممکن، عبارت &lt;b&gt;help&lt;/b&gt; را بنویسید.</translation>
     </message>
+    <message>
+        <source>never</source>
+        <translation>هرگز</translation>
+    </message>
+    <message>
+        <source>Yes</source>
+        <translation>بله</translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation>خیر</translation>
+    </message>
     <message>
         <source>Unknown</source>
         <translation>ناشناخته</translation>
@@ -1098,6 +868,10 @@
         <source>&amp;Message:</source>
         <translation>پیام:</translation>
     </message>
+    <message>
+        <source>Clear</source>
+        <translation>پاک‌کردن</translation>
+    </message>
     <message>
         <source>Show</source>
         <translation>نمایش</translation>
@@ -1106,14 +880,6 @@
         <source>Remove</source>
         <translation>حذف کردن</translation>
     </message>
-    <message>
-        <source>Copy label</source>
-        <translation>کپی برچسب</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>کپی مقدار</translation>
-    </message>
 </context>
 <context>
     <name>ReceiveRequestDialog</name>
@@ -1125,95 +891,56 @@
         <source>Copy &amp;Address</source>
         <translation>&amp;کپی نشانی</translation>
     </message>
+    </context>
+<context>
+    <name>SendCoinsDialog</name>
     <message>
-        <source>Address</source>
-        <translation>نشانی</translation>
+        <source>Send Coins</source>
+        <translation>ارسال سکه</translation>
     </message>
     <message>
-        <source>Amount</source>
-        <translation>مبلغ</translation>
+        <source>Insufficient funds!</source>
+        <translation>بود جه نا کافی </translation>
     </message>
     <message>
-        <source>Label</source>
-        <translation>برچسب</translation>
+        <source>Quantity:</source>
+        <translation>تعداد:</translation>
     </message>
     <message>
-        <source>Message</source>
-        <translation>پیام</translation>
+        <source>Bytes:</source>
+        <translation>بایت ها:</translation>
     </message>
     <message>
-        <source>Resulting URI too long, try to reduce the text for label / message.</source>
-        <translation>URL ایجاد شده خیلی طولانی است. سعی کنید طول برچسب و یا پیام را کمتر کنید.</translation>
+        <source>Amount:</source>
+        <translation>مبلغ:</translation>
     </message>
     <message>
-        <source>Error encoding URI into QR Code.</source>
-        <translation>خطا در تبدیل نشانی اینترنتی به صورت کد QR.</translation>
+        <source>Priority:</source>
+        <translation>اولویت:</translation>
     </message>
-</context>
-<context>
-    <name>RecentRequestsTableModel</name>
     <message>
-        <source>Date</source>
-        <translation>تاریخ</translation>
+        <source>Fee:</source>
+        <translation>هزینه:</translation>
     </message>
     <message>
-        <source>Label</source>
-        <translation>برچسب</translation>
+        <source>After Fee:</source>
+        <translation>هزینه ی پسین:</translation>
     </message>
     <message>
-        <source>Message</source>
-        <translation>پیام</translation>
+        <source>Change:</source>
+        <translation>پول خورد:</translation>
     </message>
     <message>
-        <source>Amount</source>
-        <translation>مبلغ</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(بدون برچسب)</translation>
-    </message>
-    </context>
-<context>
-    <name>SendCoinsDialog</name>
-    <message>
-        <source>Send Coins</source>
-        <translation>ارسال سکه</translation>
-    </message>
-    <message>
-        <source>Insufficient funds!</source>
-        <translation>بود جه نا کافی </translation>
-    </message>
-    <message>
-        <source>Quantity:</source>
-        <translation>تعداد:</translation>
-    </message>
-    <message>
-        <source>Bytes:</source>
-        <translation>بایت ها:</translation>
-    </message>
-    <message>
-        <source>Amount:</source>
-        <translation>مبلغ:</translation>
-    </message>
-    <message>
-        <source>Priority:</source>
-        <translation>اولویت:</translation>
-    </message>
-    <message>
-        <source>Fee:</source>
-        <translation>هزینه:</translation>
+        <source>Transaction Fee:</source>
+        <translation>هزینهٔ تراکنش:</translation>
     </message>
     <message>
-        <source>After Fee:</source>
-        <translation>هزینه ی پسین:</translation>
+        <source>Hide</source>
+        <translation>پنهان کردن</translation>
     </message>
     <message>
-        <source>Change:</source>
-        <translation>پول خورد:</translation>
-    </message>
-    <message>
-        <source>Transaction Fee:</source>
-        <translation>هزینهٔ تراکنش:</translation>
+        <source>normal</source>
+        <translation>نرمال</translation>
     </message>
     <message>
         <source>fast</source>
@@ -1243,43 +970,7 @@
         <source>S&amp;end</source>
         <translation>&amp;ارسال</translation>
     </message>
-    <message>
-        <source>Confirm send coins</source>
-        <translation>ارسال سکه را تأیید کنید</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>کپی مقدار</translation>
-    </message>
-    <message>
-        <source>or</source>
-        <translation>یا</translation>
-    </message>
-    <message>
-        <source>The amount to pay must be larger than 0.</source>
-        <translation>مبلغ پرداخت باید بیشتر از ۰ باشد.</translation>
-    </message>
-    <message>
-        <source>The amount exceeds your balance.</source>
-        <translation>میزان پرداخت از تراز شما بیشتر است.</translation>
-    </message>
-    <message>
-        <source>The total exceeds your balance when the %1 transaction fee is included.</source>
-        <translation>با احتساب هزینهٔ %1 برای هر تراکنش، مجموع میزان پرداختی از مبلغ تراز شما بیشتر می‌شود.</translation>
-    </message>
-    <message>
-        <source>Payment request expired.</source>
-        <translation>درخواست پرداخت منقضی شد.</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(بدون برچسب)</translation>
-    </message>
-    <message>
-        <source>Are you sure you want to send?</source>
-        <translation>آیا مطمئن هستید که می خواهید ارسال کنید؟</translation>
-    </message>
-    </context>
+</context>
 <context>
     <name>SendCoinsEntry</name>
     <message>
@@ -1290,10 +981,6 @@
         <source>Pay &amp;To:</source>
         <translation>پرداخ&amp;ت به:</translation>
     </message>
-    <message>
-        <source>Enter a label for this address to add it to your address book</source>
-        <translation>برای این نشانی یک برچسب وارد کنید تا در دفترچهٔ آدرس ذخیره شود</translation>
-    </message>
     <message>
         <source>&amp;Label:</source>
         <translation>&amp;برچسب:</translation>
@@ -1334,7 +1021,11 @@
         <source>Pay To:</source>
         <translation>پرداخت به:</translation>
     </message>
-    </context>
+    <message>
+        <source>Memo:</source>
+        <translation>یادداشت:</translation>
+    </message>
+</context>
 <context>
     <name>ShutdownWindow</name>
     </context>
@@ -1416,69 +1107,9 @@
         <source>Reset all verify message fields</source>
         <translation>بازنشانی تمام فیلدهای پیام</translation>
     </message>
-    <message>
-        <source>Click "Sign Message" to generate signature</source>
-        <translation>برای ایجاد یک امضای جدید روی «امضای پیام» کلیک کنید</translation>
-    </message>
-    <message>
-        <source>The entered address is invalid.</source>
-        <translation>نشانی وارد شده نامعتبر است.</translation>
-    </message>
-    <message>
-        <source>Please check the address and try again.</source>
-        <translation>لطفاً نشانی را بررسی کنید و دوباره تلاش کنید.</translation>
-    </message>
-    <message>
-        <source>The entered address does not refer to a key.</source>
-        <translation>نشانی وارد شده به هیچ کلیدی اشاره نمی‌کند.</translation>
-    </message>
-    <message>
-        <source>Wallet unlock was cancelled.</source>
-        <translation>عملیات باز کرن قفل کیف پول لغو شد.</translation>
-    </message>
-    <message>
-        <source>Private key for the entered address is not available.</source>
-        <translation>کلید خصوصی برای نشانی وارد شده در دسترس نیست.</translation>
-    </message>
-    <message>
-        <source>Message signing failed.</source>
-        <translation>امضای پیام با شکست مواجه شد.</translation>
-    </message>
-    <message>
-        <source>Message signed.</source>
-        <translation>پیام امضا شد.</translation>
-    </message>
-    <message>
-        <source>The signature could not be decoded.</source>
-        <translation>امضا نمی‌تواند کدگشایی شود.</translation>
-    </message>
-    <message>
-        <source>Please check the signature and try again.</source>
-        <translation>لطفاً امضا را بررسی نموده و دوباره تلاش کنید.</translation>
-    </message>
-    <message>
-        <source>The signature did not match the message digest.</source>
-        <translation>امضا با خلاصهٔ پیام مطابقت ندارد.</translation>
-    </message>
-    <message>
-        <source>Message verification failed.</source>
-        <translation>شناسایی پیام با شکست مواجه شد.</translation>
-    </message>
-    <message>
-        <source>Message verified.</source>
-        <translation>پیام شناسایی شد.</translation>
-    </message>
 </context>
 <context>
     <name>SplashScreen</name>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation> هسته Bitcoin </translation>
-    </message>
-    <message>
-        <source>The Bitcoin Core developers</source>
-        <translation>توسعه‌دهندگان هسته بیت‌کوین</translation>
-    </message>
     <message>
         <source>[testnet]</source>
         <translation>آزمایش شبکه</translation>
@@ -1491,394 +1122,16 @@
         <translation>کیلوبایت</translation>
     </message>
 </context>
-<context>
-    <name>TransactionDesc</name>
-    <message>
-        <source>Open until %1</source>
-        <translation>باز تا %1</translation>
-    </message>
-    <message>
-        <source>%1/offline</source>
-        <translation>%1/آفلاین</translation>
-    </message>
-    <message>
-        <source>%1/unconfirmed</source>
-        <translation>%1/تأیید نشده</translation>
-    </message>
-    <message>
-        <source>%1 confirmations</source>
-        <translation>%1 تأییدیه</translation>
-    </message>
-    <message>
-        <source>Status</source>
-        <translation>وضعیت</translation>
-    </message>
-    <message numerus="yes">
-        <source>, broadcast through %n node(s)</source>
-        <translation><numerusform>، پخش از طریق %n گره</numerusform></translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation>تاریخ</translation>
-    </message>
-    <message>
-        <source>Source</source>
-        <translation>منبع</translation>
-    </message>
-    <message>
-        <source>Generated</source>
-        <translation>تولید شده</translation>
-    </message>
-    <message>
-        <source>From</source>
-        <translation>فرستنده</translation>
-    </message>
-    <message>
-        <source>To</source>
-        <translation>گیرنده</translation>
-    </message>
-    <message>
-        <source>own address</source>
-        <translation>آدرس شما</translation>
-    </message>
-    <message>
-        <source>label</source>
-        <translation>برچسب</translation>
-    </message>
-    <message>
-        <source>Credit</source>
-        <translation>بدهی</translation>
-    </message>
-    <message numerus="yes">
-        <source>matures in %n more block(s)</source>
-        <translation><numerusform>بلوغ در %n بلوک دیگر</numerusform></translation>
-    </message>
-    <message>
-        <source>not accepted</source>
-        <translation>پذیرفته نشد</translation>
-    </message>
-    <message>
-        <source>Debit</source>
-        <translation>اعتبار</translation>
-    </message>
-    <message>
-        <source>Transaction fee</source>
-        <translation>هزینهٔ تراکنش</translation>
-    </message>
-    <message>
-        <source>Net amount</source>
-        <translation>مبلغ خالص</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>پیام</translation>
-    </message>
-    <message>
-        <source>Comment</source>
-        <translation>نظر</translation>
-    </message>
-    <message>
-        <source>Transaction ID</source>
-        <translation>شناسهٔ تراکنش</translation>
-    </message>
-    <message>
-        <source>Debug information</source>
-        <translation>اطلاعات اشکال‌زدایی</translation>
-    </message>
-    <message>
-        <source>Transaction</source>
-        <translation>تراکنش</translation>
-    </message>
-    <message>
-        <source>Inputs</source>
-        <translation>ورودی‌ها</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>مبلغ</translation>
-    </message>
-    <message>
-        <source>true</source>
-        <translation>درست</translation>
-    </message>
-    <message>
-        <source>false</source>
-        <translation>نادرست</translation>
-    </message>
-    <message>
-        <source>, has not been successfully broadcast yet</source>
-        <translation>، هنوز با موفقیت ارسال نشده</translation>
-    </message>
-    <message numerus="yes">
-        <source>Open for %n more block(s)</source>
-        <translation><numerusform>باز برای %n بلوک دیگر</numerusform></translation>
-    </message>
-    <message>
-        <source>unknown</source>
-        <translation>ناشناس</translation>
-    </message>
-</context>
 <context>
     <name>TransactionDescDialog</name>
-    <message>
-        <source>Transaction details</source>
-        <translation>جزئیات تراکنش</translation>
-    </message>
     <message>
         <source>This pane shows a detailed description of the transaction</source>
         <translation>این پانل شامل توصیف کاملی از جزئیات تراکنش است</translation>
     </message>
 </context>
-<context>
-    <name>TransactionTableModel</name>
-    <message>
-        <source>Date</source>
-        <translation>تاریخ</translation>
-    </message>
-    <message>
-        <source>Type</source>
-        <translation>نوع</translation>
-    </message>
-    <message numerus="yes">
-        <source>Open for %n more block(s)</source>
-        <translation><numerusform>باز برای %n بلوک دیگر</numerusform></translation>
-    </message>
-    <message>
-        <source>Open until %1</source>
-        <translation>باز شده تا %1</translation>
-    </message>
-    <message>
-        <source>Confirmed (%1 confirmations)</source>
-        <translation>تأیید شده (%1 تأییدیه)</translation>
-    </message>
-    <message>
-        <source>This block was not received by any other nodes and will probably not be accepted!</source>
-        <translation>این بلوک از هیچ همتای دیگری دریافت نشده است و احتمال می‌رود پذیرفته نشود!</translation>
-    </message>
-    <message>
-        <source>Generated but not accepted</source>
-        <translation>تولید شده ولی قبول نشده</translation>
-    </message>
-    <message>
-        <source>Offline</source>
-        <translation>آفلاین</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>برچسب</translation>
-    </message>
-    <message>
-        <source>Unconfirmed</source>
-        <translation>تایید نشده</translation>
-    </message>
-    <message>
-        <source>Received with</source>
-        <translation>دریافت‌شده با</translation>
-    </message>
-    <message>
-        <source>Received from</source>
-        <translation>دریافت‌شده از</translation>
-    </message>
-    <message>
-        <source>Sent to</source>
-        <translation>ارسال‌شده به</translation>
-    </message>
-    <message>
-        <source>Payment to yourself</source>
-        <translation>پر داخت به خودتان</translation>
-    </message>
-    <message>
-        <source>Mined</source>
-        <translation>استخراج‌شده</translation>
-    </message>
-    <message>
-        <source>(n/a)</source>
-        <translation>(ناموجود)</translation>
-    </message>
-    <message>
-        <source>Transaction status. Hover over this field to show number of confirmations.</source>
-        <translation>وضعیت تراکنش. نشانگر را روی این فیلد نگه دارید تا تعداد تأییدیه‌ها نشان داده شود.</translation>
-    </message>
-    <message>
-        <source>Date and time that the transaction was received.</source>
-        <translation>تاریخ و ساعت دریافت تراکنش.</translation>
-    </message>
-    <message>
-        <source>Type of transaction.</source>
-        <translation>نوع تراکنش.</translation>
-    </message>
-    <message>
-        <source>Amount removed from or added to balance.</source>
-        <translation>مبلغ کسر شده و یا اضافه شده به تراز.</translation>
-    </message>
-</context>
-<context>
-    <name>TransactionView</name>
-    <message>
-        <source>All</source>
-        <translation>همه</translation>
-    </message>
-    <message>
-        <source>Today</source>
-        <translation>امروز</translation>
-    </message>
-    <message>
-        <source>This week</source>
-        <translation>این هفته</translation>
-    </message>
-    <message>
-        <source>This month</source>
-        <translation>این ماه</translation>
-    </message>
-    <message>
-        <source>Last month</source>
-        <translation>ماه گذشته</translation>
-    </message>
-    <message>
-        <source>This year</source>
-        <translation>امسال</translation>
-    </message>
-    <message>
-        <source>Range...</source>
-        <translation>محدوده...</translation>
-    </message>
-    <message>
-        <source>Received with</source>
-        <translation>دریافت‌شده با </translation>
-    </message>
-    <message>
-        <source>Sent to</source>
-        <translation>ارسال به</translation>
-    </message>
-    <message>
-        <source>To yourself</source>
-        <translation>به خودتان</translation>
-    </message>
-    <message>
-        <source>Mined</source>
-        <translation>استخراج‌شده</translation>
-    </message>
-    <message>
-        <source>Other</source>
-        <translation>دیگر</translation>
-    </message>
-    <message>
-        <source>Enter address or label to search</source>
-        <translation>برای جست‌‌وجو نشانی یا برچسب را وارد کنید</translation>
-    </message>
-    <message>
-        <source>Min amount</source>
-        <translation>مبلغ حداقل</translation>
-    </message>
-    <message>
-        <source>Copy address</source>
-        <translation>کپی نشانی</translation>
-    </message>
-    <message>
-        <source>Copy label</source>
-        <translation>کپی برچسب</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>کپی مقدار</translation>
-    </message>
-    <message>
-        <source>Copy transaction ID</source>
-        <translation>کپی شناسهٔ تراکنش</translation>
-    </message>
-    <message>
-        <source>Edit label</source>
-        <translation>ویرایش برچسب</translation>
-    </message>
-    <message>
-        <source>Show transaction details</source>
-        <translation>نمایش جزئیات تراکنش</translation>
-    </message>
-    <message>
-        <source>Exporting Failed</source>
-        <translation>استخراج انجام نشد</translation>
-    </message>
-    <message>
-        <source>Exporting Successful</source>
-        <translation>استخراج موفق</translation>
-    </message>
-    <message>
-        <source>Comma separated file (*.csv)</source>
-        <translation>پروندهٔ نوع CSV جداشونده با کاما (*.csv)</translation>
-    </message>
-    <message>
-        <source>Confirmed</source>
-        <translation>تأیید شده</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation>تاریخ</translation>
-    </message>
-    <message>
-        <source>Type</source>
-        <translation>نوع</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>برچسب</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>نشانی</translation>
-    </message>
-    <message>
-        <source>ID</source>
-        <translation>شناسه</translation>
-    </message>
-    <message>
-        <source>Range:</source>
-        <translation>محدوده:</translation>
-    </message>
-    <message>
-        <source>to</source>
-        <translation>به</translation>
-    </message>
-</context>
 <context>
     <name>UnitDisplayStatusBarControl</name>
     </context>
-<context>
-    <name>WalletFrame</name>
-    </context>
-<context>
-    <name>WalletModel</name>
-    <message>
-        <source>Send Coins</source>
-        <translation>ارسال وجه</translation>
-    </message>
-</context>
-<context>
-    <name>WalletView</name>
-    <message>
-        <source>&amp;Export</source>
-        <translation>&amp;صدور</translation>
-    </message>
-    <message>
-        <source>Export the data in the current tab to a file</source>
-        <translation>داده ها  نوارِ جاری را به فایل انتقال دهید</translation>
-    </message>
-    <message>
-        <source>Backup Wallet</source>
-        <translation>نسخهٔ پشتیبان کیف پول</translation>
-    </message>
-    <message>
-        <source>Wallet Data (*.dat)</source>
-        <translation>دادهٔ کیف پول (*.dat)</translation>
-    </message>
-    <message>
-        <source>Backup Failed</source>
-        <translation>خطا در پشتیبان‌گیری</translation>
-    </message>
-    <message>
-        <source>Backup Successful</source>
-        <translation>پشتیبان‌گیری موفق</translation>
-    </message>
-</context>
 <context>
     <name>bitcoin-core</name>
     <message>
@@ -1909,6 +1162,10 @@
         <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
         <translation>پذیرش اتصالات از بیرون (پیش فرض:1 بدون پراکسی یا اتصال)</translation>
     </message>
+    <message>
+        <source>Bitcoin Core</source>
+        <translation> هسته Bitcoin </translation>
+    </message>
     <message>
         <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source>
         <translation>مقید به نشانی داده شده باشید و همیشه از آن پیروی کنید. از نشانه گذاری استاندار IPv6 به صورت Host]:Port] استفاده کنید.</translation>
@@ -1929,6 +1186,14 @@
         <source>Connect only to the specified node(s)</source>
         <translation>تنها در گره (های) مشخص شده متصل شوید</translation>
     </message>
+    <message>
+        <source>Connection options:</source>
+        <translation>گزینه‌های اتصال:</translation>
+    </message>
+    <message>
+        <source>Copyright (C) %i-%i</source>
+        <translation>حق تألیف (C) %i-%i</translation>
+    </message>
     <message>
         <source>Corrupted block database detected</source>
         <translation>یک پایگاه داده ی بلوک خراب یافت شد</translation>
@@ -1941,6 +1206,10 @@
         <source>Error initializing block database</source>
         <translation>خطا در آماده سازی پایگاه داده ی بلوک</translation>
     </message>
+    <message>
+        <source>Error loading %s</source>
+        <translation>خطا در بارگیری %s</translation>
+    </message>
     <message>
         <source>Error loading block database</source>
         <translation>خطا در بارگذاری پایگاه داده ها</translation>
@@ -1961,37 +1230,53 @@
         <source>Importing...</source>
         <translation>در حال پیاده‌سازی...</translation>
     </message>
+    <message>
+        <source>Loading banlist...</source>
+        <translation>بارگذاری لیست‌سیاه...</translation>
+    </message>
+    <message>
+        <source>Print this help message and exit</source>
+        <translation>چاپ ایت پیام کمک و خروج</translation>
+    </message>
+    <message>
+        <source>Print version and exit</source>
+        <translation>چاپ نسخه و خروج</translation>
+    </message>
     <message>
         <source>Verifying blocks...</source>
-        <translation>در حال بازبینی بلوک ها...</translation>
+        <translation>در حال بازبینی بلوک‌ها...</translation>
     </message>
     <message>
         <source>Verifying wallet...</source>
         <translation>در حال بازبینی کیف پول...</translation>
     </message>
+    <message>
+        <source>Wallet options:</source>
+        <translation>گزینه‌های کیف پول:</translation>
+    </message>
     <message>
         <source>Information</source>
         <translation>اطلاعات</translation>
     </message>
     <message>
-        <source>Invalid amount for -maxtxfee=&lt;amount&gt;: '%s'</source>
-        <translation>میزان وجه اشتباه برای maxtxfee=&lt;میزان وجه&gt;: %s</translation>
+        <source>Send trace/debug info to console instead of debug.log file</source>
+        <translation>اطلاعات ردگیری/اشکال‌زدایی را به جای فایل لاگ اشکال‌زدایی به کنسول بفرستید</translation>
     </message>
     <message>
-        <source>Invalid amount for -minrelaytxfee=&lt;amount&gt;: '%s'</source>
-        <translation>میزان وجه اشتباه برای minrelaytxfee=&lt;میزان وجه&gt;: %s</translation>
+        <source>Shrink debug.log file on client startup (default: 1 when no -debug)</source>
+        <translation>فایل debug.log  را در startup مشتری کوچک کن (پیش فرض:1 اگر اشکال زدایی روی نداد)</translation>
     </message>
     <message>
-        <source>Invalid amount for -mintxfee=&lt;amount&gt;: '%s'</source>
-        <translation>میزان وجه اشتباه برای mintxfee=&lt;میزان وجه&gt;: %s</translation>
+        <source>Transaction amount too small</source>
+        <translation>مقدار تراکنش بسیار کم است</translation>
     </message>
     <message>
-        <source>Send trace/debug info to console instead of debug.log file</source>
-        <translation>اطلاعات ردگیری/اشکال‌زدایی را به جای فایل لاگ اشکال‌زدایی به کنسول بفرستید</translation>
+        <source>Transaction amounts must be positive</source>
+        <translation>مقادیر تراکنش باید مثبت باشد</translation>
     </message>
     <message>
-        <source>Shrink debug.log file on client startup (default: 1 when no -debug)</source>
-        <translation>فایل debug.log  را در startup مشتری کوچک کن (پیش فرض:1 اگر اشکال زدایی روی نداد)</translation>
+        <source>Transaction too large</source>
+        <translation>تراکنش بسیار بزرگ است</translation>
     </message>
     <message>
         <source>Username for JSON-RPC connections</source>
@@ -2001,6 +1286,10 @@
         <source>Warning</source>
         <translation>هشدار</translation>
     </message>
+    <message>
+        <source>Warning: unknown new rules activated (versionbit %i)</source>
+        <translation>هشدار: قوانین جدید ناشناخته‌ای فعال شده‌اند (نسخه‌بیت %i)</translation>
+    </message>
     <message>
         <source>Password for JSON-RPC connections</source>
         <translation>JSON-RPC عبارت عبور برای ارتباطات</translation>
@@ -2009,10 +1298,6 @@
         <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
         <translation>زمانی که بهترین بلاک تغییر کرد، دستور را اجرا کن (%s در cmd با block hash جایگزین شده است)</translation>
     </message>
-    <message>
-        <source>This help message</source>
-        <translation>پیام کمکی</translation>
-    </message>
     <message>
         <source>Allow DNS lookups for -addnode, -seednode and -connect</source>
         <translation>به DNS اجازه بده تا برای addnode ، seednode و اتصال جستجو کند</translation>
@@ -2021,14 +1306,6 @@
         <source>Loading addresses...</source>
         <translation>بار گیری آدرس ها</translation>
     </message>
-    <message>
-        <source>Error loading wallet.dat: Wallet corrupted</source>
-        <translation>خطا در بارگیری wallet.dat: کیف پول خراب شده است</translation>
-    </message>
-    <message>
-        <source>Error loading wallet.dat</source>
-        <translation>خطا در بارگیری wallet.dat</translation>
-    </message>
     <message>
         <source>Invalid -proxy address: '%s'</source>
         <translation>آدرس پراکسی اشتباه %s</translation>
@@ -2037,18 +1314,6 @@
         <source>Unknown network specified in -onlynet: '%s'</source>
         <translation>شبکه مشخص شده غیرقابل شناسایی در onlynet: '%s'</translation>
     </message>
-    <message>
-        <source>Cannot resolve -bind address: '%s'</source>
-        <translation>آدرس قابل اتصال- شناسایی نیست %s</translation>
-    </message>
-    <message>
-        <source>Cannot resolve -externalip address: '%s'</source>
-        <translation>آدرس خارجی قابل اتصال- شناسایی نیست %s</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -paytxfee=&lt;amount&gt;: '%s'</source>
-        <translation>میزان وجه اشتباه برای paytxfee=&lt;میزان وجه&gt;: %s</translation>
-    </message>
     <message>
         <source>Insufficient funds</source>
         <translation>بود جه نا کافی </translation>
diff --git a/src/qt/locale/bitcoin_fa_IR.ts b/src/qt/locale/bitcoin_fa_IR.ts
index 8bbfc724243bc..b329612ded011 100644
--- a/src/qt/locale/bitcoin_fa_IR.ts
+++ b/src/qt/locale/bitcoin_fa_IR.ts
@@ -21,10 +21,6 @@
         <source>C&amp;lose</source>
         <translation>بستن</translation>
     </message>
-    <message>
-        <source>&amp;Copy Address</source>
-        <translation>کپی آدرس</translation>
-    </message>
     <message>
         <source>Delete the currently selected address from the list</source>
         <translation>حذف آدرس های انتخاب شده از لیست</translation>
@@ -41,65 +37,6 @@
         <source>&amp;Delete</source>
         <translation>حذف</translation>
     </message>
-    <message>
-        <source>Choose the address to send coins to</source>
-        <translation>انتخاب آدرس جهت ارسال کوین ها به آن آدرس</translation>
-    </message>
-    <message>
-        <source>Choose the address to receive coins with</source>
-        <translation>انتخاب آدرس جهت دریافت کوین ها از آن آدرس</translation>
-    </message>
-    <message>
-        <source>C&amp;hoose</source>
-        <translation>انتخاب</translation>
-    </message>
-    <message>
-        <source>Sending addresses</source>
-        <translation>ارسال آدرس ها</translation>
-    </message>
-    <message>
-        <source>Receiving addresses</source>
-        <translation>دریافت آدرس ها</translation>
-    </message>
-    <message>
-        <source>Copy &amp;Label</source>
-        <translation>کپی برچسب</translation>
-    </message>
-    <message>
-        <source>&amp;Edit</source>
-        <translation>ویرایش</translation>
-    </message>
-    <message>
-        <source>Export Address List</source>
-        <translation>صدور لیست آدرس</translation>
-    </message>
-    <message>
-        <source>Comma separated file (*.csv)</source>
-        <translation>فایل سی اس وی (*.csv)</translation>
-    </message>
-    <message>
-        <source>Exporting Failed</source>
-        <translation>صدور با شکست مواجه شد</translation>
-    </message>
-    <message>
-        <source>There was an error trying to save the address list to %1. Please try again.</source>
-        <translation>خطایی به هنگام ذخیره لیست آدرس در %1 رخ داده است. لطفا دوباره تلاش کنید.</translation>
-    </message>
-</context>
-<context>
-    <name>AddressTableModel</name>
-    <message>
-        <source>Label</source>
-        <translation>برچسب</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>حساب</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(برچسب ندارد)</translation>
-    </message>
 </context>
 <context>
     <name>AskPassphraseDialog</name>
@@ -119,74 +56,6 @@
         <source>Repeat new passphrase</source>
         <translation>رمز/پَس فرِیز را دوباره وارد کنید</translation>
     </message>
-    <message>
-        <source>Encrypt wallet</source>
-        <translation>wallet را رمزگذاری کنید</translation>
-    </message>
-    <message>
-        <source>This operation needs your wallet passphrase to unlock the wallet.</source>
-        <translation>برای انجام این عملکرد به رمز/پَس فرِیزِwallet نیاز است تا آن را از حالت قفل درآورد.</translation>
-    </message>
-    <message>
-        <source>Unlock wallet</source>
-        <translation>باز کردن قفل wallet </translation>
-    </message>
-    <message>
-        <source>This operation needs your wallet passphrase to decrypt the wallet.</source>
-        <translation>برای کشف رمز wallet، به رمز/پَس فرِیزِwallet نیاز است.</translation>
-    </message>
-    <message>
-        <source>Decrypt wallet</source>
-        <translation>کشف رمز wallet</translation>
-    </message>
-    <message>
-        <source>Change passphrase</source>
-        <translation>تغییر رمز/پَس فرِیز</translation>
-    </message>
-    <message>
-        <source>Confirm wallet encryption</source>
-        <translation>رمزگذاری wallet را تایید کنید</translation>
-    </message>
-    <message>
-        <source>Warning: The Caps Lock key is on!</source>
-        <translation>اخطار: کلید Caps Lock فعال است!</translation>
-    </message>
-    <message>
-        <source>Wallet encrypted</source>
-        <translation>تایید رمزگذاری</translation>
-    </message>
-    <message>
-        <source>Enter the old passphrase and new passphrase to the wallet.</source>
-        <translation>رمز قدیمی و جدید کیف پول را وارد کنید.</translation>
-    </message>
-    <message>
-        <source>Wallet encryption failed</source>
-        <translation>رمزگذاری تایید نشد</translation>
-    </message>
-    <message>
-        <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
-        <translation>رمزگذاری به علت خطای داخلی تایید نشد. wallet شما رمزگذاری نشد</translation>
-    </message>
-    <message>
-        <source>The supplied passphrases do not match.</source>
-        <translation>رمزهای/پَس فرِیزهایِ وارد شده با هم تطابق ندارند</translation>
-    </message>
-    <message>
-        <source>Wallet unlock failed</source>
-        <translation>قفل wallet  باز نشد</translation>
-    </message>
-    <message>
-        <source>The passphrase entered for the wallet decryption was incorrect.</source>
-        <translation>رمزهای/پَس فرِیزهایِ وارد شده wallet برای کشف رمز اشتباه است.</translation>
-    </message>
-    <message>
-        <source>Wallet decryption failed</source>
-        <translation>کشف رمز wallet انجام نشد</translation>
-    </message>
-    <message>
-        <source>Wallet passphrase was successfully changed.</source>
-        <translation>رمز عبور کیف پول با موفقیت تغییر کرد.</translation>
-    </message>
 </context>
 <context>
     <name>BanTableModel</name>
@@ -322,13 +191,6 @@
         <translation>wallet رمزگذاری شد و در حال حاضر قفل است</translation>
     </message>
 </context>
-<context>
-    <name>ClientModel</name>
-    <message>
-        <source>Network Alert</source>
-        <translation>هشدار شبکه</translation>
-    </message>
-</context>
 <context>
     <name>CoinControlDialog</name>
     <message>
@@ -347,22 +209,6 @@
         <source>Confirmed</source>
         <translation>تایید شده</translation>
     </message>
-    <message>
-        <source>Copy address</source>
-        <translation>آدرس را کپی کنید</translation>
-    </message>
-    <message>
-        <source>Copy label</source>
-        <translation>برچسب را کپی کنید</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>میزان وجه کپی شود</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(برچسب ندارد)</translation>
-    </message>
     </context>
 <context>
     <name>EditAddressDialog</name>
@@ -378,39 +224,6 @@
         <source>&amp;Address</source>
         <translation>حساب&amp;</translation>
     </message>
-    <message>
-        <source>New receiving address</source>
-        <translation>حساب دریافت کننده جدید
-</translation>
-    </message>
-    <message>
-        <source>New sending address</source>
-        <translation>حساب ارسال کننده جدید</translation>
-    </message>
-    <message>
-        <source>Edit receiving address</source>
-        <translation>ویرایش حساب دریافت کننده</translation>
-    </message>
-    <message>
-        <source>Edit sending address</source>
-        <translation>ویرایش حساب ارسال کننده</translation>
-    </message>
-    <message>
-        <source>The entered address "%1" is already in the address book.</source>
-        <translation>حساب وارد شده «%1» از پیش در دفترچه حساب ها موجود است.</translation>
-    </message>
-    <message>
-        <source>The entered address "%1" is not a valid Bitcoin address.</source>
-        <translation>آدرس وارد شده "%1" یک آدرس صحیح برای bitcoin نسشت</translation>
-    </message>
-    <message>
-        <source>Could not unlock wallet.</source>
-        <translation>عدم توانیی برای قفل گشایی wallet</translation>
-    </message>
-    <message>
-        <source>New key generation failed.</source>
-        <translation>عدم توانیی در ایجاد کلید جدید</translation>
-    </message>
 </context>
 <context>
     <name>FreespaceChecker</name>
@@ -474,9 +287,6 @@
         <translation>اطلاعات نمایش داده شده ممکن است روزآمد نباشد. wallet شما به صورت خودکار بعد از برقراری اتصال با شبکه bitcoin به روز می شود اما این فرایند هنوز تکمیل نشده است.</translation>
     </message>
     </context>
-<context>
-    <name>PaymentServer</name>
-    </context>
 <context>
     <name>PeerTableModel</name>
     </context>
@@ -487,9 +297,6 @@
         <translation>میزان</translation>
     </message>
     </context>
-<context>
-    <name>QRImageWidget</name>
-    </context>
 <context>
     <name>RPCConsole</name>
     <message>
@@ -531,68 +338,13 @@
         <source>&amp;Message:</source>
         <translation>پیام:</translation>
     </message>
-    <message>
-        <source>Copy label</source>
-        <translation>برچسب را کپی کنید</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>میزان وجه کپی شود</translation>
-    </message>
-</context>
+    </context>
 <context>
     <name>ReceiveRequestDialog</name>
     <message>
         <source>Copy &amp;Address</source>
         <translation>کپی آدرس</translation>
     </message>
-    <message>
-        <source>Address</source>
-        <translation>حساب</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>میزان</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>برچسب</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>پیام</translation>
-    </message>
-    <message>
-        <source>Resulting URI too long, try to reduce the text for label / message.</source>
-        <translation>متن وارد شده طولانی است، متنِ برچسب/پیام را کوتاه کنید</translation>
-    </message>
-    <message>
-        <source>Error encoding URI into QR Code.</source>
-        <translation>خطای تبدیل URI به کد QR</translation>
-    </message>
-</context>
-<context>
-    <name>RecentRequestsTableModel</name>
-    <message>
-        <source>Date</source>
-        <translation>تاریخ</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>برچسب</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>پیام</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>میزان</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(برچسب ندارد)</translation>
-    </message>
     </context>
 <context>
     <name>SendCoinsDialog</name>
@@ -624,27 +376,7 @@
         <source>S&amp;end</source>
         <translation>و ارسال</translation>
     </message>
-    <message>
-        <source>Confirm send coins</source>
-        <translation>تایید ارسال بیت کوین ها</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>میزان وجه کپی شود</translation>
-    </message>
-    <message>
-        <source>The amount to pay must be larger than 0.</source>
-        <translation>میزان پرداخت باید بیشتر از 0 باشد</translation>
-    </message>
-    <message>
-        <source>The amount exceeds your balance.</source>
-        <translation>مقدار مورد نظر از مانده حساب بیشتر است.</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(برچسب ندارد)</translation>
-    </message>
-    </context>
+</context>
 <context>
     <name>SendCoinsEntry</name>
     <message>
@@ -655,10 +387,6 @@
         <source>Pay &amp;To:</source>
         <translation>پرداخت و به چه کسی</translation>
     </message>
-    <message>
-        <source>Enter a label for this address to add it to your address book</source>
-        <translation>یک برچسب برای این آدرس بنویسید تا به دفترچه آدرسهای شما اضافه شود</translation>
-    </message>
     <message>
         <source>&amp;Label:</source>
         <translation>و برچسب</translation>
@@ -690,10 +418,6 @@
 </context>
 <context>
     <name>ShutdownWindow</name>
-    <message>
-        <source>Bitcoin Core is shutting down...</source>
-        <translation>هسته بیت کوین در حال خاموش شدن است...</translation>
-    </message>
     <message>
         <source>Do not shut down the computer until this window disappears.</source>
         <translation>تا پیش از بسته شدن این پنجره کامپیوتر خود را خاموش نکنید.</translation>
@@ -732,287 +456,16 @@
 <context>
     <name>TrafficGraphWidget</name>
     </context>
-<context>
-    <name>TransactionDesc</name>
-    <message>
-        <source>Open until %1</source>
-        <translation>باز کن تا %1</translation>
-    </message>
-    <message>
-        <source>%1/unconfirmed</source>
-        <translation>%1 / تایید نشده</translation>
-    </message>
-    <message>
-        <source>%1 confirmations</source>
-        <translation>%1 تایید</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation>تاریخ</translation>
-    </message>
-    <message>
-        <source>label</source>
-        <translation>برچسب</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>پیام</translation>
-    </message>
-    <message>
-        <source>Transaction ID</source>
-        <translation>شناسه کاربری</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>میزان</translation>
-    </message>
-    <message>
-        <source>, has not been successfully broadcast yet</source>
-        <translation>، هنوز با موفقیت ارسال نگردیده است</translation>
-    </message>
-    <message>
-        <source>unknown</source>
-        <translation>ناشناس</translation>
-    </message>
-</context>
 <context>
     <name>TransactionDescDialog</name>
-    <message>
-        <source>Transaction details</source>
-        <translation>جزئیات تراکنش</translation>
-    </message>
     <message>
         <source>This pane shows a detailed description of the transaction</source>
         <translation>این بخش جزئیات تراکنش را نشان می دهد</translation>
     </message>
 </context>
-<context>
-    <name>TransactionTableModel</name>
-    <message>
-        <source>Date</source>
-        <translation>تاریخ</translation>
-    </message>
-    <message>
-        <source>Type</source>
-        <translation>گونه</translation>
-    </message>
-    <message>
-        <source>Open until %1</source>
-        <translation>باز کن تا %1</translation>
-    </message>
-    <message>
-        <source>Confirmed (%1 confirmations)</source>
-        <translation>تایید شده (%1 تاییدها)</translation>
-    </message>
-    <message>
-        <source>This block was not received by any other nodes and will probably not be accepted!</source>
-        <translation>این block توسط گره های دیگری دریافت نشده است و ممکن است قبول نشود</translation>
-    </message>
-    <message>
-        <source>Generated but not accepted</source>
-        <translation>تولید شده اما قبول نشده است</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>برچسب</translation>
-    </message>
-    <message>
-        <source>Received with</source>
-        <translation>دریافت با</translation>
-    </message>
-    <message>
-        <source>Received from</source>
-        <translation>دریافت شده از</translation>
-    </message>
-    <message>
-        <source>Sent to</source>
-        <translation>ارسال به</translation>
-    </message>
-    <message>
-        <source>Payment to yourself</source>
-        <translation>وجه برای شما </translation>
-    </message>
-    <message>
-        <source>Mined</source>
-        <translation>استخراج شده</translation>
-    </message>
-    <message>
-        <source>(n/a)</source>
-        <translation>خالی</translation>
-    </message>
-    <message>
-        <source>Transaction status. Hover over this field to show number of confirmations.</source>
-        <translation>وضعیت تراکنش. با اشاره به این بخش تعداد تاییدها نمایش داده می شود</translation>
-    </message>
-    <message>
-        <source>Date and time that the transaction was received.</source>
-        <translation>زمان و تاریخی که تراکنش دریافت شده است</translation>
-    </message>
-    <message>
-        <source>Type of transaction.</source>
-        <translation>نوع تراکنش</translation>
-    </message>
-    <message>
-        <source>Amount removed from or added to balance.</source>
-        <translation>میزان وجه کم شده یا اضافه شده به حساب</translation>
-    </message>
-</context>
-<context>
-    <name>TransactionView</name>
-    <message>
-        <source>All</source>
-        <translation>همه</translation>
-    </message>
-    <message>
-        <source>Today</source>
-        <translation>امروز</translation>
-    </message>
-    <message>
-        <source>This week</source>
-        <translation>این هفته</translation>
-    </message>
-    <message>
-        <source>This month</source>
-        <translation>این ماه</translation>
-    </message>
-    <message>
-        <source>Last month</source>
-        <translation>ماه گذشته</translation>
-    </message>
-    <message>
-        <source>This year</source>
-        <translation>این سال</translation>
-    </message>
-    <message>
-        <source>Range...</source>
-        <translation>حدود..</translation>
-    </message>
-    <message>
-        <source>Received with</source>
-        <translation>دریافت با</translation>
-    </message>
-    <message>
-        <source>Sent to</source>
-        <translation>ارسال به</translation>
-    </message>
-    <message>
-        <source>To yourself</source>
-        <translation>به شما</translation>
-    </message>
-    <message>
-        <source>Mined</source>
-        <translation>استخراج شده</translation>
-    </message>
-    <message>
-        <source>Other</source>
-        <translation>دیگر</translation>
-    </message>
-    <message>
-        <source>Enter address or label to search</source>
-        <translation>آدرس یا برچسب را برای جستجو وارد کنید</translation>
-    </message>
-    <message>
-        <source>Min amount</source>
-        <translation>حداقل میزان وجه</translation>
-    </message>
-    <message>
-        <source>Copy address</source>
-        <translation>آدرس را کپی کنید</translation>
-    </message>
-    <message>
-        <source>Copy label</source>
-        <translation>برچسب را کپی کنید</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>میزان وجه کپی شود</translation>
-    </message>
-    <message>
-        <source>Edit label</source>
-        <translation>برچسب را ویرایش کنید</translation>
-    </message>
-    <message>
-        <source>Exporting Failed</source>
-        <translation>صدور با شکست مواجه شد</translation>
-    </message>
-    <message>
-        <source>Exporting Successful</source>
-        <translation>صدور با موفقیت انجام شد</translation>
-    </message>
-    <message>
-        <source>Comma separated file (*.csv)</source>
-        <translation>Comma separated file (*.csv) فایل جداگانه دستوری</translation>
-    </message>
-    <message>
-        <source>Confirmed</source>
-        <translation>تایید شده</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation>تاریخ</translation>
-    </message>
-    <message>
-        <source>Type</source>
-        <translation>گونه</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>برچسب</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>حساب</translation>
-    </message>
-    <message>
-        <source>ID</source>
-        <translation>شناسه کاربری</translation>
-    </message>
-    <message>
-        <source>Range:</source>
-        <translation>دامنه:</translation>
-    </message>
-    <message>
-        <source>to</source>
-        <translation>به</translation>
-    </message>
-</context>
 <context>
     <name>UnitDisplayStatusBarControl</name>
     </context>
-<context>
-    <name>WalletFrame</name>
-    </context>
-<context>
-    <name>WalletModel</name>
-    <message>
-        <source>Send Coins</source>
-        <translation>سکه های ارسالی</translation>
-    </message>
-</context>
-<context>
-    <name>WalletView</name>
-    <message>
-        <source>&amp;Export</source>
-        <translation>صدور</translation>
-    </message>
-    <message>
-        <source>Export the data in the current tab to a file</source>
-        <translation>صدور داده نوار جاری به یک فایل</translation>
-    </message>
-    <message>
-        <source>Backup Wallet</source>
-        <translation>گرفتن نسخه پیشتیبان از Wallet</translation>
-    </message>
-    <message>
-        <source>Wallet Data (*.dat)</source>
-        <translation>داده های Wallet  
-(*.dat)</translation>
-    </message>
-    <message>
-        <source>Backup Failed</source>
-        <translation>عملیات گرفتن نسخه پیشتیبان انجام نشد</translation>
-    </message>
-    </context>
 <context>
     <name>bitcoin-core</name>
     <message>
@@ -1035,18 +488,6 @@
         <source>The transaction amount is too small to send after the fee has been deducted</source>
         <translation>مبلغ تراکنش کمتر از آن است که پس از کسر هزینه  تراکنش قابل ارسال باشد</translation>
     </message>
-    <message>
-        <source>Invalid amount for -maxtxfee=&lt;amount&gt;: '%s'</source>
-        <translation>میزان اشتباه است for -maxtxfee=&lt;amount&gt;: '%s'</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -minrelaytxfee=&lt;amount&gt;: '%s'</source>
-        <translation>میزان اشتباه است for -minrelaytxfee=&lt;amount&gt;: '%s'</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -mintxfee=&lt;amount&gt;: '%s'</source>
-        <translation>میزان اشتباه است for -mintxfee=&lt;amount&gt;: '%s'</translation>
-    </message>
     <message>
         <source>RPC server options:</source>
         <translation>گزینه های سرویس دهنده RPC:</translation>
@@ -1071,22 +512,10 @@
         <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
         <translation>دستور را وقتی بهترین بلاک تغییر کرد اجرا کن (%s در دستور توسط block hash جایگزین شده است)</translation>
     </message>
-    <message>
-        <source>This help message</source>
-        <translation>این پیام راهنما</translation>
-    </message>
     <message>
         <source>Loading addresses...</source>
         <translation>لود شدن آدرسها..</translation>
     </message>
-    <message>
-        <source>Error loading wallet.dat: Wallet corrupted</source>
-        <translation>خطا در هنگام لود شدن wallet.dat: Wallet corrupted</translation>
-    </message>
-    <message>
-        <source>Error loading wallet.dat</source>
-        <translation>خطا در هنگام لود شدن wallet.dat</translation>
-    </message>
     <message>
         <source>Set minimum block size in bytes (default: %u)</source>
         <translation>تنظیم کمینه اندازه بلاک بر حسب بایت (پیش فرض: %u)</translation>
@@ -1103,10 +532,6 @@
         <source>Specify pid file (default: %s)</source>
         <translation>فایل pid را مشخص کنید (پیش فرض: %s)</translation>
     </message>
-    <message>
-        <source>Invalid amount for -paytxfee=&lt;amount&gt;: '%s'</source>
-        <translation>میزان اشتباه است for -paytxfee=&lt;amount&gt;: '%s'</translation>
-    </message>
     <message>
         <source>Insufficient funds</source>
         <translation>وجوه ناکافی</translation>
diff --git a/src/qt/locale/bitcoin_fi.ts b/src/qt/locale/bitcoin_fi.ts
index 0fb6aebb9fe9a..c2226e9b985f2 100644
--- a/src/qt/locale/bitcoin_fi.ts
+++ b/src/qt/locale/bitcoin_fi.ts
@@ -25,10 +25,6 @@
         <source>C&amp;lose</source>
         <translation>S&amp;ulje</translation>
     </message>
-    <message>
-        <source>&amp;Copy Address</source>
-        <translation>&amp;Kopioi osoite</translation>
-    </message>
     <message>
         <source>Delete the currently selected address from the list</source>
         <translation>Poista valittu osoite listalta</translation>
@@ -45,73 +41,6 @@
         <source>&amp;Delete</source>
         <translation>&amp;Poista</translation>
     </message>
-    <message>
-        <source>Choose the address to send coins to</source>
-        <translation>Valitse osoite johon kolikot lähetetään</translation>
-    </message>
-    <message>
-        <source>Choose the address to receive coins with</source>
-        <translation>Valitse osoite johon vastaanotetaan kolikoita</translation>
-    </message>
-    <message>
-        <source>C&amp;hoose</source>
-        <translation>V&amp;alitse</translation>
-    </message>
-    <message>
-        <source>Sending addresses</source>
-        <translation>Lähettävä osoite</translation>
-    </message>
-    <message>
-        <source>Receiving addresses</source>
-        <translation>Vastaanottava osoite</translation>
-    </message>
-    <message>
-        <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source>
-        <translation>Nämä ovat sinun Bitcoin osoitteita maksujen lähetykseen. Tarkista aina summa ja vastaanottajan osoite ennenkuin lähetät kolikkoja.</translation>
-    </message>
-    <message>
-        <source>These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source>
-        <translation>Nämä ovat sinun Bitcoin-osoitteesi suoritusten vastaanottamiseen. Suositellaan että annat uuden osoitteen kullekin transaktiolle.</translation>
-    </message>
-    <message>
-        <source>Copy &amp;Label</source>
-        <translation>Kopioi &amp;nimike</translation>
-    </message>
-    <message>
-        <source>&amp;Edit</source>
-        <translation>&amp;Muokkaa</translation>
-    </message>
-    <message>
-        <source>Export Address List</source>
-        <translation>Vie osoitekirja</translation>
-    </message>
-    <message>
-        <source>Comma separated file (*.csv)</source>
-        <translation>Comma separated file (*.csv)</translation>
-    </message>
-    <message>
-        <source>Exporting Failed</source>
-        <translation>Vienti epäonnistui</translation>
-    </message>
-    <message>
-        <source>There was an error trying to save the address list to %1. Please try again.</source>
-        <translation>Virhe tallentaessa osoitelistaa %1. Yritä uudelleen.</translation>
-    </message>
-</context>
-<context>
-    <name>AddressTableModel</name>
-    <message>
-        <source>Label</source>
-        <translation>Nimi</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>Osoite</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(ei nimikettä)</translation>
-    </message>
 </context>
 <context>
     <name>AskPassphraseDialog</name>
@@ -131,94 +60,6 @@
         <source>Repeat new passphrase</source>
         <translation>Toista uusi tunnuslause</translation>
     </message>
-    <message>
-        <source>Encrypt wallet</source>
-        <translation>Salaa lompakko</translation>
-    </message>
-    <message>
-        <source>This operation needs your wallet passphrase to unlock the wallet.</source>
-        <translation>Tätä toimintoa varten sinun täytyy antaa lompakon tunnuslause sen avaamiseksi.</translation>
-    </message>
-    <message>
-        <source>Unlock wallet</source>
-        <translation>Avaa lompakko</translation>
-    </message>
-    <message>
-        <source>This operation needs your wallet passphrase to decrypt the wallet.</source>
-        <translation>Tätä toimintoa varten sinun täytyy antaa lompakon tunnuslause salauksen purkuun.</translation>
-    </message>
-    <message>
-        <source>Decrypt wallet</source>
-        <translation>Pura lompakon salaus</translation>
-    </message>
-    <message>
-        <source>Change passphrase</source>
-        <translation>Vaihda tunnuslause</translation>
-    </message>
-    <message>
-        <source>Confirm wallet encryption</source>
-        <translation>Vahvista lompakon salaus</translation>
-    </message>
-    <message>
-        <source>Warning: If you encrypt your wallet and lose your passphrase, you will &lt;b&gt;LOSE ALL OF YOUR BITCOINS&lt;/b&gt;!</source>
-        <translation>Varoitus: Jos salaat lompakkosi ja menetät tunnuslauseesi, &lt;b&gt;MENETÄT KAIKKI BITCOINISI&lt;/b&gt;!</translation>
-    </message>
-    <message>
-        <source>Are you sure you wish to encrypt your wallet?</source>
-        <translation>Haluatko varmasti salata lompakkosi?</translation>
-    </message>
-    <message>
-        <source>Bitcoin Core will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source>
-        <translation>Bitcoin Core sammuu nyt viimeistelläkseen kryptaamisen. Muista että lompakon kryptaaminen ei voi täysin suojata bitcoinejasi varkaudelta malwaren saastuttamalla tietokoneella.</translation>
-    </message>
-    <message>
-        <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source>
-        <translation>TÄRKEÄÄ: Kaikki vanhat lompakon varmuuskopiot pitäisi korvata uusilla suojatuilla varmuuskopioilla. Turvallisuussyistä edelliset varmuuskopiot muuttuvat turhiksi, kun aloitat suojatun lompakon käytön.</translation>
-    </message>
-    <message>
-        <source>Warning: The Caps Lock key is on!</source>
-        <translation>Varoitus: Caps Lock on käytössä!</translation>
-    </message>
-    <message>
-        <source>Wallet encrypted</source>
-        <translation>Lompakko salattu</translation>
-    </message>
-    <message>
-        <source>Enter the new passphrase to the wallet.&lt;br/&gt;Please use a passphrase of &lt;b&gt;ten or more random characters&lt;/b&gt;, or &lt;b&gt;eight or more words&lt;/b&gt;.</source>
-        <translation>Anna salauslause lompakkoon. &lt;br/&gt;Ole hyvä ja käytä lausetta jossa on &lt;b&gt;kymmenen tai enemmän satunnaista merkkiä&lt;/b&gt; tai &lt;b&gt;kahdeksan tai useampi sanaa&lt;/b&gt;.</translation>
-    </message>
-    <message>
-        <source>Enter the old passphrase and new passphrase to the wallet.</source>
-        <translation>Syötä vanha ja uusi salasana lompakolle.</translation>
-    </message>
-    <message>
-        <source>Wallet encryption failed</source>
-        <translation>Lompakon salaus epäonnistui</translation>
-    </message>
-    <message>
-        <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
-        <translation>Lompakon salaaminen epäonnistui sisäisen virheen vuoksi. Lompakkoasi ei salattu.</translation>
-    </message>
-    <message>
-        <source>The supplied passphrases do not match.</source>
-        <translation>Annetut tunnuslauseet eivät täsmää.</translation>
-    </message>
-    <message>
-        <source>Wallet unlock failed</source>
-        <translation>Lompakon avaaminen epäonnistui.</translation>
-    </message>
-    <message>
-        <source>The passphrase entered for the wallet decryption was incorrect.</source>
-        <translation>Annettu tunnuslause oli väärä.</translation>
-    </message>
-    <message>
-        <source>Wallet decryption failed</source>
-        <translation>Lompakon salauksen purku epäonnistui.</translation>
-    </message>
-    <message>
-        <source>Wallet passphrase was successfully changed.</source>
-        <translation>Lompakon tunnuslause vaihdettiin onnistuneesti.</translation>
-    </message>
 </context>
 <context>
     <name>BanTableModel</name>
@@ -269,6 +110,10 @@
         <source>Quit application</source>
         <translation>Sulje ohjelma</translation>
     </message>
+    <message>
+        <source>&amp;About %1</source>
+        <translation>&amp;Tietoja %1</translation>
+    </message>
     <message>
         <source>About &amp;Qt</source>
         <translation>Tietoja &amp;Qt</translation>
@@ -305,14 +150,6 @@
         <source>Open &amp;URI...</source>
         <translation>Avaa &amp;URI...</translation>
     </message>
-    <message>
-        <source>Bitcoin Core client</source>
-        <translation>Bitcoin Core ohjelma</translation>
-    </message>
-    <message>
-        <source>Importing blocks from disk...</source>
-        <translation>Tuodaan lohkoja levyltä</translation>
-    </message>
     <message>
         <source>Reindexing blocks on disk...</source>
         <translation>Ladataan lohkoindeksiä...</translation>
@@ -357,10 +194,6 @@
         <source>&amp;Receive</source>
         <translation>&amp;Vastaanota</translation>
     </message>
-    <message>
-        <source>Show information about Bitcoin Core</source>
-        <translation>Näytä tietoja Bitcoin Core:sta</translation>
-    </message>
     <message>
         <source>&amp;Show / Hide</source>
         <translation>&amp;Näytä / Piilota</translation>
@@ -397,22 +230,10 @@
         <source>Tabs toolbar</source>
         <translation>Välilehtipalkki</translation>
     </message>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Bitcoin-ydin</translation>
-    </message>
     <message>
         <source>Request payments (generates QR codes and bitcoin: URIs)</source>
         <translation>Pyydä maksuja (Luo QR koodit ja bitcoin: URIt)</translation>
     </message>
-    <message>
-        <source>&amp;About Bitcoin Core</source>
-        <translation>&amp;Tietoja Bitcoin Core</translation>
-    </message>
-    <message>
-        <source>Modify configuration options for Bitcoin Core</source>
-        <translation>Muokkaa kokoonpanoasetuksia Bitcoin Corelle</translation>
-    </message>
     <message>
         <source>Show the list of used sending addresses and labels</source>
         <translation>Näytä lähettämiseen käytettyjen osoitteiden ja nimien lista</translation>
@@ -429,10 +250,6 @@
         <source>&amp;Command-line options</source>
         <translation>&amp;Komentorivin valinnat</translation>
     </message>
-    <message>
-        <source>Show the Bitcoin Core help message to get a list with possible Bitcoin command-line options</source>
-        <translation>Näytä Bitcoin Core ohjeet saadaksesi listan mahdollisista Bitcoinin komentorivivalinnoista</translation>
-    </message>
     <message numerus="yes">
         <source>%n active connection(s) to Bitcoin network</source>
         <translation><numerusform>%n aktiivinen yhteys Bitcoin-verkkoon</numerusform><numerusform>%n aktiivista yhteyttä Bitcoin-verkkoon</numerusform></translation>
@@ -544,13 +361,6 @@
         <translation>Lompakko on &lt;b&gt;salattu&lt;/b&gt; ja tällä hetkellä &lt;b&gt;lukittuna&lt;/b&gt;</translation>
     </message>
 </context>
-<context>
-    <name>ClientModel</name>
-    <message>
-        <source>Network Alert</source>
-        <translation>Verkkohälytys</translation>
-    </message>
-</context>
 <context>
     <name>CoinControlDialog</name>
     <message>
@@ -629,150 +439,6 @@
         <source>Priority</source>
         <translation>Prioriteetti</translation>
     </message>
-    <message>
-        <source>Copy address</source>
-        <translation>Kopioi osoite</translation>
-    </message>
-    <message>
-        <source>Copy label</source>
-        <translation>Kopioi nimi</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>Kopioi määrä</translation>
-    </message>
-    <message>
-        <source>Copy transaction ID</source>
-        <translation>Kopioi siirtotunnus</translation>
-    </message>
-    <message>
-        <source>Lock unspent</source>
-        <translation>Lukitse käyttämättömät</translation>
-    </message>
-    <message>
-        <source>Unlock unspent</source>
-        <translation>Avaa käyttämättömät</translation>
-    </message>
-    <message>
-        <source>Copy quantity</source>
-        <translation>Kopioi määrä</translation>
-    </message>
-    <message>
-        <source>Copy fee</source>
-        <translation>Kopioi palkkio</translation>
-    </message>
-    <message>
-        <source>Copy after fee</source>
-        <translation>Kopioi palkkion jälkeen</translation>
-    </message>
-    <message>
-        <source>Copy bytes</source>
-        <translation>Kopioi tavut</translation>
-    </message>
-    <message>
-        <source>Copy priority</source>
-        <translation>Kopioi prioriteetti</translation>
-    </message>
-    <message>
-        <source>Copy dust</source>
-        <translation>Kopioi tomu</translation>
-    </message>
-    <message>
-        <source>Copy change</source>
-        <translation>Kopioi vaihtoraha</translation>
-    </message>
-    <message>
-        <source>highest</source>
-        <translation>korkein</translation>
-    </message>
-    <message>
-        <source>higher</source>
-        <translation>korkeampi</translation>
-    </message>
-    <message>
-        <source>high</source>
-        <translation>korkea</translation>
-    </message>
-    <message>
-        <source>medium-high</source>
-        <translation>keski-korkea</translation>
-    </message>
-    <message>
-        <source>medium</source>
-        <translation>keskisuuri</translation>
-    </message>
-    <message>
-        <source>low-medium</source>
-        <translation>pieni-keskisuuri</translation>
-    </message>
-    <message>
-        <source>low</source>
-        <translation>pieni</translation>
-    </message>
-    <message>
-        <source>lower</source>
-        <translation>pienempi</translation>
-    </message>
-    <message>
-        <source>lowest</source>
-        <translation>pienin</translation>
-    </message>
-    <message>
-        <source>(%1 locked)</source>
-        <translation>(%1 lukittu)</translation>
-    </message>
-    <message>
-        <source>none</source>
-        <translation>ei mitään</translation>
-    </message>
-    <message>
-        <source>This label turns red if the transaction size is greater than 1000 bytes.</source>
-        <translation>Tämä nimi muuttuu punaiseksi mikäli rahansiirron koko on suurempi kuin 1000 tavua.</translation>
-    </message>
-    <message>
-        <source>This label turns red if the priority is smaller than "medium".</source>
-        <translation>Tämä nimi muuttuu punaiseksi mikäli prioriteetti on pienempi kuin "medium".</translation>
-    </message>
-    <message>
-        <source>This label turns red if any recipient receives an amount smaller than %1.</source>
-        <translation>Tämä nimike muuttuu punaiseksi mikäli mikä tahansa saaja vastaanottaa pienemmän määrän kuin %1.</translation>
-    </message>
-    <message>
-        <source>Can vary +/- %1 satoshi(s) per input.</source>
-        <translation>Saattaa vaihdella +/- %1 satoshia per syöte.</translation>
-    </message>
-    <message>
-        <source>yes</source>
-        <translation>kyllä</translation>
-    </message>
-    <message>
-        <source>no</source>
-        <translation>ei</translation>
-    </message>
-    <message>
-        <source>This means a fee of at least %1 per kB is required.</source>
-        <translation>Tämä tarkoittaa että vähintään %1 per kB palkkio on pakollinen.</translation>
-    </message>
-    <message>
-        <source>Can vary +/- 1 byte per input.</source>
-        <translation>Voi vaihdella +/- 1 tavu per syöte</translation>
-    </message>
-    <message>
-        <source>Transactions with higher priority are more likely to get included into a block.</source>
-        <translation>Rahansiirrot korkeammalla prioriteetilla sisällytetään varmemmin lohkoon.</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(ei nimeä)</translation>
-    </message>
-    <message>
-        <source>change from %1 (%2)</source>
-        <translation>Vaihda %1 (%2)</translation>
-    </message>
-    <message>
-        <source>(change)</source>
-        <translation>(vaihtoraha)</translation>
-    </message>
 </context>
 <context>
     <name>EditAddressDialog</name>
@@ -796,38 +462,6 @@
         <source>&amp;Address</source>
         <translation>&amp;Osoite</translation>
     </message>
-    <message>
-        <source>New receiving address</source>
-        <translation>Uusi vastaanottava osoite</translation>
-    </message>
-    <message>
-        <source>New sending address</source>
-        <translation>Uusi lähettävä osoite</translation>
-    </message>
-    <message>
-        <source>Edit receiving address</source>
-        <translation>Muokkaa vastaanottajan osoitetta</translation>
-    </message>
-    <message>
-        <source>Edit sending address</source>
-        <translation>Muokkaa lähtevää osoitetta</translation>
-    </message>
-    <message>
-        <source>The entered address "%1" is already in the address book.</source>
-        <translation>Osoite "%1" on jo osoitekirjassa.</translation>
-    </message>
-    <message>
-        <source>The entered address "%1" is not a valid Bitcoin address.</source>
-        <translation>Antamasi osoite "%1" ei ole validi Bitcoin-osoite.</translation>
-    </message>
-    <message>
-        <source>Could not unlock wallet.</source>
-        <translation>Lompakkoa ei voitu avata.</translation>
-    </message>
-    <message>
-        <source>New key generation failed.</source>
-        <translation>Uuden avaimen luonti epäonnistui.</translation>
-    </message>
 </context>
 <context>
     <name>FreespaceChecker</name>
@@ -854,10 +488,6 @@
 </context>
 <context>
     <name>HelpMessageDialog</name>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Bitcoin-ydin</translation>
-    </message>
     <message>
         <source>version</source>
         <translation>versio</translation>
@@ -866,10 +496,6 @@
         <source>(%1-bit)</source>
         <translation>(%1-bit)</translation>
     </message>
-    <message>
-        <source>About Bitcoin Core</source>
-        <translation>Tietoja Bitcoin Core</translation>
-    </message>
     <message>
         <source>Command-line options</source>
         <translation>Komentorivi parametrit</translation>
@@ -906,29 +532,13 @@
         <source>Show splash screen on startup (default: %u)</source>
         <translation>Näytä aloitusruutu käynnistyksen yhteydessä (oletus: %u)</translation>
     </message>
-    <message>
-        <source>Reset all settings changes made over the GUI</source>
-        <translation>Nollaa kaikki graafisen käyttöliittymän kautta tehdyt muutokset</translation>
-    </message>
-</context>
+    </context>
 <context>
     <name>Intro</name>
     <message>
         <source>Welcome</source>
         <translation>Tervetuloa</translation>
     </message>
-    <message>
-        <source>Welcome to Bitcoin Core.</source>
-        <translation>Tervetuloa Bitcoin Core</translation>
-    </message>
-    <message>
-        <source>As this is the first time the program is launched, you can choose where Bitcoin Core will store its data.</source>
-        <translation>Tämän on ensimmäinen kerta kun Bitcoin Core on käynnistetty joten voit valita data-hakemiston paikan.</translation>
-    </message>
-    <message>
-        <source>Bitcoin Core will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source>
-        <translation>Bitcoin Core lataa ja tallentaa kopion Bitcoinin lohkoketjusta. Vähintään %1GB dataa tullaan tallentamaan tähän hakemistoon ja tarve kasvaa ajan myötä. Lomakko tullaan myös tallentamaan tähän hakemistoon.</translation>
-    </message>
     <message>
         <source>Use the default data directory</source>
         <translation>Käytä oletuskansiota</translation>
@@ -937,10 +547,6 @@
         <source>Use a custom data directory:</source>
         <translation>Määritä oma kansio:</translation>
     </message>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Bitcoin-ydin</translation>
-    </message>
     <message>
         <source>Error: Specified data directory "%1" cannot be created.</source>
         <translation>Virhe: Annettu datahakemistoa "%1" ei voida luoda.</translation>
@@ -976,10 +582,6 @@
         <source>Select payment request file</source>
         <translation>Valitse maksupyynnön tiedosto</translation>
     </message>
-    <message>
-        <source>Select payment request file to open</source>
-        <translation>Valitse maksypyynnön tiedosto avattavaksi</translation>
-    </message>
 </context>
 <context>
     <name>OptionsDialog</name>
@@ -1019,10 +621,6 @@
         <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Exit in the menu.</source>
         <translation>Minimoi ikkuna ohjelman sulkemisen sijasta kun ikkuna suljetaan. Kun tämä asetus on käytössä, ohjelma suljetaan vain valittaessa valikosta Poistu.</translation>
     </message>
-    <message>
-        <source>The user interface language can be set here. This setting will take effect after restarting Bitcoin Core.</source>
-        <translation>Käyttöliittymän kieli voidaan asettaa tässä. Tämä asetus tulee käyttöön vasta kun Bitcoin Core käynnistetään uudelleen.</translation>
-    </message>
     <message>
         <source>Third party URLs (e.g. a block explorer) that appear in the transactions tab as context menu items. %s in the URL is replaced by transaction hash. Multiple URLs are separated by vertical bar |.</source>
         <translation>Ulkopuoliset URL-osoitteet (esim. block explorer,) jotka esiintyvät siirrot-välilehdellä valikossa. %s URL-osoitteessa korvataan siirtotunnuksella. Useampi URL-osoite on eroteltu pystyviivalla |.</translation>
@@ -1047,14 +645,6 @@
         <source>&amp;Network</source>
         <translation>&amp;Verkko</translation>
     </message>
-    <message>
-        <source>Automatically start Bitcoin Core after logging in to the system.</source>
-        <translation>Käynnistä Bitcoin Core automaattisesti järjestelmään kirjautumisen jälkeen.</translation>
-    </message>
-    <message>
-        <source>&amp;Start Bitcoin Core on system login</source>
-        <translation>&amp;Käynnistä Bitcoin Core järjestelmään kirjautuessa</translation>
-    </message>
     <message>
         <source>(0 = auto, &lt;0 = leave that many cores free)</source>
         <translation>(0 = auto, &lt;0 = jätä näin monta ydintä vapaaksi)</translation>
@@ -1284,178 +874,68 @@
     </message>
 </context>
 <context>
-    <name>PaymentServer</name>
+    <name>PeerTableModel</name>
     <message>
-        <source>URI handling</source>
-        <translation>URI käsittely</translation>
+        <source>User Agent</source>
+        <translation>Käyttöliittymä</translation>
     </message>
     <message>
-        <source>Invalid payment address %1</source>
-        <translation>Virheellinen maksuosoite %1</translation>
+        <source>Node/Service</source>
+        <translation>Noodi/Palvelu</translation>
     </message>
     <message>
-        <source>Payment request rejected</source>
-        <translation>Maksupyyntö hylätty</translation>
+        <source>Ping Time</source>
+        <translation>Vasteaika</translation>
     </message>
+</context>
+<context>
+    <name>QObject</name>
     <message>
-        <source>Payment request network doesn't match client network.</source>
-        <translation>Maksypyyntö verkossa ei täsmää asiakasohjelman verkkoon.</translation>
+        <source>Amount</source>
+        <translation>Määrä</translation>
     </message>
     <message>
-        <source>Payment request is not initialized.</source>
-        <translation>Maksupyyntöä ei ole alustettu.</translation>
+        <source>Enter a Bitcoin address (e.g. %1)</source>
+        <translation>Syötä Bitcoin-osoite (esim. %1)</translation>
     </message>
     <message>
-        <source>Requested payment amount of %1 is too small (considered dust).</source>
-        <translation>Maksupyyntö %1 on liian pieni (huomioidaan tomuna).</translation>
+        <source>%1 d</source>
+        <translation>%1 d</translation>
     </message>
     <message>
-        <source>Payment request error</source>
-        <translation>Maksupyyntövirhe</translation>
+        <source>%1 h</source>
+        <translation>%1 h</translation>
     </message>
     <message>
-        <source>Cannot start bitcoin: click-to-pay handler</source>
-        <translation>Ei voida käynnistää bitcoin: klikkaa-maksu käsittelijää</translation>
+        <source>%1 m</source>
+        <translation>%1 m</translation>
     </message>
     <message>
-        <source>Payment request fetch URL is invalid: %1</source>
-        <translation>Maksupyynnön haku URL on virheellinen: %1</translation>
+        <source>%1 s</source>
+        <translation>%1 s</translation>
     </message>
     <message>
-        <source>URI cannot be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source>
-        <translation>URIa ei voitu jäsentää! Tämä voi johtua kelvottomasta Bitcoin-osoitteesta tai virheellisistä URI parametreista.</translation>
+        <source>None</source>
+        <translation>Ei yhtään</translation>
     </message>
     <message>
-        <source>Payment request file handling</source>
-        <translation>Maksupyynnön tiedoston käsittely</translation>
+        <source>N/A</source>
+        <translation>Ei saatavilla</translation>
     </message>
     <message>
-        <source>Payment request file cannot be read! This can be caused by an invalid payment request file.</source>
-        <translation>Maksupyynnön tiedostoa ei voida lukea! Tämä voi aiheutua sopimattomasta maksupyyntötiedostosta.</translation>
+        <source>%1 ms</source>
+        <translation>%1 ms</translation>
     </message>
+</context>
+<context>
+    <name>RPCConsole</name>
     <message>
-        <source>Payment request expired.</source>
-        <translation>Maksupyyntö on vanhentunut.</translation>
+        <source>Client name</source>
+        <translation>Pääteohjelman nimi</translation>
     </message>
     <message>
-        <source>Unverified payment requests to custom payment scripts are unsupported.</source>
-        <translation>Varmistamattomia maksupyyntöjä kustomoituun maksupalveluun ei tueta.</translation>
-    </message>
-    <message>
-        <source>Invalid payment request.</source>
-        <translation>Epäkelpo maksupyyntö.</translation>
-    </message>
-    <message>
-        <source>Refund from %1</source>
-        <translation>Maksupalautus %1:sta</translation>
-    </message>
-    <message>
-        <source>Payment request %1 is too large (%2 bytes, allowed %3 bytes).</source>
-        <translation>Maksupyyntö %1 on liian suuri (%2 tavua, sallittu %3 tavua).</translation>
-    </message>
-    <message>
-        <source>Error communicating with %1: %2</source>
-        <translation>Virhe kommunikoidessa %1n kanssa: %2</translation>
-    </message>
-    <message>
-        <source>Payment request cannot be parsed!</source>
-        <translation>Maksupyyntöä ei voida jäsentää!</translation>
-    </message>
-    <message>
-        <source>Bad response from server %1</source>
-        <translation>Huono vastaus palvelimelta %1</translation>
-    </message>
-    <message>
-        <source>Payment acknowledged</source>
-        <translation>Rahansiirto tunnistettu</translation>
-    </message>
-    <message>
-        <source>Network request error</source>
-        <translation>Tietoverkon pyyntövirhe</translation>
-    </message>
-</context>
-<context>
-    <name>PeerTableModel</name>
-    <message>
-        <source>User Agent</source>
-        <translation>Käyttöliittymä</translation>
-    </message>
-    <message>
-        <source>Node/Service</source>
-        <translation>Noodi/Palvelu</translation>
-    </message>
-    <message>
-        <source>Ping Time</source>
-        <translation>Vasteaika</translation>
-    </message>
-</context>
-<context>
-    <name>QObject</name>
-    <message>
-        <source>Amount</source>
-        <translation>Määrä</translation>
-    </message>
-    <message>
-        <source>Enter a Bitcoin address (e.g. %1)</source>
-        <translation>Syötä Bitcoin-osoite (esim. %1)</translation>
-    </message>
-    <message>
-        <source>%1 d</source>
-        <translation>%1 d</translation>
-    </message>
-    <message>
-        <source>%1 h</source>
-        <translation>%1 h</translation>
-    </message>
-    <message>
-        <source>%1 m</source>
-        <translation>%1 m</translation>
-    </message>
-    <message>
-        <source>%1 s</source>
-        <translation>%1 s</translation>
-    </message>
-    <message>
-        <source>None</source>
-        <translation>Ei yhtään</translation>
-    </message>
-    <message>
-        <source>N/A</source>
-        <translation>Ei saatavilla</translation>
-    </message>
-    <message>
-        <source>%1 ms</source>
-        <translation>%1 ms</translation>
-    </message>
-</context>
-<context>
-    <name>QRImageWidget</name>
-    <message>
-        <source>&amp;Save Image...</source>
-        <translation>&amp;Tallenna kuva</translation>
-    </message>
-    <message>
-        <source>&amp;Copy Image</source>
-        <translation>&amp;Kopioi kuva</translation>
-    </message>
-    <message>
-        <source>Save QR Code</source>
-        <translation>Tallenna QR-koodi</translation>
-    </message>
-    <message>
-        <source>PNG Image (*.png)</source>
-        <translation>PNG kuva (*.png)</translation>
-    </message>
-</context>
-<context>
-    <name>RPCConsole</name>
-    <message>
-        <source>Client name</source>
-        <translation>Pääteohjelman nimi</translation>
-    </message>
-    <message>
-        <source>N/A</source>
-        <translation>Ei saatavilla</translation>
+        <source>N/A</source>
+        <translation>Ei saatavilla</translation>
     </message>
     <message>
         <source>Client version</source>
@@ -1513,10 +993,6 @@
         <source>Memory usage</source>
         <translation>Muistin käyttö</translation>
     </message>
-    <message>
-        <source>Open the Bitcoin Core debug log file from the current data directory. This can take a few seconds for large log files.</source>
-        <translation>Avaa Bitcoin Coren debug-loki tämänhetkisestä datahakemistosta. Tämä voi viedä muutaman sekunnin suurille lokitiedostoille.</translation>
-    </message>
     <message>
         <source>Received</source>
         <translation>Vastaanotetut</translation>
@@ -1633,10 +1109,6 @@
         <source>Out:</source>
         <translation>Ulos:</translation>
     </message>
-    <message>
-        <source>Build date</source>
-        <translation>Kääntöpäiväys</translation>
-    </message>
     <message>
         <source>Debug log file</source>
         <translation>Debug lokitiedosto</translation>
@@ -1673,10 +1145,6 @@
         <source>&amp;Unban Node</source>
         <translation>&amp;Poista solmukohdan esto</translation>
     </message>
-    <message>
-        <source>Welcome to the Bitcoin Core RPC console.</source>
-        <translation>Tervetuloa Bitcoin Coren RPC-konsoliin.</translation>
-    </message>
     <message>
         <source>Use up and down arrows to navigate history, and &lt;b&gt;Ctrl-L&lt;/b&gt; to clear screen.</source>
         <translation>Ylös- ja alas-nuolet selaavat historiaa ja &lt;b&gt;Ctrl-L&lt;/b&gt; tyhjentää ruudun.</translation>
@@ -1804,18 +1272,6 @@
         <source>Remove</source>
         <translation>Poista</translation>
     </message>
-    <message>
-        <source>Copy label</source>
-        <translation>Kopioi nimi</translation>
-    </message>
-    <message>
-        <source>Copy message</source>
-        <translation>Kopioi viesti</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>Kopioi määrä</translation>
-    </message>
 </context>
 <context>
     <name>ReceiveRequestDialog</name>
@@ -1835,73 +1291,6 @@
         <source>&amp;Save Image...</source>
         <translation>&amp;Tallenna kuva</translation>
     </message>
-    <message>
-        <source>Request payment to %1</source>
-        <translation>Vastaanota maksu %1</translation>
-    </message>
-    <message>
-        <source>Payment information</source>
-        <translation>Maksutiedot</translation>
-    </message>
-    <message>
-        <source>URI</source>
-        <translation>URI</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>Osoite</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>Määrä</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Nimi</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>Viesti</translation>
-    </message>
-    <message>
-        <source>Resulting URI too long, try to reduce the text for label / message.</source>
-        <translation>Tuloksen URI liian pitkä, yritä lyhentää otsikon tekstiä / viestiä.</translation>
-    </message>
-    <message>
-        <source>Error encoding URI into QR Code.</source>
-        <translation>Virhe käännettäessä URI:a QR-koodiksi.</translation>
-    </message>
-</context>
-<context>
-    <name>RecentRequestsTableModel</name>
-    <message>
-        <source>Date</source>
-        <translation>Aika</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Nimi</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>Viesti</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>Määrä</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(ei nimeä)</translation>
-    </message>
-    <message>
-        <source>(no message)</source>
-        <translation>(ei viestiä)</translation>
-    </message>
-    <message>
-        <source>(no amount)</source>
-        <translation>(ei määrää)</translation>
-    </message>
 </context>
 <context>
     <name>SendCoinsDialog</name>
@@ -2013,14 +1402,6 @@
         <source>fast</source>
         <translation>nopea</translation>
     </message>
-    <message>
-        <source>Send as zero-fee transaction if possible</source>
-        <translation>Lähetä siirtokuluttomana jos mahdollista</translation>
-    </message>
-    <message>
-        <source>(confirmation may take longer)</source>
-        <translation>(vahvistaminen voi viedä kauemmin)</translation>
-    </message>
     <message>
         <source>Send to multiple recipients at once</source>
         <translation>Lähetä usealla vastaanottajalle samanaikaisesti</translation>
@@ -2053,118 +1434,6 @@
         <source>S&amp;end</source>
         <translation>&amp;Lähetä</translation>
     </message>
-    <message>
-        <source>Confirm send coins</source>
-        <translation>Hyväksy Bitcoinien lähettäminen</translation>
-    </message>
-    <message>
-        <source>%1 to %2</source>
-        <translation>%1 to %2</translation>
-    </message>
-    <message>
-        <source>Copy quantity</source>
-        <translation>Kopioi määrä</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>Kopioi määrä</translation>
-    </message>
-    <message>
-        <source>Copy fee</source>
-        <translation>Kopioi palkkio</translation>
-    </message>
-    <message>
-        <source>Copy after fee</source>
-        <translation>Kopioi palkkion jälkeen</translation>
-    </message>
-    <message>
-        <source>Copy bytes</source>
-        <translation>Kopioi tavut</translation>
-    </message>
-    <message>
-        <source>Copy priority</source>
-        <translation>Kopioi prioriteetti</translation>
-    </message>
-    <message>
-        <source>Copy change</source>
-        <translation>Kopioi vaihtoraha</translation>
-    </message>
-    <message>
-        <source>Total Amount %1</source>
-        <translation>Kokonaismäärä %1</translation>
-    </message>
-    <message>
-        <source>or</source>
-        <translation>tai</translation>
-    </message>
-    <message>
-        <source>The amount to pay must be larger than 0.</source>
-        <translation>Maksettavan summan tulee olla suurempi kuin 0 Bitcoinia.</translation>
-    </message>
-    <message>
-        <source>The amount exceeds your balance.</source>
-        <translation>Määrä ylittää käytettävissä olevan saldon.</translation>
-    </message>
-    <message>
-        <source>The total exceeds your balance when the %1 transaction fee is included.</source>
-        <translation>Kokonaismäärä ylittää saldosi kun %1 maksukulu lisätään summaan.</translation>
-    </message>
-    <message>
-        <source>Transaction creation failed!</source>
-        <translation>Rahansiirron luonti epäonnistui!</translation>
-    </message>
-    <message>
-        <source>The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source>
-        <translation>Rahansiirto hylättiin! Tämä saattaa tapahtua jos lompakossa olevat kolikot on jo kulutettu, kuten jos käytät kopioita wallet.dat tiedostosta ja kolikot oli jos käytetty mutta ei merkattu täällä.</translation>
-    </message>
-    <message>
-        <source>A fee higher than %1 is considered an absurdly high fee.</source>
-        <translation>Rahansiirtokulua %1 ja sitä suurempia määriä pidetään järjenvastaisen korkeana kuluna.</translation>
-    </message>
-    <message>
-        <source>Payment request expired.</source>
-        <translation>Maksupyyntö on vanhentunut.</translation>
-    </message>
-    <message>
-        <source>Pay only the required fee of %1</source>
-        <translation>Maksa vain vaadittu kulu kooltaan %1</translation>
-    </message>
-    <message numerus="yes">
-        <source>Estimated to begin confirmation within %n block(s).</source>
-        <translation><numerusform>Vahvistuminen alkaa arviolta %n lohkon päästä.</numerusform><numerusform>Vahvistuminen alkaa arviolta %n lohkon päästä.</numerusform></translation>
-    </message>
-    <message>
-        <source>The recipient address is not valid. Please recheck.</source>
-        <translation>Vastaanottajan osoite ei ole kelvollinen. Tarkistathan uudelleen.</translation>
-    </message>
-    <message>
-        <source>Duplicate address found: addresses should only be used once each.</source>
-        <translation>Duplikaattiosoite löytyi: kutakin osoitetta pitäisi käyttää vain kerran.</translation>
-    </message>
-    <message>
-        <source>Warning: Invalid Bitcoin address</source>
-        <translation>Varoitus: Virheellinen Bitcoin osoite</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(ei nimeä)</translation>
-    </message>
-    <message>
-        <source>Warning: Unknown change address</source>
-        <translation>Varoitus: Tuntematon vaihtorahan osoite</translation>
-    </message>
-    <message>
-        <source>Copy dust</source>
-        <translation>Kopioi tomu</translation>
-    </message>
-    <message>
-        <source>Are you sure you want to send?</source>
-        <translation>Haluatko varmasti lähettää?</translation>
-    </message>
-    <message>
-        <source>added as transaction fee</source>
-        <translation>lisätty rahansiirtomaksuna</translation>
-    </message>
 </context>
 <context>
     <name>SendCoinsEntry</name>
@@ -2176,10 +1445,6 @@
         <source>Pay &amp;To:</source>
         <translation>Maksun saaja:</translation>
     </message>
-    <message>
-        <source>Enter a label for this address to add it to your address book</source>
-        <translation>Anna nimi tälle osoitteelle, jos haluat lisätä sen osoitekirjaan</translation>
-    </message>
     <message>
         <source>&amp;Label:</source>
         <translation>&amp;Nimi:</translation>
@@ -2247,10 +1512,6 @@
 </context>
 <context>
     <name>ShutdownWindow</name>
-    <message>
-        <source>Bitcoin Core is shutting down...</source>
-        <translation>Bitcoin core sulkeutuu...</translation>
-    </message>
     <message>
         <source>Do not shut down the computer until this window disappears.</source>
         <translation>Älä sammuta tietokonetta ennenkuin tämä ikkuna katoaa.</translation>
@@ -2334,594 +1595,72 @@
         <source>Reset all verify message fields</source>
         <translation>Tyhjennä kaikki varmista-viesti-kentät</translation>
     </message>
+</context>
+<context>
+    <name>SplashScreen</name>
     <message>
-        <source>Click "Sign Message" to generate signature</source>
-        <translation>Klikkaa "Allekirjoita Viesti luodaksesi allekirjoituksen </translation>
+        <source>[testnet]</source>
+        <translation>[testnet]</translation>
     </message>
+</context>
+<context>
+    <name>TrafficGraphWidget</name>
     <message>
-        <source>The entered address is invalid.</source>
-        <translation>Syötetty osoite on virheellinen.</translation>
+        <source>KB/s</source>
+        <translation>KB/s</translation>
     </message>
+</context>
+<context>
+    <name>TransactionDescDialog</name>
     <message>
-        <source>Please check the address and try again.</source>
-        <translation>Tarkista osoite ja yritä uudelleen.</translation>
+        <source>This pane shows a detailed description of the transaction</source>
+        <translation>Tämä ruutu näyttää yksityiskohtaisen tiedon rahansiirrosta</translation>
     </message>
+</context>
+<context>
+    <name>UnitDisplayStatusBarControl</name>
     <message>
-        <source>The entered address does not refer to a key.</source>
-        <translation>Syötetyn osoitteen avainta ei löydy.</translation>
+        <source>Unit to show amounts in. Click to select another unit.</source>
+        <translation>Yksikkö jossa määrät näytetään. Klikkaa valitaksesi toisen yksikön.</translation>
     </message>
+</context>
+<context>
+    <name>bitcoin-core</name>
     <message>
-        <source>Wallet unlock was cancelled.</source>
-        <translation>Lompakon avaaminen peruttiin.</translation>
+        <source>Options:</source>
+        <translation>Asetukset:</translation>
     </message>
     <message>
-        <source>Private key for the entered address is not available.</source>
-        <translation>Yksityistä avainta syötetylle osoitteelle ei ole saatavilla.</translation>
+        <source>Specify data directory</source>
+        <translation>Määritä data-hakemisto</translation>
     </message>
     <message>
-        <source>Message signing failed.</source>
-        <translation>Viestin allekirjoitus epäonnistui.</translation>
+        <source>Connect to a node to retrieve peer addresses, and disconnect</source>
+        <translation>Yhdistä noodiin hakeaksesi naapurien osoitteet ja katkaise yhteys</translation>
     </message>
     <message>
-        <source>Message signed.</source>
-        <translation>Viesti allekirjoitettu.</translation>
+        <source>Specify your own public address</source>
+        <translation>Määritä julkinen osoitteesi</translation>
     </message>
     <message>
-        <source>The signature could not be decoded.</source>
-        <translation>Allekirjoitusta ei pystytty tulkitsemaan.</translation>
+        <source>Accept command line and JSON-RPC commands</source>
+        <translation>Hyväksy merkkipohjaiset- ja JSON-RPC-käskyt</translation>
     </message>
     <message>
-        <source>Please check the signature and try again.</source>
-        <translation>Tarkista allekirjoitus ja yritä uudelleen.</translation>
+        <source>If &lt;category&gt; is not supplied or if &lt;category&gt; = 1, output all debugging information.</source>
+        <translation>Jos &lt;category&gt; on toimittamatta tai jos &lt;category&gt; = 1, tulosta kaikki debug-tieto.</translation>
     </message>
     <message>
-        <source>The signature did not match the message digest.</source>
-        <translation>Allekirjoitus ei täsmää viestin tiivisteeseen.</translation>
+        <source>Prune configured below the minimum of %d MiB.  Please use a higher number.</source>
+        <translation>Karsinta konfiguroitu alle minimin %d MiB. Käytä surempaa numeroa.</translation>
     </message>
     <message>
-        <source>Message verification failed.</source>
-        <translation>Viestin varmistus epäonnistui.</translation>
+        <source>Prune: last wallet synchronisation goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of pruned node)</source>
+        <translation>Karsinta: viime lompakon synkronisointi menee karsitun datan taakse. Sinun tarvitsee ajaa -reindex (lataa koko lohkoketju uudelleen tapauksessa jossa karsiva noodi)</translation>
     </message>
     <message>
-        <source>Message verified.</source>
-        <translation>Viesti varmistettu.</translation>
-    </message>
-</context>
-<context>
-    <name>SplashScreen</name>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Bitcoin-ydin</translation>
-    </message>
-    <message>
-        <source>The Bitcoin Core developers</source>
-        <translation>Bitcoin Core kehittäjät</translation>
-    </message>
-    <message>
-        <source>[testnet]</source>
-        <translation>[testnet]</translation>
-    </message>
-</context>
-<context>
-    <name>TrafficGraphWidget</name>
-    <message>
-        <source>KB/s</source>
-        <translation>KB/s</translation>
-    </message>
-</context>
-<context>
-    <name>TransactionDesc</name>
-    <message>
-        <source>Open until %1</source>
-        <translation>Avoinna %1 asti</translation>
-    </message>
-    <message>
-        <source>conflicted</source>
-        <translation>ristiriitainen</translation>
-    </message>
-    <message>
-        <source>%1/offline</source>
-        <translation>%1/offline</translation>
-    </message>
-    <message>
-        <source>%1/unconfirmed</source>
-        <translation>%1/vahvistamaton</translation>
-    </message>
-    <message>
-        <source>%1 confirmations</source>
-        <translation>%1 vahvistusta</translation>
-    </message>
-    <message>
-        <source>Status</source>
-        <translation>Tila</translation>
-    </message>
-    <message numerus="yes">
-        <source>, broadcast through %n node(s)</source>
-        <translation><numerusform>lähetetty %n noodin läpi</numerusform><numerusform>lähetetty %n noodin läpi</numerusform></translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation>Päivämäärä</translation>
-    </message>
-    <message>
-        <source>Source</source>
-        <translation>Lähde</translation>
-    </message>
-    <message>
-        <source>Generated</source>
-        <translation>Generoitu</translation>
-    </message>
-    <message>
-        <source>From</source>
-        <translation>Lähettäjä</translation>
-    </message>
-    <message>
-        <source>To</source>
-        <translation>Saaja</translation>
-    </message>
-    <message>
-        <source>own address</source>
-        <translation>oma osoite</translation>
-    </message>
-    <message>
-        <source>watch-only</source>
-        <translation>vain katseltava</translation>
-    </message>
-    <message>
-        <source>label</source>
-        <translation>nimi</translation>
-    </message>
-    <message>
-        <source>Credit</source>
-        <translation>Credit</translation>
-    </message>
-    <message numerus="yes">
-        <source>matures in %n more block(s)</source>
-        <translation><numerusform>kypsyy %n lohkon kuluttua</numerusform><numerusform>kypsyy %n lohkon kuluttua</numerusform></translation>
-    </message>
-    <message>
-        <source>not accepted</source>
-        <translation>ei hyväksytty</translation>
-    </message>
-    <message>
-        <source>Debit</source>
-        <translation>Debit</translation>
-    </message>
-    <message>
-        <source>Total debit</source>
-        <translation>Yhteensä debit</translation>
-    </message>
-    <message>
-        <source>Total credit</source>
-        <translation>Yhteensä credit</translation>
-    </message>
-    <message>
-        <source>Transaction fee</source>
-        <translation>Maksukulu</translation>
-    </message>
-    <message>
-        <source>Net amount</source>
-        <translation>Netto määrä</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>Viesti</translation>
-    </message>
-    <message>
-        <source>Comment</source>
-        <translation>Viesti</translation>
-    </message>
-    <message>
-        <source>Transaction ID</source>
-        <translation>Siirtotunnus</translation>
-    </message>
-    <message>
-        <source>Merchant</source>
-        <translation>Kauppias</translation>
-    </message>
-    <message>
-        <source>Generated coins must mature %1 blocks before they can be spent. When you generated this block, it was broadcast to the network to be added to the block chain. If it fails to get into the chain, its state will change to "not accepted" and it won't be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source>
-        <translation>Luodut kolikot täytyy kypsyttää %1 lohkoa kunnes ne voidaan käyttää. Kun loit tämän lohkon, se lähetettiin verkkoon lisänä lohkoketjuun. Jos se epäonnistuu pääsemään ketjuun sen tila tulee muuttumaan "ei hyväksytty" ja sitä ei voida käyttää. Tämä voi ajoittain tapahtua kun toisen solmun lohko luodaan samanaikaisesti omasi kanssa.</translation>
-    </message>
-    <message>
-        <source>Debug information</source>
-        <translation>Debug tiedot</translation>
-    </message>
-    <message>
-        <source>Transaction</source>
-        <translation>Rahansiirto</translation>
-    </message>
-    <message>
-        <source>Inputs</source>
-        <translation>Sisääntulot</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>Määrä</translation>
-    </message>
-    <message>
-        <source>true</source>
-        <translation>tosi</translation>
-    </message>
-    <message>
-        <source>false</source>
-        <translation>epätosi</translation>
-    </message>
-    <message>
-        <source>, has not been successfully broadcast yet</source>
-        <translation>, ei ole vielä onnistuneesti lähetetty</translation>
-    </message>
-    <message numerus="yes">
-        <source>Open for %n more block(s)</source>
-        <translation><numerusform>Avoinna %n lisälohkolle</numerusform><numerusform>Avoinna %n lisälohkolle</numerusform></translation>
-    </message>
-    <message>
-        <source>unknown</source>
-        <translation>tuntematon</translation>
-    </message>
-</context>
-<context>
-    <name>TransactionDescDialog</name>
-    <message>
-        <source>Transaction details</source>
-        <translation>Rahansiirron yksityiskohdat</translation>
-    </message>
-    <message>
-        <source>This pane shows a detailed description of the transaction</source>
-        <translation>Tämä ruutu näyttää yksityiskohtaisen tiedon rahansiirrosta</translation>
-    </message>
-</context>
-<context>
-    <name>TransactionTableModel</name>
-    <message>
-        <source>Date</source>
-        <translation>Päivämäärä</translation>
-    </message>
-    <message>
-        <source>Type</source>
-        <translation>Laatu</translation>
-    </message>
-    <message>
-        <source>Immature (%1 confirmations, will be available after %2)</source>
-        <translation>Epäkypsä (%1 varmistusta, saatavilla %2 jälkeen)</translation>
-    </message>
-    <message numerus="yes">
-        <source>Open for %n more block(s)</source>
-        <translation><numerusform>Avoinna %n lisälohkolle</numerusform><numerusform>Avoinna %n lisälohkolle</numerusform></translation>
-    </message>
-    <message>
-        <source>Open until %1</source>
-        <translation>Avoinna %1 asti</translation>
-    </message>
-    <message>
-        <source>Confirmed (%1 confirmations)</source>
-        <translation>Vahvistettu (%1 vahvistusta)</translation>
-    </message>
-    <message>
-        <source>This block was not received by any other nodes and will probably not be accepted!</source>
-        <translation>Tätä lohkoa ei vastaanotettu mistään muusta solmusta ja sitä ei mahdollisesti hyväksytä!</translation>
-    </message>
-    <message>
-        <source>Generated but not accepted</source>
-        <translation>Generoitu mutta ei hyväksytty</translation>
-    </message>
-    <message>
-        <source>Offline</source>
-        <translation>Offline</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Nimi</translation>
-    </message>
-    <message>
-        <source>Unconfirmed</source>
-        <translation>Varmistamaton</translation>
-    </message>
-    <message>
-        <source>Confirming (%1 of %2 recommended confirmations)</source>
-        <translation>Varmistetaan (%1 kehoitetusta %2 varmistuksesta)</translation>
-    </message>
-    <message>
-        <source>Conflicted</source>
-        <translation>Ristiriitainen</translation>
-    </message>
-    <message>
-        <source>Received with</source>
-        <translation>Vastaanotettu osoitteella</translation>
-    </message>
-    <message>
-        <source>Received from</source>
-        <translation>Vastaanotettu</translation>
-    </message>
-    <message>
-        <source>Sent to</source>
-        <translation>Saaja</translation>
-    </message>
-    <message>
-        <source>Payment to yourself</source>
-        <translation>Maksu itsellesi</translation>
-    </message>
-    <message>
-        <source>Mined</source>
-        <translation>Louhittu</translation>
-    </message>
-    <message>
-        <source>watch-only</source>
-        <translation>vain katseltava</translation>
-    </message>
-    <message>
-        <source>(n/a)</source>
-        <translation>(ei saatavilla)</translation>
-    </message>
-    <message>
-        <source>Transaction status. Hover over this field to show number of confirmations.</source>
-        <translation>Rahansiirron tila. Siirrä osoitin kentän päälle nähdäksesi vahvistusten lukumäärä.</translation>
-    </message>
-    <message>
-        <source>Date and time that the transaction was received.</source>
-        <translation>Rahansiirron vastaanottamisen päivämäärä ja aika.</translation>
-    </message>
-    <message>
-        <source>Type of transaction.</source>
-        <translation>Rahansiirron laatu.</translation>
-    </message>
-    <message>
-        <source>Whether or not a watch-only address is involved in this transaction.</source>
-        <translation>Onko rahansiirrossa mukana ainoastaan katseltava osoite vai ei.</translation>
-    </message>
-    <message>
-        <source>User-defined intent/purpose of the transaction.</source>
-        <translation>Käyttäjän määrittämä käyttötarkoitus rahansiirrolle.</translation>
-    </message>
-    <message>
-        <source>Amount removed from or added to balance.</source>
-        <translation>Saldoon lisätty tai siitä vähennetty määrä.</translation>
-    </message>
-</context>
-<context>
-    <name>TransactionView</name>
-    <message>
-        <source>All</source>
-        <translation>Kaikki</translation>
-    </message>
-    <message>
-        <source>Today</source>
-        <translation>Tänään</translation>
-    </message>
-    <message>
-        <source>This week</source>
-        <translation>Tällä viikolla</translation>
-    </message>
-    <message>
-        <source>This month</source>
-        <translation>Tässä kuussa</translation>
-    </message>
-    <message>
-        <source>Last month</source>
-        <translation>Viime kuussa</translation>
-    </message>
-    <message>
-        <source>This year</source>
-        <translation>Tänä vuonna</translation>
-    </message>
-    <message>
-        <source>Range...</source>
-        <translation>Alue...</translation>
-    </message>
-    <message>
-        <source>Received with</source>
-        <translation>Vastaanotettu osoitteella</translation>
-    </message>
-    <message>
-        <source>Sent to</source>
-        <translation>Saaja</translation>
-    </message>
-    <message>
-        <source>To yourself</source>
-        <translation>Itsellesi</translation>
-    </message>
-    <message>
-        <source>Mined</source>
-        <translation>Louhittu</translation>
-    </message>
-    <message>
-        <source>Other</source>
-        <translation>Muu</translation>
-    </message>
-    <message>
-        <source>Enter address or label to search</source>
-        <translation>Anna etsittävä osoite tai tunniste</translation>
-    </message>
-    <message>
-        <source>Min amount</source>
-        <translation>Minimimäärä</translation>
-    </message>
-    <message>
-        <source>Copy address</source>
-        <translation>Kopioi osoite</translation>
-    </message>
-    <message>
-        <source>Copy label</source>
-        <translation>Kopioi nimi</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>Kopioi määrä</translation>
-    </message>
-    <message>
-        <source>Copy transaction ID</source>
-        <translation>Kopioi siirtotunnus</translation>
-    </message>
-    <message>
-        <source>Copy raw transaction</source>
-        <translation>Kopioi rahansiirron raakavedos</translation>
-    </message>
-    <message>
-        <source>Edit label</source>
-        <translation>Muokkaa nimeä</translation>
-    </message>
-    <message>
-        <source>Show transaction details</source>
-        <translation>Näytä rahansiirron yksityiskohdat</translation>
-    </message>
-    <message>
-        <source>Export Transaction History</source>
-        <translation>Vie rahansiirtohistoria</translation>
-    </message>
-    <message>
-        <source>Watch-only</source>
-        <translation>Vain katseltava</translation>
-    </message>
-    <message>
-        <source>Exporting Failed</source>
-        <translation>Vienti epäonnistui</translation>
-    </message>
-    <message>
-        <source>There was an error trying to save the transaction history to %1.</source>
-        <translation>Rahansiirron historian tallentamisessa tapahtui virhe paikkaan %1.</translation>
-    </message>
-    <message>
-        <source>Exporting Successful</source>
-        <translation>Vienti onnistui</translation>
-    </message>
-    <message>
-        <source>The transaction history was successfully saved to %1.</source>
-        <translation>Rahansiirron historia tallennettiin onnistuneesti paikkaan %1.</translation>
-    </message>
-    <message>
-        <source>Comma separated file (*.csv)</source>
-        <translation>Comma separated file (*.csv)</translation>
-    </message>
-    <message>
-        <source>Confirmed</source>
-        <translation>Vahvistettu</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation>Aika</translation>
-    </message>
-    <message>
-        <source>Type</source>
-        <translation>Laatu</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Nimi</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>Osoite</translation>
-    </message>
-    <message>
-        <source>ID</source>
-        <translation>ID</translation>
-    </message>
-    <message>
-        <source>Range:</source>
-        <translation>Alue:</translation>
-    </message>
-    <message>
-        <source>to</source>
-        <translation>kenelle</translation>
-    </message>
-</context>
-<context>
-    <name>UnitDisplayStatusBarControl</name>
-    <message>
-        <source>Unit to show amounts in. Click to select another unit.</source>
-        <translation>Yksikkö jossa määrät näytetään. Klikkaa valitaksesi toisen yksikön.</translation>
-    </message>
-</context>
-<context>
-    <name>WalletFrame</name>
-    <message>
-        <source>No wallet has been loaded.</source>
-        <translation>Lomakkoa ei ole ladattu.</translation>
-    </message>
-</context>
-<context>
-    <name>WalletModel</name>
-    <message>
-        <source>Send Coins</source>
-        <translation>Lähetä Bitcoineja</translation>
-    </message>
-</context>
-<context>
-    <name>WalletView</name>
-    <message>
-        <source>&amp;Export</source>
-        <translation>&amp;Vie...</translation>
-    </message>
-    <message>
-        <source>Export the data in the current tab to a file</source>
-        <translation>Vie auki olevan välilehden tiedot tiedostoon</translation>
-    </message>
-    <message>
-        <source>Backup Wallet</source>
-        <translation>Varmuuskopioi lompakko</translation>
-    </message>
-    <message>
-        <source>Wallet Data (*.dat)</source>
-        <translation>Lompakkodata (*.dat)</translation>
-    </message>
-    <message>
-        <source>Backup Failed</source>
-        <translation>Varmuuskopio epäonnistui</translation>
-    </message>
-    <message>
-        <source>There was an error trying to save the wallet data to %1.</source>
-        <translation>Lompakon tallennuksessa tapahtui virhe %1.</translation>
-    </message>
-    <message>
-        <source>The wallet data was successfully saved to %1.</source>
-        <translation>Lompakko tallennettiin onnistuneesti tiedostoon %1.</translation>
-    </message>
-    <message>
-        <source>Backup Successful</source>
-        <translation>Varmuuskopio Onnistui</translation>
-    </message>
-</context>
-<context>
-    <name>bitcoin-core</name>
-    <message>
-        <source>Options:</source>
-        <translation>Asetukset:</translation>
-    </message>
-    <message>
-        <source>Specify data directory</source>
-        <translation>Määritä data-hakemisto</translation>
-    </message>
-    <message>
-        <source>Connect to a node to retrieve peer addresses, and disconnect</source>
-        <translation>Yhdistä noodiin hakeaksesi naapurien osoitteet ja katkaise yhteys</translation>
-    </message>
-    <message>
-        <source>Specify your own public address</source>
-        <translation>Määritä julkinen osoitteesi</translation>
-    </message>
-    <message>
-        <source>Accept command line and JSON-RPC commands</source>
-        <translation>Hyväksy merkkipohjaiset- ja JSON-RPC-käskyt</translation>
-    </message>
-    <message>
-        <source>If &lt;category&gt; is not supplied or if &lt;category&gt; = 1, output all debugging information.</source>
-        <translation>Jos &lt;category&gt; on toimittamatta tai jos &lt;category&gt; = 1, tulosta kaikki debug-tieto.</translation>
-    </message>
-    <message>
-        <source>Please check that your computer's date and time are correct! If your clock is wrong Bitcoin Core will not work properly.</source>
-        <translation>Tarkistathan että tietokoneesi päivämäärä ja kellonaika ovat oikeassa! Jos kellosi on väärässä, Bitcoin Core ei toimi oikein.</translation>
-    </message>
-    <message>
-        <source>Prune configured below the minimum of %d MiB.  Please use a higher number.</source>
-        <translation>Karsinta konfiguroitu alle minimin %d MiB. Käytä surempaa numeroa.</translation>
-    </message>
-    <message>
-        <source>Prune: last wallet synchronisation goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of pruned node)</source>
-        <translation>Karsinta: viime lompakon synkronisointi menee karsitun datan taakse. Sinun tarvitsee ajaa -reindex (lataa koko lohkoketju uudelleen tapauksessa jossa karsiva noodi)</translation>
-    </message>
-    <message>
-        <source>Reduce storage requirements by pruning (deleting) old blocks. This mode is incompatible with -txindex and -rescan. Warning: Reverting this setting requires re-downloading the entire blockchain. (default: 0 = disable pruning blocks, &gt;%u = target size in MiB to use for block files)</source>
-        <translation>Vähennä levytilan tarvetta karsimalla (poistamalla) vanhoja lohkoja. Tämä tila ei ole yhteensopiva -txindex ja -rescan -parametrien kanssa. Varoitus: Tämän asetuksen peruutus vaatii koko lohkoketjun uudelleenlataamisen. (oletus: 0 = poista karsinta käytöstä, &gt;%u = kohdekoko muodossa MiB jota käytetään lohkotiedostoille) </translation>
+        <source>Reduce storage requirements by pruning (deleting) old blocks. This mode is incompatible with -txindex and -rescan. Warning: Reverting this setting requires re-downloading the entire blockchain. (default: 0 = disable pruning blocks, &gt;%u = target size in MiB to use for block files)</source>
+        <translation>Vähennä levytilan tarvetta karsimalla (poistamalla) vanhoja lohkoja. Tämä tila ei ole yhteensopiva -txindex ja -rescan -parametrien kanssa. Varoitus: Tämän asetuksen peruutus vaatii koko lohkoketjun uudelleenlataamisen. (oletus: 0 = poista karsinta käytöstä, &gt;%u = kohdekoko muodossa MiB jota käytetään lohkotiedostoille) </translation>
     </message>
     <message>
         <source>Rescans are not possible in pruned mode. You will need to use -reindex which will download the whole blockchain again.</source>
@@ -2951,6 +1690,10 @@
         <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
         <translation>Hyväksy yhteyksiä ulkopuolelta (vakioasetus: 1 jos -proxy tai -connect ei määritelty)</translation>
     </message>
+    <message>
+        <source>Bitcoin Core</source>
+        <translation>Bitcoin-ydin</translation>
+    </message>
     <message>
         <source>-fallbackfee is set very high! This is the transaction fee you may pay when fee estimates are not available.</source>
         <translation>-fallbackfee on asetettu erittäin suureksi! Tämä on rahansiirtokulu jonka voit maksaa kun arvioitu rahansirtokulu ei ole saatavilla.</translation>
@@ -2971,10 +1714,6 @@
         <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
         <translation>Tämä on esi-julkaistu testiversio - Käytä omalla riskillä - Ei saa käytää louhimiseen tai kauppasovelluksiin.</translation>
     </message>
-    <message>
-        <source>Unable to bind to %s on this computer. Bitcoin Core is probably already running.</source>
-        <translation>Ei voida yhdistää %s tässä tietokoneessa. Bitcoin Core on luultavasti jo käynnissä.</translation>
-    </message>
     <message>
         <source>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</source>
         <translation>Käytä UPnP:ta kuuntelevan portin kartoitukseen (oletus: 1 kun kuunnellaan ja -proxy ei käytössä)</translation>
@@ -2995,10 +1734,6 @@
         <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source>
         <translation>Varoitus: Olemme vertaisverkon kanssa ristiriidassa! Sinun tulee päivittää tai toisten solmujen tulee päivitää.</translation>
     </message>
-    <message>
-        <source>Warning: wallet.dat corrupt, data salvaged! Original wallet.dat saved as wallet.{timestamp}.bak in %s; if your balance or transactions are incorrect you should restore from a backup.</source>
-        <translation>Varoitus: wallet.dat -lompakkotiedosto on korruptoitunut, tiedot pelastettu. Alkuperäinen wallet.dat -lompakkotiedosto on tallennettu wallet.{timestamp}.bak kansioon %s; jos balanssisi tai siirtohistoria on virheellinen, sinun tulisi palauttaa lompakkotiedosto varmuuskopiosta.</translation>
-    </message>
     <message>
         <source>Whitelist peers connecting from the given netmask or IP address. Can be specified multiple times.</source>
         <translation>Salli vertaisten yhdistää annetusta verkkomaskista tai IP-osoitteesta. Voidaan määrittää useampia kertoja.</translation>
@@ -3123,18 +1858,10 @@
         <source>Wallet options:</source>
         <translation>Lompakon valinnat:</translation>
     </message>
-    <message>
-        <source>You need to rebuild the database using -reindex to change -txindex</source>
-        <translation>Sinun tulee uudelleenrakentaa tietokanta käyttäen -reindex vaihtaen -txindex</translation>
-    </message>
     <message>
         <source>Allow JSON-RPC connections from specified source. Valid for &lt;ip&gt; are a single IP (e.g. 1.2.3.4), a network/netmask (e.g. 1.2.3.4/255.255.255.0) or a network/CIDR (e.g. 1.2.3.4/24). This option can be specified multiple times</source>
         <translation>Salli JSON-RPC-yhteydet määritetystä lähteestä. Kelvolliset arvot &lt;ip&gt; ovat yksittäinen IP (esim. 1.2.3.4), verkko/verkkomaski (esim. 1.2.3.4/255.255.255.0) tai verkko/luokaton reititys (esim. 1.2.3.4/24). Tätä valintatapaa voidaan käyttää useita kertoja</translation>
     </message>
-    <message>
-        <source>Cannot obtain a lock on data directory %s. Bitcoin Core is probably already running.</source>
-        <translation>Ei voida lukita data-hakemistoa %s. Bitcoin Core on luultavasti jo käynnissä.</translation>
-    </message>
     <message>
         <source>Discover own IP addresses (default: 1 when listening and no -externalip or -proxy)</source>
         <translation>Paljasta omat IP-osoitteet (oletus: 1 kun kuunnellaan ja -externalip tai -proxy ei ole käytössä)</translation>
@@ -3147,10 +1874,6 @@
         <source>Set maximum size of high-priority/low-fee transactions in bytes (default: %d)</source>
         <translation>Aseta maksimikoko korkea prioriteetti/pieni palkkio rahansiirtoihin tavuissa (oletus: %d)</translation>
     </message>
-    <message>
-        <source>Set the number of threads for coin generation if enabled (-1 = all cores, default: %d)</source>
-        <translation>Aseta kolikoiden luomiseen tarkoitettujen säikeiden lukumäärä (-1 = kaikki ytimet, oletus: %d)</translation>
-    </message>
     <message>
         <source>(default: %u)</source>
         <translation>(oletus: %u)</translation>
@@ -3159,30 +1882,10 @@
         <source>Accept public REST requests (default: %u)</source>
         <translation>Hyväksy julkisia REST-pyyntöjä (oletus: %u)</translation>
     </message>
-    <message>
-        <source>Activating best chain...</source>
-        <translation>Aktivoidaan parhainta ketjua...</translation>
-    </message>
-    <message>
-        <source>Attempt to recover private keys from a corrupt wallet.dat on startup</source>
-        <translation>Yritä palauttaa yksityiset avaimet korruptoituneesta wallet.dat-tiedostosta käynnistyksen yhteydessä</translation>
-    </message>
-    <message>
-        <source>Cannot resolve -whitebind address: '%s'</source>
-        <translation>-whitebind -osoitetta '%s' ei voida jäsentää</translation>
-    </message>
     <message>
         <source>Connect through SOCKS5 proxy</source>
         <translation>Yhdistä SOCKS5 proxin kautta</translation>
     </message>
-    <message>
-        <source>Copyright (C) 2009-%i The Bitcoin Core Developers</source>
-        <translation>Copyright (C) 2009-%i  Bitcoin kehittäjät</translation>
-    </message>
-    <message>
-        <source>Error loading wallet.dat: Wallet requires newer version of Bitcoin Core</source>
-        <translation>Virhe ladattaessa wallet.dat-tiedostoa: Tarvitset uudemman version Bitcoinista</translation>
-    </message>
     <message>
         <source>Error reading from database, shutting down.</source>
         <translation>Virheitä tietokantaa luettaessa, ohjelma pysäytetään.</translation>
@@ -3191,18 +1894,6 @@
         <source>Information</source>
         <translation>Tietoa</translation>
     </message>
-    <message>
-        <source>Invalid amount for -maxtxfee=&lt;amount&gt;: '%s'</source>
-        <translation>Virheellinen määrä -maxtxfee=&lt;amount&gt;: '%s'</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -minrelaytxfee=&lt;amount&gt;: '%s'</source>
-        <translation>Virheellinen määrä -minrelaytxfee=&lt;amount&gt;: '%s'</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -mintxfee=&lt;amount&gt;: '%s'</source>
-        <translation>Virheellinen määrä -mintxfee=&lt;amount&gt;: '%s'</translation>
-    </message>
     <message>
         <source>Keep at most &lt;n&gt; unconnectable transactions in memory (default: %u)</source>
         <translation>Pidä enimmillään &lt;n&gt; yhdistämiskelvotonta rahansiirtoa muistissa (oletus: %u)</translation>
@@ -3215,10 +1906,6 @@
         <source>RPC server options:</source>
         <translation>RPC-palvelimen valinnat:</translation>
     </message>
-    <message>
-        <source>Receive and display P2P network alerts (default: %u)</source>
-        <translation>Vastaanota ja näytä P2P-verkon hälytyksiä (oletus: %u)</translation>
-    </message>
     <message>
         <source>Rescan the block chain for missing wallet transactions on startup</source>
         <translation>Uudelleenskannaa lohkoketju käynnistyksen yhteydessä puuttuvien lompakon rahansiirtojen vuoksi</translation>
@@ -3279,10 +1966,6 @@
         <source>Username for JSON-RPC connections</source>
         <translation>Käyttäjätunnus JSON-RPC-yhteyksille</translation>
     </message>
-    <message>
-        <source>Wallet needed to be rewritten: restart Bitcoin Core to complete</source>
-        <translation>Lompakko tarvitsee uudelleenkirjoittaa: käynnistä Bitcoin uudelleen</translation>
-    </message>
     <message>
         <source>Warning</source>
         <translation>Varoitus</translation>
@@ -3299,10 +1982,6 @@
         <source>ZeroMQ notification options:</source>
         <translation>ZeroMQ-ilmoitusasetukset:</translation>
     </message>
-    <message>
-        <source>wallet.dat corrupt, salvage failed</source>
-        <translation>wallet.dat -lompakkotiedosto korruptoitunut, korjaaminen epäonnistui</translation>
-    </message>
     <message>
         <source>Password for JSON-RPC connections</source>
         <translation>Salasana JSON-RPC-yhteyksille</translation>
@@ -3311,10 +1990,6 @@
         <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
         <translation>Suorita käsky kun paras lohko muuttuu (%s cmd on vaihdettu block hashin kanssa)</translation>
     </message>
-    <message>
-        <source>This help message</source>
-        <translation>Tämä ohjeviesti</translation>
-    </message>
     <message>
         <source>Allow DNS lookups for -addnode, -seednode and -connect</source>
         <translation>Salli DNS kyselyt -addnode, -seednode ja -connect yhteydessä</translation>
@@ -3323,10 +1998,6 @@
         <source>Loading addresses...</source>
         <translation>Ladataan osoitteita...</translation>
     </message>
-    <message>
-        <source>Error loading wallet.dat: Wallet corrupted</source>
-        <translation>Virhe ladattaessa wallet.dat-tiedostoa: Lompakko vioittunut</translation>
-    </message>
     <message>
         <source>-maxtxfee is set very high! Fees this large could be paid on a single transaction.</source>
         <translation>-maxtxfee on asetettu erittäin suureksi! Tämänkokoisia kuluja saatetaan maksaa yhdessä rahansiirrossa.</translation>
@@ -3339,10 +2010,6 @@
         <source>Do not keep transactions in the mempool longer than &lt;n&gt; hours (default: %u)</source>
         <translation>Älä pidä rahansiirtoja muistivarannoissa kauemmin kuin &lt;n&gt; tuntia (oletus: %u)</translation>
     </message>
-    <message>
-        <source>Error reading wallet.dat! All keys read correctly, but transaction data or address book entries might be missing or incorrect.</source>
-        <translation>Virhe lukiessa wallet.dat-tiedostoa! Kaikki avaimet luettiin onnistuneesti, mutta rahansiirtotiedot tai osoitekirjan sisältö saattavat olla muuttuneita tai vääriä.</translation>
-    </message>
     <message>
         <source>How thorough the block verification of -checkblocks is (0-4, default: %u)</source>
         <translation>Kuinka läpikäyvä lohkojen -checkblocks -todennus on (0-4, oletus: %u)</translation>
@@ -3359,14 +2026,6 @@
         <source>Always query for peer addresses via DNS lookup (default: %u)</source>
         <translation>Pyydä vertaisten osoitteita aina DNS-kyselyjen avulla (oletus: %u)</translation>
     </message>
-    <message>
-        <source>Error loading wallet.dat</source>
-        <translation>Virhe ladattaessa wallet.dat-tiedostoa</translation>
-    </message>
-    <message>
-        <source>Generate coins (default: %u)</source>
-        <translation>Luo kolikoita (oletus: %u)</translation>
-    </message>
     <message>
         <source>How many blocks to check at startup (default: %u, 0 = all)</source>
         <translation>Kuinka monta lohkoa tarkistetaan käynnistyksessä (oletus: %u, 0 = kaikki)</translation>
@@ -3451,18 +2110,6 @@
         <source>Unknown network specified in -onlynet: '%s'</source>
         <translation>Tuntematon verkko -onlynet parametrina: '%s'</translation>
     </message>
-    <message>
-        <source>Cannot resolve -bind address: '%s'</source>
-        <translation>-bind osoitteen '%s' selvittäminen epäonnistui</translation>
-    </message>
-    <message>
-        <source>Cannot resolve -externalip address: '%s'</source>
-        <translation>-externalip osoitteen '%s' selvittäminen epäonnistui</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -paytxfee=&lt;amount&gt;: '%s'</source>
-        <translation>-paytxfee=&lt;amount&gt;: '%s' on virheellinen</translation>
-    </message>
     <message>
         <source>Insufficient funds</source>
         <translation>Lompakon saldo ei riitä</translation>
diff --git a/src/qt/locale/bitcoin_fil.ts b/src/qt/locale/bitcoin_fil.ts
deleted file mode 100644
index fba823837112b..0000000000000
--- a/src/qt/locale/bitcoin_fil.ts
+++ /dev/null
@@ -1,157 +0,0 @@
-<TS language="fil" version="2.1">
-<context>
-    <name>AddressBookPage</name>
-    <message>
-        <source>Create a new address</source>
-        <translation>Gumawa ng bagong address</translation>
-    </message>
-    <message>
-        <source>Copy the currently selected address to the system clipboard</source>
-        <translation>Kopyahin ang napiling tahanan sa clipboard</translation>
-    </message>
-    <message>
-        <source>&amp;Copy</source>
-        <translation>Kumopya</translation>
-    </message>
-    <message>
-        <source>C&amp;lose</source>
-        <translation>Isarado</translation>
-    </message>
-    <message>
-        <source>&amp;Copy Address</source>
-        <translation>Tumulad ng kinatatahanan</translation>
-    </message>
-    <message>
-        <source>Delete the currently selected address from the list</source>
-        <translation>Alisin ang napiling address sa pagpipilian</translation>
-    </message>
-    <message>
-        <source>Choose the address to send coins to</source>
-        <translation>Pumili ng pagpapadalahang address</translation>
-    </message>
-    <message>
-        <source>Choose the address to receive coins with</source>
-        <translation>Piliin ang address ng nagpadala</translation>
-    </message>
-    <message>
-        <source>C&amp;hoose</source>
-        <translation>Piliin</translation>
-    </message>
-    <message>
-        <source>Sending addresses</source>
-        <translation>Address pagpapadala</translation>
-    </message>
-    <message>
-        <source>Receiving addresses</source>
-        <translation>Address bilang pagtanggap</translation>
-    </message>
-    </context>
-<context>
-    <name>AddressTableModel</name>
-    </context>
-<context>
-    <name>AskPassphraseDialog</name>
-    </context>
-<context>
-    <name>BanTableModel</name>
-    </context>
-<context>
-    <name>BitcoinGUI</name>
-    </context>
-<context>
-    <name>ClientModel</name>
-    </context>
-<context>
-    <name>CoinControlDialog</name>
-    </context>
-<context>
-    <name>EditAddressDialog</name>
-    </context>
-<context>
-    <name>FreespaceChecker</name>
-    </context>
-<context>
-    <name>HelpMessageDialog</name>
-    </context>
-<context>
-    <name>Intro</name>
-    </context>
-<context>
-    <name>OpenURIDialog</name>
-    </context>
-<context>
-    <name>OptionsDialog</name>
-    </context>
-<context>
-    <name>OverviewPage</name>
-    </context>
-<context>
-    <name>PaymentServer</name>
-    </context>
-<context>
-    <name>PeerTableModel</name>
-    </context>
-<context>
-    <name>QObject</name>
-    </context>
-<context>
-    <name>QRImageWidget</name>
-    </context>
-<context>
-    <name>RPCConsole</name>
-    </context>
-<context>
-    <name>ReceiveCoinsDialog</name>
-    </context>
-<context>
-    <name>ReceiveRequestDialog</name>
-    </context>
-<context>
-    <name>RecentRequestsTableModel</name>
-    </context>
-<context>
-    <name>SendCoinsDialog</name>
-    </context>
-<context>
-    <name>SendCoinsEntry</name>
-    </context>
-<context>
-    <name>ShutdownWindow</name>
-    </context>
-<context>
-    <name>SignVerifyMessageDialog</name>
-    </context>
-<context>
-    <name>SplashScreen</name>
-    </context>
-<context>
-    <name>TrafficGraphWidget</name>
-    </context>
-<context>
-    <name>TransactionDesc</name>
-    </context>
-<context>
-    <name>TransactionDescDialog</name>
-    </context>
-<context>
-    <name>TransactionTableModel</name>
-    </context>
-<context>
-    <name>TransactionView</name>
-    </context>
-<context>
-    <name>UnitDisplayStatusBarControl</name>
-    </context>
-<context>
-    <name>WalletFrame</name>
-    </context>
-<context>
-    <name>WalletModel</name>
-    </context>
-<context>
-    <name>WalletView</name>
-    </context>
-<context>
-    <name>bitcoin-core</name>
-    </context>
-</TS>
\ No newline at end of file
diff --git a/src/qt/locale/bitcoin_fr.ts b/src/qt/locale/bitcoin_fr.ts
index 65808c77406b7..fe745f99bf181 100644
--- a/src/qt/locale/bitcoin_fr.ts
+++ b/src/qt/locale/bitcoin_fr.ts
@@ -15,7 +15,7 @@
     </message>
     <message>
         <source>Copy the currently selected address to the system clipboard</source>
-        <translation>Copier l'adresse courante sélectionnée dans le presse-papiers</translation>
+        <translation>Copier l'adresse sélectionnée actuellement dans le presse-papiers</translation>
     </message>
     <message>
         <source>&amp;Copy</source>
@@ -25,17 +25,13 @@
         <source>C&amp;lose</source>
         <translation>&amp;Fermer</translation>
     </message>
-    <message>
-        <source>&amp;Copy Address</source>
-        <translation>&amp;Copier l'adresse</translation>
-    </message>
     <message>
         <source>Delete the currently selected address from the list</source>
-        <translation>Supprimer l'adresse actuellement sélectionnée de la liste</translation>
+        <translation>Supprimer de la liste l'adresse sélectionnée actuellement</translation>
     </message>
     <message>
         <source>Export the data in the current tab to a file</source>
-        <translation>Exporter les données de l'onglet courant vers un fichier</translation>
+        <translation>Exporter les données de l'onglet actuel vers un fichier</translation>
     </message>
     <message>
         <source>&amp;Export</source>
@@ -45,73 +41,6 @@
         <source>&amp;Delete</source>
         <translation>&amp;Supprimer</translation>
     </message>
-    <message>
-        <source>Choose the address to send coins to</source>
-        <translation>Choisir l'adresse à laquelle envoyer des pièces</translation>
-    </message>
-    <message>
-        <source>Choose the address to receive coins with</source>
-        <translation>Choisir l'adresse avec laquelle recevoir des pièces</translation>
-    </message>
-    <message>
-        <source>C&amp;hoose</source>
-        <translation>C&amp;hoisir</translation>
-    </message>
-    <message>
-        <source>Sending addresses</source>
-        <translation>Adresses d'envoi</translation>
-    </message>
-    <message>
-        <source>Receiving addresses</source>
-        <translation>Adresses de réception</translation>
-    </message>
-    <message>
-        <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source>
-        <translation>Voici vos adresses Bitcoin pour envoyer des paiements. Vérifiez toujours le montant et l'adresse du destinataire avant d'envoyer des pièces.</translation>
-    </message>
-    <message>
-        <source>These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source>
-        <translation>Voici vos adresses Bitcoin pour recevoir des paiements. Il est recommandé d'utiliser une nouvelle adresse de réception pour chaque transaction.</translation>
-    </message>
-    <message>
-        <source>Copy &amp;Label</source>
-        <translation>Copier l'é&amp;tiquette</translation>
-    </message>
-    <message>
-        <source>&amp;Edit</source>
-        <translation>&amp;Modifier</translation>
-    </message>
-    <message>
-        <source>Export Address List</source>
-        <translation>Exporter la liste d'adresses</translation>
-    </message>
-    <message>
-        <source>Comma separated file (*.csv)</source>
-        <translation>Valeurs séparées par des virgules (*.csv)</translation>
-    </message>
-    <message>
-        <source>Exporting Failed</source>
-        <translation>L'exportation a échoué</translation>
-    </message>
-    <message>
-        <source>There was an error trying to save the address list to %1. Please try again.</source>
-        <translation>Une erreur est survenue lors de l'enregistrement de la liste d'adresses vers %1. Veuillez ressayer plus tard.</translation>
-    </message>
-</context>
-<context>
-    <name>AddressTableModel</name>
-    <message>
-        <source>Label</source>
-        <translation>Étiquette</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>Adresse</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(aucune étiquette)</translation>
-    </message>
 </context>
 <context>
     <name>AskPassphraseDialog</name>
@@ -131,94 +60,6 @@
         <source>Repeat new passphrase</source>
         <translation>Répéter la phrase de passe</translation>
     </message>
-    <message>
-        <source>Encrypt wallet</source>
-        <translation>Chiffrer le portefeuille</translation>
-    </message>
-    <message>
-        <source>This operation needs your wallet passphrase to unlock the wallet.</source>
-        <translation>Cette opération nécessite votre phrase de passe pour déverrouiller le portefeuille.</translation>
-    </message>
-    <message>
-        <source>Unlock wallet</source>
-        <translation>Déverrouiller le portefeuille</translation>
-    </message>
-    <message>
-        <source>This operation needs your wallet passphrase to decrypt the wallet.</source>
-        <translation>Cette opération nécessite votre phrase de passe pour déchiffrer le portefeuille.</translation>
-    </message>
-    <message>
-        <source>Decrypt wallet</source>
-        <translation>Déchiffrer le portefeuille</translation>
-    </message>
-    <message>
-        <source>Change passphrase</source>
-        <translation>Changer la phrase de passe</translation>
-    </message>
-    <message>
-        <source>Confirm wallet encryption</source>
-        <translation>Confirmer le chiffrement du portefeuille</translation>
-    </message>
-    <message>
-        <source>Warning: If you encrypt your wallet and lose your passphrase, you will &lt;b&gt;LOSE ALL OF YOUR BITCOINS&lt;/b&gt;!</source>
-        <translation>Avertissement : si vous chiffrez votre portefeuille et perdez votre phrase de passe, vous &lt;b&gt;PERDREZ TOUS VOS BITCOINS&lt;/b&gt; !</translation>
-    </message>
-    <message>
-        <source>Are you sure you wish to encrypt your wallet?</source>
-        <translation>Êtes-vous sûr de vouloir chiffrer votre portefeuille ?</translation>
-    </message>
-    <message>
-        <source>Bitcoin Core will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source>
-        <translation>Bitcoin Core va maintenant se fermer pour terminer le processus de chiffrement. Souvenez-vous que le chiffrement de votre portefeuille ne peut pas vous protéger complètement contre le vol de vos bitcoins par des programmes malveillants infectant votre ordinateur.</translation>
-    </message>
-    <message>
-        <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source>
-        <translation>IMPORTANT : Toute sauvegarde précédente de votre fichier de portefeuille devrait être remplacée par le nouveau fichier de portefeuille chiffré. Pour des raisons de sécurité, les sauvegardes précédentes de votre fichier de portefeuille non chiffré deviendront inutilisables dès que vous commencerez à utiliser le nouveau portefeuille chiffré.</translation>
-    </message>
-    <message>
-        <source>Warning: The Caps Lock key is on!</source>
-        <translation>Avertissement : la touche Verr. Maj. est activée !</translation>
-    </message>
-    <message>
-        <source>Wallet encrypted</source>
-        <translation>Portefeuille chiffré</translation>
-    </message>
-    <message>
-        <source>Enter the new passphrase to the wallet.&lt;br/&gt;Please use a passphrase of &lt;b&gt;ten or more random characters&lt;/b&gt;, or &lt;b&gt;eight or more words&lt;/b&gt;.</source>
-        <translation>Saisissez une nouvelle phrase de passe pour le portefeuille.&lt;br/&gt;Veuillez utiliser une phrase composée de &lt;b&gt;dix caractères aléatoires ou plus&lt;/b&gt;, ou bien de &lt;b&gt;huit mots ou plus&lt;/b&gt;.</translation>
-    </message>
-    <message>
-        <source>Enter the old passphrase and new passphrase to the wallet.</source>
-        <translation>Saisir l'ancienne phrase de passe puis la nouvelle phrase de passe du portefeuille.</translation>
-    </message>
-    <message>
-        <source>Wallet encryption failed</source>
-        <translation>Le chiffrement du portefeuille a échoué</translation>
-    </message>
-    <message>
-        <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
-        <translation>Le chiffrement du portefeuille a échoué en raison d'une erreur interne. Votre portefeuille n'a pas été chiffré.</translation>
-    </message>
-    <message>
-        <source>The supplied passphrases do not match.</source>
-        <translation>Les phrases de passe saisies ne correspondent pas.</translation>
-    </message>
-    <message>
-        <source>Wallet unlock failed</source>
-        <translation>Le déverrouillage du portefeuille a échoué</translation>
-    </message>
-    <message>
-        <source>The passphrase entered for the wallet decryption was incorrect.</source>
-        <translation>La phrase de passe saisie pour déchiffrer le portefeuille était incorrecte.</translation>
-    </message>
-    <message>
-        <source>Wallet decryption failed</source>
-        <translation>Le déchiffrage du portefeuille a échoué</translation>
-    </message>
-    <message>
-        <source>Wallet passphrase was successfully changed.</source>
-        <translation>La phrase de passe du portefeuille a été modifiée avec succès.</translation>
-    </message>
 </context>
 <context>
     <name>BanTableModel</name>
@@ -251,7 +92,7 @@
     </message>
     <message>
         <source>Show general overview of wallet</source>
-        <translation>Afficher une vue d’ensemble du portefeuille</translation>
+        <translation>Afficher une vue d’ensemble du porte-monnaie</translation>
     </message>
     <message>
         <source>&amp;Transactions</source>
@@ -269,6 +110,14 @@
         <source>Quit application</source>
         <translation>Quitter l’application</translation>
     </message>
+    <message>
+        <source>&amp;About %1</source>
+        <translation>À &amp;propos de %1</translation>
+    </message>
+    <message>
+        <source>Show information about %1</source>
+        <translation>Afficher des informations à propos de %1</translation>
+    </message>
     <message>
         <source>About &amp;Qt</source>
         <translation>À propos de &amp;Qt</translation>
@@ -281,13 +130,17 @@
         <source>&amp;Options...</source>
         <translation>&amp;Options…</translation>
     </message>
+    <message>
+        <source>Modify configuration options for %1</source>
+        <translation>Modifier les options de configuration de %1</translation>
+    </message>
     <message>
         <source>&amp;Encrypt Wallet...</source>
-        <translation>&amp;Chiffrer le portefeuille...</translation>
+        <translation>&amp;Chiffrer le porte-monnaie...</translation>
     </message>
     <message>
         <source>&amp;Backup Wallet...</source>
-        <translation>Sauvegarder le &amp;portefeuille...</translation>
+        <translation>Sauvegarder le &amp;porte-monnaie...</translation>
     </message>
     <message>
         <source>&amp;Change Passphrase...</source>
@@ -305,14 +158,6 @@
         <source>Open &amp;URI...</source>
         <translation>Ouvrir un &amp;URI...</translation>
     </message>
-    <message>
-        <source>Bitcoin Core client</source>
-        <translation>Client Bitcoin Core</translation>
-    </message>
-    <message>
-        <source>Importing blocks from disk...</source>
-        <translation>Importation des blocs à partir du disque...</translation>
-    </message>
     <message>
         <source>Reindexing blocks on disk...</source>
         <translation>Réindexation des blocs sur le disque...</translation>
@@ -323,11 +168,11 @@
     </message>
     <message>
         <source>Backup wallet to another location</source>
-        <translation>Sauvegarder le portefeuille vers un autre emplacement</translation>
+        <translation>Sauvegarder le porte-monnaie vers un autre emplacement</translation>
     </message>
     <message>
         <source>Change the passphrase used for wallet encryption</source>
-        <translation>Modifier la phrase de passe utilisée pour le chiffrement du portefeuille</translation>
+        <translation>Modifier la phrase de passe utilisée pour le chiffrement du porte-monnaie</translation>
     </message>
     <message>
         <source>&amp;Debug window</source>
@@ -347,7 +192,7 @@
     </message>
     <message>
         <source>Wallet</source>
-        <translation>Portefeuille</translation>
+        <translation>Porte-monnaie</translation>
     </message>
     <message>
         <source>&amp;Send</source>
@@ -357,10 +202,6 @@
         <source>&amp;Receive</source>
         <translation>&amp;Recevoir</translation>
     </message>
-    <message>
-        <source>Show information about Bitcoin Core</source>
-        <translation>Montrer des informations à propos de Bitcoin Core</translation>
-    </message>
     <message>
         <source>&amp;Show / Hide</source>
         <translation>&amp;Afficher / Cacher</translation>
@@ -371,7 +212,7 @@
     </message>
     <message>
         <source>Encrypt the private keys that belong to your wallet</source>
-        <translation>Chiffrer les clefs privées de votre portefeuille</translation>
+        <translation>Chiffrer les clefs privées de votre porte-monnaie</translation>
     </message>
     <message>
         <source>Sign messages with your Bitcoin addresses to prove you own them</source>
@@ -397,22 +238,10 @@
         <source>Tabs toolbar</source>
         <translation>Barre d'outils des onglets</translation>
     </message>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Bitcoin Core</translation>
-    </message>
     <message>
         <source>Request payments (generates QR codes and bitcoin: URIs)</source>
         <translation>Demander des paiements (génère des codes QR et des URIs bitcoin:)</translation>
     </message>
-    <message>
-        <source>&amp;About Bitcoin Core</source>
-        <translation>À &amp;propos de Bitcoin Core</translation>
-    </message>
-    <message>
-        <source>Modify configuration options for Bitcoin Core</source>
-        <translation>Modifier les options de configuration de Bitcoin Core</translation>
-    </message>
     <message>
         <source>Show the list of used sending addresses and labels</source>
         <translation>Afficher la liste d'adresses d'envoi et d'étiquettes utilisées</translation>
@@ -429,14 +258,18 @@
         <source>&amp;Command-line options</source>
         <translation>Options de ligne de &amp;commande</translation>
     </message>
-    <message>
-        <source>Show the Bitcoin Core help message to get a list with possible Bitcoin command-line options</source>
-        <translation>Afficher le message d'aide de Bitcoin Core pour obtenir une liste des options de ligne de commande Bitcoin possibles.</translation>
-    </message>
     <message numerus="yes">
         <source>%n active connection(s) to Bitcoin network</source>
         <translation><numerusform>%n connexion active avec le réseau Bitcoin</numerusform><numerusform>%n connexions actives avec le réseau Bitcoin</numerusform></translation>
     </message>
+    <message>
+        <source>Indexing blocks on disk...</source>
+        <translation>Indexation des blocs sur le disque...</translation>
+    </message>
+    <message>
+        <source>Processing blocks on disk...</source>
+        <translation>Traitement des blocs sur le disque...</translation>
+    </message>
     <message>
         <source>No block source available...</source>
         <translation>Aucune source de blocs disponible...</translation>
@@ -493,6 +326,14 @@
         <source>Up to date</source>
         <translation>À jour</translation>
     </message>
+    <message>
+        <source>Show the %1 help message to get a list with possible Bitcoin command-line options</source>
+        <translation>Afficher le message d'aide de %1 pour obtenir la liste des options de ligne de commande Bitcoin possibles.</translation>
+    </message>
+    <message>
+        <source>%1 client</source>
+        <translation>Client %1</translation>
+    </message>
     <message>
         <source>Catching up...</source>
         <translation>Rattrapage en cours…</translation>
@@ -537,18 +378,11 @@
     </message>
     <message>
         <source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;unlocked&lt;/b&gt;</source>
-        <translation>Le portefeuille est &lt;b&gt;chiffré&lt;/b&gt; et est actuellement &lt;b&gt;déverrouillé&lt;/b&gt;</translation>
+        <translation>Le porte-monnaie est &lt;b&gt;chiffré&lt;/b&gt; et est actuellement &lt;b&gt;déverrouillé&lt;/b&gt;</translation>
     </message>
     <message>
         <source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;locked&lt;/b&gt;</source>
-        <translation>Le portefeuille est &lt;b&gt;chiffré&lt;/b&gt; et actuellement &lt;b&gt;verrouillé&lt;/b&gt;</translation>
-    </message>
-</context>
-<context>
-    <name>ClientModel</name>
-    <message>
-        <source>Network Alert</source>
-        <translation>Alerte réseau</translation>
+        <translation>Le porte-monnaie est &lt;b&gt;chiffré&lt;/b&gt; et actuellement &lt;b&gt;verrouillé&lt;/b&gt;</translation>
     </message>
 </context>
 <context>
@@ -629,150 +463,6 @@
         <source>Priority</source>
         <translation>Priorité</translation>
     </message>
-    <message>
-        <source>Copy address</source>
-        <translation>Copier l’adresse</translation>
-    </message>
-    <message>
-        <source>Copy label</source>
-        <translation>Copier l’étiquette</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>Copier le montant</translation>
-    </message>
-    <message>
-        <source>Copy transaction ID</source>
-        <translation>Copier l'ID de la transaction</translation>
-    </message>
-    <message>
-        <source>Lock unspent</source>
-        <translation>Verrouiller ce qui n'est pas dépensé</translation>
-    </message>
-    <message>
-        <source>Unlock unspent</source>
-        <translation>Déverrouiller ce qui n'est pas dépensé</translation>
-    </message>
-    <message>
-        <source>Copy quantity</source>
-        <translation>Copier la quantité</translation>
-    </message>
-    <message>
-        <source>Copy fee</source>
-        <translation>Copier les frais</translation>
-    </message>
-    <message>
-        <source>Copy after fee</source>
-        <translation>Copier le montant après les frais</translation>
-    </message>
-    <message>
-        <source>Copy bytes</source>
-        <translation>Copier les octets</translation>
-    </message>
-    <message>
-        <source>Copy priority</source>
-        <translation>Copier la priorité</translation>
-    </message>
-    <message>
-        <source>Copy dust</source>
-        <translation>Copier la poussière</translation>
-    </message>
-    <message>
-        <source>Copy change</source>
-        <translation>Copier la monnaie</translation>
-    </message>
-    <message>
-        <source>highest</source>
-        <translation>la plus élevée</translation>
-    </message>
-    <message>
-        <source>higher</source>
-        <translation>plus élevée</translation>
-    </message>
-    <message>
-        <source>high</source>
-        <translation>élevée</translation>
-    </message>
-    <message>
-        <source>medium-high</source>
-        <translation>moyennement-élevée</translation>
-    </message>
-    <message>
-        <source>medium</source>
-        <translation>moyenne</translation>
-    </message>
-    <message>
-        <source>low-medium</source>
-        <translation>moyennement-basse</translation>
-    </message>
-    <message>
-        <source>low</source>
-        <translation>basse</translation>
-    </message>
-    <message>
-        <source>lower</source>
-        <translation>plus basse</translation>
-    </message>
-    <message>
-        <source>lowest</source>
-        <translation>la plus basse</translation>
-    </message>
-    <message>
-        <source>(%1 locked)</source>
-        <translation>(%1 verrouillé)</translation>
-    </message>
-    <message>
-        <source>none</source>
-        <translation>aucun</translation>
-    </message>
-    <message>
-        <source>This label turns red if the transaction size is greater than 1000 bytes.</source>
-        <translation>Cette étiquette devient rouge si la taille de la transaction est plus grande que 1 000 octets.</translation>
-    </message>
-    <message>
-        <source>This label turns red if the priority is smaller than "medium".</source>
-        <translation>Cette étiquette devient rouge si la priorité est plus basse que « moyenne ».</translation>
-    </message>
-    <message>
-        <source>This label turns red if any recipient receives an amount smaller than %1.</source>
-        <translation>Cette étiquette devient rouge si un destinataire reçoit un montant inférieur à %1.</translation>
-    </message>
-    <message>
-        <source>Can vary +/- %1 satoshi(s) per input.</source>
-        <translation>Peut varier +/- %1 satoshi(s) par entrée.</translation>
-    </message>
-    <message>
-        <source>yes</source>
-        <translation>oui</translation>
-    </message>
-    <message>
-        <source>no</source>
-        <translation>non</translation>
-    </message>
-    <message>
-        <source>This means a fee of at least %1 per kB is required.</source>
-        <translation>Ceci signifie que des frais d'au moins %1 par ko sont exigés.</translation>
-    </message>
-    <message>
-        <source>Can vary +/- 1 byte per input.</source>
-        <translation>Peut varier +/- 1 octet par entrée.</translation>
-    </message>
-    <message>
-        <source>Transactions with higher priority are more likely to get included into a block.</source>
-        <translation>Les transactions à priorité plus haute sont plus à même d'être incluses dans un bloc.</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(aucune étiquette)</translation>
-    </message>
-    <message>
-        <source>change from %1 (%2)</source>
-        <translation>monnaie de %1 (%2)</translation>
-    </message>
-    <message>
-        <source>(change)</source>
-        <translation>(monnaie)</translation>
-    </message>
 </context>
 <context>
     <name>EditAddressDialog</name>
@@ -796,38 +486,6 @@
         <source>&amp;Address</source>
         <translation>&amp;Adresse</translation>
     </message>
-    <message>
-        <source>New receiving address</source>
-        <translation>Nouvelle adresse de réception</translation>
-    </message>
-    <message>
-        <source>New sending address</source>
-        <translation>Nouvelle adresse d’envoi</translation>
-    </message>
-    <message>
-        <source>Edit receiving address</source>
-        <translation>Modifier l’adresse de réception</translation>
-    </message>
-    <message>
-        <source>Edit sending address</source>
-        <translation>Modifier l’adresse d'envoi</translation>
-    </message>
-    <message>
-        <source>The entered address "%1" is already in the address book.</source>
-        <translation>L’adresse fournie « %1 » est déjà présente dans le carnet d'adresses.</translation>
-    </message>
-    <message>
-        <source>The entered address "%1" is not a valid Bitcoin address.</source>
-        <translation>L'adresse fournie « %1 » n'est pas une adresse Bitcoin valide.</translation>
-    </message>
-    <message>
-        <source>Could not unlock wallet.</source>
-        <translation>Impossible de déverrouiller le portefeuille.</translation>
-    </message>
-    <message>
-        <source>New key generation failed.</source>
-        <translation>Échec de génération de la nouvelle clef.</translation>
-    </message>
 </context>
 <context>
     <name>FreespaceChecker</name>
@@ -854,10 +512,6 @@
 </context>
 <context>
     <name>HelpMessageDialog</name>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Bitcoin Core</translation>
-    </message>
     <message>
         <source>version</source>
         <translation>version</translation>
@@ -867,8 +521,8 @@
         <translation>(%1-bit)</translation>
     </message>
     <message>
-        <source>About Bitcoin Core</source>
-        <translation>À propos de Bitcoin Core</translation>
+        <source>About %1</source>
+        <translation>À propos de %1</translation>
     </message>
     <message>
         <source>Command-line options</source>
@@ -907,8 +561,8 @@
         <translation>Afficher l'écran d'accueil au démarrage (par défaut : %u)</translation>
     </message>
     <message>
-        <source>Reset all settings changes made over the GUI</source>
-        <translation>Réinitialiser tous les changements de paramètres appliqués à l'IUG</translation>
+        <source>Reset all settings changed in the GUI</source>
+        <translation>Réinitialiser tous les paramètres changés dans l'IUG</translation>
     </message>
 </context>
 <context>
@@ -918,16 +572,16 @@
         <translation>Bienvenue</translation>
     </message>
     <message>
-        <source>Welcome to Bitcoin Core.</source>
-        <translation>Bienvenue à Bitcoin Core.</translation>
+        <source>Welcome to %1.</source>
+        <translation>Bienvenue à %1.</translation>
     </message>
     <message>
-        <source>As this is the first time the program is launched, you can choose where Bitcoin Core will store its data.</source>
-        <translation>Comme c'est la première fois que le logiciel est lancé, vous pouvez choisir où Bitcoin Core stockera ses données.</translation>
+        <source>As this is the first time the program is launched, you can choose where %1 will store its data.</source>
+        <translation>Puisque c'est la première fois que le logiciel est lancé, vous pouvez choisir où %1 stockera ses données.</translation>
     </message>
     <message>
-        <source>Bitcoin Core will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source>
-        <translation>Bitcoin Core va télécharger et stocker une copie de la chaîne de blocs Bitcoin. Au moins %1Go de données seront stockées dans ce répertoire et cela augmentera avec le temps. Le portefeuille sera également stocké dans ce répertoire.</translation>
+        <source>%1 will download and store a copy of the Bitcoin block chain. At least %2GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source>
+        <translation>%1 téléchargera et stockera une copie de la chaîne de blocs de Bitcoin. Au moins %2 Go de données seront stockés dans ce répertoire et sa taille augmentera avec le temps. Le porte-monnaie sera également stocké dans ce répertoire.</translation>
     </message>
     <message>
         <source>Use the default data directory</source>
@@ -937,10 +591,6 @@
         <source>Use a custom data directory:</source>
         <translation>Utiliser un répertoire de données personnalisé :</translation>
     </message>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Bitcoin Core</translation>
-    </message>
     <message>
         <source>Error: Specified data directory "%1" cannot be created.</source>
         <translation>Erreur : le répertoire de données spécifié « %1 » ne peut pas être créé.</translation>
@@ -976,10 +626,6 @@
         <source>Select payment request file</source>
         <translation>Choisir le fichier de demande de paiement</translation>
     </message>
-    <message>
-        <source>Select payment request file to open</source>
-        <translation>Choisir le fichier de demande de paiement à ouvrir</translation>
-    </message>
 </context>
 <context>
     <name>OptionsDialog</name>
@@ -991,6 +637,14 @@
         <source>&amp;Main</source>
         <translation>Réglages &amp;principaux</translation>
     </message>
+    <message>
+        <source>Automatically start %1 after logging in to the system.</source>
+        <translation>Démarrer %1 automatiquement après avoir ouvert une session sur l'ordinateur.</translation>
+    </message>
+    <message>
+        <source>&amp;Start %1 on system login</source>
+        <translation>&amp;Démarrer %1 lors de l'ouverture d'une session</translation>
+    </message>
     <message>
         <source>Size of &amp;database cache</source>
         <translation>Taille du cache de la base de &amp;données</translation>
@@ -1019,10 +673,6 @@
         <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Exit in the menu.</source>
         <translation>Minimiser au lieu de quitter l'application lorsque la fenêtre est fermée. Si cette option est activée, l'application ne sera fermée qu'en sélectionnant Quitter dans le menu.</translation>
     </message>
-    <message>
-        <source>The user interface language can be set here. This setting will take effect after restarting Bitcoin Core.</source>
-        <translation>La langue de l'interface utilisateur peut être définie ici. Ce réglage sera pris en compte après redémarrage de Bitcoin.</translation>
-    </message>
     <message>
         <source>Third party URLs (e.g. a block explorer) that appear in the transactions tab as context menu items. %s in the URL is replaced by transaction hash. Multiple URLs are separated by vertical bar |.</source>
         <translation>URL de tiers (par ex. un explorateur de blocs) apparaissant dans l'onglet des transactions comme éléments du menu contextuel. %s dans l'URL est remplacé par le hachage de la transaction. Les URL multiples sont séparées par une barre verticale |.</translation>
@@ -1047,21 +697,13 @@
         <source>&amp;Network</source>
         <translation>&amp;Réseau</translation>
     </message>
-    <message>
-        <source>Automatically start Bitcoin Core after logging in to the system.</source>
-        <translation>Démarrer Bitcoin Core automatiquement après avoir ouvert une session sur le système.</translation>
-    </message>
-    <message>
-        <source>&amp;Start Bitcoin Core on system login</source>
-        <translation>&amp;Démarrer Bitcoin Core lors de l'ouverture d'une session</translation>
-    </message>
     <message>
         <source>(0 = auto, &lt;0 = leave that many cores free)</source>
         <translation>(0 = auto, &lt; 0 = laisser ce nombre de cœurs inutilisés)</translation>
     </message>
     <message>
         <source>W&amp;allet</source>
-        <translation>&amp;Portefeuille</translation>
+        <translation>&amp;Porte-monnaie</translation>
     </message>
     <message>
         <source>Expert</source>
@@ -1139,6 +781,14 @@
         <source>&amp;Window</source>
         <translation>&amp;Fenêtre</translation>
     </message>
+    <message>
+        <source>&amp;Hide the icon from the system tray.</source>
+        <translation>&amp;Cacher l'icône dans la zone de notification.</translation>
+    </message>
+    <message>
+        <source>Hide tray icon</source>
+        <translation>Cacher l'icône de la zone de notification</translation>
+    </message>
     <message>
         <source>Show only a tray icon after minimizing the window.</source>
         <translation>Afficher uniquement une icône système après minimisation.</translation>
@@ -1159,6 +809,10 @@
         <source>User Interface &amp;language:</source>
         <translation>&amp;Langue de l'interface utilisateur :</translation>
     </message>
+    <message>
+        <source>The user interface language can be set here. This setting will take effect after restarting %1.</source>
+        <translation>La langue de l'interface utilisateur peut être définie ici. Ce réglage sera pris en compte après redémarrage de %1.</translation>
+    </message>
     <message>
         <source>&amp;Unit to show amounts in:</source>
         <translation>&amp;Unité d'affichage des montants :</translation>
@@ -1216,7 +870,7 @@
     </message>
     <message>
         <source>The displayed information may be out of date. Your wallet automatically synchronizes with the Bitcoin network after a connection is established, but this process has not completed yet.</source>
-        <translation>Les informations affichées peuvent être obsolètes. Votre portefeuille est automatiquement synchronisé avec le réseau Bitcoin lorsque la connexion s'établit, or ce processus n'est pas encore terminé.</translation>
+        <translation>Les informations affichées peuvent être obsolètes. Votre porte-monnaie est automatiquement synchronisé avec le réseau Bitcoin lorsque la connexion s'établit, or ce processus n'est pas encore terminé.</translation>
     </message>
     <message>
         <source>Watch-only:</source>
@@ -1284,169 +938,59 @@
     </message>
 </context>
 <context>
-    <name>PaymentServer</name>
+    <name>PeerTableModel</name>
     <message>
-        <source>URI handling</source>
-        <translation>Gestion des URIs</translation>
+        <source>User Agent</source>
+        <translation>Agent utilisateur</translation>
     </message>
     <message>
-        <source>Invalid payment address %1</source>
-        <translation>Adresse de paiement invalide %1</translation>
+        <source>Node/Service</source>
+        <translation>Nœud/service</translation>
     </message>
     <message>
-        <source>Payment request rejected</source>
-        <translation>La demande de paiement est rejetée</translation>
+        <source>Ping Time</source>
+        <translation>Temps de ping</translation>
     </message>
+</context>
+<context>
+    <name>QObject</name>
     <message>
-        <source>Payment request network doesn't match client network.</source>
-        <translation>Le réseau de la demande de paiement ne correspond pas au réseau du client.</translation>
+        <source>Amount</source>
+        <translation>Montant</translation>
     </message>
     <message>
-        <source>Payment request is not initialized.</source>
-        <translation>La demande de paiement n'est pas initialisée.</translation>
+        <source>Enter a Bitcoin address (e.g. %1)</source>
+        <translation>Saisir une adresse Bitcoin (p. ex. %1)</translation>
     </message>
     <message>
-        <source>Requested payment amount of %1 is too small (considered dust).</source>
-        <translation>Le paiement demandé d'un montant de %1 est trop faible (considéré comme de la poussière).</translation>
+        <source>%1 d</source>
+        <translation>%1 j</translation>
     </message>
     <message>
-        <source>Payment request error</source>
-        <translation>Erreur de demande de paiement</translation>
+        <source>%1 h</source>
+        <translation>%1 h</translation>
     </message>
     <message>
-        <source>Cannot start bitcoin: click-to-pay handler</source>
-        <translation>Impossible de démarrer le gestionnaire de cliquer-pour-payer bitcoin :</translation>
+        <source>%1 m</source>
+        <translation>%1 min</translation>
     </message>
     <message>
-        <source>Payment request fetch URL is invalid: %1</source>
-        <translation>L'URL de récupération de la demande de paiement est invalide : %1</translation>
+        <source>%1 s</source>
+        <translation>%1 s</translation>
     </message>
     <message>
-        <source>URI cannot be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source>
-        <translation>L'URI ne peut pas être analysé ! Ceci peut être causé par une adresse Bitcoin invalide ou par des paramètres d'URI mal formés.</translation>
+        <source>None</source>
+        <translation>Aucun</translation>
     </message>
     <message>
-        <source>Payment request file handling</source>
-        <translation>Gestion des fichiers de demande de paiement</translation>
-    </message>
-    <message>
-        <source>Payment request file cannot be read! This can be caused by an invalid payment request file.</source>
-        <translation>Le fichier de demande de paiement ne peut pas être lu ! Ceci peut être causé par un fichier de demande de paiement invalide.</translation>
-    </message>
-    <message>
-        <source>Payment request expired.</source>
-        <translation>Demande de paiement expirée.</translation>
-    </message>
-    <message>
-        <source>Unverified payment requests to custom payment scripts are unsupported.</source>
-        <translation>Les demandes de paiements non vérifiées à des scripts de paiement personnalisés ne sont pas prises en charge.</translation>
-    </message>
-    <message>
-        <source>Invalid payment request.</source>
-        <translation>Demande de paiement invalide.</translation>
-    </message>
-    <message>
-        <source>Refund from %1</source>
-        <translation>Remboursement de %1</translation>
-    </message>
-    <message>
-        <source>Payment request %1 is too large (%2 bytes, allowed %3 bytes).</source>
-        <translation>La demande de paiement %1 est trop grande (%2 octets, %3 octets permis).</translation>
-    </message>
-    <message>
-        <source>Error communicating with %1: %2</source>
-        <translation>Erreur de communication avec %1 : %2</translation>
-    </message>
-    <message>
-        <source>Payment request cannot be parsed!</source>
-        <translation>La demande de paiement ne peut pas être analysée !</translation>
-    </message>
-    <message>
-        <source>Bad response from server %1</source>
-        <translation>Mauvaise réponse du serveur %1</translation>
-    </message>
-    <message>
-        <source>Payment acknowledged</source>
-        <translation>Le paiement a été confirmé</translation>
-    </message>
-    <message>
-        <source>Network request error</source>
-        <translation>Erreur de demande réseau</translation>
-    </message>
-</context>
-<context>
-    <name>PeerTableModel</name>
-    <message>
-        <source>User Agent</source>
-        <translation>Agent utilisateur</translation>
-    </message>
-    <message>
-        <source>Node/Service</source>
-        <translation>Nœud/service</translation>
-    </message>
-    <message>
-        <source>Ping Time</source>
-        <translation>Temps de ping</translation>
-    </message>
-</context>
-<context>
-    <name>QObject</name>
-    <message>
-        <source>Amount</source>
-        <translation>Montant</translation>
-    </message>
-    <message>
-        <source>Enter a Bitcoin address (e.g. %1)</source>
-        <translation>Saisir une adresse Bitcoin (p. ex. %1)</translation>
-    </message>
-    <message>
-        <source>%1 d</source>
-        <translation>%1 j</translation>
-    </message>
-    <message>
-        <source>%1 h</source>
-        <translation>%1 h</translation>
-    </message>
-    <message>
-        <source>%1 m</source>
-        <translation>%1 min</translation>
-    </message>
-    <message>
-        <source>%1 s</source>
-        <translation>%1 s</translation>
-    </message>
-    <message>
-        <source>None</source>
-        <translation>Aucun</translation>
-    </message>
-    <message>
-        <source>N/A</source>
-        <translation>N.D.</translation>
+        <source>N/A</source>
+        <translation>N.D.</translation>
     </message>
     <message>
         <source>%1 ms</source>
         <translation>%1 ms</translation>
     </message>
 </context>
-<context>
-    <name>QRImageWidget</name>
-    <message>
-        <source>&amp;Save Image...</source>
-        <translation>&amp;Sauvegarder l'image...</translation>
-    </message>
-    <message>
-        <source>&amp;Copy Image</source>
-        <translation>&amp;Copier l'image</translation>
-    </message>
-    <message>
-        <source>Save QR Code</source>
-        <translation>Sauvegarder le code QR</translation>
-    </message>
-    <message>
-        <source>PNG Image (*.png)</source>
-        <translation>Image PNG (*.png)</translation>
-    </message>
-</context>
 <context>
     <name>RPCConsole</name>
     <message>
@@ -1477,6 +1021,10 @@
         <source>Using BerkeleyDB version</source>
         <translation>Version BerkeleyDB utilisée</translation>
     </message>
+    <message>
+        <source>Datadir</source>
+        <translation>Datadir</translation>
+    </message>
     <message>
         <source>Startup time</source>
         <translation>Heure de démarrage</translation>
@@ -1513,10 +1061,6 @@
         <source>Memory usage</source>
         <translation>Utilisation de la mémoire</translation>
     </message>
-    <message>
-        <source>Open the Bitcoin Core debug log file from the current data directory. This can take a few seconds for large log files.</source>
-        <translation>Ouvrir le journal de débogage du répertoire de données actuel. Ceci pourrait prendre quelques secondes pour les gros fichiers de journalisation.</translation>
-    </message>
     <message>
         <source>Received</source>
         <translation>Reçu</translation>
@@ -1565,6 +1109,18 @@
         <source>User Agent</source>
         <translation>Agent utilisateur</translation>
     </message>
+    <message>
+        <source>Open the %1 debug log file from the current data directory. This can take a few seconds for large log files.</source>
+        <translation>Ouvrir le journal de débogage de %1 depuis le répertoire de données actuel. Ceci peut prendre quelques secondes pour les journaux de grande taille.</translation>
+    </message>
+    <message>
+        <source>Decrease font size</source>
+        <translation>Diminuer la taille de police</translation>
+    </message>
+    <message>
+        <source>Increase font size</source>
+        <translation>Augmenter la taille de police</translation>
+    </message>
     <message>
         <source>Services</source>
         <translation>Services</translation>
@@ -1633,10 +1189,6 @@
         <source>Out:</source>
         <translation>Sortant :</translation>
     </message>
-    <message>
-        <source>Build date</source>
-        <translation>Date de compilation</translation>
-    </message>
     <message>
         <source>Debug log file</source>
         <translation>Journal de débogage</translation>
@@ -1674,8 +1226,8 @@
         <translation>&amp;Réhabiliter le nœud</translation>
     </message>
     <message>
-        <source>Welcome to the Bitcoin Core RPC console.</source>
-        <translation>Bienvenue dans le console RPC de Bitcoin Core.</translation>
+        <source>Welcome to the %1 RPC console.</source>
+        <translation>Bienvenue sur la console RPC de %1.</translation>
     </message>
     <message>
         <source>Use up and down arrows to navigate history, and &lt;b&gt;Ctrl-L&lt;/b&gt; to clear screen.</source>
@@ -1804,18 +1356,6 @@
         <source>Remove</source>
         <translation>Enlever</translation>
     </message>
-    <message>
-        <source>Copy label</source>
-        <translation>Copier l’étiquette</translation>
-    </message>
-    <message>
-        <source>Copy message</source>
-        <translation>Copier le message</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>Copier le montant</translation>
-    </message>
 </context>
 <context>
     <name>ReceiveRequestDialog</name>
@@ -1835,73 +1375,6 @@
         <source>&amp;Save Image...</source>
         <translation>&amp;Sauvegarder l'image...</translation>
     </message>
-    <message>
-        <source>Request payment to %1</source>
-        <translation>Demande de paiement à %1</translation>
-    </message>
-    <message>
-        <source>Payment information</source>
-        <translation>Informations de paiement</translation>
-    </message>
-    <message>
-        <source>URI</source>
-        <translation>URI</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>Adresse</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>Montant</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Étiquette</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>Message</translation>
-    </message>
-    <message>
-        <source>Resulting URI too long, try to reduce the text for label / message.</source>
-        <translation>L'URI résultant est trop long, essayez de réduire le texte d'étiquette / de message.</translation>
-    </message>
-    <message>
-        <source>Error encoding URI into QR Code.</source>
-        <translation>Erreur d'encodage de l'URI en code QR.</translation>
-    </message>
-</context>
-<context>
-    <name>RecentRequestsTableModel</name>
-    <message>
-        <source>Date</source>
-        <translation>Date</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Étiquette</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>Message</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>Montant</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(pas d'étiquette)</translation>
-    </message>
-    <message>
-        <source>(no message)</source>
-        <translation>(pas de message)</translation>
-    </message>
-    <message>
-        <source>(no amount)</source>
-        <translation>(aucun montant)</translation>
-    </message>
 </context>
 <context>
     <name>SendCoinsDialog</name>
@@ -2021,14 +1494,6 @@
         <source>fast</source>
         <translation>rapide</translation>
     </message>
-    <message>
-        <source>Send as zero-fee transaction if possible</source>
-        <translation>Envoyer si possible une transaction sans frais</translation>
-    </message>
-    <message>
-        <source>(confirmation may take longer)</source>
-        <translation>(la confirmation pourrait prendre plus longtemps)</translation>
-    </message>
     <message>
         <source>Send to multiple recipients at once</source>
         <translation>Envoyer à plusieurs destinataires à la fois</translation>
@@ -2050,855 +1515,221 @@
         <translation>&amp;Tout nettoyer</translation>
     </message>
     <message>
-        <source>Balance:</source>
-        <translation>Solde :</translation>
-    </message>
-    <message>
-        <source>Confirm the send action</source>
-        <translation>Confirmer l’action d'envoi</translation>
-    </message>
-    <message>
-        <source>S&amp;end</source>
-        <translation>E&amp;nvoyer</translation>
-    </message>
-    <message>
-        <source>Confirm send coins</source>
-        <translation>Confirmer l’envoi des pièces</translation>
-    </message>
-    <message>
-        <source>%1 to %2</source>
-        <translation>%1 à %2</translation>
-    </message>
-    <message>
-        <source>Copy quantity</source>
-        <translation>Copier la quantité</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>Copier le montant</translation>
-    </message>
-    <message>
-        <source>Copy fee</source>
-        <translation>Copier les frais</translation>
-    </message>
-    <message>
-        <source>Copy after fee</source>
-        <translation>Copier le montant après les frais</translation>
-    </message>
-    <message>
-        <source>Copy bytes</source>
-        <translation>Copier les octets</translation>
-    </message>
-    <message>
-        <source>Copy priority</source>
-        <translation>Copier la priorité</translation>
-    </message>
-    <message>
-        <source>Copy change</source>
-        <translation>Copier la monnaie</translation>
-    </message>
-    <message>
-        <source>Total Amount %1</source>
-        <translation>Montant total %1</translation>
-    </message>
-    <message>
-        <source>or</source>
-        <translation>ou</translation>
-    </message>
-    <message>
-        <source>The amount to pay must be larger than 0.</source>
-        <translation>Le montant à payer doit être supérieur à 0.</translation>
-    </message>
-    <message>
-        <source>The amount exceeds your balance.</source>
-        <translation>Le montant dépasse votre solde.</translation>
-    </message>
-    <message>
-        <source>The total exceeds your balance when the %1 transaction fee is included.</source>
-        <translation>Le montant dépasse votre solde lorsque les frais de transaction de %1 sont inclus.</translation>
-    </message>
-    <message>
-        <source>Transaction creation failed!</source>
-        <translation>La création de la transaction a échoué !</translation>
-    </message>
-    <message>
-        <source>The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source>
-        <translation>La transaction a été rejetée ! Ceci peut arriver si certaines pièces de votre portefeuille étaient déjà dépensées, par exemple si vous avez utilisé une copie de wallet.dat et que des pièces ont été dépensées dans la copie sans être marquées comme telles ici.</translation>
-    </message>
-    <message>
-        <source>A fee higher than %1 is considered an absurdly high fee.</source>
-        <translation>Des frais supérieurs à %1 sont considérés comme ridiculement élevés.</translation>
-    </message>
-    <message>
-        <source>Payment request expired.</source>
-        <translation>Demande de paiement expirée.</translation>
-    </message>
-    <message>
-        <source>Pay only the required fee of %1</source>
-        <translation>Payer seulement les frais exigés de %1</translation>
-    </message>
-    <message numerus="yes">
-        <source>Estimated to begin confirmation within %n block(s).</source>
-        <translation><numerusform>Il est estimé que la confirmation commencera dans %n bloc.</numerusform><numerusform>Il est estimé que la confirmation commencera dans %n blocs.</numerusform></translation>
-    </message>
-    <message>
-        <source>The recipient address is not valid. Please recheck.</source>
-        <translation>L'adresse du destinataire est invalide. Veuillez la vérifier.</translation>
-    </message>
-    <message>
-        <source>Duplicate address found: addresses should only be used once each.</source>
-        <translation>Adresse identique trouvée : chaque adresse ne devrait être utilisée qu'une fois.</translation>
-    </message>
-    <message>
-        <source>Warning: Invalid Bitcoin address</source>
-        <translation>Avertissement : adresse Bitcoin invalide</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(pas d'étiquette)</translation>
-    </message>
-    <message>
-        <source>Warning: Unknown change address</source>
-        <translation>Avertissement : adresse de monnaie rendue inconnue</translation>
-    </message>
-    <message>
-        <source>Copy dust</source>
-        <translation>Copier la poussière</translation>
-    </message>
-    <message>
-        <source>Are you sure you want to send?</source>
-        <translation>Êtes-vous sûr de vouloir envoyer ?</translation>
-    </message>
-    <message>
-        <source>added as transaction fee</source>
-        <translation>ajouté en tant que frais de transaction</translation>
-    </message>
-</context>
-<context>
-    <name>SendCoinsEntry</name>
-    <message>
-        <source>A&amp;mount:</source>
-        <translation>&amp;Montant :</translation>
-    </message>
-    <message>
-        <source>Pay &amp;To:</source>
-        <translation>&amp;Payer à :</translation>
-    </message>
-    <message>
-        <source>Enter a label for this address to add it to your address book</source>
-        <translation>Saisir une étiquette pour cette adresse afin de l’ajouter à votre carnet d’adresses</translation>
-    </message>
-    <message>
-        <source>&amp;Label:</source>
-        <translation>É&amp;tiquette :</translation>
-    </message>
-    <message>
-        <source>Choose previously used address</source>
-        <translation>Choisir une adresse déjà utilisée</translation>
-    </message>
-    <message>
-        <source>This is a normal payment.</source>
-        <translation>Ceci est un paiement normal.</translation>
-    </message>
-    <message>
-        <source>The Bitcoin address to send the payment to</source>
-        <translation>L'adresse Bitcoin à laquelle envoyer le paiement</translation>
-    </message>
-    <message>
-        <source>Alt+A</source>
-        <translation>Alt+A</translation>
-    </message>
-    <message>
-        <source>Paste address from clipboard</source>
-        <translation>Coller l'adresse depuis le presse-papiers</translation>
-    </message>
-    <message>
-        <source>Alt+P</source>
-        <translation>Alt+P</translation>
-    </message>
-    <message>
-        <source>Remove this entry</source>
-        <translation>Enlever cette entrée</translation>
-    </message>
-    <message>
-        <source>The fee will be deducted from the amount being sent. The recipient will receive less bitcoins than you enter in the amount field. If multiple recipients are selected, the fee is split equally.</source>
-        <translation>Les frais seront déduits du montant envoyé. Le destinataire recevra moins de bitcoins que le montant saisi dans le champ de montant. Si plusieurs destinataires sont sélectionnés, les frais seront partagés également..</translation>
-    </message>
-    <message>
-        <source>S&amp;ubtract fee from amount</source>
-        <translation>S&amp;oustraire les frais du montant</translation>
-    </message>
-    <message>
-        <source>Message:</source>
-        <translation>Message :</translation>
-    </message>
-    <message>
-        <source>This is an unauthenticated payment request.</source>
-        <translation>Cette demande de paiement n'est pas authentifiée.</translation>
-    </message>
-    <message>
-        <source>This is an authenticated payment request.</source>
-        <translation>Cette demande de paiement est authentifiée.</translation>
-    </message>
-    <message>
-        <source>Enter a label for this address to add it to the list of used addresses</source>
-        <translation>Saisir une étiquette pour cette adresse afin de l'ajouter à la liste d'adresses utilisées</translation>
-    </message>
-    <message>
-        <source>A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
-        <translation>Un message qui était joint à l'URI Bitcoin et qui sera stocké avec la transaction pour référence. Note : ce message ne sera pas envoyé par le réseau Bitcoin.</translation>
-    </message>
-    <message>
-        <source>Pay To:</source>
-        <translation>Payer à :</translation>
-    </message>
-    <message>
-        <source>Memo:</source>
-        <translation>Mémo :</translation>
-    </message>
-</context>
-<context>
-    <name>ShutdownWindow</name>
-    <message>
-        <source>Bitcoin Core is shutting down...</source>
-        <translation>Arrêt de Bitcoin Core...</translation>
-    </message>
-    <message>
-        <source>Do not shut down the computer until this window disappears.</source>
-        <translation>Ne pas fermer l'ordinateur jusqu'à la disparition de cette fenêtre.</translation>
-    </message>
-</context>
-<context>
-    <name>SignVerifyMessageDialog</name>
-    <message>
-        <source>Signatures - Sign / Verify a Message</source>
-        <translation>Signatures - Signer / Vérifier un message</translation>
-    </message>
-    <message>
-        <source>&amp;Sign Message</source>
-        <translation>&amp;Signer un message</translation>
-    </message>
-    <message>
-        <source>You can sign messages/agreements with your addresses to prove you can receive bitcoins sent to them. Be careful not to sign anything vague or random, as phishing attacks may try to trick you into signing your identity over to them. Only sign fully-detailed statements you agree to.</source>
-        <translation>Vous pouvez signer des messages/accords avec vos adresses pour prouver que vous pouvez recevoir des bitcoins à ces dernières. Faites attention de ne rien signer de vague ou au hasard, car des attaques d'hameçonnage pourraient essayer de vous faire signer avec votre identité afin de l'usurper. Ne signez que des déclarations entièrement détaillées et avec lesquelles vous êtes d'accord.</translation>
-    </message>
-    <message>
-        <source>The Bitcoin address to sign the message with</source>
-        <translation>L'adresse Bitcoin avec laquelle signer le message</translation>
-    </message>
-    <message>
-        <source>Choose previously used address</source>
-        <translation>Choisir une adresse précédemment utilisée</translation>
-    </message>
-    <message>
-        <source>Alt+A</source>
-        <translation>Alt+A</translation>
-    </message>
-    <message>
-        <source>Paste address from clipboard</source>
-        <translation>Coller une adresse depuis le presse-papiers</translation>
-    </message>
-    <message>
-        <source>Alt+P</source>
-        <translation>Alt+P</translation>
-    </message>
-    <message>
-        <source>Enter the message you want to sign here</source>
-        <translation>Saisir ici le message que vous désirez signer</translation>
-    </message>
-    <message>
-        <source>Signature</source>
-        <translation>Signature</translation>
-    </message>
-    <message>
-        <source>Copy the current signature to the system clipboard</source>
-        <translation>Copier la signature actuelle dans le presse-papiers</translation>
-    </message>
-    <message>
-        <source>Sign the message to prove you own this Bitcoin address</source>
-        <translation>Signer le message pour prouver que vous détenez cette adresse Bitcoin</translation>
-    </message>
-    <message>
-        <source>Sign &amp;Message</source>
-        <translation>Signer le &amp;message</translation>
-    </message>
-    <message>
-        <source>Reset all sign message fields</source>
-        <translation>Réinitialiser tous les champs de signature de message</translation>
-    </message>
-    <message>
-        <source>Clear &amp;All</source>
-        <translation>&amp;Tout nettoyer</translation>
-    </message>
-    <message>
-        <source>&amp;Verify Message</source>
-        <translation>&amp;Vérifier un message</translation>
-    </message>
-    <message>
-        <source>Enter the receiver's address, message (ensure you copy line breaks, spaces, tabs, etc. exactly) and signature below to verify the message. Be careful not to read more into the signature than what is in the signed message itself, to avoid being tricked by a man-in-the-middle attack. Note that this only proves the signing party receives with the address, it cannot prove sendership of any transaction!</source>
-        <translation>Saisissez ci-dessous l'adresse de destinataire, le message (assurez-vous de copier exactement les retours à la ligne, les espaces, les tabulations, etc.) et la signature pour vérifier le message. Faites attention à ne pas déduire davantage de la signature que ce qui est contenu dans le message signé même, pour éviter d'être trompé par une attaque d'homme du milieu. Notez que ceci ne fait que prouver que le signataire reçoit l'adresse et ne peut pas prouver la provenance d'une transaction.</translation>
-    </message>
-    <message>
-        <source>The Bitcoin address the message was signed with</source>
-        <translation>L'adresse Bitcoin avec laquelle le message a été signé</translation>
-    </message>
-    <message>
-        <source>Verify the message to ensure it was signed with the specified Bitcoin address</source>
-        <translation>Vérifier le message pour vous assurer qu'il a bien été signé par l'adresse Bitcoin spécifiée</translation>
-    </message>
-    <message>
-        <source>Verify &amp;Message</source>
-        <translation>Vérifier le &amp;message</translation>
-    </message>
-    <message>
-        <source>Reset all verify message fields</source>
-        <translation>Réinitialiser tous les champs de vérification de message</translation>
-    </message>
-    <message>
-        <source>Click "Sign Message" to generate signature</source>
-        <translation>Cliquez sur « Signer le message » pour générer la signature</translation>
-    </message>
-    <message>
-        <source>The entered address is invalid.</source>
-        <translation>L'adresse saisie est invalide.</translation>
-    </message>
-    <message>
-        <source>Please check the address and try again.</source>
-        <translation>Veuillez vérifier l'adresse et réessayer.</translation>
-    </message>
-    <message>
-        <source>The entered address does not refer to a key.</source>
-        <translation>L'adresse saisie ne fait pas référence à une clef.</translation>
-    </message>
-    <message>
-        <source>Wallet unlock was cancelled.</source>
-        <translation>Le déverrouillage du portefeuille a été annulé.</translation>
-    </message>
-    <message>
-        <source>Private key for the entered address is not available.</source>
-        <translation>La clef privée n'est pas disponible pour l'adresse indiquée.</translation>
-    </message>
-    <message>
-        <source>Message signing failed.</source>
-        <translation>La signature du message a échoué.</translation>
-    </message>
-    <message>
-        <source>Message signed.</source>
-        <translation>Le message a été signé.</translation>
-    </message>
-    <message>
-        <source>The signature could not be decoded.</source>
-        <translation>La signature n'a pu être décodée.</translation>
-    </message>
-    <message>
-        <source>Please check the signature and try again.</source>
-        <translation>Veuillez vérifier la signature et réessayer.</translation>
-    </message>
-    <message>
-        <source>The signature did not match the message digest.</source>
-        <translation>La signature ne correspond pas à l'empreinte du message.</translation>
-    </message>
-    <message>
-        <source>Message verification failed.</source>
-        <translation>Échec de la vérification du message.</translation>
-    </message>
-    <message>
-        <source>Message verified.</source>
-        <translation>Message vérifié.</translation>
-    </message>
-</context>
-<context>
-    <name>SplashScreen</name>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Bitcoin Core</translation>
-    </message>
-    <message>
-        <source>The Bitcoin Core developers</source>
-        <translation>Les développeurs Bitcoin Core</translation>
-    </message>
-    <message>
-        <source>[testnet]</source>
-        <translation>[testnet]</translation>
-    </message>
-</context>
-<context>
-    <name>TrafficGraphWidget</name>
-    <message>
-        <source>KB/s</source>
-        <translation>Ko/s</translation>
-    </message>
-</context>
-<context>
-    <name>TransactionDesc</name>
-    <message>
-        <source>Open until %1</source>
-        <translation>Ouvert jusqu'à %1</translation>
-    </message>
-    <message>
-        <source>conflicted</source>
-        <translation>en conflit</translation>
-    </message>
-    <message>
-        <source>%1/offline</source>
-        <translation>%1/hors ligne</translation>
-    </message>
-    <message>
-        <source>%1/unconfirmed</source>
-        <translation>%1/non confirmée</translation>
-    </message>
-    <message>
-        <source>%1 confirmations</source>
-        <translation>%1 confirmations</translation>
-    </message>
-    <message>
-        <source>Status</source>
-        <translation>État</translation>
-    </message>
-    <message numerus="yes">
-        <source>, broadcast through %n node(s)</source>
-        <translation><numerusform>, diffusée à travers %n nœud</numerusform><numerusform>, diffusée à travers %n nœuds</numerusform></translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation>Date</translation>
-    </message>
-    <message>
-        <source>Source</source>
-        <translation>Source</translation>
-    </message>
-    <message>
-        <source>Generated</source>
-        <translation>Généré</translation>
-    </message>
-    <message>
-        <source>From</source>
-        <translation>De</translation>
-    </message>
-    <message>
-        <source>To</source>
-        <translation>À</translation>
-    </message>
-    <message>
-        <source>own address</source>
-        <translation>votre propre adresse</translation>
-    </message>
-    <message>
-        <source>watch-only</source>
-        <translation>juste-regarder</translation>
-    </message>
-    <message>
-        <source>label</source>
-        <translation>étiquette</translation>
-    </message>
-    <message>
-        <source>Credit</source>
-        <translation>Crédit</translation>
-    </message>
-    <message numerus="yes">
-        <source>matures in %n more block(s)</source>
-        <translation><numerusform>arrive à maturité dans %n bloc de plus</numerusform><numerusform>arrive à maturité dans %n blocs de plus</numerusform></translation>
-    </message>
-    <message>
-        <source>not accepted</source>
-        <translation>refusé</translation>
-    </message>
-    <message>
-        <source>Debit</source>
-        <translation>Débit</translation>
-    </message>
-    <message>
-        <source>Total debit</source>
-        <translation>Débit total</translation>
-    </message>
-    <message>
-        <source>Total credit</source>
-        <translation>Crédit total</translation>
-    </message>
-    <message>
-        <source>Transaction fee</source>
-        <translation>Frais de transaction</translation>
-    </message>
-    <message>
-        <source>Net amount</source>
-        <translation>Montant net</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>Message</translation>
-    </message>
-    <message>
-        <source>Comment</source>
-        <translation>Commentaire</translation>
-    </message>
-    <message>
-        <source>Transaction ID</source>
-        <translation>ID de la transaction</translation>
-    </message>
-    <message>
-        <source>Merchant</source>
-        <translation>Marchand</translation>
-    </message>
-    <message>
-        <source>Generated coins must mature %1 blocks before they can be spent. When you generated this block, it was broadcast to the network to be added to the block chain. If it fails to get into the chain, its state will change to "not accepted" and it won't be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source>
-        <translation>Les pièces générées doivent mûrir pendant %1 blocs avant de pouvoir être dépensées. Lorsque vous avez généré ce bloc, il a été diffusé sur le réseau pour être ajouté à la chaîne de blocs. S’il échoue a intégrer la chaîne, son état sera modifié en « non accepté » et il ne sera pas possible de le dépenser. Ceci peut arriver occasionnellement si un autre nœud génère un bloc à quelques secondes du votre.</translation>
-    </message>
-    <message>
-        <source>Debug information</source>
-        <translation>Informations de débogage</translation>
-    </message>
-    <message>
-        <source>Transaction</source>
-        <translation>Transaction</translation>
-    </message>
-    <message>
-        <source>Inputs</source>
-        <translation>Entrants</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>Montant</translation>
-    </message>
-    <message>
-        <source>true</source>
-        <translation>vrai</translation>
-    </message>
-    <message>
-        <source>false</source>
-        <translation>faux</translation>
-    </message>
-    <message>
-        <source>, has not been successfully broadcast yet</source>
-        <translation>, n’a pas encore été diffusée avec succès</translation>
-    </message>
-    <message numerus="yes">
-        <source>Open for %n more block(s)</source>
-        <translation><numerusform>Ouvert pour %n bloc de plus</numerusform><numerusform>Ouvert pour %n blocs de plus</numerusform></translation>
-    </message>
-    <message>
-        <source>unknown</source>
-        <translation>inconnu</translation>
-    </message>
-</context>
-<context>
-    <name>TransactionDescDialog</name>
-    <message>
-        <source>Transaction details</source>
-        <translation>Détails de la transaction</translation>
-    </message>
-    <message>
-        <source>This pane shows a detailed description of the transaction</source>
-        <translation>Ce panneau affiche une description détaillée de la transaction</translation>
-    </message>
-</context>
-<context>
-    <name>TransactionTableModel</name>
-    <message>
-        <source>Date</source>
-        <translation>Date</translation>
-    </message>
-    <message>
-        <source>Type</source>
-        <translation>Type</translation>
-    </message>
-    <message>
-        <source>Immature (%1 confirmations, will be available after %2)</source>
-        <translation>Immature (%1 confirmations, sera disponible après %2)</translation>
-    </message>
-    <message numerus="yes">
-        <source>Open for %n more block(s)</source>
-        <translation><numerusform>Ouvert pour %n bloc de plus</numerusform><numerusform>Ouvert pour %n blocs de plus</numerusform></translation>
-    </message>
-    <message>
-        <source>Open until %1</source>
-        <translation>Ouvert jusqu'à %1</translation>
-    </message>
-    <message>
-        <source>Confirmed (%1 confirmations)</source>
-        <translation>Confirmée (%1 confirmations)</translation>
-    </message>
-    <message>
-        <source>This block was not received by any other nodes and will probably not be accepted!</source>
-        <translation>Ce bloc n’a été reçu par aucun autre nœud et ne sera probablement pas accepté !</translation>
-    </message>
-    <message>
-        <source>Generated but not accepted</source>
-        <translation>Généré mais pas accepté</translation>
-    </message>
-    <message>
-        <source>Offline</source>
-        <translation>Hors ligne</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Étiquette</translation>
-    </message>
-    <message>
-        <source>Unconfirmed</source>
-        <translation>Non confirmé</translation>
-    </message>
-    <message>
-        <source>Confirming (%1 of %2 recommended confirmations)</source>
-        <translation>Confirmation (%1 sur %2 confirmations recommandées)</translation>
-    </message>
-    <message>
-        <source>Conflicted</source>
-        <translation>En conflit</translation>
-    </message>
-    <message>
-        <source>Received with</source>
-        <translation>Reçue avec</translation>
-    </message>
-    <message>
-        <source>Received from</source>
-        <translation>Reçue de</translation>
-    </message>
-    <message>
-        <source>Sent to</source>
-        <translation>Envoyée à</translation>
-    </message>
-    <message>
-        <source>Payment to yourself</source>
-        <translation>Paiement à vous-même</translation>
-    </message>
-    <message>
-        <source>Mined</source>
-        <translation>Miné</translation>
+        <source>Balance:</source>
+        <translation>Solde :</translation>
     </message>
     <message>
-        <source>watch-only</source>
-        <translation>juste-regarder</translation>
+        <source>Confirm the send action</source>
+        <translation>Confirmer l’action d'envoi</translation>
     </message>
     <message>
-        <source>(n/a)</source>
-        <translation>(n.d)</translation>
+        <source>S&amp;end</source>
+        <translation>E&amp;nvoyer</translation>
     </message>
+</context>
+<context>
+    <name>SendCoinsEntry</name>
     <message>
-        <source>Transaction status. Hover over this field to show number of confirmations.</source>
-        <translation>État de la transaction. Laissez le pointeur de la souris sur ce champ pour voir le nombre de confirmations.</translation>
+        <source>A&amp;mount:</source>
+        <translation>&amp;Montant :</translation>
     </message>
     <message>
-        <source>Date and time that the transaction was received.</source>
-        <translation>Date et heure de réception de la transaction.</translation>
+        <source>Pay &amp;To:</source>
+        <translation>&amp;Payer à :</translation>
     </message>
     <message>
-        <source>Type of transaction.</source>
-        <translation>Type de transaction.</translation>
+        <source>&amp;Label:</source>
+        <translation>É&amp;tiquette :</translation>
     </message>
     <message>
-        <source>Whether or not a watch-only address is involved in this transaction.</source>
-        <translation>Une adresse juste-regarder est-elle impliquée dans cette transaction.</translation>
+        <source>Choose previously used address</source>
+        <translation>Choisir une adresse déjà utilisée</translation>
     </message>
     <message>
-        <source>User-defined intent/purpose of the transaction.</source>
-        <translation>Intention/but de la transaction défini par l'utilisateur.</translation>
+        <source>This is a normal payment.</source>
+        <translation>Ceci est un paiement normal.</translation>
     </message>
     <message>
-        <source>Amount removed from or added to balance.</source>
-        <translation>Montant ajouté ou enlevé au solde.</translation>
+        <source>The Bitcoin address to send the payment to</source>
+        <translation>L'adresse Bitcoin à laquelle envoyer le paiement</translation>
     </message>
-</context>
-<context>
-    <name>TransactionView</name>
     <message>
-        <source>All</source>
-        <translation>Toutes</translation>
+        <source>Alt+A</source>
+        <translation>Alt+A</translation>
     </message>
     <message>
-        <source>Today</source>
-        <translation>Aujourd’hui</translation>
+        <source>Paste address from clipboard</source>
+        <translation>Coller l'adresse depuis le presse-papiers</translation>
     </message>
     <message>
-        <source>This week</source>
-        <translation>Cette semaine</translation>
+        <source>Alt+P</source>
+        <translation>Alt+P</translation>
     </message>
     <message>
-        <source>This month</source>
-        <translation>Ce mois-ci</translation>
+        <source>Remove this entry</source>
+        <translation>Enlever cette entrée</translation>
     </message>
     <message>
-        <source>Last month</source>
-        <translation>Le mois dernier</translation>
+        <source>The fee will be deducted from the amount being sent. The recipient will receive less bitcoins than you enter in the amount field. If multiple recipients are selected, the fee is split equally.</source>
+        <translation>Les frais seront déduits du montant envoyé. Le destinataire recevra moins de bitcoins que le montant saisi dans le champ de montant. Si plusieurs destinataires sont sélectionnés, les frais seront partagés également..</translation>
     </message>
     <message>
-        <source>This year</source>
-        <translation>Cette année</translation>
+        <source>S&amp;ubtract fee from amount</source>
+        <translation>S&amp;oustraire les frais du montant</translation>
     </message>
     <message>
-        <source>Range...</source>
-        <translation>Intervalle…</translation>
+        <source>Message:</source>
+        <translation>Message :</translation>
     </message>
     <message>
-        <source>Received with</source>
-        <translation>Reçue avec</translation>
+        <source>This is an unauthenticated payment request.</source>
+        <translation>Cette demande de paiement n'est pas authentifiée.</translation>
     </message>
     <message>
-        <source>Sent to</source>
-        <translation>Envoyée à</translation>
+        <source>This is an authenticated payment request.</source>
+        <translation>Cette demande de paiement est authentifiée.</translation>
     </message>
     <message>
-        <source>To yourself</source>
-        <translation>À vous-même</translation>
+        <source>Enter a label for this address to add it to the list of used addresses</source>
+        <translation>Saisir une étiquette pour cette adresse afin de l'ajouter à la liste d'adresses utilisées</translation>
     </message>
     <message>
-        <source>Mined</source>
-        <translation>Miné</translation>
+        <source>A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
+        <translation>Un message qui était joint à l'URI Bitcoin et qui sera stocké avec la transaction pour référence. Note : ce message ne sera pas envoyé par le réseau Bitcoin.</translation>
     </message>
     <message>
-        <source>Other</source>
-        <translation>Autres</translation>
+        <source>Pay To:</source>
+        <translation>Payer à :</translation>
     </message>
     <message>
-        <source>Enter address or label to search</source>
-        <translation>Saisir une adresse ou une étiquette à rechercher</translation>
+        <source>Memo:</source>
+        <translation>Mémo :</translation>
     </message>
+</context>
+<context>
+    <name>ShutdownWindow</name>
     <message>
-        <source>Min amount</source>
-        <translation>Montant min.</translation>
+        <source>%1 is shutting down...</source>
+        <translation>Arrêt de %1...</translation>
     </message>
     <message>
-        <source>Copy address</source>
-        <translation>Copier l’adresse</translation>
+        <source>Do not shut down the computer until this window disappears.</source>
+        <translation>Ne pas fermer l'ordinateur jusqu'à la disparition de cette fenêtre.</translation>
     </message>
+</context>
+<context>
+    <name>SignVerifyMessageDialog</name>
     <message>
-        <source>Copy label</source>
-        <translation>Copier l’étiquette</translation>
+        <source>Signatures - Sign / Verify a Message</source>
+        <translation>Signatures - Signer / Vérifier un message</translation>
     </message>
     <message>
-        <source>Copy amount</source>
-        <translation>Copier le montant</translation>
+        <source>&amp;Sign Message</source>
+        <translation>&amp;Signer un message</translation>
     </message>
     <message>
-        <source>Copy transaction ID</source>
-        <translation>Copier l'ID de la transaction</translation>
+        <source>You can sign messages/agreements with your addresses to prove you can receive bitcoins sent to them. Be careful not to sign anything vague or random, as phishing attacks may try to trick you into signing your identity over to them. Only sign fully-detailed statements you agree to.</source>
+        <translation>Vous pouvez signer des messages/accords avec vos adresses pour prouver que vous pouvez recevoir des bitcoins à ces dernières. Faites attention de ne rien signer de vague ou au hasard, car des attaques d'hameçonnage pourraient essayer de vous faire signer avec votre identité afin de l'usurper. Ne signez que des déclarations entièrement détaillées et avec lesquelles vous êtes d'accord.</translation>
     </message>
     <message>
-        <source>Copy raw transaction</source>
-        <translation>Copier la transaction brute</translation>
+        <source>The Bitcoin address to sign the message with</source>
+        <translation>L'adresse Bitcoin avec laquelle signer le message</translation>
     </message>
     <message>
-        <source>Edit label</source>
-        <translation>Modifier l’étiquette</translation>
+        <source>Choose previously used address</source>
+        <translation>Choisir une adresse précédemment utilisée</translation>
     </message>
     <message>
-        <source>Show transaction details</source>
-        <translation>Afficher les détails de la transaction</translation>
+        <source>Alt+A</source>
+        <translation>Alt+A</translation>
     </message>
     <message>
-        <source>Export Transaction History</source>
-        <translation>Exporter l'historique des transactions</translation>
+        <source>Paste address from clipboard</source>
+        <translation>Coller une adresse depuis le presse-papiers</translation>
     </message>
     <message>
-        <source>Watch-only</source>
-        <translation>Juste-regarder :</translation>
+        <source>Alt+P</source>
+        <translation>Alt+P</translation>
     </message>
     <message>
-        <source>Exporting Failed</source>
-        <translation>L'exportation a échoué</translation>
+        <source>Enter the message you want to sign here</source>
+        <translation>Saisir ici le message que vous désirez signer</translation>
     </message>
     <message>
-        <source>There was an error trying to save the transaction history to %1.</source>
-        <translation>Une erreur est survenue lors de l'enregistrement de l'historique des transactions vers %1.</translation>
+        <source>Signature</source>
+        <translation>Signature</translation>
     </message>
     <message>
-        <source>Exporting Successful</source>
-        <translation>Exportation réussie</translation>
+        <source>Copy the current signature to the system clipboard</source>
+        <translation>Copier la signature actuelle dans le presse-papiers</translation>
     </message>
     <message>
-        <source>The transaction history was successfully saved to %1.</source>
-        <translation>L'historique des transactions a été sauvegardée avec succès vers %1.</translation>
+        <source>Sign the message to prove you own this Bitcoin address</source>
+        <translation>Signer le message pour prouver que vous détenez cette adresse Bitcoin</translation>
     </message>
     <message>
-        <source>Comma separated file (*.csv)</source>
-        <translation>Valeurs séparées par des virgules (*.csv)</translation>
+        <source>Sign &amp;Message</source>
+        <translation>Signer le &amp;message</translation>
     </message>
     <message>
-        <source>Confirmed</source>
-        <translation>Confirmée</translation>
+        <source>Reset all sign message fields</source>
+        <translation>Réinitialiser tous les champs de signature de message</translation>
     </message>
     <message>
-        <source>Date</source>
-        <translation>Date</translation>
+        <source>Clear &amp;All</source>
+        <translation>&amp;Tout nettoyer</translation>
     </message>
     <message>
-        <source>Type</source>
-        <translation>Type</translation>
+        <source>&amp;Verify Message</source>
+        <translation>&amp;Vérifier un message</translation>
     </message>
     <message>
-        <source>Label</source>
-        <translation>Étiquette</translation>
+        <source>Enter the receiver's address, message (ensure you copy line breaks, spaces, tabs, etc. exactly) and signature below to verify the message. Be careful not to read more into the signature than what is in the signed message itself, to avoid being tricked by a man-in-the-middle attack. Note that this only proves the signing party receives with the address, it cannot prove sendership of any transaction!</source>
+        <translation>Saisissez ci-dessous l'adresse de destinataire, le message (assurez-vous de copier exactement les retours à la ligne, les espaces, les tabulations, etc.) et la signature pour vérifier le message. Faites attention à ne pas déduire davantage de la signature que ce qui est contenu dans le message signé même, pour éviter d'être trompé par une attaque d'homme du milieu. Notez que ceci ne fait que prouver que le signataire reçoit l'adresse et ne peut pas prouver la provenance d'une transaction.</translation>
     </message>
     <message>
-        <source>Address</source>
-        <translation>Adresse</translation>
+        <source>The Bitcoin address the message was signed with</source>
+        <translation>L'adresse Bitcoin avec laquelle le message a été signé</translation>
     </message>
     <message>
-        <source>ID</source>
-        <translation>ID</translation>
+        <source>Verify the message to ensure it was signed with the specified Bitcoin address</source>
+        <translation>Vérifier le message pour vous assurer qu'il a bien été signé par l'adresse Bitcoin spécifiée</translation>
     </message>
     <message>
-        <source>Range:</source>
-        <translation>Intervalle :</translation>
+        <source>Verify &amp;Message</source>
+        <translation>Vérifier le &amp;message</translation>
     </message>
     <message>
-        <source>to</source>
-        <translation>à</translation>
+        <source>Reset all verify message fields</source>
+        <translation>Réinitialiser tous les champs de vérification de message</translation>
     </message>
 </context>
 <context>
-    <name>UnitDisplayStatusBarControl</name>
+    <name>SplashScreen</name>
     <message>
-        <source>Unit to show amounts in. Click to select another unit.</source>
-        <translation>Unité d'affichage des montants. Cliquer pour choisir une autre unité.</translation>
+        <source>[testnet]</source>
+        <translation>[testnet]</translation>
     </message>
 </context>
 <context>
-    <name>WalletFrame</name>
+    <name>TrafficGraphWidget</name>
     <message>
-        <source>No wallet has been loaded.</source>
-        <translation>Aucun portefeuille de chargé.</translation>
+        <source>KB/s</source>
+        <translation>Ko/s</translation>
     </message>
 </context>
 <context>
-    <name>WalletModel</name>
+    <name>TransactionDescDialog</name>
     <message>
-        <source>Send Coins</source>
-        <translation>Envoyer des pièces</translation>
+        <source>This pane shows a detailed description of the transaction</source>
+        <translation>Ce panneau affiche une description détaillée de la transaction</translation>
     </message>
 </context>
 <context>
-    <name>WalletView</name>
-    <message>
-        <source>&amp;Export</source>
-        <translation>&amp;Exporter</translation>
-    </message>
-    <message>
-        <source>Export the data in the current tab to a file</source>
-        <translation>Exporter les données de l'onglet courant vers un fichier</translation>
-    </message>
-    <message>
-        <source>Backup Wallet</source>
-        <translation>Sauvegarder le portefeuille</translation>
-    </message>
-    <message>
-        <source>Wallet Data (*.dat)</source>
-        <translation>Données de portefeuille (*.dat)</translation>
-    </message>
-    <message>
-        <source>Backup Failed</source>
-        <translation>Échec de la sauvegarde</translation>
-    </message>
-    <message>
-        <source>There was an error trying to save the wallet data to %1.</source>
-        <translation>Une erreur est survenue lors de l'enregistrement des données de portefeuille vers %1.</translation>
-    </message>
-    <message>
-        <source>The wallet data was successfully saved to %1.</source>
-        <translation>Les données de portefeuille ont été enregistrées avec succès vers %1</translation>
-    </message>
+    <name>UnitDisplayStatusBarControl</name>
     <message>
-        <source>Backup Successful</source>
-        <translation>Sauvegarde réussie</translation>
+        <source>Unit to show amounts in. Click to select another unit.</source>
+        <translation>Unité d'affichage des montants. Cliquer pour choisir une autre unité.</translation>
     </message>
 </context>
 <context>
@@ -2927,21 +1758,13 @@
         <source>If &lt;category&gt; is not supplied or if &lt;category&gt; = 1, output all debugging information.</source>
         <translation>Si &lt;category&gt; n'est pas indiqué ou si &lt;category&gt; = 1, extraire toutes les données de débogage.</translation>
     </message>
-    <message>
-        <source>Maximum total fees (in %s) to use in a single wallet transaction; setting this too low may abort large transactions (default: %s)</source>
-        <translation>Frais totaux maximaux (en %s) à utiliser en une seule transaction de portefeuille. Les définir trop bas pourrait interrompre les grosses transactions (par défaut : %s)</translation>
-    </message>
-    <message>
-        <source>Please check that your computer's date and time are correct! If your clock is wrong Bitcoin Core will not work properly.</source>
-        <translation>Veuillez vérifier que l'heure et la date de votre ordinateur sont justes ! Si votre horloge n'est pas à l'heure, Bitcoin Core ne fonctionnera pas correctement.</translation>
-    </message>
     <message>
         <source>Prune configured below the minimum of %d MiB.  Please use a higher number.</source>
         <translation>L'élagage est configuré au-dessous du minimum de %d Mio. Veuillez utiliser un nombre plus élevé.</translation>
     </message>
     <message>
         <source>Prune: last wallet synchronisation goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of pruned node)</source>
-        <translation>Élagage : la dernière synchronisation de portefeuille va par-delà les données élaguées.  Vous devez -reindex (réindexer, télécharger de nouveau toute la chaîne de blocs en cas de nœud élagué)</translation>
+        <translation>Élagage : la dernière synchronisation de porte-monnaie va par-delà les données élaguées.  Vous devez -reindex (réindexer, télécharger de nouveau toute la chaîne de blocs en cas de nœud élagué)</translation>
     </message>
     <message>
         <source>Reduce storage requirements by pruning (deleting) old blocks. This mode is incompatible with -txindex and -rescan. Warning: Reverting this setting requires re-downloading the entire blockchain. (default: 0 = disable pruning blocks, &gt;%u = target size in MiB to use for block files)</source>
@@ -2975,6 +1798,10 @@
         <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
         <translation>Accepter les connexions entrantes (par défaut : 1 si aucun -proxy ou -connect )</translation>
     </message>
+    <message>
+        <source>Bitcoin Core</source>
+        <translation>Bitcoin Core</translation>
+    </message>
     <message>
         <source>-fallbackfee is set very high! This is the transaction fee you may pay when fee estimates are not available.</source>
         <translation>La valeur -fallbackfee est très élevée ! Elle représente les frais de transaction que vous pourriez acquitter si aucune estimation de frais n'est proposée.</translation>
@@ -2993,15 +1820,31 @@
     </message>
     <message>
         <source>Delete all wallet transactions and only recover those parts of the blockchain through -rescan on startup</source>
-        <translation>Supprimer toutes les transactions du portefeuille et ne récupérer que ces parties de la chaîne de blocs avec -rescan au démarrage</translation>
+        <translation>Supprimer toutes les transactions du porte-monnaie et ne récupérer que ces parties de la chaîne de blocs avec -rescan au démarrage</translation>
     </message>
     <message>
         <source>Distributed under the MIT software license, see the accompanying file COPYING or &lt;http://www.opensource.org/licenses/mit-license.php&gt;.</source>
         <translation>Distribué sous la licence MIT d'utilisation d'un logiciel. Consultez le fichier joint COPYING ou &lt;http://www.opensource.org/licenses/mit-license.php&gt;.</translation>
     </message>
+    <message>
+        <source>Error loading %s: You can't enable HD on a already existing non-HD wallet</source>
+        <translation>Erreur de chargement de %s : vous ne pouvez pas activer HD sur un porte-monnaie non HD existant</translation>
+    </message>
     <message>
         <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source>
-        <translation>Exécuter la commande lorsqu'une transaction de portefeuille change (%s dans la commande est remplacée par TxID)</translation>
+        <translation>Exécuter la commande lorsqu'une transaction de porte-monnaie change (%s dans la commande est remplacée par TxID)</translation>
+    </message>
+    <message>
+        <source>Maximum allowed median peer time offset adjustment. Local perspective of time may be influenced by peers forward or backward by this amount. (default: %u seconds)</source>
+        <translation>Réglage moyen maximal autorisé de décalage de l'heure d'un pair. La perspective locale du temps peut être influencée par les pairs, en avance ou en retard, de cette valeur. (Par défaut : %u secondes)</translation>
+    </message>
+    <message>
+        <source>Maximum total fees (in %s) to use in a single wallet transaction or raw transaction; setting this too low may abort large transactions (default: %s)</source>
+        <translation>Frais totaux maximaux (en %s) à utiliser en une seule transaction de porte-monnaie ou transaction brute ; les définir trop bas pourrait interrompre les grosses transactions (par défaut : %s)</translation>
+    </message>
+    <message>
+        <source>Please contribute if you find %s useful. Visit %s for further information about the software.</source>
+        <translation>Si vous trouvez %s utile, vous pouvez y contribuer. Vous trouverez davantage d'informations à propos du logiciel sur %s.</translation>
     </message>
     <message>
         <source>Set the number of script verification threads (%u to %d, 0 = auto, &lt;0 = leave that many cores free, default: %d)</source>
@@ -3015,14 +1858,6 @@
         <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
         <translation>Ceci est une pré-version de test - l'utiliser à vos risques et périls - ne pas l'utiliser pour miner ou pour des applications marchandes</translation>
     </message>
-    <message>
-        <source>Unable to bind to %s on this computer. Bitcoin Core is probably already running.</source>
-        <translation>Impossible de se lier à %s sur cet ordinateur. Bitcoin Core fonctionne probablement déjà.</translation>
-    </message>
-    <message>
-        <source>Unsupported argument -whitelistalwaysrelay ignored, use -whitelistrelay and/or -whitelistforcerelay.</source>
-        <translation>Argument non pris charge -whitelistalwaysrelay ignoré, utiliser -whitelistrelay et/ou -whitelistforcerelay.</translation>
-    </message>
     <message>
         <source>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</source>
         <translation>Utiliser l'UPnP pour mapper le port d'écoute (par défaut : 1 lors de l'écoute et pas de mandataire -proxy)</translation>
@@ -3039,22 +1874,22 @@
         <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source>
         <translation>Avertissement : le réseau ne semble pas totalement d'accord ! Quelques mineurs semblent éprouver des difficultés.</translation>
     </message>
-    <message>
-        <source>Warning: Unknown block versions being mined! It's possible unknown rules are in effect</source>
-        <translation>Avertissement : des versions de blocs inconnues sont minées ! Il est possible que des règles inconnues soient en vigeur</translation>
-    </message>
     <message>
         <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source>
         <translation>Avertissement : nous ne semblons pas être en accord complet avec nos pairs ! Vous pourriez avoir besoin d'effectuer une mise à niveau, ou d'autres nœuds du réseau pourraient avoir besoin d'effectuer une mise à niveau.</translation>
     </message>
-    <message>
-        <source>Warning: wallet.dat corrupt, data salvaged! Original wallet.dat saved as wallet.{timestamp}.bak in %s; if your balance or transactions are incorrect you should restore from a backup.</source>
-        <translation>Avertissement : wallet.dat corrompu, données récupérées ! Le fichier wallet.dat original a été enregistré en tant que wallet.{timestamp}.bak dans %s ; si votre solde ou transactions sont incorrects vous devriez effectuer une restauration depuis une sauvegarde.</translation>
-    </message>
     <message>
         <source>Whitelist peers connecting from the given netmask or IP address. Can be specified multiple times.</source>
         <translation>Pairs de la liste blanche se connectant à partir du masque réseau ou de l'IP donné. Peut être spécifié plusieurs fois.</translation>
     </message>
+    <message>
+        <source>You need to rebuild the database using -reindex-chainstate to change -txindex</source>
+        <translation>Vous devez reconstruire la base de données avec -reindex-chainstate pour changer -txindex</translation>
+    </message>
+    <message>
+        <source>%s corrupt, salvage failed</source>
+        <translation>%s corrompu, la récupération a échoué</translation>
+    </message>
     <message>
         <source>-maxmempool must be at least %d MB</source>
         <translation>-maxmempool doit être d'au moins %d Mo</translation>
@@ -3067,10 +1902,22 @@
         <source>Append comment to the user agent string</source>
         <translation>Ajouter un commentaire à la chaîne d'agent utilisateur</translation>
     </message>
+    <message>
+        <source>Attempt to recover private keys from a corrupt wallet on startup</source>
+        <translation>Tenter de récupérer les clefs privées d'un porte-monnaie corrompu lors du démarrage</translation>
+    </message>
     <message>
         <source>Block creation options:</source>
         <translation>Options de création de bloc :</translation>
     </message>
+    <message>
+        <source>Cannot resolve -%s address: '%s'</source>
+        <translation>Impossible de résoudre l'adresse -%s : « %s »</translation>
+    </message>
+    <message>
+        <source>Change index out of range</source>
+        <translation>L'index de changement est hors échelle</translation>
+    </message>
     <message>
         <source>Connect only to the specified node(s)</source>
         <translation>Ne se connecter qu'au(x) nœud(s) spécifié(s)</translation>
@@ -3079,17 +1926,21 @@
         <source>Connection options:</source>
         <translation>Options de connexion :</translation>
     </message>
+    <message>
+        <source>Copyright (C) %i-%i</source>
+        <translation>Tous droits réservés (C) %i-%i</translation>
+    </message>
     <message>
         <source>Corrupted block database detected</source>
         <translation>Base corrompue de données des blocs détectée</translation>
     </message>
     <message>
         <source>Debugging/Testing options:</source>
-        <translation>Options de test/de débogage :</translation>
+        <translation>Options de débogage/de test :</translation>
     </message>
     <message>
         <source>Do not load the wallet and disable wallet RPC calls</source>
-        <translation>Ne pas charger le portefeuille et désactiver les appels RPC</translation>
+        <translation>Ne pas charger le porte-monnaie et désactiver les appels RPC</translation>
     </message>
     <message>
         <source>Do you want to rebuild the block database now?</source>
@@ -3117,7 +1968,23 @@
     </message>
     <message>
         <source>Error initializing wallet database environment %s!</source>
-        <translation>Erreur lors de l'initialisation de l'environnement de la base de données du portefeuille %s !</translation>
+        <translation>Erreur lors de l'initialisation de l'environnement de la base de données du porte-monnaie %s !</translation>
+    </message>
+    <message>
+        <source>Error loading %s</source>
+        <translation>Erreur lors du chargement de %s</translation>
+    </message>
+    <message>
+        <source>Error loading %s: Wallet corrupted</source>
+        <translation>Erreur lors du chargement de %s : porte-monnaie corrompu</translation>
+    </message>
+    <message>
+        <source>Error loading %s: Wallet requires newer version of %s</source>
+        <translation>Erreur lors du chargement de %s : le porte-monnaie exige une version plus récente de %s</translation>
+    </message>
+    <message>
+        <source>Error loading %s: You can't disable HD on a already existing HD wallet</source>
+        <translation>Erreur de chargement de %s : vous ne pouvez pas désactiver HD sur un porte-monnaie HD existant</translation>
     </message>
     <message>
         <source>Error loading block database</source>
@@ -3147,6 +2014,10 @@
         <source>Invalid -onion address: '%s'</source>
         <translation>Adresse -onion invalide : « %s »</translation>
     </message>
+    <message>
+        <source>Invalid amount for -%s=&lt;amount&gt;: '%s'</source>
+        <translation>Montant invalide pour -%s=&lt;amount&gt; : « %s »</translation>
+    </message>
     <message>
         <source>Invalid amount for -fallbackfee=&lt;amount&gt;: '%s'</source>
         <translation>Montant invalide pour -fallbackfee=&lt;amount&gt; : « %s »</translation>
@@ -3155,6 +2026,10 @@
         <source>Keep the transaction memory pool below &lt;n&gt; megabytes (default: %u)</source>
         <translation>Garder la réserve de mémoire transactionnelle sous &lt;n&gt; mégaoctets (par défaut : %u)</translation>
     </message>
+    <message>
+        <source>Loading banlist...</source>
+        <translation>Chargement de la liste d'interdiction...</translation>
+    </message>
     <message>
         <source>Location of the auth cookie (default: data dir)</source>
         <translation>Emplacement du fichier témoin auth (par défaut : data dir)</translation>
@@ -3171,6 +2046,10 @@
         <source>Only connect to nodes in network &lt;net&gt; (ipv4, ipv6 or onion)</source>
         <translation>Seulement se connecter aux nœuds du réseau &lt;net&gt; (IPv4, IPv6 ou oignon)</translation>
     </message>
+    <message>
+        <source>Print this help message and exit</source>
+        <translation>Imprimer ce message d'aide et quitter</translation>
+    </message>
     <message>
         <source>Print version and exit</source>
         <translation>Imprimer la version et quitter</translation>
@@ -3183,6 +2062,14 @@
         <source>Prune mode is incompatible with -txindex.</source>
         <translation>Le mode élagage n'est pas compatible avec -txindex.</translation>
     </message>
+    <message>
+        <source>Rebuild chain state and block index from the blk*.dat files on disk</source>
+        <translation>Reconstruire l'état de la chaîne et l'index des blocs à partir des fichiers blk*.dat sur le disque</translation>
+    </message>
+    <message>
+        <source>Rebuild chain state from the currently indexed blocks</source>
+        <translation>Reconstruire l'état de la chaîne à partir des blocs indexés actuellement</translation>
+    </message>
     <message>
         <source>Set database cache size in megabytes (%d to %d, default: %d)</source>
         <translation>Définir la taille du cache de la base de données en mégaoctets (%d to %d, default: %d)</translation>
@@ -3193,7 +2080,11 @@
     </message>
     <message>
         <source>Specify wallet file (within data directory)</source>
-        <translation>Spécifiez le fichier de portefeuille (dans le répertoire de données)</translation>
+        <translation>Spécifiez le fichier de porte-monnaie (dans le répertoire de données)</translation>
+    </message>
+    <message>
+        <source>The source code is available from %s.</source>
+        <translation>Le code source est disponible sur %s.</translation>
     </message>
     <message>
         <source>Unsupported argument -benchmark ignored, use -debug=bench.</source>
@@ -3221,19 +2112,19 @@
     </message>
     <message>
         <source>Verifying wallet...</source>
-        <translation>Vérification du portefeuille en cours...</translation>
+        <translation>Vérification du porte-monnaie en cours...</translation>
     </message>
     <message>
         <source>Wallet %s resides outside data directory %s</source>
-        <translation>Le portefeuille %s réside en dehors du répertoire de données %s</translation>
+        <translation>Le porte-monnaie %s réside en dehors du répertoire de données %s</translation>
     </message>
     <message>
-        <source>Wallet options:</source>
-        <translation>Options du portefeuille :</translation>
+        <source>Wallet debugging/testing options:</source>
+        <translation>Options de débogage/de test du porte-monnaie :</translation>
     </message>
     <message>
-        <source>You need to rebuild the database using -reindex to change -txindex</source>
-        <translation>Vous devez reconstruire la base de données en utilisant -reindex afin de modifier -txindex</translation>
+        <source>Wallet options:</source>
+        <translation>Options du porte-monnaie :</translation>
     </message>
     <message>
         <source>Allow JSON-RPC connections from specified source. Valid for &lt;ip&gt; are a single IP (e.g. 1.2.3.4), a network/netmask (e.g. 1.2.3.4/255.255.255.0) or a network/CIDR (e.g. 1.2.3.4/24). This option can be specified multiple times</source>
@@ -3247,13 +2138,9 @@
         <source>Bind to given address to listen for JSON-RPC connections. Use [host]:port notation for IPv6. This option can be specified multiple times (default: bind to all interfaces)</source>
         <translation>Se lier à l'adresse donnée pour écouter des connexions JSON-RPC. Utiliser la notation [host]:port pour l'IPv6. Cette option peut être spécifiée plusieurs fois (par défaut : se lier à toutes les interfaces)</translation>
     </message>
-    <message>
-        <source>Cannot obtain a lock on data directory %s. Bitcoin Core is probably already running.</source>
-        <translation>Impossible d’obtenir un verrou sur le répertoire de données %s. Bitcoin Core fonctionne probablement déjà.</translation>
-    </message>
     <message>
         <source>Create new files with system default permissions, instead of umask 077 (only effective with disabled wallet functionality)</source>
-        <translation>Créer de nouveaux fichiers avec les permissions système par défaut, au lieu de umask 077 (effectif seulement avec la fonction du portefeuille désactivée)</translation>
+        <translation>Créer de nouveaux fichiers avec les permissions système par défaut, au lieu de umask 077 (effectif seulement avec la fonction du porte-monnaie désactivée)</translation>
     </message>
     <message>
         <source>Discover own IP addresses (default: 1 when listening and no -externalip or -proxy)</source>
@@ -3295,10 +2182,6 @@
         <source>Set maximum size of high-priority/low-fee transactions in bytes (default: %d)</source>
         <translation>Définir la taille maximale en octets des transactions prioritaires/à frais modiques (par défaut : %d)</translation>
     </message>
-    <message>
-        <source>Set the number of threads for coin generation if enabled (-1 = all cores, default: %d)</source>
-        <translation>Définir le nombre de fils de génération de pièces, si elle est activée (-1 = tous les cœurs, par défaut : %d)</translation>
-    </message>
     <message>
         <source>The transaction amount is too small to send after the fee has been deducted</source>
         <translation>Le montant de la transaction est trop bas pour être envoyé une fois que les frais ont été déduits</translation>
@@ -3323,34 +2206,14 @@
         <source>Accept public REST requests (default: %u)</source>
         <translation>Accepter les demandes REST publiques (par défaut : %u)</translation>
     </message>
-    <message>
-        <source>Activating best chain...</source>
-        <translation>Activation de la meilleure chaîne...</translation>
-    </message>
-    <message>
-        <source>Attempt to recover private keys from a corrupt wallet.dat on startup</source>
-        <translation>Tenter de récupérer les clefs privées d'un wallet.dat corrompu lors du démarrage</translation>
-    </message>
     <message>
         <source>Automatically create Tor hidden service (default: %d)</source>
         <translation>Créer automatiquement un service caché Tor (par défaut : %d)</translation>
     </message>
-    <message>
-        <source>Cannot resolve -whitebind address: '%s'</source>
-        <translation>Impossible de résoudre l'adresse -whitebind : « %s »</translation>
-    </message>
     <message>
         <source>Connect through SOCKS5 proxy</source>
         <translation>Se connecter par un mandataire SOCKS5</translation>
     </message>
-    <message>
-        <source>Copyright (C) 2009-%i The Bitcoin Core Developers</source>
-        <translation>Copyright © 2009-%i Les développeurs de Bitcoin Core</translation>
-    </message>
-    <message>
-        <source>Error loading wallet.dat: Wallet requires newer version of Bitcoin Core</source>
-        <translation>Erreur lors du chargement de wallet.dat : le portefeuille exige une version plus récente de Bitcoin Core</translation>
-    </message>
     <message>
         <source>Error reading from database, shutting down.</source>
         <translation>Erreur de lecture de la base de données, fermeture en cours.</translation>
@@ -3363,22 +2226,6 @@
         <source>Information</source>
         <translation>Informations</translation>
     </message>
-    <message>
-        <source>Initialization sanity check failed. Bitcoin Core is shutting down.</source>
-        <translation>L'initialisation du test de cohérence a échoué. Bitcoin est en cours de fermeture. </translation>
-    </message>
-    <message>
-        <source>Invalid amount for -maxtxfee=&lt;amount&gt;: '%s'</source>
-        <translation>Montant invalide pour -maxtxfee=&lt;amount&gt; : « %s »</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -minrelaytxfee=&lt;amount&gt;: '%s'</source>
-        <translation>Montant invalide pour -minrelayfee=&lt;montant&gt; : « %s »</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -mintxfee=&lt;amount&gt;: '%s'</source>
-        <translation>Montant invalide pour -mintxfee=&lt;montant&gt; : « %s »</translation>
-    </message>
     <message>
         <source>Invalid amount for -paytxfee=&lt;amount&gt;: '%s' (must be at least %s)</source>
         <translation>Montant invalide pour -paytxfee=&lt;montant&gt; : « %s » (doit être au moins %s)</translation>
@@ -3403,21 +2250,13 @@
         <source>RPC server options:</source>
         <translation>Options du serveur RPC :</translation>
     </message>
-    <message>
-        <source>Rebuild block chain index from current blk000??.dat files on startup</source>
-        <translation>Reconstruire au démarrage l'index de la chaîne de blocs à partir des fichiers blk000??.dat actuels</translation>
-    </message>
-    <message>
-        <source>Receive and display P2P network alerts (default: %u)</source>
-        <translation>Recevoir et afficher les alertes du réseau poste à poste (par défaut : %u)</translation>
-    </message>
     <message>
         <source>Reducing -maxconnections from %d to %d, because of system limitations.</source>
         <translation>Réduction de -maxconnections de %d à %d, due aux restrictions du système</translation>
     </message>
     <message>
         <source>Rescan the block chain for missing wallet transactions on startup</source>
-        <translation>Réanalyser la chaîne de blocs au démarrage, à la recherche de transactions de portefeuille manquantes</translation>
+        <translation>Réanalyser la chaîne de blocs au démarrage, à la recherche de transactions de porte-monnaie manquantes</translation>
     </message>
     <message>
         <source>Send trace/debug info to console instead of debug.log file</source>
@@ -3477,16 +2316,12 @@
     </message>
     <message>
         <source>Upgrade wallet to latest format on startup</source>
-        <translation>Mettre à niveau le portefeuille au démarrage vers le format le plus récent</translation>
+        <translation>Mettre à niveau le porte-monnaie au démarrage vers le format le plus récent</translation>
     </message>
     <message>
         <source>Username for JSON-RPC connections</source>
         <translation>Nom d'utilisateur pour les connexions JSON-RPC</translation>
     </message>
-    <message>
-        <source>Wallet needed to be rewritten: restart Bitcoin Core to complete</source>
-        <translation>Le portefeuille avait besoin d'être réécrit : veuillez redémarrer Bitcoin Core pour terminer</translation>
-    </message>
     <message>
         <source>Warning</source>
         <translation>Avertissement</translation>
@@ -3501,16 +2336,12 @@
     </message>
     <message>
         <source>Zapping all transactions from wallet...</source>
-        <translation>Supprimer toutes les transactions du portefeuille...</translation>
+        <translation>Supprimer toutes les transactions du porte-monnaie...</translation>
     </message>
     <message>
         <source>ZeroMQ notification options:</source>
         <translation>Options de notification ZeroMQ</translation>
     </message>
-    <message>
-        <source>wallet.dat corrupt, salvage failed</source>
-        <translation>wallet.dat corrompu, la récupération a échoué</translation>
-    </message>
     <message>
         <source>Password for JSON-RPC connections</source>
         <translation>Mot de passe pour les connexions JSON-RPC</translation>
@@ -3519,10 +2350,6 @@
         <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
         <translation>Exécuter la commande lorsque le meilleur bloc change (%s dans cmd est remplacé par le hachage du bloc)</translation>
     </message>
-    <message>
-        <source>This help message</source>
-        <translation>Ce message d'aide</translation>
-    </message>
     <message>
         <source>Allow DNS lookups for -addnode, -seednode and -connect</source>
         <translation>Autoriser les recherches DNS pour -addnode, -seednode et -connect</translation>
@@ -3531,10 +2358,6 @@
         <source>Loading addresses...</source>
         <translation>Chargement des adresses…</translation>
     </message>
-    <message>
-        <source>Error loading wallet.dat: Wallet corrupted</source>
-        <translation>Erreur lors du chargement de wallet.dat : portefeuille corrompu</translation>
-    </message>
     <message>
         <source>(1 = keep tx meta data e.g. account owner and payment request information, 2 = drop tx meta data)</source>
         <translation>(1 = conserver les métadonnées de transmission, par ex. les informations du propriétaire du compte et de la demande de paiement, 2 = abandonner les métadonnées de transmission)</translation>
@@ -3551,10 +2374,6 @@
         <source>Do not keep transactions in the mempool longer than &lt;n&gt; hours (default: %u)</source>
         <translation>Ne pas conserver de transactions dans la réserve de mémoire plus de &lt;n&gt; heures (par défaut : %u)</translation>
     </message>
-    <message>
-        <source>Error reading wallet.dat! All keys read correctly, but transaction data or address book entries might be missing or incorrect.</source>
-        <translation>Une erreur est survenue lors de la lecture de wallet.dat ! Toutes les clefs ont été lues correctement, mais les données transactionnelles ou les entrées du carnet d'adresses sont peut-être manquantes ou incorrectes.</translation>
-    </message>
     <message>
         <source>Fees (in %s/kB) smaller than this are considered zero fee for transaction creation (default: %s)</source>
         <translation>Les frais (en %s/Ko) inférieurs à ce seuil sont considérés comme étant nuls pour la création de transactions (par défaut : %s)</translation>
@@ -3591,6 +2410,10 @@
         <source>Unsupported argument -socks found. Setting SOCKS version isn't possible anymore, only SOCKS5 proxies are supported.</source>
         <translation>L'argument non pris en charge -socks a été trouvé. Il n'est plus possible de définir la version de SOCKS, seuls les mandataires SOCKS5 sont pris en charge.</translation>
     </message>
+    <message>
+        <source>Unsupported argument -whitelistalwaysrelay ignored, use -whitelistrelay and/or -whitelistforcerelay.</source>
+        <translation>Argument non pris charge -whitelistalwaysrelay ignoré, utiliser -whitelistrelay et/ou -whitelistforcerelay.</translation>
+    </message>
     <message>
         <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: %s)</source>
         <translation>Utiliser un serveur mandataire SOCKS5 séparé pour atteindre les pairs par les services cachés de Tor (par défaut : %s)</translation>
@@ -3600,20 +2423,20 @@
         <translation>Nom d'utilisateur et mot de passe haché pour les connexions JSON-RPC. Le champ &lt;userpw&gt; vient au format : &lt;USERNAME&gt;:&lt;SALT&gt;$&lt;HASH&gt;. Un script python canonique est inclus dans share/rpcuser. Cette option peut être spécifiée plusieurs fois.</translation>
     </message>
     <message>
-        <source>(default: %s)</source>
-        <translation>(par défaut : %s)</translation>
+        <source>Warning: Unknown block versions being mined! It's possible unknown rules are in effect</source>
+        <translation>Avertissement : des versions de blocs inconnues sont minées ! Il est possible que des règles inconnues soient en vigeur</translation>
     </message>
     <message>
-        <source>Always query for peer addresses via DNS lookup (default: %u)</source>
-        <translation>Toujours demander les adresses des pairs par recherche DNS (par défaut : %u)</translation>
+        <source>Warning: Wallet file corrupt, data salvaged! Original %s saved as %s in %s; if your balance or transactions are incorrect you should restore from a backup.</source>
+        <translation>Avertissement : le fichier du porte-monnaie est corrompu, les données ont été récupérées ! Le fichier %s original a été enregistré en tant que %s dans %s ; si votre solde ou vos transactions sont incorrects, vous devriez restaurer une sauvegarde.</translation>
     </message>
     <message>
-        <source>Error loading wallet.dat</source>
-        <translation>Erreur lors du chargement de wallet.dat</translation>
+        <source>(default: %s)</source>
+        <translation>(par défaut : %s)</translation>
     </message>
     <message>
-        <source>Generate coins (default: %u)</source>
-        <translation>Générer des pièces (défaut : %u)</translation>
+        <source>Always query for peer addresses via DNS lookup (default: %u)</source>
+        <translation>Toujours demander les adresses des pairs par recherche DNS (par défaut : %u)</translation>
     </message>
     <message>
         <source>How many blocks to check at startup (default: %u, 0 = all)</source>
@@ -3641,7 +2464,7 @@
     </message>
     <message>
         <source>Make the wallet broadcast transactions</source>
-        <translation>Obliger le portefeuille à diffuser les transactions</translation>
+        <translation>Obliger le porte-monnaie à diffuser les transactions</translation>
     </message>
     <message>
         <source>Maximum per-connection receive buffer, &lt;n&gt;*1000 bytes (default: %u)</source>
@@ -3699,18 +2522,6 @@
         <source>Unknown network specified in -onlynet: '%s'</source>
         <translation>Réseau inconnu spécifié sur -onlynet : « %s »</translation>
     </message>
-    <message>
-        <source>Cannot resolve -bind address: '%s'</source>
-        <translation>Impossible de résoudre l'adresse -bind : « %s »</translation>
-    </message>
-    <message>
-        <source>Cannot resolve -externalip address: '%s'</source>
-        <translation>Impossible de résoudre l'adresse -externalip : « %s »</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -paytxfee=&lt;amount&gt;: '%s'</source>
-        <translation>Montant invalide pour -paytxfee=&lt;montant&gt; : « %s »</translation>
-    </message>
     <message>
         <source>Insufficient funds</source>
         <translation>Fonds insuffisants</translation>
@@ -3725,11 +2536,11 @@
     </message>
     <message>
         <source>Loading wallet...</source>
-        <translation>Chargement du portefeuille…</translation>
+        <translation>Chargement du porte-monnaie…</translation>
     </message>
     <message>
         <source>Cannot downgrade wallet</source>
-        <translation>Impossible de revenir à une version inférieure du portefeuille</translation>
+        <translation>Impossible de revenir à une version inférieure du porte-monnaie</translation>
     </message>
     <message>
         <source>Cannot write default address</source>
diff --git a/src/qt/locale/bitcoin_fr_CA.ts b/src/qt/locale/bitcoin_fr_CA.ts
index 7e6925f96f683..fca1e62883dbd 100644
--- a/src/qt/locale/bitcoin_fr_CA.ts
+++ b/src/qt/locale/bitcoin_fr_CA.ts
@@ -13,29 +13,6 @@
         <source>&amp;Delete</source>
         <translation>&amp;Supprimer</translation>
     </message>
-    <message>
-        <source>Sending addresses</source>
-        <translation>envoyer adresse de reception </translation>
-    </message>
-    <message>
-        <source>Comma separated file (*.csv)</source>
-        <translation>Fichier séparé par une virgule (*.csv)</translation>
-    </message>
-    </context>
-<context>
-    <name>AddressTableModel</name>
-    <message>
-        <source>Label</source>
-        <translation>Record</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>Addresse</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(pas de record)</translation>
-    </message>
 </context>
 <context>
     <name>AskPassphraseDialog</name>
@@ -51,46 +28,19 @@
         <source>Repeat new passphrase</source>
         <translation>Répéter Mot de Passe</translation>
     </message>
-    <message>
-        <source>Encrypt wallet</source>
-        <translation>Encrypter Porte-Feuille</translation>
-    </message>
-    <message>
-        <source>This operation needs your wallet passphrase to unlock the wallet.</source>
-        <translation>Cette opération nécessite le mot de passe de votre porte-feuille pour débarrer le porte-feuille.</translation>
-    </message>
-    <message>
-        <source>Unlock wallet</source>
-        <translation>Débarrer Porte-Feuille</translation>
-    </message>
-    <message>
-        <source>This operation needs your wallet passphrase to decrypt the wallet.</source>
-        <translation>Cette opération nécessite le mot de passe de votre porte-feuille pour le décrypter.</translation>
-    </message>
-    </context>
+</context>
 <context>
     <name>BanTableModel</name>
     </context>
 <context>
     <name>BitcoinGUI</name>
     </context>
-<context>
-    <name>ClientModel</name>
-    </context>
 <context>
     <name>CoinControlDialog</name>
     <message>
         <source>(un)select all</source>
         <translation>Toute sélectionner </translation>
     </message>
-    <message>
-        <source>Copy address</source>
-        <translation>copier l'adresse </translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(pas de record)</translation>
-    </message>
     </context>
 <context>
     <name>EditAddressDialog</name>
@@ -102,7 +52,7 @@
         <source>&amp;Address</source>
         <translation>Addresse</translation>
     </message>
-    </context>
+</context>
 <context>
     <name>FreespaceChecker</name>
     </context>
@@ -125,18 +75,12 @@
 <context>
     <name>OverviewPage</name>
     </context>
-<context>
-    <name>PaymentServer</name>
-    </context>
 <context>
     <name>PeerTableModel</name>
     </context>
 <context>
     <name>QObject</name>
     </context>
-<context>
-    <name>QRImageWidget</name>
-    </context>
 <context>
     <name>RPCConsole</name>
     </context>
@@ -145,32 +89,9 @@
     </context>
 <context>
     <name>ReceiveRequestDialog</name>
-    <message>
-        <source>Address</source>
-        <translation>Addresse</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Record</translation>
-    </message>
-    </context>
-<context>
-    <name>RecentRequestsTableModel</name>
-    <message>
-        <source>Label</source>
-        <translation>Record</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(pas de record)</translation>
-    </message>
     </context>
 <context>
     <name>SendCoinsDialog</name>
-    <message>
-        <source>(no label)</source>
-        <translation>(pas de record)</translation>
-    </message>
     </context>
 <context>
     <name>SendCoinsEntry</name>
@@ -187,50 +108,12 @@
 <context>
     <name>TrafficGraphWidget</name>
     </context>
-<context>
-    <name>TransactionDesc</name>
-    </context>
 <context>
     <name>TransactionDescDialog</name>
     </context>
-<context>
-    <name>TransactionTableModel</name>
-    <message>
-        <source>Label</source>
-        <translation>Record</translation>
-    </message>
-    </context>
-<context>
-    <name>TransactionView</name>
-    <message>
-        <source>Copy address</source>
-        <translation>copier l'adresse </translation>
-    </message>
-    <message>
-        <source>Comma separated file (*.csv)</source>
-        <translation>Fichier séparé par une virgule (*.csv)</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Record</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>Addresse</translation>
-    </message>
-    </context>
 <context>
     <name>UnitDisplayStatusBarControl</name>
     </context>
-<context>
-    <name>WalletFrame</name>
-    </context>
-<context>
-    <name>WalletModel</name>
-    </context>
-<context>
-    <name>WalletView</name>
-    </context>
 <context>
     <name>bitcoin-core</name>
     </context>
diff --git a/src/qt/locale/bitcoin_fr_FR.ts b/src/qt/locale/bitcoin_fr_FR.ts
index 9a2ac551c63eb..f7fd7e6a18e50 100644
--- a/src/qt/locale/bitcoin_fr_FR.ts
+++ b/src/qt/locale/bitcoin_fr_FR.ts
@@ -25,10 +25,6 @@
         <source>C&amp;lose</source>
         <translation>F&amp;ermer</translation>
     </message>
-    <message>
-        <source>&amp;Copy Address</source>
-        <translation>&amp;Adresse de copie</translation>
-    </message>
     <message>
         <source>Delete the currently selected address from the list</source>
         <translation>Supprimer l'adresse sélectionnée de la liste</translation>
@@ -45,74 +41,6 @@
         <source>&amp;Delete</source>
         <translation>&amp;Supprimer</translation>
     </message>
-    <message>
-        <source>Choose the address to send coins to</source>
-        <translation>Choisissez une adresse où envoyer les bitcoins</translation>
-    </message>
-    <message>
-        <source>Choose the address to receive coins with</source>
-        <translation>Choisissez une adresse où recevoir les bitcoins</translation>
-    </message>
-    <message>
-        <source>C&amp;hoose</source>
-        <translation>C&amp;oisir</translation>
-    </message>
-    <message>
-        <source>Sending addresses</source>
-        <translation>Adresses d'envoi</translation>
-    </message>
-    <message>
-        <source>Receiving addresses</source>
-        <translation>Adresses de réception</translation>
-    </message>
-    <message>
-        <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source>
-        <translation>Voici vos adresses Bitcoin qui vous permettent d'envoyer des paiements.  Vérifiez toujours le montant et l'adresse de réception avant d'envoyer des pièces.</translation>
-    </message>
-    <message>
-        <source>These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source>
-        <translation>Voici vos adresses Bitcoin qui vous permettent de recevoir des paiements.  Il est recommandé d'utiliser une nouvelle adresse de réception pour chaque transaction</translation>
-    </message>
-    <message>
-        <source>Copy &amp;Label</source>
-        <translation>Copier &amp;Étiquette </translation>
-    </message>
-    <message>
-        <source>&amp;Edit</source>
-        <translation>&amp;Éditer </translation>
-    </message>
-    <message>
-        <source>Export Address List</source>
-        <translation>Exporter la liste d'adresses</translation>
-    </message>
-    <message>
-        <source>Comma separated file (*.csv)</source>
-        <translation>Valeurs séparées par des virgules (*.csv)</translation>
-    </message>
-    <message>
-        <source>Exporting Failed</source>
-        <translation>Échec de l'export</translation>
-    </message>
-    <message>
-        <source>There was an error trying to save the address list to %1. Please try again.</source>
-        <translation>Il y a eu une erreur durant la tentative de sauvegarde de la liste d’adresse vers %1.
-Réessayez.</translation>
-    </message>
-</context>
-<context>
-    <name>AddressTableModel</name>
-    <message>
-        <source>Label</source>
-        <translation>Étiquette</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>Adresse</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(aucune étiquette)</translation>
-    </message>
 </context>
 <context>
     <name>AskPassphraseDialog</name>
@@ -132,86 +60,6 @@ Réessayez.</translation>
         <source>Repeat new passphrase</source>
         <translation>Répétez la phrase de passe</translation>
     </message>
-    <message>
-        <source>Encrypt wallet</source>
-        <translation>Chiffrer le porte-monnaie</translation>
-    </message>
-    <message>
-        <source>This operation needs your wallet passphrase to unlock the wallet.</source>
-        <translation>Cette opération nécessite votre phrase de passe pour déverrouiller le porte-monnaie.</translation>
-    </message>
-    <message>
-        <source>Unlock wallet</source>
-        <translation>Déverrouiller le porte-monnaie</translation>
-    </message>
-    <message>
-        <source>This operation needs your wallet passphrase to decrypt the wallet.</source>
-        <translation>Cette opération nécessite votre phrase de passe pour décrypter le porte-monnaie.</translation>
-    </message>
-    <message>
-        <source>Decrypt wallet</source>
-        <translation>Décrypter le porte-monnaie</translation>
-    </message>
-    <message>
-        <source>Change passphrase</source>
-        <translation>Changer la phrase de passe</translation>
-    </message>
-    <message>
-        <source>Confirm wallet encryption</source>
-        <translation>Confirmer le chiffrement du porte-monnaie</translation>
-    </message>
-    <message>
-        <source>Warning: If you encrypt your wallet and lose your passphrase, you will &lt;b&gt;LOSE ALL OF YOUR BITCOINS&lt;/b&gt;!</source>
-        <translation>Attention: Si vous cryptez votre portefeuille et que vous perdez votre mot de passe vous &lt;b&gt; PERDREZ TOUS VOS BITCOINS&lt;/b&gt;!</translation>
-    </message>
-    <message>
-        <source>Are you sure you wish to encrypt your wallet?</source>
-        <translation>Êtes-vous sûr de de vouloir crypter votre portefeuille ? </translation>
-    </message>
-    <message>
-        <source>Bitcoin Core will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source>
-        <translation>Bitcoin Core fermera maintenant pour finir le processus de chiffrement. Rappelez-vous que crypter votre portefeuille ne protége pas totalement vos bitcoins d'être volé par un malware ayant infecté votre ordinateur. </translation>
-    </message>
-    <message>
-        <source>Warning: The Caps Lock key is on!</source>
-        <translation>Attention : La touche majuscule est enfoncé.</translation>
-    </message>
-    <message>
-        <source>Wallet encrypted</source>
-        <translation>Porte-monnaie chiffré</translation>
-    </message>
-    <message>
-        <source>Enter the old passphrase and new passphrase to the wallet.</source>
-        <translation>Entrez l'ancien mot de passe et le nouveau mot de passe pour le portefeuille</translation>
-    </message>
-    <message>
-        <source>Wallet encryption failed</source>
-        <translation>Le chiffrement du porte-monnaie a échoué</translation>
-    </message>
-    <message>
-        <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
-        <translation>Le chiffrement du porte-monnaie a échoué en raison d'une erreur interne. Votre porte-monnaie n'a pas été chiffré.</translation>
-    </message>
-    <message>
-        <source>The supplied passphrases do not match.</source>
-        <translation>Les phrases de passe entrées ne correspondent pas.</translation>
-    </message>
-    <message>
-        <source>Wallet unlock failed</source>
-        <translation>Le déverrouillage du porte-monnaie a échoué</translation>
-    </message>
-    <message>
-        <source>The passphrase entered for the wallet decryption was incorrect.</source>
-        <translation>La phrase de passe entrée pour décrypter le porte-monnaie était erronée.</translation>
-    </message>
-    <message>
-        <source>Wallet decryption failed</source>
-        <translation>Le décryptage du porte-monnaie a échoué</translation>
-    </message>
-    <message>
-        <source>Wallet passphrase was successfully changed.</source>
-        <translation>Le changement du mot de passe du portefeuille à été effectué avec succès.</translation>
-    </message>
 </context>
 <context>
     <name>BanTableModel</name>
@@ -262,6 +110,14 @@ Réessayez.</translation>
         <source>Quit application</source>
         <translation>Quitter l'application</translation>
     </message>
+    <message>
+        <source>&amp;About %1</source>
+        <translation>&amp;À propos de %1</translation>
+    </message>
+    <message>
+        <source>Show information about %1</source>
+        <translation>Afficher les informations sur %1</translation>
+    </message>
     <message>
         <source>About &amp;Qt</source>
         <translation>À propos de &amp;Qt</translation>
@@ -274,6 +130,10 @@ Réessayez.</translation>
         <source>&amp;Options...</source>
         <translation>&amp;Options...</translation>
     </message>
+    <message>
+        <source>Modify configuration options for %1</source>
+        <translation>Modifier les options de configuration pour %1</translation>
+    </message>
     <message>
         <source>&amp;Encrypt Wallet...</source>
         <translation>&amp;Chiffrer le portefeuille </translation>
@@ -298,14 +158,6 @@ Réessayez.</translation>
         <source>Open &amp;URI...</source>
         <translation>Ouvrir &amp;URI</translation>
     </message>
-    <message>
-        <source>Bitcoin Core client</source>
-        <translation>Client Bitcoin Core</translation>
-    </message>
-    <message>
-        <source>Importing blocks from disk...</source>
-        <translation>Importer les blocs depuis le disque...</translation>
-    </message>
     <message>
         <source>Reindexing blocks on disk...</source>
         <translation>Réindexer les blocs sur le disque...</translation>
@@ -350,10 +202,6 @@ Réessayez.</translation>
         <source>&amp;Receive</source>
         <translation>&amp;Réception</translation>
     </message>
-    <message>
-        <source>Show information about Bitcoin Core</source>
-        <translation>Montrer les informations à propos de Bitcoin Core</translation>
-    </message>
     <message>
         <source>&amp;Show / Hide</source>
         <translation>&amp;Montrer / Cacher</translation>
@@ -386,22 +234,10 @@ Réessayez.</translation>
         <source>Tabs toolbar</source>
         <translation>Barre d'outils des onglets</translation>
     </message>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Bitcoin Core</translation>
-    </message>
     <message>
         <source>Request payments (generates QR codes and bitcoin: URIs)</source>
         <translation>Demander des paiements (générer QR codes et bitcoin: URIs)</translation>
     </message>
-    <message>
-        <source>&amp;About Bitcoin Core</source>
-        <translation>&amp;À propos de Bitcoin</translation>
-    </message>
-    <message>
-        <source>Modify configuration options for Bitcoin Core</source>
-        <translation>Modifier les options de configuration de Bitcoin Core</translation>
-    </message>
     <message>
         <source>Show the list of used sending addresses and labels</source>
         <translation>Montrer la liste des adresses d'envois utilisées et les étiquettes</translation>
@@ -521,13 +357,6 @@ Réessayez.</translation>
         <translation>Le porte-monnaie est &lt;b&gt;chiffré&lt;/b&gt; et est actuellement &lt;b&gt;verrouillé&lt;/b&gt;</translation>
     </message>
 </context>
-<context>
-    <name>ClientModel</name>
-    <message>
-        <source>Network Alert</source>
-        <translation>Alerte réseau</translation>
-    </message>
-</context>
 <context>
     <name>CoinControlDialog</name>
     <message>
@@ -606,142 +435,6 @@ Réessayez.</translation>
         <source>Priority</source>
         <translation>Priorité</translation>
     </message>
-    <message>
-        <source>Copy address</source>
-        <translation>Copier l'adresse</translation>
-    </message>
-    <message>
-        <source>Copy label</source>
-        <translation>Copier l'étiquette</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>Copier le montant</translation>
-    </message>
-    <message>
-        <source>Copy transaction ID</source>
-        <translation>Copie ID transaction</translation>
-    </message>
-    <message>
-        <source>Lock unspent</source>
-        <translation>Verrouiller les non dépensés</translation>
-    </message>
-    <message>
-        <source>Unlock unspent</source>
-        <translation>Déverrouiller les non dépensés</translation>
-    </message>
-    <message>
-        <source>Copy quantity</source>
-        <translation>Copier la quantité</translation>
-    </message>
-    <message>
-        <source>Copy fee</source>
-        <translation>Copier les frais</translation>
-    </message>
-    <message>
-        <source>Copy after fee</source>
-        <translation>Copier après les frais</translation>
-    </message>
-    <message>
-        <source>Copy bytes</source>
-        <translation>Copier les octets</translation>
-    </message>
-    <message>
-        <source>Copy priority</source>
-        <translation>Copier la priorité </translation>
-    </message>
-    <message>
-        <source>Copy dust</source>
-        <translation>Copier la poussière </translation>
-    </message>
-    <message>
-        <source>Copy change</source>
-        <translation>Copier changement </translation>
-    </message>
-    <message>
-        <source>highest</source>
-        <translation>le plus élevé</translation>
-    </message>
-    <message>
-        <source>higher</source>
-        <translation>plus haute</translation>
-    </message>
-    <message>
-        <source>high</source>
-        <translation>haut</translation>
-    </message>
-    <message>
-        <source>medium-high</source>
-        <translation>moyen-élevé</translation>
-    </message>
-    <message>
-        <source>medium</source>
-        <translation>moyen</translation>
-    </message>
-    <message>
-        <source>low-medium</source>
-        <translation>bas-moyen</translation>
-    </message>
-    <message>
-        <source>low</source>
-        <translation>bas</translation>
-    </message>
-    <message>
-        <source>lower</source>
-        <translation>inférieur</translation>
-    </message>
-    <message>
-        <source>lowest</source>
-        <translation>le plus bas </translation>
-    </message>
-    <message>
-        <source>(%1 locked)</source>
-        <translation>(%1 verrouillé)</translation>
-    </message>
-    <message>
-        <source>none</source>
-        <translation>aucun</translation>
-    </message>
-    <message>
-        <source>This label turns red if the transaction size is greater than 1000 bytes.</source>
-        <translation>Cette étiquette devient rouge si la taille de la transaction est plus grande que 1000 octets</translation>
-    </message>
-    <message>
-        <source>This label turns red if the priority is smaller than "medium".</source>
-        <translation>Cette étiquette devient rouge si la priorité est plus petite que "moyen"</translation>
-    </message>
-    <message>
-        <source>Can vary +/- %1 satoshi(s) per input.</source>
-        <translation>Peut varier de +/- %1 satoshi(s) par entrée.</translation>
-    </message>
-    <message>
-        <source>yes</source>
-        <translation>oui</translation>
-    </message>
-    <message>
-        <source>no</source>
-        <translation>non</translation>
-    </message>
-    <message>
-        <source>This means a fee of at least %1 per kB is required.</source>
-        <translation>Cela signifie que des frais d'au moins %1 par kO sont requis.</translation>
-    </message>
-    <message>
-        <source>Can vary +/- 1 byte per input.</source>
-        <translation>Peut varier de +/- 1 octet par entrée.</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(aucune étiquette)</translation>
-    </message>
-    <message>
-        <source>change from %1 (%2)</source>
-        <translation>changement de %1 (%2)</translation>
-    </message>
-    <message>
-        <source>(change)</source>
-        <translation>(changement)</translation>
-    </message>
 </context>
 <context>
     <name>EditAddressDialog</name>
@@ -757,38 +450,6 @@ Réessayez.</translation>
         <source>&amp;Address</source>
         <translation>&amp;Adresse</translation>
     </message>
-    <message>
-        <source>New receiving address</source>
-        <translation>Nouvelle adresse de réception</translation>
-    </message>
-    <message>
-        <source>New sending address</source>
-        <translation>Nouvelle adresse d'envoi</translation>
-    </message>
-    <message>
-        <source>Edit receiving address</source>
-        <translation>Éditer l'adresse de réception</translation>
-    </message>
-    <message>
-        <source>Edit sending address</source>
-        <translation>Éditer l'adresse d'envoi</translation>
-    </message>
-    <message>
-        <source>The entered address "%1" is already in the address book.</source>
-        <translation>L'adresse fournie « %1 » est déjà présente dans le carnet d'adresses.</translation>
-    </message>
-    <message>
-        <source>The entered address "%1" is not a valid Bitcoin address.</source>
-        <translation>L'adresse entrée "%1" n'est pas une adresse Bitcoin valide.</translation>
-    </message>
-    <message>
-        <source>Could not unlock wallet.</source>
-        <translation>Impossible de déverrouiller le porte-monnaie.</translation>
-    </message>
-    <message>
-        <source>New key generation failed.</source>
-        <translation>Échec de la génération de la nouvelle clef.</translation>
-    </message>
 </context>
 <context>
     <name>FreespaceChecker</name>
@@ -811,10 +472,6 @@ Réessayez.</translation>
 </context>
 <context>
     <name>HelpMessageDialog</name>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Bitcoin Core</translation>
-    </message>
     <message>
         <source>version</source>
         <translation>version</translation>
@@ -824,8 +481,8 @@ Réessayez.</translation>
         <translation>(%1-bit)</translation>
     </message>
     <message>
-        <source>About Bitcoin Core</source>
-        <translation>À propos de Bitcoin Core</translation>
+        <source>About %1</source>
+        <translation>A propos %1</translation>
     </message>
     <message>
         <source>Command-line options</source>
@@ -854,10 +511,6 @@ Réessayez.</translation>
         <source>Welcome</source>
         <translation>Bienvenue </translation>
     </message>
-    <message>
-        <source>Welcome to Bitcoin Core.</source>
-        <translation>Bienvenue sur Bitcoin Core.</translation>
-    </message>
     <message>
         <source>Use the default data directory</source>
         <translation>Utiliser le répertoire par défaut </translation>
@@ -866,10 +519,6 @@ Réessayez.</translation>
         <source>Use a custom data directory:</source>
         <translation>Utiliser votre propre répertoire</translation>
     </message>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Bitcoin Core</translation>
-    </message>
     <message>
         <source>Error: Specified data directory "%1" cannot be created.</source>
         <translation>Erreur: Le répertoire de données "%1" n'a pas pu être créé. </translation>
@@ -905,10 +554,6 @@ Réessayez.</translation>
         <source>Select payment request file</source>
         <translation>Sélectionner un fichier de demande de paiement</translation>
     </message>
-    <message>
-        <source>Select payment request file to open</source>
-        <translation>Sélectionnez le fichier de demande de paiement à ouvrir</translation>
-    </message>
 </context>
 <context>
     <name>OptionsDialog</name>
@@ -952,10 +597,6 @@ Réessayez.</translation>
         <source>&amp;Network</source>
         <translation>&amp;Réseau</translation>
     </message>
-    <message>
-        <source>Automatically start Bitcoin Core after logging in to the system.</source>
-        <translation>Démarrer automatiquement Bitcoin Core après s'être connecté au système. </translation>
-    </message>
     <message>
         <source>Expert</source>
         <translation>Expert</translation>
@@ -1092,45 +733,6 @@ Réessayez.</translation>
         <translation>Transactions récentes </translation>
     </message>
     </context>
-<context>
-    <name>PaymentServer</name>
-    <message>
-        <source>Invalid payment address %1</source>
-        <translation>Adresse de paiement invalide %1</translation>
-    </message>
-    <message>
-        <source>Payment request rejected</source>
-        <translation>Requête de paiement rejetée </translation>
-    </message>
-    <message>
-        <source>Payment request is not initialized.</source>
-        <translation>La demande de paiement n'a pas été initialisée.</translation>
-    </message>
-    <message>
-        <source>Payment request error</source>
-        <translation>Erreur lors de la requête de paiement</translation>
-    </message>
-    <message>
-        <source>Payment request expired.</source>
-        <translation>Demande de paiement expirée.</translation>
-    </message>
-    <message>
-        <source>Invalid payment request.</source>
-        <translation>Demande de paiement invalide.</translation>
-    </message>
-    <message>
-        <source>Refund from %1</source>
-        <translation>Remboursement de %1</translation>
-    </message>
-    <message>
-        <source>Bad response from server %1</source>
-        <translation>Mauvaise réponse du serveur %1</translation>
-    </message>
-    <message>
-        <source>Network request error</source>
-        <translation>Erreur de demande de réseau</translation>
-    </message>
-</context>
 <context>
     <name>PeerTableModel</name>
     <message>
@@ -1185,25 +787,6 @@ Réessayez.</translation>
         <translation>%1 ms</translation>
     </message>
 </context>
-<context>
-    <name>QRImageWidget</name>
-    <message>
-        <source>&amp;Save Image...</source>
-        <translation>&amp;Sauvegarder image</translation>
-    </message>
-    <message>
-        <source>&amp;Copy Image</source>
-        <translation>&amp;Copier image</translation>
-    </message>
-    <message>
-        <source>Save QR Code</source>
-        <translation>Sauvegarder QR code</translation>
-    </message>
-    <message>
-        <source>PNG Image (*.png)</source>
-        <translation>Image PNG (*.png)</translation>
-    </message>
-</context>
 <context>
     <name>RPCConsole</name>
     <message>
@@ -1366,10 +949,6 @@ Réessayez.</translation>
         <source>Out:</source>
         <translation>Sortie:</translation>
     </message>
-    <message>
-        <source>Build date</source>
-        <translation>Date de création</translation>
-    </message>
     <message>
         <source>Debug log file</source>
         <translation>Fichier du journal de débogage</translation>
@@ -1469,18 +1048,6 @@ Réessayez.</translation>
         <source>Remove</source>
         <translation>Retirer</translation>
     </message>
-    <message>
-        <source>Copy label</source>
-        <translation>Copier l'étiquette</translation>
-    </message>
-    <message>
-        <source>Copy message</source>
-        <translation>Copier message</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>Copier le montant</translation>
-    </message>
 </context>
 <context>
     <name>ReceiveRequestDialog</name>
@@ -1500,87 +1067,28 @@ Réessayez.</translation>
         <source>&amp;Save Image...</source>
         <translation>&amp;Sauvegarder image</translation>
     </message>
+</context>
+<context>
+    <name>SendCoinsDialog</name>
     <message>
-        <source>Request payment to %1</source>
-        <translation>Demande de paiement à %1</translation>
+        <source>Send Coins</source>
+        <translation>Envoyer des pièces</translation>
     </message>
     <message>
-        <source>Payment information</source>
-        <translation>Informations de paiement</translation>
+        <source>Inputs...</source>
+        <translation>Sorties...</translation>
     </message>
     <message>
-        <source>URI</source>
-        <translation>URI</translation>
+        <source>automatically selected</source>
+        <translation>Automatiquement sélectionné </translation>
     </message>
     <message>
-        <source>Address</source>
-        <translation>Adresse</translation>
+        <source>Insufficient funds!</source>
+        <translation>Fonds insuffisants</translation>
     </message>
     <message>
-        <source>Amount</source>
-        <translation>Montant</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Étiquette</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>Message</translation>
-    </message>
-    </context>
-<context>
-    <name>RecentRequestsTableModel</name>
-    <message>
-        <source>Date</source>
-        <translation>Date</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Étiquette</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>Message</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>Montant</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(aucune étiquette)</translation>
-    </message>
-    <message>
-        <source>(no message)</source>
-        <translation>(pas de message)</translation>
-    </message>
-    <message>
-        <source>(no amount)</source>
-        <translation>(pas de montant)</translation>
-    </message>
-</context>
-<context>
-    <name>SendCoinsDialog</name>
-    <message>
-        <source>Send Coins</source>
-        <translation>Envoyer des pièces</translation>
-    </message>
-    <message>
-        <source>Inputs...</source>
-        <translation>Sorties...</translation>
-    </message>
-    <message>
-        <source>automatically selected</source>
-        <translation>Automatiquement sélectionné </translation>
-    </message>
-    <message>
-        <source>Insufficient funds!</source>
-        <translation>Fonds insuffisants</translation>
-    </message>
-    <message>
-        <source>Quantity:</source>
-        <translation>Quantité:</translation>
+        <source>Quantity:</source>
+        <translation>Quantité:</translation>
     </message>
     <message>
         <source>Bytes:</source>
@@ -1666,91 +1174,7 @@ Réessayez.</translation>
         <source>Confirm the send action</source>
         <translation>Confirmer l'action d'envoi</translation>
     </message>
-    <message>
-        <source>Confirm send coins</source>
-        <translation>Confirmer l'envoi des pièces</translation>
-    </message>
-    <message>
-        <source>%1 to %2</source>
-        <translation>%1 à %2</translation>
-    </message>
-    <message>
-        <source>Copy quantity</source>
-        <translation>Copier la quantité</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>Copier le montant</translation>
-    </message>
-    <message>
-        <source>Copy fee</source>
-        <translation>Copier les frais</translation>
-    </message>
-    <message>
-        <source>Copy after fee</source>
-        <translation>Copier après les frais</translation>
-    </message>
-    <message>
-        <source>Copy bytes</source>
-        <translation>Copier les octets</translation>
-    </message>
-    <message>
-        <source>Copy priority</source>
-        <translation>Copier la priorité </translation>
-    </message>
-    <message>
-        <source>Copy change</source>
-        <translation>Copier changement </translation>
-    </message>
-    <message>
-        <source>Total Amount %1</source>
-        <translation>Montant Total %1</translation>
-    </message>
-    <message>
-        <source>or</source>
-        <translation>ou</translation>
-    </message>
-    <message>
-        <source>The amount to pay must be larger than 0.</source>
-        <translation>Le montant à payer doit être supérieur à 0.</translation>
-    </message>
-    <message>
-        <source>The amount exceeds your balance.</source>
-        <translation>Le montant excède votre balance. </translation>
-    </message>
-    <message>
-        <source>Transaction creation failed!</source>
-        <translation>Échec de la création de la transaction  </translation>
-    </message>
-    <message>
-        <source>Payment request expired.</source>
-        <translation>Demande de paiement expirée. </translation>
-    </message>
-    <message>
-        <source>Pay only the required fee of %1</source>
-        <translation>Payer seulement les frais obligatoire de %1</translation>
-    </message>
-    <message>
-        <source>Warning: Invalid Bitcoin address</source>
-        <translation>Attention: Adresse Bitcoin Invalide</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(aucune étiquette)</translation>
-    </message>
-    <message>
-        <source>Copy dust</source>
-        <translation>Copier la poussière </translation>
-    </message>
-    <message>
-        <source>Are you sure you want to send?</source>
-        <translation>Êtes-vous sûr de vouloir envoyer ?</translation>
-    </message>
-    <message>
-        <source>added as transaction fee</source>
-        <translation>Ajoute en tant que frais de transaction</translation>
-    </message>
-</context>
+    </context>
 <context>
     <name>SendCoinsEntry</name>
     <message>
@@ -1761,10 +1185,6 @@ Réessayez.</translation>
         <source>Pay &amp;To:</source>
         <translation>Payer &amp;à :</translation>
     </message>
-    <message>
-        <source>Enter a label for this address to add it to your address book</source>
-        <translation>Entrez une étiquette pour cette adresse afin de l'ajouter à votre carnet d'adresses</translation>
-    </message>
     <message>
         <source>&amp;Label:</source>
         <translation>&amp;Étiquette :</translation>
@@ -1859,41 +1279,9 @@ Réessayez.</translation>
         <source>Verify &amp;Message</source>
         <translation>Vérifier &amp;Message</translation>
     </message>
-    <message>
-        <source>The entered address is invalid.</source>
-        <translation>L'adresse entrée est invalide. </translation>
-    </message>
-    <message>
-        <source>Please check the address and try again.</source>
-        <translation>Vérifiez l'adresse et réessayer. </translation>
-    </message>
-    <message>
-        <source>Message signed.</source>
-        <translation>Message signé. </translation>
-    </message>
-    <message>
-        <source>Please check the signature and try again.</source>
-        <translation>Vérifiez la signature et réessayer.</translation>
-    </message>
-    <message>
-        <source>Message verification failed.</source>
-        <translation>Vérification du message échouée.</translation>
-    </message>
-    <message>
-        <source>Message verified.</source>
-        <translation>Message vérifié. </translation>
-    </message>
-</context>
+    </context>
 <context>
     <name>SplashScreen</name>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Bitcoin Core</translation>
-    </message>
-    <message>
-        <source>The Bitcoin Core developers</source>
-        <translation>Les développeurs de Bitcoin Core</translation>
-    </message>
     <message>
         <source>[testnet]</source>
         <translation>[testnet]</translation>
@@ -1906,410 +1294,16 @@ Réessayez.</translation>
         <translation>KO/s</translation>
     </message>
 </context>
-<context>
-    <name>TransactionDesc</name>
-    <message>
-        <source>Open until %1</source>
-        <translation>Ouvert jusqu'à %1</translation>
-    </message>
-    <message>
-        <source>%1/unconfirmed</source>
-        <translation>%1/non confirmée</translation>
-    </message>
-    <message>
-        <source>%1 confirmations</source>
-        <translation>%1 confirmations</translation>
-    </message>
-    <message>
-        <source>Status</source>
-        <translation>État</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation>Date</translation>
-    </message>
-    <message>
-        <source>Source</source>
-        <translation>Source</translation>
-    </message>
-    <message>
-        <source>Generated</source>
-        <translation>Généré</translation>
-    </message>
-    <message>
-        <source>From</source>
-        <translation>De</translation>
-    </message>
-    <message>
-        <source>To</source>
-        <translation>Á</translation>
-    </message>
-    <message>
-        <source>own address</source>
-        <translation>Votre adresse</translation>
-    </message>
-    <message>
-        <source>watch-only</source>
-        <translation>Lecture uniquement</translation>
-    </message>
-    <message>
-        <source>label</source>
-        <translation>Étiquette </translation>
-    </message>
-    <message>
-        <source>Credit</source>
-        <translation>Crédit</translation>
-    </message>
-    <message>
-        <source>not accepted</source>
-        <translation>Pas accepté</translation>
-    </message>
-    <message>
-        <source>Debit</source>
-        <translation>Débit</translation>
-    </message>
-    <message>
-        <source>Total debit</source>
-        <translation>Débit total</translation>
-    </message>
-    <message>
-        <source>Total credit</source>
-        <translation>Crédit total </translation>
-    </message>
-    <message>
-        <source>Transaction fee</source>
-        <translation>Frais de transaction</translation>
-    </message>
-    <message>
-        <source>Net amount</source>
-        <translation>Montant net</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>Message</translation>
-    </message>
-    <message>
-        <source>Comment</source>
-        <translation>Commentaire </translation>
-    </message>
-    <message>
-        <source>Transaction ID</source>
-        <translation>ID de transaction</translation>
-    </message>
-    <message>
-        <source>Merchant</source>
-        <translation>Marchant</translation>
-    </message>
-    <message>
-        <source>Debug information</source>
-        <translation>Information de débogage </translation>
-    </message>
-    <message>
-        <source>Transaction</source>
-        <translation>Transaction</translation>
-    </message>
-    <message>
-        <source>Inputs</source>
-        <translation>Entrées </translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>Montant</translation>
-    </message>
-    <message>
-        <source>true</source>
-        <translation>vrai</translation>
-    </message>
-    <message>
-        <source>false</source>
-        <translation>faux</translation>
-    </message>
-    <message>
-        <source>, has not been successfully broadcast yet</source>
-        <translation>, n'a pas encore été diffusée avec succès</translation>
-    </message>
-    <message numerus="yes">
-        <source>Open for %n more block(s)</source>
-        <translation><numerusform>Ouvert pour %n bloc de plus</numerusform><numerusform>Ouvert pour %n blocs de plus</numerusform></translation>
-    </message>
-    <message>
-        <source>unknown</source>
-        <translation>inconnue</translation>
-    </message>
-</context>
 <context>
     <name>TransactionDescDialog</name>
-    <message>
-        <source>Transaction details</source>
-        <translation>Détails de la transaction</translation>
-    </message>
     <message>
         <source>This pane shows a detailed description of the transaction</source>
         <translation>Ce panneau affiche une description détaillée de la transaction</translation>
     </message>
 </context>
-<context>
-    <name>TransactionTableModel</name>
-    <message>
-        <source>Date</source>
-        <translation>Date</translation>
-    </message>
-    <message>
-        <source>Type</source>
-        <translation>Type</translation>
-    </message>
-    <message numerus="yes">
-        <source>Open for %n more block(s)</source>
-        <translation><numerusform>Ouvert pour %n bloc de plus</numerusform><numerusform>Ouvert pour %n blocs de plus</numerusform></translation>
-    </message>
-    <message>
-        <source>Open until %1</source>
-        <translation>Ouvert jusqu'à %1</translation>
-    </message>
-    <message>
-        <source>Confirmed (%1 confirmations)</source>
-        <translation>Confirmée (%1 confirmations)</translation>
-    </message>
-    <message>
-        <source>This block was not received by any other nodes and will probably not be accepted!</source>
-        <translation>Ce bloc n'a été reçu par aucun autre nœud et ne sera probablement pas accepté !</translation>
-    </message>
-    <message>
-        <source>Generated but not accepted</source>
-        <translation>Généré mais pas accepté</translation>
-    </message>
-    <message>
-        <source>Offline</source>
-        <translation>Hors ligne</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Étiquette</translation>
-    </message>
-    <message>
-        <source>Unconfirmed</source>
-        <translation>Non Confirmé</translation>
-    </message>
-    <message>
-        <source>Received with</source>
-        <translation>Reçues avec</translation>
-    </message>
-    <message>
-        <source>Received from</source>
-        <translation>Reçue de</translation>
-    </message>
-    <message>
-        <source>Sent to</source>
-        <translation>Envoyées à</translation>
-    </message>
-    <message>
-        <source>Payment to yourself</source>
-        <translation>Paiement à vous-même</translation>
-    </message>
-    <message>
-        <source>Mined</source>
-        <translation>Extraction</translation>
-    </message>
-    <message>
-        <source>watch-only</source>
-        <translation>Lecture uniquement</translation>
-    </message>
-    <message>
-        <source>(n/a)</source>
-        <translation>(indisponible)</translation>
-    </message>
-    <message>
-        <source>Transaction status. Hover over this field to show number of confirmations.</source>
-        <translation>État de la transaction. Laissez le pointeur de la souris sur ce champ pour voir le nombre de confirmations.</translation>
-    </message>
-    <message>
-        <source>Date and time that the transaction was received.</source>
-        <translation>Date et heure de réception de la transaction.</translation>
-    </message>
-    <message>
-        <source>Type of transaction.</source>
-        <translation>Type de transaction.</translation>
-    </message>
-    <message>
-        <source>Amount removed from or added to balance.</source>
-        <translation>Montant ajouté au ou enlevé du solde.</translation>
-    </message>
-</context>
-<context>
-    <name>TransactionView</name>
-    <message>
-        <source>All</source>
-        <translation>Toutes</translation>
-    </message>
-    <message>
-        <source>Today</source>
-        <translation>Aujourd'hui</translation>
-    </message>
-    <message>
-        <source>This week</source>
-        <translation>Cette semaine</translation>
-    </message>
-    <message>
-        <source>This month</source>
-        <translation>Ce mois</translation>
-    </message>
-    <message>
-        <source>Last month</source>
-        <translation>Mois dernier</translation>
-    </message>
-    <message>
-        <source>This year</source>
-        <translation>Cette année</translation>
-    </message>
-    <message>
-        <source>Range...</source>
-        <translation>Intervalle...</translation>
-    </message>
-    <message>
-        <source>Received with</source>
-        <translation>Reçues avec</translation>
-    </message>
-    <message>
-        <source>Sent to</source>
-        <translation>Envoyées à</translation>
-    </message>
-    <message>
-        <source>To yourself</source>
-        <translation>À vous-même</translation>
-    </message>
-    <message>
-        <source>Mined</source>
-        <translation>Extraction</translation>
-    </message>
-    <message>
-        <source>Other</source>
-        <translation>Autres</translation>
-    </message>
-    <message>
-        <source>Enter address or label to search</source>
-        <translation>Entrez une adresse ou une étiquette à rechercher</translation>
-    </message>
-    <message>
-        <source>Min amount</source>
-        <translation>Montant min</translation>
-    </message>
-    <message>
-        <source>Copy address</source>
-        <translation>Copier l'adresse</translation>
-    </message>
-    <message>
-        <source>Copy label</source>
-        <translation>Copier l'étiquette</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>Copier le montant</translation>
-    </message>
-    <message>
-        <source>Copy transaction ID</source>
-        <translation>Copie ID transaction</translation>
-    </message>
-    <message>
-        <source>Edit label</source>
-        <translation>Éditer l'étiquette</translation>
-    </message>
-    <message>
-        <source>Show transaction details</source>
-        <translation>Afficher les détails de la transaction</translation>
-    </message>
-    <message>
-        <source>Export Transaction History</source>
-        <translation>Exporter l'historique des transactions</translation>
-    </message>
-    <message>
-        <source>Exporting Failed</source>
-        <translation>Échec de l'export</translation>
-    </message>
-    <message>
-        <source>Exporting Successful</source>
-        <translation>Export réalisé avec sucés </translation>
-    </message>
-    <message>
-        <source>Comma separated file (*.csv)</source>
-        <translation>Valeurs séparées par des virgules (*.csv)</translation>
-    </message>
-    <message>
-        <source>Confirmed</source>
-        <translation>Confirmée</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation>Date</translation>
-    </message>
-    <message>
-        <source>Type</source>
-        <translation>Type</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Étiquette</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>Adresse</translation>
-    </message>
-    <message>
-        <source>ID</source>
-        <translation>ID</translation>
-    </message>
-    <message>
-        <source>Range:</source>
-        <translation>Intervalle :</translation>
-    </message>
-    <message>
-        <source>to</source>
-        <translation>à</translation>
-    </message>
-</context>
 <context>
     <name>UnitDisplayStatusBarControl</name>
     </context>
-<context>
-    <name>WalletFrame</name>
-    <message>
-        <source>No wallet has been loaded.</source>
-        <translation>Aucun portefeuille a été chargé.</translation>
-    </message>
-</context>
-<context>
-    <name>WalletModel</name>
-    <message>
-        <source>Send Coins</source>
-        <translation>Envoyer des pièces</translation>
-    </message>
-</context>
-<context>
-    <name>WalletView</name>
-    <message>
-        <source>&amp;Export</source>
-        <translation>&amp;Exporter...</translation>
-    </message>
-    <message>
-        <source>Export the data in the current tab to a file</source>
-        <translation>Exporter les données de l'onglet courant vers un fichier</translation>
-    </message>
-    <message>
-        <source>Backup Wallet</source>
-        <translation>Sauvegarder le porte-monnaie</translation>
-    </message>
-    <message>
-        <source>Wallet Data (*.dat)</source>
-        <translation>Données de porte-monnaie (*.dat)</translation>
-    </message>
-    <message>
-        <source>Backup Failed</source>
-        <translation>La sauvegarde a échoué</translation>
-    </message>
-    <message>
-        <source>Backup Successful</source>
-        <translation>Sauvegarde réussie</translation>
-    </message>
-</context>
 <context>
     <name>bitcoin-core</name>
     <message>
@@ -2332,6 +1326,10 @@ Réessayez.</translation>
         <source>Run in the background as a daemon and accept commands</source>
         <translation>Fonctionner en arrière-plan en tant que démon et accepter les commandes</translation>
     </message>
+    <message>
+        <source>Bitcoin Core</source>
+        <translation>Bitcoin Core</translation>
+    </message>
     <message>
         <source>&lt;category&gt; can be:</source>
         <translation>&lt;category&gt; peut être:</translation>
@@ -2425,30 +1423,14 @@ Importation ...</translation>
         <source>Password for JSON-RPC connections</source>
         <translation>Mot de passe pour les connexions JSON-RPC</translation>
     </message>
-    <message>
-        <source>This help message</source>
-        <translation>Ce message d'aide</translation>
-    </message>
     <message>
         <source>Loading addresses...</source>
         <translation>Chargement des adresses...</translation>
     </message>
-    <message>
-        <source>Error loading wallet.dat: Wallet corrupted</source>
-        <translation>Erreur lors du chargement de wallet.dat : porte-monnaie corrompu</translation>
-    </message>
     <message>
         <source>(default: %s)</source>
         <translation>(défaut: %s)</translation>
     </message>
-    <message>
-        <source>Error loading wallet.dat</source>
-        <translation>Erreur lors du chargement de wallet.dat</translation>
-    </message>
-    <message>
-        <source>Generate coins (default: %u)</source>
-        <translation>Générer des pièces (défaut: %u)</translation>
-    </message>
     <message>
         <source>Invalid -proxy address: '%s'</source>
         <translation>Adresse -proxy invalide: '%s'</translation>
diff --git a/src/qt/locale/bitcoin_gl.ts b/src/qt/locale/bitcoin_gl.ts
index 50b081d20562a..f3673b6dc74f8 100644
--- a/src/qt/locale/bitcoin_gl.ts
+++ b/src/qt/locale/bitcoin_gl.ts
@@ -21,10 +21,6 @@
         <source>C&amp;lose</source>
         <translation>&amp;Pechar</translation>
     </message>
-    <message>
-        <source>&amp;Copy Address</source>
-        <translation>&amp;Copiar Dirección</translation>
-    </message>
     <message>
         <source>Delete the currently selected address from the list</source>
         <translation>Borrar a dirección actualmente seleccionada da listaxe</translation>
@@ -41,69 +37,6 @@
         <source>&amp;Delete</source>
         <translation>&amp;Borrar</translation>
     </message>
-    <message>
-        <source>Choose the address to send coins to</source>
-        <translation>Escolle a dirección á que enviar moedas</translation>
-    </message>
-    <message>
-        <source>Choose the address to receive coins with</source>
-        <translation>Escolle a dirección da que recibir moedas</translation>
-    </message>
-    <message>
-        <source>C&amp;hoose</source>
-        <translation>&amp;Escoller</translation>
-    </message>
-    <message>
-        <source>Sending addresses</source>
-        <translation>Direccións para enviar</translation>
-    </message>
-    <message>
-        <source>Receiving addresses</source>
-        <translation>Direccións para recibir</translation>
-    </message>
-    <message>
-        <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source>
-        <translation>Estas son as túas direccións Bitcoin para enviar pagos. Revisa sempre a cantidade e a dirección receptora antes de enviar moedas.</translation>
-    </message>
-    <message>
-        <source>These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source>
-        <translation>Estas son as túas direccións Bitcoin para recibir pagos. Recoméndase empregar unha nova dirección de recepción por cada transacción.</translation>
-    </message>
-    <message>
-        <source>Copy &amp;Label</source>
-        <translation>Copiar &amp;Etiqueta</translation>
-    </message>
-    <message>
-        <source>&amp;Edit</source>
-        <translation>&amp;Modificar</translation>
-    </message>
-    <message>
-        <source>Export Address List</source>
-        <translation>Exportar Lista de Direccións</translation>
-    </message>
-    <message>
-        <source>Comma separated file (*.csv)</source>
-        <translation>Arquivo separado por comas (*.csv)</translation>
-    </message>
-    <message>
-        <source>Exporting Failed</source>
-        <translation>Exportación falida</translation>
-    </message>
-    </context>
-<context>
-    <name>AddressTableModel</name>
-    <message>
-        <source>Label</source>
-        <translation>Etiqueta</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>Dirección</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(sen etiqueta)</translation>
-    </message>
 </context>
 <context>
     <name>AskPassphraseDialog</name>
@@ -123,82 +56,6 @@
         <source>Repeat new passphrase</source>
         <translation>Repite novo contrasinal</translation>
     </message>
-    <message>
-        <source>Encrypt wallet</source>
-        <translation>Encriptar moedeiro</translation>
-    </message>
-    <message>
-        <source>This operation needs your wallet passphrase to unlock the wallet.</source>
-        <translation>Esta operación precisa o contrasinal do teu moedeiro para desbloquear o moedeiro.</translation>
-    </message>
-    <message>
-        <source>Unlock wallet</source>
-        <translation>Desbloquear moedeiro</translation>
-    </message>
-    <message>
-        <source>This operation needs your wallet passphrase to decrypt the wallet.</source>
-        <translation>Esta operación precisa o contrasinal do teu moedeiro para desencriptar o moedeiro.</translation>
-    </message>
-    <message>
-        <source>Decrypt wallet</source>
-        <translation>Desencriptar moedeiro</translation>
-    </message>
-    <message>
-        <source>Change passphrase</source>
-        <translation>Cambiar contrasinal</translation>
-    </message>
-    <message>
-        <source>Confirm wallet encryption</source>
-        <translation>Confirmar encriptación de moedeiro</translation>
-    </message>
-    <message>
-        <source>Warning: If you encrypt your wallet and lose your passphrase, you will &lt;b&gt;LOSE ALL OF YOUR BITCOINS&lt;/b&gt;!</source>
-        <translation>Precaución: Se encriptas o teu moedeiro e perdes o teu contrasinal, ti &lt;b&gt;PERDERÁS TÓDOLOS TEUS BITCOINS&lt;/b&gt;!</translation>
-    </message>
-    <message>
-        <source>Are you sure you wish to encrypt your wallet?</source>
-        <translation>Estás seguro de que desexas encriptar o teu moedeiro?</translation>
-    </message>
-    <message>
-        <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source>
-        <translation>IMPORTANTE: Calquera copia de seguridade previa que fixeses do teu arquivo de moedeiro debería ser substituída polo recén xerado arquivo encriptado de moedeiro. Por razóns de seguridade, as copias de seguridade previas de un arquivo de moedeiro desencriptado tornaránse inútiles no momento no que comeces a emprega-lo novo, encriptado, moedeiro.</translation>
-    </message>
-    <message>
-        <source>Warning: The Caps Lock key is on!</source>
-        <translation>Precaución: A tecla de Bloqueo de Maiúsculas está activada!</translation>
-    </message>
-    <message>
-        <source>Wallet encrypted</source>
-        <translation>Moedeiro encriptado</translation>
-    </message>
-    <message>
-        <source>Wallet encryption failed</source>
-        <translation>Encriptación de moedeiro fallida</translation>
-    </message>
-    <message>
-        <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
-        <translation>A encriptación do moedeiro fallou por mor dun erro interno. O teu moedeiro non foi encriptado.</translation>
-    </message>
-    <message>
-        <source>The supplied passphrases do not match.</source>
-        <translation>Os contrasinais suministrados non coinciden.</translation>
-    </message>
-    <message>
-        <source>Wallet unlock failed</source>
-        <translation>Desbloqueo de moedeiro fallido</translation>
-    </message>
-    <message>
-        <source>The passphrase entered for the wallet decryption was incorrect.</source>
-        <translation>O contrasinal introducido para a desencriptación do moedeiro foi incorrecto.</translation>
-    </message>
-    <message>
-        <source>Wallet decryption failed</source>
-        <translation>Desencriptación de moedeiro fallida</translation>
-    </message>
-    <message>
-        <source>Wallet passphrase was successfully changed.</source>
-        <translation>Cambiouse con éxito o contrasinal do moedeiro.</translation>
-    </message>
 </context>
 <context>
     <name>BanTableModel</name>
@@ -265,10 +122,6 @@
         <source>&amp;Receiving addresses...</source>
         <translation>Direccións para recibir</translation>
     </message>
-    <message>
-        <source>Importing blocks from disk...</source>
-        <translation>Importando bloques de disco...</translation>
-    </message>
     <message>
         <source>Reindexing blocks on disk...</source>
         <translation>Reindexando bloques no disco...</translation>
@@ -349,18 +202,10 @@
         <source>Tabs toolbar</source>
         <translation>Barra de ferramentas</translation>
     </message>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Core de Bitcoin</translation>
-    </message>
     <message>
         <source>Request payments (generates QR codes and bitcoin: URIs)</source>
         <translation>Solicitar pagos (xenera códigos QR e bitcoin: URIs)</translation>
     </message>
-    <message>
-        <source>&amp;About Bitcoin Core</source>
-        <translation>&amp;Sobre Bitcoin Core</translation>
-    </message>
     <message>
         <source>Show the list of used sending addresses and labels</source>
         <translation>Amosar a listaxe de direccións e etiquetas para enviar empregadas</translation>
@@ -430,13 +275,6 @@
         <translation>O moedeiro está &lt;b&gt;encriptado&lt;/b&gt; e actualmente &lt;b&gt;bloqueado&lt;/b&gt;</translation>
     </message>
 </context>
-<context>
-    <name>ClientModel</name>
-    <message>
-        <source>Network Alert</source>
-        <translation>Alerta de Rede</translation>
-    </message>
-</context>
 <context>
     <name>CoinControlDialog</name>
     <message>
@@ -495,110 +333,6 @@
         <source>Priority</source>
         <translation>Prioridade</translation>
     </message>
-    <message>
-        <source>Copy address</source>
-        <translation>Copiar dirección</translation>
-    </message>
-    <message>
-        <source>Copy label</source>
-        <translation>Copiar etiqueta</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>Copiar cantidade</translation>
-    </message>
-    <message>
-        <source>Copy transaction ID</source>
-        <translation>Copiar ID de transacción</translation>
-    </message>
-    <message>
-        <source>Lock unspent</source>
-        <translation>Bloquear o aforrado</translation>
-    </message>
-    <message>
-        <source>Unlock unspent</source>
-        <translation>Desbloquear o aforrado</translation>
-    </message>
-    <message>
-        <source>Copy quantity</source>
-        <translation>Copiar cantidade</translation>
-    </message>
-    <message>
-        <source>Copy fee</source>
-        <translation>Copiar pago</translation>
-    </message>
-    <message>
-        <source>Copy after fee</source>
-        <translation>Copiar despóis do pago</translation>
-    </message>
-    <message>
-        <source>Copy bytes</source>
-        <translation>Copiar bytes</translation>
-    </message>
-    <message>
-        <source>Copy priority</source>
-        <translation>Copiar prioridade</translation>
-    </message>
-    <message>
-        <source>Copy change</source>
-        <translation>Copiar cambio</translation>
-    </message>
-    <message>
-        <source>highest</source>
-        <translation>O máis alto</translation>
-    </message>
-    <message>
-        <source>higher</source>
-        <translation>Máis alto que</translation>
-    </message>
-    <message>
-        <source>high</source>
-        <translation>alto</translation>
-    </message>
-    <message>
-        <source>medium-high</source>
-        <translation>medio-alto</translation>
-    </message>
-    <message>
-        <source>low-medium</source>
-        <translation>medio-baixo</translation>
-    </message>
-    <message>
-        <source>low</source>
-        <translation>baixo</translation>
-    </message>
-    <message>
-        <source>lower</source>
-        <translation>máis baixo que</translation>
-    </message>
-    <message>
-        <source>lowest</source>
-        <translation>o máis baixo</translation>
-    </message>
-    <message>
-        <source>(%1 locked)</source>
-        <translation>(%1 bloqueado)</translation>
-    </message>
-    <message>
-        <source>yes</source>
-        <translation>Si</translation>
-    </message>
-    <message>
-        <source>no</source>
-        <translation>non</translation>
-    </message>
-    <message>
-        <source>Transactions with higher priority are more likely to get included into a block.</source>
-        <translation>As transacción con maior prioridade teñen máis posibilidades de ser incluidas nun bloque</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(sen etiqueta)</translation>
-    </message>
-    <message>
-        <source>(change)</source>
-        <translation>(cambio)</translation>
-    </message>
 </context>
 <context>
     <name>EditAddressDialog</name>
@@ -622,38 +356,6 @@
         <source>&amp;Address</source>
         <translation>&amp;Dirección</translation>
     </message>
-    <message>
-        <source>New receiving address</source>
-        <translation>Nova dirección para recibir</translation>
-    </message>
-    <message>
-        <source>New sending address</source>
-        <translation>Nova dirección para enviar</translation>
-    </message>
-    <message>
-        <source>Edit receiving address</source>
-        <translation>Modificar dirección para recibir</translation>
-    </message>
-    <message>
-        <source>Edit sending address</source>
-        <translation>Modificar dirección para enviar</translation>
-    </message>
-    <message>
-        <source>The entered address "%1" is already in the address book.</source>
-        <translation>A dirección introducida "%1" xa está no libro de direccións.</translation>
-    </message>
-    <message>
-        <source>The entered address "%1" is not a valid Bitcoin address.</source>
-        <translation>A dirección introducida '%1' non é unha dirección Bitcoin válida.</translation>
-    </message>
-    <message>
-        <source>Could not unlock wallet.</source>
-        <translation>Non se puido desbloquear o moedeiro.</translation>
-    </message>
-    <message>
-        <source>New key generation failed.</source>
-        <translation>A xeración de nova clave fallou.</translation>
-    </message>
 </context>
 <context>
     <name>FreespaceChecker</name>
@@ -680,18 +382,10 @@
 </context>
 <context>
     <name>HelpMessageDialog</name>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Core de Bitcoin</translation>
-    </message>
     <message>
         <source>version</source>
         <translation>versión</translation>
     </message>
-    <message>
-        <source>About Bitcoin Core</source>
-        <translation>Sobre Bitcoin core</translation>
-    </message>
     <message>
         <source>Command-line options</source>
         <translation>Opcións da liña de comandos</translation>
@@ -719,10 +413,6 @@
         <source>Use a custom data directory:</source>
         <translation>Empregar un directorio de datos personalizado</translation>
     </message>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Core de Bitcoin</translation>
-    </message>
     <message>
         <source>Error</source>
         <translation>Erro</translation>
@@ -746,10 +436,6 @@
         <source>Select payment request file</source>
         <translation>Seleccionar ficheiro de solicitude de pago</translation>
     </message>
-    <message>
-        <source>Select payment request file to open</source>
-        <translation>Seleccione ficheiro de solicitude de pago para abrir</translation>
-    </message>
 </context>
 <context>
     <name>OptionsDialog</name>
@@ -885,45 +571,6 @@
         <translation>O teu balance actual total</translation>
     </message>
     </context>
-<context>
-    <name>PaymentServer</name>
-    <message>
-        <source>URI handling</source>
-        <translation>Manexo de URI</translation>
-    </message>
-    <message>
-        <source>Invalid payment address %1</source>
-        <translation>Dirección de pago %1 inválida</translation>
-    </message>
-    <message>
-        <source>Requested payment amount of %1 is too small (considered dust).</source>
-        <translation>A cantidade de %1 na solicitude de pado é moi pequena (considerada po).</translation>
-    </message>
-    <message>
-        <source>Payment request error</source>
-        <translation>Erro na petición de pago</translation>
-    </message>
-    <message>
-        <source>Refund from %1</source>
-        <translation>Devolución dende %1</translation>
-    </message>
-    <message>
-        <source>Error communicating with %1: %2</source>
-        <translation>Erro comunicando con %1: %2</translation>
-    </message>
-    <message>
-        <source>Bad response from server %1</source>
-        <translation>Responsa errónea do servidor %1</translation>
-    </message>
-    <message>
-        <source>Payment acknowledged</source>
-        <translation>Pago admitido</translation>
-    </message>
-    <message>
-        <source>Network request error</source>
-        <translation>Erro de solicitude de rede</translation>
-    </message>
-</context>
 <context>
     <name>PeerTableModel</name>
     </context>
@@ -946,21 +593,6 @@
         <translation>N/A</translation>
     </message>
     </context>
-<context>
-    <name>QRImageWidget</name>
-    <message>
-        <source>&amp;Save Image...</source>
-        <translation>&amp;Gardar Imaxe...</translation>
-    </message>
-    <message>
-        <source>&amp;Copy Image</source>
-        <translation>&amp;Copiar Imaxe</translation>
-    </message>
-    <message>
-        <source>Save QR Code</source>
-        <translation>Gardar Código QR</translation>
-    </message>
-    </context>
 <context>
     <name>RPCConsole</name>
     <message>
@@ -1035,10 +667,6 @@
         <source>Out:</source>
         <translation>Fóra:</translation>
     </message>
-    <message>
-        <source>Build date</source>
-        <translation>Data de construción</translation>
-    </message>
     <message>
         <source>Debug log file</source>
         <translation>Arquivo de log de depuración</translation>
@@ -1106,15 +734,7 @@
         <source>&amp;Request payment</source>
         <translation>&amp;Solicitar pago</translation>
     </message>
-    <message>
-        <source>Copy label</source>
-        <translation>Copiar etiqueta</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>Copiar cantidade</translation>
-    </message>
-</context>
+    </context>
 <context>
     <name>ReceiveRequestDialog</name>
     <message>
@@ -1133,66 +753,7 @@
         <source>&amp;Save Image...</source>
         <translation>&amp;Gardar Imaxe...</translation>
     </message>
-    <message>
-        <source>Request payment to %1</source>
-        <translation>Solicitar pago a %1</translation>
-    </message>
-    <message>
-        <source>Payment information</source>
-        <translation>Información de Pago</translation>
-    </message>
-    <message>
-        <source>URI</source>
-        <translation>URI</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>Dirección</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>Cantidade</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Etiqueta</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>Mensaxe</translation>
-    </message>
-    <message>
-        <source>Resulting URI too long, try to reduce the text for label / message.</source>
-        <translation>A URI resultante é demasiado larga, tenta reducir o texto para a etiqueta / mensaxe.</translation>
-    </message>
-    <message>
-        <source>Error encoding URI into QR Code.</source>
-        <translation>Erro codificando URI nun Código QR.</translation>
-    </message>
 </context>
-<context>
-    <name>RecentRequestsTableModel</name>
-    <message>
-        <source>Date</source>
-        <translation>Data</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Etiqueta</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>Mensaxe</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>Cantidade</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(sen etiqueta)</translation>
-    </message>
-    </context>
 <context>
     <name>SendCoinsDialog</name>
     <message>
@@ -1259,108 +820,36 @@
         <source>S&amp;end</source>
         <translation>&amp;Enviar</translation>
     </message>
+</context>
+<context>
+    <name>SendCoinsEntry</name>
     <message>
-        <source>Confirm send coins</source>
-        <translation>Confirmar envío de moedas</translation>
+        <source>A&amp;mount:</source>
+        <translation>&amp;Cantidade:</translation>
     </message>
     <message>
-        <source>%1 to %2</source>
-        <translation>%1 a %2</translation>
+        <source>Pay &amp;To:</source>
+        <translation>Pagar &amp;A:</translation>
     </message>
     <message>
-        <source>Copy quantity</source>
-        <translation>Copiar cantidade</translation>
+        <source>&amp;Label:</source>
+        <translation>&amp;Etiqueta:</translation>
     </message>
     <message>
-        <source>Copy amount</source>
-        <translation>Copiar cantidade</translation>
+        <source>Choose previously used address</source>
+        <translation>Escoller dirección previamente empregada</translation>
     </message>
     <message>
-        <source>Copy fee</source>
-        <translation>Copiar pago</translation>
+        <source>This is a normal payment.</source>
+        <translation>Este é un pago normal</translation>
     </message>
     <message>
-        <source>Copy after fee</source>
-        <translation>Copiar despóis do pago</translation>
+        <source>Alt+A</source>
+        <translation>Alt+A</translation>
     </message>
     <message>
-        <source>Copy bytes</source>
-        <translation>Copiar bytes</translation>
-    </message>
-    <message>
-        <source>Copy priority</source>
-        <translation>Copiar prioridade</translation>
-    </message>
-    <message>
-        <source>Copy change</source>
-        <translation>Copiar cambio</translation>
-    </message>
-    <message>
-        <source>The amount to pay must be larger than 0.</source>
-        <translation>A cantidade a pagar debe ser maior que 0.</translation>
-    </message>
-    <message>
-        <source>The amount exceeds your balance.</source>
-        <translation>A cantidade sobrepasa o teu balance.</translation>
-    </message>
-    <message>
-        <source>The total exceeds your balance when the %1 transaction fee is included.</source>
-        <translation>O total sobrepasa o teu balance cando se inclúe a tarifa de transacción %1.</translation>
-    </message>
-    <message>
-        <source>Warning: Invalid Bitcoin address</source>
-        <translation>Atención:  Enderezo Bitcoin non válido</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(sen etiqueta)</translation>
-    </message>
-    <message>
-        <source>Warning: Unknown change address</source>
-        <translation>Atención: Enderezo de cambio desconocido</translation>
-    </message>
-    <message>
-        <source>Are you sure you want to send?</source>
-        <translation>Seguro que queres enviar?</translation>
-    </message>
-    <message>
-        <source>added as transaction fee</source>
-        <translation>engadido como tarifa de transacción</translation>
-    </message>
-</context>
-<context>
-    <name>SendCoinsEntry</name>
-    <message>
-        <source>A&amp;mount:</source>
-        <translation>&amp;Cantidade:</translation>
-    </message>
-    <message>
-        <source>Pay &amp;To:</source>
-        <translation>Pagar &amp;A:</translation>
-    </message>
-    <message>
-        <source>Enter a label for this address to add it to your address book</source>
-        <translation>Introduce unha etiqueta para esta dirección para engadila ao teu libro de direccións</translation>
-    </message>
-    <message>
-        <source>&amp;Label:</source>
-        <translation>&amp;Etiqueta:</translation>
-    </message>
-    <message>
-        <source>Choose previously used address</source>
-        <translation>Escoller dirección previamente empregada</translation>
-    </message>
-    <message>
-        <source>This is a normal payment.</source>
-        <translation>Este é un pago normal</translation>
-    </message>
-    <message>
-        <source>Alt+A</source>
-        <translation>Alt+A</translation>
-    </message>
-    <message>
-        <source>Paste address from clipboard</source>
-        <translation>Pegar dirección dende portapapeis</translation>
+        <source>Paste address from clipboard</source>
+        <translation>Pegar dirección dende portapapeis</translation>
     </message>
     <message>
         <source>Alt+P</source>
@@ -1460,69 +949,9 @@
         <source>Reset all verify message fields</source>
         <translation>Restaurar todos os campos de verificación de mensaxe</translation>
     </message>
-    <message>
-        <source>Click "Sign Message" to generate signature</source>
-        <translation>Click en "Asinar Mensaxe" para xerar sinatura</translation>
-    </message>
-    <message>
-        <source>The entered address is invalid.</source>
-        <translation>A dirección introducida é inválida.</translation>
-    </message>
-    <message>
-        <source>Please check the address and try again.</source>
-        <translation>Por favor comproba a dirección e proba de novo.</translation>
-    </message>
-    <message>
-        <source>The entered address does not refer to a key.</source>
-        <translation>A dirección introducida non se refire a ninguna clave.</translation>
-    </message>
-    <message>
-        <source>Wallet unlock was cancelled.</source>
-        <translation>Cancelouse o desbloqueo do moedeiro.</translation>
-    </message>
-    <message>
-        <source>Private key for the entered address is not available.</source>
-        <translation>A clave privada da dirección introducida non está dispoñible.</translation>
-    </message>
-    <message>
-        <source>Message signing failed.</source>
-        <translation>Fallou a sinatura da mensaxe.</translation>
-    </message>
-    <message>
-        <source>Message signed.</source>
-        <translation>Mensaxe asinada.</translation>
-    </message>
-    <message>
-        <source>The signature could not be decoded.</source>
-        <translation>A sinatura non puido ser decodificada.</translation>
-    </message>
-    <message>
-        <source>Please check the signature and try again.</source>
-        <translation>Por favor revise a sinatura e probe de novo.</translation>
-    </message>
-    <message>
-        <source>The signature did not match the message digest.</source>
-        <translation>A sinatura non coincide co resumo da mensaxe.</translation>
-    </message>
-    <message>
-        <source>Message verification failed.</source>
-        <translation>A verificación da mensaxe fallou.</translation>
-    </message>
-    <message>
-        <source>Message verified.</source>
-        <translation>Mensaxe verificada.</translation>
-    </message>
 </context>
 <context>
     <name>SplashScreen</name>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Core de Bitcoin</translation>
-    </message>
-    <message>
-        <source>The Bitcoin Core developers</source>
-        <translation>Os desarrolladores de Bitcoin Core</translation>
-    </message>
     <message>
         <source>[testnet]</source>
         <translation>[testnet]</translation>
@@ -1535,402 +964,16 @@
         <translation>KB/s</translation>
     </message>
 </context>
-<context>
-    <name>TransactionDesc</name>
-    <message>
-        <source>Open until %1</source>
-        <translation>Aberto ata %1</translation>
-    </message>
-    <message>
-        <source>%1/offline</source>
-        <translation>%1/fóra de liña</translation>
-    </message>
-    <message>
-        <source>%1/unconfirmed</source>
-        <translation>%1/sen confirmar</translation>
-    </message>
-    <message>
-        <source>%1 confirmations</source>
-        <translation>%1 confirmacións</translation>
-    </message>
-    <message>
-        <source>Status</source>
-        <translation>Estado</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation>Data</translation>
-    </message>
-    <message>
-        <source>Source</source>
-        <translation>Orixe</translation>
-    </message>
-    <message>
-        <source>Generated</source>
-        <translation>Xerado</translation>
-    </message>
-    <message>
-        <source>From</source>
-        <translation>Dende</translation>
-    </message>
-    <message>
-        <source>To</source>
-        <translation>A</translation>
-    </message>
-    <message>
-        <source>own address</source>
-        <translation>dirección propia</translation>
-    </message>
-    <message>
-        <source>label</source>
-        <translation>etiqueta</translation>
-    </message>
-    <message>
-        <source>Credit</source>
-        <translation>Crédito</translation>
-    </message>
-    <message>
-        <source>not accepted</source>
-        <translation>non aceptado</translation>
-    </message>
-    <message>
-        <source>Debit</source>
-        <translation>Débito</translation>
-    </message>
-    <message>
-        <source>Transaction fee</source>
-        <translation>Tarifa de transacción</translation>
-    </message>
-    <message>
-        <source>Net amount</source>
-        <translation>Cantidade neta</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>Mensaxe</translation>
-    </message>
-    <message>
-        <source>Comment</source>
-        <translation>Comentario</translation>
-    </message>
-    <message>
-        <source>Transaction ID</source>
-        <translation>ID de Transacción</translation>
-    </message>
-    <message>
-        <source>Merchant</source>
-        <translation>Comerciante</translation>
-    </message>
-    <message>
-        <source>Generated coins must mature %1 blocks before they can be spent. When you generated this block, it was broadcast to the network to be added to the block chain. If it fails to get into the chain, its state will change to "not accepted" and it won't be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source>
-        <translation>As moedas xeradas deben madurar %1 bloques antes de que poidan ser gastadas. Cando xeraste este bloque, foi propagado á rede para ser engadido á cadeas de bloques. Se falla ao tentar meterse na cadea, o seu estado cambiará a "non aceptado" e non poderá ser gastado. Esto pode ocorrir ocasionalmente se outro nodo xera un bloque en poucos segundos de diferencia co teu.</translation>
-    </message>
-    <message>
-        <source>Debug information</source>
-        <translation>Información de depuración</translation>
-    </message>
-    <message>
-        <source>Transaction</source>
-        <translation>Transacción</translation>
-    </message>
-    <message>
-        <source>Inputs</source>
-        <translation>Entradas</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>Cantidade</translation>
-    </message>
-    <message>
-        <source>true</source>
-        <translation>verdadeiro</translation>
-    </message>
-    <message>
-        <source>false</source>
-        <translation>falso</translation>
-    </message>
-    <message>
-        <source>, has not been successfully broadcast yet</source>
-        <translation>, non foi propagado con éxito todavía</translation>
-    </message>
-    <message>
-        <source>unknown</source>
-        <translation>descoñecido</translation>
-    </message>
-</context>
 <context>
     <name>TransactionDescDialog</name>
-    <message>
-        <source>Transaction details</source>
-        <translation>Detalles de transacción</translation>
-    </message>
     <message>
         <source>This pane shows a detailed description of the transaction</source>
         <translation>Este panel amosa unha descripción detallada da transacción</translation>
     </message>
 </context>
-<context>
-    <name>TransactionTableModel</name>
-    <message>
-        <source>Date</source>
-        <translation>Data</translation>
-    </message>
-    <message>
-        <source>Type</source>
-        <translation>Tipo</translation>
-    </message>
-    <message>
-        <source>Open until %1</source>
-        <translation>Aberto ata %1</translation>
-    </message>
-    <message>
-        <source>Confirmed (%1 confirmations)</source>
-        <translation>Confirmado (%1 confirmacións)</translation>
-    </message>
-    <message>
-        <source>This block was not received by any other nodes and will probably not be accepted!</source>
-        <translation>Este bloque non foi recibido por ningún outro nodo e probablemente non será aceptado!</translation>
-    </message>
-    <message>
-        <source>Generated but not accepted</source>
-        <translation>Xerado pero non aceptado</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Etiqueta</translation>
-    </message>
-    <message>
-        <source>Received with</source>
-        <translation>Recibido con</translation>
-    </message>
-    <message>
-        <source>Received from</source>
-        <translation>Recibido de</translation>
-    </message>
-    <message>
-        <source>Sent to</source>
-        <translation>Enviado a</translation>
-    </message>
-    <message>
-        <source>Payment to yourself</source>
-        <translation>Pago a ti mesmo</translation>
-    </message>
-    <message>
-        <source>Mined</source>
-        <translation>Minado</translation>
-    </message>
-    <message>
-        <source>(n/a)</source>
-        <translation>(n/a)</translation>
-    </message>
-    <message>
-        <source>Transaction status. Hover over this field to show number of confirmations.</source>
-        <translation>Estado da transacción. Pasa por riba deste campo para amosar o número de confirmacións.</translation>
-    </message>
-    <message>
-        <source>Date and time that the transaction was received.</source>
-        <translation>Data e hora na que foi recibida a transacción.</translation>
-    </message>
-    <message>
-        <source>Type of transaction.</source>
-        <translation>Tipo de transacción.</translation>
-    </message>
-    <message>
-        <source>Amount removed from or added to balance.</source>
-        <translation>Cantidade borrada ou engadida no balance.</translation>
-    </message>
-</context>
-<context>
-    <name>TransactionView</name>
-    <message>
-        <source>All</source>
-        <translation>Todo</translation>
-    </message>
-    <message>
-        <source>Today</source>
-        <translation>Hoxe</translation>
-    </message>
-    <message>
-        <source>This week</source>
-        <translation>Esta semana</translation>
-    </message>
-    <message>
-        <source>This month</source>
-        <translation>Este mes</translation>
-    </message>
-    <message>
-        <source>Last month</source>
-        <translation>O último mes</translation>
-    </message>
-    <message>
-        <source>This year</source>
-        <translation>Este ano</translation>
-    </message>
-    <message>
-        <source>Range...</source>
-        <translation>Periodo...</translation>
-    </message>
-    <message>
-        <source>Received with</source>
-        <translation>Recibido con</translation>
-    </message>
-    <message>
-        <source>Sent to</source>
-        <translation>Enviado a</translation>
-    </message>
-    <message>
-        <source>To yourself</source>
-        <translation>A ti mesmo</translation>
-    </message>
-    <message>
-        <source>Mined</source>
-        <translation>Minado</translation>
-    </message>
-    <message>
-        <source>Other</source>
-        <translation>Outro</translation>
-    </message>
-    <message>
-        <source>Enter address or label to search</source>
-        <translation>Introduce dirección ou etiqueta para buscar</translation>
-    </message>
-    <message>
-        <source>Min amount</source>
-        <translation>Cantidade mínima</translation>
-    </message>
-    <message>
-        <source>Copy address</source>
-        <translation>Copiar dirección</translation>
-    </message>
-    <message>
-        <source>Copy label</source>
-        <translation>Copiar etiqueta</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>Copiar cantidade</translation>
-    </message>
-    <message>
-        <source>Copy transaction ID</source>
-        <translation>Copiar ID de transacción</translation>
-    </message>
-    <message>
-        <source>Edit label</source>
-        <translation>Modificar etiqueta</translation>
-    </message>
-    <message>
-        <source>Show transaction details</source>
-        <translation>Amosar detalles da transacción</translation>
-    </message>
-    <message>
-        <source>Export Transaction History</source>
-        <translation>Exportar Historial de Transaccións</translation>
-    </message>
-    <message>
-        <source>Exporting Failed</source>
-        <translation>Exportación falida</translation>
-    </message>
-    <message>
-        <source>There was an error trying to save the transaction history to %1.</source>
-        <translation>Houbo un erro intentando salvar o historial  de transaccións a %1.</translation>
-    </message>
-    <message>
-        <source>Exporting Successful</source>
-        <translation>Exportado correctamente</translation>
-    </message>
-    <message>
-        <source>The transaction history was successfully saved to %1.</source>
-        <translation>O historial de transaccións foi salvado correctamente en %1.</translation>
-    </message>
-    <message>
-        <source>Comma separated file (*.csv)</source>
-        <translation>Arquivo separado por comas (*.csv)</translation>
-    </message>
-    <message>
-        <source>Confirmed</source>
-        <translation>Confirmado</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation>Data</translation>
-    </message>
-    <message>
-        <source>Type</source>
-        <translation>Tipo</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Etiqueta</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>Dirección</translation>
-    </message>
-    <message>
-        <source>ID</source>
-        <translation>ID</translation>
-    </message>
-    <message>
-        <source>Range:</source>
-        <translation>Periodo:</translation>
-    </message>
-    <message>
-        <source>to</source>
-        <translation>a</translation>
-    </message>
-</context>
 <context>
     <name>UnitDisplayStatusBarControl</name>
     </context>
-<context>
-    <name>WalletFrame</name>
-    <message>
-        <source>No wallet has been loaded.</source>
-        <translation>Ningún moedeiro cargado</translation>
-    </message>
-</context>
-<context>
-    <name>WalletModel</name>
-    <message>
-        <source>Send Coins</source>
-        <translation>Moedas Enviadas</translation>
-    </message>
-</context>
-<context>
-    <name>WalletView</name>
-    <message>
-        <source>&amp;Export</source>
-        <translation>&amp;Exportar</translation>
-    </message>
-    <message>
-        <source>Export the data in the current tab to a file</source>
-        <translation>Exportar os datos da pestaña actual a un arquivo.</translation>
-    </message>
-    <message>
-        <source>Backup Wallet</source>
-        <translation>Copia de Seguridade de Moedeiro</translation>
-    </message>
-    <message>
-        <source>Wallet Data (*.dat)</source>
-        <translation>Datos de Moedeiro (*.dat)</translation>
-    </message>
-    <message>
-        <source>Backup Failed</source>
-        <translation>Copia de Seguridade Fallida</translation>
-    </message>
-    <message>
-        <source>There was an error trying to save the wallet data to %1.</source>
-        <translation>Houbo un erro intentando gardar os datos de moedeiro en %1.</translation>
-    </message>
-    <message>
-        <source>The wallet data was successfully saved to %1.</source>
-        <translation>Os datos do moedeiro foron gardados correctamente en %1.</translation>
-    </message>
-    <message>
-        <source>Backup Successful</source>
-        <translation>Copia de Seguridade Correcta</translation>
-    </message>
-</context>
 <context>
     <name>bitcoin-core</name>
     <message>
@@ -1961,6 +1004,10 @@
         <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
         <translation>Aceptar conexións de fóra (por defecto: 1 se non -proxy ou -connect)</translation>
     </message>
+    <message>
+        <source>Bitcoin Core</source>
+        <translation>Core de Bitcoin</translation>
+    </message>
     <message>
         <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source>
         <translation>Enlazar a unha dirección dada e escoitar sempre nela. Emprega a notación [host]:post para IPv6</translation>
@@ -1981,10 +1028,6 @@
         <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source>
         <translation>Precaución: Non parece que esteamos totalmente de acordo cos nosos pares! Pode que precises actualizar, ou outros nodos poden precisar actualizarse.</translation>
     </message>
-    <message>
-        <source>Warning: wallet.dat corrupt, data salvaged! Original wallet.dat saved as wallet.{timestamp}.bak in %s; if your balance or transactions are incorrect you should restore from a backup.</source>
-        <translation>Precaución: wallet.dat corrupto, datos salvagardados! O wallet.dat orixinal foi gardado como wallet.{timestamp}.bak en %s; se o teu balance ou transaccións son incorrectas deberías restauralas dende unha copia de seguridade.</translation>
-    </message>
     <message>
         <source>&lt;category&gt; can be:</source>
         <translation>&lt;categoría&gt; pode ser:</translation>
@@ -2057,34 +1100,14 @@
         <source>Wallet %s resides outside data directory %s</source>
         <translation>O moedeiro %s reside fóra do directorio de datos %s</translation>
     </message>
-    <message>
-        <source>You need to rebuild the database using -reindex to change -txindex</source>
-        <translation>Precisas reconstruír a base de datos empregando -reindex para cambiar -txindex</translation>
-    </message>
     <message>
         <source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source>
         <translation>Executar comando cando se recibe unha alerta relevante ou vemos un fork realmente longo (%s no cmd é substituído pola mensaxe)</translation>
     </message>
-    <message>
-        <source>Cannot resolve -whitebind address: '%s'</source>
-        <translation>Non se pode resolver dirección -whitebind: '%s'</translation>
-    </message>
     <message>
         <source>Information</source>
         <translation>Información</translation>
     </message>
-    <message>
-        <source>Invalid amount for -maxtxfee=&lt;amount&gt;: '%s'</source>
-        <translation>Cantidade inválida para -maxtxfee=&lt;cantidade&gt;: '%s'</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -minrelaytxfee=&lt;amount&gt;: '%s'</source>
-        <translation>Cantidade inválida para -minrelaytxfee=&lt;cantidade&gt;: '%s'</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -mintxfee=&lt;amount&gt;: '%s'</source>
-        <translation>Cantidade inválida para -mintxfee=&lt;cantidade&gt;: '%s'</translation>
-    </message>
     <message>
         <source>Send trace/debug info to console instead of debug.log file</source>
         <translation>Enviar traza/información de depuración á consola en lugar de ao arquivo debug.log</translation>
@@ -2117,10 +1140,6 @@
         <source>Warning</source>
         <translation>Precaución</translation>
     </message>
-    <message>
-        <source>wallet.dat corrupt, salvage failed</source>
-        <translation>wallet.dat corrupto, fallou o gardado</translation>
-    </message>
     <message>
         <source>Password for JSON-RPC connections</source>
         <translation>Contrasinal para conexións JSON-RPC</translation>
@@ -2129,10 +1148,6 @@
         <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
         <translation>Executar comando cando o mellor bloque cambie (%s no comando é sustituído polo hash do bloque)</translation>
     </message>
-    <message>
-        <source>This help message</source>
-        <translation>Esta mensaxe de axuda</translation>
-    </message>
     <message>
         <source>Allow DNS lookups for -addnode, -seednode and -connect</source>
         <translation>Permitir lookup de DNS para -addnote, -seednote e -connect</translation>
@@ -2141,14 +1156,6 @@
         <source>Loading addresses...</source>
         <translation>Cargando direccións...</translation>
     </message>
-    <message>
-        <source>Error loading wallet.dat: Wallet corrupted</source>
-        <translation>Erro cargando wallet.dat: Moedeiro corrupto</translation>
-    </message>
-    <message>
-        <source>Error loading wallet.dat</source>
-        <translation>Erro cargando wallet.dat</translation>
-    </message>
     <message>
         <source>Invalid -proxy address: '%s'</source>
         <translation>Dirección -proxy inválida: '%s'</translation>
@@ -2157,18 +1164,6 @@
         <source>Unknown network specified in -onlynet: '%s'</source>
         <translation>Rede descoñecida especificada en -onlynet: '%s'</translation>
     </message>
-    <message>
-        <source>Cannot resolve -bind address: '%s'</source>
-        <translation>Non se pode resolver a dirección -bind: '%s'</translation>
-    </message>
-    <message>
-        <source>Cannot resolve -externalip address: '%s'</source>
-        <translation>Non se pode resolver dirección -externalip: '%s'</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -paytxfee=&lt;amount&gt;: '%s'</source>
-        <translation>Cantidade inválida para -paytxfee=&lt;cantidade&gt;: '%s'</translation>
-    </message>
     <message>
         <source>Insufficient funds</source>
         <translation>Fondos insuficientes</translation>
diff --git a/src/qt/locale/bitcoin_he.ts b/src/qt/locale/bitcoin_he.ts
index d937e211b0f1a..fbe16364eb82a 100644
--- a/src/qt/locale/bitcoin_he.ts
+++ b/src/qt/locale/bitcoin_he.ts
@@ -3,7 +3,7 @@
     <name>AddressBookPage</name>
     <message>
         <source>Right-click to edit address or label</source>
-        <translation>לחץ משק ימני כדי לערוך כתובת או חברה</translation>
+        <translation>לחץ מקש ימני כדי לערוך כתובת או תווית</translation>
     </message>
     <message>
         <source>Create a new address</source>
@@ -11,7 +11,7 @@
     </message>
     <message>
         <source>&amp;New</source>
-        <translation>&amp;חדשה</translation>
+        <translation>&amp;חדש</translation>
     </message>
     <message>
         <source>Copy the currently selected address to the system clipboard</source>
@@ -25,10 +25,6 @@
         <source>C&amp;lose</source>
         <translation>סגירה</translation>
     </message>
-    <message>
-        <source>&amp;Copy Address</source>
-        <translation>העתקת כתובת</translation>
-    </message>
     <message>
         <source>Delete the currently selected address from the list</source>
         <translation>מחיקת הכתובת שנבחרה מהרשימה</translation>
@@ -45,73 +41,6 @@
         <source>&amp;Delete</source>
         <translation>מ&amp;חיקה</translation>
     </message>
-    <message>
-        <source>Choose the address to send coins to</source>
-        <translation>נא לבחור את הכתובת המבוקשת לשליחת המטבעות</translation>
-    </message>
-    <message>
-        <source>Choose the address to receive coins with</source>
-        <translation>נא לבחור את הכתובת המבוקשת לקבלת המטבעות</translation>
-    </message>
-    <message>
-        <source>C&amp;hoose</source>
-        <translation>בחירה</translation>
-    </message>
-    <message>
-        <source>Sending addresses</source>
-        <translation>כתובות לשליחה</translation>
-    </message>
-    <message>
-        <source>Receiving addresses</source>
-        <translation>כתובות לקבלה</translation>
-    </message>
-    <message>
-        <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source>
-        <translation>אלה כתובת הביטקוין שלך לצורך שליחת תשלומים. תמיד יש לבדוק את הכמות ואת כתובות מקבלי התשלומים לפני שליחת מטבעות.</translation>
-    </message>
-    <message>
-        <source>These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source>
-        <translation>אלה כתובות הביטקוין שלך לצורך קבלת תשלומים. מומלץ להשתמש בכתובת קבלה חדשה לכל העברה.</translation>
-    </message>
-    <message>
-        <source>Copy &amp;Label</source>
-        <translation>העתקת &amp;תווית</translation>
-    </message>
-    <message>
-        <source>&amp;Edit</source>
-        <translation>ע&amp;ריכה</translation>
-    </message>
-    <message>
-        <source>Export Address List</source>
-        <translation>יצוא רשימת כתובות</translation>
-    </message>
-    <message>
-        <source>Comma separated file (*.csv)</source>
-        <translation>קובץ מופרד בפסיקים (‎*.csv)</translation>
-    </message>
-    <message>
-        <source>Exporting Failed</source>
-        <translation>היצוא נכשל</translation>
-    </message>
-    <message>
-        <source>There was an error trying to save the address list to %1. Please try again.</source>
-        <translation>אירעה שגיאה בעת הניסיון לשמור את רשימת הכתובת אל %1. נא לנסות שוב.</translation>
-    </message>
-</context>
-<context>
-    <name>AddressTableModel</name>
-    <message>
-        <source>Label</source>
-        <translation>תווית</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>כתובת</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(אין תווית)</translation>
-    </message>
 </context>
 <context>
     <name>AskPassphraseDialog</name>
@@ -131,98 +60,14 @@
         <source>Repeat new passphrase</source>
         <translation>נא לחזור על מילת הצופן החדשה</translation>
     </message>
-    <message>
-        <source>Encrypt wallet</source>
-        <translation>הצפנת הארנק</translation>
-    </message>
-    <message>
-        <source>This operation needs your wallet passphrase to unlock the wallet.</source>
-        <translation>פעולה זו דורשת את מילת הצופן של הארנק שלך כדי לפתוח את הארנק.</translation>
-    </message>
-    <message>
-        <source>Unlock wallet</source>
-        <translation>פתיחת ארנק</translation>
-    </message>
-    <message>
-        <source>This operation needs your wallet passphrase to decrypt the wallet.</source>
-        <translation>פעולה זו דורשת את מילת הצופן של הארנק שלך כדי לפענח את הארנק.</translation>
-    </message>
-    <message>
-        <source>Decrypt wallet</source>
-        <translation>פענוח ארנק</translation>
-    </message>
-    <message>
-        <source>Change passphrase</source>
-        <translation>שינוי מילת צופן</translation>
-    </message>
-    <message>
-        <source>Confirm wallet encryption</source>
-        <translation>אישור הצפנת הארנק</translation>
-    </message>
-    <message>
-        <source>Warning: If you encrypt your wallet and lose your passphrase, you will &lt;b&gt;LOSE ALL OF YOUR BITCOINS&lt;/b&gt;!</source>
-        <translation>אזהרה: הצפנת הארנק ואיבוד מילת הצופן עשויה להוביל &lt;b&gt;לאיבוד כל הביטקוינים שלך&lt;/b&gt;!</translation>
-    </message>
-    <message>
-        <source>Are you sure you wish to encrypt your wallet?</source>
-        <translation>האם אכן להצפין את הארנק?</translation>
-    </message>
-    <message>
-        <source>Bitcoin Core will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source>
-        <translation>ליבת ביטקוין תיסגר עכשיו כדי לסיים את תליך ההצפנה. זכור כי הצפנה אינה יכולה להגן עלייך באופן מלא מגניבה שמקורה בתוכנות זדוניות המצויות במחשב שלך.</translation>
-    </message>
-    <message>
-        <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source>
-        <translation>לתשומת לבך: כל גיבוי קודם שביצעת לארנק שלך יש להחליף בקובץ הארנק המוצפן שזה עתה נוצר. מטעמי אבטחה, גיבויים קודמים של קובץ הארנק הבלתי-מוצפן יהפכו לחסרי תועלת עם התחלת השימוש בארנק החדש המוצפן.</translation>
-    </message>
-    <message>
-        <source>Warning: The Caps Lock key is on!</source>
-        <translation>זהירות: מקש Caps Lock פעיל!</translation>
-    </message>
-    <message>
-        <source>Wallet encrypted</source>
-        <translation>הארנק הוצפן</translation>
-    </message>
-    <message>
-        <source>Enter the new passphrase to the wallet.&lt;br/&gt;Please use a passphrase of &lt;b&gt;ten or more random characters&lt;/b&gt;, or &lt;b&gt;eight or more words&lt;/b&gt;.</source>
-        <translation>נא להזין את מילת הצופן החדשה לארנק.&lt;br/&gt;כדאי להשתמש במילת צופן המורכבת מ&lt;b&gt;עשרה תווים אקראיים ומעלה&lt;/b&gt;, או &lt;b&gt;שמונה מילים ומעלה&lt;/b&gt;.</translation>
-    </message>
-    <message>
-        <source>Enter the old passphrase and new passphrase to the wallet.</source>
-        <translation>הכנס את מילת הצופן הישנה ומילת צופן חדשה לארנק שלך.</translation>
-    </message>
-    <message>
-        <source>Wallet encryption failed</source>
-        <translation>הצפנת הארנק נכשלה</translation>
-    </message>
-    <message>
-        <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
-        <translation>הצפנת הארנק נכשלה עקב שגיאה פנימית. הארנק שלך לא הוצפן.</translation>
-    </message>
-    <message>
-        <source>The supplied passphrases do not match.</source>
-        <translation>מילות הצופן שסופקו אינן תואמות.</translation>
-    </message>
-    <message>
-        <source>Wallet unlock failed</source>
-        <translation>פתיחת הארנק נכשלה</translation>
-    </message>
-    <message>
-        <source>The passphrase entered for the wallet decryption was incorrect.</source>
-        <translation>מילת הצופן שהוכנסה לפענוח הארנק שגויה.</translation>
-    </message>
-    <message>
-        <source>Wallet decryption failed</source>
-        <translation>פענוח הארנק נכשל</translation>
-    </message>
-    <message>
-        <source>Wallet passphrase was successfully changed.</source>
-        <translation>מילת הצופן של הארנק שונתה בהצלחה.</translation>
-    </message>
 </context>
 <context>
     <name>BanTableModel</name>
-    </context>
+    <message>
+        <source>Banned Until</source>
+        <translation>חסום עד</translation>
+    </message>
+</context>
 <context>
     <name>BitcoinGUI</name>
     <message>
@@ -261,6 +106,14 @@
         <source>Quit application</source>
         <translation>יציאה מהתכנית</translation>
     </message>
+    <message>
+        <source>&amp;About %1</source>
+        <translation>&amp;אודות %1</translation>
+    </message>
+    <message>
+        <source>Show information about %1</source>
+        <translation>הצג מידע על %1</translation>
+    </message>
     <message>
         <source>About &amp;Qt</source>
         <translation>על אודות Qt</translation>
@@ -297,14 +150,6 @@
         <source>Open &amp;URI...</source>
         <translation>פתיחת &amp;כתובת משאב…</translation>
     </message>
-    <message>
-        <source>Bitcoin Core client</source>
-        <translation>לקוח ליבה של ביטקוין</translation>
-    </message>
-    <message>
-        <source>Importing blocks from disk...</source>
-        <translation>מקטעים מיובאים מהכונן…</translation>
-    </message>
     <message>
         <source>Reindexing blocks on disk...</source>
         <translation>המקטעים נוספים למפתח בכונן…</translation>
@@ -349,10 +194,6 @@
         <source>&amp;Receive</source>
         <translation>&amp;קבלה</translation>
     </message>
-    <message>
-        <source>Show information about Bitcoin Core</source>
-        <translation>הצגת מידע על ליבת ביטקוין</translation>
-    </message>
     <message>
         <source>&amp;Show / Hide</source>
         <translation>ה&amp;צגה / הסתרה</translation>
@@ -389,18 +230,10 @@
         <source>Tabs toolbar</source>
         <translation>סרגל כלים לשוניות</translation>
     </message>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>ליבת ביטקוין</translation>
-    </message>
     <message>
         <source>Request payments (generates QR codes and bitcoin: URIs)</source>
         <translation>בקשת תשלומים (יצירה של קודים מסוג QR וסכימות כתובות משאב של :bitcoin)</translation>
     </message>
-    <message>
-        <source>&amp;About Bitcoin Core</source>
-        <translation>על &amp;אודות ליבת ביטקוין</translation>
-    </message>
     <message>
         <source>Show the list of used sending addresses and labels</source>
         <translation>הצג את רשימת הכתובות לשליחה שהיו בשימוש לרבות התוויות</translation>
@@ -418,8 +251,8 @@
         <translation>אפשרויות &amp;שורת הפקודה</translation>
     </message>
     <message>
-        <source>Show the Bitcoin Core help message to get a list with possible Bitcoin command-line options</source>
-        <translation>הצגת הודעות העזרה של ליבת ביטקוין כדי לקבל רשימה עם אפשרויות שורת הפקודה האפשריות של ביטקוין</translation>
+        <source>Processing blocks on disk...</source>
+        <translation>מעבד בלוקים על הדיסק...</translation>
     </message>
     <message>
         <source>No block source available...</source>
@@ -479,14 +312,11 @@
     </message>
 </context>
 <context>
-    <name>ClientModel</name>
+    <name>CoinControlDialog</name>
     <message>
-        <source>Network Alert</source>
-        <translation>אזעקת רשת</translation>
+        <source>Coin Selection</source>
+        <translation>בחירת מטבע</translation>
     </message>
-</context>
-<context>
-    <name>CoinControlDialog</name>
     <message>
         <source>Quantity:</source>
         <translation>כמות:</translation>
@@ -535,6 +365,14 @@
         <source>Amount</source>
         <translation>כמות</translation>
     </message>
+    <message>
+        <source>Received with label</source>
+        <translation>התקבל עם תווית</translation>
+    </message>
+    <message>
+        <source>Received with address</source>
+        <translation>התקבל עם כתובת</translation>
+    </message>
     <message>
         <source>Date</source>
         <translation>תאריך</translation>
@@ -551,138 +389,6 @@
         <source>Priority</source>
         <translation>עדיפות</translation>
     </message>
-    <message>
-        <source>Copy address</source>
-        <translation>העתקת כתובת</translation>
-    </message>
-    <message>
-        <source>Copy label</source>
-        <translation>העתקת תווית</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>העתקת כמות</translation>
-    </message>
-    <message>
-        <source>Copy transaction ID</source>
-        <translation>העתקת מזהה העברה</translation>
-    </message>
-    <message>
-        <source>Lock unspent</source>
-        <translation>נעילת יתרה</translation>
-    </message>
-    <message>
-        <source>Unlock unspent</source>
-        <translation>פתיחת יתרה</translation>
-    </message>
-    <message>
-        <source>Copy quantity</source>
-        <translation>העתקת כמות</translation>
-    </message>
-    <message>
-        <source>Copy fee</source>
-        <translation>העתקת עמלה</translation>
-    </message>
-    <message>
-        <source>Copy after fee</source>
-        <translation>העתקת אחרי עמלה</translation>
-    </message>
-    <message>
-        <source>Copy bytes</source>
-        <translation>העתקת בתים</translation>
-    </message>
-    <message>
-        <source>Copy priority</source>
-        <translation>העתקת עדיפות</translation>
-    </message>
-    <message>
-        <source>Copy dust</source>
-        <translation>העתקת אבק</translation>
-    </message>
-    <message>
-        <source>Copy change</source>
-        <translation>העתקת עודף</translation>
-    </message>
-    <message>
-        <source>highest</source>
-        <translation>הגבוה ביותר</translation>
-    </message>
-    <message>
-        <source>higher</source>
-        <translation>גבוה יותר</translation>
-    </message>
-    <message>
-        <source>high</source>
-        <translation>גבוה</translation>
-    </message>
-    <message>
-        <source>medium-high</source>
-        <translation>בינוני - גבוה</translation>
-    </message>
-    <message>
-        <source>medium</source>
-        <translation>בינוני</translation>
-    </message>
-    <message>
-        <source>low-medium</source>
-        <translation>בינוני - נמוך</translation>
-    </message>
-    <message>
-        <source>low</source>
-        <translation>נמוך</translation>
-    </message>
-    <message>
-        <source>lower</source>
-        <translation>נמוך יותר</translation>
-    </message>
-    <message>
-        <source>lowest</source>
-        <translation>הנמוך ביותר</translation>
-    </message>
-    <message>
-        <source>(%1 locked)</source>
-        <translation>(%1 נעול)</translation>
-    </message>
-    <message>
-        <source>none</source>
-        <translation>ללא</translation>
-    </message>
-    <message>
-        <source>Can vary +/- %1 satoshi(s) per input.</source>
-        <translation>יכולה להשתנות ב+/- %1 סטושי לקלט.</translation>
-    </message>
-    <message>
-        <source>yes</source>
-        <translation>כן</translation>
-    </message>
-    <message>
-        <source>no</source>
-        <translation>לא</translation>
-    </message>
-    <message>
-        <source>This means a fee of at least %1 per kB is required.</source>
-        <translation>זאת אומרת שנחוצה עמלה של לא פחות מ־%1 לכל קילו בית.</translation>
-    </message>
-    <message>
-        <source>Can vary +/- 1 byte per input.</source>
-        <translation>הערך יכול להיות +/- בית אחד לכל קלט.</translation>
-    </message>
-    <message>
-        <source>Transactions with higher priority are more likely to get included into a block.</source>
-        <translation>העברות עם עדיפות גבוהה, יותר סיכוי שיכנסו לתוך המקטע.</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(אין תווית)</translation>
-    </message>
-    <message>
-        <source>change from %1 (%2)</source>
-        <translation>עודף מ־%1 (%2)</translation>
-    </message>
-    <message>
-        <source>(change)</source>
-        <translation>(עודף)</translation>
-    </message>
 </context>
 <context>
     <name>EditAddressDialog</name>
@@ -706,38 +412,6 @@
         <source>&amp;Address</source>
         <translation>&amp;כתובת</translation>
     </message>
-    <message>
-        <source>New receiving address</source>
-        <translation>כתובת חדשה לקבלה</translation>
-    </message>
-    <message>
-        <source>New sending address</source>
-        <translation>כתובת חדשה לשליחה</translation>
-    </message>
-    <message>
-        <source>Edit receiving address</source>
-        <translation>עריכת כתובת לקבלה</translation>
-    </message>
-    <message>
-        <source>Edit sending address</source>
-        <translation>עריכת כתובת לשליחה</translation>
-    </message>
-    <message>
-        <source>The entered address "%1" is already in the address book.</source>
-        <translation>הכתובת שהוכנסה „%1“ כבר נמצאת בפנקס הכתובות.</translation>
-    </message>
-    <message>
-        <source>The entered address "%1" is not a valid Bitcoin address.</source>
-        <translation>הכתובת שהוכנסה „%1“ אינה כתובת ביטקוין תקנית.</translation>
-    </message>
-    <message>
-        <source>Could not unlock wallet.</source>
-        <translation>פתיחת הארנק נכשלה.</translation>
-    </message>
-    <message>
-        <source>New key generation failed.</source>
-        <translation>יצירת מפתח חדש נכשלה.</translation>
-    </message>
 </context>
 <context>
     <name>FreespaceChecker</name>
@@ -764,10 +438,6 @@
 </context>
 <context>
     <name>HelpMessageDialog</name>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>ליבת ביטקוין</translation>
-    </message>
     <message>
         <source>version</source>
         <translation>גרסה</translation>
@@ -776,10 +446,6 @@
         <source>(%1-bit)</source>
         <translation>(%1-סיביות)</translation>
     </message>
-    <message>
-        <source>About Bitcoin Core</source>
-        <translation>על אודות ליבת ביטקוין</translation>
-    </message>
     <message>
         <source>Command-line options</source>
         <translation>אפשרויות שורת פקודה</translation>
@@ -792,24 +458,28 @@
         <source>command-line options</source>
         <translation>אפשרויות שורת פקודה</translation>
     </message>
-    </context>
-<context>
-    <name>Intro</name>
     <message>
-        <source>Welcome</source>
-        <translation>ברוך בואך</translation>
+        <source>UI Options:</source>
+        <translation>אפשרויות ממשק</translation>
+    </message>
+    <message>
+        <source>Start minimized</source>
+        <translation>התחל ממוזער</translation>
     </message>
     <message>
-        <source>Welcome to Bitcoin Core.</source>
-        <translation>ברוך בואך לליבת ביטקוין</translation>
+        <source>Reset all settings changed in the GUI</source>
+        <translation>איפוס כל שינויי הגדרות התצוגה</translation>
     </message>
+</context>
+<context>
+    <name>Intro</name>
     <message>
-        <source>As this is the first time the program is launched, you can choose where Bitcoin Core will store its data.</source>
-        <translation>מכיוון שזאת הפעם הראשונה שהתכנית פועלת ניתן לבחור איפה ליבת ביטקוין תאחסן את הנתונים שלה.</translation>
+        <source>Welcome</source>
+        <translation>ברוך בואך</translation>
     </message>
     <message>
-        <source>Bitcoin Core will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source>
-        <translation>לקוח ביטקוין יוריד וישמור העתק של שרשרת המקטעים של ביטקוין. לפחות %1 ג״ב מהנתונים יאוחסנו בתיקייה זו, והיא תגדל עם הזמן. הארנק גם יאוחסן בתיקייה הזו.</translation>
+        <source>Welcome to %1.</source>
+        <translation>ברוך הבא ל %1.</translation>
     </message>
     <message>
         <source>Use the default data directory</source>
@@ -819,10 +489,6 @@
         <source>Use a custom data directory:</source>
         <translation>שימוש בתיקיית נתונים מותאמת אישית:</translation>
     </message>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>ליבת ביטקוין</translation>
-    </message>
     <message>
         <source>Error: Specified data directory "%1" cannot be created.</source>
         <translation>שגיאה: לא ניתן ליצור את תיקיית הנתונים שצוינה „%1“.</translation>
@@ -850,10 +516,6 @@
         <source>Select payment request file</source>
         <translation>בחירת קובץ בקשת תשלום</translation>
     </message>
-    <message>
-        <source>Select payment request file to open</source>
-        <translation>בחירת קובץ בקשת תשלום לפתיחה</translation>
-    </message>
 </context>
 <context>
     <name>OptionsDialog</name>
@@ -957,6 +619,18 @@
         <source>Port of the proxy (e.g. 9050)</source>
         <translation>הפתחה של המתווך (למשל 9050)</translation>
     </message>
+    <message>
+        <source>IPv4</source>
+        <translation>IPv4</translation>
+    </message>
+    <message>
+        <source>IPv6</source>
+        <translation>IPv6</translation>
+    </message>
+    <message>
+        <source>Tor</source>
+        <translation>Tor</translation>
+    </message>
     <message>
         <source>&amp;Window</source>
         <translation>&amp;חלון</translation>
@@ -1080,6 +754,10 @@
         <source>Your current balance in watch-only addresses</source>
         <translation>המאזן הנוכחי שלך בכתובות לקריאה בלבד</translation>
     </message>
+    <message>
+        <source>Spendable:</source>
+        <translation>ניתנים לבזבוז</translation>
+    </message>
     <message>
         <source>Recent transactions</source>
         <translation>העברות אחרונות</translation>
@@ -1098,155 +776,57 @@
     </message>
 </context>
 <context>
-    <name>PaymentServer</name>
+    <name>PeerTableModel</name>
     <message>
-        <source>URI handling</source>
-        <translation>תפעול כתובות משאב</translation>
+        <source>User Agent</source>
+        <translation>סוכן משתמש</translation>
     </message>
     <message>
-        <source>Invalid payment address %1</source>
-        <translation>כתובת תשלום שגויה %1</translation>
+        <source>Ping Time</source>
+        <translation>זמן המענה</translation>
     </message>
+</context>
+<context>
+    <name>QObject</name>
     <message>
-        <source>Payment request rejected</source>
-        <translation>בקשת התשלום נדחתה</translation>
+        <source>Amount</source>
+        <translation>כמות</translation>
     </message>
     <message>
-        <source>Payment request network doesn't match client network.</source>
-        <translation>רשת בקשת התשלום אינה תואמת לרשת הלקוח.</translation>
+        <source>Enter a Bitcoin address (e.g. %1)</source>
+        <translation>נא להזין כתובת ביטקוין (למשל: %1)</translation>
     </message>
     <message>
-        <source>Payment request is not initialized.</source>
-        <translation>בקשת התשלום לא החלה.</translation>
+        <source>%1 d</source>
+        <translation>%1 ימים</translation>
     </message>
     <message>
-        <source>Requested payment amount of %1 is too small (considered dust).</source>
-        <translation>הסכום על סך %1 הנדרש לתשלום קטן מדי (נחשב לאבק)</translation>
+        <source>%1 h</source>
+        <translation>%1 שעות</translation>
     </message>
     <message>
-        <source>Payment request error</source>
-        <translation>שגיאה בבקשת תשלום</translation>
+        <source>%1 m</source>
+        <translation>%1 דקות</translation>
     </message>
     <message>
-        <source>Cannot start bitcoin: click-to-pay handler</source>
-        <translation>לא ניתן להתחיל את ביטקוין: טיפול בלחיצה–לתשלום </translation>
+        <source>%1 s</source>
+        <translation>%1 שניות</translation>
     </message>
     <message>
-        <source>Payment request fetch URL is invalid: %1</source>
-        <translation>כתובת אחזור בקשת התשלום שגויה: %1</translation>
+        <source>None</source>
+        <translation>ללא</translation>
     </message>
     <message>
-        <source>URI cannot be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source>
-        <translation>לא ניתן לנתח את כתובת המשאב! מצב זה יכול לקרות עקב כתובת ביטקוין שגויה או פרמטרים שגויים בכתובת המשאב.</translation>
+        <source>N/A</source>
+        <translation>לא זמין</translation>
     </message>
     <message>
-        <source>Payment request file handling</source>
-        <translation>טיפול בקובצי בקשות תשלום</translation>
+        <source>%1 ms</source>
+        <translation>%1 מילישניות</translation>
     </message>
-    <message>
-        <source>Payment request file cannot be read! This can be caused by an invalid payment request file.</source>
-        <translation>לא ניתן לקרוא את קובץ בקשת התשלום! מצב כזה יכול לקרות בעקבות קובץ בקשת תשלום פגום.</translation>
-    </message>
-    <message>
-        <source>Unverified payment requests to custom payment scripts are unsupported.</source>
-        <translation>בקשות תשלום בלתי מאומתות לסקריפטים לתשלום מותאמים אישית אינן נתמכות.</translation>
-    </message>
-    <message>
-        <source>Refund from %1</source>
-        <translation>החזר מ־%1</translation>
-    </message>
-    <message>
-        <source>Error communicating with %1: %2</source>
-        <translation>שגיאה בתקשורת עם %1: %2</translation>
-    </message>
-    <message>
-        <source>Payment request cannot be parsed!</source>
-        <translation>לא ניתן לפענח את בקשת התשלום!</translation>
-    </message>
-    <message>
-        <source>Bad response from server %1</source>
-        <translation>מענה שגוי משרת %1</translation>
-    </message>
-    <message>
-        <source>Payment acknowledged</source>
-        <translation>התשלום התקבל</translation>
-    </message>
-    <message>
-        <source>Network request error</source>
-        <translation>שגיאת בקשת שרת</translation>
-    </message>
-</context>
-<context>
-    <name>PeerTableModel</name>
-    <message>
-        <source>User Agent</source>
-        <translation>סוכן משתמש</translation>
-    </message>
-    <message>
-        <source>Ping Time</source>
-        <translation>זמן המענה</translation>
-    </message>
-</context>
-<context>
-    <name>QObject</name>
-    <message>
-        <source>Amount</source>
-        <translation>כמות</translation>
-    </message>
-    <message>
-        <source>Enter a Bitcoin address (e.g. %1)</source>
-        <translation>נא להזין כתובת ביטקוין (למשל: %1)</translation>
-    </message>
-    <message>
-        <source>%1 d</source>
-        <translation>%1 ימים</translation>
-    </message>
-    <message>
-        <source>%1 h</source>
-        <translation>%1 שעות</translation>
-    </message>
-    <message>
-        <source>%1 m</source>
-        <translation>%1 דקות</translation>
-    </message>
-    <message>
-        <source>%1 s</source>
-        <translation>%1 שניות</translation>
-    </message>
-    <message>
-        <source>None</source>
-        <translation>ללא</translation>
-    </message>
-    <message>
-        <source>N/A</source>
-        <translation>לא זמין</translation>
-    </message>
-    <message>
-        <source>%1 ms</source>
-        <translation>%1 מילישניות</translation>
-    </message>
-</context>
-<context>
-    <name>QRImageWidget</name>
-    <message>
-        <source>&amp;Save Image...</source>
-        <translation>&amp;שמירת תמונה…</translation>
-    </message>
-    <message>
-        <source>&amp;Copy Image</source>
-        <translation>ה&amp;עתקת תמונה</translation>
-    </message>
-    <message>
-        <source>Save QR Code</source>
-        <translation>שמירת קוד QR</translation>
-    </message>
-    <message>
-        <source>PNG Image (*.png)</source>
-        <translation>תמונת PNG ‏(‎*.png)</translation>
-    </message>
-</context>
-<context>
-    <name>RPCConsole</name>
+</context>
+<context>
+    <name>RPCConsole</name>
     <message>
         <source>Client name</source>
         <translation>שם לקוח</translation>
@@ -1275,6 +855,10 @@
         <source>Using BerkeleyDB version</source>
         <translation>שימוש ב־BerkeleyDB גרסה</translation>
     </message>
+    <message>
+        <source>Datadir</source>
+        <translation>Datadir</translation>
+    </message>
     <message>
         <source>Startup time</source>
         <translation>זמן עלייה</translation>
@@ -1299,6 +883,18 @@
         <source>Current number of blocks</source>
         <translation>מספר המקטעים הנוכחי</translation>
     </message>
+    <message>
+        <source>Memory Pool</source>
+        <translation>מאגר זכרון</translation>
+    </message>
+    <message>
+        <source>Current number of transactions</source>
+        <translation>מספר הפעולה הנוכחי</translation>
+    </message>
+    <message>
+        <source>Memory usage</source>
+        <translation>שימוש בזכרון</translation>
+    </message>
     <message>
         <source>Received</source>
         <translation>התקבלו</translation>
@@ -1311,10 +907,18 @@
         <source>&amp;Peers</source>
         <translation>&amp;עמיתים</translation>
     </message>
+    <message>
+        <source>Banned peers</source>
+        <translation>משתמשים חסומים</translation>
+    </message>
     <message>
         <source>Select a peer to view detailed information.</source>
         <translation>נא לבחור בעמית כדי להציג מידע מפורט.</translation>
     </message>
+    <message>
+        <source>Whitelisted</source>
+        <translation>ברשימה הלבנה</translation>
+    </message>
     <message>
         <source>Direction</source>
         <translation>כיוון</translation>
@@ -1323,10 +927,26 @@
         <source>Version</source>
         <translation>גרסה</translation>
     </message>
+    <message>
+        <source>Starting Block</source>
+        <translation>בלוק התחלה</translation>
+    </message>
+    <message>
+        <source>Synced Blocks</source>
+        <translation>בלוקים מסונכרנים</translation>
+    </message>
     <message>
         <source>User Agent</source>
         <translation>סוכן משתמש</translation>
     </message>
+    <message>
+        <source>Decrease font size</source>
+        <translation>הקטן גודל גופן</translation>
+    </message>
+    <message>
+        <source>Increase font size</source>
+        <translation>הגדל גודל גופן</translation>
+    </message>
     <message>
         <source>Services</source>
         <translation>שירותים</translation>
@@ -1351,6 +971,10 @@
         <source>Ping Time</source>
         <translation>זמן המענה</translation>
     </message>
+    <message>
+        <source>Time Offset</source>
+        <translation>הפרש זמן</translation>
+    </message>
     <message>
         <source>Last block time</source>
         <translation>זמן המקטע האחרון</translation>
@@ -1383,10 +1007,6 @@
         <source>Out:</source>
         <translation>יוצא:</translation>
     </message>
-    <message>
-        <source>Build date</source>
-        <translation>תאריך בנייה</translation>
-    </message>
     <message>
         <source>Debug log file</source>
         <translation>קובץ יומן ניפוי</translation>
@@ -1395,6 +1015,22 @@
         <source>Clear console</source>
         <translation>ניקוי מסוף הבקרה</translation>
     </message>
+    <message>
+        <source>Ban Node for</source>
+        <translation>חסום משתמש ל</translation>
+    </message>
+    <message>
+        <source>1 &amp;day</source>
+        <translation>1&amp; יום</translation>
+    </message>
+    <message>
+        <source>1 &amp;week</source>
+        <translation>1 &amp; שבוע</translation>
+    </message>
+    <message>
+        <source>1 &amp;year</source>
+        <translation>1 &amp; שנה</translation>
+    </message>
     <message>
         <source>Use up and down arrows to navigate history, and &lt;b&gt;Ctrl-L&lt;/b&gt; to clear screen.</source>
         <translation>יש להשתמש בחצים למעלה ולמטה כדי לנווט בהיסטוריה, וב־&lt;b&gt;Ctrl-L&lt;/b&gt; כדי לנקות את המסך.</translation>
@@ -1518,18 +1154,6 @@
         <source>Remove</source>
         <translation>הסרה</translation>
     </message>
-    <message>
-        <source>Copy label</source>
-        <translation>העתקת תווית</translation>
-    </message>
-    <message>
-        <source>Copy message</source>
-        <translation>העתקת הודעה</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>העתקת כמות</translation>
-    </message>
 </context>
 <context>
     <name>ReceiveRequestDialog</name>
@@ -1549,73 +1173,6 @@
         <source>&amp;Save Image...</source>
         <translation>&amp;שמירת תמונה…</translation>
     </message>
-    <message>
-        <source>Request payment to %1</source>
-        <translation>בקשת תשלום לטובת %1</translation>
-    </message>
-    <message>
-        <source>Payment information</source>
-        <translation>מידע על תשלום</translation>
-    </message>
-    <message>
-        <source>URI</source>
-        <translation>כתובת משאב</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>כתובת</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>כמות</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>תווית</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>הודעה</translation>
-    </message>
-    <message>
-        <source>Resulting URI too long, try to reduce the text for label / message.</source>
-        <translation>כתובת המשאב המתקבלת ארוכה מדי, כדאי לנסות לצמצם את הטקסט בתווית / הודעה.</translation>
-    </message>
-    <message>
-        <source>Error encoding URI into QR Code.</source>
-        <translation>שגיאה בקידוד כתובת משאב לקוד QR</translation>
-    </message>
-</context>
-<context>
-    <name>RecentRequestsTableModel</name>
-    <message>
-        <source>Date</source>
-        <translation>תאריך</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>תווית</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>הודעה</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>כמות</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(אין תווית)</translation>
-    </message>
-    <message>
-        <source>(no message)</source>
-        <translation>(אין הודעה)</translation>
-    </message>
-    <message>
-        <source>(no amount)</source>
-        <translation>(אין סכום)</translation>
-    </message>
 </context>
 <context>
     <name>SendCoinsDialog</name>
@@ -1680,120 +1237,72 @@
         <translation>עמלת העברה:</translation>
     </message>
     <message>
-        <source>Send to multiple recipients at once</source>
-        <translation>שליחה למספר מוטבים בו־זמנית</translation>
-    </message>
-    <message>
-        <source>Add &amp;Recipient</source>
-        <translation>הוספת &amp;מוטב</translation>
-    </message>
-    <message>
-        <source>Clear all fields of the form.</source>
-        <translation>ניקוי של כל השדות בטופס.</translation>
-    </message>
-    <message>
-        <source>Dust:</source>
-        <translation>אבק:</translation>
-    </message>
-    <message>
-        <source>Clear &amp;All</source>
-        <translation>&amp;ניקוי הכול</translation>
-    </message>
-    <message>
-        <source>Balance:</source>
-        <translation>מאזן:</translation>
-    </message>
-    <message>
-        <source>Confirm the send action</source>
-        <translation>אישור פעולת השליחה</translation>
-    </message>
-    <message>
-        <source>S&amp;end</source>
-        <translation>&amp;שליחה</translation>
-    </message>
-    <message>
-        <source>Confirm send coins</source>
-        <translation>אישור שליחת מטבעות</translation>
-    </message>
-    <message>
-        <source>%1 to %2</source>
-        <translation>%1 אל %2</translation>
+        <source>Choose...</source>
+        <translation>בחר...</translation>
     </message>
     <message>
-        <source>Copy quantity</source>
-        <translation>העתקת כמות</translation>
+        <source>per kilobyte</source>
+        <translation>עבור קילו-בית</translation>
     </message>
     <message>
-        <source>Copy amount</source>
-        <translation>העתקת כמות</translation>
+        <source>Hide</source>
+        <translation>הסתר</translation>
     </message>
     <message>
-        <source>Copy fee</source>
-        <translation>העתקת עמלה</translation>
+        <source>total at least</source>
+        <translation>סה''כ לפחות</translation>
     </message>
     <message>
-        <source>Copy after fee</source>
-        <translation>העתקת אחרי עמלה</translation>
+        <source>Recommended:</source>
+        <translation>מומלץ:</translation>
     </message>
     <message>
-        <source>Copy bytes</source>
-        <translation>העתקת בתים</translation>
+        <source>Custom:</source>
+        <translation>מותאם אישית:</translation>
     </message>
     <message>
-        <source>Copy priority</source>
-        <translation>העתקת עדיפות</translation>
+        <source>Confirmation time:</source>
+        <translation>זמן האישור:</translation>
     </message>
     <message>
-        <source>Copy change</source>
-        <translation>העתקת עודף</translation>
+        <source>normal</source>
+        <translation>רגיל</translation>
     </message>
     <message>
-        <source>or</source>
-        <translation>או</translation>
+        <source>fast</source>
+        <translation>מהיר</translation>
     </message>
     <message>
-        <source>The amount to pay must be larger than 0.</source>
-        <translation>הכמות לתשלום חייבת להיות גדולה מ־0.</translation>
-    </message>
-    <message>
-        <source>The amount exceeds your balance.</source>
-        <translation>הכמות עולה על המאזן שלך.</translation>
-    </message>
-    <message>
-        <source>The total exceeds your balance when the %1 transaction fee is included.</source>
-        <translation>הכמות הכוללת, ובכללה עמלת העברה בסך %1, עולה על המאזן שלך.</translation>
-    </message>
-    <message>
-        <source>Transaction creation failed!</source>
-        <translation>יצירת ההעברה נכשלה!</translation>
+        <source>Send to multiple recipients at once</source>
+        <translation>שליחה למספר מוטבים בו־זמנית</translation>
     </message>
     <message>
-        <source>The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source>
-        <translation>ההעברה נדחתה! מצב כזה עשוי לקרות אם חלק מהמטבעות בארנק שלך כבר הושקעו, כמו למשל עקב שימוש בעותק של wallet.dat והמטבעות הושקעו בעותק אבל לא סומנו כאילו הושקעו דרך כאן.</translation>
+        <source>Add &amp;Recipient</source>
+        <translation>הוספת &amp;מוטב</translation>
     </message>
     <message>
-        <source>Warning: Invalid Bitcoin address</source>
-        <translation>אזהרה: כתובת ביטקוין שגויה</translation>
+        <source>Clear all fields of the form.</source>
+        <translation>ניקוי של כל השדות בטופס.</translation>
     </message>
     <message>
-        <source>(no label)</source>
-        <translation>(אין תווית)</translation>
+        <source>Dust:</source>
+        <translation>אבק:</translation>
     </message>
     <message>
-        <source>Warning: Unknown change address</source>
-        <translation>אזהרה: כתובת עודף בלתי ידועה</translation>
+        <source>Clear &amp;All</source>
+        <translation>&amp;ניקוי הכול</translation>
     </message>
     <message>
-        <source>Copy dust</source>
-        <translation>העתקת אבק</translation>
+        <source>Balance:</source>
+        <translation>מאזן:</translation>
     </message>
     <message>
-        <source>Are you sure you want to send?</source>
-        <translation>האם אכן לשלוח?</translation>
+        <source>Confirm the send action</source>
+        <translation>אישור פעולת השליחה</translation>
     </message>
     <message>
-        <source>added as transaction fee</source>
-        <translation>נוסף כעמלת העברה</translation>
+        <source>S&amp;end</source>
+        <translation>&amp;שליחה</translation>
     </message>
 </context>
 <context>
@@ -1806,10 +1315,6 @@
         <source>Pay &amp;To:</source>
         <translation>לשלם ל&amp;טובת:</translation>
     </message>
-    <message>
-        <source>Enter a label for this address to add it to your address book</source>
-        <translation>נא להכניס תווית לכתובת הזאת כדי להוסיף לפנקס הכתובות</translation>
-    </message>
     <message>
         <source>&amp;Label:</source>
         <translation>ת&amp;ווית:</translation>
@@ -1846,6 +1351,10 @@
         <source>Message:</source>
         <translation>הודעה:</translation>
     </message>
+    <message>
+        <source>This is an authenticated payment request.</source>
+        <translation>זוהי בקשה מאומתת לתשלום.</translation>
+    </message>
     <message>
         <source>Enter a label for this address to add it to the list of used addresses</source>
         <translation>יש להזין תווית עבור כתובת זו כדי להוסיף אותה לרשימת הכתובות בשימוש</translation>
@@ -1865,10 +1374,6 @@
 </context>
 <context>
     <name>ShutdownWindow</name>
-    <message>
-        <source>Bitcoin Core is shutting down...</source>
-        <translation>ליבת ביטקוין נסגרת…</translation>
-    </message>
     <message>
         <source>Do not shut down the computer until this window disappears.</source>
         <translation>אין לכבות את המחשב עד שחלון זה נעלם.</translation>
@@ -1952,558 +1457,76 @@
         <source>Reset all verify message fields</source>
         <translation>איפוס כל שדות אימות ההודעה</translation>
     </message>
+</context>
+<context>
+    <name>SplashScreen</name>
     <message>
-        <source>Click "Sign Message" to generate signature</source>
-        <translation>יש ללחוץ על „חתימה על ההודעה“ כדי לחולל חתימה</translation>
+        <source>[testnet]</source>
+        <translation>[רשת-בדיקה]</translation>
     </message>
+</context>
+<context>
+    <name>TrafficGraphWidget</name>
     <message>
-        <source>The entered address is invalid.</source>
-        <translation>הכתובת שהוכנסה אינה תקינה.</translation>
+        <source>KB/s</source>
+        <translation>ק״ב/ש׳</translation>
     </message>
+</context>
+<context>
+    <name>TransactionDescDialog</name>
     <message>
-        <source>Please check the address and try again.</source>
-        <translation>נא לבדוק את הכתובת לנסות שנית.</translation>
+        <source>This pane shows a detailed description of the transaction</source>
+        <translation>חלונית זו מציגה תיאור מפורט של ההעברה</translation>
     </message>
+</context>
+<context>
+    <name>UnitDisplayStatusBarControl</name>
     <message>
-        <source>The entered address does not refer to a key.</source>
-        <translation>הכתובת שהוכנסה אינה מתייחסת למפתח.</translation>
+        <source>Unit to show amounts in. Click to select another unit.</source>
+        <translation>יחידת המידה להצגת הסכומים. יש ללחוץ כדי לבחור ביחידת מידה אחרת.</translation>
     </message>
+</context>
+<context>
+    <name>bitcoin-core</name>
     <message>
-        <source>Wallet unlock was cancelled.</source>
-        <translation>פתיחת הארנק בוטלה.</translation>
+        <source>Options:</source>
+        <translation>אפשרויות:</translation>
     </message>
     <message>
-        <source>Private key for the entered address is not available.</source>
-        <translation>המפתח הפרטי עבור הכתובת שהוכנסה אינו זמין.</translation>
+        <source>Specify data directory</source>
+        <translation>ציון תיקיית נתונים</translation>
     </message>
     <message>
-        <source>Message signing failed.</source>
-        <translation>החתימה על ההודעה נכשלה.</translation>
+        <source>Connect to a node to retrieve peer addresses, and disconnect</source>
+        <translation>יש להתחבר למפרק כדי לדלות כתובות עמיתים ואז להתנתק</translation>
     </message>
     <message>
-        <source>Message signed.</source>
-        <translation>ההודעה נחתמה.</translation>
+        <source>Specify your own public address</source>
+        <translation>נא לציין את הכתובת הפומבית שלך</translation>
     </message>
     <message>
-        <source>The signature could not be decoded.</source>
-        <translation>לא ניתן לפענח את החתימה.</translation>
+        <source>Accept command line and JSON-RPC commands</source>
+        <translation>קבלת פקודות משורת הפקודה ומ־JSON-RPC</translation>
     </message>
     <message>
-        <source>Please check the signature and try again.</source>
-        <translation>נא לבדוק את החתימה ולנסות שנית.</translation>
+        <source>Error: A fatal internal error occurred, see debug.log for details</source>
+        <translation>שגיאה: סניה קלמה קריטית פנימית קרטה, פנה ל debug.log לפרטים</translation>
     </message>
     <message>
-        <source>The signature did not match the message digest.</source>
-        <translation>החתימה לא תואמת את תקציר ההודעה.</translation>
+        <source>Run in the background as a daemon and accept commands</source>
+        <translation>ריצה כסוכן ברקע וקבלת פקודות</translation>
     </message>
     <message>
-        <source>Message verification failed.</source>
-        <translation>אימות ההודעה נכשל.</translation>
-    </message>
-    <message>
-        <source>Message verified.</source>
-        <translation>ההודעה אומתה.</translation>
+        <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
+        <translation>קבלת חיבורים מבחוץ (בררת מחדל: 1 ללא ‎-proxy או ‎-connect)</translation>
     </message>
-</context>
-<context>
-    <name>SplashScreen</name>
     <message>
         <source>Bitcoin Core</source>
         <translation>ליבת ביטקוין</translation>
     </message>
     <message>
-        <source>The Bitcoin Core developers</source>
-        <translation>מתכנתי ליבת ביטקוין</translation>
-    </message>
-    <message>
-        <source>[testnet]</source>
-        <translation>[רשת-בדיקה]</translation>
-    </message>
-</context>
-<context>
-    <name>TrafficGraphWidget</name>
-    <message>
-        <source>KB/s</source>
-        <translation>ק״ב/ש׳</translation>
-    </message>
-</context>
-<context>
-    <name>TransactionDesc</name>
-    <message>
-        <source>Open until %1</source>
-        <translation>פתוחה עד %1</translation>
-    </message>
-    <message>
-        <source>conflicted</source>
-        <translation>מתנגש</translation>
-    </message>
-    <message>
-        <source>%1/offline</source>
-        <translation>%1/מנותק</translation>
-    </message>
-    <message>
-        <source>%1/unconfirmed</source>
-        <translation>%1/המתנה לאישור</translation>
-    </message>
-    <message>
-        <source>%1 confirmations</source>
-        <translation>%1 אישורים</translation>
-    </message>
-    <message>
-        <source>Status</source>
-        <translation>מצב</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation>תאריך</translation>
-    </message>
-    <message>
-        <source>Source</source>
-        <translation>מקור</translation>
-    </message>
-    <message>
-        <source>Generated</source>
-        <translation>נוצר</translation>
-    </message>
-    <message>
-        <source>From</source>
-        <translation>מאת</translation>
-    </message>
-    <message>
-        <source>To</source>
-        <translation>אל</translation>
-    </message>
-    <message>
-        <source>own address</source>
-        <translation>כתובת עצמית</translation>
-    </message>
-    <message>
-        <source>watch-only</source>
-        <translation>צפייה בלבד</translation>
-    </message>
-    <message>
-        <source>label</source>
-        <translation>תווית</translation>
-    </message>
-    <message>
-        <source>Credit</source>
-        <translation>זיכוי</translation>
-    </message>
-    <message>
-        <source>not accepted</source>
-        <translation>לא התקבל</translation>
-    </message>
-    <message>
-        <source>Debit</source>
-        <translation>חיוב</translation>
-    </message>
-    <message>
-        <source>Total debit</source>
-        <translation>סך כל החיוב</translation>
-    </message>
-    <message>
-        <source>Total credit</source>
-        <translation>סך כל האשראי</translation>
-    </message>
-    <message>
-        <source>Transaction fee</source>
-        <translation>עמלת העברה</translation>
-    </message>
-    <message>
-        <source>Net amount</source>
-        <translation>כמות נקייה</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>הודעה</translation>
-    </message>
-    <message>
-        <source>Comment</source>
-        <translation>הערה</translation>
-    </message>
-    <message>
-        <source>Transaction ID</source>
-        <translation>מזהה העברה</translation>
-    </message>
-    <message>
-        <source>Merchant</source>
-        <translation>סוחר</translation>
-    </message>
-    <message>
-        <source>Generated coins must mature %1 blocks before they can be spent. When you generated this block, it was broadcast to the network to be added to the block chain. If it fails to get into the chain, its state will change to "not accepted" and it won't be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source>
-        <translation>מטבעות חדשים שנוצרו חייבים להבשיל במשך %1 מקטעים לפני שניתן לנצל אותם. כשמקטע זה נוצר הוא משודר ברשת על מנת שייכנס לשרשרת המקטעים. אם הוא לא ייכנס לשרשרת, מצבו ישתנה ל„לא התקבל“ ולא ניתן יהיה לנצלו. מצב כזה יכול לקרות מדי פעם אם במקרה מפרק אחר יצר מקטע בהבדל של שניות בודדות ממך.</translation>
-    </message>
-    <message>
-        <source>Debug information</source>
-        <translation>מידע ניפוי</translation>
-    </message>
-    <message>
-        <source>Transaction</source>
-        <translation>העברה</translation>
-    </message>
-    <message>
-        <source>Inputs</source>
-        <translation>קלטים</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>כמות</translation>
-    </message>
-    <message>
-        <source>true</source>
-        <translation>אמת</translation>
-    </message>
-    <message>
-        <source>false</source>
-        <translation>שקר</translation>
-    </message>
-    <message>
-        <source>, has not been successfully broadcast yet</source>
-        <translation>, טרם שודר בהצלחה</translation>
-    </message>
-    <message>
-        <source>unknown</source>
-        <translation>לא ידוע</translation>
-    </message>
-</context>
-<context>
-    <name>TransactionDescDialog</name>
-    <message>
-        <source>Transaction details</source>
-        <translation>פרטי ההעברה</translation>
-    </message>
-    <message>
-        <source>This pane shows a detailed description of the transaction</source>
-        <translation>חלונית זו מציגה תיאור מפורט של ההעברה</translation>
-    </message>
-</context>
-<context>
-    <name>TransactionTableModel</name>
-    <message>
-        <source>Date</source>
-        <translation>תאריך</translation>
-    </message>
-    <message>
-        <source>Type</source>
-        <translation>סוג</translation>
-    </message>
-    <message>
-        <source>Immature (%1 confirmations, will be available after %2)</source>
-        <translation>לא בשל (%1 אישורים, יהיו זמינים לאחר %2)</translation>
-    </message>
-    <message>
-        <source>Open until %1</source>
-        <translation>פתוחה עד %1</translation>
-    </message>
-    <message>
-        <source>Confirmed (%1 confirmations)</source>
-        <translation>מאושר (%1 אישורים)</translation>
-    </message>
-    <message>
-        <source>This block was not received by any other nodes and will probably not be accepted!</source>
-        <translation>המקטע הזה לא נקלט על ידי אף מפרק אחר, וכנראה לא יתקבל!</translation>
-    </message>
-    <message>
-        <source>Generated but not accepted</source>
-        <translation>נוצר אך לא התקבל</translation>
-    </message>
-    <message>
-        <source>Offline</source>
-        <translation>מנותק</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>תווית</translation>
-    </message>
-    <message>
-        <source>Unconfirmed</source>
-        <translation>ללא אישור</translation>
-    </message>
-    <message>
-        <source>Confirming (%1 of %2 recommended confirmations)</source>
-        <translation>מתקבל אישור (%1 מתוך %2 אישורים מומלצים)</translation>
-    </message>
-    <message>
-        <source>Conflicted</source>
-        <translation>מתנגש</translation>
-    </message>
-    <message>
-        <source>Received with</source>
-        <translation>התקבל עם</translation>
-    </message>
-    <message>
-        <source>Received from</source>
-        <translation>התקבל מאת</translation>
-    </message>
-    <message>
-        <source>Sent to</source>
-        <translation>נשלח אל</translation>
-    </message>
-    <message>
-        <source>Payment to yourself</source>
-        <translation>תשלום לעצמך</translation>
-    </message>
-    <message>
-        <source>Mined</source>
-        <translation>נכרה</translation>
-    </message>
-    <message>
-        <source>watch-only</source>
-        <translation>צפייה בלבד</translation>
-    </message>
-    <message>
-        <source>(n/a)</source>
-        <translation>(לא זמין)</translation>
-    </message>
-    <message>
-        <source>Transaction status. Hover over this field to show number of confirmations.</source>
-        <translation>מצב ההעברה. יש להמתין עם הסמן מעל שדה זה כדי לראות את מספר האישורים.</translation>
-    </message>
-    <message>
-        <source>Date and time that the transaction was received.</source>
-        <translation>התאריך והשעה בה ההעברה הזאת התקבלה.</translation>
-    </message>
-    <message>
-        <source>Type of transaction.</source>
-        <translation>סוג ההעברה.</translation>
-    </message>
-    <message>
-        <source>Whether or not a watch-only address is involved in this transaction.</source>
-        <translation>האם כתובות לצפייה בלבד מעורבות בהעברה זאת או שלא.</translation>
-    </message>
-    <message>
-        <source>Amount removed from or added to balance.</source>
-        <translation>הכמות שהתווספה או הוסרה מהיתרה.</translation>
-    </message>
-</context>
-<context>
-    <name>TransactionView</name>
-    <message>
-        <source>All</source>
-        <translation>הכול</translation>
-    </message>
-    <message>
-        <source>Today</source>
-        <translation>היום</translation>
-    </message>
-    <message>
-        <source>This week</source>
-        <translation>השבוע</translation>
-    </message>
-    <message>
-        <source>This month</source>
-        <translation>החודש</translation>
-    </message>
-    <message>
-        <source>Last month</source>
-        <translation>החודש שעבר</translation>
-    </message>
-    <message>
-        <source>This year</source>
-        <translation>השנה</translation>
-    </message>
-    <message>
-        <source>Range...</source>
-        <translation>טווח…</translation>
-    </message>
-    <message>
-        <source>Received with</source>
-        <translation>התקבל עם</translation>
-    </message>
-    <message>
-        <source>Sent to</source>
-        <translation>נשלח אל</translation>
-    </message>
-    <message>
-        <source>To yourself</source>
-        <translation>לעצמך</translation>
-    </message>
-    <message>
-        <source>Mined</source>
-        <translation>נכרה</translation>
-    </message>
-    <message>
-        <source>Other</source>
-        <translation>אחר</translation>
-    </message>
-    <message>
-        <source>Enter address or label to search</source>
-        <translation>נא להכניס כתובת או תווית לחיפוש</translation>
-    </message>
-    <message>
-        <source>Min amount</source>
-        <translation>כמות מזערית</translation>
-    </message>
-    <message>
-        <source>Copy address</source>
-        <translation>העתקת כתובת</translation>
-    </message>
-    <message>
-        <source>Copy label</source>
-        <translation>העתקת תווית</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>העתקת כמות</translation>
-    </message>
-    <message>
-        <source>Copy transaction ID</source>
-        <translation>העתקת מזהה העברה</translation>
-    </message>
-    <message>
-        <source>Edit label</source>
-        <translation>עריכת תווית</translation>
-    </message>
-    <message>
-        <source>Show transaction details</source>
-        <translation>הצגת פרטי העברה</translation>
-    </message>
-    <message>
-        <source>Export Transaction History</source>
-        <translation>יצוא היסטוריית העברות</translation>
-    </message>
-    <message>
-        <source>Watch-only</source>
-        <translation>צפייה בלבד</translation>
-    </message>
-    <message>
-        <source>Exporting Failed</source>
-        <translation>היצוא נכשל</translation>
-    </message>
-    <message>
-        <source>There was an error trying to save the transaction history to %1.</source>
-        <translation>אירעה שגיאה בעת ניסיון לשמור את היסטוריית ההעברות אל %1.</translation>
-    </message>
-    <message>
-        <source>Exporting Successful</source>
-        <translation>היצוא בוצע בהצלחה</translation>
-    </message>
-    <message>
-        <source>The transaction history was successfully saved to %1.</source>
-        <translation>היסטוריית ההעברות נשמרה ל־%1 בהצלחה.</translation>
-    </message>
-    <message>
-        <source>Comma separated file (*.csv)</source>
-        <translation>קובץ מופרד בפסיקים (‎*.csv)</translation>
-    </message>
-    <message>
-        <source>Confirmed</source>
-        <translation>מאושר</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation>תאריך</translation>
-    </message>
-    <message>
-        <source>Type</source>
-        <translation>סוג</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>תווית</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>כתובת</translation>
-    </message>
-    <message>
-        <source>ID</source>
-        <translation>מזהה</translation>
-    </message>
-    <message>
-        <source>Range:</source>
-        <translation>טווח:</translation>
-    </message>
-    <message>
-        <source>to</source>
-        <translation>אל</translation>
-    </message>
-</context>
-<context>
-    <name>UnitDisplayStatusBarControl</name>
-    <message>
-        <source>Unit to show amounts in. Click to select another unit.</source>
-        <translation>יחידת המידה להצגת הסכומים. יש ללחוץ כדי לבחור ביחידת מידה אחרת.</translation>
-    </message>
-</context>
-<context>
-    <name>WalletFrame</name>
-    <message>
-        <source>No wallet has been loaded.</source>
-        <translation>לא נטען ארנק</translation>
-    </message>
-</context>
-<context>
-    <name>WalletModel</name>
-    <message>
-        <source>Send Coins</source>
-        <translation>שליחת מטבעות</translation>
-    </message>
-</context>
-<context>
-    <name>WalletView</name>
-    <message>
-        <source>&amp;Export</source>
-        <translation>י&amp;צוא</translation>
-    </message>
-    <message>
-        <source>Export the data in the current tab to a file</source>
-        <translation>יצוא הנתונים מהלשונית הנוכחית לקובץ</translation>
-    </message>
-    <message>
-        <source>Backup Wallet</source>
-        <translation>גיבוי ארנק</translation>
-    </message>
-    <message>
-        <source>Wallet Data (*.dat)</source>
-        <translation>נתוני ארנק (‎*.dat)</translation>
-    </message>
-    <message>
-        <source>Backup Failed</source>
-        <translation>גיבוי נכשל</translation>
-    </message>
-    <message>
-        <source>There was an error trying to save the wallet data to %1.</source>
-        <translation>אירעה שגיאה בעת ניסיון לשמירת נתוני הארנק אל %1.</translation>
-    </message>
-    <message>
-        <source>The wallet data was successfully saved to %1.</source>
-        <translation>נתוני הארנק נשמרו בהצלחה אל %1.</translation>
-    </message>
-    <message>
-        <source>Backup Successful</source>
-        <translation>הגיבוי הושלם בהצלחה</translation>
-    </message>
-</context>
-<context>
-    <name>bitcoin-core</name>
-    <message>
-        <source>Options:</source>
-        <translation>אפשרויות:</translation>
-    </message>
-    <message>
-        <source>Specify data directory</source>
-        <translation>ציון תיקיית נתונים</translation>
-    </message>
-    <message>
-        <source>Connect to a node to retrieve peer addresses, and disconnect</source>
-        <translation>יש להתחבר למפרק כדי לדלות כתובות עמיתים ואז להתנתק</translation>
-    </message>
-    <message>
-        <source>Specify your own public address</source>
-        <translation>נא לציין את הכתובת הפומבית שלך</translation>
-    </message>
-    <message>
-        <source>Accept command line and JSON-RPC commands</source>
-        <translation>קבלת פקודות משורת הפקודה ומ־JSON-RPC</translation>
-    </message>
-    <message>
-        <source>Run in the background as a daemon and accept commands</source>
-        <translation>ריצה כסוכן ברקע וקבלת פקודות</translation>
-    </message>
-    <message>
-        <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
-        <translation>קבלת חיבורים מבחוץ (בררת מחדל: 1 ללא ‎-proxy או ‎-connect)</translation>
+        <source>The %s developers</source>
+        <translation>ה %s מפתחים</translation>
     </message>
     <message>
         <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source>
@@ -2521,10 +1544,6 @@
         <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
         <translation>זוהי בניית ניסיון טרום-שחרור - השימוש בה על אחריותך - אין להשתמש לצורך כריה או יישומי מסחר</translation>
     </message>
-    <message>
-        <source>Unable to bind to %s on this computer. Bitcoin Core is probably already running.</source>
-        <translation>לא ניתן להתאגד אל %s במחשב זה. כנראה שליבת ביטקוין כבר פועלת.</translation>
-    </message>
     <message>
         <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source>
         <translation>אזהרה: נראה שלא כל הרשת מסכימה! נראה שישנם כורים שנתקלים בבעיות.</translation>
@@ -2533,10 +1552,6 @@
         <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source>
         <translation>אזהרה: נראה שישנה אי־הסכמה בינינו לבין שאר העמיתים שלנו! יתכן שעדיף לשדרג או שכל שאר העמיתים צריכים לשדרג.</translation>
     </message>
-    <message>
-        <source>Warning: wallet.dat corrupt, data salvaged! Original wallet.dat saved as wallet.{timestamp}.bak in %s; if your balance or transactions are incorrect you should restore from a backup.</source>
-        <translation>אזהרה: הקובץ wallet.dat הושחת, המידע חולץ! קובץ ה־wallet.dat המקורי נשמר בשם wallet.{timestamp}.bak במיקום %s; אם המאזן או ההעברות שגויים עליך לשחזר גיבוי.</translation>
-    </message>
     <message>
         <source>&lt;category&gt; can be:</source>
         <translation>&lt;קטגוריה&gt; יכולה להיות:</translation>
@@ -2545,6 +1560,10 @@
         <source>Block creation options:</source>
         <translation>אפשרויות יצירת מקטע:</translation>
     </message>
+    <message>
+        <source>Change index out of range</source>
+        <translation>אינדקס העודף מחוץ לתחום</translation>
+    </message>
     <message>
         <source>Connect only to the specified node(s)</source>
         <translation>התחבר רק לצמתים המצוינים</translation>
@@ -2577,6 +1596,10 @@
         <source>Error initializing wallet database environment %s!</source>
         <translation>שגיאה באתחול סביבת מסד נתוני הארנקים %s!</translation>
     </message>
+    <message>
+        <source>Error loading %s</source>
+        <translation>שגיאה בטעינת %s</translation>
+    </message>
     <message>
         <source>Error loading block database</source>
         <translation>שגיאה בטעינת מסד נתוני המקטעים</translation>
@@ -2605,6 +1628,10 @@
         <source>Invalid -onion address: '%s'</source>
         <translation>כתובת onion- שגויה: '%s'</translation>
     </message>
+    <message>
+        <source>Loading banlist...</source>
+        <translation>טוען רשימת חסומים...</translation>
+    </message>
     <message>
         <source>Not enough file descriptors available.</source>
         <translation>אין מספיק מידע על הקובץ</translation>
@@ -2613,6 +1640,10 @@
         <source>Only connect to nodes in network &lt;net&gt; (ipv4, ipv6 or onion)</source>
         <translation>תמיד להתחבר למפרקים ברשת &lt;net&gt;‏ (ipv4,‏ ipv6 או onion)</translation>
     </message>
+    <message>
+        <source>Print version and exit</source>
+        <translation>הדפס גירסא וצא</translation>
+    </message>
     <message>
         <source>Set database cache size in megabytes (%d to %d, default: %d)</source>
         <translation>הגדרת גודל מטמון מסדי הנתונים במגה בתים (%d עד %d, בררת מחדל: %d)</translation>
@@ -2638,53 +1669,29 @@
         <translation>הארנק %s יושב מחוץ לתיקיית הנתונים %s</translation>
     </message>
     <message>
-        <source>Wallet options:</source>
-        <translation>אפשרויות הארנק:</translation>
+        <source>Wallet debugging/testing options:</source>
+        <translation>אפשרות דיבוג/בדיקת ארנק:</translation>
     </message>
     <message>
-        <source>You need to rebuild the database using -reindex to change -txindex</source>
-        <translation>עליך לבנות מחדש את מסד הנתונים תוך שימוש ב־‎-reindex על מנת לשנות את ‎-txindex</translation>
+        <source>Wallet options:</source>
+        <translation>אפשרויות הארנק:</translation>
     </message>
     <message>
         <source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source>
         <translation>הרץ פקודה כאשר ההתראה הרלוונטית מתקבלת או כשאנחנו עדים לפיצול ארוך מאוד (%s בשורת הפקודה יוחלף ע"י ההודעה)</translation>
     </message>
     <message>
-        <source>Cannot resolve -whitebind address: '%s'</source>
-        <translation>לא ניתן לפתור את הכתובת ‎-whitebind:‏ '%s'</translation>
+        <source>The transaction amount is too small to send after the fee has been deducted</source>
+        <translation>סכום העברה נמוך מדי לשליחה אחרי גביית העמלה</translation>
     </message>
     <message>
         <source>Connect through SOCKS5 proxy</source>
         <translation>התחברות דרך מתווך SOCKS5</translation>
     </message>
-    <message>
-        <source>Copyright (C) 2009-%i The Bitcoin Core Developers</source>
-        <translation>כל הזכויות שמורות (C)‏ 2009‏-%i מתכנתי ליבת ביטקוין</translation>
-    </message>
-    <message>
-        <source>Error loading wallet.dat: Wallet requires newer version of Bitcoin Core</source>
-        <translation>אירעה שגיאה בטעינת wallet.dat: הארנק דורש גרסה חדשה יותר של ליבת ביטקוין</translation>
-    </message>
     <message>
         <source>Information</source>
         <translation>מידע</translation>
     </message>
-    <message>
-        <source>Initialization sanity check failed. Bitcoin Core is shutting down.</source>
-        <translation>בדיקת התקינות ההתחלתית נכשלה. ליבת ביטקוין תיסגר כעת.</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -maxtxfee=&lt;amount&gt;: '%s'</source>
-        <translation>כמות לא תקינה עבור -maxtxfee=&lt;amount&gt;: '%s'</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -minrelaytxfee=&lt;amount&gt;: '%s'</source>
-        <translation>כמות לא תקינה עבור -paytxfee=&lt;amount&gt;: '%s'</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -mintxfee=&lt;amount&gt;: '%s'</source>
-        <translation>כמות לא תקינה עבור ‎-mintxfee=&lt;amount&gt;‎:‏ '%s'</translation>
-    </message>
     <message>
         <source>Invalid amount for -paytxfee=&lt;amount&gt;: '%s' (must be at least %s)</source>
         <translation>כמות לא תקינה עבור ‎-paytxfee=&lt;amount&gt;‎:‏ '%s' (חייבת להיות לפחות %s)</translation>
@@ -2721,6 +1728,10 @@
         <source>Signing transaction failed</source>
         <translation>החתימה על ההעברה נכשלה</translation>
     </message>
+    <message>
+        <source>The transaction amount is too small to pay the fee</source>
+        <translation>סכום ההעברה נמוך מכדי לשלם את העמלה</translation>
+    </message>
     <message>
         <source>This is experimental software.</source>
         <translation>זוהי תכנית נסיונית.</translation>
@@ -2733,6 +1744,10 @@
         <source>Transaction amounts must be positive</source>
         <translation>סכומי ההעברות חייבים להיות חיוביים</translation>
     </message>
+    <message>
+        <source>Transaction too large for fee policy</source>
+        <translation>ההעברה גבוהה מדי עבור מדיניות העמלות</translation>
+    </message>
     <message>
         <source>Transaction too large</source>
         <translation>סכום ההעברה גדול מדי</translation>
@@ -2742,21 +1757,17 @@
         <translation>לא ניתן להתאגד עם הפתחה %s במחשב זה (פעולת האיגוד החזירה את השגיאה %s)</translation>
     </message>
     <message>
-        <source>Username for JSON-RPC connections</source>
-        <translation>שם משתמש לחיבורי JSON-RPC</translation>
+        <source>Upgrade wallet to latest format on startup</source>
+        <translation>עדכן ארק לפורמט העדכני בהפעלה</translation>
     </message>
     <message>
-        <source>Wallet needed to be rewritten: restart Bitcoin Core to complete</source>
-        <translation>יש לכתוב את הארנק מחדש: נא להפעיל את ליבת ביטקוין מחדש כדי להשלים את הפעולה</translation>
+        <source>Username for JSON-RPC connections</source>
+        <translation>שם משתמש לחיבורי JSON-RPC</translation>
     </message>
     <message>
         <source>Warning</source>
         <translation>אזהרה</translation>
     </message>
-    <message>
-        <source>wallet.dat corrupt, salvage failed</source>
-        <translation>קובץ wallet.dat מושחת, החילוץ נכשל</translation>
-    </message>
     <message>
         <source>Password for JSON-RPC connections</source>
         <translation>ססמה לחיבורי JSON-RPC</translation>
@@ -2765,10 +1776,6 @@
         <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
         <translation>יש לבצע פקודה זו כשהמקטע הטוב ביותר משתנה (%s בפקודה יוחלף בגיבוב המקטע)</translation>
     </message>
-    <message>
-        <source>This help message</source>
-        <translation>הודעת העזרה הזו</translation>
-    </message>
     <message>
         <source>Allow DNS lookups for -addnode, -seednode and -connect</source>
         <translation>הפעלת בדיקת DNS עבור ‎-addnode,‏ ‎-seednode ו־‎-connect</translation>
@@ -2778,12 +1785,8 @@
         <translation>הכתובות בטעינה…</translation>
     </message>
     <message>
-        <source>Error loading wallet.dat: Wallet corrupted</source>
-        <translation>שגיאה בטעינת הקובץ wallet.dat: הארנק מושחת</translation>
-    </message>
-    <message>
-        <source>Error loading wallet.dat</source>
-        <translation>שגיאה בטעינת הקובץ wallet.dat</translation>
+        <source>(default: %s)</source>
+        <translation>(ברירת מחדל: %s)</translation>
     </message>
     <message>
         <source>Invalid -proxy address: '%s'</source>
@@ -2793,18 +1796,6 @@
         <source>Unknown network specified in -onlynet: '%s'</source>
         <translation>רשת לא ידועה צוינה דרך ‎-onlynet:‏ '%s'</translation>
     </message>
-    <message>
-        <source>Cannot resolve -bind address: '%s'</source>
-        <translation>לא ניתן לפתור את הכתובת ‎-bind:‏ '%s'</translation>
-    </message>
-    <message>
-        <source>Cannot resolve -externalip address: '%s'</source>
-        <translation>לא ניתן לפתור את הכתובת ‎-externalip:‏ '%s'</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -paytxfee=&lt;amount&gt;: '%s'</source>
-        <translation>כמות לא תקינה עבור ‎-paytxfee=&lt;amount&gt;‎:‏ '%s'</translation>
-    </message>
     <message>
         <source>Insufficient funds</source>
         <translation>אין מספיק כספים</translation>
diff --git a/src/qt/locale/bitcoin_hi_IN.ts b/src/qt/locale/bitcoin_hi_IN.ts
index 377ff3a3faf10..86c53b4ce3dfd 100644
--- a/src/qt/locale/bitcoin_hi_IN.ts
+++ b/src/qt/locale/bitcoin_hi_IN.ts
@@ -9,41 +9,10 @@
         <source>Copy the currently selected address to the system clipboard</source>
         <translation>चुनिन्दा पते को सिस्टम क्लिपबोर्ड पर कापी करे !</translation>
     </message>
-    <message>
-        <source>&amp;Copy Address</source>
-        <translation>&amp;पता कॉपी करे</translation>
-    </message>
     <message>
         <source>&amp;Delete</source>
         <translation>&amp;मिटाए !!</translation>
     </message>
-    <message>
-        <source>Copy &amp;Label</source>
-        <translation>&amp;लेबल कॉपी करे </translation>
-    </message>
-    <message>
-        <source>&amp;Edit</source>
-        <translation>&amp;एडिट</translation>
-    </message>
-    <message>
-        <source>Comma separated file (*.csv)</source>
-        <translation>Comma separated file (*.csv)</translation>
-    </message>
-    </context>
-<context>
-    <name>AddressTableModel</name>
-    <message>
-        <source>Label</source>
-        <translation>लेबल</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>पता</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(कोई लेबल नही !)</translation>
-    </message>
 </context>
 <context>
     <name>AskPassphraseDialog</name>
@@ -59,63 +28,7 @@
         <source>Repeat new passphrase</source>
         <translation>दोबारा नया पहचान शब्द/अक्षर डालिए !</translation>
     </message>
-    <message>
-        <source>Encrypt wallet</source>
-        <translation>एनक्रिप्ट वॉलेट !</translation>
-    </message>
-    <message>
-        <source>This operation needs your wallet passphrase to unlock the wallet.</source>
-        <translation>वॉलेट खोलने के आपका वॉलेट पहचान शब्द्‌/अक्षर चाईए !</translation>
-    </message>
-    <message>
-        <source>Unlock wallet</source>
-        <translation>वॉलेट खोलिए</translation>
-    </message>
-    <message>
-        <source>This operation needs your wallet passphrase to decrypt the wallet.</source>
-        <translation>वॉलेट डीक्रिप्ट( विकोड) करने के लिए आपका वॉलेट पहचान शब्द्‌/अक्षर चाईए !</translation>
-    </message>
-    <message>
-        <source>Decrypt wallet</source>
-        <translation> डीक्रिप्ट वॉलेट</translation>
-    </message>
-    <message>
-        <source>Change passphrase</source>
-        <translation>पहचान शब्द/अक्षर बदलिये !</translation>
-    </message>
-    <message>
-        <source>Confirm wallet encryption</source>
-        <translation>वॉलेट एनक्रिपशन को प्रमाणित कीजिए !</translation>
-    </message>
-    <message>
-        <source>Wallet encrypted</source>
-        <translation>वॉलेट एनक्रिप्ट हो गया !</translation>
-    </message>
-    <message>
-        <source>Wallet encryption failed</source>
-        <translation>वॉलेट एनक्रिप्ट नही हुआ!</translation>
-    </message>
-    <message>
-        <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
-        <translation>वॉलेट एनक्रिपशन नाकाम हो गया इंटर्नल एरर की वजह से! आपका वॉलेट एनक्रीपत नही हुआ है!</translation>
-    </message>
-    <message>
-        <source>The supplied passphrases do not match.</source>
-        <translation>आपके द्वारा डाले गये पहचान शब्द/अक्षर मिलते नही है !</translation>
-    </message>
-    <message>
-        <source>Wallet unlock failed</source>
-        <translation>वॉलेट का लॉक नही खुला !</translation>
-    </message>
-    <message>
-        <source>The passphrase entered for the wallet decryption was incorrect.</source>
-        <translation>वॉलेट डीक्रिप्ट करने के लिए जो पहचान शब्द/अक्षर डाले गये है वो सही नही है!</translation>
-    </message>
-    <message>
-        <source>Wallet decryption failed</source>
-        <translation>वॉलेट का डीक्रिप्ट-ष्ण असफल !</translation>
-    </message>
-    </context>
+</context>
 <context>
     <name>BanTableModel</name>
     </context>
@@ -223,9 +136,6 @@
         <translation>वॉलेट एन्क्रिप्टेड है तथा अभी लॉक्ड है</translation>
     </message>
 </context>
-<context>
-    <name>ClientModel</name>
-    </context>
 <context>
     <name>CoinControlDialog</name>
     <message>
@@ -244,22 +154,6 @@
         <source>Confirmed</source>
         <translation>पक्का</translation>
     </message>
-    <message>
-        <source>Copy address</source>
-        <translation>पता कॉपी करे</translation>
-    </message>
-    <message>
-        <source>Copy label</source>
-        <translation>लेबल कॉपी करे </translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>कॉपी राशि</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(कोई लेबल नही !)</translation>
-    </message>
     </context>
 <context>
     <name>EditAddressDialog</name>
@@ -275,34 +169,6 @@
         <source>&amp;Address</source>
         <translation>&amp;पता</translation>
     </message>
-    <message>
-        <source>New receiving address</source>
-        <translation>नया स्वीकार्य पता</translation>
-    </message>
-    <message>
-        <source>New sending address</source>
-        <translation>नया भेजने वाला पता</translation>
-    </message>
-    <message>
-        <source>Edit receiving address</source>
-        <translation>एडिट स्वीकार्य पता </translation>
-    </message>
-    <message>
-        <source>Edit sending address</source>
-        <translation>एडिट भेजने वाला पता</translation>
-    </message>
-    <message>
-        <source>The entered address "%1" is already in the address book.</source>
-        <translation>डाला गया पता "%1" एड्रेस बुक में पहले से ही मोजूद है|</translation>
-    </message>
-    <message>
-        <source>Could not unlock wallet.</source>
-        <translation>वॉलेट को unlock नहीं किया जा सकता|</translation>
-    </message>
-    <message>
-        <source>New key generation failed.</source>
-        <translation>नयी कुंजी का निर्माण असफल रहा|</translation>
-    </message>
 </context>
 <context>
     <name>FreespaceChecker</name>
@@ -354,9 +220,6 @@
         <translation>फार्म</translation>
     </message>
     </context>
-<context>
-    <name>PaymentServer</name>
-    </context>
 <context>
     <name>PeerTableModel</name>
     </context>
@@ -372,9 +235,6 @@
 </translation>
     </message>
     </context>
-<context>
-    <name>QRImageWidget</name>
-    </context>
 <context>
     <name>RPCConsole</name>
     <message>
@@ -397,52 +257,13 @@
         <source>&amp;Label:</source>
         <translation>लेबल:</translation>
     </message>
-    <message>
-        <source>Copy label</source>
-        <translation>लेबल कॉपी करे </translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>कॉपी राशि</translation>
-    </message>
-</context>
+    </context>
 <context>
     <name>ReceiveRequestDialog</name>
     <message>
         <source>Copy &amp;Address</source>
         <translation>&amp;पता कॉपी करे</translation>
     </message>
-    <message>
-        <source>Address</source>
-        <translation>पता</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>राशि</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>लेबल</translation>
-    </message>
-    </context>
-<context>
-    <name>RecentRequestsTableModel</name>
-    <message>
-        <source>Date</source>
-        <translation>taareek</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>लेबल</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>राशि</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(कोई लेबल नही !)</translation>
-    </message>
     </context>
 <context>
     <name>SendCoinsDialog</name>
@@ -466,22 +287,6 @@
         <source>Confirm the send action</source>
         <translation>भेजने की पुष्टि करें</translation>
     </message>
-    <message>
-        <source>Confirm send coins</source>
-        <translation>सिक्के भेजने की पुष्टि करें</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>कॉपी राशि</translation>
-    </message>
-    <message>
-        <source>The amount to pay must be larger than 0.</source>
-        <translation>भेजा गया अमाउंट शुन्य से अधिक होना चाहिए|</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(कोई लेबल नही !)</translation>
-    </message>
     </context>
 <context>
     <name>SendCoinsEntry</name>
@@ -493,10 +298,6 @@
         <source>Pay &amp;To:</source>
         <translation>प्राप्तकर्ता:</translation>
     </message>
-    <message>
-        <source>Enter a label for this address to add it to your address book</source>
-        <translation>आपकी एड्रेस बुक में इस एड्रेस के लिए एक लेबल लिखें</translation>
-    </message>
     <message>
         <source>&amp;Label:</source>
         <translation>लेबल:</translation>
@@ -550,274 +351,16 @@
 <context>
     <name>TrafficGraphWidget</name>
     </context>
-<context>
-    <name>TransactionDesc</name>
-    <message>
-        <source>Open until %1</source>
-        <translation>खुला है जबतक %1</translation>
-    </message>
-    <message>
-        <source>%1/unconfirmed</source>
-        <translation>%1/अपुष्ट</translation>
-    </message>
-    <message>
-        <source>%1 confirmations</source>
-        <translation>%1 पुष्टियाँ</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation>taareek</translation>
-    </message>
-    <message>
-        <source>Transaction ID</source>
-        <translation>ID</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>राशि</translation>
-    </message>
-    <message>
-        <source>true</source>
-        <translation>सही</translation>
-    </message>
-    <message>
-        <source>false</source>
-        <translation>ग़लत</translation>
-    </message>
-    <message>
-        <source>, has not been successfully broadcast yet</source>
-        <translation>, अभी तक सफलतापूर्वक प्रसारित नहीं किया गया है</translation>
-    </message>
-    <message>
-        <source>unknown</source>
-        <translation>अज्ञात</translation>
-    </message>
-</context>
 <context>
     <name>TransactionDescDialog</name>
-    <message>
-        <source>Transaction details</source>
-        <translation>लेन-देन का विवरण</translation>
-    </message>
     <message>
         <source>This pane shows a detailed description of the transaction</source>
         <translation> ये खिड़की आपको लेन-देन का विस्तृत विवरण देगी !</translation>
     </message>
 </context>
-<context>
-    <name>TransactionTableModel</name>
-    <message>
-        <source>Date</source>
-        <translation>taareek</translation>
-    </message>
-    <message>
-        <source>Type</source>
-        <translation>टाइप</translation>
-    </message>
-    <message>
-        <source>Open until %1</source>
-        <translation>खुला है जबतक %1</translation>
-    </message>
-    <message>
-        <source>Confirmed (%1 confirmations)</source>
-        <translation>पक्के  ( %1 पक्का करना)</translation>
-    </message>
-    <message>
-        <source>This block was not received by any other nodes and will probably not be accepted!</source>
-        <translation>यह ब्लॉक किसी भी और नोड को मिला नही है ! शायद यह ब्लॉक कोई भी नोड स्वीकारे गा नही !</translation>
-    </message>
-    <message>
-        <source>Generated but not accepted</source>
-        <translation>जेनरेट किया गया किंतु स्वीकारा नही गया !</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>लेबल</translation>
-    </message>
-    <message>
-        <source>Received with</source>
-        <translation>स्वीकार करना</translation>
-    </message>
-    <message>
-        <source>Received from</source>
-        <translation>स्वीकार्य ओर से</translation>
-    </message>
-    <message>
-        <source>Sent to</source>
-        <translation>भेजा गया</translation>
-    </message>
-    <message>
-        <source>Payment to yourself</source>
-        <translation>भेजा खुद को भुगतान</translation>
-    </message>
-    <message>
-        <source>Mined</source>
-        <translation>माइंड</translation>
-    </message>
-    <message>
-        <source>(n/a)</source>
-        <translation>(लागू नहीं)</translation>
-    </message>
-    <message>
-        <source>Transaction status. Hover over this field to show number of confirmations.</source>
-        <translation>ट्रांसेक्शन स्तिथि| पुष्टियों की संख्या जानने के लिए इस जगह पर माउस लायें|</translation>
-    </message>
-    <message>
-        <source>Date and time that the transaction was received.</source>
-        <translation>तारीख तथा समय जब ये ट्रांसेक्शन प्राप्त हुई थी|</translation>
-    </message>
-    <message>
-        <source>Type of transaction.</source>
-        <translation>ट्रांसेक्शन का प्रकार|</translation>
-    </message>
-    <message>
-        <source>Amount removed from or added to balance.</source>
-        <translation>अमाउंट बैलेंस से निकला या जमा किया गया |</translation>
-    </message>
-</context>
-<context>
-    <name>TransactionView</name>
-    <message>
-        <source>All</source>
-        <translation>सभी</translation>
-    </message>
-    <message>
-        <source>Today</source>
-        <translation>आज</translation>
-    </message>
-    <message>
-        <source>This week</source>
-        <translation>इस हफ्ते</translation>
-    </message>
-    <message>
-        <source>This month</source>
-        <translation>इस महीने</translation>
-    </message>
-    <message>
-        <source>Last month</source>
-        <translation>पिछले महीने</translation>
-    </message>
-    <message>
-        <source>This year</source>
-        <translation>इस साल</translation>
-    </message>
-    <message>
-        <source>Range...</source>
-        <translation>विस्तार...</translation>
-    </message>
-    <message>
-        <source>Received with</source>
-        <translation>स्वीकार करना</translation>
-    </message>
-    <message>
-        <source>Sent to</source>
-        <translation>भेजा गया</translation>
-    </message>
-    <message>
-        <source>To yourself</source>
-        <translation>अपनेआप को</translation>
-    </message>
-    <message>
-        <source>Mined</source>
-        <translation>माइंड</translation>
-    </message>
-    <message>
-        <source>Other</source>
-        <translation>अन्य</translation>
-    </message>
-    <message>
-        <source>Enter address or label to search</source>
-        <translation>ढूँदने के लिए कृपा करके पता या लेबल टाइप करे !</translation>
-    </message>
-    <message>
-        <source>Min amount</source>
-        <translation>लघुत्तम राशि</translation>
-    </message>
-    <message>
-        <source>Copy address</source>
-        <translation>पता कॉपी करे</translation>
-    </message>
-    <message>
-        <source>Copy label</source>
-        <translation>लेबल कॉपी करे </translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>कॉपी राशि</translation>
-    </message>
-    <message>
-        <source>Edit label</source>
-        <translation>एडिट लेबल</translation>
-    </message>
-    <message>
-        <source>Comma separated file (*.csv)</source>
-        <translation>Comma separated file (*.csv)</translation>
-    </message>
-    <message>
-        <source>Confirmed</source>
-        <translation>पक्का</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation>taareek</translation>
-    </message>
-    <message>
-        <source>Type</source>
-        <translation>टाइप</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>लेबल</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>पता</translation>
-    </message>
-    <message>
-        <source>ID</source>
-        <translation>ID</translation>
-    </message>
-    <message>
-        <source>Range:</source>
-        <translation>विस्तार:</translation>
-    </message>
-    <message>
-        <source>to</source>
-        <translation>तक</translation>
-    </message>
-</context>
 <context>
     <name>UnitDisplayStatusBarControl</name>
     </context>
-<context>
-    <name>WalletFrame</name>
-    </context>
-<context>
-    <name>WalletModel</name>
-    <message>
-        <source>Send Coins</source>
-        <translation>सिक्के भेजें|</translation>
-    </message>
-</context>
-<context>
-    <name>WalletView</name>
-    <message>
-        <source>Backup Wallet</source>
-        <translation>बैकप वॉलेट</translation>
-    </message>
-    <message>
-        <source>Wallet Data (*.dat)</source>
-        <translation>वॉलेट डेटा (*.dat)</translation>
-    </message>
-    <message>
-        <source>Backup Failed</source>
-        <translation>बैकप असफल</translation>
-    </message>
-    <message>
-        <source>Backup Successful</source>
-        <translation>बैकप सफल</translation>
-    </message>
-</context>
 <context>
     <name>bitcoin-core</name>
     <message>
diff --git a/src/qt/locale/bitcoin_hr.ts b/src/qt/locale/bitcoin_hr.ts
index f9d744aa3ec37..0d8d3d5c99e78 100644
--- a/src/qt/locale/bitcoin_hr.ts
+++ b/src/qt/locale/bitcoin_hr.ts
@@ -25,10 +25,6 @@
         <source>C&amp;lose</source>
         <translation>&amp;Zatvori</translation>
     </message>
-    <message>
-        <source>&amp;Copy Address</source>
-        <translation>&amp;Kopiraj adresu</translation>
-    </message>
     <message>
         <source>Delete the currently selected address from the list</source>
         <translation>Brisanje trenutno odabrane adrese s popisa.</translation>
@@ -45,73 +41,6 @@
         <source>&amp;Delete</source>
         <translation>Iz&amp;briši</translation>
     </message>
-    <message>
-        <source>Choose the address to send coins to</source>
-        <translation>Odaberi adresu na koju šalješ novac</translation>
-    </message>
-    <message>
-        <source>Choose the address to receive coins with</source>
-        <translation>Odaberi adresu na koju primaš novac</translation>
-    </message>
-    <message>
-        <source>C&amp;hoose</source>
-        <translation>&amp;Odaberi</translation>
-    </message>
-    <message>
-        <source>Sending addresses</source>
-        <translation>Adresa za slanje</translation>
-    </message>
-    <message>
-        <source>Receiving addresses</source>
-        <translation>Adresa za primanje</translation>
-    </message>
-    <message>
-        <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source>
-        <translation>Ovo su vaše Bitcoin adrese za slanje novca. Uvijek provjerite iznos i adresu primatelja prije slanja novca.</translation>
-    </message>
-    <message>
-        <source>These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source>
-        <translation>Ovo su vaše Bitcoin adrese za primanje novca. Preporučamo da koristite novu adresu za primanje za svaku transakciju.</translation>
-    </message>
-    <message>
-        <source>Copy &amp;Label</source>
-        <translation>Kopiraj &amp;oznaku</translation>
-    </message>
-    <message>
-        <source>&amp;Edit</source>
-        <translation>&amp;Uredi</translation>
-    </message>
-    <message>
-        <source>Export Address List</source>
-        <translation>Izvezi listu adresa</translation>
-    </message>
-    <message>
-        <source>Comma separated file (*.csv)</source>
-        <translation>Datoteka podataka odvojenih zarezima (*.csv)</translation>
-    </message>
-    <message>
-        <source>Exporting Failed</source>
-        <translation>Izvoz neuspješan</translation>
-    </message>
-    <message>
-        <source>There was an error trying to save the address list to %1. Please try again.</source>
-        <translation>Došlo je do pogreške kod spremanja liste adresa na %1. Molimo pokušajte ponovno.</translation>
-    </message>
-</context>
-<context>
-    <name>AddressTableModel</name>
-    <message>
-        <source>Label</source>
-        <translation>Oznaka</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>Adresa</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(bez oznake)</translation>
-    </message>
 </context>
 <context>
     <name>AskPassphraseDialog</name>
@@ -131,90 +60,6 @@
         <source>Repeat new passphrase</source>
         <translation>Ponovite novu lozinku</translation>
     </message>
-    <message>
-        <source>Encrypt wallet</source>
-        <translation>Šifriranje novčanika</translation>
-    </message>
-    <message>
-        <source>This operation needs your wallet passphrase to unlock the wallet.</source>
-        <translation>Ova operacija treba lozinku vašeg novčanika kako bi se novčanik otključao.</translation>
-    </message>
-    <message>
-        <source>Unlock wallet</source>
-        <translation>Otključaj novčanik</translation>
-    </message>
-    <message>
-        <source>This operation needs your wallet passphrase to decrypt the wallet.</source>
-        <translation>Ova operacija treba lozinku vašeg novčanika kako bi se novčanik dešifrirao.</translation>
-    </message>
-    <message>
-        <source>Decrypt wallet</source>
-        <translation>Dešifriranje novčanika.</translation>
-    </message>
-    <message>
-        <source>Change passphrase</source>
-        <translation>Promjena lozinke</translation>
-    </message>
-    <message>
-        <source>Confirm wallet encryption</source>
-        <translation>Potvrdi šifriranje novčanika</translation>
-    </message>
-    <message>
-        <source>Warning: If you encrypt your wallet and lose your passphrase, you will &lt;b&gt;LOSE ALL OF YOUR BITCOINS&lt;/b&gt;!</source>
-        <translation>Upozorenje: Ako šifrirate vaš novčanik i izgubite lozinku, &lt;b&gt;IZGUBIT ĆETE SVE SVOJE BITCOINE!&lt;/b&gt;</translation>
-    </message>
-    <message>
-        <source>Are you sure you wish to encrypt your wallet?</source>
-        <translation>Jeste li sigurni da želite šifrirati svoj novčanik?</translation>
-    </message>
-    <message>
-        <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source>
-        <translation>VAŽNO: Sve prethodne pričuve vašeg novčanika trebale bi biti zamijenjene novo stvorenom, šifriranom datotekom novčanika. Zbog sigurnosnih razloga, prethodne pričuve nešifriranog novčanika će postati beskorisne čim počnete koristiti novi, šifrirani novčanik.</translation>
-    </message>
-    <message>
-        <source>Warning: The Caps Lock key is on!</source>
-        <translation>Upozorenje: Tipka Caps Lock je uključena!</translation>
-    </message>
-    <message>
-        <source>Wallet encrypted</source>
-        <translation>Novčanik šifriran</translation>
-    </message>
-    <message>
-        <source>Enter the new passphrase to the wallet.&lt;br/&gt;Please use a passphrase of &lt;b&gt;ten or more random characters&lt;/b&gt;, or &lt;b&gt;eight or more words&lt;/b&gt;.</source>
-        <translation>Unesite novu lozinku za novčanik. &lt;br/&gt;Molimo Vas da koristite zaporku od &lt;b&gt;deset ili više slučajnih znakova&lt;/b&gt;, ili &lt;b&gt;osam ili više riječi.&lt;/b&gt;</translation>
-    </message>
-    <message>
-        <source>Enter the old passphrase and new passphrase to the wallet.</source>
-        <translation>Unesite staru i novu lozinku za novčanik.</translation>
-    </message>
-    <message>
-        <source>Wallet encryption failed</source>
-        <translation>Šifriranje novčanika nije uspjelo</translation>
-    </message>
-    <message>
-        <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
-        <translation>Šifriranje novčanika nije uspjelo zbog interne pogreške. Vaš novčanik nije šifriran.</translation>
-    </message>
-    <message>
-        <source>The supplied passphrases do not match.</source>
-        <translation>Priložene lozinke se ne podudaraju.</translation>
-    </message>
-    <message>
-        <source>Wallet unlock failed</source>
-        <translation>Otključavanje novčanika nije uspjelo</translation>
-    </message>
-    <message>
-        <source>The passphrase entered for the wallet decryption was incorrect.</source>
-        <translation>Lozinka za dešifriranje novčanika nije točna.</translation>
-    </message>
-    <message>
-        <source>Wallet decryption failed</source>
-        <translation>Dešifriranje novčanika nije uspjelo</translation>
-    </message>
-    <message>
-        <source>Wallet passphrase was successfully changed.</source>
-        <translation>Lozinka novčanika je uspješno promijenjena.</translation>
-    </message>
 </context>
 <context>
     <name>BanTableModel</name>
@@ -257,6 +102,10 @@
         <source>Quit application</source>
         <translation>Izlazak iz programa</translation>
     </message>
+    <message>
+        <source>&amp;About %1</source>
+        <translation>&amp;Više o %1</translation>
+    </message>
     <message>
         <source>About &amp;Qt</source>
         <translation>Više o &amp;Qt</translation>
@@ -293,14 +142,6 @@
         <source>Open &amp;URI...</source>
         <translation>Otvori &amp;URI...</translation>
     </message>
-    <message>
-        <source>Bitcoin Core client</source>
-        <translation>Bitcoin Core klijent</translation>
-    </message>
-    <message>
-        <source>Importing blocks from disk...</source>
-        <translation>Importiranje blokova sa diska...</translation>
-    </message>
     <message>
         <source>Reindexing blocks on disk...</source>
         <translation>Re-indeksiranje blokova na disku...</translation>
@@ -345,10 +186,6 @@
         <source>&amp;Receive</source>
         <translation>Pri&amp;mi</translation>
     </message>
-    <message>
-        <source>Show information about Bitcoin Core</source>
-        <translation>Prikaži informacije o programu Bitcoin Core</translation>
-    </message>
     <message>
         <source>&amp;Show / Hide</source>
         <translation>Po&amp;kaži / Sakrij</translation>
@@ -385,22 +222,10 @@
         <source>Tabs toolbar</source>
         <translation>Traka kartica</translation>
     </message>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Bitcoin Core</translation>
-    </message>
     <message>
         <source>Request payments (generates QR codes and bitcoin: URIs)</source>
         <translation>Zatraži uplatu (stvara QR kod i bitcoin: URI adresu)</translation>
     </message>
-    <message>
-        <source>&amp;About Bitcoin Core</source>
-        <translation>&amp;O programu Bitcoin Core</translation>
-    </message>
-    <message>
-        <source>Modify configuration options for Bitcoin Core</source>
-        <translation>Promijeni postavke programa</translation>
-    </message>
     <message>
         <source>Show the list of used sending addresses and labels</source>
         <translation>Prikaži popis korištenih adresa i oznaka za slanje novca</translation>
@@ -417,10 +242,6 @@
         <source>&amp;Command-line options</source>
         <translation>Opcije &amp;naredbene linije</translation>
     </message>
-    <message>
-        <source>Show the Bitcoin Core help message to get a list with possible Bitcoin command-line options</source>
-        <translation>Ispis svih opcija naredbene linije programa sa kratkim opisom</translation>
-    </message>
     <message numerus="yes">
         <source>%n active connection(s) to Bitcoin network</source>
         <translation><numerusform>%n aktivna veza na Bitcoin mrežu</numerusform><numerusform>%n aktivnih veza na Bitcoin mrežu</numerusform><numerusform>%n aktivnih veza na Bitcoin mrežu</numerusform></translation>
@@ -524,9 +345,6 @@
         <translation>Novčanik je &lt;b&gt;šifriran&lt;/b&gt; i trenutno &lt;b&gt;zaključan&lt;/b&gt;</translation>
     </message>
 </context>
-<context>
-    <name>ClientModel</name>
-    </context>
 <context>
     <name>CoinControlDialog</name>
     <message>
@@ -593,87 +411,7 @@
         <source>Priority</source>
         <translation>Prioriteta</translation>
     </message>
-    <message>
-        <source>Copy address</source>
-        <translation>Kopiraj adresu</translation>
-    </message>
-    <message>
-        <source>Copy label</source>
-        <translation>Kopiraj oznaku</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>Kopiraj iznos</translation>
-    </message>
-    <message>
-        <source>Copy transaction ID</source>
-        <translation>Kopiraj ID transakcije</translation>
-    </message>
-    <message>
-        <source>highest</source>
-        <translation>najviša</translation>
-    </message>
-    <message>
-        <source>higher</source>
-        <translation>viša</translation>
-    </message>
-    <message>
-        <source>high</source>
-        <translation>visoka</translation>
-    </message>
-    <message>
-        <source>medium-high</source>
-        <translation>srednje visoka</translation>
-    </message>
-    <message>
-        <source>medium</source>
-        <translation>srednja</translation>
-    </message>
-    <message>
-        <source>low-medium</source>
-        <translation>srednje niska</translation>
-    </message>
-    <message>
-        <source>low</source>
-        <translation>niska</translation>
-    </message>
-    <message>
-        <source>lower</source>
-        <translation>niža</translation>
-    </message>
-    <message>
-        <source>lowest</source>
-        <translation>najniža</translation>
-    </message>
-    <message>
-        <source>This label turns red if the transaction size is greater than 1000 bytes.</source>
-        <translation>Oznaka postane crvene boje ako je transakcija veća od 1000 bajtova.</translation>
-    </message>
-    <message>
-        <source>This label turns red if the priority is smaller than "medium".</source>
-        <translation>Oznaka postane crvene boje ako je prioriteta transakcije niža od "srednja"</translation>
-    </message>
-    <message>
-        <source>This label turns red if any recipient receives an amount smaller than %1.</source>
-        <translation>Oznaka postane crvene boje ako je iznos manji od %1</translation>
-    </message>
-    <message>
-        <source>yes</source>
-        <translation>da</translation>
-    </message>
-    <message>
-        <source>no</source>
-        <translation>ne</translation>
-    </message>
-    <message>
-        <source>Transactions with higher priority are more likely to get included into a block.</source>
-        <translation>Transakcije više prioritete imaju veću vjerojatnost da budu prije dodane u novi blok.</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(bez oznake)</translation>
-    </message>
-    </context>
+</context>
 <context>
     <name>EditAddressDialog</name>
     <message>
@@ -696,38 +434,6 @@
         <source>&amp;Address</source>
         <translation>&amp;Adresa</translation>
     </message>
-    <message>
-        <source>New receiving address</source>
-        <translation>Nova adresa za primanje</translation>
-    </message>
-    <message>
-        <source>New sending address</source>
-        <translation>Nova adresa za slanje</translation>
-    </message>
-    <message>
-        <source>Edit receiving address</source>
-        <translation>Uredi adresu za primanje</translation>
-    </message>
-    <message>
-        <source>Edit sending address</source>
-        <translation>Uredi adresu za slanje</translation>
-    </message>
-    <message>
-        <source>The entered address "%1" is already in the address book.</source>
-        <translation>Upisana adresa "%1" je već u adresaru.</translation>
-    </message>
-    <message>
-        <source>The entered address "%1" is not a valid Bitcoin address.</source>
-        <translation>Upisana adresa "%1" nije valjana bitcoin adresa.</translation>
-    </message>
-    <message>
-        <source>Could not unlock wallet.</source>
-        <translation>Ne mogu otključati novčanik.</translation>
-    </message>
-    <message>
-        <source>New key generation failed.</source>
-        <translation>Stvaranje novog ključa nije uspjelo.</translation>
-    </message>
 </context>
 <context>
     <name>FreespaceChecker</name>
@@ -746,10 +452,6 @@
 </context>
 <context>
     <name>HelpMessageDialog</name>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Bitcoin Core</translation>
-    </message>
     <message>
         <source>version</source>
         <translation>verzija</translation>
@@ -758,10 +460,6 @@
         <source>(%1-bit)</source>
         <translation>(%1-bit)</translation>
     </message>
-    <message>
-        <source>About Bitcoin Core</source>
-        <translation>O programu Bitcoin Core</translation>
-    </message>
     <message>
         <source>Command-line options</source>
         <translation>Opcije programa u naredbenoj liniji</translation>
@@ -781,14 +479,6 @@
         <source>Welcome</source>
         <translation>Dobrodošli</translation>
     </message>
-    <message>
-        <source>Welcome to Bitcoin Core.</source>
-        <translation>Dobrodošli u programu Bitcoin Core.</translation>
-    </message>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Bitcoin Core</translation>
-    </message>
     <message>
         <source>Error</source>
         <translation>Greška</translation>
@@ -812,10 +502,6 @@
         <source>Select payment request file</source>
         <translation>Izaberi datoteku zahtjeva za plaćanje</translation>
     </message>
-    <message>
-        <source>Select payment request file to open</source>
-        <translation>Izaberi datoteku zahtjeva za plaćanje</translation>
-    </message>
 </context>
 <context>
     <name>OptionsDialog</name>
@@ -863,14 +549,6 @@
         <source>&amp;Network</source>
         <translation>&amp;Mreža</translation>
     </message>
-    <message>
-        <source>Automatically start Bitcoin Core after logging in to the system.</source>
-        <translation>Program se automatski pokrene po prijavi u sustav.</translation>
-    </message>
-    <message>
-        <source>&amp;Start Bitcoin Core on system login</source>
-        <translation>&amp;Pokreni program kod prijave u sustav</translation>
-    </message>
     <message>
         <source>W&amp;allet</source>
         <translation>&amp;Novčanik</translation>
@@ -963,13 +641,6 @@
         <translation>Ukupno:</translation>
     </message>
     </context>
-<context>
-    <name>PaymentServer</name>
-    <message>
-        <source>URI handling</source>
-        <translation>URI upravljanje</translation>
-    </message>
-    </context>
 <context>
     <name>PeerTableModel</name>
     </context>
@@ -984,17 +655,6 @@
         <translation>N/A</translation>
     </message>
     </context>
-<context>
-    <name>QRImageWidget</name>
-    <message>
-        <source>&amp;Save Image...</source>
-        <translation>&amp;Spremi sliku...</translation>
-    </message>
-    <message>
-        <source>Save QR Code</source>
-        <translation>Spremi QR kod</translation>
-    </message>
-    </context>
 <context>
     <name>RPCConsole</name>
     <message>
@@ -1081,10 +741,6 @@
         <source>Clear console</source>
         <translation>Očisti konzolu</translation>
     </message>
-    <message>
-        <source>Welcome to the Bitcoin Core RPC console.</source>
-        <translation>Dobrodošli u Bitcoin RPC konzolu.</translation>
-    </message>
     <message>
         <source>Use up and down arrows to navigate history, and &lt;b&gt;Ctrl-L&lt;/b&gt; to clear screen.</source>
         <translation>Koristite tipke gore i dolje za izbor već korištenih naredbi. &lt;b&gt;Ctrl-L&lt;/b&gt; kako bi očistili ekran i povijest naredbi.</translation>
@@ -1120,15 +776,7 @@
         <source>Show</source>
         <translation>Pokaži</translation>
     </message>
-    <message>
-        <source>Copy label</source>
-        <translation>Kopiraj oznaku</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>Kopiraj iznos</translation>
-    </message>
-</context>
+    </context>
 <context>
     <name>ReceiveRequestDialog</name>
     <message>
@@ -1147,65 +795,6 @@
         <source>&amp;Save Image...</source>
         <translation>&amp;Spremi sliku...</translation>
     </message>
-    <message>
-        <source>URI</source>
-        <translation>URI</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>Adresa</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>Iznos</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Oznaka</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>Poruka</translation>
-    </message>
-    <message>
-        <source>Resulting URI too long, try to reduce the text for label / message.</source>
-        <translation>URI je predug, probajte skratiti tekst za naslov / poruku.</translation>
-    </message>
-    <message>
-        <source>Error encoding URI into QR Code.</source>
-        <translation>Greška kod kodiranja URI adrese u QR kod.</translation>
-    </message>
-</context>
-<context>
-    <name>RecentRequestsTableModel</name>
-    <message>
-        <source>Date</source>
-        <translation>Datum</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Oznaka</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>Poruka</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>Iznos</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(bez oznake)</translation>
-    </message>
-    <message>
-        <source>(no message)</source>
-        <translation>(bez poruke)</translation>
-    </message>
-    <message>
-        <source>(no amount)</source>
-        <translation>(bez iznosa)</translation>
-    </message>
 </context>
 <context>
     <name>SendCoinsDialog</name>
@@ -1277,35 +866,7 @@
         <source>S&amp;end</source>
         <translation>&amp;Pošalji</translation>
     </message>
-    <message>
-        <source>Confirm send coins</source>
-        <translation>Potvrdi slanje novca</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>Kopiraj iznos</translation>
-    </message>
-    <message>
-        <source>or</source>
-        <translation>ili</translation>
-    </message>
-    <message>
-        <source>The amount to pay must be larger than 0.</source>
-        <translation>Iznos mora biti veći od 0.</translation>
-    </message>
-    <message>
-        <source>The amount exceeds your balance.</source>
-        <translation>Iznos je veći od raspoložljivog stanja novčanika.</translation>
-    </message>
-    <message>
-        <source>The total exceeds your balance when the %1 transaction fee is included.</source>
-        <translation>Iznos je veći od stanja novčanika kad se doda naknada za transakcije od %1.</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(bez oznake)</translation>
-    </message>
-    </context>
+</context>
 <context>
     <name>SendCoinsEntry</name>
     <message>
@@ -1316,10 +877,6 @@
         <source>Pay &amp;To:</source>
         <translation>&amp;Primatelj plaćanja:</translation>
     </message>
-    <message>
-        <source>Enter a label for this address to add it to your address book</source>
-        <translation>Unesite oznaku za ovu adresu kako bi ju dodali u vaš adresar</translation>
-    </message>
     <message>
         <source>&amp;Label:</source>
         <translation>&amp;Oznaka:</translation>
@@ -1390,21 +947,9 @@
         <source>Verify &amp;Message</source>
         <translation>&amp;Potvrdite poruku</translation>
     </message>
-    <message>
-        <source>Wallet unlock was cancelled.</source>
-        <translation>Otključavanje novčanika je otkazano.</translation>
-    </message>
-    <message>
-        <source>Message signed.</source>
-        <translation>Poruka je potpisana.</translation>
-    </message>
     </context>
 <context>
     <name>SplashScreen</name>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Bitcoin Core</translation>
-    </message>
     <message>
         <source>[testnet]</source>
         <translation>[testnet]</translation>
@@ -1413,350 +958,16 @@
 <context>
     <name>TrafficGraphWidget</name>
     </context>
-<context>
-    <name>TransactionDesc</name>
-    <message>
-        <source>Open until %1</source>
-        <translation>Otvoren do %1</translation>
-    </message>
-    <message>
-        <source>%1/offline</source>
-        <translation>%1 nije dostupan</translation>
-    </message>
-    <message>
-        <source>%1/unconfirmed</source>
-        <translation>%1/nepotvrđeno</translation>
-    </message>
-    <message>
-        <source>%1 confirmations</source>
-        <translation>%1 potvrda</translation>
-    </message>
-    <message>
-        <source>Status</source>
-        <translation>Status</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation>Datum</translation>
-    </message>
-    <message>
-        <source>Source</source>
-        <translation>Izvor</translation>
-    </message>
-    <message>
-        <source>Generated</source>
-        <translation>Generiran</translation>
-    </message>
-    <message>
-        <source>From</source>
-        <translation>Od</translation>
-    </message>
-    <message>
-        <source>To</source>
-        <translation>Za</translation>
-    </message>
-    <message>
-        <source>own address</source>
-        <translation>vlastita adresa</translation>
-    </message>
-    <message>
-        <source>label</source>
-        <translation>oznaka</translation>
-    </message>
-    <message>
-        <source>Credit</source>
-        <translation>Uplaćeno</translation>
-    </message>
-    <message>
-        <source>not accepted</source>
-        <translation>Nije prihvaćeno</translation>
-    </message>
-    <message>
-        <source>Debit</source>
-        <translation>Zaduženje</translation>
-    </message>
-    <message>
-        <source>Transaction fee</source>
-        <translation>Naknada za transakciju</translation>
-    </message>
-    <message>
-        <source>Net amount</source>
-        <translation>Neto iznos</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>Poruka</translation>
-    </message>
-    <message>
-        <source>Comment</source>
-        <translation>Komentar</translation>
-    </message>
-    <message>
-        <source>Transaction ID</source>
-        <translation>ID transakcije</translation>
-    </message>
-    <message>
-        <source>Transaction</source>
-        <translation>Transakcija</translation>
-    </message>
-    <message>
-        <source>Inputs</source>
-        <translation>Unosi</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>Iznos</translation>
-    </message>
-    <message>
-        <source>, has not been successfully broadcast yet</source>
-        <translation>, još nije bio uspješno emitiran</translation>
-    </message>
-    <message>
-        <source>unknown</source>
-        <translation>nepoznato</translation>
-    </message>
-</context>
 <context>
     <name>TransactionDescDialog</name>
-    <message>
-        <source>Transaction details</source>
-        <translation>Detalji transakcije</translation>
-    </message>
     <message>
         <source>This pane shows a detailed description of the transaction</source>
         <translation>Ovaj prozor prikazuje detaljni opis transakcije</translation>
     </message>
 </context>
-<context>
-    <name>TransactionTableModel</name>
-    <message>
-        <source>Date</source>
-        <translation>Datum</translation>
-    </message>
-    <message>
-        <source>Type</source>
-        <translation>Tip</translation>
-    </message>
-    <message>
-        <source>Open until %1</source>
-        <translation>Otvoren do %1</translation>
-    </message>
-    <message>
-        <source>Confirmed (%1 confirmations)</source>
-        <translation>Potvrđen (%1 potvrda)</translation>
-    </message>
-    <message>
-        <source>This block was not received by any other nodes and will probably not be accepted!</source>
-        <translation>Ovaj blok nije bio primljen od strane bilo kojeg drugog čvora i vjerojatno neće biti prihvaćen!</translation>
-    </message>
-    <message>
-        <source>Generated but not accepted</source>
-        <translation>Generirano, ali nije prihvaćeno</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Oznaka</translation>
-    </message>
-    <message>
-        <source>Received with</source>
-        <translation>Primljeno s</translation>
-    </message>
-    <message>
-        <source>Received from</source>
-        <translation>Primljeno od</translation>
-    </message>
-    <message>
-        <source>Sent to</source>
-        <translation>Poslano za</translation>
-    </message>
-    <message>
-        <source>Payment to yourself</source>
-        <translation>Plaćanje samom sebi</translation>
-    </message>
-    <message>
-        <source>Mined</source>
-        <translation>Rudareno</translation>
-    </message>
-    <message>
-        <source>(n/a)</source>
-        <translation>(n/d)</translation>
-    </message>
-    <message>
-        <source>Transaction status. Hover over this field to show number of confirmations.</source>
-        <translation>Status transakcije</translation>
-    </message>
-    <message>
-        <source>Date and time that the transaction was received.</source>
-        <translation>Datum i vrijeme kad je transakcija primljena</translation>
-    </message>
-    <message>
-        <source>Type of transaction.</source>
-        <translation>Vrsta transakcije.</translation>
-    </message>
-    <message>
-        <source>Amount removed from or added to balance.</source>
-        <translation>Iznos odbijen od ili dodan k saldu.</translation>
-    </message>
-</context>
-<context>
-    <name>TransactionView</name>
-    <message>
-        <source>All</source>
-        <translation>Sve</translation>
-    </message>
-    <message>
-        <source>Today</source>
-        <translation>Danas</translation>
-    </message>
-    <message>
-        <source>This week</source>
-        <translation>Ovaj tjedan</translation>
-    </message>
-    <message>
-        <source>This month</source>
-        <translation>Ovaj mjesec</translation>
-    </message>
-    <message>
-        <source>Last month</source>
-        <translation>Prošli mjesec</translation>
-    </message>
-    <message>
-        <source>This year</source>
-        <translation>Ove godine</translation>
-    </message>
-    <message>
-        <source>Range...</source>
-        <translation>Raspon...</translation>
-    </message>
-    <message>
-        <source>Received with</source>
-        <translation>Primljeno s</translation>
-    </message>
-    <message>
-        <source>Sent to</source>
-        <translation>Poslano za</translation>
-    </message>
-    <message>
-        <source>To yourself</source>
-        <translation>Samom sebi</translation>
-    </message>
-    <message>
-        <source>Mined</source>
-        <translation>Rudareno</translation>
-    </message>
-    <message>
-        <source>Other</source>
-        <translation>Ostalo</translation>
-    </message>
-    <message>
-        <source>Enter address or label to search</source>
-        <translation>Unesite adresu ili oznaku za pretraživanje</translation>
-    </message>
-    <message>
-        <source>Min amount</source>
-        <translation>Min iznos</translation>
-    </message>
-    <message>
-        <source>Copy address</source>
-        <translation>Kopiraj adresu</translation>
-    </message>
-    <message>
-        <source>Copy label</source>
-        <translation>Kopiraj oznaku</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>Kopiraj iznos</translation>
-    </message>
-    <message>
-        <source>Copy transaction ID</source>
-        <translation>Kopiraj ID transakcije</translation>
-    </message>
-    <message>
-        <source>Edit label</source>
-        <translation>Izmjeni oznaku</translation>
-    </message>
-    <message>
-        <source>Show transaction details</source>
-        <translation>Prikaži detalje transakcije</translation>
-    </message>
-    <message>
-        <source>Exporting Failed</source>
-        <translation>Izvoz neuspješan</translation>
-    </message>
-    <message>
-        <source>Comma separated file (*.csv)</source>
-        <translation>Datoteka podataka odvojenih zarezima (*.csv)</translation>
-    </message>
-    <message>
-        <source>Confirmed</source>
-        <translation>Potvrđeno</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation>Datum</translation>
-    </message>
-    <message>
-        <source>Type</source>
-        <translation>Tip</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Oznaka</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>Adresa</translation>
-    </message>
-    <message>
-        <source>ID</source>
-        <translation>ID</translation>
-    </message>
-    <message>
-        <source>Range:</source>
-        <translation>Raspon:</translation>
-    </message>
-    <message>
-        <source>to</source>
-        <translation>za</translation>
-    </message>
-</context>
 <context>
     <name>UnitDisplayStatusBarControl</name>
     </context>
-<context>
-    <name>WalletFrame</name>
-    </context>
-<context>
-    <name>WalletModel</name>
-    <message>
-        <source>Send Coins</source>
-        <translation>Slanje novca</translation>
-    </message>
-</context>
-<context>
-    <name>WalletView</name>
-    <message>
-        <source>&amp;Export</source>
-        <translation>&amp;Izvoz</translation>
-    </message>
-    <message>
-        <source>Export the data in the current tab to a file</source>
-        <translation>Izvoz podataka iz trenutnog taba u datoteku</translation>
-    </message>
-    <message>
-        <source>Backup Wallet</source>
-        <translation>Arhiviranje novčanika</translation>
-    </message>
-    <message>
-        <source>Wallet Data (*.dat)</source>
-        <translation>Podaci novčanika (*.dat)</translation>
-    </message>
-    <message>
-        <source>Backup Failed</source>
-        <translation>Arhiviranje nije uspjelo</translation>
-    </message>
-    </context>
 <context>
     <name>bitcoin-core</name>
     <message>
@@ -1779,6 +990,10 @@
         <source>Run in the background as a daemon and accept commands</source>
         <translation>Izvršavaj u pozadini kao uslužnik i prihvaćaj komande</translation>
     </message>
+    <message>
+        <source>Bitcoin Core</source>
+        <translation>Bitcoin Core</translation>
+    </message>
     <message>
         <source>Block creation options:</source>
         <translation>Opcije za kreiranje bloka:</translation>
@@ -1795,18 +1010,6 @@
         <source>Information</source>
         <translation>Informacija</translation>
     </message>
-    <message>
-        <source>Invalid amount for -maxtxfee=&lt;amount&gt;: '%s'</source>
-        <translation>Nevaljali iznos za opciju -maxtxfee=&lt;iznos&gt;: '%s'</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -minrelaytxfee=&lt;amount&gt;: '%s'</source>
-        <translation>Nevaljali iznos za opciju -minrelaytxfee=&lt;iznos&gt;: '%s'</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -mintxfee=&lt;amount&gt;: '%s'</source>
-        <translation>Nevaljali iznos za opciju -mintxfee=&lt;iznos&gt;: '%s'</translation>
-    </message>
     <message>
         <source>Send trace/debug info to console instead of debug.log file</source>
         <translation>Šalji trace/debug informacije na konzolu umjesto u debug.log datoteku</translation>
@@ -1827,10 +1030,6 @@
         <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
         <translation>Izvršite naredbu kada se najbolji blok promjeni (%s u cmd je zamjenjen sa block hash)</translation>
     </message>
-    <message>
-        <source>This help message</source>
-        <translation>Ova poruka za pomoć</translation>
-    </message>
     <message>
         <source>Allow DNS lookups for -addnode, -seednode and -connect</source>
         <translation>Dozvoli DNS upite za -addnode, -seednode i -connect</translation>
@@ -1839,22 +1038,10 @@
         <source>Loading addresses...</source>
         <translation>Učitavanje adresa...</translation>
     </message>
-    <message>
-        <source>Error loading wallet.dat: Wallet corrupted</source>
-        <translation>Greška kod učitavanja datoteke wallet.dat: Novčanik pokvaren</translation>
-    </message>
-    <message>
-        <source>Error loading wallet.dat</source>
-        <translation>Greška kod učitavanja datoteke wallet.dat</translation>
-    </message>
     <message>
         <source>Invalid -proxy address: '%s'</source>
         <translation>Nevaljala -proxy adresa: '%s'</translation>
     </message>
-    <message>
-        <source>Invalid amount for -paytxfee=&lt;amount&gt;: '%s'</source>
-        <translation>Nevaljali iznos za opciju -paytxfee=&lt;iznos&gt;: '%s'</translation>
-    </message>
     <message>
         <source>Insufficient funds</source>
         <translation>Nedovoljna sredstva</translation>
diff --git a/src/qt/locale/bitcoin_hu.ts b/src/qt/locale/bitcoin_hu.ts
index 839ee883bd356..bddc430f22312 100644
--- a/src/qt/locale/bitcoin_hu.ts
+++ b/src/qt/locale/bitcoin_hu.ts
@@ -25,10 +25,6 @@
         <source>C&amp;lose</source>
         <translation>&amp;Bezárás</translation>
     </message>
-    <message>
-        <source>&amp;Copy Address</source>
-        <translation>&amp;Cím másolása</translation>
-    </message>
     <message>
         <source>Delete the currently selected address from the list</source>
         <translation>Kiválasztott cím törlése a listából</translation>
@@ -45,73 +41,6 @@
         <source>&amp;Delete</source>
         <translation>&amp;Törlés</translation>
     </message>
-    <message>
-        <source>Choose the address to send coins to</source>
-        <translation>Válaszd ki a címet, ahová küldesz</translation>
-    </message>
-    <message>
-        <source>Choose the address to receive coins with</source>
-        <translation>Válaszd ki a címet, amivel fogadsz</translation>
-    </message>
-    <message>
-        <source>C&amp;hoose</source>
-        <translation>&amp;Kiválaszt</translation>
-    </message>
-    <message>
-        <source>Sending addresses</source>
-        <translation>Küldési címek</translation>
-    </message>
-    <message>
-        <source>Receiving addresses</source>
-        <translation>Fogadó címek</translation>
-    </message>
-    <message>
-        <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source>
-        <translation>Ezekről a címekről küldhetsz bitcoint. Mindig ellenőrizd a fogadó címet és a fizetendő összeget, mielőtt elküldöd.</translation>
-    </message>
-    <message>
-        <source>These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source>
-        <translation>Ezekkel a címekkel fogadhatsz bitcoint. Ajánlott minden tranzakcióhoz egy új fogadó címet használni.</translation>
-    </message>
-    <message>
-        <source>Copy &amp;Label</source>
-        <translation>&amp;Címke másolása</translation>
-    </message>
-    <message>
-        <source>&amp;Edit</source>
-        <translation>Sz&amp;erkesztés</translation>
-    </message>
-    <message>
-        <source>Export Address List</source>
-        <translation>Címjegyzék exportálása</translation>
-    </message>
-    <message>
-        <source>Comma separated file (*.csv)</source>
-        <translation>Vesszővel elválasztott fájl (*.csv)</translation>
-    </message>
-    <message>
-        <source>Exporting Failed</source>
-        <translation>Az exportálás sikertelen volt</translation>
-    </message>
-    <message>
-        <source>There was an error trying to save the address list to %1. Please try again.</source>
-        <translation>Hiba történt a címjegyzék %1 helyre való mentésekor. Kérlek próbáld újra.</translation>
-    </message>
-</context>
-<context>
-    <name>AddressTableModel</name>
-    <message>
-        <source>Label</source>
-        <translation>Címke</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>Cím</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(nincs címke)</translation>
-    </message>
 </context>
 <context>
     <name>AskPassphraseDialog</name>
@@ -131,90 +60,6 @@
         <source>Repeat new passphrase</source>
         <translation>Új jelszó újra</translation>
     </message>
-    <message>
-        <source>Encrypt wallet</source>
-        <translation>Tárca titkosítása</translation>
-    </message>
-    <message>
-        <source>This operation needs your wallet passphrase to unlock the wallet.</source>
-        <translation>A tárca megnyitásához a műveletnek szüksége van a tárcád jelszavára.</translation>
-    </message>
-    <message>
-        <source>Unlock wallet</source>
-        <translation>Tárca megnyitása</translation>
-    </message>
-    <message>
-        <source>This operation needs your wallet passphrase to decrypt the wallet.</source>
-        <translation>A tárca dekódolásához a műveletnek szüksége van a tárcád jelszavára.</translation>
-    </message>
-    <message>
-        <source>Decrypt wallet</source>
-        <translation>Tárca dekódolása</translation>
-    </message>
-    <message>
-        <source>Change passphrase</source>
-        <translation>Jelszó megváltoztatása</translation>
-    </message>
-    <message>
-        <source>Confirm wallet encryption</source>
-        <translation>Biztosan titkosítani akarod a tárcát?</translation>
-    </message>
-    <message>
-        <source>Warning: If you encrypt your wallet and lose your passphrase, you will &lt;b&gt;LOSE ALL OF YOUR BITCOINS&lt;/b&gt;!</source>
-        <translation>Figyelem: ha titkosítod a tárcát és elveszted a jelszavad, akkor &lt;b&gt;AZ ÖSSZES BITCOINOD ELVESZIK!&lt;/b&gt;</translation>
-    </message>
-    <message>
-        <source>Are you sure you wish to encrypt your wallet?</source>
-        <translation>Biztosan titkosítani akarod a tárcád?</translation>
-    </message>
-    <message>
-        <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source>
-        <translation>FONTOS: A tárca-fájl minden korábbi mentését cseréld le ezzel az új, titkosított tárca-fájllal. Biztonsági okokból a tárca-fájl korábbi, titkosítás nélküli mentései használhatatlanná válnak, amint elkezded használni az új, titkosított tárcát.</translation>
-    </message>
-    <message>
-        <source>Warning: The Caps Lock key is on!</source>
-        <translation>Vigyázat: a Caps Lock be van kapcsolva!</translation>
-    </message>
-    <message>
-        <source>Wallet encrypted</source>
-        <translation>Tárca titkosítva</translation>
-    </message>
-    <message>
-        <source>Enter the new passphrase to the wallet.&lt;br/&gt;Please use a passphrase of &lt;b&gt;ten or more random characters&lt;/b&gt;, or &lt;b&gt;eight or more words&lt;/b&gt;.</source>
-        <translation>Add meg a tárca új jelszavát.&lt;br/&gt;Olyan jelszót válassz, ami &lt;b&gt;legalább tíz véletlenszerű karakterből&lt;/b&gt; vagy &lt;b&gt;legalább 8 véletlenszerű szóból&lt;/b&gt; áll.</translation>
-    </message>
-    <message>
-        <source>Enter the old passphrase and new passphrase to the wallet.</source>
-        <translation>Add meg a tárcához a régi jelszavad és az új jelszavad.</translation>
-    </message>
-    <message>
-        <source>Wallet encryption failed</source>
-        <translation>A tárca titkosítása sikertelen.</translation>
-    </message>
-    <message>
-        <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
-        <translation>Tárca titkosítása belső hiba miatt sikertelen. A tárcád nem lett titkosítva.</translation>
-    </message>
-    <message>
-        <source>The supplied passphrases do not match.</source>
-        <translation>A megadott jelszavak nem egyeznek.</translation>
-    </message>
-    <message>
-        <source>Wallet unlock failed</source>
-        <translation>Tárca megnyitása sikertelen</translation>
-    </message>
-    <message>
-        <source>The passphrase entered for the wallet decryption was incorrect.</source>
-        <translation>Hibás jelszó.</translation>
-    </message>
-    <message>
-        <source>Wallet decryption failed</source>
-        <translation>Dekódolás sikertelen.</translation>
-    </message>
-    <message>
-        <source>Wallet passphrase was successfully changed.</source>
-        <translation>Jelszó megváltoztatva.</translation>
-    </message>
 </context>
 <context>
     <name>BanTableModel</name>
@@ -257,6 +102,10 @@
         <source>Quit application</source>
         <translation>Kilépés az alkalmazásból</translation>
     </message>
+    <message>
+        <source>&amp;About %1</source>
+        <translation>&amp;A %1-ról</translation>
+    </message>
     <message>
         <source>About &amp;Qt</source>
         <translation>A &amp;Qt-ról</translation>
@@ -293,14 +142,6 @@
         <source>Open &amp;URI...</source>
         <translation>&amp;URI azonosító megnyitása...</translation>
     </message>
-    <message>
-        <source>Bitcoin Core client</source>
-        <translation>Bitcoin Core kliens</translation>
-    </message>
-    <message>
-        <source>Importing blocks from disk...</source>
-        <translation>A blokkok importálása lemezről...</translation>
-    </message>
     <message>
         <source>Reindexing blocks on disk...</source>
         <translation>Lemezen lévő blokkok újraindexelése...</translation>
@@ -345,10 +186,6 @@
         <source>&amp;Receive</source>
         <translation>&amp;Fogadás</translation>
     </message>
-    <message>
-        <source>Show information about Bitcoin Core</source>
-        <translation>Bitcoin Core információ megjelenítése</translation>
-    </message>
     <message>
         <source>&amp;Show / Hide</source>
         <translation>&amp;Mutat / Elrejt</translation>
@@ -385,22 +222,10 @@
         <source>Tabs toolbar</source>
         <translation>Fül eszköztár</translation>
     </message>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Bitcoin Core</translation>
-    </message>
     <message>
         <source>Request payments (generates QR codes and bitcoin: URIs)</source>
         <translation>Fizetési kérelem (QR-kódot és "bitcoin:" URI azonosítót hoz létre)</translation>
     </message>
-    <message>
-        <source>&amp;About Bitcoin Core</source>
-        <translation>&amp;A Bitcoin Core-ról</translation>
-    </message>
-    <message>
-        <source>Modify configuration options for Bitcoin Core</source>
-        <translation>Konfigurációs opciók módosítása a Bitcoin Core-hoz</translation>
-    </message>
     <message>
         <source>Show the list of used sending addresses and labels</source>
         <translation>A használt küldési címek és címkék megtekintése</translation>
@@ -417,10 +242,6 @@
         <source>&amp;Command-line options</source>
         <translation>Paran&amp;cssor kapcsolók</translation>
     </message>
-    <message>
-        <source>Show the Bitcoin Core help message to get a list with possible Bitcoin command-line options</source>
-        <translation>A Bitcoin Core súgóüzenet megjelenítése a Bitcoin lehetséges parancssori kapcsolóival.</translation>
-    </message>
     <message numerus="yes">
         <source>%n active connection(s) to Bitcoin network</source>
         <translation><numerusform>%n aktív kapcsolat a Bitcoin hálózathoz</numerusform><numerusform>%n aktív kapcsolat a Bitcoin hálózathoz</numerusform></translation>
@@ -532,13 +353,6 @@
         <translation>Tárca &lt;b&gt;kódolva&lt;/b&gt; és jelenleg &lt;b&gt;zárva&lt;/b&gt;.</translation>
     </message>
 </context>
-<context>
-    <name>ClientModel</name>
-    <message>
-        <source>Network Alert</source>
-        <translation>Hálózati figyelmeztetés</translation>
-    </message>
-</context>
 <context>
     <name>CoinControlDialog</name>
     <message>
@@ -617,150 +431,6 @@
         <source>Priority</source>
         <translation>Prioritás</translation>
     </message>
-    <message>
-        <source>Copy address</source>
-        <translation>Cím másolása</translation>
-    </message>
-    <message>
-        <source>Copy label</source>
-        <translation>Címke másolása</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>Összeg másolása</translation>
-    </message>
-    <message>
-        <source>Copy transaction ID</source>
-        <translation>Tranzakcióazonosító másolása</translation>
-    </message>
-    <message>
-        <source>Lock unspent</source>
-        <translation>Megmaradt zárolása</translation>
-    </message>
-    <message>
-        <source>Unlock unspent</source>
-        <translation>Zárolás feloldása</translation>
-    </message>
-    <message>
-        <source>Copy quantity</source>
-        <translation>Mennyiség másolása</translation>
-    </message>
-    <message>
-        <source>Copy fee</source>
-        <translation>Díj másolása</translation>
-    </message>
-    <message>
-        <source>Copy after fee</source>
-        <translation>Utólagos díj másolása</translation>
-    </message>
-    <message>
-        <source>Copy bytes</source>
-        <translation>Byte-ok másolása </translation>
-    </message>
-    <message>
-        <source>Copy priority</source>
-        <translation>Prioritás másolása</translation>
-    </message>
-    <message>
-        <source>Copy dust</source>
-        <translation>Visszajáró másolása</translation>
-    </message>
-    <message>
-        <source>Copy change</source>
-        <translation>Visszajáró másolása</translation>
-    </message>
-    <message>
-        <source>highest</source>
-        <translation>legmagasabb</translation>
-    </message>
-    <message>
-        <source>higher</source>
-        <translation>magasabb</translation>
-    </message>
-    <message>
-        <source>high</source>
-        <translation>magas</translation>
-    </message>
-    <message>
-        <source>medium-high</source>
-        <translation>közepesen-magas</translation>
-    </message>
-    <message>
-        <source>medium</source>
-        <translation>közepes</translation>
-    </message>
-    <message>
-        <source>low-medium</source>
-        <translation>alacsony-közepes</translation>
-    </message>
-    <message>
-        <source>low</source>
-        <translation>alacsony</translation>
-    </message>
-    <message>
-        <source>lower</source>
-        <translation>alacsonyabb</translation>
-    </message>
-    <message>
-        <source>lowest</source>
-        <translation>legalacsonyabb</translation>
-    </message>
-    <message>
-        <source>(%1 locked)</source>
-        <translation>(%1 zárolva)</translation>
-    </message>
-    <message>
-        <source>none</source>
-        <translation>semmi</translation>
-    </message>
-    <message>
-        <source>This label turns red if the transaction size is greater than 1000 bytes.</source>
-        <translation>Ez a címke pirosra változik, ha a tranzakció mérete nagyobb mint 1000 bájt.</translation>
-    </message>
-    <message>
-        <source>This label turns red if the priority is smaller than "medium".</source>
-        <translation>Ez a címke pirosra változik, ha a prioritás kisebb mint "közepes".</translation>
-    </message>
-    <message>
-        <source>This label turns red if any recipient receives an amount smaller than %1.</source>
-        <translation>Ez a címke pirosra változik, ha bármely fogadónak %1-nál kevesebb összeg érkezik.</translation>
-    </message>
-    <message>
-        <source>Can vary +/- %1 satoshi(s) per input.</source>
-        <translation>Bemenetenként  +/- %1 satoshi-val változhat</translation>
-    </message>
-    <message>
-        <source>yes</source>
-        <translation>igen</translation>
-    </message>
-    <message>
-        <source>no</source>
-        <translation>nem</translation>
-    </message>
-    <message>
-        <source>This means a fee of at least %1 per kB is required.</source>
-        <translation>Legalább %1 díj szüksége kB-onként.</translation>
-    </message>
-    <message>
-        <source>Can vary +/- 1 byte per input.</source>
-        <translation>Bemenetenként +/- 1 byte-al változhat.</translation>
-    </message>
-    <message>
-        <source>Transactions with higher priority are more likely to get included into a block.</source>
-        <translation>Nagyobb prioritású tranzakciók nagyobb valószínűséggel kerülnek be egy blokkba.</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(nincs címke)</translation>
-    </message>
-    <message>
-        <source>change from %1 (%2)</source>
-        <translation>visszajáró %1-ből (%2)</translation>
-    </message>
-    <message>
-        <source>(change)</source>
-        <translation>(visszajáró)</translation>
-    </message>
 </context>
 <context>
     <name>EditAddressDialog</name>
@@ -784,38 +454,6 @@
         <source>&amp;Address</source>
         <translation>&amp;Cím</translation>
     </message>
-    <message>
-        <source>New receiving address</source>
-        <translation>Új fogadó cím</translation>
-    </message>
-    <message>
-        <source>New sending address</source>
-        <translation>Új küldő cím</translation>
-    </message>
-    <message>
-        <source>Edit receiving address</source>
-        <translation>Fogadó cím szerkesztése</translation>
-    </message>
-    <message>
-        <source>Edit sending address</source>
-        <translation>Küldő cím szerkesztése</translation>
-    </message>
-    <message>
-        <source>The entered address "%1" is already in the address book.</source>
-        <translation>A megadott "%1" cím már szerepel a címjegyzékben.</translation>
-    </message>
-    <message>
-        <source>The entered address "%1" is not a valid Bitcoin address.</source>
-        <translation>A megadott "%1" cím nem egy érvényes Bitcoin-cím.</translation>
-    </message>
-    <message>
-        <source>Could not unlock wallet.</source>
-        <translation>Tárca feloldása sikertelen</translation>
-    </message>
-    <message>
-        <source>New key generation failed.</source>
-        <translation>Új kulcs generálása sikertelen</translation>
-    </message>
 </context>
 <context>
     <name>FreespaceChecker</name>
@@ -838,10 +476,6 @@
 </context>
 <context>
     <name>HelpMessageDialog</name>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Bitcoin Core</translation>
-    </message>
     <message>
         <source>version</source>
         <translation>verzió</translation>
@@ -850,10 +484,6 @@
         <source>(%1-bit)</source>
         <translation>(%1-bit)</translation>
     </message>
-    <message>
-        <source>About Bitcoin Core</source>
-        <translation>A Bitcoin Core-ról</translation>
-    </message>
     <message>
         <source>Command-line options</source>
         <translation>Parancssoros opciók</translation>
@@ -873,14 +503,6 @@
         <source>Welcome</source>
         <translation>Üdvözlünk</translation>
     </message>
-    <message>
-        <source>Welcome to Bitcoin Core.</source>
-        <translation>Üdvözlünk a Bitcoin Core-ban.</translation>
-    </message>
-    <message>
-        <source>Bitcoin Core will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source>
-        <translation>A Bitcoin Core le fogja tölteni és tárolni fogja a Bitcoin blokklánc egy másolatát. Legalább %1GB adat lesz tárolva ebben a mappában, és ez folyamatosan nőni fog. A tárca szintén itt lesz tárolva.</translation>
-    </message>
     <message>
         <source>Use the default data directory</source>
         <translation>Az alapértelmezett adat könyvtár használata</translation>
@@ -889,10 +511,6 @@
         <source>Use a custom data directory:</source>
         <translation>Saját adatkönyvtár használata:</translation>
     </message>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Bitcoin Core</translation>
-    </message>
     <message>
         <source>Error: Specified data directory "%1" cannot be created.</source>
         <translation>Hiba: A megadott "%1" adatkönyvtár nem hozható létre. </translation>
@@ -924,10 +542,6 @@
         <source>Select payment request file</source>
         <translation>Fizetési kérelmi fájl kiválasztása</translation>
     </message>
-    <message>
-        <source>Select payment request file to open</source>
-        <translation>Fizetés kérelmi fájl kiválasztása</translation>
-    </message>
 </context>
 <context>
     <name>OptionsDialog</name>
@@ -959,10 +573,6 @@
         <source>IP address of the proxy (e.g. IPv4: 127.0.0.1 / IPv6: ::1)</source>
         <translation>A proxy IP címe (pl.: IPv4: 127.0.0.1 / IPv6: ::1)</translation>
     </message>
-    <message>
-        <source>The user interface language can be set here. This setting will take effect after restarting Bitcoin Core.</source>
-        <translation>Itt beállíthatod a kezelőfelület nyelvét. A beállítás a Bitcoin újraindítása után lép érvénybe.</translation>
-    </message>
     <message>
         <source>Third party transaction URLs</source>
         <translation>Harmadik fél tranzakció URL-ek</translation>
@@ -979,10 +589,6 @@
         <source>&amp;Network</source>
         <translation>&amp;Hálózat</translation>
     </message>
-    <message>
-        <source>&amp;Start Bitcoin Core on system login</source>
-        <translation>A Bitcoin elindítása bejelentkezéskor</translation>
-    </message>
     <message>
         <source>W&amp;allet</source>
         <translation>T&amp;árca</translation>
@@ -1147,25 +753,6 @@
         <translation>A legutóbbi tranzakciók</translation>
     </message>
     </context>
-<context>
-    <name>PaymentServer</name>
-    <message>
-        <source>URI handling</source>
-        <translation>URI kezelés</translation>
-    </message>
-    <message>
-        <source>Cannot start bitcoin: click-to-pay handler</source>
-        <translation>A bitcoint nem lehet elindítani: click-to-pay handler</translation>
-    </message>
-    <message>
-        <source>Payment request expired.</source>
-        <translation>A fizetési kérelem lejárt</translation>
-    </message>
-    <message>
-        <source>Invalid payment request.</source>
-        <translation>Érvénytelen fizetési kérelem</translation>
-    </message>
-    </context>
 <context>
     <name>PeerTableModel</name>
     <message>
@@ -1216,25 +803,6 @@
         <translation>%1 ms</translation>
     </message>
 </context>
-<context>
-    <name>QRImageWidget</name>
-    <message>
-        <source>&amp;Save Image...</source>
-        <translation>&amp;Kép mentése</translation>
-    </message>
-    <message>
-        <source>&amp;Copy Image</source>
-        <translation>&amp;Kép másolása</translation>
-    </message>
-    <message>
-        <source>Save QR Code</source>
-        <translation>QR kód mentése</translation>
-    </message>
-    <message>
-        <source>PNG Image (*.png)</source>
-        <translation>PNG kép (*.png)</translation>
-    </message>
-</context>
 <context>
     <name>RPCConsole</name>
     <message>
@@ -1369,10 +937,6 @@
         <source>Out:</source>
         <translation>Ki:</translation>
     </message>
-    <message>
-        <source>Build date</source>
-        <translation>Fordítás dátuma</translation>
-    </message>
     <message>
         <source>Debug log file</source>
         <translation>Debug naplófájl</translation>
@@ -1492,18 +1056,6 @@
         <source>Remove</source>
         <translation>Eltávolítás</translation>
     </message>
-    <message>
-        <source>Copy label</source>
-        <translation>Címke másolása</translation>
-    </message>
-    <message>
-        <source>Copy message</source>
-        <translation>Üzenet másolása</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>Összeg másolása</translation>
-    </message>
 </context>
 <context>
     <name>ReceiveRequestDialog</name>
@@ -1523,91 +1075,24 @@
         <source>&amp;Save Image...</source>
         <translation>&amp;Kép mentése</translation>
     </message>
+</context>
+<context>
+    <name>SendCoinsDialog</name>
     <message>
-        <source>Request payment to %1</source>
-        <translation>Fizetés kérése a %1-hez</translation>
+        <source>Send Coins</source>
+        <translation>Érmék küldése</translation>
     </message>
     <message>
-        <source>Payment information</source>
-        <translation>Kifizetés információ</translation>
+        <source>Inputs...</source>
+        <translation>Bemenetek...</translation>
     </message>
     <message>
-        <source>URI</source>
-        <translation>URI:</translation>
+        <source>automatically selected</source>
+        <translation>automatikusan kiválasztva</translation>
     </message>
     <message>
-        <source>Address</source>
-        <translation>Cím</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>Összeg</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Címke</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>Üzenet</translation>
-    </message>
-    <message>
-        <source>Resulting URI too long, try to reduce the text for label / message.</source>
-        <translation>A keletkezett URI túl hosszú, próbálja meg csökkenteni a cimkeszöveg / üzenet méretét.</translation>
-    </message>
-    <message>
-        <source>Error encoding URI into QR Code.</source>
-        <translation>Hiba lépett fel az URI QR kóddá alakításakor</translation>
-    </message>
-</context>
-<context>
-    <name>RecentRequestsTableModel</name>
-    <message>
-        <source>Date</source>
-        <translation>Dátum</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Címke</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>Üzenet</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>Összeg</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(nincs címke)</translation>
-    </message>
-    <message>
-        <source>(no message)</source>
-        <translation>(nincs üzenet)</translation>
-    </message>
-    <message>
-        <source>(no amount)</source>
-        <translation>(nincs összeg)</translation>
-    </message>
-</context>
-<context>
-    <name>SendCoinsDialog</name>
-    <message>
-        <source>Send Coins</source>
-        <translation>Érmék küldése</translation>
-    </message>
-    <message>
-        <source>Inputs...</source>
-        <translation>Bemenetek...</translation>
-    </message>
-    <message>
-        <source>automatically selected</source>
-        <translation>automatikusan kiválasztva</translation>
-    </message>
-    <message>
-        <source>Insufficient funds!</source>
-        <translation>Fedezethiány!</translation>
+        <source>Insufficient funds!</source>
+        <translation>Fedezethiány!</translation>
     </message>
     <message>
         <source>Quantity:</source>
@@ -1701,75 +1186,7 @@
         <source>S&amp;end</source>
         <translation>&amp;Küldés</translation>
     </message>
-    <message>
-        <source>Confirm send coins</source>
-        <translation>Küldés megerősítése</translation>
-    </message>
-    <message>
-        <source>Copy quantity</source>
-        <translation>Mennyiség másolása</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>Összeg másolása</translation>
-    </message>
-    <message>
-        <source>Copy fee</source>
-        <translation>Díj másolása</translation>
-    </message>
-    <message>
-        <source>Copy after fee</source>
-        <translation>Utólagos díj másolása</translation>
-    </message>
-    <message>
-        <source>Copy bytes</source>
-        <translation>Byte-ok másolása </translation>
-    </message>
-    <message>
-        <source>Copy priority</source>
-        <translation>Prioritás másolása</translation>
-    </message>
-    <message>
-        <source>Copy change</source>
-        <translation>Visszajáró másolása</translation>
-    </message>
-    <message>
-        <source>or</source>
-        <translation>vagy</translation>
-    </message>
-    <message>
-        <source>The amount to pay must be larger than 0.</source>
-        <translation>A fizetendő összegnek nagyobbnak kell lennie 0-nál.</translation>
-    </message>
-    <message>
-        <source>The amount exceeds your balance.</source>
-        <translation>Nincs ennyi bitcoin az egyenlegeden.</translation>
-    </message>
-    <message>
-        <source>The total exceeds your balance when the %1 transaction fee is included.</source>
-        <translation>A küldeni kívánt összeg és a %1 tranzakciós díj együtt meghaladja az egyenlegeden rendelkezésedre álló összeget.</translation>
-    </message>
-    <message>
-        <source>Payment request expired.</source>
-        <translation>A fizetési kérelem lejárt</translation>
-    </message>
-    <message>
-        <source>Warning: Invalid Bitcoin address</source>
-        <translation>Figyelmeztetés: Érvénytelen Bitcoin cím</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(nincs címke)</translation>
-    </message>
-    <message>
-        <source>Copy dust</source>
-        <translation>Visszajáró másolása</translation>
-    </message>
-    <message>
-        <source>Are you sure you want to send?</source>
-        <translation>Biztos, hogy el akarod küldeni?</translation>
-    </message>
-    </context>
+</context>
 <context>
     <name>SendCoinsEntry</name>
     <message>
@@ -1780,11 +1197,6 @@
         <source>Pay &amp;To:</source>
         <translation>Címzett:</translation>
     </message>
-    <message>
-        <source>Enter a label for this address to add it to your address book</source>
-        <translation>Milyen címkével kerüljön be ez a cím a címtáradba?
-</translation>
-    </message>
     <message>
         <source>&amp;Label:</source>
         <translation>Címke:</translation>
@@ -1824,10 +1236,6 @@
 </context>
 <context>
     <name>ShutdownWindow</name>
-    <message>
-        <source>Bitcoin Core is shutting down...</source>
-        <translation>A Bitcoin Core leáll...</translation>
-    </message>
     <message>
         <source>Do not shut down the computer until this window disappears.</source>
         <translation>Ne állítsd le a számítógépet amíg ez az ablak el nem tűnik.</translation>
@@ -1891,53 +1299,9 @@
         <source>Verify &amp;Message</source>
         <translation>Üzenet ellenőrzése</translation>
     </message>
-    <message>
-        <source>The entered address is invalid.</source>
-        <translation>A megadott cím nem érvényes.</translation>
-    </message>
-    <message>
-        <source>Please check the address and try again.</source>
-        <translation>Ellenőrizze a címet és próbálja meg újra.</translation>
-    </message>
-    <message>
-        <source>Private key for the entered address is not available.</source>
-        <translation>A megadott cím privát kulcsa nem található.</translation>
-    </message>
-    <message>
-        <source>Message signing failed.</source>
-        <translation>Üzenet aláírása nem sikerült.</translation>
-    </message>
-    <message>
-        <source>Message signed.</source>
-        <translation>Üzenet aláírva.</translation>
-    </message>
-    <message>
-        <source>The signature could not be decoded.</source>
-        <translation>Az aláírást nem sikerült dekódolni.</translation>
-    </message>
-    <message>
-        <source>Please check the signature and try again.</source>
-        <translation>Ellenőrizd az aláírást és próbáld újra.</translation>
-    </message>
-    <message>
-        <source>Message verification failed.</source>
-        <translation>Az üzenet ellenőrzése nem sikerült.</translation>
-    </message>
-    <message>
-        <source>Message verified.</source>
-        <translation>Üzenet ellenőrizve.</translation>
-    </message>
-</context>
+    </context>
 <context>
     <name>SplashScreen</name>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Bitcoin Core</translation>
-    </message>
-    <message>
-        <source>The Bitcoin Core developers</source>
-        <translation>A Bitcoin Core fejlesztői</translation>
-    </message>
     <message>
         <source>[testnet]</source>
         <translation>[teszthálózat]</translation>
@@ -1950,378 +1314,16 @@
         <translation>KB/s</translation>
     </message>
 </context>
-<context>
-    <name>TransactionDesc</name>
-    <message>
-        <source>Open until %1</source>
-        <translation>%1-ig megnyitva</translation>
-    </message>
-    <message>
-        <source>%1/unconfirmed</source>
-        <translation>%1/megerősítetlen</translation>
-    </message>
-    <message>
-        <source>%1 confirmations</source>
-        <translation>%1 megerősítés</translation>
-    </message>
-    <message>
-        <source>Status</source>
-        <translation>Állapot</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation>Dátum</translation>
-    </message>
-    <message>
-        <source>Source</source>
-        <translation>Forrás</translation>
-    </message>
-    <message>
-        <source>Generated</source>
-        <translation>Legenerálva</translation>
-    </message>
-    <message>
-        <source>From</source>
-        <translation>Űrlap</translation>
-    </message>
-    <message>
-        <source>To</source>
-        <translation>Címzett</translation>
-    </message>
-    <message>
-        <source>own address</source>
-        <translation>saját cím</translation>
-    </message>
-    <message>
-        <source>label</source>
-        <translation>címke</translation>
-    </message>
-    <message>
-        <source>Credit</source>
-        <translation>Jóváírás</translation>
-    </message>
-    <message>
-        <source>not accepted</source>
-        <translation>elutasítva</translation>
-    </message>
-    <message>
-        <source>Debit</source>
-        <translation>Terhelés</translation>
-    </message>
-    <message>
-        <source>Transaction fee</source>
-        <translation>Tranzakciós díj</translation>
-    </message>
-    <message>
-        <source>Net amount</source>
-        <translation>Nettó összeg</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>Üzenet</translation>
-    </message>
-    <message>
-        <source>Comment</source>
-        <translation>Megjegyzés</translation>
-    </message>
-    <message>
-        <source>Transaction ID</source>
-        <translation>Tranzakcióazonosító</translation>
-    </message>
-    <message>
-        <source>Debug information</source>
-        <translation>Debug információ</translation>
-    </message>
-    <message>
-        <source>Transaction</source>
-        <translation>Tranzakció</translation>
-    </message>
-    <message>
-        <source>Inputs</source>
-        <translation>Bemenetek</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>Összeg</translation>
-    </message>
-    <message>
-        <source>true</source>
-        <translation>igaz</translation>
-    </message>
-    <message>
-        <source>false</source>
-        <translation>hamis</translation>
-    </message>
-    <message>
-        <source>, has not been successfully broadcast yet</source>
-        <translation>, még nem sikerült elküldeni.</translation>
-    </message>
-    <message>
-        <source>unknown</source>
-        <translation>ismeretlen</translation>
-    </message>
-</context>
 <context>
     <name>TransactionDescDialog</name>
-    <message>
-        <source>Transaction details</source>
-        <translation>Tranzakció részletei</translation>
-    </message>
     <message>
         <source>This pane shows a detailed description of the transaction</source>
         <translation>Ez a mező a tranzakció részleteit mutatja</translation>
     </message>
 </context>
-<context>
-    <name>TransactionTableModel</name>
-    <message>
-        <source>Date</source>
-        <translation>Dátum</translation>
-    </message>
-    <message>
-        <source>Type</source>
-        <translation>Típus</translation>
-    </message>
-    <message>
-        <source>Open until %1</source>
-        <translation>%1-ig megnyitva</translation>
-    </message>
-    <message>
-        <source>Confirmed (%1 confirmations)</source>
-        <translation>Megerősítve (%1 megerősítés)</translation>
-    </message>
-    <message>
-        <source>This block was not received by any other nodes and will probably not be accepted!</source>
-        <translation>Ezt a blokkot egyetlen másik csomópont sem kapta meg, így valószínűleg nem lesz elfogadva!</translation>
-    </message>
-    <message>
-        <source>Generated but not accepted</source>
-        <translation>Legenerálva, de még el nem fogadva.</translation>
-    </message>
-    <message>
-        <source>Offline</source>
-        <translation>Offline</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Címke</translation>
-    </message>
-    <message>
-        <source>Unconfirmed</source>
-        <translation>Megerősítetlen:</translation>
-    </message>
-    <message>
-        <source>Received with</source>
-        <translation>Erre a címre</translation>
-    </message>
-    <message>
-        <source>Received from</source>
-        <translation>Erről az</translation>
-    </message>
-    <message>
-        <source>Sent to</source>
-        <translation>Erre a címre</translation>
-    </message>
-    <message>
-        <source>Payment to yourself</source>
-        <translation>Magadnak kifizetve</translation>
-    </message>
-    <message>
-        <source>Mined</source>
-        <translation>Kibányászva</translation>
-    </message>
-    <message>
-        <source>(n/a)</source>
-        <translation>(nincs)</translation>
-    </message>
-    <message>
-        <source>Transaction status. Hover over this field to show number of confirmations.</source>
-        <translation>Tranzakció állapota. Húzd ide a kurzort, hogy lásd a megerősítések számát.</translation>
-    </message>
-    <message>
-        <source>Date and time that the transaction was received.</source>
-        <translation>Tranzakció fogadásának dátuma és időpontja.</translation>
-    </message>
-    <message>
-        <source>Type of transaction.</source>
-        <translation>Tranzakció típusa.</translation>
-    </message>
-    <message>
-        <source>Amount removed from or added to balance.</source>
-        <translation>Az egyenleghez jóváírt vagy ráterhelt összeg.</translation>
-    </message>
-</context>
-<context>
-    <name>TransactionView</name>
-    <message>
-        <source>All</source>
-        <translation>Mind</translation>
-    </message>
-    <message>
-        <source>Today</source>
-        <translation>Mai</translation>
-    </message>
-    <message>
-        <source>This week</source>
-        <translation>Ezen a héten</translation>
-    </message>
-    <message>
-        <source>This month</source>
-        <translation>Ebben a hónapban</translation>
-    </message>
-    <message>
-        <source>Last month</source>
-        <translation>Múlt hónapban</translation>
-    </message>
-    <message>
-        <source>This year</source>
-        <translation>Ebben az évben</translation>
-    </message>
-    <message>
-        <source>Range...</source>
-        <translation>Tartomány ...</translation>
-    </message>
-    <message>
-        <source>Received with</source>
-        <translation>Erre a címre</translation>
-    </message>
-    <message>
-        <source>Sent to</source>
-        <translation>Erre a címre</translation>
-    </message>
-    <message>
-        <source>To yourself</source>
-        <translation>Magadnak</translation>
-    </message>
-    <message>
-        <source>Mined</source>
-        <translation>Kibányászva</translation>
-    </message>
-    <message>
-        <source>Other</source>
-        <translation>Más</translation>
-    </message>
-    <message>
-        <source>Enter address or label to search</source>
-        <translation>Írd be a keresendő címet vagy címkét</translation>
-    </message>
-    <message>
-        <source>Min amount</source>
-        <translation>Minimális összeg</translation>
-    </message>
-    <message>
-        <source>Copy address</source>
-        <translation>Cím másolása</translation>
-    </message>
-    <message>
-        <source>Copy label</source>
-        <translation>Címke másolása</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>Összeg másolása</translation>
-    </message>
-    <message>
-        <source>Copy transaction ID</source>
-        <translation>Tranzakcióazonosító másolása</translation>
-    </message>
-    <message>
-        <source>Edit label</source>
-        <translation>Címke szerkesztése</translation>
-    </message>
-    <message>
-        <source>Show transaction details</source>
-        <translation>Tranzakciós részletek megjelenítése</translation>
-    </message>
-    <message>
-        <source>Watch-only</source>
-        <translation>Csak megfigyelés</translation>
-    </message>
-    <message>
-        <source>Exporting Failed</source>
-        <translation>Az exportálás sikertelen volt</translation>
-    </message>
-    <message>
-        <source>Exporting Successful</source>
-        <translation>Sikeres exportálás</translation>
-    </message>
-    <message>
-        <source>Comma separated file (*.csv)</source>
-        <translation>Vesszővel elválasztott fájl (*.csv)</translation>
-    </message>
-    <message>
-        <source>Confirmed</source>
-        <translation>Megerősítve</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation>Dátum</translation>
-    </message>
-    <message>
-        <source>Type</source>
-        <translation>Típus</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Címke</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>Cím</translation>
-    </message>
-    <message>
-        <source>ID</source>
-        <translation>Azonosító</translation>
-    </message>
-    <message>
-        <source>Range:</source>
-        <translation>Tartomány:</translation>
-    </message>
-    <message>
-        <source>to</source>
-        <translation>meddig</translation>
-    </message>
-</context>
 <context>
     <name>UnitDisplayStatusBarControl</name>
     </context>
-<context>
-    <name>WalletFrame</name>
-    </context>
-<context>
-    <name>WalletModel</name>
-    <message>
-        <source>Send Coins</source>
-        <translation>Érmék küldése</translation>
-    </message>
-</context>
-<context>
-    <name>WalletView</name>
-    <message>
-        <source>&amp;Export</source>
-        <translation>&amp;Exportálás</translation>
-    </message>
-    <message>
-        <source>Export the data in the current tab to a file</source>
-        <translation>Jelenlegi nézet exportálása fájlba</translation>
-    </message>
-    <message>
-        <source>Backup Wallet</source>
-        <translation>Biztonsági másolat készítése a Tárcáról</translation>
-    </message>
-    <message>
-        <source>Wallet Data (*.dat)</source>
-        <translation>Tárca fájl (*.dat)</translation>
-    </message>
-    <message>
-        <source>Backup Failed</source>
-        <translation>Biztonsági másolat készítése sikertelen</translation>
-    </message>
-    <message>
-        <source>Backup Successful</source>
-        <translation>Sikeres biztonsági mentés</translation>
-    </message>
-</context>
 <context>
     <name>bitcoin-core</name>
     <message>
@@ -2356,6 +1358,10 @@
         <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
         <translation>Kívülről érkező kapcsolatok elfogadása (alapértelmezett: 1, ha nem használt a -proxy vagy a -connect)</translation>
     </message>
+    <message>
+        <source>Bitcoin Core</source>
+        <translation>Bitcoin Core</translation>
+    </message>
     <message>
         <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source>
         <translation>Parancs, amit akkor hajt végre, amikor egy tárca-tranzakció megváltozik  (%s a parancsban lecserélődik a blokk TxID-re)</translation>
@@ -2420,18 +1426,6 @@
         <source>Wallet options:</source>
         <translation>Tárca beállítások:</translation>
     </message>
-    <message>
-        <source>You need to rebuild the database using -reindex to change -txindex</source>
-        <translation>Az adatbázist újra kell építeni -reindex használatával (módosítás -tindex).</translation>
-    </message>
-    <message>
-        <source>Cannot resolve -whitebind address: '%s'</source>
-        <translation>Külső cím (-whitebind address) feloldása nem sikerült: '%s'</translation>
-    </message>
-    <message>
-        <source>Copyright (C) 2009-%i The Bitcoin Core Developers</source>
-        <translation>Copyright (C) 2009-%i A Bitcoin Core Fejlesztői</translation>
-    </message>
     <message>
         <source>Error reading from database, shutting down.</source>
         <translation>Hiba az adatbázis olvasásakor, leállítás</translation>
@@ -2440,18 +1434,6 @@
         <source>Information</source>
         <translation>Információ</translation>
     </message>
-    <message>
-        <source>Invalid amount for -maxtxfee=&lt;amount&gt;: '%s'</source>
-        <translation>Érvénytelen -maxtxfee=&lt;amount&gt;: '%s' összeg</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -minrelaytxfee=&lt;amount&gt;: '%s'</source>
-        <translation>Érvénytelen -minrelaytxfee=&lt;amount&gt;: '%s' összeg</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -mintxfee=&lt;amount&gt;: '%s'</source>
-        <translation>Érvénytelen -mintxfee=&lt;amount&gt;: '%s' összeg</translation>
-    </message>
     <message>
         <source>Send trace/debug info to console instead of debug.log file</source>
         <translation>trace/debug információ küldése a konzolra a debog.log fájl helyett</translation>
@@ -2494,11 +1476,6 @@
         <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
         <translation>Parancs, amit akkor hajt végre, amikor a legjobb blokk megváltozik (%s a cmd-ban lecserélődik a blokk hash-re)</translation>
     </message>
-    <message>
-        <source>This help message</source>
-        <translation>Ez a súgó-üzenet
-</translation>
-    </message>
     <message>
         <source>Allow DNS lookups for -addnode, -seednode and -connect</source>
         <translation>DNS-kikeresés engedélyezése az addnode-nál és a connect-nél</translation>
@@ -2507,14 +1484,6 @@
         <source>Loading addresses...</source>
         <translation>Címek betöltése...</translation>
     </message>
-    <message>
-        <source>Error loading wallet.dat: Wallet corrupted</source>
-        <translation>Hiba a wallet.dat betöltése közben: meghibásodott tárca</translation>
-    </message>
-    <message>
-        <source>Error loading wallet.dat</source>
-        <translation>Hiba az wallet.dat betöltése közben</translation>
-    </message>
     <message>
         <source>Invalid -proxy address: '%s'</source>
         <translation>Érvénytelen -proxy cím: '%s'</translation>
@@ -2523,18 +1492,6 @@
         <source>Unknown network specified in -onlynet: '%s'</source>
         <translation>Ismeretlen hálózat lett megadva -onlynet: '%s'</translation>
     </message>
-    <message>
-        <source>Cannot resolve -bind address: '%s'</source>
-        <translation>Csatlakozási cím (-bind address) feloldása nem sikerült: '%s'</translation>
-    </message>
-    <message>
-        <source>Cannot resolve -externalip address: '%s'</source>
-        <translation>Külső cím (-externalip address) feloldása nem sikerült: '%s'</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -paytxfee=&lt;amount&gt;: '%s'</source>
-        <translation>Étvénytelen -paytxfee=&lt;összeg&gt; összeg: '%s'</translation>
-    </message>
     <message>
         <source>Insufficient funds</source>
         <translation>Nincs elég bitcoinod.</translation>
diff --git a/src/qt/locale/bitcoin_id_ID.ts b/src/qt/locale/bitcoin_id_ID.ts
index e1ec7ae7fa24a..fe07ab7a29045 100644
--- a/src/qt/locale/bitcoin_id_ID.ts
+++ b/src/qt/locale/bitcoin_id_ID.ts
@@ -25,10 +25,6 @@
         <source>C&amp;lose</source>
         <translation>T&amp;utup</translation>
     </message>
-    <message>
-        <source>&amp;Copy Address</source>
-        <translation>&amp;Salin Alamat</translation>
-    </message>
     <message>
         <source>Delete the currently selected address from the list</source>
         <translation>Hapus alamat yang sementara dipilih dari daftar</translation>
@@ -45,73 +41,6 @@
         <source>&amp;Delete</source>
         <translation>&amp;Hapus</translation>
     </message>
-    <message>
-        <source>Choose the address to send coins to</source>
-        <translation>Pilihlah alamat kemana koin Anda akan dikirim </translation>
-    </message>
-    <message>
-        <source>Choose the address to receive coins with</source>
-        <translation>Pilihlah alamat dimana Anda akan menerima koin</translation>
-    </message>
-    <message>
-        <source>C&amp;hoose</source>
-        <translation>P&amp;ilihlah</translation>
-    </message>
-    <message>
-        <source>Sending addresses</source>
-        <translation>Alamat pengirim</translation>
-    </message>
-    <message>
-        <source>Receiving addresses</source>
-        <translation>Alamat penerima</translation>
-    </message>
-    <message>
-        <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source>
-        <translation>Alamat-alamat Anda untuk mengirim pembayaran. Periksalah jumlah dan alamat penerima setiap kali Anda mengirim Bitcoin.</translation>
-    </message>
-    <message>
-        <source>These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source>
-        <translation>Alamat-alamat Anda untuk menerima pembayaran. Dianjurkan agar Anda menggunakan alamat yang baru untuk setiap transaksi.</translation>
-    </message>
-    <message>
-        <source>Copy &amp;Label</source>
-        <translation>Salin &amp;Label</translation>
-    </message>
-    <message>
-        <source>&amp;Edit</source>
-        <translation>&amp;Ubah</translation>
-    </message>
-    <message>
-        <source>Export Address List</source>
-        <translation>Ekspor Daftar Alamat</translation>
-    </message>
-    <message>
-        <source>Comma separated file (*.csv)</source>
-        <translation>Berkas CSV (*.csv)</translation>
-    </message>
-    <message>
-        <source>Exporting Failed</source>
-        <translation>Proses Ekspor Gagal</translation>
-    </message>
-    <message>
-        <source>There was an error trying to save the address list to %1. Please try again.</source>
-        <translation>Terjadi kesalahan saat menyimpan daftar alamat ke %1. Silakan coba lagi.</translation>
-    </message>
-</context>
-<context>
-    <name>AddressTableModel</name>
-    <message>
-        <source>Label</source>
-        <translation>Label</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>Alamat</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(tidak ada label)</translation>
-    </message>
 </context>
 <context>
     <name>AskPassphraseDialog</name>
@@ -131,94 +60,6 @@
         <source>Repeat new passphrase</source>
         <translation>Ulangi kata kunci baru</translation>
     </message>
-    <message>
-        <source>Encrypt wallet</source>
-        <translation>Enkripsi dompet</translation>
-    </message>
-    <message>
-        <source>This operation needs your wallet passphrase to unlock the wallet.</source>
-        <translation>Operasi ini memerlukan kata kunci dompet Anda untuk membuka dompet.</translation>
-    </message>
-    <message>
-        <source>Unlock wallet</source>
-        <translation>Buka dompet</translation>
-    </message>
-    <message>
-        <source>This operation needs your wallet passphrase to decrypt the wallet.</source>
-        <translation>Operasi ini memerlukan kata kunci dompet Anda untuk mendekripsi dompet.</translation>
-    </message>
-    <message>
-        <source>Decrypt wallet</source>
-        <translation>Dekripsi dompet</translation>
-    </message>
-    <message>
-        <source>Change passphrase</source>
-        <translation>Ubah kata kunci</translation>
-    </message>
-    <message>
-        <source>Confirm wallet encryption</source>
-        <translation>Konfirmasi enkripsi dompet</translation>
-    </message>
-    <message>
-        <source>Warning: If you encrypt your wallet and lose your passphrase, you will &lt;b&gt;LOSE ALL OF YOUR BITCOINS&lt;/b&gt;!</source>
-        <translation>Perhatian: Jika anda mengenkripsi dompet anda dan lupa kata kuncinya, anda akan &lt;b&gt;KEHILANGAN SELURUH BITCOIN ANDA&lt;/b&gt;!</translation>
-    </message>
-    <message>
-        <source>Are you sure you wish to encrypt your wallet?</source>
-        <translation>Apakah Anda yakin ingin mengenkripsi dompet Anda?</translation>
-    </message>
-    <message>
-        <source>Bitcoin Core will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source>
-        <translation>Bitcoin Core akan ditutup untuk menyelesaikan proses enkripsi. Mohon diingat bahwa mengenkripsi dompet Anda tidak akan sepenuhnya melindungi bitcoin Anda dari virus atau malware yang menginfeksi komputer Anda.</translation>
-    </message>
-    <message>
-        <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source>
-        <translation>PENTING: Setiap back up yang sudah Anda buat sebaiknya diganti dengan data dompet Anda yang baru dan terenkripsi. Untuk alasan keamanan, data back up tidak terenkripsi yang sudah Anda buat sebelumnya tidak akan dapat digunakan setelah Anda mulai menggunakan dompet yang baru dan terenkripsi.</translation>
-    </message>
-    <message>
-        <source>Warning: The Caps Lock key is on!</source>
-        <translation>Perhatian: tombol Caps Lock sementara aktif!</translation>
-    </message>
-    <message>
-        <source>Wallet encrypted</source>
-        <translation>Dompet terenkripsi</translation>
-    </message>
-    <message>
-        <source>Enter the new passphrase to the wallet.&lt;br/&gt;Please use a passphrase of &lt;b&gt;ten or more random characters&lt;/b&gt;, or &lt;b&gt;eight or more words&lt;/b&gt;.</source>
-        <translation>Masukkan kata kunci untuk dompet Anda.&lt;br/&gt;Mohon gunakan kata kunci &lt;b&gt;yang terdiri dari 10 karakter acak&lt;/b&gt;, atau &lt;b&gt;delapan atau beberapa kata lagi&lt;/b&gt;.</translation>
-    </message>
-    <message>
-        <source>Enter the old passphrase and new passphrase to the wallet.</source>
-        <translation>Masukkan kata kunci lama dan kata kunci baru dompet Anda.</translation>
-    </message>
-    <message>
-        <source>Wallet encryption failed</source>
-        <translation>Enkripsi dompet gagal</translation>
-    </message>
-    <message>
-        <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
-        <translation>Enkripsi dompet gagal karena kesalahan internal. Dompet Anda tidak dienkripsi.</translation>
-    </message>
-    <message>
-        <source>The supplied passphrases do not match.</source>
-        <translation>Kata kunci yang dimasukkan tidak cocok.</translation>
-    </message>
-    <message>
-        <source>Wallet unlock failed</source>
-        <translation>Gagal buka dompet</translation>
-    </message>
-    <message>
-        <source>The passphrase entered for the wallet decryption was incorrect.</source>
-        <translation>Kata kunci yang dimasukkan untuk dekripsi dompet tidak cocok.</translation>
-    </message>
-    <message>
-        <source>Wallet decryption failed</source>
-        <translation>Dekripsi dompet gagal</translation>
-    </message>
-    <message>
-        <source>Wallet passphrase was successfully changed.</source>
-        <translation>Kata kunci dompet Anda berhasil diubah.</translation>
-    </message>
 </context>
 <context>
     <name>BanTableModel</name>
@@ -305,14 +146,6 @@
         <source>Open &amp;URI...</source>
         <translation>Buka &amp;URI</translation>
     </message>
-    <message>
-        <source>Bitcoin Core client</source>
-        <translation>Klien Bitcoin Core</translation>
-    </message>
-    <message>
-        <source>Importing blocks from disk...</source>
-        <translation>Mengimpor blok dari disk...</translation>
-    </message>
     <message>
         <source>Reindexing blocks on disk...</source>
         <translation>Mengindex ulang blok di dalam disk...</translation>
@@ -357,10 +190,6 @@
         <source>&amp;Receive</source>
         <translation>&amp;Menerima</translation>
     </message>
-    <message>
-        <source>Show information about Bitcoin Core</source>
-        <translation>Tampilkan informasi tentang Bitcoin Core</translation>
-    </message>
     <message>
         <source>&amp;Show / Hide</source>
         <translation>&amp;Tampilkan / Sembunyikan</translation>
@@ -397,22 +226,10 @@
         <source>Tabs toolbar</source>
         <translation>Baris tab</translation>
     </message>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Bitcoin Core</translation>
-    </message>
     <message>
         <source>Request payments (generates QR codes and bitcoin: URIs)</source>
         <translation>Permintaan pembayaran (membuat kode QR dan bitcoin: URIs)</translation>
     </message>
-    <message>
-        <source>&amp;About Bitcoin Core</source>
-        <translation>&amp;Mengenai Bitcoin Core</translation>
-    </message>
-    <message>
-        <source>Modify configuration options for Bitcoin Core</source>
-        <translation>Modifikasi pengaturan konfigurasi untuk Bitcoin Core</translation>
-    </message>
     <message>
         <source>Show the list of used sending addresses and labels</source>
         <translation>Tampilkan daftar alamat dan label yang terkirim</translation>
@@ -429,10 +246,6 @@
         <source>&amp;Command-line options</source>
         <translation>&amp;pilihan Command-line</translation>
     </message>
-    <message>
-        <source>Show the Bitcoin Core help message to get a list with possible Bitcoin command-line options</source>
-        <translation>Tampilkan pesan bantuan Bitcoin Core untuk mendapatkan daftar pilihan Command-line</translation>
-    </message>
     <message numerus="yes">
         <source>%n active connection(s) to Bitcoin network</source>
         <translation><numerusform>%n koneksi aktif ke jaringan Bitcoin</numerusform></translation>
@@ -544,13 +357,6 @@
         <translation>Dompet saat ini &lt;b&gt;terenkripsi&lt;/b&gt; dan &lt;b&gt;terkunci&lt;/b&gt;</translation>
     </message>
 </context>
-<context>
-    <name>ClientModel</name>
-    <message>
-        <source>Network Alert</source>
-        <translation>Notifikasi Jaringan</translation>
-    </message>
-</context>
 <context>
     <name>CoinControlDialog</name>
     <message>
@@ -629,150 +435,6 @@
         <source>Priority</source>
         <translation>Prioritas</translation>
     </message>
-    <message>
-        <source>Copy address</source>
-        <translation>Salin alamat</translation>
-    </message>
-    <message>
-        <source>Copy label</source>
-        <translation>Salin label</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>Salin jumlah</translation>
-    </message>
-    <message>
-        <source>Copy transaction ID</source>
-        <translation>Salin ID transaksi</translation>
-    </message>
-    <message>
-        <source>Lock unspent</source>
-        <translation>Kunci unspent.</translation>
-    </message>
-    <message>
-        <source>Unlock unspent</source>
-        <translation>Buka unspent</translation>
-    </message>
-    <message>
-        <source>Copy quantity</source>
-        <translation>Salin kuantitas</translation>
-    </message>
-    <message>
-        <source>Copy fee</source>
-        <translation>Salin biaya</translation>
-    </message>
-    <message>
-        <source>Copy after fee</source>
-        <translation>Salin dengan biaya</translation>
-    </message>
-    <message>
-        <source>Copy bytes</source>
-        <translation>Salin bytes</translation>
-    </message>
-    <message>
-        <source>Copy priority</source>
-        <translation>Salin prioritas</translation>
-    </message>
-    <message>
-        <source>Copy dust</source>
-        <translation>Salin dust</translation>
-    </message>
-    <message>
-        <source>Copy change</source>
-        <translation>Salin kembalian</translation>
-    </message>
-    <message>
-        <source>highest</source>
-        <translation>terbesar</translation>
-    </message>
-    <message>
-        <source>higher</source>
-        <translation>lebih besar</translation>
-    </message>
-    <message>
-        <source>high</source>
-        <translation>besar</translation>
-    </message>
-    <message>
-        <source>medium-high</source>
-        <translation>sedang-sampai-besar</translation>
-    </message>
-    <message>
-        <source>medium</source>
-        <translation>sedang</translation>
-    </message>
-    <message>
-        <source>low-medium</source>
-        <translation>sedikit-sampai-sedang</translation>
-    </message>
-    <message>
-        <source>low</source>
-        <translation>sedikit</translation>
-    </message>
-    <message>
-        <source>lower</source>
-        <translation>lebih sedikit</translation>
-    </message>
-    <message>
-        <source>lowest</source>
-        <translation>tersedikit</translation>
-    </message>
-    <message>
-        <source>(%1 locked)</source>
-        <translation>(%1 terkunci)</translation>
-    </message>
-    <message>
-        <source>none</source>
-        <translation>tidak satupun</translation>
-    </message>
-    <message>
-        <source>This label turns red if the transaction size is greater than 1000 bytes.</source>
-        <translation>Label ini akan menjadi merah apabila ukuran transaksi melebihi 1000 bytes.</translation>
-    </message>
-    <message>
-        <source>This label turns red if the priority is smaller than "medium".</source>
-        <translation>Label ini akan menjadi merah apabila prioritasnya lebih kecil dari "sedang"</translation>
-    </message>
-    <message>
-        <source>This label turns red if any recipient receives an amount smaller than %1.</source>
-        <translation>Label ini akan menjadi merah apabila penerima menerima jumlah yang lebih kecil dari %1.</translation>
-    </message>
-    <message>
-        <source>Can vary +/- %1 satoshi(s) per input.</source>
-        <translation>Dapat beragam +/- %1 satoshi per input.</translation>
-    </message>
-    <message>
-        <source>yes</source>
-        <translation>ya</translation>
-    </message>
-    <message>
-        <source>no</source>
-        <translation>tidak</translation>
-    </message>
-    <message>
-        <source>This means a fee of at least %1 per kB is required.</source>
-        <translation>Perlu biaya lebih dari %1 untuk setiap kB.</translation>
-    </message>
-    <message>
-        <source>Can vary +/- 1 byte per input.</source>
-        <translation>Dapat beragam +/- 1 byte per input.</translation>
-    </message>
-    <message>
-        <source>Transactions with higher priority are more likely to get included into a block.</source>
-        <translation>Transaksi dengan prioritas lebih tinggi akan lebih cepat dimasukkan kedalam blok.</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(tidak ada label)</translation>
-    </message>
-    <message>
-        <source>change from %1 (%2)</source>
-        <translation>kembalian dari %1 (%2)</translation>
-    </message>
-    <message>
-        <source>(change)</source>
-        <translation>(kembalian)</translation>
-    </message>
 </context>
 <context>
     <name>EditAddressDialog</name>
@@ -796,38 +458,6 @@
         <source>&amp;Address</source>
         <translation>&amp;Alamat</translation>
     </message>
-    <message>
-        <source>New receiving address</source>
-        <translation>Alamat menerima baru</translation>
-    </message>
-    <message>
-        <source>New sending address</source>
-        <translation>Alamat mengirim baru</translation>
-    </message>
-    <message>
-        <source>Edit receiving address</source>
-        <translation>Ubah alamat menerima</translation>
-    </message>
-    <message>
-        <source>Edit sending address</source>
-        <translation>Ubah alamat mengirim</translation>
-    </message>
-    <message>
-        <source>The entered address "%1" is already in the address book.</source>
-        <translation>Alamat yang dimasukkan "%1" sudah ada di dalam buku alamat.</translation>
-    </message>
-    <message>
-        <source>The entered address "%1" is not a valid Bitcoin address.</source>
-        <translation>Alamat yang dimasukkan "%1" bukan alamat Bitcoin yang benar.</translation>
-    </message>
-    <message>
-        <source>Could not unlock wallet.</source>
-        <translation>Tidak dapat membuka dompet.</translation>
-    </message>
-    <message>
-        <source>New key generation failed.</source>
-        <translation>Pembuatan kunci baru gagal.</translation>
-    </message>
 </context>
 <context>
     <name>FreespaceChecker</name>
@@ -854,10 +484,6 @@
 </context>
 <context>
     <name>HelpMessageDialog</name>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Bitcoin Core</translation>
-    </message>
     <message>
         <source>version</source>
         <translation>versi</translation>
@@ -866,10 +492,6 @@
         <source>(%1-bit)</source>
         <translation>(%1-bit)</translation>
     </message>
-    <message>
-        <source>About Bitcoin Core</source>
-        <translation>Mengenai Bitcoin Core</translation>
-    </message>
     <message>
         <source>Command-line options</source>
         <translation>Pilihan Command-line</translation>
@@ -906,29 +528,13 @@
         <source>Show splash screen on startup (default: %u)</source>
         <translation>Tampilkan layar kilat saat memulai (default: %u)</translation>
     </message>
-    <message>
-        <source>Reset all settings changes made over the GUI</source>
-        <translation>Reset semua pengaturan yang dibuat dari GUI</translation>
-    </message>
-</context>
+    </context>
 <context>
     <name>Intro</name>
     <message>
         <source>Welcome</source>
         <translation>Selamat Datang</translation>
     </message>
-    <message>
-        <source>Welcome to Bitcoin Core.</source>
-        <translation>Selamat Datang ke Bitcoin Core</translation>
-    </message>
-    <message>
-        <source>As this is the first time the program is launched, you can choose where Bitcoin Core will store its data.</source>
-        <translation>Ini adalah pertama kali program ini dijalankan, Anda dapat memilih dimana Bitcoin Core menyimpan data.</translation>
-    </message>
-    <message>
-        <source>Bitcoin Core will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source>
-        <translation>Bitcoin Core akan mengunduh dan menyimpan salinan dari block chain Bitcoin. Setidaknya %1GB data akan disimpan di direktori ini, dan akan terus bertambah. Dompet Anda juga akan disimpan di direktori ini.</translation>
-    </message>
     <message>
         <source>Use the default data directory</source>
         <translation>Gunakan direktori data default.</translation>
@@ -937,10 +543,6 @@
         <source>Use a custom data directory:</source>
         <translation>Gunakan direktori pilihan Anda:</translation>
     </message>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Bitcoin Core</translation>
-    </message>
     <message>
         <source>Error: Specified data directory "%1" cannot be created.</source>
         <translation>Kesalahan: Direktori data "%1" tidak dapat dibuat.</translation>
@@ -976,10 +578,6 @@
         <source>Select payment request file</source>
         <translation>Pilih data permintaan pembayaran</translation>
     </message>
-    <message>
-        <source>Select payment request file to open</source>
-        <translation>Pilih data permintaan pembayaran yang akan dibuka</translation>
-    </message>
 </context>
 <context>
     <name>OptionsDialog</name>
@@ -1019,10 +617,6 @@
         <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Exit in the menu.</source>
         <translation>Minimalisasi aplikasi ketika jendela ditutup. Ketika pilihan ini dipilih, aplikasi akan menutup seluruhnya jika anda memilih Keluar di menu yang tersedia.</translation>
     </message>
-    <message>
-        <source>The user interface language can be set here. This setting will take effect after restarting Bitcoin Core.</source>
-        <translation>Bahasa interface pengguna bisa diubah disini. Pengaturan ini akan memberikan efek setelah Bitcoin Core di-restart.</translation>
-    </message>
     <message>
         <source>Third party URLs (e.g. a block explorer) that appear in the transactions tab as context menu items. %s in the URL is replaced by transaction hash. Multiple URLs are separated by vertical bar |.</source>
         <translation>URL pihak ketika (misalnya sebuah block explorer) yang mumcul dalam tab transaksi sebagai konteks menu. %s dalam URL diganti dengan kode transaksi. URL dipisahkan dengan tanda vertikal |.</translation>
@@ -1047,14 +641,6 @@
         <source>&amp;Network</source>
         <translation>&amp;Jaringan</translation>
     </message>
-    <message>
-        <source>Automatically start Bitcoin Core after logging in to the system.</source>
-        <translation>Buka Bitcoin Core secara otomatis setelah Anda log-in ke sistem Anda.</translation>
-    </message>
-    <message>
-        <source>&amp;Start Bitcoin Core on system login</source>
-        <translation>&amp;Mulai Bitcoin Core saat log-in sistem</translation>
-    </message>
     <message>
         <source>(0 = auto, &lt;0 = leave that many cores free)</source>
         <translation>(0 = auto, &lt;0 = leave that many cores free)</translation>
@@ -1235,53 +821,6 @@
         <translation>Jumlah saldo Anda sekarang</translation>
     </message>
     </context>
-<context>
-    <name>PaymentServer</name>
-    <message>
-        <source>URI handling</source>
-        <translation>Penanganan URI</translation>
-    </message>
-    <message>
-        <source>Invalid payment address %1</source>
-        <translation>Alamat pembayaran salah %1</translation>
-    </message>
-    <message>
-        <source>Payment request rejected</source>
-        <translation>Permintaan pembayaran ditolak</translation>
-    </message>
-    <message>
-        <source>Requested payment amount of %1 is too small (considered dust).</source>
-        <translation>Nilai pembayaran %1 yang diminta oleh Anda terlalu sedikit (dianggap debu).</translation>
-    </message>
-    <message>
-        <source>Payment request error</source>
-        <translation>Gagalan permintaan pembayaran</translation>
-    </message>
-    <message>
-        <source>Payment request expired.</source>
-        <translation>Permintaan pembayaran telah kadaluarsa</translation>
-    </message>
-    <message>
-        <source>Refund from %1</source>
-        <translation>Pembayaran kembali dari %1</translation>
-    </message>
-    <message>
-        <source>Error communicating with %1: %2</source>
-        <translation>Masalah berkomunikasi dengan %1: %2</translation>
-    </message>
-    <message>
-        <source>Bad response from server %1</source>
-        <translation>Jawaban salah dari server %1</translation>
-    </message>
-    <message>
-        <source>Payment acknowledged</source>
-        <translation>Pembayaran diakui</translation>
-    </message>
-    <message>
-        <source>Network request error</source>
-        <translation>Gagalan permintaan dari jaringan</translation>
-    </message>
-</context>
 <context>
     <name>PeerTableModel</name>
     <message>
@@ -1312,25 +851,6 @@
         <translation>T/S</translation>
     </message>
     </context>
-<context>
-    <name>QRImageWidget</name>
-    <message>
-        <source>&amp;Save Image...</source>
-        <translation>&amp;Simpan Gambaran...</translation>
-    </message>
-    <message>
-        <source>&amp;Copy Image</source>
-        <translation>&amp;Salin Gambaran</translation>
-    </message>
-    <message>
-        <source>Save QR Code</source>
-        <translation>Simpan Kode QR</translation>
-    </message>
-    <message>
-        <source>PNG Image (*.png)</source>
-        <translation>Gambar PNG (*.png)</translation>
-    </message>
-</context>
 <context>
     <name>RPCConsole</name>
     <message>
@@ -1431,10 +951,6 @@
         <source>Out:</source>
         <translation>Keluar:</translation>
     </message>
-    <message>
-        <source>Build date</source>
-        <translation>Tanggal pembuatan</translation>
-    </message>
     <message>
         <source>Debug log file</source>
         <translation>Berkas catatan debug</translation>
@@ -1459,10 +975,6 @@
         <source>1 &amp;year</source>
         <translation>1 &amp;tahun</translation>
     </message>
-    <message>
-        <source>Welcome to the Bitcoin Core RPC console.</source>
-        <translation>Selamat datang di konsol RPC Bitcoin.</translation>
-    </message>
     <message>
         <source>Use up and down arrows to navigate history, and &lt;b&gt;Ctrl-L&lt;/b&gt; to clear screen.</source>
         <translation>Gunakan panah keatas dan kebawah untuk menampilkan sejarah, dan &lt;b&gt;Ctrl-L&lt;/b&gt; untuk bersihkan layar.</translation>
@@ -1562,18 +1074,6 @@
         <source>Remove</source>
         <translation>Menghapus</translation>
     </message>
-    <message>
-        <source>Copy label</source>
-        <translation>Salin label</translation>
-    </message>
-    <message>
-        <source>Copy message</source>
-        <translation>Salin Pesan</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>Salin nilai</translation>
-    </message>
 </context>
 <context>
     <name>ReceiveRequestDialog</name>
@@ -1593,73 +1093,6 @@
         <source>&amp;Save Image...</source>
         <translation>&amp;Simpan Gambaran...</translation>
     </message>
-    <message>
-        <source>Request payment to %1</source>
-        <translation>Minta pembayaran ke %1</translation>
-    </message>
-    <message>
-        <source>Payment information</source>
-        <translation>Informasi pembayaran</translation>
-    </message>
-    <message>
-        <source>URI</source>
-        <translation>URI</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>Alamat</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>Nilai</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Label</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>Pesan</translation>
-    </message>
-    <message>
-        <source>Resulting URI too long, try to reduce the text for label / message.</source>
-        <translation>Hasil URI terlalu panjang, coba kurangi label / pesan.</translation>
-    </message>
-    <message>
-        <source>Error encoding URI into QR Code.</source>
-        <translation>Gagal mengubah URI ke kode QR.</translation>
-    </message>
-</context>
-<context>
-    <name>RecentRequestsTableModel</name>
-    <message>
-        <source>Date</source>
-        <translation>Tanggal</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Label</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>Pesan:</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>Nilai</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(tidak ada label)</translation>
-    </message>
-    <message>
-        <source>(no message)</source>
-        <translation>(tidak ada pesan)</translation>
-    </message>
-    <message>
-        <source>(no amount)</source>
-        <translation>(tidak ada nilai)</translation>
-    </message>
 </context>
 <context>
     <name>SendCoinsDialog</name>
@@ -1771,98 +1204,6 @@
         <source>S&amp;end</source>
         <translation>K&amp;irim</translation>
     </message>
-    <message>
-        <source>Confirm send coins</source>
-        <translation>Konfirmasi pengiriman koin</translation>
-    </message>
-    <message>
-        <source>%1 to %2</source>
-        <translation>%1 ke %2</translation>
-    </message>
-    <message>
-        <source>Copy quantity</source>
-        <translation>Salin kuantitas</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>Salin nilai</translation>
-    </message>
-    <message>
-        <source>Copy fee</source>
-        <translation>Salin biaya</translation>
-    </message>
-    <message>
-        <source>Copy after fee</source>
-        <translation>Salin dengan biaya</translation>
-    </message>
-    <message>
-        <source>Copy bytes</source>
-        <translation>Salin bytes</translation>
-    </message>
-    <message>
-        <source>Copy priority</source>
-        <translation>Salin prioritas</translation>
-    </message>
-    <message>
-        <source>Copy change</source>
-        <translation>Salin uang kembali</translation>
-    </message>
-    <message>
-        <source>Total Amount %1</source>
-        <translation>Jumlah Total %1</translation>
-    </message>
-    <message>
-        <source>or</source>
-        <translation>atau</translation>
-    </message>
-    <message>
-        <source>The amount to pay must be larger than 0.</source>
-        <translation>Nilai yang dibayar harus lebih besar dari 0.</translation>
-    </message>
-    <message>
-        <source>The amount exceeds your balance.</source>
-        <translation>Nilai melebihi saldo Anda.</translation>
-    </message>
-    <message>
-        <source>The total exceeds your balance when the %1 transaction fee is included.</source>
-        <translation>Jumlah melebihi saldo Anda ketika biaya transaksi %1 ditambahkan.</translation>
-    </message>
-    <message>
-        <source>Transaction creation failed!</source>
-        <translation>Gagal membuat transaksi!</translation>
-    </message>
-    <message>
-        <source>The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source>
-        <translation>Gagal: Transaksi ditolak. Ini mungkin terjadi jika beberapa dari koin dalam dompet Anda telah digunakan, seperti ketika Anda menggunakan salinan wallet.dat dan beberapa koin telah dibelanjakan dalam salinan tersebut tetapi disini tidak tertandai sebagai terpakai.</translation>
-    </message>
-    <message>
-        <source>A fee higher than %1 is considered an absurdly high fee.</source>
-        <translation>Biaya yang lebih tinggi dari %1 dianggap biaya tak masuk akal.</translation>
-    </message>
-    <message>
-        <source>Payment request expired.</source>
-        <translation>Permintaan pembayaran telah kadaluarsa</translation>
-    </message>
-    <message>
-        <source>Warning: Invalid Bitcoin address</source>
-        <translation>Awas: Alamat Bitcoin tidak sah</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(tidak ada label)</translation>
-    </message>
-    <message>
-        <source>Copy dust</source>
-        <translation>Salin dust</translation>
-    </message>
-    <message>
-        <source>Are you sure you want to send?</source>
-        <translation>Apakah Anda yakin ingin kirim?</translation>
-    </message>
-    <message>
-        <source>added as transaction fee</source>
-        <translation>ditambahkan sebagai biaya transaksi</translation>
-    </message>
 </context>
 <context>
     <name>SendCoinsEntry</name>
@@ -1874,10 +1215,6 @@
         <source>Pay &amp;To:</source>
         <translation>Kirim &amp;Ke:</translation>
     </message>
-    <message>
-        <source>Enter a label for this address to add it to your address book</source>
-        <translation>Masukkan label bagi alamat ini untuk menambahkannya ke buku alamat Anda</translation>
-    </message>
     <message>
         <source>&amp;Label:</source>
         <translation>&amp;Label:</translation>
@@ -1925,10 +1262,6 @@
 </context>
 <context>
     <name>ShutdownWindow</name>
-    <message>
-        <source>Bitcoin Core is shutting down...</source>
-        <translation>Bitcoin Core sementara dimatikan...</translation>
-    </message>
     <message>
         <source>Do not shut down the computer until this window disappears.</source>
         <translation>Kamu tidak dapat mematikan komputer sebelum jendela ini tertutup sendiri.</translation>
@@ -2000,69 +1333,9 @@
         <source>Reset all verify message fields</source>
         <translation>Hapus semua bidang verifikasi pesan</translation>
     </message>
-    <message>
-        <source>Click "Sign Message" to generate signature</source>
-        <translation>Tekan "Tandatangan Pesan" untuk menghasilan tanda tangan</translation>
-    </message>
-    <message>
-        <source>The entered address is invalid.</source>
-        <translation>Alamat yang dimasukkan tidak sesuai.</translation>
-    </message>
-    <message>
-        <source>Please check the address and try again.</source>
-        <translation>Silahkan periksa alamat dan coba lagi.</translation>
-    </message>
-    <message>
-        <source>The entered address does not refer to a key.</source>
-        <translation>Alamat itu tidak menghubungkan kunci.</translation>
-    </message>
-    <message>
-        <source>Wallet unlock was cancelled.</source>
-        <translation>Membuka kunci dompet dibatalkan.</translation>
-    </message>
-    <message>
-        <source>Private key for the entered address is not available.</source>
-        <translation>Kunci pribadi untuk alamat itu tidak tersedia.</translation>
-    </message>
-    <message>
-        <source>Message signing failed.</source>
-        <translation>Menandai pesan gagal.</translation>
-    </message>
-    <message>
-        <source>Message signed.</source>
-        <translation>Pesan ditandai.</translation>
-    </message>
-    <message>
-        <source>The signature could not be decoded.</source>
-        <translation>Tanda tangan tidak bisa diterjemahkan.</translation>
-    </message>
-    <message>
-        <source>Please check the signature and try again.</source>
-        <translation>Mohon periksa tanda tangan dan coba kembali</translation>
-    </message>
-    <message>
-        <source>The signature did not match the message digest.</source>
-        <translation>Tanda tangan tidak cocok dengan intisari pesan.</translation>
-    </message>
-    <message>
-        <source>Message verification failed.</source>
-        <translation>Verifikasi pesan gagal.</translation>
-    </message>
-    <message>
-        <source>Message verified.</source>
-        <translation>Pesan terverifikasi.</translation>
-    </message>
 </context>
 <context>
     <name>SplashScreen</name>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Bitcoin Core</translation>
-    </message>
-    <message>
-        <source>The Bitcoin Core developers</source>
-        <translation>Pembangun Bitcoin Core</translation>
-    </message>
     <message>
         <source>[testnet]</source>
         <translation>[testnet]</translation>
@@ -2075,430 +1348,16 @@
         <translation>KB/s</translation>
     </message>
 </context>
-<context>
-    <name>TransactionDesc</name>
-    <message>
-        <source>Open until %1</source>
-        <translation>Buka hingga %1</translation>
-    </message>
-    <message>
-        <source>conflicted</source>
-        <translation>Terkonflik</translation>
-    </message>
-    <message>
-        <source>%1/offline</source>
-        <translation>%1/tidak terhubung</translation>
-    </message>
-    <message>
-        <source>%1/unconfirmed</source>
-        <translation>%1/belum dikonfirmasi</translation>
-    </message>
-    <message>
-        <source>%1 confirmations</source>
-        <translation>%1 konfirmasi</translation>
-    </message>
-    <message>
-        <source>Status</source>
-        <translation>Status</translation>
-    </message>
-    <message numerus="yes">
-        <source>, broadcast through %n node(s)</source>
-        <translation><numerusform>kirim lewat %n node</numerusform></translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation>Tanggal</translation>
-    </message>
-    <message>
-        <source>Source</source>
-        <translation>Sumber</translation>
-    </message>
-    <message>
-        <source>Generated</source>
-        <translation>Dibuat</translation>
-    </message>
-    <message>
-        <source>From</source>
-        <translation>Dari</translation>
-    </message>
-    <message>
-        <source>To</source>
-        <translation>Untuk</translation>
-    </message>
-    <message>
-        <source>own address</source>
-        <translation>Alamat saya sendiri</translation>
-    </message>
-    <message>
-        <source>label</source>
-        <translation>label</translation>
-    </message>
-    <message>
-        <source>Credit</source>
-        <translation>Kredit</translation>
-    </message>
-    <message numerus="yes">
-        <source>matures in %n more block(s)</source>
-        <translation><numerusform>cukup tua sesudah %n blok lagi</numerusform></translation>
-    </message>
-    <message>
-        <source>not accepted</source>
-        <translation>tidak diterima</translation>
-    </message>
-    <message>
-        <source>Debit</source>
-        <translation>Debet</translation>
-    </message>
-    <message>
-        <source>Transaction fee</source>
-        <translation>Biaya Transaksi</translation>
-    </message>
-    <message>
-        <source>Net amount</source>
-        <translation>Nilai bersih</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>Pesan:</translation>
-    </message>
-    <message>
-        <source>Comment</source>
-        <translation>Komentar</translation>
-    </message>
-    <message>
-        <source>Transaction ID</source>
-        <translation>ID Transaksi</translation>
-    </message>
-    <message>
-        <source>Merchant</source>
-        <translation>Pedagang</translation>
-    </message>
-    <message>
-        <source>Debug information</source>
-        <translation>Informasi debug</translation>
-    </message>
-    <message>
-        <source>Transaction</source>
-        <translation>Transaksi</translation>
-    </message>
-    <message>
-        <source>Inputs</source>
-        <translation>Masukan</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>Nilai</translation>
-    </message>
-    <message>
-        <source>true</source>
-        <translation>benar</translation>
-    </message>
-    <message>
-        <source>false</source>
-        <translation>salah</translation>
-    </message>
-    <message>
-        <source>, has not been successfully broadcast yet</source>
-        <translation>, belum berhasil disiarkan</translation>
-    </message>
-    <message numerus="yes">
-        <source>Open for %n more block(s)</source>
-        <translation><numerusform>Buka untuk %n blok lagi</numerusform></translation>
-    </message>
-    <message>
-        <source>unknown</source>
-        <translation>tidak diketahui</translation>
-    </message>
-</context>
 <context>
     <name>TransactionDescDialog</name>
-    <message>
-        <source>Transaction details</source>
-        <translation>Rincian transaksi</translation>
-    </message>
     <message>
         <source>This pane shows a detailed description of the transaction</source>
         <translation>Jendela ini menampilkan deskripsi rinci dari transaksi tersebut</translation>
     </message>
 </context>
-<context>
-    <name>TransactionTableModel</name>
-    <message>
-        <source>Date</source>
-        <translation>Tanggal</translation>
-    </message>
-    <message>
-        <source>Type</source>
-        <translation>Jenis</translation>
-    </message>
-    <message>
-        <source>Immature (%1 confirmations, will be available after %2)</source>
-        <translation>Terlalu muda (cuma %1 konfirmasi, akan siap sesudah %2) </translation>
-    </message>
-    <message numerus="yes">
-        <source>Open for %n more block(s)</source>
-        <translation><numerusform>Buka untuk %n blok lagi</numerusform></translation>
-    </message>
-    <message>
-        <source>Open until %1</source>
-        <translation>Buka hingga %1</translation>
-    </message>
-    <message>
-        <source>Confirmed (%1 confirmations)</source>
-        <translation>Terkonfirmasi (%1 konfirmasi)</translation>
-    </message>
-    <message>
-        <source>This block was not received by any other nodes and will probably not be accepted!</source>
-        <translation>Blok ini tidak diterima oleh node lainnya dan kemungkinan tidak akan diterima!</translation>
-    </message>
-    <message>
-        <source>Generated but not accepted</source>
-        <translation>Terbuat tetapi tidak diterima</translation>
-    </message>
-    <message>
-        <source>Offline</source>
-        <translation>Tidak terhubung</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Label</translation>
-    </message>
-    <message>
-        <source>Unconfirmed</source>
-        <translation>Belum dikonfirmasi</translation>
-    </message>
-    <message>
-        <source>Confirming (%1 of %2 recommended confirmations)</source>
-        <translation>Sedang dikonfirmasi (%1 dari %2 konfirmasi disarankan)</translation>
-    </message>
-    <message>
-        <source>Conflicted</source>
-        <translation>Terkonflik</translation>
-    </message>
-    <message>
-        <source>Received with</source>
-        <translation>Diterima dengan</translation>
-    </message>
-    <message>
-        <source>Received from</source>
-        <translation>Diterima dari</translation>
-    </message>
-    <message>
-        <source>Sent to</source>
-        <translation>Terkirim ke</translation>
-    </message>
-    <message>
-        <source>Payment to yourself</source>
-        <translation>Pembayaran ke Anda sendiri</translation>
-    </message>
-    <message>
-        <source>Mined</source>
-        <translation>Tertambang</translation>
-    </message>
-    <message>
-        <source>(n/a)</source>
-        <translation>(t/s)</translation>
-    </message>
-    <message>
-        <source>Transaction status. Hover over this field to show number of confirmations.</source>
-        <translation>Status transaksi. Arahkan ke bagian ini untuk menampilkan jumlah konfrimasi.</translation>
-    </message>
-    <message>
-        <source>Date and time that the transaction was received.</source>
-        <translation>Tanggal dan waktu transaksi tersebut diterima.</translation>
-    </message>
-    <message>
-        <source>Type of transaction.</source>
-        <translation>Jenis transaksi.</translation>
-    </message>
-    <message>
-        <source>Amount removed from or added to balance.</source>
-        <translation>Nilai dihapus dari atau ditambahkan ke saldo.</translation>
-    </message>
-</context>
-<context>
-    <name>TransactionView</name>
-    <message>
-        <source>All</source>
-        <translation>Semua</translation>
-    </message>
-    <message>
-        <source>Today</source>
-        <translation>Hari ini</translation>
-    </message>
-    <message>
-        <source>This week</source>
-        <translation>Minggu ini</translation>
-    </message>
-    <message>
-        <source>This month</source>
-        <translation>Bulan ini</translation>
-    </message>
-    <message>
-        <source>Last month</source>
-        <translation>Bulan kemarin</translation>
-    </message>
-    <message>
-        <source>This year</source>
-        <translation>Tahun ini</translation>
-    </message>
-    <message>
-        <source>Range...</source>
-        <translation>Jarak...</translation>
-    </message>
-    <message>
-        <source>Received with</source>
-        <translation>DIterima dengan</translation>
-    </message>
-    <message>
-        <source>Sent to</source>
-        <translation>Terkirim ke</translation>
-    </message>
-    <message>
-        <source>To yourself</source>
-        <translation>Ke Anda sendiri</translation>
-    </message>
-    <message>
-        <source>Mined</source>
-        <translation>Ditambang</translation>
-    </message>
-    <message>
-        <source>Other</source>
-        <translation>Lainnya</translation>
-    </message>
-    <message>
-        <source>Enter address or label to search</source>
-        <translation>Masukkan alamat atau label untuk mencari</translation>
-    </message>
-    <message>
-        <source>Min amount</source>
-        <translation>Nilai min</translation>
-    </message>
-    <message>
-        <source>Copy address</source>
-        <translation>Salin alamat</translation>
-    </message>
-    <message>
-        <source>Copy label</source>
-        <translation>Salin label</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>Salin Nilai</translation>
-    </message>
-    <message>
-        <source>Copy transaction ID</source>
-        <translation>Menyalinkan ID transaksi</translation>
-    </message>
-    <message>
-        <source>Edit label</source>
-        <translation>Ubah label</translation>
-    </message>
-    <message>
-        <source>Show transaction details</source>
-        <translation>Tampilkan rincian transaksi</translation>
-    </message>
-    <message>
-        <source>Export Transaction History</source>
-        <translation>Expor Histori Transaksi</translation>
-    </message>
-    <message>
-        <source>Exporting Failed</source>
-        <translation>Proses Ekspor Gagal</translation>
-    </message>
-    <message>
-        <source>Exporting Successful</source>
-        <translation>Proses Ekspor Berhasil</translation>
-    </message>
-    <message>
-        <source>The transaction history was successfully saved to %1.</source>
-        <translation>Riwayat transaksi berhasil disimpan di %1.</translation>
-    </message>
-    <message>
-        <source>Comma separated file (*.csv)</source>
-        <translation>Berkas CSV (*.csv)</translation>
-    </message>
-    <message>
-        <source>Confirmed</source>
-        <translation>Terkonfirmasi</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation>Tanggal</translation>
-    </message>
-    <message>
-        <source>Type</source>
-        <translation>Jenis</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Label</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>Alamat</translation>
-    </message>
-    <message>
-        <source>ID</source>
-        <translation>ID</translation>
-    </message>
-    <message>
-        <source>Range:</source>
-        <translation>Jarak:</translation>
-    </message>
-    <message>
-        <source>to</source>
-        <translation>ke</translation>
-    </message>
-</context>
 <context>
     <name>UnitDisplayStatusBarControl</name>
     </context>
-<context>
-    <name>WalletFrame</name>
-    <message>
-        <source>No wallet has been loaded.</source>
-        <translation>Tidak ada dompet yang dibuka</translation>
-    </message>
-</context>
-<context>
-    <name>WalletModel</name>
-    <message>
-        <source>Send Coins</source>
-        <translation>Kirim Koin</translation>
-    </message>
-</context>
-<context>
-    <name>WalletView</name>
-    <message>
-        <source>&amp;Export</source>
-        <translation>&amp;Ekspor</translation>
-    </message>
-    <message>
-        <source>Export the data in the current tab to a file</source>
-        <translation>Ekspor data dalam tab sekarang ke sebuah berkas</translation>
-    </message>
-    <message>
-        <source>Backup Wallet</source>
-        <translation>Cadangkan Dompet</translation>
-    </message>
-    <message>
-        <source>Wallet Data (*.dat)</source>
-        <translation>Data Dompet (*.dat)</translation>
-    </message>
-    <message>
-        <source>Backup Failed</source>
-        <translation>Cadangkgan Gagal</translation>
-    </message>
-    <message>
-        <source>The wallet data was successfully saved to %1.</source>
-        <translation>Informasi dalam dompet berhasil disimpan di %1.</translation>
-    </message>
-    <message>
-        <source>Backup Successful</source>
-        <translation>Cadangkan Berhasil </translation>
-    </message>
-</context>
 <context>
     <name>bitcoin-core</name>
     <message>
@@ -2530,12 +1389,12 @@
         <translation>Terima hubungan dari luar (standar: 1 kalau -proxy atau -connect tidak dipilih)</translation>
     </message>
     <message>
-        <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source>
-        <translation>Jalankan perintah ketika perubahan transaksi dompet (%s di cmd digantikan oleh TxID)</translation>
+        <source>Bitcoin Core</source>
+        <translation>Bitcoin Core</translation>
     </message>
     <message>
-        <source>Unable to bind to %s on this computer. Bitcoin Core is probably already running.</source>
-        <translation>Tidak bisa mengikat dengan %s di computer ini. Kemungkinan Bitcoin Core sudah mulai.</translation>
+        <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source>
+        <translation>Jalankan perintah ketika perubahan transaksi dompet (%s di cmd digantikan oleh TxID)</translation>
     </message>
     <message>
         <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source>
@@ -2629,18 +1488,6 @@
         <source>Wallet options:</source>
         <translation>Opsi dompet:</translation>
     </message>
-    <message>
-        <source>You need to rebuild the database using -reindex to change -txindex</source>
-        <translation>Harus membangun ulang database menggunakan -reindex supaya mengubah -txindex</translation>
-    </message>
-    <message>
-        <source>Cannot obtain a lock on data directory %s. Bitcoin Core is probably already running.</source>
-        <translation>Tidak bisa mengunci data directory %s. Kemungkinan Bitcoin Core sudah mulai.</translation>
-    </message>
-    <message>
-        <source>Cannot resolve -whitebind address: '%s'</source>
-        <translation>Tidak dapat menyelesaikan alamat -whitebind: '%s'</translation>
-    </message>
     <message>
         <source>Connect through SOCKS5 proxy</source>
         <translation>Hubungkan melalui proxy SOCKS5</translation>
@@ -2649,18 +1496,6 @@
         <source>Information</source>
         <translation>Informasi</translation>
     </message>
-    <message>
-        <source>Invalid amount for -maxtxfee=&lt;amount&gt;: '%s'</source>
-        <translation>Nilai salah untuk -maxtxfee=&lt;amount&gt;: '%s'</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -minrelaytxfee=&lt;amount&gt;: '%s'</source>
-        <translation>Nilai yang salah untuk -minrelaytxfee=&lt;amount&gt;: '%s'</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -mintxfee=&lt;amount&gt;: '%s'</source>
-        <translation>Nilai yang salah untuk -mintxfee=&lt;amount&gt;: '%s'</translation>
-    </message>
     <message>
         <source>RPC server options:</source>
         <translation>Opsi server RPC:</translation>
@@ -2701,10 +1536,6 @@
         <source>Zapping all transactions from wallet...</source>
         <translation>Setiap transaksi dalam dompet sedang di-'Zap'...</translation>
     </message>
-    <message>
-        <source>wallet.dat corrupt, salvage failed</source>
-        <translation>wallet.dat rusak, tidak bisa diperbaiki</translation>
-    </message>
     <message>
         <source>Password for JSON-RPC connections</source>
         <translation>Kata sandi untuk hubungan JSON-RPC</translation>
@@ -2713,10 +1544,6 @@
         <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
         <translation>Menjalankan perintah ketika perubahan blok terbaik (%s dalam cmd digantikan oleh hash blok)</translation>
     </message>
-    <message>
-        <source>This help message</source>
-        <translation>Pesan bantuan ini</translation>
-    </message>
     <message>
         <source>Allow DNS lookups for -addnode, -seednode and -connect</source>
         <translation>Izinkan peninjauan DNS untuk -addnote, -seednode dan -connect</translation>
@@ -2725,14 +1552,6 @@
         <source>Loading addresses...</source>
         <translation>Memuat alamat...</translation>
     </message>
-    <message>
-        <source>Error loading wallet.dat: Wallet corrupted</source>
-        <translation>Gagal memuat wallet.dat: Dompet rusak</translation>
-    </message>
-    <message>
-        <source>Error loading wallet.dat</source>
-        <translation>Gagal memuat wallet.dat</translation>
-    </message>
     <message>
         <source>Invalid -proxy address: '%s'</source>
         <translation>Alamat -proxy salah: '%s'</translation>
@@ -2741,18 +1560,6 @@
         <source>Unknown network specified in -onlynet: '%s'</source>
         <translation>Jaringan tidak diketahui yang ditentukan dalam -onlynet: '%s'</translation>
     </message>
-    <message>
-        <source>Cannot resolve -bind address: '%s'</source>
-        <translation>Tidak dapat menyelesaikan alamat -bind: '%s'</translation>
-    </message>
-    <message>
-        <source>Cannot resolve -externalip address: '%s'</source>
-        <translation>Tidak dapat menyelesaikan alamat -externalip: '%s'</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -paytxfee=&lt;amount&gt;: '%s'</source>
-        <translation>Nilai salah untuk -paytxfee=&lt;amount&gt;: '%s'</translation>
-    </message>
     <message>
         <source>Insufficient funds</source>
         <translation>Saldo tidak mencukupi</translation>
diff --git a/src/qt/locale/bitcoin_it.ts b/src/qt/locale/bitcoin_it.ts
index 2f14c420146c6..b92dbb2cb3b34 100644
--- a/src/qt/locale/bitcoin_it.ts
+++ b/src/qt/locale/bitcoin_it.ts
@@ -25,10 +25,6 @@
         <source>C&amp;lose</source>
         <translation>C&amp;hiudi</translation>
     </message>
-    <message>
-        <source>&amp;Copy Address</source>
-        <translation>&amp;Copia l'indirizzo</translation>
-    </message>
     <message>
         <source>Delete the currently selected address from the list</source>
         <translation>Rimuove dalla lista l'indirizzo attualmente selezionato</translation>
@@ -45,73 +41,6 @@
         <source>&amp;Delete</source>
         <translation>&amp;Elimina</translation>
     </message>
-    <message>
-        <source>Choose the address to send coins to</source>
-        <translation>Scegli l'indirizzo a cui inviare bitcoin</translation>
-    </message>
-    <message>
-        <source>Choose the address to receive coins with</source>
-        <translation>Scegli l'indirizzo con cui ricevere bitcoin</translation>
-    </message>
-    <message>
-        <source>C&amp;hoose</source>
-        <translation>Sc&amp;egli</translation>
-    </message>
-    <message>
-        <source>Sending addresses</source>
-        <translation>Indirizzi d'invio</translation>
-    </message>
-    <message>
-        <source>Receiving addresses</source>
-        <translation>Indirizzi di ricezione</translation>
-    </message>
-    <message>
-        <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source>
-        <translation>Questo è un elenco di indirizzi Bitcoin a cui puoi inviare pagamenti. Controlla sempre l'importo e l'indirizzo del beneficiario prima di inviare bitcoin.</translation>
-    </message>
-    <message>
-        <source>These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source>
-        <translation>Questi sono i tuoi indirizzi Bitcoin che puoi usare per ricevere pagamenti. Si raccomanda di generare un nuovo indirizzo per ogni transazione.</translation>
-    </message>
-    <message>
-        <source>Copy &amp;Label</source>
-        <translation>Copia &amp;l'etichetta</translation>
-    </message>
-    <message>
-        <source>&amp;Edit</source>
-        <translation>&amp;Modifica</translation>
-    </message>
-    <message>
-        <source>Export Address List</source>
-        <translation>Esporta Lista Indirizzi</translation>
-    </message>
-    <message>
-        <source>Comma separated file (*.csv)</source>
-        <translation>Testo CSV (*.csv)</translation>
-    </message>
-    <message>
-        <source>Exporting Failed</source>
-        <translation>Esportazione Fallita.</translation>
-    </message>
-    <message>
-        <source>There was an error trying to save the address list to %1. Please try again.</source>
-        <translation>Si è verificato un errore tentando di salvare la lista degli indirizzi su %1. Si prega di riprovare.</translation>
-    </message>
-</context>
-<context>
-    <name>AddressTableModel</name>
-    <message>
-        <source>Label</source>
-        <translation>Etichetta</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>Indirizzo</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(nessuna etichetta)</translation>
-    </message>
 </context>
 <context>
     <name>AskPassphraseDialog</name>
@@ -131,94 +60,6 @@
         <source>Repeat new passphrase</source>
         <translation>Ripeti la nuova passphrase</translation>
     </message>
-    <message>
-        <source>Encrypt wallet</source>
-        <translation>Cifra il portamonete</translation>
-    </message>
-    <message>
-        <source>This operation needs your wallet passphrase to unlock the wallet.</source>
-        <translation>Questa operazione necessita della passphrase per sbloccare il portamonete.</translation>
-    </message>
-    <message>
-        <source>Unlock wallet</source>
-        <translation>Sblocca il portamonete</translation>
-    </message>
-    <message>
-        <source>This operation needs your wallet passphrase to decrypt the wallet.</source>
-        <translation>Quest'operazione necessita della passphrase per decifrare il portamonete,</translation>
-    </message>
-    <message>
-        <source>Decrypt wallet</source>
-        <translation>Decifra il portamonete</translation>
-    </message>
-    <message>
-        <source>Change passphrase</source>
-        <translation>Cambia la passphrase</translation>
-    </message>
-    <message>
-        <source>Confirm wallet encryption</source>
-        <translation>Conferma la cifratura del portamonete</translation>
-    </message>
-    <message>
-        <source>Warning: If you encrypt your wallet and lose your passphrase, you will &lt;b&gt;LOSE ALL OF YOUR BITCOINS&lt;/b&gt;!</source>
-        <translation>Attenzione: perdendo la passphrase di un portamonete cifrato &lt;b&gt;TUTTI I PROPRI BITCOIN ANDRANNO PERSI&lt;/b&gt;!</translation>
-    </message>
-    <message>
-        <source>Are you sure you wish to encrypt your wallet?</source>
-        <translation>Si è sicuri di voler cifrare il portamonete?</translation>
-    </message>
-    <message>
-        <source>Bitcoin Core will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source>
-        <translation>Bitcoin Core si chiuderà per portare a termine il processo di cifratura. Si ricorda che la cifratura del portamonete non garantisce protezione totale contro i furti causati da infezioni malware.</translation>
-    </message>
-    <message>
-        <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source>
-        <translation>IMPORTANTE: qualsiasi backup del file portamonete effettuato in precedenza dovrà essere sostituito con il file del portamonete cifrato appena generato. Per ragioni di sicurezza, i precedenti backup del file del portamonete non cifrato diventeranno inservibili non appena si inizierà ad utilizzare il nuovo portamonete cifrato.</translation>
-    </message>
-    <message>
-        <source>Warning: The Caps Lock key is on!</source>
-        <translation>Attenzione: il tasto Blocco maiuscole è attivo!</translation>
-    </message>
-    <message>
-        <source>Wallet encrypted</source>
-        <translation>Portamonete cifrato</translation>
-    </message>
-    <message>
-        <source>Enter the new passphrase to the wallet.&lt;br/&gt;Please use a passphrase of &lt;b&gt;ten or more random characters&lt;/b&gt;, or &lt;b&gt;eight or more words&lt;/b&gt;.</source>
-        <translation>Inserisci la nuova passphrase per il portamonete.&lt;br/&gt;Si consiglia di utilizzare &lt;b&gt;almeno dieci caratteri casuali&lt;/b&gt; oppure &lt;b&gt;otto o più parole&lt;/b&gt;.</translation>
-    </message>
-    <message>
-        <source>Enter the old passphrase and new passphrase to the wallet.</source>
-        <translation>Inserisci la vecchia e la nuova passphrase per il portamonete.</translation>
-    </message>
-    <message>
-        <source>Wallet encryption failed</source>
-        <translation>Cifratura del portamonete fallita</translation>
-    </message>
-    <message>
-        <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
-        <translation>Cifratura del portamonete fallita a causa di un errore interno. Il portamonete non è stato cifrato.</translation>
-    </message>
-    <message>
-        <source>The supplied passphrases do not match.</source>
-        <translation>Le passphrase inserite non corrispondono.</translation>
-    </message>
-    <message>
-        <source>Wallet unlock failed</source>
-        <translation>Sblocco del portamonete fallito</translation>
-    </message>
-    <message>
-        <source>The passphrase entered for the wallet decryption was incorrect.</source>
-        <translation>La passphrase inserita per la decifrazione del portamonete è errata.</translation>
-    </message>
-    <message>
-        <source>Wallet decryption failed</source>
-        <translation>Decifrazione del portamonete fallita</translation>
-    </message>
-    <message>
-        <source>Wallet passphrase was successfully changed.</source>
-        <translation>Passphrase del portamonete modificata con successo.</translation>
-    </message>
 </context>
 <context>
     <name>BanTableModel</name>
@@ -269,6 +110,10 @@
         <source>Quit application</source>
         <translation>Chiudi applicazione</translation>
     </message>
+    <message>
+        <source>&amp;About %1</source>
+        <translation>&amp;Informazioni su %1</translation>
+    </message>
     <message>
         <source>About &amp;Qt</source>
         <translation>Informazioni su &amp;Qt</translation>
@@ -305,14 +150,6 @@
         <source>Open &amp;URI...</source>
         <translation>Apri &amp;URI...</translation>
     </message>
-    <message>
-        <source>Bitcoin Core client</source>
-        <translation>Bitcoin Core client</translation>
-    </message>
-    <message>
-        <source>Importing blocks from disk...</source>
-        <translation>Importazione blocchi dal disco...</translation>
-    </message>
     <message>
         <source>Reindexing blocks on disk...</source>
         <translation>Re-indicizzazione blocchi su disco...</translation>
@@ -357,10 +194,6 @@
         <source>&amp;Receive</source>
         <translation>&amp;Ricevi</translation>
     </message>
-    <message>
-        <source>Show information about Bitcoin Core</source>
-        <translation>Mostra le informazioni su Bitcoin Core</translation>
-    </message>
     <message>
         <source>&amp;Show / Hide</source>
         <translation>&amp;Mostra / Nascondi</translation>
@@ -397,22 +230,10 @@
         <source>Tabs toolbar</source>
         <translation>Barra degli strumenti</translation>
     </message>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Bitcoin Core</translation>
-    </message>
     <message>
         <source>Request payments (generates QR codes and bitcoin: URIs)</source>
         <translation>Richiedi pagamenti (genera codici QR e bitcoin: URI)</translation>
     </message>
-    <message>
-        <source>&amp;About Bitcoin Core</source>
-        <translation>&amp;Informazioni su Bitcoin Core</translation>
-    </message>
-    <message>
-        <source>Modify configuration options for Bitcoin Core</source>
-        <translation>Modifica opzioni di configurazione per Bitcoin Core</translation>
-    </message>
     <message>
         <source>Show the list of used sending addresses and labels</source>
         <translation>Mostra la lista degli indirizzi di invio utilizzati</translation>
@@ -429,10 +250,6 @@
         <source>&amp;Command-line options</source>
         <translation>Opzioni della riga di &amp;comando</translation>
     </message>
-    <message>
-        <source>Show the Bitcoin Core help message to get a list with possible Bitcoin command-line options</source>
-        <translation>Mostra il messaggio di aiuto di Bitcoin Core per ottenere la lista delle opzioni della riga di comando valide.</translation>
-    </message>
     <message numerus="yes">
         <source>%n active connection(s) to Bitcoin network</source>
         <translation><numerusform>%n connessione attiva alla rete Bitcoin</numerusform><numerusform>%n connessioni alla rete Bitcoin attive</numerusform></translation>
@@ -544,13 +361,6 @@
         <translation>Il portamonete è &lt;b&gt;cifrato&lt;/b&gt; ed attualmente &lt;b&gt;bloccato&lt;/b&gt;</translation>
     </message>
 </context>
-<context>
-    <name>ClientModel</name>
-    <message>
-        <source>Network Alert</source>
-        <translation>Avviso di rete</translation>
-    </message>
-</context>
 <context>
     <name>CoinControlDialog</name>
     <message>
@@ -629,150 +439,6 @@
         <source>Priority</source>
         <translation>Priorità</translation>
     </message>
-    <message>
-        <source>Copy address</source>
-        <translation>Copia l'indirizzo</translation>
-    </message>
-    <message>
-        <source>Copy label</source>
-        <translation>Copia l'etichetta</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>Copia importo</translation>
-    </message>
-    <message>
-        <source>Copy transaction ID</source>
-        <translation>Copia l'ID transazione</translation>
-    </message>
-    <message>
-        <source>Lock unspent</source>
-        <translation>Bloccare non spesi</translation>
-    </message>
-    <message>
-        <source>Unlock unspent</source>
-        <translation>Sbloccare non spesi</translation>
-    </message>
-    <message>
-        <source>Copy quantity</source>
-        <translation>Copia quantità</translation>
-    </message>
-    <message>
-        <source>Copy fee</source>
-        <translation>Copia commissione</translation>
-    </message>
-    <message>
-        <source>Copy after fee</source>
-        <translation>Copia dopo commissione</translation>
-    </message>
-    <message>
-        <source>Copy bytes</source>
-        <translation>Copia byte</translation>
-    </message>
-    <message>
-        <source>Copy priority</source>
-        <translation>Copia priorità</translation>
-    </message>
-    <message>
-        <source>Copy dust</source>
-        <translation>Copia trascurabile</translation>
-    </message>
-    <message>
-        <source>Copy change</source>
-        <translation>Copia resto</translation>
-    </message>
-    <message>
-        <source>highest</source>
-        <translation>massima</translation>
-    </message>
-    <message>
-        <source>higher</source>
-        <translation>molto alta</translation>
-    </message>
-    <message>
-        <source>high</source>
-        <translation>alta</translation>
-    </message>
-    <message>
-        <source>medium-high</source>
-        <translation>medio-alta</translation>
-    </message>
-    <message>
-        <source>medium</source>
-        <translation>media</translation>
-    </message>
-    <message>
-        <source>low-medium</source>
-        <translation>medio-bassa</translation>
-    </message>
-    <message>
-        <source>low</source>
-        <translation>bassa</translation>
-    </message>
-    <message>
-        <source>lower</source>
-        <translation>molto bassa</translation>
-    </message>
-    <message>
-        <source>lowest</source>
-        <translation>minima</translation>
-    </message>
-    <message>
-        <source>(%1 locked)</source>
-        <translation>(%1 bloccato)</translation>
-    </message>
-    <message>
-        <source>none</source>
-        <translation>nessuno</translation>
-    </message>
-    <message>
-        <source>This label turns red if the transaction size is greater than 1000 bytes.</source>
-        <translation>Questa etichetta diventerà rossa se la dimensione della transazione supererà i 1000 byte.</translation>
-    </message>
-    <message>
-        <source>This label turns red if the priority is smaller than "medium".</source>
-        <translation>Questa etichetta diventerà rossa se la priorità sarà inferiore a "media".</translation>
-    </message>
-    <message>
-        <source>This label turns red if any recipient receives an amount smaller than %1.</source>
-        <translation>Questa etichetta diventerà rossa se uno qualsiasi dei destinatari riceverà un importo inferiore a %1.</translation>
-    </message>
-    <message>
-        <source>Can vary +/- %1 satoshi(s) per input.</source>
-        <translation>Può variare di +/- %1 satoshi per input.</translation>
-    </message>
-    <message>
-        <source>yes</source>
-        <translation>sì</translation>
-    </message>
-    <message>
-        <source>no</source>
-        <translation>no</translation>
-    </message>
-    <message>
-        <source>This means a fee of at least %1 per kB is required.</source>
-        <translation>In tal caso sarà necessaria una commissione di almeno %1 per ogni kB.</translation>
-    </message>
-    <message>
-        <source>Can vary +/- 1 byte per input.</source>
-        <translation>Può variare di +/- 1 byte per input.</translation>
-    </message>
-    <message>
-        <source>Transactions with higher priority are more likely to get included into a block.</source>
-        <translation>Le transazioni con priorità più alta hanno più probabilità di essere incluse in un blocco.</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(nessuna etichetta)</translation>
-    </message>
-    <message>
-        <source>change from %1 (%2)</source>
-        <translation>resto da %1 (%2)</translation>
-    </message>
-    <message>
-        <source>(change)</source>
-        <translation>(resto)</translation>
-    </message>
 </context>
 <context>
     <name>EditAddressDialog</name>
@@ -796,38 +462,6 @@
         <source>&amp;Address</source>
         <translation>&amp;Indirizzo</translation>
     </message>
-    <message>
-        <source>New receiving address</source>
-        <translation>Nuovo indirizzo di ricezione</translation>
-    </message>
-    <message>
-        <source>New sending address</source>
-        <translation>Nuovo indirizzo d'invio</translation>
-    </message>
-    <message>
-        <source>Edit receiving address</source>
-        <translation>Modifica indirizzo di ricezione</translation>
-    </message>
-    <message>
-        <source>Edit sending address</source>
-        <translation>Modifica indirizzo d'invio</translation>
-    </message>
-    <message>
-        <source>The entered address "%1" is already in the address book.</source>
-        <translation>L'indirizzo "%1" è già presente in rubrica.</translation>
-    </message>
-    <message>
-        <source>The entered address "%1" is not a valid Bitcoin address.</source>
-        <translation>L'indirizzo "%1" non è un indirizzo bitcoin valido.</translation>
-    </message>
-    <message>
-        <source>Could not unlock wallet.</source>
-        <translation>Impossibile sbloccare il portamonete.</translation>
-    </message>
-    <message>
-        <source>New key generation failed.</source>
-        <translation>Generazione della nuova chiave non riuscita.</translation>
-    </message>
 </context>
 <context>
     <name>FreespaceChecker</name>
@@ -854,10 +488,6 @@
 </context>
 <context>
     <name>HelpMessageDialog</name>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Bitcoin Core</translation>
-    </message>
     <message>
         <source>version</source>
         <translation>versione</translation>
@@ -866,10 +496,6 @@
         <source>(%1-bit)</source>
         <translation>(%1-bit)</translation>
     </message>
-    <message>
-        <source>About Bitcoin Core</source>
-        <translation>Informazioni su Bitcoin Core</translation>
-    </message>
     <message>
         <source>Command-line options</source>
         <translation>Opzioni della riga di comando</translation>
@@ -906,29 +532,13 @@
         <source>Show splash screen on startup (default: %u)</source>
         <translation>Mostra schermata iniziale all'avvio (default: %u)</translation>
     </message>
-    <message>
-        <source>Reset all settings changes made over the GUI</source>
-        <translation>Reset di tutte le modifiche alle impostazioni eseguite da interfaccia grafica</translation>
-    </message>
-</context>
+    </context>
 <context>
     <name>Intro</name>
     <message>
         <source>Welcome</source>
         <translation>Benvenuto</translation>
     </message>
-    <message>
-        <source>Welcome to Bitcoin Core.</source>
-        <translation>Benvenuti su Bitcoin Core.</translation>
-    </message>
-    <message>
-        <source>As this is the first time the program is launched, you can choose where Bitcoin Core will store its data.</source>
-        <translation>Visto che questa è la prima volta che il programma viene lanciato, puoi scegliere dove Bitcoin Core salverà i propri dati.</translation>
-    </message>
-    <message>
-        <source>Bitcoin Core will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source>
-        <translation>Bitcoin Core scaricherà e salverà una copia della block chain di Bitcoin. Il portamonete ed almeno %1GB di dati saranno salvati in questa cartella. Si ricorda che lo spazio occupato andrà ad aumentare nel tempo.</translation>
-    </message>
     <message>
         <source>Use the default data directory</source>
         <translation>Usa la cartella dati predefinita</translation>
@@ -937,10 +547,6 @@
         <source>Use a custom data directory:</source>
         <translation>Usa una cartella dati personalizzata:</translation>
     </message>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Bitcoin Core</translation>
-    </message>
     <message>
         <source>Error: Specified data directory "%1" cannot be created.</source>
         <translation>Errore: La cartella dati "%1" specificata non può essere creata.</translation>
@@ -976,10 +582,6 @@
         <source>Select payment request file</source>
         <translation>Seleziona il file di richiesta di pagamento</translation>
     </message>
-    <message>
-        <source>Select payment request file to open</source>
-        <translation>Seleziona il file di richiesta di pagamento da aprire</translation>
-    </message>
 </context>
 <context>
     <name>OptionsDialog</name>
@@ -1019,10 +621,6 @@
         <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Exit in the menu.</source>
         <translation>Riduci ad icona invece di uscire dall'applicazione quando la finestra viene chiusa. Attivando questa opzione l'applicazione terminerà solo dopo aver selezionato Esci dal menu File.</translation>
     </message>
-    <message>
-        <source>The user interface language can be set here. This setting will take effect after restarting Bitcoin Core.</source>
-        <translation>La lingua dell'interfaccia utente può essere impostata qui. L'applicazione delle modifiche avrà effetto dopo il riavvio di Bitcoin Core.</translation>
-    </message>
     <message>
         <source>Third party URLs (e.g. a block explorer) that appear in the transactions tab as context menu items. %s in the URL is replaced by transaction hash. Multiple URLs are separated by vertical bar |.</source>
         <translation>URL di terze parti (ad es. un block explorer) che appaiono nella tabella delle transazioni come voci nel menu contestuale. "%s" nell'URL è sostituito dall'hash della transazione.
@@ -1048,14 +646,6 @@ Per specificare più URL separarli con una barra verticale "|".</translation>
         <source>&amp;Network</source>
         <translation>Rete</translation>
     </message>
-    <message>
-        <source>Automatically start Bitcoin Core after logging in to the system.</source>
-        <translation>Avvia automaticamente Bitcoin Core una volta effettuato l'accesso al sistema.</translation>
-    </message>
-    <message>
-        <source>&amp;Start Bitcoin Core on system login</source>
-        <translation>&amp;Avvia Bitcoin Core all'accesso al sistema</translation>
-    </message>
     <message>
         <source>(0 = auto, &lt;0 = leave that many cores free)</source>
         <translation>(0 = automatico, &lt;0 = lascia questo numero di core liberi)</translation>
@@ -1285,182 +875,72 @@ Per specificare più URL separarli con una barra verticale "|".</translation>
     </message>
 </context>
 <context>
-    <name>PaymentServer</name>
+    <name>PeerTableModel</name>
     <message>
-        <source>URI handling</source>
-        <translation>Gestione URI</translation>
+        <source>User Agent</source>
+        <translation>User Agent</translation>
     </message>
     <message>
-        <source>Invalid payment address %1</source>
-        <translation>Indirizzo di pagamento non valido %1</translation>
+        <source>Node/Service</source>
+        <translation>Nodo/Servizio</translation>
     </message>
     <message>
-        <source>Payment request rejected</source>
-        <translation>Richiesta di pagamento respinta</translation>
+        <source>Ping Time</source>
+        <translation>Tempo di ping</translation>
     </message>
+</context>
+<context>
+    <name>QObject</name>
     <message>
-        <source>Payment request network doesn't match client network.</source>
-        <translation>La rete della richiesta di pagamento non corrisponde alla rete del client.</translation>
+        <source>Amount</source>
+        <translation>Importo</translation>
     </message>
     <message>
-        <source>Payment request is not initialized.</source>
-        <translation>La richiesta di pagamento non è stata inizializzata.</translation>
+        <source>Enter a Bitcoin address (e.g. %1)</source>
+        <translation>Inserisci un indirizzo Bitcoin (ad es. %1)</translation>
     </message>
     <message>
-        <source>Requested payment amount of %1 is too small (considered dust).</source>
-        <translation>L'importo di pagamento di %1 richiesto è troppo basso (considerato come trascurabile).</translation>
+        <source>%1 d</source>
+        <translation>%1 d</translation>
     </message>
     <message>
-        <source>Payment request error</source>
-        <translation>Errore di richiesta di pagamento</translation>
+        <source>%1 h</source>
+        <translation>%1 h</translation>
     </message>
     <message>
-        <source>Cannot start bitcoin: click-to-pay handler</source>
-        <translation>Impossibile avviare bitcoin: gestore click-to-pay</translation>
+        <source>%1 m</source>
+        <translation>%1 m</translation>
     </message>
     <message>
-        <source>Payment request fetch URL is invalid: %1</source>
-        <translation>URL di recupero della Richiesta di pagamento non valido: %1</translation>
+        <source>%1 s</source>
+        <translation>%1 s</translation>
     </message>
     <message>
-        <source>URI cannot be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source>
-        <translation>Impossibile interpretare l'URI! I parametri URI o l'indirizzo Bitcoin potrebbero non essere corretti.</translation>
+        <source>None</source>
+        <translation>Nessuno</translation>
     </message>
     <message>
-        <source>Payment request file handling</source>
-        <translation>Gestione del file di richiesta del pagamento</translation>
+        <source>N/A</source>
+        <translation>N/D</translation>
     </message>
     <message>
-        <source>Payment request file cannot be read! This can be caused by an invalid payment request file.</source>
-        <translation>Impossibile leggere il file della richiesta di pagamento! Il file della richiesta di pagamento potrebbe non essere valido.</translation>
+        <source>%1 ms</source>
+        <translation>%1 ms</translation>
     </message>
+</context>
+<context>
+    <name>RPCConsole</name>
     <message>
-        <source>Payment request expired.</source>
-        <translation>Richiesta di pagamento scaduta.</translation>
+        <source>Client name</source>
+        <translation>Nome del client</translation>
     </message>
     <message>
-        <source>Unverified payment requests to custom payment scripts are unsupported.</source>
-        <translation>Le richieste di pagamento non verificate verso script di pagamento personalizzati non sono supportate.</translation>
+        <source>N/A</source>
+        <translation>N/D</translation>
     </message>
     <message>
-        <source>Invalid payment request.</source>
-        <translation>Richiesta di pagamento non valida.</translation>
-    </message>
-    <message>
-        <source>Refund from %1</source>
-        <translation>Rimborso da %1</translation>
-    </message>
-    <message>
-        <source>Payment request %1 is too large (%2 bytes, allowed %3 bytes).</source>
-        <translation>La richiesta di pagamento %1 (%2 byte) supera la dimensione massima di %3 byte.</translation>
-    </message>
-    <message>
-        <source>Error communicating with %1: %2</source>
-        <translation>Errore di comunicazione con %1: %2</translation>
-    </message>
-    <message>
-        <source>Payment request cannot be parsed!</source>
-        <translation>La richiesta di pagamento non può essere analizzata!</translation>
-    </message>
-    <message>
-        <source>Bad response from server %1</source>
-        <translation>Risposta errata da parte del server %1</translation>
-    </message>
-    <message>
-        <source>Payment acknowledged</source>
-        <translation>Pagamento riconosciuto</translation>
-    </message>
-    <message>
-        <source>Network request error</source>
-        <translation>Errore di richiesta di rete</translation>
-    </message>
-</context>
-<context>
-    <name>PeerTableModel</name>
-    <message>
-        <source>User Agent</source>
-        <translation>User Agent</translation>
-    </message>
-    <message>
-        <source>Node/Service</source>
-        <translation>Nodo/Servizio</translation>
-    </message>
-    <message>
-        <source>Ping Time</source>
-        <translation>Tempo di ping</translation>
-    </message>
-</context>
-<context>
-    <name>QObject</name>
-    <message>
-        <source>Amount</source>
-        <translation>Importo</translation>
-    </message>
-    <message>
-        <source>Enter a Bitcoin address (e.g. %1)</source>
-        <translation>Inserisci un indirizzo Bitcoin (ad es. %1)</translation>
-    </message>
-    <message>
-        <source>%1 d</source>
-        <translation>%1 d</translation>
-    </message>
-    <message>
-        <source>%1 h</source>
-        <translation>%1 h</translation>
-    </message>
-    <message>
-        <source>%1 m</source>
-        <translation>%1 m</translation>
-    </message>
-    <message>
-        <source>%1 s</source>
-        <translation>%1 s</translation>
-    </message>
-    <message>
-        <source>None</source>
-        <translation>Nessuno</translation>
-    </message>
-    <message>
-        <source>N/A</source>
-        <translation>N/D</translation>
-    </message>
-    <message>
-        <source>%1 ms</source>
-        <translation>%1 ms</translation>
-    </message>
-</context>
-<context>
-    <name>QRImageWidget</name>
-    <message>
-        <source>&amp;Save Image...</source>
-        <translation>&amp;Salva Immagine...</translation>
-    </message>
-    <message>
-        <source>&amp;Copy Image</source>
-        <translation>&amp;Copia Immagine</translation>
-    </message>
-    <message>
-        <source>Save QR Code</source>
-        <translation>Salva codice QR</translation>
-    </message>
-    <message>
-        <source>PNG Image (*.png)</source>
-        <translation>Immagine PNG (*.png)</translation>
-    </message>
-</context>
-<context>
-    <name>RPCConsole</name>
-    <message>
-        <source>Client name</source>
-        <translation>Nome del client</translation>
-    </message>
-    <message>
-        <source>N/A</source>
-        <translation>N/D</translation>
-    </message>
-    <message>
-        <source>Client version</source>
-        <translation>Versione client</translation>
+        <source>Client version</source>
+        <translation>Versione client</translation>
     </message>
     <message>
         <source>&amp;Information</source>
@@ -1514,10 +994,6 @@ Per specificare più URL separarli con una barra verticale "|".</translation>
         <source>Memory usage</source>
         <translation>Utilizzo memoria</translation>
     </message>
-    <message>
-        <source>Open the Bitcoin Core debug log file from the current data directory. This can take a few seconds for large log files.</source>
-        <translation>Apre il file log di debug di Bitcoin Core dalla cartella dati attuale. Questa azione può richiedere alcuni secondi per file log di grandi dimensioni.</translation>
-    </message>
     <message>
         <source>Received</source>
         <translation>Ricevuto</translation>
@@ -1634,10 +1110,6 @@ Per specificare più URL separarli con una barra verticale "|".</translation>
         <source>Out:</source>
         <translation>Uscita:</translation>
     </message>
-    <message>
-        <source>Build date</source>
-        <translation>Data di creazione</translation>
-    </message>
     <message>
         <source>Debug log file</source>
         <translation>File log del Debug</translation>
@@ -1674,10 +1146,6 @@ Per specificare più URL separarli con una barra verticale "|".</translation>
         <source>&amp;Unban Node</source>
         <translation>&amp;Elimina Ban Nodo</translation>
     </message>
-    <message>
-        <source>Welcome to the Bitcoin Core RPC console.</source>
-        <translation>Benvenuto nella console RPC di Bitcoin Core.</translation>
-    </message>
     <message>
         <source>Use up and down arrows to navigate history, and &lt;b&gt;Ctrl-L&lt;/b&gt; to clear screen.</source>
         <translation>Usa le frecce direzionali per scorrere la cronologia, e &lt;b&gt;Ctrl-L&lt;/b&gt; per cancellarla.</translation>
@@ -1805,18 +1273,6 @@ Per specificare più URL separarli con una barra verticale "|".</translation>
         <source>Remove</source>
         <translation>Rimuovi</translation>
     </message>
-    <message>
-        <source>Copy label</source>
-        <translation>Copia l'etichetta</translation>
-    </message>
-    <message>
-        <source>Copy message</source>
-        <translation>Copia il messaggio</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>Copia l'importo</translation>
-    </message>
 </context>
 <context>
     <name>ReceiveRequestDialog</name>
@@ -1836,73 +1292,6 @@ Per specificare più URL separarli con una barra verticale "|".</translation>
         <source>&amp;Save Image...</source>
         <translation>&amp;Salva Immagine...</translation>
     </message>
-    <message>
-        <source>Request payment to %1</source>
-        <translation>Richiesta di pagamento a %1</translation>
-    </message>
-    <message>
-        <source>Payment information</source>
-        <translation>Informazioni pagamento</translation>
-    </message>
-    <message>
-        <source>URI</source>
-        <translation>URI</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>Indirizzo</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>Importo</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Etichetta</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>Messaggio</translation>
-    </message>
-    <message>
-        <source>Resulting URI too long, try to reduce the text for label / message.</source>
-        <translation>L'URI risultante è troppo lungo, prova a ridurre il testo nell'etichetta / messaggio.</translation>
-    </message>
-    <message>
-        <source>Error encoding URI into QR Code.</source>
-        <translation>Errore nella codifica dell'URI nel codice QR.</translation>
-    </message>
-</context>
-<context>
-    <name>RecentRequestsTableModel</name>
-    <message>
-        <source>Date</source>
-        <translation>Data</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Etichetta</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>Messaggio</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>Importo</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(nessuna etichetta)</translation>
-    </message>
-    <message>
-        <source>(no message)</source>
-        <translation>(nessun messaggio)</translation>
-    </message>
-    <message>
-        <source>(no amount)</source>
-        <translation>(nessun importo)</translation>
-    </message>
 </context>
 <context>
     <name>SendCoinsDialog</name>
@@ -1952,954 +1341,308 @@ Per specificare più URL separarli con una barra verticale "|".</translation>
     </message>
     <message>
         <source>Change:</source>
-        <translation>Resto:</translation>
-    </message>
-    <message>
-        <source>If this is activated, but the change address is empty or invalid, change will be sent to a newly generated address.</source>
-        <translation>In caso di abilitazione con indirizzo vuoto o non valido, il resto sarà inviato ad un nuovo indirizzo generato appositamente.</translation>
-    </message>
-    <message>
-        <source>Custom change address</source>
-        <translation>Personalizza indirizzo di resto</translation>
-    </message>
-    <message>
-        <source>Transaction Fee:</source>
-        <translation>Commissione di Transazione:</translation>
-    </message>
-    <message>
-        <source>Choose...</source>
-        <translation>Scegli...</translation>
-    </message>
-    <message>
-        <source>collapse fee-settings</source>
-        <translation>minimizza le impostazioni di commissione</translation>
-    </message>
-    <message>
-        <source>per kilobyte</source>
-        <translation>per kilobyte</translation>
-    </message>
-    <message>
-        <source>If the custom fee is set to 1000 satoshis and the transaction is only 250 bytes, then "per kilobyte" only pays 250 satoshis in fee, while "total at least" pays 1000 satoshis. For transactions bigger than a kilobyte both pay by kilobyte.</source>
-        <translation>Se la commissione personalizzata è impostata su 1000 satoshi e la transazione è di soli 250 byte, allora "per kilobyte" paga solo 250 satoshi di commissione, mentre "somma almeno" paga 1000 satoshi. Per transazioni più grandi di un kilobyte, entrambe le opzioni pagano al kilobyte.</translation>
-    </message>
-    <message>
-        <source>Hide</source>
-        <translation>Nascondi</translation>
-    </message>
-    <message>
-        <source>total at least</source>
-        <translation>somma almeno</translation>
-    </message>
-    <message>
-        <source>Paying only the minimum fee is just fine as long as there is less transaction volume than space in the blocks. But be aware that this can end up in a never confirming transaction once there is more demand for bitcoin transactions than the network can process.</source>
-        <translation>Non vi è alcuna controindicazione a pagare la commissione minima, a patto che il volume delle transazioni sia inferiore allo spazio disponibile nei blocchi. Occorre comunque essere consapevoli che ciò potrebbe impedire la conferma delle transazioni nel caso in cui la rete risultasse satura.</translation>
-    </message>
-    <message>
-        <source>(read the tooltip)</source>
-        <translation>(leggi il suggerimento)</translation>
-    </message>
-    <message>
-        <source>Recommended:</source>
-        <translation>Raccomandata:</translation>
-    </message>
-    <message>
-        <source>Custom:</source>
-        <translation>Personalizzata:</translation>
-    </message>
-    <message>
-        <source>(Smart fee not initialized yet. This usually takes a few blocks...)</source>
-        <translation>(Commissione intelligente non ancora inizializzata. Normalmente richiede un'attesa di alcuni blocchi...)</translation>
-    </message>
-    <message>
-        <source>Confirmation time:</source>
-        <translation>Tempo di conferma:</translation>
-    </message>
-    <message>
-        <source>normal</source>
-        <translation>normale</translation>
-    </message>
-    <message>
-        <source>fast</source>
-        <translation>veloce</translation>
-    </message>
-    <message>
-        <source>Send as zero-fee transaction if possible</source>
-        <translation>Invia come transazione a zero commissioni se possibile</translation>
-    </message>
-    <message>
-        <source>(confirmation may take longer)</source>
-        <translation>(la conferma potrebbe richiedere più tempo)</translation>
-    </message>
-    <message>
-        <source>Send to multiple recipients at once</source>
-        <translation>Invia simultaneamente a più beneficiari</translation>
-    </message>
-    <message>
-        <source>Add &amp;Recipient</source>
-        <translation>&amp;Aggiungi beneficiario</translation>
-    </message>
-    <message>
-        <source>Clear all fields of the form.</source>
-        <translation>Cancellare tutti i campi del modulo.</translation>
-    </message>
-    <message>
-        <source>Dust:</source>
-        <translation>Trascurabile:</translation>
-    </message>
-    <message>
-        <source>Clear &amp;All</source>
-        <translation>Cancella &amp;tutto</translation>
-    </message>
-    <message>
-        <source>Balance:</source>
-        <translation>Saldo:</translation>
-    </message>
-    <message>
-        <source>Confirm the send action</source>
-        <translation>Conferma l'azione di invio</translation>
-    </message>
-    <message>
-        <source>S&amp;end</source>
-        <translation>&amp;Invia</translation>
-    </message>
-    <message>
-        <source>Confirm send coins</source>
-        <translation>Conferma l'invio di bitcoin</translation>
-    </message>
-    <message>
-        <source>%1 to %2</source>
-        <translation>%1 a %2</translation>
-    </message>
-    <message>
-        <source>Copy quantity</source>
-        <translation>Copia quantità</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>Copia importo</translation>
-    </message>
-    <message>
-        <source>Copy fee</source>
-        <translation>Copia commissione</translation>
-    </message>
-    <message>
-        <source>Copy after fee</source>
-        <translation>Copia dopo commissione</translation>
-    </message>
-    <message>
-        <source>Copy bytes</source>
-        <translation>Copia byte</translation>
-    </message>
-    <message>
-        <source>Copy priority</source>
-        <translation>Copia priorità</translation>
-    </message>
-    <message>
-        <source>Copy change</source>
-        <translation>Copia resto</translation>
-    </message>
-    <message>
-        <source>Total Amount %1</source>
-        <translation>Ammontare Totale %1</translation>
-    </message>
-    <message>
-        <source>or</source>
-        <translation>o</translation>
-    </message>
-    <message>
-        <source>The amount to pay must be larger than 0.</source>
-        <translation>L'importo da pagare deve essere maggiore di 0.</translation>
-    </message>
-    <message>
-        <source>The amount exceeds your balance.</source>
-        <translation>L'importo è superiore al tuo saldo attuale.</translation>
-    </message>
-    <message>
-        <source>The total exceeds your balance when the %1 transaction fee is included.</source>
-        <translation>Il totale è superiore al tuo saldo attuale includendo la commissione di %1.</translation>
-    </message>
-    <message>
-        <source>Transaction creation failed!</source>
-        <translation>Creazione transazione fallita!</translation>
-    </message>
-    <message>
-        <source>The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source>
-        <translation>La transazione è stata respinta! Questo può accadere se alcuni bitcoin nel tuo portamonete sono già stati spesi, come nel caso in cui tu avessi utilizzato una copia del file wallet.dat per spendere bitcoin e questi non fossero stati considerati come spesi dal portamonete corrente.</translation>
-    </message>
-    <message>
-        <source>A fee higher than %1 is considered an absurdly high fee.</source>
-        <translation>Una commissione maggiore di %1 è considerata irragionevolmente elevata.</translation>
-    </message>
-    <message>
-        <source>Payment request expired.</source>
-        <translation>Richiesta di pagamento scaduta.</translation>
-    </message>
-    <message>
-        <source>Pay only the required fee of %1</source>
-        <translation>Paga solamente la commissione richiesta di %1</translation>
-    </message>
-    <message numerus="yes">
-        <source>Estimated to begin confirmation within %n block(s).</source>
-        <translation><numerusform>Inizio delle conferme stimato entro %n blocco.</numerusform><numerusform>Inizio delle conferme stimato entro %n blocchi.</numerusform></translation>
-    </message>
-    <message>
-        <source>The recipient address is not valid. Please recheck.</source>
-        <translation>L'indirizzo del beneficiario non è valido. Si prega di ricontrollare.</translation>
-    </message>
-    <message>
-        <source>Duplicate address found: addresses should only be used once each.</source>
-        <translation>Rilevato un indirizzo duplicato Ciascun indirizzo dovrebbe essere utilizzato una sola volta.</translation>
-    </message>
-    <message>
-        <source>Warning: Invalid Bitcoin address</source>
-        <translation>Attenzione: Indirizzo Bitcoin non valido</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(nessuna etichetta)</translation>
-    </message>
-    <message>
-        <source>Warning: Unknown change address</source>
-        <translation>Attenzione: Indirizzo per il resto sconosciuto</translation>
-    </message>
-    <message>
-        <source>Copy dust</source>
-        <translation>Copia trascurabile</translation>
-    </message>
-    <message>
-        <source>Are you sure you want to send?</source>
-        <translation>Sei sicuro di voler inviare?</translation>
-    </message>
-    <message>
-        <source>added as transaction fee</source>
-        <translation>aggiunto come tassa di transazione</translation>
-    </message>
-</context>
-<context>
-    <name>SendCoinsEntry</name>
-    <message>
-        <source>A&amp;mount:</source>
-        <translation>&amp;Importo:</translation>
-    </message>
-    <message>
-        <source>Pay &amp;To:</source>
-        <translation>Paga &amp;a:</translation>
-    </message>
-    <message>
-        <source>Enter a label for this address to add it to your address book</source>
-        <translation>Inserisci un'etichetta per questo indirizzo, per aggiungerlo alla rubrica</translation>
-    </message>
-    <message>
-        <source>&amp;Label:</source>
-        <translation>&amp;Etichetta:</translation>
-    </message>
-    <message>
-        <source>Choose previously used address</source>
-        <translation>Scegli un indirizzo usato precedentemente</translation>
-    </message>
-    <message>
-        <source>This is a normal payment.</source>
-        <translation>Questo è un normale pagamento.</translation>
-    </message>
-    <message>
-        <source>The Bitcoin address to send the payment to</source>
-        <translation>L'indirizzo Bitcoin a cui vuoi inviare il pagamento</translation>
-    </message>
-    <message>
-        <source>Alt+A</source>
-        <translation>Alt+A</translation>
-    </message>
-    <message>
-        <source>Paste address from clipboard</source>
-        <translation>Incollare l'indirizzo dagli appunti</translation>
-    </message>
-    <message>
-        <source>Alt+P</source>
-        <translation>Alt+P</translation>
-    </message>
-    <message>
-        <source>Remove this entry</source>
-        <translation>Rimuovi questa voce</translation>
-    </message>
-    <message>
-        <source>The fee will be deducted from the amount being sent. The recipient will receive less bitcoins than you enter in the amount field. If multiple recipients are selected, the fee is split equally.</source>
-        <translation>La commissione sarà sottratta dall'importo che si sta inviando. Il beneficiario riceverà un totale di bitcoin inferiore al valore digitato. Nel caso in cui siano stati selezionati più beneficiari la commissione sarà suddivisa in parti uguali.</translation>
-    </message>
-    <message>
-        <source>S&amp;ubtract fee from amount</source>
-        <translation>S&amp;ottrae la commissione dall'importo</translation>
-    </message>
-    <message>
-        <source>Message:</source>
-        <translation>Messaggio:</translation>
-    </message>
-    <message>
-        <source>This is an unauthenticated payment request.</source>
-        <translation>Questa è una richiesta di pagamento non autenticata.</translation>
-    </message>
-    <message>
-        <source>This is an authenticated payment request.</source>
-        <translation>Questa è una richiesta di pagamento autenticata.</translation>
-    </message>
-    <message>
-        <source>Enter a label for this address to add it to the list of used addresses</source>
-        <translation>Inserisci un'etichetta per questo indirizzo per aggiungerlo alla lista degli indirizzi utilizzati</translation>
-    </message>
-    <message>
-        <source>A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
-        <translation>Messaggio incluso nel bitcoin URI e che sarà memorizzato con la transazione per vostro riferimento. Nota: Questo messaggio non sarà inviato attraverso la rete Bitcoin.</translation>
-    </message>
-    <message>
-        <source>Pay To:</source>
-        <translation>Pagare a:</translation>
-    </message>
-    <message>
-        <source>Memo:</source>
-        <translation>Memo:</translation>
-    </message>
-</context>
-<context>
-    <name>ShutdownWindow</name>
-    <message>
-        <source>Bitcoin Core is shutting down...</source>
-        <translation>Arresto di Bitcoin Core in corso...</translation>
-    </message>
-    <message>
-        <source>Do not shut down the computer until this window disappears.</source>
-        <translation>Non spegnere il computer fino a quando questa finestra non si sarà chiusa.</translation>
-    </message>
-</context>
-<context>
-    <name>SignVerifyMessageDialog</name>
-    <message>
-        <source>Signatures - Sign / Verify a Message</source>
-        <translation>Firme - Firma / Verifica un messaggio</translation>
-    </message>
-    <message>
-        <source>&amp;Sign Message</source>
-        <translation>&amp;Firma Messaggio</translation>
-    </message>
-    <message>
-        <source>You can sign messages/agreements with your addresses to prove you can receive bitcoins sent to them. Be careful not to sign anything vague or random, as phishing attacks may try to trick you into signing your identity over to them. Only sign fully-detailed statements you agree to.</source>
-        <translation>È possibile firmare messaggi/accordi con i propri indirizzi in modo da dimostrare di poter ricevere bitcoin attraverso di essi. Si consiglia di prestare attenzione a non firmare dichiarazioni vaghe o casuali, attacchi di phishing potrebbero cercare di indurre ad apporre la firma su di esse. Si raccomanda di firmare esclusivamente dichiarazioni completamente dettagliate e delle quali si condivide in pieno il contenuto.</translation>
-    </message>
-    <message>
-        <source>The Bitcoin address to sign the message with</source>
-        <translation>L'indirizzo Bitcoin da utilizzare per firmare il messaggio</translation>
-    </message>
-    <message>
-        <source>Choose previously used address</source>
-        <translation>Scegli un indirizzo usato precedentemente</translation>
-    </message>
-    <message>
-        <source>Alt+A</source>
-        <translation>Alt+A</translation>
-    </message>
-    <message>
-        <source>Paste address from clipboard</source>
-        <translation>Incolla l'indirizzo dagli appunti</translation>
-    </message>
-    <message>
-        <source>Alt+P</source>
-        <translation>Alt+P</translation>
-    </message>
-    <message>
-        <source>Enter the message you want to sign here</source>
-        <translation>Inserisci qui il messaggio che vuoi firmare</translation>
-    </message>
-    <message>
-        <source>Signature</source>
-        <translation>Firma</translation>
-    </message>
-    <message>
-        <source>Copy the current signature to the system clipboard</source>
-        <translation>Copia la firma corrente nella clipboard</translation>
-    </message>
-    <message>
-        <source>Sign the message to prove you own this Bitcoin address</source>
-        <translation>Firma un messaggio per dimostrare di possedere questo indirizzo Bitcoin</translation>
-    </message>
-    <message>
-        <source>Sign &amp;Message</source>
-        <translation>Firma &amp;Messaggio</translation>
-    </message>
-    <message>
-        <source>Reset all sign message fields</source>
-        <translation>Reimposta tutti i campi della firma messaggio</translation>
-    </message>
-    <message>
-        <source>Clear &amp;All</source>
-        <translation>Cancella &amp;Tutto</translation>
-    </message>
-    <message>
-        <source>&amp;Verify Message</source>
-        <translation>&amp;Verifica Messaggio</translation>
-    </message>
-    <message>
-        <source>Enter the receiver's address, message (ensure you copy line breaks, spaces, tabs, etc. exactly) and signature below to verify the message. Be careful not to read more into the signature than what is in the signed message itself, to avoid being tricked by a man-in-the-middle attack. Note that this only proves the signing party receives with the address, it cannot prove sendership of any transaction!</source>
-        <translation>Per verificare il messaggio inserire l'indirizzo del firmatario, il messaggio e la firma nei campi sottostanti, assicurandosi di copiare esattamente anche ritorni a capo, spazi, tabulazioni, etc.. Si raccomanda di non lasciarsi fuorviare dalla firma a leggere più di quanto non sia riportato nel testo del messaggio stesso, in modo da evitare di cadere vittima di attacchi di tipo man-in-the-middle. Si ricorda che la verifica della firma dimostra soltanto che il firmatario può ricevere pagamenti con l'indirizzo corrispondente, non prova l'invio di alcuna transazione.</translation>
-    </message>
-    <message>
-        <source>The Bitcoin address the message was signed with</source>
-        <translation>L'indirizzo Bitcoin con cui è stato contrassegnato il messaggio</translation>
-    </message>
-    <message>
-        <source>Verify the message to ensure it was signed with the specified Bitcoin address</source>
-        <translation>Verifica il messaggio per accertare che sia stato firmato con l'indirizzo specificato</translation>
-    </message>
-    <message>
-        <source>Verify &amp;Message</source>
-        <translation>Verifica &amp;Messaggio</translation>
-    </message>
-    <message>
-        <source>Reset all verify message fields</source>
-        <translation>Reimposta tutti i campi della verifica messaggio</translation>
-    </message>
-    <message>
-        <source>Click "Sign Message" to generate signature</source>
-        <translation>Clicca "Firma il messaggio" per ottenere la firma</translation>
-    </message>
-    <message>
-        <source>The entered address is invalid.</source>
-        <translation>L'indirizzo inserito non è valido.</translation>
-    </message>
-    <message>
-        <source>Please check the address and try again.</source>
-        <translation>Per favore controlla l'indirizzo e prova di nuovo.</translation>
-    </message>
-    <message>
-        <source>The entered address does not refer to a key.</source>
-        <translation>L'indirizzo bitcoin inserito non è associato a nessuna chiave.</translation>
-    </message>
-    <message>
-        <source>Wallet unlock was cancelled.</source>
-        <translation>Sblocco del portamonete annullato.</translation>
-    </message>
-    <message>
-        <source>Private key for the entered address is not available.</source>
-        <translation>La chiave privata per l'indirizzo inserito non è disponibile.</translation>
-    </message>
-    <message>
-        <source>Message signing failed.</source>
-        <translation>Firma messaggio fallita.</translation>
-    </message>
-    <message>
-        <source>Message signed.</source>
-        <translation>Messaggio firmato.</translation>
-    </message>
-    <message>
-        <source>The signature could not be decoded.</source>
-        <translation>Non è stato possibile decodificare la firma.</translation>
-    </message>
-    <message>
-        <source>Please check the signature and try again.</source>
-        <translation>Per favore controlla la firma e prova di nuovo.</translation>
-    </message>
-    <message>
-        <source>The signature did not match the message digest.</source>
-        <translation>La firma non corrisponde al digest del messaggio.</translation>
-    </message>
-    <message>
-        <source>Message verification failed.</source>
-        <translation>Verifica messaggio fallita.</translation>
-    </message>
-    <message>
-        <source>Message verified.</source>
-        <translation>Messaggio verificato.</translation>
-    </message>
-</context>
-<context>
-    <name>SplashScreen</name>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Bitcoin Core</translation>
-    </message>
-    <message>
-        <source>The Bitcoin Core developers</source>
-        <translation>Gli sviluppatori di Bitcoin Core</translation>
-    </message>
-    <message>
-        <source>[testnet]</source>
-        <translation>[testnet]</translation>
-    </message>
-</context>
-<context>
-    <name>TrafficGraphWidget</name>
-    <message>
-        <source>KB/s</source>
-        <translation>KB/s</translation>
-    </message>
-</context>
-<context>
-    <name>TransactionDesc</name>
-    <message>
-        <source>Open until %1</source>
-        <translation>Aperto fino a %1</translation>
-    </message>
-    <message>
-        <source>conflicted</source>
-        <translation>in conflitto</translation>
-    </message>
-    <message>
-        <source>%1/offline</source>
-        <translation>%1/offline</translation>
-    </message>
-    <message>
-        <source>%1/unconfirmed</source>
-        <translation>%1/non confermata</translation>
-    </message>
-    <message>
-        <source>%1 confirmations</source>
-        <translation>%1 conferme</translation>
-    </message>
-    <message>
-        <source>Status</source>
-        <translation>Stato</translation>
-    </message>
-    <message numerus="yes">
-        <source>, broadcast through %n node(s)</source>
-        <translation><numerusform>, trasmesso attraverso %n nodo</numerusform><numerusform>, trasmessa attraverso %n nodi</numerusform></translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation>Data</translation>
-    </message>
-    <message>
-        <source>Source</source>
-        <translation>Sorgente</translation>
-    </message>
-    <message>
-        <source>Generated</source>
-        <translation>Generato</translation>
-    </message>
-    <message>
-        <source>From</source>
-        <translation>Da</translation>
-    </message>
-    <message>
-        <source>To</source>
-        <translation>A</translation>
-    </message>
-    <message>
-        <source>own address</source>
-        <translation>proprio indirizzo</translation>
-    </message>
-    <message>
-        <source>watch-only</source>
-        <translation>sola lettura</translation>
-    </message>
-    <message>
-        <source>label</source>
-        <translation>etichetta</translation>
-    </message>
-    <message>
-        <source>Credit</source>
-        <translation>Credito</translation>
-    </message>
-    <message numerus="yes">
-        <source>matures in %n more block(s)</source>
-        <translation><numerusform>matura tra %n blocco</numerusform><numerusform>matura tra %n blocchi</numerusform></translation>
-    </message>
-    <message>
-        <source>not accepted</source>
-        <translation>non accettate</translation>
-    </message>
-    <message>
-        <source>Debit</source>
-        <translation>Debito</translation>
-    </message>
-    <message>
-        <source>Total debit</source>
-        <translation>Debito totale</translation>
-    </message>
-    <message>
-        <source>Total credit</source>
-        <translation>Credito totale</translation>
-    </message>
-    <message>
-        <source>Transaction fee</source>
-        <translation>Commissione transazione</translation>
-    </message>
-    <message>
-        <source>Net amount</source>
-        <translation>Importo netto</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>Messaggio</translation>
-    </message>
-    <message>
-        <source>Comment</source>
-        <translation>Commento</translation>
-    </message>
-    <message>
-        <source>Transaction ID</source>
-        <translation>ID della transazione</translation>
-    </message>
-    <message>
-        <source>Merchant</source>
-        <translation>Commerciante</translation>
-    </message>
-    <message>
-        <source>Generated coins must mature %1 blocks before they can be spent. When you generated this block, it was broadcast to the network to be added to the block chain. If it fails to get into the chain, its state will change to "not accepted" and it won't be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source>
-        <translation>È necessario attendere %1 blocchi prima che i bitcoin generati possano essere spesi. Al momento della generazione questo blocco è stato trasmesso alla rete in modo da poter essere aggiunto alla block chain. Se l'inserimento avrà esito negativo lo stato del blocco sarà modificato in "non accettato" ed esso risulterà non spendibile. Ciò può verificarsi occasionalmente nel caso in cui un altro blocco sia stato generato entro pochi secondi dal tuo.</translation>
-    </message>
-    <message>
-        <source>Debug information</source>
-        <translation>Informazione di debug</translation>
-    </message>
-    <message>
-        <source>Transaction</source>
-        <translation>Transazione</translation>
-    </message>
-    <message>
-        <source>Inputs</source>
-        <translation>Input</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>Importo</translation>
-    </message>
-    <message>
-        <source>true</source>
-        <translation>vero</translation>
+        <translation>Resto:</translation>
     </message>
     <message>
-        <source>false</source>
-        <translation>falso</translation>
+        <source>If this is activated, but the change address is empty or invalid, change will be sent to a newly generated address.</source>
+        <translation>In caso di abilitazione con indirizzo vuoto o non valido, il resto sarà inviato ad un nuovo indirizzo generato appositamente.</translation>
     </message>
     <message>
-        <source>, has not been successfully broadcast yet</source>
-        <translation>, non è ancora stata trasmessa con successo</translation>
-    </message>
-    <message numerus="yes">
-        <source>Open for %n more block(s)</source>
-        <translation><numerusform>Aperto per %n altro blocco</numerusform><numerusform>Aperto per altri %n blocchi</numerusform></translation>
+        <source>Custom change address</source>
+        <translation>Personalizza indirizzo di resto</translation>
     </message>
     <message>
-        <source>unknown</source>
-        <translation>sconosciuto</translation>
+        <source>Transaction Fee:</source>
+        <translation>Commissione di Transazione:</translation>
     </message>
-</context>
-<context>
-    <name>TransactionDescDialog</name>
     <message>
-        <source>Transaction details</source>
-        <translation>Dettagli sulla transazione</translation>
+        <source>Choose...</source>
+        <translation>Scegli...</translation>
     </message>
     <message>
-        <source>This pane shows a detailed description of the transaction</source>
-        <translation>Questo pannello mostra una descrizione dettagliata della transazione</translation>
+        <source>collapse fee-settings</source>
+        <translation>minimizza le impostazioni di commissione</translation>
     </message>
-</context>
-<context>
-    <name>TransactionTableModel</name>
     <message>
-        <source>Date</source>
-        <translation>Data</translation>
+        <source>per kilobyte</source>
+        <translation>per kilobyte</translation>
     </message>
     <message>
-        <source>Type</source>
-        <translation>Tipo</translation>
+        <source>If the custom fee is set to 1000 satoshis and the transaction is only 250 bytes, then "per kilobyte" only pays 250 satoshis in fee, while "total at least" pays 1000 satoshis. For transactions bigger than a kilobyte both pay by kilobyte.</source>
+        <translation>Se la commissione personalizzata è impostata su 1000 satoshi e la transazione è di soli 250 byte, allora "per kilobyte" paga solo 250 satoshi di commissione, mentre "somma almeno" paga 1000 satoshi. Per transazioni più grandi di un kilobyte, entrambe le opzioni pagano al kilobyte.</translation>
     </message>
     <message>
-        <source>Immature (%1 confirmations, will be available after %2)</source>
-        <translation>Immaturo (%1 conferme, sarà disponibile fra %2)</translation>
-    </message>
-    <message numerus="yes">
-        <source>Open for %n more block(s)</source>
-        <translation><numerusform>Aperto per %n altro blocco</numerusform><numerusform>Aperto per altri %n blocchi</numerusform></translation>
+        <source>Hide</source>
+        <translation>Nascondi</translation>
     </message>
     <message>
-        <source>Open until %1</source>
-        <translation>Aperto fino a %1</translation>
+        <source>total at least</source>
+        <translation>somma almeno</translation>
     </message>
     <message>
-        <source>Confirmed (%1 confirmations)</source>
-        <translation>Confermata (%1 conferme)</translation>
+        <source>Paying only the minimum fee is just fine as long as there is less transaction volume than space in the blocks. But be aware that this can end up in a never confirming transaction once there is more demand for bitcoin transactions than the network can process.</source>
+        <translation>Non vi è alcuna controindicazione a pagare la commissione minima, a patto che il volume delle transazioni sia inferiore allo spazio disponibile nei blocchi. Occorre comunque essere consapevoli che ciò potrebbe impedire la conferma delle transazioni nel caso in cui la rete risultasse satura.</translation>
     </message>
     <message>
-        <source>This block was not received by any other nodes and will probably not be accepted!</source>
-        <translation>Questo blocco non è stato ricevuto da alcun altro nodo e probabilmente non sarà accettato!</translation>
+        <source>(read the tooltip)</source>
+        <translation>(leggi il suggerimento)</translation>
     </message>
     <message>
-        <source>Generated but not accepted</source>
-        <translation>Generati, ma non accettati</translation>
+        <source>Recommended:</source>
+        <translation>Raccomandata:</translation>
     </message>
     <message>
-        <source>Offline</source>
-        <translation>Offline</translation>
+        <source>Custom:</source>
+        <translation>Personalizzata:</translation>
     </message>
     <message>
-        <source>Label</source>
-        <translation>Etichetta</translation>
+        <source>(Smart fee not initialized yet. This usually takes a few blocks...)</source>
+        <translation>(Commissione intelligente non ancora inizializzata. Normalmente richiede un'attesa di alcuni blocchi...)</translation>
     </message>
     <message>
-        <source>Unconfirmed</source>
-        <translation>Non confermata</translation>
+        <source>Confirmation time:</source>
+        <translation>Tempo di conferma:</translation>
     </message>
     <message>
-        <source>Confirming (%1 of %2 recommended confirmations)</source>
-        <translation>In conferma (%1 di %2 conferme raccomandate)</translation>
+        <source>normal</source>
+        <translation>normale</translation>
     </message>
     <message>
-        <source>Conflicted</source>
-        <translation>In conflitto</translation>
+        <source>fast</source>
+        <translation>veloce</translation>
     </message>
     <message>
-        <source>Received with</source>
-        <translation>Ricevuto tramite</translation>
+        <source>Send to multiple recipients at once</source>
+        <translation>Invia simultaneamente a più beneficiari</translation>
     </message>
     <message>
-        <source>Received from</source>
-        <translation>Ricevuto da</translation>
+        <source>Add &amp;Recipient</source>
+        <translation>&amp;Aggiungi beneficiario</translation>
     </message>
     <message>
-        <source>Sent to</source>
-        <translation>Inviato a</translation>
+        <source>Clear all fields of the form.</source>
+        <translation>Cancellare tutti i campi del modulo.</translation>
     </message>
     <message>
-        <source>Payment to yourself</source>
-        <translation>Pagamento a te stesso</translation>
+        <source>Dust:</source>
+        <translation>Trascurabile:</translation>
     </message>
     <message>
-        <source>Mined</source>
-        <translation>Ottenuto dal mining</translation>
+        <source>Clear &amp;All</source>
+        <translation>Cancella &amp;tutto</translation>
     </message>
     <message>
-        <source>watch-only</source>
-        <translation>sola lettura</translation>
+        <source>Balance:</source>
+        <translation>Saldo:</translation>
     </message>
     <message>
-        <source>(n/a)</source>
-        <translation>(n/d)</translation>
+        <source>Confirm the send action</source>
+        <translation>Conferma l'azione di invio</translation>
     </message>
     <message>
-        <source>Transaction status. Hover over this field to show number of confirmations.</source>
-        <translation>Stato della transazione. Passare con il mouse su questo campo per visualizzare il numero di conferme.</translation>
+        <source>S&amp;end</source>
+        <translation>&amp;Invia</translation>
     </message>
+</context>
+<context>
+    <name>SendCoinsEntry</name>
     <message>
-        <source>Date and time that the transaction was received.</source>
-        <translation>Data e ora in cui la transazione è stata ricevuta.</translation>
+        <source>A&amp;mount:</source>
+        <translation>&amp;Importo:</translation>
     </message>
     <message>
-        <source>Type of transaction.</source>
-        <translation>Tipo di transazione.</translation>
+        <source>Pay &amp;To:</source>
+        <translation>Paga &amp;a:</translation>
     </message>
     <message>
-        <source>Whether or not a watch-only address is involved in this transaction.</source>
-        <translation>Indica se un indirizzo di sola lettura sia o meno coinvolto in questa transazione.</translation>
+        <source>&amp;Label:</source>
+        <translation>&amp;Etichetta:</translation>
     </message>
     <message>
-        <source>User-defined intent/purpose of the transaction.</source>
-        <translation>Intento/scopo della transazione definito dall'utente.</translation>
+        <source>Choose previously used address</source>
+        <translation>Scegli un indirizzo usato precedentemente</translation>
     </message>
     <message>
-        <source>Amount removed from or added to balance.</source>
-        <translation>Importo rimosso o aggiunto al saldo.</translation>
+        <source>This is a normal payment.</source>
+        <translation>Questo è un normale pagamento.</translation>
     </message>
-</context>
-<context>
-    <name>TransactionView</name>
     <message>
-        <source>All</source>
-        <translation>Tutti</translation>
+        <source>The Bitcoin address to send the payment to</source>
+        <translation>L'indirizzo Bitcoin a cui vuoi inviare il pagamento</translation>
     </message>
     <message>
-        <source>Today</source>
-        <translation>Oggi</translation>
+        <source>Alt+A</source>
+        <translation>Alt+A</translation>
     </message>
     <message>
-        <source>This week</source>
-        <translation>Questa settimana</translation>
+        <source>Paste address from clipboard</source>
+        <translation>Incollare l'indirizzo dagli appunti</translation>
     </message>
     <message>
-        <source>This month</source>
-        <translation>Questo mese</translation>
+        <source>Alt+P</source>
+        <translation>Alt+P</translation>
     </message>
     <message>
-        <source>Last month</source>
-        <translation>Il mese scorso</translation>
+        <source>Remove this entry</source>
+        <translation>Rimuovi questa voce</translation>
     </message>
     <message>
-        <source>This year</source>
-        <translation>Quest'anno</translation>
+        <source>The fee will be deducted from the amount being sent. The recipient will receive less bitcoins than you enter in the amount field. If multiple recipients are selected, the fee is split equally.</source>
+        <translation>La commissione sarà sottratta dall'importo che si sta inviando. Il beneficiario riceverà un totale di bitcoin inferiore al valore digitato. Nel caso in cui siano stati selezionati più beneficiari la commissione sarà suddivisa in parti uguali.</translation>
     </message>
     <message>
-        <source>Range...</source>
-        <translation>Intervallo...</translation>
+        <source>S&amp;ubtract fee from amount</source>
+        <translation>S&amp;ottrae la commissione dall'importo</translation>
     </message>
     <message>
-        <source>Received with</source>
-        <translation>Ricevuto tramite</translation>
+        <source>Message:</source>
+        <translation>Messaggio:</translation>
     </message>
     <message>
-        <source>Sent to</source>
-        <translation>Inviato a</translation>
+        <source>This is an unauthenticated payment request.</source>
+        <translation>Questa è una richiesta di pagamento non autenticata.</translation>
     </message>
     <message>
-        <source>To yourself</source>
-        <translation>A te stesso</translation>
+        <source>This is an authenticated payment request.</source>
+        <translation>Questa è una richiesta di pagamento autenticata.</translation>
     </message>
     <message>
-        <source>Mined</source>
-        <translation>Ottenuto dal mining</translation>
+        <source>Enter a label for this address to add it to the list of used addresses</source>
+        <translation>Inserisci un'etichetta per questo indirizzo per aggiungerlo alla lista degli indirizzi utilizzati</translation>
     </message>
     <message>
-        <source>Other</source>
-        <translation>Altro</translation>
+        <source>A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
+        <translation>Messaggio incluso nel bitcoin URI e che sarà memorizzato con la transazione per vostro riferimento. Nota: Questo messaggio non sarà inviato attraverso la rete Bitcoin.</translation>
     </message>
     <message>
-        <source>Enter address or label to search</source>
-        <translation>Inserisci un indirizzo o un'etichetta da cercare</translation>
+        <source>Pay To:</source>
+        <translation>Pagare a:</translation>
     </message>
     <message>
-        <source>Min amount</source>
-        <translation>Importo minimo</translation>
+        <source>Memo:</source>
+        <translation>Memo:</translation>
     </message>
+</context>
+<context>
+    <name>ShutdownWindow</name>
     <message>
-        <source>Copy address</source>
-        <translation>Copia l'indirizzo</translation>
+        <source>Do not shut down the computer until this window disappears.</source>
+        <translation>Non spegnere il computer fino a quando questa finestra non si sarà chiusa.</translation>
     </message>
+</context>
+<context>
+    <name>SignVerifyMessageDialog</name>
     <message>
-        <source>Copy label</source>
-        <translation>Copia l'etichetta</translation>
+        <source>Signatures - Sign / Verify a Message</source>
+        <translation>Firme - Firma / Verifica un messaggio</translation>
     </message>
     <message>
-        <source>Copy amount</source>
-        <translation>Copia l'importo</translation>
+        <source>&amp;Sign Message</source>
+        <translation>&amp;Firma Messaggio</translation>
     </message>
     <message>
-        <source>Copy transaction ID</source>
-        <translation>Copia l'ID transazione</translation>
+        <source>You can sign messages/agreements with your addresses to prove you can receive bitcoins sent to them. Be careful not to sign anything vague or random, as phishing attacks may try to trick you into signing your identity over to them. Only sign fully-detailed statements you agree to.</source>
+        <translation>È possibile firmare messaggi/accordi con i propri indirizzi in modo da dimostrare di poter ricevere bitcoin attraverso di essi. Si consiglia di prestare attenzione a non firmare dichiarazioni vaghe o casuali, attacchi di phishing potrebbero cercare di indurre ad apporre la firma su di esse. Si raccomanda di firmare esclusivamente dichiarazioni completamente dettagliate e delle quali si condivide in pieno il contenuto.</translation>
     </message>
     <message>
-        <source>Copy raw transaction</source>
-        <translation>Copia la transazione raw</translation>
+        <source>The Bitcoin address to sign the message with</source>
+        <translation>L'indirizzo Bitcoin da utilizzare per firmare il messaggio</translation>
     </message>
     <message>
-        <source>Edit label</source>
-        <translation>Modifica l'etichetta</translation>
+        <source>Choose previously used address</source>
+        <translation>Scegli un indirizzo usato precedentemente</translation>
     </message>
     <message>
-        <source>Show transaction details</source>
-        <translation>Mostra i dettagli della transazione</translation>
+        <source>Alt+A</source>
+        <translation>Alt+A</translation>
     </message>
     <message>
-        <source>Export Transaction History</source>
-        <translation>Esporta lo storico delle transazioni</translation>
+        <source>Paste address from clipboard</source>
+        <translation>Incolla l'indirizzo dagli appunti</translation>
     </message>
     <message>
-        <source>Watch-only</source>
-        <translation>Sola lettura</translation>
+        <source>Alt+P</source>
+        <translation>Alt+P</translation>
     </message>
     <message>
-        <source>Exporting Failed</source>
-        <translation>Esportazione Fallita.</translation>
+        <source>Enter the message you want to sign here</source>
+        <translation>Inserisci qui il messaggio che vuoi firmare</translation>
     </message>
     <message>
-        <source>There was an error trying to save the transaction history to %1.</source>
-        <translation>Si è verificato un errore durante il salvataggio dello storico delle transazioni in %1.</translation>
+        <source>Signature</source>
+        <translation>Firma</translation>
     </message>
     <message>
-        <source>Exporting Successful</source>
-        <translation>Esportazione Riuscita</translation>
+        <source>Copy the current signature to the system clipboard</source>
+        <translation>Copia la firma corrente nella clipboard</translation>
     </message>
     <message>
-        <source>The transaction history was successfully saved to %1.</source>
-        <translation>Lo storico delle transazioni e' stato salvato con successo in %1.</translation>
+        <source>Sign the message to prove you own this Bitcoin address</source>
+        <translation>Firma un messaggio per dimostrare di possedere questo indirizzo Bitcoin</translation>
     </message>
     <message>
-        <source>Comma separated file (*.csv)</source>
-        <translation>Testo CSV (*.csv)</translation>
+        <source>Sign &amp;Message</source>
+        <translation>Firma &amp;Messaggio</translation>
     </message>
     <message>
-        <source>Confirmed</source>
-        <translation>Confermato</translation>
+        <source>Reset all sign message fields</source>
+        <translation>Reimposta tutti i campi della firma messaggio</translation>
     </message>
     <message>
-        <source>Date</source>
-        <translation>Data</translation>
+        <source>Clear &amp;All</source>
+        <translation>Cancella &amp;Tutto</translation>
     </message>
     <message>
-        <source>Type</source>
-        <translation>Tipo</translation>
+        <source>&amp;Verify Message</source>
+        <translation>&amp;Verifica Messaggio</translation>
     </message>
     <message>
-        <source>Label</source>
-        <translation>Etichetta</translation>
+        <source>Enter the receiver's address, message (ensure you copy line breaks, spaces, tabs, etc. exactly) and signature below to verify the message. Be careful not to read more into the signature than what is in the signed message itself, to avoid being tricked by a man-in-the-middle attack. Note that this only proves the signing party receives with the address, it cannot prove sendership of any transaction!</source>
+        <translation>Per verificare il messaggio inserire l'indirizzo del firmatario, il messaggio e la firma nei campi sottostanti, assicurandosi di copiare esattamente anche ritorni a capo, spazi, tabulazioni, etc.. Si raccomanda di non lasciarsi fuorviare dalla firma a leggere più di quanto non sia riportato nel testo del messaggio stesso, in modo da evitare di cadere vittima di attacchi di tipo man-in-the-middle. Si ricorda che la verifica della firma dimostra soltanto che il firmatario può ricevere pagamenti con l'indirizzo corrispondente, non prova l'invio di alcuna transazione.</translation>
     </message>
     <message>
-        <source>Address</source>
-        <translation>Indirizzo</translation>
+        <source>The Bitcoin address the message was signed with</source>
+        <translation>L'indirizzo Bitcoin con cui è stato contrassegnato il messaggio</translation>
     </message>
     <message>
-        <source>ID</source>
-        <translation>ID</translation>
+        <source>Verify the message to ensure it was signed with the specified Bitcoin address</source>
+        <translation>Verifica il messaggio per accertare che sia stato firmato con l'indirizzo specificato</translation>
     </message>
     <message>
-        <source>Range:</source>
-        <translation>Intervallo:</translation>
+        <source>Verify &amp;Message</source>
+        <translation>Verifica &amp;Messaggio</translation>
     </message>
     <message>
-        <source>to</source>
-        <translation>a</translation>
+        <source>Reset all verify message fields</source>
+        <translation>Reimposta tutti i campi della verifica messaggio</translation>
     </message>
 </context>
 <context>
-    <name>UnitDisplayStatusBarControl</name>
+    <name>SplashScreen</name>
     <message>
-        <source>Unit to show amounts in. Click to select another unit.</source>
-        <translation>Unità con cui visualizzare gli importi. Clicca per selezionare un'altra unità.</translation>
+        <source>[testnet]</source>
+        <translation>[testnet]</translation>
     </message>
 </context>
 <context>
-    <name>WalletFrame</name>
+    <name>TrafficGraphWidget</name>
     <message>
-        <source>No wallet has been loaded.</source>
-        <translation>Non è stato caricato alcun portamonete.</translation>
+        <source>KB/s</source>
+        <translation>KB/s</translation>
     </message>
 </context>
 <context>
-    <name>WalletModel</name>
+    <name>TransactionDescDialog</name>
     <message>
-        <source>Send Coins</source>
-        <translation>Invia Bitcoin</translation>
+        <source>This pane shows a detailed description of the transaction</source>
+        <translation>Questo pannello mostra una descrizione dettagliata della transazione</translation>
     </message>
 </context>
 <context>
-    <name>WalletView</name>
-    <message>
-        <source>&amp;Export</source>
-        <translation>&amp;Esporta</translation>
-    </message>
-    <message>
-        <source>Export the data in the current tab to a file</source>
-        <translation>Esporta su file i dati contenuti nella tabella corrente</translation>
-    </message>
-    <message>
-        <source>Backup Wallet</source>
-        <translation>Backup Portamonete</translation>
-    </message>
-    <message>
-        <source>Wallet Data (*.dat)</source>
-        <translation>Dati Portamonete (*.dat)</translation>
-    </message>
-    <message>
-        <source>Backup Failed</source>
-        <translation>Backup Fallito</translation>
-    </message>
-    <message>
-        <source>There was an error trying to save the wallet data to %1.</source>
-        <translation>Si è verificato un errore durante il salvataggio dei dati del portamonete in %1.</translation>
-    </message>
-    <message>
-        <source>The wallet data was successfully saved to %1.</source>
-        <translation>Il portamonete è stato correttamente salvato in %1.</translation>
-    </message>
+    <name>UnitDisplayStatusBarControl</name>
     <message>
-        <source>Backup Successful</source>
-        <translation>Backup eseguito con successo</translation>
+        <source>Unit to show amounts in. Click to select another unit.</source>
+        <translation>Unità con cui visualizzare gli importi. Clicca per selezionare un'altra unità.</translation>
     </message>
 </context>
 <context>
@@ -2928,14 +1671,6 @@ Per specificare più URL separarli con una barra verticale "|".</translation>
         <source>If &lt;category&gt; is not supplied or if &lt;category&gt; = 1, output all debugging information.</source>
         <translation>Se &lt;category&gt; non è specificato oppure se &lt;category&gt; = 1, mostra tutte le informazioni di debug.</translation>
     </message>
-    <message>
-        <source>Maximum total fees (in %s) to use in a single wallet transaction; setting this too low may abort large transactions (default: %s)</source>
-        <translation>Totale massimo di commissioni (in %s) da usare in una singola transazione del wallet; valori troppo bassi possono abortire grandi transazioni (default: %s)</translation>
-    </message>
-    <message>
-        <source>Please check that your computer's date and time are correct! If your clock is wrong Bitcoin Core will not work properly.</source>
-        <translation>Per favore controllate che la data del computer e l'ora siano corrette. Se il vostro orologio è sbagliato Bitcoin non funzionerà correttamente.</translation>
-    </message>
     <message>
         <source>Prune configured below the minimum of %d MiB.  Please use a higher number.</source>
         <translation>La modalità prune è configurata al di sotto del minimo di %d MB. Si prega di utilizzare un valore più elevato.</translation>
@@ -2976,6 +1711,10 @@ Per specificare più URL separarli con una barra verticale "|".</translation>
         <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
         <translation>Accetta connessioni dall'esterno (predefinito: 1 se -proxy o -connect non sono utilizzati)</translation>
     </message>
+    <message>
+        <source>Bitcoin Core</source>
+        <translation>Bitcoin Core</translation>
+    </message>
     <message>
         <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source>
         <translation>Associa all'indirizzo indicato e resta permanentemente in ascolto su di esso. Usa la notazione [host]:porta per l'IPv6</translation>
@@ -3004,10 +1743,6 @@ Per specificare più URL separarli con una barra verticale "|".</translation>
         <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
         <translation>Questa versione è una compilazione pre-rilascio - usala a tuo rischio - non utilizzarla per la generazione o per applicazioni di commercio</translation>
     </message>
-    <message>
-        <source>Unable to bind to %s on this computer. Bitcoin Core is probably already running.</source>
-        <translation>Impossibile associarsi a %s su questo computer. Probabilmente Bitcoin Core è già in esecuzione.</translation>
-    </message>
     <message>
         <source>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</source>
         <translation>Utilizza UPnP per mappare la porta in ascolto (default: 1 quando in ascolto e -proxy non è specificato)</translation>
@@ -3028,10 +1763,6 @@ Per specificare più URL separarli con una barra verticale "|".</translation>
         <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source>
         <translation>Attenzione: Sembra che non vi sia pieno consenso con i nostri peer! Un aggiornamento da parte tua o degli altri nodi potrebbe essere necessario.</translation>
     </message>
-    <message>
-        <source>Warning: wallet.dat corrupt, data salvaged! Original wallet.dat saved as wallet.{timestamp}.bak in %s; if your balance or transactions are incorrect you should restore from a backup.</source>
-        <translation>Attenzione: wallet.dat corrotto, dati recuperati! Il wallet.dat originale è stato salvato come wallet.{timestamp}.bak in %s. Se i dati relativi a saldo o transazioni non dovessero risultare corretti si consiglia di procedere al ripristino da un backup.</translation>
-    </message>
     <message>
         <source>Whitelist peers connecting from the given netmask or IP address. Can be specified multiple times.</source>
         <translation>Inserisce in whitelist i peer che si connettono da un dato indirizzo IP o netmask. Può essere specificato più volte.</translation>
@@ -3192,10 +1923,6 @@ Per specificare più URL separarli con una barra verticale "|".</translation>
         <source>Wallet options:</source>
         <translation>Opzioni portamonete:</translation>
     </message>
-    <message>
-        <source>You need to rebuild the database using -reindex to change -txindex</source>
-        <translation>È necessario ricostruire il database usando -reindex per cambiare -txindex</translation>
-    </message>
     <message>
         <source>Allow JSON-RPC connections from specified source. Valid for &lt;ip&gt; are a single IP (e.g. 1.2.3.4), a network/netmask (e.g. 1.2.3.4/255.255.255.0) or a network/CIDR (e.g. 1.2.3.4/24). This option can be specified multiple times</source>
         <translation>Permette connessioni JSON-RPC dall'origine specificata. I valori validi per &lt;ip&gt; sono un singolo IP (ad es. 1.2.3.4), una network/netmask (ad es. 1.2.3.4/255.255.255.0) oppure una network/CIDR (ad es. 1.2.3.4/24). Questa opzione può essere specificata più volte.</translation>
@@ -3208,10 +1935,6 @@ Per specificare più URL separarli con una barra verticale "|".</translation>
         <source>Bind to given address to listen for JSON-RPC connections. Use [host]:port notation for IPv6. This option can be specified multiple times (default: bind to all interfaces)</source>
         <translation>Resta in attesa di connessioni JSON-RPC sull'indirizzo indicato. Usa la notazione [host]:porta per IPv6. Questa opzione può essere specificata più volte (predefinito: associa a tutte le interfacce) </translation>
     </message>
-    <message>
-        <source>Cannot obtain a lock on data directory %s. Bitcoin Core is probably already running.</source>
-        <translation>Non è possibile ottenere un lock sulla cartella %s. Probabilmente Bitcoin Core è già in esecuzione.</translation>
-    </message>
     <message>
         <source>Create new files with system default permissions, instead of umask 077 (only effective with disabled wallet functionality)</source>
         <translation>Crea nuovi file con i permessi di default del sistema, invece che con umask 077 (ha effetto solo con funzionalità di portamonete disabilitate)</translation>
@@ -3256,10 +1979,6 @@ Per specificare più URL separarli con una barra verticale "|".</translation>
         <source>Set maximum size of high-priority/low-fee transactions in bytes (default: %d)</source>
         <translation>Imposta la dimensione massima in byte delle transazioni ad alta-priorità/basse-commissioni (predefinito: %d)</translation>
     </message>
-    <message>
-        <source>Set the number of threads for coin generation if enabled (-1 = all cores, default: %d)</source>
-        <translation>Specifica il numero di thread per la generazione di bitcoin, se abilitata (-1 = tutti i core, predefinito: %d)</translation>
-    </message>
     <message>
         <source>The transaction amount is too small to send after the fee has been deducted</source>
         <translation>L'importo della transazione risulta troppo basso per l'invio una volta dedotte le commissioni.</translation>
@@ -3284,34 +2003,14 @@ Per specificare più URL separarli con una barra verticale "|".</translation>
         <source>Accept public REST requests (default: %u)</source>
         <translation>Accetta richieste REST pubbliche (predefinito: %u)</translation>
     </message>
-    <message>
-        <source>Activating best chain...</source>
-        <translation>Attivazione della blockchain migliore...</translation>
-    </message>
-    <message>
-        <source>Attempt to recover private keys from a corrupt wallet.dat on startup</source>
-        <translation>Prova a recuperare le chiavi private da un wallet corrotto all'avvio</translation>
-    </message>
     <message>
         <source>Automatically create Tor hidden service (default: %d)</source>
         <translation>Crea automaticamente il servizio Tor (default: %d)</translation>
     </message>
-    <message>
-        <source>Cannot resolve -whitebind address: '%s'</source>
-        <translation>Impossibile risolvere indirizzo -whitebind: '%s'</translation>
-    </message>
     <message>
         <source>Connect through SOCKS5 proxy</source>
         <translation>Connessione attraverso un proxy SOCKS5</translation>
     </message>
-    <message>
-        <source>Copyright (C) 2009-%i The Bitcoin Core Developers</source>
-        <translation>Copyright (C) 2009-%i Gli sviluppatori di Bitcoin Core</translation>
-    </message>
-    <message>
-        <source>Error loading wallet.dat: Wallet requires newer version of Bitcoin Core</source>
-        <translation>Errore durante il caricamento del file wallet.dat: il portamonete richiede una versione di Bitcoin Core più recente</translation>
-    </message>
     <message>
         <source>Error reading from database, shutting down.</source>
         <translation>Errore durante lalettura del database. Arresto in corso.</translation>
@@ -3324,22 +2023,6 @@ Per specificare più URL separarli con una barra verticale "|".</translation>
         <source>Information</source>
         <translation>Informazioni</translation>
     </message>
-    <message>
-        <source>Initialization sanity check failed. Bitcoin Core is shutting down.</source>
-        <translation>Test di integrità iniziale fallito. Bitcoin Core si arresterà.</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -maxtxfee=&lt;amount&gt;: '%s'</source>
-        <translation>Importo non valido per -maxtxfee=&lt;amount&gt;: '%s'</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -minrelaytxfee=&lt;amount&gt;: '%s'</source>
-        <translation>Importo non valido per -minrelaytxfee=&lt;amount&gt;: '%s'</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -mintxfee=&lt;amount&gt;: '%s'</source>
-        <translation>Importo non valido per -mintxfee=&lt;amount&gt;: '%s'</translation>
-    </message>
     <message>
         <source>Invalid amount for -paytxfee=&lt;amount&gt;: '%s' (must be at least %s)</source>
         <translation>Importo non valido per -paytxfee=&lt;amount&gt;: '%s' (deve essere almeno %s)</translation>
@@ -3364,14 +2047,6 @@ Per specificare più URL separarli con una barra verticale "|".</translation>
         <source>RPC server options:</source>
         <translation>Opzioni server RPC:</translation>
     </message>
-    <message>
-        <source>Rebuild block chain index from current blk000??.dat files on startup</source>
-        <translation>Ricostruzione dell'indice della block chain dai file blk000??.dat correnti all'avvio</translation>
-    </message>
-    <message>
-        <source>Receive and display P2P network alerts (default: %u)</source>
-        <translation>Ricevi e visualizza gli alerts della rete P2P (default: %u)</translation>
-    </message>
     <message>
         <source>Reducing -maxconnections from %d to %d, because of system limitations.</source>
         <translation>Riduzione -maxconnections da %d a %d a causa di limitazioni di sistema.</translation>
@@ -3444,10 +2119,6 @@ Per specificare più URL separarli con una barra verticale "|".</translation>
         <source>Username for JSON-RPC connections</source>
         <translation>Nome utente per connessioni JSON-RPC</translation>
     </message>
-    <message>
-        <source>Wallet needed to be rewritten: restart Bitcoin Core to complete</source>
-        <translation>Il portamonete necessitava di essere riscritto: riavviare Bitcoin Core per completare l'operazione</translation>
-    </message>
     <message>
         <source>Warning</source>
         <translation>Attenzione</translation>
@@ -3464,10 +2135,6 @@ Per specificare più URL separarli con una barra verticale "|".</translation>
         <source>ZeroMQ notification options:</source>
         <translation>Opzioni di notifica ZeroMQ</translation>
     </message>
-    <message>
-        <source>wallet.dat corrupt, salvage failed</source>
-        <translation>wallet.dat corrotto, recupero fallito</translation>
-    </message>
     <message>
         <source>Password for JSON-RPC connections</source>
         <translation>Password per connessioni JSON-RPC</translation>
@@ -3476,10 +2143,6 @@ Per specificare più URL separarli con una barra verticale "|".</translation>
         <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
         <translation>Esegue un comando quando il miglior blocco cambia (%s nel cmd è sostituito dall'hash del blocco)</translation>
     </message>
-    <message>
-        <source>This help message</source>
-        <translation>Questo messaggio di aiuto</translation>
-    </message>
     <message>
         <source>Allow DNS lookups for -addnode, -seednode and -connect</source>
         <translation>Consente interrogazioni DNS per -addnode, -seednode e -connect</translation>
@@ -3488,10 +2151,6 @@ Per specificare più URL separarli con una barra verticale "|".</translation>
         <source>Loading addresses...</source>
         <translation>Caricamento indirizzi...</translation>
     </message>
-    <message>
-        <source>Error loading wallet.dat: Wallet corrupted</source>
-        <translation>Errore caricamento wallet.dat: Portamonete corrotto</translation>
-    </message>
     <message>
         <source>(1 = keep tx meta data e.g. account owner and payment request information, 2 = drop tx meta data)</source>
         <translation>(1 = mantiene metadati tx, ad es. proprietario account ed informazioni di richiesta di pagamento, 2 = scarta metadati tx)</translation>
@@ -3508,10 +2167,6 @@ Per specificare più URL separarli con una barra verticale "|".</translation>
         <source>Do not keep transactions in the mempool longer than &lt;n&gt; hours (default: %u)</source>
         <translation>Non mantenere le transazioni nella mempool più a lungo di &lt;n&gt; ore (default: %u)</translation>
     </message>
-    <message>
-        <source>Error reading wallet.dat! All keys read correctly, but transaction data or address book entries might be missing or incorrect.</source>
-        <translation>Errore di lettura di wallet.dat! Tutte le chiavi sono state lette correttamente, ma i dati delle transazioni o della rubrica potrebbero essere mancanti o non corretti.</translation>
-    </message>
     <message>
         <source>Fees (in %s/kB) smaller than this are considered zero fee for transaction creation (default: %s)</source>
         <translation>Le commissioni (in %s/kB) inferiori a questo valore sono considerate pari a zero per la creazione della transazione (default: %s)</translation>
@@ -3564,14 +2219,6 @@ Per specificare più URL separarli con una barra verticale "|".</translation>
         <source>Always query for peer addresses via DNS lookup (default: %u)</source>
         <translation>Interroga sempre i DNS per ottenere gli indirizzi dei peer (predefinito: %u)</translation>
     </message>
-    <message>
-        <source>Error loading wallet.dat</source>
-        <translation>Errore caricamento wallet.dat</translation>
-    </message>
-    <message>
-        <source>Generate coins (default: %u)</source>
-        <translation>Genera bitcoin (predefinito: %u)</translation>
-    </message>
     <message>
         <source>How many blocks to check at startup (default: %u, 0 = all)</source>
         <translation>Numero di blocchi da controllare all'avvio (predefinito: %u, 0 = tutti)</translation>
@@ -3656,18 +2303,6 @@ Per specificare più URL separarli con una barra verticale "|".</translation>
         <source>Unknown network specified in -onlynet: '%s'</source>
         <translation>Rete sconosciuta specificata in -onlynet: '%s'</translation>
     </message>
-    <message>
-        <source>Cannot resolve -bind address: '%s'</source>
-        <translation>Impossibile risolvere indirizzo -bind: '%s'</translation>
-    </message>
-    <message>
-        <source>Cannot resolve -externalip address: '%s'</source>
-        <translation>Impossibile risolvere indirizzo -externalip: '%s'</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -paytxfee=&lt;amount&gt;: '%s'</source>
-        <translation>Importo non valido per -paytxfee=&lt;amount&gt;: '%s'</translation>
-    </message>
     <message>
         <source>Insufficient funds</source>
         <translation>Fondi insufficienti</translation>
diff --git a/src/qt/locale/bitcoin_it_IT.ts b/src/qt/locale/bitcoin_it_IT.ts
index 46ad0e9339df0..f89f4bdc48d11 100644
--- a/src/qt/locale/bitcoin_it_IT.ts
+++ b/src/qt/locale/bitcoin_it_IT.ts
@@ -25,10 +25,6 @@
         <source>C&amp;lose</source>
         <translation>chiudi </translation>
     </message>
-    <message>
-        <source>&amp;Copy Address</source>
-        <translation>copia indirizzo </translation>
-    </message>
     <message>
         <source>Delete the currently selected address from the list</source>
         <translation>Cancella l'indirizzo attualmente selezionato dalla lista.</translation>
@@ -45,70 +41,6 @@
         <source>&amp;Delete</source>
         <translation>Cancella</translation>
     </message>
-    <message>
-        <source>Choose the address to send coins to</source>
-        <translation>Scegli l'indirizzo a cui inviare denaro</translation>
-    </message>
-    <message>
-        <source>Choose the address to receive coins with</source>
-        <translation>Scegli l'indirizzo con cui ricevere i coin</translation>
-    </message>
-    <message>
-        <source>C&amp;hoose</source>
-        <translation>Scegli</translation>
-    </message>
-    <message>
-        <source>Sending addresses</source>
-        <translation>Indirizzi mittenti</translation>
-    </message>
-    <message>
-        <source>Receiving addresses</source>
-        <translation>Indirizzi destinatari</translation>
-    </message>
-    <message>
-        <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source>
-        <translation>Questi sono gli indirizzi Bitcoin per l'invio di pagamenti. Controlla sempre la quantità e l'indirizzo di ricezione prima di inviare monete.</translation>
-    </message>
-    <message>
-        <source>These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source>
-        <translation>Questi sono i tuoi indirizzi Bitcoin per ricevere pagamenti. Si raccomanda di generare un nuovo indirizzo per ogni transazione</translation>
-    </message>
-    <message>
-        <source>Copy &amp;Label</source>
-        <translation>copia etichetta</translation>
-    </message>
-    <message>
-        <source>&amp;Edit</source>
-        <translation>Modifica</translation>
-    </message>
-    <message>
-        <source>Export Address List</source>
-        <translation>Esporta lista degli indirizzi</translation>
-    </message>
-    <message>
-        <source>Comma separated file (*.csv)</source>
-        <translation>Contenuto del file separato da virgole (*.csv)</translation>
-    </message>
-    <message>
-        <source>Exporting Failed</source>
-        <translation>Esportazione fallita</translation>
-    </message>
-    </context>
-<context>
-    <name>AddressTableModel</name>
-    <message>
-        <source>Label</source>
-        <translation>Etichetta</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>Indirizzo</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(nessuna etichetta)
-</translation>
-    </message>
 </context>
 <context>
     <name>AskPassphraseDialog</name>
@@ -124,39 +56,7 @@
         <source>Repeat new passphrase</source>
         <translation>Ripeti nuova passphrase</translation>
     </message>
-    <message>
-        <source>Encrypt wallet</source>
-        <translation>Cifra portagoflio</translation>
-    </message>
-    <message>
-        <source>This operation needs your wallet passphrase to unlock the wallet.</source>
-        <translation>Questa operazione richiede la passphrase del tuo portafoglio per sbloccare il portafoglio.</translation>
-    </message>
-    <message>
-        <source>Unlock wallet</source>
-        <translation>Sblocca portafoglio</translation>
-    </message>
-    <message>
-        <source>Decrypt wallet</source>
-        <translation>decifra portafoglio</translation>
-    </message>
-    <message>
-        <source>Change passphrase</source>
-        <translation>cambia passphrase</translation>
-    </message>
-    <message>
-        <source>Confirm wallet encryption</source>
-        <translation>conferma cifrazione del portagoglio</translation>
-    </message>
-    <message>
-        <source>Wallet encrypted</source>
-        <translation>portafoglio cifrato</translation>
-    </message>
-    <message>
-        <source>Wallet unlock failed</source>
-        <translation>sblocco portafoglio fallito</translation>
-    </message>
-    </context>
+</context>
 <context>
     <name>BanTableModel</name>
     <message>
@@ -171,16 +71,8 @@
         <translation>Transazioni</translation>
     </message>
     </context>
-<context>
-    <name>ClientModel</name>
-    </context>
 <context>
     <name>CoinControlDialog</name>
-    <message>
-        <source>(no label)</source>
-        <translation>(nessuna etichetta)
-</translation>
-    </message>
     </context>
 <context>
     <name>EditAddressDialog</name>
@@ -203,18 +95,12 @@
 <context>
     <name>OverviewPage</name>
     </context>
-<context>
-    <name>PaymentServer</name>
-    </context>
 <context>
     <name>PeerTableModel</name>
     </context>
 <context>
     <name>QObject</name>
     </context>
-<context>
-    <name>QRImageWidget</name>
-    </context>
 <context>
     <name>RPCConsole</name>
     </context>
@@ -223,34 +109,9 @@
     </context>
 <context>
     <name>ReceiveRequestDialog</name>
-    <message>
-        <source>Address</source>
-        <translation>Indirizzo</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Etichetta</translation>
-    </message>
-    </context>
-<context>
-    <name>RecentRequestsTableModel</name>
-    <message>
-        <source>Label</source>
-        <translation>Etichetta</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(nessuna etichetta)
-</translation>
-    </message>
     </context>
 <context>
     <name>SendCoinsDialog</name>
-    <message>
-        <source>(no label)</source>
-        <translation>(nessuna etichetta)
-</translation>
-    </message>
     </context>
 <context>
     <name>SendCoinsEntry</name>
@@ -267,58 +128,12 @@
 <context>
     <name>TrafficGraphWidget</name>
     </context>
-<context>
-    <name>TransactionDesc</name>
-    </context>
 <context>
     <name>TransactionDescDialog</name>
     </context>
-<context>
-    <name>TransactionTableModel</name>
-    <message>
-        <source>Label</source>
-        <translation>Etichetta</translation>
-    </message>
-    </context>
-<context>
-    <name>TransactionView</name>
-    <message>
-        <source>Exporting Failed</source>
-        <translation>Esportazione fallita</translation>
-    </message>
-    <message>
-        <source>Comma separated file (*.csv)</source>
-        <translation>Contenuto del file separato da virgole (*.csv)</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Etichetta</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>Indirizzo</translation>
-    </message>
-    </context>
 <context>
     <name>UnitDisplayStatusBarControl</name>
     </context>
-<context>
-    <name>WalletFrame</name>
-    </context>
-<context>
-    <name>WalletModel</name>
-    </context>
-<context>
-    <name>WalletView</name>
-    <message>
-        <source>&amp;Export</source>
-        <translation>Esporta</translation>
-    </message>
-    <message>
-        <source>Export the data in the current tab to a file</source>
-        <translation>Esportare i dati nella scheda corrente in un file</translation>
-    </message>
-    </context>
 <context>
     <name>bitcoin-core</name>
     </context>
diff --git a/src/qt/locale/bitcoin_ja.ts b/src/qt/locale/bitcoin_ja.ts
index 06fd27fa161a5..b2dae186d97c9 100644
--- a/src/qt/locale/bitcoin_ja.ts
+++ b/src/qt/locale/bitcoin_ja.ts
@@ -25,10 +25,6 @@
         <source>C&amp;lose</source>
         <translation>閉じる(&amp;C)</translation>
     </message>
-    <message>
-        <source>&amp;Copy Address</source>
-        <translation>アドレスをコピー (&amp;C)</translation>
-    </message>
     <message>
         <source>Delete the currently selected address from the list</source>
         <translation>選択されたアドレスを一覧から削除する</translation>
@@ -45,73 +41,6 @@
         <source>&amp;Delete</source>
         <translation>削除(&amp;D)</translation>
     </message>
-    <message>
-        <source>Choose the address to send coins to</source>
-        <translation>送信先のアドレスを選択</translation>
-    </message>
-    <message>
-        <source>Choose the address to receive coins with</source>
-        <translation>支払いを受け取るアドレスを指定する</translation>
-    </message>
-    <message>
-        <source>C&amp;hoose</source>
-        <translation>選択(&amp;C)</translation>
-    </message>
-    <message>
-        <source>Sending addresses</source>
-        <translation>アドレス送信中</translation>
-    </message>
-    <message>
-        <source>Receiving addresses</source>
-        <translation>アドレス受信中</translation>
-    </message>
-    <message>
-        <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source>
-        <translation>これらは支払いを送信するためのあなたの Bitcoin アドレスです。コインを送信する前に、常に額と受信アドレスを確認してください。</translation>
-    </message>
-    <message>
-        <source>These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source>
-        <translation>これらは支払いを受け取るためのビットコインアドレスです。トランザクションごとに新しい受け取り用アドレスを作成することが推奨されます。</translation>
-    </message>
-    <message>
-        <source>Copy &amp;Label</source>
-        <translation>ラベルをコピー (&amp;L)</translation>
-    </message>
-    <message>
-        <source>&amp;Edit</source>
-        <translation>編集 (&amp;E)</translation>
-    </message>
-    <message>
-        <source>Export Address List</source>
-        <translation>アドレス帳をエクスポート</translation>
-    </message>
-    <message>
-        <source>Comma separated file (*.csv)</source>
-        <translation>CSVファイル (*.csv)</translation>
-    </message>
-    <message>
-        <source>Exporting Failed</source>
-        <translation>エクスポート失敗</translation>
-    </message>
-    <message>
-        <source>There was an error trying to save the address list to %1. Please try again.</source>
-        <translation>トランザクション履歴を %1 へ保存する際にエラーが発生しました。再試行してください。</translation>
-    </message>
-</context>
-<context>
-    <name>AddressTableModel</name>
-    <message>
-        <source>Label</source>
-        <translation>ラベル</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>アドレス</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>（ラベル無し）</translation>
-    </message>
 </context>
 <context>
     <name>AskPassphraseDialog</name>
@@ -131,94 +60,6 @@
         <source>Repeat new passphrase</source>
         <translation>新しいパスフレーズをもう一度</translation>
     </message>
-    <message>
-        <source>Encrypt wallet</source>
-        <translation>ウォレットを暗号化する</translation>
-    </message>
-    <message>
-        <source>This operation needs your wallet passphrase to unlock the wallet.</source>
-        <translation>この操作はウォレットをアンロックするためにパスフレーズが必要です。</translation>
-    </message>
-    <message>
-        <source>Unlock wallet</source>
-        <translation>ウォレットをアンロックする</translation>
-    </message>
-    <message>
-        <source>This operation needs your wallet passphrase to decrypt the wallet.</source>
-        <translation>この操作はウォレットの暗号化解除のためにパスフレーズが必要です。</translation>
-    </message>
-    <message>
-        <source>Decrypt wallet</source>
-        <translation>ウォレットの暗号化を解除する</translation>
-    </message>
-    <message>
-        <source>Change passphrase</source>
-        <translation>パスフレーズの変更</translation>
-    </message>
-    <message>
-        <source>Confirm wallet encryption</source>
-        <translation>ウォレットの暗号化を確認する</translation>
-    </message>
-    <message>
-        <source>Warning: If you encrypt your wallet and lose your passphrase, you will &lt;b&gt;LOSE ALL OF YOUR BITCOINS&lt;/b&gt;!</source>
-        <translation>警告: もしもあなたのウォレットを暗号化してパスフレーズを失ってしまったなら、&lt;b&gt;あなたの Bitcoin はすべて失われます&lt;/b&gt;!</translation>
-    </message>
-    <message>
-        <source>Are you sure you wish to encrypt your wallet?</source>
-        <translation>本当にウォレットを暗号化しますか?</translation>
-    </message>
-    <message>
-        <source>Bitcoin Core will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source>
-        <translation>暗号化処理を完了させるため Bitcoin Core をいますぐ終了します。ウォレットの暗号化では、コンピュータに感染したマルウェアなどによるビットコインの盗難から完全に守ることはできないことにご注意ください。</translation>
-    </message>
-    <message>
-        <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source>
-        <translation>重要: 過去のウォレット ファイルのバックアップは、暗号化された新しいウォレット ファイルに取り替える必要があります。セキュリティ上の理由により、暗号化された新しいウォレットを使い始めると、暗号化されていないウォレット ファイルのバックアップはすぐに使えなくなります。</translation>
-    </message>
-    <message>
-        <source>Warning: The Caps Lock key is on!</source>
-        <translation>警告: Caps Lock キーがオンになっています!</translation>
-    </message>
-    <message>
-        <source>Wallet encrypted</source>
-        <translation>ウォレットは暗号化されました</translation>
-    </message>
-    <message>
-        <source>Enter the new passphrase to the wallet.&lt;br/&gt;Please use a passphrase of &lt;b&gt;ten or more random characters&lt;/b&gt;, or &lt;b&gt;eight or more words&lt;/b&gt;.</source>
-        <translation>ウォレットの新しいパスフレーズを入力してください。&lt;br/&gt;&lt;b&gt;10文字以上のランダムな文字&lt;/b&gt;で構成されたものか、&lt;b&gt;8単語以上の単語&lt;/b&gt;で構成されたパスフレーズを使用してください。</translation>
-    </message>
-    <message>
-        <source>Enter the old passphrase and new passphrase to the wallet.</source>
-        <translation>ウォレットの古いパスフレーズおよび新しいパスフレーズを入力してください。</translation>
-    </message>
-    <message>
-        <source>Wallet encryption failed</source>
-        <translation>ウォレットの暗号化に失敗しました</translation>
-    </message>
-    <message>
-        <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
-        <translation>内部エラーによりウォレットの暗号化が失敗しました。ウォレットは暗号化されませんでした。</translation>
-    </message>
-    <message>
-        <source>The supplied passphrases do not match.</source>
-        <translation>パスフレーズが同じではありません。</translation>
-    </message>
-    <message>
-        <source>Wallet unlock failed</source>
-        <translation>ウォレットのアンロックに失敗しました</translation>
-    </message>
-    <message>
-        <source>The passphrase entered for the wallet decryption was incorrect.</source>
-        <translation>ウォレットの暗号化解除のパスフレーズが正しくありません。</translation>
-    </message>
-    <message>
-        <source>Wallet decryption failed</source>
-        <translation>ウォレットの暗号化解除に失敗しました</translation>
-    </message>
-    <message>
-        <source>Wallet passphrase was successfully changed.</source>
-        <translation>ウォレットのパスフレーズの変更が成功しました。</translation>
-    </message>
 </context>
 <context>
     <name>BanTableModel</name>
@@ -269,6 +110,14 @@
         <source>Quit application</source>
         <translation>アプリケーションを終了</translation>
     </message>
+    <message>
+        <source>&amp;About %1</source>
+        <translation>%1 について (&amp;A)</translation>
+    </message>
+    <message>
+        <source>Show information about %1</source>
+        <translation>%1 の情報を表示</translation>
+    </message>
     <message>
         <source>About &amp;Qt</source>
         <translation>Qt について(&amp;Q)</translation>
@@ -281,6 +130,10 @@
         <source>&amp;Options...</source>
         <translation>オプション... (&amp;O)</translation>
     </message>
+    <message>
+        <source>Modify configuration options for %1</source>
+        <translation>%1 の設定を変更する</translation>
+    </message>
     <message>
         <source>&amp;Encrypt Wallet...</source>
         <translation>ウォレットの暗号化... (&amp;E)</translation>
@@ -305,14 +158,6 @@
         <source>Open &amp;URI...</source>
         <translation>URI を開く (&amp;U)...</translation>
     </message>
-    <message>
-        <source>Bitcoin Core client</source>
-        <translation>Bitcoinコア クライアント</translation>
-    </message>
-    <message>
-        <source>Importing blocks from disk...</source>
-        <translation>ディスクからブロックをインポートしています...</translation>
-    </message>
     <message>
         <source>Reindexing blocks on disk...</source>
         <translation>ディスク上のブロックのインデックスを再作成中...</translation>
@@ -357,10 +202,6 @@
         <source>&amp;Receive</source>
         <translation>入金 (&amp;R)</translation>
     </message>
-    <message>
-        <source>Show information about Bitcoin Core</source>
-        <translation>Bitcoinコアに関する情報を表示</translation>
-    </message>
     <message>
         <source>&amp;Show / Hide</source>
         <translation>見る/隠す (&amp;S)</translation>
@@ -397,22 +238,10 @@
         <source>Tabs toolbar</source>
         <translation>タブツールバー</translation>
     </message>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Bitcoin のコア</translation>
-    </message>
     <message>
         <source>Request payments (generates QR codes and bitcoin: URIs)</source>
         <translation>支払いを要求する (QRコードとbitcoin:ではじまるURIを生成する)</translation>
     </message>
-    <message>
-        <source>&amp;About Bitcoin Core</source>
-        <translation>ビットコインコアについて (&amp;A)</translation>
-    </message>
-    <message>
-        <source>Modify configuration options for Bitcoin Core</source>
-        <translation>Bitcoin Core の設定を編集する</translation>
-    </message>
     <message>
         <source>Show the list of used sending addresses and labels</source>
         <translation>使用済みの送金用アドレスとラベルの一覧を表示する</translation>
@@ -429,14 +258,18 @@
         <source>&amp;Command-line options</source>
         <translation>コマンドラインオプション (&amp;C)</translation>
     </message>
-    <message>
-        <source>Show the Bitcoin Core help message to get a list with possible Bitcoin command-line options</source>
-        <translation>有効な Bitcoin のコマンドライン オプションを見るために Bitcoin Core のヘルプメッセージを表示します。</translation>
-    </message>
     <message numerus="yes">
         <source>%n active connection(s) to Bitcoin network</source>
         <translation><numerusform>%n の Bitcoin ネットワークへのアクティブな接続</numerusform></translation>
     </message>
+    <message>
+        <source>Indexing blocks on disk...</source>
+        <translation>ディスク上のブロックのインデックスを作成しています...</translation>
+    </message>
+    <message>
+        <source>Processing blocks on disk...</source>
+        <translation>ディスク上のブロックを処理しています...</translation>
+    </message>
     <message>
         <source>No block source available...</source>
         <translation>利用可能なブロックがありません...</translation>
@@ -493,6 +326,14 @@
         <source>Up to date</source>
         <translation>バージョンは最新です</translation>
     </message>
+    <message>
+        <source>Show the %1 help message to get a list with possible Bitcoin command-line options</source>
+        <translation>有効な Bitcoin のコマンドライン オプションを見るために %1 のヘルプメッセージを表示します。</translation>
+    </message>
+    <message>
+        <source>%1 client</source>
+        <translation>%1 クライアント</translation>
+    </message>
     <message>
         <source>Catching up...</source>
         <translation>追跡中...</translation>
@@ -544,13 +385,6 @@
         <translation>ウォレットは&lt;b&gt;暗号化されて、ロックされています&lt;/b&gt;</translation>
     </message>
 </context>
-<context>
-    <name>ClientModel</name>
-    <message>
-        <source>Network Alert</source>
-        <translation>ネットワーク警告</translation>
-    </message>
-</context>
 <context>
     <name>CoinControlDialog</name>
     <message>
@@ -629,150 +463,6 @@
         <source>Priority</source>
         <translation>優先度</translation>
     </message>
-    <message>
-        <source>Copy address</source>
-        <translation>アドレスをコピーする</translation>
-    </message>
-    <message>
-        <source>Copy label</source>
-        <translation>ラベルをコピーする</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>総額のコピー</translation>
-    </message>
-    <message>
-        <source>Copy transaction ID</source>
-        <translation>取引 ID をコピー</translation>
-    </message>
-    <message>
-        <source>Lock unspent</source>
-        <translation>未使用トランザクションをロックする</translation>
-    </message>
-    <message>
-        <source>Unlock unspent</source>
-        <translation>未使用トランザクションをアンロックする</translation>
-    </message>
-    <message>
-        <source>Copy quantity</source>
-        <translation>数量をコピーする</translation>
-    </message>
-    <message>
-        <source>Copy fee</source>
-        <translation>手数料をコピーする</translation>
-    </message>
-    <message>
-        <source>Copy after fee</source>
-        <translation>手数料差引後の値をコピーする</translation>
-    </message>
-    <message>
-        <source>Copy bytes</source>
-        <translation>バイト数をコピーする</translation>
-    </message>
-    <message>
-        <source>Copy priority</source>
-        <translation>優先度をコピーする</translation>
-    </message>
-    <message>
-        <source>Copy dust</source>
-        <translation>ダストをコピーする</translation>
-    </message>
-    <message>
-        <source>Copy change</source>
-        <translation>釣り銭をコピー</translation>
-    </message>
-    <message>
-        <source>highest</source>
-        <translation>最高</translation>
-    </message>
-    <message>
-        <source>higher</source>
-        <translation>非常に高</translation>
-    </message>
-    <message>
-        <source>high</source>
-        <translation>高</translation>
-    </message>
-    <message>
-        <source>medium-high</source>
-        <translation>中〜高</translation>
-    </message>
-    <message>
-        <source>medium</source>
-        <translation>中</translation>
-    </message>
-    <message>
-        <source>low-medium</source>
-        <translation>低〜中</translation>
-    </message>
-    <message>
-        <source>low</source>
-        <translation>低</translation>
-    </message>
-    <message>
-        <source>lower</source>
-        <translation>非常に低</translation>
-    </message>
-    <message>
-        <source>lowest</source>
-        <translation>最低</translation>
-    </message>
-    <message>
-        <source>(%1 locked)</source>
-        <translation>(%1 がロック済み)</translation>
-    </message>
-    <message>
-        <source>none</source>
-        <translation>なし</translation>
-    </message>
-    <message>
-        <source>This label turns red if the transaction size is greater than 1000 bytes.</source>
-        <translation>トランザクションのサイズが1000バイトを超える場合にはこのラベルは赤色になります。</translation>
-    </message>
-    <message>
-        <source>This label turns red if the priority is smaller than "medium".</source>
-        <translation>優先度が「中」未満の場合、このラベルは赤色になります。</translation>
-    </message>
-    <message>
-        <source>This label turns red if any recipient receives an amount smaller than %1.</source>
-        <translation>受取人のうち誰かの受取額が %1 未満の場合にこのラベルは赤色になります。</translation>
-    </message>
-    <message>
-        <source>Can vary +/- %1 satoshi(s) per input.</source>
-        <translation>ひとつの入力につき %1 satoshi 前後ずれることがあります。</translation>
-    </message>
-    <message>
-        <source>yes</source>
-        <translation>はい</translation>
-    </message>
-    <message>
-        <source>no</source>
-        <translation>いいえ</translation>
-    </message>
-    <message>
-        <source>This means a fee of at least %1 per kB is required.</source>
-        <translation>これは少なくとも1kBあたり %1 の手数料が必要であることを意味します。</translation>
-    </message>
-    <message>
-        <source>Can vary +/- 1 byte per input.</source>
-        <translation>ひとつの入力につき1バイト程度ずれることがあります。</translation>
-    </message>
-    <message>
-        <source>Transactions with higher priority are more likely to get included into a block.</source>
-        <translation>より高い優先度を持つトランザクションの方がブロックに取り込まれやすくなります。</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>（ラベル無し）</translation>
-    </message>
-    <message>
-        <source>change from %1 (%2)</source>
-        <translation>%1 (%2) からのおつり</translation>
-    </message>
-    <message>
-        <source>(change)</source>
-        <translation>(おつり)</translation>
-    </message>
 </context>
 <context>
     <name>EditAddressDialog</name>
@@ -796,38 +486,6 @@
         <source>&amp;Address</source>
         <translation>アドレス帳 (&amp;A)</translation>
     </message>
-    <message>
-        <source>New receiving address</source>
-        <translation>新しい入金アドレス</translation>
-    </message>
-    <message>
-        <source>New sending address</source>
-        <translation>新しい送信アドレス</translation>
-    </message>
-    <message>
-        <source>Edit receiving address</source>
-        <translation>入金アドレスを編集</translation>
-    </message>
-    <message>
-        <source>Edit sending address</source>
-        <translation>送信アドレスを編集</translation>
-    </message>
-    <message>
-        <source>The entered address "%1" is already in the address book.</source>
-        <translation>入力されたアドレス "%1" は既にアドレス帳にあります。</translation>
-    </message>
-    <message>
-        <source>The entered address "%1" is not a valid Bitcoin address.</source>
-        <translation>入力されたアドレス "%1" は無効な Bitcoin アドレスです。</translation>
-    </message>
-    <message>
-        <source>Could not unlock wallet.</source>
-        <translation>ウォレットをアンロックできませんでした。</translation>
-    </message>
-    <message>
-        <source>New key generation failed.</source>
-        <translation>新しいキーの生成に失敗しました。</translation>
-    </message>
 </context>
 <context>
     <name>FreespaceChecker</name>
@@ -854,10 +512,6 @@
 </context>
 <context>
     <name>HelpMessageDialog</name>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Bitcoin のコア</translation>
-    </message>
     <message>
         <source>version</source>
         <translation>バージョン</translation>
@@ -867,8 +521,8 @@
         <translation>(%1ビット)</translation>
     </message>
     <message>
-        <source>About Bitcoin Core</source>
-        <translation>Bitcoinコアについて</translation>
+        <source>About %1</source>
+        <translation>%1 について</translation>
     </message>
     <message>
         <source>Command-line options</source>
@@ -907,8 +561,8 @@
         <translation>起動時にスプラッシュ画面を表示する (初期値: %u)</translation>
     </message>
     <message>
-        <source>Reset all settings changes made over the GUI</source>
-        <translation>GUI 経由で行われた設定の変更を全てリセット</translation>
+        <source>Reset all settings changed in the GUI</source>
+        <translation>GUI で行われた設定の変更を全てリセット</translation>
     </message>
 </context>
 <context>
@@ -918,16 +572,16 @@
         <translation>ようこそ</translation>
     </message>
     <message>
-        <source>Welcome to Bitcoin Core.</source>
-        <translation>ようこそ！</translation>
+        <source>Welcome to %1.</source>
+        <translation>%1 へようこそ。</translation>
     </message>
     <message>
-        <source>As this is the first time the program is launched, you can choose where Bitcoin Core will store its data.</source>
-        <translation>これはプログラム最初の起動です。Bitcoin Coreがデータを保存する場所を選択して下さい。</translation>
+        <source>As this is the first time the program is launched, you can choose where %1 will store its data.</source>
+        <translation>これはプログラム最初の起動です。%1 がデータを保存する場所を選択して下さい。</translation>
     </message>
     <message>
-        <source>Bitcoin Core will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source>
-        <translation>Bitcoin Coreは、ビットコインのブロックチェーンのコピーを、ダウンロードして保存します。少なくとも%1ギガバイトのデータが、このディレクトリに保存されます。そしてそれは時間と共に増加します。またウォレットもこのディレクトリに保存されます。</translation>
+        <source>%1 will download and store a copy of the Bitcoin block chain. At least %2GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source>
+        <translation>%1 は、ビットコインのブロックチェーンのコピーを、ダウンロードして保存します。少なくとも %2 ギガバイトのデータが、このディレクトリに保存されます。そしてそれは時間と共に増加します。またウォレットもこのディレクトリに保存されます。</translation>
     </message>
     <message>
         <source>Use the default data directory</source>
@@ -937,10 +591,6 @@
         <source>Use a custom data directory:</source>
         <translation>任意のデータ ディレクトリを使用:</translation>
     </message>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Bitcoin のコア</translation>
-    </message>
     <message>
         <source>Error: Specified data directory "%1" cannot be created.</source>
         <translation>エラー: 指定のデータディレクトリ "%1" を作成できません。</translation>
@@ -976,10 +626,6 @@
         <source>Select payment request file</source>
         <translation>支払いリクエストファイルを選択してください</translation>
     </message>
-    <message>
-        <source>Select payment request file to open</source>
-        <translation>開きたい支払いリクエストファイルを選択してください</translation>
-    </message>
 </context>
 <context>
     <name>OptionsDialog</name>
@@ -991,6 +637,14 @@
         <source>&amp;Main</source>
         <translation>メイン (&amp;M)</translation>
     </message>
+    <message>
+        <source>Automatically start %1 after logging in to the system.</source>
+        <translation>システムにログインした際、自動的に %1 を起動する。</translation>
+    </message>
+    <message>
+        <source>&amp;Start %1 on system login</source>
+        <translation>システムにログインした時に %1 を起動 (&amp;S)</translation>
+    </message>
     <message>
         <source>Size of &amp;database cache</source>
         <translation>データベースキャッシュのサイズ (&amp;D)</translation>
@@ -1019,10 +673,6 @@
         <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Exit in the menu.</source>
         <translation>ウィンドウを閉じる際にアプリケーションを終了するのではなく、最小化します。このオプションが有効化された場合、メニューから終了を選択した場合にのみアプリケーションは閉じられます。</translation>
     </message>
-    <message>
-        <source>The user interface language can be set here. This setting will take effect after restarting Bitcoin Core.</source>
-        <translation>ユーザ・インタフェイス言語はここで設定できます。この設定はBitcoin Coreの再起動後に有効となります。</translation>
-    </message>
     <message>
         <source>Third party URLs (e.g. a block explorer) that appear in the transactions tab as context menu items. %s in the URL is replaced by transaction hash. Multiple URLs are separated by vertical bar |.</source>
         <translation>トランザクションタブのコンテキストメニュー項目に表示する、サードパーティURL (例えばブロックエクスプローラ)。URL中の%sはトランザクションのハッシュ値に置き換えられます。垂直バー | で区切ることで、複数のURLを指定できます。</translation>
@@ -1047,14 +697,6 @@
         <source>&amp;Network</source>
         <translation>ネットワーク (&amp;N)</translation>
     </message>
-    <message>
-        <source>Automatically start Bitcoin Core after logging in to the system.</source>
-        <translation>システムにログインした際、自動的にBitcoin Coreを起動する。</translation>
-    </message>
-    <message>
-        <source>&amp;Start Bitcoin Core on system login</source>
-        <translation>システムへログインした際にBitcoin Coreを起動する (&amp;S)</translation>
-    </message>
     <message>
         <source>(0 = auto, &lt;0 = leave that many cores free)</source>
         <translation>(0 = 自動、0以上 = 指定した数のコアをフリーにする)</translation>
@@ -1139,6 +781,14 @@
         <source>&amp;Window</source>
         <translation>ウインドウ (&amp;W)</translation>
     </message>
+    <message>
+        <source>&amp;Hide the icon from the system tray.</source>
+        <translation>システムトレイのアイコンを隠す (&amp;H)</translation>
+    </message>
+    <message>
+        <source>Hide tray icon</source>
+        <translation>トレイアイコンを隠す</translation>
+    </message>
     <message>
         <source>Show only a tray icon after minimizing the window.</source>
         <translation>ウインドウを最小化したあとトレイ アイコンだけを表示する。</translation>
@@ -1159,6 +809,10 @@
         <source>User Interface &amp;language:</source>
         <translation>ユーザインターフェースの言語 (&amp;l) :</translation>
     </message>
+    <message>
+        <source>The user interface language can be set here. This setting will take effect after restarting %1.</source>
+        <translation>ここでユーザインターフェースの言語を設定できます。設定を反映するには %1 を再起動します。</translation>
+    </message>
     <message>
         <source>&amp;Unit to show amounts in:</source>
         <translation>額を表示する単位 (&amp;U) :</translation>
@@ -1284,140 +938,49 @@
     </message>
 </context>
 <context>
-    <name>PaymentServer</name>
+    <name>PeerTableModel</name>
     <message>
-        <source>URI handling</source>
-        <translation>URI の操作</translation>
+        <source>User Agent</source>
+        <translation>ユーザエージェント</translation>
     </message>
     <message>
-        <source>Invalid payment address %1</source>
-        <translation>支払いのアドレス「%1」は無効です</translation>
+        <source>Node/Service</source>
+        <translation>ノード・サービス</translation>
     </message>
     <message>
-        <source>Payment request rejected</source>
-        <translation>支払い要求は拒否されました</translation>
+        <source>Ping Time</source>
+        <translation>Ping時間</translation>
     </message>
+</context>
+<context>
+    <name>QObject</name>
     <message>
-        <source>Payment request network doesn't match client network.</source>
-        <translation>支払いリクエストのネットワークは現在のクライアントのネットワークに一致しません。</translation>
+        <source>Amount</source>
+        <translation>総額</translation>
     </message>
     <message>
-        <source>Payment request is not initialized.</source>
-        <translation>支払いリクエストは開始されていません。</translation>
+        <source>Enter a Bitcoin address (e.g. %1)</source>
+        <translation>Bitcoinアドレスを入力してください (例 %1)</translation>
     </message>
     <message>
-        <source>Requested payment amount of %1 is too small (considered dust).</source>
-        <translation>要求された支払額 %1 は少なすぎます (ダストとみなされてしまいます)。</translation>
+        <source>%1 d</source>
+        <translation>%1日</translation>
     </message>
     <message>
-        <source>Payment request error</source>
-        <translation>支払いのリクエストのエラーです</translation>
+        <source>%1 h</source>
+        <translation>%1 h</translation>
     </message>
     <message>
-        <source>Cannot start bitcoin: click-to-pay handler</source>
-        <translation>Bitcoin を起動できません: click-to-pay handler</translation>
+        <source>%1 m</source>
+        <translation>%1 m</translation>
     </message>
     <message>
-        <source>Payment request fetch URL is invalid: %1</source>
-        <translation>支払い要求の取得先URLが無効です: %1</translation>
+        <source>%1 s</source>
+        <translation>%1秒</translation>
     </message>
     <message>
-        <source>URI cannot be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source>
-        <translation>URI を解析できません! これは無効な Bitcoin アドレスあるいや不正な形式の URI パラメーターによって引き起こされる場合があります。</translation>
-    </message>
-    <message>
-        <source>Payment request file handling</source>
-        <translation>支払いリクエストファイルを処理しています</translation>
-    </message>
-    <message>
-        <source>Payment request file cannot be read! This can be caused by an invalid payment request file.</source>
-        <translation>支払いリクエストファイルを読み込めませんでした！無効な支払いリクエストファイルにより引き起こされた可能性があります。</translation>
-    </message>
-    <message>
-        <source>Payment request expired.</source>
-        <translation>支払いリクエストの期限が切れました。</translation>
-    </message>
-    <message>
-        <source>Unverified payment requests to custom payment scripts are unsupported.</source>
-        <translation>カスタム支払いスクリプトに対する、検証されていない支払いリクエストはサポートされていません。</translation>
-    </message>
-    <message>
-        <source>Invalid payment request.</source>
-        <translation>無効な支払いリクエスト。</translation>
-    </message>
-    <message>
-        <source>Refund from %1</source>
-        <translation>%1 からの返金</translation>
-    </message>
-    <message>
-        <source>Payment request %1 is too large (%2 bytes, allowed %3 bytes).</source>
-        <translation>支払リクエスト %1 は大きすぎます（%2バイトですが、%3バイトまでが許されています）。</translation>
-    </message>
-    <message>
-        <source>Error communicating with %1: %2</source>
-        <translation>%1: %2とコミュニケーション・エラーです</translation>
-    </message>
-    <message>
-        <source>Payment request cannot be parsed!</source>
-        <translation>支払リクエストを読み込めませんでした！</translation>
-    </message>
-    <message>
-        <source>Bad response from server %1</source>
-        <translation>サーバーの返事は無効 %1</translation>
-    </message>
-    <message>
-        <source>Payment acknowledged</source>
-        <translation>支払いは確認しました</translation>
-    </message>
-    <message>
-        <source>Network request error</source>
-        <translation>ネットワーク・リクエストのエラーです</translation>
-    </message>
-</context>
-<context>
-    <name>PeerTableModel</name>
-    <message>
-        <source>User Agent</source>
-        <translation>ユーザエージェント</translation>
-    </message>
-    <message>
-        <source>Node/Service</source>
-        <translation>ノード・サービス</translation>
-    </message>
-    <message>
-        <source>Ping Time</source>
-        <translation>Ping時間</translation>
-    </message>
-</context>
-<context>
-    <name>QObject</name>
-    <message>
-        <source>Amount</source>
-        <translation>総額</translation>
-    </message>
-    <message>
-        <source>Enter a Bitcoin address (e.g. %1)</source>
-        <translation>Bitcoinアドレスを入力してください (例 %1)</translation>
-    </message>
-    <message>
-        <source>%1 d</source>
-        <translation>%1日</translation>
-    </message>
-    <message>
-        <source>%1 h</source>
-        <translation>%1 h</translation>
-    </message>
-    <message>
-        <source>%1 m</source>
-        <translation>%1 m</translation>
-    </message>
-    <message>
-        <source>%1 s</source>
-        <translation>%1秒</translation>
-    </message>
-    <message>
-        <source>None</source>
-        <translation>なし</translation>
+        <source>None</source>
+        <translation>なし</translation>
     </message>
     <message>
         <source>N/A</source>
@@ -1428,25 +991,6 @@
         <translation>%1ミリ秒</translation>
     </message>
 </context>
-<context>
-    <name>QRImageWidget</name>
-    <message>
-        <source>&amp;Save Image...</source>
-        <translation>画像を保存(&amp;S)</translation>
-    </message>
-    <message>
-        <source>&amp;Copy Image</source>
-        <translation>画像をコピー(&amp;C)</translation>
-    </message>
-    <message>
-        <source>Save QR Code</source>
-        <translation>QR コードの保存</translation>
-    </message>
-    <message>
-        <source>PNG Image (*.png)</source>
-        <translation>PNG画像ファイル(*.png)</translation>
-    </message>
-</context>
 <context>
     <name>RPCConsole</name>
     <message>
@@ -1477,6 +1021,10 @@
         <source>Using BerkeleyDB version</source>
         <translation>使用中のBerkleyDBバージョン</translation>
     </message>
+    <message>
+        <source>Datadir</source>
+        <translation>データディレクトリ</translation>
+    </message>
     <message>
         <source>Startup time</source>
         <translation>起動した日時</translation>
@@ -1513,10 +1061,6 @@
         <source>Memory usage</source>
         <translation>メモリ使用量</translation>
     </message>
-    <message>
-        <source>Open the Bitcoin Core debug log file from the current data directory. This can take a few seconds for large log files.</source>
-        <translation>現在のデータディレクトリからBitcoin Coreのデバッグ用ログファイルを開きます。ログファイルが巨大な場合、数秒かかることがあります。</translation>
-    </message>
     <message>
         <source>Received</source>
         <translation>受取</translation>
@@ -1565,6 +1109,18 @@
         <source>User Agent</source>
         <translation>ユーザエージェント</translation>
     </message>
+    <message>
+        <source>Open the %1 debug log file from the current data directory. This can take a few seconds for large log files.</source>
+        <translation>現在のデータディレクトリから %1 のデバッグ用ログファイルを開きます。ログファイルが巨大な場合、数秒かかることがあります。</translation>
+    </message>
+    <message>
+        <source>Decrease font size</source>
+        <translation>文字サイズを縮小</translation>
+    </message>
+    <message>
+        <source>Increase font size</source>
+        <translation>文字サイズを拡大</translation>
+    </message>
     <message>
         <source>Services</source>
         <translation>サービス</translation>
@@ -1633,10 +1189,6 @@
         <source>Out:</source>
         <translation>出力:</translation>
     </message>
-    <message>
-        <source>Build date</source>
-        <translation>ビルドの日付</translation>
-    </message>
     <message>
         <source>Debug log file</source>
         <translation>デバッグ用ログファイル</translation>
@@ -1674,8 +1226,8 @@
         <translation>ノードのbanを解除する (&amp;U)</translation>
     </message>
     <message>
-        <source>Welcome to the Bitcoin Core RPC console.</source>
-        <translation>Bitcoin CoreのRPCコンソールへようこそ。</translation>
+        <source>Welcome to the %1 RPC console.</source>
+        <translation>%1 のRPCコンソールへようこそ。</translation>
     </message>
     <message>
         <source>Use up and down arrows to navigate history, and &lt;b&gt;Ctrl-L&lt;/b&gt; to clear screen.</source>
@@ -1804,18 +1356,6 @@
         <source>Remove</source>
         <translation>削除</translation>
     </message>
-    <message>
-        <source>Copy label</source>
-        <translation>ラベルをコピーする</translation>
-    </message>
-    <message>
-        <source>Copy message</source>
-        <translation>メッセージをコピーする</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>総額のコピー</translation>
-    </message>
 </context>
 <context>
     <name>ReceiveRequestDialog</name>
@@ -1835,73 +1375,6 @@
         <source>&amp;Save Image...</source>
         <translation>画像を保存(&amp;S)</translation>
     </message>
-    <message>
-        <source>Request payment to %1</source>
-        <translation>%1 への支払いリクエストを行う</translation>
-    </message>
-    <message>
-        <source>Payment information</source>
-        <translation>支払い情報</translation>
-    </message>
-    <message>
-        <source>URI</source>
-        <translation>URI</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>アドレス</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>総額</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>ラベル</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>メッセージ</translation>
-    </message>
-    <message>
-        <source>Resulting URI too long, try to reduce the text for label / message.</source>
-        <translation>URI が長くなり過ぎます。ラベルやメッセージのテキストを短くしてください。</translation>
-    </message>
-    <message>
-        <source>Error encoding URI into QR Code.</source>
-        <translation>QR コード用の URI エンコードでエラー。</translation>
-    </message>
-</context>
-<context>
-    <name>RecentRequestsTableModel</name>
-    <message>
-        <source>Date</source>
-        <translation>日付</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>ラベル</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>メッセージ</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>総額</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>（ラベル無し）</translation>
-    </message>
-    <message>
-        <source>(no message)</source>
-        <translation>（メッセージなし）</translation>
-    </message>
-    <message>
-        <source>(no amount)</source>
-        <translation>（金額なし）</translation>
-    </message>
 </context>
 <context>
     <name>SendCoinsDialog</name>
@@ -2021,14 +1494,6 @@
         <source>fast</source>
         <translation>高速</translation>
     </message>
-    <message>
-        <source>Send as zero-fee transaction if possible</source>
-        <translation>可能な場合には手数料ゼロのトランザクションとして送金する</translation>
-    </message>
-    <message>
-        <source>(confirmation may take longer)</source>
-        <translation>（検証に長い時間がかかる可能性があります）</translation>
-    </message>
     <message>
         <source>Send to multiple recipients at once</source>
         <translation>一度に複数の人に送る</translation>
@@ -2061,118 +1526,6 @@
         <source>S&amp;end</source>
         <translation>送金 (&amp;E)</translation>
     </message>
-    <message>
-        <source>Confirm send coins</source>
-        <translation>コインを送る確認</translation>
-    </message>
-    <message>
-        <source>%1 to %2</source>
-        <translation>%1 から %2</translation>
-    </message>
-    <message>
-        <source>Copy quantity</source>
-        <translation>数量をコピーする</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>総額のコピー</translation>
-    </message>
-    <message>
-        <source>Copy fee</source>
-        <translation>手数料をコピーする</translation>
-    </message>
-    <message>
-        <source>Copy after fee</source>
-        <translation>手数料差引後の値をコピーする</translation>
-    </message>
-    <message>
-        <source>Copy bytes</source>
-        <translation>バイト数をコピーする</translation>
-    </message>
-    <message>
-        <source>Copy priority</source>
-        <translation>優先度をコピーする</translation>
-    </message>
-    <message>
-        <source>Copy change</source>
-        <translation>釣り銭をコピー</translation>
-    </message>
-    <message>
-        <source>Total Amount %1</source>
-        <translation>合計：　%1</translation>
-    </message>
-    <message>
-        <source>or</source>
-        <translation>または</translation>
-    </message>
-    <message>
-        <source>The amount to pay must be larger than 0.</source>
-        <translation>支払額は0より大きくないといけません。</translation>
-    </message>
-    <message>
-        <source>The amount exceeds your balance.</source>
-        <translation>額が残高を超えています。</translation>
-    </message>
-    <message>
-        <source>The total exceeds your balance when the %1 transaction fee is included.</source>
-        <translation>%1 の取引手数料を含めると額が残高を超えています。</translation>
-    </message>
-    <message>
-        <source>Transaction creation failed!</source>
-        <translation>トラザクションの作成に失敗しました!</translation>
-    </message>
-    <message>
-        <source>The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source>
-        <translation>トランザクションは拒否されました。wallet.dat のコピーを使い、そしてコピーしたウォレットからコインを使用したことがマークされなかったときなど、ウォレットのいくつかのコインがすでに使用されている場合に、このエラーは起こるかもしれません。</translation>
-    </message>
-    <message>
-        <source>A fee higher than %1 is considered an absurdly high fee.</source>
-        <translation>%1 よりも高い手数料の場合、手数料が高すぎると判断されます。</translation>
-    </message>
-    <message>
-        <source>Payment request expired.</source>
-        <translation>支払いリクエストの期限が切れました。</translation>
-    </message>
-    <message>
-        <source>Pay only the required fee of %1</source>
-        <translation>要求手数料 %1 のみを支払う</translation>
-    </message>
-    <message numerus="yes">
-        <source>Estimated to begin confirmation within %n block(s).</source>
-        <translation><numerusform>%n ブロック以内に検証が開始されると予想されます。</numerusform></translation>
-    </message>
-    <message>
-        <source>The recipient address is not valid. Please recheck.</source>
-        <translation>受取アドレスが不正です。再チェックしてください。</translation>
-    </message>
-    <message>
-        <source>Duplicate address found: addresses should only be used once each.</source>
-        <translation>重複したアドレスが見つかりました: アドレスはそれぞれ一度のみ使用することができます。</translation>
-    </message>
-    <message>
-        <source>Warning: Invalid Bitcoin address</source>
-        <translation>警告：無効なBitcoinアドレスです</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>（ラベル無し）</translation>
-    </message>
-    <message>
-        <source>Warning: Unknown change address</source>
-        <translation>警告：未知のおつりアドレスです</translation>
-    </message>
-    <message>
-        <source>Copy dust</source>
-        <translation>ダストをコピーする</translation>
-    </message>
-    <message>
-        <source>Are you sure you want to send?</source>
-        <translation>送ってよろしいですか？</translation>
-    </message>
-    <message>
-        <source>added as transaction fee</source>
-        <translation>取引手数料として追加された</translation>
-    </message>
 </context>
 <context>
     <name>SendCoinsEntry</name>
@@ -2184,10 +1537,6 @@
         <source>Pay &amp;To:</source>
         <translation>送り先(&amp;T):</translation>
     </message>
-    <message>
-        <source>Enter a label for this address to add it to your address book</source>
-        <translation>アドレス帳に追加するには、このアドレスのラベルを入力します</translation>
-    </message>
     <message>
         <source>&amp;Label:</source>
         <translation>ラベル(&amp;L):</translation>
@@ -2198,707 +1547,189 @@
     </message>
     <message>
         <source>This is a normal payment.</source>
-        <translation>これは通常の支払です。</translation>
-    </message>
-    <message>
-        <source>The Bitcoin address to send the payment to</source>
-        <translation>支払の送金先Bitcoinアドレス</translation>
-    </message>
-    <message>
-        <source>Alt+A</source>
-        <translation>Alt+A</translation>
-    </message>
-    <message>
-        <source>Paste address from clipboard</source>
-        <translation>クリップボードからアドレスを貼付ける</translation>
-    </message>
-    <message>
-        <source>Alt+P</source>
-        <translation>Alt+P</translation>
-    </message>
-    <message>
-        <source>Remove this entry</source>
-        <translation>この項目を削除する</translation>
-    </message>
-    <message>
-        <source>The fee will be deducted from the amount being sent. The recipient will receive less bitcoins than you enter in the amount field. If multiple recipients are selected, the fee is split equally.</source>
-        <translation>送金する金額から手数料が差し引かれます。受取人は数量フィールドで指定した量よりも少ないビットコインを受け取ります。受取人が複数いる場合には、手数料は均等割されます。</translation>
-    </message>
-    <message>
-        <source>S&amp;ubtract fee from amount</source>
-        <translation>送金額から手数料を差し引く (&amp;U)</translation>
-    </message>
-    <message>
-        <source>Message:</source>
-        <translation>メッセージ:</translation>
-    </message>
-    <message>
-        <source>This is an unauthenticated payment request.</source>
-        <translation>これは未認証の支払いリクエストです。</translation>
-    </message>
-    <message>
-        <source>This is an authenticated payment request.</source>
-        <translation>これは認証済みの支払いリクエストです。</translation>
-    </message>
-    <message>
-        <source>Enter a label for this address to add it to the list of used addresses</source>
-        <translation>このアドレスに対するラベルを入力することで、使用済みアドレスの一覧に追加することができます</translation>
-    </message>
-    <message>
-        <source>A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
-        <translation>bitcoin: URIに添付されていたメッセージです。これは参照用としてトランザクションとともに保存されます。注意：このメッセージはBitcoinネットワークを通して送信されるわけではありません。</translation>
-    </message>
-    <message>
-        <source>Pay To:</source>
-        <translation>支払先:</translation>
-    </message>
-    <message>
-        <source>Memo:</source>
-        <translation>メモ：</translation>
-    </message>
-</context>
-<context>
-    <name>ShutdownWindow</name>
-    <message>
-        <source>Bitcoin Core is shutting down...</source>
-        <translation>Bitcoin Coreをシャットダウンしています。</translation>
-    </message>
-    <message>
-        <source>Do not shut down the computer until this window disappears.</source>
-        <translation>このウィンドウが消えるまでコンピュータをシャットダウンしないで下さい。</translation>
-    </message>
-</context>
-<context>
-    <name>SignVerifyMessageDialog</name>
-    <message>
-        <source>Signatures - Sign / Verify a Message</source>
-        <translation>署名 - メッセージの署名/検証</translation>
-    </message>
-    <message>
-        <source>&amp;Sign Message</source>
-        <translation>メッセージの署名 (&amp;S)</translation>
-    </message>
-    <message>
-        <source>You can sign messages/agreements with your addresses to prove you can receive bitcoins sent to them. Be careful not to sign anything vague or random, as phishing attacks may try to trick you into signing your identity over to them. Only sign fully-detailed statements you agree to.</source>
-        <translation>あなたの所有しているアドレスによりメッセージや合意書に署名をすることで、それらアドレスに対して送られたビットコインを受け取ることができることを証明できます。フィッシング攻撃により不正にあなたの識別情報を署名させられてしまうことを防ぐために、不明確なものやランダムなものに対して署名しないよう注意してください。合意することが可能な、よく詳細の記された文言にのみ署名するようにしてください。</translation>
-    </message>
-    <message>
-        <source>The Bitcoin address to sign the message with</source>
-        <translation>メッセージを署名するBitcoinアドレス</translation>
-    </message>
-    <message>
-        <source>Choose previously used address</source>
-        <translation>前に使用したアドレスを選ぶ</translation>
-    </message>
-    <message>
-        <source>Alt+A</source>
-        <translation>Alt+A</translation>
-    </message>
-    <message>
-        <source>Paste address from clipboard</source>
-        <translation>クリップボードからアドレスを貼付ける</translation>
-    </message>
-    <message>
-        <source>Alt+P</source>
-        <translation>Alt+P</translation>
-    </message>
-    <message>
-        <source>Enter the message you want to sign here</source>
-        <translation>ここにあなたが署名するメッセージを入力します</translation>
-    </message>
-    <message>
-        <source>Signature</source>
-        <translation>署名</translation>
-    </message>
-    <message>
-        <source>Copy the current signature to the system clipboard</source>
-        <translation>現在の署名をシステムのクリップボードにコピーする</translation>
-    </message>
-    <message>
-        <source>Sign the message to prove you own this Bitcoin address</source>
-        <translation>この Bitcoin アドレスを所有していることを証明するためにメッセージに署名</translation>
-    </message>
-    <message>
-        <source>Sign &amp;Message</source>
-        <translation>メッセージの署名 (&amp;M)</translation>
-    </message>
-    <message>
-        <source>Reset all sign message fields</source>
-        <translation>入力項目の内容をすべて消去します</translation>
-    </message>
-    <message>
-        <source>Clear &amp;All</source>
-        <translation>すべてクリア (&amp;A)</translation>
-    </message>
-    <message>
-        <source>&amp;Verify Message</source>
-        <translation>メッセージの検証 (&amp;V)</translation>
-    </message>
-    <message>
-        <source>Enter the receiver's address, message (ensure you copy line breaks, spaces, tabs, etc. exactly) and signature below to verify the message. Be careful not to read more into the signature than what is in the signed message itself, to avoid being tricked by a man-in-the-middle attack. Note that this only proves the signing party receives with the address, it cannot prove sendership of any transaction!</source>
-        <translation>受取人のアドレスとメッセージ（改行やスペース、タブなども完全に一致するよう注意してください）および署名を以下に入力し、メッセージの署名を検証してください。中間者攻撃により騙されるのを防ぐため、署名対象のメッセージに書かれていること以上の意味を署名から読み取ろうとしないよう注意してください。これは署名作成者がこのアドレスで受け取ったことを証明するだけであり、トランザクションの送信権限を証明するものではないことに注意してください！</translation>
-    </message>
-    <message>
-        <source>The Bitcoin address the message was signed with</source>
-        <translation>メッセージの署名に使われたBitcoinアドレス</translation>
-    </message>
-    <message>
-        <source>Verify the message to ensure it was signed with the specified Bitcoin address</source>
-        <translation>指定された Bitcoin アドレスで署名されたことを保証するメッセージを検証</translation>
-    </message>
-    <message>
-        <source>Verify &amp;Message</source>
-        <translation>メッセージの検証 (&amp;M)</translation>
-    </message>
-    <message>
-        <source>Reset all verify message fields</source>
-        <translation>入力項目の内容をすべて消去します</translation>
-    </message>
-    <message>
-        <source>Click "Sign Message" to generate signature</source>
-        <translation>署名を作成するには"メッセージの署名"をクリック</translation>
-    </message>
-    <message>
-        <source>The entered address is invalid.</source>
-        <translation>不正なアドレスが入力されました。</translation>
-    </message>
-    <message>
-        <source>Please check the address and try again.</source>
-        <translation>アドレスを確かめてからもう一度試してください。</translation>
-    </message>
-    <message>
-        <source>The entered address does not refer to a key.</source>
-        <translation>入力されたアドレスに関連するキーがありません。</translation>
-    </message>
-    <message>
-        <source>Wallet unlock was cancelled.</source>
-        <translation>ウォレットのアンロックはキャンセルされました。</translation>
-    </message>
-    <message>
-        <source>Private key for the entered address is not available.</source>
-        <translation>入力されたアドレスのプライベート キーが無効です。</translation>
-    </message>
-    <message>
-        <source>Message signing failed.</source>
-        <translation>メッセージの署名に失敗しました。</translation>
-    </message>
-    <message>
-        <source>Message signed.</source>
-        <translation>メッセージに署名しました。</translation>
-    </message>
-    <message>
-        <source>The signature could not be decoded.</source>
-        <translation>署名がデコードできません。</translation>
-    </message>
-    <message>
-        <source>Please check the signature and try again.</source>
-        <translation>署名を確認してからもう一度試してください。</translation>
-    </message>
-    <message>
-        <source>The signature did not match the message digest.</source>
-        <translation>署名はメッセージ ダイジェストと一致しませんでした。</translation>
-    </message>
-    <message>
-        <source>Message verification failed.</source>
-        <translation>メッセージの検証に失敗しました。</translation>
-    </message>
-    <message>
-        <source>Message verified.</source>
-        <translation>メッセージは検証されました。</translation>
-    </message>
-</context>
-<context>
-    <name>SplashScreen</name>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Bitcoin のコア</translation>
-    </message>
-    <message>
-        <source>The Bitcoin Core developers</source>
-        <translation>ビットコインコアの開発者</translation>
-    </message>
-    <message>
-        <source>[testnet]</source>
-        <translation>[testnet]</translation>
-    </message>
-</context>
-<context>
-    <name>TrafficGraphWidget</name>
-    <message>
-        <source>KB/s</source>
-        <translation>KB/s</translation>
-    </message>
-</context>
-<context>
-    <name>TransactionDesc</name>
-    <message>
-        <source>Open until %1</source>
-        <translation>ユニット %1 を開く</translation>
-    </message>
-    <message>
-        <source>conflicted</source>
-        <translation>衝突</translation>
-    </message>
-    <message>
-        <source>%1/offline</source>
-        <translation>%1/オフライン</translation>
-    </message>
-    <message>
-        <source>%1/unconfirmed</source>
-        <translation>%1/未検証</translation>
-    </message>
-    <message>
-        <source>%1 confirmations</source>
-        <translation>%1 確認</translation>
-    </message>
-    <message>
-        <source>Status</source>
-        <translation>ステータス</translation>
-    </message>
-    <message numerus="yes">
-        <source>, broadcast through %n node(s)</source>
-        <translation><numerusform>%n ノードにブロードキャスト</numerusform></translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation>日付</translation>
-    </message>
-    <message>
-        <source>Source</source>
-        <translation>ソース</translation>
-    </message>
-    <message>
-        <source>Generated</source>
-        <translation>生成された</translation>
-    </message>
-    <message>
-        <source>From</source>
-        <translation>送信</translation>
-    </message>
-    <message>
-        <source>To</source>
-        <translation>受信</translation>
-    </message>
-    <message>
-        <source>own address</source>
-        <translation>自分のアドレス</translation>
-    </message>
-    <message>
-        <source>watch-only</source>
-        <translation>監視限定</translation>
-    </message>
-    <message>
-        <source>label</source>
-        <translation>ラベル</translation>
-    </message>
-    <message>
-        <source>Credit</source>
-        <translation>クレジット</translation>
-    </message>
-    <message numerus="yes">
-        <source>matures in %n more block(s)</source>
-        <translation><numerusform>%n 以上のブロックが満期</numerusform></translation>
-    </message>
-    <message>
-        <source>not accepted</source>
-        <translation>承認されなかった</translation>
-    </message>
-    <message>
-        <source>Debit</source>
-        <translation>引き落とし額</translation>
-    </message>
-    <message>
-        <source>Total debit</source>
-        <translation>総出金額</translation>
-    </message>
-    <message>
-        <source>Total credit</source>
-        <translation>総入金額</translation>
-    </message>
-    <message>
-        <source>Transaction fee</source>
-        <translation>取引手数料</translation>
-    </message>
-    <message>
-        <source>Net amount</source>
-        <translation>正味金額</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>メッセージ</translation>
-    </message>
-    <message>
-        <source>Comment</source>
-        <translation>コメント</translation>
-    </message>
-    <message>
-        <source>Transaction ID</source>
-        <translation>取引 ID</translation>
-    </message>
-    <message>
-        <source>Merchant</source>
-        <translation>商人</translation>
-    </message>
-    <message>
-        <source>Generated coins must mature %1 blocks before they can be spent. When you generated this block, it was broadcast to the network to be added to the block chain. If it fails to get into the chain, its state will change to "not accepted" and it won't be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source>
-        <translation>生成されたコインは使う前に%1のブロックを完成させる必要があります。あなたが生成した時、このブロックはブロック チェーンに追加されるネットワークにブロードキャストされました。チェーンに追加されるのが失敗した場合、状態が"不承認"に変更されて使えなくなるでしょう。これは、別のノードがあなたの数秒前にブロックを生成する場合に時々起こるかもしれません。</translation>
-    </message>
-    <message>
-        <source>Debug information</source>
-        <translation>デバッグ情報</translation>
-    </message>
-    <message>
-        <source>Transaction</source>
-        <translation>取引</translation>
-    </message>
-    <message>
-        <source>Inputs</source>
-        <translation>入力</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>総額</translation>
-    </message>
-    <message>
-        <source>true</source>
-        <translation>正しい</translation>
-    </message>
-    <message>
-        <source>false</source>
-        <translation>正しくない</translation>
-    </message>
-    <message>
-        <source>, has not been successfully broadcast yet</source>
-        <translation>まだブロードキャストが成功していません</translation>
-    </message>
-    <message numerus="yes">
-        <source>Open for %n more block(s)</source>
-        <translation><numerusform>%n 以上のブロックを開く</numerusform></translation>
-    </message>
-    <message>
-        <source>unknown</source>
-        <translation>未確認</translation>
-    </message>
-</context>
-<context>
-    <name>TransactionDescDialog</name>
-    <message>
-        <source>Transaction details</source>
-        <translation>取引の詳細</translation>
-    </message>
-    <message>
-        <source>This pane shows a detailed description of the transaction</source>
-        <translation>ここでは取引の詳細を表示しています</translation>
-    </message>
-</context>
-<context>
-    <name>TransactionTableModel</name>
-    <message>
-        <source>Date</source>
-        <translation>日付</translation>
-    </message>
-    <message>
-        <source>Type</source>
-        <translation>タイプ</translation>
-    </message>
-    <message>
-        <source>Immature (%1 confirmations, will be available after %2)</source>
-        <translation>未成熟（%1検証。%2検証完了後に使用可能となります）</translation>
-    </message>
-    <message numerus="yes">
-        <source>Open for %n more block(s)</source>
-        <translation><numerusform>%n 以上のブロックを開く</numerusform></translation>
-    </message>
-    <message>
-        <source>Open until %1</source>
-        <translation>ユニット %1 を開く</translation>
-    </message>
-    <message>
-        <source>Confirmed (%1 confirmations)</source>
-        <translation>検証されました (%1 検証済み)</translation>
-    </message>
-    <message>
-        <source>This block was not received by any other nodes and will probably not be accepted!</source>
-        <translation>このブロックは他のどのノードによっても受け取られないで、多分受け入れられないでしょう！</translation>
-    </message>
-    <message>
-        <source>Generated but not accepted</source>
-        <translation>生成されましたが承認されませんでした</translation>
-    </message>
-    <message>
-        <source>Offline</source>
-        <translation>オフライン</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>ラベル</translation>
-    </message>
-    <message>
-        <source>Unconfirmed</source>
-        <translation>未検証</translation>
-    </message>
-    <message>
-        <source>Confirming (%1 of %2 recommended confirmations)</source>
-        <translation>検証中（%2の推奨検証数のうち、%1検証が完了）</translation>
-    </message>
-    <message>
-        <source>Conflicted</source>
-        <translation>衝突</translation>
-    </message>
-    <message>
-        <source>Received with</source>
-        <translation>受け取り</translation>
-    </message>
-    <message>
-        <source>Received from</source>
-        <translation>送り主</translation>
-    </message>
-    <message>
-        <source>Sent to</source>
-        <translation>送り先</translation>
-    </message>
-    <message>
-        <source>Payment to yourself</source>
-        <translation>自分自身への支払い</translation>
-    </message>
-    <message>
-        <source>Mined</source>
-        <translation>発掘した</translation>
-    </message>
-    <message>
-        <source>watch-only</source>
-        <translation>監視限定</translation>
-    </message>
-    <message>
-        <source>(n/a)</source>
-        <translation>(n/a)</translation>
-    </message>
-    <message>
-        <source>Transaction status. Hover over this field to show number of confirmations.</source>
-        <translation>取引の状況。このフィールドの上にカーソルを置くと検証の数を表示します。</translation>
-    </message>
-    <message>
-        <source>Date and time that the transaction was received.</source>
-        <translation>取引を受信した日時。</translation>
-    </message>
-    <message>
-        <source>Type of transaction.</source>
-        <translation>取引の種類。</translation>
-    </message>
-    <message>
-        <source>Whether or not a watch-only address is involved in this transaction.</source>
-        <translation>監視限定アドレスがこのトランザクションに含まれているかどうか</translation>
-    </message>
-    <message>
-        <source>User-defined intent/purpose of the transaction.</source>
-        <translation>ユーザ定義のトランザクションの意図や目的。</translation>
+        <translation>これは通常の支払です。</translation>
     </message>
     <message>
-        <source>Amount removed from or added to balance.</source>
-        <translation>残高に追加または削除された総額。</translation>
+        <source>The Bitcoin address to send the payment to</source>
+        <translation>支払の送金先Bitcoinアドレス</translation>
     </message>
-</context>
-<context>
-    <name>TransactionView</name>
     <message>
-        <source>All</source>
-        <translation>すべて</translation>
+        <source>Alt+A</source>
+        <translation>Alt+A</translation>
     </message>
     <message>
-        <source>Today</source>
-        <translation>今日</translation>
+        <source>Paste address from clipboard</source>
+        <translation>クリップボードからアドレスを貼付ける</translation>
     </message>
     <message>
-        <source>This week</source>
-        <translation>今週</translation>
+        <source>Alt+P</source>
+        <translation>Alt+P</translation>
     </message>
     <message>
-        <source>This month</source>
-        <translation>今月</translation>
+        <source>Remove this entry</source>
+        <translation>この項目を削除する</translation>
     </message>
     <message>
-        <source>Last month</source>
-        <translation>先月</translation>
+        <source>The fee will be deducted from the amount being sent. The recipient will receive less bitcoins than you enter in the amount field. If multiple recipients are selected, the fee is split equally.</source>
+        <translation>送金する金額から手数料が差し引かれます。受取人は数量フィールドで指定した量よりも少ないビットコインを受け取ります。受取人が複数いる場合には、手数料は均等割されます。</translation>
     </message>
     <message>
-        <source>This year</source>
-        <translation>今年</translation>
+        <source>S&amp;ubtract fee from amount</source>
+        <translation>送金額から手数料を差し引く (&amp;U)</translation>
     </message>
     <message>
-        <source>Range...</source>
-        <translation>期間...</translation>
+        <source>Message:</source>
+        <translation>メッセージ:</translation>
     </message>
     <message>
-        <source>Received with</source>
-        <translation>送り主</translation>
+        <source>This is an unauthenticated payment request.</source>
+        <translation>これは未認証の支払いリクエストです。</translation>
     </message>
     <message>
-        <source>Sent to</source>
-        <translation>送り先</translation>
+        <source>This is an authenticated payment request.</source>
+        <translation>これは認証済みの支払いリクエストです。</translation>
     </message>
     <message>
-        <source>To yourself</source>
-        <translation>自分自身</translation>
+        <source>Enter a label for this address to add it to the list of used addresses</source>
+        <translation>このアドレスに対するラベルを入力することで、使用済みアドレスの一覧に追加することができます</translation>
     </message>
     <message>
-        <source>Mined</source>
-        <translation>発掘した</translation>
+        <source>A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
+        <translation>bitcoin: URIに添付されていたメッセージです。これは参照用としてトランザクションとともに保存されます。注意：このメッセージはBitcoinネットワークを通して送信されるわけではありません。</translation>
     </message>
     <message>
-        <source>Other</source>
-        <translation>その他</translation>
+        <source>Pay To:</source>
+        <translation>支払先:</translation>
     </message>
     <message>
-        <source>Enter address or label to search</source>
-        <translation>検索するアドレスまたはラベルを入力</translation>
+        <source>Memo:</source>
+        <translation>メモ：</translation>
     </message>
+</context>
+<context>
+    <name>ShutdownWindow</name>
     <message>
-        <source>Min amount</source>
-        <translation>最小の額</translation>
+        <source>%1 is shutting down...</source>
+        <translation>%1 をシャットダウンしています...</translation>
     </message>
     <message>
-        <source>Copy address</source>
-        <translation>アドレスをコピーする</translation>
+        <source>Do not shut down the computer until this window disappears.</source>
+        <translation>このウィンドウが消えるまでコンピュータをシャットダウンしないで下さい。</translation>
     </message>
+</context>
+<context>
+    <name>SignVerifyMessageDialog</name>
     <message>
-        <source>Copy label</source>
-        <translation>ラベルをコピーする</translation>
+        <source>Signatures - Sign / Verify a Message</source>
+        <translation>署名 - メッセージの署名/検証</translation>
     </message>
     <message>
-        <source>Copy amount</source>
-        <translation>総額のコピー</translation>
+        <source>&amp;Sign Message</source>
+        <translation>メッセージの署名 (&amp;S)</translation>
     </message>
     <message>
-        <source>Copy transaction ID</source>
-        <translation>取引 ID をコピー</translation>
+        <source>You can sign messages/agreements with your addresses to prove you can receive bitcoins sent to them. Be careful not to sign anything vague or random, as phishing attacks may try to trick you into signing your identity over to them. Only sign fully-detailed statements you agree to.</source>
+        <translation>あなたの所有しているアドレスによりメッセージや合意書に署名をすることで、それらアドレスに対して送られたビットコインを受け取ることができることを証明できます。フィッシング攻撃により不正にあなたの識別情報を署名させられてしまうことを防ぐために、不明確なものやランダムなものに対して署名しないよう注意してください。合意することが可能な、よく詳細の記された文言にのみ署名するようにしてください。</translation>
     </message>
     <message>
-        <source>Copy raw transaction</source>
-        <translation>生トランザクションをコピー</translation>
+        <source>The Bitcoin address to sign the message with</source>
+        <translation>メッセージを署名するBitcoinアドレス</translation>
     </message>
     <message>
-        <source>Edit label</source>
-        <translation>ラベルの編集</translation>
+        <source>Choose previously used address</source>
+        <translation>前に使用したアドレスを選ぶ</translation>
     </message>
     <message>
-        <source>Show transaction details</source>
-        <translation>取引の詳細を表示</translation>
+        <source>Alt+A</source>
+        <translation>Alt+A</translation>
     </message>
     <message>
-        <source>Export Transaction History</source>
-        <translation>トランザクション履歴をエクスポートする</translation>
+        <source>Paste address from clipboard</source>
+        <translation>クリップボードからアドレスを貼付ける</translation>
     </message>
     <message>
-        <source>Watch-only</source>
-        <translation>監視限定</translation>
+        <source>Alt+P</source>
+        <translation>Alt+P</translation>
     </message>
     <message>
-        <source>Exporting Failed</source>
-        <translation>エクスポートに失敗しました</translation>
+        <source>Enter the message you want to sign here</source>
+        <translation>ここにあなたが署名するメッセージを入力します</translation>
     </message>
     <message>
-        <source>There was an error trying to save the transaction history to %1.</source>
-        <translation>トランザクション履歴を %1 へ保存する際にエラーが発生しました。</translation>
+        <source>Signature</source>
+        <translation>署名</translation>
     </message>
     <message>
-        <source>Exporting Successful</source>
-        <translation>エクスポートに成功しました</translation>
+        <source>Copy the current signature to the system clipboard</source>
+        <translation>現在の署名をシステムのクリップボードにコピーする</translation>
     </message>
     <message>
-        <source>The transaction history was successfully saved to %1.</source>
-        <translation>トランザクション履歴は正常に%1に保存されました。</translation>
+        <source>Sign the message to prove you own this Bitcoin address</source>
+        <translation>この Bitcoin アドレスを所有していることを証明するためにメッセージに署名</translation>
     </message>
     <message>
-        <source>Comma separated file (*.csv)</source>
-        <translation>テキスト CSV (*.csv)</translation>
+        <source>Sign &amp;Message</source>
+        <translation>メッセージの署名 (&amp;M)</translation>
     </message>
     <message>
-        <source>Confirmed</source>
-        <translation>検証済み</translation>
+        <source>Reset all sign message fields</source>
+        <translation>入力項目の内容をすべて消去します</translation>
     </message>
     <message>
-        <source>Date</source>
-        <translation>日付</translation>
+        <source>Clear &amp;All</source>
+        <translation>すべてクリア (&amp;A)</translation>
     </message>
     <message>
-        <source>Type</source>
-        <translation>タイプ</translation>
+        <source>&amp;Verify Message</source>
+        <translation>メッセージの検証 (&amp;V)</translation>
     </message>
     <message>
-        <source>Label</source>
-        <translation>ラベル</translation>
+        <source>Enter the receiver's address, message (ensure you copy line breaks, spaces, tabs, etc. exactly) and signature below to verify the message. Be careful not to read more into the signature than what is in the signed message itself, to avoid being tricked by a man-in-the-middle attack. Note that this only proves the signing party receives with the address, it cannot prove sendership of any transaction!</source>
+        <translation>受取人のアドレスとメッセージ（改行やスペース、タブなども完全に一致するよう注意してください）および署名を以下に入力し、メッセージの署名を検証してください。中間者攻撃により騙されるのを防ぐため、署名対象のメッセージに書かれていること以上の意味を署名から読み取ろうとしないよう注意してください。これは署名作成者がこのアドレスで受け取ったことを証明するだけであり、トランザクションの送信権限を証明するものではないことに注意してください！</translation>
     </message>
     <message>
-        <source>Address</source>
-        <translation>Helbidea</translation>
+        <source>The Bitcoin address the message was signed with</source>
+        <translation>メッセージの署名に使われたBitcoinアドレス</translation>
     </message>
     <message>
-        <source>ID</source>
-        <translation>ID</translation>
+        <source>Verify the message to ensure it was signed with the specified Bitcoin address</source>
+        <translation>指定された Bitcoin アドレスで署名されたことを保証するメッセージを検証</translation>
     </message>
     <message>
-        <source>Range:</source>
-        <translation>期間:</translation>
+        <source>Verify &amp;Message</source>
+        <translation>メッセージの検証 (&amp;M)</translation>
     </message>
     <message>
-        <source>to</source>
-        <translation>から</translation>
+        <source>Reset all verify message fields</source>
+        <translation>入力項目の内容をすべて消去します</translation>
     </message>
 </context>
 <context>
-    <name>UnitDisplayStatusBarControl</name>
+    <name>SplashScreen</name>
     <message>
-        <source>Unit to show amounts in. Click to select another unit.</source>
-        <translation>金額を表示する際の単位。クリックすることで他の単位を選択します。</translation>
+        <source>[testnet]</source>
+        <translation>[testnet]</translation>
     </message>
 </context>
 <context>
-    <name>WalletFrame</name>
+    <name>TrafficGraphWidget</name>
     <message>
-        <source>No wallet has been loaded.</source>
-        <translation>ウォレットがロードされていません</translation>
+        <source>KB/s</source>
+        <translation>KB/s</translation>
     </message>
 </context>
 <context>
-    <name>WalletModel</name>
+    <name>TransactionDescDialog</name>
     <message>
-        <source>Send Coins</source>
-        <translation>コインを送る</translation>
+        <source>This pane shows a detailed description of the transaction</source>
+        <translation>ここでは取引の詳細を表示しています</translation>
     </message>
 </context>
 <context>
-    <name>WalletView</name>
-    <message>
-        <source>&amp;Export</source>
-        <translation>エクスポート (&amp;E)</translation>
-    </message>
-    <message>
-        <source>Export the data in the current tab to a file</source>
-        <translation>ファイルに現在のタブのデータをエクスポート</translation>
-    </message>
-    <message>
-        <source>Backup Wallet</source>
-        <translation>ウォレットのバックアップ</translation>
-    </message>
-    <message>
-        <source>Wallet Data (*.dat)</source>
-        <translation>ウォレット データ (*.dat)</translation>
-    </message>
-    <message>
-        <source>Backup Failed</source>
-        <translation>バックアップに失敗しました</translation>
-    </message>
-    <message>
-        <source>There was an error trying to save the wallet data to %1.</source>
-        <translation>ウォレットデータを%1へ保存する際にエラーが発生しました。</translation>
-    </message>
-    <message>
-        <source>The wallet data was successfully saved to %1.</source>
-        <translation>ウォレット データは正常に%1に保存されました。</translation>
-    </message>
+    <name>UnitDisplayStatusBarControl</name>
     <message>
-        <source>Backup Successful</source>
-        <translation>バックアップ成功</translation>
+        <source>Unit to show amounts in. Click to select another unit.</source>
+        <translation>金額を表示する際の単位。クリックすることで他の単位を選択します。</translation>
     </message>
 </context>
 <context>
@@ -2927,14 +1758,6 @@
         <source>If &lt;category&gt; is not supplied or if &lt;category&gt; = 1, output all debugging information.</source>
         <translation>&lt;category&gt; が与えられなかった場合や &lt;category&gt; = 1 の場合には、すべてのデバッグ情報が出力されます。</translation>
     </message>
-    <message>
-        <source>Maximum total fees (in %s) to use in a single wallet transaction; setting this too low may abort large transactions (default: %s)</source>
-        <translation>ひとつのウォレットトランザクションで使用する合計手数料 (%s 単位) の最大値。低すぎる値を指定すると巨大なトランザクションの作成ができなくなります (規定値: %s)</translation>
-    </message>
-    <message>
-        <source>Please check that your computer's date and time are correct! If your clock is wrong Bitcoin Core will not work properly.</source>
-        <translation>あなたのPCの日付と時刻が正しいことを確認して下さい！ もしあなたの時計が正しくなければBitcoin Coreが正確に動作しません。</translation>
-    </message>
     <message>
         <source>Prune configured below the minimum of %d MiB.  Please use a higher number.</source>
         <translation>剪定が最小値の %d MiB以下に設定されています。もっと大きな値を使用してください。</translation>
@@ -2975,6 +1798,14 @@
         <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
         <translation>外部からの接続を許可 (初期値:  -proxy または -connect を使用していない場合は1)</translation>
     </message>
+    <message>
+        <source>Bitcoin Core</source>
+        <translation>Bitcoin のコア</translation>
+    </message>
+    <message>
+        <source>The %s developers</source>
+        <translation>%s の開発者</translation>
+    </message>
     <message>
         <source>-fallbackfee is set very high! This is the transaction fee you may pay when fee estimates are not available.</source>
         <translation>-fallbackfee が高すぎます！これは手数料の推定機能が利用できない場合に支払うトランザクション手数料です。</translation>
@@ -2991,6 +1822,10 @@
         <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source>
         <translation>指定のアドレスへバインドし、その上で常にリスンします。IPv6 は [ホスト名]:ポート番号 と表記します</translation>
     </message>
+    <message>
+        <source>Cannot obtain a lock on data directory %s. %s is probably already running.</source>
+        <translation>データ ディレクトリ %s のロックを取得することができません。おそらく %s は実行中です。</translation>
+    </message>
     <message>
         <source>Delete all wallet transactions and only recover those parts of the blockchain through -rescan on startup</source>
         <translation>ウォレットの全トランザクションを削除し、これらを-rescanオプションを用いることで起動時にブロックチェインのデータのみからリカバリします。</translation>
@@ -2999,6 +1834,14 @@
         <source>Distributed under the MIT software license, see the accompanying file COPYING or &lt;http://www.opensource.org/licenses/mit-license.php&gt;.</source>
         <translation>MITソフトウェアライセンスのもとで配布されています。付属のCOPYINGファイルまたは&lt;http://www.opensource.org/licenses/mit-license.php&gt;を参照してください。</translation>
     </message>
+    <message>
+        <source>Error loading %s: You can't enable HD on a already existing non-HD wallet</source>
+        <translation>%s の読み込みエラー: 非HDウォレットが既に存在するため、HDウォレットを有効化できません</translation>
+    </message>
+    <message>
+        <source>Error reading %s! All keys read correctly, but transaction data or address book entries might be missing or incorrect.</source>
+        <translation>%s の読み込みエラー! すべてのキーは正しく読み取れますが、取引データやアドレス帳のエントリが失われたか、正しくない可能性があります。</translation>
+    </message>
     <message>
         <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source>
         <translation>ウォレットの取引を変更する際にコマンドを実行 (cmd の %s は TxID に置換される)</translation>
@@ -3007,6 +1850,22 @@
         <source>Force relay of transactions from whitelisted peers even they violate local relay policy (default: %d)</source>
         <translation>ホワイトリストのピアから受け取ったトランザクションに関しては、たとえローカルの中継ポリシーに違反しているとしても中継を行うようにする (デフォルト: %d)</translation>
     </message>
+    <message>
+        <source>Maximum allowed median peer time offset adjustment. Local perspective of time may be influenced by peers forward or backward by this amount. (default: %u seconds)</source>
+        <translation>時間オフセット調整値のピア中央値に対する最大の許容値。ローカル時間の見込み値は、接続するピアにより前方ないし後方へ影響されます。(初期値: %u 秒)</translation>
+    </message>
+    <message>
+        <source>Maximum total fees (in %s) to use in a single wallet transaction or raw transaction; setting this too low may abort large transactions (default: %s)</source>
+        <translation>ひとつのウォレットトランザクションまたは生トランザクションで使用する合計手数料の最大値 (%s 単位)。低すぎる値を指定すると巨大なトランザクションの作成ができなくなります (規定値: %s)</translation>
+    </message>
+    <message>
+        <source>Please check that your computer's date and time are correct! If your clock is wrong, %s will not work properly.</source>
+        <translation>あなたのPCの日付と時刻が正しいことを確認して下さい！ もしあなたの時計が正しくなければ %s が正確に動作しません。</translation>
+    </message>
+    <message>
+        <source>Please contribute if you find %s useful. Visit %s for further information about the software.</source>
+        <translation>%s が有用だと感じられた方はぜひプロジェクトへの貢献をお願いします。ソフトウェアのより詳細な情報については %s をご覧ください。</translation>
+    </message>
     <message>
         <source>Set the number of script verification threads (%u to %d, 0 = auto, &lt;0 = leave that many cores free, default: %d)</source>
         <translation>スクリプト検証スレッドを設定 (%uから%dの間, 0 = 自動, &lt;0 = たくさんのコアを自由にしておく, 初期値: %d)</translation>
@@ -3019,14 +1878,6 @@
         <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
         <translation>これはリリース前のテストビルドです - 各自の責任で利用すること - 採掘や商取引に使用しないでください</translation>
     </message>
-    <message>
-        <source>Unable to bind to %s on this computer. Bitcoin Core is probably already running.</source>
-        <translation>このコンピュータの %s にバインドすることができません。おそらく Bitcoin Core は既に実行されています。</translation>
-    </message>
-    <message>
-        <source>Unsupported argument -whitelistalwaysrelay ignored, use -whitelistrelay and/or -whitelistforcerelay.</source>
-        <translation>サポートされていない引数 -whitelistalwaysrelay は無視されました。-whitelistrelay または -whitelistforcerelay を利用してください</translation>
-    </message>
     <message>
         <source>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</source>
         <translation>リスン ポートの割当に UPnP を使用 (初期値: リスン中および-proxyが指定されていない場合は1)</translation>
@@ -3043,22 +1894,22 @@
         <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source>
         <translation>警告： ネットワークは完全に同意しないみたいです。マイナーは何かの問題を経験してるみたいなんです。</translation>
     </message>
-    <message>
-        <source>Warning: Unknown block versions being mined! It's possible unknown rules are in effect</source>
-        <translation>警告: 未知のバージョンのブロックが採掘されました。未知のルールが導入された可能性があります</translation>
-    </message>
     <message>
         <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source>
         <translation>警告： ピアーと完全に同意しないみたいです！アップグレードは必要かもしれません、それとも他のノードはアップグレードは必要かもしれません。</translation>
     </message>
-    <message>
-        <source>Warning: wallet.dat corrupt, data salvaged! Original wallet.dat saved as wallet.{timestamp}.bak in %s; if your balance or transactions are incorrect you should restore from a backup.</source>
-        <translation>警告: wallet.dat が壊れたのでデータを復旧しました! オリジナルの wallet.dat は wallet.{timestamp}.bak として %s に保存されました; もしもあなたの残高や取引が正しくないならバックアップから復元してください。</translation>
-    </message>
     <message>
         <source>Whitelist peers connecting from the given netmask or IP address. Can be specified multiple times.</source>
         <translation>与えられたネットマスクやIPアドレスから接続を行う、ホワイトリストのピア。複数回指定できます。</translation>
     </message>
+    <message>
+        <source>You need to rebuild the database using -reindex-chainstate to change -txindex</source>
+        <translation>-txindex を変更するには -reindex-chainstate を使用してデータベースを再構築する必要があります</translation>
+    </message>
+    <message>
+        <source>%s corrupt, salvage failed</source>
+        <translation>%s が壊れています。復旧にも失敗しました</translation>
+    </message>
     <message>
         <source>-maxmempool must be at least %d MB</source>
         <translation>-maxmempoolは最低でも %d MB必要です</translation>
@@ -3071,10 +1922,22 @@
         <source>Append comment to the user agent string</source>
         <translation>ユーザエージェント文字列にコメントを</translation>
     </message>
+    <message>
+        <source>Attempt to recover private keys from a corrupt wallet on startup</source>
+        <translation>起動時に壊れたウォレットから秘密鍵を復旧することを試す</translation>
+    </message>
     <message>
         <source>Block creation options:</source>
         <translation>ブロック作成オプション:</translation>
     </message>
+    <message>
+        <source>Cannot resolve -%s address: '%s'</source>
+        <translation>-%s アドレス '%s' を解決できません</translation>
+    </message>
+    <message>
+        <source>Change index out of range</source>
+        <translation>おつりのインデックスが範囲外です</translation>
+    </message>
     <message>
         <source>Connect only to the specified node(s)</source>
         <translation>指定したノードだけに接続</translation>
@@ -3083,6 +1946,10 @@
         <source>Connection options:</source>
         <translation>接続オプション：</translation>
     </message>
+    <message>
+        <source>Copyright (C) %i-%i</source>
+        <translation>Copyright (C) %i-%i</translation>
+    </message>
     <message>
         <source>Corrupted block database detected</source>
         <translation>破損したブロック データベースが見つかりました
@@ -3128,6 +1995,22 @@
         <source>Error initializing wallet database environment %s!</source>
         <translation>ウォレットのデータベース環境 %s 初期化エラー!</translation>
     </message>
+    <message>
+        <source>Error loading %s</source>
+        <translation>%s 読み込みエラー</translation>
+    </message>
+    <message>
+        <source>Error loading %s: Wallet corrupted</source>
+        <translation>%s 読み込みエラー: ウォレットが壊れました</translation>
+    </message>
+    <message>
+        <source>Error loading %s: Wallet requires newer version of %s</source>
+        <translation>%s の読み込みに失敗しました: ウォレットの読み込みにはより新しいバージョンの %s が必要です</translation>
+    </message>
+    <message>
+        <source>Error loading %s: You can't disable HD on a already existing HD wallet</source>
+        <translation>%s の読み込みエラー: HDウォレットが既に存在するため、HDウォレットを無効化できません</translation>
+    </message>
     <message>
         <source>Error loading block database</source>
         <translation>ブロック データベースの読み込みエラー</translation>
@@ -3152,10 +2035,18 @@
         <source>Incorrect or no genesis block found. Wrong datadir for network?</source>
         <translation>不正なブロックあるいは、生成されていないブロックが見つかりました。ネットワークの datadir が間違っていませんか?</translation>
     </message>
+    <message>
+        <source>Initialization sanity check failed. %s is shutting down.</source>
+        <translation>初期化時の健全性チェックに失敗しました。%s を終了します。</translation>
+    </message>
     <message>
         <source>Invalid -onion address: '%s'</source>
         <translation>無効な -onion アドレス：'%s'</translation>
     </message>
+    <message>
+        <source>Invalid amount for -%s=&lt;amount&gt;: '%s'</source>
+        <translation>-%s=&lt;数量&gt; に対する不正な額: '%s'</translation>
+    </message>
     <message>
         <source>Invalid amount for -fallbackfee=&lt;amount&gt;: '%s'</source>
         <translation>不正な額 -fallbackfee=&lt;amount&gt;: '%s'</translation>
@@ -3164,6 +2055,10 @@
         <source>Keep the transaction memory pool below &lt;n&gt; megabytes (default: %u)</source>
         <translation>トランザクションのメモリ・プールの総量を &lt;n&gt; メガバイト以下に維持する (初期値: %u)</translation>
     </message>
+    <message>
+        <source>Loading banlist...</source>
+        <translation>banリストを読み込んでいます...</translation>
+    </message>
     <message>
         <source>Location of the auth cookie (default: data dir)</source>
         <translation>認証クッキーの場所 (デフォルト: )</translation>
@@ -3180,6 +2075,10 @@
         <source>Only connect to nodes in network &lt;net&gt; (ipv4, ipv6 or onion)</source>
         <translation>&lt;net&gt; (ipv4, ipv6 または onion) ネットワーク内のノードだけに接続する</translation>
     </message>
+    <message>
+        <source>Print this help message and exit</source>
+        <translation>このヘルプメッセージを表示し終了する</translation>
+    </message>
     <message>
         <source>Print version and exit</source>
         <translation>バージョンを表示し終了</translation>
@@ -3192,6 +2091,14 @@
         <source>Prune mode is incompatible with -txindex.</source>
         <translation>剪定モードは-txindexと互換性がありません。</translation>
     </message>
+    <message>
+        <source>Rebuild chain state and block index from the blk*.dat files on disk</source>
+        <translation>チェイン状態およびブロックインデックスをディスク上の blk*.dat ファイルから再構築する</translation>
+    </message>
+    <message>
+        <source>Rebuild chain state from the currently indexed blocks</source>
+        <translation>既にインデックスされたブロックからチェイン状態を再構築する</translation>
+    </message>
     <message>
         <source>Set database cache size in megabytes (%d to %d, default: %d)</source>
         <translation>データベースのキャッシュサイズをメガバイトで設定 (%dから%d。初期値: %d)</translation>
@@ -3204,6 +2111,14 @@
         <source>Specify wallet file (within data directory)</source>
         <translation>ウォレットのファイルを指定　(データ・ディレクトリの中に)</translation>
     </message>
+    <message>
+        <source>The source code is available from %s.</source>
+        <translation>ソースコードは %s より入手可能です。</translation>
+    </message>
+    <message>
+        <source>Unable to bind to %s on this computer. %s is probably already running.</source>
+        <translation>このコンピュータの %s にバインドすることができません。おそらく %s は既に実行されています。</translation>
+    </message>
     <message>
         <source>Unsupported argument -benchmark ignored, use -debug=bench.</source>
         <translation>サポートされていない引数 -benchmark は無視されました。-debug=bench を使用してください。</translation>
@@ -3237,12 +2152,16 @@
         <translation>財布 %s はデータ・ディレクトリ%sの外にあります</translation>
     </message>
     <message>
-        <source>Wallet options:</source>
-        <translation>ウォレットオプション：</translation>
+        <source>Wallet debugging/testing options:</source>
+        <translation>ウォレットのデバッグ・テスト用オプション:</translation>
+    </message>
+    <message>
+        <source>Wallet needed to be rewritten: restart %s to complete</source>
+        <translation>ウォレットが書き直される必要がありました: 完了するために %s を再起動します</translation>
     </message>
     <message>
-        <source>You need to rebuild the database using -reindex to change -txindex</source>
-        <translation>-txindex を変更するには -reindex を使用してデータベースを再構築する必要があります</translation>
+        <source>Wallet options:</source>
+        <translation>ウォレットオプション：</translation>
     </message>
     <message>
         <source>Allow JSON-RPC connections from specified source. Valid for &lt;ip&gt; are a single IP (e.g. 1.2.3.4), a network/netmask (e.g. 1.2.3.4/255.255.255.0) or a network/CIDR (e.g. 1.2.3.4/24). This option can be specified multiple times</source>
@@ -3256,10 +2175,6 @@
         <source>Bind to given address to listen for JSON-RPC connections. Use [host]:port notation for IPv6. This option can be specified multiple times (default: bind to all interfaces)</source>
         <translation>指定されたアドレスに対して JSON-RPC 接続をリッスンしするようバインドします。IPv6の場合には [host]:port 表記を使用してください。このオプションは複数回指定することが可能です (初期値: すべてのインターフェースに対してバインドする)</translation>
     </message>
-    <message>
-        <source>Cannot obtain a lock on data directory %s. Bitcoin Core is probably already running.</source>
-        <translation>データ ディレクトリ %s のロックを取得することができません。おそらく Bitcoin Core は実行中です。</translation>
-    </message>
     <message>
         <source>Create new files with system default permissions, instead of umask 077 (only effective with disabled wallet functionality)</source>
         <translation>umask 077 ではなく、システムのデフォルトパーミッションで新規ファイルを作成する (ウォレット機能が無効化されていた場合にのみ有効)</translation>
@@ -3304,10 +2219,6 @@
         <source>Set maximum size of high-priority/low-fee transactions in bytes (default: %d)</source>
         <translation>最優先/最低手数料の最大サイズをバイトで指定 (初期値: %d)</translation>
     </message>
-    <message>
-        <source>Set the number of threads for coin generation if enabled (-1 = all cores, default: %d)</source>
-        <translation>コイン生成が有効になっていた場合の利用スレッド数を設定する (-1 = すべてのコア, 初期値: %d)</translation>
-    </message>
     <message>
         <source>The transaction amount is too small to send after the fee has been deducted</source>
         <translation>手数料差引後のトランザクションの金額が小さすぎるため、送金できません。</translation>
@@ -3316,6 +2227,10 @@
         <source>This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit &lt;https://www.openssl.org/&gt; and cryptographic software written by Eric Young and UPnP software written by Thomas Bernard.</source>
         <translation>この製品はOpenSSLプロジェクトにより開発されたソフトウェアをOpenSSLツールキットとして利用しています &lt;https://www.openssl.org/&gt;。また、Eric Young氏により開発された暗号ソフトウェア、Thomas Bernard氏により書かれたUPnPソフトウェアを用いています。</translation>
     </message>
+    <message>
+        <source>Use hierarchical deterministic key generation (HD) after BIP32. Only has effect during wallet creation/first start</source>
+        <translation>BIP32 に従った階層的決定性鍵生成方式 (HD) を利用します。ウォレットの生成時ないし最初に起動した時にのみ有効です。</translation>
+    </message>
     <message>
         <source>Whitelisted peers cannot be DoS banned and their transactions are always relayed, even if they are already in the mempool, useful e.g. for a gateway</source>
         <translation>ホワイトリストのピアはDoSによるアクセス禁止処理が無効化され、トランザクションは例えmempool内に既に存在していたとしても常にリレーされます。これは例えばゲートウェイに対して有用です</translation>
@@ -3332,34 +2247,14 @@
         <source>Accept public REST requests (default: %u)</source>
         <translation>公開 REST リクエストを許可する (初期値: %u)</translation>
     </message>
-    <message>
-        <source>Activating best chain...</source>
-        <translation>最優良のチェインを有効化しています...</translation>
-    </message>
-    <message>
-        <source>Attempt to recover private keys from a corrupt wallet.dat on startup</source>
-        <translation>起動時に壊れた wallet.dat から秘密鍵を復旧することを試す</translation>
-    </message>
     <message>
         <source>Automatically create Tor hidden service (default: %d)</source>
         <translation>Tor秘匿サービスを自動的に作成する (初期値: %d)</translation>
     </message>
-    <message>
-        <source>Cannot resolve -whitebind address: '%s'</source>
-        <translation>-whitebind アドレス '%s' を解決できません</translation>
-    </message>
     <message>
         <source>Connect through SOCKS5 proxy</source>
         <translation>SOCKS5 プロキシ経由で接続する</translation>
     </message>
-    <message>
-        <source>Copyright (C) 2009-%i The Bitcoin Core Developers</source>
-        <translation>Copyright (C) 2009-%i Bitcoin Core 開発者</translation>
-    </message>
-    <message>
-        <source>Error loading wallet.dat: Wallet requires newer version of Bitcoin Core</source>
-        <translation>wallet.dat の読み込みに失敗しました: ウォレットの読み込みにはより新しいバージョンの Bitcoin Core が必要です</translation>
-    </message>
     <message>
         <source>Error reading from database, shutting down.</source>
         <translation>データベースの読み込みエラー。シャットダウンします。</translation>
@@ -3372,22 +2267,6 @@
         <source>Information</source>
         <translation>情報</translation>
     </message>
-    <message>
-        <source>Initialization sanity check failed. Bitcoin Core is shutting down.</source>
-        <translation>初期化時の健全性チェックに失敗しました。Bitcoin Coreを終了します。</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -maxtxfee=&lt;amount&gt;: '%s'</source>
-        <translation>-maxtxfee=&lt;amount&gt; に対する無効な数量です: '%s'</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -minrelaytxfee=&lt;amount&gt;: '%s'</source>
-        <translation>不正な額 -minrelaytxfee=&lt;amount&gt;: '%s'</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -mintxfee=&lt;amount&gt;: '%s'</source>
-        <translation>不正な額 -minrelaytxfee=&lt;amount&gt;: '%s'</translation>
-    </message>
     <message>
         <source>Invalid amount for -paytxfee=&lt;amount&gt;: '%s' (must be at least %s)</source>
         <translation>-paytxfee=&lt;amount&gt; に対する無効な数量です: '%s' (少なくとも %s でなければいけません)</translation>
@@ -3412,14 +2291,6 @@
         <source>RPC server options:</source>
         <translation>RPCサーバのオプション:</translation>
     </message>
-    <message>
-        <source>Rebuild block chain index from current blk000??.dat files on startup</source>
-        <translation>起動時に現在の blk000??.dat ファイルからブロック チェーンのインデックスを再構築</translation>
-    </message>
-    <message>
-        <source>Receive and display P2P network alerts (default: %u)</source>
-        <translation>P2Pネットワークのアラートの受け取りと表示を行う (デフォルト: %u)</translation>
-    </message>
     <message>
         <source>Reducing -maxconnections from %d to %d, because of system limitations.</source>
         <translation>システム上の制約から、-maxconnections を %d から %d に削減しました。</translation>
@@ -3492,10 +2363,6 @@
         <source>Username for JSON-RPC connections</source>
         <translation>JSON-RPC 接続のユーザー名</translation>
     </message>
-    <message>
-        <source>Wallet needed to be rewritten: restart Bitcoin Core to complete</source>
-        <translation>ウォレットが書き直される必要がありました: 完了するために Bitcoin Core を再起動します</translation>
-    </message>
     <message>
         <source>Warning</source>
         <translation>警告</translation>
@@ -3516,10 +2383,6 @@
         <source>ZeroMQ notification options:</source>
         <translation>ZeroMQ通知オプション:</translation>
     </message>
-    <message>
-        <source>wallet.dat corrupt, salvage failed</source>
-        <translation>wallet.dat が壊れ、復旧に失敗しました</translation>
-    </message>
     <message>
         <source>Password for JSON-RPC connections</source>
         <translation>JSON-RPC 接続のパスワード</translation>
@@ -3528,10 +2391,6 @@
         <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
         <translation>最良のブロックに変更する際にコマンドを実行 (cmd の %s はブロック ハッシュに置換される)</translation>
     </message>
-    <message>
-        <source>This help message</source>
-        <translation>このヘルプ メッセージ</translation>
-    </message>
     <message>
         <source>Allow DNS lookups for -addnode, -seednode and -connect</source>
         <translation>-addnode, -seednode と -connect で DNS ルックアップを許可する</translation>
@@ -3540,10 +2399,6 @@
         <source>Loading addresses...</source>
         <translation>アドレスを読み込んでいます...</translation>
     </message>
-    <message>
-        <source>Error loading wallet.dat: Wallet corrupted</source>
-        <translation>wallet.dat 読み込みエラー: ウォレットが壊れました</translation>
-    </message>
     <message>
         <source>(1 = keep tx meta data e.g. account owner and payment request information, 2 = drop tx meta data)</source>
         <translation>(1 = トランザクションのメタデータ、例えばアカウントの所有者や支払リクエストの内容を保持する, 2 = トランザクションのメタデータを破棄する)</translation>
@@ -3560,10 +2415,6 @@
         <source>Do not keep transactions in the mempool longer than &lt;n&gt; hours (default: %u)</source>
         <translation>mempool内でトランザクションを &lt;n&gt; 時間以上保持しない (初期値: %u)</translation>
     </message>
-    <message>
-        <source>Error reading wallet.dat! All keys read correctly, but transaction data or address book entries might be missing or incorrect.</source>
-        <translation>wallet.dat の読み込みエラー! すべてのキーは正しく読み取れますが、取引データやアドレス帳のエントリが失われたか、正しくない可能性があります。</translation>
-    </message>
     <message>
         <source>Fees (in %s/kB) smaller than this are considered zero fee for transaction creation (default: %s)</source>
         <translation>トランザクション作成の際、この値未満の手数料 (%s/kB単位) はゼロであるとみなす (デフォルト: %s)</translation>
@@ -3600,6 +2451,10 @@
         <source>Unsupported argument -socks found. Setting SOCKS version isn't possible anymore, only SOCKS5 proxies are supported.</source>
         <translation>サポートされていない引数 -socks が見つかりました。SOCKSバージョンの設定はできないようになりました。SOCKS5プロキシのみがサポートされています。</translation>
     </message>
+    <message>
+        <source>Unsupported argument -whitelistalwaysrelay ignored, use -whitelistrelay and/or -whitelistforcerelay.</source>
+        <translation>サポートされていない引数 -whitelistalwaysrelay は無視されました。-whitelistrelay または -whitelistforcerelay を利用してください</translation>
+    </message>
     <message>
         <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: %s)</source>
         <translation>Tor 秘匿サービスを通し、別々の SOCKS5 プロキシを用いることでピアに到達する (初期値: %s)</translation>
@@ -3609,20 +2464,20 @@
         <translation>JSON-RPC接続時のユーザ名とハッシュ化されたパスワード。&lt;userpw&gt; フィールドのフォーマットは &lt;USERNAME&gt;:&lt;SALT&gt;$&lt;HASH&gt;。標準的な Python スクリプトが share/rpcuser 内に含まれています。このオプションは複数回指定できます。</translation>
     </message>
     <message>
-        <source>(default: %s)</source>
-        <translation>(デフォルト: %s)</translation>
+        <source>Warning: Unknown block versions being mined! It's possible unknown rules are in effect</source>
+        <translation>警告: 未知のバージョンのブロックが採掘されました。未知のルールが導入された可能性があります</translation>
     </message>
     <message>
-        <source>Always query for peer addresses via DNS lookup (default: %u)</source>
-        <translation>DNS ルックアップを通してピアアドレスを常に問い合わせる (初期値: %u)</translation>
+        <source>Warning: Wallet file corrupt, data salvaged! Original %s saved as %s in %s; if your balance or transactions are incorrect you should restore from a backup.</source>
+        <translation>警告: ウォレットファイルが破損していましたのでデータを復旧しました！元の %s は %s として %s に保存されました; 残高やトランザクションが正しくない場合にはバックアップから復元してください。</translation>
     </message>
     <message>
-        <source>Error loading wallet.dat</source>
-        <translation>wallet.dat 読み込みエラー</translation>
+        <source>(default: %s)</source>
+        <translation>(デフォルト: %s)</translation>
     </message>
     <message>
-        <source>Generate coins (default: %u)</source>
-        <translation>コインを生成 (初期値: %u)</translation>
+        <source>Always query for peer addresses via DNS lookup (default: %u)</source>
+        <translation>DNS ルックアップを通してピアアドレスを常に問い合わせる (初期値: %u)</translation>
     </message>
     <message>
         <source>How many blocks to check at startup (default: %u, 0 = all)</source>
@@ -3708,18 +2563,6 @@
         <source>Unknown network specified in -onlynet: '%s'</source>
         <translation>-onlynet で指定された '%s' は未知のネットワークです</translation>
     </message>
-    <message>
-        <source>Cannot resolve -bind address: '%s'</source>
-        <translation>-bind のアドレス '%s' を解決できません</translation>
-    </message>
-    <message>
-        <source>Cannot resolve -externalip address: '%s'</source>
-        <translation>-externalip のアドレス '%s' を解決できません</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -paytxfee=&lt;amount&gt;: '%s'</source>
-        <translation>-paytxfee=&lt;amount&gt; の額 '%s' が無効です</translation>
-    </message>
     <message>
         <source>Insufficient funds</source>
         <translation>残高不足</translation>
@@ -3730,7 +2573,7 @@
     </message>
     <message>
         <source>Add a node to connect to and attempt to keep the connection open</source>
-        <translation>接続するノードを追加し接続を持続するように試します</translation>
+        <translation>接続するノードを追加し接続を保持します</translation>
     </message>
     <message>
         <source>Loading wallet...</source>
diff --git a/src/qt/locale/bitcoin_ka.ts b/src/qt/locale/bitcoin_ka.ts
index 1a072d1df116b..22e7651f6344d 100644
--- a/src/qt/locale/bitcoin_ka.ts
+++ b/src/qt/locale/bitcoin_ka.ts
@@ -21,10 +21,6 @@
         <source>C&amp;lose</source>
         <translation>&amp;დახურვა</translation>
     </message>
-    <message>
-        <source>&amp;Copy Address</source>
-        <translation>&amp;მისამართის კოპირება</translation>
-    </message>
     <message>
         <source>Delete the currently selected address from the list</source>
         <translation>მონიშნული მისამართის წაშლა სიიდან</translation>
@@ -41,69 +37,6 @@
         <source>&amp;Delete</source>
         <translation>&amp;წაშლა</translation>
     </message>
-    <message>
-        <source>Choose the address to send coins to</source>
-        <translation>აირჩიეთ მონეტების გაგზავნის მისამართი</translation>
-    </message>
-    <message>
-        <source>Choose the address to receive coins with</source>
-        <translation>აირჩიეთ მონეტების მიღების მისამართი</translation>
-    </message>
-    <message>
-        <source>C&amp;hoose</source>
-        <translation>&amp;არჩევა</translation>
-    </message>
-    <message>
-        <source>Sending addresses</source>
-        <translation>გაგზავნის მისამართი</translation>
-    </message>
-    <message>
-        <source>Receiving addresses</source>
-        <translation>მიღების მისამართი</translation>
-    </message>
-    <message>
-        <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source>
-        <translation>ეს არის თქვენი Bitcoin-მისამართები გადახდების შესასრულებლად. მონეტების გაგზავნამდე ყოველთვის შეამოწმეთ თანხა და მიმღების მისამართი.</translation>
-    </message>
-    <message>
-        <source>These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source>
-        <translation>ეს არის თქვენი Bitcoin-მისამართები გადახდების მისაღებად. რეკომენდებულია ყოველი ტრანსაქციისათვის ახალი მიღების მისამართის გამოყენება.</translation>
-    </message>
-    <message>
-        <source>Copy &amp;Label</source>
-        <translation>ნიშნუ&amp;ლის კოპირება</translation>
-    </message>
-    <message>
-        <source>&amp;Edit</source>
-        <translation>რ&amp;ედაქტირება</translation>
-    </message>
-    <message>
-        <source>Export Address List</source>
-        <translation>მისამართების სიის ექსპორტი</translation>
-    </message>
-    <message>
-        <source>Comma separated file (*.csv)</source>
-        <translation>CSV-ფაილი (*.csv)</translation>
-    </message>
-    <message>
-        <source>Exporting Failed</source>
-        <translation>ექსპორტი ვერ განხორციელდა</translation>
-    </message>
-    </context>
-<context>
-    <name>AddressTableModel</name>
-    <message>
-        <source>Label</source>
-        <translation>ნიშნული</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>მისამართი</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(არ არის ნიშნული)</translation>
-    </message>
 </context>
 <context>
     <name>AskPassphraseDialog</name>
@@ -123,82 +56,6 @@
         <source>Repeat new passphrase</source>
         <translation>გაიმეორეთ ახალი ფრაზა-პაროლი</translation>
     </message>
-    <message>
-        <source>Encrypt wallet</source>
-        <translation>საფულის დაშიფრვა</translation>
-    </message>
-    <message>
-        <source>This operation needs your wallet passphrase to unlock the wallet.</source>
-        <translation>ეს ოპერაცია მოითხოვს თქვენი საფულის ფრაზა-პაროლს საფულის განსაბლოკად.</translation>
-    </message>
-    <message>
-        <source>Unlock wallet</source>
-        <translation>საფულის განბლოკვა</translation>
-    </message>
-    <message>
-        <source>This operation needs your wallet passphrase to decrypt the wallet.</source>
-        <translation>ეს ოპერაცია მოითხოვს თქვენი საფულის ფრაზა-პაროლს საფულის გასაშიფრად.</translation>
-    </message>
-    <message>
-        <source>Decrypt wallet</source>
-        <translation>საფულის გაშიფრვა</translation>
-    </message>
-    <message>
-        <source>Change passphrase</source>
-        <translation>ფრაზა-პაროლის შეცვლა</translation>
-    </message>
-    <message>
-        <source>Confirm wallet encryption</source>
-        <translation>დაადასტურეთ საფულის დაშიფრვა</translation>
-    </message>
-    <message>
-        <source>Warning: If you encrypt your wallet and lose your passphrase, you will &lt;b&gt;LOSE ALL OF YOUR BITCOINS&lt;/b&gt;!</source>
-        <translation>ყურადღება: საფულის დაშიფრვის შემდეგ თუ თქვენ დაკარგავთ ფრაზა-პაროლს,  &lt;b&gt;ყველა ბიტქოინი დაგეკარგებათ&lt;/b&gt;!</translation>
-    </message>
-    <message>
-        <source>Are you sure you wish to encrypt your wallet?</source>
-        <translation>დარწმუნებული ხართ, რომ გინდათ საფულის დაშიფრვა?</translation>
-    </message>
-    <message>
-        <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source>
-        <translation>მნიშვნელოვანია: თქვენი საფულის ყველა ადრინდელი არქივი შეიცვლება ახლადგენერირებული დაშიფრული საფულის ფაილით. უსაფრთხოების მოსაზრებებით დაუშიფრავი საფულის ძველი არქივები ძალას დაკარგავს, როგორც კი დაიწყებთ ახალი, დაშიფრული საფულის გამოყენებას.</translation>
-    </message>
-    <message>
-        <source>Warning: The Caps Lock key is on!</source>
-        <translation>ყურადღება: ჩართულია Caps Lock რეჟიმი!</translation>
-    </message>
-    <message>
-        <source>Wallet encrypted</source>
-        <translation>საფულე დაშიფრულია</translation>
-    </message>
-    <message>
-        <source>Wallet encryption failed</source>
-        <translation>ვერ მოხერხდა საფულის დაშიფრვა</translation>
-    </message>
-    <message>
-        <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
-        <translation>საფულის დაშიფრვა ვერ მოხერხდა სისტემაში შეცდომის გამო. თქვენი საფულე არ არის დაშფრული.</translation>
-    </message>
-    <message>
-        <source>The supplied passphrases do not match.</source>
-        <translation>ფრაზა-პაროლები არ ემთხვევა ერთმანეთს.</translation>
-    </message>
-    <message>
-        <source>Wallet unlock failed</source>
-        <translation>საფულის განბლოკვა ვერ მოხერხდა</translation>
-    </message>
-    <message>
-        <source>The passphrase entered for the wallet decryption was incorrect.</source>
-        <translation>საფულის განშიფრვის ფრაზა-პაროლი არაწორია</translation>
-    </message>
-    <message>
-        <source>Wallet decryption failed</source>
-        <translation>საფულის განშიფრვა ვერ მოხერხდა</translation>
-    </message>
-    <message>
-        <source>Wallet passphrase was successfully changed.</source>
-        <translation>საფულის ფრაზა-პაროლი შეცვლილია.</translation>
-    </message>
 </context>
 <context>
     <name>BanTableModel</name>
@@ -277,10 +134,6 @@
         <source>Open &amp;URI...</source>
         <translation>&amp;URI-ის გახსნა...</translation>
     </message>
-    <message>
-        <source>Importing blocks from disk...</source>
-        <translation>ბლოკების იმპორტი დისკიდან...</translation>
-    </message>
     <message>
         <source>Reindexing blocks on disk...</source>
         <translation>დისკზე ბლოკების რეინდექსაცია...</translation>
@@ -361,18 +214,10 @@
         <source>Tabs toolbar</source>
         <translation>ბარათების პანელი</translation>
     </message>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Bitcoin Core</translation>
-    </message>
     <message>
         <source>Request payments (generates QR codes and bitcoin: URIs)</source>
         <translation>გადახდის მოთხოვნა (შეიქმნება QR-კოდები და bitcoin: ბმულები)</translation>
     </message>
-    <message>
-        <source>&amp;About Bitcoin Core</source>
-        <translation>Bitcoin Core-ს შეს&amp;ახებ</translation>
-    </message>
     <message>
         <source>Show the list of used sending addresses and labels</source>
         <translation>გამოყენებული გაგზავნის მისამართებისა და ნიშნულების სიის ჩვენება</translation>
@@ -389,10 +234,6 @@
         <source>&amp;Command-line options</source>
         <translation>საკომანდო სტრიქონის ოპ&amp;ციები</translation>
     </message>
-    <message>
-        <source>Show the Bitcoin Core help message to get a list with possible Bitcoin command-line options</source>
-        <translation>Bitcoin Core-ს დახმარების ჩვენება Bitcoin-ის საკომანდო სტრიქონის დასაშვები ოპციების სანახავად</translation>
-    </message>
     <message>
         <source>No block source available...</source>
         <translation>ბლოკების წყარო მიუწვდომელია...</translation>
@@ -450,13 +291,6 @@
         <translation>საფულე &lt;b&gt;დაშიფრულია&lt;/b&gt; და ამჟამად &lt;b&gt;დაბლოკილია&lt;/b&gt;</translation>
     </message>
 </context>
-<context>
-    <name>ClientModel</name>
-    <message>
-        <source>Network Alert</source>
-        <translation>ქსელური განგაში</translation>
-    </message>
-</context>
 <context>
     <name>CoinControlDialog</name>
     <message>
@@ -519,130 +353,6 @@
         <source>Priority</source>
         <translation>პრიორიტეტი</translation>
     </message>
-    <message>
-        <source>Copy address</source>
-        <translation>მისამართის კოპირება</translation>
-    </message>
-    <message>
-        <source>Copy label</source>
-        <translation>ნიშნულის კოპირება</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>თანხის კოპირება</translation>
-    </message>
-    <message>
-        <source>Copy transaction ID</source>
-        <translation>ტრანსაქციის ID-ს კოპირება</translation>
-    </message>
-    <message>
-        <source>Lock unspent</source>
-        <translation>დაუხარჯავის დაბლოკვა</translation>
-    </message>
-    <message>
-        <source>Unlock unspent</source>
-        <translation>დაუხარჯავის განბლოკვა</translation>
-    </message>
-    <message>
-        <source>Copy quantity</source>
-        <translation>რაოდენობის კოპირება</translation>
-    </message>
-    <message>
-        <source>Copy fee</source>
-        <translation>საკომისიოს კოპირება</translation>
-    </message>
-    <message>
-        <source>Copy after fee</source>
-        <translation>დამატებითი საკომისიოს კოპირება</translation>
-    </message>
-    <message>
-        <source>Copy bytes</source>
-        <translation>ბაიტების კოპირება</translation>
-    </message>
-    <message>
-        <source>Copy priority</source>
-        <translation>პრიორიტეტის კოპირება</translation>
-    </message>
-    <message>
-        <source>Copy change</source>
-        <translation>ხურდის კოპირება</translation>
-    </message>
-    <message>
-        <source>highest</source>
-        <translation>უმაღლესი</translation>
-    </message>
-    <message>
-        <source>higher</source>
-        <translation>უფრო მაღალი</translation>
-    </message>
-    <message>
-        <source>high</source>
-        <translation>მაღალი</translation>
-    </message>
-    <message>
-        <source>medium-high</source>
-        <translation>საშუალოზე მაღალი</translation>
-    </message>
-    <message>
-        <source>medium</source>
-        <translation>საშუალო</translation>
-    </message>
-    <message>
-        <source>low-medium</source>
-        <translation>საშუალოზე დაბალი</translation>
-    </message>
-    <message>
-        <source>low</source>
-        <translation>დაბალი</translation>
-    </message>
-    <message>
-        <source>lower</source>
-        <translation>უფრო დაბალი</translation>
-    </message>
-    <message>
-        <source>lowest</source>
-        <translation>უდაბლესი</translation>
-    </message>
-    <message>
-        <source>(%1 locked)</source>
-        <translation>(%1 დაბლოკილია)</translation>
-    </message>
-    <message>
-        <source>none</source>
-        <translation>ცარიელი</translation>
-    </message>
-    <message>
-        <source>yes</source>
-        <translation>კი</translation>
-    </message>
-    <message>
-        <source>no</source>
-        <translation>არა</translation>
-    </message>
-    <message>
-        <source>This means a fee of at least %1 per kB is required.</source>
-        <translation>ეს ნიშნავს, რომ კილობაიტზე საკომისიო იქნება მინიმუმ %1</translation>
-    </message>
-    <message>
-        <source>Can vary +/- 1 byte per input.</source>
-        <translation>შეიძლება იყოს +/- 1 ბაიტი ყოველ შესავალზე.</translation>
-    </message>
-    <message>
-        <source>Transactions with higher priority are more likely to get included into a block.</source>
-        <translation>მეტი პრიორიტეტის ტრანსაქციებს მეტი შანსი აქვს მოხვდეს ბლოკში.</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(არ არის ნიშნული)</translation>
-    </message>
-    <message>
-        <source>change from %1 (%2)</source>
-        <translation>ხურდა %1-დან (%2)</translation>
-    </message>
-    <message>
-        <source>(change)</source>
-        <translation>(ხურდა)</translation>
-    </message>
 </context>
 <context>
     <name>EditAddressDialog</name>
@@ -666,38 +376,6 @@
         <source>&amp;Address</source>
         <translation>მის&amp;ამართი</translation>
     </message>
-    <message>
-        <source>New receiving address</source>
-        <translation>ახალი მიღების მისამართი</translation>
-    </message>
-    <message>
-        <source>New sending address</source>
-        <translation>ახალი გაგზავნის მისამართი</translation>
-    </message>
-    <message>
-        <source>Edit receiving address</source>
-        <translation>მიღების მისამართის შეცვლა</translation>
-    </message>
-    <message>
-        <source>Edit sending address</source>
-        <translation>გაგზავნის მისამართის შეცვლა</translation>
-    </message>
-    <message>
-        <source>The entered address "%1" is already in the address book.</source>
-        <translation>მისამართი "%1" უკვე არის მისამართების წიგნში.</translation>
-    </message>
-    <message>
-        <source>The entered address "%1" is not a valid Bitcoin address.</source>
-        <translation>შეყვანილი მისამართი "%1" არ არის ვალიდური Bitcoin-მისამართი.</translation>
-    </message>
-    <message>
-        <source>Could not unlock wallet.</source>
-        <translation>საფულის განბლოკვა ვერ მოხერხდა.</translation>
-    </message>
-    <message>
-        <source>New key generation failed.</source>
-        <translation>ახალი გასაღების გენერირება ვერ მოხერხდა</translation>
-    </message>
 </context>
 <context>
     <name>FreespaceChecker</name>
@@ -724,18 +402,10 @@
 </context>
 <context>
     <name>HelpMessageDialog</name>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Bitcoin Core</translation>
-    </message>
     <message>
         <source>version</source>
         <translation>ვერსია</translation>
     </message>
-    <message>
-        <source>About Bitcoin Core</source>
-        <translation>Bitcoin Core-ს შესახებ</translation>
-    </message>
     <message>
         <source>Command-line options</source>
         <translation>კომანდების ზოლის ოპციები</translation>
@@ -755,18 +425,6 @@
         <source>Welcome</source>
         <translation>მოგესალმებით</translation>
     </message>
-    <message>
-        <source>Welcome to Bitcoin Core.</source>
-        <translation>მოგესალმებათ Bitcoin Core.</translation>
-    </message>
-    <message>
-        <source>As this is the first time the program is launched, you can choose where Bitcoin Core will store its data.</source>
-        <translation>ეს პროგრამის პირველი გაშვებაა; შეგიძლიათ მიუთითოთ, სად შეინახოს მონაცემები Bitcoin Core-მ.</translation>
-    </message>
-    <message>
-        <source>Bitcoin Core will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source>
-        <translation>Bitcoin Core გადმოტვირთავს და შეინახავს Bitcoin-ის ბლოკთა ჯაჭვს. მითითებულ კატალოგში დაგროვდება სულ ცოტა %1 გბ მონაცემები, და მომავალში უფრო გაიზრდება. საფულეც ამავე კატალოგში შეინახება.</translation>
-    </message>
     <message>
         <source>Use the default data directory</source>
         <translation>ნაგულისხმევი კატალოგის გამოყენება</translation>
@@ -775,10 +433,6 @@
         <source>Use a custom data directory:</source>
         <translation>მითითებული კატალოგის გამოყენება:</translation>
     </message>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Bitcoin Core</translation>
-    </message>
     <message>
         <source>Error</source>
         <translation>შეცდომა</translation>
@@ -802,10 +456,6 @@
         <source>Select payment request file</source>
         <translation>გადახდის მოთხოვნის ფაილის არჩევა</translation>
     </message>
-    <message>
-        <source>Select payment request file to open</source>
-        <translation>გადახდის მოთხოვნის ფაილის არჩევა გასახსნელად</translation>
-    </message>
 </context>
 <context>
     <name>OptionsDialog</name>
@@ -989,61 +639,6 @@
         <translation>თქვენი სრული მიმდინარე ბალანსი</translation>
     </message>
     </context>
-<context>
-    <name>PaymentServer</name>
-    <message>
-        <source>URI handling</source>
-        <translation>URI-ების დამუშავება</translation>
-    </message>
-    <message>
-        <source>Invalid payment address %1</source>
-        <translation>გადახდის მისამართი არასწორია: %1</translation>
-    </message>
-    <message>
-        <source>Requested payment amount of %1 is too small (considered dust).</source>
-        <translation>მოთხოვნილი გადახდის %1 მოცულობა ძალიან მცირეა (ითვლება "მტვრად")</translation>
-    </message>
-    <message>
-        <source>Payment request error</source>
-        <translation>გადახდის მოთხოვნის შეცდომა</translation>
-    </message>
-    <message>
-        <source>Cannot start bitcoin: click-to-pay handler</source>
-        <translation>ვერ გაიშვა bitcoin: click-to-pay</translation>
-    </message>
-    <message>
-        <source>Payment request fetch URL is invalid: %1</source>
-        <translation>არასწორია გადახდის მოთხოვნის URL: %1</translation>
-    </message>
-    <message>
-        <source>Payment request file handling</source>
-        <translation>გადახდის მოთხოვნის ფაილის დამუშავება</translation>
-    </message>
-    <message>
-        <source>Unverified payment requests to custom payment scripts are unsupported.</source>
-        <translation>არავერიფიცირებული გადახდის მოთხოვნები გადახდის სამომხმარებლო სკრიპტებისათვის არ არის მხარდაჭერილი.</translation>
-    </message>
-    <message>
-        <source>Refund from %1</source>
-        <translation>დაბრუნება %1-საგან</translation>
-    </message>
-    <message>
-        <source>Error communicating with %1: %2</source>
-        <translation>ვერ გამოდის კავშირზე %1: %2</translation>
-    </message>
-    <message>
-        <source>Bad response from server %1</source>
-        <translation>ცუდი პასუხი სერვერისაგან %1</translation>
-    </message>
-    <message>
-        <source>Payment acknowledged</source>
-        <translation>გადახდა მიღებულია</translation>
-    </message>
-    <message>
-        <source>Network request error</source>
-        <translation>ქსელური მოთხოვნის შეცდომა</translation>
-    </message>
-</context>
 <context>
     <name>PeerTableModel</name>
     </context>
@@ -1066,25 +661,6 @@
         <translation>მიუწვდ.</translation>
     </message>
     </context>
-<context>
-    <name>QRImageWidget</name>
-    <message>
-        <source>&amp;Save Image...</source>
-        <translation>გამო&amp;სახულების შენახვა...</translation>
-    </message>
-    <message>
-        <source>&amp;Copy Image</source>
-        <translation>გამოსახულების &amp;კოპირება</translation>
-    </message>
-    <message>
-        <source>Save QR Code</source>
-        <translation>QR-კოდის შენახვა</translation>
-    </message>
-    <message>
-        <source>PNG Image (*.png)</source>
-        <translation>PNG სურათი (*.png)</translation>
-    </message>
-</context>
 <context>
     <name>RPCConsole</name>
     <message>
@@ -1167,10 +743,6 @@
         <source>Out:</source>
         <translation>გამავალი:</translation>
     </message>
-    <message>
-        <source>Build date</source>
-        <translation>შექმნის დრო</translation>
-    </message>
     <message>
         <source>Debug log file</source>
         <translation>დახვეწის ლოგ-ფაილი</translation>
@@ -1274,18 +846,6 @@
         <source>Remove</source>
         <translation>წაშლა</translation>
     </message>
-    <message>
-        <source>Copy label</source>
-        <translation>ნიშნულის კოპირება</translation>
-    </message>
-    <message>
-        <source>Copy message</source>
-        <translation>მესიჯის კოპირება</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>თანხის კოპირება</translation>
-    </message>
 </context>
 <context>
     <name>ReceiveRequestDialog</name>
@@ -1305,111 +865,44 @@
         <source>&amp;Save Image...</source>
         <translation>გამო&amp;სახულების შენახვა...</translation>
     </message>
+</context>
+<context>
+    <name>SendCoinsDialog</name>
     <message>
-        <source>Request payment to %1</source>
-        <translation>%1-ის გადაზდის მოთხოვნა</translation>
+        <source>Send Coins</source>
+        <translation>მონეტების გაგზავნა</translation>
     </message>
     <message>
-        <source>Payment information</source>
-        <translation>ინფორმაცია გადახდის შესახებ</translation>
+        <source>Coin Control Features</source>
+        <translation>მონეტების კონტროლის პარამეტრები</translation>
     </message>
     <message>
-        <source>URI</source>
-        <translation>URI</translation>
+        <source>Inputs...</source>
+        <translation>ხარჯები...</translation>
     </message>
     <message>
-        <source>Address</source>
-        <translation>მისამართი</translation>
+        <source>automatically selected</source>
+        <translation>არჩეულია ავტომატურად</translation>
     </message>
     <message>
-        <source>Amount</source>
-        <translation>თანხა</translation>
+        <source>Insufficient funds!</source>
+        <translation>არ არის საკმარისი თანხა!</translation>
     </message>
     <message>
-        <source>Label</source>
-        <translation>ნიშნული</translation>
+        <source>Quantity:</source>
+        <translation>რაოდენობა:</translation>
     </message>
     <message>
-        <source>Message</source>
-        <translation>მესიჯი</translation>
+        <source>Bytes:</source>
+        <translation>ბაიტები:</translation>
     </message>
     <message>
-        <source>Resulting URI too long, try to reduce the text for label / message.</source>
-        <translation>URI ძალიან გრძელი გამოდის, შეამოკლეთ ნიშნულის/მესიჯის ტექსტი.</translation>
+        <source>Amount:</source>
+        <translation>თანხა:</translation>
     </message>
     <message>
-        <source>Error encoding URI into QR Code.</source>
-        <translation>შედომა URI-ის QR-კოდში გადაყვანისას.</translation>
-    </message>
-</context>
-<context>
-    <name>RecentRequestsTableModel</name>
-    <message>
-        <source>Date</source>
-        <translation>თარიღი</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>ნიშნული</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>მესიჯი</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>თანხა</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(არ არის ნიშნული)</translation>
-    </message>
-    <message>
-        <source>(no message)</source>
-        <translation>(მესიჯები არ არის)</translation>
-    </message>
-    <message>
-        <source>(no amount)</source>
-        <translation>(თანხა არ არის)</translation>
-    </message>
-</context>
-<context>
-    <name>SendCoinsDialog</name>
-    <message>
-        <source>Send Coins</source>
-        <translation>მონეტების გაგზავნა</translation>
-    </message>
-    <message>
-        <source>Coin Control Features</source>
-        <translation>მონეტების კონტროლის პარამეტრები</translation>
-    </message>
-    <message>
-        <source>Inputs...</source>
-        <translation>ხარჯები...</translation>
-    </message>
-    <message>
-        <source>automatically selected</source>
-        <translation>არჩეულია ავტომატურად</translation>
-    </message>
-    <message>
-        <source>Insufficient funds!</source>
-        <translation>არ არის საკმარისი თანხა!</translation>
-    </message>
-    <message>
-        <source>Quantity:</source>
-        <translation>რაოდენობა:</translation>
-    </message>
-    <message>
-        <source>Bytes:</source>
-        <translation>ბაიტები:</translation>
-    </message>
-    <message>
-        <source>Amount:</source>
-        <translation>თანხა:</translation>
-    </message>
-    <message>
-        <source>Priority:</source>
-        <translation>პრიორიტეტი:</translation>
+        <source>Priority:</source>
+        <translation>პრიორიტეტი:</translation>
     </message>
     <message>
         <source>Fee:</source>
@@ -1463,86 +956,6 @@
         <source>S&amp;end</source>
         <translation>გაგ&amp;ზავნა</translation>
     </message>
-    <message>
-        <source>Confirm send coins</source>
-        <translation>მონეტების გაგზავნის დადასტურება</translation>
-    </message>
-    <message>
-        <source>%1 to %2</source>
-        <translation>%1-დან %2-ში</translation>
-    </message>
-    <message>
-        <source>Copy quantity</source>
-        <translation>რაოდენობის კოპირება</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>თანხის კოპირება</translation>
-    </message>
-    <message>
-        <source>Copy fee</source>
-        <translation>საკომისიოს კოპირება</translation>
-    </message>
-    <message>
-        <source>Copy after fee</source>
-        <translation>დამატებითი საკომისიოს კოპირება</translation>
-    </message>
-    <message>
-        <source>Copy bytes</source>
-        <translation>ბაიტების კოპირება</translation>
-    </message>
-    <message>
-        <source>Copy priority</source>
-        <translation>პრიორიტეტის კოპირება</translation>
-    </message>
-    <message>
-        <source>Copy change</source>
-        <translation>ხურდის კოპირება</translation>
-    </message>
-    <message>
-        <source>or</source>
-        <translation>ან</translation>
-    </message>
-    <message>
-        <source>The amount to pay must be larger than 0.</source>
-        <translation>გადახდის მოცულობა 0-ზე მეტი უნდა იყოს</translation>
-    </message>
-    <message>
-        <source>The amount exceeds your balance.</source>
-        <translation>თანხა აღემატება თქვენს ბალანსს</translation>
-    </message>
-    <message>
-        <source>The total exceeds your balance when the %1 transaction fee is included.</source>
-        <translation>საკომისიო %1-ის დამატების შემდეგ თანხა აჭარბებს თქვენს ბალანსს</translation>
-    </message>
-    <message>
-        <source>Transaction creation failed!</source>
-        <translation>შეცდომა ტრანსაქციის შექმნისას!</translation>
-    </message>
-    <message>
-        <source>The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source>
-        <translation>ტრანსაქცია უარყოფილია! შესაძლოა მონეტების ნაწილი თქვენი საფულიდან უკვე გამოყენებულია, რაც შეიძლება მოხდეს wallet.dat-ის ასლის გამოყენებისას, როცა მონეტები გაიგზავნა სხვა ასლიდან, აქ კი არ არის გაგზავნილად მონიშნული.</translation>
-    </message>
-    <message>
-        <source>Warning: Invalid Bitcoin address</source>
-        <translation>ყურადღება: არასწორია Bitcoin-მისამართი</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(არ არის ნიშნული)</translation>
-    </message>
-    <message>
-        <source>Warning: Unknown change address</source>
-        <translation>ყურადღება: უცნობია ხურდის მისამართი</translation>
-    </message>
-    <message>
-        <source>Are you sure you want to send?</source>
-        <translation>დარწმუნებული ხართ, რომ გინდათ გაგზავნა?</translation>
-    </message>
-    <message>
-        <source>added as transaction fee</source>
-        <translation>დამატებულია საკომისიო</translation>
-    </message>
 </context>
 <context>
     <name>SendCoinsEntry</name>
@@ -1554,10 +967,6 @@
         <source>Pay &amp;To:</source>
         <translation>ადრესა&amp;ტი:</translation>
     </message>
-    <message>
-        <source>Enter a label for this address to add it to your address book</source>
-        <translation>შეიყვანეთ ამ მისამართის ნიშნული მისამართების წიგნში დასამატებლად</translation>
-    </message>
     <message>
         <source>&amp;Label:</source>
         <translation>ნიშნუ&amp;ლი:</translation>
@@ -1609,10 +1018,6 @@
 </context>
 <context>
     <name>ShutdownWindow</name>
-    <message>
-        <source>Bitcoin Core is shutting down...</source>
-        <translation>Bitcoin Core იხურება...</translation>
-    </message>
     <message>
         <source>Do not shut down the computer until this window disappears.</source>
         <translation>არ გამორთოთ კომპიუტერი ამ ფანჯრის გაქრობამდე.</translation>
@@ -1688,69 +1093,9 @@
         <source>Reset all verify message fields</source>
         <translation>ვერიფიკაციის ყველა ველის წაშლა</translation>
     </message>
-    <message>
-        <source>Click "Sign Message" to generate signature</source>
-        <translation>ხელმოწერის გენერირებისათვის დააჭირეთ "მესიჯის ხელმოწერა"-ს</translation>
-    </message>
-    <message>
-        <source>The entered address is invalid.</source>
-        <translation>შეყვანილი მისამართი არასწორია.</translation>
-    </message>
-    <message>
-        <source>Please check the address and try again.</source>
-        <translation>შეამოწმეთ მისამართი და სცადეთ ხელახლა.</translation>
-    </message>
-    <message>
-        <source>The entered address does not refer to a key.</source>
-        <translation>შეყვანილი მისამართი არ არის კავშირში გასაღებთან.</translation>
-    </message>
-    <message>
-        <source>Wallet unlock was cancelled.</source>
-        <translation>საფულის განბლოკვა შეწყვეტილია.</translation>
-    </message>
-    <message>
-        <source>Private key for the entered address is not available.</source>
-        <translation>ამ მისამართისათვის პირადი გასაღები მიუწვდომელია.</translation>
-    </message>
-    <message>
-        <source>Message signing failed.</source>
-        <translation>ვერ მოხერხდა მესიჯის ხელმოწერა.</translation>
-    </message>
-    <message>
-        <source>Message signed.</source>
-        <translation>მესიჯი ხელმოწერილია.</translation>
-    </message>
-    <message>
-        <source>The signature could not be decoded.</source>
-        <translation>ხელმოწერის დეკოდირება ვერ ხერხდება.</translation>
-    </message>
-    <message>
-        <source>Please check the signature and try again.</source>
-        <translation>შეამოწმეთ ხელმოწერა და სცადეთ ხელახლა.</translation>
-    </message>
-    <message>
-        <source>The signature did not match the message digest.</source>
-        <translation>ხელმოწერა არ შეესაბამება მესიჯის დაიჯესტს.</translation>
-    </message>
-    <message>
-        <source>Message verification failed.</source>
-        <translation>მესიჯის ვერიფიკაცია ვერ მოხერხდა.</translation>
-    </message>
-    <message>
-        <source>Message verified.</source>
-        <translation>მესიჯი ვერიფიცირებულია.</translation>
-    </message>
 </context>
 <context>
     <name>SplashScreen</name>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Bitcoin Core</translation>
-    </message>
-    <message>
-        <source>The Bitcoin Core developers</source>
-        <translation>Bitcoin Core-ს ავტორები</translation>
-    </message>
     <message>
         <source>[testnet]</source>
         <translation>[testnet]</translation>
@@ -1763,426 +1108,16 @@
         <translation>KB/s</translation>
     </message>
 </context>
-<context>
-    <name>TransactionDesc</name>
-    <message>
-        <source>Open until %1</source>
-        <translation>ღია იქნება სანამ %1</translation>
-    </message>
-    <message>
-        <source>conflicted</source>
-        <translation>კონფლიქტშია</translation>
-    </message>
-    <message>
-        <source>%1/offline</source>
-        <translation>%1/გათიშულია</translation>
-    </message>
-    <message>
-        <source>%1/unconfirmed</source>
-        <translation>%1/დაუდასტურებელია</translation>
-    </message>
-    <message>
-        <source>%1 confirmations</source>
-        <translation>%1 დადასტურებულია</translation>
-    </message>
-    <message>
-        <source>Status</source>
-        <translation>სტატუსი</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation>თარიღი</translation>
-    </message>
-    <message>
-        <source>Source</source>
-        <translation>წყარო</translation>
-    </message>
-    <message>
-        <source>Generated</source>
-        <translation>გენერირებულია</translation>
-    </message>
-    <message>
-        <source>From</source>
-        <translation>გამგზავნი</translation>
-    </message>
-    <message>
-        <source>To</source>
-        <translation>მიმღები</translation>
-    </message>
-    <message>
-        <source>own address</source>
-        <translation>საკუთარი მისამართი</translation>
-    </message>
-    <message>
-        <source>label</source>
-        <translation>ნიშნული</translation>
-    </message>
-    <message>
-        <source>Credit</source>
-        <translation>კრედიტი</translation>
-    </message>
-    <message>
-        <source>not accepted</source>
-        <translation>უარყოფილია</translation>
-    </message>
-    <message>
-        <source>Debit</source>
-        <translation>დებიტი</translation>
-    </message>
-    <message>
-        <source>Transaction fee</source>
-        <translation>ტრანსაქციის საფასური - საკომისიო</translation>
-    </message>
-    <message>
-        <source>Net amount</source>
-        <translation>სუფთა თანხა</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>მესიჯი</translation>
-    </message>
-    <message>
-        <source>Comment</source>
-        <translation>შენიშვნა</translation>
-    </message>
-    <message>
-        <source>Transaction ID</source>
-        <translation>ტრანსაქციის ID</translation>
-    </message>
-    <message>
-        <source>Merchant</source>
-        <translation>გამყიდველი</translation>
-    </message>
-    <message>
-        <source>Generated coins must mature %1 blocks before they can be spent. When you generated this block, it was broadcast to the network to be added to the block chain. If it fails to get into the chain, its state will change to "not accepted" and it won't be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source>
-        <translation>გენერირებული მონეტები გასაგზავნად მომწიფდება %1 ბლოკის შემდეგ. ეს ბლოკი გენერირების შემდეგ გავრცელებულ იქნა ქსელში ბლოკთა ჯაჭვზე დასამატებლად. თუ ის ვერ ჩაჯდა ჯაჭვში, მიეცემა სტატუსი "უარყოფილია" და ამ მონეტებს ვერ გამოიყენებთ. ასეთი რამ შეიძლება მოხდეს, თუ რომელიმე კვანძმა რამდენიმე წამით დაგასწროთ ბლოკის გენერირება.</translation>
-    </message>
-    <message>
-        <source>Debug information</source>
-        <translation>დახვეწის ინფორმაცია</translation>
-    </message>
-    <message>
-        <source>Transaction</source>
-        <translation>ტრანსაქცია</translation>
-    </message>
-    <message>
-        <source>Inputs</source>
-        <translation>ხარჯები</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>თანხა</translation>
-    </message>
-    <message>
-        <source>true</source>
-        <translation>ჭეშმარიტი</translation>
-    </message>
-    <message>
-        <source>false</source>
-        <translation>მცდარი</translation>
-    </message>
-    <message>
-        <source>, has not been successfully broadcast yet</source>
-        <translation>, დაგზავნა არ არის წარმატებით დასრულებული</translation>
-    </message>
-    <message>
-        <source>unknown</source>
-        <translation>უცნობია</translation>
-    </message>
-</context>
 <context>
     <name>TransactionDescDialog</name>
-    <message>
-        <source>Transaction details</source>
-        <translation>ტრანსაქციის დეტალები</translation>
-    </message>
     <message>
         <source>This pane shows a detailed description of the transaction</source>
         <translation>ტრანსაქციის დაწვრილებითი აღწერილობა</translation>
     </message>
 </context>
-<context>
-    <name>TransactionTableModel</name>
-    <message>
-        <source>Date</source>
-        <translation>თარიღი</translation>
-    </message>
-    <message>
-        <source>Type</source>
-        <translation>ტიპი</translation>
-    </message>
-    <message>
-        <source>Immature (%1 confirmations, will be available after %2)</source>
-        <translation>არ არის მომწიფებული (%1 დასტური, საჭიროა სულ %2)</translation>
-    </message>
-    <message>
-        <source>Open until %1</source>
-        <translation>ღია იქნება სანამ %1</translation>
-    </message>
-    <message>
-        <source>Confirmed (%1 confirmations)</source>
-        <translation>დადასტურებულია (%1დასტური)</translation>
-    </message>
-    <message>
-        <source>This block was not received by any other nodes and will probably not be accepted!</source>
-        <translation>ეს ბლოკი არ არის მიღებული არცერთი კვანძის მიერ და სავარაუდოდ უარყოფილია!</translation>
-    </message>
-    <message>
-        <source>Generated but not accepted</source>
-        <translation>გენერირებულია, მაგრამ უარყოფილია</translation>
-    </message>
-    <message>
-        <source>Offline</source>
-        <translation>ოფლაინშია</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>ნიშნული</translation>
-    </message>
-    <message>
-        <source>Unconfirmed</source>
-        <translation>დაუდასტურებელია</translation>
-    </message>
-    <message>
-        <source>Confirming (%1 of %2 recommended confirmations)</source>
-        <translation>დადასტურებულია (%1,  რეკომენდებულია %2)</translation>
-    </message>
-    <message>
-        <source>Conflicted</source>
-        <translation>კონფლიქტშია</translation>
-    </message>
-    <message>
-        <source>Received with</source>
-        <translation>შემოსულია</translation>
-    </message>
-    <message>
-        <source>Received from</source>
-        <translation>გამომგზავნი</translation>
-    </message>
-    <message>
-        <source>Sent to</source>
-        <translation>გაგზავნილია</translation>
-    </message>
-    <message>
-        <source>Payment to yourself</source>
-        <translation>გადახდილია საკუთარი თავისათვის</translation>
-    </message>
-    <message>
-        <source>Mined</source>
-        <translation>მოპოვებულია</translation>
-    </message>
-    <message>
-        <source>(n/a)</source>
-        <translation>(მიუწვდ.)</translation>
-    </message>
-    <message>
-        <source>Transaction status. Hover over this field to show number of confirmations.</source>
-        <translation>ტრანსაქციის სტატუსი. ველზე კურსორის შეყვანისას გამოჩნდება დასტურების რაოდენობა.</translation>
-    </message>
-    <message>
-        <source>Date and time that the transaction was received.</source>
-        <translation>ტრანსაქციის მიღების თარიღი და დრო.</translation>
-    </message>
-    <message>
-        <source>Type of transaction.</source>
-        <translation>ტრანსაქციის ტიპი.</translation>
-    </message>
-    <message>
-        <source>Amount removed from or added to balance.</source>
-        <translation>ბალანსიდან მოხსნილი ან დამატებული თანხა.</translation>
-    </message>
-</context>
-<context>
-    <name>TransactionView</name>
-    <message>
-        <source>All</source>
-        <translation>ყველა</translation>
-    </message>
-    <message>
-        <source>Today</source>
-        <translation>დღეს</translation>
-    </message>
-    <message>
-        <source>This week</source>
-        <translation>ამ კვირის</translation>
-    </message>
-    <message>
-        <source>This month</source>
-        <translation>ამ თვის</translation>
-    </message>
-    <message>
-        <source>Last month</source>
-        <translation>ბოლო თვის</translation>
-    </message>
-    <message>
-        <source>This year</source>
-        <translation>ამ წლის</translation>
-    </message>
-    <message>
-        <source>Range...</source>
-        <translation>შუალედი...</translation>
-    </message>
-    <message>
-        <source>Received with</source>
-        <translation>შემოსულია</translation>
-    </message>
-    <message>
-        <source>Sent to</source>
-        <translation>გაგზავნილია</translation>
-    </message>
-    <message>
-        <source>To yourself</source>
-        <translation>საკუთარი თავისათვის</translation>
-    </message>
-    <message>
-        <source>Mined</source>
-        <translation>მოპოვებულია</translation>
-    </message>
-    <message>
-        <source>Other</source>
-        <translation>სხვა</translation>
-    </message>
-    <message>
-        <source>Enter address or label to search</source>
-        <translation>შეიყვანეთ საძებნი მისამართი ან ნიშნული</translation>
-    </message>
-    <message>
-        <source>Min amount</source>
-        <translation>მინ. თანხა</translation>
-    </message>
-    <message>
-        <source>Copy address</source>
-        <translation>მისამართის კოპირება</translation>
-    </message>
-    <message>
-        <source>Copy label</source>
-        <translation>ნიშნულის კოპირება</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>თანხის კოპირება</translation>
-    </message>
-    <message>
-        <source>Copy transaction ID</source>
-        <translation>ტრანსაქციის ID-ს კოპირება</translation>
-    </message>
-    <message>
-        <source>Edit label</source>
-        <translation>ნიშნულის რედაქტირება</translation>
-    </message>
-    <message>
-        <source>Show transaction details</source>
-        <translation>ტრანსაქციის დეტალების ჩვენება</translation>
-    </message>
-    <message>
-        <source>Export Transaction History</source>
-        <translation>ტრანსაქციების ისტორიის ექსპორტი</translation>
-    </message>
-    <message>
-        <source>Exporting Failed</source>
-        <translation>ექსპორტი ვერ განხორციელდა</translation>
-    </message>
-    <message>
-        <source>There was an error trying to save the transaction history to %1.</source>
-        <translation>შეცდომა %1-ში ტრანსაქციების შენახვის მცდელობისას.</translation>
-    </message>
-    <message>
-        <source>Exporting Successful</source>
-        <translation>ეხპორტი განხორციელებულია</translation>
-    </message>
-    <message>
-        <source>The transaction history was successfully saved to %1.</source>
-        <translation>ტრანსაქციების ისტორია შენახულია %1-ში.</translation>
-    </message>
-    <message>
-        <source>Comma separated file (*.csv)</source>
-        <translation>CSV-ფაილი (*.csv)</translation>
-    </message>
-    <message>
-        <source>Confirmed</source>
-        <translation>დადასტურებულია</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation>თარიღი</translation>
-    </message>
-    <message>
-        <source>Type</source>
-        <translation>ტიპი</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>ნიშნული</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>მისამართი</translation>
-    </message>
-    <message>
-        <source>ID</source>
-        <translation>ID</translation>
-    </message>
-    <message>
-        <source>Range:</source>
-        <translation>შუალედი:</translation>
-    </message>
-    <message>
-        <source>to</source>
-        <translation>-</translation>
-    </message>
-</context>
 <context>
     <name>UnitDisplayStatusBarControl</name>
     </context>
-<context>
-    <name>WalletFrame</name>
-    <message>
-        <source>No wallet has been loaded.</source>
-        <translation>არ არის ჩატვირთული საფულე.</translation>
-    </message>
-</context>
-<context>
-    <name>WalletModel</name>
-    <message>
-        <source>Send Coins</source>
-        <translation>მონეტების გაგზავნა</translation>
-    </message>
-</context>
-<context>
-    <name>WalletView</name>
-    <message>
-        <source>&amp;Export</source>
-        <translation>&amp;ექსპორტი</translation>
-    </message>
-    <message>
-        <source>Export the data in the current tab to a file</source>
-        <translation>ამ ბარათიდან მონაცემების ექსპორტი ფაილში</translation>
-    </message>
-    <message>
-        <source>Backup Wallet</source>
-        <translation>საფულის არქივირება</translation>
-    </message>
-    <message>
-        <source>Wallet Data (*.dat)</source>
-        <translation>საფულის მონაცემები (*.dat)</translation>
-    </message>
-    <message>
-        <source>Backup Failed</source>
-        <translation>არქივირება ვერ მოხერხდა</translation>
-    </message>
-    <message>
-        <source>There was an error trying to save the wallet data to %1.</source>
-        <translation>შეცდომა %1-ში საფულის მონაცემების შენახვის მცდელობისას.</translation>
-    </message>
-    <message>
-        <source>The wallet data was successfully saved to %1.</source>
-        <translation>საფულის მონაცემები შენახულია %1-ში.</translation>
-    </message>
-    <message>
-        <source>Backup Successful</source>
-        <translation>არქივირება შესრულებულია</translation>
-    </message>
-</context>
 <context>
     <name>bitcoin-core</name>
     <message>
@@ -2213,6 +1148,10 @@
         <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
         <translation>გარედან შეერთებების დაშვება (ნაგულისხმევი: 1 თუ არ გამოიყენება -proxy ან -connect)</translation>
     </message>
+    <message>
+        <source>Bitcoin Core</source>
+        <translation>Bitcoin Core</translation>
+    </message>
     <message>
         <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source>
         <translation>მოცემულ მისამართზე მიჯაჭვა მუდმივად მასზე მიყურადებით. გამოიყენეთ [host]:port ფორმა IPv6-სათვის</translation>
@@ -2233,10 +1172,6 @@
         <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source>
         <translation>ყურადღება: ჩვენ არ ვეთანხმებით ყველა პირს. შესაძლოა თქვენ ან სხვა კვანძებს განახლება გჭირდებათ.</translation>
     </message>
-    <message>
-        <source>Warning: wallet.dat corrupt, data salvaged! Original wallet.dat saved as wallet.{timestamp}.bak in %s; if your balance or transactions are incorrect you should restore from a backup.</source>
-        <translation>ყურადღება: wallet.dat დაზიანებულია! ორიგინალური wallet.dat შენახულია როგორც wallet.{timestamp}.bak %s-ში; თუ შეამჩნიეთ უზუსტობა ნაშთში ან ტრანსაქციებში, აღადგინეთ არქივიდან.</translation>
-    </message>
     <message>
         <source>&lt;category&gt; can be:</source>
         <translation>&lt;category&gt; შეიძლება იყოს:</translation>
@@ -2321,10 +1256,6 @@
         <source>Wallet options:</source>
         <translation>სფულის ოპციები:</translation>
     </message>
-    <message>
-        <source>You need to rebuild the database using -reindex to change -txindex</source>
-        <translation>საჭიროა ბაზის ხელახალი აგება, გამოიყენეთ -reindex რათა შეცვალოთ -txindex</translation>
-    </message>
     <message>
         <source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source>
         <translation>ბრძანების შესრულება შესაბამისი უწყების მიღებისას ან როცა შეინიშნება საგრძნობი გახლეჩა (cmd-ში %s შეიცვლება მესიჯით)</translation>
@@ -2333,26 +1264,10 @@
         <source>Set maximum size of high-priority/low-fee transactions in bytes (default: %d)</source>
         <translation>მაღალპრიორიტეტული/დაბალსაკომისიოიანი ტრანსაქციების მაქსიმალური ზომა ბაიტებში (ნაგულისხმევი: %d)</translation>
     </message>
-    <message>
-        <source>Cannot resolve -whitebind address: '%s'</source>
-        <translation>ვერ ხერხდება -whitebind მისამართის გარკვევა: '%s'</translation>
-    </message>
     <message>
         <source>Information</source>
         <translation>ინფორმაცია</translation>
     </message>
-    <message>
-        <source>Invalid amount for -maxtxfee=&lt;amount&gt;: '%s'</source>
-        <translation>დაუშვებელი მნიშვნელობა -pmaxtxfee&lt;amount&gt;: '%s'</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -minrelaytxfee=&lt;amount&gt;: '%s'</source>
-        <translation>დაუშვებელი მნიშვნელობა -minrelaytxfee=&lt;amount&gt;: '%s'</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -mintxfee=&lt;amount&gt;: '%s'</source>
-        <translation>დაუშვებელი მნიშვნელობა -mintxfee=&lt;amount&gt;: '%s'</translation>
-    </message>
     <message>
         <source>Send trace/debug info to console instead of debug.log file</source>
         <translation>ტრასირების/დახვეწის ინფოს გაგზავნა კონსოლზე debug.log ფაილის ნაცვლად</translation>
@@ -2389,10 +1304,6 @@
         <source>Zapping all transactions from wallet...</source>
         <translation>ტრანსაქციების ჩახსნა საფულიდან...</translation>
     </message>
-    <message>
-        <source>wallet.dat corrupt, salvage failed</source>
-        <translation>wallet.dat დაზიანებულია, აღდგენა ვერ მოხერხდა</translation>
-    </message>
     <message>
         <source>Password for JSON-RPC connections</source>
         <translation>პაროლი JSON-RPC-შეერთებისათვის</translation>
@@ -2401,10 +1312,6 @@
         <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
         <translation>კომანდის შესრულება უკეთესი ბლოკის გამოჩენისას (%s კომანდაში ჩანაცვლდება ბლოკის ჰეშით)</translation>
     </message>
-    <message>
-        <source>This help message</source>
-        <translation>ეს ტექსტი</translation>
-    </message>
     <message>
         <source>Allow DNS lookups for -addnode, -seednode and -connect</source>
         <translation>DNS-ძებნის დაშვება -addnode, -seednode და -connect-სათვის</translation>
@@ -2413,14 +1320,6 @@
         <source>Loading addresses...</source>
         <translation>მისამართების ჩატვირთვა...</translation>
     </message>
-    <message>
-        <source>Error loading wallet.dat: Wallet corrupted</source>
-        <translation>არ იტვირთება wallet.dat: საფულე დაზიანებულია</translation>
-    </message>
-    <message>
-        <source>Error loading wallet.dat</source>
-        <translation>არ იტვირთება wallet.dat</translation>
-    </message>
     <message>
         <source>Invalid -proxy address: '%s'</source>
         <translation>არასწორია მისამართი -proxy: '%s'</translation>
@@ -2429,18 +1328,6 @@
         <source>Unknown network specified in -onlynet: '%s'</source>
         <translation>-onlynet-ში მითითებულია უცნობი ქსელი: '%s'</translation>
     </message>
-    <message>
-        <source>Cannot resolve -bind address: '%s'</source>
-        <translation>ვერ ხერხდება -bind მისამართის გარკვევა: '%s'</translation>
-    </message>
-    <message>
-        <source>Cannot resolve -externalip address: '%s'</source>
-        <translation>ვერ ხერხდება -externalip მისამართის გარკვევა: '%s'</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -paytxfee=&lt;amount&gt;: '%s'</source>
-        <translation>დაუშვებელი მნიშვნელობა -paytxfee=&lt;amount&gt;: '%s'</translation>
-    </message>
     <message>
         <source>Insufficient funds</source>
         <translation>არ არის საკმარისი თანხა</translation>
diff --git a/src/qt/locale/bitcoin_kk_KZ.ts b/src/qt/locale/bitcoin_kk_KZ.ts
index cfa19d13f01e1..ff02521264f73 100644
--- a/src/qt/locale/bitcoin_kk_KZ.ts
+++ b/src/qt/locale/bitcoin_kk_KZ.ts
@@ -25,25 +25,6 @@
         <source>&amp;Delete</source>
         <translation>Жою</translation>
     </message>
-    <message>
-        <source>Comma separated file (*.csv)</source>
-        <translation>Үтірмен бөлінген текст (*.csv)</translation>
-    </message>
-    </context>
-<context>
-    <name>AddressTableModel</name>
-    <message>
-        <source>Label</source>
-        <translation>таңба</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>Адрес</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(таңбасыз)</translation>
-    </message>
 </context>
 <context>
     <name>AskPassphraseDialog</name>
@@ -59,31 +40,7 @@
         <source>Repeat new passphrase</source>
         <translation>Жаңа құпия сөзді қайта енгізу</translation>
     </message>
-    <message>
-        <source>Encrypt wallet</source>
-        <translation>Әмиянді шифрлау</translation>
-    </message>
-    <message>
-        <source>This operation needs your wallet passphrase to unlock the wallet.</source>
-        <translation>Бұл операциясы бойынша сіздің әмиянізді қоршаудан шығару үшін әмиянның құпия сөзі керек</translation>
-    </message>
-    <message>
-        <source>Unlock wallet</source>
-        <translation>Әмиянізді қоршаудан шығару</translation>
-    </message>
-    <message>
-        <source>This operation needs your wallet passphrase to decrypt the wallet.</source>
-        <translation>Бұл операциясы бойынша сіздің әмиянізді шифрлап тастау үшін әмиянның құпия сөзі керек</translation>
-    </message>
-    <message>
-        <source>Decrypt wallet</source>
-        <translation>Әмиянізді шифрлап тастау</translation>
-    </message>
-    <message>
-        <source>Change passphrase</source>
-        <translation>Құпия сөзді өзгерту</translation>
-    </message>
-    </context>
+</context>
 <context>
     <name>BanTableModel</name>
     </context>
@@ -174,9 +131,6 @@
         <translation>Жаңартылған</translation>
     </message>
     </context>
-<context>
-    <name>ClientModel</name>
-    </context>
 <context>
     <name>CoinControlDialog</name>
     <message>
@@ -219,15 +173,7 @@
         <source>Priority</source>
         <translation>Басымдық</translation>
     </message>
-    <message>
-        <source>no</source>
-        <translation>жоқ</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(таңбасыз)</translation>
-    </message>
-    </context>
+</context>
 <context>
     <name>EditAddressDialog</name>
     <message>
@@ -238,7 +184,7 @@
         <source>&amp;Address</source>
         <translation>Адрес</translation>
     </message>
-    </context>
+</context>
 <context>
     <name>FreespaceChecker</name>
     </context>
@@ -265,9 +211,6 @@
 <context>
     <name>OverviewPage</name>
     </context>
-<context>
-    <name>PaymentServer</name>
-    </context>
 <context>
     <name>PeerTableModel</name>
     </context>
@@ -278,9 +221,6 @@
         <translation>Саны</translation>
     </message>
     </context>
-<context>
-    <name>QRImageWidget</name>
-    </context>
 <context>
     <name>RPCConsole</name>
     <message>
@@ -297,37 +237,6 @@
     </context>
 <context>
     <name>ReceiveRequestDialog</name>
-    <message>
-        <source>Address</source>
-        <translation>Адрес</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>Саны</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>таңба</translation>
-    </message>
-    </context>
-<context>
-    <name>RecentRequestsTableModel</name>
-    <message>
-        <source>Date</source>
-        <translation>Күні</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>таңба</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>Саны</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(таңбасыз)</translation>
-    </message>
     </context>
 <context>
     <name>SendCoinsDialog</name>
@@ -351,10 +260,6 @@
         <source>Dust:</source>
         <translation>Шаң</translation>
     </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(таңбасыз)</translation>
-    </message>
     </context>
 <context>
     <name>SendCoinsEntry</name>
@@ -375,70 +280,12 @@
 <context>
     <name>TrafficGraphWidget</name>
     </context>
-<context>
-    <name>TransactionDesc</name>
-    <message>
-        <source>Date</source>
-        <translation>Күні</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>Саны</translation>
-    </message>
-    </context>
 <context>
     <name>TransactionDescDialog</name>
     </context>
-<context>
-    <name>TransactionTableModel</name>
-    <message>
-        <source>Date</source>
-        <translation>Күні</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>таңба</translation>
-    </message>
-    </context>
-<context>
-    <name>TransactionView</name>
-    <message>
-        <source>Comma separated file (*.csv)</source>
-        <translation>Үтірмен бөлінген файл (*.csv)</translation>
-    </message>
-    <message>
-        <source>Confirmed</source>
-        <translation>Растық</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation>Күні</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>таңба</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>Адрес</translation>
-    </message>
-    </context>
 <context>
     <name>UnitDisplayStatusBarControl</name>
     </context>
-<context>
-    <name>WalletFrame</name>
-    </context>
-<context>
-    <name>WalletModel</name>
-    </context>
-<context>
-    <name>WalletView</name>
-    <message>
-        <source>&amp;Export</source>
-        <translation>Экспорт</translation>
-    </message>
-    </context>
 <context>
     <name>bitcoin-core</name>
     <message>
diff --git a/src/qt/locale/bitcoin_ko_KR.ts b/src/qt/locale/bitcoin_ko_KR.ts
index 34aeafcd5ca94..11e5d35af2465 100644
--- a/src/qt/locale/bitcoin_ko_KR.ts
+++ b/src/qt/locale/bitcoin_ko_KR.ts
@@ -25,10 +25,6 @@
         <source>C&amp;lose</source>
         <translation>닫기(&amp;L)</translation>
     </message>
-    <message>
-        <source>&amp;Copy Address</source>
-        <translation>주소 복사(&amp;C)</translation>
-    </message>
     <message>
         <source>Delete the currently selected address from the list</source>
         <translation>현재 목록에 선택한 주소 삭제</translation>
@@ -45,73 +41,6 @@
         <source>&amp;Delete</source>
         <translation>삭제(&amp;D)</translation>
     </message>
-    <message>
-        <source>Choose the address to send coins to</source>
-        <translation>코인을 보내실 주소를 선택하세요</translation>
-    </message>
-    <message>
-        <source>Choose the address to receive coins with</source>
-        <translation>코인을 받으실 주소를 선택하세요</translation>
-    </message>
-    <message>
-        <source>C&amp;hoose</source>
-        <translation>선택하기(&amp;H)</translation>
-    </message>
-    <message>
-        <source>Sending addresses</source>
-        <translation>타인 계좌 주소목록</translation>
-    </message>
-    <message>
-        <source>Receiving addresses</source>
-        <translation>내 계좌 주소목록</translation>
-    </message>
-    <message>
-        <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source>
-        <translation>비트코인을 보내는 계좌 주소입니다. 코인을 보내기 전에 잔고와 받는 주소를 항상 확인하세요.</translation>
-    </message>
-    <message>
-        <source>These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source>
-        <translation>비트코인을 받을 수 있는 계좌 주소입니다. 매 거래마다 새로운 주소 사용을 권장합니다. </translation>
-    </message>
-    <message>
-        <source>Copy &amp;Label</source>
-        <translation>라벨 복사(&amp;L)</translation>
-    </message>
-    <message>
-        <source>&amp;Edit</source>
-        <translation>편집(&amp;E)</translation>
-    </message>
-    <message>
-        <source>Export Address List</source>
-        <translation>주소 목록 내보내기</translation>
-    </message>
-    <message>
-        <source>Comma separated file (*.csv)</source>
-        <translation>쉼표로 구분된 파일(*.csv)</translation>
-    </message>
-    <message>
-        <source>Exporting Failed</source>
-        <translation>내보내기 실패</translation>
-    </message>
-    <message>
-        <source>There was an error trying to save the address list to %1. Please try again.</source>
-        <translation>%1으로 주소 목록을 저장하는 동안 오류가 발생했습니다. 다시 시도해주세요.</translation>
-    </message>
-</context>
-<context>
-    <name>AddressTableModel</name>
-    <message>
-        <source>Label</source>
-        <translation>라벨</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>주소</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(라벨 없음)</translation>
-    </message>
 </context>
 <context>
     <name>AskPassphraseDialog</name>
@@ -131,94 +60,6 @@
         <source>Repeat new passphrase</source>
         <translation>새로운 암호 재확인</translation>
     </message>
-    <message>
-        <source>Encrypt wallet</source>
-        <translation>지갑 암호화</translation>
-    </message>
-    <message>
-        <source>This operation needs your wallet passphrase to unlock the wallet.</source>
-        <translation>이 작업을 실행하려면 사용자 지갑의 암호가 필요합니다.</translation>
-    </message>
-    <message>
-        <source>Unlock wallet</source>
-        <translation>지갑 잠금해제</translation>
-    </message>
-    <message>
-        <source>This operation needs your wallet passphrase to decrypt the wallet.</source>
-        <translation>이 작업은 지갑을 해독하기 위해 사용자 지갑의 암호가 필요합니다.</translation>
-    </message>
-    <message>
-        <source>Decrypt wallet</source>
-        <translation>지갑 해독</translation>
-    </message>
-    <message>
-        <source>Change passphrase</source>
-        <translation>암호 변경</translation>
-    </message>
-    <message>
-        <source>Confirm wallet encryption</source>
-        <translation>지갑 암호화 승인</translation>
-    </message>
-    <message>
-        <source>Warning: If you encrypt your wallet and lose your passphrase, you will &lt;b&gt;LOSE ALL OF YOUR BITCOINS&lt;/b&gt;!</source>
-        <translation>경고: 만약 암호화 된 지갑의 비밀번호를 잃어버릴 경우, &lt;b&gt;모든 비트코인들을 잃어버릴 수 있습니다&lt;/b&gt;!</translation>
-    </message>
-    <message>
-        <source>Are you sure you wish to encrypt your wallet?</source>
-        <translation>지갑 암호화를 허용하시겠습니까?</translation>
-    </message>
-    <message>
-        <source>Bitcoin Core will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source>
-        <translation>비트코인 코어는 암호화 과정을 마무리 하기 위해 종료됩니다. 당신의 지갑을 암호화하는 것이 여러분의 컴퓨터에 해를 끼치는 프로그램으로부터 여러분의 비트코인을 완전히 보호해주지는 못한다는 사실을 기억하십시오.</translation>
-    </message>
-    <message>
-        <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source>
-        <translation>중요: 본인 지갑파일에서 만든 예전 백업들은 새로 생성한 암호화 된 지갑 파일로 교체됩니다. 보안상 이유로 이전에 암호화 하지 않은 지갑 파일 백업은 사용할 수 없게 되니 빠른 시일 내로 새로 암호화 된 지갑을 사용하시기 바랍니다.</translation>
-    </message>
-    <message>
-        <source>Warning: The Caps Lock key is on!</source>
-        <translation>경고: Caps Lock키가 켜져있습니다!</translation>
-    </message>
-    <message>
-        <source>Wallet encrypted</source>
-        <translation>지갑 암호화 완료</translation>
-    </message>
-    <message>
-        <source>Enter the new passphrase to the wallet.&lt;br/&gt;Please use a passphrase of &lt;b&gt;ten or more random characters&lt;/b&gt;, or &lt;b&gt;eight or more words&lt;/b&gt;.</source>
-        <translation>지갑에 새로운 비밀문구를 입력하세요.&lt;br/&gt;비밀문구를 &lt;b&gt;열 개 이상의 무작위 글자&lt;/b&gt; 혹은 &lt;b&gt;여덟개 이상의 단어로&lt;b&gt; 정하세요.</translation>
-    </message>
-    <message>
-        <source>Enter the old passphrase and new passphrase to the wallet.</source>
-        <translation>지갑의 기존 암호와 새로운 암호를 입력해주세요.</translation>
-    </message>
-    <message>
-        <source>Wallet encryption failed</source>
-        <translation>지갑 암호화 실패</translation>
-    </message>
-    <message>
-        <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
-        <translation>지갑 암호화는 내부 오류로 인해 실패했습니다.  당신의 지갑은 암호화 되지 않았습니다.</translation>
-    </message>
-    <message>
-        <source>The supplied passphrases do not match.</source>
-        <translation>지정한 암호가 일치하지 않습니다.</translation>
-    </message>
-    <message>
-        <source>Wallet unlock failed</source>
-        <translation>지갑을 열지 못했습니다.</translation>
-    </message>
-    <message>
-        <source>The passphrase entered for the wallet decryption was incorrect.</source>
-        <translation>지갑 해독을 위한 암호가 틀렸습니다.</translation>
-    </message>
-    <message>
-        <source>Wallet decryption failed</source>
-        <translation>지갑 해독에 실패하였습니다.</translation>
-    </message>
-    <message>
-        <source>Wallet passphrase was successfully changed.</source>
-        <translation>지갑 비밀번호가 성공적으로 변경되었습니다.</translation>
-    </message>
 </context>
 <context>
     <name>BanTableModel</name>
@@ -305,14 +146,6 @@
         <source>Open &amp;URI...</source>
         <translation>&amp;URI 열기...</translation>
     </message>
-    <message>
-        <source>Bitcoin Core client</source>
-        <translation>비트코인 코어 클라이언트</translation>
-    </message>
-    <message>
-        <source>Importing blocks from disk...</source>
-        <translation>디스크에서 블록 가져오는 중...</translation>
-    </message>
     <message>
         <source>Reindexing blocks on disk...</source>
         <translation>디스크에서 블록 다시 색인중...</translation>
@@ -357,10 +190,6 @@
         <source>&amp;Receive</source>
         <translation>받기(&amp;R)</translation>
     </message>
-    <message>
-        <source>Show information about Bitcoin Core</source>
-        <translation>비트코인 코어에 관한 정보입니다.</translation>
-    </message>
     <message>
         <source>&amp;Show / Hide</source>
         <translation>보이기/숨기기(&amp;S)</translation>
@@ -397,22 +226,10 @@
         <source>Tabs toolbar</source>
         <translation>툴바 색인표</translation>
     </message>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>비트코인 코어</translation>
-    </message>
     <message>
         <source>Request payments (generates QR codes and bitcoin: URIs)</source>
         <translation>지불 요청하기 (QR코드와 비트코인이 생성됩니다: URIs)</translation>
     </message>
-    <message>
-        <source>&amp;About Bitcoin Core</source>
-        <translation>비트코인 코어 소개(&amp;A)</translation>
-    </message>
-    <message>
-        <source>Modify configuration options for Bitcoin Core</source>
-        <translation>비트코인 코어에 대한 설정을 수정합니다.</translation>
-    </message>
     <message>
         <source>Show the list of used sending addresses and labels</source>
         <translation>한번 이상 사용된 보내는 주소와 주소 제목의 목록을 보여줍니다.</translation>
@@ -429,10 +246,6 @@
         <source>&amp;Command-line options</source>
         <translation>명령줄 옵션(&amp;C)</translation>
     </message>
-    <message>
-        <source>Show the Bitcoin Core help message to get a list with possible Bitcoin command-line options</source>
-        <translation>사용할 수 있는 비트코인 명령줄 옵션 목록을 가져오기 위해 Bitcoin-Qt 도움말 메시지를 표시합니다.</translation>
-    </message>
     <message numerus="yes">
         <source>%n active connection(s) to Bitcoin network</source>
         <translation><numerusform>비트코인 네트워크에 %n개의 연결이 활성화되어 있습니다.</numerusform></translation>
@@ -544,13 +357,6 @@
         <translation>지갑이 암호화 되었고 현재 잠겨져 있습니다</translation>
     </message>
 </context>
-<context>
-    <name>ClientModel</name>
-    <message>
-        <source>Network Alert</source>
-        <translation>네트워크 경고</translation>
-    </message>
-</context>
 <context>
     <name>CoinControlDialog</name>
     <message>
@@ -629,150 +435,6 @@
         <source>Priority</source>
         <translation>우선순위</translation>
     </message>
-    <message>
-        <source>Copy address</source>
-        <translation>주소 복사하기</translation>
-    </message>
-    <message>
-        <source>Copy label</source>
-        <translation>라벨 복사하기</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>거래액 복사</translation>
-    </message>
-    <message>
-        <source>Copy transaction ID</source>
-        <translation>거래 아이디 복사</translation>
-    </message>
-    <message>
-        <source>Lock unspent</source>
-        <translation>비트코인이 사용되지 않은 주소를 잠금 처리합니다.</translation>
-    </message>
-    <message>
-        <source>Unlock unspent</source>
-        <translation>비트코인이 사용되지 않은 주소를 잠금 해제합니다. </translation>
-    </message>
-    <message>
-        <source>Copy quantity</source>
-        <translation>수량 복사</translation>
-    </message>
-    <message>
-        <source>Copy fee</source>
-        <translation>수수료 복사</translation>
-    </message>
-    <message>
-        <source>Copy after fee</source>
-        <translation>수수료 이후 복사</translation>
-    </message>
-    <message>
-        <source>Copy bytes</source>
-        <translation>bytes 복사</translation>
-    </message>
-    <message>
-        <source>Copy priority</source>
-        <translation>우선도 복사</translation>
-    </message>
-    <message>
-        <source>Copy dust</source>
-        <translation>더스트 복사</translation>
-    </message>
-    <message>
-        <source>Copy change</source>
-        <translation>잔돈 복사</translation>
-    </message>
-    <message>
-        <source>highest</source>
-        <translation>아주 높음</translation>
-    </message>
-    <message>
-        <source>higher</source>
-        <translation>보다 높음</translation>
-    </message>
-    <message>
-        <source>high</source>
-        <translation>높음</translation>
-    </message>
-    <message>
-        <source>medium-high</source>
-        <translation>약간 높음</translation>
-    </message>
-    <message>
-        <source>medium</source>
-        <translation>보통</translation>
-    </message>
-    <message>
-        <source>low-medium</source>
-        <translation>약간 낮음</translation>
-    </message>
-    <message>
-        <source>low</source>
-        <translation>낮음</translation>
-    </message>
-    <message>
-        <source>lower</source>
-        <translation>보다 낮음</translation>
-    </message>
-    <message>
-        <source>lowest</source>
-        <translation>아주 낮음</translation>
-    </message>
-    <message>
-        <source>(%1 locked)</source>
-        <translation>(%1 잠금)</translation>
-    </message>
-    <message>
-        <source>none</source>
-        <translation>없음</translation>
-    </message>
-    <message>
-        <source>This label turns red if the transaction size is greater than 1000 bytes.</source>
-        <translation>이 라벨은 1000바이트 이상의 거래가 이루어지면 붉게 변합니다.</translation>
-    </message>
-    <message>
-        <source>This label turns red if the priority is smaller than "medium".</source>
-        <translation>이 라벨은 우선순위가 "보통" 이하인 경우 붉게 변합니다.</translation>
-    </message>
-    <message>
-        <source>This label turns red if any recipient receives an amount smaller than %1.</source>
-        <translation>이 라벨은 수령인이 받은 액수가 잔고의 %1보다 작으면 붉게 변합니다.</translation>
-    </message>
-    <message>
-        <source>Can vary +/- %1 satoshi(s) per input.</source>
-        <translation>입력마다 +/- %1 사토시가 변할 수 있습니다.</translation>
-    </message>
-    <message>
-        <source>yes</source>
-        <translation>예</translation>
-    </message>
-    <message>
-        <source>no</source>
-        <translation>아니요</translation>
-    </message>
-    <message>
-        <source>This means a fee of at least %1 per kB is required.</source>
-        <translation>이 뜻은 최소한 1kB 당 %1의 수수료가 필요하다는 의미입니다.</translation>
-    </message>
-    <message>
-        <source>Can vary +/- 1 byte per input.</source>
-        <translation>입력마다 +/- 1 바이트가 변할 수 있습니다.</translation>
-    </message>
-    <message>
-        <source>Transactions with higher priority are more likely to get included into a block.</source>
-        <translation>우선 순위가 높은 거래의 경우 블럭에 포함될 가능성이 더 많습니다.</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(라벨 없음)</translation>
-    </message>
-    <message>
-        <source>change from %1 (%2)</source>
-        <translation>~로부터 변경 %1 (%2)</translation>
-    </message>
-    <message>
-        <source>(change)</source>
-        <translation>(잔돈)</translation>
-    </message>
 </context>
 <context>
     <name>EditAddressDialog</name>
@@ -796,38 +458,6 @@
         <source>&amp;Address</source>
         <translation>주소(&amp;A)</translation>
     </message>
-    <message>
-        <source>New receiving address</source>
-        <translation>새로 받는 주소</translation>
-    </message>
-    <message>
-        <source>New sending address</source>
-        <translation>새로 보내는 주소</translation>
-    </message>
-    <message>
-        <source>Edit receiving address</source>
-        <translation>받는 주소 편집</translation>
-    </message>
-    <message>
-        <source>Edit sending address</source>
-        <translation>보내는 주소 편집</translation>
-    </message>
-    <message>
-        <source>The entered address "%1" is already in the address book.</source>
-        <translation>입력된 주소는"%1" 이미 주소록에 있습니다.</translation>
-    </message>
-    <message>
-        <source>The entered address "%1" is not a valid Bitcoin address.</source>
-        <translation>입력한 "%1" 주소는 올바른 비트코인 주소가 아닙니다.</translation>
-    </message>
-    <message>
-        <source>Could not unlock wallet.</source>
-        <translation>지갑을 열 수 없습니다.</translation>
-    </message>
-    <message>
-        <source>New key generation failed.</source>
-        <translation>새로운 키 생성이 실패하였습니다.</translation>
-    </message>
 </context>
 <context>
     <name>FreespaceChecker</name>
@@ -854,10 +484,6 @@
 </context>
 <context>
     <name>HelpMessageDialog</name>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>비트코인 코어</translation>
-    </message>
     <message>
         <source>version</source>
         <translation>버전</translation>
@@ -866,10 +492,6 @@
         <source>(%1-bit)</source>
         <translation>(%1-비트)</translation>
     </message>
-    <message>
-        <source>About Bitcoin Core</source>
-        <translation>비트코인 코어 소개</translation>
-    </message>
     <message>
         <source>Command-line options</source>
         <translation>명령줄 옵션</translation>
@@ -906,29 +528,13 @@
         <source>Show splash screen on startup (default: %u)</source>
         <translation>실행시 시작화면 보기 (기본값: %u)</translation>
     </message>
-    <message>
-        <source>Reset all settings changes made over the GUI</source>
-        <translation>GUI를 통해 수정된 모든 설정을 초기화</translation>
-    </message>
-</context>
+    </context>
 <context>
     <name>Intro</name>
     <message>
         <source>Welcome</source>
         <translation>환영합니다</translation>
     </message>
-    <message>
-        <source>Welcome to Bitcoin Core.</source>
-        <translation>비트코인 코어에 오신것을 환영합니다.</translation>
-    </message>
-    <message>
-        <source>As this is the first time the program is launched, you can choose where Bitcoin Core will store its data.</source>
-        <translation>프로그램이 처음으로 실행되고 있습니다. 비트코인 코어가 어디에 데이터를 저장할지 선택할 수 있습니다. </translation>
-    </message>
-    <message>
-        <source>Bitcoin Core will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source>
-        <translation>비트코인 코어가 블럭체인의 복사본을 다운로드 저장합니다. 적어도 %1GB의 데이터가 이 폴더에 저장되며 시간이 경과할수록 점차 증가합니다. 그리고 지갑 또한 이 폴더에 저장됩니다. </translation>
-    </message>
     <message>
         <source>Use the default data directory</source>
         <translation>기본 데이터 폴더를 사용하기</translation>
@@ -937,10 +543,6 @@
         <source>Use a custom data directory:</source>
         <translation>커스텀 데이터 폴더 사용:</translation>
     </message>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>비트코인 코어</translation>
-    </message>
     <message>
         <source>Error: Specified data directory "%1" cannot be created.</source>
         <translation>오류: "%1" 지정한 데이터 디렉토리를 생성할 수 없습니다.</translation>
@@ -976,10 +578,6 @@
         <source>Select payment request file</source>
         <translation>지불 요청 파일을 선택하세요</translation>
     </message>
-    <message>
-        <source>Select payment request file to open</source>
-        <translation>지불 요청 파일을 열기 위해서 선택하세요</translation>
-    </message>
 </context>
 <context>
     <name>OptionsDialog</name>
@@ -1019,10 +617,6 @@
         <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Exit in the menu.</source>
         <translation>창을 닫으면 종료 대신 트레이로 보내기. 이 옵션을 활성화하면 메뉴에서 종료를 선택한 후에만 어플리케이션이 종료됩니다.</translation>
     </message>
-    <message>
-        <source>The user interface language can be set here. This setting will take effect after restarting Bitcoin Core.</source>
-        <translation>사용자 인터페이스 언어를 여기서 설정할 수 있습니다. 이 설정은 Bitcoin Core를 다시 시작할 때 적용됩니다.</translation>
-    </message>
     <message>
         <source>Third party URLs (e.g. a block explorer) that appear in the transactions tab as context menu items. %s in the URL is replaced by transaction hash. Multiple URLs are separated by vertical bar |.</source>
         <translation>서드-파티 URLs (예. 블록 탐색기)는 거래 탭의 컨텍스트 메뉴에 나타납니다. URL의 %s는 트랜잭션 해시값으로 대체됩니다. 여러 URLs는 수직 바 | 에서 나누어 집니다.</translation>
@@ -1047,14 +641,6 @@
         <source>&amp;Network</source>
         <translation>네트워크(&amp;N)</translation>
     </message>
-    <message>
-        <source>Automatically start Bitcoin Core after logging in to the system.</source>
-        <translation>시스템 로그인 후 자동으로 Bitcoin Core를 실행합니다.</translation>
-    </message>
-    <message>
-        <source>&amp;Start Bitcoin Core on system login</source>
-        <translation>시스템 로그인 후 Bitcoin Core 시작(&amp;S)</translation>
-    </message>
     <message>
         <source>(0 = auto, &lt;0 = leave that many cores free)</source>
         <translation>(0 = 자동, &lt;0 = 지정된 코어 개수만큼 사용 안함)</translation>
@@ -1284,182 +870,72 @@
     </message>
 </context>
 <context>
-    <name>PaymentServer</name>
+    <name>PeerTableModel</name>
     <message>
-        <source>URI handling</source>
-        <translation>URI 조작중</translation>
+        <source>User Agent</source>
+        <translation>유저 에이전트</translation>
     </message>
     <message>
-        <source>Invalid payment address %1</source>
-        <translation>잘못된 지불 주소입니다 %1</translation>
+        <source>Node/Service</source>
+        <translation>노드/서비스</translation>
     </message>
     <message>
-        <source>Payment request rejected</source>
-        <translation>지불 요청이 거부됨</translation>
+        <source>Ping Time</source>
+        <translation>Ping 시간</translation>
     </message>
+</context>
+<context>
+    <name>QObject</name>
     <message>
-        <source>Payment request network doesn't match client network.</source>
-        <translation>지급 요청 네트워크가 클라이언트 네트워크와 일치되지 않습니다.</translation>
+        <source>Amount</source>
+        <translation>거래액</translation>
     </message>
     <message>
-        <source>Payment request is not initialized.</source>
-        <translation>지불 요청이 초기화 되지 않았습니다.</translation>
+        <source>Enter a Bitcoin address (e.g. %1)</source>
+        <translation>비트코인 주소를 입력하기 (예. %1)</translation>
     </message>
     <message>
-        <source>Requested payment amount of %1 is too small (considered dust).</source>
-        <translation>요청한 금액 %1의 양이 너무 적습니다. (스팸성 거래로 간주)</translation>
+        <source>%1 d</source>
+        <translation>%1 일</translation>
     </message>
     <message>
-        <source>Payment request error</source>
-        <translation>지불 요청 오류</translation>
+        <source>%1 h</source>
+        <translation>%1 시간</translation>
     </message>
     <message>
-        <source>Cannot start bitcoin: click-to-pay handler</source>
-        <translation>비트코인을 시작할 수 없습니다: 지급제어기를 클릭하시오</translation>
+        <source>%1 m</source>
+        <translation>%1 분</translation>
     </message>
     <message>
-        <source>Payment request fetch URL is invalid: %1</source>
-        <translation>대금 청구서의 URL이 올바르지 않습니다: %1</translation>
+        <source>%1 s</source>
+        <translation>%1 초</translation>
     </message>
     <message>
-        <source>URI cannot be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source>
-        <translation>URI의 파싱에 문제가 발생했습니다. 잘못된 비트코인 주소나 URI 파라미터 구성에 오류가 존재할 수 있습니다.</translation>
+        <source>None</source>
+        <translation>없음</translation>
     </message>
     <message>
-        <source>Payment request file handling</source>
-        <translation>지불이 파일 처리를 요청합니다</translation>
+        <source>N/A</source>
+        <translation>없음</translation>
     </message>
     <message>
-        <source>Payment request file cannot be read! This can be caused by an invalid payment request file.</source>
-        <translation>지불 요청 파일을 읽을 수 없습니다. 이것은 잘못된 지불 요청 파일에 의해 발생하는 오류일 수 있습니다.</translation>
+        <source>%1 ms</source>
+        <translation>%1 ms</translation>
     </message>
+</context>
+<context>
+    <name>RPCConsole</name>
     <message>
-        <source>Payment request expired.</source>
-        <translation>지불 요청이 만료됨.</translation>
+        <source>Client name</source>
+        <translation>클라이언트 이름</translation>
     </message>
     <message>
-        <source>Unverified payment requests to custom payment scripts are unsupported.</source>
-        <translation>임의로 변경한 결제 스크립트 기반의 대금 청구서 양식은 검증되기 전까지는 지원되지 않습니다.</translation>
+        <source>N/A</source>
+        <translation>없음</translation>
     </message>
     <message>
-        <source>Invalid payment request.</source>
-        <translation>잘못된 지불 요청.</translation>
-    </message>
-    <message>
-        <source>Refund from %1</source>
-        <translation>%1 으로부터의 환불</translation>
-    </message>
-    <message>
-        <source>Payment request %1 is too large (%2 bytes, allowed %3 bytes).</source>
-        <translation>지불 요청 %1은 너무 큽니다 (%2 바이트, %3 바이트까지 허용됩니다).</translation>
-    </message>
-    <message>
-        <source>Error communicating with %1: %2</source>
-        <translation>%1과 소통하는데 오류: %2</translation>
-    </message>
-    <message>
-        <source>Payment request cannot be parsed!</source>
-        <translation>지불요청을 처리할 수 없습니다.</translation>
-    </message>
-    <message>
-        <source>Bad response from server %1</source>
-        <translation>서버로 부터 반응이 없습니다 %1</translation>
-    </message>
-    <message>
-        <source>Payment acknowledged</source>
-        <translation>지불이 승인됨</translation>
-    </message>
-    <message>
-        <source>Network request error</source>
-        <translation>네트워크 요청 오류</translation>
-    </message>
-</context>
-<context>
-    <name>PeerTableModel</name>
-    <message>
-        <source>User Agent</source>
-        <translation>유저 에이전트</translation>
-    </message>
-    <message>
-        <source>Node/Service</source>
-        <translation>노드/서비스</translation>
-    </message>
-    <message>
-        <source>Ping Time</source>
-        <translation>Ping 시간</translation>
-    </message>
-</context>
-<context>
-    <name>QObject</name>
-    <message>
-        <source>Amount</source>
-        <translation>거래액</translation>
-    </message>
-    <message>
-        <source>Enter a Bitcoin address (e.g. %1)</source>
-        <translation>비트코인 주소를 입력하기 (예. %1)</translation>
-    </message>
-    <message>
-        <source>%1 d</source>
-        <translation>%1 일</translation>
-    </message>
-    <message>
-        <source>%1 h</source>
-        <translation>%1 시간</translation>
-    </message>
-    <message>
-        <source>%1 m</source>
-        <translation>%1 분</translation>
-    </message>
-    <message>
-        <source>%1 s</source>
-        <translation>%1 초</translation>
-    </message>
-    <message>
-        <source>None</source>
-        <translation>없음</translation>
-    </message>
-    <message>
-        <source>N/A</source>
-        <translation>없음</translation>
-    </message>
-    <message>
-        <source>%1 ms</source>
-        <translation>%1 ms</translation>
-    </message>
-</context>
-<context>
-    <name>QRImageWidget</name>
-    <message>
-        <source>&amp;Save Image...</source>
-        <translation>이미지 저장(&amp;S)...</translation>
-    </message>
-    <message>
-        <source>&amp;Copy Image</source>
-        <translation>이미지 복사(&amp;C)</translation>
-    </message>
-    <message>
-        <source>Save QR Code</source>
-        <translation>QR코드 저장</translation>
-    </message>
-    <message>
-        <source>PNG Image (*.png)</source>
-        <translation>PNG 이미지 (*.png)</translation>
-    </message>
-</context>
-<context>
-    <name>RPCConsole</name>
-    <message>
-        <source>Client name</source>
-        <translation>클라이언트 이름</translation>
-    </message>
-    <message>
-        <source>N/A</source>
-        <translation>없음</translation>
-    </message>
-    <message>
-        <source>Client version</source>
-        <translation>클라이언트 버전</translation>
+        <source>Client version</source>
+        <translation>클라이언트 버전</translation>
     </message>
     <message>
         <source>&amp;Information</source>
@@ -1513,10 +989,6 @@
         <source>Memory usage</source>
         <translation>메모리 사용량</translation>
     </message>
-    <message>
-        <source>Open the Bitcoin Core debug log file from the current data directory. This can take a few seconds for large log files.</source>
-        <translation>현재의 데이터폴더에서 비트코인 디버그 파일을 엽니다. 용량이 큰 로그 파일은 몇 초가 걸릴 수 있습니다.</translation>
-    </message>
     <message>
         <source>Received</source>
         <translation>받음</translation>
@@ -1633,10 +1105,6 @@
         <source>Out:</source>
         <translation>Out:</translation>
     </message>
-    <message>
-        <source>Build date</source>
-        <translation>빌드 날짜</translation>
-    </message>
     <message>
         <source>Debug log file</source>
         <translation>로그 파일 디버그</translation>
@@ -1673,10 +1141,6 @@
         <source>&amp;Unban Node</source>
         <translation>노드 추방 취소(&amp;U)</translation>
     </message>
-    <message>
-        <source>Welcome to the Bitcoin Core RPC console.</source>
-        <translation>비트코인 RPC 콘솔에 오신걸 환영합니다</translation>
-    </message>
     <message>
         <source>Use up and down arrows to navigate history, and &lt;b&gt;Ctrl-L&lt;/b&gt; to clear screen.</source>
         <translation>기록을 찾아보려면 위 아래 화살표 키를, 화면을 지우려면 &lt;b&gt;Ctrl-L&lt;/b&gt;키를 사용하십시오.</translation>
@@ -1804,18 +1268,6 @@
         <source>Remove</source>
         <translation>삭제</translation>
     </message>
-    <message>
-        <source>Copy label</source>
-        <translation>라벨 복사하기</translation>
-    </message>
-    <message>
-        <source>Copy message</source>
-        <translation>메시지 복사</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>거래액 복사</translation>
-    </message>
 </context>
 <context>
     <name>ReceiveRequestDialog</name>
@@ -1835,73 +1287,6 @@
         <source>&amp;Save Image...</source>
         <translation>이미지 저장(&amp;S)...</translation>
     </message>
-    <message>
-        <source>Request payment to %1</source>
-        <translation>%1에 지불을 요청했습니다</translation>
-    </message>
-    <message>
-        <source>Payment information</source>
-        <translation>지불 정보</translation>
-    </message>
-    <message>
-        <source>URI</source>
-        <translation>URI</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>주소</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>거래액</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>라벨</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>메시지</translation>
-    </message>
-    <message>
-        <source>Resulting URI too long, try to reduce the text for label / message.</source>
-        <translation>URI 결과가 너무 길음, 라벨/메세지의 글을 줄이도록 하세요.</translation>
-    </message>
-    <message>
-        <source>Error encoding URI into QR Code.</source>
-        <translation>QR코드 인코딩 오류</translation>
-    </message>
-</context>
-<context>
-    <name>RecentRequestsTableModel</name>
-    <message>
-        <source>Date</source>
-        <translation>날짜</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>라벨</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>메시지</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>거래액</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(라벨 없음)</translation>
-    </message>
-    <message>
-        <source>(no message)</source>
-        <translation>(메세지가 없습니다)</translation>
-    </message>
-    <message>
-        <source>(no amount)</source>
-        <translation>(거래액 없음)</translation>
-    </message>
 </context>
 <context>
     <name>SendCoinsDialog</name>
@@ -1970,935 +1355,289 @@
         <translation>선택 하기...</translation>
     </message>
     <message>
-        <source>collapse fee-settings</source>
-        <translation>수수료 설정 접기</translation>
-    </message>
-    <message>
-        <source>per kilobyte</source>
-        <translation>킬로바이트 당</translation>
-    </message>
-    <message>
-        <source>If the custom fee is set to 1000 satoshis and the transaction is only 250 bytes, then "per kilobyte" only pays 250 satoshis in fee, while "total at least" pays 1000 satoshis. For transactions bigger than a kilobyte both pay by kilobyte.</source>
-        <translation>사용자 정의 수수료가 1000사토시로 지정된 경우 트랜잭션의 크기가 250바이트 일 경우 1킬로바이트당 250사토시만 지불되지만 "최소 수수료"에선 1000사토시가 지불됩니다. 1킬로바이트가 넘는 트랜잭션인 경우 어떠한 경우에든 1킬로바이트 기준으로 지불됩니다.</translation>
-    </message>
-    <message>
-        <source>Hide</source>
-        <translation>숨기기</translation>
-    </message>
-    <message>
-        <source>total at least</source>
-        <translation>최소 수수료</translation>
-    </message>
-    <message>
-        <source>Paying only the minimum fee is just fine as long as there is less transaction volume than space in the blocks. But be aware that this can end up in a never confirming transaction once there is more demand for bitcoin transactions than the network can process.</source>
-        <translation>블록의 용량보다 트랜잭션의 용량이 작은 경우에는 최소한의 수수료만으로도 충분합니다. 그러나 비트코인 네트워크의 처리량보다 더 많은 트랜잭션 요구는 영원히 검증이 안 될 수도 있습니다.</translation>
-    </message>
-    <message>
-        <source>(read the tooltip)</source>
-        <translation>(툴팁을 읽어보세요)</translation>
-    </message>
-    <message>
-        <source>Recommended:</source>
-        <translation>권장:</translation>
-    </message>
-    <message>
-        <source>Custom:</source>
-        <translation>사용자 정의:</translation>
-    </message>
-    <message>
-        <source>(Smart fee not initialized yet. This usually takes a few blocks...)</source>
-        <translation>(Smart fee가 아직 초기화되지 않았습니다. 블록 분석이 완료될 때 까지 기다려주십시오...)</translation>
-    </message>
-    <message>
-        <source>Confirmation time:</source>
-        <translation>승인 시간:</translation>
-    </message>
-    <message>
-        <source>normal</source>
-        <translation>일반</translation>
-    </message>
-    <message>
-        <source>fast</source>
-        <translation>빠름</translation>
-    </message>
-    <message>
-        <source>Send as zero-fee transaction if possible</source>
-        <translation>가능한 경우 수수료 없이 보내기</translation>
-    </message>
-    <message>
-        <source>(confirmation may take longer)</source>
-        <translation>(거래 검증이 오래 걸릴 수 있습니다)</translation>
-    </message>
-    <message>
-        <source>Send to multiple recipients at once</source>
-        <translation>다수의 수령인들에게 한번에 보내기</translation>
-    </message>
-    <message>
-        <source>Add &amp;Recipient</source>
-        <translation>수령인 추가하기(&amp;R)</translation>
-    </message>
-    <message>
-        <source>Clear all fields of the form.</source>
-        <translation>양식의 모든 필드를 지웁니다</translation>
-    </message>
-    <message>
-        <source>Dust:</source>
-        <translation>더스트:</translation>
-    </message>
-    <message>
-        <source>Clear &amp;All</source>
-        <translation>모두 지우기(&amp;A)</translation>
-    </message>
-    <message>
-        <source>Balance:</source>
-        <translation>잔액:</translation>
-    </message>
-    <message>
-        <source>Confirm the send action</source>
-        <translation>전송 기능 확인</translation>
-    </message>
-    <message>
-        <source>S&amp;end</source>
-        <translation>보내기(&amp;E)</translation>
-    </message>
-    <message>
-        <source>Confirm send coins</source>
-        <translation>코인 전송을 확인</translation>
-    </message>
-    <message>
-        <source>%1 to %2</source>
-        <translation>%1을(를) %2(으)로</translation>
-    </message>
-    <message>
-        <source>Copy quantity</source>
-        <translation>수량 복사</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>거래액 복사</translation>
-    </message>
-    <message>
-        <source>Copy fee</source>
-        <translation>수수료 복사</translation>
-    </message>
-    <message>
-        <source>Copy after fee</source>
-        <translation>수수료 이후 복사</translation>
-    </message>
-    <message>
-        <source>Copy bytes</source>
-        <translation>bytes 복사</translation>
-    </message>
-    <message>
-        <source>Copy priority</source>
-        <translation>우선도 복사</translation>
-    </message>
-    <message>
-        <source>Copy change</source>
-        <translation>잔돈 복사</translation>
-    </message>
-    <message>
-        <source>Total Amount %1</source>
-        <translation>총 액수 %1</translation>
-    </message>
-    <message>
-        <source>or</source>
-        <translation>또는</translation>
-    </message>
-    <message>
-        <source>The amount to pay must be larger than 0.</source>
-        <translation>지불하는 금액은 0 보다 커야 합니다.</translation>
-    </message>
-    <message>
-        <source>The amount exceeds your balance.</source>
-        <translation>잔고를 초과하였습니다.</translation>
-    </message>
-    <message>
-        <source>The total exceeds your balance when the %1 transaction fee is included.</source>
-        <translation>%1 의 거래수수료를 포함하면 잔고를 초과합니다.</translation>
-    </message>
-    <message>
-        <source>Transaction creation failed!</source>
-        <translation>거래를 생성하는 것을 실패하였습니다</translation>
-    </message>
-    <message>
-        <source>The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source>
-        <translation>거래가 거부되었습니다. 몇몇 코인들이 지갑에서 이미 사용된 경우, 예를 들어 코인을 이미 사용한  wallet.dat를 복사해서 사용한 경우 지금 지갑에 기록이 안되있어 이런 일이 생길 수 있습니다.</translation>
-    </message>
-    <message>
-        <source>A fee higher than %1 is considered an absurdly high fee.</source>
-        <translation>%1 보다 높은 수수료는 너무 높은 수수료 입니다.</translation>
-    </message>
-    <message>
-        <source>Payment request expired.</source>
-        <translation>지불 요청이 만료됨.</translation>
-    </message>
-    <message>
-        <source>Pay only the required fee of %1</source>
-        <translation>오직 %1 만의 수수료를 지불하기</translation>
-    </message>
-    <message numerus="yes">
-        <source>Estimated to begin confirmation within %n block(s).</source>
-        <translation><numerusform>%n 블록 안에 거래검증이 시작 될것으로 예상합니다.</numerusform></translation>
-    </message>
-    <message>
-        <source>The recipient address is not valid. Please recheck.</source>
-        <translation>수령인 주소가 정확하지 않습니다. 재확인 바랍니다</translation>
-    </message>
-    <message>
-        <source>Duplicate address found: addresses should only be used once each.</source>
-        <translation>두개 이상의 주소입니다: 한번에 하나의 주소에만 작업할 수 있습니다.</translation>
-    </message>
-    <message>
-        <source>Warning: Invalid Bitcoin address</source>
-        <translation>경고: 잘못된 비트코인주소입니다</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(라벨 없음)</translation>
-    </message>
-    <message>
-        <source>Warning: Unknown change address</source>
-        <translation>경고: 알려지지 않은 주소변경입니다</translation>
-    </message>
-    <message>
-        <source>Copy dust</source>
-        <translation>더스트 복사</translation>
-    </message>
-    <message>
-        <source>Are you sure you want to send?</source>
-        <translation>정말로 보내시겠습니까?</translation>
-    </message>
-    <message>
-        <source>added as transaction fee</source>
-        <translation>거래 수수료로 추가됨</translation>
-    </message>
-</context>
-<context>
-    <name>SendCoinsEntry</name>
-    <message>
-        <source>A&amp;mount:</source>
-        <translation>금액(&amp;M):</translation>
-    </message>
-    <message>
-        <source>Pay &amp;To:</source>
-        <translation>송금할 대상(&amp;T) : </translation>
-    </message>
-    <message>
-        <source>Enter a label for this address to add it to your address book</source>
-        <translation>주소록에 추가하려면 라벨을 입력하세요</translation>
-    </message>
-    <message>
-        <source>&amp;Label:</source>
-        <translation>라벨(&amp;L)</translation>
-    </message>
-    <message>
-        <source>Choose previously used address</source>
-        <translation>이전에 사용한 주소를 선택하십시오</translation>
-    </message>
-    <message>
-        <source>This is a normal payment.</source>
-        <translation>이것은 정상적인 지불입니다.</translation>
-    </message>
-    <message>
-        <source>The Bitcoin address to send the payment to</source>
-        <translation>이 비트코인 주소로 송금됩니다</translation>
-    </message>
-    <message>
-        <source>Alt+A</source>
-        <translation>Alt+A</translation>
-    </message>
-    <message>
-        <source>Paste address from clipboard</source>
-        <translation>클립보드로 부터 주소 붙여넣기</translation>
-    </message>
-    <message>
-        <source>Alt+P</source>
-        <translation>Alt+P</translation>
-    </message>
-    <message>
-        <source>Remove this entry</source>
-        <translation>항목을 지웁니다</translation>
-    </message>
-    <message>
-        <source>The fee will be deducted from the amount being sent. The recipient will receive less bitcoins than you enter in the amount field. If multiple recipients are selected, the fee is split equally.</source>
-        <translation>수수료가 송금되는 금액에서 공제됩니다. 수령자는 금액 필드에서 입력한 금액보다 적은 금액을 전송받게 됩니다. 받는 사람이 여러 명인 경우 수수료는 균등하게 나누어집니다.</translation>
-    </message>
-    <message>
-        <source>S&amp;ubtract fee from amount</source>
-        <translation>송금액에서 수수료 공제(&amp;U)</translation>
-    </message>
-    <message>
-        <source>Message:</source>
-        <translation>메시지:</translation>
-    </message>
-    <message>
-        <source>This is an unauthenticated payment request.</source>
-        <translation>인증 되지 않은 지급 요청입니다.</translation>
-    </message>
-    <message>
-        <source>This is an authenticated payment request.</source>
-        <translation>인증 된 지급 요청 입니다.</translation>
-    </message>
-    <message>
-        <source>Enter a label for this address to add it to the list of used addresses</source>
-        <translation>사용된 주소 목록에 새 주소를 추가하기 위해 라벨 이름을 입력해 주세요. </translation>
-    </message>
-    <message>
-        <source>A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
-        <translation>비트코인에 첨부된 메시지: 참고용으로 거래와 함께 저장될 URI. 메모: 이 메시지는 비트코인 네트워크로 전송되지 않습니다.</translation>
-    </message>
-    <message>
-        <source>Pay To:</source>
-        <translation>송금할 대상 : </translation>
-    </message>
-    <message>
-        <source>Memo:</source>
-        <translation>메모:</translation>
-    </message>
-</context>
-<context>
-    <name>ShutdownWindow</name>
-    <message>
-        <source>Bitcoin Core is shutting down...</source>
-        <translation>Bitcoin Core이 종료 중입니다...</translation>
-    </message>
-    <message>
-        <source>Do not shut down the computer until this window disappears.</source>
-        <translation>창이 사라지기 전까지 컴퓨터를 끄지마시오.</translation>
-    </message>
-</context>
-<context>
-    <name>SignVerifyMessageDialog</name>
-    <message>
-        <source>Signatures - Sign / Verify a Message</source>
-        <translation>서명 - 싸인 / 메시지 확인</translation>
-    </message>
-    <message>
-        <source>&amp;Sign Message</source>
-        <translation>메시지 서명(&amp;S)</translation>
-    </message>
-    <message>
-        <source>You can sign messages/agreements with your addresses to prove you can receive bitcoins sent to them. Be careful not to sign anything vague or random, as phishing attacks may try to trick you into signing your identity over to them. Only sign fully-detailed statements you agree to.</source>
-        <translation>여러분 자신을 증명하기 위해 주소를 첨가하고 서명할 수 있습니다. 피싱 공격으로 말미암아 여러분의 서명을 통해 속아 넘어가게 할 수 있으므로, 서명하지 않은 모든 모호한 요소를 주의하십시오. 조항들이 완전 무결한지 확인 후 동의하는 경우에만 서명하십시오.</translation>
-    </message>
-    <message>
-        <source>The Bitcoin address to sign the message with</source>
-        <translation>메세지를 서명한 비트코인 주소</translation>
-    </message>
-    <message>
-        <source>Choose previously used address</source>
-        <translation>이전에 사용한 주소를 선택하십시오</translation>
-    </message>
-    <message>
-        <source>Alt+A</source>
-        <translation>Alt+A</translation>
-    </message>
-    <message>
-        <source>Paste address from clipboard</source>
-        <translation>클립보드로 부터 주소를 복사하기</translation>
-    </message>
-    <message>
-        <source>Alt+P</source>
-        <translation>Alt+P</translation>
-    </message>
-    <message>
-        <source>Enter the message you want to sign here</source>
-        <translation>여기에 서명하려는 메시지를 입력하십시오</translation>
-    </message>
-    <message>
-        <source>Signature</source>
-        <translation>서명</translation>
-    </message>
-    <message>
-        <source>Copy the current signature to the system clipboard</source>
-        <translation>현재 서명을 시스템 클립보드에 복사</translation>
-    </message>
-    <message>
-        <source>Sign the message to prove you own this Bitcoin address</source>
-        <translation>여러분의 비트코인 주소를 증명하려면 메시지 서명하십시오</translation>
-    </message>
-    <message>
-        <source>Sign &amp;Message</source>
-        <translation>메시지에 서명(&amp;M)</translation>
-    </message>
-    <message>
-        <source>Reset all sign message fields</source>
-        <translation>메시지 필드의 모든 서명 재설정</translation>
-    </message>
-    <message>
-        <source>Clear &amp;All</source>
-        <translation>모두 지우기(&amp;A)</translation>
-    </message>
-    <message>
-        <source>&amp;Verify Message</source>
-        <translation>메시지 검증(&amp;V)</translation>
-    </message>
-    <message>
-        <source>Enter the receiver's address, message (ensure you copy line breaks, spaces, tabs, etc. exactly) and signature below to verify the message. Be careful not to read more into the signature than what is in the signed message itself, to avoid being tricked by a man-in-the-middle attack. Note that this only proves the signing party receives with the address, it cannot prove sendership of any transaction!</source>
-        <translation>메시지를 검증하기 위해 아래 칸에 각각 지갑 주소와 메시지, 전자서명을 입력하세요. (메시지 원본의 띄어쓰기, 들여쓰기, 행 나눔 등이 정확하게 입력되어야 하므로 원본을 복사해서 입력하세요) 이 기능은 메시지 검증이 주 목적이며, 네트워크 침입자에 의해 변조되지 않도록 전자서명 해독에 불필요한 시간을 소모하지 마세요. </translation>
-    </message>
-    <message>
-        <source>The Bitcoin address the message was signed with</source>
-        <translation>메세지의 서명에 사용된 비트코인 주소</translation>
-    </message>
-    <message>
-        <source>Verify the message to ensure it was signed with the specified Bitcoin address</source>
-        <translation>정확한 비트코인주소가 입력됬는지 메시지를 확인하시오</translation>
-    </message>
-    <message>
-        <source>Verify &amp;Message</source>
-        <translation>메시지 검증(&amp;M)</translation>
-    </message>
-    <message>
-        <source>Reset all verify message fields</source>
-        <translation>모든 검증 메시지 필드 재설정</translation>
-    </message>
-    <message>
-        <source>Click "Sign Message" to generate signature</source>
-        <translation>서명을 만들려면 "메시지 서명"을 누르십시오</translation>
-    </message>
-    <message>
-        <source>The entered address is invalid.</source>
-        <translation>입력한 주소가 잘못되었습니다.</translation>
-    </message>
-    <message>
-        <source>Please check the address and try again.</source>
-        <translation>주소를 확인하고 다시 시도하십시오.</translation>
-    </message>
-    <message>
-        <source>The entered address does not refer to a key.</source>
-        <translation>입력한 주소는 키에서 참조하지 않습니다.</translation>
-    </message>
-    <message>
-        <source>Wallet unlock was cancelled.</source>
-        <translation>지갑 잠금 해제를 취소했습니다.</translation>
-    </message>
-    <message>
-        <source>Private key for the entered address is not available.</source>
-        <translation>입력한 주소에 대한 개인키가 없습니다.</translation>
-    </message>
-    <message>
-        <source>Message signing failed.</source>
-        <translation>메시지 서명에 실패했습니다.</translation>
-    </message>
-    <message>
-        <source>Message signed.</source>
-        <translation>메시지를 서명했습니다.</translation>
-    </message>
-    <message>
-        <source>The signature could not be decoded.</source>
-        <translation>서명을 해독할 수 없습니다.</translation>
-    </message>
-    <message>
-        <source>Please check the signature and try again.</source>
-        <translation>서명을 확인하고 다시 시도하십시오.</translation>
-    </message>
-    <message>
-        <source>The signature did not match the message digest.</source>
-        <translation>메시지 다이제스트와 서명이 일치하지 않습니다.</translation>
-    </message>
-    <message>
-        <source>Message verification failed.</source>
-        <translation>메시지 검증에 실패했습니다.</translation>
-    </message>
-    <message>
-        <source>Message verified.</source>
-        <translation>메시지를 검증했습니다.</translation>
-    </message>
-</context>
-<context>
-    <name>SplashScreen</name>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>비트코인 코어</translation>
-    </message>
-    <message>
-        <source>The Bitcoin Core developers</source>
-        <translation>비트코인코어 개발자들</translation>
-    </message>
-    <message>
-        <source>[testnet]</source>
-        <translation>[테스트넷]</translation>
-    </message>
-</context>
-<context>
-    <name>TrafficGraphWidget</name>
-    <message>
-        <source>KB/s</source>
-        <translation>KB/s</translation>
-    </message>
-</context>
-<context>
-    <name>TransactionDesc</name>
-    <message>
-        <source>Open until %1</source>
-        <translation>%1 까지 열림</translation>
-    </message>
-    <message>
-        <source>conflicted</source>
-        <translation>충돌</translation>
-    </message>
-    <message>
-        <source>%1/offline</source>
-        <translation>%1/오프라인</translation>
-    </message>
-    <message>
-        <source>%1/unconfirmed</source>
-        <translation>%1/미확인</translation>
-    </message>
-    <message>
-        <source>%1 confirmations</source>
-        <translation>%1 확인됨</translation>
-    </message>
-    <message>
-        <source>Status</source>
-        <translation>상태</translation>
-    </message>
-    <message numerus="yes">
-        <source>, broadcast through %n node(s)</source>
-        <translation><numerusform>%n 노드를 거쳐 전파합니다.</numerusform></translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation>날짜</translation>
-    </message>
-    <message>
-        <source>Source</source>
-        <translation>소스</translation>
-    </message>
-    <message>
-        <source>Generated</source>
-        <translation>생성하다</translation>
-    </message>
-    <message>
-        <source>From</source>
-        <translation>으로부터</translation>
-    </message>
-    <message>
-        <source>To</source>
-        <translation>에게</translation>
-    </message>
-    <message>
-        <source>own address</source>
-        <translation>자신의 주소</translation>
-    </message>
-    <message>
-        <source>watch-only</source>
-        <translation>모니터링 지갑</translation>
-    </message>
-    <message>
-        <source>label</source>
-        <translation>라벨</translation>
-    </message>
-    <message>
-        <source>Credit</source>
-        <translation>예금</translation>
-    </message>
-    <message numerus="yes">
-        <source>matures in %n more block(s)</source>
-        <translation><numerusform>%n개 블럭 후에 코인 숙성이 완료됩니다.</numerusform></translation>
-    </message>
-    <message>
-        <source>not accepted</source>
-        <translation>허용되지 않는다</translation>
-    </message>
-    <message>
-        <source>Debit</source>
-        <translation>차변</translation>
-    </message>
-    <message>
-        <source>Total debit</source>
-        <translation>총 출금액</translation>
-    </message>
-    <message>
-        <source>Total credit</source>
-        <translation>총 입금액</translation>
-    </message>
-    <message>
-        <source>Transaction fee</source>
-        <translation>송금 수수료</translation>
-    </message>
-    <message>
-        <source>Net amount</source>
-        <translation>총 거래액</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>메시지</translation>
-    </message>
-    <message>
-        <source>Comment</source>
-        <translation>설명</translation>
-    </message>
-    <message>
-        <source>Transaction ID</source>
-        <translation>아이디</translation>
-    </message>
-    <message>
-        <source>Merchant</source>
-        <translation>상인</translation>
-    </message>
-    <message>
-        <source>Generated coins must mature %1 blocks before they can be spent. When you generated this block, it was broadcast to the network to be added to the block chain. If it fails to get into the chain, its state will change to "not accepted" and it won't be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source>
-        <translation>신규 채굴된 코인이 사용되기 위해서는 %1 개의 블럭이 경과되어야 합니다. 블럭을 생성할 때 블럭체인에 추가되도록 네트워크에 전파되는 과정을 거치는데, 블럭체인에 포함되지 못하고 실패한다면 해당 블럭의 상태는 '미승인'으로 표현되고 비트코인 또한 사용될 수 없습니다. 이 현상은 다른 노드가 비슷한 시간대에 동시에 블럭을 생성할 때 종종 발생할 수 있습니다. </translation>
-    </message>
-    <message>
-        <source>Debug information</source>
-        <translation>디버깅 정보</translation>
-    </message>
-    <message>
-        <source>Transaction</source>
-        <translation>송금</translation>
-    </message>
-    <message>
-        <source>Inputs</source>
-        <translation>입력</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>거래액</translation>
-    </message>
-    <message>
-        <source>true</source>
-        <translation>참</translation>
-    </message>
-    <message>
-        <source>false</source>
-        <translation>거짓</translation>
-    </message>
-    <message>
-        <source>, has not been successfully broadcast yet</source>
-        <translation>. 아직 성공적으로 통보하지 않음</translation>
-    </message>
-    <message numerus="yes">
-        <source>Open for %n more block(s)</source>
-        <translation><numerusform>%n 개의 추가 블록을 읽습니다.</numerusform></translation>
-    </message>
-    <message>
-        <source>unknown</source>
-        <translation>알수없음</translation>
-    </message>
-</context>
-<context>
-    <name>TransactionDescDialog</name>
-    <message>
-        <source>Transaction details</source>
-        <translation>거래 세부 내역</translation>
-    </message>
-    <message>
-        <source>This pane shows a detailed description of the transaction</source>
-        <translation>이 창은 거래의 세부내역을 보여줍니다</translation>
-    </message>
-</context>
-<context>
-    <name>TransactionTableModel</name>
-    <message>
-        <source>Date</source>
-        <translation>날짜</translation>
+        <source>collapse fee-settings</source>
+        <translation>수수료 설정 접기</translation>
     </message>
     <message>
-        <source>Type</source>
-        <translation>종류</translation>
+        <source>per kilobyte</source>
+        <translation>킬로바이트 당</translation>
     </message>
     <message>
-        <source>Immature (%1 confirmations, will be available after %2)</source>
-        <translation>충분히 숙성되지 않은 상태 (%1 승인, %2 후에 사용 가능합니다)</translation>
+        <source>If the custom fee is set to 1000 satoshis and the transaction is only 250 bytes, then "per kilobyte" only pays 250 satoshis in fee, while "total at least" pays 1000 satoshis. For transactions bigger than a kilobyte both pay by kilobyte.</source>
+        <translation>사용자 정의 수수료가 1000사토시로 지정된 경우 트랜잭션의 크기가 250바이트 일 경우 1킬로바이트당 250사토시만 지불되지만 "최소 수수료"에선 1000사토시가 지불됩니다. 1킬로바이트가 넘는 트랜잭션인 경우 어떠한 경우에든 1킬로바이트 기준으로 지불됩니다.</translation>
     </message>
-    <message numerus="yes">
-        <source>Open for %n more block(s)</source>
-        <translation><numerusform>%n 개의 추가 블록을 읽습니다.</numerusform></translation>
+    <message>
+        <source>Hide</source>
+        <translation>숨기기</translation>
     </message>
     <message>
-        <source>Open until %1</source>
-        <translation>%1 까지 열림</translation>
+        <source>total at least</source>
+        <translation>최소 수수료</translation>
     </message>
     <message>
-        <source>Confirmed (%1 confirmations)</source>
-        <translation>확인됨 (%1 확인됨)</translation>
+        <source>Paying only the minimum fee is just fine as long as there is less transaction volume than space in the blocks. But be aware that this can end up in a never confirming transaction once there is more demand for bitcoin transactions than the network can process.</source>
+        <translation>블록의 용량보다 트랜잭션의 용량이 작은 경우에는 최소한의 수수료만으로도 충분합니다. 그러나 비트코인 네트워크의 처리량보다 더 많은 트랜잭션 요구는 영원히 검증이 안 될 수도 있습니다.</translation>
     </message>
     <message>
-        <source>This block was not received by any other nodes and will probably not be accepted!</source>
-        <translation>이 블럭은 다른 노드로부터 받지 않아 허용되지 않을 것임.</translation>
+        <source>(read the tooltip)</source>
+        <translation>(툴팁을 읽어보세요)</translation>
     </message>
     <message>
-        <source>Generated but not accepted</source>
-        <translation>생성되었으나 거절됨</translation>
+        <source>Recommended:</source>
+        <translation>권장:</translation>
     </message>
     <message>
-        <source>Offline</source>
-        <translation>오프라인</translation>
+        <source>Custom:</source>
+        <translation>사용자 정의:</translation>
     </message>
     <message>
-        <source>Label</source>
-        <translation>라벨</translation>
+        <source>(Smart fee not initialized yet. This usually takes a few blocks...)</source>
+        <translation>(Smart fee가 아직 초기화되지 않았습니다. 블록 분석이 완료될 때 까지 기다려주십시오...)</translation>
     </message>
     <message>
-        <source>Unconfirmed</source>
-        <translation>미확인</translation>
+        <source>Confirmation time:</source>
+        <translation>승인 시간:</translation>
     </message>
     <message>
-        <source>Confirming (%1 of %2 recommended confirmations)</source>
-        <translation>승인 중 (권장되는 승인 회수 %2 대비 현재 승인 수 %1)</translation>
+        <source>normal</source>
+        <translation>일반</translation>
     </message>
     <message>
-        <source>Conflicted</source>
-        <translation>충돌</translation>
+        <source>fast</source>
+        <translation>빠름</translation>
     </message>
     <message>
-        <source>Received with</source>
-        <translation>보낸 주소</translation>
+        <source>Send to multiple recipients at once</source>
+        <translation>다수의 수령인들에게 한번에 보내기</translation>
     </message>
     <message>
-        <source>Received from</source>
-        <translation>보낸 주소</translation>
+        <source>Add &amp;Recipient</source>
+        <translation>수령인 추가하기(&amp;R)</translation>
     </message>
     <message>
-        <source>Sent to</source>
-        <translation>받는 주소</translation>
+        <source>Clear all fields of the form.</source>
+        <translation>양식의 모든 필드를 지웁니다</translation>
     </message>
     <message>
-        <source>Payment to yourself</source>
-        <translation>자신에게 지불</translation>
+        <source>Dust:</source>
+        <translation>더스트:</translation>
     </message>
     <message>
-        <source>Mined</source>
-        <translation>채굴</translation>
+        <source>Clear &amp;All</source>
+        <translation>모두 지우기(&amp;A)</translation>
     </message>
     <message>
-        <source>watch-only</source>
-        <translation>모니터링 지갑</translation>
+        <source>Balance:</source>
+        <translation>잔액:</translation>
     </message>
     <message>
-        <source>(n/a)</source>
-        <translation>(없음)</translation>
+        <source>Confirm the send action</source>
+        <translation>전송 기능 확인</translation>
     </message>
     <message>
-        <source>Transaction status. Hover over this field to show number of confirmations.</source>
-        <translation>거래상황. 마우스를 올리면 검증횟수가 표시됩니다.</translation>
+        <source>S&amp;end</source>
+        <translation>보내기(&amp;E)</translation>
     </message>
+</context>
+<context>
+    <name>SendCoinsEntry</name>
     <message>
-        <source>Date and time that the transaction was received.</source>
-        <translation>거래가 이루어진 날짜와 시각.</translation>
+        <source>A&amp;mount:</source>
+        <translation>금액(&amp;M):</translation>
     </message>
     <message>
-        <source>Type of transaction.</source>
-        <translation>거래의 종류.</translation>
+        <source>Pay &amp;To:</source>
+        <translation>송금할 대상(&amp;T) : </translation>
     </message>
     <message>
-        <source>Whether or not a watch-only address is involved in this transaction.</source>
-        <translation>이 트랜잭션에 모니터링 지갑를 포함할지의 여부입니다.</translation>
+        <source>&amp;Label:</source>
+        <translation>라벨(&amp;L)</translation>
     </message>
     <message>
-        <source>User-defined intent/purpose of the transaction.</source>
-        <translation>트랜잭션에 대한 사용자 정의 intent/purpose</translation>
+        <source>Choose previously used address</source>
+        <translation>이전에 사용한 주소를 선택하십시오</translation>
     </message>
     <message>
-        <source>Amount removed from or added to balance.</source>
-        <translation>변경된 잔고.</translation>
+        <source>This is a normal payment.</source>
+        <translation>이것은 정상적인 지불입니다.</translation>
     </message>
-</context>
-<context>
-    <name>TransactionView</name>
     <message>
-        <source>All</source>
-        <translation>전체</translation>
+        <source>The Bitcoin address to send the payment to</source>
+        <translation>이 비트코인 주소로 송금됩니다</translation>
     </message>
     <message>
-        <source>Today</source>
-        <translation>오늘</translation>
+        <source>Alt+A</source>
+        <translation>Alt+A</translation>
     </message>
     <message>
-        <source>This week</source>
-        <translation>이번주</translation>
+        <source>Paste address from clipboard</source>
+        <translation>클립보드로 부터 주소 붙여넣기</translation>
     </message>
     <message>
-        <source>This month</source>
-        <translation>이번 달</translation>
+        <source>Alt+P</source>
+        <translation>Alt+P</translation>
     </message>
     <message>
-        <source>Last month</source>
-        <translation>지난 달</translation>
+        <source>Remove this entry</source>
+        <translation>항목을 지웁니다</translation>
     </message>
     <message>
-        <source>This year</source>
-        <translation>올 해</translation>
+        <source>The fee will be deducted from the amount being sent. The recipient will receive less bitcoins than you enter in the amount field. If multiple recipients are selected, the fee is split equally.</source>
+        <translation>수수료가 송금되는 금액에서 공제됩니다. 수령자는 금액 필드에서 입력한 금액보다 적은 금액을 전송받게 됩니다. 받는 사람이 여러 명인 경우 수수료는 균등하게 나누어집니다.</translation>
     </message>
     <message>
-        <source>Range...</source>
-        <translation>범위...</translation>
+        <source>S&amp;ubtract fee from amount</source>
+        <translation>송금액에서 수수료 공제(&amp;U)</translation>
     </message>
     <message>
-        <source>Received with</source>
-        <translation>보낸 주소</translation>
+        <source>Message:</source>
+        <translation>메시지:</translation>
     </message>
     <message>
-        <source>Sent to</source>
-        <translation>받는 주소</translation>
+        <source>This is an unauthenticated payment request.</source>
+        <translation>인증 되지 않은 지급 요청입니다.</translation>
     </message>
     <message>
-        <source>To yourself</source>
-        <translation>자기거래</translation>
+        <source>This is an authenticated payment request.</source>
+        <translation>인증 된 지급 요청 입니다.</translation>
     </message>
     <message>
-        <source>Mined</source>
-        <translation>채굴</translation>
+        <source>Enter a label for this address to add it to the list of used addresses</source>
+        <translation>사용된 주소 목록에 새 주소를 추가하기 위해 라벨 이름을 입력해 주세요. </translation>
     </message>
     <message>
-        <source>Other</source>
-        <translation>기타</translation>
+        <source>A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
+        <translation>비트코인에 첨부된 메시지: 참고용으로 거래와 함께 저장될 URI. 메모: 이 메시지는 비트코인 네트워크로 전송되지 않습니다.</translation>
     </message>
     <message>
-        <source>Enter address or label to search</source>
-        <translation>검색하기 위한 주소 또는 표 입력</translation>
+        <source>Pay To:</source>
+        <translation>송금할 대상 : </translation>
     </message>
     <message>
-        <source>Min amount</source>
-        <translation>최소 거래액</translation>
+        <source>Memo:</source>
+        <translation>메모:</translation>
     </message>
+</context>
+<context>
+    <name>ShutdownWindow</name>
     <message>
-        <source>Copy address</source>
-        <translation>주소 복사하기</translation>
+        <source>Do not shut down the computer until this window disappears.</source>
+        <translation>창이 사라지기 전까지 컴퓨터를 끄지마시오.</translation>
     </message>
+</context>
+<context>
+    <name>SignVerifyMessageDialog</name>
     <message>
-        <source>Copy label</source>
-        <translation>라벨 복사하기</translation>
+        <source>Signatures - Sign / Verify a Message</source>
+        <translation>서명 - 싸인 / 메시지 확인</translation>
     </message>
     <message>
-        <source>Copy amount</source>
-        <translation>거래액 복사</translation>
+        <source>&amp;Sign Message</source>
+        <translation>메시지 서명(&amp;S)</translation>
     </message>
     <message>
-        <source>Copy transaction ID</source>
-        <translation>거래 아이디 복사</translation>
+        <source>You can sign messages/agreements with your addresses to prove you can receive bitcoins sent to them. Be careful not to sign anything vague or random, as phishing attacks may try to trick you into signing your identity over to them. Only sign fully-detailed statements you agree to.</source>
+        <translation>여러분 자신을 증명하기 위해 주소를 첨가하고 서명할 수 있습니다. 피싱 공격으로 말미암아 여러분의 서명을 통해 속아 넘어가게 할 수 있으므로, 서명하지 않은 모든 모호한 요소를 주의하십시오. 조항들이 완전 무결한지 확인 후 동의하는 경우에만 서명하십시오.</translation>
     </message>
     <message>
-        <source>Copy raw transaction</source>
-        <translation>로우 트랜잭션 복사</translation>
+        <source>The Bitcoin address to sign the message with</source>
+        <translation>메세지를 서명한 비트코인 주소</translation>
     </message>
     <message>
-        <source>Edit label</source>
-        <translation>라벨 수정하기</translation>
+        <source>Choose previously used address</source>
+        <translation>이전에 사용한 주소를 선택하십시오</translation>
     </message>
     <message>
-        <source>Show transaction details</source>
-        <translation>거래 내역 확인</translation>
+        <source>Alt+A</source>
+        <translation>Alt+A</translation>
     </message>
     <message>
-        <source>Export Transaction History</source>
-        <translation>거래 기록 내보내기</translation>
+        <source>Paste address from clipboard</source>
+        <translation>클립보드로 부터 주소를 복사하기</translation>
     </message>
     <message>
-        <source>Watch-only</source>
-        <translation>모니터링 지갑</translation>
+        <source>Alt+P</source>
+        <translation>Alt+P</translation>
     </message>
     <message>
-        <source>Exporting Failed</source>
-        <translation>내보내기 실패</translation>
+        <source>Enter the message you want to sign here</source>
+        <translation>여기에 서명하려는 메시지를 입력하십시오</translation>
     </message>
     <message>
-        <source>There was an error trying to save the transaction history to %1.</source>
-        <translation>%1으로 거래 기록을 저장하는데 오류가 있었습니다.</translation>
+        <source>Signature</source>
+        <translation>서명</translation>
     </message>
     <message>
-        <source>Exporting Successful</source>
-        <translation>내보내기 성공</translation>
+        <source>Copy the current signature to the system clipboard</source>
+        <translation>현재 서명을 시스템 클립보드에 복사</translation>
     </message>
     <message>
-        <source>The transaction history was successfully saved to %1.</source>
-        <translation>거래 기록이 성공적으로 %1에 저장되었습니다.</translation>
+        <source>Sign the message to prove you own this Bitcoin address</source>
+        <translation>여러분의 비트코인 주소를 증명하려면 메시지 서명하십시오</translation>
     </message>
     <message>
-        <source>Comma separated file (*.csv)</source>
-        <translation>각각의 파일에 쉼표하기(*.csv)</translation>
+        <source>Sign &amp;Message</source>
+        <translation>메시지에 서명(&amp;M)</translation>
     </message>
     <message>
-        <source>Confirmed</source>
-        <translation>확인됨</translation>
+        <source>Reset all sign message fields</source>
+        <translation>메시지 필드의 모든 서명 재설정</translation>
     </message>
     <message>
-        <source>Date</source>
-        <translation>날짜</translation>
+        <source>Clear &amp;All</source>
+        <translation>모두 지우기(&amp;A)</translation>
     </message>
     <message>
-        <source>Type</source>
-        <translation>종류</translation>
+        <source>&amp;Verify Message</source>
+        <translation>메시지 검증(&amp;V)</translation>
     </message>
     <message>
-        <source>Label</source>
-        <translation>라벨</translation>
+        <source>Enter the receiver's address, message (ensure you copy line breaks, spaces, tabs, etc. exactly) and signature below to verify the message. Be careful not to read more into the signature than what is in the signed message itself, to avoid being tricked by a man-in-the-middle attack. Note that this only proves the signing party receives with the address, it cannot prove sendership of any transaction!</source>
+        <translation>메시지를 검증하기 위해 아래 칸에 각각 지갑 주소와 메시지, 전자서명을 입력하세요. (메시지 원본의 띄어쓰기, 들여쓰기, 행 나눔 등이 정확하게 입력되어야 하므로 원본을 복사해서 입력하세요) 이 기능은 메시지 검증이 주 목적이며, 네트워크 침입자에 의해 변조되지 않도록 전자서명 해독에 불필요한 시간을 소모하지 마세요. </translation>
     </message>
     <message>
-        <source>Address</source>
-        <translation>주소</translation>
+        <source>The Bitcoin address the message was signed with</source>
+        <translation>메세지의 서명에 사용된 비트코인 주소</translation>
     </message>
     <message>
-        <source>ID</source>
-        <translation>아이디</translation>
+        <source>Verify the message to ensure it was signed with the specified Bitcoin address</source>
+        <translation>정확한 비트코인주소가 입력됬는지 메시지를 확인하시오</translation>
     </message>
     <message>
-        <source>Range:</source>
-        <translation>범위:</translation>
+        <source>Verify &amp;Message</source>
+        <translation>메시지 검증(&amp;M)</translation>
     </message>
     <message>
-        <source>to</source>
-        <translation>상대방</translation>
+        <source>Reset all verify message fields</source>
+        <translation>모든 검증 메시지 필드 재설정</translation>
     </message>
 </context>
 <context>
-    <name>UnitDisplayStatusBarControl</name>
+    <name>SplashScreen</name>
     <message>
-        <source>Unit to show amounts in. Click to select another unit.</source>
-        <translation>거래액을 표시하는 단위. 클릭해서 다른 단위를 선택할 수 있습니다.</translation>
+        <source>[testnet]</source>
+        <translation>[테스트넷]</translation>
     </message>
 </context>
 <context>
-    <name>WalletFrame</name>
+    <name>TrafficGraphWidget</name>
     <message>
-        <source>No wallet has been loaded.</source>
-        <translation>지갑 불러오기가 안됩니다</translation>
+        <source>KB/s</source>
+        <translation>KB/s</translation>
     </message>
 </context>
 <context>
-    <name>WalletModel</name>
+    <name>TransactionDescDialog</name>
     <message>
-        <source>Send Coins</source>
-        <translation>코인들 보내기</translation>
+        <source>This pane shows a detailed description of the transaction</source>
+        <translation>이 창은 거래의 세부내역을 보여줍니다</translation>
     </message>
 </context>
 <context>
-    <name>WalletView</name>
-    <message>
-        <source>&amp;Export</source>
-        <translation>내보내기(&amp;E)</translation>
-    </message>
-    <message>
-        <source>Export the data in the current tab to a file</source>
-        <translation>현재 탭에 있는 데이터를 파일로 내보내기</translation>
-    </message>
-    <message>
-        <source>Backup Wallet</source>
-        <translation>지갑 백업</translation>
-    </message>
-    <message>
-        <source>Wallet Data (*.dat)</source>
-        <translation>지갑 데이터(*.dat)</translation>
-    </message>
-    <message>
-        <source>Backup Failed</source>
-        <translation>백업 실패</translation>
-    </message>
-    <message>
-        <source>There was an error trying to save the wallet data to %1.</source>
-        <translation>지갑 데이터를 %1 폴더에 저장하는 동안 오류가 발생했습니다. </translation>
-    </message>
-    <message>
-        <source>The wallet data was successfully saved to %1.</source>
-        <translation>지갑 정보가 %1에 성공적으로 저장되었습니다</translation>
-    </message>
+    <name>UnitDisplayStatusBarControl</name>
     <message>
-        <source>Backup Successful</source>
-        <translation>백업 성공</translation>
+        <source>Unit to show amounts in. Click to select another unit.</source>
+        <translation>거래액을 표시하는 단위. 클릭해서 다른 단위를 선택할 수 있습니다.</translation>
     </message>
 </context>
 <context>
@@ -2927,14 +1666,6 @@
         <source>If &lt;category&gt; is not supplied or if &lt;category&gt; = 1, output all debugging information.</source>
         <translation>&lt;category&gt;가 제공되지 않거나 &lt;category&gt; = 1 인 경우, 모든 디버깅 정보를 출력</translation>
     </message>
-    <message>
-        <source>Maximum total fees (in %s) to use in a single wallet transaction; setting this too low may abort large transactions (default: %s)</source>
-        <translation>하나의 지갑 트랜잭션에서의 총 수수료(%s)의 최대치; 너무 낮게 설정하면 큰 트랜잭션이 중지 됩니다 (기본값: %s)</translation>
-    </message>
-    <message>
-        <source>Please check that your computer's date and time are correct! If your clock is wrong Bitcoin Core will not work properly.</source>
-        <translation>컴퓨터의 날짜와 시간이 올바른지 확인하십시오! 시간이 잘못되면 비트코인은 제대로 동작하지 않습니다.</translation>
-    </message>
     <message>
         <source>Prune configured below the minimum of %d MiB.  Please use a higher number.</source>
         <translation>블록 축소가 최소치의 %d MiB 밑으로 설정되어 있습니다. 더 높은 값을 사용해 보세요.</translation>
@@ -2975,6 +1706,10 @@
         <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
         <translation>외부 접속을 승인합니다</translation>
     </message>
+    <message>
+        <source>Bitcoin Core</source>
+        <translation>비트코인 코어</translation>
+    </message>
     <message>
         <source>-fallbackfee is set very high! This is the transaction fee you may pay when fee estimates are not available.</source>
         <translation>-fallbackfee은 너무 높습니다! 이것은 수수료 예측을 이용할 수 없을 때 지불되는 트랜잭션 수수료입니다.</translation>
@@ -3019,14 +1754,6 @@
         <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
         <translation>이 빌드 버전은 정식 출시 전 테스트의 목적이며, 예기치 않은 위험과 오류가 발생할 수 있습니다. 채굴과 상점용 소프트웨어로 사용하는 것을 권하지 않습니다.</translation>
     </message>
-    <message>
-        <source>Unable to bind to %s on this computer. Bitcoin Core is probably already running.</source>
-        <translation>이 컴퓨터의 %s에 바인딩 할 수 없습니다. 아마도 비트코인이 실행중인 것 같습니다.</translation>
-    </message>
-    <message>
-        <source>Unsupported argument -whitelistalwaysrelay ignored, use -whitelistrelay and/or -whitelistforcerelay.</source>
-        <translation>지원하지 않는 인수 -whitelistalwaysrelay 는 무시됩니다,  -whitelistrelay 나 -whitelistforcerelay 를 사용해 주세요.</translation>
-    </message>
     <message>
         <source>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</source>
         <translation>리슨(Listen) 포트를 할당하기 위해 UPnP 사용 (기본값: 열려있거나 -proxy 옵션을 사용하지 않을 시 1)</translation>
@@ -3043,18 +1770,10 @@
         <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source>
         <translation>경고 : 모든 네트워크가 동의해야 하나, 일부 채굴자들에게 문제가 있는 것으로 보입니다. </translation>
     </message>
-    <message>
-        <source>Warning: Unknown block versions being mined! It's possible unknown rules are in effect</source>
-        <translation>경고: 알려지지 않은 버전의 블록이 채굴되었습니다. 알려지지 않은 규칙이 적용되었을 가능성이 있습니다.</translation>
-    </message>
     <message>
         <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source>
         <translation>경고: 현재 비트코인 버전이 다른 네트워크 참여자들과 동일하지 않는 것 같습니다. 당신 또는 다른 참여자들이 동일한 비트코인 버전으로 업그레이드 할 필요가 있습니다.</translation>
     </message>
-    <message>
-        <source>Warning: wallet.dat corrupt, data salvaged! Original wallet.dat saved as wallet.{timestamp}.bak in %s; if your balance or transactions are incorrect you should restore from a backup.</source>
-        <translation>경고 : wallet.dat가 손상되어 데이터가 복구되었습니다. 원래의 wallet.dat 파일은 %s 후에 wallet.{timestamp}.bak 이름으로 저장됩니다. 잔액과 거래 내역이 정확하지 않다면 백업 파일로 부터 복원해야 합니다. </translation>
-    </message>
     <message>
         <source>Whitelist peers connecting from the given netmask or IP address. Can be specified multiple times.</source>
         <translation>설정된 넷마스크 혹은 IP 주소로 화이트리스트에 포함된 피어에 접속합니다. 이 설정은 복수로 지정 할 수 있습니다.</translation>
@@ -3236,12 +1955,12 @@
         <translation>지갑 %s는 데이터 디렉토리 %s 밖에 위치합니다.</translation>
     </message>
     <message>
-        <source>Wallet options:</source>
-        <translation>지갑 옵션:</translation>
+        <source>Wallet debugging/testing options:</source>
+        <translation>지갑 디버깅/테스트 옵션:</translation>
     </message>
     <message>
-        <source>You need to rebuild the database using -reindex to change -txindex</source>
-        <translation>-txindex를 바꾸기 위해서는 -reindex를 사용해서 데이터베이스를 재구성해야 합니다. </translation>
+        <source>Wallet options:</source>
+        <translation>지갑 옵션:</translation>
     </message>
     <message>
         <source>Allow JSON-RPC connections from specified source. Valid for &lt;ip&gt; are a single IP (e.g. 1.2.3.4), a network/netmask (e.g. 1.2.3.4/255.255.255.0) or a network/CIDR (e.g. 1.2.3.4/24). This option can be specified multiple times</source>
@@ -3255,10 +1974,6 @@
         <source>Bind to given address to listen for JSON-RPC connections. Use [host]:port notation for IPv6. This option can be specified multiple times (default: bind to all interfaces)</source>
         <translation>선택된 주소로 고정하여 JSON-RPC 연결을 리슨(Listen)합니다. IPv6 프로토콜인 경우 [host]:port 방식의 명령어 표기법을 사용합니다. 이 옵션은 복수로 지정 할수 있습니다. (기본값: 모든 인터페이스에 고정)</translation>
     </message>
-    <message>
-        <source>Cannot obtain a lock on data directory %s. Bitcoin Core is probably already running.</source>
-        <translation>데이터 디렉토리 %s에 락을 걸 수 없었습니다. 비트코인 코어가 이미 실행 중인 것으로 보입니다.</translation>
-    </message>
     <message>
         <source>Create new files with system default permissions, instead of umask 077 (only effective with disabled wallet functionality)</source>
         <translation>umask 077 대신 시스템 기본 퍼미션으로 새 파일을 만듭니다 (지갑 기능이 비활성화 상태에서만 유효합니다)</translation>
@@ -3303,10 +2018,6 @@
         <source>Set maximum size of high-priority/low-fee transactions in bytes (default: %d)</source>
         <translation>최대 크기를 최우선으로 설정 / 바이트당 최소 수수료로 거래(기본값: %d)</translation>
     </message>
-    <message>
-        <source>Set the number of threads for coin generation if enabled (-1 = all cores, default: %d)</source>
-        <translation>코인 생성에 대한 스레드 갯수 설정 (-1 = 모든 코어, 기본값: %d)</translation>
-    </message>
     <message>
         <source>The transaction amount is too small to send after the fee has been deducted</source>
         <translation>거래액이 수수료를 지불하기엔 너무 작습니다</translation>
@@ -3331,34 +2042,14 @@
         <source>Accept public REST requests (default: %u)</source>
         <translation>공개 REST 요청을 허가 (기본값: %u)</translation>
     </message>
-    <message>
-        <source>Activating best chain...</source>
-        <translation>최적 블록 체인을 활성화하는중...</translation>
-    </message>
-    <message>
-        <source>Attempt to recover private keys from a corrupt wallet.dat on startup</source>
-        <translation>시작시 망가진 wallet.dat에서 개인키 복원을 시도</translation>
-    </message>
     <message>
         <source>Automatically create Tor hidden service (default: %d)</source>
         <translation>Tor서비스를 자동적으로 생성 (기본값: %d)</translation>
     </message>
-    <message>
-        <source>Cannot resolve -whitebind address: '%s'</source>
-        <translation>-whitebind 주소를 확인할 수 없습니다: '%s'</translation>
-    </message>
     <message>
         <source>Connect through SOCKS5 proxy</source>
         <translation>SOCK5 프록시를 통해 연결</translation>
     </message>
-    <message>
-        <source>Copyright (C) 2009-%i The Bitcoin Core Developers</source>
-        <translation>Copyright (C) 2009-%i The Bitcoin Core Developers</translation>
-    </message>
-    <message>
-        <source>Error loading wallet.dat: Wallet requires newer version of Bitcoin Core</source>
-        <translation>wallet.dat 불러오기 오류: 최신 버전의 Bitcoin Core이 필요합니다.</translation>
-    </message>
     <message>
         <source>Error reading from database, shutting down.</source>
         <translation>블록 데이터베이스를 불러오는데 오류가 발생하였습니다, 종료됩니다.</translation>
@@ -3371,22 +2062,6 @@
         <source>Information</source>
         <translation>정보</translation>
     </message>
-    <message>
-        <source>Initialization sanity check failed. Bitcoin Core is shutting down.</source>
-        <translation>무결성 확인 초기화가 실패했습니다. Bitcoin Core가 종료됩니다.</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -maxtxfee=&lt;amount&gt;: '%s'</source>
-        <translation>-maxtxfee=&lt;amount&gt;에 대한 양이 잘못되었습니다: '%s'</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -minrelaytxfee=&lt;amount&gt;: '%s'</source>
-        <translation>노드로 전달하기 위한 최저 거래 수수료가 부족합니다. - minrelaytxfee=&lt;amount&gt;: '%s' -</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -mintxfee=&lt;amount&gt;: '%s'</source>
-        <translation>최저 거래 수수료가 부족합니다. -mintxfee=&lt;amount&gt;: '%s'</translation>
-    </message>
     <message>
         <source>Invalid amount for -paytxfee=&lt;amount&gt;: '%s' (must be at least %s)</source>
         <translation>유효하지 않은 금액 -paytxfee=&lt;amount&gt;: "%s" (최소 %s 이상이어야 됨)</translation>
@@ -3411,14 +2086,6 @@
         <source>RPC server options:</source>
         <translation>RPC 서버 설정</translation>
     </message>
-    <message>
-        <source>Rebuild block chain index from current blk000??.dat files on startup</source>
-        <translation>현재의 blk000??.dat 파일들로부터 블록체인 색인을 재구성합니다.</translation>
-    </message>
-    <message>
-        <source>Receive and display P2P network alerts (default: %u)</source>
-        <translation>P2P 네트워크 알림을 수신후 표시합니다 (기본값: %u)</translation>
-    </message>
     <message>
         <source>Reducing -maxconnections from %d to %d, because of system limitations.</source>
         <translation>시스템 한계로 인하여 -maxconnections를 %d 에서 %d로 줄였습니다.</translation>
@@ -3487,10 +2154,6 @@
         <source>Username for JSON-RPC connections</source>
         <translation>JSON-RPC 연결에 사용할 사용자 이름</translation>
     </message>
-    <message>
-        <source>Wallet needed to be rewritten: restart Bitcoin Core to complete</source>
-        <translation>지갑을 새로 써야 합니다:  완료하기 위하여 Bitcoin Core을 다시 시작하십시오.</translation>
-    </message>
     <message>
         <source>Warning</source>
         <translation>경고</translation>
@@ -3511,10 +2174,6 @@
         <source>ZeroMQ notification options:</source>
         <translation>ZeroMQ 알림 옵션:</translation>
     </message>
-    <message>
-        <source>wallet.dat corrupt, salvage failed</source>
-        <translation>wallet.dat 파일이 손상되었고 복구가 실패하였습니다.</translation>
-    </message>
     <message>
         <source>Password for JSON-RPC connections</source>
         <translation>JSON-RPC 연결에 사용할 암호</translation>
@@ -3523,10 +2182,6 @@
         <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
         <translation>최고의 블럭이 변하면 명령을 실행(cmd 에 있는 %s 는 블럭 해시에 의해 대체되어 짐)</translation>
     </message>
-    <message>
-        <source>This help message</source>
-        <translation>도움말 메시지입니다</translation>
-    </message>
     <message>
         <source>Allow DNS lookups for -addnode, -seednode and -connect</source>
         <translation>-addnode, -seednode, -connect 옵션에 대해 DNS 탐색 허용</translation>
@@ -3535,10 +2190,6 @@
         <source>Loading addresses...</source>
         <translation>주소를 불러오는 중...</translation>
     </message>
-    <message>
-        <source>Error loading wallet.dat: Wallet corrupted</source>
-        <translation>wallet.dat 불러오기 오류: 지갑 오류</translation>
-    </message>
     <message>
         <source>(1 = keep tx meta data e.g. account owner and payment request information, 2 = drop tx meta data)</source>
         <translation>(1 = 트랜잭션의 메타 데이터를 유지함 예. 계좌정보 와 지불 요구 정보, 2 = 트랜잭션 메타 데이터 파기)</translation>
@@ -3555,10 +2206,6 @@
         <source>Do not keep transactions in the mempool longer than &lt;n&gt; hours (default: %u)</source>
         <translation>메모리 풀에 있는 트랜잭션 기록을 &lt;n&gt;시간 후 부터는 유지하지 않기 (기본값: %u)</translation>
     </message>
-    <message>
-        <source>Error reading wallet.dat! All keys read correctly, but transaction data or address book entries might be missing or incorrect.</source>
-        <translation>경고 : wallet.dat 파일을 읽는 중 오류가 발생했습니다. 주소 키는 모두 정확하게 로딩되었으나 거래 데이터와 주소록 필드에서 누락이나 오류가 존재할 수 있습니다. </translation>
-    </message>
     <message>
         <source>Fees (in %s/kB) smaller than this are considered zero fee for transaction creation (default: %s)</source>
         <translation>해당 금액(%s/kB) 보다 적은 수수료는 수수료 면제로 간주됩니다.(기본값: %s)</translation>
@@ -3595,6 +2242,10 @@
         <source>Unsupported argument -socks found. Setting SOCKS version isn't possible anymore, only SOCKS5 proxies are supported.</source>
         <translation>지원하지 않는 인수 -socks를 찾았습니다. 설정된 SOCKS의 버전은 더이상 사용할 수 없으며, SOCK5 프록시만을 지원합니다.</translation>
     </message>
+    <message>
+        <source>Unsupported argument -whitelistalwaysrelay ignored, use -whitelistrelay and/or -whitelistforcerelay.</source>
+        <translation>지원하지 않는 인수 -whitelistalwaysrelay 는 무시됩니다,  -whitelistrelay 나 -whitelistforcerelay 를 사용해 주세요.</translation>
+    </message>
     <message>
         <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: %s)</source>
         <translation>Tor 서비스를 이용하여 피어에게 연결하기 위해 분리된 SOCKS5 프록시를 사용 (기본값: %s)</translation>
@@ -3604,16 +2255,12 @@
         <translation>JSON-RPC 연결시 사용자 이름과 해시화된 암호문. &lt;userpw&gt; 필드는 &lt;USERNAME&gt;:&lt;SALT&gt;$&lt;HASH&gt; 포멧으로 구성되어 있습니다. 전형적 파이썬 스크립트에선 share/rpcuser가 포함되어 있습니다. 이 옵션은 여러번 지정할 수 있습니다.</translation>
     </message>
     <message>
-        <source>Always query for peer addresses via DNS lookup (default: %u)</source>
-        <translation>DNS lookup을 통해 항상 피어주소에 대한 쿼리 보내기 (기본값: %u)</translation>
-    </message>
-    <message>
-        <source>Error loading wallet.dat</source>
-        <translation>wallet.dat 불러오기 오류</translation>
+        <source>Warning: Unknown block versions being mined! It's possible unknown rules are in effect</source>
+        <translation>경고: 알려지지 않은 버전의 블록이 채굴되었습니다. 알려지지 않은 규칙이 적용되었을 가능성이 있습니다.</translation>
     </message>
     <message>
-        <source>Generate coins (default: %u)</source>
-        <translation>코인 생성 (기본값: %u)</translation>
+        <source>Always query for peer addresses via DNS lookup (default: %u)</source>
+        <translation>DNS lookup을 통해 항상 피어주소에 대한 쿼리 보내기 (기본값: %u)</translation>
     </message>
     <message>
         <source>How many blocks to check at startup (default: %u, 0 = all)</source>
@@ -3695,18 +2342,6 @@
         <source>Unknown network specified in -onlynet: '%s'</source>
         <translation>-onlynet에 지정한 네트워크를 알 수 없습니다: '%s'</translation>
     </message>
-    <message>
-        <source>Cannot resolve -bind address: '%s'</source>
-        <translation>-bind 주소를 확인할 수 없습니다: '%s'</translation>
-    </message>
-    <message>
-        <source>Cannot resolve -externalip address: '%s'</source>
-        <translation>-externalip 주소를 확인할 수 없습니다: '%s'</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -paytxfee=&lt;amount&gt;: '%s'</source>
-        <translation>-paytxfee=&lt;amount&gt;에 대한 양이 잘못되었습니다: '%s'</translation>
-    </message>
     <message>
         <source>Insufficient funds</source>
         <translation>자금 부족</translation>
diff --git a/src/qt/locale/bitcoin_ku_IQ.ts b/src/qt/locale/bitcoin_ku_IQ.ts
new file mode 100644
index 0000000000000..da5e41a3583e9
--- /dev/null
+++ b/src/qt/locale/bitcoin_ku_IQ.ts
@@ -0,0 +1,272 @@
+<TS language="ku_IQ" version="2.1">
+<context>
+    <name>AddressBookPage</name>
+    <message>
+        <source>Create a new address</source>
+        <translation>ناوونیشانێکی نوێ دروست بکە</translation>
+    </message>
+    <message>
+        <source>&amp;New</source>
+        <translation>&amp;نوێ</translation>
+    </message>
+    <message>
+        <source>&amp;Copy</source>
+        <translation>&amp;ڕوونووس</translation>
+    </message>
+    <message>
+        <source>C&amp;lose</source>
+        <translation>C&amp;داخستن</translation>
+    </message>
+    <message>
+        <source>&amp;Export</source>
+        <translation>&amp;هەناردن</translation>
+    </message>
+    <message>
+        <source>&amp;Delete</source>
+        <translation>&amp;سڕینەوە</translation>
+    </message>
+</context>
+<context>
+    <name>AskPassphraseDialog</name>
+    </context>
+<context>
+    <name>BanTableModel</name>
+    </context>
+<context>
+    <name>BitcoinGUI</name>
+    <message>
+        <source>&amp;Send</source>
+        <translation>&amp;ناردن</translation>
+    </message>
+    <message>
+        <source>&amp;File</source>
+        <translation>&amp;پەرگە</translation>
+    </message>
+    <message>
+        <source>&amp;Settings</source>
+        <translation>&amp;سازکارییەکان</translation>
+    </message>
+    <message>
+        <source>&amp;Help</source>
+        <translation>&amp;یارمەتی</translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation>هەڵە</translation>
+    </message>
+    <message>
+        <source>Warning</source>
+        <translation>ئاگاداری</translation>
+    </message>
+    <message>
+        <source>Information</source>
+        <translation>زانیاری</translation>
+    </message>
+    </context>
+<context>
+    <name>CoinControlDialog</name>
+    <message>
+        <source>Amount:</source>
+        <translation>کۆ:</translation>
+    </message>
+    <message>
+        <source>Priority:</source>
+        <translation>لەپێشی:</translation>
+    </message>
+    <message>
+        <source>Fee:</source>
+        <translation>تێچوون:</translation>
+    </message>
+    <message>
+        <source>Amount</source>
+        <translation>سەرجەم</translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation>رێکەت</translation>
+    </message>
+    <message>
+        <source>Priority</source>
+        <translation>لەپێشی</translation>
+    </message>
+</context>
+<context>
+    <name>EditAddressDialog</name>
+    </context>
+<context>
+    <name>FreespaceChecker</name>
+    <message>
+        <source>name</source>
+        <translation>ناو</translation>
+    </message>
+    </context>
+<context>
+    <name>HelpMessageDialog</name>
+    <message>
+        <source>version</source>
+        <translation>وەشان</translation>
+    </message>
+    </context>
+<context>
+    <name>Intro</name>
+    <message>
+        <source>Welcome</source>
+        <translation>بەخێربێن</translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation>هەڵە</translation>
+    </message>
+    </context>
+<context>
+    <name>OpenURIDialog</name>
+    </context>
+<context>
+    <name>OptionsDialog</name>
+    <message>
+        <source>Options</source>
+        <translation>هەڵبژاردنەکان</translation>
+    </message>
+    </context>
+<context>
+    <name>OverviewPage</name>
+    <message>
+        <source>Total:</source>
+        <translation>گشتی</translation>
+    </message>
+    </context>
+<context>
+    <name>PeerTableModel</name>
+    </context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Amount</source>
+        <translation>سەرجەم</translation>
+    </message>
+    </context>
+<context>
+    <name>RPCConsole</name>
+    <message>
+        <source>&amp;Information</source>
+        <translation>&amp;زانیاری</translation>
+    </message>
+    <message>
+        <source>Name</source>
+        <translation>ناو</translation>
+    </message>
+    <message>
+        <source>Version</source>
+        <translation>وەشان</translation>
+    </message>
+    <message>
+        <source>&amp;Open</source>
+        <translation>&amp;کردنەوە</translation>
+    </message>
+    <message>
+        <source>&amp;Clear</source>
+        <translation>&amp;پاککردنەوە</translation>
+    </message>
+    <message>
+        <source>Totals</source>
+        <translation>گشتییەکان</translation>
+    </message>
+    <message>
+        <source>Yes</source>
+        <translation>بەڵێ</translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation>نەخێر</translation>
+    </message>
+    </context>
+<context>
+    <name>ReceiveCoinsDialog</name>
+    <message>
+        <source>&amp;Amount:</source>
+        <translation>&amp;سەرجەم:</translation>
+    </message>
+    <message>
+        <source>&amp;Message:</source>
+        <translation>&amp;پەیام:</translation>
+    </message>
+    <message>
+        <source>Clear</source>
+        <translation>پاککردنەوە</translation>
+    </message>
+    <message>
+        <source>Show</source>
+        <translation>پیشاندان</translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation>سڕینەوە</translation>
+    </message>
+</context>
+<context>
+    <name>ReceiveRequestDialog</name>
+    </context>
+<context>
+    <name>SendCoinsDialog</name>
+    <message>
+        <source>Amount:</source>
+        <translation>کۆ:</translation>
+    </message>
+    <message>
+        <source>Priority:</source>
+        <translation>لەپێشی:</translation>
+    </message>
+    <message>
+        <source>Fee:</source>
+        <translation>تێچوون:</translation>
+    </message>
+    <message>
+        <source>fast</source>
+        <translation>خێرا</translation>
+    </message>
+    </context>
+<context>
+    <name>SendCoinsEntry</name>
+    <message>
+        <source>Message:</source>
+        <translation>پەیام:</translation>
+    </message>
+    </context>
+<context>
+    <name>ShutdownWindow</name>
+    </context>
+<context>
+    <name>SignVerifyMessageDialog</name>
+    </context>
+<context>
+    <name>SplashScreen</name>
+    </context>
+<context>
+    <name>TrafficGraphWidget</name>
+    </context>
+<context>
+    <name>TransactionDescDialog</name>
+    </context>
+<context>
+    <name>UnitDisplayStatusBarControl</name>
+    </context>
+<context>
+    <name>bitcoin-core</name>
+    <message>
+        <source>Options:</source>
+        <translation>هەڵبژاردنەکان:</translation>
+    </message>
+    <message>
+        <source>Information</source>
+        <translation>زانیاری</translation>
+    </message>
+    <message>
+        <source>Warning</source>
+        <translation>ئاگاداری</translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation>هەڵە</translation>
+    </message>
+</context>
+</TS>
\ No newline at end of file
diff --git a/src/qt/locale/bitcoin_ky.ts b/src/qt/locale/bitcoin_ky.ts
index 51efd519c3821..14cb9c2020198 100644
--- a/src/qt/locale/bitcoin_ky.ts
+++ b/src/qt/locale/bitcoin_ky.ts
@@ -9,17 +9,6 @@
         <source>&amp;Delete</source>
         <translation>Ө&amp;чүрүү</translation>
     </message>
-    </context>
-<context>
-    <name>AddressTableModel</name>
-    <message>
-        <source>Address</source>
-        <translation>Дарек</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(аты жок)</translation>
-    </message>
 </context>
 <context>
     <name>AskPassphraseDialog</name>
@@ -70,23 +59,12 @@
         <translation>Жаңыланган</translation>
     </message>
     </context>
-<context>
-    <name>ClientModel</name>
-    </context>
 <context>
     <name>CoinControlDialog</name>
     <message>
         <source>Date</source>
         <translation>Дата</translation>
     </message>
-    <message>
-        <source>none</source>
-        <translation>жок</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(аты жок)</translation>
-    </message>
     </context>
 <context>
     <name>EditAddressDialog</name>
@@ -94,7 +72,7 @@
         <source>&amp;Address</source>
         <translation>&amp;Дарек</translation>
     </message>
-    </context>
+</context>
 <context>
     <name>FreespaceChecker</name>
     </context>
@@ -157,18 +135,12 @@
 <context>
     <name>OverviewPage</name>
     </context>
-<context>
-    <name>PaymentServer</name>
-    </context>
 <context>
     <name>PeerTableModel</name>
     </context>
 <context>
     <name>QObject</name>
     </context>
-<context>
-    <name>QRImageWidget</name>
-    </context>
 <context>
     <name>RPCConsole</name>
     <message>
@@ -209,29 +181,6 @@
     </context>
 <context>
     <name>ReceiveRequestDialog</name>
-    <message>
-        <source>Address</source>
-        <translation>Дарек</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>Билдирүү</translation>
-    </message>
-    </context>
-<context>
-    <name>RecentRequestsTableModel</name>
-    <message>
-        <source>Date</source>
-        <translation>Дата</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>Билдирүү</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(аты жок)</translation>
-    </message>
     </context>
 <context>
     <name>SendCoinsDialog</name>
@@ -243,11 +192,7 @@
         <source>S&amp;end</source>
         <translation>&amp;Жөнөтүү</translation>
     </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(аты жок)</translation>
-    </message>
-    </context>
+</context>
 <context>
     <name>SendCoinsEntry</name>
     <message>
@@ -279,54 +224,12 @@
 <context>
     <name>TrafficGraphWidget</name>
     </context>
-<context>
-    <name>TransactionDesc</name>
-    <message>
-        <source>%1/offline</source>
-        <translation>%1/тармакта эмес</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation>Дата</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>Билдирүү</translation>
-    </message>
-    </context>
 <context>
     <name>TransactionDescDialog</name>
     </context>
-<context>
-    <name>TransactionTableModel</name>
-    <message>
-        <source>Date</source>
-        <translation>Дата</translation>
-    </message>
-    </context>
-<context>
-    <name>TransactionView</name>
-    <message>
-        <source>Date</source>
-        <translation>Дата</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>Дарек</translation>
-    </message>
-    </context>
 <context>
     <name>UnitDisplayStatusBarControl</name>
     </context>
-<context>
-    <name>WalletFrame</name>
-    </context>
-<context>
-    <name>WalletModel</name>
-    </context>
-<context>
-    <name>WalletView</name>
-    </context>
 <context>
     <name>bitcoin-core</name>
     <message>
diff --git a/src/qt/locale/bitcoin_la.ts b/src/qt/locale/bitcoin_la.ts
index b11027d1ee275..ebaddba7e930e 100644
--- a/src/qt/locale/bitcoin_la.ts
+++ b/src/qt/locale/bitcoin_la.ts
@@ -9,10 +9,6 @@
         <source>Copy the currently selected address to the system clipboard</source>
         <translation>Copia inscriptionem iam selectam in latibulum systematis</translation>
     </message>
-    <message>
-        <source>&amp;Copy Address</source>
-        <translation>&amp;Copia Inscriptionem</translation>
-    </message>
     <message>
         <source>Delete the currently selected address from the list</source>
         <translation>Dele active selectam inscriptionem ex enumeratione</translation>
@@ -29,37 +25,6 @@
         <source>&amp;Delete</source>
         <translation>&amp;Dele</translation>
     </message>
-    <message>
-        <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source>
-        <translation>Hae sunt inscriptiones mittendi pensitationes.  Semper inspice quantitatem et inscriptionem accipiendi antequam nummos mittis.</translation>
-    </message>
-    <message>
-        <source>Copy &amp;Label</source>
-        <translation>Copia &amp;Titulum</translation>
-    </message>
-    <message>
-        <source>&amp;Edit</source>
-        <translation>&amp;Muta</translation>
-    </message>
-    <message>
-        <source>Comma separated file (*.csv)</source>
-        <translation>Comma Separata Plica (*.csv)</translation>
-    </message>
-    </context>
-<context>
-    <name>AddressTableModel</name>
-    <message>
-        <source>Label</source>
-        <translation>Titulus</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>Inscriptio</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(nullus titulus)</translation>
-    </message>
 </context>
 <context>
     <name>AskPassphraseDialog</name>
@@ -79,82 +44,6 @@
         <source>Repeat new passphrase</source>
         <translation>Itera novam tesseram</translation>
     </message>
-    <message>
-        <source>Encrypt wallet</source>
-        <translation>Cifra cassidile</translation>
-    </message>
-    <message>
-        <source>This operation needs your wallet passphrase to unlock the wallet.</source>
-        <translation>Huic operationi necesse est tessera cassidili tuo ut cassidile reseret.</translation>
-    </message>
-    <message>
-        <source>Unlock wallet</source>
-        <translation>Resera cassidile</translation>
-    </message>
-    <message>
-        <source>This operation needs your wallet passphrase to decrypt the wallet.</source>
-        <translation>Huic operationi necesse est tessera cassidili tuo ut cassidile decifret.</translation>
-    </message>
-    <message>
-        <source>Decrypt wallet</source>
-        <translation>Decifra cassidile</translation>
-    </message>
-    <message>
-        <source>Change passphrase</source>
-        <translation>Muta tesseram</translation>
-    </message>
-    <message>
-        <source>Confirm wallet encryption</source>
-        <translation>Confirma cifrationem cassidilis</translation>
-    </message>
-    <message>
-        <source>Warning: If you encrypt your wallet and lose your passphrase, you will &lt;b&gt;LOSE ALL OF YOUR BITCOINS&lt;/b&gt;!</source>
-        <translation>Monitio: Si cassidile tuum cifras et tesseram amittis, tu &lt;b&gt;AMITTES OMNES TUOS NUMMOS BITOS&lt;/b&gt;!</translation>
-    </message>
-    <message>
-        <source>Are you sure you wish to encrypt your wallet?</source>
-        <translation>Certusne es te velle tuum cassidile cifrare?</translation>
-    </message>
-    <message>
-        <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source>
-        <translation>GRAVE: Oportet ulla prioria conservata quae fecisti de plica tui cassidilis reponi a nove generata cifrata plica cassidilis.  Propter securitatem, prioria conservata de plica non cifrata cassidilis inutilia fiet simul atque incipis uti novo cifrato cassidili.</translation>
-    </message>
-    <message>
-        <source>Warning: The Caps Lock key is on!</source>
-        <translation>Monitio: Litterae ut capitales seratae sunt!</translation>
-    </message>
-    <message>
-        <source>Wallet encrypted</source>
-        <translation>Cassidile cifratum</translation>
-    </message>
-    <message>
-        <source>Wallet encryption failed</source>
-        <translation>Cassidile cifrare abortum est</translation>
-    </message>
-    <message>
-        <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
-        <translation>Cassidile cifrare abortum est propter internum errorem.  Tuum cassidile cifratum non est.</translation>
-    </message>
-    <message>
-        <source>The supplied passphrases do not match.</source>
-        <translation>Tesserae datae non eaedem sunt.</translation>
-    </message>
-    <message>
-        <source>Wallet unlock failed</source>
-        <translation>Cassidile reserare abortum est.</translation>
-    </message>
-    <message>
-        <source>The passphrase entered for the wallet decryption was incorrect.</source>
-        <translation>Tessera inserta pro cassidilis decifrando prava erat.</translation>
-    </message>
-    <message>
-        <source>Wallet decryption failed</source>
-        <translation>Cassidile decifrare abortum est.</translation>
-    </message>
-    <message>
-        <source>Wallet passphrase was successfully changed.</source>
-        <translation>Tessera cassidilis successa est in mutando.</translation>
-    </message>
 </context>
 <context>
     <name>BanTableModel</name>
@@ -217,10 +106,6 @@
         <source>&amp;Change Passphrase...</source>
         <translation>&amp;Muta tesseram...</translation>
     </message>
-    <message>
-        <source>Importing blocks from disk...</source>
-        <translation>Importans frusta ab disco...</translation>
-    </message>
     <message>
         <source>Reindexing blocks on disk...</source>
         <translation>Recreans indicem frustorum in disco...</translation>
@@ -301,10 +186,6 @@
         <source>Tabs toolbar</source>
         <translation>Tabella instrumentorum "Tabs"</translation>
     </message>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Bitcoin Nucleus</translation>
-    </message>
     <message>
         <source>&amp;Command-line options</source>
         <translation>Optiones mandati initiantis</translation>
@@ -362,13 +243,6 @@
         <translation>Cassidile &lt;b&gt;cifratum&lt;/b&gt; est et iam nunc &lt;b&gt;seratum&lt;/b&gt;</translation>
     </message>
 </context>
-<context>
-    <name>ClientModel</name>
-    <message>
-        <source>Network Alert</source>
-        <translation>Monitio Retis</translation>
-    </message>
-</context>
 <context>
     <name>CoinControlDialog</name>
     <message>
@@ -387,26 +261,6 @@
         <source>Confirmed</source>
         <translation>Confirmatum</translation>
     </message>
-    <message>
-        <source>Copy address</source>
-        <translation>Copia inscriptionem</translation>
-    </message>
-    <message>
-        <source>Copy label</source>
-        <translation>Copia titulum</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>Copia quantitatem</translation>
-    </message>
-    <message>
-        <source>Copy transaction ID</source>
-        <translation>Copia transactionis ID</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(nullus titulus)</translation>
-    </message>
     </context>
 <context>
     <name>EditAddressDialog</name>
@@ -422,48 +276,12 @@
         <source>&amp;Address</source>
         <translation>&amp;Inscriptio</translation>
     </message>
-    <message>
-        <source>New receiving address</source>
-        <translation>Nova inscriptio accipiendi</translation>
-    </message>
-    <message>
-        <source>New sending address</source>
-        <translation>Nova inscriptio mittendi</translation>
-    </message>
-    <message>
-        <source>Edit receiving address</source>
-        <translation>Muta inscriptionem accipiendi</translation>
-    </message>
-    <message>
-        <source>Edit sending address</source>
-        <translation>Muta inscriptionem mittendi</translation>
-    </message>
-    <message>
-        <source>The entered address "%1" is already in the address book.</source>
-        <translation>Inserta inscriptio "%1" iam in libro inscriptionum est.</translation>
-    </message>
-    <message>
-        <source>The entered address "%1" is not a valid Bitcoin address.</source>
-        <translation>Inscriptio inserta "%1" non valida inscriptio Bitcoin est.</translation>
-    </message>
-    <message>
-        <source>Could not unlock wallet.</source>
-        <translation>Non potuisse cassidile reserare</translation>
-    </message>
-    <message>
-        <source>New key generation failed.</source>
-        <translation>Generare novam clavem abortum est.</translation>
-    </message>
 </context>
 <context>
     <name>FreespaceChecker</name>
     </context>
 <context>
     <name>HelpMessageDialog</name>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Bitcoin Nucleus</translation>
-    </message>
     <message>
         <source>version</source>
         <translation>versio</translation>
@@ -483,10 +301,6 @@
     </context>
 <context>
     <name>Intro</name>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Bitcoin Nucleus</translation>
-    </message>
     <message>
         <source>Error</source>
         <translation>Error</translation>
@@ -613,17 +427,6 @@
         <translation>Fossum pendendum quod nondum maturum est</translation>
     </message>
     </context>
-<context>
-    <name>PaymentServer</name>
-    <message>
-        <source>URI handling</source>
-        <translation>Tractatio URI</translation>
-    </message>
-    <message>
-        <source>Cannot start bitcoin: click-to-pay handler</source>
-        <translation>Bitcoin incipere non potest: cliccare-ad-pensandum handler</translation>
-    </message>
-    </context>
 <context>
     <name>PeerTableModel</name>
     </context>
@@ -638,13 +441,6 @@
         <translation>N/A</translation>
     </message>
     </context>
-<context>
-    <name>QRImageWidget</name>
-    <message>
-        <source>Save QR Code</source>
-        <translation>Salva codicem QR</translation>
-    </message>
-    </context>
 <context>
     <name>RPCConsole</name>
     <message>
@@ -699,10 +495,6 @@
         <source>&amp;Console</source>
         <translation>&amp;Terminale</translation>
     </message>
-    <message>
-        <source>Build date</source>
-        <translation>Dies aedificandi</translation>
-    </message>
     <message>
         <source>Debug log file</source>
         <translation>Debug catalogi plica</translation>
@@ -734,68 +526,13 @@
         <source>&amp;Message:</source>
         <translation>Nuntius:</translation>
     </message>
-    <message>
-        <source>Copy label</source>
-        <translation>Copia titulum</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>Copia quantitatem</translation>
-    </message>
-</context>
+    </context>
 <context>
     <name>ReceiveRequestDialog</name>
     <message>
         <source>Copy &amp;Address</source>
         <translation>&amp;Copia Inscriptionem</translation>
     </message>
-    <message>
-        <source>Address</source>
-        <translation>Inscriptio</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>Quantitas</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Titulus</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>Nuntius</translation>
-    </message>
-    <message>
-        <source>Resulting URI too long, try to reduce the text for label / message.</source>
-        <translation>Resultato URI nimis longo, conare minuere verba pro titulo / nuntio.</translation>
-    </message>
-    <message>
-        <source>Error encoding URI into QR Code.</source>
-        <translation>Error codificandi URI in codicem QR.</translation>
-    </message>
-</context>
-<context>
-    <name>RecentRequestsTableModel</name>
-    <message>
-        <source>Date</source>
-        <translation>Dies</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Titulus</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>Nuntius</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>Quantitas</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(nullus titulus)</translation>
-    </message>
     </context>
 <context>
     <name>SendCoinsDialog</name>
@@ -839,31 +576,7 @@
         <source>S&amp;end</source>
         <translation>&amp;Mitte</translation>
     </message>
-    <message>
-        <source>Confirm send coins</source>
-        <translation>Confirma mittendum nummorum</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>Copia quantitatem</translation>
-    </message>
-    <message>
-        <source>The amount to pay must be larger than 0.</source>
-        <translation>Oportet quantitatem ad pensandum maiorem quam 0 esse.</translation>
-    </message>
-    <message>
-        <source>The amount exceeds your balance.</source>
-        <translation>Quantitas est ultra quod habes.</translation>
-    </message>
-    <message>
-        <source>The total exceeds your balance when the %1 transaction fee is included.</source>
-        <translation>Quantitas est ultra quod habes cum merces transactionis %1 includitur.</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(nullus titulus)</translation>
-    </message>
-    </context>
+</context>
 <context>
     <name>SendCoinsEntry</name>
     <message>
@@ -874,10 +587,6 @@
         <source>Pay &amp;To:</source>
         <translation>Pensa &amp;Ad:</translation>
     </message>
-    <message>
-        <source>Enter a label for this address to add it to your address book</source>
-        <translation>Insero titulum huic inscriptioni ut eam in tuum librum inscriptionum addas.</translation>
-    </message>
     <message>
         <source>&amp;Label:</source>
         <translation>&amp;Titulus:</translation>
@@ -972,65 +681,9 @@
         <source>Reset all verify message fields</source>
         <translation>Reconstitue omnes campos verificandi nuntii</translation>
     </message>
-    <message>
-        <source>Click "Sign Message" to generate signature</source>
-        <translation>Clicca "Signa Nuntium" ut signatio generetur</translation>
-    </message>
-    <message>
-        <source>The entered address is invalid.</source>
-        <translation>Inscriptio inserta non valida est.</translation>
-    </message>
-    <message>
-        <source>Please check the address and try again.</source>
-        <translation>Sodes inscriptionem proba et rursus conare.</translation>
-    </message>
-    <message>
-        <source>The entered address does not refer to a key.</source>
-        <translation>Inserta inscriptio clavem non refert.</translation>
-    </message>
-    <message>
-        <source>Wallet unlock was cancelled.</source>
-        <translation>Cassidilis reserare cancellatum est.</translation>
-    </message>
-    <message>
-        <source>Private key for the entered address is not available.</source>
-        <translation>Clavis privata absens est pro inserta inscriptione.</translation>
-    </message>
-    <message>
-        <source>Message signing failed.</source>
-        <translation>Nuntium signare abortum est.</translation>
-    </message>
-    <message>
-        <source>Message signed.</source>
-        <translation>Nuntius signatus.</translation>
-    </message>
-    <message>
-        <source>The signature could not be decoded.</source>
-        <translation>Signatio decodificari non potuit.</translation>
-    </message>
-    <message>
-        <source>Please check the signature and try again.</source>
-        <translation>Sodes signationem proba et rursus conare.</translation>
-    </message>
-    <message>
-        <source>The signature did not match the message digest.</source>
-        <translation>Signatio non convenit digesto nuntii</translation>
-    </message>
-    <message>
-        <source>Message verification failed.</source>
-        <translation>Nuntium verificare abortum est.</translation>
-    </message>
-    <message>
-        <source>Message verified.</source>
-        <translation>Nuntius verificatus.</translation>
-    </message>
 </context>
 <context>
     <name>SplashScreen</name>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Bitcoin Nucleus</translation>
-    </message>
     <message>
         <source>[testnet]</source>
         <translation>[testnet]</translation>
@@ -1039,362 +692,16 @@
 <context>
     <name>TrafficGraphWidget</name>
     </context>
-<context>
-    <name>TransactionDesc</name>
-    <message>
-        <source>Open until %1</source>
-        <translation>Apertum donec %1</translation>
-    </message>
-    <message>
-        <source>%1/offline</source>
-        <translation>%1/non conecto</translation>
-    </message>
-    <message>
-        <source>%1/unconfirmed</source>
-        <translation>%1/non confirmata</translation>
-    </message>
-    <message>
-        <source>%1 confirmations</source>
-        <translation>%1 confirmationes</translation>
-    </message>
-    <message>
-        <source>Status</source>
-        <translation>Status</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation>Dies</translation>
-    </message>
-    <message>
-        <source>Source</source>
-        <translation>Fons</translation>
-    </message>
-    <message>
-        <source>Generated</source>
-        <translation>Generatum</translation>
-    </message>
-    <message>
-        <source>From</source>
-        <translation>Ab</translation>
-    </message>
-    <message>
-        <source>To</source>
-        <translation>Ad</translation>
-    </message>
-    <message>
-        <source>own address</source>
-        <translation>inscriptio propria</translation>
-    </message>
-    <message>
-        <source>label</source>
-        <translation>titulus</translation>
-    </message>
-    <message>
-        <source>Credit</source>
-        <translation>Creditum</translation>
-    </message>
-    <message>
-        <source>not accepted</source>
-        <translation>non acceptum</translation>
-    </message>
-    <message>
-        <source>Debit</source>
-        <translation>Debitum</translation>
-    </message>
-    <message>
-        <source>Transaction fee</source>
-        <translation>Transactionis merces</translation>
-    </message>
-    <message>
-        <source>Net amount</source>
-        <translation>Cuncta quantitas</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>Nuntius</translation>
-    </message>
-    <message>
-        <source>Comment</source>
-        <translation>Annotatio</translation>
-    </message>
-    <message>
-        <source>Transaction ID</source>
-        <translation>ID transactionis</translation>
-    </message>
-    <message>
-        <source>Debug information</source>
-        <translation>Informatio de debug</translation>
-    </message>
-    <message>
-        <source>Transaction</source>
-        <translation>Transactio</translation>
-    </message>
-    <message>
-        <source>Inputs</source>
-        <translation>Lectenda</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>Quantitas</translation>
-    </message>
-    <message>
-        <source>true</source>
-        <translation>verum</translation>
-    </message>
-    <message>
-        <source>false</source>
-        <translation>falsum</translation>
-    </message>
-    <message>
-        <source>, has not been successfully broadcast yet</source>
-        <translation>, nondum prospere disseminatum est</translation>
-    </message>
-    <message>
-        <source>unknown</source>
-        <translation>ignotum</translation>
-    </message>
-</context>
 <context>
     <name>TransactionDescDialog</name>
-    <message>
-        <source>Transaction details</source>
-        <translation>Particularia transactionis</translation>
-    </message>
     <message>
         <source>This pane shows a detailed description of the transaction</source>
         <translation>Haec tabula monstrat descriptionem verbosam transactionis</translation>
     </message>
 </context>
-<context>
-    <name>TransactionTableModel</name>
-    <message>
-        <source>Date</source>
-        <translation>Dies</translation>
-    </message>
-    <message>
-        <source>Type</source>
-        <translation>Typus</translation>
-    </message>
-    <message>
-        <source>Open until %1</source>
-        <translation>Apertum donec %1</translation>
-    </message>
-    <message>
-        <source>Confirmed (%1 confirmations)</source>
-        <translation>Confirmatum (%1 confirmationes)</translation>
-    </message>
-    <message>
-        <source>This block was not received by any other nodes and will probably not be accepted!</source>
-        <translation>Hoc frustum non acceptum est ab ulla alia nodis et probabiliter non acceptum erit!</translation>
-    </message>
-    <message>
-        <source>Generated but not accepted</source>
-        <translation>Generatum sed non acceptum</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Titulus</translation>
-    </message>
-    <message>
-        <source>Received with</source>
-        <translation>Acceptum cum</translation>
-    </message>
-    <message>
-        <source>Received from</source>
-        <translation>Acceptum ab</translation>
-    </message>
-    <message>
-        <source>Sent to</source>
-        <translation>Missum ad</translation>
-    </message>
-    <message>
-        <source>Payment to yourself</source>
-        <translation>Pensitatio ad te ipsum</translation>
-    </message>
-    <message>
-        <source>Mined</source>
-        <translation>Fossa</translation>
-    </message>
-    <message>
-        <source>(n/a)</source>
-        <translation>(n/a)</translation>
-    </message>
-    <message>
-        <source>Transaction status. Hover over this field to show number of confirmations.</source>
-        <translation>Status transactionis.  Supervola cum mure ut monstretur numerus confirmationum.</translation>
-    </message>
-    <message>
-        <source>Date and time that the transaction was received.</source>
-        <translation>Dies et tempus quando transactio accepta est.</translation>
-    </message>
-    <message>
-        <source>Type of transaction.</source>
-        <translation>Typus transactionis.</translation>
-    </message>
-    <message>
-        <source>Amount removed from or added to balance.</source>
-        <translation>Quantitas remota ex pendendo aut addita ei.</translation>
-    </message>
-</context>
-<context>
-    <name>TransactionView</name>
-    <message>
-        <source>All</source>
-        <translation>Omne</translation>
-    </message>
-    <message>
-        <source>Today</source>
-        <translation>Hodie</translation>
-    </message>
-    <message>
-        <source>This week</source>
-        <translation>Hac hebdomade</translation>
-    </message>
-    <message>
-        <source>This month</source>
-        <translation>Hoc mense</translation>
-    </message>
-    <message>
-        <source>Last month</source>
-        <translation>Postremo mense</translation>
-    </message>
-    <message>
-        <source>This year</source>
-        <translation>Hoc anno</translation>
-    </message>
-    <message>
-        <source>Range...</source>
-        <translation>Intervallum...</translation>
-    </message>
-    <message>
-        <source>Received with</source>
-        <translation>Acceptum cum</translation>
-    </message>
-    <message>
-        <source>Sent to</source>
-        <translation>Missum ad</translation>
-    </message>
-    <message>
-        <source>To yourself</source>
-        <translation>Ad te ipsum</translation>
-    </message>
-    <message>
-        <source>Mined</source>
-        <translation>Fossa</translation>
-    </message>
-    <message>
-        <source>Other</source>
-        <translation>Alia</translation>
-    </message>
-    <message>
-        <source>Enter address or label to search</source>
-        <translation>Insere inscriptionem vel titulum ut quaeras</translation>
-    </message>
-    <message>
-        <source>Min amount</source>
-        <translation>Quantitas minima</translation>
-    </message>
-    <message>
-        <source>Copy address</source>
-        <translation>Copia inscriptionem</translation>
-    </message>
-    <message>
-        <source>Copy label</source>
-        <translation>Copia titulum</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>Copia quantitatem</translation>
-    </message>
-    <message>
-        <source>Copy transaction ID</source>
-        <translation>Copia transactionis ID</translation>
-    </message>
-    <message>
-        <source>Edit label</source>
-        <translation>Muta titulum</translation>
-    </message>
-    <message>
-        <source>Show transaction details</source>
-        <translation>Monstra particularia transactionis</translation>
-    </message>
-    <message>
-        <source>Comma separated file (*.csv)</source>
-        <translation>Comma Separata Plica (*.csv)</translation>
-    </message>
-    <message>
-        <source>Confirmed</source>
-        <translation>Confirmatum</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation>Dies</translation>
-    </message>
-    <message>
-        <source>Type</source>
-        <translation>Typus</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Titulus</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>Inscriptio</translation>
-    </message>
-    <message>
-        <source>ID</source>
-        <translation>ID</translation>
-    </message>
-    <message>
-        <source>Range:</source>
-        <translation>Intervallum:</translation>
-    </message>
-    <message>
-        <source>to</source>
-        <translation>ad</translation>
-    </message>
-</context>
 <context>
     <name>UnitDisplayStatusBarControl</name>
     </context>
-<context>
-    <name>WalletFrame</name>
-    </context>
-<context>
-    <name>WalletModel</name>
-    <message>
-        <source>Send Coins</source>
-        <translation>Mitte Nummos</translation>
-    </message>
-</context>
-<context>
-    <name>WalletView</name>
-    <message>
-        <source>&amp;Export</source>
-        <translation>&amp;Exporta</translation>
-    </message>
-    <message>
-        <source>Export the data in the current tab to a file</source>
-        <translation>Exporta data in hac tabella in plicam</translation>
-    </message>
-    <message>
-        <source>Backup Wallet</source>
-        <translation>Conserva cassidile</translation>
-    </message>
-    <message>
-        <source>Wallet Data (*.dat)</source>
-        <translation>Data cassidilis (*.dat)</translation>
-    </message>
-    <message>
-        <source>Backup Failed</source>
-        <translation>Conservare abortum est.</translation>
-    </message>
-    <message>
-        <source>Backup Successful</source>
-        <translation>Successum in conservando</translation>
-    </message>
-</context>
 <context>
     <name>bitcoin-core</name>
     <message>
@@ -1425,6 +732,10 @@
         <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
         <translation>Accipe conexiones externas (praedefinitum: 1 nisi -proxy neque -connect)</translation>
     </message>
+    <message>
+        <source>Bitcoin Core</source>
+        <translation>Bitcoin Nucleus</translation>
+    </message>
     <message>
         <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source>
         <translation>Conglutina ad inscriptionem datam et semper in eam ausculta.  Utere [moderatrum]:porta notationem pro IPv6</translation>
@@ -1437,10 +748,6 @@
         <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
         <translation>Hoc est prae-dimittum experimentala aedes - utere eo periculo tuo proprio - nolite utere fodendo vel applicationibus mercatoriis</translation>
     </message>
-    <message>
-        <source>Warning: wallet.dat corrupt, data salvaged! Original wallet.dat saved as wallet.{timestamp}.bak in %s; if your balance or transactions are incorrect you should restore from a backup.</source>
-        <translation>Monitio: wallet.data corrupta, data salvata!  Originalis wallet.dat salvata ut wallet.{timestamp}.bak in %s; si pendendum tuum vel transactiones pravae sunt, oportet ab conservato restituere.</translation>
-    </message>
     <message>
         <source>Block creation options:</source>
         <translation>Optiones creandi frustorum:</translation>
@@ -1493,26 +800,10 @@
         <source>Verifying wallet...</source>
         <translation>Verificante cassidilem...</translation>
     </message>
-    <message>
-        <source>Cannot resolve -whitebind address: '%s'</source>
-        <translation>Non posse resolvere -whitebind inscriptionem: '%s'</translation>
-    </message>
     <message>
         <source>Information</source>
         <translation>Informatio</translation>
     </message>
-    <message>
-        <source>Invalid amount for -maxtxfee=&lt;amount&gt;: '%s'</source>
-        <translation>Quantitas non valida pro -maxtxfee=&lt;amount&gt;: '%s'</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -minrelaytxfee=&lt;amount&gt;: '%s'</source>
-        <translation>Quantitas non valida pro -minrelaytxfee=&lt;amount&gt;: '%s'</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -mintxfee=&lt;amount&gt;: '%s'</source>
-        <translation>Quantitas non valida pro -mintxfee=&lt;amount&gt;: '%s'</translation>
-    </message>
     <message>
         <source>Send trace/debug info to console instead of debug.log file</source>
         <translation>Mitte informationem vestigii/debug ad terminale potius quam plicam debug.log</translation>
@@ -1545,10 +836,6 @@
         <source>Warning</source>
         <translation>Monitio</translation>
     </message>
-    <message>
-        <source>wallet.dat corrupt, salvage failed</source>
-        <translation>wallet.dat corrupta, salvare abortum est</translation>
-    </message>
     <message>
         <source>Password for JSON-RPC connections</source>
         <translation>Tessera pro conexionibus JSON-RPC</translation>
@@ -1557,10 +844,6 @@
         <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
         <translation>Pelle mandatum quando optissimum frustum mutat (%s in mandato substituitur ab hash frusti)</translation>
     </message>
-    <message>
-        <source>This help message</source>
-        <translation>Hic nuntius auxilii</translation>
-    </message>
     <message>
         <source>Allow DNS lookups for -addnode, -seednode and -connect</source>
         <translation>Permitte quaerenda DNS pro -addnode, -seednode, et -connect</translation>
@@ -1569,14 +852,6 @@
         <source>Loading addresses...</source>
         <translation>Legens inscriptiones...</translation>
     </message>
-    <message>
-        <source>Error loading wallet.dat: Wallet corrupted</source>
-        <translation>Error legendi wallet.dat: Cassidile corruptum</translation>
-    </message>
-    <message>
-        <source>Error loading wallet.dat</source>
-        <translation>Error legendi wallet.dat</translation>
-    </message>
     <message>
         <source>Invalid -proxy address: '%s'</source>
         <translation>Inscriptio -proxy non valida: '%s'</translation>
@@ -1585,18 +860,6 @@
         <source>Unknown network specified in -onlynet: '%s'</source>
         <translation>Ignotum rete specificatum in -onlynet: '%s'</translation>
     </message>
-    <message>
-        <source>Cannot resolve -bind address: '%s'</source>
-        <translation>Non posse resolvere -bind inscriptonem: '%s'</translation>
-    </message>
-    <message>
-        <source>Cannot resolve -externalip address: '%s'</source>
-        <translation>Non posse resolvere -externalip inscriptionem: '%s'</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -paytxfee=&lt;amount&gt;: '%s'</source>
-        <translation>Quantitas non valida pro -paytxfee=&lt;quantitas&gt;: '%s'</translation>
-    </message>
     <message>
         <source>Insufficient funds</source>
         <translation>Inopia nummorum</translation>
diff --git a/src/qt/locale/bitcoin_lt.ts b/src/qt/locale/bitcoin_lt.ts
index 873a6939b7a5c..9e98baa77af73 100644
--- a/src/qt/locale/bitcoin_lt.ts
+++ b/src/qt/locale/bitcoin_lt.ts
@@ -25,10 +25,6 @@
         <source>C&amp;lose</source>
         <translation>&amp;Užverti</translation>
     </message>
-    <message>
-        <source>&amp;Copy Address</source>
-        <translation>&amp;Kopijuoti adresą</translation>
-    </message>
     <message>
         <source>Delete the currently selected address from the list</source>
         <translation>Ištrinti pasirinktą adresą iš sąrašo</translation>
@@ -45,73 +41,6 @@
         <source>&amp;Delete</source>
         <translation>&amp;Trinti</translation>
     </message>
-    <message>
-        <source>Choose the address to send coins to</source>
-        <translation>Pasirinkite adresą kuriam siūsite monetas</translation>
-    </message>
-    <message>
-        <source>Choose the address to receive coins with</source>
-        <translation>Pasirinkite adresą su kuriuo gauti monetas</translation>
-    </message>
-    <message>
-        <source>C&amp;hoose</source>
-        <translation>P&amp;asirinkti</translation>
-    </message>
-    <message>
-        <source>Sending addresses</source>
-        <translation>Siunčiami adresai</translation>
-    </message>
-    <message>
-        <source>Receiving addresses</source>
-        <translation>Gaunami adresai</translation>
-    </message>
-    <message>
-        <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source>
-        <translation>Tai yra jūsų Bitcoin adresai mokėjimų siuntimui. Visada patikrinkite siunčiamą sumą ir gavėjo adresą prieš siųsdami monetas.</translation>
-    </message>
-    <message>
-        <source>These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source>
-        <translation>Tai yra jūsų Bitcoin adresai mokėjimų gavimui. Rekomenduojame naudoti naujus gavimo adresus kiekvienai tranzakcijai.</translation>
-    </message>
-    <message>
-        <source>Copy &amp;Label</source>
-        <translation>Kopijuoti ž&amp;ymę</translation>
-    </message>
-    <message>
-        <source>&amp;Edit</source>
-        <translation>&amp;Keisti</translation>
-    </message>
-    <message>
-        <source>Export Address List</source>
-        <translation>Eksportuoti adresų sąrašą</translation>
-    </message>
-    <message>
-        <source>Comma separated file (*.csv)</source>
-        <translation>Kableliais atskirtų duomenų failas (*.csv)</translation>
-    </message>
-    <message>
-        <source>Exporting Failed</source>
-        <translation>Eksportavimas nepavyko</translation>
-    </message>
-    <message>
-        <source>There was an error trying to save the address list to %1. Please try again.</source>
-        <translation>Bandant išsaugoti adresų sąrašą - įvyko klaida keliant į %1. Prašome bandyti dar kartą.</translation>
-    </message>
-</context>
-<context>
-    <name>AddressTableModel</name>
-    <message>
-        <source>Label</source>
-        <translation>Žymė</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>Adresas</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(nėra žymės)</translation>
-    </message>
 </context>
 <context>
     <name>AskPassphraseDialog</name>
@@ -131,78 +60,6 @@
         <source>Repeat new passphrase</source>
         <translation>Pakartokite naują slaptafrazę</translation>
     </message>
-    <message>
-        <source>Encrypt wallet</source>
-        <translation>Užšifruoti piniginę</translation>
-    </message>
-    <message>
-        <source>This operation needs your wallet passphrase to unlock the wallet.</source>
-        <translation>Ši operacija reikalauja jūsų piniginės slaptafrazės jai atrakinti.</translation>
-    </message>
-    <message>
-        <source>Unlock wallet</source>
-        <translation>Atrakinti piniginę</translation>
-    </message>
-    <message>
-        <source>This operation needs your wallet passphrase to decrypt the wallet.</source>
-        <translation>Ši operacija reikalauja jūsų piniginės slaptafrazės jai iššifruoti.</translation>
-    </message>
-    <message>
-        <source>Decrypt wallet</source>
-        <translation>Iššifruoti piniginę</translation>
-    </message>
-    <message>
-        <source>Change passphrase</source>
-        <translation>Pakeisti slaptafrazę</translation>
-    </message>
-    <message>
-        <source>Confirm wallet encryption</source>
-        <translation>Patvirtinkite piniginės užšifravimą</translation>
-    </message>
-    <message>
-        <source>Warning: If you encrypt your wallet and lose your passphrase, you will &lt;b&gt;LOSE ALL OF YOUR BITCOINS&lt;/b&gt;!</source>
-        <translation>Dėmesio: jei užšifruosite savo piniginę ir pamesite slaptafrazę, jūs&lt;b&gt;PRARASITE VISUS SAVO BITCOINUS&lt;/b&gt;! </translation>
-    </message>
-    <message>
-        <source>Are you sure you wish to encrypt your wallet?</source>
-        <translation>Ar tikrai norite šifruoti savo piniginę?</translation>
-    </message>
-    <message>
-        <source>Warning: The Caps Lock key is on!</source>
-        <translation>Įspėjimas: įjungtas Caps Lock klavišas!</translation>
-    </message>
-    <message>
-        <source>Wallet encrypted</source>
-        <translation>Piniginė užšifruota</translation>
-    </message>
-    <message>
-        <source>Wallet encryption failed</source>
-        <translation>Nepavyko užšifruoti piniginę</translation>
-    </message>
-    <message>
-        <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
-        <translation>Dėl vidinės klaidos nepavyko užšifruoti piniginę.Piniginė neužšifruota.</translation>
-    </message>
-    <message>
-        <source>The supplied passphrases do not match.</source>
-        <translation>Įvestos slaptafrazės nesutampa.</translation>
-    </message>
-    <message>
-        <source>Wallet unlock failed</source>
-        <translation>Nepavyko atrakinti piniginę</translation>
-    </message>
-    <message>
-        <source>The passphrase entered for the wallet decryption was incorrect.</source>
-        <translation>Neteisingai įvestas slaptažodis piniginės iššifravimui.</translation>
-    </message>
-    <message>
-        <source>Wallet decryption failed</source>
-        <translation>Nepavyko iššifruoti piniginės</translation>
-    </message>
-    <message>
-        <source>Wallet passphrase was successfully changed.</source>
-        <translation>Piniginės slaptažodis sėkmingai pakeistas.</translation>
-    </message>
 </context>
 <context>
     <name>BanTableModel</name>
@@ -249,6 +106,10 @@
         <source>Quit application</source>
         <translation>Išjungti programą</translation>
     </message>
+    <message>
+        <source>&amp;About %1</source>
+        <translation>&amp;Apie %1</translation>
+    </message>
     <message>
         <source>About &amp;Qt</source>
         <translation>Apie &amp;Qt</translation>
@@ -285,14 +146,6 @@
         <source>Open &amp;URI...</source>
         <translation>Atidaryti &amp;URI...</translation>
     </message>
-    <message>
-        <source>Bitcoin Core client</source>
-        <translation>Bitcoin Core klientas</translation>
-    </message>
-    <message>
-        <source>Importing blocks from disk...</source>
-        <translation>Blokai importuojami iš disko...</translation>
-    </message>
     <message>
         <source>Reindexing blocks on disk...</source>
         <translation>Blokai iš naujo indeksuojami...</translation>
@@ -337,10 +190,6 @@
         <source>&amp;Receive</source>
         <translation>&amp;Gauti</translation>
     </message>
-    <message>
-        <source>Show information about Bitcoin Core</source>
-        <translation>Rodyti informaciją apie Bitcoin Core</translation>
-    </message>
     <message>
         <source>&amp;Show / Hide</source>
         <translation>&amp;Rodyti / Slėpti</translation>
@@ -369,14 +218,6 @@
         <source>Tabs toolbar</source>
         <translation>Kortelių įrankinė</translation>
     </message>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Bitcoin branduolys</translation>
-    </message>
-    <message>
-        <source>&amp;About Bitcoin Core</source>
-        <translation>&amp;Apie Bitcoin Core</translation>
-    </message>
     <message>
         <source>&amp;Command-line options</source>
         <translation>Komandinės eilutės parametrai</translation>
@@ -418,13 +259,6 @@
         <translation>Piniginė &lt;b&gt;užšifruota&lt;/b&gt; ir šiuo metu &lt;b&gt;užrakinta&lt;/b&gt;</translation>
     </message>
 </context>
-<context>
-    <name>ClientModel</name>
-    <message>
-        <source>Network Alert</source>
-        <translation>Tinklo įspėjimas</translation>
-    </message>
-</context>
 <context>
     <name>CoinControlDialog</name>
     <message>
@@ -491,94 +325,6 @@
         <source>Priority</source>
         <translation>Pirmumas</translation>
     </message>
-    <message>
-        <source>Copy address</source>
-        <translation>Kopijuoti adresą</translation>
-    </message>
-    <message>
-        <source>Copy label</source>
-        <translation>Kopijuoti žymę</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>Kopijuoti sumą</translation>
-    </message>
-    <message>
-        <source>Copy quantity</source>
-        <translation>Kopijuoti kiekį</translation>
-    </message>
-    <message>
-        <source>Copy fee</source>
-        <translation>Kopijuoti mokestį</translation>
-    </message>
-    <message>
-        <source>Copy after fee</source>
-        <translation>Kopijuoti po mokesčio</translation>
-    </message>
-    <message>
-        <source>Copy bytes</source>
-        <translation>Kopijuoti baitus</translation>
-    </message>
-    <message>
-        <source>Copy priority</source>
-        <translation>Kopijuoti pirmumą</translation>
-    </message>
-    <message>
-        <source>highest</source>
-        <translation>auksčiausias</translation>
-    </message>
-    <message>
-        <source>higher</source>
-        <translation>aukštesnis</translation>
-    </message>
-    <message>
-        <source>high</source>
-        <translation>aukštas</translation>
-    </message>
-    <message>
-        <source>medium-high</source>
-        <translation>vidutiniškai aukštas</translation>
-    </message>
-    <message>
-        <source>medium</source>
-        <translation>vidutiniškai</translation>
-    </message>
-    <message>
-        <source>low-medium</source>
-        <translation>žemai-vidutiniškas</translation>
-    </message>
-    <message>
-        <source>low</source>
-        <translation>žemas</translation>
-    </message>
-    <message>
-        <source>lower</source>
-        <translation>žemesnis</translation>
-    </message>
-    <message>
-        <source>lowest</source>
-        <translation>žemiausias</translation>
-    </message>
-    <message>
-        <source>none</source>
-        <translation>niekas</translation>
-    </message>
-    <message>
-        <source>yes</source>
-        <translation>taip</translation>
-    </message>
-    <message>
-        <source>no</source>
-        <translation>ne</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(nėra žymės)</translation>
-    </message>
-    <message>
-        <source>(change)</source>
-        <translation>(Graža)</translation>
-    </message>
 </context>
 <context>
     <name>EditAddressDialog</name>
@@ -594,38 +340,6 @@
         <source>&amp;Address</source>
         <translation>&amp;Adresas</translation>
     </message>
-    <message>
-        <source>New receiving address</source>
-        <translation>Naujas gavimo adresas</translation>
-    </message>
-    <message>
-        <source>New sending address</source>
-        <translation>Naujas siuntimo adresas</translation>
-    </message>
-    <message>
-        <source>Edit receiving address</source>
-        <translation>Keisti gavimo adresą</translation>
-    </message>
-    <message>
-        <source>Edit sending address</source>
-        <translation>Keisti siuntimo adresą</translation>
-    </message>
-    <message>
-        <source>The entered address "%1" is already in the address book.</source>
-        <translation>Įvestas adresas „%1“ jau yra adresų knygelėje.</translation>
-    </message>
-    <message>
-        <source>The entered address "%1" is not a valid Bitcoin address.</source>
-        <translation>Įvestas adresas „%1“ nėra galiojantis Bitcoin adresas.</translation>
-    </message>
-    <message>
-        <source>Could not unlock wallet.</source>
-        <translation>Nepavyko atrakinti piniginės.</translation>
-    </message>
-    <message>
-        <source>New key generation failed.</source>
-        <translation>Naujo rakto generavimas nepavyko.</translation>
-    </message>
 </context>
 <context>
     <name>FreespaceChecker</name>
@@ -636,18 +350,10 @@
     </context>
 <context>
     <name>HelpMessageDialog</name>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Bitcoin branduolys</translation>
-    </message>
     <message>
         <source>version</source>
         <translation>versija</translation>
     </message>
-    <message>
-        <source>About Bitcoin Core</source>
-        <translation>Apie Bitcoin Core</translation>
-    </message>
     <message>
         <source>Command-line options</source>
         <translation>Komandinės eilutės parametrai</translation>
@@ -667,14 +373,6 @@
         <source>Welcome</source>
         <translation>Sveiki</translation>
     </message>
-    <message>
-        <source>Welcome to Bitcoin Core.</source>
-        <translation>Sveiki atvykę į Bitcoin Core.</translation>
-    </message>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Bitcoin branduolys</translation>
-    </message>
     <message>
         <source>Error</source>
         <translation>Klaida</translation>
@@ -841,29 +539,6 @@
         <translation>Jūsų balansas</translation>
     </message>
     </context>
-<context>
-    <name>PaymentServer</name>
-    <message>
-        <source>URI handling</source>
-        <translation>URI apdorojimas</translation>
-    </message>
-    <message>
-        <source>Invalid payment address %1</source>
-        <translation>Neteisingas mokėjimo adresas %1</translation>
-    </message>
-    <message>
-        <source>Payment request rejected</source>
-        <translation>Mokėjimo siuntimas atmestas</translation>
-    </message>
-    <message>
-        <source>Payment request expired.</source>
-        <translation>Mokėjimo siuntimas pasibaigė</translation>
-    </message>
-    <message>
-        <source>Network request error</source>
-        <translation>Tinklo užklausos klaida</translation>
-    </message>
-</context>
 <context>
     <name>PeerTableModel</name>
     </context>
@@ -886,21 +561,6 @@
         <translation>nėra</translation>
     </message>
     </context>
-<context>
-    <name>QRImageWidget</name>
-    <message>
-        <source>&amp;Copy Image</source>
-        <translation>Kopijuoti nuotrauką</translation>
-    </message>
-    <message>
-        <source>Save QR Code</source>
-        <translation>Įrašyti QR kodą</translation>
-    </message>
-    <message>
-        <source>PNG Image (*.png)</source>
-        <translation>PNG paveikslėlis (*.png)</translation>
-    </message>
-</context>
 <context>
     <name>RPCConsole</name>
     <message>
@@ -979,10 +639,6 @@
         <source>Totals</source>
         <translation>Viso:</translation>
     </message>
-    <message>
-        <source>Build date</source>
-        <translation>Kompiliavimo data</translation>
-    </message>
     <message>
         <source>Debug log file</source>
         <translation>Derinimo žurnalo failas</translation>
@@ -1038,15 +694,7 @@
         <source>Clear</source>
         <translation>Išvalyti</translation>
     </message>
-    <message>
-        <source>Copy label</source>
-        <translation>Kopijuoti žymę</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>Kopijuoti sumą</translation>
-    </message>
-</context>
+    </context>
 <context>
     <name>ReceiveRequestDialog</name>
     <message>
@@ -1057,53 +705,6 @@
         <source>Copy &amp;Address</source>
         <translation>&amp;Kopijuoti adresą</translation>
     </message>
-    <message>
-        <source>Payment information</source>
-        <translation>Mokėjimo informacija</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>Adresas</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>Suma</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Žymė</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>Žinutė</translation>
-    </message>
-    <message>
-        <source>Error encoding URI into QR Code.</source>
-        <translation>Klaida, koduojant URI į QR kodą.</translation>
-    </message>
-</context>
-<context>
-    <name>RecentRequestsTableModel</name>
-    <message>
-        <source>Date</source>
-        <translation>Data</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Žymė</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>Žinutė</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>Suma</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(nėra žymės)</translation>
-    </message>
     </context>
 <context>
     <name>SendCoinsDialog</name>
@@ -1171,55 +772,7 @@
         <source>S&amp;end</source>
         <translation>&amp;Siųsti</translation>
     </message>
-    <message>
-        <source>Confirm send coins</source>
-        <translation>Patvirtinti monetų siuntimą</translation>
-    </message>
-    <message>
-        <source>Copy quantity</source>
-        <translation>Kopijuoti kiekį</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>Kopijuoti sumą</translation>
-    </message>
-    <message>
-        <source>Copy fee</source>
-        <translation>Kopijuoti mokestį</translation>
-    </message>
-    <message>
-        <source>Copy after fee</source>
-        <translation>Kopijuoti po mokesčio</translation>
-    </message>
-    <message>
-        <source>Copy bytes</source>
-        <translation>Kopijuoti baitus</translation>
-    </message>
-    <message>
-        <source>Copy priority</source>
-        <translation>Kopijuoti pirmumą</translation>
-    </message>
-    <message>
-        <source>The amount to pay must be larger than 0.</source>
-        <translation>Apmokėjimo suma turi būti didesnė nei 0.</translation>
-    </message>
-    <message>
-        <source>The amount exceeds your balance.</source>
-        <translation>Suma viršija jūsų balansą.</translation>
-    </message>
-    <message>
-        <source>The total exceeds your balance when the %1 transaction fee is included.</source>
-        <translation>Jei pridedame sandorio mokestį %1 bendra suma viršija jūsų balansą.</translation>
-    </message>
-    <message>
-        <source>Payment request expired.</source>
-        <translation>Mokėjimo siuntimas pasibaigė</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(nėra žymės)</translation>
-    </message>
-    </context>
+</context>
 <context>
     <name>SendCoinsEntry</name>
     <message>
@@ -1230,10 +783,6 @@
         <source>Pay &amp;To:</source>
         <translation>Mokėti &amp;gavėjui:</translation>
     </message>
-    <message>
-        <source>Enter a label for this address to add it to your address book</source>
-        <translation>Įveskite žymę šiam adresui kad galėtumėte įtraukti ją į adresų knygelę</translation>
-    </message>
     <message>
         <source>&amp;Label:</source>
         <translation>Ž&amp;ymė:</translation>
@@ -1308,57 +857,9 @@
         <source>Verify &amp;Message</source>
         <translation>&amp;Patikrinti žinutę</translation>
     </message>
-    <message>
-        <source>Click "Sign Message" to generate signature</source>
-        <translation>Spragtelėkite "Registruotis žinutę" tam, kad gauti parašą</translation>
-    </message>
-    <message>
-        <source>The entered address is invalid.</source>
-        <translation>Įvestas adresas negalioja.</translation>
-    </message>
-    <message>
-        <source>Please check the address and try again.</source>
-        <translation>Prašom patikrinti adresą ir bandyti iš naujo.</translation>
-    </message>
-    <message>
-        <source>Wallet unlock was cancelled.</source>
-        <translation>Piniginės atrakinimas atšauktas.</translation>
-    </message>
-    <message>
-        <source>Message signing failed.</source>
-        <translation>Žinutės pasirašymas nepavyko.</translation>
-    </message>
-    <message>
-        <source>Message signed.</source>
-        <translation>Žinutė pasirašyta.</translation>
-    </message>
-    <message>
-        <source>The signature could not be decoded.</source>
-        <translation>Nepavyko iškoduoti parašo.</translation>
-    </message>
-    <message>
-        <source>Please check the signature and try again.</source>
-        <translation>Prašom patikrinti parašą ir bandyti iš naujo.</translation>
-    </message>
-    <message>
-        <source>The signature did not match the message digest.</source>
-        <translation>Parašas neatitinka žinutės.</translation>
-    </message>
-    <message>
-        <source>Message verification failed.</source>
-        <translation>Žinutės tikrinimas nepavyko.</translation>
-    </message>
-    <message>
-        <source>Message verified.</source>
-        <translation>Žinutė patikrinta.</translation>
-    </message>
-</context>
+    </context>
 <context>
     <name>SplashScreen</name>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Bitcoin branduolys</translation>
-    </message>
     <message>
         <source>[testnet]</source>
         <translation>[testavimotinklas]</translation>
@@ -1371,358 +872,16 @@
         <translation>KB/s</translation>
     </message>
 </context>
-<context>
-    <name>TransactionDesc</name>
-    <message>
-        <source>Open until %1</source>
-        <translation>Atidaryta iki %1</translation>
-    </message>
-    <message>
-        <source>%1/offline</source>
-        <translation>%1/neprisijungęs</translation>
-    </message>
-    <message>
-        <source>%1/unconfirmed</source>
-        <translation>%1/nepatvirtintas</translation>
-    </message>
-    <message>
-        <source>%1 confirmations</source>
-        <translation>%1 patvirtinimų</translation>
-    </message>
-    <message>
-        <source>Status</source>
-        <translation>Būsena</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation>Data</translation>
-    </message>
-    <message>
-        <source>Source</source>
-        <translation>Šaltinis</translation>
-    </message>
-    <message>
-        <source>Generated</source>
-        <translation>Sugeneruotas</translation>
-    </message>
-    <message>
-        <source>From</source>
-        <translation>Nuo</translation>
-    </message>
-    <message>
-        <source>To</source>
-        <translation>Kam</translation>
-    </message>
-    <message>
-        <source>own address</source>
-        <translation>savo adresas</translation>
-    </message>
-    <message>
-        <source>label</source>
-        <translation>žymė</translation>
-    </message>
-    <message>
-        <source>Credit</source>
-        <translation>Kreditas</translation>
-    </message>
-    <message>
-        <source>not accepted</source>
-        <translation>nepriimta</translation>
-    </message>
-    <message>
-        <source>Debit</source>
-        <translation>Debitas</translation>
-    </message>
-    <message>
-        <source>Transaction fee</source>
-        <translation>Sandorio mokestis</translation>
-    </message>
-    <message>
-        <source>Net amount</source>
-        <translation>Neto suma</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>Žinutė</translation>
-    </message>
-    <message>
-        <source>Comment</source>
-        <translation>Komentaras</translation>
-    </message>
-    <message>
-        <source>Transaction ID</source>
-        <translation>Sandorio ID</translation>
-    </message>
-    <message>
-        <source>Debug information</source>
-        <translation>Derinimo informacija</translation>
-    </message>
-    <message>
-        <source>Transaction</source>
-        <translation>Sandoris</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>Suma</translation>
-    </message>
-    <message>
-        <source>true</source>
-        <translation>tiesa</translation>
-    </message>
-    <message>
-        <source>false</source>
-        <translation>netiesa</translation>
-    </message>
-    <message>
-        <source>, has not been successfully broadcast yet</source>
-        <translation>, transliavimas dar nebuvo sėkmingas</translation>
-    </message>
-    <message>
-        <source>unknown</source>
-        <translation>nežinomas</translation>
-    </message>
-</context>
 <context>
     <name>TransactionDescDialog</name>
-    <message>
-        <source>Transaction details</source>
-        <translation>Sandorio detelės</translation>
-    </message>
     <message>
         <source>This pane shows a detailed description of the transaction</source>
         <translation>Šis langas sandorio detalų aprašymą</translation>
     </message>
 </context>
-<context>
-    <name>TransactionTableModel</name>
-    <message>
-        <source>Date</source>
-        <translation>Data</translation>
-    </message>
-    <message>
-        <source>Type</source>
-        <translation>Tipas</translation>
-    </message>
-    <message>
-        <source>Open until %1</source>
-        <translation>Atidaryta iki %1</translation>
-    </message>
-    <message>
-        <source>Confirmed (%1 confirmations)</source>
-        <translation>Patvirtinta (%1 patvirtinimai)</translation>
-    </message>
-    <message>
-        <source>This block was not received by any other nodes and will probably not be accepted!</source>
-        <translation>Šis blokas negautas nė vienu iš mazgų ir matomai nepriimtas</translation>
-    </message>
-    <message>
-        <source>Generated but not accepted</source>
-        <translation>Išgauta bet nepriimta</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Žymė</translation>
-    </message>
-    <message>
-        <source>Received with</source>
-        <translation>Gauta su</translation>
-    </message>
-    <message>
-        <source>Received from</source>
-        <translation>Gauta iš</translation>
-    </message>
-    <message>
-        <source>Sent to</source>
-        <translation>Išsiųsta</translation>
-    </message>
-    <message>
-        <source>Payment to yourself</source>
-        <translation>Mokėjimas sau</translation>
-    </message>
-    <message>
-        <source>Mined</source>
-        <translation>Išgauta</translation>
-    </message>
-    <message>
-        <source>(n/a)</source>
-        <translation>nepasiekiama</translation>
-    </message>
-    <message>
-        <source>Transaction status. Hover over this field to show number of confirmations.</source>
-        <translation>Sandorio būklė. Užvedus pelės žymeklį ant šios srities matysite patvirtinimų skaičių.</translation>
-    </message>
-    <message>
-        <source>Date and time that the transaction was received.</source>
-        <translation>Sandorio gavimo data ir laikas</translation>
-    </message>
-    <message>
-        <source>Type of transaction.</source>
-        <translation>Sandorio tipas.</translation>
-    </message>
-    <message>
-        <source>Amount removed from or added to balance.</source>
-        <translation>Suma pridėta ar išskaičiuota iš balanso</translation>
-    </message>
-</context>
-<context>
-    <name>TransactionView</name>
-    <message>
-        <source>All</source>
-        <translation>Visi</translation>
-    </message>
-    <message>
-        <source>Today</source>
-        <translation>Šiandien</translation>
-    </message>
-    <message>
-        <source>This week</source>
-        <translation>Šią savaitę</translation>
-    </message>
-    <message>
-        <source>This month</source>
-        <translation>Šį mėnesį</translation>
-    </message>
-    <message>
-        <source>Last month</source>
-        <translation>Paskutinį mėnesį</translation>
-    </message>
-    <message>
-        <source>This year</source>
-        <translation>Šiais metais</translation>
-    </message>
-    <message>
-        <source>Range...</source>
-        <translation>Intervalas...</translation>
-    </message>
-    <message>
-        <source>Received with</source>
-        <translation>Gauta su</translation>
-    </message>
-    <message>
-        <source>Sent to</source>
-        <translation>Išsiųsta</translation>
-    </message>
-    <message>
-        <source>To yourself</source>
-        <translation>Skirta sau</translation>
-    </message>
-    <message>
-        <source>Mined</source>
-        <translation>Išgauta</translation>
-    </message>
-    <message>
-        <source>Other</source>
-        <translation>Kita</translation>
-    </message>
-    <message>
-        <source>Enter address or label to search</source>
-        <translation>Įveskite adresą ar žymę į paiešką</translation>
-    </message>
-    <message>
-        <source>Min amount</source>
-        <translation>Minimali suma</translation>
-    </message>
-    <message>
-        <source>Copy address</source>
-        <translation>Kopijuoti adresą</translation>
-    </message>
-    <message>
-        <source>Copy label</source>
-        <translation>Kopijuoti žymę</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>Kopijuoti sumą</translation>
-    </message>
-    <message>
-        <source>Edit label</source>
-        <translation>Taisyti žymę</translation>
-    </message>
-    <message>
-        <source>Show transaction details</source>
-        <translation>Rodyti sandėrio detales</translation>
-    </message>
-    <message>
-        <source>Exporting Failed</source>
-        <translation>Eksportavimas nepavyko</translation>
-    </message>
-    <message>
-        <source>Comma separated file (*.csv)</source>
-        <translation>Kableliais atskirtų duomenų failas (*.csv)</translation>
-    </message>
-    <message>
-        <source>Confirmed</source>
-        <translation>Patvirtintas</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation>Data</translation>
-    </message>
-    <message>
-        <source>Type</source>
-        <translation>Tipas</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Žymė</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>Adresas</translation>
-    </message>
-    <message>
-        <source>ID</source>
-        <translation>ID</translation>
-    </message>
-    <message>
-        <source>Range:</source>
-        <translation>Grupė:</translation>
-    </message>
-    <message>
-        <source>to</source>
-        <translation>skirta</translation>
-    </message>
-</context>
 <context>
     <name>UnitDisplayStatusBarControl</name>
     </context>
-<context>
-    <name>WalletFrame</name>
-    </context>
-<context>
-    <name>WalletModel</name>
-    <message>
-        <source>Send Coins</source>
-        <translation>Siųsti monetas</translation>
-    </message>
-</context>
-<context>
-    <name>WalletView</name>
-    <message>
-        <source>&amp;Export</source>
-        <translation>&amp;Eksportuoti</translation>
-    </message>
-    <message>
-        <source>Export the data in the current tab to a file</source>
-        <translation>Eksportuoti informaciją iš dabartinės lentelės į failą</translation>
-    </message>
-    <message>
-        <source>Backup Wallet</source>
-        <translation>Backup piniginę</translation>
-    </message>
-    <message>
-        <source>Wallet Data (*.dat)</source>
-        <translation>Piniginės duomenys (*.dat)</translation>
-    </message>
-    <message>
-        <source>Backup Failed</source>
-        <translation>Nepavyko padaryti atsarginės kopijos</translation>
-    </message>
-    <message>
-        <source>Backup Successful</source>
-        <translation>Atsarginė kopija sėkmingai padaryta</translation>
-    </message>
-</context>
 <context>
     <name>bitcoin-core</name>
     <message>
@@ -1745,6 +904,10 @@
         <source>Run in the background as a daemon and accept commands</source>
         <translation>Dirbti fone kaip šešėlyje ir priimti komandas</translation>
     </message>
+    <message>
+        <source>Bitcoin Core</source>
+        <translation>Bitcoin branduolys</translation>
+    </message>
     <message>
         <source>Connect only to the specified node(s)</source>
         <translation>Prisijungti tik prie nurodyto mazgo</translation>
@@ -1765,18 +928,6 @@
         <source>Information</source>
         <translation>Informacija</translation>
     </message>
-    <message>
-        <source>Invalid amount for -maxtxfee=&lt;amount&gt;: '%s'</source>
-        <translation>Neteisinga suma -maxtxfee=&lt;amount&gt;: '%s'</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -minrelaytxfee=&lt;amount&gt;: '%s'</source>
-        <translation>Neteisinga suma -minrelaytxfee=&lt;amount&gt;: '%s'</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -mintxfee=&lt;amount&gt;: '%s'</source>
-        <translation>Neteisinga suma -mintxfee=&lt;amount&gt;: '%s'</translation>
-    </message>
     <message>
         <source>Send trace/debug info to console instead of debug.log file</source>
         <translation>Siųsti atsekimo/derinimo info į konsolę vietoj debug.log failo</translation>
@@ -1793,10 +944,6 @@
         <source>Password for JSON-RPC connections</source>
         <translation>Slaptažodis JSON-RPC sujungimams</translation>
     </message>
-    <message>
-        <source>This help message</source>
-        <translation>Pagelbos žinutė</translation>
-    </message>
     <message>
         <source>Allow DNS lookups for -addnode, -seednode and -connect</source>
         <translation>Leisti DNS paiešką sujungimui ir mazgo pridėjimui</translation>
@@ -1805,22 +952,10 @@
         <source>Loading addresses...</source>
         <translation>Užkraunami adresai...</translation>
     </message>
-    <message>
-        <source>Error loading wallet.dat: Wallet corrupted</source>
-        <translation> wallet.dat pakrovimo klaida,  wallet.dat sugadintas</translation>
-    </message>
-    <message>
-        <source>Error loading wallet.dat</source>
-        <translation> wallet.dat pakrovimo klaida</translation>
-    </message>
     <message>
         <source>Invalid -proxy address: '%s'</source>
         <translation>Neteisingas proxy adresas: '%s'</translation>
     </message>
-    <message>
-        <source>Invalid amount for -paytxfee=&lt;amount&gt;: '%s'</source>
-        <translation>Neteisinga suma -paytxfee=&lt;amount&gt;: '%s'</translation>
-    </message>
     <message>
         <source>Insufficient funds</source>
         <translation>Nepakanka lėšų</translation>
diff --git a/src/qt/locale/bitcoin_lv_LV.ts b/src/qt/locale/bitcoin_lv_LV.ts
index 5a59184b0cef8..bac58756952ab 100644
--- a/src/qt/locale/bitcoin_lv_LV.ts
+++ b/src/qt/locale/bitcoin_lv_LV.ts
@@ -21,10 +21,6 @@
         <source>C&amp;lose</source>
         <translation>&amp;Aizvērt</translation>
     </message>
-    <message>
-        <source>&amp;Copy Address</source>
-        <translation>&amp;Kopēt adresi</translation>
-    </message>
     <message>
         <source>Delete the currently selected address from the list</source>
         <translation>Izdzēst iezīmētās adreses no saraksta</translation>
@@ -41,73 +37,6 @@
         <source>&amp;Delete</source>
         <translation>&amp;Dzēst</translation>
     </message>
-    <message>
-        <source>Choose the address to send coins to</source>
-        <translation>Izvēlies adresi uz kuru sūtīt bitcoins</translation>
-    </message>
-    <message>
-        <source>Choose the address to receive coins with</source>
-        <translation>Izvēlies adresi ar kuru saņemt bitcoins</translation>
-    </message>
-    <message>
-        <source>C&amp;hoose</source>
-        <translation>&amp;Izvēlēties</translation>
-    </message>
-    <message>
-        <source>Sending addresses</source>
-        <translation>Sūtīšanas adreses</translation>
-    </message>
-    <message>
-        <source>Receiving addresses</source>
-        <translation>Saņemšanas adreses</translation>
-    </message>
-    <message>
-        <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source>
-        <translation>Šīs ir jūsu Bitcoin adreses maksājumu sūtīšanai. Vienmēr  pārbaudiet summu un saņēmēja adresi pirms monētu sūtīšanas.</translation>
-    </message>
-    <message>
-        <source>These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source>
-        <translation>Šīs ir jūsu Bitcoin adreses maksājumu saņemšanai. Ir ieteicams katram darījumam izmantot jaunu saņemšanas adresi.</translation>
-    </message>
-    <message>
-        <source>Copy &amp;Label</source>
-        <translation>Kopēt &amp;Nosaukumu</translation>
-    </message>
-    <message>
-        <source>&amp;Edit</source>
-        <translation>&amp;Rediģēt</translation>
-    </message>
-    <message>
-        <source>Export Address List</source>
-        <translation>Eksportēt Adrešu Sarakstu</translation>
-    </message>
-    <message>
-        <source>Comma separated file (*.csv)</source>
-        <translation>Fails ar komatu kā atdalītāju (*.csv)</translation>
-    </message>
-    <message>
-        <source>Exporting Failed</source>
-        <translation>Eksportēšana Neizdevās</translation>
-    </message>
-    <message>
-        <source>There was an error trying to save the address list to %1. Please try again.</source>
-        <translation>Radās kļūda, saglabājot adrešu sarakstu %1. Lūdzu, mēģiniet vēlreiz!</translation>
-    </message>
-</context>
-<context>
-    <name>AddressTableModel</name>
-    <message>
-        <source>Label</source>
-        <translation>Nosaukums</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>Adrese</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(bez nosaukuma)</translation>
-    </message>
 </context>
 <context>
     <name>AskPassphraseDialog</name>
@@ -127,90 +56,6 @@
         <source>Repeat new passphrase</source>
         <translation>Jaunā parole vēlreiz</translation>
     </message>
-    <message>
-        <source>Encrypt wallet</source>
-        <translation>Šifrēt maciņu</translation>
-    </message>
-    <message>
-        <source>This operation needs your wallet passphrase to unlock the wallet.</source>
-        <translation>Lai veikto šo darbību, maciņš jāatslēdz ar paroli.</translation>
-    </message>
-    <message>
-        <source>Unlock wallet</source>
-        <translation>Atslēgt maciņu</translation>
-    </message>
-    <message>
-        <source>This operation needs your wallet passphrase to decrypt the wallet.</source>
-        <translation>Šai darbībai maciņš jāatšifrē ar maciņa paroli.</translation>
-    </message>
-    <message>
-        <source>Decrypt wallet</source>
-        <translation>Atšifrēt maciņu</translation>
-    </message>
-    <message>
-        <source>Change passphrase</source>
-        <translation>Mainīt paroli</translation>
-    </message>
-    <message>
-        <source>Confirm wallet encryption</source>
-        <translation>Apstiprināt maciņa šifrēšanu</translation>
-    </message>
-    <message>
-        <source>Warning: If you encrypt your wallet and lose your passphrase, you will &lt;b&gt;LOSE ALL OF YOUR BITCOINS&lt;/b&gt;!</source>
-        <translation>Brīdinājums: Ja tu nošifrē savu maciņu un pazaudē paroli, tu &lt;b&gt;PAZAUDĒSI VISAS SAVAS BITCOINS&lt;/b&gt;!</translation>
-    </message>
-    <message>
-        <source>Are you sure you wish to encrypt your wallet?</source>
-        <translation>Vai tu tiešām vēlies šifrēt savu maciņu?</translation>
-    </message>
-    <message>
-        <source>Bitcoin Core will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source>
-        <translation>Bitcoin Core tiks aizvērts, lai pabeigtu šifrēšansa procesu. Atcerieties, ka jūsu maka šifrēšana nevar pilnībā pasargāt jūsu monētas no to nozagašanas, inficējot datoru ar ļaunprātīgām programmām.</translation>
-    </message>
-    <message>
-        <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source>
-        <translation>SVARĪGI: Iepriekšējie maka faila dublējumi ir jāaizvieto ar jauno, šifrēto maka failu. Drošības apsvērumu dēļ iepriekšējie nešifrētā maka dublējumi vairs nebūs derīgi, tiklīdz sāksiet izmantot jauno, šifrēto maku.</translation>
-    </message>
-    <message>
-        <source>Warning: The Caps Lock key is on!</source>
-        <translation>Brīdinājums: Caps Lock ir ieslēgts!</translation>
-    </message>
-    <message>
-        <source>Wallet encrypted</source>
-        <translation>Maciņš nošifrēts</translation>
-    </message>
-    <message>
-        <source>Enter the old passphrase and new passphrase to the wallet.</source>
-        <translation>Ievadiet veco un jauno maka paroli.</translation>
-    </message>
-    <message>
-        <source>Wallet encryption failed</source>
-        <translation>Maciņa šifrēšana neizdevās</translation>
-    </message>
-    <message>
-        <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
-        <translation>Maciņa šifrēšana neizdevās programmas kļūdas dēļ. Jūsu maciņš netika šifrēts.</translation>
-    </message>
-    <message>
-        <source>The supplied passphrases do not match.</source>
-        <translation>Ievadītās paroles nav vienādas.</translation>
-    </message>
-    <message>
-        <source>Wallet unlock failed</source>
-        <translation>Maciņu atšifrēt neizdevās</translation>
-    </message>
-    <message>
-        <source>The passphrase entered for the wallet decryption was incorrect.</source>
-        <translation>Maciņa atšifrēšanai ievadītā parole nav pareiza.</translation>
-    </message>
-    <message>
-        <source>Wallet decryption failed</source>
-        <translation>Maciņu neizdevās atšifrēt</translation>
-    </message>
-    <message>
-        <source>Wallet passphrase was successfully changed.</source>
-        <translation>Maciņa parole tika veiksmīgi nomainīta.</translation>
-    </message>
 </context>
 <context>
     <name>BanTableModel</name>
@@ -289,14 +134,6 @@
         <source>Open &amp;URI...</source>
         <translation>Atvērt &amp;URI...</translation>
     </message>
-    <message>
-        <source>Bitcoin Core client</source>
-        <translation>Bitcoin Core klients</translation>
-    </message>
-    <message>
-        <source>Importing blocks from disk...</source>
-        <translation>Importē blokus no diska...</translation>
-    </message>
     <message>
         <source>Reindexing blocks on disk...</source>
         <translation>Bloku reindeksēšana no diska...</translation>
@@ -341,10 +178,6 @@
         <source>&amp;Receive</source>
         <translation>&amp;Saņemt</translation>
     </message>
-    <message>
-        <source>Show information about Bitcoin Core</source>
-        <translation>Parādīt informāciju par Bitcoin Core</translation>
-    </message>
     <message>
         <source>&amp;Show / Hide</source>
         <translation>&amp;Rādīt / Paslēpt</translation>
@@ -381,18 +214,10 @@
         <source>Tabs toolbar</source>
         <translation>Ciļņu rīkjosla</translation>
     </message>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Bitcoin Core</translation>
-    </message>
     <message>
         <source>Request payments (generates QR codes and bitcoin: URIs)</source>
         <translation>Pieprasīt maksājumus (izveido QR kodu un bitcoin: URIs)</translation>
     </message>
-    <message>
-        <source>&amp;About Bitcoin Core</source>
-        <translation>Par &amp;Bitcoin Core</translation>
-    </message>
     <message>
         <source>Open a bitcoin: URI or payment request</source>
         <translation>Atvērt bitcoin URI vai maksājuma pieprasījumu</translation>
@@ -454,13 +279,6 @@
         <translation>Maciņš ir &lt;b&gt;šifrēts&lt;/b&gt; un pašlaik &lt;b&gt;slēgts&lt;/b&gt;</translation>
     </message>
 </context>
-<context>
-    <name>ClientModel</name>
-    <message>
-        <source>Network Alert</source>
-        <translation>Tīkla brīdinājums</translation>
-    </message>
-</context>
 <context>
     <name>CoinControlDialog</name>
     <message>
@@ -523,118 +341,6 @@
         <source>Priority</source>
         <translation>Prioritāte</translation>
     </message>
-    <message>
-        <source>Copy address</source>
-        <translation>Kopēt adresi</translation>
-    </message>
-    <message>
-        <source>Copy label</source>
-        <translation>Kopēt nosaukumu</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>Kopēt daudzumu</translation>
-    </message>
-    <message>
-        <source>Copy transaction ID</source>
-        <translation>Kopēt transakcijas ID</translation>
-    </message>
-    <message>
-        <source>Lock unspent</source>
-        <translation>Aizslēgt neiztērēto</translation>
-    </message>
-    <message>
-        <source>Unlock unspent</source>
-        <translation>Atslēgt neiztērēto</translation>
-    </message>
-    <message>
-        <source>Copy quantity</source>
-        <translation>Kopēt daudzumu</translation>
-    </message>
-    <message>
-        <source>Copy fee</source>
-        <translation>Kopēt maksu</translation>
-    </message>
-    <message>
-        <source>Copy after fee</source>
-        <translation>Kopēt pēc maksas</translation>
-    </message>
-    <message>
-        <source>Copy bytes</source>
-        <translation>Kopēt baitus</translation>
-    </message>
-    <message>
-        <source>Copy priority</source>
-        <translation>Kopēt prioritāti</translation>
-    </message>
-    <message>
-        <source>Copy change</source>
-        <translation>Kopēt atlikumu</translation>
-    </message>
-    <message>
-        <source>highest</source>
-        <translation>augstākais</translation>
-    </message>
-    <message>
-        <source>higher</source>
-        <translation>augstāks</translation>
-    </message>
-    <message>
-        <source>high</source>
-        <translation>augsts</translation>
-    </message>
-    <message>
-        <source>medium-high</source>
-        <translation>vidēji-augsts</translation>
-    </message>
-    <message>
-        <source>medium</source>
-        <translation>vidējs</translation>
-    </message>
-    <message>
-        <source>low-medium</source>
-        <translation>zemi-vidējs</translation>
-    </message>
-    <message>
-        <source>low</source>
-        <translation>zems</translation>
-    </message>
-    <message>
-        <source>lower</source>
-        <translation>zemāks</translation>
-    </message>
-    <message>
-        <source>lowest</source>
-        <translation>zemākais</translation>
-    </message>
-    <message>
-        <source>(%1 locked)</source>
-        <translation>(%1 aizslēgts)</translation>
-    </message>
-    <message>
-        <source>none</source>
-        <translation>neviena</translation>
-    </message>
-    <message>
-        <source>yes</source>
-        <translation>jā</translation>
-    </message>
-    <message>
-        <source>no</source>
-        <translation>nē</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(bez nosaukuma)</translation>
-    </message>
-    <message>
-        <source>change from %1 (%2)</source>
-        <translation>atlikums no %1 (%2)</translation>
-    </message>
-    <message>
-        <source>(change)</source>
-        <translation>(atlikums)</translation>
-    </message>
 </context>
 <context>
     <name>EditAddressDialog</name>
@@ -650,38 +356,6 @@
         <source>&amp;Address</source>
         <translation>&amp;Adrese</translation>
     </message>
-    <message>
-        <source>New receiving address</source>
-        <translation>Jauna saņemšanas adrese</translation>
-    </message>
-    <message>
-        <source>New sending address</source>
-        <translation>Jauna nosūtīšanas adrese</translation>
-    </message>
-    <message>
-        <source>Edit receiving address</source>
-        <translation>Mainīt saņemšanas adresi</translation>
-    </message>
-    <message>
-        <source>Edit sending address</source>
-        <translation>Mainīt nosūtīšanas adresi</translation>
-    </message>
-    <message>
-        <source>The entered address "%1" is already in the address book.</source>
-        <translation>Nupat ierakstītā adrese "%1" jau atrodas adrešu grāmatā.</translation>
-    </message>
-    <message>
-        <source>The entered address "%1" is not a valid Bitcoin address.</source>
-        <translation>Ierakstītā adrese "%1" nav derīga Bitcoin adrese.</translation>
-    </message>
-    <message>
-        <source>Could not unlock wallet.</source>
-        <translation>Nav iespējams atslēgt maciņu.</translation>
-    </message>
-    <message>
-        <source>New key generation failed.</source>
-        <translation>Neizdevās ģenerēt jaunu atslēgu.</translation>
-    </message>
 </context>
 <context>
     <name>FreespaceChecker</name>
@@ -704,10 +378,6 @@
 </context>
 <context>
     <name>HelpMessageDialog</name>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Bitcoin Core</translation>
-    </message>
     <message>
         <source>version</source>
         <translation>versija</translation>
@@ -716,10 +386,6 @@
         <source>(%1-bit)</source>
         <translation>(%1-biti)</translation>
     </message>
-    <message>
-        <source>About Bitcoin Core</source>
-        <translation>Par Bitcoin Core</translation>
-    </message>
     <message>
         <source>Command-line options</source>
         <translation>Komandrindas iespējas</translation>
@@ -739,10 +405,6 @@
         <source>Welcome</source>
         <translation>Sveiciens</translation>
     </message>
-    <message>
-        <source>Welcome to Bitcoin Core.</source>
-        <translation>Sveicināts Bitcoin Core</translation>
-    </message>
     <message>
         <source>Use the default data directory</source>
         <translation>Izmantot noklusēto datu mapi</translation>
@@ -751,10 +413,6 @@
         <source>Use a custom data directory:</source>
         <translation>Izmantot pielāgotu datu mapi:</translation>
     </message>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Bitcoin Core</translation>
-    </message>
     <message>
         <source>Error</source>
         <translation>Kļūda</translation>
@@ -778,10 +436,6 @@
         <source>Select payment request file</source>
         <translation>Izvēlies maksājuma pieprasījuma datni</translation>
     </message>
-    <message>
-        <source>Select payment request file to open</source>
-        <translation>Izvēlies maksājuma pieprasījuma datni lai atvēru</translation>
-    </message>
 </context>
 <context>
     <name>OptionsDialog</name>
@@ -973,45 +627,6 @@
         <translation>Jūsu kopējā tekošā bilance</translation>
     </message>
     </context>
-<context>
-    <name>PaymentServer</name>
-    <message>
-        <source>URI handling</source>
-        <translation>URI apstrāde</translation>
-    </message>
-    <message>
-        <source>Invalid payment address %1</source>
-        <translation>Nederīga maksājuma adrese %1</translation>
-    </message>
-    <message>
-        <source>Payment request rejected</source>
-        <translation>Maksājuma pieprasījums noraidīts</translation>
-    </message>
-    <message>
-        <source>Payment request network doesn't match client network.</source>
-        <translation>Maksājuma pieprasījuma tīkls neatbilst klienta tīklam.</translation>
-    </message>
-    <message>
-        <source>Payment request error</source>
-        <translation>Maksājumu pieprasījuma kļūda</translation>
-    </message>
-    <message>
-        <source>Cannot start bitcoin: click-to-pay handler</source>
-        <translation>Nevar palaist Bitcoin: nospied-lai-maksātu apstrādātāju</translation>
-    </message>
-    <message>
-        <source>Refund from %1</source>
-        <translation>Atmaksa no %1</translation>
-    </message>
-    <message>
-        <source>Payment acknowledged</source>
-        <translation>Maksājums atzīts</translation>
-    </message>
-    <message>
-        <source>Network request error</source>
-        <translation>Tīkla pieprasījuma kļūda</translation>
-    </message>
-</context>
 <context>
     <name>PeerTableModel</name>
     </context>
@@ -1034,25 +649,6 @@
         <translation>N/A</translation>
     </message>
     </context>
-<context>
-    <name>QRImageWidget</name>
-    <message>
-        <source>&amp;Save Image...</source>
-        <translation>&amp;Saglabāt Attēlu...</translation>
-    </message>
-    <message>
-        <source>&amp;Copy Image</source>
-        <translation>&amp;Kopēt Attēlu</translation>
-    </message>
-    <message>
-        <source>Save QR Code</source>
-        <translation>Saglabāt QR kodu</translation>
-    </message>
-    <message>
-        <source>PNG Image (*.png)</source>
-        <translation>PNG Attēls (*.png)</translation>
-    </message>
-</context>
 <context>
     <name>RPCConsole</name>
     <message>
@@ -1135,10 +731,6 @@
         <source>Out:</source>
         <translation>Iz.:</translation>
     </message>
-    <message>
-        <source>Build date</source>
-        <translation>Kompilācijas datums</translation>
-    </message>
     <message>
         <source>Debug log file</source>
         <translation>Atkļūdošanas žurnāla datne</translation>
@@ -1222,18 +814,6 @@
         <source>Remove</source>
         <translation>Noņemt</translation>
     </message>
-    <message>
-        <source>Copy label</source>
-        <translation>Kopēt nosaukumu</translation>
-    </message>
-    <message>
-        <source>Copy message</source>
-        <translation>Kopēt ziņojumu</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>Kopēt daudzumu</translation>
-    </message>
 </context>
 <context>
     <name>ReceiveRequestDialog</name>
@@ -1253,123 +833,56 @@
         <source>&amp;Save Image...</source>
         <translation>&amp;Saglabāt Attēlu...</translation>
     </message>
+</context>
+<context>
+    <name>SendCoinsDialog</name>
     <message>
-        <source>Request payment to %1</source>
-        <translation>Pieprasīt maksājumu uz %1</translation>
+        <source>Send Coins</source>
+        <translation>Sūtīt Bitkoinus</translation>
     </message>
     <message>
-        <source>Payment information</source>
-        <translation>Maksājuma informācija</translation>
+        <source>Coin Control Features</source>
+        <translation>Bitcoin Kontroles Funkcijas</translation>
     </message>
     <message>
-        <source>URI</source>
-        <translation>URI</translation>
+        <source>Inputs...</source>
+        <translation>Ieejas...</translation>
     </message>
     <message>
-        <source>Address</source>
-        <translation>Adrese</translation>
+        <source>automatically selected</source>
+        <translation>automātiski atlasīts</translation>
     </message>
     <message>
-        <source>Amount</source>
-        <translation>Daudzums</translation>
+        <source>Insufficient funds!</source>
+        <translation>Nepietiekami līdzekļi!</translation>
     </message>
     <message>
-        <source>Label</source>
-        <translation>Nosaukums</translation>
+        <source>Quantity:</source>
+        <translation>Daudzums:</translation>
     </message>
     <message>
-        <source>Message</source>
-        <translation>Ziņojums</translation>
+        <source>Bytes:</source>
+        <translation>Baiti:</translation>
     </message>
     <message>
-        <source>Resulting URI too long, try to reduce the text for label / message.</source>
-        <translation>Rezultāta URI pārāk garš, mēģiniet saīsināt nosaukumu vai ziņojumu. </translation>
+        <source>Amount:</source>
+        <translation>Daudzums:</translation>
     </message>
     <message>
-        <source>Error encoding URI into QR Code.</source>
-        <translation>Kļūda kodējot URI QR kodā.</translation>
+        <source>Priority:</source>
+        <translation>Prioritāte:</translation>
     </message>
-</context>
-<context>
-    <name>RecentRequestsTableModel</name>
     <message>
-        <source>Date</source>
-        <translation>Datums</translation>
+        <source>Fee:</source>
+        <translation>Maksa:</translation>
     </message>
     <message>
-        <source>Label</source>
-        <translation>Nosaukums</translation>
+        <source>After Fee:</source>
+        <translation>Pēc Maksas:</translation>
     </message>
     <message>
-        <source>Message</source>
-        <translation>Ziņojums</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>Daudzums</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(bez nosaukuma)</translation>
-    </message>
-    <message>
-        <source>(no message)</source>
-        <translation>(nav ziņojuma)</translation>
-    </message>
-    <message>
-        <source>(no amount)</source>
-        <translation>(nav summas)</translation>
-    </message>
-</context>
-<context>
-    <name>SendCoinsDialog</name>
-    <message>
-        <source>Send Coins</source>
-        <translation>Sūtīt Bitkoinus</translation>
-    </message>
-    <message>
-        <source>Coin Control Features</source>
-        <translation>Bitcoin Kontroles Funkcijas</translation>
-    </message>
-    <message>
-        <source>Inputs...</source>
-        <translation>Ieejas...</translation>
-    </message>
-    <message>
-        <source>automatically selected</source>
-        <translation>automātiski atlasīts</translation>
-    </message>
-    <message>
-        <source>Insufficient funds!</source>
-        <translation>Nepietiekami līdzekļi!</translation>
-    </message>
-    <message>
-        <source>Quantity:</source>
-        <translation>Daudzums:</translation>
-    </message>
-    <message>
-        <source>Bytes:</source>
-        <translation>Baiti:</translation>
-    </message>
-    <message>
-        <source>Amount:</source>
-        <translation>Daudzums:</translation>
-    </message>
-    <message>
-        <source>Priority:</source>
-        <translation>Prioritāte:</translation>
-    </message>
-    <message>
-        <source>Fee:</source>
-        <translation>Maksa:</translation>
-    </message>
-    <message>
-        <source>After Fee:</source>
-        <translation>Pēc Maksas:</translation>
-    </message>
-    <message>
-        <source>Change:</source>
-        <translation>Atlikums:</translation>
+        <source>Change:</source>
+        <translation>Atlikums:</translation>
     </message>
     <message>
         <source>Custom change address</source>
@@ -1407,78 +920,6 @@
         <source>S&amp;end</source>
         <translation>&amp;Sūtīt</translation>
     </message>
-    <message>
-        <source>Confirm send coins</source>
-        <translation>Apstiprināt bitkoinu sūtīšanu</translation>
-    </message>
-    <message>
-        <source>%1 to %2</source>
-        <translation>%1 līdz %2</translation>
-    </message>
-    <message>
-        <source>Copy quantity</source>
-        <translation>Kopēt daudzumu</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>Kopēt daudzumu</translation>
-    </message>
-    <message>
-        <source>Copy fee</source>
-        <translation>Kopēt maksu</translation>
-    </message>
-    <message>
-        <source>Copy after fee</source>
-        <translation>Kopēt pēc maksas</translation>
-    </message>
-    <message>
-        <source>Copy bytes</source>
-        <translation>Kopēt baitus</translation>
-    </message>
-    <message>
-        <source>Copy priority</source>
-        <translation>Kopēt prioritāti</translation>
-    </message>
-    <message>
-        <source>Copy change</source>
-        <translation>Kopēt atlikumu</translation>
-    </message>
-    <message>
-        <source>or</source>
-        <translation>vai</translation>
-    </message>
-    <message>
-        <source>The amount to pay must be larger than 0.</source>
-        <translation>Nosūtāmajai summai jābūt lielākai par 0.</translation>
-    </message>
-    <message>
-        <source>The amount exceeds your balance.</source>
-        <translation>Daudzums pārsniedz pieejamo.</translation>
-    </message>
-    <message>
-        <source>The total exceeds your balance when the %1 transaction fee is included.</source>
-        <translation>Kopsumma pārsniedz pieejamo, ja pieskaitīta %1 transakcijas maksa.</translation>
-    </message>
-    <message>
-        <source>Transaction creation failed!</source>
-        <translation>Transakcijas izveidošana neizdevās!</translation>
-    </message>
-    <message>
-        <source>Warning: Invalid Bitcoin address</source>
-        <translation>Brīdinājums: Nederīga Bitcoin adrese</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(bez nosaukuma)</translation>
-    </message>
-    <message>
-        <source>Warning: Unknown change address</source>
-        <translation>Brīdinājums: Nezināma atlikuma adrese</translation>
-    </message>
-    <message>
-        <source>added as transaction fee</source>
-        <translation>pievienots kā transakcijas maksa</translation>
-    </message>
 </context>
 <context>
     <name>SendCoinsEntry</name>
@@ -1490,10 +931,6 @@
         <source>Pay &amp;To:</source>
         <translation>&amp;Saņēmējs:</translation>
     </message>
-    <message>
-        <source>Enter a label for this address to add it to your address book</source>
-        <translation>Lai pievienotu adresi adrešu grāmatai, tai jādod nosaukums</translation>
-    </message>
     <message>
         <source>&amp;Label:</source>
         <translation>&amp;Nosaukums:</translation>
@@ -1537,10 +974,6 @@
 </context>
 <context>
     <name>ShutdownWindow</name>
-    <message>
-        <source>Bitcoin Core is shutting down...</source>
-        <translation>Bitcoin Core tiek izslēgta...</translation>
-    </message>
     <message>
         <source>Do not shut down the computer until this window disappears.</source>
         <translation>Neizslēdziet datoru kamēr šis logs nepazūd.</translation>
@@ -1612,69 +1045,9 @@
         <source>Reset all verify message fields</source>
         <translation>Atiestatīt visus laukus</translation>
     </message>
-    <message>
-        <source>Click "Sign Message" to generate signature</source>
-        <translation>Nospied "Parakstīt Ziņojumu" lai ģenerētu parakstu</translation>
-    </message>
-    <message>
-        <source>The entered address is invalid.</source>
-        <translation>Ievadītā adrese ir nederīga.</translation>
-    </message>
-    <message>
-        <source>Please check the address and try again.</source>
-        <translation>Lūdzu pārbaudi adresi un mēģini vēlreiz.</translation>
-    </message>
-    <message>
-        <source>The entered address does not refer to a key.</source>
-        <translation>Ievadītā adrese neattiecas uz atslēgu.</translation>
-    </message>
-    <message>
-        <source>Wallet unlock was cancelled.</source>
-        <translation>Maciņa atslēgšana tika atcelta.</translation>
-    </message>
-    <message>
-        <source>Private key for the entered address is not available.</source>
-        <translation>Privātā atslēga priekš ievadītās adreses nav pieejama.</translation>
-    </message>
-    <message>
-        <source>Message signing failed.</source>
-        <translation>Neizdevās parakstīt ziņojumu.</translation>
-    </message>
-    <message>
-        <source>Message signed.</source>
-        <translation>Ziņojums parakstīts.</translation>
-    </message>
-    <message>
-        <source>The signature could not be decoded.</source>
-        <translation>Paraksts nevarēja tikt dekodēts.</translation>
-    </message>
-    <message>
-        <source>Please check the signature and try again.</source>
-        <translation>Lūdzu pārbaudi parakstu un mēģini vēlreiz.</translation>
-    </message>
-    <message>
-        <source>The signature did not match the message digest.</source>
-        <translation>Paraksts neatbilda ziņojuma apkopojumam.</translation>
-    </message>
-    <message>
-        <source>Message verification failed.</source>
-        <translation>Ziņojumu neizdevās pārbaudīt.</translation>
-    </message>
-    <message>
-        <source>Message verified.</source>
-        <translation>Ziņojums pārbaudīts.</translation>
-    </message>
 </context>
 <context>
     <name>SplashScreen</name>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Bitcoin Core</translation>
-    </message>
-    <message>
-        <source>The Bitcoin Core developers</source>
-        <translation>Bitcoin Core izstrādātāji</translation>
-    </message>
     <message>
         <source>[testnet]</source>
         <translation>[testnets]</translation>
@@ -1687,410 +1060,16 @@
         <translation>KB/s</translation>
     </message>
 </context>
-<context>
-    <name>TransactionDesc</name>
-    <message>
-        <source>Open until %1</source>
-        <translation>Atvērts līdz %1</translation>
-    </message>
-    <message>
-        <source>conflicted</source>
-        <translation>pretrunā</translation>
-    </message>
-    <message>
-        <source>%1/offline</source>
-        <translation>%1/bezsaistē</translation>
-    </message>
-    <message>
-        <source>%1/unconfirmed</source>
-        <translation>%1/neapstiprinātas</translation>
-    </message>
-    <message>
-        <source>%1 confirmations</source>
-        <translation>%1 apstiprinājumu</translation>
-    </message>
-    <message>
-        <source>Status</source>
-        <translation>Status</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation>Datums</translation>
-    </message>
-    <message>
-        <source>Source</source>
-        <translation>Avots</translation>
-    </message>
-    <message>
-        <source>Generated</source>
-        <translation>Ģenerēts</translation>
-    </message>
-    <message>
-        <source>From</source>
-        <translation>No</translation>
-    </message>
-    <message>
-        <source>To</source>
-        <translation>Uz</translation>
-    </message>
-    <message>
-        <source>own address</source>
-        <translation>paša adrese</translation>
-    </message>
-    <message>
-        <source>label</source>
-        <translation>etiķete</translation>
-    </message>
-    <message>
-        <source>Credit</source>
-        <translation>Kredīts</translation>
-    </message>
-    <message>
-        <source>not accepted</source>
-        <translation>nav pieņemts</translation>
-    </message>
-    <message>
-        <source>Debit</source>
-        <translation>Debets</translation>
-    </message>
-    <message>
-        <source>Transaction fee</source>
-        <translation>Transakcijas maksa</translation>
-    </message>
-    <message>
-        <source>Net amount</source>
-        <translation>Neto summa</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>Ziņojums</translation>
-    </message>
-    <message>
-        <source>Comment</source>
-        <translation>Komentārs</translation>
-    </message>
-    <message>
-        <source>Transaction ID</source>
-        <translation>Transakcijas ID</translation>
-    </message>
-    <message>
-        <source>Merchant</source>
-        <translation>Tirgotājs</translation>
-    </message>
-    <message>
-        <source>Debug information</source>
-        <translation>Atkļūdošanas informācija</translation>
-    </message>
-    <message>
-        <source>Transaction</source>
-        <translation>Transakcija</translation>
-    </message>
-    <message>
-        <source>Inputs</source>
-        <translation>Ieejas</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>Daudzums</translation>
-    </message>
-    <message>
-        <source>true</source>
-        <translation>patiess</translation>
-    </message>
-    <message>
-        <source>false</source>
-        <translation>nepatiess</translation>
-    </message>
-    <message>
-        <source>, has not been successfully broadcast yet</source>
-        <translation>, vēl nav veiksmīgi izziņots</translation>
-    </message>
-    <message>
-        <source>unknown</source>
-        <translation>nav zināms</translation>
-    </message>
-</context>
 <context>
     <name>TransactionDescDialog</name>
-    <message>
-        <source>Transaction details</source>
-        <translation>Transakcijas detaļas</translation>
-    </message>
     <message>
         <source>This pane shows a detailed description of the transaction</source>
         <translation>Šis panelis parāda transakcijas detaļas</translation>
     </message>
 </context>
-<context>
-    <name>TransactionTableModel</name>
-    <message>
-        <source>Date</source>
-        <translation>Datums</translation>
-    </message>
-    <message>
-        <source>Type</source>
-        <translation>Tips</translation>
-    </message>
-    <message>
-        <source>Open until %1</source>
-        <translation>Atvērts līdz %1</translation>
-    </message>
-    <message>
-        <source>Confirmed (%1 confirmations)</source>
-        <translation>Apstiprināts (%1 apstiprinājumu)</translation>
-    </message>
-    <message>
-        <source>This block was not received by any other nodes and will probably not be accepted!</source>
-        <translation>Neviens cits mezgls šo bloku nav saņēmis un droši vien netiks akceptēts!</translation>
-    </message>
-    <message>
-        <source>Generated but not accepted</source>
-        <translation>Ģenerēts, taču nav akceptēts</translation>
-    </message>
-    <message>
-        <source>Offline</source>
-        <translation>Bezsaitē</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Nosaukums</translation>
-    </message>
-    <message>
-        <source>Unconfirmed</source>
-        <translation>Neapstiprināts</translation>
-    </message>
-    <message>
-        <source>Conflicted</source>
-        <translation>Pretrunā</translation>
-    </message>
-    <message>
-        <source>Received with</source>
-        <translation>Saņemts ar</translation>
-    </message>
-    <message>
-        <source>Received from</source>
-        <translation>Saņemts no</translation>
-    </message>
-    <message>
-        <source>Sent to</source>
-        <translation>Nosūtīts</translation>
-    </message>
-    <message>
-        <source>Payment to yourself</source>
-        <translation>Maksājums sev</translation>
-    </message>
-    <message>
-        <source>Mined</source>
-        <translation>Atrasts</translation>
-    </message>
-    <message>
-        <source>(n/a)</source>
-        <translation>(nav pieejams)</translation>
-    </message>
-    <message>
-        <source>Transaction status. Hover over this field to show number of confirmations.</source>
-        <translation>Transakcijas statuss. Turiet peli virs šī lauka, lai redzētu apstiprinājumu skaitu.</translation>
-    </message>
-    <message>
-        <source>Date and time that the transaction was received.</source>
-        <translation>Transakcijas saņemšanas datums un laiks.</translation>
-    </message>
-    <message>
-        <source>Type of transaction.</source>
-        <translation>Transakcijas tips.</translation>
-    </message>
-    <message>
-        <source>Amount removed from or added to balance.</source>
-        <translation>Bilancei pievienotais vai atņemtais daudzums.</translation>
-    </message>
-</context>
-<context>
-    <name>TransactionView</name>
-    <message>
-        <source>All</source>
-        <translation>Visi</translation>
-    </message>
-    <message>
-        <source>Today</source>
-        <translation>Šodien</translation>
-    </message>
-    <message>
-        <source>This week</source>
-        <translation>Šonedēļ</translation>
-    </message>
-    <message>
-        <source>This month</source>
-        <translation>Šomēnes</translation>
-    </message>
-    <message>
-        <source>Last month</source>
-        <translation>Pēdējais mēnesis</translation>
-    </message>
-    <message>
-        <source>This year</source>
-        <translation>Šogad</translation>
-    </message>
-    <message>
-        <source>Range...</source>
-        <translation>Diapazons...</translation>
-    </message>
-    <message>
-        <source>Received with</source>
-        <translation>Saņemts ar</translation>
-    </message>
-    <message>
-        <source>Sent to</source>
-        <translation>Nosūtīts</translation>
-    </message>
-    <message>
-        <source>To yourself</source>
-        <translation>Sev</translation>
-    </message>
-    <message>
-        <source>Mined</source>
-        <translation>Atrasts</translation>
-    </message>
-    <message>
-        <source>Other</source>
-        <translation>Cits</translation>
-    </message>
-    <message>
-        <source>Enter address or label to search</source>
-        <translation>Ierakstiet meklējamo nosaukumu vai adresi</translation>
-    </message>
-    <message>
-        <source>Min amount</source>
-        <translation>Minimālais daudzums</translation>
-    </message>
-    <message>
-        <source>Copy address</source>
-        <translation>Kopēt adresi</translation>
-    </message>
-    <message>
-        <source>Copy label</source>
-        <translation>Kopēt nosaukumu</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>Kopēt daudzumu</translation>
-    </message>
-    <message>
-        <source>Copy transaction ID</source>
-        <translation>Kopēt transakcijas ID</translation>
-    </message>
-    <message>
-        <source>Edit label</source>
-        <translation>Mainīt nosaukumu</translation>
-    </message>
-    <message>
-        <source>Show transaction details</source>
-        <translation>Rādīt transakcijas detaļas</translation>
-    </message>
-    <message>
-        <source>Export Transaction History</source>
-        <translation>Eksportēt Transakciju Vēsturi</translation>
-    </message>
-    <message>
-        <source>Exporting Failed</source>
-        <translation>Eksportēšana Neizdevās</translation>
-    </message>
-    <message>
-        <source>Exporting Successful</source>
-        <translation>Eksportēšana Veiksmīga</translation>
-    </message>
-    <message>
-        <source>The transaction history was successfully saved to %1.</source>
-        <translation>Transakciju vēsture tika veiksmīgi saglabāta uz %1.</translation>
-    </message>
-    <message>
-        <source>Comma separated file (*.csv)</source>
-        <translation>Fails ar komatu kā atdalītāju (*.csv)</translation>
-    </message>
-    <message>
-        <source>Confirmed</source>
-        <translation>Apstiprināts</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation>Datums</translation>
-    </message>
-    <message>
-        <source>Type</source>
-        <translation>Tips</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Nosaukums</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>Adrese</translation>
-    </message>
-    <message>
-        <source>ID</source>
-        <translation>ID</translation>
-    </message>
-    <message>
-        <source>Range:</source>
-        <translation>Diapazons:</translation>
-    </message>
-    <message>
-        <source>to</source>
-        <translation>uz</translation>
-    </message>
-</context>
 <context>
     <name>UnitDisplayStatusBarControl</name>
     </context>
-<context>
-    <name>WalletFrame</name>
-    <message>
-        <source>No wallet has been loaded.</source>
-        <translation>Neviens maciņš nav ielādēts.</translation>
-    </message>
-</context>
-<context>
-    <name>WalletModel</name>
-    <message>
-        <source>Send Coins</source>
-        <translation>Sūtīt Bitkoinus</translation>
-    </message>
-</context>
-<context>
-    <name>WalletView</name>
-    <message>
-        <source>&amp;Export</source>
-        <translation>&amp;Eksportēt</translation>
-    </message>
-    <message>
-        <source>Export the data in the current tab to a file</source>
-        <translation>Datus no tekošā ieliktņa eksportēt uz failu</translation>
-    </message>
-    <message>
-        <source>Backup Wallet</source>
-        <translation>Izveidot maciņa rezerves kopiju</translation>
-    </message>
-    <message>
-        <source>Wallet Data (*.dat)</source>
-        <translation>Maciņa dati (*.dat)</translation>
-    </message>
-    <message>
-        <source>Backup Failed</source>
-        <translation>Rezerves kopēšana neizdevās</translation>
-    </message>
-    <message>
-        <source>There was an error trying to save the wallet data to %1.</source>
-        <translation>Notikusi kļūme mēģinot saglabāt maciņa datus uz %1.</translation>
-    </message>
-    <message>
-        <source>The wallet data was successfully saved to %1.</source>
-        <translation>Maciņa dati tika veiksmīgi saglabāti uz %1.</translation>
-    </message>
-    <message>
-        <source>Backup Successful</source>
-        <translation>Dublēšana Veiksmīga</translation>
-    </message>
-</context>
 <context>
     <name>bitcoin-core</name>
     <message>
@@ -2117,6 +1096,10 @@
         <source>Run in the background as a daemon and accept commands</source>
         <translation>Darbināt fonā kā servisu un pieņemt komandas</translation>
     </message>
+    <message>
+        <source>Bitcoin Core</source>
+        <translation>Bitcoin Core</translation>
+    </message>
     <message>
         <source>&lt;category&gt; can be:</source>
         <translation>&lt;category&gt; var būt:</translation>
@@ -2161,26 +1144,10 @@
         <source>Wallet options:</source>
         <translation>Maciņa iespējas:</translation>
     </message>
-    <message>
-        <source>Cannot resolve -whitebind address: '%s'</source>
-        <translation>Nevar atrisināt -whitebind adresi: '%s'</translation>
-    </message>
     <message>
         <source>Information</source>
         <translation>Informācija</translation>
     </message>
-    <message>
-        <source>Invalid amount for -maxtxfee=&lt;amount&gt;: '%s'</source>
-        <translation>Nederīgs daudzums priekš -maxtxfee=&lt;amount&gt;: '%s'</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -minrelaytxfee=&lt;amount&gt;: '%s'</source>
-        <translation>Nederīgs daudzums priekš -minrelaytxfee=&lt;amount&gt;: '%s'</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -mintxfee=&lt;amount&gt;: '%s'</source>
-        <translation>Nederīgs daudzums priekš -mintxfee=&lt;amount&gt;: '%s'</translation>
-    </message>
     <message>
         <source>RPC server options:</source>
         <translation>RPC servera iestatījumi:</translation>
@@ -2213,10 +1180,6 @@
         <source>Warning</source>
         <translation>Brīdinājums</translation>
     </message>
-    <message>
-        <source>wallet.dat corrupt, salvage failed</source>
-        <translation>wallet.dat ir bojāts, glābšana neizdevās</translation>
-    </message>
     <message>
         <source>Password for JSON-RPC connections</source>
         <translation>JSON-RPC savienojumu parole</translation>
@@ -2225,10 +1188,6 @@
         <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
         <translation>Izpildīt komandu, kad labāk atbilstošais bloks izmainās (%s cmd aizvieto ar bloka hešu)</translation>
     </message>
-    <message>
-        <source>This help message</source>
-        <translation>Šis palīdzības paziņojums</translation>
-    </message>
     <message>
         <source>Allow DNS lookups for -addnode, -seednode and -connect</source>
         <translation>Atļaut DNS uzmeklēšanu priekš -addnode, -seednode un -connect</translation>
@@ -2237,14 +1196,6 @@
         <source>Loading addresses...</source>
         <translation>Ielādē adreses...</translation>
     </message>
-    <message>
-        <source>Error loading wallet.dat: Wallet corrupted</source>
-        <translation>Nevar ielādēt wallet.dat: maciņš bojāts</translation>
-    </message>
-    <message>
-        <source>Error loading wallet.dat</source>
-        <translation>Kļūda ielādējot wallet.dat</translation>
-    </message>
     <message>
         <source>Invalid -proxy address: '%s'</source>
         <translation>Nederīga -proxy adrese: '%s'</translation>
@@ -2253,18 +1204,6 @@
         <source>Unknown network specified in -onlynet: '%s'</source>
         <translation>-onlynet komandā norādīts nepazīstams tīkls: '%s'</translation>
     </message>
-    <message>
-        <source>Cannot resolve -bind address: '%s'</source>
-        <translation>Nevar uzmeklēt -bind adresi: '%s'</translation>
-    </message>
-    <message>
-        <source>Cannot resolve -externalip address: '%s'</source>
-        <translation>Nevar atrisināt -externalip adresi: '%s'</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -paytxfee=&lt;amount&gt;: '%s'</source>
-        <translation>Nederīgs daudzums priekš -paytxfree=&lt;amount&gt;: '%s'</translation>
-    </message>
     <message>
         <source>Insufficient funds</source>
         <translation>Nepietiek bitkoinu</translation>
diff --git a/src/qt/locale/bitcoin_mk_MK.ts b/src/qt/locale/bitcoin_mk_MK.ts
index b7797063b2856..b696111a5379a 100644
--- a/src/qt/locale/bitcoin_mk_MK.ts
+++ b/src/qt/locale/bitcoin_mk_MK.ts
@@ -25,10 +25,6 @@
         <source>C&amp;lose</source>
         <translation>З&amp;атвори</translation>
     </message>
-    <message>
-        <source>&amp;Copy Address</source>
-        <translation>&amp;Копирај Адреса</translation>
-    </message>
     <message>
         <source>Delete the currently selected address from the list</source>
         <translation>Избриши ја избраната адреса од листата</translation>
@@ -45,57 +41,6 @@
         <source>&amp;Delete</source>
         <translation>&amp;Избриши</translation>
     </message>
-    <message>
-        <source>Choose the address to send coins to</source>
-        <translation>Изберете адресата за да пратите биткоини</translation>
-    </message>
-    <message>
-        <source>Choose the address to receive coins with</source>
-        <translation>Изберете адресата за да примите биткоини</translation>
-    </message>
-    <message>
-        <source>C&amp;hoose</source>
-        <translation>И&amp;збери</translation>
-    </message>
-    <message>
-        <source>Sending addresses</source>
-        <translation>Адреси за праќање</translation>
-    </message>
-    <message>
-        <source>Receiving addresses</source>
-        <translation>Адреси за примање</translation>
-    </message>
-    <message>
-        <source>Copy &amp;Label</source>
-        <translation>Копирај &amp;Етикета</translation>
-    </message>
-    <message>
-        <source>&amp;Edit</source>
-        <translation>&amp;Уреди</translation>
-    </message>
-    <message>
-        <source>Export Address List</source>
-        <translation>Експортирај Листа со Адреси</translation>
-    </message>
-    <message>
-        <source>Exporting Failed</source>
-        <translation>Експортирањето не Успеа</translation>
-    </message>
-    </context>
-<context>
-    <name>AddressTableModel</name>
-    <message>
-        <source>Label</source>
-        <translation>Етикета</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>Адреса</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(без етикета)</translation>
-    </message>
 </context>
 <context>
     <name>AskPassphraseDialog</name>
@@ -111,70 +56,6 @@
         <source>Repeat new passphrase</source>
         <translation>Повторете ја новата тајна фраза</translation>
     </message>
-    <message>
-        <source>Encrypt wallet</source>
-        <translation>Криптирање на паричник</translation>
-    </message>
-    <message>
-        <source>Unlock wallet</source>
-        <translation>Отклучи паричник</translation>
-    </message>
-    <message>
-        <source>Decrypt wallet</source>
-        <translation>Декриптирање на паричник</translation>
-    </message>
-    <message>
-        <source>Change passphrase</source>
-        <translation>Измени тајна фраза</translation>
-    </message>
-    <message>
-        <source>Confirm wallet encryption</source>
-        <translation>Потврдете го криптирањето на паричникот</translation>
-    </message>
-    <message>
-        <source>Warning: If you encrypt your wallet and lose your passphrase, you will &lt;b&gt;LOSE ALL OF YOUR BITCOINS&lt;/b&gt;!</source>
-        <translation>Предупредување: Ако го шифрирате вашиот паричник и ја изгубите вашата тајна фраза, ќе &lt;b&gt;ГИ ИЗГУБИТЕ СИТЕ ВАШИ БИТКОИНИ&lt;/b&gt;!</translation>
-    </message>
-    <message>
-        <source>Are you sure you wish to encrypt your wallet?</source>
-        <translation>Дали сте сигурни дека сакате да криптирате вашиот паричник?</translation>
-    </message>
-    <message>
-        <source>Warning: The Caps Lock key is on!</source>
-        <translation>Предупредување: Caps Lock копчето е активно!</translation>
-    </message>
-    <message>
-        <source>Wallet encrypted</source>
-        <translation>Паричникот е криптиран</translation>
-    </message>
-    <message>
-        <source>Wallet encryption failed</source>
-        <translation>Криптирањето на паричникот е неуспешно</translation>
-    </message>
-    <message>
-        <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
-        <translation>Криптирањето на паричникот не успеа поради интерна грешка. Вашиот паричник не е криптиран.</translation>
-    </message>
-    <message>
-        <source>The supplied passphrases do not match.</source>
-        <translation>Приложените тајни фрази не се поклопуваат</translation>
-    </message>
-    <message>
-        <source>Wallet unlock failed</source>
-        <translation>Отклучувањето на паричникот е неуспешно</translation>
-    </message>
-    <message>
-        <source>The passphrase entered for the wallet decryption was incorrect.</source>
-        <translation>Тајната фраза која што ја внесовте за декриптирање на паричникот е неточна.</translation>
-    </message>
-    <message>
-        <source>Wallet decryption failed</source>
-        <translation>Декриптирањето на паричникот е неуспешно</translation>
-    </message>
-    <message>
-        <source>Wallet passphrase was successfully changed.</source>
-        <translation>Тајната фраза е успешно променета.</translation>
-    </message>
 </context>
 <context>
     <name>BanTableModel</name>
@@ -249,14 +130,6 @@
         <source>Open &amp;URI...</source>
         <translation>Отвори &amp;URI...</translation>
     </message>
-    <message>
-        <source>Bitcoin Core client</source>
-        <translation>Биткоин Core софтверот</translation>
-    </message>
-    <message>
-        <source>Importing blocks from disk...</source>
-        <translation>Внесување на блокови од дискот...</translation>
-    </message>
     <message>
         <source>Reindexing blocks on disk...</source>
         <translation>Повторно индексирање на блокови од дискот...</translation>
@@ -285,10 +158,6 @@
         <source>&amp;Receive</source>
         <translation>&amp;Прими</translation>
     </message>
-    <message>
-        <source>Show information about Bitcoin Core</source>
-        <translation>Прикажи информации за Биткоин Core</translation>
-    </message>
     <message>
         <source>&amp;Show / Hide</source>
         <translation>&amp;Прикажи / Сокриј</translation>
@@ -305,14 +174,6 @@
         <source>&amp;Help</source>
         <translation>&amp;Помош</translation>
     </message>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Биткоин Core</translation>
-    </message>
-    <message>
-        <source>&amp;About Bitcoin Core</source>
-        <translation>&amp;За Биткоин Core</translation>
-    </message>
     <message numerus="yes">
         <source>Processed %n block(s) of transaction history.</source>
         <translation><numerusform>Обработен %n блок од историјата на трансакции.</numerusform><numerusform>Обработени %n блокови од историјата на трансакции.</numerusform></translation>
@@ -384,9 +245,6 @@
 </translation>
     </message>
     </context>
-<context>
-    <name>ClientModel</name>
-    </context>
 <context>
     <name>CoinControlDialog</name>
     <message>
@@ -429,126 +287,6 @@
         <source>Priority</source>
         <translation>Приоритет</translation>
     </message>
-    <message>
-        <source>Copy address</source>
-        <translation>Копирај адреса</translation>
-    </message>
-    <message>
-        <source>Copy label</source>
-        <translation>Копирај етикета</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>Копирај сума</translation>
-    </message>
-    <message>
-        <source>Lock unspent</source>
-        <translation>Заклучи непотрошени</translation>
-    </message>
-    <message>
-        <source>Unlock unspent</source>
-        <translation>Отклучи непотрошени</translation>
-    </message>
-    <message>
-        <source>Copy quantity</source>
-        <translation>Копирај количина</translation>
-    </message>
-    <message>
-        <source>Copy fee</source>
-        <translation>Копирај провизија</translation>
-    </message>
-    <message>
-        <source>Copy after fee</source>
-        <translation>Копирај после провизија</translation>
-    </message>
-    <message>
-        <source>Copy bytes</source>
-        <translation>Копирај бајти</translation>
-    </message>
-    <message>
-        <source>Copy priority</source>
-        <translation>Копирај приоритет</translation>
-    </message>
-    <message>
-        <source>Copy dust</source>
-        <translation>Копирај прашина</translation>
-    </message>
-    <message>
-        <source>Copy change</source>
-        <translation>Копирај кусур</translation>
-    </message>
-    <message>
-        <source>highest</source>
-        <translation>највисок</translation>
-    </message>
-    <message>
-        <source>higher</source>
-        <translation>повисок</translation>
-    </message>
-    <message>
-        <source>high</source>
-        <translation>висок</translation>
-    </message>
-    <message>
-        <source>medium-high</source>
-        <translation>средно-висок</translation>
-    </message>
-    <message>
-        <source>medium</source>
-        <translation>среден</translation>
-    </message>
-    <message>
-        <source>low-medium</source>
-        <translation>ниско-среден</translation>
-    </message>
-    <message>
-        <source>low</source>
-        <translation>низок</translation>
-    </message>
-    <message>
-        <source>lower</source>
-        <translation>понизок</translation>
-    </message>
-    <message>
-        <source>lowest</source>
-        <translation>најнизок</translation>
-    </message>
-    <message>
-        <source>none</source>
-        <translation>нема</translation>
-    </message>
-    <message>
-        <source>This label turns red if the transaction size is greater than 1000 bytes.</source>
-        <translation>Оваа етикета станува црвена ако големината на трансакцијата е поголема од 1000 бајти.</translation>
-    </message>
-    <message>
-        <source>This label turns red if the priority is smaller than "medium".</source>
-        <translation>Оваа етикета станува црвена ако приоритетот е помал од "среден".</translation>
-    </message>
-    <message>
-        <source>This label turns red if any recipient receives an amount smaller than %1.</source>
-        <translation>Оваа етикета станува црвена ако примачот прими сума помала од %1.</translation>
-    </message>
-    <message>
-        <source>yes</source>
-        <translation>да</translation>
-    </message>
-    <message>
-        <source>no</source>
-        <translation>не</translation>
-    </message>
-    <message>
-        <source>Transactions with higher priority are more likely to get included into a block.</source>
-        <translation>Трансакциите со повисок приоритет имаат поголеми шанси да бидат вклучени во блок.</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(без етикета)</translation>
-    </message>
-    <message>
-        <source>(change)</source>
-        <translation>(кусур)</translation>
-    </message>
 </context>
 <context>
     <name>EditAddressDialog</name>
@@ -564,7 +302,7 @@
         <source>&amp;Address</source>
         <translation>&amp;Адреса</translation>
     </message>
-    </context>
+</context>
 <context>
     <name>FreespaceChecker</name>
     <message>
@@ -574,10 +312,6 @@
     </context>
 <context>
     <name>HelpMessageDialog</name>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Биткоин Core</translation>
-    </message>
     <message>
         <source>version</source>
         <translation>верзија</translation>
@@ -586,17 +320,9 @@
         <source>(%1-bit)</source>
         <translation>(%1-бит)</translation>
     </message>
-    <message>
-        <source>About Bitcoin Core</source>
-        <translation>За Биткоин Core</translation>
-    </message>
     </context>
 <context>
     <name>Intro</name>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Биткоин Core</translation>
-    </message>
     <message>
         <source>Error</source>
         <translation>Грешка</translation>
@@ -655,9 +381,6 @@
         <translation>Вкупно:</translation>
     </message>
     </context>
-<context>
-    <name>PaymentServer</name>
-    </context>
 <context>
     <name>PeerTableModel</name>
     </context>
@@ -688,21 +411,6 @@
         <translation>%1 мс</translation>
     </message>
 </context>
-<context>
-    <name>QRImageWidget</name>
-    <message>
-        <source>&amp;Save Image...</source>
-        <translation>&amp;Сними Слика...</translation>
-    </message>
-    <message>
-        <source>Save QR Code</source>
-        <translation>Сними QR Код</translation>
-    </message>
-    <message>
-        <source>PNG Image (*.png)</source>
-        <translation>PNG Слика (*.png)</translation>
-    </message>
-</context>
 <context>
     <name>RPCConsole</name>
     <message>
@@ -768,19 +476,7 @@
         <source>Show</source>
         <translation>Прикажи</translation>
     </message>
-    <message>
-        <source>Copy label</source>
-        <translation>Копирај етикета</translation>
-    </message>
-    <message>
-        <source>Copy message</source>
-        <translation>Копирај порака</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>Копирај сума</translation>
-    </message>
-</context>
+    </context>
 <context>
     <name>ReceiveRequestDialog</name>
     <message>
@@ -799,50 +495,7 @@
         <source>&amp;Save Image...</source>
         <translation>&amp;Сними Слика...</translation>
     </message>
-    <message>
-        <source>URI</source>
-        <translation>URI</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>Адреса</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>Сума</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Етикета</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>Порака</translation>
-    </message>
-    </context>
-<context>
-    <name>RecentRequestsTableModel</name>
-    <message>
-        <source>Date</source>
-        <translation>Дата</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Етикета</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>Порака</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>Сума</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(без етикета)</translation>
-    </message>
-    </context>
+</context>
 <context>
     <name>SendCoinsDialog</name>
     <message>
@@ -873,42 +526,6 @@
         <source>Dust:</source>
         <translation>Прашина:</translation>
     </message>
-    <message>
-        <source>Copy quantity</source>
-        <translation>Копирај количина</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>Копирај сума</translation>
-    </message>
-    <message>
-        <source>Copy fee</source>
-        <translation>Копирај провизија</translation>
-    </message>
-    <message>
-        <source>Copy after fee</source>
-        <translation>Копирај после провизија</translation>
-    </message>
-    <message>
-        <source>Copy bytes</source>
-        <translation>Копирај бајти</translation>
-    </message>
-    <message>
-        <source>Copy priority</source>
-        <translation>Копирај приоритет</translation>
-    </message>
-    <message>
-        <source>Copy change</source>
-        <translation>Копирај кусур</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(без етикета)</translation>
-    </message>
-    <message>
-        <source>Copy dust</source>
-        <translation>Копирај прашина</translation>
-    </message>
     </context>
 <context>
     <name>SendCoinsEntry</name>
@@ -933,100 +550,26 @@
     </context>
 <context>
     <name>SplashScreen</name>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Биткоин Core</translation>
-    </message>
     </context>
 <context>
     <name>TrafficGraphWidget</name>
     </context>
-<context>
-    <name>TransactionDesc</name>
-    <message>
-        <source>Date</source>
-        <translation>Дата</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>Порака</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>Сума</translation>
-    </message>
-    </context>
 <context>
     <name>TransactionDescDialog</name>
     </context>
-<context>
-    <name>TransactionTableModel</name>
-    <message>
-        <source>Date</source>
-        <translation>Дата</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Етикета</translation>
-    </message>
-    </context>
-<context>
-    <name>TransactionView</name>
-    <message>
-        <source>Copy address</source>
-        <translation>Копирај Адреса</translation>
-    </message>
-    <message>
-        <source>Copy label</source>
-        <translation>Копирај етикета</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>Копирај сума</translation>
-    </message>
-    <message>
-        <source>Exporting Failed</source>
-        <translation>Експортирањето не Успеа</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation>Дата</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Етикета</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>Адреса</translation>
-    </message>
-    </context>
 <context>
     <name>UnitDisplayStatusBarControl</name>
     </context>
-<context>
-    <name>WalletFrame</name>
-    </context>
-<context>
-    <name>WalletModel</name>
-    </context>
-<context>
-    <name>WalletView</name>
-    <message>
-        <source>&amp;Export</source>
-        <translation>&amp;Експорт</translation>
-    </message>
-    <message>
-        <source>Export the data in the current tab to a file</source>
-        <translation>Експортирај ги податоците од активното јазиче во датотека</translation>
-    </message>
-    </context>
 <context>
     <name>bitcoin-core</name>
     <message>
         <source>Options:</source>
         <translation>Опции:</translation>
     </message>
+    <message>
+        <source>Bitcoin Core</source>
+        <translation>Биткоин Core</translation>
+    </message>
     <message>
         <source>Warning</source>
         <translation>Предупредување</translation>
diff --git a/src/qt/locale/bitcoin_mn.ts b/src/qt/locale/bitcoin_mn.ts
index b790010066c29..e38320ac5d271 100644
--- a/src/qt/locale/bitcoin_mn.ts
+++ b/src/qt/locale/bitcoin_mn.ts
@@ -21,10 +21,6 @@
         <source>C&amp;lose</source>
         <translation>&amp;Хаах</translation>
     </message>
-    <message>
-        <source>&amp;Copy Address</source>
-        <translation>Хаягийг &amp;Хуулбарлах</translation>
-    </message>
     <message>
         <source>Delete the currently selected address from the list</source>
         <translation>Одоо сонгогдсон байгаа хаягуудыг жагсаалтаас устгах</translation>
@@ -41,65 +37,6 @@
         <source>&amp;Delete</source>
         <translation>&amp;Устгах</translation>
     </message>
-    <message>
-        <source>Choose the address to send coins to</source>
-        <translation>Зооснуудыг илгээх хаягийг сонгоно уу</translation>
-    </message>
-    <message>
-        <source>Choose the address to receive coins with</source>
-        <translation>Зооснуудыг хүлээн авах хаягийг сонгоно уу</translation>
-    </message>
-    <message>
-        <source>C&amp;hoose</source>
-        <translation>С&amp;онго</translation>
-    </message>
-    <message>
-        <source>Sending addresses</source>
-        <translation>Илгээх хаягууд</translation>
-    </message>
-    <message>
-        <source>Receiving addresses</source>
-        <translation>Хүлээн авах хаяг</translation>
-    </message>
-    <message>
-        <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source>
-        <translation>Эдгээр Биткойн хаягууд нь илгээх хаягууд. Хүлээн авах хаяг болон тоо хэмжээг илгээхээсээ өмнө сайн нягталж үзэж байна уу</translation>
-    </message>
-    <message>
-        <source>These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source>
-        <translation>Эдгээр Биткойн хаягууд нь хүлээн авах хаягууд. Гүйлгээ болгонд шинээр хаяг үүсгэхийг бид санал болгож байна.</translation>
-    </message>
-    <message>
-        <source>Copy &amp;Label</source>
-        <translation>&amp;Шошгыг хуулбарлах</translation>
-    </message>
-    <message>
-        <source>&amp;Edit</source>
-        <translation>&amp;Ѳѳрчлѳх</translation>
-    </message>
-    <message>
-        <source>Export Address List</source>
-        <translation>Экспорт хийх хаягуудын жагсаалт</translation>
-    </message>
-    <message>
-        <source>Comma separated file (*.csv)</source>
-        <translation>Таслалаар тусгаарлагдсан хүснэгтэн файл (.csv)</translation>
-    </message>
-    </context>
-<context>
-    <name>AddressTableModel</name>
-    <message>
-        <source>Label</source>
-        <translation>Шошго</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>Хаяг</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(шошгогүй)</translation>
-    </message>
 </context>
 <context>
     <name>AskPassphraseDialog</name>
@@ -115,66 +52,6 @@
         <source>Repeat new passphrase</source>
         <translation>Шинэ нууц үгийг давтана уу</translation>
     </message>
-    <message>
-        <source>Encrypt wallet</source>
-        <translation>Түрүйвчийг цоожлох</translation>
-    </message>
-    <message>
-        <source>This operation needs your wallet passphrase to unlock the wallet.</source>
-        <translation>Энэ үйлдэлийг гүйцэтгэхийн тулд та нууц үгээрээ түрүйвчийн цоожийг тайлах хэрэгтэй</translation>
-    </message>
-    <message>
-        <source>Unlock wallet</source>
-        <translation>Түрүйвчийн цоожийг тайлах</translation>
-    </message>
-    <message>
-        <source>This operation needs your wallet passphrase to decrypt the wallet.</source>
-        <translation>Энэ үйлдэлийг гүйцэтгэхийн тулд та эхлээд түрүйвчийн нууц үгийг оруулж цоожийг тайлах шаардлагтай.</translation>
-    </message>
-    <message>
-        <source>Decrypt wallet</source>
-        <translation>Түрүйвчийн цоожийг устгах</translation>
-    </message>
-    <message>
-        <source>Change passphrase</source>
-        <translation>Нууц үгийг солих</translation>
-    </message>
-    <message>
-        <source>Confirm wallet encryption</source>
-        <translation>Түрүйвчийн цоожийг баталгаажуулах</translation>
-    </message>
-    <message>
-        <source>Wallet encrypted</source>
-        <translation>Түрүйвч цоожлогдлоо</translation>
-    </message>
-    <message>
-        <source>Wallet encryption failed</source>
-        <translation>Түрүйвчийн цоожлол амжилттай болсонгүй</translation>
-    </message>
-    <message>
-        <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
-        <translation>Түрүйвчийн цоожлол дотоод алдаанаас үүдэн амжилттай болсонгүй. Түрүйвч цоожлогдоогүй байна.</translation>
-    </message>
-    <message>
-        <source>The supplied passphrases do not match.</source>
-        <translation>Таны оруулсан нууц үг таарсангүй</translation>
-    </message>
-    <message>
-        <source>Wallet unlock failed</source>
-        <translation>Түрүйвчийн цоож тайлагдсангүй</translation>
-    </message>
-    <message>
-        <source>The passphrase entered for the wallet decryption was incorrect.</source>
-        <translation>Таны оруулсан түрүйвчийн цоожийг тайлах нууц үг буруу байна</translation>
-    </message>
-    <message>
-        <source>Wallet decryption failed</source>
-        <translation>Түрүйвчийн цоож амжилттай устгагдсангүй</translation>
-    </message>
-    <message>
-        <source>Wallet passphrase was successfully changed.</source>
-        <translation>Түрүйвчийн нууц үг амжилттай ѳѳр</translation>
-    </message>
 </context>
 <context>
     <name>BanTableModel</name>
@@ -298,9 +175,6 @@
         <translation>Түрүйвч &lt;b&gt;цоожтой&lt;/b&gt; ба одоогоор цоож &lt;b&gt;хаалттай&lt;/b&gt; байна</translation>
     </message>
 </context>
-<context>
-    <name>ClientModel</name>
-    </context>
 <context>
     <name>CoinControlDialog</name>
     <message>
@@ -323,31 +197,7 @@
         <source>Confirmed</source>
         <translation>Баталгаажлаа</translation>
     </message>
-    <message>
-        <source>Copy address</source>
-        <translation>Хаягийг санах</translation>
-    </message>
-    <message>
-        <source>Copy label</source>
-        <translation>Шошгыг санах</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>Хэмжээг санах</translation>
-    </message>
-    <message>
-        <source>Copy change</source>
-        <translation>Ѳѳрчлѳлтийг санах</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(шошгогүй)</translation>
-    </message>
-    <message>
-        <source>(change)</source>
-        <translation>(ѳѳрчлѳх)</translation>
-    </message>
-</context>
+    </context>
 <context>
     <name>EditAddressDialog</name>
     <message>
@@ -362,34 +212,6 @@
         <source>&amp;Address</source>
         <translation>&amp;Хаяг</translation>
     </message>
-    <message>
-        <source>New receiving address</source>
-        <translation>Шинэ хүлээн авах хаяг</translation>
-    </message>
-    <message>
-        <source>New sending address</source>
-        <translation>Шинэ явуулах хаяг</translation>
-    </message>
-    <message>
-        <source>Edit receiving address</source>
-        <translation>Хүлээн авах хаягийг ѳѳрчлѳх</translation>
-    </message>
-    <message>
-        <source>Edit sending address</source>
-        <translation>Явуулах хаягийг ѳѳрчлѳх</translation>
-    </message>
-    <message>
-        <source>The entered address "%1" is already in the address book.</source>
-        <translation>Таны оруулсан хаяг "%1" нь хаягийн бүртгэлд ѳмнѳ нь орсон байна</translation>
-    </message>
-    <message>
-        <source>Could not unlock wallet.</source>
-        <translation>Түрүйвчийн цоожийг тайлж чадсангүй</translation>
-    </message>
-    <message>
-        <source>New key generation failed.</source>
-        <translation>Шинэ түлхүүр амжилттай гарсангүй</translation>
-    </message>
 </context>
 <context>
     <name>FreespaceChecker</name>
@@ -453,9 +275,6 @@
         <translation>Хэрэглэж болох хэмжээ:</translation>
     </message>
     </context>
-<context>
-    <name>PaymentServer</name>
-    </context>
 <context>
     <name>PeerTableModel</name>
     </context>
@@ -470,13 +289,6 @@
         <translation>Алга Байна</translation>
     </message>
     </context>
-<context>
-    <name>QRImageWidget</name>
-    <message>
-        <source>PNG Image (*.png)</source>
-        <translation>PNG форматын зураг (*.png)</translation>
-    </message>
-</context>
 <context>
     <name>RPCConsole</name>
     <message>
@@ -562,18 +374,6 @@
         <source>Remove</source>
         <translation>Устгах</translation>
     </message>
-    <message>
-        <source>Copy label</source>
-        <translation>Шошгыг санах</translation>
-    </message>
-    <message>
-        <source>Copy message</source>
-        <translation>Зурвасыг санах</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>Хэмжээг санах</translation>
-    </message>
 </context>
 <context>
     <name>ReceiveRequestDialog</name>
@@ -581,49 +381,6 @@
         <source>Copy &amp;Address</source>
         <translation>Хаягийг &amp;Хуулбарлах</translation>
     </message>
-    <message>
-        <source>Address</source>
-        <translation>Хаяг</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>Хэмжээ</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Шошго</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>Зурвас</translation>
-    </message>
-    </context>
-<context>
-    <name>RecentRequestsTableModel</name>
-    <message>
-        <source>Date</source>
-        <translation>Огноо</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Шошго</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>Зурвас</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>Хэмжээ</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(шошгогүй)</translation>
-    </message>
-    <message>
-        <source>(no message)</source>
-        <translation>(зурвас алга)</translation>
-    </message>
     </context>
 <context>
     <name>SendCoinsDialog</name>
@@ -671,43 +428,7 @@
         <source>S&amp;end</source>
         <translation>Яв&amp;уул</translation>
     </message>
-    <message>
-        <source>Confirm send coins</source>
-        <translation>Зоос явуулахыг баталгаажуулна уу</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>Хэмжээг санах</translation>
-    </message>
-    <message>
-        <source>Copy change</source>
-        <translation>Ѳѳрчлѳлтийг санах</translation>
-    </message>
-    <message>
-        <source>or</source>
-        <translation>эсвэл</translation>
-    </message>
-    <message>
-        <source>The amount to pay must be larger than 0.</source>
-        <translation>Тѳлѳх хэмжээ 0.-оос их байх ёстой</translation>
-    </message>
-    <message>
-        <source>The amount exceeds your balance.</source>
-        <translation>Энэ хэмжээ таны балансаас хэтэрсэн байна.</translation>
-    </message>
-    <message>
-        <source>The total exceeds your balance when the %1 transaction fee is included.</source>
-        <translation>Гүйлгээний тѳлбѳр %1-ийг тооцхоор нийт дүн нь таны балансаас хэтрээд байна.</translation>
-    </message>
-    <message>
-        <source>Warning: Invalid Bitcoin address</source>
-        <translation>Анхаар:Буруу Биткойны хаяг байна</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(шошгогүй)</translation>
-    </message>
-    </context>
+</context>
 <context>
     <name>SendCoinsEntry</name>
     <message>
@@ -718,10 +439,6 @@
         <source>Pay &amp;To:</source>
         <translation>Тѳлѳх &amp;хаяг:</translation>
     </message>
-    <message>
-        <source>Enter a label for this address to add it to your address book</source>
-        <translation>Энэ хаягийг ѳѳрийн бүртгэлдээ авахын тулд шошго оруул</translation>
-    </message>
     <message>
         <source>&amp;Label:</source>
         <translation>&amp;Шошго:</translation>
@@ -749,10 +466,6 @@
     </context>
 <context>
     <name>ShutdownWindow</name>
-    <message>
-        <source>Bitcoin Core is shutting down...</source>
-        <translation>Биткойны цѳм хаагдаж байна...</translation>
-    </message>
     <message>
         <source>Do not shut down the computer until this window disappears.</source>
         <translation>Энэ цонхыг хаагдтал компьютерээ бүү унтраагаарай</translation>
@@ -783,278 +496,16 @@
 <context>
     <name>TrafficGraphWidget</name>
     </context>
-<context>
-    <name>TransactionDesc</name>
-    <message>
-        <source>Open until %1</source>
-        <translation>%1 хүртэл нээлттэй</translation>
-    </message>
-    <message>
-        <source>conflicted</source>
-        <translation>зѳрчилдлѳѳ</translation>
-    </message>
-    <message>
-        <source>%1/unconfirmed</source>
-        <translation>%1/баталгаажаагүй</translation>
-    </message>
-    <message>
-        <source>%1 confirmations</source>
-        <translation>%1 баталгаажилтууд</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation>Огноо</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>Зурвас</translation>
-    </message>
-    <message>
-        <source>Transaction ID</source>
-        <translation>Тодорхойлолт</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>Хэмжээ</translation>
-    </message>
-    <message>
-        <source>, has not been successfully broadcast yet</source>
-        <translation>, хараахан амжилттай цацагдаагүй байна</translation>
-    </message>
-    <message>
-        <source>unknown</source>
-        <translation>үл мэдэгдэх</translation>
-    </message>
-</context>
 <context>
     <name>TransactionDescDialog</name>
-    <message>
-        <source>Transaction details</source>
-        <translation>Гүйлгээний мэдээллэл</translation>
-    </message>
     <message>
         <source>This pane shows a detailed description of the transaction</source>
         <translation>Гүйлгээний дэлгэрэнгүйг энэ бичил цонх харуулж байна</translation>
     </message>
 </context>
-<context>
-    <name>TransactionTableModel</name>
-    <message>
-        <source>Date</source>
-        <translation>Огноо</translation>
-    </message>
-    <message>
-        <source>Type</source>
-        <translation>Тѳрѳл</translation>
-    </message>
-    <message>
-        <source>Open until %1</source>
-        <translation>%1 хүртэл нээлттэй</translation>
-    </message>
-    <message>
-        <source>Confirmed (%1 confirmations)</source>
-        <translation>Баталгаажлаа (%1 баталгаажилт)</translation>
-    </message>
-    <message>
-        <source>This block was not received by any other nodes and will probably not be accepted!</source>
-        <translation>Энэ блокийг аль ч нод хүлээн авсангүй ба ер нь зѳвшѳѳрѳгдѳхгүй байж мэднэ!</translation>
-    </message>
-    <message>
-        <source>Generated but not accepted</source>
-        <translation>Үүсгэгдсэн гэхдээ хүлээн авагдаагүй</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Шошго</translation>
-    </message>
-    <message>
-        <source>Unconfirmed</source>
-        <translation>Баталгаажаагүй</translation>
-    </message>
-    <message>
-        <source>Conflicted</source>
-        <translation>Зѳрчилдлѳѳ</translation>
-    </message>
-    <message>
-        <source>Received with</source>
-        <translation>Хүлээн авсан хаяг</translation>
-    </message>
-    <message>
-        <source>Received from</source>
-        <translation>Хүлээн авагдсан хаяг</translation>
-    </message>
-    <message>
-        <source>Sent to</source>
-        <translation>Явуулсан хаяг</translation>
-    </message>
-    <message>
-        <source>Payment to yourself</source>
-        <translation>Ѳѳрлүүгээ хийсэн тѳлбѳр</translation>
-    </message>
-    <message>
-        <source>Mined</source>
-        <translation>Олборлогдсон</translation>
-    </message>
-    <message>
-        <source>(n/a)</source>
-        <translation>(алга байна)</translation>
-    </message>
-    <message>
-        <source>Transaction status. Hover over this field to show number of confirmations.</source>
-        <translation>Гүйлгээний байдал. Энд хулганыг авчирч баталгаажуулалтын тоог харна уу.</translation>
-    </message>
-    <message>
-        <source>Date and time that the transaction was received.</source>
-        <translation>Гүйлгээг хүлээн авсан огноо ба цаг.</translation>
-    </message>
-    <message>
-        <source>Type of transaction.</source>
-        <translation>Гүйлгээний тѳрѳл</translation>
-    </message>
-    <message>
-        <source>Amount removed from or added to balance.</source>
-        <translation>Балансаас авагдсан болон нэмэгдсэн хэмжээ.</translation>
-    </message>
-</context>
-<context>
-    <name>TransactionView</name>
-    <message>
-        <source>All</source>
-        <translation>Бүгд</translation>
-    </message>
-    <message>
-        <source>Today</source>
-        <translation>Ѳнѳѳдѳр</translation>
-    </message>
-    <message>
-        <source>This week</source>
-        <translation>Энэ долоо хоног</translation>
-    </message>
-    <message>
-        <source>This month</source>
-        <translation>Энэ сар</translation>
-    </message>
-    <message>
-        <source>Last month</source>
-        <translation>Ѳнгѳрсѳн сар</translation>
-    </message>
-    <message>
-        <source>This year</source>
-        <translation>Энэ жил</translation>
-    </message>
-    <message>
-        <source>Received with</source>
-        <translation>Хүлээн авсан хаяг</translation>
-    </message>
-    <message>
-        <source>Sent to</source>
-        <translation>Явуулсан хаяг</translation>
-    </message>
-    <message>
-        <source>To yourself</source>
-        <translation>Ѳѳрлүүгээ</translation>
-    </message>
-    <message>
-        <source>Mined</source>
-        <translation>Олборлогдсон</translation>
-    </message>
-    <message>
-        <source>Other</source>
-        <translation>Бусад</translation>
-    </message>
-    <message>
-        <source>Enter address or label to search</source>
-        <translation>Хайлт хийхийн тулд хаяг эсвэл шошгыг оруул</translation>
-    </message>
-    <message>
-        <source>Min amount</source>
-        <translation>Хамгийн бага хэмжээ</translation>
-    </message>
-    <message>
-        <source>Copy address</source>
-        <translation>Хаягийг санах</translation>
-    </message>
-    <message>
-        <source>Copy label</source>
-        <translation>Шошгыг санах</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>Хэмжээг санах</translation>
-    </message>
-    <message>
-        <source>Edit label</source>
-        <translation>Шошгыг ѳѳрчлѳх</translation>
-    </message>
-    <message>
-        <source>Show transaction details</source>
-        <translation>Гүйлгээний дэлгэрэнгүйг харуул</translation>
-    </message>
-    <message>
-        <source>The transaction history was successfully saved to %1.</source>
-        <translation>Гүйлгээнүй түүхийг %1-д амжилттай хадгаллаа.</translation>
-    </message>
-    <message>
-        <source>Comma separated file (*.csv)</source>
-        <translation>Таслалаар тусгаарлагдсан хүснэгтэн файл (.csv)</translation>
-    </message>
-    <message>
-        <source>Confirmed</source>
-        <translation>Баталгаажлаа</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation>Огноо</translation>
-    </message>
-    <message>
-        <source>Type</source>
-        <translation>Тѳрѳл</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Шошго</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>Хаяг</translation>
-    </message>
-    <message>
-        <source>ID</source>
-        <translation>Тодорхойлолт</translation>
-    </message>
-    <message>
-        <source>to</source>
-        <translation>-рүү/руу</translation>
-    </message>
-</context>
 <context>
     <name>UnitDisplayStatusBarControl</name>
     </context>
-<context>
-    <name>WalletFrame</name>
-    <message>
-        <source>No wallet has been loaded.</source>
-        <translation>Ямар ч түрүйвч ачааллагдсангүй.</translation>
-    </message>
-</context>
-<context>
-    <name>WalletModel</name>
-    <message>
-        <source>Send Coins</source>
-        <translation>Зоос явуулах</translation>
-    </message>
-</context>
-<context>
-    <name>WalletView</name>
-    <message>
-        <source>&amp;Export</source>
-        <translation>&amp;Экспортдлох</translation>
-    </message>
-    <message>
-        <source>Export the data in the current tab to a file</source>
-        <translation>Сонгогдсон таб дээрхи дата-г экспортлох</translation>
-    </message>
-    </context>
 <context>
     <name>bitcoin-core</name>
     <message>
@@ -1073,14 +524,6 @@
         <source>Loading addresses...</source>
         <translation>Хаягуудыг ачааллаж байна...</translation>
     </message>
-    <message>
-        <source>Error loading wallet.dat: Wallet corrupted</source>
-        <translation>wallet.dat-ыг ачааллахад алдаа гарлаа: Түрүйвч эвдэрсэн байна</translation>
-    </message>
-    <message>
-        <source>Error loading wallet.dat</source>
-        <translation>wallet.dat-ыг ачааллахад алдаа гарлаа</translation>
-    </message>
     <message>
         <source>Invalid -proxy address: '%s'</source>
         <translation>Эдгээр прокси хаягнууд буруу байна: '%s'</translation>
diff --git a/src/qt/locale/bitcoin_ms_MY.ts b/src/qt/locale/bitcoin_ms_MY.ts
index df98dd839646c..de4c32c2df868 100644
--- a/src/qt/locale/bitcoin_ms_MY.ts
+++ b/src/qt/locale/bitcoin_ms_MY.ts
@@ -17,10 +17,6 @@
         <source>&amp;Copy</source>
         <translation>&amp;Salin</translation>
     </message>
-    <message>
-        <source>&amp;Copy Address</source>
-        <translation>&amp;Salin Alamat</translation>
-    </message>
     <message>
         <source>&amp;Export</source>
         <translation>&amp;Eksport</translation>
@@ -29,30 +25,7 @@
         <source>&amp;Delete</source>
         <translation>&amp;Padam</translation>
     </message>
-    <message>
-        <source>Choose the address to send coins to</source>
-        <translation>Pilih alamat untuk menghantar syiling</translation>
-    </message>
-    <message>
-        <source>Choose the address to receive coins with</source>
-        <translation>Pilih alamat untuk menerima syiling</translation>
-    </message>
-    <message>
-        <source>C&amp;hoose</source>
-        <translation>&amp;Pilih</translation>
-    </message>
-    <message>
-        <source>Comma separated file (*.csv)</source>
-        <translation>Fail yang dipisahkan dengan koma</translation>
-    </message>
-    </context>
-<context>
-    <name>AddressTableModel</name>
-    <message>
-        <source>Address</source>
-        <translation>Alamat</translation>
-    </message>
-    </context>
+</context>
 <context>
     <name>AskPassphraseDialog</name>
     </context>
@@ -66,9 +39,6 @@
         <translation>Pilihan</translation>
     </message>
     </context>
-<context>
-    <name>ClientModel</name>
-    </context>
 <context>
     <name>CoinControlDialog</name>
     </context>
@@ -82,7 +52,7 @@
         <source>&amp;Address</source>
         <translation>Alamat</translation>
     </message>
-    </context>
+</context>
 <context>
     <name>FreespaceChecker</name>
     </context>
@@ -101,18 +71,12 @@
 <context>
     <name>OverviewPage</name>
     </context>
-<context>
-    <name>PaymentServer</name>
-    </context>
 <context>
     <name>PeerTableModel</name>
     </context>
 <context>
     <name>QObject</name>
     </context>
-<context>
-    <name>QRImageWidget</name>
-    </context>
 <context>
     <name>RPCConsole</name>
     </context>
@@ -125,13 +89,6 @@
         <source>Copy &amp;Address</source>
         <translation>&amp;Salin Alamat</translation>
     </message>
-    <message>
-        <source>Address</source>
-        <translation>Alamat</translation>
-    </message>
-    </context>
-<context>
-    <name>RecentRequestsTableModel</name>
     </context>
 <context>
     <name>SendCoinsDialog</name>
@@ -155,42 +112,12 @@
 <context>
     <name>TrafficGraphWidget</name>
     </context>
-<context>
-    <name>TransactionDesc</name>
-    </context>
 <context>
     <name>TransactionDescDialog</name>
     </context>
-<context>
-    <name>TransactionTableModel</name>
-    </context>
-<context>
-    <name>TransactionView</name>
-    <message>
-        <source>Comma separated file (*.csv)</source>
-        <translation>Fail yang dipisahkan dengan koma</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>Alamat</translation>
-    </message>
-    </context>
 <context>
     <name>UnitDisplayStatusBarControl</name>
     </context>
-<context>
-    <name>WalletFrame</name>
-    </context>
-<context>
-    <name>WalletModel</name>
-    </context>
-<context>
-    <name>WalletView</name>
-    <message>
-        <source>&amp;Export</source>
-        <translation>&amp;Eksport</translation>
-    </message>
-    </context>
 <context>
     <name>bitcoin-core</name>
     </context>
diff --git a/src/qt/locale/bitcoin_nb.ts b/src/qt/locale/bitcoin_nb.ts
index 94e02f8900ed1..b5ffdb2e10253 100644
--- a/src/qt/locale/bitcoin_nb.ts
+++ b/src/qt/locale/bitcoin_nb.ts
@@ -25,10 +25,6 @@
         <source>C&amp;lose</source>
         <translation>&amp;Lukk</translation>
     </message>
-    <message>
-        <source>&amp;Copy Address</source>
-        <translation>&amp;Kopier Adresse</translation>
-    </message>
     <message>
         <source>Delete the currently selected address from the list</source>
         <translation>Slett den valgte adressen fra listen.</translation>
@@ -45,73 +41,6 @@
         <source>&amp;Delete</source>
         <translation>&amp;Slett</translation>
     </message>
-    <message>
-        <source>Choose the address to send coins to</source>
-        <translation>Velg adressen å sende mynter til</translation>
-    </message>
-    <message>
-        <source>Choose the address to receive coins with</source>
-        <translation>Velg adressen til å motta mynter med</translation>
-    </message>
-    <message>
-        <source>C&amp;hoose</source>
-        <translation>&amp;Velg</translation>
-    </message>
-    <message>
-        <source>Sending addresses</source>
-        <translation>Utsendingsadresser</translation>
-    </message>
-    <message>
-        <source>Receiving addresses</source>
-        <translation>Mottaksadresser</translation>
-    </message>
-    <message>
-        <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source>
-        <translation>Dette er dine Bitcoin-adresser for å sende betalinger. Alltid sjekk beløp og mottakeradresse før sending av mynter.</translation>
-    </message>
-    <message>
-        <source>These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source>
-        <translation>Dette er dine Bitcoin-adresser for å sende betalinger. Det er anbefalt å bruk en ny mottaksadresse for hver transaksjon.</translation>
-    </message>
-    <message>
-        <source>Copy &amp;Label</source>
-        <translation>Kopier &amp;Merkelapp</translation>
-    </message>
-    <message>
-        <source>&amp;Edit</source>
-        <translation>&amp;Rediger</translation>
-    </message>
-    <message>
-        <source>Export Address List</source>
-        <translation>Ekporter Adresseliste</translation>
-    </message>
-    <message>
-        <source>Comma separated file (*.csv)</source>
-        <translation>Kommaseparert fil (*.csv)</translation>
-    </message>
-    <message>
-        <source>Exporting Failed</source>
-        <translation>Eksportering feilet</translation>
-    </message>
-    <message>
-        <source>There was an error trying to save the address list to %1. Please try again.</source>
-        <translation>Det oppstod en feil under lagring av adresselisten til %1. Vennligst prøv på nytt.</translation>
-    </message>
-</context>
-<context>
-    <name>AddressTableModel</name>
-    <message>
-        <source>Label</source>
-        <translation>Merkelapp</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>Adresse</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(ingen merkelapp)</translation>
-    </message>
 </context>
 <context>
     <name>AskPassphraseDialog</name>
@@ -131,94 +60,6 @@
         <source>Repeat new passphrase</source>
         <translation>Gjenta ny adgangsfrase</translation>
     </message>
-    <message>
-        <source>Encrypt wallet</source>
-        <translation>Krypter lommebok</translation>
-    </message>
-    <message>
-        <source>This operation needs your wallet passphrase to unlock the wallet.</source>
-        <translation>Denne operasjonen krever adgangsfrasen til lommeboken for å låse den opp.</translation>
-    </message>
-    <message>
-        <source>Unlock wallet</source>
-        <translation>Lås opp lommebok</translation>
-    </message>
-    <message>
-        <source>This operation needs your wallet passphrase to decrypt the wallet.</source>
-        <translation>Denne operasjonen krever adgangsfrasen til lommeboken for å dekryptere den.</translation>
-    </message>
-    <message>
-        <source>Decrypt wallet</source>
-        <translation>Dekrypter lommebok</translation>
-    </message>
-    <message>
-        <source>Change passphrase</source>
-        <translation>Endre adgangsfrase</translation>
-    </message>
-    <message>
-        <source>Confirm wallet encryption</source>
-        <translation>Bekreft kryptering av lommebok</translation>
-    </message>
-    <message>
-        <source>Warning: If you encrypt your wallet and lose your passphrase, you will &lt;b&gt;LOSE ALL OF YOUR BITCOINS&lt;/b&gt;!</source>
-        <translation>Advarsel: Hvis du krypterer lommeboken og mister adgangsfrasen, så vil du &lt;b&gt;MISTE ALLE DINE BITCOINS&lt;/b&gt;!</translation>
-    </message>
-    <message>
-        <source>Are you sure you wish to encrypt your wallet?</source>
-        <translation>Er du sikker på at du vil kryptere lommeboken?</translation>
-    </message>
-    <message>
-        <source>Bitcoin Core will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source>
-        <translation>Bitcoin Core vil nå avslutte for å fullføre krypteringsprosessen. Husk at kryptering av lommeboken ikke kan beskytte fullstendig mot tyveri av dine bitcoins hvis datamaskinen din er infisert av skadevare.</translation>
-    </message>
-    <message>
-        <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source>
-        <translation>VIKTIG: Tidligere sikkerhetskopier av din lommebokfil bør erstattes med den nylig genererte og krypterte filen, da de blir ugyldiggjort av sikkerhetshensyn så snart du begynner å bruke den nye krypterte lommeboken.</translation>
-    </message>
-    <message>
-        <source>Warning: The Caps Lock key is on!</source>
-        <translation>Advarsel: Caps Lock er på!</translation>
-    </message>
-    <message>
-        <source>Wallet encrypted</source>
-        <translation>Lommebok kryptert</translation>
-    </message>
-    <message>
-        <source>Enter the new passphrase to the wallet.&lt;br/&gt;Please use a passphrase of &lt;b&gt;ten or more random characters&lt;/b&gt;, or &lt;b&gt;eight or more words&lt;/b&gt;.</source>
-        <translation>Oppgi adgangsfrasen til lommeboken.&lt;br/&gt;Vennligst bruk en adgangsfrase med &lt;b&gt;ti eller flere tilfeldige tegn&lt;/b&gt;, eller &lt;b&gt;åtte eller flere ord&lt;/b&gt;.</translation>
-    </message>
-    <message>
-        <source>Enter the old passphrase and new passphrase to the wallet.</source>
-        <translation>Oppgi gammel og ny adgangsfrase til lommeboken.</translation>
-    </message>
-    <message>
-        <source>Wallet encryption failed</source>
-        <translation>Kryptering av lommebok feilet</translation>
-    </message>
-    <message>
-        <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
-        <translation>Kryptering av lommebok feilet på grunn av en intern feil. Din lommebok ble ikke kryptert.</translation>
-    </message>
-    <message>
-        <source>The supplied passphrases do not match.</source>
-        <translation>De angitte adgangsfrasene er ulike.</translation>
-    </message>
-    <message>
-        <source>Wallet unlock failed</source>
-        <translation>Opplåsing av lommebok feilet</translation>
-    </message>
-    <message>
-        <source>The passphrase entered for the wallet decryption was incorrect.</source>
-        <translation>Adgangsfrasen angitt for dekryptering av lommeboken var feil.</translation>
-    </message>
-    <message>
-        <source>Wallet decryption failed</source>
-        <translation>Dekryptering av lommebok feilet</translation>
-    </message>
-    <message>
-        <source>Wallet passphrase was successfully changed.</source>
-        <translation>Adgangsfrase for lommebok endret.</translation>
-    </message>
 </context>
 <context>
     <name>BanTableModel</name>
@@ -269,6 +110,10 @@
         <source>Quit application</source>
         <translation>Avslutt applikasjonen</translation>
     </message>
+    <message>
+        <source>&amp;About %1</source>
+        <translation> &amp;Om %1</translation>
+    </message>
     <message>
         <source>About &amp;Qt</source>
         <translation>Om &amp;Qt</translation>
@@ -305,14 +150,6 @@
         <source>Open &amp;URI...</source>
         <translation>Åpne &amp;URI...</translation>
     </message>
-    <message>
-        <source>Bitcoin Core client</source>
-        <translation>Bitcoin Core-klient</translation>
-    </message>
-    <message>
-        <source>Importing blocks from disk...</source>
-        <translation>Importere blokker...</translation>
-    </message>
     <message>
         <source>Reindexing blocks on disk...</source>
         <translation>Reindekserer blokker på harddisk...</translation>
@@ -357,10 +194,6 @@
         <source>&amp;Receive</source>
         <translation>&amp;Motta</translation>
     </message>
-    <message>
-        <source>Show information about Bitcoin Core</source>
-        <translation>Vis informasjon om Bitcoin Core</translation>
-    </message>
     <message>
         <source>&amp;Show / Hide</source>
         <translation>&amp;Vis / Skjul</translation>
@@ -397,22 +230,10 @@
         <source>Tabs toolbar</source>
         <translation>Verktøylinje for faner</translation>
     </message>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Bitcoin Core</translation>
-    </message>
     <message>
         <source>Request payments (generates QR codes and bitcoin: URIs)</source>
         <translation>Forespør betalinger (genererer QR-koder og bitcoin: URIer)</translation>
     </message>
-    <message>
-        <source>&amp;About Bitcoin Core</source>
-        <translation>&amp;Om Bitcoin Core</translation>
-    </message>
-    <message>
-        <source>Modify configuration options for Bitcoin Core</source>
-        <translation>Endre konfigurasjonsvalg for Bitcoin Core</translation>
-    </message>
     <message>
         <source>Show the list of used sending addresses and labels</source>
         <translation>Vis listen av brukte utsendingsadresser og merkelapper</translation>
@@ -429,10 +250,6 @@
         <source>&amp;Command-line options</source>
         <translation>&amp;Kommandolinjevalg</translation>
     </message>
-    <message>
-        <source>Show the Bitcoin Core help message to get a list with possible Bitcoin command-line options</source>
-        <translation>Vis Bitcoin Core hjelpemeldingen for å få en liste med mulige kommandolinjevalg</translation>
-    </message>
     <message numerus="yes">
         <source>%n active connection(s) to Bitcoin network</source>
         <translation><numerusform>%n aktiv forbindelse til Bitcoin-nettverket</numerusform><numerusform>%n aktive forbindelser til Bitcoin-nettverket</numerusform></translation>
@@ -544,13 +361,6 @@
         <translation>Lommeboken er &lt;b&gt;kryptert&lt;/b&gt; og for tiden &lt;b&gt;låst&lt;/b&gt;</translation>
     </message>
 </context>
-<context>
-    <name>ClientModel</name>
-    <message>
-        <source>Network Alert</source>
-        <translation>Nettverksvarsel</translation>
-    </message>
-</context>
 <context>
     <name>CoinControlDialog</name>
     <message>
@@ -629,150 +439,6 @@
         <source>Priority</source>
         <translation>Prioritet</translation>
     </message>
-    <message>
-        <source>Copy address</source>
-        <translation>Kopier adresse</translation>
-    </message>
-    <message>
-        <source>Copy label</source>
-        <translation>Kopier merkelapp</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>Kopier beløp</translation>
-    </message>
-    <message>
-        <source>Copy transaction ID</source>
-        <translation>Kopier transaksjons-ID</translation>
-    </message>
-    <message>
-        <source>Lock unspent</source>
-        <translation>Lås ubrukte</translation>
-    </message>
-    <message>
-        <source>Unlock unspent</source>
-        <translation>Lås opp ubrukte</translation>
-    </message>
-    <message>
-        <source>Copy quantity</source>
-        <translation>Kopier mengde</translation>
-    </message>
-    <message>
-        <source>Copy fee</source>
-        <translation>Kopier gebyr</translation>
-    </message>
-    <message>
-        <source>Copy after fee</source>
-        <translation>Kopier totalt</translation>
-    </message>
-    <message>
-        <source>Copy bytes</source>
-        <translation>Kopier bytes</translation>
-    </message>
-    <message>
-        <source>Copy priority</source>
-        <translation>Kopier prioritet</translation>
-    </message>
-    <message>
-        <source>Copy dust</source>
-        <translation>Kopier støv</translation>
-    </message>
-    <message>
-        <source>Copy change</source>
-        <translation>Kopier veksel</translation>
-    </message>
-    <message>
-        <source>highest</source>
-        <translation>høyest</translation>
-    </message>
-    <message>
-        <source>higher</source>
-        <translation>høyere</translation>
-    </message>
-    <message>
-        <source>high</source>
-        <translation>høy</translation>
-    </message>
-    <message>
-        <source>medium-high</source>
-        <translation>medium-høy</translation>
-    </message>
-    <message>
-        <source>medium</source>
-        <translation>medium</translation>
-    </message>
-    <message>
-        <source>low-medium</source>
-        <translation>lav-medium</translation>
-    </message>
-    <message>
-        <source>low</source>
-        <translation>lav</translation>
-    </message>
-    <message>
-        <source>lower</source>
-        <translation>lavere</translation>
-    </message>
-    <message>
-        <source>lowest</source>
-        <translation>lavest</translation>
-    </message>
-    <message>
-        <source>(%1 locked)</source>
-        <translation>(%1 låst)</translation>
-    </message>
-    <message>
-        <source>none</source>
-        <translation>ingen</translation>
-    </message>
-    <message>
-        <source>This label turns red if the transaction size is greater than 1000 bytes.</source>
-        <translation>Denne teksten blir rød hvis transaksjonsstørrelsen er større enn 1000 bytes.</translation>
-    </message>
-    <message>
-        <source>This label turns red if the priority is smaller than "medium".</source>
-        <translation>Denne teksten blir rød hvis prioriteten er lavere enn "medium".</translation>
-    </message>
-    <message>
-        <source>This label turns red if any recipient receives an amount smaller than %1.</source>
-        <translation>Denne teksten blir rød dersom en mottaker mottar et beløp mindre enn %1.</translation>
-    </message>
-    <message>
-        <source>Can vary +/- %1 satoshi(s) per input.</source>
-        <translation>Kan variere +/- %1 satoshi(er) per input.</translation>
-    </message>
-    <message>
-        <source>yes</source>
-        <translation>ja</translation>
-    </message>
-    <message>
-        <source>no</source>
-        <translation>nei</translation>
-    </message>
-    <message>
-        <source>This means a fee of at least %1 per kB is required.</source>
-        <translation>Dette betyr at et gebyr på minst %1 per KB er påkrevd.</translation>
-    </message>
-    <message>
-        <source>Can vary +/- 1 byte per input.</source>
-        <translation>Kan variere +/- 1 byte per input.</translation>
-    </message>
-    <message>
-        <source>Transactions with higher priority are more likely to get included into a block.</source>
-        <translation>Transaksjoner med høyere prioritet har mer sannsynlighet for å bli inkludert i en blokk.</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(ingen merkelapp)</translation>
-    </message>
-    <message>
-        <source>change from %1 (%2)</source>
-        <translation>veksel fra %1 (%2)</translation>
-    </message>
-    <message>
-        <source>(change)</source>
-        <translation>(veksel)</translation>
-    </message>
 </context>
 <context>
     <name>EditAddressDialog</name>
@@ -796,38 +462,6 @@
         <source>&amp;Address</source>
         <translation>&amp;Adresse</translation>
     </message>
-    <message>
-        <source>New receiving address</source>
-        <translation>Ny mottaksadresse</translation>
-    </message>
-    <message>
-        <source>New sending address</source>
-        <translation>Ny utsendingsadresse</translation>
-    </message>
-    <message>
-        <source>Edit receiving address</source>
-        <translation>Rediger mottaksadresse</translation>
-    </message>
-    <message>
-        <source>Edit sending address</source>
-        <translation>Rediger utsendingsadresse</translation>
-    </message>
-    <message>
-        <source>The entered address "%1" is already in the address book.</source>
-        <translation>Den oppgitte adressen "%1" er allerede i adresseboken.</translation>
-    </message>
-    <message>
-        <source>The entered address "%1" is not a valid Bitcoin address.</source>
-        <translation>Den angitte adressed "%1" er ikke en gyldig Bitcoin-adresse.</translation>
-    </message>
-    <message>
-        <source>Could not unlock wallet.</source>
-        <translation>Kunne ikke låse opp lommeboken.</translation>
-    </message>
-    <message>
-        <source>New key generation failed.</source>
-        <translation>Generering av ny nøkkel feilet.</translation>
-    </message>
 </context>
 <context>
     <name>FreespaceChecker</name>
@@ -854,10 +488,6 @@
 </context>
 <context>
     <name>HelpMessageDialog</name>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Bitcoin Core</translation>
-    </message>
     <message>
         <source>version</source>
         <translation>versjon</translation>
@@ -866,10 +496,6 @@
         <source>(%1-bit)</source>
         <translation> (%1-bit)</translation>
     </message>
-    <message>
-        <source>About Bitcoin Core</source>
-        <translation>Om Bitcoin Core</translation>
-    </message>
     <message>
         <source>Command-line options</source>
         <translation>Kommandolinjevalg</translation>
@@ -906,29 +532,13 @@
         <source>Show splash screen on startup (default: %u)</source>
         <translation>Vis velkomstbilde ved oppstart (default: %u)</translation>
     </message>
-    <message>
-        <source>Reset all settings changes made over the GUI</source>
-        <translation>Nullstill alle oppsettendringer gjort via det grafiske grensesnittet</translation>
-    </message>
-</context>
+    </context>
 <context>
     <name>Intro</name>
     <message>
         <source>Welcome</source>
         <translation>Velkommen</translation>
     </message>
-    <message>
-        <source>Welcome to Bitcoin Core.</source>
-        <translation>Velkommen til Bitcoin Core.</translation>
-    </message>
-    <message>
-        <source>As this is the first time the program is launched, you can choose where Bitcoin Core will store its data.</source>
-        <translation>Siden dette er første gang programmet starter, kan du nå velge hvor Bitcoin Core skal lagre sine data.</translation>
-    </message>
-    <message>
-        <source>Bitcoin Core will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source>
-        <translation>Bitcoin Core vil laste ned og lagre en kopi av Bitcoin sin blokkjede. Minst %1GB av data vil bli lagret i denne mappen, og det vil vokse over tid. Lommeboken vil også bli lagret i denne mappen.</translation>
-    </message>
     <message>
         <source>Use the default data directory</source>
         <translation>Bruk standard datamappe</translation>
@@ -937,10 +547,6 @@
         <source>Use a custom data directory:</source>
         <translation>Bruk en egendefinert datamappe:</translation>
     </message>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Bitcoin Core</translation>
-    </message>
     <message>
         <source>Error: Specified data directory "%1" cannot be created.</source>
         <translation>Feil: Den oppgitte datamappen "%1" kan ikke opprettes.</translation>
@@ -976,10 +582,6 @@
         <source>Select payment request file</source>
         <translation>Velg fil for betalingsetterspørring</translation>
     </message>
-    <message>
-        <source>Select payment request file to open</source>
-        <translation>Velg fil for betalingsetterspørring å åpne</translation>
-    </message>
 </context>
 <context>
     <name>OptionsDialog</name>
@@ -1019,10 +621,6 @@
         <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Exit in the menu.</source>
         <translation>Minimer i stedet for å avslutte applikasjonen når vinduet lukkes. Når dette er valgt, vil applikasjonen avsluttes kun etter at Avslutte er valgt i menyen.</translation>
     </message>
-    <message>
-        <source>The user interface language can be set here. This setting will take effect after restarting Bitcoin Core.</source>
-        <translation>Språk for brukergrensesnittet kan velges her. Denne innstillingen trer i kraft etter omstart av Bitcoin Core.</translation>
-    </message>
     <message>
         <source>Third party URLs (e.g. a block explorer) that appear in the transactions tab as context menu items. %s in the URL is replaced by transaction hash. Multiple URLs are separated by vertical bar |.</source>
         <translation>Tredjepart URLer (f. eks. en blokkutforsker) som dukker opp i transaksjonsfanen som kontekst meny elementer. %s i URLen er erstattet med transaksjonen sin hash. Flere URLer er separert av en vertikal linje |.</translation>
@@ -1047,14 +645,6 @@
         <source>&amp;Network</source>
         <translation>&amp;Nettverk</translation>
     </message>
-    <message>
-        <source>Automatically start Bitcoin Core after logging in to the system.</source>
-        <translation>Start Bitcoin Core automatisk ved oppstart av datamaskinen.</translation>
-    </message>
-    <message>
-        <source>&amp;Start Bitcoin Core on system login</source>
-        <translation>&amp;Start Bitcoin Core ved oppstart av datamaskinen</translation>
-    </message>
     <message>
         <source>(0 = auto, &lt;0 = leave that many cores free)</source>
         <translation>(0 = automatisk, &lt;0 = la så mange kjerner være ledig)</translation>
@@ -1284,182 +874,72 @@
     </message>
 </context>
 <context>
-    <name>PaymentServer</name>
+    <name>PeerTableModel</name>
     <message>
-        <source>URI handling</source>
-        <translation>URI-håndtering</translation>
+        <source>User Agent</source>
+        <translation>Brukeragent</translation>
     </message>
     <message>
-        <source>Invalid payment address %1</source>
-        <translation>Ugyldig betalingsadresse %1</translation>
+        <source>Node/Service</source>
+        <translation>Node/Tjeneste</translation>
     </message>
     <message>
-        <source>Payment request rejected</source>
-        <translation>Betalingsetterspørring avvist</translation>
+        <source>Ping Time</source>
+        <translation>Ping-tid</translation>
     </message>
+</context>
+<context>
+    <name>QObject</name>
     <message>
-        <source>Payment request network doesn't match client network.</source>
-        <translation>Nettverk for betalingsetterspørring er ikke i overensstemmelse med klientnettverket.</translation>
+        <source>Amount</source>
+        <translation>Beløp</translation>
     </message>
     <message>
-        <source>Payment request is not initialized.</source>
-        <translation>Betalingsetterspørringen er ikke initialisert.</translation>
+        <source>Enter a Bitcoin address (e.g. %1)</source>
+        <translation>Oppgi en Bitcoin-adresse (f.eks. %1)</translation>
     </message>
     <message>
-        <source>Requested payment amount of %1 is too small (considered dust).</source>
-        <translation>Forespurt betalingsmengde på %1 er for liten (betraktet som støv).</translation>
+        <source>%1 d</source>
+        <translation>%1 d</translation>
     </message>
     <message>
-        <source>Payment request error</source>
-        <translation>Betalingsetterspørringsfeil</translation>
+        <source>%1 h</source>
+        <translation>%1 t</translation>
     </message>
     <message>
-        <source>Cannot start bitcoin: click-to-pay handler</source>
-        <translation>Kan ikke starte Bitcoin: klikk-og-betal håndterer</translation>
+        <source>%1 m</source>
+        <translation>%1 m</translation>
     </message>
     <message>
-        <source>Payment request fetch URL is invalid: %1</source>
-        <translation>Hentelenke for betalingsetterspørring er ugyldig: %1</translation>
+        <source>%1 s</source>
+        <translation>%1 s</translation>
     </message>
     <message>
-        <source>URI cannot be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source>
-        <translation>URI kan ikke fortolkes! Dette kan være forårsaket av en ugyldig Bitcoin-adresse eller feilformede URI-parametre.</translation>
+        <source>None</source>
+        <translation>Ingen</translation>
     </message>
     <message>
-        <source>Payment request file handling</source>
-        <translation>Filhåndtering for betalingsetterspørring</translation>
+        <source>N/A</source>
+        <translation>-</translation>
     </message>
     <message>
-        <source>Payment request file cannot be read! This can be caused by an invalid payment request file.</source>
-        <translation>Betalingsetterspørringsfil kan ikke leses! Dette kan være forårsaket av en ugyldig betalingsetterspørringsfil.</translation>
+        <source>%1 ms</source>
+        <translation>%1 ms</translation>
     </message>
+</context>
+<context>
+    <name>RPCConsole</name>
     <message>
-        <source>Payment request expired.</source>
-        <translation>Betalingsetterspørringen har utløpt.</translation>
+        <source>Client name</source>
+        <translation>Klientnavn</translation>
     </message>
     <message>
-        <source>Unverified payment requests to custom payment scripts are unsupported.</source>
-        <translation>Uverifiserte betalingsforespørsler til egentilpassede betalingscript er ikke støttet.</translation>
+        <source>N/A</source>
+        <translation>-</translation>
     </message>
     <message>
-        <source>Invalid payment request.</source>
-        <translation>Ugyldig betalingsetterspørring.</translation>
-    </message>
-    <message>
-        <source>Refund from %1</source>
-        <translation>Refundering fra %1</translation>
-    </message>
-    <message>
-        <source>Payment request %1 is too large (%2 bytes, allowed %3 bytes).</source>
-        <translation>Betalingsforespørsel %1 er for stor (%2 bytes, tillatt %3 bytes).</translation>
-    </message>
-    <message>
-        <source>Error communicating with %1: %2</source>
-        <translation>Feil i kommunikasjonen med %1: %2</translation>
-    </message>
-    <message>
-        <source>Payment request cannot be parsed!</source>
-        <translation>Betaingsetterspørrelse kan ikke fortolkes!</translation>
-    </message>
-    <message>
-        <source>Bad response from server %1</source>
-        <translation>Dårlig svar fra server %1</translation>
-    </message>
-    <message>
-        <source>Payment acknowledged</source>
-        <translation>Betaling erkjent</translation>
-    </message>
-    <message>
-        <source>Network request error</source>
-        <translation>Nettverksforespørsel feil</translation>
-    </message>
-</context>
-<context>
-    <name>PeerTableModel</name>
-    <message>
-        <source>User Agent</source>
-        <translation>Brukeragent</translation>
-    </message>
-    <message>
-        <source>Node/Service</source>
-        <translation>Node/Tjeneste</translation>
-    </message>
-    <message>
-        <source>Ping Time</source>
-        <translation>Ping-tid</translation>
-    </message>
-</context>
-<context>
-    <name>QObject</name>
-    <message>
-        <source>Amount</source>
-        <translation>Beløp</translation>
-    </message>
-    <message>
-        <source>Enter a Bitcoin address (e.g. %1)</source>
-        <translation>Oppgi en Bitcoin-adresse (f.eks. %1)</translation>
-    </message>
-    <message>
-        <source>%1 d</source>
-        <translation>%1 d</translation>
-    </message>
-    <message>
-        <source>%1 h</source>
-        <translation>%1 t</translation>
-    </message>
-    <message>
-        <source>%1 m</source>
-        <translation>%1 m</translation>
-    </message>
-    <message>
-        <source>%1 s</source>
-        <translation>%1 s</translation>
-    </message>
-    <message>
-        <source>None</source>
-        <translation>Ingen</translation>
-    </message>
-    <message>
-        <source>N/A</source>
-        <translation>-</translation>
-    </message>
-    <message>
-        <source>%1 ms</source>
-        <translation>%1 ms</translation>
-    </message>
-</context>
-<context>
-    <name>QRImageWidget</name>
-    <message>
-        <source>&amp;Save Image...</source>
-        <translation>&amp;Lagre Bilde...</translation>
-    </message>
-    <message>
-        <source>&amp;Copy Image</source>
-        <translation>&amp;Kopier Bilde</translation>
-    </message>
-    <message>
-        <source>Save QR Code</source>
-        <translation>Lagre QR-kode</translation>
-    </message>
-    <message>
-        <source>PNG Image (*.png)</source>
-        <translation>PNG-bilde (*.png)</translation>
-    </message>
-</context>
-<context>
-    <name>RPCConsole</name>
-    <message>
-        <source>Client name</source>
-        <translation>Klientnavn</translation>
-    </message>
-    <message>
-        <source>N/A</source>
-        <translation>-</translation>
-    </message>
-    <message>
-        <source>Client version</source>
-        <translation>Klientversjon</translation>
+        <source>Client version</source>
+        <translation>Klientversjon</translation>
     </message>
     <message>
         <source>&amp;Information</source>
@@ -1513,10 +993,6 @@
         <source>Memory usage</source>
         <translation>Minnebruk</translation>
     </message>
-    <message>
-        <source>Open the Bitcoin Core debug log file from the current data directory. This can take a few seconds for large log files.</source>
-        <translation>Åpne Bitcoin Core sin loggfil for feilsøk fra gjeldende datamappe. Dette kan ta noen sekunder for store loggfiler.</translation>
-    </message>
     <message>
         <source>Received</source>
         <translation>Mottatt</translation>
@@ -1633,10 +1109,6 @@
         <source>Out:</source>
         <translation>Ut:</translation>
     </message>
-    <message>
-        <source>Build date</source>
-        <translation>Byggedato</translation>
-    </message>
     <message>
         <source>Debug log file</source>
         <translation>Loggfil for feilsøk</translation>
@@ -1673,10 +1145,6 @@
         <source>&amp;Unban Node</source>
         <translation>Fjern &amp;Utestengning av Node</translation>
     </message>
-    <message>
-        <source>Welcome to the Bitcoin Core RPC console.</source>
-        <translation>Velkommen til Bitcoin Core sin RPC-konsoll.</translation>
-    </message>
     <message>
         <source>Use up and down arrows to navigate history, and &lt;b&gt;Ctrl-L&lt;/b&gt; to clear screen.</source>
         <translation>Bruk opp og ned pil for å navigere historikken, og &lt;b&gt;Ctrl-L&lt;/b&gt; for å tømme skjermen.</translation>
@@ -1804,18 +1272,6 @@
         <source>Remove</source>
         <translation>Fjern</translation>
     </message>
-    <message>
-        <source>Copy label</source>
-        <translation>Kopier merkelapp</translation>
-    </message>
-    <message>
-        <source>Copy message</source>
-        <translation>Kopier melding</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>Kopier beløp</translation>
-    </message>
 </context>
 <context>
     <name>ReceiveRequestDialog</name>
@@ -1835,73 +1291,6 @@
         <source>&amp;Save Image...</source>
         <translation>&amp;Lagre Bilde...</translation>
     </message>
-    <message>
-        <source>Request payment to %1</source>
-        <translation>Etterspør betaling til %1</translation>
-    </message>
-    <message>
-        <source>Payment information</source>
-        <translation>Betalingsinformasjon</translation>
-    </message>
-    <message>
-        <source>URI</source>
-        <translation>URI</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>Adresse</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>Beløp</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Merkelapp</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>Melding</translation>
-    </message>
-    <message>
-        <source>Resulting URI too long, try to reduce the text for label / message.</source>
-        <translation>Resultat URI for lang, prøv å redusere teksten for merkelapp / melding.</translation>
-    </message>
-    <message>
-        <source>Error encoding URI into QR Code.</source>
-        <translation>Feil ved koding av URI til QR-kode.</translation>
-    </message>
-</context>
-<context>
-    <name>RecentRequestsTableModel</name>
-    <message>
-        <source>Date</source>
-        <translation>Dato</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Merkelapp</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>Melding</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>Beløp</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(ingen merkelapp)</translation>
-    </message>
-    <message>
-        <source>(no message)</source>
-        <translation>(ingen melding)</translation>
-    </message>
-    <message>
-        <source>(no amount)</source>
-        <translation>(intet beløp)</translation>
-    </message>
 </context>
 <context>
     <name>SendCoinsDialog</name>
@@ -1954,951 +1343,305 @@
         <translation>Veksel:</translation>
     </message>
     <message>
-        <source>If this is activated, but the change address is empty or invalid, change will be sent to a newly generated address.</source>
-        <translation>Hvis dette er aktivert, men adressen for veksel er tom eller ugyldig, vil veksel bli sendt til en nylig generert adresse.</translation>
-    </message>
-    <message>
-        <source>Custom change address</source>
-        <translation>Egendefinert adresse for veksel</translation>
-    </message>
-    <message>
-        <source>Transaction Fee:</source>
-        <translation>Transaksjonsgebyr:</translation>
-    </message>
-    <message>
-        <source>Choose...</source>
-        <translation>Velg...</translation>
-    </message>
-    <message>
-        <source>collapse fee-settings</source>
-        <translation>Legg ned gebyrinnstillinger</translation>
-    </message>
-    <message>
-        <source>per kilobyte</source>
-        <translation>per kilobyte</translation>
-    </message>
-    <message>
-        <source>If the custom fee is set to 1000 satoshis and the transaction is only 250 bytes, then "per kilobyte" only pays 250 satoshis in fee, while "total at least" pays 1000 satoshis. For transactions bigger than a kilobyte both pay by kilobyte.</source>
-        <translation>Hvis den egendefinerte avgiften er satt til 1000 satoshis og transaksjonen bare er 250 bytes, da vil "per kilobyte" bare betale 250 satoshis i gebyr, mens "minstebeløp" betaler 1000 satoshis. For transaksjoner større enn en kilobyte vil begge betale for antall kilobyte.</translation>
-    </message>
-    <message>
-        <source>Hide</source>
-        <translation>Skjul</translation>
-    </message>
-    <message>
-        <source>total at least</source>
-        <translation>minstebeløp</translation>
-    </message>
-    <message>
-        <source>Paying only the minimum fee is just fine as long as there is less transaction volume than space in the blocks. But be aware that this can end up in a never confirming transaction once there is more demand for bitcoin transactions than the network can process.</source>
-        <translation>Betaling av bare minimumsavgiften går helt fint så lenge det er mindre transaksjonsvolum enn plass i blokkene. Men vær klar over at dette kan ende opp i en transaksjon som aldri blir bekreftet når det er mer etterspørsel etter Bitcoin-transaksjoner enn nettverket kan behandle.</translation>
-    </message>
-    <message>
-        <source>(read the tooltip)</source>
-        <translation>(les verktøytipset)</translation>
-    </message>
-    <message>
-        <source>Recommended:</source>
-        <translation>Anbefalt:</translation>
-    </message>
-    <message>
-        <source>Custom:</source>
-        <translation>Egendefinert:</translation>
-    </message>
-    <message>
-        <source>(Smart fee not initialized yet. This usually takes a few blocks...)</source>
-        <translation>(Smartgebyr ikke innført ennå. Dette tar vanligvis noen blokker...)</translation>
-    </message>
-    <message>
-        <source>Confirmation time:</source>
-        <translation>Bekreftelsestid:</translation>
-    </message>
-    <message>
-        <source>normal</source>
-        <translation>normal</translation>
-    </message>
-    <message>
-        <source>fast</source>
-        <translation>rask</translation>
-    </message>
-    <message>
-        <source>Send as zero-fee transaction if possible</source>
-        <translation>Send uten transaksjonsgebyr hvis mulig</translation>
-    </message>
-    <message>
-        <source>(confirmation may take longer)</source>
-        <translation>(bekreftelse kan ta lengre tid)</translation>
-    </message>
-    <message>
-        <source>Send to multiple recipients at once</source>
-        <translation>Send til flere enn en mottaker</translation>
-    </message>
-    <message>
-        <source>Add &amp;Recipient</source>
-        <translation>Legg til &amp;Mottaker</translation>
-    </message>
-    <message>
-        <source>Clear all fields of the form.</source>
-        <translation>Fjern alle felter fra skjemaet.</translation>
-    </message>
-    <message>
-        <source>Dust:</source>
-        <translation>Støv:</translation>
-    </message>
-    <message>
-        <source>Clear &amp;All</source>
-        <translation>Fjern &amp;Alt</translation>
-    </message>
-    <message>
-        <source>Balance:</source>
-        <translation>Saldo:</translation>
-    </message>
-    <message>
-        <source>Confirm the send action</source>
-        <translation>Bekreft sending</translation>
-    </message>
-    <message>
-        <source>S&amp;end</source>
-        <translation>S&amp;end</translation>
-    </message>
-    <message>
-        <source>Confirm send coins</source>
-        <translation>Bekreft sending av bitcoins</translation>
-    </message>
-    <message>
-        <source>%1 to %2</source>
-        <translation>%1 til %2</translation>
-    </message>
-    <message>
-        <source>Copy quantity</source>
-        <translation>Kopier mengde</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>Kopier beløp</translation>
-    </message>
-    <message>
-        <source>Copy fee</source>
-        <translation>Kopier gebyr</translation>
-    </message>
-    <message>
-        <source>Copy after fee</source>
-        <translation>Kopier fra gebyr</translation>
-    </message>
-    <message>
-        <source>Copy bytes</source>
-        <translation>Kopier bytes</translation>
-    </message>
-    <message>
-        <source>Copy priority</source>
-        <translation>Kopier prioritet</translation>
-    </message>
-    <message>
-        <source>Copy change</source>
-        <translation>Kopier veksel</translation>
-    </message>
-    <message>
-        <source>Total Amount %1</source>
-        <translation>Totalt Beløp %1</translation>
-    </message>
-    <message>
-        <source>or</source>
-        <translation>eller</translation>
-    </message>
-    <message>
-        <source>The amount to pay must be larger than 0.</source>
-        <translation>Beløpet som skal betales må være over 0.</translation>
-    </message>
-    <message>
-        <source>The amount exceeds your balance.</source>
-        <translation>Beløpet overstiger saldo.</translation>
-    </message>
-    <message>
-        <source>The total exceeds your balance when the %1 transaction fee is included.</source>
-        <translation>Totalbeløpet overstiger saldo etter at %1 transaksjonsgebyr er lagt til.</translation>
-    </message>
-    <message>
-        <source>Transaction creation failed!</source>
-        <translation>Opprettelse av transaksjon feilet!</translation>
-    </message>
-    <message>
-        <source>The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source>
-        <translation>Transaksjonen ble avvist!  Dette kan skje hvis noen av myntene i lommeboken allerede er brukt, som hvis du kopierte wallet.dat og mynter ble brukt i kopien uten å bli markert som brukt her.</translation>
-    </message>
-    <message>
-        <source>A fee higher than %1 is considered an absurdly high fee.</source>
-        <translation>Et gebyr høyere enn %1 er ansett som et absurd høyt gebyr.</translation>
-    </message>
-    <message>
-        <source>Payment request expired.</source>
-        <translation>Betalingsetterspørringen har utløpt.</translation>
-    </message>
-    <message>
-        <source>Pay only the required fee of %1</source>
-        <translation>Betal kun påkrevd gebyr på %1</translation>
-    </message>
-    <message numerus="yes">
-        <source>Estimated to begin confirmation within %n block(s).</source>
-        <translation><numerusform>Anslått til å begynne bekreftelse innen %n blokk.</numerusform><numerusform>Anslått til å begynne bekreftelse innen %n blokker.</numerusform></translation>
-    </message>
-    <message>
-        <source>The recipient address is not valid. Please recheck.</source>
-        <translation>Mottakeradressen er ikke gyldig. Vennligst kontroller på nytt.</translation>
-    </message>
-    <message>
-        <source>Duplicate address found: addresses should only be used once each.</source>
-        <translation>Gjenbruk av adresse funnet: adresser skal bare brukes en gang hver.</translation>
-    </message>
-    <message>
-        <source>Warning: Invalid Bitcoin address</source>
-        <translation>Advarsel: Ugyldig Bitcoin-adresse</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(ingen merkelapp)</translation>
-    </message>
-    <message>
-        <source>Warning: Unknown change address</source>
-        <translation>Advarsel: Ukjent adresse for veksel</translation>
-    </message>
-    <message>
-        <source>Copy dust</source>
-        <translation>Kopier støv</translation>
-    </message>
-    <message>
-        <source>Are you sure you want to send?</source>
-        <translation>Er du sikker på at du vil sende?</translation>
-    </message>
-    <message>
-        <source>added as transaction fee</source>
-        <translation>lagt til som transaksjonsgebyr</translation>
-    </message>
-</context>
-<context>
-    <name>SendCoinsEntry</name>
-    <message>
-        <source>A&amp;mount:</source>
-        <translation>&amp;Beløp:</translation>
-    </message>
-    <message>
-        <source>Pay &amp;To:</source>
-        <translation>Betal &amp;Til:</translation>
-    </message>
-    <message>
-        <source>Enter a label for this address to add it to your address book</source>
-        <translation>Skriv inn en merkelapp for denne adressen for å legge den til i din adressebok</translation>
-    </message>
-    <message>
-        <source>&amp;Label:</source>
-        <translation>&amp;Merkelapp:</translation>
-    </message>
-    <message>
-        <source>Choose previously used address</source>
-        <translation>Velg tidligere brukt adresse</translation>
-    </message>
-    <message>
-        <source>This is a normal payment.</source>
-        <translation>Dette er en normal betaling.</translation>
-    </message>
-    <message>
-        <source>The Bitcoin address to send the payment to</source>
-        <translation>Bitcoin-adressen betalingen skal sendes til</translation>
-    </message>
-    <message>
-        <source>Alt+A</source>
-        <translation>Alt+A</translation>
-    </message>
-    <message>
-        <source>Paste address from clipboard</source>
-        <translation>Lim inn adresse fra utklippstavlen</translation>
-    </message>
-    <message>
-        <source>Alt+P</source>
-        <translation>Alt+P</translation>
-    </message>
-    <message>
-        <source>Remove this entry</source>
-        <translation>Fjern denne oppføringen</translation>
-    </message>
-    <message>
-        <source>The fee will be deducted from the amount being sent. The recipient will receive less bitcoins than you enter in the amount field. If multiple recipients are selected, the fee is split equally.</source>
-        <translation>Gebyret vil bli trukket fra beløpet som blir sendt. Mottakeren vil motta mindre bitcoins enn det du skriver inn i beløpsfeltet. Hvis det er valgt flere mottakere, deles gebyret likt.</translation>
-    </message>
-    <message>
-        <source>S&amp;ubtract fee from amount</source>
-        <translation>T&amp;rekk fra gebyr fra beløp</translation>
-    </message>
-    <message>
-        <source>Message:</source>
-        <translation>Melding:</translation>
-    </message>
-    <message>
-        <source>This is an unauthenticated payment request.</source>
-        <translation>Dette er en uautorisert betalingsetterspørring.</translation>
-    </message>
-    <message>
-        <source>This is an authenticated payment request.</source>
-        <translation>Dette er en autorisert betalingsetterspørring.</translation>
-    </message>
-    <message>
-        <source>Enter a label for this address to add it to the list of used addresses</source>
-        <translation>Skriv inn en merkelapp for denne adressen for å legge den til listen av brukte adresser</translation>
-    </message>
-    <message>
-        <source>A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
-        <translation>En melding som var tilknyttet bitcoinen: URI vil bli lagret med transaksjonen for din oversikt. Denne meldingen vil ikke bli sendt over Bitcoin-nettverket.</translation>
-    </message>
-    <message>
-        <source>Pay To:</source>
-        <translation>Betal Til:</translation>
-    </message>
-    <message>
-        <source>Memo:</source>
-        <translation>Memo:</translation>
-    </message>
-</context>
-<context>
-    <name>ShutdownWindow</name>
-    <message>
-        <source>Bitcoin Core is shutting down...</source>
-        <translation>Bitcoin Core lukker...</translation>
-    </message>
-    <message>
-        <source>Do not shut down the computer until this window disappears.</source>
-        <translation>Slå ikke av datamaskinen før dette vinduet forsvinner.</translation>
-    </message>
-</context>
-<context>
-    <name>SignVerifyMessageDialog</name>
-    <message>
-        <source>Signatures - Sign / Verify a Message</source>
-        <translation>Signaturer - Signer / Verifiser en Melding</translation>
-    </message>
-    <message>
-        <source>&amp;Sign Message</source>
-        <translation>&amp;Signer Melding</translation>
-    </message>
-    <message>
-        <source>You can sign messages/agreements with your addresses to prove you can receive bitcoins sent to them. Be careful not to sign anything vague or random, as phishing attacks may try to trick you into signing your identity over to them. Only sign fully-detailed statements you agree to.</source>
-        <translation>Du kan signere meldinger/avtaler med adresser for å bevise at du kan motta bitcoins sendt til dem. Vær forsiktig med å signere noe vagt eller tilfeldig, siden phishing-angrep kan prøve å lure deg til å signere din identitet over til dem. Bare signer fullt detaljerte utsagn som du er enig i.</translation>
-    </message>
-    <message>
-        <source>The Bitcoin address to sign the message with</source>
-        <translation>Bitcoin-adressen meldingen skal signeres med</translation>
-    </message>
-    <message>
-        <source>Choose previously used address</source>
-        <translation>Velg tidligere brukt adresse</translation>
-    </message>
-    <message>
-        <source>Alt+A</source>
-        <translation>Alt+A</translation>
-    </message>
-    <message>
-        <source>Paste address from clipboard</source>
-        <translation>Lim inn adresse fra utklippstavlen</translation>
-    </message>
-    <message>
-        <source>Alt+P</source>
-        <translation>Alt+P</translation>
-    </message>
-    <message>
-        <source>Enter the message you want to sign here</source>
-        <translation>Skriv inn meldingen du vil signere her</translation>
-    </message>
-    <message>
-        <source>Signature</source>
-        <translation>Signatur</translation>
-    </message>
-    <message>
-        <source>Copy the current signature to the system clipboard</source>
-        <translation>Kopier valgt signatur til utklippstavle</translation>
-    </message>
-    <message>
-        <source>Sign the message to prove you own this Bitcoin address</source>
-        <translation>Signer meldingen for å bevise at du eier denne Bitcoin-adressen</translation>
-    </message>
-    <message>
-        <source>Sign &amp;Message</source>
-        <translation>Signer &amp;Melding</translation>
-    </message>
-    <message>
-        <source>Reset all sign message fields</source>
-        <translation>Tilbakestill alle felter for meldingssignering</translation>
-    </message>
-    <message>
-        <source>Clear &amp;All</source>
-        <translation>Fjern &amp;Alt</translation>
-    </message>
-    <message>
-        <source>&amp;Verify Message</source>
-        <translation>&amp;Verifiser Melding</translation>
-    </message>
-    <message>
-        <source>Enter the receiver's address, message (ensure you copy line breaks, spaces, tabs, etc. exactly) and signature below to verify the message. Be careful not to read more into the signature than what is in the signed message itself, to avoid being tricked by a man-in-the-middle attack. Note that this only proves the signing party receives with the address, it cannot prove sendership of any transaction!</source>
-        <translation>Skriv inn mottakerens adresse, melding (forsikre deg om at du kopier linjeskift, mellomrom, faner osv. nøyaktig) og underskrift nedenfor for å bekrefte meldingen. Vær forsiktig så du ikke leser mer ut av signaturen enn hva som er i den signerte meldingen i seg selv, for å unngå å bli lurt av et man-in-the-middle-angrep. Merk at dette bare beviser at den som signerer kan motta med adressen, dette beviser ikke hvem som har sendt transaksjoner!</translation>
-    </message>
-    <message>
-        <source>The Bitcoin address the message was signed with</source>
-        <translation>Bitcoin-adressen meldingen ble signert med</translation>
-    </message>
-    <message>
-        <source>Verify the message to ensure it was signed with the specified Bitcoin address</source>
-        <translation>Verifiser meldingen for å være sikker på at den ble signert av den angitte Bitcoin-adressen</translation>
-    </message>
-    <message>
-        <source>Verify &amp;Message</source>
-        <translation>Verifiser &amp;Melding</translation>
-    </message>
-    <message>
-        <source>Reset all verify message fields</source>
-        <translation>Tilbakestill alle felter for meldingsverifikasjon</translation>
-    </message>
-    <message>
-        <source>Click "Sign Message" to generate signature</source>
-        <translation>Klikk "Signer Melding" for å generere signatur</translation>
-    </message>
-    <message>
-        <source>The entered address is invalid.</source>
-        <translation>Angitt adresse er ugyldig.</translation>
-    </message>
-    <message>
-        <source>Please check the address and try again.</source>
-        <translation>Vennligst sjekk adressen og prøv igjen.</translation>
-    </message>
-    <message>
-        <source>The entered address does not refer to a key.</source>
-        <translation>Angitt adresse refererer ikke til en nøkkel.</translation>
-    </message>
-    <message>
-        <source>Wallet unlock was cancelled.</source>
-        <translation>Opplåsing av lommebok ble avbrutt.</translation>
-    </message>
-    <message>
-        <source>Private key for the entered address is not available.</source>
-        <translation>Privat nøkkel for den angitte adressen er ikke tilgjengelig.</translation>
-    </message>
-    <message>
-        <source>Message signing failed.</source>
-        <translation>Signering av melding feilet.</translation>
-    </message>
-    <message>
-        <source>Message signed.</source>
-        <translation>Melding signert.</translation>
-    </message>
-    <message>
-        <source>The signature could not be decoded.</source>
-        <translation>Signaturen kunne ikke dekodes.</translation>
-    </message>
-    <message>
-        <source>Please check the signature and try again.</source>
-        <translation>Vennligst sjekk signaturen og prøv igjen.</translation>
-    </message>
-    <message>
-        <source>The signature did not match the message digest.</source>
-        <translation>Signaturen passer ikke til meldingen.</translation>
-    </message>
-    <message>
-        <source>Message verification failed.</source>
-        <translation>Verifikasjon av melding feilet.</translation>
-    </message>
-    <message>
-        <source>Message verified.</source>
-        <translation>Melding verifisert.</translation>
-    </message>
-</context>
-<context>
-    <name>SplashScreen</name>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Bitcoin Core</translation>
-    </message>
-    <message>
-        <source>The Bitcoin Core developers</source>
-        <translation>Bitcoin Core utviklerne</translation>
-    </message>
-    <message>
-        <source>[testnet]</source>
-        <translation>[testnett]</translation>
-    </message>
-</context>
-<context>
-    <name>TrafficGraphWidget</name>
-    <message>
-        <source>KB/s</source>
-        <translation>KB/s</translation>
-    </message>
-</context>
-<context>
-    <name>TransactionDesc</name>
-    <message>
-        <source>Open until %1</source>
-        <translation>Åpen til %1</translation>
-    </message>
-    <message>
-        <source>conflicted</source>
-        <translation>konflikt</translation>
-    </message>
-    <message>
-        <source>%1/offline</source>
-        <translation>%1/frakoblet</translation>
-    </message>
-    <message>
-        <source>%1/unconfirmed</source>
-        <translation>%1/ubekreftet</translation>
-    </message>
-    <message>
-        <source>%1 confirmations</source>
-        <translation>%1 bekreftelser</translation>
-    </message>
-    <message>
-        <source>Status</source>
-        <translation>Status</translation>
-    </message>
-    <message numerus="yes">
-        <source>, broadcast through %n node(s)</source>
-        <translation><numerusform>, kringkast gjennom %n node</numerusform><numerusform>, kringkast gjennom %n noder</numerusform></translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation>Dato</translation>
-    </message>
-    <message>
-        <source>Source</source>
-        <translation>Kilde</translation>
-    </message>
-    <message>
-        <source>Generated</source>
-        <translation>Generert</translation>
-    </message>
-    <message>
-        <source>From</source>
-        <translation>Fra</translation>
-    </message>
-    <message>
-        <source>To</source>
-        <translation>Til</translation>
-    </message>
-    <message>
-        <source>own address</source>
-        <translation>egen adresse</translation>
-    </message>
-    <message>
-        <source>watch-only</source>
-        <translation>kun observerbar</translation>
-    </message>
-    <message>
-        <source>label</source>
-        <translation>merkelapp</translation>
-    </message>
-    <message>
-        <source>Credit</source>
-        <translation>Kredit</translation>
-    </message>
-    <message numerus="yes">
-        <source>matures in %n more block(s)</source>
-        <translation><numerusform>blir moden om %n blokk</numerusform><numerusform>blir moden om %n blokker</numerusform></translation>
-    </message>
-    <message>
-        <source>not accepted</source>
-        <translation>ikke akseptert</translation>
-    </message>
-    <message>
-        <source>Debit</source>
-        <translation>Debet</translation>
-    </message>
-    <message>
-        <source>Total debit</source>
-        <translation>Total debet</translation>
-    </message>
-    <message>
-        <source>Total credit</source>
-        <translation>Total kredit</translation>
-    </message>
-    <message>
-        <source>Transaction fee</source>
-        <translation>Transaksjonsgebyr</translation>
-    </message>
-    <message>
-        <source>Net amount</source>
-        <translation>Nettobeløp</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>Melding</translation>
-    </message>
-    <message>
-        <source>Comment</source>
-        <translation>Kommentar</translation>
-    </message>
-    <message>
-        <source>Transaction ID</source>
-        <translation>Transaksjons-ID</translation>
-    </message>
-    <message>
-        <source>Merchant</source>
-        <translation>Forhandler</translation>
-    </message>
-    <message>
-        <source>Generated coins must mature %1 blocks before they can be spent. When you generated this block, it was broadcast to the network to be added to the block chain. If it fails to get into the chain, its state will change to "not accepted" and it won't be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source>
-        <translation>Genererte bitcoins må modnes %1 blokker før de kan brukes. Da du genererte denne blokken ble den kringkastet på nettverket for å bli lagt til i kjeden av blokker. Hvis den ikke kommer med i kjeden vil den endre seg til "ikke akseptert" og pengene vil ikke kunne brukes. Dette vil noen ganger skje hvis en annen node genererer en blokk noen sekunder i tid fra din egen.</translation>
-    </message>
-    <message>
-        <source>Debug information</source>
-        <translation>Informasjon for feilsøk</translation>
-    </message>
-    <message>
-        <source>Transaction</source>
-        <translation>Transaksjon</translation>
-    </message>
-    <message>
-        <source>Inputs</source>
-        <translation>Inndata</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>Beløp</translation>
-    </message>
-    <message>
-        <source>true</source>
-        <translation>sann</translation>
-    </message>
-    <message>
-        <source>false</source>
-        <translation>usann</translation>
+        <source>If this is activated, but the change address is empty or invalid, change will be sent to a newly generated address.</source>
+        <translation>Hvis dette er aktivert, men adressen for veksel er tom eller ugyldig, vil veksel bli sendt til en nylig generert adresse.</translation>
     </message>
     <message>
-        <source>, has not been successfully broadcast yet</source>
-        <translation>, har ikke blitt kringkastet med hell enda</translation>
-    </message>
-    <message numerus="yes">
-        <source>Open for %n more block(s)</source>
-        <translation><numerusform>Åpen for %n blokk til</numerusform><numerusform>Åpen for %n blokker til</numerusform></translation>
+        <source>Custom change address</source>
+        <translation>Egendefinert adresse for veksel</translation>
     </message>
     <message>
-        <source>unknown</source>
-        <translation>ukjent</translation>
+        <source>Transaction Fee:</source>
+        <translation>Transaksjonsgebyr:</translation>
     </message>
-</context>
-<context>
-    <name>TransactionDescDialog</name>
     <message>
-        <source>Transaction details</source>
-        <translation>Transaksjonsdetaljer</translation>
+        <source>Choose...</source>
+        <translation>Velg...</translation>
     </message>
     <message>
-        <source>This pane shows a detailed description of the transaction</source>
-        <translation>Her vises en detaljert beskrivelse av transaksjonen</translation>
+        <source>collapse fee-settings</source>
+        <translation>Legg ned gebyrinnstillinger</translation>
     </message>
-</context>
-<context>
-    <name>TransactionTableModel</name>
     <message>
-        <source>Date</source>
-        <translation>Dato</translation>
+        <source>per kilobyte</source>
+        <translation>per kilobyte</translation>
     </message>
     <message>
-        <source>Type</source>
-        <translation>Type</translation>
+        <source>If the custom fee is set to 1000 satoshis and the transaction is only 250 bytes, then "per kilobyte" only pays 250 satoshis in fee, while "total at least" pays 1000 satoshis. For transactions bigger than a kilobyte both pay by kilobyte.</source>
+        <translation>Hvis den egendefinerte avgiften er satt til 1000 satoshis og transaksjonen bare er 250 bytes, da vil "per kilobyte" bare betale 250 satoshis i gebyr, mens "minstebeløp" betaler 1000 satoshis. For transaksjoner større enn en kilobyte vil begge betale for antall kilobyte.</translation>
     </message>
     <message>
-        <source>Immature (%1 confirmations, will be available after %2)</source>
-        <translation>Umoden (%1 bekreftelser, vil være tilgjengelig etter %2)</translation>
-    </message>
-    <message numerus="yes">
-        <source>Open for %n more block(s)</source>
-        <translation><numerusform>Åpen for %n blokk til</numerusform><numerusform>Åpen for %n blokker til</numerusform></translation>
+        <source>Hide</source>
+        <translation>Skjul</translation>
     </message>
     <message>
-        <source>Open until %1</source>
-        <translation>Åpen til %1</translation>
+        <source>total at least</source>
+        <translation>minstebeløp</translation>
     </message>
     <message>
-        <source>Confirmed (%1 confirmations)</source>
-        <translation>Bekreftet (%1 bekreftelser)</translation>
+        <source>Paying only the minimum fee is just fine as long as there is less transaction volume than space in the blocks. But be aware that this can end up in a never confirming transaction once there is more demand for bitcoin transactions than the network can process.</source>
+        <translation>Betaling av bare minimumsavgiften går helt fint så lenge det er mindre transaksjonsvolum enn plass i blokkene. Men vær klar over at dette kan ende opp i en transaksjon som aldri blir bekreftet når det er mer etterspørsel etter Bitcoin-transaksjoner enn nettverket kan behandle.</translation>
     </message>
     <message>
-        <source>This block was not received by any other nodes and will probably not be accepted!</source>
-        <translation>Denne blokken har ikke blitt mottatt av noen andre noder og vil sannsynligvis ikke bli akseptert!</translation>
+        <source>(read the tooltip)</source>
+        <translation>(les verktøytipset)</translation>
     </message>
     <message>
-        <source>Generated but not accepted</source>
-        <translation>Generert men ikke akseptert</translation>
+        <source>Recommended:</source>
+        <translation>Anbefalt:</translation>
     </message>
     <message>
-        <source>Offline</source>
-        <translation>Frakoblet</translation>
+        <source>Custom:</source>
+        <translation>Egendefinert:</translation>
     </message>
     <message>
-        <source>Label</source>
-        <translation>Merkelapp</translation>
+        <source>(Smart fee not initialized yet. This usually takes a few blocks...)</source>
+        <translation>(Smartgebyr ikke innført ennå. Dette tar vanligvis noen blokker...)</translation>
     </message>
     <message>
-        <source>Unconfirmed</source>
-        <translation>Ubekreftet</translation>
+        <source>Confirmation time:</source>
+        <translation>Bekreftelsestid:</translation>
     </message>
     <message>
-        <source>Confirming (%1 of %2 recommended confirmations)</source>
-        <translation>Bekrefter (%1 av %2 anbefalte bekreftelser)</translation>
+        <source>normal</source>
+        <translation>normal</translation>
     </message>
     <message>
-        <source>Conflicted</source>
-        <translation>Konflikt</translation>
+        <source>fast</source>
+        <translation>rask</translation>
     </message>
     <message>
-        <source>Received with</source>
-        <translation>Mottatt med</translation>
+        <source>Send to multiple recipients at once</source>
+        <translation>Send til flere enn en mottaker</translation>
     </message>
     <message>
-        <source>Received from</source>
-        <translation>Mottatt fra</translation>
+        <source>Add &amp;Recipient</source>
+        <translation>Legg til &amp;Mottaker</translation>
     </message>
     <message>
-        <source>Sent to</source>
-        <translation>Sendt til</translation>
+        <source>Clear all fields of the form.</source>
+        <translation>Fjern alle felter fra skjemaet.</translation>
     </message>
     <message>
-        <source>Payment to yourself</source>
-        <translation>Betaling til deg selv</translation>
+        <source>Dust:</source>
+        <translation>Støv:</translation>
     </message>
     <message>
-        <source>Mined</source>
-        <translation>Utvunnet</translation>
+        <source>Clear &amp;All</source>
+        <translation>Fjern &amp;Alt</translation>
     </message>
     <message>
-        <source>watch-only</source>
-        <translation>kun observerbar</translation>
+        <source>Balance:</source>
+        <translation>Saldo:</translation>
     </message>
     <message>
-        <source>(n/a)</source>
-        <translation>-</translation>
+        <source>Confirm the send action</source>
+        <translation>Bekreft sending</translation>
     </message>
     <message>
-        <source>Transaction status. Hover over this field to show number of confirmations.</source>
-        <translation>Transaksjonsstatus. Hold muspekeren over dette feltet for å se antall bekreftelser.</translation>
+        <source>S&amp;end</source>
+        <translation>S&amp;end</translation>
     </message>
+</context>
+<context>
+    <name>SendCoinsEntry</name>
     <message>
-        <source>Date and time that the transaction was received.</source>
-        <translation>Dato og tid for da transaksjonen ble mottat.</translation>
+        <source>A&amp;mount:</source>
+        <translation>&amp;Beløp:</translation>
     </message>
     <message>
-        <source>Type of transaction.</source>
-        <translation>Type transaksjon.</translation>
+        <source>Pay &amp;To:</source>
+        <translation>Betal &amp;Til:</translation>
     </message>
     <message>
-        <source>Whether or not a watch-only address is involved in this transaction.</source>
-        <translation>Hvorvidt en kun observerbar adresse er involvert i denne transaksjonen.</translation>
+        <source>&amp;Label:</source>
+        <translation>&amp;Merkelapp:</translation>
     </message>
     <message>
-        <source>User-defined intent/purpose of the transaction.</source>
-        <translation>Brukerdefinert intensjon/hensikt med transaksjonen.</translation>
+        <source>Choose previously used address</source>
+        <translation>Velg tidligere brukt adresse</translation>
     </message>
     <message>
-        <source>Amount removed from or added to balance.</source>
-        <translation>Beløp fjernet eller lagt til saldo.</translation>
+        <source>This is a normal payment.</source>
+        <translation>Dette er en normal betaling.</translation>
     </message>
-</context>
-<context>
-    <name>TransactionView</name>
     <message>
-        <source>All</source>
-        <translation>Alle</translation>
+        <source>The Bitcoin address to send the payment to</source>
+        <translation>Bitcoin-adressen betalingen skal sendes til</translation>
     </message>
     <message>
-        <source>Today</source>
-        <translation>I dag</translation>
+        <source>Alt+A</source>
+        <translation>Alt+A</translation>
     </message>
     <message>
-        <source>This week</source>
-        <translation>Denne uken</translation>
+        <source>Paste address from clipboard</source>
+        <translation>Lim inn adresse fra utklippstavlen</translation>
     </message>
     <message>
-        <source>This month</source>
-        <translation>Denne måneden</translation>
+        <source>Alt+P</source>
+        <translation>Alt+P</translation>
     </message>
     <message>
-        <source>Last month</source>
-        <translation>Forrige måned</translation>
+        <source>Remove this entry</source>
+        <translation>Fjern denne oppføringen</translation>
     </message>
     <message>
-        <source>This year</source>
-        <translation>Dette året</translation>
+        <source>The fee will be deducted from the amount being sent. The recipient will receive less bitcoins than you enter in the amount field. If multiple recipients are selected, the fee is split equally.</source>
+        <translation>Gebyret vil bli trukket fra beløpet som blir sendt. Mottakeren vil motta mindre bitcoins enn det du skriver inn i beløpsfeltet. Hvis det er valgt flere mottakere, deles gebyret likt.</translation>
     </message>
     <message>
-        <source>Range...</source>
-        <translation>Intervall...</translation>
+        <source>S&amp;ubtract fee from amount</source>
+        <translation>T&amp;rekk fra gebyr fra beløp</translation>
     </message>
     <message>
-        <source>Received with</source>
-        <translation>Mottatt med</translation>
+        <source>Message:</source>
+        <translation>Melding:</translation>
     </message>
     <message>
-        <source>Sent to</source>
-        <translation>Sendt til</translation>
+        <source>This is an unauthenticated payment request.</source>
+        <translation>Dette er en uautorisert betalingsetterspørring.</translation>
     </message>
     <message>
-        <source>To yourself</source>
-        <translation>Til deg selv</translation>
+        <source>This is an authenticated payment request.</source>
+        <translation>Dette er en autorisert betalingsetterspørring.</translation>
     </message>
     <message>
-        <source>Mined</source>
-        <translation>Utvunnet</translation>
+        <source>Enter a label for this address to add it to the list of used addresses</source>
+        <translation>Skriv inn en merkelapp for denne adressen for å legge den til listen av brukte adresser</translation>
     </message>
     <message>
-        <source>Other</source>
-        <translation>Andre</translation>
+        <source>A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
+        <translation>En melding som var tilknyttet bitcoinen: URI vil bli lagret med transaksjonen for din oversikt. Denne meldingen vil ikke bli sendt over Bitcoin-nettverket.</translation>
     </message>
     <message>
-        <source>Enter address or label to search</source>
-        <translation>Skriv inn adresse eller merkelapp for søk</translation>
+        <source>Pay To:</source>
+        <translation>Betal Til:</translation>
     </message>
     <message>
-        <source>Min amount</source>
-        <translation>Minimumsbeløp</translation>
+        <source>Memo:</source>
+        <translation>Memo:</translation>
     </message>
+</context>
+<context>
+    <name>ShutdownWindow</name>
     <message>
-        <source>Copy address</source>
-        <translation>Kopier adresse</translation>
+        <source>Do not shut down the computer until this window disappears.</source>
+        <translation>Slå ikke av datamaskinen før dette vinduet forsvinner.</translation>
     </message>
+</context>
+<context>
+    <name>SignVerifyMessageDialog</name>
     <message>
-        <source>Copy label</source>
-        <translation>Kopier merkelapp</translation>
+        <source>Signatures - Sign / Verify a Message</source>
+        <translation>Signaturer - Signer / Verifiser en Melding</translation>
     </message>
     <message>
-        <source>Copy amount</source>
-        <translation>Kopier beløp</translation>
+        <source>&amp;Sign Message</source>
+        <translation>&amp;Signer Melding</translation>
     </message>
     <message>
-        <source>Copy transaction ID</source>
-        <translation>Kopier transaksjons-ID</translation>
+        <source>You can sign messages/agreements with your addresses to prove you can receive bitcoins sent to them. Be careful not to sign anything vague or random, as phishing attacks may try to trick you into signing your identity over to them. Only sign fully-detailed statements you agree to.</source>
+        <translation>Du kan signere meldinger/avtaler med adresser for å bevise at du kan motta bitcoins sendt til dem. Vær forsiktig med å signere noe vagt eller tilfeldig, siden phishing-angrep kan prøve å lure deg til å signere din identitet over til dem. Bare signer fullt detaljerte utsagn som du er enig i.</translation>
     </message>
     <message>
-        <source>Copy raw transaction</source>
-        <translation>Kopier råtransaksjon</translation>
+        <source>The Bitcoin address to sign the message with</source>
+        <translation>Bitcoin-adressen meldingen skal signeres med</translation>
     </message>
     <message>
-        <source>Edit label</source>
-        <translation>Rediger merkelapp</translation>
+        <source>Choose previously used address</source>
+        <translation>Velg tidligere brukt adresse</translation>
     </message>
     <message>
-        <source>Show transaction details</source>
-        <translation>Vis transaksjonsdetaljer</translation>
+        <source>Alt+A</source>
+        <translation>Alt+A</translation>
     </message>
     <message>
-        <source>Export Transaction History</source>
-        <translation>Eksporter Transaksjonshistorikk</translation>
+        <source>Paste address from clipboard</source>
+        <translation>Lim inn adresse fra utklippstavlen</translation>
     </message>
     <message>
-        <source>Watch-only</source>
-        <translation>Kun observer</translation>
+        <source>Alt+P</source>
+        <translation>Alt+P</translation>
     </message>
     <message>
-        <source>Exporting Failed</source>
-        <translation>Ekport Feilet</translation>
+        <source>Enter the message you want to sign here</source>
+        <translation>Skriv inn meldingen du vil signere her</translation>
     </message>
     <message>
-        <source>There was an error trying to save the transaction history to %1.</source>
-        <translation>En feil oppstod ved lagring av transaksjonshistorikken til %1.</translation>
+        <source>Signature</source>
+        <translation>Signatur</translation>
     </message>
     <message>
-        <source>Exporting Successful</source>
-        <translation>Ekport Fullført</translation>
+        <source>Copy the current signature to the system clipboard</source>
+        <translation>Kopier valgt signatur til utklippstavle</translation>
     </message>
     <message>
-        <source>The transaction history was successfully saved to %1.</source>
-        <translation>Transaksjonshistorikken ble lagret til %1.</translation>
+        <source>Sign the message to prove you own this Bitcoin address</source>
+        <translation>Signer meldingen for å bevise at du eier denne Bitcoin-adressen</translation>
     </message>
     <message>
-        <source>Comma separated file (*.csv)</source>
-        <translation>Kommaseparert fil (*.csv)</translation>
+        <source>Sign &amp;Message</source>
+        <translation>Signer &amp;Melding</translation>
     </message>
     <message>
-        <source>Confirmed</source>
-        <translation>Bekreftet</translation>
+        <source>Reset all sign message fields</source>
+        <translation>Tilbakestill alle felter for meldingssignering</translation>
     </message>
     <message>
-        <source>Date</source>
-        <translation>Dato</translation>
+        <source>Clear &amp;All</source>
+        <translation>Fjern &amp;Alt</translation>
     </message>
     <message>
-        <source>Type</source>
-        <translation>Type</translation>
+        <source>&amp;Verify Message</source>
+        <translation>&amp;Verifiser Melding</translation>
     </message>
     <message>
-        <source>Label</source>
-        <translation>Merkelapp</translation>
+        <source>Enter the receiver's address, message (ensure you copy line breaks, spaces, tabs, etc. exactly) and signature below to verify the message. Be careful not to read more into the signature than what is in the signed message itself, to avoid being tricked by a man-in-the-middle attack. Note that this only proves the signing party receives with the address, it cannot prove sendership of any transaction!</source>
+        <translation>Skriv inn mottakerens adresse, melding (forsikre deg om at du kopier linjeskift, mellomrom, faner osv. nøyaktig) og underskrift nedenfor for å bekrefte meldingen. Vær forsiktig så du ikke leser mer ut av signaturen enn hva som er i den signerte meldingen i seg selv, for å unngå å bli lurt av et man-in-the-middle-angrep. Merk at dette bare beviser at den som signerer kan motta med adressen, dette beviser ikke hvem som har sendt transaksjoner!</translation>
     </message>
     <message>
-        <source>Address</source>
-        <translation>Adresse</translation>
+        <source>The Bitcoin address the message was signed with</source>
+        <translation>Bitcoin-adressen meldingen ble signert med</translation>
     </message>
     <message>
-        <source>ID</source>
-        <translation>ID</translation>
+        <source>Verify the message to ensure it was signed with the specified Bitcoin address</source>
+        <translation>Verifiser meldingen for å være sikker på at den ble signert av den angitte Bitcoin-adressen</translation>
     </message>
     <message>
-        <source>Range:</source>
-        <translation>Intervall:</translation>
+        <source>Verify &amp;Message</source>
+        <translation>Verifiser &amp;Melding</translation>
     </message>
     <message>
-        <source>to</source>
-        <translation>til</translation>
+        <source>Reset all verify message fields</source>
+        <translation>Tilbakestill alle felter for meldingsverifikasjon</translation>
     </message>
 </context>
 <context>
-    <name>UnitDisplayStatusBarControl</name>
+    <name>SplashScreen</name>
     <message>
-        <source>Unit to show amounts in. Click to select another unit.</source>
-        <translation>Enhet å vise beløper i. Klikk for å velge en annen enhet.</translation>
+        <source>[testnet]</source>
+        <translation>[testnett]</translation>
     </message>
 </context>
 <context>
-    <name>WalletFrame</name>
+    <name>TrafficGraphWidget</name>
     <message>
-        <source>No wallet has been loaded.</source>
-        <translation>Ingen lommebok har blitt lastet.</translation>
+        <source>KB/s</source>
+        <translation>KB/s</translation>
     </message>
 </context>
 <context>
-    <name>WalletModel</name>
+    <name>TransactionDescDialog</name>
     <message>
-        <source>Send Coins</source>
-        <translation>Send Bitcoins</translation>
+        <source>This pane shows a detailed description of the transaction</source>
+        <translation>Her vises en detaljert beskrivelse av transaksjonen</translation>
     </message>
 </context>
 <context>
-    <name>WalletView</name>
-    <message>
-        <source>&amp;Export</source>
-        <translation>&amp;Eksporter</translation>
-    </message>
-    <message>
-        <source>Export the data in the current tab to a file</source>
-        <translation>Eksporter data fra nåværende fane til fil</translation>
-    </message>
-    <message>
-        <source>Backup Wallet</source>
-        <translation>Sikkerhetskopier Lommebok</translation>
-    </message>
-    <message>
-        <source>Wallet Data (*.dat)</source>
-        <translation>Lommebokdata (*.dat)</translation>
-    </message>
-    <message>
-        <source>Backup Failed</source>
-        <translation>Sikkerhetskopiering Feilet</translation>
-    </message>
-    <message>
-        <source>There was an error trying to save the wallet data to %1.</source>
-        <translation>En feil oppstod ved lagring av lommebok til %1.</translation>
-    </message>
-    <message>
-        <source>The wallet data was successfully saved to %1.</source>
-        <translation>Lommeboken ble lagret til %1.</translation>
-    </message>
+    <name>UnitDisplayStatusBarControl</name>
     <message>
-        <source>Backup Successful</source>
-        <translation>Sikkerhetskopiering Fullført</translation>
+        <source>Unit to show amounts in. Click to select another unit.</source>
+        <translation>Enhet å vise beløper i. Klikk for å velge en annen enhet.</translation>
     </message>
 </context>
 <context>
@@ -2927,14 +1670,6 @@
         <source>If &lt;category&gt; is not supplied or if &lt;category&gt; = 1, output all debugging information.</source>
         <translation>Hvis &lt;category&gt; ikke er oppgitt eller hvis &lt;category&gt; = 1, ta ut all informasjon for feilsøking.</translation>
     </message>
-    <message>
-        <source>Maximum total fees (in %s) to use in a single wallet transaction; setting this too low may abort large transactions (default: %s)</source>
-        <translation>Maksimalt samlede gebyrer (i %s) til å bruke i en enkelt lommeboktransaksjon; settes dette for lavt kan store transaksjoner kanskje avbrytes (standardverdi: %s)</translation>
-    </message>
-    <message>
-        <source>Please check that your computer's date and time are correct! If your clock is wrong Bitcoin Core will not work properly.</source>
-        <translation>Vennligst undersøk at din datamaskin har riktig dato og klokkeslett! Hvis klokken er stilt feil vil ikke Bitcoin Core fungere riktig.</translation>
-    </message>
     <message>
         <source>Prune configured below the minimum of %d MiB.  Please use a higher number.</source>
         <translation>Beskjæringsmodus er konfigurert under minimum på %d MiB. Vennligst bruk et høyere nummer.</translation>
@@ -2975,6 +1710,10 @@
         <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
         <translation>Ta imot tilkoblinger fra utsiden (standardverdi: 1 hvis uten -proxy eller -connect)</translation>
     </message>
+    <message>
+        <source>Bitcoin Core</source>
+        <translation>Bitcoin Core</translation>
+    </message>
     <message>
         <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source>
         <translation>Bind til angitt adresse. Bruk [vertsmaskin]:port notasjon for IPv6</translation>
@@ -3003,10 +1742,6 @@
         <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
         <translation>Dette er en forhåndssluppet testversjon - bruk på egen risiko - ikke for bruk til blokkutvinning eller bedriftsapplikasjoner</translation>
     </message>
-    <message>
-        <source>Unable to bind to %s on this computer. Bitcoin Core is probably already running.</source>
-        <translation>Ute av stand til å binde til %s på denne datamaskinen. Bitcoin Core kjører sannsynligvis allerede.</translation>
-    </message>
     <message>
         <source>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</source>
         <translation>Bruk UPnP for lytteport (standardverdi: 1 ved lytting og uten -proxy)</translation>
@@ -3027,10 +1762,6 @@
         <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source>
         <translation>Advarsel: Vi ser ikke ut til å være enige med våre noder! Du må oppgradere, eller andre noder må oppgradere.</translation>
     </message>
-    <message>
-        <source>Warning: wallet.dat corrupt, data salvaged! Original wallet.dat saved as wallet.{timestamp}.bak in %s; if your balance or transactions are incorrect you should restore from a backup.</source>
-        <translation>Advarsel: wallet.dat korrupt, data reddet! Original wallet.dat lagret som wallet.{timestamp}.bak i %s; hvis din saldo eller dine transaksjoner ikke er korrekte bør du gjenopprette fra en backup.</translation>
-    </message>
     <message>
         <source>Whitelist peers connecting from the given netmask or IP address. Can be specified multiple times.</source>
         <translation>Hvitelist noder som kobler til fra den oppgitte nettmasken eller IP-adressen. Kan oppgis flere ganger.</translation>
@@ -3191,10 +1922,6 @@
         <source>Wallet options:</source>
         <translation>Valg for lommebok:</translation>
     </message>
-    <message>
-        <source>You need to rebuild the database using -reindex to change -txindex</source>
-        <translation>Du må gjenoppbygge databasen med å bruke -reindex for å endre -txindex</translation>
-    </message>
     <message>
         <source>Allow JSON-RPC connections from specified source. Valid for &lt;ip&gt; are a single IP (e.g. 1.2.3.4), a network/netmask (e.g. 1.2.3.4/255.255.255.0) or a network/CIDR (e.g. 1.2.3.4/24). This option can be specified multiple times</source>
         <translation>Tillat JSON-RPC-tilkoblinger fra angitt kilde. Gyldig for &lt;ip&gt; er en enkelt IP (f. eks. 1.2.3.4), et nettverk/nettmaske (f. eks. 1.2.3.4/255.255.255.0) eller et nettverk/CIDR (f. eks. 1.2.3.4/24). Dette alternativet kan angis flere ganger</translation>
@@ -3207,10 +1934,6 @@
         <source>Bind to given address to listen for JSON-RPC connections. Use [host]:port notation for IPv6. This option can be specified multiple times (default: bind to all interfaces)</source>
         <translation>Bind til gitt adresse for å lytte for JSON-RPC-tilkoblinger. Bruk [host]:port notasjon for IPv6. Dette alternativet kan angis flere ganger (standardverdi: bind til alle grensesnitt)</translation>
     </message>
-    <message>
-        <source>Cannot obtain a lock on data directory %s. Bitcoin Core is probably already running.</source>
-        <translation>Ute av stand til å låse datamappen %s. Bitcoin Core kjører sannsynligvis allerede.</translation>
-    </message>
     <message>
         <source>Create new files with system default permissions, instead of umask 077 (only effective with disabled wallet functionality)</source>
         <translation>Opprett nye filer med standardtillatelser i systemet, i stedet for umask 077 (kun virksom med lommebokfunksjonalitet slått av)</translation>
@@ -3255,10 +1978,6 @@
         <source>Set maximum size of high-priority/low-fee transactions in bytes (default: %d)</source>
         <translation>Sett maksimum størrelse for transaksjoner med høy prioritet / lavt gebyr, i bytes (standardverdi: %d)</translation>
     </message>
-    <message>
-        <source>Set the number of threads for coin generation if enabled (-1 = all cores, default: %d)</source>
-        <translation>Angi antall tråder for mynt generering hvis aktivert (-1 = alle kjerner, standardverdi: %d)</translation>
-    </message>
     <message>
         <source>The transaction amount is too small to send after the fee has been deducted</source>
         <translation>Transaksjonsbeløpet er for lite til å sendes etter at gebyret er fratrukket</translation>
@@ -3283,34 +2002,14 @@
         <source>Accept public REST requests (default: %u)</source>
         <translation>Godta offentlige REST forespørsler (standardverdi: %u)</translation>
     </message>
-    <message>
-        <source>Activating best chain...</source>
-        <translation>Aktiverer beste kjede...</translation>
-    </message>
-    <message>
-        <source>Attempt to recover private keys from a corrupt wallet.dat on startup</source>
-        <translation>Forsøk å berge private nøkler fra en korrupt wallet.dat ved oppstart</translation>
-    </message>
     <message>
         <source>Automatically create Tor hidden service (default: %d)</source>
         <translation>Automatisk opprette Tor skjult tjeneste (standardverdi: %d)</translation>
     </message>
-    <message>
-        <source>Cannot resolve -whitebind address: '%s'</source>
-        <translation>Kan ikke løse -whitebind-adresse: '%s'</translation>
-    </message>
     <message>
         <source>Connect through SOCKS5 proxy</source>
         <translation>Koble til via SOCKS5-proxy</translation>
     </message>
-    <message>
-        <source>Copyright (C) 2009-%i The Bitcoin Core Developers</source>
-        <translation>Copyright (C) 2009-%i utviklerne av Bitcoin Core</translation>
-    </message>
-    <message>
-        <source>Error loading wallet.dat: Wallet requires newer version of Bitcoin Core</source>
-        <translation>Feil ved lasting av wallet.dat: Lommeboken krever en nyere versjon av Bitcoin Core</translation>
-    </message>
     <message>
         <source>Error reading from database, shutting down.</source>
         <translation>Feil ved lesing fra database, stenger ned.</translation>
@@ -3323,22 +2022,6 @@
         <source>Information</source>
         <translation>Informasjon</translation>
     </message>
-    <message>
-        <source>Initialization sanity check failed. Bitcoin Core is shutting down.</source>
-        <translation>Sunnhetssjekk ved oppstart feilet. Bitcoin Core stenges ned.</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -maxtxfee=&lt;amount&gt;: '%s'</source>
-        <translation>Ugyldig beløp for -maxtxfee=&lt;amount&gt;: '%s'</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -minrelaytxfee=&lt;amount&gt;: '%s'</source>
-        <translation>Ugyldig mengde for -minrelaytxfee=&lt;beløp&gt;: '%s'</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -mintxfee=&lt;amount&gt;: '%s'</source>
-        <translation>Ugyldig mengde for -mintxfee=&lt;beløp&gt;: '%s'</translation>
-    </message>
     <message>
         <source>Invalid amount for -paytxfee=&lt;amount&gt;: '%s' (must be at least %s)</source>
         <translation>Ugyldig beløp for -paytxfee=&lt;amount&gt;: '%s' (må være minst %s)</translation>
@@ -3363,14 +2046,6 @@
         <source>RPC server options:</source>
         <translation>Innstillinger for RPC-server:</translation>
     </message>
-    <message>
-        <source>Rebuild block chain index from current blk000??.dat files on startup</source>
-        <translation>Gjenopprett blokkjedeindeks fra gjeldende blk000??.dat filer ved oppstart</translation>
-    </message>
-    <message>
-        <source>Receive and display P2P network alerts (default: %u)</source>
-        <translation>Motta og vis P2P nettverksvarsler (standardvalg: %u)</translation>
-    </message>
     <message>
         <source>Reducing -maxconnections from %d to %d, because of system limitations.</source>
         <translation>Reduserer -maxconnections fra %d til %d, pga. systembegrensninger.</translation>
@@ -3443,10 +2118,6 @@
         <source>Username for JSON-RPC connections</source>
         <translation>Brukernavn for JSON-RPC forbindelser</translation>
     </message>
-    <message>
-        <source>Wallet needed to be rewritten: restart Bitcoin Core to complete</source>
-        <translation>Lommeboken måtte skrives på nytt: start Bitcoin Core på nytt for å fullføre</translation>
-    </message>
     <message>
         <source>Warning</source>
         <translation>Advarsel</translation>
@@ -3463,10 +2134,6 @@
         <source>ZeroMQ notification options:</source>
         <translation>Valg for ZeroMQ-meldinger:</translation>
     </message>
-    <message>
-        <source>wallet.dat corrupt, salvage failed</source>
-        <translation>wallet.dat korrupt, bergning feilet</translation>
-    </message>
     <message>
         <source>Password for JSON-RPC connections</source>
         <translation>Passord for JSON-RPC forbindelser</translation>
@@ -3475,10 +2142,6 @@
         <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
         <translation>Utfør kommando når beste blokk endrer seg (%s i kommandoen erstattes med blokkens hash)</translation>
     </message>
-    <message>
-        <source>This help message</source>
-        <translation>Denne hjelpemeldingen</translation>
-    </message>
     <message>
         <source>Allow DNS lookups for -addnode, -seednode and -connect</source>
         <translation>Tillat oppslag i DNS for -addnode, -seednode og -connect</translation>
@@ -3487,10 +2150,6 @@
         <source>Loading addresses...</source>
         <translation>Laster adresser...</translation>
     </message>
-    <message>
-        <source>Error loading wallet.dat: Wallet corrupted</source>
-        <translation>Feil ved lasting av wallet.dat: Lommeboken er skadet</translation>
-    </message>
     <message>
         <source>(1 = keep tx meta data e.g. account owner and payment request information, 2 = drop tx meta data)</source>
         <translation>(1 = behold metadata for transaksjon som f. eks. kontoeier og informasjon om betalingsanmodning, 2 = dropp metadata for transaksjon)</translation>
@@ -3507,10 +2166,6 @@
         <source>Do not keep transactions in the mempool longer than &lt;n&gt; hours (default: %u)</source>
         <translation>Ikke hold transaksjoner i minnet lenger enn &lt;n&gt; timer (standard: %u)</translation>
     </message>
-    <message>
-        <source>Error reading wallet.dat! All keys read correctly, but transaction data or address book entries might be missing or incorrect.</source>
-        <translation>Feil ved lesing av wallet.dat! Alle nøkler lest riktig, men transaksjonsdataene eller oppføringer i adresseboken mangler kanskje eller er feil.</translation>
-    </message>
     <message>
         <source>Fees (in %s/kB) smaller than this are considered zero fee for transaction creation (default: %s)</source>
         <translation>Gebyrer (i %s/Kb) mindre enn dette anses som null gebyr for laging av transaksjoner (standardverdi: %s)</translation>
@@ -3563,14 +2218,6 @@
         <source>Always query for peer addresses via DNS lookup (default: %u)</source>
         <translation>Alltid søk etter nodeadresser via DNS-oppslag (standardverdi: %u)</translation>
     </message>
-    <message>
-        <source>Error loading wallet.dat</source>
-        <translation>Feil ved lasting av wallet.dat</translation>
-    </message>
-    <message>
-        <source>Generate coins (default: %u)</source>
-        <translation>Generer mynter (standardverdi: %u)</translation>
-    </message>
     <message>
         <source>How many blocks to check at startup (default: %u, 0 = all)</source>
         <translation>Hvor mange blokker skal sjekkes ved oppstart (standardverdi: %u, 0 = alle)</translation>
@@ -3655,18 +2302,6 @@
         <source>Unknown network specified in -onlynet: '%s'</source>
         <translation>Ukjent nettverk angitt i -onlynet '%s'</translation>
     </message>
-    <message>
-        <source>Cannot resolve -bind address: '%s'</source>
-        <translation>Kunne ikke slå opp -bind adresse: '%s'</translation>
-    </message>
-    <message>
-        <source>Cannot resolve -externalip address: '%s'</source>
-        <translation>Kunne ikke slå opp -externalip adresse: '%s'</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -paytxfee=&lt;amount&gt;: '%s'</source>
-        <translation>Ugyldig beløp for -paytxfee=&lt;beløp&gt;: '%s'</translation>
-    </message>
     <message>
         <source>Insufficient funds</source>
         <translation>Utilstrekkelige midler</translation>
diff --git a/src/qt/locale/bitcoin_nl.ts b/src/qt/locale/bitcoin_nl.ts
index fe29959abf5ba..3009c154e334e 100644
--- a/src/qt/locale/bitcoin_nl.ts
+++ b/src/qt/locale/bitcoin_nl.ts
@@ -25,10 +25,6 @@
         <source>C&amp;lose</source>
         <translation>S&amp;luiten</translation>
     </message>
-    <message>
-        <source>&amp;Copy Address</source>
-        <translation>&amp;Kopiëer Adres</translation>
-    </message>
     <message>
         <source>Delete the currently selected address from the list</source>
         <translation>Verwijder het geselecteerde adres van de lijst</translation>
@@ -45,73 +41,6 @@
         <source>&amp;Delete</source>
         <translation>&amp;Verwijder</translation>
     </message>
-    <message>
-        <source>Choose the address to send coins to</source>
-        <translation>Kies het adres om munten naar te versturen</translation>
-    </message>
-    <message>
-        <source>Choose the address to receive coins with</source>
-        <translation>Kies het adres om munten op te ontvangen</translation>
-    </message>
-    <message>
-        <source>C&amp;hoose</source>
-        <translation>K&amp;iezen</translation>
-    </message>
-    <message>
-        <source>Sending addresses</source>
-        <translation>Verstuuradressen</translation>
-    </message>
-    <message>
-        <source>Receiving addresses</source>
-        <translation>Ontvang adressen</translation>
-    </message>
-    <message>
-        <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source>
-        <translation>Dit zijn uw Bitcoinadressen om betalingen mee te doen. Controleer altijd het bedrag en het ontvang adres voordat u uw bitcoins verstuurt.</translation>
-    </message>
-    <message>
-        <source>These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source>
-        <translation>Dit zijn uw Bitcoinadressen waarmee u kunt betalen. We raden u aan om een nieuw ontvangstadres voor elke transactie te gebruiken.</translation>
-    </message>
-    <message>
-        <source>Copy &amp;Label</source>
-        <translation>Kopiëer &amp;Label</translation>
-    </message>
-    <message>
-        <source>&amp;Edit</source>
-        <translation>&amp;Bewerk</translation>
-    </message>
-    <message>
-        <source>Export Address List</source>
-        <translation>Exporteer adreslijst</translation>
-    </message>
-    <message>
-        <source>Comma separated file (*.csv)</source>
-        <translation>Kommagescheiden bestand (*.csv)</translation>
-    </message>
-    <message>
-        <source>Exporting Failed</source>
-        <translation>Export Mislukt</translation>
-    </message>
-    <message>
-        <source>There was an error trying to save the address list to %1. Please try again.</source>
-        <translation>Een fout is opgetreden tijdens het opslaan van deze adreslijst naar %1. Probeer het nogmaals.</translation>
-    </message>
-</context>
-<context>
-    <name>AddressTableModel</name>
-    <message>
-        <source>Label</source>
-        <translation>Label</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>Adres</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(geen label)</translation>
-    </message>
 </context>
 <context>
     <name>AskPassphraseDialog</name>
@@ -131,94 +60,6 @@
         <source>Repeat new passphrase</source>
         <translation>Herhaal nieuw wachtwoord</translation>
     </message>
-    <message>
-        <source>Encrypt wallet</source>
-        <translation>Versleutel portemonnee</translation>
-    </message>
-    <message>
-        <source>This operation needs your wallet passphrase to unlock the wallet.</source>
-        <translation>Deze operatie vereist uw portemonneewachtwoord om de portemonnee te openen.</translation>
-    </message>
-    <message>
-        <source>Unlock wallet</source>
-        <translation>Open portemonnee</translation>
-    </message>
-    <message>
-        <source>This operation needs your wallet passphrase to decrypt the wallet.</source>
-        <translation>Deze operatie vereist uw portemonneewachtwoord om de portemonnee te ontsleutelen</translation>
-    </message>
-    <message>
-        <source>Decrypt wallet</source>
-        <translation>Ontsleutel portemonnee</translation>
-    </message>
-    <message>
-        <source>Change passphrase</source>
-        <translation>Wijzig wachtwoord</translation>
-    </message>
-    <message>
-        <source>Confirm wallet encryption</source>
-        <translation>Bevestig versleuteling van uw portemonnee</translation>
-    </message>
-    <message>
-        <source>Warning: If you encrypt your wallet and lose your passphrase, you will &lt;b&gt;LOSE ALL OF YOUR BITCOINS&lt;/b&gt;!</source>
-        <translation>Waarschuwing: Als u uw portemonnee versleutelt en uw wachtwoord vergeet, zult u &lt;b&gt;AL UW BITCOINS VERLIEZEN&lt;/b&gt;!</translation>
-    </message>
-    <message>
-        <source>Are you sure you wish to encrypt your wallet?</source>
-        <translation>Weet u zeker dat u uw portemonnee wilt versleutelen?</translation>
-    </message>
-    <message>
-        <source>Bitcoin Core will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source>
-        <translation>Bitcoin Core zal nu afsluiten om het versleutelingsproces te voltooien. Hou er rekening mee dat versleuteling van uw portemonnee u niet volledig beschermt tegen diefstal van jouw bitcoins door malware op je computer.</translation>
-    </message>
-    <message>
-        <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source>
-        <translation>BELANGRIJK: Elke eerder gemaakte backup van uw portemonneebestand dient u te vervangen door het nieuw gegenereerde, versleutelde portemonneebestand. Om veiligheidsredenen zullen eerdere backups van het niet-versleutelde portemonneebestand onbruikbaar worden zodra u uw nieuwe, versleutelde, portemonnee begint te gebruiken.</translation>
-    </message>
-    <message>
-        <source>Warning: The Caps Lock key is on!</source>
-        <translation>Waarschuwing: De Caps Locktoets staat aan!</translation>
-    </message>
-    <message>
-        <source>Wallet encrypted</source>
-        <translation>Portemonnee versleuteld</translation>
-    </message>
-    <message>
-        <source>Enter the new passphrase to the wallet.&lt;br/&gt;Please use a passphrase of &lt;b&gt;ten or more random characters&lt;/b&gt;, or &lt;b&gt;eight or more words&lt;/b&gt;.</source>
-        <translation>Voer een nieuw wachtwoord in voor uw portemonnee.&lt;br/&gt;Gebruik een wachtwoord van &lt;b&gt;tien of meer willekeurige karakters&lt;/b&gt;, of &lt;b&gt;acht of meer woorden&lt;/b&gt;.</translation>
-    </message>
-    <message>
-        <source>Enter the old passphrase and new passphrase to the wallet.</source>
-        <translation>Voer het oude en nieuwe wachtwoord in voor uw portemonnee.</translation>
-    </message>
-    <message>
-        <source>Wallet encryption failed</source>
-        <translation>Portemonneeversleuteling mislukt</translation>
-    </message>
-    <message>
-        <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
-        <translation>Portemonneeversleuteling mislukt door een interne fout. Uw portemonnee is niet versleuteld.</translation>
-    </message>
-    <message>
-        <source>The supplied passphrases do not match.</source>
-        <translation>De opgegeven wachtwoorden komen niet overeen</translation>
-    </message>
-    <message>
-        <source>Wallet unlock failed</source>
-        <translation>Portemonnee openen mislukt</translation>
-    </message>
-    <message>
-        <source>The passphrase entered for the wallet decryption was incorrect.</source>
-        <translation>Het opgegeven wachtwoord voor de portemonnee-ontsleuteling is niet correct.</translation>
-    </message>
-    <message>
-        <source>Wallet decryption failed</source>
-        <translation>Portemonnee-ontsleuteling mislukt</translation>
-    </message>
-    <message>
-        <source>Wallet passphrase was successfully changed.</source>
-        <translation>Portemonneewachtwoord is met succes gewijzigd.</translation>
-    </message>
 </context>
 <context>
     <name>BanTableModel</name>
@@ -269,6 +110,14 @@
         <source>Quit application</source>
         <translation>Programma afsluiten</translation>
     </message>
+    <message>
+        <source>&amp;About %1</source>
+        <translation>&amp;Over %1</translation>
+    </message>
+    <message>
+        <source>Show information about %1</source>
+        <translation>Toon informatie over %1</translation>
+    </message>
     <message>
         <source>About &amp;Qt</source>
         <translation>Over &amp;Qt</translation>
@@ -281,6 +130,10 @@
         <source>&amp;Options...</source>
         <translation>&amp;Opties...</translation>
     </message>
+    <message>
+        <source>Modify configuration options for %1</source>
+        <translation>Wijzig configuratieopties voor %1</translation>
+    </message>
     <message>
         <source>&amp;Encrypt Wallet...</source>
         <translation>&amp;Versleutel Portemonnee...</translation>
@@ -305,14 +158,6 @@
         <source>Open &amp;URI...</source>
         <translation>Open &amp;URI...</translation>
     </message>
-    <message>
-        <source>Bitcoin Core client</source>
-        <translation>Bitcoin Coreapplicatie</translation>
-    </message>
-    <message>
-        <source>Importing blocks from disk...</source>
-        <translation>Blokken aan het importeren vanaf harde schijf...</translation>
-    </message>
     <message>
         <source>Reindexing blocks on disk...</source>
         <translation>Bezig met herindexeren van blokken op harde schijf...</translation>
@@ -357,10 +202,6 @@
         <source>&amp;Receive</source>
         <translation>&amp;Ontvangen</translation>
     </message>
-    <message>
-        <source>Show information about Bitcoin Core</source>
-        <translation>Toon informatie over Bitcoin Core</translation>
-    </message>
     <message>
         <source>&amp;Show / Hide</source>
         <translation>&amp;Toon / Verberg</translation>
@@ -397,22 +238,10 @@
         <source>Tabs toolbar</source>
         <translation>Tab-werkbalk</translation>
     </message>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Bitcoin Core</translation>
-    </message>
     <message>
         <source>Request payments (generates QR codes and bitcoin: URIs)</source>
         <translation>Vraag betaling aan (genereert QR-codes en bitcoin: URI's)</translation>
     </message>
-    <message>
-        <source>&amp;About Bitcoin Core</source>
-        <translation>&amp;Over Bitcoin Core</translation>
-    </message>
-    <message>
-        <source>Modify configuration options for Bitcoin Core</source>
-        <translation>Wijzig configuratieopties voor Bitcoin Core</translation>
-    </message>
     <message>
         <source>Show the list of used sending addresses and labels</source>
         <translation>Toon de lijst met gebruikte verstuuradressen en -labels</translation>
@@ -427,16 +256,20 @@
     </message>
     <message>
         <source>&amp;Command-line options</source>
-        <translation>&amp;Opdrachytregelopties</translation>
-    </message>
-    <message>
-        <source>Show the Bitcoin Core help message to get a list with possible Bitcoin command-line options</source>
-        <translation>Toon het Bitcoin Core hulpbericht om een lijst te krijgen met mogelijke Bitcoinopdrachtregelopties</translation>
+        <translation>&amp;Opdrachtregelopties</translation>
     </message>
     <message numerus="yes">
         <source>%n active connection(s) to Bitcoin network</source>
         <translation><numerusform>%n actieve verbinding met Bitcoinnetwerk</numerusform><numerusform>%n actieve verbindingen met Bitcoinnetwerk</numerusform></translation>
     </message>
+    <message>
+        <source>Indexing blocks on disk...</source>
+        <translation>Bezig met indexeren van blokken op harde schijf...</translation>
+    </message>
+    <message>
+        <source>Processing blocks on disk...</source>
+        <translation>Bezig met verwerken van blokken op harde schijf...</translation>
+    </message>
     <message>
         <source>No block source available...</source>
         <translation>Geen bron voor blokken beschikbaar...</translation>
@@ -493,6 +326,14 @@
         <source>Up to date</source>
         <translation>Bijgewerkt</translation>
     </message>
+    <message>
+        <source>Show the %1 help message to get a list with possible Bitcoin command-line options</source>
+        <translation>Toon het %1 hulpbericht om een lijst te krijgen met mogelijke Bitcoin commandoregelopties</translation>
+    </message>
+    <message>
+        <source>%1 client</source>
+        <translation>%1 client</translation>
+    </message>
     <message>
         <source>Catching up...</source>
         <translation>Aan het bijwerken...</translation>
@@ -544,13 +385,6 @@
         <translation>Portemonnee is &lt;b&gt;versleuteld&lt;/b&gt; en momenteel &lt;b&gt;gesloten&lt;/b&gt;</translation>
     </message>
 </context>
-<context>
-    <name>ClientModel</name>
-    <message>
-        <source>Network Alert</source>
-        <translation>Netwerkwaarschuwing</translation>
-    </message>
-</context>
 <context>
     <name>CoinControlDialog</name>
     <message>
@@ -629,150 +463,6 @@
         <source>Priority</source>
         <translation>Prioriteit</translation>
     </message>
-    <message>
-        <source>Copy address</source>
-        <translation>Kopieer adres</translation>
-    </message>
-    <message>
-        <source>Copy label</source>
-        <translation>Kopieer label</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>Kopieer bedrag</translation>
-    </message>
-    <message>
-        <source>Copy transaction ID</source>
-        <translation>Kopieer transactie-ID</translation>
-    </message>
-    <message>
-        <source>Lock unspent</source>
-        <translation>Blokeer ongebruikte</translation>
-    </message>
-    <message>
-        <source>Unlock unspent</source>
-        <translation>Deblokkeer ongebruikte</translation>
-    </message>
-    <message>
-        <source>Copy quantity</source>
-        <translation>Kopieer aantal</translation>
-    </message>
-    <message>
-        <source>Copy fee</source>
-        <translation>Kopieerkosten</translation>
-    </message>
-    <message>
-        <source>Copy after fee</source>
-        <translation>Kopieernaheffing</translation>
-    </message>
-    <message>
-        <source>Copy bytes</source>
-        <translation>Kopieer bytes</translation>
-    </message>
-    <message>
-        <source>Copy priority</source>
-        <translation>Kopieer prioriteit</translation>
-    </message>
-    <message>
-        <source>Copy dust</source>
-        <translation>Kopieër stof</translation>
-    </message>
-    <message>
-        <source>Copy change</source>
-        <translation>Kopieer wisselgeld</translation>
-    </message>
-    <message>
-        <source>highest</source>
-        <translation>hoogste</translation>
-    </message>
-    <message>
-        <source>higher</source>
-        <translation>hoger</translation>
-    </message>
-    <message>
-        <source>high</source>
-        <translation>hoog</translation>
-    </message>
-    <message>
-        <source>medium-high</source>
-        <translation>gemiddeld hoog</translation>
-    </message>
-    <message>
-        <source>medium</source>
-        <translation>gemiddeld</translation>
-    </message>
-    <message>
-        <source>low-medium</source>
-        <translation>laag gemiddeld</translation>
-    </message>
-    <message>
-        <source>low</source>
-        <translation>laag</translation>
-    </message>
-    <message>
-        <source>lower</source>
-        <translation>lager</translation>
-    </message>
-    <message>
-        <source>lowest</source>
-        <translation>laagste</translation>
-    </message>
-    <message>
-        <source>(%1 locked)</source>
-        <translation>(%1 geblokeerd)</translation>
-    </message>
-    <message>
-        <source>none</source>
-        <translation>geen</translation>
-    </message>
-    <message>
-        <source>This label turns red if the transaction size is greater than 1000 bytes.</source>
-        <translation>Dit label wordt rood als de transactie groter is dan 1000 bytes.</translation>
-    </message>
-    <message>
-        <source>This label turns red if the priority is smaller than "medium".</source>
-        <translation>Dit label wordt rood als de prioriteit lager is dan "gemiddeld".</translation>
-    </message>
-    <message>
-        <source>This label turns red if any recipient receives an amount smaller than %1.</source>
-        <translation>Dit label wordt rood wanneer een ontvanger minder dan %1 krijgt.</translation>
-    </message>
-    <message>
-        <source>Can vary +/- %1 satoshi(s) per input.</source>
-        <translation>Kan per input +/- %1 satoshi(s)  variëren.</translation>
-    </message>
-    <message>
-        <source>yes</source>
-        <translation>ja</translation>
-    </message>
-    <message>
-        <source>no</source>
-        <translation>nee</translation>
-    </message>
-    <message>
-        <source>This means a fee of at least %1 per kB is required.</source>
-        <translation>Dit betekent dat kosten van minimaal %1 per kB aan verbonden zijn.</translation>
-    </message>
-    <message>
-        <source>Can vary +/- 1 byte per input.</source>
-        <translation>Kan +/- 1 byte per invoer variëren.</translation>
-    </message>
-    <message>
-        <source>Transactions with higher priority are more likely to get included into a block.</source>
-        <translation>Transacties met een hogere prioriteit zullen eerder in een blok gezet worden.</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(geen label)</translation>
-    </message>
-    <message>
-        <source>change from %1 (%2)</source>
-        <translation>wijzig van %1 (%2)</translation>
-    </message>
-    <message>
-        <source>(change)</source>
-        <translation>(wijzig)</translation>
-    </message>
 </context>
 <context>
     <name>EditAddressDialog</name>
@@ -796,38 +486,6 @@
         <source>&amp;Address</source>
         <translation>&amp;Adres</translation>
     </message>
-    <message>
-        <source>New receiving address</source>
-        <translation>Nieuw ontvangstadres</translation>
-    </message>
-    <message>
-        <source>New sending address</source>
-        <translation>Nieuw adres om naar te versturen</translation>
-    </message>
-    <message>
-        <source>Edit receiving address</source>
-        <translation>Bewerk ontvangstadres</translation>
-    </message>
-    <message>
-        <source>Edit sending address</source>
-        <translation>Bewerk adres om naar te versturen</translation>
-    </message>
-    <message>
-        <source>The entered address "%1" is already in the address book.</source>
-        <translation>Het opgegeven adres "%1" bestaat al in uw adresboek.</translation>
-    </message>
-    <message>
-        <source>The entered address "%1" is not a valid Bitcoin address.</source>
-        <translation>Het opgegeven adres "%1" is een ongeldig Bitcoinadres</translation>
-    </message>
-    <message>
-        <source>Could not unlock wallet.</source>
-        <translation>Kon de portemonnee niet openen.</translation>
-    </message>
-    <message>
-        <source>New key generation failed.</source>
-        <translation>Genereren nieuwe sleutel mislukt.</translation>
-    </message>
 </context>
 <context>
     <name>FreespaceChecker</name>
@@ -854,10 +512,6 @@
 </context>
 <context>
     <name>HelpMessageDialog</name>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Bitcoin Core</translation>
-    </message>
     <message>
         <source>version</source>
         <translation>versie</translation>
@@ -867,8 +521,8 @@
         <translation>(%1-bit)</translation>
     </message>
     <message>
-        <source>About Bitcoin Core</source>
-        <translation>Over Bitcoin Core</translation>
+        <source>About %1</source>
+        <translation>Over %1</translation>
     </message>
     <message>
         <source>Command-line options</source>
@@ -907,8 +561,8 @@
         <translation>Toon opstartscherm bij opstarten (standaard: %u)</translation>
     </message>
     <message>
-        <source>Reset all settings changes made over the GUI</source>
-        <translation>Reset alle wijzigingen aan instellingen gedaan met de GUI</translation>
+        <source>Reset all settings changed in the GUI</source>
+        <translation>Reset alle wijzigingen aan instellingen gedaan in de GUI</translation>
     </message>
 </context>
 <context>
@@ -918,16 +572,16 @@
         <translation>Welkom</translation>
     </message>
     <message>
-        <source>Welcome to Bitcoin Core.</source>
-        <translation>Welkom bij Bitcoin Core</translation>
+        <source>Welcome to %1.</source>
+        <translation>Welkom bij %1.</translation>
     </message>
     <message>
-        <source>As this is the first time the program is launched, you can choose where Bitcoin Core will store its data.</source>
-        <translation>Omdat dit de eerste keer is dat het programma gestart is, kunt u nu kiezen waar Bitcoin Core de data moet opslaan.</translation>
+        <source>As this is the first time the program is launched, you can choose where %1 will store its data.</source>
+        <translation>Omdat dit de eerste keer is dat het programma gestart is, kunt u nu kiezen waar %1 de data moet opslaan.</translation>
     </message>
     <message>
-        <source>Bitcoin Core will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source>
-        <translation>Bitcoin Core zal een kopie van de Bitcoinblokketen downloaden en opslaan. Tenminste %1 GB aan data wordt opgeslagen in deze map en het zal groeien in de tijd. De portemonnee wordt ook in deze map opgeslagen.</translation>
+        <source>%1 will download and store a copy of the Bitcoin block chain. At least %2GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source>
+        <translation>%1 zal een kopie van de Bitcoin blokketen downloaden en opslaan. Tenminste %2 GB aan data wordt opgeslagen in deze map en het zal groeien in de tijd. De portemonnee wordt ook in deze map opgeslagen.</translation>
     </message>
     <message>
         <source>Use the default data directory</source>
@@ -937,10 +591,6 @@
         <source>Use a custom data directory:</source>
         <translation>Gebruik een persoonlijke gegevensmap:</translation>
     </message>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Bitcoin Core</translation>
-    </message>
     <message>
         <source>Error: Specified data directory "%1" cannot be created.</source>
         <translation>Fout: De gespecificeerde directory "%1" kan niet worden gecreëerd.</translation>
@@ -976,10 +626,6 @@
         <source>Select payment request file</source>
         <translation>Selecteer betalingsverzoek bestand</translation>
     </message>
-    <message>
-        <source>Select payment request file to open</source>
-        <translation>Selecteer betalingsverzoek bestand om te openen</translation>
-    </message>
 </context>
 <context>
     <name>OptionsDialog</name>
@@ -991,6 +637,14 @@
         <source>&amp;Main</source>
         <translation>&amp;Algemeen</translation>
     </message>
+    <message>
+        <source>Automatically start %1 after logging in to the system.</source>
+        <translation>Start %1 automatisch na inloggen in het systeem.</translation>
+    </message>
+    <message>
+        <source>&amp;Start %1 on system login</source>
+        <translation>&amp;Start %1 bij het inloggen op het systeem</translation>
+    </message>
     <message>
         <source>Size of &amp;database cache</source>
         <translation>Grootte van de &amp;databasecache</translation>
@@ -1019,10 +673,6 @@
         <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Exit in the menu.</source>
         <translation>Minimaliseren in plaats van de applicatie af te sluiten wanneer het venster is afgesloten. Als deze optie is ingeschakeld, zal de toepassing pas worden afgesloten na het selecteren van Exit in het menu.</translation>
     </message>
-    <message>
-        <source>The user interface language can be set here. This setting will take effect after restarting Bitcoin Core.</source>
-        <translation>Stel hier de taal van de applicatie in. Deze instelling zal van kracht worden na het herstarten van de applicatie.</translation>
-    </message>
     <message>
         <source>Third party URLs (e.g. a block explorer) that appear in the transactions tab as context menu items. %s in the URL is replaced by transaction hash. Multiple URLs are separated by vertical bar |.</source>
         <translation>URL's van derden (bijvoorbeeld block explorer) die in de transacties tab verschijnen als contextmenuelementen. %s in de URL is vervangen door transactiehash. Verscheidene URL's zijn gescheiden door een verticale streep |.  </translation>
@@ -1047,14 +697,6 @@
         <source>&amp;Network</source>
         <translation>&amp;Netwerk</translation>
     </message>
-    <message>
-        <source>Automatically start Bitcoin Core after logging in to the system.</source>
-        <translation>Bitcoin Core automatisch starten bij inloggen.</translation>
-    </message>
-    <message>
-        <source>&amp;Start Bitcoin Core on system login</source>
-        <translation>&amp;Start Bitcoin Core tijdens login.</translation>
-    </message>
     <message>
         <source>(0 = auto, &lt;0 = leave that many cores free)</source>
         <translation>(0 = auto, &lt;0 = laat dit aantal kernen vrij)</translation>
@@ -1139,6 +781,14 @@
         <source>&amp;Window</source>
         <translation>&amp;Scherm</translation>
     </message>
+    <message>
+        <source>&amp;Hide the icon from the system tray.</source>
+        <translation>&amp;Verberg het icoon van de systeembalk.</translation>
+    </message>
+    <message>
+        <source>Hide tray icon</source>
+        <translation>Verberg systeembalk icoon</translation>
+    </message>
     <message>
         <source>Show only a tray icon after minimizing the window.</source>
         <translation>Laat alleen een systeemvakicoon zien wanneer het venster geminimaliseerd is</translation>
@@ -1159,6 +809,10 @@
         <source>User Interface &amp;language:</source>
         <translation>Taal &amp;Gebruikersinterface:</translation>
     </message>
+    <message>
+        <source>The user interface language can be set here. This setting will take effect after restarting %1.</source>
+        <translation>De taal van de gebruikersinterface kan hier ingesteld worden. Deze instelling zal pas van kracht worden nadat %1 herstart wordt.</translation>
+    </message>
     <message>
         <source>&amp;Unit to show amounts in:</source>
         <translation>&amp;Eenheid om bedrag in te tonen:</translation>
@@ -1284,169 +938,59 @@
     </message>
 </context>
 <context>
-    <name>PaymentServer</name>
+    <name>PeerTableModel</name>
     <message>
-        <source>URI handling</source>
-        <translation>URI-behandeling</translation>
+        <source>User Agent</source>
+        <translation>User Agent</translation>
     </message>
     <message>
-        <source>Invalid payment address %1</source>
-        <translation>Ongeldig betalingsadres %1</translation>
+        <source>Node/Service</source>
+        <translation>Node/Dienst</translation>
     </message>
     <message>
-        <source>Payment request rejected</source>
-        <translation>Betalingsverzoek geweigerd</translation>
+        <source>Ping Time</source>
+        <translation>Ping tijd</translation>
     </message>
+</context>
+<context>
+    <name>QObject</name>
     <message>
-        <source>Payment request network doesn't match client network.</source>
-        <translation>Betalingsaanvraagnetwerk komt niet overeen met klantennetwerk.</translation>
+        <source>Amount</source>
+        <translation>Bedrag</translation>
     </message>
     <message>
-        <source>Payment request is not initialized.</source>
-        <translation>Betalingsaanvraag is niet geïnitialiseerd.</translation>
+        <source>Enter a Bitcoin address (e.g. %1)</source>
+        <translation>Voer een Bitcoinadres in (bijv. %1)</translation>
     </message>
     <message>
-        <source>Requested payment amount of %1 is too small (considered dust).</source>
-        <translation>Het gevraagde betalingsbedrag van %1 is te weinig (beschouwd als stof).</translation>
+        <source>%1 d</source>
+        <translation>%1 d</translation>
     </message>
     <message>
-        <source>Payment request error</source>
-        <translation>Fout bij betalingsverzoek</translation>
+        <source>%1 h</source>
+        <translation>%1 uur</translation>
     </message>
     <message>
-        <source>Cannot start bitcoin: click-to-pay handler</source>
-        <translation>Kan bitcoin niet starten: click-to-pay handler</translation>
+        <source>%1 m</source>
+        <translation>%1 m</translation>
     </message>
     <message>
-        <source>Payment request fetch URL is invalid: %1</source>
-        <translation>URL om betalingsverzoek te verkrijgen is ongeldig: %1</translation>
+        <source>%1 s</source>
+        <translation>%1 s</translation>
     </message>
     <message>
-        <source>URI cannot be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source>
-        <translation>URI kan niet verwerkt worden! Dit kan het gevolg zijn van een ongeldig Bitcoinadres of misvormde URI-parameters.</translation>
+        <source>None</source>
+        <translation>Geen</translation>
     </message>
     <message>
-        <source>Payment request file handling</source>
-        <translation>Betalingsverzoek bestandsafhandeling</translation>
-    </message>
-    <message>
-        <source>Payment request file cannot be read! This can be caused by an invalid payment request file.</source>
-        <translation>Betalingsverzoekbestand kan niet gelezen of verwerkt worden! Dit kan veroorzaakt worden door een ongeldig betalingsverzoek-bestand.</translation>
-    </message>
-    <message>
-        <source>Payment request expired.</source>
-        <translation>Betalingsverzoek verlopen.</translation>
-    </message>
-    <message>
-        <source>Unverified payment requests to custom payment scripts are unsupported.</source>
-        <translation>Niet-geverifieerde betalingsverzoeken naar aangepaste betaling scripts worden niet ondersteund.</translation>
-    </message>
-    <message>
-        <source>Invalid payment request.</source>
-        <translation>Ongeldig betalingsverzoek.</translation>
-    </message>
-    <message>
-        <source>Refund from %1</source>
-        <translation>Restitutie van %1</translation>
-    </message>
-    <message>
-        <source>Payment request %1 is too large (%2 bytes, allowed %3 bytes).</source>
-        <translation>Betalingsverzoek %1 is te groot (%2 bytes, toegestaan ​​%3 bytes).</translation>
-    </message>
-    <message>
-        <source>Error communicating with %1: %2</source>
-        <translation>Fout bij communiceren met %1: %2</translation>
-    </message>
-    <message>
-        <source>Payment request cannot be parsed!</source>
-        <translation>Betalingsverzoek kan niet juist worden ontleed of verwerkt!</translation>
-    </message>
-    <message>
-        <source>Bad response from server %1</source>
-        <translation>Ongeldige respons van server %1</translation>
-    </message>
-    <message>
-        <source>Payment acknowledged</source>
-        <translation>Betaling bevestigd</translation>
-    </message>
-    <message>
-        <source>Network request error</source>
-        <translation>Netwerkfout bij verzoek</translation>
-    </message>
-</context>
-<context>
-    <name>PeerTableModel</name>
-    <message>
-        <source>User Agent</source>
-        <translation>User Agent</translation>
-    </message>
-    <message>
-        <source>Node/Service</source>
-        <translation>Node/Dienst</translation>
-    </message>
-    <message>
-        <source>Ping Time</source>
-        <translation>Ping tijd</translation>
-    </message>
-</context>
-<context>
-    <name>QObject</name>
-    <message>
-        <source>Amount</source>
-        <translation>Bedrag</translation>
-    </message>
-    <message>
-        <source>Enter a Bitcoin address (e.g. %1)</source>
-        <translation>Voer een Bitcoinadres in (bijv. %1)</translation>
-    </message>
-    <message>
-        <source>%1 d</source>
-        <translation>%1 d</translation>
-    </message>
-    <message>
-        <source>%1 h</source>
-        <translation>%1 uur</translation>
-    </message>
-    <message>
-        <source>%1 m</source>
-        <translation>%1 m</translation>
-    </message>
-    <message>
-        <source>%1 s</source>
-        <translation>%1 s</translation>
-    </message>
-    <message>
-        <source>None</source>
-        <translation>Geen</translation>
-    </message>
-    <message>
-        <source>N/A</source>
-        <translation>N.v.t.</translation>
+        <source>N/A</source>
+        <translation>N.v.t.</translation>
     </message>
     <message>
         <source>%1 ms</source>
         <translation>%1 ms</translation>
     </message>
 </context>
-<context>
-    <name>QRImageWidget</name>
-    <message>
-        <source>&amp;Save Image...</source>
-        <translation>&amp;Afbeelding opslaan...</translation>
-    </message>
-    <message>
-        <source>&amp;Copy Image</source>
-        <translation>&amp;Afbeelding kopiëren</translation>
-    </message>
-    <message>
-        <source>Save QR Code</source>
-        <translation>Sla QR-code op</translation>
-    </message>
-    <message>
-        <source>PNG Image (*.png)</source>
-        <translation>PNG afbeelding (*.png)</translation>
-    </message>
-</context>
 <context>
     <name>RPCConsole</name>
     <message>
@@ -1477,6 +1021,10 @@
         <source>Using BerkeleyDB version</source>
         <translation>Gebruikt BerkeleyDB versie</translation>
     </message>
+    <message>
+        <source>Datadir</source>
+        <translation>Data map</translation>
+    </message>
     <message>
         <source>Startup time</source>
         <translation>Opstarttijd</translation>
@@ -1513,10 +1061,6 @@
         <source>Memory usage</source>
         <translation>Geheugengebruik</translation>
     </message>
-    <message>
-        <source>Open the Bitcoin Core debug log file from the current data directory. This can take a few seconds for large log files.</source>
-        <translation>Open het Bitcoin Core debuglogbestand van de huidige gegevensmap. Dit kan enkele seconden duren voor grote logbestanden.</translation>
-    </message>
     <message>
         <source>Received</source>
         <translation>Ontvangen</translation>
@@ -1565,6 +1109,18 @@
         <source>User Agent</source>
         <translation>User Agent</translation>
     </message>
+    <message>
+        <source>Open the %1 debug log file from the current data directory. This can take a few seconds for large log files.</source>
+        <translation>Open het %1 debug-logbestand van de huidige datamap. Dit kan een aantal seconden duren voor grote logbestanden.</translation>
+    </message>
+    <message>
+        <source>Decrease font size</source>
+        <translation>Verklein lettergrootte</translation>
+    </message>
+    <message>
+        <source>Increase font size</source>
+        <translation>Vergroot lettergrootte</translation>
+    </message>
     <message>
         <source>Services</source>
         <translation>Diensten</translation>
@@ -1627,16 +1183,12 @@
     </message>
     <message>
         <source>In:</source>
-        <translation>In;</translation>
+        <translation>In:</translation>
     </message>
     <message>
         <source>Out:</source>
         <translation>Uit:</translation>
     </message>
-    <message>
-        <source>Build date</source>
-        <translation>Bouwdatum</translation>
-    </message>
     <message>
         <source>Debug log file</source>
         <translation>Debuglogbestand</translation>
@@ -1674,8 +1226,8 @@
         <translation>&amp;Maak Ban Ongedaan voor Node</translation>
     </message>
     <message>
-        <source>Welcome to the Bitcoin Core RPC console.</source>
-        <translation>Welkom op de Bitcoin Core RPC console.</translation>
+        <source>Welcome to the %1 RPC console.</source>
+        <translation>Welkom bij de %1 RPC-console.</translation>
     </message>
     <message>
         <source>Use up and down arrows to navigate history, and &lt;b&gt;Ctrl-L&lt;/b&gt; to clear screen.</source>
@@ -1804,18 +1356,6 @@
         <source>Remove</source>
         <translation>Verwijder</translation>
     </message>
-    <message>
-        <source>Copy label</source>
-        <translation>Kopieer label</translation>
-    </message>
-    <message>
-        <source>Copy message</source>
-        <translation>Kopieer bericht</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>Kopieer bedrag</translation>
-    </message>
 </context>
 <context>
     <name>ReceiveRequestDialog</name>
@@ -1835,73 +1375,6 @@
         <source>&amp;Save Image...</source>
         <translation>&amp;Sla afbeelding op...</translation>
     </message>
-    <message>
-        <source>Request payment to %1</source>
-        <translation>Betalingsverzoek tot %1</translation>
-    </message>
-    <message>
-        <source>Payment information</source>
-        <translation>Betalingsinformatie</translation>
-    </message>
-    <message>
-        <source>URI</source>
-        <translation>URI</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>Adres</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>Bedrag</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Label</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>Bericht</translation>
-    </message>
-    <message>
-        <source>Resulting URI too long, try to reduce the text for label / message.</source>
-        <translation>Resulterende URI te lang, probeer de tekst korter te maken voor het label/bericht.</translation>
-    </message>
-    <message>
-        <source>Error encoding URI into QR Code.</source>
-        <translation>Fout tijdens encoderen URI in QR-code</translation>
-    </message>
-</context>
-<context>
-    <name>RecentRequestsTableModel</name>
-    <message>
-        <source>Date</source>
-        <translation>Datum</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Label</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>Bericht</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>Bedrag</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(geen label)</translation>
-    </message>
-    <message>
-        <source>(no message)</source>
-        <translation>(geen bericht)</translation>
-    </message>
-    <message>
-        <source>(no amount)</source>
-        <translation>(geen bedrag)</translation>
-    </message>
 </context>
 <context>
     <name>SendCoinsDialog</name>
@@ -2021,14 +1494,6 @@
         <source>fast</source>
         <translation>snel</translation>
     </message>
-    <message>
-        <source>Send as zero-fee transaction if possible</source>
-        <translation>Indien mogelijk, verstuur zonder transactiekosten</translation>
-    </message>
-    <message>
-        <source>(confirmation may take longer)</source>
-        <translation>(bevestiging kan langer duren)</translation>
-    </message>
     <message>
         <source>Send to multiple recipients at once</source>
         <translation>Verstuur in een keer aan verschillende ontvangers</translation>
@@ -2055,850 +1520,216 @@
     </message>
     <message>
         <source>Confirm the send action</source>
-        <translation>Bevestig de verstuuractie</translation>
-    </message>
-    <message>
-        <source>S&amp;end</source>
-        <translation>V&amp;erstuur</translation>
-    </message>
-    <message>
-        <source>Confirm send coins</source>
-        <translation>Bevestig versturen munten</translation>
-    </message>
-    <message>
-        <source>%1 to %2</source>
-        <translation>%1 tot %2</translation>
-    </message>
-    <message>
-        <source>Copy quantity</source>
-        <translation>Kopieer aantal</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>Kopieer bedrag</translation>
-    </message>
-    <message>
-        <source>Copy fee</source>
-        <translation>Kopieerkosten</translation>
-    </message>
-    <message>
-        <source>Copy after fee</source>
-        <translation>Kopieernaheffing</translation>
-    </message>
-    <message>
-        <source>Copy bytes</source>
-        <translation>Kopieer bytes</translation>
-    </message>
-    <message>
-        <source>Copy priority</source>
-        <translation>Kopieer prioriteit</translation>
-    </message>
-    <message>
-        <source>Copy change</source>
-        <translation>Kopieer wijziging</translation>
-    </message>
-    <message>
-        <source>Total Amount %1</source>
-        <translation>Totaalbedrag %1</translation>
-    </message>
-    <message>
-        <source>or</source>
-        <translation>of</translation>
-    </message>
-    <message>
-        <source>The amount to pay must be larger than 0.</source>
-        <translation>Het ingevoerde bedrag moet groter zijn dan 0.</translation>
-    </message>
-    <message>
-        <source>The amount exceeds your balance.</source>
-        <translation>Bedrag is hoger dan uw huidige saldo</translation>
-    </message>
-    <message>
-        <source>The total exceeds your balance when the %1 transaction fee is included.</source>
-        <translation>Totaal overschrijdt uw huidige saldo wanneer de %1 transactiekosten worden meegerekend</translation>
-    </message>
-    <message>
-        <source>Transaction creation failed!</source>
-        <translation>Transactie creatie niet gelukt!</translation>
-    </message>
-    <message>
-        <source>The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source>
-        <translation>De transactie was afgewezen. Dit kan gebeuren als u eerder uitgegeven munten opnieuw wilt versturen, zoals wanneer u een kopie van uw wallet.dat heeft gebruikt en in de kopie deze munten zijn gemarkeerd als uitgegeven, maar in de huidige nog niet.</translation>
-    </message>
-    <message>
-        <source>A fee higher than %1 is considered an absurdly high fee.</source>
-        <translation>Transactiekosten van meer dan %1 wordt beschouwd als een absurd hoge transactiekosten.</translation>
-    </message>
-    <message>
-        <source>Payment request expired.</source>
-        <translation>Betalingsverzoek verlopen.</translation>
-    </message>
-    <message>
-        <source>Pay only the required fee of %1</source>
-        <translation>Betaal alleen de verplichte transactiekosten van %1</translation>
-    </message>
-    <message numerus="yes">
-        <source>Estimated to begin confirmation within %n block(s).</source>
-        <translation><numerusform>Schatting is dat bevestiging begint over %n blok.</numerusform><numerusform>Schatting is dat bevestiging begint over %n blokken.</numerusform></translation>
-    </message>
-    <message>
-        <source>The recipient address is not valid. Please recheck.</source>
-        <translation>Het adres van de ontvanger is niet geldig. Gelieve opnieuw te controleren..</translation>
-    </message>
-    <message>
-        <source>Duplicate address found: addresses should only be used once each.</source>
-        <translation>Dubbel adres gevonden: adressen mogen maar één keer worden gebruikt worden.</translation>
-    </message>
-    <message>
-        <source>Warning: Invalid Bitcoin address</source>
-        <translation>Waarschuwing: Ongeldig Bitcoinadres</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(geen label)</translation>
-    </message>
-    <message>
-        <source>Warning: Unknown change address</source>
-        <translation>Waarschuwing: Onbekend wisselgeldadres</translation>
-    </message>
-    <message>
-        <source>Copy dust</source>
-        <translation>Kopieër stof</translation>
-    </message>
-    <message>
-        <source>Are you sure you want to send?</source>
-        <translation>Weet u zeker dat u wilt versturen?</translation>
-    </message>
-    <message>
-        <source>added as transaction fee</source>
-        <translation>toegevoegd als transactiekosten</translation>
-    </message>
-</context>
-<context>
-    <name>SendCoinsEntry</name>
-    <message>
-        <source>A&amp;mount:</source>
-        <translation>B&amp;edrag:</translation>
-    </message>
-    <message>
-        <source>Pay &amp;To:</source>
-        <translation>Betaal &amp;Aan:</translation>
-    </message>
-    <message>
-        <source>Enter a label for this address to add it to your address book</source>
-        <translation>Vul een label in voor dit adres om het toe te voegen aan uw adresboek</translation>
-    </message>
-    <message>
-        <source>&amp;Label:</source>
-        <translation>&amp;Label:</translation>
-    </message>
-    <message>
-        <source>Choose previously used address</source>
-        <translation>Kies een eerder gebruikt adres</translation>
-    </message>
-    <message>
-        <source>This is a normal payment.</source>
-        <translation>Dit is een normale betaling.</translation>
-    </message>
-    <message>
-        <source>The Bitcoin address to send the payment to</source>
-        <translation>Het Bitcoinadres om betaling aan te versturen</translation>
-    </message>
-    <message>
-        <source>Alt+A</source>
-        <translation>Alt+A</translation>
-    </message>
-    <message>
-        <source>Paste address from clipboard</source>
-        <translation>Plak adres vanuit klembord</translation>
-    </message>
-    <message>
-        <source>Alt+P</source>
-        <translation>Alt+P</translation>
-    </message>
-    <message>
-        <source>Remove this entry</source>
-        <translation>Verwijder deze toevoeging</translation>
-    </message>
-    <message>
-        <source>The fee will be deducted from the amount being sent. The recipient will receive less bitcoins than you enter in the amount field. If multiple recipients are selected, the fee is split equally.</source>
-        <translation>De transactiekosten zal worden afgetrokken van het bedrag dat verstuurd wordt. De ontvangers zullen minder bitcoins ontvangen dan ingevoerd is in het hoeveelheidsveld. Als er meerdere ontvangers geselecteerd zijn, dan worden de transactiekosten gelijk verdeeld.</translation>
-    </message>
-    <message>
-        <source>S&amp;ubtract fee from amount</source>
-        <translation>Trek de transactiekosten a&amp;f van het bedrag.</translation>
-    </message>
-    <message>
-        <source>Message:</source>
-        <translation>Bericht:</translation>
-    </message>
-    <message>
-        <source>This is an unauthenticated payment request.</source>
-        <translation>Dit is een niet-geverifieerd betalingsverzoek.</translation>
-    </message>
-    <message>
-        <source>This is an authenticated payment request.</source>
-        <translation>Dit is een geverifieerd betalingsverzoek.</translation>
-    </message>
-    <message>
-        <source>Enter a label for this address to add it to the list of used addresses</source>
-        <translation>Vul een label voor dit adres in om het aan de lijst met gebruikte adressen toe te voegen</translation>
-    </message>
-    <message>
-        <source>A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
-        <translation>Een bericht dat werd toegevoegd aan de bitcoin: URI welke wordt opgeslagen met de transactie ter referentie. Opmerking: Dit bericht zal niet worden verzonden over het Bitcoinnetwerk.</translation>
-    </message>
-    <message>
-        <source>Pay To:</source>
-        <translation>Betaal Aan:</translation>
-    </message>
-    <message>
-        <source>Memo:</source>
-        <translation>Memo:</translation>
-    </message>
-</context>
-<context>
-    <name>ShutdownWindow</name>
-    <message>
-        <source>Bitcoin Core is shutting down...</source>
-        <translation>Bitcoin Core is aan het afsluiten...</translation>
-    </message>
-    <message>
-        <source>Do not shut down the computer until this window disappears.</source>
-        <translation>Sluit de computer niet af totdat dit venster verdwenen is.</translation>
-    </message>
-</context>
-<context>
-    <name>SignVerifyMessageDialog</name>
-    <message>
-        <source>Signatures - Sign / Verify a Message</source>
-        <translation>Handtekeningen – Onderteken een bericht / Verifiëer een handtekening</translation>
-    </message>
-    <message>
-        <source>&amp;Sign Message</source>
-        <translation>&amp;Onderteken Bericht</translation>
-    </message>
-    <message>
-        <source>You can sign messages/agreements with your addresses to prove you can receive bitcoins sent to them. Be careful not to sign anything vague or random, as phishing attacks may try to trick you into signing your identity over to them. Only sign fully-detailed statements you agree to.</source>
-        <translation>U kunt berichten/overeenkomsten ondertekenen met uw adres om te bewijzen dat u Bitcoins kunt versturen. Wees voorzichtig met het ondertekenen van iets vaags of willekeurigs, omdat phishingaanvallen u kunnen proberen te misleiden tot het ondertekenen van overeenkomsten om uw identiteit aan hen toe te vertrouwen. Onderteken alleen volledig gedetailleerde verklaringen voordat u akkoord gaat.</translation>
-    </message>
-    <message>
-        <source>The Bitcoin address to sign the message with</source>
-        <translation>Het Bitcoinadres om bericht mee te ondertekenen</translation>
-    </message>
-    <message>
-        <source>Choose previously used address</source>
-        <translation>Kies een eerder gebruikt adres</translation>
-    </message>
-    <message>
-        <source>Alt+A</source>
-        <translation>Alt+A</translation>
-    </message>
-    <message>
-        <source>Paste address from clipboard</source>
-        <translation>Plak adres vanuit klembord</translation>
-    </message>
-    <message>
-        <source>Alt+P</source>
-        <translation>Alt+P</translation>
-    </message>
-    <message>
-        <source>Enter the message you want to sign here</source>
-        <translation>Typ hier het bericht dat u wilt ondertekenen</translation>
-    </message>
-    <message>
-        <source>Signature</source>
-        <translation>Handtekening</translation>
-    </message>
-    <message>
-        <source>Copy the current signature to the system clipboard</source>
-        <translation>Kopieer de huidige handtekening naar het systeemklembord</translation>
-    </message>
-    <message>
-        <source>Sign the message to prove you own this Bitcoin address</source>
-        <translation>Onderteken een bericht om te bewijzen dat u een bepaald Bitcoinadres bezit</translation>
-    </message>
-    <message>
-        <source>Sign &amp;Message</source>
-        <translation>Onderteken &amp;Bericht</translation>
-    </message>
-    <message>
-        <source>Reset all sign message fields</source>
-        <translation>Verwijder alles in de invulvelden</translation>
-    </message>
-    <message>
-        <source>Clear &amp;All</source>
-        <translation>Verwijder &amp;Alles</translation>
-    </message>
-    <message>
-        <source>&amp;Verify Message</source>
-        <translation>&amp;Verifiëer Bericht</translation>
-    </message>
-    <message>
-        <source>Enter the receiver's address, message (ensure you copy line breaks, spaces, tabs, etc. exactly) and signature below to verify the message. Be careful not to read more into the signature than what is in the signed message itself, to avoid being tricked by a man-in-the-middle attack. Note that this only proves the signing party receives with the address, it cannot prove sendership of any transaction!</source>
-        <translation>Voer het adres van de ontvanger in, bericht (zorg ervoor dat de regeleinden, spaties, tabs etc. precies kloppen) en onderteken onderaan om het bericht te verifiëren. Wees voorzicht om niet meer in de ondertekening te lezen dan in het getekende bericht zelf, om te voorkomen dat je wordt aangevallen met een man-in-the-middle attack. Houd er mee rekening dat dit alleen de ondertekende partij bewijst met het ontvangen adres, er kan niet bewezen worden dat er een transactie heeft plaatsgevonden!</translation>
-    </message>
-    <message>
-        <source>The Bitcoin address the message was signed with</source>
-        <translation>Het Bitcoinadres waarmee het bericht ondertekend is</translation>
-    </message>
-    <message>
-        <source>Verify the message to ensure it was signed with the specified Bitcoin address</source>
-        <translation>Controleer een bericht om te verifiëren dat het gespecificeerde Bitcoinadres het bericht heeft ondertekend.</translation>
-    </message>
-    <message>
-        <source>Verify &amp;Message</source>
-        <translation>Verifiëer &amp;Bericht</translation>
-    </message>
-    <message>
-        <source>Reset all verify message fields</source>
-        <translation>Verwijder alles in de invulvelden</translation>
-    </message>
-    <message>
-        <source>Click "Sign Message" to generate signature</source>
-        <translation>Klik "Onderteken Bericht" om de handtekening te genereren</translation>
-    </message>
-    <message>
-        <source>The entered address is invalid.</source>
-        <translation>Het opgegeven adres is ongeldig.</translation>
-    </message>
-    <message>
-        <source>Please check the address and try again.</source>
-        <translation>Controleer s.v.p. het adres en probeer het opnieuw.</translation>
-    </message>
-    <message>
-        <source>The entered address does not refer to a key.</source>
-        <translation>Het opgegeven adres verwijst niet naar een sleutel.</translation>
-    </message>
-    <message>
-        <source>Wallet unlock was cancelled.</source>
-        <translation>Portemonnee-ontsleuteling is geannuleerd</translation>
-    </message>
-    <message>
-        <source>Private key for the entered address is not available.</source>
-        <translation>Geheime sleutel voor het ingevoerde adres is niet beschikbaar.</translation>
-    </message>
-    <message>
-        <source>Message signing failed.</source>
-        <translation>Ondertekenen van het bericht is mislukt.</translation>
-    </message>
-    <message>
-        <source>Message signed.</source>
-        <translation>Bericht ondertekend.</translation>
-    </message>
-    <message>
-        <source>The signature could not be decoded.</source>
-        <translation>De handtekening kon niet worden gedecodeerd.</translation>
-    </message>
-    <message>
-        <source>Please check the signature and try again.</source>
-        <translation>Controleer s.v.p. de handtekening en probeer het opnieuw.</translation>
-    </message>
-    <message>
-        <source>The signature did not match the message digest.</source>
-        <translation>De handtekening hoort niet bij het bericht.</translation>
-    </message>
-    <message>
-        <source>Message verification failed.</source>
-        <translation>Berichtverificatie mislukt.</translation>
-    </message>
-    <message>
-        <source>Message verified.</source>
-        <translation>Bericht correct geverifiëerd.</translation>
-    </message>
-</context>
-<context>
-    <name>SplashScreen</name>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Bitcoin Core</translation>
-    </message>
-    <message>
-        <source>The Bitcoin Core developers</source>
-        <translation>De Bitcoin Core-ontwikkelaars</translation>
-    </message>
-    <message>
-        <source>[testnet]</source>
-        <translation>[testnetwerk]</translation>
-    </message>
-</context>
-<context>
-    <name>TrafficGraphWidget</name>
-    <message>
-        <source>KB/s</source>
-        <translation>KB/s</translation>
-    </message>
-</context>
-<context>
-    <name>TransactionDesc</name>
-    <message>
-        <source>Open until %1</source>
-        <translation>Openen totdat %1</translation>
-    </message>
-    <message>
-        <source>conflicted</source>
-        <translation>conflicterend</translation>
-    </message>
-    <message>
-        <source>%1/offline</source>
-        <translation>%1/offline</translation>
-    </message>
-    <message>
-        <source>%1/unconfirmed</source>
-        <translation>%1/onbevestigd</translation>
-    </message>
-    <message>
-        <source>%1 confirmations</source>
-        <translation>%1 bevestigingen</translation>
-    </message>
-    <message>
-        <source>Status</source>
-        <translation>Status</translation>
-    </message>
-    <message numerus="yes">
-        <source>, broadcast through %n node(s)</source>
-        <translation><numerusform>, uitgezonden naar %n node</numerusform><numerusform>, uitgezonden naar %n nodes</numerusform></translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation>Datum</translation>
-    </message>
-    <message>
-        <source>Source</source>
-        <translation>Bron</translation>
-    </message>
-    <message>
-        <source>Generated</source>
-        <translation>Gegenereerd</translation>
-    </message>
-    <message>
-        <source>From</source>
-        <translation>Van</translation>
-    </message>
-    <message>
-        <source>To</source>
-        <translation>Aan</translation>
-    </message>
-    <message>
-        <source>own address</source>
-        <translation>eigen adres</translation>
-    </message>
-    <message>
-        <source>watch-only</source>
-        <translation>alleen-bekijkbaar</translation>
-    </message>
-    <message>
-        <source>label</source>
-        <translation>label</translation>
-    </message>
-    <message>
-        <source>Credit</source>
-        <translation>Credit</translation>
-    </message>
-    <message numerus="yes">
-        <source>matures in %n more block(s)</source>
-        <translation><numerusform>komt tot wasdom na %n nieuw blok</numerusform><numerusform>komt tot wasdom na %n nieuwe blokken</numerusform></translation>
-    </message>
-    <message>
-        <source>not accepted</source>
-        <translation>niet geaccepteerd</translation>
-    </message>
-    <message>
-        <source>Debit</source>
-        <translation>Debet</translation>
-    </message>
-    <message>
-        <source>Total debit</source>
-        <translation>Totaal debit</translation>
-    </message>
-    <message>
-        <source>Total credit</source>
-        <translation>Totaal credit</translation>
-    </message>
-    <message>
-        <source>Transaction fee</source>
-        <translation>Transactiekosten</translation>
-    </message>
-    <message>
-        <source>Net amount</source>
-        <translation>Netto bedrag</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>Bericht</translation>
-    </message>
-    <message>
-        <source>Comment</source>
-        <translation>Opmerking</translation>
-    </message>
-    <message>
-        <source>Transaction ID</source>
-        <translation>Transactie-ID:</translation>
-    </message>
-    <message>
-        <source>Merchant</source>
-        <translation>Handelaar</translation>
-    </message>
-    <message>
-        <source>Generated coins must mature %1 blocks before they can be spent. When you generated this block, it was broadcast to the network to be added to the block chain. If it fails to get into the chain, its state will change to "not accepted" and it won't be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source>
-        <translation>Gegenereerde munten moeten %1 blokken rijpen voordat ze kunnen worden besteed. Toen dit blok gegenereerd werd, werd het uitgezonden naar het netwerk om aan de blokketen toegevoegd te worden. Als het niet lukt om in de keten toegevoegd te worden, zal de status te veranderen naar "niet geaccepteerd" en het zal deze niet besteedbaar zijn. Dit kan soms gebeuren als een ander knooppunt een blok genereert binnen een paar seconden na die van u.</translation>
-    </message>
-    <message>
-        <source>Debug information</source>
-        <translation>Debuginformatie</translation>
-    </message>
-    <message>
-        <source>Transaction</source>
-        <translation>Transactie</translation>
-    </message>
-    <message>
-        <source>Inputs</source>
-        <translation>Inputs</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>Bedrag</translation>
-    </message>
-    <message>
-        <source>true</source>
-        <translation>waar</translation>
-    </message>
-    <message>
-        <source>false</source>
-        <translation>onwaar</translation>
-    </message>
-    <message>
-        <source>, has not been successfully broadcast yet</source>
-        <translation>, is nog niet met succes uitgezonden</translation>
-    </message>
-    <message numerus="yes">
-        <source>Open for %n more block(s)</source>
-        <translation><numerusform>Open voor nog %n blok</numerusform><numerusform>Open voor nog %n blokken</numerusform></translation>
-    </message>
-    <message>
-        <source>unknown</source>
-        <translation>onbekend</translation>
-    </message>
-</context>
-<context>
-    <name>TransactionDescDialog</name>
-    <message>
-        <source>Transaction details</source>
-        <translation>Transactiedetails</translation>
-    </message>
-    <message>
-        <source>This pane shows a detailed description of the transaction</source>
-        <translation>Dit venster laat een uitgebreide beschrijving van de transactie zien</translation>
-    </message>
-</context>
-<context>
-    <name>TransactionTableModel</name>
-    <message>
-        <source>Date</source>
-        <translation>Datum</translation>
-    </message>
-    <message>
-        <source>Type</source>
-        <translation>Type</translation>
-    </message>
-    <message>
-        <source>Immature (%1 confirmations, will be available after %2)</source>
-        <translation>Premature (%1 bevestigingen, zal beschikbaar zijn na %2)</translation>
-    </message>
-    <message numerus="yes">
-        <source>Open for %n more block(s)</source>
-        <translation><numerusform>Open voor nog %n blok</numerusform><numerusform>Open voor nog %n blokken</numerusform></translation>
-    </message>
-    <message>
-        <source>Open until %1</source>
-        <translation>Open tot %1</translation>
-    </message>
-    <message>
-        <source>Confirmed (%1 confirmations)</source>
-        <translation>Bevestigd (%1 bevestigingen)</translation>
-    </message>
-    <message>
-        <source>This block was not received by any other nodes and will probably not be accepted!</source>
-        <translation>Dit blok is niet ontvangen bij andere nodes en zal waarschijnlijk niet worden geaccepteerd!</translation>
-    </message>
-    <message>
-        <source>Generated but not accepted</source>
-        <translation>Gegenereerd maar niet geaccepteerd</translation>
-    </message>
-    <message>
-        <source>Offline</source>
-        <translation>Niet verbonden</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Label</translation>
-    </message>
-    <message>
-        <source>Unconfirmed</source>
-        <translation>Onbevestigd</translation>
-    </message>
-    <message>
-        <source>Confirming (%1 of %2 recommended confirmations)</source>
-        <translation>Bevestigen (%1 van %2 aanbevolen bevestigingen)</translation>
-    </message>
-    <message>
-        <source>Conflicted</source>
-        <translation>Conflicterend</translation>
-    </message>
-    <message>
-        <source>Received with</source>
-        <translation>Ontvangen met</translation>
-    </message>
-    <message>
-        <source>Received from</source>
-        <translation>Ontvangen van</translation>
-    </message>
-    <message>
-        <source>Sent to</source>
-        <translation>Verstuurd aan</translation>
-    </message>
-    <message>
-        <source>Payment to yourself</source>
-        <translation>Betaling aan uzelf</translation>
-    </message>
-    <message>
-        <source>Mined</source>
-        <translation>Gedolven</translation>
-    </message>
-    <message>
-        <source>watch-only</source>
-        <translation>alleen-bekijkbaar</translation>
+        <translation>Bevestig de verstuuractie</translation>
     </message>
     <message>
-        <source>(n/a)</source>
-        <translation>(nvt)</translation>
+        <source>S&amp;end</source>
+        <translation>V&amp;erstuur</translation>
     </message>
+</context>
+<context>
+    <name>SendCoinsEntry</name>
     <message>
-        <source>Transaction status. Hover over this field to show number of confirmations.</source>
-        <translation>Transactiestatus. Houd de muiscursor boven dit veld om het aantal bevestigingen te laten zien.</translation>
+        <source>A&amp;mount:</source>
+        <translation>B&amp;edrag:</translation>
     </message>
     <message>
-        <source>Date and time that the transaction was received.</source>
-        <translation>Datum en tijd waarop deze transactie is ontvangen.</translation>
+        <source>Pay &amp;To:</source>
+        <translation>Betaal &amp;Aan:</translation>
     </message>
     <message>
-        <source>Type of transaction.</source>
-        <translation>Type transactie.</translation>
+        <source>&amp;Label:</source>
+        <translation>&amp;Label:</translation>
     </message>
     <message>
-        <source>Whether or not a watch-only address is involved in this transaction.</source>
-        <translation>Of er een alleen-bekijken adres is betrokken bij deze transactie.</translation>
+        <source>Choose previously used address</source>
+        <translation>Kies een eerder gebruikt adres</translation>
     </message>
     <message>
-        <source>User-defined intent/purpose of the transaction.</source>
-        <translation>Door gebruiker gedefinieerde intentie/doel van de transactie</translation>
+        <source>This is a normal payment.</source>
+        <translation>Dit is een normale betaling.</translation>
     </message>
     <message>
-        <source>Amount removed from or added to balance.</source>
-        <translation>Bedrag verwijderd van of toegevoegd aan saldo</translation>
+        <source>The Bitcoin address to send the payment to</source>
+        <translation>Het Bitcoinadres om betaling aan te versturen</translation>
     </message>
-</context>
-<context>
-    <name>TransactionView</name>
     <message>
-        <source>All</source>
-        <translation>Alles</translation>
+        <source>Alt+A</source>
+        <translation>Alt+A</translation>
     </message>
     <message>
-        <source>Today</source>
-        <translation>Vandaag</translation>
+        <source>Paste address from clipboard</source>
+        <translation>Plak adres vanuit klembord</translation>
     </message>
     <message>
-        <source>This week</source>
-        <translation>Deze week</translation>
+        <source>Alt+P</source>
+        <translation>Alt+P</translation>
     </message>
     <message>
-        <source>This month</source>
-        <translation>Deze maand</translation>
+        <source>Remove this entry</source>
+        <translation>Verwijder deze toevoeging</translation>
     </message>
     <message>
-        <source>Last month</source>
-        <translation>Vorige maand</translation>
+        <source>The fee will be deducted from the amount being sent. The recipient will receive less bitcoins than you enter in the amount field. If multiple recipients are selected, the fee is split equally.</source>
+        <translation>De transactiekosten zal worden afgetrokken van het bedrag dat verstuurd wordt. De ontvangers zullen minder bitcoins ontvangen dan ingevoerd is in het hoeveelheidsveld. Als er meerdere ontvangers geselecteerd zijn, dan worden de transactiekosten gelijk verdeeld.</translation>
     </message>
     <message>
-        <source>This year</source>
-        <translation>Dit jaar</translation>
+        <source>S&amp;ubtract fee from amount</source>
+        <translation>Trek de transactiekosten a&amp;f van het bedrag.</translation>
     </message>
     <message>
-        <source>Range...</source>
-        <translation>Bereik...</translation>
+        <source>Message:</source>
+        <translation>Bericht:</translation>
     </message>
     <message>
-        <source>Received with</source>
-        <translation>Ontvangen met</translation>
+        <source>This is an unauthenticated payment request.</source>
+        <translation>Dit is een niet-geverifieerd betalingsverzoek.</translation>
     </message>
     <message>
-        <source>Sent to</source>
-        <translation>Verstuurd aan</translation>
+        <source>This is an authenticated payment request.</source>
+        <translation>Dit is een geverifieerd betalingsverzoek.</translation>
     </message>
     <message>
-        <source>To yourself</source>
-        <translation>Aan uzelf</translation>
+        <source>Enter a label for this address to add it to the list of used addresses</source>
+        <translation>Vul een label voor dit adres in om het aan de lijst met gebruikte adressen toe te voegen</translation>
     </message>
     <message>
-        <source>Mined</source>
-        <translation>Gedolven</translation>
+        <source>A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
+        <translation>Een bericht dat werd toegevoegd aan de bitcoin: URI welke wordt opgeslagen met de transactie ter referentie. Opmerking: Dit bericht zal niet worden verzonden over het Bitcoinnetwerk.</translation>
     </message>
     <message>
-        <source>Other</source>
-        <translation>Anders</translation>
+        <source>Pay To:</source>
+        <translation>Betaal Aan:</translation>
     </message>
     <message>
-        <source>Enter address or label to search</source>
-        <translation>Vul adres of label in om te zoeken</translation>
+        <source>Memo:</source>
+        <translation>Memo:</translation>
     </message>
+</context>
+<context>
+    <name>ShutdownWindow</name>
     <message>
-        <source>Min amount</source>
-        <translation>Min. bedrag</translation>
+        <source>%1 is shutting down...</source>
+        <translation>%1 is aan het afsluiten...</translation>
     </message>
     <message>
-        <source>Copy address</source>
-        <translation>Kopieer adres</translation>
+        <source>Do not shut down the computer until this window disappears.</source>
+        <translation>Sluit de computer niet af totdat dit venster verdwenen is.</translation>
     </message>
+</context>
+<context>
+    <name>SignVerifyMessageDialog</name>
     <message>
-        <source>Copy label</source>
-        <translation>Kopieer label</translation>
+        <source>Signatures - Sign / Verify a Message</source>
+        <translation>Handtekeningen – Onderteken een bericht / Verifiëer een handtekening</translation>
     </message>
     <message>
-        <source>Copy amount</source>
-        <translation>Kopieer bedrag</translation>
+        <source>&amp;Sign Message</source>
+        <translation>&amp;Onderteken Bericht</translation>
     </message>
     <message>
-        <source>Copy transaction ID</source>
-        <translation>Kopieer transactie-ID</translation>
+        <source>You can sign messages/agreements with your addresses to prove you can receive bitcoins sent to them. Be careful not to sign anything vague or random, as phishing attacks may try to trick you into signing your identity over to them. Only sign fully-detailed statements you agree to.</source>
+        <translation>U kunt berichten/overeenkomsten ondertekenen met uw adres om te bewijzen dat u Bitcoins kunt versturen. Wees voorzichtig met het ondertekenen van iets vaags of willekeurigs, omdat phishingaanvallen u kunnen proberen te misleiden tot het ondertekenen van overeenkomsten om uw identiteit aan hen toe te vertrouwen. Onderteken alleen volledig gedetailleerde verklaringen voordat u akkoord gaat.</translation>
     </message>
     <message>
-        <source>Copy raw transaction</source>
-        <translation>Kopieer ruwe transactie</translation>
+        <source>The Bitcoin address to sign the message with</source>
+        <translation>Het Bitcoinadres om bericht mee te ondertekenen</translation>
     </message>
     <message>
-        <source>Edit label</source>
-        <translation>Bewerk label</translation>
+        <source>Choose previously used address</source>
+        <translation>Kies een eerder gebruikt adres</translation>
     </message>
     <message>
-        <source>Show transaction details</source>
-        <translation>Toon transactiedetails</translation>
+        <source>Alt+A</source>
+        <translation>Alt+A</translation>
     </message>
     <message>
-        <source>Export Transaction History</source>
-        <translation>Exporteer Transactiegeschiedenis</translation>
+        <source>Paste address from clipboard</source>
+        <translation>Plak adres vanuit klembord</translation>
     </message>
     <message>
-        <source>Watch-only</source>
-        <translation>Alleen-bekijkbaar</translation>
+        <source>Alt+P</source>
+        <translation>Alt+P</translation>
     </message>
     <message>
-        <source>Exporting Failed</source>
-        <translation>Export Mislukt</translation>
+        <source>Enter the message you want to sign here</source>
+        <translation>Typ hier het bericht dat u wilt ondertekenen</translation>
     </message>
     <message>
-        <source>There was an error trying to save the transaction history to %1.</source>
-        <translation>Er is een fout opgetreden bij het opslaan van het transactiegeschiedenis naar %1.</translation>
+        <source>Signature</source>
+        <translation>Handtekening</translation>
     </message>
     <message>
-        <source>Exporting Successful</source>
-        <translation>Export Succesvol</translation>
+        <source>Copy the current signature to the system clipboard</source>
+        <translation>Kopieer de huidige handtekening naar het systeemklembord</translation>
     </message>
     <message>
-        <source>The transaction history was successfully saved to %1.</source>
-        <translation>Het transactiegeschiedenis was succesvol bewaard in %1.</translation>
+        <source>Sign the message to prove you own this Bitcoin address</source>
+        <translation>Onderteken een bericht om te bewijzen dat u een bepaald Bitcoinadres bezit</translation>
     </message>
     <message>
-        <source>Comma separated file (*.csv)</source>
-        <translation>Kommagescheiden bestand (*.csv)</translation>
+        <source>Sign &amp;Message</source>
+        <translation>Onderteken &amp;Bericht</translation>
     </message>
     <message>
-        <source>Confirmed</source>
-        <translation>Bevestigd</translation>
+        <source>Reset all sign message fields</source>
+        <translation>Verwijder alles in de invulvelden</translation>
     </message>
     <message>
-        <source>Date</source>
-        <translation>Datum</translation>
+        <source>Clear &amp;All</source>
+        <translation>Verwijder &amp;Alles</translation>
     </message>
     <message>
-        <source>Type</source>
-        <translation>Type</translation>
+        <source>&amp;Verify Message</source>
+        <translation>&amp;Verifiëer Bericht</translation>
     </message>
     <message>
-        <source>Label</source>
-        <translation>Label</translation>
+        <source>Enter the receiver's address, message (ensure you copy line breaks, spaces, tabs, etc. exactly) and signature below to verify the message. Be careful not to read more into the signature than what is in the signed message itself, to avoid being tricked by a man-in-the-middle attack. Note that this only proves the signing party receives with the address, it cannot prove sendership of any transaction!</source>
+        <translation>Voer het adres van de ontvanger in, bericht (zorg ervoor dat de regeleinden, spaties, tabs etc. precies kloppen) en onderteken onderaan om het bericht te verifiëren. Wees voorzicht om niet meer in de ondertekening te lezen dan in het getekende bericht zelf, om te voorkomen dat je wordt aangevallen met een man-in-the-middle attack. Houd er mee rekening dat dit alleen de ondertekende partij bewijst met het ontvangen adres, er kan niet bewezen worden dat er een transactie heeft plaatsgevonden!</translation>
     </message>
     <message>
-        <source>Address</source>
-        <translation>Adres</translation>
+        <source>The Bitcoin address the message was signed with</source>
+        <translation>Het Bitcoinadres waarmee het bericht ondertekend is</translation>
     </message>
     <message>
-        <source>ID</source>
-        <translation>ID</translation>
+        <source>Verify the message to ensure it was signed with the specified Bitcoin address</source>
+        <translation>Controleer een bericht om te verifiëren dat het gespecificeerde Bitcoinadres het bericht heeft ondertekend.</translation>
     </message>
     <message>
-        <source>Range:</source>
-        <translation>Bereik:</translation>
+        <source>Verify &amp;Message</source>
+        <translation>Verifiëer &amp;Bericht</translation>
     </message>
     <message>
-        <source>to</source>
-        <translation>naar</translation>
+        <source>Reset all verify message fields</source>
+        <translation>Verwijder alles in de invulvelden</translation>
     </message>
 </context>
 <context>
-    <name>UnitDisplayStatusBarControl</name>
+    <name>SplashScreen</name>
     <message>
-        <source>Unit to show amounts in. Click to select another unit.</source>
-        <translation>Eenheid om bedragen uit te drukken. Klik om een andere eenheid te selecteren.</translation>
+        <source>[testnet]</source>
+        <translation>[testnetwerk]</translation>
     </message>
 </context>
 <context>
-    <name>WalletFrame</name>
+    <name>TrafficGraphWidget</name>
     <message>
-        <source>No wallet has been loaded.</source>
-        <translation>Portemonnee werd niet geladen.</translation>
+        <source>KB/s</source>
+        <translation>KB/s</translation>
     </message>
 </context>
 <context>
-    <name>WalletModel</name>
+    <name>TransactionDescDialog</name>
     <message>
-        <source>Send Coins</source>
-        <translation>Verstuur Munten</translation>
+        <source>This pane shows a detailed description of the transaction</source>
+        <translation>Dit venster laat een uitgebreide beschrijving van de transactie zien</translation>
     </message>
 </context>
 <context>
-    <name>WalletView</name>
-    <message>
-        <source>&amp;Export</source>
-        <translation>&amp;Exporteer</translation>
-    </message>
-    <message>
-        <source>Export the data in the current tab to a file</source>
-        <translation>Exporteer de data in de huidige tab naar een bestand</translation>
-    </message>
-    <message>
-        <source>Backup Wallet</source>
-        <translation>Portemonnee backuppen</translation>
-    </message>
-    <message>
-        <source>Wallet Data (*.dat)</source>
-        <translation>Portemonneedata (*.dat)</translation>
-    </message>
-    <message>
-        <source>Backup Failed</source>
-        <translation>Backup Mislukt</translation>
-    </message>
-    <message>
-        <source>There was an error trying to save the wallet data to %1.</source>
-        <translation>Er is een fout opgetreden bij het wegschrijven van de portemonneedata naar %1.</translation>
-    </message>
-    <message>
-        <source>The wallet data was successfully saved to %1.</source>
-        <translation>De portemonneedata is succesvol opgeslagen in %1.</translation>
-    </message>
+    <name>UnitDisplayStatusBarControl</name>
     <message>
-        <source>Backup Successful</source>
-        <translation>Backup Succesvol</translation>
+        <source>Unit to show amounts in. Click to select another unit.</source>
+        <translation>Eenheid om bedragen uit te drukken. Klik om een andere eenheid te selecteren.</translation>
     </message>
 </context>
 <context>
@@ -2927,14 +1758,6 @@
         <source>If &lt;category&gt; is not supplied or if &lt;category&gt; = 1, output all debugging information.</source>
         <translation>Als er geen &lt;categorie&gt; is opgegeven of als de &lt;categorie&gt; 1 is, laat dan alle debugginginformatie zien.</translation>
     </message>
-    <message>
-        <source>Maximum total fees (in %s) to use in a single wallet transaction; setting this too low may abort large transactions (default: %s)</source>
-        <translation>Maximum totale transactiekosten (in %s) om te gebruiken voor een enkele portemonneetransactie; als dit te laag is ingesteld kan het grote transacties verhinderen (default: %s)</translation>
-    </message>
-    <message>
-        <source>Please check that your computer's date and time are correct! If your clock is wrong Bitcoin Core will not work properly.</source>
-        <translation>Check a.u.b. of de datum en tijd van uw computer correct zijn! Als uw klok verkeerd staat zal Bitcoin Core niet correct werken.</translation>
-    </message>
     <message>
         <source>Prune configured below the minimum of %d MiB.  Please use a higher number.</source>
         <translation>Snoeien is geconfigureerd on het minimum van %d MiB. Gebruik a.u.b. een hoger aantal.</translation>
@@ -2975,6 +1798,10 @@
         <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
         <translation>Accepteer verbindingen van buitenaf (standaard: 1 als geen -proxy of -connect is opgegeven)</translation>
     </message>
+    <message>
+        <source>Bitcoin Core</source>
+        <translation>Bitcoin Core</translation>
+    </message>
     <message>
         <source>-fallbackfee is set very high! This is the transaction fee you may pay when fee estimates are not available.</source>
         <translation>-fallbackfee is zeer hoog ingesteld! Dit zijn de transactie kosten die u mogelijk betaald wanneer de schattingen niet beschikbaar zijn.</translation>
@@ -2991,6 +1818,10 @@
         <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source>
         <translation>Bind aan opgegeven adres en luister er altijd op. Gebruik [host]:port notatie voor IPv6</translation>
     </message>
+    <message>
+        <source>Cannot obtain a lock on data directory %s. %s is probably already running.</source>
+        <translation>Kan geen lock verkrijgen op gegevensmap %s. %s draait waarschijnlijk al.</translation>
+    </message>
     <message>
         <source>Delete all wallet transactions and only recover those parts of the blockchain through -rescan on startup</source>
         <translation>Verwijder alle transacties van de portemonnee en herstel alleen de delen van de blokketen door -rescan tijdens het opstarten</translation>
@@ -2999,6 +1830,10 @@
         <source>Distributed under the MIT software license, see the accompanying file COPYING or &lt;http://www.opensource.org/licenses/mit-license.php&gt;.</source>
         <translation>Uitgegeven onder de MIT-softwarelicentie, zie het bijgevoegde bestand COPYING of &lt;http://www.opensource.org/licenses/mit-license.php&gt;.</translation>
     </message>
+    <message>
+        <source>Error reading %s! All keys read correctly, but transaction data or address book entries might be missing or incorrect.</source>
+        <translation>Waarschuwing: Fout bij het lezen van %s! Alle sleutels zijn in goede orde uitgelezen, maar transactiedata of adresboeklemma's zouden kunnen ontbreken of fouten bevatten.</translation>
+    </message>
     <message>
         <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source>
         <translation>Voer opdracht uit zodra een portemonneetransactie verandert (%s in cmd wordt vervangen door TxID)</translation>
@@ -3007,6 +1842,18 @@
         <source>Force relay of transactions from whitelisted peers even they violate local relay policy (default: %d)</source>
         <translation>Forceer het doorsturen van transacties van goedgekeurde peers, zelfs wanneer deze niet voldoen aan de lokale doorstuur regels (standaard: %d)</translation>
     </message>
+    <message>
+        <source>Maximum allowed median peer time offset adjustment. Local perspective of time may be influenced by peers forward or backward by this amount. (default: %u seconds)</source>
+        <translation>Maximum toegestane peer tijd compensatie. Lokaal perspectief van tijd mag worden beinvloed door peers die met deze hoeveelheid voor of achter lopen. (standaard: %u seconden)</translation>
+    </message>
+    <message>
+        <source>Maximum total fees (in %s) to use in a single wallet transaction or raw transaction; setting this too low may abort large transactions (default: %s)</source>
+        <translation>Maximum totale transactiekosten (in %s) om te gebruiken in een enkele portemoneetransactie; als dit te laag is ingesteld kunnen grote transacties worden verhinderd (standaard: %s)</translation>
+    </message>
+    <message>
+        <source>Please check that your computer's date and time are correct! If your clock is wrong, %s will not work properly.</source>
+        <translation>Waarschuwing: Controleer dat de datum en tijd van uw computer correct zijn ingesteld! Bij een onjuist ingestelde klok zal %s niet goed werken.</translation>
+    </message>
     <message>
         <source>Set the number of script verification threads (%u to %d, 0 = auto, &lt;0 = leave that many cores free, default: %d)</source>
         <translation>Kies het aantal scriptverificatie processen (%u tot %d, 0 = auto, &lt;0 = laat dit aantal kernen vrij, standaard: %d)</translation>
@@ -3019,14 +1866,6 @@
         <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
         <translation>Dit is een prerelease testversie – gebruik op eigen risico! Gebruik deze niet voor het delven van munten of handelsdoeleinden</translation>
     </message>
-    <message>
-        <source>Unable to bind to %s on this computer. Bitcoin Core is probably already running.</source>
-        <translation>Niet in staat om %s te verbinden op deze computer. Bitcoin Core draait waarschijnlijk al.</translation>
-    </message>
-    <message>
-        <source>Unsupported argument -whitelistalwaysrelay ignored, use -whitelistrelay and/or -whitelistforcerelay.</source>
-        <translation>Niet ondersteund argument -whitelistalwaysrelay genegeerd, gebruik -whitelistrelay en/of -whitelistforcerelay.</translation>
-    </message>
     <message>
         <source>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</source>
         <translation>Gebruik UPnP om de luisterende poort te mappen (standaard: 1 als er geluisterd worden en geen -proxy is meegegeven)</translation>
@@ -3043,22 +1882,18 @@
         <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source>
         <translation>Waarschuwing: Het lijkt erop dat het netwerk geen consensus kan vinden! Sommige delvers lijken problemen te ondervinden.</translation>
     </message>
-    <message>
-        <source>Warning: Unknown block versions being mined! It's possible unknown rules are in effect</source>
-        <translation>Waarschuwing: Onbekende blok versies worden gemined! Er zijn mogelijk onbekende regels in werking getreden</translation>
-    </message>
     <message>
         <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source>
         <translation>Waarschuwing: Het lijkt erop dat we geen consensus kunnen vinden met onze peers! Mogelijk dient u te upgraden, of andere nodes moeten wellicht upgraden.</translation>
     </message>
-    <message>
-        <source>Warning: wallet.dat corrupt, data salvaged! Original wallet.dat saved as wallet.{timestamp}.bak in %s; if your balance or transactions are incorrect you should restore from a backup.</source>
-        <translation>Waarschuwing: wallet.dat is corrupt, data is veiliggesteld! Originele wallet.dat is opgeslagen als wallet.{tijdstip}.bak in %s; als uw balans of transacties incorrect zijn dient u een backup terug te zetten.</translation>
-    </message>
     <message>
         <source>Whitelist peers connecting from the given netmask or IP address. Can be specified multiple times.</source>
         <translation>Goedgekeurde peers die verbinden van het ingegeven netmask of IP adres. Kan meerdere keren gespecificeerd worden.</translation>
     </message>
+    <message>
+        <source>You need to rebuild the database using -reindex-chainstate to change -txindex</source>
+        <translation>Om -txindex te kunnen veranderen dient u de database opnieuw te bouwen met gebruik van -reindex-chainstate.</translation>
+    </message>
     <message>
         <source>-maxmempool must be at least %d MB</source>
         <translation>-maxmempool moet tenminste %d MB zijn</translation>
@@ -3071,10 +1906,22 @@
         <source>Append comment to the user agent string</source>
         <translation>Voeg commentaar toe aan de user agent string</translation>
     </message>
+    <message>
+        <source>Attempt to recover private keys from a corrupt wallet on startup</source>
+        <translation>Probeer privésleutels te herstellen van een corrupte wallet bij opstarten</translation>
+    </message>
     <message>
         <source>Block creation options:</source>
         <translation>Blokcreatie-opties:</translation>
     </message>
+    <message>
+        <source>Cannot resolve -%s address: '%s'</source>
+        <translation>Kan -%s adres niet herleiden: '%s'</translation>
+    </message>
+    <message>
+        <source>Change index out of range</source>
+        <translation>Wijzigingsindex buiten bereik</translation>
+    </message>
     <message>
         <source>Connect only to the specified node(s)</source>
         <translation>Verbind alleen naar de gespecificeerde node(s)</translation>
@@ -3083,6 +1930,10 @@
         <source>Connection options:</source>
         <translation>Verbindingsopties:</translation>
     </message>
+    <message>
+        <source>Copyright (C) %i-%i</source>
+        <translation>Auteursrecht (C) %i-%i</translation>
+    </message>
     <message>
         <source>Corrupted block database detected</source>
         <translation>Corrupte blokkendatabase gedetecteerd</translation>
@@ -3127,6 +1978,18 @@
         <source>Error initializing wallet database environment %s!</source>
         <translation>Probleem met initializeren van de database-omgeving %s!</translation>
     </message>
+    <message>
+        <source>Error loading %s</source>
+        <translation>Fout bij het laden van %s</translation>
+    </message>
+    <message>
+        <source>Error loading %s: Wallet corrupted</source>
+        <translation>Fout bij het laden van %s: Portomonnee corrupt</translation>
+    </message>
+    <message>
+        <source>Error loading %s: Wallet requires newer version of %s</source>
+        <translation>Fout bij laden %s: Portemonnee vereist een nieuwere versie van %s</translation>
+    </message>
     <message>
         <source>Error loading block database</source>
         <translation>Fout bij het laden van blokkendatabase</translation>
@@ -3151,10 +2014,18 @@
         <source>Incorrect or no genesis block found. Wrong datadir for network?</source>
         <translation>Incorrect of geen genesisblok gevonden. Verkeerde datamap voor het netwerk?</translation>
     </message>
+    <message>
+        <source>Initialization sanity check failed. %s is shutting down.</source>
+        <translation>Initialisatie sanity check mislukt. %s is aan het afsluiten.</translation>
+    </message>
     <message>
         <source>Invalid -onion address: '%s'</source>
         <translation>Ongeldig -onion adres '%s'</translation>
     </message>
+    <message>
+        <source>Invalid amount for -%s=&lt;amount&gt;: '%s'</source>
+        <translation>Ongeldig bedrag voor -%s=&lt;bedrag&gt;: '%s'</translation>
+    </message>
     <message>
         <source>Invalid amount for -fallbackfee=&lt;amount&gt;: '%s'</source>
         <translation>Ongeldig bedrag voor -fallbackfee=&lt;bedrag&gt;: '%s'</translation>
@@ -3163,6 +2034,10 @@
         <source>Keep the transaction memory pool below &lt;n&gt; megabytes (default: %u)</source>
         <translation>De transactiegeheugenpool moet onder de &lt;n&gt; megabytes blijven (standaard: %u)</translation>
     </message>
+    <message>
+        <source>Loading banlist...</source>
+        <translation>Verbanningslijst aan het laden...</translation>
+    </message>
     <message>
         <source>Location of the auth cookie (default: data dir)</source>
         <translation>Locatie van de auth cookie (standaard: data dir)</translation>
@@ -3179,6 +2054,10 @@
         <source>Only connect to nodes in network &lt;net&gt; (ipv4, ipv6 or onion)</source>
         <translation>Verbind alleen met nodes in netwerk &lt;net&gt; (ipv4, ipv6 of onion)</translation>
     </message>
+    <message>
+        <source>Print this help message and exit</source>
+        <translation>Print dit helpbericht en sluit af</translation>
+    </message>
     <message>
         <source>Print version and exit</source>
         <translation>Laat versie zien en sluit af</translation>
@@ -3191,6 +2070,14 @@
         <source>Prune mode is incompatible with -txindex.</source>
         <translation>Snoeimodus is niet-compatibel met -txindex</translation>
     </message>
+    <message>
+        <source>Rebuild chain state and block index from the blk*.dat files on disk</source>
+        <translation>Herbouw ketenstaat en block index met behulp van de blk*.dat bestanden op de hardeschijf</translation>
+    </message>
+    <message>
+        <source>Rebuild chain state from the currently indexed blocks</source>
+        <translation>Herbouw ketenstaat vanuit de huidige geindexeerde blokken</translation>
+    </message>
     <message>
         <source>Set database cache size in megabytes (%d to %d, default: %d)</source>
         <translation>Zet database cache grootte in megabytes (%d tot %d, standaard: %d)</translation>
@@ -3203,6 +2090,10 @@
         <source>Specify wallet file (within data directory)</source>
         <translation>Specificeer het portemonnee bestand (vanuit de gegevensmap)</translation>
     </message>
+    <message>
+        <source>Unable to bind to %s on this computer. %s is probably already running.</source>
+        <translation>Niet in staat om %s te verbinden op deze computer. %s draait waarschijnlijk al.</translation>
+    </message>
     <message>
         <source>Unsupported argument -benchmark ignored, use -debug=bench.</source>
         <translation>Niet-ondersteund argument -benchmark genegeerd, gebruik -debug=bench.</translation>
@@ -3236,12 +2127,16 @@
         <translation>Portemonnee %s bevindt zich buiten de gegevensmap %s</translation>
     </message>
     <message>
-        <source>Wallet options:</source>
-        <translation>Portemonnee instellingen:</translation>
+        <source>Wallet debugging/testing options:</source>
+        <translation>Portomonee debugging/testing opties:</translation>
     </message>
     <message>
-        <source>You need to rebuild the database using -reindex to change -txindex</source>
-        <translation>Om -txindex te kunnen veranderen dient u de database herbouwen met gebruik van -reindex.</translation>
+        <source>Wallet needed to be rewritten: restart %s to complete</source>
+        <translation>Portemonnee moest herschreven worden: Herstart %s om te voltooien</translation>
+    </message>
+    <message>
+        <source>Wallet options:</source>
+        <translation>Portemonnee instellingen:</translation>
     </message>
     <message>
         <source>Allow JSON-RPC connections from specified source. Valid for &lt;ip&gt; are a single IP (e.g. 1.2.3.4), a network/netmask (e.g. 1.2.3.4/255.255.255.0) or a network/CIDR (e.g. 1.2.3.4/24). This option can be specified multiple times</source>
@@ -3255,10 +2150,6 @@
         <source>Bind to given address to listen for JSON-RPC connections. Use [host]:port notation for IPv6. This option can be specified multiple times (default: bind to all interfaces)</source>
         <translation>Bind aan gegeven adres om te luisteren voor JSON-RPC verbindingen. Gebruik [host]:poort notatie voor IPv6. Deze optie kan meerdere keren gespecificeerd worden (standaard: bind aan alle interfaces.</translation>
     </message>
-    <message>
-        <source>Cannot obtain a lock on data directory %s. Bitcoin Core is probably already running.</source>
-        <translation>Kan geen lock verkrijgen op gegevensmap %s. Bitcoin Core draait waarschijnlijk al.</translation>
-    </message>
     <message>
         <source>Create new files with system default permissions, instead of umask 077 (only effective with disabled wallet functionality)</source>
         <translation>Creër nieuwe bestanden met standaard systeem bestandsrechten in plaats van umask 077 (alleen effectief met uitgeschakelde portemonnee functionaliteit)</translation>
@@ -3303,10 +2194,6 @@
         <source>Set maximum size of high-priority/low-fee transactions in bytes (default: %d)</source>
         <translation>Stel maximumgrootte in bytes in voor hoge-prioriteits-/lage-transactiekosten-transacties (standaard: %d)</translation>
     </message>
-    <message>
-        <source>Set the number of threads for coin generation if enabled (-1 = all cores, default: %d)</source>
-        <translation>Stel het aantal threads in voor het genereren van coins indien ingesteld (-1 = alle kernen, standaard: %d)</translation>
-    </message>
     <message>
         <source>The transaction amount is too small to send after the fee has been deducted</source>
         <translation>Het transactiebedrag is te klein om te versturen nadat de transactiekosten in mindering zijn gebracht</translation>
@@ -3331,34 +2218,14 @@
         <source>Accept public REST requests (default: %u)</source>
         <translation>Accepteer publieke REST-verzoeken (standaard: %u)</translation>
     </message>
-    <message>
-        <source>Activating best chain...</source>
-        <translation>Beste reeks activeren...</translation>
-    </message>
-    <message>
-        <source>Attempt to recover private keys from a corrupt wallet.dat on startup</source>
-        <translation>Probeer privésleutels te herstellen van een corrupte wallet.dat bij opstarten</translation>
-    </message>
     <message>
         <source>Automatically create Tor hidden service (default: %d)</source>
         <translation>Creëer automatisch verborgen dienst van Tor (standaard:%d)</translation>
     </message>
-    <message>
-        <source>Cannot resolve -whitebind address: '%s'</source>
-        <translation>Kan -whitebind adres niet herleiden: '%s'</translation>
-    </message>
     <message>
         <source>Connect through SOCKS5 proxy</source>
         <translation>Verbind door SOCKS5 proxy</translation>
     </message>
-    <message>
-        <source>Copyright (C) 2009-%i The Bitcoin Core Developers</source>
-        <translation>Auteursrecht (C) 2009-%i De Bitcoin Core Ontwikkelaars</translation>
-    </message>
-    <message>
-        <source>Error loading wallet.dat: Wallet requires newer version of Bitcoin Core</source>
-        <translation>Fout bij laden wallet.dat: Portemonnee vereist een nieuwere versie van Bitcoin Core</translation>
-    </message>
     <message>
         <source>Error reading from database, shutting down.</source>
         <translation>Fout bij het lezen van de database, afsluiten. </translation>
@@ -3371,22 +2238,6 @@
         <source>Information</source>
         <translation>Informatie</translation>
     </message>
-    <message>
-        <source>Initialization sanity check failed. Bitcoin Core is shutting down.</source>
-        <translation>Initialisatie sanity check mislukt. Bitcoin Core is aan het afsluiten.</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -maxtxfee=&lt;amount&gt;: '%s'</source>
-        <translation>Ongeldig bedrag voor -maxtxfee=&lt;bedrag&gt;: '%s'</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -minrelaytxfee=&lt;amount&gt;: '%s'</source>
-        <translation>Ongeldig bedrag voor -minrelaytxfee=&lt;bedrag&gt;: '%s'</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -mintxfee=&lt;amount&gt;: '%s'</source>
-        <translation>Ongeldig bedrag voor -mintxfee=&lt;bedrag&gt;: '%s'</translation>
-    </message>
     <message>
         <source>Invalid amount for -paytxfee=&lt;amount&gt;: '%s' (must be at least %s)</source>
         <translation>Ongeldig bedrag voor -paytxfee=&lt;bedrag&gt;: '%s' (Minimum %s)</translation>
@@ -3411,14 +2262,6 @@
         <source>RPC server options:</source>
         <translation>RPC server opties:</translation>
     </message>
-    <message>
-        <source>Rebuild block chain index from current blk000??.dat files on startup</source>
-        <translation>Herbouwen blokketenindex vanuit huidige blk000??.dat-bestanden bij opstarten?</translation>
-    </message>
-    <message>
-        <source>Receive and display P2P network alerts (default: %u)</source>
-        <translation>Ontvang en toon P2P-netwerkwaarschuwingen (standaard: %u)</translation>
-    </message>
     <message>
         <source>Reducing -maxconnections from %d to %d, because of system limitations.</source>
         <translation>Verminder -maxconnections van %d naar %d, vanwege systeembeperkingen.</translation>
@@ -3491,10 +2334,6 @@
         <source>Username for JSON-RPC connections</source>
         <translation>Gebruikersnaam voor JSON-RPC-verbindingen</translation>
     </message>
-    <message>
-        <source>Wallet needed to be rewritten: restart Bitcoin Core to complete</source>
-        <translation>Portemonnee moest herschreven worden: Herstart Bitcoin Core om te voltooien</translation>
-    </message>
     <message>
         <source>Warning</source>
         <translation>Waarschuwing</translation>
@@ -3515,10 +2354,6 @@
         <source>ZeroMQ notification options:</source>
         <translation>ZeroMQ notificatieopties:</translation>
     </message>
-    <message>
-        <source>wallet.dat corrupt, salvage failed</source>
-        <translation>wallet.dat corrupt, veiligstellen mislukt</translation>
-    </message>
     <message>
         <source>Password for JSON-RPC connections</source>
         <translation>Wachtwoord voor JSON-RPC-verbindingen</translation>
@@ -3527,10 +2362,6 @@
         <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
         <translation>Voer opdracht uit zodra het beste blok verandert (%s in cmd wordt vervangen door blokhash)</translation>
     </message>
-    <message>
-        <source>This help message</source>
-        <translation>Dit helpbericht</translation>
-    </message>
     <message>
         <source>Allow DNS lookups for -addnode, -seednode and -connect</source>
         <translation>Sta DNS-naslag toe voor -addnode, -seednode en -connect</translation>
@@ -3539,10 +2370,6 @@
         <source>Loading addresses...</source>
         <translation>Adressen aan het laden...</translation>
     </message>
-    <message>
-        <source>Error loading wallet.dat: Wallet corrupted</source>
-        <translation>Fout bij laden wallet.dat: Portemonnee corrupt</translation>
-    </message>
     <message>
         <source>(1 = keep tx meta data e.g. account owner and payment request information, 2 = drop tx meta data)</source>
         <translation>(1 = behoudt tx meta data bijv. account eigenaar en betalingsverzoek informatie, 2. sla tx meta data niet op)</translation>
@@ -3559,10 +2386,6 @@
         <source>Do not keep transactions in the mempool longer than &lt;n&gt; hours (default: %u)</source>
         <translation>Bewaar transactie niet langer dan &lt;n&gt; uren in de geheugenpool (standaard: %u)</translation>
     </message>
-    <message>
-        <source>Error reading wallet.dat! All keys read correctly, but transaction data or address book entries might be missing or incorrect.</source>
-        <translation>Fout tijdens lezen van wallet.dat! Alle sleutels zijn correct te lezen, maar de transactiondatabase of adresboekingangen zijn mogelijk verdwenen of incorrect.</translation>
-    </message>
     <message>
         <source>Fees (in %s/kB) smaller than this are considered zero fee for transaction creation (default: %s)</source>
         <translation>Transactiekosten (in %s/kB) kleiner dan dit worden beschouwd dat geen transactiekosten in rekening worden gebracht voor transactiecreatie (standaard: %s)</translation>
@@ -3599,6 +2422,10 @@
         <source>Unsupported argument -socks found. Setting SOCKS version isn't possible anymore, only SOCKS5 proxies are supported.</source>
         <translation>Niet-ondersteund argument -socks gevonden. Instellen van SOCKS-versie is niet meer mogelijk, alleen SOCKS5-proxies worden ondersteund.</translation>
     </message>
+    <message>
+        <source>Unsupported argument -whitelistalwaysrelay ignored, use -whitelistrelay and/or -whitelistforcerelay.</source>
+        <translation>Niet ondersteund argument -whitelistalwaysrelay genegeerd, gebruik -whitelistrelay en/of -whitelistforcerelay.</translation>
+    </message>
     <message>
         <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: %s)</source>
         <translation>Gebruik een aparte SOCKS5 proxy om verborgen diensten van Tor te bereiken (standaard: %s)</translation>
@@ -3608,20 +2435,20 @@
         <translation>Gebruikersnaam en gehasht wachtwoord voor JSON-RPC-verbindingen. De velden &lt;userpw&gt; is in het formaat: &lt;GEBRUIKERSNAAM&gt;:&lt;SALT&gt;$&lt;HASH&gt;. Een kanoniek Pythonscript is inbegrepen in de share/rpcuser. Deze optie kan meerdere keren worden meegegeven</translation>
     </message>
     <message>
-        <source>(default: %s)</source>
-        <translation>(standaard: %s)</translation>
+        <source>Warning: Unknown block versions being mined! It's possible unknown rules are in effect</source>
+        <translation>Waarschuwing: Onbekende blok versies worden gemined! Er zijn mogelijk onbekende regels in werking getreden</translation>
     </message>
     <message>
-        <source>Always query for peer addresses via DNS lookup (default: %u)</source>
-        <translation>Vind anderen door middel van een DNS-naslag (standaard: %u)</translation>
+        <source>Warning: Wallet file corrupt, data salvaged! Original %s saved as %s in %s; if your balance or transactions are incorrect you should restore from a backup.</source>
+        <translation>Waarschuwing: portomonee bestand is corrupt, data is veiliggesteld! Originele %s is opgeslagen als %s in %s; als uw balans of transacties incorrect zijn dient u een backup terug te zetten.</translation>
     </message>
     <message>
-        <source>Error loading wallet.dat</source>
-        <translation>Fout bij laden wallet.dat</translation>
+        <source>(default: %s)</source>
+        <translation>(standaard: %s)</translation>
     </message>
     <message>
-        <source>Generate coins (default: %u)</source>
-        <translation>Genereer munten (standaard: %u)</translation>
+        <source>Always query for peer addresses via DNS lookup (default: %u)</source>
+        <translation>Vind anderen door middel van een DNS-naslag (standaard: %u)</translation>
     </message>
     <message>
         <source>How many blocks to check at startup (default: %u, 0 = all)</source>
@@ -3707,18 +2534,6 @@
         <source>Unknown network specified in -onlynet: '%s'</source>
         <translation>Onbekend netwerk gespecificeerd in -onlynet: '%s'</translation>
     </message>
-    <message>
-        <source>Cannot resolve -bind address: '%s'</source>
-        <translation>Kan -bind adres niet herleiden: '%s'</translation>
-    </message>
-    <message>
-        <source>Cannot resolve -externalip address: '%s'</source>
-        <translation>Kan -externlip adres niet herleiden: '%s'</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -paytxfee=&lt;amount&gt;: '%s'</source>
-        <translation>Ongeldig bedrag voor -paytxfee=&lt;bedrag&gt;: '%s'</translation>
-    </message>
     <message>
         <source>Insufficient funds</source>
         <translation>Ontoereikend saldo</translation>
diff --git a/src/qt/locale/bitcoin_pam.ts b/src/qt/locale/bitcoin_pam.ts
index c5a0b17e801fe..12151a576c984 100644
--- a/src/qt/locale/bitcoin_pam.ts
+++ b/src/qt/locale/bitcoin_pam.ts
@@ -25,10 +25,6 @@
         <source>C&amp;lose</source>
         <translation>I&amp;sara</translation>
     </message>
-    <message>
-        <source>&amp;Copy Address</source>
-        <translation>&amp;Kopyan ing address</translation>
-    </message>
     <message>
         <source>Delete the currently selected address from the list</source>
         <translation>Ilako ya ing kasalungsungan makapiling address keng listahan</translation>
@@ -37,61 +33,6 @@
         <source>&amp;Delete</source>
         <translation>&amp;Ilako</translation>
     </message>
-    <message>
-        <source>Choose the address to send coins to</source>
-        <translation>Pilinan ing address a magpadalang coins kang</translation>
-    </message>
-    <message>
-        <source>Choose the address to receive coins with</source>
-        <translation>Pilinan ing address a tumanggap coins a atin</translation>
-    </message>
-    <message>
-        <source>C&amp;hoose</source>
-        <translation>P&amp;ilinan</translation>
-    </message>
-    <message>
-        <source>Sending addresses</source>
-        <translation>Address king pamag-Send</translation>
-    </message>
-    <message>
-        <source>Receiving addresses</source>
-        <translation>Address king pamag-Tanggap</translation>
-    </message>
-    <message>
-        <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source>
-        <translation>Reni reng kekang Bitcoin address king pamagpadalang kabayaran. Lawan mulang masalese reng alaga ampo ing address na ning tumanggap bayu ka magpadalang barya.</translation>
-    </message>
-    <message>
-        <source>These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source>
-        <translation>Reni reng kekang Bitcoin addresses keng pamananggap bayad. Rerekomenda mi na gumamit kang bayung address keng balang transaksiyon.</translation>
-    </message>
-    <message>
-        <source>Copy &amp;Label</source>
-        <translation>Kopyan ing &amp;Label</translation>
-    </message>
-    <message>
-        <source>&amp;Edit</source>
-        <translation>&amp;Alilan</translation>
-    </message>
-    <message>
-        <source>Comma separated file (*.csv)</source>
-        <translation>Comma separated file (*.csv)</translation>
-    </message>
-    </context>
-<context>
-    <name>AddressTableModel</name>
-    <message>
-        <source>Label</source>
-        <translation>Label</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>Address</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(alang label)</translation>
-    </message>
 </context>
 <context>
     <name>AskPassphraseDialog</name>
@@ -111,82 +52,6 @@
         <source>Repeat new passphrase</source>
         <translation>Pasibayuan ya ing bayung passphrase</translation>
     </message>
-    <message>
-        <source>Encrypt wallet</source>
-        <translation>I-encrypt ye ing wallet</translation>
-    </message>
-    <message>
-        <source>This operation needs your wallet passphrase to unlock the wallet.</source>
-        <translation>Ing operasyun a ini kailangan ne ing kekayung wallet passphrase, ban a-unlock ya ing wallet</translation>
-    </message>
-    <message>
-        <source>Unlock wallet</source>
-        <translation>Unlock ya ing wallet</translation>
-    </message>
-    <message>
-        <source>This operation needs your wallet passphrase to decrypt the wallet.</source>
-        <translation>Ing operasyun a ini kailangan ne ing kekang wallet passphrase ban a-decrypt ne ing wallet.</translation>
-    </message>
-    <message>
-        <source>Decrypt wallet</source>
-        <translation>I-decrypt ya ing wallet</translation>
-    </message>
-    <message>
-        <source>Change passphrase</source>
-        <translation>Alilan ya ing passphrase</translation>
-    </message>
-    <message>
-        <source>Confirm wallet encryption</source>
-        <translation>Kumpirman ya ing wallet encryption</translation>
-    </message>
-    <message>
-        <source>Warning: If you encrypt your wallet and lose your passphrase, you will &lt;b&gt;LOSE ALL OF YOUR BITCOINS&lt;/b&gt;!</source>
-        <translation>Kapabaluan: Istung in-encrypt me ing kekang wallet at meala ya ing passphrase na, ma-&lt;b&gt;ALA NO NGAN RING KEKANG BITCOINS&lt;/b&gt;</translation>
-    </message>
-    <message>
-        <source>Are you sure you wish to encrypt your wallet?</source>
-        <translation>Siguradu na kang buri meng i-encrypt ing kekang wallet?</translation>
-    </message>
-    <message>
-        <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source>
-        <translation>Mayalaga: Reng milabas a backups a gewa mu gamit ing wallet file mu dapat lamung mialilan bayung gawang encrypted wallet file. Para keng seguridad , reng milabas a backups dareng ali maka encrypt a wallet file ma-ala nala istung inumpisan mu nalang gamitan reng bayu, at me encrypt a wallet. </translation>
-    </message>
-    <message>
-        <source>Warning: The Caps Lock key is on!</source>
-        <translation>Kapabaluan: Makabuklat ya ing Caps Lock key!</translation>
-    </message>
-    <message>
-        <source>Wallet encrypted</source>
-        <translation>Me-encrypt ne ing wallet</translation>
-    </message>
-    <message>
-        <source>Wallet encryption failed</source>
-        <translation>Memali ya ing pamag-encrypt king wallet </translation>
-    </message>
-    <message>
-        <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
-        <translation>Memali ya ing encryption uli na ning ausan dang internal error. E ya me-encrypt ing wallet yu.</translation>
-    </message>
-    <message>
-        <source>The supplied passphrases do not match.</source>
-        <translation>E la mitutugma ring mibieng passphrase</translation>
-    </message>
-    <message>
-        <source>Wallet unlock failed</source>
-        <translation>Memali ya ing pamag-unlock king wallet </translation>
-    </message>
-    <message>
-        <source>The passphrase entered for the wallet decryption was incorrect.</source>
-        <translation>E ya istu ing passphrase a pepalub da para king wallet decryption</translation>
-    </message>
-    <message>
-        <source>Wallet decryption failed</source>
-        <translation>Me-mali ya ing pamag-decrypt king wallet</translation>
-    </message>
-    <message>
-        <source>Wallet passphrase was successfully changed.</source>
-        <translation>Mi-alilan ne ing passphrase na ning wallet.</translation>
-    </message>
 </context>
 <context>
     <name>BanTableModel</name>
@@ -309,10 +174,6 @@
         <source>Tabs toolbar</source>
         <translation>Gamit para king Tabs</translation>
     </message>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Kapilubluban ning Bitcoin</translation>
-    </message>
     <message>
         <source>&amp;Command-line options</source>
         <translation>Pipamilian command-line</translation>
@@ -362,13 +223,6 @@
         <translation>Maka-&lt;b&gt;encrypt&lt;/b&gt; ya ing wallet at kasalukuyan yang maka-&lt;b&gt;locked&lt;/b&gt;</translation>
     </message>
 </context>
-<context>
-    <name>ClientModel</name>
-    <message>
-        <source>Network Alert</source>
-        <translation>Alertu ning Network</translation>
-    </message>
-</context>
 <context>
     <name>CoinControlDialog</name>
     <message>
@@ -387,22 +241,6 @@
         <source>Confirmed</source>
         <translation>Me-kumpirma</translation>
     </message>
-    <message>
-        <source>Copy address</source>
-        <translation>Kopyan ing address</translation>
-    </message>
-    <message>
-        <source>Copy label</source>
-        <translation>Kopyan ing label</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>Kopyan ing alaga</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(alang label)</translation>
-    </message>
     </context>
 <context>
     <name>EditAddressDialog</name>
@@ -418,48 +256,12 @@
         <source>&amp;Address</source>
         <translation>&amp;Address</translation>
     </message>
-    <message>
-        <source>New receiving address</source>
-        <translation>Bayung address king pamagtanggap</translation>
-    </message>
-    <message>
-        <source>New sending address</source>
-        <translation>Bayung address king pamagpadala</translation>
-    </message>
-    <message>
-        <source>Edit receiving address</source>
-        <translation>Alilan ya ing address king pamagpadala</translation>
-    </message>
-    <message>
-        <source>Edit sending address</source>
-        <translation>Alilan ya ing address king pamagpadala</translation>
-    </message>
-    <message>
-        <source>The entered address "%1" is already in the address book.</source>
-        <translation>Ing pepalub yung address "%1" ati na yu king aklat dareng address</translation>
-    </message>
-    <message>
-        <source>The entered address "%1" is not a valid Bitcoin address.</source>
-        <translation>Ing pepalub yung address "%1" ali ya katanggap-tanggap a Bitcoin address.</translation>
-    </message>
-    <message>
-        <source>Could not unlock wallet.</source>
-        <translation>Ali ya bisang mag-unlock ing wallet</translation>
-    </message>
-    <message>
-        <source>New key generation failed.</source>
-        <translation>Memali ya ing pamangaua king key</translation>
-    </message>
 </context>
 <context>
     <name>FreespaceChecker</name>
     </context>
 <context>
     <name>HelpMessageDialog</name>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Kapilubluban ning Bitcoin</translation>
-    </message>
     <message>
         <source>version</source>
         <translation>bersion</translation>
@@ -483,10 +285,6 @@
         <source>Welcome</source>
         <translation>Malaus ka</translation>
     </message>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Kapilubluban ning Bitcoin</translation>
-    </message>
     <message>
         <source>Error</source>
         <translation>Mali</translation>
@@ -613,9 +411,6 @@
         <translation>Ing kekang kasalungsungan kabuuang balanse</translation>
     </message>
     </context>
-<context>
-    <name>PaymentServer</name>
-    </context>
 <context>
     <name>PeerTableModel</name>
     </context>
@@ -630,9 +425,6 @@
         <translation>N/A</translation>
     </message>
     </context>
-<context>
-    <name>QRImageWidget</name>
-    </context>
 <context>
     <name>RPCConsole</name>
     <message>
@@ -691,10 +483,6 @@
         <source>Totals</source>
         <translation>Kabuuan:</translation>
     </message>
-    <message>
-        <source>Build date</source>
-        <translation>Kaaldauan ning pamaglalang</translation>
-    </message>
     <message>
         <source>Debug log file</source>
         <translation>Debug log file</translation>
@@ -718,60 +506,13 @@
         <source>&amp;Label:</source>
         <translation>&amp;Label:</translation>
     </message>
-    <message>
-        <source>Copy label</source>
-        <translation>Kopyan ing label</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>Kopyan ing alaga</translation>
-    </message>
-</context>
+    </context>
 <context>
     <name>ReceiveRequestDialog</name>
     <message>
         <source>Copy &amp;Address</source>
         <translation>&amp;Kopyan ing address</translation>
     </message>
-    <message>
-        <source>Address</source>
-        <translation>Address</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>Alaga</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Label</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>Mensayi</translation>
-    </message>
-    </context>
-<context>
-    <name>RecentRequestsTableModel</name>
-    <message>
-        <source>Date</source>
-        <translation>Kaaldauan</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Label</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>Mensayi</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>Alaga</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(alang label)</translation>
-    </message>
     </context>
 <context>
     <name>SendCoinsDialog</name>
@@ -815,31 +556,7 @@
         <source>S&amp;end</source>
         <translation>Ipadala</translation>
     </message>
-    <message>
-        <source>Confirm send coins</source>
-        <translation>Kumpirman ing pamagpadalang barya</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>Kopyan ing alaga</translation>
-    </message>
-    <message>
-        <source>The amount to pay must be larger than 0.</source>
-        <translation>Ing alaga na ning bayaran dapat mung mas matas ya king 0.</translation>
-    </message>
-    <message>
-        <source>The amount exceeds your balance.</source>
-        <translation>Ing alaga mipasobra ya king kekang balanse.</translation>
-    </message>
-    <message>
-        <source>The total exceeds your balance when the %1 transaction fee is included.</source>
-        <translation>Ing kabuuan mipasobra ya king kekang balanse istung inabe ya ing %1 a bayad king transaksion </translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(alang label)</translation>
-    </message>
-    </context>
+</context>
 <context>
     <name>SendCoinsEntry</name>
     <message>
@@ -850,10 +567,6 @@
         <source>Pay &amp;To:</source>
         <translation>Ibayad &amp;kang:</translation>
     </message>
-    <message>
-        <source>Enter a label for this address to add it to your address book</source>
-        <translation>Magpalub kang label para king address a ini ban a-iabe me king aklat dareng address</translation>
-    </message>
     <message>
         <source>&amp;Label:</source>
         <translation>&amp;Label:</translation>
@@ -948,65 +661,9 @@
         <source>Reset all verify message fields</source>
         <translation>Ibalik king dati reng ngan fields na ning pamag beripikang mensayi</translation>
     </message>
-    <message>
-        <source>Click "Sign Message" to generate signature</source>
-        <translation>I-click ing "Pirman ing Mensayi" ban agawa ya ing metung a pirma</translation>
-    </message>
-    <message>
-        <source>The entered address is invalid.</source>
-        <translation>Ing milub a address e ya katanggap-tanggap.</translation>
-    </message>
-    <message>
-        <source>Please check the address and try again.</source>
-        <translation>Maliaring pakilawe pasibayu ing address at pasibayuan ya iti.</translation>
-    </message>
-    <message>
-        <source>The entered address does not refer to a key.</source>
-        <translation>Ing milub a address ali ya mag-refer king metung a key.</translation>
-    </message>
-    <message>
-        <source>Wallet unlock was cancelled.</source>
-        <translation>Me-kansela ya ing pamag-unlock king wallet.</translation>
-    </message>
-    <message>
-        <source>Private key for the entered address is not available.</source>
-        <translation>Ing private key para king milub a address, ala ya.</translation>
-    </message>
-    <message>
-        <source>Message signing failed.</source>
-        <translation>Me-mali ya ing pamag-pirma king mensayi .</translation>
-    </message>
-    <message>
-        <source>Message signed.</source>
-        <translation>Me-pirman ne ing mensayi.</translation>
-    </message>
-    <message>
-        <source>The signature could not be decoded.</source>
-        <translation>Ing pirma ali ya bisang ma-decode.</translation>
-    </message>
-    <message>
-        <source>Please check the signature and try again.</source>
-        <translation>Maliaring pakilawe pasibayu ing pirma kaibat pasibayuan ya iti.</translation>
-    </message>
-    <message>
-        <source>The signature did not match the message digest.</source>
-        <translation>Ing pirma ali ya makatugma king message digest.</translation>
-    </message>
-    <message>
-        <source>Message verification failed.</source>
-        <translation>Me-mali ya ing pamag-beripika king mensayi.</translation>
-    </message>
-    <message>
-        <source>Message verified.</source>
-        <translation>Me-beripika ne ing mensayi.</translation>
-    </message>
 </context>
 <context>
     <name>SplashScreen</name>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Kapilubluban ning Bitcoin</translation>
-    </message>
     <message>
         <source>[testnet]</source>
         <translation>[testnet]</translation>
@@ -1015,330 +672,16 @@
 <context>
     <name>TrafficGraphWidget</name>
     </context>
-<context>
-    <name>TransactionDesc</name>
-    <message>
-        <source>Open until %1</source>
-        <translation>Makabuklat anggang %1</translation>
-    </message>
-    <message>
-        <source>%1/offline</source>
-        <translation>%1/offline</translation>
-    </message>
-    <message>
-        <source>%1/unconfirmed</source>
-        <translation>%1/ali me-kumpirma</translation>
-    </message>
-    <message>
-        <source>%1 confirmations</source>
-        <translation>%1 kumpirmasion</translation>
-    </message>
-    <message>
-        <source>Status</source>
-        <translation>Kabilian</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation>Kaaldauan</translation>
-    </message>
-    <message>
-        <source>Source</source>
-        <translation>Pikuanan</translation>
-    </message>
-    <message>
-        <source>Generated</source>
-        <translation>Megawa</translation>
-    </message>
-    <message>
-        <source>From</source>
-        <translation>Menibat</translation>
-    </message>
-    <message>
-        <source>To</source>
-        <translation>Para kang</translation>
-    </message>
-    <message>
-        <source>own address</source>
-        <translation>sariling address</translation>
-    </message>
-    <message>
-        <source>label</source>
-        <translation>label</translation>
-    </message>
-    <message>
-        <source>Credit</source>
-        <translation>Credit</translation>
-    </message>
-    <message>
-        <source>not accepted</source>
-        <translation>ali metanggap</translation>
-    </message>
-    <message>
-        <source>Debit</source>
-        <translation>Debit</translation>
-    </message>
-    <message>
-        <source>Transaction fee</source>
-        <translation>Bayad king Transaksion</translation>
-    </message>
-    <message>
-        <source>Net amount</source>
-        <translation>Alaga dareng eganagana</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>Mensayi</translation>
-    </message>
-    <message>
-        <source>Comment</source>
-        <translation>Komentu</translation>
-    </message>
-    <message>
-        <source>Transaction ID</source>
-        <translation>ID</translation>
-    </message>
-    <message>
-        <source>Debug information</source>
-        <translation>Impormasion ning Debug</translation>
-    </message>
-    <message>
-        <source>Transaction</source>
-        <translation>Transaksion</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>Alaga</translation>
-    </message>
-    <message>
-        <source>true</source>
-        <translation>tutu</translation>
-    </message>
-    <message>
-        <source>false</source>
-        <translation>e tutu</translation>
-    </message>
-    <message>
-        <source>, has not been successfully broadcast yet</source>
-        <translation>, eya matagumpeng mibalita</translation>
-    </message>
-    <message>
-        <source>unknown</source>
-        <translation>e miya balu</translation>
-    </message>
-</context>
 <context>
     <name>TransactionDescDialog</name>
-    <message>
-        <source>Transaction details</source>
-        <translation>Detalye ning Transaksion</translation>
-    </message>
     <message>
         <source>This pane shows a detailed description of the transaction</source>
         <translation>Ining pane a ini magpakit yang detalyadung description ning transaksion</translation>
     </message>
 </context>
-<context>
-    <name>TransactionTableModel</name>
-    <message>
-        <source>Date</source>
-        <translation>Kaaldauan</translation>
-    </message>
-    <message>
-        <source>Type</source>
-        <translation>Klase</translation>
-    </message>
-    <message>
-        <source>Open until %1</source>
-        <translation>Makabuklat anggang %1</translation>
-    </message>
-    <message>
-        <source>Confirmed (%1 confirmations)</source>
-        <translation>Me-kumpirma(%1 kumpirmasion)</translation>
-    </message>
-    <message>
-        <source>This block was not received by any other nodes and will probably not be accepted!</source>
-        <translation>Ing block a ini ali de atanggap deng aliwa pang nodes ania ali ya magsilbing tanggapan</translation>
-    </message>
-    <message>
-        <source>Generated but not accepted</source>
-        <translation>Me-generate ya oneng ali ya metanggap</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Label</translation>
-    </message>
-    <message>
-        <source>Received with</source>
-        <translation>Atanggap kayabe ning</translation>
-    </message>
-    <message>
-        <source>Received from</source>
-        <translation>Atanggap menibat kang</translation>
-    </message>
-    <message>
-        <source>Sent to</source>
-        <translation>Mipadala kang</translation>
-    </message>
-    <message>
-        <source>Payment to yourself</source>
-        <translation>Kabayaran keka</translation>
-    </message>
-    <message>
-        <source>Mined</source>
-        <translation>Me-mina</translation>
-    </message>
-    <message>
-        <source>(n/a)</source>
-        <translation>(n/a)</translation>
-    </message>
-    <message>
-        <source>Transaction status. Hover over this field to show number of confirmations.</source>
-        <translation>Status ning Transaksion: Itapat me babo na ning field a ini ban ipakit dala reng bilang dareng me-kumpirma na</translation>
-    </message>
-    <message>
-        <source>Date and time that the transaction was received.</source>
-        <translation>Aldo at oras nung kapilan me tanggap ya ing transaksion</translation>
-    </message>
-    <message>
-        <source>Type of transaction.</source>
-        <translation>Klase ning transaksion</translation>
-    </message>
-    <message>
-        <source>Amount removed from or added to balance.</source>
-        <translation>Alagang milako o miragdag king balanse.</translation>
-    </message>
-</context>
-<context>
-    <name>TransactionView</name>
-    <message>
-        <source>All</source>
-        <translation>Eganagana</translation>
-    </message>
-    <message>
-        <source>Today</source>
-        <translation>Aldo iti</translation>
-    </message>
-    <message>
-        <source>This week</source>
-        <translation>Paruminggung iti</translation>
-    </message>
-    <message>
-        <source>This month</source>
-        <translation>Bulan a iti</translation>
-    </message>
-    <message>
-        <source>Last month</source>
-        <translation>Milabas a bulan</translation>
-    </message>
-    <message>
-        <source>This year</source>
-        <translation>Banuang iti</translation>
-    </message>
-    <message>
-        <source>Range...</source>
-        <translation>Angganan...</translation>
-    </message>
-    <message>
-        <source>Received with</source>
-        <translation>Atanggap kayabe ning</translation>
-    </message>
-    <message>
-        <source>Sent to</source>
-        <translation>Mipadala kang</translation>
-    </message>
-    <message>
-        <source>To yourself</source>
-        <translation>Keng sarili mu</translation>
-    </message>
-    <message>
-        <source>Mined</source>
-        <translation>Me-mina</translation>
-    </message>
-    <message>
-        <source>Other</source>
-        <translation>Aliwa</translation>
-    </message>
-    <message>
-        <source>Enter address or label to search</source>
-        <translation>Magpalub kang address o label para pantunan</translation>
-    </message>
-    <message>
-        <source>Min amount</source>
-        <translation>Pekaditak a alaga</translation>
-    </message>
-    <message>
-        <source>Copy address</source>
-        <translation>Kopyan ing address</translation>
-    </message>
-    <message>
-        <source>Copy label</source>
-        <translation>Kopyan ing label</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>Kopyan ing alaga</translation>
-    </message>
-    <message>
-        <source>Edit label</source>
-        <translation>Alilan ing label</translation>
-    </message>
-    <message>
-        <source>Show transaction details</source>
-        <translation>Ipakit ing detalye ning transaksion</translation>
-    </message>
-    <message>
-        <source>Comma separated file (*.csv)</source>
-        <translation>Comma separated file (*.csv)</translation>
-    </message>
-    <message>
-        <source>Confirmed</source>
-        <translation>Me-kumpirma</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation>Kaaldauan</translation>
-    </message>
-    <message>
-        <source>Type</source>
-        <translation>Klase</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Label</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>Address</translation>
-    </message>
-    <message>
-        <source>ID</source>
-        <translation>ID</translation>
-    </message>
-    <message>
-        <source>Range:</source>
-        <translation>Angga:</translation>
-    </message>
-    <message>
-        <source>to</source>
-        <translation>para kang</translation>
-    </message>
-</context>
 <context>
     <name>UnitDisplayStatusBarControl</name>
     </context>
-<context>
-    <name>WalletFrame</name>
-    </context>
-<context>
-    <name>WalletModel</name>
-    <message>
-        <source>Send Coins</source>
-        <translation>Magpadalang Barya</translation>
-    </message>
-</context>
-<context>
-    <name>WalletView</name>
-    </context>
 <context>
     <name>bitcoin-core</name>
     <message>
@@ -1369,6 +712,10 @@
         <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
         <translation>Tumanggap koneksion menibat king kilwal (default: 1 if no -proxy or -connect)</translation>
     </message>
+    <message>
+        <source>Bitcoin Core</source>
+        <translation>Kapilubluban ning Bitcoin</translation>
+    </message>
     <message>
         <source>Block creation options:</source>
         <translation>Pipamilian king pamag-gawang block:</translation>
@@ -1401,26 +748,10 @@
         <source>Failed to listen on any port. Use -listen=0 if you want this.</source>
         <translation>Memali ya ing pamakiramdam kareng gang nanung port. Gamita me ini -listen=0 nung buri me ini.</translation>
     </message>
-    <message>
-        <source>Cannot resolve -whitebind address: '%s'</source>
-        <translation>Eya me-resolve ing -whitebind address: '%s'</translation>
-    </message>
     <message>
         <source>Information</source>
         <translation>&amp;Impormasion</translation>
     </message>
-    <message>
-        <source>Invalid amount for -maxtxfee=&lt;amount&gt;: '%s'</source>
-        <translation>Eya maliari ing alaga keng -maxtxfee=&lt;amount&gt;: '%s'</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -minrelaytxfee=&lt;amount&gt;: '%s'</source>
-        <translation>Eya maliari ing alaga keng -minrelaytxfee=&lt;amount&gt;: '%s'</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -mintxfee=&lt;amount&gt;: '%s'</source>
-        <translation>Eya maliari ing alaga keng -mintxfee=&lt;amount&gt;: '%s'</translation>
-    </message>
     <message>
         <source>Send trace/debug info to console instead of debug.log file</source>
         <translation>Magpadalang trace/debug info okeng console kesa keng debug.log file</translation>
@@ -1445,10 +776,6 @@
         <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
         <translation>I-execute ing command istung mialilan ya ing best block (%s in cmd is replaced by block hash)</translation>
     </message>
-    <message>
-        <source>This help message</source>
-        <translation>Ining saup a mensayi</translation>
-    </message>
     <message>
         <source>Allow DNS lookups for -addnode, -seednode and -connect</source>
         <translation>Payagan ing pamaglawe DNS para king -addnode, -seednode and -connect</translation>
@@ -1457,14 +784,6 @@
         <source>Loading addresses...</source>
         <translation>Lo-load da ne ing address...</translation>
     </message>
-    <message>
-        <source>Error loading wallet.dat: Wallet corrupted</source>
-        <translation>Me-mali ya ing pamag-load king wallet.dat: Me-corrupt ya ing wallet</translation>
-    </message>
-    <message>
-        <source>Error loading wallet.dat</source>
-        <translation>Me-mali ya ing pamag-load king wallet.dat</translation>
-    </message>
     <message>
         <source>Invalid -proxy address: '%s'</source>
         <translation>Ali katanggap-tanggap a -proxy addresss: '%s'</translation>
@@ -1473,18 +792,6 @@
         <source>Unknown network specified in -onlynet: '%s'</source>
         <translation>E kilalang network ing mepili king -onlynet: '%s'</translation>
     </message>
-    <message>
-        <source>Cannot resolve -bind address: '%s'</source>
-        <translation>Eya me-resolve ing -bind address: '%s'</translation>
-    </message>
-    <message>
-        <source>Cannot resolve -externalip address: '%s'</source>
-        <translation>Eya me-resolve ing -externalip address: '%s'</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -paytxfee=&lt;amount&gt;: '%s'</source>
-        <translation>Eya maliari ing alaga keng -paytxfee=&lt;amount&gt;: '%s'</translation>
-    </message>
     <message>
         <source>Insufficient funds</source>
         <translation>Kulang a pondo</translation>
diff --git a/src/qt/locale/bitcoin_pl.ts b/src/qt/locale/bitcoin_pl.ts
index ffbacfd4929f4..6d41cbeef227e 100644
--- a/src/qt/locale/bitcoin_pl.ts
+++ b/src/qt/locale/bitcoin_pl.ts
@@ -3,7 +3,7 @@
     <name>AddressBookPage</name>
     <message>
         <source>Right-click to edit address or label</source>
-        <translation>Kliknij prawy przycisk aby edytować adres lub etykietę</translation>
+        <translation>Kliknij prawy przycisk myszy, aby edytować adres lub etykietę</translation>
     </message>
     <message>
         <source>Create a new address</source>
@@ -25,10 +25,6 @@
         <source>C&amp;lose</source>
         <translation>Z&amp;amknij</translation>
     </message>
-    <message>
-        <source>&amp;Copy Address</source>
-        <translation>&amp;Kopiuj adres</translation>
-    </message>
     <message>
         <source>Delete the currently selected address from the list</source>
         <translation>Usuń zaznaczony adres z listy</translation>
@@ -45,73 +41,6 @@
         <source>&amp;Delete</source>
         <translation>&amp;Usuń</translation>
     </message>
-    <message>
-        <source>Choose the address to send coins to</source>
-        <translation>Wybierz adres, na który chcesz wysłać monety</translation>
-    </message>
-    <message>
-        <source>Choose the address to receive coins with</source>
-        <translation>Wybierz adres, na który chcesz otrzymać monety</translation>
-    </message>
-    <message>
-        <source>C&amp;hoose</source>
-        <translation>W&amp;ybierz</translation>
-    </message>
-    <message>
-        <source>Sending addresses</source>
-        <translation>Adres wysyłania</translation>
-    </message>
-    <message>
-        <source>Receiving addresses</source>
-        <translation>Adres odbiorczy</translation>
-    </message>
-    <message>
-        <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source>
-        <translation>Tutaj znajdują się adresy Bitcoin na które wysyłasz płatności. Zawsze sprawdzaj ilość i adres odbiorcy przed wysyłką monet.</translation>
-    </message>
-    <message>
-        <source>These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source>
-        <translation>To twoje adresy Bitcoin, na które otrzymujesz płatności. Zaleca się używanie nowych adresów odbiorczych dla każdej transakcji.</translation>
-    </message>
-    <message>
-        <source>Copy &amp;Label</source>
-        <translation>Kopiuj &amp;Etykietę</translation>
-    </message>
-    <message>
-        <source>&amp;Edit</source>
-        <translation>&amp;Modyfikuj</translation>
-    </message>
-    <message>
-        <source>Export Address List</source>
-        <translation>Eksportuj listę adresową</translation>
-    </message>
-    <message>
-        <source>Comma separated file (*.csv)</source>
-        <translation>Pliki (*.csv) rozdzielone przecinkami</translation>
-    </message>
-    <message>
-        <source>Exporting Failed</source>
-        <translation>Błąd przy próbie eksportowania</translation>
-    </message>
-    <message>
-        <source>There was an error trying to save the address list to %1. Please try again.</source>
-        <translation>Wystąpił błąd podczas próby zapisu listy adresów %1. Proszę spróbować ponownie.</translation>
-    </message>
-</context>
-<context>
-    <name>AddressTableModel</name>
-    <message>
-        <source>Label</source>
-        <translation>Etykieta</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>Adres</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(brak etykiety)</translation>
-    </message>
 </context>
 <context>
     <name>AskPassphraseDialog</name>
@@ -131,94 +60,6 @@
         <source>Repeat new passphrase</source>
         <translation>Powtórz nowe hasło</translation>
     </message>
-    <message>
-        <source>Encrypt wallet</source>
-        <translation>Zaszyfruj portfel</translation>
-    </message>
-    <message>
-        <source>This operation needs your wallet passphrase to unlock the wallet.</source>
-        <translation>Operacja wymaga hasła portfela, aby go odblokować.</translation>
-    </message>
-    <message>
-        <source>Unlock wallet</source>
-        <translation>Odblokuj portfel</translation>
-    </message>
-    <message>
-        <source>This operation needs your wallet passphrase to decrypt the wallet.</source>
-        <translation>Operacja wymaga hasła portfela, aby go odszyfrować.</translation>
-    </message>
-    <message>
-        <source>Decrypt wallet</source>
-        <translation>Odszyfruj portfel</translation>
-    </message>
-    <message>
-        <source>Change passphrase</source>
-        <translation>Zmień hasło</translation>
-    </message>
-    <message>
-        <source>Confirm wallet encryption</source>
-        <translation>Potwierdź szyfrowanie portfela</translation>
-    </message>
-    <message>
-        <source>Warning: If you encrypt your wallet and lose your passphrase, you will &lt;b&gt;LOSE ALL OF YOUR BITCOINS&lt;/b&gt;!</source>
-        <translation>Uwaga: jeśli zaszyfrujesz swój portfel i zgubisz hasło &lt;b&gt;STRACISZ WSZYSTKIE SWOJE BITCOINY&lt;/b&gt;!</translation>
-    </message>
-    <message>
-        <source>Are you sure you wish to encrypt your wallet?</source>
-        <translation>Jesteś pewien, że chcesz zaszyfrować swój portfel?</translation>
-    </message>
-    <message>
-        <source>Bitcoin Core will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source>
-        <translation>Program Bitcoin Core zamknie się, aby dokończyć proces szyfrowania. Pamiętaj, że szyfrowanie portfela nie zabezpiecza w pełni twoich bitcoinów przed kradzieżą przez złośliwe oprogramowanie mogące zainfekować twój komputer.</translation>
-    </message>
-    <message>
-        <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source>
-        <translation>WAŻNE: Wszystkie wcześniejsze kopie pliku portfela powinny być zamienione na nowe, szyfrowane pliki. Z powodów bezpieczeństwa, poprzednie kopie nieszyfrowanych plików portfela staną się bezużyteczne jak tylko zaczniesz korzystać z nowego, szyfrowanego portfela.</translation>
-    </message>
-    <message>
-        <source>Warning: The Caps Lock key is on!</source>
-        <translation>Uwaga: klawisz Caps Lock jest włączony!</translation>
-    </message>
-    <message>
-        <source>Wallet encrypted</source>
-        <translation>Portfel zaszyfrowany</translation>
-    </message>
-    <message>
-        <source>Enter the new passphrase to the wallet.&lt;br/&gt;Please use a passphrase of &lt;b&gt;ten or more random characters&lt;/b&gt;, or &lt;b&gt;eight or more words&lt;/b&gt;.</source>
-        <translation>Wprowadź nowe hasło do portfela.&lt;br/&gt;Proszę używać hasła złożonego z &lt;b&gt;10 lub więcej losowych znaków&lt;/b&gt; albo &lt;b&gt;8 lub więcej słów.&lt;/b&gt;</translation>
-    </message>
-    <message>
-        <source>Enter the old passphrase and new passphrase to the wallet.</source>
-        <translation>Podaj stare i nowe hasło do portfela.</translation>
-    </message>
-    <message>
-        <source>Wallet encryption failed</source>
-        <translation>Szyfrowanie portfela nie powiodło się</translation>
-    </message>
-    <message>
-        <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
-        <translation>Szyfrowanie portfela nie powiodło się z powodu wewnętrznego błędu. Twój portfel nie został zaszyfrowany.</translation>
-    </message>
-    <message>
-        <source>The supplied passphrases do not match.</source>
-        <translation>Podane hasła nie są takie same.</translation>
-    </message>
-    <message>
-        <source>Wallet unlock failed</source>
-        <translation>Odblokowanie portfela nie powiodło się</translation>
-    </message>
-    <message>
-        <source>The passphrase entered for the wallet decryption was incorrect.</source>
-        <translation>Wprowadzone hasło do odszyfrowania portfela jest niepoprawne.</translation>
-    </message>
-    <message>
-        <source>Wallet decryption failed</source>
-        <translation>Odszyfrowanie portfela nie powiodło się</translation>
-    </message>
-    <message>
-        <source>Wallet passphrase was successfully changed.</source>
-        <translation>Hasło portfela zostało pomyślnie zmienione.</translation>
-    </message>
 </context>
 <context>
     <name>BanTableModel</name>
@@ -269,6 +110,14 @@
         <source>Quit application</source>
         <translation>Zamknij program</translation>
     </message>
+    <message>
+        <source>&amp;About %1</source>
+        <translation>&amp;O %1</translation>
+    </message>
+    <message>
+        <source>Show information about %1</source>
+        <translation>Pokaż informacje o %1</translation>
+    </message>
     <message>
         <source>About &amp;Qt</source>
         <translation>O &amp;Qt</translation>
@@ -281,6 +130,10 @@
         <source>&amp;Options...</source>
         <translation>&amp;Opcje...</translation>
     </message>
+    <message>
+        <source>Modify configuration options for %1</source>
+        <translation>Zmień opcje konfiguracji dla %1</translation>
+    </message>
     <message>
         <source>&amp;Encrypt Wallet...</source>
         <translation>Zaszyfruj Portf&amp;el</translation>
@@ -305,14 +158,6 @@
         <source>Open &amp;URI...</source>
         <translation>Otwórz URI...</translation>
     </message>
-    <message>
-        <source>Bitcoin Core client</source>
-        <translation>Klient Rdzenia Bitcoina</translation>
-    </message>
-    <message>
-        <source>Importing blocks from disk...</source>
-        <translation>Importowanie bloków z dysku...</translation>
-    </message>
     <message>
         <source>Reindexing blocks on disk...</source>
         <translation>Ponowne indeksowanie bloków na dysku...</translation>
@@ -357,10 +202,6 @@
         <source>&amp;Receive</source>
         <translation>Odbie&amp;rz</translation>
     </message>
-    <message>
-        <source>Show information about Bitcoin Core</source>
-        <translation>Pokaż informacje o Rdzeniu Bitcoina</translation>
-    </message>
     <message>
         <source>&amp;Show / Hide</source>
         <translation>&amp;Pokaż / Ukryj</translation>
@@ -397,22 +238,10 @@
         <source>Tabs toolbar</source>
         <translation>Pasek zakładek</translation>
     </message>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Rdzeń Bitcoina</translation>
-    </message>
     <message>
         <source>Request payments (generates QR codes and bitcoin: URIs)</source>
         <translation>Żądaj płatności (generuje kod QR oraz bitcoinowe URI)</translation>
     </message>
-    <message>
-        <source>&amp;About Bitcoin Core</source>
-        <translation>&amp;O Bitcoin Core</translation>
-    </message>
-    <message>
-        <source>Modify configuration options for Bitcoin Core</source>
-        <translation>Zmień opcje konfiguracji dla Bitcoin Core</translation>
-    </message>
     <message>
         <source>Show the list of used sending addresses and labels</source>
         <translation>Pokaż listę adresów i etykiet użytych do wysyłania</translation>
@@ -429,14 +258,18 @@
         <source>&amp;Command-line options</source>
         <translation>&amp;Opcje linii komend</translation>
     </message>
-    <message>
-        <source>Show the Bitcoin Core help message to get a list with possible Bitcoin command-line options</source>
-        <translation>Pokaż pomoc Rdzenia Bitcoin, aby zobaczyć listę wszystkich opcji linii poleceń</translation>
-    </message>
     <message numerus="yes">
         <source>%n active connection(s) to Bitcoin network</source>
         <translation><numerusform>%n aktywnych połączeń do sieci Bitcoin</numerusform><numerusform>%n aktywnych połączeń do sieci Bitcoin</numerusform><numerusform>%n aktywnych połączeń do sieci Bitcoin</numerusform></translation>
     </message>
+    <message>
+        <source>Indexing blocks on disk...</source>
+        <translation>Indeksowanie bloków na dysku...</translation>
+    </message>
+    <message>
+        <source>Processing blocks on disk...</source>
+        <translation>Przetwarzanie blocks on disk...</translation>
+    </message>
     <message>
         <source>No block source available...</source>
         <translation>Brak dostępnych źródeł bloków...</translation>
@@ -493,6 +326,14 @@
         <source>Up to date</source>
         <translation>Aktualny</translation>
     </message>
+    <message>
+        <source>Show the %1 help message to get a list with possible Bitcoin command-line options</source>
+        <translation>Pokaż pomoc %1 aby zobaczyć listę wszystkich opcji lnii poleceń.</translation>
+    </message>
+    <message>
+        <source>%1 client</source>
+        <translation>%1 klient</translation>
+    </message>
     <message>
         <source>Catching up...</source>
         <translation>Trwa synchronizacja…</translation>
@@ -544,13 +385,6 @@
         <translation>Portfel jest &lt;b&gt;zaszyfrowany&lt;/b&gt; i obecnie &lt;b&gt;zablokowany&lt;/b&gt;</translation>
     </message>
 </context>
-<context>
-    <name>ClientModel</name>
-    <message>
-        <source>Network Alert</source>
-        <translation>Komunikat Sieci</translation>
-    </message>
-</context>
 <context>
     <name>CoinControlDialog</name>
     <message>
@@ -629,150 +463,6 @@
         <source>Priority</source>
         <translation>Priorytet</translation>
     </message>
-    <message>
-        <source>Copy address</source>
-        <translation>Kopiuj adres</translation>
-    </message>
-    <message>
-        <source>Copy label</source>
-        <translation>Kopiuj etykietę</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>Kopiuj kwotę</translation>
-    </message>
-    <message>
-        <source>Copy transaction ID</source>
-        <translation>Skopiuj ID transakcji</translation>
-    </message>
-    <message>
-        <source>Lock unspent</source>
-        <translation>Zablokuj niewydane</translation>
-    </message>
-    <message>
-        <source>Unlock unspent</source>
-        <translation>Odblokuj niewydane</translation>
-    </message>
-    <message>
-        <source>Copy quantity</source>
-        <translation>Skopiuj ilość</translation>
-    </message>
-    <message>
-        <source>Copy fee</source>
-        <translation>Skopiuj opłatę</translation>
-    </message>
-    <message>
-        <source>Copy after fee</source>
-        <translation>Skopiuj ilość po opłacie</translation>
-    </message>
-    <message>
-        <source>Copy bytes</source>
-        <translation>Skopiuj ilość bajtów</translation>
-    </message>
-    <message>
-        <source>Copy priority</source>
-        <translation>Skopiuj priorytet</translation>
-    </message>
-    <message>
-        <source>Copy dust</source>
-        <translation>Kopiuj kurz</translation>
-    </message>
-    <message>
-        <source>Copy change</source>
-        <translation>Skopiuj resztę</translation>
-    </message>
-    <message>
-        <source>highest</source>
-        <translation>najwyższa</translation>
-    </message>
-    <message>
-        <source>higher</source>
-        <translation>wyższa</translation>
-    </message>
-    <message>
-        <source>high</source>
-        <translation>wysoka</translation>
-    </message>
-    <message>
-        <source>medium-high</source>
-        <translation>średnio wysoki</translation>
-    </message>
-    <message>
-        <source>medium</source>
-        <translation>średnia</translation>
-    </message>
-    <message>
-        <source>low-medium</source>
-        <translation>średnio niski</translation>
-    </message>
-    <message>
-        <source>low</source>
-        <translation>niski</translation>
-    </message>
-    <message>
-        <source>lower</source>
-        <translation>niższy</translation>
-    </message>
-    <message>
-        <source>lowest</source>
-        <translation>najniższy</translation>
-    </message>
-    <message>
-        <source>(%1 locked)</source>
-        <translation>(%1 zablokowane)</translation>
-    </message>
-    <message>
-        <source>none</source>
-        <translation>żaden</translation>
-    </message>
-    <message>
-        <source>This label turns red if the transaction size is greater than 1000 bytes.</source>
-        <translation>Ta etykieta staje się czerwona, kiedy transakcja jest większa niż 1000 bajtów.</translation>
-    </message>
-    <message>
-        <source>This label turns red if the priority is smaller than "medium".</source>
-        <translation>Ta etykieta jest czerwona, jeżeli priorytet jest mniejszy niż "średni"</translation>
-    </message>
-    <message>
-        <source>This label turns red if any recipient receives an amount smaller than %1.</source>
-        <translation>Etykieta staje się czerwona kiedy którykolwiek odbiorca otrzymuje kwotę mniejszą niż %1.</translation>
-    </message>
-    <message>
-        <source>Can vary +/- %1 satoshi(s) per input.</source>
-        <translation>Waha się +/- %1 satoshi na wejście.</translation>
-    </message>
-    <message>
-        <source>yes</source>
-        <translation>tak</translation>
-    </message>
-    <message>
-        <source>no</source>
-        <translation>nie</translation>
-    </message>
-    <message>
-        <source>This means a fee of at least %1 per kB is required.</source>
-        <translation>Oznacza to wymaganą opłatę minimum %1 na kB.</translation>
-    </message>
-    <message>
-        <source>Can vary +/- 1 byte per input.</source>
-        <translation>Waha się +/- 1 bajt na wejście.</translation>
-    </message>
-    <message>
-        <source>Transactions with higher priority are more likely to get included into a block.</source>
-        <translation>Transakcje o wyższym priorytecie zwykle szybciej zostają dołączone do bloku.</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(brak etykiety)</translation>
-    </message>
-    <message>
-        <source>change from %1 (%2)</source>
-        <translation>reszta z %1 (%2)</translation>
-    </message>
-    <message>
-        <source>(change)</source>
-        <translation>(reszta)</translation>
-    </message>
 </context>
 <context>
     <name>EditAddressDialog</name>
@@ -796,38 +486,6 @@
         <source>&amp;Address</source>
         <translation>&amp;Adres</translation>
     </message>
-    <message>
-        <source>New receiving address</source>
-        <translation>Nowy adres otrzymywania</translation>
-    </message>
-    <message>
-        <source>New sending address</source>
-        <translation>Nowy adres wysyłania</translation>
-    </message>
-    <message>
-        <source>Edit receiving address</source>
-        <translation>Zmień adres odbioru</translation>
-    </message>
-    <message>
-        <source>Edit sending address</source>
-        <translation>Zmień adres wysyłania</translation>
-    </message>
-    <message>
-        <source>The entered address "%1" is already in the address book.</source>
-        <translation>Wprowadzony adres «%1» już istnieje w książce adresowej.</translation>
-    </message>
-    <message>
-        <source>The entered address "%1" is not a valid Bitcoin address.</source>
-        <translation>Wprowadzony adres «%1"» nie jest poprawnym adresem bitcoinowym.</translation>
-    </message>
-    <message>
-        <source>Could not unlock wallet.</source>
-        <translation>Nie można było odblokować portfela.</translation>
-    </message>
-    <message>
-        <source>New key generation failed.</source>
-        <translation>Tworzenie nowego klucza nie powiodło się.</translation>
-    </message>
 </context>
 <context>
     <name>FreespaceChecker</name>
@@ -854,10 +512,6 @@
 </context>
 <context>
     <name>HelpMessageDialog</name>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Rdzeń Bitcoina</translation>
-    </message>
     <message>
         <source>version</source>
         <translation>wersja</translation>
@@ -867,8 +521,8 @@
         <translation>(%1-bit)</translation>
     </message>
     <message>
-        <source>About Bitcoin Core</source>
-        <translation>O Bitcoin Core</translation>
+        <source>About %1</source>
+        <translation>Informacje o %1</translation>
     </message>
     <message>
         <source>Command-line options</source>
@@ -907,8 +561,8 @@
         <translation>Wyświetl okno powitalne podczas uruchamiania (domyślnie: %u)</translation>
     </message>
     <message>
-        <source>Reset all settings changes made over the GUI</source>
-        <translation>Ustaw jako domyślne wszystkie ustawienia interfejsu</translation>
+        <source>Reset all settings changed in the GUI</source>
+        <translation>Zresetuj wszystkie ustawienia zmienione w GUI</translation>
     </message>
 </context>
 <context>
@@ -918,16 +572,16 @@
         <translation>Witaj</translation>
     </message>
     <message>
-        <source>Welcome to Bitcoin Core.</source>
-        <translation>Witaj w Bitcoin Core</translation>
+        <source>Welcome to %1.</source>
+        <translation>Witaj w %1.</translation>
     </message>
     <message>
-        <source>As this is the first time the program is launched, you can choose where Bitcoin Core will store its data.</source>
-        <translation>Ponieważ jest to pierwsze uruchomienie programu, możesz wybrać gdzie Bitcoin Core będzie przechowywał swoje dane.</translation>
+        <source>As this is the first time the program is launched, you can choose where %1 will store its data.</source>
+        <translation>Ponieważ jest to pierwsze uruchomienie programu, możesz wybrać gdzie %1 będzie przechowywał swoje dane.</translation>
     </message>
     <message>
-        <source>Bitcoin Core will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source>
-        <translation>Program pobierze i będzie przechowywał kopię łańcucha bloków bitcoinowych. W wybranym katalogu musi być przynajmniej %1 GB miejsca, a z czasem ilość danych będzie rosła. Portfel będzie przechowywany w tym samym katalogu.</translation>
+        <source>%1 will download and store a copy of the Bitcoin block chain. At least %2GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source>
+        <translation>%1 pobierze i będzie przechowywał kopię łańcucha bloków Bitcoin. W wybranym katalogu zostanie zapisanych %2GB danych, a z czasem ta ilość będzie rosła. Portfel będzie przechowywany w tym samym katalogu.</translation>
     </message>
     <message>
         <source>Use the default data directory</source>
@@ -937,10 +591,6 @@
         <source>Use a custom data directory:</source>
         <translation>Użyj wybranego folderu dla danych</translation>
     </message>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Rdzeń Bitcoina</translation>
-    </message>
     <message>
         <source>Error: Specified data directory "%1" cannot be created.</source>
         <translation>Błąd: podany folder danych «%1» nie mógł zostać utworzony.</translation>
@@ -976,10 +626,6 @@
         <source>Select payment request file</source>
         <translation>Otwórz żądanie zapłaty z pliku</translation>
     </message>
-    <message>
-        <source>Select payment request file to open</source>
-        <translation>Wybierz plik żądania zapłaty do otwarcia</translation>
-    </message>
 </context>
 <context>
     <name>OptionsDialog</name>
@@ -991,6 +637,14 @@
         <source>&amp;Main</source>
         <translation>Główne</translation>
     </message>
+    <message>
+        <source>Automatically start %1 after logging in to the system.</source>
+        <translation>Automatycznie uruchom %1 po zalogowaniu do systemu.</translation>
+    </message>
+    <message>
+        <source>&amp;Start %1 on system login</source>
+        <translation>Uruchamiaj %1 wraz z zalogowaniem do &amp;systemu</translation>
+    </message>
     <message>
         <source>Size of &amp;database cache</source>
         <translation>Wielkość bufora bazy &amp;danych</translation>
@@ -1019,10 +673,6 @@
         <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Exit in the menu.</source>
         <translation>Minimalizuje zamiast zakończyć działanie programu przy zamykaniu okna. Kiedy ta opcja jest włączona, program zakończy działanie po wybieraniu Zamknij w menu.</translation>
     </message>
-    <message>
-        <source>The user interface language can be set here. This setting will take effect after restarting Bitcoin Core.</source>
-        <translation>Można tu ustawić język interfejsu uzytkownika. Żeby ustawienie przyniosło skutek trzeba uruchomić ponownie Bitcoin.</translation>
-    </message>
     <message>
         <source>Third party URLs (e.g. a block explorer) that appear in the transactions tab as context menu items. %s in the URL is replaced by transaction hash. Multiple URLs are separated by vertical bar |.</source>
         <translation>Zewnętrzne URL podglądu transakcji (np. eksplorator bloków), które będą wyświetlały się w menu kontekstowym, w zakładce transakcji. %s będzie zamieniany w adresie na hash transakcji. Oddziel wiele adresów pionową kreską |.</translation>
@@ -1047,14 +697,6 @@
         <source>&amp;Network</source>
         <translation>&amp;Sieć</translation>
     </message>
-    <message>
-        <source>Automatically start Bitcoin Core after logging in to the system.</source>
-        <translation>Automatycznie uruchamia Bitcoin po zalogowaniu do systemu.</translation>
-    </message>
-    <message>
-        <source>&amp;Start Bitcoin Core on system login</source>
-        <translation>Uruchamiaj Bitcoin Core wraz z zalogowaniem do &amp;systemu</translation>
-    </message>
     <message>
         <source>(0 = auto, &lt;0 = leave that many cores free)</source>
         <translation>(0 = automatycznie, &lt;0 = zostaw tyle wolnych rdzeni)</translation>
@@ -1139,6 +781,14 @@
         <source>&amp;Window</source>
         <translation>&amp;Okno</translation>
     </message>
+    <message>
+        <source>&amp;Hide the icon from the system tray.</source>
+        <translation>Ukryj ikonę z zasobnika systemowego.</translation>
+    </message>
+    <message>
+        <source>Hide tray icon</source>
+        <translation>Ukryj ikonę zasobnika</translation>
+    </message>
     <message>
         <source>Show only a tray icon after minimizing the window.</source>
         <translation>Pokazuj tylko ikonę przy zegarku po zminimalizowaniu okna.</translation>
@@ -1159,6 +809,10 @@
         <source>User Interface &amp;language:</source>
         <translation>Język &amp;użytkownika:</translation>
     </message>
+    <message>
+        <source>The user interface language can be set here. This setting will take effect after restarting %1.</source>
+        <translation>Można tu ustawić język interfejsu uzytkownika. Ustawienie przyniesie skutek po ponownym uruchomieniu %1.</translation>
+    </message>
     <message>
         <source>&amp;Unit to show amounts in:</source>
         <translation>&amp;Jednostka pokazywana przy kwocie:</translation>
@@ -1284,169 +938,59 @@
     </message>
 </context>
 <context>
-    <name>PaymentServer</name>
+    <name>PeerTableModel</name>
     <message>
-        <source>URI handling</source>
-        <translation>Obsługa URI</translation>
+        <source>User Agent</source>
+        <translation>Aplikacja kliencka</translation>
     </message>
     <message>
-        <source>Invalid payment address %1</source>
-        <translation>błędny adres płatności %1</translation>
+        <source>Node/Service</source>
+        <translation>Węzeł/Usługi</translation>
     </message>
     <message>
-        <source>Payment request rejected</source>
-        <translation>Żądanie płatności odrzucone</translation>
+        <source>Ping Time</source>
+        <translation>Czas odpowiedzi</translation>
     </message>
+</context>
+<context>
+    <name>QObject</name>
     <message>
-        <source>Payment request network doesn't match client network.</source>
-        <translation>Sieć żądania płatności nie odpowiada sieci klienta.</translation>
+        <source>Amount</source>
+        <translation>Kwota</translation>
     </message>
     <message>
-        <source>Payment request is not initialized.</source>
-        <translation>Żądanie płatności nie jest zainicjowane.</translation>
+        <source>Enter a Bitcoin address (e.g. %1)</source>
+        <translation>Wprowadź adres bitcoinowy (np. %1)</translation>
     </message>
     <message>
-        <source>Requested payment amount of %1 is too small (considered dust).</source>
-        <translation>Żądana kwota %1 jest za niska (uznano za kurz).</translation>
+        <source>%1 d</source>
+        <translation>%1 d</translation>
     </message>
     <message>
-        <source>Payment request error</source>
-        <translation>Błąd żądania płatności</translation>
+        <source>%1 h</source>
+        <translation>%1 h</translation>
     </message>
     <message>
-        <source>Cannot start bitcoin: click-to-pay handler</source>
-        <translation>Nie można uruchomić protokołu bitcoin: kliknij-by-zapłacić</translation>
+        <source>%1 m</source>
+        <translation>%1 m</translation>
     </message>
     <message>
-        <source>Payment request fetch URL is invalid: %1</source>
-        <translation>URL pobrania żądania zapłaty jest nieprawidłowe: %1</translation>
+        <source>%1 s</source>
+        <translation>%1 s</translation>
     </message>
     <message>
-        <source>URI cannot be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source>
-        <translation>URI nie może zostać przetworzony! Może to być spowodowane nieprawidłowym adresem Bitcoin lub uszkodzonymi parametrami URI.</translation>
+        <source>None</source>
+        <translation>Żaden</translation>
     </message>
     <message>
-        <source>Payment request file handling</source>
-        <translation>Przechwytywanie plików żądania płatności</translation>
-    </message>
-    <message>
-        <source>Payment request file cannot be read! This can be caused by an invalid payment request file.</source>
-        <translation>Plików żądania płatności nie może zostać odczytany. Mogło to być spowodowane nieprawidłowym plikiem żądania płatności.</translation>
-    </message>
-    <message>
-        <source>Payment request expired.</source>
-        <translation>Żądanie płatności upłynęło.</translation>
-    </message>
-    <message>
-        <source>Unverified payment requests to custom payment scripts are unsupported.</source>
-        <translation>Niezweryfikowane żądania płatności do własnych skryptów płatności są niewspierane.</translation>
-    </message>
-    <message>
-        <source>Invalid payment request.</source>
-        <translation>Nieprawidłowe żądanie płatności</translation>
-    </message>
-    <message>
-        <source>Refund from %1</source>
-        <translation>Zwrot z %1</translation>
-    </message>
-    <message>
-        <source>Payment request %1 is too large (%2 bytes, allowed %3 bytes).</source>
-        <translation>Żądanie płatności %1 jest zbyt duże (%2 bajtów, dozwolone %3 bajtów).</translation>
-    </message>
-    <message>
-        <source>Error communicating with %1: %2</source>
-        <translation>Błąd komunikacji z %1 : %2</translation>
-    </message>
-    <message>
-        <source>Payment request cannot be parsed!</source>
-        <translation>Żądanie płatności nie może zostać przetworzone.</translation>
-    </message>
-    <message>
-        <source>Bad response from server %1</source>
-        <translation>Błędna odpowiedź z serwera %1</translation>
-    </message>
-    <message>
-        <source>Payment acknowledged</source>
-        <translation>Płatność potwierdzona</translation>
-    </message>
-    <message>
-        <source>Network request error</source>
-        <translation>Błąd żądania sieci</translation>
-    </message>
-</context>
-<context>
-    <name>PeerTableModel</name>
-    <message>
-        <source>User Agent</source>
-        <translation>Aplikacja kliencka</translation>
-    </message>
-    <message>
-        <source>Node/Service</source>
-        <translation>Węzeł/Usługi</translation>
-    </message>
-    <message>
-        <source>Ping Time</source>
-        <translation>Czas odpowiedzi</translation>
-    </message>
-</context>
-<context>
-    <name>QObject</name>
-    <message>
-        <source>Amount</source>
-        <translation>Kwota</translation>
-    </message>
-    <message>
-        <source>Enter a Bitcoin address (e.g. %1)</source>
-        <translation>Wprowadź adres bitcoinowy (np. %1)</translation>
-    </message>
-    <message>
-        <source>%1 d</source>
-        <translation>%1 d</translation>
-    </message>
-    <message>
-        <source>%1 h</source>
-        <translation>%1 h</translation>
-    </message>
-    <message>
-        <source>%1 m</source>
-        <translation>%1 m</translation>
-    </message>
-    <message>
-        <source>%1 s</source>
-        <translation>%1 s</translation>
-    </message>
-    <message>
-        <source>None</source>
-        <translation>Żaden</translation>
-    </message>
-    <message>
-        <source>N/A</source>
-        <translation>NIEDOSTĘPNE</translation>
+        <source>N/A</source>
+        <translation>NIEDOSTĘPNE</translation>
     </message>
     <message>
         <source>%1 ms</source>
         <translation>%1 ms</translation>
     </message>
 </context>
-<context>
-    <name>QRImageWidget</name>
-    <message>
-        <source>&amp;Save Image...</source>
-        <translation>&amp;Zapisz obraz...</translation>
-    </message>
-    <message>
-        <source>&amp;Copy Image</source>
-        <translation>&amp;Kopiuj obraz</translation>
-    </message>
-    <message>
-        <source>Save QR Code</source>
-        <translation>Zapisz kod QR</translation>
-    </message>
-    <message>
-        <source>PNG Image (*.png)</source>
-        <translation>Obraz PNG (*.png)</translation>
-    </message>
-</context>
 <context>
     <name>RPCConsole</name>
     <message>
@@ -1477,6 +1021,10 @@
         <source>Using BerkeleyDB version</source>
         <translation>Używana wersja BerkeleyDB </translation>
     </message>
+    <message>
+        <source>Datadir</source>
+        <translation>Katalog danych</translation>
+    </message>
     <message>
         <source>Startup time</source>
         <translation>Czas uruchomienia</translation>
@@ -1513,10 +1061,6 @@
         <source>Memory usage</source>
         <translation>Zużycie pamięci</translation>
     </message>
-    <message>
-        <source>Open the Bitcoin Core debug log file from the current data directory. This can take a few seconds for large log files.</source>
-        <translation>Otwórz plik logowania debugowania Bitcoin Core z obecnego katalogu z danymi. Może to potrwać kilka sekund przy większych plikach.</translation>
-    </message>
     <message>
         <source>Received</source>
         <translation>Otrzymane</translation>
@@ -1565,6 +1109,18 @@
         <source>User Agent</source>
         <translation>Aplikacja kliencka</translation>
     </message>
+    <message>
+        <source>Open the %1 debug log file from the current data directory. This can take a few seconds for large log files.</source>
+        <translation>Otwórz plik dziennika debugowania %1 z obecnego katalogu z danymi. Może to potrwać kilka sekund przy większych plikach.</translation>
+    </message>
+    <message>
+        <source>Decrease font size</source>
+        <translation>Zmniejsz rozmiar czcionki</translation>
+    </message>
+    <message>
+        <source>Increase font size</source>
+        <translation>Zwiększ rozmiar czcionki</translation>
+    </message>
     <message>
         <source>Services</source>
         <translation>Usługi</translation>
@@ -1629,10 +1185,6 @@
         <source>Out:</source>
         <translation>Wyjście:</translation>
     </message>
-    <message>
-        <source>Build date</source>
-        <translation>Data kompilacji</translation>
-    </message>
     <message>
         <source>Debug log file</source>
         <translation>Plik logowania debugowania</translation>
@@ -1670,8 +1222,8 @@
         <translation>Odblokuj węzeł</translation>
     </message>
     <message>
-        <source>Welcome to the Bitcoin Core RPC console.</source>
-        <translation>Witaj w konsoli Bitcoin Core RPC.</translation>
+        <source>Welcome to the %1 RPC console.</source>
+        <translation>Witaj w konsoli %1 RPC.</translation>
     </message>
     <message>
         <source>Use up and down arrows to navigate history, and &lt;b&gt;Ctrl-L&lt;/b&gt; to clear screen.</source>
@@ -1800,18 +1352,6 @@
         <source>Remove</source>
         <translation>Usuń</translation>
     </message>
-    <message>
-        <source>Copy label</source>
-        <translation>Kopiuj etykietę</translation>
-    </message>
-    <message>
-        <source>Copy message</source>
-        <translation>Kopiuj wiadomość</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>Kopiuj kwotę</translation>
-    </message>
 </context>
 <context>
     <name>ReceiveRequestDialog</name>
@@ -1831,73 +1371,6 @@
         <source>&amp;Save Image...</source>
         <translation>&amp;Zapisz obraz...</translation>
     </message>
-    <message>
-        <source>Request payment to %1</source>
-        <translation>Zażądaj płatności do %1</translation>
-    </message>
-    <message>
-        <source>Payment information</source>
-        <translation>Informacje o płatności</translation>
-    </message>
-    <message>
-        <source>URI</source>
-        <translation>URI</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>Adres</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>Kwota</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Etykieta</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>Wiadomość</translation>
-    </message>
-    <message>
-        <source>Resulting URI too long, try to reduce the text for label / message.</source>
-        <translation>Wynikowy URI jest zbyt długi, spróbuj zmniejszyć tekst etykiety / wiadomości</translation>
-    </message>
-    <message>
-        <source>Error encoding URI into QR Code.</source>
-        <translation>Błąd kodowania URI w Kodzie QR.</translation>
-    </message>
-</context>
-<context>
-    <name>RecentRequestsTableModel</name>
-    <message>
-        <source>Date</source>
-        <translation>Data</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Etykieta</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>Wiadomość</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>Kwota</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(brak etykiety)</translation>
-    </message>
-    <message>
-        <source>(no message)</source>
-        <translation>(brak wiadomości)</translation>
-    </message>
-    <message>
-        <source>(no amount)</source>
-        <translation>(brak kwoty)</translation>
-    </message>
 </context>
 <context>
     <name>SendCoinsDialog</name>
@@ -2015,887 +1488,245 @@
     </message>
     <message>
         <source>fast</source>
-        <translation>szybko</translation>
-    </message>
-    <message>
-        <source>Send as zero-fee transaction if possible</source>
-        <translation>Wyślij bez opłaty jeżeli to możliwe</translation>
-    </message>
-    <message>
-        <source>(confirmation may take longer)</source>
-        <translation>(potwierdzenie może potrwać dłużej)</translation>
-    </message>
-    <message>
-        <source>Send to multiple recipients at once</source>
-        <translation>Wyślij do wielu odbiorców na raz</translation>
-    </message>
-    <message>
-        <source>Add &amp;Recipient</source>
-        <translation>Dodaj Odbio&amp;rcę</translation>
-    </message>
-    <message>
-        <source>Clear all fields of the form.</source>
-        <translation>Wyczyść wszystkie pola formularza.</translation>
-    </message>
-    <message>
-        <source>Dust:</source>
-        <translation>Pył:</translation>
-    </message>
-    <message>
-        <source>Clear &amp;All</source>
-        <translation>Wyczyść &amp;wszystko</translation>
-    </message>
-    <message>
-        <source>Balance:</source>
-        <translation>Saldo:</translation>
-    </message>
-    <message>
-        <source>Confirm the send action</source>
-        <translation>Potwierdź akcję wysyłania</translation>
-    </message>
-    <message>
-        <source>S&amp;end</source>
-        <translation>Wy&amp;syłka</translation>
-    </message>
-    <message>
-        <source>Confirm send coins</source>
-        <translation>Potwierdź wysyłanie monet</translation>
-    </message>
-    <message>
-        <source>%1 to %2</source>
-        <translation>%1 do %2</translation>
-    </message>
-    <message>
-        <source>Copy quantity</source>
-        <translation>Skopiuj ilość</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>Kopiuj kwotę</translation>
-    </message>
-    <message>
-        <source>Copy fee</source>
-        <translation>Skopiuj opłatę</translation>
-    </message>
-    <message>
-        <source>Copy after fee</source>
-        <translation>Skopiuj ilość po opłacie</translation>
-    </message>
-    <message>
-        <source>Copy bytes</source>
-        <translation>Skopiuj ilość bajtów</translation>
-    </message>
-    <message>
-        <source>Copy priority</source>
-        <translation>Skopiuj priorytet</translation>
-    </message>
-    <message>
-        <source>Copy change</source>
-        <translation>Skopiuj resztę</translation>
-    </message>
-    <message>
-        <source>Total Amount %1</source>
-        <translation>Łączna kwota %1</translation>
-    </message>
-    <message>
-        <source>or</source>
-        <translation>lub</translation>
-    </message>
-    <message>
-        <source>The amount to pay must be larger than 0.</source>
-        <translation>Kwota do zapłacenia musi być większa od 0.</translation>
-    </message>
-    <message>
-        <source>The amount exceeds your balance.</source>
-        <translation>Kwota przekracza twoje saldo.</translation>
-    </message>
-    <message>
-        <source>The total exceeds your balance when the %1 transaction fee is included.</source>
-        <translation>Suma przekracza twoje saldo, gdy doliczymy %1 prowizji transakcyjnej.</translation>
-    </message>
-    <message>
-        <source>Transaction creation failed!</source>
-        <translation>Utworzenie transakcji nie powiodło się!</translation>
-    </message>
-    <message>
-        <source>The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source>
-        <translation>Transakcja została odrzucona! Może się to zdarzyć jeśli część monet z portfela została już wydana używając kopii pliku wallet.dat i nie zostało to tutaj uwzględnione.</translation>
-    </message>
-    <message>
-        <source>A fee higher than %1 is considered an absurdly high fee.</source>
-        <translation>Opłata wyższa niż %1 jest uważana za szalenie wysoką.</translation>
-    </message>
-    <message>
-        <source>Payment request expired.</source>
-        <translation>Żądanie płatności upłynęło.</translation>
-    </message>
-    <message>
-        <source>Pay only the required fee of %1</source>
-        <translation>Zapłać tylko wymaganą opłatę %1</translation>
-    </message>
-    <message numerus="yes">
-        <source>Estimated to begin confirmation within %n block(s).</source>
-        <translation><numerusform>Przybliżony czas zatwierdzenia: %n bloków.</numerusform><numerusform>Przybliżony czas zatwierdzenia: %n bloków.</numerusform><numerusform>Przybliżony czas zatwierdzenia: %n bloków.</numerusform></translation>
-    </message>
-    <message>
-        <source>The recipient address is not valid. Please recheck.</source>
-        <translation>Adres odbiorcy jest nieprawidłowy, proszę sprawić ponownie.</translation>
-    </message>
-    <message>
-        <source>Duplicate address found: addresses should only be used once each.</source>
-        <translation>Znaleziono powtórzony adres, można wysłać tylko raz na każdy adres podczas jednej operacji wysyłania.</translation>
-    </message>
-    <message>
-        <source>Warning: Invalid Bitcoin address</source>
-        <translation>Ostrzeżenie: nieprawidłowy adres Bitcoin</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(brak etykiety)</translation>
-    </message>
-    <message>
-        <source>Warning: Unknown change address</source>
-        <translation>Ostrzeżenie: Nieznany adres reszty</translation>
-    </message>
-    <message>
-        <source>Copy dust</source>
-        <translation>Kopiuj kurz</translation>
-    </message>
-    <message>
-        <source>Are you sure you want to send?</source>
-        <translation>Czy na pewno chcesz wysłać?</translation>
-    </message>
-    <message>
-        <source>added as transaction fee</source>
-        <translation>dodano jako opłata transakcyjna</translation>
-    </message>
-</context>
-<context>
-    <name>SendCoinsEntry</name>
-    <message>
-        <source>A&amp;mount:</source>
-        <translation>Su&amp;ma:</translation>
-    </message>
-    <message>
-        <source>Pay &amp;To:</source>
-        <translation>Zapłać &amp;dla:</translation>
-    </message>
-    <message>
-        <source>Enter a label for this address to add it to your address book</source>
-        <translation>Wprowadź etykietę dla tego adresu by dodać go do książki adresowej</translation>
-    </message>
-    <message>
-        <source>&amp;Label:</source>
-        <translation>&amp;Etykieta:</translation>
-    </message>
-    <message>
-        <source>Choose previously used address</source>
-        <translation>Wybierz wcześniej użyty adres</translation>
-    </message>
-    <message>
-        <source>This is a normal payment.</source>
-        <translation>To jest standardowa płatność</translation>
-    </message>
-    <message>
-        <source>The Bitcoin address to send the payment to</source>
-        <translation>Adres Bitcoin gdzie wysłać płatność</translation>
-    </message>
-    <message>
-        <source>Alt+A</source>
-        <translation>Alt+A</translation>
-    </message>
-    <message>
-        <source>Paste address from clipboard</source>
-        <translation>Wklej adres ze schowka</translation>
-    </message>
-    <message>
-        <source>Alt+P</source>
-        <translation>Alt+P</translation>
-    </message>
-    <message>
-        <source>Remove this entry</source>
-        <translation>Usuń ten wpis</translation>
-    </message>
-    <message>
-        <source>The fee will be deducted from the amount being sent. The recipient will receive less bitcoins than you enter in the amount field. If multiple recipients are selected, the fee is split equally.</source>
-        <translation>Opłata zostanie odjęta od kwoty wysyłane.Odbiorca otrzyma mniej niż bitcoins wpisz w polu kwoty. Jeśli wybrano kilku odbiorców, opłata jest podzielona równo.</translation>
-    </message>
-    <message>
-        <source>S&amp;ubtract fee from amount</source>
-        <translation>Odejmij od wysokości opłaty</translation>
-    </message>
-    <message>
-        <source>Message:</source>
-        <translation>Wiadomość:</translation>
-    </message>
-    <message>
-        <source>This is an unauthenticated payment request.</source>
-        <translation>To żądanie zapłaty nie zostało zweryfikowane.</translation>
-    </message>
-    <message>
-        <source>This is an authenticated payment request.</source>
-        <translation>To żądanie zapłaty jest zweryfikowane.</translation>
-    </message>
-    <message>
-        <source>Enter a label for this address to add it to the list of used addresses</source>
-        <translation>Wprowadź etykietę dla tego adresu by dodać go do listy użytych adresów</translation>
-    </message>
-    <message>
-        <source>A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
-        <translation>Wiadomość, która została dołączona do URI bitcoin:, która będzie przechowywana wraz z transakcją w celach informacyjnych. Uwaga: Ta wiadomość nie będzie rozsyłana w sieci Bitcoin.</translation>
-    </message>
-    <message>
-        <source>Pay To:</source>
-        <translation>Wpłać do:</translation>
-    </message>
-    <message>
-        <source>Memo:</source>
-        <translation>Notatka:</translation>
-    </message>
-</context>
-<context>
-    <name>ShutdownWindow</name>
-    <message>
-        <source>Bitcoin Core is shutting down...</source>
-        <translation>Bitcoin Core się zamyka...</translation>
-    </message>
-    <message>
-        <source>Do not shut down the computer until this window disappears.</source>
-        <translation>Nie wyłączaj komputera dopóki to okno nie zniknie.</translation>
-    </message>
-</context>
-<context>
-    <name>SignVerifyMessageDialog</name>
-    <message>
-        <source>Signatures - Sign / Verify a Message</source>
-        <translation>Podpisy - Podpisz / zweryfikuj wiadomość</translation>
-    </message>
-    <message>
-        <source>&amp;Sign Message</source>
-        <translation>Podpi&amp;sz Wiadomość</translation>
-    </message>
-    <message>
-        <source>You can sign messages/agreements with your addresses to prove you can receive bitcoins sent to them. Be careful not to sign anything vague or random, as phishing attacks may try to trick you into signing your identity over to them. Only sign fully-detailed statements you agree to.</source>
-        <translation>Możesz podpisywać wiadomości swoimi adresami aby udowodnić, że jesteś ich właścicielem. Uważaj, aby nie podpisywać niczego co wzbudza Twoje podejrzenia, ponieważ ktoś może stosować phishing próbując nakłonić Cię do ich podpisania. Akceptuj i podpisuj tylko w pełni zrozumiałe komunikaty i wiadomości.</translation>
-    </message>
-    <message>
-        <source>The Bitcoin address to sign the message with</source>
-        <translation>Adres Bitcoin, za pomocą którego podpisać wiadomość</translation>
-    </message>
-    <message>
-        <source>Choose previously used address</source>
-        <translation>Wybierz wcześniej użyty adres</translation>
-    </message>
-    <message>
-        <source>Alt+A</source>
-        <translation>Alt+A</translation>
-    </message>
-    <message>
-        <source>Paste address from clipboard</source>
-        <translation>Wklej adres ze schowka</translation>
-    </message>
-    <message>
-        <source>Alt+P</source>
-        <translation>Alt+P</translation>
-    </message>
-    <message>
-        <source>Enter the message you want to sign here</source>
-        <translation>Tutaj wprowadź wiadomość, którą chcesz podpisać</translation>
-    </message>
-    <message>
-        <source>Signature</source>
-        <translation>Podpis</translation>
-    </message>
-    <message>
-        <source>Copy the current signature to the system clipboard</source>
-        <translation>Kopiuje aktualny podpis do schowka systemowego</translation>
-    </message>
-    <message>
-        <source>Sign the message to prove you own this Bitcoin address</source>
-        <translation>Podpisz wiadomość aby dowieść, że ten adres jest twój</translation>
-    </message>
-    <message>
-        <source>Sign &amp;Message</source>
-        <translation>Podpisz Wiado&amp;mość</translation>
-    </message>
-    <message>
-        <source>Reset all sign message fields</source>
-        <translation>Zresetuj wszystkie pola podpisanej wiadomości</translation>
-    </message>
-    <message>
-        <source>Clear &amp;All</source>
-        <translation>Wyczyść &amp;wszystko</translation>
-    </message>
-    <message>
-        <source>&amp;Verify Message</source>
-        <translation>&amp;Zweryfikuj wiadomość</translation>
-    </message>
-    <message>
-        <source>Enter the receiver's address, message (ensure you copy line breaks, spaces, tabs, etc. exactly) and signature below to verify the message. Be careful not to read more into the signature than what is in the signed message itself, to avoid being tricked by a man-in-the-middle attack. Note that this only proves the signing party receives with the address, it cannot prove sendership of any transaction!</source>
-        <translation>Wpisz adres, wiadomość oraz sygnaturę (podpis) odbiorcy (upewnij się, że dokładnie skopiujesz wszystkie zakończenia linii, spacje, tabulacje itp.).  Uważaj by nie dodać więcej do podpisu niż do samej podpisywanej wiadomości by uniknąć ataku man-in-the-middle. 
-Zwróć uwagę, że poprawnie zweryfikowana wiadomość potwierdza to, że nadawca posiada klucz do adresu, natomiast nie potwierdza to, że poprawne wysłanie jakiejkolwiek transakcji! </translation>
-    </message>
-    <message>
-        <source>The Bitcoin address the message was signed with</source>
-        <translation>Adres Bitcoin, którym została podpisana wiadomość</translation>
-    </message>
-    <message>
-        <source>Verify the message to ensure it was signed with the specified Bitcoin address</source>
-        <translation>Zweryfikuj wiadomość,  aby upewnić się, że została podpisana odpowiednim adresem Bitcoin.</translation>
-    </message>
-    <message>
-        <source>Verify &amp;Message</source>
-        <translation>Zweryfikuj Wiado&amp;mość</translation>
-    </message>
-    <message>
-        <source>Reset all verify message fields</source>
-        <translation>Resetuje wszystkie pola weryfikacji wiadomości</translation>
-    </message>
-    <message>
-        <source>Click "Sign Message" to generate signature</source>
-        <translation>Kliknij "Podpisz Wiadomość" żeby uzyskać podpis</translation>
-    </message>
-    <message>
-        <source>The entered address is invalid.</source>
-        <translation>Podany adres jest nieprawidłowy.</translation>
-    </message>
-    <message>
-        <source>Please check the address and try again.</source>
-        <translation>Proszę sprawdzić adres i spróbować ponownie.</translation>
-    </message>
-    <message>
-        <source>The entered address does not refer to a key.</source>
-        <translation>Wprowadzony adres nie odnosi się do klucza.</translation>
-    </message>
-    <message>
-        <source>Wallet unlock was cancelled.</source>
-        <translation>Odblokowanie portfela zostało anulowane.</translation>
-    </message>
-    <message>
-        <source>Private key for the entered address is not available.</source>
-        <translation>Klucz prywatny dla podanego adresu nie jest dostępny.</translation>
-    </message>
-    <message>
-        <source>Message signing failed.</source>
-        <translation>Podpisanie wiadomości nie powiodło się.</translation>
-    </message>
-    <message>
-        <source>Message signed.</source>
-        <translation>Wiadomość podpisana.</translation>
-    </message>
-    <message>
-        <source>The signature could not be decoded.</source>
-        <translation>Podpis nie może zostać zdekodowany.</translation>
-    </message>
-    <message>
-        <source>Please check the signature and try again.</source>
-        <translation>Sprawdź podpis i spróbuj ponownie.</translation>
-    </message>
-    <message>
-        <source>The signature did not match the message digest.</source>
-        <translation>Podpis nie odpowiada skrótowi wiadomości.</translation>
-    </message>
-    <message>
-        <source>Message verification failed.</source>
-        <translation>Weryfikacja wiadomości nie powiodła się.</translation>
-    </message>
-    <message>
-        <source>Message verified.</source>
-        <translation>Wiadomość zweryfikowana.</translation>
-    </message>
-</context>
-<context>
-    <name>SplashScreen</name>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Rdzeń Bitcoina</translation>
-    </message>
-    <message>
-        <source>The Bitcoin Core developers</source>
-        <translation>Deweloperzy Bitcoin Core</translation>
-    </message>
-    <message>
-        <source>[testnet]</source>
-        <translation>[testnet]</translation>
-    </message>
-</context>
-<context>
-    <name>TrafficGraphWidget</name>
-    <message>
-        <source>KB/s</source>
-        <translation>KB/s</translation>
-    </message>
-</context>
-<context>
-    <name>TransactionDesc</name>
-    <message>
-        <source>Open until %1</source>
-        <translation>Otwórz do %1</translation>
-    </message>
-    <message>
-        <source>conflicted</source>
-        <translation>konflikt</translation>
-    </message>
-    <message>
-        <source>%1/offline</source>
-        <translation>%1/offline</translation>
-    </message>
-    <message>
-        <source>%1/unconfirmed</source>
-        <translation>%1/niezatwierdzone</translation>
-    </message>
-    <message>
-        <source>%1 confirmations</source>
-        <translation>%1 potwierdzeń</translation>
-    </message>
-    <message>
-        <source>Status</source>
-        <translation>Status</translation>
-    </message>
-    <message numerus="yes">
-        <source>, broadcast through %n node(s)</source>
-        <translation><numerusform>, przekazywany przez %n węzłów</numerusform><numerusform>, przekazywany przez %n węzłów</numerusform><numerusform>, przekazywany przez %n węzłów</numerusform></translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation>Data</translation>
-    </message>
-    <message>
-        <source>Source</source>
-        <translation>Źródło</translation>
-    </message>
-    <message>
-        <source>Generated</source>
-        <translation>Wygenerowano</translation>
-    </message>
-    <message>
-        <source>From</source>
-        <translation>Od</translation>
-    </message>
-    <message>
-        <source>To</source>
-        <translation>Do</translation>
-    </message>
-    <message>
-        <source>own address</source>
-        <translation>własny adres</translation>
-    </message>
-    <message>
-        <source>watch-only</source>
-        <translation>tylko-obserwowany</translation>
-    </message>
-    <message>
-        <source>label</source>
-        <translation>etykieta</translation>
-    </message>
-    <message>
-        <source>Credit</source>
-        <translation>Przypisy</translation>
-    </message>
-    <message numerus="yes">
-        <source>matures in %n more block(s)</source>
-        <translation><numerusform>potwierdzona przy %n blokach więcej</numerusform><numerusform>potwierdzona przy %n blokach więcej</numerusform><numerusform>potwierdzona przy %n blokach więcej</numerusform></translation>
-    </message>
-    <message>
-        <source>not accepted</source>
-        <translation>niezaakceptowane</translation>
-    </message>
-    <message>
-        <source>Debit</source>
-        <translation>Debet</translation>
-    </message>
-    <message>
-        <source>Total debit</source>
-        <translation>Razem wychodzących</translation>
-    </message>
-    <message>
-        <source>Total credit</source>
-        <translation>Razem przychodzących</translation>
-    </message>
-    <message>
-        <source>Transaction fee</source>
-        <translation>Opłata transakcyjna</translation>
-    </message>
-    <message>
-        <source>Net amount</source>
-        <translation>Kwota netto</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>Wiadomość</translation>
-    </message>
-    <message>
-        <source>Comment</source>
-        <translation>Komentarz</translation>
-    </message>
-    <message>
-        <source>Transaction ID</source>
-        <translation>ID transakcji</translation>
-    </message>
-    <message>
-        <source>Merchant</source>
-        <translation>Kupiec</translation>
-    </message>
-    <message>
-        <source>Generated coins must mature %1 blocks before they can be spent. When you generated this block, it was broadcast to the network to be added to the block chain. If it fails to get into the chain, its state will change to "not accepted" and it won't be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source>
-        <translation>Wygenerowane monety muszą dojrzeć przez %1 bloków zanim będzie można je wydać. Gdy wygenerowałeś ten blok został on ogłoszony w sieci i dodany do łańcucha bloków. Jeżeli nie uda mu się wejść do łańcucha jego status zostanie zmieniony na "nie zaakceptowano" i nie będzie można go wydać. To czasem zdarza się gdy inny węzeł wygeneruje blok w kilka sekund od twojego.</translation>
-    </message>
-    <message>
-        <source>Debug information</source>
-        <translation>Informacje debugowania</translation>
-    </message>
-    <message>
-        <source>Transaction</source>
-        <translation>Transakcja</translation>
-    </message>
-    <message>
-        <source>Inputs</source>
-        <translation>Wejścia</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>Kwota</translation>
-    </message>
-    <message>
-        <source>true</source>
-        <translation>prawda</translation>
-    </message>
-    <message>
-        <source>false</source>
-        <translation>fałsz</translation>
-    </message>
-    <message>
-        <source>, has not been successfully broadcast yet</source>
-        <translation>, nie został jeszcze pomyślnie rozesłany</translation>
-    </message>
-    <message numerus="yes">
-        <source>Open for %n more block(s)</source>
-        <translation><numerusform>Otwórz dla %n następnych bloków</numerusform><numerusform>Otwórz dla %n następnych bloków</numerusform><numerusform>Otwórz dla %n następnych bloków</numerusform></translation>
-    </message>
-    <message>
-        <source>unknown</source>
-        <translation>nieznany</translation>
-    </message>
-</context>
-<context>
-    <name>TransactionDescDialog</name>
-    <message>
-        <source>Transaction details</source>
-        <translation>Szczegóły transakcji</translation>
-    </message>
-    <message>
-        <source>This pane shows a detailed description of the transaction</source>
-        <translation>Ten panel pokazuje szczegółowy opis transakcji</translation>
-    </message>
-</context>
-<context>
-    <name>TransactionTableModel</name>
-    <message>
-        <source>Date</source>
-        <translation>Data</translation>
-    </message>
-    <message>
-        <source>Type</source>
-        <translation>Typ</translation>
-    </message>
-    <message>
-        <source>Immature (%1 confirmations, will be available after %2)</source>
-        <translation>Niedojrzała (%1 potwierdzeń, będzie dostępna po %2)</translation>
-    </message>
-    <message numerus="yes">
-        <source>Open for %n more block(s)</source>
-        <translation><numerusform>Otwórz dla %n następnych bloków</numerusform><numerusform>Otwórz dla %n następnych bloków</numerusform><numerusform>Otwórz dla %n następnych bloków</numerusform></translation>
-    </message>
-    <message>
-        <source>Open until %1</source>
-        <translation>Otwórz do %1</translation>
-    </message>
-    <message>
-        <source>Confirmed (%1 confirmations)</source>
-        <translation>Zatwierdzony (%1 potwierdzeń)</translation>
-    </message>
-    <message>
-        <source>This block was not received by any other nodes and will probably not be accepted!</source>
-        <translation>Ten blok nie został odebrany przez jakikolwiek inny węzeł i prawdopodobnie nie zostanie zaakceptowany!</translation>
-    </message>
-    <message>
-        <source>Generated but not accepted</source>
-        <translation>Wygenerowano ale nie zaakceptowano</translation>
-    </message>
-    <message>
-        <source>Offline</source>
-        <translation>Offline</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Etykieta</translation>
-    </message>
-    <message>
-        <source>Unconfirmed</source>
-        <translation>Niepotwierdzone:</translation>
-    </message>
-    <message>
-        <source>Confirming (%1 of %2 recommended confirmations)</source>
-        <translation>Potwierdzanie (%1 z %2 rekomendowanych potwierdzeń)</translation>
+        <translation>szybko</translation>
     </message>
     <message>
-        <source>Conflicted</source>
-        <translation>Konflikt</translation>
+        <source>Send to multiple recipients at once</source>
+        <translation>Wyślij do wielu odbiorców na raz</translation>
     </message>
     <message>
-        <source>Received with</source>
-        <translation>Otrzymane przez</translation>
+        <source>Add &amp;Recipient</source>
+        <translation>Dodaj Odbio&amp;rcę</translation>
     </message>
     <message>
-        <source>Received from</source>
-        <translation>Odebrano od</translation>
+        <source>Clear all fields of the form.</source>
+        <translation>Wyczyść wszystkie pola formularza.</translation>
     </message>
     <message>
-        <source>Sent to</source>
-        <translation>Wysłano do</translation>
+        <source>Dust:</source>
+        <translation>Pył:</translation>
     </message>
     <message>
-        <source>Payment to yourself</source>
-        <translation>Płatność do siebie</translation>
+        <source>Clear &amp;All</source>
+        <translation>Wyczyść &amp;wszystko</translation>
     </message>
     <message>
-        <source>Mined</source>
-        <translation>Wydobyto</translation>
+        <source>Balance:</source>
+        <translation>Saldo:</translation>
     </message>
     <message>
-        <source>watch-only</source>
-        <translation>tylko-obserwowany</translation>
+        <source>Confirm the send action</source>
+        <translation>Potwierdź akcję wysyłania</translation>
     </message>
     <message>
-        <source>(n/a)</source>
-        <translation>(brak)</translation>
+        <source>S&amp;end</source>
+        <translation>Wy&amp;syłka</translation>
     </message>
+</context>
+<context>
+    <name>SendCoinsEntry</name>
     <message>
-        <source>Transaction status. Hover over this field to show number of confirmations.</source>
-        <translation>Status transakcji. Najedź na pole, aby zobaczyć liczbę potwierdzeń.</translation>
+        <source>A&amp;mount:</source>
+        <translation>Su&amp;ma:</translation>
     </message>
     <message>
-        <source>Date and time that the transaction was received.</source>
-        <translation>Data i czas odebrania transakcji.</translation>
+        <source>Pay &amp;To:</source>
+        <translation>Zapłać &amp;dla:</translation>
     </message>
     <message>
-        <source>Type of transaction.</source>
-        <translation>Rodzaj transakcji.</translation>
+        <source>&amp;Label:</source>
+        <translation>&amp;Etykieta:</translation>
     </message>
     <message>
-        <source>Whether or not a watch-only address is involved in this transaction.</source>
-        <translation>Czy adres tylko-obserwowany jest lub nie użyty w tej transakcji.</translation>
+        <source>Choose previously used address</source>
+        <translation>Wybierz wcześniej użyty adres</translation>
     </message>
     <message>
-        <source>User-defined intent/purpose of the transaction.</source>
-        <translation>Zdefiniowana przez użytkownika intencja/cel transakcji.</translation>
+        <source>This is a normal payment.</source>
+        <translation>To jest standardowa płatność</translation>
     </message>
     <message>
-        <source>Amount removed from or added to balance.</source>
-        <translation>Kwota usunięta z lub dodana do konta.</translation>
+        <source>The Bitcoin address to send the payment to</source>
+        <translation>Adres Bitcoin gdzie wysłać płatność</translation>
     </message>
-</context>
-<context>
-    <name>TransactionView</name>
     <message>
-        <source>All</source>
-        <translation>Wszystko</translation>
+        <source>Alt+A</source>
+        <translation>Alt+A</translation>
     </message>
     <message>
-        <source>Today</source>
-        <translation>Dzisiaj</translation>
+        <source>Paste address from clipboard</source>
+        <translation>Wklej adres ze schowka</translation>
     </message>
     <message>
-        <source>This week</source>
-        <translation>W tym tygodniu</translation>
+        <source>Alt+P</source>
+        <translation>Alt+P</translation>
     </message>
     <message>
-        <source>This month</source>
-        <translation>W tym miesiącu</translation>
+        <source>Remove this entry</source>
+        <translation>Usuń ten wpis</translation>
     </message>
     <message>
-        <source>Last month</source>
-        <translation>W zeszłym miesiącu</translation>
+        <source>The fee will be deducted from the amount being sent. The recipient will receive less bitcoins than you enter in the amount field. If multiple recipients are selected, the fee is split equally.</source>
+        <translation>Opłata zostanie odjęta od kwoty wysyłane.Odbiorca otrzyma mniej niż bitcoins wpisz w polu kwoty. Jeśli wybrano kilku odbiorców, opłata jest podzielona równo.</translation>
     </message>
     <message>
-        <source>This year</source>
-        <translation>W tym roku</translation>
+        <source>S&amp;ubtract fee from amount</source>
+        <translation>Odejmij od wysokości opłaty</translation>
     </message>
     <message>
-        <source>Range...</source>
-        <translation>Zakres...</translation>
+        <source>Message:</source>
+        <translation>Wiadomość:</translation>
     </message>
     <message>
-        <source>Received with</source>
-        <translation>Otrzymane przez</translation>
+        <source>This is an unauthenticated payment request.</source>
+        <translation>To żądanie zapłaty nie zostało zweryfikowane.</translation>
     </message>
     <message>
-        <source>Sent to</source>
-        <translation>Wysłano do</translation>
+        <source>This is an authenticated payment request.</source>
+        <translation>To żądanie zapłaty jest zweryfikowane.</translation>
     </message>
     <message>
-        <source>To yourself</source>
-        <translation>Do siebie</translation>
+        <source>Enter a label for this address to add it to the list of used addresses</source>
+        <translation>Wprowadź etykietę dla tego adresu by dodać go do listy użytych adresów</translation>
     </message>
     <message>
-        <source>Mined</source>
-        <translation>Wydobyto</translation>
+        <source>A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
+        <translation>Wiadomość, która została dołączona do URI bitcoin:, która będzie przechowywana wraz z transakcją w celach informacyjnych. Uwaga: Ta wiadomość nie będzie rozsyłana w sieci Bitcoin.</translation>
     </message>
     <message>
-        <source>Other</source>
-        <translation>Inne</translation>
+        <source>Pay To:</source>
+        <translation>Wpłać do:</translation>
     </message>
     <message>
-        <source>Enter address or label to search</source>
-        <translation>Wprowadź adres albo etykietę żeby wyszukać</translation>
+        <source>Memo:</source>
+        <translation>Notatka:</translation>
     </message>
+</context>
+<context>
+    <name>ShutdownWindow</name>
     <message>
-        <source>Min amount</source>
-        <translation>Min suma</translation>
+        <source>%1 is shutting down...</source>
+        <translation>%1 się zamyka...</translation>
     </message>
     <message>
-        <source>Copy address</source>
-        <translation>Kopiuj adres</translation>
+        <source>Do not shut down the computer until this window disappears.</source>
+        <translation>Nie wyłączaj komputera dopóki to okno nie zniknie.</translation>
     </message>
+</context>
+<context>
+    <name>SignVerifyMessageDialog</name>
     <message>
-        <source>Copy label</source>
-        <translation>Kopiuj etykietę</translation>
+        <source>Signatures - Sign / Verify a Message</source>
+        <translation>Podpisy - Podpisz / zweryfikuj wiadomość</translation>
     </message>
     <message>
-        <source>Copy amount</source>
-        <translation>Kopiuj kwotę</translation>
+        <source>&amp;Sign Message</source>
+        <translation>Podpi&amp;sz Wiadomość</translation>
     </message>
     <message>
-        <source>Copy transaction ID</source>
-        <translation>Skopiuj ID transakcji</translation>
+        <source>You can sign messages/agreements with your addresses to prove you can receive bitcoins sent to them. Be careful not to sign anything vague or random, as phishing attacks may try to trick you into signing your identity over to them. Only sign fully-detailed statements you agree to.</source>
+        <translation>Możesz podpisywać wiadomości swoimi adresami aby udowodnić, że jesteś ich właścicielem. Uważaj, aby nie podpisywać niczego co wzbudza Twoje podejrzenia, ponieważ ktoś może stosować phishing próbując nakłonić Cię do ich podpisania. Akceptuj i podpisuj tylko w pełni zrozumiałe komunikaty i wiadomości.</translation>
     </message>
     <message>
-        <source>Copy raw transaction</source>
-        <translation>Skopiuj surowe dane transakcji</translation>
+        <source>The Bitcoin address to sign the message with</source>
+        <translation>Adres Bitcoin, za pomocą którego podpisać wiadomość</translation>
     </message>
     <message>
-        <source>Edit label</source>
-        <translation>Zmień etykietę</translation>
+        <source>Choose previously used address</source>
+        <translation>Wybierz wcześniej użyty adres</translation>
     </message>
     <message>
-        <source>Show transaction details</source>
-        <translation>Pokaż szczegóły transakcji</translation>
+        <source>Alt+A</source>
+        <translation>Alt+A</translation>
     </message>
     <message>
-        <source>Export Transaction History</source>
-        <translation>Eksport historii transakcji</translation>
+        <source>Paste address from clipboard</source>
+        <translation>Wklej adres ze schowka</translation>
     </message>
     <message>
-        <source>Watch-only</source>
-        <translation>Tylko obserwowany</translation>
+        <source>Alt+P</source>
+        <translation>Alt+P</translation>
     </message>
     <message>
-        <source>Exporting Failed</source>
-        <translation>Błąd przy próbie eksportu</translation>
+        <source>Enter the message you want to sign here</source>
+        <translation>Tutaj wprowadź wiadomość, którą chcesz podpisać</translation>
     </message>
     <message>
-        <source>There was an error trying to save the transaction history to %1.</source>
-        <translation>Wystąpił błąd przy próbie zapisu historii transakcji do %1.</translation>
+        <source>Signature</source>
+        <translation>Podpis</translation>
     </message>
     <message>
-        <source>Exporting Successful</source>
-        <translation>Eksport powiódł się</translation>
+        <source>Copy the current signature to the system clipboard</source>
+        <translation>Kopiuje aktualny podpis do schowka systemowego</translation>
     </message>
     <message>
-        <source>The transaction history was successfully saved to %1.</source>
-        <translation>Historia transakcji została zapisana do %1.</translation>
+        <source>Sign the message to prove you own this Bitcoin address</source>
+        <translation>Podpisz wiadomość aby dowieść, że ten adres jest twój</translation>
     </message>
     <message>
-        <source>Comma separated file (*.csv)</source>
-        <translation>CSV (rozdzielany przecinkami)</translation>
+        <source>Sign &amp;Message</source>
+        <translation>Podpisz Wiado&amp;mość</translation>
     </message>
     <message>
-        <source>Confirmed</source>
-        <translation>Potwierdzony</translation>
+        <source>Reset all sign message fields</source>
+        <translation>Zresetuj wszystkie pola podpisanej wiadomości</translation>
     </message>
     <message>
-        <source>Date</source>
-        <translation>Data</translation>
+        <source>Clear &amp;All</source>
+        <translation>Wyczyść &amp;wszystko</translation>
     </message>
     <message>
-        <source>Type</source>
-        <translation>Typ</translation>
+        <source>&amp;Verify Message</source>
+        <translation>&amp;Zweryfikuj wiadomość</translation>
     </message>
     <message>
-        <source>Label</source>
-        <translation>Etykieta</translation>
+        <source>Enter the receiver's address, message (ensure you copy line breaks, spaces, tabs, etc. exactly) and signature below to verify the message. Be careful not to read more into the signature than what is in the signed message itself, to avoid being tricked by a man-in-the-middle attack. Note that this only proves the signing party receives with the address, it cannot prove sendership of any transaction!</source>
+        <translation>Wpisz adres, wiadomość oraz sygnaturę (podpis) odbiorcy (upewnij się, że dokładnie skopiujesz wszystkie zakończenia linii, spacje, tabulacje itp.).  Uważaj by nie dodać więcej do podpisu niż do samej podpisywanej wiadomości by uniknąć ataku man-in-the-middle. 
+Zwróć uwagę, że poprawnie zweryfikowana wiadomość potwierdza to, że nadawca posiada klucz do adresu, natomiast nie potwierdza to, że poprawne wysłanie jakiejkolwiek transakcji! </translation>
     </message>
     <message>
-        <source>Address</source>
-        <translation>Adres</translation>
+        <source>The Bitcoin address the message was signed with</source>
+        <translation>Adres Bitcoin, którym została podpisana wiadomość</translation>
     </message>
     <message>
-        <source>ID</source>
-        <translation>ID</translation>
+        <source>Verify the message to ensure it was signed with the specified Bitcoin address</source>
+        <translation>Zweryfikuj wiadomość,  aby upewnić się, że została podpisana odpowiednim adresem Bitcoin.</translation>
     </message>
     <message>
-        <source>Range:</source>
-        <translation>Zakres:</translation>
+        <source>Verify &amp;Message</source>
+        <translation>Zweryfikuj Wiado&amp;mość</translation>
     </message>
     <message>
-        <source>to</source>
-        <translation>do</translation>
+        <source>Reset all verify message fields</source>
+        <translation>Resetuje wszystkie pola weryfikacji wiadomości</translation>
     </message>
 </context>
 <context>
-    <name>UnitDisplayStatusBarControl</name>
+    <name>SplashScreen</name>
     <message>
-        <source>Unit to show amounts in. Click to select another unit.</source>
-        <translation>Jednostka w jakiej pokazywane są kwoty. Kliknij aby wybrać inną.</translation>
+        <source>[testnet]</source>
+        <translation>[testnet]</translation>
     </message>
 </context>
 <context>
-    <name>WalletFrame</name>
+    <name>TrafficGraphWidget</name>
     <message>
-        <source>No wallet has been loaded.</source>
-        <translation>Nie załadowano żadnego portfela.</translation>
+        <source>KB/s</source>
+        <translation>KB/s</translation>
     </message>
 </context>
 <context>
-    <name>WalletModel</name>
+    <name>TransactionDescDialog</name>
     <message>
-        <source>Send Coins</source>
-        <translation>Wyślij monety</translation>
+        <source>This pane shows a detailed description of the transaction</source>
+        <translation>Ten panel pokazuje szczegółowy opis transakcji</translation>
     </message>
 </context>
 <context>
-    <name>WalletView</name>
-    <message>
-        <source>&amp;Export</source>
-        <translation>&amp;Eksportuj</translation>
-    </message>
-    <message>
-        <source>Export the data in the current tab to a file</source>
-        <translation>Eksportuj dane z aktywnej karty do pliku</translation>
-    </message>
-    <message>
-        <source>Backup Wallet</source>
-        <translation>Kopia zapasowa portfela</translation>
-    </message>
-    <message>
-        <source>Wallet Data (*.dat)</source>
-        <translation>Dane portfela (*.dat)</translation>
-    </message>
-    <message>
-        <source>Backup Failed</source>
-        <translation>Nie udało się wykonać kopii zapasowej</translation>
-    </message>
-    <message>
-        <source>There was an error trying to save the wallet data to %1.</source>
-        <translation>Wystąpił błąd przy próbie zapisu pliku portfela do %1.</translation>
-    </message>
-    <message>
-        <source>The wallet data was successfully saved to %1.</source>
-        <translation>Plik portfela został zapisany do %1.</translation>
-    </message>
+    <name>UnitDisplayStatusBarControl</name>
     <message>
-        <source>Backup Successful</source>
-        <translation>Wykonano kopię zapasową</translation>
+        <source>Unit to show amounts in. Click to select another unit.</source>
+        <translation>Jednostka w jakiej pokazywane są kwoty. Kliknij aby wybrać inną.</translation>
     </message>
 </context>
 <context>
@@ -2924,10 +1755,6 @@ Zwróć uwagę, że poprawnie zweryfikowana wiadomość potwierdza to, że nadaw
         <source>If &lt;category&gt; is not supplied or if &lt;category&gt; = 1, output all debugging information.</source>
         <translation>Jeżeli &lt;category&gt; nie zostanie określona lub &lt;category&gt; = 1, wyświetl wszystkie informacje debugowania.</translation>
     </message>
-    <message>
-        <source>Please check that your computer's date and time are correct! If your clock is wrong Bitcoin Core will not work properly.</source>
-        <translation>Proszę sprawdzić czy data i czas na Twoim komputerze są poprawne! Jeżeli ustawienia zegara będą złe, Bitcoin Core nie będzie działał prawidłowo.</translation>
-    </message>
     <message>
         <source>Prune configured below the minimum of %d MiB.  Please use a higher number.</source>
         <translation>Przycinanie skonfigurowano poniżej minimalnych %d MiB. Proszę użyć wyższej liczby.</translation>
@@ -2956,6 +1783,14 @@ Zwróć uwagę, że poprawnie zweryfikowana wiadomość potwierdza to, że nadaw
         <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
         <translation>Akceptuj połączenia z zewnątrz (domyślnie: 1 jeśli nie ustawiono -proxy lub -connect)</translation>
     </message>
+    <message>
+        <source>Bitcoin Core</source>
+        <translation>Rdzeń Bitcoina</translation>
+    </message>
+    <message>
+        <source>The %s developers</source>
+        <translation>Deweloperzy %s</translation>
+    </message>
     <message>
         <source>-fallbackfee is set very high! This is the transaction fee you may pay when fee estimates are not available.</source>
         <translation>-fallbackfee ma ustawioną bardzo dużą wartość!  Jest to prowizja za transakcje, którą możesz zapłacić gdy oszacowanie opłaty jest niemożliwe.</translation>
@@ -2964,6 +1799,10 @@ Zwróć uwagę, że poprawnie zweryfikowana wiadomość potwierdza to, że nadaw
         <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source>
         <translation>Skojarz z podanym adresem i nasłuchuj na nim. Użyj formatu [host]:port dla IPv6</translation>
     </message>
+    <message>
+        <source>Cannot obtain a lock on data directory %s. %s is probably already running.</source>
+        <translation>Nie można uzyskać blokady na katalogu z danymi %s. %s najprawdopodobniej jest już uruchomiony.</translation>
+    </message>
     <message>
         <source>Delete all wallet transactions and only recover those parts of the blockchain through -rescan on startup</source>
         <translation>Usuwa wszystkie transakcje w portfelu i tylko odtwarza te części z łańcucha bloków poprzez -rescan przy starcie</translation>
@@ -2972,6 +1811,10 @@ Zwróć uwagę, że poprawnie zweryfikowana wiadomość potwierdza to, że nadaw
         <source>Distributed under the MIT software license, see the accompanying file COPYING or &lt;http://www.opensource.org/licenses/mit-license.php&gt;.</source>
         <translation>Rozprowadzane na licencji MIT, zobacz dołączony plik COPYING lub &lt;http://www.opensource.org/licenses/mit-license.php&gt;.</translation>
     </message>
+    <message>
+        <source>Error reading %s! All keys read correctly, but transaction data or address book entries might be missing or incorrect.</source>
+        <translation>Błąd odczytu %s! Wszystkie klucze zostały odczytane poprawnie, ale może brakować  danych transakcji lub wpisów w książce adresowej, lub mogą one być nieprawidłowe.</translation>
+    </message>
     <message>
         <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source>
         <translation>Wykonaj polecenie, kiedy transakcja portfela ulegnie zmianie (%s w poleceniu zostanie zastąpione przez TxID)</translation>
@@ -2980,6 +1823,10 @@ Zwróć uwagę, że poprawnie zweryfikowana wiadomość potwierdza to, że nadaw
         <source>Force relay of transactions from whitelisted peers even they violate local relay policy (default: %d)</source>
         <translation>Wymuś przekazywanie transakcji od osób z białej listy, nawet jeśli narusza to lokalną politykę przekazywania (default: %d)</translation>
     </message>
+    <message>
+        <source>Please check that your computer's date and time are correct! If your clock is wrong, %s will not work properly.</source>
+        <translation>Proszę sprawdzić czy data i czas na Twoim komputerze są poprawne! Jeżeli ustawienia zegara będą złe, %s nie będzie działał prawidłowo.</translation>
+    </message>
     <message>
         <source>Set the number of script verification threads (%u to %d, 0 = auto, &lt;0 = leave that many cores free, default: %d)</source>
         <translation>Ustaw liczbę wątków skryptu weryfikacyjnego (%u do %d, 0 = auto, &lt;0 = zostaw tyle rdzeni wolnych, domyślnie: %d)</translation>
@@ -2988,17 +1835,9 @@ Zwróć uwagę, że poprawnie zweryfikowana wiadomość potwierdza to, że nadaw
         <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
         <translation>To jest testowa wersja - używaj na własne ryzyko - nie używaj do wykopywania oraz przy aplikacjach kupieckich</translation>
     </message>
-    <message>
-        <source>Unable to bind to %s on this computer. Bitcoin Core is probably already running.</source>
-        <translation>Nie można przywiązać z portem %s na tym komputerze. Bitcoin Core prawdopodobnie już działa.</translation>
-    </message>
-    <message>
-        <source>Unsupported argument -whitelistalwaysrelay ignored, use -whitelistrelay and/or -whitelistforcerelay.</source>
-        <translation>Niewspierany argument -whitelistalwaysrelay zignorowany, użyj -whitelistrelay i/lub -whitelistforcerelay.</translation>
-    </message>
     <message>
         <source>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</source>
-        <translation>Używaj UPnP do mapowania portu nasłuchu (domyślnie: 1 gdy nasłuchuje i brak -proxy)</translation>
+        <translation>Użyj UPnP do mapowania portu nasłuchu (domyślnie: 1 gdy nasłuchuje i brak -proxy)</translation>
     </message>
     <message>
         <source>WARNING: abnormally high number of blocks generated, %d blocks received in the last %d hours (%d expected)</source>
@@ -3016,14 +1855,18 @@ Zwróć uwagę, że poprawnie zweryfikowana wiadomość potwierdza to, że nadaw
         <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source>
         <translation>Uwaga: Wygląda na to, że nie ma pełnej zgodności z naszymi peerami! Możliwe, że potrzebujesz aktualizacji bądź inne węzły jej potrzebują</translation>
     </message>
-    <message>
-        <source>Warning: wallet.dat corrupt, data salvaged! Original wallet.dat saved as wallet.{timestamp}.bak in %s; if your balance or transactions are incorrect you should restore from a backup.</source>
-        <translation>Ostrzeżenie: Odtworzono dane z uszkodzonego pliku wallet.dat! Oryginalny wallet.dat został zapisany jako wallet.{timestamp}.bak w %s; jeśli twoje saldo lub transakcje są niepoprawne powinieneś odtworzyć kopię zapasową.</translation>
-    </message>
     <message>
         <source>Whitelist peers connecting from the given netmask or IP address. Can be specified multiple times.</source>
         <translation>Dodawaj do białej listy węzły łączące się z podanej maski sieciowej lub adresu IP. Może być określona kilka razy.</translation>
     </message>
+    <message>
+        <source>You need to rebuild the database using -reindex-chainstate to change -txindex</source>
+        <translation>Musisz przebudować bazę używając -reindex-chainstate aby zmienić -txindex</translation>
+    </message>
+    <message>
+        <source>%s corrupt, salvage failed</source>
+        <translation>%s uszkodzony, odtworzenie się nie powiodło</translation>
+    </message>
     <message>
         <source>-maxmempool must be at least %d MB</source>
         <translation>-maxmempool musi być przynajmniej %d MB</translation>
@@ -3032,6 +1875,10 @@ Zwróć uwagę, że poprawnie zweryfikowana wiadomość potwierdza to, że nadaw
         <source>&lt;category&gt; can be:</source>
         <translation>&lt;category&gt; mogą być:</translation>
     </message>
+    <message>
+        <source>Attempt to recover private keys from a corrupt wallet on startup</source>
+        <translation>Próbuj odzyskać klucze prywatne z uszkodzonego portfela podczas uruchamiania.</translation>
+    </message>
     <message>
         <source>Block creation options:</source>
         <translation>Opcje tworzenia bloku:</translation>
@@ -3044,6 +1891,10 @@ Zwróć uwagę, że poprawnie zweryfikowana wiadomość potwierdza to, że nadaw
         <source>Connection options:</source>
         <translation>Opcje połączenia:</translation>
     </message>
+    <message>
+        <source>Copyright (C) %i-%i</source>
+        <translation>Prawa autorskie (C) %i-%i</translation>
+    </message>
     <message>
         <source>Corrupted block database detected</source>
         <translation>Wykryto uszkodzoną bazę bloków</translation>
@@ -3072,6 +1923,18 @@ Zwróć uwagę, że poprawnie zweryfikowana wiadomość potwierdza to, że nadaw
         <source>Error initializing wallet database environment %s!</source>
         <translation>Błąd inicjowania środowiska bazy portfela %s!</translation>
     </message>
+    <message>
+        <source>Error loading %s</source>
+        <translation>Błąd ładowania %s</translation>
+    </message>
+    <message>
+        <source>Error loading %s: Wallet corrupted</source>
+        <translation>Błąd ładowania %s: Uszkodzony portfel</translation>
+    </message>
+    <message>
+        <source>Error loading %s: Wallet requires newer version of %s</source>
+        <translation>Błąd ładowania %s: Portfel wymaga nowszej wersji %s</translation>
+    </message>
     <message>
         <source>Error loading block database</source>
         <translation>Błąd ładowania bazy bloków</translation>
@@ -3096,10 +1959,18 @@ Zwróć uwagę, że poprawnie zweryfikowana wiadomość potwierdza to, że nadaw
         <source>Incorrect or no genesis block found. Wrong datadir for network?</source>
         <translation>Nieprawidłowy lub brak bloku genezy. Błędny folder_danych dla sieci?</translation>
     </message>
+    <message>
+        <source>Initialization sanity check failed. %s is shutting down.</source>
+        <translation>Wstępna kontrola poprawności nie powiodła się. %s wyłącza się.</translation>
+    </message>
     <message>
         <source>Invalid -onion address: '%s'</source>
         <translation>Nieprawidłowy adres -onion: '%s'</translation>
     </message>
+    <message>
+        <source>Invalid amount for -%s=&lt;amount&gt;: '%s'</source>
+        <translation>Nieprawidłowa kwota dla -%s=&lt;amount&gt;: '%s'</translation>
+    </message>
     <message>
         <source>Invalid amount for -fallbackfee=&lt;amount&gt;: '%s'</source>
         <translation>Nieprawidłowa kwota dla -fallbackfee=&lt;amount&gt;: '%s'</translation>
@@ -3116,6 +1987,10 @@ Zwróć uwagę, że poprawnie zweryfikowana wiadomość potwierdza to, że nadaw
         <source>Only connect to nodes in network &lt;net&gt; (ipv4, ipv6 or onion)</source>
         <translation>Łącz z węzłami tylko w sieci &lt;net&gt; (ipv4, piv6 lub onion)</translation>
     </message>
+    <message>
+        <source>Print this help message and exit</source>
+        <translation>Wyświetl ten tekst pomocy i wyjdź</translation>
+    </message>
     <message>
         <source>Print version and exit</source>
         <translation>Wyświetl wersję i wyjdź</translation>
@@ -3128,6 +2003,14 @@ Zwróć uwagę, że poprawnie zweryfikowana wiadomość potwierdza to, że nadaw
         <source>Prune mode is incompatible with -txindex.</source>
         <translation>Tryb ograniczony jest niekompatybilny z -txindex.</translation>
     </message>
+    <message>
+        <source>Rebuild chain state and block index from the blk*.dat files on disk</source>
+        <translation>Odbuduj stan lańcucha i indeks bloków z obecnych na dysku plików blk*.dat</translation>
+    </message>
+    <message>
+        <source>Rebuild chain state from the currently indexed blocks</source>
+        <translation>Odbuduj stan łańcucha z aktualnie zindeksowanych bloków</translation>
+    </message>
     <message>
         <source>Set database cache size in megabytes (%d to %d, default: %d)</source>
         <translation>Ustaw wielkość pamięci podręcznej w megabajtach (%d do %d, domyślnie: %d)</translation>
@@ -3140,6 +2023,10 @@ Zwróć uwagę, że poprawnie zweryfikowana wiadomość potwierdza to, że nadaw
         <source>Specify wallet file (within data directory)</source>
         <translation>Określ plik portfela (w obrębie folderu danych)</translation>
     </message>
+    <message>
+        <source>Unable to bind to %s on this computer. %s is probably already running.</source>
+        <translation>Nie można przywiązać do %s na tym komputerze. %s prawdopodobnie jest już uruchomiony.</translation>
+    </message>
     <message>
         <source>Unsupported argument -benchmark ignored, use -debug=bench.</source>
         <translation>Niewspierany argument -benchmark zignorowany, użyj -debug=bench.</translation>
@@ -3173,12 +2060,16 @@ Zwróć uwagę, że poprawnie zweryfikowana wiadomość potwierdza to, że nadaw
         <translation>Portfel %s znajduje się poza folderem danych %s</translation>
     </message>
     <message>
-        <source>Wallet options:</source>
-        <translation>Opcje portfela:</translation>
+        <source>Wallet debugging/testing options:</source>
+        <translation>Opcje debugowania/testowania portfela:</translation>
     </message>
     <message>
-        <source>You need to rebuild the database using -reindex to change -txindex</source>
-        <translation>Musisz przebudować bazę używając parametru -reindex aby zmienić -txindex</translation>
+        <source>Wallet needed to be rewritten: restart %s to complete</source>
+        <translation>Portfel wymaga przepisania: zrestartuj %s aby ukończyć</translation>
+    </message>
+    <message>
+        <source>Wallet options:</source>
+        <translation>Opcje portfela:</translation>
     </message>
     <message>
         <source>Allow JSON-RPC connections from specified source. Valid for &lt;ip&gt; are a single IP (e.g. 1.2.3.4), a network/netmask (e.g. 1.2.3.4/255.255.255.0) or a network/CIDR (e.g. 1.2.3.4/24). This option can be specified multiple times</source>
@@ -3192,10 +2083,6 @@ Zwróć uwagę, że poprawnie zweryfikowana wiadomość potwierdza to, że nadaw
         <source>Bind to given address to listen for JSON-RPC connections. Use [host]:port notation for IPv6. This option can be specified multiple times (default: bind to all interfaces)</source>
         <translation>Powiąż się z podanym adresem, aby nasłuchiwać połączenia JSON-RPC. Użyj notacji [host]:port dla IPv6. Ta opcja może być określona kilka razy (domyślnie: powiąż ze wszystkimi interfejsami)</translation>
     </message>
-    <message>
-        <source>Cannot obtain a lock on data directory %s. Bitcoin Core is probably already running.</source>
-        <translation>Nie można uzyskać blokady na katalogu z danymi %s. Rdzeń Bitcoin najprawdopodobniej jest już uruchomiony.</translation>
-    </message>
     <message>
         <source>Create new files with system default permissions, instead of umask 077 (only effective with disabled wallet functionality)</source>
         <translation>Twórz nowe pliki z domyślnymi dla systemu uprawnieniami, zamiast umask 077 (skuteczne tylko przy wyłączonej funkcjonalności portfela)</translation>
@@ -3232,10 +2119,6 @@ Zwróć uwagę, że poprawnie zweryfikowana wiadomość potwierdza to, że nadaw
         <source>Set maximum size of high-priority/low-fee transactions in bytes (default: %d)</source>
         <translation>Ustaw maksymalny rozmiar transakcji o wysokim priorytecie/niskiej prowizji w bajtach (domyślnie: %d)</translation>
     </message>
-    <message>
-        <source>Set the number of threads for coin generation if enabled (-1 = all cores, default: %d)</source>
-        <translation>Ustaw liczbę wątków dla generowania monet (-1 = wszystkie rdzenie, domyślnie: %d)</translation>
-    </message>
     <message>
         <source>The transaction amount is too small to send after the fee has been deducted</source>
         <translation>Zbyt niska kwota transakcji do wysłania po odjęciu opłaty</translation>
@@ -3256,34 +2139,14 @@ Zwróć uwagę, że poprawnie zweryfikowana wiadomość potwierdza to, że nadaw
         <source>Accept public REST requests (default: %u)</source>
         <translation>Akceptuj publiczne żądania REST (domyślnie: %u)</translation>
     </message>
-    <message>
-        <source>Activating best chain...</source>
-        <translation>Aktywuje najlepszy łańcuch</translation>
-    </message>
-    <message>
-        <source>Attempt to recover private keys from a corrupt wallet.dat on startup</source>
-        <translation>Próbuj podczas uruchamiania programu odzyskać klucze prywatne z uszkodzonego pliku wallet.dat</translation>
-    </message>
     <message>
         <source>Automatically create Tor hidden service (default: %d)</source>
         <translation>Stwórz automatycznie ukrytą usługę Tora (domyślnie: %d)</translation>
     </message>
-    <message>
-        <source>Cannot resolve -whitebind address: '%s'</source>
-        <translation>Nie można rozwiązać adresu -whitebind: '%s'</translation>
-    </message>
     <message>
         <source>Connect through SOCKS5 proxy</source>
         <translation>Połącz przez SOCKS5 proxy</translation>
     </message>
-    <message>
-        <source>Copyright (C) 2009-%i The Bitcoin Core Developers</source>
-        <translation>Copyright (C) 2009-%i The Bitcoin Core Developers</translation>
-    </message>
-    <message>
-        <source>Error loading wallet.dat: Wallet requires newer version of Bitcoin Core</source>
-        <translation>Błąd ładowania wallet.dat: Portfel wymaga nowszej wersji Bitcoin Core</translation>
-    </message>
     <message>
         <source>Error reading from database, shutting down.</source>
         <translation>Błąd odczytu z bazy danych, wyłączam się.</translation>
@@ -3296,22 +2159,6 @@ Zwróć uwagę, że poprawnie zweryfikowana wiadomość potwierdza to, że nadaw
         <source>Information</source>
         <translation>Informacja</translation>
     </message>
-    <message>
-        <source>Initialization sanity check failed. Bitcoin Core is shutting down.</source>
-        <translation>Wstępna kontrola poprawności nie powiodła się. Bitcoin Core wyłącza się.</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -maxtxfee=&lt;amount&gt;: '%s'</source>
-        <translation>Nieprawidłowa kwota dla -maxtxfee=&lt;amount&gt;: '%s'</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -minrelaytxfee=&lt;amount&gt;: '%s'</source>
-        <translation>Nieprawidłowa kwota dla -minrelaytxfee=&lt;amount&gt;: '%s'</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -mintxfee=&lt;amount&gt;: '%s'</source>
-        <translation>Nieprawidłowa kwota dla -mintxfee=&lt;amount&gt;: '%s'</translation>
-    </message>
     <message>
         <source>Invalid amount for -paytxfee=&lt;amount&gt;: '%s' (must be at least %s)</source>
         <translation>Nieprawidłowa kwota dla -paytxfee=&lt;amount&gt;: '%s' (musi być co najmniej %s)</translation>
@@ -3336,14 +2183,6 @@ Zwróć uwagę, że poprawnie zweryfikowana wiadomość potwierdza to, że nadaw
         <source>RPC server options:</source>
         <translation>Opcje serwera RPC:</translation>
     </message>
-    <message>
-        <source>Rebuild block chain index from current blk000??.dat files on startup</source>
-        <translation>Odbuduj indeks łańcucha bloków z obecnych plików blk000??.dat podczas ponownego uruchomienia</translation>
-    </message>
-    <message>
-        <source>Receive and display P2P network alerts (default: %u)</source>
-        <translation>Odbieranie i wyświetlanie alertów sieci P2P (domyślnie: %u)</translation>
-    </message>
     <message>
         <source>Reducing -maxconnections from %d to %d, because of system limitations.</source>
         <translation>Zmniejszanie -maxconnections z %d do %d z powodu ograniczeń systemu.</translation>
@@ -3412,10 +2251,6 @@ Zwróć uwagę, że poprawnie zweryfikowana wiadomość potwierdza to, że nadaw
         <source>Username for JSON-RPC connections</source>
         <translation>Nazwa użytkownika dla połączeń JSON-RPC</translation>
     </message>
-    <message>
-        <source>Wallet needed to be rewritten: restart Bitcoin Core to complete</source>
-        <translation>Portfel wymaga przepisania: zrestartuj Bitcoina aby ukończyć</translation>
-    </message>
     <message>
         <source>Warning</source>
         <translation>Ostrzeżenie</translation>
@@ -3428,10 +2263,6 @@ Zwróć uwagę, że poprawnie zweryfikowana wiadomość potwierdza to, że nadaw
         <source>ZeroMQ notification options:</source>
         <translation>Opcje powiadomień ZeroMQ:</translation>
     </message>
-    <message>
-        <source>wallet.dat corrupt, salvage failed</source>
-        <translation>wallet.dat uszkodzony, odtworzenie się nie powiodło</translation>
-    </message>
     <message>
         <source>Password for JSON-RPC connections</source>
         <translation>Hasło do połączeń JSON-RPC</translation>
@@ -3440,10 +2271,6 @@ Zwróć uwagę, że poprawnie zweryfikowana wiadomość potwierdza to, że nadaw
         <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
         <translation>Wykonaj polecenie kiedy najlepszy blok ulegnie zmianie (%s w komendzie zastanie zastąpione przez hash bloku)</translation>
     </message>
-    <message>
-        <source>This help message</source>
-        <translation>Ta wiadomość pomocy</translation>
-    </message>
     <message>
         <source>Allow DNS lookups for -addnode, -seednode and -connect</source>
         <translation>Zezwól -addnode, -seednode i -connect na łączenie się z serwerem DNS</translation>
@@ -3452,17 +2279,13 @@ Zwróć uwagę, że poprawnie zweryfikowana wiadomość potwierdza to, że nadaw
         <source>Loading addresses...</source>
         <translation>Wczytywanie adresów...</translation>
     </message>
-    <message>
-        <source>Error loading wallet.dat: Wallet corrupted</source>
-        <translation>Błąd ładowania wallet.dat: Uszkodzony portfel</translation>
-    </message>
     <message>
         <source>(1 = keep tx meta data e.g. account owner and payment request information, 2 = drop tx meta data)</source>
         <translation>(1 = zachowaj wysłane metadane np. właściciel konta i informacje o żądaniach płatności, 2 = porzuć wysłane metadane)</translation>
     </message>
     <message>
         <source>-maxtxfee is set very high! Fees this large could be paid on a single transaction.</source>
-        <translation>-matxfee jest ustawione bardzo wysokie! Tak wysokie opłaty mogą być zapłacone w jednej transakcji.</translation>
+        <translation>-maxtxfee ma ustawioną badzo dużą wartość! Tak wysokie opłaty mogą być zapłacone w jednej transakcji.</translation>
     </message>
     <message>
         <source>-paytxfee is set very high! This is the transaction fee you will pay if you send a transaction.</source>
@@ -3472,10 +2295,6 @@ Zwróć uwagę, że poprawnie zweryfikowana wiadomość potwierdza to, że nadaw
         <source>Do not keep transactions in the mempool longer than &lt;n&gt; hours (default: %u)</source>
         <translation>Nie trzymaj w pamięci transakcji starszych niż &lt;n&gt; godz. (domyślnie: %u)</translation>
     </message>
-    <message>
-        <source>Error reading wallet.dat! All keys read correctly, but transaction data or address book entries might be missing or incorrect.</source>
-        <translation>Ostrzeżenie: błąd odczytu wallet.dat! Wszystkie klucze zostały odczytane, ale może brakować pewnych danych transakcji lub wpisów w książce adresowej lub mogą one być nieprawidłowe.</translation>
-    </message>
     <message>
         <source>Fees (in %s/kB) smaller than this are considered zero fee for transaction creation (default: %s)</source>
         <translation>Opłaty (w %s/Kb) mniejsze niż ta będą traktowane jako bez opłaty przy tworzeniu transakcji (domyślnie: %s)</translation>
@@ -3506,16 +2325,24 @@ Zwróć uwagę, że poprawnie zweryfikowana wiadomość potwierdza to, że nadaw
     </message>
     <message>
         <source>Tries to keep outbound traffic under the given target (in MiB per 24h), 0 = no limit (default: %d)</source>
-        <translation>Próbuje utrzymać ruch wychodzący poniżej zadanego (w MiB na dobę), 0 = bez limitu (domyślnie: %d)</translation>
+        <translation>Próbuje utrzymać ruch wychodzący poniżej zadanego (w MiB na 24h), 0 = bez limitu (domyślnie: %d)</translation>
     </message>
     <message>
         <source>Unsupported argument -socks found. Setting SOCKS version isn't possible anymore, only SOCKS5 proxies are supported.</source>
         <translation>Znaleziono niewspierany argument -socks. Wybieranie wersji SOCKS nie jest już możliwe, wsparcie programu obejmuje tylko proxy SOCKS5</translation>
     </message>
+    <message>
+        <source>Unsupported argument -whitelistalwaysrelay ignored, use -whitelistrelay and/or -whitelistforcerelay.</source>
+        <translation>Niewspierany argument -whitelistalwaysrelay zignorowany, użyj -whitelistrelay i/lub -whitelistforcerelay.</translation>
+    </message>
     <message>
         <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: %s)</source>
         <translation>Użyj oddzielnego prozy SOCKS5 aby osiągnąć węzły w ukrytych usługach Tor (domyślnie: %s)</translation>
     </message>
+    <message>
+        <source>Warning: Wallet file corrupt, data salvaged! Original %s saved as %s in %s; if your balance or transactions are incorrect you should restore from a backup.</source>
+        <translation>Ostrzeżenie: Odtworzono dane z uszkodzonego pliku portfela! Oryginalny %s został zapisany jako %s w %s; jeśli twoje saldo lub transakcje są niepoprawne powinieneś odtworzyć kopię zapasową.</translation>
+    </message>
     <message>
         <source>(default: %s)</source>
         <translation>(domyślnie: %s)</translation>
@@ -3524,14 +2351,6 @@ Zwróć uwagę, że poprawnie zweryfikowana wiadomość potwierdza to, że nadaw
         <source>Always query for peer addresses via DNS lookup (default: %u)</source>
         <translation>Zawsze wypytuj o adresy węzłów poprzez podejrzenie DNS (domyślnie: %u)</translation>
     </message>
-    <message>
-        <source>Error loading wallet.dat</source>
-        <translation>Błąd ładowania wallet.dat</translation>
-    </message>
-    <message>
-        <source>Generate coins (default: %u)</source>
-        <translation>Generuj monety (domyślnie: %u)</translation>
-    </message>
     <message>
         <source>How many blocks to check at startup (default: %u, 0 = all)</source>
         <translation>Ile bloków sprawdzić przy starcie (domyślnie: %u, 0 = wszystkie)</translation>
@@ -3616,18 +2435,6 @@ Zwróć uwagę, że poprawnie zweryfikowana wiadomość potwierdza to, że nadaw
         <source>Unknown network specified in -onlynet: '%s'</source>
         <translation>Nieznana sieć w -onlynet: '%s'</translation>
     </message>
-    <message>
-        <source>Cannot resolve -bind address: '%s'</source>
-        <translation>Nie można uzyskać adresu -bind: '%s'</translation>
-    </message>
-    <message>
-        <source>Cannot resolve -externalip address: '%s'</source>
-        <translation>Nie można uzyskać adresu -externalip: '%s'</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -paytxfee=&lt;amount&gt;: '%s'</source>
-        <translation>Nieprawidłowa kwota dla -paytxfee=&lt;amount&gt;: '%s'</translation>
-    </message>
     <message>
         <source>Insufficient funds</source>
         <translation>Niewystarczające środki</translation>
diff --git a/src/qt/locale/bitcoin_pt_BR.ts b/src/qt/locale/bitcoin_pt_BR.ts
index 1b92395c79809..fe9dd66269ff5 100644
--- a/src/qt/locale/bitcoin_pt_BR.ts
+++ b/src/qt/locale/bitcoin_pt_BR.ts
@@ -3,7 +3,7 @@
     <name>AddressBookPage</name>
     <message>
         <source>Right-click to edit address or label</source>
-        <translation>Clique com o botão direito para editar o endereço ou rótulo </translation>
+        <translation>Clique com o botão direito para editar o endereço ou rótulo</translation>
     </message>
     <message>
         <source>Create a new address</source>
@@ -25,10 +25,6 @@
         <source>C&amp;lose</source>
         <translation>&amp;Fechar</translation>
     </message>
-    <message>
-        <source>&amp;Copy Address</source>
-        <translation>&amp;Copiar Endereço</translation>
-    </message>
     <message>
         <source>Delete the currently selected address from the list</source>
         <translation>Excluir os endereços selecionados da lista</translation>
@@ -45,73 +41,6 @@
         <source>&amp;Delete</source>
         <translation>&amp;Excluir</translation>
     </message>
-    <message>
-        <source>Choose the address to send coins to</source>
-        <translation>Escolha o endereço para enviar moedas</translation>
-    </message>
-    <message>
-        <source>Choose the address to receive coins with</source>
-        <translation>Escolha o endereço para receber moedas</translation>
-    </message>
-    <message>
-        <source>C&amp;hoose</source>
-        <translation>Escol&amp;ha</translation>
-    </message>
-    <message>
-        <source>Sending addresses</source>
-        <translation>Endereços para envios</translation>
-    </message>
-    <message>
-        <source>Receiving addresses</source>
-        <translation>Endereços de recebimento</translation>
-    </message>
-    <message>
-        <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source>
-        <translation>Esses são seus endereços Bitcoin para enviar pagamentos. Confira sempre a quantia e o destinatário antes de enviar moedas.</translation>
-    </message>
-    <message>
-        <source>These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source>
-        <translation>Estes são os seus endereços Bitcoin para receber pagamentos. Recomenda-se a utilização de um novo endereço de recebimento para cada transação.</translation>
-    </message>
-    <message>
-        <source>Copy &amp;Label</source>
-        <translation>Copiar &amp;Rótulo</translation>
-    </message>
-    <message>
-        <source>&amp;Edit</source>
-        <translation>&amp;Editar</translation>
-    </message>
-    <message>
-        <source>Export Address List</source>
-        <translation>Exportar lista de endereços</translation>
-    </message>
-    <message>
-        <source>Comma separated file (*.csv)</source>
-        <translation>Arquivo separado por vírgulas (*. csv)</translation>
-    </message>
-    <message>
-        <source>Exporting Failed</source>
-        <translation>Exportação Falhou</translation>
-    </message>
-    <message>
-        <source>There was an error trying to save the address list to %1. Please try again.</source>
-        <translation>Ocorreu um erro ao tentar salvar a lista de endereço em %1.. Por favor tente novamente.</translation>
-    </message>
-</context>
-<context>
-    <name>AddressTableModel</name>
-    <message>
-        <source>Label</source>
-        <translation>Rótulo</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>Endereço</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(Sem rótulo)</translation>
-    </message>
 </context>
 <context>
     <name>AskPassphraseDialog</name>
@@ -131,94 +60,6 @@
         <source>Repeat new passphrase</source>
         <translation>Repita a nova frase de segurança</translation>
     </message>
-    <message>
-        <source>Encrypt wallet</source>
-        <translation>Criptografar carteira</translation>
-    </message>
-    <message>
-        <source>This operation needs your wallet passphrase to unlock the wallet.</source>
-        <translation>Esta operação precisa de sua frase de segurança para desbloquear a carteira.</translation>
-    </message>
-    <message>
-        <source>Unlock wallet</source>
-        <translation>Desbloquear carteira</translation>
-    </message>
-    <message>
-        <source>This operation needs your wallet passphrase to decrypt the wallet.</source>
-        <translation>Esta operação precisa de sua frase de segurança para descriptografar a carteira.</translation>
-    </message>
-    <message>
-        <source>Decrypt wallet</source>
-        <translation>Descriptografar carteira</translation>
-    </message>
-    <message>
-        <source>Change passphrase</source>
-        <translation>Alterar frase de segurança</translation>
-    </message>
-    <message>
-        <source>Confirm wallet encryption</source>
-        <translation>Confirmar criptografia da carteira</translation>
-    </message>
-    <message>
-        <source>Warning: If you encrypt your wallet and lose your passphrase, you will &lt;b&gt;LOSE ALL OF YOUR BITCOINS&lt;/b&gt;!</source>
-        <translation>Atenção: Se você criptografar sua carteira e perder sua frase, você vai &lt;b&gt;perder todos os seus BITCOINS!&lt;/b&gt;</translation>
-    </message>
-    <message>
-        <source>Are you sure you wish to encrypt your wallet?</source>
-        <translation>Tem certeza de que deseja criptografar sua carteira?</translation>
-    </message>
-    <message>
-        <source>Bitcoin Core will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source>
-        <translation>O Bitcoin irá fechar agora para terminar o processo de criptografia. Lembre-se que criptografando sua carteira não te protege totalmente de ter seus bitcoins roubados por um malware que infectar seu computador.</translation>
-    </message>
-    <message>
-        <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source>
-        <translation>IMPORTANTE: Qualquer backup prévio que você tenha feito do seu arquivo wallet deve ser substituído pelo novo e encriptado arquivo wallet gerado. Por razões de segurança, qualquer backup do arquivo wallet não criptografado se tornará inútil assim que você começar  a usar uma nova carteira criptografada.</translation>
-    </message>
-    <message>
-        <source>Warning: The Caps Lock key is on!</source>
-        <translation>Atenção: A tecla Caps Lock está ligada!</translation>
-    </message>
-    <message>
-        <source>Wallet encrypted</source>
-        <translation>Carteira criptografada</translation>
-    </message>
-    <message>
-        <source>Enter the new passphrase to the wallet.&lt;br/&gt;Please use a passphrase of &lt;b&gt;ten or more random characters&lt;/b&gt;, or &lt;b&gt;eight or more words&lt;/b&gt;.</source>
-        <translation>Digite a nova frase da carteira. &lt;br/&gt;Por favor utilize uma senha com &lt;b&gt;dez ou mais caracteres aleartórios&lt;/b&gt;, ou &lt;b&gt;oito ou mais palavras&lt;/b&gt;.</translation>
-    </message>
-    <message>
-        <source>Enter the old passphrase and new passphrase to the wallet.</source>
-        <translation>Insira a frase antiga e a nova da carteira.</translation>
-    </message>
-    <message>
-        <source>Wallet encryption failed</source>
-        <translation>A criptografia da carteira falhou</translation>
-    </message>
-    <message>
-        <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
-        <translation>A criptografia da carteira falhou devido a um erro interno. Sua carteira não estava criptografada.</translation>
-    </message>
-    <message>
-        <source>The supplied passphrases do not match.</source>
-        <translation>A frase de segurança fornecida não confere.</translation>
-    </message>
-    <message>
-        <source>Wallet unlock failed</source>
-        <translation>O desbloqueio da carteira falhou</translation>
-    </message>
-    <message>
-        <source>The passphrase entered for the wallet decryption was incorrect.</source>
-        <translation>A frase de segurança digitada para a descriptografia da carteira estava incorreta.</translation>
-    </message>
-    <message>
-        <source>Wallet decryption failed</source>
-        <translation>A descriptografia da carteira falhou</translation>
-    </message>
-    <message>
-        <source>Wallet passphrase was successfully changed.</source>
-        <translation>A frase de segurança da carteira foi alterada com êxito.</translation>
-    </message>
 </context>
 <context>
     <name>BanTableModel</name>
@@ -269,6 +110,10 @@
         <source>Quit application</source>
         <translation>Sair da aplicação</translation>
     </message>
+    <message>
+        <source>&amp;About %1</source>
+        <translation>&amp;About %1</translation>
+    </message>
     <message>
         <source>About &amp;Qt</source>
         <translation>Sobre &amp;Qt</translation>
@@ -281,6 +126,10 @@
         <source>&amp;Options...</source>
         <translation>&amp;Opções...</translation>
     </message>
+    <message>
+        <source>Modify configuration options for %1</source>
+        <translation>Modificar opções de configuração para o %1</translation>
+    </message>
     <message>
         <source>&amp;Encrypt Wallet...</source>
         <translation>&amp;Criptografar Carteira...</translation>
@@ -305,14 +154,6 @@
         <source>Open &amp;URI...</source>
         <translation>Abrir &amp;URI...</translation>
     </message>
-    <message>
-        <source>Bitcoin Core client</source>
-        <translation>Cliente Bitcoin</translation>
-    </message>
-    <message>
-        <source>Importing blocks from disk...</source>
-        <translation>Importando blocos do disco...</translation>
-    </message>
     <message>
         <source>Reindexing blocks on disk...</source>
         <translation>Reindexando blocos no disco...</translation>
@@ -357,10 +198,6 @@
         <source>&amp;Receive</source>
         <translation>&amp;Receber</translation>
     </message>
-    <message>
-        <source>Show information about Bitcoin Core</source>
-        <translation>Mostrar informações sobre Bitcoin</translation>
-    </message>
     <message>
         <source>&amp;Show / Hide</source>
         <translation>&amp;Exibir/Ocultar</translation>
@@ -397,22 +234,10 @@
         <source>Tabs toolbar</source>
         <translation>Barra de ferramentas</translation>
     </message>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Bitcoin</translation>
-    </message>
     <message>
         <source>Request payments (generates QR codes and bitcoin: URIs)</source>
         <translation>Solicitações de pagamentos (gera códigos QR e bitcoin: URIs)</translation>
     </message>
-    <message>
-        <source>&amp;About Bitcoin Core</source>
-        <translation>&amp;Sobre Bitcoin</translation>
-    </message>
-    <message>
-        <source>Modify configuration options for Bitcoin Core</source>
-        <translation>Modificar opções de configuração do Bitcoin</translation>
-    </message>
     <message>
         <source>Show the list of used sending addresses and labels</source>
         <translation>Mostrar a lista de endereços de envio e rótulos usados</translation>
@@ -429,14 +254,18 @@
         <source>&amp;Command-line options</source>
         <translation>Opções de linha de &amp;comando</translation>
     </message>
-    <message>
-        <source>Show the Bitcoin Core help message to get a list with possible Bitcoin command-line options</source>
-        <translation>Mostra a mensagem de ajuda do Bitcoin para pegar a lista com os comandos possíveis</translation>
-    </message>
     <message numerus="yes">
         <source>%n active connection(s) to Bitcoin network</source>
         <translation><numerusform>%n conexão ativa na rede Bitcoin</numerusform><numerusform>%n conexões ativas na rede Bitcoin</numerusform></translation>
     </message>
+    <message>
+        <source>Indexing blocks on disk...</source>
+        <translation>Indexando blocos no disco...</translation>
+    </message>
+    <message>
+        <source>Processing blocks on disk...</source>
+        <translation>Processando blocos no disco...</translation>
+    </message>
     <message>
         <source>No block source available...</source>
         <translation>Nenhum servidor disponível...</translation>
@@ -493,6 +322,14 @@
         <source>Up to date</source>
         <translation>Atualizado</translation>
     </message>
+    <message>
+        <source>Show the %1 help message to get a list with possible Bitcoin command-line options</source>
+        <translation>Mostrar a mensagem de ajuda do %1 para obter uma lista com possíveis opções de linha de comando Bitcoin</translation>
+    </message>
+    <message>
+        <source>%1 client</source>
+        <translation>cliente %1</translation>
+    </message>
     <message>
         <source>Catching up...</source>
         <translation>Recuperando o atraso ...</translation>
@@ -544,13 +381,6 @@
         <translation>Carteira está &lt;b&gt;criptografada&lt;/b&gt; e atualmente &lt;b&gt;bloqueada&lt;/b&gt;</translation>
     </message>
 </context>
-<context>
-    <name>ClientModel</name>
-    <message>
-        <source>Network Alert</source>
-        <translation>Alerta da Rede</translation>
-    </message>
-</context>
 <context>
     <name>CoinControlDialog</name>
     <message>
@@ -629,150 +459,6 @@
         <source>Priority</source>
         <translation>Prioridade</translation>
     </message>
-    <message>
-        <source>Copy address</source>
-        <translation>Copiar endereço</translation>
-    </message>
-    <message>
-        <source>Copy label</source>
-        <translation>Copiar rótulo</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>Copiar quantia</translation>
-    </message>
-    <message>
-        <source>Copy transaction ID</source>
-        <translation>Copiar ID da transação</translation>
-    </message>
-    <message>
-        <source>Lock unspent</source>
-        <translation>Travar não gasto</translation>
-    </message>
-    <message>
-        <source>Unlock unspent</source>
-        <translation>Destravar não gasto</translation>
-    </message>
-    <message>
-        <source>Copy quantity</source>
-        <translation>Copiar quantidade</translation>
-    </message>
-    <message>
-        <source>Copy fee</source>
-        <translation>Copiar taxa</translation>
-    </message>
-    <message>
-        <source>Copy after fee</source>
-        <translation>Copia pós-taxa</translation>
-    </message>
-    <message>
-        <source>Copy bytes</source>
-        <translation>Copiar bytes</translation>
-    </message>
-    <message>
-        <source>Copy priority</source>
-        <translation>Copia prioridade</translation>
-    </message>
-    <message>
-        <source>Copy dust</source>
-        <translation>Copiar poeira</translation>
-    </message>
-    <message>
-        <source>Copy change</source>
-        <translation>Copia alteração</translation>
-    </message>
-    <message>
-        <source>highest</source>
-        <translation>mais alta possível</translation>
-    </message>
-    <message>
-        <source>higher</source>
-        <translation>muito alta</translation>
-    </message>
-    <message>
-        <source>high</source>
-        <translation>alta</translation>
-    </message>
-    <message>
-        <source>medium-high</source>
-        <translation>média-alta</translation>
-    </message>
-    <message>
-        <source>medium</source>
-        <translation>média</translation>
-    </message>
-    <message>
-        <source>low-medium</source>
-        <translation>média-baixa</translation>
-    </message>
-    <message>
-        <source>low</source>
-        <translation>baixa</translation>
-    </message>
-    <message>
-        <source>lower</source>
-        <translation>muito baixa</translation>
-    </message>
-    <message>
-        <source>lowest</source>
-        <translation>a mais baixa possível</translation>
-    </message>
-    <message>
-        <source>(%1 locked)</source>
-        <translation>(%1 travado)</translation>
-    </message>
-    <message>
-        <source>none</source>
-        <translation>Nenhum</translation>
-    </message>
-    <message>
-        <source>This label turns red if the transaction size is greater than 1000 bytes.</source>
-        <translation>Este texto fica vermelho se o tamanho da transação for maior que 1000 bytes.</translation>
-    </message>
-    <message>
-        <source>This label turns red if the priority is smaller than "medium".</source>
-        <translation>Este texto fica vermelho se a prioridade é menor que "medio".</translation>
-    </message>
-    <message>
-        <source>This label turns red if any recipient receives an amount smaller than %1.</source>
-        <translation>Este texto fica vermelho se qualquer destinatário receber uma quantidade menor que %1.</translation>
-    </message>
-    <message>
-        <source>Can vary +/- %1 satoshi(s) per input.</source>
-        <translation>Pode variar +/- %1 satoshi(s) por entrada.</translation>
-    </message>
-    <message>
-        <source>yes</source>
-        <translation>sim</translation>
-    </message>
-    <message>
-        <source>no</source>
-        <translation>não</translation>
-    </message>
-    <message>
-        <source>This means a fee of at least %1 per kB is required.</source>
-        <translation>Isso significa que uma taxa de pelo menos %1 por kB é necessária.</translation>
-    </message>
-    <message>
-        <source>Can vary +/- 1 byte per input.</source>
-        <translation>Pode variar +/- 1 byte por entrada.</translation>
-    </message>
-    <message>
-        <source>Transactions with higher priority are more likely to get included into a block.</source>
-        <translation>Transações de alta prioridade são mais propensas a serem incluídas em um bloco.</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(Sem rótulo)</translation>
-    </message>
-    <message>
-        <source>change from %1 (%2)</source>
-        <translation>troco de %1 (%2)</translation>
-    </message>
-    <message>
-        <source>(change)</source>
-        <translation>(troco)</translation>
-    </message>
 </context>
 <context>
     <name>EditAddressDialog</name>
@@ -796,38 +482,6 @@
         <source>&amp;Address</source>
         <translation>&amp;Endereço</translation>
     </message>
-    <message>
-        <source>New receiving address</source>
-        <translation>Novo endereço de recebimento</translation>
-    </message>
-    <message>
-        <source>New sending address</source>
-        <translation>Novo endereço de envio</translation>
-    </message>
-    <message>
-        <source>Edit receiving address</source>
-        <translation>Editar endereço de recebimento</translation>
-    </message>
-    <message>
-        <source>Edit sending address</source>
-        <translation>Editar endereço de envio</translation>
-    </message>
-    <message>
-        <source>The entered address "%1" is already in the address book.</source>
-        <translation>O endereço digitado "%1" já se encontra no catálogo de endereços.</translation>
-    </message>
-    <message>
-        <source>The entered address "%1" is not a valid Bitcoin address.</source>
-        <translation>O endereço digitado "%1" não é um endereço Bitcoin válido.</translation>
-    </message>
-    <message>
-        <source>Could not unlock wallet.</source>
-        <translation>Não foi possível desbloquear a carteira.</translation>
-    </message>
-    <message>
-        <source>New key generation failed.</source>
-        <translation>A geração de nova chave falhou.</translation>
-    </message>
 </context>
 <context>
     <name>FreespaceChecker</name>
@@ -854,10 +508,6 @@
 </context>
 <context>
     <name>HelpMessageDialog</name>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Bitcoin</translation>
-    </message>
     <message>
         <source>version</source>
         <translation>versão</translation>
@@ -867,8 +517,8 @@
         <translation>(%1-bit)</translation>
     </message>
     <message>
-        <source>About Bitcoin Core</source>
-        <translation>Sobre o Bitcoin</translation>
+        <source>About %1</source>
+        <translation>Sobre %1</translation>
     </message>
     <message>
         <source>Command-line options</source>
@@ -907,8 +557,8 @@
         <translation>Exibir tela de abertura na inicialização (padrão: %u)</translation>
     </message>
     <message>
-        <source>Reset all settings changes made over the GUI</source>
-        <translation>Desfazer todas as mudanças de configuração feitas na interface</translation>
+        <source>Reset all settings changed in the GUI</source>
+        <translation>Resetar todas as configuraçãoes do GUI</translation>
     </message>
 </context>
 <context>
@@ -918,16 +568,8 @@
         <translation>Bem-vindo</translation>
     </message>
     <message>
-        <source>Welcome to Bitcoin Core.</source>
-        <translation>Bem vindo ao Bitcoin.</translation>
-    </message>
-    <message>
-        <source>As this is the first time the program is launched, you can choose where Bitcoin Core will store its data.</source>
-        <translation>A primeira vez que o programa é aberto você pode escolher onde o Bitcoin vai guardar os dados.</translation>
-    </message>
-    <message>
-        <source>Bitcoin Core will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source>
-        <translation>O Bitcoin vai fazer download e salvar uma cópia da cadeia de blocos do Bitcoin: Blockchain. Pelo menos %1 GB de dados serão armazenados nesse diretório e isso aumentará ao longo do tempo. Sua carteira também será armazenada nesse diretório.</translation>
+        <source>Welcome to %1.</source>
+        <translation>Bem vindo ao %1</translation>
     </message>
     <message>
         <source>Use the default data directory</source>
@@ -937,10 +579,6 @@
         <source>Use a custom data directory:</source>
         <translation>Use um diretório de dados personalizado:</translation>
     </message>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Bitcoin</translation>
-    </message>
     <message>
         <source>Error: Specified data directory "%1" cannot be created.</source>
         <translation>Erro: Diretório de dados "%1" não pode ser criado.</translation>
@@ -976,10 +614,6 @@
         <source>Select payment request file</source>
         <translation>Selecione o arquivo de cobrança</translation>
     </message>
-    <message>
-        <source>Select payment request file to open</source>
-        <translation>Selecione o arquivo de cobrança para ser aberto</translation>
-    </message>
 </context>
 <context>
     <name>OptionsDialog</name>
@@ -991,6 +625,14 @@
         <source>&amp;Main</source>
         <translation>Principal</translation>
     </message>
+    <message>
+        <source>Automatically start %1 after logging in to the system.</source>
+        <translation>Executar o %1 automaticamente ao iniciar o sistema.</translation>
+    </message>
+    <message>
+        <source>&amp;Start %1 on system login</source>
+        <translation>$Iniciar %1 ao fazer login no sistema</translation>
+    </message>
     <message>
         <source>Size of &amp;database cache</source>
         <translation>Tamanho do banco de &amp;dados do cache</translation>
@@ -1019,10 +661,6 @@
         <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Exit in the menu.</source>
         <translation>Minimizar em vez de fechar o programa quando a janela for fechada. Quando essa opção estiver ativa, o programa só será fechado somente pela opção Sair no menu Arquivo.</translation>
     </message>
-    <message>
-        <source>The user interface language can be set here. This setting will take effect after restarting Bitcoin Core.</source>
-        <translation>A linguagem da interface do usuário pode ser alterada aqui. A mudança ocorrerá após o reinício do Bitcoin Core.</translation>
-    </message>
     <message>
         <source>Third party URLs (e.g. a block explorer) that appear in the transactions tab as context menu items. %s in the URL is replaced by transaction hash. Multiple URLs are separated by vertical bar |.</source>
         <translation>URLs de terceiros (exemplo: explorador de blocos) que aparecem na aba de transações como itens do menu de contexto. %s na URL é substituido pela hash da transação. Múltiplas URLs são separadas pela barra vertical |.</translation>
@@ -1047,14 +685,6 @@
         <source>&amp;Network</source>
         <translation>Rede</translation>
     </message>
-    <message>
-        <source>Automatically start Bitcoin Core after logging in to the system.</source>
-        <translation>Inicar automaticamente o Bitcoin ao logar no sistema.</translation>
-    </message>
-    <message>
-        <source>&amp;Start Bitcoin Core on system login</source>
-        <translation>&amp;Iniciar Bitcoin no login do sistema</translation>
-    </message>
     <message>
         <source>(0 = auto, &lt;0 = leave that many cores free)</source>
         <translation>(0 = automático, &lt;0 = número de cores deixados livres)</translation>
@@ -1139,6 +769,14 @@
         <source>&amp;Window</source>
         <translation>&amp;Janela</translation>
     </message>
+    <message>
+        <source>&amp;Hide the icon from the system tray.</source>
+        <translation>&amp;Ocultar o ícone da bandeja do sistema.</translation>
+    </message>
+    <message>
+        <source>Hide tray icon</source>
+        <translation>Ocultar ícone de bandeja</translation>
+    </message>
     <message>
         <source>Show only a tray icon after minimizing the window.</source>
         <translation>Mostrar apenas um ícone na bandeja ao minimizar a janela.</translation>
@@ -1159,6 +797,10 @@
         <source>User Interface &amp;language:</source>
         <translation>&amp;Linguagem da interface:</translation>
     </message>
+    <message>
+        <source>The user interface language can be set here. This setting will take effect after restarting %1.</source>
+        <translation>O idioma de interface do usuário pode ser definido aqui. Essa configuração terá efeito após reiniciar o %1</translation>
+    </message>
     <message>
         <source>&amp;Unit to show amounts in:</source>
         <translation>&amp;Unidade usada para mostrar quantidades:</translation>
@@ -1284,136 +926,45 @@
     </message>
 </context>
 <context>
-    <name>PaymentServer</name>
+    <name>PeerTableModel</name>
     <message>
-        <source>URI handling</source>
-        <translation>Manipulação de URI</translation>
+        <source>User Agent</source>
+        <translation>User Agent</translation>
     </message>
     <message>
-        <source>Invalid payment address %1</source>
-        <translation>Endereço de pagamento inválido %1</translation>
+        <source>Node/Service</source>
+        <translation>Nó/Serviço</translation>
     </message>
     <message>
-        <source>Payment request rejected</source>
-        <translation>Solicitação de pagamento rejeitada</translation>
+        <source>Ping Time</source>
+        <translation>Ping</translation>
     </message>
+</context>
+<context>
+    <name>QObject</name>
     <message>
-        <source>Payment request network doesn't match client network.</source>
-        <translation>Rede de pedido de pagamento não corresponde rede do cliente.</translation>
+        <source>Amount</source>
+        <translation>Quantidade</translation>
     </message>
     <message>
-        <source>Payment request is not initialized.</source>
-        <translation>Pedido de pagamento não é inicializado.</translation>
+        <source>Enter a Bitcoin address (e.g. %1)</source>
+        <translation>Informe um endereço Bitcoin (ex: %1)</translation>
     </message>
     <message>
-        <source>Requested payment amount of %1 is too small (considered dust).</source>
-        <translation>Valor do pagamento solicitado de %1 é muito pequeno (Considerado poeira).</translation>
+        <source>%1 d</source>
+        <translation>%1 d</translation>
     </message>
     <message>
-        <source>Payment request error</source>
-        <translation>Erro no pedido de pagamento</translation>
+        <source>%1 h</source>
+        <translation>%1 h</translation>
     </message>
     <message>
-        <source>Cannot start bitcoin: click-to-pay handler</source>
-        <translation>Não foi possível iniciar bitcoin: manipulador clique-para-pagar</translation>
+        <source>%1 m</source>
+        <translation>%1 m</translation>
     </message>
     <message>
-        <source>Payment request fetch URL is invalid: %1</source>
-        <translation>URL de cobrança é inválida: %1</translation>
-    </message>
-    <message>
-        <source>URI cannot be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source>
-        <translation>URI não pode ser analisado ! Isto pode ser causado por um endereço Bitcoin inválido ou parâmetros URI informados incorretamente.</translation>
-    </message>
-    <message>
-        <source>Payment request file handling</source>
-        <translation>Manipulação de arquivo de cobrança</translation>
-    </message>
-    <message>
-        <source>Payment request file cannot be read! This can be caused by an invalid payment request file.</source>
-        <translation>Arquivo de pedido de pagamento não pode ser lido ! Isto pode ser causado por uma requisição de pagamento inválida.</translation>
-    </message>
-    <message>
-        <source>Payment request expired.</source>
-        <translation>Pedido de pagamento expirado.</translation>
-    </message>
-    <message>
-        <source>Unverified payment requests to custom payment scripts are unsupported.</source>
-        <translation>Cobrança não verificada para scripts de pagamento personalizados não é suportado.</translation>
-    </message>
-    <message>
-        <source>Invalid payment request.</source>
-        <translation>Pedido de pagamento inválido.</translation>
-    </message>
-    <message>
-        <source>Refund from %1</source>
-        <translation>Reembolso de %1</translation>
-    </message>
-    <message>
-        <source>Payment request %1 is too large (%2 bytes, allowed %3 bytes).</source>
-        <translation>Pedido de pagamento %1 é muito grande (%2 bytes, permitido %3 bytes).</translation>
-    </message>
-    <message>
-        <source>Error communicating with %1: %2</source>
-        <translation>Erro na comunicação com %1: %2</translation>
-    </message>
-    <message>
-        <source>Payment request cannot be parsed!</source>
-        <translation>Requisição de pagamento não pode ser analisado!</translation>
-    </message>
-    <message>
-        <source>Bad response from server %1</source>
-        <translation>Resposta incorreta do servidor %1</translation>
-    </message>
-    <message>
-        <source>Payment acknowledged</source>
-        <translation>Pagamento reconhecido</translation>
-    </message>
-    <message>
-        <source>Network request error</source>
-        <translation>Erro de solicitação de rede</translation>
-    </message>
-</context>
-<context>
-    <name>PeerTableModel</name>
-    <message>
-        <source>User Agent</source>
-        <translation>User Agent</translation>
-    </message>
-    <message>
-        <source>Node/Service</source>
-        <translation>Nó/Serviço</translation>
-    </message>
-    <message>
-        <source>Ping Time</source>
-        <translation>Ping</translation>
-    </message>
-</context>
-<context>
-    <name>QObject</name>
-    <message>
-        <source>Amount</source>
-        <translation>Quantidade</translation>
-    </message>
-    <message>
-        <source>Enter a Bitcoin address (e.g. %1)</source>
-        <translation>Informe um endereço Bitcoin (ex: %1)</translation>
-    </message>
-    <message>
-        <source>%1 d</source>
-        <translation>%1 d</translation>
-    </message>
-    <message>
-        <source>%1 h</source>
-        <translation>%1 h</translation>
-    </message>
-    <message>
-        <source>%1 m</source>
-        <translation>%1 m</translation>
-    </message>
-    <message>
-        <source>%1 s</source>
-        <translation>%1 s</translation>
+        <source>%1 s</source>
+        <translation>%1 s</translation>
     </message>
     <message>
         <source>None</source>
@@ -1428,25 +979,6 @@
         <translation>%1 ms</translation>
     </message>
 </context>
-<context>
-    <name>QRImageWidget</name>
-    <message>
-        <source>&amp;Save Image...</source>
-        <translation>&amp;Salvar imagem</translation>
-    </message>
-    <message>
-        <source>&amp;Copy Image</source>
-        <translation>&amp;Copiar Imagem</translation>
-    </message>
-    <message>
-        <source>Save QR Code</source>
-        <translation>Salvar código QR</translation>
-    </message>
-    <message>
-        <source>PNG Image (*.png)</source>
-        <translation>PNG Imagem (*.png)</translation>
-    </message>
-</context>
 <context>
     <name>RPCConsole</name>
     <message>
@@ -1513,10 +1045,6 @@
         <source>Memory usage</source>
         <translation>Uso de memória</translation>
     </message>
-    <message>
-        <source>Open the Bitcoin Core debug log file from the current data directory. This can take a few seconds for large log files.</source>
-        <translation>Abrir o arquivo de log de depuração do Bitcoin na pasta de dados atual. Isso pode demorar para arquivos grandes.</translation>
-    </message>
     <message>
         <source>Received</source>
         <translation>Recebido</translation>
@@ -1565,6 +1093,14 @@
         <source>User Agent</source>
         <translation>User Agent</translation>
     </message>
+    <message>
+        <source>Decrease font size</source>
+        <translation>Diminuir o tamanho da fonte</translation>
+    </message>
+    <message>
+        <source>Increase font size</source>
+        <translation>Aumentar o tamanho da fonte</translation>
+    </message>
     <message>
         <source>Services</source>
         <translation>Serviços</translation>
@@ -1633,10 +1169,6 @@
         <source>Out:</source>
         <translation>Saída:</translation>
     </message>
-    <message>
-        <source>Build date</source>
-        <translation>Data do 'build'</translation>
-    </message>
     <message>
         <source>Debug log file</source>
         <translation>Arquivo de log de Depuração</translation>
@@ -1674,8 +1206,8 @@
         <translation>&amp;Desbanir nó</translation>
     </message>
     <message>
-        <source>Welcome to the Bitcoin Core RPC console.</source>
-        <translation>Bem vindo ao console de RPC do Bitcoin.</translation>
+        <source>Welcome to the %1 RPC console.</source>
+        <translation>Bem-vindo ao console RPC do %1</translation>
     </message>
     <message>
         <source>Use up and down arrows to navigate history, and &lt;b&gt;Ctrl-L&lt;/b&gt; to clear screen.</source>
@@ -1804,18 +1336,6 @@
         <source>Remove</source>
         <translation>Remover</translation>
     </message>
-    <message>
-        <source>Copy label</source>
-        <translation>Copiar rótulo</translation>
-    </message>
-    <message>
-        <source>Copy message</source>
-        <translation>Copiar mensagem</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>Copiar quantia</translation>
-    </message>
 </context>
 <context>
     <name>ReceiveRequestDialog</name>
@@ -1835,73 +1355,6 @@
         <source>&amp;Save Image...</source>
         <translation>&amp;Salvar Imagem...</translation>
     </message>
-    <message>
-        <source>Request payment to %1</source>
-        <translation>Requisitar pagamento para %1</translation>
-    </message>
-    <message>
-        <source>Payment information</source>
-        <translation>Informação de pagamento</translation>
-    </message>
-    <message>
-        <source>URI</source>
-        <translation>URI</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>Endereço</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>Quantidade</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Rótulo</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>Mensagem</translation>
-    </message>
-    <message>
-        <source>Resulting URI too long, try to reduce the text for label / message.</source>
-        <translation>URI resultante muito longa. Tente reduzir o texto do rótulo ou da mensagem.</translation>
-    </message>
-    <message>
-        <source>Error encoding URI into QR Code.</source>
-        <translation>Erro ao codigicar o URI em código QR</translation>
-    </message>
-</context>
-<context>
-    <name>RecentRequestsTableModel</name>
-    <message>
-        <source>Date</source>
-        <translation>Data</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Rótulo</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>Mensagem</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>Quantidade</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(Sem rótulo)</translation>
-    </message>
-    <message>
-        <source>(no message)</source>
-        <translation>(sem mensagem)</translation>
-    </message>
-    <message>
-        <source>(no amount)</source>
-        <translation>(sem quantia especificada)</translation>
-    </message>
 </context>
 <context>
     <name>SendCoinsDialog</name>
@@ -1970,935 +1423,289 @@
         <translation>Escolher</translation>
     </message>
     <message>
-        <source>collapse fee-settings</source>
-        <translation>Ocultar painel</translation>
-    </message>
-    <message>
-        <source>per kilobyte</source>
-        <translation>por kilobyte</translation>
-    </message>
-    <message>
-        <source>If the custom fee is set to 1000 satoshis and the transaction is only 250 bytes, then "per kilobyte" only pays 250 satoshis in fee, while "total at least" pays 1000 satoshis. For transactions bigger than a kilobyte both pay by kilobyte.</source>
-        <translation>Se a taxa personalizada for definida em 1000 satoshis e a transação tiver somente 250 bytes, então "por kilobyte" somente paga 250 satoshis de taxa, enquanto "pelo menos" paga 1000 satoshis. Se a transação for maior que 1 kilobyte, ambos pagam por kilobyte.</translation>
-    </message>
-    <message>
-        <source>Hide</source>
-        <translation>Ocultar</translation>
-    </message>
-    <message>
-        <source>total at least</source>
-        <translation>pelo menos</translation>
-    </message>
-    <message>
-        <source>Paying only the minimum fee is just fine as long as there is less transaction volume than space in the blocks. But be aware that this can end up in a never confirming transaction once there is more demand for bitcoin transactions than the network can process.</source>
-        <translation>Pagando apenas a taxa mínima é bom, desde que haja pouco volume de transações. Mas esteja ciente de que isso pode acabar em uma transação nunca confirmanda uma vez que há mais demanda por transações do que a rede pode processar.</translation>
-    </message>
-    <message>
-        <source>(read the tooltip)</source>
-        <translation>(Leia o popup)</translation>
-    </message>
-    <message>
-        <source>Recommended:</source>
-        <translation>Recomendado:</translation>
-    </message>
-    <message>
-        <source>Custom:</source>
-        <translation>Personalizado:</translation>
-    </message>
-    <message>
-        <source>(Smart fee not initialized yet. This usually takes a few blocks...)</source>
-        <translation>(Smart fee não iniciado. Isso requer alguns blocos...)</translation>
-    </message>
-    <message>
-        <source>Confirmation time:</source>
-        <translation>Tempo de confirmação:</translation>
-    </message>
-    <message>
-        <source>normal</source>
-        <translation>normal</translation>
-    </message>
-    <message>
-        <source>fast</source>
-        <translation>rápido </translation>
-    </message>
-    <message>
-        <source>Send as zero-fee transaction if possible</source>
-        <translation>Enviar sem taxa de transação se possível </translation>
-    </message>
-    <message>
-        <source>(confirmation may take longer)</source>
-        <translation>(confirmação pode demorar)</translation>
-    </message>
-    <message>
-        <source>Send to multiple recipients at once</source>
-        <translation>Enviar para vários destinatários de uma só vez</translation>
-    </message>
-    <message>
-        <source>Add &amp;Recipient</source>
-        <translation>Adicionar destinatário</translation>
-    </message>
-    <message>
-        <source>Clear all fields of the form.</source>
-        <translation>Limpar todos os campos do formulário.</translation>
-    </message>
-    <message>
-        <source>Dust:</source>
-        <translation>Poeira:</translation>
-    </message>
-    <message>
-        <source>Clear &amp;All</source>
-        <translation>Limpar Tudo</translation>
-    </message>
-    <message>
-        <source>Balance:</source>
-        <translation>Saldo:</translation>
-    </message>
-    <message>
-        <source>Confirm the send action</source>
-        <translation>Confirmar o envio</translation>
-    </message>
-    <message>
-        <source>S&amp;end</source>
-        <translation>Enviar</translation>
-    </message>
-    <message>
-        <source>Confirm send coins</source>
-        <translation>Confirmar envio de moedas</translation>
-    </message>
-    <message>
-        <source>%1 to %2</source>
-        <translation>%1 para %2</translation>
-    </message>
-    <message>
-        <source>Copy quantity</source>
-        <translation>Copiar quantidade</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>Copiar quantia</translation>
-    </message>
-    <message>
-        <source>Copy fee</source>
-        <translation>Copiar taxa</translation>
-    </message>
-    <message>
-        <source>Copy after fee</source>
-        <translation>Copia pós-taxa</translation>
-    </message>
-    <message>
-        <source>Copy bytes</source>
-        <translation>Copiar bytes</translation>
-    </message>
-    <message>
-        <source>Copy priority</source>
-        <translation>Copia prioridade</translation>
-    </message>
-    <message>
-        <source>Copy change</source>
-        <translation>Copia alteração</translation>
-    </message>
-    <message>
-        <source>Total Amount %1</source>
-        <translation>Quantia Total %1</translation>
-    </message>
-    <message>
-        <source>or</source>
-        <translation>ou</translation>
-    </message>
-    <message>
-        <source>The amount to pay must be larger than 0.</source>
-        <translation>A quantidade a ser paga precisa ser maior que 0.</translation>
-    </message>
-    <message>
-        <source>The amount exceeds your balance.</source>
-        <translation>A quantidade excede seu saldo.</translation>
-    </message>
-    <message>
-        <source>The total exceeds your balance when the %1 transaction fee is included.</source>
-        <translation>O total excede seu saldo quando uma taxa de transação de %1 é incluída.</translation>
-    </message>
-    <message>
-        <source>Transaction creation failed!</source>
-        <translation>A criação de transação falhou!</translation>
-    </message>
-    <message>
-        <source>The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source>
-        <translation>A transação foi rejeitada! Isso pode acontecer se alguns bitcoins na sua carteira já foram gastos em outro local, por exemplo se você tiver uma cópia do wallet.dat e os bitcoins tiverem sido gastos na cópia mas não marcados como gastos aqui ainda.</translation>
-    </message>
-    <message>
-        <source>A fee higher than %1 is considered an absurdly high fee.</source>
-        <translation>Uma taxa maior que %1 é considerada uma taxa absurdamente alto.</translation>
-    </message>
-    <message>
-        <source>Payment request expired.</source>
-        <translation>Pedido de pagamento expirado.</translation>
-    </message>
-    <message>
-        <source>Pay only the required fee of %1</source>
-        <translation>Pagar somente a taxa requerida de %1</translation>
-    </message>
-    <message numerus="yes">
-        <source>Estimated to begin confirmation within %n block(s).</source>
-        <translation><numerusform>Confirmação estimada em %n bloco.</numerusform><numerusform>Confirmação estimada em %n blocos.</numerusform></translation>
-    </message>
-    <message>
-        <source>The recipient address is not valid. Please recheck.</source>
-        <translation>O endereço do destinatário é inválido. Favor confirmar.</translation>
-    </message>
-    <message>
-        <source>Duplicate address found: addresses should only be used once each.</source>
-        <translation>Endereço duplicado encontrado: Endereços devem ser usados somente uma vez cada.</translation>
-    </message>
-    <message>
-        <source>Warning: Invalid Bitcoin address</source>
-        <translation>Atenção: endereço de Bitcoin inválido</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(Sem rótulo)</translation>
-    </message>
-    <message>
-        <source>Warning: Unknown change address</source>
-        <translation>Atenção: endereço de troco desconhecido</translation>
-    </message>
-    <message>
-        <source>Copy dust</source>
-        <translation>Copiar poeira</translation>
-    </message>
-    <message>
-        <source>Are you sure you want to send?</source>
-        <translation>Tem certeza que quer enviar?</translation>
-    </message>
-    <message>
-        <source>added as transaction fee</source>
-        <translation>Adicionado como taxa de transação</translation>
-    </message>
-</context>
-<context>
-    <name>SendCoinsEntry</name>
-    <message>
-        <source>A&amp;mount:</source>
-        <translation>Q&amp;uantidade:</translation>
-    </message>
-    <message>
-        <source>Pay &amp;To:</source>
-        <translation>Pagar &amp;Para:</translation>
-    </message>
-    <message>
-        <source>Enter a label for this address to add it to your address book</source>
-        <translation>Digite um rótulo para este endereço para adicioná-lo ao catálogo de endereços</translation>
-    </message>
-    <message>
-        <source>&amp;Label:</source>
-        <translation>&amp;Rótulo:</translation>
-    </message>
-    <message>
-        <source>Choose previously used address</source>
-        <translation>Escolher endereço usado anteriormente</translation>
-    </message>
-    <message>
-        <source>This is a normal payment.</source>
-        <translation>Este é um pagamento normal.</translation>
-    </message>
-    <message>
-        <source>The Bitcoin address to send the payment to</source>
-        <translation>Endereço que enviará o pagamento</translation>
-    </message>
-    <message>
-        <source>Alt+A</source>
-        <translation>Alt+A</translation>
-    </message>
-    <message>
-        <source>Paste address from clipboard</source>
-        <translation>Colar o endereço da área de transferência</translation>
-    </message>
-    <message>
-        <source>Alt+P</source>
-        <translation>Alt+P</translation>
-    </message>
-    <message>
-        <source>Remove this entry</source>
-        <translation>Remover esta entrada</translation>
-    </message>
-    <message>
-        <source>The fee will be deducted from the amount being sent. The recipient will receive less bitcoins than you enter in the amount field. If multiple recipients are selected, the fee is split equally.</source>
-        <translation>A taxa será deduzida da quantia sendo enviada. O destinatário receberá menos bitcoins do que você colocou no campo de quantidade. Se varios destinatários estão selecionados, a taxa é dividida igualmente.</translation>
-    </message>
-    <message>
-        <source>S&amp;ubtract fee from amount</source>
-        <translation>&amp;Retirar taxa da quantia</translation>
-    </message>
-    <message>
-        <source>Message:</source>
-        <translation>Mensagem:</translation>
-    </message>
-    <message>
-        <source>This is an unauthenticated payment request.</source>
-        <translation>Esta é uma cobrança não autenticada.</translation>
-    </message>
-    <message>
-        <source>This is an authenticated payment request.</source>
-        <translation>Esta é uma cobrança autenticada.</translation>
-    </message>
-    <message>
-        <source>Enter a label for this address to add it to the list of used addresses</source>
-        <translation>Digite um rótulo para este endereço para adicioná-lo no catálogo</translation>
-    </message>
-    <message>
-        <source>A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
-        <translation>A mensagem que foi anexada ao bitcoin: URI na qual será gravada na transação para sua referência. Nota: Essa mensagem não será gravada publicamente na rede Bitcoin.</translation>
-    </message>
-    <message>
-        <source>Pay To:</source>
-        <translation>Pague Para:</translation>
-    </message>
-    <message>
-        <source>Memo:</source>
-        <translation>Memorizar:</translation>
-    </message>
-</context>
-<context>
-    <name>ShutdownWindow</name>
-    <message>
-        <source>Bitcoin Core is shutting down...</source>
-        <translation>Bitcoin está sendo encerrado...</translation>
-    </message>
-    <message>
-        <source>Do not shut down the computer until this window disappears.</source>
-        <translation>Não desligue o computador até que esta janela desapareça.</translation>
-    </message>
-</context>
-<context>
-    <name>SignVerifyMessageDialog</name>
-    <message>
-        <source>Signatures - Sign / Verify a Message</source>
-        <translation>Assinaturas - Assinar / Verificar uma mensagem</translation>
-    </message>
-    <message>
-        <source>&amp;Sign Message</source>
-        <translation>&amp;Assinar mensagem</translation>
-    </message>
-    <message>
-        <source>You can sign messages/agreements with your addresses to prove you can receive bitcoins sent to them. Be careful not to sign anything vague or random, as phishing attacks may try to trick you into signing your identity over to them. Only sign fully-detailed statements you agree to.</source>
-        <translation>Você pode assinar mensagens com seus endereços para provar que você pode receber bitcoins enviados por alguém. Cuidado para não assinar nada vago ou aleatório, pois ataques phishing podem tentar te enganar para assinar coisas para eles como se fosse você. Somente assine termos bem detalhados que você concorde.</translation>
-    </message>
-    <message>
-        <source>The Bitcoin address to sign the message with</source>
-        <translation>O enderesso Bitcoin que assinará a mensagem</translation>
-    </message>
-    <message>
-        <source>Choose previously used address</source>
-        <translation>Escolha um endereço usado anteriormente</translation>
-    </message>
-    <message>
-        <source>Alt+A</source>
-        <translation>Alt+A</translation>
-    </message>
-    <message>
-        <source>Paste address from clipboard</source>
-        <translation>Colar o endereço da área de transferência</translation>
-    </message>
-    <message>
-        <source>Alt+P</source>
-        <translation>Alt+P</translation>
-    </message>
-    <message>
-        <source>Enter the message you want to sign here</source>
-        <translation>Entre a mensagem que você quer assinar aqui</translation>
-    </message>
-    <message>
-        <source>Signature</source>
-        <translation>Assinatura</translation>
-    </message>
-    <message>
-        <source>Copy the current signature to the system clipboard</source>
-        <translation>Copiar a assinatura para a área de transferência do sistema</translation>
-    </message>
-    <message>
-        <source>Sign the message to prove you own this Bitcoin address</source>
-        <translation>Assinar mensagem para provar que você é dono deste endereço Bitcoin</translation>
-    </message>
-    <message>
-        <source>Sign &amp;Message</source>
-        <translation>Assinar &amp;mensagem</translation>
-    </message>
-    <message>
-        <source>Reset all sign message fields</source>
-        <translation>Limpar todos os campos de assinatura da mensagem</translation>
-    </message>
-    <message>
-        <source>Clear &amp;All</source>
-        <translation>Limpar Tudo</translation>
-    </message>
-    <message>
-        <source>&amp;Verify Message</source>
-        <translation>&amp;Verificar mensagem</translation>
-    </message>
-    <message>
-        <source>Enter the receiver's address, message (ensure you copy line breaks, spaces, tabs, etc. exactly) and signature below to verify the message. Be careful not to read more into the signature than what is in the signed message itself, to avoid being tricked by a man-in-the-middle attack. Note that this only proves the signing party receives with the address, it cannot prove sendership of any transaction!</source>
-        <translation>Coloque o endereço do autor, a mensagem (certifique-se de copiar toda a mensagem, incluindo quebras de linha, espaços, tabulações, etc.) e a assinatura embaixo para verificar a mensagem. Cuidado para não ler mais da assinatura do que está assinado na mensagem, para evitar ser enganado pelo ataque man-in-the-middle. Note que isso somente prova a propriedade de um endereço, e não o remetende de qualquer transação.</translation>
-    </message>
-    <message>
-        <source>The Bitcoin address the message was signed with</source>
-        <translation>O enderesso Bitcoin que assionou a mesnagem</translation>
-    </message>
-    <message>
-        <source>Verify the message to ensure it was signed with the specified Bitcoin address</source>
-        <translation>Verificar mensagem para se assegurar que ela foi assinada pelo dono de um endereço Bitcoin específico.</translation>
-    </message>
-    <message>
-        <source>Verify &amp;Message</source>
-        <translation>Verificar &amp;mensagem</translation>
-    </message>
-    <message>
-        <source>Reset all verify message fields</source>
-        <translation>Limpar todos os campos de assinatura da mensagem</translation>
-    </message>
-    <message>
-        <source>Click "Sign Message" to generate signature</source>
-        <translation>Clique em "Assinar mensagem" para gerar a assinatura</translation>
-    </message>
-    <message>
-        <source>The entered address is invalid.</source>
-        <translation>O endereço fornecido é inválido.</translation>
-    </message>
-    <message>
-        <source>Please check the address and try again.</source>
-        <translation>Por favor, verifique o endereço e tente novamente.</translation>
-    </message>
-    <message>
-        <source>The entered address does not refer to a key.</source>
-        <translation>O endereço fornecido não se refere a uma chave.</translation>
-    </message>
-    <message>
-        <source>Wallet unlock was cancelled.</source>
-        <translation>Desbloqueamento da Carteira foi cancelado.</translation>
-    </message>
-    <message>
-        <source>Private key for the entered address is not available.</source>
-        <translation>A chave privada para o endereço fornecido não está disponível.</translation>
-    </message>
-    <message>
-        <source>Message signing failed.</source>
-        <translation>Assinatura da mensagem falhou.</translation>
-    </message>
-    <message>
-        <source>Message signed.</source>
-        <translation>Mensagem assinada.</translation>
-    </message>
-    <message>
-        <source>The signature could not be decoded.</source>
-        <translation>A assinatura não pode ser decodificada.</translation>
-    </message>
-    <message>
-        <source>Please check the signature and try again.</source>
-        <translation>Por favor, verifique a assinatura e tente novamente.</translation>
-    </message>
-    <message>
-        <source>The signature did not match the message digest.</source>
-        <translation>A assinatura não corresponde ao "resumo da mensagem".</translation>
-    </message>
-    <message>
-        <source>Message verification failed.</source>
-        <translation>Verificação da mensagem falhou.</translation>
-    </message>
-    <message>
-        <source>Message verified.</source>
-        <translation>Mensagem verificada.</translation>
-    </message>
-</context>
-<context>
-    <name>SplashScreen</name>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Bitcoin</translation>
-    </message>
-    <message>
-        <source>The Bitcoin Core developers</source>
-        <translation>Programadores do Bitcoin</translation>
-    </message>
-    <message>
-        <source>[testnet]</source>
-        <translation>[testnet]</translation>
-    </message>
-</context>
-<context>
-    <name>TrafficGraphWidget</name>
-    <message>
-        <source>KB/s</source>
-        <translation>KB/s</translation>
-    </message>
-</context>
-<context>
-    <name>TransactionDesc</name>
-    <message>
-        <source>Open until %1</source>
-        <translation>Aberto até %1</translation>
-    </message>
-    <message>
-        <source>conflicted</source>
-        <translation>em conflito</translation>
-    </message>
-    <message>
-        <source>%1/offline</source>
-        <translation>%1/offline</translation>
-    </message>
-    <message>
-        <source>%1/unconfirmed</source>
-        <translation>%1/não confirmadas</translation>
-    </message>
-    <message>
-        <source>%1 confirmations</source>
-        <translation>%1 confirmações</translation>
-    </message>
-    <message>
-        <source>Status</source>
-        <translation>Status</translation>
-    </message>
-    <message numerus="yes">
-        <source>, broadcast through %n node(s)</source>
-        <translation><numerusform>, difundir atráves de %n nó</numerusform><numerusform>, difundir atráves de %n nós</numerusform></translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation>Data</translation>
-    </message>
-    <message>
-        <source>Source</source>
-        <translation>Fonte</translation>
-    </message>
-    <message>
-        <source>Generated</source>
-        <translation>Gerados</translation>
-    </message>
-    <message>
-        <source>From</source>
-        <translation>De</translation>
-    </message>
-    <message>
-        <source>To</source>
-        <translation>Para</translation>
-    </message>
-    <message>
-        <source>own address</source>
-        <translation>seu próprio endereço</translation>
-    </message>
-    <message>
-        <source>watch-only</source>
-        <translation>monitorado</translation>
-    </message>
-    <message>
-        <source>label</source>
-        <translation>rótulo</translation>
-    </message>
-    <message>
-        <source>Credit</source>
-        <translation>Crédito</translation>
-    </message>
-    <message numerus="yes">
-        <source>matures in %n more block(s)</source>
-        <translation><numerusform>matura em mais %n bloco</numerusform><numerusform>matura em mais %n blocos</numerusform></translation>
-    </message>
-    <message>
-        <source>not accepted</source>
-        <translation>não aceito</translation>
-    </message>
-    <message>
-        <source>Debit</source>
-        <translation>Débito</translation>
-    </message>
-    <message>
-        <source>Total debit</source>
-        <translation>Débito total</translation>
-    </message>
-    <message>
-        <source>Total credit</source>
-        <translation>Credito total</translation>
-    </message>
-    <message>
-        <source>Transaction fee</source>
-        <translation>Taxa de transação</translation>
-    </message>
-    <message>
-        <source>Net amount</source>
-        <translation>Valor líquido</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>Mensagem</translation>
-    </message>
-    <message>
-        <source>Comment</source>
-        <translation>Comentário</translation>
-    </message>
-    <message>
-        <source>Transaction ID</source>
-        <translation>ID da transação</translation>
-    </message>
-    <message>
-        <source>Merchant</source>
-        <translation>Mercador</translation>
-    </message>
-    <message>
-        <source>Generated coins must mature %1 blocks before they can be spent. When you generated this block, it was broadcast to the network to be added to the block chain. If it fails to get into the chain, its state will change to "not accepted" and it won't be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source>
-        <translation>Bitcoins recém minerados precisam aguardar %1 blocos antes de serem gastos. Quando o bloco foi gerado, ele foi disseminado pela rede para ser adicionado à blockchain. Se ele falhar em ser inserido na cadeia, seu estado será modificado para "não aceito" e ele não poderá ser gasto. Isso pode acontecer eventualmente quando blocos são gerados quase que simultaneamente.</translation>
-    </message>
-    <message>
-        <source>Debug information</source>
-        <translation>Informação de depuração</translation>
-    </message>
-    <message>
-        <source>Transaction</source>
-        <translation>Transação</translation>
-    </message>
-    <message>
-        <source>Inputs</source>
-        <translation>Entradas</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>Quantidade</translation>
-    </message>
-    <message>
-        <source>true</source>
-        <translation>verdadeiro</translation>
-    </message>
-    <message>
-        <source>false</source>
-        <translation>falso</translation>
-    </message>
-    <message>
-        <source>, has not been successfully broadcast yet</source>
-        <translation>, ainda não foi propagada na rede com sucesso.</translation>
-    </message>
-    <message numerus="yes">
-        <source>Open for %n more block(s)</source>
-        <translation><numerusform>Abrir para mais %n bloco</numerusform><numerusform>Abrir para mais %n blocos</numerusform></translation>
-    </message>
-    <message>
-        <source>unknown</source>
-        <translation>desconhecido</translation>
-    </message>
-</context>
-<context>
-    <name>TransactionDescDialog</name>
-    <message>
-        <source>Transaction details</source>
-        <translation>Detalhes da transação</translation>
-    </message>
-    <message>
-        <source>This pane shows a detailed description of the transaction</source>
-        <translation>Este painel mostra uma descrição detalhada da transação</translation>
-    </message>
-</context>
-<context>
-    <name>TransactionTableModel</name>
-    <message>
-        <source>Date</source>
-        <translation>Data</translation>
+        <source>collapse fee-settings</source>
+        <translation>Ocultar painel</translation>
     </message>
     <message>
-        <source>Type</source>
-        <translation>Tipo</translation>
+        <source>per kilobyte</source>
+        <translation>por kilobyte</translation>
     </message>
     <message>
-        <source>Immature (%1 confirmations, will be available after %2)</source>
-        <translation>Recém-criado (%1 confirmações, disponível somente após %2)</translation>
+        <source>If the custom fee is set to 1000 satoshis and the transaction is only 250 bytes, then "per kilobyte" only pays 250 satoshis in fee, while "total at least" pays 1000 satoshis. For transactions bigger than a kilobyte both pay by kilobyte.</source>
+        <translation>Se a taxa personalizada for definida em 1000 satoshis e a transação tiver somente 250 bytes, então "por kilobyte" somente paga 250 satoshis de taxa, enquanto "pelo menos" paga 1000 satoshis. Se a transação for maior que 1 kilobyte, ambos pagam por kilobyte.</translation>
     </message>
-    <message numerus="yes">
-        <source>Open for %n more block(s)</source>
-        <translation><numerusform>Abrir para mais %n bloco</numerusform><numerusform>Abrir para mais %n blocos</numerusform></translation>
+    <message>
+        <source>Hide</source>
+        <translation>Ocultar</translation>
     </message>
     <message>
-        <source>Open until %1</source>
-        <translation>Aberto até %1</translation>
+        <source>total at least</source>
+        <translation>pelo menos</translation>
     </message>
     <message>
-        <source>Confirmed (%1 confirmations)</source>
-        <translation>Confirmado (%1 confirmações)</translation>
+        <source>Paying only the minimum fee is just fine as long as there is less transaction volume than space in the blocks. But be aware that this can end up in a never confirming transaction once there is more demand for bitcoin transactions than the network can process.</source>
+        <translation>Pagando apenas a taxa mínima é bom, desde que haja pouco volume de transações. Mas esteja ciente de que isso pode acabar em uma transação nunca confirmanda uma vez que há mais demanda por transações do que a rede pode processar.</translation>
     </message>
     <message>
-        <source>This block was not received by any other nodes and will probably not be accepted!</source>
-        <translation>Este bloco não foi recebido por nenhum outro participante da rede e provavelmente não será aceito!</translation>
+        <source>(read the tooltip)</source>
+        <translation>(Leia o popup)</translation>
     </message>
     <message>
-        <source>Generated but not accepted</source>
-        <translation>Gerado mas não aceito</translation>
+        <source>Recommended:</source>
+        <translation>Recomendado:</translation>
     </message>
     <message>
-        <source>Offline</source>
-        <translation>Offline</translation>
+        <source>Custom:</source>
+        <translation>Personalizado:</translation>
     </message>
     <message>
-        <source>Label</source>
-        <translation>Rótulo</translation>
+        <source>(Smart fee not initialized yet. This usually takes a few blocks...)</source>
+        <translation>(Smart fee não iniciado. Isso requer alguns blocos...)</translation>
     </message>
     <message>
-        <source>Unconfirmed</source>
-        <translation>Não confirmado</translation>
+        <source>Confirmation time:</source>
+        <translation>Tempo de confirmação:</translation>
     </message>
     <message>
-        <source>Confirming (%1 of %2 recommended confirmations)</source>
-        <translation>Confirmando (%1 de %2 confirmações recomendadas)</translation>
+        <source>normal</source>
+        <translation>normal</translation>
     </message>
     <message>
-        <source>Conflicted</source>
-        <translation>Conflitou</translation>
+        <source>fast</source>
+        <translation>rápido </translation>
     </message>
     <message>
-        <source>Received with</source>
-        <translation>Recebido</translation>
+        <source>Send to multiple recipients at once</source>
+        <translation>Enviar para vários destinatários de uma só vez</translation>
     </message>
     <message>
-        <source>Received from</source>
-        <translation>Recebido</translation>
+        <source>Add &amp;Recipient</source>
+        <translation>Adicionar destinatário</translation>
     </message>
     <message>
-        <source>Sent to</source>
-        <translation>Enviado</translation>
+        <source>Clear all fields of the form.</source>
+        <translation>Limpar todos os campos do formulário.</translation>
     </message>
     <message>
-        <source>Payment to yourself</source>
-        <translation>Pagamento para você mesmo</translation>
+        <source>Dust:</source>
+        <translation>Poeira:</translation>
     </message>
     <message>
-        <source>Mined</source>
-        <translation>Minerado</translation>
+        <source>Clear &amp;All</source>
+        <translation>Limpar Tudo</translation>
     </message>
     <message>
-        <source>watch-only</source>
-        <translation>monitorado</translation>
+        <source>Balance:</source>
+        <translation>Saldo:</translation>
     </message>
     <message>
-        <source>(n/a)</source>
-        <translation>(n/a)</translation>
+        <source>Confirm the send action</source>
+        <translation>Confirmar o envio</translation>
     </message>
     <message>
-        <source>Transaction status. Hover over this field to show number of confirmations.</source>
-        <translation>Status da transação. Passe o mouse sobre este campo para mostrar o número de confirmações.</translation>
+        <source>S&amp;end</source>
+        <translation>Enviar</translation>
     </message>
+</context>
+<context>
+    <name>SendCoinsEntry</name>
     <message>
-        <source>Date and time that the transaction was received.</source>
-        <translation>Data e hora em que a transação foi recebida.</translation>
+        <source>A&amp;mount:</source>
+        <translation>Q&amp;uantidade:</translation>
     </message>
     <message>
-        <source>Type of transaction.</source>
-        <translation>Tipo de transação.</translation>
+        <source>Pay &amp;To:</source>
+        <translation>Pagar &amp;Para:</translation>
     </message>
     <message>
-        <source>Whether or not a watch-only address is involved in this transaction.</source>
-        <translation>Mostrar ou não endereços Bitcoin na lista de transações.</translation>
+        <source>&amp;Label:</source>
+        <translation>&amp;Rótulo:</translation>
     </message>
     <message>
-        <source>User-defined intent/purpose of the transaction.</source>
-        <translation>Intenção/Propósito definido pelo usuário para a transação</translation>
+        <source>Choose previously used address</source>
+        <translation>Escolher endereço usado anteriormente</translation>
     </message>
     <message>
-        <source>Amount removed from or added to balance.</source>
-        <translation>Quantidade debitada ou creditada ao saldo.</translation>
+        <source>This is a normal payment.</source>
+        <translation>Este é um pagamento normal.</translation>
     </message>
-</context>
-<context>
-    <name>TransactionView</name>
     <message>
-        <source>All</source>
-        <translation>Todos</translation>
+        <source>The Bitcoin address to send the payment to</source>
+        <translation>Endereço que enviará o pagamento</translation>
     </message>
     <message>
-        <source>Today</source>
-        <translation>Hoje</translation>
+        <source>Alt+A</source>
+        <translation>Alt+A</translation>
     </message>
     <message>
-        <source>This week</source>
-        <translation>Esta semana</translation>
+        <source>Paste address from clipboard</source>
+        <translation>Colar o endereço da área de transferência</translation>
     </message>
     <message>
-        <source>This month</source>
-        <translation>Este mês</translation>
+        <source>Alt+P</source>
+        <translation>Alt+P</translation>
     </message>
     <message>
-        <source>Last month</source>
-        <translation>Mês passado</translation>
+        <source>Remove this entry</source>
+        <translation>Remover esta entrada</translation>
     </message>
     <message>
-        <source>This year</source>
-        <translation>Este ano</translation>
+        <source>The fee will be deducted from the amount being sent. The recipient will receive less bitcoins than you enter in the amount field. If multiple recipients are selected, the fee is split equally.</source>
+        <translation>A taxa será deduzida da quantia sendo enviada. O destinatário receberá menos bitcoins do que você colocou no campo de quantidade. Se varios destinatários estão selecionados, a taxa é dividida igualmente.</translation>
     </message>
     <message>
-        <source>Range...</source>
-        <translation>Intervalo...</translation>
+        <source>S&amp;ubtract fee from amount</source>
+        <translation>&amp;Retirar taxa da quantia</translation>
     </message>
     <message>
-        <source>Received with</source>
-        <translation>Recebido</translation>
+        <source>Message:</source>
+        <translation>Mensagem:</translation>
     </message>
     <message>
-        <source>Sent to</source>
-        <translation>Enviado</translation>
+        <source>This is an unauthenticated payment request.</source>
+        <translation>Esta é uma cobrança não autenticada.</translation>
     </message>
     <message>
-        <source>To yourself</source>
-        <translation>Para você mesmo</translation>
+        <source>This is an authenticated payment request.</source>
+        <translation>Esta é uma cobrança autenticada.</translation>
     </message>
     <message>
-        <source>Mined</source>
-        <translation>Minerado</translation>
+        <source>Enter a label for this address to add it to the list of used addresses</source>
+        <translation>Digite um rótulo para este endereço para adicioná-lo no catálogo</translation>
     </message>
     <message>
-        <source>Other</source>
-        <translation>Outro</translation>
+        <source>A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
+        <translation>A mensagem que foi anexada ao bitcoin: URI na qual será gravada na transação para sua referência. Nota: Essa mensagem não será gravada publicamente na rede Bitcoin.</translation>
     </message>
     <message>
-        <source>Enter address or label to search</source>
-        <translation>Procure um endereço ou rótulo</translation>
+        <source>Pay To:</source>
+        <translation>Pague Para:</translation>
     </message>
     <message>
-        <source>Min amount</source>
-        <translation>Quantidade mínima</translation>
+        <source>Memo:</source>
+        <translation>Memorizar:</translation>
     </message>
+</context>
+<context>
+    <name>ShutdownWindow</name>
     <message>
-        <source>Copy address</source>
-        <translation>Copiar endereço</translation>
+        <source>Do not shut down the computer until this window disappears.</source>
+        <translation>Não desligue o computador até que esta janela desapareça.</translation>
     </message>
+</context>
+<context>
+    <name>SignVerifyMessageDialog</name>
     <message>
-        <source>Copy label</source>
-        <translation>Copiar rótulo</translation>
+        <source>Signatures - Sign / Verify a Message</source>
+        <translation>Assinaturas - Assinar / Verificar uma mensagem</translation>
     </message>
     <message>
-        <source>Copy amount</source>
-        <translation>Copiar quantia</translation>
+        <source>&amp;Sign Message</source>
+        <translation>&amp;Assinar mensagem</translation>
     </message>
     <message>
-        <source>Copy transaction ID</source>
-        <translation>Copiar ID da transação</translation>
+        <source>You can sign messages/agreements with your addresses to prove you can receive bitcoins sent to them. Be careful not to sign anything vague or random, as phishing attacks may try to trick you into signing your identity over to them. Only sign fully-detailed statements you agree to.</source>
+        <translation>Você pode assinar mensagens com seus endereços para provar que você pode receber bitcoins enviados por alguém. Cuidado para não assinar nada vago ou aleatório, pois ataques phishing podem tentar te enganar para assinar coisas para eles como se fosse você. Somente assine termos bem detalhados que você concorde.</translation>
     </message>
     <message>
-        <source>Copy raw transaction</source>
-        <translation>Copia os dados brutos da transação</translation>
+        <source>The Bitcoin address to sign the message with</source>
+        <translation>O enderesso Bitcoin que assinará a mensagem</translation>
     </message>
     <message>
-        <source>Edit label</source>
-        <translation>Editar rótulo</translation>
+        <source>Choose previously used address</source>
+        <translation>Escolha um endereço usado anteriormente</translation>
     </message>
     <message>
-        <source>Show transaction details</source>
-        <translation>Mostrar detalhes da transação</translation>
+        <source>Alt+A</source>
+        <translation>Alt+A</translation>
     </message>
     <message>
-        <source>Export Transaction History</source>
-        <translation>Exportar Histórico de Transação</translation>
+        <source>Paste address from clipboard</source>
+        <translation>Colar o endereço da área de transferência</translation>
     </message>
     <message>
-        <source>Watch-only</source>
-        <translation>Monitorado</translation>
+        <source>Alt+P</source>
+        <translation>Alt+P</translation>
     </message>
     <message>
-        <source>Exporting Failed</source>
-        <translation>Exportação Falhou</translation>
+        <source>Enter the message you want to sign here</source>
+        <translation>Entre a mensagem que você quer assinar aqui</translation>
     </message>
     <message>
-        <source>There was an error trying to save the transaction history to %1.</source>
-        <translation>Ocorreu um erro ao tentar salvar o histórico de transação em %1.</translation>
+        <source>Signature</source>
+        <translation>Assinatura</translation>
     </message>
     <message>
-        <source>Exporting Successful</source>
-        <translation>Exportação feita com sucesso</translation>
+        <source>Copy the current signature to the system clipboard</source>
+        <translation>Copiar a assinatura para a área de transferência do sistema</translation>
     </message>
     <message>
-        <source>The transaction history was successfully saved to %1.</source>
-        <translation>O histórico de transação foi gravado com sucesso em %1.</translation>
+        <source>Sign the message to prove you own this Bitcoin address</source>
+        <translation>Assinar mensagem para provar que você é dono deste endereço Bitcoin</translation>
     </message>
     <message>
-        <source>Comma separated file (*.csv)</source>
-        <translation>Arquivo separado por vírgulas (*. csv)</translation>
+        <source>Sign &amp;Message</source>
+        <translation>Assinar &amp;mensagem</translation>
     </message>
     <message>
-        <source>Confirmed</source>
-        <translation>Confirmado</translation>
+        <source>Reset all sign message fields</source>
+        <translation>Limpar todos os campos de assinatura da mensagem</translation>
     </message>
     <message>
-        <source>Date</source>
-        <translation>Data</translation>
+        <source>Clear &amp;All</source>
+        <translation>Limpar Tudo</translation>
     </message>
     <message>
-        <source>Type</source>
-        <translation>Tipo</translation>
+        <source>&amp;Verify Message</source>
+        <translation>&amp;Verificar mensagem</translation>
     </message>
     <message>
-        <source>Label</source>
-        <translation>Rótulo</translation>
+        <source>Enter the receiver's address, message (ensure you copy line breaks, spaces, tabs, etc. exactly) and signature below to verify the message. Be careful not to read more into the signature than what is in the signed message itself, to avoid being tricked by a man-in-the-middle attack. Note that this only proves the signing party receives with the address, it cannot prove sendership of any transaction!</source>
+        <translation>Coloque o endereço do autor, a mensagem (certifique-se de copiar toda a mensagem, incluindo quebras de linha, espaços, tabulações, etc.) e a assinatura embaixo para verificar a mensagem. Cuidado para não ler mais da assinatura do que está assinado na mensagem, para evitar ser enganado pelo ataque man-in-the-middle. Note que isso somente prova a propriedade de um endereço, e não o remetende de qualquer transação.</translation>
     </message>
     <message>
-        <source>Address</source>
-        <translation>Endereço</translation>
+        <source>The Bitcoin address the message was signed with</source>
+        <translation>O enderesso Bitcoin que assionou a mesnagem</translation>
     </message>
     <message>
-        <source>ID</source>
-        <translation>ID</translation>
+        <source>Verify the message to ensure it was signed with the specified Bitcoin address</source>
+        <translation>Verificar mensagem para se assegurar que ela foi assinada pelo dono de um endereço Bitcoin específico.</translation>
     </message>
     <message>
-        <source>Range:</source>
-        <translation>Intervalo: </translation>
+        <source>Verify &amp;Message</source>
+        <translation>Verificar &amp;mensagem</translation>
     </message>
     <message>
-        <source>to</source>
-        <translation>para</translation>
+        <source>Reset all verify message fields</source>
+        <translation>Limpar todos os campos de assinatura da mensagem</translation>
     </message>
 </context>
 <context>
-    <name>UnitDisplayStatusBarControl</name>
+    <name>SplashScreen</name>
     <message>
-        <source>Unit to show amounts in. Click to select another unit.</source>
-        <translation>Unidade para mostrar. Clique para selecionar outra unidade.</translation>
+        <source>[testnet]</source>
+        <translation>[testnet]</translation>
     </message>
 </context>
 <context>
-    <name>WalletFrame</name>
+    <name>TrafficGraphWidget</name>
     <message>
-        <source>No wallet has been loaded.</source>
-        <translation>Nenhuma carteira foi carregada.</translation>
+        <source>KB/s</source>
+        <translation>KB/s</translation>
     </message>
 </context>
 <context>
-    <name>WalletModel</name>
+    <name>TransactionDescDialog</name>
     <message>
-        <source>Send Coins</source>
-        <translation>Send Coins</translation>
+        <source>This pane shows a detailed description of the transaction</source>
+        <translation>Este painel mostra uma descrição detalhada da transação</translation>
     </message>
 </context>
 <context>
-    <name>WalletView</name>
-    <message>
-        <source>&amp;Export</source>
-        <translation>&amp;Exportar</translation>
-    </message>
-    <message>
-        <source>Export the data in the current tab to a file</source>
-        <translation>Exportar os dados na aba atual para um arquivo</translation>
-    </message>
-    <message>
-        <source>Backup Wallet</source>
-        <translation>Fazer cópia de segurança da Carteira</translation>
-    </message>
-    <message>
-        <source>Wallet Data (*.dat)</source>
-        <translation>Dados da Carteira (*.dat)</translation>
-    </message>
-    <message>
-        <source>Backup Failed</source>
-        <translation>Cópia de segurança Falhou</translation>
-    </message>
-    <message>
-        <source>There was an error trying to save the wallet data to %1.</source>
-        <translation>Ocorreu um erro ao tentar salvar os dados da carteira em %1.</translation>
-    </message>
-    <message>
-        <source>The wallet data was successfully saved to %1.</source>
-        <translation>Os dados da carteira foram salvos com sucesso em %1.</translation>
-    </message>
+    <name>UnitDisplayStatusBarControl</name>
     <message>
-        <source>Backup Successful</source>
-        <translation>Backup feito com sucesso</translation>
+        <source>Unit to show amounts in. Click to select another unit.</source>
+        <translation>Unidade para mostrar. Clique para selecionar outra unidade.</translation>
     </message>
 </context>
 <context>
@@ -2927,14 +1734,6 @@
         <source>If &lt;category&gt; is not supplied or if &lt;category&gt; = 1, output all debugging information.</source>
         <translation>Se &lt;category&gt; não for suprida ou se &lt;category&gt; = 1, mostrar toda informação de depuração.</translation>
     </message>
-    <message>
-        <source>Maximum total fees (in %s) to use in a single wallet transaction; setting this too low may abort large transactions (default: %s)</source>
-        <translation>Total máximo de comissão (em %s) que será usado em uma única transação; um valor muito baixo pode cancelar uma transação grande (padrão: %s)</translation>
-    </message>
-    <message>
-        <source>Please check that your computer's date and time are correct! If your clock is wrong Bitcoin Core will not work properly.</source>
-        <translation>Por favor verifique se a data e horário estão corretos no seu computador! Se o seu relógio estiver incorreto, a Carteira Bitcoin não irá funcionar corretamente.</translation>
-    </message>
     <message>
         <source>Prune configured below the minimum of %d MiB.  Please use a higher number.</source>
         <translation>Corte configurado abaixo do nível mínimo de %d de MiB. Por favor use um número mais alto.</translation>
@@ -2975,6 +1774,10 @@
         <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
         <translation>Aceitar conexões externas (padrão: 1 se opções -proxy ou -connect não estiverem presentes)</translation>
     </message>
+    <message>
+        <source>Bitcoin Core</source>
+        <translation>Bitcoin</translation>
+    </message>
     <message>
         <source>-fallbackfee is set very high! This is the transaction fee you may pay when fee estimates are not available.</source>
         <translation>-fallbackfee está muito alta! Essa é a taxa de transação que você vai pagar quando a taxa estimada não estiver disponível.</translation>
@@ -3019,14 +1822,6 @@
         <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
         <translation>Este pode ser um build de teste pré-lançamento - use por sua conta e risco - não use para mineração ou aplicações de comércio.</translation>
     </message>
-    <message>
-        <source>Unable to bind to %s on this computer. Bitcoin Core is probably already running.</source>
-        <translation>Impossível ouvir em %s neste computador. Provavelmente o Bitcoin já está sendo executado.</translation>
-    </message>
-    <message>
-        <source>Unsupported argument -whitelistalwaysrelay ignored, use -whitelistrelay and/or -whitelistforcerelay.</source>
-        <translation>Argumento não suportado -whitelistalwaysrelay foi ignorado, utilize -whitelistrelay e/ou -whitelistforcerelay.</translation>
-    </message>
     <message>
         <source>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</source>
         <translation>Use UPnP para mapear a porta escutada (padrão: 1 quando escutando e sem -proxy)</translation>
@@ -3043,18 +1838,10 @@
         <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source>
         <translation>Atenção: A rede não parecem concordar plenamente! Alguns mineiros parecem estar enfrentando problemas.</translation>
     </message>
-    <message>
-        <source>Warning: Unknown block versions being mined! It's possible unknown rules are in effect</source>
-        <translation>Aviso: Versões de bloco desconhecidas sendo mineradas! É possível que regras estranhas estejam ativas</translation>
-    </message>
     <message>
         <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source>
         <translation>Atenção: Nós não parecemos concordar plenamente com nossos colegas! Você pode precisar atualizar ou outros nós podem precisar atualizar.</translation>
     </message>
-    <message>
-        <source>Warning: wallet.dat corrupt, data salvaged! Original wallet.dat saved as wallet.{timestamp}.bak in %s; if your balance or transactions are incorrect you should restore from a backup.</source>
-        <translation>Atenção: wallet.dat corrompido, dados recuperados! Arquivo wallet.dat original salvo como wallet.{timestamp}.bak em %s; se seu saldo ou transações estiverem incorretos, você deve restaurar o backup.</translation>
-    </message>
     <message>
         <source>Whitelist peers connecting from the given netmask or IP address. Can be specified multiple times.</source>
         <translation>Lista Branca pares de ligação da máscara de rede dado ou o endereço IP . Pode ser especificado várias vezes.</translation>
@@ -3239,10 +2026,6 @@
         <source>Wallet options:</source>
         <translation>Opções da carteira:</translation>
     </message>
-    <message>
-        <source>You need to rebuild the database using -reindex to change -txindex</source>
-        <translation>Você precisa reconstruir o banco de dados utilizando -reindex</translation>
-    </message>
     <message>
         <source>Allow JSON-RPC connections from specified source. Valid for &lt;ip&gt; are a single IP (e.g. 1.2.3.4), a network/netmask (e.g. 1.2.3.4/255.255.255.0) or a network/CIDR (e.g. 1.2.3.4/24). This option can be specified multiple times</source>
         <translation>Permitir conexões JSON-RPC de uma fonte específica. Válido para um único ip (ex. 1.2.3.4), até uma rede/máscara (ex. 1.2.3.4/255.255.255.0) ou uma rede/CIDR (ex. 1.2.3.4/24). Esta opção pode ser usada múltiplas vezes</translation>
@@ -3255,10 +2038,6 @@
         <source>Bind to given address to listen for JSON-RPC connections. Use [host]:port notation for IPv6. This option can be specified multiple times (default: bind to all interfaces)</source>
         <translation>Conecte ao endereço dado para receber conecções JSON-RPC. Use a notação [destino]:porta para IPv6. Essa opção pode ser especificada várias vezes (padrão: conecte a todas as interfaces)</translation>
     </message>
-    <message>
-        <source>Cannot obtain a lock on data directory %s. Bitcoin Core is probably already running.</source>
-        <translation>Não foi possível obter acesso exclusivo ao diretório de dados %s. Provavelmente Bitcoin já está sendo executado.</translation>
-    </message>
     <message>
         <source>Create new files with system default permissions, instead of umask 077 (only effective with disabled wallet functionality)</source>
         <translation>Criar novos arquivos com permissões padrão do sistema, em vez de umask 077 (apenas efetivo com funcionalidade de carteira desabilitada)</translation>
@@ -3303,10 +2082,6 @@
         <source>Set maximum size of high-priority/low-fee transactions in bytes (default: %d)</source>
         <translation>Define o tamanho máximo de alta-prioridade por taxa baixa nas transações em bytes (padrão: %d)</translation>
     </message>
-    <message>
-        <source>Set the number of threads for coin generation if enabled (-1 = all cores, default: %d)</source>
-        <translation>Determina o número de núcleos para a geração de moedas se ativado (-1 = todos os núcleos, padrão: %d)</translation>
-    </message>
     <message>
         <source>The transaction amount is too small to send after the fee has been deducted</source>
         <translation>A quantia da transação é muito pequena para mandar </translation>
@@ -3331,34 +2106,14 @@
         <source>Accept public REST requests (default: %u)</source>
         <translation>Aceitar pedidos restantes públicas (padrão: %u)</translation>
     </message>
-    <message>
-        <source>Activating best chain...</source>
-        <translation>Ativando a melhor sequência...</translation>
-    </message>
-    <message>
-        <source>Attempt to recover private keys from a corrupt wallet.dat on startup</source>
-        <translation>Tentar recuperar na inicialização chaves privadas de um arquivo wallet.dat corrompido</translation>
-    </message>
     <message>
         <source>Automatically create Tor hidden service (default: %d)</source>
         <translation>Criar automaticamente serviços ocultos do Tor (padrão: %d)</translation>
     </message>
-    <message>
-        <source>Cannot resolve -whitebind address: '%s'</source>
-        <translation>Impossível resolver endereço -whitebind: '%s'</translation>
-    </message>
     <message>
         <source>Connect through SOCKS5 proxy</source>
         <translation>Connecte-se através de um proxy SOCKS5</translation>
     </message>
-    <message>
-        <source>Copyright (C) 2009-%i The Bitcoin Core Developers</source>
-        <translation>Copyright (C) 2009-%i Desenvolvedores Bitcoin Core</translation>
-    </message>
-    <message>
-        <source>Error loading wallet.dat: Wallet requires newer version of Bitcoin Core</source>
-        <translation>Erro ao carregar wallet.dat: A carteira requer a nova versão do Bitcoin</translation>
-    </message>
     <message>
         <source>Error reading from database, shutting down.</source>
         <translation>Erro ao ler o banco de dados. Finalizando.</translation>
@@ -3371,22 +2126,6 @@
         <source>Information</source>
         <translation>Informação</translation>
     </message>
-    <message>
-        <source>Initialization sanity check failed. Bitcoin Core is shutting down.</source>
-        <translation>O teste de integridade da inicialização falhou. O Core do Bitcoin está sendo desligado.</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -maxtxfee=&lt;amount&gt;: '%s'</source>
-        <translation>Quantidade inválida para -maxtxfee=&lt;quantidade&gt;: '%s'</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -minrelaytxfee=&lt;amount&gt;: '%s'</source>
-        <translation>Quantidade inválida para -minrelaytxfee=&lt;amount&gt;: '%s'</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -mintxfee=&lt;amount&gt;: '%s'</source>
-        <translation>Valor inválido para -mintxfee=&lt;amount&gt;: '%s'</translation>
-    </message>
     <message>
         <source>Invalid amount for -paytxfee=&lt;amount&gt;: '%s' (must be at least %s)</source>
         <translation>Valor inválido para -paytxfee=&lt;amount&gt;: '%s' (precisa ser no mínimo %s)</translation>
@@ -3411,14 +2150,6 @@
         <source>RPC server options:</source>
         <translation>Opções do servidor RPC:</translation>
     </message>
-    <message>
-        <source>Rebuild block chain index from current blk000??.dat files on startup</source>
-        <translation>Reconstruir índice de cadeia de bloco a partir dos arquivos blk000??.dat atuais durante a inicialização</translation>
-    </message>
-    <message>
-        <source>Receive and display P2P network alerts (default: %u)</source>
-        <translation>Receba e mostre P2P alerta de rede (padrão: %u)</translation>
-    </message>
     <message>
         <source>Reducing -maxconnections from %d to %d, because of system limitations.</source>
         <translation>Reduzindo -maxconnections de %d para %d, devido a limitações do sistema</translation>
@@ -3491,10 +2222,6 @@
         <source>Username for JSON-RPC connections</source>
         <translation>Nome de usuário para conexões JSON-RPC</translation>
     </message>
-    <message>
-        <source>Wallet needed to be rewritten: restart Bitcoin Core to complete</source>
-        <translation>Sua carteira precisou ser reescrita: favor reiniciar o Bitcoin para completar</translation>
-    </message>
     <message>
         <source>Warning</source>
         <translation>Atenção</translation>
@@ -3515,10 +2242,6 @@
         <source>ZeroMQ notification options:</source>
         <translation>Opções de notificação ZeroMQ:</translation>
     </message>
-    <message>
-        <source>wallet.dat corrupt, salvage failed</source>
-        <translation>wallet.dat corrompido, recuperação falhou</translation>
-    </message>
     <message>
         <source>Password for JSON-RPC connections</source>
         <translation>Senha para conexões JSON-RPC</translation>
@@ -3527,10 +2250,6 @@
         <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
         <translation>Executa um comando quando o melhor bloco mudar (%s no comando será substituído pelo hash do bloco)</translation>
     </message>
-    <message>
-        <source>This help message</source>
-        <translation>Exibe esta mensagem de ajuda</translation>
-    </message>
     <message>
         <source>Allow DNS lookups for -addnode, -seednode and -connect</source>
         <translation>Permitir consultas DNS para -addnode, -seednode e -connect</translation>
@@ -3539,10 +2258,6 @@
         <source>Loading addresses...</source>
         <translation>Carregando endereços...</translation>
     </message>
-    <message>
-        <source>Error loading wallet.dat: Wallet corrupted</source>
-        <translation>Erro ao carregar wallet.dat: Carteira corrompida</translation>
-    </message>
     <message>
         <source>(1 = keep tx meta data e.g. account owner and payment request information, 2 = drop tx meta data)</source>
         <translation>(1 = manter metadados tx e.g. informação do dono da conta e requisição de pagamente, 2 = descartar metadados tx)</translation>
@@ -3559,10 +2274,6 @@
         <source>Do not keep transactions in the mempool longer than &lt;n&gt; hours (default: %u)</source>
         <translation>Não manter transações na mempool por mais que &lt;n&gt; horas (padrão: %u)</translation>
     </message>
-    <message>
-        <source>Error reading wallet.dat! All keys read correctly, but transaction data or address book entries might be missing or incorrect.</source>
-        <translation>Erro ao ler o arquivo wallet.dat! Todas as chaves foram lidas corretamente, mas os dados de transações ou o livro de endereços podem estar faltando ou ser incorretos.</translation>
-    </message>
     <message>
         <source>Fees (in %s/kB) smaller than this are considered zero fee for transaction creation (default: %s)</source>
         <translation>Comissões (em %s/kB) menores serão consideradas como zero para criação de transação (padrão %s)</translation>
@@ -3599,6 +2310,10 @@
         <source>Unsupported argument -socks found. Setting SOCKS version isn't possible anymore, only SOCKS5 proxies are supported.</source>
         <translation>Argumento inválido -socks encontrado. Definir a versão do SOCKS não é mais possível, somente proxys SOCK5 são suportados.</translation>
     </message>
+    <message>
+        <source>Unsupported argument -whitelistalwaysrelay ignored, use -whitelistrelay and/or -whitelistforcerelay.</source>
+        <translation>Argumento não suportado -whitelistalwaysrelay foi ignorado, utilize -whitelistrelay e/ou -whitelistforcerelay.</translation>
+    </message>
     <message>
         <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: %s)</source>
         <translation>Use um proxy SOCKS5 separado para alcançar participantes da rede via serviços ocultos Tor (padrão: %s)</translation>
@@ -3607,6 +2322,10 @@
         <source>Username and hashed password for JSON-RPC connections. The field &lt;userpw&gt; comes in the format: &lt;USERNAME&gt;:&lt;SALT&gt;$&lt;HASH&gt;. A canonical python script is included in share/rpcuser. This option can be specified multiple times</source>
         <translation>Nome de usuário e senha hash para conexões JSON-RPC. O campo &lt;userpw&gt; vem com o formato: &lt;USERNAME&gt;:&lt;SALT&gt;$&lt;HASH&gt;. Um script python canônico é incluído em share/rpcuser. Essa opção pode ser especificada múltiplas vezes.</translation>
     </message>
+    <message>
+        <source>Warning: Unknown block versions being mined! It's possible unknown rules are in effect</source>
+        <translation>Aviso: Versões de bloco desconhecidas sendo mineradas! É possível que regras estranhas estejam ativas</translation>
+    </message>
     <message>
         <source>(default: %s)</source>
         <translation>(padrão: %s)</translation>
@@ -3615,14 +2334,6 @@
         <source>Always query for peer addresses via DNS lookup (default: %u)</source>
         <translation>Sempre pergunte pelo endereço de peer via pesquisa DNS (padrão: %u)</translation>
     </message>
-    <message>
-        <source>Error loading wallet.dat</source>
-        <translation>Erro ao carregar wallet.dat</translation>
-    </message>
-    <message>
-        <source>Generate coins (default: %u)</source>
-        <translation>Gerar moedas (padrão: %u)</translation>
-    </message>
     <message>
         <source>How many blocks to check at startup (default: %u, 0 = all)</source>
         <translation>Quantos blocos devem ser checados ao iniciar (padrão: %u, 0 = todos)</translation>
@@ -3707,18 +2418,6 @@
         <source>Unknown network specified in -onlynet: '%s'</source>
         <translation>Rede desconhecida especificada em -onlynet: '%s'</translation>
     </message>
-    <message>
-        <source>Cannot resolve -bind address: '%s'</source>
-        <translation>Impossível encontrar o endereço -bind: '%s'</translation>
-    </message>
-    <message>
-        <source>Cannot resolve -externalip address: '%s'</source>
-        <translation>Impossível encontrar endereço -externalip: '%s'</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -paytxfee=&lt;amount&gt;: '%s'</source>
-        <translation>Quantidade inválida para -paytxfee=&lt;quantidade&gt;: '%s'</translation>
-    </message>
     <message>
         <source>Insufficient funds</source>
         <translation>Saldo insuficiente</translation>
diff --git a/src/qt/locale/bitcoin_pt_PT.ts b/src/qt/locale/bitcoin_pt_PT.ts
index 362769138a842..16b912dfdc57b 100644
--- a/src/qt/locale/bitcoin_pt_PT.ts
+++ b/src/qt/locale/bitcoin_pt_PT.ts
@@ -25,10 +25,6 @@
         <source>C&amp;lose</source>
         <translation>F&amp;echar</translation>
     </message>
-    <message>
-        <source>&amp;Copy Address</source>
-        <translation>&amp;Copiar Endereço</translation>
-    </message>
     <message>
         <source>Delete the currently selected address from the list</source>
         <translation>Eliminar o endereço selecionado da lista</translation>
@@ -45,73 +41,6 @@
         <source>&amp;Delete</source>
         <translation>&amp;Eliminar</translation>
     </message>
-    <message>
-        <source>Choose the address to send coins to</source>
-        <translation>Escolha o endereço para enviar as moedas</translation>
-    </message>
-    <message>
-        <source>Choose the address to receive coins with</source>
-        <translation>Escolha o endereço para receber as moedas com</translation>
-    </message>
-    <message>
-        <source>C&amp;hoose</source>
-        <translation>Escol&amp;her</translation>
-    </message>
-    <message>
-        <source>Sending addresses</source>
-        <translation>Endereços de envio</translation>
-    </message>
-    <message>
-        <source>Receiving addresses</source>
-        <translation>Endereços de a receber</translation>
-    </message>
-    <message>
-        <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source>
-        <translation>Estes são os seus endereços Bitcoin para enviar pagamentos. Verifique sempre o valor e o endereço de envio antes de enviar moedas.</translation>
-    </message>
-    <message>
-        <source>These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source>
-        <translation>Estes são os seus endereços do Bitcoin para receber pagamentos. É recomendado que utilize um novo endereço para cada transação.</translation>
-    </message>
-    <message>
-        <source>Copy &amp;Label</source>
-        <translation>Copiar &amp;Rótulo</translation>
-    </message>
-    <message>
-        <source>&amp;Edit</source>
-        <translation>&amp;Editar</translation>
-    </message>
-    <message>
-        <source>Export Address List</source>
-        <translation>Exportar Lista de Endereços</translation>
-    </message>
-    <message>
-        <source>Comma separated file (*.csv)</source>
-        <translation>Ficheiro separado por vírgulas (*.csv)</translation>
-    </message>
-    <message>
-        <source>Exporting Failed</source>
-        <translation>Exportação Falhou</translation>
-    </message>
-    <message>
-        <source>There was an error trying to save the address list to %1. Please try again.</source>
-        <translation>Houve um erro ao tentar a guardar a lista de endereços em %1. Por favor tente novamente.</translation>
-    </message>
-</context>
-<context>
-    <name>AddressTableModel</name>
-    <message>
-        <source>Label</source>
-        <translation>Etiqueta</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>Endereço</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(sem etiqueta)</translation>
-    </message>
 </context>
 <context>
     <name>AskPassphraseDialog</name>
@@ -131,94 +60,6 @@
         <source>Repeat new passphrase</source>
         <translation>Repita a nova frase de palavra-passe</translation>
     </message>
-    <message>
-        <source>Encrypt wallet</source>
-        <translation>Encriptar carteira</translation>
-    </message>
-    <message>
-        <source>This operation needs your wallet passphrase to unlock the wallet.</source>
-        <translation>Esta operação precisa da sua frase de palavra-passe da carteira para desbloquear a mesma.</translation>
-    </message>
-    <message>
-        <source>Unlock wallet</source>
-        <translation>Desbloquear carteira</translation>
-    </message>
-    <message>
-        <source>This operation needs your wallet passphrase to decrypt the wallet.</source>
-        <translation>Esta operação precisa da sua frase de palavra-passe da carteira para desencriptar a mesma.</translation>
-    </message>
-    <message>
-        <source>Decrypt wallet</source>
-        <translation>Desencriptar carteira</translation>
-    </message>
-    <message>
-        <source>Change passphrase</source>
-        <translation>Alterar frase de palavra-passe</translation>
-    </message>
-    <message>
-        <source>Confirm wallet encryption</source>
-        <translation>Confirmar encriptação da carteira</translation>
-    </message>
-    <message>
-        <source>Warning: If you encrypt your wallet and lose your passphrase, you will &lt;b&gt;LOSE ALL OF YOUR BITCOINS&lt;/b&gt;!</source>
-        <translation>Aviso: se encriptar a sua carteira e perder a sua frase de de palavra-passe, irá &lt;b&gt;PERDER TODOS OS SEUS BITCOINS&lt;/b&gt;!</translation>
-    </message>
-    <message>
-        <source>Are you sure you wish to encrypt your wallet?</source>
-        <translation>Tem a certeza que deseja encriptar a carteira?</translation>
-    </message>
-    <message>
-        <source>Bitcoin Core will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source>
-        <translation>O cliente Bitcoin Core irá agora ser fechado para terminar o processo de encriptação. Recorde que a encriptação da sua carteira não protegerá totalmente os seus bitcoins de serem roubados por programas maliciosos que infectem o seu computador.</translation>
-    </message>
-    <message>
-        <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source>
-        <translation>IMPORTANTE: Qualquer cópia de segurança da carteira anterior deverá ser substituída com o novo ficheiro de carteira, agora encriptado. Por razões de segurança, cópias de segurança não encriptadas tornar-se-ão inúteis assim que começar a usar a nova carteira encriptada.</translation>
-    </message>
-    <message>
-        <source>Warning: The Caps Lock key is on!</source>
-        <translation>Atenção: a tecla Caps Lock está ativada!</translation>
-    </message>
-    <message>
-        <source>Wallet encrypted</source>
-        <translation>Carteira encriptada</translation>
-    </message>
-    <message>
-        <source>Enter the new passphrase to the wallet.&lt;br/&gt;Please use a passphrase of &lt;b&gt;ten or more random characters&lt;/b&gt;, or &lt;b&gt;eight or more words&lt;/b&gt;.</source>
-        <translation>Insira a nova frase de palavra-passe da sua carteira. &lt;br/&gt; Por favor, utilize uma frase de palavra-passe com &lt;b&gt;mais de 10 ou mais carateres aleatórios,&lt;/b&gt; ou &lt;b&gt;oito ou mais palavras&lt;/b&gt;.</translation>
-    </message>
-    <message>
-        <source>Enter the old passphrase and new passphrase to the wallet.</source>
-        <translation>Insira a frase de palavra-passe antiga e a nova frase de palavra-passe para carteira.</translation>
-    </message>
-    <message>
-        <source>Wallet encryption failed</source>
-        <translation>A encriptação da carteira falhou</translation>
-    </message>
-    <message>
-        <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
-        <translation>A encriptação da carteira falhou devido a um erro interno. A carteira não foi encriptada.</translation>
-    </message>
-    <message>
-        <source>The supplied passphrases do not match.</source>
-        <translation>As frases de palavra-passe inseridas não coincidem.</translation>
-    </message>
-    <message>
-        <source>Wallet unlock failed</source>
-        <translation>O desbloqueio da carteira falhou</translation>
-    </message>
-    <message>
-        <source>The passphrase entered for the wallet decryption was incorrect.</source>
-        <translation>A frase de palavra-passe inserida para a desencriptação da carteira estava incorreta.</translation>
-    </message>
-    <message>
-        <source>Wallet decryption failed</source>
-        <translation>A desencriptação da carteira falhou</translation>
-    </message>
-    <message>
-        <source>Wallet passphrase was successfully changed.</source>
-        <translation>A frase de palavra-passe da carteira foi alterada com sucesso.</translation>
-    </message>
 </context>
 <context>
     <name>BanTableModel</name>
@@ -269,6 +110,14 @@
         <source>Quit application</source>
         <translation>Sair da aplicação</translation>
     </message>
+    <message>
+        <source>&amp;About %1</source>
+        <translation>&amp;Acerca de %1</translation>
+    </message>
+    <message>
+        <source>Show information about %1</source>
+        <translation>Mostrar informação sobre %1</translation>
+    </message>
     <message>
         <source>About &amp;Qt</source>
         <translation>Sobre &amp;Qt</translation>
@@ -281,6 +130,10 @@
         <source>&amp;Options...</source>
         <translation>&amp;Opções...</translation>
     </message>
+    <message>
+        <source>Modify configuration options for %1</source>
+        <translation>Modificar opções de configuração para %1</translation>
+    </message>
     <message>
         <source>&amp;Encrypt Wallet...</source>
         <translation>E&amp;ncriptar Carteira...</translation>
@@ -305,14 +158,6 @@
         <source>Open &amp;URI...</source>
         <translation>Abrir &amp;URI...</translation>
     </message>
-    <message>
-        <source>Bitcoin Core client</source>
-        <translation>Cliente do Bitcoin Core</translation>
-    </message>
-    <message>
-        <source>Importing blocks from disk...</source>
-        <translation>A importar os blocos do disco...</translation>
-    </message>
     <message>
         <source>Reindexing blocks on disk...</source>
         <translation>A reindexar os blocos no disco...</translation>
@@ -357,10 +202,6 @@
         <source>&amp;Receive</source>
         <translation>&amp;Receber</translation>
     </message>
-    <message>
-        <source>Show information about Bitcoin Core</source>
-        <translation>Mostrar informação sobre o Bitcoin Core</translation>
-    </message>
     <message>
         <source>&amp;Show / Hide</source>
         <translation>Mo&amp;strar / Ocultar</translation>
@@ -397,22 +238,10 @@
         <source>Tabs toolbar</source>
         <translation>Barra de ferramentas dos separadores</translation>
     </message>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Bitcoin Core</translation>
-    </message>
     <message>
         <source>Request payments (generates QR codes and bitcoin: URIs)</source>
         <translation>Solicitar pagamentos (gera códigos QR e bitcoin: URIs)</translation>
     </message>
-    <message>
-        <source>&amp;About Bitcoin Core</source>
-        <translation>&amp;Sobre o Bitcoin Core</translation>
-    </message>
-    <message>
-        <source>Modify configuration options for Bitcoin Core</source>
-        <translation>Modificar as opções de configuração do Bitcoin Core</translation>
-    </message>
     <message>
         <source>Show the list of used sending addresses and labels</source>
         <translation>Mostrar a lista de rótulos e endereços de envio usados</translation>
@@ -429,14 +258,18 @@
         <source>&amp;Command-line options</source>
         <translation>&amp;Opções da linha de &amp;comando</translation>
     </message>
-    <message>
-        <source>Show the Bitcoin Core help message to get a list with possible Bitcoin command-line options</source>
-        <translation>Mostrar a mensagem de ajuda do Bitcoin Core para obter uma lista com possíveis opções de linha de comando do Bitcoin</translation>
-    </message>
     <message numerus="yes">
         <source>%n active connection(s) to Bitcoin network</source>
         <translation><numerusform>%n ligação ativa à rede Bitcoin</numerusform><numerusform>%n ligações ativas à rede Bitcoin</numerusform></translation>
     </message>
+    <message>
+        <source>Indexing blocks on disk...</source>
+        <translation>A indexar blocos no disco...</translation>
+    </message>
+    <message>
+        <source>Processing blocks on disk...</source>
+        <translation>A processar blocos no disco...</translation>
+    </message>
     <message>
         <source>No block source available...</source>
         <translation>Nenhuma fonte de blocos disponível...</translation>
@@ -544,13 +377,6 @@
         <translation>A carteira está &lt;b&gt;encriptada&lt;/b&gt; e atualmente &lt;b&gt;bloqueada&lt;/b&gt;</translation>
     </message>
 </context>
-<context>
-    <name>ClientModel</name>
-    <message>
-        <source>Network Alert</source>
-        <translation>Alerta da Rede</translation>
-    </message>
-</context>
 <context>
     <name>CoinControlDialog</name>
     <message>
@@ -629,150 +455,6 @@
         <source>Priority</source>
         <translation>Prioridade</translation>
     </message>
-    <message>
-        <source>Copy address</source>
-        <translation>Copiar endereço</translation>
-    </message>
-    <message>
-        <source>Copy label</source>
-        <translation>Copiar etiqueta</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>Copiar valor</translation>
-    </message>
-    <message>
-        <source>Copy transaction ID</source>
-        <translation>Copiar id. da transação</translation>
-    </message>
-    <message>
-        <source>Lock unspent</source>
-        <translation>Bloquear não gastas</translation>
-    </message>
-    <message>
-        <source>Unlock unspent</source>
-        <translation>Desbloquear não gastas</translation>
-    </message>
-    <message>
-        <source>Copy quantity</source>
-        <translation>Copiar quantidade</translation>
-    </message>
-    <message>
-        <source>Copy fee</source>
-        <translation>Copiar taxa</translation>
-    </message>
-    <message>
-        <source>Copy after fee</source>
-        <translation>Copiar depois da taxa</translation>
-    </message>
-    <message>
-        <source>Copy bytes</source>
-        <translation>Copiar bytes</translation>
-    </message>
-    <message>
-        <source>Copy priority</source>
-        <translation>Copiar prioridade</translation>
-    </message>
-    <message>
-        <source>Copy dust</source>
-        <translation>Copiar lixo</translation>
-    </message>
-    <message>
-        <source>Copy change</source>
-        <translation>Copiar alteração</translation>
-    </message>
-    <message>
-        <source>highest</source>
-        <translation>muito alta</translation>
-    </message>
-    <message>
-        <source>higher</source>
-        <translation>mais alta</translation>
-    </message>
-    <message>
-        <source>high</source>
-        <translation>alta</translation>
-    </message>
-    <message>
-        <source>medium-high</source>
-        <translation>média alta</translation>
-    </message>
-    <message>
-        <source>medium</source>
-        <translation>média</translation>
-    </message>
-    <message>
-        <source>low-medium</source>
-        <translation>média baixa</translation>
-    </message>
-    <message>
-        <source>low</source>
-        <translation>baixa</translation>
-    </message>
-    <message>
-        <source>lower</source>
-        <translation>mais baixa</translation>
-    </message>
-    <message>
-        <source>lowest</source>
-        <translation>muito baixa</translation>
-    </message>
-    <message>
-        <source>(%1 locked)</source>
-        <translation>(%1 bloqueados)</translation>
-    </message>
-    <message>
-        <source>none</source>
-        <translation>nenhum</translation>
-    </message>
-    <message>
-        <source>This label turns red if the transaction size is greater than 1000 bytes.</source>
-        <translation>Esta etiqueta fica vermelha se o tamanho da transação exceder os 1000 bytes.</translation>
-    </message>
-    <message>
-        <source>This label turns red if the priority is smaller than "medium".</source>
-        <translation>Esta etiqueta fica vermelha se a prioridade for menor que "média".</translation>
-    </message>
-    <message>
-        <source>This label turns red if any recipient receives an amount smaller than %1.</source>
-        <translation>Esta etiqueta fica vermelha se qualquer recipiente receber uma quantia menor que %1.</translation>
-    </message>
-    <message>
-        <source>Can vary +/- %1 satoshi(s) per input.</source>
-        <translation>Pode variar +/- %1 satoshi(s) por entrada</translation>
-    </message>
-    <message>
-        <source>yes</source>
-        <translation>sim</translation>
-    </message>
-    <message>
-        <source>no</source>
-        <translation>não</translation>
-    </message>
-    <message>
-        <source>This means a fee of at least %1 per kB is required.</source>
-        <translation>Isto significa que uma taxa de pelo menos %1 por kB é necessária.</translation>
-    </message>
-    <message>
-        <source>Can vary +/- 1 byte per input.</source>
-        <translation>Pode variar +/- 1 byte por input.</translation>
-    </message>
-    <message>
-        <source>Transactions with higher priority are more likely to get included into a block.</source>
-        <translation>Transacções com uma prioridade mais alta têm uma maior probabilidade de serem incluídas num bloco.</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(sem etiqueta)</translation>
-    </message>
-    <message>
-        <source>change from %1 (%2)</source>
-        <translation>troco de %1 (%2)</translation>
-    </message>
-    <message>
-        <source>(change)</source>
-        <translation>(troco)</translation>
-    </message>
 </context>
 <context>
     <name>EditAddressDialog</name>
@@ -796,38 +478,6 @@
         <source>&amp;Address</source>
         <translation>E&amp;ndereço</translation>
     </message>
-    <message>
-        <source>New receiving address</source>
-        <translation>Novo endereço de entrada</translation>
-    </message>
-    <message>
-        <source>New sending address</source>
-        <translation>Novo endereço de saída</translation>
-    </message>
-    <message>
-        <source>Edit receiving address</source>
-        <translation>Editar endereço de entrada</translation>
-    </message>
-    <message>
-        <source>Edit sending address</source>
-        <translation>Editar endereço de saída</translation>
-    </message>
-    <message>
-        <source>The entered address "%1" is already in the address book.</source>
-        <translation>O endereço introduzido "%1" já se encontra no livro de endereços.</translation>
-    </message>
-    <message>
-        <source>The entered address "%1" is not a valid Bitcoin address.</source>
-        <translation>O endereço introduzido "%1" não é um endereço bitcoin válido.</translation>
-    </message>
-    <message>
-        <source>Could not unlock wallet.</source>
-        <translation>Impossível desbloquear carteira.</translation>
-    </message>
-    <message>
-        <source>New key generation failed.</source>
-        <translation>Falha ao gerar nova chave.</translation>
-    </message>
 </context>
 <context>
     <name>FreespaceChecker</name>
@@ -854,10 +504,6 @@
 </context>
 <context>
     <name>HelpMessageDialog</name>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Bitcoin Core</translation>
-    </message>
     <message>
         <source>version</source>
         <translation>versão</translation>
@@ -867,8 +513,8 @@
         <translation>(%1-bit)</translation>
     </message>
     <message>
-        <source>About Bitcoin Core</source>
-        <translation>Sobre o Bitcoin Core</translation>
+        <source>About %1</source>
+        <translation>Sobre %1</translation>
     </message>
     <message>
         <source>Command-line options</source>
@@ -906,11 +552,7 @@
         <source>Show splash screen on startup (default: %u)</source>
         <translation>Mostrar o ecrã de abertura no arranque (predefinição: %u)</translation>
     </message>
-    <message>
-        <source>Reset all settings changes made over the GUI</source>
-        <translation>Reiniciar as alterações das configurações efetuadas na GUI</translation>
-    </message>
-</context>
+    </context>
 <context>
     <name>Intro</name>
     <message>
@@ -918,16 +560,8 @@
         <translation>Bem-vindo</translation>
     </message>
     <message>
-        <source>Welcome to Bitcoin Core.</source>
-        <translation>Bem-vindo ao Bitcoin Core.</translation>
-    </message>
-    <message>
-        <source>As this is the first time the program is launched, you can choose where Bitcoin Core will store its data.</source>
-        <translation>Como esta é a primeira vez que o programa é iniciado, pode escolher onde guardar os seus dados do Bitcoin Core.</translation>
-    </message>
-    <message>
-        <source>Bitcoin Core will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source>
-        <translation>O Bitcoin Core irá transferir e guardar uma cópia da cadeia de bloco do Bitcoin. Pelo menos %1GB de dados serão guardados nesta diretoria, e estes irão crescer ao longo do tempo. A sua carteira também será guardada nesta diretoria.</translation>
+        <source>Welcome to %1.</source>
+        <translation>Bem-vindo a %1.</translation>
     </message>
     <message>
         <source>Use the default data directory</source>
@@ -937,10 +571,6 @@
         <source>Use a custom data directory:</source>
         <translation>Utilizar uma diretoria de dados personalizada:</translation>
     </message>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Bitcoin Core</translation>
-    </message>
     <message>
         <source>Error: Specified data directory "%1" cannot be created.</source>
         <translation>Erro: não pode ser criada a diretoria de dados especificada como "%1.</translation>
@@ -976,10 +606,6 @@
         <source>Select payment request file</source>
         <translation>Seleccione o ficheiro de pedido de pagamento</translation>
     </message>
-    <message>
-        <source>Select payment request file to open</source>
-        <translation>Seleccione o ficheiro de pedido de pagamento a abrir</translation>
-    </message>
 </context>
 <context>
     <name>OptionsDialog</name>
@@ -991,6 +617,10 @@
         <source>&amp;Main</source>
         <translation>&amp;Principal</translation>
     </message>
+    <message>
+        <source>&amp;Start %1 on system login</source>
+        <translation>&amp;Iniciar o %1 no início de sessão do sistema</translation>
+    </message>
     <message>
         <source>Size of &amp;database cache</source>
         <translation>Tamanho da cache da base de &amp;dados</translation>
@@ -1019,10 +649,6 @@
         <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Exit in the menu.</source>
         <translation>Minimize ao invés de sair da aplicação quando a janela é fechada. Com esta  opção selecionada, a aplicação apenas será encerrada quando escolher Sair da aplicação no menú.</translation>
     </message>
-    <message>
-        <source>The user interface language can be set here. This setting will take effect after restarting Bitcoin Core.</source>
-        <translation>O idioma da da interface do utilizador pode ser definida aqui. Esta definição será aplicada depois de reiniciar o Bitcoin Core.</translation>
-    </message>
     <message>
         <source>Third party URLs (e.g. a block explorer) that appear in the transactions tab as context menu items. %s in the URL is replaced by transaction hash. Multiple URLs are separated by vertical bar |.</source>
         <translation>URLs de outrem (ex. um explorador de blocos) que aparece no separador de transações como itens do menu de contexto.
@@ -1048,14 +674,6 @@
         <source>&amp;Network</source>
         <translation>&amp;Rede</translation>
     </message>
-    <message>
-        <source>Automatically start Bitcoin Core after logging in to the system.</source>
-        <translation>Iniciar automaticamente o Bitcoin Core depois de iniciar a sessão no sistema.</translation>
-    </message>
-    <message>
-        <source>&amp;Start Bitcoin Core on system login</source>
-        <translation>&amp;Iniciar o Bitcoin Core ao iniciar a sessão no sistema</translation>
-    </message>
     <message>
         <source>(0 = auto, &lt;0 = leave that many cores free)</source>
         <translation>(0 = automático, &lt;0 = deixar essa quantidade de núcleos livre)</translation>
@@ -1140,6 +758,10 @@
         <source>&amp;Window</source>
         <translation>&amp;Janela</translation>
     </message>
+    <message>
+        <source>Hide tray icon</source>
+        <translation>Ocultar ícone da bandeja</translation>
+    </message>
     <message>
         <source>Show only a tray icon after minimizing the window.</source>
         <translation>Apenas mostrar o ícone da bandeja de sistema após minimizar a janela.</translation>
@@ -1285,167 +907,57 @@
     </message>
 </context>
 <context>
-    <name>PaymentServer</name>
+    <name>PeerTableModel</name>
     <message>
-        <source>URI handling</source>
-        <translation>Manuseamento de URI</translation>
+        <source>User Agent</source>
+        <translation>Agente Usuário</translation>
     </message>
     <message>
-        <source>Invalid payment address %1</source>
-        <translation>Endereço de pagamento inválido %1</translation>
+        <source>Node/Service</source>
+        <translation>Nó/Serviço</translation>
     </message>
     <message>
-        <source>Payment request rejected</source>
-        <translation>Pedido de pagamento rejeitado</translation>
+        <source>Ping Time</source>
+        <translation>Tempo de Latência</translation>
     </message>
+</context>
+<context>
+    <name>QObject</name>
     <message>
-        <source>Payment request network doesn't match client network.</source>
-        <translation>Rede de requisição de pagamento não corresponde com a rede do cliente.</translation>
+        <source>Amount</source>
+        <translation>Quantia</translation>
     </message>
     <message>
-        <source>Payment request is not initialized.</source>
-        <translation>Requisição de pagamento não iniciou.</translation>
+        <source>Enter a Bitcoin address (e.g. %1)</source>
+        <translation>Entre um endereço Bitcoin (ex. %1)</translation>
     </message>
     <message>
-        <source>Requested payment amount of %1 is too small (considered dust).</source>
-        <translation>Quantia solicitada para pagamento de %1 é muito pequena (considerada "pó").</translation>
+        <source>%1 d</source>
+        <translation>%1 d</translation>
     </message>
     <message>
-        <source>Payment request error</source>
-        <translation>Erro de pedido de pagamento</translation>
+        <source>%1 h</source>
+        <translation>%1 h</translation>
     </message>
     <message>
-        <source>Cannot start bitcoin: click-to-pay handler</source>
-        <translation>Não é possível iniciar o Bitcoin: utilizador clique-para-pagar</translation>
+        <source>%1 m</source>
+        <translation>%1 m</translation>
     </message>
     <message>
-        <source>Payment request fetch URL is invalid: %1</source>
-        <translation>O URL de pedido de pagamento é inválido: %1</translation>
+        <source>%1 s</source>
+        <translation>%1 s</translation>
     </message>
     <message>
-        <source>URI cannot be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source>
-        <translation>URI não foi lido correctamente! Isto pode ser causado por um endereço Bitcoin inválido ou por parâmetros URI malformados.</translation>
+        <source>None</source>
+        <translation>Nenhum</translation>
     </message>
     <message>
-        <source>Payment request file handling</source>
-        <translation>Controlo de pedidos de pagamento.</translation>
+        <source>N/A</source>
+        <translation>N/D</translation>
     </message>
     <message>
-        <source>Payment request file cannot be read! This can be caused by an invalid payment request file.</source>
-        <translation>O ficheiro de pedido de pagamento não pôde ser lido! Isto pode ter sido causado por um ficheiro de pedido de pagamento inválido.</translation>
-    </message>
-    <message>
-        <source>Payment request expired.</source>
-        <translation>Pedido de pagamento expirou.</translation>
-    </message>
-    <message>
-        <source>Unverified payment requests to custom payment scripts are unsupported.</source>
-        <translation>Pedidos de pagamento não-verificados para scripts de pagamento personalizados não são suportados.</translation>
-    </message>
-    <message>
-        <source>Invalid payment request.</source>
-        <translation>Pedido de pagamento inválido.</translation>
-    </message>
-    <message>
-        <source>Refund from %1</source>
-        <translation>Reembolsar de %1</translation>
-    </message>
-    <message>
-        <source>Payment request %1 is too large (%2 bytes, allowed %3 bytes).</source>
-        <translation>Pedido de pagamento %1 excede o tamanho (%2 bytes, permitido %3 bytes).</translation>
-    </message>
-    <message>
-        <source>Error communicating with %1: %2</source>
-        <translation>Erro ao comunicar com %1: %2</translation>
-    </message>
-    <message>
-        <source>Payment request cannot be parsed!</source>
-        <translation>O pedido de pagamento não pode ser lido ou processado!</translation>
-    </message>
-    <message>
-        <source>Bad response from server %1</source>
-        <translation>Má resposta do servidor %1</translation>
-    </message>
-    <message>
-        <source>Payment acknowledged</source>
-        <translation>Pagamento confirmado</translation>
-    </message>
-    <message>
-        <source>Network request error</source>
-        <translation>Erro de pedido de rede</translation>
-    </message>
-</context>
-<context>
-    <name>PeerTableModel</name>
-    <message>
-        <source>User Agent</source>
-        <translation>Agente Usuário</translation>
-    </message>
-    <message>
-        <source>Node/Service</source>
-        <translation>Nó/Serviço</translation>
-    </message>
-    <message>
-        <source>Ping Time</source>
-        <translation>Tempo de Latência</translation>
-    </message>
-</context>
-<context>
-    <name>QObject</name>
-    <message>
-        <source>Amount</source>
-        <translation>Quantia</translation>
-    </message>
-    <message>
-        <source>Enter a Bitcoin address (e.g. %1)</source>
-        <translation>Entre um endereço Bitcoin (ex. %1)</translation>
-    </message>
-    <message>
-        <source>%1 d</source>
-        <translation>%1 d</translation>
-    </message>
-    <message>
-        <source>%1 h</source>
-        <translation>%1 h</translation>
-    </message>
-    <message>
-        <source>%1 m</source>
-        <translation>%1 m</translation>
-    </message>
-    <message>
-        <source>%1 s</source>
-        <translation>%1 s</translation>
-    </message>
-    <message>
-        <source>None</source>
-        <translation>Nenhum</translation>
-    </message>
-    <message>
-        <source>N/A</source>
-        <translation>N/D</translation>
-    </message>
-    <message>
-        <source>%1 ms</source>
-        <translation>%1 ms</translation>
-    </message>
-</context>
-<context>
-    <name>QRImageWidget</name>
-    <message>
-        <source>&amp;Save Image...</source>
-        <translation>&amp;Salvar Imagem...</translation>
-    </message>
-    <message>
-        <source>&amp;Copy Image</source>
-        <translation>&amp;Copiar Imagem</translation>
-    </message>
-    <message>
-        <source>Save QR Code</source>
-        <translation>Guardar Código QR</translation>
-    </message>
-    <message>
-        <source>PNG Image (*.png)</source>
-        <translation>Imagem PNG (*.png)</translation>
+        <source>%1 ms</source>
+        <translation>%1 ms</translation>
     </message>
 </context>
 <context>
@@ -1514,10 +1026,6 @@
         <source>Memory usage</source>
         <translation>Utilização de memória</translation>
     </message>
-    <message>
-        <source>Open the Bitcoin Core debug log file from the current data directory. This can take a few seconds for large log files.</source>
-        <translation>Abrir o ficheiro de registo de depuração da pasta de dados actual. Isto pode demorar alguns segundos para ficheiros de registo grandes.</translation>
-    </message>
     <message>
         <source>Received</source>
         <translation>Recebido</translation>
@@ -1566,6 +1074,14 @@
         <source>User Agent</source>
         <translation>Agente Usuário</translation>
     </message>
+    <message>
+        <source>Decrease font size</source>
+        <translation>Diminuir tamanho da letra</translation>
+    </message>
+    <message>
+        <source>Increase font size</source>
+        <translation>Aumentar tamanho da letra</translation>
+    </message>
     <message>
         <source>Services</source>
         <translation>Serviços</translation>
@@ -1634,10 +1150,6 @@
         <source>Out:</source>
         <translation>Saída:</translation>
     </message>
-    <message>
-        <source>Build date</source>
-        <translation>Data de compilação</translation>
-    </message>
     <message>
         <source>Debug log file</source>
         <translation>Ficheiro de registo de depuração</translation>
@@ -1675,8 +1187,8 @@
         <translation>&amp;Desbloquear Nó</translation>
     </message>
     <message>
-        <source>Welcome to the Bitcoin Core RPC console.</source>
-        <translation>Bem-vindo à consola RPC do Bitcoin Core.</translation>
+        <source>Welcome to the %1 RPC console.</source>
+        <translation>Bem-vindo à consola RPC da %1.</translation>
     </message>
     <message>
         <source>Use up and down arrows to navigate history, and &lt;b&gt;Ctrl-L&lt;/b&gt; to clear screen.</source>
@@ -1805,18 +1317,6 @@
         <source>Remove</source>
         <translation>Remover</translation>
     </message>
-    <message>
-        <source>Copy label</source>
-        <translation>Copiar rótulo</translation>
-    </message>
-    <message>
-        <source>Copy message</source>
-        <translation>Copiar mensagem</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>Copiar quantia</translation>
-    </message>
 </context>
 <context>
     <name>ReceiveRequestDialog</name>
@@ -1836,73 +1336,6 @@
         <source>&amp;Save Image...</source>
         <translation>&amp;Salvar Imagem...</translation>
     </message>
-    <message>
-        <source>Request payment to %1</source>
-        <translation>Requisitar Pagamento para %1</translation>
-    </message>
-    <message>
-        <source>Payment information</source>
-        <translation>Informação de Pagamento</translation>
-    </message>
-    <message>
-        <source>URI</source>
-        <translation>URI</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>Endereço</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>Quantia</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Rótulo</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>Mensagem</translation>
-    </message>
-    <message>
-        <source>Resulting URI too long, try to reduce the text for label / message.</source>
-        <translation>URI resultante muito longo. Tente reduzir o texto do rótulo / mensagem.</translation>
-    </message>
-    <message>
-        <source>Error encoding URI into QR Code.</source>
-        <translation>Erro ao codificar URI em Código QR.</translation>
-    </message>
-</context>
-<context>
-    <name>RecentRequestsTableModel</name>
-    <message>
-        <source>Date</source>
-        <translation>Data</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Rótulo</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>Mensagem</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>Quantia</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(sem rótulo)</translation>
-    </message>
-    <message>
-        <source>(no message)</source>
-        <translation>(sem mensagem)</translation>
-    </message>
-    <message>
-        <source>(no amount)</source>
-        <translation>(sem quantia)</translation>
-    </message>
 </context>
 <context>
     <name>SendCoinsDialog</name>
@@ -1980,922 +1413,284 @@
     </message>
     <message>
         <source>If the custom fee is set to 1000 satoshis and the transaction is only 250 bytes, then "per kilobyte" only pays 250 satoshis in fee, while "total at least" pays 1000 satoshis. For transactions bigger than a kilobyte both pay by kilobyte.</source>
-        <translation>Se a taxa fixa for 1000 satoshis e a transação for somente 250 bytes, pagará somente 250 satoshis "por kilobyte" em custos se trasacionar "pelo menos" 1000 satoshis. Transações superiores a um kilobyte são cobradas por kilobyte.</translation>
-    </message>
-    <message>
-        <source>Hide</source>
-        <translation>Esconder</translation>
-    </message>
-    <message>
-        <source>total at least</source>
-        <translation>total minimo</translation>
-    </message>
-    <message>
-        <source>Paying only the minimum fee is just fine as long as there is less transaction volume than space in the blocks. But be aware that this can end up in a never confirming transaction once there is more demand for bitcoin transactions than the network can process.</source>
-        <translation>Pode pagar somente a taxa minima desde que haja um volume de transações inferior ao espaço nos blocos. No entanto tenha em atenção que esta opção poderá acabar em uma transação nunca confirmada assim que os pedidos de transações excedam a capacidade de processamento da rede.</translation>
-    </message>
-    <message>
-        <source>(read the tooltip)</source>
-        <translation>(leia a dica)</translation>
-    </message>
-    <message>
-        <source>Recommended:</source>
-        <translation>Recomendado:</translation>
-    </message>
-    <message>
-        <source>Custom:</source>
-        <translation>Uso:</translation>
-    </message>
-    <message>
-        <source>(Smart fee not initialized yet. This usually takes a few blocks...)</source>
-        <translation>(Taxa inteligente ainda não foi acionada. Normalmente demora alguns blocos...)</translation>
-    </message>
-    <message>
-        <source>Confirmation time:</source>
-        <translation>Tempo de confirmação:</translation>
-    </message>
-    <message>
-        <source>normal</source>
-        <translation>normal</translation>
-    </message>
-    <message>
-        <source>fast</source>
-        <translation>rapido</translation>
-    </message>
-    <message>
-        <source>Send as zero-fee transaction if possible</source>
-        <translation>Enviar como uma transação a custo zero se possivél</translation>
-    </message>
-    <message>
-        <source>(confirmation may take longer)</source>
-        <translation>(confirmação poderá demorar mais)</translation>
-    </message>
-    <message>
-        <source>Send to multiple recipients at once</source>
-        <translation>Enviar para múltiplos destinatários de uma vez</translation>
-    </message>
-    <message>
-        <source>Add &amp;Recipient</source>
-        <translation>Adicionar &amp;Destinatário</translation>
-    </message>
-    <message>
-        <source>Clear all fields of the form.</source>
-        <translation>Limpar todos os campos do formulário.</translation>
-    </message>
-    <message>
-        <source>Dust:</source>
-        <translation>Lixo:</translation>
-    </message>
-    <message>
-        <source>Clear &amp;All</source>
-        <translation>Limpar &amp;Tudo</translation>
-    </message>
-    <message>
-        <source>Balance:</source>
-        <translation>Saldo:</translation>
-    </message>
-    <message>
-        <source>Confirm the send action</source>
-        <translation>Confirme ação de envio</translation>
-    </message>
-    <message>
-        <source>S&amp;end</source>
-        <translation>E&amp;nviar</translation>
-    </message>
-    <message>
-        <source>Confirm send coins</source>
-        <translation>Confirme envio de moedas</translation>
-    </message>
-    <message>
-        <source>%1 to %2</source>
-        <translation>%1 para %2</translation>
-    </message>
-    <message>
-        <source>Copy quantity</source>
-        <translation>Copiar quantidade</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>Copiar quantia</translation>
-    </message>
-    <message>
-        <source>Copy fee</source>
-        <translation>Copiar taxa</translation>
-    </message>
-    <message>
-        <source>Copy after fee</source>
-        <translation>Copiar valor após taxa</translation>
-    </message>
-    <message>
-        <source>Copy bytes</source>
-        <translation>Copiar bytes</translation>
-    </message>
-    <message>
-        <source>Copy priority</source>
-        <translation>Copiar prioridade</translation>
-    </message>
-    <message>
-        <source>Copy change</source>
-        <translation>Copiar alteração</translation>
-    </message>
-    <message>
-        <source>Total Amount %1</source>
-        <translation>Quantia Total %1</translation>
-    </message>
-    <message>
-        <source>or</source>
-        <translation>ou</translation>
-    </message>
-    <message>
-        <source>The amount to pay must be larger than 0.</source>
-        <translation>A quantia a pagar deverá ser maior que 0.</translation>
-    </message>
-    <message>
-        <source>The amount exceeds your balance.</source>
-        <translation>A quantia excede o seu saldo.</translation>
-    </message>
-    <message>
-        <source>The total exceeds your balance when the %1 transaction fee is included.</source>
-        <translation>O total excede o seu saldo quando a taxa de transação de %1 for incluída.</translation>
-    </message>
-    <message>
-        <source>Transaction creation failed!</source>
-        <translation>Erro: A criação da transação falhou! </translation>
-    </message>
-    <message>
-        <source>The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source>
-        <translation>A transação foi rejeitada! Isto poderá acontecer se algumas das moedas na sua carteira já tiverem sido gastas, se por exemplo tiver usado uma cópia do ficheiro wallet.dat e as moedas tiverem sido gastas na cópia mas não tiverem sido marcadas como gastas aqui.</translation>
-    </message>
-    <message>
-        <source>A fee higher than %1 is considered an absurdly high fee.</source>
-        <translation>Uma taxa superior a %1 é considerada muito alta.</translation>
-    </message>
-    <message>
-        <source>Payment request expired.</source>
-        <translation>Pedido de pagamento expirou.</translation>
-    </message>
-    <message>
-        <source>Pay only the required fee of %1</source>
-        <translation>Pagar somente a taxa mínima de %1</translation>
-    </message>
-    <message>
-        <source>The recipient address is not valid. Please recheck.</source>
-        <translation>O endereço de destino não é válido. Por favor, verifique novamente.</translation>
-    </message>
-    <message>
-        <source>Duplicate address found: addresses should only be used once each.</source>
-        <translation>Endereço duplicado encontrado: cada endereço só poderá ser usado uma vez.</translation>
-    </message>
-    <message>
-        <source>Warning: Invalid Bitcoin address</source>
-        <translation>Aviso: Endereço Bitcoin inválido</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(sem rótulo)</translation>
-    </message>
-    <message>
-        <source>Warning: Unknown change address</source>
-        <translation>Aviso: Endereço de troco desconhecido</translation>
-    </message>
-    <message>
-        <source>Copy dust</source>
-        <translation>Copiar lixo</translation>
-    </message>
-    <message>
-        <source>Are you sure you want to send?</source>
-        <translation>Tem a certeza que deseja enviar?</translation>
-    </message>
-    <message>
-        <source>added as transaction fee</source>
-        <translation>adicionados como taxa de transação</translation>
-    </message>
-</context>
-<context>
-    <name>SendCoinsEntry</name>
-    <message>
-        <source>A&amp;mount:</source>
-        <translation>Qu&amp;antia:</translation>
-    </message>
-    <message>
-        <source>Pay &amp;To:</source>
-        <translation>&amp;Pagar A:</translation>
-    </message>
-    <message>
-        <source>Enter a label for this address to add it to your address book</source>
-        <translation>Escreva um rótulo para este endereço para o adicionar ao seu livro de endereços</translation>
-    </message>
-    <message>
-        <source>&amp;Label:</source>
-        <translation>Rótu&amp;lo:</translation>
-    </message>
-    <message>
-        <source>Choose previously used address</source>
-        <translation>Escolha o endereço utilizado anteriormente</translation>
-    </message>
-    <message>
-        <source>This is a normal payment.</source>
-        <translation>Este é um pagamento normal.</translation>
-    </message>
-    <message>
-        <source>The Bitcoin address to send the payment to</source>
-        <translation>O endereço Bitcoin para enviar o pagamento</translation>
-    </message>
-    <message>
-        <source>Alt+A</source>
-        <translation>Alt+A</translation>
-    </message>
-    <message>
-        <source>Paste address from clipboard</source>
-        <translation>Cole endereço da área de transferência</translation>
-    </message>
-    <message>
-        <source>Alt+P</source>
-        <translation>Alt+P</translation>
-    </message>
-    <message>
-        <source>Remove this entry</source>
-        <translation>Remover esta entrada</translation>
-    </message>
-    <message>
-        <source>The fee will be deducted from the amount being sent. The recipient will receive less bitcoins than you enter in the amount field. If multiple recipients are selected, the fee is split equally.</source>
-        <translation>A taxa será deduzida ao montante enviado. O destinatário irá receber menos bitcoins do que as que introduziu no campo montante. Caso sejam seleccionados múltiplos destinatários, a taxa será repartida equitativamente.</translation>
-    </message>
-    <message>
-        <source>S&amp;ubtract fee from amount</source>
-        <translation>S&amp;ubtrair taxa ao montante</translation>
-    </message>
-    <message>
-        <source>Message:</source>
-        <translation>Mensagem:</translation>
-    </message>
-    <message>
-        <source>This is an unauthenticated payment request.</source>
-        <translation>Pedido de pagamento não autenticado.</translation>
-    </message>
-    <message>
-        <source>This is an authenticated payment request.</source>
-        <translation>Pedido de pagamento autenticado.</translation>
-    </message>
-    <message>
-        <source>Enter a label for this address to add it to the list of used addresses</source>
-        <translation>Introduza um rótulo para este endereço para o adicionar à sua lista de endereços usados</translation>
-    </message>
-    <message>
-        <source>A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
-        <translation>Uma mensagem que estava anexada ao URI bitcoin: que será armazenada com a transação para sua referência. Nota: Esta mensagem não será enviada através da rede Bitcoin.</translation>
-    </message>
-    <message>
-        <source>Pay To:</source>
-        <translation>Pagar a:</translation>
-    </message>
-    <message>
-        <source>Memo:</source>
-        <translation>Memorando:</translation>
-    </message>
-</context>
-<context>
-    <name>ShutdownWindow</name>
-    <message>
-        <source>Bitcoin Core is shutting down...</source>
-        <translation>O Bitcoin Core está a encerrar...</translation>
-    </message>
-    <message>
-        <source>Do not shut down the computer until this window disappears.</source>
-        <translation>Não desligue o computador enquanto esta janela não desaparecer.</translation>
-    </message>
-</context>
-<context>
-    <name>SignVerifyMessageDialog</name>
-    <message>
-        <source>Signatures - Sign / Verify a Message</source>
-        <translation>Assinaturas - Assinar / Verificar uma Mensagem</translation>
-    </message>
-    <message>
-        <source>&amp;Sign Message</source>
-        <translation>&amp;Assinar Mensagem</translation>
-    </message>
-    <message>
-        <source>You can sign messages/agreements with your addresses to prove you can receive bitcoins sent to them. Be careful not to sign anything vague or random, as phishing attacks may try to trick you into signing your identity over to them. Only sign fully-detailed statements you agree to.</source>
-        <translation>Pode assinar mensagens com os seus endereços para provar que são seus. Tenha atenção ao assinar mensagens ambíguas, pois ataques de phishing podem tentar enganá-lo de modo a assinar a sua identidade para os atacantes. Apenas assine declarações detalhadas com as quais concorde.</translation>
-    </message>
-    <message>
-        <source>The Bitcoin address to sign the message with</source>
-        <translation>O endereço Bitcoin para designar a mensagem</translation>
-    </message>
-    <message>
-        <source>Choose previously used address</source>
-        <translation>Escolha o endereço utilizado anteriormente</translation>
-    </message>
-    <message>
-        <source>Alt+A</source>
-        <translation>Alt+A</translation>
-    </message>
-    <message>
-        <source>Paste address from clipboard</source>
-        <translation>Colar endereço da área de transferência</translation>
-    </message>
-    <message>
-        <source>Alt+P</source>
-        <translation>Alt+P</translation>
-    </message>
-    <message>
-        <source>Enter the message you want to sign here</source>
-        <translation>Escreva aqui a mensagem que deseja assinar</translation>
-    </message>
-    <message>
-        <source>Signature</source>
-        <translation>Assinatura</translation>
-    </message>
-    <message>
-        <source>Copy the current signature to the system clipboard</source>
-        <translation>Copiar a assinatura actual para a área de transferência</translation>
-    </message>
-    <message>
-        <source>Sign the message to prove you own this Bitcoin address</source>
-        <translation>Assine uma mensagem para provar que é dono deste endereço Bitcoin</translation>
-    </message>
-    <message>
-        <source>Sign &amp;Message</source>
-        <translation>Assinar &amp;Mensagem</translation>
-    </message>
-    <message>
-        <source>Reset all sign message fields</source>
-        <translation>Repor todos os campos de assinatura de mensagem</translation>
-    </message>
-    <message>
-        <source>Clear &amp;All</source>
-        <translation>Limpar &amp;Tudo</translation>
-    </message>
-    <message>
-        <source>&amp;Verify Message</source>
-        <translation>&amp;Verificar Mensagem</translation>
-    </message>
-    <message>
-        <source>Enter the receiver's address, message (ensure you copy line breaks, spaces, tabs, etc. exactly) and signature below to verify the message. Be careful not to read more into the signature than what is in the signed message itself, to avoid being tricked by a man-in-the-middle attack. Note that this only proves the signing party receives with the address, it cannot prove sendership of any transaction!</source>
-        <translation>Introduza o endereço de assinatura, mensagem (assegure-se que copia quebras de linha, espaços, tabulações, etc. exactamente) e assinatura abaixo para verificar a mensagem. Tenha atenção para não ler mais na assinatura do que o que estiver na mensagem assinada, para evitar ser enganado por um atacante que se encontre entre si e quem assinou a mensagem.</translation>
-    </message>
-    <message>
-        <source>The Bitcoin address the message was signed with</source>
-        <translation>O endereço Bitcoin com que a mensagem foi designada</translation>
-    </message>
-    <message>
-        <source>Verify the message to ensure it was signed with the specified Bitcoin address</source>
-        <translation>Verifique a mensagem para assegurar que foi assinada com o endereço Bitcoin especificado</translation>
-    </message>
-    <message>
-        <source>Verify &amp;Message</source>
-        <translation>Verificar &amp;Mensagem</translation>
-    </message>
-    <message>
-        <source>Reset all verify message fields</source>
-        <translation>Repor todos os campos de verificação de mensagem</translation>
-    </message>
-    <message>
-        <source>Click "Sign Message" to generate signature</source>
-        <translation>Clique "Assinar mensagem" para gerar a assinatura</translation>
-    </message>
-    <message>
-        <source>The entered address is invalid.</source>
-        <translation>O endereço introduzido é inválido.</translation>
-    </message>
-    <message>
-        <source>Please check the address and try again.</source>
-        <translation>Por favor verifique o endereço e tente de novo.</translation>
-    </message>
-    <message>
-        <source>The entered address does not refer to a key.</source>
-        <translation>O endereço introduzido não refere a nenhuma chave.</translation>
-    </message>
-    <message>
-        <source>Wallet unlock was cancelled.</source>
-        <translation>O desbloqueio da carteira foi cancelado.</translation>
-    </message>
-    <message>
-        <source>Private key for the entered address is not available.</source>
-        <translation>A chave privada para o endereço introduzido não está disponível.</translation>
-    </message>
-    <message>
-        <source>Message signing failed.</source>
-        <translation>Assinatura de mensagem falhou.</translation>
-    </message>
-    <message>
-        <source>Message signed.</source>
-        <translation>Mensagem assinada.</translation>
-    </message>
-    <message>
-        <source>The signature could not be decoded.</source>
-        <translation>A assinatura não pôde ser descodificada.</translation>
-    </message>
-    <message>
-        <source>Please check the signature and try again.</source>
-        <translation>Por favor verifique a assinatura e tente de novo.</translation>
-    </message>
-    <message>
-        <source>The signature did not match the message digest.</source>
-        <translation>A assinatura não condiz com o conteúdo da mensagem.</translation>
-    </message>
-    <message>
-        <source>Message verification failed.</source>
-        <translation>Verificação da mensagem falhou.</translation>
-    </message>
-    <message>
-        <source>Message verified.</source>
-        <translation>Mensagem verificada.</translation>
-    </message>
-</context>
-<context>
-    <name>SplashScreen</name>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Bitcoin Core</translation>
-    </message>
-    <message>
-        <source>The Bitcoin Core developers</source>
-        <translation>Os programadores do Bitcoin Core</translation>
-    </message>
-    <message>
-        <source>[testnet]</source>
-        <translation>[rede de testes]</translation>
-    </message>
-</context>
-<context>
-    <name>TrafficGraphWidget</name>
-    <message>
-        <source>KB/s</source>
-        <translation>KB/s</translation>
-    </message>
-</context>
-<context>
-    <name>TransactionDesc</name>
-    <message>
-        <source>Open until %1</source>
-        <translation>Aberto até %1</translation>
-    </message>
-    <message>
-        <source>conflicted</source>
-        <translation>em conflito:</translation>
-    </message>
-    <message>
-        <source>%1/offline</source>
-        <translation>%1/desligado</translation>
-    </message>
-    <message>
-        <source>%1/unconfirmed</source>
-        <translation>%1/não confirmada</translation>
-    </message>
-    <message>
-        <source>%1 confirmations</source>
-        <translation>%1 confirmações</translation>
-    </message>
-    <message>
-        <source>Status</source>
-        <translation>Estado</translation>
-    </message>
-    <message numerus="yes">
-        <source>, broadcast through %n node(s)</source>
-        <translation><numerusform>, transmitida através de %n nó</numerusform><numerusform>, transmitida através de %n nós</numerusform></translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation>Data</translation>
-    </message>
-    <message>
-        <source>Source</source>
-        <translation>Origem</translation>
-    </message>
-    <message>
-        <source>Generated</source>
-        <translation>Gerado</translation>
-    </message>
-    <message>
-        <source>From</source>
-        <translation>De</translation>
-    </message>
-    <message>
-        <source>To</source>
-        <translation>Para</translation>
-    </message>
-    <message>
-        <source>own address</source>
-        <translation>endereço próprio</translation>
-    </message>
-    <message>
-        <source>watch-only</source>
-        <translation>modo-verificação</translation>
-    </message>
-    <message>
-        <source>label</source>
-        <translation>rótulo</translation>
-    </message>
-    <message>
-        <source>Credit</source>
-        <translation>Crédito</translation>
-    </message>
-    <message numerus="yes">
-        <source>matures in %n more block(s)</source>
-        <translation><numerusform>matura em %n bloco</numerusform><numerusform>matura em %n blocos</numerusform></translation>
-    </message>
-    <message>
-        <source>not accepted</source>
-        <translation>não aceite</translation>
-    </message>
-    <message>
-        <source>Debit</source>
-        <translation>Débito</translation>
-    </message>
-    <message>
-        <source>Total debit</source>
-        <translation>Total a debitar</translation>
-    </message>
-    <message>
-        <source>Total credit</source>
-        <translation>Total a creditar</translation>
-    </message>
-    <message>
-        <source>Transaction fee</source>
-        <translation>Taxa de transação</translation>
-    </message>
-    <message>
-        <source>Net amount</source>
-        <translation>Valor líquido</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>Mensagem</translation>
-    </message>
-    <message>
-        <source>Comment</source>
-        <translation>Comentário</translation>
-    </message>
-    <message>
-        <source>Transaction ID</source>
-        <translation>ID da Transação</translation>
-    </message>
-    <message>
-        <source>Merchant</source>
-        <translation>Comerciante</translation>
-    </message>
-    <message>
-        <source>Generated coins must mature %1 blocks before they can be spent. When you generated this block, it was broadcast to the network to be added to the block chain. If it fails to get into the chain, its state will change to "not accepted" and it won't be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source>
-        <translation>Moedas geradas deverão maturar por %1 blocos antes de poderem ser gastas. Quando gerou este bloco, ele foi transmitido para a rede para ser incluído na cadeia de blocos. Se a inclusão na cadeia de blocos falhar, o seu estado irá ser alterado para "não aceite" e as moedas não poderão ser gastas. Isto poderá acontecer ocasionalmente se outro nó da rede gerar um bloco a poucos segundos de diferença do seu.</translation>
-    </message>
-    <message>
-        <source>Debug information</source>
-        <translation>Informação de depuração</translation>
-    </message>
-    <message>
-        <source>Transaction</source>
-        <translation>Transação</translation>
-    </message>
-    <message>
-        <source>Inputs</source>
-        <translation>Entradas</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>Quantia</translation>
-    </message>
-    <message>
-        <source>true</source>
-        <translation>verdadeiro</translation>
-    </message>
-    <message>
-        <source>false</source>
-        <translation>falso</translation>
-    </message>
-    <message>
-        <source>, has not been successfully broadcast yet</source>
-        <translation>, ainda não foi transmitida com sucesso</translation>
-    </message>
-    <message numerus="yes">
-        <source>Open for %n more block(s)</source>
-        <translation><numerusform>Aberta por mais %n bloco</numerusform><numerusform>Aberta por mais %n blocos</numerusform></translation>
-    </message>
-    <message>
-        <source>unknown</source>
-        <translation>desconhecido</translation>
-    </message>
-</context>
-<context>
-    <name>TransactionDescDialog</name>
-    <message>
-        <source>Transaction details</source>
-        <translation>Detalhes da transação</translation>
-    </message>
-    <message>
-        <source>This pane shows a detailed description of the transaction</source>
-        <translation>Esta janela mostra uma descrição detalhada da transação</translation>
-    </message>
-</context>
-<context>
-    <name>TransactionTableModel</name>
-    <message>
-        <source>Date</source>
-        <translation>Data</translation>
+        <translation>Se a taxa fixa for 1000 satoshis e a transação for somente 250 bytes, pagará somente 250 satoshis "por kilobyte" em custos se trasacionar "pelo menos" 1000 satoshis. Transações superiores a um kilobyte são cobradas por kilobyte.</translation>
     </message>
     <message>
-        <source>Type</source>
-        <translation>Tipo</translation>
+        <source>Hide</source>
+        <translation>Esconder</translation>
     </message>
     <message>
-        <source>Immature (%1 confirmations, will be available after %2)</source>
-        <translation>Imaturo (%1 confirmações, estará disponível após %2)</translation>
-    </message>
-    <message numerus="yes">
-        <source>Open for %n more block(s)</source>
-        <translation><numerusform>Aberta por mais %n bloco</numerusform><numerusform>Aberta por mais %n blocos</numerusform></translation>
+        <source>total at least</source>
+        <translation>total minimo</translation>
     </message>
     <message>
-        <source>Open until %1</source>
-        <translation>Aberto até %1</translation>
+        <source>Paying only the minimum fee is just fine as long as there is less transaction volume than space in the blocks. But be aware that this can end up in a never confirming transaction once there is more demand for bitcoin transactions than the network can process.</source>
+        <translation>Pode pagar somente a taxa minima desde que haja um volume de transações inferior ao espaço nos blocos. No entanto tenha em atenção que esta opção poderá acabar em uma transação nunca confirmada assim que os pedidos de transações excedam a capacidade de processamento da rede.</translation>
     </message>
     <message>
-        <source>Confirmed (%1 confirmations)</source>
-        <translation>Confirmada (%1 confirmações)</translation>
+        <source>(read the tooltip)</source>
+        <translation>(leia a dica)</translation>
     </message>
     <message>
-        <source>This block was not received by any other nodes and will probably not be accepted!</source>
-        <translation>Este bloco não foi recebido por outros nós e provavelmente não será aceite pela rede!</translation>
+        <source>Recommended:</source>
+        <translation>Recomendado:</translation>
     </message>
     <message>
-        <source>Generated but not accepted</source>
-        <translation>Gerado mas não aceite</translation>
+        <source>Custom:</source>
+        <translation>Uso:</translation>
     </message>
     <message>
-        <source>Offline</source>
-        <translation>Offline</translation>
+        <source>(Smart fee not initialized yet. This usually takes a few blocks...)</source>
+        <translation>(Taxa inteligente ainda não foi acionada. Normalmente demora alguns blocos...)</translation>
     </message>
     <message>
-        <source>Label</source>
-        <translation>Rótulo</translation>
+        <source>Confirmation time:</source>
+        <translation>Tempo de confirmação:</translation>
     </message>
     <message>
-        <source>Unconfirmed</source>
-        <translation>Não confirmado:</translation>
+        <source>normal</source>
+        <translation>normal</translation>
     </message>
     <message>
-        <source>Confirming (%1 of %2 recommended confirmations)</source>
-        <translation>A confirmar (%1 de %2 confirmações recomendadas)</translation>
+        <source>fast</source>
+        <translation>rapido</translation>
     </message>
     <message>
-        <source>Conflicted</source>
-        <translation>Em Conflito:</translation>
+        <source>Send to multiple recipients at once</source>
+        <translation>Enviar para múltiplos destinatários de uma vez</translation>
     </message>
     <message>
-        <source>Received with</source>
-        <translation>Recebido com</translation>
+        <source>Add &amp;Recipient</source>
+        <translation>Adicionar &amp;Destinatário</translation>
     </message>
     <message>
-        <source>Received from</source>
-        <translation>Recebido de</translation>
+        <source>Clear all fields of the form.</source>
+        <translation>Limpar todos os campos do formulário.</translation>
     </message>
     <message>
-        <source>Sent to</source>
-        <translation>Enviado para</translation>
+        <source>Dust:</source>
+        <translation>Lixo:</translation>
     </message>
     <message>
-        <source>Payment to yourself</source>
-        <translation>Pagamento a si mesmo</translation>
+        <source>Clear &amp;All</source>
+        <translation>Limpar &amp;Tudo</translation>
     </message>
     <message>
-        <source>Mined</source>
-        <translation>Minadas</translation>
+        <source>Balance:</source>
+        <translation>Saldo:</translation>
     </message>
     <message>
-        <source>watch-only</source>
-        <translation>modo-verificação</translation>
+        <source>Confirm the send action</source>
+        <translation>Confirme ação de envio</translation>
     </message>
     <message>
-        <source>(n/a)</source>
-        <translation>(n/d)</translation>
+        <source>S&amp;end</source>
+        <translation>E&amp;nviar</translation>
     </message>
+</context>
+<context>
+    <name>SendCoinsEntry</name>
     <message>
-        <source>Transaction status. Hover over this field to show number of confirmations.</source>
-        <translation>Estado da transação. Passar o cursor por cima deste campo para mostrar o número de confirmações.</translation>
+        <source>A&amp;mount:</source>
+        <translation>Qu&amp;antia:</translation>
     </message>
     <message>
-        <source>Date and time that the transaction was received.</source>
-        <translation>Data e hora em que a transação foi recebida.</translation>
+        <source>Pay &amp;To:</source>
+        <translation>&amp;Pagar A:</translation>
     </message>
     <message>
-        <source>Type of transaction.</source>
-        <translation>Tipo de transação.</translation>
+        <source>&amp;Label:</source>
+        <translation>Rótu&amp;lo:</translation>
     </message>
     <message>
-        <source>Whether or not a watch-only address is involved in this transaction.</source>
-        <translation>Desde que um endereço de modo-verificação faça parte ou não desta transação</translation>
+        <source>Choose previously used address</source>
+        <translation>Escolha o endereço utilizado anteriormente</translation>
     </message>
     <message>
-        <source>User-defined intent/purpose of the transaction.</source>
-        <translation>Motivo da transacção definido pelo utilizador.</translation>
+        <source>This is a normal payment.</source>
+        <translation>Este é um pagamento normal.</translation>
     </message>
     <message>
-        <source>Amount removed from or added to balance.</source>
-        <translation>Quantia retirada ou adicionada ao saldo.</translation>
+        <source>The Bitcoin address to send the payment to</source>
+        <translation>O endereço Bitcoin para enviar o pagamento</translation>
     </message>
-</context>
-<context>
-    <name>TransactionView</name>
     <message>
-        <source>All</source>
-        <translation>Todas</translation>
+        <source>Alt+A</source>
+        <translation>Alt+A</translation>
     </message>
     <message>
-        <source>Today</source>
-        <translation>Hoje</translation>
+        <source>Paste address from clipboard</source>
+        <translation>Cole endereço da área de transferência</translation>
     </message>
     <message>
-        <source>This week</source>
-        <translation>Esta semana</translation>
+        <source>Alt+P</source>
+        <translation>Alt+P</translation>
     </message>
     <message>
-        <source>This month</source>
-        <translation>Este mês</translation>
+        <source>Remove this entry</source>
+        <translation>Remover esta entrada</translation>
     </message>
     <message>
-        <source>Last month</source>
-        <translation>Mês passado</translation>
+        <source>The fee will be deducted from the amount being sent. The recipient will receive less bitcoins than you enter in the amount field. If multiple recipients are selected, the fee is split equally.</source>
+        <translation>A taxa será deduzida ao montante enviado. O destinatário irá receber menos bitcoins do que as que introduziu no campo montante. Caso sejam seleccionados múltiplos destinatários, a taxa será repartida equitativamente.</translation>
     </message>
     <message>
-        <source>This year</source>
-        <translation>Este ano</translation>
+        <source>S&amp;ubtract fee from amount</source>
+        <translation>S&amp;ubtrair taxa ao montante</translation>
     </message>
     <message>
-        <source>Range...</source>
-        <translation>Período...</translation>
+        <source>Message:</source>
+        <translation>Mensagem:</translation>
     </message>
     <message>
-        <source>Received with</source>
-        <translation>Recebida com</translation>
+        <source>This is an unauthenticated payment request.</source>
+        <translation>Pedido de pagamento não autenticado.</translation>
     </message>
     <message>
-        <source>Sent to</source>
-        <translation>Enviada para</translation>
+        <source>This is an authenticated payment request.</source>
+        <translation>Pedido de pagamento autenticado.</translation>
     </message>
     <message>
-        <source>To yourself</source>
-        <translation>Para si mesmo</translation>
+        <source>Enter a label for this address to add it to the list of used addresses</source>
+        <translation>Introduza um rótulo para este endereço para o adicionar à sua lista de endereços usados</translation>
     </message>
     <message>
-        <source>Mined</source>
-        <translation>Minadas</translation>
+        <source>A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
+        <translation>Uma mensagem que estava anexada ao URI bitcoin: que será armazenada com a transação para sua referência. Nota: Esta mensagem não será enviada através da rede Bitcoin.</translation>
     </message>
     <message>
-        <source>Other</source>
-        <translation>Outras</translation>
+        <source>Pay To:</source>
+        <translation>Pagar a:</translation>
     </message>
     <message>
-        <source>Enter address or label to search</source>
-        <translation>Escreva endereço ou rótulo a procurar</translation>
+        <source>Memo:</source>
+        <translation>Memorando:</translation>
     </message>
+</context>
+<context>
+    <name>ShutdownWindow</name>
     <message>
-        <source>Min amount</source>
-        <translation>Quantia mínima</translation>
+        <source>%1 is shutting down...</source>
+        <translation>%1 está a encerrar...</translation>
     </message>
     <message>
-        <source>Copy address</source>
-        <translation>Copiar endereço</translation>
+        <source>Do not shut down the computer until this window disappears.</source>
+        <translation>Não desligue o computador enquanto esta janela não desaparecer.</translation>
     </message>
+</context>
+<context>
+    <name>SignVerifyMessageDialog</name>
     <message>
-        <source>Copy label</source>
-        <translation>Copiar rótulo</translation>
+        <source>Signatures - Sign / Verify a Message</source>
+        <translation>Assinaturas - Assinar / Verificar uma Mensagem</translation>
     </message>
     <message>
-        <source>Copy amount</source>
-        <translation>Copiar quantia</translation>
+        <source>&amp;Sign Message</source>
+        <translation>&amp;Assinar Mensagem</translation>
     </message>
     <message>
-        <source>Copy transaction ID</source>
-        <translation>Copiar ID da Transação</translation>
+        <source>You can sign messages/agreements with your addresses to prove you can receive bitcoins sent to them. Be careful not to sign anything vague or random, as phishing attacks may try to trick you into signing your identity over to them. Only sign fully-detailed statements you agree to.</source>
+        <translation>Pode assinar mensagens com os seus endereços para provar que são seus. Tenha atenção ao assinar mensagens ambíguas, pois ataques de phishing podem tentar enganá-lo de modo a assinar a sua identidade para os atacantes. Apenas assine declarações detalhadas com as quais concorde.</translation>
     </message>
     <message>
-        <source>Copy raw transaction</source>
-        <translation>Copiar dados brutos da transacção</translation>
+        <source>The Bitcoin address to sign the message with</source>
+        <translation>O endereço Bitcoin para designar a mensagem</translation>
     </message>
     <message>
-        <source>Edit label</source>
-        <translation>Editar rótulo</translation>
+        <source>Choose previously used address</source>
+        <translation>Escolha o endereço utilizado anteriormente</translation>
     </message>
     <message>
-        <source>Show transaction details</source>
-        <translation>Mostrar detalhes da transação</translation>
+        <source>Alt+A</source>
+        <translation>Alt+A</translation>
     </message>
     <message>
-        <source>Export Transaction History</source>
-        <translation>Exportar Histórico de Transacções</translation>
+        <source>Paste address from clipboard</source>
+        <translation>Colar endereço da área de transferência</translation>
     </message>
     <message>
-        <source>Watch-only</source>
-        <translation>Modo-verificação</translation>
+        <source>Alt+P</source>
+        <translation>Alt+P</translation>
     </message>
     <message>
-        <source>Exporting Failed</source>
-        <translation>A Exportação Falhou</translation>
+        <source>Enter the message you want to sign here</source>
+        <translation>Escreva aqui a mensagem que deseja assinar</translation>
     </message>
     <message>
-        <source>There was an error trying to save the transaction history to %1.</source>
-        <translation>Ocorreu um erro ao tentar guardar o histórico de transações em %1.</translation>
+        <source>Signature</source>
+        <translation>Assinatura</translation>
     </message>
     <message>
-        <source>Exporting Successful</source>
-        <translation>Exportação Bem Sucedida</translation>
+        <source>Copy the current signature to the system clipboard</source>
+        <translation>Copiar a assinatura actual para a área de transferência</translation>
     </message>
     <message>
-        <source>The transaction history was successfully saved to %1.</source>
-        <translation>O histórico de transacções foi com guardado com sucesso em %1.</translation>
+        <source>Sign the message to prove you own this Bitcoin address</source>
+        <translation>Assine uma mensagem para provar que é dono deste endereço Bitcoin</translation>
     </message>
     <message>
-        <source>Comma separated file (*.csv)</source>
-        <translation>Ficheiro separado por vírgulas (*.csv)</translation>
+        <source>Sign &amp;Message</source>
+        <translation>Assinar &amp;Mensagem</translation>
     </message>
     <message>
-        <source>Confirmed</source>
-        <translation>Confirmada</translation>
+        <source>Reset all sign message fields</source>
+        <translation>Repor todos os campos de assinatura de mensagem</translation>
     </message>
     <message>
-        <source>Date</source>
-        <translation>Data</translation>
+        <source>Clear &amp;All</source>
+        <translation>Limpar &amp;Tudo</translation>
     </message>
     <message>
-        <source>Type</source>
-        <translation>Tipo</translation>
+        <source>&amp;Verify Message</source>
+        <translation>&amp;Verificar Mensagem</translation>
     </message>
     <message>
-        <source>Label</source>
-        <translation>Rótulo</translation>
+        <source>Enter the receiver's address, message (ensure you copy line breaks, spaces, tabs, etc. exactly) and signature below to verify the message. Be careful not to read more into the signature than what is in the signed message itself, to avoid being tricked by a man-in-the-middle attack. Note that this only proves the signing party receives with the address, it cannot prove sendership of any transaction!</source>
+        <translation>Introduza o endereço de assinatura, mensagem (assegure-se que copia quebras de linha, espaços, tabulações, etc. exactamente) e assinatura abaixo para verificar a mensagem. Tenha atenção para não ler mais na assinatura do que o que estiver na mensagem assinada, para evitar ser enganado por um atacante que se encontre entre si e quem assinou a mensagem.</translation>
     </message>
     <message>
-        <source>Address</source>
-        <translation>Endereço</translation>
+        <source>The Bitcoin address the message was signed with</source>
+        <translation>O endereço Bitcoin com que a mensagem foi designada</translation>
     </message>
     <message>
-        <source>ID</source>
-        <translation>ID</translation>
+        <source>Verify the message to ensure it was signed with the specified Bitcoin address</source>
+        <translation>Verifique a mensagem para assegurar que foi assinada com o endereço Bitcoin especificado</translation>
     </message>
     <message>
-        <source>Range:</source>
-        <translation>Período:</translation>
+        <source>Verify &amp;Message</source>
+        <translation>Verificar &amp;Mensagem</translation>
     </message>
     <message>
-        <source>to</source>
-        <translation>até</translation>
+        <source>Reset all verify message fields</source>
+        <translation>Repor todos os campos de verificação de mensagem</translation>
     </message>
 </context>
 <context>
-    <name>UnitDisplayStatusBarControl</name>
+    <name>SplashScreen</name>
     <message>
-        <source>Unit to show amounts in. Click to select another unit.</source>
-        <translation>Unidade de valores recebidos. Clique para selecionar outra unidade.</translation>
+        <source>[testnet]</source>
+        <translation>[rede de testes]</translation>
     </message>
 </context>
 <context>
-    <name>WalletFrame</name>
+    <name>TrafficGraphWidget</name>
     <message>
-        <source>No wallet has been loaded.</source>
-        <translation>Não foi carregada nenhuma carteira.</translation>
+        <source>KB/s</source>
+        <translation>KB/s</translation>
     </message>
 </context>
 <context>
-    <name>WalletModel</name>
+    <name>TransactionDescDialog</name>
     <message>
-        <source>Send Coins</source>
-        <translation>Enviar Moedas</translation>
+        <source>This pane shows a detailed description of the transaction</source>
+        <translation>Esta janela mostra uma descrição detalhada da transação</translation>
     </message>
 </context>
 <context>
-    <name>WalletView</name>
-    <message>
-        <source>&amp;Export</source>
-        <translation>&amp;Exportar</translation>
-    </message>
-    <message>
-        <source>Export the data in the current tab to a file</source>
-        <translation>Exportar os dados no separador actual para um ficheiro</translation>
-    </message>
-    <message>
-        <source>Backup Wallet</source>
-        <translation>Cópia de Segurança da Carteira</translation>
-    </message>
-    <message>
-        <source>Wallet Data (*.dat)</source>
-        <translation>Dados da Carteira (*.dat)</translation>
-    </message>
-    <message>
-        <source>Backup Failed</source>
-        <translation>Cópia de Segurança Falhou</translation>
-    </message>
-    <message>
-        <source>There was an error trying to save the wallet data to %1.</source>
-        <translation>Ocorreu um erro ao tentar guardar os dados da carteira em %1.</translation>
-    </message>
-    <message>
-        <source>The wallet data was successfully saved to %1.</source>
-        <translation>Os dados da carteira foram guardados com sucesso em %1.</translation>
-    </message>
+    <name>UnitDisplayStatusBarControl</name>
     <message>
-        <source>Backup Successful</source>
-        <translation>Cópia de Segurança Bem Sucedida</translation>
+        <source>Unit to show amounts in. Click to select another unit.</source>
+        <translation>Unidade de valores recebidos. Clique para selecionar outra unidade.</translation>
     </message>
 </context>
 <context>
@@ -2924,14 +1719,6 @@
         <source>If &lt;category&gt; is not supplied or if &lt;category&gt; = 1, output all debugging information.</source>
         <translation>Se &lt;category&gt; não é fornecida ou &lt;category&gt; = 1, imprimir toda a informação de depuração.</translation>
     </message>
-    <message>
-        <source>Maximum total fees (in %s) to use in a single wallet transaction; setting this too low may abort large transactions (default: %s)</source>
-        <translation>Total máximo de taxas (em %s) a utilizar numa única transacção; definir este valor demasiado baixo pode abortar transacções grandes (padrão: %s)</translation>
-    </message>
-    <message>
-        <source>Please check that your computer's date and time are correct! If your clock is wrong Bitcoin Core will not work properly.</source>
-        <translation>Por favor verifique que a data e hora do seu computador estão correctas! Se o seu relógio não estiver certo o Bitcoin Core não irá funcionar correctamente.</translation>
-    </message>
     <message>
         <source>Prune configured below the minimum of %d MiB.  Please use a higher number.</source>
         <translation>Poda configurada abaixo do mínimo de %d MiB.  Por favor, utilize um valor mais elevado.</translation>
@@ -2972,6 +1759,10 @@
         <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
         <translation>Aceitar ligações externas (padrão: 1 sem -proxy ou -connect)</translation>
     </message>
+    <message>
+        <source>Bitcoin Core</source>
+        <translation>Bitcoin Core</translation>
+    </message>
     <message>
         <source>-fallbackfee is set very high! This is the transaction fee you may pay when fee estimates are not available.</source>
         <translation>-fallbackfee está definida muito elevada! Esta é a taxa de transação pode poderá pagar quando as estimativas de taxas não estão disponíveis.</translation>
@@ -3016,14 +1807,6 @@
         <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
         <translation>Esta é uma versão de testes pré-lançamento - use à sua responsabilidade - não usar para minar ou aplicações comerciais</translation>
     </message>
-    <message>
-        <source>Unable to bind to %s on this computer. Bitcoin Core is probably already running.</source>
-        <translation>Incapaz de vincular à porta %s neste computador. O Bitcoin Core provavelmente já está a correr.</translation>
-    </message>
-    <message>
-        <source>Unsupported argument -whitelistalwaysrelay ignored, use -whitelistrelay and/or -whitelistforcerelay.</source>
-        <translation>Argumento não suportado -whitelistalwaysrelay ignorado, utilize -whitelistrelay e/ou -whitelistforcerelay.</translation>
-    </message>
     <message>
         <source>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</source>
         <translation>Utilizar UPnP para mapear a porta de escuta (predefinição: 1 quando escutar e sem -proxy)</translation>
@@ -3040,18 +1823,10 @@
         <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source>
         <translation>Aviso: A rede não parece estar completamente de acordo! Parece que alguns mineiros estão com dificuldades técnicas.</translation>
     </message>
-    <message>
-        <source>Warning: Unknown block versions being mined! It's possible unknown rules are in effect</source>
-        <translation>Atenção: Versões desconhecidas de blocos estão a ser mineradas! É possível que regras desconhecias estão a ser efetuadas</translation>
-    </message>
     <message>
         <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source>
         <translation>Atenção: Parecemos não estar de acordo com os nossos pares! Poderá ter que atualizar o seu cliente, ou outros nós poderão ter que atualizar os seus clientes.</translation>
     </message>
-    <message>
-        <source>Warning: wallet.dat corrupt, data salvaged! Original wallet.dat saved as wallet.{timestamp}.bak in %s; if your balance or transactions are incorrect you should restore from a backup.</source>
-        <translation>Atenção: wallet.dat corrompido, dados recuperados! wallet.dat original salvo como wallet.{timestamp}.bak em %s; se o seu saldo ou transações estiverem incorrectos deverá recuperar uma cópia de segurança.</translation>
-    </message>
     <message>
         <source>Whitelist peers connecting from the given netmask or IP address. Can be specified multiple times.</source>
         <translation>Ligações na lista branca conectam desde a seguinte netmask ou endereço IP. Posse ser especificado varias vezes.</translation>
@@ -3124,6 +1899,18 @@
         <source>Error initializing wallet database environment %s!</source>
         <translation>Erro ao inicializar o ambiente %s da base de dados da carteira</translation>
     </message>
+    <message>
+        <source>Error loading %s</source>
+        <translation>Erro ao carregar %s</translation>
+    </message>
+    <message>
+        <source>Error loading %s: Wallet corrupted</source>
+        <translation>Erro ao carregar %s: carteira corrompida</translation>
+    </message>
+    <message>
+        <source>Error loading %s: Wallet requires newer version of %s</source>
+        <translation>Erro ao carregar %s: a carteira requer a nova versão de %s</translation>
+    </message>
     <message>
         <source>Error loading block database</source>
         <translation>Erro ao carregar base de dados de blocos</translation>
@@ -3152,6 +1939,10 @@
         <source>Invalid -onion address: '%s'</source>
         <translation>Endereço -onion inválido: '%s'</translation>
     </message>
+    <message>
+        <source>Invalid amount for -%s=&lt;amount&gt;: '%s'</source>
+        <translation>Valor inválido para -%s=&lt;amount&gt;: '%s'</translation>
+    </message>
     <message>
         <source>Invalid amount for -fallbackfee=&lt;amount&gt;: '%s'</source>
         <translation>Valor inválido para -fallbackfee=&lt;amount&gt;: '%s'</translation>
@@ -3176,6 +1967,10 @@
         <source>Only connect to nodes in network &lt;net&gt; (ipv4, ipv6 or onion)</source>
         <translation>Somente conectar aos nodes na rede &lt;net&gt; (ipv4, ipv6 ou onion)</translation>
     </message>
+    <message>
+        <source>Print this help message and exit</source>
+        <translation>Imprimir esta mensagem de ajuda e sair</translation>
+    </message>
     <message>
         <source>Print version and exit</source>
         <translation>Imprimir versão e sair</translation>
@@ -3236,10 +2031,6 @@
         <source>Wallet options:</source>
         <translation>Opções da carteira:</translation>
     </message>
-    <message>
-        <source>You need to rebuild the database using -reindex to change -txindex</source>
-        <translation>É necessário reconstruir as bases de dados usando -reindex para mudar o -txindex</translation>
-    </message>
     <message>
         <source>Allow JSON-RPC connections from specified source. Valid for &lt;ip&gt; are a single IP (e.g. 1.2.3.4), a network/netmask (e.g. 1.2.3.4/255.255.255.0) or a network/CIDR (e.g. 1.2.3.4/24). This option can be specified multiple times</source>
         <translation>Permitir conexções JSON-RPC de fontes especificas. Valido para &lt;ip&gt; um unico IP (ex. 1.2.3.4), uma rede/netmask (ex. 1.2.3.4/255.255.255.0) ou uma rede/CIDR (ex. 1.2.3.4/24). Esta opção pode ser especificada varias vezes</translation>
@@ -3252,10 +2043,6 @@
         <source>Bind to given address to listen for JSON-RPC connections. Use [host]:port notation for IPv6. This option can be specified multiple times (default: bind to all interfaces)</source>
         <translation>Vinculado para dar o endereço para atender as ligações JSON-RPC. Use [host]: Notação de porta para IPv6. Esta opção pode ser especificada várias vezes (padrão: ligam-se a todas as interfaces)</translation>
     </message>
-    <message>
-        <source>Cannot obtain a lock on data directory %s. Bitcoin Core is probably already running.</source>
-        <translation>Impossível trancar a pasta de dados %s. Provavelmente o Bitcoin Core já está a ser executado.</translation>
-    </message>
     <message>
         <source>Create new files with system default permissions, instead of umask 077 (only effective with disabled wallet functionality)</source>
         <translation>Crie ficheiros novos com as permisões predefinidas do sistema, em vez de umask 077 (apenas eficaz caso a funcionalidade carteira esteja desactivada)</translation>
@@ -3300,10 +2087,6 @@
         <source>Set maximum size of high-priority/low-fee transactions in bytes (default: %d)</source>
         <translation>Definir tamanho máximo de transações com alta-prioridade/baixa-taxa em bytes (por defeito: %d)</translation>
     </message>
-    <message>
-        <source>Set the number of threads for coin generation if enabled (-1 = all cores, default: %d)</source>
-        <translation>Definir o número threads para a geração de moedas, caso activo (-1 = todos os cores, padrão: %d)</translation>
-    </message>
     <message>
         <source>The transaction amount is too small to send after the fee has been deducted</source>
         <translation>O montante da transacção é demasiado baixo após a dedução da taxa</translation>
@@ -3328,34 +2111,14 @@
         <source>Accept public REST requests (default: %u)</source>
         <translation>Aceitar pedidos REST públicos (predefinição: %u)</translation>
     </message>
-    <message>
-        <source>Activating best chain...</source>
-        <translation>A activar a melhor cadeia...</translation>
-    </message>
-    <message>
-        <source>Attempt to recover private keys from a corrupt wallet.dat on startup</source>
-        <translation>Tentar recuperar chaves privadas de um wallet.dat corrompido ao iniciar</translation>
-    </message>
     <message>
         <source>Automatically create Tor hidden service (default: %d)</source>
         <translation>Criar automaticamente o serviço Tor oculto (predefinição: %d)</translation>
     </message>
-    <message>
-        <source>Cannot resolve -whitebind address: '%s'</source>
-        <translation>Não foi possível resolver o endereço -whitebind: '%s'</translation>
-    </message>
     <message>
         <source>Connect through SOCKS5 proxy</source>
         <translation>Ligar através de um proxy SOCKS5</translation>
     </message>
-    <message>
-        <source>Copyright (C) 2009-%i The Bitcoin Core Developers</source>
-        <translation>Copyright (C) 2009-%i Os Programadores do Bitcoin Core</translation>
-    </message>
-    <message>
-        <source>Error loading wallet.dat: Wallet requires newer version of Bitcoin Core</source>
-        <translation>Erro ao carregar wallet.dat: A carteira requer uma versão mais recente do Bitcoin Core</translation>
-    </message>
     <message>
         <source>Error reading from database, shutting down.</source>
         <translation>Erro ao ler da base de dados, encerrando.</translation>
@@ -3368,22 +2131,6 @@
         <source>Information</source>
         <translation>Informação</translation>
     </message>
-    <message>
-        <source>Initialization sanity check failed. Bitcoin Core is shutting down.</source>
-        <translation>Falha na prova real inicial. Bitcoin Core está a desligar.</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -maxtxfee=&lt;amount&gt;: '%s'</source>
-        <translation>Quantia inválida para -maxtxfee=&lt;quantidade&gt;: '%s'</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -minrelaytxfee=&lt;amount&gt;: '%s'</source>
-        <translation>Quantia inválida para -minrelaytxfee=&lt;quantidade&gt;: '%s'</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -mintxfee=&lt;amount&gt;: '%s'</source>
-        <translation>Quantia inválida para -mintxfee=&lt;quantidade&gt;: '%s'</translation>
-    </message>
     <message>
         <source>Invalid amount for -paytxfee=&lt;amount&gt;: '%s' (must be at least %s)</source>
         <translation>Montante inválido para -paytxfee=&lt;amount&gt;: '%s' (deverá ser no mínimo %s)</translation>
@@ -3408,14 +2155,6 @@
         <source>RPC server options:</source>
         <translation>Opções do servidor RPC:</translation>
     </message>
-    <message>
-        <source>Rebuild block chain index from current blk000??.dat files on startup</source>
-        <translation>Reconstruir a cadeia de blocos a partir dos ficheiros blk000??.dat actuais ao iniciar</translation>
-    </message>
-    <message>
-        <source>Receive and display P2P network alerts (default: %u)</source>
-        <translation>Receber e mostrar alertas da rede P2P (padrão: %u)</translation>
-    </message>
     <message>
         <source>Reducing -maxconnections from %d to %d, because of system limitations.</source>
         <translation>Reduzindo -maxconnections de %d para %d, devido a limitações no sistema.</translation>
@@ -3488,10 +2227,6 @@
         <source>Username for JSON-RPC connections</source>
         <translation>Nome de utilizador para ligações JSON-RPC</translation>
     </message>
-    <message>
-        <source>Wallet needed to be rewritten: restart Bitcoin Core to complete</source>
-        <translation>A Carteira precisou de ser reescrita: reinicie o Bitcoin Core para completar o processo</translation>
-    </message>
     <message>
         <source>Warning</source>
         <translation>Aviso</translation>
@@ -3512,10 +2247,6 @@
         <source>ZeroMQ notification options:</source>
         <translation>Opções de notificação ZeroMQ:</translation>
     </message>
-    <message>
-        <source>wallet.dat corrupt, salvage failed</source>
-        <translation>wallet.dat corrompido, recuperação falhou</translation>
-    </message>
     <message>
         <source>Password for JSON-RPC connections</source>
         <translation>Palavra-passe para ligações JSON-RPC</translation>
@@ -3524,10 +2255,6 @@
         <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
         <translation>Executar comando quando o melhor bloco mudar (no comando, %s é substituído pela hash do bloco)</translation>
     </message>
-    <message>
-        <source>This help message</source>
-        <translation>Esta mensagem de ajuda</translation>
-    </message>
     <message>
         <source>Allow DNS lookups for -addnode, -seednode and -connect</source>
         <translation>Permitir procuras DNS para -addnode, -seednode e -connect</translation>
@@ -3536,10 +2263,6 @@
         <source>Loading addresses...</source>
         <translation>A carregar os endereços...</translation>
     </message>
-    <message>
-        <source>Error loading wallet.dat: Wallet corrupted</source>
-        <translation>Erro ao carregar wallet.dat: Carteira danificada</translation>
-    </message>
     <message>
         <source>(1 = keep tx meta data e.g. account owner and payment request information, 2 = drop tx meta data)</source>
         <translation>(1 = guardar metadados da transacção ex: proprietário da conta e informação do pedido de pagamento, 2 = descartar metadados da transacção)</translation>
@@ -3556,10 +2279,6 @@
         <source>Do not keep transactions in the mempool longer than &lt;n&gt; hours (default: %u)</source>
         <translation>Não guardar transações no banco de memória por mais de &lt;n&gt; horas (predefinição: %u)</translation>
     </message>
-    <message>
-        <source>Error reading wallet.dat! All keys read correctly, but transaction data or address book entries might be missing or incorrect.</source>
-        <translation>Erro ao ler wallet.dat! Todas as chaves foram lidas correctamente, mas os dados das transacções ou do livro de endereços podem estar em falta ou incorrectos.</translation>
-    </message>
     <message>
         <source>Fees (in %s/kB) smaller than this are considered zero fee for transaction creation (default: %s)</source>
         <translation>Taxas (em %s/kB) abaixo deste valor são consideradas nulas para a criação de transacções (padrão: %s)</translation>
@@ -3596,6 +2315,10 @@
         <source>Unsupported argument -socks found. Setting SOCKS version isn't possible anymore, only SOCKS5 proxies are supported.</source>
         <translation>Encontrado um argumento não suportado -socks. Definir a versão do SOCKS já não é possível, apenas proxies SOCKS5 são suportados.</translation>
     </message>
+    <message>
+        <source>Unsupported argument -whitelistalwaysrelay ignored, use -whitelistrelay and/or -whitelistforcerelay.</source>
+        <translation>Argumento não suportado -whitelistalwaysrelay ignorado, utilize -whitelistrelay e/ou -whitelistforcerelay.</translation>
+    </message>
     <message>
         <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: %s)</source>
         <translation>Use um proxy SOCKS5 separado para alcançar pares via serviços ocultos do Tor (padrão: %s)</translation>
@@ -3604,6 +2327,10 @@
         <source>Username and hashed password for JSON-RPC connections. The field &lt;userpw&gt; comes in the format: &lt;USERNAME&gt;:&lt;SALT&gt;$&lt;HASH&gt;. A canonical python script is included in share/rpcuser. This option can be specified multiple times</source>
         <translation>Username e hash da password para ligações JSON-RPC. O campo &lt;userpw&gt; está no formato: &lt;USERNAME&gt;:&lt;SALT&gt;$&lt;HASH&gt;. Um script python está incluido em share/rpcuser. Esta opção pode ser especificada múltiplas vezes.</translation>
     </message>
+    <message>
+        <source>Warning: Unknown block versions being mined! It's possible unknown rules are in effect</source>
+        <translation>Atenção: Versões desconhecidas de blocos estão a ser mineradas! É possível que regras desconhecias estão a ser efetuadas</translation>
+    </message>
     <message>
         <source>(default: %s)</source>
         <translation>(predefinição: %s)</translation>
@@ -3612,14 +2339,6 @@
         <source>Always query for peer addresses via DNS lookup (default: %u)</source>
         <translation>Utilizar sempre a consulta de DNS para endereços de pares (predefinição: %u)</translation>
     </message>
-    <message>
-        <source>Error loading wallet.dat</source>
-        <translation>Erro ao carregar wallet.dat</translation>
-    </message>
-    <message>
-        <source>Generate coins (default: %u)</source>
-        <translation>Gerar moedas (predefinição: %u)</translation>
-    </message>
     <message>
         <source>How many blocks to check at startup (default: %u, 0 = all)</source>
         <translation>Quantos blocos para verificar no arranque (predefinição: %u, 0 = todos)</translation>
@@ -3704,18 +2423,6 @@
         <source>Unknown network specified in -onlynet: '%s'</source>
         <translation>Rede desconhecida especificada em -onlynet: '%s'</translation>
     </message>
-    <message>
-        <source>Cannot resolve -bind address: '%s'</source>
-        <translation>Não foi possível resolver o endereço -bind: '%s'</translation>
-    </message>
-    <message>
-        <source>Cannot resolve -externalip address: '%s'</source>
-        <translation>Não foi possível resolver o endereço -externalip: '%s'</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -paytxfee=&lt;amount&gt;: '%s'</source>
-        <translation>Quantia inválida para -paytxfee=&lt;amount&gt;: '%s'</translation>
-    </message>
     <message>
         <source>Insufficient funds</source>
         <translation>Fundos insuficientes</translation>
diff --git a/src/qt/locale/bitcoin_ro.ts b/src/qt/locale/bitcoin_ro.ts
index 11ac69f0f2dd1..270a4ba062994 100644
--- a/src/qt/locale/bitcoin_ro.ts
+++ b/src/qt/locale/bitcoin_ro.ts
@@ -11,7 +11,7 @@
     </message>
     <message>
         <source>&amp;New</source>
-        <translation>&amp;Nou</translation>
+        <translation>Nou</translation>
     </message>
     <message>
         <source>Copy the currently selected address to the system clipboard</source>
@@ -19,15 +19,11 @@
     </message>
     <message>
         <source>&amp;Copy</source>
-        <translation>&amp;Copiază</translation>
+        <translation>Copiază</translation>
     </message>
     <message>
         <source>C&amp;lose</source>
-        <translation>Î&amp;nchide</translation>
-    </message>
-    <message>
-        <source>&amp;Copy Address</source>
-        <translation>&amp;Copiază Adresa</translation>
+        <translation>Închide</translation>
     </message>
     <message>
         <source>Delete the currently selected address from the list</source>
@@ -39,32 +35,38 @@
     </message>
     <message>
         <source>&amp;Export</source>
-        <translation>&amp;Exportă</translation>
-    </message>
-    <message>
-        <source>Choose the address to send coins to</source>
-        <translation>Indică adresa de expediere a monedelor</translation>
+        <translation>Exportă</translation>
     </message>
     <message>
-        <source>Choose the address to receive coins with</source>
-        <translation>Indică adresa de a primi monedele</translation>
+        <source>&amp;Delete</source>
+        <translation>Șterge</translation>
     </message>
-    </context>
-<context>
-    <name>AddressTableModel</name>
-    </context>
+</context>
 <context>
     <name>AskPassphraseDialog</name>
-    </context>
+    <message>
+        <source>Passphrase Dialog</source>
+        <translation>Secventa de cuvinte a parolei</translation>
+    </message>
+    <message>
+        <source>Enter passphrase</source>
+        <translation>Introduceti parola</translation>
+    </message>
+    <message>
+        <source>New passphrase</source>
+        <translation>Noua parolă</translation>
+    </message>
+    <message>
+        <source>Repeat new passphrase</source>
+        <translation>Repetati noua parolă</translation>
+    </message>
+</context>
 <context>
     <name>BanTableModel</name>
     </context>
 <context>
     <name>BitcoinGUI</name>
     </context>
-<context>
-    <name>ClientModel</name>
-    </context>
 <context>
     <name>CoinControlDialog</name>
     </context>
@@ -89,18 +91,12 @@
 <context>
     <name>OverviewPage</name>
     </context>
-<context>
-    <name>PaymentServer</name>
-    </context>
 <context>
     <name>PeerTableModel</name>
     </context>
 <context>
     <name>QObject</name>
     </context>
-<context>
-    <name>QRImageWidget</name>
-    </context>
 <context>
     <name>RPCConsole</name>
     </context>
@@ -110,9 +106,6 @@
 <context>
     <name>ReceiveRequestDialog</name>
     </context>
-<context>
-    <name>RecentRequestsTableModel</name>
-    </context>
 <context>
     <name>SendCoinsDialog</name>
     </context>
@@ -131,38 +124,12 @@
 <context>
     <name>TrafficGraphWidget</name>
     </context>
-<context>
-    <name>TransactionDesc</name>
-    </context>
 <context>
     <name>TransactionDescDialog</name>
     </context>
-<context>
-    <name>TransactionTableModel</name>
-    </context>
-<context>
-    <name>TransactionView</name>
-    </context>
 <context>
     <name>UnitDisplayStatusBarControl</name>
     </context>
-<context>
-    <name>WalletFrame</name>
-    </context>
-<context>
-    <name>WalletModel</name>
-    </context>
-<context>
-    <name>WalletView</name>
-    <message>
-        <source>&amp;Export</source>
-        <translation>&amp;Exportă</translation>
-    </message>
-    <message>
-        <source>Export the data in the current tab to a file</source>
-        <translation>Exportă datele din tabul curent in fisier</translation>
-    </message>
-    </context>
 <context>
     <name>bitcoin-core</name>
     </context>
diff --git a/src/qt/locale/bitcoin_ro_RO.ts b/src/qt/locale/bitcoin_ro_RO.ts
index 502052dffb296..e6f591aa9e67c 100644
--- a/src/qt/locale/bitcoin_ro_RO.ts
+++ b/src/qt/locale/bitcoin_ro_RO.ts
@@ -25,10 +25,6 @@
         <source>C&amp;lose</source>
         <translation>Închide</translation>
     </message>
-    <message>
-        <source>&amp;Copy Address</source>
-        <translation>&amp;Copiază Adresa</translation>
-    </message>
     <message>
         <source>Delete the currently selected address from the list</source>
         <translation>Şterge adresele curent selectate din listă</translation>
@@ -45,73 +41,6 @@
         <source>&amp;Delete</source>
         <translation>&amp;Şterge</translation>
     </message>
-    <message>
-        <source>Choose the address to send coins to</source>
-        <translation>Alegeţi adresa unde vreţi să trimiteţi monedele</translation>
-    </message>
-    <message>
-        <source>Choose the address to receive coins with</source>
-        <translation>Alegeţi adresa unde vreţi să primiţi monedele</translation>
-    </message>
-    <message>
-        <source>C&amp;hoose</source>
-        <translation>&amp;Alegeţi</translation>
-    </message>
-    <message>
-        <source>Sending addresses</source>
-        <translation>Adresa destinatarului</translation>
-    </message>
-    <message>
-        <source>Receiving addresses</source>
-        <translation>Adresa de primire</translation>
-    </message>
-    <message>
-        <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source>
-        <translation>Acestea sînt adresele dumneavoastră Bitcoin pentru efectuarea plăţilor. Verificaţi întotdeauna cantitatea şi adresa de primire înainte de a trimite monede.</translation>
-    </message>
-    <message>
-        <source>These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source>
-        <translation>Acestea sînt adresele dumneavoastră Bitcoin folosite pentru a primi plati. Este recomandat să folosiţi o adresă nouă de primire pentru fiecare tranzacţie în parte.</translation>
-    </message>
-    <message>
-        <source>Copy &amp;Label</source>
-        <translation>Copiază &amp;eticheta</translation>
-    </message>
-    <message>
-        <source>&amp;Edit</source>
-        <translation>&amp;Editare</translation>
-    </message>
-    <message>
-        <source>Export Address List</source>
-        <translation>Exportă listă de adrese</translation>
-    </message>
-    <message>
-        <source>Comma separated file (*.csv)</source>
-        <translation>Fişier text cu valori separate prin virgulă (*.csv)</translation>
-    </message>
-    <message>
-        <source>Exporting Failed</source>
-        <translation>Export nereuşit</translation>
-    </message>
-    <message>
-        <source>There was an error trying to save the address list to %1. Please try again.</source>
-        <translation>A apărut o eroare la salvarea listei de adrese la %1. Vă rugăm să încercaţi din nou.</translation>
-    </message>
-</context>
-<context>
-    <name>AddressTableModel</name>
-    <message>
-        <source>Label</source>
-        <translation>Etichetă</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>Adresă</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(fără etichetă)</translation>
-    </message>
 </context>
 <context>
     <name>AskPassphraseDialog</name>
@@ -131,94 +60,6 @@
         <source>Repeat new passphrase</source>
         <translation>Repetaţi noua frază de acces</translation>
     </message>
-    <message>
-        <source>Encrypt wallet</source>
-        <translation>Criptare portofel</translation>
-    </message>
-    <message>
-        <source>This operation needs your wallet passphrase to unlock the wallet.</source>
-        <translation>Această acţiune necesită fraza dvs. de acces pentru deblocarea portofelului.</translation>
-    </message>
-    <message>
-        <source>Unlock wallet</source>
-        <translation>Deblocare portofel</translation>
-    </message>
-    <message>
-        <source>This operation needs your wallet passphrase to decrypt the wallet.</source>
-        <translation>Această acţiune necesită fraza dvs. de acces pentru decriptarea portofelului.</translation>
-    </message>
-    <message>
-        <source>Decrypt wallet</source>
-        <translation>Decriptare portofel</translation>
-    </message>
-    <message>
-        <source>Change passphrase</source>
-        <translation>Schimbare frază de acces</translation>
-    </message>
-    <message>
-        <source>Confirm wallet encryption</source>
-        <translation>Confirmaţi criptarea portofelului</translation>
-    </message>
-    <message>
-        <source>Warning: If you encrypt your wallet and lose your passphrase, you will &lt;b&gt;LOSE ALL OF YOUR BITCOINS&lt;/b&gt;!</source>
-        <translation>Atenţie: Dacă pierdeţi parola portofelului electronic după criptare, &lt;b&gt;VEŢI PIERDE ÎNTREAGA SUMĂ DE BITCOIN ACUMULATĂ&lt;/b&gt;!</translation>
-    </message>
-    <message>
-        <source>Are you sure you wish to encrypt your wallet?</source>
-        <translation>Sigur doriţi să criptaţi portofelul dvs.?</translation>
-    </message>
-    <message>
-        <source>Bitcoin Core will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source>
-        <translation>Bitcoin se va închide acum pentru a termina procesul de criptare. Ţineţi minte că criptarea portofelului nu vă poate proteja în totalitate de furtul monedelor de către programe dăunătoare care vă infectează calculatorul.</translation>
-    </message>
-    <message>
-        <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source>
-        <translation>IMPORTANT: Orice copie de siguranţă făcută anterior portofelului dumneavoastră ar trebui înlocuită cu cea generată cel mai recent, fişier criptat al portofelului. Pentru siguranţă, copiile de siguranţă vechi ale portofelului ne-criptat vor deveni inutile imediat ce veţi începe folosirea noului fişier criptat al portofelului.</translation>
-    </message>
-    <message>
-        <source>Warning: The Caps Lock key is on!</source>
-        <translation>Atenţie! Caps Lock este pornit!</translation>
-    </message>
-    <message>
-        <source>Wallet encrypted</source>
-        <translation>Portofel criptat</translation>
-    </message>
-    <message>
-        <source>Enter the new passphrase to the wallet.&lt;br/&gt;Please use a passphrase of &lt;b&gt;ten or more random characters&lt;/b&gt;, or &lt;b&gt;eight or more words&lt;/b&gt;.</source>
-        <translation>Introduceţi noua parolă a portofelului electronic.&lt;br/&gt;Vă rugăm să folosiţi o parolă de&lt;b&gt;minimum 10 caractere aleatoare&lt;/b&gt;, sau &lt;b&gt;minimum 8 cuvinte&lt;/b&gt;.</translation>
-    </message>
-    <message>
-        <source>Enter the old passphrase and new passphrase to the wallet.</source>
-        <translation>Introduceţi vechea şi noua parolă pentru portofel.</translation>
-    </message>
-    <message>
-        <source>Wallet encryption failed</source>
-        <translation>Criptarea portofelului nu a reuşit</translation>
-    </message>
-    <message>
-        <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
-        <translation>Criptarea portofelului nu a reuşit din cauza unei erori interne. Portofelul dvs. nu a fost criptat.</translation>
-    </message>
-    <message>
-        <source>The supplied passphrases do not match.</source>
-        <translation>Frazele de acces introduse nu se potrivesc.</translation>
-    </message>
-    <message>
-        <source>Wallet unlock failed</source>
-        <translation>Deblocarea portofelului nu a reuşit</translation>
-    </message>
-    <message>
-        <source>The passphrase entered for the wallet decryption was incorrect.</source>
-        <translation>Fraza de acces introdusă pentru decriptarea portofelului a fost incorectă.</translation>
-    </message>
-    <message>
-        <source>Wallet decryption failed</source>
-        <translation>Decriptarea portofelului nu a reuşit</translation>
-    </message>
-    <message>
-        <source>Wallet passphrase was successfully changed.</source>
-        <translation>Parola portofelului electronic a fost schimbată.</translation>
-    </message>
 </context>
 <context>
     <name>BanTableModel</name>
@@ -305,14 +146,6 @@
         <source>Open &amp;URI...</source>
         <translation>Deschide &amp;URI...</translation>
     </message>
-    <message>
-        <source>Bitcoin Core client</source>
-        <translation>Clientul Bitcoin Core</translation>
-    </message>
-    <message>
-        <source>Importing blocks from disk...</source>
-        <translation>Import blocuri de pe disk...</translation>
-    </message>
     <message>
         <source>Reindexing blocks on disk...</source>
         <translation>Se reindexează blocurile pe disc...</translation>
@@ -357,10 +190,6 @@
         <source>&amp;Receive</source>
         <translation>P&amp;rimeşte</translation>
     </message>
-    <message>
-        <source>Show information about Bitcoin Core</source>
-        <translation>Arată informaţii despre Bitcoin Core</translation>
-    </message>
     <message>
         <source>&amp;Show / Hide</source>
         <translation>Arată/Ascunde</translation>
@@ -397,22 +226,10 @@
         <source>Tabs toolbar</source>
         <translation>Bara de unelte</translation>
     </message>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Nucleul Bitcoin</translation>
-    </message>
     <message>
         <source>Request payments (generates QR codes and bitcoin: URIs)</source>
         <translation>Cereţi plăţi (generează coduri QR şi bitcoin-uri: URls)</translation>
     </message>
-    <message>
-        <source>&amp;About Bitcoin Core</source>
-        <translation>&amp;Despre Nucleul Bitcoin</translation>
-    </message>
-    <message>
-        <source>Modify configuration options for Bitcoin Core</source>
-        <translation>Modifică opţiunile de configurare pentru Bitcoin</translation>
-    </message>
     <message>
         <source>Show the list of used sending addresses and labels</source>
         <translation>Arată lista de adrese trimise şi etichetele folosite.</translation>
@@ -429,10 +246,6 @@
         <source>&amp;Command-line options</source>
         <translation>Opţiuni linie de &amp;comandă</translation>
     </message>
-    <message>
-        <source>Show the Bitcoin Core help message to get a list with possible Bitcoin command-line options</source>
-        <translation>Arată mesajul de ajutor Bitcoin Core pentru a obţine o listă cu opţiunile posibile de linii de comandă Bitcoin</translation>
-    </message>
     <message numerus="yes">
         <source>%n active connection(s) to Bitcoin network</source>
         <translation><numerusform>%n conexiune activă către reţeaua Bitcoin</numerusform><numerusform>%n conexiuni active către reţeaua Bitcoin</numerusform><numerusform>%n de conexiuni active către reţeaua Bitcoin</numerusform></translation>
@@ -544,13 +357,6 @@
         <translation>Portofelul este &lt;b&gt;criptat&lt;/b&gt; iar în momentul de faţă este &lt;b&gt;blocat&lt;/b&gt;</translation>
     </message>
 </context>
-<context>
-    <name>ClientModel</name>
-    <message>
-        <source>Network Alert</source>
-        <translation>Alertă reţea</translation>
-    </message>
-</context>
 <context>
     <name>CoinControlDialog</name>
     <message>
@@ -629,150 +435,6 @@
         <source>Priority</source>
         <translation>Prioritate</translation>
     </message>
-    <message>
-        <source>Copy address</source>
-        <translation>Copiază adresa</translation>
-    </message>
-    <message>
-        <source>Copy label</source>
-        <translation>Copiază eticheta</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>Copiază suma</translation>
-    </message>
-    <message>
-        <source>Copy transaction ID</source>
-        <translation>Copiază ID tranzacţie</translation>
-    </message>
-    <message>
-        <source>Lock unspent</source>
-        <translation>Blocare necheltuiţi</translation>
-    </message>
-    <message>
-        <source>Unlock unspent</source>
-        <translation>Deblocare necheltuiţi</translation>
-    </message>
-    <message>
-        <source>Copy quantity</source>
-        <translation>Copiază cantitea</translation>
-    </message>
-    <message>
-        <source>Copy fee</source>
-        <translation>Copiază taxa</translation>
-    </message>
-    <message>
-        <source>Copy after fee</source>
-        <translation>Copiază după taxă</translation>
-    </message>
-    <message>
-        <source>Copy bytes</source>
-        <translation>Copiază octeţi</translation>
-    </message>
-    <message>
-        <source>Copy priority</source>
-        <translation>Copiază prioritatea</translation>
-    </message>
-    <message>
-        <source>Copy dust</source>
-        <translation>Copiază praf</translation>
-    </message>
-    <message>
-        <source>Copy change</source>
-        <translation>Copiază rest</translation>
-    </message>
-    <message>
-        <source>highest</source>
-        <translation>cea mai mare</translation>
-    </message>
-    <message>
-        <source>higher</source>
-        <translation>mai mare</translation>
-    </message>
-    <message>
-        <source>high</source>
-        <translation>mare</translation>
-    </message>
-    <message>
-        <source>medium-high</source>
-        <translation>medie-mare</translation>
-    </message>
-    <message>
-        <source>medium</source>
-        <translation>medie</translation>
-    </message>
-    <message>
-        <source>low-medium</source>
-        <translation>medie-scăzută</translation>
-    </message>
-    <message>
-        <source>low</source>
-        <translation>scazută</translation>
-    </message>
-    <message>
-        <source>lower</source>
-        <translation>mai scăzută</translation>
-    </message>
-    <message>
-        <source>lowest</source>
-        <translation>cea mai scăzută</translation>
-    </message>
-    <message>
-        <source>(%1 locked)</source>
-        <translation>(%1 blocat)</translation>
-    </message>
-    <message>
-        <source>none</source>
-        <translation>nimic</translation>
-    </message>
-    <message>
-        <source>This label turns red if the transaction size is greater than 1000 bytes.</source>
-        <translation>Această etichetă devine roşie în cazul în care dimensiunea tranzacţiei este mai mare de 1000 de octeţi.</translation>
-    </message>
-    <message>
-        <source>This label turns red if the priority is smaller than "medium".</source>
-        <translation>Această etichetă devine roşie dacă prioritatea e mai mică decît "medie".</translation>
-    </message>
-    <message>
-        <source>This label turns red if any recipient receives an amount smaller than %1.</source>
-        <translation>Această etichetă devine roşie, dacă orice beneficiar primeşte o sumă mai mică decât %1.</translation>
-    </message>
-    <message>
-        <source>Can vary +/- %1 satoshi(s) per input.</source>
-        <translation>Poate varia +/- %1 satoshi pentru fiecare intrare.</translation>
-    </message>
-    <message>
-        <source>yes</source>
-        <translation>da</translation>
-    </message>
-    <message>
-        <source>no</source>
-        <translation>nu</translation>
-    </message>
-    <message>
-        <source>This means a fee of at least %1 per kB is required.</source>
-        <translation>Aceasta înseamnă o taxă de cel puţin %1 pe kB necesar.</translation>
-    </message>
-    <message>
-        <source>Can vary +/- 1 byte per input.</source>
-        <translation>Poate varia +/- 1 octet pentru fiecare intrare.</translation>
-    </message>
-    <message>
-        <source>Transactions with higher priority are more likely to get included into a block.</source>
-        <translation>Tranzacţiile cu prioritate mai mare sînt mai susceptibile de fi incluse într-un bloc.</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(fără etichetă)</translation>
-    </message>
-    <message>
-        <source>change from %1 (%2)</source>
-        <translation>restul de la %1 (%2)</translation>
-    </message>
-    <message>
-        <source>(change)</source>
-        <translation>(rest)</translation>
-    </message>
 </context>
 <context>
     <name>EditAddressDialog</name>
@@ -796,38 +458,6 @@
         <source>&amp;Address</source>
         <translation>&amp;Adresă</translation>
     </message>
-    <message>
-        <source>New receiving address</source>
-        <translation>Noua adresă de primire</translation>
-    </message>
-    <message>
-        <source>New sending address</source>
-        <translation>Noua adresă de trimitere</translation>
-    </message>
-    <message>
-        <source>Edit receiving address</source>
-        <translation>Editează adresa de primire</translation>
-    </message>
-    <message>
-        <source>Edit sending address</source>
-        <translation>Editează adresa de trimitere</translation>
-    </message>
-    <message>
-        <source>The entered address "%1" is already in the address book.</source>
-        <translation>Adresa introdusă "%1" se află deja în lista de adrese.</translation>
-    </message>
-    <message>
-        <source>The entered address "%1" is not a valid Bitcoin address.</source>
-        <translation>Adresa introdusă "%1" nu este o adresă bitcoin validă.</translation>
-    </message>
-    <message>
-        <source>Could not unlock wallet.</source>
-        <translation>Portofelul nu a putut fi deblocat.</translation>
-    </message>
-    <message>
-        <source>New key generation failed.</source>
-        <translation>Generarea noii chei nu a reuşit.</translation>
-    </message>
 </context>
 <context>
     <name>FreespaceChecker</name>
@@ -854,10 +484,6 @@
 </context>
 <context>
     <name>HelpMessageDialog</name>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Nucleul Bitcoin</translation>
-    </message>
     <message>
         <source>version</source>
         <translation>versiunea</translation>
@@ -867,8 +493,8 @@
         <translation>(%1-bit)</translation>
     </message>
     <message>
-        <source>About Bitcoin Core</source>
-        <translation>Despre Nucleul Bitcoin</translation>
+        <source>About %1</source>
+        <translation>Despre %1</translation>
     </message>
     <message>
         <source>Command-line options</source>
@@ -906,29 +532,13 @@
         <source>Show splash screen on startup (default: %u)</source>
         <translation>Afişează ecran splash la pornire (implicit: %u)</translation>
     </message>
-    <message>
-        <source>Reset all settings changes made over the GUI</source>
-        <translation>Resetează toate schimbările făcute în GUI</translation>
-    </message>
-</context>
+    </context>
 <context>
     <name>Intro</name>
     <message>
         <source>Welcome</source>
         <translation>Bun venit</translation>
     </message>
-    <message>
-        <source>Welcome to Bitcoin Core.</source>
-        <translation>Bine aţi venit la Nucleul Bitcoin.</translation>
-    </message>
-    <message>
-        <source>As this is the first time the program is launched, you can choose where Bitcoin Core will store its data.</source>
-        <translation>Dacă aceasta este prima dată cînd programul este lansat, puteţi alege unde Nucleul Bitcoin va stoca datele.</translation>
-    </message>
-    <message>
-        <source>Bitcoin Core will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source>
-        <translation>Nucleul Bitcoin se va descărca şi va stoca o copie a lanţului blocului Bitcoin. Cel puţin %1GB de date vor fi stocate în acest dosar şi se va mări în timp. Portofelul va fi, de asemenea, stocat în acest dosar.</translation>
-    </message>
     <message>
         <source>Use the default data directory</source>
         <translation>Foloseşte dosarul de date implicit</translation>
@@ -937,10 +547,6 @@
         <source>Use a custom data directory:</source>
         <translation>Foloseşte un dosar de date personalizat:</translation>
     </message>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Nucleul Bitcoin</translation>
-    </message>
     <message>
         <source>Error: Specified data directory "%1" cannot be created.</source>
         <translation>Eroare: Directorul datelor specificate "%1" nu poate fi creat.</translation>
@@ -976,10 +582,6 @@
         <source>Select payment request file</source>
         <translation>Selectaţi fişierul cerere de plată</translation>
     </message>
-    <message>
-        <source>Select payment request file to open</source>
-        <translation>Selectaţi fişierul cerere de plată pentru deschidere</translation>
-    </message>
 </context>
 <context>
     <name>OptionsDialog</name>
@@ -1019,10 +621,6 @@
         <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Exit in the menu.</source>
         <translation>Minimizează fereastra în locul părăsirii programului în momentul închiderii ferestrei. Cînd acestă opţiune e activă, aplicaţia se va opri doar în momentul selectării comenzii 'Închide aplicaţia' din menu.</translation>
     </message>
-    <message>
-        <source>The user interface language can be set here. This setting will take effect after restarting Bitcoin Core.</source>
-        <translation>Limba interfeţei utilizatorului poate fi setată aici. Această setare va avea efect după repornirea Nucleului Bitcoin.</translation>
-    </message>
     <message>
         <source>Third party URLs (e.g. a block explorer) that appear in the transactions tab as context menu items. %s in the URL is replaced by transaction hash. Multiple URLs are separated by vertical bar |.</source>
         <translation>URL-uri terţe părţi (de exemplu, un explorator de bloc), care apar în tab-ul tranzacţiilor ca elemente de meniu contextual. %s în URL este înlocuit cu hash de tranzacţie. URL-urile multiple sînt separate prin bară verticală |.</translation>
@@ -1047,14 +645,6 @@
         <source>&amp;Network</source>
         <translation>Reţea</translation>
     </message>
-    <message>
-        <source>Automatically start Bitcoin Core after logging in to the system.</source>
-        <translation>Porneşte automat Bitcoin Core după logarea în sistem.</translation>
-    </message>
-    <message>
-        <source>&amp;Start Bitcoin Core on system login</source>
-        <translation>Porneşte Nucleul Bitcoin la pornirea sistemului</translation>
-    </message>
     <message>
         <source>(0 = auto, &lt;0 = leave that many cores free)</source>
         <translation>(0 = automat, &lt;0 = lasă atîtea nuclee libere)</translation>
@@ -1268,190 +858,80 @@
     </message>
 </context>
 <context>
-    <name>PaymentServer</name>
+    <name>PeerTableModel</name>
     <message>
-        <source>URI handling</source>
-        <translation>Gestionare URI</translation>
+        <source>User Agent</source>
+        <translation>Agent utilizator</translation>
     </message>
     <message>
-        <source>Invalid payment address %1</source>
-        <translation>Adresă pentru plată nevalidă %1</translation>
+        <source>Node/Service</source>
+        <translation>Nod/Serviciu</translation>
     </message>
     <message>
-        <source>Payment request rejected</source>
-        <translation>Cerere de plată refuzată</translation>
+        <source>Ping Time</source>
+        <translation>Timp ping</translation>
     </message>
+</context>
+<context>
+    <name>QObject</name>
     <message>
-        <source>Payment request network doesn't match client network.</source>
-        <translation>Cererea de plată din reţea nu se potriveşte cu clientul din reţea</translation>
+        <source>Amount</source>
+        <translation>Cantitate</translation>
     </message>
     <message>
-        <source>Payment request is not initialized.</source>
-        <translation>Cererea de plată nu este iniţializată.</translation>
+        <source>Enter a Bitcoin address (e.g. %1)</source>
+        <translation>Introduceţi o adresă Bitcoin (de exemplu %1)</translation>
     </message>
     <message>
-        <source>Requested payment amount of %1 is too small (considered dust).</source>
-        <translation>Suma cerută de plată de %1 este prea mică (considerată praf).</translation>
+        <source>%1 d</source>
+        <translation>%1 z</translation>
     </message>
     <message>
-        <source>Payment request error</source>
-        <translation>Eroare la cererea de plată</translation>
+        <source>%1 h</source>
+        <translation>%1 h</translation>
     </message>
     <message>
-        <source>Cannot start bitcoin: click-to-pay handler</source>
-        <translation>Nu poate porni bitcoin: manipulator clic-pentru-plată</translation>
+        <source>%1 m</source>
+        <translation>%1 m</translation>
     </message>
     <message>
-        <source>Payment request fetch URL is invalid: %1</source>
-        <translation>URL-ul cererii de plată preluat nu este valid: %1</translation>
+        <source>%1 s</source>
+        <translation>%1 s</translation>
     </message>
     <message>
-        <source>URI cannot be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source>
-        <translation>URI nu poate fi analizat! Acest lucru poate fi cauzat de o adresă Bitcoin nevalidă sau parametri URI deformaţi.</translation>
+        <source>None</source>
+        <translation>Niciuna</translation>
     </message>
     <message>
-        <source>Payment request file handling</source>
-        <translation>Manipulare fişier cerere de plată</translation>
+        <source>N/A</source>
+        <translation>N/A</translation>
     </message>
     <message>
-        <source>Payment request file cannot be read! This can be caused by an invalid payment request file.</source>
-        <translation>Fişierul cerere de plată nu poate fi citit! Cauza poate fi un fişier cerere de plată nevalid.</translation>
+        <source>%1 ms</source>
+        <translation>%1 ms</translation>
     </message>
+</context>
+<context>
+    <name>RPCConsole</name>
     <message>
-        <source>Payment request expired.</source>
-        <translation>Cererea de plată a expirat.</translation>
+        <source>Client name</source>
+        <translation>Nume client</translation>
     </message>
     <message>
-        <source>Unverified payment requests to custom payment scripts are unsupported.</source>
-        <translation>Cererile de plată neverificate prin script-uri personalizate de plată nu sînt suportate.</translation>
+        <source>N/A</source>
+        <translation>indisponibil</translation>
     </message>
     <message>
-        <source>Invalid payment request.</source>
-        <translation>Cerere de plată nevalidă.</translation>
+        <source>Client version</source>
+        <translation>Versiune client</translation>
     </message>
     <message>
-        <source>Refund from %1</source>
-        <translation>Rambursare de la %1</translation>
+        <source>&amp;Information</source>
+        <translation>&amp;Informaţii</translation>
     </message>
     <message>
-        <source>Payment request %1 is too large (%2 bytes, allowed %3 bytes).</source>
-        <translation>Cererea de plată %1 este prea mare (%2 octeţi, permis %3 octeţi).</translation>
-    </message>
-    <message>
-        <source>Error communicating with %1: %2</source>
-        <translation>Eroare la comunicarea cu %1: %2</translation>
-    </message>
-    <message>
-        <source>Payment request cannot be parsed!</source>
-        <translation>Cererea de plată nu poate fi analizată!</translation>
-    </message>
-    <message>
-        <source>Bad response from server %1</source>
-        <translation>Răspuns greşit de la server %1</translation>
-    </message>
-    <message>
-        <source>Payment acknowledged</source>
-        <translation>Plată acceptată</translation>
-    </message>
-    <message>
-        <source>Network request error</source>
-        <translation>Eroare în cererea de reţea</translation>
-    </message>
-</context>
-<context>
-    <name>PeerTableModel</name>
-    <message>
-        <source>User Agent</source>
-        <translation>Agent utilizator</translation>
-    </message>
-    <message>
-        <source>Node/Service</source>
-        <translation>Nod/Serviciu</translation>
-    </message>
-    <message>
-        <source>Ping Time</source>
-        <translation>Timp ping</translation>
-    </message>
-</context>
-<context>
-    <name>QObject</name>
-    <message>
-        <source>Amount</source>
-        <translation>Cantitate</translation>
-    </message>
-    <message>
-        <source>Enter a Bitcoin address (e.g. %1)</source>
-        <translation>Introduceţi o adresă Bitcoin (de exemplu %1)</translation>
-    </message>
-    <message>
-        <source>%1 d</source>
-        <translation>%1 z</translation>
-    </message>
-    <message>
-        <source>%1 h</source>
-        <translation>%1 h</translation>
-    </message>
-    <message>
-        <source>%1 m</source>
-        <translation>%1 m</translation>
-    </message>
-    <message>
-        <source>%1 s</source>
-        <translation>%1 s</translation>
-    </message>
-    <message>
-        <source>None</source>
-        <translation>Niciuna</translation>
-    </message>
-    <message>
-        <source>N/A</source>
-        <translation>N/A</translation>
-    </message>
-    <message>
-        <source>%1 ms</source>
-        <translation>%1 ms</translation>
-    </message>
-</context>
-<context>
-    <name>QRImageWidget</name>
-    <message>
-        <source>&amp;Save Image...</source>
-        <translation>&amp;Salvează imagine...</translation>
-    </message>
-    <message>
-        <source>&amp;Copy Image</source>
-        <translation>&amp;Copiază imaginea</translation>
-    </message>
-    <message>
-        <source>Save QR Code</source>
-        <translation>Salvează codul QR</translation>
-    </message>
-    <message>
-        <source>PNG Image (*.png)</source>
-        <translation>Imagine de tip PNG (*.png)</translation>
-    </message>
-</context>
-<context>
-    <name>RPCConsole</name>
-    <message>
-        <source>Client name</source>
-        <translation>Nume client</translation>
-    </message>
-    <message>
-        <source>N/A</source>
-        <translation>indisponibil</translation>
-    </message>
-    <message>
-        <source>Client version</source>
-        <translation>Versiune client</translation>
-    </message>
-    <message>
-        <source>&amp;Information</source>
-        <translation>&amp;Informaţii</translation>
-    </message>
-    <message>
-        <source>Debug window</source>
-        <translation>Fereastra de depanare</translation>
+        <source>Debug window</source>
+        <translation>Fereastra de depanare</translation>
     </message>
     <message>
         <source>General</source>
@@ -1589,10 +1069,6 @@
         <source>Out:</source>
         <translation>Ieşire:</translation>
     </message>
-    <message>
-        <source>Build date</source>
-        <translation>Construit la data</translation>
-    </message>
     <message>
         <source>Debug log file</source>
         <translation>Fişier jurnal depanare</translation>
@@ -1621,10 +1097,6 @@
         <source>1 &amp;year</source>
         <translation>1 &amp;an</translation>
     </message>
-    <message>
-        <source>Welcome to the Bitcoin Core RPC console.</source>
-        <translation>Bun venit la consola Nucleului Bitcoin RPC.</translation>
-    </message>
     <message>
         <source>Use up and down arrows to navigate history, and &lt;b&gt;Ctrl-L&lt;/b&gt; to clear screen.</source>
         <translation>Folosiţi săgetile sus şi jos pentru a naviga în istoric şi &lt;b&gt;Ctrl-L&lt;/b&gt; pentru a curăţa.</translation>
@@ -1748,18 +1220,6 @@
         <source>Remove</source>
         <translation>Înlătură</translation>
     </message>
-    <message>
-        <source>Copy label</source>
-        <translation>Copiază eticheta</translation>
-    </message>
-    <message>
-        <source>Copy message</source>
-        <translation>Copiază mesajul</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>Copiază suma</translation>
-    </message>
 </context>
 <context>
     <name>ReceiveRequestDialog</name>
@@ -1779,73 +1239,6 @@
         <source>&amp;Save Image...</source>
         <translation>&amp;Salvează imaginea...</translation>
     </message>
-    <message>
-        <source>Request payment to %1</source>
-        <translation>Cere plata pentru %1</translation>
-    </message>
-    <message>
-        <source>Payment information</source>
-        <translation>Informaţiile plăţii</translation>
-    </message>
-    <message>
-        <source>URI</source>
-        <translation>URI</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>Adresă</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>Sumă</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Etichetă</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>Mesaj</translation>
-    </message>
-    <message>
-        <source>Resulting URI too long, try to reduce the text for label / message.</source>
-        <translation>URI rezultat este prea lung, încearcaţi să reduceţi textul pentru etichetă / mesaj.</translation>
-    </message>
-    <message>
-        <source>Error encoding URI into QR Code.</source>
-        <translation>Eroare la codarea URl-ului în cod QR.</translation>
-    </message>
-</context>
-<context>
-    <name>RecentRequestsTableModel</name>
-    <message>
-        <source>Date</source>
-        <translation>Data</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Etichetă</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>Mesaj</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>Sumă</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(fără etichetă)</translation>
-    </message>
-    <message>
-        <source>(no message)</source>
-        <translation>(nici un mesaj)</translation>
-    </message>
-    <message>
-        <source>(no amount)</source>
-        <translation>(sumă nulă)</translation>
-    </message>
 </context>
 <context>
     <name>SendCoinsDialog</name>
@@ -1945,14 +1338,6 @@
         <source>fast</source>
         <translation>rapid</translation>
     </message>
-    <message>
-        <source>Send as zero-fee transaction if possible</source>
-        <translation>Trimite ca taxă zero dacă este posibil</translation>
-    </message>
-    <message>
-        <source>(confirmation may take longer)</source>
-        <translation>(confirmarea poate dura mai mult)</translation>
-    </message>
     <message>
         <source>Send to multiple recipients at once</source>
         <translation>Trimite simultan către mai mulţi destinatari</translation>
@@ -1985,106 +1370,6 @@
         <source>S&amp;end</source>
         <translation>Trimit&amp;e</translation>
     </message>
-    <message>
-        <source>Confirm send coins</source>
-        <translation>Confirmă trimiterea de monede</translation>
-    </message>
-    <message>
-        <source>%1 to %2</source>
-        <translation>%1 la %2</translation>
-    </message>
-    <message>
-        <source>Copy quantity</source>
-        <translation>Copiază cantitea</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>Copiază suma</translation>
-    </message>
-    <message>
-        <source>Copy fee</source>
-        <translation>Copiază taxa</translation>
-    </message>
-    <message>
-        <source>Copy after fee</source>
-        <translation>Copiază după taxă</translation>
-    </message>
-    <message>
-        <source>Copy bytes</source>
-        <translation>Copiază octeţi</translation>
-    </message>
-    <message>
-        <source>Copy priority</source>
-        <translation>Copiază prioritatea</translation>
-    </message>
-    <message>
-        <source>Copy change</source>
-        <translation>Copiază rest</translation>
-    </message>
-    <message>
-        <source>Total Amount %1</source>
-        <translation>Suma totală %1</translation>
-    </message>
-    <message>
-        <source>or</source>
-        <translation>sau</translation>
-    </message>
-    <message>
-        <source>The amount to pay must be larger than 0.</source>
-        <translation>Suma de plată trebuie să fie mai mare decît 0.</translation>
-    </message>
-    <message>
-        <source>The amount exceeds your balance.</source>
-        <translation>Suma depăşeşte soldul contului.</translation>
-    </message>
-    <message>
-        <source>The total exceeds your balance when the %1 transaction fee is included.</source>
-        <translation>Totalul depăşeşte soldul contului dacă se include şi plata taxei de %1.</translation>
-    </message>
-    <message>
-        <source>Transaction creation failed!</source>
-        <translation>Creare tranzacţie nereuşită!</translation>
-    </message>
-    <message>
-        <source>The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source>
-        <translation>Tranzacţia a fost respinsă! Acest lucru se poate întîmpla dacă o parte din monedele tale din portofel au fost deja cheltuite, la fel ca şi cum aţi fi folosit o copie a wallet.dat şi monedele au fost cheltuite în copie, dar nu au fost marcate ca şi cheltuite şi aici.</translation>
-    </message>
-    <message>
-        <source>Payment request expired.</source>
-        <translation>Cererea de plată a expirat.</translation>
-    </message>
-    <message>
-        <source>The recipient address is not valid. Please recheck.</source>
-        <translation>Adresa destinatarului nu este validă, vă rugăm să o verificaţi.</translation>
-    </message>
-    <message>
-        <source>Duplicate address found: addresses should only be used once each.</source>
-        <translation>Adresă duplicat găsită: fiecare adresă ar trebui folosită o singură dată.</translation>
-    </message>
-    <message>
-        <source>Warning: Invalid Bitcoin address</source>
-        <translation>Atenţie: Adresa bitcoin nevalidă!</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(fără etichetă)</translation>
-    </message>
-    <message>
-        <source>Warning: Unknown change address</source>
-        <translation>Atenţie: Adresă de rest necunoscută</translation>
-    </message>
-    <message>
-        <source>Copy dust</source>
-        <translation>Copiază praf</translation>
-    </message>
-    <message>
-        <source>Are you sure you want to send?</source>
-        <translation>Sigur doriţi să trimiteţi?</translation>
-    </message>
-    <message>
-        <source>added as transaction fee</source>
-        <translation>adăugat ca taxă de tranzacţie</translation>
-    </message>
 </context>
 <context>
     <name>SendCoinsEntry</name>
@@ -2096,10 +1381,6 @@
         <source>Pay &amp;To:</source>
         <translation>Plăteşte că&amp;tre:</translation>
     </message>
-    <message>
-        <source>Enter a label for this address to add it to your address book</source>
-        <translation>Introduceţi o etichetă pentru această adresă pentru a fi adăugată în lista dvs. de adrese</translation>
-    </message>
     <message>
         <source>&amp;Label:</source>
         <translation>&amp;Etichetă:</translation>
@@ -2156,8 +1437,8 @@
 <context>
     <name>ShutdownWindow</name>
     <message>
-        <source>Bitcoin Core is shutting down...</source>
-        <translation>Nucleul Bitcoin se închide...</translation>
+        <source>%1 is shutting down...</source>
+        <translation>%1 se închide</translation>
     </message>
     <message>
         <source>Do not shut down the computer until this window disappears.</source>
@@ -2242,586 +1523,80 @@
         <source>Reset all verify message fields</source>
         <translation>Resetează toate cîmpurile mesajelor semnate</translation>
     </message>
+</context>
+<context>
+    <name>SplashScreen</name>
     <message>
-        <source>Click "Sign Message" to generate signature</source>
-        <translation>Faceţi clic pe "Semneaza msaj" pentru a genera semnătura</translation>
+        <source>[testnet]</source>
+        <translation>[testnet]</translation>
     </message>
+</context>
+<context>
+    <name>TrafficGraphWidget</name>
     <message>
-        <source>The entered address is invalid.</source>
-        <translation>Adresa introdusă nu este validă</translation>
+        <source>KB/s</source>
+        <translation>KB/s</translation>
     </message>
+</context>
+<context>
+    <name>TransactionDescDialog</name>
     <message>
-        <source>Please check the address and try again.</source>
-        <translation>Vă rugăm verificaţi adresa şi încercaţi din nou.</translation>
+        <source>This pane shows a detailed description of the transaction</source>
+        <translation>Acest panou arată o descriere detaliată a tranzacţiei</translation>
     </message>
+</context>
+<context>
+    <name>UnitDisplayStatusBarControl</name>
     <message>
-        <source>The entered address does not refer to a key.</source>
-        <translation>Adresa introdusă nu se referă la o cheie.</translation>
+        <source>Unit to show amounts in. Click to select another unit.</source>
+        <translation>Unitatea în care sînt arătate sumele. Faceţi clic pentru a selecta o altă unitate.</translation>
     </message>
+</context>
+<context>
+    <name>bitcoin-core</name>
     <message>
-        <source>Wallet unlock was cancelled.</source>
-        <translation>Blocarea portofelului a fost întreruptă.</translation>
+        <source>Options:</source>
+        <translation>Opţiuni:</translation>
     </message>
     <message>
-        <source>Private key for the entered address is not available.</source>
-        <translation>Cheia privată pentru adresa introdusă nu este validă.</translation>
+        <source>Specify data directory</source>
+        <translation>Specificaţi dosarul de date</translation>
     </message>
     <message>
-        <source>Message signing failed.</source>
-        <translation>Semnarea mesajului nu a reuşit.</translation>
+        <source>Connect to a node to retrieve peer addresses, and disconnect</source>
+        <translation>Se conectează la un nod pentru a obţine adresele partenerilor, şi apoi se deconectează</translation>
     </message>
     <message>
-        <source>Message signed.</source>
-        <translation>Mesaj semnat.</translation>
+        <source>Specify your own public address</source>
+        <translation>Specificaţi adresa dvs. publică</translation>
     </message>
     <message>
-        <source>The signature could not be decoded.</source>
-        <translation>Această semnatură nu a putut fi decodată.</translation>
+        <source>Accept command line and JSON-RPC commands</source>
+        <translation>Acceptă comenzi din linia de comandă şi comenzi JSON-RPC</translation>
     </message>
     <message>
-        <source>Please check the signature and try again.</source>
-        <translation>Vă rugăm verificaţi semnătura şi încercaţi din nou.</translation>
+        <source>Run in the background as a daemon and accept commands</source>
+        <translation>Rulează în fundal ca un demon şi acceptă comenzi</translation>
     </message>
     <message>
-        <source>The signature did not match the message digest.</source>
-        <translation>Semnatura nu se potriveşte cu mesajul.</translation>
+        <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
+        <translation>Acceptă conexiuni din afară (implicit: 1 dacă nu se foloseşte -proxy sau -connect)</translation>
     </message>
     <message>
-        <source>Message verification failed.</source>
-        <translation>Verificarea mesajului nu a reuşit.</translation>
+        <source>Bitcoin Core</source>
+        <translation>Nucleul Bitcoin</translation>
     </message>
     <message>
-        <source>Message verified.</source>
-        <translation>Mesaj verificat.</translation>
+        <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source>
+        <translation>Ataşaţi adresei date şi ascultaţi totdeauna pe ea. Folosiţi notaţia [host]:port pentru IPv6</translation>
     </message>
-</context>
-<context>
-    <name>SplashScreen</name>
     <message>
-        <source>Bitcoin Core</source>
-        <translation>Nucleul Bitcoin</translation>
+        <source>Distributed under the MIT software license, see the accompanying file COPYING or &lt;http://www.opensource.org/licenses/mit-license.php&gt;.</source>
+        <translation>Distribuit sub licenţa de programe MIT/X11, vezi fişierul însoţitor COPYING sau &lt;http://www.opensource.org/licenses/mit-license.php&gt;.</translation>
     </message>
     <message>
-        <source>The Bitcoin Core developers</source>
-        <translation>Dezvoltatorii Nucleului Bitcoin</translation>
-    </message>
-    <message>
-        <source>[testnet]</source>
-        <translation>[testnet]</translation>
-    </message>
-</context>
-<context>
-    <name>TrafficGraphWidget</name>
-    <message>
-        <source>KB/s</source>
-        <translation>KB/s</translation>
-    </message>
-</context>
-<context>
-    <name>TransactionDesc</name>
-    <message>
-        <source>Open until %1</source>
-        <translation>Deschis pînă la %1</translation>
-    </message>
-    <message>
-        <source>conflicted</source>
-        <translation>în conflict</translation>
-    </message>
-    <message>
-        <source>%1/offline</source>
-        <translation>%1/deconectat</translation>
-    </message>
-    <message>
-        <source>%1/unconfirmed</source>
-        <translation>%1/neconfirmat</translation>
-    </message>
-    <message>
-        <source>%1 confirmations</source>
-        <translation>%1 confirmări</translation>
-    </message>
-    <message>
-        <source>Status</source>
-        <translation>Stare</translation>
-    </message>
-    <message numerus="yes">
-        <source>, broadcast through %n node(s)</source>
-        <translation><numerusform>, distribuit prin %n nod</numerusform><numerusform>, distribuit prin %n noduri</numerusform><numerusform>, distribuit prin %n de noduri</numerusform></translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation>Data</translation>
-    </message>
-    <message>
-        <source>Source</source>
-        <translation>Sursa</translation>
-    </message>
-    <message>
-        <source>Generated</source>
-        <translation>Generat</translation>
-    </message>
-    <message>
-        <source>From</source>
-        <translation>De la</translation>
-    </message>
-    <message>
-        <source>To</source>
-        <translation>Către</translation>
-    </message>
-    <message>
-        <source>own address</source>
-        <translation>adresa proprie</translation>
-    </message>
-    <message>
-        <source>watch-only</source>
-        <translation>doar-supraveghere</translation>
-    </message>
-    <message>
-        <source>label</source>
-        <translation>etichetă</translation>
-    </message>
-    <message>
-        <source>Credit</source>
-        <translation>Credit</translation>
-    </message>
-    <message numerus="yes">
-        <source>matures in %n more block(s)</source>
-        <translation><numerusform>se maturizează în încă %n bloc</numerusform><numerusform>se maturizează în încă %n blocuri</numerusform><numerusform>se maturizează în încă %n de blocuri</numerusform></translation>
-    </message>
-    <message>
-        <source>not accepted</source>
-        <translation>neacceptat</translation>
-    </message>
-    <message>
-        <source>Debit</source>
-        <translation>Debit</translation>
-    </message>
-    <message>
-        <source>Total debit</source>
-        <translation>Total debit</translation>
-    </message>
-    <message>
-        <source>Total credit</source>
-        <translation>Total credit</translation>
-    </message>
-    <message>
-        <source>Transaction fee</source>
-        <translation>Taxă tranzacţie</translation>
-    </message>
-    <message>
-        <source>Net amount</source>
-        <translation>Suma netă</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>Mesaj</translation>
-    </message>
-    <message>
-        <source>Comment</source>
-        <translation>Comentariu</translation>
-    </message>
-    <message>
-        <source>Transaction ID</source>
-        <translation>ID-ul tranzacţie</translation>
-    </message>
-    <message>
-        <source>Merchant</source>
-        <translation>Comerciant</translation>
-    </message>
-    <message>
-        <source>Generated coins must mature %1 blocks before they can be spent. When you generated this block, it was broadcast to the network to be added to the block chain. If it fails to get into the chain, its state will change to "not accepted" and it won't be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source>
-        <translation>Monedele generate trebuie să crească %1 blocuri înainte să poată fi cheltuite. Cînd aţi generat acest bloc, a fost transmis reţelei pentru a fi adaugat la lanţul de blocuri. Aceasta se poate întîmpla ocazional dacă alt nod generează un bloc la numai cîteva secunde de al dvs.</translation>
-    </message>
-    <message>
-        <source>Debug information</source>
-        <translation>Informaţii pentru depanare</translation>
-    </message>
-    <message>
-        <source>Transaction</source>
-        <translation>Tranzacţie</translation>
-    </message>
-    <message>
-        <source>Inputs</source>
-        <translation>Intrări</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>Sumă</translation>
-    </message>
-    <message>
-        <source>true</source>
-        <translation>adevărat</translation>
-    </message>
-    <message>
-        <source>false</source>
-        <translation>fals</translation>
-    </message>
-    <message>
-        <source>, has not been successfully broadcast yet</source>
-        <translation>, nu s-a propagat încă</translation>
-    </message>
-    <message numerus="yes">
-        <source>Open for %n more block(s)</source>
-        <translation><numerusform>Deschis pentru încă %n bloc</numerusform><numerusform>Deschis pentru încă %n blocuri</numerusform><numerusform>Deschis pentru încă %n de blocuri</numerusform></translation>
-    </message>
-    <message>
-        <source>unknown</source>
-        <translation>necunoscut</translation>
-    </message>
-</context>
-<context>
-    <name>TransactionDescDialog</name>
-    <message>
-        <source>Transaction details</source>
-        <translation>Detaliile tranzacţiei</translation>
-    </message>
-    <message>
-        <source>This pane shows a detailed description of the transaction</source>
-        <translation>Acest panou arată o descriere detaliată a tranzacţiei</translation>
-    </message>
-</context>
-<context>
-    <name>TransactionTableModel</name>
-    <message>
-        <source>Date</source>
-        <translation>Data</translation>
-    </message>
-    <message>
-        <source>Type</source>
-        <translation>Tip</translation>
-    </message>
-    <message>
-        <source>Immature (%1 confirmations, will be available after %2)</source>
-        <translation>Imatur (%1 confirmări, va fi disponibil după %2)</translation>
-    </message>
-    <message numerus="yes">
-        <source>Open for %n more block(s)</source>
-        <translation><numerusform>Deschis pentru încă %n bloc</numerusform><numerusform>Deschis pentru încă %n blocuri</numerusform><numerusform>Deschis pentru încă %n de blocuri</numerusform></translation>
-    </message>
-    <message>
-        <source>Open until %1</source>
-        <translation>Deschis până la %1</translation>
-    </message>
-    <message>
-        <source>Confirmed (%1 confirmations)</source>
-        <translation>Confirmat (%1 confirmări)</translation>
-    </message>
-    <message>
-        <source>This block was not received by any other nodes and will probably not be accepted!</source>
-        <translation>Acest bloc nu a fost recepţionat de nici un alt nod şi probabil nu va fi acceptat!</translation>
-    </message>
-    <message>
-        <source>Generated but not accepted</source>
-        <translation>Generat dar neacceptat</translation>
-    </message>
-    <message>
-        <source>Offline</source>
-        <translation>Deconectat</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Etichetă</translation>
-    </message>
-    <message>
-        <source>Unconfirmed</source>
-        <translation>Neconfirmat</translation>
-    </message>
-    <message>
-        <source>Confirming (%1 of %2 recommended confirmations)</source>
-        <translation>Confirmare (%1 din %2 confirmări recomandate)</translation>
-    </message>
-    <message>
-        <source>Conflicted</source>
-        <translation>În conflict</translation>
-    </message>
-    <message>
-        <source>Received with</source>
-        <translation>Recepţionat cu</translation>
-    </message>
-    <message>
-        <source>Received from</source>
-        <translation>Primit de la</translation>
-    </message>
-    <message>
-        <source>Sent to</source>
-        <translation>Trimis către</translation>
-    </message>
-    <message>
-        <source>Payment to yourself</source>
-        <translation>Plată către dvs.</translation>
-    </message>
-    <message>
-        <source>Mined</source>
-        <translation>Minerit</translation>
-    </message>
-    <message>
-        <source>watch-only</source>
-        <translation>doar-supraveghere</translation>
-    </message>
-    <message>
-        <source>(n/a)</source>
-        <translation>indisponibil</translation>
-    </message>
-    <message>
-        <source>Transaction status. Hover over this field to show number of confirmations.</source>
-        <translation>Starea tranzacţiei. Treceţi cu mouse-ul peste acest cîmp pentru afişarea numărului de confirmări.</translation>
-    </message>
-    <message>
-        <source>Date and time that the transaction was received.</source>
-        <translation>Data şi ora la care a fost recepţionată tranzacţia.</translation>
-    </message>
-    <message>
-        <source>Type of transaction.</source>
-        <translation>Tipul tranzacţiei.</translation>
-    </message>
-    <message>
-        <source>Whether or not a watch-only address is involved in this transaction.</source>
-        <translation>Indiferent dacă sau nu o adresă doar-suăpraveghere este implicată în această tranzacţie.</translation>
-    </message>
-    <message>
-        <source>Amount removed from or added to balance.</source>
-        <translation>Suma extrasă sau adăugată la sold.</translation>
-    </message>
-</context>
-<context>
-    <name>TransactionView</name>
-    <message>
-        <source>All</source>
-        <translation>Toate</translation>
-    </message>
-    <message>
-        <source>Today</source>
-        <translation>Astăzi</translation>
-    </message>
-    <message>
-        <source>This week</source>
-        <translation>Săptămîna aceasta</translation>
-    </message>
-    <message>
-        <source>This month</source>
-        <translation>Luna aceasta</translation>
-    </message>
-    <message>
-        <source>Last month</source>
-        <translation>Luna trecută</translation>
-    </message>
-    <message>
-        <source>This year</source>
-        <translation>Anul acesta</translation>
-    </message>
-    <message>
-        <source>Range...</source>
-        <translation>Interval...</translation>
-    </message>
-    <message>
-        <source>Received with</source>
-        <translation>Recepţionat cu</translation>
-    </message>
-    <message>
-        <source>Sent to</source>
-        <translation>Trimis către</translation>
-    </message>
-    <message>
-        <source>To yourself</source>
-        <translation>Către dvs.</translation>
-    </message>
-    <message>
-        <source>Mined</source>
-        <translation>Minerit</translation>
-    </message>
-    <message>
-        <source>Other</source>
-        <translation>Altele</translation>
-    </message>
-    <message>
-        <source>Enter address or label to search</source>
-        <translation>Introduceţi adresa sau eticheta pentru căutare</translation>
-    </message>
-    <message>
-        <source>Min amount</source>
-        <translation>Suma minimă</translation>
-    </message>
-    <message>
-        <source>Copy address</source>
-        <translation>Copiază adresa</translation>
-    </message>
-    <message>
-        <source>Copy label</source>
-        <translation>Copiază eticheta</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>Copiază suma</translation>
-    </message>
-    <message>
-        <source>Copy transaction ID</source>
-        <translation>Copiază ID tranzacţie</translation>
-    </message>
-    <message>
-        <source>Edit label</source>
-        <translation>Editează eticheta</translation>
-    </message>
-    <message>
-        <source>Show transaction details</source>
-        <translation>Arată detaliile tranzacţiei</translation>
-    </message>
-    <message>
-        <source>Export Transaction History</source>
-        <translation>Export istoric tranzacţii</translation>
-    </message>
-    <message>
-        <source>Watch-only</source>
-        <translation>Doar-supraveghere</translation>
-    </message>
-    <message>
-        <source>Exporting Failed</source>
-        <translation>Export nereuşit</translation>
-    </message>
-    <message>
-        <source>There was an error trying to save the transaction history to %1.</source>
-        <translation>S-a produs o eroare la salvarea istoricului tranzacţiilor la %1.</translation>
-    </message>
-    <message>
-        <source>Exporting Successful</source>
-        <translation>Export reuşit</translation>
-    </message>
-    <message>
-        <source>The transaction history was successfully saved to %1.</source>
-        <translation>Istoricul tranzacţiilor a fost salvat cu succes la %1.</translation>
-    </message>
-    <message>
-        <source>Comma separated file (*.csv)</source>
-        <translation>Fişier text cu valori separate prin virgulă (*.csv)</translation>
-    </message>
-    <message>
-        <source>Confirmed</source>
-        <translation>Confirmat</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation>Data</translation>
-    </message>
-    <message>
-        <source>Type</source>
-        <translation>Tip</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Etichetă</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>Adresă</translation>
-    </message>
-    <message>
-        <source>ID</source>
-        <translation>ID</translation>
-    </message>
-    <message>
-        <source>Range:</source>
-        <translation>Interval:</translation>
-    </message>
-    <message>
-        <source>to</source>
-        <translation>către</translation>
-    </message>
-</context>
-<context>
-    <name>UnitDisplayStatusBarControl</name>
-    <message>
-        <source>Unit to show amounts in. Click to select another unit.</source>
-        <translation>Unitatea în care sînt arătate sumele. Faceţi clic pentru a selecta o altă unitate.</translation>
-    </message>
-</context>
-<context>
-    <name>WalletFrame</name>
-    <message>
-        <source>No wallet has been loaded.</source>
-        <translation>Nu a fost încărcat nici un portofel.</translation>
-    </message>
-</context>
-<context>
-    <name>WalletModel</name>
-    <message>
-        <source>Send Coins</source>
-        <translation>Trimitere bitcoin</translation>
-    </message>
-</context>
-<context>
-    <name>WalletView</name>
-    <message>
-        <source>&amp;Export</source>
-        <translation>&amp;Export</translation>
-    </message>
-    <message>
-        <source>Export the data in the current tab to a file</source>
-        <translation>Exportă datele din tab-ul curent într-un fişier</translation>
-    </message>
-    <message>
-        <source>Backup Wallet</source>
-        <translation>Copie de siguranţă portofel</translation>
-    </message>
-    <message>
-        <source>Wallet Data (*.dat)</source>
-        <translation>Date portofel (*.dat)</translation>
-    </message>
-    <message>
-        <source>Backup Failed</source>
-        <translation>Copierea de siguranţă nu a reuşit</translation>
-    </message>
-    <message>
-        <source>There was an error trying to save the wallet data to %1.</source>
-        <translation>S-a produs o eroare la salvarea datelor portofelului la %1.</translation>
-    </message>
-    <message>
-        <source>The wallet data was successfully saved to %1.</source>
-        <translation>Datele portofelului s-au salvat cu succes la %1.</translation>
-    </message>
-    <message>
-        <source>Backup Successful</source>
-        <translation>Copie de siguranţă efectuată cu succes</translation>
-    </message>
-</context>
-<context>
-    <name>bitcoin-core</name>
-    <message>
-        <source>Options:</source>
-        <translation>Opţiuni:</translation>
-    </message>
-    <message>
-        <source>Specify data directory</source>
-        <translation>Specificaţi dosarul de date</translation>
-    </message>
-    <message>
-        <source>Connect to a node to retrieve peer addresses, and disconnect</source>
-        <translation>Se conectează la un nod pentru a obţine adresele partenerilor, şi apoi se deconectează</translation>
-    </message>
-    <message>
-        <source>Specify your own public address</source>
-        <translation>Specificaţi adresa dvs. publică</translation>
-    </message>
-    <message>
-        <source>Accept command line and JSON-RPC commands</source>
-        <translation>Acceptă comenzi din linia de comandă şi comenzi JSON-RPC</translation>
-    </message>
-    <message>
-        <source>Run in the background as a daemon and accept commands</source>
-        <translation>Rulează în fundal ca un demon şi acceptă comenzi</translation>
-    </message>
-    <message>
-        <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
-        <translation>Acceptă conexiuni din afară (implicit: 1 dacă nu se foloseşte -proxy sau -connect)</translation>
-    </message>
-    <message>
-        <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source>
-        <translation>Ataşaţi adresei date şi ascultaţi totdeauna pe ea. Folosiţi notaţia [host]:port pentru IPv6</translation>
-    </message>
-    <message>
-        <source>Distributed under the MIT software license, see the accompanying file COPYING or &lt;http://www.opensource.org/licenses/mit-license.php&gt;.</source>
-        <translation>Distribuit sub licenţa de programe MIT/X11, vezi fişierul însoţitor COPYING sau &lt;http://www.opensource.org/licenses/mit-license.php&gt;.</translation>
-    </message>
-    <message>
-        <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source>
-        <translation>Execută comanda cînd o tranzacţie a portofelului se schimbă (%s în cmd este înlocuit de TxID)</translation>
+        <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source>
+        <translation>Execută comanda cînd o tranzacţie a portofelului se schimbă (%s în cmd este înlocuit de TxID)</translation>
     </message>
     <message>
         <source>Set the number of script verification threads (%u to %d, 0 = auto, &lt;0 = leave that many cores free, default: %d)</source>
@@ -2831,10 +1606,6 @@
         <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
         <translation>Aceasta este o versiune de test preliminară - vă asumaţi riscul folosind-o - nu folosiţi pentru minerit sau aplicaţiile comercianţilor</translation>
     </message>
-    <message>
-        <source>Unable to bind to %s on this computer. Bitcoin Core is probably already running.</source>
-        <translation>Nu se poate lega la %s pe acest calculator. Nucleul Bitcoin probabil deja rulează.</translation>
-    </message>
     <message>
         <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source>
         <translation>Atenţie: Reţeaua nu pare să fie de acord în totalitate! Aparent nişte mineri au probleme.</translation>
@@ -2843,10 +1614,6 @@
         <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source>
         <translation>Atenţie: Aparent, nu sîntem de acord cu toţi partenerii noştri! Va trebui să faceţi o actualizare, sau alte noduri necesită actualizare.</translation>
     </message>
-    <message>
-        <source>Warning: wallet.dat corrupt, data salvaged! Original wallet.dat saved as wallet.{timestamp}.bak in %s; if your balance or transactions are incorrect you should restore from a backup.</source>
-        <translation>Atenţie: fişierul wallet.dat este corupt, date salvate! Fişierul original wallet.dat a fost salvat ca wallet.{timestamp}.bak in %s; dacă balansul sau tranzactiile sînt incorecte ar trebui să restauraţi dintr-o copie de siguranţă.</translation>
-    </message>
     <message>
         <source>&lt;category&gt; can be:</source>
         <translation>&lt;category&gt; poate fi:</translation>
@@ -2955,18 +1722,10 @@
         <source>Wallet options:</source>
         <translation>Opţiuni portofel:</translation>
     </message>
-    <message>
-        <source>You need to rebuild the database using -reindex to change -txindex</source>
-        <translation>Trebuie să reconstruiţi baza de date folosind -reindex pentru a schimba -txindex</translation>
-    </message>
     <message>
         <source>Allow JSON-RPC connections from specified source. Valid for &lt;ip&gt; are a single IP (e.g. 1.2.3.4), a network/netmask (e.g. 1.2.3.4/255.255.255.0) or a network/CIDR (e.g. 1.2.3.4/24). This option can be specified multiple times</source>
         <translation>Permite conexiunile JSON-RPC din sursa specificată. Valid pentru &lt;ip&gt; sînt IP singulare (ex. 1.2.3.4), o reţea/mască-reţea (ex. 1.2.3.4/255.255.255.0) sau o reţea/CIDR (ex. 1.2.3.4/24). Această opţiune poate fi specificată de mai multe ori</translation>
     </message>
-    <message>
-        <source>Cannot obtain a lock on data directory %s. Bitcoin Core is probably already running.</source>
-        <translation>Nu se poate obţine blocarea folderului cu date %s. Nucleul Bitcoin probabil deja rulează.</translation>
-    </message>
     <message>
         <source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source>
         <translation>Execută comanda cînd o alertă relevantă este primită sau vedem o bifurcaţie foarte lungă (%s în cmd este înlocuit de mesaj)</translation>
@@ -2988,17 +1747,13 @@
         <translation>Acceptă cererile publice REST (implicit: %u)</translation>
     </message>
     <message>
-        <source>Cannot resolve -whitebind address: '%s'</source>
-        <translation>Nu se poate rezolva adresa -whitebind: '%s'</translation>
+        <source>Automatically create Tor hidden service (default: %d)</source>
+        <translation>Crează automat un serviciu Tor ascuns (implicit: %d)</translation>
     </message>
     <message>
         <source>Connect through SOCKS5 proxy</source>
         <translation>Conectare prin proxy SOCKS5</translation>
     </message>
-    <message>
-        <source>Copyright (C) 2009-%i The Bitcoin Core Developers</source>
-        <translation>Copyright (C) 2009-%i Dezvoltatorii Bitcoin</translation>
-    </message>
     <message>
         <source>Error reading from database, shutting down.</source>
         <translation>Eroare la citirea bazei de date. Oprire.</translation>
@@ -3007,22 +1762,6 @@
         <source>Information</source>
         <translation>Informaţie</translation>
     </message>
-    <message>
-        <source>Initialization sanity check failed. Bitcoin Core is shutting down.</source>
-        <translation>Nu s-a reuşit iniţierea verificării sănătăţii. Nucleul Bitcoin se opreşte.</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -maxtxfee=&lt;amount&gt;: '%s'</source>
-        <translation>Sumă nevalidă pentru -maxtxfee=&lt;suma&gt;: '%s'</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -minrelaytxfee=&lt;amount&gt;: '%s'</source>
-        <translation>Sumă nevalidă pentru -minrelaytxfee=&lt;suma&gt;:'%s'</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -mintxfee=&lt;amount&gt;: '%s'</source>
-        <translation>Sumă nevalidă pentru -mintxfee=&lt;suma&gt;: '%s'</translation>
-    </message>
     <message>
         <source>Invalid amount for -paytxfee=&lt;amount&gt;: '%s' (must be at least %s)</source>
         <translation>Sumă nevalidă pentru -paytxfee=&lt;suma&gt;: '%s' (trebuie să fie cel puţin %s)</translation>
@@ -3087,10 +1826,6 @@
         <source>Username for JSON-RPC connections</source>
         <translation>Utilizator pentru conexiunile JSON-RPC</translation>
     </message>
-    <message>
-        <source>Wallet needed to be rewritten: restart Bitcoin Core to complete</source>
-        <translation>Portofelul necesită rescrierea: reporniţi Nucleul Bitcoin pentru completare</translation>
-    </message>
     <message>
         <source>Warning</source>
         <translation>Avertisment</translation>
@@ -3099,10 +1834,6 @@
         <source>Zapping all transactions from wallet...</source>
         <translation>Şterge toate tranzacţiile din portofel...</translation>
     </message>
-    <message>
-        <source>wallet.dat corrupt, salvage failed</source>
-        <translation>wallet.dat corupt, salvare nereuşită</translation>
-    </message>
     <message>
         <source>Password for JSON-RPC connections</source>
         <translation>Parola pentru conexiunile JSON-RPC</translation>
@@ -3111,10 +1842,6 @@
         <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
         <translation>Execută comanda cînd cel mai bun bloc se modifică (%s în cmd este înlocuit cu hash-ul blocului)</translation>
     </message>
-    <message>
-        <source>This help message</source>
-        <translation>Acest mesaj de ajutor</translation>
-    </message>
     <message>
         <source>Allow DNS lookups for -addnode, -seednode and -connect</source>
         <translation>Permite căutări DNS pentru -addnode, -seednode şi -connect</translation>
@@ -3123,10 +1850,6 @@
         <source>Loading addresses...</source>
         <translation>Încărcare adrese...</translation>
     </message>
-    <message>
-        <source>Error loading wallet.dat: Wallet corrupted</source>
-        <translation>Eroare la încărcarea wallet.dat: Portofel corupt</translation>
-    </message>
     <message>
         <source>Output debugging information (default: %u, supplying &lt;category&gt; is optional)</source>
         <translation>Produce toate informaţiile de depanare (implicit: %u &lt;category&gt; furnizată este opţională)</translation>
@@ -3135,14 +1858,6 @@
         <source>(default: %s)</source>
         <translation>(implicit: %s)</translation>
     </message>
-    <message>
-        <source>Error loading wallet.dat</source>
-        <translation>Eroare la încărcarea wallet.dat</translation>
-    </message>
-    <message>
-        <source>Generate coins (default: %u)</source>
-        <translation>Generează monede (implicit: %u)</translation>
-    </message>
     <message>
         <source>How many blocks to check at startup (default: %u, 0 = all)</source>
         <translation>Cîte blocuri verifică la pornire (implicit: %u, 0 = toate)</translation>
@@ -3167,18 +1882,6 @@
         <source>Unknown network specified in -onlynet: '%s'</source>
         <translation>Reţeaua specificată în -onlynet este necunoscută: '%s'</translation>
     </message>
-    <message>
-        <source>Cannot resolve -bind address: '%s'</source>
-        <translation>Nu se poate rezolva adresa -bind: '%s'</translation>
-    </message>
-    <message>
-        <source>Cannot resolve -externalip address: '%s'</source>
-        <translation>Nu se poate rezolva adresa -externalip: '%s'</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -paytxfee=&lt;amount&gt;: '%s'</source>
-        <translation>Suma nevalidă pentru -paytxfee=&lt;amount&gt;: '%s'</translation>
-    </message>
     <message>
         <source>Insufficient funds</source>
         <translation>Fonduri insuficiente</translation>
diff --git a/src/qt/locale/bitcoin_ru.ts b/src/qt/locale/bitcoin_ru.ts
index b4546a21578f4..e2949a9482539 100644
--- a/src/qt/locale/bitcoin_ru.ts
+++ b/src/qt/locale/bitcoin_ru.ts
@@ -25,10 +25,6 @@
         <source>C&amp;lose</source>
         <translation>&amp;Закрыть</translation>
     </message>
-    <message>
-        <source>&amp;Copy Address</source>
-        <translation>&amp;Копировать адрес</translation>
-    </message>
     <message>
         <source>Delete the currently selected address from the list</source>
         <translation>Удалить выбранный адрес из списка</translation>
@@ -45,73 +41,6 @@
         <source>&amp;Delete</source>
         <translation>&amp;Удалить</translation>
     </message>
-    <message>
-        <source>Choose the address to send coins to</source>
-        <translation>Выберите адрес для отправки на него монет</translation>
-    </message>
-    <message>
-        <source>Choose the address to receive coins with</source>
-        <translation>Выберите адрес для получения монет</translation>
-    </message>
-    <message>
-        <source>C&amp;hoose</source>
-        <translation>&amp;Выбрать</translation>
-    </message>
-    <message>
-        <source>Sending addresses</source>
-        <translation>Адреса отправки</translation>
-    </message>
-    <message>
-        <source>Receiving addresses</source>
-        <translation>Адреса получения</translation>
-    </message>
-    <message>
-        <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source>
-        <translation>Это ваши адреса Bitcoin для отправки платежей. Всегда проверяйте количество и адрес получателя перед отправкой перевода.</translation>
-    </message>
-    <message>
-        <source>These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source>
-        <translation>Это ваши адреса Bitcoin для приёма платежей. Рекомендуется использовать новый адрес получения для каждой транзакции.</translation>
-    </message>
-    <message>
-        <source>Copy &amp;Label</source>
-        <translation>Копировать &amp;метку</translation>
-    </message>
-    <message>
-        <source>&amp;Edit</source>
-        <translation>&amp;Правка</translation>
-    </message>
-    <message>
-        <source>Export Address List</source>
-        <translation>Экспортировать список адресов</translation>
-    </message>
-    <message>
-        <source>Comma separated file (*.csv)</source>
-        <translation>Текст, разделённый запятыми (*.csv)</translation>
-    </message>
-    <message>
-        <source>Exporting Failed</source>
-        <translation>Экспорт не удался</translation>
-    </message>
-    <message>
-        <source>There was an error trying to save the address list to %1. Please try again.</source>
-        <translation>Произошла ошибка при попытке сохранить список адресов, %1. Пожалуйста, попробуйте еще раз.</translation>
-    </message>
-</context>
-<context>
-    <name>AddressTableModel</name>
-    <message>
-        <source>Label</source>
-        <translation>Метка</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>Адрес</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>[нет метки]</translation>
-    </message>
 </context>
 <context>
     <name>AskPassphraseDialog</name>
@@ -131,94 +60,6 @@
         <source>Repeat new passphrase</source>
         <translation>Повторите новый пароль</translation>
     </message>
-    <message>
-        <source>Encrypt wallet</source>
-        <translation>Зашифровать бумажник</translation>
-    </message>
-    <message>
-        <source>This operation needs your wallet passphrase to unlock the wallet.</source>
-        <translation>Для выполнения операции требуется пароль вашего бумажника.</translation>
-    </message>
-    <message>
-        <source>Unlock wallet</source>
-        <translation>Разблокировать бумажник</translation>
-    </message>
-    <message>
-        <source>This operation needs your wallet passphrase to decrypt the wallet.</source>
-        <translation>Для выполнения операции требуется пароль вашего бумажника.</translation>
-    </message>
-    <message>
-        <source>Decrypt wallet</source>
-        <translation>Расшифровать бумажник</translation>
-    </message>
-    <message>
-        <source>Change passphrase</source>
-        <translation>Сменить пароль</translation>
-    </message>
-    <message>
-        <source>Confirm wallet encryption</source>
-        <translation>Подтвердите шифрование бумажника</translation>
-    </message>
-    <message>
-        <source>Warning: If you encrypt your wallet and lose your passphrase, you will &lt;b&gt;LOSE ALL OF YOUR BITCOINS&lt;/b&gt;!</source>
-        <translation>Внимание: если вы зашифруете бумажник и потеряете пароль, вы &lt;b&gt;ПОТЕРЯЕТЕ ВСЕ ВАШИ БИТКОЙНЫ&lt;/b&gt;!</translation>
-    </message>
-    <message>
-        <source>Are you sure you wish to encrypt your wallet?</source>
-        <translation>Вы уверены, что хотите зашифровать ваш бумажник?</translation>
-    </message>
-    <message>
-        <source>Bitcoin Core will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source>
-        <translation>Сейчас программа закроется для завершения процесса шифрования. Помните, что шифрование вашего бумажника не может полностью защитить ваши биткоины от кражи с помощью инфицирования вашего компьютера вредоносным ПО.</translation>
-    </message>
-    <message>
-        <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source>
-        <translation>ВАЖНО: все предыдущие резервные копии вашего бумажника должны быть заменены новым зашифрованным файлом. В целях безопасности предыдущие резервные копии незашифрованного бумажника станут бесполезны, как только вы начнёте использовать новый зашифрованный бумажник.</translation>
-    </message>
-    <message>
-        <source>Warning: The Caps Lock key is on!</source>
-        <translation>Внимание: Caps Lock включен!</translation>
-    </message>
-    <message>
-        <source>Wallet encrypted</source>
-        <translation>Бумажник зашифрован</translation>
-    </message>
-    <message>
-        <source>Enter the new passphrase to the wallet.&lt;br/&gt;Please use a passphrase of &lt;b&gt;ten or more random characters&lt;/b&gt;, or &lt;b&gt;eight or more words&lt;/b&gt;.</source>
-        <translation>Введите новый пароль бумажника.&lt;br/&gt;Используйте пароль, состоящий из &lt;b&gt;десяти или более случайных символов&lt;/b&gt;, или &lt;b&gt;восьми или более слов&lt;/b&gt;.</translation>
-    </message>
-    <message>
-        <source>Enter the old passphrase and new passphrase to the wallet.</source>
-        <translation>Введите старый и новый пароль для кошелька.</translation>
-    </message>
-    <message>
-        <source>Wallet encryption failed</source>
-        <translation>Не удалось зашифровать бумажник</translation>
-    </message>
-    <message>
-        <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
-        <translation>Шифрование бумажника не удалось из-за внутренней ошибки. Ваш бумажник не был зашифрован.</translation>
-    </message>
-    <message>
-        <source>The supplied passphrases do not match.</source>
-        <translation>Введённые пароли не совпадают.</translation>
-    </message>
-    <message>
-        <source>Wallet unlock failed</source>
-        <translation>Разблокировка бумажника не удалась</translation>
-    </message>
-    <message>
-        <source>The passphrase entered for the wallet decryption was incorrect.</source>
-        <translation>Указанный пароль не подходит.</translation>
-    </message>
-    <message>
-        <source>Wallet decryption failed</source>
-        <translation>Расшифрование бумажника не удалось</translation>
-    </message>
-    <message>
-        <source>Wallet passphrase was successfully changed.</source>
-        <translation>Пароль бумажника успешно изменён.</translation>
-    </message>
 </context>
 <context>
     <name>BanTableModel</name>
@@ -269,6 +110,14 @@
         <source>Quit application</source>
         <translation>Закрыть приложение</translation>
     </message>
+    <message>
+        <source>&amp;About %1</source>
+        <translation>&amp;О %1</translation>
+    </message>
+    <message>
+        <source>Show information about %1</source>
+        <translation>Показать информацию о %1</translation>
+    </message>
     <message>
         <source>About &amp;Qt</source>
         <translation>О &amp;Qt</translation>
@@ -305,14 +154,6 @@
         <source>Open &amp;URI...</source>
         <translation>Открыть &amp;URI...</translation>
     </message>
-    <message>
-        <source>Bitcoin Core client</source>
-        <translation>Bitcoin Core клиент</translation>
-    </message>
-    <message>
-        <source>Importing blocks from disk...</source>
-        <translation>Импортируются блоки с диска...</translation>
-    </message>
     <message>
         <source>Reindexing blocks on disk...</source>
         <translation>Идёт переиндексация блоков на диске...</translation>
@@ -357,10 +198,6 @@
         <source>&amp;Receive</source>
         <translation>&amp;Получить</translation>
     </message>
-    <message>
-        <source>Show information about Bitcoin Core</source>
-        <translation>Показать информацию о Bitcoin Core</translation>
-    </message>
     <message>
         <source>&amp;Show / Hide</source>
         <translation>&amp;Показать / Скрыть</translation>
@@ -397,22 +234,10 @@
         <source>Tabs toolbar</source>
         <translation>Панель вкладок</translation>
     </message>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Bitcoin Core</translation>
-    </message>
     <message>
         <source>Request payments (generates QR codes and bitcoin: URIs)</source>
         <translation>Запросить платежи (создаёт QR-коды и bitcoin: ссылки)</translation>
     </message>
-    <message>
-        <source>&amp;About Bitcoin Core</source>
-        <translation>&amp;О Bitcoin Core</translation>
-    </message>
-    <message>
-        <source>Modify configuration options for Bitcoin Core</source>
-        <translation>Изменить опции конфигурации Bitcoin Core</translation>
-    </message>
     <message>
         <source>Show the list of used sending addresses and labels</source>
         <translation>Показать список использованных адресов и меток отправки</translation>
@@ -429,14 +254,18 @@
         <source>&amp;Command-line options</source>
         <translation>&amp;Параметры командной строки</translation>
     </message>
-    <message>
-        <source>Show the Bitcoin Core help message to get a list with possible Bitcoin command-line options</source>
-        <translation>Показать помощь по Bitcoin Core и получить список доступных параметров командной строки.</translation>
-    </message>
     <message numerus="yes">
         <source>%n active connection(s) to Bitcoin network</source>
         <translation><numerusform>%n активных соединений с сетью Bitcoin</numerusform><numerusform>%n активных соединений с сетью Bitcoin</numerusform><numerusform>%n активных соединений с сетью Bitcoin</numerusform><numerusform>%n активных соединений с сетью Bitcoin</numerusform></translation>
     </message>
+    <message>
+        <source>Indexing blocks on disk...</source>
+        <translation>Индексация блоков на диске...</translation>
+    </message>
+    <message>
+        <source>Processing blocks on disk...</source>
+        <translation>Обработка блоков на диске...</translation>
+    </message>
     <message>
         <source>No block source available...</source>
         <translation>Источник блоков недоступен...</translation>
@@ -493,6 +322,10 @@
         <source>Up to date</source>
         <translation>Синхронизировано</translation>
     </message>
+    <message>
+        <source>%1 client</source>
+        <translation>%1 клиент</translation>
+    </message>
     <message>
         <source>Catching up...</source>
         <translation>Синхронизируется...</translation>
@@ -544,13 +377,6 @@
         <translation>Бумажник &lt;b&gt;зашифрован&lt;/b&gt; и в настоящее время &lt;b&gt;заблокирован&lt;/b&gt;</translation>
     </message>
 </context>
-<context>
-    <name>ClientModel</name>
-    <message>
-        <source>Network Alert</source>
-        <translation>Сетевая Тревога</translation>
-    </message>
-</context>
 <context>
     <name>CoinControlDialog</name>
     <message>
@@ -629,150 +455,6 @@
         <source>Priority</source>
         <translation>Приоритет</translation>
     </message>
-    <message>
-        <source>Copy address</source>
-        <translation>Копировать адрес</translation>
-    </message>
-    <message>
-        <source>Copy label</source>
-        <translation>Копировать метку</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>Скопировать сумму</translation>
-    </message>
-    <message>
-        <source>Copy transaction ID</source>
-        <translation>Скопировать ID транзакции</translation>
-    </message>
-    <message>
-        <source>Lock unspent</source>
-        <translation>Заблокировать непотраченное</translation>
-    </message>
-    <message>
-        <source>Unlock unspent</source>
-        <translation>Разблокировать непотраченное</translation>
-    </message>
-    <message>
-        <source>Copy quantity</source>
-        <translation>Копировать количество</translation>
-    </message>
-    <message>
-        <source>Copy fee</source>
-        <translation>Копировать комиссию</translation>
-    </message>
-    <message>
-        <source>Copy after fee</source>
-        <translation>Копировать после комиссии</translation>
-    </message>
-    <message>
-        <source>Copy bytes</source>
-        <translation>Копировать байты</translation>
-    </message>
-    <message>
-        <source>Copy priority</source>
-        <translation>Копировать приоритет</translation>
-    </message>
-    <message>
-        <source>Copy dust</source>
-        <translation>Копировать пыль</translation>
-    </message>
-    <message>
-        <source>Copy change</source>
-        <translation>Копировать сдачу</translation>
-    </message>
-    <message>
-        <source>highest</source>
-        <translation>самый высокий</translation>
-    </message>
-    <message>
-        <source>higher</source>
-        <translation>выше</translation>
-    </message>
-    <message>
-        <source>high</source>
-        <translation>высокий</translation>
-    </message>
-    <message>
-        <source>medium-high</source>
-        <translation>выше среднего</translation>
-    </message>
-    <message>
-        <source>medium</source>
-        <translation>средний</translation>
-    </message>
-    <message>
-        <source>low-medium</source>
-        <translation>ниже среднего</translation>
-    </message>
-    <message>
-        <source>low</source>
-        <translation>низкий</translation>
-    </message>
-    <message>
-        <source>lower</source>
-        <translation>ниже</translation>
-    </message>
-    <message>
-        <source>lowest</source>
-        <translation>самый низкий</translation>
-    </message>
-    <message>
-        <source>(%1 locked)</source>
-        <translation>(%1 заблокировано)</translation>
-    </message>
-    <message>
-        <source>none</source>
-        <translation>ничего</translation>
-    </message>
-    <message>
-        <source>This label turns red if the transaction size is greater than 1000 bytes.</source>
-        <translation>Эта метка становится красной, если размер транзакции будет больше, чем 1000 байт.</translation>
-    </message>
-    <message>
-        <source>This label turns red if the priority is smaller than "medium".</source>
-        <translation>Эта метка становится красной, если приоритет меньше, чем "среднее".</translation>
-    </message>
-    <message>
-        <source>This label turns red if any recipient receives an amount smaller than %1.</source>
-        <translation>Эта метка становится красной, если любой из получателей принимает количество меньше, чем %1.</translation>
-    </message>
-    <message>
-        <source>Can vary +/- %1 satoshi(s) per input.</source>
-        <translation>Может отличаться на +/- %1 сатоши на вход.</translation>
-    </message>
-    <message>
-        <source>yes</source>
-        <translation>да</translation>
-    </message>
-    <message>
-        <source>no</source>
-        <translation>нет</translation>
-    </message>
-    <message>
-        <source>This means a fee of at least %1 per kB is required.</source>
-        <translation>Это значит, что требуется комиссия как минимум %1 на КБ.</translation>
-    </message>
-    <message>
-        <source>Can vary +/- 1 byte per input.</source>
-        <translation>Может отличаться на +/- 1 байт на вход.</translation>
-    </message>
-    <message>
-        <source>Transactions with higher priority are more likely to get included into a block.</source>
-        <translation>Транзакции с более высоким приоритетом будут вероятнее других включены в блок.</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>[нет метки]</translation>
-    </message>
-    <message>
-        <source>change from %1 (%2)</source>
-        <translation>сдача с %1 (%2)</translation>
-    </message>
-    <message>
-        <source>(change)</source>
-        <translation>(размен)</translation>
-    </message>
 </context>
 <context>
     <name>EditAddressDialog</name>
@@ -796,38 +478,6 @@
         <source>&amp;Address</source>
         <translation>&amp;Адрес</translation>
     </message>
-    <message>
-        <source>New receiving address</source>
-        <translation>Новый адрес для получения</translation>
-    </message>
-    <message>
-        <source>New sending address</source>
-        <translation>Новый адрес для отправки</translation>
-    </message>
-    <message>
-        <source>Edit receiving address</source>
-        <translation>Изменение адреса для получения</translation>
-    </message>
-    <message>
-        <source>Edit sending address</source>
-        <translation>Изменение адреса для отправки</translation>
-    </message>
-    <message>
-        <source>The entered address "%1" is already in the address book.</source>
-        <translation>Введённый адрес «%1» уже находится в адресной книге.</translation>
-    </message>
-    <message>
-        <source>The entered address "%1" is not a valid Bitcoin address.</source>
-        <translation>Введённый адрес "%1" не является правильным Bitcoin-адресом.</translation>
-    </message>
-    <message>
-        <source>Could not unlock wallet.</source>
-        <translation>Не удается разблокировать бумажник.</translation>
-    </message>
-    <message>
-        <source>New key generation failed.</source>
-        <translation>Генерация нового ключа не удалась.</translation>
-    </message>
 </context>
 <context>
     <name>FreespaceChecker</name>
@@ -854,10 +504,6 @@
 </context>
 <context>
     <name>HelpMessageDialog</name>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Bitcoin Core</translation>
-    </message>
     <message>
         <source>version</source>
         <translation>версия</translation>
@@ -867,8 +513,8 @@
         <translation>(%1-бит)</translation>
     </message>
     <message>
-        <source>About Bitcoin Core</source>
-        <translation>О Bitcoin Core</translation>
+        <source>About %1</source>
+        <translation>О %1</translation>
     </message>
     <message>
         <source>Command-line options</source>
@@ -906,11 +552,7 @@
         <source>Show splash screen on startup (default: %u)</source>
         <translation>Показывать экран-заставку при запуске (по умолчанию: %u)</translation>
     </message>
-    <message>
-        <source>Reset all settings changes made over the GUI</source>
-        <translation>Сбросить все настройки сделанные через графический интерфейс</translation>
-    </message>
-</context>
+    </context>
 <context>
     <name>Intro</name>
     <message>
@@ -918,16 +560,8 @@
         <translation>Добро пожаловать</translation>
     </message>
     <message>
-        <source>Welcome to Bitcoin Core.</source>
-        <translation>Добро пожаловать в Bitcoin Core.</translation>
-    </message>
-    <message>
-        <source>As this is the first time the program is launched, you can choose where Bitcoin Core will store its data.</source>
-        <translation>Так как вы впервые запустили программу, вы можете выбрать, где Bitcoin Core будет хранить данные.</translation>
-    </message>
-    <message>
-        <source>Bitcoin Core will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source>
-        <translation>Bitcoin Core скачает и сохранит копию цепи блоков. Как минимум, %1ГБ данных будет храниться в этом каталоге, и со временем он будет расти. Бумажник будет также сохранён в этом каталоге.</translation>
+        <source>Welcome to %1.</source>
+        <translation>Добро пожаловать в %1</translation>
     </message>
     <message>
         <source>Use the default data directory</source>
@@ -937,10 +571,6 @@
         <source>Use a custom data directory:</source>
         <translation>Использовать другой каталог данных:</translation>
     </message>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Bitcoin Core</translation>
-    </message>
     <message>
         <source>Error: Specified data directory "%1" cannot be created.</source>
         <translation>Ошибка: не удалось создать указанный каталог данных "%1".</translation>
@@ -976,10 +606,6 @@
         <source>Select payment request file</source>
         <translation>Выбрать файл запроса платежа</translation>
     </message>
-    <message>
-        <source>Select payment request file to open</source>
-        <translation>Выберите файл запроса платежа</translation>
-    </message>
 </context>
 <context>
     <name>OptionsDialog</name>
@@ -1019,10 +645,6 @@
         <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Exit in the menu.</source>
         <translation>Сворачивать вместо закрытия. Если данная опция будет выбрана — приложение закроется только после выбора соответствующего пункта в меню.</translation>
     </message>
-    <message>
-        <source>The user interface language can be set here. This setting will take effect after restarting Bitcoin Core.</source>
-        <translation>Здесь можно выбрать язык интерфейса. Настройки вступят в силу после перезапуска Bitcoin Core.</translation>
-    </message>
     <message>
         <source>Third party URLs (e.g. a block explorer) that appear in the transactions tab as context menu items. %s in the URL is replaced by transaction hash. Multiple URLs are separated by vertical bar |.</source>
         <translation>Сторонние URL (например, block explorer), которые отображаются на вкладке транзакций как пункты контекстного меню. %s в URL заменяется хэшем транзакции. URL отделяются друг от друга вертикальной чертой |.</translation>
@@ -1047,14 +669,6 @@
         <source>&amp;Network</source>
         <translation>&amp;Сеть</translation>
     </message>
-    <message>
-        <source>Automatically start Bitcoin Core after logging in to the system.</source>
-        <translation>Автоматически запускать Bitcoin Core после входа в систему</translation>
-    </message>
-    <message>
-        <source>&amp;Start Bitcoin Core on system login</source>
-        <translation>&amp;Запускать Bitcoin Core при входе в систему</translation>
-    </message>
     <message>
         <source>(0 = auto, &lt;0 = leave that many cores free)</source>
         <translation>(0 = автоматически, &lt;0 = оставить столько незагруженных ядер)</translation>
@@ -1139,6 +753,10 @@
         <source>&amp;Window</source>
         <translation>&amp;Окно</translation>
     </message>
+    <message>
+        <source>Hide tray icon</source>
+        <translation>Скрыть иконку в трее</translation>
+    </message>
     <message>
         <source>Show only a tray icon after minimizing the window.</source>
         <translation>Показывать только иконку в системном лотке после сворачивания окна.</translation>
@@ -1284,171 +902,61 @@
     </message>
 </context>
 <context>
-    <name>PaymentServer</name>
+    <name>PeerTableModel</name>
     <message>
-        <source>URI handling</source>
-        <translation>Обработка URI</translation>
+        <source>User Agent</source>
+        <translation>Юзер-агент</translation>
     </message>
     <message>
-        <source>Invalid payment address %1</source>
-        <translation>Неверный адрес платежа %1</translation>
+        <source>Node/Service</source>
+        <translation>Узел/сервис</translation>
     </message>
     <message>
-        <source>Payment request rejected</source>
-        <translation>Запрос платежа отклонён</translation>
+        <source>Ping Time</source>
+        <translation>Время задержки</translation>
     </message>
+</context>
+<context>
+    <name>QObject</name>
     <message>
-        <source>Payment request network doesn't match client network.</source>
-        <translation>Сеть запроса платежа не совпадает с сетью клиента.</translation>
+        <source>Amount</source>
+        <translation>Сумма</translation>
     </message>
     <message>
-        <source>Payment request is not initialized.</source>
-        <translation>Запрос платежа не инициализирован.</translation>
+        <source>Enter a Bitcoin address (e.g. %1)</source>
+        <translation>Введите адрес Bitcoin (например, %1)</translation>
     </message>
     <message>
-        <source>Requested payment amount of %1 is too small (considered dust).</source>
-        <translation>Запрошенная сумма платежа %1 слишком мала (считается пылью).</translation>
+        <source>%1 d</source>
+        <translation>%1 д</translation>
     </message>
     <message>
-        <source>Payment request error</source>
-        <translation>Ошибка запроса платежа</translation>
+        <source>%1 h</source>
+        <translation>%1 ч</translation>
     </message>
     <message>
-        <source>Cannot start bitcoin: click-to-pay handler</source>
-        <translation>Не удаётся запустить bitcoin: обработчик click-to-pay</translation>
+        <source>%1 m</source>
+        <translation>%1 мин</translation>
     </message>
     <message>
-        <source>Payment request fetch URL is invalid: %1</source>
-        <translation>Неверный URL запроса платежа: %1</translation>
+        <source>%1 s</source>
+        <translation>%1 с</translation>
     </message>
     <message>
-        <source>URI cannot be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source>
-        <translation>Не удалось обработать URI! Это может быть связано с неверным адресом Bitcoin или неправильными параметрами URI.</translation>
+        <source>None</source>
+        <translation>Ничего</translation>
     </message>
     <message>
-        <source>Payment request file handling</source>
-        <translation>Обработка файла запроса платежа</translation>
+        <source>N/A</source>
+        <translation>Н/Д</translation>
     </message>
     <message>
-        <source>Payment request file cannot be read! This can be caused by an invalid payment request file.</source>
-        <translation>Файл запроса платежа не может быть прочитан! Обычно это происходит из-за неверного файла запроса платежа.</translation>
+        <source>%1 ms</source>
+        <translation>%1 мс</translation>
     </message>
-    <message>
-        <source>Payment request expired.</source>
-        <translation>Запрос платежа просрочен.</translation>
-    </message>
-    <message>
-        <source>Unverified payment requests to custom payment scripts are unsupported.</source>
-        <translation>Непроверенные запросы платежей с нестандартными платёжными сценариями не поддерживаются.</translation>
-    </message>
-    <message>
-        <source>Invalid payment request.</source>
-        <translation>Неверный запрос платежа.</translation>
-    </message>
-    <message>
-        <source>Refund from %1</source>
-        <translation>Возврат от %1</translation>
-    </message>
-    <message>
-        <source>Payment request %1 is too large (%2 bytes, allowed %3 bytes).</source>
-        <translation>Запрос платежа %1 слишком большой (%2 байтов, разрешено %3 байтов).</translation>
-    </message>
-    <message>
-        <source>Error communicating with %1: %2</source>
-        <translation>Ошибка связи с %1: %2</translation>
-    </message>
-    <message>
-        <source>Payment request cannot be parsed!</source>
-        <translation>Запрос платежа не может быть разобран!</translation>
-    </message>
-    <message>
-        <source>Bad response from server %1</source>
-        <translation>Плохой ответ от сервера %1</translation>
-    </message>
-    <message>
-        <source>Payment acknowledged</source>
-        <translation>Платёж принят</translation>
-    </message>
-    <message>
-        <source>Network request error</source>
-        <translation>Ошибка сетевого запроса</translation>
-    </message>
-</context>
-<context>
-    <name>PeerTableModel</name>
-    <message>
-        <source>User Agent</source>
-        <translation>Юзер-агент</translation>
-    </message>
-    <message>
-        <source>Node/Service</source>
-        <translation>Узел/сервис</translation>
-    </message>
-    <message>
-        <source>Ping Time</source>
-        <translation>Время задержки</translation>
-    </message>
-</context>
-<context>
-    <name>QObject</name>
-    <message>
-        <source>Amount</source>
-        <translation>Сумма</translation>
-    </message>
-    <message>
-        <source>Enter a Bitcoin address (e.g. %1)</source>
-        <translation>Введите адрес Bitcoin (например, %1)</translation>
-    </message>
-    <message>
-        <source>%1 d</source>
-        <translation>%1 д</translation>
-    </message>
-    <message>
-        <source>%1 h</source>
-        <translation>%1 ч</translation>
-    </message>
-    <message>
-        <source>%1 m</source>
-        <translation>%1 мин</translation>
-    </message>
-    <message>
-        <source>%1 s</source>
-        <translation>%1 с</translation>
-    </message>
-    <message>
-        <source>None</source>
-        <translation>Ничего</translation>
-    </message>
-    <message>
-        <source>N/A</source>
-        <translation>Н/Д</translation>
-    </message>
-    <message>
-        <source>%1 ms</source>
-        <translation>%1 мс</translation>
-    </message>
-</context>
-<context>
-    <name>QRImageWidget</name>
-    <message>
-        <source>&amp;Save Image...</source>
-        <translation>&amp;Сохранить изображение...</translation>
-    </message>
-    <message>
-        <source>&amp;Copy Image</source>
-        <translation>&amp;Копировать изображение</translation>
-    </message>
-    <message>
-        <source>Save QR Code</source>
-        <translation>Сохранить QR-код</translation>
-    </message>
-    <message>
-        <source>PNG Image (*.png)</source>
-        <translation>Изображение PNG (*.png)</translation>
-    </message>
-</context>
-<context>
-    <name>RPCConsole</name>
+</context>
+<context>
+    <name>RPCConsole</name>
     <message>
         <source>Client name</source>
         <translation>Имя клиента</translation>
@@ -1513,10 +1021,6 @@
         <source>Memory usage</source>
         <translation>Использование памяти</translation>
     </message>
-    <message>
-        <source>Open the Bitcoin Core debug log file from the current data directory. This can take a few seconds for large log files.</source>
-        <translation>Открыть отладочный лог-файл Bitcoin Core из текущего каталога данных. Это может занять несколько секунд для больших лог-файлов.</translation>
-    </message>
     <message>
         <source>Received</source>
         <translation>Получено</translation>
@@ -1633,10 +1137,6 @@
         <source>Out:</source>
         <translation>Выход:</translation>
     </message>
-    <message>
-        <source>Build date</source>
-        <translation>Дата сборки</translation>
-    </message>
     <message>
         <source>Debug log file</source>
         <translation>Отладочный лог-файл</translation>
@@ -1673,10 +1173,6 @@
         <source>&amp;Unban Node</source>
         <translation>&amp;Разблокировать узел</translation>
     </message>
-    <message>
-        <source>Welcome to the Bitcoin Core RPC console.</source>
-        <translation>Добро пожаловать в RPC-консоль Bitcoin Core.</translation>
-    </message>
     <message>
         <source>Use up and down arrows to navigate history, and &lt;b&gt;Ctrl-L&lt;/b&gt; to clear screen.</source>
         <translation>Используйте стрелки вверх и вниз для просмотра истории и &lt;b&gt;Ctrl-L&lt;/b&gt; для очистки экрана.</translation>
@@ -1804,18 +1300,6 @@
         <source>Remove</source>
         <translation>Удалить</translation>
     </message>
-    <message>
-        <source>Copy label</source>
-        <translation>Копировать метку</translation>
-    </message>
-    <message>
-        <source>Copy message</source>
-        <translation>Копировать сообщение</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>Скопировать сумму</translation>
-    </message>
 </context>
 <context>
     <name>ReceiveRequestDialog</name>
@@ -1835,73 +1319,6 @@
         <source>&amp;Save Image...</source>
         <translation>&amp;Сохранить изображение...</translation>
     </message>
-    <message>
-        <source>Request payment to %1</source>
-        <translation>Запросить платёж на %1</translation>
-    </message>
-    <message>
-        <source>Payment information</source>
-        <translation>Информация платежа</translation>
-    </message>
-    <message>
-        <source>URI</source>
-        <translation>URI</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>Адрес</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>Сумма</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Метка</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>Сообщение</translation>
-    </message>
-    <message>
-        <source>Resulting URI too long, try to reduce the text for label / message.</source>
-        <translation>Получившийся URI слишком длинный, попробуйте сократить текст метки / сообщения.</translation>
-    </message>
-    <message>
-        <source>Error encoding URI into QR Code.</source>
-        <translation>Ошибка кодирования URI в QR-код</translation>
-    </message>
-</context>
-<context>
-    <name>RecentRequestsTableModel</name>
-    <message>
-        <source>Date</source>
-        <translation>Дата</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Метка</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>Сообщение</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>Сумма</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>[нет метки]</translation>
-    </message>
-    <message>
-        <source>(no message)</source>
-        <translation>(нет сообщения)</translation>
-    </message>
-    <message>
-        <source>(no amount)</source>
-        <translation>(нет суммы)</translation>
-    </message>
 </context>
 <context>
     <name>SendCoinsDialog</name>
@@ -1966,939 +1383,293 @@
         <translation>Комиссия</translation>
     </message>
     <message>
-        <source>Choose...</source>
-        <translation>Выберите...</translation>
-    </message>
-    <message>
-        <source>collapse fee-settings</source>
-        <translation>Свернуть настройки комиссии</translation>
-    </message>
-    <message>
-        <source>per kilobyte</source>
-        <translation>за килобайт</translation>
-    </message>
-    <message>
-        <source>If the custom fee is set to 1000 satoshis and the transaction is only 250 bytes, then "per kilobyte" only pays 250 satoshis in fee, while "total at least" pays 1000 satoshis. For transactions bigger than a kilobyte both pay by kilobyte.</source>
-        <translation>Если комиссия установлена в 1000 сатоши, а транзакция составляет лишь 250 байт, тогда комиссия "на килобайт" составит 250 сатоши, а "всего как минимум" — 1000 сатоши. Для транзакций крупнее килобайта в обоих случаях будет использоваться платёж "на килобайт".</translation>
-    </message>
-    <message>
-        <source>Hide</source>
-        <translation>Скрыть</translation>
-    </message>
-    <message>
-        <source>total at least</source>
-        <translation>Итого как минимум</translation>
-    </message>
-    <message>
-        <source>Paying only the minimum fee is just fine as long as there is less transaction volume than space in the blocks. But be aware that this can end up in a never confirming transaction once there is more demand for bitcoin transactions than the network can process.</source>
-        <translation>Уплата минимальной комиссии — не проблема, пока объём транзакций меньше, чем свободное место в блоках. Учтите, однако, что такая транзакция может никогда не подтвердиться, если спрос на транзакции превышает возможности сети по их обработке.</translation>
-    </message>
-    <message>
-        <source>(read the tooltip)</source>
-        <translation>(прочтите подсказку)</translation>
-    </message>
-    <message>
-        <source>Recommended:</source>
-        <translation>Рекомендовано:</translation>
-    </message>
-    <message>
-        <source>Custom:</source>
-        <translation>Выборочно:</translation>
-    </message>
-    <message>
-        <source>(Smart fee not initialized yet. This usually takes a few blocks...)</source>
-        <translation>(Умная комиссия пока не инициализирована. Обычно для этого требуется несколько блоков...)</translation>
-    </message>
-    <message>
-        <source>Confirmation time:</source>
-        <translation>Время подтверждения:</translation>
-    </message>
-    <message>
-        <source>normal</source>
-        <translation>обычный</translation>
-    </message>
-    <message>
-        <source>fast</source>
-        <translation>ускоренный</translation>
-    </message>
-    <message>
-        <source>Send as zero-fee transaction if possible</source>
-        <translation>Осуществить транзакцию бесплатно, если возможно</translation>
-    </message>
-    <message>
-        <source>(confirmation may take longer)</source>
-        <translation>(подтверждение может занять больше времени)</translation>
-    </message>
-    <message>
-        <source>Send to multiple recipients at once</source>
-        <translation>Отправить нескольким получателям одновременно</translation>
-    </message>
-    <message>
-        <source>Add &amp;Recipient</source>
-        <translation>&amp;Добавить получателя</translation>
-    </message>
-    <message>
-        <source>Clear all fields of the form.</source>
-        <translation>Очистить все поля формы</translation>
-    </message>
-    <message>
-        <source>Dust:</source>
-        <translation>Пыль:</translation>
-    </message>
-    <message>
-        <source>Clear &amp;All</source>
-        <translation>Очистить &amp;всё</translation>
-    </message>
-    <message>
-        <source>Balance:</source>
-        <translation>Баланс:</translation>
-    </message>
-    <message>
-        <source>Confirm the send action</source>
-        <translation>Подтвердить отправку</translation>
-    </message>
-    <message>
-        <source>S&amp;end</source>
-        <translation>&amp;Отправить</translation>
-    </message>
-    <message>
-        <source>Confirm send coins</source>
-        <translation>Подтвердите отправку монет</translation>
-    </message>
-    <message>
-        <source>%1 to %2</source>
-        <translation>С %1 на %2</translation>
-    </message>
-    <message>
-        <source>Copy quantity</source>
-        <translation>Копировать количество</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>Скопировать сумму</translation>
-    </message>
-    <message>
-        <source>Copy fee</source>
-        <translation>Копировать комиссию</translation>
-    </message>
-    <message>
-        <source>Copy after fee</source>
-        <translation>Копировать после комиссии</translation>
-    </message>
-    <message>
-        <source>Copy bytes</source>
-        <translation>Копировать байты</translation>
-    </message>
-    <message>
-        <source>Copy priority</source>
-        <translation>Копировать приоритет</translation>
-    </message>
-    <message>
-        <source>Copy change</source>
-        <translation>Копировать размен</translation>
-    </message>
-    <message>
-        <source>Total Amount %1</source>
-        <translation>Общая сумма %1</translation>
-    </message>
-    <message>
-        <source>or</source>
-        <translation>или</translation>
-    </message>
-    <message>
-        <source>The amount to pay must be larger than 0.</source>
-        <translation>Сумма для отправки должно быть больше 0.</translation>
-    </message>
-    <message>
-        <source>The amount exceeds your balance.</source>
-        <translation>Сумма превышает Ваш баланс</translation>
-    </message>
-    <message>
-        <source>The total exceeds your balance when the %1 transaction fee is included.</source>
-        <translation>Сумма превысит Ваш баланс, если комиссия в размере %1 будет добавлена к транзакции</translation>
-    </message>
-    <message>
-        <source>Transaction creation failed!</source>
-        <translation>Не удалось создать транзакцию!</translation>
-    </message>
-    <message>
-        <source>The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source>
-        <translation>Транзакция была отклонена! Такое может произойти, если некоторые монеты уже были потрачены, например, если Вы используете одну копию бумажника (wallet.dat), а монеты были потрачены из другой копии, но не были отмечены как потраченные в этой.</translation>
-    </message>
-    <message>
-        <source>A fee higher than %1 is considered an absurdly high fee.</source>
-        <translation>Комиссия больше, чем %1, считается невероятно большой.</translation>
-    </message>
-    <message>
-        <source>Payment request expired.</source>
-        <translation>Запрос платежа просрочен.</translation>
-    </message>
-    <message>
-        <source>Pay only the required fee of %1</source>
-        <translation>Заплатить только обязательную комиссию %1</translation>
-    </message>
-    <message numerus="yes">
-        <source>Estimated to begin confirmation within %n block(s).</source>
-        <translation><numerusform>Подтверждение ожидается через %n блок.</numerusform><numerusform>Подтверждение ожидается через %n блока.</numerusform><numerusform>Подтверждение ожидается через %n блоков.</numerusform><numerusform>Подтверждение ожидается через %n блоков.</numerusform></translation>
-    </message>
-    <message>
-        <source>The recipient address is not valid. Please recheck.</source>
-        <translation>Адрес получателя неверный. Пожалуйста, перепроверьте.</translation>
-    </message>
-    <message>
-        <source>Duplicate address found: addresses should only be used once each.</source>
-        <translation>Обнаружен дублирующийся адрес: используйте каждый адрес только один раз.</translation>
-    </message>
-    <message>
-        <source>Warning: Invalid Bitcoin address</source>
-        <translation>Внимание: неверный адрес Bitcoin</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>[нет метки]</translation>
-    </message>
-    <message>
-        <source>Warning: Unknown change address</source>
-        <translation>Внимание: неизвестный адрес для сдачи</translation>
-    </message>
-    <message>
-        <source>Copy dust</source>
-        <translation>Копировать пыль</translation>
-    </message>
-    <message>
-        <source>Are you sure you want to send?</source>
-        <translation>Вы уверены, что хотите отправить?</translation>
-    </message>
-    <message>
-        <source>added as transaction fee</source>
-        <translation>добавлено как комиссия</translation>
-    </message>
-</context>
-<context>
-    <name>SendCoinsEntry</name>
-    <message>
-        <source>A&amp;mount:</source>
-        <translation>Ко&amp;личество:</translation>
-    </message>
-    <message>
-        <source>Pay &amp;To:</source>
-        <translation>Полу&amp;чатель:</translation>
-    </message>
-    <message>
-        <source>Enter a label for this address to add it to your address book</source>
-        <translation>Введите метку для данного адреса (для добавления в адресную книгу)</translation>
-    </message>
-    <message>
-        <source>&amp;Label:</source>
-        <translation>&amp;Метка:</translation>
-    </message>
-    <message>
-        <source>Choose previously used address</source>
-        <translation>Выберите ранее использованный адрес</translation>
-    </message>
-    <message>
-        <source>This is a normal payment.</source>
-        <translation>Это нормальный платёж.</translation>
-    </message>
-    <message>
-        <source>The Bitcoin address to send the payment to</source>
-        <translation>Адрес Bitcoin, на который отправить платёж</translation>
-    </message>
-    <message>
-        <source>Alt+A</source>
-        <translation>Alt+A</translation>
-    </message>
-    <message>
-        <source>Paste address from clipboard</source>
-        <translation>Вставить адрес из буфера обмена</translation>
-    </message>
-    <message>
-        <source>Alt+P</source>
-        <translation>Alt+P</translation>
-    </message>
-    <message>
-        <source>Remove this entry</source>
-        <translation>Удалить эту запись</translation>
-    </message>
-    <message>
-        <source>The fee will be deducted from the amount being sent. The recipient will receive less bitcoins than you enter in the amount field. If multiple recipients are selected, the fee is split equally.</source>
-        <translation>С отправляемой суммы будет удержана комиссия. Получателю придёт меньше биткоинов, чем вы вводите в поле количества. Если выбрано несколько получателей, комиссия распределяется поровну.</translation>
-    </message>
-    <message>
-        <source>S&amp;ubtract fee from amount</source>
-        <translation>Вычесть комиссию из суммы</translation>
-    </message>
-    <message>
-        <source>Message:</source>
-        <translation>Сообщение:</translation>
-    </message>
-    <message>
-        <source>This is an unauthenticated payment request.</source>
-        <translation>Это неавторизованный запрос платежа.</translation>
-    </message>
-    <message>
-        <source>This is an authenticated payment request.</source>
-        <translation>Это авторизованный запрос платежа.</translation>
-    </message>
-    <message>
-        <source>Enter a label for this address to add it to the list of used addresses</source>
-        <translation>Введите метку для этого адреса, чтобы добавить его в список использованных</translation>
-    </message>
-    <message>
-        <source>A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
-        <translation>К bitcoin: URI было прикреплено сообщение, которое будет сохранено вместе с транзакцией для вашего сведения. Заметьте: сообщение не будет отправлено через сеть Bitcoin.</translation>
-    </message>
-    <message>
-        <source>Pay To:</source>
-        <translation>Получатель:</translation>
-    </message>
-    <message>
-        <source>Memo:</source>
-        <translation>Примечание:</translation>
-    </message>
-</context>
-<context>
-    <name>ShutdownWindow</name>
-    <message>
-        <source>Bitcoin Core is shutting down...</source>
-        <translation>Bitcoin Core выключается...</translation>
-    </message>
-    <message>
-        <source>Do not shut down the computer until this window disappears.</source>
-        <translation>Не выключайте компьютер, пока это окно не исчезнет.</translation>
-    </message>
-</context>
-<context>
-    <name>SignVerifyMessageDialog</name>
-    <message>
-        <source>Signatures - Sign / Verify a Message</source>
-        <translation>Подписи - подписать/проверить сообщение</translation>
-    </message>
-    <message>
-        <source>&amp;Sign Message</source>
-        <translation>&amp;Подписать сообщение</translation>
-    </message>
-    <message>
-        <source>You can sign messages/agreements with your addresses to prove you can receive bitcoins sent to them. Be careful not to sign anything vague or random, as phishing attacks may try to trick you into signing your identity over to them. Only sign fully-detailed statements you agree to.</source>
-        <translation>Вы можете подписывать сообщения/соглашения своими адресами, чтобы доказать свою возможность получать биткоины на них. Будьте осторожны, не подписывайте что-то неопределённое или случайное, так как фишинговые атаки могут обманным путём заставить вас подписать нежелательные сообщения. Подписывайте только те сообщения, с которыми вы согласны вплоть до мелочей.</translation>
-    </message>
-    <message>
-        <source>The Bitcoin address to sign the message with</source>
-        <translation>Адрес Bitcoin, которым подписать сообщение</translation>
-    </message>
-    <message>
-        <source>Choose previously used address</source>
-        <translation>Выберите ранее использованный адрес</translation>
-    </message>
-    <message>
-        <source>Alt+A</source>
-        <translation>Alt+A</translation>
-    </message>
-    <message>
-        <source>Paste address from clipboard</source>
-        <translation>Вставить адрес из буфера обмена</translation>
-    </message>
-    <message>
-        <source>Alt+P</source>
-        <translation>Alt+P</translation>
-    </message>
-    <message>
-        <source>Enter the message you want to sign here</source>
-        <translation>Введите сообщение для подписи</translation>
-    </message>
-    <message>
-        <source>Signature</source>
-        <translation>Подпись</translation>
-    </message>
-    <message>
-        <source>Copy the current signature to the system clipboard</source>
-        <translation>Скопировать текущую подпись в системный буфер обмена</translation>
-    </message>
-    <message>
-        <source>Sign the message to prove you own this Bitcoin address</source>
-        <translation>Подписать сообщение, чтобы доказать владение адресом Bitcoin</translation>
-    </message>
-    <message>
-        <source>Sign &amp;Message</source>
-        <translation>Подписать &amp;Сообщение</translation>
-    </message>
-    <message>
-        <source>Reset all sign message fields</source>
-        <translation>Сбросить значения всех полей подписывания сообщений</translation>
-    </message>
-    <message>
-        <source>Clear &amp;All</source>
-        <translation>Очистить &amp;всё</translation>
-    </message>
-    <message>
-        <source>&amp;Verify Message</source>
-        <translation>&amp;Проверить сообщение</translation>
-    </message>
-    <message>
-        <source>Enter the receiver's address, message (ensure you copy line breaks, spaces, tabs, etc. exactly) and signature below to verify the message. Be careful not to read more into the signature than what is in the signed message itself, to avoid being tricked by a man-in-the-middle attack. Note that this only proves the signing party receives with the address, it cannot prove sendership of any transaction!</source>
-        <translation>Введите ниже адрес получателя, сообщение (убедитесь, что переводы строк, пробелы, табы и т.п. в точности скопированы) и подпись, чтобы проверить сообщение. Убедитесь, что не скопировали лишнего в подпись, по сравнению с самим подписываемым сообщением, чтобы не стать жертвой атаки "man-in-the-middle". Заметьте, что эта операция удостоверяет лишь авторство подписавшего, но не может удостоверить отправителя транзакции.</translation>
-    </message>
-    <message>
-        <source>The Bitcoin address the message was signed with</source>
-        <translation>Адрес Bitcoin, которым было подписано сообщение</translation>
-    </message>
-    <message>
-        <source>Verify the message to ensure it was signed with the specified Bitcoin address</source>
-        <translation>Проверить сообщение, чтобы убедиться, что оно было подписано указанным адресом Bitcoin</translation>
-    </message>
-    <message>
-        <source>Verify &amp;Message</source>
-        <translation>Проверить &amp;Сообщение</translation>
-    </message>
-    <message>
-        <source>Reset all verify message fields</source>
-        <translation>Сбросить все поля проверки сообщения</translation>
-    </message>
-    <message>
-        <source>Click "Sign Message" to generate signature</source>
-        <translation>Нажмите "Подписать сообщение" для создания подписи</translation>
-    </message>
-    <message>
-        <source>The entered address is invalid.</source>
-        <translation>Введённый адрес неверен</translation>
-    </message>
-    <message>
-        <source>Please check the address and try again.</source>
-        <translation>Пожалуйста, проверьте адрес и попробуйте ещё раз.</translation>
-    </message>
-    <message>
-        <source>The entered address does not refer to a key.</source>
-        <translation>Введённый адрес не связан с ключом</translation>
-    </message>
-    <message>
-        <source>Wallet unlock was cancelled.</source>
-        <translation>Разблокировка бумажника была отменена.</translation>
-    </message>
-    <message>
-        <source>Private key for the entered address is not available.</source>
-        <translation>Для введённого адреса недоступен закрытый ключ</translation>
-    </message>
-    <message>
-        <source>Message signing failed.</source>
-        <translation>Не удалось подписать сообщение</translation>
-    </message>
-    <message>
-        <source>Message signed.</source>
-        <translation>Сообщение подписано</translation>
-    </message>
-    <message>
-        <source>The signature could not be decoded.</source>
-        <translation>Подпись не может быть раскодирована.</translation>
-    </message>
-    <message>
-        <source>Please check the signature and try again.</source>
-        <translation>Пожалуйста, проверьте подпись и попробуйте ещё раз.</translation>
-    </message>
-    <message>
-        <source>The signature did not match the message digest.</source>
-        <translation>Подпись не соответствует отпечатку сообщения.</translation>
-    </message>
-    <message>
-        <source>Message verification failed.</source>
-        <translation>Проверка сообщения не удалась.</translation>
-    </message>
-    <message>
-        <source>Message verified.</source>
-        <translation>Сообщение проверено.</translation>
-    </message>
-</context>
-<context>
-    <name>SplashScreen</name>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Bitcoin Core</translation>
-    </message>
-    <message>
-        <source>The Bitcoin Core developers</source>
-        <translation>Разработчики Bitcoin Core</translation>
-    </message>
-    <message>
-        <source>[testnet]</source>
-        <translation>[тестовая сеть]</translation>
-    </message>
-</context>
-<context>
-    <name>TrafficGraphWidget</name>
-    <message>
-        <source>KB/s</source>
-        <translation>КБ/сек</translation>
-    </message>
-</context>
-<context>
-    <name>TransactionDesc</name>
-    <message>
-        <source>Open until %1</source>
-        <translation>Открыто до %1</translation>
-    </message>
-    <message>
-        <source>conflicted</source>
-        <translation>в противоречии</translation>
-    </message>
-    <message>
-        <source>%1/offline</source>
-        <translation>%1/отключен</translation>
-    </message>
-    <message>
-        <source>%1/unconfirmed</source>
-        <translation>%1/не подтверждено</translation>
-    </message>
-    <message>
-        <source>%1 confirmations</source>
-        <translation>%1 подтверждений</translation>
-    </message>
-    <message>
-        <source>Status</source>
-        <translation>Статус</translation>
-    </message>
-    <message numerus="yes">
-        <source>, broadcast through %n node(s)</source>
-        <translation><numerusform>, разослано через %n узел</numerusform><numerusform>, разослано через %n узла</numerusform><numerusform>, разослано через %n узлов</numerusform><numerusform>, разослано через %n узлов</numerusform></translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation>Дата</translation>
-    </message>
-    <message>
-        <source>Source</source>
-        <translation>Источник</translation>
-    </message>
-    <message>
-        <source>Generated</source>
-        <translation>Сгенерированно</translation>
-    </message>
-    <message>
-        <source>From</source>
-        <translation>От</translation>
-    </message>
-    <message>
-        <source>To</source>
-        <translation>Для</translation>
-    </message>
-    <message>
-        <source>own address</source>
-        <translation>свой адрес</translation>
-    </message>
-    <message>
-        <source>watch-only</source>
-        <translation>только наблюдение</translation>
-    </message>
-    <message>
-        <source>label</source>
-        <translation>метка</translation>
-    </message>
-    <message>
-        <source>Credit</source>
-        <translation>Кредит</translation>
-    </message>
-    <message numerus="yes">
-        <source>matures in %n more block(s)</source>
-        <translation><numerusform>будет доступно через %n блок</numerusform><numerusform>будет доступно через %n блока</numerusform><numerusform>будет доступно через %n блоков</numerusform><numerusform>будет доступно через %n блоков</numerusform></translation>
-    </message>
-    <message>
-        <source>not accepted</source>
-        <translation>не принято</translation>
-    </message>
-    <message>
-        <source>Debit</source>
-        <translation>Дебет</translation>
-    </message>
-    <message>
-        <source>Total debit</source>
-        <translation>Всего дебет</translation>
-    </message>
-    <message>
-        <source>Total credit</source>
-        <translation>Всего кредит</translation>
-    </message>
-    <message>
-        <source>Transaction fee</source>
-        <translation>Комиссия</translation>
-    </message>
-    <message>
-        <source>Net amount</source>
-        <translation>Чистая сумма</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>Сообщение</translation>
-    </message>
-    <message>
-        <source>Comment</source>
-        <translation>Комментарий:</translation>
-    </message>
-    <message>
-        <source>Transaction ID</source>
-        <translation>ID транзакции</translation>
-    </message>
-    <message>
-        <source>Merchant</source>
-        <translation>Продавец</translation>
-    </message>
-    <message>
-        <source>Generated coins must mature %1 blocks before they can be spent. When you generated this block, it was broadcast to the network to be added to the block chain. If it fails to get into the chain, its state will change to "not accepted" and it won't be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source>
-        <translation>Сгенерированные монеты должны подождать %1 блоков, прежде чем они могут быть потрачены. Когда Вы сгенерировали этот блок, он был отправлен в сеть для добавления в цепочку блоков. Если он не попадёт в цепь, его статус изменится на "не принят", и монеты будут недействительны. Это иногда происходит в случае, если другой узел сгенерирует блок на несколько секунд раньше вас.</translation>
-    </message>
-    <message>
-        <source>Debug information</source>
-        <translation>Отладочная информация</translation>
-    </message>
-    <message>
-        <source>Transaction</source>
-        <translation>Транзакция</translation>
-    </message>
-    <message>
-        <source>Inputs</source>
-        <translation>Входы</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>Сумма</translation>
-    </message>
-    <message>
-        <source>true</source>
-        <translation>истина</translation>
-    </message>
-    <message>
-        <source>false</source>
-        <translation>ложь</translation>
-    </message>
-    <message>
-        <source>, has not been successfully broadcast yet</source>
-        <translation>, ещё не было успешно разослано</translation>
-    </message>
-    <message numerus="yes">
-        <source>Open for %n more block(s)</source>
-        <translation><numerusform>Открыто для ещё %n блока</numerusform><numerusform>Открыто для ещё %n блоков</numerusform><numerusform>Открыто для ещё %n блоков</numerusform><numerusform>Открыто для ещё %n блоков</numerusform></translation>
-    </message>
-    <message>
-        <source>unknown</source>
-        <translation>неизвестно</translation>
-    </message>
-</context>
-<context>
-    <name>TransactionDescDialog</name>
-    <message>
-        <source>Transaction details</source>
-        <translation>Детали транзакции</translation>
-    </message>
-    <message>
-        <source>This pane shows a detailed description of the transaction</source>
-        <translation>Эта панель отображает детальное описание транзакции.</translation>
+        <source>Choose...</source>
+        <translation>Выберите...</translation>
     </message>
-</context>
-<context>
-    <name>TransactionTableModel</name>
     <message>
-        <source>Date</source>
-        <translation>Дата</translation>
+        <source>collapse fee-settings</source>
+        <translation>Свернуть настройки комиссии</translation>
     </message>
     <message>
-        <source>Type</source>
-        <translation>Тип</translation>
+        <source>per kilobyte</source>
+        <translation>за килобайт</translation>
     </message>
     <message>
-        <source>Immature (%1 confirmations, will be available after %2)</source>
-        <translation>Незрелый (%1 подтверждений, будет доступен после %2)</translation>
+        <source>If the custom fee is set to 1000 satoshis and the transaction is only 250 bytes, then "per kilobyte" only pays 250 satoshis in fee, while "total at least" pays 1000 satoshis. For transactions bigger than a kilobyte both pay by kilobyte.</source>
+        <translation>Если комиссия установлена в 1000 сатоши, а транзакция составляет лишь 250 байт, тогда комиссия "на килобайт" составит 250 сатоши, а "всего как минимум" — 1000 сатоши. Для транзакций крупнее килобайта в обоих случаях будет использоваться платёж "на килобайт".</translation>
     </message>
-    <message numerus="yes">
-        <source>Open for %n more block(s)</source>
-        <translation><numerusform>Открыто для ещё %n блока</numerusform><numerusform>Открыто для ещё %n блоков</numerusform><numerusform>Открыто для ещё %n блоков</numerusform><numerusform>Открыто для ещё %n блоков</numerusform></translation>
+    <message>
+        <source>Hide</source>
+        <translation>Скрыть</translation>
     </message>
     <message>
-        <source>Open until %1</source>
-        <translation>Открыто до %1</translation>
+        <source>total at least</source>
+        <translation>Итого как минимум</translation>
     </message>
     <message>
-        <source>Confirmed (%1 confirmations)</source>
-        <translation>Подтверждено (%1 подтверждений)</translation>
+        <source>Paying only the minimum fee is just fine as long as there is less transaction volume than space in the blocks. But be aware that this can end up in a never confirming transaction once there is more demand for bitcoin transactions than the network can process.</source>
+        <translation>Уплата минимальной комиссии — не проблема, пока объём транзакций меньше, чем свободное место в блоках. Учтите, однако, что такая транзакция может никогда не подтвердиться, если спрос на транзакции превышает возможности сети по их обработке.</translation>
     </message>
     <message>
-        <source>This block was not received by any other nodes and will probably not be accepted!</source>
-        <translation>Этот блок не был получен другими узлами и, возможно, не будет принят!</translation>
+        <source>(read the tooltip)</source>
+        <translation>(прочтите подсказку)</translation>
     </message>
     <message>
-        <source>Generated but not accepted</source>
-        <translation>Сгенерированно, но не подтверждено</translation>
+        <source>Recommended:</source>
+        <translation>Рекомендовано:</translation>
     </message>
     <message>
-        <source>Offline</source>
-        <translation>Нет активных соединений с сетью</translation>
+        <source>Custom:</source>
+        <translation>Выборочно:</translation>
     </message>
     <message>
-        <source>Label</source>
-        <translation>Метка</translation>
+        <source>(Smart fee not initialized yet. This usually takes a few blocks...)</source>
+        <translation>(Умная комиссия пока не инициализирована. Обычно для этого требуется несколько блоков...)</translation>
     </message>
     <message>
-        <source>Unconfirmed</source>
-        <translation>Неподтверждено</translation>
+        <source>Confirmation time:</source>
+        <translation>Время подтверждения:</translation>
     </message>
     <message>
-        <source>Confirming (%1 of %2 recommended confirmations)</source>
-        <translation>Подтверждено(%1 подтверждений, рекомендуется %2 подтверждений)</translation>
+        <source>normal</source>
+        <translation>обычный</translation>
     </message>
     <message>
-        <source>Conflicted</source>
-        <translation>В противоречии</translation>
+        <source>fast</source>
+        <translation>ускоренный</translation>
     </message>
     <message>
-        <source>Received with</source>
-        <translation>Получено</translation>
+        <source>Send to multiple recipients at once</source>
+        <translation>Отправить нескольким получателям одновременно</translation>
     </message>
     <message>
-        <source>Received from</source>
-        <translation>Получено от</translation>
+        <source>Add &amp;Recipient</source>
+        <translation>&amp;Добавить получателя</translation>
     </message>
     <message>
-        <source>Sent to</source>
-        <translation>Отправлено</translation>
+        <source>Clear all fields of the form.</source>
+        <translation>Очистить все поля формы</translation>
     </message>
     <message>
-        <source>Payment to yourself</source>
-        <translation>Отправлено себе</translation>
+        <source>Dust:</source>
+        <translation>Пыль:</translation>
     </message>
     <message>
-        <source>Mined</source>
-        <translation>Добыто</translation>
+        <source>Clear &amp;All</source>
+        <translation>Очистить &amp;всё</translation>
     </message>
     <message>
-        <source>watch-only</source>
-        <translation>только наблюдение</translation>
+        <source>Balance:</source>
+        <translation>Баланс:</translation>
     </message>
     <message>
-        <source>(n/a)</source>
-        <translation>[не доступно]</translation>
+        <source>Confirm the send action</source>
+        <translation>Подтвердить отправку</translation>
     </message>
     <message>
-        <source>Transaction status. Hover over this field to show number of confirmations.</source>
-        <translation>Статус транзакции. Подведите курсор к нужному полю для того, чтобы увидеть количество подтверждений.</translation>
+        <source>S&amp;end</source>
+        <translation>&amp;Отправить</translation>
     </message>
+</context>
+<context>
+    <name>SendCoinsEntry</name>
     <message>
-        <source>Date and time that the transaction was received.</source>
-        <translation>Дата и время, когда транзакция была получена.</translation>
+        <source>A&amp;mount:</source>
+        <translation>Ко&amp;личество:</translation>
     </message>
     <message>
-        <source>Type of transaction.</source>
-        <translation>Тип транзакции.</translation>
+        <source>Pay &amp;To:</source>
+        <translation>Полу&amp;чатель:</translation>
     </message>
     <message>
-        <source>Whether or not a watch-only address is involved in this transaction.</source>
-        <translation>Использовался ли в транзакции адрес для наблюдения.</translation>
+        <source>&amp;Label:</source>
+        <translation>&amp;Метка:</translation>
     </message>
     <message>
-        <source>User-defined intent/purpose of the transaction.</source>
-        <translation>Определяемое пользователем намерение/цель транзакции.</translation>
+        <source>Choose previously used address</source>
+        <translation>Выберите ранее использованный адрес</translation>
     </message>
     <message>
-        <source>Amount removed from or added to balance.</source>
-        <translation>Сумма, добавленная, или снятая с баланса.</translation>
+        <source>This is a normal payment.</source>
+        <translation>Это нормальный платёж.</translation>
     </message>
-</context>
-<context>
-    <name>TransactionView</name>
     <message>
-        <source>All</source>
-        <translation>Все</translation>
+        <source>The Bitcoin address to send the payment to</source>
+        <translation>Адрес Bitcoin, на который отправить платёж</translation>
     </message>
     <message>
-        <source>Today</source>
-        <translation>Сегодня</translation>
+        <source>Alt+A</source>
+        <translation>Alt+A</translation>
     </message>
     <message>
-        <source>This week</source>
-        <translation>На этой неделе</translation>
+        <source>Paste address from clipboard</source>
+        <translation>Вставить адрес из буфера обмена</translation>
     </message>
     <message>
-        <source>This month</source>
-        <translation>В этом месяце</translation>
+        <source>Alt+P</source>
+        <translation>Alt+P</translation>
     </message>
     <message>
-        <source>Last month</source>
-        <translation>В прошлом месяце</translation>
+        <source>Remove this entry</source>
+        <translation>Удалить эту запись</translation>
     </message>
     <message>
-        <source>This year</source>
-        <translation>В этом году</translation>
+        <source>The fee will be deducted from the amount being sent. The recipient will receive less bitcoins than you enter in the amount field. If multiple recipients are selected, the fee is split equally.</source>
+        <translation>С отправляемой суммы будет удержана комиссия. Получателю придёт меньше биткоинов, чем вы вводите в поле количества. Если выбрано несколько получателей, комиссия распределяется поровну.</translation>
     </message>
     <message>
-        <source>Range...</source>
-        <translation>Промежуток...</translation>
+        <source>S&amp;ubtract fee from amount</source>
+        <translation>Вычесть комиссию из суммы</translation>
     </message>
     <message>
-        <source>Received with</source>
-        <translation>Получено на</translation>
+        <source>Message:</source>
+        <translation>Сообщение:</translation>
     </message>
     <message>
-        <source>Sent to</source>
-        <translation>Отправлено на</translation>
+        <source>This is an unauthenticated payment request.</source>
+        <translation>Это неавторизованный запрос платежа.</translation>
     </message>
     <message>
-        <source>To yourself</source>
-        <translation>Отправленные себе</translation>
+        <source>This is an authenticated payment request.</source>
+        <translation>Это авторизованный запрос платежа.</translation>
     </message>
     <message>
-        <source>Mined</source>
-        <translation>Добытые</translation>
+        <source>Enter a label for this address to add it to the list of used addresses</source>
+        <translation>Введите метку для этого адреса, чтобы добавить его в список использованных</translation>
     </message>
     <message>
-        <source>Other</source>
-        <translation>Другое</translation>
+        <source>A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
+        <translation>К bitcoin: URI было прикреплено сообщение, которое будет сохранено вместе с транзакцией для вашего сведения. Заметьте: сообщение не будет отправлено через сеть Bitcoin.</translation>
     </message>
     <message>
-        <source>Enter address or label to search</source>
-        <translation>Введите адрес или метку для поиска</translation>
+        <source>Pay To:</source>
+        <translation>Получатель:</translation>
     </message>
     <message>
-        <source>Min amount</source>
-        <translation>Мин. сумма</translation>
+        <source>Memo:</source>
+        <translation>Примечание:</translation>
     </message>
+</context>
+<context>
+    <name>ShutdownWindow</name>
     <message>
-        <source>Copy address</source>
-        <translation>Копировать адрес</translation>
+        <source>Do not shut down the computer until this window disappears.</source>
+        <translation>Не выключайте компьютер, пока это окно не исчезнет.</translation>
     </message>
+</context>
+<context>
+    <name>SignVerifyMessageDialog</name>
     <message>
-        <source>Copy label</source>
-        <translation>Копировать метку</translation>
+        <source>Signatures - Sign / Verify a Message</source>
+        <translation>Подписи - подписать/проверить сообщение</translation>
     </message>
     <message>
-        <source>Copy amount</source>
-        <translation>Скопировать сумму</translation>
+        <source>&amp;Sign Message</source>
+        <translation>&amp;Подписать сообщение</translation>
     </message>
     <message>
-        <source>Copy transaction ID</source>
-        <translation>Скопировать ID транзакции</translation>
+        <source>You can sign messages/agreements with your addresses to prove you can receive bitcoins sent to them. Be careful not to sign anything vague or random, as phishing attacks may try to trick you into signing your identity over to them. Only sign fully-detailed statements you agree to.</source>
+        <translation>Вы можете подписывать сообщения/соглашения своими адресами, чтобы доказать свою возможность получать биткоины на них. Будьте осторожны, не подписывайте что-то неопределённое или случайное, так как фишинговые атаки могут обманным путём заставить вас подписать нежелательные сообщения. Подписывайте только те сообщения, с которыми вы согласны вплоть до мелочей.</translation>
     </message>
     <message>
-        <source>Copy raw transaction</source>
-        <translation>Скопировать исходную транзакции</translation>
+        <source>The Bitcoin address to sign the message with</source>
+        <translation>Адрес Bitcoin, которым подписать сообщение</translation>
     </message>
     <message>
-        <source>Edit label</source>
-        <translation>Изменить метку</translation>
+        <source>Choose previously used address</source>
+        <translation>Выберите ранее использованный адрес</translation>
     </message>
     <message>
-        <source>Show transaction details</source>
-        <translation>Показать подробности транзакции</translation>
+        <source>Alt+A</source>
+        <translation>Alt+A</translation>
     </message>
     <message>
-        <source>Export Transaction History</source>
-        <translation>Экспортировать историю транзакций</translation>
+        <source>Paste address from clipboard</source>
+        <translation>Вставить адрес из буфера обмена</translation>
     </message>
     <message>
-        <source>Watch-only</source>
-        <translation>Для наблюдения</translation>
+        <source>Alt+P</source>
+        <translation>Alt+P</translation>
     </message>
     <message>
-        <source>Exporting Failed</source>
-        <translation>Экспорт не удался</translation>
+        <source>Enter the message you want to sign here</source>
+        <translation>Введите сообщение для подписи</translation>
     </message>
     <message>
-        <source>There was an error trying to save the transaction history to %1.</source>
-        <translation>Произошла ошибка при сохранении истории транзакций в %1.</translation>
+        <source>Signature</source>
+        <translation>Подпись</translation>
     </message>
     <message>
-        <source>Exporting Successful</source>
-        <translation>Экспорт успешно завершён</translation>
+        <source>Copy the current signature to the system clipboard</source>
+        <translation>Скопировать текущую подпись в системный буфер обмена</translation>
     </message>
     <message>
-        <source>The transaction history was successfully saved to %1.</source>
-        <translation>История транзакций была успешно сохранена в %1.</translation>
+        <source>Sign the message to prove you own this Bitcoin address</source>
+        <translation>Подписать сообщение, чтобы доказать владение адресом Bitcoin</translation>
     </message>
     <message>
-        <source>Comma separated file (*.csv)</source>
-        <translation>Текст, разделённый запятыми (*.csv)</translation>
+        <source>Sign &amp;Message</source>
+        <translation>Подписать &amp;Сообщение</translation>
     </message>
     <message>
-        <source>Confirmed</source>
-        <translation>Подтверждено</translation>
+        <source>Reset all sign message fields</source>
+        <translation>Сбросить значения всех полей подписывания сообщений</translation>
     </message>
     <message>
-        <source>Date</source>
-        <translation>Дата</translation>
+        <source>Clear &amp;All</source>
+        <translation>Очистить &amp;всё</translation>
     </message>
     <message>
-        <source>Type</source>
-        <translation>Тип</translation>
+        <source>&amp;Verify Message</source>
+        <translation>&amp;Проверить сообщение</translation>
     </message>
     <message>
-        <source>Label</source>
-        <translation>Метка</translation>
+        <source>Enter the receiver's address, message (ensure you copy line breaks, spaces, tabs, etc. exactly) and signature below to verify the message. Be careful not to read more into the signature than what is in the signed message itself, to avoid being tricked by a man-in-the-middle attack. Note that this only proves the signing party receives with the address, it cannot prove sendership of any transaction!</source>
+        <translation>Введите ниже адрес получателя, сообщение (убедитесь, что переводы строк, пробелы, табы и т.п. в точности скопированы) и подпись, чтобы проверить сообщение. Убедитесь, что не скопировали лишнего в подпись, по сравнению с самим подписываемым сообщением, чтобы не стать жертвой атаки "man-in-the-middle". Заметьте, что эта операция удостоверяет лишь авторство подписавшего, но не может удостоверить отправителя транзакции.</translation>
     </message>
     <message>
-        <source>Address</source>
-        <translation>Адрес</translation>
+        <source>The Bitcoin address the message was signed with</source>
+        <translation>Адрес Bitcoin, которым было подписано сообщение</translation>
     </message>
     <message>
-        <source>ID</source>
-        <translation>ID</translation>
+        <source>Verify the message to ensure it was signed with the specified Bitcoin address</source>
+        <translation>Проверить сообщение, чтобы убедиться, что оно было подписано указанным адресом Bitcoin</translation>
     </message>
     <message>
-        <source>Range:</source>
-        <translation>Промежуток от:</translation>
+        <source>Verify &amp;Message</source>
+        <translation>Проверить &amp;Сообщение</translation>
     </message>
     <message>
-        <source>to</source>
-        <translation>до</translation>
+        <source>Reset all verify message fields</source>
+        <translation>Сбросить все поля проверки сообщения</translation>
     </message>
 </context>
 <context>
-    <name>UnitDisplayStatusBarControl</name>
+    <name>SplashScreen</name>
     <message>
-        <source>Unit to show amounts in. Click to select another unit.</source>
-        <translation>Единица измерения количества монет. Щёлкните для выбора другой единицы.</translation>
+        <source>[testnet]</source>
+        <translation>[тестовая сеть]</translation>
     </message>
 </context>
 <context>
-    <name>WalletFrame</name>
+    <name>TrafficGraphWidget</name>
     <message>
-        <source>No wallet has been loaded.</source>
-        <translation>Не был загружен ни один бумажник.</translation>
+        <source>KB/s</source>
+        <translation>КБ/сек</translation>
     </message>
 </context>
 <context>
-    <name>WalletModel</name>
+    <name>TransactionDescDialog</name>
     <message>
-        <source>Send Coins</source>
-        <translation>Отправка</translation>
+        <source>This pane shows a detailed description of the transaction</source>
+        <translation>Эта панель отображает детальное описание транзакции.</translation>
     </message>
 </context>
 <context>
-    <name>WalletView</name>
-    <message>
-        <source>&amp;Export</source>
-        <translation>&amp;Экспорт</translation>
-    </message>
-    <message>
-        <source>Export the data in the current tab to a file</source>
-        <translation>Экспортировать данные из вкладки в файл</translation>
-    </message>
-    <message>
-        <source>Backup Wallet</source>
-        <translation>Сделать резервную копию бумажника</translation>
-    </message>
-    <message>
-        <source>Wallet Data (*.dat)</source>
-        <translation>Данные бумажника (*.dat)</translation>
-    </message>
-    <message>
-        <source>Backup Failed</source>
-        <translation>Резервное копирование не удалось</translation>
-    </message>
-    <message>
-        <source>There was an error trying to save the wallet data to %1.</source>
-        <translation>Произошла ошибка при сохранении данных бумажника в %1.</translation>
-    </message>
-    <message>
-        <source>The wallet data was successfully saved to %1.</source>
-        <translation>Данные бумажника были успешно сохранены в %1.</translation>
-    </message>
+    <name>UnitDisplayStatusBarControl</name>
     <message>
-        <source>Backup Successful</source>
-        <translation>Резервное копирование успешно завершено</translation>
+        <source>Unit to show amounts in. Click to select another unit.</source>
+        <translation>Единица измерения количества монет. Щёлкните для выбора другой единицы.</translation>
     </message>
 </context>
 <context>
@@ -2927,14 +1698,6 @@
         <source>If &lt;category&gt; is not supplied or if &lt;category&gt; = 1, output all debugging information.</source>
         <translation>Если &lt;category&gt; не предоставлена или равна 1, выводить всю отладочную информацию.</translation>
     </message>
-    <message>
-        <source>Maximum total fees (in %s) to use in a single wallet transaction; setting this too low may abort large transactions (default: %s)</source>
-        <translation>Максимальная сумма комиссий (%s) для одной транзакции в бумажнике; слишком низкое значение может вызвать прерывание больших транзакций (по умолчанию: %s)</translation>
-    </message>
-    <message>
-        <source>Please check that your computer's date and time are correct! If your clock is wrong Bitcoin Core will not work properly.</source>
-        <translation>Внимание: убедитесь, что дата и время на Вашем компьютере выставлены верно! Если Ваши часы идут неправильно, Bitcoin Core будет работать некорректно.</translation>
-    </message>
     <message>
         <source>Prune configured below the minimum of %d MiB.  Please use a higher number.</source>
         <translation>Удаление блоков выставлено ниже, чем минимум в %d Мб. Пожалуйста, используйте большее значение.</translation>
@@ -2975,6 +1738,10 @@
         <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
         <translation>Принимать подключения извне (по умолчанию: 1, если не используется -proxy или -connect)</translation>
     </message>
+    <message>
+        <source>Bitcoin Core</source>
+        <translation>Bitcoin Core</translation>
+    </message>
     <message>
         <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source>
         <translation>Привязаться к указанному адресу и всегда прослушивать только его. Используйте [хост]:порт для IPv6</translation>
@@ -3007,10 +1774,6 @@
         <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
         <translation>Это пре-релизная тестовая сборка - используйте на свой страх и риск - не используйте для добычи или торговых приложений</translation>
     </message>
-    <message>
-        <source>Unable to bind to %s on this computer. Bitcoin Core is probably already running.</source>
-        <translation>Не удалось забиндиться на %s на этом компьютере. Возможно, Bitcoin Core уже запущен.</translation>
-    </message>
     <message>
         <source>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</source>
         <translation>Использовать UPnP для проброса порта (по умолчанию: 1, если используется прослушивание и нет -proxy)</translation>
@@ -3027,18 +1790,10 @@
         <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source>
         <translation>Внимание: похоже, в сети нет полного согласия! Некоторый майнеры, возможно, испытывают проблемы.</translation>
     </message>
-    <message>
-        <source>Warning: Unknown block versions being mined! It's possible unknown rules are in effect</source>
-        <translation>Внимание: Получена неизвестная версия блока! Возможно неизвестные правила вступили в силу.</translation>
-    </message>
     <message>
         <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source>
         <translation>Внимание: мы не полностью согласны с подключенными участниками! Вам или другим участникам, возможно, следует обновиться.</translation>
     </message>
-    <message>
-        <source>Warning: wallet.dat corrupt, data salvaged! Original wallet.dat saved as wallet.{timestamp}.bak in %s; if your balance or transactions are incorrect you should restore from a backup.</source>
-        <translation>Внимание: wallet.dat повреждён, данные спасены! Оригинальный wallet.dat сохранён как wallet.{timestamp}.bak в %s; если ваш баланс или транзакции некорректны, вы должны восстановить файл из резервной копии.</translation>
-    </message>
     <message>
         <source>Whitelist peers connecting from the given netmask or IP address. Can be specified multiple times.</source>
         <translation>Вносить в белый список участников, подключающихся с указанной маски сети или IP. Можно использовать многократно.</translation>
@@ -3107,6 +1862,10 @@
         <source>Error initializing wallet database environment %s!</source>
         <translation>Ошибка инициализации окружения БД бумажника %s!</translation>
     </message>
+    <message>
+        <source>Error loading %s</source>
+        <translation>Ошибка загрузки %s</translation>
+    </message>
     <message>
         <source>Error loading block database</source>
         <translation>Ошибка чтения базы данных блоков</translation>
@@ -3211,10 +1970,6 @@
         <source>Wallet options:</source>
         <translation>Настройки бумажника:</translation>
     </message>
-    <message>
-        <source>You need to rebuild the database using -reindex to change -txindex</source>
-        <translation>Вам необходимо пересобрать базы данных с помощью -reindex, чтобы изменить -txindex</translation>
-    </message>
     <message>
         <source>Allow JSON-RPC connections from specified source. Valid for &lt;ip&gt; are a single IP (e.g. 1.2.3.4), a network/netmask (e.g. 1.2.3.4/255.255.255.0) or a network/CIDR (e.g. 1.2.3.4/24). This option can be specified multiple times</source>
         <translation>Разрешить подключения JSON-RPC с указанного источника. Разрешённые значения для &lt;ip&gt; — отдельный IP (например, 1.2.3.4), сеть/маска сети (например, 1.2.3.4/255.255.255.0) или сеть/CIDR (например, 1.2.3.4/24). Эту опцию можно использовать многократно</translation>
@@ -3227,10 +1982,6 @@
         <source>Bind to given address to listen for JSON-RPC connections. Use [host]:port notation for IPv6. This option can be specified multiple times (default: bind to all interfaces)</source>
         <translation>Привязаться к указанному адресу для прослушивания JSON-RPC подключений. Используйте запись [хост]:порт для IPv6. Эту опцию можно использовать многократно (по умолчанию: привязываться ко всем интерфейсам)</translation>
     </message>
-    <message>
-        <source>Cannot obtain a lock on data directory %s. Bitcoin Core is probably already running.</source>
-        <translation>Не удалось установить блокировку на каталог данных %s. Возможно, Bitcoin Core уже запущен.</translation>
-    </message>
     <message>
         <source>Create new files with system default permissions, instead of umask 077 (only effective with disabled wallet functionality)</source>
         <translation>Создавать новые файлы с системными правами по умолчанию вместо umask 077 (эффективно только при отключенном бумажнике)</translation>
@@ -3275,10 +2026,6 @@
         <source>Set maximum size of high-priority/low-fee transactions in bytes (default: %d)</source>
         <translation>Задать максимальный размер высокоприоритетных/низкокомиссионных транзакций в байтах (по умолчанию: %d)</translation>
     </message>
-    <message>
-        <source>Set the number of threads for coin generation if enabled (-1 = all cores, default: %d)</source>
-        <translation>Задать число потоков генерации монет, если она включена (-1 = все ядра процессора, по умолчанию: %d)</translation>
-    </message>
     <message>
         <source>The transaction amount is too small to send after the fee has been deducted</source>
         <translation>Сумма транзакции за вычетом комиссии слишком мала</translation>
@@ -3303,34 +2050,14 @@
         <source>Accept public REST requests (default: %u)</source>
         <translation>Принимать публичные REST-запросы (по умолчанию: %u)</translation>
     </message>
-    <message>
-        <source>Activating best chain...</source>
-        <translation>Активируется лучшая цепь...</translation>
-    </message>
-    <message>
-        <source>Attempt to recover private keys from a corrupt wallet.dat on startup</source>
-        <translation>Попытаться восстановить приватные ключи из повреждённого wallet.dat при запуске</translation>
-    </message>
     <message>
         <source>Automatically create Tor hidden service (default: %d)</source>
         <translation>Автоматически создавать скрытый Tor сервис (по умолчанию: %d)</translation>
     </message>
-    <message>
-        <source>Cannot resolve -whitebind address: '%s'</source>
-        <translation>Не удаётся разрешить адрес в параметре -whitebind: '%s'</translation>
-    </message>
     <message>
         <source>Connect through SOCKS5 proxy</source>
         <translation>Подключаться через SOCKS5 прокси</translation>
     </message>
-    <message>
-        <source>Copyright (C) 2009-%i The Bitcoin Core Developers</source>
-        <translation>Все права защищены © 2009-%i Разработчики Bitcoin Core</translation>
-    </message>
-    <message>
-        <source>Error loading wallet.dat: Wallet requires newer version of Bitcoin Core</source>
-        <translation>Ошибка загрузки wallet.dat: бумажник требует более новую версию Bitcoin Core</translation>
-    </message>
     <message>
         <source>Error reading from database, shutting down.</source>
         <translation>Ошибка чтения базы данных, работа завершается.</translation>
@@ -3343,22 +2070,6 @@
         <source>Information</source>
         <translation>Информация</translation>
     </message>
-    <message>
-        <source>Initialization sanity check failed. Bitcoin Core is shutting down.</source>
-        <translation>Не удалось проверить чистоту. Bitcoin Core выключается.</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -maxtxfee=&lt;amount&gt;: '%s'</source>
-        <translation>Неверное значение -maxtxfee=&lt;amount&gt;: '%s'</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -minrelaytxfee=&lt;amount&gt;: '%s'</source>
-        <translation>Неверная сумма в параметре -minrelaytxfee=&lt;кол-во&gt;: '%s'</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -mintxfee=&lt;amount&gt;: '%s'</source>
-        <translation>Неверная сумма в параметре -mintxfee=&lt;кол-во&gt;: '%s'</translation>
-    </message>
     <message>
         <source>Invalid amount for -paytxfee=&lt;amount&gt;: '%s' (must be at least %s)</source>
         <translation>Неверное количество в параметре -paytxfee=&lt;кол-во&gt;: '%s' (должно быть как минимум %s)</translation>
@@ -3383,14 +2094,6 @@
         <source>RPC server options:</source>
         <translation>Параметры сервера RPC:</translation>
     </message>
-    <message>
-        <source>Rebuild block chain index from current blk000??.dat files on startup</source>
-        <translation>Перестроить при запуске индекс цепи блоков из текущих файлов blk000??.dat</translation>
-    </message>
-    <message>
-        <source>Receive and display P2P network alerts (default: %u)</source>
-        <translation>Получать и отображать P2P сетевые тревоги (по умолчанию: %u)</translation>
-    </message>
     <message>
         <source>Reducing -maxconnections from %d to %d, because of system limitations.</source>
         <translation>Уменьшите -maxconnections с %d до %d, из-за ограничений системы.</translation>
@@ -3463,10 +2166,6 @@
         <source>Username for JSON-RPC connections</source>
         <translation>Имя для подключений JSON-RPC</translation>
     </message>
-    <message>
-        <source>Wallet needed to be rewritten: restart Bitcoin Core to complete</source>
-        <translation>Необходимо перезаписать бумажник, перезапустите Bitcoin Core для завершения операции.</translation>
-    </message>
     <message>
         <source>Warning</source>
         <translation>Внимание</translation>
@@ -3487,10 +2186,6 @@
         <source>ZeroMQ notification options:</source>
         <translation>ZeroMQ параметры оповещения:</translation>
     </message>
-    <message>
-        <source>wallet.dat corrupt, salvage failed</source>
-        <translation>wallet.dat повреждён, спасение данных не удалось</translation>
-    </message>
     <message>
         <source>Password for JSON-RPC connections</source>
         <translation>Пароль для подключений JSON-RPC</translation>
@@ -3499,10 +2194,6 @@
         <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
         <translation>Выполнить команду, когда появляется новый блок (%s в команде заменяется на хэш блока)</translation>
     </message>
-    <message>
-        <source>This help message</source>
-        <translation>Эта справка</translation>
-    </message>
     <message>
         <source>Allow DNS lookups for -addnode, -seednode and -connect</source>
         <translation>Разрешить поиск в DNS для -addnode, -seednode и -connect</translation>
@@ -3511,10 +2202,6 @@
         <source>Loading addresses...</source>
         <translation>Загрузка адресов...</translation>
     </message>
-    <message>
-        <source>Error loading wallet.dat: Wallet corrupted</source>
-        <translation>Ошибка загрузки wallet.dat: Бумажник поврежден</translation>
-    </message>
     <message>
         <source>(1 = keep tx meta data e.g. account owner and payment request information, 2 = drop tx meta data)</source>
         <translation>(1 = сохранять метаданные транзакции: например, владельца аккаунта и информацию запроса платежа; 2 = отбросить метаданные)</translation>
@@ -3531,10 +2218,6 @@
         <source>Do not keep transactions in the mempool longer than &lt;n&gt; hours (default: %u)</source>
         <translation>Не хранить транзакции в памяти дольше, чем &lt;n&gt; часов (по умолчанию %u)</translation>
     </message>
-    <message>
-        <source>Error reading wallet.dat! All keys read correctly, but transaction data or address book entries might be missing or incorrect.</source>
-        <translation>Ошибка чтения wallet.dat! Все ключи прочитаны верно, но данные транзакций или записи адресной книги могут отсутствовать или быть неправильными.</translation>
-    </message>
     <message>
         <source>Fees (in %s/kB) smaller than this are considered zero fee for transaction creation (default: %s)</source>
         <translation>Комиссии (в %s/Кб) меньшие этого значения считаются нулевыми при создании транзакций (по умолчанию: %s)</translation>
@@ -3579,6 +2262,10 @@
         <source>Username and hashed password for JSON-RPC connections. The field &lt;userpw&gt; comes in the format: &lt;USERNAME&gt;:&lt;SALT&gt;$&lt;HASH&gt;. A canonical python script is included in share/rpcuser. This option can be specified multiple times</source>
         <translation>Имя пользователя и хэш пароля для JSON-RPC соединений. Поле &lt;userpw&gt; использует формат: &lt;USERNAME&gt;:&lt;SALT&gt;$&lt;HASH&gt;. Каноничный пример скрипта на питоне включен в "share/rpcuser". Эта опция может быть указана несколько раз</translation>
     </message>
+    <message>
+        <source>Warning: Unknown block versions being mined! It's possible unknown rules are in effect</source>
+        <translation>Внимание: Получена неизвестная версия блока! Возможно неизвестные правила вступили в силу.</translation>
+    </message>
     <message>
         <source>(default: %s)</source>
         <translation>(по умолчанию: %s)</translation>
@@ -3587,14 +2274,6 @@
         <source>Always query for peer addresses via DNS lookup (default: %u)</source>
         <translation>Всегда запрашивать адреса участников с помощью DNS (по умолчанию: %u)</translation>
     </message>
-    <message>
-        <source>Error loading wallet.dat</source>
-        <translation>Ошибка при загрузке wallet.dat</translation>
-    </message>
-    <message>
-        <source>Generate coins (default: %u)</source>
-        <translation>Включить добычу монет (по умолчанию: %u)</translation>
-    </message>
     <message>
         <source>How many blocks to check at startup (default: %u, 0 = all)</source>
         <translation>Сколько блоков проверять при запуске (по умолчанию: %u, 0 = все)</translation>
@@ -3679,18 +2358,6 @@
         <source>Unknown network specified in -onlynet: '%s'</source>
         <translation>В параметре -onlynet указана неизвестная сеть: '%s'</translation>
     </message>
-    <message>
-        <source>Cannot resolve -bind address: '%s'</source>
-        <translation>Не удаётся разрешить адрес в параметре -bind: '%s'</translation>
-    </message>
-    <message>
-        <source>Cannot resolve -externalip address: '%s'</source>
-        <translation>Не удаётся разрешить адрес в параметре -externalip: '%s'</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -paytxfee=&lt;amount&gt;: '%s'</source>
-        <translation>Неверная сумма в параметре -paytxfee=&lt;кол-во&gt;: '%s'</translation>
-    </message>
     <message>
         <source>Insufficient funds</source>
         <translation>Недостаточно монет</translation>
diff --git a/src/qt/locale/bitcoin_ru_RU.ts b/src/qt/locale/bitcoin_ru_RU.ts
index 41e467e496e82..a6f9ffccbd776 100644
--- a/src/qt/locale/bitcoin_ru_RU.ts
+++ b/src/qt/locale/bitcoin_ru_RU.ts
@@ -21,10 +21,6 @@
         <source>C&amp;lose</source>
         <translation>Закрыть</translation>
     </message>
-    <message>
-        <source>&amp;Copy Address</source>
-        <translation>Копировать адрес</translation>
-    </message>
     <message>
         <source>Delete the currently selected address from the list</source>
         <translation>Удалить выбранный адрес из списка</translation>
@@ -41,14 +37,7 @@
         <source>&amp;Delete</source>
         <translation>Удалить</translation>
     </message>
-    <message>
-        <source>C&amp;hoose</source>
-        <translation>Выбрать</translation>
-    </message>
-    </context>
-<context>
-    <name>AddressTableModel</name>
-    </context>
+</context>
 <context>
     <name>AskPassphraseDialog</name>
     </context>
@@ -57,14 +46,6 @@
     </context>
 <context>
     <name>BitcoinGUI</name>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Bitcoin Core</translation>
-    </message>
-    <message>
-        <source>&amp;About Bitcoin Core</source>
-        <translation>О Bitcoin Core</translation>
-    </message>
     <message>
         <source>&amp;Command-line options</source>
         <translation>Опции командной строки</translation>
@@ -82,9 +63,6 @@
         <translation>Информация</translation>
     </message>
     </context>
-<context>
-    <name>ClientModel</name>
-    </context>
 <context>
     <name>CoinControlDialog</name>
     <message>
@@ -99,18 +77,6 @@
         <source>Confirmed</source>
         <translation>Подтвержденные</translation>
     </message>
-    <message>
-        <source>Copy address</source>
-        <translation>Копировать адрес</translation>
-    </message>
-    <message>
-        <source>yes</source>
-        <translation>Да</translation>
-    </message>
-    <message>
-        <source>no</source>
-        <translation>Нет</translation>
-    </message>
     </context>
 <context>
     <name>EditAddressDialog</name>
@@ -124,18 +90,10 @@
     </context>
 <context>
     <name>HelpMessageDialog</name>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Bitcoin Core</translation>
-    </message>
     <message>
         <source>version</source>
         <translation>версия</translation>
     </message>
-    <message>
-        <source>About Bitcoin Core</source>
-        <translation>О Bitcoin Core</translation>
-    </message>
     <message>
         <source>Command-line options</source>
         <translation>Опции командной строки</translation>
@@ -147,10 +105,6 @@
     </context>
 <context>
     <name>Intro</name>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Bitcoin Core</translation>
-    </message>
     <message>
         <source>Error</source>
         <translation>Ошибка</translation>
@@ -173,18 +127,12 @@
 <context>
     <name>OverviewPage</name>
     </context>
-<context>
-    <name>PaymentServer</name>
-    </context>
 <context>
     <name>PeerTableModel</name>
     </context>
 <context>
     <name>QObject</name>
     </context>
-<context>
-    <name>QRImageWidget</name>
-    </context>
 <context>
     <name>RPCConsole</name>
     <message>
@@ -198,13 +146,6 @@
 <context>
     <name>ReceiveRequestDialog</name>
     </context>
-<context>
-    <name>RecentRequestsTableModel</name>
-    <message>
-        <source>Date</source>
-        <translation>Дата</translation>
-    </message>
-    </context>
 <context>
     <name>SendCoinsDialog</name>
     </context>
@@ -219,68 +160,22 @@
     </context>
 <context>
     <name>SplashScreen</name>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Bitcoin Core</translation>
-    </message>
     </context>
 <context>
     <name>TrafficGraphWidget</name>
     </context>
-<context>
-    <name>TransactionDesc</name>
-    <message>
-        <source>Date</source>
-        <translation>Дата</translation>
-    </message>
-    </context>
 <context>
     <name>TransactionDescDialog</name>
     </context>
-<context>
-    <name>TransactionTableModel</name>
-    <message>
-        <source>Date</source>
-        <translation>Дата</translation>
-    </message>
-    </context>
-<context>
-    <name>TransactionView</name>
-    <message>
-        <source>Copy address</source>
-        <translation>Копировать адрес</translation>
-    </message>
-    <message>
-        <source>Confirmed</source>
-        <translation>Подтвержденные</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation>Дата</translation>
-    </message>
-    </context>
 <context>
     <name>UnitDisplayStatusBarControl</name>
     </context>
 <context>
-    <name>WalletFrame</name>
-    </context>
-<context>
-    <name>WalletModel</name>
-    </context>
-<context>
-    <name>WalletView</name>
-    <message>
-        <source>&amp;Export</source>
-        <translation>Экспорт</translation>
-    </message>
+    <name>bitcoin-core</name>
     <message>
-        <source>Export the data in the current tab to a file</source>
-        <translation>Экспортировать данные текущей вкладки в файл</translation>
+        <source>Bitcoin Core</source>
+        <translation>Bitcoin Core</translation>
     </message>
-    </context>
-<context>
-    <name>bitcoin-core</name>
     <message>
         <source>Information</source>
         <translation>Информация</translation>
diff --git a/src/qt/locale/bitcoin_sk.ts b/src/qt/locale/bitcoin_sk.ts
index 9addbdaa8a10e..e2b8a0201599b 100644
--- a/src/qt/locale/bitcoin_sk.ts
+++ b/src/qt/locale/bitcoin_sk.ts
@@ -25,10 +25,6 @@
         <source>C&amp;lose</source>
         <translation>Zatvoriť</translation>
     </message>
-    <message>
-        <source>&amp;Copy Address</source>
-        <translation>&amp;Kopírovať adresu</translation>
-    </message>
     <message>
         <source>Delete the currently selected address from the list</source>
         <translation>Vymaž vybranú adresu zo zoznamu</translation>
@@ -45,73 +41,6 @@
         <source>&amp;Delete</source>
         <translation>&amp;Zmazať</translation>
     </message>
-    <message>
-        <source>Choose the address to send coins to</source>
-        <translation>Zvoľte adresu kam poslať coins</translation>
-    </message>
-    <message>
-        <source>Choose the address to receive coins with</source>
-        <translation>Zvoľte adresu na ktorú prijať coins</translation>
-    </message>
-    <message>
-        <source>C&amp;hoose</source>
-        <translation>Vybrať</translation>
-    </message>
-    <message>
-        <source>Sending addresses</source>
-        <translation>Adresa odoslania</translation>
-    </message>
-    <message>
-        <source>Receiving addresses</source>
-        <translation>Prijímacia adresa</translation>
-    </message>
-    <message>
-        <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source>
-        <translation>Toto sú Vaše Bitcoin adresy pre posielanie platieb. Vždy skontrolujte množstvo a prijímaciu adresu pred poslaním coins.</translation>
-    </message>
-    <message>
-        <source>These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source>
-        <translation>Toto sú vaše Bitcoin adresy pre prijímanie platieb. Odporúča sa použiť novú prijímaciu adresu pre každú transakciu.</translation>
-    </message>
-    <message>
-        <source>Copy &amp;Label</source>
-        <translation>Kopírovať &amp;popis</translation>
-    </message>
-    <message>
-        <source>&amp;Edit</source>
-        <translation>&amp;Upraviť</translation>
-    </message>
-    <message>
-        <source>Export Address List</source>
-        <translation>Exportovať zoznam adries</translation>
-    </message>
-    <message>
-        <source>Comma separated file (*.csv)</source>
-        <translation>Čiarkou oddelovaný súbor (*.csv)</translation>
-    </message>
-    <message>
-        <source>Exporting Failed</source>
-        <translation>Export zlyhal</translation>
-    </message>
-    <message>
-        <source>There was an error trying to save the address list to %1. Please try again.</source>
-        <translation>Nastala chyba pri pokuse uložiť zoznam adries do %1. Skúste znovu.</translation>
-    </message>
-</context>
-<context>
-    <name>AddressTableModel</name>
-    <message>
-        <source>Label</source>
-        <translation>Popis</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>Adresa</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(bez popisu)</translation>
-    </message>
 </context>
 <context>
     <name>AskPassphraseDialog</name>
@@ -131,94 +60,6 @@
         <source>Repeat new passphrase</source>
         <translation>Zopakujte nové heslo</translation>
     </message>
-    <message>
-        <source>Encrypt wallet</source>
-        <translation>Zašifrovať peňaženku</translation>
-    </message>
-    <message>
-        <source>This operation needs your wallet passphrase to unlock the wallet.</source>
-        <translation>Táto operácia potrebuje heslo k vašej peňaženke aby ju mohla dešifrovať.</translation>
-    </message>
-    <message>
-        <source>Unlock wallet</source>
-        <translation>Odomknúť peňaženku</translation>
-    </message>
-    <message>
-        <source>This operation needs your wallet passphrase to decrypt the wallet.</source>
-        <translation>Táto operácia potrebuje heslo k vašej peňaženke na dešifrovanie peňaženky.</translation>
-    </message>
-    <message>
-        <source>Decrypt wallet</source>
-        <translation>Dešifrovať peňaženku</translation>
-    </message>
-    <message>
-        <source>Change passphrase</source>
-        <translation>Zmena hesla</translation>
-    </message>
-    <message>
-        <source>Confirm wallet encryption</source>
-        <translation>Potvrďte šifrovanie peňaženky</translation>
-    </message>
-    <message>
-        <source>Warning: If you encrypt your wallet and lose your passphrase, you will &lt;b&gt;LOSE ALL OF YOUR BITCOINS&lt;/b&gt;!</source>
-        <translation>Varovanie: Ak zašifrujete peňaženku a stratíte heslo, &lt;b&gt;STRATÍTE VŠETKY VAŠE BITCOINY&lt;/b&gt;!⏎</translation>
-    </message>
-    <message>
-        <source>Are you sure you wish to encrypt your wallet?</source>
-        <translation>Ste si istí, že si želáte zašifrovať peňaženku?</translation>
-    </message>
-    <message>
-        <source>Bitcoin Core will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source>
-        <translation>Jadro Bitcoin sa teraz ukončí pre dokončenie procesu šifrovania. Pamätaj, že šifrovanie peňaženky Ťa nemôže úplne ochrániť pred krádežou bitcoinov pomocou škodlivého software.</translation>
-    </message>
-    <message>
-        <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source>
-        <translation>DÔLEŽITÉ: Všetky doterajšie záložné kópie peňaženky ktoré ste zhotovili by mali byť nahradené novým zašifrovaným súborom s peňaženkou. Z bezpečnostných dôvodov sa predchádzajúce kópie nezašifrovanej peňaženky stanú neužitočné keď začnete používať novú zašifrovanú peňaženku.</translation>
-    </message>
-    <message>
-        <source>Warning: The Caps Lock key is on!</source>
-        <translation>Varovanie: Caps Lock je zapnutý</translation>
-    </message>
-    <message>
-        <source>Wallet encrypted</source>
-        <translation>Peňaženka zašifrovaná</translation>
-    </message>
-    <message>
-        <source>Enter the new passphrase to the wallet.&lt;br/&gt;Please use a passphrase of &lt;b&gt;ten or more random characters&lt;/b&gt;, or &lt;b&gt;eight or more words&lt;/b&gt;.</source>
-        <translation>Zadajte nové heslo k peňaženke.&lt;br/&gt;Prosím použite heslo s dĺžkou aspoň &lt;b&gt;10 alebo viac náhodných znakov&lt;/b&gt;, alebo &lt;b&gt;8 alebo viac slov&lt;/b&gt;.</translation>
-    </message>
-    <message>
-        <source>Enter the old passphrase and new passphrase to the wallet.</source>
-        <translation>Zadajte staré a nové heslo k peňaženke.</translation>
-    </message>
-    <message>
-        <source>Wallet encryption failed</source>
-        <translation>Šifrovanie peňaženky zlyhalo</translation>
-    </message>
-    <message>
-        <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
-        <translation>Šifrovanie peňaženky zlyhalo kôli internej chybe. Vaša peňaženka nebola zašifrovaná.</translation>
-    </message>
-    <message>
-        <source>The supplied passphrases do not match.</source>
-        <translation>Zadané heslá nesúhlasia.</translation>
-    </message>
-    <message>
-        <source>Wallet unlock failed</source>
-        <translation>Odomykanie peňaženky zlyhalo</translation>
-    </message>
-    <message>
-        <source>The passphrase entered for the wallet decryption was incorrect.</source>
-        <translation>Zadané heslo pre dešifrovanie peňaženky bolo nesprávne.</translation>
-    </message>
-    <message>
-        <source>Wallet decryption failed</source>
-        <translation>Zlyhalo šifrovanie peňaženky.</translation>
-    </message>
-    <message>
-        <source>Wallet passphrase was successfully changed.</source>
-        <translation>Heslo k peňaženke bolo úspešne zmenené.</translation>
-    </message>
 </context>
 <context>
     <name>BanTableModel</name>
@@ -269,6 +110,10 @@
         <source>Quit application</source>
         <translation>Ukončiť program</translation>
     </message>
+    <message>
+        <source>&amp;About %1</source>
+        <translation>&amp;O %1</translation>
+    </message>
     <message>
         <source>About &amp;Qt</source>
         <translation>O &amp;Qt</translation>
@@ -305,14 +150,6 @@
         <source>Open &amp;URI...</source>
         <translation>Otvoriť &amp;URI...</translation>
     </message>
-    <message>
-        <source>Bitcoin Core client</source>
-        <translation>Bitcoin Core klient</translation>
-    </message>
-    <message>
-        <source>Importing blocks from disk...</source>
-        <translation>Importujem bloky z disku...</translation>
-    </message>
     <message>
         <source>Reindexing blocks on disk...</source>
         <translation>Preindexúvam bloky na disku...</translation>
@@ -357,10 +194,6 @@
         <source>&amp;Receive</source>
         <translation>&amp;Prijať</translation>
     </message>
-    <message>
-        <source>Show information about Bitcoin Core</source>
-        <translation>Zobraziť informácie o Bitcoin Core</translation>
-    </message>
     <message>
         <source>&amp;Show / Hide</source>
         <translation>Zobraziť / skryť</translation>
@@ -397,22 +230,10 @@
         <source>Tabs toolbar</source>
         <translation>Lišta záložiek</translation>
     </message>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Jadro Bitcoin</translation>
-    </message>
     <message>
         <source>Request payments (generates QR codes and bitcoin: URIs)</source>
         <translation>Vyžiadať platby (vygeneruje QR kódy a bitcoin: URI)</translation>
     </message>
-    <message>
-        <source>&amp;About Bitcoin Core</source>
-        <translation>O jadre Bitcoin</translation>
-    </message>
-    <message>
-        <source>Modify configuration options for Bitcoin Core</source>
-        <translation>Upraviť možnosti nastavenia pre Jadro Bitcoin</translation>
-    </message>
     <message>
         <source>Show the list of used sending addresses and labels</source>
         <translation>Zobraziť zoznam použitých adries odosielateľa a ich popisy</translation>
@@ -429,10 +250,6 @@
         <source>&amp;Command-line options</source>
         <translation>Možnosti príkazového riadku</translation>
     </message>
-    <message>
-        <source>Show the Bitcoin Core help message to get a list with possible Bitcoin command-line options</source>
-        <translation>Zobraziť pomocnú správu od Bitcoin Jadra pre získanie zoznamu dostupných možností príkazového riadku</translation>
-    </message>
     <message numerus="yes">
         <source>%n active connection(s) to Bitcoin network</source>
         <translation><numerusform>%n aktívne pripojenie do siete Bitcoin</numerusform><numerusform>%n aktívne pripojenia do siete Bitcoin</numerusform><numerusform>%n aktívnych pripojení do siete Bitcoin</numerusform></translation>
@@ -544,13 +361,6 @@
         <translation>Peňaženka je &lt;b&gt;zašifrovaná&lt;/b&gt; a momentálne &lt;b&gt;zamknutá&lt;/b&gt;</translation>
     </message>
 </context>
-<context>
-    <name>ClientModel</name>
-    <message>
-        <source>Network Alert</source>
-        <translation>Výstraha siete</translation>
-    </message>
-</context>
 <context>
     <name>CoinControlDialog</name>
     <message>
@@ -629,150 +439,6 @@
         <source>Priority</source>
         <translation>Priorita</translation>
     </message>
-    <message>
-        <source>Copy address</source>
-        <translation>Kopírovať adresu</translation>
-    </message>
-    <message>
-        <source>Copy label</source>
-        <translation>Kopírovať popis</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>Kopírovať sumu</translation>
-    </message>
-    <message>
-        <source>Copy transaction ID</source>
-        <translation>Kopírovať ID transakcie</translation>
-    </message>
-    <message>
-        <source>Lock unspent</source>
-        <translation>Uzamknúť neminuté</translation>
-    </message>
-    <message>
-        <source>Unlock unspent</source>
-        <translation>Odomknúť neminuté</translation>
-    </message>
-    <message>
-        <source>Copy quantity</source>
-        <translation>Kopírovať množstvo</translation>
-    </message>
-    <message>
-        <source>Copy fee</source>
-        <translation>Kopírovať poplatok</translation>
-    </message>
-    <message>
-        <source>Copy after fee</source>
-        <translation>Kopírovať za poplatok</translation>
-    </message>
-    <message>
-        <source>Copy bytes</source>
-        <translation>Kopírovať bajty</translation>
-    </message>
-    <message>
-        <source>Copy priority</source>
-        <translation>Kopírovať prioritu</translation>
-    </message>
-    <message>
-        <source>Copy dust</source>
-        <translation>Kopírovať prach</translation>
-    </message>
-    <message>
-        <source>Copy change</source>
-        <translation>Kopírovať zmenu</translation>
-    </message>
-    <message>
-        <source>highest</source>
-        <translation>najvyššie</translation>
-    </message>
-    <message>
-        <source>higher</source>
-        <translation>vyššie</translation>
-    </message>
-    <message>
-        <source>high</source>
-        <translation>vysoké</translation>
-    </message>
-    <message>
-        <source>medium-high</source>
-        <translation>stredne vysoké</translation>
-    </message>
-    <message>
-        <source>medium</source>
-        <translation>stredné</translation>
-    </message>
-    <message>
-        <source>low-medium</source>
-        <translation>stredne nízke</translation>
-    </message>
-    <message>
-        <source>low</source>
-        <translation>nízke</translation>
-    </message>
-    <message>
-        <source>lower</source>
-        <translation>nižšie</translation>
-    </message>
-    <message>
-        <source>lowest</source>
-        <translation>najnižšie</translation>
-    </message>
-    <message>
-        <source>(%1 locked)</source>
-        <translation>(%1 zamknutých)</translation>
-    </message>
-    <message>
-        <source>none</source>
-        <translation>žiadne</translation>
-    </message>
-    <message>
-        <source>This label turns red if the transaction size is greater than 1000 bytes.</source>
-        <translation>Tento popis sčervenie ak veľkosť transakcie presiahne 1000 bajtov.</translation>
-    </message>
-    <message>
-        <source>This label turns red if the priority is smaller than "medium".</source>
-        <translation>Tento popis sčervenie ak je priorita nižšia ako "stredná".</translation>
-    </message>
-    <message>
-        <source>This label turns red if any recipient receives an amount smaller than %1.</source>
-        <translation>Tento popis sčervenie ak ktorýkoľvek príjemca dostane sumu menšiu ako %1.</translation>
-    </message>
-    <message>
-        <source>Can vary +/- %1 satoshi(s) per input.</source>
-        <translation>Môže sa líšiť o +/- %1 satoshi pre každý vstup</translation>
-    </message>
-    <message>
-        <source>yes</source>
-        <translation>áno</translation>
-    </message>
-    <message>
-        <source>no</source>
-        <translation>nie</translation>
-    </message>
-    <message>
-        <source>This means a fee of at least %1 per kB is required.</source>
-        <translation>To znamená že požadovaný poplatok je aspoň  %1  za kB.</translation>
-    </message>
-    <message>
-        <source>Can vary +/- 1 byte per input.</source>
-        <translation>Môže sa pohybovať +/- 1 bajt pre vstup.</translation>
-    </message>
-    <message>
-        <source>Transactions with higher priority are more likely to get included into a block.</source>
-        <translation>Transakcie s vysokou prioritou sa pravdepodobnejsie dostanú do bloku.</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(bez popisu)</translation>
-    </message>
-    <message>
-        <source>change from %1 (%2)</source>
-        <translation>zmena od %1 (%2)</translation>
-    </message>
-    <message>
-        <source>(change)</source>
-        <translation>(zmena)</translation>
-    </message>
 </context>
 <context>
     <name>EditAddressDialog</name>
@@ -796,38 +462,6 @@
         <source>&amp;Address</source>
         <translation>&amp;Adresa</translation>
     </message>
-    <message>
-        <source>New receiving address</source>
-        <translation>Nová adresa pre prijímanie</translation>
-    </message>
-    <message>
-        <source>New sending address</source>
-        <translation>Nová adresa pre odoslanie</translation>
-    </message>
-    <message>
-        <source>Edit receiving address</source>
-        <translation>Upraviť prijímacie adresy</translation>
-    </message>
-    <message>
-        <source>Edit sending address</source>
-        <translation>Upraviť odosielaciu adresu</translation>
-    </message>
-    <message>
-        <source>The entered address "%1" is already in the address book.</source>
-        <translation>Vložená adresa "%1" sa už nachádza v adresári.</translation>
-    </message>
-    <message>
-        <source>The entered address "%1" is not a valid Bitcoin address.</source>
-        <translation>Vložená adresa "%1" nieje platnou adresou bitcoin.</translation>
-    </message>
-    <message>
-        <source>Could not unlock wallet.</source>
-        <translation>Nepodarilo sa odomknúť peňaženku.</translation>
-    </message>
-    <message>
-        <source>New key generation failed.</source>
-        <translation>Generovanie nového kľúča zlyhalo.</translation>
-    </message>
 </context>
 <context>
     <name>FreespaceChecker</name>
@@ -854,10 +488,6 @@
 </context>
 <context>
     <name>HelpMessageDialog</name>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Jadro Bitcoin</translation>
-    </message>
     <message>
         <source>version</source>
         <translation>verzia</translation>
@@ -866,10 +496,6 @@
         <source>(%1-bit)</source>
         <translation>(%1-bit)</translation>
     </message>
-    <message>
-        <source>About Bitcoin Core</source>
-        <translation>O jadre Bitcoin</translation>
-    </message>
     <message>
         <source>Command-line options</source>
         <translation>Voľby príkazového riadku</translation>
@@ -906,29 +532,13 @@
         <source>Show splash screen on startup (default: %u)</source>
         <translation>Zobraziť uvítaciu obrazovku pri štarte (predvolené: %u)</translation>
     </message>
-    <message>
-        <source>Reset all settings changes made over the GUI</source>
-        <translation>Reštartovať všetky nastavenia urobené v používateľskom rozhraní.</translation>
-    </message>
-</context>
+    </context>
 <context>
     <name>Intro</name>
     <message>
         <source>Welcome</source>
         <translation>Vitajte</translation>
     </message>
-    <message>
-        <source>Welcome to Bitcoin Core.</source>
-        <translation>Vitajte v jadre Bitcoin.</translation>
-    </message>
-    <message>
-        <source>As this is the first time the program is launched, you can choose where Bitcoin Core will store its data.</source>
-        <translation>Keďže spúštate program prvý krát, môžte si vybrať kde bude Bitcoin Jadro ukladať svoje dáta.</translation>
-    </message>
-    <message>
-        <source>Bitcoin Core will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source>
-        <translation>Jadro Bitcoin stiahne zo siete a uloží kópiu Bitcoin blockchain. Aspoň %1GB dát bude uložených v tomto priečinku a časom porastie. Peňaženka bude tiež uložená v tomto priečinku.</translation>
-    </message>
     <message>
         <source>Use the default data directory</source>
         <translation>Použiť predvolený dátový adresár</translation>
@@ -937,10 +547,6 @@
         <source>Use a custom data directory:</source>
         <translation>Použiť vlastný dátový adresár:</translation>
     </message>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Jadro Bitcoin</translation>
-    </message>
     <message>
         <source>Error: Specified data directory "%1" cannot be created.</source>
         <translation>Chyba: Zadaný priečinok pre dáta "%1" nemôže byť vytvorený.</translation>
@@ -976,10 +582,6 @@
         <source>Select payment request file</source>
         <translation>Vyberte súbor s výzvou k platbe</translation>
     </message>
-    <message>
-        <source>Select payment request file to open</source>
-        <translation>Vyberte ktorý súbor s výzvou k platbe otvoriť</translation>
-    </message>
 </context>
 <context>
     <name>OptionsDialog</name>
@@ -1019,10 +621,6 @@
         <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Exit in the menu.</source>
         <translation>Minimalizovať namiesto ukončenia aplikácie keď sa okno zavrie. Keď je zvolená táto možnosť, aplikácia sa zavrie len po zvolení Ukončiť v menu.</translation>
     </message>
-    <message>
-        <source>The user interface language can be set here. This setting will take effect after restarting Bitcoin Core.</source>
-        <translation>Tu sa dá nastaviť jazyk užívateľského rozhrania. Toto nastavenie bude účinné po reštartovaní Jadra Bitcoin.</translation>
-    </message>
     <message>
         <source>Third party URLs (e.g. a block explorer) that appear in the transactions tab as context menu items. %s in the URL is replaced by transaction hash. Multiple URLs are separated by vertical bar |.</source>
         <translation>URL tretích strán (napr. prehliadač blockchain) ktoré sa zobrazujú v záložke transakcií ako položky kontextového menu. %s v URL je nahradené hash-om transakcie. Viaceré URL sú oddelené zvislou čiarou |.</translation>
@@ -1047,14 +645,6 @@
         <source>&amp;Network</source>
         <translation>&amp;Sieť</translation>
     </message>
-    <message>
-        <source>Automatically start Bitcoin Core after logging in to the system.</source>
-        <translation>Automaticky spustiť Jadro Bitcoin po prihlásení do systému</translation>
-    </message>
-    <message>
-        <source>&amp;Start Bitcoin Core on system login</source>
-        <translation>&amp;Spustiť Bitcoin pri spustení systému správy okien</translation>
-    </message>
     <message>
         <source>(0 = auto, &lt;0 = leave that many cores free)</source>
         <translation>(0 = auto, &lt;0 = nechať toľko jadier voľných)</translation>
@@ -1284,178 +874,68 @@
     </message>
 </context>
 <context>
-    <name>PaymentServer</name>
+    <name>PeerTableModel</name>
     <message>
-        <source>URI handling</source>
-        <translation>Spracovanie URI</translation>
+        <source>User Agent</source>
+        <translation>Aplikácia</translation>
     </message>
     <message>
-        <source>Invalid payment address %1</source>
-        <translation>Neplatná adresa platby %1</translation>
+        <source>Node/Service</source>
+        <translation>Uzol/Služba</translation>
     </message>
     <message>
-        <source>Payment request rejected</source>
-        <translation>Požiadavka na platbu zamietnutá</translation>
+        <source>Ping Time</source>
+        <translation>Čas odozvy</translation>
     </message>
+</context>
+<context>
+    <name>QObject</name>
     <message>
-        <source>Payment request network doesn't match client network.</source>
-        <translation>Sieť požiadavky na platbu nie je zhodná so sieťou klienta.</translation>
+        <source>Amount</source>
+        <translation>Suma</translation>
     </message>
     <message>
-        <source>Payment request is not initialized.</source>
-        <translation>Požiadavka na platbu nie je inicializovaná</translation>
+        <source>Enter a Bitcoin address (e.g. %1)</source>
+        <translation>Zadajte bitcoin adresu (napr. %1)</translation>
     </message>
     <message>
-        <source>Requested payment amount of %1 is too small (considered dust).</source>
-        <translation>Požadovaná platba sumy  %1 je príliš malá (považovaná za prach).</translation>
+        <source>%1 d</source>
+        <translation>%1 d</translation>
     </message>
     <message>
-        <source>Payment request error</source>
-        <translation>Chyba pri vyžiadaní platby</translation>
+        <source>%1 h</source>
+        <translation>%1 h</translation>
     </message>
     <message>
-        <source>Cannot start bitcoin: click-to-pay handler</source>
-        <translation>Nedá sa spustiť obslužný program bitcoin: click-to-pay zaplatiť kliknutím</translation>
+        <source>%1 m</source>
+        <translation>%1 m</translation>
     </message>
     <message>
-        <source>Payment request fetch URL is invalid: %1</source>
-        <translation>URL pre stiahnutie výzvy na zaplatenie je neplatné: %1</translation>
+        <source>%1 s</source>
+        <translation>%1 s</translation>
     </message>
     <message>
-        <source>URI cannot be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source>
-        <translation>URI sa nedá analyzovať! To môže byť spôsobené neplatnou Bitcoin adresou alebo zle upravenými vlastnosťami URI.</translation>
+        <source>None</source>
+        <translation>Žiadne</translation>
     </message>
     <message>
-        <source>Payment request file handling</source>
-        <translation>Obsluha súboru s požiadavkou na platbu</translation>
+        <source>N/A</source>
+        <translation>nie je k dispozícii</translation>
     </message>
     <message>
-        <source>Payment request file cannot be read! This can be caused by an invalid payment request file.</source>
-        <translation>Súbor s výzvou na zaplatenie sa nedá čítať alebo spracovať! To môže byť spôsobené aj neplatným súborom s výzvou.</translation>
+        <source>%1 ms</source>
+        <translation>%1 ms</translation>
     </message>
+</context>
+<context>
+    <name>RPCConsole</name>
     <message>
-        <source>Payment request expired.</source>
-        <translation>Vypršala platnosť požiadavky na platbu.</translation>
+        <source>Client name</source>
+        <translation>Meno klienta</translation>
     </message>
     <message>
-        <source>Unverified payment requests to custom payment scripts are unsupported.</source>
-        <translation>Program nepodporuje neoverené platobné výzvy na vlastná skripty.</translation>
-    </message>
-    <message>
-        <source>Invalid payment request.</source>
-        <translation>Chybná požiadavka na platbu.</translation>
-    </message>
-    <message>
-        <source>Refund from %1</source>
-        <translation>Vrátenie z  %1</translation>
-    </message>
-    <message>
-        <source>Payment request %1 is too large (%2 bytes, allowed %3 bytes).</source>
-        <translation>Požiadavka na platbu %1 je príliš veľká (%2 bajtov, povolené je %3 bajtov).</translation>
-    </message>
-    <message>
-        <source>Error communicating with %1: %2</source>
-        <translation>Chyba komunikácie s %1: %2 </translation>
-    </message>
-    <message>
-        <source>Payment request cannot be parsed!</source>
-        <translation>Požiadavka na platbu nemôže byť analyzovaná!</translation>
-    </message>
-    <message>
-        <source>Bad response from server %1</source>
-        <translation>Zlá odpoveď zo servera %1</translation>
-    </message>
-    <message>
-        <source>Payment acknowledged</source>
-        <translation>Platba potvrdená</translation>
-    </message>
-    <message>
-        <source>Network request error</source>
-        <translation>Chyba požiadavky siete</translation>
-    </message>
-</context>
-<context>
-    <name>PeerTableModel</name>
-    <message>
-        <source>User Agent</source>
-        <translation>Aplikácia</translation>
-    </message>
-    <message>
-        <source>Node/Service</source>
-        <translation>Uzol/Služba</translation>
-    </message>
-    <message>
-        <source>Ping Time</source>
-        <translation>Čas odozvy</translation>
-    </message>
-</context>
-<context>
-    <name>QObject</name>
-    <message>
-        <source>Amount</source>
-        <translation>Suma</translation>
-    </message>
-    <message>
-        <source>Enter a Bitcoin address (e.g. %1)</source>
-        <translation>Zadajte bitcoin adresu (napr. %1)</translation>
-    </message>
-    <message>
-        <source>%1 d</source>
-        <translation>%1 d</translation>
-    </message>
-    <message>
-        <source>%1 h</source>
-        <translation>%1 h</translation>
-    </message>
-    <message>
-        <source>%1 m</source>
-        <translation>%1 m</translation>
-    </message>
-    <message>
-        <source>%1 s</source>
-        <translation>%1 s</translation>
-    </message>
-    <message>
-        <source>None</source>
-        <translation>Žiadne</translation>
-    </message>
-    <message>
-        <source>N/A</source>
-        <translation>nie je k dispozícii</translation>
-    </message>
-    <message>
-        <source>%1 ms</source>
-        <translation>%1 ms</translation>
-    </message>
-</context>
-<context>
-    <name>QRImageWidget</name>
-    <message>
-        <source>&amp;Save Image...</source>
-        <translation>Uložiť obrázok...</translation>
-    </message>
-    <message>
-        <source>&amp;Copy Image</source>
-        <translation>Kopírovať obrázok</translation>
-    </message>
-    <message>
-        <source>Save QR Code</source>
-        <translation>Ukladanie QR kódu</translation>
-    </message>
-    <message>
-        <source>PNG Image (*.png)</source>
-        <translation>PNG obrázok (*.png)</translation>
-    </message>
-</context>
-<context>
-    <name>RPCConsole</name>
-    <message>
-        <source>Client name</source>
-        <translation>Meno klienta</translation>
-    </message>
-    <message>
-        <source>N/A</source>
-        <translation>nie je k dispozícii</translation>
+        <source>N/A</source>
+        <translation>nie je k dispozícii</translation>
     </message>
     <message>
         <source>Client version</source>
@@ -1513,10 +993,6 @@
         <source>Memory usage</source>
         <translation>Využitie pamäte</translation>
     </message>
-    <message>
-        <source>Open the Bitcoin Core debug log file from the current data directory. This can take a few seconds for large log files.</source>
-        <translation>Otvoriť Bitcoin log súbor pre ladenie z aktuálneho dátového adresára. Toto môže trvať niekoľko sekúnd pre veľké súbory.</translation>
-    </message>
     <message>
         <source>Received</source>
         <translation>Prijaté</translation>
@@ -1630,10 +1106,6 @@
         <source>Out:</source>
         <translation>Von:</translation>
     </message>
-    <message>
-        <source>Build date</source>
-        <translation>Dátum zostavenia</translation>
-    </message>
     <message>
         <source>Debug log file</source>
         <translation>Súbor záznamu ladenia</translation>
@@ -1670,10 +1142,6 @@
         <source>&amp;Unban Node</source>
         <translation>&amp;odblokovať uzol</translation>
     </message>
-    <message>
-        <source>Welcome to the Bitcoin Core RPC console.</source>
-        <translation>Vitajte v RPC konzole pre Jadro Bitcoin.</translation>
-    </message>
     <message>
         <source>Use up and down arrows to navigate history, and &lt;b&gt;Ctrl-L&lt;/b&gt; to clear screen.</source>
         <translation>Použi šípky hore a dolu pre navigáciu históriou a &lt;b&gt;Ctrl-L&lt;/b&gt; pre vyčistenie obrazovky.</translation>
@@ -1801,18 +1269,6 @@
         <source>Remove</source>
         <translation>Odstrániť</translation>
     </message>
-    <message>
-        <source>Copy label</source>
-        <translation>Kopírovať popis</translation>
-    </message>
-    <message>
-        <source>Copy message</source>
-        <translation>Kopírovať správu</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>Kopírovať sumu</translation>
-    </message>
 </context>
 <context>
     <name>ReceiveRequestDialog</name>
@@ -1832,73 +1288,6 @@
         <source>&amp;Save Image...</source>
         <translation>Uložiť obrázok...</translation>
     </message>
-    <message>
-        <source>Request payment to %1</source>
-        <translation>Vyžiadať platbu pre %1</translation>
-    </message>
-    <message>
-        <source>Payment information</source>
-        <translation>Informácia o platbe</translation>
-    </message>
-    <message>
-        <source>URI</source>
-        <translation>URI</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>Adresa</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>Suma</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Popis</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>Správa</translation>
-    </message>
-    <message>
-        <source>Resulting URI too long, try to reduce the text for label / message.</source>
-        <translation>Výsledné URI príliš dlhé, skráť text pre názov / správu.</translation>
-    </message>
-    <message>
-        <source>Error encoding URI into QR Code.</source>
-        <translation>Chyba v zakódovaní URI do QR kódu</translation>
-    </message>
-</context>
-<context>
-    <name>RecentRequestsTableModel</name>
-    <message>
-        <source>Date</source>
-        <translation>Dátum</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Popis</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>Správa</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>Suma</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(bez popisu)</translation>
-    </message>
-    <message>
-        <source>(no message)</source>
-        <translation>(žiadna správa)</translation>
-    </message>
-    <message>
-        <source>(no amount)</source>
-        <translation>(žiadna suma)</translation>
-    </message>
 </context>
 <context>
     <name>SendCoinsDialog</name>
@@ -2018,14 +1407,6 @@
         <source>fast</source>
         <translation>rýchle</translation>
     </message>
-    <message>
-        <source>Send as zero-fee transaction if possible</source>
-        <translation>Poslať ako transakciu bez poplatku, ak je to možné</translation>
-    </message>
-    <message>
-        <source>(confirmation may take longer)</source>
-        <translation>(potvrdenie môže trvať dlhšie)</translation>
-    </message>
     <message>
         <source>Send to multiple recipients at once</source>
         <translation>Poslať viacerým príjemcom naraz</translation>
@@ -2058,114 +1439,6 @@
         <source>S&amp;end</source>
         <translation>&amp;Odoslať</translation>
     </message>
-    <message>
-        <source>Confirm send coins</source>
-        <translation>Potvrdiť odoslanie bitcoins</translation>
-    </message>
-    <message>
-        <source>%1 to %2</source>
-        <translation>%1 do %2</translation>
-    </message>
-    <message>
-        <source>Copy quantity</source>
-        <translation>Kopírovať množstvo</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>Kopírovať sumu</translation>
-    </message>
-    <message>
-        <source>Copy fee</source>
-        <translation>Kopírovať poplatok</translation>
-    </message>
-    <message>
-        <source>Copy after fee</source>
-        <translation>Kopírovať za poplatok</translation>
-    </message>
-    <message>
-        <source>Copy bytes</source>
-        <translation>Kopírovať bajty</translation>
-    </message>
-    <message>
-        <source>Copy priority</source>
-        <translation>Kopírovať prioritu</translation>
-    </message>
-    <message>
-        <source>Copy change</source>
-        <translation>Kopírovať zmenu</translation>
-    </message>
-    <message>
-        <source>Total Amount %1</source>
-        <translation>Celkové množstvo %1</translation>
-    </message>
-    <message>
-        <source>or</source>
-        <translation>alebo</translation>
-    </message>
-    <message>
-        <source>The amount to pay must be larger than 0.</source>
-        <translation>Suma na úhradu musí byť väčšia ako 0.</translation>
-    </message>
-    <message>
-        <source>The amount exceeds your balance.</source>
-        <translation>Suma je vyššia ako Váš zostatok.</translation>
-    </message>
-    <message>
-        <source>The total exceeds your balance when the %1 transaction fee is included.</source>
-        <translation>Suma celkom prevyšuje Váš zostatok ak sú započítané %1 transakčné poplatky.</translation>
-    </message>
-    <message>
-        <source>Transaction creation failed!</source>
-        <translation>Vytvorenie transakcie zlyhalo!</translation>
-    </message>
-    <message>
-        <source>The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source>
-        <translation>Transakcia bola zamietnutá! Toto sa môže stať ak niektoré coins vo vašej peňaženke už boli minuté, ako keď použijete kópiu wallet.dat a coins boli minuté z kópie ale neoznačené ako minuté tu.</translation>
-    </message>
-    <message>
-        <source>A fee higher than %1 is considered an absurdly high fee.</source>
-        <translation>Poplatok vyšší ako %1 je považovaný za šialene vysoký.</translation>
-    </message>
-    <message>
-        <source>Payment request expired.</source>
-        <translation>Vypršala platnosť požiadavky na platbu.</translation>
-    </message>
-    <message>
-        <source>Pay only the required fee of %1</source>
-        <translation>Zaplatiť len vyžadovaný poplatok z %1</translation>
-    </message>
-    <message>
-        <source>The recipient address is not valid. Please recheck.</source>
-        <translation>Adresa príjemcu je neplatná. Prosím, overte ju.</translation>
-    </message>
-    <message>
-        <source>Duplicate address found: addresses should only be used once each.</source>
-        <translation>Našla sa duplicitná adresa: každú adresu je možné použiť len raz.</translation>
-    </message>
-    <message>
-        <source>Warning: Invalid Bitcoin address</source>
-        <translation>Varovanie: Nesprávna Bitcoin adresa</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(bez popisu)</translation>
-    </message>
-    <message>
-        <source>Warning: Unknown change address</source>
-        <translation>Varovanie: Neznáma adresa pre výdavok</translation>
-    </message>
-    <message>
-        <source>Copy dust</source>
-        <translation>Kopírovať prach</translation>
-    </message>
-    <message>
-        <source>Are you sure you want to send?</source>
-        <translation>Určite to chcete odoslať?</translation>
-    </message>
-    <message>
-        <source>added as transaction fee</source>
-        <translation>pridané ako transakčný poplatok</translation>
-    </message>
 </context>
 <context>
     <name>SendCoinsEntry</name>
@@ -2177,10 +1450,6 @@
         <source>Pay &amp;To:</source>
         <translation>Zapla&amp;tiť:</translation>
     </message>
-    <message>
-        <source>Enter a label for this address to add it to your address book</source>
-        <translation>Vložte popis pre túto adresu aby sa pridala do adresára</translation>
-    </message>
     <message>
         <source>&amp;Label:</source>
         <translation>&amp;Popis:</translation>
@@ -2252,10 +1521,6 @@
 </context>
 <context>
     <name>ShutdownWindow</name>
-    <message>
-        <source>Bitcoin Core is shutting down...</source>
-        <translation>Jadro Bitcoin sa ukončuje...</translation>
-    </message>
     <message>
         <source>Do not shut down the computer until this window disappears.</source>
         <translation>Nevypínajte počítač kým toto okno nezmizne.</translation>
@@ -2339,594 +1604,84 @@
         <source>Reset all verify message fields</source>
         <translation>Obnoviť všetky polia v overiť správu</translation>
     </message>
+</context>
+<context>
+    <name>SplashScreen</name>
     <message>
-        <source>Click "Sign Message" to generate signature</source>
-        <translation>Kliknite "Podpísať Správu" na získanie podpisu</translation>
+        <source>[testnet]</source>
+        <translation>[testovacia sieť]</translation>
     </message>
+</context>
+<context>
+    <name>TrafficGraphWidget</name>
     <message>
-        <source>The entered address is invalid.</source>
-        <translation>Zadaná adresa je neplatná.</translation>
+        <source>KB/s</source>
+        <translation>KB/s</translation>
     </message>
+</context>
+<context>
+    <name>TransactionDescDialog</name>
     <message>
-        <source>Please check the address and try again.</source>
-        <translation>Prosím skontrolujte adresu a skúste znova.</translation>
+        <source>This pane shows a detailed description of the transaction</source>
+        <translation>Táto časť obrazovky zobrazuje detailný popis transakcie</translation>
     </message>
+</context>
+<context>
+    <name>UnitDisplayStatusBarControl</name>
     <message>
-        <source>The entered address does not refer to a key.</source>
-        <translation>Vložená adresa nezodpovedá žiadnemu kľúcu.</translation>
+        <source>Unit to show amounts in. Click to select another unit.</source>
+        <translation>Jednotka pre zobrazovanie súm. Kliknite pre zvolenie inej jednotky.</translation>
     </message>
+</context>
+<context>
+    <name>bitcoin-core</name>
     <message>
-        <source>Wallet unlock was cancelled.</source>
-        <translation>Odomknutie peňaženky bolo zrušené.</translation>
+        <source>Options:</source>
+        <translation>Možnosti:</translation>
     </message>
     <message>
-        <source>Private key for the entered address is not available.</source>
-        <translation>Súkromný kľúč pre vložená adresu nieje k dispozícii.</translation>
+        <source>Specify data directory</source>
+        <translation>Určiť priečinok s dátami</translation>
     </message>
     <message>
-        <source>Message signing failed.</source>
-        <translation>Podpísanie správy zlyhalo.</translation>
+        <source>Connect to a node to retrieve peer addresses, and disconnect</source>
+        <translation>Pripojiť sa k uzlu, získať adresy ďalších počítačov v sieti a odpojiť sa</translation>
     </message>
     <message>
-        <source>Message signed.</source>
-        <translation>Správa podpísaná.</translation>
+        <source>Specify your own public address</source>
+        <translation>Určite vašu vlastnú verejnú adresu</translation>
     </message>
     <message>
-        <source>The signature could not be decoded.</source>
-        <translation>Podpis nie je možné dekódovať.</translation>
+        <source>Accept command line and JSON-RPC commands</source>
+        <translation>Prijímať príkazy z príkazového riadku a JSON-RPC</translation>
     </message>
     <message>
-        <source>Please check the signature and try again.</source>
-        <translation>Prosím skontrolujte podpis a skúste znova.</translation>
+        <source>Error: A fatal internal error occurred, see debug.log for details</source>
+        <translation>Chyba: Vyskytla sa interná chyba, pre viac informácií zobrazte debug.log</translation>
     </message>
     <message>
-        <source>The signature did not match the message digest.</source>
-        <translation>Podpis sa nezhoduje so zhrnutím správy</translation>
+        <source>Fee (in %s/kB) to add to transactions you send (default: %s)</source>
+        <translation>Poplatok (za %s/kB) pridaný do tranzakcie, ktorú posielate (predvolené: %s)</translation>
     </message>
     <message>
-        <source>Message verification failed.</source>
-        <translation>Overenie správy zlyhalo.</translation>
+        <source>Pruning blockstore...</source>
+        <translation>Redukovanie blockstore...</translation>
     </message>
     <message>
-        <source>Message verified.</source>
-        <translation>Správa overená.</translation>
+        <source>Run in the background as a daemon and accept commands</source>
+        <translation>Bežať na pozadí ako démon a prijímať príkazy</translation>
     </message>
-</context>
-<context>
-    <name>SplashScreen</name>
     <message>
-        <source>Bitcoin Core</source>
-        <translation>Jadro Bitcoin</translation>
+        <source>Unable to start HTTP server. See debug log for details.</source>
+        <translation>Nepodarilo sa spustiť HTTP server. Pre viac detailov zobrazte debug log.</translation>
     </message>
     <message>
-        <source>The Bitcoin Core developers</source>
-        <translation>Vývojári jadra Bitcoin</translation>
+        <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
+        <translation>Prijať spojenia zvonku (predvolené: 1 ak žiadne -proxy alebo -connect)</translation>
     </message>
     <message>
-        <source>[testnet]</source>
-        <translation>[testovacia sieť]</translation>
-    </message>
-</context>
-<context>
-    <name>TrafficGraphWidget</name>
-    <message>
-        <source>KB/s</source>
-        <translation>KB/s</translation>
-    </message>
-</context>
-<context>
-    <name>TransactionDesc</name>
-    <message>
-        <source>Open until %1</source>
-        <translation>Otvorené do %1</translation>
-    </message>
-    <message>
-        <source>conflicted</source>
-        <translation>sporné</translation>
-    </message>
-    <message>
-        <source>%1/offline</source>
-        <translation>%1/offline</translation>
-    </message>
-    <message>
-        <source>%1/unconfirmed</source>
-        <translation>%1/nepotvrdené</translation>
-    </message>
-    <message>
-        <source>%1 confirmations</source>
-        <translation>%1 potvrdení</translation>
-    </message>
-    <message>
-        <source>Status</source>
-        <translation>Stav</translation>
-    </message>
-    <message numerus="yes">
-        <source>, broadcast through %n node(s)</source>
-        <translation><numerusform>, vysielať cez %n uzol</numerusform><numerusform>, vysielať cez %n uzle</numerusform><numerusform>, vysielať cez %n uzolov</numerusform></translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation>Dátum</translation>
-    </message>
-    <message>
-        <source>Source</source>
-        <translation>Zdroj</translation>
-    </message>
-    <message>
-        <source>Generated</source>
-        <translation>Vygenerované</translation>
-    </message>
-    <message>
-        <source>From</source>
-        <translation>od</translation>
-    </message>
-    <message>
-        <source>To</source>
-        <translation>Pre</translation>
-    </message>
-    <message>
-        <source>own address</source>
-        <translation>vlastná adresa</translation>
-    </message>
-    <message>
-        <source>watch-only</source>
-        <translation>Iba sledovanie</translation>
-    </message>
-    <message>
-        <source>label</source>
-        <translation>popis</translation>
-    </message>
-    <message>
-        <source>Credit</source>
-        <translation>Kredit</translation>
-    </message>
-    <message>
-        <source>not accepted</source>
-        <translation>neprijaté</translation>
-    </message>
-    <message>
-        <source>Debit</source>
-        <translation>Debet</translation>
-    </message>
-    <message>
-        <source>Total debit</source>
-        <translation>Debit spolu</translation>
-    </message>
-    <message>
-        <source>Total credit</source>
-        <translation>Kredit spolu</translation>
-    </message>
-    <message>
-        <source>Transaction fee</source>
-        <translation>Transakčný poplatok</translation>
-    </message>
-    <message>
-        <source>Net amount</source>
-        <translation>Suma netto</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>Správa</translation>
-    </message>
-    <message>
-        <source>Comment</source>
-        <translation>Komentár</translation>
-    </message>
-    <message>
-        <source>Transaction ID</source>
-        <translation>ID transakcie</translation>
-    </message>
-    <message>
-        <source>Merchant</source>
-        <translation>Kupec</translation>
-    </message>
-    <message>
-        <source>Generated coins must mature %1 blocks before they can be spent. When you generated this block, it was broadcast to the network to be added to the block chain. If it fails to get into the chain, its state will change to "not accepted" and it won't be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source>
-        <translation>Vygenerované mince musia dospieť %1 blokov kým môžu byť minuté. Keď vytvoríte tento blok, bude rozoslaný do siete aby bol akceptovaný do reťaze blokov. Ak sa nedostane do reťazca, jeho stav sa zmení na "zamietnutý" a nebude sa dať minúť. Toto sa môže občas stať ak iný uzol vytvorí blok približne v rovnakom čase.</translation>
-    </message>
-    <message>
-        <source>Debug information</source>
-        <translation>Ladiace informácie</translation>
-    </message>
-    <message>
-        <source>Transaction</source>
-        <translation>Transakcie</translation>
-    </message>
-    <message>
-        <source>Inputs</source>
-        <translation>Vstupy</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>Suma</translation>
-    </message>
-    <message>
-        <source>true</source>
-        <translation>pravda</translation>
-    </message>
-    <message>
-        <source>false</source>
-        <translation>nepravda</translation>
-    </message>
-    <message>
-        <source>, has not been successfully broadcast yet</source>
-        <translation>, ešte nebola úspešne odoslaná</translation>
-    </message>
-    <message numerus="yes">
-        <source>Open for %n more block(s)</source>
-        <translation><numerusform>Otvorené pre %n ďalší blok</numerusform><numerusform>Otvorené pre %n ďalšie bloky</numerusform><numerusform>Otvorené pre %n ďalších blokov</numerusform></translation>
-    </message>
-    <message>
-        <source>unknown</source>
-        <translation>neznámy</translation>
-    </message>
-</context>
-<context>
-    <name>TransactionDescDialog</name>
-    <message>
-        <source>Transaction details</source>
-        <translation>Detaily transakcie</translation>
-    </message>
-    <message>
-        <source>This pane shows a detailed description of the transaction</source>
-        <translation>Táto časť obrazovky zobrazuje detailný popis transakcie</translation>
-    </message>
-</context>
-<context>
-    <name>TransactionTableModel</name>
-    <message>
-        <source>Date</source>
-        <translation>Dátum</translation>
-    </message>
-    <message>
-        <source>Type</source>
-        <translation>Typ</translation>
-    </message>
-    <message>
-        <source>Immature (%1 confirmations, will be available after %2)</source>
-        <translation>Nezrelé (%1 potvrdení, bude k dispozícii po %2)</translation>
-    </message>
-    <message numerus="yes">
-        <source>Open for %n more block(s)</source>
-        <translation><numerusform>Otvorené pre %n ďalší blok</numerusform><numerusform>Otvorené pre %n ďalšie bloky</numerusform><numerusform>Otvorené pre %n ďalších blokov</numerusform></translation>
-    </message>
-    <message>
-        <source>Open until %1</source>
-        <translation>Otvorené do %1</translation>
-    </message>
-    <message>
-        <source>Confirmed (%1 confirmations)</source>
-        <translation>Potvrdené (%1 potvrdení)</translation>
-    </message>
-    <message>
-        <source>This block was not received by any other nodes and will probably not be accepted!</source>
-        <translation>Ten blok nebol prijatý žiadnou inou nódou a pravdepodobne nebude akceptovaný!</translation>
-    </message>
-    <message>
-        <source>Generated but not accepted</source>
-        <translation>Vygenerované ale neakceptované</translation>
-    </message>
-    <message>
-        <source>Offline</source>
-        <translation>Offline</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Popis</translation>
-    </message>
-    <message>
-        <source>Unconfirmed</source>
-        <translation>Nepotvrdené</translation>
-    </message>
-    <message>
-        <source>Confirming (%1 of %2 recommended confirmations)</source>
-        <translation> Potvrdzuje sa ( %1 z  %2 odporúčaných potvrdení)</translation>
-    </message>
-    <message>
-        <source>Conflicted</source>
-        <translation>V rozpore</translation>
-    </message>
-    <message>
-        <source>Received with</source>
-        <translation>Prijaté s</translation>
-    </message>
-    <message>
-        <source>Received from</source>
-        <translation>Prijaté od:</translation>
-    </message>
-    <message>
-        <source>Sent to</source>
-        <translation>Odoslané na</translation>
-    </message>
-    <message>
-        <source>Payment to yourself</source>
-        <translation>Platba sebe samému</translation>
-    </message>
-    <message>
-        <source>Mined</source>
-        <translation>Vyťažené</translation>
-    </message>
-    <message>
-        <source>watch-only</source>
-        <translation>Iba sledovanie</translation>
-    </message>
-    <message>
-        <source>(n/a)</source>
-        <translation>(n/a)</translation>
-    </message>
-    <message>
-        <source>Transaction status. Hover over this field to show number of confirmations.</source>
-        <translation>Status transakcie. Pohybujte myšou nad týmto poľom a zjaví sa počet potvrdení.</translation>
-    </message>
-    <message>
-        <source>Date and time that the transaction was received.</source>
-        <translation>Dátum a čas prijatia transakcie.</translation>
-    </message>
-    <message>
-        <source>Type of transaction.</source>
-        <translation>Typ transakcie.</translation>
-    </message>
-    <message>
-        <source>Whether or not a watch-only address is involved in this transaction.</source>
-        <translation>Či sú ale nie sú, adresy iba na sledovanie zahrnuté v tejto transakcii.</translation>
-    </message>
-    <message>
-        <source>Amount removed from or added to balance.</source>
-        <translation>Suma pridaná alebo odobraná k zostatku.</translation>
-    </message>
-</context>
-<context>
-    <name>TransactionView</name>
-    <message>
-        <source>All</source>
-        <translation>Všetko</translation>
-    </message>
-    <message>
-        <source>Today</source>
-        <translation>Dnes</translation>
-    </message>
-    <message>
-        <source>This week</source>
-        <translation>Tento týždeň</translation>
-    </message>
-    <message>
-        <source>This month</source>
-        <translation>Tento mesiac</translation>
-    </message>
-    <message>
-        <source>Last month</source>
-        <translation>Minulý mesiac</translation>
-    </message>
-    <message>
-        <source>This year</source>
-        <translation>Tento rok</translation>
-    </message>
-    <message>
-        <source>Range...</source>
-        <translation>Rozsah...</translation>
-    </message>
-    <message>
-        <source>Received with</source>
-        <translation>Prijaté s</translation>
-    </message>
-    <message>
-        <source>Sent to</source>
-        <translation>Odoslané na</translation>
-    </message>
-    <message>
-        <source>To yourself</source>
-        <translation>Samému sebe</translation>
-    </message>
-    <message>
-        <source>Mined</source>
-        <translation>Vyťažené</translation>
-    </message>
-    <message>
-        <source>Other</source>
-        <translation>Iné</translation>
-    </message>
-    <message>
-        <source>Enter address or label to search</source>
-        <translation>Vložte adresu alebo popis pre vyhľadávanie</translation>
-    </message>
-    <message>
-        <source>Min amount</source>
-        <translation>Min množstvo</translation>
-    </message>
-    <message>
-        <source>Copy address</source>
-        <translation>Kopírovať adresu</translation>
-    </message>
-    <message>
-        <source>Copy label</source>
-        <translation>Kopírovať popis</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>Kopírovať sumu</translation>
-    </message>
-    <message>
-        <source>Copy transaction ID</source>
-        <translation>Kopírovať ID transakcie</translation>
-    </message>
-    <message>
-        <source>Copy raw transaction</source>
-        <translation>Kopírovať celú tranzakciu</translation>
-    </message>
-    <message>
-        <source>Edit label</source>
-        <translation>Editovať popis</translation>
-    </message>
-    <message>
-        <source>Show transaction details</source>
-        <translation>Zobraziť podrobnosti transakcie</translation>
-    </message>
-    <message>
-        <source>Export Transaction History</source>
-        <translation>Exportovať históriu transakcií</translation>
-    </message>
-    <message>
-        <source>Watch-only</source>
-        <translation>Iba sledovanie</translation>
-    </message>
-    <message>
-        <source>Exporting Failed</source>
-        <translation>Export zlyhal</translation>
-    </message>
-    <message>
-        <source>There was an error trying to save the transaction history to %1.</source>
-        <translation>Vyskytla sa chyba pri pokuse o uloženie histórie transakcií do %1.</translation>
-    </message>
-    <message>
-        <source>Exporting Successful</source>
-        <translation>Export úspešný</translation>
-    </message>
-    <message>
-        <source>The transaction history was successfully saved to %1.</source>
-        <translation>História transakciá bola úspešne uložená do %1.</translation>
-    </message>
-    <message>
-        <source>Comma separated file (*.csv)</source>
-        <translation>Čiarkou oddelovaný súbor (*.csv)</translation>
-    </message>
-    <message>
-        <source>Confirmed</source>
-        <translation>Potvrdené</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation>Dátum</translation>
-    </message>
-    <message>
-        <source>Type</source>
-        <translation>Typ</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Popis</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>Adresa</translation>
-    </message>
-    <message>
-        <source>ID</source>
-        <translation>ID</translation>
-    </message>
-    <message>
-        <source>Range:</source>
-        <translation>Rozsah:</translation>
-    </message>
-    <message>
-        <source>to</source>
-        <translation>do</translation>
-    </message>
-</context>
-<context>
-    <name>UnitDisplayStatusBarControl</name>
-    <message>
-        <source>Unit to show amounts in. Click to select another unit.</source>
-        <translation>Jednotka pre zobrazovanie súm. Kliknite pre zvolenie inej jednotky.</translation>
-    </message>
-</context>
-<context>
-    <name>WalletFrame</name>
-    <message>
-        <source>No wallet has been loaded.</source>
-        <translation>Nie je načítaná peňaženka.</translation>
-    </message>
-</context>
-<context>
-    <name>WalletModel</name>
-    <message>
-        <source>Send Coins</source>
-        <translation>Poslať Bitcoins</translation>
-    </message>
-</context>
-<context>
-    <name>WalletView</name>
-    <message>
-        <source>&amp;Export</source>
-        <translation>&amp;Exportovať...</translation>
-    </message>
-    <message>
-        <source>Export the data in the current tab to a file</source>
-        <translation>Exportovať tento náhľad do súboru</translation>
-    </message>
-    <message>
-        <source>Backup Wallet</source>
-        <translation>Zálohovať peňaženku</translation>
-    </message>
-    <message>
-        <source>Wallet Data (*.dat)</source>
-        <translation>Údaje peňaženky (*.dat)</translation>
-    </message>
-    <message>
-        <source>Backup Failed</source>
-        <translation>Záloha zlyhala</translation>
-    </message>
-    <message>
-        <source>There was an error trying to save the wallet data to %1.</source>
-        <translation>Vyskytla sa chyba pri pokuse o uloženie dát peňaženky do %1.</translation>
-    </message>
-    <message>
-        <source>The wallet data was successfully saved to %1.</source>
-        <translation>Dáta peňaženky boli úspešne uložené do %1.</translation>
-    </message>
-    <message>
-        <source>Backup Successful</source>
-        <translation>Záloha úspešná</translation>
-    </message>
-</context>
-<context>
-    <name>bitcoin-core</name>
-    <message>
-        <source>Options:</source>
-        <translation>Možnosti:</translation>
-    </message>
-    <message>
-        <source>Specify data directory</source>
-        <translation>Určiť priečinok s dátami</translation>
-    </message>
-    <message>
-        <source>Connect to a node to retrieve peer addresses, and disconnect</source>
-        <translation>Pripojiť sa k uzlu, získať adresy ďalších počítačov v sieti a odpojiť sa</translation>
-    </message>
-    <message>
-        <source>Specify your own public address</source>
-        <translation>Určite vašu vlastnú verejnú adresu</translation>
-    </message>
-    <message>
-        <source>Accept command line and JSON-RPC commands</source>
-        <translation>Prijímať príkazy z príkazového riadku a JSON-RPC</translation>
-    </message>
-    <message>
-        <source>Please check that your computer's date and time are correct! If your clock is wrong Bitcoin Core will not work properly.</source>
-        <translation>Skontrolujte správnosť nastavenia dátumu a času na vašom počítači! Ak je čas nesprávny Jadro Bitcoin nebude správne fungovať.</translation>
-    </message>
-    <message>
-        <source>Error: A fatal internal error occurred, see debug.log for details</source>
-        <translation>Chyba: Vyskytla sa interná chyba, pre viac informácií zobrazte debug.log</translation>
-    </message>
-    <message>
-        <source>Fee (in %s/kB) to add to transactions you send (default: %s)</source>
-        <translation>Poplatok (za %s/kB) pridaný do tranzakcie, ktorú posielate (predvolené: %s)</translation>
-    </message>
-    <message>
-        <source>Pruning blockstore...</source>
-        <translation>Redukovanie blockstore...</translation>
-    </message>
-    <message>
-        <source>Run in the background as a daemon and accept commands</source>
-        <translation>Bežať na pozadí ako démon a prijímať príkazy</translation>
-    </message>
-    <message>
-        <source>Unable to start HTTP server. See debug log for details.</source>
-        <translation>Nepodarilo sa spustiť HTTP server. Pre viac detailov zobrazte debug log.</translation>
-    </message>
-    <message>
-        <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
-        <translation>Prijať spojenia zvonku (predvolené: 1 ak žiadne -proxy alebo -connect)</translation>
+        <source>Bitcoin Core</source>
+        <translation>Jadro Bitcoin</translation>
     </message>
     <message>
         <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source>
@@ -2952,10 +1707,6 @@
         <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
         <translation>Toto je pred-testovacia verzia - použitie je na vlastné riziko - nepoužívajte na tvorbu bitcoin ani obchodovanie.</translation>
     </message>
-    <message>
-        <source>Unable to bind to %s on this computer. Bitcoin Core is probably already running.</source>
-        <translation>Nepodarilo sa pripojiť na %s na tomto počítači. Bitcoin Jadro je už pravdepodobne spustené.</translation>
-    </message>
     <message>
         <source>WARNING: abnormally high number of blocks generated, %d blocks received in the last %d hours (%d expected)</source>
         <translation>VAROVANIE: príliš veľa vygenerovaných blokov; %d prijatých blokov v posledných %d hodinách (očakávaných %d)</translation>
@@ -2974,10 +1725,6 @@ The network does not appear to fully agree! Some miners appear to be experiencin
         <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source>
         <translation>Varovanie: Zjavne sa úplne nezhodujeme s našimi peer-mi! Možno potrebujete prejsť na novšiu verziu alebo ostatné uzly potrebujú vyššiu verziu.</translation>
     </message>
-    <message>
-        <source>Warning: wallet.dat corrupt, data salvaged! Original wallet.dat saved as wallet.{timestamp}.bak in %s; if your balance or transactions are incorrect you should restore from a backup.</source>
-        <translation>Varovanie: wallet.dat je poškodený, údaje úspešne získané! Pôvodný wallet.dat uložený ako wallet.{timestamp}.bak v %s; ak váš zostatok alebo transakcie niesu správne, mali by ste súbor obnoviť zo zálohy.</translation>
-    </message>
     <message>
         <source>Whitelist peers connecting from the given netmask or IP address. Can be specified multiple times.</source>
         <translation>Uzle na zoznam povolených, ktoré sa pripájajú z danej netmask alebo IP adresy. Môže byť zadané viac krát.</translation>
@@ -3038,6 +1785,18 @@ The network does not appear to fully agree! Some miners appear to be experiencin
         <source>Error initializing wallet database environment %s!</source>
         <translation>Chyba spustenia databázového prostredia peňaženky %s!</translation>
     </message>
+    <message>
+        <source>Error loading %s</source>
+        <translation>Chyba načítania %s</translation>
+    </message>
+    <message>
+        <source>Error loading %s: Wallet corrupted</source>
+        <translation>Chyba načítania %s: Peňaženka je poškodená</translation>
+    </message>
+    <message>
+        <source>Error loading %s: Wallet requires newer version of %s</source>
+        <translation>Chyba načítania %s: Peňaženka vyžaduje novšiu verziu %s</translation>
+    </message>
     <message>
         <source>Error loading block database</source>
         <translation>Chyba načítania databázy blokov</translation>
@@ -3066,10 +1825,18 @@ The network does not appear to fully agree! Some miners appear to be experiencin
         <source>Invalid -onion address: '%s'</source>
         <translation>Neplatná -onion adresa:  '%s'</translation>
     </message>
+    <message>
+        <source>Invalid amount for -%s=&lt;amount&gt;: '%s'</source>
+        <translation>Neplatná suma pre -%s=&lt;amount&gt;: '%s'</translation>
+    </message>
     <message>
         <source>Invalid amount for -fallbackfee=&lt;amount&gt;: '%s'</source>
         <translation>Neplatná suma pre -fallbackfee=&lt;amount&gt;: '%s'</translation>
     </message>
+    <message>
+        <source>Loading banlist...</source>
+        <translation>Načítavam banlist...</translation>
+    </message>
     <message>
         <source>Not enough file descriptors available.</source>
         <translation>Nedostatok kľúčových slov súboru.</translation>
@@ -3130,10 +1897,6 @@ The network does not appear to fully agree! Some miners appear to be experiencin
         <source>Wallet options:</source>
         <translation>Voľby peňaženky:</translation>
     </message>
-    <message>
-        <source>You need to rebuild the database using -reindex to change -txindex</source>
-        <translation>Potrebujete prebudovať databázu použitím -reindex zmeniť -txindex</translation>
-    </message>
     <message>
         <source>Allow JSON-RPC connections from specified source. Valid for &lt;ip&gt; are a single IP (e.g. 1.2.3.4), a network/netmask (e.g. 1.2.3.4/255.255.255.0) or a network/CIDR (e.g. 1.2.3.4/24). This option can be specified multiple times</source>
         <translation>Povoliť JSON-RPC pripojenia zo zadaného zdroja. Pre &lt;ip&gt; sú platné jednoduché IP (napr. 1.2.3.4), sieť/netmask (napr. 1.2.3.4/255.255.255.0) alebo sieť/CIDR (napr. 1.2.3.4/24). Táto možnosť môže byť zadaná niekoľko krát</translation>
@@ -3146,10 +1909,6 @@ The network does not appear to fully agree! Some miners appear to be experiencin
         <source>Bind to given address to listen for JSON-RPC connections. Use [host]:port notation for IPv6. This option can be specified multiple times (default: bind to all interfaces)</source>
         <translation>Spojiť s danou adresou pre počúvanie JSON-RPC spojení. Použite zápis [host]:port pre IPv6. Táto možnosť môže byt zadaná niekoľko krát (predvolené: spojiť so všetkými rozhraniami)</translation>
     </message>
-    <message>
-        <source>Cannot obtain a lock on data directory %s. Bitcoin Core is probably already running.</source>
-        <translation>Neviem uzamknúť data adresár %s. Jadro Bitcoin je pravdepodobne už spustené.</translation>
-    </message>
     <message>
         <source>Create new files with system default permissions, instead of umask 077 (only effective with disabled wallet functionality)</source>
         <translation>Vytvoriť nové súbory z predvolenými systémovými právami, namiesto umask 077 (funguje iba z vypnutou funkcionalitou peňaženky)</translation>
@@ -3186,10 +1945,6 @@ The network does not appear to fully agree! Some miners appear to be experiencin
         <source>Set maximum size of high-priority/low-fee transactions in bytes (default: %d)</source>
         <translation>Nastaviť najväčšiu veľkosť vysoká-dôležitosť/nízke-poplatky transakcií v bajtoch (prednastavené: %d)</translation>
     </message>
-    <message>
-        <source>Set the number of threads for coin generation if enabled (-1 = all cores, default: %d)</source>
-        <translation>Nastaviť počet vlákien pre generáciu mincí (-1 = všetky jadrá, predvolené: %d)</translation>
-    </message>
     <message>
         <source>The transaction amount is too small to send after the fee has been deducted</source>
         <translation>Suma je príliš malá pre odoslanie tranzakcie</translation>
@@ -3210,34 +1965,14 @@ The network does not appear to fully agree! Some miners appear to be experiencin
         <source>Accept public REST requests (default: %u)</source>
         <translation>Akceptovať verejné REST žiadosti (predvolené: %u)</translation>
     </message>
-    <message>
-        <source>Activating best chain...</source>
-        <translation>Aktivácia najlepšej reťaze...</translation>
-    </message>
-    <message>
-        <source>Attempt to recover private keys from a corrupt wallet.dat on startup</source>
-        <translation>Pokus o obnovenie privátnych kľúčov z poškodenej wallet.dat pri spustení</translation>
-    </message>
     <message>
         <source>Automatically create Tor hidden service (default: %d)</source>
         <translation>Automaticky vytvoriť skrytú službu Tor (predvolené: %d)</translation>
     </message>
-    <message>
-        <source>Cannot resolve -whitebind address: '%s'</source>
-        <translation>Nedá sa vyriešiť -whitebind adresa: '%s'</translation>
-    </message>
     <message>
         <source>Connect through SOCKS5 proxy</source>
         <translation>Pripojiť cez proxy server SOCKS5</translation>
     </message>
-    <message>
-        <source>Copyright (C) 2009-%i The Bitcoin Core Developers</source>
-        <translation>Autorské práva (C) 2009-%i Vývojári jadra Bitcoin</translation>
-    </message>
-    <message>
-        <source>Error loading wallet.dat: Wallet requires newer version of Bitcoin Core</source>
-        <translation>Chyba pri čítaní wallet.dat: Peňaženka vyžaduje vyššiu verziu Jadra Bitcoin</translation>
-    </message>
     <message>
         <source>Error reading from database, shutting down.</source>
         <translation>Chyba pri načítaní z databázy, ukončuje sa.</translation>
@@ -3250,22 +1985,6 @@ The network does not appear to fully agree! Some miners appear to be experiencin
         <source>Information</source>
         <translation>Informácia</translation>
     </message>
-    <message>
-        <source>Initialization sanity check failed. Bitcoin Core is shutting down.</source>
-        <translation>Inicializačná kontrola zlyhala. Jadro Bitcoin sa ukončuje.</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -maxtxfee=&lt;amount&gt;: '%s'</source>
-        <translation>Neplatná suma pre -maxtxfee=&lt;amount&gt;: '%s'</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -minrelaytxfee=&lt;amount&gt;: '%s'</source>
-        <translation>Neplatná suma pre -minrelaytxfee=&lt;amount&gt;: '%s'</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -mintxfee=&lt;amount&gt;: '%s'</source>
-        <translation>Neplatná suma pre -mintxfee=&lt;amount&gt;: '%s'</translation>
-    </message>
     <message>
         <source>Invalid amount for -paytxfee=&lt;amount&gt;: '%s' (must be at least %s)</source>
         <translation>Neplatná suma pre -paytxfee=&lt;amount&gt;: '%s' (musí byť aspoň %s)</translation>
@@ -3290,10 +2009,6 @@ The network does not appear to fully agree! Some miners appear to be experiencin
         <source>RPC server options:</source>
         <translation>Možnosti servra RPC:</translation>
     </message>
-    <message>
-        <source>Receive and display P2P network alerts (default: %u)</source>
-        <translation>Obdržať a zobraziť sieťové P2P varovania (predvolené: %u)</translation>
-    </message>
     <message>
         <source>Send trace/debug info to console instead of debug.log file</source>
         <translation>Odoslať trace/debug informácie na konzolu namiesto debug.info žurnálu</translation>
@@ -3354,10 +2069,6 @@ The network does not appear to fully agree! Some miners appear to be experiencin
         <source>Username for JSON-RPC connections</source>
         <translation>Užívateľské meno pre JSON-RPC spojenia</translation>
     </message>
-    <message>
-        <source>Wallet needed to be rewritten: restart Bitcoin Core to complete</source>
-        <translation>Peňaženka musí byť prepísaná: pre dokončenie reštartujte Jadro Bitcoin</translation>
-    </message>
     <message>
         <source>Warning</source>
         <translation>Upozornenie</translation>
@@ -3366,10 +2077,6 @@ The network does not appear to fully agree! Some miners appear to be experiencin
         <source>Zapping all transactions from wallet...</source>
         <translation>Zmazať všetky transakcie z peňaženky...</translation>
     </message>
-    <message>
-        <source>wallet.dat corrupt, salvage failed</source>
-        <translation>wallet.dat je poškodený, záchrana zlyhala</translation>
-    </message>
     <message>
         <source>Password for JSON-RPC connections</source>
         <translation>Heslo pre JSON-rPC spojenia</translation>
@@ -3378,10 +2085,6 @@ The network does not appear to fully agree! Some miners appear to be experiencin
         <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
         <translation>Vykonaj príkaz, ak zmeny v najlepšom bloku (%s v príkaze nahradí blok hash)</translation>
     </message>
-    <message>
-        <source>This help message</source>
-        <translation>Táto pomocná správa</translation>
-    </message>
     <message>
         <source>Allow DNS lookups for -addnode, -seednode and -connect</source>
         <translation>Povoliť vyhľadávanie DNS pre pridanie nódy a spojenie</translation>
@@ -3390,10 +2093,6 @@ The network does not appear to fully agree! Some miners appear to be experiencin
         <source>Loading addresses...</source>
         <translation>Načítavanie adries...</translation>
     </message>
-    <message>
-        <source>Error loading wallet.dat: Wallet corrupted</source>
-        <translation>Chyba načítania wallet.dat: Peňaženka je poškodená</translation>
-    </message>
     <message>
         <source>(1 = keep tx meta data e.g. account owner and payment request information, 2 = drop tx meta data)</source>
         <translation>(1 = zachovať metaúdaje tx napr. vlastníka účtu a informácie o platobných príkazoch, 2 = zahodiť metaúdaje tx)</translation>
@@ -3426,14 +2125,6 @@ The network does not appear to fully agree! Some miners appear to be experiencin
         <source>Always query for peer addresses via DNS lookup (default: %u)</source>
         <translation>Vždy sa dotazovať adresy partnerských uzlov cez vyhľadávanie DNS (predvolené: %u)</translation>
     </message>
-    <message>
-        <source>Error loading wallet.dat</source>
-        <translation>Chyba načítania wallet.dat</translation>
-    </message>
-    <message>
-        <source>Generate coins (default: %u)</source>
-        <translation>Generovať mince (predvolené: %u)</translation>
-    </message>
     <message>
         <source>How many blocks to check at startup (default: %u, 0 = all)</source>
         <translation>Koľko blokov overiť pri spustení (predvolené: %u, 0 = všetky)</translation>
@@ -3514,18 +2205,6 @@ The network does not appear to fully agree! Some miners appear to be experiencin
         <source>Unknown network specified in -onlynet: '%s'</source>
         <translation>Neznáma sieť upresnená v -onlynet: '%s'</translation>
     </message>
-    <message>
-        <source>Cannot resolve -bind address: '%s'</source>
-        <translation>Nemožno rozriešiť -bind adress: '%s'</translation>
-    </message>
-    <message>
-        <source>Cannot resolve -externalip address: '%s'</source>
-        <translation>Nemožno rozriešiť -externalip address: '%s'</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -paytxfee=&lt;amount&gt;: '%s'</source>
-        <translation>Neplatná suma pre -paytxfee=&lt;amount&gt;: '%s'</translation>
-    </message>
     <message>
         <source>Insufficient funds</source>
         <translation>Nedostatok prostriedkov</translation>
diff --git a/src/qt/locale/bitcoin_sl_SI.ts b/src/qt/locale/bitcoin_sl_SI.ts
index 1b540a7310f08..155be7bb27144 100644
--- a/src/qt/locale/bitcoin_sl_SI.ts
+++ b/src/qt/locale/bitcoin_sl_SI.ts
@@ -25,10 +25,6 @@
         <source>C&amp;lose</source>
         <translation>&amp;Zapri</translation>
     </message>
-    <message>
-        <source>&amp;Copy Address</source>
-        <translation>&amp;Kopiraj naslov</translation>
-    </message>
     <message>
         <source>Delete the currently selected address from the list</source>
         <translation>Izbriši trenutno označeni naslov  iz seznama</translation>
@@ -45,73 +41,6 @@
         <source>&amp;Delete</source>
         <translation>I&amp;zbriši</translation>
     </message>
-    <message>
-        <source>Choose the address to send coins to</source>
-        <translation>Izbira naslova, na katerega pošiljate plačilo</translation>
-    </message>
-    <message>
-        <source>Choose the address to receive coins with</source>
-        <translation>Izbira naslova za prejem plačila</translation>
-    </message>
-    <message>
-        <source>C&amp;hoose</source>
-        <translation>&amp;Izberi</translation>
-    </message>
-    <message>
-        <source>Sending addresses</source>
-        <translation>Imenik naslovov za pošiljanje</translation>
-    </message>
-    <message>
-        <source>Receiving addresses</source>
-        <translation>Imenik naslovov za prejemanje</translation>
-    </message>
-    <message>
-        <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source>
-        <translation>To je vaš imenik shranjenih naslovov Bitcoin, na katere lahko pošiljate plačila. Pred vsakim odlivom vedno preverite, če sta znesek in prejemnikov naslov pravilna.</translation>
-    </message>
-    <message>
-        <source>These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source>
-        <translation>To je imenik vaših ustvarjenih naslovov Bitcoin, na katere lahko prejemate plačila. Priporočljivo je, da za vsak nov priliv ustvarite nov prejemni naslov.</translation>
-    </message>
-    <message>
-        <source>Copy &amp;Label</source>
-        <translation>Kopiraj &amp;oznako</translation>
-    </message>
-    <message>
-        <source>&amp;Edit</source>
-        <translation>&amp;Uredi</translation>
-    </message>
-    <message>
-        <source>Export Address List</source>
-        <translation>Izvozi seznam naslovov</translation>
-    </message>
-    <message>
-        <source>Comma separated file (*.csv)</source>
-        <translation>Datoteka s podatki, ločenimi z vejico (*.csv)</translation>
-    </message>
-    <message>
-        <source>Exporting Failed</source>
-        <translation>Seznama naslovov ni bilo mogoče izvoziti.</translation>
-    </message>
-    <message>
-        <source>There was an error trying to save the address list to %1. Please try again.</source>
-        <translation>Napaka pri shranjevanju seznama naslovov v datoteko %1. Prosimo, poskusite znova.</translation>
-    </message>
-</context>
-<context>
-    <name>AddressTableModel</name>
-    <message>
-        <source>Label</source>
-        <translation>Oznaka</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>Naslov</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(brez oznake)</translation>
-    </message>
 </context>
 <context>
     <name>AskPassphraseDialog</name>
@@ -131,94 +60,6 @@
         <source>Repeat new passphrase</source>
         <translation>Ponovite novo geslo</translation>
     </message>
-    <message>
-        <source>Encrypt wallet</source>
-        <translation>Šifriraj denarnico</translation>
-    </message>
-    <message>
-        <source>This operation needs your wallet passphrase to unlock the wallet.</source>
-        <translation>To dejanje zahteva geslo za odklepanje vaše denarnice.</translation>
-    </message>
-    <message>
-        <source>Unlock wallet</source>
-        <translation>Odkleni denarnico</translation>
-    </message>
-    <message>
-        <source>This operation needs your wallet passphrase to decrypt the wallet.</source>
-        <translation>To dejanje zahteva geslo za dešifriranje vaše denarnice.</translation>
-    </message>
-    <message>
-        <source>Decrypt wallet</source>
-        <translation>Dešifriraj denarnico</translation>
-    </message>
-    <message>
-        <source>Change passphrase</source>
-        <translation>Zamenjaj geslo</translation>
-    </message>
-    <message>
-        <source>Confirm wallet encryption</source>
-        <translation>Potrditev šifriranja denarnice</translation>
-    </message>
-    <message>
-        <source>Warning: If you encrypt your wallet and lose your passphrase, you will &lt;b&gt;LOSE ALL OF YOUR BITCOINS&lt;/b&gt;!</source>
-        <translation>Opozorilo: V primeru izgube gesla šifrirane denarnice, boste &lt;b&gt;IZGUBILI VSE BITCOINE V DENARNICI&lt;/b&gt;!</translation>
-    </message>
-    <message>
-        <source>Are you sure you wish to encrypt your wallet?</source>
-        <translation>Ali ste prepričani, da želite šifrirati vašo denarnico?</translation>
-    </message>
-    <message>
-        <source>Bitcoin Core will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source>
-        <translation>Program se bo zaprl, da dokonča proces šifriranja. Zapomnite si, da šifriranje ne more popolnoma zaščititi vaše denarnice pred krajami in zlonamernimi programi, ki bi lahko bili nameščeni na vašem računalniku.</translation>
-    </message>
-    <message>
-        <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source>
-        <translation>POMEMBNO: Vse starejše obstoječe varnostne kopije denarnice je potrebno zamenjati s to novo, šifrirano varnostno kopijo. Iz varnostnih razlogov bodo stare varnostne kopije postale neuporabne takoj, ko začnete uporabljati novo, šifrirano denarnico.</translation>
-    </message>
-    <message>
-        <source>Warning: The Caps Lock key is on!</source>
-        <translation>Opozorilo: imate vklopljene velike črke (Caps Lock)</translation>
-    </message>
-    <message>
-        <source>Wallet encrypted</source>
-        <translation>Denarnica je šifrirana</translation>
-    </message>
-    <message>
-        <source>Enter the new passphrase to the wallet.&lt;br/&gt;Please use a passphrase of &lt;b&gt;ten or more random characters&lt;/b&gt;, or &lt;b&gt;eight or more words&lt;/b&gt;.</source>
-        <translation>Vnesite novo geslo. Prosimo, da uporabite geslo sestavljeno iz &lt;b&gt;deset ali več&lt;/b&gt; naključnih znakov, ali &lt;b&gt;osem ali več&lt;/b&gt; besed.</translation>
-    </message>
-    <message>
-        <source>Enter the old passphrase and new passphrase to the wallet.</source>
-        <translation>Vnesite staro in novo geslo denarnice.</translation>
-    </message>
-    <message>
-        <source>Wallet encryption failed</source>
-        <translation>Denarnice ni bilo mogoče šifrirati.</translation>
-    </message>
-    <message>
-        <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
-        <translation>Prišlo je do napake. Denarnice ni bilo mogoče šifrirati.</translation>
-    </message>
-    <message>
-        <source>The supplied passphrases do not match.</source>
-        <translation>Vnešeni gesli se ne ujemata</translation>
-    </message>
-    <message>
-        <source>Wallet unlock failed</source>
-        <translation>Denarnice ni bilo mogoče odkleniti.</translation>
-    </message>
-    <message>
-        <source>The passphrase entered for the wallet decryption was incorrect.</source>
-        <translation>Vnesli ste napačno geslo za dešifriranje denarnice.</translation>
-    </message>
-    <message>
-        <source>Wallet decryption failed</source>
-        <translation>Denarnice ni bilo mogoče dešifrirati.</translation>
-    </message>
-    <message>
-        <source>Wallet passphrase was successfully changed.</source>
-        <translation>Geslo za dostop do denarnice je bilo uspešno zamenjano.</translation>
-    </message>
 </context>
 <context>
     <name>BanTableModel</name>
@@ -297,14 +138,6 @@
         <source>Open &amp;URI...</source>
         <translation>Odpri &amp;URI ...</translation>
     </message>
-    <message>
-        <source>Bitcoin Core client</source>
-        <translation>Odjemalec Bitcoin Core</translation>
-    </message>
-    <message>
-        <source>Importing blocks from disk...</source>
-        <translation>Uvažam bloke z diska ...</translation>
-    </message>
     <message>
         <source>Reindexing blocks on disk...</source>
         <translation>Poustvarjam kazalo blokov na disku ...</translation>
@@ -349,10 +182,6 @@
         <source>&amp;Receive</source>
         <translation>P&amp;rejmi</translation>
     </message>
-    <message>
-        <source>Show information about Bitcoin Core</source>
-        <translation>Oglejte si informacije o programu</translation>
-    </message>
     <message>
         <source>&amp;Show / Hide</source>
         <translation>&amp;Prikaži / Skrij</translation>
@@ -389,22 +218,10 @@
         <source>Tabs toolbar</source>
         <translation>Orodna vrstica zavihkov</translation>
     </message>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Bitcoin Core</translation>
-    </message>
     <message>
         <source>Request payments (generates QR codes and bitcoin: URIs)</source>
         <translation>Zahtevajte plačilo (ustvarite zahtevek s kodo QR in URI tipa bitcoin:)</translation>
     </message>
-    <message>
-        <source>&amp;About Bitcoin Core</source>
-        <translation>&amp;O programu</translation>
-    </message>
-    <message>
-        <source>Modify configuration options for Bitcoin Core</source>
-        <translation>Spremenite programske nastavitve</translation>
-    </message>
     <message>
         <source>Show the list of used sending addresses and labels</source>
         <translation>Preglejte in uredite seznam naslovov, na katere ste kdaj poslali plačila</translation>
@@ -421,10 +238,6 @@
         <source>&amp;Command-line options</source>
         <translation>Opcije &amp;ukazne vrstice</translation>
     </message>
-    <message>
-        <source>Show the Bitcoin Core help message to get a list with possible Bitcoin command-line options</source>
-        <translation>Oglejte si seznam in kratek opis vseh opcij pri zagonu programa iz ukazne vrstice</translation>
-    </message>
     <message numerus="yes">
         <source>%n active connection(s) to Bitcoin network</source>
         <translation><numerusform>%n aktivna povezava v omrežje Bitcoin</numerusform><numerusform>%n aktivni povezavi v omrežje Bitcoin</numerusform><numerusform>%n aktivne povezave v omrežje Bitcoin</numerusform><numerusform>%n aktivnih povezav v omrežje Bitcoin</numerusform></translation>
@@ -439,7 +252,7 @@
     </message>
     <message numerus="yes">
         <source>%n hour(s)</source>
-        <translation><numerusform>%n ura</numerusform><numerusform>%n uri</numerusform><numerusform>%n ure</numerusform><numerusform>%n ur</numerusform></translation>
+        <translation><numerusform>%n uro</numerusform><numerusform>%n uri</numerusform><numerusform>%n ure</numerusform><numerusform>%n ur</numerusform></translation>
     </message>
     <message numerus="yes">
         <source>%n day(s)</source>
@@ -536,13 +349,6 @@
         <translation>Denarnica je &lt;b&gt;šifrirana&lt;/b&gt; in trenutno &lt;b&gt;zaklenjena&lt;/b&gt;</translation>
     </message>
 </context>
-<context>
-    <name>ClientModel</name>
-    <message>
-        <source>Network Alert</source>
-        <translation>Omrežno opozorilo</translation>
-    </message>
-</context>
 <context>
     <name>CoinControlDialog</name>
     <message>
@@ -621,150 +427,6 @@
         <source>Priority</source>
         <translation>Prioriteta</translation>
     </message>
-    <message>
-        <source>Copy address</source>
-        <translation>Kopiraj naslov</translation>
-    </message>
-    <message>
-        <source>Copy label</source>
-        <translation>Kopiraj oznako</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>Kopiraj znesek</translation>
-    </message>
-    <message>
-        <source>Copy transaction ID</source>
-        <translation>Kopiraj ID transakcije</translation>
-    </message>
-    <message>
-        <source>Lock unspent</source>
-        <translation>Zakleni neporabljeno</translation>
-    </message>
-    <message>
-        <source>Unlock unspent</source>
-        <translation>Odkleni neporabljeno</translation>
-    </message>
-    <message>
-        <source>Copy quantity</source>
-        <translation>Kopiraj število vhodov</translation>
-    </message>
-    <message>
-        <source>Copy fee</source>
-        <translation>Kopiraj znesek provizije</translation>
-    </message>
-    <message>
-        <source>Copy after fee</source>
-        <translation>Kopiraj končni znesek</translation>
-    </message>
-    <message>
-        <source>Copy bytes</source>
-        <translation>Kopiraj število bajtov</translation>
-    </message>
-    <message>
-        <source>Copy priority</source>
-        <translation>Kopiraj prioriteto</translation>
-    </message>
-    <message>
-        <source>Copy dust</source>
-        <translation>Kopiraj prah</translation>
-    </message>
-    <message>
-        <source>Copy change</source>
-        <translation>Kopiraj znesek vračila</translation>
-    </message>
-    <message>
-        <source>highest</source>
-        <translation>najvišja</translation>
-    </message>
-    <message>
-        <source>higher</source>
-        <translation>višja</translation>
-    </message>
-    <message>
-        <source>high</source>
-        <translation>visoka</translation>
-    </message>
-    <message>
-        <source>medium-high</source>
-        <translation>srednje visoka</translation>
-    </message>
-    <message>
-        <source>medium</source>
-        <translation>srednja</translation>
-    </message>
-    <message>
-        <source>low-medium</source>
-        <translation>srednje nizka</translation>
-    </message>
-    <message>
-        <source>low</source>
-        <translation>nizka</translation>
-    </message>
-    <message>
-        <source>lower</source>
-        <translation>nižja</translation>
-    </message>
-    <message>
-        <source>lowest</source>
-        <translation>najnižja</translation>
-    </message>
-    <message>
-        <source>(%1 locked)</source>
-        <translation>(%1 zaklenjeno)</translation>
-    </message>
-    <message>
-        <source>none</source>
-        <translation>nič</translation>
-    </message>
-    <message>
-        <source>This label turns red if the transaction size is greater than 1000 bytes.</source>
-        <translation>Oznaka postane rdeča, če je transakcije večja od 1000 bajtov.</translation>
-    </message>
-    <message>
-        <source>This label turns red if the priority is smaller than "medium".</source>
-        <translation>Oznaka postane rdeča, če je prioriteta transakcije manjša kot "srednja".</translation>
-    </message>
-    <message>
-        <source>This label turns red if any recipient receives an amount smaller than %1.</source>
-        <translation>Oznaka postane rdeča, če je znesek manjši od %1.</translation>
-    </message>
-    <message>
-        <source>Can vary +/- %1 satoshi(s) per input.</source>
-        <translation>Lahko variira +/- %1 satoshijev na vhod.</translation>
-    </message>
-    <message>
-        <source>yes</source>
-        <translation>da</translation>
-    </message>
-    <message>
-        <source>no</source>
-        <translation>ne</translation>
-    </message>
-    <message>
-        <source>This means a fee of at least %1 per kB is required.</source>
-        <translation>To pomeni, da je zahtevana provizija v višini vsaj %1 na KiB.</translation>
-    </message>
-    <message>
-        <source>Can vary +/- 1 byte per input.</source>
-        <translation>Lahko variira +/-1 bajt na vhod.</translation>
-    </message>
-    <message>
-        <source>Transactions with higher priority are more likely to get included into a block.</source>
-        <translation>Transakcije z višjo prioriteto imajo boljše možnosti za vključitev v blok.</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(brez oznake)</translation>
-    </message>
-    <message>
-        <source>change from %1 (%2)</source>
-        <translation>vračilo od %1 (%2)</translation>
-    </message>
-    <message>
-        <source>(change)</source>
-        <translation>(vračilo)</translation>
-    </message>
 </context>
 <context>
     <name>EditAddressDialog</name>
@@ -788,38 +450,6 @@
         <source>&amp;Address</source>
         <translation>&amp;Naslov</translation>
     </message>
-    <message>
-        <source>New receiving address</source>
-        <translation>Nov naslov za prilive</translation>
-    </message>
-    <message>
-        <source>New sending address</source>
-        <translation>Nov naslov za odlive</translation>
-    </message>
-    <message>
-        <source>Edit receiving address</source>
-        <translation>Uredi naslov za prilive</translation>
-    </message>
-    <message>
-        <source>Edit sending address</source>
-        <translation>Uredi naslov za odlive</translation>
-    </message>
-    <message>
-        <source>The entered address "%1" is already in the address book.</source>
-        <translation>Vnešeni naslov %1 je že v imeniku.</translation>
-    </message>
-    <message>
-        <source>The entered address "%1" is not a valid Bitcoin address.</source>
-        <translation>Vnešeni naslov %1 ni veljaven naslov Bitcoin.</translation>
-    </message>
-    <message>
-        <source>Could not unlock wallet.</source>
-        <translation>Denarnice ni bilo mogoče odkleniti.</translation>
-    </message>
-    <message>
-        <source>New key generation failed.</source>
-        <translation>Novega ključa ni bilo mogoče ustvariti.</translation>
-    </message>
 </context>
 <context>
     <name>FreespaceChecker</name>
@@ -846,10 +476,6 @@
 </context>
 <context>
     <name>HelpMessageDialog</name>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Bitcoin Core</translation>
-    </message>
     <message>
         <source>version</source>
         <translation>različica</translation>
@@ -858,10 +484,6 @@
         <source>(%1-bit)</source>
         <translation>(%1-bit)</translation>
     </message>
-    <message>
-        <source>About Bitcoin Core</source>
-        <translation>O programu Bitcoin Core</translation>
-    </message>
     <message>
         <source>Command-line options</source>
         <translation>Možnosti ukazne vrstice</translation>
@@ -881,18 +503,6 @@
         <source>Welcome</source>
         <translation>Dobrodošli</translation>
     </message>
-    <message>
-        <source>Welcome to Bitcoin Core.</source>
-        <translation>Dobrodošli v programu Bitcoin Core.</translation>
-    </message>
-    <message>
-        <source>As this is the first time the program is launched, you can choose where Bitcoin Core will store its data.</source>
-        <translation>To je prvi zagon programa, zato lahko izberete mapo, v katero bo program shranjeval podatke.</translation>
-    </message>
-    <message>
-        <source>Bitcoin Core will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source>
-        <translation>Program bo prenesel in shranil kopijo verige blokov. V izbrani podatkovni mapi bo shranjenih vsaj %1 GiB podatkov, ta količina pa bo sčasoma še naraščala. V tej mapi bo shranjena tudi denarnica.</translation>
-    </message>
     <message>
         <source>Use the default data directory</source>
         <translation>Uporabi privzeto podatkovno mapo</translation>
@@ -901,10 +511,6 @@
         <source>Use a custom data directory:</source>
         <translation>Uporabi to podatkovno mapo:</translation>
     </message>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Bitcoin Core</translation>
-    </message>
     <message>
         <source>Error: Specified data directory "%1" cannot be created.</source>
         <translation>Napaka: Ni mogoče ustvariti mape "%1".</translation>
@@ -940,10 +546,6 @@
         <source>Select payment request file</source>
         <translation>Izbiranje datoteke z zahtevkom za plačilo</translation>
     </message>
-    <message>
-        <source>Select payment request file to open</source>
-        <translation>Izberite datoteko, ki vsebuje zahtevek za plačilo</translation>
-    </message>
 </context>
 <context>
     <name>OptionsDialog</name>
@@ -983,10 +585,6 @@
         <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Exit in the menu.</source>
         <translation>Ko zaprete glavno okno programa, bo program tekel še naprej, okno pa bo zgolj minimirano. Program v tem primeru ustavite tako, da v meniju izberete ukaz Izhod.</translation>
     </message>
-    <message>
-        <source>The user interface language can be set here. This setting will take effect after restarting Bitcoin Core.</source>
-        <translation>Nastavitev jezika uporabniškega vmesnika programa. Nova nastavitev jezika bo uporabljena šele, ko boste znova zagnali program.</translation>
-    </message>
     <message>
         <source>Third party URLs (e.g. a block explorer) that appear in the transactions tab as context menu items. %s in the URL is replaced by transaction hash. Multiple URLs are separated by vertical bar |.</source>
         <translation>Naslovi URL tretjih oseb (npr. raziskovalec blokov), ki bodo navedeni v kontekstnem meniju seznama transakcij. Niz %s iz naslova URL je nadomeščen s hash vrednostjo transakcije. Več zaporednih naslovov URL je med seboj ločenih z znakom |.</translation>
@@ -1011,14 +609,6 @@
         <source>&amp;Network</source>
         <translation>&amp;Omrežje</translation>
     </message>
-    <message>
-        <source>Automatically start Bitcoin Core after logging in to the system.</source>
-        <translation>Ob uporabnikovi prijavi v sistem se bo program samodejno zagnal</translation>
-    </message>
-    <message>
-        <source>&amp;Start Bitcoin Core on system login</source>
-        <translation>&amp;Zaženi program ob prijavi v sistem</translation>
-    </message>
     <message>
         <source>(0 = auto, &lt;0 = leave that many cores free)</source>
         <translation>(0 = samodejno, &lt;0 = toliko procesorskih jeder naj ostane prostih)</translation>
@@ -1224,190 +814,80 @@
     </message>
 </context>
 <context>
-    <name>PaymentServer</name>
+    <name>PeerTableModel</name>
     <message>
-        <source>URI handling</source>
-        <translation>Rokovanje z URI</translation>
+        <source>User Agent</source>
+        <translation>Ime agenta</translation>
     </message>
     <message>
-        <source>Invalid payment address %1</source>
-        <translation>Neveljaven naslov plačila %1</translation>
+        <source>Node/Service</source>
+        <translation>Naslov</translation>
     </message>
     <message>
-        <source>Payment request rejected</source>
-        <translation>Zahtevek za plačilo je bil zavrnjen.</translation>
+        <source>Ping Time</source>
+        <translation>Odzivni čas</translation>
     </message>
+</context>
+<context>
+    <name>QObject</name>
     <message>
-        <source>Payment request network doesn't match client network.</source>
-        <translation>Zahtevek za plačilo in vaš odjemalec se nahajata na dveh različnih omrežjih.</translation>
+        <source>Amount</source>
+        <translation>Znesek</translation>
     </message>
     <message>
-        <source>Payment request is not initialized.</source>
-        <translation>Zahtevek za plačilo ni inicializiran.</translation>
+        <source>Enter a Bitcoin address (e.g. %1)</source>
+        <translation>Vnesite naslov Bitcoin (npr. %1):</translation>
     </message>
     <message>
-        <source>Requested payment amount of %1 is too small (considered dust).</source>
-        <translation>Znesek %1 v zahtevku za plačilo je prenizek (smatran za prah.)</translation>
+        <source>%1 d</source>
+        <translation>%1 d</translation>
     </message>
     <message>
-        <source>Payment request error</source>
-        <translation>Napaka pri zahtevku za plačilo</translation>
+        <source>%1 h</source>
+        <translation>%1 h</translation>
     </message>
     <message>
-        <source>Cannot start bitcoin: click-to-pay handler</source>
-        <translation>Ni mogoče zagnati rokovalca plačilnih povezav tipa bitcoin:.</translation>
+        <source>%1 m</source>
+        <translation>%1 m</translation>
     </message>
     <message>
-        <source>Payment request fetch URL is invalid: %1</source>
-        <translation>Naslov URL za pridobitev zahtevka za plačilo ni veljaven: %1</translation>
+        <source>%1 s</source>
+        <translation>%1 s</translation>
     </message>
     <message>
-        <source>URI cannot be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source>
-        <translation>URI je neprepoznaven! Možno je, da je naslov Bitcoin neveljaven, ali da so parametri v URI napačno oblikovani.</translation>
+        <source>None</source>
+        <translation>Nič</translation>
     </message>
     <message>
-        <source>Payment request file handling</source>
-        <translation>Rokovanje z datoteko z zahtevkom za plačilo</translation>
+        <source>N/A</source>
+        <translation>Neznano</translation>
     </message>
     <message>
-        <source>Payment request file cannot be read! This can be caused by an invalid payment request file.</source>
-        <translation>Datoteke z zahtevkom za plačilo ni mogoče prebrati! Možno je, da datoteka ni veljavna.</translation>
+        <source>%1 ms</source>
+        <translation>%1 ms</translation>
     </message>
+</context>
+<context>
+    <name>RPCConsole</name>
     <message>
-        <source>Payment request expired.</source>
-        <translation>Zahtevek za plačilo je potekel.</translation>
+        <source>Client name</source>
+        <translation>Ime odjemalca</translation>
     </message>
     <message>
-        <source>Unverified payment requests to custom payment scripts are unsupported.</source>
-        <translation>Nepreverjeni zahtevki za plačilo, namenjeni plačilni skripti po meri, niso podprti.</translation>
+        <source>N/A</source>
+        <translation>Neznano</translation>
     </message>
     <message>
-        <source>Invalid payment request.</source>
-        <translation>Neveljaven zahtevek za plačilo.</translation>
+        <source>Client version</source>
+        <translation>Različica odjemalca</translation>
     </message>
     <message>
-        <source>Refund from %1</source>
-        <translation>Povračilo od %1</translation>
+        <source>&amp;Information</source>
+        <translation>&amp;Informacije</translation>
     </message>
     <message>
-        <source>Payment request %1 is too large (%2 bytes, allowed %3 bytes).</source>
-        <translation>Zahtevek za plačilo %1 je prevelik (%2 bajtov, dovoljenih je %3 bajtov.)</translation>
-    </message>
-    <message>
-        <source>Error communicating with %1: %2</source>
-        <translation>Napaka pri povezavi z  %1: %2</translation>
-    </message>
-    <message>
-        <source>Payment request cannot be parsed!</source>
-        <translation>Zahtevek za plačilo je neprepoznaven!</translation>
-    </message>
-    <message>
-        <source>Bad response from server %1</source>
-        <translation>Napačen odziv strežnika %1</translation>
-    </message>
-    <message>
-        <source>Payment acknowledged</source>
-        <translation>Plačilo priznano</translation>
-    </message>
-    <message>
-        <source>Network request error</source>
-        <translation>Napaka omrežne zahteve</translation>
-    </message>
-</context>
-<context>
-    <name>PeerTableModel</name>
-    <message>
-        <source>User Agent</source>
-        <translation>Ime agenta</translation>
-    </message>
-    <message>
-        <source>Node/Service</source>
-        <translation>Naslov</translation>
-    </message>
-    <message>
-        <source>Ping Time</source>
-        <translation>Odzivni čas</translation>
-    </message>
-</context>
-<context>
-    <name>QObject</name>
-    <message>
-        <source>Amount</source>
-        <translation>Znesek</translation>
-    </message>
-    <message>
-        <source>Enter a Bitcoin address (e.g. %1)</source>
-        <translation>Vnesite naslov Bitcoin (npr. %1):</translation>
-    </message>
-    <message>
-        <source>%1 d</source>
-        <translation>%1 d</translation>
-    </message>
-    <message>
-        <source>%1 h</source>
-        <translation>%1 h</translation>
-    </message>
-    <message>
-        <source>%1 m</source>
-        <translation>%1 m</translation>
-    </message>
-    <message>
-        <source>%1 s</source>
-        <translation>%1 s</translation>
-    </message>
-    <message>
-        <source>None</source>
-        <translation>Nič</translation>
-    </message>
-    <message>
-        <source>N/A</source>
-        <translation>Neznano</translation>
-    </message>
-    <message>
-        <source>%1 ms</source>
-        <translation>%1 ms</translation>
-    </message>
-</context>
-<context>
-    <name>QRImageWidget</name>
-    <message>
-        <source>&amp;Save Image...</source>
-        <translation>&amp;Shrani sliko ...</translation>
-    </message>
-    <message>
-        <source>&amp;Copy Image</source>
-        <translation>&amp;Kopiraj sliko</translation>
-    </message>
-    <message>
-        <source>Save QR Code</source>
-        <translation>Shrani kodo QR</translation>
-    </message>
-    <message>
-        <source>PNG Image (*.png)</source>
-        <translation>PNG slika (*.png)</translation>
-    </message>
-</context>
-<context>
-    <name>RPCConsole</name>
-    <message>
-        <source>Client name</source>
-        <translation>Ime odjemalca</translation>
-    </message>
-    <message>
-        <source>N/A</source>
-        <translation>Neznano</translation>
-    </message>
-    <message>
-        <source>Client version</source>
-        <translation>Različica odjemalca</translation>
-    </message>
-    <message>
-        <source>&amp;Information</source>
-        <translation>&amp;Informacije</translation>
-    </message>
-    <message>
-        <source>Debug window</source>
-        <translation>Razhroščevalno okno</translation>
+        <source>Debug window</source>
+        <translation>Razhroščevalno okno</translation>
     </message>
     <message>
         <source>General</source>
@@ -1441,10 +921,6 @@
         <source>Current number of blocks</source>
         <translation>Trenutno število blokov</translation>
     </message>
-    <message>
-        <source>Open the Bitcoin Core debug log file from the current data directory. This can take a few seconds for large log files.</source>
-        <translation>Odpre razhroščevalni dnevnik debug.log, ki se nahaja v trenutni podatkovni mapi. Če je datoteka velika, lahko postopek traja nekaj sekund.</translation>
-    </message>
     <message>
         <source>Received</source>
         <translation>Prejeto</translation>
@@ -1533,10 +1009,6 @@
         <source>Out:</source>
         <translation>Odhodnih:</translation>
     </message>
-    <message>
-        <source>Build date</source>
-        <translation>Datum izgradnje</translation>
-    </message>
     <message>
         <source>Debug log file</source>
         <translation>Razhroščevalni dnevnik</translation>
@@ -1545,10 +1017,6 @@
         <source>Clear console</source>
         <translation>Počisti konzolo</translation>
     </message>
-    <message>
-        <source>Welcome to the Bitcoin Core RPC console.</source>
-        <translation>Dobrodošli v konzoli RPC programa Bitcoin Core.</translation>
-    </message>
     <message>
         <source>Use up and down arrows to navigate history, and &lt;b&gt;Ctrl-L&lt;/b&gt; to clear screen.</source>
         <translation>Uporabite tipki gor in dol za navigacijo po zgodovini ukazov. Uporabite &lt;b&gt;Ctrl-L&lt;/b&gt; za izbris zaslona in zgodovine ukazov.</translation>
@@ -1672,18 +1140,6 @@
         <source>Remove</source>
         <translation>Odstrani</translation>
     </message>
-    <message>
-        <source>Copy label</source>
-        <translation>Kopiraj oznako</translation>
-    </message>
-    <message>
-        <source>Copy message</source>
-        <translation>Kopiraj sporočilo</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>Kopiraj znesek</translation>
-    </message>
 </context>
 <context>
     <name>ReceiveRequestDialog</name>
@@ -1703,73 +1159,6 @@
         <source>&amp;Save Image...</source>
         <translation>&amp;Shrani sliko ...</translation>
     </message>
-    <message>
-        <source>Request payment to %1</source>
-        <translation>Zahtevek za plačilo z oznako: %1</translation>
-    </message>
-    <message>
-        <source>Payment information</source>
-        <translation>Informacije o plačilu</translation>
-    </message>
-    <message>
-        <source>URI</source>
-        <translation>URI</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>Naslov</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>Znesek</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Oznaka</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>Sporočilo</translation>
-    </message>
-    <message>
-        <source>Resulting URI too long, try to reduce the text for label / message.</source>
-        <translation>Nastali URI je predolg. Skušajte skrajšati besedilo v oznaki/sporočilu.</translation>
-    </message>
-    <message>
-        <source>Error encoding URI into QR Code.</source>
-        <translation>Napaka pri pretvorbi URI v kodo QR.</translation>
-    </message>
-</context>
-<context>
-    <name>RecentRequestsTableModel</name>
-    <message>
-        <source>Date</source>
-        <translation>Datum</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Oznaka</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>Sporočilo</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>Znesek</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(brez oznake)</translation>
-    </message>
-    <message>
-        <source>(no message)</source>
-        <translation>(brez sporočila)</translation>
-    </message>
-    <message>
-        <source>(no amount)</source>
-        <translation>(brez zneska)</translation>
-    </message>
 </context>
 <context>
     <name>SendCoinsDialog</name>
@@ -1889,14 +1278,6 @@
         <source>fast</source>
         <translation>hitro</translation>
     </message>
-    <message>
-        <source>Send as zero-fee transaction if possible</source>
-        <translation>Pošlji brez provizije, če je mogoče</translation>
-    </message>
-    <message>
-        <source>(confirmation may take longer)</source>
-        <translation>(čas do potrditve je lahko daljši)</translation>
-    </message>
     <message>
         <source>Send to multiple recipients at once</source>
         <translation>Pošlji več prejemnikom hkrati</translation>
@@ -1929,110 +1310,6 @@
         <source>S&amp;end</source>
         <translation>&amp;Pošlji</translation>
     </message>
-    <message>
-        <source>Confirm send coins</source>
-        <translation>Potrdi pošiljanje</translation>
-    </message>
-    <message>
-        <source>%1 to %2</source>
-        <translation>%1 na %2</translation>
-    </message>
-    <message>
-        <source>Copy quantity</source>
-        <translation>Kopiraj število vhodov</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>Kopiraj znesek</translation>
-    </message>
-    <message>
-        <source>Copy fee</source>
-        <translation>Kopiraj provizijo</translation>
-    </message>
-    <message>
-        <source>Copy after fee</source>
-        <translation>Kopiraj Po proviziji</translation>
-    </message>
-    <message>
-        <source>Copy bytes</source>
-        <translation>Kopiraj bajte</translation>
-    </message>
-    <message>
-        <source>Copy priority</source>
-        <translation>Kopiraj prioriteto</translation>
-    </message>
-    <message>
-        <source>Copy change</source>
-        <translation>Kopiraj vračilo</translation>
-    </message>
-    <message>
-        <source>or</source>
-        <translation>ali</translation>
-    </message>
-    <message>
-        <source>The amount to pay must be larger than 0.</source>
-        <translation>Znesek za plačilo mora biti večji od 0.</translation>
-    </message>
-    <message>
-        <source>The amount exceeds your balance.</source>
-        <translation>Znesek je večji od stanja sredstev, s katerimi razpolagate.</translation>
-    </message>
-    <message>
-        <source>The total exceeds your balance when the %1 transaction fee is included.</source>
-        <translation>Celotni znesek z vključeno provizijo %1 je večji od stanja sredstev, s katerimi razpolagate.</translation>
-    </message>
-    <message>
-        <source>Transaction creation failed!</source>
-        <translation>Transakcije ni bilo mogoče ustvariti!</translation>
-    </message>
-    <message>
-        <source>The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source>
-        <translation>Transakcija je bila zavrnjena! To se lahko zgodi, če so bili kateri od kovancev iz denarnice že porabljeni, kot v primeru, da ste kje uporabili kopijo datoteke wallet.dat in kovance tam že porabili, lokalno pa ti še niso bili označeni kot porabljeni.</translation>
-    </message>
-    <message>
-        <source>A fee higher than %1 is considered an absurdly high fee.</source>
-        <translation>Provizija, višja od %1, velja za nesmiselno visoko.</translation>
-    </message>
-    <message>
-        <source>Payment request expired.</source>
-        <translation>Zahtevek za plačilo je potekel.</translation>
-    </message>
-    <message numerus="yes">
-        <source>Estimated to begin confirmation within %n block(s).</source>
-        <translation><numerusform>Predviden začetek potrditev po %n najdenem bloku.</numerusform><numerusform>Predviden začetek potrditev po %n najdenih blokih.</numerusform><numerusform>Predviden začetek potrditev po %n najdenih blokih.</numerusform><numerusform>Predviden začetek potrditev po %n najdenih blokih.</numerusform></translation>
-    </message>
-    <message>
-        <source>The recipient address is not valid. Please recheck.</source>
-        <translation>Naslov prejemnika je neveljaven. Prosimo, preverite.</translation>
-    </message>
-    <message>
-        <source>Duplicate address found: addresses should only be used once each.</source>
-        <translation>Naslov je že bil uporabljen. Vsak naslov naj bi se uporabil samo enkrat.</translation>
-    </message>
-    <message>
-        <source>Warning: Invalid Bitcoin address</source>
-        <translation>Opozorilo: Neveljaven bitcoin naslov</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(brez oznake)</translation>
-    </message>
-    <message>
-        <source>Warning: Unknown change address</source>
-        <translation>Opozorilo: Neznan naslov za vračilo drobiža</translation>
-    </message>
-    <message>
-        <source>Copy dust</source>
-        <translation>Kopiraj prah</translation>
-    </message>
-    <message>
-        <source>Are you sure you want to send?</source>
-        <translation>Ali ste prepričani, da želite izvesti plačilo?</translation>
-    </message>
-    <message>
-        <source>added as transaction fee</source>
-        <translation>dodano kot provizija transakcije</translation>
-    </message>
 </context>
 <context>
     <name>SendCoinsEntry</name>
@@ -2044,10 +1321,6 @@
         <source>Pay &amp;To:</source>
         <translation>Prejemnik &amp;plačila:</translation>
     </message>
-    <message>
-        <source>Enter a label for this address to add it to your address book</source>
-        <translation>Vnesite oznako, pod katero bo zgornji naslov shranjen v imenik</translation>
-    </message>
     <message>
         <source>&amp;Label:</source>
         <translation>&amp;Oznaka:</translation>
@@ -2119,10 +1392,6 @@
 </context>
 <context>
     <name>ShutdownWindow</name>
-    <message>
-        <source>Bitcoin Core is shutting down...</source>
-        <translation>Program se ustavlja ...</translation>
-    </message>
     <message>
         <source>Do not shut down the computer until this window disappears.</source>
         <translation>Dokler to okno ne izgine, ne zaustavljajte računalnika.</translation>
@@ -2214,582 +1483,72 @@
         <source>Reset all verify message fields</source>
         <translation>Počisti vsa polja za vnos v oknu za preverjanje</translation>
     </message>
+</context>
+<context>
+    <name>SplashScreen</name>
     <message>
-        <source>Click "Sign Message" to generate signature</source>
-        <translation>Kliknite "Podpiši sporočilo" da ustvarite podpis</translation>
+        <source>[testnet]</source>
+        <translation>[testnet]</translation>
     </message>
+</context>
+<context>
+    <name>TrafficGraphWidget</name>
     <message>
-        <source>The entered address is invalid.</source>
-        <translation>Vnešeni naslov ni veljaven.</translation>
+        <source>KB/s</source>
+        <translation>KiB/s</translation>
     </message>
+</context>
+<context>
+    <name>TransactionDescDialog</name>
     <message>
-        <source>Please check the address and try again.</source>
-        <translation>Prosimo preverite naslov in poskusite znova.</translation>
+        <source>This pane shows a detailed description of the transaction</source>
+        <translation>V tem podoknu so prikazane podrobnosti o transakciji</translation>
     </message>
+</context>
+<context>
+    <name>UnitDisplayStatusBarControl</name>
     <message>
-        <source>The entered address does not refer to a key.</source>
-        <translation>Vnešeni naslov se ne nanaša na noben ključ.</translation>
+        <source>Unit to show amounts in. Click to select another unit.</source>
+        <translation>Merska enota za prikaz zneskov. Kliknite za izbiro druge enote.</translation>
     </message>
+</context>
+<context>
+    <name>bitcoin-core</name>
     <message>
-        <source>Wallet unlock was cancelled.</source>
-        <translation>Odklepanje denarnice je bilo preklicano.</translation>
+        <source>Options:</source>
+        <translation>Možnosti:</translation>
     </message>
     <message>
-        <source>Private key for the entered address is not available.</source>
-        <translation>Zasebni ključ vnešenega naslova ni na voljo.</translation>
+        <source>Specify data directory</source>
+        <translation>Izberite podatkovno mapo</translation>
     </message>
     <message>
-        <source>Message signing failed.</source>
-        <translation>Podpisa ni bilo mogoče ustvariti.</translation>
+        <source>Connect to a node to retrieve peer addresses, and disconnect</source>
+        <translation>Povežite se z vozliščem za pridobitev naslovov soležnikov in nato prekinite povezavo.</translation>
     </message>
     <message>
-        <source>Message signed.</source>
-        <translation>Podpis je bil ustvarjen.</translation>
+        <source>Specify your own public address</source>
+        <translation>Določite vaš lasten javni naslov</translation>
     </message>
     <message>
-        <source>The signature could not be decoded.</source>
-        <translation>Podpisa ni bilo mogoče razbrati.</translation>
+        <source>Accept command line and JSON-RPC commands</source>
+        <translation>Sprejemaj ukaze iz ukazne vrstice in preko JSON-RPC</translation>
     </message>
     <message>
-        <source>Please check the signature and try again.</source>
-        <translation>Prosimo preverite podpis in poskusite znova.</translation>
+        <source>Run in the background as a daemon and accept commands</source>
+        <translation>Teci v ozadju in sprejemaj ukaze</translation>
     </message>
     <message>
-        <source>The signature did not match the message digest.</source>
-        <translation>Podpis se ne ujema z rezultatom funkcije preverjanja.</translation>
+        <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
+        <translation>Sprejemaj zunanje povezave (privzeto: 1, razen če ste vklopili opciji -proxy ali -connect)</translation>
     </message>
     <message>
-        <source>Message verification failed.</source>
-        <translation>Podpis ni veljaven za to sporočilo.</translation>
+        <source>Bitcoin Core</source>
+        <translation>Bitcoin Core</translation>
     </message>
     <message>
-        <source>Message verified.</source>
-        <translation>Podpis sporočila je veljaven.</translation>
-    </message>
-</context>
-<context>
-    <name>SplashScreen</name>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Bitcoin Core</translation>
-    </message>
-    <message>
-        <source>The Bitcoin Core developers</source>
-        <translation>Bitcoin Core razvijalci</translation>
-    </message>
-    <message>
-        <source>[testnet]</source>
-        <translation>[testnet]</translation>
-    </message>
-</context>
-<context>
-    <name>TrafficGraphWidget</name>
-    <message>
-        <source>KB/s</source>
-        <translation>KiB/s</translation>
-    </message>
-</context>
-<context>
-    <name>TransactionDesc</name>
-    <message>
-        <source>Open until %1</source>
-        <translation>Odprto do %1</translation>
-    </message>
-    <message>
-        <source>conflicted</source>
-        <translation>v konfliktu</translation>
-    </message>
-    <message>
-        <source>%1/offline</source>
-        <translation>%1/brez povezave</translation>
-    </message>
-    <message>
-        <source>%1/unconfirmed</source>
-        <translation>%1/nepotrjeno</translation>
-    </message>
-    <message>
-        <source>%1 confirmations</source>
-        <translation>%1 potrdil</translation>
-    </message>
-    <message>
-        <source>Status</source>
-        <translation>Status</translation>
-    </message>
-    <message numerus="yes">
-        <source>, broadcast through %n node(s)</source>
-        <translation><numerusform>, posredovano %n vozlišču</numerusform><numerusform>, posredovano %n vozliščema</numerusform><numerusform>, posredovano %n vozliščem</numerusform><numerusform>, posredovano %n vozliščem</numerusform></translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation>Datum</translation>
-    </message>
-    <message>
-        <source>Source</source>
-        <translation>Izvor</translation>
-    </message>
-    <message>
-        <source>Generated</source>
-        <translation>Generirano</translation>
-    </message>
-    <message>
-        <source>From</source>
-        <translation>Pošiljatelj</translation>
-    </message>
-    <message>
-        <source>To</source>
-        <translation>Prejemnik</translation>
-    </message>
-    <message>
-        <source>own address</source>
-        <translation>lasten naslov</translation>
-    </message>
-    <message>
-        <source>watch-only</source>
-        <translation>opazovano</translation>
-    </message>
-    <message>
-        <source>label</source>
-        <translation>oznaka</translation>
-    </message>
-    <message>
-        <source>Credit</source>
-        <translation>V dobro</translation>
-    </message>
-    <message numerus="yes">
-        <source>matures in %n more block(s)</source>
-        <translation><numerusform>dozori po %n najdenem bloku</numerusform><numerusform>dozori po %n najdenih blokih</numerusform><numerusform>dozori po %n najdenih blokih</numerusform><numerusform>dozori po %n najdenih blokih</numerusform></translation>
-    </message>
-    <message>
-        <source>not accepted</source>
-        <translation>ni bilo sprejeto</translation>
-    </message>
-    <message>
-        <source>Debit</source>
-        <translation>Debit</translation>
-    </message>
-    <message>
-        <source>Total debit</source>
-        <translation>Skupaj v breme</translation>
-    </message>
-    <message>
-        <source>Total credit</source>
-        <translation>Skupaj v dobro</translation>
-    </message>
-    <message>
-        <source>Transaction fee</source>
-        <translation>Provizija transakcije</translation>
-    </message>
-    <message>
-        <source>Net amount</source>
-        <translation>Neto znesek</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>Sporočilo</translation>
-    </message>
-    <message>
-        <source>Comment</source>
-        <translation>Opomba</translation>
-    </message>
-    <message>
-        <source>Transaction ID</source>
-        <translation>ID transakcije</translation>
-    </message>
-    <message>
-        <source>Merchant</source>
-        <translation>Trgovec</translation>
-    </message>
-    <message>
-        <source>Generated coins must mature %1 blocks before they can be spent. When you generated this block, it was broadcast to the network to be added to the block chain. If it fails to get into the chain, its state will change to "not accepted" and it won't be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source>
-        <translation>Ustvarjeni kovanci morajo zoreti %1 blokov, preden jih lahko porabite. Ko ste ta blok zgenerirali, je bil posredovan v omrežje, da bo dodan v verigo. Če se bloku ni uspelo uvrstiti v verigo, se bo njegovo stanje spremenilo v "ni bilo sprejeto" in kovancev ne bo mogoče porabiti. To se včasih zgodi, če kak drug rudar v roku nekaj sekund hkrati z vami odkrije drug blok.</translation>
-    </message>
-    <message>
-        <source>Debug information</source>
-        <translation>Razhroščevalne informacije</translation>
-    </message>
-    <message>
-        <source>Transaction</source>
-        <translation>Transakcija</translation>
-    </message>
-    <message>
-        <source>Inputs</source>
-        <translation>Vhodi</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>Znesek</translation>
-    </message>
-    <message>
-        <source>true</source>
-        <translation>pravilno</translation>
-    </message>
-    <message>
-        <source>false</source>
-        <translation>nepravilno</translation>
-    </message>
-    <message>
-        <source>, has not been successfully broadcast yet</source>
-        <translation>, še ni bila uspešno raznešena</translation>
-    </message>
-    <message numerus="yes">
-        <source>Open for %n more block(s)</source>
-        <translation><numerusform>Še %n blok do potrditve</numerusform><numerusform>Še %n bloka do potrditve</numerusform><numerusform>Še %n bloki do potrditve</numerusform><numerusform>Še %n blokov do potrditve</numerusform></translation>
-    </message>
-    <message>
-        <source>unknown</source>
-        <translation>neznano</translation>
-    </message>
-</context>
-<context>
-    <name>TransactionDescDialog</name>
-    <message>
-        <source>Transaction details</source>
-        <translation>Podrobnosti transakcije</translation>
-    </message>
-    <message>
-        <source>This pane shows a detailed description of the transaction</source>
-        <translation>V tem podoknu so prikazane podrobnosti o transakciji</translation>
-    </message>
-</context>
-<context>
-    <name>TransactionTableModel</name>
-    <message>
-        <source>Date</source>
-        <translation>Datum</translation>
-    </message>
-    <message>
-        <source>Type</source>
-        <translation>Vrsta</translation>
-    </message>
-    <message>
-        <source>Immature (%1 confirmations, will be available after %2)</source>
-        <translation>Nedozorelo (št. potrditev: %1, na voljo šele po: %2)</translation>
-    </message>
-    <message numerus="yes">
-        <source>Open for %n more block(s)</source>
-        <translation><numerusform>Še %n blok do potrditve</numerusform><numerusform>Še %n bloka do potrditve</numerusform><numerusform>Še %n bloki do potrditve</numerusform><numerusform>Še %n blokov do potrditve</numerusform></translation>
-    </message>
-    <message>
-        <source>Open until %1</source>
-        <translation>Odprto do %1</translation>
-    </message>
-    <message>
-        <source>Confirmed (%1 confirmations)</source>
-        <translation>Potrjeno (%1 potrdil)</translation>
-    </message>
-    <message>
-        <source>This block was not received by any other nodes and will probably not be accepted!</source>
-        <translation>Ta blok ni prejelo še nobeno vozlišče. Najverjetneje ne bo sprejet!</translation>
-    </message>
-    <message>
-        <source>Generated but not accepted</source>
-        <translation>Generirano, toda ne sprejeto</translation>
-    </message>
-    <message>
-        <source>Offline</source>
-        <translation>Brez povezave</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Oznaka</translation>
-    </message>
-    <message>
-        <source>Unconfirmed</source>
-        <translation>Nepotrjeno</translation>
-    </message>
-    <message>
-        <source>Confirming (%1 of %2 recommended confirmations)</source>
-        <translation>V potrjevanju (št. potrditev: %1 od priporočenih %2)</translation>
-    </message>
-    <message>
-        <source>Conflicted</source>
-        <translation>V konfliktu</translation>
-    </message>
-    <message>
-        <source>Received with</source>
-        <translation>Prejemek</translation>
-    </message>
-    <message>
-        <source>Received from</source>
-        <translation>Prejemek</translation>
-    </message>
-    <message>
-        <source>Sent to</source>
-        <translation>Izdatek</translation>
-    </message>
-    <message>
-        <source>Payment to yourself</source>
-        <translation>Nakazilo sebi</translation>
-    </message>
-    <message>
-        <source>Mined</source>
-        <translation>Narudarjeno</translation>
-    </message>
-    <message>
-        <source>watch-only</source>
-        <translation>opazovano</translation>
-    </message>
-    <message>
-        <source>(n/a)</source>
-        <translation>(ni na voljo)</translation>
-    </message>
-    <message>
-        <source>Transaction status. Hover over this field to show number of confirmations.</source>
-        <translation>Stanje transakcije. Zapeljite z miško čez to polje za prikaz števila potrdil. </translation>
-    </message>
-    <message>
-        <source>Date and time that the transaction was received.</source>
-        <translation>Datum in čas, ko je transakcija bila prejeta.</translation>
-    </message>
-    <message>
-        <source>Type of transaction.</source>
-        <translation>Vrsta transakcije.</translation>
-    </message>
-    <message>
-        <source>Whether or not a watch-only address is involved in this transaction.</source>
-        <translation>Ali je v transakciji udeležen kateri od opazovanih naslovov.</translation>
-    </message>
-    <message>
-        <source>User-defined intent/purpose of the transaction.</source>
-        <translation>Uporabniško določen namen transakcije.</translation>
-    </message>
-    <message>
-        <source>Amount removed from or added to balance.</source>
-        <translation>Znesek spremembe stanja sredstev.</translation>
-    </message>
-</context>
-<context>
-    <name>TransactionView</name>
-    <message>
-        <source>All</source>
-        <translation>Vse</translation>
-    </message>
-    <message>
-        <source>Today</source>
-        <translation>Danes</translation>
-    </message>
-    <message>
-        <source>This week</source>
-        <translation>Ta teden</translation>
-    </message>
-    <message>
-        <source>This month</source>
-        <translation>Ta mesec</translation>
-    </message>
-    <message>
-        <source>Last month</source>
-        <translation>Prejšnji mesec</translation>
-    </message>
-    <message>
-        <source>This year</source>
-        <translation>To leto</translation>
-    </message>
-    <message>
-        <source>Range...</source>
-        <translation>Območje ...</translation>
-    </message>
-    <message>
-        <source>Received with</source>
-        <translation>Prejemek</translation>
-    </message>
-    <message>
-        <source>Sent to</source>
-        <translation>Izdatek</translation>
-    </message>
-    <message>
-        <source>To yourself</source>
-        <translation>Nakazilo sebi</translation>
-    </message>
-    <message>
-        <source>Mined</source>
-        <translation>Narudarjeno</translation>
-    </message>
-    <message>
-        <source>Other</source>
-        <translation>Drugo</translation>
-    </message>
-    <message>
-        <source>Enter address or label to search</source>
-        <translation>Iščite po naslovu ali oznaki</translation>
-    </message>
-    <message>
-        <source>Min amount</source>
-        <translation>Minimalni znesek</translation>
-    </message>
-    <message>
-        <source>Copy address</source>
-        <translation>Kopiraj naslov</translation>
-    </message>
-    <message>
-        <source>Copy label</source>
-        <translation>Kopiraj oznako</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>Kopiraj znesek</translation>
-    </message>
-    <message>
-        <source>Copy transaction ID</source>
-        <translation>Kopiraj ID transakcije</translation>
-    </message>
-    <message>
-        <source>Edit label</source>
-        <translation>Uredi oznako</translation>
-    </message>
-    <message>
-        <source>Show transaction details</source>
-        <translation>Prikaži podrobnosti transakcije</translation>
-    </message>
-    <message>
-        <source>Export Transaction History</source>
-        <translation>Izvoz zgodovine transakcij</translation>
-    </message>
-    <message>
-        <source>Watch-only</source>
-        <translation>Opazovano</translation>
-    </message>
-    <message>
-        <source>Exporting Failed</source>
-        <translation>Seznama transakcij ni bilo mogoče izvoziti.</translation>
-    </message>
-    <message>
-        <source>There was an error trying to save the transaction history to %1.</source>
-        <translation>Prišlo je do napake med shranjevanjem zgodovine transakcij v datoteko %1.</translation>
-    </message>
-    <message>
-        <source>Exporting Successful</source>
-        <translation>Uspešen izvoz</translation>
-    </message>
-    <message>
-        <source>The transaction history was successfully saved to %1.</source>
-        <translation>Zgodovina poteklih transakcij je bila uspešno shranjena v datoteko %1.</translation>
-    </message>
-    <message>
-        <source>Comma separated file (*.csv)</source>
-        <translation>Datoteka s podatki, ločenimi z vejico (*.csv)</translation>
-    </message>
-    <message>
-        <source>Confirmed</source>
-        <translation>Potrjeno</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation>Datum</translation>
-    </message>
-    <message>
-        <source>Type</source>
-        <translation>Vrsta</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Oznaka</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>Naslov</translation>
-    </message>
-    <message>
-        <source>ID</source>
-        <translation>ID</translation>
-    </message>
-    <message>
-        <source>Range:</source>
-        <translation>Območje:</translation>
-    </message>
-    <message>
-        <source>to</source>
-        <translation>za</translation>
-    </message>
-</context>
-<context>
-    <name>UnitDisplayStatusBarControl</name>
-    <message>
-        <source>Unit to show amounts in. Click to select another unit.</source>
-        <translation>Merska enota za prikaz zneskov. Kliknite za izbiro druge enote.</translation>
-    </message>
-</context>
-<context>
-    <name>WalletFrame</name>
-    <message>
-        <source>No wallet has been loaded.</source>
-        <translation>Denarnica ni bila naložena.</translation>
-    </message>
-</context>
-<context>
-    <name>WalletModel</name>
-    <message>
-        <source>Send Coins</source>
-        <translation>Pošlji</translation>
-    </message>
-</context>
-<context>
-    <name>WalletView</name>
-    <message>
-        <source>&amp;Export</source>
-        <translation>&amp;Izvozi</translation>
-    </message>
-    <message>
-        <source>Export the data in the current tab to a file</source>
-        <translation>Izvozi podatke iz trenutnega zavihka v datoteko</translation>
-    </message>
-    <message>
-        <source>Backup Wallet</source>
-        <translation>Izdelava varnostne kopije denarnice</translation>
-    </message>
-    <message>
-        <source>Wallet Data (*.dat)</source>
-        <translation>Podatki denarnice (*.dat)</translation>
-    </message>
-    <message>
-        <source>Backup Failed</source>
-        <translation>Varnostne kopije ni bilo mogoče izdelati.</translation>
-    </message>
-    <message>
-        <source>There was an error trying to save the wallet data to %1.</source>
-        <translation>Prišlo je do napake pri shranjevanju podatkov denarnice v datoteko %1.</translation>
-    </message>
-    <message>
-        <source>The wallet data was successfully saved to %1.</source>
-        <translation>Podatki iz denarnice so bili uspešno shranjeni v datoteko %1.</translation>
-    </message>
-    <message>
-        <source>Backup Successful</source>
-        <translation>Varnostna kopija je bila uspešno izdelana</translation>
-    </message>
-</context>
-<context>
-    <name>bitcoin-core</name>
-    <message>
-        <source>Options:</source>
-        <translation>Možnosti:</translation>
-    </message>
-    <message>
-        <source>Specify data directory</source>
-        <translation>Izberite podatkovno mapo</translation>
-    </message>
-    <message>
-        <source>Connect to a node to retrieve peer addresses, and disconnect</source>
-        <translation>Povežite se z vozliščem za pridobitev naslovov soležnikov in nato prekinite povezavo.</translation>
-    </message>
-    <message>
-        <source>Specify your own public address</source>
-        <translation>Določite vaš lasten javni naslov</translation>
-    </message>
-    <message>
-        <source>Accept command line and JSON-RPC commands</source>
-        <translation>Sprejemaj ukaze iz ukazne vrstice in preko JSON-RPC</translation>
-    </message>
-    <message>
-        <source>Run in the background as a daemon and accept commands</source>
-        <translation>Teci v ozadju in sprejemaj ukaze</translation>
-    </message>
-    <message>
-        <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
-        <translation>Sprejemaj zunanje povezave (privzeto: 1, razen če ste vklopili opciji -proxy ali -connect)</translation>
-    </message>
-    <message>
-        <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source>
-        <translation>Veži dani naslov in tam vedno poslušaj. Za naslove protokola IPv6 uporabite zapis [gostitelj]:vrata.</translation>
+        <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source>
+        <translation>Veži dani naslov in tam vedno poslušaj. Za naslove protokola IPv6 uporabite zapis [gostitelj]:vrata.</translation>
     </message>
     <message>
         <source>Distributed under the MIT software license, see the accompanying file COPYING or &lt;http://www.opensource.org/licenses/mit-license.php&gt;.</source>
@@ -2807,10 +1566,6 @@
         <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
         <translation>To je preizkusna različica še neizdanega programa. Uporabljate jo na lastno odgovornost. Programa ne uporabljajte je za rudarjenje ali trgovske aplikacije.</translation>
     </message>
-    <message>
-        <source>Unable to bind to %s on this computer. Bitcoin Core is probably already running.</source>
-        <translation>Na tem računalniku ni bilo mogoče vezati naslova %s. Odjemalec Bitcoin Core je verjetno že zagnan.</translation>
-    </message>
     <message>
         <source>WARNING: abnormally high number of blocks generated, %d blocks received in the last %d hours (%d expected)</source>
         <translation>OPOZORILO: Generirano je bilo nenavadno veliko število blokov. Št. prejetih blokov: %d v št. ur: %d (pričakovanih je %d blokov)</translation>
@@ -2827,10 +1582,6 @@
         <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source>
         <translation>Opozorilo: Trenutno se s soležniki ne strinjam v popolnosti! Mogoče bi morali vi ali drugi udeleženci posodobiti odjemalce.</translation>
     </message>
-    <message>
-        <source>Warning: wallet.dat corrupt, data salvaged! Original wallet.dat saved as wallet.{timestamp}.bak in %s; if your balance or transactions are incorrect you should restore from a backup.</source>
-        <translation>Opozorilo: Datoteka wallet.dat je bila okvarjena, podatki pa so bili kljub temu rešeni! Originalna datoteka je bila shranjena kot wallet.{čas.oznaka}.bak v mapo %s. Če sta skupno stanje ali seznam transakcij napačna, morate datoteko restavrirati iz varnostne kopije.</translation>
-    </message>
     <message>
         <source>Whitelist peers connecting from the given netmask or IP address. Can be specified multiple times.</source>
         <translation>Sprejemaj povezave samo od soležnikov, ki so na naslovih, ki ustrezajo navedeni omrežni maski ali naslovu. Opcijo lahko navedete večkrat.</translation>
@@ -2951,10 +1702,6 @@
         <source>Wallet options:</source>
         <translation>Izbire denarnice:</translation>
     </message>
-    <message>
-        <source>You need to rebuild the database using -reindex to change -txindex</source>
-        <translation>Ob spremembi vrednosti opcije -txindex boste morali obnoviti bazo podatkov z uporabo opcije -reindex</translation>
-    </message>
     <message>
         <source>Allow JSON-RPC connections from specified source. Valid for &lt;ip&gt; are a single IP (e.g. 1.2.3.4), a network/netmask (e.g. 1.2.3.4/255.255.255.0) or a network/CIDR (e.g. 1.2.3.4/24). This option can be specified multiple times</source>
         <translation>Iz navedenega vira dovoli povezave na JSON-RPC. Veljavne oblike vrednosti parametra &lt;ip&gt; so: edinstven naslov IP (npr.: 1.2.3.4), kombinacija omrežje/netmask (npr.: 1.2.3.4/255.255.255.0), ali pa kombinacija omrežje/CIDR (1.2.3.4/24). To opcijo lahko navedete večkrat.</translation>
@@ -2967,10 +1714,6 @@
         <source>Bind to given address to listen for JSON-RPC connections. Use [host]:port notation for IPv6. This option can be specified multiple times (default: bind to all interfaces)</source>
         <translation>Veži dani naslov in sprejemaj povezave na JSON-RPC. Za naslove protokola IPv6 uporabite zapis [gostitelj]:vrata. To opcijo lahko navedete večkrat. (privzeto: veži vse omrežne vmesnike)</translation>
     </message>
-    <message>
-        <source>Cannot obtain a lock on data directory %s. Bitcoin Core is probably already running.</source>
-        <translation>Ne morem zakleniti podatkovne mape %s. Bitcoin Core je verjetno že zagnan.</translation>
-    </message>
     <message>
         <source>Create new files with system default permissions, instead of umask 077 (only effective with disabled wallet functionality)</source>
         <translation>Ustvarjaj nove datoteke s privzetimi sistemskimi dovoljenji, namesto z umask 077. (To pride v poštev samo, kadar imate izklopljeno funkcijo denarnice.)</translation>
@@ -2999,38 +1742,14 @@
         <source>(default: %u)</source>
         <translation>(privzeto: %u)</translation>
     </message>
-    <message>
-        <source>Activating best chain...</source>
-        <translation>Prehajam na najboljšo verigo ...</translation>
-    </message>
-    <message>
-        <source>Cannot resolve -whitebind address: '%s'</source>
-        <translation>Naslova %s, podanega pri opciji -whitebind ni mogoče razrešiti.</translation>
-    </message>
     <message>
         <source>Connect through SOCKS5 proxy</source>
         <translation>Poveži se preko posredniškega strežnika SOCKS5</translation>
     </message>
-    <message>
-        <source>Copyright (C) 2009-%i The Bitcoin Core Developers</source>
-        <translation>Copyright (C) 2009-%i The Bitcoin Core Developers</translation>
-    </message>
     <message>
         <source>Information</source>
         <translation>Informacije</translation>
     </message>
-    <message>
-        <source>Invalid amount for -maxtxfee=&lt;amount&gt;: '%s'</source>
-        <translation>Neveljavna količina za -maxtxfee=&lt;amount&gt;: '%s'</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -minrelaytxfee=&lt;amount&gt;: '%s'</source>
-        <translation>Neveljavna količina za -minrelaytxfee=&lt;amount&gt;: '%s'</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -mintxfee=&lt;amount&gt;: '%s'</source>
-        <translation>Neveljavna količina za -mintxfee=&lt;amount&gt;: '%s'</translation>
-    </message>
     <message>
         <source>Need to specify a port with -whitebind: '%s'</source>
         <translation>Pri opciji -whitebind morate navesti vrata: %s</translation>
@@ -3079,10 +1798,6 @@
         <source>Zapping all transactions from wallet...</source>
         <translation>Brišem vse transakcije iz denarnice ...</translation>
     </message>
-    <message>
-        <source>wallet.dat corrupt, salvage failed</source>
-        <translation>Datoteka wallet.dat je poškodovana in je ni bilo mogoče obnoviti.</translation>
-    </message>
     <message>
         <source>Password for JSON-RPC connections</source>
         <translation>Geslo za povezave na JSON-RPC</translation>
@@ -3091,10 +1806,6 @@
         <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
         <translation>Izvedi ukaz, ko je najden najboljši blok (niz %s v ukazu bo zamenjan s hash vrednostjo bloka)</translation>
     </message>
-    <message>
-        <source>This help message</source>
-        <translation>To sporočilo pomoči</translation>
-    </message>
     <message>
         <source>Allow DNS lookups for -addnode, -seednode and -connect</source>
         <translation>Omogoči poizvedbe DNS za opcije -addnode, -seednode in -connect.</translation>
@@ -3103,10 +1814,6 @@
         <source>Loading addresses...</source>
         <translation>Nalagam naslove ...</translation>
     </message>
-    <message>
-        <source>Error loading wallet.dat: Wallet corrupted</source>
-        <translation>Napaka pri nalaganju wallet.dat: denarnica pokvarjena</translation>
-    </message>
     <message>
         <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: %s)</source>
         <translation>Za dostop do soležnikov preko skritih storitev Tor uporabi drug posredniški strežnik SOCKS5 (privzeto: %s)</translation>
@@ -3115,10 +1822,6 @@
         <source>(default: %s)</source>
         <translation>(privzeto: %s)</translation>
     </message>
-    <message>
-        <source>Error loading wallet.dat</source>
-        <translation>Napaka pri nalaganju wallet.dat</translation>
-    </message>
     <message>
         <source>Invalid -proxy address: '%s'</source>
         <translation>Neveljaven naslov -proxy: '%s'</translation>
@@ -3151,18 +1854,6 @@
         <source>Unknown network specified in -onlynet: '%s'</source>
         <translation>Neznano omrežje določeno v -onlynet: '%s'.</translation>
     </message>
-    <message>
-        <source>Cannot resolve -bind address: '%s'</source>
-        <translation>Naslova %s, podanega pri opciji -bind ni mogoče razrešiti.</translation>
-    </message>
-    <message>
-        <source>Cannot resolve -externalip address: '%s'</source>
-        <translation>Naslova "%s", podanega pri opciji -externalip ni mogoče razrešiti.</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -paytxfee=&lt;amount&gt;: '%s'</source>
-        <translation>Neveljavna količina za -paytxfee=&lt;amount&gt;: '%s'</translation>
-    </message>
     <message>
         <source>Insufficient funds</source>
         <translation>Premalo sredstev</translation>
diff --git a/src/qt/locale/bitcoin_sq.ts b/src/qt/locale/bitcoin_sq.ts
index d87bd9db5811a..6c86b7d9fcd87 100644
--- a/src/qt/locale/bitcoin_sq.ts
+++ b/src/qt/locale/bitcoin_sq.ts
@@ -21,10 +21,6 @@
         <source>&amp;Copy</source>
         <translation>&amp;Kopjo</translation>
     </message>
-    <message>
-        <source>&amp;Copy Address</source>
-        <translation>&amp;Kopjo adresen</translation>
-    </message>
     <message>
         <source>Delete the currently selected address from the list</source>
         <translation>Fshi adresen e selektuar nga lista</translation>
@@ -37,65 +33,6 @@
         <source>&amp;Delete</source>
         <translation>&amp;Fshi</translation>
     </message>
-    <message>
-        <source>Choose the address to send coins to</source>
-        <translation>Zgjidh adresen ku do te dergoni monedhat</translation>
-    </message>
-    <message>
-        <source>Sending addresses</source>
-        <translation>Duke derguar adresen</translation>
-    </message>
-    <message>
-        <source>Receiving addresses</source>
-        <translation>Duke marr adresen</translation>
-    </message>
-    <message>
-        <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source>
-        <translation>Këto janë Bitcoin adresat e juaja për të dërguar pagesa. Gjithmon kontrolloni shumën dhe adresën pranuese para se të dërgoni monedha.</translation>
-    </message>
-    <message>
-        <source>These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source>
-        <translation>Këto janë Bitcoin adresat e juaja për të pranuar pagesa. Rekomandohet që gjithmon të përdorni një adresë të re për çdo transaksion.</translation>
-    </message>
-    <message>
-        <source>Copy &amp;Label</source>
-        <translation>Kopjo &amp;Etiketë</translation>
-    </message>
-    <message>
-        <source>&amp;Edit</source>
-        <translation>&amp;Ndrysho</translation>
-    </message>
-    <message>
-        <source>Export Address List</source>
-        <translation>Eksporto listën e adresave</translation>
-    </message>
-    <message>
-        <source>Comma separated file (*.csv)</source>
-        <translation>Skedar i ndarë me pikëpresje(*.csv)</translation>
-    </message>
-    <message>
-        <source>Exporting Failed</source>
-        <translation>Eksportimi dështoj</translation>
-    </message>
-    <message>
-        <source>There was an error trying to save the address list to %1. Please try again.</source>
-        <translation>Gabim gjatë ruajtjes së listës së adresave në %1. Ju lutem provoni prapë.</translation>
-    </message>
-</context>
-<context>
-    <name>AddressTableModel</name>
-    <message>
-        <source>Label</source>
-        <translation>Etiketë</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>Adresë</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(pa etiketë)</translation>
-    </message>
 </context>
 <context>
     <name>AskPassphraseDialog</name>
@@ -111,67 +48,7 @@
         <source>Repeat new passphrase</source>
         <translation>Përsërisni frazkalimin e ri</translation>
     </message>
-    <message>
-        <source>Encrypt wallet</source>
-        <translation>Kripto portofolin</translation>
-    </message>
-    <message>
-        <source>This operation needs your wallet passphrase to unlock the wallet.</source>
-        <translation>Ky veprim ka nevojë per frazkalimin e portofolit tuaj që të ç'kyç portofolin.</translation>
-    </message>
-    <message>
-        <source>Unlock wallet</source>
-        <translation>ç'kyç portofolin.</translation>
-    </message>
-    <message>
-        <source>This operation needs your wallet passphrase to decrypt the wallet.</source>
-        <translation>Ky veprim kërkon frazkalimin e portofolit tuaj që të dekriptoj portofolin.</translation>
-    </message>
-    <message>
-        <source>Decrypt wallet</source>
-        <translation>Dekripto portofolin</translation>
-    </message>
-    <message>
-        <source>Change passphrase</source>
-        <translation>Ndrysho frazkalimin</translation>
-    </message>
-    <message>
-        <source>Confirm wallet encryption</source>
-        <translation>Konfirmoni enkriptimin e portofolit</translation>
-    </message>
-    <message>
-        <source>Are you sure you wish to encrypt your wallet?</source>
-        <translation>Jeni te sigurt te enkriptoni portofolin tuaj?</translation>
-    </message>
-    <message>
-        <source>Wallet encrypted</source>
-        <translation>Portofoli u enkriptua</translation>
-    </message>
-    <message>
-        <source>Wallet encryption failed</source>
-        <translation>Enkriptimi i portofolit dështoi</translation>
-    </message>
-    <message>
-        <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
-        <translation>Enkriptimi i portofolit dështoi për shkak të një gabimi të brëndshëm. portofoli juaj nuk u enkriptua.</translation>
-    </message>
-    <message>
-        <source>The supplied passphrases do not match.</source>
-        <translation>Frazkalimet e plotësuara nuk përputhen.</translation>
-    </message>
-    <message>
-        <source>Wallet unlock failed</source>
-        <translation>ç'kyçja e portofolit dështoi</translation>
-    </message>
-    <message>
-        <source>The passphrase entered for the wallet decryption was incorrect.</source>
-        <translation>Frazkalimi i futur për dekriptimin e portofolit nuk ishte i saktë.</translation>
-    </message>
-    <message>
-        <source>Wallet decryption failed</source>
-        <translation>Dekriptimi i portofolit dështoi</translation>
-    </message>
-    </context>
+</context>
 <context>
     <name>BanTableModel</name>
     </context>
@@ -249,14 +126,6 @@
         <source>Tabs toolbar</source>
         <translation>Shiriti i mjeteve</translation>
     </message>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Berthama Bitcoin</translation>
-    </message>
-    <message>
-        <source>&amp;About Bitcoin Core</source>
-        <translation>Rreth Berthames Bitkoin</translation>
-    </message>
     <message>
         <source>%1 and %2</source>
         <translation>%1 dhe %2</translation>
@@ -298,9 +167,6 @@
         <translation>Portofoli po &lt;b&gt; enkriptohet&lt;/b&gt; dhe është &lt;b&gt; i kyçur&lt;/b&gt;</translation>
     </message>
 </context>
-<context>
-    <name>ClientModel</name>
-    </context>
 <context>
     <name>CoinControlDialog</name>
     <message>
@@ -319,22 +185,6 @@
         <source>Date</source>
         <translation>Data</translation>
     </message>
-    <message>
-        <source>Copy address</source>
-        <translation>Kopjo adresën</translation>
-    </message>
-    <message>
-        <source>yes</source>
-        <translation>po</translation>
-    </message>
-    <message>
-        <source>no</source>
-        <translation>jo</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(pa etiketë)</translation>
-    </message>
     </context>
 <context>
     <name>EditAddressDialog</name>
@@ -350,34 +200,6 @@
         <source>&amp;Address</source>
         <translation>&amp;Adresa</translation>
     </message>
-    <message>
-        <source>New receiving address</source>
-        <translation>Adresë e re pritëse</translation>
-    </message>
-    <message>
-        <source>New sending address</source>
-        <translation>Adresë e re dërgimi</translation>
-    </message>
-    <message>
-        <source>Edit receiving address</source>
-        <translation>Ndrysho adresën pritëse</translation>
-    </message>
-    <message>
-        <source>Edit sending address</source>
-        <translation>ndrysho adresën dërguese</translation>
-    </message>
-    <message>
-        <source>The entered address "%1" is already in the address book.</source>
-        <translation>Adresa e dhënë "%1" është e zënë në librin e adresave. </translation>
-    </message>
-    <message>
-        <source>Could not unlock wallet.</source>
-        <translation>Nuk mund të ç'kyçet portofoli.</translation>
-    </message>
-    <message>
-        <source>New key generation failed.</source>
-        <translation>Krijimi i çelësit të ri dështoi.</translation>
-    </message>
 </context>
 <context>
     <name>FreespaceChecker</name>
@@ -388,18 +210,10 @@
     </context>
 <context>
     <name>HelpMessageDialog</name>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Berthama Bitcoin</translation>
-    </message>
     <message>
         <source>version</source>
         <translation>versioni</translation>
     </message>
-    <message>
-        <source>About Bitcoin Core</source>
-        <translation>Rreth Berthames Bitkoin</translation>
-    </message>
     </context>
 <context>
     <name>Intro</name>
@@ -407,14 +221,6 @@
         <source>Welcome</source>
         <translation>Miresevini</translation>
     </message>
-    <message>
-        <source>Welcome to Bitcoin Core.</source>
-        <translation>Miresevini ne Berthamen Bitcoin</translation>
-    </message>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Berthama Bitcoin</translation>
-    </message>
     <message>
         <source>Error</source>
         <translation>Problem</translation>
@@ -441,9 +247,6 @@
         <translation>Formilarë</translation>
     </message>
     </context>
-<context>
-    <name>PaymentServer</name>
-    </context>
 <context>
     <name>PeerTableModel</name>
     </context>
@@ -454,9 +257,6 @@
         <translation>Sasia</translation>
     </message>
     </context>
-<context>
-    <name>QRImageWidget</name>
-    </context>
 <context>
     <name>RPCConsole</name>
     <message>
@@ -501,37 +301,6 @@
         <source>Copy &amp;Address</source>
         <translation>&amp;Kopjo adresen</translation>
     </message>
-    <message>
-        <source>Address</source>
-        <translation>Adresë</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>Sasia</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Etiketë</translation>
-    </message>
-    </context>
-<context>
-    <name>RecentRequestsTableModel</name>
-    <message>
-        <source>Date</source>
-        <translation>Data</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Etiketë</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>Sasia</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(pa etiketë)</translation>
-    </message>
     </context>
 <context>
     <name>SendCoinsDialog</name>
@@ -559,18 +328,6 @@
         <source>Confirm the send action</source>
         <translation>Konfirmo veprimin e dërgimit</translation>
     </message>
-    <message>
-        <source>Confirm send coins</source>
-        <translation>konfirmo dërgimin e monedhave</translation>
-    </message>
-    <message>
-        <source>The amount to pay must be larger than 0.</source>
-        <translation>Shuma e paguar duhet të jetë më e madhe se 0.</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(pa etiketë)</translation>
-    </message>
     </context>
 <context>
     <name>SendCoinsEntry</name>
@@ -582,10 +339,6 @@
         <source>Pay &amp;To:</source>
         <translation>Paguaj &amp;drejt:</translation>
     </message>
-    <message>
-        <source>Enter a label for this address to add it to your address book</source>
-        <translation>Krijoni një etiketë për këtë adresë që t'ja shtoni librit të adresave</translation>
-    </message>
     <message>
         <source>&amp;Label:</source>
         <translation>&amp;Etiketë:</translation>
@@ -627,10 +380,6 @@
     </context>
 <context>
     <name>SplashScreen</name>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Berthama Bitcoin</translation>
-    </message>
     <message>
         <source>[testnet]</source>
         <translation>[testo rrjetin]</translation>
@@ -639,172 +388,26 @@
 <context>
     <name>TrafficGraphWidget</name>
     </context>
-<context>
-    <name>TransactionDesc</name>
-    <message>
-        <source>Open until %1</source>
-        <translation>Hapur deri më %1</translation>
-    </message>
-    <message>
-        <source>%1/unconfirmed</source>
-        <translation>%1/I pakonfirmuar</translation>
-    </message>
-    <message>
-        <source>%1 confirmations</source>
-        <translation>%1 konfirmimet</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation>Data</translation>
-    </message>
-    <message>
-        <source>Transaction</source>
-        <translation>transaksionit</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>Sasia</translation>
-    </message>
-    <message>
-        <source>, has not been successfully broadcast yet</source>
-        <translation>, nuk është transmetuar me sukses deri tani</translation>
-    </message>
-    <message>
-        <source>unknown</source>
-        <translation>i/e panjohur</translation>
-    </message>
-</context>
 <context>
     <name>TransactionDescDialog</name>
-    <message>
-        <source>Transaction details</source>
-        <translation>Detajet e transaksionit</translation>
-    </message>
     <message>
         <source>This pane shows a detailed description of the transaction</source>
         <translation>Ky panel tregon një përshkrim të detajuar të transaksionit</translation>
     </message>
 </context>
-<context>
-    <name>TransactionTableModel</name>
-    <message>
-        <source>Date</source>
-        <translation>Data</translation>
-    </message>
-    <message>
-        <source>Type</source>
-        <translation>Lloji</translation>
-    </message>
-    <message>
-        <source>Open until %1</source>
-        <translation>Hapur deri më %1</translation>
-    </message>
-    <message>
-        <source>Confirmed (%1 confirmations)</source>
-        <translation>I/E konfirmuar(%1 konfirmime)</translation>
-    </message>
-    <message>
-        <source>This block was not received by any other nodes and will probably not be accepted!</source>
-        <translation>Ky bllok është marrë nga ndonjë nyje dhe ka shumë mundësi të mos pranohet! </translation>
-    </message>
-    <message>
-        <source>Generated but not accepted</source>
-        <translation>I krijuar por i papranuar</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Etiketë</translation>
-    </message>
-    <message>
-        <source>Received with</source>
-        <translation>Marrë me</translation>
-    </message>
-    <message>
-        <source>Sent to</source>
-        <translation>Dërguar drejt</translation>
-    </message>
-    <message>
-        <source>Payment to yourself</source>
-        <translation>Pagesë ndaj vetvetes</translation>
-    </message>
-    <message>
-        <source>Mined</source>
-        <translation>Minuar</translation>
-    </message>
-    <message>
-        <source>(n/a)</source>
-        <translation>(p/a)</translation>
-    </message>
-    </context>
-<context>
-    <name>TransactionView</name>
-    <message>
-        <source>Received with</source>
-        <translation>Marrë me</translation>
-    </message>
-    <message>
-        <source>Sent to</source>
-        <translation>Dërguar drejt</translation>
-    </message>
-    <message>
-        <source>Mined</source>
-        <translation>Minuar</translation>
-    </message>
-    <message>
-        <source>Copy address</source>
-        <translation>Kopjo adresën</translation>
-    </message>
-    <message>
-        <source>Exporting Failed</source>
-        <translation>Eksportimi dështoj</translation>
-    </message>
-    <message>
-        <source>Comma separated file (*.csv)</source>
-        <translation>Skedar i ndarë me pikëpresje(*.csv)</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation>Data</translation>
-    </message>
-    <message>
-        <source>Type</source>
-        <translation>Lloji</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Etiketë</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>Adresë</translation>
-    </message>
-    </context>
 <context>
     <name>UnitDisplayStatusBarControl</name>
     </context>
-<context>
-    <name>WalletFrame</name>
-    </context>
-<context>
-    <name>WalletModel</name>
-    <message>
-        <source>Send Coins</source>
-        <translation>Dërgo Monedha</translation>
-    </message>
-</context>
-<context>
-    <name>WalletView</name>
-    <message>
-        <source>Export the data in the current tab to a file</source>
-        <translation>Eksporto të dhënat e skedës korrente në një skedar</translation>
-    </message>
-    </context>
 <context>
     <name>bitcoin-core</name>
     <message>
         <source>Options:</source>
         <translation>Opsionet:</translation>
     </message>
+    <message>
+        <source>Bitcoin Core</source>
+        <translation>Berthama Bitcoin</translation>
+    </message>
     <message>
         <source>Information</source>
         <translation>Informacion</translation>
diff --git a/src/qt/locale/bitcoin_sr.ts b/src/qt/locale/bitcoin_sr.ts
index b6ba896b38f54..6b6f1af6f6453 100644
--- a/src/qt/locale/bitcoin_sr.ts
+++ b/src/qt/locale/bitcoin_sr.ts
@@ -17,10 +17,6 @@
         <source>&amp;Copy</source>
         <translation>Kopirajte</translation>
     </message>
-    <message>
-        <source>&amp;Copy Address</source>
-        <translation>Kopirajte adresu</translation>
-    </message>
     <message>
         <source>Delete the currently selected address from the list</source>
         <translation>Izbrisite trenutno izabranu adresu sa liste</translation>
@@ -29,25 +25,6 @@
         <source>&amp;Delete</source>
         <translation>&amp;Избриши</translation>
     </message>
-    <message>
-        <source>Comma separated file (*.csv)</source>
-        <translation>Зарезом одвојене вредности (*.csv)</translation>
-    </message>
-    </context>
-<context>
-    <name>AddressTableModel</name>
-    <message>
-        <source>Label</source>
-        <translation>Етикета</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>Адреса</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(без етикете)</translation>
-    </message>
 </context>
 <context>
     <name>AskPassphraseDialog</name>
@@ -63,74 +40,6 @@
         <source>Repeat new passphrase</source>
         <translation>Поновите нову лозинку</translation>
     </message>
-    <message>
-        <source>Encrypt wallet</source>
-        <translation>Шифровање новчаника</translation>
-    </message>
-    <message>
-        <source>This operation needs your wallet passphrase to unlock the wallet.</source>
-        <translation>Ова акција захтева лозинку Вашег новчаника да би га откључала.</translation>
-    </message>
-    <message>
-        <source>Unlock wallet</source>
-        <translation>Откључавање новчаника</translation>
-    </message>
-    <message>
-        <source>This operation needs your wallet passphrase to decrypt the wallet.</source>
-        <translation>Ова акција захтева да унесете лозинку да би дешифловала новчаник.</translation>
-    </message>
-    <message>
-        <source>Decrypt wallet</source>
-        <translation>Дешифровање новчаника</translation>
-    </message>
-    <message>
-        <source>Change passphrase</source>
-        <translation>Промена лозинке</translation>
-    </message>
-    <message>
-        <source>Confirm wallet encryption</source>
-        <translation>Одобрите шифровање новчаника</translation>
-    </message>
-    <message>
-        <source>Warning: If you encrypt your wallet and lose your passphrase, you will &lt;b&gt;LOSE ALL OF YOUR BITCOINS&lt;/b&gt;!</source>
-        <translation>Упозорење: Ако се ваш новчаник шифрује а потом изгубите лозинкзу, ви ћете &lt;b&gt;ИЗГУБИТИ СВЕ BITCOIN-Е&lt;/b&gt;!</translation>
-    </message>
-    <message>
-        <source>Are you sure you wish to encrypt your wallet?</source>
-        <translation>Да ли сте сигурни да желите да се новчаник шифује?</translation>
-    </message>
-    <message>
-        <source>Wallet encrypted</source>
-        <translation>Новчаник је шифрован</translation>
-    </message>
-    <message>
-        <source>Wallet encryption failed</source>
-        <translation>Неуспело шифровање новчаника</translation>
-    </message>
-    <message>
-        <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
-        <translation>Настала је унутрашња грешка током шифровања новчаника. Ваш новчаник није шифрован.</translation>
-    </message>
-    <message>
-        <source>The supplied passphrases do not match.</source>
-        <translation>Лозинке које сте унели се не подударају.</translation>
-    </message>
-    <message>
-        <source>Wallet unlock failed</source>
-        <translation>Неуспело откључавање новчаника</translation>
-    </message>
-    <message>
-        <source>The passphrase entered for the wallet decryption was incorrect.</source>
-        <translation>Лозинка коју сте унели за откључавање новчаника је нетачна.</translation>
-    </message>
-    <message>
-        <source>Wallet decryption failed</source>
-        <translation>Неуспело дешифровање новчаника</translation>
-    </message>
-    <message>
-        <source>Wallet passphrase was successfully changed.</source>
-        <translation>Лозинка за приступ новчанику је успешно промењена.</translation>
-    </message>
 </context>
 <context>
     <name>BanTableModel</name>
@@ -221,10 +130,6 @@
         <source>Tabs toolbar</source>
         <translation>Трака са картицама</translation>
     </message>
-    <message>
-        <source>&amp;About Bitcoin Core</source>
-        <translation>O Bitcoin Coru</translation>
-    </message>
     <message>
         <source>Up to date</source>
         <translation>Ажурно</translation>
@@ -250,9 +155,6 @@
         <translation>Новчаник јс &lt;b&gt;шифрован&lt;/b&gt; и тренутно &lt;b&gt;закључан&lt;/b&gt;</translation>
     </message>
 </context>
-<context>
-    <name>ClientModel</name>
-    </context>
 <context>
     <name>CoinControlDialog</name>
     <message>
@@ -271,22 +173,6 @@
         <source>Confirmed</source>
         <translation>Potvrdjen</translation>
     </message>
-    <message>
-        <source>Copy address</source>
-        <translation>kopiraj adresu</translation>
-    </message>
-    <message>
-        <source>Copy label</source>
-        <translation>kopiraj naziv</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>kopiraj iznos</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(без етикете)</translation>
-    </message>
     </context>
 <context>
     <name>EditAddressDialog</name>
@@ -302,15 +188,7 @@
         <source>&amp;Address</source>
         <translation>&amp;Адреса</translation>
     </message>
-    <message>
-        <source>The entered address "%1" is already in the address book.</source>
-        <translation>Унешена адреса "%1" се већ налази у адресару.</translation>
-    </message>
-    <message>
-        <source>Could not unlock wallet.</source>
-        <translation>Немогуће откључати новчаник.</translation>
-    </message>
-    </context>
+</context>
 <context>
     <name>FreespaceChecker</name>
     </context>
@@ -320,10 +198,6 @@
         <source>version</source>
         <translation>верзија</translation>
     </message>
-    <message>
-        <source>About Bitcoin Core</source>
-        <translation>O Bitcoin Coru</translation>
-    </message>
     <message>
         <source>Usage:</source>
         <translation>Korišćenje:</translation>
@@ -361,9 +235,6 @@
         <translation>Форма</translation>
     </message>
     </context>
-<context>
-    <name>PaymentServer</name>
-    </context>
 <context>
     <name>PeerTableModel</name>
     </context>
@@ -374,9 +245,6 @@
         <translation>iznos</translation>
     </message>
     </context>
-<context>
-    <name>QRImageWidget</name>
-    </context>
 <context>
     <name>RPCConsole</name>
     </context>
@@ -394,60 +262,13 @@
         <source>&amp;Message:</source>
         <translation>Poruka:</translation>
     </message>
-    <message>
-        <source>Copy label</source>
-        <translation>kopiraj naziv</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>kopiraj iznos</translation>
-    </message>
-</context>
+    </context>
 <context>
     <name>ReceiveRequestDialog</name>
     <message>
         <source>Copy &amp;Address</source>
         <translation>Kopirajte adresu</translation>
     </message>
-    <message>
-        <source>Address</source>
-        <translation>Адреса</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>iznos</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Етикета</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>Poruka</translation>
-    </message>
-    </context>
-<context>
-    <name>RecentRequestsTableModel</name>
-    <message>
-        <source>Date</source>
-        <translation>datum</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Етикета</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>Poruka</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>iznos</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(без етикете)</translation>
-    </message>
     </context>
 <context>
     <name>SendCoinsDialog</name>
@@ -467,15 +288,7 @@
         <source>S&amp;end</source>
         <translation>&amp;Пошаљи</translation>
     </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>kopiraj iznos</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(без етикете)</translation>
-    </message>
-    </context>
+</context>
 <context>
     <name>SendCoinsEntry</name>
     <message>
@@ -523,258 +336,16 @@
 <context>
     <name>TrafficGraphWidget</name>
     </context>
-<context>
-    <name>TransactionDesc</name>
-    <message>
-        <source>Open until %1</source>
-        <translation>Otvoreno do %1</translation>
-    </message>
-    <message>
-        <source>%1/unconfirmed</source>
-        <translation>%1/nepotvrdjeno</translation>
-    </message>
-    <message>
-        <source>%1 confirmations</source>
-        <translation>%1 potvrde</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation>datum</translation>
-    </message>
-    <message>
-        <source>label</source>
-        <translation>етикета</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>Poruka</translation>
-    </message>
-    <message>
-        <source>Transaction</source>
-        <translation>transakcije</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>iznos</translation>
-    </message>
-    <message>
-        <source>, has not been successfully broadcast yet</source>
-        <translation>, nije još uvek uspešno emitovan</translation>
-    </message>
-    <message>
-        <source>unknown</source>
-        <translation>nepoznato</translation>
-    </message>
-</context>
 <context>
     <name>TransactionDescDialog</name>
-    <message>
-        <source>Transaction details</source>
-        <translation>detalji transakcije</translation>
-    </message>
     <message>
         <source>This pane shows a detailed description of the transaction</source>
         <translation>Ovaj odeljak pokazuje detaljan opis transakcije</translation>
     </message>
 </context>
-<context>
-    <name>TransactionTableModel</name>
-    <message>
-        <source>Date</source>
-        <translation>datum</translation>
-    </message>
-    <message>
-        <source>Type</source>
-        <translation>tip</translation>
-    </message>
-    <message>
-        <source>Open until %1</source>
-        <translation>Otvoreno do %1</translation>
-    </message>
-    <message>
-        <source>Confirmed (%1 confirmations)</source>
-        <translation>Potvrdjena (%1 potvrdjenih)</translation>
-    </message>
-    <message>
-        <source>This block was not received by any other nodes and will probably not be accepted!</source>
-        <translation>Ovaj blok nije primljen od ostalih čvorova (nodova) i verovatno neće biti prihvaćen!</translation>
-    </message>
-    <message>
-        <source>Generated but not accepted</source>
-        <translation>Generisan ali nije prihvaćen</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Етикета</translation>
-    </message>
-    <message>
-        <source>Received with</source>
-        <translation>Primljen sa</translation>
-    </message>
-    <message>
-        <source>Received from</source>
-        <translation>Primljeno od</translation>
-    </message>
-    <message>
-        <source>Sent to</source>
-        <translation>Poslat ka</translation>
-    </message>
-    <message>
-        <source>Payment to yourself</source>
-        <translation>Isplata samom sebi</translation>
-    </message>
-    <message>
-        <source>Mined</source>
-        <translation>Minirano</translation>
-    </message>
-    <message>
-        <source>(n/a)</source>
-        <translation>(n/a)</translation>
-    </message>
-    <message>
-        <source>Transaction status. Hover over this field to show number of confirmations.</source>
-        <translation>Status vaše transakcije. Predjite mišem preko ovog polja da bi ste videli broj konfirmacija</translation>
-    </message>
-    <message>
-        <source>Date and time that the transaction was received.</source>
-        <translation>Datum i vreme primljene transakcije.</translation>
-    </message>
-    <message>
-        <source>Type of transaction.</source>
-        <translation>Tip transakcije</translation>
-    </message>
-    <message>
-        <source>Amount removed from or added to balance.</source>
-        <translation>Iznos odbijen ili dodat balansu.</translation>
-    </message>
-</context>
-<context>
-    <name>TransactionView</name>
-    <message>
-        <source>All</source>
-        <translation>Sve</translation>
-    </message>
-    <message>
-        <source>Today</source>
-        <translation>Danas</translation>
-    </message>
-    <message>
-        <source>This week</source>
-        <translation>ove nedelje</translation>
-    </message>
-    <message>
-        <source>This month</source>
-        <translation>Ovog meseca</translation>
-    </message>
-    <message>
-        <source>Last month</source>
-        <translation>Prošlog meseca</translation>
-    </message>
-    <message>
-        <source>This year</source>
-        <translation>Ove godine</translation>
-    </message>
-    <message>
-        <source>Range...</source>
-        <translation>Opseg...</translation>
-    </message>
-    <message>
-        <source>Received with</source>
-        <translation>Primljen sa</translation>
-    </message>
-    <message>
-        <source>Sent to</source>
-        <translation>Poslat ka</translation>
-    </message>
-    <message>
-        <source>To yourself</source>
-        <translation>Vama - samom sebi</translation>
-    </message>
-    <message>
-        <source>Mined</source>
-        <translation>Minirano</translation>
-    </message>
-    <message>
-        <source>Other</source>
-        <translation>Drugi</translation>
-    </message>
-    <message>
-        <source>Enter address or label to search</source>
-        <translation>Navedite adresu ili naziv koji bi ste potražili</translation>
-    </message>
-    <message>
-        <source>Min amount</source>
-        <translation>Min iznos</translation>
-    </message>
-    <message>
-        <source>Copy address</source>
-        <translation>kopiraj adresu</translation>
-    </message>
-    <message>
-        <source>Copy label</source>
-        <translation>kopiraj naziv</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>kopiraj iznos</translation>
-    </message>
-    <message>
-        <source>Edit label</source>
-        <translation>promeni naziv</translation>
-    </message>
-    <message>
-        <source>Comma separated file (*.csv)</source>
-        <translation>Зарезом одвојене вредности (*.csv)</translation>
-    </message>
-    <message>
-        <source>Confirmed</source>
-        <translation>Potvrdjen</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation>datum</translation>
-    </message>
-    <message>
-        <source>Type</source>
-        <translation>tip</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Етикета</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>Адреса</translation>
-    </message>
-    <message>
-        <source>Range:</source>
-        <translation>Opseg:</translation>
-    </message>
-    <message>
-        <source>to</source>
-        <translation>do</translation>
-    </message>
-</context>
 <context>
     <name>UnitDisplayStatusBarControl</name>
     </context>
-<context>
-    <name>WalletFrame</name>
-    </context>
-<context>
-    <name>WalletModel</name>
-    <message>
-        <source>Send Coins</source>
-        <translation>Слање новца</translation>
-    </message>
-</context>
-<context>
-    <name>WalletView</name>
-    <message>
-        <source>Backup Wallet</source>
-        <translation>Backup новчаника</translation>
-    </message>
-    </context>
 <context>
     <name>bitcoin-core</name>
     <message>
@@ -801,22 +372,10 @@
         <source>Password for JSON-RPC connections</source>
         <translation>Lozinka za JSON-RPC konekcije</translation>
     </message>
-    <message>
-        <source>This help message</source>
-        <translation>Ova poruka Pomoći</translation>
-    </message>
     <message>
         <source>Loading addresses...</source>
         <translation>učitavam adrese....</translation>
     </message>
-    <message>
-        <source>Error loading wallet.dat: Wallet corrupted</source>
-        <translation>Грешка током учитавања wallet.dat: Новчаник је покварен      </translation>
-    </message>
-    <message>
-        <source>Error loading wallet.dat</source>
-        <translation>Грешка током учитавања wallet.dat      </translation>
-    </message>
     <message>
         <source>Loading block index...</source>
         <translation>Učitavam blok indeksa...</translation>
diff --git a/src/qt/locale/bitcoin_sr@latin.ts b/src/qt/locale/bitcoin_sr@latin.ts
index c836c8ddbaedb..86243bc14c1ef 100644
--- a/src/qt/locale/bitcoin_sr@latin.ts
+++ b/src/qt/locale/bitcoin_sr@latin.ts
@@ -25,10 +25,6 @@
         <source>C&amp;lose</source>
         <translation>Zatvori</translation>
     </message>
-    <message>
-        <source>&amp;Copy Address</source>
-        <translation>Kopiraj adresu</translation>
-    </message>
     <message>
         <source>Delete the currently selected address from the list</source>
         <translation>Briše trenutno izabranu adresu sa liste</translation>
@@ -45,69 +41,6 @@
         <source>&amp;Delete</source>
         <translation>&amp;Izbrisati</translation>
     </message>
-    <message>
-        <source>Choose the address to send coins to</source>
-        <translation>Izaberi adresu za slanje bitkoina</translation>
-    </message>
-    <message>
-        <source>Choose the address to receive coins with</source>
-        <translation>Izaberi adresu za primanje bitkoina</translation>
-    </message>
-    <message>
-        <source>C&amp;hoose</source>
-        <translation>I&amp;zaberi</translation>
-    </message>
-    <message>
-        <source>Sending addresses</source>
-        <translation>Adrese za slanje</translation>
-    </message>
-    <message>
-        <source>Receiving addresses</source>
-        <translation>Adrese za primanje</translation>
-    </message>
-    <message>
-        <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source>
-        <translation>Ovo su vase Bitkoin adrese za slanje bitkoina. Uvek proverite unetu kolicinu bitkoina i adresu za slanje bitkoin pre slanja.</translation>
-    </message>
-    <message>
-        <source>These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source>
-        <translation>Ovo su vase Bitkoin adrese za primanje bitkoina. Preporuceno je da koristite drugaciju adresu za primanje kod svake transakcije.</translation>
-    </message>
-    <message>
-        <source>&amp;Edit</source>
-        <translation>&amp;Izmeni</translation>
-    </message>
-    <message>
-        <source>Export Address List</source>
-        <translation>Izvezi listu adresa</translation>
-    </message>
-    <message>
-        <source>Comma separated file (*.csv)</source>
-        <translation>Zapetom odvojene ('.csv) datoteke</translation>
-    </message>
-    <message>
-        <source>Exporting Failed</source>
-        <translation>Izvoz nije uspeo</translation>
-    </message>
-    <message>
-        <source>There was an error trying to save the address list to %1. Please try again.</source>
-        <translation>Dogodila se greska prilikom cuvanja adrese u %1. Molimo pokusajte ponovo.</translation>
-    </message>
-</context>
-<context>
-    <name>AddressTableModel</name>
-    <message>
-        <source>Label</source>
-        <translation>Etiketa</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>Adresa</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(bez etikete)</translation>
-    </message>
 </context>
 <context>
     <name>AskPassphraseDialog</name>
@@ -127,94 +60,6 @@
         <source>Repeat new passphrase</source>
         <translation>Ponovo unesite pristupnu frazu</translation>
     </message>
-    <message>
-        <source>Encrypt wallet</source>
-        <translation>Enkriptuj/Sifruj novcanik</translation>
-    </message>
-    <message>
-        <source>This operation needs your wallet passphrase to unlock the wallet.</source>
-        <translation>Da bi ste otkljucali novcanik potrebno je da unesete pristupnu frazu</translation>
-    </message>
-    <message>
-        <source>Unlock wallet</source>
-        <translation>Otkljucaj novcanik</translation>
-    </message>
-    <message>
-        <source>This operation needs your wallet passphrase to decrypt the wallet.</source>
-        <translation>Da bi ste dekriptovali/desifrovali novcanik potrebno je da unesete pristupnu frazu</translation>
-    </message>
-    <message>
-        <source>Decrypt wallet</source>
-        <translation>Dekriptuj/Desifruj novcanik</translation>
-    </message>
-    <message>
-        <source>Change passphrase</source>
-        <translation>Izmeni pristupnu frazu</translation>
-    </message>
-    <message>
-        <source>Confirm wallet encryption</source>
-        <translation>Potvrdite enkripciju/sifrovanje novcanika</translation>
-    </message>
-    <message>
-        <source>Warning: If you encrypt your wallet and lose your passphrase, you will &lt;b&gt;LOSE ALL OF YOUR BITCOINS&lt;/b&gt;!</source>
-        <translation>Upozorenje: Ako ekriptujete/sifrujete novcanik, a izgubite pristupnu frazu &lt;b&gt;IZGUBICETE SVE VASE BITKOINE&lt;/b&gt;!</translation>
-    </message>
-    <message>
-        <source>Are you sure you wish to encrypt your wallet?</source>
-        <translation>Da li ste sigurni da zelite da enkriptujete/sifrujete novcanik?</translation>
-    </message>
-    <message>
-        <source>Bitcoin Core will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source>
-        <translation>Bitcoin Core ce se sada zatvoriti radi zavrsavanje procesa enkripcije/sifrovanja novcanika. Zapamtite da enkriptovanje/sifrovanje novcanika ne moze u potpunosti da zastiti vase bitkoine od kradje od strane virusa koji su zarazili vas racunar.</translation>
-    </message>
-    <message>
-        <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source>
-        <translation>VAZNO : Bilo koja prethodne rezervne kopije koje ste nacinili od svoje datoteke novcanika treba da se zamene sa novogenerisanom, sifrovanom datotekom novcanika. Iz bezbednosnih razloga, prethodne rezervne kopije su nezasifrovanih datoteka novcanika ce postati beskorisne cim pocnete da koristite novi, sifrovani novčanik.</translation>
-    </message>
-    <message>
-        <source>Warning: The Caps Lock key is on!</source>
-        <translation>Upozorenje: Dugme Caps Lock je upaljeno</translation>
-    </message>
-    <message>
-        <source>Wallet encrypted</source>
-        <translation>Novcanik je enkriptovan/sifrovan</translation>
-    </message>
-    <message>
-        <source>Enter the new passphrase to the wallet.&lt;br/&gt;Please use a passphrase of &lt;b&gt;ten or more random characters&lt;/b&gt;, or &lt;b&gt;eight or more words&lt;/b&gt;.</source>
-        <translation>Unesite novu pristupnu frazu u novcanik.&lt;br/&gt;Molimo koristite pristupnu frazu od &lt;br/&gt;deset ili vise nasumicnih karaktera &lt;br/&gt;, ili &lt;b&gt;osm ili vise reci &lt;/b&gt;.</translation>
-    </message>
-    <message>
-        <source>Enter the old passphrase and new passphrase to the wallet.</source>
-        <translation>Unesite staru pristupnu frazu i novu pristupnu frazu u novcanik.</translation>
-    </message>
-    <message>
-        <source>Wallet encryption failed</source>
-        <translation>Ekripcija/Sifrovanje novcanika nije uspelo</translation>
-    </message>
-    <message>
-        <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
-        <translation>Enkriptovanje/Sifrovanje novcanika nije uspelo zbog greske. Vas novcanik nije enkriptovan/sifrovan.</translation>
-    </message>
-    <message>
-        <source>The supplied passphrases do not match.</source>
-        <translation>Uneta pristupne fraze se ne podudaraju</translation>
-    </message>
-    <message>
-        <source>Wallet unlock failed</source>
-        <translation>Otkljucavanje novcanika nije uspelo</translation>
-    </message>
-    <message>
-        <source>The passphrase entered for the wallet decryption was incorrect.</source>
-        <translation>Pristupna fraza za dekriptovanje/desifrovanje novcanika nije tacna.</translation>
-    </message>
-    <message>
-        <source>Wallet decryption failed</source>
-        <translation>Dekriptovanje/desifrovanje novcanika nije uspelo</translation>
-    </message>
-    <message>
-        <source>Wallet passphrase was successfully changed.</source>
-        <translation>Pristupna fraza novcanika je uspesno promenjena.</translation>
-    </message>
 </context>
 <context>
     <name>BanTableModel</name>
@@ -229,18 +74,11 @@
 </context>
 <context>
     <name>BitcoinGUI</name>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Bitcoin Core</translation>
-    </message>
     <message>
         <source>Error</source>
         <translation>Greska</translation>
     </message>
     </context>
-<context>
-    <name>ClientModel</name>
-    </context>
 <context>
     <name>CoinControlDialog</name>
     <message>
@@ -251,10 +89,6 @@
         <source>Date</source>
         <translation>Datum</translation>
     </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(bez etikete)</translation>
-    </message>
     </context>
 <context>
     <name>EditAddressDialog</name>
@@ -264,17 +98,9 @@
     </context>
 <context>
     <name>HelpMessageDialog</name>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Bitcoin Core</translation>
-    </message>
     </context>
 <context>
     <name>Intro</name>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Bitcoin Core</translation>
-    </message>
     <message>
         <source>Error</source>
         <translation>Greska</translation>
@@ -289,9 +115,6 @@
 <context>
     <name>OverviewPage</name>
     </context>
-<context>
-    <name>PaymentServer</name>
-    </context>
 <context>
     <name>PeerTableModel</name>
     </context>
@@ -302,9 +125,6 @@
         <translation>Kolicina</translation>
     </message>
     </context>
-<context>
-    <name>QRImageWidget</name>
-    </context>
 <context>
     <name>RPCConsole</name>
     </context>
@@ -313,52 +133,9 @@
     </context>
 <context>
     <name>ReceiveRequestDialog</name>
-    <message>
-        <source>Address</source>
-        <translation>Adresa</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>Kolicina</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Etiketa</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>Poruka</translation>
-    </message>
-    </context>
-<context>
-    <name>RecentRequestsTableModel</name>
-    <message>
-        <source>Date</source>
-        <translation>Datum</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Etiketa</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>Poruka</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>Kolicina</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(bez etikete)</translation>
-    </message>
     </context>
 <context>
     <name>SendCoinsDialog</name>
-    <message>
-        <source>(no label)</source>
-        <translation>(bez etikete)</translation>
-    </message>
     </context>
 <context>
     <name>SendCoinsEntry</name>
@@ -371,252 +148,22 @@
     </context>
 <context>
     <name>SplashScreen</name>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Bitcoin Core</translation>
-    </message>
-    <message>
-        <source>The Bitcoin Core developers</source>
-        <translation>Razvojni tim Bitcoin Core</translation>
-    </message>
     </context>
 <context>
     <name>TrafficGraphWidget</name>
     </context>
-<context>
-    <name>TransactionDesc</name>
-    <message>
-        <source>%1/offline</source>
-        <translation>%1/van mreze</translation>
-    </message>
-    <message>
-        <source>%1/unconfirmed</source>
-        <translation>%1/nepotvrdjeno</translation>
-    </message>
-    <message>
-        <source>%1 confirmations</source>
-        <translation>%1 potvrdjeno/ih</translation>
-    </message>
-    <message>
-        <source>Status</source>
-        <translation>Stanje/Status</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation>Datum</translation>
-    </message>
-    <message>
-        <source>Source</source>
-        <translation>Izvor</translation>
-    </message>
-    <message>
-        <source>Generated</source>
-        <translation>Generisano</translation>
-    </message>
-    <message>
-        <source>From</source>
-        <translation>Od</translation>
-    </message>
-    <message>
-        <source>To</source>
-        <translation>Kome</translation>
-    </message>
-    <message>
-        <source>own address</source>
-        <translation>sopstvena adresa</translation>
-    </message>
-    <message>
-        <source>watch-only</source>
-        <translation>samo za gledanje</translation>
-    </message>
-    <message>
-        <source>label</source>
-        <translation>etiketa</translation>
-    </message>
-    <message>
-        <source>Credit</source>
-        <translation>Kredit</translation>
-    </message>
-    <message>
-        <source>not accepted</source>
-        <translation>nije prihvaceno</translation>
-    </message>
-    <message>
-        <source>Debit</source>
-        <translation>Zaduzenje</translation>
-    </message>
-    <message>
-        <source>Total debit</source>
-        <translation>Ukupno zaduzenje</translation>
-    </message>
-    <message>
-        <source>Total credit</source>
-        <translation>Totalni kredit</translation>
-    </message>
-    <message>
-        <source>Transaction fee</source>
-        <translation>Taksa transakcije</translation>
-    </message>
-    <message>
-        <source>Net amount</source>
-        <translation>Neto iznos</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>Poruka</translation>
-    </message>
-    <message>
-        <source>Comment</source>
-        <translation>Komentar</translation>
-    </message>
-    <message>
-        <source>Transaction ID</source>
-        <translation>ID Transakcije</translation>
-    </message>
-    <message>
-        <source>Merchant</source>
-        <translation>Trgovac</translation>
-    </message>
-    <message>
-        <source>Debug information</source>
-        <translation>Informacije debugovanja</translation>
-    </message>
-    <message>
-        <source>Transaction</source>
-        <translation>Transakcije</translation>
-    </message>
-    <message>
-        <source>Inputs</source>
-        <translation>Unosi</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>Kolicina</translation>
-    </message>
-    <message>
-        <source>true</source>
-        <translation>tacno</translation>
-    </message>
-    <message>
-        <source>false</source>
-        <translation>netacno</translation>
-    </message>
-    <message>
-        <source>, has not been successfully broadcast yet</source>
-        <translation>, nisu uspesno jos emitovano</translation>
-    </message>
-    <message>
-        <source>unknown</source>
-        <translation>nepoznato</translation>
-    </message>
-</context>
 <context>
     <name>TransactionDescDialog</name>
-    <message>
-        <source>Transaction details</source>
-        <translation>Detalji transakcije</translation>
-    </message>
-    </context>
-<context>
-    <name>TransactionTableModel</name>
-    <message>
-        <source>Date</source>
-        <translation>Datum</translation>
-    </message>
-    <message>
-        <source>Type</source>
-        <translation>Tip</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Etiketa</translation>
-    </message>
-    <message>
-        <source>Received with</source>
-        <translation>Primljeno uz</translation>
-    </message>
-    <message>
-        <source>Received from</source>
-        <translation>Primljeno od</translation>
-    </message>
-    <message>
-        <source>Sent to</source>
-        <translation>Poslat</translation>
-    </message>
-    <message>
-        <source>Payment to yourself</source>
-        <translation>Placanje samom sebi</translation>
-    </message>
-    <message>
-        <source>Mined</source>
-        <translation>Iskopano</translation>
-    </message>
-    <message>
-        <source>watch-only</source>
-        <translation>samo za gledanje</translation>
-    </message>
-    </context>
-<context>
-    <name>TransactionView</name>
-    <message>
-        <source>Received with</source>
-        <translation>Primljeno uz</translation>
-    </message>
-    <message>
-        <source>Sent to</source>
-        <translation>Poslat</translation>
-    </message>
-    <message>
-        <source>Mined</source>
-        <translation>Iskopano</translation>
-    </message>
-    <message>
-        <source>Exporting Failed</source>
-        <translation>Izvoz nije uspeo</translation>
-    </message>
-    <message>
-        <source>Comma separated file (*.csv)</source>
-        <translation>Zarezom odvojene ('.csv) datoteke</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation>Datum</translation>
-    </message>
-    <message>
-        <source>Type</source>
-        <translation>Tip</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Etiketa</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>Adresa</translation>
-    </message>
     </context>
 <context>
     <name>UnitDisplayStatusBarControl</name>
     </context>
 <context>
-    <name>WalletFrame</name>
-    </context>
-<context>
-    <name>WalletModel</name>
-    </context>
-<context>
-    <name>WalletView</name>
-    <message>
-        <source>&amp;Export</source>
-        <translation>&amp;Izvoz</translation>
-    </message>
+    <name>bitcoin-core</name>
     <message>
-        <source>Export the data in the current tab to a file</source>
-        <translation>Izvoz podataka iz trenutne kartice u datoteku</translation>
+        <source>Bitcoin Core</source>
+        <translation>Bitcoin Core</translation>
     </message>
-    </context>
-<context>
-    <name>bitcoin-core</name>
     <message>
         <source>Insufficient funds</source>
         <translation>Nedovoljno sredstava</translation>
diff --git a/src/qt/locale/bitcoin_sv.ts b/src/qt/locale/bitcoin_sv.ts
index acf37bd1d4eee..a637cebe2cd53 100644
--- a/src/qt/locale/bitcoin_sv.ts
+++ b/src/qt/locale/bitcoin_sv.ts
@@ -25,10 +25,6 @@
         <source>C&amp;lose</source>
         <translation>S&amp;täng</translation>
     </message>
-    <message>
-        <source>&amp;Copy Address</source>
-        <translation>&amp;Kopiera adress</translation>
-    </message>
     <message>
         <source>Delete the currently selected address from the list</source>
         <translation>Ta bort den valda adressen från listan</translation>
@@ -45,74 +41,6 @@
         <source>&amp;Delete</source>
         <translation>&amp;Radera</translation>
     </message>
-    <message>
-        <source>Choose the address to send coins to</source>
-        <translation>Välj en adress att sända betalning till</translation>
-    </message>
-    <message>
-        <source>Choose the address to receive coins with</source>
-        <translation>Välj en adress att ta emot betalning till</translation>
-    </message>
-    <message>
-        <source>C&amp;hoose</source>
-        <translation>V&amp;älj</translation>
-    </message>
-    <message>
-        <source>Sending addresses</source>
-        <translation>Avsändaradresser</translation>
-    </message>
-    <message>
-        <source>Receiving addresses</source>
-        <translation>Mottagaradresser</translation>
-    </message>
-    <message>
-        <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source>
-        <translation>Detta är dina Bitcoin-adresser för att skicka betalningar. Kolla alltid summan och den mottagande adressen innan du skickar Bitcoins.</translation>
-    </message>
-    <message>
-        <source>These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source>
-        <translation>Detta är dina Bitcoin-adresser för att ta emot betalningar. Det rekommenderas att använda en ny mottagningsadress för varje transaktion.</translation>
-    </message>
-    <message>
-        <source>Copy &amp;Label</source>
-        <translation>Kopiera &amp;etikett</translation>
-    </message>
-    <message>
-        <source>&amp;Edit</source>
-        <translation>&amp;Ändra</translation>
-    </message>
-    <message>
-        <source>Export Address List</source>
-        <translation>Exportera adresslistan</translation>
-    </message>
-    <message>
-        <source>Comma separated file (*.csv)</source>
-        <translation>Kommaseparerad fil (*.csv)</translation>
-    </message>
-    <message>
-        <source>Exporting Failed</source>
-        <translation>Exporteringen misslyckades</translation>
-    </message>
-    <message>
-        <source>There was an error trying to save the address list to %1. Please try again.</source>
-        <translation>Det inträffade ett fel när adresslistan skulle sparas till %1.
-Var vänlig och försök igen.</translation>
-    </message>
-</context>
-<context>
-    <name>AddressTableModel</name>
-    <message>
-        <source>Label</source>
-        <translation>Etikett</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>Adress</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(ingen etikett)</translation>
-    </message>
 </context>
 <context>
     <name>AskPassphraseDialog</name>
@@ -132,94 +60,6 @@ Var vänlig och försök igen.</translation>
         <source>Repeat new passphrase</source>
         <translation>Upprepa nytt lösenord</translation>
     </message>
-    <message>
-        <source>Encrypt wallet</source>
-        <translation>Kryptera plånbok</translation>
-    </message>
-    <message>
-        <source>This operation needs your wallet passphrase to unlock the wallet.</source>
-        <translation>Denna operation behöver din plånboks lösenord för att låsa upp plånboken.</translation>
-    </message>
-    <message>
-        <source>Unlock wallet</source>
-        <translation>Lås upp plånbok</translation>
-    </message>
-    <message>
-        <source>This operation needs your wallet passphrase to decrypt the wallet.</source>
-        <translation>Denna operation behöver din plånboks lösenord för att dekryptera plånboken.</translation>
-    </message>
-    <message>
-        <source>Decrypt wallet</source>
-        <translation>Dekryptera plånbok</translation>
-    </message>
-    <message>
-        <source>Change passphrase</source>
-        <translation>Ändra lösenord</translation>
-    </message>
-    <message>
-        <source>Confirm wallet encryption</source>
-        <translation>Bekräfta kryptering av plånbok</translation>
-    </message>
-    <message>
-        <source>Warning: If you encrypt your wallet and lose your passphrase, you will &lt;b&gt;LOSE ALL OF YOUR BITCOINS&lt;/b&gt;!</source>
-        <translation>VARNING: Om du krypterar din plånbok och glömmer ditt lösenord, kommer du att &lt;b&gt;FÖRLORA ALLA DINA TILLGÅNGAR&lt;/b&gt;!</translation>
-    </message>
-    <message>
-        <source>Are you sure you wish to encrypt your wallet?</source>
-        <translation>Är du säker på att du vill kryptera din plånbok?</translation>
-    </message>
-    <message>
-        <source>Bitcoin Core will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source>
-        <translation>Bitcoin Core kommer att stängas för att slutföra krypteringsprocessen. Kom ihåg att plånbokskryptering inte garanterar fullt skydd mot skadlig kod på din dator.</translation>
-    </message>
-    <message>
-        <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source>
-        <translation>VIKTIGT: Alla tidigare säkerhetskopior du har gjort av plånbokens fil ska ersättas med den nya genererade, krypterade plånboks filen. Av säkerhetsskäl kommer tidigare säkerhetskopior av den okrypterade plånboks filen blir oanvändbara när du börjar använda en ny, krypterad plånbok.</translation>
-    </message>
-    <message>
-        <source>Warning: The Caps Lock key is on!</source>
-        <translation>Varning: Caps Lock är påslaget!</translation>
-    </message>
-    <message>
-        <source>Wallet encrypted</source>
-        <translation>Plånboken är krypterad</translation>
-    </message>
-    <message>
-        <source>Enter the new passphrase to the wallet.&lt;br/&gt;Please use a passphrase of &lt;b&gt;ten or more random characters&lt;/b&gt;, or &lt;b&gt;eight or more words&lt;/b&gt;.</source>
-        <translation>Ange plånbokens nya lösenord. &lt;br/&gt; Använd ett lösenord på &lt;b&gt;tio eller fler slumpmässiga tecken,&lt;/b&gt; eller &lt;b&gt;åtta eller fler ord.&lt;/b&gt;.</translation>
-    </message>
-    <message>
-        <source>Enter the old passphrase and new passphrase to the wallet.</source>
-        <translation>Ge det gamla lösenordet och det nya lösenordet för plånboken.</translation>
-    </message>
-    <message>
-        <source>Wallet encryption failed</source>
-        <translation>Kryptering av plånbok misslyckades</translation>
-    </message>
-    <message>
-        <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
-        <translation>Kryptering av plånbok misslyckades på grund av ett internt fel. Din plånbok blev inte krypterad.</translation>
-    </message>
-    <message>
-        <source>The supplied passphrases do not match.</source>
-        <translation>De angivna lösenorden överensstämmer inte.</translation>
-    </message>
-    <message>
-        <source>Wallet unlock failed</source>
-        <translation>Upplåsning av plånbok misslyckades</translation>
-    </message>
-    <message>
-        <source>The passphrase entered for the wallet decryption was incorrect.</source>
-        <translation>Lösenordet för dekryptering av plånbok var felaktig.</translation>
-    </message>
-    <message>
-        <source>Wallet decryption failed</source>
-        <translation>Dekryptering av plånbok misslyckades</translation>
-    </message>
-    <message>
-        <source>Wallet passphrase was successfully changed.</source>
-        <translation>Plånbokens lösenord har ändrats.</translation>
-    </message>
 </context>
 <context>
     <name>BanTableModel</name>
@@ -270,6 +110,14 @@ Var vänlig och försök igen.</translation>
         <source>Quit application</source>
         <translation>Avsluta programmet</translation>
     </message>
+    <message>
+        <source>&amp;About %1</source>
+        <translation>&amp;Om %1</translation>
+    </message>
+    <message>
+        <source>Show information about %1</source>
+        <translation>Visa information om %1</translation>
+    </message>
     <message>
         <source>About &amp;Qt</source>
         <translation>Om &amp;Qt</translation>
@@ -282,6 +130,10 @@ Var vänlig och försök igen.</translation>
         <source>&amp;Options...</source>
         <translation>&amp;Alternativ...</translation>
     </message>
+    <message>
+        <source>Modify configuration options for %1</source>
+        <translation>Ändra konfigurationsalternativ för %1</translation>
+    </message>
     <message>
         <source>&amp;Encrypt Wallet...</source>
         <translation>&amp;Kryptera plånbok...</translation>
@@ -306,14 +158,6 @@ Var vänlig och försök igen.</translation>
         <source>Open &amp;URI...</source>
         <translation>Öppna &amp;URI...</translation>
     </message>
-    <message>
-        <source>Bitcoin Core client</source>
-        <translation>Bitcoin Core-klient</translation>
-    </message>
-    <message>
-        <source>Importing blocks from disk...</source>
-        <translation>Importerar block från disk...</translation>
-    </message>
     <message>
         <source>Reindexing blocks on disk...</source>
         <translation>Återindexerar block på disken...</translation>
@@ -358,10 +202,6 @@ Var vänlig och försök igen.</translation>
         <source>&amp;Receive</source>
         <translation>&amp;Ta emot</translation>
     </message>
-    <message>
-        <source>Show information about Bitcoin Core</source>
-        <translation>Visa information om Bitcoin Core</translation>
-    </message>
     <message>
         <source>&amp;Show / Hide</source>
         <translation>&amp;Visa / Göm</translation>
@@ -398,22 +238,10 @@ Var vänlig och försök igen.</translation>
         <source>Tabs toolbar</source>
         <translation>Verktygsfält för tabbar</translation>
     </message>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Bitcoin Core</translation>
-    </message>
     <message>
         <source>Request payments (generates QR codes and bitcoin: URIs)</source>
         <translation>Begär betalning (genererar QR-koder och bitcoin-URI)</translation>
     </message>
-    <message>
-        <source>&amp;About Bitcoin Core</source>
-        <translation>&amp;Om Bitcoin Core</translation>
-    </message>
-    <message>
-        <source>Modify configuration options for Bitcoin Core</source>
-        <translation>Ändra konfigurationsalternativ för Bitcoin Core</translation>
-    </message>
     <message>
         <source>Show the list of used sending addresses and labels</source>
         <translation>Visa listan av använda avsändaradresser och etiketter</translation>
@@ -430,14 +258,18 @@ Var vänlig och försök igen.</translation>
         <source>&amp;Command-line options</source>
         <translation>&amp;Kommandoradsalternativ</translation>
     </message>
-    <message>
-        <source>Show the Bitcoin Core help message to get a list with possible Bitcoin command-line options</source>
-        <translation>Visa Bitcoin Cores hjälpmeddelande för att få en lista med möjliga Bitcoin-kommandoradsalternativ.</translation>
-    </message>
     <message numerus="yes">
         <source>%n active connection(s) to Bitcoin network</source>
         <translation><numerusform>%n aktiva anslutningar till Bitcoin-nätverket.</numerusform><numerusform>%n aktiva anslutningar till Bitcoin-nätverket.</numerusform></translation>
     </message>
+    <message>
+        <source>Indexing blocks on disk...</source>
+        <translation>Indexerar block på disken...</translation>
+    </message>
+    <message>
+        <source>Processing blocks on disk...</source>
+        <translation>Bearbetar block på disken...</translation>
+    </message>
     <message>
         <source>No block source available...</source>
         <translation>Ingen block-källa tillgänglig...</translation>
@@ -494,6 +326,14 @@ Var vänlig och försök igen.</translation>
         <source>Up to date</source>
         <translation>Uppdaterad</translation>
     </message>
+    <message>
+        <source>Show the %1 help message to get a list with possible Bitcoin command-line options</source>
+        <translation>Visa %1 hjälpmeddelande för att få en lista med möjliga Bitcoin kommandoradsalternativ.</translation>
+    </message>
+    <message>
+        <source>%1 client</source>
+        <translation>%1-klient</translation>
+    </message>
     <message>
         <source>Catching up...</source>
         <translation>Hämtar senaste...</translation>
@@ -545,13 +385,6 @@ Var vänlig och försök igen.</translation>
         <translation>Denna plånbok är &lt;b&gt;krypterad&lt;/b&gt; och för närvarande &lt;b&gt;låst&lt;/b&gt;</translation>
     </message>
 </context>
-<context>
-    <name>ClientModel</name>
-    <message>
-        <source>Network Alert</source>
-        <translation>Nätverkslarm</translation>
-    </message>
-</context>
 <context>
     <name>CoinControlDialog</name>
     <message>
@@ -630,150 +463,6 @@ Var vänlig och försök igen.</translation>
         <source>Priority</source>
         <translation>Prioritet</translation>
     </message>
-    <message>
-        <source>Copy address</source>
-        <translation>Kopiera adress</translation>
-    </message>
-    <message>
-        <source>Copy label</source>
-        <translation>Kopiera etikett</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>Kopiera belopp</translation>
-    </message>
-    <message>
-        <source>Copy transaction ID</source>
-        <translation>Kopiera transaktions ID</translation>
-    </message>
-    <message>
-        <source>Lock unspent</source>
-        <translation>Lås ospenderat</translation>
-    </message>
-    <message>
-        <source>Unlock unspent</source>
-        <translation>Lås upp ospenderat</translation>
-    </message>
-    <message>
-        <source>Copy quantity</source>
-        <translation>Kopiera kvantitet</translation>
-    </message>
-    <message>
-        <source>Copy fee</source>
-        <translation>Kopiera avgift</translation>
-    </message>
-    <message>
-        <source>Copy after fee</source>
-        <translation>Kopiera efter avgift</translation>
-    </message>
-    <message>
-        <source>Copy bytes</source>
-        <translation>Kopiera byte</translation>
-    </message>
-    <message>
-        <source>Copy priority</source>
-        <translation>Kopiera prioritet</translation>
-    </message>
-    <message>
-        <source>Copy dust</source>
-        <translation>Kopiera damm</translation>
-    </message>
-    <message>
-        <source>Copy change</source>
-        <translation>Kopiera växel</translation>
-    </message>
-    <message>
-        <source>highest</source>
-        <translation>högst</translation>
-    </message>
-    <message>
-        <source>higher</source>
-        <translation>högre</translation>
-    </message>
-    <message>
-        <source>high</source>
-        <translation>hög</translation>
-    </message>
-    <message>
-        <source>medium-high</source>
-        <translation>medelhög</translation>
-    </message>
-    <message>
-        <source>medium</source>
-        <translation>medel</translation>
-    </message>
-    <message>
-        <source>low-medium</source>
-        <translation>lågmedel</translation>
-    </message>
-    <message>
-        <source>low</source>
-        <translation>låg</translation>
-    </message>
-    <message>
-        <source>lower</source>
-        <translation>lägre</translation>
-    </message>
-    <message>
-        <source>lowest</source>
-        <translation>lägst</translation>
-    </message>
-    <message>
-        <source>(%1 locked)</source>
-        <translation>(%1 låst)</translation>
-    </message>
-    <message>
-        <source>none</source>
-        <translation>ingen</translation>
-    </message>
-    <message>
-        <source>This label turns red if the transaction size is greater than 1000 bytes.</source>
-        <translation>Denna etikett blir röd om transaktionens storlek är större än 1000 bytes.</translation>
-    </message>
-    <message>
-        <source>This label turns red if the priority is smaller than "medium".</source>
-        <translation>Denna etikett blir röd om prioriteten är lägre än "medium".</translation>
-    </message>
-    <message>
-        <source>This label turns red if any recipient receives an amount smaller than %1.</source>
-        <translation>Denna etikett blir röd om någon mottagare får ett belopp mindre än %1.</translation>
-    </message>
-    <message>
-        <source>Can vary +/- %1 satoshi(s) per input.</source>
-        <translation>Kan variera +/- %1 satoshi per inmatning.</translation>
-    </message>
-    <message>
-        <source>yes</source>
-        <translation>ja</translation>
-    </message>
-    <message>
-        <source>no</source>
-        <translation>nej</translation>
-    </message>
-    <message>
-        <source>This means a fee of at least %1 per kB is required.</source>
-        <translation>Detta betyder att en avgift på minst %1 per kB behövs.</translation>
-    </message>
-    <message>
-        <source>Can vary +/- 1 byte per input.</source>
-        <translation>Kan variera +/- 1 byte per inmatning.</translation>
-    </message>
-    <message>
-        <source>Transactions with higher priority are more likely to get included into a block.</source>
-        <translation>Transaktioner med högre prioritet har större sannolikhet att inkluderas i ett block.</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(Ingen etikett)</translation>
-    </message>
-    <message>
-        <source>change from %1 (%2)</source>
-        <translation>växel från %1 (%2)</translation>
-    </message>
-    <message>
-        <source>(change)</source>
-        <translation>(växel)</translation>
-    </message>
 </context>
 <context>
     <name>EditAddressDialog</name>
@@ -797,38 +486,6 @@ Var vänlig och försök igen.</translation>
         <source>&amp;Address</source>
         <translation>&amp;Adress</translation>
     </message>
-    <message>
-        <source>New receiving address</source>
-        <translation>Ny mottagaradress</translation>
-    </message>
-    <message>
-        <source>New sending address</source>
-        <translation>Ny avsändaradress</translation>
-    </message>
-    <message>
-        <source>Edit receiving address</source>
-        <translation>Redigera mottagaradress</translation>
-    </message>
-    <message>
-        <source>Edit sending address</source>
-        <translation>Redigera avsändaradress</translation>
-    </message>
-    <message>
-        <source>The entered address "%1" is already in the address book.</source>
-        <translation>Den angivna adressen "%1" finns redan i adressboken.</translation>
-    </message>
-    <message>
-        <source>The entered address "%1" is not a valid Bitcoin address.</source>
-        <translation>Den angivna adressen "%1" är inte en giltig Bitcoin-adress.</translation>
-    </message>
-    <message>
-        <source>Could not unlock wallet.</source>
-        <translation>Plånboken kunde inte låsas upp.</translation>
-    </message>
-    <message>
-        <source>New key generation failed.</source>
-        <translation>Misslyckades med generering av ny nyckel.</translation>
-    </message>
 </context>
 <context>
     <name>FreespaceChecker</name>
@@ -855,10 +512,6 @@ Var vänlig och försök igen.</translation>
 </context>
 <context>
     <name>HelpMessageDialog</name>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Bitcoin Core</translation>
-    </message>
     <message>
         <source>version</source>
         <translation>version</translation>
@@ -868,8 +521,8 @@ Var vänlig och försök igen.</translation>
         <translation>(%1-bit)</translation>
     </message>
     <message>
-        <source>About Bitcoin Core</source>
-        <translation>Om Bitcoin Core</translation>
+        <source>About %1</source>
+        <translation>Om %1</translation>
     </message>
     <message>
         <source>Command-line options</source>
@@ -908,8 +561,8 @@ Var vänlig och försök igen.</translation>
         <translation>Visa startbild vid uppstart (standard: %u)</translation>
     </message>
     <message>
-        <source>Reset all settings changes made over the GUI</source>
-        <translation>Återställ alla inställningar som gjorts över GUI</translation>
+        <source>Reset all settings changed in the GUI</source>
+        <translation>Återställ alla inställningar som gjorts i GUI</translation>
     </message>
 </context>
 <context>
@@ -919,16 +572,16 @@ Var vänlig och försök igen.</translation>
         <translation>Välkommen</translation>
     </message>
     <message>
-        <source>Welcome to Bitcoin Core.</source>
-        <translation>Välkommen till Bitcoin Core.</translation>
+        <source>Welcome to %1.</source>
+        <translation>Välkommen till %1.</translation>
     </message>
     <message>
-        <source>As this is the first time the program is launched, you can choose where Bitcoin Core will store its data.</source>
-        <translation>Eftersom detta är första gången programmet startas får du välja var Bitcoin Core skall lagra sina data.</translation>
+        <source>As this is the first time the program is launched, you can choose where %1 will store its data.</source>
+        <translation>Eftersom detta är första gången programmet startas får du välja var %1 skall lagra sitt data.</translation>
     </message>
     <message>
-        <source>Bitcoin Core will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source>
-        <translation>Bitcoin Core kommer att ladda ner och spara en kopia av Bitcoin-blockkedjan. Åtminstone %1GB av data kommer att sparas i denna katalog, och den kommer att växa över tiden. Plånboken kommer också att sparas i denna katalog.</translation>
+        <source>%1 will download and store a copy of the Bitcoin block chain. At least %2GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source>
+        <translation>%1 kommer att ladda ner och spara en kopia av Bitcoin blockkedjan. Åtminstone %2GB av data kommer att sparas i denna katalog, och den kommer att växa över tiden. Plånboken kommer också att sparas i denna katalog.</translation>
     </message>
     <message>
         <source>Use the default data directory</source>
@@ -938,10 +591,6 @@ Var vänlig och försök igen.</translation>
         <source>Use a custom data directory:</source>
         <translation>Använd en anpassad datakatalog:</translation>
     </message>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Bitcoin Core</translation>
-    </message>
     <message>
         <source>Error: Specified data directory "%1" cannot be created.</source>
         <translation>Fel: Den angivna datakatalogen "%1" kan inte skapas.</translation>
@@ -977,10 +626,6 @@ Var vänlig och försök igen.</translation>
         <source>Select payment request file</source>
         <translation>Välj betalningsbegäransfil</translation>
     </message>
-    <message>
-        <source>Select payment request file to open</source>
-        <translation>Välj betalningsbegäransfil att öppna</translation>
-    </message>
 </context>
 <context>
     <name>OptionsDialog</name>
@@ -992,6 +637,14 @@ Var vänlig och försök igen.</translation>
         <source>&amp;Main</source>
         <translation>&amp;Allmänt</translation>
     </message>
+    <message>
+        <source>Automatically start %1 after logging in to the system.</source>
+        <translation>Starta %1 automatiskt efter inloggningen.</translation>
+    </message>
+    <message>
+        <source>&amp;Start %1 on system login</source>
+        <translation>&amp;Starta %1 vid systemlogin</translation>
+    </message>
     <message>
         <source>Size of &amp;database cache</source>
         <translation>Storleken på &amp;databascache</translation>
@@ -1020,10 +673,6 @@ Var vänlig och försök igen.</translation>
         <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Exit in the menu.</source>
         <translation>Minimera istället för att stänga programmet när fönstret stängs. När detta alternativ är aktiverat stängs programmet endast genom att välja Stäng i menyn.</translation>
     </message>
-    <message>
-        <source>The user interface language can be set here. This setting will take effect after restarting Bitcoin Core.</source>
-        <translation>Gränssnittets språk kan väljas här. Denna inställning träder i kraft efter omstart av Bitcoin Core.</translation>
-    </message>
     <message>
         <source>Third party URLs (e.g. a block explorer) that appear in the transactions tab as context menu items. %s in the URL is replaced by transaction hash. Multiple URLs are separated by vertical bar |.</source>
         <translation>Tredjeparts URL:er (t.ex. en blockutforskare) som finns i transaktionstabben som ett menyval i sammanhanget. %s i URL:en ersätts med tansaktionshashen. Flera URL:er är separerade med vertikala streck |.</translation>
@@ -1048,14 +697,6 @@ Var vänlig och försök igen.</translation>
         <source>&amp;Network</source>
         <translation>&amp;Nätverk</translation>
     </message>
-    <message>
-        <source>Automatically start Bitcoin Core after logging in to the system.</source>
-        <translation>Kör Bitcoin Core automatiskt vid systeminloggning.</translation>
-    </message>
-    <message>
-        <source>&amp;Start Bitcoin Core on system login</source>
-        <translation>&amp;Kör Bitcoin Core vid systeminloggning</translation>
-    </message>
     <message>
         <source>(0 = auto, &lt;0 = leave that many cores free)</source>
         <translation>(0 = auto, &lt;0 = lämna så många kärnor lediga)</translation>
@@ -1140,6 +781,14 @@ Var vänlig och försök igen.</translation>
         <source>&amp;Window</source>
         <translation>&amp;Fönster</translation>
     </message>
+    <message>
+        <source>&amp;Hide the icon from the system tray.</source>
+        <translation>&amp;Göm ikonen från systemfältet.</translation>
+    </message>
+    <message>
+        <source>Hide tray icon</source>
+        <translation>Göm systemfältsikonen</translation>
+    </message>
     <message>
         <source>Show only a tray icon after minimizing the window.</source>
         <translation>Visa endast en systemfältsikon vid minimering.</translation>
@@ -1160,6 +809,10 @@ Var vänlig och försök igen.</translation>
         <source>User Interface &amp;language:</source>
         <translation>Användargränssnittets &amp;språk: </translation>
     </message>
+    <message>
+        <source>The user interface language can be set here. This setting will take effect after restarting %1.</source>
+        <translation>Användargränssnittets språk kan ställas in här. Denna inställning träder i kraft efter en omstart av %1.</translation>
+    </message>
     <message>
         <source>&amp;Unit to show amounts in:</source>
         <translation>&amp;Måttenhet att visa belopp i: </translation>
@@ -1285,169 +938,59 @@ Var vänlig och försök igen.</translation>
     </message>
 </context>
 <context>
-    <name>PaymentServer</name>
+    <name>PeerTableModel</name>
     <message>
-        <source>URI handling</source>
-        <translation>URI hantering</translation>
+        <source>User Agent</source>
+        <translation>Användaragent</translation>
     </message>
     <message>
-        <source>Invalid payment address %1</source>
-        <translation>Felaktig betalningsadress %1</translation>
+        <source>Node/Service</source>
+        <translation>Nod/Tjänst</translation>
     </message>
     <message>
-        <source>Payment request rejected</source>
-        <translation>Betalningsbegäran avslogs</translation>
+        <source>Ping Time</source>
+        <translation>Pingtid</translation>
     </message>
+</context>
+<context>
+    <name>QObject</name>
     <message>
-        <source>Payment request network doesn't match client network.</source>
-        <translation>Betalningsbegärans nätverk matchar inte klientens nätverk.</translation>
+        <source>Amount</source>
+        <translation>Mängd</translation>
     </message>
     <message>
-        <source>Payment request is not initialized.</source>
-        <translation>Betalningsbegäran är inte initierad.</translation>
+        <source>Enter a Bitcoin address (e.g. %1)</source>
+        <translation>Ange en Bitcoin-adress (t.ex. %1)</translation>
     </message>
     <message>
-        <source>Requested payment amount of %1 is too small (considered dust).</source>
-        <translation>Begärd betalning av %1 är för liten (betraktas som damm).</translation>
+        <source>%1 d</source>
+        <translation>%1 d</translation>
     </message>
     <message>
-        <source>Payment request error</source>
-        <translation>Fel vid betalningsbegäran</translation>
+        <source>%1 h</source>
+        <translation>%1 h</translation>
     </message>
     <message>
-        <source>Cannot start bitcoin: click-to-pay handler</source>
-        <translation>Kan inte starta bitcoin: klicka-och-betala handhavare</translation>
+        <source>%1 m</source>
+        <translation>%1 m</translation>
     </message>
     <message>
-        <source>Payment request fetch URL is invalid: %1</source>
-        <translation>Betalningsbegärans hämta URL är felaktig: %1</translation>
+        <source>%1 s</source>
+        <translation>%1 s</translation>
     </message>
     <message>
-        <source>URI cannot be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source>
-        <translation>URI går inte att tolkas! Detta kan orsakas av en ogiltig Bitcoin-adress eller felaktiga URI parametrar.</translation>
+        <source>None</source>
+        <translation>Ingen</translation>
     </message>
     <message>
-        <source>Payment request file handling</source>
-        <translation>Hantering av betalningsbegäransfil</translation>
-    </message>
-    <message>
-        <source>Payment request file cannot be read! This can be caused by an invalid payment request file.</source>
-        <translation>Betalningsbegäransfilen kan inte läsas! Detta kan orsakas av en felaktig betalningsbegäransfil.</translation>
-    </message>
-    <message>
-        <source>Payment request expired.</source>
-        <translation>Betalningsbegäran löpte ut.</translation>
-    </message>
-    <message>
-        <source>Unverified payment requests to custom payment scripts are unsupported.</source>
-        <translation>Overifierade betalningsbegärningar till specialbetalningsskript stöds inte.</translation>
-    </message>
-    <message>
-        <source>Invalid payment request.</source>
-        <translation>Ogiltig betalningsbegäran.</translation>
-    </message>
-    <message>
-        <source>Refund from %1</source>
-        <translation>Återbetalning från %1</translation>
-    </message>
-    <message>
-        <source>Payment request %1 is too large (%2 bytes, allowed %3 bytes).</source>
-        <translation>Betalningsbegäran %1 är för stor (%2 bytes, tillåten %3 bytes)</translation>
-    </message>
-    <message>
-        <source>Error communicating with %1: %2</source>
-        <translation>Kommunikationsfel med %1: %2</translation>
-    </message>
-    <message>
-        <source>Payment request cannot be parsed!</source>
-        <translation>Betalningsbegäran kan inte behandlas!</translation>
-    </message>
-    <message>
-        <source>Bad response from server %1</source>
-        <translation>Dåligt svar från server %1</translation>
-    </message>
-    <message>
-        <source>Payment acknowledged</source>
-        <translation>Betalningen bekräftad</translation>
-    </message>
-    <message>
-        <source>Network request error</source>
-        <translation>Fel vid närverksbegäran</translation>
-    </message>
-</context>
-<context>
-    <name>PeerTableModel</name>
-    <message>
-        <source>User Agent</source>
-        <translation>Användaragent</translation>
-    </message>
-    <message>
-        <source>Node/Service</source>
-        <translation>Nod/Tjänst</translation>
-    </message>
-    <message>
-        <source>Ping Time</source>
-        <translation>Pingtid</translation>
-    </message>
-</context>
-<context>
-    <name>QObject</name>
-    <message>
-        <source>Amount</source>
-        <translation>Mängd</translation>
-    </message>
-    <message>
-        <source>Enter a Bitcoin address (e.g. %1)</source>
-        <translation>Ange en Bitcoin-adress (t.ex. %1)</translation>
-    </message>
-    <message>
-        <source>%1 d</source>
-        <translation>%1 d</translation>
-    </message>
-    <message>
-        <source>%1 h</source>
-        <translation>%1 h</translation>
-    </message>
-    <message>
-        <source>%1 m</source>
-        <translation>%1 m</translation>
-    </message>
-    <message>
-        <source>%1 s</source>
-        <translation>%1 s</translation>
-    </message>
-    <message>
-        <source>None</source>
-        <translation>Ingen</translation>
-    </message>
-    <message>
-        <source>N/A</source>
-        <translation>ej tillgänglig</translation>
+        <source>N/A</source>
+        <translation>ej tillgänglig</translation>
     </message>
     <message>
         <source>%1 ms</source>
         <translation>%1 ms</translation>
     </message>
 </context>
-<context>
-    <name>QRImageWidget</name>
-    <message>
-        <source>&amp;Save Image...</source>
-        <translation>&amp;Spara Bild...</translation>
-    </message>
-    <message>
-        <source>&amp;Copy Image</source>
-        <translation>&amp;Kopiera Bild</translation>
-    </message>
-    <message>
-        <source>Save QR Code</source>
-        <translation>Spara QR-kod</translation>
-    </message>
-    <message>
-        <source>PNG Image (*.png)</source>
-        <translation>PNG-bild (*.png)</translation>
-    </message>
-</context>
 <context>
     <name>RPCConsole</name>
     <message>
@@ -1478,6 +1021,10 @@ Var vänlig och försök igen.</translation>
         <source>Using BerkeleyDB version</source>
         <translation>Använder BerkeleyDB versionen</translation>
     </message>
+    <message>
+        <source>Datadir</source>
+        <translation>Datakatalog</translation>
+    </message>
     <message>
         <source>Startup time</source>
         <translation>Uppstartstid</translation>
@@ -1514,10 +1061,6 @@ Var vänlig och försök igen.</translation>
         <source>Memory usage</source>
         <translation>Minnesåtgång</translation>
     </message>
-    <message>
-        <source>Open the Bitcoin Core debug log file from the current data directory. This can take a few seconds for large log files.</source>
-        <translation>Öppna felsökningsloggfilen för Bitcoin Core från den nuvarande datakatalogen. Detta kan ta några sekunder om loggfilen är stor.</translation>
-    </message>
     <message>
         <source>Received</source>
         <translation>Mottagen</translation>
@@ -1566,6 +1109,18 @@ Var vänlig och försök igen.</translation>
         <source>User Agent</source>
         <translation>Användaragent</translation>
     </message>
+    <message>
+        <source>Open the %1 debug log file from the current data directory. This can take a few seconds for large log files.</source>
+        <translation>Öppna %1 debug-loggfilen från aktuell datakatalog. Detta kan ta några sekunder för stora loggfiler.</translation>
+    </message>
+    <message>
+        <source>Decrease font size</source>
+        <translation>Minska fontstorleken</translation>
+    </message>
+    <message>
+        <source>Increase font size</source>
+        <translation>Öka fontstorleken</translation>
+    </message>
     <message>
         <source>Services</source>
         <translation>Tjänster</translation>
@@ -1634,10 +1189,6 @@ Var vänlig och försök igen.</translation>
         <source>Out:</source>
         <translation>Ut:</translation>
     </message>
-    <message>
-        <source>Build date</source>
-        <translation>Kompileringsdatum</translation>
-    </message>
     <message>
         <source>Debug log file</source>
         <translation>Debugloggfil</translation>
@@ -1675,8 +1226,8 @@ Var vänlig och försök igen.</translation>
         <translation>&amp;Ta bort ban från nod</translation>
     </message>
     <message>
-        <source>Welcome to the Bitcoin Core RPC console.</source>
-        <translation>Välkommen till RPC-konsolen för Bitcoin Core.</translation>
+        <source>Welcome to the %1 RPC console.</source>
+        <translation>Välkommen till %1 RPC-konsolen.</translation>
     </message>
     <message>
         <source>Use up and down arrows to navigate history, and &lt;b&gt;Ctrl-L&lt;/b&gt; to clear screen.</source>
@@ -1805,18 +1356,6 @@ Var vänlig och försök igen.</translation>
         <source>Remove</source>
         <translation>Ta bort</translation>
     </message>
-    <message>
-        <source>Copy label</source>
-        <translation>Kopiera etikett</translation>
-    </message>
-    <message>
-        <source>Copy message</source>
-        <translation>Kopiera meddelande</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>Kopiera belopp</translation>
-    </message>
 </context>
 <context>
     <name>ReceiveRequestDialog</name>
@@ -1836,73 +1375,6 @@ Var vänlig och försök igen.</translation>
         <source>&amp;Save Image...</source>
         <translation>&amp;Spara Bild...</translation>
     </message>
-    <message>
-        <source>Request payment to %1</source>
-        <translation>Begär betalning till %1</translation>
-    </message>
-    <message>
-        <source>Payment information</source>
-        <translation>Betalningsinformation</translation>
-    </message>
-    <message>
-        <source>URI</source>
-        <translation>URI</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>Adress</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>Mängd</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Etikett</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>Meddelande</translation>
-    </message>
-    <message>
-        <source>Resulting URI too long, try to reduce the text for label / message.</source>
-        <translation>URI:n är för lång, försöka minska texten för etikett / meddelande.</translation>
-    </message>
-    <message>
-        <source>Error encoding URI into QR Code.</source>
-        <translation>Fel vid skapande av QR-kod från URI.</translation>
-    </message>
-</context>
-<context>
-    <name>RecentRequestsTableModel</name>
-    <message>
-        <source>Date</source>
-        <translation>Datum</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Etikett</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>Meddelande</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>Mängd</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(Ingen etikett)</translation>
-    </message>
-    <message>
-        <source>(no message)</source>
-        <translation>(inget meddelande)</translation>
-    </message>
-    <message>
-        <source>(no amount)</source>
-        <translation>(ingen summa)</translation>
-    </message>
 </context>
 <context>
     <name>SendCoinsDialog</name>
@@ -2022,14 +1494,6 @@ Var vänlig och försök igen.</translation>
         <source>fast</source>
         <translation>snabb</translation>
     </message>
-    <message>
-        <source>Send as zero-fee transaction if possible</source>
-        <translation>Sänd som nollavgiftstransaktion om möjligt</translation>
-    </message>
-    <message>
-        <source>(confirmation may take longer)</source>
-        <translation>(bekräftelse kan ta längre tid)</translation>
-    </message>
     <message>
         <source>Send to multiple recipients at once</source>
         <translation>Skicka till flera mottagare samtidigt</translation>
@@ -2062,118 +1526,6 @@ Var vänlig och försök igen.</translation>
         <source>S&amp;end</source>
         <translation>&amp;Skicka</translation>
     </message>
-    <message>
-        <source>Confirm send coins</source>
-        <translation>Bekräfta skickade mynt</translation>
-    </message>
-    <message>
-        <source>%1 to %2</source>
-        <translation>%1 till %2</translation>
-    </message>
-    <message>
-        <source>Copy quantity</source>
-        <translation>Kopiera kvantitet</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>Kopiera belopp</translation>
-    </message>
-    <message>
-        <source>Copy fee</source>
-        <translation>Kopiera avgift</translation>
-    </message>
-    <message>
-        <source>Copy after fee</source>
-        <translation>Kopiera efter avgift</translation>
-    </message>
-    <message>
-        <source>Copy bytes</source>
-        <translation>Kopiera byte</translation>
-    </message>
-    <message>
-        <source>Copy priority</source>
-        <translation>Kopiera prioritet</translation>
-    </message>
-    <message>
-        <source>Copy change</source>
-        <translation>Kopiera växel</translation>
-    </message>
-    <message>
-        <source>Total Amount %1</source>
-        <translation>Total summa %1</translation>
-    </message>
-    <message>
-        <source>or</source>
-        <translation>eller</translation>
-    </message>
-    <message>
-        <source>The amount to pay must be larger than 0.</source>
-        <translation>Det betalade beloppet måste vara större än 0.</translation>
-    </message>
-    <message>
-        <source>The amount exceeds your balance.</source>
-        <translation>Värdet överstiger ditt saldo.</translation>
-    </message>
-    <message>
-        <source>The total exceeds your balance when the %1 transaction fee is included.</source>
-        <translation>Totalvärdet överstiger ditt saldo när transaktionsavgiften %1 är pålagd.</translation>
-    </message>
-    <message>
-        <source>Transaction creation failed!</source>
-        <translation>Transaktionen gick inte att skapa!</translation>
-    </message>
-    <message>
-        <source>The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source>
-        <translation>Transaktionen avslogs! Detta kan hända om några av mynten i plånboken redan spenderats, t.ex om du använt en kopia av wallet.dat och mynt spenderades i kopian men inte markerats som spenderade här.</translation>
-    </message>
-    <message>
-        <source>A fee higher than %1 is considered an absurdly high fee.</source>
-        <translation>En avgift som är högre än %1 anses vara en orimligt hög avgift.</translation>
-    </message>
-    <message>
-        <source>Payment request expired.</source>
-        <translation>Betalningsbegäran löpte ut.</translation>
-    </message>
-    <message>
-        <source>Pay only the required fee of %1</source>
-        <translation>Betala endast den nödvändiga avgiften på %1</translation>
-    </message>
-    <message numerus="yes">
-        <source>Estimated to begin confirmation within %n block(s).</source>
-        <translation><numerusform>Uppskattas till att påbörja bekräftelse inom %n block.</numerusform><numerusform>Uppskattas till att påbörja bekräftelse inom %n block.</numerusform></translation>
-    </message>
-    <message>
-        <source>The recipient address is not valid. Please recheck.</source>
-        <translation>Mottagarens adress är ogiltig. Kontrollera igen.</translation>
-    </message>
-    <message>
-        <source>Duplicate address found: addresses should only be used once each.</source>
-        <translation>Duplicerad adress upptäckt: adresser skall endast användas en gång var.</translation>
-    </message>
-    <message>
-        <source>Warning: Invalid Bitcoin address</source>
-        <translation>Varning: Felaktig Bitcoinadress</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(Ingen etikett)</translation>
-    </message>
-    <message>
-        <source>Warning: Unknown change address</source>
-        <translation>Varning: Okänd växeladress</translation>
-    </message>
-    <message>
-        <source>Copy dust</source>
-        <translation>Kopiera damm</translation>
-    </message>
-    <message>
-        <source>Are you sure you want to send?</source>
-        <translation>Är du säker på att du vill skicka?</translation>
-    </message>
-    <message>
-        <source>added as transaction fee</source>
-        <translation>adderad som transaktionsavgift</translation>
-    </message>
 </context>
 <context>
     <name>SendCoinsEntry</name>
@@ -2185,721 +1537,199 @@ Var vänlig och försök igen.</translation>
         <source>Pay &amp;To:</source>
         <translation>Betala &amp;Till:</translation>
     </message>
-    <message>
-        <source>Enter a label for this address to add it to your address book</source>
-        <translation>Ange ett namn för den här adressen och lägg till den i din adressbok</translation>
-    </message>
     <message>
         <source>&amp;Label:</source>
         <translation>&amp;Etikett:</translation>
     </message>
     <message>
         <source>Choose previously used address</source>
-        <translation>Välj tidigare använda adresser</translation>
-    </message>
-    <message>
-        <source>This is a normal payment.</source>
-        <translation>Detta är en normal betalning.</translation>
-    </message>
-    <message>
-        <source>The Bitcoin address to send the payment to</source>
-        <translation>Bitcoinadress att sända betalning till</translation>
-    </message>
-    <message>
-        <source>Alt+A</source>
-        <translation>Alt+A</translation>
-    </message>
-    <message>
-        <source>Paste address from clipboard</source>
-        <translation>Klistra in adress från Urklipp</translation>
-    </message>
-    <message>
-        <source>Alt+P</source>
-        <translation>Alt+P</translation>
-    </message>
-    <message>
-        <source>Remove this entry</source>
-        <translation>Radera denna post</translation>
-    </message>
-    <message>
-        <source>The fee will be deducted from the amount being sent. The recipient will receive less bitcoins than you enter in the amount field. If multiple recipients are selected, the fee is split equally.</source>
-        <translation>Avgiften dras från beloppet som skickas. Mottagaren kommer att få mindre bitcoins än du angivit i belopp-fältet. Om flera mottagare valts kommer avgiften delas jämt.</translation>
-    </message>
-    <message>
-        <source>S&amp;ubtract fee from amount</source>
-        <translation>S&amp;ubtrahera avgiften från beloppet</translation>
-    </message>
-    <message>
-        <source>Message:</source>
-        <translation>Meddelande:</translation>
-    </message>
-    <message>
-        <source>This is an unauthenticated payment request.</source>
-        <translation>Detta är en oautentiserad betalningsbegäran.</translation>
-    </message>
-    <message>
-        <source>This is an authenticated payment request.</source>
-        <translation>Detta är en autentiserad betalningsbegäran.</translation>
-    </message>
-    <message>
-        <source>Enter a label for this address to add it to the list of used addresses</source>
-        <translation>Ange en etikett för denna adress att adderas till listan över använda adresser</translation>
-    </message>
-    <message>
-        <source>A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
-        <translation>Ett meddelande som bifogades bitcoin-URI, vilket lagras med transaktionen som referens. NB: Meddelandet kommer inte att sändas över Bitcoinnätverket.</translation>
-    </message>
-    <message>
-        <source>Pay To:</source>
-        <translation>Betala Till:</translation>
-    </message>
-    <message>
-        <source>Memo:</source>
-        <translation>PM:</translation>
-    </message>
-</context>
-<context>
-    <name>ShutdownWindow</name>
-    <message>
-        <source>Bitcoin Core is shutting down...</source>
-        <translation>Bitcoin Core stängs av...</translation>
-    </message>
-    <message>
-        <source>Do not shut down the computer until this window disappears.</source>
-        <translation>Stäng inte av datorn förrän denna ruta försvinner.</translation>
-    </message>
-</context>
-<context>
-    <name>SignVerifyMessageDialog</name>
-    <message>
-        <source>Signatures - Sign / Verify a Message</source>
-        <translation>Signaturer - Signera / Verifiera ett Meddelande</translation>
-    </message>
-    <message>
-        <source>&amp;Sign Message</source>
-        <translation>&amp;Signera Meddelande</translation>
-    </message>
-    <message>
-        <source>You can sign messages/agreements with your addresses to prove you can receive bitcoins sent to them. Be careful not to sign anything vague or random, as phishing attacks may try to trick you into signing your identity over to them. Only sign fully-detailed statements you agree to.</source>
-        <translation>Du kan underteckna meddelanden/avtal med dina adresser för att bevisa att du kan ta emot bitcoins som skickats till dem. Var försiktig så du inte undertecknar något oklart eller konstigt, eftersom phishing-angrepp kan försöka få dig att underteckna din identitet till dem. Underteckna endast väldetaljerade meddelanden som du godkänner.</translation>
-    </message>
-    <message>
-        <source>The Bitcoin address to sign the message with</source>
-        <translation>Bitcoinadress att signera meddelandet med</translation>
-    </message>
-    <message>
-        <source>Choose previously used address</source>
-        <translation>Välj tidigare använda adresser</translation>
-    </message>
-    <message>
-        <source>Alt+A</source>
-        <translation>Alt+A</translation>
-    </message>
-    <message>
-        <source>Paste address from clipboard</source>
-        <translation>Klistra in adress från Urklipp</translation>
-    </message>
-    <message>
-        <source>Alt+P</source>
-        <translation>Alt+P</translation>
-    </message>
-    <message>
-        <source>Enter the message you want to sign here</source>
-        <translation>Skriv in meddelandet du vill signera här</translation>
-    </message>
-    <message>
-        <source>Signature</source>
-        <translation>Signatur</translation>
-    </message>
-    <message>
-        <source>Copy the current signature to the system clipboard</source>
-        <translation>Kopiera signaturen till systemets Urklipp</translation>
-    </message>
-    <message>
-        <source>Sign the message to prove you own this Bitcoin address</source>
-        <translation>Signera meddelandet för att bevisa att du äger denna adress</translation>
-    </message>
-    <message>
-        <source>Sign &amp;Message</source>
-        <translation>Signera &amp;Meddelande</translation>
-    </message>
-    <message>
-        <source>Reset all sign message fields</source>
-        <translation>Rensa alla fält</translation>
-    </message>
-    <message>
-        <source>Clear &amp;All</source>
-        <translation>Rensa &amp;alla</translation>
-    </message>
-    <message>
-        <source>&amp;Verify Message</source>
-        <translation>&amp;Verifiera Meddelande</translation>
-    </message>
-    <message>
-        <source>Enter the receiver's address, message (ensure you copy line breaks, spaces, tabs, etc. exactly) and signature below to verify the message. Be careful not to read more into the signature than what is in the signed message itself, to avoid being tricked by a man-in-the-middle attack. Note that this only proves the signing party receives with the address, it cannot prove sendership of any transaction!</source>
-        <translation>Ange mottagarens adress, meddelande (kopiera radbrytningar, mellanrum, flikar, etc. exakt) och signatur nedan för att verifiera meddelandet. Undvik att läsa in mera information i signaturen än vad som stod i själva undertecknade meddelandet, för att undvika ett man-in-the-middle-angrepp. Notera att detta endast bevisar att undertecknad tar emot med adressen, det bevisar inte vem som skickat transaktionen!</translation>
-    </message>
-    <message>
-        <source>The Bitcoin address the message was signed with</source>
-        <translation>Bitcoinadressen som meddelandet signerades med</translation>
-    </message>
-    <message>
-        <source>Verify the message to ensure it was signed with the specified Bitcoin address</source>
-        <translation>Verifiera meddelandet för att vara säker på att den var signerad med den angivna Bitcoin-adressen</translation>
-    </message>
-    <message>
-        <source>Verify &amp;Message</source>
-        <translation>Verifiera &amp;Meddelande</translation>
-    </message>
-    <message>
-        <source>Reset all verify message fields</source>
-        <translation>Rensa alla fält</translation>
-    </message>
-    <message>
-        <source>Click "Sign Message" to generate signature</source>
-        <translation>Klicka "Signera Meddelande" för att få en signatur</translation>
-    </message>
-    <message>
-        <source>The entered address is invalid.</source>
-        <translation>Den angivna adressen är ogiltig.</translation>
-    </message>
-    <message>
-        <source>Please check the address and try again.</source>
-        <translation>Vad god kontrollera adressen och försök igen.</translation>
-    </message>
-    <message>
-        <source>The entered address does not refer to a key.</source>
-        <translation>Den angivna adressen refererar inte till en nyckel.</translation>
-    </message>
-    <message>
-        <source>Wallet unlock was cancelled.</source>
-        <translation>Upplåsningen av plånboken avbröts.</translation>
-    </message>
-    <message>
-        <source>Private key for the entered address is not available.</source>
-        <translation>Privata nyckel för den angivna adressen är inte tillgänglig.</translation>
-    </message>
-    <message>
-        <source>Message signing failed.</source>
-        <translation>Signeringen av meddelandet misslyckades.</translation>
-    </message>
-    <message>
-        <source>Message signed.</source>
-        <translation>Meddelandet är signerat.</translation>
-    </message>
-    <message>
-        <source>The signature could not be decoded.</source>
-        <translation>Signaturen kunde inte avkodas.</translation>
-    </message>
-    <message>
-        <source>Please check the signature and try again.</source>
-        <translation>Kontrollera signaturen och försök igen.</translation>
-    </message>
-    <message>
-        <source>The signature did not match the message digest.</source>
-        <translation>Signaturen matchade inte meddelandesammanfattningen.</translation>
-    </message>
-    <message>
-        <source>Message verification failed.</source>
-        <translation>Meddelandet verifikation misslyckades.</translation>
-    </message>
-    <message>
-        <source>Message verified.</source>
-        <translation>Meddelandet är verifierad.</translation>
-    </message>
-</context>
-<context>
-    <name>SplashScreen</name>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Bitcoin Kärna</translation>
-    </message>
-    <message>
-        <source>The Bitcoin Core developers</source>
-        <translation>Bitcoin Core-utvecklarna</translation>
-    </message>
-    <message>
-        <source>[testnet]</source>
-        <translation>[testnet]</translation>
-    </message>
-</context>
-<context>
-    <name>TrafficGraphWidget</name>
-    <message>
-        <source>KB/s</source>
-        <translation>KB/s</translation>
-    </message>
-</context>
-<context>
-    <name>TransactionDesc</name>
-    <message>
-        <source>Open until %1</source>
-        <translation>Öppet till %1</translation>
-    </message>
-    <message>
-        <source>conflicted</source>
-        <translation>konflikterade</translation>
-    </message>
-    <message>
-        <source>%1/offline</source>
-        <translation>%1/nerkopplad</translation>
-    </message>
-    <message>
-        <source>%1/unconfirmed</source>
-        <translation>%1/obekräftade</translation>
-    </message>
-    <message>
-        <source>%1 confirmations</source>
-        <translation>%1 bekräftelser</translation>
-    </message>
-    <message>
-        <source>Status</source>
-        <translation>Status</translation>
-    </message>
-    <message numerus="yes">
-        <source>, broadcast through %n node(s)</source>
-        <translation><numerusform>, sänd genom %n nod</numerusform><numerusform>, sänd genom %n noder</numerusform></translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation>Datum</translation>
-    </message>
-    <message>
-        <source>Source</source>
-        <translation>Källa</translation>
-    </message>
-    <message>
-        <source>Generated</source>
-        <translation>Genererad</translation>
-    </message>
-    <message>
-        <source>From</source>
-        <translation>Från</translation>
-    </message>
-    <message>
-        <source>To</source>
-        <translation>Till</translation>
-    </message>
-    <message>
-        <source>own address</source>
-        <translation>egen adress</translation>
-    </message>
-    <message>
-        <source>watch-only</source>
-        <translation>granska-bara</translation>
-    </message>
-    <message>
-        <source>label</source>
-        <translation>etikett</translation>
-    </message>
-    <message>
-        <source>Credit</source>
-        <translation>Kredit</translation>
-    </message>
-    <message numerus="yes">
-        <source>matures in %n more block(s)</source>
-        <translation><numerusform>mognar om %n fler block</numerusform><numerusform>mognar om %n fler block</numerusform></translation>
-    </message>
-    <message>
-        <source>not accepted</source>
-        <translation>inte accepterad</translation>
-    </message>
-    <message>
-        <source>Debit</source>
-        <translation>Belasta</translation>
-    </message>
-    <message>
-        <source>Total debit</source>
-        <translation>Total skuld</translation>
-    </message>
-    <message>
-        <source>Total credit</source>
-        <translation>Total kredit</translation>
-    </message>
-    <message>
-        <source>Transaction fee</source>
-        <translation>Transaktionsavgift</translation>
-    </message>
-    <message>
-        <source>Net amount</source>
-        <translation>Nettobelopp</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>Meddelande</translation>
-    </message>
-    <message>
-        <source>Comment</source>
-        <translation>Kommentar</translation>
-    </message>
-    <message>
-        <source>Transaction ID</source>
-        <translation>Transaktions-ID</translation>
-    </message>
-    <message>
-        <source>Merchant</source>
-        <translation>Handlare</translation>
-    </message>
-    <message>
-        <source>Generated coins must mature %1 blocks before they can be spent. When you generated this block, it was broadcast to the network to be added to the block chain. If it fails to get into the chain, its state will change to "not accepted" and it won't be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source>
-        <translation>Genererade mynt måste vänta %1 block innan de kan användas. När du skapade detta block sändes det till nätverket för att läggas till i blockkedjan. Om blocket inte kommer in i kedjan kommer dess status att ändras till "accepteras inte" och kommer ej att gå att spendera. Detta kan ibland hända om en annan nod genererar ett block nästan samtidigt som dig.</translation>
-    </message>
-    <message>
-        <source>Debug information</source>
-        <translation>Debug information</translation>
-    </message>
-    <message>
-        <source>Transaction</source>
-        <translation>Transaktion</translation>
-    </message>
-    <message>
-        <source>Inputs</source>
-        <translation>Inputs</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>Mängd</translation>
-    </message>
-    <message>
-        <source>true</source>
-        <translation>sant</translation>
-    </message>
-    <message>
-        <source>false</source>
-        <translation>falsk</translation>
-    </message>
-    <message>
-        <source>, has not been successfully broadcast yet</source>
-        <translation>, har inte lyckats skickas ännu</translation>
-    </message>
-    <message numerus="yes">
-        <source>Open for %n more block(s)</source>
-        <translation><numerusform>Öppet för %n mer block</numerusform><numerusform>Öppet för %n mer block</numerusform></translation>
-    </message>
-    <message>
-        <source>unknown</source>
-        <translation>okänd</translation>
-    </message>
-</context>
-<context>
-    <name>TransactionDescDialog</name>
-    <message>
-        <source>Transaction details</source>
-        <translation>Transaktionsdetaljer</translation>
-    </message>
-    <message>
-        <source>This pane shows a detailed description of the transaction</source>
-        <translation>Den här panelen visar en detaljerad beskrivning av transaktionen</translation>
-    </message>
-</context>
-<context>
-    <name>TransactionTableModel</name>
-    <message>
-        <source>Date</source>
-        <translation>Datum</translation>
-    </message>
-    <message>
-        <source>Type</source>
-        <translation>Typ</translation>
-    </message>
-    <message>
-        <source>Immature (%1 confirmations, will be available after %2)</source>
-        <translation>Omogen (%1 konfirmeringar, blir tillgänglig efter %2)</translation>
-    </message>
-    <message numerus="yes">
-        <source>Open for %n more block(s)</source>
-        <translation><numerusform>Öppet för %n mer block</numerusform><numerusform>Öppet för %n mer block</numerusform></translation>
-    </message>
-    <message>
-        <source>Open until %1</source>
-        <translation>Öppet till %1</translation>
-    </message>
-    <message>
-        <source>Confirmed (%1 confirmations)</source>
-        <translation>Bekräftad (%1 bekräftelser)</translation>
-    </message>
-    <message>
-        <source>This block was not received by any other nodes and will probably not be accepted!</source>
-        <translation>Det här blocket togs inte emot av några andra noder och kommer antagligen inte att bli godkänt.</translation>
-    </message>
-    <message>
-        <source>Generated but not accepted</source>
-        <translation>Genererad men inte accepterad</translation>
-    </message>
-    <message>
-        <source>Offline</source>
-        <translation>Nerkopplad</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Etikett</translation>
-    </message>
-    <message>
-        <source>Unconfirmed</source>
-        <translation>Okonfirmerade</translation>
-    </message>
-    <message>
-        <source>Confirming (%1 of %2 recommended confirmations)</source>
-        <translation>Konfirmerar (%1 of %2 konfirmeringar)</translation>
-    </message>
-    <message>
-        <source>Conflicted</source>
-        <translation>Konflikterade</translation>
-    </message>
-    <message>
-        <source>Received with</source>
-        <translation>Mottagen med</translation>
-    </message>
-    <message>
-        <source>Received from</source>
-        <translation>Mottaget från</translation>
-    </message>
-    <message>
-        <source>Sent to</source>
-        <translation>Skickad till</translation>
-    </message>
-    <message>
-        <source>Payment to yourself</source>
-        <translation>Betalning till dig själv</translation>
-    </message>
-    <message>
-        <source>Mined</source>
-        <translation>Genererade</translation>
-    </message>
-    <message>
-        <source>watch-only</source>
-        <translation>granska-bara</translation>
-    </message>
-    <message>
-        <source>(n/a)</source>
-        <translation>(n/a)</translation>
-    </message>
-    <message>
-        <source>Transaction status. Hover over this field to show number of confirmations.</source>
-        <translation>Transaktionsstatus. Håll muspekaren över för att se antal bekräftelser.</translation>
-    </message>
-    <message>
-        <source>Date and time that the transaction was received.</source>
-        <translation>Tidpunkt då transaktionen mottogs.</translation>
-    </message>
-    <message>
-        <source>Type of transaction.</source>
-        <translation>Transaktionstyp.</translation>
-    </message>
-    <message>
-        <source>Whether or not a watch-only address is involved in this transaction.</source>
-        <translation>Anger om granska-bara--adresser är involverade i denna transaktion.</translation>
+        <translation>Välj tidigare använda adresser</translation>
     </message>
     <message>
-        <source>User-defined intent/purpose of the transaction.</source>
-        <translation>Användardefinierat syfte/ändamål för transaktionen.</translation>
+        <source>This is a normal payment.</source>
+        <translation>Detta är en normal betalning.</translation>
     </message>
     <message>
-        <source>Amount removed from or added to balance.</source>
-        <translation>Belopp draget eller tillagt till balans.</translation>
+        <source>The Bitcoin address to send the payment to</source>
+        <translation>Bitcoinadress att sända betalning till</translation>
     </message>
-</context>
-<context>
-    <name>TransactionView</name>
     <message>
-        <source>All</source>
-        <translation>Alla</translation>
+        <source>Alt+A</source>
+        <translation>Alt+A</translation>
     </message>
     <message>
-        <source>Today</source>
-        <translation>Idag</translation>
+        <source>Paste address from clipboard</source>
+        <translation>Klistra in adress från Urklipp</translation>
     </message>
     <message>
-        <source>This week</source>
-        <translation>Denna vecka</translation>
+        <source>Alt+P</source>
+        <translation>Alt+P</translation>
     </message>
     <message>
-        <source>This month</source>
-        <translation>Denna månad</translation>
+        <source>Remove this entry</source>
+        <translation>Radera denna post</translation>
     </message>
     <message>
-        <source>Last month</source>
-        <translation>Föregående månad</translation>
+        <source>The fee will be deducted from the amount being sent. The recipient will receive less bitcoins than you enter in the amount field. If multiple recipients are selected, the fee is split equally.</source>
+        <translation>Avgiften dras från beloppet som skickas. Mottagaren kommer att få mindre bitcoins än du angivit i belopp-fältet. Om flera mottagare valts kommer avgiften delas jämt.</translation>
     </message>
     <message>
-        <source>This year</source>
-        <translation>Det här året</translation>
+        <source>S&amp;ubtract fee from amount</source>
+        <translation>S&amp;ubtrahera avgiften från beloppet</translation>
     </message>
     <message>
-        <source>Range...</source>
-        <translation>Period...</translation>
+        <source>Message:</source>
+        <translation>Meddelande:</translation>
     </message>
     <message>
-        <source>Received with</source>
-        <translation>Mottagen med</translation>
+        <source>This is an unauthenticated payment request.</source>
+        <translation>Detta är en oautentiserad betalningsbegäran.</translation>
     </message>
     <message>
-        <source>Sent to</source>
-        <translation>Skickad till</translation>
+        <source>This is an authenticated payment request.</source>
+        <translation>Detta är en autentiserad betalningsbegäran.</translation>
     </message>
     <message>
-        <source>To yourself</source>
-        <translation>Till dig själv</translation>
+        <source>Enter a label for this address to add it to the list of used addresses</source>
+        <translation>Ange en etikett för denna adress att adderas till listan över använda adresser</translation>
     </message>
     <message>
-        <source>Mined</source>
-        <translation>Genererade</translation>
+        <source>A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
+        <translation>Ett meddelande som bifogades bitcoin-URI, vilket lagras med transaktionen som referens. NB: Meddelandet kommer inte att sändas över Bitcoinnätverket.</translation>
     </message>
     <message>
-        <source>Other</source>
-        <translation>Övriga</translation>
+        <source>Pay To:</source>
+        <translation>Betala Till:</translation>
     </message>
     <message>
-        <source>Enter address or label to search</source>
-        <translation>Sök efter adress eller etikett </translation>
+        <source>Memo:</source>
+        <translation>PM:</translation>
     </message>
+</context>
+<context>
+    <name>ShutdownWindow</name>
     <message>
-        <source>Min amount</source>
-        <translation>Minsta mängd</translation>
+        <source>%1 is shutting down...</source>
+        <translation>%1 stängs av...</translation>
     </message>
     <message>
-        <source>Copy address</source>
-        <translation>Kopiera adress</translation>
+        <source>Do not shut down the computer until this window disappears.</source>
+        <translation>Stäng inte av datorn förrän denna ruta försvinner.</translation>
     </message>
+</context>
+<context>
+    <name>SignVerifyMessageDialog</name>
     <message>
-        <source>Copy label</source>
-        <translation>Kopiera etikett</translation>
+        <source>Signatures - Sign / Verify a Message</source>
+        <translation>Signaturer - Signera / Verifiera ett Meddelande</translation>
     </message>
     <message>
-        <source>Copy amount</source>
-        <translation>Kopiera belopp</translation>
+        <source>&amp;Sign Message</source>
+        <translation>&amp;Signera Meddelande</translation>
     </message>
     <message>
-        <source>Copy transaction ID</source>
-        <translation>Kopiera transaktions ID</translation>
+        <source>You can sign messages/agreements with your addresses to prove you can receive bitcoins sent to them. Be careful not to sign anything vague or random, as phishing attacks may try to trick you into signing your identity over to them. Only sign fully-detailed statements you agree to.</source>
+        <translation>Du kan underteckna meddelanden/avtal med dina adresser för att bevisa att du kan ta emot bitcoins som skickats till dem. Var försiktig så du inte undertecknar något oklart eller konstigt, eftersom phishing-angrepp kan försöka få dig att underteckna din identitet till dem. Underteckna endast väldetaljerade meddelanden som du godkänner.</translation>
     </message>
     <message>
-        <source>Copy raw transaction</source>
-        <translation>Kopiera rå transaktion</translation>
+        <source>The Bitcoin address to sign the message with</source>
+        <translation>Bitcoinadress att signera meddelandet med</translation>
     </message>
     <message>
-        <source>Edit label</source>
-        <translation>Ändra etikett</translation>
+        <source>Choose previously used address</source>
+        <translation>Välj tidigare använda adresser</translation>
     </message>
     <message>
-        <source>Show transaction details</source>
-        <translation>Visa transaktionsdetaljer</translation>
+        <source>Alt+A</source>
+        <translation>Alt+A</translation>
     </message>
     <message>
-        <source>Export Transaction History</source>
-        <translation>Exportera Transaktionshistoriken</translation>
+        <source>Paste address from clipboard</source>
+        <translation>Klistra in adress från Urklipp</translation>
     </message>
     <message>
-        <source>Watch-only</source>
-        <translation>Granska-bara</translation>
+        <source>Alt+P</source>
+        <translation>Alt+P</translation>
     </message>
     <message>
-        <source>Exporting Failed</source>
-        <translation>Exporteringen misslyckades</translation>
+        <source>Enter the message you want to sign here</source>
+        <translation>Skriv in meddelandet du vill signera här</translation>
     </message>
     <message>
-        <source>There was an error trying to save the transaction history to %1.</source>
-        <translation>Det inträffade ett fel när transaktionshistoriken skulle sparas till %1.</translation>
+        <source>Signature</source>
+        <translation>Signatur</translation>
     </message>
     <message>
-        <source>Exporting Successful</source>
-        <translation>Exporteringen lyckades</translation>
+        <source>Copy the current signature to the system clipboard</source>
+        <translation>Kopiera signaturen till systemets Urklipp</translation>
     </message>
     <message>
-        <source>The transaction history was successfully saved to %1.</source>
-        <translation>Transaktionshistoriken sparades utan problem till %1.</translation>
+        <source>Sign the message to prove you own this Bitcoin address</source>
+        <translation>Signera meddelandet för att bevisa att du äger denna adress</translation>
     </message>
     <message>
-        <source>Comma separated file (*.csv)</source>
-        <translation>Kommaseparerad fil (*.csv)</translation>
+        <source>Sign &amp;Message</source>
+        <translation>Signera &amp;Meddelande</translation>
     </message>
     <message>
-        <source>Confirmed</source>
-        <translation>Bekräftad</translation>
+        <source>Reset all sign message fields</source>
+        <translation>Rensa alla fält</translation>
     </message>
     <message>
-        <source>Date</source>
-        <translation>Datum</translation>
+        <source>Clear &amp;All</source>
+        <translation>Rensa &amp;alla</translation>
     </message>
     <message>
-        <source>Type</source>
-        <translation>Typ</translation>
+        <source>&amp;Verify Message</source>
+        <translation>&amp;Verifiera Meddelande</translation>
     </message>
     <message>
-        <source>Label</source>
-        <translation>Etikett</translation>
+        <source>Enter the receiver's address, message (ensure you copy line breaks, spaces, tabs, etc. exactly) and signature below to verify the message. Be careful not to read more into the signature than what is in the signed message itself, to avoid being tricked by a man-in-the-middle attack. Note that this only proves the signing party receives with the address, it cannot prove sendership of any transaction!</source>
+        <translation>Ange mottagarens adress, meddelande (kopiera radbrytningar, mellanrum, flikar, etc. exakt) och signatur nedan för att verifiera meddelandet. Undvik att läsa in mera information i signaturen än vad som stod i själva undertecknade meddelandet, för att undvika ett man-in-the-middle-angrepp. Notera att detta endast bevisar att undertecknad tar emot med adressen, det bevisar inte vem som skickat transaktionen!</translation>
     </message>
     <message>
-        <source>Address</source>
-        <translation>Adress</translation>
+        <source>The Bitcoin address the message was signed with</source>
+        <translation>Bitcoinadressen som meddelandet signerades med</translation>
     </message>
     <message>
-        <source>ID</source>
-        <translation>ID</translation>
+        <source>Verify the message to ensure it was signed with the specified Bitcoin address</source>
+        <translation>Verifiera meddelandet för att vara säker på att den var signerad med den angivna Bitcoin-adressen</translation>
     </message>
     <message>
-        <source>Range:</source>
-        <translation>Intervall:</translation>
+        <source>Verify &amp;Message</source>
+        <translation>Verifiera &amp;Meddelande</translation>
     </message>
     <message>
-        <source>to</source>
-        <translation>till</translation>
+        <source>Reset all verify message fields</source>
+        <translation>Rensa alla fält</translation>
     </message>
 </context>
 <context>
-    <name>UnitDisplayStatusBarControl</name>
+    <name>SplashScreen</name>
     <message>
-        <source>Unit to show amounts in. Click to select another unit.</source>
-        <translation>&amp;Enhet att visa belopp i. Klicka för att välja annan enhet.</translation>
+        <source>[testnet]</source>
+        <translation>[testnet]</translation>
     </message>
 </context>
 <context>
-    <name>WalletFrame</name>
+    <name>TrafficGraphWidget</name>
     <message>
-        <source>No wallet has been loaded.</source>
-        <translation>Ingen plånbok har laddats in.</translation>
+        <source>KB/s</source>
+        <translation>KB/s</translation>
     </message>
 </context>
 <context>
-    <name>WalletModel</name>
+    <name>TransactionDescDialog</name>
     <message>
-        <source>Send Coins</source>
-        <translation>Skicka pengar</translation>
+        <source>This pane shows a detailed description of the transaction</source>
+        <translation>Den här panelen visar en detaljerad beskrivning av transaktionen</translation>
     </message>
 </context>
 <context>
-    <name>WalletView</name>
-    <message>
-        <source>&amp;Export</source>
-        <translation>&amp;Exportera</translation>
-    </message>
-    <message>
-        <source>Export the data in the current tab to a file</source>
-        <translation>Exportera informationen i den nuvarande fliken till en fil</translation>
-    </message>
-    <message>
-        <source>Backup Wallet</source>
-        <translation>Säkerhetskopiera Plånbok</translation>
-    </message>
-    <message>
-        <source>Wallet Data (*.dat)</source>
-        <translation>Plånboks-data (*.dat)</translation>
-    </message>
-    <message>
-        <source>Backup Failed</source>
-        <translation>Säkerhetskopiering misslyckades</translation>
-    </message>
-    <message>
-        <source>There was an error trying to save the wallet data to %1.</source>
-        <translation>Det inträffade ett fel när plånbokens data skulle sparas till %1.</translation>
-    </message>
-    <message>
-        <source>The wallet data was successfully saved to %1.</source>
-        <translation>Plånbokens data sparades utan problem till %1.</translation>
-    </message>
+    <name>UnitDisplayStatusBarControl</name>
     <message>
-        <source>Backup Successful</source>
-        <translation>Säkerhetskopiering lyckades</translation>
+        <source>Unit to show amounts in. Click to select another unit.</source>
+        <translation>&amp;Enhet att visa belopp i. Klicka för att välja annan enhet.</translation>
     </message>
 </context>
 <context>
@@ -2928,14 +1758,6 @@ Var vänlig och försök igen.</translation>
         <source>If &lt;category&gt; is not supplied or if &lt;category&gt; = 1, output all debugging information.</source>
         <translation>Om &lt;kategori&gt; inte anges eller om &lt;category&gt; = 1, visa all avlusningsinformation.</translation>
     </message>
-    <message>
-        <source>Maximum total fees (in %s) to use in a single wallet transaction; setting this too low may abort large transactions (default: %s)</source>
-        <translation>Maximal total avgift (i %s) att använda i en plånbokstransaktion. Sätts denna för lågtkan stora transaktioner komma att avbrytas (förvalt: %s)</translation>
-    </message>
-    <message>
-        <source>Please check that your computer's date and time are correct! If your clock is wrong Bitcoin Core will not work properly.</source>
-        <translation>Vänligen kontrollera att din dators datum och tid är korrekt! Om din klocka går fel kommer Bitcoin Core inte att fungera ordentligt.</translation>
-    </message>
     <message>
         <source>Prune configured below the minimum of %d MiB.  Please use a higher number.</source>
         <translation>Beskärning konfigurerad under miniminivån %d MiB. Vänligen använd ett högre värde.</translation>
@@ -2976,6 +1798,10 @@ Var vänlig och försök igen.</translation>
         <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
         <translation>Acceptera anslutningar utifrån (förvalt: 1 om ingen -proxy eller -connect)</translation>
     </message>
+    <message>
+        <source>Bitcoin Core</source>
+        <translation>Bitcoin Core</translation>
+    </message>
     <message>
         <source>-fallbackfee is set very high! This is the transaction fee you may pay when fee estimates are not available.</source>
         <translation>-fallbackfee är satt väldigt högt! Detta är avgiften du kan komma att betala om uppskattad avgift inte finns tillgänglig.</translation>
@@ -2992,6 +1818,10 @@ Var vänlig och försök igen.</translation>
         <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source>
         <translation>Bind till given adress och lyssna alltid på den. Använd [värd]:port notation för IPv6</translation>
     </message>
+    <message>
+        <source>Cannot obtain a lock on data directory %s. %s is probably already running.</source>
+        <translation>Kan inte låsa data-mappen %s. %s körs förmodligen redan.</translation>
+    </message>
     <message>
         <source>Delete all wallet transactions and only recover those parts of the blockchain through -rescan on startup</source>
         <translation>Ta bort alla plånbokstransaktioner och återskapa bara dom som är en del av blockkedjan genom att ange -rescan vid uppstart</translation>
@@ -3000,6 +1830,14 @@ Var vänlig och försök igen.</translation>
         <source>Distributed under the MIT software license, see the accompanying file COPYING or &lt;http://www.opensource.org/licenses/mit-license.php&gt;.</source>
         <translation>Distribuerad under MIT mjukvarulicens, se den bifogade filen COPYING eller &lt;http://www.opensource.org/licenses/mit-license.php&gt;.</translation>
     </message>
+    <message>
+        <source>Error loading %s: You can't enable HD on a already existing non-HD wallet</source>
+        <translation>Fel vid laddning av %s: Du kan inte aktivera HD på en existerande icke-HD plånbok</translation>
+    </message>
+    <message>
+        <source>Error reading %s! All keys read correctly, but transaction data or address book entries might be missing or incorrect.</source>
+        <translation>Fel vid läsning av %s! Alla nycklar lästes korrekt, men transaktionsdatat eller adressbokens poster kanske saknas eller är felaktiga.</translation>
+    </message>
     <message>
         <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source>
         <translation>Exekvera kommando när en plånbokstransaktion ändras (%s i cmd är ersatt av TxID)</translation>
@@ -3008,6 +1846,22 @@ Var vänlig och försök igen.</translation>
         <source>Force relay of transactions from whitelisted peers even they violate local relay policy (default: %d)</source>
         <translation>Vidarebefodra alltid transaktioner från vitlistade noder även om de bryter mot lokala reläpolicyn (förvalt: %d)</translation>
     </message>
+    <message>
+        <source>Maximum allowed median peer time offset adjustment. Local perspective of time may be influenced by peers forward or backward by this amount. (default: %u seconds)</source>
+        <translation>Maximalt tillåten median-peer tidsoffset justering. Lokalt perspektiv av tiden kan bli påverkad av partners, framåt eller bakåt denna tidsrymd. (förvalt: %u sekunder)</translation>
+    </message>
+    <message>
+        <source>Maximum total fees (in %s) to use in a single wallet transaction or raw transaction; setting this too low may abort large transactions (default: %s)</source>
+        <translation>Maximal total avgift (i %s) att använda i en plånbokstransaktion eller råa transaktioner. Sätts denna för lågt kan stora transaktioner avbrytas (förvalt: %s)</translation>
+    </message>
+    <message>
+        <source>Please check that your computer's date and time are correct! If your clock is wrong, %s will not work properly.</source>
+        <translation>Vänligen kolla så att din dators datum och tid är korrekt! Om din klocka går fel kommer %s inte att fungera korrekt.</translation>
+    </message>
+    <message>
+        <source>Please contribute if you find %s useful. Visit %s for further information about the software.</source>
+        <translation>Var snäll och bidra om du finner %s användbar. Besök %s för mer information om mjukvaran.</translation>
+    </message>
     <message>
         <source>Set the number of script verification threads (%u to %d, 0 = auto, &lt;0 = leave that many cores free, default: %d)</source>
         <translation>Ange antalet skriptkontrolltrådar (%u till %d, 0 = auto, &lt;0 = lämna så många kärnor lediga, förval: %d)</translation>
@@ -3020,14 +1874,6 @@ Var vänlig och försök igen.</translation>
         <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
         <translation>Detta är ett förhands testbygge - använd på egen risk - använd inte för mining eller handels applikationer</translation>
     </message>
-    <message>
-        <source>Unable to bind to %s on this computer. Bitcoin Core is probably already running.</source>
-        <translation>Det går inte att binda till %s på den här datorn. Bitcoin Core är förmodligen redan igång.</translation>
-    </message>
-    <message>
-        <source>Unsupported argument -whitelistalwaysrelay ignored, use -whitelistrelay and/or -whitelistforcerelay.</source>
-        <translation>Argumentet -whitelistalwaysrelay stöds inte utan ignoreras, använd -whitelistrelay och/eller -whitelistforcerelay.</translation>
-    </message>
     <message>
         <source>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</source>
         <translation>Använd UPnP för att mappa den lyssnande porten (förvalt: 1 när lyssning aktiverat och utan -proxy)</translation>
@@ -3044,22 +1890,22 @@ Var vänlig och försök igen.</translation>
         <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source>
         <translation>Varning: Nätverket verkar inte vara helt överens! Några miners verkar ha problem.</translation>
     </message>
-    <message>
-        <source>Warning: Unknown block versions being mined! It's possible unknown rules are in effect</source>
-        <translation>Varning: Okända blockversioner bryts! Det är möjligt att okända regler används</translation>
-    </message>
     <message>
         <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source>
         <translation>Varning: Vi verkar inte helt överens med våra peers! Du kan behöva uppgradera, eller andra noder kan behöva uppgradera.</translation>
     </message>
-    <message>
-        <source>Warning: wallet.dat corrupt, data salvaged! Original wallet.dat saved as wallet.{timestamp}.bak in %s; if your balance or transactions are incorrect you should restore from a backup.</source>
-        <translation>Varning: wallet.dat korrupt, datan har räddats! Den ursprungliga wallet.dat har sparas som wallet.{timestamp}.bak i %s; om ditt saldo eller transaktioner är felaktiga ska du återställa från en säkerhetskopia.</translation>
-    </message>
     <message>
         <source>Whitelist peers connecting from the given netmask or IP address. Can be specified multiple times.</source>
         <translation>Vitlista klienter som ansluter från angivna nätmasker eller IP-adresser. Kan specificeras flera gånger.</translation>
     </message>
+    <message>
+        <source>You need to rebuild the database using -reindex-chainstate to change -txindex</source>
+        <translation>Du måste återskapa databasen med -reindex-chainstate för att ändra -txindex</translation>
+    </message>
+    <message>
+        <source>%s corrupt, salvage failed</source>
+        <translation>%s är korrupt, räddning misslyckades</translation>
+    </message>
     <message>
         <source>-maxmempool must be at least %d MB</source>
         <translation>-maxmempool måste vara minst %d MB</translation>
@@ -3072,10 +1918,22 @@ Var vänlig och försök igen.</translation>
         <source>Append comment to the user agent string</source>
         <translation>Lägg till kommentar till user-agent-strängen</translation>
     </message>
+    <message>
+        <source>Attempt to recover private keys from a corrupt wallet on startup</source>
+        <translation>Försök att rädda privata nycklar från en korrupt plånbok vid uppstart</translation>
+    </message>
     <message>
         <source>Block creation options:</source>
         <translation>Block skapande inställningar:</translation>
     </message>
+    <message>
+        <source>Cannot resolve -%s address: '%s'</source>
+        <translation>Kan inte matcha -%s adress: '%s'</translation>
+    </message>
+    <message>
+        <source>Change index out of range</source>
+        <translation>Förändringsindexet utom räckhåll</translation>
+    </message>
     <message>
         <source>Connect only to the specified node(s)</source>
         <translation>Koppla enbart upp till den/de specificerade noden/noder</translation>
@@ -3084,6 +1942,10 @@ Var vänlig och försök igen.</translation>
         <source>Connection options:</source>
         <translation>Anslutningsalternativ:</translation>
     </message>
+    <message>
+        <source>Copyright (C) %i-%i</source>
+        <translation>Copyright (C) %i-%i</translation>
+    </message>
     <message>
         <source>Corrupted block database detected</source>
         <translation>Korrupt blockdatabas har upptäckts</translation>
@@ -3128,6 +1990,22 @@ Var vänlig och försök igen.</translation>
         <source>Error initializing wallet database environment %s!</source>
         <translation>Fel vid initiering av plånbokens databasmiljö %s!</translation>
     </message>
+    <message>
+        <source>Error loading %s</source>
+        <translation>Fel vid inläsning av %s</translation>
+    </message>
+    <message>
+        <source>Error loading %s: Wallet corrupted</source>
+        <translation>Fel vid inläsningen av %s: Plånboken är koruppt</translation>
+    </message>
+    <message>
+        <source>Error loading %s: Wallet requires newer version of %s</source>
+        <translation>Fel vid inläsningen av %s: Plånboken kräver en senare version av %s</translation>
+    </message>
+    <message>
+        <source>Error loading %s: You can't disable HD on a already existing HD wallet</source>
+        <translation>Fel vid laddning av %s: Du kan inte avaktivera HD på en redan existerande HD plånbok</translation>
+    </message>
     <message>
         <source>Error loading block database</source>
         <translation>Fel vid inläsning av blockdatabasen</translation>
@@ -3152,10 +2030,18 @@ Var vänlig och försök igen.</translation>
         <source>Incorrect or no genesis block found. Wrong datadir for network?</source>
         <translation>Felaktig eller inget genesisblock hittades. Fel datadir för nätverket?</translation>
     </message>
+    <message>
+        <source>Initialization sanity check failed. %s is shutting down.</source>
+        <translation>Initieringschecken fallerade. %s stängs av.</translation>
+    </message>
     <message>
         <source>Invalid -onion address: '%s'</source>
         <translation>Ogiltig -onion adress:'%s'</translation>
     </message>
+    <message>
+        <source>Invalid amount for -%s=&lt;amount&gt;: '%s'</source>
+        <translation>Ogiltigt belopp för -%s=&lt;belopp&gt;:'%s'</translation>
+    </message>
     <message>
         <source>Invalid amount for -fallbackfee=&lt;amount&gt;: '%s'</source>
         <translation>Ogiltigt belopp för -fallbackfee=&lt;belopp&gt;: '%s'</translation>
@@ -3164,6 +2050,10 @@ Var vänlig och försök igen.</translation>
         <source>Keep the transaction memory pool below &lt;n&gt; megabytes (default: %u)</source>
         <translation>Håll minnespoolen över transaktioner under &lt;n&gt; megabyte (förvalt: %u)</translation>
     </message>
+    <message>
+        <source>Loading banlist...</source>
+        <translation>Laddar svarta listan...</translation>
+    </message>
     <message>
         <source>Location of the auth cookie (default: data dir)</source>
         <translation>Plats för authcookie (förvalt: datamapp)</translation>
@@ -3180,6 +2070,10 @@ Var vänlig och försök igen.</translation>
         <source>Only connect to nodes in network &lt;net&gt; (ipv4, ipv6 or onion)</source>
         <translation>Anslut enbart till noder i nätverket &lt;net&gt; (IPv4, IPv6 eller onion)</translation>
     </message>
+    <message>
+        <source>Print this help message and exit</source>
+        <translation>Visa denna hjälptext och avsluta</translation>
+    </message>
     <message>
         <source>Print version and exit</source>
         <translation>Visa version och avsluta</translation>
@@ -3192,6 +2086,14 @@ Var vänlig och försök igen.</translation>
         <source>Prune mode is incompatible with -txindex.</source>
         <translation>Beskärningsläge är inkompatibel med -txindex.</translation>
     </message>
+    <message>
+        <source>Rebuild chain state and block index from the blk*.dat files on disk</source>
+        <translation>Återskapa blockkedjans status och index från blk*.dat filer på disken</translation>
+    </message>
+    <message>
+        <source>Rebuild chain state from the currently indexed blocks</source>
+        <translation>Återskapa blockkedjans status från aktuella indexerade block</translation>
+    </message>
     <message>
         <source>Set database cache size in megabytes (%d to %d, default: %d)</source>
         <translation>Sätt databasens cachestorlek i megabyte (%d till %d, förvalt: %d)</translation>
@@ -3204,6 +2106,14 @@ Var vänlig och försök igen.</translation>
         <source>Specify wallet file (within data directory)</source>
         <translation>Ange plånboksfil (inom datakatalogen)</translation>
     </message>
+    <message>
+        <source>The source code is available from %s.</source>
+        <translation>Källkoden är tillgänglig från %s.</translation>
+    </message>
+    <message>
+        <source>Unable to bind to %s on this computer. %s is probably already running.</source>
+        <translation>Det går inte att binda till %s på den här datorn. %s är förmodligen redan igång.</translation>
+    </message>
     <message>
         <source>Unsupported argument -benchmark ignored, use -debug=bench.</source>
         <translation>Argumentet -benchmark stöds inte och ignoreras, använd -debug=bench.</translation>
@@ -3237,12 +2147,16 @@ Var vänlig och försök igen.</translation>
         <translation>Plånbok %s ligger utanför datakatalogen %s</translation>
     </message>
     <message>
-        <source>Wallet options:</source>
-        <translation>Plånboksinställningar:</translation>
+        <source>Wallet debugging/testing options:</source>
+        <translation>Plånbokens Avlusnings/Testnings optioner:</translation>
+    </message>
+    <message>
+        <source>Wallet needed to be rewritten: restart %s to complete</source>
+        <translation>Plånboken behöver sparas om: Starta om %s för att fullfölja</translation>
     </message>
     <message>
-        <source>You need to rebuild the database using -reindex to change -txindex</source>
-        <translation>Du måste återskapa databasen med -reindex för att ändra -txindex</translation>
+        <source>Wallet options:</source>
+        <translation>Plånboksinställningar:</translation>
     </message>
     <message>
         <source>Allow JSON-RPC connections from specified source. Valid for &lt;ip&gt; are a single IP (e.g. 1.2.3.4), a network/netmask (e.g. 1.2.3.4/255.255.255.0) or a network/CIDR (e.g. 1.2.3.4/24). This option can be specified multiple times</source>
@@ -3256,10 +2170,6 @@ Var vänlig och försök igen.</translation>
         <source>Bind to given address to listen for JSON-RPC connections. Use [host]:port notation for IPv6. This option can be specified multiple times (default: bind to all interfaces)</source>
         <translation>Bind till angiven adress för att lyssna på JSON-RPC-anslutningar. Använd [värd]:port-format for IPv6. Detta alternativ kan anges flera gånger (förvalt: bind till alla gränssnitt)</translation>
     </message>
-    <message>
-        <source>Cannot obtain a lock on data directory %s. Bitcoin Core is probably already running.</source>
-        <translation>Kan inte låsa data-mappen %s. Bitcoin Core körs förmodligen redan.</translation>
-    </message>
     <message>
         <source>Create new files with system default permissions, instead of umask 077 (only effective with disabled wallet functionality)</source>
         <translation>Skapa nya filer med systemets förvalda rättigheter, istället för umask 077 (bara effektivt med avaktiverad plånboks funktionalitet)</translation>
@@ -3304,10 +2214,6 @@ Var vänlig och försök igen.</translation>
         <source>Set maximum size of high-priority/low-fee transactions in bytes (default: %d)</source>
         <translation>Sätt den maximala storleken av hög-prioriterade/låg-avgifts transaktioner i byte (förvalt: %d)</translation>
     </message>
-    <message>
-        <source>Set the number of threads for coin generation if enabled (-1 = all cores, default: %d)</source>
-        <translation>Ange antalet trådar för myntgenerering om påslagen (-1= alla kärnor, förval: %d)</translation>
-    </message>
     <message>
         <source>The transaction amount is too small to send after the fee has been deducted</source>
         <translation>Transaktionen är för liten att skicka efter det att avgiften har dragits</translation>
@@ -3316,6 +2222,10 @@ Var vänlig och försök igen.</translation>
         <source>This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit &lt;https://www.openssl.org/&gt; and cryptographic software written by Eric Young and UPnP software written by Thomas Bernard.</source>
         <translation>Denna produkten innehåller mjukvara utvecklad av OpenSSL Project för användning i OpenSSL Toolkit &lt;https://www.openssl.org/&gt; och kryptografisk mjukvara utvecklad av Eric Young samt UPnP-mjukvara skriven av Thomas Bernard.</translation>
     </message>
+    <message>
+        <source>Use hierarchical deterministic key generation (HD) after BIP32. Only has effect during wallet creation/first start</source>
+        <translation>Använd hierarkisk deterministisk nyckel generering (HD) efter BIP32. Har bara effekt under plånbokens skapande/första användning.</translation>
+    </message>
     <message>
         <source>Whitelisted peers cannot be DoS banned and their transactions are always relayed, even if they are already in the mempool, useful e.g. for a gateway</source>
         <translation>Vitlistade klienter kan inte bli DoS-bannade och deras transaktioner reläas alltid, även om dom redan är i mempoolen, användbart för t.ex en gateway  </translation>
@@ -3332,34 +2242,14 @@ Var vänlig och försök igen.</translation>
         <source>Accept public REST requests (default: %u)</source>
         <translation>Acceptera publika REST förfrågningar (förvalt: %u)</translation>
     </message>
-    <message>
-        <source>Activating best chain...</source>
-        <translation>Aktiverar bästa kedjan...</translation>
-    </message>
-    <message>
-        <source>Attempt to recover private keys from a corrupt wallet.dat on startup</source>
-        <translation>Försök att rädda privata nycklar från en korrupt wallet.dat vid uppstart</translation>
-    </message>
     <message>
         <source>Automatically create Tor hidden service (default: %d)</source>
         <translation>Skapa automatiskt dold tjänst i Tor (förval: %d)</translation>
     </message>
-    <message>
-        <source>Cannot resolve -whitebind address: '%s'</source>
-        <translation>Kan inte matcha -whitebind adress: '%s'</translation>
-    </message>
     <message>
         <source>Connect through SOCKS5 proxy</source>
         <translation>Anslut genom SOCKS5 proxy</translation>
     </message>
-    <message>
-        <source>Copyright (C) 2009-%i The Bitcoin Core Developers</source>
-        <translation>Copyright (C) 2009-%i Bitcoin Core Utvecklarna</translation>
-    </message>
-    <message>
-        <source>Error loading wallet.dat: Wallet requires newer version of Bitcoin Core</source>
-        <translation>Fel vid inläsningen av wallet.dat: Kontofilen kräver en senare version av Bitcoin Core</translation>
-    </message>
     <message>
         <source>Error reading from database, shutting down.</source>
         <translation>Fel vid läsning från databas, avslutar.</translation>
@@ -3372,22 +2262,6 @@ Var vänlig och försök igen.</translation>
         <source>Information</source>
         <translation>Information</translation>
     </message>
-    <message>
-        <source>Initialization sanity check failed. Bitcoin Core is shutting down.</source>
-        <translation>Initieringschecken fallerade. Bitcoin Core stängs av...</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -maxtxfee=&lt;amount&gt;: '%s'</source>
-        <translation>Otillåtet belopp för -maxtxfee=&lt;belopp&gt;: '%s'</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -minrelaytxfee=&lt;amount&gt;: '%s'</source>
-        <translation>Ogiltigt belopp för -minrelaytxfee=&lt;belopp&gt;: '%s'</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -mintxfee=&lt;amount&gt;: '%s'</source>
-        <translation>Ogiltigt belopp för -mintxfee=&lt;belopp&gt;: '%s'</translation>
-    </message>
     <message>
         <source>Invalid amount for -paytxfee=&lt;amount&gt;: '%s' (must be at least %s)</source>
         <translation>Ogiltigt belopp för -paytxfee=&lt;belopp&gt;:'%s' (måste vara minst %s)</translation>
@@ -3412,14 +2286,6 @@ Var vänlig och försök igen.</translation>
         <source>RPC server options:</source>
         <translation>RPC-serveralternativ:</translation>
     </message>
-    <message>
-        <source>Rebuild block chain index from current blk000??.dat files on startup</source>
-        <translation>Återskapa blockkedjans index från nuvarande blk000??.dat filer under uppstarten</translation>
-    </message>
-    <message>
-        <source>Receive and display P2P network alerts (default: %u)</source>
-        <translation>Mottag och visa P2P nätverksvarningar (förvalt: %u)</translation>
-    </message>
     <message>
         <source>Reducing -maxconnections from %d to %d, because of system limitations.</source>
         <translation>Minskar -maxconnections från %d till %d, på grund av systembegränsningar.</translation>
@@ -3492,10 +2358,6 @@ Var vänlig och försök igen.</translation>
         <source>Username for JSON-RPC connections</source>
         <translation>Användarnamn för JSON-RPC-anslutningar</translation>
     </message>
-    <message>
-        <source>Wallet needed to be rewritten: restart Bitcoin Core to complete</source>
-        <translation>Kontot behöver sparas om: Starta om Bitcoin Core för att fullfölja</translation>
-    </message>
     <message>
         <source>Warning</source>
         <translation>Varning</translation>
@@ -3516,10 +2378,6 @@ Var vänlig och försök igen.</translation>
         <source>ZeroMQ notification options:</source>
         <translation>ZeroMQ-alternativ för notiser:</translation>
     </message>
-    <message>
-        <source>wallet.dat corrupt, salvage failed</source>
-        <translation>wallet.dat korrupt, räddning misslyckades</translation>
-    </message>
     <message>
         <source>Password for JSON-RPC connections</source>
         <translation>Lösenord för JSON-RPC-anslutningar</translation>
@@ -3528,10 +2386,6 @@ Var vänlig och försök igen.</translation>
         <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
         <translation>Exekvera kommando när det bästa blocket ändras (%s i cmd är utbytt av blockhash)</translation>
     </message>
-    <message>
-        <source>This help message</source>
-        <translation>Det här hjälp medelandet</translation>
-    </message>
     <message>
         <source>Allow DNS lookups for -addnode, -seednode and -connect</source>
         <translation>Tillåt DNS-sökningar för -addnode, -seednode och -connect</translation>
@@ -3540,10 +2394,6 @@ Var vänlig och försök igen.</translation>
         <source>Loading addresses...</source>
         <translation>Laddar adresser...</translation>
     </message>
-    <message>
-        <source>Error loading wallet.dat: Wallet corrupted</source>
-        <translation>Fel vid inläsningen av wallet.dat: Plånboken är skadad</translation>
-    </message>
     <message>
         <source>(1 = keep tx meta data e.g. account owner and payment request information, 2 = drop tx meta data)</source>
         <translation>(1 = spara tx metadata t.ex. kontoägare och betalningsbegäransinformation, 2 = släng tx metadata)</translation>
@@ -3560,10 +2410,6 @@ Var vänlig och försök igen.</translation>
         <source>Do not keep transactions in the mempool longer than &lt;n&gt; hours (default: %u)</source>
         <translation>Håll inte transaktioner i minnespoolen längre än &lt;n&gt; timmar (förvalt: %u)</translation>
     </message>
-    <message>
-        <source>Error reading wallet.dat! All keys read correctly, but transaction data or address book entries might be missing or incorrect.</source>
-        <translation>Fel vid läsning av wallet.dat! Alla nycklar lästes korrekt, men transaktionsdata eller adressbokens poster kanske saknas eller är felaktiga.</translation>
-    </message>
     <message>
         <source>Fees (in %s/kB) smaller than this are considered zero fee for transaction creation (default: %s)</source>
         <translation>Avgifter (i %s/kB) mindre än detta anses vara nollavgifter vid skapande av transaktion (standard: %s)</translation>
@@ -3600,6 +2446,10 @@ Var vänlig och försök igen.</translation>
         <source>Unsupported argument -socks found. Setting SOCKS version isn't possible anymore, only SOCKS5 proxies are supported.</source>
         <translation>Argumentet -socks hittades och stöds inte. Det är inte längre möjligt att sätta SOCKS-version längre, bara SOCKS5-proxy stöds.</translation>
     </message>
+    <message>
+        <source>Unsupported argument -whitelistalwaysrelay ignored, use -whitelistrelay and/or -whitelistforcerelay.</source>
+        <translation>Argumentet -whitelistalwaysrelay stöds inte utan ignoreras, använd -whitelistrelay och/eller -whitelistforcerelay.</translation>
+    </message>
     <message>
         <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: %s)</source>
         <translation>Använd separat SOCKS5 proxy för att nå kollegor via dolda tjänster i Tor (förvalt: -%s)</translation>
@@ -3609,20 +2459,20 @@ Var vänlig och försök igen.</translation>
         <translation>Användarnamn och hashat lösenord för JSON-RPC-anslutningar. Fältet &lt;userpw&gt; kommer i formatet: &lt;USERNAME&gt;:&lt;SALT&gt;$&lt;HASH&gt;. Ett kanoniskt pythonskript finns inkluderat i share/rpcuser. Detta alternativ kan anges flera gånger</translation>
     </message>
     <message>
-        <source>(default: %s)</source>
-        <translation>(förvalt: %s)</translation>
+        <source>Warning: Unknown block versions being mined! It's possible unknown rules are in effect</source>
+        <translation>Varning: Okända blockversioner bryts! Det är möjligt att okända regler används</translation>
     </message>
     <message>
-        <source>Always query for peer addresses via DNS lookup (default: %u)</source>
-        <translation>Sök alltid efter klientadresser med DNS sökningen (förvalt: %u)</translation>
+        <source>Warning: Wallet file corrupt, data salvaged! Original %s saved as %s in %s; if your balance or transactions are incorrect you should restore from a backup.</source>
+        <translation>Varning: Plånboksfilen var korrupt, datat har räddats! Den ursprungliga %s har sparas som %s i %s. Om ditt saldo eller transaktioner är felaktiga bör du återställa från en säkerhetskopia.</translation>
     </message>
     <message>
-        <source>Error loading wallet.dat</source>
-        <translation>Fel vid inläsning av plånboksfilen wallet.dat</translation>
+        <source>(default: %s)</source>
+        <translation>(förvalt: %s)</translation>
     </message>
     <message>
-        <source>Generate coins (default: %u)</source>
-        <translation>Generera mynt (förvalt: %u)</translation>
+        <source>Always query for peer addresses via DNS lookup (default: %u)</source>
+        <translation>Sök alltid efter klientadresser med DNS sökningen (förvalt: %u)</translation>
     </message>
     <message>
         <source>How many blocks to check at startup (default: %u, 0 = all)</source>
@@ -3708,18 +2558,6 @@ Var vänlig och försök igen.</translation>
         <source>Unknown network specified in -onlynet: '%s'</source>
         <translation>Okänt nätverk som anges i -onlynet: '%s'</translation>
     </message>
-    <message>
-        <source>Cannot resolve -bind address: '%s'</source>
-        <translation>Kan inte matcha -bind adress: '%s'</translation>
-    </message>
-    <message>
-        <source>Cannot resolve -externalip address: '%s'</source>
-        <translation>Kan inte matcha -externalip adress: '%s'</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -paytxfee=&lt;amount&gt;: '%s'</source>
-        <translation>Ogiltigt belopp för -paytxfee=&lt;belopp&gt;:'%s'</translation>
-    </message>
     <message>
         <source>Insufficient funds</source>
         <translation>Otillräckligt med bitcoins</translation>
diff --git a/src/qt/locale/bitcoin_ta.ts b/src/qt/locale/bitcoin_ta.ts
index c93524cdacc2f..6878d23fe22ea 100644
--- a/src/qt/locale/bitcoin_ta.ts
+++ b/src/qt/locale/bitcoin_ta.ts
@@ -17,10 +17,6 @@
         <source>C&amp;lose</source>
         <translation>&amp;மூடு</translation>
     </message>
-    <message>
-        <source>&amp;Copy Address</source>
-        <translation>&amp;முகவரியை நகலெடு</translation>
-    </message>
     <message>
         <source>&amp;Export</source>
         <translation>&amp;ஏற்றுமதி</translation>
@@ -29,44 +25,9 @@
         <source>&amp;Delete</source>
         <translation>&amp;அழி</translation>
     </message>
-    <message>
-        <source>C&amp;hoose</source>
-        <translation>&amp;தேர்ந்தெடு</translation>
-    </message>
-    <message>
-        <source>Sending addresses</source>
-        <translation>அனுப்பும் முகவரிகள்</translation>
-    </message>
-    <message>
-        <source>Receiving addresses</source>
-        <translation>பெறும் முகவரிகள்</translation>
-    </message>
-    <message>
-        <source>&amp;Edit</source>
-        <translation>&amp;தொகு</translation>
-    </message>
-    </context>
-<context>
-    <name>AddressTableModel</name>
-    <message>
-        <source>Label</source>
-        <translation>லேபிள்</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>விலாசம்</translation>
-    </message>
-    </context>
+</context>
 <context>
     <name>AskPassphraseDialog</name>
-    <message>
-        <source>Encrypt wallet</source>
-        <translation>என்க்ரிப்ட் பணப்பை</translation>
-    </message>
-    <message>
-        <source>Decrypt wallet</source>
-        <translation>டிக்ரிப்ட் பணப்பை</translation>
-    </message>
     </context>
 <context>
     <name>BanTableModel</name>
@@ -145,10 +106,6 @@
         <source>&amp;Help</source>
         <translation>&amp;உதவி</translation>
     </message>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Bitcoin மையம்</translation>
-    </message>
     <message numerus="yes">
         <source>%n hour(s)</source>
         <translation><numerusform>%n மணி</numerusform><numerusform>%n மணி</numerusform></translation>
@@ -202,13 +159,6 @@
         <translation>அனுப்பிய பரிவர்த்தனை</translation>
     </message>
     </context>
-<context>
-    <name>ClientModel</name>
-    <message>
-        <source>Network Alert</source>
-        <translation>பிணைய எச்சரிக்கை</translation>
-    </message>
-</context>
 <context>
     <name>CoinControlDialog</name>
     <message>
@@ -255,27 +205,7 @@
         <source>Priority</source>
         <translation>முன்னுரிமை</translation>
     </message>
-    <message>
-        <source>Copy address</source>
-        <translation>பிரதியை முகவரியை</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>நகலை தொகை</translation>
-    </message>
-    <message>
-        <source>none</source>
-        <translation>none</translation>
-    </message>
-    <message>
-        <source>yes</source>
-        <translation>ஆம்</translation>
-    </message>
-    <message>
-        <source>no</source>
-        <translation>இல்லை</translation>
-    </message>
-    </context>
+</context>
 <context>
     <name>EditAddressDialog</name>
     </context>
@@ -288,14 +218,6 @@
     </context>
 <context>
     <name>HelpMessageDialog</name>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Bitcoin மையம்</translation>
-    </message>
-    <message>
-        <source>About Bitcoin Core</source>
-        <translation>Bitcoin மையம் பற்றி</translation>
-    </message>
     </context>
 <context>
     <name>Intro</name>
@@ -303,10 +225,6 @@
         <source>Welcome</source>
         <translation>நல்வரவு</translation>
     </message>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Bitcoin மையம்</translation>
-    </message>
     <message>
         <source>Error</source>
         <translation>தவறு</translation>
@@ -413,9 +331,6 @@
         <translation>மொத்தம்:</translation>
     </message>
     </context>
-<context>
-    <name>PaymentServer</name>
-    </context>
 <context>
     <name>PeerTableModel</name>
     <message>
@@ -454,25 +369,6 @@
         <translation>%1 ms</translation>
     </message>
 </context>
-<context>
-    <name>QRImageWidget</name>
-    <message>
-        <source>&amp;Save Image...</source>
-        <translation>&amp;படத்தை சேமி...</translation>
-    </message>
-    <message>
-        <source>&amp;Copy Image</source>
-        <translation>&amp;படத்தை</translation>
-    </message>
-    <message>
-        <source>Save QR Code</source>
-        <translation>QR குறியீடு காப்பாற்ற</translation>
-    </message>
-    <message>
-        <source>PNG Image (*.png)</source>
-        <translation>PNG படத்தை (*.png)</translation>
-    </message>
-</context>
 <context>
     <name>RPCConsole</name>
     <message>
@@ -638,14 +534,6 @@
         <source>Remove</source>
         <translation>நீக்கு</translation>
     </message>
-    <message>
-        <source>Copy message</source>
-        <translation>நகலை செய்தி</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>நகலை தொகை</translation>
-    </message>
 </context>
 <context>
     <name>ReceiveRequestDialog</name>
@@ -665,46 +553,7 @@
         <source>&amp;Save Image...</source>
         <translation>&amp;படத்தை சேமி...</translation>
     </message>
-    <message>
-        <source>URI</source>
-        <translation>URI</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>விலாசம்</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>விலை</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>லேபிள்</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>செய்தி</translation>
-    </message>
-    </context>
-<context>
-    <name>RecentRequestsTableModel</name>
-    <message>
-        <source>Date</source>
-        <translation>தேதி</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>லேபிள்</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>செய்தி</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>விலை</translation>
-    </message>
-    </context>
+</context>
 <context>
     <name>SendCoinsDialog</name>
     <message>
@@ -755,19 +604,7 @@
         <source>S&amp;end</source>
         <translation>&amp;அனுப்பு</translation>
     </message>
-    <message>
-        <source>%1 to %2</source>
-        <translation>%1 to %2</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>நகலை தொகை</translation>
-    </message>
-    <message>
-        <source>or</source>
-        <translation>அல்லது</translation>
-    </message>
-    </context>
+</context>
 <context>
     <name>SendCoinsEntry</name>
     <message>
@@ -811,10 +648,6 @@
     </context>
 <context>
     <name>SplashScreen</name>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Bitcoin மையம்</translation>
-    </message>
     </context>
 <context>
     <name>TrafficGraphWidget</name>
@@ -823,188 +656,18 @@
         <translation>KB/s</translation>
     </message>
 </context>
-<context>
-    <name>TransactionDesc</name>
-    <message>
-        <source>Status</source>
-        <translation>நிலை</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation>தேதி</translation>
-    </message>
-    <message>
-        <source>Source</source>
-        <translation>மூலம்</translation>
-    </message>
-    <message>
-        <source>Credit</source>
-        <translation>கடன்</translation>
-    </message>
-    <message>
-        <source>Debit</source>
-        <translation>பற்று</translation>
-    </message>
-    <message>
-        <source>Total debit</source>
-        <translation>மொத்த பற்று</translation>
-    </message>
-    <message>
-        <source>Total credit</source>
-        <translation>மொத்த கடன்</translation>
-    </message>
-    <message>
-        <source>Net amount</source>
-        <translation>நிகர தொகை</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>செய்தி</translation>
-    </message>
-    <message>
-        <source>Comment</source>
-        <translation>கருத்து</translation>
-    </message>
-    <message>
-        <source>Transaction ID</source>
-        <translation>பரிவர்த்தனை ID</translation>
-    </message>
-    <message>
-        <source>Merchant</source>
-        <translation>வணிகர்</translation>
-    </message>
-    <message>
-        <source>Debug information</source>
-        <translation>சரிசெய்வதற்கான தகவல்</translation>
-    </message>
-    <message>
-        <source>Transaction</source>
-        <translation>பரிவர்த்தனை</translation>
-    </message>
-    <message>
-        <source>Inputs</source>
-        <translation>உள்ளீடுகள்</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>விலை</translation>
-    </message>
-    <message>
-        <source>true</source>
-        <translation>உண்மை</translation>
-    </message>
-    <message>
-        <source>false</source>
-        <translation>தவறான</translation>
-    </message>
-    </context>
 <context>
     <name>TransactionDescDialog</name>
     </context>
-<context>
-    <name>TransactionTableModel</name>
-    <message>
-        <source>Date</source>
-        <translation>தேதி</translation>
-    </message>
-    <message>
-        <source>Offline</source>
-        <translation>ஆஃப்லைன்</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>லேபிள்</translation>
-    </message>
-    <message>
-        <source>(n/a)</source>
-        <translation>(n/a)</translation>
-    </message>
-    </context>
-<context>
-    <name>TransactionView</name>
-    <message>
-        <source>All</source>
-        <translation>முழுவதும்</translation>
-    </message>
-    <message>
-        <source>Today</source>
-        <translation>இன்று</translation>
-    </message>
-    <message>
-        <source>This week</source>
-        <translation>இந்த வாரம்</translation>
-    </message>
-    <message>
-        <source>This month</source>
-        <translation>இந்த மாதம்</translation>
-    </message>
-    <message>
-        <source>Last month</source>
-        <translation>கடந்த மாதம்</translation>
-    </message>
-    <message>
-        <source>This year</source>
-        <translation>இந்த வருடம்</translation>
-    </message>
-    <message>
-        <source>Range...</source>
-        <translation>எல்லை...</translation>
-    </message>
-    <message>
-        <source>Other</source>
-        <translation>வேறு</translation>
-    </message>
-    <message>
-        <source>Copy address</source>
-        <translation>பிரதியை முகவரியை</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>நகலை தொகை</translation>
-    </message>
-    <message>
-        <source>Confirmed</source>
-        <translation>உறுதியாக</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation>தேதி</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>லேபிள்</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>விலாசம்</translation>
-    </message>
-    <message>
-        <source>ID</source>
-        <translation>ID</translation>
-    </message>
-    <message>
-        <source>Range:</source>
-        <translation>எல்லை:</translation>
-    </message>
-    </context>
 <context>
     <name>UnitDisplayStatusBarControl</name>
     </context>
 <context>
-    <name>WalletFrame</name>
-    </context>
-<context>
-    <name>WalletModel</name>
-    </context>
-<context>
-    <name>WalletView</name>
+    <name>bitcoin-core</name>
     <message>
-        <source>&amp;Export</source>
-        <translation>&amp;ஏற்றுமதி</translation>
+        <source>Bitcoin Core</source>
+        <translation>Bitcoin மையம்</translation>
     </message>
-    </context>
-<context>
-    <name>bitcoin-core</name>
     <message>
         <source>(default: %u)</source>
         <translation>(default: %u)</translation>
diff --git a/src/qt/locale/bitcoin_th_TH.ts b/src/qt/locale/bitcoin_th_TH.ts
index ba3b1e8741baa..2630939146563 100644
--- a/src/qt/locale/bitcoin_th_TH.ts
+++ b/src/qt/locale/bitcoin_th_TH.ts
@@ -25,10 +25,6 @@
         <source>C&amp;lose</source>
         <translation>&amp;ปิด</translation>
     </message>
-    <message>
-        <source>&amp;Copy Address</source>
-        <translation>&amp;คัดลอกที่อยู่</translation>
-    </message>
     <message>
         <source>Delete the currently selected address from the list</source>
         <translation>ลบที่อยู่ที่เลือกไว้ในขณะนี้จากรายการ</translation>
@@ -45,72 +41,13 @@
         <source>&amp;Delete</source>
         <translation>&amp;ลบ</translation>
     </message>
-    <message>
-        <source>Choose the address to send coins to</source>
-        <translation>เลือกที่อยู่เพื่อส่งเหรียญไปไว้</translation>
-    </message>
-    <message>
-        <source>Choose the address to receive coins with</source>
-        <translation>เลือกที่อยู่เพื่อรับเหรียญไว้</translation>
-    </message>
-    <message>
-        <source>C&amp;hoose</source>
-        <translation>&amp;เลือก</translation>
-    </message>
-    <message>
-        <source>Sending addresses</source>
-        <translation>ส่งที่อยู่</translation>
-    </message>
-    <message>
-        <source>Receiving addresses</source>
-        <translation>กำลังรับที่อยู่</translation>
-    </message>
-    <message>
-        <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source>
-        <translation>ที่อยู่เหล่านี้เป็นที่อยู่ Bitcoin ของคุณ สำหรับใช้เพื่อส่งเงิน กรุณาตรวจสอบจำนวนเงินและที่อยู่สำหรับรับเงินก่อนส่งเหรียญไป</translation>
-    </message>
-    <message>
-        <source>Copy &amp;Label</source>
-        <translation>คัดลอก &amp;ป้ายชื่อ</translation>
-    </message>
-    <message>
-        <source>&amp;Edit</source>
-        <translation>&amp;แก้ไข</translation>
-    </message>
-    <message>
-        <source>Export Address List</source>
-        <translation>ส่งออกรายการที่อยู่</translation>
-    </message>
-    <message>
-        <source>Comma separated file (*.csv)</source>
-        <translation>คั่นไฟล์ด้วยเครื่องหมายจุลภาค (*.csv)</translation>
-    </message>
-    <message>
-        <source>Exporting Failed</source>
-        <translation>ส่งออกข้อมูลล้มเหลว</translation>
-    </message>
-    <message>
-        <source>There was an error trying to save the address list to %1. Please try again.</source>
-        <translation>พบข้อผิดพลาดบางกระการในการพยายามบันทึกรายชื่อที่อยู่ไปยัง %1. กรุณาลองใหม่อีกครั้ง</translation>
-    </message>
 </context>
 <context>
-    <name>AddressTableModel</name>
-    <message>
-        <source>Label</source>
-        <translation>ชื่อ</translation>
-    </message>
+    <name>AskPassphraseDialog</name>
     <message>
-        <source>Address</source>
-        <translation>ที่อยู่</translation>
+        <source>Passphrase Dialog</source>
+        <translation>ช่องสำหรับ รหัสผ่าน</translation>
     </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(ไม่มีชื่อ)</translation>
-    </message>
-</context>
-<context>
-    <name>AskPassphraseDialog</name>
     <message>
         <source>Enter passphrase</source>
         <translation>ใส่รหัสผ่าน</translation>
@@ -123,107 +60,115 @@
         <source>Repeat new passphrase</source>
         <translation>กรุณากรอกรหัสผ่านใหม่อีกครั้งหนึ่ง</translation>
     </message>
+</context>
+<context>
+    <name>BanTableModel</name>
     <message>
-        <source>Encrypt wallet</source>
-        <translation>กระเป๋าสตางค์ที่เข้ารหัส</translation>
+        <source>IP/Netmask</source>
+        <translation>IP/Netmask (ตัวกรอง IP)</translation>
     </message>
     <message>
-        <source>This operation needs your wallet passphrase to unlock the wallet.</source>
-        <translation>การดำเนินการนี้ต้องมีรหัสผ่านกระเป๋าเงินของคุณเพื่อปลดล็อคกระเป๋าเงิน</translation>
+        <source>Banned Until</source>
+        <translation>ห้าม จนถึง</translation>
+    </message>
+</context>
+<context>
+    <name>BitcoinGUI</name>
+    <message>
+        <source>Sign &amp;message...</source>
+        <translation>เซ็นต์ชื่อด้วย &amp;ข้อความ...</translation>
+    </message>
+    <message>
+        <source>Synchronizing with network...</source>
+        <translation>กำลังทำข้อมูลให้ตรงกันกับเครือข่าย ...</translation>
     </message>
     <message>
-        <source>Unlock wallet</source>
-        <translation>เปิดกระเป๋าสตางค์</translation>
+        <source>&amp;Overview</source>
+        <translation>&amp;ภาพรวม</translation>
     </message>
     <message>
-        <source>This operation needs your wallet passphrase to decrypt the wallet.</source>
-        <translation>การดำเนินการนี้ต้องมีรหัสผ่านกระเป๋าเงินของคุณในการถอดรหัสกระเป๋าเงิน</translation>
+        <source>Node</source>
+        <translation>Node/โหนด</translation>
     </message>
     <message>
-        <source>Decrypt wallet</source>
-        <translation>ถอดรหัสกระเป๋าสตางค์</translation>
+        <source>Show general overview of wallet</source>
+        <translation>แสดงภาพรวมทั่วไปของกระเป๋าเงิน</translation>
     </message>
     <message>
-        <source>Change passphrase</source>
-        <translation>เปลี่ยนรหัสผ่าน</translation>
+        <source>&amp;Transactions</source>
+        <translation>&amp;การทำรายการ</translation>
     </message>
     <message>
-        <source>Confirm wallet encryption</source>
-        <translation>ยืนยันการเข้ารหัสกระเป๋าสตางค์</translation>
+        <source>Browse transaction history</source>
+        <translation>เรียกดูประวัติการทำธุรกรรม</translation>
     </message>
     <message>
-        <source>Are you sure you wish to encrypt your wallet?</source>
-        <translation>คุณแน่ใจแล้วหรือว่าต้องการเข้ารหัสกระเป๋าสตางค์ของคุณ?</translation>
+        <source>E&amp;xit</source>
+        <translation>&amp;ออก</translation>
     </message>
     <message>
-        <source>Wallet encrypted</source>
-        <translation>กระเป๋าสตางค์ถูกเข้ารหัสเรียบร้อยแล้ว</translation>
+        <source>Quit application</source>
+        <translation>ออกจากโปรแกรม</translation>
     </message>
     <message>
-        <source>Wallet encryption failed</source>
-        <translation>การเข้ารหัสกระเป๋าสตางค์ผิดพลาด</translation>
+        <source>&amp;About %1</source>
+        <translation>&amp;เกี่ยวกับ %1</translation>
     </message>
     <message>
-        <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
-        <translation>กระเป๋าเงินเข้ารหัสล้มเหลวเนื่องจากข้อผิดพลาดภายใน กระเป๋าเงินของคุณไม่ได้เข้ารหัส</translation>
+        <source>Show information about %1</source>
+        <translation>แสดงข้อมูล เกี่ยวกับ %1</translation>
     </message>
     <message>
-        <source>The supplied passphrases do not match.</source>
-        <translation>รหัสผ่านที่คุณกรอกไม่ตรงกัน</translation>
+        <source>About &amp;Qt</source>
+        <translation>เกี่ยวกับ &amp;Qt</translation>
     </message>
     <message>
-        <source>Wallet unlock failed</source>
-        <translation>ปลดล็อคกระเป๋าเงินล้มเหลว</translation>
+        <source>Show information about Qt</source>
+        <translation>แสดงข้อมูล เกี่ยวกับ Qt</translation>
     </message>
     <message>
-        <source>The passphrase entered for the wallet decryption was incorrect.</source>
-        <translation>ป้อนรหัสผ่านสำหรับการถอดรหัสกระเป๋าเงินไม่ถูกต้อง</translation>
+        <source>&amp;Options...</source>
+        <translation>&amp;ตัวเลือก...</translation>
     </message>
     <message>
-        <source>Wallet decryption failed</source>
-        <translation>ถอดรหัสกระเป๋าเงินล้มเหลว</translation>
+        <source>Modify configuration options for %1</source>
+        <translation>ปรับปรุง ข้อมูลการตั้งค่าตัวเลือก สำหรับ %1</translation>
     </message>
-    </context>
-<context>
-    <name>BanTableModel</name>
-    </context>
-<context>
-    <name>BitcoinGUI</name>
     <message>
-        <source>Synchronizing with network...</source>
-        <translation>กำลังทำข้อมูลให้ตรงกันกับเครือข่าย ...</translation>
+        <source>&amp;Encrypt Wallet...</source>
+        <translation>&amp;กระเป๋าเงินเข้ารหัส</translation>
     </message>
     <message>
-        <source>&amp;Overview</source>
-        <translation>&amp;ภาพรวม</translation>
+        <source>&amp;Backup Wallet...</source>
+        <translation>&amp;สำรองกระเป๋าเงิน...</translation>
     </message>
     <message>
-        <source>Show general overview of wallet</source>
-        <translation>แสดงภาพรวมทั่วไปของกระเป๋าเงิน</translation>
+        <source>&amp;Change Passphrase...</source>
+        <translation>&amp;เปลี่ยนรหัสผ่าน...</translation>
     </message>
     <message>
-        <source>&amp;Transactions</source>
-        <translation>&amp;การทำรายการ</translation>
+        <source>&amp;Sending addresses...</source>
+        <translation>&amp;ที่เก็บเงิน ที่จะส่ง bitcoin</translation>
     </message>
     <message>
-        <source>Browse transaction history</source>
-        <translation>เรียกดูประวัติการทำธุรกรรม</translation>
+        <source>&amp;Receiving addresses...</source>
+        <translation>&amp;ที่เก็บเงิน ที่จะรับ bitcoin</translation>
     </message>
     <message>
-        <source>E&amp;xit</source>
-        <translation>E&amp;ออก</translation>
+        <source>Open &amp;URI...</source>
+        <translation>เปิด &amp;URI</translation>
     </message>
     <message>
-        <source>Quit application</source>
-        <translation>ออกจากโปรแกรม</translation>
+        <source>Reindexing blocks on disk...</source>
+        <translation>กำลังทำดัชนี ที่เก็บบล็อก ใหม่ ในดิสก์...</translation>
     </message>
     <message>
-        <source>About &amp;Qt</source>
-        <translation>เกี่ยวกับ &amp;Qt</translation>
+        <source>Send coins to a Bitcoin address</source>
+        <translation>ส่ง coins ไปยัง ที่เก็บ Bitcoin</translation>
     </message>
     <message>
-        <source>&amp;Options...</source>
-        <translation>&amp;ตัวเลือก...</translation>
+        <source>Backup wallet to another location</source>
+        <translation>สำรอง กระเป๋าเงินไปยัง ที่เก็บอื่น</translation>
     </message>
     <message>
         <source>Change the passphrase used for wallet encryption</source>
@@ -231,7 +176,11 @@
     </message>
     <message>
         <source>&amp;Debug window</source>
-        <translation>&amp;หน้าต่างตรวจสอบข้อผิดพลาด</translation>
+        <translation>&amp;หน้าต่าง Debug</translation>
+    </message>
+    <message>
+        <source>Open debugging and diagnostic console</source>
+        <translation>เปิด แผลงควบคุม debugging และ diagnostic</translation>
     </message>
     <message>
         <source>&amp;Verify message...</source>
@@ -243,7 +192,7 @@
     </message>
     <message>
         <source>Wallet</source>
-        <translation>กระเป๋าสตางค์</translation>
+        <translation>กระเป๋าเงิน</translation>
     </message>
     <message>
         <source>&amp;Send</source>
@@ -253,6 +202,26 @@
         <source>&amp;Receive</source>
         <translation>&amp;รับ</translation>
     </message>
+    <message>
+        <source>&amp;Show / Hide</source>
+        <translation>&amp;แสดง / ซ่อน</translation>
+    </message>
+    <message>
+        <source>Show or hide the main Window</source>
+        <translation>แสดง หรือ ซ่อน หน้าหลัก</translation>
+    </message>
+    <message>
+        <source>Encrypt the private keys that belong to your wallet</source>
+        <translation>เข้ารหัส private keys/ รหัสส่วนตัว สำหรับกระเป๋าเงินของท่าน</translation>
+    </message>
+    <message>
+        <source>Sign messages with your Bitcoin addresses to prove you own them</source>
+        <translation>เซ็นชื่อด้วยข้อความ ที่เก็บ Bitcoin เพื่อแสดงว่าท่านเป็นเจ้าของ bitcoin นี้จริง</translation>
+    </message>
+    <message>
+        <source>Verify messages to ensure they were signed with specified Bitcoin addresses</source>
+        <translation>ตรวจสอบ ข้อความ เพื่อให้แน่ใจว่า การเซ็นต์ชื่อ ด้วยที่เก็บ Bitcoin แล้ว</translation>
+    </message>
     <message>
         <source>&amp;File</source>
         <translation>&amp;ไฟล์</translation>
@@ -269,17 +238,135 @@
         <source>Tabs toolbar</source>
         <translation>แถบเครื่องมือ</translation>
     </message>
+    <message>
+        <source>Request payments (generates QR codes and bitcoin: URIs)</source>
+        <translation>เรียกเก็บ การชำระเงิน (สร้าง QR codes และ bitcoin: URIs)</translation>
+    </message>
+    <message>
+        <source>Show the list of used sending addresses and labels</source>
+        <translation>แสดงรายการ ที่เก็บเงินที่จะส่ง bitcoin ออก และป้ายชื่อ ที่ใช้ไปแล้ว</translation>
+    </message>
+    <message>
+        <source>Show the list of used receiving addresses and labels</source>
+        <translation>แสดงรายการ ที่เก็บเงินที่จะรับ bitcoin เข้า และป้ายชื่อ ที่ใช้ไปแล้ว</translation>
+    </message>
+    <message>
+        <source>Open a bitcoin: URI or payment request</source>
+        <translation>เปิด bitcoin: URI หรือ การเรียกเก็บเงิน (การเรียกให้ชำระเงิน)</translation>
+    </message>
+    <message>
+        <source>&amp;Command-line options</source>
+        <translation>&amp;ตัวเลือก Command-line</translation>
+    </message>
     <message numerus="yes">
         <source>%n active connection(s) to Bitcoin network</source>
-        <translation><numerusform>%n ที่ใช้งานการเชื่อมต่อกับเครือข่าย Bitcoin</numerusform></translation>
+        <translation><numerusform>%n ช่องการเชื่อมต่อที่ใช้งานได้ เพื่อเชื่อมกับเครือข่าย Bitcoin</numerusform></translation>
+    </message>
+    <message>
+        <source>Indexing blocks on disk...</source>
+        <translation>การกำลังสร้างดัชนีของบล็อก ในดิสก์...</translation>
+    </message>
+    <message>
+        <source>Processing blocks on disk...</source>
+        <translation>กำลังดำเนินการกับบล็อกในดิสก์...</translation>
+    </message>
+    <message>
+        <source>No block source available...</source>
+        <translation>ไม่มีบล็อกเริ่มต้น ให้ใช้ได้...</translation>
+    </message>
+    <message numerus="yes">
+        <source>Processed %n block(s) of transaction history.</source>
+        <translation><numerusform>%n บล็อกในประวัติรายการ ได้รับการดำเนินการเรียบร้อยแล้ว</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%n hour(s)</source>
+        <translation><numerusform>%n ชั่วโมง</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%n day(s)</source>
+        <translation><numerusform>%n วัน</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%n week(s)</source>
+        <translation><numerusform>%n สัปดาห์</numerusform></translation>
+    </message>
+    <message>
+        <source>%1 and %2</source>
+        <translation>%1 และ %2</translation>
+    </message>
+    <message numerus="yes">
+        <source>%n year(s)</source>
+        <translation><numerusform>%n ปี</numerusform></translation>
+    </message>
+    <message>
+        <source>%1 behind</source>
+        <translation>%1 ตามหลัง</translation>
+    </message>
+    <message>
+        <source>Last received block was generated %1 ago.</source>
+        <translation>บล็อกสุดท้ายที่ได้รับ สร้างขึ้นเมื่อ %1 มาแล้ว</translation>
+    </message>
+    <message>
+        <source>Transactions after this will not yet be visible.</source>
+        <translation>รายการหลังจากนี้ จะไม่แสดงให้เห็น</translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation>ข้อผิดพลาด</translation>
+    </message>
+    <message>
+        <source>Warning</source>
+        <translation>คำเตือน</translation>
+    </message>
+    <message>
+        <source>Information</source>
+        <translation>ข้อมูล</translation>
     </message>
     <message>
         <source>Up to date</source>
         <translation>ทันสมัย</translation>
     </message>
+    <message>
+        <source>Show the %1 help message to get a list with possible Bitcoin command-line options</source>
+        <translation>แสดง %1 ข้อความช่วยเหลือ เพื่อแสดงรายการ ตัวเลือกที่เป็นไปได้สำหรับ Bitcoin command-line</translation>
+    </message>
+    <message>
+        <source>%1 client</source>
+        <translation>%1 ลูกค้า</translation>
+    </message>
     <message>
         <source>Catching up...</source>
-        <translation>จับได้...</translation>
+        <translation>กำลังตามให้ทัน...</translation>
+    </message>
+    <message>
+        <source>Date: %1
+</source>
+        <translation>วันที่: %1
+</translation>
+    </message>
+    <message>
+        <source>Amount: %1
+</source>
+        <translation>จำนวน: %1
+</translation>
+    </message>
+    <message>
+        <source>Type: %1
+</source>
+        <translation>ชนิด: %1
+</translation>
+    </message>
+    <message>
+        <source>Label: %1
+</source>
+        <translation>ป้ายชื่อ: %1
+</translation>
+    </message>
+    <message>
+        <source>Address: %1
+</source>
+        <translation>ที่อยู่: %1
+</translation>
     </message>
     <message>
         <source>Sent transaction</source>
@@ -298,15 +385,68 @@
         <translation>กระเป๋าเงินถูก &lt;b&gt;เข้ารหัส&lt;/b&gt; และในปัจจุบัน &lt;b&gt;ล็อค &lt;/b&gt;</translation>
     </message>
 </context>
-<context>
-    <name>ClientModel</name>
-    </context>
 <context>
     <name>CoinControlDialog</name>
+    <message>
+        <source>Coin Selection</source>
+        <translation>การเลือก Coin</translation>
+    </message>
+    <message>
+        <source>Quantity:</source>
+        <translation>จำนวน:</translation>
+    </message>
+    <message>
+        <source>Bytes:</source>
+        <translation>ไบต์:</translation>
+    </message>
+    <message>
+        <source>Amount:</source>
+        <translation>จำนวน:</translation>
+    </message>
+    <message>
+        <source>Priority:</source>
+        <translation>ความเร่งด่วน:</translation>
+    </message>
+    <message>
+        <source>Fee:</source>
+        <translation>ค่าธรรมเนียม:</translation>
+    </message>
+    <message>
+        <source>Dust:</source>
+        <translation>เศษ:</translation>
+    </message>
+    <message>
+        <source>After Fee:</source>
+        <translation>ส่วนที่เหลือจากค่าธรรมเนียม:</translation>
+    </message>
+    <message>
+        <source>Change:</source>
+        <translation>เงินทอน:</translation>
+    </message>
+    <message>
+        <source>(un)select all</source>
+        <translation>(ไม่)เลือกทั้งหมด</translation>
+    </message>
+    <message>
+        <source>Tree mode</source>
+        <translation>โหมดแบบต้นไม้</translation>
+    </message>
+    <message>
+        <source>List mode</source>
+        <translation>โหมดแบบรายการ</translation>
+    </message>
     <message>
         <source>Amount</source>
         <translation>จำนวน</translation>
     </message>
+    <message>
+        <source>Received with label</source>
+        <translation>รับโดยป้ายชื่อ (label)</translation>
+    </message>
+    <message>
+        <source>Received with address</source>
+        <translation>รับโดยที่เก็บ</translation>
+    </message>
     <message>
         <source>Date</source>
         <translation>วันที่</translation>
@@ -323,11 +463,7 @@
         <source>Priority</source>
         <translation>ระดับความสำคัญ</translation>
     </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(ไม่มีชื่อ)</translation>
-    </message>
-    </context>
+</context>
 <context>
     <name>EditAddressDialog</name>
     <message>
@@ -336,59 +472,299 @@
     </message>
     <message>
         <source>&amp;Label</source>
-        <translation>&amp;ชื่อ</translation>
+        <translation>&amp;ป้ายชื่อ</translation>
+    </message>
+    <message>
+        <source>The label associated with this address list entry</source>
+        <translation>รายการแสดง ป้ายชื่อที่เกี่ยวข้องกับที่เก็บนี้</translation>
+    </message>
+    <message>
+        <source>The address associated with this address list entry. This can only be modified for sending addresses.</source>
+        <translation>ที่เก็บที่เกี่ยวข้องกับ ที่เก็บที่แสดงรายการนี้ การปรับปรุงนี้ทำได้สำหรับ ที่เก็บเงินที่จะใช่ส่งเงิน เท่านั้น</translation>
     </message>
     <message>
         <source>&amp;Address</source>
-        <translation>&amp;ที่อยู่</translation>
+        <translation>&amp;ที่เก็บ</translation>
+    </message>
+</context>
+<context>
+    <name>FreespaceChecker</name>
+    <message>
+        <source>A new data directory will be created.</source>
+        <translation>ไดเร็กทอรี่ใหม่ที่ใช้เก็บข้อมูลจะถูกสร้างขึ้นมา</translation>
+    </message>
+    <message>
+        <source>name</source>
+        <translation>ชื่อ</translation>
+    </message>
+    <message>
+        <source>Path already exists, and is not a directory.</source>
+        <translation>พาธ มีอยู่แล้ว พาธนี่ไม่ใช่ไดเร็กทอรี่</translation>
+    </message>
+    <message>
+        <source>Cannot create data directory here.</source>
+        <translation>ไม่สามารถสร้างไดเร็กทอรี่ข้อมูลที่นี่</translation>
+    </message>
+</context>
+<context>
+    <name>HelpMessageDialog</name>
+    <message>
+        <source>version</source>
+        <translation>เวอร์ชั่น</translation>
+    </message>
+    <message>
+        <source>(%1-bit)</source>
+        <translation>(%1-บิท)</translation>
+    </message>
+    <message>
+        <source>About %1</source>
+        <translation>เกี่ยวกับ %1</translation>
+    </message>
+    <message>
+        <source>Command-line options</source>
+        <translation>ตัวเลือก Command-line</translation>
+    </message>
+    <message>
+        <source>Usage:</source>
+        <translation>วิธีใช้งาน:</translation>
+    </message>
+    <message>
+        <source>command-line options</source>
+        <translation>ตัวเลือก command-line</translation>
     </message>
     <message>
-        <source>New receiving address</source>
-        <translation>ที่อยู่ผู้รับใหม่</translation>
+        <source>UI Options:</source>
+        <translation>ตัวเลือก UI:</translation>
     </message>
     <message>
-        <source>New sending address</source>
-        <translation>ที่อยู่ผู้ส่งใหม่</translation>
+        <source>Choose data directory on startup (default: %u)</source>
+        <translation>เลือกไดเร็กทอรี่ข้อมูลตั้งแต่เริ่มต้นสตาร์ทอัพ (ค่าเริ่มต้น: %u)</translation>
     </message>
     <message>
-        <source>Edit receiving address</source>
-        <translation>แก้ไขที่อยู่ผู้รับ</translation>
+        <source>Set language, for example "de_DE" (default: system locale)</source>
+        <translation>ตั้งค่าภาษา ยกตัวอย่าง "de_DE" (ค่าเริ่มต้น: ภาษาท้องถิ่นของระบบ)</translation>
     </message>
     <message>
-        <source>Edit sending address</source>
-        <translation>แก้ไขที่อยู่ผู้ส่ง</translation>
+        <source>Start minimized</source>
+        <translation>เริ่มต้นมินิไมซ์</translation>
     </message>
     <message>
-        <source>The entered address "%1" is already in the address book.</source>
-        <translation>ป้อนที่อยู่ "%1" ที่มีอยู่แล้วในสมุดที่อยู่</translation>
+        <source>Set SSL root certificates for payment request (default: -system-)</source>
+        <translation>ตั้งค่า SSL root certificates สำหรับเรียกการชำระเงิน (ค่าเริ่มต้น: -system-)</translation>
     </message>
     <message>
-        <source>Could not unlock wallet.</source>
-        <translation>ไม่สามารถปลดล็อคกระเป๋าเงิน</translation>
+        <source>Show splash screen on startup (default: %u)</source>
+        <translation>แสดง splash screen ตอนเริ่มต้น (ค่าเริ่มต้น: %u)</translation>
     </message>
     <message>
-        <source>New key generation failed.</source>
-        <translation>สร้างกุญแจใหม่ล้มเหลว</translation>
+        <source>Reset all settings changed in the GUI</source>
+        <translation>รีเซตการเปลี่ยนการตั้งค่าทั้งหมดใน GUI</translation>
     </message>
 </context>
-<context>
-    <name>FreespaceChecker</name>
-    </context>
-<context>
-    <name>HelpMessageDialog</name>
-    </context>
 <context>
     <name>Intro</name>
-    </context>
+    <message>
+        <source>Welcome</source>
+        <translation>ยินดีต้อนรับ</translation>
+    </message>
+    <message>
+        <source>Welcome to %1.</source>
+        <translation>ยินดีต้องรับสู่ %1</translation>
+    </message>
+    <message>
+        <source>As this is the first time the program is launched, you can choose where %1 will store its data.</source>
+        <translation>นี่เป็นการรันโปรแกรมครั้งแรก ท่านสามารถเลือก ว่าจะเก็บข้อมูลไว้ที่ %1</translation>
+    </message>
+    <message>
+        <source>%1 will download and store a copy of the Bitcoin block chain. At least %2GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source>
+        <translation>%1 จะดาวน์โหลดและเก็บกอปปี้ชุดหนึ่งของ บล็อกเชน Bitcoin ไว้ ข้อมูลขนานอย่างน้อย %2GB จะเก็บไว้ในไดเร็กทอรี่นี้ และข้อมูลจะมีขนาดใหญ่ขึ้นเรื่อยๆ กระเป๋าเงิน จะเก็บไว้ในไดเร็กทอรี่นี้ด้วย</translation>
+    </message>
+    <message>
+        <source>Use the default data directory</source>
+        <translation>ใช้ไดเร็กทอรี่ข้อมูล ที่เป็นค่าเริ่มต้น</translation>
+    </message>
+    <message>
+        <source>Use a custom data directory:</source>
+        <translation>ใช้ไดเร็กทอรี่ข้อมูลที่ตั้งค่าเอง:</translation>
+    </message>
+    <message>
+        <source>Error: Specified data directory "%1" cannot be created.</source>
+        <translation>ข้อผิดพลาด: ไดเร็กทอรี่ข้อมูลที่ต้องการ "%1" ไม่สามารถสร้างได้</translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation>ข้อผิดพลาด</translation>
+    </message>
+    <message numerus="yes">
+        <source>%n GB of free space available</source>
+        <translation><numerusform>%n GB พื้นที่ว่างบนดิสก์ที่ใช้ได้</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>(of %n GB needed)</source>
+        <translation><numerusform>(ต้องการพื้นที่ %n GB)</numerusform></translation>
+    </message>
+</context>
 <context>
     <name>OpenURIDialog</name>
-    </context>
+    <message>
+        <source>Open URI</source>
+        <translation>เปิด URI</translation>
+    </message>
+    <message>
+        <source>Open payment request from URI or file</source>
+        <translation>เปิด การเรียกการชำระเงิน จาก URI หรือ ไฟล์</translation>
+    </message>
+    <message>
+        <source>URI:</source>
+        <translation>URI:</translation>
+    </message>
+    <message>
+        <source>Select payment request file</source>
+        <translation>เลือก ไฟล์การเรียกการชำระเงิน</translation>
+    </message>
+</context>
 <context>
     <name>OptionsDialog</name>
     <message>
         <source>Options</source>
         <translation>ตัวเลือก</translation>
     </message>
+    <message>
+        <source>&amp;Main</source>
+        <translation>&amp;หลัก</translation>
+    </message>
+    <message>
+        <source>Automatically start %1 after logging in to the system.</source>
+        <translation>เริ่มต้นอัตโนมัติ %1 หลังจาก ล็อกอิน เข้าสู่ระบบแล้ว</translation>
+    </message>
+    <message>
+        <source>&amp;Start %1 on system login</source>
+        <translation>&amp;เริ่ม %1 ในการล็อกอินระบบ</translation>
+    </message>
+    <message>
+        <source>Size of &amp;database cache</source>
+        <translation>ขนาดของ &amp;database cache</translation>
+    </message>
+    <message>
+        <source>MB</source>
+        <translation>MB</translation>
+    </message>
+    <message>
+        <source>Number of script &amp;verification threads</source>
+        <translation>จำนวนของสคริปท์ &amp;verification threads</translation>
+    </message>
+    <message>
+        <source>Accept connections from outside</source>
+        <translation>ยอมรับ การเชื่อมต่อจากภายนอก</translation>
+    </message>
+    <message>
+        <source>Allow incoming connections</source>
+        <translation>ยอมให้เชื่อมต่อจากภายนอกได้</translation>
+    </message>
+    <message>
+        <source>IP address of the proxy (e.g. IPv4: 127.0.0.1 / IPv6: ::1)</source>
+        <translation>IP แอดเดส ของ proxy (เช่น IPv4: 127.0.0.1 / IPv6: ::1)</translation>
+    </message>
+    <message>
+        <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Exit in the menu.</source>
+        <translation>มินิไมซ์แอพ แทนการออกจากแอพพลิเคชั่น เมื่อวินโดว์ได้รับการปิด เมื่อเลือกตัวเลือกนี้ แอพพลิเคชั่น จะถูกปิด ก็ต่อเมื่อ มีการเลือกเมนู Exit/ออกจากระบบ เท่านั้น</translation>
+    </message>
+    <message>
+        <source>Third party URLs (e.g. a block explorer) that appear in the transactions tab as context menu items. %s in the URL is replaced by transaction hash. Multiple URLs are separated by vertical bar |.</source>
+        <translation>URL แบบอื่น (ยกตัวอย่าง เอ็กพลอเลอร์บล็อก) ที่อยู่ใน เมนูรายการ ลำดับ %s ใน URL จะถูกเปลี่ยนด้วย รายการแฮช URL ที่เป็นแบบหลายๆอัน จะถูกแยก โดย เครื่องหมายเส้นบาร์ตั้ง |</translation>
+    </message>
+    <message>
+        <source>Third party transaction URLs</source>
+        <translation>URI รายการ แบบของเจ้าอื่นๆ</translation>
+    </message>
+    <message>
+        <source>Active command-line options that override above options:</source>
+        <translation>ตัวเลือก command-line แอกทีฟอยู่นี้ จะแทนที่ ตัวเลือกด้านบนนี้:</translation>
+    </message>
+    <message>
+        <source>Reset all client options to default.</source>
+        <translation>รีเซต ไคลเอ็นออพชั่น กลับไปเป็นค่าเริ่มต้น</translation>
+    </message>
+    <message>
+        <source>&amp;Reset Options</source>
+        <translation>&amp;รีเซต ออพชั่น</translation>
+    </message>
+    <message>
+        <source>&amp;Network</source>
+        <translation>&amp;เน็ตเวิร์ก</translation>
+    </message>
+    <message>
+        <source>(0 = auto, &lt;0 = leave that many cores free)</source>
+        <translation>(0 = อัตโนมัติ, &lt;0 = ปล่อย คอร์ อิสระ)</translation>
+    </message>
+    <message>
+        <source>W&amp;allet</source>
+        <translation>กระเ&amp;ป๋าเงิน</translation>
+    </message>
+    <message>
+        <source>Expert</source>
+        <translation>ผู้เชี่ยวชาญ</translation>
+    </message>
+    <message>
+        <source>Enable coin &amp;control features</source>
+        <translation>เปิดใช้ coin &amp; รูปแบบการควบคุม</translation>
+    </message>
+    <message>
+        <source>If you disable the spending of unconfirmed change, the change from a transaction cannot be used until that transaction has at least one confirmation. This also affects how your balance is computed.</source>
+        <translation>หากท่านไม่เปิดใช้ การใช้เงินทอนที่ยังไม่ยืนยัน เงินทอนจากการทำรายการจะไม่สามารถใช้ได้ จนกว่ารายการที่ทำการ จะได้รับการยืนยันหนึ่งครั้ง และจะกระทบการคำนวณยอดคงเหลือของท่านด้วย</translation>
+    </message>
+    <message>
+        <source>&amp;Spend unconfirmed change</source>
+        <translation>&amp;ใช้เงินทอนที่ยังไม่ยืนยัน</translation>
+    </message>
+    <message>
+        <source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source>
+        <translation>เปิด Bitcoin ไคล์เอ็นท์พอร์ต/client port บน router โดยอัตโนมัติ วิธีนี้ใช้ได้เมื่อ router สนับสนุน UPnP และสถานะเปิดใช้งาน</translation>
+    </message>
+    <message>
+        <source>Map port using &amp;UPnP</source>
+        <translation>จองพอร์ต โดยใช้ &amp;UPnP</translation>
+    </message>
+    <message>
+        <source>Connect to the Bitcoin network through a SOCKS5 proxy.</source>
+        <translation>เชื่อมต่อกับ Bitcoin เน็ตเวิร์ก ผ่านพร็อกซี่แบบ SOCKS5</translation>
+    </message>
+    <message>
+        <source>&amp;Connect through SOCKS5 proxy (default proxy):</source>
+        <translation>&amp;เชื่อมต่อผ่าน พร็อกซี่ SOCKS5 (พร็อกซี่เริ่มต้น):</translation>
+    </message>
+    <message>
+        <source>Proxy &amp;IP:</source>
+        <translation>พร็อกซี่ &amp;IP:</translation>
+    </message>
+    <message>
+        <source>&amp;Port:</source>
+        <translation>&amp;พอร์ต</translation>
+    </message>
+    <message>
+        <source>Port of the proxy (e.g. 9050)</source>
+        <translation>พอร์ตของพร็อกซี่ (ตัวอย่าง 9050)</translation>
+    </message>
+    <message>
+        <source>Used for reaching peers via:</source>
+        <translation>ใช้ในการเข้าถึงอีกฝ่ายหนึ่ง peer โดย:</translation>
+    </message>
+    <message>
+        <source>Shows, if the supplied default SOCKS5 proxy is used to reach peers via this network type.</source>
+        <translation>แสดง หากใช้พร็อกซี่ SOCKS5 ที่เป็นค่าเริ่มต้น เพื่อเข้าถึง peer อีกฝ่าย ผ่านทางเน็ตเวิร์กชนิดนี้</translation>
+    </message>
+    <message>
+        <source>IPv4</source>
+        <translation>IPv4</translation>
+    </message>
+    <message>
+        <source>IPv6</source>
+        <translation>IPv6</translation>
+    </message>
+    <message>
+        <source>Tor</source>
+        <translation>Tor</translation>
+    </message>
     </context>
 <context>
     <name>OverviewPage</name>
@@ -397,9 +773,6 @@
         <translation>รูป</translation>
     </message>
     </context>
-<context>
-    <name>PaymentServer</name>
-    </context>
 <context>
     <name>PeerTableModel</name>
     </context>
@@ -410,9 +783,6 @@
         <translation>จำนวน</translation>
     </message>
     </context>
-<context>
-    <name>QRImageWidget</name>
-    </context>
 <context>
     <name>RPCConsole</name>
     </context>
@@ -425,47 +795,44 @@
     </context>
 <context>
     <name>ReceiveRequestDialog</name>
+    </context>
+<context>
+    <name>SendCoinsDialog</name>
     <message>
-        <source>Address</source>
-        <translation>ที่อยู่</translation>
+        <source>Send Coins</source>
+        <translation>ส่งเหรียญ</translation>
     </message>
     <message>
-        <source>Amount</source>
-        <translation>จำนวน</translation>
+        <source>Quantity:</source>
+        <translation>จำนวน:</translation>
     </message>
     <message>
-        <source>Label</source>
-        <translation>ชื่อ</translation>
+        <source>Bytes:</source>
+        <translation>ไบต์:</translation>
     </message>
-    </context>
-<context>
-    <name>RecentRequestsTableModel</name>
     <message>
-        <source>Date</source>
-        <translation>วันที่</translation>
+        <source>Amount:</source>
+        <translation>จำนวน:</translation>
     </message>
     <message>
-        <source>Label</source>
-        <translation>ชื่อ</translation>
+        <source>Priority:</source>
+        <translation>ความเร่งด่วน</translation>
     </message>
     <message>
-        <source>Amount</source>
-        <translation>จำนวน</translation>
+        <source>Fee:</source>
+        <translation>ค่าธรรมเนียม:</translation>
     </message>
     <message>
-        <source>(no label)</source>
-        <translation>(ไม่มีชื่อ)</translation>
+        <source>After Fee:</source>
+        <translation>ส่วนที่เหลือจากค่าธรรมเนียม:</translation>
     </message>
-    </context>
-<context>
-    <name>SendCoinsDialog</name>
     <message>
-        <source>Send Coins</source>
-        <translation>ส่งเหรียญ</translation>
+        <source>Change:</source>
+        <translation>เงินทอน:</translation>
     </message>
     <message>
-        <source>(no label)</source>
-        <translation>(ไม่มีชื่อ)</translation>
+        <source>Dust:</source>
+        <translation>เศษ:</translation>
     </message>
     </context>
 <context>
@@ -491,91 +858,29 @@
 <context>
     <name>TrafficGraphWidget</name>
     </context>
-<context>
-    <name>TransactionDesc</name>
-    <message>
-        <source>Date</source>
-        <translation>วันที่</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>จำนวน</translation>
-    </message>
-    </context>
 <context>
     <name>TransactionDescDialog</name>
     </context>
-<context>
-    <name>TransactionTableModel</name>
-    <message>
-        <source>Date</source>
-        <translation>วันที่</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>ชื่อ</translation>
-    </message>
-    </context>
-<context>
-    <name>TransactionView</name>
-    <message>
-        <source>Today</source>
-        <translation>วันนี้</translation>
-    </message>
-    <message>
-        <source>Exporting Failed</source>
-        <translation>ส่งออกข้อมูลล้มเหลว</translation>
-    </message>
-    <message>
-        <source>Comma separated file (*.csv)</source>
-        <translation>คั่นไฟล์ด้วยเครื่องหมายจุลภาค (*.csv)</translation>
-    </message>
-    <message>
-        <source>Confirmed</source>
-        <translation>ยืนยันแล้ว</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation>วันที่</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>ชื่อ</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>ที่อยู่</translation>
-    </message>
-    </context>
 <context>
     <name>UnitDisplayStatusBarControl</name>
     </context>
 <context>
-    <name>WalletFrame</name>
-    </context>
-<context>
-    <name>WalletModel</name>
+    <name>bitcoin-core</name>
     <message>
-        <source>Send Coins</source>
-        <translation>ส่งเหรียญ</translation>
+        <source>Options:</source>
+        <translation>ตัวเลือก:</translation>
     </message>
-</context>
-<context>
-    <name>WalletView</name>
     <message>
-        <source>&amp;Export</source>
-        <translation>&amp;ส่งออก</translation>
+        <source>Information</source>
+        <translation>ข้อมูล</translation>
     </message>
     <message>
-        <source>Export the data in the current tab to a file</source>
-        <translation>ส่งออกข้อมูลที่อยู่ในแท็บไปที่ไฟล์</translation>
+        <source>Warning</source>
+        <translation>คำเตือน</translation>
     </message>
-    </context>
-<context>
-    <name>bitcoin-core</name>
     <message>
-        <source>Options:</source>
-        <translation>ตัวเลือก:</translation>
+        <source>Error</source>
+        <translation>ข้อผิดพลาด</translation>
     </message>
-    </context>
+</context>
 </TS>
\ No newline at end of file
diff --git a/src/qt/locale/bitcoin_tr.ts b/src/qt/locale/bitcoin_tr.ts
index 2406776773624..f6ab2ca18b6cf 100644
--- a/src/qt/locale/bitcoin_tr.ts
+++ b/src/qt/locale/bitcoin_tr.ts
@@ -25,10 +25,6 @@
         <source>C&amp;lose</source>
         <translation>K&amp;apat</translation>
     </message>
-    <message>
-        <source>&amp;Copy Address</source>
-        <translation>&amp;Adresi Kopyala</translation>
-    </message>
     <message>
         <source>Delete the currently selected address from the list</source>
         <translation>Seçili adresi listeden sil</translation>
@@ -45,73 +41,6 @@
         <source>&amp;Delete</source>
         <translation>&amp;Sil</translation>
     </message>
-    <message>
-        <source>Choose the address to send coins to</source>
-        <translation>Bitcoin yollanacak adresi seç</translation>
-    </message>
-    <message>
-        <source>Choose the address to receive coins with</source>
-        <translation>Bitcoin alınacak adresi seç</translation>
-    </message>
-    <message>
-        <source>C&amp;hoose</source>
-        <translation>S&amp;eç</translation>
-    </message>
-    <message>
-        <source>Sending addresses</source>
-        <translation>&amp;Gönderme adresleri...</translation>
-    </message>
-    <message>
-        <source>Receiving addresses</source>
-        <translation>Alım adresleri</translation>
-    </message>
-    <message>
-        <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source>
-        <translation>Bunlar ödemeleri göndermek için kullanacağınız Bitcoin adreslerinizdir. Bitcoin yollamadan önce miktarı ve alıcının alım adresini daima kontrol ediniz.</translation>
-    </message>
-    <message>
-        <source>These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source>
-        <translation>Bunlar ödemeleri almak için kullanacağınız Bitcoin adreslerinizdir. Her işlem için yeni bir alım adresi kullanmanız tavsiye edilir.</translation>
-    </message>
-    <message>
-        <source>Copy &amp;Label</source>
-        <translation>&amp;Etiketi kopyala</translation>
-    </message>
-    <message>
-        <source>&amp;Edit</source>
-        <translation>&amp;Düzenle</translation>
-    </message>
-    <message>
-        <source>Export Address List</source>
-        <translation>Adres listesini dışa aktar</translation>
-    </message>
-    <message>
-        <source>Comma separated file (*.csv)</source>
-        <translation>Virgülle ayrılmış değerler dosyası (*.csv)</translation>
-    </message>
-    <message>
-        <source>Exporting Failed</source>
-        <translation>Dışa aktarım başarısız oldu</translation>
-    </message>
-    <message>
-        <source>There was an error trying to save the address list to %1. Please try again.</source>
-        <translation>Adres listesinin %1 konumuna kaydedilmesi sırasında bir hata meydana geldi. Lütfen tekrar deneyin.</translation>
-    </message>
-</context>
-<context>
-    <name>AddressTableModel</name>
-    <message>
-        <source>Label</source>
-        <translation>Etiket</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>Adres</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(etiket yok)</translation>
-    </message>
 </context>
 <context>
     <name>AskPassphraseDialog</name>
@@ -131,94 +60,6 @@
         <source>Repeat new passphrase</source>
         <translation>Yeni parolayı tekrarlayınız</translation>
     </message>
-    <message>
-        <source>Encrypt wallet</source>
-        <translation>Cüzdanı şifrele</translation>
-    </message>
-    <message>
-        <source>This operation needs your wallet passphrase to unlock the wallet.</source>
-        <translation>Bu işlem cüzdan kilidini açmak için cüzdan parolanızı gerektirir.</translation>
-    </message>
-    <message>
-        <source>Unlock wallet</source>
-        <translation>Cüzdan kilidini aç</translation>
-    </message>
-    <message>
-        <source>This operation needs your wallet passphrase to decrypt the wallet.</source>
-        <translation>Bu işlem cüzdanın şifrelemesini açmak için cüzdan parolasını gerektirir.</translation>
-    </message>
-    <message>
-        <source>Decrypt wallet</source>
-        <translation>Cüzdanın şifrelemesini aç</translation>
-    </message>
-    <message>
-        <source>Change passphrase</source>
-        <translation>Parolayı değiştir</translation>
-    </message>
-    <message>
-        <source>Confirm wallet encryption</source>
-        <translation>Cüzdanın şifrelemesini teyit eder</translation>
-    </message>
-    <message>
-        <source>Warning: If you encrypt your wallet and lose your passphrase, you will &lt;b&gt;LOSE ALL OF YOUR BITCOINS&lt;/b&gt;!</source>
-        <translation>Uyarı: Eğer cüzdanınızı şifrelerseniz ve parolanızı kaybederseniz, &lt;b&gt;TÜM BİTCOİNLERİNİZİ KAYBEDERSİNİZ&lt;/b&gt;!</translation>
-    </message>
-    <message>
-        <source>Are you sure you wish to encrypt your wallet?</source>
-        <translation>Cüzdanınızı şifrelemek istediğinizden emin misiniz?</translation>
-    </message>
-    <message>
-        <source>Bitcoin Core will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source>
-        <translation>Şifreleme işlemini tamamlamak için Bitcoin Çekirdeği şimdi kapanacaktır. Cüzdanınızı şifrelemenin, Bitcoinlerinizin bilgisayara bulaşan kötücül bir yazılım tarafından çalınmaya karşı tamamen koruyamayacağını unutmayınız.</translation>
-    </message>
-    <message>
-        <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source>
-        <translation>ÖNEMLİ: Önceden yapmış olduğunuz cüzdan dosyası yedeklemelerinin yeni oluşturulan şifrelenmiş cüzdan dosyası ile değiştirilmeleri gerekir. Güvenlik nedenleriyle yeni, şifrelenmiş cüzdanı kullanmaya başladığınızda eski şifrelenmemiş cüzdan dosyaları işe yaramaz hale gelecektir.</translation>
-    </message>
-    <message>
-        <source>Warning: The Caps Lock key is on!</source>
-        <translation>Uyarı: Caps Lock tuşu faal durumda!</translation>
-    </message>
-    <message>
-        <source>Wallet encrypted</source>
-        <translation>Cüzdan şifrelendi</translation>
-    </message>
-    <message>
-        <source>Enter the new passphrase to the wallet.&lt;br/&gt;Please use a passphrase of &lt;b&gt;ten or more random characters&lt;/b&gt;, or &lt;b&gt;eight or more words&lt;/b&gt;.</source>
-        <translation>Cüzdan için yeni parolayı giriniz.&lt;br/&gt;Lütfen &lt;b&gt;on ya da daha fazla rastgele karakter&lt;/b&gt; veya &lt;b&gt;sekiz ya da daha fazla kelime&lt;/b&gt; içeren bir parola kullanınız.</translation>
-    </message>
-    <message>
-        <source>Enter the old passphrase and new passphrase to the wallet.</source>
-        <translation>Cüzdan için eski parolayı ve yeni parolayı giriniz.</translation>
-    </message>
-    <message>
-        <source>Wallet encryption failed</source>
-        <translation>Cüzdan şifrelemesi başarısız oldu</translation>
-    </message>
-    <message>
-        <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
-        <translation>Dahili bir hata sebebiyle cüzdan şifrelemesi başarısız oldu. Cüzdanınız şifrelenmedi.</translation>
-    </message>
-    <message>
-        <source>The supplied passphrases do not match.</source>
-        <translation>Girilen parolalar birbirleriyle uyumlu değil.</translation>
-    </message>
-    <message>
-        <source>Wallet unlock failed</source>
-        <translation>Cüzdan kilidinin açılması başarısız oldu</translation>
-    </message>
-    <message>
-        <source>The passphrase entered for the wallet decryption was incorrect.</source>
-        <translation>Cüzdan şifresinin açılması için girilen parola yanlıştı.</translation>
-    </message>
-    <message>
-        <source>Wallet decryption failed</source>
-        <translation>Cüzdan şifresinin açılması başarısız oldu</translation>
-    </message>
-    <message>
-        <source>Wallet passphrase was successfully changed.</source>
-        <translation>Cüzdan parolası başarılı bir şekilde değiştirildi.</translation>
-    </message>
 </context>
 <context>
     <name>BanTableModel</name>
@@ -269,6 +110,14 @@
         <source>Quit application</source>
         <translation>Uygulamadan çık</translation>
     </message>
+    <message>
+        <source>&amp;About %1</source>
+        <translation>%1 &amp;hakkında</translation>
+    </message>
+    <message>
+        <source>Show information about %1</source>
+        <translation>%1 hakkında bilgi göster</translation>
+    </message>
     <message>
         <source>About &amp;Qt</source>
         <translation>&amp;Qt hakkında</translation>
@@ -281,6 +130,10 @@
         <source>&amp;Options...</source>
         <translation>&amp;Seçenekler...</translation>
     </message>
+    <message>
+        <source>Modify configuration options for %1</source>
+        <translation>%1 için yapılandırma ayarlarını değiştir</translation>
+    </message>
     <message>
         <source>&amp;Encrypt Wallet...</source>
         <translation>Cüzdanı &amp;şifrele...</translation>
@@ -305,14 +158,6 @@
         <source>Open &amp;URI...</source>
         <translation>&amp;URI aç...</translation>
     </message>
-    <message>
-        <source>Bitcoin Core client</source>
-        <translation>Bitcoin Çekirdeği istemcisi</translation>
-    </message>
-    <message>
-        <source>Importing blocks from disk...</source>
-        <translation>Bloklar diskten içe aktarılıyor...</translation>
-    </message>
     <message>
         <source>Reindexing blocks on disk...</source>
         <translation>Diskteki bloklar yeniden endeksleniyor...</translation>
@@ -357,10 +202,6 @@
         <source>&amp;Receive</source>
         <translation>&amp;Al</translation>
     </message>
-    <message>
-        <source>Show information about Bitcoin Core</source>
-        <translation>Bitcoin Çekirdeği hakkında bilgi göster</translation>
-    </message>
     <message>
         <source>&amp;Show / Hide</source>
         <translation>&amp;Göster / Sakla</translation>
@@ -397,22 +238,10 @@
         <source>Tabs toolbar</source>
         <translation>Sekme araç çubuğu</translation>
     </message>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Bitcoin Çekirdeği</translation>
-    </message>
     <message>
         <source>Request payments (generates QR codes and bitcoin: URIs)</source>
         <translation>Ödeme talep et (QR kodu ve bitcoin URI'si oluşturur)</translation>
     </message>
-    <message>
-        <source>&amp;About Bitcoin Core</source>
-        <translation>Bitcoin Çekirdeği &amp;hakkında</translation>
-    </message>
-    <message>
-        <source>Modify configuration options for Bitcoin Core</source>
-        <translation>Bitcoin Çekirdeği yapılandırma seçeneklerini değiştir</translation>
-    </message>
     <message>
         <source>Show the list of used sending addresses and labels</source>
         <translation>Kullanılmış gönderme adresleri ve etiketlerin listesini göster</translation>
@@ -429,14 +258,18 @@
         <source>&amp;Command-line options</source>
         <translation>&amp;Komut satırı seçenekleri</translation>
     </message>
-    <message>
-        <source>Show the Bitcoin Core help message to get a list with possible Bitcoin command-line options</source>
-        <translation>Bitcoin komut satırı seçeneklerinin listesini elde etmek için Bitcoin Çekirdeği yardım mesajını göster</translation>
-    </message>
     <message numerus="yes">
         <source>%n active connection(s) to Bitcoin network</source>
         <translation><numerusform>Bitcoin şebekesine %n faal bağlantı</numerusform><numerusform>Bitcoin şebekesine %n faal bağlantı</numerusform></translation>
     </message>
+    <message>
+        <source>Indexing blocks on disk...</source>
+        <translation>Bloklar diske indeksleniyor...</translation>
+    </message>
+    <message>
+        <source>Processing blocks on disk...</source>
+        <translation>Bloklar diske yazıdırılıyor...</translation>
+    </message>
     <message>
         <source>No block source available...</source>
         <translation>Hiçbir blok kaynağı mevcut değil...</translation>
@@ -493,6 +326,14 @@
         <source>Up to date</source>
         <translation>Güncel</translation>
     </message>
+    <message>
+        <source>Show the %1 help message to get a list with possible Bitcoin command-line options</source>
+        <translation>Olası Bitcoin komut satırı seçeneklerinin listesini görmek için %1 yardım mesajını göster</translation>
+    </message>
+    <message>
+        <source>%1 client</source>
+        <translation>%1 istemcisi</translation>
+    </message>
     <message>
         <source>Catching up...</source>
         <translation>Aralık kapatılıyor...</translation>
@@ -544,13 +385,6 @@
         <translation>Cüzdan &lt;b&gt;şifrelenmiştir&lt;/b&gt; ve şu anda &lt;b&gt;kilitlidir&lt;/b&gt;</translation>
     </message>
 </context>
-<context>
-    <name>ClientModel</name>
-    <message>
-        <source>Network Alert</source>
-        <translation>Şebeke hakkında uyarı</translation>
-    </message>
-</context>
 <context>
     <name>CoinControlDialog</name>
     <message>
@@ -629,150 +463,6 @@
         <source>Priority</source>
         <translation>Öncelik</translation>
     </message>
-    <message>
-        <source>Copy address</source>
-        <translation>Adresi kopyala</translation>
-    </message>
-    <message>
-        <source>Copy label</source>
-        <translation>Etiketi kopyala</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>Meblağı kopyala</translation>
-    </message>
-    <message>
-        <source>Copy transaction ID</source>
-        <translation>Muamele kimliğini kopyala</translation>
-    </message>
-    <message>
-        <source>Lock unspent</source>
-        <translation>Harcanmamışı kilitle</translation>
-    </message>
-    <message>
-        <source>Unlock unspent</source>
-        <translation>Harcanmamışın kilidini aç</translation>
-    </message>
-    <message>
-        <source>Copy quantity</source>
-        <translation>Miktarı kopyala</translation>
-    </message>
-    <message>
-        <source>Copy fee</source>
-        <translation>Ücreti kopyala</translation>
-    </message>
-    <message>
-        <source>Copy after fee</source>
-        <translation>Ücretten sonrakini kopyala</translation>
-    </message>
-    <message>
-        <source>Copy bytes</source>
-        <translation>Baytları kopyala</translation>
-    </message>
-    <message>
-        <source>Copy priority</source>
-        <translation>Önceliği kopyala</translation>
-    </message>
-    <message>
-        <source>Copy dust</source>
-        <translation>Tozu kopyala</translation>
-    </message>
-    <message>
-        <source>Copy change</source>
-        <translation>Para üstünü kopyala</translation>
-    </message>
-    <message>
-        <source>highest</source>
-        <translation>azami</translation>
-    </message>
-    <message>
-        <source>higher</source>
-        <translation>daha yüksek</translation>
-    </message>
-    <message>
-        <source>high</source>
-        <translation>yüksek</translation>
-    </message>
-    <message>
-        <source>medium-high</source>
-        <translation>orta-yüksek</translation>
-    </message>
-    <message>
-        <source>medium</source>
-        <translation>orta</translation>
-    </message>
-    <message>
-        <source>low-medium</source>
-        <translation>düşük-orta</translation>
-    </message>
-    <message>
-        <source>low</source>
-        <translation>düşük</translation>
-    </message>
-    <message>
-        <source>lower</source>
-        <translation>daha düşük</translation>
-    </message>
-    <message>
-        <source>lowest</source>
-        <translation>asgari</translation>
-    </message>
-    <message>
-        <source>(%1 locked)</source>
-        <translation>(%1 kilitlendi)</translation>
-    </message>
-    <message>
-        <source>none</source>
-        <translation>boş</translation>
-    </message>
-    <message>
-        <source>This label turns red if the transaction size is greater than 1000 bytes.</source>
-        <translation>Eğer muamele boyutu 1000 bayttan yüksek ise bu etiket kırmızı hale gelir.</translation>
-    </message>
-    <message>
-        <source>This label turns red if the priority is smaller than "medium".</source>
-        <translation>Eğer öncelik "ortadan" düşükse bu etiket kırmızı olur.</translation>
-    </message>
-    <message>
-        <source>This label turns red if any recipient receives an amount smaller than %1.</source>
-        <translation>Eğer herhangi bir alıcı %1'den düşük bir meblağ alırsa bu etiket kırmızı olur.</translation>
-    </message>
-    <message>
-        <source>Can vary +/- %1 satoshi(s) per input.</source>
-        <translation>Giriş başına +/- %1 satoshi olarak değişebilir.</translation>
-    </message>
-    <message>
-        <source>yes</source>
-        <translation>evet</translation>
-    </message>
-    <message>
-        <source>no</source>
-        <translation>hayır</translation>
-    </message>
-    <message>
-        <source>This means a fee of at least %1 per kB is required.</source>
-        <translation>Bu, kB başına en az %1 ücret gerektiği anlamnına gelir.</translation>
-    </message>
-    <message>
-        <source>Can vary +/- 1 byte per input.</source>
-        <translation>Girdi başına +/- 1 bayt değişebilir.</translation>
-    </message>
-    <message>
-        <source>Transactions with higher priority are more likely to get included into a block.</source>
-        <translation>Yüksek öncelikli muamelelerin bir bloğa dahil olmaları daha olasıdır.</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(boş etiket)</translation>
-    </message>
-    <message>
-        <source>change from %1 (%2)</source>
-        <translation>%1 unsurundan para üstü (%2)</translation>
-    </message>
-    <message>
-        <source>(change)</source>
-        <translation>(para üstü)</translation>
-    </message>
 </context>
 <context>
     <name>EditAddressDialog</name>
@@ -796,38 +486,6 @@
         <source>&amp;Address</source>
         <translation>&amp;Adres</translation>
     </message>
-    <message>
-        <source>New receiving address</source>
-        <translation>Yeni alım adresi</translation>
-    </message>
-    <message>
-        <source>New sending address</source>
-        <translation>Yeni gönderi adresi</translation>
-    </message>
-    <message>
-        <source>Edit receiving address</source>
-        <translation>Alım adresini düzenle</translation>
-    </message>
-    <message>
-        <source>Edit sending address</source>
-        <translation>Gönderi adresini düzenle</translation>
-    </message>
-    <message>
-        <source>The entered address "%1" is already in the address book.</source>
-        <translation>Girilen "%1" adresi hâlihazırda adres defterinde mevcuttur.</translation>
-    </message>
-    <message>
-        <source>The entered address "%1" is not a valid Bitcoin address.</source>
-        <translation>Girilen "%1" adresi geçerli bir Bitcoin adresi değildir.</translation>
-    </message>
-    <message>
-        <source>Could not unlock wallet.</source>
-        <translation>Cüzdan kilidi açılamadı.</translation>
-    </message>
-    <message>
-        <source>New key generation failed.</source>
-        <translation>Yeni anahtar oluşturulması başarısız oldu.</translation>
-    </message>
 </context>
 <context>
     <name>FreespaceChecker</name>
@@ -854,10 +512,6 @@
 </context>
 <context>
     <name>HelpMessageDialog</name>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Bitcoin Çekirdeği</translation>
-    </message>
     <message>
         <source>version</source>
         <translation>sürüm</translation>
@@ -867,8 +521,8 @@
         <translation>(%1-bit)</translation>
     </message>
     <message>
-        <source>About Bitcoin Core</source>
-        <translation>Bitcoin Çekirdeği hakkında</translation>
+        <source>About %1</source>
+        <translation>%1 Hakkında</translation>
     </message>
     <message>
         <source>Command-line options</source>
@@ -907,8 +561,8 @@
         <translation>Başlatıldığında başlangıç ekranını göster (varsayılan: %u)</translation>
     </message>
     <message>
-        <source>Reset all settings changes made over the GUI</source>
-        <translation>Arayüzde yapılan tüm seçenek değişikliklerini sıfırla</translation>
+        <source>Reset all settings changed in the GUI</source>
+        <translation>Grafik arayüzde yapılan tüm seçenek değişikliklerini sıfırla</translation>
     </message>
 </context>
 <context>
@@ -918,16 +572,16 @@
         <translation>Hoş geldiniz</translation>
     </message>
     <message>
-        <source>Welcome to Bitcoin Core.</source>
-        <translation>Bitcoin Çekirdeğine hoş geldiniz.</translation>
+        <source>Welcome to %1.</source>
+        <translation>%1'a hoş geldiniz.</translation>
     </message>
     <message>
-        <source>As this is the first time the program is launched, you can choose where Bitcoin Core will store its data.</source>
-        <translation>Bu programı ilk kez başlattığınızdan dolayı Bitcoin Çekirdeğinin verilerini nereye saklayacağını seçebilirsiniz.</translation>
+        <source>As this is the first time the program is launched, you can choose where %1 will store its data.</source>
+        <translation>Bu programın ilk kez başlatılmasından dolayı %1 yazılımının verilerini nerede saklayacağını seçebilirsiniz.</translation>
     </message>
     <message>
-        <source>Bitcoin Core will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source>
-        <translation>Bitcoin çekirdeği Bitcoin blok zincirinin bir kopyasını indirip saklayacaktır. Asgari %1GB bouyutunda veri bu klasörde saklanacak ve zamanla bu boyut artacaktır. Cüzdan da bu klasörde saklanacaktır. </translation>
+        <source>%1 will download and store a copy of the Bitcoin block chain. At least %2GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source>
+        <translation>%1, Bitcoin blok zincirinin bir kopyasını indirecek ve saklayacaktır. Bu klasörde en az %2GB veri saklanacak ve bu zamanla artacaktır. Cüzdan da bu klasörde saklanacaktır.</translation>
     </message>
     <message>
         <source>Use the default data directory</source>
@@ -937,10 +591,6 @@
         <source>Use a custom data directory:</source>
         <translation>Özel bir veri klasörü kullan:</translation>
     </message>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Bitcoin Çekirdeği</translation>
-    </message>
     <message>
         <source>Error: Specified data directory "%1" cannot be created.</source>
         <translation>Hata: belirtilen "%1" veri klasörü oluşturulamaz.</translation>
@@ -976,10 +626,6 @@
         <source>Select payment request file</source>
         <translation>Ödeme talebi dosyasını seç</translation>
     </message>
-    <message>
-        <source>Select payment request file to open</source>
-        <translation>Açılacak ödeme talebi dosyasını seç</translation>
-    </message>
 </context>
 <context>
     <name>OptionsDialog</name>
@@ -991,6 +637,14 @@
         <source>&amp;Main</source>
         <translation>&amp;Esas ayarlar</translation>
     </message>
+    <message>
+        <source>Automatically start %1 after logging in to the system.</source>
+        <translation>Sistemde oturum açıldığında %1 programını otomatik olarak başlat.</translation>
+    </message>
+    <message>
+        <source>&amp;Start %1 on system login</source>
+        <translation>&amp;Açılışta %1 açılsın</translation>
+    </message>
     <message>
         <source>Size of &amp;database cache</source>
         <translation>&amp;Veritabanı tamponunun boyutu</translation>
@@ -1019,10 +673,6 @@
         <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Exit in the menu.</source>
         <translation>Pencere kapatıldığında uygulamadan çıkmak yerine uygulamayı küçültür. Bu seçenek etkinleştirildiğinde, uygulama sadece menüden çıkış seçildiğinde kapanacaktır.</translation>
     </message>
-    <message>
-        <source>The user interface language can be set here. This setting will take effect after restarting Bitcoin Core.</source>
-        <translation>Kullanıcı arayüzünün dili burada belirtilebilir. Bu ayar Bitcoin Çekirdeği tekrar başlatıldığında etkinleşecektir.</translation>
-    </message>
     <message>
         <source>Third party URLs (e.g. a block explorer) that appear in the transactions tab as context menu items. %s in the URL is replaced by transaction hash. Multiple URLs are separated by vertical bar |.</source>
         <translation>Muameleler sekmesinde bağlam menüsü unsurları olarak görünen üçüncü taraf bağlantıları (mesela bir blok tarayıcısı). URL'deki %s, muamele hash değeri ile değiştirilecektir. Birden çok bağlantılar düşey çubuklar | ile ayrılacaktır.</translation>
@@ -1047,14 +697,6 @@
         <source>&amp;Network</source>
         <translation>&amp;Şebeke</translation>
     </message>
-    <message>
-        <source>Automatically start Bitcoin Core after logging in to the system.</source>
-        <translation>Sistemde oturum açıldığında Bitcoin Çekirdeğini otomatik olarak başlat.</translation>
-    </message>
-    <message>
-        <source>&amp;Start Bitcoin Core on system login</source>
-        <translation>Bitcoin Çekirdeğini sistem oturumuyla &amp;başlat</translation>
-    </message>
     <message>
         <source>(0 = auto, &lt;0 = leave that many cores free)</source>
         <translation>(0 = otomatik, &lt;0 = bu kadar çekirdeği kullanma)</translation>
@@ -1139,6 +781,14 @@
         <source>&amp;Window</source>
         <translation>&amp;Pencere</translation>
     </message>
+    <message>
+        <source>&amp;Hide the icon from the system tray.</source>
+        <translation>İkonu sistem çekmecesinden &amp;sakla</translation>
+    </message>
+    <message>
+        <source>Hide tray icon</source>
+        <translation>Sistem çekmecesi ikonunu sakla</translation>
+    </message>
     <message>
         <source>Show only a tray icon after minimizing the window.</source>
         <translation>Küçültüldükten sonra sadece çekmece ikonu göster.</translation>
@@ -1159,6 +809,10 @@
         <source>User Interface &amp;language:</source>
         <translation>Kullanıcı arayüzü &amp;lisanı:</translation>
     </message>
+    <message>
+        <source>The user interface language can be set here. This setting will take effect after restarting %1.</source>
+        <translation>Kullanıcı arayüzünün dili burada belirtilebilir. Bu ayar %1 tekrar başlatıldığında etkinleşecektir.</translation>
+    </message>
     <message>
         <source>&amp;Unit to show amounts in:</source>
         <translation>Meblağları göstermek için &amp;birim:</translation>
@@ -1284,140 +938,49 @@
     </message>
 </context>
 <context>
-    <name>PaymentServer</name>
+    <name>PeerTableModel</name>
     <message>
-        <source>URI handling</source>
-        <translation>URI yönetimi</translation>
+        <source>User Agent</source>
+        <translation>Kullanıcı Yazılımı</translation>
     </message>
     <message>
-        <source>Invalid payment address %1</source>
-        <translation>Geçersiz ödeme adresi %1</translation>
+        <source>Node/Service</source>
+        <translation>Düğüm/Servis</translation>
     </message>
     <message>
-        <source>Payment request rejected</source>
-        <translation>Ödeme talebi reddedildi</translation>
+        <source>Ping Time</source>
+        <translation>Ping Süresi</translation>
     </message>
+</context>
+<context>
+    <name>QObject</name>
     <message>
-        <source>Payment request network doesn't match client network.</source>
-        <translation>Ödeme talebi şebekesi istemci şebekesine denk gelmiyor.</translation>
+        <source>Amount</source>
+        <translation>Meblağ</translation>
     </message>
     <message>
-        <source>Payment request is not initialized.</source>
-        <translation>Ödeme talebi başlatılmamış.</translation>
+        <source>Enter a Bitcoin address (e.g. %1)</source>
+        <translation>Bir Bitcoin adresi giriniz (mesela %1)</translation>
     </message>
     <message>
-        <source>Requested payment amount of %1 is too small (considered dust).</source>
-        <translation>Talep edilen %1 meblağında ödeme çok düşüktür (toz olarak kabul edilir).</translation>
+        <source>%1 d</source>
+        <translation>%1 g</translation>
     </message>
     <message>
-        <source>Payment request error</source>
-        <translation>Ödeme talebi hatası</translation>
+        <source>%1 h</source>
+        <translation>%1 s</translation>
     </message>
     <message>
-        <source>Cannot start bitcoin: click-to-pay handler</source>
-        <translation>Bitcoin başlatılamadı: tıkla-ve-öde yöneticisi</translation>
+        <source>%1 m</source>
+        <translation>%1 d</translation>
     </message>
     <message>
-        <source>Payment request fetch URL is invalid: %1</source>
-        <translation>Ödeme talebini alma URL'i geçersiz: %1</translation>
+        <source>%1 s</source>
+        <translation>%1 s</translation>
     </message>
     <message>
-        <source>URI cannot be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source>
-        <translation>URI okunamadı! Sebebi geçersiz bir Bitcoin adresi veya hatalı URI parametreleri olabilir.</translation>
-    </message>
-    <message>
-        <source>Payment request file handling</source>
-        <translation>Ödeme talebi dosyası yönetimi</translation>
-    </message>
-    <message>
-        <source>Payment request file cannot be read! This can be caused by an invalid payment request file.</source>
-        <translation>Ödeme talebi okunamaz ya da işlenemez! Bunun sebebi geçersiz bir ödeme talebi dosyası olabilir.</translation>
-    </message>
-    <message>
-        <source>Payment request expired.</source>
-        <translation>Ödeme talebinin ömrü doldu.</translation>
-    </message>
-    <message>
-        <source>Unverified payment requests to custom payment scripts are unsupported.</source>
-        <translation>Özel ödeme betiklerine teyit edilmemiş ödeme talepleri desteklenmez.</translation>
-    </message>
-    <message>
-        <source>Invalid payment request.</source>
-        <translation>Geçersiz ödeme talebi.</translation>
-    </message>
-    <message>
-        <source>Refund from %1</source>
-        <translation>%1 öğesinden iade</translation>
-    </message>
-    <message>
-        <source>Payment request %1 is too large (%2 bytes, allowed %3 bytes).</source>
-        <translation>%1 ödeme talebi çok büyük (%2 bayt, müsaade edilen %3 bayt).</translation>
-    </message>
-    <message>
-        <source>Error communicating with %1: %2</source>
-        <translation>%1 ile iletişimde hata: %2</translation>
-    </message>
-    <message>
-        <source>Payment request cannot be parsed!</source>
-        <translation>Ödeme talebi ayrıştırılamaz!</translation>
-    </message>
-    <message>
-        <source>Bad response from server %1</source>
-        <translation>%1 sunucusundan hatalı cevap</translation>
-    </message>
-    <message>
-        <source>Payment acknowledged</source>
-        <translation>Ödeme teyit edildi</translation>
-    </message>
-    <message>
-        <source>Network request error</source>
-        <translation>Şebeke talebi hatası</translation>
-    </message>
-</context>
-<context>
-    <name>PeerTableModel</name>
-    <message>
-        <source>User Agent</source>
-        <translation>Kullanıcı Yazılımı</translation>
-    </message>
-    <message>
-        <source>Node/Service</source>
-        <translation>Düğüm/Servis</translation>
-    </message>
-    <message>
-        <source>Ping Time</source>
-        <translation>Ping Süresi</translation>
-    </message>
-</context>
-<context>
-    <name>QObject</name>
-    <message>
-        <source>Amount</source>
-        <translation>Meblağ</translation>
-    </message>
-    <message>
-        <source>Enter a Bitcoin address (e.g. %1)</source>
-        <translation>Bir Bitcoin adresi giriniz (mesela %1)</translation>
-    </message>
-    <message>
-        <source>%1 d</source>
-        <translation>%1 g</translation>
-    </message>
-    <message>
-        <source>%1 h</source>
-        <translation>%1 s</translation>
-    </message>
-    <message>
-        <source>%1 m</source>
-        <translation>%1 d</translation>
-    </message>
-    <message>
-        <source>%1 s</source>
-        <translation>%1 s</translation>
-    </message>
-    <message>
-        <source>None</source>
-        <translation>Boş</translation>
+        <source>None</source>
+        <translation>Boş</translation>
     </message>
     <message>
         <source>N/A</source>
@@ -1428,25 +991,6 @@
         <translation>%1 ms</translation>
     </message>
 </context>
-<context>
-    <name>QRImageWidget</name>
-    <message>
-        <source>&amp;Save Image...</source>
-        <translation>Resmi k&amp;aydet...</translation>
-    </message>
-    <message>
-        <source>&amp;Copy Image</source>
-        <translation>Resmi &amp;kopyala</translation>
-    </message>
-    <message>
-        <source>Save QR Code</source>
-        <translation>QR kodu kaydet</translation>
-    </message>
-    <message>
-        <source>PNG Image (*.png)</source>
-        <translation>PNG resim (*.png)</translation>
-    </message>
-</context>
 <context>
     <name>RPCConsole</name>
     <message>
@@ -1477,6 +1021,10 @@
         <source>Using BerkeleyDB version</source>
         <translation>Kullanılan BerkeleyDB sürümü</translation>
     </message>
+    <message>
+        <source>Datadir</source>
+        <translation>Veri konumu</translation>
+    </message>
     <message>
         <source>Startup time</source>
         <translation>Başlama zamanı</translation>
@@ -1513,10 +1061,6 @@
         <source>Memory usage</source>
         <translation>Bellek kullanımı</translation>
     </message>
-    <message>
-        <source>Open the Bitcoin Core debug log file from the current data directory. This can take a few seconds for large log files.</source>
-        <translation>Güncel veri klasöründen Bitcoin Çekirdeği hata ayıklama kütük dosyasını açar. Büyük kütük dosyaları için bu birkaç saniye alabilir.</translation>
-    </message>
     <message>
         <source>Received</source>
         <translation>Alınan</translation>
@@ -1565,6 +1109,18 @@
         <source>User Agent</source>
         <translation>Kullanıcı Yazılımı</translation>
     </message>
+    <message>
+        <source>Open the %1 debug log file from the current data directory. This can take a few seconds for large log files.</source>
+        <translation>Güncel veri klasöründen %1 hata ayıklama kütük dosyasını açar. Büyük kütük dosyaları için bu birkaç saniye alabilir.</translation>
+    </message>
+    <message>
+        <source>Decrease font size</source>
+        <translation>Font boyutunu küçült</translation>
+    </message>
+    <message>
+        <source>Increase font size</source>
+        <translation>Yazıtipi boyutunu büyült</translation>
+    </message>
     <message>
         <source>Services</source>
         <translation>Servisler</translation>
@@ -1633,10 +1189,6 @@
         <source>Out:</source>
         <translation>Dışarı:</translation>
     </message>
-    <message>
-        <source>Build date</source>
-        <translation>Derleme tarihi</translation>
-    </message>
     <message>
         <source>Debug log file</source>
         <translation>Hata ayıklama kütük dosyası</translation>
@@ -1674,8 +1226,8 @@
         <translation>Düğümün Yasağını Kald&amp;ır</translation>
     </message>
     <message>
-        <source>Welcome to the Bitcoin Core RPC console.</source>
-        <translation>Bitcoin Çekirdeği RPC konsoluna hoş geldiniz.</translation>
+        <source>Welcome to the %1 RPC console.</source>
+        <translation>%1 RPC konsoluna hoş geldiniz.</translation>
     </message>
     <message>
         <source>Use up and down arrows to navigate history, and &lt;b&gt;Ctrl-L&lt;/b&gt; to clear screen.</source>
@@ -1804,18 +1356,6 @@
         <source>Remove</source>
         <translation>Kaldır</translation>
     </message>
-    <message>
-        <source>Copy label</source>
-        <translation>Etiketi kopyala</translation>
-    </message>
-    <message>
-        <source>Copy message</source>
-        <translation>Mesajı kopyala</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>Meblağı kopyala</translation>
-    </message>
 </context>
 <context>
     <name>ReceiveRequestDialog</name>
@@ -1835,73 +1375,6 @@
         <source>&amp;Save Image...</source>
         <translation>Resmi ka&amp;ydet...</translation>
     </message>
-    <message>
-        <source>Request payment to %1</source>
-        <translation>%1 unsuruna ödeme talep et</translation>
-    </message>
-    <message>
-        <source>Payment information</source>
-        <translation>Ödeme bilgisi</translation>
-    </message>
-    <message>
-        <source>URI</source>
-        <translation>URI</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>Adres</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>Meblağ</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Etiket</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>Mesaj</translation>
-    </message>
-    <message>
-        <source>Resulting URI too long, try to reduce the text for label / message.</source>
-        <translation>Sonuç URI çok uzun, etiket ya da mesaj metnini kısaltmayı deneyiniz.</translation>
-    </message>
-    <message>
-        <source>Error encoding URI into QR Code.</source>
-        <translation>URI'nin QR koduna kodlanmasında hata oluştu.</translation>
-    </message>
-</context>
-<context>
-    <name>RecentRequestsTableModel</name>
-    <message>
-        <source>Date</source>
-        <translation>Tarih</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Etiket</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>Mesaj</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>Meblağ</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(boş etiket)</translation>
-    </message>
-    <message>
-        <source>(no message)</source>
-        <translation>(boş mesaj)</translation>
-    </message>
-    <message>
-        <source>(no amount)</source>
-        <translation>(boş meblağ)</translation>
-    </message>
 </context>
 <context>
     <name>SendCoinsDialog</name>
@@ -2021,14 +1494,6 @@
         <source>fast</source>
         <translation>çabuk</translation>
     </message>
-    <message>
-        <source>Send as zero-fee transaction if possible</source>
-        <translation>Mümkünse ücretsiz muamele olarak gönder</translation>
-    </message>
-    <message>
-        <source>(confirmation may take longer)</source>
-        <translation>(teyit daha uzun süre alabilir)</translation>
-    </message>
     <message>
         <source>Send to multiple recipients at once</source>
         <translation>Birçok alıcıya aynı anda gönder</translation>
@@ -2061,844 +1526,210 @@
         <source>S&amp;end</source>
         <translation>G&amp;önder</translation>
     </message>
-    <message>
-        <source>Confirm send coins</source>
-        <translation>Gönderiyi teyit ediniz</translation>
-    </message>
-    <message>
-        <source>%1 to %2</source>
-        <translation>%1 öğesinden %2 unsuruna</translation>
-    </message>
-    <message>
-        <source>Copy quantity</source>
-        <translation>Miktarı kopyala</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>Meblağı kopyala</translation>
-    </message>
-    <message>
-        <source>Copy fee</source>
-        <translation>Ücreti kopyala</translation>
-    </message>
-    <message>
-        <source>Copy after fee</source>
-        <translation>Ücretten sonrakini kopyala</translation>
-    </message>
-    <message>
-        <source>Copy bytes</source>
-        <translation>Baytları kopyala</translation>
-    </message>
-    <message>
-        <source>Copy priority</source>
-        <translation>Önceliği kopyala</translation>
-    </message>
-    <message>
-        <source>Copy change</source>
-        <translation>Para üstünü kopyala</translation>
-    </message>
-    <message>
-        <source>Total Amount %1</source>
-        <translation>Toplam Meblağ %1</translation>
-    </message>
-    <message>
-        <source>or</source>
-        <translation>veya</translation>
-    </message>
-    <message>
-        <source>The amount to pay must be larger than 0.</source>
-        <translation>Ödeyeceğiniz tutarın sıfırdan yüksek olması gerekir.</translation>
-    </message>
-    <message>
-        <source>The amount exceeds your balance.</source>
-        <translation>Tutar bakiyenizden yüksektir.</translation>
-    </message>
-    <message>
-        <source>The total exceeds your balance when the %1 transaction fee is included.</source>
-        <translation>Toplam, %1 muamele ücreti ilâve edildiğinde bakiyenizi geçmektedir.</translation>
-    </message>
-    <message>
-        <source>Transaction creation failed!</source>
-        <translation>Muamelenin oluşturulması başarısız oldu!</translation>
-    </message>
-    <message>
-        <source>The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source>
-        <translation>Muamele reddedildi! Cüzdanınızdaki madenî paraların bazıları zaten harcanmış olduğunda bu meydana gelebilir. Örneğin wallet.dat dosyasının bir kopyasını kullandıysanız ve kopyada para harcandığında ancak burada harcandığı işaretlenmediğinde.</translation>
-    </message>
-    <message>
-        <source>A fee higher than %1 is considered an absurdly high fee.</source>
-        <translation>%1 tutarından yüksek ücret saçma derecede yüksek bir ücret olarak kabul edilir.</translation>
-    </message>
-    <message>
-        <source>Payment request expired.</source>
-        <translation>Ödeme talebinin ömrü doldu.</translation>
-    </message>
-    <message>
-        <source>Pay only the required fee of %1</source>
-        <translation>Sadece gerekli ücret olan %1 tutarını öde</translation>
-    </message>
-    <message numerus="yes">
-        <source>Estimated to begin confirmation within %n block(s).</source>
-        <translation><numerusform>Tahmini olarak %n blok içinde teyide başlanacaktır.</numerusform><numerusform>Tahmini olarak %n blok içinde teyide başlanacaktır.</numerusform></translation>
-    </message>
-    <message>
-        <source>The recipient address is not valid. Please recheck.</source>
-        <translation>Alıcı adresi geçerli değildir. Lütfen denetleyiniz.</translation>
-    </message>
-    <message>
-        <source>Duplicate address found: addresses should only be used once each.</source>
-        <translation>Çift adres bulundu: adresler herbiri için sadece bir kez kullanılmalıdır.</translation>
-    </message>
-    <message>
-        <source>Warning: Invalid Bitcoin address</source>
-        <translation>Uyarı: geçersiz Bitcoin adresi</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(boş etiket)</translation>
-    </message>
-    <message>
-        <source>Warning: Unknown change address</source>
-        <translation>Uyarı: geçersiz para üstü adresi</translation>
-    </message>
-    <message>
-        <source>Copy dust</source>
-        <translation>Tozu kopyala</translation>
-    </message>
-    <message>
-        <source>Are you sure you want to send?</source>
-        <translation>Göndermek istediğinizden emin misiniz?</translation>
-    </message>
-    <message>
-        <source>added as transaction fee</source>
-        <translation>muamele ücreti olarak eklendi</translation>
-    </message>
 </context>
-<context>
-    <name>SendCoinsEntry</name>
-    <message>
-        <source>A&amp;mount:</source>
-        <translation>Mebla&amp;ğ:</translation>
-    </message>
-    <message>
-        <source>Pay &amp;To:</source>
-        <translation>&amp;Şu adrese öde:</translation>
-    </message>
-    <message>
-        <source>Enter a label for this address to add it to your address book</source>
-        <translation>Adres defterinize eklemek için bu adrese ilişik bir etiket giriniz</translation>
-    </message>
-    <message>
-        <source>&amp;Label:</source>
-        <translation>&amp;Etiket:</translation>
-    </message>
-    <message>
-        <source>Choose previously used address</source>
-        <translation>Önceden kullanılmış adres seç</translation>
-    </message>
-    <message>
-        <source>This is a normal payment.</source>
-        <translation>Bu, normal bir ödemedir.</translation>
-    </message>
-    <message>
-        <source>The Bitcoin address to send the payment to</source>
-        <translation>Ödemenin yollanacağı Bitcoin adresi</translation>
-    </message>
-    <message>
-        <source>Alt+A</source>
-        <translation>Alt+A</translation>
-    </message>
-    <message>
-        <source>Paste address from clipboard</source>
-        <translation>Panodan adres yapıştır</translation>
-    </message>
-    <message>
-        <source>Alt+P</source>
-        <translation>Alt+P</translation>
-    </message>
-    <message>
-        <source>Remove this entry</source>
-        <translation>Bu unsuru kaldır</translation>
-    </message>
-    <message>
-        <source>The fee will be deducted from the amount being sent. The recipient will receive less bitcoins than you enter in the amount field. If multiple recipients are selected, the fee is split equally.</source>
-        <translation>Ücret yollanan meblağdan alınacaktır. Alıcı meblağ alanında girdiğinizden daha az bitcoin alacaktır.  Eğer birden çok alıcı seçiliyse ücret eşit olarak bölünecektir.</translation>
-    </message>
-    <message>
-        <source>S&amp;ubtract fee from amount</source>
-        <translation>Ücreti meblağdan düş</translation>
-    </message>
-    <message>
-        <source>Message:</source>
-        <translation>Mesaj:</translation>
-    </message>
-    <message>
-        <source>This is an unauthenticated payment request.</source>
-        <translation>Bu, kimliği doğrulanmamış bir ödeme talebidir.</translation>
-    </message>
-    <message>
-        <source>This is an authenticated payment request.</source>
-        <translation>Bu, kimliği doğrulanmış bir ödeme talebidir.</translation>
-    </message>
-    <message>
-        <source>Enter a label for this address to add it to the list of used addresses</source>
-        <translation>Kullanılmış adres listesine eklemek için bu adrese bir etiket girin</translation>
-    </message>
-    <message>
-        <source>A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
-        <translation>Bitcoin: URI'siyle ilişkili ve bilginiz için muameleyle saklanacak bir mesaj. Not: Bu mesaj Bitcoin şebekesi üzerinden gönderilmeyecektir.</translation>
-    </message>
-    <message>
-        <source>Pay To:</source>
-        <translation>Şu adrese öde:</translation>
-    </message>
-    <message>
-        <source>Memo:</source>
-        <translation>Not:</translation>
-    </message>
-</context>
-<context>
-    <name>ShutdownWindow</name>
-    <message>
-        <source>Bitcoin Core is shutting down...</source>
-        <translation>Bitcoin Çekirdeği kapanıyor...</translation>
-    </message>
-    <message>
-        <source>Do not shut down the computer until this window disappears.</source>
-        <translation>Bu pencere kalkıncaya dek bilgisayarı kapatmayınız.</translation>
-    </message>
-</context>
-<context>
-    <name>SignVerifyMessageDialog</name>
-    <message>
-        <source>Signatures - Sign / Verify a Message</source>
-        <translation>İmzalar - Mesaj İmzala / Kontrol et</translation>
-    </message>
-    <message>
-        <source>&amp;Sign Message</source>
-        <translation>Mesaj &amp;imzala</translation>
-    </message>
-    <message>
-        <source>You can sign messages/agreements with your addresses to prove you can receive bitcoins sent to them. Be careful not to sign anything vague or random, as phishing attacks may try to trick you into signing your identity over to them. Only sign fully-detailed statements you agree to.</source>
-        <translation>Adreslerinize yollanan bitcoinleri alabileceğiniz ispatlamak için adreslerinizle mesaj/anlaşma imzalayabilirsiniz. Oltalama saldırılarının kimliğinizi imzanızla elde etmeyi deneyebilecekleri için belirsiz ya da rastgele hiçbir şey imzalamamaya dikkat ediniz. Sadece ayrıntılı açıklaması olan ve tümüne katıldığınız ifadeleri imzalayınız.</translation>
-    </message>
-    <message>
-        <source>The Bitcoin address to sign the message with</source>
-        <translation>Mesajın imzalanmasında kullanılacak Bitcoin adresi</translation>
-    </message>
-    <message>
-        <source>Choose previously used address</source>
-        <translation>Önceden kullanılmış adres seç</translation>
-    </message>
-    <message>
-        <source>Alt+A</source>
-        <translation>Alt+A</translation>
-    </message>
-    <message>
-        <source>Paste address from clipboard</source>
-        <translation>Panodan adres yapıştır</translation>
-    </message>
-    <message>
-        <source>Alt+P</source>
-        <translation>Alt+P</translation>
-    </message>
-    <message>
-        <source>Enter the message you want to sign here</source>
-        <translation>İmzalamak istediğiniz mesajı burada giriniz</translation>
-    </message>
-    <message>
-        <source>Signature</source>
-        <translation>İmza</translation>
-    </message>
-    <message>
-        <source>Copy the current signature to the system clipboard</source>
-        <translation>Güncel imzayı sistem panosuna kopyala</translation>
-    </message>
-    <message>
-        <source>Sign the message to prove you own this Bitcoin address</source>
-        <translation>Bu Bitcoin adresinin sizin olduğunu ispatlamak için mesajı imzalayın</translation>
-    </message>
-    <message>
-        <source>Sign &amp;Message</source>
-        <translation>&amp;Mesajı imzala</translation>
-    </message>
-    <message>
-        <source>Reset all sign message fields</source>
-        <translation>Tüm mesaj alanlarını sıfırla</translation>
-    </message>
-    <message>
-        <source>Clear &amp;All</source>
-        <translation>Tümünü &amp;temizle</translation>
-    </message>
-    <message>
-        <source>&amp;Verify Message</source>
-        <translation>Mesaj &amp;kontrol et</translation>
-    </message>
-    <message>
-        <source>Enter the receiver's address, message (ensure you copy line breaks, spaces, tabs, etc. exactly) and signature below to verify the message. Be careful not to read more into the signature than what is in the signed message itself, to avoid being tricked by a man-in-the-middle attack. Note that this only proves the signing party receives with the address, it cannot prove sendership of any transaction!</source>
-        <translation>Alıcının adresini, mesajı (satır sonları, boşluklar, sekmeler vs. karakterleri tam olarak kopyaladığınızdan emin olunuz) ve imzayı aşağıda giriniz. Bir ortadaki adam saldırısı tarafından kandırılmaya mâni olmak için imzadan, imzalı mesajın içeriğini aşan bir anlam çıkarmamaya dikkat ediniz. Bunun sadece imzalayan tarafın adres ile alım yapabildiğini ispatladığını ve herhangi bir muamelenin gönderi tarafını kanıtlayamayacağını unutmayınız!</translation>
-    </message>
-    <message>
-        <source>The Bitcoin address the message was signed with</source>
-        <translation>Mesajın imzalanmasında kullanılan Bitcoin adresi</translation>
-    </message>
-    <message>
-        <source>Verify the message to ensure it was signed with the specified Bitcoin address</source>
-        <translation>Belirtilen Bitcoin adresi ile imzalandığını doğrulamak için mesajı kontrol et</translation>
-    </message>
-    <message>
-        <source>Verify &amp;Message</source>
-        <translation>&amp;Mesaj kontrol et</translation>
-    </message>
-    <message>
-        <source>Reset all verify message fields</source>
-        <translation>Tüm mesaj kontrolü alanlarını sıfırla</translation>
-    </message>
-    <message>
-        <source>Click "Sign Message" to generate signature</source>
-        <translation>İmzayı oluşturmak için "Mesaj İmzala" unsurunu tıklayın</translation>
-    </message>
-    <message>
-        <source>The entered address is invalid.</source>
-        <translation>Girilen adres geçersizdir.</translation>
-    </message>
-    <message>
-        <source>Please check the address and try again.</source>
-        <translation>Adresi kontrol edip tekrar deneyiniz.</translation>
-    </message>
-    <message>
-        <source>The entered address does not refer to a key.</source>
-        <translation>Girilen adres herhangi bir anahtara işaret etmemektedir.</translation>
-    </message>
-    <message>
-        <source>Wallet unlock was cancelled.</source>
-        <translation>Cüzdan kilidinin açılması iptal edildi.</translation>
-    </message>
-    <message>
-        <source>Private key for the entered address is not available.</source>
-        <translation>Girilen adres için özel anahtar mevcut değildir.</translation>
-    </message>
-    <message>
-        <source>Message signing failed.</source>
-        <translation>Mesajın imzalanması başarısız oldu.</translation>
-    </message>
-    <message>
-        <source>Message signed.</source>
-        <translation>Mesaj imzalandı.</translation>
-    </message>
-    <message>
-        <source>The signature could not be decoded.</source>
-        <translation>İmzanın kodu çözülemedi.</translation>
-    </message>
-    <message>
-        <source>Please check the signature and try again.</source>
-        <translation>İmzayı kontrol edip tekrar deneyiniz.</translation>
-    </message>
-    <message>
-        <source>The signature did not match the message digest.</source>
-        <translation>İmza mesajın hash değeri ile eşleşmedi.</translation>
-    </message>
-    <message>
-        <source>Message verification failed.</source>
-        <translation>Mesaj doğrulaması başarısız oldu.</translation>
-    </message>
-    <message>
-        <source>Message verified.</source>
-        <translation>Mesaj doğrulandı.</translation>
-    </message>
-</context>
-<context>
-    <name>SplashScreen</name>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Bitcoin Çekirdeği</translation>
-    </message>
-    <message>
-        <source>The Bitcoin Core developers</source>
-        <translation>Bitcoin Çekirdeği geliştiricileri</translation>
-    </message>
-    <message>
-        <source>[testnet]</source>
-        <translation>[testnet]</translation>
-    </message>
-</context>
-<context>
-    <name>TrafficGraphWidget</name>
-    <message>
-        <source>KB/s</source>
-        <translation>KB/s</translation>
-    </message>
-</context>
-<context>
-    <name>TransactionDesc</name>
-    <message>
-        <source>Open until %1</source>
-        <translation>%1 değerine dek açık</translation>
-    </message>
-    <message>
-        <source>conflicted</source>
-        <translation>çakışma</translation>
-    </message>
-    <message>
-        <source>%1/offline</source>
-        <translation>%1/çevrim dışı</translation>
-    </message>
-    <message>
-        <source>%1/unconfirmed</source>
-        <translation>%1/doğrulanmadı</translation>
-    </message>
-    <message>
-        <source>%1 confirmations</source>
-        <translation>%1 teyit</translation>
-    </message>
-    <message>
-        <source>Status</source>
-        <translation>Durum</translation>
-    </message>
-    <message numerus="yes">
-        <source>, broadcast through %n node(s)</source>
-        <translation><numerusform>, %n düğüm vasıtasıyla yayınlandı</numerusform><numerusform>, %n düğüm vasıtasıyla yayınlandı</numerusform></translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation>Tarih</translation>
-    </message>
-    <message>
-        <source>Source</source>
-        <translation>Kaynak</translation>
-    </message>
-    <message>
-        <source>Generated</source>
-        <translation>Oluşturuldu</translation>
-    </message>
-    <message>
-        <source>From</source>
-        <translation>Gönderen</translation>
-    </message>
-    <message>
-        <source>To</source>
-        <translation>Alıcı</translation>
-    </message>
-    <message>
-        <source>own address</source>
-        <translation>kendi adresiniz</translation>
-    </message>
-    <message>
-        <source>watch-only</source>
-        <translation>sadece-izlenen</translation>
-    </message>
-    <message>
-        <source>label</source>
-        <translation>etiket</translation>
-    </message>
-    <message>
-        <source>Credit</source>
-        <translation>Gider</translation>
-    </message>
-    <message numerus="yes">
-        <source>matures in %n more block(s)</source>
-        <translation><numerusform>%n ek blok sonrasında olgunlaşacak</numerusform><numerusform>%n ek blok sonrasında olgunlaşacak</numerusform></translation>
-    </message>
-    <message>
-        <source>not accepted</source>
-        <translation>kabul edilmedi</translation>
-    </message>
-    <message>
-        <source>Debit</source>
-        <translation>Gelir</translation>
-    </message>
-    <message>
-        <source>Total debit</source>
-        <translation>Toplam gider</translation>
-    </message>
-    <message>
-        <source>Total credit</source>
-        <translation>Toplam gelir</translation>
-    </message>
-    <message>
-        <source>Transaction fee</source>
-        <translation>Muamele ücreti</translation>
-    </message>
-    <message>
-        <source>Net amount</source>
-        <translation>Net meblağ</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>Mesaj</translation>
-    </message>
-    <message>
-        <source>Comment</source>
-        <translation>Yorum</translation>
-    </message>
-    <message>
-        <source>Transaction ID</source>
-        <translation>Muamele tanımlayıcı</translation>
-    </message>
-    <message>
-        <source>Merchant</source>
-        <translation>Tüccar</translation>
-    </message>
-    <message>
-        <source>Generated coins must mature %1 blocks before they can be spent. When you generated this block, it was broadcast to the network to be added to the block chain. If it fails to get into the chain, its state will change to "not accepted" and it won't be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source>
-        <translation>Oluşturulan bitcoin'lerin harcanabilmelerinden önce %1 blok beklemeleri gerekmektedir. Bu blok, oluşturduğunuzda, blok zincirine eklenmesi için ağda yayınlandı. Zincire eklenmesi başarısız olursa, durumu "kabul edilmedi" olarak değiştirilecek ve harcanamayacaktır. Bu, bazen başka bir düğüm sizden birkaç saniye önce ya da sonra blok oluşturursa meydana gelebilir.</translation>
-    </message>
-    <message>
-        <source>Debug information</source>
-        <translation>Hata ayıklama verileri</translation>
-    </message>
-    <message>
-        <source>Transaction</source>
-        <translation>Muamele</translation>
-    </message>
-    <message>
-        <source>Inputs</source>
-        <translation>Girdiler</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>Meblağ</translation>
-    </message>
-    <message>
-        <source>true</source>
-        <translation>doğru</translation>
-    </message>
-    <message>
-        <source>false</source>
-        <translation>yanlış</translation>
-    </message>
-    <message>
-        <source>, has not been successfully broadcast yet</source>
-        <translation>, henüz başarılı bir şekilde yayınlanmadı</translation>
-    </message>
-    <message numerus="yes">
-        <source>Open for %n more block(s)</source>
-        <translation><numerusform>%n ilâve blok için açık</numerusform><numerusform>%n ilâve blok için açık</numerusform></translation>
-    </message>
-    <message>
-        <source>unknown</source>
-        <translation>bilinmiyor</translation>
-    </message>
-</context>
-<context>
-    <name>TransactionDescDialog</name>
-    <message>
-        <source>Transaction details</source>
-        <translation>Muamele detayları</translation>
-    </message>
-    <message>
-        <source>This pane shows a detailed description of the transaction</source>
-        <translation>Bu pano muamelenin ayrıntılı açıklamasını gösterir</translation>
-    </message>
-</context>
-<context>
-    <name>TransactionTableModel</name>
-    <message>
-        <source>Date</source>
-        <translation>Tarih</translation>
-    </message>
-    <message>
-        <source>Type</source>
-        <translation>Tür</translation>
-    </message>
-    <message>
-        <source>Immature (%1 confirmations, will be available after %2)</source>
-        <translation>Olgunlaşmamış (%1 teyit, %2 teyit ardından kullanılabilir olacaktır)</translation>
-    </message>
-    <message numerus="yes">
-        <source>Open for %n more block(s)</source>
-        <translation><numerusform>%n ilâve blok için açık</numerusform><numerusform>%n ilâve blok için açık</numerusform></translation>
-    </message>
-    <message>
-        <source>Open until %1</source>
-        <translation>%1 değerine dek açık</translation>
-    </message>
-    <message>
-        <source>Confirmed (%1 confirmations)</source>
-        <translation>Doğrulandı (%1 teyit)</translation>
-    </message>
-    <message>
-        <source>This block was not received by any other nodes and will probably not be accepted!</source>
-        <translation>Bu blok başka hiçbir düğüm tarafından alınmamıştır ve muhtemelen kabul edilmeyecektir!</translation>
-    </message>
-    <message>
-        <source>Generated but not accepted</source>
-        <translation>Oluşturuldu ama kabul edilmedi</translation>
-    </message>
-    <message>
-        <source>Offline</source>
-        <translation>Çevrim dışı</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Etiket</translation>
-    </message>
-    <message>
-        <source>Unconfirmed</source>
-        <translation>Teyit edilmemiş</translation>
-    </message>
-    <message>
-        <source>Confirming (%1 of %2 recommended confirmations)</source>
-        <translation>Teyit ediliyor (tavsiye edilen %2 teyit üzerinden %1 doğrulama)</translation>
-    </message>
-    <message>
-        <source>Conflicted</source>
-        <translation>Çakışma</translation>
-    </message>
-    <message>
-        <source>Received with</source>
-        <translation>Şununla alındı</translation>
-    </message>
-    <message>
-        <source>Received from</source>
-        <translation>Alındığı kişi</translation>
-    </message>
-    <message>
-        <source>Sent to</source>
-        <translation>Gönderildiği adres</translation>
-    </message>
-    <message>
-        <source>Payment to yourself</source>
-        <translation>Kendinize ödeme</translation>
-    </message>
-    <message>
-        <source>Mined</source>
-        <translation>Madenden çıkarılan</translation>
-    </message>
-    <message>
-        <source>watch-only</source>
-        <translation>sadece-izlenen</translation>
-    </message>
-    <message>
-        <source>(n/a)</source>
-        <translation>(mevcut değil)</translation>
-    </message>
+<context>
+    <name>SendCoinsEntry</name>
     <message>
-        <source>Transaction status. Hover over this field to show number of confirmations.</source>
-        <translation>Muamele durumu. Doğrulama sayısını görüntülemek için imleci bu alanda tutunuz.</translation>
+        <source>A&amp;mount:</source>
+        <translation>Mebla&amp;ğ:</translation>
     </message>
     <message>
-        <source>Date and time that the transaction was received.</source>
-        <translation>Muamelenin alındığı tarih ve zaman.</translation>
+        <source>Pay &amp;To:</source>
+        <translation>&amp;Şu adrese öde:</translation>
     </message>
     <message>
-        <source>Type of transaction.</source>
-        <translation>Muamele türü.</translation>
+        <source>&amp;Label:</source>
+        <translation>&amp;Etiket:</translation>
     </message>
     <message>
-        <source>Whether or not a watch-only address is involved in this transaction.</source>
-        <translation>Bu muamelede sadece izlenen bir adresin bulunup bulunmadığı.</translation>
+        <source>Choose previously used address</source>
+        <translation>Önceden kullanılmış adres seç</translation>
     </message>
     <message>
-        <source>User-defined intent/purpose of the transaction.</source>
-        <translation>Muamelenin kullanıcı tanımlı niyeti/amacı.</translation>
+        <source>This is a normal payment.</source>
+        <translation>Bu, normal bir ödemedir.</translation>
     </message>
     <message>
-        <source>Amount removed from or added to balance.</source>
-        <translation>Bakiyeden alınan ya da bakiyeye eklenen meblağ.</translation>
+        <source>The Bitcoin address to send the payment to</source>
+        <translation>Ödemenin yollanacağı Bitcoin adresi</translation>
     </message>
-</context>
-<context>
-    <name>TransactionView</name>
     <message>
-        <source>All</source>
-        <translation>Hepsi</translation>
+        <source>Alt+A</source>
+        <translation>Alt+A</translation>
     </message>
     <message>
-        <source>Today</source>
-        <translation>Bugün</translation>
+        <source>Paste address from clipboard</source>
+        <translation>Panodan adres yapıştır</translation>
     </message>
     <message>
-        <source>This week</source>
-        <translation>Bu hafta</translation>
+        <source>Alt+P</source>
+        <translation>Alt+P</translation>
     </message>
     <message>
-        <source>This month</source>
-        <translation>Bu ay</translation>
+        <source>Remove this entry</source>
+        <translation>Bu unsuru kaldır</translation>
     </message>
     <message>
-        <source>Last month</source>
-        <translation>Geçen ay</translation>
+        <source>The fee will be deducted from the amount being sent. The recipient will receive less bitcoins than you enter in the amount field. If multiple recipients are selected, the fee is split equally.</source>
+        <translation>Ücret yollanan meblağdan alınacaktır. Alıcı meblağ alanında girdiğinizden daha az bitcoin alacaktır.  Eğer birden çok alıcı seçiliyse ücret eşit olarak bölünecektir.</translation>
     </message>
     <message>
-        <source>This year</source>
-        <translation>Bu sene</translation>
+        <source>S&amp;ubtract fee from amount</source>
+        <translation>Ücreti meblağdan düş</translation>
     </message>
     <message>
-        <source>Range...</source>
-        <translation>Aralık...</translation>
+        <source>Message:</source>
+        <translation>Mesaj:</translation>
     </message>
     <message>
-        <source>Received with</source>
-        <translation>Şununla alınan</translation>
+        <source>This is an unauthenticated payment request.</source>
+        <translation>Bu, kimliği doğrulanmamış bir ödeme talebidir.</translation>
     </message>
     <message>
-        <source>Sent to</source>
-        <translation>Gönderildiği adres</translation>
+        <source>This is an authenticated payment request.</source>
+        <translation>Bu, kimliği doğrulanmış bir ödeme talebidir.</translation>
     </message>
     <message>
-        <source>To yourself</source>
-        <translation>Kendinize</translation>
+        <source>Enter a label for this address to add it to the list of used addresses</source>
+        <translation>Kullanılmış adres listesine eklemek için bu adrese bir etiket girin</translation>
     </message>
     <message>
-        <source>Mined</source>
-        <translation>Oluşturulan</translation>
+        <source>A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
+        <translation>Bitcoin: URI'siyle ilişkili ve bilginiz için muameleyle saklanacak bir mesaj. Not: Bu mesaj Bitcoin şebekesi üzerinden gönderilmeyecektir.</translation>
     </message>
     <message>
-        <source>Other</source>
-        <translation>Diğer</translation>
+        <source>Pay To:</source>
+        <translation>Şu adrese öde:</translation>
     </message>
     <message>
-        <source>Enter address or label to search</source>
-        <translation>Aranacak adres ya da etiket giriniz</translation>
+        <source>Memo:</source>
+        <translation>Not:</translation>
     </message>
+</context>
+<context>
+    <name>ShutdownWindow</name>
     <message>
-        <source>Min amount</source>
-        <translation>Asgari meblağ</translation>
+        <source>%1 is shutting down...</source>
+        <translation>%1 kapanıyor...</translation>
     </message>
     <message>
-        <source>Copy address</source>
-        <translation>Adresi kopyala</translation>
+        <source>Do not shut down the computer until this window disappears.</source>
+        <translation>Bu pencere kalkıncaya dek bilgisayarı kapatmayınız.</translation>
     </message>
+</context>
+<context>
+    <name>SignVerifyMessageDialog</name>
     <message>
-        <source>Copy label</source>
-        <translation>Etiketi kopyala</translation>
+        <source>Signatures - Sign / Verify a Message</source>
+        <translation>İmzalar - Mesaj İmzala / Kontrol et</translation>
     </message>
     <message>
-        <source>Copy amount</source>
-        <translation>Meblağı kopyala</translation>
+        <source>&amp;Sign Message</source>
+        <translation>Mesaj &amp;imzala</translation>
     </message>
     <message>
-        <source>Copy transaction ID</source>
-        <translation>Muamele kimliğini kopyala</translation>
+        <source>You can sign messages/agreements with your addresses to prove you can receive bitcoins sent to them. Be careful not to sign anything vague or random, as phishing attacks may try to trick you into signing your identity over to them. Only sign fully-detailed statements you agree to.</source>
+        <translation>Adreslerinize yollanan bitcoinleri alabileceğiniz ispatlamak için adreslerinizle mesaj/anlaşma imzalayabilirsiniz. Oltalama saldırılarının kimliğinizi imzanızla elde etmeyi deneyebilecekleri için belirsiz ya da rastgele hiçbir şey imzalamamaya dikkat ediniz. Sadece ayrıntılı açıklaması olan ve tümüne katıldığınız ifadeleri imzalayınız.</translation>
     </message>
     <message>
-        <source>Copy raw transaction</source>
-        <translation>Ham muameleyi kopyala</translation>
+        <source>The Bitcoin address to sign the message with</source>
+        <translation>Mesajın imzalanmasında kullanılacak Bitcoin adresi</translation>
     </message>
     <message>
-        <source>Edit label</source>
-        <translation>Etiketi düzenle</translation>
+        <source>Choose previously used address</source>
+        <translation>Önceden kullanılmış adres seç</translation>
     </message>
     <message>
-        <source>Show transaction details</source>
-        <translation>Muamele detaylarını göster</translation>
+        <source>Alt+A</source>
+        <translation>Alt+A</translation>
     </message>
     <message>
-        <source>Export Transaction History</source>
-        <translation>Muamele tarihçesini dışa aktar</translation>
+        <source>Paste address from clipboard</source>
+        <translation>Panodan adres yapıştır</translation>
     </message>
     <message>
-        <source>Watch-only</source>
-        <translation>Sadece izlenen</translation>
+        <source>Alt+P</source>
+        <translation>Alt+P</translation>
     </message>
     <message>
-        <source>Exporting Failed</source>
-        <translation>Dışa aktarım başarısız oldu</translation>
+        <source>Enter the message you want to sign here</source>
+        <translation>İmzalamak istediğiniz mesajı burada giriniz</translation>
     </message>
     <message>
-        <source>There was an error trying to save the transaction history to %1.</source>
-        <translation>Muamele tarihçesinin %1 konumuna kaydedilmesi sırasında bir hata meydana geldi.</translation>
+        <source>Signature</source>
+        <translation>İmza</translation>
     </message>
     <message>
-        <source>Exporting Successful</source>
-        <translation>Dışa aktarım başarılı oldu</translation>
+        <source>Copy the current signature to the system clipboard</source>
+        <translation>Güncel imzayı sistem panosuna kopyala</translation>
     </message>
     <message>
-        <source>The transaction history was successfully saved to %1.</source>
-        <translation>Muamele tarihçesi başarılı bir şekilde %1 konumuna kaydedildi.</translation>
+        <source>Sign the message to prove you own this Bitcoin address</source>
+        <translation>Bu Bitcoin adresinin sizin olduğunu ispatlamak için mesajı imzalayın</translation>
     </message>
     <message>
-        <source>Comma separated file (*.csv)</source>
-        <translation>Virgülle ayrılmış değerler dosyası (*.csv)</translation>
+        <source>Sign &amp;Message</source>
+        <translation>&amp;Mesajı imzala</translation>
     </message>
     <message>
-        <source>Confirmed</source>
-        <translation>Doğrulandı</translation>
+        <source>Reset all sign message fields</source>
+        <translation>Tüm mesaj alanlarını sıfırla</translation>
     </message>
     <message>
-        <source>Date</source>
-        <translation>Tarih</translation>
+        <source>Clear &amp;All</source>
+        <translation>Tümünü &amp;temizle</translation>
     </message>
     <message>
-        <source>Type</source>
-        <translation>Tür</translation>
+        <source>&amp;Verify Message</source>
+        <translation>Mesaj &amp;kontrol et</translation>
     </message>
     <message>
-        <source>Label</source>
-        <translation>Etiket</translation>
+        <source>Enter the receiver's address, message (ensure you copy line breaks, spaces, tabs, etc. exactly) and signature below to verify the message. Be careful not to read more into the signature than what is in the signed message itself, to avoid being tricked by a man-in-the-middle attack. Note that this only proves the signing party receives with the address, it cannot prove sendership of any transaction!</source>
+        <translation>Alıcının adresini, mesajı (satır sonları, boşluklar, sekmeler vs. karakterleri tam olarak kopyaladığınızdan emin olunuz) ve imzayı aşağıda giriniz. Bir ortadaki adam saldırısı tarafından kandırılmaya mâni olmak için imzadan, imzalı mesajın içeriğini aşan bir anlam çıkarmamaya dikkat ediniz. Bunun sadece imzalayan tarafın adres ile alım yapabildiğini ispatladığını ve herhangi bir muamelenin gönderi tarafını kanıtlayamayacağını unutmayınız!</translation>
     </message>
     <message>
-        <source>Address</source>
-        <translation>Adres</translation>
+        <source>The Bitcoin address the message was signed with</source>
+        <translation>Mesajın imzalanmasında kullanılan Bitcoin adresi</translation>
     </message>
     <message>
-        <source>ID</source>
-        <translation>Tanımlayıcı</translation>
+        <source>Verify the message to ensure it was signed with the specified Bitcoin address</source>
+        <translation>Belirtilen Bitcoin adresi ile imzalandığını doğrulamak için mesajı kontrol et</translation>
     </message>
     <message>
-        <source>Range:</source>
-        <translation>Aralık:</translation>
+        <source>Verify &amp;Message</source>
+        <translation>&amp;Mesaj kontrol et</translation>
     </message>
     <message>
-        <source>to</source>
-        <translation>ilâ</translation>
+        <source>Reset all verify message fields</source>
+        <translation>Tüm mesaj kontrolü alanlarını sıfırla</translation>
     </message>
 </context>
 <context>
-    <name>UnitDisplayStatusBarControl</name>
+    <name>SplashScreen</name>
     <message>
-        <source>Unit to show amounts in. Click to select another unit.</source>
-        <translation>Meblağları göstermek için birim. Başka bir birim seçmek için tıklayınız.</translation>
+        <source>[testnet]</source>
+        <translation>[testnet]</translation>
     </message>
 </context>
 <context>
-    <name>WalletFrame</name>
+    <name>TrafficGraphWidget</name>
     <message>
-        <source>No wallet has been loaded.</source>
-        <translation>Hiçbir cüzdan yüklenmemiştir.</translation>
+        <source>KB/s</source>
+        <translation>KB/s</translation>
     </message>
 </context>
 <context>
-    <name>WalletModel</name>
+    <name>TransactionDescDialog</name>
     <message>
-        <source>Send Coins</source>
-        <translation>Bitcoin yolla</translation>
+        <source>This pane shows a detailed description of the transaction</source>
+        <translation>Bu pano muamelenin ayrıntılı açıklamasını gösterir</translation>
     </message>
 </context>
 <context>
-    <name>WalletView</name>
-    <message>
-        <source>&amp;Export</source>
-        <translation>&amp;Dışa aktar</translation>
-    </message>
-    <message>
-        <source>Export the data in the current tab to a file</source>
-        <translation>Güncel sekmedeki verileri bir dosyaya aktar</translation>
-    </message>
-    <message>
-        <source>Backup Wallet</source>
-        <translation>Cüzdanı Yedekle</translation>
-    </message>
-    <message>
-        <source>Wallet Data (*.dat)</source>
-        <translation>Cüzdan verileri (*.dat)</translation>
-    </message>
-    <message>
-        <source>Backup Failed</source>
-        <translation>Yedekleme başarısız oldu</translation>
-    </message>
-    <message>
-        <source>There was an error trying to save the wallet data to %1.</source>
-        <translation>Cüzdan verilerinin %1 konumuna kaydedilmesi sırasında bir hata meydana geldi.</translation>
-    </message>
-    <message>
-        <source>The wallet data was successfully saved to %1.</source>
-        <translation>Cüzdan verileri %1 konumuna başarıyla kaydedildi.</translation>
-    </message>
+    <name>UnitDisplayStatusBarControl</name>
     <message>
-        <source>Backup Successful</source>
-        <translation>Yedekleme başarılı</translation>
+        <source>Unit to show amounts in. Click to select another unit.</source>
+        <translation>Meblağları göstermek için birim. Başka bir birim seçmek için tıklayınız.</translation>
     </message>
 </context>
 <context>
@@ -2927,14 +1758,6 @@
         <source>If &lt;category&gt; is not supplied or if &lt;category&gt; = 1, output all debugging information.</source>
         <translation>Eğer &lt;kategori&gt; belirtilmemişse ya da &lt;kategori&gt; = 1 ise, tüm hata ayıklama verilerini dök.</translation>
     </message>
-    <message>
-        <source>Maximum total fees (in %s) to use in a single wallet transaction; setting this too low may abort large transactions (default: %s)</source>
-        <translation>Tek cüzdan muamelesinde kullanılacak azami toplam ücret (%s olarak); bunu çok düşük olarak ayarlamak büyük muameleleri iptal edebilir (varsayılan: %s)</translation>
-    </message>
-    <message>
-        <source>Please check that your computer's date and time are correct! If your clock is wrong Bitcoin Core will not work properly.</source>
-        <translation>Lütfen bilgisayarınızın saat ve tarihinin doğru olduğunu kontol ediniz! Saatinizde gecikme varsa Bitcoin Çekirdeği doğru şekilde çalışamaz.</translation>
-    </message>
     <message>
         <source>Prune configured below the minimum of %d MiB.  Please use a higher number.</source>
         <translation>Budama, asgari değer olan %d MiB'den düşük olarak ayarlanmıştır. Lütfen daha yüksek bir sayı kullanınız.</translation>
@@ -2975,6 +1798,14 @@
         <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
         <translation>Dışarıdan gelen bağlantıları kabul et (varsayılan: -proxy veya -connect yoksa 1)</translation>
     </message>
+    <message>
+        <source>Bitcoin Core</source>
+        <translation>Bitcoin Çekirdeği</translation>
+    </message>
+    <message>
+        <source>The %s developers</source>
+        <translation>%s geliştiricileri</translation>
+    </message>
     <message>
         <source>-fallbackfee is set very high! This is the transaction fee you may pay when fee estimates are not available.</source>
         <translation>-fallbackfee çok yüksek bir değere ayarlanmış! Ücret tahminleri mevcut değilken ödeyebileceğiniz muamele ücretidir bu.</translation>
@@ -2991,6 +1822,10 @@
         <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source>
         <translation>Belirtilen adrese bağlan ve daima ondan dinle. IPv6 için [makine]:port yazımını kullanınız</translation>
     </message>
+    <message>
+        <source>Cannot obtain a lock on data directory %s. %s is probably already running.</source>
+        <translation>%s veri dizininde kilit elde edilemedi. %s muhtemelen hâlihazırda çalışmaktadır.</translation>
+    </message>
     <message>
         <source>Delete all wallet transactions and only recover those parts of the blockchain through -rescan on startup</source>
         <translation>Tüm cüzdan muamelelerini sil ve başlangıçta -rescan ile sadece blok zincirinin parçası olanları geri getir</translation>
@@ -2999,6 +1834,10 @@
         <source>Distributed under the MIT software license, see the accompanying file COPYING or &lt;http://www.opensource.org/licenses/mit-license.php&gt;.</source>
         <translation>MIT yazılım lisansı kapsamında yayınlanmıştır, ekteki COPYING dosyasına ya da &lt;http://www.opensource.org/licenses/mit-license.php&gt; adresine bakınız.</translation>
     </message>
+    <message>
+        <source>Error reading %s! All keys read correctly, but transaction data or address book entries might be missing or incorrect.</source>
+        <translation>%s dosyasının okunması sırasında bir hata meydana geldi! Tüm anahtarlar doğru bir şekilde okundu, ancak muamele verileri ya da adres defteri unsurları hatalı veya eksik olabilir.</translation>
+    </message>
     <message>
         <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source>
         <translation>Bir cüzdan muamelesi değiştiğinde komutu çalıştır (komuttaki %s muamele kimliği ile değiştirilecektir)</translation>
@@ -3007,6 +1846,18 @@
         <source>Force relay of transactions from whitelisted peers even they violate local relay policy (default: %d)</source>
         <translation>Yerel aktarma politikasını ihlal ettiklerinde bile beyaz listedeki eşlerden gelen muamelelerin aktarılmasını zorla (varsayılan: %d)</translation>
     </message>
+    <message>
+        <source>Maximum allowed median peer time offset adjustment. Local perspective of time may be influenced by peers forward or backward by this amount. (default: %u seconds)</source>
+        <translation>Müsaade edilen azami medyan eş zamanı değişiklik sınırının ayarlaması. Zamanın yerel perspektifi bu miktar kadar ileri ya da geri eşler tarafından etkilenebilir. (Varsayılan %u saniye)</translation>
+    </message>
+    <message>
+        <source>Maximum total fees (in %s) to use in a single wallet transaction or raw transaction; setting this too low may abort large transactions (default: %s)</source>
+        <translation>Tek cüzdan muamelesinde ya da ham muamelede kullanılacak azami toplam ücret (%s olarak); bunu çok düşük olarak ayarlamak büyük muameleleri iptal edebilir (varsayılan: %s)</translation>
+    </message>
+    <message>
+        <source>Please check that your computer's date and time are correct! If your clock is wrong, %s will not work properly.</source>
+        <translation>Lütfen bilgisayarınızın saat ve tarihinin doğru olduğunu kontrol ediniz! Saatinizde gecikme varsa %s doğru şekilde çalışamaz.</translation>
+    </message>
     <message>
         <source>Set the number of script verification threads (%u to %d, 0 = auto, &lt;0 = leave that many cores free, default: %d)</source>
         <translation>Betik kontrolü iş parçacıklarının sayısını belirler (%u ilâ %d, 0 = otomatik, &lt;0 = bu sayıda çekirdeği kullanma, varsayılan: %d)</translation>
@@ -3019,14 +1870,6 @@
         <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
         <translation>Bu yayın öncesi bir deneme sürümüdür - tüm riski siz üstlenmiş olursunuz - bitcoin oluşturmak ya da ticari uygulamalar için kullanmayınız</translation>
     </message>
-    <message>
-        <source>Unable to bind to %s on this computer. Bitcoin Core is probably already running.</source>
-        <translation>Bu bilgisayarda %s unsuruna bağlanılamadı. Bitcoin Çekirdeği muhtemelen hâlihazırda çalışmaktadır.</translation>
-    </message>
-    <message>
-        <source>Unsupported argument -whitelistalwaysrelay ignored, use -whitelistrelay and/or -whitelistforcerelay.</source>
-        <translation>Desteklenmeyen argüman -whitelistalwaysrelay görmezden gelindi, -whitelistrelay ve/veya -whitelistforcerelay kullanın.</translation>
-    </message>
     <message>
         <source>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</source>
         <translation>Dinlenecek portu haritalamak için UPnP kullan (varsayılan: dinlenildiğinde ve -proxy olmadığında 1)</translation>
@@ -3043,22 +1886,22 @@
         <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source>
         <translation>Uyarı: şebeke tamamen mutabık değil gibi görünüyor! Bazı madenciler sorun yaşıyor gibi görünüyor.</translation>
     </message>
-    <message>
-        <source>Warning: Unknown block versions being mined! It's possible unknown rules are in effect</source>
-        <translation>İkaz: bilinmeyen blok sürümü oluşturulmaya çalışılıyor. Bilinmeyen kuralların işlemesi mümkündür.</translation>
-    </message>
     <message>
         <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source>
         <translation>Uyarı: eşlerimizle tamamen mutabık değiliz gibi görünüyor! Güncelleme yapmanız gerekebilir ya da diğer düğümlerin güncelleme yapmaları gerekebilir.</translation>
     </message>
-    <message>
-        <source>Warning: wallet.dat corrupt, data salvaged! Original wallet.dat saved as wallet.{timestamp}.bak in %s; if your balance or transactions are incorrect you should restore from a backup.</source>
-        <translation>Uyarı: wallet.dat bozuk, veriler geri kazanıldı! Özgün wallet.dat, wallet.{zamandamgası}.bak olarak %s klasörüne kaydedildi; bakiyeniz ya da muameleleriniz yanlışsa bir yedeklemeden tekrar yüklemeniz gerekir.</translation>
-    </message>
     <message>
         <source>Whitelist peers connecting from the given netmask or IP address. Can be specified multiple times.</source>
         <translation>Belirtilen ağ maskesi ya da IP adresinden bağlanan eşleri beyaz listeye al. Birden fazla kez belirtilebilir.</translation>
     </message>
+    <message>
+        <source>You need to rebuild the database using -reindex-chainstate to change -txindex</source>
+        <translation>-txindex'i değiştirmek için veritabanını -reindex-chainstate kullanarak tekrar inşa etmeniz gerekmektedir</translation>
+    </message>
+    <message>
+        <source>%s corrupt, salvage failed</source>
+        <translation>%s bozuk, geri kazanım başarısız oldu</translation>
+    </message>
     <message>
         <source>-maxmempool must be at least %d MB</source>
         <translation>-maxmempool asgari %d MB olmalıdır</translation>
@@ -3071,10 +1914,22 @@
         <source>Append comment to the user agent string</source>
         <translation>Kullanıcı aracı zincirine yorumu ekle</translation>
     </message>
+    <message>
+        <source>Attempt to recover private keys from a corrupt wallet on startup</source>
+        <translation>Başlangıçta bozuk bir cüzdandan özel anahtarları geri kazanmayı dene</translation>
+    </message>
     <message>
         <source>Block creation options:</source>
         <translation>Blok oluşturma seçenekleri:</translation>
     </message>
+    <message>
+        <source>Cannot resolve -%s address: '%s'</source>
+        <translation>Çözümlenemedi - %s adres: '%s'</translation>
+    </message>
+    <message>
+        <source>Change index out of range</source>
+        <translation>Aralık dışında değişiklik endeksi</translation>
+    </message>
     <message>
         <source>Connect only to the specified node(s)</source>
         <translation>Sadece belirtilen düğüme veya düğümlere bağlan</translation>
@@ -3083,6 +1938,10 @@
         <source>Connection options:</source>
         <translation>Bağlantı seçenekleri:</translation>
     </message>
+    <message>
+        <source>Copyright (C) %i-%i</source>
+        <translation>Telif hakkı (C) %i-%i</translation>
+    </message>
     <message>
         <source>Corrupted block database detected</source>
         <translation>Bozuk blok veritabanı tespit edildi</translation>
@@ -3127,6 +1986,18 @@
         <source>Error initializing wallet database environment %s!</source>
         <translation>%s cüzdan veritabanı ortamının başlatılmasında hata meydana geldi!</translation>
     </message>
+    <message>
+        <source>Error loading %s</source>
+        <translation>%s unsurunun yüklenmesinde hata oluştu</translation>
+    </message>
+    <message>
+        <source>Error loading %s: Wallet corrupted</source>
+        <translation>%s unsurunun yüklenmesinde hata oluştu: bozuk cüzdan</translation>
+    </message>
+    <message>
+        <source>Error loading %s: Wallet requires newer version of %s</source>
+        <translation>%s unsurunun yüklenmesinde hata oluştu: cüzdan %s programının yeni bir sürümüne ihtiyaç duyuyor</translation>
+    </message>
     <message>
         <source>Error loading block database</source>
         <translation>Blok veritabanının yüklenmesinde hata</translation>
@@ -3151,10 +2022,18 @@
         <source>Incorrect or no genesis block found. Wrong datadir for network?</source>
         <translation>Yanlış ya da bulunamamış doğuş bloku. Şebeke için yanlış veri klasörü mü?</translation>
     </message>
+    <message>
+        <source>Initialization sanity check failed. %s is shutting down.</source>
+        <translation>Başlatma sınaması başarısız oldu. %s kapatılıyor.</translation>
+    </message>
     <message>
         <source>Invalid -onion address: '%s'</source>
         <translation>Geçersiz -onion adresi: '%s'</translation>
     </message>
+    <message>
+        <source>Invalid amount for -%s=&lt;amount&gt;: '%s'</source>
+        <translation>-%s=&lt;meblağ&gt; için geçersiz meblağ: '%s'</translation>
+    </message>
     <message>
         <source>Invalid amount for -fallbackfee=&lt;amount&gt;: '%s'</source>
         <translation> -fallbackfee=&lt;meblağ&gt; için geçersiz meblağ: '%s'</translation>
@@ -3163,6 +2042,10 @@
         <source>Keep the transaction memory pool below &lt;n&gt; megabytes (default: %u)</source>
         <translation>Muamele bellek alanını &lt;n&gt; megabayttan düşük tut (varsayılan: %u)</translation>
     </message>
+    <message>
+        <source>Loading banlist...</source>
+        <translation>Yasaklama listesi yükleniyor...</translation>
+    </message>
     <message>
         <source>Location of the auth cookie (default: data dir)</source>
         <translation>auth çerezinin konumu (varsayılan: veri klasörü)</translation>
@@ -3179,6 +2062,10 @@
         <source>Only connect to nodes in network &lt;net&gt; (ipv4, ipv6 or onion)</source>
         <translation>Sadece &lt;net&gt; şebekesindeki düğümlere bağlan (ipv4, ipv6 veya onion)</translation>
     </message>
+    <message>
+        <source>Print this help message and exit</source>
+        <translation>Bu yardım mesajını yaz ve çık</translation>
+    </message>
     <message>
         <source>Print version and exit</source>
         <translation>Sürümü yaz ve çık</translation>
@@ -3191,6 +2078,14 @@
         <source>Prune mode is incompatible with -txindex.</source>
         <translation>Budama kipi -txindex ile uyumsuzdur.</translation>
     </message>
+    <message>
+        <source>Rebuild chain state and block index from the blk*.dat files on disk</source>
+        <translation>Zincir durumu ve blok endeksini diskteki blk*.dat dosyalarından yeniden derle</translation>
+    </message>
+    <message>
+        <source>Rebuild chain state from the currently indexed blocks</source>
+        <translation>Zincir durumunu güncel olarak endekslenen bloklardan yeniden derle</translation>
+    </message>
     <message>
         <source>Set database cache size in megabytes (%d to %d, default: %d)</source>
         <translation>Veritabanı önbellek boyutunu megabayt olarak belirt (%d ilâ %d, varsayılan: %d)</translation>
@@ -3203,6 +2098,10 @@
         <source>Specify wallet file (within data directory)</source>
         <translation>Cüzdan dosyası belirtiniz (veri klasörünün içinde)</translation>
     </message>
+    <message>
+        <source>Unable to bind to %s on this computer. %s is probably already running.</source>
+        <translation>Bu bilgisayarda %s unsuruna bağlanılamadı. %s muhtemelen hâlihazırda çalışmaktadır.</translation>
+    </message>
     <message>
         <source>Unsupported argument -benchmark ignored, use -debug=bench.</source>
         <translation>Desteklenmeyen -benchmark argümanı görmezden gelindi, -debug=bench kullanınız.</translation>
@@ -3236,12 +2135,16 @@
         <translation>%s cüzdan %s veri klasörünün dışında bulunuyor</translation>
     </message>
     <message>
-        <source>Wallet options:</source>
-        <translation>Cüzdan seçenekleri:</translation>
+        <source>Wallet debugging/testing options:</source>
+        <translation>Cüzdan hata ayıklama/test etme seçenekleri:</translation>
     </message>
     <message>
-        <source>You need to rebuild the database using -reindex to change -txindex</source>
-        <translation>-txindex'i değiştirmek için veritabanını -reindex kullanarak tekrar inşa etmeniz gerekmektedir</translation>
+        <source>Wallet needed to be rewritten: restart %s to complete</source>
+        <translation>Cüzdanın tekrar yazılması gerekiyordu: işlemi tamamlamak için %s programını yeniden başlatınız</translation>
+    </message>
+    <message>
+        <source>Wallet options:</source>
+        <translation>Cüzdan seçenekleri:</translation>
     </message>
     <message>
         <source>Allow JSON-RPC connections from specified source. Valid for &lt;ip&gt; are a single IP (e.g. 1.2.3.4), a network/netmask (e.g. 1.2.3.4/255.255.255.0) or a network/CIDR (e.g. 1.2.3.4/24). This option can be specified multiple times</source>
@@ -3255,10 +2158,6 @@
         <source>Bind to given address to listen for JSON-RPC connections. Use [host]:port notation for IPv6. This option can be specified multiple times (default: bind to all interfaces)</source>
         <translation>Belirtilen adrese bağlan ve JSON RPC bağlantıları için dinlemeye geç. IPv6 için [makine]:port imlasını kullanınız. Bu seçenek birden çok kez belirtilebilir (varsayılan: tüm arayüzlere bağlan)</translation>
     </message>
-    <message>
-        <source>Cannot obtain a lock on data directory %s. Bitcoin Core is probably already running.</source>
-        <translation>%s veri dizininde kilit elde edilemedi. Bitcoin Çekirdeği muhtemelen hâlihazırda çalışmaktadır.</translation>
-    </message>
     <message>
         <source>Create new files with system default permissions, instead of umask 077 (only effective with disabled wallet functionality)</source>
         <translation>Yeni dosyaları umask 077 yerine varsayılan izinlerle oluştur (sadece devre dışı cüzdan işlevselliği ile etkilidir)</translation>
@@ -3303,10 +2202,6 @@
         <source>Set maximum size of high-priority/low-fee transactions in bytes (default: %d)</source>
         <translation>Yüksek öncelikli/düşük ücretli muamelelerin azami boyutunu bayt olarak ayarla (varsayılan: %d)</translation>
     </message>
-    <message>
-        <source>Set the number of threads for coin generation if enabled (-1 = all cores, default: %d)</source>
-        <translation>Etkinse bitcoin oluşuturulmasına atanan iş parçacığı sayısını ayarla (-1 = tüm çekirdekler, varsayılan: %d)</translation>
-    </message>
     <message>
         <source>The transaction amount is too small to send after the fee has been deducted</source>
         <translation>Bu muamele, ücret düşüldükten sonra göndermek için çok düşük</translation>
@@ -3331,34 +2226,14 @@
         <source>Accept public REST requests (default: %u)</source>
         <translation>Herkese açık REST taleplerini kabul et (varsayılan: %u)</translation>
     </message>
-    <message>
-        <source>Activating best chain...</source>
-        <translation>En iyi zincir etkinleştiriliyor...</translation>
-    </message>
-    <message>
-        <source>Attempt to recover private keys from a corrupt wallet.dat on startup</source>
-        <translation>Başlangıçta bozuk bir wallet.dat dosyasından özel anahtarları geri kazanmayı dene</translation>
-    </message>
     <message>
         <source>Automatically create Tor hidden service (default: %d)</source>
         <translation>Otomatik olarak gizli Tor servisi oluştur (varsayılan: %d)</translation>
     </message>
-    <message>
-        <source>Cannot resolve -whitebind address: '%s'</source>
-        <translation>-whitebind adresi çözümlenemedi: '%s'</translation>
-    </message>
     <message>
         <source>Connect through SOCKS5 proxy</source>
         <translation>SOCKS5 vekil sunucusu vasıtasıyla bağlan</translation>
     </message>
-    <message>
-        <source>Copyright (C) 2009-%i The Bitcoin Core Developers</source>
-        <translation>Telif hakkı 2009-%i Bitcoin Çekirdeği Geliştiricileri</translation>
-    </message>
-    <message>
-        <source>Error loading wallet.dat: Wallet requires newer version of Bitcoin Core</source>
-        <translation>wallet.dat dosyasının yüklenmesinde hata: Cüzdan Bitcoin Çekirdeğinin daha yeni bir sürümünü gerektirmektedir</translation>
-    </message>
     <message>
         <source>Error reading from database, shutting down.</source>
         <translation>Veritabanından okumada hata, kapatılıyor.</translation>
@@ -3371,22 +2246,6 @@
         <source>Information</source>
         <translation>Bilgi</translation>
     </message>
-    <message>
-        <source>Initialization sanity check failed. Bitcoin Core is shutting down.</source>
-        <translation>Başlatma sınaması başarısız oldu. Bitcoin Çekirdeği kapatılıyor.</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -maxtxfee=&lt;amount&gt;: '%s'</source>
-        <translation>-maxtxfee=&lt;tutar&gt; için geçersiz tutar: '%s'</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -minrelaytxfee=&lt;amount&gt;: '%s'</source>
-        <translation>-minrelaytxfee=&lt;amount&gt; için geçersiz meblağ: '%s'</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -mintxfee=&lt;amount&gt;: '%s'</source>
-        <translation>-mintxfee=&lt;amount&gt; için geçersiz meblağ: '%s'</translation>
-    </message>
     <message>
         <source>Invalid amount for -paytxfee=&lt;amount&gt;: '%s' (must be at least %s)</source>
         <translation>-paytxfee=&lt;tutar&gt;:'%s' unsurunda geçersiz tutar (asgari %s olması lazımdır)</translation>
@@ -3411,14 +2270,6 @@
         <source>RPC server options:</source>
         <translation>RPC sunucu seçenekleri:</translation>
     </message>
-    <message>
-        <source>Rebuild block chain index from current blk000??.dat files on startup</source>
-        <translation>Başlangıçta blok zinciri indeksini güncel blk000??.dat dosyalarından tekrar inşa et</translation>
-    </message>
-    <message>
-        <source>Receive and display P2P network alerts (default: %u)</source>
-        <translation>P2P ağından gelen önemli uyarıları alın ve gösterin (önseçili değer: %u)</translation>
-    </message>
     <message>
         <source>Reducing -maxconnections from %d to %d, because of system limitations.</source>
         <translation>Sistem sınırlamaları sebebiyle -maxconnections %d değerinden %d değerine düşürülmüştür.</translation>
@@ -3491,10 +2342,6 @@
         <source>Username for JSON-RPC connections</source>
         <translation>JSON-RPC bağlantıları için kullanıcı ismi</translation>
     </message>
-    <message>
-        <source>Wallet needed to be rewritten: restart Bitcoin Core to complete</source>
-        <translation>Cüzdanın tekrar yazılması gerekmektedir: tamamlamak için Bitcoin Çekirdeğini yeniden başlatın</translation>
-    </message>
     <message>
         <source>Warning</source>
         <translation>Uyarı</translation>
@@ -3515,10 +2362,6 @@
         <source>ZeroMQ notification options:</source>
         <translation>ZeroMQ bildirim seçenekleri:</translation>
     </message>
-    <message>
-        <source>wallet.dat corrupt, salvage failed</source>
-        <translation>wallet.dat bozuk, geri kazanım başarısız oldu</translation>
-    </message>
     <message>
         <source>Password for JSON-RPC connections</source>
         <translation>JSON-RPC bağlantıları için parola</translation>
@@ -3527,10 +2370,6 @@
         <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
         <translation>En iyi blok değiştiğinde komutu çalıştır (komut için %s parametresi blok hash değeri ile değiştirilecektir)</translation>
     </message>
-    <message>
-        <source>This help message</source>
-        <translation>Bu yardım mesajı</translation>
-    </message>
     <message>
         <source>Allow DNS lookups for -addnode, -seednode and -connect</source>
         <translation>-addnode, -seednode ve -connect için DNS aramalarına izin ver</translation>
@@ -3539,10 +2378,6 @@
         <source>Loading addresses...</source>
         <translation>Adresler yükleniyor...</translation>
     </message>
-    <message>
-        <source>Error loading wallet.dat: Wallet corrupted</source>
-        <translation>wallet.dat dosyasının yüklenmesinde hata oluştu: bozuk cüzdan</translation>
-    </message>
     <message>
         <source>(1 = keep tx meta data e.g. account owner and payment request information, 2 = drop tx meta data)</source>
         <translation>(1 = tx meta verilerini tut mesela hesap sahibi ve ödeme talebi bilgileri, 2 = tx meta verilerini at)</translation>
@@ -3559,10 +2394,6 @@
         <source>Do not keep transactions in the mempool longer than &lt;n&gt; hours (default: %u)</source>
         <translation>Muameleleri bellek alanında &lt;n&gt; saatten fazla tutma (varsayılan: %u)</translation>
     </message>
-    <message>
-        <source>Error reading wallet.dat! All keys read correctly, but transaction data or address book entries might be missing or incorrect.</source>
-        <translation>wallet.dat dosyasının okunması sırasında bir hata meydana geldi! Tüm anahtarlar doğru bir şekilde okundu, ancak muamele verileri ya da adres defteri unsurları hatalı veya eksik olabilir.</translation>
-    </message>
     <message>
         <source>Fees (in %s/kB) smaller than this are considered zero fee for transaction creation (default: %s)</source>
         <translation>Bundan düşük ücretler (%s/kB olarak) muamele oluşturulması için sıfır değerinde ücret olarak kabul edilir (varsayılan: %s)</translation>
@@ -3599,6 +2430,10 @@
         <source>Unsupported argument -socks found. Setting SOCKS version isn't possible anymore, only SOCKS5 proxies are supported.</source>
         <translation>Desteklenmeyen -socks argümanı bulundu. SOCKS sürümünün ayarlanması artık mümkün değildir, sadece SOCKS5 vekilleri desteklenmektedir.</translation>
     </message>
+    <message>
+        <source>Unsupported argument -whitelistalwaysrelay ignored, use -whitelistrelay and/or -whitelistforcerelay.</source>
+        <translation>Desteklenmeyen argüman -whitelistalwaysrelay görmezden gelindi, -whitelistrelay ve/veya -whitelistforcerelay kullanın.</translation>
+    </message>
     <message>
         <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: %s)</source>
         <translation>Eşlere gizli Tor servisleri ile ulaşmak için ayrı SOCKS5 vekil sunucusu kullan (varsayılan: %s)</translation>
@@ -3608,20 +2443,20 @@
         <translation>JSON-RPC bağlantıları için kullanıcı ismi ve karmalanmış parola. &lt;userpw&gt; alanı şu biçimdedir: &lt;USERNAME&gt;:&lt;SALT&gt;$&lt;HASH&gt;. Kanonik bir Python betiği share/rpcuser klasöründe bulunabilir. Bu seçenek birden çok kez belirtilebilir.</translation>
     </message>
     <message>
-        <source>(default: %s)</source>
-        <translation>(varsayılan: %s)</translation>
+        <source>Warning: Unknown block versions being mined! It's possible unknown rules are in effect</source>
+        <translation>İkaz: bilinmeyen blok sürümü oluşturulmaya çalışılıyor. Bilinmeyen kuralların işlemesi mümkündür.</translation>
     </message>
     <message>
-        <source>Always query for peer addresses via DNS lookup (default: %u)</source>
-        <translation>Eş adresleri sorgulaması için daima DNS aramasını kullan (varsayılan: %u)</translation>
+        <source>Warning: Wallet file corrupt, data salvaged! Original %s saved as %s in %s; if your balance or transactions are incorrect you should restore from a backup.</source>
+        <translation>Uyarı: wallet.dat bozuk, veriler geri kazanıldı! Özgün %s, %s olarak %s klasörüne kaydedildi; bakiyeniz ya da muameleleriniz yanlışsa bir yedeklemeden tekrar yüklemeniz gerekir.</translation>
     </message>
     <message>
-        <source>Error loading wallet.dat</source>
-        <translation>wallet.dat dosyasının yüklenmesinde hata oluştu</translation>
+        <source>(default: %s)</source>
+        <translation>(varsayılan: %s)</translation>
     </message>
     <message>
-        <source>Generate coins (default: %u)</source>
-        <translation>Bitcoin oluştur (varsayılan: %u)</translation>
+        <source>Always query for peer addresses via DNS lookup (default: %u)</source>
+        <translation>Eş adresleri sorgulaması için daima DNS aramasını kullan (varsayılan: %u)</translation>
     </message>
     <message>
         <source>How many blocks to check at startup (default: %u, 0 = all)</source>
@@ -3707,18 +2542,6 @@
         <source>Unknown network specified in -onlynet: '%s'</source>
         <translation>-onlynet için bilinmeyen bir şebeke belirtildi: '%s'</translation>
     </message>
-    <message>
-        <source>Cannot resolve -bind address: '%s'</source>
-        <translation>-bind adresi çözümlenemedi: '%s'</translation>
-    </message>
-    <message>
-        <source>Cannot resolve -externalip address: '%s'</source>
-        <translation>-externalip adresi çözümlenemedi: '%s'</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -paytxfee=&lt;amount&gt;: '%s'</source>
-        <translation>-paytxfee=&lt;meblağ&gt; için geçersiz meblağ: '%s'</translation>
-    </message>
     <message>
         <source>Insufficient funds</source>
         <translation>Yetersiz bakiye</translation>
diff --git a/src/qt/locale/bitcoin_tr_TR.ts b/src/qt/locale/bitcoin_tr_TR.ts
index 979aeea03811f..344309c25fd33 100644
--- a/src/qt/locale/bitcoin_tr_TR.ts
+++ b/src/qt/locale/bitcoin_tr_TR.ts
@@ -25,10 +25,6 @@
         <source>C&amp;lose</source>
         <translation>K&amp;apat</translation>
     </message>
-    <message>
-        <source>&amp;Copy Address</source>
-        <translation>&amp;Adresi Kopyala</translation>
-    </message>
     <message>
         <source>Delete the currently selected address from the list</source>
         <translation>Seçili adresi listeden sil</translation>
@@ -45,73 +41,6 @@
         <source>&amp;Delete</source>
         <translation>&amp;Sil</translation>
     </message>
-    <message>
-        <source>Choose the address to send coins to</source>
-        <translation>Para göndereceğiniz adresi seçin</translation>
-    </message>
-    <message>
-        <source>Choose the address to receive coins with</source>
-        <translation>Parayı alacağınız adresi seçin</translation>
-    </message>
-    <message>
-        <source>C&amp;hoose</source>
-        <translation>S&amp;eç</translation>
-    </message>
-    <message>
-        <source>Sending addresses</source>
-        <translation>Gönderim adresleri</translation>
-    </message>
-    <message>
-        <source>Receiving addresses</source>
-        <translation>Alış adresleri</translation>
-    </message>
-    <message>
-        <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source>
-        <translation>Bunlar ödeme gönderebileceğiniz Bitcoin adreslerinizdir. Para göndermeden önce mutlaka alıcı adresini ve tutarı kontrol edin.</translation>
-    </message>
-    <message>
-        <source>These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source>
-        <translation>Bunlar ödeme alabileceğiniz Bitcoin adreslerinizdir. Her işlem için yeni bir adres kullanmanız önerilir.</translation>
-    </message>
-    <message>
-        <source>Copy &amp;Label</source>
-        <translation>Kopyala &amp;Etiketle</translation>
-    </message>
-    <message>
-        <source>&amp;Edit</source>
-        <translation>&amp;Düzenle</translation>
-    </message>
-    <message>
-        <source>Export Address List</source>
-        <translation>Adres Listesini Dışa Aktar</translation>
-    </message>
-    <message>
-        <source>Comma separated file (*.csv)</source>
-        <translation>Virgül ile ayrılmış dosya (*.csv)</translation>
-    </message>
-    <message>
-        <source>Exporting Failed</source>
-        <translation>Dışa Aktarma Başarısız Oldu</translation>
-    </message>
-    <message>
-        <source>There was an error trying to save the address list to %1. Please try again.</source>
-        <translation>Adres listesini %1'e kaydederken bir hata oluştu. Lütfen tekrar deneyin.</translation>
-    </message>
-</context>
-<context>
-    <name>AddressTableModel</name>
-    <message>
-        <source>Label</source>
-        <translation>Etiket</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>Adres</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(etiket yok)</translation>
-    </message>
 </context>
 <context>
     <name>AskPassphraseDialog</name>
@@ -126,15 +55,8 @@
         <translation>Alış adresleri</translation>
     </message>
     </context>
-<context>
-    <name>ClientModel</name>
-    </context>
 <context>
     <name>CoinControlDialog</name>
-    <message>
-        <source>(no label)</source>
-        <translation>(etiket yok)</translation>
-    </message>
     </context>
 <context>
     <name>EditAddressDialog</name>
@@ -146,7 +68,7 @@
         <source>&amp;Address</source>
         <translation>Adres</translation>
     </message>
-    </context>
+</context>
 <context>
     <name>FreespaceChecker</name>
     </context>
@@ -165,18 +87,12 @@
 <context>
     <name>OverviewPage</name>
     </context>
-<context>
-    <name>PaymentServer</name>
-    </context>
 <context>
     <name>PeerTableModel</name>
     </context>
 <context>
     <name>QObject</name>
     </context>
-<context>
-    <name>QRImageWidget</name>
-    </context>
 <context>
     <name>RPCConsole</name>
     </context>
@@ -189,32 +105,9 @@
         <source>Copy &amp;Address</source>
         <translation>&amp;Adresi Kopyala</translation>
     </message>
-    <message>
-        <source>Address</source>
-        <translation>Adres</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Etiket</translation>
-    </message>
-    </context>
-<context>
-    <name>RecentRequestsTableModel</name>
-    <message>
-        <source>Label</source>
-        <translation>Etiket</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(etiket yok)</translation>
-    </message>
     </context>
 <context>
     <name>SendCoinsDialog</name>
-    <message>
-        <source>(no label)</source>
-        <translation>(etiket yok)</translation>
-    </message>
     </context>
 <context>
     <name>SendCoinsEntry</name>
@@ -231,58 +124,12 @@
 <context>
     <name>TrafficGraphWidget</name>
     </context>
-<context>
-    <name>TransactionDesc</name>
-    </context>
 <context>
     <name>TransactionDescDialog</name>
     </context>
-<context>
-    <name>TransactionTableModel</name>
-    <message>
-        <source>Label</source>
-        <translation>Etiket</translation>
-    </message>
-    </context>
-<context>
-    <name>TransactionView</name>
-    <message>
-        <source>Exporting Failed</source>
-        <translation>Dışa Aktarma Başarısız Oldu</translation>
-    </message>
-    <message>
-        <source>Comma separated file (*.csv)</source>
-        <translation>Virgül ile ayrılmış dosya (*.csv)</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Etiket</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>Adres</translation>
-    </message>
-    </context>
 <context>
     <name>UnitDisplayStatusBarControl</name>
     </context>
-<context>
-    <name>WalletFrame</name>
-    </context>
-<context>
-    <name>WalletModel</name>
-    </context>
-<context>
-    <name>WalletView</name>
-    <message>
-        <source>&amp;Export</source>
-        <translation>&amp;Dışa Aktar</translation>
-    </message>
-    <message>
-        <source>Export the data in the current tab to a file</source>
-        <translation>Seçili sekmedeki veriyi dosya olarak dışa aktar</translation>
-    </message>
-    </context>
 <context>
     <name>bitcoin-core</name>
     </context>
diff --git a/src/qt/locale/bitcoin_uk.ts b/src/qt/locale/bitcoin_uk.ts
index 64df7b5ba5780..668e787a6eca8 100644
--- a/src/qt/locale/bitcoin_uk.ts
+++ b/src/qt/locale/bitcoin_uk.ts
@@ -25,10 +25,6 @@
         <source>C&amp;lose</source>
         <translation>З&amp;акрити</translation>
     </message>
-    <message>
-        <source>&amp;Copy Address</source>
-        <translation>&amp;Скопіювати адресу</translation>
-    </message>
     <message>
         <source>Delete the currently selected address from the list</source>
         <translation>Вилучити вибрані адреси з переліку</translation>
@@ -45,73 +41,6 @@
         <source>&amp;Delete</source>
         <translation>&amp;Видалити</translation>
     </message>
-    <message>
-        <source>Choose the address to send coins to</source>
-        <translation>Виберіть адресу для відправлення монет</translation>
-    </message>
-    <message>
-        <source>Choose the address to receive coins with</source>
-        <translation>Виберіть адресу для отримання монет</translation>
-    </message>
-    <message>
-        <source>C&amp;hoose</source>
-        <translation>&amp;Обрати</translation>
-    </message>
-    <message>
-        <source>Sending addresses</source>
-        <translation>Адреси для відправлення</translation>
-    </message>
-    <message>
-        <source>Receiving addresses</source>
-        <translation>Адреси для отримання</translation>
-    </message>
-    <message>
-        <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source>
-        <translation>Це ваші Bitcoin-адреси для відправлення платежів. Перед відправленням монет завжди перевіряйте суму та адресу прийому.</translation>
-    </message>
-    <message>
-        <source>These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source>
-        <translation>Це ваша нова Bitcoin адреса для отримання платежів. Рекомендовано використовувати нову адресу для кожної транзакції.</translation>
-    </message>
-    <message>
-        <source>Copy &amp;Label</source>
-        <translation>Скопіювати &amp;мітку</translation>
-    </message>
-    <message>
-        <source>&amp;Edit</source>
-        <translation>&amp;Редагувати</translation>
-    </message>
-    <message>
-        <source>Export Address List</source>
-        <translation>Експортувати список адрес</translation>
-    </message>
-    <message>
-        <source>Comma separated file (*.csv)</source>
-        <translation>Значення, розділені комою (*.csv)</translation>
-    </message>
-    <message>
-        <source>Exporting Failed</source>
-        <translation>Помилка експорту</translation>
-    </message>
-    <message>
-        <source>There was an error trying to save the address list to %1. Please try again.</source>
-        <translation>Виникла помилка при спробі зберігання адрес до %1. Будь ласка спробуйте ще.</translation>
-    </message>
-</context>
-<context>
-    <name>AddressTableModel</name>
-    <message>
-        <source>Label</source>
-        <translation>Назва</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>Адреса</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(немає назви)</translation>
-    </message>
 </context>
 <context>
     <name>AskPassphraseDialog</name>
@@ -131,94 +60,6 @@
         <source>Repeat new passphrase</source>
         <translation>Повторіть пароль</translation>
     </message>
-    <message>
-        <source>Encrypt wallet</source>
-        <translation>Зашифрувати гаманець</translation>
-    </message>
-    <message>
-        <source>This operation needs your wallet passphrase to unlock the wallet.</source>
-        <translation>Ця операція потребує пароль для розблокування гаманця.</translation>
-    </message>
-    <message>
-        <source>Unlock wallet</source>
-        <translation>Розблокувати гаманець</translation>
-    </message>
-    <message>
-        <source>This operation needs your wallet passphrase to decrypt the wallet.</source>
-        <translation>Ця операція потребує пароль для дешифрування гаманця.</translation>
-    </message>
-    <message>
-        <source>Decrypt wallet</source>
-        <translation>Дешифрувати гаманець</translation>
-    </message>
-    <message>
-        <source>Change passphrase</source>
-        <translation>Змінити пароль</translation>
-    </message>
-    <message>
-        <source>Confirm wallet encryption</source>
-        <translation>Підтвердити шифрування гаманця</translation>
-    </message>
-    <message>
-        <source>Warning: If you encrypt your wallet and lose your passphrase, you will &lt;b&gt;LOSE ALL OF YOUR BITCOINS&lt;/b&gt;!</source>
-        <translation>УВАГА: Якщо ви зашифруєте гаманець і забудете пароль, ви &lt;b&gt;ВТРАТИТЕ ВСІ СВОЇ БІТКОІНИ&lt;/b&gt;!</translation>
-    </message>
-    <message>
-        <source>Are you sure you wish to encrypt your wallet?</source>
-        <translation>Ви дійсно хочете зашифрувати свій гаманець?</translation>
-    </message>
-    <message>
-        <source>Bitcoin Core will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source>
-        <translation>Клієнт «Bitcoin Core» буде закрито для завершення процесу шифрування. Пам'ятайте, що шифрування гаманця не зможе повністю захистити ваші біткоїни від крадіжки якщо ваш комп'ютер буде інфіковано шкідливими програмами.</translation>
-    </message>
-    <message>
-        <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source>
-        <translation>ВАЖЛИВО: Всі попередні резервні копії, які ви зробили з вашого файлу гаманця повинні бути замінені новоствореним, зашифрованим файлом гаманця. З міркувань безпеки, попередні резервні копії незашифрованого файла гаманця стануть непридатними одразу ж, як тільки ви почнете використовувати новий, зашифрований гаманець.</translation>
-    </message>
-    <message>
-        <source>Warning: The Caps Lock key is on!</source>
-        <translation>Увага: Ввімкнено Caps Lock!</translation>
-    </message>
-    <message>
-        <source>Wallet encrypted</source>
-        <translation>Гаманець зашифровано</translation>
-    </message>
-    <message>
-        <source>Enter the new passphrase to the wallet.&lt;br/&gt;Please use a passphrase of &lt;b&gt;ten or more random characters&lt;/b&gt;, or &lt;b&gt;eight or more words&lt;/b&gt;.</source>
-        <translation>Введіть нову кодову фразу для гаманця.&lt;br/&gt;Будь ласка, використовуйте кодові фрази що містять &lt;b&gt; щонайменше десять випадкових символів &lt;/b&gt; або &lt;b&gt; щонайменше вісім слів &lt;/b&gt;.</translation>
-    </message>
-    <message>
-        <source>Enter the old passphrase and new passphrase to the wallet.</source>
-        <translation>Введіть старий пароль та новий пароль до гаманця.</translation>
-    </message>
-    <message>
-        <source>Wallet encryption failed</source>
-        <translation>Не вдалося зашифрувати гаманець</translation>
-    </message>
-    <message>
-        <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
-        <translation>Виникла помилка під час шифрування гаманця. Ваш гаманець не було зашифровано.</translation>
-    </message>
-    <message>
-        <source>The supplied passphrases do not match.</source>
-        <translation>Введені паролі не співпадають.</translation>
-    </message>
-    <message>
-        <source>Wallet unlock failed</source>
-        <translation>Не вдалося розблокувати гаманець</translation>
-    </message>
-    <message>
-        <source>The passphrase entered for the wallet decryption was incorrect.</source>
-        <translation>Введений пароль є неправильним.</translation>
-    </message>
-    <message>
-        <source>Wallet decryption failed</source>
-        <translation>Не вдалося розшифрувати гаманець</translation>
-    </message>
-    <message>
-        <source>Wallet passphrase was successfully changed.</source>
-        <translation>Пароль було успішно змінено.</translation>
-    </message>
 </context>
 <context>
     <name>BanTableModel</name>
@@ -269,6 +110,10 @@
         <source>Quit application</source>
         <translation>Вийти</translation>
     </message>
+    <message>
+        <source>&amp;About %1</source>
+        <translation>П&amp;ро %1</translation>
+    </message>
     <message>
         <source>About &amp;Qt</source>
         <translation>&amp;Про Qt</translation>
@@ -305,14 +150,6 @@
         <source>Open &amp;URI...</source>
         <translation>Відкрити &amp;URI</translation>
     </message>
-    <message>
-        <source>Bitcoin Core client</source>
-        <translation>Клієнт «Bitcoin Core»</translation>
-    </message>
-    <message>
-        <source>Importing blocks from disk...</source>
-        <translation>Імпорт блоків з диску...</translation>
-    </message>
     <message>
         <source>Reindexing blocks on disk...</source>
         <translation>Переіндексація блоків на диску ...</translation>
@@ -357,10 +194,6 @@
         <source>&amp;Receive</source>
         <translation>&amp;Отримати</translation>
     </message>
-    <message>
-        <source>Show information about Bitcoin Core</source>
-        <translation>Показати інформацію про Bitcoin Core</translation>
-    </message>
     <message>
         <source>&amp;Show / Hide</source>
         <translation>Показа&amp;ти / Приховати</translation>
@@ -397,22 +230,10 @@
         <source>Tabs toolbar</source>
         <translation>Панель вкладок</translation>
     </message>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Bitcoin Core</translation>
-    </message>
     <message>
         <source>Request payments (generates QR codes and bitcoin: URIs)</source>
         <translation>Створити запит платежу (генерує QR-код та bitcoin: URI)</translation>
     </message>
-    <message>
-        <source>&amp;About Bitcoin Core</source>
-        <translation>П&amp;ро Bitcoin Core</translation>
-    </message>
-    <message>
-        <source>Modify configuration options for Bitcoin Core</source>
-        <translation>Редагувати параметри Bitcoin Core</translation>
-    </message>
     <message>
         <source>Show the list of used sending addresses and labels</source>
         <translation>Показати список адрес і міток, що були використані для відправлення</translation>
@@ -429,10 +250,6 @@
         <source>&amp;Command-line options</source>
         <translation>П&amp;араметри командного рядка</translation>
     </message>
-    <message>
-        <source>Show the Bitcoin Core help message to get a list with possible Bitcoin command-line options</source>
-        <translation>Показати довідку Bitcoin Core для отримання переліку можливих параметрів командного рядка.</translation>
-    </message>
     <message numerus="yes">
         <source>%n active connection(s) to Bitcoin network</source>
         <translation><numerusform>%n активне з'єднання з мережею Bitcoin</numerusform><numerusform>%n активні з'єднання з мережею Bitcoin</numerusform><numerusform>%n активних з'єднань з мережею Bitcoin</numerusform></translation>
@@ -544,13 +361,6 @@
         <translation>&lt;b&gt;Зашифрований&lt;/b&gt; гаманець &lt;b&gt;заблоковано&lt;/b&gt;</translation>
     </message>
 </context>
-<context>
-    <name>ClientModel</name>
-    <message>
-        <source>Network Alert</source>
-        <translation>Сповіщення мережі</translation>
-    </message>
-</context>
 <context>
     <name>CoinControlDialog</name>
     <message>
@@ -629,150 +439,6 @@
         <source>Priority</source>
         <translation>Пріоритет</translation>
     </message>
-    <message>
-        <source>Copy address</source>
-        <translation>Скопіювати адресу</translation>
-    </message>
-    <message>
-        <source>Copy label</source>
-        <translation>Скопіювати мітку</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>Скопіювати суму</translation>
-    </message>
-    <message>
-        <source>Copy transaction ID</source>
-        <translation>Скопіювати ID транзакції </translation>
-    </message>
-    <message>
-        <source>Lock unspent</source>
-        <translation>Заблокувати</translation>
-    </message>
-    <message>
-        <source>Unlock unspent</source>
-        <translation>Розблокувати</translation>
-    </message>
-    <message>
-        <source>Copy quantity</source>
-        <translation>Скопіювати кількість</translation>
-    </message>
-    <message>
-        <source>Copy fee</source>
-        <translation>Скопіювати комісію</translation>
-    </message>
-    <message>
-        <source>Copy after fee</source>
-        <translation>Скопіювати після комісії</translation>
-    </message>
-    <message>
-        <source>Copy bytes</source>
-        <translation>Скопіювати байти</translation>
-    </message>
-    <message>
-        <source>Copy priority</source>
-        <translation>Скопіювати пріорітет</translation>
-    </message>
-    <message>
-        <source>Copy dust</source>
-        <translation>Скопіювати пил</translation>
-    </message>
-    <message>
-        <source>Copy change</source>
-        <translation>Скопіювати решту</translation>
-    </message>
-    <message>
-        <source>highest</source>
-        <translation>найвищий</translation>
-    </message>
-    <message>
-        <source>higher</source>
-        <translation>вищий</translation>
-    </message>
-    <message>
-        <source>high</source>
-        <translation>високий</translation>
-    </message>
-    <message>
-        <source>medium-high</source>
-        <translation>вище за середній</translation>
-    </message>
-    <message>
-        <source>medium</source>
-        <translation>середній</translation>
-    </message>
-    <message>
-        <source>low-medium</source>
-        <translation>нижче за середній</translation>
-    </message>
-    <message>
-        <source>low</source>
-        <translation>низький</translation>
-    </message>
-    <message>
-        <source>lower</source>
-        <translation>нижчий</translation>
-    </message>
-    <message>
-        <source>lowest</source>
-        <translation>найнижчий</translation>
-    </message>
-    <message>
-        <source>(%1 locked)</source>
-        <translation>(%1 заблоковано)</translation>
-    </message>
-    <message>
-        <source>none</source>
-        <translation>відсутній</translation>
-    </message>
-    <message>
-        <source>This label turns red if the transaction size is greater than 1000 bytes.</source>
-        <translation>Ця позначка стане червоною, якщо розмір транзакції перевищить 1000 байтів.</translation>
-    </message>
-    <message>
-        <source>This label turns red if the priority is smaller than "medium".</source>
-        <translation>Ця позначка стане червоною, якщо пріоритет транзакції менше, ніж «середній».</translation>
-    </message>
-    <message>
-        <source>This label turns red if any recipient receives an amount smaller than %1.</source>
-        <translation>Ця позначка стане червоною, якщо будь-який отримувач отримає суму, меншу за %1.</translation>
-    </message>
-    <message>
-        <source>Can vary +/- %1 satoshi(s) per input.</source>
-        <translation>Може відрізнятися на +/- %1 сатоші за вхід</translation>
-    </message>
-    <message>
-        <source>yes</source>
-        <translation>так</translation>
-    </message>
-    <message>
-        <source>no</source>
-        <translation>ні</translation>
-    </message>
-    <message>
-        <source>This means a fee of at least %1 per kB is required.</source>
-        <translation>Це означає, що необхідно внести комісію (щонайменше %1 за КБ).</translation>
-    </message>
-    <message>
-        <source>Can vary +/- 1 byte per input.</source>
-        <translation>Може відрізнятися на +/- 1 байт за вхід.</translation>
-    </message>
-    <message>
-        <source>Transactions with higher priority are more likely to get included into a block.</source>
-        <translation>Транзакції з вищим пріоритетом мають більше шансів бути включеними до блоку.</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(немає назви)</translation>
-    </message>
-    <message>
-        <source>change from %1 (%2)</source>
-        <translation>решта з %1 (%2)</translation>
-    </message>
-    <message>
-        <source>(change)</source>
-        <translation>(решта)</translation>
-    </message>
 </context>
 <context>
     <name>EditAddressDialog</name>
@@ -796,38 +462,6 @@
         <source>&amp;Address</source>
         <translation>&amp;Адреса</translation>
     </message>
-    <message>
-        <source>New receiving address</source>
-        <translation>Нова адреса для отримання</translation>
-    </message>
-    <message>
-        <source>New sending address</source>
-        <translation>Нова адреса для відправлення</translation>
-    </message>
-    <message>
-        <source>Edit receiving address</source>
-        <translation>Редагувати адресу для отримання</translation>
-    </message>
-    <message>
-        <source>Edit sending address</source>
-        <translation>Редагувати адресу для відправлення</translation>
-    </message>
-    <message>
-        <source>The entered address "%1" is already in the address book.</source>
-        <translation>Введена адреса «%1» вже присутня в адресній книзі.</translation>
-    </message>
-    <message>
-        <source>The entered address "%1" is not a valid Bitcoin address.</source>
-        <translation>Введена адреса «%1» не є коректною адресою в мережі Bitcoin.</translation>
-    </message>
-    <message>
-        <source>Could not unlock wallet.</source>
-        <translation>Неможливо розблокувати гаманець.</translation>
-    </message>
-    <message>
-        <source>New key generation failed.</source>
-        <translation>Не вдалося згенерувати нові ключі.</translation>
-    </message>
 </context>
 <context>
     <name>FreespaceChecker</name>
@@ -854,10 +488,6 @@
 </context>
 <context>
     <name>HelpMessageDialog</name>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Bitcoin Core</translation>
-    </message>
     <message>
         <source>version</source>
         <translation>версії</translation>
@@ -866,10 +496,6 @@
         <source>(%1-bit)</source>
         <translation>(%1-бітний)</translation>
     </message>
-    <message>
-        <source>About Bitcoin Core</source>
-        <translation>Про Bitcoin Core</translation>
-    </message>
     <message>
         <source>Command-line options</source>
         <translation>Параметри командного рядка</translation>
@@ -906,29 +532,13 @@
         <source>Show splash screen on startup (default: %u)</source>
         <translation>Показувати заставку під час запуску (типово: %u)</translation>
     </message>
-    <message>
-        <source>Reset all settings changes made over the GUI</source>
-        <translation>Скинути налаштування, які було змінено через графічний інтерфейс користувача</translation>
-    </message>
-</context>
+    </context>
 <context>
     <name>Intro</name>
     <message>
         <source>Welcome</source>
         <translation>Вітання</translation>
     </message>
-    <message>
-        <source>Welcome to Bitcoin Core.</source>
-        <translation>Ласкаво просимо в Bitcoin Core.</translation>
-    </message>
-    <message>
-        <source>As this is the first time the program is launched, you can choose where Bitcoin Core will store its data.</source>
-        <translation>Оскільки це перший запуск програми, ви можете обрати де Bitcoin Core буде зберігати дані.</translation>
-    </message>
-    <message>
-        <source>Bitcoin Core will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source>
-        <translation>Bitcoin Core завантажить та збереже копію ланцюжка блоків Bitcoin. Щонайменше %1ГБ даних буде збережено в цьому каталозі. Гаманець теж буде збережено в цьому каталозі.</translation>
-    </message>
     <message>
         <source>Use the default data directory</source>
         <translation>Використовувати типовий каталог даних</translation>
@@ -937,10 +547,6 @@
         <source>Use a custom data directory:</source>
         <translation>Використовувати свій каталог даних:</translation>
     </message>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Bitcoin Core</translation>
-    </message>
     <message>
         <source>Error: Specified data directory "%1" cannot be created.</source>
         <translation>Помилка: неможливо створити обраний каталог даних «%1».</translation>
@@ -976,10 +582,6 @@
         <source>Select payment request file</source>
         <translation>Виберіть файл запиту платежу</translation>
     </message>
-    <message>
-        <source>Select payment request file to open</source>
-        <translation>Виберіть файл запиту платежу для відкриття</translation>
-    </message>
 </context>
 <context>
     <name>OptionsDialog</name>
@@ -1019,10 +621,6 @@
         <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Exit in the menu.</source>
         <translation>Згортати замість закриття. Якщо ця опція включена, програма закриється лише після вибору відповідного пункту в меню.</translation>
     </message>
-    <message>
-        <source>The user interface language can be set here. This setting will take effect after restarting Bitcoin Core.</source>
-        <translation>Встановлює мову інтерфейсу. Зміни набудуть чинності після перезапуску Bitcoin Core.</translation>
-    </message>
     <message>
         <source>Third party URLs (e.g. a block explorer) that appear in the transactions tab as context menu items. %s in the URL is replaced by transaction hash. Multiple URLs are separated by vertical bar |.</source>
         <translation>Сторонні URL (наприклад, block explorer), що з'являться на вкладці транзакцій у вигляді пункту контекстного меню. %s в URL буде замінено на хеш транзакції. Для відокремлення URLів використовуйте вертикальну риску |.</translation>
@@ -1047,14 +645,6 @@
         <source>&amp;Network</source>
         <translation>&amp;Мережа</translation>
     </message>
-    <message>
-        <source>Automatically start Bitcoin Core after logging in to the system.</source>
-        <translation>Автоматично запускати Bitcoin Core при вході до системи.</translation>
-    </message>
-    <message>
-        <source>&amp;Start Bitcoin Core on system login</source>
-        <translation>&amp;Запускати Bitcoin Core при вході до системи</translation>
-    </message>
     <message>
         <source>(0 = auto, &lt;0 = leave that many cores free)</source>
         <translation>(0 = автоматично, &lt;0 = вказує кількість вільних ядер)</translation>
@@ -1284,182 +874,72 @@
     </message>
 </context>
 <context>
-    <name>PaymentServer</name>
+    <name>PeerTableModel</name>
     <message>
-        <source>URI handling</source>
-        <translation>Обробка URI</translation>
+        <source>User Agent</source>
+        <translation>Клієнт користувача</translation>
     </message>
     <message>
-        <source>Invalid payment address %1</source>
-        <translation>Помилка в адресі платежу %1</translation>
+        <source>Node/Service</source>
+        <translation>Вузол/Сервіс</translation>
     </message>
     <message>
-        <source>Payment request rejected</source>
-        <translation>Запит платежу відхилено</translation>
+        <source>Ping Time</source>
+        <translation>Затримка</translation>
     </message>
+</context>
+<context>
+    <name>QObject</name>
     <message>
-        <source>Payment request network doesn't match client network.</source>
-        <translation>Мережа запиту платежу не є мережею клієнта.</translation>
+        <source>Amount</source>
+        <translation>Кількість</translation>
     </message>
     <message>
-        <source>Payment request is not initialized.</source>
-        <translation>Запит платежу не ініціалізовано.</translation>
+        <source>Enter a Bitcoin address (e.g. %1)</source>
+        <translation>Введіть адресу Bitcoin (наприклад %1)</translation>
     </message>
     <message>
-        <source>Requested payment amount of %1 is too small (considered dust).</source>
-        <translation>Сума запиту платежу для %1 занадто мала (вважається пилом)</translation>
+        <source>%1 d</source>
+        <translation>%1 д</translation>
     </message>
     <message>
-        <source>Payment request error</source>
-        <translation>Помилка запиту платежу</translation>
+        <source>%1 h</source>
+        <translation>%1 г</translation>
     </message>
     <message>
-        <source>Cannot start bitcoin: click-to-pay handler</source>
-        <translation>Неможливо запустити bitcoin: обробник click-to-pay</translation>
+        <source>%1 m</source>
+        <translation>%1 х</translation>
     </message>
     <message>
-        <source>Payment request fetch URL is invalid: %1</source>
-        <translation>URL запиту платежу є некоректним: %1</translation>
+        <source>%1 s</source>
+        <translation>%1 с</translation>
     </message>
     <message>
-        <source>URI cannot be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source>
-        <translation>Неможливо обробити URI! Причиною цього може бути некоректна Bitcoin-адреса або неправильні параметри URI.</translation>
+        <source>None</source>
+        <translation>Відсутні</translation>
     </message>
     <message>
-        <source>Payment request file handling</source>
-        <translation>Обробка файлу запиту платежу</translation>
+        <source>N/A</source>
+        <translation>Н/Д</translation>
     </message>
     <message>
-        <source>Payment request file cannot be read! This can be caused by an invalid payment request file.</source>
-        <translation>Неможливо прочитати файл запиту платежу! Ймовірно, файл пошкоджено.</translation>
+        <source>%1 ms</source>
+        <translation>%1 мс</translation>
     </message>
+</context>
+<context>
+    <name>RPCConsole</name>
     <message>
-        <source>Payment request expired.</source>
-        <translation>Запит платежу прострочено.</translation>
+        <source>Client name</source>
+        <translation>Назва клієнту</translation>
     </message>
     <message>
-        <source>Unverified payment requests to custom payment scripts are unsupported.</source>
-        <translation>Неперевірені запити платежів з власними платіжними сценаріями не підтримуються.</translation>
+        <source>N/A</source>
+        <translation>Н/Д</translation>
     </message>
     <message>
-        <source>Invalid payment request.</source>
-        <translation>Помилка в запиті платежу.</translation>
-    </message>
-    <message>
-        <source>Refund from %1</source>
-        <translation>Відшкодування з %1</translation>
-    </message>
-    <message>
-        <source>Payment request %1 is too large (%2 bytes, allowed %3 bytes).</source>
-        <translation>Запит платежу %1 занадто великий (%2 байт, дозволено %3 байт).</translation>
-    </message>
-    <message>
-        <source>Error communicating with %1: %2</source>
-        <translation>Помилка зв'язку з %1: %2</translation>
-    </message>
-    <message>
-        <source>Payment request cannot be parsed!</source>
-        <translation>Неможливо розпізнати запит платежу!</translation>
-    </message>
-    <message>
-        <source>Bad response from server %1</source>
-        <translation>Погана відповідь від сервера %1</translation>
-    </message>
-    <message>
-        <source>Payment acknowledged</source>
-        <translation>Платіж підтверджено</translation>
-    </message>
-    <message>
-        <source>Network request error</source>
-        <translation>Помилка мережевого запиту</translation>
-    </message>
-</context>
-<context>
-    <name>PeerTableModel</name>
-    <message>
-        <source>User Agent</source>
-        <translation>Клієнт користувача</translation>
-    </message>
-    <message>
-        <source>Node/Service</source>
-        <translation>Вузол/Сервіс</translation>
-    </message>
-    <message>
-        <source>Ping Time</source>
-        <translation>Затримка</translation>
-    </message>
-</context>
-<context>
-    <name>QObject</name>
-    <message>
-        <source>Amount</source>
-        <translation>Кількість</translation>
-    </message>
-    <message>
-        <source>Enter a Bitcoin address (e.g. %1)</source>
-        <translation>Введіть адресу Bitcoin (наприклад %1)</translation>
-    </message>
-    <message>
-        <source>%1 d</source>
-        <translation>%1 д</translation>
-    </message>
-    <message>
-        <source>%1 h</source>
-        <translation>%1 г</translation>
-    </message>
-    <message>
-        <source>%1 m</source>
-        <translation>%1 х</translation>
-    </message>
-    <message>
-        <source>%1 s</source>
-        <translation>%1 с</translation>
-    </message>
-    <message>
-        <source>None</source>
-        <translation>Відсутні</translation>
-    </message>
-    <message>
-        <source>N/A</source>
-        <translation>Н/Д</translation>
-    </message>
-    <message>
-        <source>%1 ms</source>
-        <translation>%1 мс</translation>
-    </message>
-</context>
-<context>
-    <name>QRImageWidget</name>
-    <message>
-        <source>&amp;Save Image...</source>
-        <translation>&amp;Зберегти зображення...</translation>
-    </message>
-    <message>
-        <source>&amp;Copy Image</source>
-        <translation>&amp;Копіювати зображення</translation>
-    </message>
-    <message>
-        <source>Save QR Code</source>
-        <translation>Зберегти QR-код</translation>
-    </message>
-    <message>
-        <source>PNG Image (*.png)</source>
-        <translation>Зображення PNG (*.png)</translation>
-    </message>
-</context>
-<context>
-    <name>RPCConsole</name>
-    <message>
-        <source>Client name</source>
-        <translation>Назва клієнту</translation>
-    </message>
-    <message>
-        <source>N/A</source>
-        <translation>Н/Д</translation>
-    </message>
-    <message>
-        <source>Client version</source>
-        <translation>Версія клієнту</translation>
+        <source>Client version</source>
+        <translation>Версія клієнту</translation>
     </message>
     <message>
         <source>&amp;Information</source>
@@ -1513,10 +993,6 @@
         <source>Memory usage</source>
         <translation>Використання пам'яті</translation>
     </message>
-    <message>
-        <source>Open the Bitcoin Core debug log file from the current data directory. This can take a few seconds for large log files.</source>
-        <translation>Відкрити файл журналу налагодження Bitcoin Core з поточного каталогу даних. Це може зайняти кілька секунд для великих файлів журналів.</translation>
-    </message>
     <message>
         <source>Received</source>
         <translation>Отримано</translation>
@@ -1633,10 +1109,6 @@
         <source>Out:</source>
         <translation>Вихідних:</translation>
     </message>
-    <message>
-        <source>Build date</source>
-        <translation>Дата збирання</translation>
-    </message>
     <message>
         <source>Debug log file</source>
         <translation>Файл звіту зневадження</translation>
@@ -1673,10 +1145,6 @@
         <source>&amp;Unban Node</source>
         <translation>&amp;Розблокувати Вузол</translation>
     </message>
-    <message>
-        <source>Welcome to the Bitcoin Core RPC console.</source>
-        <translation>Вітаємо у RPC-консолі Bitcoin Core.</translation>
-    </message>
     <message>
         <source>Use up and down arrows to navigate history, and &lt;b&gt;Ctrl-L&lt;/b&gt; to clear screen.</source>
         <translation>Використовуйте стрілки вгору вниз для навігації по історії, і &lt;b&gt;Ctrl-L&lt;/b&gt; для очищення екрана.</translation>
@@ -1804,18 +1272,6 @@
         <source>Remove</source>
         <translation>Вилучити</translation>
     </message>
-    <message>
-        <source>Copy label</source>
-        <translation>Скопіювати мітку</translation>
-    </message>
-    <message>
-        <source>Copy message</source>
-        <translation>Скопіювати повідомлення</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>Копіювати кількість</translation>
-    </message>
 </context>
 <context>
     <name>ReceiveRequestDialog</name>
@@ -1835,73 +1291,6 @@
         <source>&amp;Save Image...</source>
         <translation>&amp;Зберегти зображення...</translation>
     </message>
-    <message>
-        <source>Request payment to %1</source>
-        <translation>Запит платежу на %1</translation>
-    </message>
-    <message>
-        <source>Payment information</source>
-        <translation>Інформація про платіж</translation>
-    </message>
-    <message>
-        <source>URI</source>
-        <translation>URI</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>Адреса</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>Кількість</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Назва</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>Повідомлення</translation>
-    </message>
-    <message>
-        <source>Resulting URI too long, try to reduce the text for label / message.</source>
-        <translation>Кінцевий URI занадто довгий, спробуйте зменшити текст для мітки / повідомлення.</translation>
-    </message>
-    <message>
-        <source>Error encoding URI into QR Code.</source>
-        <translation>Помилка при кодуванні URI в QR-код.</translation>
-    </message>
-</context>
-<context>
-    <name>RecentRequestsTableModel</name>
-    <message>
-        <source>Date</source>
-        <translation>Дата</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Назва</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>Повідомлення</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>Кількість</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(немає назви)</translation>
-    </message>
-    <message>
-        <source>(no message)</source>
-        <translation>(без повідомлення)</translation>
-    </message>
-    <message>
-        <source>(no amount)</source>
-        <translation>(без суми)</translation>
-    </message>
 </context>
 <context>
     <name>SendCoinsDialog</name>
@@ -1950,955 +1339,309 @@
         <translation>Після комісії:</translation>
     </message>
     <message>
-        <source>Change:</source>
-        <translation>Решта:</translation>
-    </message>
-    <message>
-        <source>If this is activated, but the change address is empty or invalid, change will be sent to a newly generated address.</source>
-        <translation>Якщо це поле активовано, але адреса для решти відсутня або некоректна, то решта буде відправлена на новостворену адресу.</translation>
-    </message>
-    <message>
-        <source>Custom change address</source>
-        <translation>Вказати адресу для решти</translation>
-    </message>
-    <message>
-        <source>Transaction Fee:</source>
-        <translation>Комісія за передачу:</translation>
-    </message>
-    <message>
-        <source>Choose...</source>
-        <translation>Виберіть...</translation>
-    </message>
-    <message>
-        <source>collapse fee-settings</source>
-        <translation>згорнути налаштування оплат</translation>
-    </message>
-    <message>
-        <source>per kilobyte</source>
-        <translation>за кілобайт</translation>
-    </message>
-    <message>
-        <source>If the custom fee is set to 1000 satoshis and the transaction is only 250 bytes, then "per kilobyte" only pays 250 satoshis in fee, while "total at least" pays 1000 satoshis. For transactions bigger than a kilobyte both pay by kilobyte.</source>
-        <translation>Якщо комісія встановлюється в 1000 сатоші і розмір транзакції лише 250 байтів, то опція "за кілобайт" встановлює комісію в 250 сатоші, в той час, як "всього щонайменше" - в 1000 сатоші. Для транзакцій більших за кілобайт в обох випадках буде знято комісію за кілобайт.</translation>
-    </message>
-    <message>
-        <source>Hide</source>
-        <translation>Приховати</translation>
-    </message>
-    <message>
-        <source>total at least</source>
-        <translation>всього щонайменше</translation>
-    </message>
-    <message>
-        <source>Paying only the minimum fee is just fine as long as there is less transaction volume than space in the blocks. But be aware that this can end up in a never confirming transaction once there is more demand for bitcoin transactions than the network can process.</source>
-        <translation>Оплата тільки мінімальної комісії є прийнятною, допоки обсяг транзакцій є меншим простору в блоках. Але майте на увазі, що це може анулювати транзакцію, якщо попит на Bitcoin транзакції стане більшим, ніж мережа зможе обробити.</translation>
-    </message>
-    <message>
-        <source>(read the tooltip)</source>
-        <translation>(читати підказки)</translation>
-    </message>
-    <message>
-        <source>Recommended:</source>
-        <translation>Рекомендовано:</translation>
-    </message>
-    <message>
-        <source>Custom:</source>
-        <translation>Змінено:</translation>
-    </message>
-    <message>
-        <source>(Smart fee not initialized yet. This usually takes a few blocks...)</source>
-        <translation>(Розумну оплату ще не ініціалізовано. Це, зазвичай, триває кілька блоків...)</translation>
-    </message>
-    <message>
-        <source>Confirmation time:</source>
-        <translation>Час підтвердження:</translation>
-    </message>
-    <message>
-        <source>normal</source>
-        <translation>звичайний</translation>
-    </message>
-    <message>
-        <source>fast</source>
-        <translation>швидкий</translation>
-    </message>
-    <message>
-        <source>Send as zero-fee transaction if possible</source>
-        <translation>Надіслати транзакцію без сплати комісії, якщо це можливо</translation>
-    </message>
-    <message>
-        <source>(confirmation may take longer)</source>
-        <translation>(підтвердження може зайняти більше часу)</translation>
-    </message>
-    <message>
-        <source>Send to multiple recipients at once</source>
-        <translation>Відправити на декілька адрес</translation>
-    </message>
-    <message>
-        <source>Add &amp;Recipient</source>
-        <translation>Дод&amp;ати одержувача</translation>
-    </message>
-    <message>
-        <source>Clear all fields of the form.</source>
-        <translation>Очистити всі поля в формі</translation>
-    </message>
-    <message>
-        <source>Dust:</source>
-        <translation>Пил:</translation>
-    </message>
-    <message>
-        <source>Clear &amp;All</source>
-        <translation>Очистити &amp;все</translation>
-    </message>
-    <message>
-        <source>Balance:</source>
-        <translation>Баланс:</translation>
-    </message>
-    <message>
-        <source>Confirm the send action</source>
-        <translation>Підтвердити відправлення</translation>
-    </message>
-    <message>
-        <source>S&amp;end</source>
-        <translation>&amp;Відправити</translation>
-    </message>
-    <message>
-        <source>Confirm send coins</source>
-        <translation>Підтвердіть відправлення</translation>
-    </message>
-    <message>
-        <source>%1 to %2</source>
-        <translation>%1 на %2</translation>
-    </message>
-    <message>
-        <source>Copy quantity</source>
-        <translation>Копіювати кількість</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>Копіювати суму</translation>
-    </message>
-    <message>
-        <source>Copy fee</source>
-        <translation>Копіювати комісію</translation>
-    </message>
-    <message>
-        <source>Copy after fee</source>
-        <translation>Копіювати після комісії</translation>
-    </message>
-    <message>
-        <source>Copy bytes</source>
-        <translation>Копіювати байти</translation>
-    </message>
-    <message>
-        <source>Copy priority</source>
-        <translation>Копіювати пріорітет</translation>
-    </message>
-    <message>
-        <source>Copy change</source>
-        <translation>Копіювати решту</translation>
-    </message>
-    <message>
-        <source>Total Amount %1</source>
-        <translation>Всього %1</translation>
-    </message>
-    <message>
-        <source>or</source>
-        <translation>або</translation>
-    </message>
-    <message>
-        <source>The amount to pay must be larger than 0.</source>
-        <translation>Кількість монет для відправлення повинна бути більше 0.</translation>
-    </message>
-    <message>
-        <source>The amount exceeds your balance.</source>
-        <translation>Кількість монет для відправлення перевищує ваш баланс.</translation>
-    </message>
-    <message>
-        <source>The total exceeds your balance when the %1 transaction fee is included.</source>
-        <translation>Сума перевищить ваш баланс, якщо комісія %1 буде додана до вашої транзакції.</translation>
-    </message>
-    <message>
-        <source>Transaction creation failed!</source>
-        <translation>Не вдалося створити транзакцію!</translation>
-    </message>
-    <message>
-        <source>The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source>
-        <translation>Транзакцію відхилено! Це може статись, якщо декілька монет з вашого гаманця вже використані, наприклад, якщо ви використовуєте одну копію гаманця (wallet.dat), а монети були використані з іншої копії, але не позначені як використані в цій.</translation>
-    </message>
-    <message>
-        <source>A fee higher than %1 is considered an absurdly high fee.</source>
-        <translation>Плата вища, ніж %1 вважається шалено високою.</translation>
-    </message>
-    <message>
-        <source>Payment request expired.</source>
-        <translation>Запит платежу прострочено.</translation>
-    </message>
-    <message>
-        <source>Pay only the required fee of %1</source>
-        <translation>Сплатіть лише мінімальну комісію у розмірі %1</translation>
-    </message>
-    <message numerus="yes">
-        <source>Estimated to begin confirmation within %n block(s).</source>
-        <translation><numerusform>Перше підтвердження очікується протягом %n блоку.</numerusform><numerusform>Перше підтвердження очікується протягом %n блоків.</numerusform><numerusform>Перше підтвердження очікується протягом %n блоків.</numerusform></translation>
-    </message>
-    <message>
-        <source>The recipient address is not valid. Please recheck.</source>
-        <translation>Адреса отримувача неправильна. Будь ласка, перевірте її.</translation>
-    </message>
-    <message>
-        <source>Duplicate address found: addresses should only be used once each.</source>
-        <translation>Знайдено адресу, що дублюється: кожна адреса має бути вказана не більше одного разу.</translation>
-    </message>
-    <message>
-        <source>Warning: Invalid Bitcoin address</source>
-        <translation>Увага: Неправильна Bitcoin-адреса</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(немає назви)</translation>
-    </message>
-    <message>
-        <source>Warning: Unknown change address</source>
-        <translation>Увага: Невідома адреса для решти</translation>
-    </message>
-    <message>
-        <source>Copy dust</source>
-        <translation>Копіювати пил</translation>
-    </message>
-    <message>
-        <source>Are you sure you want to send?</source>
-        <translation>Ви впевнені, що хочете відправити?</translation>
-    </message>
-    <message>
-        <source>added as transaction fee</source>
-        <translation>додано як комісія за транзакцію</translation>
-    </message>
-</context>
-<context>
-    <name>SendCoinsEntry</name>
-    <message>
-        <source>A&amp;mount:</source>
-        <translation>&amp;Кількість:</translation>
-    </message>
-    <message>
-        <source>Pay &amp;To:</source>
-        <translation>&amp;Отримувач:</translation>
-    </message>
-    <message>
-        <source>Enter a label for this address to add it to your address book</source>
-        <translation>Введіть мітку для цієї адреси для додавання її в адресну книгу</translation>
-    </message>
-    <message>
-        <source>&amp;Label:</source>
-        <translation>&amp;Мітка:</translation>
-    </message>
-    <message>
-        <source>Choose previously used address</source>
-        <translation>Обрати ранiш використовувану адресу</translation>
-    </message>
-    <message>
-        <source>This is a normal payment.</source>
-        <translation>Це звичайний платіж.</translation>
-    </message>
-    <message>
-        <source>The Bitcoin address to send the payment to</source>
-        <translation>Адреса Bitcoin для відправлення платежу</translation>
-    </message>
-    <message>
-        <source>Alt+A</source>
-        <translation>Alt+A</translation>
-    </message>
-    <message>
-        <source>Paste address from clipboard</source>
-        <translation>Вставити адресу</translation>
-    </message>
-    <message>
-        <source>Alt+P</source>
-        <translation>Alt+P</translation>
-    </message>
-    <message>
-        <source>Remove this entry</source>
-        <translation>Видалити цей запис</translation>
-    </message>
-    <message>
-        <source>The fee will be deducted from the amount being sent. The recipient will receive less bitcoins than you enter in the amount field. If multiple recipients are selected, the fee is split equally.</source>
-        <translation>Комісію буде знято зі вказаної суми. До отримувача надійде менше біткоінів, ніж було вказано в полі кількості. Якщо ж отримувачів декілька - комісію буде розподілено між ними.</translation>
-    </message>
-    <message>
-        <source>S&amp;ubtract fee from amount</source>
-        <translation>В&amp;ідняти комісію від суми</translation>
-    </message>
-    <message>
-        <source>Message:</source>
-        <translation>Повідомлення:</translation>
-    </message>
-    <message>
-        <source>This is an unauthenticated payment request.</source>
-        <translation>Цей запит платежу не є автентифікованим.</translation>
-    </message>
-    <message>
-        <source>This is an authenticated payment request.</source>
-        <translation>Цей запит платежу є автентифікованим.</translation>
-    </message>
-    <message>
-        <source>Enter a label for this address to add it to the list of used addresses</source>
-        <translation>Введіть мітку для цієї адреси для додавання її в список використаних адрес</translation>
-    </message>
-    <message>
-        <source>A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
-        <translation>Повідомлення, що було додане до bitcoin:URI та буде збережено разом з транзакцією для довідки. Примітка: Це повідомлення не буде відправлено в мережу Bitcoin.</translation>
-    </message>
-    <message>
-        <source>Pay To:</source>
-        <translation>Отримувач:</translation>
-    </message>
-    <message>
-        <source>Memo:</source>
-        <translation>Нотатка:</translation>
-    </message>
-</context>
-<context>
-    <name>ShutdownWindow</name>
-    <message>
-        <source>Bitcoin Core is shutting down...</source>
-        <translation>Bitcoin Core вимикається...</translation>
-    </message>
-    <message>
-        <source>Do not shut down the computer until this window disappears.</source>
-        <translation>Не вимикайте комп’ютер до зникнення цього вікна.</translation>
-    </message>
-</context>
-<context>
-    <name>SignVerifyMessageDialog</name>
-    <message>
-        <source>Signatures - Sign / Verify a Message</source>
-        <translation>Підписи - Підпис / Перевірка повідомлення</translation>
-    </message>
-    <message>
-        <source>&amp;Sign Message</source>
-        <translation>&amp;Підписати повідомлення</translation>
-    </message>
-    <message>
-        <source>You can sign messages/agreements with your addresses to prove you can receive bitcoins sent to them. Be careful not to sign anything vague or random, as phishing attacks may try to trick you into signing your identity over to them. Only sign fully-detailed statements you agree to.</source>
-        <translation>Ви можете підписувати повідомлення/угоди своїми адресами, щоб довести можливість отримання біткоінів, що будуть надіслані на них. Остерігайтеся підписувати будь-що нечітке чи неочікуване, так як за допомогою фішинг-атаки вас можуть спробувати ввести в оману для отримання вашого підпису під чужими словами. Підписуйте лише чіткі твердження, з якими ви повністю згодні.</translation>
-    </message>
-    <message>
-        <source>The Bitcoin address to sign the message with</source>
-        <translation>Адреса Bitcoin для підпису цього повідомлення</translation>
-    </message>
-    <message>
-        <source>Choose previously used address</source>
-        <translation>Обрати ранiш використовувану адресу</translation>
-    </message>
-    <message>
-        <source>Alt+A</source>
-        <translation>Alt+A</translation>
-    </message>
-    <message>
-        <source>Paste address from clipboard</source>
-        <translation>Вставити адресу</translation>
-    </message>
-    <message>
-        <source>Alt+P</source>
-        <translation>Alt+P</translation>
-    </message>
-    <message>
-        <source>Enter the message you want to sign here</source>
-        <translation>Введіть повідомлення, яке ви хочете підписати тут</translation>
-    </message>
-    <message>
-        <source>Signature</source>
-        <translation>Підпис</translation>
-    </message>
-    <message>
-        <source>Copy the current signature to the system clipboard</source>
-        <translation>Копіювати поточну сигнатуру до системного буферу обміну</translation>
-    </message>
-    <message>
-        <source>Sign the message to prove you own this Bitcoin address</source>
-        <translation>Підпишіть повідомлення щоб довести, що ви є власником цієї адреси</translation>
-    </message>
-    <message>
-        <source>Sign &amp;Message</source>
-        <translation>&amp;Підписати повідомлення</translation>
-    </message>
-    <message>
-        <source>Reset all sign message fields</source>
-        <translation>Скинути всі поля підпису повідомлення</translation>
-    </message>
-    <message>
-        <source>Clear &amp;All</source>
-        <translation>Очистити &amp;все</translation>
-    </message>
-    <message>
-        <source>&amp;Verify Message</source>
-        <translation>П&amp;еревірити повідомлення</translation>
-    </message>
-    <message>
-        <source>Enter the receiver's address, message (ensure you copy line breaks, spaces, tabs, etc. exactly) and signature below to verify the message. Be careful not to read more into the signature than what is in the signed message itself, to avoid being tricked by a man-in-the-middle attack. Note that this only proves the signing party receives with the address, it cannot prove sendership of any transaction!</source>
-        <translation>Введіть нижче адресу отримувача, повідомлення (впевніться, що ви точно скопіювали символи завершення рядка, табуляцію, пробіли тощо) та підпис для перевірки повідомлення. Впевніться, що в підпис не було додано зайвих символів: це допоможе уникнути атак типу «людина посередині». Зауважте, що це лише засвідчує можливість отримання транзакцій підписувачем, але не в стані підтвердити джерело жодної транзакції!</translation>
-    </message>
-    <message>
-        <source>The Bitcoin address the message was signed with</source>
-        <translation>Адреса Bitcoin, якою було підписано це повідомлення</translation>
-    </message>
-    <message>
-        <source>Verify the message to ensure it was signed with the specified Bitcoin address</source>
-        <translation>Перевірте повідомлення для впевненості, що воно підписано вказаною Bitcoin-адресою</translation>
-    </message>
-    <message>
-        <source>Verify &amp;Message</source>
-        <translation>Пере&amp;вірити повідомлення</translation>
-    </message>
-    <message>
-        <source>Reset all verify message fields</source>
-        <translation>Скинути всі поля перевірки повідомлення</translation>
-    </message>
-    <message>
-        <source>Click "Sign Message" to generate signature</source>
-        <translation>Натисніть кнопку «Підписати повідомлення», для отримання підпису</translation>
-    </message>
-    <message>
-        <source>The entered address is invalid.</source>
-        <translation>Введена нечинна адреса.</translation>
-    </message>
-    <message>
-        <source>Please check the address and try again.</source>
-        <translation>Будь ласка, перевірте адресу та спробуйте ще.</translation>
-    </message>
-    <message>
-        <source>The entered address does not refer to a key.</source>
-        <translation>Введена адреса не відноситься до ключа.</translation>
-    </message>
-    <message>
-        <source>Wallet unlock was cancelled.</source>
-        <translation>Розблокування гаманця було скасоване.</translation>
-    </message>
-    <message>
-        <source>Private key for the entered address is not available.</source>
-        <translation>Приватний ключ для введеної адреси недоступний. </translation>
-    </message>
-    <message>
-        <source>Message signing failed.</source>
-        <translation>Не вдалося підписати повідомлення.</translation>
-    </message>
-    <message>
-        <source>Message signed.</source>
-        <translation>Повідомлення підписано.</translation>
-    </message>
-    <message>
-        <source>The signature could not be decoded.</source>
-        <translation>Підпис не можливо декодувати.</translation>
-    </message>
-    <message>
-        <source>Please check the signature and try again.</source>
-        <translation>Будь ласка, перевірте підпис та спробуйте ще.</translation>
-    </message>
-    <message>
-        <source>The signature did not match the message digest.</source>
-        <translation>Підпис не збігається з хешем повідомлення.</translation>
-    </message>
-    <message>
-        <source>Message verification failed.</source>
-        <translation>Не вдалося перевірити повідомлення.</translation>
-    </message>
-    <message>
-        <source>Message verified.</source>
-        <translation>Повідомлення перевірено.</translation>
-    </message>
-</context>
-<context>
-    <name>SplashScreen</name>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Bitcoin Core</translation>
-    </message>
-    <message>
-        <source>The Bitcoin Core developers</source>
-        <translation>Розробники Bitcoin Core</translation>
-    </message>
-    <message>
-        <source>[testnet]</source>
-        <translation>[тестова мережа]</translation>
-    </message>
-</context>
-<context>
-    <name>TrafficGraphWidget</name>
-    <message>
-        <source>KB/s</source>
-        <translation>КБ/с</translation>
-    </message>
-</context>
-<context>
-    <name>TransactionDesc</name>
-    <message>
-        <source>Open until %1</source>
-        <translation>Відкрито до %1</translation>
-    </message>
-    <message>
-        <source>conflicted</source>
-        <translation>суперечить</translation>
-    </message>
-    <message>
-        <source>%1/offline</source>
-        <translation>%1/поза інтернетом</translation>
-    </message>
-    <message>
-        <source>%1/unconfirmed</source>
-        <translation>%1/не підтверджено</translation>
-    </message>
-    <message>
-        <source>%1 confirmations</source>
-        <translation>%1 підтверджень</translation>
-    </message>
-    <message>
-        <source>Status</source>
-        <translation>Статус</translation>
-    </message>
-    <message numerus="yes">
-        <source>, broadcast through %n node(s)</source>
-        <translation><numerusform>, розіслано через %n вузол</numerusform><numerusform>, розіслано через %n вузли</numerusform><numerusform>, розіслано через %n вузлів</numerusform></translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation>Дата</translation>
-    </message>
-    <message>
-        <source>Source</source>
-        <translation>Джерело</translation>
-    </message>
-    <message>
-        <source>Generated</source>
-        <translation>Згенеровано</translation>
-    </message>
-    <message>
-        <source>From</source>
-        <translation>Відправник</translation>
-    </message>
-    <message>
-        <source>To</source>
-        <translation>Отримувач</translation>
-    </message>
-    <message>
-        <source>own address</source>
-        <translation>Власна адреса</translation>
-    </message>
-    <message>
-        <source>watch-only</source>
-        <translation>тільки спостереження</translation>
-    </message>
-    <message>
-        <source>label</source>
-        <translation>Мітка</translation>
-    </message>
-    <message>
-        <source>Credit</source>
-        <translation>Кредит</translation>
-    </message>
-    <message numerus="yes">
-        <source>matures in %n more block(s)</source>
-        <translation><numerusform>«дозріє» через %n блок</numerusform><numerusform>«дозріє» через %n блоки</numerusform><numerusform>«дозріє» через %n блоків</numerusform></translation>
-    </message>
-    <message>
-        <source>not accepted</source>
-        <translation>не прийнято</translation>
-    </message>
-    <message>
-        <source>Debit</source>
-        <translation>Дебет</translation>
-    </message>
-    <message>
-        <source>Total debit</source>
-        <translation>Загальний дебет</translation>
-    </message>
-    <message>
-        <source>Total credit</source>
-        <translation>Загальний кредит</translation>
-    </message>
-    <message>
-        <source>Transaction fee</source>
-        <translation>Комісія за транзакцію</translation>
-    </message>
-    <message>
-        <source>Net amount</source>
-        <translation>Загальна сума</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>Повідомлення</translation>
-    </message>
-    <message>
-        <source>Comment</source>
-        <translation>Коментар</translation>
-    </message>
-    <message>
-        <source>Transaction ID</source>
-        <translation>ID транзакції</translation>
-    </message>
-    <message>
-        <source>Merchant</source>
-        <translation>Продавець</translation>
-    </message>
-    <message>
-        <source>Generated coins must mature %1 blocks before they can be spent. When you generated this block, it was broadcast to the network to be added to the block chain. If it fails to get into the chain, its state will change to "not accepted" and it won't be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source>
-        <translation>Після генерації монет, потрібно зачекати %1 блоків, перш ніж їх можна буде використати. Коли ви згенерували цей блок, його було відправлено в мережу для того, щоб він був доданий до ланцюжка блоків. Якщо ця процедура не вдасться, статус буде змінено на «не підтверджено» і ви не зможете витратити згенеровані монети. Таке може статись, якщо хтось інший згенерував блок на декілька секунд раніше.</translation>
-    </message>
-    <message>
-        <source>Debug information</source>
-        <translation>Налагоджувальна інформація</translation>
-    </message>
-    <message>
-        <source>Transaction</source>
-        <translation>Транзакція</translation>
-    </message>
-    <message>
-        <source>Inputs</source>
-        <translation>Входи</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>Кількість</translation>
-    </message>
-    <message>
-        <source>true</source>
-        <translation>true</translation>
+        <source>Change:</source>
+        <translation>Решта:</translation>
     </message>
     <message>
-        <source>false</source>
-        <translation>false</translation>
+        <source>If this is activated, but the change address is empty or invalid, change will be sent to a newly generated address.</source>
+        <translation>Якщо це поле активовано, але адреса для решти відсутня або некоректна, то решта буде відправлена на новостворену адресу.</translation>
     </message>
     <message>
-        <source>, has not been successfully broadcast yet</source>
-        <translation>, ще не було успішно розіслано</translation>
-    </message>
-    <message numerus="yes">
-        <source>Open for %n more block(s)</source>
-        <translation><numerusform>Відкрито на %n блок</numerusform><numerusform>Відкрито на %n блоки</numerusform><numerusform>Відкрито на %n блоків</numerusform></translation>
+        <source>Custom change address</source>
+        <translation>Вказати адресу для решти</translation>
     </message>
     <message>
-        <source>unknown</source>
-        <translation>невідомо</translation>
+        <source>Transaction Fee:</source>
+        <translation>Комісія за передачу:</translation>
     </message>
-</context>
-<context>
-    <name>TransactionDescDialog</name>
     <message>
-        <source>Transaction details</source>
-        <translation>Деталі транзакції</translation>
+        <source>Choose...</source>
+        <translation>Виберіть...</translation>
     </message>
     <message>
-        <source>This pane shows a detailed description of the transaction</source>
-        <translation>Даний діалог показує детальну статистику по вибраній транзакції</translation>
+        <source>collapse fee-settings</source>
+        <translation>згорнути налаштування оплат</translation>
     </message>
-</context>
-<context>
-    <name>TransactionTableModel</name>
     <message>
-        <source>Date</source>
-        <translation>Дата</translation>
+        <source>per kilobyte</source>
+        <translation>за кілобайт</translation>
     </message>
     <message>
-        <source>Type</source>
-        <translation>Тип</translation>
+        <source>If the custom fee is set to 1000 satoshis and the transaction is only 250 bytes, then "per kilobyte" only pays 250 satoshis in fee, while "total at least" pays 1000 satoshis. For transactions bigger than a kilobyte both pay by kilobyte.</source>
+        <translation>Якщо комісія встановлюється в 1000 сатоші і розмір транзакції лише 250 байтів, то опція "за кілобайт" встановлює комісію в 250 сатоші, в той час, як "всього щонайменше" - в 1000 сатоші. Для транзакцій більших за кілобайт в обох випадках буде знято комісію за кілобайт.</translation>
     </message>
     <message>
-        <source>Immature (%1 confirmations, will be available after %2)</source>
-        <translation>Незрілі (%1 підтверджень, будуть доступні після %2)</translation>
-    </message>
-    <message numerus="yes">
-        <source>Open for %n more block(s)</source>
-        <translation><numerusform>Відкрито на %n блок</numerusform><numerusform>Відкрито на %n блоки</numerusform><numerusform>Відкрито на %n блоків</numerusform></translation>
+        <source>Hide</source>
+        <translation>Приховати</translation>
     </message>
     <message>
-        <source>Open until %1</source>
-        <translation>Відкрито до %1</translation>
+        <source>total at least</source>
+        <translation>всього щонайменше</translation>
     </message>
     <message>
-        <source>Confirmed (%1 confirmations)</source>
-        <translation>Підтверджено (%1 підтверджень)</translation>
+        <source>Paying only the minimum fee is just fine as long as there is less transaction volume than space in the blocks. But be aware that this can end up in a never confirming transaction once there is more demand for bitcoin transactions than the network can process.</source>
+        <translation>Оплата тільки мінімальної комісії є прийнятною, допоки обсяг транзакцій є меншим простору в блоках. Але майте на увазі, що це може анулювати транзакцію, якщо попит на Bitcoin транзакції стане більшим, ніж мережа зможе обробити.</translation>
     </message>
     <message>
-        <source>This block was not received by any other nodes and will probably not be accepted!</source>
-        <translation>Цей блок не був отриманий жодними іншими вузлами і, ймовірно, не буде прийнятий!</translation>
+        <source>(read the tooltip)</source>
+        <translation>(читати підказки)</translation>
     </message>
     <message>
-        <source>Generated but not accepted</source>
-        <translation>Згенеровано, але не підтверджено</translation>
+        <source>Recommended:</source>
+        <translation>Рекомендовано:</translation>
     </message>
     <message>
-        <source>Offline</source>
-        <translation>Поза мережею</translation>
+        <source>Custom:</source>
+        <translation>Змінено:</translation>
     </message>
     <message>
-        <source>Label</source>
-        <translation>Назва</translation>
+        <source>(Smart fee not initialized yet. This usually takes a few blocks...)</source>
+        <translation>(Розумну оплату ще не ініціалізовано. Це, зазвичай, триває кілька блоків...)</translation>
     </message>
     <message>
-        <source>Unconfirmed</source>
-        <translation>Не підтверджено</translation>
+        <source>Confirmation time:</source>
+        <translation>Час підтвердження:</translation>
     </message>
     <message>
-        <source>Confirming (%1 of %2 recommended confirmations)</source>
-        <translation>Підтверджується (%1 з %2 рекомендованих підтверджень)</translation>
+        <source>normal</source>
+        <translation>звичайний</translation>
     </message>
     <message>
-        <source>Conflicted</source>
-        <translation>Суперечить</translation>
+        <source>fast</source>
+        <translation>швидкий</translation>
     </message>
     <message>
-        <source>Received with</source>
-        <translation>Отримані на</translation>
+        <source>Send to multiple recipients at once</source>
+        <translation>Відправити на декілька адрес</translation>
     </message>
     <message>
-        <source>Received from</source>
-        <translation>Отримано від</translation>
+        <source>Add &amp;Recipient</source>
+        <translation>Дод&amp;ати одержувача</translation>
     </message>
     <message>
-        <source>Sent to</source>
-        <translation>Відправлені на</translation>
+        <source>Clear all fields of the form.</source>
+        <translation>Очистити всі поля в формі</translation>
     </message>
     <message>
-        <source>Payment to yourself</source>
-        <translation>Відправлено собі</translation>
+        <source>Dust:</source>
+        <translation>Пил:</translation>
     </message>
     <message>
-        <source>Mined</source>
-        <translation>Добуті</translation>
+        <source>Clear &amp;All</source>
+        <translation>Очистити &amp;все</translation>
     </message>
     <message>
-        <source>watch-only</source>
-        <translation>тільки спостереження</translation>
+        <source>Balance:</source>
+        <translation>Баланс:</translation>
     </message>
     <message>
-        <source>(n/a)</source>
-        <translation>(недоступно)</translation>
+        <source>Confirm the send action</source>
+        <translation>Підтвердити відправлення</translation>
     </message>
     <message>
-        <source>Transaction status. Hover over this field to show number of confirmations.</source>
-        <translation>Статус транзакції. Наведіть вказівник на це поле, щоб показати кількість підтверджень.</translation>
+        <source>S&amp;end</source>
+        <translation>&amp;Відправити</translation>
     </message>
+</context>
+<context>
+    <name>SendCoinsEntry</name>
     <message>
-        <source>Date and time that the transaction was received.</source>
-        <translation>Дата і час, коли транзакцію було отримано.</translation>
+        <source>A&amp;mount:</source>
+        <translation>&amp;Кількість:</translation>
     </message>
     <message>
-        <source>Type of transaction.</source>
-        <translation>Тип транзакції.</translation>
+        <source>Pay &amp;To:</source>
+        <translation>&amp;Отримувач:</translation>
     </message>
     <message>
-        <source>Whether or not a watch-only address is involved in this transaction.</source>
-        <translation>Показує, чи було залучено адресу для спостереження в цій транзакції.</translation>
+        <source>&amp;Label:</source>
+        <translation>&amp;Мітка:</translation>
     </message>
     <message>
-        <source>User-defined intent/purpose of the transaction.</source>
-        <translation>Призначення транзакції (визначається користувачем).</translation>
+        <source>Choose previously used address</source>
+        <translation>Обрати ранiш використовувану адресу</translation>
     </message>
     <message>
-        <source>Amount removed from or added to balance.</source>
-        <translation>Сума, додана чи знята з балансу.</translation>
+        <source>This is a normal payment.</source>
+        <translation>Це звичайний платіж.</translation>
     </message>
-</context>
-<context>
-    <name>TransactionView</name>
     <message>
-        <source>All</source>
-        <translation>Всі</translation>
+        <source>The Bitcoin address to send the payment to</source>
+        <translation>Адреса Bitcoin для відправлення платежу</translation>
     </message>
     <message>
-        <source>Today</source>
-        <translation>Сьогодні</translation>
+        <source>Alt+A</source>
+        <translation>Alt+A</translation>
     </message>
     <message>
-        <source>This week</source>
-        <translation>На цьому тижні</translation>
+        <source>Paste address from clipboard</source>
+        <translation>Вставити адресу</translation>
     </message>
     <message>
-        <source>This month</source>
-        <translation>На цьому місяці</translation>
+        <source>Alt+P</source>
+        <translation>Alt+P</translation>
     </message>
     <message>
-        <source>Last month</source>
-        <translation>Минулого місяця</translation>
+        <source>Remove this entry</source>
+        <translation>Видалити цей запис</translation>
     </message>
     <message>
-        <source>This year</source>
-        <translation>Цього року</translation>
+        <source>The fee will be deducted from the amount being sent. The recipient will receive less bitcoins than you enter in the amount field. If multiple recipients are selected, the fee is split equally.</source>
+        <translation>Комісію буде знято зі вказаної суми. До отримувача надійде менше біткоінів, ніж було вказано в полі кількості. Якщо ж отримувачів декілька - комісію буде розподілено між ними.</translation>
     </message>
     <message>
-        <source>Range...</source>
-        <translation>Проміжок...</translation>
+        <source>S&amp;ubtract fee from amount</source>
+        <translation>В&amp;ідняти комісію від суми</translation>
     </message>
     <message>
-        <source>Received with</source>
-        <translation>Отримані на</translation>
+        <source>Message:</source>
+        <translation>Повідомлення:</translation>
     </message>
     <message>
-        <source>Sent to</source>
-        <translation>Відправлені на</translation>
+        <source>This is an unauthenticated payment request.</source>
+        <translation>Цей запит платежу не є автентифікованим.</translation>
     </message>
     <message>
-        <source>To yourself</source>
-        <translation>Відправлені собі</translation>
+        <source>This is an authenticated payment request.</source>
+        <translation>Цей запит платежу є автентифікованим.</translation>
     </message>
     <message>
-        <source>Mined</source>
-        <translation>Добуті</translation>
+        <source>Enter a label for this address to add it to the list of used addresses</source>
+        <translation>Введіть мітку для цієї адреси для додавання її в список використаних адрес</translation>
     </message>
     <message>
-        <source>Other</source>
-        <translation>Інше</translation>
+        <source>A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
+        <translation>Повідомлення, що було додане до bitcoin:URI та буде збережено разом з транзакцією для довідки. Примітка: Це повідомлення не буде відправлено в мережу Bitcoin.</translation>
     </message>
     <message>
-        <source>Enter address or label to search</source>
-        <translation>Введіть адресу чи мітку для пошуку</translation>
+        <source>Pay To:</source>
+        <translation>Отримувач:</translation>
     </message>
     <message>
-        <source>Min amount</source>
-        <translation>Мінімальна сума</translation>
+        <source>Memo:</source>
+        <translation>Нотатка:</translation>
     </message>
+</context>
+<context>
+    <name>ShutdownWindow</name>
     <message>
-        <source>Copy address</source>
-        <translation>Скопіювати адресу</translation>
+        <source>Do not shut down the computer until this window disappears.</source>
+        <translation>Не вимикайте комп’ютер до зникнення цього вікна.</translation>
     </message>
+</context>
+<context>
+    <name>SignVerifyMessageDialog</name>
     <message>
-        <source>Copy label</source>
-        <translation>Скопіювати мітку</translation>
+        <source>Signatures - Sign / Verify a Message</source>
+        <translation>Підписи - Підпис / Перевірка повідомлення</translation>
     </message>
     <message>
-        <source>Copy amount</source>
-        <translation>Скопіювати суму</translation>
+        <source>&amp;Sign Message</source>
+        <translation>&amp;Підписати повідомлення</translation>
     </message>
     <message>
-        <source>Copy transaction ID</source>
-        <translation>Скопіювати ID транзакції </translation>
+        <source>You can sign messages/agreements with your addresses to prove you can receive bitcoins sent to them. Be careful not to sign anything vague or random, as phishing attacks may try to trick you into signing your identity over to them. Only sign fully-detailed statements you agree to.</source>
+        <translation>Ви можете підписувати повідомлення/угоди своїми адресами, щоб довести можливість отримання біткоінів, що будуть надіслані на них. Остерігайтеся підписувати будь-що нечітке чи неочікуване, так як за допомогою фішинг-атаки вас можуть спробувати ввести в оману для отримання вашого підпису під чужими словами. Підписуйте лише чіткі твердження, з якими ви повністю згодні.</translation>
     </message>
     <message>
-        <source>Copy raw transaction</source>
-        <translation>Скопіювати RAW транзакцію</translation>
+        <source>The Bitcoin address to sign the message with</source>
+        <translation>Адреса Bitcoin для підпису цього повідомлення</translation>
     </message>
     <message>
-        <source>Edit label</source>
-        <translation>Редагувати мітку</translation>
+        <source>Choose previously used address</source>
+        <translation>Обрати ранiш використовувану адресу</translation>
     </message>
     <message>
-        <source>Show transaction details</source>
-        <translation>Показати деталі транзакції</translation>
+        <source>Alt+A</source>
+        <translation>Alt+A</translation>
     </message>
     <message>
-        <source>Export Transaction History</source>
-        <translation>Експортувати історію транзакцій</translation>
+        <source>Paste address from clipboard</source>
+        <translation>Вставити адресу</translation>
     </message>
     <message>
-        <source>Watch-only</source>
-        <translation>Для спостереження</translation>
+        <source>Alt+P</source>
+        <translation>Alt+P</translation>
     </message>
     <message>
-        <source>Exporting Failed</source>
-        <translation>Помилка експорту</translation>
+        <source>Enter the message you want to sign here</source>
+        <translation>Введіть повідомлення, яке ви хочете підписати тут</translation>
     </message>
     <message>
-        <source>There was an error trying to save the transaction history to %1.</source>
-        <translation>Виникла помилка при спробі зберігання історії транзакцій до %1.</translation>
+        <source>Signature</source>
+        <translation>Підпис</translation>
     </message>
     <message>
-        <source>Exporting Successful</source>
-        <translation>Експорт успішно виконано</translation>
+        <source>Copy the current signature to the system clipboard</source>
+        <translation>Копіювати поточну сигнатуру до системного буферу обміну</translation>
     </message>
     <message>
-        <source>The transaction history was successfully saved to %1.</source>
-        <translation>Історію транзакцій було успішно збережено до %1.</translation>
+        <source>Sign the message to prove you own this Bitcoin address</source>
+        <translation>Підпишіть повідомлення щоб довести, що ви є власником цієї адреси</translation>
     </message>
     <message>
-        <source>Comma separated file (*.csv)</source>
-        <translation>Значення, розділені комою (*.csv)</translation>
+        <source>Sign &amp;Message</source>
+        <translation>&amp;Підписати повідомлення</translation>
     </message>
     <message>
-        <source>Confirmed</source>
-        <translation>Підтверджені</translation>
+        <source>Reset all sign message fields</source>
+        <translation>Скинути всі поля підпису повідомлення</translation>
     </message>
     <message>
-        <source>Date</source>
-        <translation>Дата</translation>
+        <source>Clear &amp;All</source>
+        <translation>Очистити &amp;все</translation>
     </message>
     <message>
-        <source>Type</source>
-        <translation>Тип</translation>
+        <source>&amp;Verify Message</source>
+        <translation>П&amp;еревірити повідомлення</translation>
     </message>
     <message>
-        <source>Label</source>
-        <translation>Назва</translation>
+        <source>Enter the receiver's address, message (ensure you copy line breaks, spaces, tabs, etc. exactly) and signature below to verify the message. Be careful not to read more into the signature than what is in the signed message itself, to avoid being tricked by a man-in-the-middle attack. Note that this only proves the signing party receives with the address, it cannot prove sendership of any transaction!</source>
+        <translation>Введіть нижче адресу отримувача, повідомлення (впевніться, що ви точно скопіювали символи завершення рядка, табуляцію, пробіли тощо) та підпис для перевірки повідомлення. Впевніться, що в підпис не було додано зайвих символів: це допоможе уникнути атак типу «людина посередині». Зауважте, що це лише засвідчує можливість отримання транзакцій підписувачем, але не в стані підтвердити джерело жодної транзакції!</translation>
     </message>
     <message>
-        <source>Address</source>
-        <translation>Адреса</translation>
+        <source>The Bitcoin address the message was signed with</source>
+        <translation>Адреса Bitcoin, якою було підписано це повідомлення</translation>
     </message>
     <message>
-        <source>ID</source>
-        <translation>Ідентифікатор</translation>
+        <source>Verify the message to ensure it was signed with the specified Bitcoin address</source>
+        <translation>Перевірте повідомлення для впевненості, що воно підписано вказаною Bitcoin-адресою</translation>
     </message>
     <message>
-        <source>Range:</source>
-        <translation>Діапазон від:</translation>
+        <source>Verify &amp;Message</source>
+        <translation>Пере&amp;вірити повідомлення</translation>
     </message>
     <message>
-        <source>to</source>
-        <translation>до</translation>
+        <source>Reset all verify message fields</source>
+        <translation>Скинути всі поля перевірки повідомлення</translation>
     </message>
 </context>
 <context>
-    <name>UnitDisplayStatusBarControl</name>
+    <name>SplashScreen</name>
     <message>
-        <source>Unit to show amounts in. Click to select another unit.</source>
-        <translation>Одиниця виміру монет. Натисніть для вибору іншої.</translation>
+        <source>[testnet]</source>
+        <translation>[тестова мережа]</translation>
     </message>
 </context>
 <context>
-    <name>WalletFrame</name>
+    <name>TrafficGraphWidget</name>
     <message>
-        <source>No wallet has been loaded.</source>
-        <translation>Гаманець не завантажувався</translation>
+        <source>KB/s</source>
+        <translation>КБ/с</translation>
     </message>
 </context>
 <context>
-    <name>WalletModel</name>
+    <name>TransactionDescDialog</name>
     <message>
-        <source>Send Coins</source>
-        <translation>Відправити</translation>
+        <source>This pane shows a detailed description of the transaction</source>
+        <translation>Даний діалог показує детальну статистику по вибраній транзакції</translation>
     </message>
 </context>
 <context>
-    <name>WalletView</name>
-    <message>
-        <source>&amp;Export</source>
-        <translation>&amp;Експорт</translation>
-    </message>
-    <message>
-        <source>Export the data in the current tab to a file</source>
-        <translation>Експортувати дані з поточної вкладки в файл</translation>
-    </message>
-    <message>
-        <source>Backup Wallet</source>
-        <translation>Зробити резервне копіювання гаманця</translation>
-    </message>
-    <message>
-        <source>Wallet Data (*.dat)</source>
-        <translation>Данi гаманця (*.dat)</translation>
-    </message>
-    <message>
-        <source>Backup Failed</source>
-        <translation>Помилка резервного копіювання</translation>
-    </message>
-    <message>
-        <source>There was an error trying to save the wallet data to %1.</source>
-        <translation>Виникла помилка при спробі зберегти гаманець в %1.</translation>
-    </message>
-    <message>
-        <source>The wallet data was successfully saved to %1.</source>
-        <translation>Дані гаманця успішно збережено в %1.</translation>
-    </message>
+    <name>UnitDisplayStatusBarControl</name>
     <message>
-        <source>Backup Successful</source>
-        <translation>Успішне створення резервної копії</translation>
+        <source>Unit to show amounts in. Click to select another unit.</source>
+        <translation>Одиниця виміру монет. Натисніть для вибору іншої.</translation>
     </message>
 </context>
 <context>
@@ -2927,14 +1670,6 @@
         <source>If &lt;category&gt; is not supplied or if &lt;category&gt; = 1, output all debugging information.</source>
         <translation>Якщо &lt;category&gt; не задано, або ж якщо &lt;category&gt; = 1, виводить всю налагоджувальну інформацію.</translation>
     </message>
-    <message>
-        <source>Maximum total fees (in %s) to use in a single wallet transaction; setting this too low may abort large transactions (default: %s)</source>
-        <translation>Максимальна загальна комісія (в %s) за одну транзакцію; занадто низьке значення може скасувати відправку великих транзакцій (типово: %s)</translation>
-    </message>
-    <message>
-        <source>Please check that your computer's date and time are correct! If your clock is wrong Bitcoin Core will not work properly.</source>
-        <translation>Будь ласка, перевірте коректність дати і часу на своєму комп'ютері! За наявності значної похибки Bitcoin Core буде працювати неправильно.</translation>
-    </message>
     <message>
         <source>Prune configured below the minimum of %d MiB.  Please use a higher number.</source>
         <translation>Встановлений розмір ланцюжка блоків є замалим (меншим за %d МіБ). Будь ласка, виберіть більше число.</translation>
@@ -2975,6 +1710,10 @@
         <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
         <translation>Приймати підключення ззовні (типово: 1 за відсутності -proxy чи -connect)</translation>
     </message>
+    <message>
+        <source>Bitcoin Core</source>
+        <translation>Bitcoin Core</translation>
+    </message>
     <message>
         <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source>
         <translation>Прив'язатися до даної адреси та прослуховувати її. Використовуйте запис виду [хост]:порт для IPv6</translation>
@@ -3003,10 +1742,6 @@
         <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
         <translation>Це тестова збірка пре-релізної версії - використовуйте на свій страх і ризик - не застосовувати для добування монет або торгівлі</translation>
     </message>
-    <message>
-        <source>Unable to bind to %s on this computer. Bitcoin Core is probably already running.</source>
-        <translation>Неможливо прив'язатися до %s на цьому комп'ютері. Можливо, Bitcoin Core вже запущено.</translation>
-    </message>
     <message>
         <source>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</source>
         <translation>Використовувати UPnP для відображення порту, що прослуховується (типово: 1 при прослуховуванні та за відсутності -proxy)</translation>
@@ -3027,10 +1762,6 @@
         <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source>
         <translation>Увага: Наш ланцюжок блоків відрізняється від ланцюжків підключених учасників! Можливо, вам, або іншим вузлам, необхідно оновитися.</translation>
     </message>
-    <message>
-        <source>Warning: wallet.dat corrupt, data salvaged! Original wallet.dat saved as wallet.{timestamp}.bak in %s; if your balance or transactions are incorrect you should restore from a backup.</source>
-        <translation>Увага: файл wallet.dat пошкоджено, дані врятовано! Оригінальний wallet.dat збережено як wallet.{timestamp}.bak до %s; якщо Ваш баланс чи транзакції неправильні, Ви можете відновити їх з резервної копії. </translation>
-    </message>
     <message>
         <source>Whitelist peers connecting from the given netmask or IP address. Can be specified multiple times.</source>
         <translation>Додати учасників, що під'єднуються з заданої підмережі чи IP-адреси, в білий список. Можна вказувати декілька разів.</translation>
@@ -3195,10 +1926,6 @@
         <source>Wallet options:</source>
         <translation>Параметри гаманця:</translation>
     </message>
-    <message>
-        <source>You need to rebuild the database using -reindex to change -txindex</source>
-        <translation>Вам необхідно перебудувати базу даних з використанням -reindex для того, щоб змінити -txindex</translation>
-    </message>
     <message>
         <source>Allow JSON-RPC connections from specified source. Valid for &lt;ip&gt; are a single IP (e.g. 1.2.3.4), a network/netmask (e.g. 1.2.3.4/255.255.255.0) or a network/CIDR (e.g. 1.2.3.4/24). This option can be specified multiple times</source>
         <translation>Дозволити підключення по протоколу JSON-RPC зі вказаного джерела. Правильною для &lt;ip&gt; є окрема IP-адреса (наприклад, 1.2.3.4), IP-адреса та маска підмережі (наприклад, 1.2.3.4/255.255.255.0) або CIDR-адреса (наприклад, 1.2.3.4/24). Цей параметр можна вказувати декілька разів.</translation>
@@ -3211,10 +1938,6 @@
         <source>Bind to given address to listen for JSON-RPC connections. Use [host]:port notation for IPv6. This option can be specified multiple times (default: bind to all interfaces)</source>
         <translation>Прив'язатися до даної адреси для прослуховування JSON-RPC підключень. Використовуйте запис виду [хост]:порт для IPv6. Цей параметр можна вказувати декілька разів (типово: прив'язуватися до всіх інтерфейсів)</translation>
     </message>
-    <message>
-        <source>Cannot obtain a lock on data directory %s. Bitcoin Core is probably already running.</source>
-        <translation>Не вдалося встановити блокування на каталог даних %s. Bitcoin Core, ймовірно, вже запущений.</translation>
-    </message>
     <message>
         <source>Create new files with system default permissions, instead of umask 077 (only effective with disabled wallet functionality)</source>
         <translation>Створювати нові файли з типовими для системи атрибутами доступу замість маски 077 (діє тільки при вимкненому гаманці)</translation>
@@ -3259,10 +1982,6 @@
         <source>Set maximum size of high-priority/low-fee transactions in bytes (default: %d)</source>
         <translation>Встановити максимальний розмір транзакцій з високим пріоритетом та низькою комісією (в байтах) (типово: %d)</translation>
     </message>
-    <message>
-        <source>Set the number of threads for coin generation if enabled (-1 = all cores, default: %d)</source>
-        <translation>Встановити кількість потоків для генерації монет (-1 = кількості ядер, типово: %d)</translation>
-    </message>
     <message>
         <source>The transaction amount is too small to send after the fee has been deducted</source>
         <translation>Залишок від суми транзакції зі сплатою комісії занадто малий </translation>
@@ -3287,34 +2006,14 @@
         <source>Accept public REST requests (default: %u)</source>
         <translation>Приймати публічні REST-запити (типово: %u)</translation>
     </message>
-    <message>
-        <source>Activating best chain...</source>
-        <translation>Активація найкращого ланцюжка...</translation>
-    </message>
-    <message>
-        <source>Attempt to recover private keys from a corrupt wallet.dat on startup</source>
-        <translation>Спочатку спробуйте відновити приватні ключі в пошкодженому wallet.dat </translation>
-    </message>
     <message>
         <source>Automatically create Tor hidden service (default: %d)</source>
         <translation>Автоматичне з'єднання з прихованим сервісом Tor (типово: %d)</translation>
     </message>
-    <message>
-        <source>Cannot resolve -whitebind address: '%s'</source>
-        <translation>Не вдалося розпізнати адресу для -whitebind: «%s»</translation>
-    </message>
     <message>
         <source>Connect through SOCKS5 proxy</source>
         <translation>Підключитись через SOCKS5-проксі</translation>
     </message>
-    <message>
-        <source>Copyright (C) 2009-%i The Bitcoin Core Developers</source>
-        <translation>(C) 2009-%i Розробники Bitcoin Core</translation>
-    </message>
-    <message>
-        <source>Error loading wallet.dat: Wallet requires newer version of Bitcoin Core</source>
-        <translation>Помилка при завантаженні wallet.dat: Гаманець потребує новішої версії Bitcoin Core</translation>
-    </message>
     <message>
         <source>Error reading from database, shutting down.</source>
         <translation>Помилка читання бази даних, припиняю роботу.</translation>
@@ -3327,22 +2026,6 @@
         <source>Information</source>
         <translation>Інформація</translation>
     </message>
-    <message>
-        <source>Initialization sanity check failed. Bitcoin Core is shutting down.</source>
-        <translation>Не вдалося пройти базові перевірки під час ініціалізації. Bitcoin Core буде вимкнено.</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -maxtxfee=&lt;amount&gt;: '%s'</source>
-        <translation>Неприпустима сума для -maxtxfee = &lt;amount&gt;: «%s»</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -minrelaytxfee=&lt;amount&gt;: '%s'</source>
-        <translation>Вказано некоректну суму для параметру -minrelaytxfee: «%s»</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -mintxfee=&lt;amount&gt;: '%s'</source>
-        <translation>Вказано некоректну суму для параметру -mintxfee: «%s»</translation>
-    </message>
     <message>
         <source>Invalid amount for -paytxfee=&lt;amount&gt;: '%s' (must be at least %s)</source>
         <translation>Вказано некоректну суму для параметру -paytxfee: «%s» (повинно бути щонайменше %s)</translation>
@@ -3367,14 +2050,6 @@
         <source>RPC server options:</source>
         <translation>Параметри сервера RPC:</translation>
     </message>
-    <message>
-        <source>Rebuild block chain index from current blk000??.dat files on startup</source>
-        <translation>При запуску перебудувати індекс ланцюжка блоків з поточних файлів blk000??.dat</translation>
-    </message>
-    <message>
-        <source>Receive and display P2P network alerts (default: %u)</source>
-        <translation>Отримувати та відображати попередження з мережі (типово: %u)</translation>
-    </message>
     <message>
         <source>Reducing -maxconnections from %d to %d, because of system limitations.</source>
         <translation>Зменшення значення -maxconnections з %d до %d із-за обмежень системи.</translation>
@@ -3447,10 +2122,6 @@
         <source>Username for JSON-RPC connections</source>
         <translation>Ім'я користувача для JSON-RPC-з'єднань</translation>
     </message>
-    <message>
-        <source>Wallet needed to be rewritten: restart Bitcoin Core to complete</source>
-        <translation>Потрібно перезаписати гаманець: перезапустіть Bitcoin Core для завершення</translation>
-    </message>
     <message>
         <source>Warning</source>
         <translation>Попередження</translation>
@@ -3467,10 +2138,6 @@
         <source>ZeroMQ notification options:</source>
         <translation>Параметри сповіщень ZeroMQ:</translation>
     </message>
-    <message>
-        <source>wallet.dat corrupt, salvage failed</source>
-        <translation>wallet.dat пошкоджено, відновлення не вдалося</translation>
-    </message>
     <message>
         <source>Password for JSON-RPC connections</source>
         <translation>Пароль для JSON-RPC-з'єднань</translation>
@@ -3479,10 +2146,6 @@
         <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
         <translation>Виконати команду, коли з'явиться новий блок (%s в команді змінюється на хеш блоку)</translation>
     </message>
-    <message>
-        <source>This help message</source>
-        <translation>Дана довідка</translation>
-    </message>
     <message>
         <source>Allow DNS lookups for -addnode, -seednode and -connect</source>
         <translation>Дозволити пошук в DNS для команд -addnode, -seednode та -connect</translation>
@@ -3491,10 +2154,6 @@
         <source>Loading addresses...</source>
         <translation>Завантаження адрес...</translation>
     </message>
-    <message>
-        <source>Error loading wallet.dat: Wallet corrupted</source>
-        <translation>Помилка при завантаженні wallet.dat: Гаманець пошкоджено</translation>
-    </message>
     <message>
         <source>(1 = keep tx meta data e.g. account owner and payment request information, 2 = drop tx meta data)</source>
         <translation>(1 = утримувати метадані транзакцій (до яких відноситься інформація про власника рахунку та запити платежів), 2 - відкинути)</translation>
@@ -3511,10 +2170,6 @@
         <source>Do not keep transactions in the mempool longer than &lt;n&gt; hours (default: %u)</source>
         <translation>Не тримати транзакції в пам'яті довше &lt;n&gt; годин (типово: %u)</translation>
     </message>
-    <message>
-        <source>Error reading wallet.dat! All keys read correctly, but transaction data or address book entries might be missing or incorrect.</source>
-        <translation>Помилка читання wallet.dat! Всі ключі прочитано коректно, але дані транзакцій чи записи адресної книги можуть бути пропущені або пошкоджені.</translation>
-    </message>
     <message>
         <source>Fees (in %s/kB) smaller than this are considered zero fee for transaction creation (default: %s)</source>
         <translation>Комісії (в %s/kB), що менші за вказану, вважатимуться нульовими для створення транзакцій (типово: %s)</translation>
@@ -3567,14 +2222,6 @@
         <source>Always query for peer addresses via DNS lookup (default: %u)</source>
         <translation>Завжди дізнаватися адреси учасників через DNS (типово: %u)</translation>
     </message>
-    <message>
-        <source>Error loading wallet.dat</source>
-        <translation>Помилка при завантаженні wallet.dat</translation>
-    </message>
-    <message>
-        <source>Generate coins (default: %u)</source>
-        <translation>Генерація монет (типово: %u)</translation>
-    </message>
     <message>
         <source>How many blocks to check at startup (default: %u, 0 = all)</source>
         <translation>Скільки блоків перевіряти під час запуску (типово: %u, 0 = всі)</translation>
@@ -3659,18 +2306,6 @@
         <source>Unknown network specified in -onlynet: '%s'</source>
         <translation>Невідома мережа вказана в -onlynet: «%s»</translation>
     </message>
-    <message>
-        <source>Cannot resolve -bind address: '%s'</source>
-        <translation>Не вдалося розпізнати адресу для -bind: «%s»</translation>
-    </message>
-    <message>
-        <source>Cannot resolve -externalip address: '%s'</source>
-        <translation>Не вдалося розпізнати адресу для -externalip: «%s»</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -paytxfee=&lt;amount&gt;: '%s'</source>
-        <translation>Помилка у величині комісії -paytxfee=&lt;amount&gt;: «%s»</translation>
-    </message>
     <message>
         <source>Insufficient funds</source>
         <translation>Недостатньо коштів</translation>
diff --git a/src/qt/locale/bitcoin_ur_PK.ts b/src/qt/locale/bitcoin_ur_PK.ts
index e37c87baa84f2..6b43bf63e5102 100644
--- a/src/qt/locale/bitcoin_ur_PK.ts
+++ b/src/qt/locale/bitcoin_ur_PK.ts
@@ -25,10 +25,6 @@
         <source>C&amp;lose</source>
         <translation>بند</translation>
     </message>
-    <message>
-        <source>&amp;Copy Address</source>
-        <translation>کاپی پتہ</translation>
-    </message>
     <message>
         <source>Delete the currently selected address from the list</source>
         <translation>سلیکٹڈ پتے کو مٹائیں</translation>
@@ -45,37 +41,6 @@
         <source>&amp;Delete</source>
         <translation>مٹا</translation>
     </message>
-    <message>
-        <source>Choose the address to send coins to</source>
-        <translation>کوئین وصول کرنے والے کا پتہ</translation>
-    </message>
-    <message>
-        <source>Choose the address to receive coins with</source>
-        <translation>کوئین بھیجنے  والے کا پتہ</translation>
-    </message>
-    <message>
-        <source>C&amp;hoose</source>
-        <translation>چننا</translation>
-    </message>
-    <message>
-        <source>Sending addresses</source>
-        <translation>جس پتے پر بھیجنے ہیں</translation>
-    </message>
-    </context>
-<context>
-    <name>AddressTableModel</name>
-    <message>
-        <source>Label</source>
-        <translation>چٹ</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation> پتہ</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>چٹ کے بغیر</translation>
-    </message>
 </context>
 <context>
     <name>AskPassphraseDialog</name>
@@ -91,23 +56,7 @@
         <source>Repeat new passphrase</source>
         <translation>نیا پاس فریز دہرائیں</translation>
     </message>
-    <message>
-        <source>Encrypt wallet</source>
-        <translation>بٹوے کی رمزنگاری</translation>
-    </message>
-    <message>
-        <source>Unlock wallet</source>
-        <translation>بٹوا ان لاک</translation>
-    </message>
-    <message>
-        <source>Decrypt wallet</source>
-        <translation>خفیہ کشائی کر یںبٹوے کے</translation>
-    </message>
-    <message>
-        <source>Change passphrase</source>
-        <translation>پاس فریز تبدیل کریں</translation>
-    </message>
-    </context>
+</context>
 <context>
     <name>BanTableModel</name>
     </context>
@@ -118,9 +67,6 @@
         <translation>نقص</translation>
     </message>
     </context>
-<context>
-    <name>ClientModel</name>
-    </context>
 <context>
     <name>CoinControlDialog</name>
     <message>
@@ -135,10 +81,6 @@
         <source>Date</source>
         <translation>تاریخ</translation>
     </message>
-    <message>
-        <source>(no label)</source>
-        <translation>چٹ کے بغیر</translation>
-    </message>
     </context>
 <context>
     <name>EditAddressDialog</name>
@@ -150,7 +92,7 @@
         <source>&amp;Address</source>
         <translation> پتہ</translation>
     </message>
-    </context>
+</context>
 <context>
     <name>FreespaceChecker</name>
     </context>
@@ -173,9 +115,6 @@
 <context>
     <name>OverviewPage</name>
     </context>
-<context>
-    <name>PaymentServer</name>
-    </context>
 <context>
     <name>PeerTableModel</name>
     </context>
@@ -186,9 +125,6 @@
         <translation>رقم</translation>
     </message>
     </context>
-<context>
-    <name>QRImageWidget</name>
-    </context>
 <context>
     <name>RPCConsole</name>
     </context>
@@ -201,37 +137,6 @@
         <source>Copy &amp;Address</source>
         <translation>کاپی پتہ</translation>
     </message>
-    <message>
-        <source>Address</source>
-        <translation> پتہ</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>رقم</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>چٹ</translation>
-    </message>
-    </context>
-<context>
-    <name>RecentRequestsTableModel</name>
-    <message>
-        <source>Date</source>
-        <translation>تاریخ</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>چٹ</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>رقم</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>چٹ کے بغیر</translation>
-    </message>
     </context>
 <context>
     <name>SendCoinsDialog</name>
@@ -247,10 +152,6 @@
         <source>Balance:</source>
         <translation>بیلنس:</translation>
     </message>
-    <message>
-        <source>(no label)</source>
-        <translation>چٹ کے بغیر</translation>
-    </message>
     </context>
 <context>
     <name>SendCoinsEntry</name>
@@ -267,120 +168,14 @@
 <context>
     <name>TrafficGraphWidget</name>
     </context>
-<context>
-    <name>TransactionDesc</name>
-    <message>
-        <source>Date</source>
-        <translation>تاریخ</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>رقم</translation>
-    </message>
-    </context>
 <context>
     <name>TransactionDescDialog</name>
     </context>
-<context>
-    <name>TransactionTableModel</name>
-    <message>
-        <source>Date</source>
-        <translation>تاریخ</translation>
-    </message>
-    <message>
-        <source>Type</source>
-        <translation>ٹائپ</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>چٹ</translation>
-    </message>
-    <message>
-        <source>Sent to</source>
-        <translation>کو بھیجا</translation>
-    </message>
-    <message>
-        <source>(n/a)</source>
-        <translation>(N / A)</translation>
-    </message>
-    </context>
-<context>
-    <name>TransactionView</name>
-    <message>
-        <source>All</source>
-        <translation>تمام</translation>
-    </message>
-    <message>
-        <source>Today</source>
-        <translation>آج</translation>
-    </message>
-    <message>
-        <source>This week</source>
-        <translation>اس ہفتے</translation>
-    </message>
-    <message>
-        <source>This month</source>
-        <translation>اس مہینے</translation>
-    </message>
-    <message>
-        <source>Last month</source>
-        <translation>پچھلے مہینے</translation>
-    </message>
-    <message>
-        <source>This year</source>
-        <translation>اس سال</translation>
-    </message>
-    <message>
-        <source>Range...</source>
-        <translation>دیگر</translation>
-    </message>
-    <message>
-        <source>Sent to</source>
-        <translation>کو بھیجا</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation>تاریخ</translation>
-    </message>
-    <message>
-        <source>Type</source>
-        <translation>ٹائپ</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>چٹ</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation> پتہ</translation>
-    </message>
-    </context>
 <context>
     <name>UnitDisplayStatusBarControl</name>
     </context>
-<context>
-    <name>WalletFrame</name>
-    </context>
-<context>
-    <name>WalletModel</name>
-    </context>
-<context>
-    <name>WalletView</name>
-    <message>
-        <source>&amp;Export</source>
-        <translation>برآمد</translation>
-    </message>
-    <message>
-        <source>Export the data in the current tab to a file</source>
-        <translation>موجودہ ڈیٹا کو فائیل میں محفوظ کریں</translation>
-    </message>
-    </context>
 <context>
     <name>bitcoin-core</name>
-    <message>
-        <source>This help message</source>
-        <translation>یہ مدد کا پیغام</translation>
-    </message>
     <message>
         <source>Insufficient funds</source>
         <translation>ناکافی فنڈز</translation>
diff --git a/src/qt/locale/bitcoin_uz@Cyrl.ts b/src/qt/locale/bitcoin_uz@Cyrl.ts
index a9f9af6683e50..ce33262976d7e 100644
--- a/src/qt/locale/bitcoin_uz@Cyrl.ts
+++ b/src/qt/locale/bitcoin_uz@Cyrl.ts
@@ -25,10 +25,6 @@
         <source>C&amp;lose</source>
         <translation>&amp;Ёпиш</translation>
     </message>
-    <message>
-        <source>&amp;Copy Address</source>
-        <translation>Манзилдан &amp;нусха олиш</translation>
-    </message>
     <message>
         <source>Delete the currently selected address from the list</source>
         <translation>Жорий танланган манзилни рўйхатдан ўчириш</translation>
@@ -45,73 +41,6 @@
         <source>&amp;Delete</source>
         <translation>&amp;Ўчириш</translation>
     </message>
-    <message>
-        <source>Choose the address to send coins to</source>
-        <translation>Тангаларни жўнатиш учун манзилни танланг</translation>
-    </message>
-    <message>
-        <source>Choose the address to receive coins with</source>
-        <translation>Тангаларни қабул қилиш учун манзилни танланг</translation>
-    </message>
-    <message>
-        <source>C&amp;hoose</source>
-        <translation>&amp;Танлаш</translation>
-    </message>
-    <message>
-        <source>Sending addresses</source>
-        <translation>Жўнатиладиган манзиллар</translation>
-    </message>
-    <message>
-        <source>Receiving addresses</source>
-        <translation>Қабул қилинадиган манзиллар</translation>
-    </message>
-    <message>
-        <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source>
-        <translation>Улар тўловларни жўнатиш учун сизнинг Bitcoin манзилларингиз. Доимо тангаларни жўнатишдан олдин сумма ва қабул қилувчи манзилни текшириб кўринг. </translation>
-    </message>
-    <message>
-        <source>These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source>
-        <translation>Улар тўловларни қабул қилиш учун сизнинг Bitcoin манзилларингиз. Ҳар бир ўтказма учун янги қабул қилувчи манзилдан фойдаланиш тавсия қилинади.</translation>
-    </message>
-    <message>
-        <source>Copy &amp;Label</source>
-        <translation>Нусха олиш ва ёрлиқ</translation>
-    </message>
-    <message>
-        <source>&amp;Edit</source>
-        <translation>&amp;Таҳрирлаш</translation>
-    </message>
-    <message>
-        <source>Export Address List</source>
-        <translation>Манзил рўйхатини экспорт қилиш</translation>
-    </message>
-    <message>
-        <source>Comma separated file (*.csv)</source>
-        <translation>Вергул билан ажратилган файл (*.csv)</translation>
-    </message>
-    <message>
-        <source>Exporting Failed</source>
-        <translation>Экспорт қилиб бўлмади</translation>
-    </message>
-    <message>
-        <source>There was an error trying to save the address list to %1. Please try again.</source>
-        <translation>Манзил рўйхатини %1.га сақлашда хатолик юз берди. Яна уриниб кўринг.</translation>
-    </message>
-</context>
-<context>
-    <name>AddressTableModel</name>
-    <message>
-        <source>Label</source>
-        <translation>Ёрлиқ</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>Манзил</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(Ёрлиқ мавжуд эмас)</translation>
-    </message>
 </context>
 <context>
     <name>AskPassphraseDialog</name>
@@ -131,86 +60,6 @@
         <source>Repeat new passphrase</source>
         <translation>Янги махфий сузни такрорланг</translation>
     </message>
-    <message>
-        <source>Encrypt wallet</source>
-        <translation>Ҳамённи қодлаш</translation>
-    </message>
-    <message>
-        <source>This operation needs your wallet passphrase to unlock the wallet.</source>
-        <translation>Ушбу операцияни амалга ошириш учун ҳамённи қулфдан чиқариш парол сўзини талаб қилади.</translation>
-    </message>
-    <message>
-        <source>Unlock wallet</source>
-        <translation>Ҳамённи қулфдан чиқариш</translation>
-    </message>
-    <message>
-        <source>This operation needs your wallet passphrase to decrypt the wallet.</source>
-        <translation>Ушбу операцияни амалга ошириш учун ҳамённи коддан чиқариш парол сўзини талаб қилади.</translation>
-    </message>
-    <message>
-        <source>Decrypt wallet</source>
-        <translation>Ҳамённи коддан чиқариш</translation>
-    </message>
-    <message>
-        <source>Change passphrase</source>
-        <translation>Махфий сузни узгартириш</translation>
-    </message>
-    <message>
-        <source>Confirm wallet encryption</source>
-        <translation>Ҳамённи кодлашни тасдиқлаш</translation>
-    </message>
-    <message>
-        <source>Warning: If you encrypt your wallet and lose your passphrase, you will &lt;b&gt;LOSE ALL OF YOUR BITCOINS&lt;/b&gt;!</source>
-        <translation>Диққат: Агар сиз ҳамёнингизни кодласангиз ва махфий сўзингизни унутсангиз, сиз &lt;b&gt;БАРЧА BITCOIN ПУЛЛАРИНГИЗНИ ЙЎҚОТАСИЗ&lt;/b&gt;!</translation>
-    </message>
-    <message>
-        <source>Are you sure you wish to encrypt your wallet?</source>
-        <translation>Ҳамёнингизни кодлашни ростдан хоҳлайсизми?</translation>
-    </message>
-    <message>
-        <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source>
-        <translation>МУҲИМ: Сиз қилган олдинги ҳамён файли заҳиралари янги яратилган, кодланган ҳамён файли билан алмаштирилиши керак. Хавфсизлик сабабларига кўра олдинги кодланган ҳамён файли заҳираси янги кодланган ҳамёндан фойдаланишингиз билан яроқсиз ҳолга келади.</translation>
-    </message>
-    <message>
-        <source>Warning: The Caps Lock key is on!</source>
-        <translation>Диққат: Caps Lock тугмаси ёқилган!</translation>
-    </message>
-    <message>
-        <source>Wallet encrypted</source>
-        <translation>Ҳамёни кодланган</translation>
-    </message>
-    <message>
-        <source>Enter the new passphrase to the wallet.&lt;br/&gt;Please use a passphrase of &lt;b&gt;ten or more random characters&lt;/b&gt;, or &lt;b&gt;eight or more words&lt;/b&gt;.</source>
-        <translation>Ҳамёнга янги махфий сўз киритинг.&lt;br/&gt;Илтимос, &lt;b&gt;ўнта ёки тасодифий белгили&lt;/b&gt; махфий сўздан фойдаланинг ёки &lt;b&gt;саккизта ёки кўпроқ сўзлар&lt;/b&gt;дан фойдаланинг.</translation>
-    </message>
-    <message>
-        <source>Wallet encryption failed</source>
-        <translation>Ҳамённи кодлаш амалга ошмади</translation>
-    </message>
-    <message>
-        <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
-        <translation>Ҳамённи кодлаш ташқи хато туфайли амалга ошмади. Ҳамёнингиз кодланмади.</translation>
-    </message>
-    <message>
-        <source>The supplied passphrases do not match.</source>
-        <translation>Киритилган пароллар мос келмади.</translation>
-    </message>
-    <message>
-        <source>Wallet unlock failed</source>
-        <translation>Ҳамённи қулфдан чиқариш амалга ошмади</translation>
-    </message>
-    <message>
-        <source>The passphrase entered for the wallet decryption was incorrect.</source>
-        <translation>Ҳамённи коддан чиқариш учун киритилган парол нотўғри.</translation>
-    </message>
-    <message>
-        <source>Wallet decryption failed</source>
-        <translation>Ҳамённи коддан чиқариш амалга ошмади</translation>
-    </message>
-    <message>
-        <source>Wallet passphrase was successfully changed.</source>
-        <translation>Ҳамён пароли муваффақиятли алмаштирилди.</translation>
-    </message>
 </context>
 <context>
     <name>BanTableModel</name>
@@ -289,14 +138,6 @@
         <source>Open &amp;URI...</source>
         <translation>Интернет манзилни очиш</translation>
     </message>
-    <message>
-        <source>Bitcoin Core client</source>
-        <translation>Bitcoin асос мижози</translation>
-    </message>
-    <message>
-        <source>Importing blocks from disk...</source>
-        <translation>Дискдан блоклар импорт қилинмоқда...</translation>
-    </message>
     <message>
         <source>Reindexing blocks on disk...</source>
         <translation>Дискдаги блоклар қайта индексланмоқда...</translation>
@@ -341,10 +182,6 @@
         <source>&amp;Receive</source>
         <translation>&amp;Қабул қилиш</translation>
     </message>
-    <message>
-        <source>Show information about Bitcoin Core</source>
-        <translation>Bitcoin Core ҳақидаги маълумотларни кўрсатиш</translation>
-    </message>
     <message>
         <source>&amp;Show / Hide</source>
         <translation>&amp;Кўрсатиш / Яшириш</translation>
@@ -381,18 +218,10 @@
         <source>Tabs toolbar</source>
         <translation>Ички ойналар асбоблар панели</translation>
     </message>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Bitcoin Core</translation>
-    </message>
     <message>
         <source>Request payments (generates QR codes and bitcoin: URIs)</source>
         <translation>Тўловлар (QR кодлари ва bitcoin ёрдамида яратишлар: URI’лар) сўраш</translation>
     </message>
-    <message>
-        <source>&amp;About Bitcoin Core</source>
-        <translation>Bitcoin Core &amp;ҳақида</translation>
-    </message>
     <message>
         <source>Show the list of used sending addresses and labels</source>
         <translation>Фойдаланилган жўнатилган манзиллар ва ёрлиқлар рўйхатини кўрсатиш</translation>
@@ -409,10 +238,6 @@
         <source>&amp;Command-line options</source>
         <translation>&amp;Буйруқлар сатри мосламалари</translation>
     </message>
-    <message>
-        <source>Show the Bitcoin Core help message to get a list with possible Bitcoin command-line options</source>
-        <translation>Мавжуд Bitcoin буйруқлар матни мосламалари билан  Bitcoin Core ёрдам хабарларини олиш рўйхатини кўрсатиш</translation>
-    </message>
     <message numerus="yes">
         <source>%n active connection(s) to Bitcoin network</source>
         <translation><numerusform>%n та Bitcoin тармоғига фаол уланиш мавжуд</numerusform></translation>
@@ -490,13 +315,6 @@
         <translation>Ҳамён &lt;b&gt;кодланган&lt;/b&gt; ва вақтинча &lt;b&gt;қулфланган&lt;/b&gt;</translation>
     </message>
 </context>
-<context>
-    <name>ClientModel</name>
-    <message>
-        <source>Network Alert</source>
-        <translation>Тармоқ огоҳлантиргичи</translation>
-    </message>
-</context>
 <context>
     <name>CoinControlDialog</name>
     <message>
@@ -563,138 +381,6 @@
         <source>Priority</source>
         <translation>Муҳимлиги</translation>
     </message>
-    <message>
-        <source>Copy address</source>
-        <translation>Манзилни нусхалаш</translation>
-    </message>
-    <message>
-        <source>Copy label</source>
-        <translation>Ёрликни нусхала</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>Кийматни нусхала</translation>
-    </message>
-    <message>
-        <source>Copy transaction ID</source>
-        <translation>Ўтказам рақамидан нусха олиш</translation>
-    </message>
-    <message>
-        <source>Lock unspent</source>
-        <translation>Сарфланмаганларни қулфлаш</translation>
-    </message>
-    <message>
-        <source>Unlock unspent</source>
-        <translation>Сарфланмаганларни қулфдан чиқариш</translation>
-    </message>
-    <message>
-        <source>Copy quantity</source>
-        <translation>Нусха сони</translation>
-    </message>
-    <message>
-        <source>Copy fee</source>
-        <translation>Нусха солиғи</translation>
-    </message>
-    <message>
-        <source>Copy after fee</source>
-        <translation>Нусха солиқдан сўнг</translation>
-    </message>
-    <message>
-        <source>Copy bytes</source>
-        <translation>Нусха байти</translation>
-    </message>
-    <message>
-        <source>Copy priority</source>
-        <translation>Нусха муҳимлиги</translation>
-    </message>
-    <message>
-        <source>Copy dust</source>
-        <translation>Нусха чангги</translation>
-    </message>
-    <message>
-        <source>Copy change</source>
-        <translation>Нусха қайтими</translation>
-    </message>
-    <message>
-        <source>highest</source>
-        <translation>энг юқори</translation>
-    </message>
-    <message>
-        <source>higher</source>
-        <translation>юқорирок</translation>
-    </message>
-    <message>
-        <source>high</source>
-        <translation>юқори</translation>
-    </message>
-    <message>
-        <source>medium-high</source>
-        <translation>ўртача-юқори</translation>
-    </message>
-    <message>
-        <source>medium</source>
-        <translation>ўрта</translation>
-    </message>
-    <message>
-        <source>low-medium</source>
-        <translation>паст-юқори</translation>
-    </message>
-    <message>
-        <source>low</source>
-        <translation>паст</translation>
-    </message>
-    <message>
-        <source>lower</source>
-        <translation>пастроқ</translation>
-    </message>
-    <message>
-        <source>lowest</source>
-        <translation>энг паст</translation>
-    </message>
-    <message>
-        <source>(%1 locked)</source>
-        <translation>(%1 қулфланган)</translation>
-    </message>
-    <message>
-        <source>none</source>
-        <translation>йўқ</translation>
-    </message>
-    <message>
-        <source>Can vary +/- %1 satoshi(s) per input.</source>
-        <translation>Ҳар бир кирим +/- %1 сатоши(лар) билан ўзгариши мумкин.</translation>
-    </message>
-    <message>
-        <source>yes</source>
-        <translation>ҳа</translation>
-    </message>
-    <message>
-        <source>no</source>
-        <translation>йўқ</translation>
-    </message>
-    <message>
-        <source>This means a fee of at least %1 per kB is required.</source>
-        <translation>Бу дегани солиқ ҳар кб учун камида %1  талаб қилинади.</translation>
-    </message>
-    <message>
-        <source>Can vary +/- 1 byte per input.</source>
-        <translation>Ҳар бир кирим +/- 1 байт билан ўзгариши мумкин.</translation>
-    </message>
-    <message>
-        <source>Transactions with higher priority are more likely to get included into a block.</source>
-        <translation>Юқори муҳимликка эга бўлган ўтказмалар тезда блокнинг ичига қўшимча олади.</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(Ёрлик мавжуд эмас)</translation>
-    </message>
-    <message>
-        <source>change from %1 (%2)</source>
-        <translation>%1 (%2)дан ўзгартириш</translation>
-    </message>
-    <message>
-        <source>(change)</source>
-        <translation>(ўзгартириш)</translation>
-    </message>
 </context>
 <context>
     <name>EditAddressDialog</name>
@@ -718,38 +404,6 @@
         <source>&amp;Address</source>
         <translation>&amp;Манзил</translation>
     </message>
-    <message>
-        <source>New receiving address</source>
-        <translation>Янги кабул килувчи манзил</translation>
-    </message>
-    <message>
-        <source>New sending address</source>
-        <translation>Янги жунатилувчи манзил</translation>
-    </message>
-    <message>
-        <source>Edit receiving address</source>
-        <translation>Кабул килувчи манзилни тахрирлаш</translation>
-    </message>
-    <message>
-        <source>Edit sending address</source>
-        <translation>Жунатилувчи манзилни тахрирлаш</translation>
-    </message>
-    <message>
-        <source>The entered address "%1" is already in the address book.</source>
-        <translation>Киритилган "%1" манзили аллақачон манзил китобида.</translation>
-    </message>
-    <message>
-        <source>The entered address "%1" is not a valid Bitcoin address.</source>
-        <translation>Киритилган "%1" манзили тўғри Bitcoin манзили эмас.</translation>
-    </message>
-    <message>
-        <source>Could not unlock wallet.</source>
-        <translation>Ҳамён қулфдан чиқмади.</translation>
-    </message>
-    <message>
-        <source>New key generation failed.</source>
-        <translation>Янги калит яратиш амалга ошмади.</translation>
-    </message>
 </context>
 <context>
     <name>FreespaceChecker</name>
@@ -776,10 +430,6 @@
 </context>
 <context>
     <name>HelpMessageDialog</name>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Bitcoin Core</translation>
-    </message>
     <message>
         <source>version</source>
         <translation>версияси</translation>
@@ -788,10 +438,6 @@
         <source>(%1-bit)</source>
         <translation>(%1-bit)</translation>
     </message>
-    <message>
-        <source>About Bitcoin Core</source>
-        <translation>Bitcoin Core ҳақида</translation>
-    </message>
     <message>
         <source>Command-line options</source>
         <translation>Буйруқлар сатри мосламалари</translation>
@@ -811,18 +457,6 @@
         <source>Welcome</source>
         <translation>Хуш келибсиз</translation>
     </message>
-    <message>
-        <source>Welcome to Bitcoin Core.</source>
-        <translation>"Bitcoin Core"га хуш келибсиз.</translation>
-    </message>
-    <message>
-        <source>As this is the first time the program is launched, you can choose where Bitcoin Core will store its data.</source>
-        <translation>Биринчи марта дастур ишга тушгани каби сиз Bitcoin Core маълумотларини жойлаштирадиган жойни танлашингиз мумкин.</translation>
-    </message>
-    <message>
-        <source>Bitcoin Core will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source>
-        <translation>Bitcoin Core юклаб олинади ва Bitcoin блок занжири нусхаси жойлаштирилади. Камида %1GB  маълумот ушбу директорияга жойлаштирилади ва вақт давомида ўсиб боради. Ҳамён ҳам ушбу директорияда жойлашади.</translation>
-    </message>
     <message>
         <source>Use the default data directory</source>
         <translation>Стандарт маълумотлар директориясидан фойдаланиш</translation>
@@ -831,10 +465,6 @@
         <source>Use a custom data directory:</source>
         <translation>Бошқа маълумотлар директориясида фойдаланинг:</translation>
     </message>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Bitcoin Core</translation>
-    </message>
     <message>
         <source>Error: Specified data directory "%1" cannot be created.</source>
         <translation>Хато: кўрсатилган "%1" маълумотлар директориясини яратиб бўлмайди.</translation>
@@ -862,10 +492,6 @@
         <source>Select payment request file</source>
         <translation>Тўлов сўрови файлини танлаш</translation>
     </message>
-    <message>
-        <source>Select payment request file to open</source>
-        <translation>Очиш учун тўлов сўрови файлини танлаш</translation>
-    </message>
 </context>
 <context>
     <name>OptionsDialog</name>
@@ -1057,29 +683,6 @@
         <translation>Жорий умумий баланс фақат кўринадиган манзилларда</translation>
     </message>
 </context>
-<context>
-    <name>PaymentServer</name>
-    <message>
-        <source>URI handling</source>
-        <translation>URI осилиб қолмоқда</translation>
-    </message>
-    <message>
-        <source>Invalid payment address %1</source>
-        <translation>Нотўғри тўлов манзили %1</translation>
-    </message>
-    <message>
-        <source>Payment request rejected</source>
-        <translation>Тўлов сўрови инкор этилди</translation>
-    </message>
-    <message>
-        <source>Payment request network doesn't match client network.</source>
-        <translation>Тўлов сўрови тармоғи мижоз тармоғига мос келмайди.</translation>
-    </message>
-    <message>
-        <source>Payment request error</source>
-        <translation>Тўлов сўрови хато</translation>
-    </message>
-    </context>
 <context>
     <name>PeerTableModel</name>
     <message>
@@ -1122,25 +725,6 @@
         <translation>%1 мс</translation>
     </message>
 </context>
-<context>
-    <name>QRImageWidget</name>
-    <message>
-        <source>&amp;Save Image...</source>
-        <translation>Расмни &amp;сақлаш</translation>
-    </message>
-    <message>
-        <source>&amp;Copy Image</source>
-        <translation>Расмдан &amp;нусха олиш</translation>
-    </message>
-    <message>
-        <source>Save QR Code</source>
-        <translation>QR кодни сақлаш</translation>
-    </message>
-    <message>
-        <source>PNG Image (*.png)</source>
-        <translation>PNG расм (*.png)</translation>
-    </message>
-</context>
 <context>
     <name>RPCConsole</name>
     <message>
@@ -1259,10 +843,6 @@
         <source>Out:</source>
         <translation>Ташқарига:</translation>
     </message>
-    <message>
-        <source>Build date</source>
-        <translation>Тузилган санаси</translation>
-    </message>
     <message>
         <source>Debug log file</source>
         <translation>Тузатиш журнали файли</translation>
@@ -1386,18 +966,6 @@
         <source>Remove</source>
         <translation>Ўчириш</translation>
     </message>
-    <message>
-        <source>Copy label</source>
-        <translation>Ёрликни нусхала</translation>
-    </message>
-    <message>
-        <source>Copy message</source>
-        <translation>Хабарни нусхала</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>Кийматни нусхала</translation>
-    </message>
 </context>
 <context>
     <name>ReceiveRequestDialog</name>
@@ -1413,99 +981,40 @@
         <source>&amp;Save Image...</source>
         <translation>Расмни &amp;сақлаш</translation>
     </message>
+</context>
+<context>
+    <name>SendCoinsDialog</name>
     <message>
-        <source>Request payment to %1</source>
-        <translation> %1 дан Тўловни сўраш</translation>
+        <source>Send Coins</source>
+        <translation>Тангаларни жунат</translation>
     </message>
     <message>
-        <source>Payment information</source>
-        <translation>Тўлов маълумоти</translation>
+        <source>Coin Control Features</source>
+        <translation>Танга бошқаруви ҳусусиятлари</translation>
     </message>
     <message>
-        <source>URI</source>
-        <translation>URI</translation>
+        <source>automatically selected</source>
+        <translation>автоматик тарзда танланган</translation>
     </message>
     <message>
-        <source>Address</source>
-        <translation>Манзил</translation>
+        <source>Insufficient funds!</source>
+        <translation>Кам миқдор</translation>
     </message>
     <message>
-        <source>Amount</source>
-        <translation>Миқдори</translation>
+        <source>Quantity:</source>
+        <translation>Сони:</translation>
     </message>
     <message>
-        <source>Label</source>
-        <translation>Ёрлик</translation>
+        <source>Bytes:</source>
+        <translation>Байт:</translation>
     </message>
     <message>
-        <source>Message</source>
-        <translation>Хабар</translation>
+        <source>Amount:</source>
+        <translation>Миқдори:</translation>
     </message>
-    </context>
-<context>
-    <name>RecentRequestsTableModel</name>
     <message>
-        <source>Date</source>
-        <translation>Сана</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Ёрлик</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>Хабар</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>Миқдори</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(Ёрлик мавжуд эмас)</translation>
-    </message>
-    <message>
-        <source>(no message)</source>
-        <translation>(Хабар йўқ)</translation>
-    </message>
-    <message>
-        <source>(no amount)</source>
-        <translation>(Миқдор мавжуд эмас)</translation>
-    </message>
-</context>
-<context>
-    <name>SendCoinsDialog</name>
-    <message>
-        <source>Send Coins</source>
-        <translation>Тангаларни жунат</translation>
-    </message>
-    <message>
-        <source>Coin Control Features</source>
-        <translation>Танга бошқаруви ҳусусиятлари</translation>
-    </message>
-    <message>
-        <source>automatically selected</source>
-        <translation>автоматик тарзда танланган</translation>
-    </message>
-    <message>
-        <source>Insufficient funds!</source>
-        <translation>Кам миқдор</translation>
-    </message>
-    <message>
-        <source>Quantity:</source>
-        <translation>Сони:</translation>
-    </message>
-    <message>
-        <source>Bytes:</source>
-        <translation>Байт:</translation>
-    </message>
-    <message>
-        <source>Amount:</source>
-        <translation>Миқдори:</translation>
-    </message>
-    <message>
-        <source>Priority:</source>
-        <translation>Муҳимлиги:</translation>
+        <source>Priority:</source>
+        <translation>Муҳимлиги:</translation>
     </message>
     <message>
         <source>Fee:</source>
@@ -1583,74 +1092,6 @@
         <source>S&amp;end</source>
         <translation>Жў&amp;натиш</translation>
     </message>
-    <message>
-        <source>Confirm send coins</source>
-        <translation>Тангалар жўнаишни тасдиқлаш</translation>
-    </message>
-    <message>
-        <source>%1 to %2</source>
-        <translation>%1 дан %2</translation>
-    </message>
-    <message>
-        <source>Copy quantity</source>
-        <translation>Нусха сони</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>Кийматни нусхала</translation>
-    </message>
-    <message>
-        <source>Copy fee</source>
-        <translation>Нусха солиғи</translation>
-    </message>
-    <message>
-        <source>Copy after fee</source>
-        <translation>Нусха солиқдан сўнг</translation>
-    </message>
-    <message>
-        <source>Copy bytes</source>
-        <translation>Нусха байти</translation>
-    </message>
-    <message>
-        <source>Copy priority</source>
-        <translation>Нусха муҳимлиги</translation>
-    </message>
-    <message>
-        <source>Copy change</source>
-        <translation>Нусха қайтими</translation>
-    </message>
-    <message>
-        <source>or</source>
-        <translation>ёки</translation>
-    </message>
-    <message>
-        <source>The amount to pay must be larger than 0.</source>
-        <translation>Тўлов миқдори 0. дан катта бўлиши керак. </translation>
-    </message>
-    <message>
-        <source>Warning: Invalid Bitcoin address</source>
-        <translation>Диққат: Нотўғр Bitcoin манзили</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(Ёрлик мавжуд эмас)</translation>
-    </message>
-    <message>
-        <source>Warning: Unknown change address</source>
-        <translation>Диққат: Номаълум ўзгариш манзили</translation>
-    </message>
-    <message>
-        <source>Copy dust</source>
-        <translation>Нусха чангги</translation>
-    </message>
-    <message>
-        <source>Are you sure you want to send?</source>
-        <translation>Жўнатишни хоҳлашингизга ишончингиз комилми?</translation>
-    </message>
-    <message>
-        <source>added as transaction fee</source>
-        <translation>ўтказма солиғи қўшилди</translation>
-    </message>
 </context>
 <context>
     <name>SendCoinsEntry</name>
@@ -1662,10 +1103,6 @@
         <source>Pay &amp;To:</source>
         <translation>&amp;Тўлов олувчи:</translation>
     </message>
-    <message>
-        <source>Enter a label for this address to add it to your address book</source>
-        <translation>Манзил китобингизга қўшиш учун ушбу манзил учун ёрлиқ киритинг</translation>
-    </message>
     <message>
         <source>&amp;Label:</source>
         <translation>&amp;Ёрлиқ:</translation>
@@ -1728,21 +1165,9 @@
         <source>Clear &amp;All</source>
         <translation>Барчасини &amp; Тозалаш</translation>
     </message>
-    <message>
-        <source>Message verified.</source>
-        <translation>Хабар тасдиқланди.</translation>
-    </message>
-</context>
+    </context>
 <context>
     <name>SplashScreen</name>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Bitcoin Core</translation>
-    </message>
-    <message>
-        <source>The Bitcoin Core developers</source>
-        <translation>Bitcoin Core дастурчилари</translation>
-    </message>
     <message>
         <source>[testnet]</source>
         <translation>[testnet]</translation>
@@ -1751,358 +1176,16 @@
 <context>
     <name>TrafficGraphWidget</name>
     </context>
-<context>
-    <name>TransactionDesc</name>
-    <message>
-        <source>Open until %1</source>
-        <translation>%1 гача очиш</translation>
-    </message>
-    <message>
-        <source>%1/unconfirmed</source>
-        <translation>%1/тасдиқланмади</translation>
-    </message>
-    <message>
-        <source>%1 confirmations</source>
-        <translation>%1 тасдиқлашлар</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation>Сана</translation>
-    </message>
-    <message>
-        <source>Source</source>
-        <translation>Манба</translation>
-    </message>
-    <message>
-        <source>Generated</source>
-        <translation>Яратилган</translation>
-    </message>
-    <message>
-        <source>From</source>
-        <translation>Дан</translation>
-    </message>
-    <message>
-        <source>To</source>
-        <translation>Га</translation>
-    </message>
-    <message>
-        <source>own address</source>
-        <translation>ўз манзили</translation>
-    </message>
-    <message>
-        <source>label</source>
-        <translation>ёрлиқ</translation>
-    </message>
-    <message>
-        <source>Credit</source>
-        <translation>Кредит (қарз)</translation>
-    </message>
-    <message>
-        <source>not accepted</source>
-        <translation>қабул қилинмади</translation>
-    </message>
-    <message>
-        <source>Transaction fee</source>
-        <translation>Ўтказма тўлови</translation>
-    </message>
-    <message>
-        <source>Net amount</source>
-        <translation>Умумий миқдор</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>Хабар</translation>
-    </message>
-    <message>
-        <source>Comment</source>
-        <translation>Шарҳ</translation>
-    </message>
-    <message>
-        <source>Transaction ID</source>
-        <translation>ID</translation>
-    </message>
-    <message>
-        <source>Merchant</source>
-        <translation>Савдо</translation>
-    </message>
-    <message>
-        <source>Transaction</source>
-        <translation>Ўтказма</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>Миқдори</translation>
-    </message>
-    <message>
-        <source>true</source>
-        <translation>рост</translation>
-    </message>
-    <message>
-        <source>false</source>
-        <translation>ёлғон</translation>
-    </message>
-    <message>
-        <source>, has not been successfully broadcast yet</source>
-        <translation>, ҳалигача трансляция қилингани йўқ</translation>
-    </message>
-    <message>
-        <source>unknown</source>
-        <translation>Номаълум</translation>
-    </message>
-</context>
 <context>
     <name>TransactionDescDialog</name>
-    <message>
-        <source>Transaction details</source>
-        <translation>Операция тафсилотлари</translation>
-    </message>
     <message>
         <source>This pane shows a detailed description of the transaction</source>
         <translation>Ушбу ойна операциянинг батафсил таърифини кўрсатади</translation>
     </message>
 </context>
-<context>
-    <name>TransactionTableModel</name>
-    <message>
-        <source>Date</source>
-        <translation>Сана</translation>
-    </message>
-    <message>
-        <source>Type</source>
-        <translation>Тури</translation>
-    </message>
-    <message>
-        <source>Open until %1</source>
-        <translation>%1 гача очиш</translation>
-    </message>
-    <message>
-        <source>Confirmed (%1 confirmations)</source>
-        <translation>Тасдиқланди (%1 та тасдиқ)</translation>
-    </message>
-    <message>
-        <source>This block was not received by any other nodes and will probably not be accepted!</source>
-        <translation>Ушбу тўсиқ бирорта бошқа уланишлар томонидан қабул қилинмаган ва тасдиқланмаган!</translation>
-    </message>
-    <message>
-        <source>Generated but not accepted</source>
-        <translation>Яратилди, аммо қабул қилинмади</translation>
-    </message>
-    <message>
-        <source>Offline</source>
-        <translation>Оффлайн</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Ёрлиқ</translation>
-    </message>
-    <message>
-        <source>Unconfirmed</source>
-        <translation>Тасдиқланмаган</translation>
-    </message>
-    <message>
-        <source>Received with</source>
-        <translation>Ёрдамида қабул қилиш</translation>
-    </message>
-    <message>
-        <source>Received from</source>
-        <translation>Дан қабул қилиш</translation>
-    </message>
-    <message>
-        <source>Sent to</source>
-        <translation>Жўнатиш</translation>
-    </message>
-    <message>
-        <source>Payment to yourself</source>
-        <translation>Ўзингизга тўлов</translation>
-    </message>
-    <message>
-        <source>Mined</source>
-        <translation>Фойда</translation>
-    </message>
-    <message>
-        <source>(n/a)</source>
-        <translation>(қ/қ)</translation>
-    </message>
-    <message>
-        <source>Transaction status. Hover over this field to show number of confirmations.</source>
-        <translation>Ўтказма ҳолати. Ушбу майдон бўйлаб тасдиқлашлар сонини кўрсатиш.</translation>
-    </message>
-    <message>
-        <source>Date and time that the transaction was received.</source>
-        <translation>Ўтказма қабул қилинган сана ва вақт.</translation>
-    </message>
-    <message>
-        <source>Type of transaction.</source>
-        <translation>Пул ўтказмаси тури</translation>
-    </message>
-    <message>
-        <source>Amount removed from or added to balance.</source>
-        <translation>Миқдор ўчирилган ёки балансга қўшилган.</translation>
-    </message>
-</context>
-<context>
-    <name>TransactionView</name>
-    <message>
-        <source>All</source>
-        <translation>Барча</translation>
-    </message>
-    <message>
-        <source>Today</source>
-        <translation>Бугун</translation>
-    </message>
-    <message>
-        <source>This week</source>
-        <translation>Шу ҳафта</translation>
-    </message>
-    <message>
-        <source>This month</source>
-        <translation>Шу ой</translation>
-    </message>
-    <message>
-        <source>Last month</source>
-        <translation>Ўтган хафта</translation>
-    </message>
-    <message>
-        <source>This year</source>
-        <translation>Шу йил</translation>
-    </message>
-    <message>
-        <source>Range...</source>
-        <translation>Оралиқ...</translation>
-    </message>
-    <message>
-        <source>Received with</source>
-        <translation>Ёрдамида қабул қилинган</translation>
-    </message>
-    <message>
-        <source>Sent to</source>
-        <translation>Жўнатиш</translation>
-    </message>
-    <message>
-        <source>To yourself</source>
-        <translation>Ўзингизга</translation>
-    </message>
-    <message>
-        <source>Mined</source>
-        <translation>Фойда</translation>
-    </message>
-    <message>
-        <source>Other</source>
-        <translation>Бошка</translation>
-    </message>
-    <message>
-        <source>Enter address or label to search</source>
-        <translation>Излаш учун манзил ёки ёрлиқни киритинг</translation>
-    </message>
-    <message>
-        <source>Min amount</source>
-        <translation>Мин қиймат</translation>
-    </message>
-    <message>
-        <source>Copy address</source>
-        <translation>Манзилни нусхалаш</translation>
-    </message>
-    <message>
-        <source>Copy label</source>
-        <translation>Ёрликни нусхалаш</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>Кийматни нусхала</translation>
-    </message>
-    <message>
-        <source>Copy transaction ID</source>
-        <translation>Ўтказам рақамидан нусха олиш</translation>
-    </message>
-    <message>
-        <source>Edit label</source>
-        <translation>Ёрликни тахрирлаш</translation>
-    </message>
-    <message>
-        <source>Show transaction details</source>
-        <translation>Ўтказма тафсилотларини кўрсатиш </translation>
-    </message>
-    <message>
-        <source>Export Transaction History</source>
-        <translation>Ўтказмалар тарихини экспорт қилиш</translation>
-    </message>
-    <message>
-        <source>Watch-only</source>
-        <translation>Фақат кўришга</translation>
-    </message>
-    <message>
-        <source>Exporting Failed</source>
-        <translation>Экспорт қилиб бўлмади</translation>
-    </message>
-    <message>
-        <source>The transaction history was successfully saved to %1.</source>
-        <translation>Ўтказмалар тарихи %1 га муваффаққиятли сақланди.</translation>
-    </message>
-    <message>
-        <source>Comma separated file (*.csv)</source>
-        <translation>Вергул билан ажратилган файл (*.csv)</translation>
-    </message>
-    <message>
-        <source>Confirmed</source>
-        <translation>Тасдиқланди</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation>Сана</translation>
-    </message>
-    <message>
-        <source>Type</source>
-        <translation>Туркум</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Ёрлик</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>Манзил</translation>
-    </message>
-    <message>
-        <source>ID</source>
-        <translation>ID</translation>
-    </message>
-    <message>
-        <source>Range:</source>
-        <translation>Оралиқ:</translation>
-    </message>
-    <message>
-        <source>to</source>
-        <translation>Кимга</translation>
-    </message>
-</context>
 <context>
     <name>UnitDisplayStatusBarControl</name>
     </context>
-<context>
-    <name>WalletFrame</name>
-    <message>
-        <source>No wallet has been loaded.</source>
-        <translation>Хали бирорта хамён юкланмади</translation>
-    </message>
-</context>
-<context>
-    <name>WalletModel</name>
-    <message>
-        <source>Send Coins</source>
-        <translation>Тангаларни жунат</translation>
-    </message>
-</context>
-<context>
-    <name>WalletView</name>
-    <message>
-        <source>&amp;Export</source>
-        <translation>&amp;Экспорт</translation>
-    </message>
-    <message>
-        <source>Export the data in the current tab to a file</source>
-        <translation>Жорий ички ойна ичидаги маълумотларни файлга экспорт қилиш</translation>
-    </message>
-    </context>
 <context>
     <name>bitcoin-core</name>
     <message>
@@ -2121,6 +1204,10 @@
         <source>Run in the background as a daemon and accept commands</source>
         <translation>Демон сифатида орқа фонда ишга туширинг ва буйруқларга рози бўлинг</translation>
     </message>
+    <message>
+        <source>Bitcoin Core</source>
+        <translation>Bitcoin Core</translation>
+    </message>
     <message>
         <source>Connection options:</source>
         <translation>Уланиш кўрсаткичлари:</translation>
@@ -2141,10 +1228,6 @@
         <source>Password for JSON-RPC connections</source>
         <translation>JSON-RPC уланишлари учун парол</translation>
     </message>
-    <message>
-        <source>This help message</source>
-        <translation>Бу ёрдам хабари</translation>
-    </message>
     <message>
         <source>Loading addresses...</source>
         <translation>Манзиллар юкланмоқда...</translation>
diff --git a/src/qt/locale/bitcoin_uz@Latn.ts b/src/qt/locale/bitcoin_uz@Latn.ts
deleted file mode 100644
index 2e4dabb59fb78..0000000000000
--- a/src/qt/locale/bitcoin_uz@Latn.ts
+++ /dev/null
@@ -1,169 +0,0 @@
-<TS language="uz@Latn" version="2.1">
-<context>
-    <name>AddressBookPage</name>
-    <message>
-        <source>Create a new address</source>
-        <translation>Yangi manzil yaratish</translation>
-    </message>
-    <message>
-        <source>&amp;New</source>
-        <translation>&amp;Yangi</translation>
-    </message>
-    <message>
-        <source>&amp;Copy</source>
-        <translation>&amp;Nusxalash</translation>
-    </message>
-    <message>
-        <source>C&amp;lose</source>
-        <translation>Yo&amp;pish</translation>
-    </message>
-    <message>
-        <source>&amp;Copy Address</source>
-        <translation>&amp;Manzillarni nusxalash</translation>
-    </message>
-    <message>
-        <source>&amp;Delete</source>
-        <translation>&amp;O'chirish</translation>
-    </message>
-    </context>
-<context>
-    <name>AddressTableModel</name>
-    <message>
-        <source>Label</source>
-        <translation>Yorliq</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>Manzil</translation>
-    </message>
-    </context>
-<context>
-    <name>AskPassphraseDialog</name>
-    </context>
-<context>
-    <name>BanTableModel</name>
-    </context>
-<context>
-    <name>BitcoinGUI</name>
-    </context>
-<context>
-    <name>ClientModel</name>
-    </context>
-<context>
-    <name>CoinControlDialog</name>
-    </context>
-<context>
-    <name>EditAddressDialog</name>
-    </context>
-<context>
-    <name>FreespaceChecker</name>
-    </context>
-<context>
-    <name>HelpMessageDialog</name>
-    </context>
-<context>
-    <name>Intro</name>
-    </context>
-<context>
-    <name>OpenURIDialog</name>
-    </context>
-<context>
-    <name>OptionsDialog</name>
-    </context>
-<context>
-    <name>OverviewPage</name>
-    </context>
-<context>
-    <name>PaymentServer</name>
-    </context>
-<context>
-    <name>PeerTableModel</name>
-    </context>
-<context>
-    <name>QObject</name>
-    </context>
-<context>
-    <name>QRImageWidget</name>
-    </context>
-<context>
-    <name>RPCConsole</name>
-    </context>
-<context>
-    <name>ReceiveCoinsDialog</name>
-    </context>
-<context>
-    <name>ReceiveRequestDialog</name>
-    <message>
-        <source>Address</source>
-        <translation>Manzil</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Yorliq</translation>
-    </message>
-    </context>
-<context>
-    <name>RecentRequestsTableModel</name>
-    <message>
-        <source>Label</source>
-        <translation>Yorliq</translation>
-    </message>
-    </context>
-<context>
-    <name>SendCoinsDialog</name>
-    </context>
-<context>
-    <name>SendCoinsEntry</name>
-    </context>
-<context>
-    <name>ShutdownWindow</name>
-    </context>
-<context>
-    <name>SignVerifyMessageDialog</name>
-    </context>
-<context>
-    <name>SplashScreen</name>
-    </context>
-<context>
-    <name>TrafficGraphWidget</name>
-    </context>
-<context>
-    <name>TransactionDesc</name>
-    </context>
-<context>
-    <name>TransactionDescDialog</name>
-    </context>
-<context>
-    <name>TransactionTableModel</name>
-    <message>
-        <source>Label</source>
-        <translation>Yorliq</translation>
-    </message>
-    </context>
-<context>
-    <name>TransactionView</name>
-    <message>
-        <source>Label</source>
-        <translation>Yorliq</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>Manzil</translation>
-    </message>
-    </context>
-<context>
-    <name>UnitDisplayStatusBarControl</name>
-    </context>
-<context>
-    <name>WalletFrame</name>
-    </context>
-<context>
-    <name>WalletModel</name>
-    </context>
-<context>
-    <name>WalletView</name>
-    </context>
-<context>
-    <name>bitcoin-core</name>
-    </context>
-</TS>
\ No newline at end of file
diff --git a/src/qt/locale/bitcoin_vi.ts b/src/qt/locale/bitcoin_vi.ts
index 47745a3bc8ed0..e8bf01ab1b726 100644
--- a/src/qt/locale/bitcoin_vi.ts
+++ b/src/qt/locale/bitcoin_vi.ts
@@ -17,33 +17,10 @@
         <source>&amp;Copy</source>
         <translation>Sao chép</translation>
     </message>
-    <message>
-        <source>&amp;Copy Address</source>
-        <translation>Sao chép địa chỉ</translation>
-    </message>
     <message>
         <source>&amp;Delete</source>
         <translation>&amp;Xóa</translation>
     </message>
-    <message>
-        <source>Comma separated file (*.csv)</source>
-        <translation>Tập tin tách biệt bởi dấu phẩy (*.csv)</translation>
-    </message>
-    </context>
-<context>
-    <name>AddressTableModel</name>
-    <message>
-        <source>Label</source>
-        <translation>Nhãn dữ liệu</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>Địa chỉ</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(chưa có nhãn)</translation>
-    </message>
 </context>
 <context>
     <name>AskPassphraseDialog</name>
@@ -54,9 +31,6 @@
 <context>
     <name>BitcoinGUI</name>
     </context>
-<context>
-    <name>ClientModel</name>
-    </context>
 <context>
     <name>CoinControlDialog</name>
     <message>
@@ -67,10 +41,6 @@
         <source>Amount</source>
         <translation>Số lượng</translation>
     </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(chưa có nhãn)</translation>
-    </message>
     </context>
 <context>
     <name>EditAddressDialog</name>
@@ -82,7 +52,7 @@
         <source>&amp;Address</source>
         <translation>Địa chỉ</translation>
     </message>
-    </context>
+</context>
 <context>
     <name>FreespaceChecker</name>
     </context>
@@ -101,9 +71,6 @@
 <context>
     <name>OverviewPage</name>
     </context>
-<context>
-    <name>PaymentServer</name>
-    </context>
 <context>
     <name>PeerTableModel</name>
     </context>
@@ -114,9 +81,6 @@
         <translation>Số lượng</translation>
     </message>
     </context>
-<context>
-    <name>QRImageWidget</name>
-    </context>
 <context>
     <name>RPCConsole</name>
     </context>
@@ -129,33 +93,6 @@
         <source>Copy &amp;Address</source>
         <translation>Sao chép địa chỉ</translation>
     </message>
-    <message>
-        <source>Address</source>
-        <translation>Địa chỉ</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>Số lượng</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Nhãn dữ liệu</translation>
-    </message>
-    </context>
-<context>
-    <name>RecentRequestsTableModel</name>
-    <message>
-        <source>Label</source>
-        <translation>Nhãn dữ liệu</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>Số lượng</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(chưa có nhãn)</translation>
-    </message>
     </context>
 <context>
     <name>SendCoinsDialog</name>
@@ -163,10 +100,6 @@
         <source>Amount:</source>
         <translation>Số lượng:</translation>
     </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(chưa có nhãn)</translation>
-    </message>
     </context>
 <context>
     <name>SendCoinsEntry</name>
@@ -183,50 +116,12 @@
 <context>
     <name>TrafficGraphWidget</name>
     </context>
-<context>
-    <name>TransactionDesc</name>
-    <message>
-        <source>Amount</source>
-        <translation>Số lượng</translation>
-    </message>
-    </context>
 <context>
     <name>TransactionDescDialog</name>
     </context>
-<context>
-    <name>TransactionTableModel</name>
-    <message>
-        <source>Label</source>
-        <translation>Nhãn dữ liệu</translation>
-    </message>
-    </context>
-<context>
-    <name>TransactionView</name>
-    <message>
-        <source>Comma separated file (*.csv)</source>
-        <translation>Tập tin tách biệt bởi dấu phẩy (*.csv)</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Nhãn dữ liệu</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>Địa chỉ</translation>
-    </message>
-    </context>
 <context>
     <name>UnitDisplayStatusBarControl</name>
     </context>
-<context>
-    <name>WalletFrame</name>
-    </context>
-<context>
-    <name>WalletModel</name>
-    </context>
-<context>
-    <name>WalletView</name>
-    </context>
 <context>
     <name>bitcoin-core</name>
     </context>
diff --git a/src/qt/locale/bitcoin_vi_VN.ts b/src/qt/locale/bitcoin_vi_VN.ts
index d55fa618855fd..a4e1588c9320c 100644
--- a/src/qt/locale/bitcoin_vi_VN.ts
+++ b/src/qt/locale/bitcoin_vi_VN.ts
@@ -25,10 +25,6 @@
         <source>C&amp;lose</source>
         <translation>Đó&amp;ng</translation>
     </message>
-    <message>
-        <source>&amp;Copy Address</source>
-        <translation>&amp;Copy Địa Chỉ</translation>
-    </message>
     <message>
         <source>Delete the currently selected address from the list</source>
         <translation>Xóa địa chỉ hiện tại từ danh sách</translation>
@@ -45,61 +41,6 @@
         <source>&amp;Delete</source>
         <translation>&amp;Xó&amp;a</translation>
     </message>
-    <message>
-        <source>Choose the address to send coins to</source>
-        <translation>Chọn địa chỉ để gửi coin tới</translation>
-    </message>
-    <message>
-        <source>Choose the address to receive coins with</source>
-        <translation>Chọn địa chỉ để nhận coin</translation>
-    </message>
-    <message>
-        <source>C&amp;hoose</source>
-        <translation>C&amp;họn</translation>
-    </message>
-    <message>
-        <source>Sending addresses</source>
-        <translation>Địa chỉ gửi</translation>
-    </message>
-    <message>
-        <source>Receiving addresses</source>
-        <translation>Địa chỉ nhận</translation>
-    </message>
-    <message>
-        <source>Copy &amp;Label</source>
-        <translation>Copy &amp;Nhãn</translation>
-    </message>
-    <message>
-        <source>&amp;Edit</source>
-        <translation>&amp;Sửa</translation>
-    </message>
-    <message>
-        <source>Export Address List</source>
-        <translation>Xuất Danh Sách Địa Chỉ</translation>
-    </message>
-    <message>
-        <source>Comma separated file (*.csv)</source>
-        <translation>Comma separated file (*.csv)</translation>
-    </message>
-    <message>
-        <source>Exporting Failed</source>
-        <translation>Xuất Đã Thất Bại</translation>
-    </message>
-    </context>
-<context>
-    <name>AddressTableModel</name>
-    <message>
-        <source>Label</source>
-        <translation>Nhãn</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>Địa chỉ</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(không nhãn)</translation>
-    </message>
 </context>
 <context>
     <name>AskPassphraseDialog</name>
@@ -119,23 +60,7 @@
         <source>Repeat new passphrase</source>
         <translation>Điền lại passphrase</translation>
     </message>
-    <message>
-        <source>Encrypt wallet</source>
-        <translation>Mã hóa ví</translation>
-    </message>
-    <message>
-        <source>Unlock wallet</source>
-        <translation>Mở khóa ví</translation>
-    </message>
-    <message>
-        <source>Decrypt wallet</source>
-        <translation>Giải mã ví</translation>
-    </message>
-    <message>
-        <source>Wallet encrypted</source>
-        <translation>Ví đã được mã hóa</translation>
-    </message>
-    </context>
+</context>
 <context>
     <name>BanTableModel</name>
     </context>
@@ -173,10 +98,6 @@
         <source>Open &amp;URI...</source>
         <translation>Mở &amp;URI...</translation>
     </message>
-    <message>
-        <source>Bitcoin Core client</source>
-        <translation>Bitcoin Core client</translation>
-    </message>
     <message>
         <source>Bitcoin</source>
         <translation>Bitcoin</translation>
@@ -213,14 +134,6 @@
         <source>&amp;Help</source>
         <translation>Trợ &amp;giúp</translation>
     </message>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Bitcoin Core</translation>
-    </message>
-    <message>
-        <source>&amp;About Bitcoin Core</source>
-        <translation>&amp;Về Bitcoin Core</translation>
-    </message>
     <message numerus="yes">
         <source>%n hour(s)</source>
         <translation><numerusform>%n giờ</numerusform></translation>
@@ -266,13 +179,6 @@
         <translation>Giao dịch đang tới</translation>
     </message>
     </context>
-<context>
-    <name>ClientModel</name>
-    <message>
-        <source>Network Alert</source>
-        <translation>Network Alert</translation>
-    </message>
-</context>
 <context>
     <name>CoinControlDialog</name>
     <message>
@@ -319,43 +225,7 @@
         <source>Priority</source>
         <translation>Tầm quan trọng</translation>
     </message>
-    <message>
-        <source>Copy address</source>
-        <translation>Copy địa chỉ</translation>
-    </message>
-    <message>
-        <source>Copy label</source>
-        <translation>Copy nhãn</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>Lượng copy</translation>
-    </message>
-    <message>
-        <source>low</source>
-        <translation>thấp</translation>
-    </message>
-    <message>
-        <source>lower</source>
-        <translation>thấp hơn</translation>
-    </message>
-    <message>
-        <source>lowest</source>
-        <translation>thấp nhất</translation>
-    </message>
-    <message>
-        <source>yes</source>
-        <translation>có</translation>
-    </message>
-    <message>
-        <source>no</source>
-        <translation>không</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(không nhãn)</translation>
-    </message>
-    </context>
+</context>
 <context>
     <name>EditAddressDialog</name>
     <message>
@@ -366,7 +236,7 @@
         <source>&amp;Address</source>
         <translation>Địa chỉ</translation>
     </message>
-    </context>
+</context>
 <context>
     <name>FreespaceChecker</name>
     <message>
@@ -376,18 +246,10 @@
     </context>
 <context>
     <name>HelpMessageDialog</name>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Bitcoin Core</translation>
-    </message>
     <message>
         <source>version</source>
         <translation>version</translation>
     </message>
-    <message>
-        <source>About Bitcoin Core</source>
-        <translation>Về Bitcoin Core</translation>
-    </message>
     </context>
 <context>
     <name>Intro</name>
@@ -395,10 +257,6 @@
         <source>Welcome</source>
         <translation>Chào mừng</translation>
     </message>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Bitcoin Core</translation>
-    </message>
     <message>
         <source>Error</source>
         <translation>Lỗi</translation>
@@ -461,9 +319,6 @@
         <translation>Tổng:</translation>
     </message>
     </context>
-<context>
-    <name>PaymentServer</name>
-    </context>
 <context>
     <name>PeerTableModel</name>
     <message>
@@ -478,9 +333,6 @@
         <translation>Lượng</translation>
     </message>
     </context>
-<context>
-    <name>QRImageWidget</name>
-    </context>
 <context>
     <name>RPCConsole</name>
     <message>
@@ -514,52 +366,13 @@
         <source>&amp;Amount:</source>
         <translation>Lượng:</translation>
     </message>
-    <message>
-        <source>Copy label</source>
-        <translation>Copy nhãn</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>Lượng copy</translation>
-    </message>
-</context>
+    </context>
 <context>
     <name>ReceiveRequestDialog</name>
     <message>
         <source>Copy &amp;Address</source>
         <translation>&amp;Copy Địa Chỉ</translation>
     </message>
-    <message>
-        <source>Address</source>
-        <translation>Địa chỉ</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>Lượng</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Nhãn</translation>
-    </message>
-    </context>
-<context>
-    <name>RecentRequestsTableModel</name>
-    <message>
-        <source>Date</source>
-        <translation>Ngày tháng</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Nhãn</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>Lượng</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(không nhãn)</translation>
-    </message>
     </context>
 <context>
     <name>SendCoinsDialog</name>
@@ -591,14 +404,6 @@
         <source>Change:</source>
         <translation>Thay đổi:</translation>
     </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>Lượng copy</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(không nhãn)</translation>
-    </message>
     </context>
 <context>
     <name>SendCoinsEntry</name>
@@ -615,104 +420,26 @@
     </context>
 <context>
     <name>SplashScreen</name>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Bitcoin Core</translation>
-    </message>
     </context>
 <context>
     <name>TrafficGraphWidget</name>
     </context>
-<context>
-    <name>TransactionDesc</name>
-    <message>
-        <source>Date</source>
-        <translation>Ngày tháng</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>Lượng</translation>
-    </message>
-    </context>
 <context>
     <name>TransactionDescDialog</name>
     </context>
-<context>
-    <name>TransactionTableModel</name>
-    <message>
-        <source>Date</source>
-        <translation>Ngày tháng</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Nhãn</translation>
-    </message>
-    </context>
-<context>
-    <name>TransactionView</name>
-    <message>
-        <source>Copy address</source>
-        <translation>Copy địa chỉ</translation>
-    </message>
-    <message>
-        <source>Copy label</source>
-        <translation>Copy nhãn</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>Lượng copy</translation>
-    </message>
-    <message>
-        <source>Exporting Failed</source>
-        <translation>Xuất Đã Thất Bại</translation>
-    </message>
-    <message>
-        <source>Comma separated file (*.csv)</source>
-        <translation>Comma separated file (*.csv)</translation>
-    </message>
-    <message>
-        <source>Confirmed</source>
-        <translation>Đã xác nhận</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation>Ngày tháng</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>Nhãn</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>Địa chỉ</translation>
-    </message>
-    </context>
 <context>
     <name>UnitDisplayStatusBarControl</name>
     </context>
-<context>
-    <name>WalletFrame</name>
-    </context>
-<context>
-    <name>WalletModel</name>
-    </context>
-<context>
-    <name>WalletView</name>
-    <message>
-        <source>&amp;Export</source>
-        <translation>X&amp;uất</translation>
-    </message>
-    <message>
-        <source>Export the data in the current tab to a file</source>
-        <translation>Xuất dữ liệu trong mục hiện tại ra file</translation>
-    </message>
-    </context>
 <context>
     <name>bitcoin-core</name>
     <message>
         <source>Options:</source>
         <translation>Lựa chọn:</translation>
     </message>
+    <message>
+        <source>Bitcoin Core</source>
+        <translation>Bitcoin Core</translation>
+    </message>
     <message>
         <source>(default: %u)</source>
         <translation>(mặc định: %u)</translation>
@@ -729,10 +456,6 @@
         <source>Warning</source>
         <translation>Chú ý</translation>
     </message>
-    <message>
-        <source>This help message</source>
-        <translation>Thông điệp trợ giúp này</translation>
-    </message>
     <message>
         <source>Loading addresses...</source>
         <translation>Đang đọc các địa chỉ...</translation>
diff --git a/src/qt/locale/bitcoin_zh.ts b/src/qt/locale/bitcoin_zh.ts
index aeb4faa712283..bceba9dfdd86d 100644
--- a/src/qt/locale/bitcoin_zh.ts
+++ b/src/qt/locale/bitcoin_zh.ts
@@ -2,9 +2,6 @@
 <context>
     <name>AddressBookPage</name>
     </context>
-<context>
-    <name>AddressTableModel</name>
-    </context>
 <context>
     <name>AskPassphraseDialog</name>
     </context>
@@ -22,9 +19,6 @@
         <translation>警告</translation>
     </message>
     </context>
-<context>
-    <name>ClientModel</name>
-    </context>
 <context>
     <name>CoinControlDialog</name>
     <message>
@@ -57,18 +51,12 @@
 <context>
     <name>OverviewPage</name>
     </context>
-<context>
-    <name>PaymentServer</name>
-    </context>
 <context>
     <name>PeerTableModel</name>
     </context>
 <context>
     <name>QObject</name>
     </context>
-<context>
-    <name>QRImageWidget</name>
-    </context>
 <context>
     <name>RPCConsole</name>
     </context>
@@ -78,13 +66,6 @@
 <context>
     <name>ReceiveRequestDialog</name>
     </context>
-<context>
-    <name>RecentRequestsTableModel</name>
-    <message>
-        <source>Date</source>
-        <translation>日期</translation>
-    </message>
-    </context>
 <context>
     <name>SendCoinsDialog</name>
     <message>
@@ -95,18 +76,6 @@
         <source>Choose...</source>
         <translation>选择...</translation>
     </message>
-    <message>
-        <source>Pay only the required fee of %1</source>
-        <translation>仅支付全额的%1</translation>
-    </message>
-    <message>
-        <source>The recipient address is not valid. Please recheck.</source>
-        <translation>收款人地址无效，请再次确认。</translation>
-    </message>
-    <message>
-        <source>Warning: Invalid Bitcoin address</source>
-        <translation>警告：比特币地址无效</translation>
-    </message>
     </context>
 <context>
     <name>SendCoinsEntry</name>
@@ -123,42 +92,12 @@
 <context>
     <name>TrafficGraphWidget</name>
     </context>
-<context>
-    <name>TransactionDesc</name>
-    <message>
-        <source>Date</source>
-        <translation>日期</translation>
-    </message>
-    </context>
 <context>
     <name>TransactionDescDialog</name>
     </context>
-<context>
-    <name>TransactionTableModel</name>
-    <message>
-        <source>Date</source>
-        <translation>日期</translation>
-    </message>
-    </context>
-<context>
-    <name>TransactionView</name>
-    <message>
-        <source>Date</source>
-        <translation>日期</translation>
-    </message>
-    </context>
 <context>
     <name>UnitDisplayStatusBarControl</name>
     </context>
-<context>
-    <name>WalletFrame</name>
-    </context>
-<context>
-    <name>WalletModel</name>
-    </context>
-<context>
-    <name>WalletView</name>
-    </context>
 <context>
     <name>bitcoin-core</name>
     <message>
@@ -177,26 +116,10 @@
         <source>Warning</source>
         <translation>警告</translation>
     </message>
-    <message>
-        <source>wallet.dat corrupt, salvage failed</source>
-        <translation>wallet.dat文件受损，修复失败</translation>
-    </message>
-    <message>
-        <source>This help message</source>
-        <translation>此条帮助信息</translation>
-    </message>
     <message>
         <source>Loading addresses...</source>
         <translation>正在载入地址...</translation>
     </message>
-    <message>
-        <source>Error loading wallet.dat: Wallet corrupted</source>
-        <translation>wallet.dat文件加载错误：钱包受损</translation>
-    </message>
-    <message>
-        <source>Error loading wallet.dat</source>
-        <translation>wallet.dat文件加载错误</translation>
-    </message>
     <message>
         <source>Insufficient funds</source>
         <translation>余额不足</translation>
diff --git a/src/qt/locale/bitcoin_zh_CN.ts b/src/qt/locale/bitcoin_zh_CN.ts
index cc1b03356480e..8f467b79c1cc5 100644
--- a/src/qt/locale/bitcoin_zh_CN.ts
+++ b/src/qt/locale/bitcoin_zh_CN.ts
@@ -25,10 +25,6 @@
         <source>C&amp;lose</source>
         <translation>关闭(&amp;l)</translation>
     </message>
-    <message>
-        <source>&amp;Copy Address</source>
-        <translation>复制地址(&amp;C)</translation>
-    </message>
     <message>
         <source>Delete the currently selected address from the list</source>
         <translation>从列表中删除选中的地址</translation>
@@ -45,73 +41,6 @@
         <source>&amp;Delete</source>
         <translation>删除(&amp;D)</translation>
     </message>
-    <message>
-        <source>Choose the address to send coins to</source>
-        <translation>选择发币地址</translation>
-    </message>
-    <message>
-        <source>Choose the address to receive coins with</source>
-        <translation>选择收币地址</translation>
-    </message>
-    <message>
-        <source>C&amp;hoose</source>
-        <translation>选择(&amp;H)</translation>
-    </message>
-    <message>
-        <source>Sending addresses</source>
-        <translation>正在发送地址</translation>
-    </message>
-    <message>
-        <source>Receiving addresses</source>
-        <translation>正在接收地址</translation>
-    </message>
-    <message>
-        <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source>
-        <translation>这是您用来付款的比特币地址。在付款前，请仔细核实付款金额和收款地址。</translation>
-    </message>
-    <message>
-        <source>These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source>
-        <translation>这些都是您的比特币地址，可用于收款。建议对每笔交易都使用一个新的地址。</translation>
-    </message>
-    <message>
-        <source>Copy &amp;Label</source>
-        <translation>复制标签(&amp;L)</translation>
-    </message>
-    <message>
-        <source>&amp;Edit</source>
-        <translation>编辑(&amp;E)</translation>
-    </message>
-    <message>
-        <source>Export Address List</source>
-        <translation>导出地址列表</translation>
-    </message>
-    <message>
-        <source>Comma separated file (*.csv)</source>
-        <translation>逗号分隔文件 (*.csv)</translation>
-    </message>
-    <message>
-        <source>Exporting Failed</source>
-        <translation>导出失败</translation>
-    </message>
-    <message>
-        <source>There was an error trying to save the address list to %1. Please try again.</source>
-        <translation>保存地址列表出现 %1错误。请重试。</translation>
-    </message>
-</context>
-<context>
-    <name>AddressTableModel</name>
-    <message>
-        <source>Label</source>
-        <translation>标签</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>地址</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(没有标签)</translation>
-    </message>
 </context>
 <context>
     <name>AskPassphraseDialog</name>
@@ -131,94 +60,6 @@
         <source>Repeat new passphrase</source>
         <translation>重复新密码</translation>
     </message>
-    <message>
-        <source>Encrypt wallet</source>
-        <translation>加密钱包</translation>
-    </message>
-    <message>
-        <source>This operation needs your wallet passphrase to unlock the wallet.</source>
-        <translation>此操作需要您首先使用密码解锁该钱包。</translation>
-    </message>
-    <message>
-        <source>Unlock wallet</source>
-        <translation>解锁钱包</translation>
-    </message>
-    <message>
-        <source>This operation needs your wallet passphrase to decrypt the wallet.</source>
-        <translation>该操作需要您首先使用密码解密钱包。</translation>
-    </message>
-    <message>
-        <source>Decrypt wallet</source>
-        <translation>解密钱包</translation>
-    </message>
-    <message>
-        <source>Change passphrase</source>
-        <translation>更改密码</translation>
-    </message>
-    <message>
-        <source>Confirm wallet encryption</source>
-        <translation>确认加密钱包</translation>
-    </message>
-    <message>
-        <source>Warning: If you encrypt your wallet and lose your passphrase, you will &lt;b&gt;LOSE ALL OF YOUR BITCOINS&lt;/b&gt;!</source>
-        <translation>警告：如果您加密了您的钱包，但是忘记了密码，你将会&lt;b&gt;丢失所有的比特币&lt;/b&gt;！</translation>
-    </message>
-    <message>
-        <source>Are you sure you wish to encrypt your wallet?</source>
-        <translation>您确定需要为钱包加密吗？</translation>
-    </message>
-    <message>
-        <source>Bitcoin Core will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source>
-        <translation>比特币核心现在将关闭以完成加密过程。请记住，在您的计算机被恶意软件感染的情况下，加密不能完全保护您的比特币免于被盗。</translation>
-    </message>
-    <message>
-        <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source>
-        <translation>重要提示：您以前备份的钱包文件应该替换成最新生成的加密钱包文件（重新备份）。从安全性上考虑，您以前备份的未加密的钱包文件，在您使用新的加密钱包后将无效，请重新备份。</translation>
-    </message>
-    <message>
-        <source>Warning: The Caps Lock key is on!</source>
-        <translation>警告：大写锁定键处于打开状态！</translation>
-    </message>
-    <message>
-        <source>Wallet encrypted</source>
-        <translation>钱包已加密</translation>
-    </message>
-    <message>
-        <source>Enter the new passphrase to the wallet.&lt;br/&gt;Please use a passphrase of &lt;b&gt;ten or more random characters&lt;/b&gt;, or &lt;b&gt;eight or more words&lt;/b&gt;.</source>
-        <translation>请输入新的钱包密码. &lt;br/&gt;密码须包含&lt;b&gt;10个以上随机字符&lt;/b&gt;,或&lt;b&gt;8个以上单词&lt;/b&gt;.</translation>
-    </message>
-    <message>
-        <source>Enter the old passphrase and new passphrase to the wallet.</source>
-        <translation>请输入钱包的旧密码与新密码。</translation>
-    </message>
-    <message>
-        <source>Wallet encryption failed</source>
-        <translation>钱包加密失败</translation>
-    </message>
-    <message>
-        <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
-        <translation>由于一个本地错误，加密钱包的操作已经失败。您的钱包没能被加密。</translation>
-    </message>
-    <message>
-        <source>The supplied passphrases do not match.</source>
-        <translation>密码不匹配。</translation>
-    </message>
-    <message>
-        <source>Wallet unlock failed</source>
-        <translation>钱包解锁失败</translation>
-    </message>
-    <message>
-        <source>The passphrase entered for the wallet decryption was incorrect.</source>
-        <translation>用于解密钱包的密码不正确。</translation>
-    </message>
-    <message>
-        <source>Wallet decryption failed</source>
-        <translation>钱包解密失败。</translation>
-    </message>
-    <message>
-        <source>Wallet passphrase was successfully changed.</source>
-        <translation>修改钱包密码成功。</translation>
-    </message>
 </context>
 <context>
     <name>BanTableModel</name>
@@ -269,6 +110,10 @@
         <source>Quit application</source>
         <translation>退出程序</translation>
     </message>
+    <message>
+        <source>&amp;About %1</source>
+        <translation>&amp;关于 %1</translation>
+    </message>
     <message>
         <source>About &amp;Qt</source>
         <translation>关于Qt(&amp;Q)</translation>
@@ -305,14 +150,6 @@
         <source>Open &amp;URI...</source>
         <translation>打开 &amp;URI...</translation>
     </message>
-    <message>
-        <source>Bitcoin Core client</source>
-        <translation>比特币核心钱包客户端</translation>
-    </message>
-    <message>
-        <source>Importing blocks from disk...</source>
-        <translation>正在从磁盘导入数据块...</translation>
-    </message>
     <message>
         <source>Reindexing blocks on disk...</source>
         <translation>正在为数据块重建索引...</translation>
@@ -357,10 +194,6 @@
         <source>&amp;Receive</source>
         <translation>接收(&amp;R)</translation>
     </message>
-    <message>
-        <source>Show information about Bitcoin Core</source>
-        <translation>显示有关比特币核心钱包信息</translation>
-    </message>
     <message>
         <source>&amp;Show / Hide</source>
         <translation>显示 / 隐藏(&amp;S)</translation>
@@ -397,22 +230,10 @@
         <source>Tabs toolbar</source>
         <translation>分页工具栏</translation>
     </message>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>比特币核心</translation>
-    </message>
     <message>
         <source>Request payments (generates QR codes and bitcoin: URIs)</source>
         <translation>请求支付（生成二维码和 bitcoin: URI）</translation>
     </message>
-    <message>
-        <source>&amp;About Bitcoin Core</source>
-        <translation>关于比特币核心(&amp;A)</translation>
-    </message>
-    <message>
-        <source>Modify configuration options for Bitcoin Core</source>
-        <translation>修改比特币核心的配置选项</translation>
-    </message>
     <message>
         <source>Show the list of used sending addresses and labels</source>
         <translation>显示用过的发送地址和标签的列表</translation>
@@ -429,10 +250,6 @@
         <source>&amp;Command-line options</source>
         <translation>命令行选项(&amp;C)</translation>
     </message>
-    <message>
-        <source>Show the Bitcoin Core help message to get a list with possible Bitcoin command-line options</source>
-        <translation>显示比特币核心 程序帮助信息，获取可用的命令行选项 </translation>
-    </message>
     <message numerus="yes">
         <source>%n active connection(s) to Bitcoin network</source>
         <translation><numerusform>%n 个到比特币网络的活动连接</numerusform></translation>
@@ -544,13 +361,6 @@
         <translation>钱包已被&lt;b&gt;加密&lt;/b&gt;，当前为&lt;b&gt;锁定&lt;/b&gt;状态</translation>
     </message>
 </context>
-<context>
-    <name>ClientModel</name>
-    <message>
-        <source>Network Alert</source>
-        <translation>网络警报</translation>
-    </message>
-</context>
 <context>
     <name>CoinControlDialog</name>
     <message>
@@ -629,150 +439,6 @@
         <source>Priority</source>
         <translation>优先级</translation>
     </message>
-    <message>
-        <source>Copy address</source>
-        <translation>复制地址</translation>
-    </message>
-    <message>
-        <source>Copy label</source>
-        <translation>复制标签</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>复制金额</translation>
-    </message>
-    <message>
-        <source>Copy transaction ID</source>
-        <translation>复制交易编号</translation>
-    </message>
-    <message>
-        <source>Lock unspent</source>
-        <translation>锁定未花费</translation>
-    </message>
-    <message>
-        <source>Unlock unspent</source>
-        <translation>解锁未花费</translation>
-    </message>
-    <message>
-        <source>Copy quantity</source>
-        <translation>复制金额</translation>
-    </message>
-    <message>
-        <source>Copy fee</source>
-        <translation>复制交易费</translation>
-    </message>
-    <message>
-        <source>Copy after fee</source>
-        <translation>复制含交易费的金额</translation>
-    </message>
-    <message>
-        <source>Copy bytes</source>
-        <translation>复制字节</translation>
-    </message>
-    <message>
-        <source>Copy priority</source>
-        <translation>复制优先级</translation>
-    </message>
-    <message>
-        <source>Copy dust</source>
-        <translation>复制小额</translation>
-    </message>
-    <message>
-        <source>Copy change</source>
-        <translation>复制零钱</translation>
-    </message>
-    <message>
-        <source>highest</source>
-        <translation>最高</translation>
-    </message>
-    <message>
-        <source>higher</source>
-        <translation>更高</translation>
-    </message>
-    <message>
-        <source>high</source>
-        <translation>高</translation>
-    </message>
-    <message>
-        <source>medium-high</source>
-        <translation>中高</translation>
-    </message>
-    <message>
-        <source>medium</source>
-        <translation>中等</translation>
-    </message>
-    <message>
-        <source>low-medium</source>
-        <translation>中低</translation>
-    </message>
-    <message>
-        <source>low</source>
-        <translation>低</translation>
-    </message>
-    <message>
-        <source>lower</source>
-        <translation>更低</translation>
-    </message>
-    <message>
-        <source>lowest</source>
-        <translation>最低</translation>
-    </message>
-    <message>
-        <source>(%1 locked)</source>
-        <translation>(%1 锁定)</translation>
-    </message>
-    <message>
-        <source>none</source>
-        <translation>无</translation>
-    </message>
-    <message>
-        <source>This label turns red if the transaction size is greater than 1000 bytes.</source>
-        <translation>如果交易规模大于 1000 字节，此标签将变为红色。</translation>
-    </message>
-    <message>
-        <source>This label turns red if the priority is smaller than "medium".</source>
-        <translation>如果优先级小于“中等”，此标签将变为红色。</translation>
-    </message>
-    <message>
-        <source>This label turns red if any recipient receives an amount smaller than %1.</source>
-        <translation>如果任何接收人收到的金额小于 %1，此标签将变为红色。</translation>
-    </message>
-    <message>
-        <source>Can vary +/- %1 satoshi(s) per input.</source>
-        <translation>可能会有 正负 %1 聪(satoshi)的偏差 </translation>
-    </message>
-    <message>
-        <source>yes</source>
-        <translation>是</translation>
-    </message>
-    <message>
-        <source>no</source>
-        <translation>否</translation>
-    </message>
-    <message>
-        <source>This means a fee of at least %1 per kB is required.</source>
-        <translation>这意味着将对交易收取 %1/千字节 的交易费。</translation>
-    </message>
-    <message>
-        <source>Can vary +/- 1 byte per input.</source>
-        <translation>每笔输入可能会有 正负1字节的偏差。</translation>
-    </message>
-    <message>
-        <source>Transactions with higher priority are more likely to get included into a block.</source>
-        <translation>交易的优先级越高，被矿工收入数据块的速度也越快。</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(没有标签)</translation>
-    </message>
-    <message>
-        <source>change from %1 (%2)</source>
-        <translation>来自%1的零钱 (%2)</translation>
-    </message>
-    <message>
-        <source>(change)</source>
-        <translation>(零钱)</translation>
-    </message>
 </context>
 <context>
     <name>EditAddressDialog</name>
@@ -796,38 +462,6 @@
         <source>&amp;Address</source>
         <translation>地址(&amp;A)</translation>
     </message>
-    <message>
-        <source>New receiving address</source>
-        <translation>新建接收地址</translation>
-    </message>
-    <message>
-        <source>New sending address</source>
-        <translation>新建发送地址</translation>
-    </message>
-    <message>
-        <source>Edit receiving address</source>
-        <translation>编辑接收地址</translation>
-    </message>
-    <message>
-        <source>Edit sending address</source>
-        <translation>编辑发送地址</translation>
-    </message>
-    <message>
-        <source>The entered address "%1" is already in the address book.</source>
-        <translation>输入的地址“%1”已经存在于地址簿中。</translation>
-    </message>
-    <message>
-        <source>The entered address "%1" is not a valid Bitcoin address.</source>
-        <translation>您输入的“%1”不是有效的比特币地址。</translation>
-    </message>
-    <message>
-        <source>Could not unlock wallet.</source>
-        <translation>无法解锁钱包</translation>
-    </message>
-    <message>
-        <source>New key generation failed.</source>
-        <translation>新的密钥生成失败。</translation>
-    </message>
 </context>
 <context>
     <name>FreespaceChecker</name>
@@ -854,10 +488,6 @@
 </context>
 <context>
     <name>HelpMessageDialog</name>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>比特币核心</translation>
-    </message>
     <message>
         <source>version</source>
         <translation>版本</translation>
@@ -866,10 +496,6 @@
         <source>(%1-bit)</source>
         <translation>(%1 位)</translation>
     </message>
-    <message>
-        <source>About Bitcoin Core</source>
-        <translation>关于比特币核心</translation>
-    </message>
     <message>
         <source>Command-line options</source>
         <translation>命令行选项</translation>
@@ -906,29 +532,13 @@
         <source>Show splash screen on startup (default: %u)</source>
         <translation>显示启动画面（默认：%u）</translation>
     </message>
-    <message>
-        <source>Reset all settings changes made over the GUI</source>
-        <translation>重置所有图形界面所做的更改</translation>
-    </message>
-</context>
+    </context>
 <context>
     <name>Intro</name>
     <message>
         <source>Welcome</source>
         <translation>欢迎</translation>
     </message>
-    <message>
-        <source>Welcome to Bitcoin Core.</source>
-        <translation>欢迎使用 比特币核心 程序。</translation>
-    </message>
-    <message>
-        <source>As this is the first time the program is launched, you can choose where Bitcoin Core will store its data.</source>
-        <translation>由于这是第一次运行 比特币核心 程序，您可以选择数据存储目录。</translation>
-    </message>
-    <message>
-        <source>Bitcoin Core will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source>
-        <translation>比特币核心 程序会下载储存一份数据块链(blockchain)。至少需要 %1 GB的存储空间，随着时间推移会需要更多的存储空间。钱包文件也储存在该目录。</translation>
-    </message>
     <message>
         <source>Use the default data directory</source>
         <translation>使用默认的数据目录</translation>
@@ -937,10 +547,6 @@
         <source>Use a custom data directory:</source>
         <translation>使用自定义的数据目录：</translation>
     </message>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>比特币核心</translation>
-    </message>
     <message>
         <source>Error: Specified data directory "%1" cannot be created.</source>
         <translation>错误：无法创建 指定的数据目录 "%1" </translation>
@@ -976,10 +582,6 @@
         <source>Select payment request file</source>
         <translation>选择付款请求文件 </translation>
     </message>
-    <message>
-        <source>Select payment request file to open</source>
-        <translation>选择需要打开的付款请求文件 </translation>
-    </message>
 </context>
 <context>
     <name>OptionsDialog</name>
@@ -1019,10 +621,6 @@
         <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Exit in the menu.</source>
         <translation>窗口被关闭时最小化而不是退出应用程序。当此选项启用时，应用程序只会在菜单中选择退出时退出。</translation>
     </message>
-    <message>
-        <source>The user interface language can be set here. This setting will take effect after restarting Bitcoin Core.</source>
-        <translation>可以在这里设置用户界面语言。此设置将在重新启动比特币核心后生效。</translation>
-    </message>
     <message>
         <source>Third party URLs (e.g. a block explorer) that appear in the transactions tab as context menu items. %s in the URL is replaced by transaction hash. Multiple URLs are separated by vertical bar |.</source>
         <translation>出现在交易的选项卡的上下文菜单项的第三方网址 (例如：区块链接查询) 。 %s的URL被替换为交易哈希。多个的URL需要竖线 | 分隔。</translation>
@@ -1047,14 +645,6 @@
         <source>&amp;Network</source>
         <translation>网络(&amp;N)</translation>
     </message>
-    <message>
-        <source>Automatically start Bitcoin Core after logging in to the system.</source>
-        <translation>登录到系统后自动启动比特币核心。</translation>
-    </message>
-    <message>
-        <source>&amp;Start Bitcoin Core on system login</source>
-        <translation>系统登录时启动比特币核心(&amp;S)</translation>
-    </message>
     <message>
         <source>(0 = auto, &lt;0 = leave that many cores free)</source>
         <translation>(0 = 自动, &lt;0 = 离开很多免费的核心)</translation>
@@ -1284,178 +874,68 @@
     </message>
 </context>
 <context>
-    <name>PaymentServer</name>
+    <name>PeerTableModel</name>
     <message>
-        <source>URI handling</source>
-        <translation>URI 处理</translation>
+        <source>User Agent</source>
+        <translation>用户代理</translation>
     </message>
     <message>
-        <source>Invalid payment address %1</source>
-        <translation>无效的付款地址 %1</translation>
+        <source>Node/Service</source>
+        <translation>节点/服务</translation>
     </message>
     <message>
-        <source>Payment request rejected</source>
-        <translation>支付请求被拒绝</translation>
+        <source>Ping Time</source>
+        <translation>Ping 时间</translation>
     </message>
+</context>
+<context>
+    <name>QObject</name>
     <message>
-        <source>Payment request network doesn't match client network.</source>
-        <translation>付款请求所在的网络与当前客户端所在的网络不匹配。</translation>
+        <source>Amount</source>
+        <translation>金额</translation>
     </message>
     <message>
-        <source>Payment request is not initialized.</source>
-        <translation>支付请求未成形。</translation>
+        <source>Enter a Bitcoin address (e.g. %1)</source>
+        <translation>请输入一个比特币地址 (例如 %1)</translation>
     </message>
     <message>
-        <source>Requested payment amount of %1 is too small (considered dust).</source>
-        <translation>请求支付的金额 %1 太小（就像尘埃）。</translation>
+        <source>%1 d</source>
+        <translation>%1 天</translation>
     </message>
     <message>
-        <source>Payment request error</source>
-        <translation>支付请求出错</translation>
+        <source>%1 h</source>
+        <translation>%1 小时</translation>
     </message>
     <message>
-        <source>Cannot start bitcoin: click-to-pay handler</source>
-        <translation>暂时无法启动比特币：点击支付功能</translation>
+        <source>%1 m</source>
+        <translation>%1 分钟</translation>
     </message>
     <message>
-        <source>Payment request fetch URL is invalid: %1</source>
-        <translation>付款请求URI链接非法: %1</translation>
+        <source>%1 s</source>
+        <translation>%1 秒</translation>
     </message>
     <message>
-        <source>URI cannot be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source>
-        <translation>URI无法解析！原因可能是比特币地址不正确，或者URI参数错误。</translation>
+        <source>None</source>
+        <translation>无</translation>
     </message>
     <message>
-        <source>Payment request file handling</source>
-        <translation>付款请求文件处理 </translation>
+        <source>N/A</source>
+        <translation>不可用</translation>
     </message>
     <message>
-        <source>Payment request file cannot be read! This can be caused by an invalid payment request file.</source>
-        <translation>付款请求文件无法读取！可能是付款请求文件不合格。</translation>
+        <source>%1 ms</source>
+        <translation>%1 毫秒</translation>
     </message>
+</context>
+<context>
+    <name>RPCConsole</name>
     <message>
-        <source>Payment request expired.</source>
-        <translation>支付请求已过期。</translation>
+        <source>Client name</source>
+        <translation>客户端名称</translation>
     </message>
     <message>
-        <source>Unverified payment requests to custom payment scripts are unsupported.</source>
-        <translation>不支持到自定义付款脚本的未验证付款请求。</translation>
-    </message>
-    <message>
-        <source>Invalid payment request.</source>
-        <translation>无效的支付请求。</translation>
-    </message>
-    <message>
-        <source>Refund from %1</source>
-        <translation>退款来自 %1</translation>
-    </message>
-    <message>
-        <source>Payment request %1 is too large (%2 bytes, allowed %3 bytes).</source>
-        <translation>支付请求 %1 太大 (%2 字节。只允许 %3 字节)。</translation>
-    </message>
-    <message>
-        <source>Error communicating with %1: %2</source>
-        <translation>%1: %2 通讯出错</translation>
-    </message>
-    <message>
-        <source>Payment request cannot be parsed!</source>
-        <translation>无法解析 付款请求！</translation>
-    </message>
-    <message>
-        <source>Bad response from server %1</source>
-        <translation>来自 %1 服务器的错误响应</translation>
-    </message>
-    <message>
-        <source>Payment acknowledged</source>
-        <translation>支付已到账</translation>
-    </message>
-    <message>
-        <source>Network request error</source>
-        <translation>网络请求出错</translation>
-    </message>
-</context>
-<context>
-    <name>PeerTableModel</name>
-    <message>
-        <source>User Agent</source>
-        <translation>用户代理</translation>
-    </message>
-    <message>
-        <source>Node/Service</source>
-        <translation>节点/服务</translation>
-    </message>
-    <message>
-        <source>Ping Time</source>
-        <translation>Ping 时间</translation>
-    </message>
-</context>
-<context>
-    <name>QObject</name>
-    <message>
-        <source>Amount</source>
-        <translation>金额</translation>
-    </message>
-    <message>
-        <source>Enter a Bitcoin address (e.g. %1)</source>
-        <translation>请输入一个比特币地址 (例如 %1)</translation>
-    </message>
-    <message>
-        <source>%1 d</source>
-        <translation>%1 天</translation>
-    </message>
-    <message>
-        <source>%1 h</source>
-        <translation>%1 小时</translation>
-    </message>
-    <message>
-        <source>%1 m</source>
-        <translation>%1 分钟</translation>
-    </message>
-    <message>
-        <source>%1 s</source>
-        <translation>%1 秒</translation>
-    </message>
-    <message>
-        <source>None</source>
-        <translation>无</translation>
-    </message>
-    <message>
-        <source>N/A</source>
-        <translation>不可用</translation>
-    </message>
-    <message>
-        <source>%1 ms</source>
-        <translation>%1 毫秒</translation>
-    </message>
-</context>
-<context>
-    <name>QRImageWidget</name>
-    <message>
-        <source>&amp;Save Image...</source>
-        <translation>保存图片(&amp;S)...</translation>
-    </message>
-    <message>
-        <source>&amp;Copy Image</source>
-        <translation>复制图片(&amp;C)</translation>
-    </message>
-    <message>
-        <source>Save QR Code</source>
-        <translation>保存二维码</translation>
-    </message>
-    <message>
-        <source>PNG Image (*.png)</source>
-        <translation>PNG图片(*.png)</translation>
-    </message>
-</context>
-<context>
-    <name>RPCConsole</name>
-    <message>
-        <source>Client name</source>
-        <translation>客户端名称</translation>
-    </message>
-    <message>
-        <source>N/A</source>
-        <translation>不可用</translation>
+        <source>N/A</source>
+        <translation>不可用</translation>
     </message>
     <message>
         <source>Client version</source>
@@ -1513,10 +993,6 @@
         <source>Memory usage</source>
         <translation>内存使用</translation>
     </message>
-    <message>
-        <source>Open the Bitcoin Core debug log file from the current data directory. This can take a few seconds for large log files.</source>
-        <translation>从当前的数据目录打开比特币核心调试日志文件。对于较大的日志文件，这可能需要几秒钟。</translation>
-    </message>
     <message>
         <source>Received</source>
         <translation>收到</translation>
@@ -1629,10 +1105,6 @@
         <source>Out:</source>
         <translation>输出：</translation>
     </message>
-    <message>
-        <source>Build date</source>
-        <translation>创建时间</translation>
-    </message>
     <message>
         <source>Debug log file</source>
         <translation>调试日志文件</translation>
@@ -1669,10 +1141,6 @@
         <source>&amp;Unban Node</source>
         <translation>(&amp;U)允许节点连接</translation>
     </message>
-    <message>
-        <source>Welcome to the Bitcoin Core RPC console.</source>
-        <translation>欢迎使用 比特币核心 RPC 控制台。</translation>
-    </message>
     <message>
         <source>Use up and down arrows to navigate history, and &lt;b&gt;Ctrl-L&lt;/b&gt; to clear screen.</source>
         <translation>使用上下方向键浏览历史,  &lt;b&gt;Ctrl-L&lt;/b&gt;清除屏幕。</translation>
@@ -1800,18 +1268,6 @@
         <source>Remove</source>
         <translation>移除</translation>
     </message>
-    <message>
-        <source>Copy label</source>
-        <translation>复制标签</translation>
-    </message>
-    <message>
-        <source>Copy message</source>
-        <translation>复制消息 </translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>复制金额</translation>
-    </message>
 </context>
 <context>
     <name>ReceiveRequestDialog</name>
@@ -1831,73 +1287,6 @@
         <source>&amp;Save Image...</source>
         <translation>保存图片(&amp;S)...</translation>
     </message>
-    <message>
-        <source>Request payment to %1</source>
-        <translation>请求付款到 %1</translation>
-    </message>
-    <message>
-        <source>Payment information</source>
-        <translation>付款信息</translation>
-    </message>
-    <message>
-        <source>URI</source>
-        <translation>URI</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>地址</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>金额</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>标签</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>消息</translation>
-    </message>
-    <message>
-        <source>Resulting URI too long, try to reduce the text for label / message.</source>
-        <translation>URI 太长，请试着精简标签或消息文本。</translation>
-    </message>
-    <message>
-        <source>Error encoding URI into QR Code.</source>
-        <translation>将 URI 转为二维码失败。</translation>
-    </message>
-</context>
-<context>
-    <name>RecentRequestsTableModel</name>
-    <message>
-        <source>Date</source>
-        <translation>日期</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>标签</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>消息</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>金额</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(没有标签)</translation>
-    </message>
-    <message>
-        <source>(no message)</source>
-        <translation>(无消息)</translation>
-    </message>
-    <message>
-        <source>(no amount)</source>
-        <translation>(无金额) </translation>
-    </message>
 </context>
 <context>
     <name>SendCoinsDialog</name>
@@ -1966,935 +1355,289 @@
         <translation>选择... </translation>
     </message>
     <message>
-        <source>collapse fee-settings</source>
-        <translation>收起  费用设置 </translation>
-    </message>
-    <message>
-        <source>per kilobyte</source>
-        <translation>每kb</translation>
-    </message>
-    <message>
-        <source>If the custom fee is set to 1000 satoshis and the transaction is only 250 bytes, then "per kilobyte" only pays 250 satoshis in fee, while "total at least" pays 1000 satoshis. For transactions bigger than a kilobyte both pay by kilobyte.</source>
-        <translation>如果自定义交易费设置为 1000聪而交易大小只有250字节，则“每千字节" 模式只支付250聪交易费， 而"最少"模式则支付1000聪。 大于1000字节的交易按每千字节付费。</translation>
-    </message>
-    <message>
-        <source>Hide</source>
-        <translation>隐藏</translation>
-    </message>
-    <message>
-        <source>total at least</source>
-        <translation>最小额 </translation>
-    </message>
-    <message>
-        <source>Paying only the minimum fee is just fine as long as there is less transaction volume than space in the blocks. But be aware that this can end up in a never confirming transaction once there is more demand for bitcoin transactions than the network can process.</source>
-        <translation>交易量小时只支付最小交易费是可以的。但是请注意，当交易量大到超出网络可处理时您的交易可能永远无法确认。</translation>
-    </message>
-    <message>
-        <source>(read the tooltip)</source>
-        <translation>(请注意提示信息)</translation>
-    </message>
-    <message>
-        <source>Recommended:</source>
-        <translation>推荐：</translation>
-    </message>
-    <message>
-        <source>Custom:</source>
-        <translation>自定义：</translation>
-    </message>
-    <message>
-        <source>(Smart fee not initialized yet. This usually takes a few blocks...)</source>
-        <translation>(智能交易费用 尚未初始化。 需要再下载一些数据块...)</translation>
-    </message>
-    <message>
-        <source>Confirmation time:</source>
-        <translation>确认时间：</translation>
-    </message>
-    <message>
-        <source>normal</source>
-        <translation>一般</translation>
-    </message>
-    <message>
-        <source>fast</source>
-        <translation>快速</translation>
-    </message>
-    <message>
-        <source>Send as zero-fee transaction if possible</source>
-        <translation>发送时尽可能 不支付交易费用</translation>
-    </message>
-    <message>
-        <source>(confirmation may take longer)</source>
-        <translation>(确认时间更长) </translation>
-    </message>
-    <message>
-        <source>Send to multiple recipients at once</source>
-        <translation>一次发送给多个接收者</translation>
-    </message>
-    <message>
-        <source>Add &amp;Recipient</source>
-        <translation>添加收款人(&amp;R)</translation>
-    </message>
-    <message>
-        <source>Clear all fields of the form.</source>
-        <translation>清除此表单的所有字段。</translation>
-    </message>
-    <message>
-        <source>Dust:</source>
-        <translation>小额：</translation>
-    </message>
-    <message>
-        <source>Clear &amp;All</source>
-        <translation>清除所有(&amp;A)</translation>
-    </message>
-    <message>
-        <source>Balance:</source>
-        <translation>余额：</translation>
-    </message>
-    <message>
-        <source>Confirm the send action</source>
-        <translation>确认发送货币</translation>
-    </message>
-    <message>
-        <source>S&amp;end</source>
-        <translation>发送(&amp;E)</translation>
-    </message>
-    <message>
-        <source>Confirm send coins</source>
-        <translation>确认发送货币</translation>
-    </message>
-    <message>
-        <source>%1 to %2</source>
-        <translation>%1 到 %2</translation>
-    </message>
-    <message>
-        <source>Copy quantity</source>
-        <translation>复制金额</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>复制金额</translation>
-    </message>
-    <message>
-        <source>Copy fee</source>
-        <translation>复制交易费</translation>
-    </message>
-    <message>
-        <source>Copy after fee</source>
-        <translation>复制含交易费的金额</translation>
-    </message>
-    <message>
-        <source>Copy bytes</source>
-        <translation>复制字节</translation>
-    </message>
-    <message>
-        <source>Copy priority</source>
-        <translation>复制优先级</translation>
-    </message>
-    <message>
-        <source>Copy change</source>
-        <translation>复制零钱</translation>
-    </message>
-    <message>
-        <source>Total Amount %1</source>
-        <translation>总金额 %1</translation>
-    </message>
-    <message>
-        <source>or</source>
-        <translation>或</translation>
-    </message>
-    <message>
-        <source>The amount to pay must be larger than 0.</source>
-        <translation>支付金额必须大于0。</translation>
-    </message>
-    <message>
-        <source>The amount exceeds your balance.</source>
-        <translation>金额超出您的账上余额。</translation>
-    </message>
-    <message>
-        <source>The total exceeds your balance when the %1 transaction fee is included.</source>
-        <translation>计入 %1 交易费后的金额超出您的账上余额。</translation>
-    </message>
-    <message>
-        <source>Transaction creation failed!</source>
-        <translation>交易创建失败！</translation>
-    </message>
-    <message>
-        <source>The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source>
-        <translation>错误：该交易被拒绝！发生这种错误的原因可能是：钱包中的比特币已经被用掉，有可能您复制了wallet.dat钱包文件，然后用复制的钱包文件支付了比特币，但是这个钱包文件中没有记录。</translation>
-    </message>
-    <message>
-        <source>A fee higher than %1 is considered an absurdly high fee.</source>
-        <translation>超过 %1 的交易费被认为是荒谬的高费率。</translation>
-    </message>
-    <message>
-        <source>Payment request expired.</source>
-        <translation>支付请求已过期。</translation>
-    </message>
-    <message>
-        <source>Pay only the required fee of %1</source>
-        <translation>只支付必要费用 %1</translation>
-    </message>
-    <message numerus="yes">
-        <source>Estimated to begin confirmation within %n block(s).</source>
-        <translation><numerusform>预计 %n 个数据块后被确认。</numerusform></translation>
-    </message>
-    <message>
-        <source>The recipient address is not valid. Please recheck.</source>
-        <translation>接收人地址无效。请重新检查。</translation>
-    </message>
-    <message>
-        <source>Duplicate address found: addresses should only be used once each.</source>
-        <translation>发现重复地址：每个地址应该只使用一次。</translation>
-    </message>
-    <message>
-        <source>Warning: Invalid Bitcoin address</source>
-        <translation>警告：无效的比特币地址</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(没有标签)</translation>
-    </message>
-    <message>
-        <source>Warning: Unknown change address</source>
-        <translation>警告：未知的更改地址</translation>
-    </message>
-    <message>
-        <source>Copy dust</source>
-        <translation>复制小额</translation>
-    </message>
-    <message>
-        <source>Are you sure you want to send?</source>
-        <translation>您确定要发出吗？</translation>
-    </message>
-    <message>
-        <source>added as transaction fee</source>
-        <translation>已添加交易费</translation>
-    </message>
-</context>
-<context>
-    <name>SendCoinsEntry</name>
-    <message>
-        <source>A&amp;mount:</source>
-        <translation>金额(&amp;M)</translation>
-    </message>
-    <message>
-        <source>Pay &amp;To:</source>
-        <translation>付给(&amp;T)：</translation>
-    </message>
-    <message>
-        <source>Enter a label for this address to add it to your address book</source>
-        <translation>为这个地址输入一个标签，以便将它添加到您的地址簿</translation>
-    </message>
-    <message>
-        <source>&amp;Label:</source>
-        <translation>标签(&amp;L)：</translation>
-    </message>
-    <message>
-        <source>Choose previously used address</source>
-        <translation>选择以前用过的地址</translation>
-    </message>
-    <message>
-        <source>This is a normal payment.</source>
-        <translation>这是笔正常的支付。</translation>
-    </message>
-    <message>
-        <source>The Bitcoin address to send the payment to</source>
-        <translation>付款目的地址</translation>
-    </message>
-    <message>
-        <source>Alt+A</source>
-        <translation>Alt+A</translation>
-    </message>
-    <message>
-        <source>Paste address from clipboard</source>
-        <translation>从剪贴板粘贴地址</translation>
-    </message>
-    <message>
-        <source>Alt+P</source>
-        <translation>Alt+P</translation>
-    </message>
-    <message>
-        <source>Remove this entry</source>
-        <translation>移除此项</translation>
-    </message>
-    <message>
-        <source>The fee will be deducted from the amount being sent. The recipient will receive less bitcoins than you enter in the amount field. If multiple recipients are selected, the fee is split equally.</source>
-        <translation>交易费将从发送总额中扣除。接收人将收到比您在金额框中输入的更少的比特币。如果选中了多个收件人，交易费平分。</translation>
-    </message>
-    <message>
-        <source>S&amp;ubtract fee from amount</source>
-        <translation>从金额中减去交易费(&amp;U)</translation>
-    </message>
-    <message>
-        <source>Message:</source>
-        <translation>消息：</translation>
-    </message>
-    <message>
-        <source>This is an unauthenticated payment request.</source>
-        <translation>这是一个未经验证的支付请求。</translation>
-    </message>
-    <message>
-        <source>This is an authenticated payment request.</source>
-        <translation>这是一个已经验证的支付请求。</translation>
-    </message>
-    <message>
-        <source>Enter a label for this address to add it to the list of used addresses</source>
-        <translation>请为此地址输入一个标签以将它加入用过的地址列表</translation>
-    </message>
-    <message>
-        <source>A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
-        <translation>bitcoin:URI 附带的备注信息，将会和交易一起存储，备查。 注意：该消息不会通过比特币网络传输。</translation>
-    </message>
-    <message>
-        <source>Pay To:</source>
-        <translation>支付给:</translation>
-    </message>
-    <message>
-        <source>Memo:</source>
-        <translation>便条：</translation>
-    </message>
-</context>
-<context>
-    <name>ShutdownWindow</name>
-    <message>
-        <source>Bitcoin Core is shutting down...</source>
-        <translation>比特币核心正在关机...</translation>
-    </message>
-    <message>
-        <source>Do not shut down the computer until this window disappears.</source>
-        <translation>在此窗口消失前不要关闭计算机。</translation>
-    </message>
-</context>
-<context>
-    <name>SignVerifyMessageDialog</name>
-    <message>
-        <source>Signatures - Sign / Verify a Message</source>
-        <translation>签名 - 为消息签名/验证签名消息</translation>
-    </message>
-    <message>
-        <source>&amp;Sign Message</source>
-        <translation>签名消息(&amp;S)</translation>
-    </message>
-    <message>
-        <source>You can sign messages/agreements with your addresses to prove you can receive bitcoins sent to them. Be careful not to sign anything vague or random, as phishing attacks may try to trick you into signing your identity over to them. Only sign fully-detailed statements you agree to.</source>
-        <translation>您可以用你的地址对消息/协议进行签名，以证明您可以接收发送到该地址的比特币。注意不要对任何模棱两可或者随机的消息进行签名，以免遭受钓鱼式攻击。请确保消息内容准确的表达了您的真实意愿。</translation>
-    </message>
-    <message>
-        <source>The Bitcoin address to sign the message with</source>
-        <translation>用来对消息签名的地址 </translation>
-    </message>
-    <message>
-        <source>Choose previously used address</source>
-        <translation>选择以前用过的地址</translation>
-    </message>
-    <message>
-        <source>Alt+A</source>
-        <translation>Alt+A</translation>
-    </message>
-    <message>
-        <source>Paste address from clipboard</source>
-        <translation>从剪贴板粘贴地址</translation>
-    </message>
-    <message>
-        <source>Alt+P</source>
-        <translation>Alt+P</translation>
-    </message>
-    <message>
-        <source>Enter the message you want to sign here</source>
-        <translation>请输入您要发送的签名消息</translation>
-    </message>
-    <message>
-        <source>Signature</source>
-        <translation>签名</translation>
-    </message>
-    <message>
-        <source>Copy the current signature to the system clipboard</source>
-        <translation>复制当前签名至剪切板</translation>
-    </message>
-    <message>
-        <source>Sign the message to prove you own this Bitcoin address</source>
-        <translation>签名消息，证明这个地址属于您。</translation>
-    </message>
-    <message>
-        <source>Sign &amp;Message</source>
-        <translation>消息签名(&amp;M)</translation>
-    </message>
-    <message>
-        <source>Reset all sign message fields</source>
-        <translation>清空所有签名消息栏</translation>
-    </message>
-    <message>
-        <source>Clear &amp;All</source>
-        <translation>清除所有(&amp;A)</translation>
-    </message>
-    <message>
-        <source>&amp;Verify Message</source>
-        <translation>验证消息(&amp;V)</translation>
-    </message>
-    <message>
-        <source>Enter the receiver's address, message (ensure you copy line breaks, spaces, tabs, etc. exactly) and signature below to verify the message. Be careful not to read more into the signature than what is in the signed message itself, to avoid being tricked by a man-in-the-middle attack. Note that this only proves the signing party receives with the address, it cannot prove sendership of any transaction!</source>
-        <translation>请在下面输入接收者地址、消息（确保换行符、空格符、制表符等完全相同）和签名以验证消息。请仔细核对签名信息，以提防中间人攻击。请注意，这只是证明接收方签名的地址，它不能证明任何交易！</translation>
-    </message>
-    <message>
-        <source>The Bitcoin address the message was signed with</source>
-        <translation>消息使用的签名地址</translation>
-    </message>
-    <message>
-        <source>Verify the message to ensure it was signed with the specified Bitcoin address</source>
-        <translation>验证消息，确保消息是由指定的比特币地址签名过的。</translation>
-    </message>
-    <message>
-        <source>Verify &amp;Message</source>
-        <translation>验证消息签名(&amp;M)</translation>
-    </message>
-    <message>
-        <source>Reset all verify message fields</source>
-        <translation>清空所有验证消息栏</translation>
-    </message>
-    <message>
-        <source>Click "Sign Message" to generate signature</source>
-        <translation>单击“签名消息“产生签名。</translation>
-    </message>
-    <message>
-        <source>The entered address is invalid.</source>
-        <translation>输入的地址非法。</translation>
-    </message>
-    <message>
-        <source>Please check the address and try again.</source>
-        <translation>请检查地址后重试。</translation>
-    </message>
-    <message>
-        <source>The entered address does not refer to a key.</source>
-        <translation>输入的地址没有关联的公私钥对。</translation>
-    </message>
-    <message>
-        <source>Wallet unlock was cancelled.</source>
-        <translation>钱包解锁动作取消。</translation>
-    </message>
-    <message>
-        <source>Private key for the entered address is not available.</source>
-        <translation>找不到输入地址关联的私钥。</translation>
-    </message>
-    <message>
-        <source>Message signing failed.</source>
-        <translation>消息签名失败。</translation>
-    </message>
-    <message>
-        <source>Message signed.</source>
-        <translation>消息已签名。</translation>
-    </message>
-    <message>
-        <source>The signature could not be decoded.</source>
-        <translation>签名无法解码。</translation>
-    </message>
-    <message>
-        <source>Please check the signature and try again.</source>
-        <translation>请检查签名后重试。</translation>
-    </message>
-    <message>
-        <source>The signature did not match the message digest.</source>
-        <translation>签名与消息摘要不匹配。</translation>
-    </message>
-    <message>
-        <source>Message verification failed.</source>
-        <translation>消息验证失败。</translation>
-    </message>
-    <message>
-        <source>Message verified.</source>
-        <translation>消息验证成功。</translation>
-    </message>
-</context>
-<context>
-    <name>SplashScreen</name>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>比特币核心</translation>
-    </message>
-    <message>
-        <source>The Bitcoin Core developers</source>
-        <translation>Bitcoin Core 的开发者</translation>
-    </message>
-    <message>
-        <source>[testnet]</source>
-        <translation>[测试网络]</translation>
-    </message>
-</context>
-<context>
-    <name>TrafficGraphWidget</name>
-    <message>
-        <source>KB/s</source>
-        <translation>KB/s</translation>
-    </message>
-</context>
-<context>
-    <name>TransactionDesc</name>
-    <message>
-        <source>Open until %1</source>
-        <translation>至 %1 个数据块时开启</translation>
-    </message>
-    <message>
-        <source>conflicted</source>
-        <translation>发现冲突</translation>
-    </message>
-    <message>
-        <source>%1/offline</source>
-        <translation>%1 / 离线</translation>
-    </message>
-    <message>
-        <source>%1/unconfirmed</source>
-        <translation>%1/未确认</translation>
-    </message>
-    <message>
-        <source>%1 confirmations</source>
-        <translation>%1 已确认</translation>
-    </message>
-    <message>
-        <source>Status</source>
-        <translation>状态</translation>
-    </message>
-    <message numerus="yes">
-        <source>, broadcast through %n node(s)</source>
-        <translation><numerusform>, 通过 %n 个节点广播 </numerusform></translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation>日期</translation>
-    </message>
-    <message>
-        <source>Source</source>
-        <translation>源</translation>
-    </message>
-    <message>
-        <source>Generated</source>
-        <translation>生成</translation>
-    </message>
-    <message>
-        <source>From</source>
-        <translation>来自</translation>
-    </message>
-    <message>
-        <source>To</source>
-        <translation>到</translation>
-    </message>
-    <message>
-        <source>own address</source>
-        <translation>自己的地址</translation>
-    </message>
-    <message>
-        <source>watch-only</source>
-        <translation>观察地址(watch-only) </translation>
-    </message>
-    <message>
-        <source>label</source>
-        <translation>标签</translation>
-    </message>
-    <message>
-        <source>Credit</source>
-        <translation>收入</translation>
-    </message>
-    <message numerus="yes">
-        <source>matures in %n more block(s)</source>
-        <translation><numerusform>%n 个数据块后成熟(mature) </numerusform></translation>
-    </message>
-    <message>
-        <source>not accepted</source>
-        <translation>未被接受</translation>
-    </message>
-    <message>
-        <source>Debit</source>
-        <translation>支出</translation>
-    </message>
-    <message>
-        <source>Total debit</source>
-        <translation>总收入</translation>
-    </message>
-    <message>
-        <source>Total credit</source>
-        <translation>总支出</translation>
-    </message>
-    <message>
-        <source>Transaction fee</source>
-        <translation>交易费</translation>
-    </message>
-    <message>
-        <source>Net amount</source>
-        <translation>净额</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>消息</translation>
-    </message>
-    <message>
-        <source>Comment</source>
-        <translation>备注</translation>
-    </message>
-    <message>
-        <source>Transaction ID</source>
-        <translation>ID</translation>
-    </message>
-    <message>
-        <source>Merchant</source>
-        <translation>商店</translation>
-    </message>
-    <message>
-        <source>Generated coins must mature %1 blocks before they can be spent. When you generated this block, it was broadcast to the network to be added to the block chain. If it fails to get into the chain, its state will change to "not accepted" and it won't be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source>
-        <translation>生成的比特币在可以使用前必须有 %1 个成熟的区块。当您生成了此区块后，它将被广播到网络中以加入区块链。如果它未成功进入区块链，其状态将变更为“不接受”并且不可使用。这可能偶尔会发生，如果另一个节点比你早几秒钟成功生成一个区块。</translation>
-    </message>
-    <message>
-        <source>Debug information</source>
-        <translation>调试信息</translation>
-    </message>
-    <message>
-        <source>Transaction</source>
-        <translation>交易</translation>
-    </message>
-    <message>
-        <source>Inputs</source>
-        <translation>输入</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>金额</translation>
-    </message>
-    <message>
-        <source>true</source>
-        <translation>正确</translation>
-    </message>
-    <message>
-        <source>false</source>
-        <translation>错误</translation>
-    </message>
-    <message>
-        <source>, has not been successfully broadcast yet</source>
-        <translation>，未被成功广播</translation>
-    </message>
-    <message numerus="yes">
-        <source>Open for %n more block(s)</source>
-        <translation><numerusform>再打开 %n 个数据块</numerusform></translation>
-    </message>
-    <message>
-        <source>unknown</source>
-        <translation>未知</translation>
-    </message>
-</context>
-<context>
-    <name>TransactionDescDialog</name>
-    <message>
-        <source>Transaction details</source>
-        <translation>交易细节</translation>
-    </message>
-    <message>
-        <source>This pane shows a detailed description of the transaction</source>
-        <translation>当前面板显示了交易的详细信息</translation>
+        <source>collapse fee-settings</source>
+        <translation>收起  费用设置 </translation>
     </message>
-</context>
-<context>
-    <name>TransactionTableModel</name>
     <message>
-        <source>Date</source>
-        <translation>日期</translation>
+        <source>per kilobyte</source>
+        <translation>每kb</translation>
     </message>
     <message>
-        <source>Type</source>
-        <translation>类别</translation>
+        <source>If the custom fee is set to 1000 satoshis and the transaction is only 250 bytes, then "per kilobyte" only pays 250 satoshis in fee, while "total at least" pays 1000 satoshis. For transactions bigger than a kilobyte both pay by kilobyte.</source>
+        <translation>如果自定义交易费设置为 1000聪而交易大小只有250字节，则“每千字节" 模式只支付250聪交易费， 而"最少"模式则支付1000聪。 大于1000字节的交易按每千字节付费。</translation>
     </message>
     <message>
-        <source>Immature (%1 confirmations, will be available after %2)</source>
-        <translation>未成熟 (%1 个确认，将在 %2 个后可用)</translation>
-    </message>
-    <message numerus="yes">
-        <source>Open for %n more block(s)</source>
-        <translation><numerusform>再打开 %n 个数据块</numerusform></translation>
+        <source>Hide</source>
+        <translation>隐藏</translation>
     </message>
     <message>
-        <source>Open until %1</source>
-        <translation>至 %1 个数据块时开启</translation>
+        <source>total at least</source>
+        <translation>最小额 </translation>
     </message>
     <message>
-        <source>Confirmed (%1 confirmations)</source>
-        <translation>已确认 (%1 条确认信息)</translation>
+        <source>Paying only the minimum fee is just fine as long as there is less transaction volume than space in the blocks. But be aware that this can end up in a never confirming transaction once there is more demand for bitcoin transactions than the network can process.</source>
+        <translation>交易量小时只支付最小交易费是可以的。但是请注意，当交易量大到超出网络可处理时您的交易可能永远无法确认。</translation>
     </message>
     <message>
-        <source>This block was not received by any other nodes and will probably not be accepted!</source>
-        <translation>此数据块未被任何其他节点接收，可能不被接受！</translation>
+        <source>(read the tooltip)</source>
+        <translation>(请注意提示信息)</translation>
     </message>
     <message>
-        <source>Generated but not accepted</source>
-        <translation>已生成但未被接受</translation>
+        <source>Recommended:</source>
+        <translation>推荐：</translation>
     </message>
     <message>
-        <source>Offline</source>
-        <translation>掉线</translation>
+        <source>Custom:</source>
+        <translation>自定义：</translation>
     </message>
     <message>
-        <source>Label</source>
-        <translation>标签</translation>
+        <source>(Smart fee not initialized yet. This usually takes a few blocks...)</source>
+        <translation>(智能交易费用 尚未初始化。 需要再下载一些数据块...)</translation>
     </message>
     <message>
-        <source>Unconfirmed</source>
-        <translation>未确认的 </translation>
+        <source>Confirmation time:</source>
+        <translation>确认时间：</translation>
     </message>
     <message>
-        <source>Confirming (%1 of %2 recommended confirmations)</source>
-        <translation>确认中 (推荐 %2个确认，已经有 %1个确认)</translation>
+        <source>normal</source>
+        <translation>一般</translation>
     </message>
     <message>
-        <source>Conflicted</source>
-        <translation>冲突的</translation>
+        <source>fast</source>
+        <translation>快速</translation>
     </message>
     <message>
-        <source>Received with</source>
-        <translation>接收于</translation>
+        <source>Send to multiple recipients at once</source>
+        <translation>一次发送给多个接收者</translation>
     </message>
     <message>
-        <source>Received from</source>
-        <translation>收款来自</translation>
+        <source>Add &amp;Recipient</source>
+        <translation>添加收款人(&amp;R)</translation>
     </message>
     <message>
-        <source>Sent to</source>
-        <translation>发送给</translation>
+        <source>Clear all fields of the form.</source>
+        <translation>清除此表单的所有字段。</translation>
     </message>
     <message>
-        <source>Payment to yourself</source>
-        <translation>付款给自己</translation>
+        <source>Dust:</source>
+        <translation>小额：</translation>
     </message>
     <message>
-        <source>Mined</source>
-        <translation>挖矿所得</translation>
+        <source>Clear &amp;All</source>
+        <translation>清除所有(&amp;A)</translation>
     </message>
     <message>
-        <source>watch-only</source>
-        <translation>观察地址(watch-only) </translation>
+        <source>Balance:</source>
+        <translation>余额：</translation>
     </message>
     <message>
-        <source>(n/a)</source>
-        <translation>（不可用）</translation>
+        <source>Confirm the send action</source>
+        <translation>确认发送货币</translation>
     </message>
     <message>
-        <source>Transaction status. Hover over this field to show number of confirmations.</source>
-        <translation>交易状态。 鼠标移到此区域可显示确认项数量。</translation>
+        <source>S&amp;end</source>
+        <translation>发送(&amp;E)</translation>
     </message>
+</context>
+<context>
+    <name>SendCoinsEntry</name>
     <message>
-        <source>Date and time that the transaction was received.</source>
-        <translation>接收到交易的时间</translation>
+        <source>A&amp;mount:</source>
+        <translation>金额(&amp;M)</translation>
     </message>
     <message>
-        <source>Type of transaction.</source>
-        <translation>交易类别。</translation>
+        <source>Pay &amp;To:</source>
+        <translation>付给(&amp;T)：</translation>
     </message>
     <message>
-        <source>Whether or not a watch-only address is involved in this transaction.</source>
-        <translation>该交易中是否涉及  观察地址(watch-only address)。</translation>
+        <source>&amp;Label:</source>
+        <translation>标签(&amp;L)：</translation>
     </message>
     <message>
-        <source>User-defined intent/purpose of the transaction.</source>
-        <translation>用户定义的该交易的意图/目的。</translation>
+        <source>Choose previously used address</source>
+        <translation>选择以前用过的地址</translation>
     </message>
     <message>
-        <source>Amount removed from or added to balance.</source>
-        <translation>从余额添加或移除的金额。</translation>
+        <source>This is a normal payment.</source>
+        <translation>这是笔正常的支付。</translation>
     </message>
-</context>
-<context>
-    <name>TransactionView</name>
     <message>
-        <source>All</source>
-        <translation>全部</translation>
+        <source>The Bitcoin address to send the payment to</source>
+        <translation>付款目的地址</translation>
     </message>
     <message>
-        <source>Today</source>
-        <translation>今天</translation>
+        <source>Alt+A</source>
+        <translation>Alt+A</translation>
     </message>
     <message>
-        <source>This week</source>
-        <translation>本周</translation>
+        <source>Paste address from clipboard</source>
+        <translation>从剪贴板粘贴地址</translation>
     </message>
     <message>
-        <source>This month</source>
-        <translation>本月</translation>
+        <source>Alt+P</source>
+        <translation>Alt+P</translation>
     </message>
     <message>
-        <source>Last month</source>
-        <translation>上月</translation>
+        <source>Remove this entry</source>
+        <translation>移除此项</translation>
     </message>
     <message>
-        <source>This year</source>
-        <translation>今年</translation>
+        <source>The fee will be deducted from the amount being sent. The recipient will receive less bitcoins than you enter in the amount field. If multiple recipients are selected, the fee is split equally.</source>
+        <translation>交易费将从发送总额中扣除。接收人将收到比您在金额框中输入的更少的比特币。如果选中了多个收件人，交易费平分。</translation>
     </message>
     <message>
-        <source>Range...</source>
-        <translation>范围...</translation>
+        <source>S&amp;ubtract fee from amount</source>
+        <translation>从金额中减去交易费(&amp;U)</translation>
     </message>
     <message>
-        <source>Received with</source>
-        <translation>接收于</translation>
+        <source>Message:</source>
+        <translation>消息：</translation>
     </message>
     <message>
-        <source>Sent to</source>
-        <translation>发送给</translation>
+        <source>This is an unauthenticated payment request.</source>
+        <translation>这是一个未经验证的支付请求。</translation>
     </message>
     <message>
-        <source>To yourself</source>
-        <translation>到自己</translation>
+        <source>This is an authenticated payment request.</source>
+        <translation>这是一个已经验证的支付请求。</translation>
     </message>
     <message>
-        <source>Mined</source>
-        <translation>挖矿所得</translation>
+        <source>Enter a label for this address to add it to the list of used addresses</source>
+        <translation>请为此地址输入一个标签以将它加入用过的地址列表</translation>
     </message>
     <message>
-        <source>Other</source>
-        <translation>其他</translation>
+        <source>A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
+        <translation>bitcoin:URI 附带的备注信息，将会和交易一起存储，备查。 注意：该消息不会通过比特币网络传输。</translation>
     </message>
     <message>
-        <source>Enter address or label to search</source>
-        <translation>输入地址或标签进行搜索</translation>
+        <source>Pay To:</source>
+        <translation>支付给:</translation>
     </message>
     <message>
-        <source>Min amount</source>
-        <translation>最小金额</translation>
+        <source>Memo:</source>
+        <translation>便条：</translation>
     </message>
+</context>
+<context>
+    <name>ShutdownWindow</name>
     <message>
-        <source>Copy address</source>
-        <translation>复制地址</translation>
+        <source>Do not shut down the computer until this window disappears.</source>
+        <translation>在此窗口消失前不要关闭计算机。</translation>
     </message>
+</context>
+<context>
+    <name>SignVerifyMessageDialog</name>
     <message>
-        <source>Copy label</source>
-        <translation>复制标签</translation>
+        <source>Signatures - Sign / Verify a Message</source>
+        <translation>签名 - 为消息签名/验证签名消息</translation>
     </message>
     <message>
-        <source>Copy amount</source>
-        <translation>复制金额</translation>
+        <source>&amp;Sign Message</source>
+        <translation>签名消息(&amp;S)</translation>
     </message>
     <message>
-        <source>Copy transaction ID</source>
-        <translation>复制交易编号</translation>
+        <source>You can sign messages/agreements with your addresses to prove you can receive bitcoins sent to them. Be careful not to sign anything vague or random, as phishing attacks may try to trick you into signing your identity over to them. Only sign fully-detailed statements you agree to.</source>
+        <translation>您可以用你的地址对消息/协议进行签名，以证明您可以接收发送到该地址的比特币。注意不要对任何模棱两可或者随机的消息进行签名，以免遭受钓鱼式攻击。请确保消息内容准确的表达了您的真实意愿。</translation>
     </message>
     <message>
-        <source>Copy raw transaction</source>
-        <translation>复制原始交易</translation>
+        <source>The Bitcoin address to sign the message with</source>
+        <translation>用来对消息签名的地址 </translation>
     </message>
     <message>
-        <source>Edit label</source>
-        <translation>编辑标签</translation>
+        <source>Choose previously used address</source>
+        <translation>选择以前用过的地址</translation>
     </message>
     <message>
-        <source>Show transaction details</source>
-        <translation>显示交易详情</translation>
+        <source>Alt+A</source>
+        <translation>Alt+A</translation>
     </message>
     <message>
-        <source>Export Transaction History</source>
-        <translation>导出交易历史</translation>
+        <source>Paste address from clipboard</source>
+        <translation>从剪贴板粘贴地址</translation>
     </message>
     <message>
-        <source>Watch-only</source>
-        <translation>观察地址(Watch-only) </translation>
+        <source>Alt+P</source>
+        <translation>Alt+P</translation>
     </message>
     <message>
-        <source>Exporting Failed</source>
-        <translation>导出失败</translation>
+        <source>Enter the message you want to sign here</source>
+        <translation>请输入您要发送的签名消息</translation>
     </message>
     <message>
-        <source>There was an error trying to save the transaction history to %1.</source>
-        <translation>导出交易历史到 %1 时发生错误。</translation>
+        <source>Signature</source>
+        <translation>签名</translation>
     </message>
     <message>
-        <source>Exporting Successful</source>
-        <translation>导出成功</translation>
+        <source>Copy the current signature to the system clipboard</source>
+        <translation>复制当前签名至剪切板</translation>
     </message>
     <message>
-        <source>The transaction history was successfully saved to %1.</source>
-        <translation>交易历史已成功保存到 %1。</translation>
+        <source>Sign the message to prove you own this Bitcoin address</source>
+        <translation>签名消息，证明这个地址属于您。</translation>
     </message>
     <message>
-        <source>Comma separated file (*.csv)</source>
-        <translation>逗号分隔文件 (*.csv)</translation>
+        <source>Sign &amp;Message</source>
+        <translation>消息签名(&amp;M)</translation>
     </message>
     <message>
-        <source>Confirmed</source>
-        <translation>已确认</translation>
+        <source>Reset all sign message fields</source>
+        <translation>清空所有签名消息栏</translation>
     </message>
     <message>
-        <source>Date</source>
-        <translation>日期</translation>
+        <source>Clear &amp;All</source>
+        <translation>清除所有(&amp;A)</translation>
     </message>
     <message>
-        <source>Type</source>
-        <translation>类别</translation>
+        <source>&amp;Verify Message</source>
+        <translation>验证消息(&amp;V)</translation>
     </message>
     <message>
-        <source>Label</source>
-        <translation>标签</translation>
+        <source>Enter the receiver's address, message (ensure you copy line breaks, spaces, tabs, etc. exactly) and signature below to verify the message. Be careful not to read more into the signature than what is in the signed message itself, to avoid being tricked by a man-in-the-middle attack. Note that this only proves the signing party receives with the address, it cannot prove sendership of any transaction!</source>
+        <translation>请在下面输入接收者地址、消息（确保换行符、空格符、制表符等完全相同）和签名以验证消息。请仔细核对签名信息，以提防中间人攻击。请注意，这只是证明接收方签名的地址，它不能证明任何交易！</translation>
     </message>
     <message>
-        <source>Address</source>
-        <translation>地址</translation>
+        <source>The Bitcoin address the message was signed with</source>
+        <translation>消息使用的签名地址</translation>
     </message>
     <message>
-        <source>ID</source>
-        <translation>ID</translation>
+        <source>Verify the message to ensure it was signed with the specified Bitcoin address</source>
+        <translation>验证消息，确保消息是由指定的比特币地址签名过的。</translation>
     </message>
     <message>
-        <source>Range:</source>
-        <translation>范围：</translation>
+        <source>Verify &amp;Message</source>
+        <translation>验证消息签名(&amp;M)</translation>
     </message>
     <message>
-        <source>to</source>
-        <translation>到</translation>
+        <source>Reset all verify message fields</source>
+        <translation>清空所有验证消息栏</translation>
     </message>
 </context>
 <context>
-    <name>UnitDisplayStatusBarControl</name>
+    <name>SplashScreen</name>
     <message>
-        <source>Unit to show amounts in. Click to select another unit.</source>
-        <translation>金额单位。单击选择别的单位。</translation>
+        <source>[testnet]</source>
+        <translation>[测试网络]</translation>
     </message>
 </context>
 <context>
-    <name>WalletFrame</name>
+    <name>TrafficGraphWidget</name>
     <message>
-        <source>No wallet has been loaded.</source>
-        <translation>没有载入钱包。</translation>
+        <source>KB/s</source>
+        <translation>KB/s</translation>
     </message>
 </context>
 <context>
-    <name>WalletModel</name>
+    <name>TransactionDescDialog</name>
     <message>
-        <source>Send Coins</source>
-        <translation>发送比特币</translation>
+        <source>This pane shows a detailed description of the transaction</source>
+        <translation>当前面板显示了交易的详细信息</translation>
     </message>
 </context>
 <context>
-    <name>WalletView</name>
-    <message>
-        <source>&amp;Export</source>
-        <translation>导出(&amp;E)</translation>
-    </message>
-    <message>
-        <source>Export the data in the current tab to a file</source>
-        <translation>导出当前数据到文件</translation>
-    </message>
-    <message>
-        <source>Backup Wallet</source>
-        <translation>备份钱包</translation>
-    </message>
-    <message>
-        <source>Wallet Data (*.dat)</source>
-        <translation>钱包文件(*.dat)</translation>
-    </message>
-    <message>
-        <source>Backup Failed</source>
-        <translation>备份失败</translation>
-    </message>
-    <message>
-        <source>There was an error trying to save the wallet data to %1.</source>
-        <translation>尝试保存钱包数据至 %1 时发生错误。</translation>
-    </message>
-    <message>
-        <source>The wallet data was successfully saved to %1.</source>
-        <translation>钱包数据成功保存至 %1 。</translation>
-    </message>
+    <name>UnitDisplayStatusBarControl</name>
     <message>
-        <source>Backup Successful</source>
-        <translation>备份成功</translation>
+        <source>Unit to show amounts in. Click to select another unit.</source>
+        <translation>金额单位。单击选择别的单位。</translation>
     </message>
 </context>
 <context>
@@ -2926,14 +1669,6 @@
         <source>If &lt;category&gt; is not supplied or if &lt;category&gt; = 1, output all debugging information.</source>
         <translation>如果&lt;category&gt;未提供或&lt;category&gt; = 1，输出所有调试信息。</translation>
     </message>
-    <message>
-        <source>Maximum total fees (in %s) to use in a single wallet transaction; setting this too low may abort large transactions (default: %s)</source>
-        <translation>最大单次转账费用（%s），设置太低可能导致大宗交易失败（默认：%s）</translation>
-    </message>
-    <message>
-        <source>Please check that your computer's date and time are correct! If your clock is wrong Bitcoin Core will not work properly.</source>
-        <translation>警请检查电脑的日期时间设置是否正确！时间错误可能会导致比特币客户端运行异常。</translation>
-    </message>
     <message>
         <source>Prune configured below the minimum of %d MiB.  Please use a higher number.</source>
         <translation>修剪值被设置为低于最小值%d MiB，请使用更大的数值。</translation>
@@ -2976,6 +1711,10 @@
         <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
         <translation>接受来自外部的连接 (缺省: 如果不带 -proxy or -connect 参数设置为1)</translation>
     </message>
+    <message>
+        <source>Bitcoin Core</source>
+        <translation>比特币核心</translation>
+    </message>
     <message>
         <source>-fallbackfee is set very high! This is the transaction fee you may pay when fee estimates are not available.</source>
         <translation>-fallbackfree 交易费设置得很高！这是在费用估计不可用时你可能会支付的交易费。</translation>
@@ -3020,14 +1759,6 @@
         <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
         <translation>这是测试用的预发布版本 - 请谨慎使用 - 不要用来挖矿，或者在正式商用环境下使用</translation>
     </message>
-    <message>
-        <source>Unable to bind to %s on this computer. Bitcoin Core is probably already running.</source>
-        <translation>无法 %s的绑定到电脑上，比特币核心钱包可能已经在运行。</translation>
-    </message>
-    <message>
-        <source>Unsupported argument -whitelistalwaysrelay ignored, use -whitelistrelay and/or -whitelistforcerelay.</source>
-        <translation>一个不被支持的参数 -whitelistalwaysrelay 被忽略了。请使用 -whitelistrelay 或者 -whitelistforcerelay.</translation>
-    </message>
     <message>
         <source>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</source>
         <translation>使用UPnP暴露本机监听端口（默认：1 当正在监听且不使用代理）</translation>
@@ -3044,18 +1775,10 @@
         <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source>
         <translation>警告：网络似乎并不完全同意！有些矿工似乎遇到了问题。</translation>
     </message>
-    <message>
-        <source>Warning: Unknown block versions being mined! It's possible unknown rules are in effect</source>
-        <translation>警告: 未知的区块版本被挖掘！未知规则可能已生效</translation>
-    </message>
     <message>
         <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source>
         <translation>警告：我们的同行似乎不完全同意！您可能需要升级，或者其他节点可能需要升级。</translation>
     </message>
-    <message>
-        <source>Warning: wallet.dat corrupt, data salvaged! Original wallet.dat saved as wallet.{timestamp}.bak in %s; if your balance or transactions are incorrect you should restore from a backup.</source>
-        <translation>警告：钱包文件wallet.dat损坏! 原始的钱包文件已经备份到%s目录下并重命名为{timestamp}.bak 。如果您的账户余额或者交易记录不正确，请使用您的钱包备份文件恢复。</translation>
-    </message>
     <message>
         <source>Whitelist peers connecting from the given netmask or IP address. Can be specified multiple times.</source>
         <translation>节点白名单,网络掩码或IP址。可多次指定。</translation>
@@ -3240,10 +1963,6 @@
         <source>Wallet options:</source>
         <translation>钱包选项:</translation>
     </message>
-    <message>
-        <source>You need to rebuild the database using -reindex to change -txindex</source>
-        <translation>您需要将 -reindex 改为 -txindex 以重建数据库</translation>
-    </message>
     <message>
         <source>Allow JSON-RPC connections from specified source. Valid for &lt;ip&gt; are a single IP (e.g. 1.2.3.4), a network/netmask (e.g. 1.2.3.4/255.255.255.0) or a network/CIDR (e.g. 1.2.3.4/24). This option can be specified multiple times</source>
         <translation>允许来自指定地址的 JSON-RPC 连接。 &lt;ip&gt;为单一IP (如: 1.2.3.4), 网络/掩码 (如: 1.2.3.4/255.255.255.0), 网络/CIDR (如:  1.2.3.4/24)。该选项可多次指定。</translation>
@@ -3256,10 +1975,6 @@
         <source>Bind to given address to listen for JSON-RPC connections. Use [host]:port notation for IPv6. This option can be specified multiple times (default: bind to all interfaces)</source>
         <translation>绑定到指定地址监听 JSON-RPC连接。 IPv6使用[主机]:端口 格式。该选项可多次指定 (默认: 绑定到所有接口) </translation>
     </message>
-    <message>
-        <source>Cannot obtain a lock on data directory %s. Bitcoin Core is probably already running.</source>
-        <translation>无法获取数据目录的 %s. 比特币核心钱包可能已经在运行.</translation>
-    </message>
     <message>
         <source>Create new files with system default permissions, instead of umask 077 (only effective with disabled wallet functionality)</source>
         <translation>创建系统默认权限的文件，而不是 umask 077 (只在关闭钱包功能时有效) </translation>
@@ -3304,10 +2019,6 @@
         <source>Set maximum size of high-priority/low-fee transactions in bytes (default: %d)</source>
         <translation>设置 高优先级/低交易费 交易的最大字节  (缺省: %d)</translation>
     </message>
-    <message>
-        <source>Set the number of threads for coin generation if enabled (-1 = all cores, default: %d)</source>
-        <translation>设置比特币生成线程数 ( -1=所有核, 默认: %d) </translation>
-    </message>
     <message>
         <source>The transaction amount is too small to send after the fee has been deducted</source>
         <translation>在交易费被扣除后发送的交易金额太小</translation>
@@ -3332,34 +2043,14 @@
         <source>Accept public REST requests (default: %u)</source>
         <translation>接受公共 REST 请求 (默认: %u)</translation>
     </message>
-    <message>
-        <source>Activating best chain...</source>
-        <translation>正在激活最佳数据链...</translation>
-    </message>
-    <message>
-        <source>Attempt to recover private keys from a corrupt wallet.dat on startup</source>
-        <translation>尝试从启动页上的损坏钱包文件中恢复私钥</translation>
-    </message>
     <message>
         <source>Automatically create Tor hidden service (default: %d)</source>
         <translation>自动建立Tor隐藏服务 (默认:%d)</translation>
     </message>
-    <message>
-        <source>Cannot resolve -whitebind address: '%s'</source>
-        <translation>无法解析 -whitebind 地址: '%s'</translation>
-    </message>
     <message>
         <source>Connect through SOCKS5 proxy</source>
         <translation>通过 SOCKS5 代理连接</translation>
     </message>
-    <message>
-        <source>Copyright (C) 2009-%i The Bitcoin Core Developers</source>
-        <translation>版权所有 (C) 2009-%i Bitcoin Core 开发者</translation>
-    </message>
-    <message>
-        <source>Error loading wallet.dat: Wallet requires newer version of Bitcoin Core</source>
-        <translation>加载wallet.dat错误：需要新版的比特币核心钱包</translation>
-    </message>
     <message>
         <source>Error reading from database, shutting down.</source>
         <translation>读取数据库出错，关闭中。</translation>
@@ -3368,22 +2059,6 @@
         <source>Information</source>
         <translation>信息</translation>
     </message>
-    <message>
-        <source>Initialization sanity check failed. Bitcoin Core is shutting down.</source>
-        <translation>初始化完整性检查失败。Bitcoin Core 即将关闭。</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -maxtxfee=&lt;amount&gt;: '%s'</source>
-        <translation>-maxtxfee=&lt;amount&gt;: '%s' 的金额无效</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -minrelaytxfee=&lt;amount&gt;: '%s'</source>
-        <translation>-minrelaytxfee=&lt;amount&gt;: '%s' 无效的金额</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -mintxfee=&lt;amount&gt;: '%s'</source>
-        <translation>-mintxfee=&lt;amount&gt;: '%s' 无效的金额</translation>
-    </message>
     <message>
         <source>Invalid amount for -paytxfee=&lt;amount&gt;: '%s' (must be at least %s)</source>
         <translation>无效的金额 -paytxfee=&lt;amount&gt;: '%s' (必须至少为 %s)</translation>
@@ -3408,14 +2083,6 @@
         <source>RPC server options:</source>
         <translation>RPC 服务器选项：</translation>
     </message>
-    <message>
-        <source>Rebuild block chain index from current blk000??.dat files on startup</source>
-        <translation>启动时重新为当前的 blk000??.dat 文件建立索引</translation>
-    </message>
-    <message>
-        <source>Receive and display P2P network alerts (default: %u)</source>
-        <translation>收到并且显示P2P网络的告警(默认:%u)</translation>
-    </message>
     <message>
         <source>Rescan the block chain for missing wallet transactions on startup</source>
         <translation>重新扫描区块链以查找遗漏的钱包交易</translation>
@@ -3476,10 +2143,6 @@
         <source>Username for JSON-RPC connections</source>
         <translation>JSON-RPC 连接用户名</translation>
     </message>
-    <message>
-        <source>Wallet needed to be rewritten: restart Bitcoin Core to complete</source>
-        <translation>钱包需要被改写：重新启动核心钱包来完成</translation>
-    </message>
     <message>
         <source>Warning</source>
         <translation>警告</translation>
@@ -3496,10 +2159,6 @@
         <source>ZeroMQ notification options:</source>
         <translation>ZeroMQ 通知选项：</translation>
     </message>
-    <message>
-        <source>wallet.dat corrupt, salvage failed</source>
-        <translation>钱包文件wallet.dat损坏，抢救备份失败</translation>
-    </message>
     <message>
         <source>Password for JSON-RPC connections</source>
         <translation>JSON-RPC 连接密码
@@ -3509,11 +2168,6 @@
         <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
         <translation>当最佳数据块变化时执行命令 (命令行中的 %s 会被替换成数据块哈希值)</translation>
     </message>
-    <message>
-        <source>This help message</source>
-        <translation>本帮助信息
-</translation>
-    </message>
     <message>
         <source>Allow DNS lookups for -addnode, -seednode and -connect</source>
         <translation>使用 -addnode, -seednode 和 -connect 选项时允许查询DNS</translation>
@@ -3522,10 +2176,6 @@
         <source>Loading addresses...</source>
         <translation>正在加载地址簿...</translation>
     </message>
-    <message>
-        <source>Error loading wallet.dat: Wallet corrupted</source>
-        <translation>wallet.dat 钱包文件加载出错：钱包损坏</translation>
-    </message>
     <message>
         <source>(1 = keep tx meta data e.g. account owner and payment request information, 2 = drop tx meta data)</source>
         <translation>(1 = 保留 tx meta data , 如 account owner 和 payment request information, 2 = 不保留 tx meta data) </translation>
@@ -3550,10 +2200,18 @@
         <source>Tries to keep outbound traffic under the given target (in MiB per 24h), 0 = no limit (default: %d)</source>
         <translation>尝试保持上传带宽低于（MiB/24h），0=无限制（默认：%d）</translation>
     </message>
+    <message>
+        <source>Unsupported argument -whitelistalwaysrelay ignored, use -whitelistrelay and/or -whitelistforcerelay.</source>
+        <translation>一个不被支持的参数 -whitelistalwaysrelay 被忽略了。请使用 -whitelistrelay 或者 -whitelistforcerelay.</translation>
+    </message>
     <message>
         <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: %s)</source>
         <translation>通过Tor隐藏服务连接节点时 使用不同的SOCKS5代理 (默认: %s)</translation>
     </message>
+    <message>
+        <source>Warning: Unknown block versions being mined! It's possible unknown rules are in effect</source>
+        <translation>警告: 未知的区块版本被挖掘！未知规则可能已生效</translation>
+    </message>
     <message>
         <source>(default: %s)</source>
         <translation>(默认: %s) </translation>
@@ -3562,14 +2220,6 @@
         <source>Always query for peer addresses via DNS lookup (default: %u)</source>
         <translation>始终通过 DNS 查询节点地址 (默认: %u)</translation>
     </message>
-    <message>
-        <source>Error loading wallet.dat</source>
-        <translation>wallet.dat 钱包文件加载出错</translation>
-    </message>
-    <message>
-        <source>Generate coins (default: %u)</source>
-        <translation>生成比特币 (默认: %u)</translation>
-    </message>
     <message>
         <source>How many blocks to check at startup (default: %u, 0 = all)</source>
         <translation>启动时检测多少个数据块(默认: %u, 0=所有)</translation>
@@ -3654,18 +2304,6 @@
         <source>Unknown network specified in -onlynet: '%s'</source>
         <translation>-onlynet 指定的是未知网络：%s</translation>
     </message>
-    <message>
-        <source>Cannot resolve -bind address: '%s'</source>
-        <translation>无法解析 -bind 端口地址: '%s'</translation>
-    </message>
-    <message>
-        <source>Cannot resolve -externalip address: '%s'</source>
-        <translation>无法解析 -externalip 地址: '%s'</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -paytxfee=&lt;amount&gt;: '%s'</source>
-        <translation>非法金额 -paytxfee=&lt;amount&gt;: '%s'</translation>
-    </message>
     <message>
         <source>Insufficient funds</source>
         <translation>金额不足</translation>
diff --git a/src/qt/locale/bitcoin_zh_HK.ts b/src/qt/locale/bitcoin_zh_HK.ts
index 740a86e117024..aa014db0bd03e 100644
--- a/src/qt/locale/bitcoin_zh_HK.ts
+++ b/src/qt/locale/bitcoin_zh_HK.ts
@@ -25,10 +25,6 @@
         <source>C&amp;lose</source>
         <translation>關閉 &amp;l</translation>
     </message>
-    <message>
-        <source>&amp;Copy Address</source>
-        <translation>複製位址 &amp;C</translation>
-    </message>
     <message>
         <source>Delete the currently selected address from the list</source>
         <translation>把目前選擇的位址從列表中刪除</translation>
@@ -45,73 +41,6 @@
         <source>&amp;Delete</source>
         <translation>刪除 &amp;D</translation>
     </message>
-    <message>
-        <source>Choose the address to send coins to</source>
-        <translation>選擇要付錢過去的位址</translation>
-    </message>
-    <message>
-        <source>Choose the address to receive coins with</source>
-        <translation>選擇要收錢的位址</translation>
-    </message>
-    <message>
-        <source>C&amp;hoose</source>
-        <translation>選取 &amp;h</translation>
-    </message>
-    <message>
-        <source>Sending addresses</source>
-        <translation>付款位址</translation>
-    </message>
-    <message>
-        <source>Receiving addresses</source>
-        <translation>收款位址</translation>
-    </message>
-    <message>
-        <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source>
-        <translation>這些是你要付款過去的 Bitcoin 位址。在付款之前，務必要檢查金額和收款位址是否正確。</translation>
-    </message>
-    <message>
-        <source>These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source>
-        <translation>這些是你用來收款的 Bitcoin 位址。建議在每次交易時，都使用一個新的收款位址。</translation>
-    </message>
-    <message>
-        <source>Copy &amp;Label</source>
-        <translation>複製標記 &amp;L</translation>
-    </message>
-    <message>
-        <source>&amp;Edit</source>
-        <translation>編輯 &amp;E</translation>
-    </message>
-    <message>
-        <source>Export Address List</source>
-        <translation>匯出位址清單</translation>
-    </message>
-    <message>
-        <source>Comma separated file (*.csv)</source>
-        <translation>逗號分隔檔(*.csv)</translation>
-    </message>
-    <message>
-        <source>Exporting Failed</source>
-        <translation>匯出失敗</translation>
-    </message>
-    <message>
-        <source>There was an error trying to save the address list to %1. Please try again.</source>
-        <translation>儲存位址列表到 %1 時發生錯誤。請再試一次。</translation>
-    </message>
-</context>
-<context>
-    <name>AddressTableModel</name>
-    <message>
-        <source>Label</source>
-        <translation>標記</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>位址</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(無標記)</translation>
-    </message>
 </context>
 <context>
     <name>AskPassphraseDialog</name>
@@ -131,94 +60,6 @@
         <source>Repeat new passphrase</source>
         <translation>重複新密碼</translation>
     </message>
-    <message>
-        <source>Encrypt wallet</source>
-        <translation>加密錢包</translation>
-    </message>
-    <message>
-        <source>This operation needs your wallet passphrase to unlock the wallet.</source>
-        <translation>這個動作需要你的錢包密碼來將錢包解鎖。</translation>
-    </message>
-    <message>
-        <source>Unlock wallet</source>
-        <translation>解鎖錢包</translation>
-    </message>
-    <message>
-        <source>This operation needs your wallet passphrase to decrypt the wallet.</source>
-        <translation>這個動作需要你的錢包密碼來將錢包解密。</translation>
-    </message>
-    <message>
-        <source>Decrypt wallet</source>
-        <translation>解密錢包</translation>
-    </message>
-    <message>
-        <source>Change passphrase</source>
-        <translation>改變密碼</translation>
-    </message>
-    <message>
-        <source>Confirm wallet encryption</source>
-        <translation>確認錢包加密</translation>
-    </message>
-    <message>
-        <source>Warning: If you encrypt your wallet and lose your passphrase, you will &lt;b&gt;LOSE ALL OF YOUR BITCOINS&lt;/b&gt;!</source>
-        <translation>警告: 如果把錢包加密後又忘記密碼，你就會&lt;b&gt;失去所有 Bitcoin 了&lt;/b&gt;！</translation>
-    </message>
-    <message>
-        <source>Are you sure you wish to encrypt your wallet?</source>
-        <translation>你確定要把錢包加密嗎？</translation>
-    </message>
-    <message>
-        <source>Bitcoin Core will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source>
-        <translation>Bitcoin Core 現在要關閉以完成加密程序。請記得將錢包加密不能完全防止你的 Bitcoin 經被入侵電腦的惡意程式偷取。</translation>
-    </message>
-    <message>
-        <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source>
-        <translation>重要: 請改用新產生的加密錢包檔，來取代所以舊錢包檔的備份。為安全計，當你開始使用新的加密錢包檔後，舊錢包檔的備份就不能再使用了。</translation>
-    </message>
-    <message>
-        <source>Warning: The Caps Lock key is on!</source>
-        <translation>警告: Caps Lock 已啟用！</translation>
-    </message>
-    <message>
-        <source>Wallet encrypted</source>
-        <translation>錢包已加密</translation>
-    </message>
-    <message>
-        <source>Enter the new passphrase to the wallet.&lt;br/&gt;Please use a passphrase of &lt;b&gt;ten or more random characters&lt;/b&gt;, or &lt;b&gt;eight or more words&lt;/b&gt;.</source>
-        <translation>輸入錢包的新密碼。&lt;br/&gt;密碼請用&lt;b&gt;10 個或以上的隨機字元&lt;/b&gt;，或是&lt;b&gt;8 個或以上的字詞&lt;/b&gt;。</translation>
-    </message>
-    <message>
-        <source>Enter the old passphrase and new passphrase to the wallet.</source>
-        <translation>請輸入舊密碼和新密碼至錢包。</translation>
-    </message>
-    <message>
-        <source>Wallet encryption failed</source>
-        <translation>錢包加密失敗</translation>
-    </message>
-    <message>
-        <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
-        <translation>因內部錯誤導致錢包加密失敗。你的錢包尚未加密。</translation>
-    </message>
-    <message>
-        <source>The supplied passphrases do not match.</source>
-        <translation>提供的密碼不一樣。</translation>
-    </message>
-    <message>
-        <source>Wallet unlock failed</source>
-        <translation>錢包解鎖失敗</translation>
-    </message>
-    <message>
-        <source>The passphrase entered for the wallet decryption was incorrect.</source>
-        <translation>用來解密錢包的密碼不對。</translation>
-    </message>
-    <message>
-        <source>Wallet decryption failed</source>
-        <translation>錢包解密失敗</translation>
-    </message>
-    <message>
-        <source>Wallet passphrase was successfully changed.</source>
-        <translation>錢包密碼已成功更改。</translation>
-    </message>
 </context>
 <context>
     <name>BanTableModel</name>
@@ -305,14 +146,6 @@
         <source>Open &amp;URI...</source>
         <translation>開啓網址... &amp;U</translation>
     </message>
-    <message>
-        <source>Bitcoin Core client</source>
-        <translation>Bitcoin Core 客戶端</translation>
-    </message>
-    <message>
-        <source>Importing blocks from disk...</source>
-        <translation>正在從磁碟匯入區塊資料...</translation>
-    </message>
     <message>
         <source>Reindexing blocks on disk...</source>
         <translation>正在為磁碟區塊重建索引...</translation>
@@ -357,10 +190,6 @@
         <source>&amp;Receive</source>
         <translation>收款 &amp;R</translation>
     </message>
-    <message>
-        <source>Show information about Bitcoin Core</source>
-        <translation>顯示 Bitcoin Core 的相關資訊</translation>
-    </message>
     <message>
         <source>&amp;Show / Hide</source>
         <translation>顯示 / 隱藏 &amp;S</translation>
@@ -370,15 +199,8 @@
         <translation>顯示或隱藏主視窗</translation>
     </message>
     </context>
-<context>
-    <name>ClientModel</name>
-    </context>
 <context>
     <name>CoinControlDialog</name>
-    <message>
-        <source>(no label)</source>
-        <translation>(無標記)</translation>
-    </message>
     </context>
 <context>
     <name>EditAddressDialog</name>
@@ -401,18 +223,12 @@
 <context>
     <name>OverviewPage</name>
     </context>
-<context>
-    <name>PaymentServer</name>
-    </context>
 <context>
     <name>PeerTableModel</name>
     </context>
 <context>
     <name>QObject</name>
     </context>
-<context>
-    <name>QRImageWidget</name>
-    </context>
 <context>
     <name>RPCConsole</name>
     </context>
@@ -421,32 +237,9 @@
     </context>
 <context>
     <name>ReceiveRequestDialog</name>
-    <message>
-        <source>Address</source>
-        <translation>位址</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>標記</translation>
-    </message>
-    </context>
-<context>
-    <name>RecentRequestsTableModel</name>
-    <message>
-        <source>Label</source>
-        <translation>標記</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(無標記)</translation>
-    </message>
     </context>
 <context>
     <name>SendCoinsDialog</name>
-    <message>
-        <source>(no label)</source>
-        <translation>(無標記)</translation>
-    </message>
     </context>
 <context>
     <name>SendCoinsEntry</name>
@@ -463,58 +256,12 @@
 <context>
     <name>TrafficGraphWidget</name>
     </context>
-<context>
-    <name>TransactionDesc</name>
-    </context>
 <context>
     <name>TransactionDescDialog</name>
     </context>
-<context>
-    <name>TransactionTableModel</name>
-    <message>
-        <source>Label</source>
-        <translation>標記</translation>
-    </message>
-    </context>
-<context>
-    <name>TransactionView</name>
-    <message>
-        <source>Exporting Failed</source>
-        <translation>匯出失敗</translation>
-    </message>
-    <message>
-        <source>Comma separated file (*.csv)</source>
-        <translation>逗號分隔檔(*.csv)</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>標記</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>位址</translation>
-    </message>
-    </context>
 <context>
     <name>UnitDisplayStatusBarControl</name>
     </context>
-<context>
-    <name>WalletFrame</name>
-    </context>
-<context>
-    <name>WalletModel</name>
-    </context>
-<context>
-    <name>WalletView</name>
-    <message>
-        <source>&amp;Export</source>
-        <translation>匯出 &amp;E</translation>
-    </message>
-    <message>
-        <source>Export the data in the current tab to a file</source>
-        <translation>把目前分頁的資料匯出至檔案</translation>
-    </message>
-    </context>
 <context>
     <name>bitcoin-core</name>
     </context>
diff --git a/src/qt/locale/bitcoin_zh_TW.ts b/src/qt/locale/bitcoin_zh_TW.ts
index 107e7034e5bc9..cbdb8f2c0bacf 100644
--- a/src/qt/locale/bitcoin_zh_TW.ts
+++ b/src/qt/locale/bitcoin_zh_TW.ts
@@ -25,10 +25,6 @@
         <source>C&amp;lose</source>
         <translation>關閉</translation>
     </message>
-    <message>
-        <source>&amp;Copy Address</source>
-        <translation>複製位址</translation>
-    </message>
     <message>
         <source>Delete the currently selected address from the list</source>
         <translation>把目前選擇的位址從列表中刪掉</translation>
@@ -45,73 +41,6 @@
         <source>&amp;Delete</source>
         <translation>刪掉</translation>
     </message>
-    <message>
-        <source>Choose the address to send coins to</source>
-        <translation>選擇要付錢過去的位址</translation>
-    </message>
-    <message>
-        <source>Choose the address to receive coins with</source>
-        <translation>選擇要收錢進來的位址</translation>
-    </message>
-    <message>
-        <source>C&amp;hoose</source>
-        <translation>選取</translation>
-    </message>
-    <message>
-        <source>Sending addresses</source>
-        <translation>付款位址</translation>
-    </message>
-    <message>
-        <source>Receiving addresses</source>
-        <translation>收款位址</translation>
-    </message>
-    <message>
-        <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source>
-        <translation>這些是你要付款過去的 Bitcoin 位址。在付錢之前，務必要檢查金額和收款位址是否正確。</translation>
-    </message>
-    <message>
-        <source>These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source>
-        <translation>這些是你用來收款的 Bitcoin 位址。建議在每次交易時，都使用一個新的收款位址。</translation>
-    </message>
-    <message>
-        <source>Copy &amp;Label</source>
-        <translation>複製標記</translation>
-    </message>
-    <message>
-        <source>&amp;Edit</source>
-        <translation>編輯</translation>
-    </message>
-    <message>
-        <source>Export Address List</source>
-        <translation>匯出位址清單</translation>
-    </message>
-    <message>
-        <source>Comma separated file (*.csv)</source>
-        <translation>逗號分隔資料檔(*.csv)</translation>
-    </message>
-    <message>
-        <source>Exporting Failed</source>
-        <translation>匯出失敗</translation>
-    </message>
-    <message>
-        <source>There was an error trying to save the address list to %1. Please try again.</source>
-        <translation>儲存位址列表到 %1 時發生錯誤。請重試一次。</translation>
-    </message>
-</context>
-<context>
-    <name>AddressTableModel</name>
-    <message>
-        <source>Label</source>
-        <translation>標記</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>位址</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(無標記)</translation>
-    </message>
 </context>
 <context>
     <name>AskPassphraseDialog</name>
@@ -131,94 +60,6 @@
         <source>Repeat new passphrase</source>
         <translation>重複新密碼</translation>
     </message>
-    <message>
-        <source>Encrypt wallet</source>
-        <translation>加密錢包</translation>
-    </message>
-    <message>
-        <source>This operation needs your wallet passphrase to unlock the wallet.</source>
-        <translation>這個動作需要你的錢包密碼來解鎖錢包。</translation>
-    </message>
-    <message>
-        <source>Unlock wallet</source>
-        <translation>解鎖錢包</translation>
-    </message>
-    <message>
-        <source>This operation needs your wallet passphrase to decrypt the wallet.</source>
-        <translation>這個動作需要你的錢包密碼來把錢包解密。</translation>
-    </message>
-    <message>
-        <source>Decrypt wallet</source>
-        <translation>解密錢包</translation>
-    </message>
-    <message>
-        <source>Change passphrase</source>
-        <translation>改變密碼</translation>
-    </message>
-    <message>
-        <source>Confirm wallet encryption</source>
-        <translation>確認錢包加密</translation>
-    </message>
-    <message>
-        <source>Warning: If you encrypt your wallet and lose your passphrase, you will &lt;b&gt;LOSE ALL OF YOUR BITCOINS&lt;/b&gt;!</source>
-        <translation>警告: 如果把錢包加密後又忘記密碼，你就會從此&lt;b&gt;失去其中所有的 Bitcoin 了&lt;/b&gt;！</translation>
-    </message>
-    <message>
-        <source>Are you sure you wish to encrypt your wallet?</source>
-        <translation>你確定要把錢包加密嗎？</translation>
-    </message>
-    <message>
-        <source>Bitcoin Core will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source>
-        <translation>Bitcoin Core 現在要關閉，好完成加密程序。請注意，加密錢包不能完全防止入侵你的電腦的惡意程式偷取錢幣。</translation>
-    </message>
-    <message>
-        <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source>
-        <translation>重要: 請改用新產生有加密的錢包檔，來取代舊錢包檔的備份。為了安全性的理由，當你開始使用新的有加密的錢包後，舊錢包檔的備份就不能再使用了。</translation>
-    </message>
-    <message>
-        <source>Warning: The Caps Lock key is on!</source>
-        <translation>警告: 大寫字母鎖定作用中！</translation>
-    </message>
-    <message>
-        <source>Wallet encrypted</source>
-        <translation>錢包已加密</translation>
-    </message>
-    <message>
-        <source>Enter the new passphrase to the wallet.&lt;br/&gt;Please use a passphrase of &lt;b&gt;ten or more random characters&lt;/b&gt;, or &lt;b&gt;eight or more words&lt;/b&gt;.</source>
-        <translation>輸入錢包的新密碼。&lt;br/&gt;密碼請用&lt;b&gt;10 個以上的字元&lt;/b&gt;，或是&lt;b&gt;8 個以上的字詞&lt;/b&gt;。</translation>
-    </message>
-    <message>
-        <source>Enter the old passphrase and new passphrase to the wallet.</source>
-        <translation>請輸入錢包的舊密碼和新密碼。</translation>
-    </message>
-    <message>
-        <source>Wallet encryption failed</source>
-        <translation>錢包加密失敗</translation>
-    </message>
-    <message>
-        <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
-        <translation>因為內部錯誤導致錢包加密失敗。你的錢包還是沒加密。</translation>
-    </message>
-    <message>
-        <source>The supplied passphrases do not match.</source>
-        <translation>提供的密碼不一樣。</translation>
-    </message>
-    <message>
-        <source>Wallet unlock failed</source>
-        <translation>錢包解鎖失敗</translation>
-    </message>
-    <message>
-        <source>The passphrase entered for the wallet decryption was incorrect.</source>
-        <translation>輸入要用來解密錢包的密碼不對。</translation>
-    </message>
-    <message>
-        <source>Wallet decryption failed</source>
-        <translation>錢包解密失敗</translation>
-    </message>
-    <message>
-        <source>Wallet passphrase was successfully changed.</source>
-        <translation>錢包密碼改成功了。</translation>
-    </message>
 </context>
 <context>
     <name>BanTableModel</name>
@@ -269,6 +110,14 @@
         <source>Quit application</source>
         <translation>結束應用程式</translation>
     </message>
+    <message>
+        <source>&amp;About %1</source>
+        <translation>關於%1</translation>
+    </message>
+    <message>
+        <source>Show information about %1</source>
+        <translation>顯示 %1 的相關資訊</translation>
+    </message>
     <message>
         <source>About &amp;Qt</source>
         <translation>關於 &amp;Qt</translation>
@@ -281,6 +130,10 @@
         <source>&amp;Options...</source>
         <translation>選項...</translation>
     </message>
+    <message>
+        <source>Modify configuration options for %1</source>
+        <translation>修改 %1 的設定選項</translation>
+    </message>
     <message>
         <source>&amp;Encrypt Wallet...</source>
         <translation>加密錢包...</translation>
@@ -305,14 +158,6 @@
         <source>Open &amp;URI...</source>
         <translation>開啓 URI...</translation>
     </message>
-    <message>
-        <source>Bitcoin Core client</source>
-        <translation>Bitcoin Core 客戶端軟體</translation>
-    </message>
-    <message>
-        <source>Importing blocks from disk...</source>
-        <translation>正在從磁碟匯入區塊資料...</translation>
-    </message>
     <message>
         <source>Reindexing blocks on disk...</source>
         <translation>正在為磁碟裡的區塊重建索引...</translation>
@@ -357,10 +202,6 @@
         <source>&amp;Receive</source>
         <translation>收款</translation>
     </message>
-    <message>
-        <source>Show information about Bitcoin Core</source>
-        <translation>顯示 Bitcoin Core 的相關資訊</translation>
-    </message>
     <message>
         <source>&amp;Show / Hide</source>
         <translation>顯示或隱藏</translation>
@@ -397,22 +238,10 @@
         <source>Tabs toolbar</source>
         <translation>分頁工具列</translation>
     </message>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Bitcoin Core</translation>
-    </message>
     <message>
         <source>Request payments (generates QR codes and bitcoin: URIs)</source>
         <translation>要求付款(產生 QR Code 和 bitcoin 付款協議的資源識別碼: URI)</translation>
     </message>
-    <message>
-        <source>&amp;About Bitcoin Core</source>
-        <translation>關於 Bitcoin Core</translation>
-    </message>
-    <message>
-        <source>Modify configuration options for Bitcoin Core</source>
-        <translation>修改 Bitcoin Core 的設定選項</translation>
-    </message>
     <message>
         <source>Show the list of used sending addresses and labels</source>
         <translation>顯示已使用過的付款位址和標記的清單</translation>
@@ -429,14 +258,18 @@
         <source>&amp;Command-line options</source>
         <translation>命令列選項</translation>
     </message>
-    <message>
-        <source>Show the Bitcoin Core help message to get a list with possible Bitcoin command-line options</source>
-        <translation>顯示 Bitcoin Core 的說明訊息，來取得可用命令列選項的列表</translation>
-    </message>
     <message numerus="yes">
         <source>%n active connection(s) to Bitcoin network</source>
         <translation><numerusform>%n 個運作中的 Bitcoin 網路連線</numerusform></translation>
     </message>
+    <message>
+        <source>Indexing blocks on disk...</source>
+        <translation>正在為磁碟裡的區塊建立索引...</translation>
+    </message>
+    <message>
+        <source>Processing blocks on disk...</source>
+        <translation>正在處理磁碟裡的區塊資料...</translation>
+    </message>
     <message>
         <source>No block source available...</source>
         <translation>沒有可用的區塊來源...</translation>
@@ -493,6 +326,14 @@
         <source>Up to date</source>
         <translation>最新狀態</translation>
     </message>
+    <message>
+        <source>Show the %1 help message to get a list with possible Bitcoin command-line options</source>
+        <translation>顯示 %1 的說明訊息，來取得可用命令列選項的列表</translation>
+    </message>
+    <message>
+        <source>%1 client</source>
+        <translation>%1 客戶端軟體</translation>
+    </message>
     <message>
         <source>Catching up...</source>
         <translation>正在趕進度...</translation>
@@ -544,13 +385,6 @@
         <translation>錢包&lt;b&gt;已加密&lt;/b&gt;並且&lt;b&gt;上鎖中&lt;/b&gt;</translation>
     </message>
 </context>
-<context>
-    <name>ClientModel</name>
-    <message>
-        <source>Network Alert</source>
-        <translation>網路警報</translation>
-    </message>
-</context>
 <context>
     <name>CoinControlDialog</name>
     <message>
@@ -629,150 +463,6 @@
         <source>Priority</source>
         <translation>優先度</translation>
     </message>
-    <message>
-        <source>Copy address</source>
-        <translation>複製位址</translation>
-    </message>
-    <message>
-        <source>Copy label</source>
-        <translation>複製標記</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>複製金額</translation>
-    </message>
-    <message>
-        <source>Copy transaction ID</source>
-        <translation>複製交易識別碼</translation>
-    </message>
-    <message>
-        <source>Lock unspent</source>
-        <translation>鎖定不用</translation>
-    </message>
-    <message>
-        <source>Unlock unspent</source>
-        <translation>解鎖可用</translation>
-    </message>
-    <message>
-        <source>Copy quantity</source>
-        <translation>複製數目</translation>
-    </message>
-    <message>
-        <source>Copy fee</source>
-        <translation>複製手續費</translation>
-    </message>
-    <message>
-        <source>Copy after fee</source>
-        <translation>複製計費後金額</translation>
-    </message>
-    <message>
-        <source>Copy bytes</source>
-        <translation>複製位元組數</translation>
-    </message>
-    <message>
-        <source>Copy priority</source>
-        <translation>複製優先度</translation>
-    </message>
-    <message>
-        <source>Copy dust</source>
-        <translation>複製零散金額</translation>
-    </message>
-    <message>
-        <source>Copy change</source>
-        <translation>複製找零金額</translation>
-    </message>
-    <message>
-        <source>highest</source>
-        <translation>最高</translation>
-    </message>
-    <message>
-        <source>higher</source>
-        <translation>很高</translation>
-    </message>
-    <message>
-        <source>high</source>
-        <translation>高</translation>
-    </message>
-    <message>
-        <source>medium-high</source>
-        <translation>中高</translation>
-    </message>
-    <message>
-        <source>medium</source>
-        <translation>中等</translation>
-    </message>
-    <message>
-        <source>low-medium</source>
-        <translation>中低</translation>
-    </message>
-    <message>
-        <source>low</source>
-        <translation>低</translation>
-    </message>
-    <message>
-        <source>lower</source>
-        <translation>很低</translation>
-    </message>
-    <message>
-        <source>lowest</source>
-        <translation>最低</translation>
-    </message>
-    <message>
-        <source>(%1 locked)</source>
-        <translation>(鎖定 %1 枚)</translation>
-    </message>
-    <message>
-        <source>none</source>
-        <translation>無</translation>
-    </message>
-    <message>
-        <source>This label turns red if the transaction size is greater than 1000 bytes.</source>
-        <translation>當交易大小大於 1000 位元組時，文字會變紅色。</translation>
-    </message>
-    <message>
-        <source>This label turns red if the priority is smaller than "medium".</source>
-        <translation>當優先度低於「中等」時，文字會變紅色。</translation>
-    </message>
-    <message>
-        <source>This label turns red if any recipient receives an amount smaller than %1.</source>
-        <translation>當任何一個收款金額小於 %1 時，文字會變紅色。</translation>
-    </message>
-    <message>
-        <source>Can vary +/- %1 satoshi(s) per input.</source>
-        <translation>每組輸入可能有 +/- %1 個 satoshi 的誤差。</translation>
-    </message>
-    <message>
-        <source>yes</source>
-        <translation>是</translation>
-    </message>
-    <message>
-        <source>no</source>
-        <translation>否</translation>
-    </message>
-    <message>
-        <source>This means a fee of at least %1 per kB is required.</source>
-        <translation>表示每一千位元組(kB)需要至少 %1 的手續費。</translation>
-    </message>
-    <message>
-        <source>Can vary +/- 1 byte per input.</source>
-        <translation>每組輸入可能會誤差多或少 1 個位元組。</translation>
-    </message>
-    <message>
-        <source>Transactions with higher priority are more likely to get included into a block.</source>
-        <translation>優先度較高的交易比較有可能被接受放進區塊中。</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(無標記)</translation>
-    </message>
-    <message>
-        <source>change from %1 (%2)</source>
-        <translation>找零前是 %1 (%2)</translation>
-    </message>
-    <message>
-        <source>(change)</source>
-        <translation>(找零)</translation>
-    </message>
 </context>
 <context>
     <name>EditAddressDialog</name>
@@ -796,38 +486,6 @@
         <source>&amp;Address</source>
         <translation>位址</translation>
     </message>
-    <message>
-        <source>New receiving address</source>
-        <translation>造新的收款位址</translation>
-    </message>
-    <message>
-        <source>New sending address</source>
-        <translation>造新的付款位址</translation>
-    </message>
-    <message>
-        <source>Edit receiving address</source>
-        <translation>編輯收款位址</translation>
-    </message>
-    <message>
-        <source>Edit sending address</source>
-        <translation>編輯付款位址</translation>
-    </message>
-    <message>
-        <source>The entered address "%1" is already in the address book.</source>
-        <translation>輸入的位址 %1 在位址簿中已經有了。</translation>
-    </message>
-    <message>
-        <source>The entered address "%1" is not a valid Bitcoin address.</source>
-        <translation>輸入的位址 %1 並不是有效的 Bitcoin 位址。</translation>
-    </message>
-    <message>
-        <source>Could not unlock wallet.</source>
-        <translation>沒辦法把錢包解鎖。</translation>
-    </message>
-    <message>
-        <source>New key generation failed.</source>
-        <translation>產生新的密鑰失敗了。</translation>
-    </message>
 </context>
 <context>
     <name>FreespaceChecker</name>
@@ -854,10 +512,6 @@
 </context>
 <context>
     <name>HelpMessageDialog</name>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Bitcoin Core</translation>
-    </message>
     <message>
         <source>version</source>
         <translation>版本</translation>
@@ -867,8 +521,8 @@
         <translation>(%1 位元)</translation>
     </message>
     <message>
-        <source>About Bitcoin Core</source>
-        <translation>關於 Bitcoin Core</translation>
+        <source>About %1</source>
+        <translation>關於 %1</translation>
     </message>
     <message>
         <source>Command-line options</source>
@@ -907,7 +561,7 @@
         <translation>顯示啓動畫面(預設值: %u)</translation>
     </message>
     <message>
-        <source>Reset all settings changes made over the GUI</source>
+        <source>Reset all settings changed in the GUI</source>
         <translation>重置所有在使用界面更改的設定</translation>
     </message>
 </context>
@@ -918,16 +572,16 @@
         <translation>歡迎</translation>
     </message>
     <message>
-        <source>Welcome to Bitcoin Core.</source>
-        <translation>歡迎使用 Bitcoin Core</translation>
+        <source>Welcome to %1.</source>
+        <translation>歡迎使用 %1。</translation>
     </message>
     <message>
-        <source>As this is the first time the program is launched, you can choose where Bitcoin Core will store its data.</source>
-        <translation>因為這是程式第一次啓動，你可以選擇 Bitcoin Core 儲存資料的地方。</translation>
+        <source>As this is the first time the program is launched, you can choose where %1 will store its data.</source>
+        <translation>因為這是程式第一次啓動，你可以選擇 %1 儲存資料的地方。</translation>
     </message>
     <message>
-        <source>Bitcoin Core will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source>
-        <translation>Bitcoin Core 會下載並儲存一份 Bitcoin 區塊鏈的拷貝。至少有 %1GB 的資料會儲存到這個目錄中，並且還會持續增長。另外錢包資料也會儲存在這個目錄。</translation>
+        <source>%1 will download and store a copy of the Bitcoin block chain. At least %2GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source>
+        <translation>%1 會下載並儲存一份 Bitcoin 區塊鏈的拷貝。至少有 %2GB 的資料會儲存到這個目錄中，並且還會持續增長。另外錢包資料也會儲存在這個目錄。</translation>
     </message>
     <message>
         <source>Use the default data directory</source>
@@ -937,10 +591,6 @@
         <source>Use a custom data directory:</source>
         <translation>使用自訂的資料目錄:</translation>
     </message>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Bitcoin Core</translation>
-    </message>
     <message>
         <source>Error: Specified data directory "%1" cannot be created.</source>
         <translation>錯誤: 無法新增指定的資料目錄: %1</translation>
@@ -976,10 +626,6 @@
         <source>Select payment request file</source>
         <translation>選擇付款要求資料檔</translation>
     </message>
-    <message>
-        <source>Select payment request file to open</source>
-        <translation>選擇要開啟的付款要求資料檔</translation>
-    </message>
 </context>
 <context>
     <name>OptionsDialog</name>
@@ -991,6 +637,14 @@
         <source>&amp;Main</source>
         <translation>主要</translation>
     </message>
+    <message>
+        <source>Automatically start %1 after logging in to the system.</source>
+        <translation>在登入系統後自動啓動 %1。</translation>
+    </message>
+    <message>
+        <source>&amp;Start %1 on system login</source>
+        <translation>系統登入時啟動 %1</translation>
+    </message>
     <message>
         <source>Size of &amp;database cache</source>
         <translation>資料庫快取大小</translation>
@@ -1019,10 +673,6 @@
         <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Exit in the menu.</source>
         <translation>當視窗關閉時，把應用程式縮到最小，而不是結束。當勾選這個選項時，只能夠用選單中的結束來關掉應用程式。</translation>
     </message>
-    <message>
-        <source>The user interface language can be set here. This setting will take effect after restarting Bitcoin Core.</source>
-        <translation>可以在這裡設定使用者介面的語言。這個設定在重啓 Bitcoin Core 後才會生效。</translation>
-    </message>
     <message>
         <source>Third party URLs (e.g. a block explorer) that appear in the transactions tab as context menu items. %s in the URL is replaced by transaction hash. Multiple URLs are separated by vertical bar |.</source>
         <translation>在交易頁籤的情境選單出現的第三方網址連結(URL)，比如說區塊探索網站。網址中的 %s 會被取代為交易的雜湊值。可以用直線符號 | 來分隔多個連結。</translation>
@@ -1047,14 +697,6 @@
         <source>&amp;Network</source>
         <translation>網路</translation>
     </message>
-    <message>
-        <source>Automatically start Bitcoin Core after logging in to the system.</source>
-        <translation>在登入系統後自動啓動 Bitcoin Core。</translation>
-    </message>
-    <message>
-        <source>&amp;Start Bitcoin Core on system login</source>
-        <translation>系統登入時啟動 Bitcoin Core</translation>
-    </message>
     <message>
         <source>(0 = auto, &lt;0 = leave that many cores free)</source>
         <translation>(0 表示程式自動決定，小於 0 表示保留處理器核心不用的數目)</translation>
@@ -1139,13 +781,21 @@
         <source>&amp;Window</source>
         <translation>視窗</translation>
     </message>
+    <message>
+        <source>&amp;Hide the icon from the system tray.</source>
+        <translation>不在通知區顯示圖示。</translation>
+    </message>
+    <message>
+        <source>Hide tray icon</source>
+        <translation>不顯示通知區圖示</translation>
+    </message>
     <message>
         <source>Show only a tray icon after minimizing the window.</source>
-        <translation>視窗縮到最小後只在通知區域顯示圖示。</translation>
+        <translation>視窗縮到最小後只在通知區顯示圖示。</translation>
     </message>
     <message>
         <source>&amp;Minimize to the tray instead of the taskbar</source>
-        <translation>縮到最小到通知區域而不是工作列</translation>
+        <translation>縮到最小到通知區而不是工作列</translation>
     </message>
     <message>
         <source>M&amp;inimize on close</source>
@@ -1159,6 +809,10 @@
         <source>User Interface &amp;language:</source>
         <translation>使用界面語言:</translation>
     </message>
+    <message>
+        <source>The user interface language can be set here. This setting will take effect after restarting %1.</source>
+        <translation>可以在這裡設定使用者介面的語言。這個設定在重啓 %1 後才會生效。</translation>
+    </message>
     <message>
         <source>&amp;Unit to show amounts in:</source>
         <translation>金額顯示單位:</translation>
@@ -1284,128 +938,37 @@
     </message>
 </context>
 <context>
-    <name>PaymentServer</name>
+    <name>PeerTableModel</name>
     <message>
-        <source>URI handling</source>
-        <translation>URI 處理</translation>
+        <source>User Agent</source>
+        <translation>使用者代理</translation>
     </message>
     <message>
-        <source>Invalid payment address %1</source>
-        <translation>無效的付款位址 %1</translation>
+        <source>Node/Service</source>
+        <translation>節點/服務</translation>
     </message>
     <message>
-        <source>Payment request rejected</source>
-        <translation>付款的要求被拒絕了</translation>
+        <source>Ping Time</source>
+        <translation>Ping 時間</translation>
     </message>
+</context>
+<context>
+    <name>QObject</name>
     <message>
-        <source>Payment request network doesn't match client network.</source>
-        <translation>付款要求的網路類型跟客戶端不符。</translation>
+        <source>Amount</source>
+        <translation>金額</translation>
     </message>
     <message>
-        <source>Payment request is not initialized.</source>
-        <translation>付款的要求沒有完成初始化。</translation>
+        <source>Enter a Bitcoin address (e.g. %1)</source>
+        <translation>輸入 Bitcoin 位址 (比如說 %1)</translation>
     </message>
     <message>
-        <source>Requested payment amount of %1 is too small (considered dust).</source>
-        <translation>要求付款的金額 %1 太少(會被網路認為是沒必要的零散錢)。</translation>
+        <source>%1 d</source>
+        <translation>%1 天</translation>
     </message>
     <message>
-        <source>Payment request error</source>
-        <translation>要求付款時發生錯誤</translation>
-    </message>
-    <message>
-        <source>Cannot start bitcoin: click-to-pay handler</source>
-        <translation>沒辦法啟動 bitcoin 協議的按就付處理器</translation>
-    </message>
-    <message>
-        <source>Payment request fetch URL is invalid: %1</source>
-        <translation>取得付款要求的網址連結(URL)無效: %1</translation>
-    </message>
-    <message>
-        <source>URI cannot be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source>
-        <translation>沒辦法解析資源識別碼(URI)！可能是因為 Bitcoin 位址無效，或是 URI 參數格式錯誤。</translation>
-    </message>
-    <message>
-        <source>Payment request file handling</source>
-        <translation>處理付款要求檔案</translation>
-    </message>
-    <message>
-        <source>Payment request file cannot be read! This can be caused by an invalid payment request file.</source>
-        <translation>沒辦法讀取付款要求檔案！可能是無效的檔案造成的。</translation>
-    </message>
-    <message>
-        <source>Payment request expired.</source>
-        <translation>付款的要求過期了。</translation>
-    </message>
-    <message>
-        <source>Unverified payment requests to custom payment scripts are unsupported.</source>
-        <translation>不支援含有自訂付款指令碼，且沒驗證過的付款要求。</translation>
-    </message>
-    <message>
-        <source>Invalid payment request.</source>
-        <translation>付款的要求無效。</translation>
-    </message>
-    <message>
-        <source>Refund from %1</source>
-        <translation>來自 %1 的退款</translation>
-    </message>
-    <message>
-        <source>Payment request %1 is too large (%2 bytes, allowed %3 bytes).</source>
-        <translation>付款要求 %1 過大 (%2 位元組, 上限 %3 位元組).</translation>
-    </message>
-    <message>
-        <source>Error communicating with %1: %2</source>
-        <translation>跟 %1 通訊時發生錯誤: %2</translation>
-    </message>
-    <message>
-        <source>Payment request cannot be parsed!</source>
-        <translation>沒辦法解析付款要求內容！</translation>
-    </message>
-    <message>
-        <source>Bad response from server %1</source>
-        <translation>伺服器 %1 的回應有誤</translation>
-    </message>
-    <message>
-        <source>Payment acknowledged</source>
-        <translation>已確認付款</translation>
-    </message>
-    <message>
-        <source>Network request error</source>
-        <translation>發出要求時發生網路錯誤</translation>
-    </message>
-</context>
-<context>
-    <name>PeerTableModel</name>
-    <message>
-        <source>User Agent</source>
-        <translation>使用者代理</translation>
-    </message>
-    <message>
-        <source>Node/Service</source>
-        <translation>節點/服務</translation>
-    </message>
-    <message>
-        <source>Ping Time</source>
-        <translation>Ping 時間</translation>
-    </message>
-</context>
-<context>
-    <name>QObject</name>
-    <message>
-        <source>Amount</source>
-        <translation>金額</translation>
-    </message>
-    <message>
-        <source>Enter a Bitcoin address (e.g. %1)</source>
-        <translation>輸入 Bitcoin 位址 (比如說 %1)</translation>
-    </message>
-    <message>
-        <source>%1 d</source>
-        <translation>%1 天</translation>
-    </message>
-    <message>
-        <source>%1 h</source>
-        <translation>%1 小時</translation>
+        <source>%1 h</source>
+        <translation>%1 小時</translation>
     </message>
     <message>
         <source>%1 m</source>
@@ -1428,25 +991,6 @@
         <translation>%1 毫秒</translation>
     </message>
 </context>
-<context>
-    <name>QRImageWidget</name>
-    <message>
-        <source>&amp;Save Image...</source>
-        <translation>儲存圖片...</translation>
-    </message>
-    <message>
-        <source>&amp;Copy Image</source>
-        <translation>複製圖片</translation>
-    </message>
-    <message>
-        <source>Save QR Code</source>
-        <translation>儲存 QR Code</translation>
-    </message>
-    <message>
-        <source>PNG Image (*.png)</source>
-        <translation>PNG 圖檔(*.png)</translation>
-    </message>
-</context>
 <context>
     <name>RPCConsole</name>
     <message>
@@ -1477,6 +1021,10 @@
         <source>Using BerkeleyDB version</source>
         <translation>使用 BerkeleyDB 版本</translation>
     </message>
+    <message>
+        <source>Datadir</source>
+        <translation>資料目錄</translation>
+    </message>
     <message>
         <source>Startup time</source>
         <translation>啓動時間</translation>
@@ -1513,10 +1061,6 @@
         <source>Memory usage</source>
         <translation>記憶體使用量</translation>
     </message>
-    <message>
-        <source>Open the Bitcoin Core debug log file from the current data directory. This can take a few seconds for large log files.</source>
-        <translation>從目前的資料目錄下開啓 Bitcoin Core 的除錯紀錄檔。當紀錄檔很大時，可能會花好幾秒的時間。</translation>
-    </message>
     <message>
         <source>Received</source>
         <translation>收到</translation>
@@ -1565,6 +1109,18 @@
         <source>User Agent</source>
         <translation>使用者代理</translation>
     </message>
+    <message>
+        <source>Open the %1 debug log file from the current data directory. This can take a few seconds for large log files.</source>
+        <translation>從目前的資料目錄下開啓 %1 的除錯紀錄檔。當紀錄檔很大時，可能會花好幾秒的時間。</translation>
+    </message>
+    <message>
+        <source>Decrease font size</source>
+        <translation>縮小文字</translation>
+    </message>
+    <message>
+        <source>Increase font size</source>
+        <translation>放大文字</translation>
+    </message>
     <message>
         <source>Services</source>
         <translation>服務</translation>
@@ -1633,10 +1189,6 @@
         <source>Out:</source>
         <translation>去:</translation>
     </message>
-    <message>
-        <source>Build date</source>
-        <translation>建置日期</translation>
-    </message>
     <message>
         <source>Debug log file</source>
         <translation>除錯紀錄檔</translation>
@@ -1671,11 +1223,11 @@
     </message>
     <message>
         <source>&amp;Unban Node</source>
-        <translation>解禁解點連線</translation>
+        <translation>解禁節點連線</translation>
     </message>
     <message>
-        <source>Welcome to the Bitcoin Core RPC console.</source>
-        <translation>歡迎使用 Bitcoin Core 的 RPC 主控台。</translation>
+        <source>Welcome to the %1 RPC console.</source>
+        <translation>歡迎使用 %1 的 RPC 主控台。</translation>
     </message>
     <message>
         <source>Use up and down arrows to navigate history, and &lt;b&gt;Ctrl-L&lt;/b&gt; to clear screen.</source>
@@ -1804,18 +1356,6 @@
         <source>Remove</source>
         <translation>刪掉</translation>
     </message>
-    <message>
-        <source>Copy label</source>
-        <translation>複製標記</translation>
-    </message>
-    <message>
-        <source>Copy message</source>
-        <translation>複製訊息</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>複製金額</translation>
-    </message>
 </context>
 <context>
     <name>ReceiveRequestDialog</name>
@@ -1835,73 +1375,6 @@
         <source>&amp;Save Image...</source>
         <translation>儲存圖片...</translation>
     </message>
-    <message>
-        <source>Request payment to %1</source>
-        <translation>付款給 %1 的要求</translation>
-    </message>
-    <message>
-        <source>Payment information</source>
-        <translation>付款資訊</translation>
-    </message>
-    <message>
-        <source>URI</source>
-        <translation>URI</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>位址</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>金額</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>標記</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>訊息</translation>
-    </message>
-    <message>
-        <source>Resulting URI too long, try to reduce the text for label / message.</source>
-        <translation>產生的 URI 過長，請試著縮短標記或訊息的文字內容。</translation>
-    </message>
-    <message>
-        <source>Error encoding URI into QR Code.</source>
-        <translation>把 URI 編碼成 QR Code 時發生錯誤。</translation>
-    </message>
-</context>
-<context>
-    <name>RecentRequestsTableModel</name>
-    <message>
-        <source>Date</source>
-        <translation>日期</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>標記</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>訊息</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>金額</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(無標記)</translation>
-    </message>
-    <message>
-        <source>(no message)</source>
-        <translation>(無訊息)</translation>
-    </message>
-    <message>
-        <source>(no amount)</source>
-        <translation>(無金額)</translation>
-    </message>
 </context>
 <context>
     <name>SendCoinsDialog</name>
@@ -2021,14 +1494,6 @@
         <source>fast</source>
         <translation>快速</translation>
     </message>
-    <message>
-        <source>Send as zero-fee transaction if possible</source>
-        <translation>盡可能送不用付手續費的交易</translation>
-    </message>
-    <message>
-        <source>(confirmation may take longer)</source>
-        <translation>(確認時間可能拉長)</translation>
-    </message>
     <message>
         <source>Send to multiple recipients at once</source>
         <translation>一次付給多個收款人</translation>
@@ -2061,118 +1526,6 @@
         <source>S&amp;end</source>
         <translation>付款</translation>
     </message>
-    <message>
-        <source>Confirm send coins</source>
-        <translation>確認付款金額</translation>
-    </message>
-    <message>
-        <source>%1 to %2</source>
-        <translation>%1 給 %2</translation>
-    </message>
-    <message>
-        <source>Copy quantity</source>
-        <translation>複製數目</translation>
-    </message>
-    <message>
-        <source>Copy amount</source>
-        <translation>複製金額</translation>
-    </message>
-    <message>
-        <source>Copy fee</source>
-        <translation>複製手續費</translation>
-    </message>
-    <message>
-        <source>Copy after fee</source>
-        <translation>複製計費後金額</translation>
-    </message>
-    <message>
-        <source>Copy bytes</source>
-        <translation>複製位元組數</translation>
-    </message>
-    <message>
-        <source>Copy priority</source>
-        <translation>複製優先度</translation>
-    </message>
-    <message>
-        <source>Copy change</source>
-        <translation>複製找零金額</translation>
-    </message>
-    <message>
-        <source>Total Amount %1</source>
-        <translation>總金額 %1</translation>
-    </message>
-    <message>
-        <source>or</source>
-        <translation>或</translation>
-    </message>
-    <message>
-        <source>The amount to pay must be larger than 0.</source>
-        <translation>付款金額必須大於零。</translation>
-    </message>
-    <message>
-        <source>The amount exceeds your balance.</source>
-        <translation>金額超過餘額了。</translation>
-    </message>
-    <message>
-        <source>The total exceeds your balance when the %1 transaction fee is included.</source>
-        <translation>包含 %1 的交易手續費後，總金額超過你的餘額了。</translation>
-    </message>
-    <message>
-        <source>Transaction creation failed!</source>
-        <translation>製造交易失敗了！</translation>
-    </message>
-    <message>
-        <source>The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source>
-        <translation>交易被拒絕了！有時候會發生這種錯誤，是因為你錢包中的一些錢已經被花掉了。比如說你複製了錢包檔 wallet.dat, 然後用複製的錢包花掉了錢，你現在所用的原來的錢包中，卻沒有那筆錢已經花掉的紀錄。</translation>
-    </message>
-    <message>
-        <source>A fee higher than %1 is considered an absurdly high fee.</source>
-        <translation>高於 %1 的手續費會被認為是不合理。</translation>
-    </message>
-    <message>
-        <source>Payment request expired.</source>
-        <translation>付款的要求過期了。</translation>
-    </message>
-    <message>
-        <source>Pay only the required fee of %1</source>
-        <translation>只付必要的手續費 %1</translation>
-    </message>
-    <message numerus="yes">
-        <source>Estimated to begin confirmation within %n block(s).</source>
-        <translation><numerusform>預計可在 %n 個區塊內開始確認。</numerusform></translation>
-    </message>
-    <message>
-        <source>The recipient address is not valid. Please recheck.</source>
-        <translation>收款位址無效。請再檢查看看。</translation>
-    </message>
-    <message>
-        <source>Duplicate address found: addresses should only be used once each.</source>
-        <translation>發現有重複的位址: 每個位址只能出現一次。</translation>
-    </message>
-    <message>
-        <source>Warning: Invalid Bitcoin address</source>
-        <translation>警告: Bitcoin 位址無效</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation>(無標記)</translation>
-    </message>
-    <message>
-        <source>Warning: Unknown change address</source>
-        <translation>警告: 不明的找零位址</translation>
-    </message>
-    <message>
-        <source>Copy dust</source>
-        <translation>複製零散金額</translation>
-    </message>
-    <message>
-        <source>Are you sure you want to send?</source>
-        <translation>你確定要付錢出去嗎？</translation>
-    </message>
-    <message>
-        <source>added as transaction fee</source>
-        <translation>加做交易手續費</translation>
-    </message>
 </context>
 <context>
     <name>SendCoinsEntry</name>
@@ -2184,10 +1537,6 @@
         <source>Pay &amp;To:</source>
         <translation>付給:</translation>
     </message>
-    <message>
-        <source>Enter a label for this address to add it to your address book</source>
-        <translation>請輸入這個位址的標記來把它加進位址簿中</translation>
-    </message>
     <message>
         <source>&amp;Label:</source>
         <translation>標記:</translation>
@@ -2205,700 +1554,182 @@
         <translation>接收付款的 Bitcoin 位址</translation>
     </message>
     <message>
-        <source>Alt+A</source>
-        <translation>Alt+A</translation>
-    </message>
-    <message>
-        <source>Paste address from clipboard</source>
-        <translation>貼上剪貼簿裡的位址</translation>
-    </message>
-    <message>
-        <source>Alt+P</source>
-        <translation>Alt+P</translation>
-    </message>
-    <message>
-        <source>Remove this entry</source>
-        <translation>刪掉這個項目</translation>
-    </message>
-    <message>
-        <source>The fee will be deducted from the amount being sent. The recipient will receive less bitcoins than you enter in the amount field. If multiple recipients are selected, the fee is split equally.</source>
-        <translation>手續費會從要付款出去的金額中扣掉。因此收款人會收到比輸入的金額還要少的 bitcoin。如果有多個收款人的話，手續費會平均分配來扣除。</translation>
-    </message>
-    <message>
-        <source>S&amp;ubtract fee from amount</source>
-        <translation>從付款金額減去手續費</translation>
-    </message>
-    <message>
-        <source>Message:</source>
-        <translation>訊息:</translation>
-    </message>
-    <message>
-        <source>This is an unauthenticated payment request.</source>
-        <translation>這是個沒有驗證過身份的付款要求。</translation>
-    </message>
-    <message>
-        <source>This is an authenticated payment request.</source>
-        <translation>這是個已經驗證過身份的付款要求。</translation>
-    </message>
-    <message>
-        <source>Enter a label for this address to add it to the list of used addresses</source>
-        <translation>請輸入這個位址的標記，來把它加進去已使用過位址的清單。</translation>
-    </message>
-    <message>
-        <source>A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
-        <translation>附加在 Bitcoin 付款協議的資源識別碼(URI)中的訊息，會和交易內容一起存起來，給你自己做參考。注意: 這個訊息不會送到 Bitcoin 網路上。</translation>
-    </message>
-    <message>
-        <source>Pay To:</source>
-        <translation>付給:</translation>
-    </message>
-    <message>
-        <source>Memo:</source>
-        <translation>備註:</translation>
-    </message>
-</context>
-<context>
-    <name>ShutdownWindow</name>
-    <message>
-        <source>Bitcoin Core is shutting down...</source>
-        <translation>正在關閉 Bitcoin Core 中...</translation>
-    </message>
-    <message>
-        <source>Do not shut down the computer until this window disappears.</source>
-        <translation> 在這個視窗不見以前，請不要關掉電腦。</translation>
-    </message>
-</context>
-<context>
-    <name>SignVerifyMessageDialog</name>
-    <message>
-        <source>Signatures - Sign / Verify a Message</source>
-        <translation>簽章 - 簽署或驗證訊息</translation>
-    </message>
-    <message>
-        <source>&amp;Sign Message</source>
-        <translation>簽署訊息</translation>
-    </message>
-    <message>
-        <source>You can sign messages/agreements with your addresses to prove you can receive bitcoins sent to them. Be careful not to sign anything vague or random, as phishing attacks may try to trick you into signing your identity over to them. Only sign fully-detailed statements you agree to.</source>
-        <translation>你可以用自己的位址簽署訊息或合約，來證明你可以從該位址收款。但是請小心，不要簽署語意含糊不清，或隨機產生的內容，因為釣魚式詐騙可能會用騙你簽署的手法來冒充是你。只有在語句中的細節你都同意時才簽署。</translation>
-    </message>
-    <message>
-        <source>The Bitcoin address to sign the message with</source>
-        <translation>用來簽署訊息的 Bitcoin 位址</translation>
-    </message>
-    <message>
-        <source>Choose previously used address</source>
-        <translation>選擇先前使用過的位址</translation>
-    </message>
-    <message>
-        <source>Alt+A</source>
-        <translation>Alt+A</translation>
-    </message>
-    <message>
-        <source>Paste address from clipboard</source>
-        <translation>貼上剪貼簿裡的位址</translation>
-    </message>
-    <message>
-        <source>Alt+P</source>
-        <translation>Alt+P</translation>
-    </message>
-    <message>
-        <source>Enter the message you want to sign here</source>
-        <translation>請在這裡輸入你想簽署的訊息</translation>
-    </message>
-    <message>
-        <source>Signature</source>
-        <translation>簽章</translation>
-    </message>
-    <message>
-        <source>Copy the current signature to the system clipboard</source>
-        <translation>複製目前的簽章到系統剪貼簿</translation>
-    </message>
-    <message>
-        <source>Sign the message to prove you own this Bitcoin address</source>
-        <translation>簽署這個訊息來證明這個 Bitcoin 位址是你的</translation>
-    </message>
-    <message>
-        <source>Sign &amp;Message</source>
-        <translation>簽署訊息</translation>
-    </message>
-    <message>
-        <source>Reset all sign message fields</source>
-        <translation>重設所有訊息簽署欄位</translation>
-    </message>
-    <message>
-        <source>Clear &amp;All</source>
-        <translation>全部清掉</translation>
-    </message>
-    <message>
-        <source>&amp;Verify Message</source>
-        <translation>驗證訊息</translation>
-    </message>
-    <message>
-        <source>Enter the receiver's address, message (ensure you copy line breaks, spaces, tabs, etc. exactly) and signature below to verify the message. Be careful not to read more into the signature than what is in the signed message itself, to avoid being tricked by a man-in-the-middle attack. Note that this only proves the signing party receives with the address, it cannot prove sendership of any transaction!</source>
-        <translation>請在下面輸入收款人的位址，訊息(請確定完整複製了所包含的換行，空格，跳位符號等等)，以及簽章，來驗證這個訊息。請小心，除了訊息內容以外，不要對簽章本身過度解讀，以避免被用「中間人攻擊法」詐騙。請注意，通過驗證的簽章只能證明簽章人確實可以從該位址收款，不能證明任何交易中的付款人身份！</translation>
-    </message>
-    <message>
-        <source>The Bitcoin address the message was signed with</source>
-        <translation>簽署這個訊息的 Bitcoin 位址</translation>
-    </message>
-    <message>
-        <source>Verify the message to ensure it was signed with the specified Bitcoin address</source>
-        <translation>驗證這個訊息來確定是用指定的 Bitcoin 位址簽署的</translation>
-    </message>
-    <message>
-        <source>Verify &amp;Message</source>
-        <translation>驗證訊息</translation>
-    </message>
-    <message>
-        <source>Reset all verify message fields</source>
-        <translation>重設所有訊息驗證欄位</translation>
-    </message>
-    <message>
-        <source>Click "Sign Message" to generate signature</source>
-        <translation>請按一下「簽署訊息」來產生簽章</translation>
-    </message>
-    <message>
-        <source>The entered address is invalid.</source>
-        <translation>輸入的位址無效。</translation>
-    </message>
-    <message>
-        <source>Please check the address and try again.</source>
-        <translation>請檢查位址是否正確後再試一次。</translation>
-    </message>
-    <message>
-        <source>The entered address does not refer to a key.</source>
-        <translation>輸入的位址沒有對應到你的任何密鑰。</translation>
-    </message>
-    <message>
-        <source>Wallet unlock was cancelled.</source>
-        <translation>錢包解鎖已取消。</translation>
-    </message>
-    <message>
-        <source>Private key for the entered address is not available.</source>
-        <translation>沒有對應輸入位址的密鑰。</translation>
-    </message>
-    <message>
-        <source>Message signing failed.</source>
-        <translation>訊息簽署失敗。</translation>
-    </message>
-    <message>
-        <source>Message signed.</source>
-        <translation>訊息簽署好了。</translation>
-    </message>
-    <message>
-        <source>The signature could not be decoded.</source>
-        <translation>沒辦法把這個簽章解碼。</translation>
-    </message>
-    <message>
-        <source>Please check the signature and try again.</source>
-        <translation>請檢查簽章是否正確後再試一次。</translation>
-    </message>
-    <message>
-        <source>The signature did not match the message digest.</source>
-        <translation>這個簽章跟訊息的數位摘要不符。</translation>
-    </message>
-    <message>
-        <source>Message verification failed.</source>
-        <translation>訊息驗證失敗。</translation>
-    </message>
-    <message>
-        <source>Message verified.</source>
-        <translation>訊息驗證沒錯。</translation>
-    </message>
-</context>
-<context>
-    <name>SplashScreen</name>
-    <message>
-        <source>Bitcoin Core</source>
-        <translation>Bitcoin Core</translation>
-    </message>
-    <message>
-        <source>The Bitcoin Core developers</source>
-        <translation>Bitcoin Core 開發人員</translation>
-    </message>
-    <message>
-        <source>[testnet]</source>
-        <translation>[testnet]</translation>
-    </message>
-</context>
-<context>
-    <name>TrafficGraphWidget</name>
-    <message>
-        <source>KB/s</source>
-        <translation>KB/s</translation>
-    </message>
-</context>
-<context>
-    <name>TransactionDesc</name>
-    <message>
-        <source>Open until %1</source>
-        <translation>到 %1 前可修改</translation>
-    </message>
-    <message>
-        <source>conflicted</source>
-        <translation>有衝突</translation>
-    </message>
-    <message>
-        <source>%1/offline</source>
-        <translation>%1 次/離線中</translation>
-    </message>
-    <message>
-        <source>%1/unconfirmed</source>
-        <translation>%1 次/未確認</translation>
-    </message>
-    <message>
-        <source>%1 confirmations</source>
-        <translation>確認 %1 次</translation>
-    </message>
-    <message>
-        <source>Status</source>
-        <translation>狀態</translation>
-    </message>
-    <message numerus="yes">
-        <source>, broadcast through %n node(s)</source>
-        <translation><numerusform>，已公告給 %n 個節點</numerusform></translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation>日期</translation>
-    </message>
-    <message>
-        <source>Source</source>
-        <translation>來源</translation>
-    </message>
-    <message>
-        <source>Generated</source>
-        <translation>生產出來</translation>
-    </message>
-    <message>
-        <source>From</source>
-        <translation>來源</translation>
-    </message>
-    <message>
-        <source>To</source>
-        <translation>目的</translation>
-    </message>
-    <message>
-        <source>own address</source>
-        <translation>自己的位址</translation>
-    </message>
-    <message>
-        <source>watch-only</source>
-        <translation>只能看</translation>
-    </message>
-    <message>
-        <source>label</source>
-        <translation>標記</translation>
-    </message>
-    <message>
-        <source>Credit</source>
-        <translation>入帳</translation>
-    </message>
-    <message numerus="yes">
-        <source>matures in %n more block(s)</source>
-        <translation><numerusform>再等 %n 個區塊生出來後成熟</numerusform></translation>
-    </message>
-    <message>
-        <source>not accepted</source>
-        <translation>不被接受</translation>
-    </message>
-    <message>
-        <source>Debit</source>
-        <translation>出帳</translation>
-    </message>
-    <message>
-        <source>Total debit</source>
-        <translation>出帳總額</translation>
-    </message>
-    <message>
-        <source>Total credit</source>
-        <translation>入帳總額</translation>
-    </message>
-    <message>
-        <source>Transaction fee</source>
-        <translation>交易手續費</translation>
-    </message>
-    <message>
-        <source>Net amount</source>
-        <translation>淨額</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation>訊息</translation>
-    </message>
-    <message>
-        <source>Comment</source>
-        <translation>附註</translation>
-    </message>
-    <message>
-        <source>Transaction ID</source>
-        <translation>交易識別碼</translation>
-    </message>
-    <message>
-        <source>Merchant</source>
-        <translation>商家</translation>
-    </message>
-    <message>
-        <source>Generated coins must mature %1 blocks before they can be spent. When you generated this block, it was broadcast to the network to be added to the block chain. If it fails to get into the chain, its state will change to "not accepted" and it won't be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source>
-        <translation>生產出來的錢要再等 %1 個區塊生出來後才成熟可以用。當區塊生產出來時會公布到網路上，來被加進區塊鏈。如果加失敗了，狀態就會變成「不被接受」，而且不能夠花。如果在你生產出區塊的幾秒鐘內，也有其他節點生產出來的話，就有可能會發生這種情形。</translation>
-    </message>
-    <message>
-        <source>Debug information</source>
-        <translation>除錯資訊</translation>
-    </message>
-    <message>
-        <source>Transaction</source>
-        <translation>交易</translation>
-    </message>
-    <message>
-        <source>Inputs</source>
-        <translation>輸入</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>金額</translation>
-    </message>
-    <message>
-        <source>true</source>
-        <translation>是</translation>
-    </message>
-    <message>
-        <source>false</source>
-        <translation>否</translation>
-    </message>
-    <message>
-        <source>, has not been successfully broadcast yet</source>
-        <translation>，還沒成功公告出去</translation>
-    </message>
-    <message numerus="yes">
-        <source>Open for %n more block(s)</source>
-        <translation><numerusform>到下 %n 個區塊生出來前可修改</numerusform></translation>
-    </message>
-    <message>
-        <source>unknown</source>
-        <translation>未知</translation>
-    </message>
-</context>
-<context>
-    <name>TransactionDescDialog</name>
-    <message>
-        <source>Transaction details</source>
-        <translation>交易明細</translation>
-    </message>
-    <message>
-        <source>This pane shows a detailed description of the transaction</source>
-        <translation>這個版面顯示這次交易的詳細說明</translation>
-    </message>
-</context>
-<context>
-    <name>TransactionTableModel</name>
-    <message>
-        <source>Date</source>
-        <translation>日期</translation>
-    </message>
-    <message>
-        <source>Type</source>
-        <translation>種類</translation>
-    </message>
-    <message>
-        <source>Immature (%1 confirmations, will be available after %2)</source>
-        <translation>未成熟(確認 %1 次，會在 %2 次後可用)</translation>
-    </message>
-    <message numerus="yes">
-        <source>Open for %n more block(s)</source>
-        <translation><numerusform>到下 %n 個區塊生出來前可修改</numerusform></translation>
-    </message>
-    <message>
-        <source>Open until %1</source>
-        <translation>到 %1 前可修改</translation>
-    </message>
-    <message>
-        <source>Confirmed (%1 confirmations)</source>
-        <translation>已確認(%1 次)</translation>
-    </message>
-    <message>
-        <source>This block was not received by any other nodes and will probably not be accepted!</source>
-        <translation>沒有其他節點收到這個區塊，也許它不會被接受！</translation>
-    </message>
-    <message>
-        <source>Generated but not accepted</source>
-        <translation>生產出來但是不被接受</translation>
-    </message>
-    <message>
-        <source>Offline</source>
-        <translation>離線中</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation>標記</translation>
-    </message>
-    <message>
-        <source>Unconfirmed</source>
-        <translation>未確認</translation>
-    </message>
-    <message>
-        <source>Confirming (%1 of %2 recommended confirmations)</source>
-        <translation>確認中(已經 %1 次，建議至少 %2 次)</translation>
-    </message>
-    <message>
-        <source>Conflicted</source>
-        <translation>有衝突</translation>
-    </message>
-    <message>
-        <source>Received with</source>
-        <translation>收款在</translation>
-    </message>
-    <message>
-        <source>Received from</source>
-        <translation>收款自</translation>
-    </message>
-    <message>
-        <source>Sent to</source>
-        <translation>付款給</translation>
-    </message>
-    <message>
-        <source>Payment to yourself</source>
-        <translation>付給自己</translation>
-    </message>
-    <message>
-        <source>Mined</source>
-        <translation>開採所得</translation>
-    </message>
-    <message>
-        <source>watch-only</source>
-        <translation>只能看</translation>
-    </message>
-    <message>
-        <source>(n/a)</source>
-        <translation>(不適用)</translation>
-    </message>
-    <message>
-        <source>Transaction status. Hover over this field to show number of confirmations.</source>
-        <translation>交易狀態。把游標停在欄位上會顯示確認次數。</translation>
-    </message>
-    <message>
-        <source>Date and time that the transaction was received.</source>
-        <translation>收到交易的日期和時間。</translation>
-    </message>
-    <message>
-        <source>Type of transaction.</source>
-        <translation>交易的種類。</translation>
-    </message>
-    <message>
-        <source>Whether or not a watch-only address is involved in this transaction.</source>
-        <translation>不論如何有一個只能觀看的地只有參與這次的交易</translation>
-    </message>
-    <message>
-        <source>User-defined intent/purpose of the transaction.</source>
-        <translation>使用者定義的交易動機或理由。</translation>
-    </message>
-    <message>
-        <source>Amount removed from or added to balance.</source>
-        <translation>要減掉或加進餘額的金額。</translation>
-    </message>
-</context>
-<context>
-    <name>TransactionView</name>
-    <message>
-        <source>All</source>
-        <translation>全部</translation>
+        <source>Alt+A</source>
+        <translation>Alt+A</translation>
     </message>
     <message>
-        <source>Today</source>
-        <translation>今天</translation>
+        <source>Paste address from clipboard</source>
+        <translation>貼上剪貼簿裡的位址</translation>
     </message>
     <message>
-        <source>This week</source>
-        <translation>這星期</translation>
+        <source>Alt+P</source>
+        <translation>Alt+P</translation>
     </message>
     <message>
-        <source>This month</source>
-        <translation>這個月</translation>
+        <source>Remove this entry</source>
+        <translation>刪掉這個項目</translation>
     </message>
     <message>
-        <source>Last month</source>
-        <translation>上個月</translation>
+        <source>The fee will be deducted from the amount being sent. The recipient will receive less bitcoins than you enter in the amount field. If multiple recipients are selected, the fee is split equally.</source>
+        <translation>手續費會從要付款出去的金額中扣掉。因此收款人會收到比輸入的金額還要少的 bitcoin。如果有多個收款人的話，手續費會平均分配來扣除。</translation>
     </message>
     <message>
-        <source>This year</source>
-        <translation>今年</translation>
+        <source>S&amp;ubtract fee from amount</source>
+        <translation>從付款金額減去手續費</translation>
     </message>
     <message>
-        <source>Range...</source>
-        <translation>指定範圍...</translation>
+        <source>Message:</source>
+        <translation>訊息:</translation>
     </message>
     <message>
-        <source>Received with</source>
-        <translation>收款</translation>
+        <source>This is an unauthenticated payment request.</source>
+        <translation>這是個沒有驗證過身份的付款要求。</translation>
     </message>
     <message>
-        <source>Sent to</source>
-        <translation>付款</translation>
+        <source>This is an authenticated payment request.</source>
+        <translation>這是個已經驗證過身份的付款要求。</translation>
     </message>
     <message>
-        <source>To yourself</source>
-        <translation>給自己</translation>
+        <source>Enter a label for this address to add it to the list of used addresses</source>
+        <translation>請輸入這個位址的標記，來把它加進去已使用過位址的清單。</translation>
     </message>
     <message>
-        <source>Mined</source>
-        <translation>開採所得</translation>
+        <source>A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
+        <translation>附加在 Bitcoin 付款協議的資源識別碼(URI)中的訊息，會和交易內容一起存起來，給你自己做參考。注意: 這個訊息不會送到 Bitcoin 網路上。</translation>
     </message>
     <message>
-        <source>Other</source>
-        <translation>其它</translation>
+        <source>Pay To:</source>
+        <translation>付給:</translation>
     </message>
     <message>
-        <source>Enter address or label to search</source>
-        <translation>請輸入要搜尋的位址或標記</translation>
+        <source>Memo:</source>
+        <translation>備註:</translation>
     </message>
+</context>
+<context>
+    <name>ShutdownWindow</name>
     <message>
-        <source>Min amount</source>
-        <translation>最小金額</translation>
+        <source>%1 is shutting down...</source>
+        <translation>正在關閉 %1 中...</translation>
     </message>
     <message>
-        <source>Copy address</source>
-        <translation>複製位址</translation>
+        <source>Do not shut down the computer until this window disappears.</source>
+        <translation> 在這個視窗不見以前，請不要關掉電腦。</translation>
     </message>
+</context>
+<context>
+    <name>SignVerifyMessageDialog</name>
     <message>
-        <source>Copy label</source>
-        <translation>複製標記</translation>
+        <source>Signatures - Sign / Verify a Message</source>
+        <translation>簽章 - 簽署或驗證訊息</translation>
     </message>
     <message>
-        <source>Copy amount</source>
-        <translation>複製金額</translation>
+        <source>&amp;Sign Message</source>
+        <translation>簽署訊息</translation>
     </message>
     <message>
-        <source>Copy transaction ID</source>
-        <translation>複製交易識別碼</translation>
+        <source>You can sign messages/agreements with your addresses to prove you can receive bitcoins sent to them. Be careful not to sign anything vague or random, as phishing attacks may try to trick you into signing your identity over to them. Only sign fully-detailed statements you agree to.</source>
+        <translation>你可以用自己的位址簽署訊息或合約，來證明你可以從該位址收款。但是請小心，不要簽署語意含糊不清，或隨機產生的內容，因為釣魚式詐騙可能會用騙你簽署的手法來冒充是你。只有在語句中的細節你都同意時才簽署。</translation>
     </message>
     <message>
-        <source>Copy raw transaction</source>
-        <translation>複製交易原始資料</translation>
+        <source>The Bitcoin address to sign the message with</source>
+        <translation>用來簽署訊息的 Bitcoin 位址</translation>
     </message>
     <message>
-        <source>Edit label</source>
-        <translation>編輯標記</translation>
+        <source>Choose previously used address</source>
+        <translation>選擇先前使用過的位址</translation>
     </message>
     <message>
-        <source>Show transaction details</source>
-        <translation>顯示交易明細</translation>
+        <source>Alt+A</source>
+        <translation>Alt+A</translation>
     </message>
     <message>
-        <source>Export Transaction History</source>
-        <translation>匯出交易記錄</translation>
+        <source>Paste address from clipboard</source>
+        <translation>貼上剪貼簿裡的位址</translation>
     </message>
     <message>
-        <source>Watch-only</source>
-        <translation>只能觀看的</translation>
+        <source>Alt+P</source>
+        <translation>Alt+P</translation>
     </message>
     <message>
-        <source>Exporting Failed</source>
-        <translation>匯出失敗</translation>
+        <source>Enter the message you want to sign here</source>
+        <translation>請在這裡輸入你想簽署的訊息</translation>
     </message>
     <message>
-        <source>There was an error trying to save the transaction history to %1.</source>
-        <translation>儲存交易記錄到 %1 時發生錯誤。</translation>
+        <source>Signature</source>
+        <translation>簽章</translation>
     </message>
     <message>
-        <source>Exporting Successful</source>
-        <translation>匯出成功</translation>
+        <source>Copy the current signature to the system clipboard</source>
+        <translation>複製目前的簽章到系統剪貼簿</translation>
     </message>
     <message>
-        <source>The transaction history was successfully saved to %1.</source>
-        <translation>交易記錄已經成功儲存到 %1 了。</translation>
+        <source>Sign the message to prove you own this Bitcoin address</source>
+        <translation>簽署這個訊息來證明這個 Bitcoin 位址是你的</translation>
     </message>
     <message>
-        <source>Comma separated file (*.csv)</source>
-        <translation>逗點分隔資料檔(*.csv)</translation>
+        <source>Sign &amp;Message</source>
+        <translation>簽署訊息</translation>
     </message>
     <message>
-        <source>Confirmed</source>
-        <translation>已確認</translation>
+        <source>Reset all sign message fields</source>
+        <translation>重設所有訊息簽署欄位</translation>
     </message>
     <message>
-        <source>Date</source>
-        <translation>日期</translation>
+        <source>Clear &amp;All</source>
+        <translation>全部清掉</translation>
     </message>
     <message>
-        <source>Type</source>
-        <translation>種類</translation>
+        <source>&amp;Verify Message</source>
+        <translation>驗證訊息</translation>
     </message>
     <message>
-        <source>Label</source>
-        <translation>標記</translation>
+        <source>Enter the receiver's address, message (ensure you copy line breaks, spaces, tabs, etc. exactly) and signature below to verify the message. Be careful not to read more into the signature than what is in the signed message itself, to avoid being tricked by a man-in-the-middle attack. Note that this only proves the signing party receives with the address, it cannot prove sendership of any transaction!</source>
+        <translation>請在下面輸入收款人的位址，訊息(請確定完整複製了所包含的換行，空格，跳位符號等等)，以及簽章，來驗證這個訊息。請小心，除了訊息內容以外，不要對簽章本身過度解讀，以避免被用「中間人攻擊法」詐騙。請注意，通過驗證的簽章只能證明簽章人確實可以從該位址收款，不能證明任何交易中的付款人身份！</translation>
     </message>
     <message>
-        <source>Address</source>
-        <translation>位址</translation>
+        <source>The Bitcoin address the message was signed with</source>
+        <translation>簽署這個訊息的 Bitcoin 位址</translation>
     </message>
     <message>
-        <source>ID</source>
-        <translation>識別碼</translation>
+        <source>Verify the message to ensure it was signed with the specified Bitcoin address</source>
+        <translation>驗證這個訊息來確定是用指定的 Bitcoin 位址簽署的</translation>
     </message>
     <message>
-        <source>Range:</source>
-        <translation>範圍:</translation>
+        <source>Verify &amp;Message</source>
+        <translation>驗證訊息</translation>
     </message>
     <message>
-        <source>to</source>
-        <translation>到</translation>
+        <source>Reset all verify message fields</source>
+        <translation>重設所有訊息驗證欄位</translation>
     </message>
 </context>
 <context>
-    <name>UnitDisplayStatusBarControl</name>
+    <name>SplashScreen</name>
     <message>
-        <source>Unit to show amounts in. Click to select another unit.</source>
-        <translation>金額顯示單位。可以點選其他單位。</translation>
+        <source>[testnet]</source>
+        <translation>[testnet]</translation>
     </message>
 </context>
 <context>
-    <name>WalletFrame</name>
+    <name>TrafficGraphWidget</name>
     <message>
-        <source>No wallet has been loaded.</source>
-        <translation>沒有載入錢包。</translation>
+        <source>KB/s</source>
+        <translation>KB/s</translation>
     </message>
 </context>
 <context>
-    <name>WalletModel</name>
+    <name>TransactionDescDialog</name>
     <message>
-        <source>Send Coins</source>
-        <translation>付款</translation>
+        <source>This pane shows a detailed description of the transaction</source>
+        <translation>這個版面顯示這次交易的詳細說明</translation>
     </message>
 </context>
 <context>
-    <name>WalletView</name>
-    <message>
-        <source>&amp;Export</source>
-        <translation>匯出</translation>
-    </message>
-    <message>
-        <source>Export the data in the current tab to a file</source>
-        <translation>把目前分頁的資料匯出存成檔案</translation>
-    </message>
-    <message>
-        <source>Backup Wallet</source>
-        <translation>備份錢包</translation>
-    </message>
-    <message>
-        <source>Wallet Data (*.dat)</source>
-        <translation>錢包資料檔(*.dat)</translation>
-    </message>
-    <message>
-        <source>Backup Failed</source>
-        <translation>備份失敗</translation>
-    </message>
-    <message>
-        <source>There was an error trying to save the wallet data to %1.</source>
-        <translation>儲存錢包資料到 %1 時發生錯誤。</translation>
-    </message>
-    <message>
-        <source>The wallet data was successfully saved to %1.</source>
-        <translation>錢包的資料已經成功儲存到 %1 了。</translation>
-    </message>
+    <name>UnitDisplayStatusBarControl</name>
     <message>
-        <source>Backup Successful</source>
-        <translation>備份成功</translation>
+        <source>Unit to show amounts in. Click to select another unit.</source>
+        <translation>金額顯示單位。可以點選其他單位。</translation>
     </message>
 </context>
 <context>
@@ -2928,14 +1759,6 @@
         <source>If &lt;category&gt; is not supplied or if &lt;category&gt; = 1, output all debugging information.</source>
         <translation>如果沒有提供 &lt;category&gt; 或是值為 1 就會輸出所有的除錯資訊。</translation>
     </message>
-    <message>
-        <source>Maximum total fees (in %s) to use in a single wallet transaction; setting this too low may abort large transactions (default: %s)</source>
-        <translation>一次錢包交易允許付出最高的總手續費(單位是 %s)；設定太低的話，可能會無法進行資料量大的交易(預設值: %s)</translation>
-    </message>
-    <message>
-        <source>Please check that your computer's date and time are correct! If your clock is wrong Bitcoin Core will not work properly.</source>
-        <translation>請檢查電腦日期和時間是否正確！Bitcoin Core 沒辦法在時鐘不準的情況下正常運作。</translation>
-    </message>
     <message>
         <source>Prune configured below the minimum of %d MiB.  Please use a higher number.</source>
         <translation>設定的修剪值小於最小需求的 %d 百萬位元組(MiB)。請指定大一點的數字。</translation>
@@ -2976,6 +1799,14 @@
         <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
         <translation>是否接受外來連線(預設值: 當沒有 -proxy 或 -connect 時為 1)</translation>
     </message>
+    <message>
+        <source>Bitcoin Core</source>
+        <translation>Bitcoin Core</translation>
+    </message>
+    <message>
+        <source>The %s developers</source>
+        <translation>%s 開發人員</translation>
+    </message>
     <message>
         <source>-fallbackfee is set very high! This is the transaction fee you may pay when fee estimates are not available.</source>
         <translation>警告: -fallbackfee 設定了很高的金額！這是當預估手續費還沒計算出來時，交易付款預設會付的手續費。</translation>
@@ -2992,6 +1823,10 @@
         <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source>
         <translation>和指定的位址繫結，並且一直在指定位址聽候連線。IPv6 請用 [主機]:通訊埠 這種格式</translation>
     </message>
+    <message>
+        <source>Cannot obtain a lock on data directory %s. %s is probably already running.</source>
+        <translation>沒辦法鎖定資料目錄 %s。%s 可能已經在執行了。</translation>
+    </message>
     <message>
         <source>Delete all wallet transactions and only recover those parts of the blockchain through -rescan on startup</source>
         <translation>清掉錢包裡的所有交易，並且在下次啟動時，使用 -rescan 來從區塊鏈中復原回來。</translation>
@@ -3000,6 +1835,14 @@
         <source>Distributed under the MIT software license, see the accompanying file COPYING or &lt;http://www.opensource.org/licenses/mit-license.php&gt;.</source>
         <translation>這套軟體是依據 MIT 軟體授權條款散布，詳情請見附帶的 COPYING 檔案，或是以下網站:  &lt;http://www.opensource.org/licenses/mit-license.php&gt;.</translation>
     </message>
+    <message>
+        <source>Error loading %s: You can't enable HD on a already existing non-HD wallet</source>
+        <translation>載入 %s 發生錯誤：不能對已存在的非 HD 錢包啟用 HD 功能。</translation>
+    </message>
+    <message>
+        <source>Error reading %s! All keys read correctly, but transaction data or address book entries might be missing or incorrect.</source>
+        <translation>讀取錢包檔 %s 時發生錯誤！所有的密鑰都正確讀取了，但是交易資料或位址簿資料可能會缺少或不正確。</translation>
+    </message>
     <message>
         <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source>
         <translation>當錢包有交易改變時要執行的指令(指令中的 %s 會被取代成交易識別碼)</translation>
@@ -3008,6 +1851,22 @@
         <source>Force relay of transactions from whitelisted peers even they violate local relay policy (default: %d)</source>
         <translation>強制轉發從白名點節點收到的交易，即使它們違反了本機的轉發準則(預設值: %d)</translation>
     </message>
+    <message>
+        <source>Maximum allowed median peer time offset adjustment. Local perspective of time may be influenced by peers forward or backward by this amount. (default: %u seconds)</source>
+        <translation>跟其他節點的時間差最高可接受的中位數值。本機所認為的時間可能會被其他節點影響，往前或往後在這個值之內。(預設值: %u 秒)</translation>
+    </message>
+    <message>
+        <source>Maximum total fees (in %s) to use in a single wallet transaction or raw transaction; setting this too low may abort large transactions (default: %s)</source>
+        <translation>允許一次錢包交易或未加工交易付出的最高總手續費(單位是 %s)；設定太低的話，可能會無法進行資料量大的交易(預設值: %s)</translation>
+    </message>
+    <message>
+        <source>Please check that your computer's date and time are correct! If your clock is wrong, %s will not work properly.</source>
+        <translation>請檢查電腦日期和時間是否正確！%s 沒辦法在時鐘不準的情況下正常運作。</translation>
+    </message>
+    <message>
+        <source>Please contribute if you find %s useful. Visit %s for further information about the software.</source>
+        <translation>如果你覺得 %s 有用，可以捐助我們。關於這個軟體的更多資訊請見 %s。</translation>
+    </message>
     <message>
         <source>Set the number of script verification threads (%u to %d, 0 = auto, &lt;0 = leave that many cores free, default: %d)</source>
         <translation>設定指令碼驗證的執行緒數目 (%u 到 %d，0 表示程式自動決定，小於 0 表示保留處理器核心不用的數目，預設值: %d)</translation>
@@ -3020,14 +1879,6 @@
         <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
         <translation>這是個還沒發表的測試版本 - 使用請自負風險 - 請不要用來開採或商業應用</translation>
     </message>
-    <message>
-        <source>Unable to bind to %s on this computer. Bitcoin Core is probably already running.</source>
-        <translation>沒辦法繫結在這台電腦上的 %s 。Bitcoin Core 可能已經在執行了。</translation>
-    </message>
-    <message>
-        <source>Unsupported argument -whitelistalwaysrelay ignored, use -whitelistrelay and/or -whitelistforcerelay.</source>
-        <translation>忽略不支援的參數 -whitelistalwaysrelay，請改用 -whitelistrelay 和 -whitelistforcerelay​ 的組合。</translation>
-    </message>
     <message>
         <source>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</source>
         <translation>是否要使用「通用即插即用」協定(UPnP)，來設定聽候連線的通訊埠的對應(預設值: 當有聽候連線且沒有指定 -proxy 參數時為 1)</translation>
@@ -3044,22 +1895,22 @@
         <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source>
         <translation>警告: 節點網路對於區塊鏈結的決定目前有分歧！看來有些礦工會有問題。</translation>
     </message>
-    <message>
-        <source>Warning: Unknown block versions being mined! It's possible unknown rules are in effect</source>
-        <translation>警告: 有礦工正在開採不明版本的區塊！這表示有不明的交易規則正在作用中</translation>
-    </message>
     <message>
         <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source>
         <translation>警告: 我們和某些連線的節點對於區塊鏈結的決定不同！你可能需要升級，或是需要等其它的節點升級。</translation>
     </message>
-    <message>
-        <source>Warning: wallet.dat corrupt, data salvaged! Original wallet.dat saved as wallet.{timestamp}.bak in %s; if your balance or transactions are incorrect you should restore from a backup.</source>
-        <translation>警告: 錢包檔 wallet.dat 壞掉，但資料被拯救回來了！原來的 wallet.dat 會改儲存在 %s, 檔名是 wallet.{timestamp}.bak. 如果餘額或交易資料有誤，你應該要用備份資料復原回來。</translation>
-    </message>
     <message>
         <source>Whitelist peers connecting from the given netmask or IP address. Can be specified multiple times.</source>
         <translation>把來自指定網域或位址的節點放進白名單。這個選項可以設定多次。</translation>
     </message>
+    <message>
+        <source>You need to rebuild the database using -reindex-chainstate to change -txindex</source>
+        <translation>改變 -txindex 參數後，必須要用 -reindex-chainstate 參數來重建資料庫</translation>
+    </message>
+    <message>
+        <source>%s corrupt, salvage failed</source>
+        <translation>錢包檔 %s 壞掉了，搶救失敗</translation>
+    </message>
     <message>
         <source>-maxmempool must be at least %d MB</source>
         <translation>參數 -maxmempool 至少要給 %d 百萬位元組(MB)</translation>
@@ -3072,10 +1923,22 @@
         <source>Append comment to the user agent string</source>
         <translation>對使用者代理字串添加註解</translation>
     </message>
+    <message>
+        <source>Attempt to recover private keys from a corrupt wallet on startup</source>
+        <translation>啟動時嘗試從壞掉的錢包檔復原密鑰</translation>
+    </message>
     <message>
         <source>Block creation options:</source>
         <translation>區塊製造選項:</translation>
     </message>
+    <message>
+        <source>Cannot resolve -%s address: '%s'</source>
+        <translation>沒辦法解析 -%s 參數指定的位址: '%s'</translation>
+    </message>
+    <message>
+        <source>Change index out of range</source>
+        <translation>找零的索引值超出範圍</translation>
+    </message>
     <message>
         <source>Connect only to the specified node(s)</source>
         <translation>只連線到指定節點(可多個)</translation>
@@ -3084,6 +1947,10 @@
         <source>Connection options:</source>
         <translation>連線選項:</translation>
     </message>
+    <message>
+        <source>Copyright (C) %i-%i</source>
+        <translation>版權所有 (C) %i-%i</translation>
+    </message>
     <message>
         <source>Corrupted block database detected</source>
         <translation>發現區塊資料庫壞掉了</translation>
@@ -3128,6 +1995,22 @@
         <source>Error initializing wallet database environment %s!</source>
         <translation>初始化錢包資料庫環境 %s 時發生錯誤！</translation>
     </message>
+    <message>
+        <source>Error loading %s</source>
+        <translation>載入檔案 %s 時發生錯誤</translation>
+    </message>
+    <message>
+        <source>Error loading %s: Wallet corrupted</source>
+        <translation>載入檔案 %s 時發生錯誤: 錢包損毀了</translation>
+    </message>
+    <message>
+        <source>Error loading %s: Wallet requires newer version of %s</source>
+        <translation>載入檔案 %s 時發生錯誤: 這個錢包需要新版的 %s</translation>
+    </message>
+    <message>
+        <source>Error loading %s: You can't disable HD on a already existing HD wallet</source>
+        <translation>載入 %s 發生錯誤：不能對已存在的 HD 錢包停用 HD 功能。</translation>
+    </message>
     <message>
         <source>Error loading block database</source>
         <translation>載入區塊資料庫時發生錯誤</translation>
@@ -3152,10 +2035,18 @@
         <source>Incorrect or no genesis block found. Wrong datadir for network?</source>
         <translation>創世區塊不正確或找不到。資料目錄錯了嗎？</translation>
     </message>
+    <message>
+        <source>Initialization sanity check failed. %s is shutting down.</source>
+        <translation>初始化時的基本檢查失敗了。%s 就要關閉了。</translation>
+    </message>
     <message>
         <source>Invalid -onion address: '%s'</source>
         <translation>無效的 -onion 位址: '%s'</translation>
     </message>
+    <message>
+        <source>Invalid amount for -%s=&lt;amount&gt;: '%s'</source>
+        <translation>參數 -%s=&lt;金額&gt; 指定的金額無效: '%s'</translation>
+    </message>
     <message>
         <source>Invalid amount for -fallbackfee=&lt;amount&gt;: '%s'</source>
         <translation>設定 -fallbackfee=&lt;金額&gt; 的金額無效: '%s'</translation>
@@ -3164,6 +2055,10 @@
         <source>Keep the transaction memory pool below &lt;n&gt; megabytes (default: %u)</source>
         <translation>在記憶體暫存池中保持最多 &lt;n&gt; 個百萬位元組的交易(預設值: %u)</translation>
     </message>
+    <message>
+        <source>Loading banlist...</source>
+        <translation>正在載入禁止連線名單中...</translation>
+    </message>
     <message>
         <source>Location of the auth cookie (default: data dir)</source>
         <translation>認證 cookie 資料的位置(預設值: 同資料目錄)</translation>
@@ -3180,6 +2075,10 @@
         <source>Only connect to nodes in network &lt;net&gt; (ipv4, ipv6 or onion)</source>
         <translation>只和 &lt;net&gt; 網路上的節點連線(ipv4, ipv6, 或 onion)</translation>
     </message>
+    <message>
+        <source>Print this help message and exit</source>
+        <translation>顯示說明訊息後結束</translation>
+    </message>
     <message>
         <source>Print version and exit</source>
         <translation>顯示版本後結束</translation>
@@ -3192,6 +2091,14 @@
         <source>Prune mode is incompatible with -txindex.</source>
         <translation>修剪模式和 -txindex 參數不相容。</translation>
     </message>
+    <message>
+        <source>Rebuild chain state and block index from the blk*.dat files on disk</source>
+        <translation>從磁碟裡的區塊檔 blk*.dat 重建區塊鏈狀態和區塊索引</translation>
+    </message>
+    <message>
+        <source>Rebuild chain state from the currently indexed blocks</source>
+        <translation>從目前已編索引的區塊資料重建區塊鏈狀態</translation>
+    </message>
     <message>
         <source>Set database cache size in megabytes (%d to %d, default: %d)</source>
         <translation>設定資料庫快取大小是多少百萬位元組(MB，範圍: %d 到 %d，預設值: %d)</translation>
@@ -3204,6 +2111,14 @@
         <source>Specify wallet file (within data directory)</source>
         <translation>指定錢包檔(會在資料目錄中)</translation>
     </message>
+    <message>
+        <source>The source code is available from %s.</source>
+        <translation>原始碼可以在 %s 取得。</translation>
+    </message>
+    <message>
+        <source>Unable to bind to %s on this computer. %s is probably already running.</source>
+        <translation>沒辦法繫結在這台電腦上的 %s 。%s 可能已經在執行了。</translation>
+    </message>
     <message>
         <source>Unsupported argument -benchmark ignored, use -debug=bench.</source>
         <translation>忽略了不再支援的 -benchmark 參數，請改用 -debug=bench</translation>
@@ -3237,12 +2152,16 @@
         <translation>錢包檔 %s 沒有在資料目錄 %s 裡面</translation>
     </message>
     <message>
-        <source>Wallet options:</source>
-        <translation>錢包選項:</translation>
+        <source>Wallet debugging/testing options:</source>
+        <translation>錢包除錯與測試選項:</translation>
+    </message>
+    <message>
+        <source>Wallet needed to be rewritten: restart %s to complete</source>
+        <translation>錢包需要重寫: 請重新啓動 %s 來完成</translation>
     </message>
     <message>
-        <source>You need to rebuild the database using -reindex to change -txindex</source>
-        <translation>改變 -txindex 參數後，必須要用 -reindex 參數來重建資料庫</translation>
+        <source>Wallet options:</source>
+        <translation>錢包選項:</translation>
     </message>
     <message>
         <source>Allow JSON-RPC connections from specified source. Valid for &lt;ip&gt; are a single IP (e.g. 1.2.3.4), a network/netmask (e.g. 1.2.3.4/255.255.255.0) or a network/CIDR (e.g. 1.2.3.4/24). This option can be specified multiple times</source>
@@ -3256,10 +2175,6 @@
         <source>Bind to given address to listen for JSON-RPC connections. Use [host]:port notation for IPv6. This option can be specified multiple times (default: bind to all interfaces)</source>
         <translation>和指定的位址繫結以聽候 JSON-RPC 連線。IPv6 請用 [主機]:通訊埠 這種格式。這個選項可以設定多次。(預設值: 跟所有網路界面上的位址繫結)</translation>
     </message>
-    <message>
-        <source>Cannot obtain a lock on data directory %s. Bitcoin Core is probably already running.</source>
-        <translation>沒辦法鎖定資料目錄 %s。Bitcoin Core 可能已經在執行了。</translation>
-    </message>
     <message>
         <source>Create new files with system default permissions, instead of umask 077 (only effective with disabled wallet functionality)</source>
         <translation>用系統預設權限來造出新的檔案，而不是用使用者權限罩遮(umask)值 077 (只有在關掉錢包功能時才有作用)。</translation>
@@ -3304,10 +2219,6 @@
         <source>Set maximum size of high-priority/low-fee transactions in bytes (default: %d)</source>
         <translation>設定高優先度或低手續費的交易資料大小上限成多少位元組(預設值: %d)</translation>
     </message>
-    <message>
-        <source>Set the number of threads for coin generation if enabled (-1 = all cores, default: %d)</source>
-        <translation>設定產生錢幣的執行緒數目(-1 表示處理器核心數，預設值: %d)</translation>
-    </message>
     <message>
         <source>The transaction amount is too small to send after the fee has been deducted</source>
         <translation>扣除手續費後的交易金額太少而不能傳送</translation>
@@ -3316,6 +2227,10 @@
         <source>This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit &lt;https://www.openssl.org/&gt; and cryptographic software written by Eric Young and UPnP software written by Thomas Bernard.</source>
         <translation>此產品也包含了由 OpenSSL Project 所開發的 OpenSSL Toolkit 軟體 &lt;https://www.openssl.org/&gt;, 和由 Eric Young 撰寫的加解密軟體，以及由 Thomas Bernard 所撰寫的 UPnP 軟體。</translation>
     </message>
+    <message>
+        <source>Use hierarchical deterministic key generation (HD) after BIP32. Only has effect during wallet creation/first start</source>
+        <translation>在 BIP32 開始作用後，啟用階層式可預期性密鑰產生方式(HD)。只有在產生新錢包或第一次啟動時才有作用。</translation>
+    </message>
     <message>
         <source>Whitelisted peers cannot be DoS banned and their transactions are always relayed, even if they are already in the mempool, useful e.g. for a gateway</source>
         <translation>在白名單中的節點不會因為偵測到阻斷服務攻擊(DoS)而被停用。來自這些節點的交易也一定會被轉發，即使說交易本來就在記憶池裡了也一樣。適用於像是閘道伺服器。</translation>
@@ -3332,34 +2247,14 @@
         <source>Accept public REST requests (default: %u)</source>
         <translation>接受公開的REST請求 (預設值: %u)</translation>
     </message>
-    <message>
-        <source>Activating best chain...</source>
-        <translation>啟用最佳鏈結...</translation>
-    </message>
-    <message>
-        <source>Attempt to recover private keys from a corrupt wallet.dat on startup</source>
-        <translation>啟動時嘗試從壞掉的錢包檔 wallet.dat 復原密鑰</translation>
-    </message>
     <message>
         <source>Automatically create Tor hidden service (default: %d)</source>
         <translation>自動產生 Tor 隱藏服務(預設值: %d)</translation>
     </message>
-    <message>
-        <source>Cannot resolve -whitebind address: '%s'</source>
-        <translation>沒辦法解析 -whitebind 指定的位址: '%s'</translation>
-    </message>
     <message>
         <source>Connect through SOCKS5 proxy</source>
         <translation>透過 SOCKS5 代理伺服器連線</translation>
     </message>
-    <message>
-        <source>Copyright (C) 2009-%i The Bitcoin Core Developers</source>
-        <translation>版權為 Bitcoin Core 開發人員自西元 2009 至 %i 年起所有</translation>
-    </message>
-    <message>
-        <source>Error loading wallet.dat: Wallet requires newer version of Bitcoin Core</source>
-        <translation>載入 wallet.dat 檔案時發生錯誤: 這個錢包需要新版的 Bitcoin Core</translation>
-    </message>
     <message>
         <source>Error reading from database, shutting down.</source>
         <translation>讀取資料庫時發生錯誤，要關閉了。</translation>
@@ -3372,22 +2267,6 @@
         <source>Information</source>
         <translation>資訊</translation>
     </message>
-    <message>
-        <source>Initialization sanity check failed. Bitcoin Core is shutting down.</source>
-        <translation>初始化時的基本檢查失敗了。Bitcoin Core 就要關閉了。</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -maxtxfee=&lt;amount&gt;: '%s'</source>
-        <translation>-maxtxfee=&lt;amount&gt;: '%s' 的金額無效</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -minrelaytxfee=&lt;amount&gt;: '%s'</source>
-        <translation>設定最低轉發手續費 -minrelaytxfee=&lt;金額&gt; 的金額無效: '%s'</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -mintxfee=&lt;amount&gt;: '%s'</source>
-        <translation>設定 -mintxfee=&lt;金額&gt; 的金額無效: '%s'</translation>
-    </message>
     <message>
         <source>Invalid amount for -paytxfee=&lt;amount&gt;: '%s' (must be at least %s)</source>
         <translation>設定 -paytxfee=&lt;金額&gt; 的金額無效: '%s' (至少要有 %s)</translation>
@@ -3412,14 +2291,6 @@
         <source>RPC server options:</source>
         <translation>RPC 伺服器選項:</translation>
     </message>
-    <message>
-        <source>Rebuild block chain index from current blk000??.dat files on startup</source>
-        <translation>啟動時從目前的區塊檔 blk000??.dat 重建區塊鏈的索引</translation>
-    </message>
-    <message>
-        <source>Receive and display P2P network alerts (default: %u)</source>
-        <translation>接收並顯示對等網路(P2P)警示 (預設值: %u)</translation>
-    </message>
     <message>
         <source>Reducing -maxconnections from %d to %d, because of system limitations.</source>
         <translation>因為系統的限制，將 -maxconnections 參數從 %d 降到了 %d</translation>
@@ -3492,10 +2363,6 @@
         <source>Username for JSON-RPC connections</source>
         <translation>JSON-RPC 連線使用者名稱</translation>
     </message>
-    <message>
-        <source>Wallet needed to be rewritten: restart Bitcoin Core to complete</source>
-        <translation>錢包需要重寫: 請重新啓動 Bitcoin Core 來完成</translation>
-    </message>
     <message>
         <source>Warning</source>
         <translation>警告</translation>
@@ -3516,10 +2383,6 @@
         <source>ZeroMQ notification options:</source>
         <translation>ZeroMQ 通知選項:</translation>
     </message>
-    <message>
-        <source>wallet.dat corrupt, salvage failed</source>
-        <translation>錢包檔 weallet.dat 壞掉了，拯救失敗</translation>
-    </message>
     <message>
         <source>Password for JSON-RPC connections</source>
         <translation>JSON-RPC 連線密碼</translation>
@@ -3528,10 +2391,6 @@
         <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
         <translation>當最新區塊改變時要執行的指令(指令中的 %s 會被取代成區塊雜湊值)</translation>
     </message>
-    <message>
-        <source>This help message</source>
-        <translation>這些說明訊息</translation>
-    </message>
     <message>
         <source>Allow DNS lookups for -addnode, -seednode and -connect</source>
         <translation>允許對 -addnode, -seednode, -connect 的參數使用域名查詢 </translation>
@@ -3540,10 +2399,6 @@
         <source>Loading addresses...</source>
         <translation>正在載入位址資料...</translation>
     </message>
-    <message>
-        <source>Error loading wallet.dat: Wallet corrupted</source>
-        <translation>載入檔案 wallet.dat 時發生錯誤: 錢包損毀了</translation>
-    </message>
     <message>
         <source>(1 = keep tx meta data e.g. account owner and payment request information, 2 = drop tx meta data)</source>
         <translation>(1 表示保留交易描述資料，像是帳戶使用者和付款請求資訊；2 表示丟掉交易描述資料)</translation>
@@ -3560,10 +2415,6 @@
         <source>Do not keep transactions in the mempool longer than &lt;n&gt; hours (default: %u)</source>
         <translation>不要讓交易留在記憶池中超過 &lt;n&gt; 個小時(預設值: %u)</translation>
     </message>
-    <message>
-        <source>Error reading wallet.dat! All keys read correctly, but transaction data or address book entries might be missing or incorrect.</source>
-        <translation>讀取錢包檔 wallet.dat 時發生錯誤！所有的密鑰都正確讀取了，但是交易資料或位址簿資料可能會缺少或不正確。</translation>
-    </message>
     <message>
         <source>Fees (in %s/kB) smaller than this are considered zero fee for transaction creation (default: %s)</source>
         <translation>當製造交易時，如果每千位元組(kB)的手續費比這個值(單位是 %s)低，就視為沒付手續費(預設值: %s)</translation>
@@ -3600,6 +2451,10 @@
         <source>Unsupported argument -socks found. Setting SOCKS version isn't possible anymore, only SOCKS5 proxies are supported.</source>
         <translation>找到不再支援的 -socks 參數。現在只支援 SOCKS5 協定的代理伺服器，因此不可以指定 SOCKS 協定版本了。</translation>
     </message>
+    <message>
+        <source>Unsupported argument -whitelistalwaysrelay ignored, use -whitelistrelay and/or -whitelistforcerelay.</source>
+        <translation>忽略不支援的參數 -whitelistalwaysrelay，請改用 -whitelistrelay 和 -whitelistforcerelay​ 的組合。</translation>
+    </message>
     <message>
         <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: %s)</source>
         <translation>使用另外的 SOCK5 代理伺服器，來透過 Tor 隱藏服務跟其他節點聯絡(預設值: %s)</translation>
@@ -3609,20 +2464,20 @@
         <translation>JSON-RPC 連線要用的使用者名稱和雜湊密碼。&lt;userpw&gt; 的格式是：&lt;使用者名稱&gt;:&lt;調味值&gt;$&lt;雜湊值&gt;。在 share/rpcuser 目錄下有一個示範的 python 程式。這個選項可以給很多次。</translation>
     </message>
     <message>
-        <source>(default: %s)</source>
-        <translation>(預設值: %s)</translation>
+        <source>Warning: Unknown block versions being mined! It's possible unknown rules are in effect</source>
+        <translation>警告: 有礦工正在開採不明版本的區塊！這表示有不明的交易規則正在作用中</translation>
     </message>
     <message>
-        <source>Always query for peer addresses via DNS lookup (default: %u)</source>
-        <translation>是否一定要用域名查詢來搜尋節點(預設值: %u)</translation>
+        <source>Warning: Wallet file corrupt, data salvaged! Original %s saved as %s in %s; if your balance or transactions are incorrect you should restore from a backup.</source>
+        <translation>警告: 錢包檔壞掉，但資料被救回來了！原來的檔案 %s 改儲存為 %s，在目錄 %s 下。 如果餘額或交易資料有誤的話，你應該要從備份資料復原回來。</translation>
     </message>
     <message>
-        <source>Error loading wallet.dat</source>
-        <translation>載入錢包檔 wallet.dat 時發生錯誤</translation>
+        <source>(default: %s)</source>
+        <translation>(預設值: %s)</translation>
     </message>
     <message>
-        <source>Generate coins (default: %u)</source>
-        <translation>生產錢幣(預設值: %u)</translation>
+        <source>Always query for peer addresses via DNS lookup (default: %u)</source>
+        <translation>是否一定要用域名查詢來搜尋節點(預設值: %u)</translation>
     </message>
     <message>
         <source>How many blocks to check at startup (default: %u, 0 = all)</source>
@@ -3708,18 +2563,6 @@
         <source>Unknown network specified in -onlynet: '%s'</source>
         <translation>在 -onlynet 指定了不明的網路別: '%s'</translation>
     </message>
-    <message>
-        <source>Cannot resolve -bind address: '%s'</source>
-        <translation>沒辦法解析 -bind 位址: '%s'</translation>
-    </message>
-    <message>
-        <source>Cannot resolve -externalip address: '%s'</source>
-        <translation>沒辦法解析 -externalip 位址: '%s'</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -paytxfee=&lt;amount&gt;: '%s'</source>
-        <translation>設定 -paytxfee=&lt;金額&gt; 的金額無效: '%s'</translation>
-    </message>
     <message>
         <source>Insufficient funds</source>
         <translation>累積金額不足</translation>

From 7b01ce254cfa0e8ae7e57a72c57e8ae89f3c1829 Mon Sep 17 00:00:00 2001
From: Matthew King <chohag@jtan.com>
Date: Tue, 28 Jun 2016 12:54:30 +0300
Subject: [PATCH 0581/1802] Favour python over python2 as per PR #7723

---
 contrib/devtools/security-check.py | 2 +-
 contrib/devtools/symbol-check.py   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/contrib/devtools/security-check.py b/contrib/devtools/security-check.py
index 24e44cf5d8628..c61d652641767 100755
--- a/contrib/devtools/security-check.py
+++ b/contrib/devtools/security-check.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 '''
 Perform basic ELF security checks on a series of executables.
 Exit status will be 0 if successful, and the program will be silent.
diff --git a/contrib/devtools/symbol-check.py b/contrib/devtools/symbol-check.py
index 8c064a1822b00..8f8685006e115 100755
--- a/contrib/devtools/symbol-check.py
+++ b/contrib/devtools/symbol-check.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 # Copyright (c) 2014 Wladimir J. van der Laan
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.

From 36f1b9df762f4819e67e060e1624911df9bd59de Mon Sep 17 00:00:00 2001
From: Suhas Daftuar <sdaftuar@gmail.com>
Date: Tue, 28 Jun 2016 10:32:09 -0400
Subject: [PATCH 0582/1802] Tests: Increase sync_blocks() timeouts in
 pruning.py

---
 qa/rpc-tests/pruning.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/qa/rpc-tests/pruning.py b/qa/rpc-tests/pruning.py
index d225e29b500f2..7cbe69c29b2b9 100755
--- a/qa/rpc-tests/pruning.py
+++ b/qa/rpc-tests/pruning.py
@@ -151,14 +151,14 @@ def reorg_test(self):
         print("Reconnect nodes")
         connect_nodes(self.nodes[0], 1)
         connect_nodes(self.nodes[2], 1)
-        sync_blocks(self.nodes[0:3])
+        sync_blocks(self.nodes[0:3], timeout=120)
 
         print("Verify height on node 2:",self.nodes[2].getblockcount())
         print("Usage possibly still high bc of stale blocks in block files:", calc_usage(self.prunedir))
 
         print("Mine 220 more blocks so we have requisite history (some blocks will be big and cause pruning of previous chain)")
         self.nodes[0].generate(220) #node 0 has many large tx's in its mempool from the disconnects
-        sync_blocks(self.nodes[0:3])
+        sync_blocks(self.nodes[0:3], timeout=300)
 
         usage = calc_usage(self.prunedir)
         print("Usage should be below target:", usage)

From 14d01309bed59afb08651f2b701ff90371b15b20 Mon Sep 17 00:00:00 2001
From: BtcDrak <btcdrak@gmail.com>
Date: Tue, 16 Feb 2016 18:29:53 +0000
Subject: [PATCH 0583/1802] Rename OP_NOP3 to OP_CHECKSEQUENCEVERIFY

---
 doc/release-notes.md                  |  7 +++-
 qa/rpc-tests/test_framework/script.py |  8 ++--
 src/script/script.cpp                 |  2 +-
 src/script/script.h                   |  4 +-
 src/test/data/script_tests.json       | 24 ++++++------
 src/test/data/tx_invalid.json         | 28 +++++++-------
 src/test/data/tx_valid.json           | 56 +++++++++++++--------------
 7 files changed, 66 insertions(+), 63 deletions(-)

diff --git a/doc/release-notes.md b/doc/release-notes.md
index 6e4f390cbcc75..e1f3e2427ea8d 100644
--- a/doc/release-notes.md
+++ b/doc/release-notes.md
@@ -113,12 +113,15 @@ git merge commit are mentioned.
 
 ### RPC and REST
 
-Asm script outputs now contain OP_CHECKLOCKTIMEVERIFY in place of OP_NOP2
--------------------------------------------------------------------------
+Asm script outputs replacements for OP_NOP2 and OP_NOP3
+-------------------------------------------------------
 
 OP_NOP2 has been renamed to OP_CHECKLOCKTIMEVERIFY by [BIP 
 65](https://github.com/bitcoin/bips/blob/master/bip-0065.mediawiki)
 
+OP_NOP3 has been renamed to OP_CHECKSEQUENCEVERIFY by [BIP 
+112](https://github.com/bitcoin/bips/blob/master/bip-0112.mediawiki)
+
 The following outputs are affected by this change:
 - RPC `getrawtransaction` (in verbose mode)
 - RPC `decoderawtransaction`
diff --git a/qa/rpc-tests/test_framework/script.py b/qa/rpc-tests/test_framework/script.py
index 7678228c42bb5..b46c643ccb114 100644
--- a/qa/rpc-tests/test_framework/script.py
+++ b/qa/rpc-tests/test_framework/script.py
@@ -233,7 +233,7 @@ def __new__(cls, n):
 # expansion
 OP_NOP1 = CScriptOp(0xb0)
 OP_CHECKLOCKTIMEVERIFY = CScriptOp(0xb1)
-OP_NOP3 = CScriptOp(0xb2)
+OP_CHECKSEQUENCEVERIFY = CScriptOp(0xb2)
 OP_NOP4 = CScriptOp(0xb3)
 OP_NOP5 = CScriptOp(0xb4)
 OP_NOP6 = CScriptOp(0xb5)
@@ -360,7 +360,7 @@ def __new__(cls, n):
 
     OP_NOP1,
     OP_CHECKLOCKTIMEVERIFY,
-    OP_NOP3,
+    OP_CHECKSEQUENCEVERIFY,
     OP_NOP4,
     OP_NOP5,
     OP_NOP6,
@@ -479,7 +479,7 @@ def __new__(cls, n):
     OP_CHECKMULTISIGVERIFY : 'OP_CHECKMULTISIGVERIFY',
     OP_NOP1 : 'OP_NOP1',
     OP_CHECKLOCKTIMEVERIFY : 'OP_CHECKLOCKTIMEVERIFY',
-    OP_NOP3 : 'OP_NOP3',
+    OP_CHECKSEQUENCEVERIFY : 'OP_CHECKSEQUENCEVERIFY',
     OP_NOP4 : 'OP_NOP4',
     OP_NOP5 : 'OP_NOP5',
     OP_NOP6 : 'OP_NOP6',
@@ -598,7 +598,7 @@ def __new__(cls, n):
     'OP_CHECKMULTISIGVERIFY' : OP_CHECKMULTISIGVERIFY,
     'OP_NOP1' : OP_NOP1,
     'OP_CHECKLOCKTIMEVERIFY' : OP_CHECKLOCKTIMEVERIFY,
-    'OP_NOP3' : OP_NOP3,
+    'OP_CHECKSEQUENCEVERIFY' : OP_CHECKSEQUENCEVERIFY,
     'OP_NOP4' : OP_NOP4,
     'OP_NOP5' : OP_NOP5,
     'OP_NOP6' : OP_NOP6,
diff --git a/src/script/script.cpp b/src/script/script.cpp
index da551c23ee678..ddf6775569421 100644
--- a/src/script/script.cpp
+++ b/src/script/script.cpp
@@ -132,7 +132,7 @@ const char* GetOpName(opcodetype opcode)
     // expanson
     case OP_NOP1                   : return "OP_NOP1";
     case OP_CHECKLOCKTIMEVERIFY    : return "OP_CHECKLOCKTIMEVERIFY";
-    case OP_NOP3                   : return "OP_NOP3";
+    case OP_CHECKSEQUENCEVERIFY    : return "OP_CHECKSEQUENCEVERIFY";
     case OP_NOP4                   : return "OP_NOP4";
     case OP_NOP5                   : return "OP_NOP5";
     case OP_NOP6                   : return "OP_NOP6";
diff --git a/src/script/script.h b/src/script/script.h
index 71af3754bcd17..278774d32e3ed 100644
--- a/src/script/script.h
+++ b/src/script/script.h
@@ -167,8 +167,8 @@ enum opcodetype
     OP_NOP1 = 0xb0,
     OP_CHECKLOCKTIMEVERIFY = 0xb1,
     OP_NOP2 = OP_CHECKLOCKTIMEVERIFY,
-    OP_NOP3 = 0xb2,
-    OP_CHECKSEQUENCEVERIFY = OP_NOP3,
+    OP_CHECKSEQUENCEVERIFY = 0xb2,
+    OP_NOP3 = OP_CHECKSEQUENCEVERIFY,
     OP_NOP4 = 0xb3,
     OP_NOP5 = 0xb4,
     OP_NOP6 = 0xb5,
diff --git a/src/test/data/script_tests.json b/src/test/data/script_tests.json
index 9b81e0c77ddf7..fcd5457386dda 100644
--- a/src/test/data/script_tests.json
+++ b/src/test/data/script_tests.json
@@ -232,8 +232,8 @@
 ["'abcdefghijklmnopqrstuvwxyz'", "HASH256 0x4c 0x20 0xca139bc10c2f660da42666f72e89a225936fc60f193c161124a672050c434671 EQUAL", "P2SH,STRICTENC", "OK"],
 
 
-["1","NOP1 CHECKLOCKTIMEVERIFY NOP3 NOP4 NOP5 NOP6 NOP7 NOP8 NOP9 NOP10 1 EQUAL", "P2SH,STRICTENC", "OK"],
-["'NOP_1_to_10' NOP1 CHECKLOCKTIMEVERIFY NOP3 NOP4 NOP5 NOP6 NOP7 NOP8 NOP9 NOP10","'NOP_1_to_10' 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"],
 
@@ -443,7 +443,7 @@
 
 ["NOP", "NOP1 1", "P2SH,STRICTENC", "OK"],
 ["NOP", "CHECKLOCKTIMEVERIFY 1", "P2SH,STRICTENC", "OK"],
-["NOP", "NOP3 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"],
@@ -701,7 +701,7 @@
 ["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", "NOP3", "CHECKSEQUENCEVERIFY", "OK", "CSV passes if stack top bit 1 << 31 is set"],
+["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."],
@@ -857,13 +857,13 @@
 ["2 2 LSHIFT", "8 EQUAL", "P2SH,STRICTENC", "DISABLED_OPCODE", "disabled"],
 ["2 1 RSHIFT", "1 EQUAL", "P2SH,STRICTENC", "DISABLED_OPCODE", "disabled"],
 
-["1", "NOP1 CHECKLOCKTIMEVERIFY NOP3 NOP4 NOP5 NOP6 NOP7 NOP8 NOP9 NOP10 2 EQUAL", "P2SH,STRICTENC", "EVAL_FALSE"],
-["'NOP_1_to_10' NOP1 CHECKLOCKTIMEVERIFY NOP3 NOP4 NOP5 NOP6 NOP7 NOP8 NOP9 NOP10","'NOP_1_to_11' EQUAL", "P2SH,STRICTENC", "EVAL_FALSE"],
+["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", "NOP3",  "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"],
@@ -2119,11 +2119,11 @@
 ],
 
 ["CHECKSEQUENCEVERIFY tests"], 
-["", "NOP3", "CHECKSEQUENCEVERIFY", "INVALID_STACK_OPERATION", "CSV automatically fails on a empty stack"],
-["-1", "NOP3", "CHECKSEQUENCEVERIFY", "NEGATIVE_LOCKTIME", "CSV automatically fails if stack top is negative"],
-["0x0100", "NOP3", "CHECKSEQUENCEVERIFY,MINIMALDATA", "UNKNOWN_ERROR", "CSV fails if stack top is not minimally encoded"],
-["0", "NOP3", "CHECKSEQUENCEVERIFY", "UNSATISFIED_LOCKTIME", "CSV fails if stack top bit 1 << 31 is set and the tx version < 2"],
-["4294967296", "NOP3", "CHECKSEQUENCEVERIFY", "UNSATISFIED_LOCKTIME",
+["", "CHECKSEQUENCEVERIFY", "CHECKSEQUENCEVERIFY", "INVALID_STACK_OPERATION", "CSV automatically fails on a 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/src/test/data/tx_invalid.json b/src/test/data/tx_invalid.json
index 05502a83f73b1..f8baee05779c3 100644
--- a/src/test/data/tx_invalid.json
+++ b/src/test/data/tx_invalid.json
@@ -200,41 +200,41 @@
 ["CHECKSEQUENCEVERIFY tests"],
 
 ["By-height locks, with argument just beyond txin.nSequence"],
-[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "1 NOP3 1"]],
+[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "1 CHECKSEQUENCEVERIFY 1"]],
 "020000000100010000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000", "P2SH,CHECKSEQUENCEVERIFY"],
-[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "4259839 NOP3 1"]],
+[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "4259839 CHECKSEQUENCEVERIFY 1"]],
 "020000000100010000000000000000000000000000000000000000000000000000000000000000000000feff40000100000000000000000000000000", "P2SH,CHECKSEQUENCEVERIFY"],
 
 ["By-time locks, with argument just beyond txin.nSequence (but within numerical boundries)"],
-[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "4194305 NOP3 1"]],
+[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "4194305 CHECKSEQUENCEVERIFY 1"]],
 "020000000100010000000000000000000000000000000000000000000000000000000000000000000000000040000100000000000000000000000000", "P2SH,CHECKSEQUENCEVERIFY"],
-[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "4259839 NOP3 1"]],
+[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "4259839 CHECKSEQUENCEVERIFY 1"]],
 "020000000100010000000000000000000000000000000000000000000000000000000000000000000000feff40000100000000000000000000000000", "P2SH,CHECKSEQUENCEVERIFY"],
 
 ["Argument missing"],
-[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "NOP3 1"]],
+[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "CHECKSEQUENCEVERIFY 1"]],
 "020000000100010000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000", "P2SH,CHECKSEQUENCEVERIFY"],
 
 ["Argument negative with by-blockheight txin.nSequence=0"],
-[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "-1 NOP3 1"]],
+[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "-1 CHECKSEQUENCEVERIFY 1"]],
 "020000000100010000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000", "P2SH,CHECKSEQUENCEVERIFY"],
 
 ["Argument negative with by-blocktime txin.nSequence=CTxIn::SEQUENCE_LOCKTIME_TYPE_FLAG"],
-[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "-1 NOP3 1"]],
+[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "-1 CHECKSEQUENCEVERIFY 1"]],
 "020000000100010000000000000000000000000000000000000000000000000000000000000000000000000040000100000000000000000000000000", "P2SH,CHECKSEQUENCEVERIFY"],
 
 ["Argument/tx height/time mismatch, both versions"],
-[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "0 NOP3 1"]],
+[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "0 CHECKSEQUENCEVERIFY 1"]],
 "020000000100010000000000000000000000000000000000000000000000000000000000000000000000000040000100000000000000000000000000", "P2SH,CHECKSEQUENCEVERIFY"],
-[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "65535 NOP3 1"]],
+[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "65535 CHECKSEQUENCEVERIFY 1"]],
 "020000000100010000000000000000000000000000000000000000000000000000000000000000000000000040000100000000000000000000000000", "P2SH,CHECKSEQUENCEVERIFY"],
-[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "4194304 NOP3 1"]],
+[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "4194304 CHECKSEQUENCEVERIFY 1"]],
 "020000000100010000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000", "P2SH,CHECKSEQUENCEVERIFY"],
-[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "4259839 NOP3 1"]],
+[[["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 NOP3 1"]],
+[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "0x06 0x000000000000 CHECKSEQUENCEVERIFY 1"]],
 "020000000100010000000000000000000000000000000000000000000000000000000000000000000000ffff00000100000000000000000000000000", "P2SH,CHECKSEQUENCEVERIFY"],
 
 ["Failure due to failing CHECKSEQUENCEVERIFY in scriptSig"],
@@ -246,9 +246,9 @@
 "0200000001000100000000000000000000000000000000000000000000000000000000000000000000030251b2000000000100000000000000000000000000", "P2SH,CHECKSEQUENCEVERIFY"],
 
 ["Failure due to insufficient tx.nVersion (<2)"],
-[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "0 NOP3 1"]],
+[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "0 CHECKSEQUENCEVERIFY 1"]],
 "010000000100010000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000", "P2SH,CHECKSEQUENCEVERIFY"],
-[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "4194304 NOP3 1"]],
+[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "4194304 CHECKSEQUENCEVERIFY 1"]],
 "010000000100010000000000000000000000000000000000000000000000000000000000000000000000000040000100000000000000000000000000", "P2SH,CHECKSEQUENCEVERIFY"],
 
 ["Unknown witness program version (with DISCOURAGE_UPGRADABLE_WITNESS_PROGRAM)"],
diff --git a/src/test/data/tx_valid.json b/src/test/data/tx_valid.json
index c9fe4e313a2eb..1ea70135b437b 100644
--- a/src/test/data/tx_valid.json
+++ b/src/test/data/tx_valid.json
@@ -236,77 +236,77 @@
 ["CHECKSEQUENCEVERIFY tests"],
 
 ["By-height locks, with argument == 0 and == txin.nSequence"],
-[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "0 NOP3 1"]],
+[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "0 CHECKSEQUENCEVERIFY 1"]],
 "020000000100010000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000", "P2SH,CHECKSEQUENCEVERIFY"],
-[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "65535 NOP3 1"]],
+[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "65535 CHECKSEQUENCEVERIFY 1"]],
 "020000000100010000000000000000000000000000000000000000000000000000000000000000000000ffff00000100000000000000000000000000", "P2SH,CHECKSEQUENCEVERIFY"],
-[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "65535 NOP3 1"]],
+[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "65535 CHECKSEQUENCEVERIFY 1"]],
 "020000000100010000000000000000000000000000000000000000000000000000000000000000000000ffffbf7f0100000000000000000000000000", "P2SH,CHECKSEQUENCEVERIFY"],
-[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "0 NOP3 1"]],
+[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "0 CHECKSEQUENCEVERIFY 1"]],
 "020000000100010000000000000000000000000000000000000000000000000000000000000000000000ffffbf7f0100000000000000000000000000", "P2SH,CHECKSEQUENCEVERIFY"],
 
 ["By-time locks, with argument == 0 and == txin.nSequence"],
-[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "4194304 NOP3 1"]],
+[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "4194304 CHECKSEQUENCEVERIFY 1"]],
 "020000000100010000000000000000000000000000000000000000000000000000000000000000000000000040000100000000000000000000000000", "P2SH,CHECKSEQUENCEVERIFY"],
-[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "4259839 NOP3 1"]],
+[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "4259839 CHECKSEQUENCEVERIFY 1"]],
 "020000000100010000000000000000000000000000000000000000000000000000000000000000000000ffff40000100000000000000000000000000", "P2SH,CHECKSEQUENCEVERIFY"],
-[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "4259839 NOP3 1"]],
+[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "4259839 CHECKSEQUENCEVERIFY 1"]],
 "020000000100010000000000000000000000000000000000000000000000000000000000000000000000ffffff7f0100000000000000000000000000", "P2SH,CHECKSEQUENCEVERIFY"],
-[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "4194304 NOP3 1"]],
+[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "4194304 CHECKSEQUENCEVERIFY 1"]],
 "020000000100010000000000000000000000000000000000000000000000000000000000000000000000ffffff7f0100000000000000000000000000", "P2SH,CHECKSEQUENCEVERIFY"],
 
 ["Upper sequence with upper sequence is fine"],
-[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "2147483648 NOP3 1"]],
+[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "2147483648 CHECKSEQUENCEVERIFY 1"]],
 "020000000100010000000000000000000000000000000000000000000000000000000000000000000000000000800100000000000000000000000000", "P2SH,CHECKSEQUENCEVERIFY"],
-[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "4294967295 NOP3 1"]],
+[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "4294967295 CHECKSEQUENCEVERIFY 1"]],
 "020000000100010000000000000000000000000000000000000000000000000000000000000000000000000000800100000000000000000000000000", "P2SH,CHECKSEQUENCEVERIFY"],
-[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "2147483648 NOP3 1"]],
+[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "2147483648 CHECKSEQUENCEVERIFY 1"]],
 "020000000100010000000000000000000000000000000000000000000000000000000000000000000000feffffff0100000000000000000000000000", "P2SH,CHECKSEQUENCEVERIFY"],
-[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "4294967295 NOP3 1"]],
+[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "4294967295 CHECKSEQUENCEVERIFY 1"]],
 "020000000100010000000000000000000000000000000000000000000000000000000000000000000000feffffff0100000000000000000000000000", "P2SH,CHECKSEQUENCEVERIFY"],
-[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "2147483648 NOP3 1"]],
+[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "2147483648 CHECKSEQUENCEVERIFY 1"]],
 "020000000100010000000000000000000000000000000000000000000000000000000000000000000000ffffffff0100000000000000000000000000", "P2SH,CHECKSEQUENCEVERIFY"],
-[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "4294967295 NOP3 1"]],
+[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "4294967295 CHECKSEQUENCEVERIFY 1"]],
 "020000000100010000000000000000000000000000000000000000000000000000000000000000000000ffffffff0100000000000000000000000000", "P2SH,CHECKSEQUENCEVERIFY"],
 
 ["Argument 2^31 with various nSequence"],
-[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "2147483648 NOP3 1"]],
+[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "2147483648 CHECKSEQUENCEVERIFY 1"]],
 "020000000100010000000000000000000000000000000000000000000000000000000000000000000000ffffbf7f0100000000000000000000000000", "P2SH,CHECKSEQUENCEVERIFY"],
-[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "2147483648 NOP3 1"]],
+[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "2147483648 CHECKSEQUENCEVERIFY 1"]],
 "020000000100010000000000000000000000000000000000000000000000000000000000000000000000ffffff7f0100000000000000000000000000", "P2SH,CHECKSEQUENCEVERIFY"],
-[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "2147483648 NOP3 1"]],
+[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "2147483648 CHECKSEQUENCEVERIFY 1"]],
 "020000000100010000000000000000000000000000000000000000000000000000000000000000000000ffffffff0100000000000000000000000000", "P2SH,CHECKSEQUENCEVERIFY"],
 
 ["Argument 2^32-1 with various nSequence"],
-[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "4294967295 NOP3 1"]],
+[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "4294967295 CHECKSEQUENCEVERIFY 1"]],
 "020000000100010000000000000000000000000000000000000000000000000000000000000000000000ffffbf7f0100000000000000000000000000", "P2SH,CHECKSEQUENCEVERIFY"],
-[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "4294967295 NOP3 1"]],
+[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "4294967295 CHECKSEQUENCEVERIFY 1"]],
 "020000000100010000000000000000000000000000000000000000000000000000000000000000000000ffffff7f0100000000000000000000000000", "P2SH,CHECKSEQUENCEVERIFY"],
-[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "4294967295 NOP3 1"]],
+[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "4294967295 CHECKSEQUENCEVERIFY 1"]],
 "020000000100010000000000000000000000000000000000000000000000000000000000000000000000ffffffff0100000000000000000000000000", "P2SH,CHECKSEQUENCEVERIFY"],
 
 ["Argument 3<<31 with various nSequence"],
-[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "6442450944 NOP3 1"]],
+[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "6442450944 CHECKSEQUENCEVERIFY 1"]],
 "020000000100010000000000000000000000000000000000000000000000000000000000000000000000ffffbf7f0100000000000000000000000000", "P2SH,CHECKSEQUENCEVERIFY"],
-[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "6442450944 NOP3 1"]],
+[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "6442450944 CHECKSEQUENCEVERIFY 1"]],
 "020000000100010000000000000000000000000000000000000000000000000000000000000000000000ffffff7f0100000000000000000000000000", "P2SH,CHECKSEQUENCEVERIFY"],
-[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "6442450944 NOP3 1"]],
+[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "6442450944 CHECKSEQUENCEVERIFY 1"]],
 "020000000100010000000000000000000000000000000000000000000000000000000000000000000000ffffffff0100000000000000000000000000", "P2SH,CHECKSEQUENCEVERIFY"],
 
 ["5 byte non-minimally-encoded operandss are valid"],
-[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "0x05 0x0000000000 NOP3 1"]],
+[[["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 NOP3 1"]],
+[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "4194303 1ADD CHECKSEQUENCEVERIFY 1"]],
 "020000000100010000000000000000000000000000000000000000000000000000000000000000000000000040000100000000000000000000000000", "P2SH,CHECKSEQUENCEVERIFY"],
-[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "4194304 1SUB NOP3 1"]],
+[[["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 NOP3 1"]],
+[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "2147483647 65536 CHECKSEQUENCEVERIFY 1"]],
 "020000000100010000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000", "P2SH,CHECKSEQUENCEVERIFY"],
-[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "2147483647 4259840 ADD NOP3 1"]],
+[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "2147483647 4259840 ADD CHECKSEQUENCEVERIFY 1"]],
 "020000000100010000000000000000000000000000000000000000000000000000000000000000000000000040000100000000000000000000000000", "P2SH,CHECKSEQUENCEVERIFY"],
 
 ["Valid CHECKSEQUENCEVERIFY in scriptSig"],

From 18c975c831a3a71b26df43a2617a06840f3aa377 Mon Sep 17 00:00:00 2001
From: BtcDrak <btcdrak@gmail.com>
Date: Tue, 28 Jun 2016 17:23:32 +0100
Subject: [PATCH 0584/1802] Rename NOP3 to CHECSEQUENCEVERIFY in rpc tests

---
 qa/rpc-tests/bip68-112-113-p2p.py | 6 +++---
 qa/rpc-tests/bip9-softforks.py    | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/qa/rpc-tests/bip68-112-113-p2p.py b/qa/rpc-tests/bip68-112-113-p2p.py
index 8ba07043849a6..55b3e2a04a033 100755
--- a/qa/rpc-tests/bip68-112-113-p2p.py
+++ b/qa/rpc-tests/bip68-112-113-p2p.py
@@ -173,7 +173,7 @@ def create_bip112special(self, input, txversion):
         tx = self.create_transaction(self.nodes[0], input, self.nodeaddress, Decimal("49.98"))
         tx.nVersion = txversion
         signtx = self.sign_transaction(self.nodes[0], tx)
-        signtx.vin[0].scriptSig = CScript([-1, OP_NOP3, OP_DROP] + list(CScript(signtx.vin[0].scriptSig)))
+        signtx.vin[0].scriptSig = CScript([-1, OP_CHECKSEQUENCEVERIFY, OP_DROP] + list(CScript(signtx.vin[0].scriptSig)))
         return signtx
 
     def create_bip112txs(self, bip112inputs, varyOP_CSV, txversion, locktime_delta = 0):
@@ -196,9 +196,9 @@ def create_bip112txs(self, bip112inputs, varyOP_CSV, txversion, locktime_delta =
                         tx.nVersion = txversion
                         signtx = self.sign_transaction(self.nodes[0], tx)
                         if (varyOP_CSV):
-                            signtx.vin[0].scriptSig = CScript([relative_locktimes[b31][b25][b22][b18], OP_NOP3, OP_DROP] + list(CScript(signtx.vin[0].scriptSig)))
+                            signtx.vin[0].scriptSig = CScript([relative_locktimes[b31][b25][b22][b18], OP_CHECKSEQUENCEVERIFY, OP_DROP] + list(CScript(signtx.vin[0].scriptSig)))
                         else:
-                            signtx.vin[0].scriptSig = CScript([base_relative_locktime, OP_NOP3, OP_DROP] + list(CScript(signtx.vin[0].scriptSig)))
+                            signtx.vin[0].scriptSig = CScript([base_relative_locktime, OP_CHECKSEQUENCEVERIFY, OP_DROP] + list(CScript(signtx.vin[0].scriptSig)))
                         b18txs.append(signtx)
                     b22txs.append(b18txs)
                 b25txs.append(b22txs)
diff --git a/qa/rpc-tests/bip9-softforks.py b/qa/rpc-tests/bip9-softforks.py
index d7e8e5e5a5588..979d1410c2616 100755
--- a/qa/rpc-tests/bip9-softforks.py
+++ b/qa/rpc-tests/bip9-softforks.py
@@ -9,7 +9,7 @@
 from test_framework.mininode import CTransaction, NetworkThread
 from test_framework.blocktools import create_coinbase, create_block
 from test_framework.comptool import TestInstance, TestManager
-from test_framework.script import CScript, OP_1NEGATE, OP_NOP3, OP_DROP
+from test_framework.script import CScript, OP_1NEGATE, OP_CHECKSEQUENCEVERIFY, OP_DROP
 from io import BytesIO
 import time
 import itertools
@@ -220,7 +220,7 @@ def csv_invalidate(self, tx):
         '''Modify the signature in vin 0 of the tx to fail CSV
         Prepends -1 CSV DROP in the scriptSig itself.
         '''
-        tx.vin[0].scriptSig = CScript([OP_1NEGATE, OP_NOP3, OP_DROP] +
+        tx.vin[0].scriptSig = CScript([OP_1NEGATE, OP_CHECKSEQUENCEVERIFY, OP_DROP] +
                                       list(CScript(tx.vin[0].scriptSig)))
 
     def sequence_lock_invalidate(self, tx):

From a7897c02f790cd487874f09bc7b4ec31c17968ee Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Tue, 28 Jun 2016 18:27:49 +0200
Subject: [PATCH 0585/1802] qt: Remove client name from debug window

Remove the client name from the debug window in the GUI. It is already
part of the user agent, so adding it separately doesn't add anything.
---
 src/qt/clientmodel.cpp      |  5 ---
 src/qt/clientmodel.h        |  1 -
 src/qt/forms/debugwindow.ui | 75 +++++++++++++------------------------
 src/qt/rpcconsole.cpp       |  1 -
 4 files changed, 26 insertions(+), 56 deletions(-)

diff --git a/src/qt/clientmodel.cpp b/src/qt/clientmodel.cpp
index 108500654b2da..14661b857a5a5 100644
--- a/src/qt/clientmodel.cpp
+++ b/src/qt/clientmodel.cpp
@@ -179,11 +179,6 @@ bool ClientModel::isReleaseVersion() const
     return CLIENT_VERSION_IS_RELEASE;
 }
 
-QString ClientModel::clientName() const
-{
-    return QString::fromStdString(CLIENT_NAME);
-}
-
 QString ClientModel::formatClientStartupTime() const
 {
     return QDateTime::fromTime_t(nClientStartupTime).toString();
diff --git a/src/qt/clientmodel.h b/src/qt/clientmodel.h
index 439680431963e..99fd574b9e14d 100644
--- a/src/qt/clientmodel.h
+++ b/src/qt/clientmodel.h
@@ -73,7 +73,6 @@ class ClientModel : public QObject
     QString formatFullVersion() const;
     QString formatSubVersion() const;
     bool isReleaseVersion() const;
-    QString clientName() const;
     QString formatClientStartupTime() const;
     QString dataDir() const;
 
diff --git a/src/qt/forms/debugwindow.ui b/src/qt/forms/debugwindow.ui
index c17efcf1b367a..9dc641979e084 100644
--- a/src/qt/forms/debugwindow.ui
+++ b/src/qt/forms/debugwindow.ui
@@ -41,36 +41,13 @@
         </widget>
        </item>
        <item row="1" column="0">
-        <widget class="QLabel" name="label_5">
-         <property name="text">
-          <string>Client name</string>
-         </property>
-        </widget>
-       </item>
-       <item row="1" column="1" colspan="2">
-        <widget class="QLabel" name="clientName">
-         <property name="cursor">
-          <cursorShape>IBeamCursor</cursorShape>
-         </property>
-         <property name="text">
-          <string>N/A</string>
-         </property>
-         <property name="textFormat">
-          <enum>Qt::PlainText</enum>
-         </property>
-         <property name="textInteractionFlags">
-          <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
-         </property>
-        </widget>
-       </item>
-       <item row="2" column="0">
         <widget class="QLabel" name="label_6">
          <property name="text">
           <string>Client version</string>
          </property>
         </widget>
        </item>
-       <item row="2" column="1" colspan="2">
+       <item row="1" column="1" colspan="2">
         <widget class="QLabel" name="clientVersion">
          <property name="cursor">
           <cursorShape>IBeamCursor</cursorShape>
@@ -86,7 +63,7 @@
          </property>
         </widget>
        </item>
-       <item row="3" column="0">
+       <item row="2" column="0">
         <widget class="QLabel" name="labelClientUserAgent">
          <property name="text">
           <string>User Agent</string>
@@ -96,7 +73,7 @@
          </property>
         </widget>
        </item>
-       <item row="3" column="1" colspan="2">
+       <item row="2" column="1" colspan="2">
         <widget class="QLabel" name="clientUserAgent">
          <property name="cursor">
           <cursorShape>IBeamCursor</cursorShape>
@@ -112,7 +89,7 @@
          </property>
         </widget>
        </item>
-       <item row="4" column="0">
+       <item row="3" column="0">
         <widget class="QLabel" name="label_berkeleyDBVersion">
          <property name="text">
           <string>Using BerkeleyDB version</string>
@@ -122,7 +99,7 @@
          </property>
         </widget>
        </item>
-       <item row="4" column="1" colspan="2">
+       <item row="3" column="1" colspan="2">
         <widget class="QLabel" name="berkeleyDBVersion">
          <property name="cursor">
           <cursorShape>IBeamCursor</cursorShape>
@@ -138,14 +115,14 @@
          </property>
         </widget>
        </item>
-       <item row="5" column="0">
+       <item row="4" column="0">
         <widget class="QLabel" name="label_12">
          <property name="text">
           <string>Datadir</string>
          </property>
         </widget>
        </item>
-       <item row="5" column="1" colspan="2">
+       <item row="4" column="1" colspan="2">
         <widget class="QLabel" name="dataDir">
          <property name="cursor">
           <cursorShape>IBeamCursor</cursorShape>
@@ -164,14 +141,14 @@
          </property>
         </widget>
        </item>
-       <item row="6" column="0">
+       <item row="5" column="0">
         <widget class="QLabel" name="label_13">
          <property name="text">
           <string>Startup time</string>
          </property>
         </widget>
        </item>
-       <item row="6" column="1" colspan="2">
+       <item row="5" column="1" colspan="2">
         <widget class="QLabel" name="startupTime">
          <property name="cursor">
           <cursorShape>IBeamCursor</cursorShape>
@@ -187,7 +164,7 @@
          </property>
         </widget>
        </item>
-       <item row="7" column="0">
+       <item row="6" column="0">
            <widget class="QLabel" name="labelNetwork">
                <property name="font">
                    <font>
@@ -200,14 +177,14 @@
                </property>
            </widget>
        </item>
-       <item row="8" column="0">
+       <item row="7" column="0">
         <widget class="QLabel" name="label_8">
          <property name="text">
           <string>Name</string>
          </property>
         </widget>
        </item>
-       <item row="8" column="1" colspan="2">
+       <item row="7" column="1" colspan="2">
         <widget class="QLabel" name="networkName">
          <property name="cursor">
           <cursorShape>IBeamCursor</cursorShape>
@@ -223,14 +200,14 @@
          </property>
         </widget>
        </item>
-       <item row="9" column="0">
+       <item row="8" column="0">
         <widget class="QLabel" name="label_7">
          <property name="text">
           <string>Number of connections</string>
          </property>
         </widget>
        </item>
-       <item row="9" column="1" colspan="2">
+       <item row="8" column="1" colspan="2">
         <widget class="QLabel" name="numberOfConnections">
          <property name="cursor">
           <cursorShape>IBeamCursor</cursorShape>
@@ -246,7 +223,7 @@
          </property>
         </widget>
        </item>
-       <item row="10" column="0">
+       <item row="9" column="0">
         <widget class="QLabel" name="label_10">
          <property name="font">
           <font>
@@ -259,14 +236,14 @@
          </property>
         </widget>
        </item>
-       <item row="11" column="0">
+       <item row="10" column="0">
         <widget class="QLabel" name="label_3">
          <property name="text">
           <string>Current number of blocks</string>
          </property>
         </widget>
        </item>
-       <item row="11" column="1" colspan="2">
+       <item row="10" column="1" colspan="2">
         <widget class="QLabel" name="numberOfBlocks">
          <property name="cursor">
           <cursorShape>IBeamCursor</cursorShape>
@@ -282,14 +259,14 @@
          </property>
         </widget>
        </item>
-       <item row="12" column="0">
+       <item row="11" column="0">
         <widget class="QLabel" name="labelLastBlockTime">
          <property name="text">
           <string>Last block time</string>
          </property>
         </widget>
        </item>
-       <item row="12" column="1" colspan="2">
+       <item row="11" column="1" colspan="2">
         <widget class="QLabel" name="lastBlockTime">
          <property name="cursor">
           <cursorShape>IBeamCursor</cursorShape>
@@ -305,7 +282,7 @@
          </property>
         </widget>
        </item>
-       <item row="13" column="0">
+       <item row="12" column="0">
         <widget class="QLabel" name="labelMempoolTitle">
          <property name="font">
           <font>
@@ -318,14 +295,14 @@
          </property>
         </widget>
        </item>
-       <item row="14" column="0">
+       <item row="13" column="0">
         <widget class="QLabel" name="labelNumberOfTransactions">
          <property name="text">
           <string>Current number of transactions</string>
          </property>
         </widget>
        </item>
-       <item row="14" column="1">
+       <item row="13" column="1">
         <widget class="QLabel" name="mempoolNumberTxs">
          <property name="cursor">
           <cursorShape>IBeamCursor</cursorShape>
@@ -341,14 +318,14 @@
          </property>
         </widget>
        </item>
-       <item row="15" column="0">
+       <item row="14" column="0">
         <widget class="QLabel" name="labelMemoryUsage">
          <property name="text">
           <string>Memory usage</string>
          </property>
         </widget>
        </item>
-       <item row="15" column="1">
+       <item row="14" column="1">
         <widget class="QLabel" name="mempoolSize">
          <property name="cursor">
           <cursorShape>IBeamCursor</cursorShape>
@@ -364,7 +341,7 @@
          </property>
         </widget>
        </item>
-       <item row="13" column="2" rowspan="3">
+       <item row="12" column="2" rowspan="3">
         <layout class="QVBoxLayout" name="verticalLayoutDebugButton">
          <property name="spacing">
           <number>3</number>
@@ -404,7 +381,7 @@
          </item>
         </layout>
        </item>
-       <item row="16" column="0">
+       <item row="15" column="0">
         <spacer name="verticalSpacer">
          <property name="orientation">
           <enum>Qt::Vertical</enum>
diff --git a/src/qt/rpcconsole.cpp b/src/qt/rpcconsole.cpp
index 11f3e49a06d9b..650ff8b00db84 100644
--- a/src/qt/rpcconsole.cpp
+++ b/src/qt/rpcconsole.cpp
@@ -451,7 +451,6 @@ void RPCConsole::setClientModel(ClientModel *model)
         // Provide initial values
         ui->clientVersion->setText(model->formatFullVersion());
         ui->clientUserAgent->setText(model->formatSubVersion());
-        ui->clientName->setText(model->clientName());
         ui->dataDir->setText(model->dataDir());
         ui->startupTime->setText(model->formatClientStartupTime());
         ui->networkName->setText(QString::fromStdString(Params().NetworkIDString()));

From 0ce8e99ec8ac0d2a60b577537bf0db747bb8ec50 Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Wed, 29 Jun 2016 11:01:29 +0200
Subject: [PATCH 0586/1802] windows: Add testnet link to installer

---
 share/setup.nsi.in | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/share/setup.nsi.in b/share/setup.nsi.in
index c062f96a3059c..a3294a9f66621 100644
--- a/share/setup.nsi.in
+++ b/share/setup.nsi.in
@@ -92,6 +92,7 @@ Section -post SEC0001
     !insertmacro MUI_STARTMENU_WRITE_BEGIN Application
     CreateDirectory $SMPROGRAMS\$StartMenuGroup
     CreateShortcut "$SMPROGRAMS\$StartMenuGroup\$(^Name).lnk" $INSTDIR\@BITCOIN_GUI_NAME@@EXEEXT@
+    CreateShortcut "$SMPROGRAMS\$StartMenuGroup\@PACKAGE_NAME@ (testnet, @WINDOWS_BITS@-bit).lnk" "$INSTDIR\@BITCOIN_GUI_NAME@@EXEEXT@" "-testnet"
     CreateShortcut "$SMPROGRAMS\$StartMenuGroup\Uninstall $(^Name).lnk" $INSTDIR\uninstall.exe
     !insertmacro MUI_STARTMENU_WRITE_END
     WriteRegStr HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" DisplayName "$(^Name)"
@@ -135,6 +136,7 @@ Section -un.post UNSEC0001
     DeleteRegKey HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)"
     Delete /REBOOTOK "$SMPROGRAMS\$StartMenuGroup\Uninstall $(^Name).lnk"
     Delete /REBOOTOK "$SMPROGRAMS\$StartMenuGroup\$(^Name).lnk"
+    Delete /REBOOTOK "$SMPROGRAMS\$StartMenuGroup\@PACKAGE_NAME@ (testnet, @WINDOWS_BITS@-bit).lnk"
     Delete /REBOOTOK "$SMSTARTUP\Bitcoin.lnk"
     Delete /REBOOTOK $INSTDIR\uninstall.exe
     Delete /REBOOTOK $INSTDIR\debug.log

From 4f44cb616d98a0e17ae0599e5a58f50f3be2910b Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Wed, 29 Jun 2016 17:29:29 +0200
Subject: [PATCH 0587/1802] qt: Network-specific example address

Generate an (invalid) example address for in the bitcoin address
widgets, based on the network prefix, instead of hardcoding a mainnet
address.

- `1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L` for mainnet (same as now)
- `n2wxQmfexkjwEPgdD6iJA7T7RtzkmHxhFc` for testnet
---
 src/qt/guiutil.cpp | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/src/qt/guiutil.cpp b/src/qt/guiutil.cpp
index 4327de9b0c86d..947a4c6821d84 100644
--- a/src/qt/guiutil.cpp
+++ b/src/qt/guiutil.cpp
@@ -107,6 +107,23 @@ QFont fixedPitchFont()
 #endif
 }
 
+// Just some dummy data to generate an convincing random-looking (but consistent) address
+static const uint8_t dummydata[] = {0xeb,0x15,0x23,0x1d,0xfc,0xeb,0x60,0x92,0x58,0x86,0xb6,0x7d,0x06,0x52,0x99,0x92,0x59,0x15,0xae,0xb1,0x72,0xc0,0x66,0x47};
+
+// Generate a dummy address with invalid CRC, starting with the network prefix.
+static std::string DummyAddress(const CChainParams &params)
+{
+    std::vector<unsigned char> sourcedata = params.Base58Prefix(CChainParams::PUBKEY_ADDRESS);
+    sourcedata.insert(sourcedata.end(), dummydata, dummydata + sizeof(dummydata));
+    for(int i=0; i<256; ++i) { // Try every trailing byte
+        std::string s = EncodeBase58(begin_ptr(sourcedata), end_ptr(sourcedata));
+        if (!CBitcoinAddress(s).IsValid())
+            return s;
+        sourcedata[sourcedata.size()-1] += 1;
+    }
+    return "";
+}
+
 void setupAddressWidget(QValidatedLineEdit *widget, QWidget *parent)
 {
     parent->setFocusProxy(widget);
@@ -115,7 +132,8 @@ void setupAddressWidget(QValidatedLineEdit *widget, QWidget *parent)
 #if QT_VERSION >= 0x040700
     // We don't want translators to use own addresses in translations
     // and this is the only place, where this address is supplied.
-    widget->setPlaceholderText(QObject::tr("Enter a Bitcoin address (e.g. %1)").arg("1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L"));
+    widget->setPlaceholderText(QObject::tr("Enter a Bitcoin address (e.g. %1)").arg(
+        QString::fromStdString(DummyAddress(Params()))));
 #endif
     widget->setValidator(new BitcoinAddressEntryValidator(parent));
     widget->setCheckValidator(new BitcoinAddressCheckValidator(parent));

From 975a41dcc259c966e1ab952b3681dda2f7b99009 Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Wed, 29 Jun 2016 13:06:28 +0200
Subject: [PATCH 0588/1802] windows: Add testnet icon for testnet link

Overhauled testnet icon by Jonas Schnelli
---
 share/setup.nsi.in                   |   2 +-
 src/Makefile.qt.include              |   1 +
 src/qt/res/bitcoin-qt-res.rc         |   1 +
 src/qt/res/icons/bitcoin_testnet.ico | Bin 0 -> 57251 bytes
 4 files changed, 3 insertions(+), 1 deletion(-)
 create mode 100644 src/qt/res/icons/bitcoin_testnet.ico

diff --git a/share/setup.nsi.in b/share/setup.nsi.in
index a3294a9f66621..dd42085a27609 100644
--- a/share/setup.nsi.in
+++ b/share/setup.nsi.in
@@ -92,7 +92,7 @@ Section -post SEC0001
     !insertmacro MUI_STARTMENU_WRITE_BEGIN Application
     CreateDirectory $SMPROGRAMS\$StartMenuGroup
     CreateShortcut "$SMPROGRAMS\$StartMenuGroup\$(^Name).lnk" $INSTDIR\@BITCOIN_GUI_NAME@@EXEEXT@
-    CreateShortcut "$SMPROGRAMS\$StartMenuGroup\@PACKAGE_NAME@ (testnet, @WINDOWS_BITS@-bit).lnk" "$INSTDIR\@BITCOIN_GUI_NAME@@EXEEXT@" "-testnet"
+    CreateShortcut "$SMPROGRAMS\$StartMenuGroup\@PACKAGE_NAME@ (testnet, @WINDOWS_BITS@-bit).lnk" "$INSTDIR\@BITCOIN_GUI_NAME@@EXEEXT@" "-testnet" "$INSTDIR\@BITCOIN_GUI_NAME@@EXEEXT@" 1
     CreateShortcut "$SMPROGRAMS\$StartMenuGroup\Uninstall $(^Name).lnk" $INSTDIR\uninstall.exe
     !insertmacro MUI_STARTMENU_WRITE_END
     WriteRegStr HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" DisplayName "$(^Name)"
diff --git a/src/Makefile.qt.include b/src/Makefile.qt.include
index 36a21dd06fec1..ca2c7b2eb0d83 100644
--- a/src/Makefile.qt.include
+++ b/src/Makefile.qt.include
@@ -231,6 +231,7 @@ RES_ICONS = \
   qt/res/icons/about.png \
   qt/res/icons/about_qt.png \
   qt/res/icons/bitcoin.ico \
+  qt/res/icons/bitcoin_testnet.ico \
   qt/res/icons/bitcoin.png \
   qt/res/icons/chevron.png \
   qt/res/icons/clock1.png \
diff --git a/src/qt/res/bitcoin-qt-res.rc b/src/qt/res/bitcoin-qt-res.rc
index 19c3d5d97d656..94ae2564771fd 100644
--- a/src/qt/res/bitcoin-qt-res.rc
+++ b/src/qt/res/bitcoin-qt-res.rc
@@ -1,4 +1,5 @@
 IDI_ICON1 ICON DISCARDABLE "icons/bitcoin.ico"
+IDI_ICON2 ICON DISCARDABLE "icons/bitcoin_testnet.ico"
 
 #include <windows.h>             // needed for VERSIONINFO
 #include "../../clientversion.h" // holds the needed client version information
diff --git a/src/qt/res/icons/bitcoin_testnet.ico b/src/qt/res/icons/bitcoin_testnet.ico
new file mode 100644
index 0000000000000000000000000000000000000000..909194ecd2e10985bbca35c3cd26fd1adb4730b8
GIT binary patch
literal 57251
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

literal 0
HcmV?d00001


From 6dd4bc289c71f622ac561f6f9651546b9ec4fa3e Mon Sep 17 00:00:00 2001
From: Suhas Daftuar <sdaftuar@gmail.com>
Date: Thu, 30 Jun 2016 11:22:31 -0400
Subject: [PATCH 0589/1802] Exclude witness transactions in addPackageTxs()
 pre-segwit activation

---
 src/miner.cpp | 13 +++++++++----
 src/miner.h   |  7 +++++--
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/miner.cpp b/src/miner.cpp
index a3e29431d7552..f2ad1018b2bd0 100644
--- a/src/miner.cpp
+++ b/src/miner.cpp
@@ -236,14 +236,19 @@ bool BlockAssembler::TestPackage(uint64_t packageSize, int64_t packageSigOpsCost
     return true;
 }
 
-// Block size and sigops have already been tested.  Check that all transactions
-// are final.
-bool BlockAssembler::TestPackageFinalityAndSerializedSize(const CTxMemPool::setEntries& package)
+// Perform transaction-level checks before adding to block:
+// - transaction finality (locktime)
+// - premature witness (in case segwit transactions are added to mempool before
+//   segwit activation)
+// - serialized size (in case -blockmaxsize is in use)
+bool BlockAssembler::TestPackageTransactions(const CTxMemPool::setEntries& package)
 {
     uint64_t nPotentialBlockSize = nBlockSize; // only used with fNeedSizeAccounting
     BOOST_FOREACH (const CTxMemPool::txiter it, package) {
         if (!IsFinalTx(it->GetTx(), nHeight, nLockTimeCutoff))
             return false;
+        if (!fIncludeWitness && !it->GetTx().wit.IsNull())
+            return false;
         if (fNeedSizeAccounting) {
             uint64_t nTxSize = ::GetSerializeSize(it->GetTx(), SER_NETWORK, PROTOCOL_VERSION);
             if (nPotentialBlockSize + nTxSize >= nBlockMaxSize) {
@@ -542,7 +547,7 @@ void BlockAssembler::addPackageTxs()
         ancestors.insert(iter);
 
         // Test if all tx's are Final
-        if (!TestPackageFinalityAndSerializedSize(ancestors)) {
+        if (!TestPackageTransactions(ancestors)) {
             if (fUsingModified) {
                 mapModifiedTx.get<ancestor_score>().erase(modit);
                 failedTx.insert(iter);
diff --git a/src/miner.h b/src/miner.h
index bc4da63da074f..9fab55611e829 100644
--- a/src/miner.h
+++ b/src/miner.h
@@ -192,8 +192,11 @@ class BlockAssembler
     void onlyUnconfirmed(CTxMemPool::setEntries& testSet);
     /** Test if a new package would "fit" in the block */
     bool TestPackage(uint64_t packageSize, int64_t packageSigOpsCost);
-    /** Test if a set of transactions are all final */
-    bool TestPackageFinalityAndSerializedSize(const CTxMemPool::setEntries& package);
+    /** Perform checks on each transaction in a package:
+      * locktime, premature-witness, serialized size (if necessary)
+      * These checks should always succeed, and they're here
+      * only as an extra check in case of suboptimal node configuration */
+    bool TestPackageTransactions(const CTxMemPool::setEntries& package);
     /** Return true if given transaction from mapTx has already been evaluated,
       * or if the transaction's cached data in mapTx is incorrect. */
     bool SkipMapTxEntry(CTxMemPool::txiter it, indexed_modified_transaction_set &mapModifiedTx, CTxMemPool::setEntries &failedTx);

From d2e46e1b5cf6c08829ec3bb2a923b4ba149ab3b7 Mon Sep 17 00:00:00 2001
From: Suhas Daftuar <sdaftuar@gmail.com>
Date: Thu, 30 Jun 2016 11:37:38 -0400
Subject: [PATCH 0590/1802] Remove addScoreTxs()

---
 src/miner.cpp | 60 ---------------------------------------------------
 src/miner.h   |  6 ++----
 2 files changed, 2 insertions(+), 64 deletions(-)

diff --git a/src/miner.cpp b/src/miner.cpp
index f2ad1018b2bd0..eb71355e7abc0 100644
--- a/src/miner.cpp
+++ b/src/miner.cpp
@@ -338,66 +338,6 @@ void BlockAssembler::AddToBlock(CTxMemPool::txiter iter)
     }
 }
 
-void BlockAssembler::addScoreTxs()
-{
-    std::priority_queue<CTxMemPool::txiter, std::vector<CTxMemPool::txiter>, ScoreCompare> clearedTxs;
-    CTxMemPool::setEntries waitSet;
-    CTxMemPool::indexed_transaction_set::index<mining_score>::type::iterator mi = mempool.mapTx.get<mining_score>().begin();
-    CTxMemPool::txiter iter;
-    while (!blockFinished && (mi != mempool.mapTx.get<mining_score>().end() || !clearedTxs.empty()))
-    {
-        // If no txs that were previously postponed are available to try
-        // again, then try the next highest score tx
-        if (clearedTxs.empty()) {
-            iter = mempool.mapTx.project<0>(mi);
-            mi++;
-        }
-        // If a previously postponed tx is available to try again, then it
-        // has higher score than all untried so far txs
-        else {
-            iter = clearedTxs.top();
-            clearedTxs.pop();
-        }
-
-        // If tx already in block, skip  (added by addPriorityTxs)
-        if (inBlock.count(iter)) {
-            continue;
-        }
-
-        // cannot accept witness transactions into a non-witness block
-        if (!fIncludeWitness && !iter->GetTx().wit.IsNull())
-            continue;
-
-        // If tx is dependent on other mempool txs which haven't yet been included
-        // then put it in the waitSet
-        if (isStillDependent(iter)) {
-            waitSet.insert(iter);
-            continue;
-        }
-
-        // If the fee rate is below the min fee rate for mining, then we're done
-        // adding txs based on score (fee rate)
-        if (iter->GetModifiedFee() < ::minRelayTxFee.GetFee(iter->GetTxSize()) && nBlockSize >= nBlockMinSize) {
-            return;
-        }
-
-        // If this tx fits in the block add it, otherwise keep looping
-        if (TestForBlock(iter)) {
-            AddToBlock(iter);
-
-            // This tx was successfully added, so
-            // add transactions that depend on this one to the priority queue to try again
-            BOOST_FOREACH(CTxMemPool::txiter child, mempool.GetMemPoolChildren(iter))
-            {
-                if (waitSet.count(child)) {
-                    clearedTxs.push(child);
-                    waitSet.erase(child);
-                }
-            }
-        }
-    }
-}
-
 void BlockAssembler::UpdatePackagesForAdded(const CTxMemPool::setEntries& alreadyAdded,
         indexed_modified_transaction_set &mapModifiedTx)
 {
diff --git a/src/miner.h b/src/miner.h
index 9fab55611e829..037639b2be841 100644
--- a/src/miner.h
+++ b/src/miner.h
@@ -157,7 +157,7 @@ class BlockAssembler
     int64_t nLockTimeCutoff;
     const CChainParams& chainparams;
 
-    // Variables used for addScoreTxs and addPriorityTxs
+    // Variables used for addPriorityTxs
     int lastFewTxs;
     bool blockFinished;
 
@@ -174,14 +174,12 @@ class BlockAssembler
     void AddToBlock(CTxMemPool::txiter iter);
 
     // Methods for how to add transactions to a block.
-    /** Add transactions based on modified feerate */
-    void addScoreTxs();
     /** Add transactions based on tx "priority" */
     void addPriorityTxs();
     /** Add transactions based on feerate including unconfirmed ancestors */
     void addPackageTxs();
 
-    // helper function for addScoreTxs and addPriorityTxs
+    // helper function for addPriorityTxs
     /** Test if tx will still "fit" in the block */
     bool TestForBlock(CTxMemPool::txiter iter);
     /** Test if tx still has unconfirmed parents not yet in block */

From 27362dda4d583a43ebf687ae097d2f45ba1c4c32 Mon Sep 17 00:00:00 2001
From: Suhas Daftuar <sdaftuar@gmail.com>
Date: Thu, 30 Jun 2016 11:41:13 -0400
Subject: [PATCH 0591/1802] Remove -blockminsize option

---
 src/init.cpp        | 1 -
 src/miner.cpp       | 7 +------
 src/miner.h         | 2 +-
 src/policy/policy.h | 3 +--
 4 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/src/init.cpp b/src/init.cpp
index 5d29f14eb8821..fdf6301d2ade3 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -453,7 +453,6 @@ std::string HelpMessage(HelpMessageMode mode)
 
     strUsage += HelpMessageGroup(_("Block creation options:"));
     strUsage += HelpMessageOpt("-blockmaxcost=<n>", strprintf(_("Set maximum block cost (default: %d)"), DEFAULT_BLOCK_MAX_COST));
-    strUsage += HelpMessageOpt("-blockminsize=<n>", strprintf(_("Set minimum block size in bytes (default: %u)"), DEFAULT_BLOCK_MIN_SIZE));
     strUsage += HelpMessageOpt("-blockmaxsize=<n>", strprintf(_("Set maximum block size in bytes (default: %d)"), DEFAULT_BLOCK_MAX_SIZE));
     strUsage += HelpMessageOpt("-blockprioritysize=<n>", strprintf(_("Set maximum size of high-priority/low-fee transactions in bytes (default: %d)"), DEFAULT_BLOCK_PRIORITY_SIZE));
     if (showDebug)
diff --git a/src/miner.cpp b/src/miner.cpp
index eb71355e7abc0..8153fb9f9ecdd 100644
--- a/src/miner.cpp
+++ b/src/miner.cpp
@@ -100,13 +100,8 @@ BlockAssembler::BlockAssembler(const CChainParams& _chainparams)
     // Limit size to between 1K and MAX_BLOCK_SERIALIZED_SIZE-1K for sanity:
     nBlockMaxSize = std::max((unsigned int)1000, std::min((unsigned int)(MAX_BLOCK_SERIALIZED_SIZE-1000), nBlockMaxSize));
 
-    // Minimum block size you want to create; block will be filled with free transactions
-    // until there are no more or the block reaches this size:
-    nBlockMinSize = GetArg("-blockminsize", DEFAULT_BLOCK_MIN_SIZE);
-    nBlockMinSize = std::min(nBlockMaxSize, nBlockMinSize);
-
     // Whether we need to account for byte usage (in addition to cost usage)
-    fNeedSizeAccounting = (nBlockMaxSize < MAX_BLOCK_SERIALIZED_SIZE-1000) || (nBlockMinSize > 0);
+    fNeedSizeAccounting = (nBlockMaxSize < MAX_BLOCK_SERIALIZED_SIZE-1000);
 }
 
 void BlockAssembler::resetBlock()
diff --git a/src/miner.h b/src/miner.h
index 037639b2be841..d16e37bb599bb 100644
--- a/src/miner.h
+++ b/src/miner.h
@@ -141,7 +141,7 @@ class BlockAssembler
 
     // Configuration parameters for the block size
     bool fIncludeWitness;
-    unsigned int nBlockMaxCost, nBlockMaxSize, nBlockMinSize;
+    unsigned int nBlockMaxCost, nBlockMaxSize;
     bool fNeedSizeAccounting;
 
     // Information on the current status of the block
diff --git a/src/policy/policy.h b/src/policy/policy.h
index fefb562ff9318..29a8cc57c20ff 100644
--- a/src/policy/policy.h
+++ b/src/policy/policy.h
@@ -14,9 +14,8 @@
 
 class CCoinsViewCache;
 
-/** Default for -blockmaxsize and -blockminsize, which control the range of sizes the mining code will create **/
+/** Default for -blockmaxsize, which controls the maximum size of block the mining code will create **/
 static const unsigned int DEFAULT_BLOCK_MAX_SIZE = 750000;
-static const unsigned int DEFAULT_BLOCK_MIN_SIZE = 0;
 /** Default for -blockprioritysize, maximum space for zero/low-fee transactions **/
 static const unsigned int DEFAULT_BLOCK_PRIORITY_SIZE = 0;
 /** Default for -blockmaxcost, which control the range of block costs the mining code will create **/

From 20f3cd75f6af8f75de943fef43b4b7769746f732 Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Fri, 1 Jul 2016 13:22:52 +0200
Subject: [PATCH 0592/1802] wallet: Revert input selection post-pruning

This reverts PR #4906, "Coinselection prunes extraneous inputs from
ApproximateBestSubset".

Apparently the previous behavior of slightly over-estimating the set of
inputs was useful in cleaning up UTXOs.

See also #7664, #7657, as well as 2016-07-01 discussion on #bitcoin-core-dev IRC.
---
 src/wallet/test/wallet_tests.cpp | 14 --------------
 src/wallet/wallet.cpp            | 10 ----------
 2 files changed, 24 deletions(-)

diff --git a/src/wallet/test/wallet_tests.cpp b/src/wallet/test/wallet_tests.cpp
index 0a4f06ba88175..c6c5058984c00 100644
--- a/src/wallet/test/wallet_tests.cpp
+++ b/src/wallet/test/wallet_tests.cpp
@@ -349,20 +349,6 @@ BOOST_AUTO_TEST_CASE(ApproximateBestSubset)
     BOOST_CHECK(wallet.SelectCoinsMinConf(1003 * COIN, 1, 6, vCoins, setCoinsRet, nValueRet));
     BOOST_CHECK_EQUAL(nValueRet, 1003 * COIN);
     BOOST_CHECK_EQUAL(setCoinsRet.size(), 2U);
-
-    empty_wallet();
-
-    // Test trimming
-    for (int i = 0; i < 100; i++)
-        add_coin(10 * COIN);
-    for (int i = 0; i < 100; i++)
-        add_coin(1000 * COIN);
-
-    BOOST_CHECK(wallet.SelectCoinsMinConf(100001 * COIN, 1, 6, vCoins, setCoinsRet, nValueRet));
-    // We need all 100 larger coins and exactly one small coin.
-    // Superfluous small coins must be trimmed from the set:
-    BOOST_CHECK_EQUAL(nValueRet, 100010 * COIN);
-    BOOST_CHECK_EQUAL(setCoinsRet.size(), 101);
 }
 
 BOOST_AUTO_TEST_SUITE_END()
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index 87b85eeb72301..a0095ebd92e76 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -1879,16 +1879,6 @@ static void ApproximateBestSubset(vector<pair<CAmount, pair<const CWalletTx*,uns
             }
         }
     }
-
-    //Reduces the approximate best subset by removing any inputs that are smaller than the surplus of nTotal beyond nTargetValue. 
-    for (unsigned int i = 0; i < vValue.size(); i++)
-    {                        
-        if (vfBest[i] && (nBest - vValue[i].first) >= nTargetValue )
-        {
-            vfBest[i] = false;
-            nBest -= vValue[i].first;
-        }
-    }
 }
 
 bool CWallet::SelectCoinsMinConf(const CAmount& nTargetValue, int nConfMine, int nConfTheirs, vector<COutput> vCoins,

From 33336e1aacb36607d0950d681d8e24821e64f8df Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Wed, 29 Jun 2016 23:38:33 +0200
Subject: [PATCH 0593/1802] [util] CopyrightHolders: Check for untranslated
 substitution

Also, remove check which is always true
---
 src/util.cpp | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/util.cpp b/src/util.cpp
index 9a9209c62140b..ee12f2b443427 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -801,11 +801,10 @@ int GetNumCores()
 
 std::string CopyrightHolders(const std::string& strPrefix)
 {
-    std::string strCopyrightHolders = strPrefix + _(COPYRIGHT_HOLDERS);
-    if (strCopyrightHolders.find("%s") != strCopyrightHolders.npos) {
-        strCopyrightHolders = strprintf(strCopyrightHolders, _(COPYRIGHT_HOLDERS_SUBSTITUTION));
-    }
-    if (strCopyrightHolders.find("Bitcoin Core developers") == strCopyrightHolders.npos) {
+    std::string strCopyrightHolders = strPrefix + strprintf(_(COPYRIGHT_HOLDERS), _(COPYRIGHT_HOLDERS_SUBSTITUTION));
+
+    // Check for untranslated substitution to make sure Bitcoin Core copyright is not removed by accident
+    if (strprintf(COPYRIGHT_HOLDERS, COPYRIGHT_HOLDERS_SUBSTITUTION).find("Bitcoin Core") == std::string::npos) {
         strCopyrightHolders += "\n" + strPrefix + "The Bitcoin Core developers";
     }
     return strCopyrightHolders;

From ab0c35a290b8cb05b9bed0c24627bcc98bb22b2b Mon Sep 17 00:00:00 2001
From: fanquake <fanquake@gmail.com>
Date: Tue, 5 Jul 2016 10:24:48 +0800
Subject: [PATCH 0594/1802] [Doc] Update bips.md for CSV softfork.

---
 doc/bips.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/bips.md b/doc/bips.md
index 62bde20d944f4..039d5114fd9f1 100644
--- a/doc/bips.md
+++ b/doc/bips.md
@@ -18,11 +18,11 @@ BIPs that are implemented by Bitcoin Core (up-to-date up to **v0.13.0**):
 * [`BIP 61`](https://github.com/bitcoin/bips/blob/master/bip-0061.mediawiki): The 'reject' protocol message (and the protocol version bump to 70002) was added in **v0.9.0** ([PR #3185](https://github.com/bitcoin/bitcoin/pull/3185)).
 * [`BIP 65`](https://github.com/bitcoin/bips/blob/master/bip-0065.mediawiki): The CHECKLOCKTIMEVERIFY softfork was merged in **v0.12.0** ([PR #6351](https://github.com/bitcoin/bitcoin/pull/6351)), and backported to **v0.11.2** and **v0.10.4**. Mempool-only CLTV was added in [PR #6124](https://github.com/bitcoin/bitcoin/pull/6124).
 * [`BIP 66`](https://github.com/bitcoin/bips/blob/master/bip-0066.mediawiki): The strict DER rules and associated version 3 blocks have been implemented since **v0.10.0** ([PR #5713](https://github.com/bitcoin/bitcoin/pull/5713)).
-* [`BIP 68`](https://github.com/bitcoin/bips/blob/master/bip-0068.mediawiki): Sequence locks have been implemented as of **v0.12.1**  ([PR #7184](https://github.com/bitcoin/bitcoin/pull/7184)).
+* [`BIP 68`](https://github.com/bitcoin/bips/blob/master/bip-0068.mediawiki): Sequence locks have been implemented as of **v0.12.1**  ([PR #7184](https://github.com/bitcoin/bitcoin/pull/7184)), and have been activated since *block 419328*.
 * [`BIP 70`](https://github.com/bitcoin/bips/blob/master/bip-0070.mediawiki) [`71`](https://github.com/bitcoin/bips/blob/master/bip-0071.mediawiki) [`72`](https://github.com/bitcoin/bips/blob/master/bip-0072.mediawiki): Payment Protocol support has been available in Bitcoin Core GUI since **v0.9.0** ([PR #5216](https://github.com/bitcoin/bitcoin/pull/5216)).
 * [`BIP 111`](https://github.com/bitcoin/bips/blob/master/bip-0111.mediawiki): `NODE_BLOOM` service bit added, and enforced for all peer versions as of **v0.13.0** ([PR #6579](https://github.com/bitcoin/bitcoin/pull/6579) and [PR #6641](https://github.com/bitcoin/bitcoin/pull/6641)).
-* [`BIP 112`](https://github.com/bitcoin/bips/blob/master/bip-0112.mediawiki): The CHECKSEQUENCEVERIFY opcode has been implemented since **v0.12.1** ([PR #7524](https://github.com/bitcoin/bitcoin/pull/7524)).
-* [`BIP 113`](https://github.com/bitcoin/bips/blob/master/bip-0113.mediawiki): Median time past lock-time calculations have been implemented since **v0.12.1** ([PR #6566](https://github.com/bitcoin/bitcoin/pull/6566)).
+* [`BIP 112`](https://github.com/bitcoin/bips/blob/master/bip-0112.mediawiki): The CHECKSEQUENCEVERIFY opcode has been implemented since **v0.12.1** ([PR #7524](https://github.com/bitcoin/bitcoin/pull/7524)) and has been activated since *block 419328*.
+* [`BIP 113`](https://github.com/bitcoin/bips/blob/master/bip-0113.mediawiki): Median time past lock-time calculations have been implemented since **v0.12.1** ([PR #6566](https://github.com/bitcoin/bitcoin/pull/6566)) and have been activated since *block 419328*.
 * [`BIP 125`](https://github.com/bitcoin/bips/blob/master/bip-0125.mediawiki): Opt-in full replace-by-fee signaling honoured in mempool and mining as of **v0.12.0** ([PR 6871](https://github.com/bitcoin/bitcoin/pull/6871)).
 * [`BIP 130`](https://github.com/bitcoin/bips/blob/master/bip-0130.mediawiki): direct headers announcement is negotiated with peer versions `>=70012` as of **v0.12.0** ([PR 6494](https://github.com/bitcoin/bitcoin/pull/6494)).
 * [`BIP 133`](https://github.com/bitcoin/bips/blob/master/bip-0133.mediawiki): feefilter messages are respected and sent for peer versions `>=70013` as of **v0.13.0** ([PR 7542](https://github.com/bitcoin/bitcoin/pull/7542)).

From 4fbdc4365ba73e6947dd9052b28818a4a99c0d64 Mon Sep 17 00:00:00 2001
From: Gregory Maxwell <greg@xiph.org>
Date: Tue, 5 Jul 2016 20:45:14 +0000
Subject: [PATCH 0595/1802] Revert "net: Avoid duplicate getheaders requests."
 PR #8054

This reverts commit f93c2a1b7ee912f0651ebb4c8a5eca220e434f4a.

This can cause synchronization to get stuck.
---
 src/main.cpp | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index 6cdd55e3979df..e26a73bc4b6d4 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -5835,13 +5835,6 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
             return true;
         }
 
-        // If we already know the last header in the message, then it contains
-        // no new information for us.  In this case, we do not request
-        // more headers later.  This prevents multiple chains of redundant
-        // getheader requests from running in parallel if triggered by incoming
-        // blocks while the node is still in initial headers sync.
-        const bool hasNewHeaders = (mapBlockIndex.count(headers.back().GetHash()) == 0);
-
         CBlockIndex *pindexLast = NULL;
         BOOST_FOREACH(const CBlockHeader& header, headers) {
             CValidationState state;
@@ -5862,7 +5855,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
         assert(pindexLast);
         UpdateBlockAvailability(pfrom->GetId(), pindexLast->GetBlockHash());
 
-        if (nCount == MAX_HEADERS_RESULTS && hasNewHeaders) {
+        if (nCount == MAX_HEADERS_RESULTS) {
             // Headers message had its maximum size; the peer may have more headers.
             // TODO: optimize: if pindexLast is an ancestor of chainActive.Tip or pindexBestHeader, continue
             // from there instead.

From c1d61fbd080bcc29589b8d467df98efb7e89d231 Mon Sep 17 00:00:00 2001
From: Suhas Daftuar <sdaftuar@chaincode.com>
Date: Tue, 5 Jul 2016 15:50:48 -0400
Subject: [PATCH 0596/1802] Add warning if -blockminsize is used.

---
 contrib/devtools/check-doc.py | 2 +-
 src/init.cpp                  | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/contrib/devtools/check-doc.py b/contrib/devtools/check-doc.py
index 06c9551cebae5..9ea0131ac3aa4 100755
--- a/contrib/devtools/check-doc.py
+++ b/contrib/devtools/check-doc.py
@@ -21,7 +21,7 @@
 REGEX_ARG = re.compile(r'(?:map(?:Multi)?Args(?:\.count\(|\[)|Get(?:Bool)?Arg\()\"(\-[^\"]+?)\"')
 REGEX_DOC = re.compile(r'HelpMessageOpt\(\"(\-[^\"=]+?)(?:=|\")')
 # list unsupported, deprecated and duplicate args as they need no documentation
-SET_DOC_OPTIONAL = set(['-rpcssl', '-benchmark', '-h', '-help', '-socks', '-tor', '-debugnet', '-whitelistalwaysrelay', '-prematurewitness', '-walletprematurewitness', '-promiscuousmempoolflags'])
+SET_DOC_OPTIONAL = set(['-rpcssl', '-benchmark', '-h', '-help', '-socks', '-tor', '-debugnet', '-whitelistalwaysrelay', '-prematurewitness', '-walletprematurewitness', '-promiscuousmempoolflags', '-blockminsize'])
 
 def main():
   used = check_output(CMD_GREP_ARGS, shell=True)
diff --git a/src/init.cpp b/src/init.cpp
index fdf6301d2ade3..7f82893286b16 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -876,6 +876,9 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
     if (GetBoolArg("-whitelistalwaysrelay", false))
         InitWarning(_("Unsupported argument -whitelistalwaysrelay ignored, use -whitelistrelay and/or -whitelistforcerelay."));
 
+    if (mapArgs.count("-blockminsize"))
+        InitWarning("Unsupported argument -blockminsize ignored.");
+
     // Checkmempool and checkblockindex default to true in regtest mode
     int ratio = std::min<int>(std::max<int>(GetArg("-checkmempool", chainparams.DefaultConsistencyChecks() ? 1 : 0), 0), 1000000);
     if (ratio != 0) {

From 32cab91278651d07a11132b7636dc3d21144e616 Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Mon, 27 Jun 2016 15:39:28 +0200
Subject: [PATCH 0597/1802] Bump `-dbcache` default to 300MiB

Also cap the allocation for the leveldb-specific cache for the UTXO set
to 8MiB.
This avoids that the extra cache memory goes to the much less effective
leveldb cache instead of our application-level cache.
---
 src/init.cpp |  4 ++--
 src/txdb.h   | 14 +++++++++++---
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/init.cpp b/src/init.cpp
index 5d29f14eb8821..22a6af74e026d 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -1216,10 +1216,10 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
     nTotalCache = std::max(nTotalCache, nMinDbCache << 20); // total cache cannot be less than nMinDbCache
     nTotalCache = std::min(nTotalCache, nMaxDbCache << 20); // total cache cannot be greated than nMaxDbcache
     int64_t nBlockTreeDBCache = nTotalCache / 8;
-    if (nBlockTreeDBCache > (1 << 21) && !GetBoolArg("-txindex", DEFAULT_TXINDEX))
-        nBlockTreeDBCache = (1 << 21); // block tree db cache shouldn't be larger than 2 MiB
+    nBlockTreeDBCache = std::min(nBlockTreeDBCache, (GetBoolArg("-txindex", DEFAULT_TXINDEX) ? nMaxBlockDBAndTxIndexCache : nMaxBlockDBCache) << 20);
     nTotalCache -= nBlockTreeDBCache;
     int64_t nCoinDBCache = std::min(nTotalCache / 2, (nTotalCache / 4) + (1 << 23)); // use 25%-50% of the remainder for disk cache
+    nCoinDBCache = std::min(nCoinDBCache, nMaxCoinsDBCache << 20); // cap total coins db cache
     nTotalCache -= nCoinDBCache;
     nCoinCacheUsage = nTotalCache; // the rest goes to in-memory cache
     LogPrintf("Cache configuration:\n");
diff --git a/src/txdb.h b/src/txdb.h
index ce3c39d7fec11..5b98d2792c50d 100644
--- a/src/txdb.h
+++ b/src/txdb.h
@@ -22,11 +22,19 @@ class CCoinsViewDBCursor;
 class uint256;
 
 //! -dbcache default (MiB)
-static const int64_t nDefaultDbCache = 100;
-//! max. -dbcache in (MiB)
+static const int64_t nDefaultDbCache = 300;
+//! max. -dbcache (MiB)
 static const int64_t nMaxDbCache = sizeof(void*) > 4 ? 16384 : 1024;
-//! min. -dbcache in (MiB)
+//! min. -dbcache (MiB)
 static const int64_t nMinDbCache = 4;
+//! Max memory allocated to block tree DB specific cache, if no -txindex (MiB)
+static const int64_t nMaxBlockDBCache = 2;
+//! Max memory allocated to block tree DB specific cache, if -txindex (MiB)
+// Unlike for the UTXO database, for the txindex scenario the leveldb cache make
+// a meaningful difference: https://github.com/bitcoin/bitcoin/pull/8273#issuecomment-229601991
+static const int64_t nMaxBlockDBAndTxIndexCache = 1024;
+//! Max memory allocated to coin DB specific cache (MiB)
+static const int64_t nMaxCoinsDBCache = 8;
 
 struct CDiskTxPos : public CDiskBlockPos
 {

From efd1d8339ad9a2bb7a164e7475734a90f6fa034c Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Thu, 30 Jun 2016 11:01:19 +0200
Subject: [PATCH 0598/1802] doc: Mention dbcache increase in release notes

---
 doc/release-notes.md | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/doc/release-notes.md b/doc/release-notes.md
index 6e4f390cbcc75..df63bb53eee2d 100644
--- a/doc/release-notes.md
+++ b/doc/release-notes.md
@@ -41,9 +41,21 @@ report issues about Windows XP to the issue tracker.
 Notable changes
 ===============
 
-Example item
-----------------
+Database cache memory increased
+--------------------------------
+
+As a result of growth of the UTXO set, performance with the prior default
+database cache of 100 MiB has suffered.
+For this reason the default was changed to 300 MiB in this release.
+
+For nodes on low-memory systems, the database cache can be changed back to
+100 MiB (or to another value) by either:
+
+- Adding `dbcache=100` in bitcoin.conf
+- Changing it in the GUI under `Options → Size of database cache`
 
+Note that the database cache setting has the most performance impact
+during initial sync of a node, and when catching up after downtime.
 
 bitcoin-cli: arguments privacy
 --------------------------------

From b978701ba1822140452d35f037ce776fdcba0175 Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Wed, 6 Jul 2016 05:25:57 +0000
Subject: [PATCH 0599/1802] qt: periodic translations update

---
 src/qt/bitcoinstrings.cpp      |   6 --
 src/qt/locale/bitcoin_bg.ts    | 124 ++++++++++++++++++++++++++++++++-
 src/qt/locale/bitcoin_da.ts    |  12 ++++
 src/qt/locale/bitcoin_de.ts    |   4 ++
 src/qt/locale/bitcoin_en.ts    |  48 +++++--------
 src/qt/locale/bitcoin_en_GB.ts |  12 ++++
 src/qt/locale/bitcoin_es.ts    |  12 ++++
 src/qt/locale/bitcoin_fr.ts    |  16 +++++
 src/qt/locale/bitcoin_fr_FR.ts |  24 +++++++
 src/qt/locale/bitcoin_ja.ts    |  12 ++++
 src/qt/locale/bitcoin_ms_MY.ts |   9 +++
 src/qt/locale/bitcoin_nl.ts    |   2 +-
 src/qt/locale/bitcoin_ru.ts    |  42 ++++++++++-
 src/qt/locale/bitcoin_ru_RU.ts |  10 ++-
 src/qt/locale/bitcoin_sv.ts    |  12 ++++
 src/qt/locale/bitcoin_th_TH.ts |  24 +++++++
 src/qt/locale/bitcoin_zh_TW.ts |  12 ++++
 17 files changed, 338 insertions(+), 43 deletions(-)

diff --git a/src/qt/bitcoinstrings.cpp b/src/qt/bitcoinstrings.cpp
index 7cf32cd34e8f7..9c5b1e09d4524 100644
--- a/src/qt/bitcoinstrings.cpp
+++ b/src/qt/bitcoinstrings.cpp
@@ -186,12 +186,6 @@ QT_TRANSLATE_NOOP("bitcoin-core", ""
 "comes in the format: <USERNAME>:<SALT>$<HASH>. A canonical python script is "
 "included in share/rpcuser. This option can be specified multiple times"),
 QT_TRANSLATE_NOOP("bitcoin-core", ""
-"WARNING: abnormally high number of blocks generated, %d blocks received in "
-"the last %d hours (%d expected)"),
-QT_TRANSLATE_NOOP("bitcoin-core", ""
-"WARNING: check your network connection, %d blocks received in the last %d "
-"hours (%d expected)"),
-QT_TRANSLATE_NOOP("bitcoin-core", ""
 "Warning: The network does not appear to fully agree! Some miners appear to "
 "be experiencing issues."),
 QT_TRANSLATE_NOOP("bitcoin-core", ""
diff --git a/src/qt/locale/bitcoin_bg.ts b/src/qt/locale/bitcoin_bg.ts
index 3bb881318288f..bd85d8c8b0e1f 100644
--- a/src/qt/locale/bitcoin_bg.ts
+++ b/src/qt/locale/bitcoin_bg.ts
@@ -63,6 +63,10 @@
 </context>
 <context>
     <name>BanTableModel</name>
+    <message>
+        <source>IP/Netmask</source>
+        <translation>IP/Netmask</translation>
+    </message>
     <message>
         <source>Banned Until</source>
         <translation>Със забранен достъп до</translation>
@@ -106,6 +110,14 @@
         <source>Quit application</source>
         <translation>Изход от приложението</translation>
     </message>
+    <message>
+        <source>&amp;About %1</source>
+        <translation>Относно %1</translation>
+    </message>
+    <message>
+        <source>Show information about %1</source>
+        <translation>Покажи информация относно %1</translation>
+    </message>
     <message>
         <source>About &amp;Qt</source>
         <translation>За &amp;Qt</translation>
@@ -118,6 +130,10 @@
         <source>&amp;Options...</source>
         <translation>&amp;Опции...</translation>
     </message>
+    <message>
+        <source>Modify configuration options for %1</source>
+        <translation>Промени настройки за %1</translation>
+    </message>
     <message>
         <source>&amp;Encrypt Wallet...</source>
         <translation>&amp;Шифриране на портфейла...</translation>
@@ -142,6 +158,10 @@
         <source>Open &amp;URI...</source>
         <translation>Отвори &amp;URI...</translation>
     </message>
+    <message>
+        <source>Reindexing blocks on disk...</source>
+        <translation>Повторно индексиране на блоковете на диска...</translation>
+    </message>
     <message>
         <source>Send coins to a Bitcoin address</source>
         <translation>Изпращане към Биткоин адрес</translation>
@@ -238,14 +258,46 @@
         <source>&amp;Command-line options</source>
         <translation>&amp;Налични команди</translation>
     </message>
+    <message numerus="yes">
+        <source>%n active connection(s) to Bitcoin network</source>
+        <translation><numerusform>%n активна връзка към Биткойн мрежата</numerusform><numerusform>%n активни връзки към Биткойн мрежата</numerusform></translation>
+    </message>
+    <message>
+        <source>Indexing blocks on disk...</source>
+        <translation>Индексиране на блокове на диска...</translation>
+    </message>
+    <message>
+        <source>Processing blocks on disk...</source>
+        <translation>Обработване на блокове на диска...</translation>
+    </message>
     <message>
         <source>No block source available...</source>
         <translation>Липсва източник на блоковете...</translation>
     </message>
+    <message numerus="yes">
+        <source>Processed %n block(s) of transaction history.</source>
+        <translation><numerusform>Преработен %n блок от историята с транзакции.</numerusform><numerusform>Преработени %n блокове от историята с транзакции.</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%n hour(s)</source>
+        <translation><numerusform>%n час</numerusform><numerusform>%n часа</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%n day(s)</source>
+        <translation><numerusform>%n ден</numerusform><numerusform>%n дни</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%n week(s)</source>
+        <translation><numerusform>%n седмица</numerusform><numerusform>%n седмици</numerusform></translation>
+    </message>
     <message>
         <source>%1 and %2</source>
         <translation>%1 и %2</translation>
     </message>
+    <message numerus="yes">
+        <source>%n year(s)</source>
+        <translation><numerusform>%n година</numerusform><numerusform>%n години</numerusform></translation>
+    </message>
     <message>
         <source>%1 behind</source>
         <translation>%1 зад</translation>
@@ -274,6 +326,14 @@
         <source>Up to date</source>
         <translation>Синхронизиран</translation>
     </message>
+    <message>
+        <source>Show the %1 help message to get a list with possible Bitcoin command-line options</source>
+        <translation>Покажи %1 помощно съобщение за да получиш лист с възможни Биткойн команди</translation>
+    </message>
+    <message>
+        <source>%1 client</source>
+        <translation>%1 клиент</translation>
+    </message>
     <message>
         <source>Catching up...</source>
         <translation>Зарежда блокове...</translation>
@@ -414,6 +474,14 @@
         <source>&amp;Label</source>
         <translation>&amp;Име</translation>
     </message>
+    <message>
+        <source>The label associated with this address list entry</source>
+        <translation>Етикетът свързан с това въведение в листа с адреси</translation>
+    </message>
+    <message>
+        <source>The address associated with this address list entry. This can only be modified for sending addresses.</source>
+        <translation>Адресът свързан с това въведение в листа с адреси. Това може да бъде променено само за адреси за изпращане.</translation>
+    </message>
     <message>
         <source>&amp;Address</source>
         <translation>&amp;Адрес</translation>
@@ -452,6 +520,10 @@
         <source>(%1-bit)</source>
         <translation>(%1-битов)</translation>
     </message>
+    <message>
+        <source>About %1</source>
+        <translation>Относно %1</translation>
+    </message>
     <message>
         <source>Command-line options</source>
         <translation>Списък с команди</translation>
@@ -464,13 +536,45 @@
         <source>command-line options</source>
         <translation>Списък с налични команди</translation>
     </message>
-    </context>
+    <message>
+        <source>UI Options:</source>
+        <translation>Опции на интерфейс:</translation>
+    </message>
+    <message>
+        <source>Choose data directory on startup (default: %u)</source>
+        <translation>Избери директория за данни при стартирване (по подразбиране: %u)</translation>
+    </message>
+    <message>
+        <source>Set language, for example "de_DE" (default: system locale)</source>
+        <translation>Избери език, примерно "de_DE" (по подразбиране: system locale)</translation>
+    </message>
+    <message>
+        <source>Start minimized</source>
+        <translation>Стартирай минимизиран</translation>
+    </message>
+    <message>
+        <source>Set SSL root certificates for payment request (default: -system-)</source>
+        <translation>Задай SSL root сертификат за молба за изплащане (по подразбиране: -system-)</translation>
+    </message>
+    <message>
+        <source>Show splash screen on startup (default: %u)</source>
+        <translation>Покажи splash екран при стартирване (по подразбиране %u)</translation>
+    </message>
+    <message>
+        <source>Reset all settings changed in the GUI</source>
+        <translation>Нулиране на всички настройки променени в GUI</translation>
+    </message>
+</context>
 <context>
     <name>Intro</name>
     <message>
         <source>Welcome</source>
         <translation>Добре дошли</translation>
     </message>
+    <message>
+        <source>Welcome to %1.</source>
+        <translation>Добре дошли в %1.</translation>
+    </message>
     <message>
         <source>Use the default data directory</source>
         <translation>Използване на директория по подразбиране</translation>
@@ -483,13 +587,29 @@
         <source>Error</source>
         <translation>Грешка</translation>
     </message>
-    </context>
+    <message numerus="yes">
+        <source>%n GB of free space available</source>
+        <translation><numerusform>%n GB свободно пространство на разположение</numerusform><numerusform>%n GB свободно пространство на разположение</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>(of %n GB needed)</source>
+        <translation><numerusform>(%n GB е нужен)</numerusform><numerusform>(%n GB са нужни)</numerusform></translation>
+    </message>
+</context>
 <context>
     <name>OpenURIDialog</name>
     <message>
         <source>Open URI</source>
         <translation>Отваряне на URI</translation>
     </message>
+    <message>
+        <source>Open payment request from URI or file</source>
+        <translation>Отвори молба за изплащане от URI или файл</translation>
+    </message>
+    <message>
+        <source>URI:</source>
+        <translation>URI:</translation>
+    </message>
     </context>
 <context>
     <name>OptionsDialog</name>
diff --git a/src/qt/locale/bitcoin_da.ts b/src/qt/locale/bitcoin_da.ts
index 91903088cf5a4..fd1a4a08638aa 100644
--- a/src/qt/locale/bitcoin_da.ts
+++ b/src/qt/locale/bitcoin_da.ts
@@ -1878,6 +1878,10 @@
         <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
         <translation>Dette er en foreløbig testudgivelse - brug på eget ansvar - brug ikke til udvinding eller handelsprogrammer</translation>
     </message>
+    <message>
+        <source>Unable to rewind the database to a pre-fork state. You will need to redownload the blockchain</source>
+        <translation>Kan ikke spole databasen tilbage til en tilstand inden en splitning. Du er nødt til at downloade blokkæden igen</translation>
+    </message>
     <message>
         <source>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</source>
         <translation>Brug UPnP for at konfigurere den lyttende port (standard: 1 under lytning og ingen -proxy)</translation>
@@ -2098,10 +2102,18 @@
         <source>Rebuild chain state from the currently indexed blocks</source>
         <translation>Genopbyg kædetilstand ud fra de aktuelt indekserede blokke</translation>
     </message>
+    <message>
+        <source>Rewinding blocks...</source>
+        <translation>Spoler blokke tilbage…</translation>
+    </message>
     <message>
         <source>Set database cache size in megabytes (%d to %d, default: %d)</source>
         <translation>Sæt cache-størrelse for database i megabytes (%d til %d; standard: %d)</translation>
     </message>
+    <message>
+        <source>Set maximum block cost (default: %d)</source>
+        <translation>Sæt maksimal blokudgift (standard: %d)</translation>
+    </message>
     <message>
         <source>Set maximum block size in bytes (default: %d)</source>
         <translation>Sæt maksimum blokstørrelse i byte (standard: %d)</translation>
diff --git a/src/qt/locale/bitcoin_de.ts b/src/qt/locale/bitcoin_de.ts
index 639bc3cf2f72e..77482c774bb80 100644
--- a/src/qt/locale/bitcoin_de.ts
+++ b/src/qt/locale/bitcoin_de.ts
@@ -1009,6 +1009,10 @@
         <source>Using BerkeleyDB version</source>
         <translation>Verwendete BerkeleyDB-Version</translation>
     </message>
+    <message>
+        <source>Datadir</source>
+        <translation>Datenverz</translation>
+    </message>
     <message>
         <source>Startup time</source>
         <translation>Startzeit</translation>
diff --git a/src/qt/locale/bitcoin_en.ts b/src/qt/locale/bitcoin_en.ts
index 9723ffa3949ba..c6f3a4013c48e 100644
--- a/src/qt/locale/bitcoin_en.ts
+++ b/src/qt/locale/bitcoin_en.ts
@@ -1262,13 +1262,7 @@
 <context>
     <name>RPCConsole</name>
     <message>
-        <location filename="../forms/debugwindow.ui" line="+46"/>
-        <source>Client name</source>
-        <translation>Client name</translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <location line="+23"/>
+        <location filename="../forms/debugwindow.ui" line="+56"/>
         <location line="+26"/>
         <location line="+26"/>
         <location line="+23"/>
@@ -1305,7 +1299,7 @@
         <translation>Client version</translation>
     </message>
     <message>
-        <location line="-45"/>
+        <location line="-22"/>
         <source>&amp;Information</source>
         <translation>&amp;Information</translation>
     </message>
@@ -1320,7 +1314,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+79"/>
+        <location line="+56"/>
         <source>Using BerkeleyDB version</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1399,7 +1393,7 @@
     <message>
         <location line="+60"/>
         <location filename="../rpcconsole.cpp" line="+295"/>
-        <location line="+635"/>
+        <location line="+634"/>
         <source>Select a peer to view detailed information.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1550,7 +1544,7 @@
         <translation>Clear console</translation>
     </message>
     <message>
-        <location filename="../rpcconsole.cpp" line="-204"/>
+        <location filename="../rpcconsole.cpp" line="-203"/>
         <source>&amp;Disconnect Node</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1588,7 +1582,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+118"/>
+        <location line="+117"/>
         <source>Welcome to the %1 RPC console.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2232,7 +2226,7 @@
 <context>
     <name>bitcoin-core</name>
     <message>
-        <location filename="../bitcoinstrings.cpp" line="+298"/>
+        <location filename="../bitcoinstrings.cpp" line="+292"/>
         <source>Options:</source>
         <translation>Options:</translation>
     </message>
@@ -2257,7 +2251,7 @@
         <translation>Accept command line and JSON-RPC commands</translation>
     </message>
     <message>
-        <location line="-134"/>
+        <location line="-128"/>
         <source>If &lt;category&gt; is not supplied or if &lt;category&gt; = 1, output all debugging information.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2282,7 +2276,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+125"/>
+        <location line="+119"/>
         <source>Error: A fatal internal error occurred, see debug.log for details</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2312,7 +2306,7 @@
         <translation>Accept connections from outside (default: 1 if no -proxy or -connect)</translation>
     </message>
     <message>
-        <location line="-212"/>
+        <location line="-206"/>
         <source>Bitcoin Core</source>
         <translation type="unfinished">Bitcoin Core</translation>
     </message>
@@ -2423,16 +2417,6 @@
     </message>
     <message>
         <location line="+12"/>
-        <source>WARNING: abnormally high number of blocks generated, %d blocks received in the last %d hours (%d expected)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>WARNING: check your network connection, %d blocks received in the last %d hours (%d expected)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
         <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source>
         <translation>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</translation>
     </message>
@@ -2782,7 +2766,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-328"/>
+        <location line="-322"/>
         <source>Allow JSON-RPC connections from specified source. Valid for &lt;ip&gt; are a single IP (e.g. 1.2.3.4), a network/netmask (e.g. 1.2.3.4/255.255.255.0) or a network/CIDR (e.g. 1.2.3.4/24). This option can be specified multiple times</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2867,7 +2851,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+26"/>
         <source>Whitelisted peers cannot be DoS banned and their transactions are always relayed, even if they are already in the mempool, useful e.g. for a gateway</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3062,12 +3046,12 @@
         <translation>Password for JSON-RPC connections</translation>
     </message>
     <message>
-        <location line="-224"/>
+        <location line="-218"/>
         <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
         <translation>Execute command when the best block changes (%s in cmd is replaced by block hash)</translation>
     </message>
     <message>
-        <location line="+152"/>
+        <location line="+146"/>
         <source>Allow DNS lookups for -addnode, -seednode and -connect</source>
         <translation>Allow DNS lookups for -addnode, -seednode and -connect</translation>
     </message>
@@ -3077,7 +3061,7 @@
         <translation>Loading addresses...</translation>
     </message>
     <message>
-        <location line="-270"/>
+        <location line="-264"/>
         <source>(1 = keep tx meta data e.g. account owner and payment request information, 2 = drop tx meta data)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3157,7 +3141,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location line="+7"/>
         <source>Warning: Unknown block versions being mined! It&apos;s possible unknown rules are in effect</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/src/qt/locale/bitcoin_en_GB.ts b/src/qt/locale/bitcoin_en_GB.ts
index 89653e7aafd69..226444e9c56c6 100644
--- a/src/qt/locale/bitcoin_en_GB.ts
+++ b/src/qt/locale/bitcoin_en_GB.ts
@@ -1878,6 +1878,10 @@
         <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
         <translation>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</translation>
     </message>
+    <message>
+        <source>Unable to rewind the database to a pre-fork state. You will need to redownload the blockchain</source>
+        <translation>Unable to rewind the database to a pre-fork state. You will need to re-download the blockchain</translation>
+    </message>
     <message>
         <source>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</source>
         <translation>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</translation>
@@ -2098,10 +2102,18 @@
         <source>Rebuild chain state from the currently indexed blocks</source>
         <translation>Rebuild chain state from the currently indexed blocks</translation>
     </message>
+    <message>
+        <source>Rewinding blocks...</source>
+        <translation>Rewinding blocks...</translation>
+    </message>
     <message>
         <source>Set database cache size in megabytes (%d to %d, default: %d)</source>
         <translation>Set database cache size in megabytes (%d to %d, default: %d)</translation>
     </message>
+    <message>
+        <source>Set maximum block cost (default: %d)</source>
+        <translation>Set maximum block cost (default: %d)</translation>
+    </message>
     <message>
         <source>Set maximum block size in bytes (default: %d)</source>
         <translation>Set maximum block size in bytes (default: %d)</translation>
diff --git a/src/qt/locale/bitcoin_es.ts b/src/qt/locale/bitcoin_es.ts
index fc430e86b3c04..80cbe399321d2 100644
--- a/src/qt/locale/bitcoin_es.ts
+++ b/src/qt/locale/bitcoin_es.ts
@@ -1877,6 +1877,10 @@
         <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
         <translation>Esta es una versión de pre-prueba - utilícela bajo su propio riesgo. No la utilice para usos comerciales o de minería.</translation>
     </message>
+    <message>
+        <source>Unable to rewind the database to a pre-fork state. You will need to redownload the blockchain</source>
+        <translation>No es posible reconstruir la base de datos a un estado anterior. Debe descargar de nuevo la cadena de bloques.</translation>
+    </message>
     <message>
         <source>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</source>
         <translation>Utiliza UPnP para asignar el puerto de escucha (predeterminado: 1 cuando esta escuchando sin -proxy)</translation>
@@ -2097,10 +2101,18 @@
         <source>Rebuild chain state from the currently indexed blocks</source>
         <translation>Reconstruir el estado de la cadena a partir de los bloques indexados</translation>
     </message>
+    <message>
+        <source>Rewinding blocks...</source>
+        <translation>Verificando bloques...</translation>
+    </message>
     <message>
         <source>Set database cache size in megabytes (%d to %d, default: %d)</source>
         <translation>Asignar tamaño de cache en megabytes (entre %d y %d; predeterminado: %d)</translation>
     </message>
+    <message>
+        <source>Set maximum block cost (default: %d)</source>
+        <translation>Establecer tamaño máximo de bloque (por defecto: %d)</translation>
+    </message>
     <message>
         <source>Set maximum block size in bytes (default: %d)</source>
         <translation>Establecer tamaño máximo de bloque en bytes (predeterminado: %d)</translation>
diff --git a/src/qt/locale/bitcoin_fr.ts b/src/qt/locale/bitcoin_fr.ts
index fe745f99bf181..5c4f7f2b04ae2 100644
--- a/src/qt/locale/bitcoin_fr.ts
+++ b/src/qt/locale/bitcoin_fr.ts
@@ -1858,6 +1858,10 @@
         <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
         <translation>Ceci est une pré-version de test - l'utiliser à vos risques et périls - ne pas l'utiliser pour miner ou pour des applications marchandes</translation>
     </message>
+    <message>
+        <source>Unable to rewind the database to a pre-fork state. You will need to redownload the blockchain</source>
+        <translation>Impossible de rebobiner la base de données à un état préfourche. Vous devrez retélécharger la chaîne de blocs</translation>
+    </message>
     <message>
         <source>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</source>
         <translation>Utiliser l'UPnP pour mapper le port d'écoute (par défaut : 1 lors de l'écoute et pas de mandataire -proxy)</translation>
@@ -2070,10 +2074,18 @@
         <source>Rebuild chain state from the currently indexed blocks</source>
         <translation>Reconstruire l'état de la chaîne à partir des blocs indexés actuellement</translation>
     </message>
+    <message>
+        <source>Rewinding blocks...</source>
+        <translation>Rebobinage des blocs...</translation>
+    </message>
     <message>
         <source>Set database cache size in megabytes (%d to %d, default: %d)</source>
         <translation>Définir la taille du cache de la base de données en mégaoctets (%d to %d, default: %d)</translation>
     </message>
+    <message>
+        <source>Set maximum block cost (default: %d)</source>
+        <translation>Définir le coût maximal de bloc (par défaut : %d)</translation>
+    </message>
     <message>
         <source>Set maximum block size in bytes (default: %d)</source>
         <translation>Définir la taille minimale de bloc en octets (par défaut : %d)</translation>
@@ -2190,6 +2202,10 @@
         <source>This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit &lt;https://www.openssl.org/&gt; and cryptographic software written by Eric Young and UPnP software written by Thomas Bernard.</source>
         <translation>Ce produit comprend des logiciels développés par le projet OpenSSL pour être utilisés dans la boîte à outils OpenSSL &lt;https://www.openssl.org/&gt; et un logiciel cryptographique écrit par Eric Young, ainsi qu'un logiciel UPnP écrit par Thomas Bernard.</translation>
     </message>
+    <message>
+        <source>Use hierarchical deterministic key generation (HD) after BIP32. Only has effect during wallet creation/first start</source>
+        <translation>Utiliser une génération de clef hiérarchique déterministe (HD) après BIP32. N'a d'effet que lors de la création/premier lancement du porte-monnaie</translation>
+    </message>
     <message>
         <source>Whitelisted peers cannot be DoS banned and their transactions are always relayed, even if they are already in the mempool, useful e.g. for a gateway</source>
         <translation>Les pairs de la liste blanche ne peuvent pas être bannis DoS et leurs transactions sont toujours relayées, même si elles sont déjà dans le mempool, utile p. ex. pour une passerelle</translation>
diff --git a/src/qt/locale/bitcoin_fr_FR.ts b/src/qt/locale/bitcoin_fr_FR.ts
index f7fd7e6a18e50..08824e113a552 100644
--- a/src/qt/locale/bitcoin_fr_FR.ts
+++ b/src/qt/locale/bitcoin_fr_FR.ts
@@ -254,6 +254,10 @@
         <source>%n active connection(s) to Bitcoin network</source>
         <translation><numerusform>%n connexion active au réseau Bitcoin</numerusform><numerusform>%n connexions actives au réseau Bitcoin</numerusform></translation>
     </message>
+    <message>
+        <source>Indexing blocks on disk...</source>
+        <translation>Indexation des blocs sur le disque...</translation>
+    </message>
     <message>
         <source>No block source available...</source>
         <translation>Aucun bloc source disponible</translation>
@@ -306,6 +310,10 @@
         <source>Up to date</source>
         <translation>À jour</translation>
     </message>
+    <message>
+        <source>%1 client</source>
+        <translation>%1 client</translation>
+    </message>
     <message>
         <source>Catching up...</source>
         <translation>Rattrapage...</translation>
@@ -511,6 +519,10 @@
         <source>Welcome</source>
         <translation>Bienvenue </translation>
     </message>
+    <message>
+        <source>Welcome to %1.</source>
+        <translation>Bienvenue sur %1.</translation>
+    </message>
     <message>
         <source>Use the default data directory</source>
         <translation>Utiliser le répertoire par défaut </translation>
@@ -641,6 +653,14 @@
         <source>&amp;Window</source>
         <translation>&amp;Fenêtre</translation>
     </message>
+    <message>
+        <source>&amp;Hide the icon from the system tray.</source>
+        <translation>&amp;Cacher l'icône dans la zone de notification.</translation>
+    </message>
+    <message>
+        <source>Hide tray icon</source>
+        <translation>Cacher l'icône de la zone de notification</translation>
+    </message>
     <message>
         <source>&amp;Minimize to the tray instead of the taskbar</source>
         <translation>&amp;Minimiser dans la barre système au lieu de la barre des tâches</translation>
@@ -1326,6 +1346,10 @@
         <source>Run in the background as a daemon and accept commands</source>
         <translation>Fonctionner en arrière-plan en tant que démon et accepter les commandes</translation>
     </message>
+    <message>
+        <source>Unable to start HTTP server. See debug log for details.</source>
+        <translation>Impossible de démarrer le serveur HTTP. Voir le journal de débogage pour plus de détails.</translation>
+    </message>
     <message>
         <source>Bitcoin Core</source>
         <translation>Bitcoin Core</translation>
diff --git a/src/qt/locale/bitcoin_ja.ts b/src/qt/locale/bitcoin_ja.ts
index b2dae186d97c9..460a652e3750a 100644
--- a/src/qt/locale/bitcoin_ja.ts
+++ b/src/qt/locale/bitcoin_ja.ts
@@ -1878,6 +1878,10 @@
         <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
         <translation>これはリリース前のテストビルドです - 各自の責任で利用すること - 採掘や商取引に使用しないでください</translation>
     </message>
+    <message>
+        <source>Unable to rewind the database to a pre-fork state. You will need to redownload the blockchain</source>
+        <translation>データベースをフォーク前の状態に巻き戻せませんでした。ブロックチェーンを再ダウンロードする必要があります</translation>
+    </message>
     <message>
         <source>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</source>
         <translation>リスン ポートの割当に UPnP を使用 (初期値: リスン中および-proxyが指定されていない場合は1)</translation>
@@ -2099,10 +2103,18 @@
         <source>Rebuild chain state from the currently indexed blocks</source>
         <translation>既にインデックスされたブロックからチェイン状態を再構築する</translation>
     </message>
+    <message>
+        <source>Rewinding blocks...</source>
+        <translation>ブロックを巻き戻しています...</translation>
+    </message>
     <message>
         <source>Set database cache size in megabytes (%d to %d, default: %d)</source>
         <translation>データベースのキャッシュサイズをメガバイトで設定 (%dから%d。初期値: %d)</translation>
     </message>
+    <message>
+        <source>Set maximum block cost (default: %d)</source>
+        <translation>最大ブロックコストを設定 (初期値: %d)</translation>
+    </message>
     <message>
         <source>Set maximum block size in bytes (default: %d)</source>
         <translation>最大ブロックサイズをバイトで設定 (初期値: %d)</translation>
diff --git a/src/qt/locale/bitcoin_ms_MY.ts b/src/qt/locale/bitcoin_ms_MY.ts
index de4c32c2df868..acfb38e418c7a 100644
--- a/src/qt/locale/bitcoin_ms_MY.ts
+++ b/src/qt/locale/bitcoin_ms_MY.ts
@@ -17,6 +17,15 @@
         <source>&amp;Copy</source>
         <translation>&amp;Salin</translation>
     </message>
+    <message>
+        <source>Delete the currently selected address from the list</source>
+        <translation>Padam alamat semasa yang dipilih dari senaraiyang dipilih dari senarai</translation>
+    </message>
+    <message>
+        <source>Export the data in the current tab to a file</source>
+        <translation>
+Alihkan fail data ke dalam tab semasa</translation>
+    </message>
     <message>
         <source>&amp;Export</source>
         <translation>&amp;Eksport</translation>
diff --git a/src/qt/locale/bitcoin_nl.ts b/src/qt/locale/bitcoin_nl.ts
index 3009c154e334e..2b0cded386d2c 100644
--- a/src/qt/locale/bitcoin_nl.ts
+++ b/src/qt/locale/bitcoin_nl.ts
@@ -870,7 +870,7 @@
     </message>
     <message>
         <source>The displayed information may be out of date. Your wallet automatically synchronizes with the Bitcoin network after a connection is established, but this process has not completed yet.</source>
-        <translation>De weergegeven informatie kan verouderd zijn. Uw portemonnee synchroniseert automaticsh met het Bitcoinnetwerk nadat een verbinding is gelegd, maar dit proces is nog niet voltooid.</translation>
+        <translation>De weergegeven informatie kan verouderd zijn. Uw portemonnee synchroniseert automatisch met het Bitcoinnetwerk nadat een verbinding is gelegd, maar dit proces is nog niet voltooid.</translation>
     </message>
     <message>
         <source>Watch-only:</source>
diff --git a/src/qt/locale/bitcoin_ru.ts b/src/qt/locale/bitcoin_ru.ts
index e2949a9482539..750ea7db650a2 100644
--- a/src/qt/locale/bitcoin_ru.ts
+++ b/src/qt/locale/bitcoin_ru.ts
@@ -130,6 +130,10 @@
         <source>&amp;Options...</source>
         <translation>&amp;Параметры</translation>
     </message>
+    <message>
+        <source>Modify configuration options for %1</source>
+        <translation>Изменить конфигурационные настройки для %1</translation>
+    </message>
     <message>
         <source>&amp;Encrypt Wallet...</source>
         <translation>&amp;Зашифровать бумажник...</translation>
@@ -552,7 +556,11 @@
         <source>Show splash screen on startup (default: %u)</source>
         <translation>Показывать экран-заставку при запуске (по умолчанию: %u)</translation>
     </message>
-    </context>
+    <message>
+        <source>Reset all settings changed in the GUI</source>
+        <translation>Сбросить все настройки, измененные в графическом интерфейсе</translation>
+    </message>
+</context>
 <context>
     <name>Intro</name>
     <message>
@@ -563,6 +571,14 @@
         <source>Welcome to %1.</source>
         <translation>Добро пожаловать в %1</translation>
     </message>
+    <message>
+        <source>As this is the first time the program is launched, you can choose where %1 will store its data.</source>
+        <translation>При первом запуске программы вы можете выбрать где %1 будет хранить свои данные.</translation>
+    </message>
+    <message>
+        <source>%1 will download and store a copy of the Bitcoin block chain. At least %2GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source>
+        <translation>%1 скачает и сохранит копию цепи блоков. Как минимум %2GB будут записаны в этот каталог, и со временем он будет расти. Бумажник также будет сохранен в этом каталоге.</translation>
+    </message>
     <message>
         <source>Use the default data directory</source>
         <translation>Использовать каталог данных по умолчанию</translation>
@@ -617,6 +633,14 @@
         <source>&amp;Main</source>
         <translation>&amp;Главная</translation>
     </message>
+    <message>
+        <source>Automatically start %1 after logging in to the system.</source>
+        <translation>Автоматически запускать %1 после входа в систему.</translation>
+    </message>
+    <message>
+        <source>&amp;Start %1 on system login</source>
+        <translation>&amp;Запускать %1 при входе в систему</translation>
+    </message>
     <message>
         <source>Size of &amp;database cache</source>
         <translation>Размер кэша &amp;БД</translation>
@@ -753,6 +777,10 @@
         <source>&amp;Window</source>
         <translation>&amp;Окно</translation>
     </message>
+    <message>
+        <source>&amp;Hide the icon from the system tray.</source>
+        <translation>&amp;Скрыть иконку из системного трея.</translation>
+    </message>
     <message>
         <source>Hide tray icon</source>
         <translation>Скрыть иконку в трее</translation>
@@ -777,6 +805,10 @@
         <source>User Interface &amp;language:</source>
         <translation>&amp;Язык интерфейса:</translation>
     </message>
+    <message>
+        <source>The user interface language can be set here. This setting will take effect after restarting %1.</source>
+        <translation>Здесь можно установить язык пользовательского интерфейса. Настройки вступят в силу после перезагрузки %1</translation>
+    </message>
     <message>
         <source>&amp;Unit to show amounts in:</source>
         <translation>&amp;Отображать суммы в единицах: </translation>
@@ -985,6 +1017,10 @@
         <source>Using BerkeleyDB version</source>
         <translation>Используется версия BerkeleyDB</translation>
     </message>
+    <message>
+        <source>Datadir</source>
+        <translation>Каталог для данных</translation>
+    </message>
     <message>
         <source>Startup time</source>
         <translation>Время запуска</translation>
@@ -1069,6 +1105,10 @@
         <source>User Agent</source>
         <translation>Юзер-агент</translation>
     </message>
+    <message>
+        <source>Open the %1 debug log file from the current data directory. This can take a few seconds for large log files.</source>
+        <translation>Открыть отладочный лог-файл %1 из текущего каталога данных. Это может занять несколько секунд для больших лог-файлов.</translation>
+    </message>
     <message>
         <source>Services</source>
         <translation>Сервисы</translation>
diff --git a/src/qt/locale/bitcoin_ru_RU.ts b/src/qt/locale/bitcoin_ru_RU.ts
index a6f9ffccbd776..66419728e2c20 100644
--- a/src/qt/locale/bitcoin_ru_RU.ts
+++ b/src/qt/locale/bitcoin_ru_RU.ts
@@ -1,6 +1,10 @@
 <TS language="ru_RU" version="2.1">
 <context>
     <name>AddressBookPage</name>
+    <message>
+        <source>Right-click to edit address or label</source>
+        <translation>Кликните правой кнопкой мыши для редоктирования адреса или ярлыка</translation>
+    </message>
     <message>
         <source>Create a new address</source>
         <translation>Создать новый адрес</translation>
@@ -40,7 +44,11 @@
 </context>
 <context>
     <name>AskPassphraseDialog</name>
-    </context>
+    <message>
+        <source>Repeat new passphrase</source>
+        <translation>Повторите новый пароль</translation>
+    </message>
+</context>
 <context>
     <name>BanTableModel</name>
     </context>
diff --git a/src/qt/locale/bitcoin_sv.ts b/src/qt/locale/bitcoin_sv.ts
index a637cebe2cd53..6361b5ea5ff87 100644
--- a/src/qt/locale/bitcoin_sv.ts
+++ b/src/qt/locale/bitcoin_sv.ts
@@ -1874,6 +1874,10 @@
         <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
         <translation>Detta är ett förhands testbygge - använd på egen risk - använd inte för mining eller handels applikationer</translation>
     </message>
+    <message>
+        <source>Unable to rewind the database to a pre-fork state. You will need to redownload the blockchain</source>
+        <translation>Kan inte spola tillbaka databasen till obeskärt läge. Du måste ladda ner blockkedjan igen</translation>
+    </message>
     <message>
         <source>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</source>
         <translation>Använd UPnP för att mappa den lyssnande porten (förvalt: 1 när lyssning aktiverat och utan -proxy)</translation>
@@ -2094,10 +2098,18 @@
         <source>Rebuild chain state from the currently indexed blocks</source>
         <translation>Återskapa blockkedjans status från aktuella indexerade block</translation>
     </message>
+    <message>
+        <source>Rewinding blocks...</source>
+        <translation>Spolar tillbaka blocken...</translation>
+    </message>
     <message>
         <source>Set database cache size in megabytes (%d to %d, default: %d)</source>
         <translation>Sätt databasens cachestorlek i megabyte (%d till %d, förvalt: %d)</translation>
     </message>
+    <message>
+        <source>Set maximum block cost (default: %d)</source>
+        <translation>Sätt maximal blockkostnad (förvalt: %d)</translation>
+    </message>
     <message>
         <source>Set maximum block size in bytes (default: %d)</source>
         <translation>Sätt maximal blockstorlek i byte (förvalt: %d)</translation>
diff --git a/src/qt/locale/bitcoin_th_TH.ts b/src/qt/locale/bitcoin_th_TH.ts
index 2630939146563..34c75263416b5 100644
--- a/src/qt/locale/bitcoin_th_TH.ts
+++ b/src/qt/locale/bitcoin_th_TH.ts
@@ -765,6 +765,30 @@
         <source>Tor</source>
         <translation>Tor</translation>
     </message>
+    <message>
+        <source>Connect to the Bitcoin network through a separate SOCKS5 proxy for Tor hidden services.</source>
+        <translation>เชื่อมต่อกับ เครือข่าย Bitcoin ผ่านทาง พร้อกซี่ SOCKS5 แยกต่างหาก สำหรับ Tor เซอร์วิส</translation>
+    </message>
+    <message>
+        <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services:</source>
+        <translation>ใช้ พร็อกซี่ SOCKS5 แยก เพื่อเข้าถึง peers ผ่าน Tor เซอร์วิสซ่อน:</translation>
+    </message>
+    <message>
+        <source>&amp;Window</source>
+        <translation>&amp;วันโดว์</translation>
+    </message>
+    <message>
+        <source>&amp;Hide the icon from the system tray.</source>
+        <translation>&amp;ซ่อนไอคอน จากเทรย์ระบบ</translation>
+    </message>
+    <message>
+        <source>Hide tray icon</source>
+        <translation>ซ่อนไอคอนเทรย์</translation>
+    </message>
+    <message>
+        <source>Show only a tray icon after minimizing the window.</source>
+        <translation>แสดงเทรย์ไอคอน หลังมืนิไมส์วินโดว์ เท่านั้น</translation>
+    </message>
     </context>
 <context>
     <name>OverviewPage</name>
diff --git a/src/qt/locale/bitcoin_zh_TW.ts b/src/qt/locale/bitcoin_zh_TW.ts
index cbdb8f2c0bacf..c71a37ba986e0 100644
--- a/src/qt/locale/bitcoin_zh_TW.ts
+++ b/src/qt/locale/bitcoin_zh_TW.ts
@@ -1879,6 +1879,10 @@
         <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
         <translation>這是個還沒發表的測試版本 - 使用請自負風險 - 請不要用來開採或商業應用</translation>
     </message>
+    <message>
+        <source>Unable to rewind the database to a pre-fork state. You will need to redownload the blockchain</source>
+        <translation>沒辦法將資料庫倒轉回分岔前的狀態。必須要重新下載區塊鍊。</translation>
+    </message>
     <message>
         <source>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</source>
         <translation>是否要使用「通用即插即用」協定(UPnP)，來設定聽候連線的通訊埠的對應(預設值: 當有聽候連線且沒有指定 -proxy 參數時為 1)</translation>
@@ -2099,10 +2103,18 @@
         <source>Rebuild chain state from the currently indexed blocks</source>
         <translation>從目前已編索引的區塊資料重建區塊鏈狀態</translation>
     </message>
+    <message>
+        <source>Rewinding blocks...</source>
+        <translation>倒轉回區塊鏈之前的狀態...</translation>
+    </message>
     <message>
         <source>Set database cache size in megabytes (%d to %d, default: %d)</source>
         <translation>設定資料庫快取大小是多少百萬位元組(MB，範圍: %d 到 %d，預設值: %d)</translation>
     </message>
+    <message>
+        <source>Set maximum block cost (default: %d)</source>
+        <translation>設定區塊成本的最大值(預設值: %d)</translation>
+    </message>
     <message>
         <source>Set maximum block size in bytes (default: %d)</source>
         <translation>設定區塊大小上限成多少位元組(預設值: %d)</translation>

From cf2ef786a1ef78edefd7c1029feb46d1a9061b75 Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Wed, 6 Jul 2016 17:29:43 -0400
Subject: [PATCH 0600/1802] build: require boost for bench

---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 97af58bd7cd85..496e4ad9e7f24 100644
--- a/configure.ac
+++ b/configure.ac
@@ -583,7 +583,7 @@ BITCOIN_QT_INIT
 dnl sets $bitcoin_enable_qt, $bitcoin_enable_qt_test, $bitcoin_enable_qt_dbus
 BITCOIN_QT_CONFIGURE([$use_pkgconfig], [qt5])
 
-if test x$build_bitcoin_utils$build_bitcoind$bitcoin_enable_qt$use_tests = xnononono; then
+if test x$build_bitcoin_utils$build_bitcoind$bitcoin_enable_qt$use_tests$use_bench = xnonononono; then
     use_boost=no
 else
     use_boost=yes

From 36ae37a9f910922954d48ed1f3f2177d8b227205 Mon Sep 17 00:00:00 2001
From: Bob McElrath <bob_git@mcelrath.org>
Date: Wed, 6 Jul 2016 19:46:46 -0400
Subject: [PATCH 0601/1802] Rename CTxinWitness -> CTxInWitness

---
 qa/rpc-tests/p2p-segwit.py                | 48 +++++++++++------------
 qa/rpc-tests/test_framework/blocktools.py |  2 +-
 qa/rpc-tests/test_framework/mininode.py   |  6 +--
 src/core_memusage.h                       |  4 +-
 src/primitives/transaction.h              |  6 +--
 src/test/sigopcount_tests.cpp             | 14 +++----
 6 files changed, 40 insertions(+), 40 deletions(-)

diff --git a/qa/rpc-tests/p2p-segwit.py b/qa/rpc-tests/p2p-segwit.py
index cf78954f286bc..8e4bc989b8eb7 100755
--- a/qa/rpc-tests/p2p-segwit.py
+++ b/qa/rpc-tests/p2p-segwit.py
@@ -252,7 +252,7 @@ def test_unnecessary_witness_before_segwit_activation(self):
         tx = CTransaction()
         tx.vin.append(CTxIn(COutPoint(self.utxo[0].sha256, self.utxo[0].n), b""))
         tx.vout.append(CTxOut(self.utxo[0].nValue-1000, CScript([OP_TRUE])))
-        tx.wit.vtxinwit.append(CTxinWitness())
+        tx.wit.vtxinwit.append(CTxInWitness())
         tx.wit.vtxinwit[0].scriptWitness.stack = [CScript([CScriptNum(1)])]
 
         # Verify the hash with witness differs from the txid
@@ -362,7 +362,7 @@ def test_witness_commitments(self):
         tx2 = CTransaction()
         tx2.vin.append(CTxIn(COutPoint(tx.sha256, 0), b""))
         tx2.vout.append(CTxOut(tx.vout[0].nValue-1000, witness_program))
-        tx2.wit.vtxinwit.append(CTxinWitness())
+        tx2.wit.vtxinwit.append(CTxInWitness())
         tx2.wit.vtxinwit[0].scriptWitness.stack = [witness_program]
         tx2.rehash()
 
@@ -489,7 +489,7 @@ def test_witness_block_size(self):
             child_tx.vin.append(CTxIn(COutPoint(parent_tx.sha256, i), b""))
         child_tx.vout = [CTxOut(value - 100000, CScript([OP_TRUE]))]
         for i in range(NUM_OUTPUTS):
-            child_tx.wit.vtxinwit.append(CTxinWitness())
+            child_tx.wit.vtxinwit.append(CTxInWitness())
             child_tx.wit.vtxinwit[-1].scriptWitness.stack = [b'a'*195]*(2*NUM_DROPS) + [witness_program]
         child_tx.rehash()
         self.update_witness_block_with_transactions(block, [parent_tx, child_tx])
@@ -584,7 +584,7 @@ def test_extra_witness_data(self):
         tx.vin.append(CTxIn(COutPoint(self.utxo[0].sha256, self.utxo[0].n), b""))
         tx.vout.append(CTxOut(self.utxo[0].nValue-2000, scriptPubKey))
         tx.vout.append(CTxOut(1000, CScript([OP_TRUE]))) # non-witness output
-        tx.wit.vtxinwit.append(CTxinWitness())
+        tx.wit.vtxinwit.append(CTxInWitness())
         tx.wit.vtxinwit[0].scriptWitness.stack = [CScript([])]
         tx.rehash()
         self.update_witness_block_with_transactions(block, [tx])
@@ -607,7 +607,7 @@ def test_extra_witness_data(self):
         tx2.vin.append(CTxIn(COutPoint(tx.sha256, 0), b"")) # witness output
         tx2.vin.append(CTxIn(COutPoint(tx.sha256, 1), b"")) # non-witness
         tx2.vout.append(CTxOut(tx.vout[0].nValue, CScript([OP_TRUE])))
-        tx2.wit.vtxinwit.extend([CTxinWitness(), CTxinWitness()])
+        tx2.wit.vtxinwit.extend([CTxInWitness(), CTxInWitness()])
         tx2.wit.vtxinwit[0].scriptWitness.stack = [ CScript([CScriptNum(1)]), CScript([CScriptNum(1)]), witness_program ]
         tx2.wit.vtxinwit[1].scriptWitness.stack = [ CScript([OP_TRUE]) ]
 
@@ -663,7 +663,7 @@ def test_max_witness_push_length(self):
         tx2 = CTransaction()
         tx2.vin.append(CTxIn(COutPoint(tx.sha256, 0), b""))
         tx2.vout.append(CTxOut(tx.vout[0].nValue-1000, CScript([OP_TRUE])))
-        tx2.wit.vtxinwit.append(CTxinWitness())
+        tx2.wit.vtxinwit.append(CTxInWitness())
         # First try a 521-byte stack element
         tx2.wit.vtxinwit[0].scriptWitness.stack = [ b'a'*(MAX_SCRIPT_ELEMENT_SIZE+1), witness_program ]
         tx2.rehash()
@@ -705,7 +705,7 @@ def test_max_witness_program_length(self):
         tx2 = CTransaction()
         tx2.vin.append(CTxIn(COutPoint(tx.sha256, 0), b""))
         tx2.vout.append(CTxOut(tx.vout[0].nValue-1000, CScript([OP_TRUE])))
-        tx2.wit.vtxinwit.append(CTxinWitness())
+        tx2.wit.vtxinwit.append(CTxInWitness())
         tx2.wit.vtxinwit[0].scriptWitness.stack = [b'a']*44 + [long_witness_program]
         tx2.rehash()
 
@@ -782,7 +782,7 @@ def serialize_with_witness(self):
 
         # First try using a too long vtxinwit
         for i in range(11):
-            tx2.wit.vtxinwit.append(CTxinWitness())
+            tx2.wit.vtxinwit.append(CTxInWitness())
             tx2.wit.vtxinwit[i].scriptWitness.stack = [b'a', witness_program]
 
         block = self.build_next_block()
@@ -798,7 +798,7 @@ def serialize_with_witness(self):
         self.test_node.test_witness_block(block, accepted=False)
 
         # Now make one of the intermediate witnesses be incorrect
-        tx2.wit.vtxinwit.append(CTxinWitness())
+        tx2.wit.vtxinwit.append(CTxInWitness())
         tx2.wit.vtxinwit[-1].scriptWitness.stack = [b'a', witness_program]
         tx2.wit.vtxinwit[5].scriptWitness.stack = [ witness_program ]
 
@@ -825,7 +825,7 @@ def test_witness_tx_relay_before_segwit_activation(self):
         tx = CTransaction()
         tx.vin.append(CTxIn(COutPoint(self.utxo[0].sha256, self.utxo[0].n), b""))
         tx.vout.append(CTxOut(self.utxo[0].nValue-1000, CScript([OP_TRUE])))
-        tx.wit.vtxinwit.append(CTxinWitness())
+        tx.wit.vtxinwit.append(CTxInWitness())
         tx.wit.vtxinwit[0].scriptWitness.stack = [ b'a' ]
         tx.rehash()
 
@@ -885,7 +885,7 @@ def test_tx_relay_after_segwit_activation(self):
         tx = CTransaction()
         tx.vin.append(CTxIn(COutPoint(self.utxo[0].sha256, self.utxo[0].n), b""))
         tx.vout.append(CTxOut(self.utxo[0].nValue-1000, CScript([OP_TRUE])))
-        tx.wit.vtxinwit.append(CTxinWitness())
+        tx.wit.vtxinwit.append(CTxInWitness())
         tx.wit.vtxinwit[0].scriptWitness.stack = [ b'a' ]
         tx.rehash()
 
@@ -914,7 +914,7 @@ def test_tx_relay_after_segwit_activation(self):
         tx3 = CTransaction()
         tx3.vin.append(CTxIn(COutPoint(tx2.sha256, 0), b""))
         tx3.vout.append(CTxOut(tx2.vout[0].nValue-1000, CScript([OP_TRUE])))
-        tx3.wit.vtxinwit.append(CTxinWitness())
+        tx3.wit.vtxinwit.append(CTxInWitness())
         tx3.wit.vtxinwit[0].scriptWitness.stack = [CScript([CScriptNum(1)]), witness_program ]
         tx3.rehash()
 
@@ -1087,7 +1087,7 @@ def test_segwit_versions(self):
         tx2 = CTransaction()
         tx2.vin = [CTxIn(COutPoint(tx.sha256, 0), b"")]
         tx2.vout = [CTxOut(tx.vout[0].nValue-1000, scriptPubKey)]
-        tx2.wit.vtxinwit.append(CTxinWitness())
+        tx2.wit.vtxinwit.append(CTxInWitness())
         tx2.wit.vtxinwit[0].scriptWitness.stack = [ witness_program ]
         tx2.rehash()
         # Gets accepted to test_node, because standardness of outputs isn't
@@ -1102,7 +1102,7 @@ def test_segwit_versions(self):
         total_value = 0
         for i in temp_utxo:
             tx3.vin.append(CTxIn(COutPoint(i.sha256, i.n), b""))
-            tx3.wit.vtxinwit.append(CTxinWitness())
+            tx3.wit.vtxinwit.append(CTxInWitness())
             total_value += i.nValue
         tx3.wit.vtxinwit[-1].scriptWitness.stack = [witness_program]
         tx3.vout.append(CTxOut(total_value - 1000, CScript([OP_TRUE])))
@@ -1140,7 +1140,7 @@ def test_premature_coinbase_witness_spend(self):
         spend_tx = CTransaction()
         spend_tx.vin = [CTxIn(COutPoint(block.vtx[0].sha256, 0), b"")]
         spend_tx.vout = [CTxOut(block.vtx[0].vout[0].nValue, witness_program)]
-        spend_tx.wit.vtxinwit.append(CTxinWitness())
+        spend_tx.wit.vtxinwit.append(CTxInWitness())
         spend_tx.wit.vtxinwit[0].scriptWitness.stack = [ witness_program ]
         spend_tx.rehash()
 
@@ -1200,7 +1200,7 @@ def sign_P2PK_witness_input(script, txTo, inIdx, hashtype, value, key):
                 tx = CTransaction()
                 tx.vin.append(CTxIn(COutPoint(prev_utxo.sha256, prev_utxo.n), b""))
                 tx.vout.append(CTxOut(prev_utxo.nValue - 1000, scriptPubKey))
-                tx.wit.vtxinwit.append(CTxinWitness())
+                tx.wit.vtxinwit.append(CTxInWitness())
                 # Too-large input value
                 sign_P2PK_witness_input(witness_program, tx, 0, hashtype, prev_utxo.nValue+1, key)
                 self.update_witness_block_with_transactions(block, [tx])
@@ -1233,7 +1233,7 @@ def sign_P2PK_witness_input(script, txTo, inIdx, hashtype, value, key):
         split_value = prev_utxo.nValue // NUM_TESTS
         for i in range(NUM_TESTS):
             tx.vout.append(CTxOut(split_value, scriptPubKey))
-        tx.wit.vtxinwit.append(CTxinWitness())
+        tx.wit.vtxinwit.append(CTxInWitness())
         sign_P2PK_witness_input(witness_program, tx, 0, SIGHASH_ALL, prev_utxo.nValue, key)
         for i in range(NUM_TESTS):
             temp_utxos.append(UTXO(tx.sha256, i, split_value))
@@ -1255,7 +1255,7 @@ def sign_P2PK_witness_input(script, txTo, inIdx, hashtype, value, key):
             total_value = 0
             for i in range(num_inputs):
                 tx.vin.append(CTxIn(COutPoint(temp_utxos[i].sha256, temp_utxos[i].n), b""))
-                tx.wit.vtxinwit.append(CTxinWitness())
+                tx.wit.vtxinwit.append(CTxInWitness())
                 total_value += temp_utxos[i].nValue
             split_value = total_value // num_outputs
             for i in range(num_outputs):
@@ -1295,7 +1295,7 @@ def sign_P2PK_witness_input(script, txTo, inIdx, hashtype, value, key):
         tx = CTransaction()
         tx.vin.append(CTxIn(COutPoint(temp_utxos[0].sha256, temp_utxos[0].n), b""))
         tx.vout.append(CTxOut(temp_utxos[0].nValue, scriptPKH))
-        tx.wit.vtxinwit.append(CTxinWitness())
+        tx.wit.vtxinwit.append(CTxInWitness())
         sign_P2PK_witness_input(witness_program, tx, 0, SIGHASH_ALL, temp_utxos[0].nValue, key)
         tx2 = CTransaction()
         tx2.vin.append(CTxIn(COutPoint(tx.sha256, 0), b""))
@@ -1313,7 +1313,7 @@ def sign_P2PK_witness_input(script, txTo, inIdx, hashtype, value, key):
 
         # Move the signature to the witness.
         block.vtx.pop()
-        tx2.wit.vtxinwit.append(CTxinWitness())
+        tx2.wit.vtxinwit.append(CTxInWitness())
         tx2.wit.vtxinwit[0].scriptWitness.stack = [signature, pubkey]
         tx2.vin[0].scriptSig = b""
         tx2.rehash()
@@ -1333,7 +1333,7 @@ def sign_P2PK_witness_input(script, txTo, inIdx, hashtype, value, key):
             # the signatures as we go.
             tx.vin.append(CTxIn(COutPoint(i.sha256, i.n), b""))
             tx.vout.append(CTxOut(i.nValue, CScript([OP_TRUE])))
-            tx.wit.vtxinwit.append(CTxinWitness())
+            tx.wit.vtxinwit.append(CTxInWitness())
             sign_P2PK_witness_input(witness_program, tx, index, SIGHASH_SINGLE|SIGHASH_ANYONECANPAY, i.nValue, key)
             index += 1
         block = self.build_next_block()
@@ -1393,7 +1393,7 @@ def test_p2sh_witness(self, segwit_activated):
         # segwit activates.
         spend_tx.vin[0].scriptSig = scriptSig
         spend_tx.rehash()
-        spend_tx.wit.vtxinwit.append(CTxinWitness())
+        spend_tx.wit.vtxinwit.append(CTxInWitness())
         spend_tx.wit.vtxinwit[0].scriptWitness.stack = [ b'a', witness_program ]
 
         # Verify mempool acceptance
@@ -1499,7 +1499,7 @@ def test_witness_sigops(self):
         total_value = 0
         for i in range(outputs-1):
             tx2.vin.append(CTxIn(COutPoint(tx.sha256, i), b""))
-            tx2.wit.vtxinwit.append(CTxinWitness())
+            tx2.wit.vtxinwit.append(CTxInWitness())
             tx2.wit.vtxinwit[-1].scriptWitness.stack = [ witness_program ]
             total_value += tx.vout[i].nValue
         tx2.wit.vtxinwit[-1].scriptWitness.stack = [ witness_program_toomany ] 
@@ -1540,7 +1540,7 @@ def test_witness_sigops(self):
         block_5 = self.build_next_block()
         tx2.vout.pop()
         tx2.vin.append(CTxIn(COutPoint(tx.sha256, outputs-1), b""))
-        tx2.wit.vtxinwit.append(CTxinWitness())
+        tx2.wit.vtxinwit.append(CTxInWitness())
         tx2.wit.vtxinwit[-1].scriptWitness.stack = [ witness_program_justright ]
         tx2.rehash()
         self.update_witness_block_with_transactions(block_5, [tx2])
diff --git a/qa/rpc-tests/test_framework/blocktools.py b/qa/rpc-tests/test_framework/blocktools.py
index df4fe13e5c1c6..f69958823c9d9 100644
--- a/qa/rpc-tests/test_framework/blocktools.py
+++ b/qa/rpc-tests/test_framework/blocktools.py
@@ -34,7 +34,7 @@ def add_witness_commitment(block, nonce=0):
     witness_root = block.calc_witness_merkle_root()
     witness_commitment = uint256_from_str(hash256(ser_uint256(witness_root)+ser_uint256(witness_nonce)))
     # witness_nonce should go to coinbase witness.
-    block.vtx[0].wit.vtxinwit = [CTxinWitness()]
+    block.vtx[0].wit.vtxinwit = [CTxInWitness()]
     block.vtx[0].wit.vtxinwit[0].scriptWitness.stack = [ser_uint256(witness_nonce)]
 
     # witness commitment is the last OP_RETURN output in coinbase
diff --git a/qa/rpc-tests/test_framework/mininode.py b/qa/rpc-tests/test_framework/mininode.py
index 4548e2e7c080f..cdd5292cd67b8 100755
--- a/qa/rpc-tests/test_framework/mininode.py
+++ b/qa/rpc-tests/test_framework/mininode.py
@@ -419,7 +419,7 @@ def is_null(self):
         return True
 
 
-class CTxinWitness(object):
+class CTxInWitness(object):
     def __init__(self):
         self.scriptWitness = CScriptWitness()
 
@@ -497,7 +497,7 @@ def deserialize(self, f):
         else:
             self.vout = deser_vector(f, CTxOut)
         if flags != 0:
-            self.wit.vtxinwit = [CTxinWitness()]*len(self.vin)
+            self.wit.vtxinwit = [CTxInWitness()]*len(self.vin)
             self.wit.deserialize(f)
         self.nLockTime = struct.unpack("<I", f.read(4))[0]
         self.sha256 = None
@@ -529,7 +529,7 @@ def serialize_with_witness(self):
                 # vtxinwit must have the same length as vin
                 self.wit.vtxinwit = self.wit.vtxinwit[:len(self.vin)]
                 for i in range(len(self.wit.vtxinwit), len(self.vin)):
-                    self.wit.vtxinwit.append(CTxinWitness())
+                    self.wit.vtxinwit.append(CTxInWitness())
             r += self.wit.serialize()
         r += struct.pack("<I", self.nLockTime)
         return r
diff --git a/src/core_memusage.h b/src/core_memusage.h
index dd86f805fe457..b8e0f08bbf7be 100644
--- a/src/core_memusage.h
+++ b/src/core_memusage.h
@@ -33,13 +33,13 @@ static inline size_t RecursiveDynamicUsage(const CScriptWitness& scriptWit) {
     return mem;
 }
 
-static inline size_t RecursiveDynamicUsage(const CTxinWitness& txinwit) {
+static inline size_t RecursiveDynamicUsage(const CTxInWitness& txinwit) {
     return RecursiveDynamicUsage(txinwit.scriptWitness);
 }
 
 static inline size_t RecursiveDynamicUsage(const CTxWitness& txwit) {
     size_t mem = memusage::DynamicUsage(txwit.vtxinwit);
-    for (std::vector<CTxinWitness>::const_iterator it = txwit.vtxinwit.begin(); it != txwit.vtxinwit.end(); it++) {
+    for (std::vector<CTxInWitness>::const_iterator it = txwit.vtxinwit.begin(); it != txwit.vtxinwit.end(); it++) {
         mem += RecursiveDynamicUsage(*it);
     }
     return mem;
diff --git a/src/primitives/transaction.h b/src/primitives/transaction.h
index e87ad90f0d498..8a2d5dd22c8de 100644
--- a/src/primitives/transaction.h
+++ b/src/primitives/transaction.h
@@ -213,7 +213,7 @@ class CTxOut
     std::string ToString() const;
 };
 
-class CTxinWitness
+class CTxInWitness
 {
 public:
     CScriptWitness scriptWitness;
@@ -228,14 +228,14 @@ class CTxinWitness
 
     bool IsNull() const { return scriptWitness.IsNull(); }
 
-    CTxinWitness() { }
+    CTxInWitness() { }
 };
 
 class CTxWitness
 {
 public:
     /** In case vtxinwit is missing, all entries are treated as if they were empty CTxInWitnesses */
-    std::vector<CTxinWitness> vtxinwit;
+    std::vector<CTxInWitness> vtxinwit;
 
     ADD_SERIALIZE_METHODS;
 
diff --git a/src/test/sigopcount_tests.cpp b/src/test/sigopcount_tests.cpp
index 8dea388332b21..e8a63ae60ca81 100644
--- a/src/test/sigopcount_tests.cpp
+++ b/src/test/sigopcount_tests.cpp
@@ -84,7 +84,7 @@ ScriptError VerifyWithFlag(const CTransaction& output, const CMutableTransaction
  * and witness such that spendingTx spends output zero of creationTx.
  * Also inserts creationTx's output into the coins view.
  */
-void BuildTxs(CMutableTransaction& spendingTx, CCoinsViewCache& coins, CMutableTransaction& creationTx, const CScript& scriptPubKey, const CScript& scriptSig, const CTxinWitness& witness)
+void BuildTxs(CMutableTransaction& spendingTx, CCoinsViewCache& coins, CMutableTransaction& creationTx, const CScript& scriptPubKey, const CScript& scriptSig, const CTxInWitness& witness)
 {
     creationTx.nVersion = 1;
     creationTx.vin.resize(1);
@@ -133,7 +133,7 @@ BOOST_AUTO_TEST_CASE(GetTxSigOpCost)
         // Do not use a valid signature to avoid using wallet operations.
         CScript scriptSig = CScript() << OP_0 << OP_0;
 
-        BuildTxs(spendingTx, coins, creationTx, scriptPubKey, scriptSig, CTxinWitness());
+        BuildTxs(spendingTx, coins, creationTx, scriptPubKey, scriptSig, CTxInWitness());
         // Legacy counting only includes signature operations in scriptSigs and scriptPubKeys
         // of a transaction and does not take the actual executed sig operations into account.
         // spendingTx in itself does not contain a signature operation.
@@ -151,7 +151,7 @@ BOOST_AUTO_TEST_CASE(GetTxSigOpCost)
         CScript scriptPubKey = GetScriptForDestination(CScriptID(redeemScript));
         CScript scriptSig = CScript() << OP_0 << OP_0 << ToByteVector(redeemScript);
 
-        BuildTxs(spendingTx, coins, creationTx, scriptPubKey, scriptSig, CTxinWitness());
+        BuildTxs(spendingTx, coins, creationTx, scriptPubKey, scriptSig, CTxInWitness());
         assert(GetTransactionSigOpCost(CTransaction(spendingTx), coins, flags) == 2 * WITNESS_SCALE_FACTOR);
         assert(VerifyWithFlag(creationTx, spendingTx, flags) == SCRIPT_ERR_CHECKMULTISIGVERIFY);
     }
@@ -161,7 +161,7 @@ BOOST_AUTO_TEST_CASE(GetTxSigOpCost)
         CScript p2pk = CScript() << ToByteVector(pubkey) << OP_CHECKSIG;
         CScript scriptPubKey = GetScriptForWitness(p2pk);
         CScript scriptSig = CScript();
-        CTxinWitness witness;
+        CTxInWitness witness;
         CScriptWitness scriptWitness;
         scriptWitness.stack.push_back(vector<unsigned char>(0));
         scriptWitness.stack.push_back(vector<unsigned char>(0));
@@ -193,7 +193,7 @@ BOOST_AUTO_TEST_CASE(GetTxSigOpCost)
         CScript scriptSig = GetScriptForWitness(p2pk);
         CScript scriptPubKey = GetScriptForDestination(CScriptID(scriptSig));
         scriptSig = CScript() << ToByteVector(scriptSig);
-        CTxinWitness witness;
+        CTxInWitness witness;
         CScriptWitness scriptWitness;
         scriptWitness.stack.push_back(vector<unsigned char>(0));
         scriptWitness.stack.push_back(vector<unsigned char>(0));
@@ -209,7 +209,7 @@ BOOST_AUTO_TEST_CASE(GetTxSigOpCost)
         CScript witnessScript = CScript() << 1 << ToByteVector(pubkey) << ToByteVector(pubkey) << 2 << OP_CHECKMULTISIGVERIFY;
         CScript scriptPubKey = GetScriptForWitness(witnessScript);
         CScript scriptSig = CScript();
-        CTxinWitness witness;
+        CTxInWitness witness;
         CScriptWitness scriptWitness;
         scriptWitness.stack.push_back(vector<unsigned char>(0));
         scriptWitness.stack.push_back(vector<unsigned char>(0));
@@ -228,7 +228,7 @@ BOOST_AUTO_TEST_CASE(GetTxSigOpCost)
         CScript redeemScript = GetScriptForWitness(witnessScript);
         CScript scriptPubKey = GetScriptForDestination(CScriptID(redeemScript));
         CScript scriptSig = CScript() << ToByteVector(redeemScript);
-        CTxinWitness witness;
+        CTxInWitness witness;
         CScriptWitness scriptWitness;
         scriptWitness.stack.push_back(vector<unsigned char>(0));
         scriptWitness.stack.push_back(vector<unsigned char>(0));

From fa9976b853dbd04334cd0b5a058b99aa0014e649 Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Wed, 6 Jul 2016 20:46:22 +0200
Subject: [PATCH 0602/1802] [qa] test_framework: Add wrapper for stop_node

---
 qa/rpc-tests/test_framework/test_framework.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/qa/rpc-tests/test_framework/test_framework.py b/qa/rpc-tests/test_framework/test_framework.py
index 30e8b5755de39..0dfece6b2779a 100755
--- a/qa/rpc-tests/test_framework/test_framework.py
+++ b/qa/rpc-tests/test_framework/test_framework.py
@@ -20,6 +20,7 @@
     sync_blocks,
     sync_mempools,
     stop_nodes,
+    stop_node,
     wait_bitcoinds,
     enable_coverage,
     check_json_precision,
@@ -49,6 +50,9 @@ def setup_chain(self):
         else:
             initialize_chain(self.options.tmpdir, self.num_nodes)
 
+    def stop_node(self, num_node):
+        stop_node(self.nodes[num_node], num_node)
+
     def setup_nodes(self):
         return start_nodes(self.num_nodes, self.options.tmpdir)
 

From 1ba3db6a8e9626984fc87314b15dfa2a6c831cb2 Mon Sep 17 00:00:00 2001
From: Christian von Roques <roques@mti.ag>
Date: Sun, 26 Jun 2016 16:20:12 -0400
Subject: [PATCH 0603/1802] bash-completion: Adapt for 0.12 and 0.13

 * separate completion for bitcoind and bitcoin-cli
 * remove RPC support from bitcoind completion
 * add completion for bitcoin-tx and bitcoin-qt
 * rely on autoloading of completions
---
 contrib/bitcoin-cli.bash-completion       | 154 ++++++++++++++++++++++
 contrib/bitcoin-tx.bash-completion        |  57 ++++++++
 contrib/bitcoind.bash-completion          | 111 ++--------------
 contrib/debian/bitcoin-tx.bash-completion |   1 +
 contrib/debian/bitcoind.bash-completion   |   1 +
 5 files changed, 224 insertions(+), 100 deletions(-)
 create mode 100644 contrib/bitcoin-cli.bash-completion
 create mode 100644 contrib/bitcoin-tx.bash-completion
 create mode 100644 contrib/debian/bitcoin-tx.bash-completion

diff --git a/contrib/bitcoin-cli.bash-completion b/contrib/bitcoin-cli.bash-completion
new file mode 100644
index 0000000000000..732981fe7c5d1
--- /dev/null
+++ b/contrib/bitcoin-cli.bash-completion
@@ -0,0 +1,154 @@
+# bash programmable completion for bitcoin-cli(1)
+# Copyright (c) 2012-2016 The Bitcoin Core developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+# call $bitcoin-cli for RPC
+_bitcoin_rpc() {
+    # determine already specified args necessary for RPC
+    local rpcargs=()
+    for i in ${COMP_LINE}; do
+        case "$i" in
+            -conf=*|-datadir=*|-regtest|-rpc*|-testnet)
+                rpcargs=( "${rpcargs[@]}" "$i" )
+                ;;
+        esac
+    done
+    $bitcoin_cli "${rpcargs[@]}" "$@"
+}
+
+# Add wallet accounts to COMPREPLY
+_bitcoin_accounts() {
+    local accounts
+    accounts=$(_bitcoin_rpc listaccounts | awk -F '"' '{ print $2 }')
+    COMPREPLY=( "${COMPREPLY[@]}" $( compgen -W "$accounts" -- "$cur" ) )
+}
+
+_bitcoin_cli() {
+    local cur prev words=() cword
+    local bitcoin_cli
+
+    # save and use original argument to invoke bitcoin-cli for -help, help and RPC
+    # as bitcoin-cli might not be in $PATH
+    bitcoin_cli="$1"
+
+    COMPREPLY=()
+    _get_comp_words_by_ref -n = cur prev words cword
+
+    if ((cword > 5)); then
+        case ${words[cword-5]} in
+            sendtoaddress)
+                COMPREPLY=( $( compgen -W "true false" -- "$cur" ) )
+                return 0
+                ;;
+        esac
+    fi
+
+    if ((cword > 4)); then
+        case ${words[cword-4]} in
+            importaddress|listtransactions|setban)
+                COMPREPLY=( $( compgen -W "true false" -- "$cur" ) )
+                return 0
+                ;;
+            signrawtransaction)
+                COMPREPLY=( $( compgen -W "ALL NONE SINGLE ALL|ANYONECANPAY NONE|ANYONECANPAY SINGLE|ANYONECANPAY" -- "$cur" ) )
+                return 0
+                ;;
+        esac
+    fi
+
+    if ((cword > 3)); then
+        case ${words[cword-3]} in
+            addmultisigaddress)
+                _bitcoin_accounts
+                return 0
+                ;;
+            getbalance|gettxout|importaddress|importpubkey|importprivkey|listreceivedbyaccount|listreceivedbyaddress|listsinceblock)
+                COMPREPLY=( $( compgen -W "true false" -- "$cur" ) )
+                return 0
+                ;;
+        esac
+    fi
+
+    if ((cword > 2)); then
+        case ${words[cword-2]} in
+            addnode)
+                COMPREPLY=( $( compgen -W "add remove onetry" -- "$cur" ) )
+                return 0
+                ;;
+            setban)
+                COMPREPLY=( $( compgen -W "add remove" -- "$cur" ) )
+                return 0
+                ;;
+            fundrawtransaction|getblock|getblockheader|getmempoolancestors|getmempooldescendants|getrawtransaction|gettransaction|listaccounts|listreceivedbyaccount|listreceivedbyaddress|sendrawtransaction)
+                COMPREPLY=( $( compgen -W "true false" -- "$cur" ) )
+                return 0
+                ;;
+            move|setaccount)
+                _bitcoin_accounts
+                return 0
+                ;;
+        esac
+    fi
+
+    case "$prev" in
+        backupwallet|dumpwallet|importwallet)
+            _filedir
+            return 0
+            ;;
+        getaddednodeinfo|getrawmempool|lockunspent|setgenerate)
+            COMPREPLY=( $( compgen -W "true false" -- "$cur" ) )
+            return 0
+            ;;
+        getaccountaddress|getaddressesbyaccount|getbalance|getnewaddress|getreceivedbyaccount|listtransactions|move|sendfrom|sendmany)
+            _bitcoin_accounts
+            return 0
+            ;;
+    esac
+
+    case "$cur" in
+        -conf=*)
+            cur="${cur#*=}"
+            _filedir
+            return 0
+            ;;
+        -datadir=*)
+            cur="${cur#*=}"
+            _filedir -d
+            return 0
+            ;;
+        -*=*)	# prevent nonsense completions
+            return 0
+            ;;
+        *)
+            local helpopts commands
+
+            # only parse -help if senseful
+            if [[ -z "$cur" || "$cur" =~ ^- ]]; then
+                helpopts=$($bitcoin_cli -help 2>&1 | awk '$1 ~ /^-/ { sub(/=.*/, "="); print $1 }' )
+            fi
+
+            # only parse help if senseful
+            if [[ -z "$cur" || "$cur" =~ ^[a-z] ]]; then
+                commands=$(_bitcoin_rpc help 2>/dev/null | awk '$1 ~ /^[a-z]/ { print $1; }')
+            fi
+
+            COMPREPLY=( $( compgen -W "$helpopts $commands" -- "$cur" ) )
+
+            # Prevent space if an argument is desired
+            if [[ $COMPREPLY == *= ]]; then
+                compopt -o nospace
+            fi
+            return 0
+            ;;
+    esac
+} &&
+complete -F _bitcoin_cli bitcoin-cli
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 4
+# sh-indent-comment: t
+# indent-tabs-mode: nil
+# End:
+# ex: ts=4 sw=4 et filetype=sh
diff --git a/contrib/bitcoin-tx.bash-completion b/contrib/bitcoin-tx.bash-completion
new file mode 100644
index 0000000000000..a83d2979ed3a8
--- /dev/null
+++ b/contrib/bitcoin-tx.bash-completion
@@ -0,0 +1,57 @@
+# bash programmable completion for bitcoin-tx(1)
+# Copyright (c) 2016 The Bitcoin Core developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+_bitcoin_tx() {
+    local cur prev words=() cword
+    local bitcoin_tx
+
+    # save and use original argument to invoke bitcoin-tx for -help
+    # it might not be in $PATH
+    bitcoin_tx="$1"
+
+    COMPREPLY=()
+    _get_comp_words_by_ref -n =: cur prev words cword
+
+    case "$cur" in
+        load=*:*)
+            cur="${cur#load=*:}"
+            _filedir
+            return 0
+            ;;
+        *=*)	# prevent attempts to complete other arguments
+            return 0
+            ;;
+    esac
+
+    if [[ "$cword" == 1 || ( "$prev" != "-create" && "$prev" == -* ) ]]; then
+        # only options (or an uncompletable hex-string) allowed
+        # parse bitcoin-tx -help for options
+        local helpopts
+        helpopts=$($bitcoin_tx -help | sed -e '/^  -/ p' -e d )
+        COMPREPLY=( $( compgen -W "$helpopts" -- "$cur" ) )
+    else
+        # only commands are allowed
+        # parse -help for commands
+        local helpcmds
+        helpcmds=$($bitcoin_tx -help | sed -e '1,/Commands:/d' -e 's/=.*/=/' -e '/^  [a-z]/ p' -e d )
+        COMPREPLY=( $( compgen -W "$helpcmds" -- "$cur" ) )
+    fi
+
+    # Prevent space if an argument is desired
+    if [[ $COMPREPLY == *= ]]; then
+        compopt -o nospace
+    fi
+
+    return 0
+} &&
+complete -F _bitcoin_tx bitcoin-tx
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 4
+# sh-indent-comment: t
+# indent-tabs-mode: nil
+# End:
+# ex: ts=4 sw=4 et filetype=sh
diff --git a/contrib/bitcoind.bash-completion b/contrib/bitcoind.bash-completion
index 1338d2f2b5c3b..af87e97d80690 100644
--- a/contrib/bitcoind.bash-completion
+++ b/contrib/bitcoind.bash-completion
@@ -1,102 +1,21 @@
-# bash programmable completion for bitcoind(1) and bitcoin-cli(1)
-# Copyright (c) 2012,2014 Christian von Roques <roques@mti.ag>
+# bash programmable completion for bitcoind(1) and bitcoin-qt(1)
+# Copyright (c) 2012-2016 The Bitcoin Core developers
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-have bitcoind && {
-
-# call $bitcoind for RPC
-_bitcoin_rpc() {
-    # determine already specified args necessary for RPC
-    local rpcargs=()
-    for i in ${COMP_LINE}; do
-        case "$i" in
-            -conf=*|-proxy*|-rpc*)
-                rpcargs=( "${rpcargs[@]}" "$i" )
-                ;;
-        esac
-    done
-    $bitcoind "${rpcargs[@]}" "$@"
-}
-
-# Add bitcoin accounts to COMPREPLY
-_bitcoin_accounts() {
-    local accounts
-    accounts=$(_bitcoin_rpc listaccounts | awk '/".*"/ { a=$1; gsub(/"/, "", a); print a}')
-    COMPREPLY=( "${COMPREPLY[@]}" $( compgen -W "$accounts" -- "$cur" ) )
-}
-
 _bitcoind() {
     local cur prev words=() cword
     local bitcoind
 
-    # save and use original argument to invoke bitcoind
-    # bitcoind might not be in $PATH
+    # save and use original argument to invoke bitcoind for -help
+    # it might not be in $PATH
     bitcoind="$1"
 
     COMPREPLY=()
     _get_comp_words_by_ref -n = cur prev words cword
 
-    if ((cword > 4)); then
-        case ${words[cword-4]} in
-            listtransactions)
-                COMPREPLY=( $( compgen -W "true false" -- "$cur" ) )
-                return 0
-                ;;
-            signrawtransaction)
-                COMPREPLY=( $( compgen -W "ALL NONE SINGLE ALL|ANYONECANPAY NONE|ANYONECANPAY SINGLE|ANYONECANPAY" -- "$cur" ) )
-                return 0
-                ;;
-        esac
-    fi
-
-    if ((cword > 3)); then
-        case ${words[cword-3]} in
-            addmultisigaddress)
-                _bitcoin_accounts
-                return 0
-                ;;
-            getbalance|gettxout|importaddress|importprivkey|listreceivedbyaccount|listreceivedbyaddress|listsinceblock)
-                COMPREPLY=( $( compgen -W "true false" -- "$cur" ) )
-                return 0
-                ;;
-        esac
-    fi
-
-    if ((cword > 2)); then
-        case ${words[cword-2]} in
-            addnode)
-                COMPREPLY=( $( compgen -W "add remove onetry" -- "$cur" ) )
-                return 0
-                ;;
-            getblock|getrawtransaction|gettransaction|listaccounts|listreceivedbyaccount|listreceivedbyaddress|sendrawtransaction)
-                COMPREPLY=( $( compgen -W "true false" -- "$cur" ) )
-                return 0
-                ;;
-            move|setaccount)
-                _bitcoin_accounts
-                return 0
-                ;;
-        esac
-    fi
-
-    case "$prev" in
-        backupwallet|dumpwallet|importwallet)
-            _filedir
-            return 0
-            ;;
-        getmempool|lockunspent|setgenerate)
-            COMPREPLY=( $( compgen -W "true false" -- "$cur" ) )
-            return 0
-            ;;
-        getaccountaddress|getaddressesbyaccount|getbalance|getnewaddress|getreceivedbyaccount|listtransactions|move|sendfrom|sendmany)
-            _bitcoin_accounts
-            return 0
-            ;;
-    esac
-
     case "$cur" in
-        -conf=*|-pid=*|-loadblock=*|-wallet=*)
+        -conf=*|-pid=*|-loadblock=*|-rootcertificates=*|-rpccookiefile=*|-wallet=*)
             cur="${cur#*=}"
             _filedir
             return 0
@@ -110,20 +29,14 @@ _bitcoind() {
             return 0
             ;;
         *)
-            local helpopts commands
 
-            # only parse --help if senseful
+            # only parse -help if senseful
             if [[ -z "$cur" || "$cur" =~ ^- ]]; then
-                helpopts=$($bitcoind --help 2>&1 | awk '$1 ~ /^-/ { sub(/=.*/, "="); print $1 }' )
+                local helpopts
+                helpopts=$($bitcoind -help 2>&1 | awk '$1 ~ /^-/ { sub(/=.*/, "="); print $1 }' )
+                COMPREPLY=( $( compgen -W "$helpopts" -- "$cur" ) )
             fi
 
-            # only parse help if senseful
-            if [[ -z "$cur" || "$cur" =~ ^[a-z] ]]; then
-                commands=$(_bitcoin_rpc help 2>/dev/null | awk '$1 ~ /^[a-z]/ { print $1; }')
-            fi
-
-            COMPREPLY=( $( compgen -W "$helpopts $commands" -- "$cur" ) )
-
             # Prevent space if an argument is desired
             if [[ $COMPREPLY == *= ]]; then
                 compopt -o nospace
@@ -131,10 +44,8 @@ _bitcoind() {
             return 0
             ;;
     esac
-}
-
-complete -F _bitcoind bitcoind bitcoin-cli
-}
+} &&
+complete -F _bitcoind bitcoind bitcoin-qt
 
 # Local variables:
 # mode: shell-script
diff --git a/contrib/debian/bitcoin-tx.bash-completion b/contrib/debian/bitcoin-tx.bash-completion
new file mode 100644
index 0000000000000..7acb0b0aea668
--- /dev/null
+++ b/contrib/debian/bitcoin-tx.bash-completion
@@ -0,0 +1 @@
+contrib/bitcoin-tx.bash-completion	bitcoin-tx
diff --git a/contrib/debian/bitcoind.bash-completion b/contrib/debian/bitcoind.bash-completion
index 0f84707b66cb7..5c69d78fbb0fc 100644
--- a/contrib/debian/bitcoind.bash-completion
+++ b/contrib/debian/bitcoind.bash-completion
@@ -1 +1,2 @@
 contrib/bitcoind.bash-completion	bitcoind
+contrib/bitcoin-cli.bash-completion	bitcoin-cli

From 0c928cb13cc9146bb2c0f39d1d3b6e1e660a375d Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Thu, 7 Jul 2016 13:46:59 -0400
Subject: [PATCH 0604/1802] build: Fix Qt5PlatformSupport check without
 pkg-config

The non-pkg-config case can't use pkg-config to check the version.

Also, make sure that the check is properly guarded in the case of missing
pkg-config macros.
---
 build-aux/m4/bitcoin_qt.m4 | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/build-aux/m4/bitcoin_qt.m4 b/build-aux/m4/bitcoin_qt.m4
index 74d910267462e..d26136cbe9a45 100644
--- a/build-aux/m4/bitcoin_qt.m4
+++ b/build-aux/m4/bitcoin_qt.m4
@@ -331,8 +331,9 @@ AC_DEFUN([_BITCOIN_QT_FIND_STATIC_PLUGINS],[
           QT_LIBS="$QT_LIBS -L$qt_plugin_path/accessible"
         fi
       fi
-     m4_ifdef([PKG_CHECK_MODULES],[
      if test x$use_pkgconfig = xyes; then
+     : dnl
+     m4_ifdef([PKG_CHECK_MODULES],[
        PKG_CHECK_MODULES([QTPLATFORM], [Qt5PlatformSupport], [QT_LIBS="$QTPLATFORM_LIBS $QT_LIBS"])
        if test x$TARGET_OS = xlinux; then
          PKG_CHECK_MODULES([X11XCB], [x11-xcb], [QT_LIBS="$X11XCB_LIBS $QT_LIBS"])
@@ -342,12 +343,23 @@ AC_DEFUN([_BITCOIN_QT_FIND_STATIC_PLUGINS],[
        elif test x$TARGET_OS = xdarwin; then
          PKG_CHECK_MODULES([QTPRINT], [Qt5PrintSupport], [QT_LIBS="$QTPRINT_LIBS $QT_LIBS"])
        fi
+     ])
      else
-       if ${PKG_CONFIG} --exists "Qt5Core >= 5.6" 2>/dev/null; then
-         QT_LIBS="-lQt5PlatformSupport $QT_LIBS"
+       if test x$TARGET_OS = xwindows; then
+         AC_CACHE_CHECK(for Qt >= 5.6, bitcoin_cv_need_platformsupport,[AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
+             [[#include <QtCore>]],[[
+             #if QT_VERSION < 0x050600
+             choke;
+             #endif
+             ]])],
+           [bitcoin_cv_need_platformsupport=yes],
+           [bitcoin_cv_need_platformsupport=no])
+         ])
+         if test x$bitcoin_cv_need_platformsupport = xyes; then
+           BITCOIN_QT_CHECK(AC_CHECK_LIB([${QT_LIB_PREFIX}PlatformSupport],[main],,BITCOIN_QT_FAIL(lib$QT_LIB_PREFIXPlatformSupport not found)))
+         fi
        fi
      fi
-     ])
   else
     if test x$qt_plugin_path != x; then
       QT_LIBS="$QT_LIBS -L$qt_plugin_path/accessible"

From b556beda264308e040f8d88aca4f2f386a0183d9 Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Thu, 7 Jul 2016 13:47:54 -0400
Subject: [PATCH 0605/1802] build: fix Windows builds without pkg-config

- guard PKG_PROG_PKG_CONFIG with an m4_ifdef. If not building for windows,
  require it
- add nops as necessary in case the ifdef reduces the if/then to nothing
- AC_SUBST some missing _LIBS. These were split out over time, but not all were
  properly substituted. They continued to work if pkg-config is installed
  because it does the AC_SUBST itself
---
 configure.ac | 27 ++++++++++++++++++---------
 1 file changed, 18 insertions(+), 9 deletions(-)

diff --git a/configure.ac b/configure.ac
index 97af58bd7cd85..ae09722623f7a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -79,9 +79,6 @@ AC_PATH_TOOL(OBJCOPY, objcopy)
 
 AC_ARG_VAR(PYTHONPATH, Augments the default search path for python module files)
 
-dnl pkg-config check.
-PKG_PROG_PKG_CONFIG
-
 # Enable wallet
 AC_ARG_ENABLE([wallet],
   [AS_HELP_STRING([--disable-wallet],
@@ -375,6 +372,16 @@ case $host in
      ;;
 esac
 
+if test x$use_pkgconfig = xyes; then
+  m4_ifndef([PKG_PROG_PKG_CONFIG], [AC_MSG_ERROR(PKG_PROG_PKG_CONFIG macro not found. Please install pkg-config and re-run autogen.sh.)])
+  m4_ifdef([PKG_PROG_PKG_CONFIG], [
+  PKG_PROG_PKG_CONFIG
+  if test x"$PKG_CONFIG" = "x"; then
+    AC_MSG_ERROR(pkg-config not found.)
+  fi
+  ])
+fi
+
 if test x$use_comparison_tool != xno; then
   AC_SUBST(JAVA_COMPARISON_TOOL, $use_comparison_tool)
 fi
@@ -752,12 +759,7 @@ fi
 fi
 
 if test x$use_pkgconfig = xyes; then
-
-  if test x"$PKG_CONFIG" = "x"; then
-    AC_MSG_ERROR(pkg-config not found.)
-  fi
-
-  : #NOP
+  : dnl
   m4_ifdef(
     [PKG_CHECK_MODULES],
     [
@@ -1058,6 +1060,13 @@ AC_SUBST(TESTDEFS)
 AC_SUBST(LEVELDB_TARGET_FLAGS)
 AC_SUBST(MINIUPNPC_CPPFLAGS)
 AC_SUBST(MINIUPNPC_LIBS)
+AC_SUBST(CRYPTO_LIBS)
+AC_SUBST(SSL_LIBS)
+AC_SUBST(EVENT_LIBS)
+AC_SUBST(EVENT_PTHREADS_LIBS)
+AC_SUBST(ZMQ_LIBS)
+AC_SUBST(PROTOBUF_LIBS)
+AC_SUBST(QR_LIBS)
 AC_CONFIG_FILES([Makefile src/Makefile share/setup.nsi share/qt/Info.plist src/test/buildenv.py])
 AC_CONFIG_FILES([qa/pull-tester/run-bitcoind-for-test.sh],[chmod +x qa/pull-tester/run-bitcoind-for-test.sh])
 AC_CONFIG_FILES([qa/pull-tester/tests_config.py],[chmod +x qa/pull-tester/tests_config.py])

From bb66a11396335b5f4e5914806fcb2dc6165edf6f Mon Sep 17 00:00:00 2001
From: Suhas Daftuar <sdaftuar@gmail.com>
Date: Thu, 7 Jul 2016 15:49:26 -0400
Subject: [PATCH 0606/1802] Fix DoS vulnerability in mempool acceptance

Moves the IsStandard check to happen after the premature-witness check,
so that adding a witness to a transaction can't prevent mempool acceptance.

Note that this doesn't address the broader category of potential mempool DoS
issues that affect transactions after segwit activation.
---
 src/main.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index b86bbda1b8f9e..2f16a4c8ead26 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1132,11 +1132,6 @@ bool AcceptToMemoryPoolWorker(CTxMemPool& pool, CValidationState& state, const C
     if (tx.IsCoinBase())
         return state.DoS(100, false, REJECT_INVALID, "coinbase");
 
-    // Rather not work on nonstandard transactions (unless -testnet/-regtest)
-    string reason;
-    if (fRequireStandard && !IsStandardTx(tx, reason))
-        return state.DoS(0, false, REJECT_NONSTANDARD, reason);
-
     // Don't relay version 2 transactions until CSV is active, and we can be
     // sure that such transactions will be mined (unless we're on
     // -testnet/-regtest).
@@ -1150,6 +1145,11 @@ bool AcceptToMemoryPoolWorker(CTxMemPool& pool, CValidationState& state, const C
         return state.DoS(0, false, REJECT_NONSTANDARD, "no-witness-yet", true);
     }
 
+    // Rather not work on nonstandard transactions (unless -testnet/-regtest)
+    string reason;
+    if (fRequireStandard && !IsStandardTx(tx, reason))
+        return state.DoS(0, false, REJECT_NONSTANDARD, reason);
+
     // Only accept nLockTime-using transactions that can be mined in the next
     // block; we don't want our mempool filled up with transactions that can't
     // be mined yet.

From fade505e8b0fa37e2d99bf94259250271a9604d4 Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Wed, 6 Jul 2016 10:36:46 +0200
Subject: [PATCH 0607/1802] [qa] Add wallet-hd test

---
 qa/pull-tester/rpc-tests.py |  1 +
 qa/rpc-tests/wallet-hd.py   | 77 +++++++++++++++++++++++++++++++++++++
 2 files changed, 78 insertions(+)
 create mode 100755 qa/rpc-tests/wallet-hd.py

diff --git a/qa/pull-tester/rpc-tests.py b/qa/pull-tester/rpc-tests.py
index 37979a933fc29..11b83bac1468d 100755
--- a/qa/pull-tester/rpc-tests.py
+++ b/qa/pull-tester/rpc-tests.py
@@ -106,6 +106,7 @@
     'walletbackup.py',
     'bip68-112-113-p2p.py',
     'wallet.py',
+    'wallet-hd.py',
     'listtransactions.py',
     'receivedby.py',
     'mempool_resurrect_test.py',
diff --git a/qa/rpc-tests/wallet-hd.py b/qa/rpc-tests/wallet-hd.py
new file mode 100755
index 0000000000000..845eec027bde2
--- /dev/null
+++ b/qa/rpc-tests/wallet-hd.py
@@ -0,0 +1,77 @@
+#!/usr/bin/env python3
+# Copyright (c) 2016 The Bitcoin Core developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+from test_framework.test_framework import BitcoinTestFramework
+from test_framework.util import (
+    start_nodes,
+    start_node,
+    assert_equal,
+    connect_nodes_bi,
+)
+import os
+import shutil
+
+
+class WalletHDTest(BitcoinTestFramework):
+
+    def __init__(self):
+        super().__init__()
+        self.setup_clean_chain = True
+        self.num_nodes = 2
+        self.node_args = [['-usehd=0'], ['-usehd=1', '-keypool=0']]
+
+    def setup_network(self):
+        self.nodes = start_nodes(self.num_nodes, self.options.tmpdir, self.node_args)
+        self.is_network_split = False
+        connect_nodes_bi(self.nodes, 0, 1)
+
+    def run_test (self):
+        tmpdir = self.options.tmpdir
+
+        # Import a non-HD private key in the HD wallet
+        non_hd_add = self.nodes[0].getnewaddress()
+        self.nodes[1].importprivkey(self.nodes[0].dumpprivkey(non_hd_add))
+
+        # This should be enough to keep the master key and the non-HD key 
+        self.nodes[1].backupwallet(tmpdir + "hd.bak")
+        #self.nodes[1].dumpwallet(tmpdir + "hd.dump")
+
+        # Derive some HD addresses and remember the last
+        # Also send funds to each add
+        self.nodes[0].generate(101)
+        hd_add = None
+        num_hd_adds = 300
+        for _ in range(num_hd_adds):
+            hd_add = self.nodes[1].getnewaddress()
+            self.nodes[0].sendtoaddress(hd_add, 1)
+            self.nodes[0].generate(1)
+        self.nodes[0].sendtoaddress(non_hd_add, 1)
+        self.nodes[0].generate(1)
+
+        self.sync_all()
+        assert_equal(self.nodes[1].getbalance(), num_hd_adds + 1)
+
+        print("Restore backup ...")
+        self.stop_node(1)
+        os.remove(self.options.tmpdir + "/node1/regtest/wallet.dat")
+        shutil.copyfile(tmpdir + "hd.bak", tmpdir + "/node1/regtest/wallet.dat")
+        self.nodes[1] = start_node(1, self.options.tmpdir, self.node_args[1])
+        #connect_nodes_bi(self.nodes, 0, 1)
+
+        # Assert that derivation is deterministic
+        hd_add_2 = None
+        for _ in range(num_hd_adds):
+            hd_add_2 = self.nodes[1].getnewaddress()
+        assert_equal(hd_add, hd_add_2)
+
+        # Needs rescan
+        self.stop_node(1)
+        self.nodes[1] = start_node(1, self.options.tmpdir, self.node_args[1] + ['-rescan'])
+        #connect_nodes_bi(self.nodes, 0, 1)
+        assert_equal(self.nodes[1].getbalance(), num_hd_adds + 1)
+
+
+if __name__ == '__main__':
+    WalletHDTest().main ()

From 099d4b0b65b7dceb14dc4ec5231a60996dff4c69 Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Thu, 7 Jul 2016 20:09:55 -0400
Subject: [PATCH 0608/1802] gitian: use a wrapped gcc/g++ to avoid the need for
 a system change

C_INCLUDE_PATH and CPLUS_INCLUDE_PATH work globally as though -isystem was used
for each invocation.

Since that changes the build results, force a rebuild of x86 depends by adding
the value to $HOST_ID_SALT.
---
 contrib/gitian-descriptors/gitian-linux.yml | 40 +++++++++++++++++----
 1 file changed, 34 insertions(+), 6 deletions(-)

diff --git a/contrib/gitian-descriptors/gitian-linux.yml b/contrib/gitian-descriptors/gitian-linux.yml
index a2788c9d76169..6f43119ba24e6 100644
--- a/contrib/gitian-descriptors/gitian-linux.yml
+++ b/contrib/gitian-descriptors/gitian-linux.yml
@@ -33,12 +33,6 @@ remotes:
 files: []
 script: |
 
-  #unlock sudo
-  echo "ubuntu" | sudo -S true
-
-  sudo mkdir -p /usr/include/i386-linux-gnu/
-  sudo ln -s /usr/include/x86_64-linux-gnu/asm /usr/include/i386-linux-gnu/asm
-
   WRAP_DIR=$HOME/wrapped
   HOSTS="i686-pc-linux-gnu x86_64-linux-gnu arm-linux-gnueabihf aarch64-linux-gnu"
   CONFIGFLAGS="--enable-glibc-back-compat --enable-reduce-exports --disable-bench --disable-gui-tests"
@@ -90,11 +84,45 @@ script: |
   create_per-host_faketime_wrappers "2000-01-01 12:00:00"
   export PATH=${WRAP_DIR}:${PATH}
 
+  EXTRA_INCLUDES_BASE=$WRAP_DIR/extra_includes
+  mkdir -p $EXTRA_INCLUDES_BASE
+
+  # x86 needs /usr/include/i386-linux-gnu/asm pointed to /usr/include/x86_64-linux-gnu/asm,
+  # but we can't write there. Instead, create a link here and force it to be included in the
+  # search paths by wrapping gcc/g++.
+
+  mkdir -p $EXTRA_INCLUDES_BASE/i686-pc-linux-gnu
+  rm -f $WRAP_DIR/extra_includes/i686-pc-linux-gnu/asm
+  ln -s /usr/include/x86_64-linux-gnu/asm $EXTRA_INCLUDES_BASE/i686-pc-linux-gnu/asm
+
+  for prog in gcc g++; do
+  rm -f ${WRAP_DIR}/${prog}
+  cat << EOF > ${WRAP_DIR}/${prog}
+  #!/bin/bash
+  REAL="`which -a ${prog} | grep -v ${WRAP_DIR}/${prog} | head -1`"
+  for var in "\$@"
+  do
+    if [ "\$var" = "-m32" ]; then
+      export C_INCLUDE_PATH="$EXTRA_INCLUDES_BASE/i686-pc-linux-gnu"
+      export CPLUS_INCLUDE_PATH="$EXTRA_INCLUDES_BASE/i686-pc-linux-gnu"
+      break
+    fi
+  done
+  \$REAL \$@
+  EOF
+  chmod +x ${WRAP_DIR}/${prog}
+  done
+
   cd bitcoin
   BASEPREFIX=`pwd`/depends
   # Build dependencies for each host
   for i in $HOSTS; do
+    EXTRA_INCLUDES="$EXTRA_INCLUDES_BASE/$i"
+    if [ -d "$EXTRA_INCLUDES" ]; then
+      export HOST_ID_SALT="$EXTRA_INCLUDES"
+    fi
     make ${MAKEOPTS} -C ${BASEPREFIX} HOST="${i}"
+    unset HOST_ID_SALT
   done
 
   # Faketime for binaries

From 46c9620f11acfd2b528959d6cbab324105c3adef Mon Sep 17 00:00:00 2001
From: Suhas Daftuar <sdaftuar@gmail.com>
Date: Thu, 7 Jul 2016 21:18:05 -0400
Subject: [PATCH 0609/1802] Test that unnecessary witnesses can't be used for
 mempool DoS

Check that pre-segwit activation, unnecessary witnesses won't cause
a txid to be permanently rejected.
---
 qa/rpc-tests/p2p-segwit.py | 54 +++++++++++++++++++++++++++++++++++---
 1 file changed, 51 insertions(+), 3 deletions(-)

diff --git a/qa/rpc-tests/p2p-segwit.py b/qa/rpc-tests/p2p-segwit.py
index cf78954f286bc..2a2079d5e3ebf 100755
--- a/qa/rpc-tests/p2p-segwit.py
+++ b/qa/rpc-tests/p2p-segwit.py
@@ -43,6 +43,7 @@ def __init__(self):
         self.last_pong = msg_pong(0)
         self.sleep_time = 0.05
         self.getdataset = set()
+        self.last_reject = None
 
     def add_connection(self, conn):
         self.connection = conn
@@ -68,7 +69,7 @@ def on_pong(self, conn, message):
 
     def on_reject(self, conn, message):
         self.last_reject = message
-        #print message
+        #print (message)
 
     # Syncing helpers
     def sync(self, test_function, timeout=60):
@@ -136,13 +137,17 @@ def request_block(self, blockhash, inv_type, timeout=60):
         self.wait_for_block(blockhash, timeout)
         return self.last_block
 
-    def test_transaction_acceptance(self, tx, with_witness, accepted):
+    def test_transaction_acceptance(self, tx, with_witness, accepted, reason=None):
         tx_message = msg_tx(tx)
         if with_witness:
             tx_message = msg_witness_tx(tx)
         self.send_message(tx_message)
         self.sync_with_ping()
         assert_equal(tx.hash in self.connection.rpc.getrawmempool(), accepted)
+        if (reason != None and not accepted):
+            # Check the rejection reason as well.
+            with mininode_lock:
+                assert_equal(self.last_reject.reason, reason)
 
     # Test whether a witness block had the correct effect on the tip
     def test_witness_block(self, block, accepted, with_witness=True):
@@ -277,9 +282,52 @@ def test_unnecessary_witness_before_segwit_activation(self):
         self.test_node.sync_with_ping()
         assert_equal(self.nodes[0].getbestblockhash(), block.hash)
 
+        sync_blocks(self.nodes)
+
+        # Create a p2sh output -- this is so we can pass the standardness
+        # rules (an anyone-can-spend OP_TRUE would be rejected, if not wrapped
+        # in P2SH).
+        p2sh_program = CScript([OP_TRUE])
+        p2sh_pubkey = hash160(p2sh_program)
+        scriptPubKey = CScript([OP_HASH160, p2sh_pubkey, OP_EQUAL])
+
+        # Now check that unnecessary witnesses can't be used to blind a node
+        # to a transaction, eg by violating standardness checks.
+        tx2 = CTransaction()
+        tx2.vin.append(CTxIn(COutPoint(tx.sha256, 0), b""))
+        tx2.vout.append(CTxOut(tx.vout[0].nValue-1000, scriptPubKey))
+        tx2.rehash()
+        self.test_node.test_transaction_acceptance(tx2, False, True)
+        self.nodes[0].generate(1)
+        sync_blocks(self.nodes)
+
+        # We'll add an unnecessary witness to this transaction that would cause
+        # it to be too large according to IsStandard.
+        tx3 = CTransaction()
+        tx3.vin.append(CTxIn(COutPoint(tx2.sha256, 0), CScript([p2sh_program])))
+        tx3.vout.append(CTxOut(tx2.vout[0].nValue-1000, scriptPubKey))
+        tx3.wit.vtxinwit.append(CTxinWitness())
+        tx3.wit.vtxinwit[0].scriptWitness.stack = [b'a'*400000]
+        tx3.rehash()
+        self.std_node.test_transaction_acceptance(tx3, True, False, b'no-witness-yet')
+
+        # If we send without witness, it should be accepted.
+        self.std_node.test_transaction_acceptance(tx3, False, True)
+
+        # Now create a new anyone-can-spend utxo for the next test.
+        tx4 = CTransaction()
+        tx4.vin.append(CTxIn(COutPoint(tx3.sha256, 0), CScript([p2sh_program])))
+        tx4.vout.append(CTxOut(tx3.vout[0].nValue-1000, CScript([OP_TRUE])))
+        tx4.rehash()
+        self.test_node.test_transaction_acceptance(tx3, False, True)
+        self.test_node.test_transaction_acceptance(tx4, False, True)
+
+        self.nodes[0].generate(1)
+        sync_blocks(self.nodes)
+
         # Update our utxo list; we spent the first entry.
         self.utxo.pop(0)
-        self.utxo.append(UTXO(tx.sha256, 0, tx.vout[0].nValue))
+        self.utxo.append(UTXO(tx4.sha256, 0, tx4.vout[0].nValue))
 
 
     # Mine enough blocks for segwit's vb state to be 'started'.

From 477777f2503e3a56a267556f0fc5091042d93340 Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Fri, 8 Jul 2016 12:01:39 +0200
Subject: [PATCH 0610/1802] [rpcwallet] Don't use floating point

---
 src/wallet/rpcwallet.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index 8538f880ff636..2747477fd93e7 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -564,8 +564,8 @@ UniValue getreceivedbyaddress(const UniValue& params, bool fHelp)
     if (!address.IsValid())
         throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid Bitcoin address");
     CScript scriptPubKey = GetScriptForDestination(address.Get());
-    if (!IsMine(*pwalletMain,scriptPubKey))
-        return (double)0.0;
+    if (!IsMine(*pwalletMain, scriptPubKey))
+        return ValueFromAmount(0);
 
     // Minimum confirmations
     int nMinDepth = 1;
@@ -643,7 +643,7 @@ UniValue getreceivedbyaccount(const UniValue& params, bool fHelp)
         }
     }
 
-    return (double)nAmount / (double)COIN;
+    return ValueFromAmount(nAmount);
 }
 
 

From d6dc1bc49b958e3c89aa0885ce39ad7a0e0f7493 Mon Sep 17 00:00:00 2001
From: Krzysztof Jurewicz <krzysztof.jurewicz@gmail.com>
Date: Fri, 8 Jul 2016 22:15:08 +0200
Subject: [PATCH 0611/1802] Fix 0.12 release notes on block relaying

The previous information about block relaying in pruned mode suggested
that blocks are relayed only to nodes that support BIP 130, which is not
true.
---
 doc/release-notes/release-notes-0.12.0.md | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/doc/release-notes/release-notes-0.12.0.md b/doc/release-notes/release-notes-0.12.0.md
index 1b7bd06ece6a2..cf74a17975207 100644
--- a/doc/release-notes/release-notes-0.12.0.md
+++ b/doc/release-notes/release-notes-0.12.0.md
@@ -104,9 +104,6 @@ announcing their headers directly, instead of just announcing the hash. In a
 reorganization, all new headers are sent, instead of just the new tip. This
 can often prevent an extra roundtrip before the actual block is downloaded.
 
-With this change, pruning nodes are now able to relay new blocks to compatible
-peers.
-
 Memory pool limiting
 --------------------
 
@@ -188,6 +185,14 @@ the OP_RETURN. The limit on OP_RETURN output size is now applied to the entire
 serialized scriptPubKey, 83 bytes by default. (the previous 80 byte default plus
 three bytes overhead)
 
+Relay: New and only new blocks relayed when pruning
+---------------------------------------------------
+
+When running in pruned mode, the client will now relay new blocks. When
+responding to the `getblocks` message, only hashes of blocks that are on disk
+and are likely to remain there for some reasonable time window (1 hour) will be
+returned (previously all relevant hashes were returned).
+
 Relay and Mining: Priority transactions
 ---------------------------------------
 
@@ -887,4 +892,3 @@ Thanks to everyone who directly contributed to this release:
 - zathras-crypto
 
 As well as everyone that helped translating on [Transifex](https://www.transifex.com/projects/p/bitcoin/).
-

From 5b95dd2c256dd7ba3808021adc31bb85b41553c8 Mon Sep 17 00:00:00 2001
From: Jonas Schnelli <dev@jonasschnelli.ch>
Date: Sat, 9 Jul 2016 11:41:01 +0200
Subject: [PATCH 0612/1802] [Wallet] extend CKeyMetadata with HD keypath

---
 src/wallet/wallet.cpp |  2 ++
 src/wallet/walletdb.h | 13 ++++++++++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index a0095ebd92e76..33e516a7f4ef9 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -126,6 +126,8 @@ CPubKey CWallet::GenerateNewKey()
             // childIndex | BIP32_HARDENED_KEY_LIMIT = derive childIndex in hardened child-index-range
             // example: 1 | BIP32_HARDENED_KEY_LIMIT == 0x80000001 == 2147483649
             externalChainChildKey.Derive(childKey, hdChain.nExternalChainCounter | BIP32_HARDENED_KEY_LIMIT);
+            metadata.hdKeypath     = "m/0'/0'/"+std::to_string(hdChain.nExternalChainCounter)+"'";
+            metadata.hdMasterKeyID = hdChain.masterKeyID;
             // increment childkey index
             hdChain.nExternalChainCounter++;
         } while(HaveKey(childKey.key.GetPubKey().GetID()));
diff --git a/src/wallet/walletdb.h b/src/wallet/walletdb.h
index d083722dd23ac..eaa406857f2e7 100644
--- a/src/wallet/walletdb.h
+++ b/src/wallet/walletdb.h
@@ -73,9 +73,13 @@ class CHDChain
 class CKeyMetadata
 {
 public:
-    static const int CURRENT_VERSION=1;
+    static const int VERSION_BASIC=1;
+    static const int VERSION_WITH_HDDATA=10;
+    static const int CURRENT_VERSION=VERSION_WITH_HDDATA;
     int nVersion;
     int64_t nCreateTime; // 0 means unknown
+    std::string hdKeypath; //optional HD/bip32 keypath
+    CKeyID hdMasterKeyID; //id of the hd masterkey used to derive this key
 
     CKeyMetadata()
     {
@@ -85,6 +89,7 @@ class CKeyMetadata
     {
         nVersion = CKeyMetadata::CURRENT_VERSION;
         nCreateTime = nCreateTime_;
+        hdKeypath.clear();
     }
 
     ADD_SERIALIZE_METHODS;
@@ -94,12 +99,18 @@ class CKeyMetadata
         READWRITE(this->nVersion);
         nVersion = this->nVersion;
         READWRITE(nCreateTime);
+        if (this->nVersion >= VERSION_WITH_HDDATA)
+        {
+            READWRITE(hdKeypath);
+            READWRITE(hdMasterKeyID);
+        }
     }
 
     void SetNull()
     {
         nVersion = CKeyMetadata::CURRENT_VERSION;
         nCreateTime = 0;
+        hdKeypath.clear();
     }
 };
 

From b1c7b244e21ba67c38fe3d1a4d1638ca52835ac5 Mon Sep 17 00:00:00 2001
From: Jonas Schnelli <dev@jonasschnelli.ch>
Date: Sat, 9 Jul 2016 11:41:32 +0200
Subject: [PATCH 0613/1802] [Wallet] report optional HDKeypath/HDMasterKeyId in
 validateaddress

---
 src/rpc/misc.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/rpc/misc.cpp b/src/rpc/misc.cpp
index f2a29416e675d..a8c5bcd177fbc 100644
--- a/src/rpc/misc.cpp
+++ b/src/rpc/misc.cpp
@@ -166,6 +166,8 @@ UniValue validateaddress(const UniValue& params, bool fHelp)
             "  \"pubkey\" : \"publickeyhex\",    (string) The hex value of the raw public key\n"
             "  \"iscompressed\" : true|false,  (boolean) If the address is compressed\n"
             "  \"account\" : \"account\"         (string) DEPRECATED. The account associated with the address, \"\" is the default account\n"
+            "  \"hdkeypath\" : \"keypath\"       (string, optional) The HD keypath if the key is HD and available\n"
+            "  \"hdmasterkeyid\" : \"<hash160>\" (string, optional) The Hash160 of the HD master pubkey\n"
             "}\n"
             "\nExamples:\n"
             + HelpExampleCli("validateaddress", "\"1PSSGeFHDnKNxiEyFrD1wcEaHr9hrQDDWc\"")
@@ -200,6 +202,12 @@ UniValue validateaddress(const UniValue& params, bool fHelp)
         ret.pushKVs(detail);
         if (pwalletMain && pwalletMain->mapAddressBook.count(dest))
             ret.push_back(Pair("account", pwalletMain->mapAddressBook[dest].name));
+        CKeyID keyID;
+        if (pwalletMain && address.GetKeyID(keyID) && pwalletMain->mapKeyMetadata.count(keyID) && !pwalletMain->mapKeyMetadata[keyID].hdKeypath.empty())
+        {
+            ret.push_back(Pair("hdkeypath", pwalletMain->mapKeyMetadata[keyID].hdKeypath));
+            ret.push_back(Pair("hdmasterkeyid", pwalletMain->mapKeyMetadata[keyID].hdMasterKeyID.GetHex()));
+        }
 #endif
     }
     return ret;

From 986c2232143e5c2f909f5b27bf74470654faf49c Mon Sep 17 00:00:00 2001
From: Jonas Schnelli <dev@jonasschnelli.ch>
Date: Sat, 9 Jul 2016 11:25:02 +0200
Subject: [PATCH 0614/1802] [Wallet] print hd masterkeyid in getwalletinfo

---
 src/wallet/rpcwallet.cpp | 4 ++++
 src/wallet/wallet.h      | 1 +
 2 files changed, 5 insertions(+)

diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index 8538f880ff636..f4625743b3583 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -2269,6 +2269,7 @@ UniValue getwalletinfo(const UniValue& params, bool fHelp)
             "  \"keypoolsize\": xxxx,        (numeric) how many new keys are pre-generated\n"
             "  \"unlocked_until\": ttt,      (numeric) the timestamp in seconds since epoch (midnight Jan 1 1970 GMT) that the wallet is unlocked for transfers, or 0 if the wallet is locked\n"
             "  \"paytxfee\": x.xxxx,         (numeric) the transaction fee configuration, set in " + CURRENCY_UNIT + "/kB\n"
+            "  \"masterkeyid\": \"<hash160>\", (string) the Hash160 of the hd master pubkey\n"
             "}\n"
             "\nExamples:\n"
             + HelpExampleCli("getwalletinfo", "")
@@ -2288,6 +2289,9 @@ UniValue getwalletinfo(const UniValue& params, bool fHelp)
     if (pwalletMain->IsCrypted())
         obj.push_back(Pair("unlocked_until", nWalletUnlockTime));
     obj.push_back(Pair("paytxfee",      ValueFromAmount(payTxFee.GetFeePerK())));
+    CKeyID masterKeyID = pwalletMain->GetHDChain().masterKeyID;
+    if (!masterKeyID.IsNull())
+         obj.push_back(Pair("masterkeyid",masterKeyID.GetHex()));
     return obj;
 }
 
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
index 7fc6ce5de5af1..d58cb7b0e4fdd 100644
--- a/src/wallet/wallet.h
+++ b/src/wallet/wallet.h
@@ -901,6 +901,7 @@ class CWallet : public CCryptoKeyStore, public CValidationInterface
 
     /* Set the current hd master key (will reset the chain child index counters) */
     bool SetHDMasterKey(const CKey& key);
+    const CHDChain& GetHDChain() { return hdChain; }
 };
 
 /** A key allocated from the key pool. */

From f70808596fb4108e53c8b433820593b88c4fa81b Mon Sep 17 00:00:00 2001
From: Jonas Schnelli <dev@jonasschnelli.ch>
Date: Sat, 9 Jul 2016 12:05:30 +0200
Subject: [PATCH 0615/1802] [QA] extend wallet-hd test to cover HD metadata

---
 qa/rpc-tests/wallet-hd.py | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/qa/rpc-tests/wallet-hd.py b/qa/rpc-tests/wallet-hd.py
index 845eec027bde2..f3ae69e1062d5 100755
--- a/qa/rpc-tests/wallet-hd.py
+++ b/qa/rpc-tests/wallet-hd.py
@@ -30,6 +30,10 @@ def setup_network(self):
     def run_test (self):
         tmpdir = self.options.tmpdir
 
+        # Make sure we use hd, keep masterkeyid
+        masterkeyid = self.nodes[1].getwalletinfo()['masterkeyid']
+        assert_equal(len(masterkeyid), 40)
+
         # Import a non-HD private key in the HD wallet
         non_hd_add = self.nodes[0].getnewaddress()
         self.nodes[1].importprivkey(self.nodes[0].dumpprivkey(non_hd_add))
@@ -45,6 +49,9 @@ def run_test (self):
         num_hd_adds = 300
         for _ in range(num_hd_adds):
             hd_add = self.nodes[1].getnewaddress()
+            hd_info = self.nodes[1].validateaddress(hd_add)
+            assert_equal(hd_info["hdkeypath"], "m/0'/0'/"+str(_+1)+"'")
+            assert_equal(hd_info["hdmasterkeyid"], masterkeyid)
             self.nodes[0].sendtoaddress(hd_add, 1)
             self.nodes[0].generate(1)
         self.nodes[0].sendtoaddress(non_hd_add, 1)
@@ -64,6 +71,9 @@ def run_test (self):
         hd_add_2 = None
         for _ in range(num_hd_adds):
             hd_add_2 = self.nodes[1].getnewaddress()
+            hd_info_2 = self.nodes[1].validateaddress(hd_add_2)
+            assert_equal(hd_info_2["hdkeypath"], "m/0'/0'/"+str(_+1)+"'")
+            assert_equal(hd_info_2["hdmasterkeyid"], masterkeyid)
         assert_equal(hd_add, hd_add_2)
 
         # Needs rescan

From b993671921c0c301f18c542e77d695fdc50ffd91 Mon Sep 17 00:00:00 2001
From: Jonas Schnelli <dev@jonasschnelli.ch>
Date: Sat, 9 Jul 2016 12:56:56 +0200
Subject: [PATCH 0616/1802] [Wallet] keep HD seed during salvagewallet

---
 src/wallet/wallet.cpp   | 2 +-
 src/wallet/walletdb.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index a0095ebd92e76..7cb294bec14a6 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -3291,7 +3291,7 @@ bool CWallet::InitLoadWallet()
     if (fFirstRun)
     {
         // Create new keyUser and set as default key
-        if (GetBoolArg("-usehd", DEFAULT_USE_HD_WALLET)) {
+        if (GetBoolArg("-usehd", DEFAULT_USE_HD_WALLET) && walletInstance->hdChain.masterKeyID.IsNull()) {
             // generate a new master key
             CKey key;
             key.MakeNewKey(true);
diff --git a/src/wallet/walletdb.cpp b/src/wallet/walletdb.cpp
index 7bfd4909506f3..72af8ab7b25e6 100644
--- a/src/wallet/walletdb.cpp
+++ b/src/wallet/walletdb.cpp
@@ -977,7 +977,7 @@ bool CWalletDB::Recover(CDBEnv& dbenv, const std::string& filename, bool fOnlyKe
                 fReadOK = ReadKeyValue(&dummyWallet, ssKey, ssValue,
                                         wss, strType, strErr);
             }
-            if (!IsKeyType(strType))
+            if (!IsKeyType(strType) && strType != "hdchain")
                 continue;
             if (!fReadOK)
             {

From 4831a16223dbb42da3091e616c47eeb01f53f73b Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Tue, 12 Jul 2016 09:36:17 +0000
Subject: [PATCH 0617/1802] qt: periodic translation update

Added languages:
- `bg_BG`: Bulgarian (Bulgaria)
---
 src/Makefile.qt.include              |   1 +
 src/qt/bitcoin_locale.qrc            |   1 +
 src/qt/locale/bitcoin_af.ts          |   4 -
 src/qt/locale/bitcoin_ar.ts          | 158 ++++++++++++++++--
 src/qt/locale/bitcoin_bg.ts          |   4 -
 src/qt/locale/bitcoin_bg_BG.ts       | 236 +++++++++++++++++++++++++++
 src/qt/locale/bitcoin_ca.ts          |  12 --
 src/qt/locale/bitcoin_ca@valencia.ts |  12 --
 src/qt/locale/bitcoin_ca_ES.ts       |  12 --
 src/qt/locale/bitcoin_cs.ts          |  12 --
 src/qt/locale/bitcoin_da.ts          |  12 --
 src/qt/locale/bitcoin_de.ts          |  58 +++++--
 src/qt/locale/bitcoin_el_GR.ts       |   4 -
 src/qt/locale/bitcoin_en_GB.ts       |  12 --
 src/qt/locale/bitcoin_eo.ts          |   4 -
 src/qt/locale/bitcoin_es.ts          |  12 --
 src/qt/locale/bitcoin_es_CL.ts       |   4 -
 src/qt/locale/bitcoin_es_DO.ts       |   4 -
 src/qt/locale/bitcoin_et.ts          |   4 -
 src/qt/locale/bitcoin_fa.ts          |   4 -
 src/qt/locale/bitcoin_fa_IR.ts       |   4 -
 src/qt/locale/bitcoin_fi.ts          |  12 --
 src/qt/locale/bitcoin_fr.ts          |  12 --
 src/qt/locale/bitcoin_fr_FR.ts       |   4 -
 src/qt/locale/bitcoin_gl.ts          |   4 -
 src/qt/locale/bitcoin_he.ts          |   4 -
 src/qt/locale/bitcoin_hr.ts          |   4 -
 src/qt/locale/bitcoin_hu.ts          |   4 -
 src/qt/locale/bitcoin_id_ID.ts       |   4 -
 src/qt/locale/bitcoin_it.ts          |  12 --
 src/qt/locale/bitcoin_ja.ts          |  12 --
 src/qt/locale/bitcoin_ka.ts          |   4 -
 src/qt/locale/bitcoin_ko_KR.ts       |  12 --
 src/qt/locale/bitcoin_la.ts          |   4 -
 src/qt/locale/bitcoin_lt.ts          |   4 -
 src/qt/locale/bitcoin_lv_LV.ts       |   4 -
 src/qt/locale/bitcoin_mn.ts          |   4 -
 src/qt/locale/bitcoin_nb.ts          |  12 --
 src/qt/locale/bitcoin_nl.ts          |  12 --
 src/qt/locale/bitcoin_pam.ts         |   4 -
 src/qt/locale/bitcoin_pl.ts          |  12 --
 src/qt/locale/bitcoin_pt_BR.ts       |  60 +++++--
 src/qt/locale/bitcoin_pt_PT.ts       |  12 --
 src/qt/locale/bitcoin_ro_RO.ts       |   4 -
 src/qt/locale/bitcoin_ru.ts          | 108 ++++++++++--
 src/qt/locale/bitcoin_sk.ts          |  12 --
 src/qt/locale/bitcoin_sl_SI.ts       |  12 --
 src/qt/locale/bitcoin_sv.ts          |  12 --
 src/qt/locale/bitcoin_ta.ts          |   4 -
 src/qt/locale/bitcoin_tr.ts          |  12 --
 src/qt/locale/bitcoin_uk.ts          |  12 --
 src/qt/locale/bitcoin_uz@Cyrl.ts     |   4 -
 src/qt/locale/bitcoin_zh_CN.ts       |  12 --
 src/qt/locale/bitcoin_zh_TW.ts       |  14 +-
 54 files changed, 574 insertions(+), 422 deletions(-)
 create mode 100644 src/qt/locale/bitcoin_bg_BG.ts

diff --git a/src/Makefile.qt.include b/src/Makefile.qt.include
index ca2c7b2eb0d83..7730aba375c44 100644
--- a/src/Makefile.qt.include
+++ b/src/Makefile.qt.include
@@ -8,6 +8,7 @@ QT_TS = \
   qt/locale/bitcoin_ar.ts \
   qt/locale/bitcoin_be_BY.ts \
   qt/locale/bitcoin_bg.ts \
+  qt/locale/bitcoin_bg_BG.ts \
   qt/locale/bitcoin_ca_ES.ts \
   qt/locale/bitcoin_ca.ts \
   qt/locale/bitcoin_ca@valencia.ts \
diff --git a/src/qt/bitcoin_locale.qrc b/src/qt/bitcoin_locale.qrc
index 54d36ac0118fa..8dd07c3d41777 100644
--- a/src/qt/bitcoin_locale.qrc
+++ b/src/qt/bitcoin_locale.qrc
@@ -5,6 +5,7 @@
         <file alias="ar">locale/bitcoin_ar.qm</file>
         <file alias="be_BY">locale/bitcoin_be_BY.qm</file>
         <file alias="bg">locale/bitcoin_bg.qm</file>
+        <file alias="bg_BG">locale/bitcoin_bg_BG.qm</file>
         <file alias="ca_ES">locale/bitcoin_ca_ES.qm</file>
         <file alias="ca">locale/bitcoin_ca.qm</file>
         <file alias="ca@valencia">locale/bitcoin_ca@valencia.qm</file>
diff --git a/src/qt/locale/bitcoin_af.ts b/src/qt/locale/bitcoin_af.ts
index 7c2d294c7e8ff..97ada8dd5c63a 100644
--- a/src/qt/locale/bitcoin_af.ts
+++ b/src/qt/locale/bitcoin_af.ts
@@ -256,10 +256,6 @@
         <source>Bitcoin Core</source>
         <translation>Bitcoin Kern</translation>
     </message>
-    <message>
-        <source>WARNING: check your network connection, %d blocks received in the last %d hours (%d expected)</source>
-        <translation>WAARSKUWING:  toets die status van u netwerk, %d blokke ontvang in die laaste %d ure (%d verwag)</translation>
-    </message>
     <message>
         <source>Do not keep transactions in the mempool longer than &lt;n&gt; hours (default: %u)</source>
         <translation>Moenie transaksies vir langer as &lt;n&gt; ure in die geheuepoel hou nie (verstek: %u)</translation>
diff --git a/src/qt/locale/bitcoin_ar.ts b/src/qt/locale/bitcoin_ar.ts
index 78fd074434316..af62207df2bde 100644
--- a/src/qt/locale/bitcoin_ar.ts
+++ b/src/qt/locale/bitcoin_ar.ts
@@ -110,10 +110,6 @@
         <source>Quit application</source>
         <translation>الخروج من التطبيق</translation>
     </message>
-    <message>
-        <source>&amp;About %1</source>
-        <translation>&amp;عن %1</translation>
-    </message>
     <message>
         <source>Show information about %1</source>
         <translation>أظهر المعلومات حولة %1</translation>
@@ -306,6 +302,20 @@
         <source>Catching up...</source>
         <translation>اللحاق بالركب ...</translation>
     </message>
+    <message>
+        <source>Date: %1
+</source>
+        <translation>التاريخ %1
+
+
+</translation>
+    </message>
+    <message>
+        <source>Label: %1
+</source>
+        <translation>علامه: %1
+</translation>
+    </message>
     <message>
         <source>Sent transaction</source>
         <translation>المعاملات  المرسلة</translation>
@@ -325,10 +335,18 @@
 </context>
 <context>
     <name>CoinControlDialog</name>
+    <message>
+        <source>Coin Selection</source>
+        <translation>اختيار العمله</translation>
+    </message>
     <message>
         <source>Quantity:</source>
         <translation>الكمية :</translation>
     </message>
+    <message>
+        <source>Bytes:</source>
+        <translation>بايت</translation>
+    </message>
     <message>
         <source>Amount:</source>
         <translation>القيمة :</translation>
@@ -341,6 +359,10 @@
         <source>Fee:</source>
         <translation>رسوم :</translation>
     </message>
+    <message>
+        <source>Dust:</source>
+        <translation>غبار:</translation>
+    </message>
     <message>
         <source>After Fee:</source>
         <translation>بعد الرسوم :</translation>
@@ -349,9 +371,21 @@
         <source>Change:</source>
         <translation>تعديل :</translation>
     </message>
+    <message>
+        <source>(un)select all</source>
+        <translation>عدم اختيار الجميع</translation>
+    </message>
+    <message>
+        <source>Tree mode</source>
+        <translation>صيغة الشجرة</translation>
+    </message>
+    <message>
+        <source>List mode</source>
+        <translation>صيغة القائمة</translation>
+    </message>
     <message>
         <source>Amount</source>
-        <translation>المبلغ</translation>
+        <translation>مبلغ</translation>
     </message>
     <message>
         <source>Received with label</source>
@@ -363,11 +397,11 @@
     </message>
     <message>
         <source>Date</source>
-        <translation>التاريخ</translation>
+        <translation>تاريخ</translation>
     </message>
     <message>
         <source>Confirmations</source>
-        <translation>تأكيد</translation>
+        <translation>تأكيدات</translation>
     </message>
     <message>
         <source>Confirmed</source>
@@ -388,6 +422,14 @@
         <source>&amp;Label</source>
         <translation>&amp;وصف</translation>
     </message>
+    <message>
+        <source>The label associated with this address list entry</source>
+        <translation>الملصق المرتبط بقائمة العناوين المدخلة</translation>
+    </message>
+    <message>
+        <source>The address associated with this address list entry. This can only be modified for sending addresses.</source>
+        <translation>العنوان المرتبط بقائمة العناوين المدخلة. و التي يمكن تعديلها فقط بواسطة ارسال العناوين</translation>
+    </message>
     <message>
         <source>&amp;Address</source>
         <translation>&amp;العنوان</translation>
@@ -442,6 +484,14 @@
         <source>Choose data directory on startup (default: %u)</source>
         <translation>اختر دليل البيانات عند بدء التشغير (افتراضي: %u)</translation>
     </message>
+    <message>
+        <source>Set language, for example "de_DE" (default: system locale)</source>
+        <translation>أضع لغة, على سبيل المثال " de_DE "  (افتراضي:- مكان النظام)</translation>
+    </message>
+    <message>
+        <source>Start minimized</source>
+        <translation>الدخول مصغر</translation>
+    </message>
     <message>
         <source>Set SSL root certificates for payment request (default: -system-)</source>
         <translation>أضع شهادة بروتوكول الشبقة الأمنية لطلب المدفوع (افتراضي: -نظام-)</translation>
@@ -450,7 +500,11 @@
         <source>Show splash screen on startup (default: %u)</source>
         <translation>أظهر شاشة البداية عند بدء التشغيل (افتراضي: %u)</translation>
     </message>
-    </context>
+    <message>
+        <source>Reset all settings changed in the GUI</source>
+        <translation>اعد تعديل جميع النظم المتغيرة في GUI</translation>
+    </message>
+</context>
 <context>
     <name>Intro</name>
     <message>
@@ -472,6 +526,14 @@
     </context>
 <context>
     <name>OpenURIDialog</name>
+    <message>
+        <source>Open URI</source>
+        <translation>افتح URL</translation>
+    </message>
+    <message>
+        <source>Open payment request from URI or file</source>
+        <translation>حدد طلب الدفع من ملف او URI</translation>
+    </message>
     <message>
         <source>Select payment request file</source>
         <translation>حدد ملف طلب الدفع</translation>
@@ -527,10 +589,18 @@
         <source>Port of the proxy (e.g. 9050)</source>
         <translation>منفذ البروكسي (مثلا 9050)</translation>
     </message>
+    <message>
+        <source>Used for reaching peers via:</source>
+        <translation>مستخدم للاتصال بالاصدقاء من خلال:</translation>
+    </message>
     <message>
         <source>&amp;Window</source>
         <translation>نافذه</translation>
     </message>
+    <message>
+        <source>Hide tray icon</source>
+        <translation>اخفاء لوحة الايقون</translation>
+    </message>
     <message>
         <source>&amp;Display</source>
         <translation>&amp;عرض</translation>
@@ -615,10 +685,6 @@
     </context>
 <context>
     <name>RPCConsole</name>
-    <message>
-        <source>Client name</source>
-        <translation>اسم العميل</translation>
-    </message>
     <message>
         <source>N/A</source>
         <translation>غير معروف</translation>
@@ -663,6 +729,10 @@
         <source>Sent</source>
         <translation>تم الإرسال</translation>
     </message>
+    <message>
+        <source>&amp;Peers</source>
+        <translation>&amp;اصدقاء</translation>
+    </message>
     <message>
         <source>Direction</source>
         <translation>جهة</translation>
@@ -703,6 +773,22 @@
         <source>Out:</source>
         <translation>خارج:</translation>
     </message>
+    <message>
+        <source>1 &amp;hour</source>
+        <translation>1 &amp;ساعة</translation>
+    </message>
+    <message>
+        <source>1 &amp;day</source>
+        <translation>1 &amp; يوم</translation>
+    </message>
+    <message>
+        <source>1 &amp;week</source>
+        <translation>1 &amp; اسبوع</translation>
+    </message>
+    <message>
+        <source>1 &amp;year</source>
+        <translation>1 &amp; سنة</translation>
+    </message>
     <message>
         <source>Use up and down arrows to navigate history, and &lt;b&gt;Ctrl-L&lt;/b&gt; to clear screen.</source>
         <translation>استخدم اسهم الاعلى و الاسفل للتنقل بين السجلات و &lt;b&gt;Ctrl-L&lt;/b&gt;  لمسح الشاشة</translation>
@@ -723,6 +809,18 @@
         <source>%1 GB</source>
         <translation>%1 قيقا بايت</translation>
     </message>
+    <message>
+        <source>never</source>
+        <translation>ابدا</translation>
+    </message>
+    <message>
+        <source>Inbound</source>
+        <translation>داخل</translation>
+    </message>
+    <message>
+        <source>Outbound</source>
+        <translation>خارجي</translation>
+    </message>
     <message>
         <source>Yes</source>
         <translation>نعم</translation>
@@ -808,6 +906,10 @@
         <source>Quantity:</source>
         <translation>الكمية :</translation>
     </message>
+    <message>
+        <source>Bytes:</source>
+        <translation>بايت</translation>
+    </message>
     <message>
         <source>Amount:</source>
         <translation>القيمة :</translation>
@@ -836,6 +938,14 @@
         <source>Hide</source>
         <translation>إخفاء</translation>
     </message>
+    <message>
+        <source>normal</source>
+        <translation>طبيعي</translation>
+    </message>
+    <message>
+        <source>fast</source>
+        <translation>سريع</translation>
+    </message>
     <message>
         <source>Send to multiple recipients at once</source>
         <translation>إرسال إلى عدة مستلمين في وقت واحد</translation>
@@ -848,6 +958,10 @@
         <source>Clear all fields of the form.</source>
         <translation>مسح كل حقول النموذج المطلوبة</translation>
     </message>
+    <message>
+        <source>Dust:</source>
+        <translation>غبار</translation>
+    </message>
     <message>
         <source>Clear &amp;All</source>
         <translation>مسح الكل</translation>
@@ -879,6 +993,18 @@
         <source>&amp;Label:</source>
         <translation>&amp;وصف :</translation>
     </message>
+    <message>
+        <source>Choose previously used address</source>
+        <translation>اختر عنوانا مستخدم سابقا</translation>
+    </message>
+    <message>
+        <source>This is a normal payment.</source>
+        <translation>هذا دفع اعتيادي</translation>
+    </message>
+    <message>
+        <source>The Bitcoin address to send the payment to</source>
+        <translation>عنوان البت كوين المرسل اليه الدفع</translation>
+    </message>
     <message>
         <source>Alt+A</source>
         <translation>Alt+A</translation>
@@ -891,6 +1017,10 @@
         <source>Alt+P</source>
         <translation>Alt+P</translation>
     </message>
+    <message>
+        <source>Remove this entry</source>
+        <translation>ازل هذه المداخله</translation>
+    </message>
     <message>
         <source>Message:</source>
         <translation>الرسائل</translation>
@@ -913,6 +1043,10 @@
         <source>&amp;Sign Message</source>
         <translation>&amp;توقيع الرسالة</translation>
     </message>
+    <message>
+        <source>Choose previously used address</source>
+        <translation>اختر عنوانا مستخدم سابقا</translation>
+    </message>
     <message>
         <source>Alt+A</source>
         <translation>Alt+A</translation>
diff --git a/src/qt/locale/bitcoin_bg.ts b/src/qt/locale/bitcoin_bg.ts
index bd85d8c8b0e1f..acb60cf41c5aa 100644
--- a/src/qt/locale/bitcoin_bg.ts
+++ b/src/qt/locale/bitcoin_bg.ts
@@ -881,10 +881,6 @@
 </context>
 <context>
     <name>RPCConsole</name>
-    <message>
-        <source>Client name</source>
-        <translation>Име на клиента</translation>
-    </message>
     <message>
         <source>N/A</source>
         <translation>Несъществуващ</translation>
diff --git a/src/qt/locale/bitcoin_bg_BG.ts b/src/qt/locale/bitcoin_bg_BG.ts
new file mode 100644
index 0000000000000..4bddb5ff4a8ae
--- /dev/null
+++ b/src/qt/locale/bitcoin_bg_BG.ts
@@ -0,0 +1,236 @@
+<TS language="bg_BG" version="2.1">
+<context>
+    <name>AddressBookPage</name>
+    <message>
+        <source>Right-click to edit address or label</source>
+        <translation>Клик с десен бутон на мишката за промяна на адрес или етикет</translation>
+    </message>
+    <message>
+        <source>Create a new address</source>
+        <translation>Създай нов адрес</translation>
+    </message>
+    <message>
+        <source>&amp;New</source>
+        <translation>Нов</translation>
+    </message>
+    <message>
+        <source>Copy the currently selected address to the system clipboard</source>
+        <translation>Копирай текущо избрания адрес към клипборда</translation>
+    </message>
+    <message>
+        <source>&amp;Copy</source>
+        <translation>Копирай</translation>
+    </message>
+    <message>
+        <source>C&amp;lose</source>
+        <translation>Затвори</translation>
+    </message>
+    <message>
+        <source>Delete the currently selected address from the list</source>
+        <translation>Изтрий текущо избрания адрес от листа</translation>
+    </message>
+    <message>
+        <source>Export the data in the current tab to a file</source>
+        <translation>Изнеси данните в избрания раздел към файл</translation>
+    </message>
+    <message>
+        <source>&amp;Export</source>
+        <translation>Изнеси</translation>
+    </message>
+    <message>
+        <source>&amp;Delete</source>
+        <translation>Изтрий</translation>
+    </message>
+</context>
+<context>
+    <name>AskPassphraseDialog</name>
+    <message>
+        <source>Passphrase Dialog</source>
+        <translation>Диалог за пропуск</translation>
+    </message>
+    <message>
+        <source>Enter passphrase</source>
+        <translation>Въведи парола</translation>
+    </message>
+    <message>
+        <source>New passphrase</source>
+        <translation>Нова парола</translation>
+    </message>
+    <message>
+        <source>Repeat new passphrase</source>
+        <translation>Повтори парола</translation>
+    </message>
+</context>
+<context>
+    <name>BanTableModel</name>
+    <message>
+        <source>IP/Netmask</source>
+        <translation>IP/Мрежова маска</translation>
+    </message>
+    <message>
+        <source>Banned Until</source>
+        <translation>Блокиран до</translation>
+    </message>
+</context>
+<context>
+    <name>BitcoinGUI</name>
+    <message>
+        <source>Sign &amp;message...</source>
+        <translation>Подпиши съобщение...</translation>
+    </message>
+    <message>
+        <source>Synchronizing with network...</source>
+        <translation>Синхронизиране с мрежата...</translation>
+    </message>
+    <message>
+        <source>&amp;Overview</source>
+        <translation>Преглед</translation>
+    </message>
+    <message>
+        <source>Node</source>
+        <translation>Възел</translation>
+    </message>
+    <message>
+        <source>Show general overview of wallet</source>
+        <translation>Покажи общ преглед на портфейла</translation>
+    </message>
+    <message>
+        <source>&amp;Transactions</source>
+        <translation>Транзакции</translation>
+    </message>
+    <message>
+        <source>Browse transaction history</source>
+        <translation>Разгледай история на транзакциите</translation>
+    </message>
+    <message>
+        <source>E&amp;xit</source>
+        <translation>Изход</translation>
+    </message>
+    <message>
+        <source>Quit application</source>
+        <translation>Излез от приложението</translation>
+    </message>
+    <message>
+        <source>&amp;About %1</source>
+        <translation>За %1</translation>
+    </message>
+    <message>
+        <source>Show information about %1</source>
+        <translation>Покажи информация за %1</translation>
+    </message>
+    <message>
+        <source>About &amp;Qt</source>
+        <translation>Относно Qt</translation>
+    </message>
+    <message>
+        <source>Show information about Qt</source>
+        <translation>Покажи информация отностно Qt</translation>
+    </message>
+    <message>
+        <source>&amp;Options...</source>
+        <translation>Настройки...</translation>
+    </message>
+    <message>
+        <source>Modify configuration options for %1</source>
+        <translation>Промени конфигурации за %1</translation>
+    </message>
+    <message>
+        <source>&amp;Encrypt Wallet...</source>
+        <translation>Криптирай портфейл</translation>
+    </message>
+    <message>
+        <source>&amp;Backup Wallet...</source>
+        <translation>Направи резервно копие на портфейла...</translation>
+    </message>
+    <message>
+        <source>&amp;Change Passphrase...</source>
+        <translation>Промени паролата...</translation>
+    </message>
+    <message>
+        <source>&amp;Sending addresses...</source>
+        <translation>Адреси за пращане...</translation>
+    </message>
+    <message>
+        <source>&amp;Receiving addresses...</source>
+        <translation>Адреси за получаване...</translation>
+    </message>
+    <message>
+        <source>Open &amp;URI...</source>
+        <translation>Отвори URI</translation>
+    </message>
+    <message>
+        <source>Reindexing blocks on disk...</source>
+        <translation>Повторно индексиране на блоковете на диска...</translation>
+    </message>
+    </context>
+<context>
+    <name>CoinControlDialog</name>
+    </context>
+<context>
+    <name>EditAddressDialog</name>
+    </context>
+<context>
+    <name>FreespaceChecker</name>
+    </context>
+<context>
+    <name>HelpMessageDialog</name>
+    </context>
+<context>
+    <name>Intro</name>
+    </context>
+<context>
+    <name>OpenURIDialog</name>
+    </context>
+<context>
+    <name>OptionsDialog</name>
+    </context>
+<context>
+    <name>OverviewPage</name>
+    </context>
+<context>
+    <name>PeerTableModel</name>
+    </context>
+<context>
+    <name>QObject</name>
+    </context>
+<context>
+    <name>RPCConsole</name>
+    </context>
+<context>
+    <name>ReceiveCoinsDialog</name>
+    </context>
+<context>
+    <name>ReceiveRequestDialog</name>
+    </context>
+<context>
+    <name>SendCoinsDialog</name>
+    </context>
+<context>
+    <name>SendCoinsEntry</name>
+    </context>
+<context>
+    <name>ShutdownWindow</name>
+    </context>
+<context>
+    <name>SignVerifyMessageDialog</name>
+    </context>
+<context>
+    <name>SplashScreen</name>
+    </context>
+<context>
+    <name>TrafficGraphWidget</name>
+    </context>
+<context>
+    <name>TransactionDescDialog</name>
+    </context>
+<context>
+    <name>UnitDisplayStatusBarControl</name>
+    </context>
+<context>
+    <name>bitcoin-core</name>
+    <message>
+        <source>Bitcoin Core</source>
+        <translation>Биткойн ядро</translation>
+    </message>
+    </context>
+</TS>
\ No newline at end of file
diff --git a/src/qt/locale/bitcoin_ca.ts b/src/qt/locale/bitcoin_ca.ts
index 3eb384868ed43..ed259c4d08de9 100644
--- a/src/qt/locale/bitcoin_ca.ts
+++ b/src/qt/locale/bitcoin_ca.ts
@@ -925,10 +925,6 @@
 </context>
 <context>
     <name>RPCConsole</name>
-    <message>
-        <source>Client name</source>
-        <translation>Nom del client</translation>
-    </message>
     <message>
         <source>N/A</source>
         <translation>N/A</translation>
@@ -1738,14 +1734,6 @@
         <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
         <translation>Aquesta és una versió de pre-llançament - utilitza-la sota la teva responsabilitat - No usar per a minería o aplicacions de compra-venda</translation>
     </message>
-    <message>
-        <source>WARNING: abnormally high number of blocks generated, %d blocks received in the last %d hours (%d expected)</source>
-        <translation>AVÍS: s'ha generat un nombre anòmalament alt de blocs, %d blocs rebuts en les darreres %d hores (se n'esperaven %d)</translation>
-    </message>
-    <message>
-        <source>WARNING: check your network connection, %d blocks received in the last %d hours (%d expected)</source>
-        <translation>AVÍS: comproveu la vostra connexió a la xarxa, %d blocs rebuts en les darreres %d hores (se n'esperaven %d)</translation>
-    </message>
     <message>
         <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source>
         <translation>Avís: la xarxa no sembla que hi estigui plenament d'acord. Alguns miners sembla que estan experimentant problemes.</translation>
diff --git a/src/qt/locale/bitcoin_ca@valencia.ts b/src/qt/locale/bitcoin_ca@valencia.ts
index 1fdf0249a5b73..df0f750a61352 100644
--- a/src/qt/locale/bitcoin_ca@valencia.ts
+++ b/src/qt/locale/bitcoin_ca@valencia.ts
@@ -869,10 +869,6 @@
 </context>
 <context>
     <name>RPCConsole</name>
-    <message>
-        <source>Client name</source>
-        <translation>Nom del client</translation>
-    </message>
     <message>
         <source>N/A</source>
         <translation>N/A</translation>
@@ -1570,14 +1566,6 @@
         <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
         <translation>Esta és una versió de pre-llançament - utilitza-la sota la teva responsabilitat - No usar per a minería o aplicacions de compra-venda</translation>
     </message>
-    <message>
-        <source>WARNING: abnormally high number of blocks generated, %d blocks received in the last %d hours (%d expected)</source>
-        <translation>AVÍS: s'ha generat un nombre anòmalament alt de blocs, %d blocs rebuts en les darreres %d hores (se n'esperaven %d)</translation>
-    </message>
-    <message>
-        <source>WARNING: check your network connection, %d blocks received in the last %d hours (%d expected)</source>
-        <translation>AVÍS: comproveu la vostra connexió a la xarxa, %d blocs rebuts en les darreres %d hores (se n'esperaven %d)</translation>
-    </message>
     <message>
         <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source>
         <translation>Avís: la xarxa no pareix que hi estiga plenament d'acord. Alguns miners pareix que estan experimentant problemes.</translation>
diff --git a/src/qt/locale/bitcoin_ca_ES.ts b/src/qt/locale/bitcoin_ca_ES.ts
index 30004e10e405a..f985a6928d938 100644
--- a/src/qt/locale/bitcoin_ca_ES.ts
+++ b/src/qt/locale/bitcoin_ca_ES.ts
@@ -925,10 +925,6 @@
 </context>
 <context>
     <name>RPCConsole</name>
-    <message>
-        <source>Client name</source>
-        <translation>Nom del client</translation>
-    </message>
     <message>
         <source>N/A</source>
         <translation>N/A</translation>
@@ -1734,14 +1730,6 @@
         <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
         <translation>Aquesta és una versió de pre-llançament - utilitza-la sota la teva responsabilitat - No usar per a minería o aplicacions de compra-venda</translation>
     </message>
-    <message>
-        <source>WARNING: abnormally high number of blocks generated, %d blocks received in the last %d hours (%d expected)</source>
-        <translation>AVÍS: s'ha generat un nombre anòmalament alt de blocs, %d blocs rebuts en les darreres %d hores (se n'esperaven %d)</translation>
-    </message>
-    <message>
-        <source>WARNING: check your network connection, %d blocks received in the last %d hours (%d expected)</source>
-        <translation>AVÍS: comproveu la vostra connexió a la xarxa, %d blocs rebuts en les darreres %d hores (se n'esperaven %d)</translation>
-    </message>
     <message>
         <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source>
         <translation>Avís: la xarxa no sembla que hi estigui plenament d'acord. Alguns miners sembla que estan experimentant problemes.</translation>
diff --git a/src/qt/locale/bitcoin_cs.ts b/src/qt/locale/bitcoin_cs.ts
index d76839723fc0e..2dfa295ce078f 100644
--- a/src/qt/locale/bitcoin_cs.ts
+++ b/src/qt/locale/bitcoin_cs.ts
@@ -917,10 +917,6 @@
 </context>
 <context>
     <name>RPCConsole</name>
-    <message>
-        <source>Client name</source>
-        <translation>Název klienta</translation>
-    </message>
     <message>
         <source>N/A</source>
         <translation>N/A</translation>
@@ -1714,14 +1710,6 @@
         <source>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</source>
         <translation>Použít UPnP k namapování naslouchacího portu (výchozí: 1, pokud naslouchá a nepoužívá -proxy)</translation>
     </message>
-    <message>
-        <source>WARNING: abnormally high number of blocks generated, %d blocks received in the last %d hours (%d expected)</source>
-        <translation>UPOZORNĚNÍ: vygenerováno nezvykle mnoho bloků – přijato %d bloků jen za posledních %d hodin (očekáváno %d)</translation>
-    </message>
-    <message>
-        <source>WARNING: check your network connection, %d blocks received in the last %d hours (%d expected)</source>
-        <translation>UPOZORNĚNÍ: zkontroluj své spojení do sítě – bylo přijato %d bloků za posledních %d hodin (očekáváno %d)</translation>
-    </message>
     <message>
         <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source>
         <translation>Upozornění: Síť podle všeho není v konzistentním stavu. Někteří těžaři jsou zřejmě v potížích.</translation>
diff --git a/src/qt/locale/bitcoin_da.ts b/src/qt/locale/bitcoin_da.ts
index fd1a4a08638aa..d298c81bd453d 100644
--- a/src/qt/locale/bitcoin_da.ts
+++ b/src/qt/locale/bitcoin_da.ts
@@ -993,10 +993,6 @@
 </context>
 <context>
     <name>RPCConsole</name>
-    <message>
-        <source>Client name</source>
-        <translation>Klientnavn</translation>
-    </message>
     <message>
         <source>N/A</source>
         <translation>N/A</translation>
@@ -1886,14 +1882,6 @@
         <source>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</source>
         <translation>Brug UPnP for at konfigurere den lyttende port (standard: 1 under lytning og ingen -proxy)</translation>
     </message>
-    <message>
-        <source>WARNING: abnormally high number of blocks generated, %d blocks received in the last %d hours (%d expected)</source>
-        <translation>ADVARSEL: unormalt mange blokke er genereret; %d blokke er modtaget i løbet af de seneste %d timer (%d forventet)</translation>
-    </message>
-    <message>
-        <source>WARNING: check your network connection, %d blocks received in the last %d hours (%d expected)</source>
-        <translation>ADVARSEL: tjek din netværksforbindelse; %d blokke er modtaget i løbet af de seneste %d timer (%d forventet)</translation>
-    </message>
     <message>
         <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source>
         <translation>Advarsel: Netværket ser ikke ud til at være fuldt ud enige! Enkelte minere ser ud til at opleve problemer.</translation>
diff --git a/src/qt/locale/bitcoin_de.ts b/src/qt/locale/bitcoin_de.ts
index 77482c774bb80..f38f4c10f7148 100644
--- a/src/qt/locale/bitcoin_de.ts
+++ b/src/qt/locale/bitcoin_de.ts
@@ -781,6 +781,14 @@
         <source>&amp;Window</source>
         <translation>&amp;Programmfenster</translation>
     </message>
+    <message>
+        <source>&amp;Hide the icon from the system tray.</source>
+        <translation>&amp;Das Icon im System Tray verstecken.</translation>
+    </message>
+    <message>
+        <source>Hide tray icon</source>
+        <translation>Tray Icon verstecken</translation>
+    </message>
     <message>
         <source>Show only a tray icon after minimizing the window.</source>
         <translation>Nur ein Symbol im Infobereich anzeigen, nachdem das Programmfenster minimiert wurde.</translation>
@@ -981,10 +989,6 @@
 </context>
 <context>
     <name>RPCConsole</name>
-    <message>
-        <source>Client name</source>
-        <translation>Clientname</translation>
-    </message>
     <message>
         <source>N/A</source>
         <translation>k.A.</translation>
@@ -1011,7 +1015,7 @@
     </message>
     <message>
         <source>Datadir</source>
-        <translation>Datenverz</translation>
+        <translation>Datenverzeichnis</translation>
     </message>
     <message>
         <source>Startup time</source>
@@ -1097,6 +1101,10 @@
         <source>User Agent</source>
         <translation>User-Agent</translation>
     </message>
+    <message>
+        <source>Open the %1 debug log file from the current data directory. This can take a few seconds for large log files.</source>
+        <translation>Öffnet die %1-Debugprotokolldatei aus dem aktuellen Datenverzeichnis. Dies kann bei großen Protokolldateien einige Sekunden dauern.</translation>
+    </message>
     <message>
         <source>Decrease font size</source>
         <translation>Schrift verkleinern</translation>
@@ -1790,6 +1798,10 @@
         <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source>
         <translation>An die angegebene Adresse binden und immer abhören. Für IPv6 "[Host]:Port"-Notation verwenden</translation>
     </message>
+    <message>
+        <source>Cannot obtain a lock on data directory %s. %s is probably already running.</source>
+        <translation>Datenverzeichnis %s kann nicht gesperrt werden. Evtl. wurde %s bereits gestartet.</translation>
+    </message>
     <message>
         <source>Delete all wallet transactions and only recover those parts of the blockchain through -rescan on startup</source>
         <translation>Alle Wallet-Transaktionen löschen und nur diese Teilbereiche der Blockkette durch -rescan beim Starten wiederherstellen</translation>
@@ -1806,6 +1818,14 @@
         <source>Force relay of transactions from whitelisted peers even they violate local relay policy (default: %d)</source>
         <translation>Leite Transaktionen von Peers auf der Positivliste auf jeden Fall weiter, auch wenn sie die lokale Weiterleitungsregeln verletzen (Standardeinstellung: %d)</translation>
     </message>
+    <message>
+        <source>Please check that your computer's date and time are correct! If your clock is wrong, %s will not work properly.</source>
+        <translation>Bitte korrigieren Sie die Datums- und Uhrzeiteinstellungen Ihres Computers, da %s ansonsten nicht ordnungsgemäß funktionieren wird.</translation>
+    </message>
+    <message>
+        <source>Please contribute if you find %s useful. Visit %s for further information about the software.</source>
+        <translation>Wenn sie %s nützlich finden, sind Helfer sehr gern gesehen. Besuchen Sie %s um mehr über das Softwareprojekt zu erfahren.</translation>
+    </message>
     <message>
         <source>Set the number of script verification threads (%u to %d, 0 = auto, &lt;0 = leave that many cores free, default: %d)</source>
         <translation>Maximale Anzahl an Skript-Verifizierungs-Threads festlegen (%u bis %d, 0 = automatisch, &lt;0 = so viele Kerne frei lassen, Standard: %d)</translation>
@@ -1822,14 +1842,6 @@
         <source>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</source>
         <translation>UPnP verwenden, um eine Portweiterleitung einzurichten (Standard: 1, wenn abgehört wird und -proxy nicht gesetzt ist)</translation>
     </message>
-    <message>
-        <source>WARNING: abnormally high number of blocks generated, %d blocks received in the last %d hours (%d expected)</source>
-        <translation>Warnung: Es wurde eine ungewöhnlich hohe Anzahl Blöcke erzeugt, %d Blöcke wurden in den letzten %d Stunden empfangen (%d wurden erwartet).</translation>
-    </message>
-    <message>
-        <source>WARNING: check your network connection, %d blocks received in the last %d hours (%d expected)</source>
-        <translation>Warnung: Überprüpfen Sie ihre Netzwerkverbindung, %d Blöcke wurden in den letzten %d Stunden empfangen (%d wurden erwartet).</translation>
-    </message>
     <message>
         <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source>
         <translation>Warnung: Das Netzwerk scheint nicht vollständig übereinzustimmen! Einige Miner scheinen Probleme zu haben.</translation>
@@ -1842,6 +1854,14 @@
         <source>Whitelist peers connecting from the given netmask or IP address. Can be specified multiple times.</source>
         <translation>Gegenstellen die sich von der angegebenen Netzmaske oder IP-Adresse aus verbinden immer zulassen. Kann mehrmals angegeben werden.</translation>
     </message>
+    <message>
+        <source>You need to rebuild the database using -reindex-chainstate to change -txindex</source>
+        <translation>Sie müssen die Datenbank mit Hilfe von -reindex-chainstate neu aufbauen, um -txindex zu verändern</translation>
+    </message>
+    <message>
+        <source>%s corrupt, salvage failed</source>
+        <translation>%s beschädigt, Datenrettung fehlgeschlagen</translation>
+    </message>
     <message>
         <source>-maxmempool must be at least %d MB</source>
         <translation>-maxmempool muss mindestens %d MB betragen</translation>
@@ -1854,6 +1874,10 @@
         <source>Append comment to the user agent string</source>
         <translation>Hänge ein Kommentar zur User Agent-Zeichenkette an</translation>
     </message>
+    <message>
+        <source>Attempt to recover private keys from a corrupt wallet on startup</source>
+        <translation>Es wird versucht, private Schlüssel beim Starten aus einem beschädigtem Wallet wiederherzustellen</translation>
+    </message>
     <message>
         <source>Block creation options:</source>
         <translation>Blockerzeugungsoptionen:</translation>
@@ -1918,6 +1942,14 @@
         <source>Error loading %s</source>
         <translation>Fehler beim Laden von %s</translation>
     </message>
+    <message>
+        <source>Error loading %s: Wallet corrupted</source>
+        <translation>Fehler beim Laden von %s: Das Wallet ist beschädigt</translation>
+    </message>
+    <message>
+        <source>Error loading %s: Wallet requires newer version of %s</source>
+        <translation>Fehler beim Laden von %s: Das Wallet benötigt eine neuere Version von %s</translation>
+    </message>
     <message>
         <source>Error loading block database</source>
         <translation>Fehler beim Laden der Blockdatenbank</translation>
diff --git a/src/qt/locale/bitcoin_el_GR.ts b/src/qt/locale/bitcoin_el_GR.ts
index 59779692d9028..2814e4f6e7a0e 100644
--- a/src/qt/locale/bitcoin_el_GR.ts
+++ b/src/qt/locale/bitcoin_el_GR.ts
@@ -834,10 +834,6 @@
 </context>
 <context>
     <name>RPCConsole</name>
-    <message>
-        <source>Client name</source>
-        <translation>Όνομα Πελάτη</translation>
-    </message>
     <message>
         <source>N/A</source>
         <translation>Μη διαθέσιμο</translation>
diff --git a/src/qt/locale/bitcoin_en_GB.ts b/src/qt/locale/bitcoin_en_GB.ts
index 226444e9c56c6..1893aaca09b22 100644
--- a/src/qt/locale/bitcoin_en_GB.ts
+++ b/src/qt/locale/bitcoin_en_GB.ts
@@ -993,10 +993,6 @@
 </context>
 <context>
     <name>RPCConsole</name>
-    <message>
-        <source>Client name</source>
-        <translation>Client name</translation>
-    </message>
     <message>
         <source>N/A</source>
         <translation>N/A</translation>
@@ -1886,14 +1882,6 @@
         <source>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</source>
         <translation>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</translation>
     </message>
-    <message>
-        <source>WARNING: abnormally high number of blocks generated, %d blocks received in the last %d hours (%d expected)</source>
-        <translation>WARNING: abnormally high number of blocks generated, %d blocks received in the last %d hours (%d expected)</translation>
-    </message>
-    <message>
-        <source>WARNING: check your network connection, %d blocks received in the last %d hours (%d expected)</source>
-        <translation>WARNING: check your network connection, %d blocks received in the last %d hours (%d expected)</translation>
-    </message>
     <message>
         <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source>
         <translation>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</translation>
diff --git a/src/qt/locale/bitcoin_eo.ts b/src/qt/locale/bitcoin_eo.ts
index 043b28abc6ac6..4471aeb72e6e7 100644
--- a/src/qt/locale/bitcoin_eo.ts
+++ b/src/qt/locale/bitcoin_eo.ts
@@ -741,10 +741,6 @@
     </context>
 <context>
     <name>RPCConsole</name>
-    <message>
-        <source>Client name</source>
-        <translation>Nomo de kliento</translation>
-    </message>
     <message>
         <source>N/A</source>
         <translation>neaplikebla</translation>
diff --git a/src/qt/locale/bitcoin_es.ts b/src/qt/locale/bitcoin_es.ts
index 80cbe399321d2..c67016637b516 100644
--- a/src/qt/locale/bitcoin_es.ts
+++ b/src/qt/locale/bitcoin_es.ts
@@ -989,10 +989,6 @@
 </context>
 <context>
     <name>RPCConsole</name>
-    <message>
-        <source>Client name</source>
-        <translation>Nombre del cliente</translation>
-    </message>
     <message>
         <source>N/A</source>
         <translation>N/D</translation>
@@ -1885,14 +1881,6 @@
         <source>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</source>
         <translation>Utiliza UPnP para asignar el puerto de escucha (predeterminado: 1 cuando esta escuchando sin -proxy)</translation>
     </message>
-    <message>
-        <source>WARNING: abnormally high number of blocks generated, %d blocks received in the last %d hours (%d expected)</source>
-        <translation>ADVERTENCIA: anormalmente alto número de bloques generado, %d bloques recibidos en las últimas horas %d (%d espera)</translation>
-    </message>
-    <message>
-        <source>WARNING: check your network connection, %d blocks received in the last %d hours (%d expected)</source>
-        <translation>ADVERTENCIA: comprueba tu conexión de red, %d bloques recibidos en las últimas %d horas (%d esperados)</translation>
-    </message>
     <message>
         <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source>
         <translation>Atención: ¡Parece que la red no está totalmente de acuerdo! Algunos mineros están presentando inconvenientes.</translation>
diff --git a/src/qt/locale/bitcoin_es_CL.ts b/src/qt/locale/bitcoin_es_CL.ts
index ff0fce61192f7..188641d6e7ace 100644
--- a/src/qt/locale/bitcoin_es_CL.ts
+++ b/src/qt/locale/bitcoin_es_CL.ts
@@ -457,10 +457,6 @@
     </context>
 <context>
     <name>RPCConsole</name>
-    <message>
-        <source>Client name</source>
-        <translation>Nombre del cliente</translation>
-    </message>
     <message>
         <source>N/A</source>
         <translation>N/A</translation>
diff --git a/src/qt/locale/bitcoin_es_DO.ts b/src/qt/locale/bitcoin_es_DO.ts
index 3f4380840a068..ba963d2b8042f 100644
--- a/src/qt/locale/bitcoin_es_DO.ts
+++ b/src/qt/locale/bitcoin_es_DO.ts
@@ -639,10 +639,6 @@
     </context>
 <context>
     <name>RPCConsole</name>
-    <message>
-        <source>Client name</source>
-        <translation>Nombre del cliente</translation>
-    </message>
     <message>
         <source>N/A</source>
         <translation>N/D</translation>
diff --git a/src/qt/locale/bitcoin_et.ts b/src/qt/locale/bitcoin_et.ts
index e861d4e472312..0d659fd71951b 100644
--- a/src/qt/locale/bitcoin_et.ts
+++ b/src/qt/locale/bitcoin_et.ts
@@ -541,10 +541,6 @@
     </context>
 <context>
     <name>RPCConsole</name>
-    <message>
-        <source>Client name</source>
-        <translation>Kliendi nimi</translation>
-    </message>
     <message>
         <source>N/A</source>
         <translation>N/A</translation>
diff --git a/src/qt/locale/bitcoin_fa.ts b/src/qt/locale/bitcoin_fa.ts
index 5bebb35822c23..8bf727a0cd645 100644
--- a/src/qt/locale/bitcoin_fa.ts
+++ b/src/qt/locale/bitcoin_fa.ts
@@ -729,10 +729,6 @@
 </context>
 <context>
     <name>RPCConsole</name>
-    <message>
-        <source>Client name</source>
-        <translation>نام کلاینت</translation>
-    </message>
     <message>
         <source>N/A</source>
         <translation>ناموجود</translation>
diff --git a/src/qt/locale/bitcoin_fa_IR.ts b/src/qt/locale/bitcoin_fa_IR.ts
index b329612ded011..8faa3ce659266 100644
--- a/src/qt/locale/bitcoin_fa_IR.ts
+++ b/src/qt/locale/bitcoin_fa_IR.ts
@@ -299,10 +299,6 @@
     </context>
 <context>
     <name>RPCConsole</name>
-    <message>
-        <source>Client name</source>
-        <translation>نام کنسول RPC</translation>
-    </message>
     <message>
         <source>Client version</source>
         <translation>ویرایش کنسول RPC</translation>
diff --git a/src/qt/locale/bitcoin_fi.ts b/src/qt/locale/bitcoin_fi.ts
index c2226e9b985f2..b7b3115e251eb 100644
--- a/src/qt/locale/bitcoin_fi.ts
+++ b/src/qt/locale/bitcoin_fi.ts
@@ -929,10 +929,6 @@
 </context>
 <context>
     <name>RPCConsole</name>
-    <message>
-        <source>Client name</source>
-        <translation>Pääteohjelman nimi</translation>
-    </message>
     <message>
         <source>N/A</source>
         <translation>Ei saatavilla</translation>
@@ -1718,14 +1714,6 @@
         <source>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</source>
         <translation>Käytä UPnP:ta kuuntelevan portin kartoitukseen (oletus: 1 kun kuunnellaan ja -proxy ei käytössä)</translation>
     </message>
-    <message>
-        <source>WARNING: abnormally high number of blocks generated, %d blocks received in the last %d hours (%d expected)</source>
-        <translation>VAROITUS: epätavallisen monta lohkoa generoitu, vastaanotettu %d lohkoa viimeisen %d tunnin aikana (odotettavissa %d)</translation>
-    </message>
-    <message>
-        <source>WARNING: check your network connection, %d blocks received in the last %d hours (%d expected)</source>
-        <translation>VAROITUS: tarkista verkkoyhteytesi, vastaanotettu %d lohkoa viimeisen %d tunnin aikana (odotettavissa %d)</translation>
-    </message>
     <message>
         <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source>
         <translation>Varoitus: Tietoverkko ei ole sovussa! Luohijat näyttävät kokevan virhetilanteita.</translation>
diff --git a/src/qt/locale/bitcoin_fr.ts b/src/qt/locale/bitcoin_fr.ts
index 5c4f7f2b04ae2..0b538d76642ed 100644
--- a/src/qt/locale/bitcoin_fr.ts
+++ b/src/qt/locale/bitcoin_fr.ts
@@ -993,10 +993,6 @@
 </context>
 <context>
     <name>RPCConsole</name>
-    <message>
-        <source>Client name</source>
-        <translation>Nom du client</translation>
-    </message>
     <message>
         <source>N/A</source>
         <translation>N.D.</translation>
@@ -1866,14 +1862,6 @@
         <source>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</source>
         <translation>Utiliser l'UPnP pour mapper le port d'écoute (par défaut : 1 lors de l'écoute et pas de mandataire -proxy)</translation>
     </message>
-    <message>
-        <source>WARNING: abnormally high number of blocks generated, %d blocks received in the last %d hours (%d expected)</source>
-        <translation>AVERTISSEMENT : un nombre anormalement élevé de blocs a été généré, %d blocs reçus durant les %d dernières heures (%d attendus)</translation>
-    </message>
-    <message>
-        <source>WARNING: check your network connection, %d blocks received in the last %d hours (%d expected)</source>
-        <translation>AVERTISSEMENT : vérifiez votre connexion réseau, %d blocs reçus durant les %d dernières heures (%d attendus)</translation>
-    </message>
     <message>
         <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source>
         <translation>Avertissement : le réseau ne semble pas totalement d'accord ! Quelques mineurs semblent éprouver des difficultés.</translation>
diff --git a/src/qt/locale/bitcoin_fr_FR.ts b/src/qt/locale/bitcoin_fr_FR.ts
index 08824e113a552..a6f6ac4fd100a 100644
--- a/src/qt/locale/bitcoin_fr_FR.ts
+++ b/src/qt/locale/bitcoin_fr_FR.ts
@@ -809,10 +809,6 @@
 </context>
 <context>
     <name>RPCConsole</name>
-    <message>
-        <source>Client name</source>
-        <translation>Nom du client</translation>
-    </message>
     <message>
         <source>N/A</source>
         <translation>N/A </translation>
diff --git a/src/qt/locale/bitcoin_gl.ts b/src/qt/locale/bitcoin_gl.ts
index f3673b6dc74f8..9aa7b5509646e 100644
--- a/src/qt/locale/bitcoin_gl.ts
+++ b/src/qt/locale/bitcoin_gl.ts
@@ -595,10 +595,6 @@
     </context>
 <context>
     <name>RPCConsole</name>
-    <message>
-        <source>Client name</source>
-        <translation>Nome do cliente</translation>
-    </message>
     <message>
         <source>N/A</source>
         <translation>N/A</translation>
diff --git a/src/qt/locale/bitcoin_he.ts b/src/qt/locale/bitcoin_he.ts
index fbe16364eb82a..4a293c1c3f227 100644
--- a/src/qt/locale/bitcoin_he.ts
+++ b/src/qt/locale/bitcoin_he.ts
@@ -827,10 +827,6 @@
 </context>
 <context>
     <name>RPCConsole</name>
-    <message>
-        <source>Client name</source>
-        <translation>שם לקוח</translation>
-    </message>
     <message>
         <source>N/A</source>
         <translation>לא זמין</translation>
diff --git a/src/qt/locale/bitcoin_hr.ts b/src/qt/locale/bitcoin_hr.ts
index 0d8d3d5c99e78..f5accfb0b8fe8 100644
--- a/src/qt/locale/bitcoin_hr.ts
+++ b/src/qt/locale/bitcoin_hr.ts
@@ -657,10 +657,6 @@
     </context>
 <context>
     <name>RPCConsole</name>
-    <message>
-        <source>Client name</source>
-        <translation>Ime klijenta</translation>
-    </message>
     <message>
         <source>N/A</source>
         <translation>N/A</translation>
diff --git a/src/qt/locale/bitcoin_hu.ts b/src/qt/locale/bitcoin_hu.ts
index bddc430f22312..9eb0cf76c4319 100644
--- a/src/qt/locale/bitcoin_hu.ts
+++ b/src/qt/locale/bitcoin_hu.ts
@@ -805,10 +805,6 @@
 </context>
 <context>
     <name>RPCConsole</name>
-    <message>
-        <source>Client name</source>
-        <translation>Kliens néve</translation>
-    </message>
     <message>
         <source>N/A</source>
         <translation>Nem elérhető</translation>
diff --git a/src/qt/locale/bitcoin_id_ID.ts b/src/qt/locale/bitcoin_id_ID.ts
index fe07ab7a29045..feb6f690c4595 100644
--- a/src/qt/locale/bitcoin_id_ID.ts
+++ b/src/qt/locale/bitcoin_id_ID.ts
@@ -853,10 +853,6 @@
     </context>
 <context>
     <name>RPCConsole</name>
-    <message>
-        <source>Client name</source>
-        <translation>Nama Klien</translation>
-    </message>
     <message>
         <source>N/A</source>
         <translation>T/S</translation>
diff --git a/src/qt/locale/bitcoin_it.ts b/src/qt/locale/bitcoin_it.ts
index b92dbb2cb3b34..55bc9c3c82470 100644
--- a/src/qt/locale/bitcoin_it.ts
+++ b/src/qt/locale/bitcoin_it.ts
@@ -930,10 +930,6 @@ Per specificare più URL separarli con una barra verticale "|".</translation>
 </context>
 <context>
     <name>RPCConsole</name>
-    <message>
-        <source>Client name</source>
-        <translation>Nome del client</translation>
-    </message>
     <message>
         <source>N/A</source>
         <translation>N/D</translation>
@@ -1747,14 +1743,6 @@ Per specificare più URL separarli con una barra verticale "|".</translation>
         <source>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</source>
         <translation>Utilizza UPnP per mappare la porta in ascolto (default: 1 quando in ascolto e -proxy non è specificato)</translation>
     </message>
-    <message>
-        <source>WARNING: abnormally high number of blocks generated, %d blocks received in the last %d hours (%d expected)</source>
-        <translation>ATTENZIONE, il numero di blocchi generati è insolitamente elevato: %d blocchi ricevuti nelle ultime %d ore (%d previsti)</translation>
-    </message>
-    <message>
-        <source>WARNING: check your network connection, %d blocks received in the last %d hours (%d expected)</source>
-        <translation>ATTENZIONE, si consiglia di verificare la connessione di rete: %d blocchi ricevuti nelle ultime %d ore (%d previsti)</translation>
-    </message>
     <message>
         <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source>
         <translation>Attenzione: La rete non sembra trovarsi in pieno consenso! Alcuni minatori sembrano riscontrare problemi.</translation>
diff --git a/src/qt/locale/bitcoin_ja.ts b/src/qt/locale/bitcoin_ja.ts
index 460a652e3750a..4948cc30675e9 100644
--- a/src/qt/locale/bitcoin_ja.ts
+++ b/src/qt/locale/bitcoin_ja.ts
@@ -993,10 +993,6 @@
 </context>
 <context>
     <name>RPCConsole</name>
-    <message>
-        <source>Client name</source>
-        <translation>クライアント名</translation>
-    </message>
     <message>
         <source>N/A</source>
         <translation>N/A</translation>
@@ -1886,14 +1882,6 @@
         <source>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</source>
         <translation>リスン ポートの割当に UPnP を使用 (初期値: リスン中および-proxyが指定されていない場合は1)</translation>
     </message>
-    <message>
-        <source>WARNING: abnormally high number of blocks generated, %d blocks received in the last %d hours (%d expected)</source>
-        <translation>警告：異常に多くの数のブロックが生成されています。%d ブロックが最近 %d 時間以内に受け取られました。(期待値: %d)</translation>
-    </message>
-    <message>
-        <source>WARNING: check your network connection, %d blocks received in the last %d hours (%d expected)</source>
-        <translation>警告：ネットワーク接続を確認してください。%d ブロックが最近 %d 時間以内にに受け取られました。(期待値: %d)</translation>
-    </message>
     <message>
         <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source>
         <translation>警告： ネットワークは完全に同意しないみたいです。マイナーは何かの問題を経験してるみたいなんです。</translation>
diff --git a/src/qt/locale/bitcoin_ka.ts b/src/qt/locale/bitcoin_ka.ts
index 22e7651f6344d..80508be8eeb82 100644
--- a/src/qt/locale/bitcoin_ka.ts
+++ b/src/qt/locale/bitcoin_ka.ts
@@ -663,10 +663,6 @@
     </context>
 <context>
     <name>RPCConsole</name>
-    <message>
-        <source>Client name</source>
-        <translation>კლიენტი</translation>
-    </message>
     <message>
         <source>N/A</source>
         <translation>მიუწვდ.</translation>
diff --git a/src/qt/locale/bitcoin_ko_KR.ts b/src/qt/locale/bitcoin_ko_KR.ts
index 11e5d35af2465..012632c0e0a9f 100644
--- a/src/qt/locale/bitcoin_ko_KR.ts
+++ b/src/qt/locale/bitcoin_ko_KR.ts
@@ -925,10 +925,6 @@
 </context>
 <context>
     <name>RPCConsole</name>
-    <message>
-        <source>Client name</source>
-        <translation>클라이언트 이름</translation>
-    </message>
     <message>
         <source>N/A</source>
         <translation>없음</translation>
@@ -1758,14 +1754,6 @@
         <source>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</source>
         <translation>리슨(Listen) 포트를 할당하기 위해 UPnP 사용 (기본값: 열려있거나 -proxy 옵션을 사용하지 않을 시 1)</translation>
     </message>
-    <message>
-        <source>WARNING: abnormally high number of blocks generated, %d blocks received in the last %d hours (%d expected)</source>
-        <translation>경고: 비정상적으로 많은 블록이 생성되고 있습니다. %d 블록은 마지막 %d에 수신되었습니다 (%d 예측됨)</translation>
-    </message>
-    <message>
-        <source>WARNING: check your network connection, %d blocks received in the last %d hours (%d expected)</source>
-        <translation>경고: 네트워크 연결을 확인해 주세요. %d 블록은 마지막 %d에 수신되었습니다 (%d 예측됨)</translation>
-    </message>
     <message>
         <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source>
         <translation>경고 : 모든 네트워크가 동의해야 하나, 일부 채굴자들에게 문제가 있는 것으로 보입니다. </translation>
diff --git a/src/qt/locale/bitcoin_la.ts b/src/qt/locale/bitcoin_la.ts
index ebaddba7e930e..dc532fe011933 100644
--- a/src/qt/locale/bitcoin_la.ts
+++ b/src/qt/locale/bitcoin_la.ts
@@ -443,10 +443,6 @@
     </context>
 <context>
     <name>RPCConsole</name>
-    <message>
-        <source>Client name</source>
-        <translation>Nomen clientis</translation>
-    </message>
     <message>
         <source>N/A</source>
         <translation>N/A</translation>
diff --git a/src/qt/locale/bitcoin_lt.ts b/src/qt/locale/bitcoin_lt.ts
index 9e98baa77af73..1f6cda1f52b66 100644
--- a/src/qt/locale/bitcoin_lt.ts
+++ b/src/qt/locale/bitcoin_lt.ts
@@ -563,10 +563,6 @@
     </context>
 <context>
     <name>RPCConsole</name>
-    <message>
-        <source>Client name</source>
-        <translation>Kliento pavadinimas</translation>
-    </message>
     <message>
         <source>N/A</source>
         <translation>nėra</translation>
diff --git a/src/qt/locale/bitcoin_lv_LV.ts b/src/qt/locale/bitcoin_lv_LV.ts
index bac58756952ab..38333531e4816 100644
--- a/src/qt/locale/bitcoin_lv_LV.ts
+++ b/src/qt/locale/bitcoin_lv_LV.ts
@@ -651,10 +651,6 @@
     </context>
 <context>
     <name>RPCConsole</name>
-    <message>
-        <source>Client name</source>
-        <translation>Klienta vārds</translation>
-    </message>
     <message>
         <source>N/A</source>
         <translation>N/A</translation>
diff --git a/src/qt/locale/bitcoin_mn.ts b/src/qt/locale/bitcoin_mn.ts
index e38320ac5d271..d9ef0d127b8c9 100644
--- a/src/qt/locale/bitcoin_mn.ts
+++ b/src/qt/locale/bitcoin_mn.ts
@@ -291,10 +291,6 @@
     </context>
 <context>
     <name>RPCConsole</name>
-    <message>
-        <source>Client name</source>
-        <translation>Клиентийн нэр</translation>
-    </message>
     <message>
         <source>N/A</source>
         <translation>Алга Байна</translation>
diff --git a/src/qt/locale/bitcoin_nb.ts b/src/qt/locale/bitcoin_nb.ts
index b5ffdb2e10253..4538fd6e1e8c1 100644
--- a/src/qt/locale/bitcoin_nb.ts
+++ b/src/qt/locale/bitcoin_nb.ts
@@ -929,10 +929,6 @@
 </context>
 <context>
     <name>RPCConsole</name>
-    <message>
-        <source>Client name</source>
-        <translation>Klientnavn</translation>
-    </message>
     <message>
         <source>N/A</source>
         <translation>-</translation>
@@ -1746,14 +1742,6 @@
         <source>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</source>
         <translation>Bruk UPnP for lytteport (standardverdi: 1 ved lytting og uten -proxy)</translation>
     </message>
-    <message>
-        <source>WARNING: abnormally high number of blocks generated, %d blocks received in the last %d hours (%d expected)</source>
-        <translation>ADVARSEL: unormalt høyt antall blokker generert, %d blokker mottatt de siste %d timene (%d forventet)</translation>
-    </message>
-    <message>
-        <source>WARNING: check your network connection, %d blocks received in the last %d hours (%d expected)</source>
-        <translation>ADVARSEL: kontroller nettverkstilkoblingen, mottok %d blokker i de siste %d timene (%d forventet)</translation>
-    </message>
     <message>
         <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source>
         <translation>Advarsel: Nettverket ser ikke ut til å være enig! Noen minere ser ut til å ha problemer.</translation>
diff --git a/src/qt/locale/bitcoin_nl.ts b/src/qt/locale/bitcoin_nl.ts
index 2b0cded386d2c..781c5a8fd6672 100644
--- a/src/qt/locale/bitcoin_nl.ts
+++ b/src/qt/locale/bitcoin_nl.ts
@@ -993,10 +993,6 @@
 </context>
 <context>
     <name>RPCConsole</name>
-    <message>
-        <source>Client name</source>
-        <translation>Clientnaam</translation>
-    </message>
     <message>
         <source>N/A</source>
         <translation>N.v.t.</translation>
@@ -1870,14 +1866,6 @@
         <source>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</source>
         <translation>Gebruik UPnP om de luisterende poort te mappen (standaard: 1 als er geluisterd worden en geen -proxy is meegegeven)</translation>
     </message>
-    <message>
-        <source>WARNING: abnormally high number of blocks generated, %d blocks received in the last %d hours (%d expected)</source>
-        <translation>WAARSCHUWING: abnormaal hoog aantal blokken is gegenereerd, %d blokken ontvangen in de laatste %d uren (%d verwacht)</translation>
-    </message>
-    <message>
-        <source>WARNING: check your network connection, %d blocks received in the last %d hours (%d expected)</source>
-        <translation>WAARSCHUWING: controleer uw netwerkverbinding, %d blokken ontvangen in de laatste %d uren (%d verwacht)</translation>
-    </message>
     <message>
         <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source>
         <translation>Waarschuwing: Het lijkt erop dat het netwerk geen consensus kan vinden! Sommige delvers lijken problemen te ondervinden.</translation>
diff --git a/src/qt/locale/bitcoin_pam.ts b/src/qt/locale/bitcoin_pam.ts
index 12151a576c984..53515433384c3 100644
--- a/src/qt/locale/bitcoin_pam.ts
+++ b/src/qt/locale/bitcoin_pam.ts
@@ -427,10 +427,6 @@
     </context>
 <context>
     <name>RPCConsole</name>
-    <message>
-        <source>Client name</source>
-        <translation>Lagyu ning kliente</translation>
-    </message>
     <message>
         <source>N/A</source>
         <translation>N/A</translation>
diff --git a/src/qt/locale/bitcoin_pl.ts b/src/qt/locale/bitcoin_pl.ts
index 6d41cbeef227e..a88e505b398b4 100644
--- a/src/qt/locale/bitcoin_pl.ts
+++ b/src/qt/locale/bitcoin_pl.ts
@@ -993,10 +993,6 @@
 </context>
 <context>
     <name>RPCConsole</name>
-    <message>
-        <source>Client name</source>
-        <translation>Nazwa klienta</translation>
-    </message>
     <message>
         <source>N/A</source>
         <translation>NIEDOSTĘPNE</translation>
@@ -1839,14 +1835,6 @@ Zwróć uwagę, że poprawnie zweryfikowana wiadomość potwierdza to, że nadaw
         <source>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</source>
         <translation>Użyj UPnP do mapowania portu nasłuchu (domyślnie: 1 gdy nasłuchuje i brak -proxy)</translation>
     </message>
-    <message>
-        <source>WARNING: abnormally high number of blocks generated, %d blocks received in the last %d hours (%d expected)</source>
-        <translation>UWAGA: nienaturalnie duża liczba wygenerowanych bloków, %d bloków otrzymano w ostatnich %d godzinach (%d oczekiwanych)</translation>
-    </message>
-    <message>
-        <source>WARNING: check your network connection, %d blocks received in the last %d hours (%d expected)</source>
-        <translation>UWAGA: sprawdź swoje połączenie sieciowe, %d bloków otrzymano w ostatnich %d godzinach (%d oczekiwanych)</translation>
-    </message>
     <message>
         <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source>
         <translation>Ostrzeżenie: Sieć nie wydaje się w pełni zgodna! Niektórzy górnicy wydają się doświadczać problemów.</translation>
diff --git a/src/qt/locale/bitcoin_pt_BR.ts b/src/qt/locale/bitcoin_pt_BR.ts
index fe9dd66269ff5..29414303920ed 100644
--- a/src/qt/locale/bitcoin_pt_BR.ts
+++ b/src/qt/locale/bitcoin_pt_BR.ts
@@ -114,6 +114,10 @@
         <source>&amp;About %1</source>
         <translation>&amp;About %1</translation>
     </message>
+    <message>
+        <source>Show information about %1</source>
+        <translation>Mostrar informações sobre %1</translation>
+    </message>
     <message>
         <source>About &amp;Qt</source>
         <translation>Sobre &amp;Qt</translation>
@@ -571,6 +575,14 @@
         <source>Welcome to %1.</source>
         <translation>Bem vindo ao %1</translation>
     </message>
+    <message>
+        <source>As this is the first time the program is launched, you can choose where %1 will store its data.</source>
+        <translation>Como essa é a primeira vez que o programa é executado, você pode escolher onde %1 armazenará seus dados.</translation>
+    </message>
+    <message>
+        <source>%1 will download and store a copy of the Bitcoin block chain. At least %2GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source>
+        <translation>O %1 irá baixar e armazenar uma cópia do block chain do Bitcoin. Pelo menos %2GB de dados serão armazenados neste diretório, e ele crescerá ao longo do tempo. A carteira também será armazenada neste diretório.</translation>
+    </message>
     <message>
         <source>Use the default data directory</source>
         <translation>Use o diretório de dados padrão</translation>
@@ -981,10 +993,6 @@
 </context>
 <context>
     <name>RPCConsole</name>
-    <message>
-        <source>Client name</source>
-        <translation>Nome do cliente</translation>
-    </message>
     <message>
         <source>N/A</source>
         <translation>N/A</translation>
@@ -1009,6 +1017,10 @@
         <source>Using BerkeleyDB version</source>
         <translation>Versão do BerkeleyDB</translation>
     </message>
+    <message>
+        <source>Datadir</source>
+        <translation>Datadir</translation>
+    </message>
     <message>
         <source>Startup time</source>
         <translation>Horário de inicialização</translation>
@@ -1093,6 +1105,10 @@
         <source>User Agent</source>
         <translation>User Agent</translation>
     </message>
+    <message>
+        <source>Open the %1 debug log file from the current data directory. This can take a few seconds for large log files.</source>
+        <translation>Abrir o arquivo de log de depuração do %1 localizado no diretório atual de dados. Isso pode levar alguns segundos para arquivos de log grandes.</translation>
+    </message>
     <message>
         <source>Decrease font size</source>
         <translation>Diminuir o tamanho da fonte</translation>
@@ -1794,6 +1810,10 @@
         <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source>
         <translation>Vincular ao endereço fornecido e sempre escutar nele. Use a notação [host]:port para IPv6</translation>
     </message>
+    <message>
+        <source>Cannot obtain a lock on data directory %s. %s is probably already running.</source>
+        <translation>Não foi possível obter exclusividade de escrita no endereço %s. O %s provavelmente já está sendo executado.</translation>
+    </message>
     <message>
         <source>Delete all wallet transactions and only recover those parts of the blockchain through -rescan on startup</source>
         <translation>Apaga todas as transações da carteira e somente recupera essas partes da blockchain usando o comando -rescan na inicialização</translation>
@@ -1802,6 +1822,14 @@
         <source>Distributed under the MIT software license, see the accompanying file COPYING or &lt;http://www.opensource.org/licenses/mit-license.php&gt;.</source>
         <translation>Distribuido sob a licença MIT software license. Veja os termos em &lt;http://www.opensource.org/licenses/mit-license.php&gt;.</translation>
     </message>
+    <message>
+        <source>Error loading %s: You can't enable HD on a already existing non-HD wallet</source>
+        <translation>Erro ao carregar %s. Não é permitido habilitar HD em carteiras não-HD pre existentes.</translation>
+    </message>
+    <message>
+        <source>Error reading %s! All keys read correctly, but transaction data or address book entries might be missing or incorrect.</source>
+        <translation>Erro ao ler arquivo %s! Todas as chaves foram lidas corretamente, mas os dados de transação ou o livro de endereos podem estar faltando ou incorretos.</translation>
+    </message>
     <message>
         <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source>
         <translation>Executa um comando quando uma transação da carteira mudar (%s no comando será substituído por TxID)</translation>
@@ -1810,6 +1838,22 @@
         <source>Force relay of transactions from whitelisted peers even they violate local relay policy (default: %d)</source>
         <translation>Força a retransmissão de transações de pares da lista branca, mesmo quando violam a política local de retransmissão (default: %d)</translation>
     </message>
+    <message>
+        <source>Maximum allowed median peer time offset adjustment. Local perspective of time may be influenced by peers forward or backward by this amount. (default: %u seconds)</source>
+        <translation>A mediana máxima permitida de peer time compensa o ajuste. Perspectiva local de horário pode ser influenciada por pares à frente ou atrás neste montante. (padrão: %u segundos)</translation>
+    </message>
+    <message>
+        <source>Maximum total fees (in %s) to use in a single wallet transaction or raw transaction; setting this too low may abort large transactions (default: %s)</source>
+        <translation>Preço máximo total (in %s) aplicado a uma única transação de carteira ou transação crua; aplicar isto tão baixo pode abortar grandes transações (padrão: %s)</translation>
+    </message>
+    <message>
+        <source>Please check that your computer's date and time are correct! If your clock is wrong, %s will not work properly.</source>
+        <translation>Por favor verifique que a data e o horário de seu computador estão corretos. Se o relógio de seu computador estiver incorreto, %s não funcionarão corretamente.</translation>
+    </message>
+    <message>
+        <source>Please contribute if you find %s useful. Visit %s for further information about the software.</source>
+        <translation>Por favor contribua se você entender que %s é útil. Visite %s para mais informações sobre o software.</translation>
+    </message>
     <message>
         <source>Set the number of script verification threads (%u to %d, 0 = auto, &lt;0 = leave that many cores free, default: %d)</source>
         <translation>Define o número de threads de verificação de script (%u a %d, 0 = automático, &lt;0 = número de cores deixados livres, padrão: %d)</translation>
@@ -1826,14 +1870,6 @@
         <source>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</source>
         <translation>Use UPnP para mapear a porta escutada (padrão: 1 quando escutando e sem -proxy)</translation>
     </message>
-    <message>
-        <source>WARNING: abnormally high number of blocks generated, %d blocks received in the last %d hours (%d expected)</source>
-        <translation>AVISO: números estranhamente altos de blocos gerados, %d blocos recebidos nas últimas %d horas (%d esperados)</translation>
-    </message>
-    <message>
-        <source>WARNING: check your network connection, %d blocks received in the last %d hours (%d expected)</source>
-        <translation>ATENÇÃO: verifique sua conexão %d blocos recebidos nas últimas %d horas (%d tempo estimado)</translation>
-    </message>
     <message>
         <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source>
         <translation>Atenção: A rede não parecem concordar plenamente! Alguns mineiros parecem estar enfrentando problemas.</translation>
diff --git a/src/qt/locale/bitcoin_pt_PT.ts b/src/qt/locale/bitcoin_pt_PT.ts
index 16b912dfdc57b..f63bfece69cc5 100644
--- a/src/qt/locale/bitcoin_pt_PT.ts
+++ b/src/qt/locale/bitcoin_pt_PT.ts
@@ -962,10 +962,6 @@
 </context>
 <context>
     <name>RPCConsole</name>
-    <message>
-        <source>Client name</source>
-        <translation>Nome do Cliente</translation>
-    </message>
     <message>
         <source>N/A</source>
         <translation>N/D</translation>
@@ -1811,14 +1807,6 @@
         <source>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</source>
         <translation>Utilizar UPnP para mapear a porta de escuta (predefinição: 1 quando escutar e sem -proxy)</translation>
     </message>
-    <message>
-        <source>WARNING: abnormally high number of blocks generated, %d blocks received in the last %d hours (%d expected)</source>
-        <translation>AVISO: gerado um número anormalmente elevado de blocos, %d blocos recebidos nas últimas %d horas (%d esperados)</translation>
-    </message>
-    <message>
-        <source>WARNING: check your network connection, %d blocks received in the last %d hours (%d expected)</source>
-        <translation>AVISO: verifique a sua conexão à rede, %d blocos recebidos nas últimas %d horas (%d esperados)</translation>
-    </message>
     <message>
         <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source>
         <translation>Aviso: A rede não parece estar completamente de acordo! Parece que alguns mineiros estão com dificuldades técnicas.</translation>
diff --git a/src/qt/locale/bitcoin_ro_RO.ts b/src/qt/locale/bitcoin_ro_RO.ts
index e6f591aa9e67c..489ed07639189 100644
--- a/src/qt/locale/bitcoin_ro_RO.ts
+++ b/src/qt/locale/bitcoin_ro_RO.ts
@@ -913,10 +913,6 @@
 </context>
 <context>
     <name>RPCConsole</name>
-    <message>
-        <source>Client name</source>
-        <translation>Nume client</translation>
-    </message>
     <message>
         <source>N/A</source>
         <translation>indisponibil</translation>
diff --git a/src/qt/locale/bitcoin_ru.ts b/src/qt/locale/bitcoin_ru.ts
index 750ea7db650a2..60f5d5dfa2a4c 100644
--- a/src/qt/locale/bitcoin_ru.ts
+++ b/src/qt/locale/bitcoin_ru.ts
@@ -989,10 +989,6 @@
 </context>
 <context>
     <name>RPCConsole</name>
-    <message>
-        <source>Client name</source>
-        <translation>Имя клиента</translation>
-    </message>
     <message>
         <source>N/A</source>
         <translation>Н/Д</translation>
@@ -1109,6 +1105,14 @@
         <source>Open the %1 debug log file from the current data directory. This can take a few seconds for large log files.</source>
         <translation>Открыть отладочный лог-файл %1 из текущего каталога данных. Это может занять несколько секунд для больших лог-файлов.</translation>
     </message>
+    <message>
+        <source>Decrease font size</source>
+        <translation>Уменьшить размер текста</translation>
+    </message>
+    <message>
+        <source>Increase font size</source>
+        <translation>Увеличить размер текста</translation>
+    </message>
     <message>
         <source>Services</source>
         <translation>Сервисы</translation>
@@ -1213,6 +1217,10 @@
         <source>&amp;Unban Node</source>
         <translation>&amp;Разблокировать узел</translation>
     </message>
+    <message>
+        <source>Welcome to the %1 RPC console.</source>
+        <translation>Добро пожаловать в консоль RPC %1.</translation>
+    </message>
     <message>
         <source>Use up and down arrows to navigate history, and &lt;b&gt;Ctrl-L&lt;/b&gt; to clear screen.</source>
         <translation>Используйте стрелки вверх и вниз для просмотра истории и &lt;b&gt;Ctrl-L&lt;/b&gt; для очистки экрана.</translation>
@@ -1592,6 +1600,10 @@
 </context>
 <context>
     <name>ShutdownWindow</name>
+    <message>
+        <source>%1 is shutting down...</source>
+        <translation>%1 выключается...</translation>
+    </message>
     <message>
         <source>Do not shut down the computer until this window disappears.</source>
         <translation>Не выключайте компьютер, пока это окно не исчезнет.</translation>
@@ -1782,10 +1794,22 @@
         <source>Bitcoin Core</source>
         <translation>Bitcoin Core</translation>
     </message>
+    <message>
+        <source>The %s developers</source>
+        <translation>Разработчики %s</translation>
+    </message>
+    <message>
+        <source>-fallbackfee is set very high! This is the transaction fee you may pay when fee estimates are not available.</source>
+        <translation>Установлено очень большое значение -fallbackfee! Это комиссия за транзацию, которую вы можете заплатить, если оценка размера комиссии не доступна. </translation>
+    </message>
     <message>
         <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source>
         <translation>Привязаться к указанному адресу и всегда прослушивать только его. Используйте [хост]:порт для IPv6</translation>
     </message>
+    <message>
+        <source>Cannot obtain a lock on data directory %s. %s is probably already running.</source>
+        <translation>Невозможно заблокировать каталог данных %s. %s возможно уже работает.</translation>
+    </message>
     <message>
         <source>Delete all wallet transactions and only recover those parts of the blockchain through -rescan on startup</source>
         <translation>Удалить все транзакции бумажника с возможностью восстановить эти части цепи блоков с помощью -rescan при запуске</translation>
@@ -1794,6 +1818,10 @@
         <source>Distributed under the MIT software license, see the accompanying file COPYING or &lt;http://www.opensource.org/licenses/mit-license.php&gt;.</source>
         <translation>Распространяется под лицензией MIT, см. приложенный файл COPYING или &lt;http://www.opensource.org/licenses/mit-license.php&gt;.</translation>
     </message>
+    <message>
+        <source>Error reading %s! All keys read correctly, but transaction data or address book entries might be missing or incorrect.</source>
+        <translation>Ошибка чтения %s! Все ключи прочитаны верно, но данные транзакций или записи адресной книги могут отсутствовать или быть неправильными.</translation>
+    </message>
     <message>
         <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source>
         <translation>Выполнить команду, когда меняется транзакция в бумажнике (%s в команде заменяется на TxID)</translation>
@@ -1802,6 +1830,10 @@
         <source>Force relay of transactions from whitelisted peers even they violate local relay policy (default: %d)</source>
         <translation>Всегда разрешать транзакции, полученные от участников из белого списка (по умолчанию: %d)</translation>
     </message>
+    <message>
+        <source>Please check that your computer's date and time are correct! If your clock is wrong, %s will not work properly.</source>
+        <translation>Пожалуйста убедитесь в корректности установки времени и даты на вашем компьютере! Если время установлено неверно, %s не будет работать правильно.</translation>
+    </message>
     <message>
         <source>Set the number of script verification threads (%u to %d, 0 = auto, &lt;0 = leave that many cores free, default: %d)</source>
         <translation>Задать число потоков проверки скрипта (от %u до %d, 0=авто, &lt;0 = оставить столько ядер свободными, по умолчанию: %d)</translation>
@@ -1818,14 +1850,6 @@
         <source>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</source>
         <translation>Использовать UPnP для проброса порта (по умолчанию: 1, если используется прослушивание и нет -proxy)</translation>
     </message>
-    <message>
-        <source>WARNING: abnormally high number of blocks generated, %d blocks received in the last %d hours (%d expected)</source>
-        <translation>ВНИМАНИЕ: сгенерировано ненормально большое число блоков, %d блоков получено за последние %d часов (ожидалось %d)</translation>
-    </message>
-    <message>
-        <source>WARNING: check your network connection, %d blocks received in the last %d hours (%d expected)</source>
-        <translation>ВНИМАНИЕ: проверьте сетевое подключение, получено %d блоков за последние %d часов (ожидалось %d)</translation>
-    </message>
     <message>
         <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source>
         <translation>Внимание: похоже, в сети нет полного согласия! Некоторый майнеры, возможно, испытывают проблемы.</translation>
@@ -1838,6 +1862,10 @@
         <source>Whitelist peers connecting from the given netmask or IP address. Can be specified multiple times.</source>
         <translation>Вносить в белый список участников, подключающихся с указанной маски сети или IP. Можно использовать многократно.</translation>
     </message>
+    <message>
+        <source>%s corrupt, salvage failed</source>
+        <translation>%s поврежден, восстановить не удалось</translation>
+    </message>
     <message>
         <source>-maxmempool must be at least %d MB</source>
         <translation>-maxmempool должен быть как минимум %d MB</translation>
@@ -1850,6 +1878,10 @@
         <source>Append comment to the user agent string</source>
         <translation>Добавить комментарий к строке пользовательского агента</translation>
     </message>
+    <message>
+        <source>Attempt to recover private keys from a corrupt wallet on startup</source>
+        <translation>Попытаться восстановить приватные ключи из повреждённого бумажника при запуске</translation>
+    </message>
     <message>
         <source>Block creation options:</source>
         <translation>Параметры создания блоков:</translation>
@@ -1862,6 +1894,10 @@
         <source>Connection options:</source>
         <translation>Параметры подключения:</translation>
     </message>
+    <message>
+        <source>Copyright (C) %i-%i</source>
+        <translation>Copyright (C) %i-%i</translation>
+    </message>
     <message>
         <source>Corrupted block database detected</source>
         <translation>БД блоков повреждена</translation>
@@ -1906,6 +1942,14 @@
         <source>Error loading %s</source>
         <translation>Ошибка загрузки %s</translation>
     </message>
+    <message>
+        <source>Error loading %s: Wallet corrupted</source>
+        <translation>Ошибка загрузки %s: Бумажник поврежден</translation>
+    </message>
+    <message>
+        <source>Error loading %s: Wallet requires newer version of %s</source>
+        <translation>Ошибка загрузки %s: Для бумажника требуется более новая версия %s</translation>
+    </message>
     <message>
         <source>Error loading block database</source>
         <translation>Ошибка чтения базы данных блоков</translation>
@@ -1934,10 +1978,18 @@
         <source>Invalid -onion address: '%s'</source>
         <translation>Неверный -onion адрес: '%s'</translation>
     </message>
+    <message>
+        <source>Invalid amount for -%s=&lt;amount&gt;: '%s'</source>
+        <translation>Неверная сумма для -%s=&lt;amount&gt;: '%s'</translation>
+    </message>
     <message>
         <source>Keep the transaction memory pool below &lt;n&gt; megabytes (default: %u)</source>
         <translation>Сбрасывать транзакции из памяти на диск каждые &lt;n&gt; мегабайт (по умолчанию: %u)</translation>
     </message>
+    <message>
+        <source>Loading banlist...</source>
+        <translation>Загрузка банлиста...</translation>
+    </message>
     <message>
         <source>Location of the auth cookie (default: data dir)</source>
         <translation>Расположение куки входы(по умолчанию: data dir)</translation>
@@ -1950,6 +2002,10 @@
         <source>Only connect to nodes in network &lt;net&gt; (ipv4, ipv6 or onion)</source>
         <translation>Соединяться только по сети &lt;net&gt; (ipv4, ipv6 или onion)</translation>
     </message>
+    <message>
+        <source>Print this help message and exit</source>
+        <translation>Вывести эту справку и выйти</translation>
+    </message>
     <message>
         <source>Print version and exit</source>
         <translation>Написать версию и выйти</translation>
@@ -1962,10 +2018,18 @@
         <source>Prune mode is incompatible with -txindex.</source>
         <translation>Режим удаления блоков несовместим с -txindex.</translation>
     </message>
+    <message>
+        <source>Rebuild chain state from the currently indexed blocks</source>
+        <translation>Перестроить индекс цепи из текущих индексированных блоков</translation>
+    </message>
     <message>
         <source>Set database cache size in megabytes (%d to %d, default: %d)</source>
         <translation>Установить размер кэша БД в мегабайтах(от %d до %d, по умолчанию: %d)</translation>
     </message>
+    <message>
+        <source>Set maximum block cost (default: %d)</source>
+        <translation>Задать максимальную стоимость блока (по умолчанию: %d)</translation>
+    </message>
     <message>
         <source>Set maximum block size in bytes (default: %d)</source>
         <translation>Задать максимальный размер блока в байтах (по умолчанию: %d)</translation>
@@ -1974,6 +2038,14 @@
         <source>Specify wallet file (within data directory)</source>
         <translation>Укажите файл бумажника (внутри каталога данных)</translation>
     </message>
+    <message>
+        <source>The source code is available from %s.</source>
+        <translation>Исходный код доступен в %s.</translation>
+    </message>
+    <message>
+        <source>Unable to bind to %s on this computer. %s is probably already running.</source>
+        <translation>Невозможно привязаться к %s на этом компьютере. Возможно, %s уже работает.</translation>
+    </message>
     <message>
         <source>Unsupported argument -benchmark ignored, use -debug=bench.</source>
         <translation>Неподдерживаемый аргумент -benchmark проигнорирован, используйте -debug=bench.</translation>
@@ -2006,6 +2078,14 @@
         <source>Wallet %s resides outside data directory %s</source>
         <translation>Бумажник %s располагается вне каталога данных %s</translation>
     </message>
+    <message>
+        <source>Wallet debugging/testing options:</source>
+        <translation>Параметры отладки/тестирования бумажника:</translation>
+    </message>
+    <message>
+        <source>Wallet needed to be rewritten: restart %s to complete</source>
+        <translation>Необходимо перезаписать бумажник, перезапустите %s для завершения операции.</translation>
+    </message>
     <message>
         <source>Wallet options:</source>
         <translation>Настройки бумажника:</translation>
@@ -2306,6 +2386,10 @@
         <source>Warning: Unknown block versions being mined! It's possible unknown rules are in effect</source>
         <translation>Внимание: Получена неизвестная версия блока! Возможно неизвестные правила вступили в силу.</translation>
     </message>
+    <message>
+        <source>Warning: Wallet file corrupt, data salvaged! Original %s saved as %s in %s; if your balance or transactions are incorrect you should restore from a backup.</source>
+        <translation>Внимание: Файл бумажника поврежден, данные восстановлены! Оригинальный %s сохранен как %s в %s; Если баланс или транзакции некорректны, вы должны восстановить файл из резервной копии.</translation>
+    </message>
     <message>
         <source>(default: %s)</source>
         <translation>(по умолчанию: %s)</translation>
diff --git a/src/qt/locale/bitcoin_sk.ts b/src/qt/locale/bitcoin_sk.ts
index e2b8a0201599b..a4f0ebcb4e17c 100644
--- a/src/qt/locale/bitcoin_sk.ts
+++ b/src/qt/locale/bitcoin_sk.ts
@@ -929,10 +929,6 @@
 </context>
 <context>
     <name>RPCConsole</name>
-    <message>
-        <source>Client name</source>
-        <translation>Meno klienta</translation>
-    </message>
     <message>
         <source>N/A</source>
         <translation>nie je k dispozícii</translation>
@@ -1707,14 +1703,6 @@
         <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
         <translation>Toto je pred-testovacia verzia - použitie je na vlastné riziko - nepoužívajte na tvorbu bitcoin ani obchodovanie.</translation>
     </message>
-    <message>
-        <source>WARNING: abnormally high number of blocks generated, %d blocks received in the last %d hours (%d expected)</source>
-        <translation>VAROVANIE: príliš veľa vygenerovaných blokov; %d prijatých blokov v posledných %d hodinách (očakávaných %d)</translation>
-    </message>
-    <message>
-        <source>WARNING: check your network connection, %d blocks received in the last %d hours (%d expected)</source>
-        <translation>VAROVANIE: skontrolujte sieťové pripojenie, %d prijatých blokov za posledných %d hodín (očakávané %d)</translation>
-    </message>
     <message>
         <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source>
         <translation>Varovanie: Javí sa že sieť sieť úplne nesúhlasí! Niektorí mineri zjavne majú ťažkosti.
diff --git a/src/qt/locale/bitcoin_sl_SI.ts b/src/qt/locale/bitcoin_sl_SI.ts
index 155be7bb27144..16ef20ea3a061 100644
--- a/src/qt/locale/bitcoin_sl_SI.ts
+++ b/src/qt/locale/bitcoin_sl_SI.ts
@@ -869,10 +869,6 @@
 </context>
 <context>
     <name>RPCConsole</name>
-    <message>
-        <source>Client name</source>
-        <translation>Ime odjemalca</translation>
-    </message>
     <message>
         <source>N/A</source>
         <translation>Neznano</translation>
@@ -1566,14 +1562,6 @@
         <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
         <translation>To je preizkusna različica še neizdanega programa. Uporabljate jo na lastno odgovornost. Programa ne uporabljajte je za rudarjenje ali trgovske aplikacije.</translation>
     </message>
-    <message>
-        <source>WARNING: abnormally high number of blocks generated, %d blocks received in the last %d hours (%d expected)</source>
-        <translation>OPOZORILO: Generirano je bilo nenavadno veliko število blokov. Št. prejetih blokov: %d v št. ur: %d (pričakovanih je %d blokov)</translation>
-    </message>
-    <message>
-        <source>WARNING: check your network connection, %d blocks received in the last %d hours (%d expected)</source>
-        <translation>OPOZORILO: Preverite vašo omrežno povezavo. Št. prejetih blokov: %d v št. ur: %d (pričakovanih je %d blokov)</translation>
-    </message>
     <message>
         <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source>
         <translation>Opozorilo: Trenutno na omrežju ni videti konsenza! Videti je, kot da bi imeli nekateri rudarji težave.</translation>
diff --git a/src/qt/locale/bitcoin_sv.ts b/src/qt/locale/bitcoin_sv.ts
index 6361b5ea5ff87..ee46974d8b4e5 100644
--- a/src/qt/locale/bitcoin_sv.ts
+++ b/src/qt/locale/bitcoin_sv.ts
@@ -993,10 +993,6 @@
 </context>
 <context>
     <name>RPCConsole</name>
-    <message>
-        <source>Client name</source>
-        <translation>Klientnamn</translation>
-    </message>
     <message>
         <source>N/A</source>
         <translation>ej tillgänglig</translation>
@@ -1882,14 +1878,6 @@
         <source>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</source>
         <translation>Använd UPnP för att mappa den lyssnande porten (förvalt: 1 när lyssning aktiverat och utan -proxy)</translation>
     </message>
-    <message>
-        <source>WARNING: abnormally high number of blocks generated, %d blocks received in the last %d hours (%d expected)</source>
-        <translation>Varning: Onormalt antal block block genererade. %d block mottagna senaste %d timmarna (%d förväntade)</translation>
-    </message>
-    <message>
-        <source>WARNING: check your network connection, %d blocks received in the last %d hours (%d expected)</source>
-        <translation>Varning: Kontrollera din närverksanslutning. %d block mottagna senaste %d timmarna, (%d förväntade)</translation>
-    </message>
     <message>
         <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source>
         <translation>Varning: Nätverket verkar inte vara helt överens! Några miners verkar ha problem.</translation>
diff --git a/src/qt/locale/bitcoin_ta.ts b/src/qt/locale/bitcoin_ta.ts
index 6878d23fe22ea..921171c5449b2 100644
--- a/src/qt/locale/bitcoin_ta.ts
+++ b/src/qt/locale/bitcoin_ta.ts
@@ -371,10 +371,6 @@
 </context>
 <context>
     <name>RPCConsole</name>
-    <message>
-        <source>Client name</source>
-        <translation>வாடிக்கையாளர் பெயர்</translation>
-    </message>
     <message>
         <source>N/A</source>
         <translation>N/A</translation>
diff --git a/src/qt/locale/bitcoin_tr.ts b/src/qt/locale/bitcoin_tr.ts
index f6ab2ca18b6cf..bbd0117404c22 100644
--- a/src/qt/locale/bitcoin_tr.ts
+++ b/src/qt/locale/bitcoin_tr.ts
@@ -993,10 +993,6 @@
 </context>
 <context>
     <name>RPCConsole</name>
-    <message>
-        <source>Client name</source>
-        <translation>İstemci ismi</translation>
-    </message>
     <message>
         <source>N/A</source>
         <translation>Mevcut değil</translation>
@@ -1874,14 +1870,6 @@
         <source>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</source>
         <translation>Dinlenecek portu haritalamak için UPnP kullan (varsayılan: dinlenildiğinde ve -proxy olmadığında 1)</translation>
     </message>
-    <message>
-        <source>WARNING: abnormally high number of blocks generated, %d blocks received in the last %d hours (%d expected)</source>
-        <translation>İKAZ: anormal yüksek sayıda blok oluşturulmuştur, %d blok son %d saat içinde alınmıştır (%d bekleniyordu)</translation>
-    </message>
-    <message>
-        <source>WARNING: check your network connection, %d blocks received in the last %d hours (%d expected)</source>
-        <translation>İKAZ: ağ bağlantınızı kontrol ediniz, %d blok son %d saat içinde alınmıştır (%d bekleniyordu)</translation>
-    </message>
     <message>
         <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source>
         <translation>Uyarı: şebeke tamamen mutabık değil gibi görünüyor! Bazı madenciler sorun yaşıyor gibi görünüyor.</translation>
diff --git a/src/qt/locale/bitcoin_uk.ts b/src/qt/locale/bitcoin_uk.ts
index 668e787a6eca8..a06cc9e0921a8 100644
--- a/src/qt/locale/bitcoin_uk.ts
+++ b/src/qt/locale/bitcoin_uk.ts
@@ -929,10 +929,6 @@
 </context>
 <context>
     <name>RPCConsole</name>
-    <message>
-        <source>Client name</source>
-        <translation>Назва клієнту</translation>
-    </message>
     <message>
         <source>N/A</source>
         <translation>Н/Д</translation>
@@ -1746,14 +1742,6 @@
         <source>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</source>
         <translation>Використовувати UPnP для відображення порту, що прослуховується (типово: 1 при прослуховуванні та за відсутності -proxy)</translation>
     </message>
-    <message>
-        <source>WARNING: abnormally high number of blocks generated, %d blocks received in the last %d hours (%d expected)</source>
-        <translation>УВАГА: аномально висока кількість згенерованих блоків, %d блок(ів) було отримано за останні %d годин(и) (має бути %d)</translation>
-    </message>
-    <message>
-        <source>WARNING: check your network connection, %d blocks received in the last %d hours (%d expected)</source>
-        <translation>УВАГА: перевірте ваше мережеве з'єднання, %d блок(ів) було отримано за останні %d годин(и) (має бути %d)</translation>
-    </message>
     <message>
         <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source>
         <translation>Увага: Частина мережі використовує інший головний ланцюжок! Деякі добувачі, можливо, зазнають проблем.</translation>
diff --git a/src/qt/locale/bitcoin_uz@Cyrl.ts b/src/qt/locale/bitcoin_uz@Cyrl.ts
index ce33262976d7e..0062abfc1d444 100644
--- a/src/qt/locale/bitcoin_uz@Cyrl.ts
+++ b/src/qt/locale/bitcoin_uz@Cyrl.ts
@@ -727,10 +727,6 @@
 </context>
 <context>
     <name>RPCConsole</name>
-    <message>
-        <source>Client name</source>
-        <translation>Мижоз номи</translation>
-    </message>
     <message>
         <source>N/A</source>
         <translation>Тўғри келмайди</translation>
diff --git a/src/qt/locale/bitcoin_zh_CN.ts b/src/qt/locale/bitcoin_zh_CN.ts
index 8f467b79c1cc5..92a7006d30fdf 100644
--- a/src/qt/locale/bitcoin_zh_CN.ts
+++ b/src/qt/locale/bitcoin_zh_CN.ts
@@ -929,10 +929,6 @@
 </context>
 <context>
     <name>RPCConsole</name>
-    <message>
-        <source>Client name</source>
-        <translation>客户端名称</translation>
-    </message>
     <message>
         <source>N/A</source>
         <translation>不可用</translation>
@@ -1763,14 +1759,6 @@
         <source>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</source>
         <translation>使用UPnP暴露本机监听端口（默认：1 当正在监听且不使用代理）</translation>
     </message>
-    <message>
-        <source>WARNING: abnormally high number of blocks generated, %d blocks received in the last %d hours (%d expected)</source>
-        <translation>警告：数据块生成数量异常，最近 %d 小时收到了 %d 个数据块（预期为 %d 个）</translation>
-    </message>
-    <message>
-        <source>WARNING: check your network connection, %d blocks received in the last %d hours (%d expected)</source>
-        <translation>警告：请检查您的网络连接，最近 %d 小时收到了 %d 个数据块（预期为 %d 个）</translation>
-    </message>
     <message>
         <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source>
         <translation>警告：网络似乎并不完全同意！有些矿工似乎遇到了问题。</translation>
diff --git a/src/qt/locale/bitcoin_zh_TW.ts b/src/qt/locale/bitcoin_zh_TW.ts
index c71a37ba986e0..ab56f96795a50 100644
--- a/src/qt/locale/bitcoin_zh_TW.ts
+++ b/src/qt/locale/bitcoin_zh_TW.ts
@@ -993,10 +993,6 @@
 </context>
 <context>
     <name>RPCConsole</name>
-    <message>
-        <source>Client name</source>
-        <translation>客戶端軟體名稱</translation>
-    </message>
     <message>
         <source>N/A</source>
         <translation>未知</translation>
@@ -1865,7 +1861,7 @@
     </message>
     <message>
         <source>Please contribute if you find %s useful. Visit %s for further information about the software.</source>
-        <translation>如果你覺得 %s 有用，可以捐助我們。關於這個軟體的更多資訊請見 %s。</translation>
+        <translation>如果你覺得 %s 有用，可以幫助我們。關於這個軟體的更多資訊請見 %s。</translation>
     </message>
     <message>
         <source>Set the number of script verification threads (%u to %d, 0 = auto, &lt;0 = leave that many cores free, default: %d)</source>
@@ -1887,14 +1883,6 @@
         <source>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</source>
         <translation>是否要使用「通用即插即用」協定(UPnP)，來設定聽候連線的通訊埠的對應(預設值: 當有聽候連線且沒有指定 -proxy 參數時為 1)</translation>
     </message>
-    <message>
-        <source>WARNING: abnormally high number of blocks generated, %d blocks received in the last %d hours (%d expected)</source>
-        <translation>警告: 收到了不尋常地多的 %d 個區塊在過去 %d 小時內生產出來(預期是 %d 個)</translation>
-    </message>
-    <message>
-        <source>WARNING: check your network connection, %d blocks received in the last %d hours (%d expected)</source>
-        <translation>警告: 請檢查你的網路連線狀況，收到了 %d 個區塊是在過去 %d 小時內生產出來(預期是 %d 個)</translation>
-    </message>
     <message>
         <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source>
         <translation>警告: 節點網路對於區塊鏈結的決定目前有分歧！看來有些礦工會有問題。</translation>

From 96fa95361f68dd8169fa60e73290afae47445299 Mon Sep 17 00:00:00 2001
From: Suhas Daftuar <sdaftuar@chaincode.com>
Date: Wed, 6 Jul 2016 21:18:38 -0400
Subject: [PATCH 0618/1802] Improve handling of unconnecting headers

When processing a headers message that looks like a block announcement,
send peer a getheaders if the headers message won't connect.

Apply DoS points after too many consecutive unconnecting headers messages.
---
 src/main.cpp | 38 +++++++++++++++++++++++++++++++++++++-
 src/main.h   |  3 +++
 2 files changed, 40 insertions(+), 1 deletion(-)

diff --git a/src/main.cpp b/src/main.cpp
index b86bbda1b8f9e..dd71ee551028b 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -276,6 +276,8 @@ struct CNodeState {
     CBlockIndex *pindexLastCommonBlock;
     //! The best header we have sent our peer.
     CBlockIndex *pindexBestHeaderSent;
+    //! Length of current-streak of unconnecting headers announcements
+    int nUnconnectingHeaders;
     //! Whether we've started headers synchronization with this peer.
     bool fSyncStarted;
     //! Since when we're stalling block download progress (in microseconds), or 0.
@@ -304,6 +306,7 @@ struct CNodeState {
         hashLastUnknownBlock.SetNull();
         pindexLastCommonBlock = NULL;
         pindexBestHeaderSent = NULL;
+        nUnconnectingHeaders = 0;
         fSyncStarted = false;
         nStallingSince = 0;
         nDownloadingSince = 0;
@@ -5773,6 +5776,35 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
             return true;
         }
 
+        CNodeState *nodestate = State(pfrom->GetId());
+
+        // If this looks like it could be a block announcement (nCount <
+        // MAX_BLOCKS_TO_ANNOUNCE), use special logic for handling headers that
+        // don't connect:
+        // - Send a getheaders message in response to try to connect the chain.
+        // - The peer can send up to MAX_UNCONNECTING_HEADERS in a row that
+        //   don't connect before giving DoS points
+        // - Once a headers message is received that is valid and does connect,
+        //   nUnconnectingHeaders gets reset back to 0.
+        if (mapBlockIndex.find(headers[0].hashPrevBlock) == mapBlockIndex.end() && nCount < MAX_BLOCKS_TO_ANNOUNCE) {
+            nodestate->nUnconnectingHeaders++;
+            pfrom->PushMessage(NetMsgType::GETHEADERS, chainActive.GetLocator(pindexBestHeader), uint256());
+            LogPrint("net", "received header %s: missing prev block %s, sending getheaders (%d) to end (peer=%d, nUnconnectingHeaders=%d)\n",
+                    headers[0].GetHash().ToString(),
+                    headers[0].hashPrevBlock.ToString(),
+                    pindexBestHeader->nHeight,
+                    pfrom->id, nodestate->nUnconnectingHeaders);
+            // Set hashLastUnknownBlock for this peer, so that if we
+            // eventually get the headers - even from a different peer -
+            // we can use this peer to download.
+            UpdateBlockAvailability(pfrom->GetId(), headers.back().GetHash());
+
+            if (nodestate->nUnconnectingHeaders % MAX_UNCONNECTING_HEADERS == 0) {
+                Misbehaving(pfrom->GetId(), 20);
+            }
+            return true;
+        }
+
         CBlockIndex *pindexLast = NULL;
         BOOST_FOREACH(const CBlockHeader& header, headers) {
             CValidationState state;
@@ -5790,6 +5822,11 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
             }
         }
 
+        if (nodestate->nUnconnectingHeaders > 0) {
+            LogPrint("net", "peer=%d: resetting nUnconnectingHeaders (%d -> 0)\n", pfrom->id, nodestate->nUnconnectingHeaders);
+        }
+        nodestate->nUnconnectingHeaders = 0;
+
         assert(pindexLast);
         UpdateBlockAvailability(pfrom->GetId(), pindexLast->GetBlockHash());
 
@@ -5802,7 +5839,6 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
         }
 
         bool fCanDirectFetch = CanDirectFetch(chainparams.GetConsensus());
-        CNodeState *nodestate = State(pfrom->GetId());
         // If this set of headers is valid and ends in a block with at least as
         // much work as our tip, download as much as possible.
         if (fCanDirectFetch && pindexLast->IsValid(BLOCK_VALID_TREE) && chainActive.Tip()->nChainWork <= pindexLast->nChainWork) {
diff --git a/src/main.h b/src/main.h
index 7ea570d859792..65ae2488f9095 100644
--- a/src/main.h
+++ b/src/main.h
@@ -138,6 +138,9 @@ static const bool DEFAULT_FEEFILTER = true;
 /** Maximum number of headers to announce when relaying blocks with headers message.*/
 static const unsigned int MAX_BLOCKS_TO_ANNOUNCE = 8;
 
+/** Maximum number of unconnecting headers announcements before DoS score */
+static const int MAX_UNCONNECTING_HEADERS = 10;
+
 static const bool DEFAULT_PEERBLOOMFILTERS = true;
 
 struct BlockHasher

From e91cf4b210db72ed020612a04b55e9715d8f9831 Mon Sep 17 00:00:00 2001
From: Suhas Daftuar <sdaftuar@chaincode.com>
Date: Wed, 6 Jul 2016 21:19:32 -0400
Subject: [PATCH 0619/1802] Add test for handling of unconnecting headers

---
 qa/rpc-tests/sendheaders.py | 105 ++++++++++++++++++++++++++++++++++++
 1 file changed, 105 insertions(+)

diff --git a/qa/rpc-tests/sendheaders.py b/qa/rpc-tests/sendheaders.py
index 6ab17d59b3878..c3f3180b6bca3 100755
--- a/qa/rpc-tests/sendheaders.py
+++ b/qa/rpc-tests/sendheaders.py
@@ -63,6 +63,21 @@
    Expect: getdata request for 14 more blocks.
 f. Announce 1 more header that builds on that fork.
    Expect: no response.
+
+Part 5: Test handling of headers that don't connect.
+a. Repeat 10 times:
+   1. Announce a header that doesn't connect.
+      Expect: getheaders message
+   2. Send headers chain.
+      Expect: getdata for the missing blocks, tip update.
+b. Then send 9 more headers that don't connect.
+   Expect: getheaders message each time.
+c. Announce a header that does connect.
+   Expect: no response.
+d. Announce 49 headers that don't connect.
+   Expect: getheaders message each time.
+e. Announce one more that doesn't connect.
+   Expect: disconnect.
 '''
 
 class BaseNode(NodeConnCB):
@@ -77,6 +92,8 @@ def __init__(self):
         self.last_getdata = None
         self.sleep_time = 0.05
         self.block_announced = False
+        self.last_getheaders = None
+        self.disconnected = False
 
     def clear_last_announcement(self):
         with mininode_lock:
@@ -127,6 +144,12 @@ def on_getdata(self, conn, message):
     def on_pong(self, conn, message):
         self.last_pong = message
 
+    def on_getheaders(self, conn, message):
+        self.last_getheaders = message
+
+    def on_close(self, conn):
+        self.disconnected = True
+
     # Test whether the last announcement we received had the
     # right header or the right inv
     # inv and headers should be lists of block hashes
@@ -178,6 +201,11 @@ def wait_for_block(self, blockhash, timeout=60):
         self.sync(test_function, timeout)
         return
 
+    def wait_for_getheaders(self, timeout=60):
+        test_function = lambda: self.last_getheaders != None
+        self.sync(test_function, timeout)
+        return
+
     def wait_for_getdata(self, hash_list, timeout=60):
         if hash_list == []:
             return
@@ -186,6 +214,11 @@ def wait_for_getdata(self, hash_list, timeout=60):
         self.sync(test_function, timeout)
         return
 
+    def wait_for_disconnect(self, timeout=60):
+        test_function = lambda: self.disconnected
+        self.sync(test_function, timeout)
+        return
+
     def send_header_for_blocks(self, new_blocks):
         headers_message = msg_headers()
         headers_message.headers = [ CBlockHeader(b) for b in new_blocks ]
@@ -510,6 +543,78 @@ def run_test(self):
 
         print("Part 4: success!")
 
+        # Now deliver all those blocks we announced.
+        [ test_node.send_message(msg_block(x)) for x in blocks ]
+
+        print("Part 5: Testing handling of unconnecting headers")
+        # First we test that receipt of an unconnecting header doesn't prevent
+        # chain sync.
+        for i in range(10):
+            test_node.last_getdata = None
+            blocks = []
+            # Create two more blocks.
+            for j in range(2):
+                blocks.append(create_block(tip, create_coinbase(height), block_time))
+                blocks[-1].solve()
+                tip = blocks[-1].sha256
+                block_time += 1
+                height += 1
+            # Send the header of the second block -> this won't connect.
+            with mininode_lock:
+                test_node.last_getheaders = None
+            test_node.send_header_for_blocks([blocks[1]])
+            test_node.wait_for_getheaders(timeout=1)
+            test_node.send_header_for_blocks(blocks)
+            test_node.wait_for_getdata([x.sha256 for x in blocks])
+            [ test_node.send_message(msg_block(x)) for x in blocks ]
+            test_node.sync_with_ping()
+            assert_equal(int(self.nodes[0].getbestblockhash(), 16), blocks[1].sha256)
+
+        blocks = []
+        # Now we test that if we repeatedly don't send connecting headers, we
+        # don't go into an infinite loop trying to get them to connect.
+        MAX_UNCONNECTING_HEADERS = 10
+        for j in range(MAX_UNCONNECTING_HEADERS+1):
+            blocks.append(create_block(tip, create_coinbase(height), block_time))
+            blocks[-1].solve()
+            tip = blocks[-1].sha256
+            block_time += 1
+            height += 1
+
+        for i in range(1, MAX_UNCONNECTING_HEADERS):
+            # Send a header that doesn't connect, check that we get a getheaders.
+            with mininode_lock:
+                test_node.last_getheaders = None
+            test_node.send_header_for_blocks([blocks[i]])
+            test_node.wait_for_getheaders(timeout=1)
+
+        # Next header will connect, should re-set our count:
+        test_node.send_header_for_blocks([blocks[0]])
+
+        # Remove the first two entries (blocks[1] would connect):
+        blocks = blocks[2:]
+
+        # Now try to see how many unconnecting headers we can send
+        # before we get disconnected.  Should be 5*MAX_UNCONNECTING_HEADERS
+        for i in range(5*MAX_UNCONNECTING_HEADERS - 1):
+            # Send a header that doesn't connect, check that we get a getheaders.
+            with mininode_lock:
+                test_node.last_getheaders = None
+            test_node.send_header_for_blocks([blocks[i%len(blocks)]])
+            test_node.wait_for_getheaders(timeout=1)
+
+        # Eventually this stops working.
+        with mininode_lock:
+            self.last_getheaders = None
+        test_node.send_header_for_blocks([blocks[-1]])
+
+        # Should get disconnected
+        test_node.wait_for_disconnect()
+        with mininode_lock:
+            self.last_getheaders = True
+
+        print("Part 5: success!")
+
         # Finally, check that the inv node never received a getdata request,
         # throughout the test
         assert_equal(inv_node.last_getdata, None)

From e37b16a75c1ff86d515ef3050d2c76432ea71225 Mon Sep 17 00:00:00 2001
From: Daniel Cousens <dcousens@users.noreply.github.com>
Date: Tue, 12 Jul 2016 13:27:09 +1000
Subject: [PATCH 0620/1802] transaction: clarify witness branches

---
 src/primitives/transaction.h | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/primitives/transaction.h b/src/primitives/transaction.h
index e87ad90f0d498..18402ac4536e6 100644
--- a/src/primitives/transaction.h
+++ b/src/primitives/transaction.h
@@ -290,6 +290,8 @@ struct CMutableTransaction;
  */
 template<typename Stream, typename Operation, typename TxType>
 inline void SerializeTransaction(TxType& tx, Stream& s, Operation ser_action, int nType, int nVersion) {
+    const bool fAllowWitness = !(nVersion & SERIALIZE_TRANSACTION_NO_WITNESS);
+
     READWRITE(*const_cast<int32_t*>(&tx.nVersion));
     unsigned char flags = 0;
     if (ser_action.ForRead()) {
@@ -298,7 +300,7 @@ inline void SerializeTransaction(TxType& tx, Stream& s, Operation ser_action, in
         const_cast<CTxWitness*>(&tx.wit)->SetNull();
         /* Try to read the vin. In case the dummy is there, this will be read as an empty vector. */
         READWRITE(*const_cast<std::vector<CTxIn>*>(&tx.vin));
-        if (tx.vin.size() == 0 && !(nVersion & SERIALIZE_TRANSACTION_NO_WITNESS)) {
+        if (tx.vin.size() == 0 && fAllowWitness) {
             /* We read a dummy or an empty vin. */
             READWRITE(flags);
             if (flags != 0) {
@@ -309,7 +311,7 @@ inline void SerializeTransaction(TxType& tx, Stream& s, Operation ser_action, in
             /* We read a non-empty vin. Assume a normal vout follows. */
             READWRITE(*const_cast<std::vector<CTxOut>*>(&tx.vout));
         }
-        if ((flags & 1) && !(nVersion & SERIALIZE_TRANSACTION_NO_WITNESS)) {
+        if ((flags & 1) && fAllowWitness) {
             /* The witness flag is present, and we support witnesses. */
             flags ^= 1;
             const_cast<CTxWitness*>(&tx.wit)->vtxinwit.resize(tx.vin.size());
@@ -322,7 +324,7 @@ inline void SerializeTransaction(TxType& tx, Stream& s, Operation ser_action, in
     } else {
         // Consistency check
         assert(tx.wit.vtxinwit.size() <= tx.vin.size());
-        if (!(nVersion & SERIALIZE_TRANSACTION_NO_WITNESS)) {
+        if (fAllowWitness) {
             /* Check whether witnesses need to be serialized. */
             if (!tx.wit.IsNull()) {
                 flags |= 1;

From 66668c420a23936cb228737f982ee58c08211071 Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Thu, 14 Jul 2016 10:30:03 +0200
Subject: [PATCH 0621/1802] [qa] Solve merge conflict of
 4324bd237c3147fc153ba5046c211f03e8ac956a

---
 qa/rpc-tests/p2p-segwit.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qa/rpc-tests/p2p-segwit.py b/qa/rpc-tests/p2p-segwit.py
index 9d64c5fe3633a..b30d41af92935 100755
--- a/qa/rpc-tests/p2p-segwit.py
+++ b/qa/rpc-tests/p2p-segwit.py
@@ -306,7 +306,7 @@ def test_unnecessary_witness_before_segwit_activation(self):
         tx3 = CTransaction()
         tx3.vin.append(CTxIn(COutPoint(tx2.sha256, 0), CScript([p2sh_program])))
         tx3.vout.append(CTxOut(tx2.vout[0].nValue-1000, scriptPubKey))
-        tx3.wit.vtxinwit.append(CTxinWitness())
+        tx3.wit.vtxinwit.append(CTxInWitness())
         tx3.wit.vtxinwit[0].scriptWitness.stack = [b'a'*400000]
         tx3.rehash()
         self.std_node.test_transaction_acceptance(tx3, True, False, b'no-witness-yet')

From 68d7682b9f8c0f548e0a9ef03296320b8ae3960d Mon Sep 17 00:00:00 2001
From: Jonas Schnelli <dev@jonasschnelli.ch>
Date: Fri, 15 Jul 2016 10:33:25 +0200
Subject: [PATCH 0622/1802] [Wallet] ensure CKeyMetadata.hdMasterKeyID will be
 cleared during SetNull()

---
 src/wallet/walletdb.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/wallet/walletdb.h b/src/wallet/walletdb.h
index eaa406857f2e7..42179f2288782 100644
--- a/src/wallet/walletdb.h
+++ b/src/wallet/walletdb.h
@@ -87,9 +87,8 @@ class CKeyMetadata
     }
     CKeyMetadata(int64_t nCreateTime_)
     {
-        nVersion = CKeyMetadata::CURRENT_VERSION;
+        SetNull();
         nCreateTime = nCreateTime_;
-        hdKeypath.clear();
     }
 
     ADD_SERIALIZE_METHODS;
@@ -111,6 +110,7 @@ class CKeyMetadata
         nVersion = CKeyMetadata::CURRENT_VERSION;
         nCreateTime = 0;
         hdKeypath.clear();
+        hdMasterKeyID.SetNull();
     }
 };
 

From 7945088d413819d8cf1772fd25e0f355c84c64d6 Mon Sep 17 00:00:00 2001
From: Jonas Schnelli <dev@jonasschnelli.ch>
Date: Fri, 15 Jul 2016 10:34:08 +0200
Subject: [PATCH 0623/1802] [Wallet] comsetic non-code changes for the HD
 feature

---
 qa/rpc-tests/wallet-hd.py | 4 ++--
 src/wallet/rpcwallet.cpp  | 4 ++--
 src/wallet/wallet.h       | 6 +++---
 src/wallet/walletdb.h     | 4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/qa/rpc-tests/wallet-hd.py b/qa/rpc-tests/wallet-hd.py
index f3ae69e1062d5..c738ee2207e5a 100755
--- a/qa/rpc-tests/wallet-hd.py
+++ b/qa/rpc-tests/wallet-hd.py
@@ -47,10 +47,10 @@ def run_test (self):
         self.nodes[0].generate(101)
         hd_add = None
         num_hd_adds = 300
-        for _ in range(num_hd_adds):
+        for i in range(num_hd_adds):
             hd_add = self.nodes[1].getnewaddress()
             hd_info = self.nodes[1].validateaddress(hd_add)
-            assert_equal(hd_info["hdkeypath"], "m/0'/0'/"+str(_+1)+"'")
+            assert_equal(hd_info["hdkeypath"], "m/0'/0'/"+str(i+1)+"'")
             assert_equal(hd_info["hdmasterkeyid"], masterkeyid)
             self.nodes[0].sendtoaddress(hd_add, 1)
             self.nodes[0].generate(1)
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index f4625743b3583..960d193e5d4d5 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -2269,7 +2269,7 @@ UniValue getwalletinfo(const UniValue& params, bool fHelp)
             "  \"keypoolsize\": xxxx,        (numeric) how many new keys are pre-generated\n"
             "  \"unlocked_until\": ttt,      (numeric) the timestamp in seconds since epoch (midnight Jan 1 1970 GMT) that the wallet is unlocked for transfers, or 0 if the wallet is locked\n"
             "  \"paytxfee\": x.xxxx,         (numeric) the transaction fee configuration, set in " + CURRENCY_UNIT + "/kB\n"
-            "  \"masterkeyid\": \"<hash160>\", (string) the Hash160 of the hd master pubkey\n"
+            "  \"masterkeyid\": \"<hash160>\", (string) the Hash160 of the HD master pubkey\n"
             "}\n"
             "\nExamples:\n"
             + HelpExampleCli("getwalletinfo", "")
@@ -2291,7 +2291,7 @@ UniValue getwalletinfo(const UniValue& params, bool fHelp)
     obj.push_back(Pair("paytxfee",      ValueFromAmount(payTxFee.GetFeePerK())));
     CKeyID masterKeyID = pwalletMain->GetHDChain().masterKeyID;
     if (!masterKeyID.IsNull())
-         obj.push_back(Pair("masterkeyid",masterKeyID.GetHex()));
+         obj.push_back(Pair("masterkeyid", masterKeyID.GetHex()));
     return obj;
 }
 
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
index d58cb7b0e4fdd..e9d669a7d1e30 100644
--- a/src/wallet/wallet.h
+++ b/src/wallet/wallet.h
@@ -577,7 +577,7 @@ class CWallet : public CCryptoKeyStore, public CValidationInterface
 
     void SyncMetaData(std::pair<TxSpends::iterator, TxSpends::iterator>);
 
-    /* the hd chain data model (external chain counters) */
+    /* the HD chain data model (external chain counters) */
     CHDChain hdChain;
 
 public:
@@ -896,10 +896,10 @@ class CWallet : public CCryptoKeyStore, public CValidationInterface
 
     bool BackupWallet(const std::string& strDest);
 
-    /* Set the hd chain model (chain child index counters) */
+    /* Set the HD chain model (chain child index counters) */
     bool SetHDChain(const CHDChain& chain, bool memonly);
 
-    /* Set the current hd master key (will reset the chain child index counters) */
+    /* Set the current HD master key (will reset the chain child index counters) */
     bool SetHDMasterKey(const CKey& key);
     const CHDChain& GetHDChain() { return hdChain; }
 };
diff --git a/src/wallet/walletdb.h b/src/wallet/walletdb.h
index 42179f2288782..5addd5c5c0225 100644
--- a/src/wallet/walletdb.h
+++ b/src/wallet/walletdb.h
@@ -41,7 +41,7 @@ enum DBErrors
     DB_NEED_REWRITE
 };
 
-/* simple hd chain data model */
+/* simple HD chain data model */
 class CHDChain
 {
 public:
@@ -79,7 +79,7 @@ class CKeyMetadata
     int nVersion;
     int64_t nCreateTime; // 0 means unknown
     std::string hdKeypath; //optional HD/bip32 keypath
-    CKeyID hdMasterKeyID; //id of the hd masterkey used to derive this key
+    CKeyID hdMasterKeyID; //id of the HD masterkey used to derive this key
 
     CKeyMetadata()
     {

From fae596f0e421148b797197baff089a87b3193dbd Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Thu, 30 Jun 2016 14:49:59 +0200
Subject: [PATCH 0624/1802] [qa] Sort scripts by time for pull_tester and don't
 overwrite setup_chain

---
 qa/pull-tester/rpc-tests.py | 5 +++--
 qa/rpc-tests/p2p-mempool.py | 7 +++++--
 qa/rpc-tests/p2p-segwit.py  | 7 +++++--
 qa/rpc-tests/segwit.py      | 7 ++++---
 4 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/qa/pull-tester/rpc-tests.py b/qa/pull-tester/rpc-tests.py
index 37979a933fc29..2aa131041a02b 100755
--- a/qa/pull-tester/rpc-tests.py
+++ b/qa/pull-tester/rpc-tests.py
@@ -110,6 +110,8 @@
     'receivedby.py',
     'mempool_resurrect_test.py',
     'txn_doublespend.py --mineblock',
+    'p2p-segwit.py',
+    'segwit.py',
     'txn_clone.py',
     'getchaintips.py',
     'rawtransactions.py',
@@ -131,13 +133,12 @@
     'disablewallet.py',
     'sendheaders.py',
     'keypool.py',
+    'p2p-mempool.py',
     'prioritise_transaction.py',
     'invalidblockrequest.py',
     'invalidtxrequest.py',
     'abandonconflict.py',
     'p2p-versionbits-warning.py',
-    'p2p-segwit.py',
-    'segwit.py',
     'importprunedfunds.py',
     'signmessages.py',
 ]
diff --git a/qa/rpc-tests/p2p-mempool.py b/qa/rpc-tests/p2p-mempool.py
index 5d2daf39f8288..5c5d778f429b9 100755
--- a/qa/rpc-tests/p2p-mempool.py
+++ b/qa/rpc-tests/p2p-mempool.py
@@ -72,8 +72,11 @@ def send_mempool(self):
         self.send_message(msg_mempool())
 
 class P2PMempoolTests(BitcoinTestFramework):
-    def setup_chain(self):
-        initialize_chain_clean(self.options.tmpdir, 2)
+
+    def __init__(self):
+        super().__init__()
+        self.setup_clean_chain = True
+        self.num_nodes = 2
 
     def setup_network(self):
         # Start a node with maxuploadtarget of 200 MB (/24h)
diff --git a/qa/rpc-tests/p2p-segwit.py b/qa/rpc-tests/p2p-segwit.py
index cf78954f286bc..c67b7724516aa 100755
--- a/qa/rpc-tests/p2p-segwit.py
+++ b/qa/rpc-tests/p2p-segwit.py
@@ -163,8 +163,11 @@ def __init__(self, sha256, n, nValue):
 
 
 class SegWitTest(BitcoinTestFramework):
-    def setup_chain(self):
-        initialize_chain_clean(self.options.tmpdir, 3)
+
+    def __init__(self):
+        super().__init__()
+        self.setup_clean_chain = True
+        self.num_nodes = 3
 
     def add_options(self, parser):
         parser.add_option("--oldbinary", dest="oldbinary",
diff --git a/qa/rpc-tests/segwit.py b/qa/rpc-tests/segwit.py
index d4c9a8afed32c..f88230cbb9892 100755
--- a/qa/rpc-tests/segwit.py
+++ b/qa/rpc-tests/segwit.py
@@ -71,9 +71,10 @@ def getutxo(txid):
 
 class SegWitTest(BitcoinTestFramework):
 
-    def setup_chain(self):
-        print("Initializing test directory "+self.options.tmpdir)
-        initialize_chain_clean(self.options.tmpdir, 3)
+    def __init__(self):
+        super().__init__()
+        self.setup_clean_chain = True
+        self.num_nodes = 3
 
     def setup_network(self):
         self.nodes = []

From a3e19846519952a3d22e387031258a88ec24d280 Mon Sep 17 00:00:00 2001
From: NicolasDorier <nicolas.dorier@gmail.com>
Date: Fri, 15 Jul 2016 14:20:13 +0900
Subject: [PATCH 0625/1802] Consensus: Trivial transform BOOST_FOREACH into for
 loop

---
 src/main.cpp | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index 62f1cd1517722..5e8a6d50fb24b 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -785,7 +785,7 @@ bool IsFinalTx(const CTransaction &tx, int nBlockHeight, int64_t nBlockTime)
         return true;
     if ((int64_t)tx.nLockTime < ((int64_t)tx.nLockTime < LOCKTIME_THRESHOLD ? (int64_t)nBlockHeight : nBlockTime))
         return true;
-    BOOST_FOREACH(const CTxIn& txin, tx.vin) {
+    for (const auto& txin : tx.vin) {
         if (!(txin.nSequence == CTxIn::SEQUENCE_FINAL))
             return false;
     }
@@ -999,11 +999,11 @@ bool CheckSequenceLocks(const CTransaction &tx, int flags, LockPoints* lp, bool
 unsigned int GetLegacySigOpCount(const CTransaction& tx)
 {
     unsigned int nSigOps = 0;
-    BOOST_FOREACH(const CTxIn& txin, tx.vin)
+    for (const auto& txin : tx.vin)
     {
         nSigOps += txin.scriptSig.GetSigOpCount(false);
     }
-    BOOST_FOREACH(const CTxOut& txout, tx.vout)
+    for (const auto& txout : tx.vout)
     {
         nSigOps += txout.scriptPubKey.GetSigOpCount(false);
     }
@@ -1061,7 +1061,7 @@ bool CheckTransaction(const CTransaction& tx, CValidationState &state)
 
     // Check for negative or overflow output values
     CAmount nValueOut = 0;
-    BOOST_FOREACH(const CTxOut& txout, tx.vout)
+    for (const auto& txout : tx.vout)
     {
         if (txout.nValue < 0)
             return state.DoS(100, false, REJECT_INVALID, "bad-txns-vout-negative");
@@ -1074,7 +1074,7 @@ bool CheckTransaction(const CTransaction& tx, CValidationState &state)
 
     // Check for duplicate inputs
     set<COutPoint> vInOutPoints;
-    BOOST_FOREACH(const CTxIn& txin, tx.vin)
+    for (const auto& txin : tx.vin)
     {
         if (vInOutPoints.count(txin.prevout))
             return state.DoS(100, false, REJECT_INVALID, "bad-txns-inputs-duplicate");
@@ -1088,7 +1088,7 @@ bool CheckTransaction(const CTransaction& tx, CValidationState &state)
     }
     else
     {
-        BOOST_FOREACH(const CTxIn& txin, tx.vin)
+        for (const auto& txin : tx.vin)
             if (txin.prevout.IsNull())
                 return state.DoS(10, false, REJECT_INVALID, "bad-txns-prevout-null");
     }
@@ -3401,13 +3401,13 @@ bool CheckBlock(const CBlock& block, CValidationState& state, const Consensus::P
             return state.DoS(100, false, REJECT_INVALID, "bad-cb-multiple", false, "more than one coinbase");
 
     // Check transactions
-    BOOST_FOREACH(const CTransaction& tx, block.vtx)
+    for (const auto& tx : block.vtx)
         if (!CheckTransaction(tx, state))
             return state.Invalid(false, state.GetRejectCode(), state.GetRejectReason(),
                                  strprintf("Transaction check failed (tx hash %s) %s", tx.GetHash().ToString(), state.GetDebugMessage()));
 
     unsigned int nSigOps = 0;
-    BOOST_FOREACH(const CTransaction& tx, block.vtx)
+    for (const auto& tx : block.vtx)
     {
         nSigOps += GetLegacySigOpCount(tx);
     }
@@ -3538,7 +3538,7 @@ bool ContextualCheckBlock(const CBlock& block, CValidationState& state, CBlockIn
                               : block.GetBlockTime();
 
     // Check that all transactions are finalized
-    BOOST_FOREACH(const CTransaction& tx, block.vtx) {
+    for (const auto& tx : block.vtx) {
         if (!IsFinalTx(tx, nHeight, nLockTimeCutoff)) {
             return state.DoS(10, false, REJECT_INVALID, "bad-txns-nonfinal", false, "non-final transaction");
         }

From 6f3d616dc8d6840c2293ffadd8cc3209f1100193 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jorge=20Tim=C3=B3n?= <jtimon@jtimon.cc>
Date: Sun, 17 Jul 2016 01:34:35 +0200
Subject: [PATCH 0626/1802] Trivial: Make CBlockIndex param const in
 ContextualCheckBlockHeader and ContextualCheckBlock

---
 src/main.cpp | 4 ++--
 src/main.h   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index 62f1cd1517722..34ab23914cb15 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -3499,7 +3499,7 @@ std::vector<unsigned char> GenerateCoinbaseCommitment(CBlock& block, const CBloc
     return commitment;
 }
 
-bool ContextualCheckBlockHeader(const CBlockHeader& block, CValidationState& state, const Consensus::Params& consensusParams, CBlockIndex * const pindexPrev, int64_t nAdjustedTime)
+bool ContextualCheckBlockHeader(const CBlockHeader& block, CValidationState& state, const Consensus::Params& consensusParams, const CBlockIndex* pindexPrev, int64_t nAdjustedTime)
 {
     // Check proof of work
     if (block.nBits != GetNextWorkRequired(pindexPrev, &block, consensusParams))
@@ -3522,7 +3522,7 @@ bool ContextualCheckBlockHeader(const CBlockHeader& block, CValidationState& sta
     return true;
 }
 
-bool ContextualCheckBlock(const CBlock& block, CValidationState& state, CBlockIndex * const pindexPrev)
+bool ContextualCheckBlock(const CBlock& block, CValidationState& state, const CBlockIndex* pindexPrev)
 {
     const int nHeight = pindexPrev == NULL ? 0 : pindexPrev->nHeight + 1;
     const Consensus::Params& consensusParams = Params().GetConsensus();
diff --git a/src/main.h b/src/main.h
index 7ea570d859792..561f2eceea4d8 100644
--- a/src/main.h
+++ b/src/main.h
@@ -444,8 +444,8 @@ bool CheckBlock(const CBlock& block, CValidationState& state, const Consensus::P
 /** Context-dependent validity checks.
  *  By "context", we mean only the previous block headers, but not the UTXO
  *  set; UTXO-related validity checks are done in ConnectBlock(). */
-bool ContextualCheckBlockHeader(const CBlockHeader& block, CValidationState& state, const Consensus::Params& consensusParams, CBlockIndex* pindexPrev, int64_t nAdjustedTime);
-bool ContextualCheckBlock(const CBlock& block, CValidationState& state, CBlockIndex *pindexPrev);
+bool ContextualCheckBlockHeader(const CBlockHeader& block, CValidationState& state, const Consensus::Params& consensusParams, const CBlockIndex* pindexPrev, int64_t nAdjustedTime);
+bool ContextualCheckBlock(const CBlock& block, CValidationState& state, const CBlockIndex* pindexPrev);
 
 /** Apply the effects of this block (with given index) on the UTXO set represented by coins.
  *  Validity checks that depend on the UTXO set are also done; ConnectBlock()

From 38c4c8b7012ceeee3b6591d6a80b5f13ee20fbd6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jorge=20Tim=C3=B3n?= <jtimon@jtimon.cc>
Date: Sun, 17 Jul 2016 02:34:06 +0200
Subject: [PATCH 0627/1802] Trivial: Segwit: Don't call IsWitnessEnabled from
 ContextualCheckBlock

---
 src/main.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main.cpp b/src/main.cpp
index 62f1cd1517722..21092ca2db665 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -3564,7 +3564,7 @@ bool ContextualCheckBlock(const CBlock& block, CValidationState& state, CBlockIn
     //   {0xaa, 0x21, 0xa9, 0xed}, and the following 32 bytes are SHA256^2(witness root, witness nonce). In case there are
     //   multiple, the last one is used.
     bool fHaveWitness = false;
-    if (IsWitnessEnabled(pindexPrev, consensusParams)) {
+    if (VersionBitsState(pindexPrev, consensusParams, Consensus::DEPLOYMENT_SEGWIT, versionbitscache) == THRESHOLD_ACTIVE) {
         int commitpos = GetWitnessCommitmentIndex(block);
         if (commitpos != -1) {
             bool malleated = false;

From faa59318db48a0acc4b0ccff56b63cc05455c61f Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Mon, 18 Jul 2016 10:55:46 +0200
Subject: [PATCH 0628/1802] [doc] gbuild: Set memory explicitly (default is too
 low)

---
 doc/release-process.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/release-process.md b/doc/release-process.md
index 35ee1edae1175..41c1ac8556b1a 100644
--- a/doc/release-process.md
+++ b/doc/release-process.md
@@ -112,16 +112,16 @@ The gbuild invocations below <b>DO NOT DO THIS</b> by default.
 ### Build and sign Bitcoin Core for Linux, Windows, and OS X:
 
     pushd ./gitian-builder
-    ./bin/gbuild --commit bitcoin=v${VERSION} ../bitcoin/contrib/gitian-descriptors/gitian-linux.yml
+    ./bin/gbuild --memory 3000 --commit bitcoin=v${VERSION} ../bitcoin/contrib/gitian-descriptors/gitian-linux.yml
     ./bin/gsign --signer $SIGNER --release ${VERSION}-linux --destination ../gitian.sigs/ ../bitcoin/contrib/gitian-descriptors/gitian-linux.yml
     mv build/out/bitcoin-*.tar.gz build/out/src/bitcoin-*.tar.gz ../
 
-    ./bin/gbuild --commit bitcoin=v${VERSION} ../bitcoin/contrib/gitian-descriptors/gitian-win.yml
+    ./bin/gbuild --memory 3000 --commit bitcoin=v${VERSION} ../bitcoin/contrib/gitian-descriptors/gitian-win.yml
     ./bin/gsign --signer $SIGNER --release ${VERSION}-win-unsigned --destination ../gitian.sigs/ ../bitcoin/contrib/gitian-descriptors/gitian-win.yml
     mv build/out/bitcoin-*-win-unsigned.tar.gz inputs/bitcoin-win-unsigned.tar.gz
     mv build/out/bitcoin-*.zip build/out/bitcoin-*.exe ../
 
-    ./bin/gbuild --commit bitcoin=v${VERSION} ../bitcoin/contrib/gitian-descriptors/gitian-osx.yml
+    ./bin/gbuild --memory 3000 --commit bitcoin=v${VERSION} ../bitcoin/contrib/gitian-descriptors/gitian-osx.yml
     ./bin/gsign --signer $SIGNER --release ${VERSION}-osx-unsigned --destination ../gitian.sigs/ ../bitcoin/contrib/gitian-descriptors/gitian-osx.yml
     mv build/out/bitcoin-*-osx-unsigned.tar.gz inputs/bitcoin-osx-unsigned.tar.gz
     mv build/out/bitcoin-*.tar.gz build/out/bitcoin-*.dmg ../

From 8cef5bd58ac33ad4207d00c0696438706e8f035e Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Mon, 18 Jul 2016 10:56:25 +0200
Subject: [PATCH 0629/1802] mining: Improve `-blockmaxcost` help message

One-word replacement to #8354.
---
 src/init.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/init.cpp b/src/init.cpp
index d127ecd48f551..509bc45f516db 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -452,7 +452,7 @@ std::string HelpMessage(HelpMessageMode mode)
     strUsage += HelpMessageOpt("-mempoolreplacement", strprintf(_("Enable transaction replacement in the memory pool (default: %u)"), DEFAULT_ENABLE_REPLACEMENT));
 
     strUsage += HelpMessageGroup(_("Block creation options:"));
-    strUsage += HelpMessageOpt("-blockmaxcost=<n>", strprintf(_("Set maximum block cost (default: %d)"), DEFAULT_BLOCK_MAX_COST));
+    strUsage += HelpMessageOpt("-blockmaxcost=<n>", strprintf(_("Set maximum BIP141 block cost (default: %d)"), DEFAULT_BLOCK_MAX_COST));
     strUsage += HelpMessageOpt("-blockmaxsize=<n>", strprintf(_("Set maximum block size in bytes (default: %d)"), DEFAULT_BLOCK_MAX_SIZE));
     strUsage += HelpMessageOpt("-blockprioritysize=<n>", strprintf(_("Set maximum size of high-priority/low-fee transactions in bytes (default: %d)"), DEFAULT_BLOCK_PRIORITY_SIZE));
     if (showDebug)

From e4382fbef56a0e04b0ed834e8b3a3a16f81db149 Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Mon, 18 Jul 2016 10:12:16 +0000
Subject: [PATCH 0630/1802] qt: periodic translations update

---
 src/qt/bitcoinstrings.cpp      |  3 +-
 src/qt/locale/bitcoin_de.ts    |  4 ++
 src/qt/locale/bitcoin_en.ts    | 43 +++++++++-----------
 src/qt/locale/bitcoin_es_MX.ts | 12 ++++++
 src/qt/locale/bitcoin_es_UY.ts |  2 +-
 src/qt/locale/bitcoin_fa.ts    | 74 ++++++++++++++++++++++++++++++++--
 src/qt/locale/bitcoin_pl.ts    |  2 +-
 src/qt/locale/bitcoin_pt_BR.ts |  4 ++
 src/qt/locale/bitcoin_pt_PT.ts |  8 ++++
 src/qt/locale/bitcoin_tr.ts    | 32 +++++++++++++++
 10 files changed, 153 insertions(+), 31 deletions(-)

diff --git a/src/qt/bitcoinstrings.cpp b/src/qt/bitcoinstrings.cpp
index 9c5b1e09d4524..bca5b72827f31 100644
--- a/src/qt/bitcoinstrings.cpp
+++ b/src/qt/bitcoinstrings.cpp
@@ -311,9 +311,8 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Send trace/debug info to console instead of d
 QT_TRANSLATE_NOOP("bitcoin-core", "Send transactions as zero-fee transactions if possible (default: %u)"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Set database cache size in megabytes (%d to %d, default: %d)"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Set key pool size to <n> (default: %u)"),
-QT_TRANSLATE_NOOP("bitcoin-core", "Set maximum block cost (default: %d)"),
+QT_TRANSLATE_NOOP("bitcoin-core", "Set maximum BIP141 block cost (default: %d)"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Set maximum block size in bytes (default: %d)"),
-QT_TRANSLATE_NOOP("bitcoin-core", "Set minimum block size in bytes (default: %u)"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Set the number of threads to service RPC calls (default: %d)"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Show all debugging options (usage: --help -help-debug)"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Shrink debug.log file on client startup (default: 1 when no -debug)"),
diff --git a/src/qt/locale/bitcoin_de.ts b/src/qt/locale/bitcoin_de.ts
index f38f4c10f7148..2708324d172e1 100644
--- a/src/qt/locale/bitcoin_de.ts
+++ b/src/qt/locale/bitcoin_de.ts
@@ -2006,6 +2006,10 @@
         <source>Only connect to nodes in network &lt;net&gt; (ipv4, ipv6 or onion)</source>
         <translation>Nur zu Knoten des Netzwerktyps &lt;net&gt; verbinden (ipv4, ipv6 oder onion)</translation>
     </message>
+    <message>
+        <source>Print this help message and exit</source>
+        <translation>Drucke diese Hilfemeldung und beende</translation>
+    </message>
     <message>
         <source>Print version and exit</source>
         <translation>Gibt die Versionsnummer aus und beendet das Programm</translation>
diff --git a/src/qt/locale/bitcoin_en.ts b/src/qt/locale/bitcoin_en.ts
index c6f3a4013c48e..79c3e87b2b10a 100644
--- a/src/qt/locale/bitcoin_en.ts
+++ b/src/qt/locale/bitcoin_en.ts
@@ -1218,12 +1218,12 @@
         <translation type="unfinished">Amount</translation>
     </message>
     <message>
-        <location filename="../guiutil.cpp" line="+118"/>
+        <location filename="../guiutil.cpp" line="+135"/>
         <source>Enter a Bitcoin address (e.g. %1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+763"/>
+        <location line="+764"/>
         <source>%1 d</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2231,22 +2231,22 @@
         <translation>Options:</translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+30"/>
         <source>Specify data directory</source>
         <translation>Specify data directory</translation>
     </message>
     <message>
-        <location line="-90"/>
+        <location line="-89"/>
         <source>Connect to a node to retrieve peer addresses, and disconnect</source>
         <translation>Connect to a node to retrieve peer addresses, and disconnect</translation>
     </message>
     <message>
-        <location line="+93"/>
+        <location line="+92"/>
         <source>Specify your own public address</source>
         <translation>Specify your own public address</translation>
     </message>
     <message>
-        <location line="-109"/>
+        <location line="-108"/>
         <source>Accept command line and JSON-RPC commands</source>
         <translation>Accept command line and JSON-RPC commands</translation>
     </message>
@@ -2296,12 +2296,12 @@
         <translation>Run in the background as a daemon and accept commands</translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+30"/>
         <source>Unable to start HTTP server. See debug log for details.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-122"/>
+        <location line="-121"/>
         <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
         <translation>Accept connections from outside (default: 1 if no -proxy or -connect)</translation>
     </message>
@@ -2686,17 +2686,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Set maximum block cost (default: %d)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
+        <location line="+3"/>
         <source>Set maximum block size in bytes (default: %d)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="+9"/>
         <source>Specify wallet file (within data directory)</source>
         <translation>Specify wallet file (within data directory)</translation>
     </message>
@@ -2766,7 +2761,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-322"/>
+        <location line="-321"/>
         <source>Allow JSON-RPC connections from specified source. Valid for &lt;ip&gt; are a single IP (e.g. 1.2.3.4), a network/netmask (e.g. 1.2.3.4/255.255.255.0) or a network/CIDR (e.g. 1.2.3.4/24). This option can be specified multiple times</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2946,7 +2941,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+3"/>
+        <source>Set maximum BIP141 block cost (default: %d)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
         <source>Show all debugging options (usage: --help -help-debug)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3041,7 +3041,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-66"/>
+        <location line="-65"/>
         <source>Password for JSON-RPC connections</source>
         <translation>Password for JSON-RPC connections</translation>
     </message>
@@ -3227,11 +3227,6 @@
     </message>
     <message>
         <location line="+3"/>
-        <source>Set minimum block size in bytes (default: %u)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
         <source>Set the number of threads to service RPC calls (default: %d)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3266,7 +3261,7 @@
         <translation>Unknown network specified in -onlynet: &apos;%s&apos;</translation>
     </message>
     <message>
-        <location line="-74"/>
+        <location line="-73"/>
         <source>Insufficient funds</source>
         <translation>Insufficient funds</translation>
     </message>
diff --git a/src/qt/locale/bitcoin_es_MX.ts b/src/qt/locale/bitcoin_es_MX.ts
index 26432190a27cd..0a6ea1e1dd112 100644
--- a/src/qt/locale/bitcoin_es_MX.ts
+++ b/src/qt/locale/bitcoin_es_MX.ts
@@ -44,6 +44,10 @@
 </context>
 <context>
     <name>AskPassphraseDialog</name>
+    <message>
+        <source>Passphrase Dialog</source>
+        <translation>Dialogo de contraseña</translation>
+    </message>
     <message>
         <source>Enter passphrase</source>
         <translation>Ingrese la contraseña</translation>
@@ -59,6 +63,10 @@
 </context>
 <context>
     <name>BanTableModel</name>
+    <message>
+        <source>IP/Netmask</source>
+        <translation>IP/Máscara de red</translation>
+    </message>
     </context>
 <context>
     <name>BitcoinGUI</name>
@@ -178,6 +186,10 @@
         <source>&amp;Receive</source>
         <translation>&amp;Recibir</translation>
     </message>
+    <message>
+        <source>&amp;Show / Hide</source>
+        <translation>&amp;Mostrar / Ocultar</translation>
+    </message>
     <message>
         <source>&amp;File</source>
         <translation>&amp;Archivo</translation>
diff --git a/src/qt/locale/bitcoin_es_UY.ts b/src/qt/locale/bitcoin_es_UY.ts
index 8d361620de1b3..c565a63cd885f 100644
--- a/src/qt/locale/bitcoin_es_UY.ts
+++ b/src/qt/locale/bitcoin_es_UY.ts
@@ -108,7 +108,7 @@
     </message>
     <message>
         <source>Send coins to a Bitcoin address</source>
-        <translation>Enviar monedas a una dirección BItCoin</translation>
+        <translation>Enviar monedas a una dirección Bitcoin</translation>
     </message>
     <message>
         <source>Change the passphrase used for wallet encryption</source>
diff --git a/src/qt/locale/bitcoin_fa.ts b/src/qt/locale/bitcoin_fa.ts
index 8bf727a0cd645..98543ded461bb 100644
--- a/src/qt/locale/bitcoin_fa.ts
+++ b/src/qt/locale/bitcoin_fa.ts
@@ -67,7 +67,11 @@
         <source>IP/Netmask</source>
         <translation>آی‌پی/نت‌ماسک</translation>
     </message>
-    </context>
+    <message>
+        <source>Banned Until</source>
+        <translation>مسدود شده تا</translation>
+    </message>
+</context>
 <context>
     <name>BitcoinGUI</name>
     <message>
@@ -110,6 +114,10 @@
         <source>&amp;About %1</source>
         <translation>&amp;حدود%1</translation>
     </message>
+    <message>
+        <source>Show information about %1</source>
+        <translation>نمایش اطلاعات دربارهٔ %1</translation>
+    </message>
     <message>
         <source>About &amp;Qt</source>
         <translation>دربارهٔ &amp;کیوت</translation>
@@ -510,6 +518,10 @@
     </context>
 <context>
     <name>OpenURIDialog</name>
+    <message>
+        <source>Open URI</source>
+        <translation>بازکردن آدرس</translation>
+    </message>
     </context>
 <context>
     <name>OptionsDialog</name>
@@ -525,6 +537,10 @@
         <source>Accept connections from outside</source>
         <translation>پذیرش اتصالات از بیرون</translation>
     </message>
+    <message>
+        <source>Allow incoming connections</source>
+        <translation>اجازه دادن به اتصالات دریافتی</translation>
+    </message>
     <message>
         <source>Reset all client options to default.</source>
         <translation>بازنشانی تمام تنظیمات به پیش‌فرض.</translation>
@@ -691,7 +707,11 @@
     </context>
 <context>
     <name>PeerTableModel</name>
-    </context>
+    <message>
+        <source>Ping Time</source>
+        <translation>زمان پینگ</translation>
+    </message>
+</context>
 <context>
     <name>QObject</name>
     <message>
@@ -797,6 +817,14 @@
         <source>Last Receive</source>
         <translation>آخرین دریافتی</translation>
     </message>
+    <message>
+        <source>Ping Time</source>
+        <translation>زمان پینگ</translation>
+    </message>
+    <message>
+        <source>Ping Wait</source>
+        <translation>انتظار پینگ</translation>
+    </message>
     <message>
         <source>Last block time</source>
         <translation>زمان آخرین بلوک</translation>
@@ -833,6 +861,22 @@
         <source>Type &lt;b&gt;help&lt;/b&gt; for an overview of available commands.</source>
         <translation>برای نمایش یک مرور کلی از دستورات ممکن، عبارت &lt;b&gt;help&lt;/b&gt; را بنویسید.</translation>
     </message>
+    <message>
+        <source>%1 B</source>
+        <translation>%1 بایت</translation>
+    </message>
+    <message>
+        <source>%1 KB</source>
+        <translation>%1 کیلوبایت</translation>
+    </message>
+    <message>
+        <source>%1 MB</source>
+        <translation>%1 مگابایت</translation>
+    </message>
+    <message>
+        <source>%1 GB</source>
+        <translation>%1 گیگابایت</translation>
+    </message>
     <message>
         <source>never</source>
         <translation>هرگز</translation>
@@ -887,7 +931,11 @@
         <source>Copy &amp;Address</source>
         <translation>&amp;کپی نشانی</translation>
     </message>
-    </context>
+    <message>
+        <source>&amp;Save Image...</source>
+        <translation>&amp;ذخیره عکس...</translation>
+    </message>
+</context>
 <context>
     <name>SendCoinsDialog</name>
     <message>
@@ -934,6 +982,18 @@
         <source>Hide</source>
         <translation>پنهان کردن</translation>
     </message>
+    <message>
+        <source>Recommended:</source>
+        <translation>توصیه شده:</translation>
+    </message>
+    <message>
+        <source>Custom:</source>
+        <translation>سفارشی:</translation>
+    </message>
+    <message>
+        <source>Confirmation time:</source>
+        <translation>روز تایید:</translation>
+    </message>
     <message>
         <source>normal</source>
         <translation>نرمال</translation>
@@ -1024,6 +1084,10 @@
 </context>
 <context>
     <name>ShutdownWindow</name>
+    <message>
+        <source>%1 is shutting down...</source>
+        <translation>%1 در حال خاموش شدن است...</translation>
+    </message>
     </context>
 <context>
     <name>SignVerifyMessageDialog</name>
@@ -1250,6 +1314,10 @@
         <source>Wallet options:</source>
         <translation>گزینه‌های کیف پول:</translation>
     </message>
+    <message>
+        <source>(default: %u)</source>
+        <translation>(پیش‌فرض %u)</translation>
+    </message>
     <message>
         <source>Information</source>
         <translation>اطلاعات</translation>
diff --git a/src/qt/locale/bitcoin_pl.ts b/src/qt/locale/bitcoin_pl.ts
index a88e505b398b4..09f748b83cbf8 100644
--- a/src/qt/locale/bitcoin_pl.ts
+++ b/src/qt/locale/bitcoin_pl.ts
@@ -300,7 +300,7 @@
     </message>
     <message>
         <source>%1 behind</source>
-        <translation>%1 wstecz</translation>
+        <translation>%1 za</translation>
     </message>
     <message>
         <source>Last received block was generated %1 ago.</source>
diff --git a/src/qt/locale/bitcoin_pt_BR.ts b/src/qt/locale/bitcoin_pt_BR.ts
index 29414303920ed..ee48c673413da 100644
--- a/src/qt/locale/bitcoin_pt_BR.ts
+++ b/src/qt/locale/bitcoin_pt_BR.ts
@@ -1894,6 +1894,10 @@
         <source>Append comment to the user agent string</source>
         <translation>Adiciona comentário ao user-agent do navegador</translation>
     </message>
+    <message>
+        <source>Attempt to recover private keys from a corrupt wallet on startup</source>
+        <translation>Tentando recuperar a chape privada da carteira corrompida ao inicializar</translation>
+    </message>
     <message>
         <source>Block creation options:</source>
         <translation>Opções de criação de blocos:</translation>
diff --git a/src/qt/locale/bitcoin_pt_PT.ts b/src/qt/locale/bitcoin_pt_PT.ts
index f63bfece69cc5..eed262e010ee6 100644
--- a/src/qt/locale/bitcoin_pt_PT.ts
+++ b/src/qt/locale/bitcoin_pt_PT.ts
@@ -617,6 +617,10 @@
         <source>&amp;Main</source>
         <translation>&amp;Principal</translation>
     </message>
+    <message>
+        <source>Automatically start %1 after logging in to the system.</source>
+        <translation>Começar o %1 automaticamente ao iniciar a sessão no sistema.</translation>
+    </message>
     <message>
         <source>&amp;Start %1 on system login</source>
         <translation>&amp;Iniciar o %1 no início de sessão do sistema</translation>
@@ -1831,6 +1835,10 @@
         <source>Append comment to the user agent string</source>
         <translation>Anexar um comentário para a entrada de agente do utilizador</translation>
     </message>
+    <message>
+        <source>Attempt to recover private keys from a corrupt wallet on startup</source>
+        <translation>Tentar reuperar as chaves privadas de um "wallet" ao iniciar</translation>
+    </message>
     <message>
         <source>Block creation options:</source>
         <translation>Opções da criação de bloco:</translation>
diff --git a/src/qt/locale/bitcoin_tr.ts b/src/qt/locale/bitcoin_tr.ts
index bbd0117404c22..e3a811b504e99 100644
--- a/src/qt/locale/bitcoin_tr.ts
+++ b/src/qt/locale/bitcoin_tr.ts
@@ -1830,6 +1830,10 @@
         <source>Distributed under the MIT software license, see the accompanying file COPYING or &lt;http://www.opensource.org/licenses/mit-license.php&gt;.</source>
         <translation>MIT yazılım lisansı kapsamında yayınlanmıştır, ekteki COPYING dosyasına ya da &lt;http://www.opensource.org/licenses/mit-license.php&gt; adresine bakınız.</translation>
     </message>
+    <message>
+        <source>Error loading %s: You can't enable HD on a already existing non-HD wallet</source>
+        <translation>%s yüklenmesinde hata: zaten var olan ve HD olmayan bir cüzdanda HD etkinleştirilemez.</translation>
+    </message>
     <message>
         <source>Error reading %s! All keys read correctly, but transaction data or address book entries might be missing or incorrect.</source>
         <translation>%s dosyasının okunması sırasında bir hata meydana geldi! Tüm anahtarlar doğru bir şekilde okundu, ancak muamele verileri ya da adres defteri unsurları hatalı veya eksik olabilir.</translation>
@@ -1854,6 +1858,10 @@
         <source>Please check that your computer's date and time are correct! If your clock is wrong, %s will not work properly.</source>
         <translation>Lütfen bilgisayarınızın saat ve tarihinin doğru olduğunu kontrol ediniz! Saatinizde gecikme varsa %s doğru şekilde çalışamaz.</translation>
     </message>
+    <message>
+        <source>Please contribute if you find %s useful. Visit %s for further information about the software.</source>
+        <translation>%s programını faydalı buluyorsanız lütfen katkıda bulununuz. Yazılım hakkında daha fazla bilgi için %s adresini ziyaret ediniz.</translation>
+    </message>
     <message>
         <source>Set the number of script verification threads (%u to %d, 0 = auto, &lt;0 = leave that many cores free, default: %d)</source>
         <translation>Betik kontrolü iş parçacıklarının sayısını belirler (%u ilâ %d, 0 = otomatik, &lt;0 = bu sayıda çekirdeği kullanma, varsayılan: %d)</translation>
@@ -1866,6 +1874,10 @@
         <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
         <translation>Bu yayın öncesi bir deneme sürümüdür - tüm riski siz üstlenmiş olursunuz - bitcoin oluşturmak ya da ticari uygulamalar için kullanmayınız</translation>
     </message>
+    <message>
+        <source>Unable to rewind the database to a pre-fork state. You will need to redownload the blockchain</source>
+        <translation>Veritabanını çatallama öncesi duruma geri sarmak mümkün değil. Blok zincirini tekrar indirmeniz gerekmektedir</translation>
+    </message>
     <message>
         <source>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</source>
         <translation>Dinlenecek portu haritalamak için UPnP kullan (varsayılan: dinlenildiğinde ve -proxy olmadığında 1)</translation>
@@ -1986,6 +1998,10 @@
         <source>Error loading %s: Wallet requires newer version of %s</source>
         <translation>%s unsurunun yüklenmesinde hata oluştu: cüzdan %s programının yeni bir sürümüne ihtiyaç duyuyor</translation>
     </message>
+    <message>
+        <source>Error loading %s: You can't disable HD on a already existing HD wallet</source>
+        <translation>%s yüklenmesinde hata: zaten var olan HD bir cüzdanda HD devre dışı bırakılamaz.</translation>
+    </message>
     <message>
         <source>Error loading block database</source>
         <translation>Blok veritabanının yüklenmesinde hata</translation>
@@ -2074,10 +2090,18 @@
         <source>Rebuild chain state from the currently indexed blocks</source>
         <translation>Zincir durumunu güncel olarak endekslenen bloklardan yeniden derle</translation>
     </message>
+    <message>
+        <source>Rewinding blocks...</source>
+        <translation>Bloklar geri sarılıyor...</translation>
+    </message>
     <message>
         <source>Set database cache size in megabytes (%d to %d, default: %d)</source>
         <translation>Veritabanı önbellek boyutunu megabayt olarak belirt (%d ilâ %d, varsayılan: %d)</translation>
     </message>
+    <message>
+        <source>Set maximum block cost (default: %d)</source>
+        <translation>Azami blok maliyetini ayarla (varsayılan: %d)</translation>
+    </message>
     <message>
         <source>Set maximum block size in bytes (default: %d)</source>
         <translation>Azami blok boyutunu bayt olarak ayarla (varsayılan: %d)</translation>
@@ -2086,6 +2110,10 @@
         <source>Specify wallet file (within data directory)</source>
         <translation>Cüzdan dosyası belirtiniz (veri klasörünün içinde)</translation>
     </message>
+    <message>
+        <source>The source code is available from %s.</source>
+        <translation>Kaynak kod şuradan elde edilebilir: %s.</translation>
+    </message>
     <message>
         <source>Unable to bind to %s on this computer. %s is probably already running.</source>
         <translation>Bu bilgisayarda %s unsuruna bağlanılamadı. %s muhtemelen hâlihazırda çalışmaktadır.</translation>
@@ -2198,6 +2226,10 @@
         <source>This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit &lt;https://www.openssl.org/&gt; and cryptographic software written by Eric Young and UPnP software written by Thomas Bernard.</source>
         <translation>Bu ürün OpenSSL projesi tarafından OpenSSL araç takımı (http://www.openssl.org/) için geliştirilen yazılımlar, Eric Young (eay@cryptsoft.com) tarafından hazırlanmış şifreleme yazılımları ve Thomas Bernard tarafından programlanmış UPnP yazılımı içerir.</translation>
     </message>
+    <message>
+        <source>Use hierarchical deterministic key generation (HD) after BIP32. Only has effect during wallet creation/first start</source>
+        <translation>BIP32'den sonra hiyerarşik determinist (HD) anahtar üretimini kullan. Sadece cüzdan oluşturulmasında/ilk başlamada etkiye sahiptir.</translation>
+    </message>
     <message>
         <source>Whitelisted peers cannot be DoS banned and their transactions are always relayed, even if they are already in the mempool, useful e.g. for a gateway</source>
         <translation>Beyaz listeye alınan eşler DoS yasaklamasına uğramazlar ve muameleleri zaten mempool'da olsalar da daima aktarılır, bu mesela bir geçit için kullanışlıdır</translation>

From 6c0336c7723da274c8312b82ed2a138f5d57158f Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Mon, 18 Jul 2016 12:21:52 +0200
Subject: [PATCH 0631/1802] build: bump version to 0.13.99

Now that 0.13 branch has been split off, master is 0.13.99 (pre-0.14).
---
 configure.ac           | 2 +-
 doc/Doxyfile           | 2 +-
 doc/README.md          | 2 +-
 doc/README_windows.txt | 2 +-
 src/clientversion.h    | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/configure.ac b/configure.ac
index 011af6bd1bd8e..78d63f92729dd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N)
 AC_PREREQ([2.60])
 define(_CLIENT_VERSION_MAJOR, 0)
-define(_CLIENT_VERSION_MINOR, 12)
+define(_CLIENT_VERSION_MINOR, 13)
 define(_CLIENT_VERSION_REVISION, 99)
 define(_CLIENT_VERSION_BUILD, 0)
 define(_CLIENT_VERSION_IS_RELEASE, false)
diff --git a/doc/Doxyfile b/doc/Doxyfile
index 428fba98e1ba7..22850db835429 100644
--- a/doc/Doxyfile
+++ b/doc/Doxyfile
@@ -34,7 +34,7 @@ PROJECT_NAME           = Bitcoin
 # This could be handy for archiving the generated documentation or 
 # if some version control system is used.
 
-PROJECT_NUMBER         = 0.12.99
+PROJECT_NUMBER         = 0.13.99
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description 
 # for a project that appears at the top of each page and should give viewer 
diff --git a/doc/README.md b/doc/README.md
index c30f29452b786..09a507c9ce6e9 100644
--- a/doc/README.md
+++ b/doc/README.md
@@ -1,4 +1,4 @@
-Bitcoin Core 0.12.99
+Bitcoin Core 0.13.99
 =====================
 
 Setup
diff --git a/doc/README_windows.txt b/doc/README_windows.txt
index 2d1c4503c9177..74a05138a4280 100644
--- a/doc/README_windows.txt
+++ b/doc/README_windows.txt
@@ -1,4 +1,4 @@
-Bitcoin Core 0.12.99
+Bitcoin Core 0.13.99
 =====================
 
 Intro
diff --git a/src/clientversion.h b/src/clientversion.h
index 47263d5344f3c..53ad460346466 100644
--- a/src/clientversion.h
+++ b/src/clientversion.h
@@ -15,7 +15,7 @@
 
 //! These need to be macros, as clientversion.cpp's and bitcoin*-res.rc's voodoo requires it
 #define CLIENT_VERSION_MAJOR 0
-#define CLIENT_VERSION_MINOR 12
+#define CLIENT_VERSION_MINOR 13
 #define CLIENT_VERSION_REVISION 99
 #define CLIENT_VERSION_BUILD 0
 

From 5e3557b8e36308a27dbeb528569abe638c4d01dd Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Mon, 18 Jul 2016 14:00:05 +0200
Subject: [PATCH 0632/1802] doc: Clean out release notes

Now that 0.13 has branched, release notes for 0.13 should be maintained
there, and the release notes file on master is for 0.14 release
notes.
---
 doc/release-notes.md | 145 +++----------------------------------------
 1 file changed, 8 insertions(+), 137 deletions(-)

diff --git a/doc/release-notes.md b/doc/release-notes.md
index 3d2baaaaeaae1..343bd0846ecc0 100644
--- a/doc/release-notes.md
+++ b/doc/release-notes.md
@@ -41,81 +41,7 @@ report issues about Windows XP to the issue tracker.
 Notable changes
 ===============
 
-Database cache memory increased
---------------------------------
-
-As a result of growth of the UTXO set, performance with the prior default
-database cache of 100 MiB has suffered.
-For this reason the default was changed to 300 MiB in this release.
-
-For nodes on low-memory systems, the database cache can be changed back to
-100 MiB (or to another value) by either:
-
-- Adding `dbcache=100` in bitcoin.conf
-- Changing it in the GUI under `Options → Size of database cache`
-
-Note that the database cache setting has the most performance impact
-during initial sync of a node, and when catching up after downtime.
-
-bitcoin-cli: arguments privacy
---------------------------------
-
-The RPC command line client gained a new argument, `-stdin`
-to read extra arguments from standard input, one per line until EOF/Ctrl-D.
-For example:
-
-    $ echo -e "mysecretcode\n120" | src/bitcoin-cli -stdin walletpassphrase
-
-It is recommended to use this for sensitive information such as wallet
-passphrases, as command-line arguments can usually be read from the process
-table by any user on the system.
-
-RPC low-level changes
-----------------------
-
-- `gettxoutsetinfo` UTXO hash (`hash_serialized`) has changed. There was a divergence between
-  32-bit and 64-bit platforms, and the txids were missing in the hashed data. This has been
-  fixed, but this means that the output will be different than from previous versions.
-
-- Full UTF-8 support in the RPC API. Non-ASCII characters in, for example,
-  wallet labels have always been malformed because they weren't taken into account
-  properly in JSON RPC processing. This is no longer the case. This also affects
-  the GUI debug console.
-
-C++11 and Python 3
--------------------
-
-Various code modernizations have been done. The Bitcoin Core code base has
-started using C++11. This means that a C++11-capable compiler is now needed for
-building. Effectively this means GCC 4.7 or higher, or Clang 3.3 or higher.
-
-When cross-compiling for a target that doesn't have C++11 libraries, configure with
-`./configure --enable-glibc-back-compat ... LDFLAGS=-static-libstdc++`.
-
-For running the functional tests in `qa/rpc-tests`, Python3.4 or higher is now
-required.
-
-Linux ARM builds
-------------------
-
-Due to popular request, Linux ARM builds have been added to the uploaded
-executables.
-
-The following extra files can be found in the download directory or torrent:
-
-- `bitcoin-${VERSION}-arm-linux-gnueabihf.tar.gz`: Linux binaries for the most
-  common 32-bit ARM architecture.
-- `bitcoin-${VERSION}-aarch64-linux-gnu.tar.gz`: Linux binaries for the most
-  common 64-bit ARM architecture.
-
-ARM builds are still experimental. If you have problems on a certain device or
-Linux distribution combination please report them on the bug tracker, it may be
-possible to resolve them.
-
-Note that Android is not considered ARM Linux in this context. The executables
-are not expected to work out of the box on Android.
-
-0.13.0 Change log
+0.14.0 Change log
 =================
 
 Detailed release notes follow. This overview includes changes that affect
@@ -125,83 +51,28 @@ git merge commit are mentioned.
 
 ### RPC and REST
 
-Asm script outputs replacements for OP_NOP2 and OP_NOP3
--------------------------------------------------------
-
-OP_NOP2 has been renamed to OP_CHECKLOCKTIMEVERIFY by [BIP 
-65](https://github.com/bitcoin/bips/blob/master/bip-0065.mediawiki)
-
-OP_NOP3 has been renamed to OP_CHECKSEQUENCEVERIFY by [BIP 
-112](https://github.com/bitcoin/bips/blob/master/bip-0112.mediawiki)
-
-The following outputs are affected by this change:
-- RPC `getrawtransaction` (in verbose mode)
-- RPC `decoderawtransaction`
-- RPC `decodescript`
-- REST `/rest/tx/` (JSON format)
-- REST `/rest/block/` (JSON format when including extended tx details)
-- `bitcoin-tx -json`
-
-New mempool information RPC calls
----------------------------------
-
-RPC calls have been added to output detailed statistics for individual mempool
-entries, as well as to calculate the in-mempool ancestors or descendants of a
-transaction: see `getmempoolentry`, `getmempoolancestors`, `getmempooldescendants`.
-
-### ZMQ
-
-Each ZMQ notification now contains an up-counting sequence number that allows
-listeners to detect lost notifications.
-The sequence number is always the last element in a multi-part ZMQ notification and
-therefore backward compatible.
-Each message type has its own counter.
-(https://github.com/bitcoin/bitcoin/pull/7762)
-
 ### Configuration and command-line options
 
 ### Block and transaction handling
 
 ### P2P protocol and network code
 
-The p2p alert system has been removed in #7692 and the 'alert' message is no longer supported.
-
-
-Fee filtering of invs (BIP 133)
-------------------------------------
-
-The optional new p2p message "feefilter" is implemented and the protocol
-version is bumped to 70013. Upon receiving a feefilter message from a peer,
-a node will not send invs for any transactions which do not meet the filter
-feerate. [BIP 133](https://github.com/bitcoin/bips/blob/master/bip-0133.mediawiki)
-
 ### Validation
 
 ### Build system
 
 ### Wallet
 
-Hierarchical Deterministic Key Generation
------------------------------------------
-Newly created wallets will use hierarchical deterministic key generation
-according to BIP32 (keypath m/0'/0'/k').
-Existing wallets will still use traditional key generation.
-
-Backups of HD wallets, regardless of when they have been created, can
-therefore be used to re-generate all possible private keys, even the
-ones which haven't already been generated during the time of the backup.
-
-HD key generation for new wallets can be disabled by `-usehd=0`. Keep in
-mind that this flag only has affect on newly created wallets.
-You can't disable HD key generation once you have created a HD wallet.
-
-There is no distinction between internal (change) and external keys.
-
-[Pull request](https://github.com/bitcoin/bitcoin/pull/8035/files), [BIP 32](https://github.com/bitcoin/bips/blob/master/bip-0032.mediawiki)
-
 ### GUI
 
 ### Tests
 
 ### Miscellaneous
 
+Credits
+=======
+
+Thanks to everyone who directly contributed to this release:
+
+
+As well as everyone that helped translating on [Transifex](https://www.transifex.com/projects/p/bitcoin/).

From 682aa0f289c550c029733966a2ce3449e4a471df Mon Sep 17 00:00:00 2001
From: Suhas Daftuar <sdaftuar@chaincode.com>
Date: Mon, 18 Jul 2016 12:40:28 -0400
Subject: [PATCH 0633/1802] Scale legacy sigop count in CreateNewBlock

---
 src/miner.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/miner.cpp b/src/miner.cpp
index 8153fb9f9ecdd..3f6fe915a7a7f 100644
--- a/src/miner.cpp
+++ b/src/miner.cpp
@@ -187,7 +187,7 @@ CBlockTemplate* BlockAssembler::CreateNewBlock(const CScript& scriptPubKeyIn)
     UpdateTime(pblock, chainparams.GetConsensus(), pindexPrev);
     pblock->nBits          = GetNextWorkRequired(pindexPrev, pblock, chainparams.GetConsensus());
     pblock->nNonce         = 0;
-    pblocktemplate->vTxSigOpsCost[0] = GetLegacySigOpCount(pblock->vtx[0]);
+    pblocktemplate->vTxSigOpsCost[0] = WITNESS_SCALE_FACTOR * GetLegacySigOpCount(pblock->vtx[0]);
 
     CValidationState state;
     if (!TestBlockValidity(state, chainparams, *pblock, pindexPrev, false, false)) {

From 2c06bae39edfaa9c0855d83377ad8fda09e4fa08 Mon Sep 17 00:00:00 2001
From: Suhas Daftuar <sdaftuar@chaincode.com>
Date: Mon, 18 Jul 2016 13:28:26 -0400
Subject: [PATCH 0634/1802] Rename "block cost" to "block weight"

---
 qa/rpc-tests/p2p-segwit.py     |  6 ++---
 src/consensus/consensus.h      |  4 ++--
 src/init.cpp                   |  2 +-
 src/main.cpp                   | 12 +++++-----
 src/main.h                     |  2 +-
 src/miner.cpp                  | 42 +++++++++++++++++-----------------
 src/miner.h                    |  4 ++--
 src/policy/policy.cpp          | 10 ++++----
 src/policy/policy.h            | 12 +++++-----
 src/primitives/block.cpp       |  6 ++---
 src/primitives/block.h         |  4 ++--
 src/primitives/transaction.cpp |  4 ++--
 src/primitives/transaction.h   |  4 ++--
 src/rpc/blockchain.cpp         |  4 ++--
 src/rpc/mining.cpp             | 12 +++++-----
 src/txmempool.cpp              |  4 ++--
 src/txmempool.h                |  4 ++--
 src/wallet/wallet.cpp          |  2 +-
 18 files changed, 69 insertions(+), 69 deletions(-)

diff --git a/qa/rpc-tests/p2p-segwit.py b/qa/rpc-tests/p2p-segwit.py
index b30d41af92935..fa2c5d1f05e24 100755
--- a/qa/rpc-tests/p2p-segwit.py
+++ b/qa/rpc-tests/p2p-segwit.py
@@ -1065,12 +1065,12 @@ def test_block_relay(self, segwit_activated):
             assert_equal(wit_block.serialize(False), non_wit_block.serialize())
             assert_equal(wit_block.serialize(True), block.serialize(True))
 
-            # Test size, vsize, cost
+            # Test size, vsize, weight
             rpc_details = self.nodes[0].getblock(block.hash, True)
             assert_equal(rpc_details["size"], len(block.serialize(True)))
             assert_equal(rpc_details["strippedsize"], len(block.serialize(False)))
-            cost = 3*len(block.serialize(False)) + len(block.serialize(True))
-            assert_equal(rpc_details["cost"], cost)
+            weight = 3*len(block.serialize(False)) + len(block.serialize(True))
+            assert_equal(rpc_details["weight"], weight)
 
             # Upgraded node should not ask for blocks from unupgraded
             block4 = self.build_next_block(nVersion=4)
diff --git a/src/consensus/consensus.h b/src/consensus/consensus.h
index 81f40593b21a6..690856586604e 100644
--- a/src/consensus/consensus.h
+++ b/src/consensus/consensus.h
@@ -10,8 +10,8 @@
 
 /** The maximum allowed size for a serialized block, in bytes (only for buffer size limits) */
 static const unsigned int MAX_BLOCK_SERIALIZED_SIZE = 4000000;
-/** The maximum allowed cost for a block, see BIP 141 (network rule) */
-static const unsigned int MAX_BLOCK_COST = 4000000;
+/** The maximum allowed weight for a block, see BIP 141 (network rule) */
+static const unsigned int MAX_BLOCK_WEIGHT = 4000000;
 /** The maximum allowed size for a block excluding witness data, in bytes (network rule) */
 static const unsigned int MAX_BLOCK_BASE_SIZE = 1000000;
 /** The maximum allowed number of signature check operations in a block (network rule) */
diff --git a/src/init.cpp b/src/init.cpp
index 509bc45f516db..312dfe1699c08 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -452,7 +452,7 @@ std::string HelpMessage(HelpMessageMode mode)
     strUsage += HelpMessageOpt("-mempoolreplacement", strprintf(_("Enable transaction replacement in the memory pool (default: %u)"), DEFAULT_ENABLE_REPLACEMENT));
 
     strUsage += HelpMessageGroup(_("Block creation options:"));
-    strUsage += HelpMessageOpt("-blockmaxcost=<n>", strprintf(_("Set maximum BIP141 block cost (default: %d)"), DEFAULT_BLOCK_MAX_COST));
+    strUsage += HelpMessageOpt("-blockmaxweight=<n>", strprintf(_("Set maximum BIP141 block weight (default: %d)"), DEFAULT_BLOCK_MAX_WEIGHT));
     strUsage += HelpMessageOpt("-blockmaxsize=<n>", strprintf(_("Set maximum block size in bytes (default: %d)"), DEFAULT_BLOCK_MAX_SIZE));
     strUsage += HelpMessageOpt("-blockprioritysize=<n>", strprintf(_("Set maximum size of high-priority/low-fee transactions in bytes (default: %d)"), DEFAULT_BLOCK_PRIORITY_SIZE));
     if (showDebug)
diff --git a/src/main.cpp b/src/main.cpp
index 73fbe53afb64a..fe19895f5fbcc 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -694,8 +694,8 @@ bool AddOrphanTx(const CTransaction& tx, NodeId peer) EXCLUSIVE_LOCKS_REQUIRED(c
     // have been mined or received.
     // 100 orphans, each of which is at most 99,999 bytes big is
     // at most 10 megabytes of orphans and somewhat more byprev index (in the worst case):
-    unsigned int sz = GetTransactionCost(tx);
-    if (sz >= MAX_STANDARD_TX_COST)
+    unsigned int sz = GetTransactionWeight(tx);
+    if (sz >= MAX_STANDARD_TX_WEIGHT)
     {
         LogPrint("mempool", "ignoring large orphan tx (size: %u, hash: %s)\n", sz, hash.ToString());
         return false;
@@ -3596,13 +3596,13 @@ bool ContextualCheckBlock(const CBlock& block, CValidationState& state, CBlockIn
     }
 
     // After the coinbase witness nonce and commitment are verified,
-    // we can check if the block cost passes (before we've checked the
-    // coinbase witness, it would be possible for the cost to be too
+    // we can check if the block weight passes (before we've checked the
+    // coinbase witness, it would be possible for the weight to be too
     // large by filling up the coinbase witness, which doesn't change
     // the block hash, so we couldn't mark the block as permanently
     // failed).
-    if (GetBlockCost(block) > MAX_BLOCK_COST) {
-        return state.DoS(100, error("ContextualCheckBlock(): cost limit failed"), REJECT_INVALID, "bad-blk-cost");
+    if (GetBlockWeight(block) > MAX_BLOCK_WEIGHT) {
+        return state.DoS(100, error("ContextualCheckBlock(): weight limit failed"), REJECT_INVALID, "bad-blk-weight");
     }
 
     return true;
diff --git a/src/main.h b/src/main.h
index 65ae2488f9095..27121890f6d70 100644
--- a/src/main.h
+++ b/src/main.h
@@ -155,7 +155,7 @@ typedef boost::unordered_map<uint256, CBlockIndex*, BlockHasher> BlockMap;
 extern BlockMap mapBlockIndex;
 extern uint64_t nLastBlockTx;
 extern uint64_t nLastBlockSize;
-extern uint64_t nLastBlockCost;
+extern uint64_t nLastBlockWeight;
 extern const std::string strMessageMagic;
 extern CWaitableCriticalSection csBestBlock;
 extern CConditionVariable cvBlockChange;
diff --git a/src/miner.cpp b/src/miner.cpp
index 8153fb9f9ecdd..25a5becf93efa 100644
--- a/src/miner.cpp
+++ b/src/miner.cpp
@@ -45,7 +45,7 @@ using namespace std;
 
 uint64_t nLastBlockTx = 0;
 uint64_t nLastBlockSize = 0;
-uint64_t nLastBlockCost = 0;
+uint64_t nLastBlockWeight = 0;
 
 class ScoreCompare
 {
@@ -77,30 +77,30 @@ BlockAssembler::BlockAssembler(const CChainParams& _chainparams)
     : chainparams(_chainparams)
 {
     // Block resource limits
-    // If neither -blockmaxsize or -blockmaxcost is given, limit to DEFAULT_BLOCK_MAX_*
+    // If neither -blockmaxsize or -blockmaxweight is given, limit to DEFAULT_BLOCK_MAX_*
     // If only one is given, only restrict the specified resource.
     // If both are given, restrict both.
-    nBlockMaxCost = DEFAULT_BLOCK_MAX_COST;
+    nBlockMaxWeight = DEFAULT_BLOCK_MAX_WEIGHT;
     nBlockMaxSize = DEFAULT_BLOCK_MAX_SIZE;
-    bool fCostSet = false;
-    if (mapArgs.count("-blockmaxcost")) {
-        nBlockMaxCost = GetArg("-blockmaxcost", DEFAULT_BLOCK_MAX_COST);
+    bool fWeightSet = false;
+    if (mapArgs.count("-blockmaxweight")) {
+        nBlockMaxWeight = GetArg("-blockmaxweight", DEFAULT_BLOCK_MAX_WEIGHT);
         nBlockMaxSize = MAX_BLOCK_SERIALIZED_SIZE;
-        fCostSet = true;
+        fWeightSet = true;
     }
     if (mapArgs.count("-blockmaxsize")) {
         nBlockMaxSize = GetArg("-blockmaxsize", DEFAULT_BLOCK_MAX_SIZE);
-        if (!fCostSet) {
-            nBlockMaxCost = nBlockMaxSize * WITNESS_SCALE_FACTOR;
+        if (!fWeightSet) {
+            nBlockMaxWeight = nBlockMaxSize * WITNESS_SCALE_FACTOR;
         }
     }
 
-    // Limit cost to between 4K and MAX_BLOCK_COST-4K for sanity:
-    nBlockMaxCost = std::max((unsigned int)4000, std::min((unsigned int)(MAX_BLOCK_COST-4000), nBlockMaxCost));
+    // Limit weight to between 4K and MAX_BLOCK_WEIGHT-4K for sanity:
+    nBlockMaxWeight = std::max((unsigned int)4000, std::min((unsigned int)(MAX_BLOCK_WEIGHT-4000), nBlockMaxWeight));
     // Limit size to between 1K and MAX_BLOCK_SERIALIZED_SIZE-1K for sanity:
     nBlockMaxSize = std::max((unsigned int)1000, std::min((unsigned int)(MAX_BLOCK_SERIALIZED_SIZE-1000), nBlockMaxSize));
 
-    // Whether we need to account for byte usage (in addition to cost usage)
+    // Whether we need to account for byte usage (in addition to weight usage)
     fNeedSizeAccounting = (nBlockMaxSize < MAX_BLOCK_SERIALIZED_SIZE-1000);
 }
 
@@ -110,7 +110,7 @@ void BlockAssembler::resetBlock()
 
     // Reserve space for coinbase tx
     nBlockSize = 1000;
-    nBlockCost = 4000;
+    nBlockWeight = 4000;
     nBlockSigOpsCost = 400;
     fIncludeWitness = false;
 
@@ -167,7 +167,7 @@ CBlockTemplate* BlockAssembler::CreateNewBlock(const CScript& scriptPubKeyIn)
 
     nLastBlockTx = nBlockTx;
     nLastBlockSize = nBlockSize;
-    nLastBlockCost = nBlockCost;
+    nLastBlockWeight = nBlockWeight;
     LogPrintf("CreateNewBlock(): total size %u txs: %u fees: %ld sigops %d\n", nBlockSize, nBlockTx, nFees, nBlockSigOpsCost);
 
     // Create coinbase transaction.
@@ -223,8 +223,8 @@ void BlockAssembler::onlyUnconfirmed(CTxMemPool::setEntries& testSet)
 
 bool BlockAssembler::TestPackage(uint64_t packageSize, int64_t packageSigOpsCost)
 {
-    // TODO: switch to cost-based accounting for packages instead of vsize-based accounting.
-    if (nBlockCost + WITNESS_SCALE_FACTOR * packageSize >= nBlockMaxCost)
+    // TODO: switch to weight-based accounting for packages instead of vsize-based accounting.
+    if (nBlockWeight + WITNESS_SCALE_FACTOR * packageSize >= nBlockMaxWeight)
         return false;
     if (nBlockSigOpsCost + packageSigOpsCost >= MAX_BLOCK_SIGOPS_COST)
         return false;
@@ -257,17 +257,17 @@ bool BlockAssembler::TestPackageTransactions(const CTxMemPool::setEntries& packa
 
 bool BlockAssembler::TestForBlock(CTxMemPool::txiter iter)
 {
-    if (nBlockCost + iter->GetTxCost() >= nBlockMaxCost) {
+    if (nBlockWeight + iter->GetTxWeight() >= nBlockMaxWeight) {
         // If the block is so close to full that no more txs will fit
         // or if we've tried more than 50 times to fill remaining space
         // then flag that the block is finished
-        if (nBlockCost >  nBlockMaxCost - 400 || lastFewTxs > 50) {
+        if (nBlockWeight >  nBlockMaxWeight - 400 || lastFewTxs > 50) {
              blockFinished = true;
              return false;
         }
-        // Once we're within 4000 cost of a full block, only look at 50 more txs
+        // Once we're within 4000 weight of a full block, only look at 50 more txs
         // to try to fill the remaining space.
-        if (nBlockCost > nBlockMaxCost - 4000) {
+        if (nBlockWeight > nBlockMaxWeight - 4000) {
             lastFewTxs++;
         }
         return false;
@@ -315,7 +315,7 @@ void BlockAssembler::AddToBlock(CTxMemPool::txiter iter)
     if (fNeedSizeAccounting) {
         nBlockSize += ::GetSerializeSize(iter->GetTx(), SER_NETWORK, PROTOCOL_VERSION);
     }
-    nBlockCost += iter->GetTxCost();
+    nBlockWeight += iter->GetTxWeight();
     ++nBlockTx;
     nBlockSigOpsCost += iter->GetSigOpCost();
     nFees += iter->GetFee();
diff --git a/src/miner.h b/src/miner.h
index d16e37bb599bb..11753f5e43787 100644
--- a/src/miner.h
+++ b/src/miner.h
@@ -141,11 +141,11 @@ class BlockAssembler
 
     // Configuration parameters for the block size
     bool fIncludeWitness;
-    unsigned int nBlockMaxCost, nBlockMaxSize;
+    unsigned int nBlockMaxWeight, nBlockMaxSize;
     bool fNeedSizeAccounting;
 
     // Information on the current status of the block
-    uint64_t nBlockCost;
+    uint64_t nBlockWeight;
     uint64_t nBlockSize;
     uint64_t nBlockTx;
     uint64_t nBlockSigOpsCost;
diff --git a/src/policy/policy.cpp b/src/policy/policy.cpp
index f2148bfe1057d..8617db00c8608 100644
--- a/src/policy/policy.cpp
+++ b/src/policy/policy.cpp
@@ -64,8 +64,8 @@ bool IsStandardTx(const CTransaction& tx, std::string& reason)
     // almost as much to process as they cost the sender in fees, because
     // computing signature hashes is O(ninputs*txsize). Limiting transactions
     // to MAX_STANDARD_TX_SIZE mitigates CPU exhaustion attacks.
-    unsigned int sz = GetTransactionCost(tx);
-    if (sz >= MAX_STANDARD_TX_COST) {
+    unsigned int sz = GetTransactionWeight(tx);
+    if (sz >= MAX_STANDARD_TX_WEIGHT) {
         reason = "tx-size";
         return false;
     }
@@ -151,12 +151,12 @@ bool AreInputsStandard(const CTransaction& tx, const CCoinsViewCache& mapInputs)
     return true;
 }
 
-int64_t GetVirtualTransactionSize(int64_t nCost)
+int64_t GetVirtualTransactionSize(int64_t nWeight)
 {
-    return (nCost + WITNESS_SCALE_FACTOR - 1) / WITNESS_SCALE_FACTOR;
+    return (nWeight + WITNESS_SCALE_FACTOR - 1) / WITNESS_SCALE_FACTOR;
 }
 
 int64_t GetVirtualTransactionSize(const CTransaction& tx)
 {
-    return GetVirtualTransactionSize(GetTransactionCost(tx));
+    return GetVirtualTransactionSize(GetTransactionWeight(tx));
 }
diff --git a/src/policy/policy.h b/src/policy/policy.h
index 29a8cc57c20ff..f5f8652fb5a72 100644
--- a/src/policy/policy.h
+++ b/src/policy/policy.h
@@ -18,10 +18,10 @@ class CCoinsViewCache;
 static const unsigned int DEFAULT_BLOCK_MAX_SIZE = 750000;
 /** Default for -blockprioritysize, maximum space for zero/low-fee transactions **/
 static const unsigned int DEFAULT_BLOCK_PRIORITY_SIZE = 0;
-/** Default for -blockmaxcost, which control the range of block costs the mining code will create **/
-static const unsigned int DEFAULT_BLOCK_MAX_COST = 3000000;
-/** The maximum size for transactions we're willing to relay/mine */
-static const unsigned int MAX_STANDARD_TX_COST = 400000;
+/** Default for -blockmaxweight, which controls the range of block weights the mining code will create **/
+static const unsigned int DEFAULT_BLOCK_MAX_WEIGHT = 3000000;
+/** The maximum weight for transactions we're willing to relay/mine */
+static const unsigned int MAX_STANDARD_TX_WEIGHT = 400000;
 /** Maximum number of signature check operations in an IsStandard() P2SH script */
 static const unsigned int MAX_P2SH_SIGOPS = 15;
 /** The maximum number of sigops we're willing to relay/mine in a single tx */
@@ -66,8 +66,8 @@ bool IsStandardTx(const CTransaction& tx, std::string& reason);
      */
 bool AreInputsStandard(const CTransaction& tx, const CCoinsViewCache& mapInputs);
 
-/** Compute the virtual transaction size (cost reinterpreted as bytes). */
-int64_t GetVirtualTransactionSize(int64_t nCost);
+/** Compute the virtual transaction size (weight reinterpreted as bytes). */
+int64_t GetVirtualTransactionSize(int64_t nWeight);
 int64_t GetVirtualTransactionSize(const CTransaction& tx);
 
 #endif // BITCOIN_POLICY_POLICY_H
diff --git a/src/primitives/block.cpp b/src/primitives/block.cpp
index df900388f2678..0e6ab4dd718b3 100644
--- a/src/primitives/block.cpp
+++ b/src/primitives/block.cpp
@@ -32,11 +32,11 @@ std::string CBlock::ToString() const
     return s.str();
 }
 
-int64_t GetBlockCost(const CBlock& block)
+int64_t GetBlockWeight(const CBlock& block)
 {
-    // This implements the cost = (stripped_size * 4) + witness_size formula,
+    // This implements the weight = (stripped_size * 4) + witness_size formula,
     // using only serialization with and without witness data. As witness_size
     // is equal to total_size - stripped_size, this formula is identical to:
-    // cost = (stripped_size * 3) + total_size.
+    // weight = (stripped_size * 3) + total_size.
     return ::GetSerializeSize(block, SER_NETWORK, PROTOCOL_VERSION | SERIALIZE_TRANSACTION_NO_WITNESS) * (WITNESS_SCALE_FACTOR - 1) + ::GetSerializeSize(block, SER_NETWORK, PROTOCOL_VERSION);
 }
diff --git a/src/primitives/block.h b/src/primitives/block.h
index e2a309e63d821..72dfed985ae93 100644
--- a/src/primitives/block.h
+++ b/src/primitives/block.h
@@ -154,7 +154,7 @@ struct CBlockLocator
     }
 };
 
-/** Compute the consensus-critical block cost (see BIP 141). */
-int64_t GetBlockCost(const CBlock& tx);
+/** Compute the consensus-critical block weight (see BIP 141). */
+int64_t GetBlockWeight(const CBlock& tx);
 
 #endif // BITCOIN_PRIMITIVES_BLOCK_H
diff --git a/src/primitives/transaction.cpp b/src/primitives/transaction.cpp
index 7f10409c05397..8d6380564365e 100644
--- a/src/primitives/transaction.cpp
+++ b/src/primitives/transaction.cpp
@@ -121,7 +121,7 @@ unsigned int CTransaction::CalculateModifiedSize(unsigned int nTxSize) const
     // Providing any more cleanup incentive than making additional inputs free would
     // risk encouraging people to create junk outputs to redeem later.
     if (nTxSize == 0)
-        nTxSize = (GetTransactionCost(*this) + WITNESS_SCALE_FACTOR - 1) / WITNESS_SCALE_FACTOR;
+        nTxSize = (GetTransactionWeight(*this) + WITNESS_SCALE_FACTOR - 1) / WITNESS_SCALE_FACTOR;
     for (std::vector<CTxIn>::const_iterator it(vin.begin()); it != vin.end(); ++it)
     {
         unsigned int offset = 41U + std::min(110U, (unsigned int)it->scriptSig.size());
@@ -149,7 +149,7 @@ std::string CTransaction::ToString() const
     return str;
 }
 
-int64_t GetTransactionCost(const CTransaction& tx)
+int64_t GetTransactionWeight(const CTransaction& tx)
 {
     return ::GetSerializeSize(tx, SER_NETWORK, PROTOCOL_VERSION | SERIALIZE_TRANSACTION_NO_WITNESS) * (WITNESS_SCALE_FACTOR -1) + ::GetSerializeSize(tx, SER_NETWORK, PROTOCOL_VERSION);
 }
diff --git a/src/primitives/transaction.h b/src/primitives/transaction.h
index 8a2d5dd22c8de..d37890667f9dd 100644
--- a/src/primitives/transaction.h
+++ b/src/primitives/transaction.h
@@ -459,7 +459,7 @@ struct CMutableTransaction
     uint256 GetHash() const;
 };
 
-/** Compute the cost of a transaction, as defined by BIP 141 */
-int64_t GetTransactionCost(const CTransaction &tx);
+/** Compute the weight of a transaction, as defined by BIP 141 */
+int64_t GetTransactionWeight(const CTransaction &tx);
 
 #endif // BITCOIN_PRIMITIVES_TRANSACTION_H
diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp
index 20eefa1c574c5..9dc896b7af281 100644
--- a/src/rpc/blockchain.cpp
+++ b/src/rpc/blockchain.cpp
@@ -101,7 +101,7 @@ UniValue blockToJSON(const CBlock& block, const CBlockIndex* blockindex, bool tx
     result.push_back(Pair("confirmations", confirmations));
     result.push_back(Pair("strippedsize", (int)::GetSerializeSize(block, SER_NETWORK, PROTOCOL_VERSION | SERIALIZE_TRANSACTION_NO_WITNESS)));
     result.push_back(Pair("size", (int)::GetSerializeSize(block, SER_NETWORK, PROTOCOL_VERSION)));
-    result.push_back(Pair("cost", (int)::GetBlockCost(block)));
+    result.push_back(Pair("weight", (int)::GetBlockWeight(block)));
     result.push_back(Pair("height", blockindex->nHeight));
     result.push_back(Pair("version", block.nVersion));
     result.push_back(Pair("versionHex", strprintf("%08x", block.nVersion)));
@@ -559,7 +559,7 @@ UniValue getblock(const UniValue& params, bool fHelp)
             "  \"confirmations\" : n,   (numeric) The number of confirmations, or -1 if the block is not on the main chain\n"
             "  \"size\" : n,            (numeric) The block size\n"
             "  \"strippedsize\" : n,    (numeric) The block size excluding witness data\n"
-            "  \"cost\" : n             (numeric) The block cost\n"
+            "  \"weight\" : n           (numeric) The block weight (BIP 141)\n"
             "  \"height\" : n,          (numeric) The block height or index\n"
             "  \"version\" : n,         (numeric) The block version\n"
             "  \"versionHex\" : \"00000000\", (string) The block version formatted in hexadecimal\n"
diff --git a/src/rpc/mining.cpp b/src/rpc/mining.cpp
index 4c4e5997818ef..92ca4bab6bc1e 100644
--- a/src/rpc/mining.cpp
+++ b/src/rpc/mining.cpp
@@ -224,7 +224,7 @@ UniValue getmininginfo(const UniValue& params, bool fHelp)
             "{\n"
             "  \"blocks\": nnn,             (numeric) The current block\n"
             "  \"currentblocksize\": nnn,   (numeric) The last block size\n"
-            "  \"currentblockcost\": nnn,   (numeric) The last block cost\n"
+            "  \"currentblockweight\": nnn, (numeric) The last block weight\n"
             "  \"currentblocktx\": nnn,     (numeric) The last block transaction\n"
             "  \"difficulty\": xxx.xxxxx    (numeric) The current difficulty\n"
             "  \"errors\": \"...\"          (string) Current errors\n"
@@ -243,7 +243,7 @@ UniValue getmininginfo(const UniValue& params, bool fHelp)
     UniValue obj(UniValue::VOBJ);
     obj.push_back(Pair("blocks",           (int)chainActive.Height()));
     obj.push_back(Pair("currentblocksize", (uint64_t)nLastBlockSize));
-    obj.push_back(Pair("currentblockcost", (uint64_t)nLastBlockCost));
+    obj.push_back(Pair("currentblockweight", (uint64_t)nLastBlockWeight));
     obj.push_back(Pair("currentblocktx",   (uint64_t)nLastBlockTx));
     obj.push_back(Pair("difficulty",       (double)GetDifficulty()));
     obj.push_back(Pair("errors",           GetWarnings("statusbar")));
@@ -358,7 +358,7 @@ UniValue getblocktemplate(const UniValue& params, bool fHelp)
             "         ],\n"
             "         \"fee\": n,                   (numeric) difference in value between transaction inputs and outputs (in Satoshis); for coinbase transactions, this is a negative Number of the total collected block fees (ie, not including the block subsidy); if key is not present, fee is unknown and clients MUST NOT assume there isn't one\n"
             "         \"sigops\" : n,               (numeric) total SigOps cost, as counted for purposes of block limits; if key is not present, sigop cost is unknown and clients MUST NOT assume it is zero\n"
-            "         \"cost\" : n,                 (numeric) total transaction size cost, as counted for purposes of block limits\n"
+            "         \"weight\" : n,               (numeric) total transaction weight, as counted for purposes of block limits\n"
             "         \"required\" : true|false     (boolean) if provided and true, this transaction must be in the final block\n"
             "      }\n"
             "      ,...\n"
@@ -377,7 +377,7 @@ UniValue getblocktemplate(const UniValue& params, bool fHelp)
             "  \"noncerange\" : \"00000000ffffffff\",   (string) A range of valid nonces\n"
             "  \"sigoplimit\" : n,                 (numeric) cost limit of sigops in blocks\n"
             "  \"sizelimit\" : n,                  (numeric) limit of block size\n"
-            "  \"costlimit\" : n,                  (numeric) limit of block cost\n"
+            "  \"weightlimit\" : n,                (numeric) limit of block weight\n"
             "  \"curtime\" : ttt,                  (numeric) current timestamp in seconds since epoch (Jan 1 1970 GMT)\n"
             "  \"bits\" : \"xxx\",                 (string) compressed target of next block\n"
             "  \"height\" : n                      (numeric) The height of the next block\n"
@@ -575,7 +575,7 @@ UniValue getblocktemplate(const UniValue& params, bool fHelp)
         int index_in_template = i - 1;
         entry.push_back(Pair("fee", pblocktemplate->vTxFees[index_in_template]));
         entry.push_back(Pair("sigops", pblocktemplate->vTxSigOpsCost[index_in_template]));
-        entry.push_back(Pair("cost", GetTransactionCost(tx)));
+        entry.push_back(Pair("weight", GetTransactionWeight(tx)));
 
         transactions.push_back(entry);
     }
@@ -659,7 +659,7 @@ UniValue getblocktemplate(const UniValue& params, bool fHelp)
     result.push_back(Pair("noncerange", "00000000ffffffff"));
     result.push_back(Pair("sigoplimit", (int64_t)MAX_BLOCK_SIGOPS_COST));
     result.push_back(Pair("sizelimit", (int64_t)MAX_BLOCK_SERIALIZED_SIZE));
-    result.push_back(Pair("costlimit", (int64_t)MAX_BLOCK_COST));
+    result.push_back(Pair("weightlimit", (int64_t)MAX_BLOCK_WEIGHT));
     result.push_back(Pair("curtime", pblock->GetBlockTime()));
     result.push_back(Pair("bits", strprintf("%08x", pblock->nBits)));
     result.push_back(Pair("height", (int64_t)(pindexPrev->nHeight+1)));
diff --git a/src/txmempool.cpp b/src/txmempool.cpp
index a48a6d94659b5..691baa674403f 100644
--- a/src/txmempool.cpp
+++ b/src/txmempool.cpp
@@ -28,7 +28,7 @@ CTxMemPoolEntry::CTxMemPoolEntry(const CTransaction& _tx, const CAmount& _nFee,
     hadNoDependencies(poolHasNoInputsOf), inChainInputValue(_inChainInputValue),
     spendsCoinbase(_spendsCoinbase), sigOpCost(_sigOpsCost), lockPoints(lp)
 {
-    nTxCost = GetTransactionCost(_tx);
+    nTxWeight = GetTransactionWeight(_tx);
     nModSize = _tx.CalculateModifiedSize(GetTxSize());
     nUsageSize = RecursiveDynamicUsage(*tx) + memusage::DynamicUsage(tx);
 
@@ -75,7 +75,7 @@ void CTxMemPoolEntry::UpdateLockPoints(const LockPoints& lp)
 
 size_t CTxMemPoolEntry::GetTxSize() const
 {
-    return GetVirtualTransactionSize(nTxCost);
+    return GetVirtualTransactionSize(nTxWeight);
 }
 
 // Update the given tx for any in-mempool descendants.
diff --git a/src/txmempool.h b/src/txmempool.h
index e5a500e19d433..2c2127f326de2 100644
--- a/src/txmempool.h
+++ b/src/txmempool.h
@@ -78,7 +78,7 @@ class CTxMemPoolEntry
 private:
     std::shared_ptr<const CTransaction> tx;
     CAmount nFee;              //!< Cached to avoid expensive parent-transaction lookups
-    size_t nTxCost;            //!< ... and avoid recomputing tx cost (also used for GetTxSize())
+    size_t nTxWeight;          //!< ... and avoid recomputing tx weight (also used for GetTxSize())
     size_t nModSize;           //!< ... and modified size for priority
     size_t nUsageSize;         //!< ... and total memory usage
     int64_t nTime;             //!< Local time when entering the mempool
@@ -122,7 +122,7 @@ class CTxMemPoolEntry
     double GetPriority(unsigned int currentHeight) const;
     const CAmount& GetFee() const { return nFee; }
     size_t GetTxSize() const;
-    size_t GetTxCost() const { return nTxCost; }
+    size_t GetTxWeight() const { return nTxWeight; }
     int64_t GetTime() const { return nTime; }
     unsigned int GetHeight() const { return entryHeight; }
     bool WasClearAtEntry() const { return hadNoDependencies; }
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index 46ed542158167..4b6d98025d55b 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -2356,7 +2356,7 @@ bool CWallet::CreateTransaction(const vector<CRecipient>& vecSend, CWalletTx& wt
                 *static_cast<CTransaction*>(&wtxNew) = CTransaction(txNew);
 
                 // Limit size
-                if (GetTransactionCost(txNew) >= MAX_STANDARD_TX_COST)
+                if (GetTransactionWeight(txNew) >= MAX_STANDARD_TX_WEIGHT)
                 {
                     strFailReason = _("Transaction too large");
                     return false;

From a4f137f367a898dc3acddc778c4fe9c53ac303c9 Mon Sep 17 00:00:00 2001
From: Jonas Schnelli <dev@jonasschnelli.ch>
Date: Fri, 15 Jul 2016 11:42:47 +0200
Subject: [PATCH 0635/1802] [Wallet] Ensure <0.13 clients can't open HD wallets

---
 src/wallet/wallet.cpp | 3 +++
 src/wallet/wallet.h   | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index 46ed542158167..ae0a546ea1b38 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -3299,6 +3299,9 @@ bool CWallet::InitLoadWallet()
             key.MakeNewKey(true);
             if (!walletInstance->SetHDMasterKey(key))
                 throw std::runtime_error("CWallet::GenerateNewKey(): Storing master key failed");
+
+            // ensure this wallet.dat can only be opened by clients supporting HD
+            walletInstance->SetMinVersion(FEATURE_HD);
         }
         CPubKey newDefaultKey;
         if (walletInstance->GetKeyFromPool(newDefaultKey)) {
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
index e9d669a7d1e30..3a3cb6d8514c0 100644
--- a/src/wallet/wallet.h
+++ b/src/wallet/wallet.h
@@ -78,7 +78,8 @@ enum WalletFeature
     FEATURE_WALLETCRYPT = 40000, // wallet encryption
     FEATURE_COMPRPUBKEY = 60000, // compressed public keys
 
-    FEATURE_LATEST = 60000
+    FEATURE_HD = 130000, // Hierarchical key derivation after BIP32 (HD Wallet)
+    FEATURE_LATEST = FEATURE_COMPRPUBKEY // HD is optional, use FEATURE_COMPRPUBKEY as latest version
 };
 
 

From fbc60703a53c1544054fe6ba0753d23d0508f4e9 Mon Sep 17 00:00:00 2001
From: Thomas Snider <tjps636@gmail.com>
Date: Mon, 18 Jul 2016 19:39:46 -0700
Subject: [PATCH 0636/1802] [trivial] Switched constants to sizeof()

---
 src/key.h    | 28 ++++++++++++++++------------
 src/pubkey.h | 11 +++++++----
 2 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/src/key.h b/src/key.h
index b4f48d59f5b08..0f58e24a49aeb 100644
--- a/src/key.h
+++ b/src/key.h
@@ -15,7 +15,7 @@
 #include <vector>
 
 
-/** 
+/**
  * secp256k1:
  * const unsigned int PRIVATE_KEY_SIZE = 279;
  * const unsigned int PUBLIC_KEY_SIZE  = 65;
@@ -45,6 +45,8 @@ class CKey
     //! The actual byte data
     unsigned char vch[32];
 
+    static_assert(sizeof(vch) == 32, "vch must be 32 bytes in length to not break serialization");
+
     //! Check whether the 32-byte array pointed to be vch is valid keydata.
     bool static Check(const unsigned char* vch);
 
@@ -70,20 +72,19 @@ class CKey
 
     friend bool operator==(const CKey& a, const CKey& b)
     {
-        return a.fCompressed == b.fCompressed && a.size() == b.size() &&
-               memcmp(&a.vch[0], &b.vch[0], a.size()) == 0;
+        return a.fCompressed == b.fCompressed &&
+            a.size() == b.size() &&
+            memcmp(&a.vch[0], &b.vch[0], a.size()) == 0;
     }
 
     //! Initialize using begin and end iterators to byte data.
     template <typename T>
     void Set(const T pbegin, const T pend, bool fCompressedIn)
     {
-        if (pend - pbegin != 32) {
+        if (pend - pbegin != sizeof(vch)) {
             fValid = false;
-            return;
-        }
-        if (Check(&pbegin[0])) {
-            memcpy(vch, (unsigned char*)&pbegin[0], 32);
+        } else if (Check(&pbegin[0])) {
+            memcpy(vch, (unsigned char*)&pbegin[0], sizeof(vch));
             fValid = true;
             fCompressed = fCompressedIn;
         } else {
@@ -92,7 +93,7 @@ class CKey
     }
 
     //! Simple read-only vector-like interface.
-    unsigned int size() const { return (fValid ? 32 : 0); }
+    unsigned int size() const { return (fValid ? sizeof(vch) : 0); }
     const unsigned char* begin() const { return vch; }
     const unsigned char* end() const { return vch + size(); }
 
@@ -110,7 +111,7 @@ class CKey
 
     /**
      * Convert the private key to a CPrivKey (serialized OpenSSL private key data).
-     * This is expensive. 
+     * This is expensive.
      */
     CPrivKey GetPrivKey() const;
 
@@ -160,8 +161,11 @@ struct CExtKey {
 
     friend bool operator==(const CExtKey& a, const CExtKey& b)
     {
-        return a.nDepth == b.nDepth && memcmp(&a.vchFingerprint[0], &b.vchFingerprint[0], 4) == 0 && a.nChild == b.nChild &&
-               a.chaincode == b.chaincode && a.key == b.key;
+        return a.nDepth == b.nDepth &&
+            memcmp(&a.vchFingerprint[0], &b.vchFingerprint[0], sizeof(vchFingerprint)) == 0 &&
+            a.nChild == b.nChild &&
+            a.chaincode == b.chaincode &&
+            a.key == b.key;
     }
 
     void Encode(unsigned char code[BIP32_EXTKEY_SIZE]) const;
diff --git a/src/pubkey.h b/src/pubkey.h
index db5444ea9d745..aebfdbc826628 100644
--- a/src/pubkey.h
+++ b/src/pubkey.h
@@ -13,7 +13,7 @@
 #include <stdexcept>
 #include <vector>
 
-/** 
+/**
  * secp256k1:
  * const unsigned int PRIVATE_KEY_SIZE = 279;
  * const unsigned int PUBLIC_KEY_SIZE  = 65;
@@ -156,7 +156,7 @@ class CPubKey
 
     /*
      * Check syntactic correctness.
-     * 
+     *
      * Note that this is consensus critical as CheckSig() calls it!
      */
     bool IsValid() const
@@ -203,8 +203,11 @@ struct CExtPubKey {
 
     friend bool operator==(const CExtPubKey &a, const CExtPubKey &b)
     {
-        return a.nDepth == b.nDepth && memcmp(&a.vchFingerprint[0], &b.vchFingerprint[0], 4) == 0 && a.nChild == b.nChild &&
-               a.chaincode == b.chaincode && a.pubkey == b.pubkey;
+        return a.nDepth == b.nDepth &&
+            memcmp(&a.vchFingerprint[0], &b.vchFingerprint[0], sizeof(vchFingerprint)) == 0 &&
+            a.nChild == b.nChild &&
+            a.chaincode == b.chaincode &&
+            a.pubkey == b.pubkey;
     }
 
     void Encode(unsigned char code[BIP32_EXTKEY_SIZE]) const;

From ab942c15bd3854650afa810d7c22d7fd30d346c1 Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Mon, 18 Jul 2016 20:57:20 +0200
Subject: [PATCH 0637/1802] Treat high-sigop transactions as larger rather than
 rejecting them

---
 src/init.cpp          |  2 +-
 src/main.cpp          |  3 +--
 src/main.h            |  2 --
 src/policy/policy.cpp | 10 ++++++----
 src/policy/policy.h   |  8 ++++++--
 src/txmempool.cpp     |  2 +-
 6 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/src/init.cpp b/src/init.cpp
index 312dfe1699c08..8d4a2cafbfbb1 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -446,7 +446,7 @@ std::string HelpMessage(HelpMessageMode mode)
     strUsage += HelpMessageGroup(_("Node relay options:"));
     if (showDebug)
         strUsage += HelpMessageOpt("-acceptnonstdtxn", strprintf("Relay and mine \"non-standard\" transactions (%sdefault: %u)", "testnet/regtest only; ", !Params(CBaseChainParams::TESTNET).RequireStandard()));
-    strUsage += HelpMessageOpt("-bytespersigop", strprintf(_("Minimum bytes per sigop in transactions we relay and mine (default: %u)"), DEFAULT_BYTES_PER_SIGOP));
+    strUsage += HelpMessageOpt("-bytespersigop", strprintf(_("Equivalent bytes per sigop in transactions for relay and mining (default: %u)"), DEFAULT_BYTES_PER_SIGOP));
     strUsage += HelpMessageOpt("-datacarrier", strprintf(_("Relay and mine data carrier transactions (default: %u)"), DEFAULT_ACCEPT_DATACARRIER));
     strUsage += HelpMessageOpt("-datacarriersize", strprintf(_("Maximum size of data in data carrier transactions we relay and mine (default: %u)"), MAX_OP_RETURN_RELAY));
     strUsage += HelpMessageOpt("-mempoolreplacement", strprintf(_("Enable transaction replacement in the memory pool (default: %u)"), DEFAULT_ENABLE_REPLACEMENT));
diff --git a/src/main.cpp b/src/main.cpp
index fe19895f5fbcc..e07d99ab06210 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -74,7 +74,6 @@ bool fHavePruned = false;
 bool fPruneMode = false;
 bool fIsBareMultisigStd = DEFAULT_PERMIT_BAREMULTISIG;
 bool fRequireStandard = true;
-unsigned int nBytesPerSigOp = DEFAULT_BYTES_PER_SIGOP;
 bool fCheckBlockIndex = false;
 bool fCheckpointsEnabled = DEFAULT_CHECKPOINTS_ENABLED;
 size_t nCoinCacheUsage = 5000 * 300;
@@ -1296,7 +1295,7 @@ bool AcceptToMemoryPoolWorker(CTxMemPool& pool, CValidationState& state, const C
         // itself can contain sigops MAX_STANDARD_TX_SIGOPS is less than
         // MAX_BLOCK_SIGOPS; we still consider this an invalid rather than
         // merely non-standard transaction.
-        if ((nSigOpsCost > MAX_STANDARD_TX_SIGOPS_COST) || (nBytesPerSigOp && nSigOpsCost > nSize * WITNESS_SCALE_FACTOR / nBytesPerSigOp))
+        if (nSigOpsCost > MAX_STANDARD_TX_SIGOPS_COST)
             return state.DoS(0, false, REJECT_NONSTANDARD, "bad-txns-too-many-sigops", false,
                 strprintf("%d", nSigOpsCost));
 
diff --git a/src/main.h b/src/main.h
index 27121890f6d70..631dc00d05dce 100644
--- a/src/main.h
+++ b/src/main.h
@@ -124,7 +124,6 @@ static const int64_t DEFAULT_MAX_TIP_AGE = 24 * 60 * 60;
 
 /** Default for -permitbaremultisig */
 static const bool DEFAULT_PERMIT_BAREMULTISIG = true;
-static const unsigned int DEFAULT_BYTES_PER_SIGOP = 20;
 static const bool DEFAULT_CHECKPOINTS_ENABLED = true;
 static const bool DEFAULT_TXINDEX = false;
 static const unsigned int DEFAULT_BANSCORE_THRESHOLD = 100;
@@ -165,7 +164,6 @@ extern int nScriptCheckThreads;
 extern bool fTxIndex;
 extern bool fIsBareMultisigStd;
 extern bool fRequireStandard;
-extern unsigned int nBytesPerSigOp;
 extern bool fCheckBlockIndex;
 extern bool fCheckpointsEnabled;
 extern size_t nCoinCacheUsage;
diff --git a/src/policy/policy.cpp b/src/policy/policy.cpp
index 8617db00c8608..0cd3ac7119715 100644
--- a/src/policy/policy.cpp
+++ b/src/policy/policy.cpp
@@ -151,12 +151,14 @@ bool AreInputsStandard(const CTransaction& tx, const CCoinsViewCache& mapInputs)
     return true;
 }
 
-int64_t GetVirtualTransactionSize(int64_t nWeight)
+unsigned int nBytesPerSigOp = DEFAULT_BYTES_PER_SIGOP;
+
+int64_t GetVirtualTransactionSize(int64_t nWeight, int64_t nSigOpCost)
 {
-    return (nWeight + WITNESS_SCALE_FACTOR - 1) / WITNESS_SCALE_FACTOR;
+    return (std::max(nWeight, nSigOpCost * nBytesPerSigOp) + WITNESS_SCALE_FACTOR - 1) / WITNESS_SCALE_FACTOR;
 }
 
-int64_t GetVirtualTransactionSize(const CTransaction& tx)
+int64_t GetVirtualTransactionSize(const CTransaction& tx, int64_t nSigOpCost)
 {
-    return GetVirtualTransactionSize(GetTransactionWeight(tx));
+    return GetVirtualTransactionSize(GetTransactionWeight(tx), nSigOpCost);
 }
diff --git a/src/policy/policy.h b/src/policy/policy.h
index f5f8652fb5a72..b82c9e66b8852 100644
--- a/src/policy/policy.h
+++ b/src/policy/policy.h
@@ -28,6 +28,8 @@ static const unsigned int MAX_P2SH_SIGOPS = 15;
 static const unsigned int MAX_STANDARD_TX_SIGOPS_COST = MAX_BLOCK_SIGOPS_COST/5;
 /** Default for -maxmempool, maximum megabytes of mempool memory usage */
 static const unsigned int DEFAULT_MAX_MEMPOOL_SIZE = 300;
+/** Default for -bytespersigop */
+static const unsigned int DEFAULT_BYTES_PER_SIGOP = 20;
 /**
  * Standard script verification flags that standard transactions will comply
  * with. However scripts violating these flags may still be present in valid
@@ -66,8 +68,10 @@ bool IsStandardTx(const CTransaction& tx, std::string& reason);
      */
 bool AreInputsStandard(const CTransaction& tx, const CCoinsViewCache& mapInputs);
 
+extern unsigned int nBytesPerSigOp;
+
 /** Compute the virtual transaction size (weight reinterpreted as bytes). */
-int64_t GetVirtualTransactionSize(int64_t nWeight);
-int64_t GetVirtualTransactionSize(const CTransaction& tx);
+int64_t GetVirtualTransactionSize(int64_t nWeight, int64_t nSigOpCost);
+int64_t GetVirtualTransactionSize(const CTransaction& tx, int64_t nSigOpCost = 0);
 
 #endif // BITCOIN_POLICY_POLICY_H
diff --git a/src/txmempool.cpp b/src/txmempool.cpp
index 691baa674403f..82827b8e4f193 100644
--- a/src/txmempool.cpp
+++ b/src/txmempool.cpp
@@ -75,7 +75,7 @@ void CTxMemPoolEntry::UpdateLockPoints(const LockPoints& lp)
 
 size_t CTxMemPoolEntry::GetTxSize() const
 {
-    return GetVirtualTransactionSize(nTxWeight);
+    return GetVirtualTransactionSize(nTxWeight, sigOpCost);
 }
 
 // Update the given tx for any in-mempool descendants.

From 3b3ce25df6cc84cd1e75a7ec20fc7da8d2ef76e0 Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Tue, 19 Jul 2016 15:41:36 -0400
Subject: [PATCH 0638/1802] build: fix non-deterministic biplist

The non-deterministic ordering produced by biplist ends up in the .DS_Store
file that is included in the OSX dmg.
---
 depends/packages/native_biplist.mk            |  5 ++++
 .../patches/native_biplist/sorted_list.patch  | 29 +++++++++++++++++++
 2 files changed, 34 insertions(+)
 create mode 100644 depends/patches/native_biplist/sorted_list.patch

diff --git a/depends/packages/native_biplist.mk b/depends/packages/native_biplist.mk
index eb8672d556a9c..3c6e8900f6646 100644
--- a/depends/packages/native_biplist.mk
+++ b/depends/packages/native_biplist.mk
@@ -4,6 +4,11 @@ $(package)_download_path=https://pypi.python.org/packages/source/b/biplist
 $(package)_file_name=biplist-$($(package)_version).tar.gz
 $(package)_sha256_hash=b57cadfd26e4754efdf89e9e37de87885f9b5c847b2615688ca04adfaf6ca604
 $(package)_install_libdir=$(build_prefix)/lib/python/dist-packages
+$(package)_patches=sorted_list.patch
+
+define $(package)_preprocess_cmds
+  patch -p1 < $($(package)_patch_dir)/sorted_list.patch
+endef
 
 define $(package)_build_cmds
     python setup.py build
diff --git a/depends/patches/native_biplist/sorted_list.patch b/depends/patches/native_biplist/sorted_list.patch
new file mode 100644
index 0000000000000..89abdb1b71ff8
--- /dev/null
+++ b/depends/patches/native_biplist/sorted_list.patch
@@ -0,0 +1,29 @@
+--- a/biplist/__init__.py	2014-10-26 19:03:11.000000000 +0000
++++ b/biplist/__init__.py	2016-07-19 19:30:17.663521999 +0000
+@@ -541,7 +541,7 @@
+             return HashableWrapper(n)
+         elif isinstance(root, dict):
+             n = {}
+-            for key, value in iteritems(root):
++            for key, value in sorted(iteritems(root)):
+                 n[self.wrapRoot(key)] = self.wrapRoot(value)
+             return HashableWrapper(n)
+         elif isinstance(root, list):
+@@ -616,7 +616,7 @@
+             elif isinstance(obj, dict):
+                 size = proc_size(len(obj))
+                 self.incrementByteCount('dictBytes', incr=1+size)
+-                for key, value in iteritems(obj):
++                for key, value in sorted(iteritems(obj)):
+                     check_key(key)
+                     self.computeOffsets(key, asReference=True)
+                     self.computeOffsets(value, asReference=True)
+@@ -714,7 +714,7 @@
+                 keys = []
+                 values = []
+                 objectsToWrite = []
+-                for key, value in iteritems(obj):
++                for key, value in sorted(iteritems(obj)):
+                     keys.append(key)
+                     values.append(value)
+                 for key in keys:

From 6523fcaab2f0808d4e47b9cb9ebbef7ed69a309e Mon Sep 17 00:00:00 2001
From: Patrick Strateman <patrick.strateman@gmail.com>
Date: Tue, 19 Jul 2016 22:30:17 -0700
Subject: [PATCH 0639/1802] Move SetMinVersion for FEATURE_HD to SetHDMasterKey

---
 src/wallet/wallet.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index a76085de3093a..5908dfeaceae6 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -1170,6 +1170,9 @@ bool CWallet::SetHDMasterKey(const CKey& key)
 {
     LOCK(cs_wallet);
 
+    // ensure this wallet.dat can only be opened by clients supporting HD
+    SetMinVersion(FEATURE_HD);
+
     // store the key as normal "key"/"ckey" object
     // in the database
     // key metadata is not required
@@ -3299,9 +3302,6 @@ bool CWallet::InitLoadWallet()
             key.MakeNewKey(true);
             if (!walletInstance->SetHDMasterKey(key))
                 throw std::runtime_error("CWallet::GenerateNewKey(): Storing master key failed");
-
-            // ensure this wallet.dat can only be opened by clients supporting HD
-            walletInstance->SetMinVersion(FEATURE_HD);
         }
         CPubKey newDefaultKey;
         if (walletInstance->GetKeyFromPool(newDefaultKey)) {

From 2f32c82b3d128e42f15e22e00e4ef680d327365f Mon Sep 17 00:00:00 2001
From: Jonas Schnelli <dev@jonasschnelli.ch>
Date: Mon, 22 Feb 2016 16:21:27 +0100
Subject: [PATCH 0640/1802] [Qt] show network/chain errors in the GUI

---
 src/main.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index fe19895f5fbcc..0e7d172fbb92d 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -4647,6 +4647,7 @@ std::string GetWarnings(const std::string& strFor)
     string strStatusBar;
     string strRPC;
     string strGUI;
+    const string uiAlertSeperator = "<hr />";
 
     if (!CLIENT_VERSION_IS_RELEASE) {
         strStatusBar = "This is a pre-release test build - use at your own risk - do not use for mining or merchant applications";
@@ -4659,18 +4660,19 @@ std::string GetWarnings(const std::string& strFor)
     // Misc warnings like out of disk space and clock is wrong
     if (strMiscWarning != "")
     {
-        strStatusBar = strGUI = strMiscWarning;
+        strStatusBar = strMiscWarning;
+        strGUI += (strGUI.empty() ? "" : uiAlertSeperator) + strMiscWarning;
     }
 
     if (fLargeWorkForkFound)
     {
         strStatusBar = strRPC = "Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.";
-        strGUI = _("Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.");
+        strGUI += strGUI.empty() ? "" : uiAlertSeperator + _("Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.");
     }
     else if (fLargeWorkInvalidChainFound)
     {
         strStatusBar = strRPC = "Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.";
-        strGUI = _("Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.");
+        strGUI += strGUI.empty() ? "" : uiAlertSeperator + _("Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.");
     }
 
     if (strFor == "gui")

From a615386552f9981dc024cc4a0df758f8b0fda4d8 Mon Sep 17 00:00:00 2001
From: fanquake <fanquake@gmail.com>
Date: Wed, 22 Jun 2016 17:56:07 +0800
Subject: [PATCH 0641/1802] [depends] ZeroMQ 4.1.5

---
 configure.ac                                  |  9 ++++++++
 depends/packages/packages.mk                  |  5 +----
 depends/packages/zeromq.mk                    | 15 +++++++++----
 ...d3957725acd34aa8b8d011585812f3369411.patch | 22 +++++++++++++++++++
 ...45c12e0b100cd38acecc16ce7db02905e27c.patch | 22 +++++++++++++++++++
 5 files changed, 65 insertions(+), 8 deletions(-)
 create mode 100644 depends/patches/zeromq/9114d3957725acd34aa8b8d011585812f3369411.patch
 create mode 100644 depends/patches/zeromq/9e6745c12e0b100cd38acecc16ce7db02905e27c.patch

diff --git a/configure.ac b/configure.ac
index 78d63f92729dd..ef58cfc40d19d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -816,6 +816,15 @@ else
     AC_DEFINE_UNQUOTED([ENABLE_ZMQ],[0],[Define to 1 to enable ZMQ functions])
   fi
 
+  if test "x$use_zmq" = "xyes"; then
+    dnl Assume libzmq was built for static linking
+    case $host in
+      *mingw*)
+        ZMQ_CFLAGS="$ZMQ_CFLAGS -DZMQ_STATIC"
+      ;;
+    esac
+  fi
+
   BITCOIN_QT_CHECK(AC_CHECK_LIB([protobuf] ,[main],[PROTOBUF_LIBS=-lprotobuf], BITCOIN_QT_FAIL(libprotobuf not found)))
   if test x$use_qr != xno; then
     BITCOIN_QT_CHECK([AC_CHECK_LIB([qrencode], [main],[QR_LIBS=-lqrencode], [have_qrencode=no])])
diff --git a/depends/packages/packages.mk b/depends/packages/packages.mk
index ac43ef4a2e304..ba2a05248c04e 100644
--- a/depends/packages/packages.mk
+++ b/depends/packages/packages.mk
@@ -1,6 +1,4 @@
-packages:=boost openssl libevent
-darwin_packages:=zeromq
-linux_packages:=zeromq
+packages:=boost openssl libevent zeromq
 native_packages := native_ccache native_comparisontool
 
 qt_native_packages = native_protobuf
@@ -12,7 +10,6 @@ qt_i686_linux_packages:=$(qt_x86_64_linux_packages)
 qt_darwin_packages=qt
 qt_mingw32_packages=qt
 
-
 wallet_packages=bdb
 
 upnp_packages=miniupnpc
diff --git a/depends/packages/zeromq.mk b/depends/packages/zeromq.mk
index f8901f72c26c6..01146c26f69bc 100644
--- a/depends/packages/zeromq.mk
+++ b/depends/packages/zeromq.mk
@@ -1,15 +1,22 @@
 package=zeromq
-$(package)_version=4.1.4
-$(package)_download_path=http://download.zeromq.org
+$(package)_version=4.1.5
+$(package)_download_path=https://github.com/zeromq/zeromq4-1/releases/download/v$($(package)_version)/
 $(package)_file_name=$(package)-$($(package)_version).tar.gz
-$(package)_sha256_hash=e99f44fde25c2e4cb84ce440f87ca7d3fe3271c2b8cfbc67d55e4de25e6fe378
+$(package)_sha256_hash=04aac57f081ffa3a2ee5ed04887be9e205df3a7ddade0027460b8042432bdbcf
+$(package)_patches=9114d3957725acd34aa8b8d011585812f3369411.patch 9e6745c12e0b100cd38acecc16ce7db02905e27c.patch
 
 define $(package)_set_vars
-  $(package)_config_opts=--without-documentation --disable-shared --without-libsodium
+  $(package)_config_opts=--without-documentation --disable-shared --without-libsodium --disable-curve
   $(package)_config_opts_linux=--with-pic
   $(package)_cxxflags=-std=c++11
 endef
 
+define $(package)_preprocess_cmds
+  patch -p1 < $($(package)_patch_dir)/9114d3957725acd34aa8b8d011585812f3369411.patch && \
+  patch -p1 < $($(package)_patch_dir)/9e6745c12e0b100cd38acecc16ce7db02905e27c.patch && \
+  ./autogen.sh
+endef
+
 define $(package)_config_cmds
   $($(package)_autoconf)
 endef
diff --git a/depends/patches/zeromq/9114d3957725acd34aa8b8d011585812f3369411.patch b/depends/patches/zeromq/9114d3957725acd34aa8b8d011585812f3369411.patch
new file mode 100644
index 0000000000000..f704b3d94fda8
--- /dev/null
+++ b/depends/patches/zeromq/9114d3957725acd34aa8b8d011585812f3369411.patch
@@ -0,0 +1,22 @@
+From 9114d3957725acd34aa8b8d011585812f3369411 Mon Sep 17 00:00:00 2001
+From: Jeroen Ooms <jeroenooms@gmail.com>
+Date: Tue, 20 Oct 2015 13:10:38 +0200
+Subject: [PATCH] enable static libraries on mingw
+
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 393505b..e92131a 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -265,7 +265,7 @@ case "${host_os}" in
+         libzmq_dso_visibility="no"
+
+         if test "x$enable_static" = "xyes"; then
+-            AC_MSG_ERROR([Building static libraries is not supported under MinGW32])
++            CPPFLAGS="-DZMQ_STATIC"
+         fi
+
+ 	# Set FD_SETSIZE to 1024
\ No newline at end of file
diff --git a/depends/patches/zeromq/9e6745c12e0b100cd38acecc16ce7db02905e27c.patch b/depends/patches/zeromq/9e6745c12e0b100cd38acecc16ce7db02905e27c.patch
new file mode 100644
index 0000000000000..9aff2c179a198
--- /dev/null
+++ b/depends/patches/zeromq/9e6745c12e0b100cd38acecc16ce7db02905e27c.patch
@@ -0,0 +1,22 @@
+From 9e6745c12e0b100cd38acecc16ce7db02905e27c Mon Sep 17 00:00:00 2001
+From: David Millard <dmillard10@gmail.com>
+Date: Tue, 10 May 2016 13:53:53 -0700
+Subject: [PATCH] Fix autotools for static MinGW builds
+
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 5a0fa14..def6ea7 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -259,7 +259,7 @@ case "${host_os}" in
+         libzmq_dso_visibility="no"
+
+         if test "x$enable_static" = "xyes"; then
+-            CPPFLAGS="-DZMQ_STATIC"
++            CPPFLAGS="-DZMQ_STATIC $CPPFLAGS"
+         fi
+
+ 	# Set FD_SETSIZE to 1024
\ No newline at end of file

From 208d37f116611fb43e16965369b6d654c9e18984 Mon Sep 17 00:00:00 2001
From: fanquake <fanquake@gmail.com>
Date: Sun, 12 Jun 2016 11:11:24 +0800
Subject: [PATCH 0642/1802] [trivial] Remove URLs from About dialog
 translations

---
 src/init.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/init.cpp b/src/init.cpp
index 312dfe1699c08..fac279059c257 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -481,7 +481,7 @@ std::string LicenseInfo()
 {
     const std::string URL_SOURCE_CODE = "<https://github.com/bitcoin/bitcoin>";
     const std::string URL_WEBSITE = "<https://bitcoincore.org>";
-    // todo: remove urls from translations on next change
+
     return CopyrightHolders(strprintf(_("Copyright (C) %i-%i"), 2009, COPYRIGHT_YEAR) + " ") + "\n" +
            "\n" +
            strprintf(_("Please contribute if you find %s useful. "
@@ -493,9 +493,9 @@ std::string LicenseInfo()
            "\n" +
            "\n" +
            _("This is experimental software.") + "\n" +
-           _("Distributed under the MIT software license, see the accompanying file COPYING or <http://www.opensource.org/licenses/mit-license.php>.") + "\n" +
+           strprintf(_("Distributed under the MIT software license, see the accompanying file %s or %s"), "COPYING", "<https://opensource.org/licenses/MIT>") + "\n" +
            "\n" +
-           _("This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit <https://www.openssl.org/> and cryptographic software written by Eric Young and UPnP software written by Thomas Bernard.") +
+           strprintf(_("This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit %s and cryptographic software written by Eric Young and UPnP software written by Thomas Bernard."), "<https://www.openssl.org>") +
            "\n";
 }
 

From 7821889bce171ba44b27efe21439526e2aa7eb71 Mon Sep 17 00:00:00 2001
From: NicolasDorier <nicolas.dorier@gmail.com>
Date: Fri, 15 Jul 2016 00:02:59 +0900
Subject: [PATCH 0643/1802] Consensus: Remove calls to error() from
 ContextualCheckBlock

---
 src/main.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index 60c597797d56c..90c6f57eff4a6 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -3576,11 +3576,11 @@ bool ContextualCheckBlock(const CBlock& block, CValidationState& state, CBlockIn
             // already does not permit it, it is impossible to trigger in the
             // witness tree.
             if (block.vtx[0].wit.vtxinwit.size() != 1 || block.vtx[0].wit.vtxinwit[0].scriptWitness.stack.size() != 1 || block.vtx[0].wit.vtxinwit[0].scriptWitness.stack[0].size() != 32) {
-                return state.DoS(100, error("%s : invalid witness nonce size", __func__), REJECT_INVALID, "bad-witness-nonce-size", true);
+                return state.DoS(100, false, REJECT_INVALID, "bad-witness-nonce-size", true, strprintf("%s : invalid witness nonce size", __func__));
             }
             CHash256().Write(hashWitness.begin(), 32).Write(&block.vtx[0].wit.vtxinwit[0].scriptWitness.stack[0][0], 32).Finalize(hashWitness.begin());
             if (memcmp(hashWitness.begin(), &block.vtx[0].vout[commitpos].scriptPubKey[6], 32)) {
-                return state.DoS(100, error("%s : witness merkle commitment mismatch", __func__), REJECT_INVALID, "bad-witness-merkle-match", true);
+                return state.DoS(100, false, REJECT_INVALID, "bad-witness-merkle-match", true, strprintf("%s : witness merkle commitment mismatch", __func__));
             }
             fHaveWitness = true;
         }
@@ -3590,7 +3590,7 @@ bool ContextualCheckBlock(const CBlock& block, CValidationState& state, CBlockIn
     if (!fHaveWitness) {
         for (size_t i = 0; i < block.vtx.size(); i++) {
             if (!block.vtx[i].wit.IsNull()) {
-                return state.DoS(100, error("%s : unexpected witness data found", __func__), REJECT_INVALID, "unexpected-witness", true);
+                return state.DoS(100, false, REJECT_INVALID, "unexpected-witness", true, strprintf("%s : unexpected witness data found", __func__));
             }
         }
     }
@@ -3602,7 +3602,7 @@ bool ContextualCheckBlock(const CBlock& block, CValidationState& state, CBlockIn
     // the block hash, so we couldn't mark the block as permanently
     // failed).
     if (GetBlockWeight(block) > MAX_BLOCK_WEIGHT) {
-        return state.DoS(100, error("ContextualCheckBlock(): weight limit failed"), REJECT_INVALID, "bad-blk-weight");
+        return state.DoS(100, false, REJECT_INVALID, "bad-blk-weight", false, strprintf("%s : weight limit failed", __func__));
     }
 
     return true;

From b50e1ac298363a7733069f82709674d3a8cb3058 Mon Sep 17 00:00:00 2001
From: Jonas Schnelli <dev@jonasschnelli.ch>
Date: Thu, 21 Jul 2016 21:52:30 +0200
Subject: [PATCH 0644/1802] [Wallet] Correct hdmasterkeyid/masterkeyid name
 confusion

---
 qa/rpc-tests/wallet-hd.py |  2 +-
 src/wallet/rpcwallet.cpp  | 22 +++++++++++-----------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/qa/rpc-tests/wallet-hd.py b/qa/rpc-tests/wallet-hd.py
index c738ee2207e5a..c11da1e9a9989 100755
--- a/qa/rpc-tests/wallet-hd.py
+++ b/qa/rpc-tests/wallet-hd.py
@@ -31,7 +31,7 @@ def run_test (self):
         tmpdir = self.options.tmpdir
 
         # Make sure we use hd, keep masterkeyid
-        masterkeyid = self.nodes[1].getwalletinfo()['masterkeyid']
+        masterkeyid = self.nodes[1].getwalletinfo()['hdmasterkeyid']
         assert_equal(len(masterkeyid), 40)
 
         # Import a non-HD private key in the HD wallet
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index b4831ad795093..4087b8e77b7a2 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -2260,16 +2260,16 @@ UniValue getwalletinfo(const UniValue& params, bool fHelp)
             "Returns an object containing various wallet state info.\n"
             "\nResult:\n"
             "{\n"
-            "  \"walletversion\": xxxxx,     (numeric) the wallet version\n"
-            "  \"balance\": xxxxxxx,         (numeric) the total confirmed balance of the wallet in " + CURRENCY_UNIT + "\n"
-            "  \"unconfirmed_balance\": xxx, (numeric) the total unconfirmed balance of the wallet in " + CURRENCY_UNIT + "\n"
-            "  \"immature_balance\": xxxxxx, (numeric) the total immature balance of the wallet in " + CURRENCY_UNIT + "\n"
-            "  \"txcount\": xxxxxxx,         (numeric) the total number of transactions in the wallet\n"
-            "  \"keypoololdest\": xxxxxx,    (numeric) the timestamp (seconds since GMT epoch) of the oldest pre-generated key in the key pool\n"
-            "  \"keypoolsize\": xxxx,        (numeric) how many new keys are pre-generated\n"
-            "  \"unlocked_until\": ttt,      (numeric) the timestamp in seconds since epoch (midnight Jan 1 1970 GMT) that the wallet is unlocked for transfers, or 0 if the wallet is locked\n"
-            "  \"paytxfee\": x.xxxx,         (numeric) the transaction fee configuration, set in " + CURRENCY_UNIT + "/kB\n"
-            "  \"masterkeyid\": \"<hash160>\", (string) the Hash160 of the HD master pubkey\n"
+            "  \"walletversion\": xxxxx,       (numeric) the wallet version\n"
+            "  \"balance\": xxxxxxx,           (numeric) the total confirmed balance of the wallet in " + CURRENCY_UNIT + "\n"
+            "  \"unconfirmed_balance\": xxx,   (numeric) the total unconfirmed balance of the wallet in " + CURRENCY_UNIT + "\n"
+            "  \"immature_balance\": xxxxxx,   (numeric) the total immature balance of the wallet in " + CURRENCY_UNIT + "\n"
+            "  \"txcount\": xxxxxxx,           (numeric) the total number of transactions in the wallet\n"
+            "  \"keypoololdest\": xxxxxx,      (numeric) the timestamp (seconds since GMT epoch) of the oldest pre-generated key in the key pool\n"
+            "  \"keypoolsize\": xxxx,          (numeric) how many new keys are pre-generated\n"
+            "  \"unlocked_until\": ttt,        (numeric) the timestamp in seconds since epoch (midnight Jan 1 1970 GMT) that the wallet is unlocked for transfers, or 0 if the wallet is locked\n"
+            "  \"paytxfee\": x.xxxx,           (numeric) the transaction fee configuration, set in " + CURRENCY_UNIT + "/kB\n"
+            "  \"hdmasterkeyid\": \"<hash160>\", (string) the Hash160 of the HD master pubkey\n"
             "}\n"
             "\nExamples:\n"
             + HelpExampleCli("getwalletinfo", "")
@@ -2291,7 +2291,7 @@ UniValue getwalletinfo(const UniValue& params, bool fHelp)
     obj.push_back(Pair("paytxfee",      ValueFromAmount(payTxFee.GetFeePerK())));
     CKeyID masterKeyID = pwalletMain->GetHDChain().masterKeyID;
     if (!masterKeyID.IsNull())
-         obj.push_back(Pair("masterkeyid", masterKeyID.GetHex()));
+         obj.push_back(Pair("hdmasterkeyid", masterKeyID.GetHex()));
     return obj;
 }
 

From 1ffaff2f747af683513d6d74a7241d41e3f6e051 Mon Sep 17 00:00:00 2001
From: Johnson Lau <jl2012@users.noreply.github.com>
Date: Wed, 20 Jul 2016 18:31:45 +0800
Subject: [PATCH 0645/1802] Make witness v0 outputs non-standard before segwit
 activation

---
 src/main.cpp          | 5 +++--
 src/policy/policy.cpp | 9 ++++++---
 src/policy/policy.h   | 4 ++--
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index fe19895f5fbcc..70f0a424755a2 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1144,13 +1144,14 @@ bool AcceptToMemoryPoolWorker(CTxMemPool& pool, CValidationState& state, const C
     }
 
     // Reject transactions with witness before segregated witness activates (override with -prematurewitness)
-    if (!GetBoolArg("-prematurewitness",false) && !tx.wit.IsNull() && !IsWitnessEnabled(chainActive.Tip(), Params().GetConsensus())) {
+    bool witnessEnabled = IsWitnessEnabled(chainActive.Tip(), Params().GetConsensus());
+    if (!GetBoolArg("-prematurewitness",false) && !tx.wit.IsNull() && !witnessEnabled) {
         return state.DoS(0, false, REJECT_NONSTANDARD, "no-witness-yet", true);
     }
 
     // Rather not work on nonstandard transactions (unless -testnet/-regtest)
     string reason;
-    if (fRequireStandard && !IsStandardTx(tx, reason))
+    if (fRequireStandard && !IsStandardTx(tx, reason, witnessEnabled))
         return state.DoS(0, false, REJECT_NONSTANDARD, reason);
 
     // Only accept nLockTime-using transactions that can be mined in the next
diff --git a/src/policy/policy.cpp b/src/policy/policy.cpp
index 8617db00c8608..de3996bb4a480 100644
--- a/src/policy/policy.cpp
+++ b/src/policy/policy.cpp
@@ -31,7 +31,7 @@
      *   DUP CHECKSIG DROP ... repeated 100 times... OP_1
      */
 
-bool IsStandard(const CScript& scriptPubKey, txnouttype& whichType)
+bool IsStandard(const CScript& scriptPubKey, txnouttype& whichType, const bool witnessEnabled)
 {
     std::vector<std::vector<unsigned char> > vSolutions;
     if (!Solver(scriptPubKey, whichType, vSolutions))
@@ -49,11 +49,14 @@ bool IsStandard(const CScript& scriptPubKey, txnouttype& whichType)
     } else if (whichType == TX_NULL_DATA &&
                (!fAcceptDatacarrier || scriptPubKey.size() > nMaxDatacarrierBytes))
           return false;
+          
+    else if (!witnessEnabled && (whichType == TX_WITNESS_V0_KEYHASH || whichType == TX_WITNESS_V0_SCRIPTHASH))
+        return false;
 
     return whichType != TX_NONSTANDARD;
 }
 
-bool IsStandardTx(const CTransaction& tx, std::string& reason)
+bool IsStandardTx(const CTransaction& tx, std::string& reason, const bool witnessEnabled)
 {
     if (tx.nVersion > CTransaction::MAX_STANDARD_VERSION || tx.nVersion < 1) {
         reason = "version";
@@ -92,7 +95,7 @@ bool IsStandardTx(const CTransaction& tx, std::string& reason)
     unsigned int nDataOut = 0;
     txnouttype whichType;
     BOOST_FOREACH(const CTxOut& txout, tx.vout) {
-        if (!::IsStandard(txout.scriptPubKey, whichType)) {
+        if (!::IsStandard(txout.scriptPubKey, whichType, witnessEnabled)) {
             reason = "scriptpubkey";
             return false;
         }
diff --git a/src/policy/policy.h b/src/policy/policy.h
index f5f8652fb5a72..ad209d0306e2b 100644
--- a/src/policy/policy.h
+++ b/src/policy/policy.h
@@ -53,12 +53,12 @@ static const unsigned int STANDARD_NOT_MANDATORY_VERIFY_FLAGS = STANDARD_SCRIPT_
 static const unsigned int STANDARD_LOCKTIME_VERIFY_FLAGS = LOCKTIME_VERIFY_SEQUENCE |
                                                            LOCKTIME_MEDIAN_TIME_PAST;
 
-bool IsStandard(const CScript& scriptPubKey, txnouttype& whichType);
+bool IsStandard(const CScript& scriptPubKey, txnouttype& whichType, const bool witnessEnabled = false);
     /**
      * Check for standard transaction types
      * @return True if all outputs (scriptPubKeys) use only standard transaction forms
      */
-bool IsStandardTx(const CTransaction& tx, std::string& reason);
+bool IsStandardTx(const CTransaction& tx, std::string& reason, const bool witnessEnabled = false);
     /**
      * Check for standard transaction types
      * @param[in] mapInputs    Map of previous transactions that have outputs we're spending

From c59c434b7d1211c13f7904b9bc675e16910a1c0a Mon Sep 17 00:00:00 2001
From: Suhas Daftuar <sdaftuar@gmail.com>
Date: Fri, 22 Jul 2016 11:09:45 -0400
Subject: [PATCH 0646/1802] qa: Add test for standardness of segwit v0 outputs

---
 qa/rpc-tests/p2p-segwit.py | 78 ++++++++++++++++++++++++++++++++++++++
 src/policy/policy.cpp      |  2 +-
 2 files changed, 79 insertions(+), 1 deletion(-)

diff --git a/qa/rpc-tests/p2p-segwit.py b/qa/rpc-tests/p2p-segwit.py
index fa2c5d1f05e24..cd02692b1e88c 100755
--- a/qa/rpc-tests/p2p-segwit.py
+++ b/qa/rpc-tests/p2p-segwit.py
@@ -1086,6 +1086,82 @@ def test_block_relay(self, segwit_activated):
             self.old_node.announce_tx_and_wait_for_getdata(block4.vtx[0])
             assert(block4.sha256 not in self.old_node.getdataset)
 
+    # V0 segwit outputs should be standard after activation, but not before.
+    def test_standardness_v0(self, segwit_activated):
+        print("\tTesting standardness of v0 outputs (%s activation)" % ("after" if segwit_activated else "before"))
+        assert(len(self.utxo))
+
+        witness_program = CScript([OP_TRUE])
+        witness_hash = sha256(witness_program)
+        scriptPubKey = CScript([OP_0, witness_hash])
+
+        p2sh_pubkey = hash160(witness_program)
+        p2sh_scriptPubKey = CScript([OP_HASH160, p2sh_pubkey, OP_EQUAL])
+
+        # First prepare a p2sh output (so that spending it will pass standardness)
+        p2sh_tx = CTransaction()
+        p2sh_tx.vin = [CTxIn(COutPoint(self.utxo[0].sha256, self.utxo[0].n), b"")]
+        p2sh_tx.vout = [CTxOut(self.utxo[0].nValue-1000, p2sh_scriptPubKey)]
+        p2sh_tx.rehash()
+
+        # Mine it on test_node to create the confirmed output.
+        self.test_node.test_transaction_acceptance(p2sh_tx, with_witness=True, accepted=True)
+        self.nodes[0].generate(1)
+        sync_blocks(self.nodes)
+
+        # Now test standardness of v0 P2WSH outputs.
+        # Start by creating a transaction with two outputs.
+        tx = CTransaction()
+        tx.vin = [CTxIn(COutPoint(p2sh_tx.sha256, 0), CScript([witness_program]))]
+        tx.vout = [CTxOut(p2sh_tx.vout[0].nValue-10000, scriptPubKey)]
+        tx.vout.append(CTxOut(8000, scriptPubKey)) # Might burn this later
+        tx.rehash()
+
+        self.std_node.test_transaction_acceptance(tx, with_witness=True, accepted=segwit_activated)
+
+        # Now create something that looks like a P2PKH output. This won't be spendable.
+        scriptPubKey = CScript([OP_0, hash160(witness_hash)])
+        tx2 = CTransaction()
+        if segwit_activated:
+            # if tx was accepted, then we spend the second output.
+            tx2.vin = [CTxIn(COutPoint(tx.sha256, 1), b"")]
+            tx2.vout = [CTxOut(7000, scriptPubKey)]
+            tx2.wit.vtxinwit.append(CTxInWitness())
+            tx2.wit.vtxinwit[0].scriptWitness.stack = [witness_program]
+        else:
+            # if tx wasn't accepted, we just re-spend the p2sh output we started with.
+            tx2.vin = [CTxIn(COutPoint(p2sh_tx.sha256, 0), CScript([witness_program]))]
+            tx2.vout = [CTxOut(p2sh_tx.vout[0].nValue-1000, scriptPubKey)]
+        tx2.rehash()
+
+        self.std_node.test_transaction_acceptance(tx2, with_witness=True, accepted=segwit_activated)
+
+        # Now update self.utxo for later tests.
+        tx3 = CTransaction()
+        if segwit_activated:
+            # tx and tx2 were both accepted.  Don't bother trying to reclaim the
+            # P2PKH output; just send tx's first output back to an anyone-can-spend.
+            sync_mempools(self.nodes)
+            tx3.vin = [CTxIn(COutPoint(tx.sha256, 0), b"")]
+            tx3.vout = [CTxOut(tx.vout[0].nValue-1000, CScript([OP_TRUE]))]
+            tx3.wit.vtxinwit.append(CTxInWitness())
+            tx3.wit.vtxinwit[0].scriptWitness.stack = [witness_program]
+            tx3.rehash()
+            self.test_node.test_transaction_acceptance(tx3, with_witness=True, accepted=True)
+        else:
+            # tx and tx2 didn't go anywhere; just clean up the p2sh_tx output.
+            tx3.vin = [CTxIn(COutPoint(p2sh_tx.sha256, 0), CScript([witness_program]))]
+            tx3.vout = [CTxOut(p2sh_tx.vout[0].nValue-1000, witness_program)]
+            tx3.rehash()
+            self.test_node.test_transaction_acceptance(tx3, with_witness=True, accepted=True)
+
+        self.nodes[0].generate(1)
+        sync_blocks(self.nodes)
+        self.utxo.pop(0)
+        self.utxo.append(UTXO(tx3.sha256, 0, tx3.vout[0].nValue))
+        assert_equal(len(self.nodes[1].getrawmempool()), 0)
+
+
     # Verify that future segwit upgraded transactions are non-standard,
     # but valid in blocks. Can run this before and after segwit activation.
     def test_segwit_versions(self):
@@ -1658,6 +1734,7 @@ def run_test(self):
         self.test_witness_tx_relay_before_segwit_activation()
         self.test_block_relay(segwit_activated=False)
         self.test_p2sh_witness(segwit_activated=False)
+        self.test_standardness_v0(segwit_activated=False)
 
         sync_blocks(self.nodes)
 
@@ -1679,6 +1756,7 @@ def run_test(self):
         self.test_witness_input_length()
         self.test_block_relay(segwit_activated=True)
         self.test_tx_relay_after_segwit_activation()
+        self.test_standardness_v0(segwit_activated=True)
         self.test_segwit_versions()
         self.test_premature_coinbase_witness_spend()
         self.test_signature_version_1()
diff --git a/src/policy/policy.cpp b/src/policy/policy.cpp
index de3996bb4a480..57df1f0b1956b 100644
--- a/src/policy/policy.cpp
+++ b/src/policy/policy.cpp
@@ -49,7 +49,7 @@ bool IsStandard(const CScript& scriptPubKey, txnouttype& whichType, const bool w
     } else if (whichType == TX_NULL_DATA &&
                (!fAcceptDatacarrier || scriptPubKey.size() > nMaxDatacarrierBytes))
           return false;
-          
+
     else if (!witnessEnabled && (whichType == TX_WITNESS_V0_KEYHASH || whichType == TX_WITNESS_V0_SCRIPTHASH))
         return false;
 

From 122786d0e0170c73536360b705af711e1338adbf Mon Sep 17 00:00:00 2001
From: NicolasDorier <nicolas.dorier@gmail.com>
Date: Fri, 22 Jul 2016 08:27:55 +0900
Subject: [PATCH 0647/1802] Consensus: Remove ISM

---
 qa/rpc-tests/bip65-cltv-p2p.py | 40 +++++++++++++++----------------
 qa/rpc-tests/bip65-cltv.py     |  3 ++-
 qa/rpc-tests/bipdersig-p2p.py  | 42 ++++++++++++++++----------------
 src/chainparams.cpp            | 17 ++++++-------
 src/consensus/params.h         |  8 +++----
 src/main.cpp                   | 44 ++++++++++------------------------
 src/rpc/blockchain.cpp         | 36 +++++++++++++---------------
 7 files changed, 83 insertions(+), 107 deletions(-)

diff --git a/qa/rpc-tests/bip65-cltv-p2p.py b/qa/rpc-tests/bip65-cltv-p2p.py
index 754b6873b71ff..e903b2fbf07b3 100755
--- a/qa/rpc-tests/bip65-cltv-p2p.py
+++ b/qa/rpc-tests/bip65-cltv-p2p.py
@@ -71,9 +71,9 @@ def get_tests(self):
         self.nodeaddress = self.nodes[0].getnewaddress()
         self.last_block_time = int(time.time())
 
-        ''' 98 more version 3 blocks '''
+        ''' 398 more version 3 blocks '''
         test_blocks = []
-        for i in range(98):
+        for i in range(398):
             block = create_block(self.tip, create_coinbase(height), self.last_block_time + 1)
             block.nVersion = 3
             block.rehash()
@@ -118,24 +118,6 @@ def get_tests(self):
         height += 1
         yield TestInstance([[block, True]])
 
-        '''
-        Check that the new CLTV rules are enforced in the 751st version 4
-        block.
-        '''
-        spendtx = self.create_transaction(self.nodes[0],
-                self.coinbase_blocks[1], self.nodeaddress, 1.0)
-        cltv_invalidate(spendtx)
-        spendtx.rehash()
-
-        block = create_block(self.tip, create_coinbase(height), self.last_block_time + 1)
-        block.nVersion = 4
-        block.vtx.append(spendtx)
-        block.hashMerkleRoot = block.calc_merkle_root()
-        block.rehash()
-        block.solve()
-        self.last_block_time += 1
-        yield TestInstance([[block, False]])
-
         ''' Mine 199 new version blocks on last valid tip '''
         test_blocks = []
         for i in range(199):
@@ -169,6 +151,24 @@ def get_tests(self):
         height += 1
         yield TestInstance([[block, True]])
 
+        '''
+        Check that the new CLTV rules are enforced in the 951st version 4
+        block.
+        '''
+        spendtx = self.create_transaction(self.nodes[0],
+                self.coinbase_blocks[1], self.nodeaddress, 1.0)
+        cltv_invalidate(spendtx)
+        spendtx.rehash()
+
+        block = create_block(self.tip, create_coinbase(height), self.last_block_time + 1)
+        block.nVersion = 4
+        block.vtx.append(spendtx)
+        block.hashMerkleRoot = block.calc_merkle_root()
+        block.rehash()
+        block.solve()
+        self.last_block_time += 1
+        yield TestInstance([[block, False]])
+
         ''' Mine 1 old version block, should be invalid '''
         block = create_block(self.tip, create_coinbase(height), self.last_block_time + 1)
         block.nVersion = 3
diff --git a/qa/rpc-tests/bip65-cltv.py b/qa/rpc-tests/bip65-cltv.py
index abba7fc20e7d9..baa77b92a05bb 100755
--- a/qa/rpc-tests/bip65-cltv.py
+++ b/qa/rpc-tests/bip65-cltv.py
@@ -30,7 +30,8 @@ def run_test(self):
         cnt = self.nodes[0].getblockcount()
 
         # Mine some old-version blocks
-        self.nodes[1].generate(100)
+        self.nodes[1].generate(200)
+        cnt += 100
         self.sync_all()
         if (self.nodes[0].getblockcount() != cnt + 100):
             raise AssertionError("Failed to mine 100 version=3 blocks")
diff --git a/qa/rpc-tests/bipdersig-p2p.py b/qa/rpc-tests/bipdersig-p2p.py
index 4e4936a4ae6de..3bad5af5e67a4 100755
--- a/qa/rpc-tests/bipdersig-p2p.py
+++ b/qa/rpc-tests/bipdersig-p2p.py
@@ -79,9 +79,9 @@ def get_tests(self):
         self.nodeaddress = self.nodes[0].getnewaddress()
         self.last_block_time = int(time.time())
 
-        ''' 98 more version 2 blocks '''
+        ''' 298 more version 2 blocks '''
         test_blocks = []
-        for i in range(98):
+        for i in range(298):
             block = create_block(self.tip, create_coinbase(height), self.last_block_time + 1)
             block.nVersion = 2
             block.rehash()
@@ -124,25 +124,7 @@ def get_tests(self):
         self.last_block_time += 1
         self.tip = block.sha256
         height += 1
-        yield TestInstance([[block, True]])
-
-        ''' 
-        Check that the new DERSIG rules are enforced in the 751st version 3
-        block.
-        '''
-        spendtx = self.create_transaction(self.nodes[0],
-                self.coinbase_blocks[1], self.nodeaddress, 1.0)
-        unDERify(spendtx)
-        spendtx.rehash()
-
-        block = create_block(self.tip, create_coinbase(height), self.last_block_time + 1)
-        block.nVersion = 3
-        block.vtx.append(spendtx)
-        block.hashMerkleRoot = block.calc_merkle_root()
-        block.rehash()
-        block.solve()
-        self.last_block_time += 1
-        yield TestInstance([[block, False]])
+        yield TestInstance([[block, True]])       
 
         ''' Mine 199 new version blocks on last valid tip '''
         test_blocks = []
@@ -177,6 +159,24 @@ def get_tests(self):
         height += 1
         yield TestInstance([[block, True]])
 
+        ''' 
+        Check that the new DERSIG rules are enforced in the 951st version 3
+        block.
+        '''
+        spendtx = self.create_transaction(self.nodes[0],
+                self.coinbase_blocks[1], self.nodeaddress, 1.0)
+        unDERify(spendtx)
+        spendtx.rehash()
+
+        block = create_block(self.tip, create_coinbase(height), self.last_block_time + 1)
+        block.nVersion = 3
+        block.vtx.append(spendtx)
+        block.hashMerkleRoot = block.calc_merkle_root()
+        block.rehash()
+        block.solve()
+        self.last_block_time += 1
+        yield TestInstance([[block, False]])
+
         ''' Mine 1 old version block, should be invalid '''
         block = create_block(self.tip, create_coinbase(height), self.last_block_time + 1)
         block.nVersion = 2
diff --git a/src/chainparams.cpp b/src/chainparams.cpp
index 86bef1e105006..c7c8ce73d99f5 100644
--- a/src/chainparams.cpp
+++ b/src/chainparams.cpp
@@ -71,11 +71,10 @@ class CMainParams : public CChainParams {
     CMainParams() {
         strNetworkID = "main";
         consensus.nSubsidyHalvingInterval = 210000;
-        consensus.nMajorityEnforceBlockUpgrade = 750;
-        consensus.nMajorityRejectBlockOutdated = 950;
-        consensus.nMajorityWindow = 1000;
         consensus.BIP34Height = 227931;
         consensus.BIP34Hash = uint256S("0x000000000000024b89b42a942fe0d9fea3bb44ab7bd1b19115dd6a759c0808b8");
+        consensus.BIP65Height = 388381; // 000000000000000004c2b624ed5d7756c508d90fd0da2c7c679febfa6c4735f0
+        consensus.BIP66Height = 363725; // 00000000000000000379eaa19dce8c9b722d46ae6a57c2f1a988119488b50931
         consensus.powLimit = uint256S("00000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffff");
         consensus.nPowTargetTimespan = 14 * 24 * 60 * 60; // two weeks
         consensus.nPowTargetSpacing = 10 * 60;
@@ -167,11 +166,10 @@ class CTestNetParams : public CChainParams {
     CTestNetParams() {
         strNetworkID = "test";
         consensus.nSubsidyHalvingInterval = 210000;
-        consensus.nMajorityEnforceBlockUpgrade = 51;
-        consensus.nMajorityRejectBlockOutdated = 75;
-        consensus.nMajorityWindow = 100;
         consensus.BIP34Height = 21111;
         consensus.BIP34Hash = uint256S("0x0000000023b3a96d3484e5abb3755c413e7d41500f8e2a5c3f0dd01299cd8ef8");
+        consensus.BIP65Height = 581885; // 00000000007f6655f22f98e72ed80d8b06dc761d5da09df0fa1dc4be4f861eb6
+        consensus.BIP66Height = 330776; // 000000002104c8c45e99a8853285a3b592602a3ccde2b832481da85e9e4ba182
         consensus.powLimit = uint256S("00000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffff");
         consensus.nPowTargetTimespan = 14 * 24 * 60 * 60; // two weeks
         consensus.nPowTargetSpacing = 10 * 60;
@@ -247,11 +245,10 @@ class CRegTestParams : public CChainParams {
     CRegTestParams() {
         strNetworkID = "regtest";
         consensus.nSubsidyHalvingInterval = 150;
-        consensus.nMajorityEnforceBlockUpgrade = 750;
-        consensus.nMajorityRejectBlockOutdated = 950;
-        consensus.nMajorityWindow = 1000;
-        consensus.BIP34Height = -1; // BIP34 has not necessarily activated on regtest
+        consensus.BIP34Height = 100000000; // BIP34 has not activated on regtest (far in the future so block v1 are not rejected in tests)
         consensus.BIP34Hash = uint256();
+        consensus.BIP65Height = 1351; // BIP65 activated on regtest (Used in rpc activation tests)
+        consensus.BIP66Height = 1251; // BIP66 activated on regtest (Used in rpc activation tests)
         consensus.powLimit = uint256S("7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff");
         consensus.nPowTargetTimespan = 14 * 24 * 60 * 60; // two weeks
         consensus.nPowTargetSpacing = 10 * 60;
diff --git a/src/consensus/params.h b/src/consensus/params.h
index 822ec87d69e86..5b2f49184fc3f 100644
--- a/src/consensus/params.h
+++ b/src/consensus/params.h
@@ -39,13 +39,13 @@ struct BIP9Deployment {
 struct Params {
     uint256 hashGenesisBlock;
     int nSubsidyHalvingInterval;
-    /** Used to check majorities for block version upgrade */
-    int nMajorityEnforceBlockUpgrade;
-    int nMajorityRejectBlockOutdated;
-    int nMajorityWindow;
     /** Block height and hash at which BIP34 becomes active */
     int BIP34Height;
     uint256 BIP34Hash;
+    /** Block height at which BIP65 becomes active */
+    int BIP65Height;
+    /** Block height at which BIP66 becomes active */
+    int BIP66Height;
     /**
      * Minimum blocks including miner confirmation of the total of 2016 blocks in a retargetting period,
      * (nPowTargetTimespan / nPowTargetSpacing) which is also used for BIP9 deployments.
diff --git a/src/main.cpp b/src/main.cpp
index 124bc57e7d14e..e92dbd72feaa1 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -107,11 +107,6 @@ map<uint256, COrphanTx> mapOrphanTransactions GUARDED_BY(cs_main);
 map<COutPoint, set<map<uint256, COrphanTx>::iterator, IteratorComparator>> mapOrphanTransactionsByPrev GUARDED_BY(cs_main);
 void EraseOrphansFor(NodeId peer) EXCLUSIVE_LOCKS_REQUIRED(cs_main);
 
-/**
- * Returns true if there are nRequired or more blocks of minVersion or above
- * in the last Consensus::Params::nMajorityWindow blocks, starting at pstart and going backwards.
- */
-static bool IsSuperMajority(int minVersion, const CBlockIndex* pstart, unsigned nRequired, const Consensus::Params& consensusParams);
 static void CheckBlockIndex(const Consensus::Params& consensusParams);
 
 /** Constant stuff for coinbase transactions we create: */
@@ -2372,15 +2367,13 @@ bool ConnectBlock(const CBlock& block, CValidationState& state, CBlockIndex* pin
 
     unsigned int flags = fStrictPayToScriptHash ? SCRIPT_VERIFY_P2SH : SCRIPT_VERIFY_NONE;
 
-    // Start enforcing the DERSIG (BIP66) rules, for block.nVersion=3 blocks,
-    // when 75% of the network has upgraded:
-    if (block.nVersion >= 3 && IsSuperMajority(3, pindex->pprev, chainparams.GetConsensus().nMajorityEnforceBlockUpgrade, chainparams.GetConsensus())) {
+    // Start enforcing the DERSIG (BIP66) rule
+    if (pindex->nHeight >= chainparams.GetConsensus().BIP66Height) {
         flags |= SCRIPT_VERIFY_DERSIG;
     }
 
-    // Start enforcing CHECKLOCKTIMEVERIFY, (BIP65) for block.nVersion=4
-    // blocks, when 75% of the network has upgraded:
-    if (block.nVersion >= 4 && IsSuperMajority(4, pindex->pprev, chainparams.GetConsensus().nMajorityEnforceBlockUpgrade, chainparams.GetConsensus())) {
+    // Start enforcing CHECKLOCKTIMEVERIFY (BIP65) rule
+    if (pindex->nHeight >= chainparams.GetConsensus().BIP65Height) {
         flags |= SCRIPT_VERIFY_CHECKLOCKTIMEVERIFY;
     }
 
@@ -3504,6 +3497,7 @@ std::vector<unsigned char> GenerateCoinbaseCommitment(CBlock& block, const CBloc
 
 bool ContextualCheckBlockHeader(const CBlockHeader& block, CValidationState& state, const Consensus::Params& consensusParams, const CBlockIndex* pindexPrev, int64_t nAdjustedTime)
 {
+    const int nHeight = pindexPrev == NULL ? 0 : pindexPrev->nHeight + 1;
     // Check proof of work
     if (block.nBits != GetNextWorkRequired(pindexPrev, &block, consensusParams))
         return state.DoS(100, false, REJECT_INVALID, "bad-diffbits", false, "incorrect proof of work");
@@ -3517,10 +3511,12 @@ bool ContextualCheckBlockHeader(const CBlockHeader& block, CValidationState& sta
         return state.Invalid(false, REJECT_INVALID, "time-too-new", "block timestamp too far in the future");
 
     // Reject outdated version blocks when 95% (75% on testnet) of the network has upgraded:
-    for (int32_t version = 2; version < 5; ++version) // check for version 2, 3 and 4 upgrades
-        if (block.nVersion < version && IsSuperMajority(version, pindexPrev, consensusParams.nMajorityRejectBlockOutdated, consensusParams))
-            return state.Invalid(false, REJECT_OBSOLETE, strprintf("bad-version(0x%08x)", version - 1),
-                                 strprintf("rejected nVersion=0x%08x block", version - 1));
+    // check for version 2, 3 and 4 upgrades
+    if((block.nVersion < 2 && nHeight >= consensusParams.BIP34Height) ||
+       (block.nVersion < 3 && nHeight >= consensusParams.BIP66Height) ||
+       (block.nVersion < 4 && nHeight >= consensusParams.BIP65Height))
+            return state.Invalid(false, REJECT_OBSOLETE, strprintf("bad-version(0x%08x)", block.nVersion),
+                                 strprintf("rejected nVersion=0x%08x block", block.nVersion));
 
     return true;
 }
@@ -3547,9 +3543,8 @@ bool ContextualCheckBlock(const CBlock& block, CValidationState& state, const CB
         }
     }
 
-    // Enforce block.nVersion=2 rule that the coinbase starts with serialized block height
-    // if 750 of the last 1,000 blocks are version 2 or greater (51/100 if testnet):
-    if (block.nVersion >= 2 && IsSuperMajority(2, pindexPrev, consensusParams.nMajorityEnforceBlockUpgrade, consensusParams))
+    // Enforce rule that the coinbase starts with serialized block height
+    if (nHeight >= consensusParams.BIP34Height)
     {
         CScript expect = CScript() << nHeight;
         if (block.vtx[0].vin[0].scriptSig.size() < expect.size() ||
@@ -3722,19 +3717,6 @@ static bool AcceptBlock(const CBlock& block, CValidationState& state, const CCha
     return true;
 }
 
-static bool IsSuperMajority(int minVersion, const CBlockIndex* pstart, unsigned nRequired, const Consensus::Params& consensusParams)
-{
-    unsigned int nFound = 0;
-    for (int i = 0; i < consensusParams.nMajorityWindow && nFound < nRequired && pstart != NULL; i++)
-    {
-        if (pstart->nVersion >= minVersion)
-            ++nFound;
-        pstart = pstart->pprev;
-    }
-    return (nFound >= nRequired);
-}
-
-
 bool ProcessNewBlock(CValidationState& state, const CChainParams& chainparams, CNode* pfrom, const CBlock* pblock, bool fForceProcessing, const CDiskBlockPos* dbp)
 {
     {
diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp
index 9dc896b7af281..e3c32d905af74 100644
--- a/src/rpc/blockchain.cpp
+++ b/src/rpc/blockchain.cpp
@@ -817,22 +817,23 @@ UniValue verifychain(const UniValue& params, bool fHelp)
 }
 
 /** Implementation of IsSuperMajority with better feedback */
-static UniValue SoftForkMajorityDesc(int minVersion, CBlockIndex* pindex, int nRequired, const Consensus::Params& consensusParams)
+static UniValue SoftForkMajorityDesc(int version, CBlockIndex* pindex, const Consensus::Params& consensusParams)
 {
-    int nFound = 0;
-    CBlockIndex* pstart = pindex;
-    for (int i = 0; i < consensusParams.nMajorityWindow && pstart != NULL; i++)
+    UniValue rv(UniValue::VOBJ);
+    bool activated = false;
+    switch(version)
     {
-        if (pstart->nVersion >= minVersion)
-            ++nFound;
-        pstart = pstart->pprev;
+        case 2:
+            activated = pindex->nHeight >= consensusParams.BIP34Height;
+            break;
+        case 3:
+            activated = pindex->nHeight >= consensusParams.BIP66Height;
+            break;
+        case 4:
+            activated = pindex->nHeight >= consensusParams.BIP65Height;
+            break;
     }
-
-    UniValue rv(UniValue::VOBJ);
-    rv.push_back(Pair("status", nFound >= nRequired));
-    rv.push_back(Pair("found", nFound));
-    rv.push_back(Pair("required", nRequired));
-    rv.push_back(Pair("window", consensusParams.nMajorityWindow));
+    rv.push_back(Pair("status", activated));
     return rv;
 }
 
@@ -841,8 +842,7 @@ static UniValue SoftForkDesc(const std::string &name, int version, CBlockIndex*
     UniValue rv(UniValue::VOBJ);
     rv.push_back(Pair("id", name));
     rv.push_back(Pair("version", version));
-    rv.push_back(Pair("enforce", SoftForkMajorityDesc(version, pindex, consensusParams.nMajorityEnforceBlockUpgrade, consensusParams)));
-    rv.push_back(Pair("reject", SoftForkMajorityDesc(version, pindex, consensusParams.nMajorityRejectBlockOutdated, consensusParams)));
+    rv.push_back(Pair("reject", SoftForkMajorityDesc(version, pindex, consensusParams)));
     return rv;
 }
 
@@ -897,13 +897,9 @@ UniValue getblockchaininfo(const UniValue& params, bool fHelp)
             "     {\n"
             "        \"id\": \"xxxx\",        (string) name of softfork\n"
             "        \"version\": xx,         (numeric) block version\n"
-            "        \"enforce\": {           (object) progress toward enforcing the softfork rules for new-version blocks\n"
+            "        \"reject\": {            (object) progress toward rejecting pre-softfork blocks\n"
             "           \"status\": xx,       (boolean) true if threshold reached\n"
-            "           \"found\": xx,        (numeric) number of blocks with the new version found\n"
-            "           \"required\": xx,     (numeric) number of blocks required to trigger\n"
-            "           \"window\": xx,       (numeric) maximum size of examined window of recent blocks\n"
             "        },\n"
-            "        \"reject\": { ... }      (object) progress toward rejecting pre-softfork blocks (same fields as \"enforce\")\n"
             "     }, ...\n"
             "  ],\n"
             "  \"bip9_softforks\": {          (object) status of BIP9 softforks in progress\n"

From cc021ef4862ee8c67453aebf746b98b591e4fc99 Mon Sep 17 00:00:00 2001
From: lizhi <cqtenq9@gmail.com>
Date: Sun, 24 Jul 2016 10:49:07 +0800
Subject: [PATCH 0648/1802] remove outdated legacy code

CheckSignatureElement is not used,it be replaced by eccrypto::CheckSignatureElement.
---
 src/key.h | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/key.h b/src/key.h
index b4f48d59f5b08..4e5e208928d59 100644
--- a/src/key.h
+++ b/src/key.h
@@ -146,9 +146,6 @@ class CKey
 
     //! Load private key and check that public key matches.
     bool Load(CPrivKey& privkey, CPubKey& vchPubKey, bool fSkipCheck);
-
-    //! Check whether an element of a signature (r or s) is valid.
-    static bool CheckSignatureElement(const unsigned char* vch, int len, bool half);
 };
 
 struct CExtKey {

From 0ff4375c93bd159233282de5a33ad2e6c1e79841 Mon Sep 17 00:00:00 2001
From: whythat <yuri.zhykin@gmail.com>
Date: Mon, 25 Jul 2016 01:30:28 +0300
Subject: [PATCH 0649/1802] [qa]: add parsing for '<host>:<port>' argument form
 to rpc_url()

---
 qa/rpc-tests/test_framework/util.py | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/qa/rpc-tests/test_framework/util.py b/qa/rpc-tests/test_framework/util.py
index 32fe79efc38be..8aa34265c5447 100644
--- a/qa/rpc-tests/test_framework/util.py
+++ b/qa/rpc-tests/test_framework/util.py
@@ -171,7 +171,15 @@ def rpc_auth_pair(n):
 
 def rpc_url(i, rpchost=None):
     rpc_u, rpc_p = rpc_auth_pair(i)
-    return "http://%s:%s@%s:%d" % (rpc_u, rpc_p, rpchost or '127.0.0.1', rpc_port(i))
+    host = '127.0.0.1'
+    port = rpc_port(i)
+    if rpchost:
+        parts = rpchost.split(':')
+        if len(parts) == 2:
+            host, port = parts
+        else:
+            host = rpchost
+    return "http://%s:%s@%s:%d" % (rpc_u, rpc_p, host, int(port))
 
 def wait_for_bitcoind_start(process, url, i):
     '''

From 9bbb414b800cf71f93f15d2cb5d4cf32c72294e6 Mon Sep 17 00:00:00 2001
From: whythat <yuri.zhykin@gmail.com>
Date: Mon, 25 Jul 2016 01:31:05 +0300
Subject: [PATCH 0650/1802] [qa]: enable rpcbind_test

---
 qa/pull-tester/rpc-tests.py  |   2 +-
 qa/rpc-tests/rpcbind_test.py | 219 +++++++++++++++--------------------
 2 files changed, 93 insertions(+), 128 deletions(-)

diff --git a/qa/pull-tester/rpc-tests.py b/qa/pull-tester/rpc-tests.py
index 11b83bac1468d..84ab9d92c5090 100755
--- a/qa/pull-tester/rpc-tests.py
+++ b/qa/pull-tester/rpc-tests.py
@@ -158,7 +158,7 @@
     'txn_clone.py --mineblock',
     'forknotify.py',
     'invalidateblock.py',
-#    'rpcbind_test.py', #temporary, bug in libevent, see #6655
+    'rpcbind_test.py',
     'smartfees.py',
     'maxblocksinflight.py',
     'p2p-acceptblock.py',
diff --git a/qa/rpc-tests/rpcbind_test.py b/qa/rpc-tests/rpcbind_test.py
index 572273566b63a..bf1cc8712611a 100755
--- a/qa/rpc-tests/rpcbind_test.py
+++ b/qa/rpc-tests/rpcbind_test.py
@@ -5,143 +5,108 @@
 
 # Test for -rpcbind, as well as -rpcallowip and -rpcconnect
 
-# TODO extend this test from the test framework (like all other tests)
-
 import tempfile
 import traceback
 
+from test_framework.test_framework import BitcoinTestFramework
 from test_framework.util import *
 from test_framework.netutil import *
 
-def run_bind_test(tmpdir, allow_ips, connect_to, addresses, expected):
-    '''
-    Start a node with requested rpcallowip and rpcbind parameters,
-    then try to connect, and check if the set of bound addresses
-    matches the expected set.
-    '''
-    expected = [(addr_to_hex(addr), port) for (addr, port) in expected]
-    base_args = ['-disablewallet', '-nolisten']
-    if allow_ips:
-        base_args += ['-rpcallowip=' + x for x in allow_ips]
-    binds = ['-rpcbind='+addr for addr in addresses]
-    nodes = start_nodes(self.num_nodes, tmpdir, [base_args + binds], connect_to)
-    try:
-        pid = bitcoind_processes[0].pid
-        assert_equal(set(get_bind_addrs(pid)), set(expected))
-    finally:
-        stop_nodes(nodes)
-        wait_bitcoinds()
-
-def run_allowip_test(tmpdir, allow_ips, rpchost, rpcport):
-    '''
-    Start a node with rpcwallow IP, and request getinfo
-    at a non-localhost IP.
-    '''
-    base_args = ['-disablewallet', '-nolisten'] + ['-rpcallowip='+x for x in allow_ips]
-    nodes = start_nodes(self.num_nodes, tmpdir, [base_args])
-    try:
-        # connect to node through non-loopback interface
-        url = "http://rt:rt@%s:%d" % (rpchost, rpcport,)
-        node = get_rpc_proxy(url, 1)
-        node.getinfo()
-    finally:
-        node = None # make sure connection will be garbage collected and closed
-        stop_nodes(nodes)
-        wait_bitcoinds()
-
-
-def run_test(tmpdir):
-    assert(sys.platform.startswith('linux')) # due to OS-specific network stats queries, this test works only on Linux
-    # find the first non-loopback interface for testing
-    non_loopback_ip = None
-    for name,ip in all_interfaces():
-        if ip != '127.0.0.1':
-            non_loopback_ip = ip
-            break
-    if non_loopback_ip is None:
-        assert(not 'This test requires at least one non-loopback IPv4 interface')
-    print("Using interface %s for testing" % non_loopback_ip)
+class RPCBindTest(BitcoinTestFramework):
 
-    defaultport = rpc_port(0)
+    def __init__(self):
+        super().__init__()
+        self.setup_clean_chain = True
+        self.num_nodes = 1
 
-    # check default without rpcallowip (IPv4 and IPv6 localhost)
-    run_bind_test(tmpdir, None, '127.0.0.1', [],
-        [('127.0.0.1', defaultport), ('::1', defaultport)])
-    # check default with rpcallowip (IPv6 any)
-    run_bind_test(tmpdir, ['127.0.0.1'], '127.0.0.1', [],
-        [('::0', defaultport)])
-    # check only IPv4 localhost (explicit)
-    run_bind_test(tmpdir, ['127.0.0.1'], '127.0.0.1', ['127.0.0.1'],
-        [('127.0.0.1', defaultport)])
-    # check only IPv4 localhost (explicit) with alternative port
-    run_bind_test(tmpdir, ['127.0.0.1'], '127.0.0.1:32171', ['127.0.0.1:32171'],
-        [('127.0.0.1', 32171)])
-    # check only IPv4 localhost (explicit) with multiple alternative ports on same host
-    run_bind_test(tmpdir, ['127.0.0.1'], '127.0.0.1:32171', ['127.0.0.1:32171', '127.0.0.1:32172'],
-        [('127.0.0.1', 32171), ('127.0.0.1', 32172)])
-    # check only IPv6 localhost (explicit)
-    run_bind_test(tmpdir, ['[::1]'], '[::1]', ['[::1]'],
-        [('::1', defaultport)])
-    # check both IPv4 and IPv6 localhost (explicit)
-    run_bind_test(tmpdir, ['127.0.0.1'], '127.0.0.1', ['127.0.0.1', '[::1]'],
-        [('127.0.0.1', defaultport), ('::1', defaultport)])
-    # check only non-loopback interface
-    run_bind_test(tmpdir, [non_loopback_ip], non_loopback_ip, [non_loopback_ip],
-        [(non_loopback_ip, defaultport)])
-
-    # Check that with invalid rpcallowip, we are denied
-    run_allowip_test(tmpdir, [non_loopback_ip], non_loopback_ip, defaultport)
-    try:
-        run_allowip_test(tmpdir, ['1.1.1.1'], non_loopback_ip, defaultport)
-        assert(not 'Connection not denied by rpcallowip as expected')
-    except ValueError:
+    def setup_network(self):
         pass
 
-def main():
-    import optparse
-
-    parser = optparse.OptionParser(usage="%prog [options]")
-    parser.add_option("--nocleanup", dest="nocleanup", default=False, action="store_true",
-                      help="Leave bitcoinds and test.* datadir on exit or error")
-    parser.add_option("--srcdir", dest="srcdir", default="../../src",
-                      help="Source directory containing bitcoind/bitcoin-cli (default: %default%)")
-    parser.add_option("--tmpdir", dest="tmpdir", default=tempfile.mkdtemp(prefix="test"),
-                      help="Root directory for datadirs")
-    (options, args) = parser.parse_args()
-
-    os.environ['PATH'] = options.srcdir+":"+os.environ['PATH']
-
-    check_json_precision()
-
-    success = False
-    nodes = []
-    try:
-        print("Initializing test directory "+options.tmpdir)
-        if not os.path.isdir(options.tmpdir):
-            os.makedirs(options.tmpdir)
-        initialize_chain(options.tmpdir)
-
-        run_test(options.tmpdir)
-
-        success = True
-
-    except AssertionError as e:
-        print("Assertion failed: "+e.message)
-    except Exception as e:
-        print("Unexpected exception caught during testing: "+str(e))
-        traceback.print_tb(sys.exc_info()[2])
-
-    if not options.nocleanup:
-        print("Cleaning up")
-        wait_bitcoinds()
-        shutil.rmtree(options.tmpdir)
+    def setup_nodes(self):
+        pass
 
-    if success:
-        print("Tests successful")
-        sys.exit(0)
-    else:
-        print("Failed")
-        sys.exit(1)
+    def run_bind_test(self, allow_ips, connect_to, addresses, expected):
+        '''
+        Start a node with requested rpcallowip and rpcbind parameters,
+        then try to connect, and check if the set of bound addresses
+        matches the expected set.
+        '''
+        expected = [(addr_to_hex(addr), port) for (addr, port) in expected]
+        base_args = ['-disablewallet', '-nolisten']
+        if allow_ips:
+            base_args += ['-rpcallowip=' + x for x in allow_ips]
+        binds = ['-rpcbind='+addr for addr in addresses]
+        self.nodes = start_nodes(self.num_nodes, self.options.tmpdir, [base_args + binds], connect_to)
+        try:
+            pid = bitcoind_processes[0].pid
+            assert_equal(set(get_bind_addrs(pid)), set(expected))
+        finally:
+            stop_nodes(self.nodes)
+            wait_bitcoinds()
+
+    def run_allowip_test(self, allow_ips, rpchost, rpcport):
+        '''
+        Start a node with rpcwallow IP, and request getinfo
+        at a non-localhost IP.
+        '''
+        base_args = ['-disablewallet', '-nolisten'] + ['-rpcallowip='+x for x in allow_ips]
+        self.nodes = start_nodes(self.num_nodes, self.options.tmpdir, [base_args])
+        try:
+            # connect to node through non-loopback interface
+            node = get_rpc_proxy(rpc_url(0, "%s:%d" % (rpchost, rpcport)), 0)
+            node.getinfo()
+        finally:
+            node = None # make sure connection will be garbage collected and closed
+            stop_nodes(self.nodes)
+            wait_bitcoinds()
+
+    def run_test(self):
+        # due to OS-specific network stats queries, this test works only on Linux
+        assert(sys.platform.startswith('linux'))
+        # find the first non-loopback interface for testing
+        non_loopback_ip = None
+        for name,ip in all_interfaces():
+            if ip != '127.0.0.1':
+                non_loopback_ip = ip
+                break
+        if non_loopback_ip is None:
+            assert(not 'This test requires at least one non-loopback IPv4 interface')
+        print("Using interface %s for testing" % non_loopback_ip)
+
+        defaultport = rpc_port(0)
+
+        # check default without rpcallowip (IPv4 and IPv6 localhost)
+        self.run_bind_test(None, '127.0.0.1', [],
+            [('127.0.0.1', defaultport), ('::1', defaultport)])
+        # check default with rpcallowip (IPv6 any)
+        self.run_bind_test(['127.0.0.1'], '127.0.0.1', [],
+            [('::0', defaultport)])
+        # check only IPv4 localhost (explicit)
+        self.run_bind_test(['127.0.0.1'], '127.0.0.1', ['127.0.0.1'],
+            [('127.0.0.1', defaultport)])
+        # check only IPv4 localhost (explicit) with alternative port
+        self.run_bind_test(['127.0.0.1'], '127.0.0.1:32171', ['127.0.0.1:32171'],
+            [('127.0.0.1', 32171)])
+        # check only IPv4 localhost (explicit) with multiple alternative ports on same host
+        self.run_bind_test(['127.0.0.1'], '127.0.0.1:32171', ['127.0.0.1:32171', '127.0.0.1:32172'],
+            [('127.0.0.1', 32171), ('127.0.0.1', 32172)])
+        # check only IPv6 localhost (explicit)
+        self.run_bind_test(['[::1]'], '[::1]', ['[::1]'],
+            [('::1', defaultport)])
+        # check both IPv4 and IPv6 localhost (explicit)
+        self.run_bind_test(['127.0.0.1'], '127.0.0.1', ['127.0.0.1', '[::1]'],
+            [('127.0.0.1', defaultport), ('::1', defaultport)])
+        # check only non-loopback interface
+        self.run_bind_test([non_loopback_ip], non_loopback_ip, [non_loopback_ip],
+            [(non_loopback_ip, defaultport)])
+
+        # Check that with invalid rpcallowip, we are denied
+        self.run_allowip_test([non_loopback_ip], non_loopback_ip, defaultport)
+        try:
+            self.run_allowip_test(['1.1.1.1'], non_loopback_ip, defaultport)
+            assert(not 'Connection not denied by rpcallowip as expected')
+        except JSONRPCException:
+            pass
 
 if __name__ == '__main__':
-    main()
+    RPCBindTest ().main ()

From 1de2a46632946990a7863020b61172232f8c5796 Mon Sep 17 00:00:00 2001
From: Suhas Daftuar <sdaftuar@chaincode.com>
Date: Tue, 26 Jul 2016 16:50:48 -0400
Subject: [PATCH 0651/1802] Ignore GETBLOCKTXN requests for unknown blocks

Don't disconnect peers, or else we leak information that could be
used for fingerprinting.
---
 src/main.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/main.cpp b/src/main.cpp
index 052b739326a5a..4675127ec37ac 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -5343,7 +5343,6 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
 
         BlockMap::iterator it = mapBlockIndex.find(req.blockhash);
         if (it == mapBlockIndex.end() || !(it->second->nStatus & BLOCK_HAVE_DATA)) {
-            Misbehaving(pfrom->GetId(), 100);
             LogPrintf("Peer %d sent us a getblocktxn for a block we don't have", pfrom->id);
             return true;
         }

From 1d06e49834814eed45e07393dcffd7b6683311b2 Mon Sep 17 00:00:00 2001
From: Suhas Daftuar <sdaftuar@chaincode.com>
Date: Tue, 26 Jul 2016 16:52:35 -0400
Subject: [PATCH 0652/1802] Ignore CMPCTBLOCK messages for pruned blocks

Also ignores CMPCTBLOCK announcements that have too little work.  This is to
prevent disk-exhaustion DoS.
---
 src/main.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main.cpp b/src/main.cpp
index 4675127ec37ac..b41a719552ec8 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -5626,8 +5626,8 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
                 std::vector<CInv> vInv(1);
                 vInv[0] = CInv(MSG_BLOCK, cmpctblock.header.GetHash());
                 pfrom->PushMessage(NetMsgType::GETDATA, vInv);
-                return true;
             }
+            return true;
         }
 
         // If we're not close to tip yet, give up and let parallel block fetch work its magic

From 77c912d21c8cd153f4503c65225a5a46990cc85a Mon Sep 17 00:00:00 2001
From: Jonas Schnelli <dev@jonasschnelli.ch>
Date: Wed, 15 Jun 2016 10:49:29 +0200
Subject: [PATCH 0653/1802] [Wallet] add HD xpriv to dumpwallet

---
 src/wallet/rpcdump.cpp | 29 ++++++++++++++++++++++++++---
 src/wallet/wallet.h    |  2 +-
 2 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/src/wallet/rpcdump.cpp b/src/wallet/rpcdump.cpp
index d55cc68dc0309..6647d3297fad2 100644
--- a/src/wallet/rpcdump.cpp
+++ b/src/wallet/rpcdump.cpp
@@ -602,19 +602,42 @@ UniValue dumpwallet(const UniValue& params, bool fHelp)
     file << strprintf("# * Best block at time of backup was %i (%s),\n", chainActive.Height(), chainActive.Tip()->GetBlockHash().ToString());
     file << strprintf("#   mined on %s\n", EncodeDumpTime(chainActive.Tip()->GetBlockTime()));
     file << "\n";
+
+    // add the base58check encoded extended master if the wallet uses HD 
+    CKeyID masterKeyID = pwalletMain->GetHDChain().masterKeyID;
+    if (!masterKeyID.IsNull())
+    {
+        CKey key;
+        if (pwalletMain->GetKey(masterKeyID, key))
+        {
+            CExtKey masterKey;
+            masterKey.SetMaster(key.begin(), key.size());
+
+            CBitcoinExtKey b58extkey;
+            b58extkey.SetKey(masterKey);
+
+            file << "# extended private masterkey: " << b58extkey.ToString() << "\n\n";
+        }
+    }
     for (std::vector<std::pair<int64_t, CKeyID> >::const_iterator it = vKeyBirth.begin(); it != vKeyBirth.end(); it++) {
         const CKeyID &keyid = it->second;
         std::string strTime = EncodeDumpTime(it->first);
         std::string strAddr = CBitcoinAddress(keyid).ToString();
         CKey key;
         if (pwalletMain->GetKey(keyid, key)) {
+            file << strprintf("%s %s ", CBitcoinSecret(key).ToString(), strTime);
             if (pwalletMain->mapAddressBook.count(keyid)) {
-                file << strprintf("%s %s label=%s # addr=%s\n", CBitcoinSecret(key).ToString(), strTime, EncodeDumpString(pwalletMain->mapAddressBook[keyid].name), strAddr);
+                file << strprintf("label=%s", EncodeDumpString(pwalletMain->mapAddressBook[keyid].name));
+            } else if (keyid == masterKeyID) {
+                file << "hdmaster=1";
             } else if (setKeyPool.count(keyid)) {
-                file << strprintf("%s %s reserve=1 # addr=%s\n", CBitcoinSecret(key).ToString(), strTime, strAddr);
+                file << "reserve=1";
+            } else if (pwalletMain->mapKeyMetadata[keyid].hdKeypath == "m") {
+                file << "inactivehdmaster=1";
             } else {
-                file << strprintf("%s %s change=1 # addr=%s\n", CBitcoinSecret(key).ToString(), strTime, strAddr);
+                file << "change=1";
             }
+            file << strprintf(" # addr=%s%s\n", strAddr, (pwalletMain->mapKeyMetadata[keyid].hdKeypath.size() > 0 ? " hdkeypath="+pwalletMain->mapKeyMetadata[keyid].hdKeypath : ""));
         }
     }
     file << "\n";
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
index 3a3cb6d8514c0..efed2ba11df02 100644
--- a/src/wallet/wallet.h
+++ b/src/wallet/wallet.h
@@ -899,10 +899,10 @@ class CWallet : public CCryptoKeyStore, public CValidationInterface
 
     /* Set the HD chain model (chain child index counters) */
     bool SetHDChain(const CHDChain& chain, bool memonly);
+    const CHDChain& GetHDChain() { return hdChain; }
 
     /* Set the current HD master key (will reset the chain child index counters) */
     bool SetHDMasterKey(const CKey& key);
-    const CHDChain& GetHDChain() { return hdChain; }
 };
 
 /** A key allocated from the key pool. */

From c8664eeac75fb87282dc69049cfa23d583742629 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jorge=20Tim=C3=B3n?= <jtimon@jtimon.cc>
Date: Sun, 17 Jul 2016 05:49:46 +0200
Subject: [PATCH 0654/1802] Trivial: pass Consensus::Params& instead of
 CChainParams& in ContextualCheckBlock

---
 src/main.cpp | 8 ++++----
 src/main.h   | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index 124bc57e7d14e..b7a20c78d59ab 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -3525,10 +3525,9 @@ bool ContextualCheckBlockHeader(const CBlockHeader& block, CValidationState& sta
     return true;
 }
 
-bool ContextualCheckBlock(const CBlock& block, CValidationState& state, const CBlockIndex* pindexPrev)
+bool ContextualCheckBlock(const CBlock& block, CValidationState& state, const Consensus::Params& consensusParams, const CBlockIndex* pindexPrev)
 {
     const int nHeight = pindexPrev == NULL ? 0 : pindexPrev->nHeight + 1;
-    const Consensus::Params& consensusParams = Params().GetConsensus();
 
     // Start enforcing BIP113 (Median Time Past) using versionbits logic.
     int nLockTimeFlags = 0;
@@ -3689,7 +3688,8 @@ static bool AcceptBlock(const CBlock& block, CValidationState& state, const CCha
     }
     if (fNewBlock) *fNewBlock = true;
 
-    if ((!CheckBlock(block, state, chainparams.GetConsensus(), GetAdjustedTime())) || !ContextualCheckBlock(block, state, pindex->pprev)) {
+    if (!CheckBlock(block, state, chainparams.GetConsensus(), GetAdjustedTime()) ||
+        !ContextualCheckBlock(block, state, chainparams.GetConsensus(), pindex->pprev)) {
         if (state.IsInvalid() && !state.CorruptionPossible()) {
             pindex->nStatus |= BLOCK_FAILED_VALID;
             setDirtyBlockIndex.insert(pindex);
@@ -3780,7 +3780,7 @@ bool TestBlockValidity(CValidationState& state, const CChainParams& chainparams,
         return error("%s: Consensus::ContextualCheckBlockHeader: %s", __func__, FormatStateMessage(state));
     if (!CheckBlock(block, state, chainparams.GetConsensus(), fCheckPOW, fCheckMerkleRoot))
         return error("%s: Consensus::CheckBlock: %s", __func__, FormatStateMessage(state));
-    if (!ContextualCheckBlock(block, state, pindexPrev))
+    if (!ContextualCheckBlock(block, state, chainparams.GetConsensus(), pindexPrev))
         return error("%s: Consensus::ContextualCheckBlock: %s", __func__, FormatStateMessage(state));
     if (!ConnectBlock(block, state, &indexDummy, viewNew, chainparams, true))
         return false;
diff --git a/src/main.h b/src/main.h
index feaaaad750b1c..262e94b9f8f52 100644
--- a/src/main.h
+++ b/src/main.h
@@ -448,7 +448,7 @@ bool CheckBlock(const CBlock& block, CValidationState& state, const Consensus::P
  *  By "context", we mean only the previous block headers, but not the UTXO
  *  set; UTXO-related validity checks are done in ConnectBlock(). */
 bool ContextualCheckBlockHeader(const CBlockHeader& block, CValidationState& state, const Consensus::Params& consensusParams, const CBlockIndex* pindexPrev, int64_t nAdjustedTime);
-bool ContextualCheckBlock(const CBlock& block, CValidationState& state, const CBlockIndex* pindexPrev);
+bool ContextualCheckBlock(const CBlock& block, CValidationState& state, const Consensus::Params& consensusParams, const CBlockIndex* pindexPrev);
 
 /** Apply the effects of this block (with given index) on the UTXO set represented by coins.
  *  Validity checks that depend on the UTXO set are also done; ConnectBlock()

From d12b732ac287a1ed7543481b79801c9afc333b7f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jorge=20Tim=C3=B3n?= <jtimon@jtimon.cc>
Date: Wed, 27 Jul 2016 22:42:13 +0200
Subject: [PATCH 0655/1802] libconsensus: Expose a flag for BIP112

We added the segwit one, but we forgot CHECKSEQUENCEVERIFY
---
 src/script/bitcoinconsensus.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/script/bitcoinconsensus.h b/src/script/bitcoinconsensus.h
index 6f868d0d6d6ab..f73a8e30bc6c4 100644
--- a/src/script/bitcoinconsensus.h
+++ b/src/script/bitcoinconsensus.h
@@ -51,6 +51,7 @@ enum
     bitcoinconsensus_SCRIPT_FLAGS_VERIFY_P2SH                = (1U << 0), // evaluate P2SH (BIP16) subscripts
     bitcoinconsensus_SCRIPT_FLAGS_VERIFY_DERSIG              = (1U << 2), // enforce strict DER (BIP66) compliance
     bitcoinconsensus_SCRIPT_FLAGS_VERIFY_CHECKLOCKTIMEVERIFY = (1U << 9), // enable CHECKLOCKTIMEVERIFY (BIP65)
+    bitcoinconsensus_SCRIPT_FLAGS_VERIFY_CHECKSEQUENCEVERIFY = (1U << 10), // enable CHECKSEQUENCEVERIFY (BIP112)
     bitcoinconsensus_SCRIPT_FLAGS_VERIFY_WITNESS             = (1U << 11), // enable WITNESS (BIP141)
 };
 

From d3af342276f29d2bd162628eb4b669599633e39e Mon Sep 17 00:00:00 2001
From: Kaz Wesley <keziahw@gmail.com>
Date: Wed, 27 Jul 2016 16:27:07 -0700
Subject: [PATCH 0656/1802] prepend license statement to indirectmap

Add statement about MIT licensing to indirectmap.h. I forgot the license
preamble when I originally wrote the file.
---
 src/indirectmap.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/indirectmap.h b/src/indirectmap.h
index 28e1e8deddbde..76da4a6bd5575 100644
--- a/src/indirectmap.h
+++ b/src/indirectmap.h
@@ -1,3 +1,7 @@
+// Copyright (c) 2016 The Bitcoin Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
 #ifndef BITCOIN_INDIRECTMAP_H
 #define BITCOIN_INDIRECTMAP_H
 

From 893f379ba0befef5301208b6bee8206ac4e76329 Mon Sep 17 00:00:00 2001
From: Jonas Schnelli <dev@jonasschnelli.ch>
Date: Tue, 26 Jul 2016 14:01:36 +0200
Subject: [PATCH 0657/1802] [Qt] Add dbcache migration path

---
 src/qt/optionsmodel.cpp | 21 +++++++++++++++++++++
 src/qt/optionsmodel.h   |  4 +++-
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/src/qt/optionsmodel.cpp b/src/qt/optionsmodel.cpp
index cc2cbc0e66419..684db71a8ce03 100644
--- a/src/qt/optionsmodel.cpp
+++ b/src/qt/optionsmodel.cpp
@@ -43,6 +43,8 @@ void OptionsModel::Init(bool resetSettings)
     if (resetSettings)
         Reset();
 
+    checkAndMigrate();
+
     QSettings settings;
 
     // Ensure restart flag is unset on client startup
@@ -429,3 +431,22 @@ bool OptionsModel::isRestartRequired()
     QSettings settings;
     return settings.value("fRestartRequired", false).toBool();
 }
+
+void OptionsModel::checkAndMigrate()
+{
+    // Migration of default values
+    // Check if the QSettings container was already loaded with this client version
+    QSettings settings;
+    static const char strSettingsVersionKey[] = "nSettingsVersion";
+    int settingsVersion = settings.contains(strSettingsVersionKey) ? settings.value(strSettingsVersionKey).toInt() : 0;
+    if (settingsVersion < CLIENT_VERSION)
+    {
+        // -dbcache was bumped from 100 to 300 in 0.13
+        // see https://github.com/bitcoin/bitcoin/pull/8273
+        // force people to upgrade to the new value if they are using 100MB
+        if (settingsVersion < 130000 && settings.contains("nDatabaseCache") && settings.value("nDatabaseCache").toLongLong() == 100)
+            settings.setValue("nDatabaseCache", (qint64)nDefaultDbCache);
+
+        settings.setValue(strSettingsVersionKey, CLIENT_VERSION);
+    }
+}
\ No newline at end of file
diff --git a/src/qt/optionsmodel.h b/src/qt/optionsmodel.h
index 3b491ceac2cde..b23b5f2607a6c 100644
--- a/src/qt/optionsmodel.h
+++ b/src/qt/optionsmodel.h
@@ -84,9 +84,11 @@ class OptionsModel : public QAbstractListModel
     /* settings that were overriden by command-line */
     QString strOverriddenByCommandLine;
 
-    /// Add option to list of GUI options overridden through command line/config file
+    // Add option to list of GUI options overridden through command line/config file
     void addOverriddenOption(const std::string &option);
 
+    // Check settings version and upgrade default values if required
+    void checkAndMigrate();
 Q_SIGNALS:
     void displayUnitChanged(int unit);
     void coinControlFeaturesChanged(bool);

From 2266b43e3317a889b9150e614169acda50383bf5 Mon Sep 17 00:00:00 2001
From: Jonas Schnelli <dev@jonasschnelli.ch>
Date: Thu, 21 Jul 2016 21:19:02 +0200
Subject: [PATCH 0658/1802] Port from 0.13: Create a new HD seed after
 encrypting the wallet

Forward-ports two commits from 0.13:
- [0.13] Create a new HD seed after encrypting the wallet
- [Wallet] Add CKeyMetadata record for HDMasterKey(s), factor out HD key generation

Github-Pull: #8389
Rebased-From: f142c11ac634df487cc4bc65a5f1c9a3e3563dd9 de45c065f0648c4c41b57cb492420ceeed29dd11
---
 qa/rpc-tests/keypool.py  | 10 ++++++++
 src/wallet/rpcwallet.cpp |  2 +-
 src/wallet/wallet.cpp    | 52 ++++++++++++++++++++++++++++++++--------
 src/wallet/wallet.h      |  5 +++-
 4 files changed, 57 insertions(+), 12 deletions(-)

diff --git a/qa/rpc-tests/keypool.py b/qa/rpc-tests/keypool.py
index c75303ecbfc31..fa3947656809c 100755
--- a/qa/rpc-tests/keypool.py
+++ b/qa/rpc-tests/keypool.py
@@ -12,6 +12,11 @@ class KeyPoolTest(BitcoinTestFramework):
 
     def run_test(self):
         nodes = self.nodes
+        addr_before_encrypting = nodes[0].getnewaddress()
+        addr_before_encrypting_data = nodes[0].validateaddress(addr_before_encrypting)
+        wallet_info_old = nodes[0].getwalletinfo()
+        assert(addr_before_encrypting_data['hdmasterkeyid'] == wallet_info_old['hdmasterkeyid'])
+        
         # Encrypt wallet and wait to terminate
         nodes[0].encryptwallet('test')
         bitcoind_processes[0].wait()
@@ -19,6 +24,11 @@ def run_test(self):
         nodes[0] = start_node(0, self.options.tmpdir)
         # Keep creating keys
         addr = nodes[0].getnewaddress()
+        addr_data = nodes[0].validateaddress(addr)
+        wallet_info = nodes[0].getwalletinfo()
+        assert(addr_before_encrypting_data['hdmasterkeyid'] != wallet_info['hdmasterkeyid'])
+        assert(addr_data['hdmasterkeyid'] == wallet_info['hdmasterkeyid'])
+        
         try:
             addr = nodes[0].getnewaddress()
             raise AssertionError('Keypool should be exhausted after one address')
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index 4087b8e77b7a2..a90807e5141b7 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -2081,7 +2081,7 @@ UniValue encryptwallet(const UniValue& params, bool fHelp)
     // slack space in .dat files; that is bad if the old data is
     // unencrypted private keys. So:
     StartShutdown();
-    return "wallet encrypted; Bitcoin server stopping, restart to run with encrypted wallet. The keypool has been flushed, you need to make a new backup.";
+    return "wallet encrypted; Bitcoin server stopping, restart to run with encrypted wallet. The keypool has been flushed and a new HD seed was generated (if you are using HD). You need to make a new backup.";
 }
 
 UniValue lockunspent(const UniValue& params, bool fHelp)
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index 5908dfeaceae6..e5ee5063a5d31 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -626,6 +626,15 @@ bool CWallet::EncryptWallet(const SecureString& strWalletPassphrase)
 
         Lock();
         Unlock(strWalletPassphrase);
+
+        // if we are using HD, replace the HD master key (seed) with a new one
+        if (!hdChain.masterKeyID.IsNull()) {
+            CKey key;
+            CPubKey masterPubKey = GenerateNewHDMasterKey();
+            if (!SetHDMasterKey(masterPubKey))
+                return false;
+        }
+
         NewKeyPool();
         Lock();
 
@@ -1166,20 +1175,43 @@ CAmount CWallet::GetChange(const CTransaction& tx) const
     return nChange;
 }
 
-bool CWallet::SetHDMasterKey(const CKey& key)
+CPubKey CWallet::GenerateNewHDMasterKey()
+{
+    CKey key;
+    key.MakeNewKey(true);
+
+    int64_t nCreationTime = GetTime();
+    CKeyMetadata metadata(nCreationTime);
+
+    // calculate the pubkey
+    CPubKey pubkey = key.GetPubKey();
+    assert(key.VerifyPubKey(pubkey));
+
+    // set the hd keypath to "m" -> Master, refers the masterkeyid to itself
+    metadata.hdKeypath     = "m";
+    metadata.hdMasterKeyID = pubkey.GetID();
+
+    {
+        LOCK(cs_wallet);
+
+        // mem store the metadata
+        mapKeyMetadata[pubkey.GetID()] = metadata;
+
+        // write the key&metadata to the database
+        if (!AddKeyPubKey(key, pubkey))
+            throw std::runtime_error("CWallet::GenerateNewKey(): AddKey failed");
+    }
+
+    return pubkey;
+}
+
+bool CWallet::SetHDMasterKey(const CPubKey& pubkey)
 {
     LOCK(cs_wallet);
 
     // ensure this wallet.dat can only be opened by clients supporting HD
     SetMinVersion(FEATURE_HD);
 
-    // store the key as normal "key"/"ckey" object
-    // in the database
-    // key metadata is not required
-    CPubKey pubkey = key.GetPubKey();
-    if (!AddKeyPubKey(key, pubkey))
-        throw std::runtime_error("CWallet::GenerateNewKey(): AddKey failed");
-
     // store the keyid (hash160) together with
     // the child index counter in the database
     // as a hdchain object
@@ -3299,8 +3331,8 @@ bool CWallet::InitLoadWallet()
         if (GetBoolArg("-usehd", DEFAULT_USE_HD_WALLET) && walletInstance->hdChain.masterKeyID.IsNull()) {
             // generate a new master key
             CKey key;
-            key.MakeNewKey(true);
-            if (!walletInstance->SetHDMasterKey(key))
+            CPubKey masterPubKey = walletInstance->GenerateNewHDMasterKey();
+            if (!walletInstance->SetHDMasterKey(masterPubKey))
                 throw std::runtime_error("CWallet::GenerateNewKey(): Storing master key failed");
         }
         CPubKey newDefaultKey;
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
index efed2ba11df02..0c95fdf4b04d8 100644
--- a/src/wallet/wallet.h
+++ b/src/wallet/wallet.h
@@ -901,8 +901,11 @@ class CWallet : public CCryptoKeyStore, public CValidationInterface
     bool SetHDChain(const CHDChain& chain, bool memonly);
     const CHDChain& GetHDChain() { return hdChain; }
 
+    /* Generates a new HD master key (will not be activated) */
+    CPubKey GenerateNewHDMasterKey();
+    
     /* Set the current HD master key (will reset the chain child index counters) */
-    bool SetHDMasterKey(const CKey& key);
+    bool SetHDMasterKey(const CPubKey& key);
 };
 
 /** A key allocated from the key pool. */

From 54af51d98d0b38f08c58dd589bff81883aee2854 Mon Sep 17 00:00:00 2001
From: Jonas Schnelli <dev@jonasschnelli.ch>
Date: Thu, 28 Jul 2016 14:59:13 +0200
Subject: [PATCH 0659/1802] [QA] Add walletdump RPC test (including HD- &
 encryption-tests)

---
 qa/pull-tester/rpc-tests.py |   1 +
 qa/rpc-tests/wallet-dump.py | 120 ++++++++++++++++++++++++++++++++++++
 2 files changed, 121 insertions(+)
 create mode 100755 qa/rpc-tests/wallet-dump.py

diff --git a/qa/pull-tester/rpc-tests.py b/qa/pull-tester/rpc-tests.py
index 11b83bac1468d..5900fa51e34b4 100755
--- a/qa/pull-tester/rpc-tests.py
+++ b/qa/pull-tester/rpc-tests.py
@@ -107,6 +107,7 @@
     'bip68-112-113-p2p.py',
     'wallet.py',
     'wallet-hd.py',
+    'wallet-dump.py',
     'listtransactions.py',
     'receivedby.py',
     'mempool_resurrect_test.py',
diff --git a/qa/rpc-tests/wallet-dump.py b/qa/rpc-tests/wallet-dump.py
new file mode 100755
index 0000000000000..dd675f57fc46a
--- /dev/null
+++ b/qa/rpc-tests/wallet-dump.py
@@ -0,0 +1,120 @@
+#!/usr/bin/env python3
+# Copyright (c) 2016 The Bitcoin Core developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+from test_framework.test_framework import BitcoinTestFramework
+from test_framework.util import *
+import os
+import shutil
+
+
+class WalletDumpTest(BitcoinTestFramework):
+
+    def __init__(self):
+        super().__init__()
+        self.setup_clean_chain = False
+        self.num_nodes = 1
+
+    def setup_network(self, split=False):
+        extra_args = [["-keypool=100"]]
+        self.nodes = start_nodes(self.num_nodes, self.options.tmpdir, extra_args)
+
+    def run_test (self):
+        tmpdir = self.options.tmpdir
+
+        #generate 20 addresses to compare against the dump
+        test_addr_count = 20
+        addrs = []
+        for i in range(0,test_addr_count):
+            addr = self.nodes[0].getnewaddress()
+            vaddr= self.nodes[0].validateaddress(addr) #required to get hd keypath
+            addrs.append(vaddr)
+
+        # dump unencrypted wallet
+        self.nodes[0].dumpwallet(tmpdir + "/node0/wallet.unencrypted.dump")
+
+        #open file
+        inputfile = open(tmpdir + "/node0/wallet.unencrypted.dump")
+        found_addr = 0
+        found_addr_chg = 0
+        found_addr_rsv = 0
+        hdmasteraddr = ""
+        for line in inputfile:
+            #only read non comment lines
+            if line[0] != "#" and len(line) > 10:
+                #split out some data
+                keyLabel, comment = line.split("#")
+                key = keyLabel.split(" ")[0]
+                keytype = keyLabel.split(" ")[2]
+                if len(comment) > 1:
+                    addrKeypath = comment.split(" addr=")[1]
+                    addr = addrKeypath.split(" ")[0]
+                    keypath = ""
+                    if keytype != "hdmaster=1":
+                        keypath = addrKeypath.rstrip().split("hdkeypath=")[1]
+                    else:
+                        #keep hd master for later comp.
+                        hdmasteraddr = addr
+
+                    #count key types
+                    for addrObj in addrs:
+                        if (addrObj['address'] == addr and addrObj['hdkeypath'] == keypath and keytype == "label="):
+                            found_addr+=1
+                            break
+                        elif (keytype == "change=1"):
+                            found_addr_chg+=1
+                            break
+                        elif (keytype == "reserve=1"):
+                            found_addr_rsv+=1
+                            break
+        assert(found_addr == test_addr_count) #all keys must be in the dump
+        assert(found_addr_chg == 50) #50 blocks where mined
+        assert(found_addr_rsv == 100) #100 reserve keys (keypool)
+
+        #encrypt wallet, restart, unlock and dump
+        self.nodes[0].encryptwallet('test')
+        bitcoind_processes[0].wait()
+        self.nodes[0] = start_node(0, self.options.tmpdir)
+        self.nodes[0].walletpassphrase('test', 10)
+        self.nodes[0].dumpwallet(tmpdir + "/node0/wallet.encrypted.dump")
+
+        #open dump done with an encrypted wallet
+        inputfile = open(tmpdir + "/node0/wallet.encrypted.dump")
+        found_addr = 0
+        found_addr_chg = 0
+        found_addr_rsv = 0
+        for line in inputfile:
+            if line[0] != "#" and len(line) > 10:
+                keyLabel, comment = line.split("#")
+                key = keyLabel.split(" ")[0]
+                keytype = keyLabel.split(" ")[2]
+                if len(comment) > 1:
+                    addrKeypath = comment.split(" addr=")[1]
+                    addr = addrKeypath.split(" ")[0]
+                    keypath = ""
+                    if keytype != "hdmaster=1":
+                        keypath = addrKeypath.rstrip().split("hdkeypath=")[1]
+                    else:
+                        #ensure we have generated a new hd master key
+                        assert(hdmasteraddr != addr)
+                    if keytype == "inactivehdmaster=1":
+                        #ensure the old master is still available
+                        assert(hdmasteraddr == addr)
+                    for addrObj in addrs:
+                        if (addrObj['address'] == addr and addrObj['hdkeypath'] == keypath and keytype == "label="):
+                            found_addr+=1
+                            break
+                        elif (keytype == "change=1"):
+                            found_addr_chg+=1
+                            break
+                        elif (keytype == "reserve=1"):
+                            found_addr_rsv+=1
+                            break
+
+        assert(found_addr == test_addr_count)
+        assert(found_addr_chg == 150) #old reserve keys are marked as change now
+        assert(found_addr_rsv == 100) #keypool size
+
+if __name__ == '__main__':
+    WalletDumpTest().main ()

From 8bfd70817bf8b8b07b81660e47c88dd122b7423f Mon Sep 17 00:00:00 2001
From: Suhas Daftuar <sdaftuar@gmail.com>
Date: Thu, 28 Jul 2016 14:27:19 -0400
Subject: [PATCH 0660/1802] Enable size accounting in mining unit tests

---
 src/test/miner_tests.cpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/test/miner_tests.cpp b/src/test/miner_tests.cpp
index fd581db52ea28..15fceb963a59f 100644
--- a/src/test/miner_tests.cpp
+++ b/src/test/miner_tests.cpp
@@ -181,9 +181,7 @@ void TestPackageSelection(const CChainParams& chainparams, CScript scriptPubKey,
 // NOTE: These tests rely on CreateNewBlock doing its own self-validation!
 BOOST_AUTO_TEST_CASE(CreateNewBlock_validity)
 {
-    // Disable size accounting (CPFP does not support it)
-    mapArgs["-blockmaxsize"] = strprintf("%u", MAX_BLOCK_SERIALIZED_SIZE);
-
+    // Note that by default, these tests run with size accounting enabled.
     const CChainParams& chainparams = Params(CBaseChainParams::MAIN);
     CScript scriptPubKey = CScript() << ParseHex("04678afdb0fe5548271967f1a67130b7105cd6a828e03909a67962e0ea1f61deb649f6bc3f4cef38c4f35504e51ec112de5c384df7ba0b8d578a4c702b6bf11d5f") << OP_CHECKSIG;
     CBlockTemplate *pblocktemplate;

From a6cc299541fc9df5af010ce63eb1dd34d8c4b6e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jorge=20Tim=C3=B3n?= <jtimon@jtimon.cc>
Date: Sat, 16 Jul 2016 20:57:42 +0200
Subject: [PATCH 0661/1802] Mempool: Use Consensus::CheckTxInputs direclty over
 main::CheckInputs

---
 src/main.h        | 13 +++++++++++++
 src/txmempool.cpp |  9 +++++++--
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/src/main.h b/src/main.h
index 7ea570d859792..b60bb05e187f6 100644
--- a/src/main.h
+++ b/src/main.h
@@ -351,9 +351,22 @@ bool CheckInputs(const CTransaction& tx, CValidationState &state, const CCoinsVi
 /** Apply the effects of this transaction on the UTXO set represented by view */
 void UpdateCoins(const CTransaction& tx, CCoinsViewCache& inputs, int nHeight);
 
+/** Transaction validation functions */
+
 /** Context-independent validity checks */
 bool CheckTransaction(const CTransaction& tx, CValidationState& state);
 
+namespace Consensus {
+
+/**
+ * Check whether all inputs of this transaction are valid (no double spends and amounts)
+ * This does not modify the UTXO set. This does not check scripts and sigs.
+ * Preconditions: tx.IsCoinBase() is false.
+ */
+bool CheckTxInputs(const CTransaction& tx, CValidationState& state, const CCoinsViewCache& inputs, int nSpendHeight);
+
+} // namespace Consensus
+
 /**
  * Check if transaction is final and can be included in a block with the
  * specified height and time. Consensus critical.
diff --git a/src/txmempool.cpp b/src/txmempool.cpp
index a48a6d94659b5..b30022bd66714 100644
--- a/src/txmempool.cpp
+++ b/src/txmempool.cpp
@@ -657,6 +657,7 @@ void CTxMemPool::check(const CCoinsViewCache *pcoins) const
     uint64_t innerUsage = 0;
 
     CCoinsViewCache mempoolDuplicate(const_cast<CCoinsViewCache*>(pcoins));
+    const int64_t nSpendHeight = GetSpendHeight(mempoolDuplicate);
 
     LOCK(cs);
     list<const CTxMemPoolEntry*> waitingOnDependants;
@@ -737,7 +738,9 @@ void CTxMemPool::check(const CCoinsViewCache *pcoins) const
             waitingOnDependants.push_back(&(*it));
         else {
             CValidationState state;
-            assert(CheckInputs(tx, state, mempoolDuplicate, false, 0, false, NULL));
+            bool fCheckResult = tx.IsCoinBase() ||
+                Consensus::CheckTxInputs(tx, state, mempoolDuplicate, nSpendHeight);
+            assert(fCheckResult);
             UpdateCoins(tx, mempoolDuplicate, 1000000);
         }
     }
@@ -751,7 +754,9 @@ void CTxMemPool::check(const CCoinsViewCache *pcoins) const
             stepsSinceLastRemove++;
             assert(stepsSinceLastRemove < waitingOnDependants.size());
         } else {
-            assert(CheckInputs(entry->GetTx(), state, mempoolDuplicate, false, 0, false, NULL));
+            bool fCheckResult = entry->GetTx().IsCoinBase() ||
+                Consensus::CheckTxInputs(entry->GetTx(), state, mempoolDuplicate, nSpendHeight);
+            assert(fCheckResult);
             UpdateCoins(entry->GetTx(), mempoolDuplicate, 1000000);
             stepsSinceLastRemove = 0;
         }

From 755aa05174e06effd758eeb78c5af9fb465e9611 Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Thu, 28 Jul 2016 17:52:51 -0400
Subject: [PATCH 0662/1802] httpserver: use a future rather than relying on
 boost's try_join_for

---
 src/httpserver.cpp | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/httpserver.cpp b/src/httpserver.cpp
index 812940eaf9861..7150f96ed7f46 100644
--- a/src/httpserver.cpp
+++ b/src/httpserver.cpp
@@ -19,6 +19,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <signal.h>
+#include <future>
 
 #include <event2/event.h>
 #include <event2/http.h>
@@ -302,13 +303,14 @@ static void http_reject_request_cb(struct evhttp_request* req, void*)
 }
 
 /** Event dispatcher thread */
-static void ThreadHTTP(struct event_base* base, struct evhttp* http)
+static bool ThreadHTTP(struct event_base* base, struct evhttp* http)
 {
     RenameThread("bitcoin-http");
     LogPrint("http", "Entering http event loop\n");
     event_base_dispatch(base);
     // Event loop will be interrupted by InterruptHTTPServer()
     LogPrint("http", "Exited http event loop\n");
+    return event_base_got_break(base) == 0;
 }
 
 /** Bind HTTP server to specified addresses */
@@ -438,13 +440,16 @@ bool InitHTTPServer()
 }
 
 boost::thread threadHTTP;
+std::future<bool> threadResult;
 
 bool StartHTTPServer()
 {
     LogPrint("http", "Starting HTTP server\n");
     int rpcThreads = std::max((long)GetArg("-rpcthreads", DEFAULT_HTTP_THREADS), 1L);
     LogPrintf("HTTP: starting %d worker threads\n", rpcThreads);
-    threadHTTP = boost::thread(boost::bind(&ThreadHTTP, eventBase, eventHTTP));
+    std::packaged_task<bool(event_base*, evhttp*)> task(ThreadHTTP);
+    threadResult = task.get_future();
+    threadHTTP = boost::thread(std::bind(std::move(task), eventBase, eventHTTP));
 
     for (int i = 0; i < rpcThreads; i++)
         boost::thread(boost::bind(&HTTPWorkQueueRun, workQueue));
@@ -482,15 +487,11 @@ void StopHTTPServer()
         // master that appears to be solved, so in the future that solution
         // could be used again (if desirable).
         // (see discussion in https://github.com/bitcoin/bitcoin/pull/6990)
-#if BOOST_VERSION >= 105000
-        if (!threadHTTP.try_join_for(boost::chrono::milliseconds(2000))) {
-#else
-        if (!threadHTTP.timed_join(boost::posix_time::milliseconds(2000))) {
-#endif
+        if (threadResult.valid() && threadResult.wait_for(std::chrono::milliseconds(2000)) == std::future_status::timeout) {
             LogPrintf("HTTP event loop did not exit within allotted time, sending loopbreak\n");
             event_base_loopbreak(eventBase);
-            threadHTTP.join();
         }
+        threadHTTP.join();
     }
     if (eventHTTP) {
         evhttp_free(eventHTTP);

From d3773ca9aeb0d2f12dc0c5a0726778050c8cb455 Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Thu, 28 Jul 2016 18:21:00 -0400
Subject: [PATCH 0663/1802] httpserver: explicitly detach worker threads

When using std::thread in place of boost::thread, letting the threads destruct
results in a std::terminate. According to the docs, the same thing should be
be happening in later boost versions:
http://www.boost.org/doc/libs/1_55_0/doc/html/thread/thread_management.html#thread.thread_management.thread.destructor

I'm unsure why this hasn't blown up already, but explicitly detaching can't
hurt.
---
 src/httpserver.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/httpserver.cpp b/src/httpserver.cpp
index 7150f96ed7f46..8d0d3c1584662 100644
--- a/src/httpserver.cpp
+++ b/src/httpserver.cpp
@@ -451,8 +451,10 @@ bool StartHTTPServer()
     threadResult = task.get_future();
     threadHTTP = boost::thread(std::bind(std::move(task), eventBase, eventHTTP));
 
-    for (int i = 0; i < rpcThreads; i++)
-        boost::thread(boost::bind(&HTTPWorkQueueRun, workQueue));
+    for (int i = 0; i < rpcThreads; i++) {
+        boost::thread rpc_worker(HTTPWorkQueueRun, workQueue);
+        rpc_worker.detach();
+    }
     return true;
 }
 

From 7e87033447149e54d9b5ab2f90ad3a7ed094d784 Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Thu, 28 Jul 2016 18:31:25 -0400
Subject: [PATCH 0664/1802] httpserver: replace boost threads with std

along with mutex/condvar/bind/etc.

httpserver handles its own interruption, so there's no reason not to use std
threading.

While we're at it, may as well kill the BOOST_FOREACH's as well.
---
 src/httpserver.cpp | 39 ++++++++++++++++++---------------------
 src/httpserver.h   | 10 ++++------
 2 files changed, 22 insertions(+), 27 deletions(-)

diff --git a/src/httpserver.cpp b/src/httpserver.cpp
index 8d0d3c1584662..be7a6a1ddee86 100644
--- a/src/httpserver.cpp
+++ b/src/httpserver.cpp
@@ -35,9 +35,6 @@
 #endif
 #endif
 
-#include <boost/algorithm/string/case_conv.hpp> // for to_lower()
-#include <boost/foreach.hpp>
-
 /** Maximum size of http request (request line + headers) */
 static const size_t MAX_HEADERS_SIZE = 8192;
 
@@ -69,8 +66,8 @@ class WorkQueue
 {
 private:
     /** Mutex protects entire object */
-    CWaitableCriticalSection cs;
-    CConditionVariable cond;
+    std::mutex cs;
+    std::condition_variable cond;
     std::deque<std::unique_ptr<WorkItem>> queue;
     bool running;
     size_t maxDepth;
@@ -83,12 +80,12 @@ class WorkQueue
         WorkQueue &wq;
         ThreadCounter(WorkQueue &w): wq(w)
         {
-            boost::lock_guard<boost::mutex> lock(wq.cs);
+            std::lock_guard<std::mutex> lock(wq.cs);
             wq.numThreads += 1;
         }
         ~ThreadCounter()
         {
-            boost::lock_guard<boost::mutex> lock(wq.cs);
+            std::lock_guard<std::mutex> lock(wq.cs);
             wq.numThreads -= 1;
             wq.cond.notify_all();
         }
@@ -109,7 +106,7 @@ class WorkQueue
     /** Enqueue a work item */
     bool Enqueue(WorkItem* item)
     {
-        boost::unique_lock<boost::mutex> lock(cs);
+        std::unique_lock<std::mutex> lock(cs);
         if (queue.size() >= maxDepth) {
             return false;
         }
@@ -124,7 +121,7 @@ class WorkQueue
         while (running) {
             std::unique_ptr<WorkItem> i;
             {
-                boost::unique_lock<boost::mutex> lock(cs);
+                std::unique_lock<std::mutex> lock(cs);
                 while (running && queue.empty())
                     cond.wait(lock);
                 if (!running)
@@ -138,14 +135,14 @@ class WorkQueue
     /** Interrupt and exit loops */
     void Interrupt()
     {
-        boost::unique_lock<boost::mutex> lock(cs);
+        std::unique_lock<std::mutex> lock(cs);
         running = false;
         cond.notify_all();
     }
     /** Wait for worker threads to exit */
     void WaitExit()
     {
-        boost::unique_lock<boost::mutex> lock(cs);
+        std::unique_lock<std::mutex> lock(cs);
         while (numThreads > 0)
             cond.wait(lock);
     }
@@ -153,7 +150,7 @@ class WorkQueue
     /** Return current depth of queue */
     size_t Depth()
     {
-        boost::unique_lock<boost::mutex> lock(cs);
+        std::unique_lock<std::mutex> lock(cs);
         return queue.size();
     }
 };
@@ -190,7 +187,7 @@ static bool ClientAllowed(const CNetAddr& netaddr)
 {
     if (!netaddr.IsValid())
         return false;
-    BOOST_FOREACH (const CSubNet& subnet, rpc_allow_subnets)
+    for(const CSubNet& subnet : rpc_allow_subnets)
         if (subnet.Match(netaddr))
             return true;
     return false;
@@ -204,7 +201,7 @@ static bool InitHTTPAllowList()
     rpc_allow_subnets.push_back(CSubNet("::1"));         // always allow IPv6 localhost
     if (mapMultiArgs.count("-rpcallowip")) {
         const std::vector<std::string>& vAllow = mapMultiArgs["-rpcallowip"];
-        BOOST_FOREACH (std::string strAllow, vAllow) {
+        for (std::string strAllow : vAllow) {
             CSubNet subnet(strAllow);
             if (!subnet.IsValid()) {
                 uiInterface.ThreadSafeMessageBox(
@@ -216,7 +213,7 @@ static bool InitHTTPAllowList()
         }
     }
     std::string strAllowed;
-    BOOST_FOREACH (const CSubNet& subnet, rpc_allow_subnets)
+    for (const CSubNet& subnet : rpc_allow_subnets)
         strAllowed += subnet.ToString() + " ";
     LogPrint("http", "Allowing HTTP connections from: %s\n", strAllowed);
     return true;
@@ -439,7 +436,7 @@ bool InitHTTPServer()
     return true;
 }
 
-boost::thread threadHTTP;
+std::thread threadHTTP;
 std::future<bool> threadResult;
 
 bool StartHTTPServer()
@@ -449,10 +446,10 @@ bool StartHTTPServer()
     LogPrintf("HTTP: starting %d worker threads\n", rpcThreads);
     std::packaged_task<bool(event_base*, evhttp*)> task(ThreadHTTP);
     threadResult = task.get_future();
-    threadHTTP = boost::thread(std::bind(std::move(task), eventBase, eventHTTP));
+    threadHTTP = std::thread(std::move(task), eventBase, eventHTTP);
 
     for (int i = 0; i < rpcThreads; i++) {
-        boost::thread rpc_worker(HTTPWorkQueueRun, workQueue);
+        std::thread rpc_worker(HTTPWorkQueueRun, workQueue);
         rpc_worker.detach();
     }
     return true;
@@ -463,7 +460,7 @@ void InterruptHTTPServer()
     LogPrint("http", "Interrupting HTTP server\n");
     if (eventHTTP) {
         // Unlisten sockets
-        BOOST_FOREACH (evhttp_bound_socket *socket, boundSockets) {
+        for (evhttp_bound_socket *socket : boundSockets) {
             evhttp_del_accept_socket(eventHTTP, socket);
         }
         // Reject requests on current connections
@@ -520,7 +517,7 @@ static void httpevent_callback_fn(evutil_socket_t, short, void* data)
         delete self;
 }
 
-HTTPEvent::HTTPEvent(struct event_base* base, bool deleteWhenTriggered, const boost::function<void(void)>& handler):
+HTTPEvent::HTTPEvent(struct event_base* base, bool deleteWhenTriggered, const std::function<void(void)>& handler):
     deleteWhenTriggered(deleteWhenTriggered), handler(handler)
 {
     ev = event_new(base, -1, 0, httpevent_callback_fn, this);
@@ -602,7 +599,7 @@ void HTTPRequest::WriteReply(int nStatus, const std::string& strReply)
     assert(evb);
     evbuffer_add(evb, strReply.data(), strReply.size());
     HTTPEvent* ev = new HTTPEvent(eventBase, true,
-        boost::bind(evhttp_send_reply, req, nStatus, (const char*)NULL, (struct evbuffer *)NULL));
+        std::bind(evhttp_send_reply, req, nStatus, (const char*)NULL, (struct evbuffer *)NULL));
     ev->trigger(0);
     replySent = true;
     req = 0; // transferred back to main thread
diff --git a/src/httpserver.h b/src/httpserver.h
index 20a119cc5c9ca..0e30e666a6b42 100644
--- a/src/httpserver.h
+++ b/src/httpserver.h
@@ -7,9 +7,7 @@
 
 #include <string>
 #include <stdint.h>
-#include <boost/thread.hpp>
-#include <boost/scoped_ptr.hpp>
-#include <boost/function.hpp>
+#include <functional>
 
 static const int DEFAULT_HTTP_THREADS=4;
 static const int DEFAULT_HTTP_WORKQUEUE=16;
@@ -35,7 +33,7 @@ void InterruptHTTPServer();
 void StopHTTPServer();
 
 /** Handler for requests to a certain HTTP path */
-typedef boost::function<void(HTTPRequest* req, const std::string &)> HTTPRequestHandler;
+typedef std::function<void(HTTPRequest* req, const std::string &)> HTTPRequestHandler;
 /** Register handler for prefix.
  * If multiple handlers match a prefix, the first-registered one will
  * be invoked.
@@ -132,7 +130,7 @@ class HTTPEvent
      * deleteWhenTriggered deletes this event object after the event is triggered (and the handler called)
      * handler is the handler to call when the event is triggered.
      */
-    HTTPEvent(struct event_base* base, bool deleteWhenTriggered, const boost::function<void(void)>& handler);
+    HTTPEvent(struct event_base* base, bool deleteWhenTriggered, const std::function<void(void)>& handler);
     ~HTTPEvent();
 
     /** Trigger the event. If tv is 0, trigger it immediately. Otherwise trigger it after
@@ -141,7 +139,7 @@ class HTTPEvent
     void trigger(struct timeval* tv);
 
     bool deleteWhenTriggered;
-    boost::function<void(void)> handler;
+    std::function<void(void)> handler;
 private:
     struct event* ev;
 };

From 56c87e92110f05d7452f1e85bf755246ffc77206 Mon Sep 17 00:00:00 2001
From: Suhas Daftuar <sdaftuar@gmail.com>
Date: Mon, 25 Jul 2016 17:22:37 -0400
Subject: [PATCH 0665/1802] Allow changing BIP9 parameters on regtest

---
 src/chainparams.cpp | 11 +++++++++++
 src/chainparams.h   |  5 +++++
 src/init.cpp        | 36 ++++++++++++++++++++++++++++++++++++
 3 files changed, 52 insertions(+)

diff --git a/src/chainparams.cpp b/src/chainparams.cpp
index 86bef1e105006..d6032440e3bb2 100644
--- a/src/chainparams.cpp
+++ b/src/chainparams.cpp
@@ -303,6 +303,12 @@ class CRegTestParams : public CChainParams {
         base58Prefixes[EXT_PUBLIC_KEY] = boost::assign::list_of(0x04)(0x35)(0x87)(0xCF).convert_to_container<std::vector<unsigned char> >();
         base58Prefixes[EXT_SECRET_KEY] = boost::assign::list_of(0x04)(0x35)(0x83)(0x94).convert_to_container<std::vector<unsigned char> >();
     }
+
+    void UpdateBIP9Parameters(Consensus::DeploymentPos d, int64_t nStartTime, int64_t nTimeout)
+    {
+        consensus.vDeployments[d].nStartTime = nStartTime;
+        consensus.vDeployments[d].nTimeout = nTimeout;
+    }
 };
 static CRegTestParams regTestParams;
 
@@ -330,4 +336,9 @@ void SelectParams(const std::string& network)
     SelectBaseParams(network);
     pCurrentParams = &Params(network);
 }
+
+void UpdateRegtestBIP9Parameters(Consensus::DeploymentPos d, int64_t nStartTime, int64_t nTimeout)
+{
+    regTestParams.UpdateBIP9Parameters(d, nStartTime, nTimeout);
+}
  
diff --git a/src/chainparams.h b/src/chainparams.h
index 638893e9ad9b4..0c3820b7c6e72 100644
--- a/src/chainparams.h
+++ b/src/chainparams.h
@@ -112,4 +112,9 @@ CChainParams& Params(const std::string& chain);
  */
 void SelectParams(const std::string& chain);
 
+/**
+ * Allows modifying the BIP9 regtest parameters.
+ */
+void UpdateRegtestBIP9Parameters(Consensus::DeploymentPos d, int64_t nStartTime, int64_t nTimeout);
+
 #endif // BITCOIN_CHAINPARAMS_H
diff --git a/src/init.cpp b/src/init.cpp
index 8d4a2cafbfbb1..5dc3ac023ccf8 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -410,6 +410,7 @@ std::string HelpMessage(HelpMessageMode mode)
         strUsage += HelpMessageOpt("-limitancestorsize=<n>", strprintf("Do not accept transactions whose size with all in-mempool ancestors exceeds <n> kilobytes (default: %u)", DEFAULT_ANCESTOR_SIZE_LIMIT));
         strUsage += HelpMessageOpt("-limitdescendantcount=<n>", strprintf("Do not accept transactions if any ancestor would have <n> or more in-mempool descendants (default: %u)", DEFAULT_DESCENDANT_LIMIT));
         strUsage += HelpMessageOpt("-limitdescendantsize=<n>", strprintf("Do not accept transactions if any ancestor would have more than <n> kilobytes of in-mempool descendants (default: %u).", DEFAULT_DESCENDANT_SIZE_LIMIT));
+        strUsage += HelpMessageOpt("-bip9params=deployment:start:end", "Use given start/end times for specified bip9 deployment (regtest-only)");
     }
     string debugCategories = "addrman, alert, bench, coindb, db, http, libevent, lock, mempool, mempoolrej, net, proxy, prune, rand, reindex, rpc, selectcoins, tor, zmq"; // Don't translate these and qt below
     if (mode == HMM_BITCOIN_QT)
@@ -975,6 +976,41 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
         fEnableReplacement = (std::find(vstrReplacementModes.begin(), vstrReplacementModes.end(), "fee") != vstrReplacementModes.end());
     }
 
+    if (!mapMultiArgs["-bip9params"].empty()) {
+        // Allow overriding bip9 parameters for testing
+        if (!Params().MineBlocksOnDemand()) {
+            return InitError("BIP9 parameters may only be overridden on regtest.");
+        }
+        const vector<string>& deployments = mapMultiArgs["-bip9params"];
+        for (auto i : deployments) {
+            std::vector<std::string> vDeploymentParams;
+            boost::split(vDeploymentParams, i, boost::is_any_of(":"));
+            if (vDeploymentParams.size() != 3) {
+                return InitError("BIP9 parameters malformed, expecting deployment:start:end");
+            }
+            int64_t nStartTime, nTimeout;
+            if (!ParseInt64(vDeploymentParams[1], &nStartTime)) {
+                return InitError(strprintf("Invalid nStartTime (%s)", vDeploymentParams[1]));
+            }
+            if (!ParseInt64(vDeploymentParams[2], &nTimeout)) {
+                return InitError(strprintf("Invalid nTimeout (%s)", vDeploymentParams[2]));
+            }
+            bool found = false;
+            for (int i=0; i<(int)Consensus::MAX_VERSION_BITS_DEPLOYMENTS; ++i)
+            {
+                if (vDeploymentParams[0].compare(VersionBitsDeploymentInfo[i].name) == 0) {
+                    UpdateRegtestBIP9Parameters(Consensus::DeploymentPos(i), nStartTime, nTimeout);
+                    found = true;
+                    LogPrintf("Setting BIP9 activation parameters for %s to start=%ld, timeout=%ld\n", vDeploymentParams[0], nStartTime, nTimeout);
+                    break;
+                }
+            }
+            if (!found) {
+                return InitError(strprintf("Invalid deployment (%s)", vDeploymentParams[0]));
+            }
+        }
+    }
+
     // ********************************************************* Step 4: application initialization: dir lock, daemonize, pidfile, debug log
 
     // Initialize elliptic curve code

From 9c8593d2b4e25ef628172ceadbedf0ef078d01ef Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Mon, 27 Jun 2016 16:06:17 +0200
Subject: [PATCH 0666/1802] Implement SipHash in Python

---
 qa/rpc-tests/test_framework/siphash.py | 64 ++++++++++++++++++++++++++
 src/test/hash_tests.cpp                |  4 ++
 2 files changed, 68 insertions(+)
 create mode 100644 qa/rpc-tests/test_framework/siphash.py

diff --git a/qa/rpc-tests/test_framework/siphash.py b/qa/rpc-tests/test_framework/siphash.py
new file mode 100644
index 0000000000000..9c0574bd93175
--- /dev/null
+++ b/qa/rpc-tests/test_framework/siphash.py
@@ -0,0 +1,64 @@
+#!/usr/bin/env python3
+# Copyright (c) 2016 The Bitcoin Core developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#
+# siphash.py - Specialized SipHash-2-4 implementations
+#
+# This implements SipHash-2-4 for 256-bit integers.
+
+def rotl64(n, b):
+    return n >> (64 - b) | (n & ((1 << (64 - b)) - 1)) << b
+
+def siphash_round(v0, v1, v2, v3):
+    v0 = (v0 + v1) & ((1 << 64) - 1)
+    v1 = rotl64(v1, 13)
+    v1 ^= v0
+    v0 = rotl64(v0, 32)
+    v2 = (v2 + v3) & ((1 << 64) - 1)
+    v3 = rotl64(v3, 16)
+    v3 ^= v2
+    v0 = (v0 + v3) & ((1 << 64) - 1)
+    v3 = rotl64(v3, 21)
+    v3 ^= v0
+    v2 = (v2 + v1) & ((1 << 64) - 1)
+    v1 = rotl64(v1, 17)
+    v1 ^= v2
+    v2 = rotl64(v2, 32)
+    return (v0, v1, v2, v3)
+
+def siphash256(k0, k1, h):
+    n0 = h & ((1 << 64) - 1)
+    n1 = (h >> 64) & ((1 << 64) - 1)
+    n2 = (h >> 128) & ((1 << 64) - 1)
+    n3 = (h >> 192) & ((1 << 64) - 1)
+    v0 = 0x736f6d6570736575 ^ k0
+    v1 = 0x646f72616e646f6d ^ k1
+    v2 = 0x6c7967656e657261 ^ k0
+    v3 = 0x7465646279746573 ^ k1 ^ n0
+    v0, v1, v2, v3 = siphash_round(v0, v1, v2, v3)
+    v0, v1, v2, v3 = siphash_round(v0, v1, v2, v3)
+    v0 ^= n0
+    v3 ^= n1
+    v0, v1, v2, v3 = siphash_round(v0, v1, v2, v3)
+    v0, v1, v2, v3 = siphash_round(v0, v1, v2, v3)
+    v0 ^= n1
+    v3 ^= n2
+    v0, v1, v2, v3 = siphash_round(v0, v1, v2, v3)
+    v0, v1, v2, v3 = siphash_round(v0, v1, v2, v3)
+    v0 ^= n2
+    v3 ^= n3
+    v0, v1, v2, v3 = siphash_round(v0, v1, v2, v3)
+    v0, v1, v2, v3 = siphash_round(v0, v1, v2, v3)
+    v0 ^= n3
+    v3 ^= 0x2000000000000000
+    v0, v1, v2, v3 = siphash_round(v0, v1, v2, v3)
+    v0, v1, v2, v3 = siphash_round(v0, v1, v2, v3)
+    v0 ^= 0x2000000000000000
+    v2 ^= 0xFF
+    v0, v1, v2, v3 = siphash_round(v0, v1, v2, v3)
+    v0, v1, v2, v3 = siphash_round(v0, v1, v2, v3)
+    v0, v1, v2, v3 = siphash_round(v0, v1, v2, v3)
+    v0, v1, v2, v3 = siphash_round(v0, v1, v2, v3)
+    return v0 ^ v1 ^ v2 ^ v3
diff --git a/src/test/hash_tests.cpp b/src/test/hash_tests.cpp
index 82d61209b5e50..fa9624f13daf5 100644
--- a/src/test/hash_tests.cpp
+++ b/src/test/hash_tests.cpp
@@ -122,6 +122,10 @@ BOOST_AUTO_TEST_CASE(siphash)
         hasher3.Write(uint64_t(x)|(uint64_t(x+1)<<8)|(uint64_t(x+2)<<16)|(uint64_t(x+3)<<24)|
                      (uint64_t(x+4)<<32)|(uint64_t(x+5)<<40)|(uint64_t(x+6)<<48)|(uint64_t(x+7)<<56));
     }
+
+    CHashWriter ss(SER_DISK, CLIENT_VERSION);
+    ss << CTransaction();
+    BOOST_CHECK_EQUAL(SipHashUint256(1, 2, ss.GetHash()), 0x79751e980c2a0a35ULL);
 }
 
 BOOST_AUTO_TEST_SUITE_END()

From a8689fdf8e10300b73750161a73a23467ecd1efe Mon Sep 17 00:00:00 2001
From: Suhas Daftuar <sdaftuar@gmail.com>
Date: Fri, 17 Jun 2016 21:17:25 -0400
Subject: [PATCH 0667/1802] Tests: refactor compact size serialization in
 mininode

---
 qa/rpc-tests/test_framework/mininode.py | 97 +++++++------------------
 1 file changed, 25 insertions(+), 72 deletions(-)

diff --git a/qa/rpc-tests/test_framework/mininode.py b/qa/rpc-tests/test_framework/mininode.py
index cdd5292cd67b8..67aaab698e952 100755
--- a/qa/rpc-tests/test_framework/mininode.py
+++ b/qa/rpc-tests/test_framework/mininode.py
@@ -74,8 +74,19 @@ def ripemd160(s):
 def hash256(s):
     return sha256(sha256(s))
 
+def ser_compact_size(l):
+    r = b""
+    if l < 253:
+        r = struct.pack("B", l)
+    elif l < 0x10000:
+        r = struct.pack("<BH", 253, l)
+    elif l < 0x100000000:
+        r = struct.pack("<BI", 254, l)
+    else:
+        r = struct.pack("<BQ", 255, l)
+    return r
 
-def deser_string(f):
+def deser_compact_size(f):
     nit = struct.unpack("<B", f.read(1))[0]
     if nit == 253:
         nit = struct.unpack("<H", f.read(2))[0]
@@ -83,16 +94,14 @@ def deser_string(f):
         nit = struct.unpack("<I", f.read(4))[0]
     elif nit == 255:
         nit = struct.unpack("<Q", f.read(8))[0]
+    return nit
+
+def deser_string(f):
+    nit = deser_compact_size(f)
     return f.read(nit)
 
 def ser_string(s):
-    if len(s) < 253:
-        return struct.pack("B", len(s)) + s
-    elif len(s) < 0x10000:
-        return struct.pack("<BH", 253, len(s)) + s
-    elif len(s) < 0x100000000:
-        return struct.pack("<BI", 254, len(s)) + s
-    return struct.pack("<BQ", 255, len(s)) + s
+    return ser_compact_size(len(s)) + s
 
 def deser_uint256(f):
     r = 0
@@ -125,13 +134,7 @@ def uint256_from_compact(c):
 
 
 def deser_vector(f, c):
-    nit = struct.unpack("<B", f.read(1))[0]
-    if nit == 253:
-        nit = struct.unpack("<H", f.read(2))[0]
-    elif nit == 254:
-        nit = struct.unpack("<I", f.read(4))[0]
-    elif nit == 255:
-        nit = struct.unpack("<Q", f.read(8))[0]
+    nit = deser_compact_size(f)
     r = []
     for i in range(nit):
         t = c()
@@ -144,15 +147,7 @@ def deser_vector(f, c):
 # entries in the vector (we use this for serializing the vector of transactions
 # for a witness block).
 def ser_vector(l, ser_function_name=None):
-    r = b""
-    if len(l) < 253:
-        r = struct.pack("B", len(l))
-    elif len(l) < 0x10000:
-        r = struct.pack("<BH", 253, len(l))
-    elif len(l) < 0x100000000:
-        r = struct.pack("<BI", 254, len(l))
-    else:
-        r = struct.pack("<BQ", 255, len(l))
+    r = ser_compact_size(len(l))
     for i in l:
         if ser_function_name:
             r += getattr(i, ser_function_name)()
@@ -162,13 +157,7 @@ def ser_vector(l, ser_function_name=None):
 
 
 def deser_uint256_vector(f):
-    nit = struct.unpack("<B", f.read(1))[0]
-    if nit == 253:
-        nit = struct.unpack("<H", f.read(2))[0]
-    elif nit == 254:
-        nit = struct.unpack("<I", f.read(4))[0]
-    elif nit == 255:
-        nit = struct.unpack("<Q", f.read(8))[0]
+    nit = deser_compact_size(f)
     r = []
     for i in range(nit):
         t = deser_uint256(f)
@@ -177,28 +166,14 @@ def deser_uint256_vector(f):
 
 
 def ser_uint256_vector(l):
-    r = b""
-    if len(l) < 253:
-        r = struct.pack("B", len(l))
-    elif len(l) < 0x10000:
-        r = struct.pack("<BH", 253, len(l))
-    elif len(l) < 0x100000000:
-        r = struct.pack("<BI", 254, len(l))
-    else:
-        r = struct.pack("<BQ", 255, len(l))
+    r = ser_compact_size(len(l))
     for i in l:
         r += ser_uint256(i)
     return r
 
 
 def deser_string_vector(f):
-    nit = struct.unpack("<B", f.read(1))[0]
-    if nit == 253:
-        nit = struct.unpack("<H", f.read(2))[0]
-    elif nit == 254:
-        nit = struct.unpack("<I", f.read(4))[0]
-    elif nit == 255:
-        nit = struct.unpack("<Q", f.read(8))[0]
+    nit = deser_compact_size(f)
     r = []
     for i in range(nit):
         t = deser_string(f)
@@ -207,28 +182,14 @@ def deser_string_vector(f):
 
 
 def ser_string_vector(l):
-    r = b""
-    if len(l) < 253:
-        r = struct.pack("B", len(l))
-    elif len(l) < 0x10000:
-        r = struct.pack("<BH", 253, len(l))
-    elif len(l) < 0x100000000:
-        r = struct.pack("<BI", 254, len(l))
-    else:
-        r = struct.pack("<BQ", 255, len(l))
+    r = ser_compact_size(len(l))
     for sv in l:
         r += ser_string(sv)
     return r
 
 
 def deser_int_vector(f):
-    nit = struct.unpack("<B", f.read(1))[0]
-    if nit == 253:
-        nit = struct.unpack("<H", f.read(2))[0]
-    elif nit == 254:
-        nit = struct.unpack("<I", f.read(4))[0]
-    elif nit == 255:
-        nit = struct.unpack("<Q", f.read(8))[0]
+    nit = deser_compact_size(f)
     r = []
     for i in range(nit):
         t = struct.unpack("<i", f.read(4))[0]
@@ -237,15 +198,7 @@ def deser_int_vector(f):
 
 
 def ser_int_vector(l):
-    r = b""
-    if len(l) < 253:
-        r = struct.pack("B", len(l))
-    elif len(l) < 0x10000:
-        r = struct.pack("<BH", 253, len(l))
-    elif len(l) < 0x100000000:
-        r = struct.pack("<BI", 254, len(l))
-    else:
-        r = struct.pack("<BQ", 255, len(l))
+    r = ser_compact_size(len(l))
     for i in l:
         r += struct.pack("<i", i)
     return r

From 9a22a6c0891256f02f4906c1c13fb22a9722ec7c Mon Sep 17 00:00:00 2001
From: Suhas Daftuar <sdaftuar@gmail.com>
Date: Tue, 12 Jul 2016 16:04:38 -0400
Subject: [PATCH 0668/1802] Add support for compactblocks to mininode

---
 qa/rpc-tests/test_framework/mininode.py | 276 +++++++++++++++++++++++-
 1 file changed, 272 insertions(+), 4 deletions(-)

diff --git a/qa/rpc-tests/test_framework/mininode.py b/qa/rpc-tests/test_framework/mininode.py
index 67aaab698e952..caffab35351df 100755
--- a/qa/rpc-tests/test_framework/mininode.py
+++ b/qa/rpc-tests/test_framework/mininode.py
@@ -36,9 +36,10 @@
 from threading import Thread
 import logging
 import copy
+from test_framework.siphash import siphash256
 
 BIP0031_VERSION = 60000
-MY_VERSION = 60001  # past bip-31 for ping/pong
+MY_VERSION = 70014  # past bip-31 for ping/pong
 MY_SUBVERSION = b"/python-mininode-tester:0.0.3/"
 
 MAX_INV_SZ = 50000
@@ -52,7 +53,7 @@
 NODE_WITNESS = (1 << 3)
 
 # Keep our own socket map for asyncore, so that we can track disconnects
-# ourselves (to workaround an issue with closing an asyncore socket when 
+# ourselves (to workaround an issue with closing an asyncore socket when
 # using select)
 mininode_socket_map = dict()
 
@@ -247,7 +248,8 @@ class CInv(object):
         1: "TX",
         2: "Block",
         1|MSG_WITNESS_FLAG: "WitnessTx",
-        2|MSG_WITNESS_FLAG : "WitnessBlock"
+        2|MSG_WITNESS_FLAG : "WitnessBlock",
+        4: "CompactBlock"
     }
 
     def __init__(self, t=0, h=0):
@@ -734,6 +736,187 @@ def __repr__(self):
             % (len(self.vchMsg), len(self.vchSig))
 
 
+class PrefilledTransaction(object):
+    def __init__(self, index=0, tx = None):
+        self.index = index
+        self.tx = tx
+
+    def deserialize(self, f):
+        self.index = deser_compact_size(f)
+        self.tx = CTransaction()
+        self.tx.deserialize(f)
+
+    def serialize(self, with_witness=False):
+        r = b""
+        r += ser_compact_size(self.index)
+        if with_witness:
+            r += self.tx.serialize_with_witness()
+        else:
+            r += self.tx.serialize_without_witness()
+        return r
+
+    def __repr__(self):
+        return "PrefilledTransaction(index=%d, tx=%s)" % (self.index, repr(self.tx))
+
+# This is what we send on the wire, in a cmpctblock message.
+class P2PHeaderAndShortIDs(object):
+    def __init__(self):
+        self.header = CBlockHeader()
+        self.nonce = 0
+        self.shortids_length = 0
+        self.shortids = []
+        self.prefilled_txn_length = 0
+        self.prefilled_txn = []
+
+    def deserialize(self, f):
+        self.header.deserialize(f)
+        self.nonce = struct.unpack("<Q", f.read(8))[0]
+        self.shortids_length = deser_compact_size(f)
+        for i in range(self.shortids_length):
+            # shortids are defined to be 6 bytes in the spec, so append
+            # two zero bytes and read it in as an 8-byte number
+            self.shortids.append(struct.unpack("<Q", f.read(6) + b'\x00\x00')[0])
+        self.prefilled_txn = deser_vector(f, PrefilledTransaction)
+        self.prefilled_txn_length = len(self.prefilled_txn)
+
+    def serialize(self, with_witness=False):
+        r = b""
+        r += self.header.serialize()
+        r += struct.pack("<Q", self.nonce)
+        r += ser_compact_size(self.shortids_length)
+        for x in self.shortids:
+            # We only want the first 6 bytes
+            r += struct.pack("<Q", x)[0:6]
+        r += ser_vector(self.prefilled_txn)
+        return r
+
+    def __repr__(self):
+        return "P2PHeaderAndShortIDs(header=%s, nonce=%d, shortids_length=%d, shortids=%s, prefilled_txn_length=%d, prefilledtxn=%s" % (repr(self.header), self.nonce, self.shortids_length, repr(self.shortids), self.prefilled_txn_length, repr(self.prefilled_txn))
+
+
+# Calculate the BIP 152-compact blocks shortid for a given transaction hash
+def calculate_shortid(k0, k1, tx_hash):
+    expected_shortid = siphash256(k0, k1, tx_hash)
+    expected_shortid &= 0x0000ffffffffffff
+    return expected_shortid
+
+# This version gets rid of the array lengths, and reinterprets the differential
+# encoding into indices that can be used for lookup.
+class HeaderAndShortIDs(object):
+    def __init__(self, p2pheaders_and_shortids = None):
+        self.header = CBlockHeader()
+        self.nonce = 0
+        self.shortids = []
+        self.prefilled_txn = []
+
+        if p2pheaders_and_shortids != None:
+            self.header = p2pheaders_and_shortids.header
+            self.nonce = p2pheaders_and_shortids.nonce
+            self.shortids = p2pheaders_and_shortids.shortids
+            last_index = -1
+            for x in p2pheaders_and_shortids.prefilled_txn:
+                self.prefilled_txn.append(PrefilledTransaction(x.index + last_index + 1, x.tx))
+                last_index = self.prefilled_txn[-1].index
+
+    def to_p2p(self):
+        ret = P2PHeaderAndShortIDs()
+        ret.header = self.header
+        ret.nonce = self.nonce
+        ret.shortids_length = len(self.shortids)
+        ret.shortids = self.shortids
+        ret.prefilled_txn_length = len(self.prefilled_txn)
+        ret.prefilled_txn = []
+        last_index = -1
+        for x in self.prefilled_txn:
+            ret.prefilled_txn.append(PrefilledTransaction(x.index - last_index - 1, x.tx))
+            last_index = x.index
+        return ret
+
+    def get_siphash_keys(self):
+        header_nonce = self.header.serialize()
+        header_nonce += struct.pack("<Q", self.nonce)
+        hash_header_nonce_as_str = sha256(header_nonce)
+        key0 = struct.unpack("<Q", hash_header_nonce_as_str[0:8])[0]
+        key1 = struct.unpack("<Q", hash_header_nonce_as_str[8:16])[0]
+        return [ key0, key1 ]
+
+    def initialize_from_block(self, block, nonce=0, prefill_list = [0]):
+        self.header = CBlockHeader(block)
+        self.nonce = nonce
+        self.prefilled_txn = [ PrefilledTransaction(i, block.vtx[i]) for i in prefill_list ]
+        self.shortids = []
+        [k0, k1] = self.get_siphash_keys()
+        for i in range(len(block.vtx)):
+            if i not in prefill_list:
+                self.shortids.append(calculate_shortid(k0, k1, block.vtx[i].sha256))
+
+    def __repr__(self):
+        return "HeaderAndShortIDs(header=%s, nonce=%d, shortids=%s, prefilledtxn=%s" % (repr(self.header), self.nonce, repr(self.shortids), repr(self.prefilled_txn))
+
+
+class BlockTransactionsRequest(object):
+
+    def __init__(self, blockhash=0, indexes = None):
+        self.blockhash = blockhash
+        self.indexes = indexes if indexes != None else []
+
+    def deserialize(self, f):
+        self.blockhash = deser_uint256(f)
+        indexes_length = deser_compact_size(f)
+        for i in range(indexes_length):
+            self.indexes.append(deser_compact_size(f))
+
+    def serialize(self):
+        r = b""
+        r += ser_uint256(self.blockhash)
+        r += ser_compact_size(len(self.indexes))
+        for x in self.indexes:
+            r += ser_compact_size(x)
+        return r
+
+    # helper to set the differentially encoded indexes from absolute ones
+    def from_absolute(self, absolute_indexes):
+        self.indexes = []
+        last_index = -1
+        for x in absolute_indexes:
+            self.indexes.append(x-last_index-1)
+            last_index = x
+
+    def to_absolute(self):
+        absolute_indexes = []
+        last_index = -1
+        for x in self.indexes:
+            absolute_indexes.append(x+last_index+1)
+            last_index = absolute_indexes[-1]
+        return absolute_indexes
+
+    def __repr__(self):
+        return "BlockTransactionsRequest(hash=%064x indexes=%s)" % (self.blockhash, repr(self.indexes))
+
+
+class BlockTransactions(object):
+
+    def __init__(self, blockhash=0, transactions = None):
+        self.blockhash = blockhash
+        self.transactions = transactions if transactions != None else []
+
+    def deserialize(self, f):
+        self.blockhash = deser_uint256(f)
+        self.transactions = deser_vector(f, CTransaction)
+
+    def serialize(self, with_witness=False):
+        r = b""
+        r += ser_uint256(self.blockhash)
+        if with_witness:
+            r += ser_vector(self.transactions, "serialize_with_witness")
+        else:
+            r += ser_vector(self.transactions)
+        return r
+
+    def __repr__(self):
+        return "BlockTransactions(hash=%064x transactions=%s)" % (self.blockhash, repr(self.transactions))
+
+
 # Objects that correspond to messages on the wire
 class msg_version(object):
     command = b"version"
@@ -1168,6 +1351,79 @@ def serialize(self):
     def __repr__(self):
         return "msg_feefilter(feerate=%08x)" % self.feerate
 
+class msg_sendcmpct(object):
+    command = b"sendcmpct"
+
+    def __init__(self):
+        self.announce = False
+        self.version = 1
+
+    def deserialize(self, f):
+        self.announce = struct.unpack("<?", f.read(1))[0]
+        self.version = struct.unpack("<Q", f.read(8))[0]
+
+    def serialize(self):
+        r = b""
+        r += struct.pack("<?", self.announce)
+        r += struct.pack("<Q", self.version)
+        return r
+
+    def __repr__(self):
+        return "msg_sendcmpct(announce=%s, version=%lu)" % (self.announce, self.version)
+
+class msg_cmpctblock(object):
+    command = b"cmpctblock"
+
+    def __init__(self, header_and_shortids = None):
+        self.header_and_shortids = header_and_shortids
+
+    def deserialize(self, f):
+        self.header_and_shortids = P2PHeaderAndShortIDs()
+        self.header_and_shortids.deserialize(f)
+
+    def serialize(self):
+        r = b""
+        r += self.header_and_shortids.serialize()
+        return r
+
+    def __repr__(self):
+        return "msg_cmpctblock(HeaderAndShortIDs=%s)" % repr(self.header_and_shortids)
+
+class msg_getblocktxn(object):
+    command = b"getblocktxn"
+
+    def __init__(self):
+        self.block_txn_request = None
+
+    def deserialize(self, f):
+        self.block_txn_request = BlockTransactionsRequest()
+        self.block_txn_request.deserialize(f)
+
+    def serialize(self):
+        r = b""
+        r += self.block_txn_request.serialize()
+        return r
+
+    def __repr__(self):
+        return "msg_getblocktxn(block_txn_request=%s)" % (repr(self.block_txn_request))
+
+class msg_blocktxn(object):
+    command = b"blocktxn"
+
+    def __init__(self):
+        self.block_transactions = BlockTransactions()
+
+    def deserialize(self, f):
+        self.block_transactions.deserialize(f)
+
+    def serialize(self):
+        r = b""
+        r += self.block_transactions.serialize()
+        return r
+
+    def __repr__(self):
+        return "msg_blocktxn(block_transactions=%s)" % (repr(self.block_transactions))
+
 # This is what a callback should look like for NodeConn
 # Reimplement the on_* functions to provide handling for events
 class NodeConnCB(object):
@@ -1248,6 +1504,10 @@ def on_mempool(self, conn): pass
     def on_pong(self, conn, message): pass
     def on_feefilter(self, conn, message): pass
     def on_sendheaders(self, conn, message): pass
+    def on_sendcmpct(self, conn, message): pass
+    def on_cmpctblock(self, conn, message): pass
+    def on_getblocktxn(self, conn, message): pass
+    def on_blocktxn(self, conn, message): pass
 
 # More useful callbacks and functions for NodeConnCB's which have a single NodeConn
 class SingleNodeConnCB(NodeConnCB):
@@ -1264,6 +1524,10 @@ def add_connection(self, conn):
     def send_message(self, message):
         self.connection.send_message(message)
 
+    def send_and_ping(self, message):
+        self.send_message(message)
+        self.sync_with_ping()
+
     def on_pong(self, conn, message):
         self.last_pong = message
 
@@ -1297,7 +1561,11 @@ class NodeConn(asyncore.dispatcher):
         b"reject": msg_reject,
         b"mempool": msg_mempool,
         b"feefilter": msg_feefilter,
-        b"sendheaders": msg_sendheaders
+        b"sendheaders": msg_sendheaders,
+        b"sendcmpct": msg_sendcmpct,
+        b"cmpctblock": msg_cmpctblock,
+        b"getblocktxn": msg_getblocktxn,
+        b"blocktxn": msg_blocktxn
     }
     MAGIC_BYTES = {
         "mainnet": b"\xf9\xbe\xb4\xd9",   # mainnet

From 45c7ddd109465e03551f5b39c2e650c243b4a078 Mon Sep 17 00:00:00 2001
From: Suhas Daftuar <sdaftuar@gmail.com>
Date: Tue, 12 Jul 2016 16:05:02 -0400
Subject: [PATCH 0669/1802] Add p2p test for BIP 152 (compact blocks)

---
 qa/pull-tester/rpc-tests.py       |   1 +
 qa/rpc-tests/p2p-compactblocks.py | 608 ++++++++++++++++++++++++++++++
 2 files changed, 609 insertions(+)
 create mode 100755 qa/rpc-tests/p2p-compactblocks.py

diff --git a/qa/pull-tester/rpc-tests.py b/qa/pull-tester/rpc-tests.py
index 11b83bac1468d..c4b11bc51b1e3 100755
--- a/qa/pull-tester/rpc-tests.py
+++ b/qa/pull-tester/rpc-tests.py
@@ -141,6 +141,7 @@
     'segwit.py',
     'importprunedfunds.py',
     'signmessages.py',
+    'p2p-compactblocks.py',
 ]
 if ENABLE_ZMQ:
     testScripts.append('zmq_test.py')
diff --git a/qa/rpc-tests/p2p-compactblocks.py b/qa/rpc-tests/p2p-compactblocks.py
new file mode 100755
index 0000000000000..7fe7ecc16c6e1
--- /dev/null
+++ b/qa/rpc-tests/p2p-compactblocks.py
@@ -0,0 +1,608 @@
+#!/usr/bin/env python3
+# Copyright (c) 2016 The Bitcoin Core developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+from test_framework.mininode import *
+from test_framework.test_framework import BitcoinTestFramework
+from test_framework.util import *
+from test_framework.blocktools import create_block, create_coinbase
+from test_framework.siphash import siphash256
+from test_framework.script import CScript, OP_TRUE
+
+'''
+CompactBlocksTest -- test compact blocks (BIP 152)
+'''
+
+
+# TestNode: A peer we use to send messages to bitcoind, and store responses.
+class TestNode(SingleNodeConnCB):
+    def __init__(self):
+        SingleNodeConnCB.__init__(self)
+        self.last_sendcmpct = None
+        self.last_headers = None
+        self.last_inv = None
+        self.last_cmpctblock = None
+        self.block_announced = False
+        self.last_getdata = None
+        self.last_getblocktxn = None
+        self.last_block = None
+        self.last_blocktxn = None
+
+    def on_sendcmpct(self, conn, message):
+        self.last_sendcmpct = message
+
+    def on_block(self, conn, message):
+        self.last_block = message
+
+    def on_cmpctblock(self, conn, message):
+        self.last_cmpctblock = message
+        self.block_announced = True
+
+    def on_headers(self, conn, message):
+        self.last_headers = message
+        self.block_announced = True
+
+    def on_inv(self, conn, message):
+        self.last_inv = message
+        self.block_announced = True
+
+    def on_getdata(self, conn, message):
+        self.last_getdata = message
+
+    def on_getblocktxn(self, conn, message):
+        self.last_getblocktxn = message
+
+    def on_blocktxn(self, conn, message):
+        self.last_blocktxn = message
+
+    # Requires caller to hold mininode_lock
+    def received_block_announcement(self):
+        return self.block_announced
+
+    def clear_block_announcement(self):
+        with mininode_lock:
+            self.block_announced = False
+            self.last_inv = None
+            self.last_headers = None
+            self.last_cmpctblock = None
+
+    def get_headers(self, locator, hashstop):
+        msg = msg_getheaders()
+        msg.locator.vHave = locator
+        msg.hashstop = hashstop
+        self.connection.send_message(msg)
+
+    def send_header_for_blocks(self, new_blocks):
+        headers_message = msg_headers()
+        headers_message.headers = [CBlockHeader(b) for b in new_blocks]
+        self.send_message(headers_message)
+
+
+class CompactBlocksTest(BitcoinTestFramework):
+    def __init__(self):
+        super().__init__()
+        self.setup_clean_chain = True
+        self.num_nodes = 1
+        self.utxos = []
+
+    def setup_network(self):
+        self.nodes = []
+
+        # Turn off segwit in this test, as compact blocks don't currently work
+        # with segwit.  (After BIP 152 is updated to support segwit, we can
+        # test behavior with and without segwit enabled by adding a second node
+        # to the test.)
+        self.nodes = start_nodes(self.num_nodes, self.options.tmpdir, [["-debug", "-logtimemicros=1", "-bip9params=segwit:0:0"]])
+
+    def build_block_on_tip(self):
+        height = self.nodes[0].getblockcount()
+        tip = self.nodes[0].getbestblockhash()
+        mtp = self.nodes[0].getblockheader(tip)['mediantime']
+        block = create_block(int(tip, 16), create_coinbase(height + 1), mtp + 1)
+        block.solve()
+        return block
+
+    # Create 10 more anyone-can-spend utxo's for testing.
+    def make_utxos(self):
+        block = self.build_block_on_tip()
+        self.test_node.send_and_ping(msg_block(block))
+        assert(int(self.nodes[0].getbestblockhash(), 16) == block.sha256)
+        self.nodes[0].generate(100)
+
+        total_value = block.vtx[0].vout[0].nValue
+        out_value = total_value // 10
+        tx = CTransaction()
+        tx.vin.append(CTxIn(COutPoint(block.vtx[0].sha256, 0), b''))
+        for i in range(10):
+            tx.vout.append(CTxOut(out_value, CScript([OP_TRUE])))
+        tx.rehash()
+
+        block2 = self.build_block_on_tip()
+        block2.vtx.append(tx)
+        block2.hashMerkleRoot = block2.calc_merkle_root()
+        block2.solve()
+        self.test_node.send_and_ping(msg_block(block2))
+        assert_equal(int(self.nodes[0].getbestblockhash(), 16), block2.sha256)
+        self.utxos.extend([[tx.sha256, i, out_value] for i in range(10)])
+        return
+
+    # Test "sendcmpct":
+    # - No compact block announcements or getdata(MSG_CMPCT_BLOCK) unless
+    #   sendcmpct is sent.
+    # - If sendcmpct is sent with version > 0, the message is ignored.
+    # - If sendcmpct is sent with boolean 0, then block announcements are not
+    #   made with compact blocks.
+    # - If sendcmpct is then sent with boolean 1, then new block announcements
+    #   are made with compact blocks.
+    def test_sendcmpct(self):
+        print("Testing SENDCMPCT p2p message... ")
+
+        # Make sure we get a version 0 SENDCMPCT message from our peer
+        def received_sendcmpct():
+            return (self.test_node.last_sendcmpct is not None)
+        got_message = wait_until(received_sendcmpct, timeout=30)
+        assert(got_message)
+        assert_equal(self.test_node.last_sendcmpct.version, 1)
+
+        tip = int(self.nodes[0].getbestblockhash(), 16)
+
+        def check_announcement_of_new_block(node, peer, predicate):
+            self.test_node.clear_block_announcement()
+            node.generate(1)
+            got_message = wait_until(peer.received_block_announcement, timeout=30)
+            assert(got_message)
+            with mininode_lock:
+                assert(predicate)
+
+        # We shouldn't get any block announcements via cmpctblock yet.
+        check_announcement_of_new_block(self.nodes[0], self.test_node, lambda: self.test_node.last_cmpctblock is None)
+
+        # Try one more time, this time after requesting headers.
+        self.test_node.clear_block_announcement()
+        self.test_node.get_headers(locator=[tip], hashstop=0)
+        wait_until(self.test_node.received_block_announcement, timeout=30)
+        self.test_node.clear_block_announcement()
+
+        check_announcement_of_new_block(self.nodes[0], self.test_node, lambda: self.test_node.last_cmpctblock is None and self.test_node.last_inv is not None)
+
+        # Now try a SENDCMPCT message with too-high version
+        sendcmpct = msg_sendcmpct()
+        sendcmpct.version = 2
+        self.test_node.send_message(sendcmpct)
+
+        check_announcement_of_new_block(self.nodes[0], self.test_node, lambda: self.test_node.last_cmpctblock is None)
+
+        # Now try a SENDCMPCT message with valid version, but announce=False
+        self.test_node.send_message(msg_sendcmpct())
+        check_announcement_of_new_block(self.nodes[0], self.test_node, lambda: self.test_node.last_cmpctblock is None)
+
+        # Finally, try a SENDCMPCT message with announce=True
+        sendcmpct.version = 1
+        sendcmpct.announce = True
+        self.test_node.send_message(sendcmpct)
+        check_announcement_of_new_block(self.nodes[0], self.test_node, lambda: self.test_node.last_cmpctblock is not None)
+
+        # Try one more time
+        check_announcement_of_new_block(self.nodes[0], self.test_node, lambda: self.test_node.last_cmpctblock is not None)
+
+        # Try one more time, after turning on sendheaders
+        self.test_node.send_message(msg_sendheaders())
+        check_announcement_of_new_block(self.nodes[0], self.test_node, lambda: self.test_node.last_cmpctblock is not None)
+
+        # Now turn off announcements
+        sendcmpct.announce = False
+        check_announcement_of_new_block(self.nodes[0], self.test_node, lambda: self.test_node.last_cmpctblock is None and self.test_node.last_headers is not None)
+
+    # This test actually causes bitcoind to (reasonably!) disconnect us, so do this last.
+    def test_invalid_cmpctblock_message(self):
+        print("Testing invalid index in cmpctblock message...")
+        self.nodes[0].generate(101)
+        block = self.build_block_on_tip()
+
+        cmpct_block = P2PHeaderAndShortIDs()
+        cmpct_block.header = CBlockHeader(block)
+        cmpct_block.prefilled_txn_length = 1
+        # This index will be too high
+        prefilled_txn = PrefilledTransaction(1, block.vtx[0])
+        cmpct_block.prefilled_txn = [prefilled_txn]
+        self.test_node.send_and_ping(msg_cmpctblock(cmpct_block))
+        assert(int(self.nodes[0].getbestblockhash(), 16) == block.hashPrevBlock)
+
+    # Compare the generated shortids to what we expect based on BIP 152, given
+    # bitcoind's choice of nonce.
+    def test_compactblock_construction(self):
+        print("Testing compactblock headers and shortIDs are correct...")
+
+        # Generate a bunch of transactions.
+        self.nodes[0].generate(101)
+        num_transactions = 25
+        address = self.nodes[0].getnewaddress()
+        for i in range(num_transactions):
+            self.nodes[0].sendtoaddress(address, 0.1)
+
+        # Now mine a block, and look at the resulting compact block.
+        self.test_node.clear_block_announcement()
+        block_hash = int(self.nodes[0].generate(1)[0], 16)
+
+        # Store the raw block in our internal format.
+        block = FromHex(CBlock(), self.nodes[0].getblock("%02x" % block_hash, False))
+        [tx.calc_sha256() for tx in block.vtx]
+        block.rehash()
+
+        # Don't care which type of announcement came back for this test; just
+        # request the compact block if we didn't get one yet.
+        wait_until(self.test_node.received_block_announcement, timeout=30)
+
+        with mininode_lock:
+            if self.test_node.last_cmpctblock is None:
+                self.test_node.clear_block_announcement()
+                inv = CInv(4, block_hash)  # 4 == "CompactBlock"
+                self.test_node.send_message(msg_getdata([inv]))
+
+        wait_until(self.test_node.received_block_announcement, timeout=30)
+
+        # Now we should have the compactblock
+        header_and_shortids = None
+        with mininode_lock:
+            assert(self.test_node.last_cmpctblock is not None)
+            # Convert the on-the-wire representation to absolute indexes
+            header_and_shortids = HeaderAndShortIDs(self.test_node.last_cmpctblock.header_and_shortids)
+
+        # Check that we got the right block!
+        header_and_shortids.header.calc_sha256()
+        assert_equal(header_and_shortids.header.sha256, block_hash)
+
+        # Make sure the prefilled_txn appears to have included the coinbase
+        assert(len(header_and_shortids.prefilled_txn) >= 1)
+        assert_equal(header_and_shortids.prefilled_txn[0].index, 0)
+
+        # Check that all prefilled_txn entries match what's in the block.
+        for entry in header_and_shortids.prefilled_txn:
+            entry.tx.calc_sha256()
+            assert_equal(entry.tx.sha256, block.vtx[entry.index].sha256)
+
+        # Check that the cmpctblock message announced all the transactions.
+        assert_equal(len(header_and_shortids.prefilled_txn) + len(header_and_shortids.shortids), len(block.vtx))
+
+        # And now check that all the shortids are as expected as well.
+        # Determine the siphash keys to use.
+        [k0, k1] = header_and_shortids.get_siphash_keys()
+
+        index = 0
+        while index < len(block.vtx):
+            if (len(header_and_shortids.prefilled_txn) > 0 and
+                    header_and_shortids.prefilled_txn[0].index == index):
+                # Already checked prefilled transactions above
+                header_and_shortids.prefilled_txn.pop(0)
+            else:
+                shortid = calculate_shortid(k0, k1, block.vtx[index].sha256)
+                assert_equal(shortid, header_and_shortids.shortids[0])
+                header_and_shortids.shortids.pop(0)
+            index += 1
+
+    # Test that bitcoind requests compact blocks when we announce new blocks
+    # via header or inv, and that responding to getblocktxn causes the block
+    # to be successfully reconstructed.
+    def test_compactblock_requests(self):
+        print("Testing compactblock requests... ")
+
+        # Try announcing a block with an inv or header, expect a compactblock
+        # request
+        for announce in ["inv", "header"]:
+            block = self.build_block_on_tip()
+            with mininode_lock:
+                self.test_node.last_getdata = None
+
+            if announce == "inv":
+                self.test_node.send_message(msg_inv([CInv(2, block.sha256)]))
+            else:
+                self.test_node.send_header_for_blocks([block])
+            success = wait_until(lambda: self.test_node.last_getdata is not None, timeout=30)
+            assert(success)
+            assert_equal(len(self.test_node.last_getdata.inv), 1)
+            assert_equal(self.test_node.last_getdata.inv[0].type, 4)
+            assert_equal(self.test_node.last_getdata.inv[0].hash, block.sha256)
+
+            # Send back a compactblock message that omits the coinbase
+            comp_block = HeaderAndShortIDs()
+            comp_block.header = CBlockHeader(block)
+            comp_block.nonce = 0
+            comp_block.shortids = [1]  # this is useless, and wrong
+            self.test_node.send_and_ping(msg_cmpctblock(comp_block.to_p2p()))
+            assert_equal(int(self.nodes[0].getbestblockhash(), 16), block.hashPrevBlock)
+            # Expect a getblocktxn message.
+            with mininode_lock:
+                assert(self.test_node.last_getblocktxn is not None)
+                absolute_indexes = self.test_node.last_getblocktxn.block_txn_request.to_absolute()
+            assert_equal(absolute_indexes, [0])  # should be a coinbase request
+
+            # Send the coinbase, and verify that the tip advances.
+            msg = msg_blocktxn()
+            msg.block_transactions.blockhash = block.sha256
+            msg.block_transactions.transactions = [block.vtx[0]]
+            self.test_node.send_and_ping(msg)
+            assert_equal(int(self.nodes[0].getbestblockhash(), 16), block.sha256)
+
+    # Create a chain of transactions from given utxo, and add to a new block.
+    def build_block_with_transactions(self, utxo, num_transactions):
+        block = self.build_block_on_tip()
+
+        for i in range(num_transactions):
+            tx = CTransaction()
+            tx.vin.append(CTxIn(COutPoint(utxo[0], utxo[1]), b''))
+            tx.vout.append(CTxOut(utxo[2] - 1000, CScript([OP_TRUE])))
+            tx.rehash()
+            utxo = [tx.sha256, 0, tx.vout[0].nValue]
+            block.vtx.append(tx)
+
+        block.hashMerkleRoot = block.calc_merkle_root()
+        block.solve()
+        return block
+
+    # Test that we only receive getblocktxn requests for transactions that the
+    # node needs, and that responding to them causes the block to be
+    # reconstructed.
+    def test_getblocktxn_requests(self):
+        print("Testing getblocktxn requests...")
+
+        # First try announcing compactblocks that won't reconstruct, and verify
+        # that we receive getblocktxn messages back.
+        utxo = self.utxos.pop(0)
+
+        block = self.build_block_with_transactions(utxo, 5)
+        self.utxos.append([block.vtx[-1].sha256, 0, block.vtx[-1].vout[0].nValue])
+
+        comp_block = HeaderAndShortIDs()
+        comp_block.initialize_from_block(block)
+
+        self.test_node.send_and_ping(msg_cmpctblock(comp_block.to_p2p()))
+        with mininode_lock:
+            assert(self.test_node.last_getblocktxn is not None)
+            absolute_indexes = self.test_node.last_getblocktxn.block_txn_request.to_absolute()
+        assert_equal(absolute_indexes, [1, 2, 3, 4, 5])
+        msg = msg_blocktxn()
+        msg.block_transactions = BlockTransactions(block.sha256, block.vtx[1:])
+        self.test_node.send_and_ping(msg)
+        assert_equal(int(self.nodes[0].getbestblockhash(), 16), block.sha256)
+
+        utxo = self.utxos.pop(0)
+        block = self.build_block_with_transactions(utxo, 5)
+        self.utxos.append([block.vtx[-1].sha256, 0, block.vtx[-1].vout[0].nValue])
+
+        # Now try interspersing the prefilled transactions
+        comp_block.initialize_from_block(block, prefill_list=[0, 1, 5])
+        self.test_node.send_and_ping(msg_cmpctblock(comp_block.to_p2p()))
+        with mininode_lock:
+            assert(self.test_node.last_getblocktxn is not None)
+            absolute_indexes = self.test_node.last_getblocktxn.block_txn_request.to_absolute()
+        assert_equal(absolute_indexes, [2, 3, 4])
+        msg.block_transactions = BlockTransactions(block.sha256, block.vtx[2:5])
+        self.test_node.send_and_ping(msg)
+        assert_equal(int(self.nodes[0].getbestblockhash(), 16), block.sha256)
+
+        # Now try giving one transaction ahead of time.
+        utxo = self.utxos.pop(0)
+        block = self.build_block_with_transactions(utxo, 5)
+        self.utxos.append([block.vtx[-1].sha256, 0, block.vtx[-1].vout[0].nValue])
+        self.test_node.send_and_ping(msg_tx(block.vtx[1]))
+        assert(block.vtx[1].hash in self.nodes[0].getrawmempool())
+
+        # Prefill 4 out of the 6 transactions, and verify that only the one
+        # that was not in the mempool is requested.
+        comp_block.initialize_from_block(block, prefill_list=[0, 2, 3, 4])
+        self.test_node.send_and_ping(msg_cmpctblock(comp_block.to_p2p()))
+        with mininode_lock:
+            assert(self.test_node.last_getblocktxn is not None)
+            absolute_indexes = self.test_node.last_getblocktxn.block_txn_request.to_absolute()
+        assert_equal(absolute_indexes, [5])
+
+        msg.block_transactions = BlockTransactions(block.sha256, [block.vtx[5]])
+        self.test_node.send_and_ping(msg)
+        assert_equal(int(self.nodes[0].getbestblockhash(), 16), block.sha256)
+
+        # Now provide all transactions to the node before the block is
+        # announced and verify reconstruction happens immediately.
+        utxo = self.utxos.pop(0)
+        block = self.build_block_with_transactions(utxo, 10)
+        self.utxos.append([block.vtx[-1].sha256, 0, block.vtx[-1].vout[0].nValue])
+        for tx in block.vtx[1:]:
+            self.test_node.send_message(msg_tx(tx))
+        self.test_node.sync_with_ping()
+        # Make sure all transactions were accepted.
+        mempool = self.nodes[0].getrawmempool()
+        for tx in block.vtx[1:]:
+            assert(tx.hash in mempool)
+
+        # Clear out last request.
+        with mininode_lock:
+            self.test_node.last_getblocktxn = None
+
+        # Send compact block
+        comp_block.initialize_from_block(block, prefill_list=[0])
+        self.test_node.send_and_ping(msg_cmpctblock(comp_block.to_p2p()))
+        with mininode_lock:
+            # Shouldn't have gotten a request for any transaction
+            assert(self.test_node.last_getblocktxn is None)
+        # Tip should have updated
+        assert_equal(int(self.nodes[0].getbestblockhash(), 16), block.sha256)
+
+    # Incorrectly responding to a getblocktxn shouldn't cause the block to be
+    # permanently failed.
+    def test_incorrect_blocktxn_response(self):
+        print("Testing handling of incorrect blocktxn responses...")
+
+        if (len(self.utxos) == 0):
+            self.make_utxos()
+        utxo = self.utxos.pop(0)
+
+        block = self.build_block_with_transactions(utxo, 10)
+        self.utxos.append([block.vtx[-1].sha256, 0, block.vtx[-1].vout[0].nValue])
+        # Relay the first 5 transactions from the block in advance
+        for tx in block.vtx[1:6]:
+            self.test_node.send_message(msg_tx(tx))
+        self.test_node.sync_with_ping()
+        # Make sure all transactions were accepted.
+        mempool = self.nodes[0].getrawmempool()
+        for tx in block.vtx[1:6]:
+            assert(tx.hash in mempool)
+
+        # Send compact block
+        comp_block = HeaderAndShortIDs()
+        comp_block.initialize_from_block(block, prefill_list=[0])
+        self.test_node.send_and_ping(msg_cmpctblock(comp_block.to_p2p()))
+        absolute_indexes = []
+        with mininode_lock:
+            assert(self.test_node.last_getblocktxn is not None)
+            absolute_indexes = self.test_node.last_getblocktxn.block_txn_request.to_absolute()
+        assert_equal(absolute_indexes, [6, 7, 8, 9, 10])
+
+        # Now give an incorrect response.
+        # Note that it's possible for bitcoind to be smart enough to know we're
+        # lying, since it could check to see if the shortid matches what we're
+        # sending, and eg disconnect us for misbehavior.  If that behavior
+        # change were made, we could just modify this test by having a
+        # different peer provide the block further down, so that we're still
+        # verifying that the block isn't marked bad permanently. This is good
+        # enough for now.
+        msg = msg_blocktxn()
+        msg.block_transactions = BlockTransactions(block.sha256, [block.vtx[5]] + block.vtx[7:])
+        self.test_node.send_and_ping(msg)
+
+        # Tip should not have updated
+        assert_equal(int(self.nodes[0].getbestblockhash(), 16), block.hashPrevBlock)
+
+        # We should receive a getdata request
+        success = wait_until(lambda: self.test_node.last_getdata is not None, timeout=10)
+        assert(success)
+        assert_equal(len(self.test_node.last_getdata.inv), 1)
+        assert_equal(self.test_node.last_getdata.inv[0].type, 2)
+        assert_equal(self.test_node.last_getdata.inv[0].hash, block.sha256)
+
+        # Deliver the block
+        self.test_node.send_and_ping(msg_block(block))
+        assert_equal(int(self.nodes[0].getbestblockhash(), 16), block.sha256)
+
+    def test_getblocktxn_handler(self):
+        print("Testing getblocktxn handler...")
+
+        # bitcoind won't respond for blocks whose height is more than 15 blocks
+        # deep.
+        MAX_GETBLOCKTXN_DEPTH = 15
+        chain_height = self.nodes[0].getblockcount()
+        current_height = chain_height
+        while (current_height >= chain_height - MAX_GETBLOCKTXN_DEPTH):
+            block_hash = self.nodes[0].getblockhash(current_height)
+            block = FromHex(CBlock(), self.nodes[0].getblock(block_hash, False))
+
+            msg = msg_getblocktxn()
+            msg.block_txn_request = BlockTransactionsRequest(int(block_hash, 16), [])
+            num_to_request = random.randint(1, len(block.vtx))
+            msg.block_txn_request.from_absolute(sorted(random.sample(range(len(block.vtx)), num_to_request)))
+            self.test_node.send_message(msg)
+            success = wait_until(lambda: self.test_node.last_blocktxn is not None, timeout=10)
+            assert(success)
+
+            [tx.calc_sha256() for tx in block.vtx]
+            with mininode_lock:
+                assert_equal(self.test_node.last_blocktxn.block_transactions.blockhash, int(block_hash, 16))
+                all_indices = msg.block_txn_request.to_absolute()
+                for index in all_indices:
+                    tx = self.test_node.last_blocktxn.block_transactions.transactions.pop(0)
+                    tx.calc_sha256()
+                    assert_equal(tx.sha256, block.vtx[index].sha256)
+                self.test_node.last_blocktxn = None
+            current_height -= 1
+
+        # Next request should be ignored, as we're past the allowed depth.
+        block_hash = self.nodes[0].getblockhash(current_height)
+        msg.block_txn_request = BlockTransactionsRequest(int(block_hash, 16), [0])
+        self.test_node.send_and_ping(msg)
+        with mininode_lock:
+            assert_equal(self.test_node.last_blocktxn, None)
+
+    def test_compactblocks_not_at_tip(self):
+        print("Testing compactblock requests/announcements not at chain tip...")
+
+        # Test that requesting old compactblocks doesn't work.
+        MAX_CMPCTBLOCK_DEPTH = 11
+        new_blocks = []
+        for i in range(MAX_CMPCTBLOCK_DEPTH):
+            self.test_node.clear_block_announcement()
+            new_blocks.append(self.nodes[0].generate(1)[0])
+            wait_until(self.test_node.received_block_announcement, timeout=30)
+
+        self.test_node.clear_block_announcement()
+        self.test_node.send_message(msg_getdata([CInv(4, int(new_blocks[0], 16))]))
+        success = wait_until(lambda: self.test_node.last_cmpctblock is not None, timeout=30)
+        assert(success)
+
+        self.test_node.clear_block_announcement()
+        self.nodes[0].generate(1)
+        wait_until(self.test_node.received_block_announcement, timeout=30)
+        self.test_node.clear_block_announcement()
+        self.test_node.send_message(msg_getdata([CInv(4, int(new_blocks[0], 16))]))
+        success = wait_until(lambda: self.test_node.last_block is not None, timeout=30)
+        assert(success)
+        with mininode_lock:
+            self.test_node.last_block.block.calc_sha256()
+            assert_equal(self.test_node.last_block.block.sha256, int(new_blocks[0], 16))
+
+        # Generate an old compactblock, and verify that it's not accepted.
+        cur_height = self.nodes[0].getblockcount()
+        hashPrevBlock = int(self.nodes[0].getblockhash(cur_height-5), 16)
+        block = self.build_block_on_tip()
+        block.hashPrevBlock = hashPrevBlock
+        block.solve()
+
+        comp_block = HeaderAndShortIDs()
+        comp_block.initialize_from_block(block)
+        self.test_node.send_and_ping(msg_cmpctblock(comp_block.to_p2p()))
+
+        tips = self.nodes[0].getchaintips()
+        found = False
+        for x in tips:
+            if x["hash"] == block.hash:
+                assert_equal(x["status"], "headers-only")
+                found = True
+                break
+        assert(found)
+
+        # Requesting this block via getblocktxn should silently fail
+        # (to avoid fingerprinting attacks).
+        msg = msg_getblocktxn()
+        msg.block_txn_request = BlockTransactionsRequest(block.sha256, [0])
+        with mininode_lock:
+            self.test_node.last_blocktxn = None
+        self.test_node.send_and_ping(msg)
+        with mininode_lock:
+            assert(self.test_node.last_blocktxn is None)
+
+    def run_test(self):
+        # Setup the p2p connections and start up the network thread.
+        self.test_node = TestNode()
+
+        connections = []
+        connections.append(NodeConn('127.0.0.1', p2p_port(0), self.nodes[0], self.test_node))
+        self.test_node.add_connection(connections[0])
+
+        NetworkThread().start()  # Start up network handling in another thread
+
+        # Test logic begins here
+        self.test_node.wait_for_verack()
+
+        # We will need UTXOs to construct transactions in later tests.
+        self.make_utxos()
+
+        self.test_sendcmpct()
+        self.test_compactblock_construction()
+        self.test_compactblock_requests()
+        self.test_getblocktxn_requests()
+        self.test_getblocktxn_handler()
+        self.test_compactblocks_not_at_tip()
+        self.test_incorrect_blocktxn_response()
+        self.test_invalid_cmpctblock_message()
+
+
+if __name__ == '__main__':
+    CompactBlocksTest().main()

From 5c9e49d12c931f9c7ddaac0144739dcd7263e554 Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Fri, 29 Jul 2016 17:42:12 +0200
Subject: [PATCH 0670/1802] net: Ignore `notfound` P2P messages

---
 src/main.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/main.cpp b/src/main.cpp
index 622ec51422ae6..81f09515f30de 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -6145,6 +6145,11 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
         }
     }
 
+    else if (strCommand == NetMsgType::NOTFOUND) {
+        // We do not care about the NOTFOUND message, but logging an Unknown Command
+        // message would be undesirable as we transmit it ourselves.
+    }
+
     else {
         // Ignore unknown commands for extensibility
         LogPrint("net", "Unknown command \"%s\" from peer=%d\n", SanitizeString(strCommand), pfrom->id);

From 00f09c920c2e8906d2260251be6d1d2fa1bbb29d Mon Sep 17 00:00:00 2001
From: Patrick Strateman <patrick.strateman@gmail.com>
Date: Tue, 7 Jun 2016 21:25:31 -0700
Subject: [PATCH 0671/1802] Split CWallet::AddToWallet into AddToWallet and
 LoadToWallet.

This removes the fFromLoadWallet flag in AddToWallet.  These were already
effectively two methods.
---
 src/wallet/rpcdump.cpp               |   2 +-
 src/wallet/test/accounting_tests.cpp |   6 +-
 src/wallet/wallet.cpp                | 222 ++++++++++++++-------------
 src/wallet/wallet.h                  |   3 +-
 src/wallet/walletdb.cpp              |   2 +-
 5 files changed, 119 insertions(+), 116 deletions(-)

diff --git a/src/wallet/rpcdump.cpp b/src/wallet/rpcdump.cpp
index 6647d3297fad2..9d403a453889f 100644
--- a/src/wallet/rpcdump.cpp
+++ b/src/wallet/rpcdump.cpp
@@ -310,7 +310,7 @@ UniValue importprunedfunds(const UniValue& params, bool fHelp)
 
     if (pwalletMain->IsMine(tx)) {
         CWalletDB walletdb(pwalletMain->strWalletFile, "r+", false);
-        pwalletMain->AddToWallet(wtx, false, &walletdb);
+        pwalletMain->AddToWallet(wtx, &walletdb);
         return NullUniValue;
     }
 
diff --git a/src/wallet/test/accounting_tests.cpp b/src/wallet/test/accounting_tests.cpp
index d075b2b641a1b..8aad568c93cc6 100644
--- a/src/wallet/test/accounting_tests.cpp
+++ b/src/wallet/test/accounting_tests.cpp
@@ -48,7 +48,7 @@ BOOST_AUTO_TEST_CASE(acc_orderupgrade)
     pwalletMain->AddAccountingEntry(ae, walletdb);
 
     wtx.mapValue["comment"] = "z";
-    pwalletMain->AddToWallet(wtx, false, &walletdb);
+    pwalletMain->AddToWallet(wtx, &walletdb);
     vpwtx.push_back(&pwalletMain->mapWallet[wtx.GetHash()]);
     vpwtx[0]->nTimeReceived = (unsigned int)1333333335;
     vpwtx[0]->nOrderPos = -1;
@@ -90,7 +90,7 @@ BOOST_AUTO_TEST_CASE(acc_orderupgrade)
         --tx.nLockTime;  // Just to change the hash :)
         *static_cast<CTransaction*>(&wtx) = CTransaction(tx);
     }
-    pwalletMain->AddToWallet(wtx, false, &walletdb);
+    pwalletMain->AddToWallet(wtx, &walletdb);
     vpwtx.push_back(&pwalletMain->mapWallet[wtx.GetHash()]);
     vpwtx[1]->nTimeReceived = (unsigned int)1333333336;
 
@@ -100,7 +100,7 @@ BOOST_AUTO_TEST_CASE(acc_orderupgrade)
         --tx.nLockTime;  // Just to change the hash :)
         *static_cast<CTransaction*>(&wtx) = CTransaction(tx);
     }
-    pwalletMain->AddToWallet(wtx, false, &walletdb);
+    pwalletMain->AddToWallet(wtx, &walletdb);
     vpwtx.push_back(&pwalletMain->mapWallet[wtx.GetHash()]);
     vpwtx[2]->nTimeReceived = (unsigned int)1333333329;
     vpwtx[2]->nOrderPos = -1;
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index e5ee5063a5d31..68ce26eaa8ae0 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -741,138 +741,140 @@ void CWallet::MarkDirty()
     }
 }
 
-bool CWallet::AddToWallet(const CWalletTx& wtxIn, bool fFromLoadWallet, CWalletDB* pwalletdb)
+bool CWallet::AddToWallet(const CWalletTx& wtxIn, CWalletDB* pwalletdb)
 {
     uint256 hash = wtxIn.GetHash();
 
-    if (fFromLoadWallet)
-    {
-        mapWallet[hash] = wtxIn;
-        CWalletTx& wtx = mapWallet[hash];
-        wtx.BindWallet(this);
+    LOCK(cs_wallet);
+    // Inserts only if not already there, returns tx inserted or tx found
+    pair<map<uint256, CWalletTx>::iterator, bool> ret = mapWallet.insert(make_pair(hash, wtxIn));
+    CWalletTx& wtx = (*ret.first).second;
+    wtx.BindWallet(this);
+    bool fInsertedNew = ret.second;
+    if (fInsertedNew)
+    {
+        wtx.nTimeReceived = GetAdjustedTime();
+        wtx.nOrderPos = IncOrderPosNext(pwalletdb);
         wtxOrdered.insert(make_pair(wtx.nOrderPos, TxPair(&wtx, (CAccountingEntry*)0)));
-        AddToSpends(hash);
-        BOOST_FOREACH(const CTxIn& txin, wtx.vin) {
-            if (mapWallet.count(txin.prevout.hash)) {
-                CWalletTx& prevtx = mapWallet[txin.prevout.hash];
-                if (prevtx.nIndex == -1 && !prevtx.hashUnset()) {
-                    MarkConflicted(prevtx.hashBlock, wtx.GetHash());
-                }
-            }
-        }
-    }
-    else
-    {
-        LOCK(cs_wallet);
-        // Inserts only if not already there, returns tx inserted or tx found
-        pair<map<uint256, CWalletTx>::iterator, bool> ret = mapWallet.insert(make_pair(hash, wtxIn));
-        CWalletTx& wtx = (*ret.first).second;
-        wtx.BindWallet(this);
-        bool fInsertedNew = ret.second;
-        if (fInsertedNew)
-        {
-            wtx.nTimeReceived = GetAdjustedTime();
-            wtx.nOrderPos = IncOrderPosNext(pwalletdb);
-            wtxOrdered.insert(make_pair(wtx.nOrderPos, TxPair(&wtx, (CAccountingEntry*)0)));
-
-            wtx.nTimeSmart = wtx.nTimeReceived;
-            if (!wtxIn.hashUnset())
+
+        wtx.nTimeSmart = wtx.nTimeReceived;
+        if (!wtxIn.hashUnset())
+        {
+            if (mapBlockIndex.count(wtxIn.hashBlock))
             {
-                if (mapBlockIndex.count(wtxIn.hashBlock))
+                int64_t latestNow = wtx.nTimeReceived;
+                int64_t latestEntry = 0;
                 {
-                    int64_t latestNow = wtx.nTimeReceived;
-                    int64_t latestEntry = 0;
+                    // Tolerate times up to the last timestamp in the wallet not more than 5 minutes into the future
+                    int64_t latestTolerated = latestNow + 300;
+                    const TxItems & txOrdered = wtxOrdered;
+                    for (TxItems::const_reverse_iterator it = txOrdered.rbegin(); it != txOrdered.rend(); ++it)
                     {
-                        // Tolerate times up to the last timestamp in the wallet not more than 5 minutes into the future
-                        int64_t latestTolerated = latestNow + 300;
-                        const TxItems & txOrdered = wtxOrdered;
-                        for (TxItems::const_reverse_iterator it = txOrdered.rbegin(); it != txOrdered.rend(); ++it)
+                        CWalletTx *const pwtx = (*it).second.first;
+                        if (pwtx == &wtx)
+                            continue;
+                        CAccountingEntry *const pacentry = (*it).second.second;
+                        int64_t nSmartTime;
+                        if (pwtx)
                         {
-                            CWalletTx *const pwtx = (*it).second.first;
-                            if (pwtx == &wtx)
-                                continue;
-                            CAccountingEntry *const pacentry = (*it).second.second;
-                            int64_t nSmartTime;
-                            if (pwtx)
-                            {
-                                nSmartTime = pwtx->nTimeSmart;
-                                if (!nSmartTime)
-                                    nSmartTime = pwtx->nTimeReceived;
-                            }
-                            else
-                                nSmartTime = pacentry->nTime;
-                            if (nSmartTime <= latestTolerated)
-                            {
-                                latestEntry = nSmartTime;
-                                if (nSmartTime > latestNow)
-                                    latestNow = nSmartTime;
-                                break;
-                            }
+                            nSmartTime = pwtx->nTimeSmart;
+                            if (!nSmartTime)
+                                nSmartTime = pwtx->nTimeReceived;
+                        }
+                        else
+                            nSmartTime = pacentry->nTime;
+                        if (nSmartTime <= latestTolerated)
+                        {
+                            latestEntry = nSmartTime;
+                            if (nSmartTime > latestNow)
+                                latestNow = nSmartTime;
+                            break;
                         }
                     }
-
-                    int64_t blocktime = mapBlockIndex[wtxIn.hashBlock]->GetBlockTime();
-                    wtx.nTimeSmart = std::max(latestEntry, std::min(blocktime, latestNow));
                 }
-                else
-                    LogPrintf("AddToWallet(): found %s in block %s not in index\n",
-                             wtxIn.GetHash().ToString(),
-                             wtxIn.hashBlock.ToString());
+
+                int64_t blocktime = mapBlockIndex[wtxIn.hashBlock]->GetBlockTime();
+                wtx.nTimeSmart = std::max(latestEntry, std::min(blocktime, latestNow));
             }
-            AddToSpends(hash);
+            else
+                LogPrintf("AddToWallet(): found %s in block %s not in index\n",
+                         wtxIn.GetHash().ToString(),
+                         wtxIn.hashBlock.ToString());
         }
+        AddToSpends(hash);
+    }
 
-        bool fUpdated = false;
-        if (!fInsertedNew)
+    bool fUpdated = false;
+    if (!fInsertedNew)
+    {
+        // Merge
+        if (!wtxIn.hashUnset() && wtxIn.hashBlock != wtx.hashBlock)
         {
-            // Merge
-            if (!wtxIn.hashUnset() && wtxIn.hashBlock != wtx.hashBlock)
-            {
-                wtx.hashBlock = wtxIn.hashBlock;
-                fUpdated = true;
-            }
-            // If no longer abandoned, update
-            if (wtxIn.hashBlock.IsNull() && wtx.isAbandoned())
-            {
-                wtx.hashBlock = wtxIn.hashBlock;
-                fUpdated = true;
-            }
-            if (wtxIn.nIndex != -1 && (wtxIn.nIndex != wtx.nIndex))
-            {
-                wtx.nIndex = wtxIn.nIndex;
-                fUpdated = true;
-            }
-            if (wtxIn.fFromMe && wtxIn.fFromMe != wtx.fFromMe)
-            {
-                wtx.fFromMe = wtxIn.fFromMe;
-                fUpdated = true;
-            }
+            wtx.hashBlock = wtxIn.hashBlock;
+            fUpdated = true;
         }
+        // If no longer abandoned, update
+        if (wtxIn.hashBlock.IsNull() && wtx.isAbandoned())
+        {
+            wtx.hashBlock = wtxIn.hashBlock;
+            fUpdated = true;
+        }
+        if (wtxIn.nIndex != -1 && (wtxIn.nIndex != wtx.nIndex))
+        {
+            wtx.nIndex = wtxIn.nIndex;
+            fUpdated = true;
+        }
+        if (wtxIn.fFromMe && wtxIn.fFromMe != wtx.fFromMe)
+        {
+            wtx.fFromMe = wtxIn.fFromMe;
+            fUpdated = true;
+        }
+    }
 
-        //// debug print
-        LogPrintf("AddToWallet %s  %s%s\n", wtxIn.GetHash().ToString(), (fInsertedNew ? "new" : ""), (fUpdated ? "update" : ""));
+    //// debug print
+    LogPrintf("AddToWallet %s  %s%s\n", wtxIn.GetHash().ToString(), (fInsertedNew ? "new" : ""), (fUpdated ? "update" : ""));
 
-        // Write to disk
-        if (fInsertedNew || fUpdated)
-            if (!pwalletdb->WriteTx(wtx))
-                return false;
+    // Write to disk
+    if (fInsertedNew || fUpdated)
+        if (!pwalletdb->WriteTx(wtx))
+            return false;
 
-        // Break debit/credit balance caches:
-        wtx.MarkDirty();
+    // Break debit/credit balance caches:
+    wtx.MarkDirty();
 
-        // Notify UI of new or updated transaction
-        NotifyTransactionChanged(this, hash, fInsertedNew ? CT_NEW : CT_UPDATED);
+    // Notify UI of new or updated transaction
+    NotifyTransactionChanged(this, hash, fInsertedNew ? CT_NEW : CT_UPDATED);
 
-        // notify an external script when a wallet transaction comes in or is updated
-        std::string strCmd = GetArg("-walletnotify", "");
+    // notify an external script when a wallet transaction comes in or is updated
+    std::string strCmd = GetArg("-walletnotify", "");
 
-        if ( !strCmd.empty())
-        {
-            boost::replace_all(strCmd, "%s", wtxIn.GetHash().GetHex());
-            boost::thread t(runCommand, strCmd); // thread runs free
-        }
+    if ( !strCmd.empty())
+    {
+        boost::replace_all(strCmd, "%s", wtxIn.GetHash().GetHex());
+        boost::thread t(runCommand, strCmd); // thread runs free
+    }
+
+    return true;
+}
+
+bool CWallet::LoadToWallet(const CWalletTx& wtxIn)
+{
+    uint256 hash = wtxIn.GetHash();
 
+    mapWallet[hash] = wtxIn;
+    CWalletTx& wtx = mapWallet[hash];
+    wtx.BindWallet(this);
+    wtxOrdered.insert(make_pair(wtx.nOrderPos, TxPair(&wtx, (CAccountingEntry*)0)));
+    AddToSpends(hash);
+    BOOST_FOREACH(const CTxIn& txin, wtx.vin) {
+        if (mapWallet.count(txin.prevout.hash)) {
+            CWalletTx& prevtx = mapWallet[txin.prevout.hash];
+            if (prevtx.nIndex == -1 && !prevtx.hashUnset()) {
+                MarkConflicted(prevtx.hashBlock, wtx.GetHash());
+            }
+        }
     }
+
     return true;
 }
 
@@ -913,7 +915,7 @@ bool CWallet::AddToWalletIfInvolvingMe(const CTransaction& tx, const CBlock* pbl
             // this is safe, as in case of a crash, we rescan the necessary blocks on startup through our SetBestChain-mechanism
             CWalletDB walletdb(strWalletFile, "r+", false);
 
-            return AddToWallet(wtx, false, &walletdb);
+            return AddToWallet(wtx, &walletdb);
         }
     }
     return false;
@@ -2456,7 +2458,7 @@ bool CWallet::CommitTransaction(CWalletTx& wtxNew, CReserveKey& reservekey)
 
             // Add tx to wallet, because if it has change it's also ours,
             // otherwise just for transaction history.
-            AddToWallet(wtxNew, false, pwalletdb);
+            AddToWallet(wtxNew, pwalletdb);
 
             // Notify that old coins are spent
             set<CWalletTx*> setCoins;
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
index 0c95fdf4b04d8..3bbacaae5786f 100644
--- a/src/wallet/wallet.h
+++ b/src/wallet/wallet.h
@@ -729,7 +729,8 @@ class CWallet : public CCryptoKeyStore, public CValidationInterface
     bool GetAccountPubkey(CPubKey &pubKey, std::string strAccount, bool bForceNew = false);
 
     void MarkDirty();
-    bool AddToWallet(const CWalletTx& wtxIn, bool fFromLoadWallet, CWalletDB* pwalletdb);
+    bool AddToWallet(const CWalletTx& wtxIn, CWalletDB* pwalletdb);
+    bool LoadToWallet(const CWalletTx& wtxIn);
     void SyncTransaction(const CTransaction& tx, const CBlockIndex *pindex, const CBlock* pblock);
     bool AddToWalletIfInvolvingMe(const CTransaction& tx, const CBlock* pblock, bool fUpdate);
     int ScanForWalletTransactions(CBlockIndex* pindexStart, bool fUpdate = false);
diff --git a/src/wallet/walletdb.cpp b/src/wallet/walletdb.cpp
index 72af8ab7b25e6..543522ca6485c 100644
--- a/src/wallet/walletdb.cpp
+++ b/src/wallet/walletdb.cpp
@@ -400,7 +400,7 @@ ReadKeyValue(CWallet* pwallet, CDataStream& ssKey, CDataStream& ssValue,
             if (wtx.nOrderPos == -1)
                 wss.fAnyUnordered = true;
 
-            pwallet->AddToWallet(wtx, true, NULL);
+            pwallet->LoadToWallet(wtx);
         }
         else if (strType == "acentry")
         {

From 867f842f1e5a385aeb2093f802d6f37a84d0fe5d Mon Sep 17 00:00:00 2001
From: Patrick Strateman <patrick.strateman@gmail.com>
Date: Tue, 7 Jun 2016 21:41:03 -0700
Subject: [PATCH 0672/1802] Remove CWalletDB* parameter from
 CWallet::AddToWallet

---
 src/wallet/rpcdump.cpp               |  3 +--
 src/wallet/test/accounting_tests.cpp |  6 +++---
 src/wallet/wallet.cpp                | 19 +++++++++----------
 src/wallet/wallet.h                  |  2 +-
 4 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/src/wallet/rpcdump.cpp b/src/wallet/rpcdump.cpp
index 9d403a453889f..fe8b53ceb0c1a 100644
--- a/src/wallet/rpcdump.cpp
+++ b/src/wallet/rpcdump.cpp
@@ -309,8 +309,7 @@ UniValue importprunedfunds(const UniValue& params, bool fHelp)
     LOCK2(cs_main, pwalletMain->cs_wallet);
 
     if (pwalletMain->IsMine(tx)) {
-        CWalletDB walletdb(pwalletMain->strWalletFile, "r+", false);
-        pwalletMain->AddToWallet(wtx, &walletdb);
+        pwalletMain->AddToWallet(wtx, false);
         return NullUniValue;
     }
 
diff --git a/src/wallet/test/accounting_tests.cpp b/src/wallet/test/accounting_tests.cpp
index 8aad568c93cc6..a6cada46a226c 100644
--- a/src/wallet/test/accounting_tests.cpp
+++ b/src/wallet/test/accounting_tests.cpp
@@ -48,7 +48,7 @@ BOOST_AUTO_TEST_CASE(acc_orderupgrade)
     pwalletMain->AddAccountingEntry(ae, walletdb);
 
     wtx.mapValue["comment"] = "z";
-    pwalletMain->AddToWallet(wtx, &walletdb);
+    pwalletMain->AddToWallet(wtx);
     vpwtx.push_back(&pwalletMain->mapWallet[wtx.GetHash()]);
     vpwtx[0]->nTimeReceived = (unsigned int)1333333335;
     vpwtx[0]->nOrderPos = -1;
@@ -90,7 +90,7 @@ BOOST_AUTO_TEST_CASE(acc_orderupgrade)
         --tx.nLockTime;  // Just to change the hash :)
         *static_cast<CTransaction*>(&wtx) = CTransaction(tx);
     }
-    pwalletMain->AddToWallet(wtx, &walletdb);
+    pwalletMain->AddToWallet(wtx);
     vpwtx.push_back(&pwalletMain->mapWallet[wtx.GetHash()]);
     vpwtx[1]->nTimeReceived = (unsigned int)1333333336;
 
@@ -100,7 +100,7 @@ BOOST_AUTO_TEST_CASE(acc_orderupgrade)
         --tx.nLockTime;  // Just to change the hash :)
         *static_cast<CTransaction*>(&wtx) = CTransaction(tx);
     }
-    pwalletMain->AddToWallet(wtx, &walletdb);
+    pwalletMain->AddToWallet(wtx);
     vpwtx.push_back(&pwalletMain->mapWallet[wtx.GetHash()]);
     vpwtx[2]->nTimeReceived = (unsigned int)1333333329;
     vpwtx[2]->nOrderPos = -1;
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index 68ce26eaa8ae0..63a3baea04957 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -741,11 +741,14 @@ void CWallet::MarkDirty()
     }
 }
 
-bool CWallet::AddToWallet(const CWalletTx& wtxIn, CWalletDB* pwalletdb)
+bool CWallet::AddToWallet(const CWalletTx& wtxIn, bool fFlushOnClose)
 {
+    LOCK(cs_wallet);
+
+    CWalletDB walletdb(strWalletFile, "r+", fFlushOnClose);
+
     uint256 hash = wtxIn.GetHash();
 
-    LOCK(cs_wallet);
     // Inserts only if not already there, returns tx inserted or tx found
     pair<map<uint256, CWalletTx>::iterator, bool> ret = mapWallet.insert(make_pair(hash, wtxIn));
     CWalletTx& wtx = (*ret.first).second;
@@ -754,7 +757,7 @@ bool CWallet::AddToWallet(const CWalletTx& wtxIn, CWalletDB* pwalletdb)
     if (fInsertedNew)
     {
         wtx.nTimeReceived = GetAdjustedTime();
-        wtx.nOrderPos = IncOrderPosNext(pwalletdb);
+        wtx.nOrderPos = IncOrderPosNext(&walletdb);
         wtxOrdered.insert(make_pair(wtx.nOrderPos, TxPair(&wtx, (CAccountingEntry*)0)));
 
         wtx.nTimeSmart = wtx.nTimeReceived;
@@ -836,7 +839,7 @@ bool CWallet::AddToWallet(const CWalletTx& wtxIn, CWalletDB* pwalletdb)
 
     // Write to disk
     if (fInsertedNew || fUpdated)
-        if (!pwalletdb->WriteTx(wtx))
+        if (!walletdb.WriteTx(wtx))
             return false;
 
     // Break debit/credit balance caches:
@@ -911,11 +914,7 @@ bool CWallet::AddToWalletIfInvolvingMe(const CTransaction& tx, const CBlock* pbl
             if (pblock)
                 wtx.SetMerkleBranch(*pblock);
 
-            // Do not flush the wallet here for performance reasons
-            // this is safe, as in case of a crash, we rescan the necessary blocks on startup through our SetBestChain-mechanism
-            CWalletDB walletdb(strWalletFile, "r+", false);
-
-            return AddToWallet(wtx, &walletdb);
+            return AddToWallet(wtx, false);
         }
     }
     return false;
@@ -2458,7 +2457,7 @@ bool CWallet::CommitTransaction(CWalletTx& wtxNew, CReserveKey& reservekey)
 
             // Add tx to wallet, because if it has change it's also ours,
             // otherwise just for transaction history.
-            AddToWallet(wtxNew, pwalletdb);
+            AddToWallet(wtxNew);
 
             // Notify that old coins are spent
             set<CWalletTx*> setCoins;
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
index 3bbacaae5786f..236ef85114e1a 100644
--- a/src/wallet/wallet.h
+++ b/src/wallet/wallet.h
@@ -729,7 +729,7 @@ class CWallet : public CCryptoKeyStore, public CValidationInterface
     bool GetAccountPubkey(CPubKey &pubKey, std::string strAccount, bool bForceNew = false);
 
     void MarkDirty();
-    bool AddToWallet(const CWalletTx& wtxIn, CWalletDB* pwalletdb);
+    bool AddToWallet(const CWalletTx& wtxIn, bool fFlushOnClose=true);
     bool LoadToWallet(const CWalletTx& wtxIn);
     void SyncTransaction(const CTransaction& tx, const CBlockIndex *pindex, const CBlock* pblock);
     bool AddToWalletIfInvolvingMe(const CTransaction& tx, const CBlock* pblock, bool fUpdate);

From 5723bb44ce2c6bb14114aa7f211160702a47ac91 Mon Sep 17 00:00:00 2001
From: Patrick Strateman <patrick.strateman@gmail.com>
Date: Wed, 8 Jun 2016 16:20:59 -0700
Subject: [PATCH 0673/1802] Remove unused pwalletdb from CWallet::AddToWallet

---
 src/wallet/wallet.cpp | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index 63a3baea04957..ee9254050ce78 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -2447,11 +2447,6 @@ bool CWallet::CommitTransaction(CWalletTx& wtxNew, CReserveKey& reservekey)
         LOCK2(cs_main, cs_wallet);
         LogPrintf("CommitTransaction:\n%s", wtxNew.ToString());
         {
-            // This is only to keep the database open to defeat the auto-flush for the
-            // duration of this scope.  This is the only place where this optimization
-            // maybe makes sense; please don't do it anywhere else.
-            CWalletDB* pwalletdb = fFileBacked ? new CWalletDB(strWalletFile,"r+") : NULL;
-
             // Take key pair from key pool so it won't be used again
             reservekey.KeepKey();
 
@@ -2467,9 +2462,6 @@ bool CWallet::CommitTransaction(CWalletTx& wtxNew, CReserveKey& reservekey)
                 coin.BindWallet(this);
                 NotifyTransactionChanged(this, coin.GetHash(), CT_UPDATED);
             }
-
-            if (fFileBacked)
-                delete pwalletdb;
         }
 
         // Track how many getdata requests our transaction gets

From 0fd2a33648ccde4b989f1d69529daea4d88b14a2 Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Fri, 22 Jul 2016 15:57:25 +0200
Subject: [PATCH 0674/1802] Use a signal to continue init after genesis
 activation

---
 src/init.cpp              | 40 +++++++++++++++++++++++++++++----------
 src/main.cpp              |  2 --
 src/test/test_bitcoin.cpp |  5 +++++
 3 files changed, 35 insertions(+), 12 deletions(-)

diff --git a/src/init.cpp b/src/init.cpp
index 8d4a2cafbfbb1..4458c8331b613 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -510,6 +510,21 @@ static void BlockNotifyCallback(bool initialSync, const CBlockIndex *pBlockIndex
     boost::thread t(runCommand, strCmd); // thread runs free
 }
 
+static bool fHaveGenesis = false;
+static boost::mutex cs_GenesisWait;
+static CConditionVariable condvar_GenesisWait;
+
+static void BlockNotifyGenesisWait(bool, const CBlockIndex *pBlockIndex)
+{
+    if (pBlockIndex != NULL) {
+        {
+            boost::unique_lock<boost::mutex> lock_GenesisWait(cs_GenesisWait);
+            fHaveGenesis = true;
+        }
+        condvar_GenesisWait.notify_all();
+    }
+}
+
 struct CImportingNow
 {
     CImportingNow() {
@@ -1286,7 +1301,7 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
                     break;
                 }
 
-                if (!fReindex) {
+                if (!fReindex && chainActive.Tip() != NULL) {
                     uiInterface.InitMessage(_("Rewinding blocks..."));
                     if (!RewindBlockIndex(chainparams)) {
                         strLoadError = _("Unable to rewind the database to a pre-fork state. You will need to redownload the blockchain");
@@ -1403,6 +1418,14 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
 
     // ********************************************************* Step 10: import blocks
 
+    // Either install a handler to notify us when genesis activates, or set fHaveGenesis directly.
+    // No locking, as this happens before any background thread is started.
+    if (chainActive.Tip() == NULL) {
+        uiInterface.NotifyBlockTip.connect(BlockNotifyGenesisWait);
+    } else {
+        fHaveGenesis = true;
+    }
+
     if (mapArgs.count("-blocknotify"))
         uiInterface.NotifyBlockTip.connect(BlockNotifyCallback);
 
@@ -1412,19 +1435,16 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
         BOOST_FOREACH(const std::string& strFile, mapMultiArgs["-loadblock"])
             vImportFiles.push_back(strFile);
     }
+
     threadGroup.create_thread(boost::bind(&ThreadImport, vImportFiles));
 
     // Wait for genesis block to be processed
-    bool fHaveGenesis = false;
-    while (!fHaveGenesis && !fRequestShutdown) {
-        {
-            LOCK(cs_main);
-            fHaveGenesis = (chainActive.Tip() != NULL);
-        }
-
-        if (!fHaveGenesis) {
-            MilliSleep(10);
+    {
+        boost::unique_lock<boost::mutex> lock(cs_GenesisWait);
+        while (!fHaveGenesis) {
+            condvar_GenesisWait.wait(lock);
         }
+        uiInterface.NotifyBlockTip.disconnect(BlockNotifyGenesisWait);
     }
 
     // ********************************************************* Step 11: start node
diff --git a/src/main.cpp b/src/main.cpp
index 622ec51422ae6..f8eab7eb3f8e5 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -4331,8 +4331,6 @@ bool InitBlockIndex(const CChainParams& chainparams)
             CBlockIndex *pindex = AddToBlockIndex(block);
             if (!ReceivedBlockTransactions(block, state, pindex, blockPos))
                 return error("LoadBlockIndex(): genesis block not accepted");
-            if (!ActivateBestChain(state, chainparams, &block))
-                return error("LoadBlockIndex(): genesis block cannot be activated");
             // Force a chainstate write so that when we VerifyDB in a moment, it doesn't check stale data
             return FlushStateToDisk(state, FLUSH_STATE_ALWAYS);
         } catch (const std::runtime_error& e) {
diff --git a/src/test/test_bitcoin.cpp b/src/test/test_bitcoin.cpp
index 856f9b842300c..056f2982cf1eb 100644
--- a/src/test/test_bitcoin.cpp
+++ b/src/test/test_bitcoin.cpp
@@ -60,6 +60,11 @@ TestingSetup::TestingSetup(const std::string& chainName) : BasicTestingSetup(cha
         pcoinsdbview = new CCoinsViewDB(1 << 23, true);
         pcoinsTip = new CCoinsViewCache(pcoinsdbview);
         InitBlockIndex(chainparams);
+        {
+            CValidationState state;
+            bool ok = ActivateBestChain(state, chainparams);
+            BOOST_CHECK(ok);
+        }
         nScriptCheckThreads = 3;
         for (int i=0; i < nScriptCheckThreads-1; i++)
             threadGroup.create_thread(&ThreadScriptCheck);

From aa59f2ed3f378c02159e41ff3ae2df76ef850577 Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Fri, 22 Jul 2016 16:01:12 +0200
Subject: [PATCH 0675/1802] Add extra message to avoid a long 'Loading banlist'

---
 src/net.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/net.cpp b/src/net.cpp
index 4cbc43e4d8425..6a1ba41613192 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -2050,6 +2050,8 @@ void StartNode(boost::thread_group& threadGroup, CScheduler& scheduler)
         DumpBanlist();
     }
 
+    uiInterface.InitMessage(_("Starting network threads..."));
+
     fAddressesInitialized = true;
 
     if (semOutbound == NULL) {

From 9d4eb9ad99f7c3abf7abaeaf7ea51f98f9445e75 Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Fri, 22 Jul 2016 16:01:51 +0200
Subject: [PATCH 0676/1802] Do diskspace check before import thread is started

---
 src/init.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/init.cpp b/src/init.cpp
index 4458c8331b613..44d8c16d9553d 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -1418,6 +1418,9 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
 
     // ********************************************************* Step 10: import blocks
 
+    if (!CheckDiskSpace())
+        return false;
+
     // Either install a handler to notify us when genesis activates, or set fHaveGenesis directly.
     // No locking, as this happens before any background thread is started.
     if (chainActive.Tip() == NULL) {
@@ -1449,9 +1452,6 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
 
     // ********************************************************* Step 11: start node
 
-    if (!CheckDiskSpace())
-        return false;
-
     if (!strErrors.str().empty())
         return InitError(strErrors.str());
 

From 29c2d99bc937c7288b64ab8778dc5f4fd74b4f82 Mon Sep 17 00:00:00 2001
From: Patrick Strateman <patrick.strateman@gmail.com>
Date: Sat, 30 Jul 2016 11:27:48 -0700
Subject: [PATCH 0677/1802] Make CWallet::fFileBacked private.

---
 src/wallet/wallet.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
index 0c95fdf4b04d8..9dfb87e1448f5 100644
--- a/src/wallet/wallet.h
+++ b/src/wallet/wallet.h
@@ -581,6 +581,7 @@ class CWallet : public CCryptoKeyStore, public CValidationInterface
     /* the HD chain data model (external chain counters) */
     CHDChain hdChain;
 
+    bool fFileBacked;
 public:
     /*
      * Main wallet lock.
@@ -591,7 +592,6 @@ class CWallet : public CCryptoKeyStore, public CValidationInterface
      */
     mutable CCriticalSection cs_wallet;
 
-    bool fFileBacked;
     std::string strWalletFile;
 
     std::set<int64_t> setKeyPool;

From 31d6b1d5f0414d8b356d8cb9c99961d8a04d6c0a Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Tue, 31 May 2016 13:05:52 -0400
Subject: [PATCH 0678/1802] net: Split resolving out of CNetAddr

---
 src/net.cpp                |  11 ++-
 src/netbase.cpp            |  26 +++----
 src/netbase.h              |   3 +-
 src/qt/rpcconsole.cpp      |   5 +-
 src/rpc/net.cpp            |   7 +-
 src/test/addrman_tests.cpp |  62 +++++++++------
 src/test/net_tests.cpp     |   4 +-
 src/test/netbase_tests.cpp | 154 ++++++++++++++++++++-----------------
 8 files changed, 153 insertions(+), 119 deletions(-)

diff --git a/src/net.cpp b/src/net.cpp
index 4cbc43e4d8425..8725346fe89f3 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -1396,8 +1396,11 @@ void ThreadMapPort()
             {
                 if(externalIPAddress[0])
                 {
-                    LogPrintf("UPnP: ExternalIPAddress = %s\n", externalIPAddress);
-                    AddLocal(CNetAddr(externalIPAddress), LOCAL_UPNP);
+                    CNetAddr resolved;
+                    if(LookupHost(externalIPAddress, resolved, false)) {
+                        LogPrintf("UPnP: ExternalIPAddress = %s\n", resolved.ToString().c_str());
+                        AddLocal(resolved, LOCAL_UPNP);
+                    }
                 }
                 else
                     LogPrintf("UPnP: GetExternalIPAddress failed.\n");
@@ -1623,7 +1626,9 @@ void ThreadOpenConnections()
             static bool done = false;
             if (!done) {
                 LogPrintf("Adding fixed seed nodes as DNS doesn't seem to be available.\n");
-                addrman.Add(convertSeed6(Params().FixedSeeds()), CNetAddr("127.0.0.1"));
+                CNetAddr local;
+                LookupHost("127.0.0.1", local, false);
+                addrman.Add(convertSeed6(Params().FixedSeeds()), local);
                 done = true;
             }
         }
diff --git a/src/netbase.cpp b/src/netbase.cpp
index e2a516986c116..bb16dd0439cd2 100644
--- a/src/netbase.cpp
+++ b/src/netbase.cpp
@@ -195,6 +195,16 @@ bool LookupHost(const char *pszName, std::vector<CNetAddr>& vIP, unsigned int nM
     return LookupIntern(strHost.c_str(), vIP, nMaxSolutions, fAllowLookup);
 }
 
+bool LookupHost(const char *pszName, CNetAddr& addr, bool fAllowLookup)
+{
+    std::vector<CNetAddr> vIP;
+    LookupHost(pszName, vIP, 1, fAllowLookup);
+    if(vIP.empty())
+        return false;
+    addr = vIP.front();
+    return true;
+}
+
 bool Lookup(const char *pszName, std::vector<CService>& vAddr, int portDefault, bool fAllowLookup, unsigned int nMaxSolutions)
 {
     if (pszName[0] == 0)
@@ -695,22 +705,6 @@ CNetAddr::CNetAddr(const struct in6_addr& ipv6Addr, const uint32_t scope)
     scopeId = scope;
 }
 
-CNetAddr::CNetAddr(const char *pszIp)
-{
-    Init();
-    std::vector<CNetAddr> vIP;
-    if (LookupHost(pszIp, vIP, 1, false))
-        *this = vIP[0];
-}
-
-CNetAddr::CNetAddr(const std::string &strIp)
-{
-    Init();
-    std::vector<CNetAddr> vIP;
-    if (LookupHost(strIp.c_str(), vIP, 1, false))
-        *this = vIP[0];
-}
-
 unsigned int CNetAddr::GetByte(int n) const
 {
     return ip[15-n];
diff --git a/src/netbase.h b/src/netbase.h
index 65187a17cfd54..0deca02ca669a 100644
--- a/src/netbase.h
+++ b/src/netbase.h
@@ -49,8 +49,6 @@ class CNetAddr
     public:
         CNetAddr();
         CNetAddr(const struct in_addr& ipv4Addr);
-        explicit CNetAddr(const char *pszIp);
-        explicit CNetAddr(const std::string &strIp);
         void Init();
         void SetIP(const CNetAddr& ip);
 
@@ -207,6 +205,7 @@ bool IsProxy(const CNetAddr &addr);
 bool SetNameProxy(const proxyType &addrProxy);
 bool HaveNameProxy();
 bool LookupHost(const char *pszName, std::vector<CNetAddr>& vIP, unsigned int nMaxSolutions, bool fAllowLookup);
+bool LookupHost(const char *pszName, CNetAddr& addr, bool fAllowLookup);
 bool Lookup(const char *pszName, CService& addr, int portDefault, bool fAllowLookup);
 bool Lookup(const char *pszName, std::vector<CService>& vAddr, int portDefault, bool fAllowLookup, unsigned int nMaxSolutions);
 bool LookupNumeric(const char *pszName, CService& addr, int portDefault = 0);
diff --git a/src/qt/rpcconsole.cpp b/src/qt/rpcconsole.cpp
index 650ff8b00db84..e7df4f2dfafce 100644
--- a/src/qt/rpcconsole.cpp
+++ b/src/qt/rpcconsole.cpp
@@ -898,7 +898,10 @@ void RPCConsole::banSelectedNode(int bantime)
         int port = 0;
         SplitHostPort(nStr, port, addr);
 
-        CNode::Ban(CNetAddr(addr), BanReasonManuallyAdded, bantime);
+        CNetAddr resolved;
+        if(!LookupHost(addr.c_str(), resolved, false))
+            return;
+        CNode::Ban(resolved, BanReasonManuallyAdded, bantime);
 
         clearSelectedNode();
         clientModel->getBanTableModel()->refresh();
diff --git a/src/rpc/net.cpp b/src/rpc/net.cpp
index b85c7b2e1aaa5..c23becd4a97de 100644
--- a/src/rpc/net.cpp
+++ b/src/rpc/net.cpp
@@ -494,8 +494,11 @@ UniValue setban(const UniValue& params, bool fHelp)
     if (params[0].get_str().find("/") != string::npos)
         isSubnet = true;
 
-    if (!isSubnet)
-        netAddr = CNetAddr(params[0].get_str());
+    if (!isSubnet) {
+        CNetAddr resolved;
+        LookupHost(params[0].get_str().c_str(), resolved, false);
+        netAddr = resolved;
+    }
     else
         subNet = CSubNet(params[0].get_str());
 
diff --git a/src/test/addrman_tests.cpp b/src/test/addrman_tests.cpp
index b6cec24b5752a..fd9666f532e98 100644
--- a/src/test/addrman_tests.cpp
+++ b/src/test/addrman_tests.cpp
@@ -50,6 +50,18 @@ class CAddrManTest : public CAddrMan
     }
 };
 
+static CNetAddr ResolveIP(const char* ip)
+{
+    CNetAddr addr;
+    BOOST_CHECK_MESSAGE(LookupHost(ip, addr, false), strprintf("failed to resolve: %s", ip));
+    return addr;
+}
+
+static CNetAddr ResolveIP(std::string ip)
+{
+    return ResolveIP(ip.c_str());
+}
+
 BOOST_FIXTURE_TEST_SUITE(addrman_tests, BasicTestingSetup)
 
 BOOST_AUTO_TEST_CASE(addrman_simple)
@@ -59,7 +71,7 @@ BOOST_AUTO_TEST_CASE(addrman_simple)
     // Set addrman addr placement to be deterministic.
     addrman.MakeDeterministic();
 
-    CNetAddr source = CNetAddr("252.2.2.2");
+    CNetAddr source = ResolveIP("252.2.2.2");
 
     // Test 1: Does Addrman respond correctly when empty.
     BOOST_CHECK(addrman.size() == 0);
@@ -100,7 +112,7 @@ BOOST_AUTO_TEST_CASE(addrman_ports)
     // Set addrman addr placement to be deterministic.
     addrman.MakeDeterministic();
 
-    CNetAddr source = CNetAddr("252.2.2.2");
+    CNetAddr source = ResolveIP("252.2.2.2");
 
     BOOST_CHECK(addrman.size() == 0);
 
@@ -132,7 +144,7 @@ BOOST_AUTO_TEST_CASE(addrman_select)
     // Set addrman addr placement to be deterministic.
     addrman.MakeDeterministic();
 
-    CNetAddr source = CNetAddr("252.2.2.2");
+    CNetAddr source = ResolveIP("252.2.2.2");
 
     // Test 9: Select from new with 1 addr in new.
     CService addr1 = CService("250.1.1.1", 8333);
@@ -160,20 +172,20 @@ BOOST_AUTO_TEST_CASE(addrman_select)
     CService addr3 = CService("250.3.2.2", 9999);
     CService addr4 = CService("250.3.3.3", 9999);
 
-    addrman.Add(CAddress(addr2, NODE_NONE), CService("250.3.1.1", 8333));
-    addrman.Add(CAddress(addr3, NODE_NONE), CService("250.3.1.1", 8333));
-    addrman.Add(CAddress(addr4, NODE_NONE), CService("250.4.1.1", 8333));
+    addrman.Add(CAddress(addr2, NODE_NONE), CService("250.3.1.1", 8333), NODE_NONE);
+    addrman.Add(CAddress(addr3, NODE_NONE), CService("250.3.1.1", 8333), NODE_NONE);
+    addrman.Add(CAddress(addr4, NODE_NONE), CService("250.4.1.1", 8333), NODE_NONE);
 
     // Add three addresses to tried table.
     CService addr5 = CService("250.4.4.4", 8333);
     CService addr6 = CService("250.4.5.5", 7777);
     CService addr7 = CService("250.4.6.6", 8333);
 
-    addrman.Add(CAddress(addr5, NODE_NONE), CService("250.3.1.1", 8333));
+    addrman.Add(CAddress(addr5, NODE_NONE), CService("250.3.1.1", 8333), NODE_NONE);
     addrman.Good(CAddress(addr5, NODE_NONE));
-    addrman.Add(CAddress(addr6, NODE_NONE), CService("250.3.1.1", 8333));
+    addrman.Add(CAddress(addr6, NODE_NONE), CService("250.3.1.1", 8333), NODE_NONE);
     addrman.Good(CAddress(addr6, NODE_NONE));
-    addrman.Add(CAddress(addr7, NODE_NONE), CService("250.1.1.3", 8333));
+    addrman.Add(CAddress(addr7, NODE_NONE), CService("250.1.1.3", 8333), NODE_NONE);
     addrman.Good(CAddress(addr7, NODE_NONE));
 
     // Test 11: 6 addrs + 1 addr from last test = 7.
@@ -193,7 +205,7 @@ BOOST_AUTO_TEST_CASE(addrman_new_collisions)
     // Set addrman addr placement to be deterministic.
     addrman.MakeDeterministic();
 
-    CNetAddr source = CNetAddr("252.2.2.2");
+    CNetAddr source = ResolveIP("252.2.2.2");
 
     BOOST_CHECK(addrman.size() == 0);
 
@@ -222,7 +234,7 @@ BOOST_AUTO_TEST_CASE(addrman_tried_collisions)
     // Set addrman addr placement to be deterministic.
     addrman.MakeDeterministic();
 
-    CNetAddr source = CNetAddr("252.2.2.2");
+    CNetAddr source = ResolveIP("252.2.2.2");
 
     BOOST_CHECK(addrman.size() == 0);
 
@@ -259,8 +271,8 @@ BOOST_AUTO_TEST_CASE(addrman_find)
     CAddress addr2 = CAddress(CService("250.1.2.1", 9999), NODE_NONE);
     CAddress addr3 = CAddress(CService("251.255.2.1", 8333), NODE_NONE);
 
-    CNetAddr source1 = CNetAddr("250.1.2.1");
-    CNetAddr source2 = CNetAddr("250.1.2.2");
+    CNetAddr source1 = ResolveIP("250.1.2.1");
+    CNetAddr source2 = ResolveIP("250.1.2.2");
 
     addrman.Add(addr1, source1);
     addrman.Add(addr2, source2);
@@ -295,7 +307,7 @@ BOOST_AUTO_TEST_CASE(addrman_create)
     BOOST_CHECK(addrman.size() == 0);
 
     CAddress addr1 = CAddress(CService("250.1.2.1", 8333), NODE_NONE);
-    CNetAddr source1 = CNetAddr("250.1.2.1");
+    CNetAddr source1 = ResolveIP("250.1.2.1");
 
     int nId;
     CAddrInfo* pinfo = addrman.Create(addr1, source1, &nId);
@@ -318,7 +330,7 @@ BOOST_AUTO_TEST_CASE(addrman_delete)
     BOOST_CHECK(addrman.size() == 0);
 
     CAddress addr1 = CAddress(CService("250.1.2.1", 8333), NODE_NONE);
-    CNetAddr source1 = CNetAddr("250.1.2.1");
+    CNetAddr source1 = ResolveIP("250.1.2.1");
 
     int nId;
     addrman.Create(addr1, source1, &nId);
@@ -354,8 +366,8 @@ BOOST_AUTO_TEST_CASE(addrman_getaddr)
     addr4.nTime = GetAdjustedTime();
     CAddress addr5 = CAddress(CService("252.254.4.5", 8333), NODE_NONE);
     addr5.nTime = GetAdjustedTime();
-    CNetAddr source1 = CNetAddr("250.1.2.1");
-    CNetAddr source2 = CNetAddr("250.2.3.3");
+    CNetAddr source1 = ResolveIP("250.1.2.1");
+    CNetAddr source2 = ResolveIP("250.2.3.3");
 
     // Test 23: Ensure GetAddr works with new addresses.
     addrman.Add(addr1, source1);
@@ -382,7 +394,7 @@ BOOST_AUTO_TEST_CASE(addrman_getaddr)
         
         // Ensure that for all addrs in addrman, isTerrible == false.
         addr.nTime = GetAdjustedTime();
-        addrman.Add(addr, CNetAddr(strAddr));
+        addrman.Add(addr, ResolveIP(strAddr));
         if (i % 8 == 0)
             addrman.Good(addr);
     }
@@ -406,7 +418,7 @@ BOOST_AUTO_TEST_CASE(caddrinfo_get_tried_bucket)
     CAddress addr1 = CAddress(CService("250.1.1.1", 8333), NODE_NONE);
     CAddress addr2 = CAddress(CService("250.1.1.1", 9999), NODE_NONE);
 
-    CNetAddr source1 = CNetAddr("250.1.1.1");
+    CNetAddr source1 = ResolveIP("250.1.1.1");
 
 
     CAddrInfo info1 = CAddrInfo(addr1, source1);
@@ -432,7 +444,7 @@ BOOST_AUTO_TEST_CASE(caddrinfo_get_tried_bucket)
     for (int i = 0; i < 255; i++) {
         CAddrInfo infoi = CAddrInfo(
             CAddress(CService("250.1.1." + boost::to_string(i)), NODE_NONE),
-            CNetAddr("250.1.1." + boost::to_string(i)));
+            ResolveIP("250.1.1." + boost::to_string(i)));
         int bucket = infoi.GetTriedBucket(nKey1);
         buckets.insert(bucket);
     }
@@ -444,7 +456,7 @@ BOOST_AUTO_TEST_CASE(caddrinfo_get_tried_bucket)
     for (int j = 0; j < 255; j++) {
         CAddrInfo infoj = CAddrInfo(
             CAddress(CService("250." + boost::to_string(j) + ".1.1"), NODE_NONE),
-            CNetAddr("250." + boost::to_string(j) + ".1.1"));
+            ResolveIP("250." + boost::to_string(j) + ".1.1"));
         int bucket = infoj.GetTriedBucket(nKey1);
         buckets.insert(bucket);
     }
@@ -463,7 +475,7 @@ BOOST_AUTO_TEST_CASE(caddrinfo_get_new_bucket)
     CAddress addr1 = CAddress(CService("250.1.2.1", 8333), NODE_NONE);
     CAddress addr2 = CAddress(CService("250.1.2.1", 9999), NODE_NONE);
 
-    CNetAddr source1 = CNetAddr("250.1.2.1");
+    CNetAddr source1 = ResolveIP("250.1.2.1");
 
     CAddrInfo info1 = CAddrInfo(addr1, source1);
 
@@ -485,7 +497,7 @@ BOOST_AUTO_TEST_CASE(caddrinfo_get_new_bucket)
     for (int i = 0; i < 255; i++) {
         CAddrInfo infoi = CAddrInfo(
             CAddress(CService("250.1.1." + boost::to_string(i)), NODE_NONE),
-            CNetAddr("250.1.1." + boost::to_string(i)));
+            ResolveIP("250.1.1." + boost::to_string(i)));
         int bucket = infoi.GetNewBucket(nKey1);
         buckets.insert(bucket);
     }
@@ -498,7 +510,7 @@ BOOST_AUTO_TEST_CASE(caddrinfo_get_new_bucket)
         CAddrInfo infoj = CAddrInfo(CAddress(
                                         CService(
                                             boost::to_string(250 + (j / 255)) + "." + boost::to_string(j % 256) + ".1.1"), NODE_NONE),
-            CNetAddr("251.4.1.1"));
+            ResolveIP("251.4.1.1"));
         int bucket = infoj.GetNewBucket(nKey1);
         buckets.insert(bucket);
     }
@@ -510,7 +522,7 @@ BOOST_AUTO_TEST_CASE(caddrinfo_get_new_bucket)
     for (int p = 0; p < 255; p++) {
         CAddrInfo infoj = CAddrInfo(
             CAddress(CService("250.1.1.1"), NODE_NONE),
-            CNetAddr("250." + boost::to_string(p) + ".1.1"));
+            ResolveIP("250." + boost::to_string(p) + ".1.1"));
         int bucket = infoj.GetNewBucket(nKey1);
         buckets.insert(bucket);
     }
diff --git a/src/test/net_tests.cpp b/src/test/net_tests.cpp
index d005d6a1633e9..511073499e245 100644
--- a/src/test/net_tests.cpp
+++ b/src/test/net_tests.cpp
@@ -52,7 +52,9 @@ class CAddrManCorrupted : public CAddrManSerializationMock
         s << nUBuckets;
 
         CAddress addr = CAddress(CService("252.1.1.1", 7777), NODE_NONE);
-        CAddrInfo info = CAddrInfo(addr, CNetAddr("252.2.2.2"));
+        CNetAddr resolved;
+        LookupHost("252.2.2.2", resolved, false);
+        CAddrInfo info = CAddrInfo(addr, resolved);
         s << info;
     }
 };
diff --git a/src/test/netbase_tests.cpp b/src/test/netbase_tests.cpp
index 4168f75e9a420..556c64f2297fa 100644
--- a/src/test/netbase_tests.cpp
+++ b/src/test/netbase_tests.cpp
@@ -14,37 +14,47 @@ using namespace std;
 
 BOOST_FIXTURE_TEST_SUITE(netbase_tests, BasicTestingSetup)
 
+static CNetAddr ResolveIP(const char* ip)
+{
+    CNetAddr addr;
+    LookupHost(ip, addr, false);
+    return addr;
+}
+
 BOOST_AUTO_TEST_CASE(netbase_networks)
 {
-    BOOST_CHECK(CNetAddr("127.0.0.1").GetNetwork()                              == NET_UNROUTABLE);
-    BOOST_CHECK(CNetAddr("::1").GetNetwork()                                    == NET_UNROUTABLE);
-    BOOST_CHECK(CNetAddr("8.8.8.8").GetNetwork()                                == NET_IPV4);
-    BOOST_CHECK(CNetAddr("2001::8888").GetNetwork()                             == NET_IPV6);
-    BOOST_CHECK(CNetAddr("FD87:D87E:EB43:edb1:8e4:3588:e546:35ca").GetNetwork() == NET_TOR);
+    BOOST_CHECK(ResolveIP("127.0.0.1").GetNetwork()                              == NET_UNROUTABLE);
+    BOOST_CHECK(ResolveIP("::1").GetNetwork()                                    == NET_UNROUTABLE);
+    BOOST_CHECK(ResolveIP("8.8.8.8").GetNetwork()                                == NET_IPV4);
+    BOOST_CHECK(ResolveIP("2001::8888").GetNetwork()                             == NET_IPV6);
+    BOOST_CHECK(ResolveIP("FD87:D87E:EB43:edb1:8e4:3588:e546:35ca").GetNetwork() == NET_TOR);
+
 }
 
 BOOST_AUTO_TEST_CASE(netbase_properties)
 {
-    BOOST_CHECK(CNetAddr("127.0.0.1").IsIPv4());
-    BOOST_CHECK(CNetAddr("::FFFF:192.168.1.1").IsIPv4());
-    BOOST_CHECK(CNetAddr("::1").IsIPv6());
-    BOOST_CHECK(CNetAddr("10.0.0.1").IsRFC1918());
-    BOOST_CHECK(CNetAddr("192.168.1.1").IsRFC1918());
-    BOOST_CHECK(CNetAddr("172.31.255.255").IsRFC1918());
-    BOOST_CHECK(CNetAddr("2001:0DB8::").IsRFC3849());
-    BOOST_CHECK(CNetAddr("169.254.1.1").IsRFC3927());
-    BOOST_CHECK(CNetAddr("2002::1").IsRFC3964());
-    BOOST_CHECK(CNetAddr("FC00::").IsRFC4193());
-    BOOST_CHECK(CNetAddr("2001::2").IsRFC4380());
-    BOOST_CHECK(CNetAddr("2001:10::").IsRFC4843());
-    BOOST_CHECK(CNetAddr("FE80::").IsRFC4862());
-    BOOST_CHECK(CNetAddr("64:FF9B::").IsRFC6052());
-    BOOST_CHECK(CNetAddr("FD87:D87E:EB43:edb1:8e4:3588:e546:35ca").IsTor());
-    BOOST_CHECK(CNetAddr("127.0.0.1").IsLocal());
-    BOOST_CHECK(CNetAddr("::1").IsLocal());
-    BOOST_CHECK(CNetAddr("8.8.8.8").IsRoutable());
-    BOOST_CHECK(CNetAddr("2001::1").IsRoutable());
-    BOOST_CHECK(CNetAddr("127.0.0.1").IsValid());
+
+    BOOST_CHECK(ResolveIP("127.0.0.1").IsIPv4());
+    BOOST_CHECK(ResolveIP("::FFFF:192.168.1.1").IsIPv4());
+    BOOST_CHECK(ResolveIP("::1").IsIPv6());
+    BOOST_CHECK(ResolveIP("10.0.0.1").IsRFC1918());
+    BOOST_CHECK(ResolveIP("192.168.1.1").IsRFC1918());
+    BOOST_CHECK(ResolveIP("172.31.255.255").IsRFC1918());
+    BOOST_CHECK(ResolveIP("2001:0DB8::").IsRFC3849());
+    BOOST_CHECK(ResolveIP("169.254.1.1").IsRFC3927());
+    BOOST_CHECK(ResolveIP("2002::1").IsRFC3964());
+    BOOST_CHECK(ResolveIP("FC00::").IsRFC4193());
+    BOOST_CHECK(ResolveIP("2001::2").IsRFC4380());
+    BOOST_CHECK(ResolveIP("2001:10::").IsRFC4843());
+    BOOST_CHECK(ResolveIP("FE80::").IsRFC4862());
+    BOOST_CHECK(ResolveIP("64:FF9B::").IsRFC6052());
+    BOOST_CHECK(ResolveIP("FD87:D87E:EB43:edb1:8e4:3588:e546:35ca").IsTor());
+    BOOST_CHECK(ResolveIP("127.0.0.1").IsLocal());
+    BOOST_CHECK(ResolveIP("::1").IsLocal());
+    BOOST_CHECK(ResolveIP("8.8.8.8").IsRoutable());
+    BOOST_CHECK(ResolveIP("2001::1").IsRoutable());
+    BOOST_CHECK(ResolveIP("127.0.0.1").IsValid());
+
 }
 
 bool static TestSplitHost(string test, string host, int port)
@@ -95,44 +105,47 @@ BOOST_AUTO_TEST_CASE(netbase_lookupnumeric)
 
 BOOST_AUTO_TEST_CASE(onioncat_test)
 {
+
     // values from https://web.archive.org/web/20121122003543/http://www.cypherpunk.at/onioncat/wiki/OnionCat
-    CNetAddr addr1("5wyqrzbvrdsumnok.onion");
-    CNetAddr addr2("FD87:D87E:EB43:edb1:8e4:3588:e546:35ca");
+    CNetAddr addr1(ResolveIP("5wyqrzbvrdsumnok.onion"));
+    CNetAddr addr2(ResolveIP("FD87:D87E:EB43:edb1:8e4:3588:e546:35ca"));
     BOOST_CHECK(addr1 == addr2);
     BOOST_CHECK(addr1.IsTor());
     BOOST_CHECK(addr1.ToStringIP() == "5wyqrzbvrdsumnok.onion");
     BOOST_CHECK(addr1.IsRoutable());
+
 }
 
 BOOST_AUTO_TEST_CASE(subnet_test)
 {
+
     BOOST_CHECK(CSubNet("1.2.3.0/24") == CSubNet("1.2.3.0/255.255.255.0"));
     BOOST_CHECK(CSubNet("1.2.3.0/24") != CSubNet("1.2.4.0/255.255.255.0"));
-    BOOST_CHECK(CSubNet("1.2.3.0/24").Match(CNetAddr("1.2.3.4")));
-    BOOST_CHECK(!CSubNet("1.2.2.0/24").Match(CNetAddr("1.2.3.4")));
-    BOOST_CHECK(CSubNet("1.2.3.4").Match(CNetAddr("1.2.3.4")));
-    BOOST_CHECK(CSubNet("1.2.3.4/32").Match(CNetAddr("1.2.3.4")));
-    BOOST_CHECK(!CSubNet("1.2.3.4").Match(CNetAddr("5.6.7.8")));
-    BOOST_CHECK(!CSubNet("1.2.3.4/32").Match(CNetAddr("5.6.7.8")));
-    BOOST_CHECK(CSubNet("::ffff:127.0.0.1").Match(CNetAddr("127.0.0.1")));
-    BOOST_CHECK(CSubNet("1:2:3:4:5:6:7:8").Match(CNetAddr("1:2:3:4:5:6:7:8")));
-    BOOST_CHECK(!CSubNet("1:2:3:4:5:6:7:8").Match(CNetAddr("1:2:3:4:5:6:7:9")));
-    BOOST_CHECK(CSubNet("1:2:3:4:5:6:7:0/112").Match(CNetAddr("1:2:3:4:5:6:7:1234")));
-    BOOST_CHECK(CSubNet("192.168.0.1/24").Match(CNetAddr("192.168.0.2")));
-    BOOST_CHECK(CSubNet("192.168.0.20/29").Match(CNetAddr("192.168.0.18")));
-    BOOST_CHECK(CSubNet("1.2.2.1/24").Match(CNetAddr("1.2.2.4")));
-    BOOST_CHECK(CSubNet("1.2.2.110/31").Match(CNetAddr("1.2.2.111")));
-    BOOST_CHECK(CSubNet("1.2.2.20/26").Match(CNetAddr("1.2.2.63")));
+    BOOST_CHECK(CSubNet("1.2.3.0/24").Match(ResolveIP("1.2.3.4")));
+    BOOST_CHECK(!CSubNet("1.2.2.0/24").Match(ResolveIP("1.2.3.4")));
+    BOOST_CHECK(CSubNet("1.2.3.4").Match(ResolveIP("1.2.3.4")));
+    BOOST_CHECK(CSubNet("1.2.3.4/32").Match(ResolveIP("1.2.3.4")));
+    BOOST_CHECK(!CSubNet("1.2.3.4").Match(ResolveIP("5.6.7.8")));
+    BOOST_CHECK(!CSubNet("1.2.3.4/32").Match(ResolveIP("5.6.7.8")));
+    BOOST_CHECK(CSubNet("::ffff:127.0.0.1").Match(ResolveIP("127.0.0.1")));
+    BOOST_CHECK(CSubNet("1:2:3:4:5:6:7:8").Match(ResolveIP("1:2:3:4:5:6:7:8")));
+    BOOST_CHECK(!CSubNet("1:2:3:4:5:6:7:8").Match(ResolveIP("1:2:3:4:5:6:7:9")));
+    BOOST_CHECK(CSubNet("1:2:3:4:5:6:7:0/112").Match(ResolveIP("1:2:3:4:5:6:7:1234")));
+    BOOST_CHECK(CSubNet("192.168.0.1/24").Match(ResolveIP("192.168.0.2")));
+    BOOST_CHECK(CSubNet("192.168.0.20/29").Match(ResolveIP("192.168.0.18")));
+    BOOST_CHECK(CSubNet("1.2.2.1/24").Match(ResolveIP("1.2.2.4")));
+    BOOST_CHECK(CSubNet("1.2.2.110/31").Match(ResolveIP("1.2.2.111")));
+    BOOST_CHECK(CSubNet("1.2.2.20/26").Match(ResolveIP("1.2.2.63")));
     // All-Matching IPv6 Matches arbitrary IPv4 and IPv6
-    BOOST_CHECK(CSubNet("::/0").Match(CNetAddr("1:2:3:4:5:6:7:1234")));
-    BOOST_CHECK(CSubNet("::/0").Match(CNetAddr("1.2.3.4")));
+    BOOST_CHECK(CSubNet("::/0").Match(ResolveIP("1:2:3:4:5:6:7:1234")));
+    BOOST_CHECK(CSubNet("::/0").Match(ResolveIP("1.2.3.4")));
     // All-Matching IPv4 does not Match IPv6
-    BOOST_CHECK(!CSubNet("0.0.0.0/0").Match(CNetAddr("1:2:3:4:5:6:7:1234")));
+    BOOST_CHECK(!CSubNet("0.0.0.0/0").Match(ResolveIP("1:2:3:4:5:6:7:1234")));
     // Invalid subnets Match nothing (not even invalid addresses)
-    BOOST_CHECK(!CSubNet().Match(CNetAddr("1.2.3.4")));
-    BOOST_CHECK(!CSubNet("").Match(CNetAddr("4.5.6.7")));
-    BOOST_CHECK(!CSubNet("bloop").Match(CNetAddr("0.0.0.0")));
-    BOOST_CHECK(!CSubNet("bloop").Match(CNetAddr("hab")));
+    BOOST_CHECK(!CSubNet().Match(ResolveIP("1.2.3.4")));
+    BOOST_CHECK(!CSubNet("").Match(ResolveIP("4.5.6.7")));
+    BOOST_CHECK(!CSubNet("bloop").Match(ResolveIP("0.0.0.0")));
+    BOOST_CHECK(!CSubNet("bloop").Match(ResolveIP("hab")));
     // Check valid/invalid
     BOOST_CHECK(CSubNet("1.2.3.0/0").IsValid());
     BOOST_CHECK(!CSubNet("1.2.3.0/-1").IsValid());
@@ -146,15 +159,15 @@ BOOST_AUTO_TEST_CASE(subnet_test)
     BOOST_CHECK(!CSubNet("fuzzy").IsValid());
 
     //CNetAddr constructor test
-    BOOST_CHECK(CSubNet(CNetAddr("127.0.0.1")).IsValid());
-    BOOST_CHECK(CSubNet(CNetAddr("127.0.0.1")).Match(CNetAddr("127.0.0.1")));
-    BOOST_CHECK(!CSubNet(CNetAddr("127.0.0.1")).Match(CNetAddr("127.0.0.2")));
-    BOOST_CHECK(CSubNet(CNetAddr("127.0.0.1")).ToString() == "127.0.0.1/32");
+    BOOST_CHECK(CSubNet(ResolveIP("127.0.0.1")).IsValid());
+    BOOST_CHECK(CSubNet(ResolveIP("127.0.0.1")).Match(ResolveIP("127.0.0.1")));
+    BOOST_CHECK(!CSubNet(ResolveIP("127.0.0.1")).Match(ResolveIP("127.0.0.2")));
+    BOOST_CHECK(CSubNet(ResolveIP("127.0.0.1")).ToString() == "127.0.0.1/32");
 
-    BOOST_CHECK(CSubNet(CNetAddr("1:2:3:4:5:6:7:8")).IsValid());
-    BOOST_CHECK(CSubNet(CNetAddr("1:2:3:4:5:6:7:8")).Match(CNetAddr("1:2:3:4:5:6:7:8")));
-    BOOST_CHECK(!CSubNet(CNetAddr("1:2:3:4:5:6:7:8")).Match(CNetAddr("1:2:3:4:5:6:7:9")));
-    BOOST_CHECK(CSubNet(CNetAddr("1:2:3:4:5:6:7:8")).ToString() == "1:2:3:4:5:6:7:8/128");
+    BOOST_CHECK(CSubNet(ResolveIP("1:2:3:4:5:6:7:8")).IsValid());
+    BOOST_CHECK(CSubNet(ResolveIP("1:2:3:4:5:6:7:8")).Match(ResolveIP("1:2:3:4:5:6:7:8")));
+    BOOST_CHECK(!CSubNet(ResolveIP("1:2:3:4:5:6:7:8")).Match(ResolveIP("1:2:3:4:5:6:7:9")));
+    BOOST_CHECK(CSubNet(ResolveIP("1:2:3:4:5:6:7:8")).ToString() == "1:2:3:4:5:6:7:8/128");
 
     CSubNet subnet = CSubNet("1.2.3.4/255.255.255.255");
     BOOST_CHECK_EQUAL(subnet.ToString(), "1.2.3.4/32");
@@ -233,22 +246,25 @@ BOOST_AUTO_TEST_CASE(subnet_test)
     BOOST_CHECK_EQUAL(subnet.ToString(), "1.2.0.0/255.255.232.0");
     subnet = CSubNet("1:2:3:4:5:6:7:8/ffff:ffff:ffff:fffe:ffff:ffff:ffff:ff0f");
     BOOST_CHECK_EQUAL(subnet.ToString(), "1:2:3:4:5:6:7:8/ffff:ffff:ffff:fffe:ffff:ffff:ffff:ff0f");
+
 }
 
 BOOST_AUTO_TEST_CASE(netbase_getgroup)
 {
-    BOOST_CHECK(CNetAddr("127.0.0.1").GetGroup() == boost::assign::list_of(0)); // Local -> !Routable()
-    BOOST_CHECK(CNetAddr("257.0.0.1").GetGroup() == boost::assign::list_of(0)); // !Valid -> !Routable()
-    BOOST_CHECK(CNetAddr("10.0.0.1").GetGroup() == boost::assign::list_of(0)); // RFC1918 -> !Routable()
-    BOOST_CHECK(CNetAddr("169.254.1.1").GetGroup() == boost::assign::list_of(0)); // RFC3927 -> !Routable()
-    BOOST_CHECK(CNetAddr("1.2.3.4").GetGroup() == boost::assign::list_of((unsigned char)NET_IPV4)(1)(2)); // IPv4
-    BOOST_CHECK(CNetAddr("::FFFF:0:102:304").GetGroup() == boost::assign::list_of((unsigned char)NET_IPV4)(1)(2)); // RFC6145
-    BOOST_CHECK(CNetAddr("64:FF9B::102:304").GetGroup() == boost::assign::list_of((unsigned char)NET_IPV4)(1)(2)); // RFC6052
-    BOOST_CHECK(CNetAddr("2002:102:304:9999:9999:9999:9999:9999").GetGroup() == boost::assign::list_of((unsigned char)NET_IPV4)(1)(2)); // RFC3964
-    BOOST_CHECK(CNetAddr("2001:0:9999:9999:9999:9999:FEFD:FCFB").GetGroup() == boost::assign::list_of((unsigned char)NET_IPV4)(1)(2)); // RFC4380
-    BOOST_CHECK(CNetAddr("FD87:D87E:EB43:edb1:8e4:3588:e546:35ca").GetGroup() == boost::assign::list_of((unsigned char)NET_TOR)(239)); // Tor
-    BOOST_CHECK(CNetAddr("2001:470:abcd:9999:9999:9999:9999:9999").GetGroup() == boost::assign::list_of((unsigned char)NET_IPV6)(32)(1)(4)(112)(175)); //he.net
-    BOOST_CHECK(CNetAddr("2001:2001:9999:9999:9999:9999:9999:9999").GetGroup() == boost::assign::list_of((unsigned char)NET_IPV6)(32)(1)(32)(1)); //IPv6
+
+    BOOST_CHECK(ResolveIP("127.0.0.1").GetGroup() == boost::assign::list_of(0)); // Local -> !Routable()
+    BOOST_CHECK(ResolveIP("257.0.0.1").GetGroup() == boost::assign::list_of(0)); // !Valid -> !Routable()
+    BOOST_CHECK(ResolveIP("10.0.0.1").GetGroup() == boost::assign::list_of(0)); // RFC1918 -> !Routable()
+    BOOST_CHECK(ResolveIP("169.254.1.1").GetGroup() == boost::assign::list_of(0)); // RFC3927 -> !Routable()
+    BOOST_CHECK(ResolveIP("1.2.3.4").GetGroup() == boost::assign::list_of((unsigned char)NET_IPV4)(1)(2)); // IPv4
+    BOOST_CHECK(ResolveIP("::FFFF:0:102:304").GetGroup() == boost::assign::list_of((unsigned char)NET_IPV4)(1)(2)); // RFC6145
+    BOOST_CHECK(ResolveIP("64:FF9B::102:304").GetGroup() == boost::assign::list_of((unsigned char)NET_IPV4)(1)(2)); // RFC6052
+    BOOST_CHECK(ResolveIP("2002:102:304:9999:9999:9999:9999:9999").GetGroup() == boost::assign::list_of((unsigned char)NET_IPV4)(1)(2)); // RFC3964
+    BOOST_CHECK(ResolveIP("2001:0:9999:9999:9999:9999:FEFD:FCFB").GetGroup() == boost::assign::list_of((unsigned char)NET_IPV4)(1)(2)); // RFC4380
+    BOOST_CHECK(ResolveIP("FD87:D87E:EB43:edb1:8e4:3588:e546:35ca").GetGroup() == boost::assign::list_of((unsigned char)NET_TOR)(239)); // Tor
+    BOOST_CHECK(ResolveIP("2001:470:abcd:9999:9999:9999:9999:9999").GetGroup() == boost::assign::list_of((unsigned char)NET_IPV6)(32)(1)(4)(112)(175)); //he.net
+    BOOST_CHECK(ResolveIP("2001:2001:9999:9999:9999:9999:9999:9999").GetGroup() == boost::assign::list_of((unsigned char)NET_IPV6)(32)(1)(32)(1)); //IPv6
+
 }
 
 BOOST_AUTO_TEST_SUITE_END()

From f96c7c4d91f3c09d26658bc9c15aa561689fa2d4 Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Tue, 31 May 2016 13:51:11 -0400
Subject: [PATCH 0679/1802] net: Split resolving out of CService

---
 src/httpserver.cpp         |   2 +-
 src/init.cpp               |   8 ++-
 src/net.cpp                |  17 ++++---
 src/netbase.cpp            |  34 +------------
 src/netbase.h              |   4 --
 src/qt/optionsdialog.cpp   |   4 +-
 src/test/addrman_tests.cpp | 100 +++++++++++++++++++++----------------
 src/test/net_tests.cpp     |  19 ++++---
 src/torcontrol.cpp         |   7 +--
 9 files changed, 94 insertions(+), 101 deletions(-)

diff --git a/src/httpserver.cpp b/src/httpserver.cpp
index be7a6a1ddee86..57aa134b38fc3 100644
--- a/src/httpserver.cpp
+++ b/src/httpserver.cpp
@@ -614,7 +614,7 @@ CService HTTPRequest::GetPeer()
         const char* address = "";
         uint16_t port = 0;
         evhttp_connection_get_peer(con, (char**)&address, &port);
-        peer = CService(address, port);
+        LookupNumeric(address, peer, port);
     }
     return peer;
 }
diff --git a/src/init.cpp b/src/init.cpp
index 8d4a2cafbfbb1..77ecf05f1db90 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -1096,7 +1096,9 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
     std::string proxyArg = GetArg("-proxy", "");
     SetLimited(NET_TOR);
     if (proxyArg != "" && proxyArg != "0") {
-        proxyType addrProxy = proxyType(CService(proxyArg, 9050), proxyRandomize);
+        CService resolved;
+        LookupNumeric(proxyArg.c_str(), resolved, 9050);
+        proxyType addrProxy = proxyType(resolved, proxyRandomize);
         if (!addrProxy.IsValid())
             return InitError(strprintf(_("Invalid -proxy address: '%s'"), proxyArg));
 
@@ -1115,7 +1117,9 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
         if (onionArg == "0") { // Handle -noonion/-onion=0
             SetLimited(NET_TOR); // set onions as unreachable
         } else {
-            proxyType addrOnion = proxyType(CService(onionArg, 9050), proxyRandomize);
+            CService resolved;
+            LookupNumeric(onionArg.c_str(), resolved, 9050);
+            proxyType addrOnion = proxyType(resolved, proxyRandomize);
             if (!addrOnion.IsValid())
                 return InitError(strprintf(_("Invalid -onion address: '%s'"), onionArg));
             SetProxy(NET_TOR, addrOnion);
diff --git a/src/net.cpp b/src/net.cpp
index 8725346fe89f3..e44bdafc79889 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -175,7 +175,7 @@ static std::vector<CAddress> convertSeed6(const std::vector<SeedSpec6> &vSeedsIn
 // one by discovery.
 CAddress GetLocalAddress(const CNetAddr *paddrPeer)
 {
-    CAddress ret(CService("0.0.0.0",GetListenPort()), NODE_NONE);
+    CAddress ret(CService(CNetAddr(),GetListenPort()), NODE_NONE);
     CService addr;
     if (GetLocal(addr, paddrPeer))
     {
@@ -494,7 +494,7 @@ void CNode::PushVersion()
     int nBestHeight = GetNodeSignals().GetHeight().get_value_or(0);
 
     int64_t nTime = (fInbound ? GetAdjustedTime() : GetTime());
-    CAddress addrYou = (addr.IsRoutable() && !IsProxy(addr) ? addr : CAddress(CService("0.0.0.0", 0), addr.nServices));
+    CAddress addrYou = (addr.IsRoutable() && !IsProxy(addr) ? addr : CAddress(CService(), addr.nServices));
     CAddress addrMe = GetLocalAddress(&addr);
     GetRandBytes((unsigned char*)&nLocalHostNonce, sizeof(nLocalHostNonce));
     if (fLogIPs)
@@ -1727,7 +1727,8 @@ std::vector<AddedNodeInfo> GetAddedNodeInfo()
     }
 
     BOOST_FOREACH(const std::string& strAddNode, lAddresses) {
-        CService service(strAddNode, Params().GetDefaultPort());
+        CService service;
+        LookupNumeric(strAddNode.c_str(), service, Params().GetDefaultPort());
         if (service.IsValid()) {
             // strAddNode is an IP:port
             auto it = mapConnected.find(service);
@@ -1765,7 +1766,8 @@ void ThreadOpenAddedConnections()
                 CSemaphoreGrant grant(*semOutbound);
                 // If strAddedNode is an IP/port, decode it immediately, so
                 // OpenNetworkConnection can detect existing connections to that IP/port.
-                CService service(info.strAddedNode, Params().GetDefaultPort());
+                CService service;
+                LookupNumeric(info.strAddedNode.c_str(), service, Params().GetDefaultPort());
                 OpenNetworkConnection(CAddress(service, NODE_NONE), false, &grant, info.strAddedNode.c_str(), false);
                 MilliSleep(500);
             }
@@ -2063,8 +2065,11 @@ void StartNode(boost::thread_group& threadGroup, CScheduler& scheduler)
         semOutbound = new CSemaphore(nMaxOutbound);
     }
 
-    if (pnodeLocalHost == NULL)
-        pnodeLocalHost = new CNode(INVALID_SOCKET, CAddress(CService("127.0.0.1", 0), nLocalServices));
+    if (pnodeLocalHost == NULL) {
+        CNetAddr local;
+        LookupHost("127.0.0.1", local, false);
+        pnodeLocalHost = new CNode(INVALID_SOCKET, CAddress(CService(local, 0), nLocalServices));
+    }
 
     Discover(threadGroup);
 
diff --git a/src/netbase.cpp b/src/netbase.cpp
index bb16dd0439cd2..2e7a4f758a39e 100644
--- a/src/netbase.cpp
+++ b/src/netbase.cpp
@@ -639,7 +639,7 @@ bool ConnectSocketByName(CService &addr, SOCKET& hSocketRet, const char *pszDest
         }
     }
 
-    addr = CService("0.0.0.0:0");
+    addr = CService();
 
     if (!HaveNameProxy())
         return false;
@@ -1124,38 +1124,6 @@ bool CService::SetSockAddr(const struct sockaddr *paddr)
     }
 }
 
-CService::CService(const char *pszIpPort)
-{
-    Init();
-    CService ip;
-    if (Lookup(pszIpPort, ip, 0, false))
-        *this = ip;
-}
-
-CService::CService(const char *pszIpPort, int portDefault)
-{
-    Init();
-    CService ip;
-    if (Lookup(pszIpPort, ip, portDefault, false))
-        *this = ip;
-}
-
-CService::CService(const std::string &strIpPort)
-{
-    Init();
-    CService ip;
-    if (Lookup(strIpPort.c_str(), ip, 0, false))
-        *this = ip;
-}
-
-CService::CService(const std::string &strIpPort, int portDefault)
-{
-    Init();
-    CService ip;
-    if (Lookup(strIpPort.c_str(), ip, portDefault, false))
-        *this = ip;
-}
-
 unsigned short CService::GetPort() const
 {
     return port;
diff --git a/src/netbase.h b/src/netbase.h
index 0deca02ca669a..97b96f69cc55e 100644
--- a/src/netbase.h
+++ b/src/netbase.h
@@ -152,10 +152,6 @@ class CService : public CNetAddr
         CService(const CNetAddr& ip, unsigned short port);
         CService(const struct in_addr& ipv4Addr, unsigned short port);
         CService(const struct sockaddr_in& addr);
-        explicit CService(const char *pszIpPort, int portDefault);
-        explicit CService(const char *pszIpPort);
-        explicit CService(const std::string& strIpPort, int portDefault);
-        explicit CService(const std::string& strIpPort);
         void Init();
         void SetPort(unsigned short portIn);
         unsigned short GetPort() const;
diff --git a/src/qt/optionsdialog.cpp b/src/qt/optionsdialog.cpp
index f2db3988991a0..e419e4d9ee579 100644
--- a/src/qt/optionsdialog.cpp
+++ b/src/qt/optionsdialog.cpp
@@ -327,7 +327,9 @@ QValidator::State ProxyAddressValidator::validate(QString &input, int &pos) cons
 {
     Q_UNUSED(pos);
     // Validate the proxy
-    proxyType addrProxy = proxyType(CService(input.toStdString(), 9050), true);
+    CService serv;
+    LookupNumeric(input.toStdString().c_str(), serv, 9050);
+    proxyType addrProxy = proxyType(serv, true);
     if (addrProxy.IsValid())
         return QValidator::Acceptable;
 
diff --git a/src/test/addrman_tests.cpp b/src/test/addrman_tests.cpp
index fd9666f532e98..b84d00856bd66 100644
--- a/src/test/addrman_tests.cpp
+++ b/src/test/addrman_tests.cpp
@@ -62,6 +62,18 @@ static CNetAddr ResolveIP(std::string ip)
     return ResolveIP(ip.c_str());
 }
 
+static CService ResolveService(const char* ip, int port = 0)
+{
+    CService serv;
+    BOOST_CHECK_MESSAGE(Lookup(ip, serv, port, false), strprintf("failed to resolve: %s:%i", ip, port));
+    return serv;
+}
+
+static CService ResolveService(std::string ip, int port = 0)
+{
+    return ResolveService(ip.c_str(), port);
+}
+
 BOOST_FIXTURE_TEST_SUITE(addrman_tests, BasicTestingSetup)
 
 BOOST_AUTO_TEST_CASE(addrman_simple)
@@ -79,7 +91,7 @@ BOOST_AUTO_TEST_CASE(addrman_simple)
     BOOST_CHECK(addr_null.ToString() == "[::]:0");
 
     // Test 2: Does Addrman::Add work as expected.
-    CService addr1 = CService("250.1.1.1", 8333);
+    CService addr1 = ResolveService("250.1.1.1", 8333);
     addrman.Add(CAddress(addr1, NODE_NONE), source);
     BOOST_CHECK(addrman.size() == 1);
     CAddrInfo addr_ret1 = addrman.Select();
@@ -87,14 +99,14 @@ BOOST_AUTO_TEST_CASE(addrman_simple)
 
     // Test 3: Does IP address deduplication work correctly.
     //  Expected dup IP should not be added.
-    CService addr1_dup = CService("250.1.1.1", 8333);
+    CService addr1_dup = ResolveService("250.1.1.1", 8333);
     addrman.Add(CAddress(addr1_dup, NODE_NONE), source);
     BOOST_CHECK(addrman.size() == 1);
 
 
     // Test 5: New table has one addr and we add a diff addr we should
     //  have two addrs.
-    CService addr2 = CService("250.1.1.2", 8333);
+    CService addr2 = ResolveService("250.1.1.2", 8333);
     addrman.Add(CAddress(addr2, NODE_NONE), source);
     BOOST_CHECK(addrman.size() == 2);
 
@@ -117,11 +129,11 @@ BOOST_AUTO_TEST_CASE(addrman_ports)
     BOOST_CHECK(addrman.size() == 0);
 
     // Test 7; Addr with same IP but diff port does not replace existing addr.
-    CService addr1 = CService("250.1.1.1", 8333);
+    CService addr1 = ResolveService("250.1.1.1", 8333);
     addrman.Add(CAddress(addr1, NODE_NONE), source);
     BOOST_CHECK(addrman.size() == 1);
 
-    CService addr1_port = CService("250.1.1.1", 8334);
+    CService addr1_port = ResolveService("250.1.1.1", 8334);
     addrman.Add(CAddress(addr1_port, NODE_NONE), source);
     BOOST_CHECK(addrman.size() == 1);
     CAddrInfo addr_ret2 = addrman.Select();
@@ -147,7 +159,7 @@ BOOST_AUTO_TEST_CASE(addrman_select)
     CNetAddr source = ResolveIP("252.2.2.2");
 
     // Test 9: Select from new with 1 addr in new.
-    CService addr1 = CService("250.1.1.1", 8333);
+    CService addr1 = ResolveService("250.1.1.1", 8333);
     addrman.Add(CAddress(addr1, NODE_NONE), source);
     BOOST_CHECK(addrman.size() == 1);
 
@@ -168,24 +180,24 @@ BOOST_AUTO_TEST_CASE(addrman_select)
 
 
     // Add three addresses to new table.
-    CService addr2 = CService("250.3.1.1", 8333);
-    CService addr3 = CService("250.3.2.2", 9999);
-    CService addr4 = CService("250.3.3.3", 9999);
+    CService addr2 = ResolveService("250.3.1.1", 8333);
+    CService addr3 = ResolveService("250.3.2.2", 9999);
+    CService addr4 = ResolveService("250.3.3.3", 9999);
 
-    addrman.Add(CAddress(addr2, NODE_NONE), CService("250.3.1.1", 8333), NODE_NONE);
-    addrman.Add(CAddress(addr3, NODE_NONE), CService("250.3.1.1", 8333), NODE_NONE);
-    addrman.Add(CAddress(addr4, NODE_NONE), CService("250.4.1.1", 8333), NODE_NONE);
+    addrman.Add(CAddress(addr2, NODE_NONE), ResolveService("250.3.1.1", 8333));
+    addrman.Add(CAddress(addr3, NODE_NONE), ResolveService("250.3.1.1", 8333));
+    addrman.Add(CAddress(addr4, NODE_NONE), ResolveService("250.4.1.1", 8333));
 
     // Add three addresses to tried table.
-    CService addr5 = CService("250.4.4.4", 8333);
-    CService addr6 = CService("250.4.5.5", 7777);
-    CService addr7 = CService("250.4.6.6", 8333);
+    CService addr5 = ResolveService("250.4.4.4", 8333);
+    CService addr6 = ResolveService("250.4.5.5", 7777);
+    CService addr7 = ResolveService("250.4.6.6", 8333);
 
-    addrman.Add(CAddress(addr5, NODE_NONE), CService("250.3.1.1", 8333), NODE_NONE);
+    addrman.Add(CAddress(addr5, NODE_NONE), ResolveService("250.3.1.1", 8333));
     addrman.Good(CAddress(addr5, NODE_NONE));
-    addrman.Add(CAddress(addr6, NODE_NONE), CService("250.3.1.1", 8333), NODE_NONE);
+    addrman.Add(CAddress(addr6, NODE_NONE), ResolveService("250.3.1.1", 8333));
     addrman.Good(CAddress(addr6, NODE_NONE));
-    addrman.Add(CAddress(addr7, NODE_NONE), CService("250.1.1.3", 8333), NODE_NONE);
+    addrman.Add(CAddress(addr7, NODE_NONE), ResolveService("250.1.1.3", 8333));
     addrman.Good(CAddress(addr7, NODE_NONE));
 
     // Test 11: 6 addrs + 1 addr from last test = 7.
@@ -210,7 +222,7 @@ BOOST_AUTO_TEST_CASE(addrman_new_collisions)
     BOOST_CHECK(addrman.size() == 0);
 
     for (unsigned int i = 1; i < 18; i++) {
-        CService addr = CService("250.1.1." + boost::to_string(i));
+        CService addr = ResolveService("250.1.1." + boost::to_string(i));
         addrman.Add(CAddress(addr, NODE_NONE), source);
 
         //Test 13: No collision in new table yet.
@@ -218,11 +230,11 @@ BOOST_AUTO_TEST_CASE(addrman_new_collisions)
     }
 
     //Test 14: new table collision!
-    CService addr1 = CService("250.1.1.18");
+    CService addr1 = ResolveService("250.1.1.18");
     addrman.Add(CAddress(addr1, NODE_NONE), source);
     BOOST_CHECK(addrman.size() == 17);
 
-    CService addr2 = CService("250.1.1.19");
+    CService addr2 = ResolveService("250.1.1.19");
     addrman.Add(CAddress(addr2, NODE_NONE), source);
     BOOST_CHECK(addrman.size() == 18);
 }
@@ -239,7 +251,7 @@ BOOST_AUTO_TEST_CASE(addrman_tried_collisions)
     BOOST_CHECK(addrman.size() == 0);
 
     for (unsigned int i = 1; i < 80; i++) {
-        CService addr = CService("250.1.1." + boost::to_string(i));
+        CService addr = ResolveService("250.1.1." + boost::to_string(i));
         addrman.Add(CAddress(addr, NODE_NONE), source);
         addrman.Good(CAddress(addr, NODE_NONE));
 
@@ -249,11 +261,11 @@ BOOST_AUTO_TEST_CASE(addrman_tried_collisions)
     }
 
     //Test 16: tried table collision!
-    CService addr1 = CService("250.1.1.80");
+    CService addr1 = ResolveService("250.1.1.80");
     addrman.Add(CAddress(addr1, NODE_NONE), source);
     BOOST_CHECK(addrman.size() == 79);
 
-    CService addr2 = CService("250.1.1.81");
+    CService addr2 = ResolveService("250.1.1.81");
     addrman.Add(CAddress(addr2, NODE_NONE), source);
     BOOST_CHECK(addrman.size() == 80);
 }
@@ -267,9 +279,9 @@ BOOST_AUTO_TEST_CASE(addrman_find)
 
     BOOST_CHECK(addrman.size() == 0);
 
-    CAddress addr1 = CAddress(CService("250.1.2.1", 8333), NODE_NONE);
-    CAddress addr2 = CAddress(CService("250.1.2.1", 9999), NODE_NONE);
-    CAddress addr3 = CAddress(CService("251.255.2.1", 8333), NODE_NONE);
+    CAddress addr1 = CAddress(ResolveService("250.1.2.1", 8333), NODE_NONE);
+    CAddress addr2 = CAddress(ResolveService("250.1.2.1", 9999), NODE_NONE);
+    CAddress addr3 = CAddress(ResolveService("251.255.2.1", 8333), NODE_NONE);
 
     CNetAddr source1 = ResolveIP("250.1.2.1");
     CNetAddr source2 = ResolveIP("250.1.2.2");
@@ -306,7 +318,7 @@ BOOST_AUTO_TEST_CASE(addrman_create)
 
     BOOST_CHECK(addrman.size() == 0);
 
-    CAddress addr1 = CAddress(CService("250.1.2.1", 8333), NODE_NONE);
+    CAddress addr1 = CAddress(ResolveService("250.1.2.1", 8333), NODE_NONE);
     CNetAddr source1 = ResolveIP("250.1.2.1");
 
     int nId;
@@ -329,7 +341,7 @@ BOOST_AUTO_TEST_CASE(addrman_delete)
 
     BOOST_CHECK(addrman.size() == 0);
 
-    CAddress addr1 = CAddress(CService("250.1.2.1", 8333), NODE_NONE);
+    CAddress addr1 = CAddress(ResolveService("250.1.2.1", 8333), NODE_NONE);
     CNetAddr source1 = ResolveIP("250.1.2.1");
 
     int nId;
@@ -356,15 +368,15 @@ BOOST_AUTO_TEST_CASE(addrman_getaddr)
     vector<CAddress> vAddr1 = addrman.GetAddr();
     BOOST_CHECK(vAddr1.size() == 0);
 
-    CAddress addr1 = CAddress(CService("250.250.2.1", 8333), NODE_NONE);
+    CAddress addr1 = CAddress(ResolveService("250.250.2.1", 8333), NODE_NONE);
     addr1.nTime = GetAdjustedTime(); // Set time so isTerrible = false
-    CAddress addr2 = CAddress(CService("250.251.2.2", 9999), NODE_NONE);
+    CAddress addr2 = CAddress(ResolveService("250.251.2.2", 9999), NODE_NONE);
     addr2.nTime = GetAdjustedTime();
-    CAddress addr3 = CAddress(CService("251.252.2.3", 8333), NODE_NONE);
+    CAddress addr3 = CAddress(ResolveService("251.252.2.3", 8333), NODE_NONE);
     addr3.nTime = GetAdjustedTime();
-    CAddress addr4 = CAddress(CService("252.253.3.4", 8333), NODE_NONE);
+    CAddress addr4 = CAddress(ResolveService("252.253.3.4", 8333), NODE_NONE);
     addr4.nTime = GetAdjustedTime();
-    CAddress addr5 = CAddress(CService("252.254.4.5", 8333), NODE_NONE);
+    CAddress addr5 = CAddress(ResolveService("252.254.4.5", 8333), NODE_NONE);
     addr5.nTime = GetAdjustedTime();
     CNetAddr source1 = ResolveIP("250.1.2.1");
     CNetAddr source2 = ResolveIP("250.2.3.3");
@@ -390,7 +402,7 @@ BOOST_AUTO_TEST_CASE(addrman_getaddr)
         int octet2 = (i / 256) % 256;
         int octet3 = (i / (256 * 2)) % 256;
         string strAddr = boost::to_string(octet1) + "." + boost::to_string(octet2) + "." + boost::to_string(octet3) + ".23";
-        CAddress addr = CAddress(CService(strAddr), NODE_NONE);
+        CAddress addr = CAddress(ResolveService(strAddr), NODE_NONE);
         
         // Ensure that for all addrs in addrman, isTerrible == false.
         addr.nTime = GetAdjustedTime();
@@ -415,8 +427,8 @@ BOOST_AUTO_TEST_CASE(caddrinfo_get_tried_bucket)
     // Set addrman addr placement to be deterministic.
     addrman.MakeDeterministic();
 
-    CAddress addr1 = CAddress(CService("250.1.1.1", 8333), NODE_NONE);
-    CAddress addr2 = CAddress(CService("250.1.1.1", 9999), NODE_NONE);
+    CAddress addr1 = CAddress(ResolveService("250.1.1.1", 8333), NODE_NONE);
+    CAddress addr2 = CAddress(ResolveService("250.1.1.1", 9999), NODE_NONE);
 
     CNetAddr source1 = ResolveIP("250.1.1.1");
 
@@ -443,7 +455,7 @@ BOOST_AUTO_TEST_CASE(caddrinfo_get_tried_bucket)
     set<int> buckets;
     for (int i = 0; i < 255; i++) {
         CAddrInfo infoi = CAddrInfo(
-            CAddress(CService("250.1.1." + boost::to_string(i)), NODE_NONE),
+            CAddress(ResolveService("250.1.1." + boost::to_string(i)), NODE_NONE),
             ResolveIP("250.1.1." + boost::to_string(i)));
         int bucket = infoi.GetTriedBucket(nKey1);
         buckets.insert(bucket);
@@ -455,7 +467,7 @@ BOOST_AUTO_TEST_CASE(caddrinfo_get_tried_bucket)
     buckets.clear();
     for (int j = 0; j < 255; j++) {
         CAddrInfo infoj = CAddrInfo(
-            CAddress(CService("250." + boost::to_string(j) + ".1.1"), NODE_NONE),
+            CAddress(ResolveService("250." + boost::to_string(j) + ".1.1"), NODE_NONE),
             ResolveIP("250." + boost::to_string(j) + ".1.1"));
         int bucket = infoj.GetTriedBucket(nKey1);
         buckets.insert(bucket);
@@ -472,8 +484,8 @@ BOOST_AUTO_TEST_CASE(caddrinfo_get_new_bucket)
     // Set addrman addr placement to be deterministic.
     addrman.MakeDeterministic();
 
-    CAddress addr1 = CAddress(CService("250.1.2.1", 8333), NODE_NONE);
-    CAddress addr2 = CAddress(CService("250.1.2.1", 9999), NODE_NONE);
+    CAddress addr1 = CAddress(ResolveService("250.1.2.1", 8333), NODE_NONE);
+    CAddress addr2 = CAddress(ResolveService("250.1.2.1", 9999), NODE_NONE);
 
     CNetAddr source1 = ResolveIP("250.1.2.1");
 
@@ -496,7 +508,7 @@ BOOST_AUTO_TEST_CASE(caddrinfo_get_new_bucket)
     set<int> buckets;
     for (int i = 0; i < 255; i++) {
         CAddrInfo infoi = CAddrInfo(
-            CAddress(CService("250.1.1." + boost::to_string(i)), NODE_NONE),
+            CAddress(ResolveService("250.1.1." + boost::to_string(i)), NODE_NONE),
             ResolveIP("250.1.1." + boost::to_string(i)));
         int bucket = infoi.GetNewBucket(nKey1);
         buckets.insert(bucket);
@@ -508,7 +520,7 @@ BOOST_AUTO_TEST_CASE(caddrinfo_get_new_bucket)
     buckets.clear();
     for (int j = 0; j < 4 * 255; j++) {
         CAddrInfo infoj = CAddrInfo(CAddress(
-                                        CService(
+                                        ResolveService(
                                             boost::to_string(250 + (j / 255)) + "." + boost::to_string(j % 256) + ".1.1"), NODE_NONE),
             ResolveIP("251.4.1.1"));
         int bucket = infoj.GetNewBucket(nKey1);
@@ -521,7 +533,7 @@ BOOST_AUTO_TEST_CASE(caddrinfo_get_new_bucket)
     buckets.clear();
     for (int p = 0; p < 255; p++) {
         CAddrInfo infoj = CAddrInfo(
-            CAddress(CService("250.1.1.1"), NODE_NONE),
+            CAddress(ResolveService("250.1.1.1"), NODE_NONE),
             ResolveIP("250." + boost::to_string(p) + ".1.1"));
         int bucket = infoj.GetNewBucket(nKey1);
         buckets.insert(bucket);
diff --git a/src/test/net_tests.cpp b/src/test/net_tests.cpp
index 511073499e245..fca1a16b2dc81 100644
--- a/src/test/net_tests.cpp
+++ b/src/test/net_tests.cpp
@@ -51,7 +51,9 @@ class CAddrManCorrupted : public CAddrManSerializationMock
         int nUBuckets = ADDRMAN_NEW_BUCKET_COUNT ^ (1 << 30);
         s << nUBuckets;
 
-        CAddress addr = CAddress(CService("252.1.1.1", 7777), NODE_NONE);
+        CService serv;
+        Lookup("252.1.1.1", serv, 7777, false);
+        CAddress addr = CAddress(serv, NODE_NONE);
         CNetAddr resolved;
         LookupHost("252.2.2.2", resolved, false);
         CAddrInfo info = CAddrInfo(addr, resolved);
@@ -76,14 +78,17 @@ BOOST_AUTO_TEST_CASE(caddrdb_read)
     CAddrManUncorrupted addrmanUncorrupted;
     addrmanUncorrupted.MakeDeterministic();
 
-    CService addr1 = CService("250.7.1.1", 8333);
-    CService addr2 = CService("250.7.2.2", 9999);
-    CService addr3 = CService("250.7.3.3", 9999);
+    CService addr1, addr2, addr3;
+    Lookup("250.7.1.1", addr1, 8333, false);
+    Lookup("250.7.2.2", addr2, 9999, false);
+    Lookup("250.7.3.3", addr3, 9999, false);
 
     // Add three addresses to new table.
-    addrmanUncorrupted.Add(CAddress(addr1, NODE_NONE), CService("252.5.1.1", 8333));
-    addrmanUncorrupted.Add(CAddress(addr2, NODE_NONE), CService("252.5.1.1", 8333));
-    addrmanUncorrupted.Add(CAddress(addr3, NODE_NONE), CService("252.5.1.1", 8333));
+    CService source;
+    Lookup("252.5.1.1", source, 8333, false);
+    addrmanUncorrupted.Add(CAddress(addr1, NODE_NONE), source);
+    addrmanUncorrupted.Add(CAddress(addr2, NODE_NONE), source);
+    addrmanUncorrupted.Add(CAddress(addr3, NODE_NONE), source);
 
     // Test that the de-serialization does not throw an exception.
     CDataStream ssPeers1 = AddrmanToStream(addrmanUncorrupted);
diff --git a/src/torcontrol.cpp b/src/torcontrol.cpp
index 0d6b655675ded..d3d782747fd2c 100644
--- a/src/torcontrol.cpp
+++ b/src/torcontrol.cpp
@@ -437,8 +437,7 @@ void TorController::add_onion_cb(TorControlConnection& conn, const TorControlRep
             if ((i = m.find("PrivateKey")) != m.end())
                 private_key = i->second;
         }
-
-        service = CService(service_id+".onion", GetListenPort());
+        LookupNumeric(std::string(service_id+".onion").c_str(), service, GetListenPort());
         LogPrintf("tor: Got service ID %s, advertising service %s\n", service_id, service.ToString());
         if (WriteBinaryFile(GetPrivateKeyFile(), private_key)) {
             LogPrint("tor", "tor: Cached service private key to %s\n", GetPrivateKeyFile());
@@ -462,7 +461,9 @@ void TorController::auth_cb(TorControlConnection& conn, const TorControlReply& r
         // Now that we know Tor is running setup the proxy for onion addresses
         // if -onion isn't set to something else.
         if (GetArg("-onion", "") == "") {
-            proxyType addrOnion = proxyType(CService("127.0.0.1", 9050), true);
+            CService resolved;
+            assert(LookupNumeric("127.0.0.1", resolved, 9050));
+            proxyType addrOnion = proxyType(resolved, true);
             SetProxy(NET_TOR, addrOnion);
             SetLimited(NET_TOR, false);
         }

From b8db185952c815444b7052092472ef9af3a42e89 Mon Sep 17 00:00:00 2001
From: Chris Stewart <stewart.chris1234@gmail.com>
Date: Fri, 29 Jul 2016 11:52:48 -0500
Subject: [PATCH 0680/1802] Update README.md

Updating documentation for adding new unit test files

Removing unneeded sentence from README

Removing uint160_tests.cpp as it DNE

Formatting command line instructions to use ``

fixing 80 char formatting issue in README

fixing more nits
---
 src/test/README.md | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/src/test/README.md b/src/test/README.md
index b2d6be14f14fd..61462642bfb9c 100644
--- a/src/test/README.md
+++ b/src/test/README.md
@@ -5,18 +5,15 @@ sense to simply use this framework rather than require developers to
 configure some other framework (we want as few impediments to creating
 unit tests as possible).
 
-The build system is setup to compile an executable called "test_bitcoin"
+The build system is setup to compile an executable called `test_bitcoin`
 that runs all of the unit tests.  The main source file is called
-test_bitcoin.cpp, which simply includes other files that contain the
-actual unit tests (outside of a couple required preprocessor
-directives).  The pattern is to create one test file for each class or
-source file for which you want to create unit tests.  The file naming
-convention is "<source_filename>_tests.cpp" and such files should wrap
-their tests in a test suite called "<source_filename>_tests".  For an
-examples of this pattern, examine uint160_tests.cpp and
-uint256_tests.cpp.
-
-Add the source files to /src/Makefile.test.include to add them to the build.
+test_bitcoin.cpp. To add a new unit test file to our test suite you need 
+to add the file to `src/Makefile.test.include`. The pattern is to create 
+one test file for each class or source file for which you want to create 
+unit tests.  The file naming convention is `<source_filename>_tests.cpp` 
+and such files should wrap their tests in a test suite 
+called `<source_filename>_tests`. For an example of this pattern, 
+examine `uint256_tests.cpp`.
 
 For further reading, I found the following website to be helpful in
 explaining how the boost unit test framework works:
@@ -31,5 +28,5 @@ example, to run just the getarg_tests verbosely:
 
     test_bitcoin --run_test=getarg_tests/doubledash
 
-Run  test_bitcoin --help   for the full list.
+Run `test_bitcoin --help` for the full list.
 

From b6c3ff3daed432e71d1c5bfe2357c4bb9fdc862a Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Tue, 31 May 2016 15:50:24 -0400
Subject: [PATCH 0681/1802] net: Split resolving out of CSubNet

---
 src/httpserver.cpp         |  11 ++-
 src/init.cpp               |   3 +-
 src/netbase.cpp            |  94 ++++++++++++++---------
 src/netbase.h              |   4 +-
 src/qt/rpcconsole.cpp      |   3 +-
 src/rpc/net.cpp            |   2 +-
 src/test/netbase_tests.cpp | 149 +++++++++++++++++++------------------
 7 files changed, 152 insertions(+), 114 deletions(-)

diff --git a/src/httpserver.cpp b/src/httpserver.cpp
index 57aa134b38fc3..2c5bc2c7923c3 100644
--- a/src/httpserver.cpp
+++ b/src/httpserver.cpp
@@ -197,12 +197,17 @@ static bool ClientAllowed(const CNetAddr& netaddr)
 static bool InitHTTPAllowList()
 {
     rpc_allow_subnets.clear();
-    rpc_allow_subnets.push_back(CSubNet("127.0.0.0/8")); // always allow IPv4 local subnet
-    rpc_allow_subnets.push_back(CSubNet("::1"));         // always allow IPv6 localhost
+    CNetAddr localv4;
+    CNetAddr localv6;
+    LookupHost("127.0.0.1", localv4, false);
+    LookupHost("::1", localv6, false);
+    rpc_allow_subnets.push_back(CSubNet(localv4, 8)); // always allow IPv4 local subnet
+    rpc_allow_subnets.push_back(CSubNet(localv6));         // always allow IPv6 localhost
     if (mapMultiArgs.count("-rpcallowip")) {
         const std::vector<std::string>& vAllow = mapMultiArgs["-rpcallowip"];
         for (std::string strAllow : vAllow) {
-            CSubNet subnet(strAllow);
+            CSubNet subnet;
+            LookupSubNet(strAllow.c_str(), subnet);
             if (!subnet.IsValid()) {
                 uiInterface.ThreadSafeMessageBox(
                     strprintf("Invalid -rpcallowip subnet specification: %s. Valid are a single IP (e.g. 1.2.3.4), a network/netmask (e.g. 1.2.3.4/255.255.255.0) or a network/CIDR (e.g. 1.2.3.4/24).", strAllow),
diff --git a/src/init.cpp b/src/init.cpp
index 77ecf05f1db90..8b94e2dbfb126 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -1083,7 +1083,8 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
 
     if (mapArgs.count("-whitelist")) {
         BOOST_FOREACH(const std::string& net, mapMultiArgs["-whitelist"]) {
-            CSubNet subnet(net);
+            CSubNet subnet;
+            LookupSubNet(net.c_str(), subnet);
             if (!subnet.IsValid())
                 return InitError(strprintf(_("Invalid netmask specified in -whitelist: '%s'"), net));
             CNode::AddWhitelistedRange(subnet);
diff --git a/src/netbase.cpp b/src/netbase.cpp
index 2e7a4f758a39e..52badcd98f5f8 100644
--- a/src/netbase.cpp
+++ b/src/netbase.cpp
@@ -1214,63 +1214,85 @@ CSubNet::CSubNet():
     memset(netmask, 0, sizeof(netmask));
 }
 
-CSubNet::CSubNet(const std::string &strSubnet)
+CSubNet::CSubNet(const CNetAddr &addr, int32_t mask)
 {
-    size_t slash = strSubnet.find_last_of('/');
-    std::vector<CNetAddr> vIP;
+    valid = true;
+    network = addr;
+    // Default to /32 (IPv4) or /128 (IPv6), i.e. match single address
+    memset(netmask, 255, sizeof(netmask));
 
+    // IPv4 addresses start at offset 12, and first 12 bytes must match, so just offset n
+    const int astartofs = network.IsIPv4() ? 12 : 0;
+
+    int32_t n = mask;
+    if(n >= 0 && n <= (128 - astartofs*8)) // Only valid if in range of bits of address
+    {
+        n += astartofs*8;
+        // Clear bits [n..127]
+        for (; n < 128; ++n)
+            netmask[n>>3] &= ~(1<<(7-(n&7)));
+    } else
+        valid = false;
+
+    // Normalize network according to netmask
+    for(int x=0; x<16; ++x)
+        network.ip[x] &= netmask[x];
+}
+
+CSubNet::CSubNet(const CNetAddr &addr, const CNetAddr &mask)
+{
     valid = true;
+    network = addr;
     // Default to /32 (IPv4) or /128 (IPv6), i.e. match single address
     memset(netmask, 255, sizeof(netmask));
 
+    // IPv4 addresses start at offset 12, and first 12 bytes must match, so just offset n
+    const int astartofs = network.IsIPv4() ? 12 : 0;
+
+    for(int x=astartofs; x<16; ++x)
+        netmask[x] = mask.ip[x];
+
+    // Normalize network according to netmask
+    for(int x=0; x<16; ++x)
+        network.ip[x] &= netmask[x];
+}
+
+
+bool LookupSubNet(const char* pszName, CSubNet& ret)
+{
+    std::string strSubnet(pszName);
+    size_t slash = strSubnet.find_last_of('/');
+    std::vector<CNetAddr> vIP;
+
     std::string strAddress = strSubnet.substr(0, slash);
     if (LookupHost(strAddress.c_str(), vIP, 1, false))
     {
-        network = vIP[0];
+        CNetAddr network = vIP[0];
         if (slash != strSubnet.npos)
         {
             std::string strNetmask = strSubnet.substr(slash + 1);
             int32_t n;
             // IPv4 addresses start at offset 12, and first 12 bytes must match, so just offset n
-            const int astartofs = network.IsIPv4() ? 12 : 0;
-            if (ParseInt32(strNetmask, &n)) // If valid number, assume /24 symtex
-            {
-                if(n >= 0 && n <= (128 - astartofs*8)) // Only valid if in range of bits of address
-                {
-                    n += astartofs*8;
-                    // Clear bits [n..127]
-                    for (; n < 128; ++n)
-                        netmask[n>>3] &= ~(1<<(7-(n&7)));
-                }
-                else
-                {
-                    valid = false;
-                }
+            if (ParseInt32(strNetmask, &n)) { // If valid number, assume /24 syntax
+                ret = CSubNet(network, n);
+                return ret.IsValid();
             }
             else // If not a valid number, try full netmask syntax
             {
-                if (LookupHost(strNetmask.c_str(), vIP, 1, false)) // Never allow lookup for netmask
-                {
-                    // Copy only the *last* four bytes in case of IPv4, the rest of the mask should stay 1's as
-                    // we don't want pchIPv4 to be part of the mask.
-                    for(int x=astartofs; x<16; ++x)
-                        netmask[x] = vIP[0].ip[x];
-                }
-                else
-                {
-                    valid = false;
+                // Never allow lookup for netmask
+                if (LookupHost(strNetmask.c_str(), vIP, 1, false)) {
+                    ret = CSubNet(network, vIP[0]);
+                    return ret.IsValid();
                 }
             }
         }
+        else
+        {
+            ret = CSubNet(network);
+            return ret.IsValid();
+        }
     }
-    else
-    {
-        valid = false;
-    }
-
-    // Normalize network according to netmask
-    for(int x=0; x<16; ++x)
-        network.ip[x] &= netmask[x];
+    return false;
 }
 
 CSubNet::CSubNet(const CNetAddr &addr):
diff --git a/src/netbase.h b/src/netbase.h
index 97b96f69cc55e..26807ae69733a 100644
--- a/src/netbase.h
+++ b/src/netbase.h
@@ -117,7 +117,8 @@ class CSubNet
 
     public:
         CSubNet();
-        explicit CSubNet(const std::string &strSubnet);
+        CSubNet(const CNetAddr &addr, int32_t mask);
+        CSubNet(const CNetAddr &addr, const CNetAddr &mask);
 
         //constructor for single ip subnet (<ipv4>/32 or <ipv6>/128)
         explicit CSubNet(const CNetAddr &addr);
@@ -205,6 +206,7 @@ bool LookupHost(const char *pszName, CNetAddr& addr, bool fAllowLookup);
 bool Lookup(const char *pszName, CService& addr, int portDefault, bool fAllowLookup);
 bool Lookup(const char *pszName, std::vector<CService>& vAddr, int portDefault, bool fAllowLookup, unsigned int nMaxSolutions);
 bool LookupNumeric(const char *pszName, CService& addr, int portDefault = 0);
+bool LookupSubNet(const char *pszName, CSubNet& subnet);
 bool ConnectSocket(const CService &addr, SOCKET& hSocketRet, int nTimeout, bool *outProxyConnectionFailed = 0);
 bool ConnectSocketByName(CService &addr, SOCKET& hSocketRet, const char *pszDest, int portDefault, int nTimeout, bool *outProxyConnectionFailed = 0);
 /** Return readable error string for a network error code */
diff --git a/src/qt/rpcconsole.cpp b/src/qt/rpcconsole.cpp
index e7df4f2dfafce..21eda07ddffd0 100644
--- a/src/qt/rpcconsole.cpp
+++ b/src/qt/rpcconsole.cpp
@@ -915,8 +915,9 @@ void RPCConsole::unbanSelectedNode()
 
     // Get currently selected ban address
     QString strNode = GUIUtil::getEntryData(ui->banlistWidget, 0, BanTableModel::Address);
-    CSubNet possibleSubnet(strNode.toStdString());
+    CSubNet possibleSubnet;
 
+    LookupSubNet(strNode.toStdString().c_str(), possibleSubnet);
     if (possibleSubnet.IsValid())
     {
         CNode::Unban(possibleSubnet);
diff --git a/src/rpc/net.cpp b/src/rpc/net.cpp
index c23becd4a97de..58cf4a56e05ec 100644
--- a/src/rpc/net.cpp
+++ b/src/rpc/net.cpp
@@ -500,7 +500,7 @@ UniValue setban(const UniValue& params, bool fHelp)
         netAddr = resolved;
     }
     else
-        subNet = CSubNet(params[0].get_str());
+        LookupSubNet(params[0].get_str().c_str(), subNet);
 
     if (! (isSubnet ? subNet.IsValid() : netAddr.IsValid()) )
         throw JSONRPCError(RPC_CLIENT_NODE_ALREADY_ADDED, "Error: Invalid IP/Subnet");
diff --git a/src/test/netbase_tests.cpp b/src/test/netbase_tests.cpp
index 556c64f2297fa..34b1ebb7a428d 100644
--- a/src/test/netbase_tests.cpp
+++ b/src/test/netbase_tests.cpp
@@ -21,6 +21,13 @@ static CNetAddr ResolveIP(const char* ip)
     return addr;
 }
 
+static CSubNet ResolveSubNet(const char* subnet)
+{
+    CSubNet ret;
+    LookupSubNet(subnet, ret);
+    return ret;
+}
+
 BOOST_AUTO_TEST_CASE(netbase_networks)
 {
     BOOST_CHECK(ResolveIP("127.0.0.1").GetNetwork()                              == NET_UNROUTABLE);
@@ -119,44 +126,44 @@ BOOST_AUTO_TEST_CASE(onioncat_test)
 BOOST_AUTO_TEST_CASE(subnet_test)
 {
 
-    BOOST_CHECK(CSubNet("1.2.3.0/24") == CSubNet("1.2.3.0/255.255.255.0"));
-    BOOST_CHECK(CSubNet("1.2.3.0/24") != CSubNet("1.2.4.0/255.255.255.0"));
-    BOOST_CHECK(CSubNet("1.2.3.0/24").Match(ResolveIP("1.2.3.4")));
-    BOOST_CHECK(!CSubNet("1.2.2.0/24").Match(ResolveIP("1.2.3.4")));
-    BOOST_CHECK(CSubNet("1.2.3.4").Match(ResolveIP("1.2.3.4")));
-    BOOST_CHECK(CSubNet("1.2.3.4/32").Match(ResolveIP("1.2.3.4")));
-    BOOST_CHECK(!CSubNet("1.2.3.4").Match(ResolveIP("5.6.7.8")));
-    BOOST_CHECK(!CSubNet("1.2.3.4/32").Match(ResolveIP("5.6.7.8")));
-    BOOST_CHECK(CSubNet("::ffff:127.0.0.1").Match(ResolveIP("127.0.0.1")));
-    BOOST_CHECK(CSubNet("1:2:3:4:5:6:7:8").Match(ResolveIP("1:2:3:4:5:6:7:8")));
-    BOOST_CHECK(!CSubNet("1:2:3:4:5:6:7:8").Match(ResolveIP("1:2:3:4:5:6:7:9")));
-    BOOST_CHECK(CSubNet("1:2:3:4:5:6:7:0/112").Match(ResolveIP("1:2:3:4:5:6:7:1234")));
-    BOOST_CHECK(CSubNet("192.168.0.1/24").Match(ResolveIP("192.168.0.2")));
-    BOOST_CHECK(CSubNet("192.168.0.20/29").Match(ResolveIP("192.168.0.18")));
-    BOOST_CHECK(CSubNet("1.2.2.1/24").Match(ResolveIP("1.2.2.4")));
-    BOOST_CHECK(CSubNet("1.2.2.110/31").Match(ResolveIP("1.2.2.111")));
-    BOOST_CHECK(CSubNet("1.2.2.20/26").Match(ResolveIP("1.2.2.63")));
+    BOOST_CHECK(ResolveSubNet("1.2.3.0/24") == ResolveSubNet("1.2.3.0/255.255.255.0"));
+    BOOST_CHECK(ResolveSubNet("1.2.3.0/24") != ResolveSubNet("1.2.4.0/255.255.255.0"));
+    BOOST_CHECK(ResolveSubNet("1.2.3.0/24").Match(ResolveIP("1.2.3.4")));
+    BOOST_CHECK(!ResolveSubNet("1.2.2.0/24").Match(ResolveIP("1.2.3.4")));
+    BOOST_CHECK(ResolveSubNet("1.2.3.4").Match(ResolveIP("1.2.3.4")));
+    BOOST_CHECK(ResolveSubNet("1.2.3.4/32").Match(ResolveIP("1.2.3.4")));
+    BOOST_CHECK(!ResolveSubNet("1.2.3.4").Match(ResolveIP("5.6.7.8")));
+    BOOST_CHECK(!ResolveSubNet("1.2.3.4/32").Match(ResolveIP("5.6.7.8")));
+    BOOST_CHECK(ResolveSubNet("::ffff:127.0.0.1").Match(ResolveIP("127.0.0.1")));
+    BOOST_CHECK(ResolveSubNet("1:2:3:4:5:6:7:8").Match(ResolveIP("1:2:3:4:5:6:7:8")));
+    BOOST_CHECK(!ResolveSubNet("1:2:3:4:5:6:7:8").Match(ResolveIP("1:2:3:4:5:6:7:9")));
+    BOOST_CHECK(ResolveSubNet("1:2:3:4:5:6:7:0/112").Match(ResolveIP("1:2:3:4:5:6:7:1234")));
+    BOOST_CHECK(ResolveSubNet("192.168.0.1/24").Match(ResolveIP("192.168.0.2")));
+    BOOST_CHECK(ResolveSubNet("192.168.0.20/29").Match(ResolveIP("192.168.0.18")));
+    BOOST_CHECK(ResolveSubNet("1.2.2.1/24").Match(ResolveIP("1.2.2.4")));
+    BOOST_CHECK(ResolveSubNet("1.2.2.110/31").Match(ResolveIP("1.2.2.111")));
+    BOOST_CHECK(ResolveSubNet("1.2.2.20/26").Match(ResolveIP("1.2.2.63")));
     // All-Matching IPv6 Matches arbitrary IPv4 and IPv6
-    BOOST_CHECK(CSubNet("::/0").Match(ResolveIP("1:2:3:4:5:6:7:1234")));
-    BOOST_CHECK(CSubNet("::/0").Match(ResolveIP("1.2.3.4")));
+    BOOST_CHECK(ResolveSubNet("::/0").Match(ResolveIP("1:2:3:4:5:6:7:1234")));
+    BOOST_CHECK(ResolveSubNet("::/0").Match(ResolveIP("1.2.3.4")));
     // All-Matching IPv4 does not Match IPv6
-    BOOST_CHECK(!CSubNet("0.0.0.0/0").Match(ResolveIP("1:2:3:4:5:6:7:1234")));
+    BOOST_CHECK(!ResolveSubNet("0.0.0.0/0").Match(ResolveIP("1:2:3:4:5:6:7:1234")));
     // Invalid subnets Match nothing (not even invalid addresses)
     BOOST_CHECK(!CSubNet().Match(ResolveIP("1.2.3.4")));
-    BOOST_CHECK(!CSubNet("").Match(ResolveIP("4.5.6.7")));
-    BOOST_CHECK(!CSubNet("bloop").Match(ResolveIP("0.0.0.0")));
-    BOOST_CHECK(!CSubNet("bloop").Match(ResolveIP("hab")));
+    BOOST_CHECK(!ResolveSubNet("").Match(ResolveIP("4.5.6.7")));
+    BOOST_CHECK(!ResolveSubNet("bloop").Match(ResolveIP("0.0.0.0")));
+    BOOST_CHECK(!ResolveSubNet("bloop").Match(ResolveIP("hab")));
     // Check valid/invalid
-    BOOST_CHECK(CSubNet("1.2.3.0/0").IsValid());
-    BOOST_CHECK(!CSubNet("1.2.3.0/-1").IsValid());
-    BOOST_CHECK(CSubNet("1.2.3.0/32").IsValid());
-    BOOST_CHECK(!CSubNet("1.2.3.0/33").IsValid());
-    BOOST_CHECK(CSubNet("1:2:3:4:5:6:7:8/0").IsValid());
-    BOOST_CHECK(CSubNet("1:2:3:4:5:6:7:8/33").IsValid());
-    BOOST_CHECK(!CSubNet("1:2:3:4:5:6:7:8/-1").IsValid());
-    BOOST_CHECK(CSubNet("1:2:3:4:5:6:7:8/128").IsValid());
-    BOOST_CHECK(!CSubNet("1:2:3:4:5:6:7:8/129").IsValid());
-    BOOST_CHECK(!CSubNet("fuzzy").IsValid());
+    BOOST_CHECK(ResolveSubNet("1.2.3.0/0").IsValid());
+    BOOST_CHECK(!ResolveSubNet("1.2.3.0/-1").IsValid());
+    BOOST_CHECK(ResolveSubNet("1.2.3.0/32").IsValid());
+    BOOST_CHECK(!ResolveSubNet("1.2.3.0/33").IsValid());
+    BOOST_CHECK(ResolveSubNet("1:2:3:4:5:6:7:8/0").IsValid());
+    BOOST_CHECK(ResolveSubNet("1:2:3:4:5:6:7:8/33").IsValid());
+    BOOST_CHECK(!ResolveSubNet("1:2:3:4:5:6:7:8/-1").IsValid());
+    BOOST_CHECK(ResolveSubNet("1:2:3:4:5:6:7:8/128").IsValid());
+    BOOST_CHECK(!ResolveSubNet("1:2:3:4:5:6:7:8/129").IsValid());
+    BOOST_CHECK(!ResolveSubNet("fuzzy").IsValid());
 
     //CNetAddr constructor test
     BOOST_CHECK(CSubNet(ResolveIP("127.0.0.1")).IsValid());
@@ -169,82 +176,82 @@ BOOST_AUTO_TEST_CASE(subnet_test)
     BOOST_CHECK(!CSubNet(ResolveIP("1:2:3:4:5:6:7:8")).Match(ResolveIP("1:2:3:4:5:6:7:9")));
     BOOST_CHECK(CSubNet(ResolveIP("1:2:3:4:5:6:7:8")).ToString() == "1:2:3:4:5:6:7:8/128");
 
-    CSubNet subnet = CSubNet("1.2.3.4/255.255.255.255");
+    CSubNet subnet = ResolveSubNet("1.2.3.4/255.255.255.255");
     BOOST_CHECK_EQUAL(subnet.ToString(), "1.2.3.4/32");
-    subnet = CSubNet("1.2.3.4/255.255.255.254");
+    subnet = ResolveSubNet("1.2.3.4/255.255.255.254");
     BOOST_CHECK_EQUAL(subnet.ToString(), "1.2.3.4/31");
-    subnet = CSubNet("1.2.3.4/255.255.255.252");
+    subnet = ResolveSubNet("1.2.3.4/255.255.255.252");
     BOOST_CHECK_EQUAL(subnet.ToString(), "1.2.3.4/30");
-    subnet = CSubNet("1.2.3.4/255.255.255.248");
+    subnet = ResolveSubNet("1.2.3.4/255.255.255.248");
     BOOST_CHECK_EQUAL(subnet.ToString(), "1.2.3.0/29");
-    subnet = CSubNet("1.2.3.4/255.255.255.240");
+    subnet = ResolveSubNet("1.2.3.4/255.255.255.240");
     BOOST_CHECK_EQUAL(subnet.ToString(), "1.2.3.0/28");
-    subnet = CSubNet("1.2.3.4/255.255.255.224");
+    subnet = ResolveSubNet("1.2.3.4/255.255.255.224");
     BOOST_CHECK_EQUAL(subnet.ToString(), "1.2.3.0/27");
-    subnet = CSubNet("1.2.3.4/255.255.255.192");
+    subnet = ResolveSubNet("1.2.3.4/255.255.255.192");
     BOOST_CHECK_EQUAL(subnet.ToString(), "1.2.3.0/26");
-    subnet = CSubNet("1.2.3.4/255.255.255.128");
+    subnet = ResolveSubNet("1.2.3.4/255.255.255.128");
     BOOST_CHECK_EQUAL(subnet.ToString(), "1.2.3.0/25");
-    subnet = CSubNet("1.2.3.4/255.255.255.0");
+    subnet = ResolveSubNet("1.2.3.4/255.255.255.0");
     BOOST_CHECK_EQUAL(subnet.ToString(), "1.2.3.0/24");
-    subnet = CSubNet("1.2.3.4/255.255.254.0");
+    subnet = ResolveSubNet("1.2.3.4/255.255.254.0");
     BOOST_CHECK_EQUAL(subnet.ToString(), "1.2.2.0/23");
-    subnet = CSubNet("1.2.3.4/255.255.252.0");
+    subnet = ResolveSubNet("1.2.3.4/255.255.252.0");
     BOOST_CHECK_EQUAL(subnet.ToString(), "1.2.0.0/22");
-    subnet = CSubNet("1.2.3.4/255.255.248.0");
+    subnet = ResolveSubNet("1.2.3.4/255.255.248.0");
     BOOST_CHECK_EQUAL(subnet.ToString(), "1.2.0.0/21");
-    subnet = CSubNet("1.2.3.4/255.255.240.0");
+    subnet = ResolveSubNet("1.2.3.4/255.255.240.0");
     BOOST_CHECK_EQUAL(subnet.ToString(), "1.2.0.0/20");
-    subnet = CSubNet("1.2.3.4/255.255.224.0");
+    subnet = ResolveSubNet("1.2.3.4/255.255.224.0");
     BOOST_CHECK_EQUAL(subnet.ToString(), "1.2.0.0/19");
-    subnet = CSubNet("1.2.3.4/255.255.192.0");
+    subnet = ResolveSubNet("1.2.3.4/255.255.192.0");
     BOOST_CHECK_EQUAL(subnet.ToString(), "1.2.0.0/18");
-    subnet = CSubNet("1.2.3.4/255.255.128.0");
+    subnet = ResolveSubNet("1.2.3.4/255.255.128.0");
     BOOST_CHECK_EQUAL(subnet.ToString(), "1.2.0.0/17");
-    subnet = CSubNet("1.2.3.4/255.255.0.0");
+    subnet = ResolveSubNet("1.2.3.4/255.255.0.0");
     BOOST_CHECK_EQUAL(subnet.ToString(), "1.2.0.0/16");
-    subnet = CSubNet("1.2.3.4/255.254.0.0");
+    subnet = ResolveSubNet("1.2.3.4/255.254.0.0");
     BOOST_CHECK_EQUAL(subnet.ToString(), "1.2.0.0/15");
-    subnet = CSubNet("1.2.3.4/255.252.0.0");
+    subnet = ResolveSubNet("1.2.3.4/255.252.0.0");
     BOOST_CHECK_EQUAL(subnet.ToString(), "1.0.0.0/14");
-    subnet = CSubNet("1.2.3.4/255.248.0.0");
+    subnet = ResolveSubNet("1.2.3.4/255.248.0.0");
     BOOST_CHECK_EQUAL(subnet.ToString(), "1.0.0.0/13");
-    subnet = CSubNet("1.2.3.4/255.240.0.0");
+    subnet = ResolveSubNet("1.2.3.4/255.240.0.0");
     BOOST_CHECK_EQUAL(subnet.ToString(), "1.0.0.0/12");
-    subnet = CSubNet("1.2.3.4/255.224.0.0");
+    subnet = ResolveSubNet("1.2.3.4/255.224.0.0");
     BOOST_CHECK_EQUAL(subnet.ToString(), "1.0.0.0/11");
-    subnet = CSubNet("1.2.3.4/255.192.0.0");
+    subnet = ResolveSubNet("1.2.3.4/255.192.0.0");
     BOOST_CHECK_EQUAL(subnet.ToString(), "1.0.0.0/10");
-    subnet = CSubNet("1.2.3.4/255.128.0.0");
+    subnet = ResolveSubNet("1.2.3.4/255.128.0.0");
     BOOST_CHECK_EQUAL(subnet.ToString(), "1.0.0.0/9");
-    subnet = CSubNet("1.2.3.4/255.0.0.0");
+    subnet = ResolveSubNet("1.2.3.4/255.0.0.0");
     BOOST_CHECK_EQUAL(subnet.ToString(), "1.0.0.0/8");
-    subnet = CSubNet("1.2.3.4/254.0.0.0");
+    subnet = ResolveSubNet("1.2.3.4/254.0.0.0");
     BOOST_CHECK_EQUAL(subnet.ToString(), "0.0.0.0/7");
-    subnet = CSubNet("1.2.3.4/252.0.0.0");
+    subnet = ResolveSubNet("1.2.3.4/252.0.0.0");
     BOOST_CHECK_EQUAL(subnet.ToString(), "0.0.0.0/6");
-    subnet = CSubNet("1.2.3.4/248.0.0.0");
+    subnet = ResolveSubNet("1.2.3.4/248.0.0.0");
     BOOST_CHECK_EQUAL(subnet.ToString(), "0.0.0.0/5");
-    subnet = CSubNet("1.2.3.4/240.0.0.0");
+    subnet = ResolveSubNet("1.2.3.4/240.0.0.0");
     BOOST_CHECK_EQUAL(subnet.ToString(), "0.0.0.0/4");
-    subnet = CSubNet("1.2.3.4/224.0.0.0");
+    subnet = ResolveSubNet("1.2.3.4/224.0.0.0");
     BOOST_CHECK_EQUAL(subnet.ToString(), "0.0.0.0/3");
-    subnet = CSubNet("1.2.3.4/192.0.0.0");
+    subnet = ResolveSubNet("1.2.3.4/192.0.0.0");
     BOOST_CHECK_EQUAL(subnet.ToString(), "0.0.0.0/2");
-    subnet = CSubNet("1.2.3.4/128.0.0.0");
+    subnet = ResolveSubNet("1.2.3.4/128.0.0.0");
     BOOST_CHECK_EQUAL(subnet.ToString(), "0.0.0.0/1");
-    subnet = CSubNet("1.2.3.4/0.0.0.0");
+    subnet = ResolveSubNet("1.2.3.4/0.0.0.0");
     BOOST_CHECK_EQUAL(subnet.ToString(), "0.0.0.0/0");
 
-    subnet = CSubNet("1:2:3:4:5:6:7:8/ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff");
+    subnet = ResolveSubNet("1:2:3:4:5:6:7:8/ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff");
     BOOST_CHECK_EQUAL(subnet.ToString(), "1:2:3:4:5:6:7:8/128");
-    subnet = CSubNet("1:2:3:4:5:6:7:8/ffff:0000:0000:0000:0000:0000:0000:0000");
+    subnet = ResolveSubNet("1:2:3:4:5:6:7:8/ffff:0000:0000:0000:0000:0000:0000:0000");
     BOOST_CHECK_EQUAL(subnet.ToString(), "1::/16");
-    subnet = CSubNet("1:2:3:4:5:6:7:8/0000:0000:0000:0000:0000:0000:0000:0000");
+    subnet = ResolveSubNet("1:2:3:4:5:6:7:8/0000:0000:0000:0000:0000:0000:0000:0000");
     BOOST_CHECK_EQUAL(subnet.ToString(), "::/0");
-    subnet = CSubNet("1.2.3.4/255.255.232.0");
+    subnet = ResolveSubNet("1.2.3.4/255.255.232.0");
     BOOST_CHECK_EQUAL(subnet.ToString(), "1.2.0.0/255.255.232.0");
-    subnet = CSubNet("1:2:3:4:5:6:7:8/ffff:ffff:ffff:fffe:ffff:ffff:ffff:ff0f");
+    subnet = ResolveSubNet("1:2:3:4:5:6:7:8/ffff:ffff:ffff:fffe:ffff:ffff:ffff:ff0f");
     BOOST_CHECK_EQUAL(subnet.ToString(), "1:2:3:4:5:6:7:8/ffff:ffff:ffff:fffe:ffff:ffff:ffff:ff0f");
 
 }

From 1017b8a960d8bca41adebdad9982511a479689ce Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Tue, 31 May 2016 18:18:41 -0400
Subject: [PATCH 0682/1802] net: Add direct tests for new CSubNet constructors

---
 src/test/netbase_tests.cpp | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/test/netbase_tests.cpp b/src/test/netbase_tests.cpp
index 34b1ebb7a428d..7a8584f0f4322 100644
--- a/src/test/netbase_tests.cpp
+++ b/src/test/netbase_tests.cpp
@@ -171,12 +171,26 @@ BOOST_AUTO_TEST_CASE(subnet_test)
     BOOST_CHECK(!CSubNet(ResolveIP("127.0.0.1")).Match(ResolveIP("127.0.0.2")));
     BOOST_CHECK(CSubNet(ResolveIP("127.0.0.1")).ToString() == "127.0.0.1/32");
 
+    CSubNet subnet = CSubNet(ResolveIP("1.2.3.4"), 32);
+    BOOST_CHECK_EQUAL(subnet.ToString(), "1.2.3.4/32");
+    subnet = CSubNet(ResolveIP("1.2.3.4"), 8);
+    BOOST_CHECK_EQUAL(subnet.ToString(), "1.0.0.0/8");
+    subnet = CSubNet(ResolveIP("1.2.3.4"), 0);
+    BOOST_CHECK_EQUAL(subnet.ToString(), "0.0.0.0/0");
+
+    subnet = CSubNet(ResolveIP("1.2.3.4"), ResolveIP("255.255.255.255"));
+    BOOST_CHECK_EQUAL(subnet.ToString(), "1.2.3.4/32");
+    subnet = CSubNet(ResolveIP("1.2.3.4"), ResolveIP("255.0.0.0"));
+    BOOST_CHECK_EQUAL(subnet.ToString(), "1.0.0.0/8");
+    subnet = CSubNet(ResolveIP("1.2.3.4"), ResolveIP("0.0.0.0"));
+    BOOST_CHECK_EQUAL(subnet.ToString(), "0.0.0.0/0");
+
     BOOST_CHECK(CSubNet(ResolveIP("1:2:3:4:5:6:7:8")).IsValid());
     BOOST_CHECK(CSubNet(ResolveIP("1:2:3:4:5:6:7:8")).Match(ResolveIP("1:2:3:4:5:6:7:8")));
     BOOST_CHECK(!CSubNet(ResolveIP("1:2:3:4:5:6:7:8")).Match(ResolveIP("1:2:3:4:5:6:7:9")));
     BOOST_CHECK(CSubNet(ResolveIP("1:2:3:4:5:6:7:8")).ToString() == "1:2:3:4:5:6:7:8/128");
 
-    CSubNet subnet = ResolveSubNet("1.2.3.4/255.255.255.255");
+    subnet = ResolveSubNet("1.2.3.4/255.255.255.255");
     BOOST_CHECK_EQUAL(subnet.ToString(), "1.2.3.4/32");
     subnet = ResolveSubNet("1.2.3.4/255.255.255.254");
     BOOST_CHECK_EQUAL(subnet.ToString(), "1.2.3.4/31");

From 21e5b96ff417f304e624052f629e2b030984180f Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Tue, 31 May 2016 17:25:03 -0400
Subject: [PATCH 0683/1802] net: move CNetAddr/CService/CSubNet out of netbase

---
 src/Makefile.am    |   2 +
 src/netaddress.cpp | 716 +++++++++++++++++++++++++++++++++++++++++++++
 src/netaddress.h   | 171 +++++++++++
 src/netbase.cpp    | 705 --------------------------------------------
 src/netbase.h      | 158 +---------
 5 files changed, 890 insertions(+), 862 deletions(-)
 create mode 100644 src/netaddress.cpp
 create mode 100644 src/netaddress.h

diff --git a/src/Makefile.am b/src/Makefile.am
index e3eaacdb4c983..0a35a052c24ab 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -106,6 +106,7 @@ BITCOIN_CORE_H = \
   miner.h \
   net.h \
   netbase.h \
+  netaddress.h \
   noui.h \
   policy/fees.h \
   policy/policy.h \
@@ -289,6 +290,7 @@ libbitcoin_common_a_SOURCES = \
   core_write.cpp \
   key.cpp \
   keystore.cpp \
+  netaddress.cpp \
   netbase.cpp \
   protocol.cpp \
   scheduler.cpp \
diff --git a/src/netaddress.cpp b/src/netaddress.cpp
new file mode 100644
index 0000000000000..7000ce3f0acce
--- /dev/null
+++ b/src/netaddress.cpp
@@ -0,0 +1,716 @@
+// Copyright (c) 2009-2010 Satoshi Nakamoto
+// Copyright (c) 2009-2015 The Bitcoin Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#ifdef HAVE_CONFIG_H
+#include "config/bitcoin-config.h"
+#endif
+
+#include "netaddress.h"
+#include "hash.h"
+#include "utilstrencodings.h"
+#include "tinyformat.h"
+
+static const unsigned char pchIPv4[12] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0xff, 0xff };
+static const unsigned char pchOnionCat[] = {0xFD,0x87,0xD8,0x7E,0xEB,0x43};
+
+void CNetAddr::Init()
+{
+    memset(ip, 0, sizeof(ip));
+    scopeId = 0;
+}
+
+void CNetAddr::SetIP(const CNetAddr& ipIn)
+{
+    memcpy(ip, ipIn.ip, sizeof(ip));
+}
+
+void CNetAddr::SetRaw(Network network, const uint8_t *ip_in)
+{
+    switch(network)
+    {
+        case NET_IPV4:
+            memcpy(ip, pchIPv4, 12);
+            memcpy(ip+12, ip_in, 4);
+            break;
+        case NET_IPV6:
+            memcpy(ip, ip_in, 16);
+            break;
+        default:
+            assert(!"invalid network");
+    }
+}
+
+bool CNetAddr::SetSpecial(const std::string &strName)
+{
+    if (strName.size()>6 && strName.substr(strName.size() - 6, 6) == ".onion") {
+        std::vector<unsigned char> vchAddr = DecodeBase32(strName.substr(0, strName.size() - 6).c_str());
+        if (vchAddr.size() != 16-sizeof(pchOnionCat))
+            return false;
+        memcpy(ip, pchOnionCat, sizeof(pchOnionCat));
+        for (unsigned int i=0; i<16-sizeof(pchOnionCat); i++)
+            ip[i + sizeof(pchOnionCat)] = vchAddr[i];
+        return true;
+    }
+    return false;
+}
+
+CNetAddr::CNetAddr()
+{
+    Init();
+}
+
+CNetAddr::CNetAddr(const struct in_addr& ipv4Addr)
+{
+    SetRaw(NET_IPV4, (const uint8_t*)&ipv4Addr);
+}
+
+CNetAddr::CNetAddr(const struct in6_addr& ipv6Addr, const uint32_t scope)
+{
+    SetRaw(NET_IPV6, (const uint8_t*)&ipv6Addr);
+    scopeId = scope;
+}
+
+unsigned int CNetAddr::GetByte(int n) const
+{
+    return ip[15-n];
+}
+
+bool CNetAddr::IsIPv4() const
+{
+    return (memcmp(ip, pchIPv4, sizeof(pchIPv4)) == 0);
+}
+
+bool CNetAddr::IsIPv6() const
+{
+    return (!IsIPv4() && !IsTor());
+}
+
+bool CNetAddr::IsRFC1918() const
+{
+    return IsIPv4() && (
+        GetByte(3) == 10 ||
+        (GetByte(3) == 192 && GetByte(2) == 168) ||
+        (GetByte(3) == 172 && (GetByte(2) >= 16 && GetByte(2) <= 31)));
+}
+
+bool CNetAddr::IsRFC2544() const
+{
+    return IsIPv4() && GetByte(3) == 198 && (GetByte(2) == 18 || GetByte(2) == 19);
+}
+
+bool CNetAddr::IsRFC3927() const
+{
+    return IsIPv4() && (GetByte(3) == 169 && GetByte(2) == 254);
+}
+
+bool CNetAddr::IsRFC6598() const
+{
+    return IsIPv4() && GetByte(3) == 100 && GetByte(2) >= 64 && GetByte(2) <= 127;
+}
+
+bool CNetAddr::IsRFC5737() const
+{
+    return IsIPv4() && ((GetByte(3) == 192 && GetByte(2) == 0 && GetByte(1) == 2) ||
+        (GetByte(3) == 198 && GetByte(2) == 51 && GetByte(1) == 100) ||
+        (GetByte(3) == 203 && GetByte(2) == 0 && GetByte(1) == 113));
+}
+
+bool CNetAddr::IsRFC3849() const
+{
+    return GetByte(15) == 0x20 && GetByte(14) == 0x01 && GetByte(13) == 0x0D && GetByte(12) == 0xB8;
+}
+
+bool CNetAddr::IsRFC3964() const
+{
+    return (GetByte(15) == 0x20 && GetByte(14) == 0x02);
+}
+
+bool CNetAddr::IsRFC6052() const
+{
+    static const unsigned char pchRFC6052[] = {0,0x64,0xFF,0x9B,0,0,0,0,0,0,0,0};
+    return (memcmp(ip, pchRFC6052, sizeof(pchRFC6052)) == 0);
+}
+
+bool CNetAddr::IsRFC4380() const
+{
+    return (GetByte(15) == 0x20 && GetByte(14) == 0x01 && GetByte(13) == 0 && GetByte(12) == 0);
+}
+
+bool CNetAddr::IsRFC4862() const
+{
+    static const unsigned char pchRFC4862[] = {0xFE,0x80,0,0,0,0,0,0};
+    return (memcmp(ip, pchRFC4862, sizeof(pchRFC4862)) == 0);
+}
+
+bool CNetAddr::IsRFC4193() const
+{
+    return ((GetByte(15) & 0xFE) == 0xFC);
+}
+
+bool CNetAddr::IsRFC6145() const
+{
+    static const unsigned char pchRFC6145[] = {0,0,0,0,0,0,0,0,0xFF,0xFF,0,0};
+    return (memcmp(ip, pchRFC6145, sizeof(pchRFC6145)) == 0);
+}
+
+bool CNetAddr::IsRFC4843() const
+{
+    return (GetByte(15) == 0x20 && GetByte(14) == 0x01 && GetByte(13) == 0x00 && (GetByte(12) & 0xF0) == 0x10);
+}
+
+bool CNetAddr::IsTor() const
+{
+    return (memcmp(ip, pchOnionCat, sizeof(pchOnionCat)) == 0);
+}
+
+bool CNetAddr::IsLocal() const
+{
+    // IPv4 loopback
+   if (IsIPv4() && (GetByte(3) == 127 || GetByte(3) == 0))
+       return true;
+
+   // IPv6 loopback (::1/128)
+   static const unsigned char pchLocal[16] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1};
+   if (memcmp(ip, pchLocal, 16) == 0)
+       return true;
+
+   return false;
+}
+
+bool CNetAddr::IsMulticast() const
+{
+    return    (IsIPv4() && (GetByte(3) & 0xF0) == 0xE0)
+           || (GetByte(15) == 0xFF);
+}
+
+bool CNetAddr::IsValid() const
+{
+    // Cleanup 3-byte shifted addresses caused by garbage in size field
+    // of addr messages from versions before 0.2.9 checksum.
+    // Two consecutive addr messages look like this:
+    // header20 vectorlen3 addr26 addr26 addr26 header20 vectorlen3 addr26 addr26 addr26...
+    // so if the first length field is garbled, it reads the second batch
+    // of addr misaligned by 3 bytes.
+    if (memcmp(ip, pchIPv4+3, sizeof(pchIPv4)-3) == 0)
+        return false;
+
+    // unspecified IPv6 address (::/128)
+    unsigned char ipNone[16] = {};
+    if (memcmp(ip, ipNone, 16) == 0)
+        return false;
+
+    // documentation IPv6 address
+    if (IsRFC3849())
+        return false;
+
+    if (IsIPv4())
+    {
+        // INADDR_NONE
+        uint32_t ipNone = INADDR_NONE;
+        if (memcmp(ip+12, &ipNone, 4) == 0)
+            return false;
+
+        // 0
+        ipNone = 0;
+        if (memcmp(ip+12, &ipNone, 4) == 0)
+            return false;
+    }
+
+    return true;
+}
+
+bool CNetAddr::IsRoutable() const
+{
+    return IsValid() && !(IsRFC1918() || IsRFC2544() || IsRFC3927() || IsRFC4862() || IsRFC6598() || IsRFC5737() || (IsRFC4193() && !IsTor()) || IsRFC4843() || IsLocal());
+}
+
+enum Network CNetAddr::GetNetwork() const
+{
+    if (!IsRoutable())
+        return NET_UNROUTABLE;
+
+    if (IsIPv4())
+        return NET_IPV4;
+
+    if (IsTor())
+        return NET_TOR;
+
+    return NET_IPV6;
+}
+
+std::string CNetAddr::ToStringIP() const
+{
+    if (IsTor())
+        return EncodeBase32(&ip[6], 10) + ".onion";
+    CService serv(*this, 0);
+    struct sockaddr_storage sockaddr;
+    socklen_t socklen = sizeof(sockaddr);
+    if (serv.GetSockAddr((struct sockaddr*)&sockaddr, &socklen)) {
+        char name[1025] = "";
+        if (!getnameinfo((const struct sockaddr*)&sockaddr, socklen, name, sizeof(name), NULL, 0, NI_NUMERICHOST))
+            return std::string(name);
+    }
+    if (IsIPv4())
+        return strprintf("%u.%u.%u.%u", GetByte(3), GetByte(2), GetByte(1), GetByte(0));
+    else
+        return strprintf("%x:%x:%x:%x:%x:%x:%x:%x",
+                         GetByte(15) << 8 | GetByte(14), GetByte(13) << 8 | GetByte(12),
+                         GetByte(11) << 8 | GetByte(10), GetByte(9) << 8 | GetByte(8),
+                         GetByte(7) << 8 | GetByte(6), GetByte(5) << 8 | GetByte(4),
+                         GetByte(3) << 8 | GetByte(2), GetByte(1) << 8 | GetByte(0));
+}
+
+std::string CNetAddr::ToString() const
+{
+    return ToStringIP();
+}
+
+bool operator==(const CNetAddr& a, const CNetAddr& b)
+{
+    return (memcmp(a.ip, b.ip, 16) == 0);
+}
+
+bool operator!=(const CNetAddr& a, const CNetAddr& b)
+{
+    return (memcmp(a.ip, b.ip, 16) != 0);
+}
+
+bool operator<(const CNetAddr& a, const CNetAddr& b)
+{
+    return (memcmp(a.ip, b.ip, 16) < 0);
+}
+
+bool CNetAddr::GetInAddr(struct in_addr* pipv4Addr) const
+{
+    if (!IsIPv4())
+        return false;
+    memcpy(pipv4Addr, ip+12, 4);
+    return true;
+}
+
+bool CNetAddr::GetIn6Addr(struct in6_addr* pipv6Addr) const
+{
+    memcpy(pipv6Addr, ip, 16);
+    return true;
+}
+
+// get canonical identifier of an address' group
+// no two connections will be attempted to addresses with the same group
+std::vector<unsigned char> CNetAddr::GetGroup() const
+{
+    std::vector<unsigned char> vchRet;
+    int nClass = NET_IPV6;
+    int nStartByte = 0;
+    int nBits = 16;
+
+    // all local addresses belong to the same group
+    if (IsLocal())
+    {
+        nClass = 255;
+        nBits = 0;
+    }
+
+    // all unroutable addresses belong to the same group
+    if (!IsRoutable())
+    {
+        nClass = NET_UNROUTABLE;
+        nBits = 0;
+    }
+    // for IPv4 addresses, '1' + the 16 higher-order bits of the IP
+    // includes mapped IPv4, SIIT translated IPv4, and the well-known prefix
+    else if (IsIPv4() || IsRFC6145() || IsRFC6052())
+    {
+        nClass = NET_IPV4;
+        nStartByte = 12;
+    }
+    // for 6to4 tunnelled addresses, use the encapsulated IPv4 address
+    else if (IsRFC3964())
+    {
+        nClass = NET_IPV4;
+        nStartByte = 2;
+    }
+    // for Teredo-tunnelled IPv6 addresses, use the encapsulated IPv4 address
+    else if (IsRFC4380())
+    {
+        vchRet.push_back(NET_IPV4);
+        vchRet.push_back(GetByte(3) ^ 0xFF);
+        vchRet.push_back(GetByte(2) ^ 0xFF);
+        return vchRet;
+    }
+    else if (IsTor())
+    {
+        nClass = NET_TOR;
+        nStartByte = 6;
+        nBits = 4;
+    }
+    // for he.net, use /36 groups
+    else if (GetByte(15) == 0x20 && GetByte(14) == 0x01 && GetByte(13) == 0x04 && GetByte(12) == 0x70)
+        nBits = 36;
+    // for the rest of the IPv6 network, use /32 groups
+    else
+        nBits = 32;
+
+    vchRet.push_back(nClass);
+    while (nBits >= 8)
+    {
+        vchRet.push_back(GetByte(15 - nStartByte));
+        nStartByte++;
+        nBits -= 8;
+    }
+    if (nBits > 0)
+        vchRet.push_back(GetByte(15 - nStartByte) | ((1 << (8 - nBits)) - 1));
+
+    return vchRet;
+}
+
+uint64_t CNetAddr::GetHash() const
+{
+    uint256 hash = Hash(&ip[0], &ip[16]);
+    uint64_t nRet;
+    memcpy(&nRet, &hash, sizeof(nRet));
+    return nRet;
+}
+
+// private extensions to enum Network, only returned by GetExtNetwork,
+// and only used in GetReachabilityFrom
+static const int NET_UNKNOWN = NET_MAX + 0;
+static const int NET_TEREDO  = NET_MAX + 1;
+int static GetExtNetwork(const CNetAddr *addr)
+{
+    if (addr == NULL)
+        return NET_UNKNOWN;
+    if (addr->IsRFC4380())
+        return NET_TEREDO;
+    return addr->GetNetwork();
+}
+
+/** Calculates a metric for how reachable (*this) is from a given partner */
+int CNetAddr::GetReachabilityFrom(const CNetAddr *paddrPartner) const
+{
+    enum Reachability {
+        REACH_UNREACHABLE,
+        REACH_DEFAULT,
+        REACH_TEREDO,
+        REACH_IPV6_WEAK,
+        REACH_IPV4,
+        REACH_IPV6_STRONG,
+        REACH_PRIVATE
+    };
+
+    if (!IsRoutable())
+        return REACH_UNREACHABLE;
+
+    int ourNet = GetExtNetwork(this);
+    int theirNet = GetExtNetwork(paddrPartner);
+    bool fTunnel = IsRFC3964() || IsRFC6052() || IsRFC6145();
+
+    switch(theirNet) {
+    case NET_IPV4:
+        switch(ourNet) {
+        default:       return REACH_DEFAULT;
+        case NET_IPV4: return REACH_IPV4;
+        }
+    case NET_IPV6:
+        switch(ourNet) {
+        default:         return REACH_DEFAULT;
+        case NET_TEREDO: return REACH_TEREDO;
+        case NET_IPV4:   return REACH_IPV4;
+        case NET_IPV6:   return fTunnel ? REACH_IPV6_WEAK : REACH_IPV6_STRONG; // only prefer giving our IPv6 address if it's not tunnelled
+        }
+    case NET_TOR:
+        switch(ourNet) {
+        default:         return REACH_DEFAULT;
+        case NET_IPV4:   return REACH_IPV4; // Tor users can connect to IPv4 as well
+        case NET_TOR:    return REACH_PRIVATE;
+        }
+    case NET_TEREDO:
+        switch(ourNet) {
+        default:          return REACH_DEFAULT;
+        case NET_TEREDO:  return REACH_TEREDO;
+        case NET_IPV6:    return REACH_IPV6_WEAK;
+        case NET_IPV4:    return REACH_IPV4;
+        }
+    case NET_UNKNOWN:
+    case NET_UNROUTABLE:
+    default:
+        switch(ourNet) {
+        default:          return REACH_DEFAULT;
+        case NET_TEREDO:  return REACH_TEREDO;
+        case NET_IPV6:    return REACH_IPV6_WEAK;
+        case NET_IPV4:    return REACH_IPV4;
+        case NET_TOR:     return REACH_PRIVATE; // either from Tor, or don't care about our address
+        }
+    }
+}
+
+void CService::Init()
+{
+    port = 0;
+}
+
+CService::CService()
+{
+    Init();
+}
+
+CService::CService(const CNetAddr& cip, unsigned short portIn) : CNetAddr(cip), port(portIn)
+{
+}
+
+CService::CService(const struct in_addr& ipv4Addr, unsigned short portIn) : CNetAddr(ipv4Addr), port(portIn)
+{
+}
+
+CService::CService(const struct in6_addr& ipv6Addr, unsigned short portIn) : CNetAddr(ipv6Addr), port(portIn)
+{
+}
+
+CService::CService(const struct sockaddr_in& addr) : CNetAddr(addr.sin_addr), port(ntohs(addr.sin_port))
+{
+    assert(addr.sin_family == AF_INET);
+}
+
+CService::CService(const struct sockaddr_in6 &addr) : CNetAddr(addr.sin6_addr, addr.sin6_scope_id), port(ntohs(addr.sin6_port))
+{
+   assert(addr.sin6_family == AF_INET6);
+}
+
+bool CService::SetSockAddr(const struct sockaddr *paddr)
+{
+    switch (paddr->sa_family) {
+    case AF_INET:
+        *this = CService(*(const struct sockaddr_in*)paddr);
+        return true;
+    case AF_INET6:
+        *this = CService(*(const struct sockaddr_in6*)paddr);
+        return true;
+    default:
+        return false;
+    }
+}
+
+unsigned short CService::GetPort() const
+{
+    return port;
+}
+
+bool operator==(const CService& a, const CService& b)
+{
+    return (CNetAddr)a == (CNetAddr)b && a.port == b.port;
+}
+
+bool operator!=(const CService& a, const CService& b)
+{
+    return (CNetAddr)a != (CNetAddr)b || a.port != b.port;
+}
+
+bool operator<(const CService& a, const CService& b)
+{
+    return (CNetAddr)a < (CNetAddr)b || ((CNetAddr)a == (CNetAddr)b && a.port < b.port);
+}
+
+bool CService::GetSockAddr(struct sockaddr* paddr, socklen_t *addrlen) const
+{
+    if (IsIPv4()) {
+        if (*addrlen < (socklen_t)sizeof(struct sockaddr_in))
+            return false;
+        *addrlen = sizeof(struct sockaddr_in);
+        struct sockaddr_in *paddrin = (struct sockaddr_in*)paddr;
+        memset(paddrin, 0, *addrlen);
+        if (!GetInAddr(&paddrin->sin_addr))
+            return false;
+        paddrin->sin_family = AF_INET;
+        paddrin->sin_port = htons(port);
+        return true;
+    }
+    if (IsIPv6()) {
+        if (*addrlen < (socklen_t)sizeof(struct sockaddr_in6))
+            return false;
+        *addrlen = sizeof(struct sockaddr_in6);
+        struct sockaddr_in6 *paddrin6 = (struct sockaddr_in6*)paddr;
+        memset(paddrin6, 0, *addrlen);
+        if (!GetIn6Addr(&paddrin6->sin6_addr))
+            return false;
+        paddrin6->sin6_scope_id = scopeId;
+        paddrin6->sin6_family = AF_INET6;
+        paddrin6->sin6_port = htons(port);
+        return true;
+    }
+    return false;
+}
+
+std::vector<unsigned char> CService::GetKey() const
+{
+     std::vector<unsigned char> vKey;
+     vKey.resize(18);
+     memcpy(&vKey[0], ip, 16);
+     vKey[16] = port / 0x100;
+     vKey[17] = port & 0x0FF;
+     return vKey;
+}
+
+std::string CService::ToStringPort() const
+{
+    return strprintf("%u", port);
+}
+
+std::string CService::ToStringIPPort() const
+{
+    if (IsIPv4() || IsTor()) {
+        return ToStringIP() + ":" + ToStringPort();
+    } else {
+        return "[" + ToStringIP() + "]:" + ToStringPort();
+    }
+}
+
+std::string CService::ToString() const
+{
+    return ToStringIPPort();
+}
+
+void CService::SetPort(unsigned short portIn)
+{
+    port = portIn;
+}
+
+CSubNet::CSubNet():
+    valid(false)
+{
+    memset(netmask, 0, sizeof(netmask));
+}
+
+CSubNet::CSubNet(const CNetAddr &addr, int32_t mask)
+{
+    valid = true;
+    network = addr;
+    // Default to /32 (IPv4) or /128 (IPv6), i.e. match single address
+    memset(netmask, 255, sizeof(netmask));
+
+    // IPv4 addresses start at offset 12, and first 12 bytes must match, so just offset n
+    const int astartofs = network.IsIPv4() ? 12 : 0;
+
+    int32_t n = mask;
+    if(n >= 0 && n <= (128 - astartofs*8)) // Only valid if in range of bits of address
+    {
+        n += astartofs*8;
+        // Clear bits [n..127]
+        for (; n < 128; ++n)
+            netmask[n>>3] &= ~(1<<(7-(n&7)));
+    } else
+        valid = false;
+
+    // Normalize network according to netmask
+    for(int x=0; x<16; ++x)
+        network.ip[x] &= netmask[x];
+}
+
+CSubNet::CSubNet(const CNetAddr &addr, const CNetAddr &mask)
+{
+    valid = true;
+    network = addr;
+    // Default to /32 (IPv4) or /128 (IPv6), i.e. match single address
+    memset(netmask, 255, sizeof(netmask));
+
+    // IPv4 addresses start at offset 12, and first 12 bytes must match, so just offset n
+    const int astartofs = network.IsIPv4() ? 12 : 0;
+
+    for(int x=astartofs; x<16; ++x)
+        netmask[x] = mask.ip[x];
+
+    // Normalize network according to netmask
+    for(int x=0; x<16; ++x)
+        network.ip[x] &= netmask[x];
+}
+
+CSubNet::CSubNet(const CNetAddr &addr):
+    valid(addr.IsValid())
+{
+    memset(netmask, 255, sizeof(netmask));
+    network = addr;
+}
+
+bool CSubNet::Match(const CNetAddr &addr) const
+{
+    if (!valid || !addr.IsValid())
+        return false;
+    for(int x=0; x<16; ++x)
+        if ((addr.ip[x] & netmask[x]) != network.ip[x])
+            return false;
+    return true;
+}
+
+static inline int NetmaskBits(uint8_t x)
+{
+    switch(x) {
+    case 0x00: return 0; break;
+    case 0x80: return 1; break;
+    case 0xc0: return 2; break;
+    case 0xe0: return 3; break;
+    case 0xf0: return 4; break;
+    case 0xf8: return 5; break;
+    case 0xfc: return 6; break;
+    case 0xfe: return 7; break;
+    case 0xff: return 8; break;
+    default: return -1; break;
+    }
+}
+
+std::string CSubNet::ToString() const
+{
+    /* Parse binary 1{n}0{N-n} to see if mask can be represented as /n */
+    int cidr = 0;
+    bool valid_cidr = true;
+    int n = network.IsIPv4() ? 12 : 0;
+    for (; n < 16 && netmask[n] == 0xff; ++n)
+        cidr += 8;
+    if (n < 16) {
+        int bits = NetmaskBits(netmask[n]);
+        if (bits < 0)
+            valid_cidr = false;
+        else
+            cidr += bits;
+        ++n;
+    }
+    for (; n < 16 && valid_cidr; ++n)
+        if (netmask[n] != 0x00)
+            valid_cidr = false;
+
+    /* Format output */
+    std::string strNetmask;
+    if (valid_cidr) {
+        strNetmask = strprintf("%u", cidr);
+    } else {
+        if (network.IsIPv4())
+            strNetmask = strprintf("%u.%u.%u.%u", netmask[12], netmask[13], netmask[14], netmask[15]);
+        else
+            strNetmask = strprintf("%x:%x:%x:%x:%x:%x:%x:%x",
+                             netmask[0] << 8 | netmask[1], netmask[2] << 8 | netmask[3],
+                             netmask[4] << 8 | netmask[5], netmask[6] << 8 | netmask[7],
+                             netmask[8] << 8 | netmask[9], netmask[10] << 8 | netmask[11],
+                             netmask[12] << 8 | netmask[13], netmask[14] << 8 | netmask[15]);
+    }
+
+    return network.ToString() + "/" + strNetmask;
+}
+
+bool CSubNet::IsValid() const
+{
+    return valid;
+}
+
+bool operator==(const CSubNet& a, const CSubNet& b)
+{
+    return a.valid == b.valid && a.network == b.network && !memcmp(a.netmask, b.netmask, 16);
+}
+
+bool operator!=(const CSubNet& a, const CSubNet& b)
+{
+    return !(a==b);
+}
+
+bool operator<(const CSubNet& a, const CSubNet& b)
+{
+    return (a.network < b.network || (a.network == b.network && memcmp(a.netmask, b.netmask, 16) < 0));
+}
diff --git a/src/netaddress.h b/src/netaddress.h
new file mode 100644
index 0000000000000..9330fe3328582
--- /dev/null
+++ b/src/netaddress.h
@@ -0,0 +1,171 @@
+// Copyright (c) 2009-2015 The Bitcoin Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#ifndef BITCOIN_NETADDRESS_H
+#define BITCOIN_NETADDRESS_H
+
+#if defined(HAVE_CONFIG_H)
+#include "config/bitcoin-config.h"
+#endif
+
+#include "compat.h"
+#include "serialize.h"
+
+#include <stdint.h>
+#include <string>
+#include <vector>
+
+enum Network
+{
+    NET_UNROUTABLE = 0,
+    NET_IPV4,
+    NET_IPV6,
+    NET_TOR,
+
+    NET_MAX,
+};
+
+/** IP address (IPv6, or IPv4 using mapped IPv6 range (::FFFF:0:0/96)) */
+class CNetAddr
+{
+    protected:
+        unsigned char ip[16]; // in network byte order
+        uint32_t scopeId; // for scoped/link-local ipv6 addresses
+
+    public:
+        CNetAddr();
+        CNetAddr(const struct in_addr& ipv4Addr);
+        void Init();
+        void SetIP(const CNetAddr& ip);
+
+        /**
+         * Set raw IPv4 or IPv6 address (in network byte order)
+         * @note Only NET_IPV4 and NET_IPV6 are allowed for network.
+         */
+        void SetRaw(Network network, const uint8_t *data);
+
+        bool SetSpecial(const std::string &strName); // for Tor addresses
+        bool IsIPv4() const;    // IPv4 mapped address (::FFFF:0:0/96, 0.0.0.0/0)
+        bool IsIPv6() const;    // IPv6 address (not mapped IPv4, not Tor)
+        bool IsRFC1918() const; // IPv4 private networks (10.0.0.0/8, 192.168.0.0/16, 172.16.0.0/12)
+        bool IsRFC2544() const; // IPv4 inter-network communcations (192.18.0.0/15)
+        bool IsRFC6598() const; // IPv4 ISP-level NAT (100.64.0.0/10)
+        bool IsRFC5737() const; // IPv4 documentation addresses (192.0.2.0/24, 198.51.100.0/24, 203.0.113.0/24)
+        bool IsRFC3849() const; // IPv6 documentation address (2001:0DB8::/32)
+        bool IsRFC3927() const; // IPv4 autoconfig (169.254.0.0/16)
+        bool IsRFC3964() const; // IPv6 6to4 tunnelling (2002::/16)
+        bool IsRFC4193() const; // IPv6 unique local (FC00::/7)
+        bool IsRFC4380() const; // IPv6 Teredo tunnelling (2001::/32)
+        bool IsRFC4843() const; // IPv6 ORCHID (2001:10::/28)
+        bool IsRFC4862() const; // IPv6 autoconfig (FE80::/64)
+        bool IsRFC6052() const; // IPv6 well-known prefix (64:FF9B::/96)
+        bool IsRFC6145() const; // IPv6 IPv4-translated address (::FFFF:0:0:0/96)
+        bool IsTor() const;
+        bool IsLocal() const;
+        bool IsRoutable() const;
+        bool IsValid() const;
+        bool IsMulticast() const;
+        enum Network GetNetwork() const;
+        std::string ToString() const;
+        std::string ToStringIP() const;
+        unsigned int GetByte(int n) const;
+        uint64_t GetHash() const;
+        bool GetInAddr(struct in_addr* pipv4Addr) const;
+        std::vector<unsigned char> GetGroup() const;
+        int GetReachabilityFrom(const CNetAddr *paddrPartner = NULL) const;
+
+        CNetAddr(const struct in6_addr& pipv6Addr, const uint32_t scope = 0);
+        bool GetIn6Addr(struct in6_addr* pipv6Addr) const;
+
+        friend bool operator==(const CNetAddr& a, const CNetAddr& b);
+        friend bool operator!=(const CNetAddr& a, const CNetAddr& b);
+        friend bool operator<(const CNetAddr& a, const CNetAddr& b);
+
+        ADD_SERIALIZE_METHODS;
+
+        template <typename Stream, typename Operation>
+        inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) {
+            READWRITE(FLATDATA(ip));
+        }
+
+        friend class CSubNet;
+};
+
+class CSubNet
+{
+    protected:
+        /// Network (base) address
+        CNetAddr network;
+        /// Netmask, in network byte order
+        uint8_t netmask[16];
+        /// Is this value valid? (only used to signal parse errors)
+        bool valid;
+
+    public:
+        CSubNet();
+        CSubNet(const CNetAddr &addr, int32_t mask);
+        CSubNet(const CNetAddr &addr, const CNetAddr &mask);
+
+        //constructor for single ip subnet (<ipv4>/32 or <ipv6>/128)
+        explicit CSubNet(const CNetAddr &addr);
+
+        bool Match(const CNetAddr &addr) const;
+
+        std::string ToString() const;
+        bool IsValid() const;
+
+        friend bool operator==(const CSubNet& a, const CSubNet& b);
+        friend bool operator!=(const CSubNet& a, const CSubNet& b);
+        friend bool operator<(const CSubNet& a, const CSubNet& b);
+
+        ADD_SERIALIZE_METHODS;
+
+        template <typename Stream, typename Operation>
+        inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) {
+            READWRITE(network);
+            READWRITE(FLATDATA(netmask));
+            READWRITE(FLATDATA(valid));
+        }
+};
+
+/** A combination of a network address (CNetAddr) and a (TCP) port */
+class CService : public CNetAddr
+{
+    protected:
+        unsigned short port; // host order
+
+    public:
+        CService();
+        CService(const CNetAddr& ip, unsigned short port);
+        CService(const struct in_addr& ipv4Addr, unsigned short port);
+        CService(const struct sockaddr_in& addr);
+        void Init();
+        void SetPort(unsigned short portIn);
+        unsigned short GetPort() const;
+        bool GetSockAddr(struct sockaddr* paddr, socklen_t *addrlen) const;
+        bool SetSockAddr(const struct sockaddr* paddr);
+        friend bool operator==(const CService& a, const CService& b);
+        friend bool operator!=(const CService& a, const CService& b);
+        friend bool operator<(const CService& a, const CService& b);
+        std::vector<unsigned char> GetKey() const;
+        std::string ToString() const;
+        std::string ToStringPort() const;
+        std::string ToStringIPPort() const;
+
+        CService(const struct in6_addr& ipv6Addr, unsigned short port);
+        CService(const struct sockaddr_in6& addr);
+
+        ADD_SERIALIZE_METHODS;
+
+        template <typename Stream, typename Operation>
+        inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) {
+            READWRITE(FLATDATA(ip));
+            unsigned short portN = htons(port);
+            READWRITE(FLATDATA(portN));
+            if (ser_action.ForRead())
+                 port = ntohs(portN);
+        }
+};
+
+#endif // BITCOIN_NETADDRESS_H
diff --git a/src/netbase.cpp b/src/netbase.cpp
index 52badcd98f5f8..c2294a078da51 100644
--- a/src/netbase.cpp
+++ b/src/netbase.cpp
@@ -42,8 +42,6 @@ static CCriticalSection cs_proxyInfos;
 int nConnectTimeout = DEFAULT_CONNECT_TIMEOUT;
 bool fNameLookup = DEFAULT_NAME_LOOKUP;
 
-static const unsigned char pchIPv4[12] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0xff, 0xff };
-
 // Need ample time for negotiation for very slow proxies such as Tor (milliseconds)
 static const int SOCKS5_RECV_TIMEOUT = 20 * 1000;
 
@@ -646,618 +644,6 @@ bool ConnectSocketByName(CService &addr, SOCKET& hSocketRet, const char *pszDest
     return ConnectThroughProxy(nameProxy, strDest, port, hSocketRet, nTimeout, outProxyConnectionFailed);
 }
 
-void CNetAddr::Init()
-{
-    memset(ip, 0, sizeof(ip));
-    scopeId = 0;
-}
-
-void CNetAddr::SetIP(const CNetAddr& ipIn)
-{
-    memcpy(ip, ipIn.ip, sizeof(ip));
-}
-
-void CNetAddr::SetRaw(Network network, const uint8_t *ip_in)
-{
-    switch(network)
-    {
-        case NET_IPV4:
-            memcpy(ip, pchIPv4, 12);
-            memcpy(ip+12, ip_in, 4);
-            break;
-        case NET_IPV6:
-            memcpy(ip, ip_in, 16);
-            break;
-        default:
-            assert(!"invalid network");
-    }
-}
-
-static const unsigned char pchOnionCat[] = {0xFD,0x87,0xD8,0x7E,0xEB,0x43};
-
-bool CNetAddr::SetSpecial(const std::string &strName)
-{
-    if (strName.size()>6 && strName.substr(strName.size() - 6, 6) == ".onion") {
-        std::vector<unsigned char> vchAddr = DecodeBase32(strName.substr(0, strName.size() - 6).c_str());
-        if (vchAddr.size() != 16-sizeof(pchOnionCat))
-            return false;
-        memcpy(ip, pchOnionCat, sizeof(pchOnionCat));
-        for (unsigned int i=0; i<16-sizeof(pchOnionCat); i++)
-            ip[i + sizeof(pchOnionCat)] = vchAddr[i];
-        return true;
-    }
-    return false;
-}
-
-CNetAddr::CNetAddr()
-{
-    Init();
-}
-
-CNetAddr::CNetAddr(const struct in_addr& ipv4Addr)
-{
-    SetRaw(NET_IPV4, (const uint8_t*)&ipv4Addr);
-}
-
-CNetAddr::CNetAddr(const struct in6_addr& ipv6Addr, const uint32_t scope)
-{
-    SetRaw(NET_IPV6, (const uint8_t*)&ipv6Addr);
-    scopeId = scope;
-}
-
-unsigned int CNetAddr::GetByte(int n) const
-{
-    return ip[15-n];
-}
-
-bool CNetAddr::IsIPv4() const
-{
-    return (memcmp(ip, pchIPv4, sizeof(pchIPv4)) == 0);
-}
-
-bool CNetAddr::IsIPv6() const
-{
-    return (!IsIPv4() && !IsTor());
-}
-
-bool CNetAddr::IsRFC1918() const
-{
-    return IsIPv4() && (
-        GetByte(3) == 10 ||
-        (GetByte(3) == 192 && GetByte(2) == 168) ||
-        (GetByte(3) == 172 && (GetByte(2) >= 16 && GetByte(2) <= 31)));
-}
-
-bool CNetAddr::IsRFC2544() const
-{
-    return IsIPv4() && GetByte(3) == 198 && (GetByte(2) == 18 || GetByte(2) == 19);
-}
-
-bool CNetAddr::IsRFC3927() const
-{
-    return IsIPv4() && (GetByte(3) == 169 && GetByte(2) == 254);
-}
-
-bool CNetAddr::IsRFC6598() const
-{
-    return IsIPv4() && GetByte(3) == 100 && GetByte(2) >= 64 && GetByte(2) <= 127;
-}
-
-bool CNetAddr::IsRFC5737() const
-{
-    return IsIPv4() && ((GetByte(3) == 192 && GetByte(2) == 0 && GetByte(1) == 2) ||
-        (GetByte(3) == 198 && GetByte(2) == 51 && GetByte(1) == 100) ||
-        (GetByte(3) == 203 && GetByte(2) == 0 && GetByte(1) == 113));
-}
-
-bool CNetAddr::IsRFC3849() const
-{
-    return GetByte(15) == 0x20 && GetByte(14) == 0x01 && GetByte(13) == 0x0D && GetByte(12) == 0xB8;
-}
-
-bool CNetAddr::IsRFC3964() const
-{
-    return (GetByte(15) == 0x20 && GetByte(14) == 0x02);
-}
-
-bool CNetAddr::IsRFC6052() const
-{
-    static const unsigned char pchRFC6052[] = {0,0x64,0xFF,0x9B,0,0,0,0,0,0,0,0};
-    return (memcmp(ip, pchRFC6052, sizeof(pchRFC6052)) == 0);
-}
-
-bool CNetAddr::IsRFC4380() const
-{
-    return (GetByte(15) == 0x20 && GetByte(14) == 0x01 && GetByte(13) == 0 && GetByte(12) == 0);
-}
-
-bool CNetAddr::IsRFC4862() const
-{
-    static const unsigned char pchRFC4862[] = {0xFE,0x80,0,0,0,0,0,0};
-    return (memcmp(ip, pchRFC4862, sizeof(pchRFC4862)) == 0);
-}
-
-bool CNetAddr::IsRFC4193() const
-{
-    return ((GetByte(15) & 0xFE) == 0xFC);
-}
-
-bool CNetAddr::IsRFC6145() const
-{
-    static const unsigned char pchRFC6145[] = {0,0,0,0,0,0,0,0,0xFF,0xFF,0,0};
-    return (memcmp(ip, pchRFC6145, sizeof(pchRFC6145)) == 0);
-}
-
-bool CNetAddr::IsRFC4843() const
-{
-    return (GetByte(15) == 0x20 && GetByte(14) == 0x01 && GetByte(13) == 0x00 && (GetByte(12) & 0xF0) == 0x10);
-}
-
-bool CNetAddr::IsTor() const
-{
-    return (memcmp(ip, pchOnionCat, sizeof(pchOnionCat)) == 0);
-}
-
-bool CNetAddr::IsLocal() const
-{
-    // IPv4 loopback
-   if (IsIPv4() && (GetByte(3) == 127 || GetByte(3) == 0))
-       return true;
-
-   // IPv6 loopback (::1/128)
-   static const unsigned char pchLocal[16] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1};
-   if (memcmp(ip, pchLocal, 16) == 0)
-       return true;
-
-   return false;
-}
-
-bool CNetAddr::IsMulticast() const
-{
-    return    (IsIPv4() && (GetByte(3) & 0xF0) == 0xE0)
-           || (GetByte(15) == 0xFF);
-}
-
-bool CNetAddr::IsValid() const
-{
-    // Cleanup 3-byte shifted addresses caused by garbage in size field
-    // of addr messages from versions before 0.2.9 checksum.
-    // Two consecutive addr messages look like this:
-    // header20 vectorlen3 addr26 addr26 addr26 header20 vectorlen3 addr26 addr26 addr26...
-    // so if the first length field is garbled, it reads the second batch
-    // of addr misaligned by 3 bytes.
-    if (memcmp(ip, pchIPv4+3, sizeof(pchIPv4)-3) == 0)
-        return false;
-
-    // unspecified IPv6 address (::/128)
-    unsigned char ipNone[16] = {};
-    if (memcmp(ip, ipNone, 16) == 0)
-        return false;
-
-    // documentation IPv6 address
-    if (IsRFC3849())
-        return false;
-
-    if (IsIPv4())
-    {
-        // INADDR_NONE
-        uint32_t ipNone = INADDR_NONE;
-        if (memcmp(ip+12, &ipNone, 4) == 0)
-            return false;
-
-        // 0
-        ipNone = 0;
-        if (memcmp(ip+12, &ipNone, 4) == 0)
-            return false;
-    }
-
-    return true;
-}
-
-bool CNetAddr::IsRoutable() const
-{
-    return IsValid() && !(IsRFC1918() || IsRFC2544() || IsRFC3927() || IsRFC4862() || IsRFC6598() || IsRFC5737() || (IsRFC4193() && !IsTor()) || IsRFC4843() || IsLocal());
-}
-
-enum Network CNetAddr::GetNetwork() const
-{
-    if (!IsRoutable())
-        return NET_UNROUTABLE;
-
-    if (IsIPv4())
-        return NET_IPV4;
-
-    if (IsTor())
-        return NET_TOR;
-
-    return NET_IPV6;
-}
-
-std::string CNetAddr::ToStringIP() const
-{
-    if (IsTor())
-        return EncodeBase32(&ip[6], 10) + ".onion";
-    CService serv(*this, 0);
-    struct sockaddr_storage sockaddr;
-    socklen_t socklen = sizeof(sockaddr);
-    if (serv.GetSockAddr((struct sockaddr*)&sockaddr, &socklen)) {
-        char name[1025] = "";
-        if (!getnameinfo((const struct sockaddr*)&sockaddr, socklen, name, sizeof(name), NULL, 0, NI_NUMERICHOST))
-            return std::string(name);
-    }
-    if (IsIPv4())
-        return strprintf("%u.%u.%u.%u", GetByte(3), GetByte(2), GetByte(1), GetByte(0));
-    else
-        return strprintf("%x:%x:%x:%x:%x:%x:%x:%x",
-                         GetByte(15) << 8 | GetByte(14), GetByte(13) << 8 | GetByte(12),
-                         GetByte(11) << 8 | GetByte(10), GetByte(9) << 8 | GetByte(8),
-                         GetByte(7) << 8 | GetByte(6), GetByte(5) << 8 | GetByte(4),
-                         GetByte(3) << 8 | GetByte(2), GetByte(1) << 8 | GetByte(0));
-}
-
-std::string CNetAddr::ToString() const
-{
-    return ToStringIP();
-}
-
-bool operator==(const CNetAddr& a, const CNetAddr& b)
-{
-    return (memcmp(a.ip, b.ip, 16) == 0);
-}
-
-bool operator!=(const CNetAddr& a, const CNetAddr& b)
-{
-    return (memcmp(a.ip, b.ip, 16) != 0);
-}
-
-bool operator<(const CNetAddr& a, const CNetAddr& b)
-{
-    return (memcmp(a.ip, b.ip, 16) < 0);
-}
-
-bool CNetAddr::GetInAddr(struct in_addr* pipv4Addr) const
-{
-    if (!IsIPv4())
-        return false;
-    memcpy(pipv4Addr, ip+12, 4);
-    return true;
-}
-
-bool CNetAddr::GetIn6Addr(struct in6_addr* pipv6Addr) const
-{
-    memcpy(pipv6Addr, ip, 16);
-    return true;
-}
-
-// get canonical identifier of an address' group
-// no two connections will be attempted to addresses with the same group
-std::vector<unsigned char> CNetAddr::GetGroup() const
-{
-    std::vector<unsigned char> vchRet;
-    int nClass = NET_IPV6;
-    int nStartByte = 0;
-    int nBits = 16;
-
-    // all local addresses belong to the same group
-    if (IsLocal())
-    {
-        nClass = 255;
-        nBits = 0;
-    }
-
-    // all unroutable addresses belong to the same group
-    if (!IsRoutable())
-    {
-        nClass = NET_UNROUTABLE;
-        nBits = 0;
-    }
-    // for IPv4 addresses, '1' + the 16 higher-order bits of the IP
-    // includes mapped IPv4, SIIT translated IPv4, and the well-known prefix
-    else if (IsIPv4() || IsRFC6145() || IsRFC6052())
-    {
-        nClass = NET_IPV4;
-        nStartByte = 12;
-    }
-    // for 6to4 tunnelled addresses, use the encapsulated IPv4 address
-    else if (IsRFC3964())
-    {
-        nClass = NET_IPV4;
-        nStartByte = 2;
-    }
-    // for Teredo-tunnelled IPv6 addresses, use the encapsulated IPv4 address
-    else if (IsRFC4380())
-    {
-        vchRet.push_back(NET_IPV4);
-        vchRet.push_back(GetByte(3) ^ 0xFF);
-        vchRet.push_back(GetByte(2) ^ 0xFF);
-        return vchRet;
-    }
-    else if (IsTor())
-    {
-        nClass = NET_TOR;
-        nStartByte = 6;
-        nBits = 4;
-    }
-    // for he.net, use /36 groups
-    else if (GetByte(15) == 0x20 && GetByte(14) == 0x01 && GetByte(13) == 0x04 && GetByte(12) == 0x70)
-        nBits = 36;
-    // for the rest of the IPv6 network, use /32 groups
-    else
-        nBits = 32;
-
-    vchRet.push_back(nClass);
-    while (nBits >= 8)
-    {
-        vchRet.push_back(GetByte(15 - nStartByte));
-        nStartByte++;
-        nBits -= 8;
-    }
-    if (nBits > 0)
-        vchRet.push_back(GetByte(15 - nStartByte) | ((1 << (8 - nBits)) - 1));
-
-    return vchRet;
-}
-
-uint64_t CNetAddr::GetHash() const
-{
-    uint256 hash = Hash(&ip[0], &ip[16]);
-    uint64_t nRet;
-    memcpy(&nRet, &hash, sizeof(nRet));
-    return nRet;
-}
-
-// private extensions to enum Network, only returned by GetExtNetwork,
-// and only used in GetReachabilityFrom
-static const int NET_UNKNOWN = NET_MAX + 0;
-static const int NET_TEREDO  = NET_MAX + 1;
-int static GetExtNetwork(const CNetAddr *addr)
-{
-    if (addr == NULL)
-        return NET_UNKNOWN;
-    if (addr->IsRFC4380())
-        return NET_TEREDO;
-    return addr->GetNetwork();
-}
-
-/** Calculates a metric for how reachable (*this) is from a given partner */
-int CNetAddr::GetReachabilityFrom(const CNetAddr *paddrPartner) const
-{
-    enum Reachability {
-        REACH_UNREACHABLE,
-        REACH_DEFAULT,
-        REACH_TEREDO,
-        REACH_IPV6_WEAK,
-        REACH_IPV4,
-        REACH_IPV6_STRONG,
-        REACH_PRIVATE
-    };
-
-    if (!IsRoutable())
-        return REACH_UNREACHABLE;
-
-    int ourNet = GetExtNetwork(this);
-    int theirNet = GetExtNetwork(paddrPartner);
-    bool fTunnel = IsRFC3964() || IsRFC6052() || IsRFC6145();
-
-    switch(theirNet) {
-    case NET_IPV4:
-        switch(ourNet) {
-        default:       return REACH_DEFAULT;
-        case NET_IPV4: return REACH_IPV4;
-        }
-    case NET_IPV6:
-        switch(ourNet) {
-        default:         return REACH_DEFAULT;
-        case NET_TEREDO: return REACH_TEREDO;
-        case NET_IPV4:   return REACH_IPV4;
-        case NET_IPV6:   return fTunnel ? REACH_IPV6_WEAK : REACH_IPV6_STRONG; // only prefer giving our IPv6 address if it's not tunnelled
-        }
-    case NET_TOR:
-        switch(ourNet) {
-        default:         return REACH_DEFAULT;
-        case NET_IPV4:   return REACH_IPV4; // Tor users can connect to IPv4 as well
-        case NET_TOR:    return REACH_PRIVATE;
-        }
-    case NET_TEREDO:
-        switch(ourNet) {
-        default:          return REACH_DEFAULT;
-        case NET_TEREDO:  return REACH_TEREDO;
-        case NET_IPV6:    return REACH_IPV6_WEAK;
-        case NET_IPV4:    return REACH_IPV4;
-        }
-    case NET_UNKNOWN:
-    case NET_UNROUTABLE:
-    default:
-        switch(ourNet) {
-        default:          return REACH_DEFAULT;
-        case NET_TEREDO:  return REACH_TEREDO;
-        case NET_IPV6:    return REACH_IPV6_WEAK;
-        case NET_IPV4:    return REACH_IPV4;
-        case NET_TOR:     return REACH_PRIVATE; // either from Tor, or don't care about our address
-        }
-    }
-}
-
-void CService::Init()
-{
-    port = 0;
-}
-
-CService::CService()
-{
-    Init();
-}
-
-CService::CService(const CNetAddr& cip, unsigned short portIn) : CNetAddr(cip), port(portIn)
-{
-}
-
-CService::CService(const struct in_addr& ipv4Addr, unsigned short portIn) : CNetAddr(ipv4Addr), port(portIn)
-{
-}
-
-CService::CService(const struct in6_addr& ipv6Addr, unsigned short portIn) : CNetAddr(ipv6Addr), port(portIn)
-{
-}
-
-CService::CService(const struct sockaddr_in& addr) : CNetAddr(addr.sin_addr), port(ntohs(addr.sin_port))
-{
-    assert(addr.sin_family == AF_INET);
-}
-
-CService::CService(const struct sockaddr_in6 &addr) : CNetAddr(addr.sin6_addr, addr.sin6_scope_id), port(ntohs(addr.sin6_port))
-{
-   assert(addr.sin6_family == AF_INET6);
-}
-
-bool CService::SetSockAddr(const struct sockaddr *paddr)
-{
-    switch (paddr->sa_family) {
-    case AF_INET:
-        *this = CService(*(const struct sockaddr_in*)paddr);
-        return true;
-    case AF_INET6:
-        *this = CService(*(const struct sockaddr_in6*)paddr);
-        return true;
-    default:
-        return false;
-    }
-}
-
-unsigned short CService::GetPort() const
-{
-    return port;
-}
-
-bool operator==(const CService& a, const CService& b)
-{
-    return (CNetAddr)a == (CNetAddr)b && a.port == b.port;
-}
-
-bool operator!=(const CService& a, const CService& b)
-{
-    return (CNetAddr)a != (CNetAddr)b || a.port != b.port;
-}
-
-bool operator<(const CService& a, const CService& b)
-{
-    return (CNetAddr)a < (CNetAddr)b || ((CNetAddr)a == (CNetAddr)b && a.port < b.port);
-}
-
-bool CService::GetSockAddr(struct sockaddr* paddr, socklen_t *addrlen) const
-{
-    if (IsIPv4()) {
-        if (*addrlen < (socklen_t)sizeof(struct sockaddr_in))
-            return false;
-        *addrlen = sizeof(struct sockaddr_in);
-        struct sockaddr_in *paddrin = (struct sockaddr_in*)paddr;
-        memset(paddrin, 0, *addrlen);
-        if (!GetInAddr(&paddrin->sin_addr))
-            return false;
-        paddrin->sin_family = AF_INET;
-        paddrin->sin_port = htons(port);
-        return true;
-    }
-    if (IsIPv6()) {
-        if (*addrlen < (socklen_t)sizeof(struct sockaddr_in6))
-            return false;
-        *addrlen = sizeof(struct sockaddr_in6);
-        struct sockaddr_in6 *paddrin6 = (struct sockaddr_in6*)paddr;
-        memset(paddrin6, 0, *addrlen);
-        if (!GetIn6Addr(&paddrin6->sin6_addr))
-            return false;
-        paddrin6->sin6_scope_id = scopeId;
-        paddrin6->sin6_family = AF_INET6;
-        paddrin6->sin6_port = htons(port);
-        return true;
-    }
-    return false;
-}
-
-std::vector<unsigned char> CService::GetKey() const
-{
-     std::vector<unsigned char> vKey;
-     vKey.resize(18);
-     memcpy(&vKey[0], ip, 16);
-     vKey[16] = port / 0x100;
-     vKey[17] = port & 0x0FF;
-     return vKey;
-}
-
-std::string CService::ToStringPort() const
-{
-    return strprintf("%u", port);
-}
-
-std::string CService::ToStringIPPort() const
-{
-    if (IsIPv4() || IsTor()) {
-        return ToStringIP() + ":" + ToStringPort();
-    } else {
-        return "[" + ToStringIP() + "]:" + ToStringPort();
-    }
-}
-
-std::string CService::ToString() const
-{
-    return ToStringIPPort();
-}
-
-void CService::SetPort(unsigned short portIn)
-{
-    port = portIn;
-}
-
-CSubNet::CSubNet():
-    valid(false)
-{
-    memset(netmask, 0, sizeof(netmask));
-}
-
-CSubNet::CSubNet(const CNetAddr &addr, int32_t mask)
-{
-    valid = true;
-    network = addr;
-    // Default to /32 (IPv4) or /128 (IPv6), i.e. match single address
-    memset(netmask, 255, sizeof(netmask));
-
-    // IPv4 addresses start at offset 12, and first 12 bytes must match, so just offset n
-    const int astartofs = network.IsIPv4() ? 12 : 0;
-
-    int32_t n = mask;
-    if(n >= 0 && n <= (128 - astartofs*8)) // Only valid if in range of bits of address
-    {
-        n += astartofs*8;
-        // Clear bits [n..127]
-        for (; n < 128; ++n)
-            netmask[n>>3] &= ~(1<<(7-(n&7)));
-    } else
-        valid = false;
-
-    // Normalize network according to netmask
-    for(int x=0; x<16; ++x)
-        network.ip[x] &= netmask[x];
-}
-
-CSubNet::CSubNet(const CNetAddr &addr, const CNetAddr &mask)
-{
-    valid = true;
-    network = addr;
-    // Default to /32 (IPv4) or /128 (IPv6), i.e. match single address
-    memset(netmask, 255, sizeof(netmask));
-
-    // IPv4 addresses start at offset 12, and first 12 bytes must match, so just offset n
-    const int astartofs = network.IsIPv4() ? 12 : 0;
-
-    for(int x=astartofs; x<16; ++x)
-        netmask[x] = mask.ip[x];
-
-    // Normalize network according to netmask
-    for(int x=0; x<16; ++x)
-        network.ip[x] &= netmask[x];
-}
-
-
 bool LookupSubNet(const char* pszName, CSubNet& ret)
 {
     std::string strSubnet(pszName);
@@ -1295,97 +681,6 @@ bool LookupSubNet(const char* pszName, CSubNet& ret)
     return false;
 }
 
-CSubNet::CSubNet(const CNetAddr &addr):
-    valid(addr.IsValid())
-{
-    memset(netmask, 255, sizeof(netmask));
-    network = addr;
-}
-
-bool CSubNet::Match(const CNetAddr &addr) const
-{
-    if (!valid || !addr.IsValid())
-        return false;
-    for(int x=0; x<16; ++x)
-        if ((addr.ip[x] & netmask[x]) != network.ip[x])
-            return false;
-    return true;
-}
-
-static inline int NetmaskBits(uint8_t x)
-{
-    switch(x) {
-    case 0x00: return 0; break;
-    case 0x80: return 1; break;
-    case 0xc0: return 2; break;
-    case 0xe0: return 3; break;
-    case 0xf0: return 4; break;
-    case 0xf8: return 5; break;
-    case 0xfc: return 6; break;
-    case 0xfe: return 7; break;
-    case 0xff: return 8; break;
-    default: return -1; break;
-    }
-}
-
-std::string CSubNet::ToString() const
-{
-    /* Parse binary 1{n}0{N-n} to see if mask can be represented as /n */
-    int cidr = 0;
-    bool valid_cidr = true;
-    int n = network.IsIPv4() ? 12 : 0;
-    for (; n < 16 && netmask[n] == 0xff; ++n)
-        cidr += 8;
-    if (n < 16) {
-        int bits = NetmaskBits(netmask[n]);
-        if (bits < 0)
-            valid_cidr = false;
-        else
-            cidr += bits;
-        ++n;
-    }
-    for (; n < 16 && valid_cidr; ++n)
-        if (netmask[n] != 0x00)
-            valid_cidr = false;
-
-    /* Format output */
-    std::string strNetmask;
-    if (valid_cidr) {
-        strNetmask = strprintf("%u", cidr);
-    } else {
-        if (network.IsIPv4())
-            strNetmask = strprintf("%u.%u.%u.%u", netmask[12], netmask[13], netmask[14], netmask[15]);
-        else
-            strNetmask = strprintf("%x:%x:%x:%x:%x:%x:%x:%x",
-                             netmask[0] << 8 | netmask[1], netmask[2] << 8 | netmask[3],
-                             netmask[4] << 8 | netmask[5], netmask[6] << 8 | netmask[7],
-                             netmask[8] << 8 | netmask[9], netmask[10] << 8 | netmask[11],
-                             netmask[12] << 8 | netmask[13], netmask[14] << 8 | netmask[15]);
-    }
-
-    return network.ToString() + "/" + strNetmask;
-}
-
-bool CSubNet::IsValid() const
-{
-    return valid;
-}
-
-bool operator==(const CSubNet& a, const CSubNet& b)
-{
-    return a.valid == b.valid && a.network == b.network && !memcmp(a.netmask, b.netmask, 16);
-}
-
-bool operator!=(const CSubNet& a, const CSubNet& b)
-{
-    return !(a==b);
-}
-
-bool operator<(const CSubNet& a, const CSubNet& b)
-{
-    return (a.network < b.network || (a.network == b.network && memcmp(a.netmask, b.netmask, 16) < 0));
-}
-
 #ifdef WIN32
 std::string NetworkErrorString(int err)
 {
diff --git a/src/netbase.h b/src/netbase.h
index 26807ae69733a..d0abd5e954ef4 100644
--- a/src/netbase.h
+++ b/src/netbase.h
@@ -10,6 +10,7 @@
 #endif
 
 #include "compat.h"
+#include "netaddress.h"
 #include "serialize.h"
 
 #include <stdint.h>
@@ -24,163 +25,6 @@ static const int DEFAULT_CONNECT_TIMEOUT = 5000;
 //! -dns default
 static const int DEFAULT_NAME_LOOKUP = true;
 
-#ifdef WIN32
-// In MSVC, this is defined as a macro, undefine it to prevent a compile and link error
-#undef SetPort
-#endif
-
-enum Network
-{
-    NET_UNROUTABLE = 0,
-    NET_IPV4,
-    NET_IPV6,
-    NET_TOR,
-
-    NET_MAX,
-};
-
-/** IP address (IPv6, or IPv4 using mapped IPv6 range (::FFFF:0:0/96)) */
-class CNetAddr
-{
-    protected:
-        unsigned char ip[16]; // in network byte order
-        uint32_t scopeId; // for scoped/link-local ipv6 addresses
-
-    public:
-        CNetAddr();
-        CNetAddr(const struct in_addr& ipv4Addr);
-        void Init();
-        void SetIP(const CNetAddr& ip);
-
-        /**
-         * Set raw IPv4 or IPv6 address (in network byte order)
-         * @note Only NET_IPV4 and NET_IPV6 are allowed for network.
-         */
-        void SetRaw(Network network, const uint8_t *data);
-
-        bool SetSpecial(const std::string &strName); // for Tor addresses
-        bool IsIPv4() const;    // IPv4 mapped address (::FFFF:0:0/96, 0.0.0.0/0)
-        bool IsIPv6() const;    // IPv6 address (not mapped IPv4, not Tor)
-        bool IsRFC1918() const; // IPv4 private networks (10.0.0.0/8, 192.168.0.0/16, 172.16.0.0/12)
-        bool IsRFC2544() const; // IPv4 inter-network communcations (192.18.0.0/15)
-        bool IsRFC6598() const; // IPv4 ISP-level NAT (100.64.0.0/10)
-        bool IsRFC5737() const; // IPv4 documentation addresses (192.0.2.0/24, 198.51.100.0/24, 203.0.113.0/24)
-        bool IsRFC3849() const; // IPv6 documentation address (2001:0DB8::/32)
-        bool IsRFC3927() const; // IPv4 autoconfig (169.254.0.0/16)
-        bool IsRFC3964() const; // IPv6 6to4 tunnelling (2002::/16)
-        bool IsRFC4193() const; // IPv6 unique local (FC00::/7)
-        bool IsRFC4380() const; // IPv6 Teredo tunnelling (2001::/32)
-        bool IsRFC4843() const; // IPv6 ORCHID (2001:10::/28)
-        bool IsRFC4862() const; // IPv6 autoconfig (FE80::/64)
-        bool IsRFC6052() const; // IPv6 well-known prefix (64:FF9B::/96)
-        bool IsRFC6145() const; // IPv6 IPv4-translated address (::FFFF:0:0:0/96)
-        bool IsTor() const;
-        bool IsLocal() const;
-        bool IsRoutable() const;
-        bool IsValid() const;
-        bool IsMulticast() const;
-        enum Network GetNetwork() const;
-        std::string ToString() const;
-        std::string ToStringIP() const;
-        unsigned int GetByte(int n) const;
-        uint64_t GetHash() const;
-        bool GetInAddr(struct in_addr* pipv4Addr) const;
-        std::vector<unsigned char> GetGroup() const;
-        int GetReachabilityFrom(const CNetAddr *paddrPartner = NULL) const;
-
-        CNetAddr(const struct in6_addr& pipv6Addr, const uint32_t scope = 0);
-        bool GetIn6Addr(struct in6_addr* pipv6Addr) const;
-
-        friend bool operator==(const CNetAddr& a, const CNetAddr& b);
-        friend bool operator!=(const CNetAddr& a, const CNetAddr& b);
-        friend bool operator<(const CNetAddr& a, const CNetAddr& b);
-
-        ADD_SERIALIZE_METHODS;
-
-        template <typename Stream, typename Operation>
-        inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) {
-            READWRITE(FLATDATA(ip));
-        }
-
-        friend class CSubNet;
-};
-
-class CSubNet
-{
-    protected:
-        /// Network (base) address
-        CNetAddr network;
-        /// Netmask, in network byte order
-        uint8_t netmask[16];
-        /// Is this value valid? (only used to signal parse errors)
-        bool valid;
-
-    public:
-        CSubNet();
-        CSubNet(const CNetAddr &addr, int32_t mask);
-        CSubNet(const CNetAddr &addr, const CNetAddr &mask);
-
-        //constructor for single ip subnet (<ipv4>/32 or <ipv6>/128)
-        explicit CSubNet(const CNetAddr &addr);
-
-        bool Match(const CNetAddr &addr) const;
-
-        std::string ToString() const;
-        bool IsValid() const;
-
-        friend bool operator==(const CSubNet& a, const CSubNet& b);
-        friend bool operator!=(const CSubNet& a, const CSubNet& b);
-        friend bool operator<(const CSubNet& a, const CSubNet& b);
-
-        ADD_SERIALIZE_METHODS;
-
-        template <typename Stream, typename Operation>
-        inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) {
-            READWRITE(network);
-            READWRITE(FLATDATA(netmask));
-            READWRITE(FLATDATA(valid));
-        }
-};
-
-/** A combination of a network address (CNetAddr) and a (TCP) port */
-class CService : public CNetAddr
-{
-    protected:
-        unsigned short port; // host order
-
-    public:
-        CService();
-        CService(const CNetAddr& ip, unsigned short port);
-        CService(const struct in_addr& ipv4Addr, unsigned short port);
-        CService(const struct sockaddr_in& addr);
-        void Init();
-        void SetPort(unsigned short portIn);
-        unsigned short GetPort() const;
-        bool GetSockAddr(struct sockaddr* paddr, socklen_t *addrlen) const;
-        bool SetSockAddr(const struct sockaddr* paddr);
-        friend bool operator==(const CService& a, const CService& b);
-        friend bool operator!=(const CService& a, const CService& b);
-        friend bool operator<(const CService& a, const CService& b);
-        std::vector<unsigned char> GetKey() const;
-        std::string ToString() const;
-        std::string ToStringPort() const;
-        std::string ToStringIPPort() const;
-
-        CService(const struct in6_addr& ipv6Addr, unsigned short port);
-        CService(const struct sockaddr_in6& addr);
-
-        ADD_SERIALIZE_METHODS;
-
-        template <typename Stream, typename Operation>
-        inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) {
-            READWRITE(FLATDATA(ip));
-            unsigned short portN = htons(port);
-            READWRITE(FLATDATA(portN));
-            if (ser_action.ForRead())
-                 port = ntohs(portN);
-        }
-};
-
 class proxyType
 {
 public:

From 21ba407a7369a0229b8a8554dee0da63a64e6639 Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Tue, 31 May 2016 17:42:38 -0400
Subject: [PATCH 0684/1802] net: narrow include scope after moving to
 netaddress

Net functionality is no longer needed for CAddress/CAddrman/etc. now that
CNetAddr/CService/CSubNet are dumb storage classes.
---
 src/addrman.h              | 2 +-
 src/init.cpp               | 1 +
 src/net.cpp                | 1 +
 src/net.h                  | 2 +-
 src/protocol.h             | 2 +-
 src/qt/optionsmodel.cpp    | 1 +
 src/qt/rpcconsole.cpp      | 1 +
 src/test/addrman_tests.cpp | 1 +
 src/test/net_tests.cpp     | 1 +
 src/timedata.cpp           | 2 +-
 src/torcontrol.cpp         | 1 +
 src/wallet/rpcwallet.cpp   | 1 -
 12 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/addrman.h b/src/addrman.h
index 1caf540758797..9bab39049d7ab 100644
--- a/src/addrman.h
+++ b/src/addrman.h
@@ -6,7 +6,7 @@
 #ifndef BITCOIN_ADDRMAN_H
 #define BITCOIN_ADDRMAN_H
 
-#include "netbase.h"
+#include "netaddress.h"
 #include "protocol.h"
 #include "random.h"
 #include "sync.h"
diff --git a/src/init.cpp b/src/init.cpp
index 8b94e2dbfb126..4f5eeeffe67e7 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -21,6 +21,7 @@
 #include "key.h"
 #include "main.h"
 #include "miner.h"
+#include "netbase.h"
 #include "net.h"
 #include "policy/policy.h"
 #include "rpc/server.h"
diff --git a/src/net.cpp b/src/net.cpp
index e44bdafc79889..e9bb406e976c5 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -17,6 +17,7 @@
 #include "crypto/sha256.h"
 #include "hash.h"
 #include "primitives/transaction.h"
+#include "netbase.h"
 #include "scheduler.h"
 #include "ui_interface.h"
 #include "utilstrencodings.h"
diff --git a/src/net.h b/src/net.h
index 41315fc9b9fcc..ea03defc408cf 100644
--- a/src/net.h
+++ b/src/net.h
@@ -10,7 +10,7 @@
 #include "bloom.h"
 #include "compat.h"
 #include "limitedmap.h"
-#include "netbase.h"
+#include "netaddress.h"
 #include "protocol.h"
 #include "random.h"
 #include "streams.h"
diff --git a/src/protocol.h b/src/protocol.h
index 15f27e2d2fbcb..015215b2a668b 100644
--- a/src/protocol.h
+++ b/src/protocol.h
@@ -10,7 +10,7 @@
 #ifndef BITCOIN_PROTOCOL_H
 #define BITCOIN_PROTOCOL_H
 
-#include "netbase.h"
+#include "netaddress.h"
 #include "serialize.h"
 #include "uint256.h"
 #include "version.h"
diff --git a/src/qt/optionsmodel.cpp b/src/qt/optionsmodel.cpp
index 684db71a8ce03..d33ab682770f0 100644
--- a/src/qt/optionsmodel.cpp
+++ b/src/qt/optionsmodel.cpp
@@ -15,6 +15,7 @@
 #include "init.h"
 #include "main.h" // For DEFAULT_SCRIPTCHECK_THREADS
 #include "net.h"
+#include "netbase.h"
 #include "txdb.h" // for -dbcache defaults
 
 #ifdef ENABLE_WALLET
diff --git a/src/qt/rpcconsole.cpp b/src/qt/rpcconsole.cpp
index 21eda07ddffd0..bcaa9164c91ba 100644
--- a/src/qt/rpcconsole.cpp
+++ b/src/qt/rpcconsole.cpp
@@ -16,6 +16,7 @@
 #include "bantablemodel.h"
 
 #include "chainparams.h"
+#include "netbase.h"
 #include "rpc/server.h"
 #include "rpc/client.h"
 #include "util.h"
diff --git a/src/test/addrman_tests.cpp b/src/test/addrman_tests.cpp
index b84d00856bd66..5f150e4812af5 100644
--- a/src/test/addrman_tests.cpp
+++ b/src/test/addrman_tests.cpp
@@ -7,6 +7,7 @@
 #include <boost/test/unit_test.hpp>
 
 #include "hash.h"
+#include "netbase.h"
 #include "random.h"
 
 using namespace std;
diff --git a/src/test/net_tests.cpp b/src/test/net_tests.cpp
index fca1a16b2dc81..6511e6ffa24f1 100644
--- a/src/test/net_tests.cpp
+++ b/src/test/net_tests.cpp
@@ -9,6 +9,7 @@
 #include "serialize.h"
 #include "streams.h"
 #include "net.h"
+#include "netbase.h"
 #include "chainparams.h"
 
 using namespace std;
diff --git a/src/timedata.cpp b/src/timedata.cpp
index b6bcf86fbf261..25fc494121d4d 100644
--- a/src/timedata.cpp
+++ b/src/timedata.cpp
@@ -8,7 +8,7 @@
 
 #include "timedata.h"
 
-#include "netbase.h"
+#include "netaddress.h"
 #include "sync.h"
 #include "ui_interface.h"
 #include "util.h"
diff --git a/src/torcontrol.cpp b/src/torcontrol.cpp
index d3d782747fd2c..c7f96270050ac 100644
--- a/src/torcontrol.cpp
+++ b/src/torcontrol.cpp
@@ -4,6 +4,7 @@
 
 #include "torcontrol.h"
 #include "utilstrencodings.h"
+#include "netbase.h"
 #include "net.h"
 #include "util.h"
 #include "crypto/hmac_sha256.h"
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index a90807e5141b7..aa0a9374c1991 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -10,7 +10,6 @@
 #include "init.h"
 #include "main.h"
 #include "net.h"
-#include "netbase.h"
 #include "policy/rbf.h"
 #include "rpc/server.h"
 #include "timedata.h"

From ff8d279a78fef40224665353624771cd970c6095 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pavel=20Jan=C3=ADk?= <Pavel@Janik.cz>
Date: Fri, 27 May 2016 08:00:56 +0200
Subject: [PATCH 0685/1802] Do not shadow member variables

---
 src/httprpc.cpp    |  2 +-
 src/httpserver.cpp | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/httprpc.cpp b/src/httprpc.cpp
index 04d3386e9a922..6a6c5276cc1e5 100644
--- a/src/httprpc.cpp
+++ b/src/httprpc.cpp
@@ -45,7 +45,7 @@ class HTTPRPCTimer : public RPCTimerBase
 class HTTPRPCTimerInterface : public RPCTimerInterface
 {
 public:
-    HTTPRPCTimerInterface(struct event_base* base) : base(base)
+    HTTPRPCTimerInterface(struct event_base* _base) : base(_base)
     {
     }
     const char* Name()
diff --git a/src/httpserver.cpp b/src/httpserver.cpp
index be7a6a1ddee86..64ccb263edfce 100644
--- a/src/httpserver.cpp
+++ b/src/httpserver.cpp
@@ -42,8 +42,8 @@ static const size_t MAX_HEADERS_SIZE = 8192;
 class HTTPWorkItem : public HTTPClosure
 {
 public:
-    HTTPWorkItem(std::unique_ptr<HTTPRequest> req, const std::string &path, const HTTPRequestHandler& func):
-        req(std::move(req)), path(path), func(func)
+    HTTPWorkItem(std::unique_ptr<HTTPRequest> _req, const std::string &_path, const HTTPRequestHandler& _func):
+        req(std::move(_req)), path(_path), func(_func)
     {
     }
     void operator()()
@@ -92,8 +92,8 @@ class WorkQueue
     };
 
 public:
-    WorkQueue(size_t maxDepth) : running(true),
-                                 maxDepth(maxDepth),
+    WorkQueue(size_t _maxDepth) : running(true),
+                                 maxDepth(_maxDepth),
                                  numThreads(0)
     {
     }
@@ -158,8 +158,8 @@ class WorkQueue
 struct HTTPPathHandler
 {
     HTTPPathHandler() {}
-    HTTPPathHandler(std::string prefix, bool exactMatch, HTTPRequestHandler handler):
-        prefix(prefix), exactMatch(exactMatch), handler(handler)
+    HTTPPathHandler(std::string _prefix, bool _exactMatch, HTTPRequestHandler _handler):
+        prefix(_prefix), exactMatch(_exactMatch), handler(_handler)
     {
     }
     std::string prefix;
@@ -517,8 +517,8 @@ static void httpevent_callback_fn(evutil_socket_t, short, void* data)
         delete self;
 }
 
-HTTPEvent::HTTPEvent(struct event_base* base, bool deleteWhenTriggered, const std::function<void(void)>& handler):
-    deleteWhenTriggered(deleteWhenTriggered), handler(handler)
+HTTPEvent::HTTPEvent(struct event_base* base, bool _deleteWhenTriggered, const std::function<void(void)>& _handler):
+    deleteWhenTriggered(_deleteWhenTriggered), handler(_handler)
 {
     ev = event_new(base, -1, 0, httpevent_callback_fn, this);
     assert(ev);
@@ -534,7 +534,7 @@ void HTTPEvent::trigger(struct timeval* tv)
     else
         evtimer_add(ev, tv); // trigger after timeval passed
 }
-HTTPRequest::HTTPRequest(struct evhttp_request* req) : req(req),
+HTTPRequest::HTTPRequest(struct evhttp_request* _req) : req(_req),
                                                        replySent(false)
 {
 }

From 7fdbce9de43c600776e00a2f2042d302cfa4e411 Mon Sep 17 00:00:00 2001
From: fanquake <fanquake@gmail.com>
Date: Mon, 1 Aug 2016 09:30:32 +0800
Subject: [PATCH 0686/1802] [doc] Increase recommended memory in gitian build
 guide

---
 doc/gitian-building.md                    |   2 +-
 doc/gitian-building/create_vm_memsize.png | Bin 89475 -> 22158 bytes
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/gitian-building.md b/doc/gitian-building.md
index 7796a5fc9c151..938f92ff1281f 100644
--- a/doc/gitian-building.md
+++ b/doc/gitian-building.md
@@ -55,7 +55,7 @@ In the VirtualBox GUI click "New" and choose the following parameters in the wiz
 
 ![](gitian-building/create_vm_memsize.png)
 
-- Memory Size: at least 1024MB, anything less will really slow down the build.
+- Memory Size: at least 3000MB, anything less and the build might not complete.
 
 ![](gitian-building/create_vm_hard_disk.png)
 
diff --git a/doc/gitian-building/create_vm_memsize.png b/doc/gitian-building/create_vm_memsize.png
index 5abfee5337058f9bd638a79416040bd6c6496194..6f42cda73f3cabb02e39ae0309ac67f419a168c7 100644
GIT binary patch
literal 22158
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%0A-nL7Zl65qAwp5y$_efz^}#|Q
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
FV1lysU>^Vg

literal 89475
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%0D`!``7%Iy`oE2(Ay6%F`o0ngQ6nw&sA0b06X
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
Nih`zmjjYA{{{SC4x1s<5


From fa4439d3554435bdf0ef47861835f10d41bcdc1a Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Sun, 31 Jul 2016 15:35:46 +0200
Subject: [PATCH 0687/1802] [qa] Rework hd wallet dump test

---
 qa/rpc-tests/wallet-dump.py | 144 ++++++++++++++++--------------------
 1 file changed, 64 insertions(+), 80 deletions(-)

diff --git a/qa/rpc-tests/wallet-dump.py b/qa/rpc-tests/wallet-dump.py
index dd675f57fc46a..6028d2c20b191 100755
--- a/qa/rpc-tests/wallet-dump.py
+++ b/qa/rpc-tests/wallet-dump.py
@@ -4,9 +4,52 @@
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 from test_framework.test_framework import BitcoinTestFramework
-from test_framework.util import *
-import os
-import shutil
+from test_framework.util import (start_nodes, start_node, assert_equal, bitcoind_processes)
+
+
+def read_dump(file_name, addrs, hd_master_addr_old):
+    """
+    Read the given dump, count the addrs that match, count change and reserve.
+    Also check that the old hd_master is inactive
+    """
+    with open(file_name) as inputfile:
+        found_addr = 0
+        found_addr_chg = 0
+        found_addr_rsv = 0
+        hd_master_addr_ret = None
+        for line in inputfile:
+            # only read non comment lines
+            if line[0] != "#" and len(line) > 10:
+                # split out some data
+                key_label, comment = line.split("#")
+                # key = key_label.split(" ")[0]
+                keytype = key_label.split(" ")[2]
+                if len(comment) > 1:
+                    addr_keypath = comment.split(" addr=")[1]
+                    addr = addr_keypath.split(" ")[0]
+                    keypath = None
+                    if keytype == "inactivehdmaster=1":
+                        # ensure the old master is still available
+                        assert(hd_master_addr_old == addr)
+                    elif keytype == "hdmaster=1":
+                        # ensure we have generated a new hd master key
+                        assert(hd_master_addr_old != addr)
+                        hd_master_addr_ret = addr
+                    else:
+                        keypath = addr_keypath.rstrip().split("hdkeypath=")[1]
+
+                    # count key types
+                    for addrObj in addrs:
+                        if addrObj['address'] == addr and addrObj['hdkeypath'] == keypath and keytype == "label=":
+                            found_addr += 1
+                            break
+                        elif keytype == "change=1":
+                            found_addr_chg += 1
+                            break
+                        elif keytype == "reserve=1":
+                            found_addr_rsv += 1
+                            break
+        return found_addr, found_addr_chg, found_addr_rsv, hd_master_addr_ret
 
 
 class WalletDumpTest(BitcoinTestFramework):
@@ -15,106 +58,47 @@ def __init__(self):
         super().__init__()
         self.setup_clean_chain = False
         self.num_nodes = 1
+        self.extra_args = [["-keypool=90"]]
 
     def setup_network(self, split=False):
-        extra_args = [["-keypool=100"]]
-        self.nodes = start_nodes(self.num_nodes, self.options.tmpdir, extra_args)
+        self.nodes = start_nodes(self.num_nodes, self.options.tmpdir, self.extra_args)
 
     def run_test (self):
         tmpdir = self.options.tmpdir
 
-        #generate 20 addresses to compare against the dump
+        # generate 20 addresses to compare against the dump
         test_addr_count = 20
         addrs = []
         for i in range(0,test_addr_count):
             addr = self.nodes[0].getnewaddress()
             vaddr= self.nodes[0].validateaddress(addr) #required to get hd keypath
             addrs.append(vaddr)
+        # Should be a no-op:
+        self.nodes[0].keypoolrefill()
 
         # dump unencrypted wallet
         self.nodes[0].dumpwallet(tmpdir + "/node0/wallet.unencrypted.dump")
 
-        #open file
-        inputfile = open(tmpdir + "/node0/wallet.unencrypted.dump")
-        found_addr = 0
-        found_addr_chg = 0
-        found_addr_rsv = 0
-        hdmasteraddr = ""
-        for line in inputfile:
-            #only read non comment lines
-            if line[0] != "#" and len(line) > 10:
-                #split out some data
-                keyLabel, comment = line.split("#")
-                key = keyLabel.split(" ")[0]
-                keytype = keyLabel.split(" ")[2]
-                if len(comment) > 1:
-                    addrKeypath = comment.split(" addr=")[1]
-                    addr = addrKeypath.split(" ")[0]
-                    keypath = ""
-                    if keytype != "hdmaster=1":
-                        keypath = addrKeypath.rstrip().split("hdkeypath=")[1]
-                    else:
-                        #keep hd master for later comp.
-                        hdmasteraddr = addr
-
-                    #count key types
-                    for addrObj in addrs:
-                        if (addrObj['address'] == addr and addrObj['hdkeypath'] == keypath and keytype == "label="):
-                            found_addr+=1
-                            break
-                        elif (keytype == "change=1"):
-                            found_addr_chg+=1
-                            break
-                        elif (keytype == "reserve=1"):
-                            found_addr_rsv+=1
-                            break
-        assert(found_addr == test_addr_count) #all keys must be in the dump
-        assert(found_addr_chg == 50) #50 blocks where mined
-        assert(found_addr_rsv == 100) #100 reserve keys (keypool)
+        found_addr, found_addr_chg, found_addr_rsv, hd_master_addr_unenc = \
+            read_dump(tmpdir + "/node0/wallet.unencrypted.dump", addrs, None)
+        assert_equal(found_addr, test_addr_count)  # all keys must be in the dump
+        assert_equal(found_addr_chg, 50)  # 50 blocks where mined
+        assert_equal(found_addr_rsv, 90 + 1)  # keypool size (TODO: fix off-by-one)
 
         #encrypt wallet, restart, unlock and dump
         self.nodes[0].encryptwallet('test')
         bitcoind_processes[0].wait()
-        self.nodes[0] = start_node(0, self.options.tmpdir)
+        self.nodes[0] = start_node(0, self.options.tmpdir, self.extra_args[0])
         self.nodes[0].walletpassphrase('test', 10)
+        # Should be a no-op:
+        self.nodes[0].keypoolrefill()
         self.nodes[0].dumpwallet(tmpdir + "/node0/wallet.encrypted.dump")
 
-        #open dump done with an encrypted wallet
-        inputfile = open(tmpdir + "/node0/wallet.encrypted.dump")
-        found_addr = 0
-        found_addr_chg = 0
-        found_addr_rsv = 0
-        for line in inputfile:
-            if line[0] != "#" and len(line) > 10:
-                keyLabel, comment = line.split("#")
-                key = keyLabel.split(" ")[0]
-                keytype = keyLabel.split(" ")[2]
-                if len(comment) > 1:
-                    addrKeypath = comment.split(" addr=")[1]
-                    addr = addrKeypath.split(" ")[0]
-                    keypath = ""
-                    if keytype != "hdmaster=1":
-                        keypath = addrKeypath.rstrip().split("hdkeypath=")[1]
-                    else:
-                        #ensure we have generated a new hd master key
-                        assert(hdmasteraddr != addr)
-                    if keytype == "inactivehdmaster=1":
-                        #ensure the old master is still available
-                        assert(hdmasteraddr == addr)
-                    for addrObj in addrs:
-                        if (addrObj['address'] == addr and addrObj['hdkeypath'] == keypath and keytype == "label="):
-                            found_addr+=1
-                            break
-                        elif (keytype == "change=1"):
-                            found_addr_chg+=1
-                            break
-                        elif (keytype == "reserve=1"):
-                            found_addr_rsv+=1
-                            break
-
-        assert(found_addr == test_addr_count)
-        assert(found_addr_chg == 150) #old reserve keys are marked as change now
-        assert(found_addr_rsv == 100) #keypool size
+        found_addr, found_addr_chg, found_addr_rsv, hd_master_addr_enc = \
+            read_dump(tmpdir + "/node0/wallet.encrypted.dump", addrs, hd_master_addr_unenc)
+        assert_equal(found_addr, test_addr_count)
+        assert_equal(found_addr_chg, 90 + 1 + 50)  # old reserve keys are marked as change now
+        assert_equal(found_addr_rsv, 90 + 1)  # keypool size (TODO: fix off-by-one)
 
 if __name__ == '__main__':
     WalletDumpTest().main ()

From 2c517b3928a68c6e36b18262081a401a741cd4cd Mon Sep 17 00:00:00 2001
From: Suhas Daftuar <sdaftuar@gmail.com>
Date: Mon, 1 Aug 2016 12:40:38 -0400
Subject: [PATCH 0688/1802] Fix p2p-feefilter.py for changed tx relay behavior

---
 qa/rpc-tests/p2p-feefilter.py | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/qa/rpc-tests/p2p-feefilter.py b/qa/rpc-tests/p2p-feefilter.py
index cd0501a3140c3..96d99d38a73c1 100755
--- a/qa/rpc-tests/p2p-feefilter.py
+++ b/qa/rpc-tests/p2p-feefilter.py
@@ -62,6 +62,7 @@ def setup_network(self):
 
     def run_test(self):
         node1 = self.nodes[1]
+        node0 = self.nodes[0]
         # Get out of IBD
         node1.generate(1)
         sync_blocks(self.nodes)
@@ -91,8 +92,17 @@ def run_test(self):
         node1.settxfee(Decimal("0.00010000"))
         [node1.sendtoaddress(node1.getnewaddress(), 1) for x in range(3)]
         sync_mempools(self.nodes) # must be sure node 0 has received all txs 
-        time.sleep(10) # wait 10 secs to be sure its doesn't relay any
-        assert(allInvsMatch([], test_node))
+
+        # Send one transaction from node0 that should be received, so that we
+        # we can sync the test on receipt (if node1's txs were relayed, they'd
+        # be received by the time this node0 tx is received). This is
+        # unfortunately reliant on the current relay behavior where we batch up
+        # to 35 entries in an inv, which means that when this next transaction
+        # is eligible for relay, the prior transactions from node1 are eligible
+        # as well.
+        node0.settxfee(Decimal("0.00020000"))
+        txids = [node0.sendtoaddress(node0.getnewaddress(), 1)]
+        assert(allInvsMatch(txids, test_node))
         test_node.clear_invs()
 
         # Remove fee filter and check that txs are received again

From 115265bb1060533bc1b73a10c5ca17ad64fbaf45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pavel=20Jan=C3=ADk?= <Pavel@Janik.cz>
Date: Tue, 2 Aug 2016 10:26:05 +0200
Subject: [PATCH 0689/1802] Trivial: bip -> BIP in help text and comment

---
 src/init.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/init.cpp b/src/init.cpp
index 5dc3ac023ccf8..a3560afef8c8e 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -410,7 +410,7 @@ std::string HelpMessage(HelpMessageMode mode)
         strUsage += HelpMessageOpt("-limitancestorsize=<n>", strprintf("Do not accept transactions whose size with all in-mempool ancestors exceeds <n> kilobytes (default: %u)", DEFAULT_ANCESTOR_SIZE_LIMIT));
         strUsage += HelpMessageOpt("-limitdescendantcount=<n>", strprintf("Do not accept transactions if any ancestor would have <n> or more in-mempool descendants (default: %u)", DEFAULT_DESCENDANT_LIMIT));
         strUsage += HelpMessageOpt("-limitdescendantsize=<n>", strprintf("Do not accept transactions if any ancestor would have more than <n> kilobytes of in-mempool descendants (default: %u).", DEFAULT_DESCENDANT_SIZE_LIMIT));
-        strUsage += HelpMessageOpt("-bip9params=deployment:start:end", "Use given start/end times for specified bip9 deployment (regtest-only)");
+        strUsage += HelpMessageOpt("-bip9params=deployment:start:end", "Use given start/end times for specified BIP9 deployment (regtest-only)");
     }
     string debugCategories = "addrman, alert, bench, coindb, db, http, libevent, lock, mempool, mempoolrej, net, proxy, prune, rand, reindex, rpc, selectcoins, tor, zmq"; // Don't translate these and qt below
     if (mode == HMM_BITCOIN_QT)
@@ -977,7 +977,7 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
     }
 
     if (!mapMultiArgs["-bip9params"].empty()) {
-        // Allow overriding bip9 parameters for testing
+        // Allow overriding BIP9 parameters for testing
         if (!Params().MineBlocksOnDemand()) {
             return InitError("BIP9 parameters may only be overridden on regtest.");
         }

From 0fc00bea5d24f4a6715f7069adb7b7396c981308 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pavel=20Jan=C3=ADk?= <Pavel@Janik.cz>
Date: Tue, 2 Aug 2016 10:26:54 +0200
Subject: [PATCH 0690/1802] Do not shadow previous local variable

---
 src/init.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/init.cpp b/src/init.cpp
index a3560afef8c8e..cb3dfe3aa49af 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -996,10 +996,10 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
                 return InitError(strprintf("Invalid nTimeout (%s)", vDeploymentParams[2]));
             }
             bool found = false;
-            for (int i=0; i<(int)Consensus::MAX_VERSION_BITS_DEPLOYMENTS; ++i)
+            for (int j=0; j<(int)Consensus::MAX_VERSION_BITS_DEPLOYMENTS; ++j)
             {
-                if (vDeploymentParams[0].compare(VersionBitsDeploymentInfo[i].name) == 0) {
-                    UpdateRegtestBIP9Parameters(Consensus::DeploymentPos(i), nStartTime, nTimeout);
+                if (vDeploymentParams[0].compare(VersionBitsDeploymentInfo[j].name) == 0) {
+                    UpdateRegtestBIP9Parameters(Consensus::DeploymentPos(j), nStartTime, nTimeout);
                     found = true;
                     LogPrintf("Setting BIP9 activation parameters for %s to start=%ld, timeout=%ld\n", vDeploymentParams[0], nStartTime, nTimeout);
                     break;

From cce3024c23aceb097ac32c00f84e613bf94e9995 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pavel=20Jan=C3=ADk?= <Pavel@Janik.cz>
Date: Wed, 3 Aug 2016 19:45:24 +0200
Subject: [PATCH 0691/1802] Do not shadow local variable, cleanup

---
 src/blockencodings.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/blockencodings.h b/src/blockencodings.h
index b980e9e28660f..349fcbd50f8c7 100644
--- a/src/blockencodings.h
+++ b/src/blockencodings.h
@@ -53,11 +53,11 @@ class BlockTransactionsRequest {
             }
 
             uint16_t offset = 0;
-            for (size_t i = 0; i < indexes.size(); i++) {
-                if (uint64_t(indexes[i]) + uint64_t(offset) > std::numeric_limits<uint16_t>::max())
+            for (size_t j = 0; j < indexes.size(); j++) {
+                if (uint64_t(indexes[j]) + uint64_t(offset) > std::numeric_limits<uint16_t>::max())
                     throw std::ios_base::failure("indexes overflowed 16 bits");
-                indexes[i] = indexes[i] + offset;
-                offset = indexes[i] + 1;
+                indexes[j] = indexes[j] + offset;
+                offset = indexes[j] + 1;
             }
         } else {
             for (size_t i = 0; i < indexes.size(); i++) {

From 8945384bca00f74ba85c98a52925c254c49025a5 Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Thu, 4 Aug 2016 16:37:49 -0400
Subject: [PATCH 0692/1802] net: Have LookupNumeric return a CService directly

Also fix up a few small issues:
- Lookup with "badip:port" now sets the port to 0
- Don't allow assert to have side-effects
---
 src/httpserver.cpp         | 2 +-
 src/init.cpp               | 6 ++----
 src/net.cpp                | 6 ++----
 src/netbase.cpp            | 9 +++++++--
 src/netbase.h              | 2 +-
 src/qt/optionsdialog.cpp   | 3 +--
 src/test/netbase_tests.cpp | 6 ++----
 src/torcontrol.cpp         | 5 ++---
 8 files changed, 18 insertions(+), 21 deletions(-)

diff --git a/src/httpserver.cpp b/src/httpserver.cpp
index 2c5bc2c7923c3..2bb4be564ea94 100644
--- a/src/httpserver.cpp
+++ b/src/httpserver.cpp
@@ -619,7 +619,7 @@ CService HTTPRequest::GetPeer()
         const char* address = "";
         uint16_t port = 0;
         evhttp_connection_get_peer(con, (char**)&address, &port);
-        LookupNumeric(address, peer, port);
+        peer = LookupNumeric(address, port);
     }
     return peer;
 }
diff --git a/src/init.cpp b/src/init.cpp
index 4f5eeeffe67e7..04d7ed0ea3ff1 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -1098,8 +1098,7 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
     std::string proxyArg = GetArg("-proxy", "");
     SetLimited(NET_TOR);
     if (proxyArg != "" && proxyArg != "0") {
-        CService resolved;
-        LookupNumeric(proxyArg.c_str(), resolved, 9050);
+        CService resolved(LookupNumeric(proxyArg.c_str(), 9050));
         proxyType addrProxy = proxyType(resolved, proxyRandomize);
         if (!addrProxy.IsValid())
             return InitError(strprintf(_("Invalid -proxy address: '%s'"), proxyArg));
@@ -1119,8 +1118,7 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
         if (onionArg == "0") { // Handle -noonion/-onion=0
             SetLimited(NET_TOR); // set onions as unreachable
         } else {
-            CService resolved;
-            LookupNumeric(onionArg.c_str(), resolved, 9050);
+            CService resolved(LookupNumeric(onionArg.c_str(), 9050));
             proxyType addrOnion = proxyType(resolved, proxyRandomize);
             if (!addrOnion.IsValid())
                 return InitError(strprintf(_("Invalid -onion address: '%s'"), onionArg));
diff --git a/src/net.cpp b/src/net.cpp
index e9bb406e976c5..fc44a0f17cb20 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -1728,8 +1728,7 @@ std::vector<AddedNodeInfo> GetAddedNodeInfo()
     }
 
     BOOST_FOREACH(const std::string& strAddNode, lAddresses) {
-        CService service;
-        LookupNumeric(strAddNode.c_str(), service, Params().GetDefaultPort());
+        CService service(LookupNumeric(strAddNode.c_str(), Params().GetDefaultPort()));
         if (service.IsValid()) {
             // strAddNode is an IP:port
             auto it = mapConnected.find(service);
@@ -1767,8 +1766,7 @@ void ThreadOpenAddedConnections()
                 CSemaphoreGrant grant(*semOutbound);
                 // If strAddedNode is an IP/port, decode it immediately, so
                 // OpenNetworkConnection can detect existing connections to that IP/port.
-                CService service;
-                LookupNumeric(info.strAddedNode.c_str(), service, Params().GetDefaultPort());
+                CService service(LookupNumeric(info.strAddedNode.c_str(), Params().GetDefaultPort()));
                 OpenNetworkConnection(CAddress(service, NODE_NONE), false, &grant, info.strAddedNode.c_str(), false);
                 MilliSleep(500);
             }
diff --git a/src/netbase.cpp b/src/netbase.cpp
index c2294a078da51..4f243ec6f5397 100644
--- a/src/netbase.cpp
+++ b/src/netbase.cpp
@@ -231,9 +231,14 @@ bool Lookup(const char *pszName, CService& addr, int portDefault, bool fAllowLoo
     return true;
 }
 
-bool LookupNumeric(const char *pszName, CService& addr, int portDefault)
+CService LookupNumeric(const char *pszName, int portDefault)
 {
-    return Lookup(pszName, addr, portDefault, false);
+    CService addr;
+    // "1.2:345" will fail to resolve the ip, but will still set the port.
+    // If the ip fails to resolve, re-init the result.
+    if(!Lookup(pszName, addr, portDefault, false))
+        addr = CService();
+    return addr;
 }
 
 struct timeval MillisToTimeval(int64_t nTimeout)
diff --git a/src/netbase.h b/src/netbase.h
index d0abd5e954ef4..bb12019a8216b 100644
--- a/src/netbase.h
+++ b/src/netbase.h
@@ -49,7 +49,7 @@ bool LookupHost(const char *pszName, std::vector<CNetAddr>& vIP, unsigned int nM
 bool LookupHost(const char *pszName, CNetAddr& addr, bool fAllowLookup);
 bool Lookup(const char *pszName, CService& addr, int portDefault, bool fAllowLookup);
 bool Lookup(const char *pszName, std::vector<CService>& vAddr, int portDefault, bool fAllowLookup, unsigned int nMaxSolutions);
-bool LookupNumeric(const char *pszName, CService& addr, int portDefault = 0);
+CService LookupNumeric(const char *pszName, int portDefault = 0);
 bool LookupSubNet(const char *pszName, CSubNet& subnet);
 bool ConnectSocket(const CService &addr, SOCKET& hSocketRet, int nTimeout, bool *outProxyConnectionFailed = 0);
 bool ConnectSocketByName(CService &addr, SOCKET& hSocketRet, const char *pszDest, int portDefault, int nTimeout, bool *outProxyConnectionFailed = 0);
diff --git a/src/qt/optionsdialog.cpp b/src/qt/optionsdialog.cpp
index e419e4d9ee579..f73bb87064088 100644
--- a/src/qt/optionsdialog.cpp
+++ b/src/qt/optionsdialog.cpp
@@ -327,8 +327,7 @@ QValidator::State ProxyAddressValidator::validate(QString &input, int &pos) cons
 {
     Q_UNUSED(pos);
     // Validate the proxy
-    CService serv;
-    LookupNumeric(input.toStdString().c_str(), serv, 9050);
+    CService serv(LookupNumeric(input.toStdString().c_str(), 9050));
     proxyType addrProxy = proxyType(serv, true);
     if (addrProxy.IsValid())
         return QValidator::Acceptable;
diff --git a/src/test/netbase_tests.cpp b/src/test/netbase_tests.cpp
index 7a8584f0f4322..18ad5dc90bf4e 100644
--- a/src/test/netbase_tests.cpp
+++ b/src/test/netbase_tests.cpp
@@ -93,9 +93,7 @@ BOOST_AUTO_TEST_CASE(netbase_splithost)
 
 bool static TestParse(string src, string canon)
 {
-    CService addr;
-    if (!LookupNumeric(src.c_str(), addr, 65535))
-        return canon == "";
+    CService addr(LookupNumeric(src.c_str(), 65535));
     return canon == addr.ToString();
 }
 
@@ -107,7 +105,7 @@ BOOST_AUTO_TEST_CASE(netbase_lookupnumeric)
     BOOST_CHECK(TestParse("::", "[::]:65535"));
     BOOST_CHECK(TestParse("[::]:8333", "[::]:8333"));
     BOOST_CHECK(TestParse("[127.0.0.1]", "127.0.0.1:65535"));
-    BOOST_CHECK(TestParse(":::", ""));
+    BOOST_CHECK(TestParse(":::", "[::]:0"));
 }
 
 BOOST_AUTO_TEST_CASE(onioncat_test)
diff --git a/src/torcontrol.cpp b/src/torcontrol.cpp
index c7f96270050ac..99c45d489cb21 100644
--- a/src/torcontrol.cpp
+++ b/src/torcontrol.cpp
@@ -438,7 +438,7 @@ void TorController::add_onion_cb(TorControlConnection& conn, const TorControlRep
             if ((i = m.find("PrivateKey")) != m.end())
                 private_key = i->second;
         }
-        LookupNumeric(std::string(service_id+".onion").c_str(), service, GetListenPort());
+        service = LookupNumeric(std::string(service_id+".onion").c_str(), GetListenPort());
         LogPrintf("tor: Got service ID %s, advertising service %s\n", service_id, service.ToString());
         if (WriteBinaryFile(GetPrivateKeyFile(), private_key)) {
             LogPrint("tor", "tor: Cached service private key to %s\n", GetPrivateKeyFile());
@@ -462,8 +462,7 @@ void TorController::auth_cb(TorControlConnection& conn, const TorControlReply& r
         // Now that we know Tor is running setup the proxy for onion addresses
         // if -onion isn't set to something else.
         if (GetArg("-onion", "") == "") {
-            CService resolved;
-            assert(LookupNumeric("127.0.0.1", resolved, 9050));
+            CService resolved(LookupNumeric("127.0.0.1", 9050));
             proxyType addrOnion = proxyType(resolved, true);
             SetProxy(NET_TOR, addrOnion);
             SetLimited(NET_TOR, false);

From 65f4532f13a89cacc4909072601d71ee7ebae5c5 Mon Sep 17 00:00:00 2001
From: Jameson Lopp <jameson@bitgo.com>
Date: Thu, 4 Aug 2016 17:33:59 -0400
Subject: [PATCH 0693/1802] document return value of networkhashps for
 getmininginfo RPC endpoint

---
 src/rpc/mining.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/rpc/mining.cpp b/src/rpc/mining.cpp
index 92ca4bab6bc1e..3214e724bbef1 100644
--- a/src/rpc/mining.cpp
+++ b/src/rpc/mining.cpp
@@ -227,10 +227,11 @@ UniValue getmininginfo(const UniValue& params, bool fHelp)
             "  \"currentblockweight\": nnn, (numeric) The last block weight\n"
             "  \"currentblocktx\": nnn,     (numeric) The last block transaction\n"
             "  \"difficulty\": xxx.xxxxx    (numeric) The current difficulty\n"
-            "  \"errors\": \"...\"          (string) Current errors\n"
+            "  \"errors\": \"...\"            (string) Current errors\n"
+            "  \"networkhashps\": nnn,      (numeric) The network hashes per second\n"
             "  \"pooledtx\": n              (numeric) The size of the mem pool\n"
             "  \"testnet\": true|false      (boolean) If using testnet or not\n"
-            "  \"chain\": \"xxxx\",         (string) current network name as defined in BIP70 (main, test, regtest)\n"
+            "  \"chain\": \"xxxx\",           (string) current network name as defined in BIP70 (main, test, regtest)\n"
             "}\n"
             "\nExamples:\n"
             + HelpExampleCli("getmininginfo", "")

From f13c1bae529cd6e45b4e4b1768a6ab953870fd29 Mon Sep 17 00:00:00 2001
From: Michael Rotarius <michael-rotarius@rotamedia.de>
Date: Fri, 5 Aug 2016 18:34:32 +0200
Subject: [PATCH 0694/1802] Move AdvertiseLocal debug output to net category

---
 src/main.cpp | 4 ++--
 src/net.cpp  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index 3a07190a6210f..0f7a9e55b39b4 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -4999,11 +4999,11 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
                 CAddress addr = GetLocalAddress(&pfrom->addr);
                 if (addr.IsRoutable())
                 {
-                    LogPrintf("ProcessMessages: advertising address %s\n", addr.ToString());
+                    LogPrint("net", "ProcessMessages: advertising address %s\n", addr.ToString());
                     pfrom->PushAddress(addr);
                 } else if (IsPeerAddrLocalGood(pfrom)) {
                     addr.SetIP(pfrom->addrLocal);
-                    LogPrintf("ProcessMessages: advertising address %s\n", addr.ToString());
+                    LogPrint("net", "ProcessMessages: advertising address %s\n", addr.ToString());
                     pfrom->PushAddress(addr);
                 }
             }
diff --git a/src/net.cpp b/src/net.cpp
index 4bbe5059df188..c159198ac6f7f 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -216,7 +216,7 @@ void AdvertiseLocal(CNode *pnode)
         }
         if (addrLocal.IsRoutable())
         {
-            LogPrintf("AdvertiseLocal: advertising address %s\n", addrLocal.ToString());
+            LogPrint("net", "AdvertiseLocal: advertising address %s\n", addrLocal.ToString());
             pnode->PushAddress(addrLocal);
         }
     }

From a159f25e19b8d921e30742f5ba87ef12803d991d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pavel=20Jan=C3=ADk?= <Pavel@Janik.cz>
Date: Fri, 5 Aug 2016 20:03:01 +0200
Subject: [PATCH 0695/1802] Remove redundand (and shadowing) declaration

---
 src/test/blockencodings_tests.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/test/blockencodings_tests.cpp b/src/test/blockencodings_tests.cpp
index 3884bf3fe37c3..d2392cfb22f0d 100644
--- a/src/test/blockencodings_tests.cpp
+++ b/src/test/blockencodings_tests.cpp
@@ -283,7 +283,6 @@ BOOST_AUTO_TEST_CASE(EmptyBlockRoundTripTest)
         std::vector<CTransaction> vtx_missing;
         BOOST_CHECK(partialBlock.FillBlock(block2, vtx_missing) == READ_STATUS_OK);
         BOOST_CHECK_EQUAL(block.GetHash().ToString(), block2.GetHash().ToString());
-        bool mutated;
         BOOST_CHECK_EQUAL(block.hashMerkleRoot.ToString(), BlockMerkleRoot(block2, &mutated).ToString());
         BOOST_CHECK(!mutated);
     }

From 4a35e0f34c0d1c2bbcae6d7b6d691fb0df946dfe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pavel=20Jan=C3=ADk?= <Pavel@Janik.cz>
Date: Fri, 5 Aug 2016 21:17:50 +0200
Subject: [PATCH 0696/1802] Do not shadow members in dbwrapper

---
 src/dbwrapper.h | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/dbwrapper.h b/src/dbwrapper.h
index a0779d3ab9918..47bdb31b5b888 100644
--- a/src/dbwrapper.h
+++ b/src/dbwrapper.h
@@ -52,9 +52,9 @@ class CDBBatch
 
 public:
     /**
-     * @param[in] parent    CDBWrapper that this batch is to be submitted to
+     * @param[in] _parent   CDBWrapper that this batch is to be submitted to
      */
-    CDBBatch(const CDBWrapper &parent) : parent(parent) { };
+    CDBBatch(const CDBWrapper &_parent) : parent(_parent) { };
 
     template <typename K, typename V>
     void Write(const K& key, const V& value)
@@ -94,11 +94,11 @@ class CDBIterator
 public:
 
     /**
-     * @param[in] parent           Parent CDBWrapper instance.
-     * @param[in] piterIn          The original leveldb iterator.
+     * @param[in] _parent          Parent CDBWrapper instance.
+     * @param[in] _piter           The original leveldb iterator.
      */
-    CDBIterator(const CDBWrapper &parent, leveldb::Iterator *piterIn) :
-        parent(parent), piter(piterIn) { };
+    CDBIterator(const CDBWrapper &_parent, leveldb::Iterator *_piter) :
+        parent(_parent), piter(_piter) { };
     ~CDBIterator();
 
     bool Valid();

From 33d15a3a76d073986337adcd62646d93e7ba223f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pavel=20Jan=C3=ADk?= <Pavel@Janik.cz>
Date: Sat, 6 Aug 2016 10:54:29 +0200
Subject: [PATCH 0697/1802] Do not shadow LOCK's criticalblock variable for
 LOCK inside LOCK

---
 src/sync.h | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/sync.h b/src/sync.h
index 0c58fb6b4e94c..77339107494eb 100644
--- a/src/sync.h
+++ b/src/sync.h
@@ -171,7 +171,10 @@ class SCOPED_LOCKABLE CMutexLock
 
 typedef CMutexLock<CCriticalSection> CCriticalBlock;
 
-#define LOCK(cs) CCriticalBlock criticalblock(cs, #cs, __FILE__, __LINE__)
+#define PASTE(x, y) x ## y
+#define PASTE2(x, y) PASTE(x, y)
+
+#define LOCK(cs) CCriticalBlock PASTE2(criticalblock, __COUNTER__)(cs, #cs, __FILE__, __LINE__)
 #define LOCK2(cs1, cs2) CCriticalBlock criticalblock1(cs1, #cs1, __FILE__, __LINE__), criticalblock2(cs2, #cs2, __FILE__, __LINE__)
 #define TRY_LOCK(cs, name) CCriticalBlock name(cs, #cs, __FILE__, __LINE__, true)
 

From 05242e937d3fc0144029ccf3b14f98662400dd60 Mon Sep 17 00:00:00 2001
From: adlawren <adlawren010@gmail.com>
Date: Sat, 6 Aug 2016 23:58:30 -0700
Subject: [PATCH 0698/1802] Fix minimize and close bugs

refs #8225

To ensure the GUI closes when the "Minimize on close" window option is disabled, and the "Minimize to the tray instead of the taskbar" window option is enbaled, remove a check made against the "Minimize to the tray instead of the taskbar" value, made during GUI closure.

To ensure the GUI minimizes to the taskbar when the "Minimize on close" window option is enabled, and the "Minimize to the tray instead of the taskbar" window option is disabled, minimize the GUI and ignore the closure event.
---
 src/qt/bitcoingui.cpp | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp
index 9042e3b56a3b8..2afefb733edcf 100644
--- a/src/qt/bitcoingui.cpp
+++ b/src/qt/bitcoingui.cpp
@@ -902,17 +902,22 @@ void BitcoinGUI::closeEvent(QCloseEvent *event)
 #ifndef Q_OS_MAC // Ignored on Mac
     if(clientModel && clientModel->getOptionsModel())
     {
-        if(!clientModel->getOptionsModel()->getMinimizeToTray() &&
-           !clientModel->getOptionsModel()->getMinimizeOnClose())
+        if(!clientModel->getOptionsModel()->getMinimizeOnClose())
         {
             // close rpcConsole in case it was open to make some space for the shutdown window
             rpcConsole->close();
 
             QApplication::quit();
         }
+        else
+        {
+            QMainWindow::showMinimized();
+            event->ignore();
+        }
     }
-#endif
+#else
     QMainWindow::closeEvent(event);
+#endif
 }
 
 void BitcoinGUI::showEvent(QShowEvent *event)

From fa2d68f79c459b505652728c3d8da60679f98ae3 Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Fri, 8 Jul 2016 17:59:06 +0200
Subject: [PATCH 0699/1802] [qa] Adjust timeouts for micro-optimization of run
 time

---
 qa/rpc-tests/test_framework/util.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/qa/rpc-tests/test_framework/util.py b/qa/rpc-tests/test_framework/util.py
index 32fe79efc38be..31fa19dd33a63 100644
--- a/qa/rpc-tests/test_framework/util.py
+++ b/qa/rpc-tests/test_framework/util.py
@@ -121,7 +121,7 @@ def hex_str_to_bytes(hex_str):
 def str_to_b64str(string):
     return b64encode(string.encode('utf-8')).decode('ascii')
 
-def sync_blocks(rpc_connections, wait=1, timeout=60):
+def sync_blocks(rpc_connections, wait=0.125, timeout=60):
     """
     Wait until everybody has the same tip
     """
@@ -133,7 +133,7 @@ def sync_blocks(rpc_connections, wait=1, timeout=60):
         timeout -= wait
     raise AssertionError("Block sync failed")
 
-def sync_mempools(rpc_connections, wait=1, timeout=60):
+def sync_mempools(rpc_connections, wait=0.5, timeout=60):
     """
     Wait until everybody has the same transactions in their memory
     pools

From fad8cf63e5f6a2e26b44dbf2bbdd7df901c4e6f4 Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Sun, 7 Aug 2016 23:06:27 +0200
Subject: [PATCH 0700/1802] [qa] Use single cache dir for chains

---
 .gitignore                                    |  3 +--
 qa/pull-tester/rpc-tests.py                   |  1 +
 qa/rpc-tests/test_framework/test_framework.py |  4 +++-
 qa/rpc-tests/test_framework/util.py           | 20 +++++++++----------
 4 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/.gitignore b/.gitignore
index ce40019dc314f..892b2a3e08e0c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -103,10 +103,9 @@ linux-build
 win32-build
 qa/pull-tester/run-bitcoind-for-test.sh
 qa/pull-tester/tests_config.py
-qa/pull-tester/cache/*
 qa/pull-tester/test.*/*
 qa/tmp
-cache/
+qa/cache/*
 share/BitcoindComparisonTool.jar
 
 !src/leveldb*/Makefile
diff --git a/qa/pull-tester/rpc-tests.py b/qa/pull-tester/rpc-tests.py
index 2aa131041a02b..05b41ae989162 100755
--- a/qa/pull-tester/rpc-tests.py
+++ b/qa/pull-tester/rpc-tests.py
@@ -192,6 +192,7 @@ def runtests():
         coverage = RPCCoverage()
         print("Initializing coverage directory at %s\n" % coverage.dir)
     flags = ["--srcdir=%s/src" % BUILDDIR] + passon_args
+    flags.append("--cachedir=%s/qa/cache" % BUILDDIR)
     if coverage:
         flags.append(coverage.flag)
 
diff --git a/qa/rpc-tests/test_framework/test_framework.py b/qa/rpc-tests/test_framework/test_framework.py
index 30e8b5755de39..ced9521234062 100755
--- a/qa/rpc-tests/test_framework/test_framework.py
+++ b/qa/rpc-tests/test_framework/test_framework.py
@@ -47,7 +47,7 @@ def setup_chain(self):
         if self.setup_clean_chain:
             initialize_chain_clean(self.options.tmpdir, self.num_nodes)
         else:
-            initialize_chain(self.options.tmpdir, self.num_nodes)
+            initialize_chain(self.options.tmpdir, self.num_nodes, self.options.cachedir)
 
     def setup_nodes(self):
         return start_nodes(self.num_nodes, self.options.tmpdir)
@@ -108,6 +108,8 @@ def main(self):
                           help="Don't stop bitcoinds after the test execution")
         parser.add_option("--srcdir", dest="srcdir", default=os.path.normpath(os.path.dirname(os.path.realpath(__file__))+"/../../../src"),
                           help="Source directory containing bitcoind/bitcoin-cli (default: %default)")
+        parser.add_option("--cachedir", dest="cachedir", default=os.path.normpath(os.path.dirname(os.path.realpath(__file__))+"/../../cache"),
+                          help="Directory for caching pregenerated datadirs")
         parser.add_option("--tmpdir", dest="tmpdir", default=tempfile.mkdtemp(prefix="test"),
                           help="Root directory for datadirs")
         parser.add_option("--tracerpc", dest="trace_rpc", default=False, action="store_true",
diff --git a/qa/rpc-tests/test_framework/util.py b/qa/rpc-tests/test_framework/util.py
index 31fa19dd33a63..3e10f13bb317e 100644
--- a/qa/rpc-tests/test_framework/util.py
+++ b/qa/rpc-tests/test_framework/util.py
@@ -193,7 +193,7 @@ def wait_for_bitcoind_start(process, url, i):
                 raise # unkown JSON RPC exception
         time.sleep(0.25)
 
-def initialize_chain(test_dir, num_nodes):
+def initialize_chain(test_dir, num_nodes, cachedir):
     """
     Create a cache of a 200-block-long chain (with wallet) for MAX_NODES
     Afterward, create num_nodes copies from the cache
@@ -202,7 +202,7 @@ def initialize_chain(test_dir, num_nodes):
     assert num_nodes <= MAX_NODES
     create_cache = False
     for i in range(MAX_NODES):
-        if not os.path.isdir(os.path.join('cache', 'node'+str(i))):
+        if not os.path.isdir(os.path.join(cachedir, 'node'+str(i))):
             create_cache = True
             break
 
@@ -210,12 +210,12 @@ def initialize_chain(test_dir, num_nodes):
 
         #find and delete old cache directories if any exist
         for i in range(MAX_NODES):
-            if os.path.isdir(os.path.join("cache","node"+str(i))):
-                shutil.rmtree(os.path.join("cache","node"+str(i)))
+            if os.path.isdir(os.path.join(cachedir,"node"+str(i))):
+                shutil.rmtree(os.path.join(cachedir,"node"+str(i)))
 
         # Create cache directories, run bitcoinds:
         for i in range(MAX_NODES):
-            datadir=initialize_datadir("cache", i)
+            datadir=initialize_datadir(cachedir, i)
             args = [ os.getenv("BITCOIND", "bitcoind"), "-server", "-keypool=1", "-datadir="+datadir, "-discover=0" ]
             if i > 0:
                 args.append("-connect=127.0.0.1:"+str(p2p_port(0)))
@@ -257,13 +257,13 @@ def initialize_chain(test_dir, num_nodes):
         wait_bitcoinds()
         disable_mocktime()
         for i in range(MAX_NODES):
-            os.remove(log_filename("cache", i, "debug.log"))
-            os.remove(log_filename("cache", i, "db.log"))
-            os.remove(log_filename("cache", i, "peers.dat"))
-            os.remove(log_filename("cache", i, "fee_estimates.dat"))
+            os.remove(log_filename(cachedir, i, "debug.log"))
+            os.remove(log_filename(cachedir, i, "db.log"))
+            os.remove(log_filename(cachedir, i, "peers.dat"))
+            os.remove(log_filename(cachedir, i, "fee_estimates.dat"))
 
     for i in range(num_nodes):
-        from_dir = os.path.join("cache", "node"+str(i))
+        from_dir = os.path.join(cachedir, "node"+str(i))
         to_dir = os.path.join(test_dir,  "node"+str(i))
         shutil.copytree(from_dir, to_dir)
         initialize_datadir(test_dir, i) # Overwrite port/rpcport in bitcoin.conf

From 25400c4de18fe63a0b1051cc158b62f6c8c7ba90 Mon Sep 17 00:00:00 2001
From: Patrick Strateman <patrick.strateman@gmail.com>
Date: Wed, 3 Aug 2016 19:28:39 -0700
Subject: [PATCH 0701/1802] Account wallet feature RPC tests.

---
 qa/pull-tester/rpc-tests.py     |  1 +
 qa/rpc-tests/wallet-accounts.py | 94 +++++++++++++++++++++++++++++++++
 2 files changed, 95 insertions(+)
 create mode 100755 qa/rpc-tests/wallet-accounts.py

diff --git a/qa/pull-tester/rpc-tests.py b/qa/pull-tester/rpc-tests.py
index f65a3eefc3937..ed509463435c1 100755
--- a/qa/pull-tester/rpc-tests.py
+++ b/qa/pull-tester/rpc-tests.py
@@ -106,6 +106,7 @@
     'walletbackup.py',
     'bip68-112-113-p2p.py',
     'wallet.py',
+    'wallet-accounts.py',
     'wallet-hd.py',
     'wallet-dump.py',
     'listtransactions.py',
diff --git a/qa/rpc-tests/wallet-accounts.py b/qa/rpc-tests/wallet-accounts.py
new file mode 100755
index 0000000000000..c51181e4f8e9b
--- /dev/null
+++ b/qa/rpc-tests/wallet-accounts.py
@@ -0,0 +1,94 @@
+#!/usr/bin/env python3
+# Copyright (c) 2016 The Bitcoin Core developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+from test_framework.test_framework import BitcoinTestFramework
+from test_framework.util import (
+    start_nodes,
+    start_node,
+    assert_equal,
+    connect_nodes_bi,
+)
+
+
+class WalletAccountsTest(BitcoinTestFramework):
+
+    def __init__(self):
+        super().__init__()
+        self.setup_clean_chain = True
+        self.num_nodes = 1
+        self.node_args = [[]]
+
+    def setup_network(self):
+        self.nodes = start_nodes(self.num_nodes, self.options.tmpdir, self.node_args)
+        self.is_network_split = False
+
+    def run_test (self):
+        node = self.nodes[0]
+        # Check that there's no UTXO on any of the nodes
+        assert_equal(len(node.listunspent()), 0)
+        
+        node.generate(101)
+        
+        assert_equal(node.getbalance(), 50)
+        
+        accounts = ["a","b","c","d","e"]
+        amount_to_send = 1.0
+        account_addresses = dict()
+        for account in accounts:
+            address = node.getaccountaddress(account)
+            account_addresses[account] = address
+            
+            node.getnewaddress(account)
+            assert_equal(node.getaccount(address), account)
+            assert(address in node.getaddressesbyaccount(account))
+            
+            node.sendfrom("", address, amount_to_send)
+        
+        node.generate(1)
+        
+        for i in range(len(accounts)):
+            from_account = accounts[i]
+            to_account = accounts[(i+1)%len(accounts)]
+            to_address = account_addresses[to_account]
+            node.sendfrom(from_account, to_address, amount_to_send)
+        
+        node.generate(1)
+        
+        for account in accounts:
+            address = node.getaccountaddress(account)
+            assert(address != account_addresses[account])
+            assert_equal(node.getreceivedbyaccount(account), 2)
+            node.move(account, "", node.getbalance(account))
+        
+        node.generate(101)
+        
+        expected_account_balances = {"": 5200}
+        for account in accounts:
+            expected_account_balances[account] = 0
+        
+        assert_equal(node.listaccounts(), expected_account_balances)
+        
+        assert_equal(node.getbalance(""), 5200)
+        
+        for account in accounts:
+            address = node.getaccountaddress("")
+            node.setaccount(address, account)
+            assert(address in node.getaddressesbyaccount(account))
+            assert(address not in node.getaddressesbyaccount(""))
+        
+        for account in accounts:
+            addresses = []
+            for x in range(10):
+                addresses.append(node.getnewaddress())
+            multisig_address = node.addmultisigaddress(5, addresses, account)
+            node.sendfrom("", multisig_address, 50)
+        
+        node.generate(101)
+        
+        for account in accounts:
+            assert_equal(node.getbalance(account), 50)
+
+if __name__ == '__main__':
+    WalletAccountsTest().main ()

From 9578333ec456bbfaccfecf9ea561c421f3a5d547 Mon Sep 17 00:00:00 2001
From: Patrick Strateman <patrick.strateman@gmail.com>
Date: Wed, 3 Aug 2016 16:37:02 -0700
Subject: [PATCH 0702/1802] Remove rpc_wallet_tests.cpp

---
 src/Makefile.test.include            |   3 +-
 src/wallet/test/rpc_wallet_tests.cpp | 229 ---------------------------
 2 files changed, 1 insertion(+), 231 deletions(-)
 delete mode 100644 src/wallet/test/rpc_wallet_tests.cpp

diff --git a/src/Makefile.test.include b/src/Makefile.test.include
index 27e7694748c2a..0748d1a39d232 100644
--- a/src/Makefile.test.include
+++ b/src/Makefile.test.include
@@ -97,8 +97,7 @@ BITCOIN_TESTS += \
   wallet/test/wallet_test_fixture.h \
   wallet/test/accounting_tests.cpp \
   wallet/test/wallet_tests.cpp \
-  wallet/test/crypto_tests.cpp \
-  wallet/test/rpc_wallet_tests.cpp
+  wallet/test/crypto_tests.cpp
 endif
 
 test_test_bitcoin_SOURCES = $(BITCOIN_TESTS) $(JSON_TEST_FILES) $(RAW_TEST_FILES)
diff --git a/src/wallet/test/rpc_wallet_tests.cpp b/src/wallet/test/rpc_wallet_tests.cpp
deleted file mode 100644
index 4e7d177f51855..0000000000000
--- a/src/wallet/test/rpc_wallet_tests.cpp
+++ /dev/null
@@ -1,229 +0,0 @@
-// Copyright (c) 2013-2015 The Bitcoin Core developers
-// Distributed under the MIT software license, see the accompanying
-// file COPYING or http://www.opensource.org/licenses/mit-license.php.
-
-#include "rpc/server.h"
-#include "rpc/client.h"
-
-#include "base58.h"
-#include "main.h"
-#include "wallet/wallet.h"
-
-#include "wallet/test/wallet_test_fixture.h"
-
-#include <boost/algorithm/string.hpp>
-#include <boost/test/unit_test.hpp>
-
-#include <univalue.h>
-
-using namespace std;
-
-extern UniValue createArgs(int nRequired, const char* address1 = NULL, const char* address2 = NULL);
-extern UniValue CallRPC(string args);
-
-extern CWallet* pwalletMain;
-
-BOOST_FIXTURE_TEST_SUITE(rpc_wallet_tests, WalletTestingSetup)
-
-BOOST_AUTO_TEST_CASE(rpc_addmultisig)
-{
-    rpcfn_type addmultisig = tableRPC["addmultisigaddress"]->actor;
-
-    // old, 65-byte-long:
-    const char address1Hex[] = "0434e3e09f49ea168c5bbf53f877ff4206923858aab7c7e1df25bc263978107c95e35065a27ef6f1b27222db0ec97e0e895eaca603d3ee0d4c060ce3d8a00286c8";
-    // new, compressed:
-    const char address2Hex[] = "0388c2037017c62240b6b72ac1a2a5f94da790596ebd06177c8572752922165cb4";
-
-    UniValue v;
-    CBitcoinAddress address;
-    BOOST_CHECK_NO_THROW(v = addmultisig(createArgs(1, address1Hex), false));
-    address.SetString(v.get_str());
-    BOOST_CHECK(address.IsValid() && address.IsScript());
-
-    BOOST_CHECK_NO_THROW(v = addmultisig(createArgs(1, address1Hex, address2Hex), false));
-    address.SetString(v.get_str());
-    BOOST_CHECK(address.IsValid() && address.IsScript());
-
-    BOOST_CHECK_NO_THROW(v = addmultisig(createArgs(2, address1Hex, address2Hex), false));
-    address.SetString(v.get_str());
-    BOOST_CHECK(address.IsValid() && address.IsScript());
-
-    BOOST_CHECK_THROW(addmultisig(createArgs(0), false), runtime_error);
-    BOOST_CHECK_THROW(addmultisig(createArgs(1), false), runtime_error);
-    BOOST_CHECK_THROW(addmultisig(createArgs(2, address1Hex), false), runtime_error);
-
-    BOOST_CHECK_THROW(addmultisig(createArgs(1, ""), false), runtime_error);
-    BOOST_CHECK_THROW(addmultisig(createArgs(1, "NotAValidPubkey"), false), runtime_error);
-
-    string short1(address1Hex, address1Hex + sizeof(address1Hex) - 2); // last byte missing
-    BOOST_CHECK_THROW(addmultisig(createArgs(2, short1.c_str()), false), runtime_error);
-
-    string short2(address1Hex + 1, address1Hex + sizeof(address1Hex)); // first byte missing
-    BOOST_CHECK_THROW(addmultisig(createArgs(2, short2.c_str()), false), runtime_error);
-}
-
-BOOST_AUTO_TEST_CASE(rpc_wallet)
-{
-    // Test RPC calls for various wallet statistics
-    UniValue r;
-    CPubKey demoPubkey;
-    CBitcoinAddress demoAddress;
-    UniValue retValue;
-    string strAccount = "walletDemoAccount";
-    CBitcoinAddress setaccountDemoAddress;
-    {
-        LOCK(pwalletMain->cs_wallet);
-
-        demoPubkey = pwalletMain->GenerateNewKey();
-        demoAddress = CBitcoinAddress(CTxDestination(demoPubkey.GetID()));
-        string strPurpose = "receive";
-        BOOST_CHECK_NO_THROW({ /*Initialize Wallet with an account */
-            CWalletDB walletdb(pwalletMain->strWalletFile);
-            CAccount account;
-            account.vchPubKey = demoPubkey;
-            pwalletMain->SetAddressBook(account.vchPubKey.GetID(), strAccount, strPurpose);
-            walletdb.WriteAccount(strAccount, account);
-        });
-
-        CPubKey setaccountDemoPubkey = pwalletMain->GenerateNewKey();
-        setaccountDemoAddress = CBitcoinAddress(CTxDestination(setaccountDemoPubkey.GetID()));
-    }
-    /*********************************
-     * 			setaccount
-     *********************************/
-    BOOST_CHECK_NO_THROW(CallRPC("setaccount " + setaccountDemoAddress.ToString() + " nullaccount"));
-    /* 1D1ZrZNe3JUo7ZycKEYQQiQAWd9y54F4XZ is not owned by the test wallet. */
-    BOOST_CHECK_THROW(CallRPC("setaccount 1D1ZrZNe3JUo7ZycKEYQQiQAWd9y54F4XZ nullaccount"), runtime_error);
-    BOOST_CHECK_THROW(CallRPC("setaccount"), runtime_error);
-    /* 1D1ZrZNe3JUo7ZycKEYQQiQAWd9y54F4X (33 chars) is an illegal address (should be 34 chars) */
-    BOOST_CHECK_THROW(CallRPC("setaccount 1D1ZrZNe3JUo7ZycKEYQQiQAWd9y54F4X nullaccount"), runtime_error);
-
-
-    /*********************************
-     *                  getbalance
-     *********************************/
-    BOOST_CHECK_NO_THROW(CallRPC("getbalance"));
-    BOOST_CHECK_NO_THROW(CallRPC("getbalance " + demoAddress.ToString()));
-
-    /*********************************
-     * 			listunspent
-     *********************************/
-    BOOST_CHECK_NO_THROW(CallRPC("listunspent"));
-    BOOST_CHECK_THROW(CallRPC("listunspent string"), runtime_error);
-    BOOST_CHECK_THROW(CallRPC("listunspent 0 string"), runtime_error);
-    BOOST_CHECK_THROW(CallRPC("listunspent 0 1 not_array"), runtime_error);
-    BOOST_CHECK_THROW(CallRPC("listunspent 0 1 [] extra"), runtime_error);
-    BOOST_CHECK_NO_THROW(r = CallRPC("listunspent 0 1 []"));
-    BOOST_CHECK(r.get_array().empty());
-
-    /*********************************
-     * 		listreceivedbyaddress
-     *********************************/
-    BOOST_CHECK_NO_THROW(CallRPC("listreceivedbyaddress"));
-    BOOST_CHECK_NO_THROW(CallRPC("listreceivedbyaddress 0"));
-    BOOST_CHECK_THROW(CallRPC("listreceivedbyaddress not_int"), runtime_error);
-    BOOST_CHECK_THROW(CallRPC("listreceivedbyaddress 0 not_bool"), runtime_error);
-    BOOST_CHECK_NO_THROW(CallRPC("listreceivedbyaddress 0 true"));
-    BOOST_CHECK_THROW(CallRPC("listreceivedbyaddress 0 true extra"), runtime_error);
-
-    /*********************************
-     * 		listreceivedbyaccount
-     *********************************/
-    BOOST_CHECK_NO_THROW(CallRPC("listreceivedbyaccount"));
-    BOOST_CHECK_NO_THROW(CallRPC("listreceivedbyaccount 0"));
-    BOOST_CHECK_THROW(CallRPC("listreceivedbyaccount not_int"), runtime_error);
-    BOOST_CHECK_THROW(CallRPC("listreceivedbyaccount 0 not_bool"), runtime_error);
-    BOOST_CHECK_NO_THROW(CallRPC("listreceivedbyaccount 0 true"));
-    BOOST_CHECK_THROW(CallRPC("listreceivedbyaccount 0 true extra"), runtime_error);
-
-    /*********************************
-     *          listsinceblock
-     *********************************/
-    BOOST_CHECK_NO_THROW(CallRPC("listsinceblock"));
-
-    /*********************************
-     *          listtransactions
-     *********************************/
-    BOOST_CHECK_NO_THROW(CallRPC("listtransactions"));
-    BOOST_CHECK_NO_THROW(CallRPC("listtransactions " + demoAddress.ToString()));
-    BOOST_CHECK_NO_THROW(CallRPC("listtransactions " + demoAddress.ToString() + " 20"));
-    BOOST_CHECK_NO_THROW(CallRPC("listtransactions " + demoAddress.ToString() + " 20 0"));
-    BOOST_CHECK_THROW(CallRPC("listtransactions " + demoAddress.ToString() + " not_int"), runtime_error);
-
-    /*********************************
-     *          listlockunspent
-     *********************************/
-    BOOST_CHECK_NO_THROW(CallRPC("listlockunspent"));
-
-    /*********************************
-     *          listaccounts
-     *********************************/
-    BOOST_CHECK_NO_THROW(CallRPC("listaccounts"));
-
-    /*********************************
-     *          listaddressgroupings
-     *********************************/
-    BOOST_CHECK_NO_THROW(CallRPC("listaddressgroupings"));
-
-    /*********************************
-     * 		getrawchangeaddress
-     *********************************/
-    BOOST_CHECK_NO_THROW(CallRPC("getrawchangeaddress"));
-
-    /*********************************
-     * 		getnewaddress
-     *********************************/
-    BOOST_CHECK_NO_THROW(CallRPC("getnewaddress"));
-    BOOST_CHECK_NO_THROW(CallRPC("getnewaddress getnewaddress_demoaccount"));
-
-    /*********************************
-     * 		getaccountaddress
-     *********************************/
-    BOOST_CHECK_NO_THROW(CallRPC("getaccountaddress \"\""));
-    BOOST_CHECK_NO_THROW(CallRPC("getaccountaddress accountThatDoesntExists")); // Should generate a new account
-    BOOST_CHECK_NO_THROW(retValue = CallRPC("getaccountaddress " + strAccount));
-    BOOST_CHECK(CBitcoinAddress(retValue.get_str()).Get() == demoAddress.Get());
-
-    /*********************************
-     * 			getaccount
-     *********************************/
-    BOOST_CHECK_THROW(CallRPC("getaccount"), runtime_error);
-    BOOST_CHECK_NO_THROW(CallRPC("getaccount " + demoAddress.ToString()));
-
-    /*********************************
-     * 	signmessage + verifymessage
-     *********************************/
-    BOOST_CHECK_NO_THROW(retValue = CallRPC("signmessage " + demoAddress.ToString() + " mymessage"));
-    BOOST_CHECK_THROW(CallRPC("signmessage"), runtime_error);
-    /* Should throw error because this address is not loaded in the wallet */
-    BOOST_CHECK_THROW(CallRPC("signmessage 1QFqqMUD55ZV3PJEJZtaKCsQmjLT6JkjvJ mymessage"), runtime_error);
-
-    /* missing arguments */
-    BOOST_CHECK_THROW(CallRPC("verifymessage " + demoAddress.ToString()), runtime_error);
-    BOOST_CHECK_THROW(CallRPC("verifymessage " + demoAddress.ToString() + " " + retValue.get_str()), runtime_error);
-    /* Illegal address */
-    BOOST_CHECK_THROW(CallRPC("verifymessage 1D1ZrZNe3JUo7ZycKEYQQiQAWd9y54F4X " + retValue.get_str() + " mymessage"), runtime_error);
-    /* wrong address */
-    BOOST_CHECK(CallRPC("verifymessage 1D1ZrZNe3JUo7ZycKEYQQiQAWd9y54F4XZ " + retValue.get_str() + " mymessage").get_bool() == false);
-    /* Correct address and signature but wrong message */
-    BOOST_CHECK(CallRPC("verifymessage " + demoAddress.ToString() + " " + retValue.get_str() + " wrongmessage").get_bool() == false);
-    /* Correct address, message and signature*/
-    BOOST_CHECK(CallRPC("verifymessage " + demoAddress.ToString() + " " + retValue.get_str() + " mymessage").get_bool() == true);
-
-    /*********************************
-     * 		getaddressesbyaccount
-     *********************************/
-    BOOST_CHECK_THROW(CallRPC("getaddressesbyaccount"), runtime_error);
-    BOOST_CHECK_NO_THROW(retValue = CallRPC("getaddressesbyaccount " + strAccount));
-    UniValue arr = retValue.get_array();
-    BOOST_CHECK(arr.size() > 0);
-    BOOST_CHECK(CBitcoinAddress(arr[0].get_str()).Get() == demoAddress.Get());
-
-    /*********************************
-     * 	     fundrawtransaction
-     *********************************/
-    BOOST_CHECK_THROW(CallRPC("fundrawtransaction 28z"), runtime_error);
-    BOOST_CHECK_THROW(CallRPC("fundrawtransaction 01000000000180969800000000001976a91450ce0a4b0ee0ddeb633da85199728b940ac3fe9488ac00000000"), runtime_error);
-}
-
-BOOST_AUTO_TEST_SUITE_END()

From 160f895a80660e4e3904a2624e4110960d051902 Mon Sep 17 00:00:00 2001
From: Luke Dashjr <luke-jr+git@utopios.org>
Date: Mon, 8 Aug 2016 21:16:40 +0000
Subject: [PATCH 0703/1802] Bugfix: Use pre-BIP141 sigops until segwit
 activates

---
 src/rpc/mining.cpp | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/rpc/mining.cpp b/src/rpc/mining.cpp
index 92ca4bab6bc1e..2479e5d5953d2 100644
--- a/src/rpc/mining.cpp
+++ b/src/rpc/mining.cpp
@@ -546,6 +546,9 @@ UniValue getblocktemplate(const UniValue& params, bool fHelp)
     UpdateTime(pblock, consensusParams, pindexPrev);
     pblock->nNonce = 0;
 
+    // NOTE: If at some point we support pre-segwit miners post-segwit-activation, this needs to take segwit support into consideration
+    const bool fPreSegWit = (THRESHOLD_ACTIVE != VersionBitsState(pindexPrev, consensusParams, Consensus::DEPLOYMENT_SEGWIT, versionbitscache));
+
     UniValue aCaps(UniValue::VARR); aCaps.push_back("proposal");
 
     UniValue transactions(UniValue::VARR);
@@ -574,7 +577,12 @@ UniValue getblocktemplate(const UniValue& params, bool fHelp)
 
         int index_in_template = i - 1;
         entry.push_back(Pair("fee", pblocktemplate->vTxFees[index_in_template]));
-        entry.push_back(Pair("sigops", pblocktemplate->vTxSigOpsCost[index_in_template]));
+        int64_t nTxSigOps = pblocktemplate->vTxSigOpsCost[index_in_template];
+        if (fPreSegWit) {
+            assert(nTxSigOps % WITNESS_SCALE_FACTOR == 0);
+            nTxSigOps /= WITNESS_SCALE_FACTOR;
+        }
+        entry.push_back(Pair("sigops", nTxSigOps));
         entry.push_back(Pair("weight", GetTransactionWeight(tx)));
 
         transactions.push_back(entry);
@@ -657,7 +665,12 @@ UniValue getblocktemplate(const UniValue& params, bool fHelp)
     result.push_back(Pair("mintime", (int64_t)pindexPrev->GetMedianTimePast()+1));
     result.push_back(Pair("mutable", aMutable));
     result.push_back(Pair("noncerange", "00000000ffffffff"));
-    result.push_back(Pair("sigoplimit", (int64_t)MAX_BLOCK_SIGOPS_COST));
+    int64_t nSigOpLimit = MAX_BLOCK_SIGOPS_COST;
+    if (fPreSegWit) {
+        assert(nSigOpLimit % WITNESS_SCALE_FACTOR == 0);
+        nSigOpLimit /= WITNESS_SCALE_FACTOR;
+    }
+    result.push_back(Pair("sigoplimit", nSigOpLimit));
     result.push_back(Pair("sizelimit", (int64_t)MAX_BLOCK_SERIALIZED_SIZE));
     result.push_back(Pair("weightlimit", (int64_t)MAX_BLOCK_WEIGHT));
     result.push_back(Pair("curtime", pblock->GetBlockTime()));

From 239cbd2e5c2a36843b45b356e9aea6e8d35f0968 Mon Sep 17 00:00:00 2001
From: Luke Dashjr <luke-jr+git@utopios.org>
Date: Mon, 8 Aug 2016 21:58:36 +0000
Subject: [PATCH 0704/1802] qa/rpc-tests/segwit: Test GBT sigops before and
 after activation

---
 qa/rpc-tests/segwit.py | 52 ++++++++++++++++++++++++++++++++++++------
 1 file changed, 45 insertions(+), 7 deletions(-)

diff --git a/qa/rpc-tests/segwit.py b/qa/rpc-tests/segwit.py
index d4c9a8afed32c..097e119f3239b 100755
--- a/qa/rpc-tests/segwit.py
+++ b/qa/rpc-tests/segwit.py
@@ -69,6 +69,11 @@ def getutxo(txid):
     utxo["txid"] = txid
     return utxo
 
+def find_unspent(node, min_value):
+    for utxo in node.listunspent():
+        if utxo['amount'] >= min_value:
+            return utxo
+
 class SegWitTest(BitcoinTestFramework):
 
     def setup_chain(self):
@@ -117,8 +122,21 @@ def fail_mine(self, node, txid, sign, redeem_script=""):
         sync_blocks(self.nodes)
 
     def run_test(self):
-        self.nodes[0].generate(160) #block 160
-
+        self.nodes[0].generate(161) #block 161
+
+        print("Verify sigops are counted in GBT with pre-BIP141 rules before the fork")
+        txid = self.nodes[0].sendtoaddress(self.nodes[0].getnewaddress(), 1)
+        tmpl = self.nodes[0].getblocktemplate({})
+        assert(tmpl['sigoplimit'] == 20000)
+        assert(tmpl['transactions'][0]['hash'] == txid)
+        assert(tmpl['transactions'][0]['sigops'] == 2)
+        tmpl = self.nodes[0].getblocktemplate({'rules':['segwit']})
+        assert(tmpl['sigoplimit'] == 20000)
+        assert(tmpl['transactions'][0]['hash'] == txid)
+        assert(tmpl['transactions'][0]['sigops'] == 2)
+        self.nodes[0].generate(1) #block 162
+
+        balance_presetup = self.nodes[0].getbalance()
         self.pubkey = []
         p2sh_ids = [] # p2sh_ids[NODE][VER] is an array of txids that spend to a witness version VER pkscript to an address for NODE embedded in p2sh
         wit_ids = [] # wit_ids[NODE][VER] is an array of txids that spend to a witness version VER pkscript to an address for NODE via bare witness
@@ -137,18 +155,18 @@ def run_test(self):
         for i in range(5):
             for n in range(3):
                 for v in range(2):
-                    wit_ids[n][v].append(send_to_witness(v, self.nodes[0], self.nodes[0].listunspent()[0], self.pubkey[n], False, Decimal("49.999")))
-                    p2sh_ids[n][v].append(send_to_witness(v, self.nodes[0], self.nodes[0].listunspent()[0], self.pubkey[n], True, Decimal("49.999")))
+                    wit_ids[n][v].append(send_to_witness(v, self.nodes[0], find_unspent(self.nodes[0], 50), self.pubkey[n], False, Decimal("49.999")))
+                    p2sh_ids[n][v].append(send_to_witness(v, self.nodes[0], find_unspent(self.nodes[0], 50), self.pubkey[n], True, Decimal("49.999")))
 
-        self.nodes[0].generate(1) #block 161
+        self.nodes[0].generate(1) #block 163
         sync_blocks(self.nodes)
 
         # Make sure all nodes recognize the transactions as theirs
-        assert_equal(self.nodes[0].getbalance(), 60*50 - 60*50 + 20*Decimal("49.999") + 50)
+        assert_equal(self.nodes[0].getbalance(), balance_presetup - 60*50 + 20*Decimal("49.999") + 50)
         assert_equal(self.nodes[1].getbalance(), 20*Decimal("49.999"))
         assert_equal(self.nodes[2].getbalance(), 20*Decimal("49.999"))
 
-        self.nodes[0].generate(262) #block 423
+        self.nodes[0].generate(260) #block 423
         sync_blocks(self.nodes)
 
         print("Verify default node can't accept any witness format txs before fork")
@@ -205,5 +223,25 @@ def run_test(self):
         self.success_mine(self.nodes[0], p2sh_ids[NODE_0][WIT_V0][0], True) #block 434
         self.success_mine(self.nodes[0], p2sh_ids[NODE_0][WIT_V1][0], True) #block 435
 
+        print("Verify sigops are counted in GBT with BIP141 rules after the fork")
+        txid = self.nodes[0].sendtoaddress(self.nodes[0].getnewaddress(), 1)
+        tmpl = self.nodes[0].getblocktemplate({'rules':['segwit']})
+        assert(tmpl['sigoplimit'] == 80000)
+        assert(tmpl['transactions'][0]['txid'] == txid)
+        assert(tmpl['transactions'][0]['sigops'] == 8)
+
+        print("Verify non-segwit miners get a valid GBT response after the fork")
+        send_to_witness(1, self.nodes[0], find_unspent(self.nodes[0], 50), self.pubkey[0], False, Decimal("49.998"))
+        try:
+            tmpl = self.nodes[0].getblocktemplate({})
+            assert(len(tmpl['transactions']) == 1)  # Doesn't include witness tx
+            assert(tmpl['sigoplimit'] == 20000)
+            assert(tmpl['transactions'][0]['hash'] == txid)
+            assert(tmpl['transactions'][0]['sigops'] == 2)
+            assert(('!segwit' in tmpl['rules']) or ('segwit' not in tmpl['rules']))
+        except JSONRPCException:
+            # This is an acceptable outcome
+            pass
+
 if __name__ == '__main__':
     SegWitTest().main()

From 947913fc54325bea88dd52ea219ea2c69e334c97 Mon Sep 17 00:00:00 2001
From: whythat <yuri.zhykin@gmail.com>
Date: Mon, 18 Jul 2016 12:23:42 +0300
Subject: [PATCH 0705/1802] use std::map::erase(const_iterator, const_iterator)
 to get non-constant iterator

---
 src/limitedmap.h | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/limitedmap.h b/src/limitedmap.h
index 4d9bb4fa21d5d..7841d7f4a4abe 100644
--- a/src/limitedmap.h
+++ b/src/limitedmap.h
@@ -66,8 +66,11 @@ class limitedmap
     }
     void update(const_iterator itIn, const mapped_type& v)
     {
-        // TODO: When we switch to C++11, use map.erase(itIn, itIn) to get the non-const iterator.
-        iterator itTarget = map.find(itIn->first);
+        // Using map::erase() with empty range instead of map::find() to get a non-const iterator,
+        // since it is a constant time operation in C++11. For more details, see
+        // https://stackoverflow.com/questions/765148/how-to-remove-constness-of-const-iterator
+        iterator itTarget = map.erase(itIn, itIn);
+        
         if (itTarget == map.end())
             return;
         std::pair<rmap_iterator, rmap_iterator> itPair = rmap.equal_range(itTarget->second);

From 5e187e70012c247b96783f7fa9bcbd0289504ad5 Mon Sep 17 00:00:00 2001
From: whythat <yuri.zhykin@gmail.com>
Date: Mon, 18 Jul 2016 12:26:21 +0300
Subject: [PATCH 0706/1802] use c++11 std::unique_ptr instead of
 boost::shared_ptr

---
 src/rpc/server.cpp | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/rpc/server.cpp b/src/rpc/server.cpp
index 23149baa6d945..4b594f5fa6674 100644
--- a/src/rpc/server.cpp
+++ b/src/rpc/server.cpp
@@ -25,6 +25,8 @@
 #include <boost/thread.hpp>
 #include <boost/algorithm/string/case_conv.hpp> // for to_upper()
 
+#include <memory> // for unique_ptr
+
 using namespace RPCServer;
 using namespace std;
 
@@ -34,9 +36,8 @@ static std::string rpcWarmupStatus("RPC server started");
 static CCriticalSection cs_rpcWarmup;
 /* Timer-creating functions */
 static RPCTimerInterface* timerInterface = NULL;
-/* Map of name to timer.
- * @note Can be changed to std::unique_ptr when C++11 */
-static std::map<std::string, boost::shared_ptr<RPCTimerBase> > deadlineTimers;
+/* Map of name to timer. */
+static std::map<std::string, std::unique_ptr<RPCTimerBase> > deadlineTimers;
 
 static struct CRPCSignals
 {
@@ -490,7 +491,7 @@ void RPCRunLater(const std::string& name, boost::function<void(void)> func, int6
         throw JSONRPCError(RPC_INTERNAL_ERROR, "No timer handler registered for RPC");
     deadlineTimers.erase(name);
     LogPrint("rpc", "queue run of timer %s in %i seconds (using %s)\n", name, nSeconds, timerInterface->Name());
-    deadlineTimers.insert(std::make_pair(name, boost::shared_ptr<RPCTimerBase>(timerInterface->NewTimer(func, nSeconds*1000))));
+    deadlineTimers.insert(std::make_pair(name, std::unique_ptr<RPCTimerBase>(timerInterface->NewTimer(func, nSeconds*1000))));
 }
 
 CRPCTable tableRPC;

From c78408607536bf030947f69f6dc6e09e07873c84 Mon Sep 17 00:00:00 2001
From: whythat <yuri.zhykin@gmail.com>
Date: Tue, 19 Jul 2016 02:15:59 +0300
Subject: [PATCH 0707/1802] use std::map::emplace() instead of
 std::map::insert()

---
 src/rpc/server.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/rpc/server.cpp b/src/rpc/server.cpp
index 4b594f5fa6674..5fb97f7496217 100644
--- a/src/rpc/server.cpp
+++ b/src/rpc/server.cpp
@@ -491,7 +491,7 @@ void RPCRunLater(const std::string& name, boost::function<void(void)> func, int6
         throw JSONRPCError(RPC_INTERNAL_ERROR, "No timer handler registered for RPC");
     deadlineTimers.erase(name);
     LogPrint("rpc", "queue run of timer %s in %i seconds (using %s)\n", name, nSeconds, timerInterface->Name());
-    deadlineTimers.insert(std::make_pair(name, std::unique_ptr<RPCTimerBase>(timerInterface->NewTimer(func, nSeconds*1000))));
+    deadlineTimers.emplace(name, std::unique_ptr<RPCTimerBase>(timerInterface->NewTimer(func, nSeconds*1000)));
 }
 
 CRPCTable tableRPC;

From 216d796ce006df36427c03f0c209c48472d65bef Mon Sep 17 00:00:00 2001
From: Luke Dashjr <luke-jr+git@utopios.org>
Date: Tue, 9 Aug 2016 05:07:28 +0000
Subject: [PATCH 0708/1802] configure: Allow building bench_bitcoin by itself

---
 configure.ac | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index 011af6bd1bd8e..cc96511f97c7d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1003,8 +1003,8 @@ else
   AC_MSG_RESULT([no])
 fi
 
-if test x$build_bitcoin_utils$build_bitcoin_libs$build_bitcoind$bitcoin_enable_qt$use_tests = xnonononono; then
-  AC_MSG_ERROR([No targets! Please specify at least one of: --with-utils --with-libs --with-daemon --with-gui or --enable-tests])
+if test x$build_bitcoin_utils$build_bitcoin_libs$build_bitcoind$bitcoin_enable_qt$use_bench$use_tests = xnononononono; then
+  AC_MSG_ERROR([No targets! Please specify at least one of: --with-utils --with-libs --with-daemon --with-gui --enable-bench or --enable-tests])
 fi
 
 AM_CONDITIONAL([TARGET_DARWIN], [test x$TARGET_OS = xdarwin])

From 8a270b25fc90495ce4b98b6d6e954fce92135dc1 Mon Sep 17 00:00:00 2001
From: Luke Dashjr <luke-jr+git@utopios.org>
Date: Thu, 30 Jun 2016 01:51:09 +0000
Subject: [PATCH 0709/1802] Bugfix: Allow building libbitcoinconsensus without
 any univalue

---
 configure.ac | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index 24f9f090f9a00..cc2624ccb23a0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -750,6 +750,12 @@ fi
 
 dnl univalue check
 
+need_bundled_univalue=yes
+
+if test x$build_bitcoin_utils$build_bitcoind$bitcoin_enable_qt$use_tests$use_bench = xnonononono; then
+  need_bundled_univalue=no
+else
+
 if test x$system_univalue != xno ; then
   found_univalue=no
   if test x$use_pkgconfig = xyes; then
@@ -771,6 +777,7 @@ if test x$system_univalue != xno ; then
 
   if test x$found_univalue = xyes ; then
     system_univalue=yes
+    need_bundled_univalue=no
   elif test x$system_univalue = xyes ; then
     AC_MSG_ERROR([univalue not found])
   else
@@ -778,11 +785,14 @@ if test x$system_univalue != xno ; then
   fi
 fi
 
-if test x$system_univalue = xno ; then
+if test x$need_bundled_univalue = xyes ; then
   UNIVALUE_CFLAGS='-I$(srcdir)/univalue/include'
   UNIVALUE_LIBS='univalue/libunivalue.la'
 fi
-AM_CONDITIONAL([EMBEDDED_UNIVALUE],[test x$system_univalue = xno])
+
+fi
+
+AM_CONDITIONAL([EMBEDDED_UNIVALUE],[test x$need_bundled_univalue = xyes])
 AC_SUBST(UNIVALUE_CFLAGS)
 AC_SUBST(UNIVALUE_LIBS)
 
@@ -1002,7 +1012,7 @@ PKGCONFIG_LIBDIR_TEMP="$PKG_CONFIG_LIBDIR"
 unset PKG_CONFIG_LIBDIR
 PKG_CONFIG_LIBDIR="$PKGCONFIG_LIBDIR_TEMP"
 
-if test x$system_univalue = xno; then
+if test x$need_bundled_univalue = xyes; then
   AC_CONFIG_SUBDIRS([src/univalue])
 fi
 

From fa5d276c906214ef959529fd6cde0b78bd67ed8e Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Wed, 10 Aug 2016 08:39:46 +0200
Subject: [PATCH 0710/1802] [init] ParameterInteraction() iff wallet enabled

---
 src/init.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/init.cpp b/src/init.cpp
index 4d9de6cfc8c9f..44204d93b2f0c 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -966,7 +966,7 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
     nBytesPerSigOp = GetArg("-bytespersigop", nBytesPerSigOp);
 
 #ifdef ENABLE_WALLET
-    if (!CWallet::ParameterInteraction())
+    if (!fDisableWallet && !CWallet::ParameterInteraction())
         return false;
 #endif // ENABLE_WALLET
 

From 3897668f5eea679383881af48c3f3ed63bd15a74 Mon Sep 17 00:00:00 2001
From: CryptoVote <cryptovote@yandex.com>
Date: Sun, 15 May 2016 14:30:05 -0500
Subject: [PATCH 0711/1802] Adds issue template. [skip ci]

---
 .github/ISSUE_TEMPLATE.md | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 .github/ISSUE_TEMPLATE.md

diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
new file mode 100644
index 0000000000000..a16cedd7fda0c
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE.md
@@ -0,0 +1,23 @@
+<!--- Remove sections that do not apply -->
+### Describe the issue
+
+### Is the issue reproducible?
+#### List steps to reproduce below:
+1. 
+2. 
+3. 
+
+### Expected behavior
+Tell us what should happen
+
+### Actual behavior
+Tell us what happens instead
+
+### Any information in the debug.log file related to this issue?
+
+### Screenshots (if available)
+
+### What binary version was used (official or self compiled)
+
+### Machine specs: CPU, RAM, Disk space & OS (Windows, OS X, Linux) 
+

From 15df3c196b2359505980a2b0217133e0bb550565 Mon Sep 17 00:00:00 2001
From: Andrew Chow <achow101@gmail.com>
Date: Mon, 8 Aug 2016 14:17:23 -0400
Subject: [PATCH 0712/1802] Persist the datadir after option reset

After a reset is performed, the datadir setting is saved and readded to the settings so that it is persisted across option resets.
---
 src/qt/optionsmodel.cpp | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/qt/optionsmodel.cpp b/src/qt/optionsmodel.cpp
index 684db71a8ce03..7987d8e7ea470 100644
--- a/src/qt/optionsmodel.cpp
+++ b/src/qt/optionsmodel.cpp
@@ -16,6 +16,7 @@
 #include "main.h" // For DEFAULT_SCRIPTCHECK_THREADS
 #include "net.h"
 #include "txdb.h" // for -dbcache defaults
+#include "intro.h" 
 
 #ifdef ENABLE_WALLET
 #include "wallet/wallet.h"
@@ -98,6 +99,9 @@ void OptionsModel::Init(bool resetSettings)
     if (!SoftSetArg("-par", settings.value("nThreadsScriptVerif").toString().toStdString()))
         addOverriddenOption("-par");
 
+    if (!settings.contains("strDataDir"))
+        settings.setValue("strDataDir", Intro::getDefaultDataDirectory());
+
     // Wallet
 #ifdef ENABLE_WALLET
     if (!settings.contains("bSpendZeroConfChange"))
@@ -150,9 +154,16 @@ void OptionsModel::Reset()
 {
     QSettings settings;
 
+    // Save the strDataDir setting
+    QString dataDir = Intro::getDefaultDataDirectory();
+    dataDir = settings.value("strDataDir", dataDir).toString();
+
     // Remove all entries from our QSettings object
     settings.clear();
 
+    // Set strDataDir
+    settings.setValue("strDataDir", dataDir);
+
     // default setting for OptionsModel::StartAtStartup - disabled
     if (GUIUtil::GetStartOnSystemStartup())
         GUIUtil::SetStartOnSystemStartup(false);

From b3b3c2a5623d5c942d2b3565cc2d833c65105555 Mon Sep 17 00:00:00 2001
From: Jonas Schnelli <dev@jonasschnelli.ch>
Date: Tue, 26 Apr 2016 13:55:13 +0200
Subject: [PATCH 0713/1802] Reduce cs_main locks during
 ConnectTip/SyncWithWallets

---
 src/main.cpp                         | 40 +++++++++++++++-----------
 src/validationinterface.cpp          |  4 +--
 src/validationinterface.h            |  6 ++--
 src/wallet/wallet.cpp                | 43 +++++++++++-----------------
 src/wallet/wallet.h                  |  6 ++--
 src/zmq/zmqnotificationinterface.cpp |  2 +-
 src/zmq/zmqnotificationinterface.h   |  2 +-
 7 files changed, 49 insertions(+), 54 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index 3a07190a6210f..db457f6f53d57 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1541,7 +1541,7 @@ bool AcceptToMemoryPoolWorker(CTxMemPool& pool, CValidationState& state, const C
         }
     }
 
-    SyncWithWallets(tx, NULL, NULL);
+    SyncWithWallets(tx, NULL);
 
     return true;
 }
@@ -2770,7 +2770,7 @@ bool static DisconnectTip(CValidationState& state, const CChainParams& chainpara
     // Let wallets know transactions went from 1-confirmed to
     // 0-confirmed or conflicted:
     BOOST_FOREACH(const CTransaction &tx, block.vtx) {
-        SyncWithWallets(tx, pindexDelete->pprev, NULL);
+        SyncWithWallets(tx, pindexDelete->pprev);
     }
     return true;
 }
@@ -2785,7 +2785,7 @@ static int64_t nTimePostConnect = 0;
  * Connect a new block to chainActive. pblock is either NULL or a pointer to a CBlock
  * corresponding to pindexNew, to bypass loading it again from disk.
  */
-bool static ConnectTip(CValidationState& state, const CChainParams& chainparams, CBlockIndex* pindexNew, const CBlock* pblock)
+bool static ConnectTip(CValidationState& state, const CChainParams& chainparams, CBlockIndex* pindexNew, const CBlock* pblock, std::list<CTransaction> &txConflicted, std::vector<std::tuple<CTransaction,CBlockIndex*,int> > &txChanged)
 {
     assert(pindexNew->pprev == chainActive.Tip());
     // Read block from disk.
@@ -2821,20 +2821,13 @@ bool static ConnectTip(CValidationState& state, const CChainParams& chainparams,
         return false;
     int64_t nTime5 = GetTimeMicros(); nTimeChainState += nTime5 - nTime4;
     LogPrint("bench", "  - Writing chainstate: %.2fms [%.2fs]\n", (nTime5 - nTime4) * 0.001, nTimeChainState * 0.000001);
-    // Remove conflicting transactions from the mempool.
-    list<CTransaction> txConflicted;
+    // Remove conflicting transactions from the mempool.;
     mempool.removeForBlock(pblock->vtx, pindexNew->nHeight, txConflicted, !IsInitialBlockDownload());
     // Update chainActive & related variables.
     UpdateTip(pindexNew, chainparams);
-    // Tell wallet about transactions that went from mempool
-    // to conflicted:
-    BOOST_FOREACH(const CTransaction &tx, txConflicted) {
-        SyncWithWallets(tx, pindexNew, NULL);
-    }
-    // ... and about transactions that got confirmed:
-    BOOST_FOREACH(const CTransaction &tx, pblock->vtx) {
-        SyncWithWallets(tx, pindexNew, pblock);
-    }
+
+    for(unsigned int i=0; i < pblock->vtx.size(); i++)
+        txChanged.push_back(std::make_tuple(pblock->vtx[i], pindexNew, i));
 
     int64_t nTime6 = GetTimeMicros(); nTimePostConnect += nTime6 - nTime5; nTimeTotal += nTime6 - nTime1;
     LogPrint("bench", "  - Connect postprocess: %.2fms [%.2fs]\n", (nTime6 - nTime5) * 0.001, nTimePostConnect * 0.000001);
@@ -2916,7 +2909,7 @@ static void PruneBlockIndexCandidates() {
  * Try to make some progress towards making pindexMostWork the active block.
  * pblock is either NULL or a pointer to a CBlock corresponding to pindexMostWork.
  */
-static bool ActivateBestChainStep(CValidationState& state, const CChainParams& chainparams, CBlockIndex* pindexMostWork, const CBlock* pblock, bool& fInvalidFound)
+static bool ActivateBestChainStep(CValidationState& state, const CChainParams& chainparams, CBlockIndex* pindexMostWork, const CBlock* pblock, bool& fInvalidFound, std::list<CTransaction>& txConflicted, std::vector<std::tuple<CTransaction,CBlockIndex*,int> >& txChanged)
 {
     AssertLockHeld(cs_main);
     const CBlockIndex *pindexOldTip = chainActive.Tip();
@@ -2949,7 +2942,7 @@ static bool ActivateBestChainStep(CValidationState& state, const CChainParams& c
 
         // Connect new blocks.
         BOOST_REVERSE_FOREACH(CBlockIndex *pindexConnect, vpindexToConnect) {
-            if (!ConnectTip(state, chainparams, pindexConnect, pindexConnect == pindexMostWork ? pblock : NULL)) {
+            if (!ConnectTip(state, chainparams, pindexConnect, pindexConnect == pindexMostWork ? pblock : NULL, txConflicted, txChanged)) {
                 if (state.IsInvalid()) {
                     // The block violates a consensus rule.
                     if (!state.CorruptionPossible())
@@ -3024,6 +3017,8 @@ bool ActivateBestChain(CValidationState &state, const CChainParams& chainparams,
             break;
 
         const CBlockIndex *pindexFork;
+        std::list<CTransaction> txConflicted;
+        std::vector<std::tuple<CTransaction,CBlockIndex*,int> > txChanged;
         bool fInitialDownload;
         int nNewHeight;
         {
@@ -3038,7 +3033,7 @@ bool ActivateBestChain(CValidationState &state, const CChainParams& chainparams,
                 return true;
 
             bool fInvalidFound = false;
-            if (!ActivateBestChainStep(state, chainparams, pindexMostWork, pblock && pblock->GetHash() == pindexMostWork->GetBlockHash() ? pblock : NULL, fInvalidFound))
+            if (!ActivateBestChainStep(state, chainparams, pindexMostWork, pblock && pblock->GetHash() == pindexMostWork->GetBlockHash() ? pblock : NULL, fInvalidFound, txConflicted, txChanged))
                 return false;
 
             if (fInvalidFound) {
@@ -3053,6 +3048,17 @@ bool ActivateBestChain(CValidationState &state, const CChainParams& chainparams,
         // When we reach this point, we switched to a new tip (stored in pindexNewTip).
 
         // Notifications/callbacks that can run without cs_main
+
+        // throw all transactions though the signal-interface
+        // while _not_ holding the cs_main lock
+        BOOST_FOREACH(const CTransaction &tx, txConflicted)
+        {
+            SyncWithWallets(tx, pindexNewTip);
+        }
+        // ... and about transactions that got confirmed:
+        for(unsigned int i = 0; i < txChanged.size(); i++)
+            SyncWithWallets(std::get<0>(txChanged[i]), std::get<1>(txChanged[i]), std::get<2>(txChanged[i]));
+
         // Always notify the UI if a new block tip was connected
         if (pindexFork != pindexNewTip) {
             uiInterface.NotifyBlockTip(fInitialDownload, pindexNewTip);
diff --git a/src/validationinterface.cpp b/src/validationinterface.cpp
index 8da0c72858d85..cf1d6ca08699a 100644
--- a/src/validationinterface.cpp
+++ b/src/validationinterface.cpp
@@ -48,6 +48,6 @@ void UnregisterAllValidationInterfaces() {
     g_signals.UpdatedBlockTip.disconnect_all_slots();
 }
 
-void SyncWithWallets(const CTransaction &tx, const CBlockIndex *pindex, const CBlock *pblock) {
-    g_signals.SyncTransaction(tx, pindex, pblock);
+void SyncWithWallets(const CTransaction &tx, const CBlockIndex *pindex, int posInBlock) {
+    g_signals.SyncTransaction(tx, pindex, posInBlock);
 }
diff --git a/src/validationinterface.h b/src/validationinterface.h
index 01b8e47650dc4..094b1cfe26672 100644
--- a/src/validationinterface.h
+++ b/src/validationinterface.h
@@ -28,12 +28,12 @@ void UnregisterValidationInterface(CValidationInterface* pwalletIn);
 /** Unregister all wallets from core */
 void UnregisterAllValidationInterfaces();
 /** Push an updated transaction to all registered wallets */
-void SyncWithWallets(const CTransaction& tx, const CBlockIndex *pindex, const CBlock* pblock = NULL);
+void SyncWithWallets(const CTransaction& tx, const CBlockIndex *pindex, int posInBlock = -1);
 
 class CValidationInterface {
 protected:
     virtual void UpdatedBlockTip(const CBlockIndex *pindex) {}
-    virtual void SyncTransaction(const CTransaction &tx, const CBlockIndex *pindex, const CBlock *pblock) {}
+    virtual void SyncTransaction(const CTransaction &tx, const CBlockIndex *pindex, int posInBlock) {}
     virtual void SetBestChain(const CBlockLocator &locator) {}
     virtual void UpdatedTransaction(const uint256 &hash) {}
     virtual void Inventory(const uint256 &hash) {}
@@ -50,7 +50,7 @@ struct CMainSignals {
     /** Notifies listeners of updated block chain tip */
     boost::signals2::signal<void (const CBlockIndex *)> UpdatedBlockTip;
     /** Notifies listeners of updated transaction data (transaction, and optionally the block it is found in. */
-    boost::signals2::signal<void (const CTransaction &, const CBlockIndex *pindex, const CBlock *)> SyncTransaction;
+    boost::signals2::signal<void (const CTransaction &, const CBlockIndex *pindex, int posInBlock)> SyncTransaction;
     /** Notifies listeners of an updated transaction without new data (for now: a coinbase potentially becoming visible). */
     boost::signals2::signal<void (const uint256 &)> UpdatedTransaction;
     /** Notifies listeners of a new active block chain. */
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index ee9254050ce78..888aa029a3dcd 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -886,18 +886,18 @@ bool CWallet::LoadToWallet(const CWalletTx& wtxIn)
  * pblock is optional, but should be provided if the transaction is known to be in a block.
  * If fUpdate is true, existing transactions will be updated.
  */
-bool CWallet::AddToWalletIfInvolvingMe(const CTransaction& tx, const CBlock* pblock, bool fUpdate)
+bool CWallet::AddToWalletIfInvolvingMe(const CTransaction& tx, const CBlockIndex* pIndex, int posInBlock, bool fUpdate)
 {
     {
         AssertLockHeld(cs_wallet);
 
-        if (pblock) {
+        if (posInBlock != -1) {
             BOOST_FOREACH(const CTxIn& txin, tx.vin) {
                 std::pair<TxSpends::const_iterator, TxSpends::const_iterator> range = mapTxSpends.equal_range(txin.prevout);
                 while (range.first != range.second) {
                     if (range.first->second != tx.GetHash()) {
-                        LogPrintf("Transaction %s (in block %s) conflicts with wallet transaction %s (both spend %s:%i)\n", tx.GetHash().ToString(), pblock->GetHash().ToString(), range.first->second.ToString(), range.first->first.hash.ToString(), range.first->first.n);
-                        MarkConflicted(pblock->GetHash(), range.first->second);
+                        LogPrintf("Transaction %s (in block %s) conflicts with wallet transaction %s (both spend %s:%i)\n", tx.GetHash().ToString(), pIndex->GetBlockHash().ToString(), range.first->second.ToString(), range.first->first.hash.ToString(), range.first->first.n);
+                        MarkConflicted(pIndex->GetBlockHash(), range.first->second);
                     }
                     range.first++;
                 }
@@ -911,8 +911,8 @@ bool CWallet::AddToWalletIfInvolvingMe(const CTransaction& tx, const CBlock* pbl
             CWalletTx wtx(this,tx);
 
             // Get merkle branch if transaction was found in a block
-            if (pblock)
-                wtx.SetMerkleBranch(*pblock);
+            if (posInBlock != -1)
+                wtx.SetMerkleBranch(pIndex, posInBlock);
 
             return AddToWallet(wtx, false);
         }
@@ -1037,11 +1037,11 @@ void CWallet::MarkConflicted(const uint256& hashBlock, const uint256& hashTx)
     }
 }
 
-void CWallet::SyncTransaction(const CTransaction& tx, const CBlockIndex *pindex, const CBlock* pblock)
+void CWallet::SyncTransaction(const CTransaction& tx, const CBlockIndex *pindex, int posInBlock)
 {
     LOCK2(cs_main, cs_wallet);
 
-    if (!AddToWalletIfInvolvingMe(tx, pblock, true))
+    if (!AddToWalletIfInvolvingMe(tx, pindex, posInBlock, true))
         return; // Not one of ours
 
     // If a transaction changes 'conflicted' state, that changes the balance
@@ -1399,9 +1399,10 @@ int CWallet::ScanForWalletTransactions(CBlockIndex* pindexStart, bool fUpdate)
 
             CBlock block;
             ReadBlockFromDisk(block, pindex, Params().GetConsensus());
-            BOOST_FOREACH(CTransaction& tx, block.vtx)
+            int posInBlock;
+            for (posInBlock = 0; posInBlock < (int)block.vtx.size(); posInBlock++)
             {
-                if (AddToWalletIfInvolvingMe(tx, &block, fUpdate))
+                if (AddToWalletIfInvolvingMe(block.vtx[posInBlock], pindex, posInBlock, fUpdate))
                     ret++;
             }
             pindex = chainActive.Next(pindex);
@@ -3526,31 +3527,19 @@ CWalletKey::CWalletKey(int64_t nExpires)
     nTimeExpires = nExpires;
 }
 
-int CMerkleTx::SetMerkleBranch(const CBlock& block)
+int CMerkleTx::SetMerkleBranch(const CBlockIndex* pindex, int posInBlock)
 {
     AssertLockHeld(cs_main);
     CBlock blockTmp;
 
     // Update the tx's hashBlock
-    hashBlock = block.GetHash();
+    hashBlock = pindex->GetBlockHash();
 
-    // Locate the transaction
-    for (nIndex = 0; nIndex < (int)block.vtx.size(); nIndex++)
-        if (block.vtx[nIndex] == *(CTransaction*)this)
-            break;
-    if (nIndex == (int)block.vtx.size())
-    {
-        nIndex = -1;
-        LogPrintf("ERROR: SetMerkleBranch(): couldn't find tx in block\n");
-        return 0;
-    }
+    // set the position of the transaction in the block
+    nIndex = posInBlock;
 
     // Is the tx in a block that's in the main chain
-    BlockMap::iterator mi = mapBlockIndex.find(hashBlock);
-    if (mi == mapBlockIndex.end())
-        return 0;
-    const CBlockIndex* pindex = (*mi).second;
-    if (!pindex || !chainActive.Contains(pindex))
+    if (!chainActive.Contains(pindex))
         return 0;
 
     return chainActive.Height() - pindex->nHeight + 1;
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
index 50c94ccfbcd95..952acd1535abf 100644
--- a/src/wallet/wallet.h
+++ b/src/wallet/wallet.h
@@ -200,7 +200,7 @@ class CMerkleTx : public CTransaction
         READWRITE(nIndex);
     }
 
-    int SetMerkleBranch(const CBlock& block);
+    int SetMerkleBranch(const CBlockIndex* pIndex, int posInBlock);
 
     /**
      * Return depth of transaction in blockchain:
@@ -731,8 +731,8 @@ class CWallet : public CCryptoKeyStore, public CValidationInterface
     void MarkDirty();
     bool AddToWallet(const CWalletTx& wtxIn, bool fFlushOnClose=true);
     bool LoadToWallet(const CWalletTx& wtxIn);
-    void SyncTransaction(const CTransaction& tx, const CBlockIndex *pindex, const CBlock* pblock);
-    bool AddToWalletIfInvolvingMe(const CTransaction& tx, const CBlock* pblock, bool fUpdate);
+    void SyncTransaction(const CTransaction& tx, const CBlockIndex *pindex, int posInBlock);
+    bool AddToWalletIfInvolvingMe(const CTransaction& tx, const CBlockIndex* pIndex, int posInBlock, bool fUpdate);
     int ScanForWalletTransactions(CBlockIndex* pindexStart, bool fUpdate = false);
     void ReacceptWalletTransactions();
     void ResendWalletTransactions(int64_t nBestBlockTime);
diff --git a/src/zmq/zmqnotificationinterface.cpp b/src/zmq/zmqnotificationinterface.cpp
index 8705532429fe8..376e7dec590b5 100644
--- a/src/zmq/zmqnotificationinterface.cpp
+++ b/src/zmq/zmqnotificationinterface.cpp
@@ -141,7 +141,7 @@ void CZMQNotificationInterface::UpdatedBlockTip(const CBlockIndex *pindex)
     }
 }
 
-void CZMQNotificationInterface::SyncTransaction(const CTransaction& tx, const CBlockIndex* pindex, const CBlock* pblock)
+void CZMQNotificationInterface::SyncTransaction(const CTransaction& tx, const CBlockIndex* pindex, int posInBlock)
 {
     for (std::list<CZMQAbstractNotifier*>::iterator i = notifiers.begin(); i!=notifiers.end(); )
     {
diff --git a/src/zmq/zmqnotificationinterface.h b/src/zmq/zmqnotificationinterface.h
index 7b52e7775bc53..a853447267f31 100644
--- a/src/zmq/zmqnotificationinterface.h
+++ b/src/zmq/zmqnotificationinterface.h
@@ -24,7 +24,7 @@ class CZMQNotificationInterface : public CValidationInterface
     void Shutdown();
 
     // CValidationInterface
-    void SyncTransaction(const CTransaction& tx, const CBlockIndex *pindex, const CBlock* pblock);
+    void SyncTransaction(const CTransaction& tx, const CBlockIndex *pindex, int posInBlock);
     void UpdatedBlockTip(const CBlockIndex *pindex);
 
 private:

From 9e9d644f5178da8b5743ea3ddc3b779a2c8d1cd4 Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Fri, 12 Aug 2016 14:21:50 -0400
Subject: [PATCH 0714/1802] net: fixup nits

---
 src/Makefile.am    | 2 +-
 src/httpserver.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index 0a35a052c24ab..03fac5bf979ac 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -105,8 +105,8 @@ BITCOIN_CORE_H = \
   merkleblock.h \
   miner.h \
   net.h \
-  netbase.h \
   netaddress.h \
+  netbase.h \
   noui.h \
   policy/fees.h \
   policy/policy.h \
diff --git a/src/httpserver.cpp b/src/httpserver.cpp
index 2bb4be564ea94..f921305fcc36b 100644
--- a/src/httpserver.cpp
+++ b/src/httpserver.cpp
@@ -201,7 +201,7 @@ static bool InitHTTPAllowList()
     CNetAddr localv6;
     LookupHost("127.0.0.1", localv4, false);
     LookupHost("::1", localv6, false);
-    rpc_allow_subnets.push_back(CSubNet(localv4, 8)); // always allow IPv4 local subnet
+    rpc_allow_subnets.push_back(CSubNet(localv4, 8));      // always allow IPv4 local subnet
     rpc_allow_subnets.push_back(CSubNet(localv6));         // always allow IPv6 localhost
     if (mapMultiArgs.count("-rpcallowip")) {
         const std::vector<std::string>& vAllow = mapMultiArgs["-rpcallowip"];

From e11f9a2f0244f1d6e34b50293b2ecca61a356bed Mon Sep 17 00:00:00 2001
From: Justin Camarena <justin121994@gmail.com>
Date: Fri, 12 Aug 2016 15:30:11 -0700
Subject: [PATCH 0715/1802] [doc] typos, READMEs, comments

Just a quick run through some docs and fixing some text errors.
---
 doc/README_osx.md          | 2 +-
 doc/release-notes.md       | 2 +-
 doc/translation_process.md | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/README_osx.md b/doc/README_osx.md
index aed3cd97e1ecd..6a5c672277cf7 100644
--- a/doc/README_osx.md
+++ b/doc/README_osx.md
@@ -22,7 +22,7 @@ These tools inject timestamps by default, which produce non-deterministic
 binaries. The ZERO_AR_DATE environment variable is used to disable that.
 
 This version of cctools has been patched to use the current version of clang's
-headers and and its libLTO.so rather than those from llvmgcc, as it was
+headers and its libLTO.so rather than those from llvmgcc, as it was
 originally done in toolchain4.
 
 To complicate things further, all builds must target an Apple SDK. These SDKs
diff --git a/doc/release-notes.md b/doc/release-notes.md
index 343bd0846ecc0..b99192ae97c9b 100644
--- a/doc/release-notes.md
+++ b/doc/release-notes.md
@@ -31,7 +31,7 @@ libraries such as Qt are no longer being tested on XP.
 
 We do not have time nor resources to provide support for an OS that is
 end-of-life. From 0.13.0 on, Windows XP is no longer supported. Users are
-suggested to upgrade to a newer verion of Windows, or install an alternative OS
+suggested to upgrade to a newer version of Windows, or install an alternative OS
 that is supported.
 
 No attempt is made to prevent installing or running the software on Windows XP,
diff --git a/doc/translation_process.md b/doc/translation_process.md
index 310d560b364fa..d8a85292e8ed8 100644
--- a/doc/translation_process.md
+++ b/doc/translation_process.md
@@ -94,7 +94,7 @@ When new plurals are added to the source file, it's important to do the followin
 7. Save the source file
 
 ### Translating a new language
-To create a new language template, you will need to edit the languages manifest file `src/qt/bitcoin.qrc` and add a new entry. Below is an example of the english language entry.
+To create a new language template, you will need to edit the languages manifest file `src/qt/bitcoin.qrc` and add a new entry. Below is an example of the English language entry.
 
 ```xml
 <qresource prefix="/translations">

From 3c5251daeb29902b051502dd20030ce25aeccdf2 Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Sat, 13 Aug 2016 16:03:44 +0200
Subject: [PATCH 0716/1802] test: Remove java comparison tool

---
 Makefile.am                               | 24 +++--------------
 configure.ac                              | 32 -----------------------
 depends/config.site.in                    |  3 ---
 depends/packages/native_comparisontool.mk | 21 ---------------
 depends/packages/packages.mk              |  2 +-
 5 files changed, 5 insertions(+), 77 deletions(-)
 delete mode 100644 depends/packages/native_comparisontool.mk

diff --git a/Makefile.am b/Makefile.am
index b10d0850664c8..37c1e98eca6bc 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -47,9 +47,9 @@ OSX_PACKAGING = $(OSX_DEPLOY_SCRIPT) $(OSX_FANCY_PLIST) $(OSX_INSTALLER_ICONS) \
   $(top_srcdir)/contrib/macdeploy/detached-sig-apply.sh \
   $(top_srcdir)/contrib/macdeploy/detached-sig-create.sh
 
-COVERAGE_INFO = baseline_filtered_combined.info baseline.info block_test.info \
+COVERAGE_INFO = baseline_filtered_combined.info baseline.info \
   leveldb_baseline.info test_bitcoin_filtered.info total_coverage.info \
-  baseline_filtered.info block_test_filtered.info rpc_test.info rpc_test_filtered.info \
+  baseline_filtered.info rpc_test.info rpc_test_filtered.info \
   leveldb_baseline_filtered.info test_bitcoin_coverage.info test_bitcoin.info
 
 dist-hook:
@@ -175,16 +175,6 @@ test_bitcoin.info: baseline_filtered_combined.info
 test_bitcoin_filtered.info: test_bitcoin.info
 	$(LCOV) -r $< "/usr/include/*" -o $@
 
-block_test.info: test_bitcoin_filtered.info
-	$(MKDIR_P) qa/tmp
-	-@TIMEOUT=15 qa/pull-tester/run-bitcoind-for-test.sh $(JAVA) -jar $(JAVA_COMPARISON_TOOL) qa/tmp/compTool $(COMPARISON_TOOL_REORG_TESTS)
-	$(LCOV) -c -d $(abs_builddir)/src --t BitcoinJBlockTest -o $@
-	$(LCOV) -z -d $(abs_builddir)/src
-	$(LCOV) -z -d $(abs_builddir)/src/leveldb
-
-block_test_filtered.info: block_test.info
-	$(LCOV) -r $< "/usr/include/*" -o $@
-
 rpc_test.info: test_bitcoin_filtered.info
 	-@TIMEOUT=15 python qa/pull-tester/rpc-tests.py $(EXTENDED_RPC_TESTS)
 	$(LCOV) -c -d $(abs_builddir)/src --t rpc-tests -o $@
@@ -197,8 +187,8 @@ rpc_test_filtered.info: rpc_test.info
 test_bitcoin_coverage.info: baseline_filtered_combined.info test_bitcoin_filtered.info
 	$(LCOV) -a baseline_filtered.info -a leveldb_baseline_filtered.info -a test_bitcoin_filtered.info -o $@
 
-total_coverage.info: baseline_filtered_combined.info test_bitcoin_filtered.info block_test_filtered.info rpc_test_filtered.info
-	$(LCOV) -a baseline_filtered.info -a leveldb_baseline_filtered.info -a test_bitcoin_filtered.info -a block_test_filtered.info -a rpc_test_filtered.info -o $@ | $(GREP) "\%" | $(AWK) '{ print substr($$3,2,50) "/" $$5 }' > coverage_percent.txt
+total_coverage.info: baseline_filtered_combined.info test_bitcoin_filtered.info rpc_test_filtered.info
+	$(LCOV) -a baseline_filtered.info -a leveldb_baseline_filtered.info -a test_bitcoin_filtered.info -a rpc_test_filtered.info -o $@ | $(GREP) "\%" | $(AWK) '{ print substr($$3,2,50) "/" $$5 }' > coverage_percent.txt
 
 test_bitcoin.coverage/.dirstamp:  test_bitcoin_coverage.info
 	$(GENHTML) -s $< -o $(@D)
@@ -212,12 +202,6 @@ cov: test_bitcoin.coverage/.dirstamp total.coverage/.dirstamp
 
 endif
 
-if USE_COMPARISON_TOOL
-check-local:
-	$(MKDIR_P) qa/tmp
-	@qa/pull-tester/run-bitcoind-for-test.sh $(JAVA) -jar $(JAVA_COMPARISON_TOOL) qa/tmp/compTool $(COMPARISON_TOOL_REORG_TESTS) 2>&1
-endif
-
 dist_noinst_SCRIPTS = autogen.sh
 
 EXTRA_DIST = $(top_srcdir)/share/genbuild.sh qa/pull-tester/rpc-tests.py qa/rpc-tests $(DIST_DOCS) $(WINDOWS_PACKAGING) $(OSX_PACKAGING) $(BIN_CHECKS)
diff --git a/configure.ac b/configure.ac
index c4b60398be2a1..508c3b8a4dc48 100644
--- a/configure.ac
+++ b/configure.ac
@@ -66,7 +66,6 @@ AC_PATH_TOOL(RANLIB, ranlib)
 AC_PATH_TOOL(STRIP, strip)
 AC_PATH_TOOL(GCOV, gcov)
 AC_PATH_PROG(LCOV, lcov)
-AC_PATH_PROG(JAVA, java)
 AC_PATH_PROGS([PYTHON], [python3 python2.7 python2 python])
 AC_PATH_PROG(GENHTML, genhtml)
 AC_PATH_PROG([GIT], [git])
@@ -113,16 +112,6 @@ AC_ARG_ENABLE(bench,
     [use_bench=$enableval],
     [use_bench=yes])
 
-AC_ARG_WITH([comparison-tool],
-    AS_HELP_STRING([--with-comparison-tool],[path to java comparison tool (requires --enable-tests)]),
-    [use_comparison_tool=$withval],
-    [use_comparison_tool=no])
-
-AC_ARG_ENABLE([comparison-tool-reorg-tests],
-    AS_HELP_STRING([--enable-comparison-tool-reorg-tests],[enable expensive reorg tests in the comparison tool (default no)]),
-    [use_comparison_tool_reorg_tests=$enableval],
-    [use_comparison_tool_reorg_tests=no])
-
 AC_ARG_ENABLE([extended-rpc-tests],
     AS_HELP_STRING([--enable-extended-rpc-tests],[enable expensive RPC tests when using lcov (default no)]),
     [use_extended_rpc_tests=$enableval],
@@ -382,19 +371,6 @@ if test x$use_pkgconfig = xyes; then
   ])
 fi
 
-if test x$use_comparison_tool != xno; then
-  AC_SUBST(JAVA_COMPARISON_TOOL, $use_comparison_tool)
-fi
-
-if test x$use_comparison_tool_reorg_tests != xno; then
-  if test x$use_comparison_tool = x; then
-    AC_MSG_ERROR("comparison tool reorg tests but comparison tool was not specified")
-  fi
-  AC_SUBST(COMPARISON_TOOL_REORG_TESTS, 1)
-else
-  AC_SUBST(COMPARISON_TOOL_REORG_TESTS, 0)
-fi
-
 if test x$use_extended_rpc_tests != xno; then
   AC_SUBST(EXTENDED_RPC_TESTS, -extended)
 fi
@@ -406,18 +382,12 @@ if test x$use_lcov = xyes; then
   if test x$GCOV = x; then
     AC_MSG_ERROR("lcov testing requested but gcov not found")
   fi
-  if test x$JAVA = x; then
-    AC_MSG_ERROR("lcov testing requested but java not found")
-  fi
   if test x$PYTHON = x; then
     AC_MSG_ERROR("lcov testing requested but python not found")
   fi
   if test x$GENHTML = x; then
     AC_MSG_ERROR("lcov testing requested but genhtml not found")
   fi
-  if test x$use_comparison_tool = x; then
-    AC_MSG_ERROR("lcov testing requested but comparison tool was not specified")
-  fi
   LCOV="$LCOV --gcov-tool=$GCOV"
   AX_CHECK_COMPILE_FLAG([--coverage],[CXXFLAGS="$CXXFLAGS --coverage"],
     [AC_MSG_ERROR("lcov testing requested but --coverage flag does not work")])
@@ -1036,8 +1006,6 @@ AM_CONDITIONAL([ENABLE_QT_TESTS],[test x$BUILD_TEST_QT = xyes])
 AM_CONDITIONAL([ENABLE_BENCH],[test x$use_bench = xyes])
 AM_CONDITIONAL([USE_QRCODE], [test x$use_qr = xyes])
 AM_CONDITIONAL([USE_LCOV],[test x$use_lcov = xyes])
-AM_CONDITIONAL([USE_COMPARISON_TOOL],[test x$use_comparison_tool != xno])
-AM_CONDITIONAL([USE_COMPARISON_TOOL_REORG_TESTS],[test x$use_comparison_tool_reorg_test != xno])
 AM_CONDITIONAL([GLIBC_BACK_COMPAT],[test x$use_glibc_compat = xyes])
 AM_CONDITIONAL([HARDEN],[test x$use_hardening = xyes])
 
diff --git a/depends/config.site.in b/depends/config.site.in
index e731537bf76bd..27e3aedd8ed4f 100644
--- a/depends/config.site.in
+++ b/depends/config.site.in
@@ -19,9 +19,6 @@ fi
 if test -z $with_protoc_bindir; then
   with_protoc_bindir=$depends_prefix/native/bin
 fi
-if test -z $with_comparison_tool; then
-  with_comparison_tool=$depends_prefix/native/share/BitcoindComparisonTool_jar/BitcoindComparisonTool.jar
-fi
 
 
 if test -z $enable_wallet && test -n "@no_wallet@"; then
diff --git a/depends/packages/native_comparisontool.mk b/depends/packages/native_comparisontool.mk
deleted file mode 100644
index e0ae0cec700e9..0000000000000
--- a/depends/packages/native_comparisontool.mk
+++ /dev/null
@@ -1,21 +0,0 @@
-package=native_comparisontool
-$(package)_version=8c6666f
-$(package)_download_path=https://github.com/theuni/bitcoind-comparisontool/raw/master
-$(package)_file_name=pull-tests-$($(package)_version).jar
-$(package)_sha256_hash=a865332b3827abcde684ab79f5f43c083b0b6a4c97ff5508c79f29fee24f11cd
-$(package)_install_dirname=BitcoindComparisonTool_jar
-$(package)_install_filename=BitcoindComparisonTool.jar
-
-define $(package)_extract_cmds
-endef
-
-define $(package)_configure_cmds
-endef
-
-define $(package)_build_cmds
-endef
-
-define $(package)_stage_cmds
-  mkdir -p $($(package)_staging_prefix_dir)/share/$($(package)_install_dirname) && \
-  cp $($(package)_source) $($(package)_staging_prefix_dir)/share/$($(package)_install_dirname)/$($(package)_install_filename)
-endef
diff --git a/depends/packages/packages.mk b/depends/packages/packages.mk
index ba2a05248c04e..4cf44385b88dc 100644
--- a/depends/packages/packages.mk
+++ b/depends/packages/packages.mk
@@ -1,5 +1,5 @@
 packages:=boost openssl libevent zeromq
-native_packages := native_ccache native_comparisontool
+native_packages := native_ccache
 
 qt_native_packages = native_protobuf
 qt_packages = qrencode protobuf

From 6ffd996b8ee5f36ed4490410385f9b072da5889b Mon Sep 17 00:00:00 2001
From: Sev <git@sevastos.com>
Date: Sun, 14 Aug 2016 15:35:27 +0300
Subject: [PATCH 0717/1802] Corrected JSON typo on setban of net.cpp

---
 src/rpc/net.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/rpc/net.cpp b/src/rpc/net.cpp
index b85c7b2e1aaa5..89035aaa848c0 100644
--- a/src/rpc/net.cpp
+++ b/src/rpc/net.cpp
@@ -484,7 +484,7 @@ UniValue setban(const UniValue& params, bool fHelp)
                             "\nExamples:\n"
                             + HelpExampleCli("setban", "\"192.168.0.6\" \"add\" 86400")
                             + HelpExampleCli("setban", "\"192.168.0.0/24\" \"add\"")
-                            + HelpExampleRpc("setban", "\"192.168.0.6\", \"add\" 86400")
+                            + HelpExampleRpc("setban", "\"192.168.0.6\", \"add\", 86400")
                             );
 
     CSubNet subNet;

From 1aacfc2da521a8e0d718e9ac561d9b2d7916eb0b Mon Sep 17 00:00:00 2001
From: leijurv <leijurv@gmail.com>
Date: Sat, 13 Aug 2016 11:21:13 -0600
Subject: [PATCH 0718/1802] various typos

---
 src/blockencodings.cpp | 2 +-
 src/init.cpp           | 2 +-
 src/main.cpp           | 6 +++---
 src/main.h             | 2 +-
 src/net.cpp            | 2 +-
 src/rpc/mining.cpp     | 2 +-
 src/wallet/wallet.cpp  | 2 +-
 7 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/blockencodings.cpp b/src/blockencodings.cpp
index 5c4c3bd27487c..df237f8f26f58 100644
--- a/src/blockencodings.cpp
+++ b/src/blockencodings.cpp
@@ -75,7 +75,7 @@ ReadStatus PartiallyDownloadedBlock::InitData(const CBlockHeaderAndShortTxIDs& c
     }
     prefilled_count = cmpctblock.prefilledtxn.size();
 
-    // Calculate map of txids -> positions and check mempool to see what we have (or dont)
+    // Calculate map of txids -> positions and check mempool to see what we have (or don't)
     // Because well-formed cmpctblock messages will have a (relatively) uniform distribution
     // of short IDs, any highly-uneven distribution of elements can be safely treated as a
     // READ_STATUS_FAILED.
diff --git a/src/init.cpp b/src/init.cpp
index 4d9de6cfc8c9f..6af9d30cdfc40 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -1267,7 +1267,7 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
     // cache size calculations
     int64_t nTotalCache = (GetArg("-dbcache", nDefaultDbCache) << 20);
     nTotalCache = std::max(nTotalCache, nMinDbCache << 20); // total cache cannot be less than nMinDbCache
-    nTotalCache = std::min(nTotalCache, nMaxDbCache << 20); // total cache cannot be greated than nMaxDbcache
+    nTotalCache = std::min(nTotalCache, nMaxDbCache << 20); // total cache cannot be greater than nMaxDbcache
     int64_t nBlockTreeDBCache = nTotalCache / 8;
     nBlockTreeDBCache = std::min(nBlockTreeDBCache, (GetBoolArg("-txindex", DEFAULT_TXINDEX) ? nMaxBlockDBAndTxIndexCache : nMaxBlockDBCache) << 20);
     nTotalCache -= nBlockTreeDBCache;
diff --git a/src/main.cpp b/src/main.cpp
index 3a07190a6210f..64c67ff0f601a 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1174,7 +1174,7 @@ bool AcceptToMemoryPoolWorker(CTxMemPool& pool, CValidationState& state, const C
                 // nSequence >= maxint-1 on all inputs.
                 //
                 // maxint-1 is picked to still allow use of nLockTime by
-                // non-replacable transactions. All inputs rather than just one
+                // non-replaceable transactions. All inputs rather than just one
                 // is for the sake of multi-party protocols, where we don't
                 // want a single party to be able to disable replacement.
                 //
@@ -1988,7 +1988,7 @@ bool CheckInputs(const CTransaction& tx, CValidationState &state, const CCoinsVi
         // is safe because block merkle hashes are still computed and checked,
         // and any change will be caught at the next checkpoint. Of course, if
         // the checkpoint is for a chain that's invalid due to false scriptSigs
-        // this optimisation would allow an invalid chain to be accepted.
+        // this optimization would allow an invalid chain to be accepted.
         if (fScriptChecks) {
             for (unsigned int i = 0; i < tx.vin.size(); i++) {
                 const COutPoint &prevout = tx.vin[i].prevout;
@@ -4795,7 +4795,7 @@ void static ProcessGetData(CNode* pfrom, const Consensus::Params& consensusParam
                     {
                         // If a peer is asking for old blocks, we're almost guaranteed
                         // they wont have a useful mempool to match against a compact block,
-                        // and we dont feel like constructing the object for them, so
+                        // and we don't feel like constructing the object for them, so
                         // instead we respond with the full, non-compact block.
                         if (mi->second->nHeight >= chainActive.Height() - 10) {
                             CBlockHeaderAndShortTxIDs cmpctblock(block);
diff --git a/src/main.h b/src/main.h
index d4d70c018027d..e9106fccf7927 100644
--- a/src/main.h
+++ b/src/main.h
@@ -214,7 +214,7 @@ void UnregisterNodeSignals(CNodeSignals& nodeSignals);
  * block is made active. Note that it does not, however, guarantee that the
  * specific block passed to it has been checked for validity!
  * 
- * @param[out]  state   This may be set to an Error state if any error occurred processing it, including during validation/connection/etc of otherwise unrelated blocks during reorganisation; or it may be set to an Invalid state if pblock is itself invalid (but this is not guaranteed even when the block is checked). If you want to *possibly* get feedback on whether pblock is valid, you must also install a CValidationInterface (see validationinterface.h) - this will have its BlockChecked method called whenever *any* block completes validation.
+ * @param[out]  state   This may be set to an Error state if any error occurred processing it, including during validation/connection/etc of otherwise unrelated blocks during reorganization; or it may be set to an Invalid state if pblock is itself invalid (but this is not guaranteed even when the block is checked). If you want to *possibly* get feedback on whether pblock is valid, you must also install a CValidationInterface (see validationinterface.h) - this will have its BlockChecked method called whenever *any* block completes validation.
  * @param[in]   pfrom   The node which we are receiving the block from; it is added to mapBlockSource and may be penalised if the block is invalid.
  * @param[in]   pblock  The block we want to process.
  * @param[in]   fForceProcessing Process this block even if unrequested; used for non-network block sources and whitelisted peers.
diff --git a/src/net.cpp b/src/net.cpp
index 4bbe5059df188..4f669f3382641 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -1676,7 +1676,7 @@ void ThreadOpenConnections()
             if (nANow - addr.nLastTry < 600 && nTries < 30)
                 continue;
 
-            // only consider nodes missing relevant services after 40 failed attemps
+            // only consider nodes missing relevant services after 40 failed attempts
             if ((addr.nServices & nRelevantServices) != nRelevantServices && nTries < 40)
                 continue;
 
diff --git a/src/rpc/mining.cpp b/src/rpc/mining.cpp
index 2479e5d5953d2..6d88d4bec8147 100644
--- a/src/rpc/mining.cpp
+++ b/src/rpc/mining.cpp
@@ -650,7 +650,7 @@ UniValue getblocktemplate(const UniValue& params, bool fHelp)
 
     if (nMaxVersionPreVB >= 2) {
         // If VB is supported by the client, nMaxVersionPreVB is -1, so we won't get here
-        // Because BIP 34 changed how the generation transaction is serialised, we can only use version/force back to v2 blocks
+        // Because BIP 34 changed how the generation transaction is serialized, we can only use version/force back to v2 blocks
         // This is safe to do [otherwise-]unconditionally only because we are throwing an exception above if a non-force deployment gets activated
         // Note that this can probably also be removed entirely after the first BIP9 non-force deployment (ie, probably segwit) gets activated
         aMutable.push_back("version/force");
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index ee9254050ce78..8a3bebcc6701b 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -3132,7 +3132,7 @@ void CWallet::GetKeyBirthTimes(std::map<CKeyID, int64_t> &mapKeyBirth) const {
             mapKeyBirth[it->first] = it->second.nCreateTime;
 
     // map in which we'll infer heights of other keys
-    CBlockIndex *pindexMax = chainActive[std::max(0, chainActive.Height() - 144)]; // the tip can be reorganised; use a 144-block safety margin
+    CBlockIndex *pindexMax = chainActive[std::max(0, chainActive.Height() - 144)]; // the tip can be reorganized; use a 144-block safety margin
     std::map<CKeyID, CBlockIndex*> mapKeyFirstBlock;
     std::set<CKeyID> setKeys;
     GetKeys(setKeys);

From 8194a6e525514d5cda85ac08273a6ffb6d5b6cac Mon Sep 17 00:00:00 2001
From: Jeremy Rubin <jeremy.l.rubin@gmail.com>
Date: Sun, 14 Aug 2016 20:45:46 -0400
Subject: [PATCH 0719/1802] Fix a type error that would not compile on Apple
 LLVM version 6.1.0 (clang-602.0.53) (based on LLVM 3.6.0svn)

---
 src/httpserver.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/httpserver.h b/src/httpserver.h
index 0e30e666a6b42..49d67f4b88427 100644
--- a/src/httpserver.h
+++ b/src/httpserver.h
@@ -33,7 +33,7 @@ void InterruptHTTPServer();
 void StopHTTPServer();
 
 /** Handler for requests to a certain HTTP path */
-typedef std::function<void(HTTPRequest* req, const std::string &)> HTTPRequestHandler;
+typedef std::function<bool(HTTPRequest* req, const std::string &)> HTTPRequestHandler;
 /** Register handler for prefix.
  * If multiple handlers match a prefix, the first-registered one will
  * be invoked.

From b7c349d5e7c207bb7a2e7469c3e5522c9909c17f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pavel=20Jan=C3=ADk?= <Pavel@Janik.cz>
Date: Mon, 15 Aug 2016 14:10:07 +0200
Subject: [PATCH 0720/1802] Do not shadow variables in networking code

---
 src/net.cpp        |  2 +-
 src/net.h          | 12 ++++++------
 src/netaddress.cpp |  4 ++--
 src/netbase.cpp    |  6 +++---
 src/netbase.h      |  2 +-
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/net.cpp b/src/net.cpp
index a0773b2e07cb8..8fbd8fd192b89 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -66,7 +66,7 @@ namespace {
         SOCKET socket;
         bool whitelisted;
 
-        ListenSocket(SOCKET socket, bool whitelisted) : socket(socket), whitelisted(whitelisted) {}
+        ListenSocket(SOCKET _socket, bool _whitelisted) : socket(_socket), whitelisted(_whitelisted) {}
     };
 }
 
diff --git a/src/net.h b/src/net.h
index ea03defc408cf..b5ebe66ce0363 100644
--- a/src/net.h
+++ b/src/net.h
@@ -509,21 +509,21 @@ class CNode
 
 
 
-    void AddAddressKnown(const CAddress& addr)
+    void AddAddressKnown(const CAddress& _addr)
     {
-        addrKnown.insert(addr.GetKey());
+        addrKnown.insert(_addr.GetKey());
     }
 
-    void PushAddress(const CAddress& addr)
+    void PushAddress(const CAddress& _addr)
     {
         // Known checking here is only to save space from duplicates.
         // SendMessages will filter it again for knowns that were added
         // after addresses were pushed.
-        if (addr.IsValid() && !addrKnown.contains(addr.GetKey())) {
+        if (_addr.IsValid() && !addrKnown.contains(_addr.GetKey())) {
             if (vAddrToSend.size() >= MAX_ADDR_TO_SEND) {
-                vAddrToSend[insecure_rand() % vAddrToSend.size()] = addr;
+                vAddrToSend[insecure_rand() % vAddrToSend.size()] = _addr;
             } else {
-                vAddrToSend.push_back(addr);
+                vAddrToSend.push_back(_addr);
             }
         }
     }
diff --git a/src/netaddress.cpp b/src/netaddress.cpp
index 7000ce3f0acce..db5cc3bc20a0e 100644
--- a/src/netaddress.cpp
+++ b/src/netaddress.cpp
@@ -197,8 +197,8 @@ bool CNetAddr::IsValid() const
         return false;
 
     // unspecified IPv6 address (::/128)
-    unsigned char ipNone[16] = {};
-    if (memcmp(ip, ipNone, 16) == 0)
+    unsigned char ipNone6[16] = {};
+    if (memcmp(ip, ipNone6, 16) == 0)
         return false;
 
     // documentation IPv6 address
diff --git a/src/netbase.cpp b/src/netbase.cpp
index 4f243ec6f5397..7d7f1b6788984 100644
--- a/src/netbase.cpp
+++ b/src/netbase.cpp
@@ -631,8 +631,8 @@ bool ConnectSocketByName(CService &addr, SOCKET& hSocketRet, const char *pszDest
 
     SplitHostPort(std::string(pszDest), port, strDest);
 
-    proxyType nameProxy;
-    GetNameProxy(nameProxy);
+    proxyType proxy;
+    GetNameProxy(proxy);
 
     std::vector<CService> addrResolved;
     if (Lookup(strDest.c_str(), addrResolved, port, fNameLookup && !HaveNameProxy(), 256)) {
@@ -646,7 +646,7 @@ bool ConnectSocketByName(CService &addr, SOCKET& hSocketRet, const char *pszDest
 
     if (!HaveNameProxy())
         return false;
-    return ConnectThroughProxy(nameProxy, strDest, port, hSocketRet, nTimeout, outProxyConnectionFailed);
+    return ConnectThroughProxy(proxy, strDest, port, hSocketRet, nTimeout, outProxyConnectionFailed);
 }
 
 bool LookupSubNet(const char* pszName, CSubNet& ret)
diff --git a/src/netbase.h b/src/netbase.h
index bb12019a8216b..eb39d16578ed4 100644
--- a/src/netbase.h
+++ b/src/netbase.h
@@ -29,7 +29,7 @@ class proxyType
 {
 public:
     proxyType(): randomize_credentials(false) {}
-    proxyType(const CService &proxy, bool randomize_credentials=false): proxy(proxy), randomize_credentials(randomize_credentials) {}
+    proxyType(const CService &_proxy, bool _randomize_credentials=false): proxy(_proxy), randomize_credentials(_randomize_credentials) {}
 
     bool IsValid() const { return proxy.IsValid(); }
 

From edb6cf1432568bc54cd3d6a6cc260f3f265403f6 Mon Sep 17 00:00:00 2001
From: instagibbs <gsanders87@gmail.com>
Date: Mon, 15 Aug 2016 10:28:53 -0400
Subject: [PATCH 0721/1802] remove no-longer-used InitError logic

---
 src/init.cpp | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/init.cpp b/src/init.cpp
index 72095da4a22d8..5ef8af8b3fd31 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -1067,7 +1067,6 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
     LogPrintf("Using data directory %s\n", strDataDir);
     LogPrintf("Using config file %s\n", GetConfigFile().string());
     LogPrintf("Using at most %i connections (%i file descriptors available)\n", nMaxConnections, nFD);
-    std::ostringstream strErrors;
 
     LogPrintf("Using %u threads for script verification\n", nScriptCheckThreads);
     if (nScriptCheckThreads) {
@@ -1492,9 +1491,6 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
 
     // ********************************************************* Step 11: start node
 
-    if (!strErrors.str().empty())
-        return InitError(strErrors.str());
-
     //// debug print
     LogPrintf("mapBlockIndex.size() = %u\n",   mapBlockIndex.size());
     LogPrintf("nBestHeight = %d\n",                   chainActive.Height());

From 936c1448ed2e247e99fd3570fd8677870721c8b7 Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Tue, 16 Aug 2016 11:16:21 +0200
Subject: [PATCH 0722/1802] build: Remove check for `openssl/ec.h`

We don't use any elliptic curves from OpenSSL anymore, nor include this
header anywhere but optionally in the tests of secp256k1 (which has
its own autoconf setup).

Reported by sinetek on IRC.
---
 configure.ac | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/configure.ac b/configure.ac
index c4b60398be2a1..b1492deba4768 100644
--- a/configure.ac
+++ b/configure.ac
@@ -880,14 +880,6 @@ AM_CONDITIONAL([EMBEDDED_UNIVALUE],[test x$need_bundled_univalue = xyes])
 AC_SUBST(UNIVALUE_CFLAGS)
 AC_SUBST(UNIVALUE_LIBS)
 
-CXXFLAGS_TEMP="$CXXFLAGS"
-LIBS_TEMP="$LIBS"
-CXXFLAGS="$CXXFLAGS $SSL_CFLAGS $CRYPTO_CFLAGS"
-LIBS="$LIBS $SSL_LIBS $CRYPTO_LIBS"
-AC_CHECK_HEADER([openssl/ec.h],, AC_MSG_ERROR(OpenSSL ec header missing),)
-CXXFLAGS="$CXXFLAGS_TEMP"
-LIBS="$LIBS_TEMP"
-
 BITCOIN_QT_PATH_PROGS([PROTOC], [protoc],$protoc_bin_path)
 
 AC_MSG_CHECKING([whether to build bitcoind])

From b2135359b3ad37cf2ac09b008079ddb237eff2c9 Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Tue, 16 Aug 2016 11:34:11 +0200
Subject: [PATCH 0723/1802] Squashed 'src/secp256k1/' changes from
 6c527ec..7a49cac

7a49cac Merge #410: Add string.h include to ecmult_impl
0bbd5d4 Add string.h include to ecmult_impl
c5b32e1 Merge #405: Make secp256k1_fe_sqrt constant time
926836a Make secp256k1_fe_sqrt constant time
e2a8e92 Merge #404: Replace 3M + 4S doubling formula with 2M + 5S one
8ec49d8 Add note about 2M + 5S doubling formula
5a91bd7 Merge #400: A couple minor cleanups
ac01378 build: add -DSECP256K1_BUILD to benchmark_internal build flags
a6c6f99 Remove a bunch of unused stdlib #includes
65285a6 Merge #403: configure: add flag to disable OpenSSL tests
a9b2a5d configure: add flag to disable OpenSSL tests
b340123 Merge #402: Add support for testing quadratic residues
e6e9805 Add function for testing quadratic residue field/group elements.
efd953a Add Jacobi symbol test via GMP
fa36a0d Merge #401: ecmult_const: unify endomorphism and non-endomorphism skew cases
c6191fd ecmult_const: unify endomorphism and non-endomorphism skew cases
0b3e618 Merge #378: .gitignore build-aux cleanup
6042217 Merge #384: JNI: align shared files copyright/comments to bitcoinj's
24ad20f Merge #399: build: verify that the native compiler works for static precomp
b3be852 Merge #398: Test whether ECDH and Schnorr are enabled for JNI
aa0b1fd build: verify that the native compiler works for static precomp
eee808d Test whether ECDH and Schnorr are enabled for JNI
7b0fb18 Merge #366: ARM assembly implementation of field_10x26 inner (rebase of #173)
001f176 ARM assembly implementation of field_10x26 inner
0172be9 Merge #397: Small fixes for sha256
3f8b78e Fix undefs in hash_impl.h
2ab4695 Fix state size in sha256 struct
6875b01 Merge #386: Add some missing `VERIFY_CHECK(ctx != NULL)`
2c52b5d Merge #389: Cast pointers through uintptr_t under JNI
43097a4 Merge #390: Update bitcoin-core GitHub links
31c9c12 Merge #391: JNI: Only call ecdsa_verify if its inputs parsed correctly
1cb2302 Merge #392: Add testcase which hits additional branch in secp256k1_scalar_sqr
d2ee340 Merge #388: bench_ecdh: fix call to secp256k1_context_create
093a497 Add testcase which hits additional branch in secp256k1_scalar_sqr
a40c701 JNI: Only call ecdsa_verify if its inputs parsed correctly
faa2a11 Update bitcoin-core GitHub links
47b9e78 Cast pointers through uintptr_t under JNI
f36f9c6 bench_ecdh: fix call to secp256k1_context_create
bcc4881 Add some missing `VERIFY_CHECK(ctx != NULL)` for functions that use `ARG_CHECK`
6ceea2c align shared files copyright/comments to bitcoinj's
70141a8 Update .gitignore
7b549b1 Merge #373: build: fix x86_64 asm detection for some compilers
bc7c93c Merge #374: Add note about y=0 being possible on one of the sextic twists
e457018 Merge #364: JNI rebased
86e2d07 JNI library: cleanup, removed unimplemented code
3093576a JNI library
bd2895f Merge pull request #371
e72e93a Add note about y=0 being possible on one of the sextic twists
3f8fdfb build: fix x86_64 asm detection for some compilers
e5a9047 [Trivial] Remove double semicolons
c18b869 Merge pull request #360
3026daa Merge pull request #302
03d4611 Add sage verification script for the group laws
a965937 Merge pull request #361
83221ec Add experimental features to configure
5d4c5a3 Prevent damage_array in the signature test from going out of bounds.
419bf7f Merge pull request #356
03d84a4 Benchmark against OpenSSL verification

git-subtree-dir: src/secp256k1
git-subtree-split: 7a49cacd3937311fcb1cb36b6ba3336fca811991
---
 .gitignore                                    |  19 +-
 .travis.yml                                   |  19 +-
 Makefile.am                                   |  72 +-
 README.md                                     |   2 +-
 build-aux/m4/ax_jni_include_dir.m4            | 140 +++
 build-aux/m4/bitcoin_secp.m4                  |   4 +-
 configure.ac                                  | 146 ++-
 libsecp256k1.pc.in                            |   2 +-
 sage/group_prover.sage                        | 322 ++++++
 sage/secp256k1.sage                           | 306 ++++++
 sage/weierstrass_prover.sage                  | 264 +++++
 src/asm/field_10x26_arm.s                     | 919 ++++++++++++++++++
 src/bench_ecdh.c                              |   3 +-
 src/bench_internal.c                          |  34 +-
 src/bench_verify.c                            |  44 +
 src/ecmult_const_impl.h                       |  67 +-
 src/ecmult_impl.h                             |   2 +
 src/field.h                                   |   8 +-
 src/field_10x26_impl.h                        |  12 +-
 src/field_5x52_impl.h                         |   1 -
 src/field_5x52_int128_impl.h                  |   4 +-
 src/field_impl.h                              |  36 +-
 src/group.h                                   |   5 +-
 src/group_impl.h                              |  36 +-
 src/hash.h                                    |   2 +-
 src/hash_impl.h                               |  10 +-
 src/java/org/bitcoin/NativeSecp256k1.java     | 472 ++++++++-
 src/java/org/bitcoin/NativeSecp256k1Test.java | 247 +++++
 src/java/org/bitcoin/NativeSecp256k1Util.java |  45 +
 src/java/org/bitcoin/Secp256k1Context.java    |  51 +
 src/java/org_bitcoin_NativeSecp256k1.c        | 412 +++++++-
 src/java/org_bitcoin_NativeSecp256k1.h        | 112 ++-
 src/java/org_bitcoin_Secp256k1Context.c       |  15 +
 src/java/org_bitcoin_Secp256k1Context.h       |  22 +
 src/modules/ecdh/Makefile.am.include          |   2 +-
 src/modules/recovery/Makefile.am.include      |   2 +-
 src/modules/schnorr/Makefile.am.include       |   2 +-
 src/num.h                                     |   6 +
 src/num_gmp_impl.h                            |  26 +
 src/scalar_impl.h                             |   2 -
 src/secp256k1.c                               |  15 +-
 src/tests.c                                   | 190 +++-
 42 files changed, 3905 insertions(+), 195 deletions(-)
 create mode 100644 build-aux/m4/ax_jni_include_dir.m4
 create mode 100644 sage/group_prover.sage
 create mode 100644 sage/secp256k1.sage
 create mode 100644 sage/weierstrass_prover.sage
 create mode 100644 src/asm/field_10x26_arm.s
 create mode 100644 src/java/org/bitcoin/NativeSecp256k1Test.java
 create mode 100644 src/java/org/bitcoin/NativeSecp256k1Util.java
 create mode 100644 src/java/org/bitcoin/Secp256k1Context.java
 create mode 100644 src/java/org_bitcoin_Secp256k1Context.c
 create mode 100644 src/java/org_bitcoin_Secp256k1Context.h

diff --git a/.gitignore b/.gitignore
index e0b7b7a48a31f..efb277d347065 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,17 +25,24 @@ config.status
 libtool
 .deps/
 .dirstamp
-build-aux/
 *.lo
 *.o
 *~
 src/libsecp256k1-config.h
 src/libsecp256k1-config.h.in
 src/ecmult_static_context.h
-m4/libtool.m4
-m4/ltoptions.m4
-m4/ltsugar.m4
-m4/ltversion.m4
-m4/lt~obsolete.m4
+build-aux/config.guess
+build-aux/config.sub
+build-aux/depcomp
+build-aux/install-sh
+build-aux/ltmain.sh
+build-aux/m4/libtool.m4
+build-aux/m4/lt~obsolete.m4
+build-aux/m4/ltoptions.m4
+build-aux/m4/ltsugar.m4
+build-aux/m4/ltversion.m4
+build-aux/missing
+build-aux/compile
+build-aux/test-driver
 src/stamp-h1
 libsecp256k1.pc
diff --git a/.travis.yml b/.travis.yml
index 4e1e73c39f57b..2c5c63adadcb1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,26 +6,31 @@ addons:
 compiler:
   - clang
   - gcc
+cache:
+  directories:
+  - src/java/guava/
 env:
   global:
-    - FIELD=auto  BIGNUM=auto  SCALAR=auto  ENDOMORPHISM=no  STATICPRECOMPUTATION=yes  ASM=no  BUILD=check  EXTRAFLAGS=  HOST=  ECDH=no  schnorr=no  RECOVERY=no
+    - FIELD=auto  BIGNUM=auto  SCALAR=auto  ENDOMORPHISM=no  STATICPRECOMPUTATION=yes  ASM=no  BUILD=check  EXTRAFLAGS=  HOST=  ECDH=no  schnorr=no  RECOVERY=no  EXPERIMENTAL=no
+    - GUAVA_URL=https://search.maven.org/remotecontent?filepath=com/google/guava/guava/18.0/guava-18.0.jar GUAVA_JAR=src/java/guava/guava-18.0.jar
   matrix:
     - SCALAR=32bit    RECOVERY=yes
-    - SCALAR=32bit    FIELD=32bit       ECDH=yes
+    - SCALAR=32bit    FIELD=32bit       ECDH=yes  EXPERIMENTAL=yes
     - SCALAR=64bit
     - FIELD=64bit     RECOVERY=yes
     - FIELD=64bit     ENDOMORPHISM=yes
-    - FIELD=64bit     ENDOMORPHISM=yes  ECDH=yes
+    - FIELD=64bit     ENDOMORPHISM=yes  ECDH=yes EXPERIMENTAL=yes
     - FIELD=64bit                       ASM=x86_64
     - FIELD=64bit     ENDOMORPHISM=yes  ASM=x86_64
-    - FIELD=32bit     SCHNORR=yes
+    - FIELD=32bit     SCHNORR=yes EXPERIMENTAL=yes
     - FIELD=32bit     ENDOMORPHISM=yes
     - BIGNUM=no
-    - BIGNUM=no       ENDOMORPHISM=yes SCHNORR=yes  RECOVERY=yes
+    - BIGNUM=no       ENDOMORPHISM=yes SCHNORR=yes  RECOVERY=yes EXPERIMENTAL=yes
     - BIGNUM=no       STATICPRECOMPUTATION=no
     - BUILD=distcheck
     - EXTRAFLAGS=CPPFLAGS=-DDETERMINISTIC
     - EXTRAFLAGS=CFLAGS=-O0
+    - BUILD=check-java ECDH=yes SCHNORR=yes EXPERIMENTAL=yes
 matrix:
   fast_finish: true
   include:
@@ -55,9 +60,11 @@ matrix:
           packages:
             - gcc-multilib
             - libgmp-dev:i386
+before_install: mkdir -p `dirname $GUAVA_JAR`
+install: if [ ! -f $GUAVA_JAR ]; then wget $GUAVA_URL -O $GUAVA_JAR; fi
 before_script: ./autogen.sh
 script:
  - if [ -n "$HOST" ]; then export USE_HOST="--host=$HOST"; fi
  - if [ "x$HOST" = "xi686-linux-gnu" ]; then export CC="$CC -m32"; fi
- - ./configure --enable-endomorphism=$ENDOMORPHISM --with-field=$FIELD --with-bignum=$BIGNUM --with-scalar=$SCALAR --enable-ecmult-static-precomputation=$STATICPRECOMPUTATION --enable-module-ecdh=$ECDH --enable-module-schnorr=$SCHNORR --enable-module-recovery=$RECOVERY $EXTRAFLAGS $USE_HOST && make -j2 $BUILD
+ - ./configure --enable-experimental=$EXPERIMENTAL --enable-endomorphism=$ENDOMORPHISM --with-field=$FIELD --with-bignum=$BIGNUM --with-scalar=$SCALAR --enable-ecmult-static-precomputation=$STATICPRECOMPUTATION --enable-module-ecdh=$ECDH --enable-module-schnorr=$SCHNORR --enable-module-recovery=$RECOVERY $EXTRAFLAGS $USE_HOST && make -j2 $BUILD
 os: linux
diff --git a/Makefile.am b/Makefile.am
index 7772a4e9d282c..3d130bdcbd717 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,12 @@
 ACLOCAL_AMFLAGS = -I build-aux/m4
 
 lib_LTLIBRARIES = libsecp256k1.la
+if USE_JNI
+JNI_LIB = libsecp256k1_jni.la
+noinst_LTLIBRARIES = $(JNI_LIB)
+else
+JNI_LIB =
+endif
 include_HEADERS = include/secp256k1.h
 noinst_HEADERS =
 noinst_HEADERS += src/scalar.h
@@ -32,6 +38,7 @@ noinst_HEADERS += src/field_5x52_impl.h
 noinst_HEADERS += src/field_5x52_int128_impl.h
 noinst_HEADERS += src/field_5x52_asm_impl.h
 noinst_HEADERS += src/java/org_bitcoin_NativeSecp256k1.h
+noinst_HEADERS += src/java/org_bitcoin_Secp256k1Context.h
 noinst_HEADERS += src/util.h
 noinst_HEADERS += src/testrand.h
 noinst_HEADERS += src/testrand_impl.h
@@ -45,35 +52,80 @@ noinst_HEADERS += contrib/lax_der_parsing.c
 noinst_HEADERS += contrib/lax_der_privatekey_parsing.h
 noinst_HEADERS += contrib/lax_der_privatekey_parsing.c
 
+if USE_EXTERNAL_ASM
+COMMON_LIB = libsecp256k1_common.la
+noinst_LTLIBRARIES = $(COMMON_LIB)
+else
+COMMON_LIB =
+endif
+
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libsecp256k1.pc
 
+if USE_EXTERNAL_ASM
+if USE_ASM_ARM
+libsecp256k1_common_la_SOURCES = src/asm/field_10x26_arm.s
+endif
+endif
+
 libsecp256k1_la_SOURCES = src/secp256k1.c
-libsecp256k1_la_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src $(SECP_INCLUDES)
-libsecp256k1_la_LIBADD = $(SECP_LIBS)
+libsecp256k1_la_CPPFLAGS = -DSECP256K1_BUILD -I$(top_srcdir)/include -I$(top_srcdir)/src $(SECP_INCLUDES)
+libsecp256k1_la_LIBADD = $(JNI_LIB) $(SECP_LIBS) $(COMMON_LIB)
 
+libsecp256k1_jni_la_SOURCES  = src/java/org_bitcoin_NativeSecp256k1.c src/java/org_bitcoin_Secp256k1Context.c
+libsecp256k1_jni_la_CPPFLAGS = -DSECP256K1_BUILD $(JNI_INCLUDES)
 
 noinst_PROGRAMS =
 if USE_BENCHMARK
 noinst_PROGRAMS += bench_verify bench_sign bench_internal
 bench_verify_SOURCES = src/bench_verify.c
-bench_verify_LDADD = libsecp256k1.la $(SECP_LIBS)
+bench_verify_LDADD = libsecp256k1.la $(SECP_LIBS) $(SECP_TEST_LIBS) $(COMMON_LIB)
 bench_sign_SOURCES = src/bench_sign.c
-bench_sign_LDADD = libsecp256k1.la $(SECP_LIBS)
+bench_sign_LDADD = libsecp256k1.la $(SECP_LIBS) $(SECP_TEST_LIBS) $(COMMON_LIB)
 bench_internal_SOURCES = src/bench_internal.c
-bench_internal_LDADD = $(SECP_LIBS)
-bench_internal_CPPFLAGS = $(SECP_INCLUDES)
+bench_internal_LDADD = $(SECP_LIBS) $(COMMON_LIB)
+bench_internal_CPPFLAGS = -DSECP256K1_BUILD $(SECP_INCLUDES)
 endif
 
 if USE_TESTS
 noinst_PROGRAMS += tests
 tests_SOURCES = src/tests.c
-tests_CPPFLAGS = -DVERIFY -I$(top_srcdir)/src -I$(top_srcdir)/include $(SECP_INCLUDES) $(SECP_TEST_INCLUDES)
-tests_LDADD = $(SECP_LIBS) $(SECP_TEST_LIBS)
+tests_CPPFLAGS = -DSECP256K1_BUILD -DVERIFY -I$(top_srcdir)/src -I$(top_srcdir)/include $(SECP_INCLUDES) $(SECP_TEST_INCLUDES)
+tests_LDADD = $(SECP_LIBS) $(SECP_TEST_LIBS) $(COMMON_LIB)
 tests_LDFLAGS = -static
 TESTS = tests
 endif
 
+JAVAROOT=src/java
+JAVAORG=org/bitcoin
+JAVA_GUAVA=$(srcdir)/$(JAVAROOT)/guava/guava-18.0.jar
+CLASSPATH_ENV=CLASSPATH=$(JAVA_GUAVA)
+JAVA_FILES= \
+  $(JAVAROOT)/$(JAVAORG)/NativeSecp256k1.java \
+  $(JAVAROOT)/$(JAVAORG)/NativeSecp256k1Test.java \
+  $(JAVAROOT)/$(JAVAORG)/NativeSecp256k1Util.java \
+  $(JAVAROOT)/$(JAVAORG)/Secp256k1Context.java
+
+if USE_JNI
+
+$(JAVA_GUAVA):
+	@echo Guava is missing. Fetch it via: \
+	wget https://search.maven.org/remotecontent?filepath=com/google/guava/guava/18.0/guava-18.0.jar -O $(@)
+	@false
+
+.stamp-java: $(JAVA_FILES)
+	@echo   Compiling $^
+	$(AM_V_at)$(CLASSPATH_ENV) javac $^
+	@touch $@
+
+if USE_TESTS
+
+check-java: libsecp256k1.la $(JAVA_GUAVA) .stamp-java
+	$(AM_V_at)java -Djava.library.path="./:./src:./src/.libs:.libs/" -cp "$(JAVA_GUAVA):$(JAVAROOT)" $(JAVAORG)/NativeSecp256k1Test
+
+endif
+endif
+
 if USE_ECMULT_STATIC_PRECOMPUTATION
 CPPFLAGS_FOR_BUILD +=-I$(top_srcdir)
 CFLAGS_FOR_BUILD += -Wall -Wextra -Wno-unused-function
@@ -93,10 +145,10 @@ $(bench_internal_OBJECTS): src/ecmult_static_context.h
 src/ecmult_static_context.h: $(gen_context_BIN)
 	./$(gen_context_BIN)
 
-CLEANFILES = $(gen_context_BIN) src/ecmult_static_context.h
+CLEANFILES = $(gen_context_BIN) src/ecmult_static_context.h $(JAVAROOT)/$(JAVAORG)/*.class .stamp-java
 endif
 
-EXTRA_DIST = autogen.sh src/gen_context.c src/basic-config.h
+EXTRA_DIST = autogen.sh src/gen_context.c src/basic-config.h $(JAVA_FILES)
 
 if ENABLE_MODULE_ECDH
 include src/modules/ecdh/Makefile.am.include
diff --git a/README.md b/README.md
index 6095db42205be..8cd344ea81232 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 libsecp256k1
 ============
 
-[![Build Status](https://travis-ci.org/bitcoin/secp256k1.svg?branch=master)](https://travis-ci.org/bitcoin/secp256k1)
+[![Build Status](https://travis-ci.org/bitcoin-core/secp256k1.svg?branch=master)](https://travis-ci.org/bitcoin-core/secp256k1)
 
 Optimized C library for EC operations on curve secp256k1.
 
diff --git a/build-aux/m4/ax_jni_include_dir.m4 b/build-aux/m4/ax_jni_include_dir.m4
new file mode 100644
index 0000000000000..1fc36276144a2
--- /dev/null
+++ b/build-aux/m4/ax_jni_include_dir.m4
@@ -0,0 +1,140 @@
+# ===========================================================================
+#    http://www.gnu.org/software/autoconf-archive/ax_jni_include_dir.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+#   AX_JNI_INCLUDE_DIR
+#
+# DESCRIPTION
+#
+#   AX_JNI_INCLUDE_DIR finds include directories needed for compiling
+#   programs using the JNI interface.
+#
+#   JNI include directories are usually in the Java distribution. This is
+#   deduced from the value of $JAVA_HOME, $JAVAC, or the path to "javac", in
+#   that order. When this macro completes, a list of directories is left in
+#   the variable JNI_INCLUDE_DIRS.
+#
+#   Example usage follows:
+#
+#     AX_JNI_INCLUDE_DIR
+#
+#     for JNI_INCLUDE_DIR in $JNI_INCLUDE_DIRS
+#     do
+#             CPPFLAGS="$CPPFLAGS -I$JNI_INCLUDE_DIR"
+#     done
+#
+#   If you want to force a specific compiler:
+#
+#   - at the configure.in level, set JAVAC=yourcompiler before calling
+#   AX_JNI_INCLUDE_DIR
+#
+#   - at the configure level, setenv JAVAC
+#
+#   Note: This macro can work with the autoconf M4 macros for Java programs.
+#   This particular macro is not part of the original set of macros.
+#
+# LICENSE
+#
+#   Copyright (c) 2008 Don Anderson <dda@sleepycat.com>
+#
+#   Copying and distribution of this file, with or without modification, are
+#   permitted in any medium without royalty provided the copyright notice
+#   and this notice are preserved. This file is offered as-is, without any
+#   warranty.
+
+#serial 10
+
+AU_ALIAS([AC_JNI_INCLUDE_DIR], [AX_JNI_INCLUDE_DIR])
+AC_DEFUN([AX_JNI_INCLUDE_DIR],[
+
+JNI_INCLUDE_DIRS=""
+
+if test "x$JAVA_HOME" != x; then
+	_JTOPDIR="$JAVA_HOME"
+else
+	if test "x$JAVAC" = x; then
+		JAVAC=javac
+	fi
+	AC_PATH_PROG([_ACJNI_JAVAC], [$JAVAC], [no])
+	if test "x$_ACJNI_JAVAC" = xno; then
+		AC_MSG_WARN([cannot find JDK; try setting \$JAVAC or \$JAVA_HOME])
+	fi
+	_ACJNI_FOLLOW_SYMLINKS("$_ACJNI_JAVAC")
+	_JTOPDIR=`echo "$_ACJNI_FOLLOWED" | sed -e 's://*:/:g' -e 's:/[[^/]]*$::'`
+fi
+
+case "$host_os" in
+        darwin*)        _JTOPDIR=`echo "$_JTOPDIR" | sed -e 's:/[[^/]]*$::'`
+                        _JINC="$_JTOPDIR/Headers";;
+        *)              _JINC="$_JTOPDIR/include";;
+esac
+_AS_ECHO_LOG([_JTOPDIR=$_JTOPDIR])
+_AS_ECHO_LOG([_JINC=$_JINC])
+
+# On Mac OS X 10.6.4, jni.h is a symlink:
+# /System/Library/Frameworks/JavaVM.framework/Versions/Current/Headers/jni.h
+# -> ../../CurrentJDK/Headers/jni.h.
+
+AC_CACHE_CHECK(jni headers, ac_cv_jni_header_path,
+[
+if test -f "$_JINC/jni.h"; then
+  ac_cv_jni_header_path="$_JINC"
+  JNI_INCLUDE_DIRS="$JNI_INCLUDE_DIRS $ac_cv_jni_header_path"
+else
+  _JTOPDIR=`echo "$_JTOPDIR" | sed -e 's:/[[^/]]*$::'`
+  if test -f "$_JTOPDIR/include/jni.h"; then
+    ac_cv_jni_header_path="$_JTOPDIR/include"
+    JNI_INCLUDE_DIRS="$JNI_INCLUDE_DIRS $ac_cv_jni_header_path"
+  else
+    ac_cv_jni_header_path=none
+  fi
+fi
+])
+
+
+
+# get the likely subdirectories for system specific java includes
+case "$host_os" in
+bsdi*)          _JNI_INC_SUBDIRS="bsdos";;
+darwin*)        _JNI_INC_SUBDIRS="darwin";;
+freebsd*)       _JNI_INC_SUBDIRS="freebsd";;
+linux*)         _JNI_INC_SUBDIRS="linux genunix";;
+osf*)           _JNI_INC_SUBDIRS="alpha";;
+solaris*)       _JNI_INC_SUBDIRS="solaris";;
+mingw*)		_JNI_INC_SUBDIRS="win32";;
+cygwin*)	_JNI_INC_SUBDIRS="win32";;
+*)              _JNI_INC_SUBDIRS="genunix";;
+esac
+
+if test "x$ac_cv_jni_header_path" != "xnone"; then
+  # add any subdirectories that are present
+  for JINCSUBDIR in $_JNI_INC_SUBDIRS
+  do
+      if test -d "$_JTOPDIR/include/$JINCSUBDIR"; then
+           JNI_INCLUDE_DIRS="$JNI_INCLUDE_DIRS $_JTOPDIR/include/$JINCSUBDIR"
+      fi
+  done
+fi
+])
+
+# _ACJNI_FOLLOW_SYMLINKS <path>
+# Follows symbolic links on <path>,
+# finally setting variable _ACJNI_FOLLOWED
+# ----------------------------------------
+AC_DEFUN([_ACJNI_FOLLOW_SYMLINKS],[
+# find the include directory relative to the javac executable
+_cur="$1"
+while ls -ld "$_cur" 2>/dev/null | grep " -> " >/dev/null; do
+        AC_MSG_CHECKING([symlink for $_cur])
+        _slink=`ls -ld "$_cur" | sed 's/.* -> //'`
+        case "$_slink" in
+        /*) _cur="$_slink";;
+        # 'X' avoids triggering unwanted echo options.
+        *) _cur=`echo "X$_cur" | sed -e 's/^X//' -e 's:[[^/]]*$::'`"$_slink";;
+        esac
+        AC_MSG_RESULT([$_cur])
+done
+_ACJNI_FOLLOWED="$_cur"
+])# _ACJNI
diff --git a/build-aux/m4/bitcoin_secp.m4 b/build-aux/m4/bitcoin_secp.m4
index d41bbb648708b..b25d8adb92c7f 100644
--- a/build-aux/m4/bitcoin_secp.m4
+++ b/build-aux/m4/bitcoin_secp.m4
@@ -3,13 +3,13 @@ AC_DEFUN([SECP_INT128_CHECK],[
 has_int128=$ac_cv_type___int128
 ])
 
-dnl 
+dnl escape "$0x" below using the m4 quadrigaph @S|@, and escape it again with a \ for the shell.
 AC_DEFUN([SECP_64BIT_ASM_CHECK],[
 AC_MSG_CHECKING(for x86_64 assembly availability)
 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
   #include <stdint.h>]],[[
   uint64_t a = 11, tmp;
-  __asm__ __volatile__("movq $0x100000000,%1; mulq %%rsi" : "+a"(a) : "S"(tmp) : "cc", "%rdx");
+  __asm__ __volatile__("movq \@S|@0x100000000,%1; mulq %%rsi" : "+a"(a) : "S"(tmp) : "cc", "%rdx");
   ]])],[has_64bit_asm=yes],[has_64bit_asm=no])
 AC_MSG_RESULT([$has_64bit_asm])
 ])
diff --git a/configure.ac b/configure.ac
index 786d8dcfb99ec..0743c36690c7a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -29,6 +29,7 @@ AC_PROG_CC_C89
 if test x"$ac_cv_prog_cc_c89" = x"no"; then
   AC_MSG_ERROR([c89 compiler support required])
 fi
+AM_PROG_AS
 
 case $host_os in
   *darwin*)
@@ -93,23 +94,33 @@ AC_ARG_ENABLE(tests,
     [use_tests=$enableval],
     [use_tests=yes])
 
+AC_ARG_ENABLE(openssl_tests,
+    AS_HELP_STRING([--enable-openssl-tests],[enable OpenSSL tests, if OpenSSL is available (default is auto)]),
+    [enable_openssl_tests=$enableval],
+    [enable_openssl_tests=auto])
+
+AC_ARG_ENABLE(experimental,
+    AS_HELP_STRING([--enable-experimental],[allow experimental configure options (default is no)]),
+    [use_experimental=$enableval],
+    [use_experimental=no])
+
 AC_ARG_ENABLE(endomorphism,
     AS_HELP_STRING([--enable-endomorphism],[enable endomorphism (default is no)]),
     [use_endomorphism=$enableval],
     [use_endomorphism=no])
-    
+
 AC_ARG_ENABLE(ecmult_static_precomputation,
     AS_HELP_STRING([--enable-ecmult-static-precomputation],[enable precomputed ecmult table for signing (default is yes)]),
     [use_ecmult_static_precomputation=$enableval],
-    [use_ecmult_static_precomputation=yes])
+    [use_ecmult_static_precomputation=auto])
 
 AC_ARG_ENABLE(module_ecdh,
-    AS_HELP_STRING([--enable-module-ecdh],[enable ECDH shared secret computation (default is no)]),
+    AS_HELP_STRING([--enable-module-ecdh],[enable ECDH shared secret computation (experimental)]),
     [enable_module_ecdh=$enableval],
     [enable_module_ecdh=no])
 
 AC_ARG_ENABLE(module_schnorr,
-    AS_HELP_STRING([--enable-module-schnorr],[enable Schnorr signature module (default is no)]),
+    AS_HELP_STRING([--enable-module-schnorr],[enable Schnorr signature module (experimental)]),
     [enable_module_schnorr=$enableval],
     [enable_module_schnorr=no])
 
@@ -118,6 +129,11 @@ AC_ARG_ENABLE(module_recovery,
     [enable_module_recovery=$enableval],
     [enable_module_recovery=no])
 
+AC_ARG_ENABLE(jni,
+    AS_HELP_STRING([--enable-jni],[enable libsecp256k1_jni (default is auto)]),
+    [use_jni=$enableval],
+    [use_jni=auto])
+
 AC_ARG_WITH([field], [AS_HELP_STRING([--with-field=64bit|32bit|auto],
 [Specify Field Implementation. Default is auto])],[req_field=$withval], [req_field=auto])
 
@@ -127,8 +143,8 @@ AC_ARG_WITH([bignum], [AS_HELP_STRING([--with-bignum=gmp|no|auto],
 AC_ARG_WITH([scalar], [AS_HELP_STRING([--with-scalar=64bit|32bit|auto],
 [Specify scalar implementation. Default is auto])],[req_scalar=$withval], [req_scalar=auto])
 
-AC_ARG_WITH([asm], [AS_HELP_STRING([--with-asm=x86_64|no|auto]
-[Specify assembly optimizations to use. Default is auto])],[req_asm=$withval], [req_asm=auto])
+AC_ARG_WITH([asm], [AS_HELP_STRING([--with-asm=x86_64|arm|no|auto]
+[Specify assembly optimizations to use. Default is auto (experimental: arm)])],[req_asm=$withval], [req_asm=auto])
 
 AC_CHECK_TYPES([__int128])
 
@@ -138,6 +154,34 @@ AC_COMPILE_IFELSE([AC_LANG_SOURCE([[void myfunc() {__builtin_expect(0,0);}]])],
     [ AC_MSG_RESULT([no])
     ])
 
+if test x"$use_ecmult_static_precomputation" != x"no"; then
+  save_cross_compiling=$cross_compiling
+  cross_compiling=no
+  TEMP_CC="$CC"
+  CC="$CC_FOR_BUILD"
+  AC_MSG_CHECKING([native compiler: ${CC_FOR_BUILD}])
+  AC_RUN_IFELSE(
+    [AC_LANG_PROGRAM([], [return 0])],
+    [working_native_cc=yes],
+    [working_native_cc=no],[dnl])
+  CC="$TEMP_CC"
+  cross_compiling=$save_cross_compiling
+
+  if test x"$working_native_cc" = x"no"; then
+    set_precomp=no
+    if test x"$use_ecmult_static_precomputation" = x"yes";  then
+      AC_MSG_ERROR([${CC_FOR_BUILD} does not produce working binaries. Please set CC_FOR_BUILD])
+    else
+      AC_MSG_RESULT([${CC_FOR_BUILD} does not produce working binaries. Please set CC_FOR_BUILD])
+    fi
+  else
+    AC_MSG_RESULT([ok])
+    set_precomp=yes
+  fi
+else
+  set_precomp=no
+fi
+
 if test x"$req_asm" = x"auto"; then
   SECP_64BIT_ASM_CHECK
   if test x"$has_64bit_asm" = x"yes"; then
@@ -155,6 +199,8 @@ else
       AC_MSG_ERROR([x86_64 assembly optimization requested but not available])
     fi
     ;;
+  arm)
+    ;;
   no)
     ;;
   *)
@@ -247,10 +293,15 @@ else
 fi
 
 # select assembly optimization
+use_external_asm=no
+
 case $set_asm in
 x86_64)
   AC_DEFINE(USE_ASM_X86_64, 1, [Define this symbol to enable x86_64 assembly optimizations])
   ;;
+arm)
+  use_external_asm=yes
+  ;;
 no)
   ;;
 *)
@@ -305,16 +356,51 @@ esac
 if test x"$use_tests" = x"yes"; then
   SECP_OPENSSL_CHECK
   if test x"$has_openssl_ec" = x"yes"; then
-    AC_DEFINE(ENABLE_OPENSSL_TESTS, 1, [Define this symbol if OpenSSL EC functions are available])
-    SECP_TEST_INCLUDES="$SSL_CFLAGS $CRYPTO_CFLAGS"
-    SECP_TEST_LIBS="$CRYPTO_LIBS"
-
-    case $host in
-    *mingw*)
-      SECP_TEST_LIBS="$SECP_TEST_LIBS -lgdi32"
-      ;;
-    esac
+    if test x"$enable_openssl_tests" != x"no"; then
+      AC_DEFINE(ENABLE_OPENSSL_TESTS, 1, [Define this symbol if OpenSSL EC functions are available])
+      SECP_TEST_INCLUDES="$SSL_CFLAGS $CRYPTO_CFLAGS"
+      SECP_TEST_LIBS="$CRYPTO_LIBS"
+
+      case $host in
+      *mingw*)
+        SECP_TEST_LIBS="$SECP_TEST_LIBS -lgdi32"
+        ;;
+      esac
+    fi
+  else
+    if test x"$enable_openssl_tests" = x"yes"; then
+      AC_MSG_ERROR([OpenSSL tests requested but OpenSSL with EC support is not available])
+    fi
+  fi
+else
+  if test x"$enable_openssl_tests" = x"yes"; then
+    AC_MSG_ERROR([OpenSSL tests requested but tests are not enabled])
+  fi
+fi
 
+if test x"$use_jni" != x"no"; then
+  AX_JNI_INCLUDE_DIR
+  have_jni_dependencies=yes
+  if test x"$enable_module_schnorr" = x"no"; then
+    have_jni_dependencies=no
+  fi
+  if test x"$enable_module_ecdh" = x"no"; then
+    have_jni_dependencies=no
+  fi
+  if test "x$JNI_INCLUDE_DIRS" = "x"; then
+    have_jni_dependencies=no
+  fi
+  if test "x$have_jni_dependencies" = "xno"; then
+    if test x"$use_jni" = x"yes"; then
+      AC_MSG_ERROR([jni support explicitly requested but headers/dependencies were not found. Enable ECDH and Schnorr and try again.])
+    fi
+    AC_MSG_WARN([jni headers/dependencies not found. jni support disabled])
+    use_jni=no
+  else
+    use_jni=yes
+    for JNI_INCLUDE_DIR in $JNI_INCLUDE_DIRS; do
+      JNI_INCLUDES="$JNI_INCLUDES -I$JNI_INCLUDE_DIR"
+    done
   fi
 fi
 
@@ -345,18 +431,43 @@ fi
 
 AC_C_BIGENDIAN()
 
+if test x"$use_external_asm" = x"yes"; then
+  AC_DEFINE(USE_EXTERNAL_ASM, 1, [Define this symbol if an external (non-inline) assembly implementation is used])
+fi
+
+AC_MSG_NOTICE([Using static precomputation: $set_precomp])
 AC_MSG_NOTICE([Using assembly optimizations: $set_asm])
 AC_MSG_NOTICE([Using field implementation: $set_field])
 AC_MSG_NOTICE([Using bignum implementation: $set_bignum])
 AC_MSG_NOTICE([Using scalar implementation: $set_scalar])
 AC_MSG_NOTICE([Using endomorphism optimizations: $use_endomorphism])
 AC_MSG_NOTICE([Building ECDH module: $enable_module_ecdh])
-
 AC_MSG_NOTICE([Building Schnorr signatures module: $enable_module_schnorr])
 AC_MSG_NOTICE([Building ECDSA pubkey recovery module: $enable_module_recovery])
+AC_MSG_NOTICE([Using jni: $use_jni])
+
+if test x"$enable_experimental" = x"yes"; then
+  AC_MSG_NOTICE([******])
+  AC_MSG_NOTICE([WARNING: experimental build])
+  AC_MSG_NOTICE([Experimental features do not have stable APIs or properties, and may not be safe for production use.])
+  AC_MSG_NOTICE([Building ECDH module: $enable_module_ecdh])
+  AC_MSG_NOTICE([Building Schnorr signatures module: $enable_module_schnorr])
+  AC_MSG_NOTICE([******])
+else
+  if test x"$enable_module_schnorr" = x"yes"; then
+    AC_MSG_ERROR([Schnorr signature module is experimental. Use --enable-experimental to allow.])
+  fi
+  if test x"$enable_module_ecdh" = x"yes"; then
+    AC_MSG_ERROR([ECDH module is experimental. Use --enable-experimental to allow.])
+  fi
+  if test x"$set_asm" = x"arm"; then
+    AC_MSG_ERROR([ARM assembly optimization is experimental. Use --enable-experimental to allow.])
+  fi
+fi
 
 AC_CONFIG_HEADERS([src/libsecp256k1-config.h])
 AC_CONFIG_FILES([Makefile libsecp256k1.pc])
+AC_SUBST(JNI_INCLUDES)
 AC_SUBST(SECP_INCLUDES)
 AC_SUBST(SECP_LIBS)
 AC_SUBST(SECP_TEST_LIBS)
@@ -367,6 +478,9 @@ AM_CONDITIONAL([USE_ECMULT_STATIC_PRECOMPUTATION], [test x"$use_ecmult_static_pr
 AM_CONDITIONAL([ENABLE_MODULE_ECDH], [test x"$enable_module_ecdh" = x"yes"])
 AM_CONDITIONAL([ENABLE_MODULE_SCHNORR], [test x"$enable_module_schnorr" = x"yes"])
 AM_CONDITIONAL([ENABLE_MODULE_RECOVERY], [test x"$enable_module_recovery" = x"yes"])
+AM_CONDITIONAL([USE_JNI], [test x"$use_jni" == x"yes"])
+AM_CONDITIONAL([USE_EXTERNAL_ASM], [test x"$use_external_asm" = x"yes"])
+AM_CONDITIONAL([USE_ASM_ARM], [test x"$set_asm" = x"arm"])
 
 dnl make sure nothing new is exported so that we don't break the cache
 PKGCONFIG_PATH_TEMP="$PKG_CONFIG_PATH"
diff --git a/libsecp256k1.pc.in b/libsecp256k1.pc.in
index 1c72dd00037b5..a0d006f1131f4 100644
--- a/libsecp256k1.pc.in
+++ b/libsecp256k1.pc.in
@@ -5,7 +5,7 @@ includedir=@includedir@
 
 Name: libsecp256k1
 Description: Optimized C library for EC operations on curve secp256k1
-URL: https://github.com/bitcoin/secp256k1
+URL: https://github.com/bitcoin-core/secp256k1
 Version: @PACKAGE_VERSION@
 Cflags: -I${includedir}
 Libs.private: @SECP_LIBS@
diff --git a/sage/group_prover.sage b/sage/group_prover.sage
new file mode 100644
index 0000000000000..ab580c5b23bbf
--- /dev/null
+++ b/sage/group_prover.sage
@@ -0,0 +1,322 @@
+# This code supports verifying group implementations which have branches
+# or conditional statements (like cmovs), by allowing each execution path
+# to independently set assumptions on input or intermediary variables.
+#
+# The general approach is:
+# * A constraint is a tuple of two sets of of symbolic expressions:
+#   the first of which are required to evaluate to zero, the second of which
+#   are required to evaluate to nonzero.
+#   - A constraint is said to be conflicting if any of its nonzero expressions
+#     is in the ideal with basis the zero expressions (in other words: when the
+#     zero expressions imply that one of the nonzero expressions are zero).
+# * There is a list of laws that describe the intended behaviour, including
+#   laws for addition and doubling. Each law is called with the symbolic point
+#   coordinates as arguments, and returns:
+#   - A constraint describing the assumptions under which it is applicable,
+#     called "assumeLaw"
+#   - A constraint describing the requirements of the law, called "require"
+# * Implementations are transliterated into functions that operate as well on
+#   algebraic input points, and are called once per combination of branches
+#   exectured. Each execution returns:
+#   - A constraint describing the assumptions this implementation requires
+#     (such as Z1=1), called "assumeFormula"
+#   - A constraint describing the assumptions this specific branch requires,
+#     but which is by construction guaranteed to cover the entire space by
+#     merging the results from all branches, called "assumeBranch"
+#   - The result of the computation
+# * All combinations of laws with implementation branches are tried, and:
+#   - If the combination of assumeLaw, assumeFormula, and assumeBranch results
+#     in a conflict, it means this law does not apply to this branch, and it is
+#     skipped.
+#   - For others, we try to prove the require constraints hold, assuming the
+#     information in assumeLaw + assumeFormula + assumeBranch, and if this does
+#     not succeed, we fail.
+#     + To prove an expression is zero, we check whether it belongs to the
+#       ideal with the assumed zero expressions as basis. This test is exact.
+#     + To prove an expression is nonzero, we check whether each of its
+#       factors is contained in the set of nonzero assumptions' factors.
+#       This test is not exact, so various combinations of original and
+#       reduced expressions' factors are tried.
+#   - If we succeed, we print out the assumptions from assumeFormula that
+#     weren't implied by assumeLaw already. Those from assumeBranch are skipped,
+#     as we assume that all constraints in it are complementary with each other.
+#
+# Based on the sage verification scripts used in the Explicit-Formulas Database
+# by Tanja Lange and others, see http://hyperelliptic.org/EFD
+
+class fastfrac:
+  """Fractions over rings."""
+
+  def __init__(self,R,top,bot=1):
+    """Construct a fractional, given a ring, a numerator, and denominator."""
+    self.R = R
+    if parent(top) == ZZ or parent(top) == R:
+      self.top = R(top)
+      self.bot = R(bot)
+    elif top.__class__ == fastfrac:
+      self.top = top.top
+      self.bot = top.bot * bot
+    else:
+      self.top = R(numerator(top))
+      self.bot = R(denominator(top)) * bot
+
+  def iszero(self,I):
+    """Return whether this fraction is zero given an ideal."""
+    return self.top in I and self.bot not in I
+
+  def reduce(self,assumeZero):
+    zero = self.R.ideal(map(numerator, assumeZero))
+    return fastfrac(self.R, zero.reduce(self.top)) / fastfrac(self.R, zero.reduce(self.bot))
+
+  def __add__(self,other):
+    """Add two fractions."""
+    if parent(other) == ZZ:
+      return fastfrac(self.R,self.top + self.bot * other,self.bot)
+    if other.__class__ == fastfrac:
+      return fastfrac(self.R,self.top * other.bot + self.bot * other.top,self.bot * other.bot)
+    return NotImplemented
+
+  def __sub__(self,other):
+    """Subtract two fractions."""
+    if parent(other) == ZZ:
+      return fastfrac(self.R,self.top - self.bot * other,self.bot)
+    if other.__class__ == fastfrac:
+      return fastfrac(self.R,self.top * other.bot - self.bot * other.top,self.bot * other.bot)
+    return NotImplemented
+
+  def __neg__(self):
+    """Return the negation of a fraction."""
+    return fastfrac(self.R,-self.top,self.bot)
+
+  def __mul__(self,other):
+    """Multiply two fractions."""
+    if parent(other) == ZZ:
+      return fastfrac(self.R,self.top * other,self.bot)
+    if other.__class__ == fastfrac:
+      return fastfrac(self.R,self.top * other.top,self.bot * other.bot)
+    return NotImplemented
+
+  def __rmul__(self,other):
+    """Multiply something else with a fraction."""
+    return self.__mul__(other)
+
+  def __div__(self,other):
+    """Divide two fractions."""
+    if parent(other) == ZZ:
+      return fastfrac(self.R,self.top,self.bot * other)
+    if other.__class__ == fastfrac:
+      return fastfrac(self.R,self.top * other.bot,self.bot * other.top)
+    return NotImplemented
+
+  def __pow__(self,other):
+    """Compute a power of a fraction."""
+    if parent(other) == ZZ:
+      if other < 0:
+        # Negative powers require flipping top and bottom
+        return fastfrac(self.R,self.bot ^ (-other),self.top ^ (-other))
+      else:
+        return fastfrac(self.R,self.top ^ other,self.bot ^ other)
+    return NotImplemented
+
+  def __str__(self):
+    return "fastfrac((" + str(self.top) + ") / (" + str(self.bot) + "))"
+  def __repr__(self):
+    return "%s" % self
+
+  def numerator(self):
+    return self.top
+
+class constraints:
+  """A set of constraints, consisting of zero and nonzero expressions.
+
+  Constraints can either be used to express knowledge or a requirement.
+
+  Both the fields zero and nonzero are maps from expressions to description
+  strings. The expressions that are the keys in zero are required to be zero,
+  and the expressions that are the keys in nonzero are required to be nonzero.
+
+  Note that (a != 0) and (b != 0) is the same as (a*b != 0), so all keys in
+  nonzero could be multiplied into a single key. This is often much less
+  efficient to work with though, so we keep them separate inside the
+  constraints. This allows higher-level code to do fast checks on the individual
+  nonzero elements, or combine them if needed for stronger checks.
+
+  We can't multiply the different zero elements, as it would suffice for one of
+  the factors to be zero, instead of all of them. Instead, the zero elements are
+  typically combined into an ideal first.
+  """
+
+  def __init__(self, **kwargs):
+    if 'zero' in kwargs:
+      self.zero = dict(kwargs['zero'])
+    else:
+      self.zero = dict()
+    if 'nonzero' in kwargs:
+      self.nonzero = dict(kwargs['nonzero'])
+    else:
+      self.nonzero = dict()
+
+  def negate(self):
+    return constraints(zero=self.nonzero, nonzero=self.zero)
+
+  def __add__(self, other):
+    zero = self.zero.copy()
+    zero.update(other.zero)
+    nonzero = self.nonzero.copy()
+    nonzero.update(other.nonzero)
+    return constraints(zero=zero, nonzero=nonzero)
+
+  def __str__(self):
+    return "constraints(zero=%s,nonzero=%s)" % (self.zero, self.nonzero)
+
+  def __repr__(self):
+    return "%s" % self
+
+
+def conflicts(R, con):
+  """Check whether any of the passed non-zero assumptions is implied by the zero assumptions"""
+  zero = R.ideal(map(numerator, con.zero))
+  if 1 in zero:
+    return True
+  # First a cheap check whether any of the individual nonzero terms conflict on
+  # their own.
+  for nonzero in con.nonzero:
+    if nonzero.iszero(zero):
+      return True
+  # It can be the case that entries in the nonzero set do not individually
+  # conflict with the zero set, but their combination does. For example, knowing
+  # that either x or y is zero is equivalent to having x*y in the zero set.
+  # Having x or y individually in the nonzero set is not a conflict, but both
+  # simultaneously is, so that is the right thing to check for.
+  if reduce(lambda a,b: a * b, con.nonzero, fastfrac(R, 1)).iszero(zero):
+    return True
+  return False
+
+
+def get_nonzero_set(R, assume):
+  """Calculate a simple set of nonzero expressions"""
+  zero = R.ideal(map(numerator, assume.zero))
+  nonzero = set()
+  for nz in map(numerator, assume.nonzero):
+    for (f,n) in nz.factor():
+      nonzero.add(f)
+    rnz = zero.reduce(nz)
+    for (f,n) in rnz.factor():
+      nonzero.add(f)
+  return nonzero
+
+
+def prove_nonzero(R, exprs, assume):
+  """Check whether an expression is provably nonzero, given assumptions"""
+  zero = R.ideal(map(numerator, assume.zero))
+  nonzero = get_nonzero_set(R, assume)
+  expl = set()
+  ok = True
+  for expr in exprs:
+    if numerator(expr) in zero:
+      return (False, [exprs[expr]])
+  allexprs = reduce(lambda a,b: numerator(a)*numerator(b), exprs, 1)
+  for (f, n) in allexprs.factor():
+    if f not in nonzero:
+      ok = False
+  if ok:
+    return (True, None)
+  ok = True
+  for (f, n) in zero.reduce(numerator(allexprs)).factor():
+    if f not in nonzero:
+      ok = False
+  if ok:
+    return (True, None)
+  ok = True
+  for expr in exprs:
+    for (f,n) in numerator(expr).factor():
+      if f not in nonzero:
+        ok = False
+  if ok:
+    return (True, None)
+  ok = True
+  for expr in exprs:
+    for (f,n) in zero.reduce(numerator(expr)).factor():
+      if f not in nonzero:
+        expl.add(exprs[expr])
+  if expl:
+    return (False, list(expl))
+  else:
+    return (True, None)
+
+
+def prove_zero(R, exprs, assume):
+  """Check whether all of the passed expressions are provably zero, given assumptions"""
+  r, e = prove_nonzero(R, dict(map(lambda x: (fastfrac(R, x.bot, 1), exprs[x]), exprs)), assume)
+  if not r:
+    return (False, map(lambda x: "Possibly zero denominator: %s" % x, e))
+  zero = R.ideal(map(numerator, assume.zero))
+  nonzero = prod(x for x in assume.nonzero)
+  expl = []
+  for expr in exprs:
+    if not expr.iszero(zero):
+      expl.append(exprs[expr])
+  if not expl:
+    return (True, None)
+  return (False, expl)
+
+
+def describe_extra(R, assume, assumeExtra):
+  """Describe what assumptions are added, given existing assumptions"""
+  zerox = assume.zero.copy()
+  zerox.update(assumeExtra.zero)
+  zero = R.ideal(map(numerator, assume.zero))
+  zeroextra = R.ideal(map(numerator, zerox))
+  nonzero = get_nonzero_set(R, assume)
+  ret = set()
+  # Iterate over the extra zero expressions
+  for base in assumeExtra.zero:
+    if base not in zero:
+      add = []
+      for (f, n) in numerator(base).factor():
+        if f not in nonzero:
+          add += ["%s" % f]
+      if add:
+        ret.add((" * ".join(add)) + " = 0 [%s]" % assumeExtra.zero[base])
+  # Iterate over the extra nonzero expressions
+  for nz in assumeExtra.nonzero:
+    nzr = zeroextra.reduce(numerator(nz))
+    if nzr not in zeroextra:
+      for (f,n) in nzr.factor():
+        if zeroextra.reduce(f) not in nonzero:
+          ret.add("%s != 0" % zeroextra.reduce(f))
+  return ", ".join(x for x in ret)
+
+
+def check_symbolic(R, assumeLaw, assumeAssert, assumeBranch, require):
+  """Check a set of zero and nonzero requirements, given a set of zero and nonzero assumptions"""
+  assume = assumeLaw + assumeAssert + assumeBranch
+
+  if conflicts(R, assume):
+    # This formula does not apply
+    return None
+
+  describe = describe_extra(R, assumeLaw + assumeBranch, assumeAssert)
+
+  ok, msg = prove_zero(R, require.zero, assume)
+  if not ok:
+    return "FAIL, %s fails (assuming %s)" % (str(msg), describe)
+
+  res, expl = prove_nonzero(R, require.nonzero, assume)
+  if not res:
+    return "FAIL, %s fails (assuming %s)" % (str(expl), describe)
+
+  if describe != "":
+    return "OK (assuming %s)" % describe
+  else:
+    return "OK"
+
+
+def concrete_verify(c):
+  for k in c.zero:
+    if k != 0:
+      return (False, c.zero[k])
+  for k in c.nonzero:
+    if k == 0:
+      return (False, c.nonzero[k])
+  return (True, None)
diff --git a/sage/secp256k1.sage b/sage/secp256k1.sage
new file mode 100644
index 0000000000000..a97e732f7fa3a
--- /dev/null
+++ b/sage/secp256k1.sage
@@ -0,0 +1,306 @@
+# Test libsecp256k1' group operation implementations using prover.sage
+
+import sys
+
+load("group_prover.sage")
+load("weierstrass_prover.sage")
+
+def formula_secp256k1_gej_double_var(a):
+  """libsecp256k1's secp256k1_gej_double_var, used by various addition functions"""
+  rz = a.Z * a.Y
+  rz = rz * 2
+  t1 = a.X^2
+  t1 = t1 * 3
+  t2 = t1^2
+  t3 = a.Y^2
+  t3 = t3 * 2
+  t4 = t3^2
+  t4 = t4 * 2
+  t3 = t3 * a.X
+  rx = t3
+  rx = rx * 4
+  rx = -rx
+  rx = rx + t2
+  t2 = -t2
+  t3 = t3 * 6
+  t3 = t3 + t2
+  ry = t1 * t3
+  t2 = -t4
+  ry = ry + t2
+  return jacobianpoint(rx, ry, rz)
+
+def formula_secp256k1_gej_add_var(branch, a, b):
+  """libsecp256k1's secp256k1_gej_add_var"""
+  if branch == 0:
+    return (constraints(), constraints(nonzero={a.Infinity : 'a_infinite'}), b)
+  if branch == 1:
+    return (constraints(), constraints(zero={a.Infinity : 'a_finite'}, nonzero={b.Infinity : 'b_infinite'}), a)
+  z22 = b.Z^2
+  z12 = a.Z^2
+  u1 = a.X * z22
+  u2 = b.X * z12
+  s1 = a.Y * z22
+  s1 = s1 * b.Z
+  s2 = b.Y * z12
+  s2 = s2 * a.Z
+  h = -u1
+  h = h + u2
+  i = -s1
+  i = i + s2
+  if branch == 2:
+    r = formula_secp256k1_gej_double_var(a)
+    return (constraints(), constraints(zero={h : 'h=0', i : 'i=0', a.Infinity : 'a_finite', b.Infinity : 'b_finite'}), r)
+  if branch == 3:
+    return (constraints(), constraints(zero={h : 'h=0', a.Infinity : 'a_finite', b.Infinity : 'b_finite'}, nonzero={i : 'i!=0'}), point_at_infinity())
+  i2 = i^2
+  h2 = h^2
+  h3 = h2 * h
+  h = h * b.Z
+  rz = a.Z * h
+  t = u1 * h2
+  rx = t
+  rx = rx * 2
+  rx = rx + h3
+  rx = -rx
+  rx = rx + i2
+  ry = -rx
+  ry = ry + t
+  ry = ry * i
+  h3 = h3 * s1
+  h3 = -h3
+  ry = ry + h3
+  return (constraints(), constraints(zero={a.Infinity : 'a_finite', b.Infinity : 'b_finite'}, nonzero={h : 'h!=0'}), jacobianpoint(rx, ry, rz))
+
+def formula_secp256k1_gej_add_ge_var(branch, a, b):
+  """libsecp256k1's secp256k1_gej_add_ge_var, which assume bz==1"""
+  if branch == 0:
+    return (constraints(zero={b.Z - 1 : 'b.z=1'}), constraints(nonzero={a.Infinity : 'a_infinite'}), b)
+  if branch == 1:
+    return (constraints(zero={b.Z - 1 : 'b.z=1'}), constraints(zero={a.Infinity : 'a_finite'}, nonzero={b.Infinity : 'b_infinite'}), a)
+  z12 = a.Z^2
+  u1 = a.X
+  u2 = b.X * z12
+  s1 = a.Y
+  s2 = b.Y * z12
+  s2 = s2 * a.Z
+  h = -u1
+  h = h + u2
+  i = -s1
+  i = i + s2
+  if (branch == 2):
+    r = formula_secp256k1_gej_double_var(a)
+    return (constraints(zero={b.Z - 1 : 'b.z=1'}), constraints(zero={a.Infinity : 'a_finite', b.Infinity : 'b_finite', h : 'h=0', i : 'i=0'}), r)
+  if (branch == 3):
+    return (constraints(zero={b.Z - 1 : 'b.z=1'}), constraints(zero={a.Infinity : 'a_finite', b.Infinity : 'b_finite', h : 'h=0'}, nonzero={i : 'i!=0'}), point_at_infinity())
+  i2 = i^2
+  h2 = h^2
+  h3 = h * h2
+  rz = a.Z * h
+  t = u1 * h2
+  rx = t
+  rx = rx * 2
+  rx = rx + h3
+  rx = -rx
+  rx = rx + i2
+  ry = -rx
+  ry = ry + t
+  ry = ry * i
+  h3 = h3 * s1
+  h3 = -h3
+  ry = ry + h3
+  return (constraints(zero={b.Z - 1 : 'b.z=1'}), constraints(zero={a.Infinity : 'a_finite', b.Infinity : 'b_finite'}, nonzero={h : 'h!=0'}), jacobianpoint(rx, ry, rz))
+
+def formula_secp256k1_gej_add_zinv_var(branch, a, b):
+  """libsecp256k1's secp256k1_gej_add_zinv_var"""
+  bzinv = b.Z^(-1)
+  if branch == 0:
+    return (constraints(), constraints(nonzero={b.Infinity : 'b_infinite'}), a)
+  if branch == 1:
+    bzinv2 = bzinv^2
+    bzinv3 = bzinv2 * bzinv
+    rx = b.X * bzinv2
+    ry = b.Y * bzinv3
+    rz = 1
+    return (constraints(), constraints(zero={b.Infinity : 'b_finite'}, nonzero={a.Infinity : 'a_infinite'}), jacobianpoint(rx, ry, rz))
+  azz = a.Z * bzinv
+  z12 = azz^2
+  u1 = a.X
+  u2 = b.X * z12
+  s1 = a.Y
+  s2 = b.Y * z12
+  s2 = s2 * azz
+  h = -u1
+  h = h + u2
+  i = -s1
+  i = i + s2
+  if branch == 2:
+    r = formula_secp256k1_gej_double_var(a)
+    return (constraints(), constraints(zero={a.Infinity : 'a_finite', b.Infinity : 'b_finite', h : 'h=0', i : 'i=0'}), r)
+  if branch == 3:
+    return (constraints(), constraints(zero={a.Infinity : 'a_finite', b.Infinity : 'b_finite', h : 'h=0'}, nonzero={i : 'i!=0'}), point_at_infinity())
+  i2 = i^2
+  h2 = h^2
+  h3 = h * h2
+  rz = a.Z
+  rz = rz * h
+  t = u1 * h2
+  rx = t
+  rx = rx * 2
+  rx = rx + h3
+  rx = -rx
+  rx = rx + i2
+  ry = -rx
+  ry = ry + t
+  ry = ry * i
+  h3 = h3 * s1
+  h3 = -h3
+  ry = ry + h3
+  return (constraints(), constraints(zero={a.Infinity : 'a_finite', b.Infinity : 'b_finite'}, nonzero={h : 'h!=0'}), jacobianpoint(rx, ry, rz))
+
+def formula_secp256k1_gej_add_ge(branch, a, b):
+  """libsecp256k1's secp256k1_gej_add_ge"""
+  zeroes = {}
+  nonzeroes = {}
+  a_infinity = False
+  if (branch & 4) != 0:
+    nonzeroes.update({a.Infinity : 'a_infinite'})
+    a_infinity = True
+  else:
+    zeroes.update({a.Infinity : 'a_finite'})
+  zz = a.Z^2
+  u1 = a.X
+  u2 = b.X * zz
+  s1 = a.Y
+  s2 = b.Y * zz
+  s2 = s2 * a.Z
+  t = u1
+  t = t + u2
+  m = s1
+  m = m + s2
+  rr = t^2
+  m_alt = -u2
+  tt = u1 * m_alt
+  rr = rr + tt
+  degenerate = (branch & 3) == 3
+  if (branch & 1) != 0:
+    zeroes.update({m : 'm_zero'})
+  else:
+    nonzeroes.update({m : 'm_nonzero'})
+  if (branch & 2) != 0:
+    zeroes.update({rr : 'rr_zero'})
+  else:
+    nonzeroes.update({rr : 'rr_nonzero'})
+  rr_alt = s1
+  rr_alt = rr_alt * 2
+  m_alt = m_alt + u1
+  if not degenerate:
+    rr_alt = rr
+    m_alt = m
+  n = m_alt^2
+  q = n * t
+  n = n^2
+  if degenerate:
+    n = m
+  t = rr_alt^2
+  rz = a.Z * m_alt
+  infinity = False
+  if (branch & 8) != 0:
+    if not a_infinity:
+      infinity = True
+    zeroes.update({rz : 'r.z=0'})
+  else:
+    nonzeroes.update({rz : 'r.z!=0'})
+  rz = rz * 2
+  q = -q
+  t = t + q
+  rx = t
+  t = t * 2
+  t = t + q
+  t = t * rr_alt
+  t = t + n
+  ry = -t
+  rx = rx * 4
+  ry = ry * 4
+  if a_infinity:
+    rx = b.X
+    ry = b.Y
+    rz = 1
+  if infinity:
+    return (constraints(zero={b.Z - 1 : 'b.z=1', b.Infinity : 'b_finite'}), constraints(zero=zeroes, nonzero=nonzeroes), point_at_infinity())
+  return (constraints(zero={b.Z - 1 : 'b.z=1', b.Infinity : 'b_finite'}), constraints(zero=zeroes, nonzero=nonzeroes), jacobianpoint(rx, ry, rz))
+
+def formula_secp256k1_gej_add_ge_old(branch, a, b):
+  """libsecp256k1's old secp256k1_gej_add_ge, which fails when ay+by=0 but ax!=bx"""
+  a_infinity = (branch & 1) != 0
+  zero = {}
+  nonzero = {}
+  if a_infinity:
+    nonzero.update({a.Infinity : 'a_infinite'})
+  else:
+    zero.update({a.Infinity : 'a_finite'})
+  zz = a.Z^2
+  u1 = a.X
+  u2 = b.X * zz
+  s1 = a.Y
+  s2 = b.Y * zz
+  s2 = s2 * a.Z
+  z = a.Z
+  t = u1
+  t = t + u2
+  m = s1
+  m = m + s2
+  n = m^2
+  q = n * t
+  n = n^2
+  rr = t^2
+  t = u1 * u2
+  t = -t
+  rr = rr + t
+  t = rr^2
+  rz = m * z
+  infinity = False
+  if (branch & 2) != 0:
+    if not a_infinity:
+      infinity = True
+    else:
+      return (constraints(zero={b.Z - 1 : 'b.z=1', b.Infinity : 'b_finite'}), constraints(nonzero={z : 'conflict_a'}, zero={z : 'conflict_b'}), point_at_infinity())
+    zero.update({rz : 'r.z=0'})
+  else:
+    nonzero.update({rz : 'r.z!=0'})
+  rz = rz * (0 if a_infinity else 2)
+  rx = t
+  q = -q
+  rx = rx + q
+  q = q * 3
+  t = t * 2
+  t = t + q
+  t = t * rr
+  t = t + n
+  ry = -t
+  rx = rx * (0 if a_infinity else 4)
+  ry = ry * (0 if a_infinity else 4)
+  t = b.X
+  t = t * (1 if a_infinity else 0)
+  rx = rx + t
+  t = b.Y
+  t = t * (1 if a_infinity else 0)
+  ry = ry + t
+  t = (1 if a_infinity else 0)
+  rz = rz + t
+  if infinity:
+    return (constraints(zero={b.Z - 1 : 'b.z=1', b.Infinity : 'b_finite'}), constraints(zero=zero, nonzero=nonzero), point_at_infinity())
+  return (constraints(zero={b.Z - 1 : 'b.z=1', b.Infinity : 'b_finite'}), constraints(zero=zero, nonzero=nonzero), jacobianpoint(rx, ry, rz))
+
+if __name__ == "__main__":
+  check_symbolic_jacobian_weierstrass("secp256k1_gej_add_var", 0, 7, 5, formula_secp256k1_gej_add_var)
+  check_symbolic_jacobian_weierstrass("secp256k1_gej_add_ge_var", 0, 7, 5, formula_secp256k1_gej_add_ge_var)
+  check_symbolic_jacobian_weierstrass("secp256k1_gej_add_zinv_var", 0, 7, 5, formula_secp256k1_gej_add_zinv_var)
+  check_symbolic_jacobian_weierstrass("secp256k1_gej_add_ge", 0, 7, 16, formula_secp256k1_gej_add_ge)
+  check_symbolic_jacobian_weierstrass("secp256k1_gej_add_ge_old [should fail]", 0, 7, 4, formula_secp256k1_gej_add_ge_old)
+
+  if len(sys.argv) >= 2 and sys.argv[1] == "--exhaustive":
+    check_exhaustive_jacobian_weierstrass("secp256k1_gej_add_var", 0, 7, 5, formula_secp256k1_gej_add_var, 43)
+    check_exhaustive_jacobian_weierstrass("secp256k1_gej_add_ge_var", 0, 7, 5, formula_secp256k1_gej_add_ge_var, 43)
+    check_exhaustive_jacobian_weierstrass("secp256k1_gej_add_zinv_var", 0, 7, 5, formula_secp256k1_gej_add_zinv_var, 43)
+    check_exhaustive_jacobian_weierstrass("secp256k1_gej_add_ge", 0, 7, 16, formula_secp256k1_gej_add_ge, 43)
+    check_exhaustive_jacobian_weierstrass("secp256k1_gej_add_ge_old [should fail]", 0, 7, 4, formula_secp256k1_gej_add_ge_old, 43)
diff --git a/sage/weierstrass_prover.sage b/sage/weierstrass_prover.sage
new file mode 100644
index 0000000000000..03ef2ec901ea9
--- /dev/null
+++ b/sage/weierstrass_prover.sage
@@ -0,0 +1,264 @@
+# Prover implementation for Weierstrass curves of the form
+# y^2 = x^3 + A * x + B, specifically with a = 0 and b = 7, with group laws
+# operating on affine and Jacobian coordinates, including the point at infinity
+# represented by a 4th variable in coordinates.
+
+load("group_prover.sage")
+
+
+class affinepoint:
+  def __init__(self, x, y, infinity=0):
+    self.x = x
+    self.y = y
+    self.infinity = infinity
+  def __str__(self):
+    return "affinepoint(x=%s,y=%s,inf=%s)" % (self.x, self.y, self.infinity)
+
+
+class jacobianpoint:
+  def __init__(self, x, y, z, infinity=0):
+    self.X = x
+    self.Y = y
+    self.Z = z
+    self.Infinity = infinity
+  def __str__(self):
+    return "jacobianpoint(X=%s,Y=%s,Z=%s,inf=%s)" % (self.X, self.Y, self.Z, self.Infinity)
+
+
+def point_at_infinity():
+  return jacobianpoint(1, 1, 1, 1)
+
+
+def negate(p):
+  if p.__class__ == affinepoint:
+    return affinepoint(p.x, -p.y)
+  if p.__class__ == jacobianpoint:
+    return jacobianpoint(p.X, -p.Y, p.Z)
+  assert(False)
+
+
+def on_weierstrass_curve(A, B, p):
+  """Return a set of zero-expressions for an affine point to be on the curve"""
+  return constraints(zero={p.x^3 + A*p.x + B - p.y^2: 'on_curve'})
+
+
+def tangential_to_weierstrass_curve(A, B, p12, p3):
+  """Return a set of zero-expressions for ((x12,y12),(x3,y3)) to be a line that is tangential to the curve at (x12,y12)"""
+  return constraints(zero={
+    (p12.y - p3.y) * (p12.y * 2) - (p12.x^2 * 3 + A) * (p12.x - p3.x): 'tangential_to_curve'
+  })
+
+
+def colinear(p1, p2, p3):
+  """Return a set of zero-expressions for ((x1,y1),(x2,y2),(x3,y3)) to be collinear"""
+  return constraints(zero={
+    (p1.y - p2.y) * (p1.x - p3.x) - (p1.y - p3.y) * (p1.x - p2.x): 'colinear_1',
+    (p2.y - p3.y) * (p2.x - p1.x) - (p2.y - p1.y) * (p2.x - p3.x): 'colinear_2',
+    (p3.y - p1.y) * (p3.x - p2.x) - (p3.y - p2.y) * (p3.x - p1.x): 'colinear_3'
+  })
+
+
+def good_affine_point(p):
+  return constraints(nonzero={p.x : 'nonzero_x', p.y : 'nonzero_y'})
+
+
+def good_jacobian_point(p):
+  return constraints(nonzero={p.X : 'nonzero_X', p.Y : 'nonzero_Y', p.Z^6 : 'nonzero_Z'})
+
+
+def good_point(p):
+  return constraints(nonzero={p.Z^6 : 'nonzero_X'})
+
+
+def finite(p, *affine_fns):
+  con = good_point(p) + constraints(zero={p.Infinity : 'finite_point'})
+  if p.Z != 0:
+    return con + reduce(lambda a, b: a + b, (f(affinepoint(p.X / p.Z^2, p.Y / p.Z^3)) for f in affine_fns), con)
+  else:
+    return con
+
+def infinite(p):
+  return constraints(nonzero={p.Infinity : 'infinite_point'})
+
+
+def law_jacobian_weierstrass_add(A, B, pa, pb, pA, pB, pC):
+  """Check whether the passed set of coordinates is a valid Jacobian add, given assumptions"""
+  assumeLaw = (good_affine_point(pa) +
+               good_affine_point(pb) +
+               good_jacobian_point(pA) +
+               good_jacobian_point(pB) +
+               on_weierstrass_curve(A, B, pa) +
+               on_weierstrass_curve(A, B, pb) +
+               finite(pA) +
+               finite(pB) +
+               constraints(nonzero={pa.x - pb.x : 'different_x'}))
+  require = (finite(pC, lambda pc: on_weierstrass_curve(A, B, pc) +
+             colinear(pa, pb, negate(pc))))
+  return (assumeLaw, require)
+
+
+def law_jacobian_weierstrass_double(A, B, pa, pb, pA, pB, pC):
+  """Check whether the passed set of coordinates is a valid Jacobian doubling, given assumptions"""
+  assumeLaw = (good_affine_point(pa) +
+               good_affine_point(pb) +
+               good_jacobian_point(pA) +
+               good_jacobian_point(pB) +
+               on_weierstrass_curve(A, B, pa) +
+               on_weierstrass_curve(A, B, pb) +
+               finite(pA) +
+               finite(pB) +
+               constraints(zero={pa.x - pb.x : 'equal_x', pa.y - pb.y : 'equal_y'}))
+  require = (finite(pC, lambda pc: on_weierstrass_curve(A, B, pc) +
+             tangential_to_weierstrass_curve(A, B, pa, negate(pc))))
+  return (assumeLaw, require)
+
+
+def law_jacobian_weierstrass_add_opposites(A, B, pa, pb, pA, pB, pC):
+  assumeLaw = (good_affine_point(pa) +
+               good_affine_point(pb) +
+               good_jacobian_point(pA) +
+               good_jacobian_point(pB) +
+               on_weierstrass_curve(A, B, pa) +
+               on_weierstrass_curve(A, B, pb) +
+               finite(pA) +
+               finite(pB) +
+               constraints(zero={pa.x - pb.x : 'equal_x', pa.y + pb.y : 'opposite_y'}))
+  require = infinite(pC)
+  return (assumeLaw, require)
+
+
+def law_jacobian_weierstrass_add_infinite_a(A, B, pa, pb, pA, pB, pC):
+  assumeLaw = (good_affine_point(pa) +
+               good_affine_point(pb) +
+               good_jacobian_point(pA) +
+               good_jacobian_point(pB) +
+               on_weierstrass_curve(A, B, pb) +
+               infinite(pA) +
+               finite(pB))
+  require = finite(pC, lambda pc: constraints(zero={pc.x - pb.x : 'c.x=b.x', pc.y - pb.y : 'c.y=b.y'}))
+  return (assumeLaw, require)
+
+
+def law_jacobian_weierstrass_add_infinite_b(A, B, pa, pb, pA, pB, pC):
+  assumeLaw = (good_affine_point(pa) +
+               good_affine_point(pb) +
+               good_jacobian_point(pA) +
+               good_jacobian_point(pB) +
+               on_weierstrass_curve(A, B, pa) +
+               infinite(pB) +
+               finite(pA))
+  require = finite(pC, lambda pc: constraints(zero={pc.x - pa.x : 'c.x=a.x', pc.y - pa.y : 'c.y=a.y'}))
+  return (assumeLaw, require)
+
+
+def law_jacobian_weierstrass_add_infinite_ab(A, B, pa, pb, pA, pB, pC):
+  assumeLaw = (good_affine_point(pa) +
+               good_affine_point(pb) +
+               good_jacobian_point(pA) +
+               good_jacobian_point(pB) +
+               infinite(pA) +
+               infinite(pB))
+  require = infinite(pC)
+  return (assumeLaw, require)
+
+
+laws_jacobian_weierstrass = {
+  'add': law_jacobian_weierstrass_add,
+  'double': law_jacobian_weierstrass_double,
+  'add_opposite': law_jacobian_weierstrass_add_opposites,
+  'add_infinite_a': law_jacobian_weierstrass_add_infinite_a,
+  'add_infinite_b': law_jacobian_weierstrass_add_infinite_b,
+  'add_infinite_ab': law_jacobian_weierstrass_add_infinite_ab
+}
+
+
+def check_exhaustive_jacobian_weierstrass(name, A, B, branches, formula, p):
+  """Verify an implementation of addition of Jacobian points on a Weierstrass curve, by executing and validating the result for every possible addition in a prime field"""
+  F = Integers(p)
+  print "Formula %s on Z%i:" % (name, p)
+  points = []
+  for x in xrange(0, p):
+    for y in xrange(0, p):
+      point = affinepoint(F(x), F(y))
+      r, e = concrete_verify(on_weierstrass_curve(A, B, point))
+      if r:
+        points.append(point)
+
+  for za in xrange(1, p):
+    for zb in xrange(1, p):
+      for pa in points:
+        for pb in points:
+          for ia in xrange(2):
+            for ib in xrange(2):
+              pA = jacobianpoint(pa.x * F(za)^2, pa.y * F(za)^3, F(za), ia)
+              pB = jacobianpoint(pb.x * F(zb)^2, pb.y * F(zb)^3, F(zb), ib)
+              for branch in xrange(0, branches):
+                assumeAssert, assumeBranch, pC = formula(branch, pA, pB)
+                pC.X = F(pC.X)
+                pC.Y = F(pC.Y)
+                pC.Z = F(pC.Z)
+                pC.Infinity = F(pC.Infinity)
+                r, e = concrete_verify(assumeAssert + assumeBranch)
+                if r:
+                  match = False
+                  for key in laws_jacobian_weierstrass:
+                    assumeLaw, require = laws_jacobian_weierstrass[key](A, B, pa, pb, pA, pB, pC)
+                    r, e = concrete_verify(assumeLaw)
+                    if r:
+                      if match:
+                        print "  multiple branches for (%s,%s,%s,%s) + (%s,%s,%s,%s)" % (pA.X, pA.Y, pA.Z, pA.Infinity, pB.X, pB.Y, pB.Z, pB.Infinity)
+                      else:
+                        match = True
+                      r, e = concrete_verify(require)
+                      if not r:
+                        print "  failure in branch %i for (%s,%s,%s,%s) + (%s,%s,%s,%s) = (%s,%s,%s,%s): %s" % (branch, pA.X, pA.Y, pA.Z, pA.Infinity, pB.X, pB.Y, pB.Z, pB.Infinity, pC.X, pC.Y, pC.Z, pC.Infinity, e)
+  print
+
+
+def check_symbolic_function(R, assumeAssert, assumeBranch, f, A, B, pa, pb, pA, pB, pC):
+  assumeLaw, require = f(A, B, pa, pb, pA, pB, pC)
+  return check_symbolic(R, assumeLaw, assumeAssert, assumeBranch, require)
+
+def check_symbolic_jacobian_weierstrass(name, A, B, branches, formula):
+  """Verify an implementation of addition of Jacobian points on a Weierstrass curve symbolically"""
+  R.<ax,bx,ay,by,Az,Bz,Ai,Bi> = PolynomialRing(QQ,8,order='invlex')
+  lift = lambda x: fastfrac(R,x)
+  ax = lift(ax)
+  ay = lift(ay)
+  Az = lift(Az)
+  bx = lift(bx)
+  by = lift(by)
+  Bz = lift(Bz)
+  Ai = lift(Ai)
+  Bi = lift(Bi)
+
+  pa = affinepoint(ax, ay, Ai)
+  pb = affinepoint(bx, by, Bi)
+  pA = jacobianpoint(ax * Az^2, ay * Az^3, Az, Ai)
+  pB = jacobianpoint(bx * Bz^2, by * Bz^3, Bz, Bi)
+
+  res = {}
+
+  for key in laws_jacobian_weierstrass:
+    res[key] = []
+
+  print ("Formula " + name + ":")
+  count = 0
+  for branch in xrange(branches):
+    assumeFormula, assumeBranch, pC = formula(branch, pA, pB)
+    pC.X = lift(pC.X)
+    pC.Y = lift(pC.Y)
+    pC.Z = lift(pC.Z)
+    pC.Infinity = lift(pC.Infinity)
+
+    for key in laws_jacobian_weierstrass:
+      res[key].append((check_symbolic_function(R, assumeFormula, assumeBranch, laws_jacobian_weierstrass[key], A, B, pa, pb, pA, pB, pC), branch))
+
+  for key in res:
+    print "  %s:" % key
+    val = res[key]
+    for x in val:
+      if x[0] is not None:
+        print "    branch %i: %s" % (x[1], x[0])
+
+  print
diff --git a/src/asm/field_10x26_arm.s b/src/asm/field_10x26_arm.s
new file mode 100644
index 0000000000000..5df561f2fc939
--- /dev/null
+++ b/src/asm/field_10x26_arm.s
@@ -0,0 +1,919 @@
+@ vim: set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab syntax=armasm:
+/**********************************************************************
+ * Copyright (c) 2014 Wladimir J. van der Laan                        *
+ * Distributed under the MIT software license, see the accompanying   *
+ * file COPYING or http://www.opensource.org/licenses/mit-license.php.*
+ **********************************************************************/
+/*
+ARM implementation of field_10x26 inner loops.
+
+Note:
+
+- To avoid unnecessary loads and make use of available registers, two
+  'passes' have every time been interleaved, with the odd passes accumulating c' and d' 
+  which will be added to c and d respectively in the the even passes
+
+*/
+
+	.syntax unified
+	.arch armv7-a
+	@ eabi attributes - see readelf -A
+	.eabi_attribute 8, 1  @ Tag_ARM_ISA_use = yes
+	.eabi_attribute 9, 0  @ Tag_Thumb_ISA_use = no
+	.eabi_attribute 10, 0 @ Tag_FP_arch = none
+	.eabi_attribute 24, 1 @ Tag_ABI_align_needed = 8-byte
+	.eabi_attribute 25, 1 @ Tag_ABI_align_preserved = 8-byte, except leaf SP
+	.eabi_attribute 30, 2 @ Tag_ABI_optimization_goals = Agressive Speed
+	.eabi_attribute 34, 1 @ Tag_CPU_unaligned_access = v6
+	.text
+
+	@ Field constants
+	.set field_R0, 0x3d10
+	.set field_R1, 0x400
+	.set field_not_M, 0xfc000000	@ ~M = ~0x3ffffff
+
+	.align	2
+	.global secp256k1_fe_mul_inner
+	.type	secp256k1_fe_mul_inner, %function
+	@ Arguments:
+	@  r0  r      Restrict: can overlap with a, not with b
+	@  r1  a
+	@  r2  b
+	@ Stack (total 4+10*4 = 44)
+	@  sp + #0        saved 'r' pointer
+	@  sp + #4 + 4*X  t0,t1,t2,t3,t4,t5,t6,t7,u8,t9
+secp256k1_fe_mul_inner:
+	stmfd	sp!, {r4, r5, r6, r7, r8, r9, r10, r11, r14}
+	sub	sp, sp, #48			@ frame=44 + alignment
+	str     r0, [sp, #0]			@ save result address, we need it only at the end
+
+	/******************************************
+	 * Main computation code.
+	 ******************************************
+
+	Allocation:
+	    r0,r14,r7,r8   scratch
+	    r1       a (pointer)
+	    r2       b (pointer)
+	    r3:r4    c
+	    r5:r6    d
+	    r11:r12  c'
+	    r9:r10   d'
+
+	Note: do not write to r[] here, it may overlap with a[]
+	*/
+
+	/* A - interleaved with B */
+	ldr	r7, [r1, #0*4]			@ a[0]
+	ldr	r8, [r2, #9*4]			@ b[9]
+	ldr	r0, [r1, #1*4]			@ a[1]
+	umull	r5, r6, r7, r8			@ d = a[0] * b[9]
+	ldr	r14, [r2, #8*4]			@ b[8]
+	umull	r9, r10, r0, r8			@ d' = a[1] * b[9]
+	ldr	r7, [r1, #2*4]			@ a[2]
+	umlal	r5, r6, r0, r14			@ d += a[1] * b[8]
+	ldr	r8, [r2, #7*4] 			@ b[7]
+	umlal	r9, r10, r7, r14		@ d' += a[2] * b[8]
+	ldr	r0, [r1, #3*4]   		@ a[3]
+	umlal	r5, r6, r7, r8   		@ d += a[2] * b[7]
+	ldr	r14, [r2, #6*4]   		@ b[6]
+	umlal	r9, r10, r0, r8  		@ d' += a[3] * b[7]
+	ldr	r7, [r1, #4*4]   		@ a[4]
+	umlal	r5, r6, r0, r14   		@ d += a[3] * b[6]
+	ldr	r8, [r2, #5*4]   		@ b[5]
+	umlal	r9, r10, r7, r14  		@ d' += a[4] * b[6]
+	ldr	r0, [r1, #5*4]   		@ a[5]
+	umlal	r5, r6, r7, r8   		@ d += a[4] * b[5]
+	ldr	r14, [r2, #4*4]   		@ b[4]
+	umlal	r9, r10, r0, r8  		@ d' += a[5] * b[5]
+	ldr	r7, [r1, #6*4]   		@ a[6]
+	umlal	r5, r6, r0, r14   		@ d += a[5] * b[4]
+	ldr	r8, [r2, #3*4]   		@ b[3]
+	umlal	r9, r10, r7, r14  		@ d' += a[6] * b[4]
+	ldr	r0, [r1, #7*4]   		@ a[7]
+	umlal	r5, r6, r7, r8   		@ d += a[6] * b[3]
+	ldr	r14, [r2, #2*4]   		@ b[2]
+	umlal	r9, r10, r0, r8  		@ d' += a[7] * b[3]
+	ldr	r7, [r1, #8*4]   		@ a[8]
+	umlal	r5, r6, r0, r14   		@ d += a[7] * b[2]
+	ldr	r8, [r2, #1*4]   		@ b[1]
+	umlal	r9, r10, r7, r14  		@ d' += a[8] * b[2]
+	ldr	r0, [r1, #9*4]   		@ a[9]
+	umlal	r5, r6, r7, r8   		@ d += a[8] * b[1]
+	ldr	r14, [r2, #0*4]   		@ b[0]
+	umlal	r9, r10, r0, r8  		@ d' += a[9] * b[1]
+	ldr	r7, [r1, #0*4]   		@ a[0]
+	umlal	r5, r6, r0, r14   		@ d += a[9] * b[0]
+	@ r7,r14 used in B
+
+	bic	r0, r5, field_not_M 		@ t9 = d & M
+	str     r0, [sp, #4 + 4*9]
+	mov	r5, r5, lsr #26     		@ d >>= 26 
+	orr	r5, r5, r6, asl #6
+	mov     r6, r6, lsr #26
+
+	/* B */
+	umull	r3, r4, r7, r14   		@ c = a[0] * b[0]
+	adds	r5, r5, r9       		@ d += d'
+	adc	r6, r6, r10
+
+	bic	r0, r5, field_not_M 		@ u0 = d & M
+	mov	r5, r5, lsr #26     		@ d >>= 26
+	orr	r5, r5, r6, asl #6
+	mov     r6, r6, lsr #26
+	movw    r14, field_R0			@ c += u0 * R0
+	umlal   r3, r4, r0, r14
+
+	bic	r14, r3, field_not_M 		@ t0 = c & M
+	str	r14, [sp, #4 + 0*4]
+	mov	r3, r3, lsr #26     		@ c >>= 26
+	orr	r3, r3, r4, asl #6
+	mov     r4, r4, lsr #26
+	mov     r14, field_R1			@ c += u0 * R1
+	umlal   r3, r4, r0, r14
+
+	/* C - interleaved with D */
+	ldr	r7, [r1, #0*4]   		@ a[0]
+	ldr	r8, [r2, #2*4]   		@ b[2]
+	ldr	r14, [r2, #1*4]   		@ b[1]
+	umull	r11, r12, r7, r8   		@ c' = a[0] * b[2]
+	ldr	r0, [r1, #1*4]   		@ a[1]
+	umlal   r3, r4, r7, r14   		@ c += a[0] * b[1]
+	ldr	r8, [r2, #0*4]   		@ b[0]
+	umlal   r11, r12, r0, r14   		@ c' += a[1] * b[1]
+	ldr	r7, [r1, #2*4]   		@ a[2]
+	umlal   r3, r4, r0, r8   		@ c += a[1] * b[0]
+	ldr	r14, [r2, #9*4]   		@ b[9]
+	umlal   r11, r12, r7, r8   		@ c' += a[2] * b[0]
+	ldr	r0, [r1, #3*4]   		@ a[3]
+	umlal	r5, r6, r7, r14   		@ d += a[2] * b[9]
+	ldr	r8, [r2, #8*4]   		@ b[8]
+	umull	r9, r10, r0, r14   		@ d' = a[3] * b[9]
+	ldr	r7, [r1, #4*4]   		@ a[4]
+	umlal	r5, r6, r0, r8   		@ d += a[3] * b[8]
+	ldr	r14, [r2, #7*4]   		@ b[7]
+	umlal	r9, r10, r7, r8   		@ d' += a[4] * b[8]
+	ldr	r0, [r1, #5*4]   		@ a[5]
+	umlal	r5, r6, r7, r14   		@ d += a[4] * b[7]
+	ldr	r8, [r2, #6*4]   		@ b[6]
+	umlal	r9, r10, r0, r14   		@ d' += a[5] * b[7]
+	ldr	r7, [r1, #6*4]   		@ a[6]
+	umlal	r5, r6, r0, r8   		@ d += a[5] * b[6]
+	ldr	r14, [r2, #5*4]   		@ b[5]
+	umlal	r9, r10, r7, r8   		@ d' += a[6] * b[6]
+	ldr	r0, [r1, #7*4]   		@ a[7]
+	umlal	r5, r6, r7, r14   		@ d += a[6] * b[5]
+	ldr	r8, [r2, #4*4]   		@ b[4]
+	umlal	r9, r10, r0, r14   		@ d' += a[7] * b[5]
+	ldr	r7, [r1, #8*4]   		@ a[8]
+	umlal	r5, r6, r0, r8   		@ d += a[7] * b[4]
+	ldr	r14, [r2, #3*4]   		@ b[3]
+	umlal	r9, r10, r7, r8   		@ d' += a[8] * b[4]
+	ldr	r0, [r1, #9*4]   		@ a[9]
+	umlal	r5, r6, r7, r14   		@ d += a[8] * b[3]
+	ldr	r8, [r2, #2*4]   		@ b[2]
+	umlal	r9, r10, r0, r14   		@ d' += a[9] * b[3]
+	umlal	r5, r6, r0, r8   		@ d += a[9] * b[2]
+
+	bic	r0, r5, field_not_M 		@ u1 = d & M
+	mov	r5, r5, lsr #26     		@ d >>= 26
+	orr	r5, r5, r6, asl #6
+	mov     r6, r6, lsr #26
+	movw    r14, field_R0			@ c += u1 * R0
+	umlal   r3, r4, r0, r14
+
+	bic	r14, r3, field_not_M 		@ t1 = c & M
+	str	r14, [sp, #4 + 1*4]
+	mov	r3, r3, lsr #26     		@ c >>= 26
+	orr	r3, r3, r4, asl #6
+	mov     r4, r4, lsr #26
+	mov     r14, field_R1			@ c += u1 * R1
+	umlal   r3, r4, r0, r14
+
+	/* D */
+	adds	r3, r3, r11			@ c += c'
+	adc	r4, r4, r12
+	adds	r5, r5, r9			@ d += d'
+	adc	r6, r6, r10
+
+	bic	r0, r5, field_not_M 		@ u2 = d & M
+	mov	r5, r5, lsr #26     		@ d >>= 26
+	orr	r5, r5, r6, asl #6
+	mov     r6, r6, lsr #26
+	movw    r14, field_R0			@ c += u2 * R0
+	umlal   r3, r4, r0, r14
+
+	bic	r14, r3, field_not_M 		@ t2 = c & M
+	str	r14, [sp, #4 + 2*4]
+	mov	r3, r3, lsr #26     		@ c >>= 26
+	orr	r3, r3, r4, asl #6
+	mov     r4, r4, lsr #26
+	mov     r14, field_R1			@ c += u2 * R1
+	umlal   r3, r4, r0, r14
+
+	/* E - interleaved with F */
+	ldr	r7, [r1, #0*4]   		@ a[0]
+	ldr	r8, [r2, #4*4]   		@ b[4]
+	umull	r11, r12, r7, r8   		@ c' = a[0] * b[4]
+	ldr	r8, [r2, #3*4]   		@ b[3]
+	umlal   r3, r4, r7, r8   		@ c += a[0] * b[3]
+	ldr	r7, [r1, #1*4]   		@ a[1]
+	umlal   r11, r12, r7, r8   		@ c' += a[1] * b[3]
+	ldr	r8, [r2, #2*4]   		@ b[2]
+	umlal   r3, r4, r7, r8   		@ c += a[1] * b[2]
+	ldr	r7, [r1, #2*4]   		@ a[2]
+	umlal   r11, r12, r7, r8   		@ c' += a[2] * b[2]
+	ldr	r8, [r2, #1*4]   		@ b[1]
+	umlal   r3, r4, r7, r8   		@ c += a[2] * b[1]
+	ldr	r7, [r1, #3*4]   		@ a[3]
+	umlal   r11, r12, r7, r8   		@ c' += a[3] * b[1]
+	ldr	r8, [r2, #0*4]   		@ b[0]
+	umlal   r3, r4, r7, r8   		@ c += a[3] * b[0]
+	ldr	r7, [r1, #4*4]   		@ a[4]
+	umlal   r11, r12, r7, r8   		@ c' += a[4] * b[0]
+	ldr	r8, [r2, #9*4]   		@ b[9]
+	umlal	r5, r6, r7, r8   		@ d += a[4] * b[9]
+	ldr	r7, [r1, #5*4]   		@ a[5]
+	umull	r9, r10, r7, r8   		@ d' = a[5] * b[9]
+	ldr	r8, [r2, #8*4]   		@ b[8]
+	umlal	r5, r6, r7, r8   		@ d += a[5] * b[8]
+	ldr	r7, [r1, #6*4]   		@ a[6]
+	umlal	r9, r10, r7, r8   		@ d' += a[6] * b[8]
+	ldr	r8, [r2, #7*4]   		@ b[7]
+	umlal	r5, r6, r7, r8   		@ d += a[6] * b[7]
+	ldr	r7, [r1, #7*4]   		@ a[7]
+	umlal	r9, r10, r7, r8   		@ d' += a[7] * b[7]
+	ldr	r8, [r2, #6*4]   		@ b[6]
+	umlal	r5, r6, r7, r8   		@ d += a[7] * b[6]
+	ldr	r7, [r1, #8*4]   		@ a[8]
+	umlal	r9, r10, r7, r8   		@ d' += a[8] * b[6]
+	ldr	r8, [r2, #5*4]   		@ b[5]
+	umlal	r5, r6, r7, r8   		@ d += a[8] * b[5]
+	ldr	r7, [r1, #9*4]   		@ a[9]
+	umlal	r9, r10, r7, r8   		@ d' += a[9] * b[5]
+	ldr	r8, [r2, #4*4]   		@ b[4]
+	umlal	r5, r6, r7, r8   		@ d += a[9] * b[4]
+
+	bic	r0, r5, field_not_M 		@ u3 = d & M
+	mov	r5, r5, lsr #26     		@ d >>= 26
+	orr	r5, r5, r6, asl #6
+	mov     r6, r6, lsr #26
+	movw    r14, field_R0			@ c += u3 * R0
+	umlal   r3, r4, r0, r14
+
+	bic	r14, r3, field_not_M 		@ t3 = c & M
+	str	r14, [sp, #4 + 3*4]
+	mov	r3, r3, lsr #26     		@ c >>= 26
+	orr	r3, r3, r4, asl #6
+	mov     r4, r4, lsr #26
+	mov     r14, field_R1			@ c += u3 * R1
+	umlal   r3, r4, r0, r14
+
+	/* F */
+	adds	r3, r3, r11			@ c += c'
+	adc	r4, r4, r12
+	adds	r5, r5, r9			@ d += d'
+	adc	r6, r6, r10
+
+	bic	r0, r5, field_not_M 		@ u4 = d & M
+	mov	r5, r5, lsr #26     		@ d >>= 26
+	orr	r5, r5, r6, asl #6
+	mov     r6, r6, lsr #26
+	movw    r14, field_R0			@ c += u4 * R0
+	umlal   r3, r4, r0, r14
+
+	bic	r14, r3, field_not_M 		@ t4 = c & M
+	str	r14, [sp, #4 + 4*4]
+	mov	r3, r3, lsr #26     		@ c >>= 26
+	orr	r3, r3, r4, asl #6
+	mov     r4, r4, lsr #26
+	mov     r14, field_R1			@ c += u4 * R1
+	umlal   r3, r4, r0, r14
+
+	/* G - interleaved with H */
+	ldr	r7, [r1, #0*4]   		@ a[0]
+	ldr	r8, [r2, #6*4]   		@ b[6]
+	ldr	r14, [r2, #5*4]   		@ b[5]
+	umull	r11, r12, r7, r8   		@ c' = a[0] * b[6]
+	ldr	r0, [r1, #1*4]   		@ a[1]
+	umlal   r3, r4, r7, r14   		@ c += a[0] * b[5]
+	ldr	r8, [r2, #4*4]   		@ b[4]
+	umlal   r11, r12, r0, r14   		@ c' += a[1] * b[5]
+	ldr	r7, [r1, #2*4]   		@ a[2]
+	umlal   r3, r4, r0, r8   		@ c += a[1] * b[4]
+	ldr	r14, [r2, #3*4]   		@ b[3]
+	umlal   r11, r12, r7, r8   		@ c' += a[2] * b[4]
+	ldr	r0, [r1, #3*4]   		@ a[3]
+	umlal   r3, r4, r7, r14   		@ c += a[2] * b[3]
+	ldr	r8, [r2, #2*4]   		@ b[2]
+	umlal   r11, r12, r0, r14   		@ c' += a[3] * b[3]
+	ldr	r7, [r1, #4*4]   		@ a[4]
+	umlal   r3, r4, r0, r8   		@ c += a[3] * b[2]
+	ldr	r14, [r2, #1*4]   		@ b[1]
+	umlal   r11, r12, r7, r8   		@ c' += a[4] * b[2]
+	ldr	r0, [r1, #5*4]   		@ a[5]
+	umlal   r3, r4, r7, r14   		@ c += a[4] * b[1]
+	ldr	r8, [r2, #0*4]   		@ b[0]
+	umlal   r11, r12, r0, r14   		@ c' += a[5] * b[1]
+	ldr	r7, [r1, #6*4]   		@ a[6]
+	umlal   r3, r4, r0, r8   		@ c += a[5] * b[0]
+	ldr	r14, [r2, #9*4]   		@ b[9]
+	umlal   r11, r12, r7, r8   		@ c' += a[6] * b[0]
+	ldr	r0, [r1, #7*4]   		@ a[7]
+	umlal	r5, r6, r7, r14   		@ d += a[6] * b[9]
+	ldr	r8, [r2, #8*4]   		@ b[8]
+	umull	r9, r10, r0, r14   		@ d' = a[7] * b[9]
+	ldr	r7, [r1, #8*4]   		@ a[8]
+	umlal	r5, r6, r0, r8   		@ d += a[7] * b[8]
+	ldr	r14, [r2, #7*4]   		@ b[7]
+	umlal	r9, r10, r7, r8   		@ d' += a[8] * b[8]
+	ldr	r0, [r1, #9*4]   		@ a[9]
+	umlal	r5, r6, r7, r14   		@ d += a[8] * b[7]
+	ldr	r8, [r2, #6*4]   		@ b[6]
+	umlal	r9, r10, r0, r14   		@ d' += a[9] * b[7]
+	umlal	r5, r6, r0, r8   		@ d += a[9] * b[6]
+
+	bic	r0, r5, field_not_M 		@ u5 = d & M
+	mov	r5, r5, lsr #26     		@ d >>= 26
+	orr	r5, r5, r6, asl #6
+	mov     r6, r6, lsr #26
+	movw    r14, field_R0			@ c += u5 * R0
+	umlal   r3, r4, r0, r14
+
+	bic	r14, r3, field_not_M 		@ t5 = c & M
+	str	r14, [sp, #4 + 5*4]
+	mov	r3, r3, lsr #26     		@ c >>= 26
+	orr	r3, r3, r4, asl #6
+	mov     r4, r4, lsr #26
+	mov     r14, field_R1			@ c += u5 * R1
+	umlal   r3, r4, r0, r14
+
+	/* H */
+	adds	r3, r3, r11			@ c += c'
+	adc	r4, r4, r12
+	adds	r5, r5, r9			@ d += d'
+	adc	r6, r6, r10
+
+	bic	r0, r5, field_not_M 		@ u6 = d & M
+	mov	r5, r5, lsr #26     		@ d >>= 26
+	orr	r5, r5, r6, asl #6
+	mov     r6, r6, lsr #26
+	movw    r14, field_R0			@ c += u6 * R0
+	umlal   r3, r4, r0, r14
+
+	bic	r14, r3, field_not_M 		@ t6 = c & M
+	str	r14, [sp, #4 + 6*4]
+	mov	r3, r3, lsr #26     		@ c >>= 26
+	orr	r3, r3, r4, asl #6
+	mov     r4, r4, lsr #26
+	mov     r14, field_R1			@ c += u6 * R1
+	umlal   r3, r4, r0, r14
+
+	/* I - interleaved with J */
+	ldr	r8, [r2, #8*4]   		@ b[8]
+	ldr	r7, [r1, #0*4]   		@ a[0]
+	ldr	r14, [r2, #7*4]   		@ b[7]
+	umull   r11, r12, r7, r8   		@ c' = a[0] * b[8]
+	ldr	r0, [r1, #1*4]   		@ a[1]
+	umlal   r3, r4, r7, r14   		@ c += a[0] * b[7]
+	ldr	r8, [r2, #6*4]   		@ b[6]
+	umlal   r11, r12, r0, r14   		@ c' += a[1] * b[7]
+	ldr	r7, [r1, #2*4]   		@ a[2]
+	umlal   r3, r4, r0, r8   		@ c += a[1] * b[6]
+	ldr	r14, [r2, #5*4]   		@ b[5]
+	umlal   r11, r12, r7, r8   		@ c' += a[2] * b[6]
+	ldr	r0, [r1, #3*4]   		@ a[3]
+	umlal   r3, r4, r7, r14   		@ c += a[2] * b[5]
+	ldr	r8, [r2, #4*4]   		@ b[4]
+	umlal   r11, r12, r0, r14   		@ c' += a[3] * b[5]
+	ldr	r7, [r1, #4*4]   		@ a[4]
+	umlal   r3, r4, r0, r8   		@ c += a[3] * b[4]
+	ldr	r14, [r2, #3*4]   		@ b[3]
+	umlal   r11, r12, r7, r8   		@ c' += a[4] * b[4]
+	ldr	r0, [r1, #5*4]   		@ a[5]
+	umlal   r3, r4, r7, r14   		@ c += a[4] * b[3]
+	ldr	r8, [r2, #2*4]   		@ b[2]
+	umlal   r11, r12, r0, r14   		@ c' += a[5] * b[3]
+	ldr	r7, [r1, #6*4]   		@ a[6]
+	umlal   r3, r4, r0, r8   		@ c += a[5] * b[2]
+	ldr	r14, [r2, #1*4]   		@ b[1]
+	umlal   r11, r12, r7, r8   		@ c' += a[6] * b[2]
+	ldr	r0, [r1, #7*4]   		@ a[7]
+	umlal   r3, r4, r7, r14   		@ c += a[6] * b[1]
+	ldr	r8, [r2, #0*4]   		@ b[0]
+	umlal   r11, r12, r0, r14   		@ c' += a[7] * b[1]
+	ldr	r7, [r1, #8*4]   		@ a[8]
+	umlal   r3, r4, r0, r8   		@ c += a[7] * b[0]
+	ldr	r14, [r2, #9*4]   		@ b[9]
+	umlal   r11, r12, r7, r8   		@ c' += a[8] * b[0]
+	ldr	r0, [r1, #9*4]   		@ a[9]
+	umlal	r5, r6, r7, r14   		@ d += a[8] * b[9]
+	ldr	r8, [r2, #8*4]   		@ b[8]
+	umull	r9, r10, r0, r14  		@ d' = a[9] * b[9]
+	umlal	r5, r6, r0, r8   		@ d += a[9] * b[8]
+
+	bic	r0, r5, field_not_M 		@ u7 = d & M
+	mov	r5, r5, lsr #26     		@ d >>= 26
+	orr	r5, r5, r6, asl #6
+	mov     r6, r6, lsr #26
+	movw    r14, field_R0			@ c += u7 * R0
+	umlal   r3, r4, r0, r14
+
+	bic	r14, r3, field_not_M 		@ t7 = c & M
+	str	r14, [sp, #4 + 7*4]
+	mov	r3, r3, lsr #26     		@ c >>= 26
+	orr	r3, r3, r4, asl #6
+	mov     r4, r4, lsr #26
+	mov     r14, field_R1			@ c += u7 * R1
+	umlal   r3, r4, r0, r14
+
+	/* J */
+	adds	r3, r3, r11			@ c += c'
+	adc	r4, r4, r12
+	adds	r5, r5, r9			@ d += d'
+	adc	r6, r6, r10
+
+	bic	r0, r5, field_not_M 		@ u8 = d & M
+	str	r0, [sp, #4 + 8*4]
+	mov	r5, r5, lsr #26     		@ d >>= 26
+	orr	r5, r5, r6, asl #6
+	mov     r6, r6, lsr #26
+	movw    r14, field_R0			@ c += u8 * R0
+	umlal   r3, r4, r0, r14
+
+	/******************************************
+	 * compute and write back result
+	 ******************************************
+	Allocation:
+	    r0    r
+	    r3:r4 c
+	    r5:r6 d
+	    r7    t0
+	    r8    t1
+	    r9    t2
+	    r11   u8
+	    r12   t9
+	    r1,r2,r10,r14 scratch
+
+	Note: do not read from a[] after here, it may overlap with r[]
+	*/
+	ldr	r0, [sp, #0]
+	add	r1, sp, #4 + 3*4		@ r[3..7] = t3..7, r11=u8, r12=t9
+	ldmia	r1, {r2,r7,r8,r9,r10,r11,r12}
+	add	r1, r0, #3*4
+	stmia	r1, {r2,r7,r8,r9,r10}
+
+	bic	r2, r3, field_not_M 		@ r[8] = c & M
+	str	r2, [r0, #8*4]
+	mov	r3, r3, lsr #26     		@ c >>= 26
+	orr	r3, r3, r4, asl #6
+	mov     r4, r4, lsr #26
+	mov     r14, field_R1			@ c += u8 * R1
+	umlal   r3, r4, r11, r14
+	movw    r14, field_R0			@ c += d * R0
+	umlal   r3, r4, r5, r14
+	adds	r3, r3, r12			@ c += t9
+	adc	r4, r4, #0
+
+	add	r1, sp, #4 + 0*4		@ r7,r8,r9 = t0,t1,t2
+	ldmia	r1, {r7,r8,r9}
+
+	ubfx	r2, r3, #0, #22     		@ r[9] = c & (M >> 4)
+	str	r2, [r0, #9*4]
+	mov	r3, r3, lsr #22     		@ c >>= 22
+	orr	r3, r3, r4, asl #10
+	mov     r4, r4, lsr #22
+	movw    r14, field_R1 << 4   		@ c += d * (R1 << 4)
+	umlal   r3, r4, r5, r14
+
+	movw    r14, field_R0 >> 4   		@ d = c * (R0 >> 4) + t0 (64x64 multiply+add)
+	umull	r5, r6, r3, r14			@ d = c.lo * (R0 >> 4)
+	adds	r5, r5, r7	    		@ d.lo += t0
+	mla	r6, r14, r4, r6			@ d.hi += c.hi * (R0 >> 4)
+	adc	r6, r6, 0	     		@ d.hi += carry
+
+	bic	r2, r5, field_not_M 		@ r[0] = d & M
+	str	r2, [r0, #0*4]
+
+	mov	r5, r5, lsr #26     		@ d >>= 26
+	orr	r5, r5, r6, asl #6
+	mov     r6, r6, lsr #26
+	
+	movw    r14, field_R1 >> 4   		@ d += c * (R1 >> 4) + t1 (64x64 multiply+add)
+	umull	r1, r2, r3, r14       		@ tmp = c.lo * (R1 >> 4)
+	adds	r5, r5, r8	    		@ d.lo += t1
+	adc	r6, r6, #0	    		@ d.hi += carry
+	adds	r5, r5, r1	    		@ d.lo += tmp.lo
+	mla	r2, r14, r4, r2      		@ tmp.hi += c.hi * (R1 >> 4)
+	adc	r6, r6, r2	   		@ d.hi += carry + tmp.hi
+
+	bic	r2, r5, field_not_M 		@ r[1] = d & M
+	str	r2, [r0, #1*4]
+	mov	r5, r5, lsr #26     		@ d >>= 26 (ignore hi)
+	orr	r5, r5, r6, asl #6
+
+	add	r5, r5, r9	  		@ d += t2
+	str	r5, [r0, #2*4]      		@ r[2] = d
+
+	add	sp, sp, #48
+	ldmfd	sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
+	.size	secp256k1_fe_mul_inner, .-secp256k1_fe_mul_inner
+
+	.align	2
+	.global secp256k1_fe_sqr_inner
+	.type	secp256k1_fe_sqr_inner, %function
+	@ Arguments:
+	@  r0  r	 Can overlap with a
+	@  r1  a
+	@ Stack (total 4+10*4 = 44)
+	@  sp + #0        saved 'r' pointer
+	@  sp + #4 + 4*X  t0,t1,t2,t3,t4,t5,t6,t7,u8,t9
+secp256k1_fe_sqr_inner:
+	stmfd	sp!, {r4, r5, r6, r7, r8, r9, r10, r11, r14}
+	sub	sp, sp, #48			@ frame=44 + alignment
+	str     r0, [sp, #0]			@ save result address, we need it only at the end
+	/******************************************
+	 * Main computation code.
+	 ******************************************
+
+	Allocation:
+	    r0,r14,r2,r7,r8   scratch
+	    r1       a (pointer)
+	    r3:r4    c
+	    r5:r6    d
+	    r11:r12  c'
+	    r9:r10   d'
+
+	Note: do not write to r[] here, it may overlap with a[]
+	*/
+	/* A interleaved with B */
+	ldr	r0, [r1, #1*4]			@ a[1]*2
+	ldr	r7, [r1, #0*4]			@ a[0]
+	mov	r0, r0, asl #1
+	ldr	r14, [r1, #9*4]			@ a[9]
+	umull	r3, r4, r7, r7			@ c = a[0] * a[0]
+	ldr	r8, [r1, #8*4]			@ a[8]
+	mov	r7, r7, asl #1
+	umull	r5, r6, r7, r14			@ d = a[0]*2 * a[9]
+	ldr	r7, [r1, #2*4]			@ a[2]*2
+	umull	r9, r10, r0, r14		@ d' = a[1]*2 * a[9]
+	ldr	r14, [r1, #7*4]			@ a[7]
+	umlal	r5, r6, r0, r8			@ d += a[1]*2 * a[8]
+	mov	r7, r7, asl #1
+	ldr	r0, [r1, #3*4]			@ a[3]*2
+	umlal	r9, r10, r7, r8			@ d' += a[2]*2 * a[8]
+	ldr	r8, [r1, #6*4]			@ a[6]
+	umlal	r5, r6, r7, r14			@ d += a[2]*2 * a[7]
+	mov	r0, r0, asl #1
+	ldr	r7, [r1, #4*4]			@ a[4]*2
+	umlal	r9, r10, r0, r14		@ d' += a[3]*2 * a[7]
+	ldr	r14, [r1, #5*4]			@ a[5]
+	mov	r7, r7, asl #1
+	umlal	r5, r6, r0, r8			@ d += a[3]*2 * a[6]
+	umlal	r9, r10, r7, r8			@ d' += a[4]*2 * a[6]
+	umlal	r5, r6, r7, r14			@ d += a[4]*2 * a[5]
+	umlal	r9, r10, r14, r14		@ d' += a[5] * a[5]
+
+	bic	r0, r5, field_not_M 		@ t9 = d & M
+	str     r0, [sp, #4 + 9*4]
+	mov	r5, r5, lsr #26     		@ d >>= 26 
+	orr	r5, r5, r6, asl #6
+	mov     r6, r6, lsr #26
+
+	/* B */
+	adds	r5, r5, r9			@ d += d'
+	adc	r6, r6, r10
+
+	bic	r0, r5, field_not_M 		@ u0 = d & M
+	mov	r5, r5, lsr #26     		@ d >>= 26
+	orr	r5, r5, r6, asl #6
+	mov     r6, r6, lsr #26
+	movw    r14, field_R0			@ c += u0 * R0
+	umlal   r3, r4, r0, r14
+	bic	r14, r3, field_not_M 		@ t0 = c & M
+	str	r14, [sp, #4 + 0*4]
+	mov	r3, r3, lsr #26     		@ c >>= 26
+	orr	r3, r3, r4, asl #6
+	mov     r4, r4, lsr #26
+	mov     r14, field_R1			@ c += u0 * R1
+	umlal   r3, r4, r0, r14
+
+	/* C interleaved with D */
+	ldr	r0, [r1, #0*4]			@ a[0]*2
+	ldr	r14, [r1, #1*4]			@ a[1]
+	mov	r0, r0, asl #1
+	ldr	r8, [r1, #2*4]			@ a[2]
+	umlal	r3, r4, r0, r14			@ c += a[0]*2 * a[1]
+	mov	r7, r8, asl #1                  @ a[2]*2
+	umull	r11, r12, r14, r14		@ c' = a[1] * a[1]
+	ldr	r14, [r1, #9*4]			@ a[9]
+	umlal	r11, r12, r0, r8		@ c' += a[0]*2 * a[2]
+	ldr	r0, [r1, #3*4]			@ a[3]*2
+	ldr	r8, [r1, #8*4]			@ a[8]
+	umlal	r5, r6, r7, r14			@ d += a[2]*2 * a[9]
+	mov	r0, r0, asl #1
+	ldr	r7, [r1, #4*4]			@ a[4]*2
+	umull	r9, r10, r0, r14		@ d' = a[3]*2 * a[9]
+	ldr	r14, [r1, #7*4]			@ a[7]
+	umlal	r5, r6, r0, r8			@ d += a[3]*2 * a[8]
+	mov	r7, r7, asl #1
+	ldr	r0, [r1, #5*4]			@ a[5]*2
+	umlal	r9, r10, r7, r8			@ d' += a[4]*2 * a[8]
+	ldr	r8, [r1, #6*4]			@ a[6]
+	mov	r0, r0, asl #1
+	umlal	r5, r6, r7, r14			@ d += a[4]*2 * a[7]
+	umlal	r9, r10, r0, r14		@ d' += a[5]*2 * a[7]
+	umlal	r5, r6, r0, r8			@ d += a[5]*2 * a[6]
+	umlal	r9, r10, r8, r8			@ d' += a[6] * a[6]
+
+	bic	r0, r5, field_not_M 		@ u1 = d & M
+	mov	r5, r5, lsr #26     		@ d >>= 26
+	orr	r5, r5, r6, asl #6
+	mov     r6, r6, lsr #26
+	movw    r14, field_R0			@ c += u1 * R0
+	umlal   r3, r4, r0, r14
+	bic	r14, r3, field_not_M 		@ t1 = c & M
+	str	r14, [sp, #4 + 1*4]
+	mov	r3, r3, lsr #26     		@ c >>= 26
+	orr	r3, r3, r4, asl #6
+	mov     r4, r4, lsr #26
+	mov     r14, field_R1			@ c += u1 * R1
+	umlal   r3, r4, r0, r14
+
+	/* D */
+	adds	r3, r3, r11			@ c += c'
+	adc	r4, r4, r12
+	adds	r5, r5, r9			@ d += d'
+	adc	r6, r6, r10
+
+	bic	r0, r5, field_not_M 		@ u2 = d & M
+	mov	r5, r5, lsr #26     		@ d >>= 26
+	orr	r5, r5, r6, asl #6
+	mov     r6, r6, lsr #26
+	movw    r14, field_R0			@ c += u2 * R0
+	umlal   r3, r4, r0, r14
+	bic	r14, r3, field_not_M 		@ t2 = c & M
+	str	r14, [sp, #4 + 2*4]
+	mov	r3, r3, lsr #26     		@ c >>= 26
+	orr	r3, r3, r4, asl #6
+	mov     r4, r4, lsr #26
+	mov     r14, field_R1			@ c += u2 * R1
+	umlal   r3, r4, r0, r14
+
+	/* E interleaved with F */
+	ldr	r7, [r1, #0*4]			@ a[0]*2
+	ldr	r0, [r1, #1*4]			@ a[1]*2
+	ldr	r14, [r1, #2*4]			@ a[2]
+	mov	r7, r7, asl #1
+	ldr	r8, [r1, #3*4]			@ a[3]
+	ldr	r2, [r1, #4*4]
+	umlal	r3, r4, r7, r8			@ c += a[0]*2 * a[3]
+	mov	r0, r0, asl #1
+	umull	r11, r12, r7, r2		@ c' = a[0]*2 * a[4]
+	mov	r2, r2, asl #1			@ a[4]*2
+	umlal	r11, r12, r0, r8		@ c' += a[1]*2 * a[3]
+	ldr	r8, [r1, #9*4]			@ a[9]
+	umlal	r3, r4, r0, r14			@ c += a[1]*2 * a[2]
+	ldr	r0, [r1, #5*4]			@ a[5]*2
+	umlal	r11, r12, r14, r14		@ c' += a[2] * a[2]
+	ldr	r14, [r1, #8*4]			@ a[8]
+	mov	r0, r0, asl #1
+	umlal	r5, r6, r2, r8			@ d += a[4]*2 * a[9]
+	ldr	r7, [r1, #6*4]			@ a[6]*2
+	umull	r9, r10, r0, r8			@ d' = a[5]*2 * a[9]
+	mov	r7, r7, asl #1
+	ldr	r8, [r1, #7*4]			@ a[7]
+	umlal	r5, r6, r0, r14			@ d += a[5]*2 * a[8]
+	umlal	r9, r10, r7, r14		@ d' += a[6]*2 * a[8]
+	umlal	r5, r6, r7, r8			@ d += a[6]*2 * a[7]
+	umlal	r9, r10, r8, r8			@ d' += a[7] * a[7]
+
+	bic	r0, r5, field_not_M 		@ u3 = d & M
+	mov	r5, r5, lsr #26     		@ d >>= 26
+	orr	r5, r5, r6, asl #6
+	mov     r6, r6, lsr #26
+	movw    r14, field_R0			@ c += u3 * R0
+	umlal   r3, r4, r0, r14
+	bic	r14, r3, field_not_M 		@ t3 = c & M
+	str	r14, [sp, #4 + 3*4]
+	mov	r3, r3, lsr #26     		@ c >>= 26
+	orr	r3, r3, r4, asl #6
+	mov     r4, r4, lsr #26
+	mov     r14, field_R1			@ c += u3 * R1
+	umlal   r3, r4, r0, r14
+
+	/* F */
+	adds	r3, r3, r11			@ c += c'
+	adc	r4, r4, r12
+	adds	r5, r5, r9			@ d += d'
+	adc	r6, r6, r10
+
+	bic	r0, r5, field_not_M 		@ u4 = d & M
+	mov	r5, r5, lsr #26     		@ d >>= 26
+	orr	r5, r5, r6, asl #6
+	mov     r6, r6, lsr #26
+	movw    r14, field_R0			@ c += u4 * R0
+	umlal   r3, r4, r0, r14
+	bic	r14, r3, field_not_M 		@ t4 = c & M
+	str	r14, [sp, #4 + 4*4]
+	mov	r3, r3, lsr #26     		@ c >>= 26
+	orr	r3, r3, r4, asl #6
+	mov     r4, r4, lsr #26
+	mov     r14, field_R1			@ c += u4 * R1
+	umlal   r3, r4, r0, r14
+
+	/* G interleaved with H */
+	ldr	r7, [r1, #0*4]			@ a[0]*2
+	ldr	r0, [r1, #1*4]			@ a[1]*2
+	mov	r7, r7, asl #1
+	ldr	r8, [r1, #5*4]			@ a[5]
+	ldr	r2, [r1, #6*4]			@ a[6]
+	umlal	r3, r4, r7, r8			@ c += a[0]*2 * a[5]
+	ldr	r14, [r1, #4*4]			@ a[4]
+	mov	r0, r0, asl #1
+	umull	r11, r12, r7, r2		@ c' = a[0]*2 * a[6]
+	ldr	r7, [r1, #2*4]			@ a[2]*2
+	umlal	r11, r12, r0, r8		@ c' += a[1]*2 * a[5]
+	mov	r7, r7, asl #1
+	ldr	r8, [r1, #3*4]			@ a[3]
+	umlal	r3, r4, r0, r14			@ c += a[1]*2 * a[4]
+	mov	r0, r2, asl #1			@ a[6]*2
+	umlal	r11, r12, r7, r14		@ c' += a[2]*2 * a[4]
+	ldr	r14, [r1, #9*4]			@ a[9]
+	umlal	r3, r4, r7, r8			@ c += a[2]*2 * a[3]
+	ldr	r7, [r1, #7*4]			@ a[7]*2
+	umlal	r11, r12, r8, r8		@ c' += a[3] * a[3]
+	mov	r7, r7, asl #1
+	ldr	r8, [r1, #8*4]			@ a[8]
+	umlal	r5, r6, r0, r14			@ d += a[6]*2 * a[9]
+	umull	r9, r10, r7, r14		@ d' = a[7]*2 * a[9]
+	umlal	r5, r6, r7, r8			@ d += a[7]*2 * a[8]
+	umlal	r9, r10, r8, r8			@ d' += a[8] * a[8]
+
+	bic	r0, r5, field_not_M 		@ u5 = d & M
+	mov	r5, r5, lsr #26     		@ d >>= 26
+	orr	r5, r5, r6, asl #6
+	mov     r6, r6, lsr #26
+	movw    r14, field_R0			@ c += u5 * R0
+	umlal   r3, r4, r0, r14
+	bic	r14, r3, field_not_M 		@ t5 = c & M
+	str	r14, [sp, #4 + 5*4]
+	mov	r3, r3, lsr #26     		@ c >>= 26
+	orr	r3, r3, r4, asl #6
+	mov     r4, r4, lsr #26
+	mov     r14, field_R1			@ c += u5 * R1
+	umlal   r3, r4, r0, r14
+
+	/* H */
+	adds	r3, r3, r11			@ c += c'
+	adc	r4, r4, r12
+	adds	r5, r5, r9			@ d += d'
+	adc	r6, r6, r10
+
+	bic	r0, r5, field_not_M 		@ u6 = d & M
+	mov	r5, r5, lsr #26     		@ d >>= 26
+	orr	r5, r5, r6, asl #6
+	mov     r6, r6, lsr #26
+	movw    r14, field_R0			@ c += u6 * R0
+	umlal   r3, r4, r0, r14
+	bic	r14, r3, field_not_M 		@ t6 = c & M
+	str	r14, [sp, #4 + 6*4]
+	mov	r3, r3, lsr #26     		@ c >>= 26
+	orr	r3, r3, r4, asl #6
+	mov     r4, r4, lsr #26
+	mov     r14, field_R1			@ c += u6 * R1
+	umlal   r3, r4, r0, r14
+
+	/* I interleaved with J */
+	ldr	r7, [r1, #0*4]			@ a[0]*2
+	ldr	r0, [r1, #1*4]			@ a[1]*2
+	mov	r7, r7, asl #1
+	ldr	r8, [r1, #7*4]			@ a[7]
+	ldr	r2, [r1, #8*4]			@ a[8]
+	umlal	r3, r4, r7, r8			@ c += a[0]*2 * a[7]
+	ldr	r14, [r1, #6*4]			@ a[6]
+	mov	r0, r0, asl #1
+	umull	r11, r12, r7, r2		@ c' = a[0]*2 * a[8]
+	ldr	r7, [r1, #2*4]			@ a[2]*2
+	umlal	r11, r12, r0, r8		@ c' += a[1]*2 * a[7]
+	ldr	r8, [r1, #5*4]			@ a[5]
+	umlal	r3, r4, r0, r14			@ c += a[1]*2 * a[6]
+	ldr	r0, [r1, #3*4]			@ a[3]*2
+	mov	r7, r7, asl #1
+	umlal	r11, r12, r7, r14		@ c' += a[2]*2 * a[6]
+	ldr	r14, [r1, #4*4]			@ a[4]
+	mov	r0, r0, asl #1
+	umlal	r3, r4, r7, r8			@ c += a[2]*2 * a[5]
+	mov	r2, r2, asl #1			@ a[8]*2
+	umlal	r11, r12, r0, r8		@ c' += a[3]*2 * a[5]
+	umlal	r3, r4, r0, r14			@ c += a[3]*2 * a[4]
+	umlal	r11, r12, r14, r14		@ c' += a[4] * a[4]
+	ldr	r8, [r1, #9*4]			@ a[9]
+	umlal	r5, r6, r2, r8			@ d += a[8]*2 * a[9]
+	@ r8 will be used in J
+
+	bic	r0, r5, field_not_M 		@ u7 = d & M
+	mov	r5, r5, lsr #26     		@ d >>= 26
+	orr	r5, r5, r6, asl #6
+	mov     r6, r6, lsr #26
+	movw    r14, field_R0			@ c += u7 * R0
+	umlal   r3, r4, r0, r14
+	bic	r14, r3, field_not_M 		@ t7 = c & M
+	str	r14, [sp, #4 + 7*4]
+	mov	r3, r3, lsr #26     		@ c >>= 26
+	orr	r3, r3, r4, asl #6
+	mov     r4, r4, lsr #26
+	mov     r14, field_R1			@ c += u7 * R1
+	umlal   r3, r4, r0, r14
+
+	/* J */
+	adds	r3, r3, r11			@ c += c'
+	adc	r4, r4, r12
+	umlal	r5, r6, r8, r8			@ d += a[9] * a[9]
+
+	bic	r0, r5, field_not_M 		@ u8 = d & M
+	str	r0, [sp, #4 + 8*4]
+	mov	r5, r5, lsr #26     		@ d >>= 26
+	orr	r5, r5, r6, asl #6
+	mov     r6, r6, lsr #26
+	movw    r14, field_R0			@ c += u8 * R0
+	umlal   r3, r4, r0, r14
+
+	/******************************************
+	 * compute and write back result
+	 ******************************************
+	Allocation:
+	    r0    r
+	    r3:r4 c
+	    r5:r6 d
+	    r7    t0
+	    r8    t1
+	    r9    t2
+	    r11   u8
+	    r12   t9
+	    r1,r2,r10,r14 scratch
+
+	Note: do not read from a[] after here, it may overlap with r[]
+	*/
+	ldr	r0, [sp, #0]
+	add	r1, sp, #4 + 3*4		@ r[3..7] = t3..7, r11=u8, r12=t9
+	ldmia	r1, {r2,r7,r8,r9,r10,r11,r12}
+	add	r1, r0, #3*4
+	stmia	r1, {r2,r7,r8,r9,r10}
+
+	bic	r2, r3, field_not_M 		@ r[8] = c & M
+	str	r2, [r0, #8*4]
+	mov	r3, r3, lsr #26     		@ c >>= 26
+	orr	r3, r3, r4, asl #6
+	mov     r4, r4, lsr #26
+	mov     r14, field_R1			@ c += u8 * R1
+	umlal   r3, r4, r11, r14
+	movw    r14, field_R0			@ c += d * R0
+	umlal   r3, r4, r5, r14
+	adds	r3, r3, r12			@ c += t9
+	adc	r4, r4, #0
+
+	add	r1, sp, #4 + 0*4		@ r7,r8,r9 = t0,t1,t2
+	ldmia	r1, {r7,r8,r9}
+
+	ubfx	r2, r3, #0, #22     		@ r[9] = c & (M >> 4)
+	str	r2, [r0, #9*4]
+	mov	r3, r3, lsr #22     		@ c >>= 22
+	orr	r3, r3, r4, asl #10
+	mov     r4, r4, lsr #22
+	movw    r14, field_R1 << 4   		@ c += d * (R1 << 4)
+	umlal   r3, r4, r5, r14
+
+	movw    r14, field_R0 >> 4   		@ d = c * (R0 >> 4) + t0 (64x64 multiply+add)
+	umull	r5, r6, r3, r14			@ d = c.lo * (R0 >> 4)
+	adds	r5, r5, r7	    		@ d.lo += t0
+	mla	r6, r14, r4, r6			@ d.hi += c.hi * (R0 >> 4)
+	adc	r6, r6, 0	     		@ d.hi += carry
+
+	bic	r2, r5, field_not_M 		@ r[0] = d & M
+	str	r2, [r0, #0*4]
+
+	mov	r5, r5, lsr #26     		@ d >>= 26
+	orr	r5, r5, r6, asl #6
+	mov     r6, r6, lsr #26
+	
+	movw    r14, field_R1 >> 4   		@ d += c * (R1 >> 4) + t1 (64x64 multiply+add)
+	umull	r1, r2, r3, r14       		@ tmp = c.lo * (R1 >> 4)
+	adds	r5, r5, r8	    		@ d.lo += t1
+	adc	r6, r6, #0	    		@ d.hi += carry
+	adds	r5, r5, r1	    		@ d.lo += tmp.lo
+	mla	r2, r14, r4, r2      		@ tmp.hi += c.hi * (R1 >> 4)
+	adc	r6, r6, r2	   		@ d.hi += carry + tmp.hi
+
+	bic	r2, r5, field_not_M 		@ r[1] = d & M
+	str	r2, [r0, #1*4]
+	mov	r5, r5, lsr #26     		@ d >>= 26 (ignore hi)
+	orr	r5, r5, r6, asl #6
+
+	add	r5, r5, r9	  		@ d += t2
+	str	r5, [r0, #2*4]      		@ r[2] = d
+
+	add	sp, sp, #48
+	ldmfd	sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
+	.size	secp256k1_fe_sqr_inner, .-secp256k1_fe_sqr_inner
+
diff --git a/src/bench_ecdh.c b/src/bench_ecdh.c
index 5a7c6376e08a1..cde5e2dbb4e4e 100644
--- a/src/bench_ecdh.c
+++ b/src/bench_ecdh.c
@@ -28,7 +28,8 @@ static void bench_ecdh_setup(void* arg) {
         0xa2, 0xba, 0xd1, 0x84, 0xf8, 0x83, 0xc6, 0x9f
     };
 
-    data->ctx = secp256k1_context_create(0);
+    /* create a context with no capabilities */
+    data->ctx = secp256k1_context_create(SECP256K1_FLAGS_TYPE_CONTEXT);
     for (i = 0; i < 32; i++) {
         data->scalar[i] = i + 1;
     }
diff --git a/src/bench_internal.c b/src/bench_internal.c
index 7809f5f8cfeb4..0809f77bda108 100644
--- a/src/bench_internal.c
+++ b/src/bench_internal.c
@@ -181,12 +181,12 @@ void bench_field_inverse_var(void* arg) {
     }
 }
 
-void bench_field_sqrt_var(void* arg) {
+void bench_field_sqrt(void* arg) {
     int i;
     bench_inv_t *data = (bench_inv_t*)arg;
 
     for (i = 0; i < 20000; i++) {
-        secp256k1_fe_sqrt_var(&data->fe_x, &data->fe_x);
+        secp256k1_fe_sqrt(&data->fe_x, &data->fe_x);
         secp256k1_fe_add(&data->fe_x, &data->fe_y);
     }
 }
@@ -227,6 +227,15 @@ void bench_group_add_affine_var(void* arg) {
     }
 }
 
+void bench_group_jacobi_var(void* arg) {
+    int i;
+    bench_inv_t *data = (bench_inv_t*)arg;
+
+    for (i = 0; i < 20000; i++) {
+        secp256k1_gej_has_quad_y_var(&data->gej_x);
+    }
+}
+
 void bench_ecmult_wnaf(void* arg) {
     int i;
     bench_inv_t *data = (bench_inv_t*)arg;
@@ -299,6 +308,21 @@ void bench_context_sign(void* arg) {
     }
 }
 
+#ifndef USE_NUM_NONE
+void bench_num_jacobi(void* arg) {
+    int i;
+    bench_inv_t *data = (bench_inv_t*)arg;
+    secp256k1_num nx, norder;
+
+    secp256k1_scalar_get_num(&nx, &data->scalar_x);
+    secp256k1_scalar_order_get_num(&norder);
+    secp256k1_scalar_get_num(&norder, &data->scalar_y);
+
+    for (i = 0; i < 200000; i++) {
+        secp256k1_num_jacobi(&nx, &norder);
+    }
+}
+#endif
 
 int have_flag(int argc, char** argv, char *flag) {
     char** argm = argv + argc;
@@ -333,12 +357,13 @@ int main(int argc, char **argv) {
     if (have_flag(argc, argv, "field") || have_flag(argc, argv, "mul")) run_benchmark("field_mul", bench_field_mul, bench_setup, NULL, &data, 10, 200000);
     if (have_flag(argc, argv, "field") || have_flag(argc, argv, "inverse")) run_benchmark("field_inverse", bench_field_inverse, bench_setup, NULL, &data, 10, 20000);
     if (have_flag(argc, argv, "field") || have_flag(argc, argv, "inverse")) run_benchmark("field_inverse_var", bench_field_inverse_var, bench_setup, NULL, &data, 10, 20000);
-    if (have_flag(argc, argv, "field") || have_flag(argc, argv, "sqrt")) run_benchmark("field_sqrt_var", bench_field_sqrt_var, bench_setup, NULL, &data, 10, 20000);
+    if (have_flag(argc, argv, "field") || have_flag(argc, argv, "sqrt")) run_benchmark("field_sqrt", bench_field_sqrt, bench_setup, NULL, &data, 10, 20000);
 
     if (have_flag(argc, argv, "group") || have_flag(argc, argv, "double")) run_benchmark("group_double_var", bench_group_double_var, bench_setup, NULL, &data, 10, 200000);
     if (have_flag(argc, argv, "group") || have_flag(argc, argv, "add")) run_benchmark("group_add_var", bench_group_add_var, bench_setup, NULL, &data, 10, 200000);
     if (have_flag(argc, argv, "group") || have_flag(argc, argv, "add")) run_benchmark("group_add_affine", bench_group_add_affine, bench_setup, NULL, &data, 10, 200000);
     if (have_flag(argc, argv, "group") || have_flag(argc, argv, "add")) run_benchmark("group_add_affine_var", bench_group_add_affine_var, bench_setup, NULL, &data, 10, 200000);
+    if (have_flag(argc, argv, "group") || have_flag(argc, argv, "jacobi")) run_benchmark("group_jacobi_var", bench_group_jacobi_var, bench_setup, NULL, &data, 10, 20000);
 
     if (have_flag(argc, argv, "ecmult") || have_flag(argc, argv, "wnaf")) run_benchmark("wnaf_const", bench_wnaf_const, bench_setup, NULL, &data, 10, 20000);
     if (have_flag(argc, argv, "ecmult") || have_flag(argc, argv, "wnaf")) run_benchmark("ecmult_wnaf", bench_ecmult_wnaf, bench_setup, NULL, &data, 10, 20000);
@@ -350,5 +375,8 @@ int main(int argc, char **argv) {
     if (have_flag(argc, argv, "context") || have_flag(argc, argv, "verify")) run_benchmark("context_verify", bench_context_verify, bench_setup, NULL, &data, 10, 20);
     if (have_flag(argc, argv, "context") || have_flag(argc, argv, "sign")) run_benchmark("context_sign", bench_context_sign, bench_setup, NULL, &data, 10, 200);
 
+#ifndef USE_NUM_NONE
+    if (have_flag(argc, argv, "num") || have_flag(argc, argv, "jacobi")) run_benchmark("num_jacobi", bench_num_jacobi, bench_setup, NULL, &data, 10, 200000);
+#endif
     return 0;
 }
diff --git a/src/bench_verify.c b/src/bench_verify.c
index 5718320cda298..418defa0aa22a 100644
--- a/src/bench_verify.c
+++ b/src/bench_verify.c
@@ -11,6 +11,12 @@
 #include "util.h"
 #include "bench.h"
 
+#ifdef ENABLE_OPENSSL_TESTS
+#include <openssl/bn.h>
+#include <openssl/ecdsa.h>
+#include <openssl/obj_mac.h>
+#endif
+
 typedef struct {
     secp256k1_context *ctx;
     unsigned char msg[32];
@@ -19,6 +25,9 @@ typedef struct {
     size_t siglen;
     unsigned char pubkey[33];
     size_t pubkeylen;
+#ifdef ENABLE_OPENSSL_TESTS
+    EC_GROUP* ec_group;
+#endif
 } benchmark_verify_t;
 
 static void benchmark_verify(void* arg) {
@@ -40,6 +49,36 @@ static void benchmark_verify(void* arg) {
     }
 }
 
+#ifdef ENABLE_OPENSSL_TESTS
+static void benchmark_verify_openssl(void* arg) {
+    int i;
+    benchmark_verify_t* data = (benchmark_verify_t*)arg;
+
+    for (i = 0; i < 20000; i++) {
+        data->sig[data->siglen - 1] ^= (i & 0xFF);
+        data->sig[data->siglen - 2] ^= ((i >> 8) & 0xFF);
+        data->sig[data->siglen - 3] ^= ((i >> 16) & 0xFF);
+        {
+            EC_KEY *pkey = EC_KEY_new();
+            const unsigned char *pubkey = &data->pubkey[0];
+            int result;
+
+            CHECK(pkey != NULL);
+            result = EC_KEY_set_group(pkey, data->ec_group);
+            CHECK(result);
+            result = (o2i_ECPublicKey(&pkey, &pubkey, data->pubkeylen)) != NULL;
+            CHECK(result);
+            result = ECDSA_verify(0, &data->msg[0], sizeof(data->msg), &data->sig[0], data->siglen, pkey) == (i == 0);
+            CHECK(result);
+            EC_KEY_free(pkey);
+        }
+        data->sig[data->siglen - 1] ^= (i & 0xFF);
+        data->sig[data->siglen - 2] ^= ((i >> 8) & 0xFF);
+        data->sig[data->siglen - 3] ^= ((i >> 16) & 0xFF);
+    }
+}
+#endif
+
 int main(void) {
     int i;
     secp256k1_pubkey pubkey;
@@ -62,6 +101,11 @@ int main(void) {
     CHECK(secp256k1_ec_pubkey_serialize(data.ctx, data.pubkey, &data.pubkeylen, &pubkey, SECP256K1_EC_COMPRESSED) == 1);
 
     run_benchmark("ecdsa_verify", benchmark_verify, NULL, NULL, &data, 10, 20000);
+#ifdef ENABLE_OPENSSL_TESTS
+    data.ec_group = EC_GROUP_new_by_curve_name(NID_secp256k1);
+    run_benchmark("ecdsa_verify_openssl", benchmark_verify_openssl, NULL, NULL, &data, 10, 20000);
+    EC_GROUP_free(data.ec_group);
+#endif
 
     secp256k1_context_destroy(data.ctx);
     return 0;
diff --git a/src/ecmult_const_impl.h b/src/ecmult_const_impl.h
index 90ac94770ea13..7a6a25318c4cf 100644
--- a/src/ecmult_const_impl.h
+++ b/src/ecmult_const_impl.h
@@ -58,22 +58,24 @@ static int secp256k1_wnaf_const(int *wnaf, secp256k1_scalar s, int w) {
     int global_sign;
     int skew = 0;
     int word = 0;
+
     /* 1 2 3 */
     int u_last;
     int u;
 
-#ifdef USE_ENDOMORPHISM
     int flip;
     int bit;
     secp256k1_scalar neg_s;
     int not_neg_one;
-    /* If we are using the endomorphism, we cannot handle even numbers by negating
-     * them, since we are working with 128-bit numbers whose negations would be 256
-     * bits, eliminating the performance advantage. Instead we use a technique from
+    /* Note that we cannot handle even numbers by negating them to be odd, as is
+     * done in other implementations, since if our scalars were specified to have
+     * width < 256 for performance reasons, their negations would have width 256
+     * and we'd lose any performance benefit. Instead, we use a technique from
      * Section 4.2 of the Okeya/Tagaki paper, which is to add either 1 (for even)
-     * or 2 (for odd) to the number we are encoding, then compensating after the
-     * multiplication. */
-    /* Negative 128-bit numbers will be negated, since otherwise they are 256-bit */
+     * or 2 (for odd) to the number we are encoding, returning a skew value indicating
+     * this, and having the caller compensate after doing the multiplication. */
+
+    /* Negative numbers will be negated to keep their bit representation below the maximum width */
     flip = secp256k1_scalar_is_high(&s);
     /* We add 1 to even numbers, 2 to odd ones, noting that negation flips parity */
     bit = flip ^ (s.d[0] & 1);
@@ -89,11 +91,6 @@ static int secp256k1_wnaf_const(int *wnaf, secp256k1_scalar s, int w) {
     global_sign = secp256k1_scalar_cond_negate(&s, flip);
     global_sign *= not_neg_one * 2 - 1;
     skew = 1 << bit;
-#else
-    /* Otherwise, we just negate to force oddness */
-    int is_even = secp256k1_scalar_is_even(&s);
-    global_sign = secp256k1_scalar_cond_negate(&s, is_even);
-#endif
 
     /* 4 */
     u_last = secp256k1_scalar_shr_int(&s, w);
@@ -127,15 +124,13 @@ static void secp256k1_ecmult_const(secp256k1_gej *r, const secp256k1_ge *a, cons
     secp256k1_ge tmpa;
     secp256k1_fe Z;
 
+    int skew_1;
+    int wnaf_1[1 + WNAF_SIZE(WINDOW_A - 1)];
 #ifdef USE_ENDOMORPHISM
     secp256k1_ge pre_a_lam[ECMULT_TABLE_SIZE(WINDOW_A)];
-    int wnaf_1[1 + WNAF_SIZE(WINDOW_A - 1)];
     int wnaf_lam[1 + WNAF_SIZE(WINDOW_A - 1)];
-    int skew_1;
     int skew_lam;
     secp256k1_scalar q_1, q_lam;
-#else
-    int wnaf[1 + WNAF_SIZE(WINDOW_A - 1)];
 #endif
 
     int i;
@@ -145,18 +140,10 @@ static void secp256k1_ecmult_const(secp256k1_gej *r, const secp256k1_ge *a, cons
 #ifdef USE_ENDOMORPHISM
     /* split q into q_1 and q_lam (where q = q_1 + q_lam*lambda, and q_1 and q_lam are ~128 bit) */
     secp256k1_scalar_split_lambda(&q_1, &q_lam, &sc);
-    /* no need for zero correction when using endomorphism since even
-     * numbers have one added to them anyway */
     skew_1   = secp256k1_wnaf_const(wnaf_1,   q_1,   WINDOW_A - 1);
     skew_lam = secp256k1_wnaf_const(wnaf_lam, q_lam, WINDOW_A - 1);
 #else
-    int is_zero = secp256k1_scalar_is_zero(scalar);
-    /* the wNAF ladder cannot handle zero, so bump this to one .. we will
-     * correct the result after the fact */
-    sc.d[0] += is_zero;
-    VERIFY_CHECK(!secp256k1_scalar_is_zero(&sc));
-
-    secp256k1_wnaf_const(wnaf, sc, WINDOW_A - 1);
+    skew_1   = secp256k1_wnaf_const(wnaf_1, sc, WINDOW_A - 1);
 #endif
 
     /* Calculate odd multiples of a.
@@ -179,21 +166,15 @@ static void secp256k1_ecmult_const(secp256k1_gej *r, const secp256k1_ge *a, cons
     /* first loop iteration (separated out so we can directly set r, rather
      * than having it start at infinity, get doubled several times, then have
      * its new value added to it) */
-#ifdef USE_ENDOMORPHISM
     i = wnaf_1[WNAF_SIZE(WINDOW_A - 1)];
     VERIFY_CHECK(i != 0);
     ECMULT_CONST_TABLE_GET_GE(&tmpa, pre_a, i, WINDOW_A);
     secp256k1_gej_set_ge(r, &tmpa);
-
+#ifdef USE_ENDOMORPHISM
     i = wnaf_lam[WNAF_SIZE(WINDOW_A - 1)];
     VERIFY_CHECK(i != 0);
     ECMULT_CONST_TABLE_GET_GE(&tmpa, pre_a_lam, i, WINDOW_A);
     secp256k1_gej_add_ge(r, r, &tmpa);
-#else
-    i = wnaf[WNAF_SIZE(WINDOW_A - 1)];
-    VERIFY_CHECK(i != 0);
-    ECMULT_CONST_TABLE_GET_GE(&tmpa, pre_a, i, WINDOW_A);
-    secp256k1_gej_set_ge(r, &tmpa);
 #endif
     /* remaining loop iterations */
     for (i = WNAF_SIZE(WINDOW_A - 1) - 1; i >= 0; i--) {
@@ -202,59 +183,57 @@ static void secp256k1_ecmult_const(secp256k1_gej *r, const secp256k1_ge *a, cons
         for (j = 0; j < WINDOW_A - 1; ++j) {
             secp256k1_gej_double_nonzero(r, r, NULL);
         }
-#ifdef USE_ENDOMORPHISM
+
         n = wnaf_1[i];
         ECMULT_CONST_TABLE_GET_GE(&tmpa, pre_a, n, WINDOW_A);
         VERIFY_CHECK(n != 0);
         secp256k1_gej_add_ge(r, r, &tmpa);
-
+#ifdef USE_ENDOMORPHISM
         n = wnaf_lam[i];
         ECMULT_CONST_TABLE_GET_GE(&tmpa, pre_a_lam, n, WINDOW_A);
         VERIFY_CHECK(n != 0);
         secp256k1_gej_add_ge(r, r, &tmpa);
-#else
-        n = wnaf[i];
-        VERIFY_CHECK(n != 0);
-        ECMULT_CONST_TABLE_GET_GE(&tmpa, pre_a, n, WINDOW_A);
-        secp256k1_gej_add_ge(r, r, &tmpa);
 #endif
     }
 
     secp256k1_fe_mul(&r->z, &r->z, &Z);
 
-#ifdef USE_ENDOMORPHISM
     {
         /* Correct for wNAF skew */
         secp256k1_ge correction = *a;
         secp256k1_ge_storage correction_1_stor;
+#ifdef USE_ENDOMORPHISM
         secp256k1_ge_storage correction_lam_stor;
+#endif
         secp256k1_ge_storage a2_stor;
         secp256k1_gej tmpj;
         secp256k1_gej_set_ge(&tmpj, &correction);
         secp256k1_gej_double_var(&tmpj, &tmpj, NULL);
         secp256k1_ge_set_gej(&correction, &tmpj);
         secp256k1_ge_to_storage(&correction_1_stor, a);
+#ifdef USE_ENDOMORPHISM
         secp256k1_ge_to_storage(&correction_lam_stor, a);
+#endif
         secp256k1_ge_to_storage(&a2_stor, &correction);
 
         /* For odd numbers this is 2a (so replace it), for even ones a (so no-op) */
         secp256k1_ge_storage_cmov(&correction_1_stor, &a2_stor, skew_1 == 2);
+#ifdef USE_ENDOMORPHISM
         secp256k1_ge_storage_cmov(&correction_lam_stor, &a2_stor, skew_lam == 2);
+#endif
 
         /* Apply the correction */
         secp256k1_ge_from_storage(&correction, &correction_1_stor);
         secp256k1_ge_neg(&correction, &correction);
         secp256k1_gej_add_ge(r, r, &correction);
 
+#ifdef USE_ENDOMORPHISM
         secp256k1_ge_from_storage(&correction, &correction_lam_stor);
         secp256k1_ge_neg(&correction, &correction);
         secp256k1_ge_mul_lambda(&correction, &correction);
         secp256k1_gej_add_ge(r, r, &correction);
-    }
-#else
-    /* correct for zero */
-    r->infinity |= is_zero;
 #endif
+    }
 }
 
 #endif
diff --git a/src/ecmult_impl.h b/src/ecmult_impl.h
index e6e5f47188071..81ae08e100b6b 100644
--- a/src/ecmult_impl.h
+++ b/src/ecmult_impl.h
@@ -11,6 +11,8 @@
 #include "scalar.h"
 #include "ecmult.h"
 
+#include <string.h>
+
 /* optimal for 128-bit and 256-bit exponents. */
 #define WINDOW_A 5
 
diff --git a/src/field.h b/src/field.h
index 2d52af5e366c2..c5ba074244e6a 100644
--- a/src/field.h
+++ b/src/field.h
@@ -57,6 +57,9 @@ static int secp256k1_fe_is_zero(const secp256k1_fe *a);
 static int secp256k1_fe_is_odd(const secp256k1_fe *a);
 
 /** Compare two field elements. Requires magnitude-1 inputs. */
+static int secp256k1_fe_equal(const secp256k1_fe *a, const secp256k1_fe *b);
+
+/** Same as secp256k1_fe_equal, but may be variable time. */
 static int secp256k1_fe_equal_var(const secp256k1_fe *a, const secp256k1_fe *b);
 
 /** Compare two field elements. Requires both inputs to be normalized */
@@ -92,7 +95,10 @@ static void secp256k1_fe_sqr(secp256k1_fe *r, const secp256k1_fe *a);
  *  The input's magnitude can be at most 8. The output magnitude is 1 (but not
  *  guaranteed to be normalized). The result in r will always be a square
  *  itself. */
-static int secp256k1_fe_sqrt_var(secp256k1_fe *r, const secp256k1_fe *a);
+static int secp256k1_fe_sqrt(secp256k1_fe *r, const secp256k1_fe *a);
+
+/** Checks whether a field element is a quadratic residue. */
+static int secp256k1_fe_is_quad_var(const secp256k1_fe *a);
 
 /** Sets a field element to be the (modular) inverse of another. Requires the input's magnitude to be
  *  at most 8. The output magnitude is 1 (but not guaranteed to be normalized). */
diff --git a/src/field_10x26_impl.h b/src/field_10x26_impl.h
index 212cc5396af82..7b8c07960847e 100644
--- a/src/field_10x26_impl.h
+++ b/src/field_10x26_impl.h
@@ -7,8 +7,6 @@
 #ifndef _SECP256K1_FIELD_REPR_IMPL_H_
 #define _SECP256K1_FIELD_REPR_IMPL_H_
 
-#include <stdio.h>
-#include <string.h>
 #include "util.h"
 #include "num.h"
 #include "field.h"
@@ -429,6 +427,14 @@ SECP256K1_INLINE static void secp256k1_fe_add(secp256k1_fe *r, const secp256k1_f
 #endif
 }
 
+#if defined(USE_EXTERNAL_ASM)
+
+/* External assembler implementation */
+void secp256k1_fe_mul_inner(uint32_t *r, const uint32_t *a, const uint32_t * SECP256K1_RESTRICT b);
+void secp256k1_fe_sqr_inner(uint32_t *r, const uint32_t *a);
+
+#else
+
 #ifdef VERIFY
 #define VERIFY_BITS(x, n) VERIFY_CHECK(((x) >> (n)) == 0)
 #else
@@ -1037,7 +1043,7 @@ SECP256K1_INLINE static void secp256k1_fe_sqr_inner(uint32_t *r, const uint32_t
     VERIFY_BITS(r[2], 27);
     /* [r9 r8 r7 r6 r5 r4 r3 r2 r1 r0] = [p18 p17 p16 p15 p14 p13 p12 p11 p10 p9 p8 p7 p6 p5 p4 p3 p2 p1 p0] */
 }
-
+#endif
 
 static void secp256k1_fe_mul(secp256k1_fe *r, const secp256k1_fe *a, const secp256k1_fe * SECP256K1_RESTRICT b) {
 #ifdef VERIFY
diff --git a/src/field_5x52_impl.h b/src/field_5x52_impl.h
index b31e24ab811b0..7a99eb21eccc6 100644
--- a/src/field_5x52_impl.h
+++ b/src/field_5x52_impl.h
@@ -11,7 +11,6 @@
 #include "libsecp256k1-config.h"
 #endif
 
-#include <string.h>
 #include "util.h"
 #include "num.h"
 #include "field.h"
diff --git a/src/field_5x52_int128_impl.h b/src/field_5x52_int128_impl.h
index 9280bb5ea2216..0bf22bdd3ec88 100644
--- a/src/field_5x52_int128_impl.h
+++ b/src/field_5x52_int128_impl.h
@@ -137,7 +137,7 @@ SECP256K1_INLINE static void secp256k1_fe_mul_inner(uint64_t *r, const uint64_t
     VERIFY_BITS(r[2], 52);
     VERIFY_BITS(c, 63);
     /* [d 0 0 0 t4 t3+c r2 r1 r0] = [p8 p7 p6 p5 p4 p3 p2 p1 p0] */
-    c   += d * R + t3;;
+    c   += d * R + t3;
     VERIFY_BITS(c, 100);
     /* [t4 c r2 r1 r0] = [p8 p7 p6 p5 p4 p3 p2 p1 p0] */
     r[3] = c & M; c >>= 52;
@@ -259,7 +259,7 @@ SECP256K1_INLINE static void secp256k1_fe_sqr_inner(uint64_t *r, const uint64_t
     VERIFY_BITS(c, 63);
     /* [d 0 0 0 t4 t3+c r2 r1 r0] = [p8 p7 p6 p5 p4 p3 p2 p1 p0] */
 
-    c   += d * R + t3;;
+    c   += d * R + t3;
     VERIFY_BITS(c, 100);
     /* [t4 c r2 r1 r0] = [p8 p7 p6 p5 p4 p3 p2 p1 p0] */
     r[3] = c & M; c >>= 52;
diff --git a/src/field_impl.h b/src/field_impl.h
index 77f4aae2f9724..52cd902eb3873 100644
--- a/src/field_impl.h
+++ b/src/field_impl.h
@@ -21,6 +21,13 @@
 #error "Please select field implementation"
 #endif
 
+SECP256K1_INLINE static int secp256k1_fe_equal(const secp256k1_fe *a, const secp256k1_fe *b) {
+    secp256k1_fe na;
+    secp256k1_fe_negate(&na, a, 1);
+    secp256k1_fe_add(&na, b);
+    return secp256k1_fe_normalizes_to_zero(&na);
+}
+
 SECP256K1_INLINE static int secp256k1_fe_equal_var(const secp256k1_fe *a, const secp256k1_fe *b) {
     secp256k1_fe na;
     secp256k1_fe_negate(&na, a, 1);
@@ -28,7 +35,7 @@ SECP256K1_INLINE static int secp256k1_fe_equal_var(const secp256k1_fe *a, const
     return secp256k1_fe_normalizes_to_zero_var(&na);
 }
 
-static int secp256k1_fe_sqrt_var(secp256k1_fe *r, const secp256k1_fe *a) {
+static int secp256k1_fe_sqrt(secp256k1_fe *r, const secp256k1_fe *a) {
     /** Given that p is congruent to 3 mod 4, we can compute the square root of
      *  a mod p as the (p+1)/4'th power of a.
      *
@@ -123,7 +130,7 @@ static int secp256k1_fe_sqrt_var(secp256k1_fe *r, const secp256k1_fe *a) {
     /* Check that a square root was actually calculated */
 
     secp256k1_fe_sqr(&t1, r);
-    return secp256k1_fe_equal_var(&t1, a);
+    return secp256k1_fe_equal(&t1, a);
 }
 
 static void secp256k1_fe_inv(secp256k1_fe *r, const secp256k1_fe *a) {
@@ -280,4 +287,29 @@ static void secp256k1_fe_inv_all_var(size_t len, secp256k1_fe *r, const secp256k
     r[0] = u;
 }
 
+static int secp256k1_fe_is_quad_var(const secp256k1_fe *a) {
+#ifndef USE_NUM_NONE
+    unsigned char b[32];
+    secp256k1_num n;
+    secp256k1_num m;
+    /* secp256k1 field prime, value p defined in "Standards for Efficient Cryptography" (SEC2) 2.7.1. */
+    static const unsigned char prime[32] = {
+        0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
+        0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
+        0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
+        0xFF,0xFF,0xFF,0xFE,0xFF,0xFF,0xFC,0x2F
+    };
+
+    secp256k1_fe c = *a;
+    secp256k1_fe_normalize_var(&c);
+    secp256k1_fe_get_b32(b, &c);
+    secp256k1_num_set_bin(&n, b, 32);
+    secp256k1_num_set_bin(&m, prime, 32);
+    return secp256k1_num_jacobi(&n, &m) >= 0;
+#else
+    secp256k1_fe r;
+    return secp256k1_fe_sqrt(&r, a);
+#endif
+}
+
 #endif
diff --git a/src/group.h b/src/group.h
index ebfe1ca70cc15..d5157167447a7 100644
--- a/src/group.h
+++ b/src/group.h
@@ -47,7 +47,7 @@ static void secp256k1_ge_set_xy(secp256k1_ge *r, const secp256k1_fe *x, const se
  *  and a Y coordinate that is a quadratic residue modulo p. The return value
  *  is true iff a coordinate with the given X coordinate exists.
  */
-static int secp256k1_ge_set_xquad_var(secp256k1_ge *r, const secp256k1_fe *x);
+static int secp256k1_ge_set_xquad(secp256k1_ge *r, const secp256k1_fe *x);
 
 /** Set a group element (affine) equal to the point with the given X coordinate, and given oddness
  *  for Y. Return value indicates whether the result is valid. */
@@ -94,6 +94,9 @@ static void secp256k1_gej_neg(secp256k1_gej *r, const secp256k1_gej *a);
 /** Check whether a group element is the point at infinity. */
 static int secp256k1_gej_is_infinity(const secp256k1_gej *a);
 
+/** Check whether a group element's y coordinate is a quadratic residue. */
+static int secp256k1_gej_has_quad_y_var(const secp256k1_gej *a);
+
 /** Set r equal to the double of a. If rzr is not-NULL, r->z = a->z * *rzr (where infinity means an implicit z = 0).
  * a may not be zero. Constant time. */
 static void secp256k1_gej_double_nonzero(secp256k1_gej *r, const secp256k1_gej *a, secp256k1_fe *rzr);
diff --git a/src/group_impl.h b/src/group_impl.h
index 42e2f6e6ebf6c..3e9c4c410d413 100644
--- a/src/group_impl.h
+++ b/src/group_impl.h
@@ -7,8 +7,6 @@
 #ifndef _SECP256K1_GROUP_IMPL_H_
 #define _SECP256K1_GROUP_IMPL_H_
 
-#include <string.h>
-
 #include "num.h"
 #include "field.h"
 #include "group.h"
@@ -165,7 +163,7 @@ static void secp256k1_ge_clear(secp256k1_ge *r) {
     secp256k1_fe_clear(&r->y);
 }
 
-static int secp256k1_ge_set_xquad_var(secp256k1_ge *r, const secp256k1_fe *x) {
+static int secp256k1_ge_set_xquad(secp256k1_ge *r, const secp256k1_fe *x) {
     secp256k1_fe x2, x3, c;
     r->x = *x;
     secp256k1_fe_sqr(&x2, x);
@@ -173,11 +171,11 @@ static int secp256k1_ge_set_xquad_var(secp256k1_ge *r, const secp256k1_fe *x) {
     r->infinity = 0;
     secp256k1_fe_set_int(&c, 7);
     secp256k1_fe_add(&c, &x3);
-    return secp256k1_fe_sqrt_var(&r->y, &c);
+    return secp256k1_fe_sqrt(&r->y, &c);
 }
 
 static int secp256k1_ge_set_xo_var(secp256k1_ge *r, const secp256k1_fe *x, int odd) {
-    if (!secp256k1_ge_set_xquad_var(r, x)) {
+    if (!secp256k1_ge_set_xquad(r, x)) {
         return 0;
     }
     secp256k1_fe_normalize_var(&r->y);
@@ -251,11 +249,23 @@ static int secp256k1_ge_is_valid_var(const secp256k1_ge *a) {
 }
 
 static void secp256k1_gej_double_var(secp256k1_gej *r, const secp256k1_gej *a, secp256k1_fe *rzr) {
-    /* Operations: 3 mul, 4 sqr, 0 normalize, 12 mul_int/add/negate */
+    /* Operations: 3 mul, 4 sqr, 0 normalize, 12 mul_int/add/negate.
+     *
+     * Note that there is an implementation described at
+     *     https://hyperelliptic.org/EFD/g1p/auto-shortw-jacobian-0.html#doubling-dbl-2009-l
+     * which trades a multiply for a square, but in practice this is actually slower,
+     * mainly because it requires more normalizations.
+     */
     secp256k1_fe t1,t2,t3,t4;
     /** For secp256k1, 2Q is infinity if and only if Q is infinity. This is because if 2Q = infinity,
      *  Q must equal -Q, or that Q.y == -(Q.y), or Q.y is 0. For a point on y^2 = x^3 + 7 to have
      *  y=0, x^3 must be -7 mod p. However, -7 has no cube root mod p.
+     *  
+     *  Having said this, if this function receives a point on a sextic twist, e.g. by
+     *  a fault attack, it is possible for y to be 0. This happens for y^2 = x^3 + 6,
+     *  since -6 does have a cube root mod p. For this point, this function will not set
+     *  the infinity flag even though the point doubles to infinity, and the result
+     *  point will be gibberish (z = 0 but infinity = 0).
      */
     r->infinity = a->infinity;
     if (r->infinity) {
@@ -623,4 +633,18 @@ static void secp256k1_ge_mul_lambda(secp256k1_ge *r, const secp256k1_ge *a) {
 }
 #endif
 
+static int secp256k1_gej_has_quad_y_var(const secp256k1_gej *a) {
+    secp256k1_fe yz;
+
+    if (a->infinity) {
+        return 0;
+    }
+
+    /* We rely on the fact that the Jacobi symbol of 1 / a->z^3 is the same as
+     * that of a->z. Thus a->y / a->z^3 is a quadratic residue iff a->y * a->z
+       is */
+    secp256k1_fe_mul(&yz, &a->y, &a->z);
+    return secp256k1_fe_is_quad_var(&yz);
+}
+
 #endif
diff --git a/src/hash.h b/src/hash.h
index 0ff01e63fa737..fca98cab9f831 100644
--- a/src/hash.h
+++ b/src/hash.h
@@ -11,7 +11,7 @@
 #include <stdint.h>
 
 typedef struct {
-    uint32_t s[32];
+    uint32_t s[8];
     uint32_t buf[16]; /* In big endian */
     size_t bytes;
 } secp256k1_sha256_t;
diff --git a/src/hash_impl.h b/src/hash_impl.h
index ae55df6d8a29a..b47e65f830a90 100644
--- a/src/hash_impl.h
+++ b/src/hash_impl.h
@@ -269,15 +269,13 @@ static void secp256k1_rfc6979_hmac_sha256_finalize(secp256k1_rfc6979_hmac_sha256
     rng->retry = 0;
 }
 
-
+#undef BE32
 #undef Round
-#undef sigma0
 #undef sigma1
-#undef Sigma0
+#undef sigma0
 #undef Sigma1
-#undef Ch
+#undef Sigma0
 #undef Maj
-#undef ReadBE32
-#undef WriteBE32
+#undef Ch
 
 #endif
diff --git a/src/java/org/bitcoin/NativeSecp256k1.java b/src/java/org/bitcoin/NativeSecp256k1.java
index 90a498eaa2c40..be67048fbed69 100644
--- a/src/java/org/bitcoin/NativeSecp256k1.java
+++ b/src/java/org/bitcoin/NativeSecp256k1.java
@@ -1,60 +1,478 @@
+/*
+ * Copyright 2013 Google Inc.
+ * Copyright 2014-2016 the libsecp256k1 contributors
+ *
+ * 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.bitcoin;
 
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 
+import java.math.BigInteger;
 import com.google.common.base.Preconditions;
-
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReentrantReadWriteLock;
+import static org.bitcoin.NativeSecp256k1Util.*;
 
 /**
- * This class holds native methods to handle ECDSA verification.
- * You can find an example library that can be used for this at
- * https://github.com/sipa/secp256k1
+ * <p>This class holds native methods to handle ECDSA verification.</p>
+ *
+ * <p>You can find an example library that can be used for this at https://github.com/bitcoin/secp256k1</p>
+ *
+ * <p>To build secp256k1 for use with bitcoinj, run
+ * `./configure --enable-jni --enable-experimental --enable-module-schnorr --enable-module-ecdh`
+ * and `make` then copy `.libs/libsecp256k1.so` to your system library path
+ * or point the JVM to the folder containing it with -Djava.library.path
+ * </p>
  */
 public class NativeSecp256k1 {
-    public static final boolean enabled;
-    static {
-        boolean isEnabled = true;
-        try {
-            System.loadLibrary("javasecp256k1");
-        } catch (UnsatisfiedLinkError e) {
-            isEnabled = false;
-        }
-        enabled = isEnabled;
-    }
-    
+
+    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>();
     /**
      * Verifies the given secp256k1 signature in native code.
      * Calling when enabled == false is undefined (probably library not loaded)
-     * 
+     *
      * @param data The data which was signed, must be exactly 32 bytes
      * @param signature The signature
      * @param pub The public key which did the signing
      */
-    public static boolean verify(byte[] data, byte[] signature, byte[] pub) {
+    public static boolean verify(byte[] data, byte[] signature, byte[] pub) throws AssertFailException{
         Preconditions.checkArgument(data.length == 32 && signature.length <= 520 && pub.length <= 520);
 
         ByteBuffer byteBuff = nativeECDSABuffer.get();
-        if (byteBuff == null) {
-            byteBuff = ByteBuffer.allocateDirect(32 + 8 + 520 + 520);
+        if (byteBuff == null || byteBuff.capacity() < 520) {
+            byteBuff = ByteBuffer.allocateDirect(520);
             byteBuff.order(ByteOrder.nativeOrder());
             nativeECDSABuffer.set(byteBuff);
         }
         byteBuff.rewind();
         byteBuff.put(data);
-        byteBuff.putInt(signature.length);
-        byteBuff.putInt(pub.length);
         byteBuff.put(signature);
         byteBuff.put(pub);
-        return secp256k1_ecdsa_verify(byteBuff) == 1;
+
+        byte[][] retByteArray;
+
+        r.lock();
+        try {
+          return secp256k1_ecdsa_verify(byteBuff, Secp256k1Context.getContext(), signature.length, pub.length) == 1;
+        } finally {
+          r.unlock();
+        }
+    }
+
+    /**
+     * libsecp256k1 Create an ECDSA signature.
+     *
+     * @param data Message hash, 32 bytes
+     * @param key Secret key, 32 bytes
+     *
+     * Return values
+     * @param sig byte array of signature
+     */
+    public static byte[] sign(byte[] data, byte[] sec) throws AssertFailException{
+        Preconditions.checkArgument(data.length == 32 && sec.length <= 32);
+
+        ByteBuffer byteBuff = nativeECDSABuffer.get();
+        if (byteBuff == null || byteBuff.capacity() < 32 + 32) {
+            byteBuff = ByteBuffer.allocateDirect(32 + 32);
+            byteBuff.order(ByteOrder.nativeOrder());
+            nativeECDSABuffer.set(byteBuff);
+        }
+        byteBuff.rewind();
+        byteBuff.put(data);
+        byteBuff.put(sec);
+
+        byte[][] retByteArray;
+
+        r.lock();
+        try {
+          retByteArray = secp256k1_ecdsa_sign(byteBuff, Secp256k1Context.getContext());
+        } finally {
+          r.unlock();
+        }
+
+        byte[] sigArr = retByteArray[0];
+        int sigLen = new BigInteger(new byte[] { retByteArray[1][0] }).intValue();
+        int retVal = new BigInteger(new byte[] { retByteArray[1][1] }).intValue();
+
+        assertEquals(sigArr.length, sigLen, "Got bad signature length.");
+
+        return retVal == 0 ? new byte[0] : sigArr;
+    }
+
+    /**
+     * libsecp256k1 Seckey Verify - returns 1 if valid, 0 if invalid
+     *
+     * @param seckey ECDSA Secret key, 32 bytes
+     */
+    public static boolean secKeyVerify(byte[] seckey) {
+        Preconditions.checkArgument(seckey.length == 32);
+
+        ByteBuffer byteBuff = nativeECDSABuffer.get();
+        if (byteBuff == null || byteBuff.capacity() < seckey.length) {
+            byteBuff = ByteBuffer.allocateDirect(seckey.length);
+            byteBuff.order(ByteOrder.nativeOrder());
+            nativeECDSABuffer.set(byteBuff);
+        }
+        byteBuff.rewind();
+        byteBuff.put(seckey);
+
+        r.lock();
+        try {
+          return secp256k1_ec_seckey_verify(byteBuff,Secp256k1Context.getContext()) == 1;
+        } finally {
+          r.unlock();
+        }
+    }
+
+
+    /**
+     * libsecp256k1 Compute Pubkey - computes public key from secret key
+     *
+     * @param seckey ECDSA Secret key, 32 bytes
+     *
+     * Return values
+     * @param pubkey ECDSA Public key, 33 or 65 bytes
+     */
+    //TODO add a 'compressed' arg
+    public static byte[] computePubkey(byte[] seckey) throws AssertFailException{
+        Preconditions.checkArgument(seckey.length == 32);
+
+        ByteBuffer byteBuff = nativeECDSABuffer.get();
+        if (byteBuff == null || byteBuff.capacity() < seckey.length) {
+            byteBuff = ByteBuffer.allocateDirect(seckey.length);
+            byteBuff.order(ByteOrder.nativeOrder());
+            nativeECDSABuffer.set(byteBuff);
+        }
+        byteBuff.rewind();
+        byteBuff.put(seckey);
+
+        byte[][] retByteArray;
+
+        r.lock();
+        try {
+          retByteArray = secp256k1_ec_pubkey_create(byteBuff, Secp256k1Context.getContext());
+        } finally {
+          r.unlock();
+        }
+
+        byte[] pubArr = retByteArray[0];
+        int pubLen = new BigInteger(new byte[] { retByteArray[1][0] }).intValue();
+        int retVal = new BigInteger(new byte[] { retByteArray[1][1] }).intValue();
+
+        assertEquals(pubArr.length, pubLen, "Got bad pubkey length.");
+
+        return retVal == 0 ? new byte[0]: pubArr;
+    }
+
+    /**
+     * libsecp256k1 Cleanup - This destroys the secp256k1 context object
+     * This should be called at the end of the program for proper cleanup of the context.
+     */
+    public static synchronized void cleanup() {
+        w.lock();
+        try {
+          secp256k1_destroy_context(Secp256k1Context.getContext());
+        } finally {
+          w.unlock();
+        }
+    }
+
+    public static long cloneContext() {
+       r.lock();
+       try {
+        return secp256k1_ctx_clone(Secp256k1Context.getContext());
+       } finally { r.unlock(); }
+    }
+
+    /**
+     * libsecp256k1 PrivKey Tweak-Mul - Tweak privkey by multiplying to it
+     *
+     * @param tweak some bytes to tweak with
+     * @param seckey 32-byte seckey
+     */
+    public static byte[] privKeyTweakMul(byte[] privkey, byte[] tweak) throws AssertFailException{
+        Preconditions.checkArgument(privkey.length == 32);
+
+        ByteBuffer byteBuff = nativeECDSABuffer.get();
+        if (byteBuff == null || byteBuff.capacity() < privkey.length + tweak.length) {
+            byteBuff = ByteBuffer.allocateDirect(privkey.length + tweak.length);
+            byteBuff.order(ByteOrder.nativeOrder());
+            nativeECDSABuffer.set(byteBuff);
+        }
+        byteBuff.rewind();
+        byteBuff.put(privkey);
+        byteBuff.put(tweak);
+
+        byte[][] retByteArray;
+        r.lock();
+        try {
+          retByteArray = secp256k1_privkey_tweak_mul(byteBuff,Secp256k1Context.getContext());
+        } finally {
+          r.unlock();
+        }
+
+        byte[] privArr = retByteArray[0];
+
+        int privLen = (byte) new BigInteger(new byte[] { retByteArray[1][0] }).intValue() & 0xFF;
+        int retVal = new BigInteger(new byte[] { retByteArray[1][1] }).intValue();
+
+        assertEquals(privArr.length, privLen, "Got bad pubkey length.");
+
+        assertEquals(retVal, 1, "Failed return value check.");
+
+        return privArr;
     }
 
     /**
-     * @param byteBuff signature format is byte[32] data,
-     *        native-endian int signatureLength, native-endian int pubkeyLength,
-     *        byte[signatureLength] signature, byte[pubkeyLength] pub
-     * @returns 1 for valid signature, anything else for invalid
+     * libsecp256k1 PrivKey Tweak-Add - Tweak privkey by adding to it
+     *
+     * @param tweak some bytes to tweak with
+     * @param seckey 32-byte seckey
      */
-    private static native int secp256k1_ecdsa_verify(ByteBuffer byteBuff);
+    public static byte[] privKeyTweakAdd(byte[] privkey, byte[] tweak) throws AssertFailException{
+        Preconditions.checkArgument(privkey.length == 32);
+
+        ByteBuffer byteBuff = nativeECDSABuffer.get();
+        if (byteBuff == null || byteBuff.capacity() < privkey.length + tweak.length) {
+            byteBuff = ByteBuffer.allocateDirect(privkey.length + tweak.length);
+            byteBuff.order(ByteOrder.nativeOrder());
+            nativeECDSABuffer.set(byteBuff);
+        }
+        byteBuff.rewind();
+        byteBuff.put(privkey);
+        byteBuff.put(tweak);
+
+        byte[][] retByteArray;
+        r.lock();
+        try {
+          retByteArray = secp256k1_privkey_tweak_add(byteBuff,Secp256k1Context.getContext());
+        } finally {
+          r.unlock();
+        }
+
+        byte[] privArr = retByteArray[0];
+
+        int privLen = (byte) new BigInteger(new byte[] { retByteArray[1][0] }).intValue() & 0xFF;
+        int retVal = new BigInteger(new byte[] { retByteArray[1][1] }).intValue();
+
+        assertEquals(privArr.length, privLen, "Got bad pubkey length.");
+
+        assertEquals(retVal, 1, "Failed return value check.");
+
+        return privArr;
+    }
+
+    /**
+     * libsecp256k1 PubKey Tweak-Add - Tweak pubkey by adding to it
+     *
+     * @param tweak some bytes to tweak with
+     * @param pubkey 32-byte seckey
+     */
+    public static byte[] pubKeyTweakAdd(byte[] pubkey, byte[] tweak) throws AssertFailException{
+        Preconditions.checkArgument(pubkey.length == 33 || pubkey.length == 65);
+
+        ByteBuffer byteBuff = nativeECDSABuffer.get();
+        if (byteBuff == null || byteBuff.capacity() < pubkey.length + tweak.length) {
+            byteBuff = ByteBuffer.allocateDirect(pubkey.length + tweak.length);
+            byteBuff.order(ByteOrder.nativeOrder());
+            nativeECDSABuffer.set(byteBuff);
+        }
+        byteBuff.rewind();
+        byteBuff.put(pubkey);
+        byteBuff.put(tweak);
+
+        byte[][] retByteArray;
+        r.lock();
+        try {
+          retByteArray = secp256k1_pubkey_tweak_add(byteBuff,Secp256k1Context.getContext(), pubkey.length);
+        } finally {
+          r.unlock();
+        }
+
+        byte[] pubArr = retByteArray[0];
+
+        int pubLen = (byte) new BigInteger(new byte[] { retByteArray[1][0] }).intValue() & 0xFF;
+        int retVal = new BigInteger(new byte[] { retByteArray[1][1] }).intValue();
+
+        assertEquals(pubArr.length, pubLen, "Got bad pubkey length.");
+
+        assertEquals(retVal, 1, "Failed return value check.");
+
+        return pubArr;
+    }
+
+    /**
+     * libsecp256k1 PubKey Tweak-Mul - Tweak pubkey by multiplying to it
+     *
+     * @param tweak some bytes to tweak with
+     * @param pubkey 32-byte seckey
+     */
+    public static byte[] pubKeyTweakMul(byte[] pubkey, byte[] tweak) throws AssertFailException{
+        Preconditions.checkArgument(pubkey.length == 33 || pubkey.length == 65);
+
+        ByteBuffer byteBuff = nativeECDSABuffer.get();
+        if (byteBuff == null || byteBuff.capacity() < pubkey.length + tweak.length) {
+            byteBuff = ByteBuffer.allocateDirect(pubkey.length + tweak.length);
+            byteBuff.order(ByteOrder.nativeOrder());
+            nativeECDSABuffer.set(byteBuff);
+        }
+        byteBuff.rewind();
+        byteBuff.put(pubkey);
+        byteBuff.put(tweak);
+
+        byte[][] retByteArray;
+        r.lock();
+        try {
+          retByteArray = secp256k1_pubkey_tweak_mul(byteBuff,Secp256k1Context.getContext(), pubkey.length);
+        } finally {
+          r.unlock();
+        }
+
+        byte[] pubArr = retByteArray[0];
+
+        int pubLen = (byte) new BigInteger(new byte[] { retByteArray[1][0] }).intValue() & 0xFF;
+        int retVal = new BigInteger(new byte[] { retByteArray[1][1] }).intValue();
+
+        assertEquals(pubArr.length, pubLen, "Got bad pubkey length.");
+
+        assertEquals(retVal, 1, "Failed return value check.");
+
+        return pubArr;
+    }
+
+    /**
+     * libsecp256k1 create ECDH secret - constant time ECDH calculation
+     *
+     * @param seckey byte array of secret key used in exponentiaion
+     * @param pubkey byte array of public key used in exponentiaion
+     */
+    public static byte[] createECDHSecret(byte[] seckey, byte[] pubkey) throws AssertFailException{
+        Preconditions.checkArgument(seckey.length <= 32 && pubkey.length <= 65);
+
+        ByteBuffer byteBuff = nativeECDSABuffer.get();
+        if (byteBuff == null || byteBuff.capacity() < 32 + pubkey.length) {
+            byteBuff = ByteBuffer.allocateDirect(32 + pubkey.length);
+            byteBuff.order(ByteOrder.nativeOrder());
+            nativeECDSABuffer.set(byteBuff);
+        }
+        byteBuff.rewind();
+        byteBuff.put(seckey);
+        byteBuff.put(pubkey);
+
+        byte[][] retByteArray;
+        r.lock();
+        try {
+          retByteArray = secp256k1_ecdh(byteBuff, Secp256k1Context.getContext(), pubkey.length);
+        } finally {
+          r.unlock();
+        }
+
+        byte[] resArr = retByteArray[0];
+        int retVal = new BigInteger(new byte[] { retByteArray[1][0] }).intValue();
+
+        assertEquals(resArr.length, 32, "Got bad result length.");
+        assertEquals(retVal, 1, "Failed return value check.");
+
+        return resArr;
+    }
+
+    /**
+     * libsecp256k1 randomize - updates the context randomization
+     *
+     * @param seed 32-byte random seed
+     */
+    public static synchronized boolean randomize(byte[] seed) throws AssertFailException{
+        Preconditions.checkArgument(seed.length == 32 || seed == null);
+
+        ByteBuffer byteBuff = nativeECDSABuffer.get();
+        if (byteBuff == null || byteBuff.capacity() < seed.length) {
+            byteBuff = ByteBuffer.allocateDirect(seed.length);
+            byteBuff.order(ByteOrder.nativeOrder());
+            nativeECDSABuffer.set(byteBuff);
+        }
+        byteBuff.rewind();
+        byteBuff.put(seed);
+
+        w.lock();
+        try {
+          return secp256k1_context_randomize(byteBuff, Secp256k1Context.getContext()) == 1;
+        } finally {
+          w.unlock();
+        }
+    }
+
+    public static byte[] schnorrSign(byte[] data, byte[] sec) throws AssertFailException {
+        Preconditions.checkArgument(data.length == 32 && sec.length <= 32);
+
+        ByteBuffer byteBuff = nativeECDSABuffer.get();
+        if (byteBuff == null) {
+            byteBuff = ByteBuffer.allocateDirect(32 + 32);
+            byteBuff.order(ByteOrder.nativeOrder());
+            nativeECDSABuffer.set(byteBuff);
+        }
+        byteBuff.rewind();
+        byteBuff.put(data);
+        byteBuff.put(sec);
+
+        byte[][] retByteArray;
+
+        r.lock();
+        try {
+          retByteArray = secp256k1_schnorr_sign(byteBuff, Secp256k1Context.getContext());
+        } finally {
+          r.unlock();
+        }
+
+        byte[] sigArr = retByteArray[0];
+        int retVal = new BigInteger(new byte[] { retByteArray[1][0] }).intValue();
+
+        assertEquals(sigArr.length, 64, "Got bad signature length.");
+
+        return retVal == 0 ? new byte[0] : sigArr;
+    }
+
+    private static native long secp256k1_ctx_clone(long context);
+
+    private static native int secp256k1_context_randomize(ByteBuffer byteBuff, long context);
+
+    private static native byte[][] secp256k1_privkey_tweak_add(ByteBuffer byteBuff, long context);
+
+    private static native byte[][] secp256k1_privkey_tweak_mul(ByteBuffer byteBuff, long context);
+
+    private static native byte[][] secp256k1_pubkey_tweak_add(ByteBuffer byteBuff, long context, int pubLen);
+
+    private static native byte[][] secp256k1_pubkey_tweak_mul(ByteBuffer byteBuff, long context, int pubLen);
+
+    private static native void secp256k1_destroy_context(long context);
+
+    private static native int secp256k1_ecdsa_verify(ByteBuffer byteBuff, long context, int sigLen, int pubLen);
+
+    private static native byte[][] secp256k1_ecdsa_sign(ByteBuffer byteBuff, long context);
+
+    private static native int secp256k1_ec_seckey_verify(ByteBuffer byteBuff, long context);
+
+    private static native byte[][] secp256k1_ec_pubkey_create(ByteBuffer byteBuff, long context);
+
+    private static native byte[][] secp256k1_ec_pubkey_parse(ByteBuffer byteBuff, long context, int inputLen);
+
+    private static native byte[][] secp256k1_schnorr_sign(ByteBuffer byteBuff, long context);
+
+    private static native byte[][] secp256k1_ecdh(ByteBuffer byteBuff, long context, int inputLen);
+
 }
diff --git a/src/java/org/bitcoin/NativeSecp256k1Test.java b/src/java/org/bitcoin/NativeSecp256k1Test.java
new file mode 100644
index 0000000000000..f18ce95810d13
--- /dev/null
+++ b/src/java/org/bitcoin/NativeSecp256k1Test.java
@@ -0,0 +1,247 @@
+package org.bitcoin;
+
+import com.google.common.io.BaseEncoding;
+import java.util.Arrays;
+import java.math.BigInteger;
+import javax.xml.bind.DatatypeConverter;
+import static org.bitcoin.NativeSecp256k1Util.*;
+
+/**
+ * This class holds test cases defined for testing this library.
+ */
+public class NativeSecp256k1Test {
+
+    //TODO improve comments/add more tests
+    /**
+      * This tests verify() for a valid signature
+      */
+    public static void testVerifyPos() throws AssertFailException{
+        boolean result = false;
+        byte[] data = BaseEncoding.base16().lowerCase().decode("CF80CD8AED482D5D1527D7DC72FCEFF84E6326592848447D2DC0B0E87DFC9A90".toLowerCase()); //sha256hash of "testing"
+        byte[] sig = BaseEncoding.base16().lowerCase().decode("3044022079BE667EF9DCBBAC55A06295CE870B07029BFCDB2DCE28D959F2815B16F817980220294F14E883B3F525B5367756C2A11EF6CF84B730B36C17CB0C56F0AAB2C98589".toLowerCase());
+        byte[] pub = BaseEncoding.base16().lowerCase().decode("040A629506E1B65CD9D2E0BA9C75DF9C4FED0DB16DC9625ED14397F0AFC836FAE595DC53F8B0EFE61E703075BD9B143BAC75EC0E19F82A2208CAEB32BE53414C40".toLowerCase());
+
+        result = NativeSecp256k1.verify( data, sig, pub);
+        assertEquals( result, true , "testVerifyPos");
+    }
+
+    /**
+      * This tests verify() for a non-valid signature
+      */
+    public static void testVerifyNeg() throws AssertFailException{
+        boolean result = false;
+        byte[] data = BaseEncoding.base16().lowerCase().decode("CF80CD8AED482D5D1527D7DC72FCEFF84E6326592848447D2DC0B0E87DFC9A91".toLowerCase()); //sha256hash of "testing"
+        byte[] sig = BaseEncoding.base16().lowerCase().decode("3044022079BE667EF9DCBBAC55A06295CE870B07029BFCDB2DCE28D959F2815B16F817980220294F14E883B3F525B5367756C2A11EF6CF84B730B36C17CB0C56F0AAB2C98589".toLowerCase());
+        byte[] pub = BaseEncoding.base16().lowerCase().decode("040A629506E1B65CD9D2E0BA9C75DF9C4FED0DB16DC9625ED14397F0AFC836FAE595DC53F8B0EFE61E703075BD9B143BAC75EC0E19F82A2208CAEB32BE53414C40".toLowerCase());
+
+        result = NativeSecp256k1.verify( data, sig, pub);
+        //System.out.println(" TEST " + new BigInteger(1, resultbytes).toString(16));
+        assertEquals( result, false , "testVerifyNeg");
+    }
+
+    /**
+      * This tests secret key verify() for a valid secretkey
+      */
+    public static void testSecKeyVerifyPos() throws AssertFailException{
+        boolean result = false;
+        byte[] sec = BaseEncoding.base16().lowerCase().decode("67E56582298859DDAE725F972992A07C6C4FB9F62A8FFF58CE3CA926A1063530".toLowerCase());
+
+        result = NativeSecp256k1.secKeyVerify( sec );
+        //System.out.println(" TEST " + new BigInteger(1, resultbytes).toString(16));
+        assertEquals( result, true , "testSecKeyVerifyPos");
+    }
+
+    /**
+      * This tests secret key verify() for a invalid secretkey
+      */
+    public static void testSecKeyVerifyNeg() throws AssertFailException{
+        boolean result = false;
+        byte[] sec = BaseEncoding.base16().lowerCase().decode("FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF".toLowerCase());
+
+        result = NativeSecp256k1.secKeyVerify( sec );
+        //System.out.println(" TEST " + new BigInteger(1, resultbytes).toString(16));
+        assertEquals( result, false , "testSecKeyVerifyNeg");
+    }
+
+    /**
+      * This tests public key create() for a valid secretkey
+      */
+    public static void testPubKeyCreatePos() throws AssertFailException{
+        byte[] sec = BaseEncoding.base16().lowerCase().decode("67E56582298859DDAE725F972992A07C6C4FB9F62A8FFF58CE3CA926A1063530".toLowerCase());
+
+        byte[] resultArr = NativeSecp256k1.computePubkey( sec);
+        String pubkeyString = javax.xml.bind.DatatypeConverter.printHexBinary(resultArr);
+        assertEquals( pubkeyString , "04C591A8FF19AC9C4E4E5793673B83123437E975285E7B442F4EE2654DFFCA5E2D2103ED494718C697AC9AEBCFD19612E224DB46661011863ED2FC54E71861E2A6" , "testPubKeyCreatePos");
+    }
+
+    /**
+      * This tests public key create() for a invalid secretkey
+      */
+    public static void testPubKeyCreateNeg() throws AssertFailException{
+       byte[] sec = BaseEncoding.base16().lowerCase().decode("FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF".toLowerCase());
+
+       byte[] resultArr = NativeSecp256k1.computePubkey( sec);
+       String pubkeyString = javax.xml.bind.DatatypeConverter.printHexBinary(resultArr);
+       assertEquals( pubkeyString, "" , "testPubKeyCreateNeg");
+    }
+
+    /**
+      * This tests sign() for a valid secretkey
+      */
+    public static void testSignPos() throws AssertFailException{
+
+        byte[] data = BaseEncoding.base16().lowerCase().decode("CF80CD8AED482D5D1527D7DC72FCEFF84E6326592848447D2DC0B0E87DFC9A90".toLowerCase()); //sha256hash of "testing"
+        byte[] sec = BaseEncoding.base16().lowerCase().decode("67E56582298859DDAE725F972992A07C6C4FB9F62A8FFF58CE3CA926A1063530".toLowerCase());
+
+        byte[] resultArr = NativeSecp256k1.sign(data, sec);
+        String sigString = javax.xml.bind.DatatypeConverter.printHexBinary(resultArr);
+        assertEquals( sigString, "30440220182A108E1448DC8F1FB467D06A0F3BB8EA0533584CB954EF8DA112F1D60E39A202201C66F36DA211C087F3AF88B50EDF4F9BDAA6CF5FD6817E74DCA34DB12390C6E9" , "testSignPos");
+    }
+
+    /**
+      * This tests sign() for a invalid secretkey
+      */
+    public static void testSignNeg() throws AssertFailException{
+        byte[] data = BaseEncoding.base16().lowerCase().decode("CF80CD8AED482D5D1527D7DC72FCEFF84E6326592848447D2DC0B0E87DFC9A90".toLowerCase()); //sha256hash of "testing"
+        byte[] sec = BaseEncoding.base16().lowerCase().decode("FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF".toLowerCase());
+
+        byte[] resultArr = NativeSecp256k1.sign(data, sec);
+        String sigString = javax.xml.bind.DatatypeConverter.printHexBinary(resultArr);
+        assertEquals( sigString, "" , "testSignNeg");
+    }
+
+    /**
+      * This tests private key tweak-add
+      */
+    public static void testPrivKeyTweakAdd_1() throws AssertFailException {
+        byte[] sec = BaseEncoding.base16().lowerCase().decode("67E56582298859DDAE725F972992A07C6C4FB9F62A8FFF58CE3CA926A1063530".toLowerCase());
+        byte[] data = BaseEncoding.base16().lowerCase().decode("3982F19BEF1615BCCFBB05E321C10E1D4CBA3DF0E841C2E41EEB6016347653C3".toLowerCase()); //sha256hash of "tweak"
+
+        byte[] resultArr = NativeSecp256k1.privKeyTweakAdd( sec , data );
+        String sigString = javax.xml.bind.DatatypeConverter.printHexBinary(resultArr);
+        assertEquals( sigString , "A168571E189E6F9A7E2D657A4B53AE99B909F7E712D1C23CED28093CD57C88F3" , "testPrivKeyAdd_1");
+    }
+
+    /**
+      * This tests private key tweak-mul
+      */
+    public static void testPrivKeyTweakMul_1() throws AssertFailException {
+        byte[] sec = BaseEncoding.base16().lowerCase().decode("67E56582298859DDAE725F972992A07C6C4FB9F62A8FFF58CE3CA926A1063530".toLowerCase());
+        byte[] data = BaseEncoding.base16().lowerCase().decode("3982F19BEF1615BCCFBB05E321C10E1D4CBA3DF0E841C2E41EEB6016347653C3".toLowerCase()); //sha256hash of "tweak"
+
+        byte[] resultArr = NativeSecp256k1.privKeyTweakMul( sec , data );
+        String sigString = javax.xml.bind.DatatypeConverter.printHexBinary(resultArr);
+        assertEquals( sigString , "97F8184235F101550F3C71C927507651BD3F1CDB4A5A33B8986ACF0DEE20FFFC" , "testPrivKeyMul_1");
+    }
+
+    /**
+      * This tests private key tweak-add uncompressed
+      */
+    public static void testPrivKeyTweakAdd_2() throws AssertFailException {
+        byte[] pub = BaseEncoding.base16().lowerCase().decode("040A629506E1B65CD9D2E0BA9C75DF9C4FED0DB16DC9625ED14397F0AFC836FAE595DC53F8B0EFE61E703075BD9B143BAC75EC0E19F82A2208CAEB32BE53414C40".toLowerCase());
+        byte[] data = BaseEncoding.base16().lowerCase().decode("3982F19BEF1615BCCFBB05E321C10E1D4CBA3DF0E841C2E41EEB6016347653C3".toLowerCase()); //sha256hash of "tweak"
+
+        byte[] resultArr = NativeSecp256k1.pubKeyTweakAdd( pub , data );
+        String sigString = javax.xml.bind.DatatypeConverter.printHexBinary(resultArr);
+        assertEquals( sigString , "0411C6790F4B663CCE607BAAE08C43557EDC1A4D11D88DFCB3D841D0C6A941AF525A268E2A863C148555C48FB5FBA368E88718A46E205FABC3DBA2CCFFAB0796EF" , "testPrivKeyAdd_2");
+    }
+
+    /**
+      * This tests private key tweak-mul uncompressed
+      */
+    public static void testPrivKeyTweakMul_2() throws AssertFailException {
+        byte[] pub = BaseEncoding.base16().lowerCase().decode("040A629506E1B65CD9D2E0BA9C75DF9C4FED0DB16DC9625ED14397F0AFC836FAE595DC53F8B0EFE61E703075BD9B143BAC75EC0E19F82A2208CAEB32BE53414C40".toLowerCase());
+        byte[] data = BaseEncoding.base16().lowerCase().decode("3982F19BEF1615BCCFBB05E321C10E1D4CBA3DF0E841C2E41EEB6016347653C3".toLowerCase()); //sha256hash of "tweak"
+
+        byte[] resultArr = NativeSecp256k1.pubKeyTweakMul( pub , data );
+        String sigString = javax.xml.bind.DatatypeConverter.printHexBinary(resultArr);
+        assertEquals( sigString , "04E0FE6FE55EBCA626B98A807F6CAF654139E14E5E3698F01A9A658E21DC1D2791EC060D4F412A794D5370F672BC94B722640B5F76914151CFCA6E712CA48CC589" , "testPrivKeyMul_2");
+    }
+
+    /**
+      * This tests seed randomization
+      */
+    public static void testRandomize() throws AssertFailException {
+        byte[] seed = BaseEncoding.base16().lowerCase().decode("A441B15FE9A3CF56661190A0B93B9DEC7D04127288CC87250967CF3B52894D11".toLowerCase()); //sha256hash of "random"
+        boolean result = NativeSecp256k1.randomize(seed);
+        assertEquals( result, true, "testRandomize");
+    }
+
+    /**
+      * This tests signSchnorr() for a valid secretkey
+      */
+    public static void testSchnorrSign() throws AssertFailException{
+
+        byte[] data = BaseEncoding.base16().lowerCase().decode("CF80CD8AED482D5D1527D7DC72FCEFF84E6326592848447D2DC0B0E87DFC9A90".toLowerCase()); //sha256hash of "testing"
+        byte[] sec = BaseEncoding.base16().lowerCase().decode("67E56582298859DDAE725F972992A07C6C4FB9F62A8FFF58CE3CA926A1063530".toLowerCase());
+
+        byte[] resultArr = NativeSecp256k1.schnorrSign(data, sec);
+        String sigString = javax.xml.bind.DatatypeConverter.printHexBinary(resultArr);
+        assertEquals( sigString, "C5E929AA058B982048760422D3B563749B7D0E50C5EBD8CD2FFC23214BD6A2F1B072C13880997EBA847CF20F2F90FCE07C1CA33A890A4127095A351127F8D95F" , "testSchnorrSign");
+    }
+
+    /**
+      * This tests signSchnorr() for a valid secretkey
+      */
+    public static void testCreateECDHSecret() throws AssertFailException{
+
+        byte[] sec = BaseEncoding.base16().lowerCase().decode("67E56582298859DDAE725F972992A07C6C4FB9F62A8FFF58CE3CA926A1063530".toLowerCase());
+        byte[] pub = BaseEncoding.base16().lowerCase().decode("040A629506E1B65CD9D2E0BA9C75DF9C4FED0DB16DC9625ED14397F0AFC836FAE595DC53F8B0EFE61E703075BD9B143BAC75EC0E19F82A2208CAEB32BE53414C40".toLowerCase());
+
+        byte[] resultArr = NativeSecp256k1.createECDHSecret(sec, pub);
+        String ecdhString = javax.xml.bind.DatatypeConverter.printHexBinary(resultArr);
+        assertEquals( ecdhString, "2A2A67007A926E6594AF3EB564FC74005B37A9C8AEF2033C4552051B5C87F043" , "testCreateECDHSecret");
+    }
+
+    public static void main(String[] args) throws AssertFailException{
+
+
+        System.out.println("\n libsecp256k1 enabled: " + Secp256k1Context.isEnabled() + "\n");
+
+        assertEquals( Secp256k1Context.isEnabled(), true, "isEnabled" );
+
+        //Test verify() success/fail
+        testVerifyPos();
+        testVerifyNeg();
+
+        //Test secKeyVerify() success/fail
+        testSecKeyVerifyPos();
+        testSecKeyVerifyNeg();
+
+        //Test computePubkey() success/fail
+        testPubKeyCreatePos();
+        testPubKeyCreateNeg();
+
+        //Test sign() success/fail
+        testSignPos();
+        testSignNeg();
+
+        //Test Schnorr (partial support) //TODO
+        testSchnorrSign();
+        //testSchnorrVerify
+        //testSchnorrRecovery
+
+        //Test privKeyTweakAdd() 1
+        testPrivKeyTweakAdd_1();
+
+        //Test privKeyTweakMul() 2
+        testPrivKeyTweakMul_1();
+
+        //Test privKeyTweakAdd() 3
+        testPrivKeyTweakAdd_2();
+
+        //Test privKeyTweakMul() 4
+        testPrivKeyTweakMul_2();
+
+        //Test randomize()
+        testRandomize();
+
+        //Test ECDH
+        testCreateECDHSecret();
+
+        NativeSecp256k1.cleanup();
+
+        System.out.println(" All tests passed." );
+
+    }
+}
diff --git a/src/java/org/bitcoin/NativeSecp256k1Util.java b/src/java/org/bitcoin/NativeSecp256k1Util.java
new file mode 100644
index 0000000000000..04732ba044363
--- /dev/null
+++ b/src/java/org/bitcoin/NativeSecp256k1Util.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2014-2016 the libsecp256k1 contributors
+ *
+ * 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.bitcoin;
+
+public class NativeSecp256k1Util{
+
+    public static void assertEquals( int val, int val2, String message ) throws AssertFailException{
+      if( val != val2 )
+        throw new AssertFailException("FAIL: " + message);
+    }
+
+    public static void assertEquals( boolean val, boolean val2, String message ) throws AssertFailException{
+      if( val != val2 )
+        throw new AssertFailException("FAIL: " + message);
+      else
+        System.out.println("PASS: " + message);
+    }
+
+    public static void assertEquals( String val, String val2, String message ) throws AssertFailException{
+      if( !val.equals(val2) )
+        throw new AssertFailException("FAIL: " + message);
+      else
+        System.out.println("PASS: " + message);
+    }
+
+    public static class AssertFailException extends Exception {
+      public AssertFailException(String message) {
+        super( message );
+      }
+    }
+}
diff --git a/src/java/org/bitcoin/Secp256k1Context.java b/src/java/org/bitcoin/Secp256k1Context.java
new file mode 100644
index 0000000000000..216c986a8b564
--- /dev/null
+++ b/src/java/org/bitcoin/Secp256k1Context.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2014-2016 the libsecp256k1 contributors
+ *
+ * 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.bitcoin;
+
+/**
+ * This class holds the context reference used in native methods 
+ * to handle ECDSA operations.
+ */
+public class Secp256k1Context {
+  private static final boolean enabled; //true if the library is loaded
+  private static final long context; //ref to pointer to context obj
+
+  static { //static initializer
+      boolean isEnabled = true;
+      long contextRef = -1;
+      try {
+          System.loadLibrary("secp256k1");
+          contextRef = secp256k1_init_context();
+      } catch (UnsatisfiedLinkError e) {
+          System.out.println("UnsatisfiedLinkError: " + e.toString());
+          isEnabled = false;
+      }
+      enabled = isEnabled;
+      context = contextRef;
+  }
+
+  public static boolean isEnabled() {
+     return enabled;
+  }
+
+  public static long getContext() {
+     if(!enabled) return -1; //sanity check
+     return context;
+  }
+
+  private static native long secp256k1_init_context();
+}
diff --git a/src/java/org_bitcoin_NativeSecp256k1.c b/src/java/org_bitcoin_NativeSecp256k1.c
index bb4cd707280a6..dba9524dd4cc2 100644
--- a/src/java/org_bitcoin_NativeSecp256k1.c
+++ b/src/java/org_bitcoin_NativeSecp256k1.c
@@ -1,23 +1,411 @@
+#include <stdlib.h>
+#include <stdint.h>
+#include <string.h>
 #include "org_bitcoin_NativeSecp256k1.h"
 #include "include/secp256k1.h"
+#include "include/secp256k1_ecdh.h"
+#include "include/secp256k1_recovery.h"
+#include "include/secp256k1_schnorr.h"
 
-JNIEXPORT jint JNICALL Java_org_bitcoin_NativeSecp256k1_secp256k1_1ecdsa_1verify
-  (JNIEnv* env, jclass classObject, jobject byteBufferObject)
+
+SECP256K1_API jlong JNICALL Java_org_bitcoin_NativeSecp256k1_secp256k1_1ctx_1clone
+  (JNIEnv* env, jclass classObject, jlong ctx_l)
+{
+  const secp256k1_context *ctx = (secp256k1_context*)(uintptr_t)ctx_l;
+
+  jlong ctx_clone_l = (uintptr_t) secp256k1_context_clone(ctx);
+
+  (void)classObject;(void)env;
+
+  return ctx_clone_l;
+
+}
+
+SECP256K1_API jint JNICALL Java_org_bitcoin_NativeSecp256k1_secp256k1_1context_1randomize
+  (JNIEnv* env, jclass classObject, jobject byteBufferObject, jlong ctx_l)
+{
+  secp256k1_context *ctx = (secp256k1_context*)(uintptr_t)ctx_l;
+
+  const unsigned char* seed = (unsigned char*) (*env)->GetDirectBufferAddress(env, byteBufferObject);
+
+  (void)classObject;
+
+  return secp256k1_context_randomize(ctx, seed);
+
+}
+
+SECP256K1_API void JNICALL Java_org_bitcoin_NativeSecp256k1_secp256k1_1destroy_1context
+  (JNIEnv* env, jclass classObject, jlong ctx_l)
+{
+  secp256k1_context *ctx = (secp256k1_context*)(uintptr_t)ctx_l;
+
+  secp256k1_context_destroy(ctx);
+
+  (void)classObject;(void)env;
+}
+
+SECP256K1_API jint JNICALL Java_org_bitcoin_NativeSecp256k1_secp256k1_1ecdsa_1verify
+  (JNIEnv* env, jclass classObject, jobject byteBufferObject, jlong ctx_l, jint siglen, jint publen)
+{
+  secp256k1_context *ctx = (secp256k1_context*)(uintptr_t)ctx_l;
+
+  unsigned char* data = (unsigned char*) (*env)->GetDirectBufferAddress(env, byteBufferObject);
+  const unsigned char* sigdata = {  (unsigned char*) (data + 32) };
+  const unsigned char* pubdata = { (unsigned char*) (data + siglen + 32) };
+
+  secp256k1_ecdsa_signature sig;
+  secp256k1_pubkey pubkey;
+
+  int ret = secp256k1_ecdsa_signature_parse_der(ctx, &sig, sigdata, siglen);
+
+  if( ret ) {
+    ret = secp256k1_ec_pubkey_parse(ctx, &pubkey, pubdata, publen);
+
+    if( ret ) {
+      ret = secp256k1_ecdsa_verify(ctx, &sig, data, &pubkey);
+    }
+  }
+
+  (void)classObject;
+
+  return ret;
+}
+
+SECP256K1_API jobjectArray JNICALL Java_org_bitcoin_NativeSecp256k1_secp256k1_1ecdsa_1sign
+  (JNIEnv* env, jclass classObject, jobject byteBufferObject, jlong ctx_l)
+{
+  secp256k1_context *ctx = (secp256k1_context*)(uintptr_t)ctx_l;
+  unsigned char* data = (unsigned char*) (*env)->GetDirectBufferAddress(env, byteBufferObject);
+  unsigned char* secKey = (unsigned char*) (data + 32);
+
+  jobjectArray retArray;
+  jbyteArray sigArray, intsByteArray;
+  unsigned char intsarray[2];
+
+  secp256k1_ecdsa_signature sig[72];
+
+  int ret = secp256k1_ecdsa_sign(ctx, sig, data, secKey, NULL, NULL );
+
+  unsigned char outputSer[72];
+  size_t outputLen = 72;
+
+  if( ret ) {
+    int ret2 = secp256k1_ecdsa_signature_serialize_der(ctx,outputSer, &outputLen, sig ); (void)ret2;
+  }
+
+  intsarray[0] = outputLen;
+  intsarray[1] = ret;
+
+  retArray = (*env)->NewObjectArray(env, 2,
+    (*env)->FindClass(env, "[B"),
+    (*env)->NewByteArray(env, 1));
+
+  sigArray = (*env)->NewByteArray(env, outputLen);
+  (*env)->SetByteArrayRegion(env, sigArray, 0, outputLen, (jbyte*)outputSer);
+  (*env)->SetObjectArrayElement(env, retArray, 0, sigArray);
+
+  intsByteArray = (*env)->NewByteArray(env, 2);
+  (*env)->SetByteArrayRegion(env, intsByteArray, 0, 2, (jbyte*)intsarray);
+  (*env)->SetObjectArrayElement(env, retArray, 1, intsByteArray);
+
+  (void)classObject;
+
+  return retArray;
+}
+
+SECP256K1_API jint JNICALL Java_org_bitcoin_NativeSecp256k1_secp256k1_1ec_1seckey_1verify
+  (JNIEnv* env, jclass classObject, jobject byteBufferObject, jlong ctx_l)
+{
+  secp256k1_context *ctx = (secp256k1_context*)(uintptr_t)ctx_l;
+  unsigned char* secKey = (unsigned char*) (*env)->GetDirectBufferAddress(env, byteBufferObject);
+
+  (void)classObject;
+
+  return secp256k1_ec_seckey_verify(ctx, secKey);
+}
+
+SECP256K1_API jobjectArray JNICALL Java_org_bitcoin_NativeSecp256k1_secp256k1_1ec_1pubkey_1create
+  (JNIEnv* env, jclass classObject, jobject byteBufferObject, jlong ctx_l)
+{
+  secp256k1_context *ctx = (secp256k1_context*)(uintptr_t)ctx_l;
+  const unsigned char* secKey = (unsigned char*) (*env)->GetDirectBufferAddress(env, byteBufferObject);
+
+  secp256k1_pubkey pubkey;
+
+  jobjectArray retArray;
+  jbyteArray pubkeyArray, intsByteArray;
+  unsigned char intsarray[2];
+
+  int ret = secp256k1_ec_pubkey_create(ctx, &pubkey, secKey);
+
+  unsigned char outputSer[65];
+  size_t outputLen = 65;
+
+  if( ret ) {
+    int ret2 = secp256k1_ec_pubkey_serialize(ctx,outputSer, &outputLen, &pubkey,SECP256K1_EC_UNCOMPRESSED );(void)ret2;
+  }
+
+  intsarray[0] = outputLen;
+  intsarray[1] = ret;
+
+  retArray = (*env)->NewObjectArray(env, 2,
+    (*env)->FindClass(env, "[B"),
+    (*env)->NewByteArray(env, 1));
+
+  pubkeyArray = (*env)->NewByteArray(env, outputLen);
+  (*env)->SetByteArrayRegion(env, pubkeyArray, 0, outputLen, (jbyte*)outputSer);
+  (*env)->SetObjectArrayElement(env, retArray, 0, pubkeyArray);
+
+  intsByteArray = (*env)->NewByteArray(env, 2);
+  (*env)->SetByteArrayRegion(env, intsByteArray, 0, 2, (jbyte*)intsarray);
+  (*env)->SetObjectArrayElement(env, retArray, 1, intsByteArray);
+
+  (void)classObject;
+
+  return retArray;
+
+}
+
+SECP256K1_API jobjectArray JNICALL Java_org_bitcoin_NativeSecp256k1_secp256k1_1privkey_1tweak_1add
+  (JNIEnv* env, jclass classObject, jobject byteBufferObject, jlong ctx_l)
+{
+  secp256k1_context *ctx = (secp256k1_context*)(uintptr_t)ctx_l;
+  unsigned char* privkey = (unsigned char*) (*env)->GetDirectBufferAddress(env, byteBufferObject);
+  const unsigned char* tweak = (unsigned char*) (privkey + 32);
+
+  jobjectArray retArray;
+  jbyteArray privArray, intsByteArray;
+  unsigned char intsarray[2];
+
+  int privkeylen = 32;
+
+  int ret = secp256k1_ec_privkey_tweak_add(ctx, privkey, tweak);
+
+  intsarray[0] = privkeylen;
+  intsarray[1] = ret;
+
+  retArray = (*env)->NewObjectArray(env, 2,
+    (*env)->FindClass(env, "[B"),
+    (*env)->NewByteArray(env, 1));
+
+  privArray = (*env)->NewByteArray(env, privkeylen);
+  (*env)->SetByteArrayRegion(env, privArray, 0, privkeylen, (jbyte*)privkey);
+  (*env)->SetObjectArrayElement(env, retArray, 0, privArray);
+
+  intsByteArray = (*env)->NewByteArray(env, 2);
+  (*env)->SetByteArrayRegion(env, intsByteArray, 0, 2, (jbyte*)intsarray);
+  (*env)->SetObjectArrayElement(env, retArray, 1, intsByteArray);
+
+  (void)classObject;
+
+  return retArray;
+}
+
+SECP256K1_API jobjectArray JNICALL Java_org_bitcoin_NativeSecp256k1_secp256k1_1privkey_1tweak_1mul
+  (JNIEnv* env, jclass classObject, jobject byteBufferObject, jlong ctx_l)
+{
+  secp256k1_context *ctx = (secp256k1_context*)(uintptr_t)ctx_l;
+  unsigned char* privkey = (unsigned char*) (*env)->GetDirectBufferAddress(env, byteBufferObject);
+  const unsigned char* tweak = (unsigned char*) (privkey + 32);
+
+  jobjectArray retArray;
+  jbyteArray privArray, intsByteArray;
+  unsigned char intsarray[2];
+
+  int privkeylen = 32;
+
+  int ret = secp256k1_ec_privkey_tweak_mul(ctx, privkey, tweak);
+
+  intsarray[0] = privkeylen;
+  intsarray[1] = ret;
+
+  retArray = (*env)->NewObjectArray(env, 2,
+    (*env)->FindClass(env, "[B"),
+    (*env)->NewByteArray(env, 1));
+
+  privArray = (*env)->NewByteArray(env, privkeylen);
+  (*env)->SetByteArrayRegion(env, privArray, 0, privkeylen, (jbyte*)privkey);
+  (*env)->SetObjectArrayElement(env, retArray, 0, privArray);
+
+  intsByteArray = (*env)->NewByteArray(env, 2);
+  (*env)->SetByteArrayRegion(env, intsByteArray, 0, 2, (jbyte*)intsarray);
+  (*env)->SetObjectArrayElement(env, retArray, 1, intsByteArray);
+
+  (void)classObject;
+
+  return retArray;
+}
+
+SECP256K1_API jobjectArray JNICALL Java_org_bitcoin_NativeSecp256k1_secp256k1_1pubkey_1tweak_1add
+  (JNIEnv* env, jclass classObject, jobject byteBufferObject, jlong ctx_l, jint publen)
+{
+  secp256k1_context *ctx = (secp256k1_context*)(uintptr_t)ctx_l;
+/*  secp256k1_pubkey* pubkey = (secp256k1_pubkey*) (*env)->GetDirectBufferAddress(env, byteBufferObject);*/
+  unsigned char* pkey = (*env)->GetDirectBufferAddress(env, byteBufferObject);
+  const unsigned char* tweak = (unsigned char*) (pkey + publen);
+
+  jobjectArray retArray;
+  jbyteArray pubArray, intsByteArray;
+  unsigned char intsarray[2];
+  unsigned char outputSer[65];
+  size_t outputLen = 65;
+
+  secp256k1_pubkey pubkey;
+  int ret = secp256k1_ec_pubkey_parse(ctx, &pubkey, pkey, publen);
+
+  if( ret ) {
+    ret = secp256k1_ec_pubkey_tweak_add(ctx, &pubkey, tweak);
+  }
+
+  if( ret ) {
+    int ret2 = secp256k1_ec_pubkey_serialize(ctx,outputSer, &outputLen, &pubkey,SECP256K1_EC_UNCOMPRESSED );(void)ret2;
+  }
+
+  intsarray[0] = outputLen;
+  intsarray[1] = ret;
+
+  retArray = (*env)->NewObjectArray(env, 2,
+    (*env)->FindClass(env, "[B"),
+    (*env)->NewByteArray(env, 1));
+
+  pubArray = (*env)->NewByteArray(env, outputLen);
+  (*env)->SetByteArrayRegion(env, pubArray, 0, outputLen, (jbyte*)outputSer);
+  (*env)->SetObjectArrayElement(env, retArray, 0, pubArray);
+
+  intsByteArray = (*env)->NewByteArray(env, 2);
+  (*env)->SetByteArrayRegion(env, intsByteArray, 0, 2, (jbyte*)intsarray);
+  (*env)->SetObjectArrayElement(env, retArray, 1, intsByteArray);
+
+  (void)classObject;
+
+  return retArray;
+}
+
+SECP256K1_API jobjectArray JNICALL Java_org_bitcoin_NativeSecp256k1_secp256k1_1pubkey_1tweak_1mul
+  (JNIEnv* env, jclass classObject, jobject byteBufferObject, jlong ctx_l, jint publen)
 {
-	unsigned char* data = (unsigned char*) (*env)->GetDirectBufferAddress(env, byteBufferObject);
-	int sigLen = *((int*)(data + 32));
-	int pubLen = *((int*)(data + 32 + 4));
+  secp256k1_context *ctx = (secp256k1_context*)(uintptr_t)ctx_l;
+  unsigned char* pkey = (*env)->GetDirectBufferAddress(env, byteBufferObject);
+  const unsigned char* tweak = (unsigned char*) (pkey + publen);
+
+  jobjectArray retArray;
+  jbyteArray pubArray, intsByteArray;
+  unsigned char intsarray[2];
+  unsigned char outputSer[65];
+  size_t outputLen = 65;
+
+  secp256k1_pubkey pubkey;
+  int ret = secp256k1_ec_pubkey_parse(ctx, &pubkey, pkey, publen);
+
+  if ( ret ) {
+    ret = secp256k1_ec_pubkey_tweak_mul(ctx, &pubkey, tweak);
+  }
+
+  if( ret ) {
+    int ret2 = secp256k1_ec_pubkey_serialize(ctx,outputSer, &outputLen, &pubkey,SECP256K1_EC_UNCOMPRESSED );(void)ret2;
+  }
+
+  intsarray[0] = outputLen;
+  intsarray[1] = ret;
+
+  retArray = (*env)->NewObjectArray(env, 2,
+    (*env)->FindClass(env, "[B"),
+    (*env)->NewByteArray(env, 1));
+
+  pubArray = (*env)->NewByteArray(env, outputLen);
+  (*env)->SetByteArrayRegion(env, pubArray, 0, outputLen, (jbyte*)outputSer);
+  (*env)->SetObjectArrayElement(env, retArray, 0, pubArray);
 
-	return secp256k1_ecdsa_verify(data, 32, data+32+8, sigLen, data+32+8+sigLen, pubLen);
+  intsByteArray = (*env)->NewByteArray(env, 2);
+  (*env)->SetByteArrayRegion(env, intsByteArray, 0, 2, (jbyte*)intsarray);
+  (*env)->SetObjectArrayElement(env, retArray, 1, intsByteArray);
+
+  (void)classObject;
+
+  return retArray;
 }
 
-static void __javasecp256k1_attach(void) __attribute__((constructor));
-static void __javasecp256k1_detach(void) __attribute__((destructor));
+SECP256K1_API jlong JNICALL Java_org_bitcoin_NativeSecp256k1_secp256k1_1ecdsa_1pubkey_1combine
+  (JNIEnv * env, jclass classObject, jobject byteBufferObject, jlong ctx_l, jint numkeys)
+{
+  (void)classObject;(void)env;(void)byteBufferObject;(void)ctx_l;(void)numkeys;
 
-static void __javasecp256k1_attach(void) {
-	secp256k1_start(SECP256K1_START_VERIFY);
+  return 0;
 }
 
-static void __javasecp256k1_detach(void) {
-	secp256k1_stop();
+SECP256K1_API jobjectArray JNICALL Java_org_bitcoin_NativeSecp256k1_secp256k1_1schnorr_1sign
+  (JNIEnv* env, jclass classObject, jobject byteBufferObject, jlong ctx_l)
+{
+  secp256k1_context *ctx = (secp256k1_context*)(uintptr_t)ctx_l;
+  unsigned char* data = (unsigned char*) (*env)->GetDirectBufferAddress(env, byteBufferObject);
+  unsigned char* secKey = (unsigned char*) (data + 32);
+
+  jobjectArray retArray;
+  jbyteArray sigArray, intsByteArray;
+  unsigned char intsarray[1];
+  unsigned char sig[64];
+
+  int ret = secp256k1_schnorr_sign(ctx, sig, data, secKey, NULL, NULL);
+
+  intsarray[0] = ret;
+
+  retArray = (*env)->NewObjectArray(env, 2,
+    (*env)->FindClass(env, "[B"),
+    (*env)->NewByteArray(env, 1));
+
+  sigArray = (*env)->NewByteArray(env, 64);
+  (*env)->SetByteArrayRegion(env, sigArray, 0, 64, (jbyte*)sig);
+  (*env)->SetObjectArrayElement(env, retArray, 0, sigArray);
+
+  intsByteArray = (*env)->NewByteArray(env, 1);
+  (*env)->SetByteArrayRegion(env, intsByteArray, 0, 1, (jbyte*)intsarray);
+  (*env)->SetObjectArrayElement(env, retArray, 1, intsByteArray);
+
+  (void)classObject;
+
+  return retArray;
+}
+
+SECP256K1_API jobjectArray JNICALL Java_org_bitcoin_NativeSecp256k1_secp256k1_1ecdh
+  (JNIEnv* env, jclass classObject, jobject byteBufferObject, jlong ctx_l, jint publen)
+{
+  secp256k1_context *ctx = (secp256k1_context*)(uintptr_t)ctx_l;
+  const unsigned char* secdata = (*env)->GetDirectBufferAddress(env, byteBufferObject);
+  const unsigned char* pubdata = (const unsigned char*) (secdata + 32);
+
+  jobjectArray retArray;
+  jbyteArray outArray, intsByteArray;
+  unsigned char intsarray[1];
+  secp256k1_pubkey pubkey;
+  unsigned char nonce_res[32];
+  size_t outputLen = 32;
+
+  int ret = secp256k1_ec_pubkey_parse(ctx, &pubkey, pubdata, publen);
+
+  if (ret) {
+    ret = secp256k1_ecdh(
+      ctx,
+      nonce_res,
+      &pubkey,
+      secdata
+    );
+  }
+
+  intsarray[0] = ret;
+
+  retArray = (*env)->NewObjectArray(env, 2,
+    (*env)->FindClass(env, "[B"),
+    (*env)->NewByteArray(env, 1));
+
+  outArray = (*env)->NewByteArray(env, outputLen);
+  (*env)->SetByteArrayRegion(env, outArray, 0, 32, (jbyte*)nonce_res);
+  (*env)->SetObjectArrayElement(env, retArray, 0, outArray);
+
+  intsByteArray = (*env)->NewByteArray(env, 1);
+  (*env)->SetByteArrayRegion(env, intsByteArray, 0, 1, (jbyte*)intsarray);
+  (*env)->SetObjectArrayElement(env, retArray, 1, intsByteArray);
+
+  (void)classObject;
+
+  return retArray;
 }
diff --git a/src/java/org_bitcoin_NativeSecp256k1.h b/src/java/org_bitcoin_NativeSecp256k1.h
index d7fb004fa841e..4125a1f5233be 100644
--- a/src/java/org_bitcoin_NativeSecp256k1.h
+++ b/src/java/org_bitcoin_NativeSecp256k1.h
@@ -1,5 +1,6 @@
 /* DO NOT EDIT THIS FILE - it is machine generated */
 #include <jni.h>
+#include "include/secp256k1.h"
 /* Header for class org_bitcoin_NativeSecp256k1 */
 
 #ifndef _Included_org_bitcoin_NativeSecp256k1
@@ -7,13 +8,118 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+/*
+ * Class:     org_bitcoin_NativeSecp256k1
+ * Method:    secp256k1_ctx_clone
+ * Signature: (J)J
+ */
+SECP256K1_API jlong JNICALL Java_org_bitcoin_NativeSecp256k1_secp256k1_1ctx_1clone
+  (JNIEnv *, jclass, jlong);
+
+/*
+ * Class:     org_bitcoin_NativeSecp256k1
+ * Method:    secp256k1_context_randomize
+ * Signature: (Ljava/nio/ByteBuffer;J)I
+ */
+SECP256K1_API jint JNICALL Java_org_bitcoin_NativeSecp256k1_secp256k1_1context_1randomize
+  (JNIEnv *, jclass, jobject, jlong);
+
+/*
+ * Class:     org_bitcoin_NativeSecp256k1
+ * Method:    secp256k1_privkey_tweak_add
+ * Signature: (Ljava/nio/ByteBuffer;J)[[B
+ */
+SECP256K1_API jobjectArray JNICALL Java_org_bitcoin_NativeSecp256k1_secp256k1_1privkey_1tweak_1add
+  (JNIEnv *, jclass, jobject, jlong);
+
+/*
+ * Class:     org_bitcoin_NativeSecp256k1
+ * Method:    secp256k1_privkey_tweak_mul
+ * Signature: (Ljava/nio/ByteBuffer;J)[[B
+ */
+SECP256K1_API jobjectArray JNICALL Java_org_bitcoin_NativeSecp256k1_secp256k1_1privkey_1tweak_1mul
+  (JNIEnv *, jclass, jobject, jlong);
+
+/*
+ * Class:     org_bitcoin_NativeSecp256k1
+ * Method:    secp256k1_pubkey_tweak_add
+ * Signature: (Ljava/nio/ByteBuffer;JI)[[B
+ */
+SECP256K1_API jobjectArray JNICALL Java_org_bitcoin_NativeSecp256k1_secp256k1_1pubkey_1tweak_1add
+  (JNIEnv *, jclass, jobject, jlong, jint);
+
+/*
+ * Class:     org_bitcoin_NativeSecp256k1
+ * Method:    secp256k1_pubkey_tweak_mul
+ * Signature: (Ljava/nio/ByteBuffer;JI)[[B
+ */
+SECP256K1_API jobjectArray JNICALL Java_org_bitcoin_NativeSecp256k1_secp256k1_1pubkey_1tweak_1mul
+  (JNIEnv *, jclass, jobject, jlong, jint);
+
+/*
+ * Class:     org_bitcoin_NativeSecp256k1
+ * Method:    secp256k1_destroy_context
+ * Signature: (J)V
+ */
+SECP256K1_API void JNICALL Java_org_bitcoin_NativeSecp256k1_secp256k1_1destroy_1context
+  (JNIEnv *, jclass, jlong);
+
 /*
  * Class:     org_bitcoin_NativeSecp256k1
  * Method:    secp256k1_ecdsa_verify
- * Signature: (Ljava/nio/ByteBuffer;)I
+ * Signature: (Ljava/nio/ByteBuffer;JII)I
+ */
+SECP256K1_API jint JNICALL Java_org_bitcoin_NativeSecp256k1_secp256k1_1ecdsa_1verify
+  (JNIEnv *, jclass, jobject, jlong, jint, jint);
+
+/*
+ * Class:     org_bitcoin_NativeSecp256k1
+ * Method:    secp256k1_ecdsa_sign
+ * Signature: (Ljava/nio/ByteBuffer;J)[[B
+ */
+SECP256K1_API jobjectArray JNICALL Java_org_bitcoin_NativeSecp256k1_secp256k1_1ecdsa_1sign
+  (JNIEnv *, jclass, jobject, jlong);
+
+/*
+ * Class:     org_bitcoin_NativeSecp256k1
+ * Method:    secp256k1_ec_seckey_verify
+ * Signature: (Ljava/nio/ByteBuffer;J)I
+ */
+SECP256K1_API jint JNICALL Java_org_bitcoin_NativeSecp256k1_secp256k1_1ec_1seckey_1verify
+  (JNIEnv *, jclass, jobject, jlong);
+
+/*
+ * Class:     org_bitcoin_NativeSecp256k1
+ * Method:    secp256k1_ec_pubkey_create
+ * Signature: (Ljava/nio/ByteBuffer;J)[[B
  */
-JNIEXPORT jint JNICALL Java_org_bitcoin_NativeSecp256k1_secp256k1_1ecdsa_1verify
-  (JNIEnv *, jclass, jobject);
+SECP256K1_API jobjectArray JNICALL Java_org_bitcoin_NativeSecp256k1_secp256k1_1ec_1pubkey_1create
+  (JNIEnv *, jclass, jobject, jlong);
+
+/*
+ * Class:     org_bitcoin_NativeSecp256k1
+ * Method:    secp256k1_ec_pubkey_parse
+ * Signature: (Ljava/nio/ByteBuffer;JI)[[B
+ */
+SECP256K1_API jobjectArray JNICALL Java_org_bitcoin_NativeSecp256k1_secp256k1_1ec_1pubkey_1parse
+  (JNIEnv *, jclass, jobject, jlong, jint);
+
+/*
+ * Class:     org_bitcoin_NativeSecp256k1
+ * Method:    secp256k1_schnorr_sign
+ * Signature: (Ljava/nio/ByteBuffer;JI)[[B
+ */
+SECP256K1_API jobjectArray JNICALL Java_org_bitcoin_NativeSecp256k1_secp256k1_1schnorr_1sign
+  (JNIEnv* env, jclass classObject, jobject byteBufferObject, jlong ctx_l);
+
+/*
+ * Class:     org_bitcoin_NativeSecp256k1
+ * Method:    secp256k1_ecdh
+ * Signature: (Ljava/nio/ByteBuffer;JI)[[B
+ */
+SECP256K1_API jobjectArray JNICALL Java_org_bitcoin_NativeSecp256k1_secp256k1_1ecdh
+  (JNIEnv* env, jclass classObject, jobject byteBufferObject, jlong ctx_l, jint publen);
+
 
 #ifdef __cplusplus
 }
diff --git a/src/java/org_bitcoin_Secp256k1Context.c b/src/java/org_bitcoin_Secp256k1Context.c
new file mode 100644
index 0000000000000..a52939e7e7dac
--- /dev/null
+++ b/src/java/org_bitcoin_Secp256k1Context.c
@@ -0,0 +1,15 @@
+#include <stdlib.h>
+#include <stdint.h>
+#include "org_bitcoin_Secp256k1Context.h"
+#include "include/secp256k1.h"
+
+SECP256K1_API jlong JNICALL Java_org_bitcoin_Secp256k1Context_secp256k1_1init_1context
+  (JNIEnv* env, jclass classObject)
+{
+  secp256k1_context *ctx = secp256k1_context_create(SECP256K1_CONTEXT_SIGN | SECP256K1_CONTEXT_VERIFY);
+
+  (void)classObject;(void)env;
+
+  return (uintptr_t)ctx;
+}
+
diff --git a/src/java/org_bitcoin_Secp256k1Context.h b/src/java/org_bitcoin_Secp256k1Context.h
new file mode 100644
index 0000000000000..0d2bc84b7f3fd
--- /dev/null
+++ b/src/java/org_bitcoin_Secp256k1Context.h
@@ -0,0 +1,22 @@
+/* DO NOT EDIT THIS FILE - it is machine generated */
+#include <jni.h>
+#include "include/secp256k1.h"
+/* Header for class org_bitcoin_Secp256k1Context */
+
+#ifndef _Included_org_bitcoin_Secp256k1Context
+#define _Included_org_bitcoin_Secp256k1Context
+#ifdef __cplusplus
+extern "C" {
+#endif
+/*
+ * Class:     org_bitcoin_Secp256k1Context
+ * Method:    secp256k1_init_context
+ * Signature: ()J
+ */
+SECP256K1_API jlong JNICALL Java_org_bitcoin_Secp256k1Context_secp256k1_1init_1context
+  (JNIEnv *, jclass);
+
+#ifdef __cplusplus
+}
+#endif
+#endif
diff --git a/src/modules/ecdh/Makefile.am.include b/src/modules/ecdh/Makefile.am.include
index 670b9c1152e75..e3088b469790b 100644
--- a/src/modules/ecdh/Makefile.am.include
+++ b/src/modules/ecdh/Makefile.am.include
@@ -4,5 +4,5 @@ noinst_HEADERS += src/modules/ecdh/tests_impl.h
 if USE_BENCHMARK
 noinst_PROGRAMS += bench_ecdh
 bench_ecdh_SOURCES = src/bench_ecdh.c
-bench_ecdh_LDADD = libsecp256k1.la $(SECP_LIBS)
+bench_ecdh_LDADD = libsecp256k1.la $(SECP_LIBS) $(COMMON_LIB)
 endif
diff --git a/src/modules/recovery/Makefile.am.include b/src/modules/recovery/Makefile.am.include
index 5de3ea33ea5e1..bf23c26e71c5d 100644
--- a/src/modules/recovery/Makefile.am.include
+++ b/src/modules/recovery/Makefile.am.include
@@ -4,5 +4,5 @@ noinst_HEADERS += src/modules/recovery/tests_impl.h
 if USE_BENCHMARK
 noinst_PROGRAMS += bench_recover
 bench_recover_SOURCES = src/bench_recover.c
-bench_recover_LDADD = libsecp256k1.la $(SECP_LIBS)
+bench_recover_LDADD = libsecp256k1.la $(SECP_LIBS) $(COMMON_LIB)
 endif
diff --git a/src/modules/schnorr/Makefile.am.include b/src/modules/schnorr/Makefile.am.include
index b3bfa7d5cc49e..f1af8e83255fd 100644
--- a/src/modules/schnorr/Makefile.am.include
+++ b/src/modules/schnorr/Makefile.am.include
@@ -6,5 +6,5 @@ noinst_HEADERS += src/modules/schnorr/tests_impl.h
 if USE_BENCHMARK
 noinst_PROGRAMS += bench_schnorr_verify
 bench_schnorr_verify_SOURCES = src/bench_schnorr_verify.c
-bench_schnorr_verify_LDADD = libsecp256k1.la $(SECP_LIBS)
+bench_schnorr_verify_LDADD = libsecp256k1.la $(SECP_LIBS) $(COMMON_LIB)
 endif
diff --git a/src/num.h b/src/num.h
index ebfa71eb44bda..7bb9c5be8cf5a 100644
--- a/src/num.h
+++ b/src/num.h
@@ -32,6 +32,9 @@ static void secp256k1_num_set_bin(secp256k1_num *r, const unsigned char *a, unsi
 /** Compute a modular inverse. The input must be less than the modulus. */
 static void secp256k1_num_mod_inverse(secp256k1_num *r, const secp256k1_num *a, const secp256k1_num *m);
 
+/** Compute the jacobi symbol (a|b). b must be positive and odd. */
+static int secp256k1_num_jacobi(const secp256k1_num *a, const secp256k1_num *b);
+
 /** Compare the absolute value of two numbers. */
 static int secp256k1_num_cmp(const secp256k1_num *a, const secp256k1_num *b);
 
@@ -57,6 +60,9 @@ static void secp256k1_num_shift(secp256k1_num *r, int bits);
 /** Check whether a number is zero. */
 static int secp256k1_num_is_zero(const secp256k1_num *a);
 
+/** Check whether a number is one. */
+static int secp256k1_num_is_one(const secp256k1_num *a);
+
 /** Check whether a number is strictly negative. */
 static int secp256k1_num_is_neg(const secp256k1_num *a);
 
diff --git a/src/num_gmp_impl.h b/src/num_gmp_impl.h
index 7b6a89719ab14..3a46495eeac7d 100644
--- a/src/num_gmp_impl.h
+++ b/src/num_gmp_impl.h
@@ -144,6 +144,32 @@ static void secp256k1_num_mod_inverse(secp256k1_num *r, const secp256k1_num *a,
     memset(v, 0, sizeof(v));
 }
 
+static int secp256k1_num_jacobi(const secp256k1_num *a, const secp256k1_num *b) {
+    int ret;
+    mpz_t ga, gb;
+    secp256k1_num_sanity(a);
+    secp256k1_num_sanity(b);
+    VERIFY_CHECK(!b->neg && (b->limbs > 0) && (b->data[0] & 1));
+
+    mpz_inits(ga, gb, NULL);
+
+    mpz_import(gb, b->limbs, -1, sizeof(mp_limb_t), 0, 0, b->data);
+    mpz_import(ga, a->limbs, -1, sizeof(mp_limb_t), 0, 0, a->data);
+    if (a->neg) {
+        mpz_neg(ga, ga);
+    }
+
+    ret = mpz_jacobi(ga, gb);
+
+    mpz_clears(ga, gb, NULL);
+
+    return ret;
+}
+
+static int secp256k1_num_is_one(const secp256k1_num *a) {
+    return (a->limbs == 1 && a->data[0] == 1);
+}
+
 static int secp256k1_num_is_zero(const secp256k1_num *a) {
     return (a->limbs == 1 && a->data[0] == 0);
 }
diff --git a/src/scalar_impl.h b/src/scalar_impl.h
index 88ea97de863e9..c5baf4df413e0 100644
--- a/src/scalar_impl.h
+++ b/src/scalar_impl.h
@@ -7,8 +7,6 @@
 #ifndef _SECP256K1_SCALAR_IMPL_H_
 #define _SECP256K1_SCALAR_IMPL_H_
 
-#include <string.h>
-
 #include "group.h"
 #include "scalar.h"
 
diff --git a/src/secp256k1.c b/src/secp256k1.c
index 62d192baeb388..7973d60c36a81 100644
--- a/src/secp256k1.c
+++ b/src/secp256k1.c
@@ -4,8 +4,6 @@
  * file COPYING or http://www.opensource.org/licenses/mit-license.php.*
  **********************************************************************/
 
-#define SECP256K1_BUILD (1)
-
 #include "include/secp256k1.h"
 
 #include "util.h"
@@ -152,7 +150,6 @@ static void secp256k1_pubkey_save(secp256k1_pubkey* pubkey, secp256k1_ge* ge) {
 int secp256k1_ec_pubkey_parse(const secp256k1_context* ctx, secp256k1_pubkey* pubkey, const unsigned char *input, size_t inputlen) {
     secp256k1_ge Q;
 
-    (void)ctx;
     VERIFY_CHECK(ctx != NULL);
     ARG_CHECK(pubkey != NULL);
     memset(pubkey, 0, sizeof(*pubkey));
@@ -170,7 +167,6 @@ int secp256k1_ec_pubkey_serialize(const secp256k1_context* ctx, unsigned char *o
     size_t len;
     int ret = 0;
 
-    (void)ctx;
     VERIFY_CHECK(ctx != NULL);
     ARG_CHECK(outputlen != NULL);
     ARG_CHECK(*outputlen >= ((flags & SECP256K1_FLAGS_BIT_COMPRESSION) ? 33 : 65));
@@ -216,7 +212,7 @@ static void secp256k1_ecdsa_signature_save(secp256k1_ecdsa_signature* sig, const
 int secp256k1_ecdsa_signature_parse_der(const secp256k1_context* ctx, secp256k1_ecdsa_signature* sig, const unsigned char *input, size_t inputlen) {
     secp256k1_scalar r, s;
 
-    (void)ctx;
+    VERIFY_CHECK(ctx != NULL);
     ARG_CHECK(sig != NULL);
     ARG_CHECK(input != NULL);
 
@@ -234,7 +230,7 @@ int secp256k1_ecdsa_signature_parse_compact(const secp256k1_context* ctx, secp25
     int ret = 1;
     int overflow = 0;
 
-    (void)ctx;
+    VERIFY_CHECK(ctx != NULL);
     ARG_CHECK(sig != NULL);
     ARG_CHECK(input64 != NULL);
 
@@ -253,7 +249,7 @@ int secp256k1_ecdsa_signature_parse_compact(const secp256k1_context* ctx, secp25
 int secp256k1_ecdsa_signature_serialize_der(const secp256k1_context* ctx, unsigned char *output, size_t *outputlen, const secp256k1_ecdsa_signature* sig) {
     secp256k1_scalar r, s;
 
-    (void)ctx;
+    VERIFY_CHECK(ctx != NULL);
     ARG_CHECK(output != NULL);
     ARG_CHECK(outputlen != NULL);
     ARG_CHECK(sig != NULL);
@@ -265,7 +261,7 @@ int secp256k1_ecdsa_signature_serialize_der(const secp256k1_context* ctx, unsign
 int secp256k1_ecdsa_signature_serialize_compact(const secp256k1_context* ctx, unsigned char *output64, const secp256k1_ecdsa_signature* sig) {
     secp256k1_scalar r, s;
 
-    (void)ctx;
+    VERIFY_CHECK(ctx != NULL);
     ARG_CHECK(output64 != NULL);
     ARG_CHECK(sig != NULL);
 
@@ -398,7 +394,6 @@ int secp256k1_ec_seckey_verify(const secp256k1_context* ctx, const unsigned char
     int overflow;
     VERIFY_CHECK(ctx != NULL);
     ARG_CHECK(seckey != NULL);
-    (void)ctx;
 
     secp256k1_scalar_set_b32(&sec, seckey, &overflow);
     ret = !overflow && !secp256k1_scalar_is_zero(&sec);
@@ -437,7 +432,6 @@ int secp256k1_ec_privkey_tweak_add(const secp256k1_context* ctx, unsigned char *
     VERIFY_CHECK(ctx != NULL);
     ARG_CHECK(seckey != NULL);
     ARG_CHECK(tweak != NULL);
-    (void)ctx;
 
     secp256k1_scalar_set_b32(&term, tweak, &overflow);
     secp256k1_scalar_set_b32(&sec, seckey, NULL);
@@ -485,7 +479,6 @@ int secp256k1_ec_privkey_tweak_mul(const secp256k1_context* ctx, unsigned char *
     VERIFY_CHECK(ctx != NULL);
     ARG_CHECK(seckey != NULL);
     ARG_CHECK(tweak != NULL);
-    (void)ctx;
 
     secp256k1_scalar_set_b32(&factor, tweak, &overflow);
     secp256k1_scalar_set_b32(&sec, seckey, NULL);
diff --git a/src/tests.c b/src/tests.c
index 687a5f2fdd801..b32cb90813718 100644
--- a/src/tests.c
+++ b/src/tests.c
@@ -473,6 +473,8 @@ void test_num_negate(void) {
 }
 
 void test_num_add_sub(void) {
+    int i;
+    secp256k1_scalar s;
     secp256k1_num n1;
     secp256k1_num n2;
     secp256k1_num n1p2, n2p1, n1m2, n2m1;
@@ -498,6 +500,110 @@ void test_num_add_sub(void) {
     CHECK(!secp256k1_num_eq(&n2p1, &n1));
     secp256k1_num_sub(&n2p1, &n2p1, &n2); /* n2p1 = R2 + R1 - R2 = R1 */
     CHECK(secp256k1_num_eq(&n2p1, &n1));
+
+    /* check is_one */
+    secp256k1_scalar_set_int(&s, 1);
+    secp256k1_scalar_get_num(&n1, &s);
+    CHECK(secp256k1_num_is_one(&n1));
+    /* check that 2^n + 1 is never 1 */
+    secp256k1_scalar_get_num(&n2, &s);
+    for (i = 0; i < 250; ++i) {
+        secp256k1_num_add(&n1, &n1, &n1);    /* n1 *= 2 */
+        secp256k1_num_add(&n1p2, &n1, &n2);  /* n1p2 = n1 + 1 */
+        CHECK(!secp256k1_num_is_one(&n1p2));
+    }
+}
+
+void test_num_mod(void) {
+    int i;
+    secp256k1_scalar s;
+    secp256k1_num order, n;
+
+    /* check that 0 mod anything is 0 */
+    random_scalar_order_test(&s); 
+    secp256k1_scalar_get_num(&order, &s);
+    secp256k1_scalar_set_int(&s, 0);
+    secp256k1_scalar_get_num(&n, &s);
+    secp256k1_num_mod(&n, &order);
+    CHECK(secp256k1_num_is_zero(&n));
+
+    /* check that anything mod 1 is 0 */
+    secp256k1_scalar_set_int(&s, 1);
+    secp256k1_scalar_get_num(&order, &s);
+    secp256k1_scalar_get_num(&n, &s);
+    secp256k1_num_mod(&n, &order);
+    CHECK(secp256k1_num_is_zero(&n));
+
+    /* check that increasing the number past 2^256 does not break this */
+    random_scalar_order_test(&s); 
+    secp256k1_scalar_get_num(&n, &s);
+    /* multiply by 2^8, which'll test this case with high probability */
+    for (i = 0; i < 8; ++i) {
+        secp256k1_num_add(&n, &n, &n);
+    }
+    secp256k1_num_mod(&n, &order);
+    CHECK(secp256k1_num_is_zero(&n));
+}
+
+void test_num_jacobi(void) {
+    secp256k1_scalar sqr;
+    secp256k1_scalar small;
+    secp256k1_scalar five;  /* five is not a quadratic residue */
+    secp256k1_num order, n;
+    int i;
+    /* squares mod 5 are 1, 4 */
+    const int jacobi5[10] = { 0, 1, -1, -1, 1, 0, 1, -1, -1, 1 };
+
+    /* check some small values with 5 as the order */
+    secp256k1_scalar_set_int(&five, 5);
+    secp256k1_scalar_get_num(&order, &five);
+    for (i = 0; i < 10; ++i) {
+        secp256k1_scalar_set_int(&small, i);
+        secp256k1_scalar_get_num(&n, &small);
+        CHECK(secp256k1_num_jacobi(&n, &order) == jacobi5[i]);
+    }
+
+    /** test large values with 5 as group order */
+    secp256k1_scalar_get_num(&order, &five);
+    /* we first need a scalar which is not a multiple of 5 */
+    do {
+        secp256k1_num fiven;
+        random_scalar_order_test(&sqr); 
+        secp256k1_scalar_get_num(&fiven, &five);
+        secp256k1_scalar_get_num(&n, &sqr);
+        secp256k1_num_mod(&n, &fiven);
+    } while (secp256k1_num_is_zero(&n));
+    /* next force it to be a residue. 2 is a nonresidue mod 5 so we can
+     * just multiply by two, i.e. add the number to itself */
+    if (secp256k1_num_jacobi(&n, &order) == -1) {
+        secp256k1_num_add(&n, &n, &n);
+    }
+
+    /* test residue */
+    CHECK(secp256k1_num_jacobi(&n, &order) == 1);
+    /* test nonresidue */
+    secp256k1_num_add(&n, &n, &n);
+    CHECK(secp256k1_num_jacobi(&n, &order) == -1);
+
+    /** test with secp group order as order */
+    secp256k1_scalar_order_get_num(&order);
+    random_scalar_order_test(&sqr); 
+    secp256k1_scalar_sqr(&sqr, &sqr);
+    /* test residue */
+    secp256k1_scalar_get_num(&n, &sqr);
+    CHECK(secp256k1_num_jacobi(&n, &order) == 1);
+    /* test nonresidue */
+    secp256k1_scalar_mul(&sqr, &sqr, &five);
+    secp256k1_scalar_get_num(&n, &sqr);
+    CHECK(secp256k1_num_jacobi(&n, &order) == -1);
+    /* test multiple of the order*/
+    CHECK(secp256k1_num_jacobi(&order, &order) == 0);
+
+    /* check one less than the order */
+    secp256k1_scalar_set_int(&small, 1);
+    secp256k1_scalar_get_num(&n, &small);
+    secp256k1_num_sub(&n, &order, &n);
+    CHECK(secp256k1_num_jacobi(&n, &order) == 1);  /* sage confirms this is 1 */
 }
 
 void run_num_smalltests(void) {
@@ -505,6 +611,8 @@ void run_num_smalltests(void) {
     for (i = 0; i < 100*count; i++) {
         test_num_negate();
         test_num_add_sub();
+        test_num_mod();
+        test_num_jacobi();
     }
 }
 #endif
@@ -689,6 +797,10 @@ void scalar_test(void) {
             secp256k1_scalar_inverse(&inv, &inv);
             /* Inverting one must result in one. */
             CHECK(secp256k1_scalar_is_one(&inv));
+#ifndef USE_NUM_NONE
+            secp256k1_scalar_get_num(&invnum, &inv);
+            CHECK(secp256k1_num_is_one(&invnum));
+#endif
         }
     }
 
@@ -855,7 +967,7 @@ void run_scalar_tests(void) {
         secp256k1_scalar zzv;
 #endif
         int overflow;
-        unsigned char chal[32][2][32] = {
+        unsigned char chal[33][2][32] = {
             {{0xff, 0xff, 0x03, 0x07, 0x00, 0x00, 0x00, 0x00,
               0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x03,
               0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0xff, 0xff,
@@ -1111,9 +1223,17 @@ void run_scalar_tests(void) {
              {0xff, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf8, 0xff,
               0xff, 0xff, 0xff, 0xff, 0xff, 0x1f, 0x00, 0x00,
               0xf8, 0x07, 0x00, 0x80, 0xff, 0xff, 0xff, 0xff,
-              0xff, 0xc7, 0xff, 0xff, 0xe0, 0xff, 0xff, 0xff}}
+              0xff, 0xc7, 0xff, 0xff, 0xe0, 0xff, 0xff, 0xff}},
+            {{0x82, 0xc9, 0xfa, 0xb0, 0x68, 0x04, 0xa0, 0x00,
+              0x82, 0xc9, 0xfa, 0xb0, 0x68, 0x04, 0xa0, 0x00,
+              0xff, 0xff, 0xff, 0xff, 0xff, 0x6f, 0x03, 0xfb,
+              0xfa, 0x8a, 0x7d, 0xdf, 0x13, 0x86, 0xe2, 0x03},
+             {0x82, 0xc9, 0xfa, 0xb0, 0x68, 0x04, 0xa0, 0x00,
+              0x82, 0xc9, 0xfa, 0xb0, 0x68, 0x04, 0xa0, 0x00,
+              0xff, 0xff, 0xff, 0xff, 0xff, 0x6f, 0x03, 0xfb,
+              0xfa, 0x8a, 0x7d, 0xdf, 0x13, 0x86, 0xe2, 0x03}}
         };
-        unsigned char res[32][2][32] = {
+        unsigned char res[33][2][32] = {
             {{0x0c, 0x3b, 0x0a, 0xca, 0x8d, 0x1a, 0x2f, 0xb9,
               0x8a, 0x7b, 0x53, 0x5a, 0x1f, 0xc5, 0x22, 0xa1,
               0x07, 0x2a, 0x48, 0xea, 0x02, 0xeb, 0xb3, 0xd6,
@@ -1369,10 +1489,18 @@ void run_scalar_tests(void) {
              {0xe4, 0xf1, 0x23, 0x84, 0xe1, 0xb5, 0x9d, 0xf2,
               0xb8, 0x73, 0x8b, 0x45, 0x2b, 0x35, 0x46, 0x38,
               0x10, 0x2b, 0x50, 0xf8, 0x8b, 0x35, 0xcd, 0x34,
-              0xc8, 0x0e, 0xf6, 0xdb, 0x09, 0x35, 0xf0, 0xda}}
+              0xc8, 0x0e, 0xf6, 0xdb, 0x09, 0x35, 0xf0, 0xda}},
+            {{0xdb, 0x21, 0x5c, 0x8d, 0x83, 0x1d, 0xb3, 0x34,
+              0xc7, 0x0e, 0x43, 0xa1, 0x58, 0x79, 0x67, 0x13,
+              0x1e, 0x86, 0x5d, 0x89, 0x63, 0xe6, 0x0a, 0x46,
+              0x5c, 0x02, 0x97, 0x1b, 0x62, 0x43, 0x86, 0xf5},
+             {0xdb, 0x21, 0x5c, 0x8d, 0x83, 0x1d, 0xb3, 0x34,
+              0xc7, 0x0e, 0x43, 0xa1, 0x58, 0x79, 0x67, 0x13,
+              0x1e, 0x86, 0x5d, 0x89, 0x63, 0xe6, 0x0a, 0x46,
+              0x5c, 0x02, 0x97, 0x1b, 0x62, 0x43, 0x86, 0xf5}}
         };
         secp256k1_scalar_set_int(&one, 1);
-        for (i = 0; i < 32; i++) {
+        for (i = 0; i < 33; i++) {
             secp256k1_scalar_set_b32(&x, chal[i][0], &overflow);
             CHECK(!overflow);
             secp256k1_scalar_set_b32(&y, chal[i][1], &overflow);
@@ -1446,7 +1574,7 @@ void random_fe_non_zero(secp256k1_fe *nz) {
 void random_fe_non_square(secp256k1_fe *ns) {
     secp256k1_fe r;
     random_fe_non_zero(ns);
-    if (secp256k1_fe_sqrt_var(&r, ns)) {
+    if (secp256k1_fe_sqrt(&r, ns)) {
         secp256k1_fe_negate(ns, ns, 1);
     }
 }
@@ -1641,7 +1769,7 @@ void run_sqr(void) {
 
 void test_sqrt(const secp256k1_fe *a, const secp256k1_fe *k) {
     secp256k1_fe r1, r2;
-    int v = secp256k1_fe_sqrt_var(&r1, a);
+    int v = secp256k1_fe_sqrt(&r1, a);
     CHECK((v == 0) == (k == NULL));
 
     if (k != NULL) {
@@ -1951,8 +2079,8 @@ void test_add_neg_y_diff_x(void) {
      * of the sum to be wrong (since infinity has no xy coordinates).
      * HOWEVER, if the x-coordinates are different, infinity is the
      * wrong answer, and such degeneracies are exposed. This is the
-     * root of https://github.com/bitcoin/secp256k1/issues/257 which
-     * this test is a regression test for.
+     * root of https://github.com/bitcoin-core/secp256k1/issues/257
+     * which this test is a regression test for.
      *
      * These points were generated in sage as
      * # secp256k1 params
@@ -2051,15 +2179,16 @@ void run_ec_combine(void) {
 void test_group_decompress(const secp256k1_fe* x) {
     /* The input itself, normalized. */
     secp256k1_fe fex = *x;
-    secp256k1_fe tmp;
+    secp256k1_fe fez;
     /* Results of set_xquad_var, set_xo_var(..., 0), set_xo_var(..., 1). */
     secp256k1_ge ge_quad, ge_even, ge_odd;
+    secp256k1_gej gej_quad;
     /* Return values of the above calls. */
     int res_quad, res_even, res_odd;
 
     secp256k1_fe_normalize_var(&fex);
 
-    res_quad = secp256k1_ge_set_xquad_var(&ge_quad, &fex);
+    res_quad = secp256k1_ge_set_xquad(&ge_quad, &fex);
     res_even = secp256k1_ge_set_xo_var(&ge_even, &fex, 0);
     res_odd = secp256k1_ge_set_xo_var(&ge_odd, &fex, 1);
 
@@ -2085,13 +2214,29 @@ void test_group_decompress(const secp256k1_fe* x) {
         CHECK(secp256k1_fe_equal_var(&ge_odd.x, x));
 
         /* Check that the Y coordinate result in ge_quad is a square. */
-        CHECK(secp256k1_fe_sqrt_var(&tmp, &ge_quad.y));
-        secp256k1_fe_sqr(&tmp, &tmp);
-        CHECK(secp256k1_fe_equal_var(&tmp, &ge_quad.y));
+        CHECK(secp256k1_fe_is_quad_var(&ge_quad.y));
 
         /* Check odd/even Y in ge_odd, ge_even. */
         CHECK(secp256k1_fe_is_odd(&ge_odd.y));
         CHECK(!secp256k1_fe_is_odd(&ge_even.y));
+
+        /* Check secp256k1_gej_has_quad_y_var. */
+        secp256k1_gej_set_ge(&gej_quad, &ge_quad);
+        CHECK(secp256k1_gej_has_quad_y_var(&gej_quad));
+        do {
+            random_fe_test(&fez);
+        } while (secp256k1_fe_is_zero(&fez));
+        secp256k1_gej_rescale(&gej_quad, &fez);
+        CHECK(secp256k1_gej_has_quad_y_var(&gej_quad));
+        secp256k1_gej_neg(&gej_quad, &gej_quad);
+        CHECK(!secp256k1_gej_has_quad_y_var(&gej_quad));
+        do {
+            random_fe_test(&fez);
+        } while (secp256k1_fe_is_zero(&fez));
+        secp256k1_gej_rescale(&gej_quad, &fez);
+        CHECK(!secp256k1_gej_has_quad_y_var(&gej_quad));
+        secp256k1_gej_neg(&gej_quad, &gej_quad);
+        CHECK(secp256k1_gej_has_quad_y_var(&gej_quad));
     }
 }
 
@@ -2383,9 +2528,7 @@ void test_constant_wnaf(const secp256k1_scalar *number, int w) {
     secp256k1_scalar x, shift;
     int wnaf[256] = {0};
     int i;
-#ifdef USE_ENDOMORPHISM
     int skew;
-#endif
     secp256k1_scalar num = *number;
 
     secp256k1_scalar_set_int(&x, 0);
@@ -2395,10 +2538,8 @@ void test_constant_wnaf(const secp256k1_scalar *number, int w) {
     for (i = 0; i < 16; ++i) {
         secp256k1_scalar_shr_int(&num, 8);
     }
-    skew = secp256k1_wnaf_const(wnaf, num, w);
-#else
-    secp256k1_wnaf_const(wnaf, num, w);
 #endif
+    skew = secp256k1_wnaf_const(wnaf, num, w);
 
     for (i = WNAF_SIZE(w); i >= 0; --i) {
         secp256k1_scalar t;
@@ -2417,10 +2558,8 @@ void test_constant_wnaf(const secp256k1_scalar *number, int w) {
         }
         secp256k1_scalar_add(&x, &x, &t);
     }
-#ifdef USE_ENDOMORPHISM
-    /* Skew num because when encoding 128-bit numbers as odd we use an offset */
+    /* Skew num because when encoding numbers as odd we use an offset */
     secp256k1_scalar_cadd_bit(&num, skew == 2, 1);
-#endif
     CHECK(secp256k1_scalar_eq(&x, &num));
 }
 
@@ -3484,12 +3623,14 @@ void run_ecdsa_end_to_end(void) {
 
 int test_ecdsa_der_parse(const unsigned char *sig, size_t siglen, int certainly_der, int certainly_not_der) {
     static const unsigned char zeroes[32] = {0};
+#ifdef ENABLE_OPENSSL_TESTS
     static const unsigned char max_scalar[32] = {
         0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
         0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe,
         0xba, 0xae, 0xdc, 0xe6, 0xaf, 0x48, 0xa0, 0x3b,
         0xbf, 0xd2, 0x5e, 0x8c, 0xd0, 0x36, 0x41, 0x40
     };
+#endif
 
     int ret = 0;
 
@@ -3607,13 +3748,13 @@ static void assign_big_endian(unsigned char *ptr, size_t ptrlen, uint32_t val) {
 static void damage_array(unsigned char *sig, size_t *len) {
     int pos;
     int action = secp256k1_rand_bits(3);
-    if (action < 1) {
+    if (action < 1 && *len > 3) {
         /* Delete a byte. */
         pos = secp256k1_rand_int(*len);
         memmove(sig + pos, sig + pos + 1, *len - pos - 1);
         (*len)--;
         return;
-    } else if (action < 2) {
+    } else if (action < 2 && *len < 2048) {
         /* Insert a byte. */
         pos = secp256k1_rand_int(1 + *len);
         memmove(sig + pos + 1, sig + pos, *len - pos);
@@ -3785,6 +3926,7 @@ void run_ecdsa_der_parse(void) {
         int certainly_der = 0;
         int certainly_not_der = 0;
         random_ber_signature(buffer, &buflen, &certainly_der, &certainly_not_der);
+        CHECK(buflen <= 2048);
         for (j = 0; j < 16; j++) {
             int ret = 0;
             if (j > 0) {

From c1582d5d8595ce8814a86dffdb0fa647e4100862 Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Tue, 16 Aug 2016 11:48:54 +0200
Subject: [PATCH 0724/1802] qa: Remove duplicate `hash160` implementation

`hash160` is defined in `test_framework.script`, so there is no need
to define it here again.
---
 qa/rpc-tests/p2p-fullblocktest.py | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/qa/rpc-tests/p2p-fullblocktest.py b/qa/rpc-tests/p2p-fullblocktest.py
index 17fd40ef1dffd..9aee81164f088 100755
--- a/qa/rpc-tests/p2p-fullblocktest.py
+++ b/qa/rpc-tests/p2p-fullblocktest.py
@@ -25,9 +25,6 @@ def __init__(self, tx = CTransaction(), n = -1):
 each test.
 '''
 
-def hash160(s):
-    return hashlib.new('ripemd160', sha256(s)).digest()
-
 #  Use this class for tests that require behavior other than normal "mininode" behavior.
 #  For now, it is used to serialize a bloated varint (b64).
 class CBrokenBlock(CBlock):

From d2c5d044d00ec805957ab246a7863d83ca075805 Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Tue, 16 Aug 2016 15:35:45 +0200
Subject: [PATCH 0725/1802] Precompute sighashes

Original version by Nicolas Dorier. Precomputing version by Pieter Wuille.
---
 src/main.cpp                    | 22 ++++++++------
 src/main.h                      |  9 ++++--
 src/script/bitcoinconsensus.cpp |  4 +--
 src/script/interpreter.cpp      | 54 ++++++++++++++++++++++-----------
 src/script/interpreter.h        | 13 ++++++--
 src/script/sigcache.h           |  2 +-
 src/test/script_P2SH_tests.cpp  |  6 ++--
 src/test/transaction_tests.cpp  |  6 ++--
 8 files changed, 78 insertions(+), 38 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index db457f6f53d57..7f48ccbae1de4 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1492,12 +1492,13 @@ bool AcceptToMemoryPoolWorker(CTxMemPool& pool, CValidationState& state, const C
 
         // Check against previous transactions
         // This is done last to help prevent CPU exhaustion denial-of-service attacks.
-        if (!CheckInputs(tx, state, view, true, scriptVerifyFlags, true)) {
+        CachedHashes cachedHashes(tx);
+        if (!CheckInputs(tx, state, view, true, scriptVerifyFlags, true, cachedHashes)) {
             // SCRIPT_VERIFY_CLEANSTACK requires SCRIPT_VERIFY_WITNESS, so we
             // need to turn both off, and compare against just turning off CLEANSTACK
             // to see if the failure is specifically due to witness validation.
-            if (CheckInputs(tx, state, view, true, scriptVerifyFlags & ~(SCRIPT_VERIFY_WITNESS | SCRIPT_VERIFY_CLEANSTACK), true) &&
-                !CheckInputs(tx, state, view, true, scriptVerifyFlags & ~SCRIPT_VERIFY_CLEANSTACK, true)) {
+            if (CheckInputs(tx, state, view, true, scriptVerifyFlags & ~(SCRIPT_VERIFY_WITNESS | SCRIPT_VERIFY_CLEANSTACK), true, cachedHashes) &&
+                !CheckInputs(tx, state, view, true, scriptVerifyFlags & ~SCRIPT_VERIFY_CLEANSTACK, true, cachedHashes)) {
                 // Only the witness is wrong, so the transaction itself may be fine.
                 state.SetCorruptionPossible();
             }
@@ -1513,7 +1514,7 @@ bool AcceptToMemoryPoolWorker(CTxMemPool& pool, CValidationState& state, const C
         // There is a similar check in CreateNewBlock() to prevent creating
         // invalid blocks, however allowing such transactions into the mempool
         // can be exploited as a DoS attack.
-        if (!CheckInputs(tx, state, view, true, MANDATORY_SCRIPT_VERIFY_FLAGS, true))
+        if (!CheckInputs(tx, state, view, true, MANDATORY_SCRIPT_VERIFY_FLAGS, true, cachedHashes))
         {
             return error("%s: BUG! PLEASE REPORT THIS! ConnectInputs failed against MANDATORY but not STANDARD flags %s, %s",
                 __func__, hash.ToString(), FormatStateMessage(state));
@@ -1910,7 +1911,7 @@ void UpdateCoins(const CTransaction& tx, CCoinsViewCache& inputs, int nHeight)
 bool CScriptCheck::operator()() {
     const CScript &scriptSig = ptxTo->vin[nIn].scriptSig;
     const CScriptWitness *witness = (nIn < ptxTo->wit.vtxinwit.size()) ? &ptxTo->wit.vtxinwit[nIn].scriptWitness : NULL;
-    if (!VerifyScript(scriptSig, scriptPubKey, witness, nFlags, CachingTransactionSignatureChecker(ptxTo, nIn, amount, cacheStore), &error)) {
+    if (!VerifyScript(scriptSig, scriptPubKey, witness, nFlags, CachingTransactionSignatureChecker(ptxTo, nIn, amount, cacheStore, *cachedHashes), &error)) {
         return false;
     }
     return true;
@@ -1969,7 +1970,7 @@ bool CheckTxInputs(const CTransaction& tx, CValidationState& state, const CCoins
 }
 }// namespace Consensus
 
-bool CheckInputs(const CTransaction& tx, CValidationState &state, const CCoinsViewCache &inputs, bool fScriptChecks, unsigned int flags, bool cacheStore, std::vector<CScriptCheck> *pvChecks)
+bool CheckInputs(const CTransaction& tx, CValidationState &state, const CCoinsViewCache &inputs, bool fScriptChecks, unsigned int flags, bool cacheStore, CachedHashes& cachedHashes, std::vector<CScriptCheck> *pvChecks)
 {
     if (!tx.IsCoinBase())
     {
@@ -1996,7 +1997,7 @@ bool CheckInputs(const CTransaction& tx, CValidationState &state, const CCoinsVi
                 assert(coins);
 
                 // Verify signature
-                CScriptCheck check(*coins, tx, i, flags, cacheStore);
+                CScriptCheck check(*coins, tx, i, flags, cacheStore, &cachedHashes);
                 if (pvChecks) {
                     pvChecks->push_back(CScriptCheck());
                     check.swap(pvChecks->back());
@@ -2009,7 +2010,7 @@ bool CheckInputs(const CTransaction& tx, CValidationState &state, const CCoinsVi
                         // avoid splitting the network between upgraded and
                         // non-upgraded nodes.
                         CScriptCheck check2(*coins, tx, i,
-                                flags & ~STANDARD_NOT_MANDATORY_VERIFY_FLAGS, cacheStore);
+                                flags & ~STANDARD_NOT_MANDATORY_VERIFY_FLAGS, cacheStore, &cachedHashes);
                         if (check2())
                             return state.Invalid(false, REJECT_NONSTANDARD, strprintf("non-mandatory-script-verify-flag (%s)", ScriptErrorString(check.GetScriptError())));
                     }
@@ -2405,6 +2406,8 @@ bool ConnectBlock(const CBlock& block, CValidationState& state, CBlockIndex* pin
     std::vector<std::pair<uint256, CDiskTxPos> > vPos;
     vPos.reserve(block.vtx.size());
     blockundo.vtxundo.reserve(block.vtx.size() - 1);
+    std::vector<CachedHashes> cachedHashes;
+    cachedHashes.reserve(block.vtx.size()); // Required so that pointers to individual CachedHashes don't get invalidated
     for (unsigned int i = 0; i < block.vtx.size(); i++)
     {
         const CTransaction &tx = block.vtx[i];
@@ -2451,13 +2454,14 @@ bool ConnectBlock(const CBlock& block, CValidationState& state, CBlockIndex* pin
             return state.DoS(100, error("ConnectBlock(): too many sigops"),
                              REJECT_INVALID, "bad-blk-sigops");
 
+        cachedHashes.emplace_back(tx);
         if (!tx.IsCoinBase())
         {
             nFees += view.GetValueIn(tx)-tx.GetValueOut();
 
             std::vector<CScriptCheck> vChecks;
             bool fCacheResults = fJustCheck; /* Don't cache results if we're actually connecting blocks (still consult the cache, though) */
-            if (!CheckInputs(tx, state, view, fScriptChecks, flags, fCacheResults, nScriptCheckThreads ? &vChecks : NULL))
+            if (!CheckInputs(tx, state, view, fScriptChecks, flags, fCacheResults, cachedHashes[i], nScriptCheckThreads ? &vChecks : NULL))
                 return error("ConnectBlock(): CheckInputs on %s failed with %s",
                     tx.GetHash().ToString(), FormatStateMessage(state));
             control.Add(vChecks);
diff --git a/src/main.h b/src/main.h
index d4d70c018027d..fbf66c0481166 100644
--- a/src/main.h
+++ b/src/main.h
@@ -38,6 +38,7 @@ class CScriptCheck;
 class CTxMemPool;
 class CValidationInterface;
 class CValidationState;
+class CachedHashes;
 
 struct CNodeStateStats;
 struct LockPoints;
@@ -347,7 +348,7 @@ int64_t GetTransactionSigOpCost(const CTransaction& tx, const CCoinsViewCache& i
  * instead of being performed inline.
  */
 bool CheckInputs(const CTransaction& tx, CValidationState &state, const CCoinsViewCache &view, bool fScriptChecks,
-                 unsigned int flags, bool cacheStore, std::vector<CScriptCheck> *pvChecks = NULL);
+                 unsigned int flags, bool cacheStore, CachedHashes& cachedHashes, std::vector<CScriptCheck> *pvChecks = NULL);
 
 /** Apply the effects of this transaction on the UTXO set represented by view */
 void UpdateCoins(const CTransaction& tx, CCoinsViewCache& inputs, int nHeight);
@@ -421,12 +422,13 @@ class CScriptCheck
     unsigned int nFlags;
     bool cacheStore;
     ScriptError error;
+    CachedHashes *cachedHashes;
 
 public:
     CScriptCheck(): amount(0), ptxTo(0), nIn(0), nFlags(0), cacheStore(false), error(SCRIPT_ERR_UNKNOWN_ERROR) {}
-    CScriptCheck(const CCoins& txFromIn, const CTransaction& txToIn, unsigned int nInIn, unsigned int nFlagsIn, bool cacheIn) :
+    CScriptCheck(const CCoins& txFromIn, const CTransaction& txToIn, unsigned int nInIn, unsigned int nFlagsIn, bool cacheIn, CachedHashes* cachedHashesIn) :
         scriptPubKey(txFromIn.vout[txToIn.vin[nInIn].prevout.n].scriptPubKey), amount(txFromIn.vout[txToIn.vin[nInIn].prevout.n].nValue),
-        ptxTo(&txToIn), nIn(nInIn), nFlags(nFlagsIn), cacheStore(cacheIn), error(SCRIPT_ERR_UNKNOWN_ERROR) { }
+        ptxTo(&txToIn), nIn(nInIn), nFlags(nFlagsIn), cacheStore(cacheIn), error(SCRIPT_ERR_UNKNOWN_ERROR), cachedHashes(cachedHashesIn) { }
 
     bool operator()();
 
@@ -438,6 +440,7 @@ class CScriptCheck
         std::swap(nFlags, check.nFlags);
         std::swap(cacheStore, check.cacheStore);
         std::swap(error, check.error);
+        std::swap(cachedHashes, check.cachedHashes);
     }
 
     ScriptError GetScriptError() const { return error; }
diff --git a/src/script/bitcoinconsensus.cpp b/src/script/bitcoinconsensus.cpp
index 62fd9031f853a..01a8babb679eb 100644
--- a/src/script/bitcoinconsensus.cpp
+++ b/src/script/bitcoinconsensus.cpp
@@ -84,8 +84,8 @@ static int verify_script(const unsigned char *scriptPubKey, unsigned int scriptP
 
         // Regardless of the verification result, the tx did not error.
         set_error(err, bitcoinconsensus_ERR_OK);
-
-        return VerifyScript(tx.vin[nIn].scriptSig, CScript(scriptPubKey, scriptPubKey + scriptPubKeyLen), nIn < tx.wit.vtxinwit.size() ? &tx.wit.vtxinwit[nIn].scriptWitness : NULL, flags, TransactionSignatureChecker(&tx, nIn, amount), NULL);
+        CachedHashes cachedHashes(tx);
+        return VerifyScript(tx.vin[nIn].scriptSig, CScript(scriptPubKey, scriptPubKey + scriptPubKeyLen), nIn < tx.wit.vtxinwit.size() ? &tx.wit.vtxinwit[nIn].scriptWitness : NULL, flags, TransactionSignatureChecker(&tx, nIn, amount, cachedHashes), NULL);
     } catch (const std::exception&) {
         return set_error(err, bitcoinconsensus_ERR_TX_DESERIALIZE); // Error deserializing
     }
diff --git a/src/script/interpreter.cpp b/src/script/interpreter.cpp
index bc027e9f0c113..459feaa0f4826 100644
--- a/src/script/interpreter.cpp
+++ b/src/script/interpreter.cpp
@@ -1108,9 +1108,40 @@ class CTransactionSignatureSerializer {
     }
 };
 
+uint256 GetPrevoutHash(const CTransaction& txTo) {
+    CHashWriter ss(SER_GETHASH, 0);
+    for (unsigned int n = 0; n < txTo.vin.size(); n++) {
+        ss << txTo.vin[n].prevout;
+    }
+    return ss.GetHash();
+}
+
+uint256 GetSequenceHash(const CTransaction& txTo) {
+    CHashWriter ss(SER_GETHASH, 0);
+    for (unsigned int n = 0; n < txTo.vin.size(); n++) {
+        ss << txTo.vin[n].nSequence;
+    }
+    return ss.GetHash();
+}
+
+uint256 GetOutputsHash(const CTransaction& txTo) {
+    CHashWriter ss(SER_GETHASH, 0);
+    for (unsigned int n = 0; n < txTo.vout.size(); n++) {
+        ss << txTo.vout[n];
+    }
+    return ss.GetHash();
+}
+
 } // anon namespace
 
-uint256 SignatureHash(const CScript& scriptCode, const CTransaction& txTo, unsigned int nIn, int nHashType, const CAmount& amount, SigVersion sigversion)
+CachedHashes::CachedHashes(const CTransaction& txTo)
+{
+    hashPrevouts = GetPrevoutHash(txTo);
+    hashSequence = GetSequenceHash(txTo);
+    hashOutputs = GetOutputsHash(txTo);
+}
+
+uint256 SignatureHash(const CScript& scriptCode, const CTransaction& txTo, unsigned int nIn, int nHashType, const CAmount& amount, SigVersion sigversion, const CachedHashes* cache)
 {
     if (sigversion == SIGVERSION_WITNESS_V0) {
         uint256 hashPrevouts;
@@ -1118,27 +1149,16 @@ uint256 SignatureHash(const CScript& scriptCode, const CTransaction& txTo, unsig
         uint256 hashOutputs;
 
         if (!(nHashType & SIGHASH_ANYONECANPAY)) {
-            CHashWriter ss(SER_GETHASH, 0);
-            for (unsigned int n = 0; n < txTo.vin.size(); n++) {
-                ss << txTo.vin[n].prevout;
-            }
-            hashPrevouts = ss.GetHash(); // TODO: cache this value for all signatures in a transaction
+            hashPrevouts = cache ? cache->hashPrevouts : GetPrevoutHash(txTo);
         }
 
         if (!(nHashType & SIGHASH_ANYONECANPAY) && (nHashType & 0x1f) != SIGHASH_SINGLE && (nHashType & 0x1f) != SIGHASH_NONE) {
-            CHashWriter ss(SER_GETHASH, 0);
-            for (unsigned int n = 0; n < txTo.vin.size(); n++) {
-                ss << txTo.vin[n].nSequence;
-            }
-            hashSequence = ss.GetHash(); // TODO: cache this value for all signatures in a transaction
+            hashSequence = cache ? cache->hashSequence : GetSequenceHash(txTo);
         }
 
+
         if ((nHashType & 0x1f) != SIGHASH_SINGLE && (nHashType & 0x1f) != SIGHASH_NONE) {
-            CHashWriter ss(SER_GETHASH, 0);
-            for (unsigned int n = 0; n < txTo.vout.size(); n++) {
-                ss << txTo.vout[n];
-            }
-            hashOutputs = ss.GetHash(); // TODO: cache this value for all signatures in a transaction
+            hashOutputs = cache ? cache->hashOutputs : GetOutputsHash(txTo);
         } else if ((nHashType & 0x1f) == SIGHASH_SINGLE && nIn < txTo.vout.size()) {
             CHashWriter ss(SER_GETHASH, 0);
             ss << txTo.vout[nIn];
@@ -1209,7 +1229,7 @@ bool TransactionSignatureChecker::CheckSig(const vector<unsigned char>& vchSigIn
     int nHashType = vchSig.back();
     vchSig.pop_back();
 
-    uint256 sighash = SignatureHash(scriptCode, *txTo, nIn, nHashType, amount, sigversion);
+    uint256 sighash = SignatureHash(scriptCode, *txTo, nIn, nHashType, amount, sigversion, this->cachedHashes);
 
     if (!VerifySignature(vchSig, pubkey, sighash))
         return false;
diff --git a/src/script/interpreter.h b/src/script/interpreter.h
index bd2f21166368a..b4da113eec939 100644
--- a/src/script/interpreter.h
+++ b/src/script/interpreter.h
@@ -98,13 +98,20 @@ enum
 
 bool CheckSignatureEncoding(const std::vector<unsigned char> &vchSig, unsigned int flags, ScriptError* serror);
 
+struct CachedHashes
+{
+    uint256 hashPrevouts, hashSequence, hashOutputs;
+
+    CachedHashes(const CTransaction& tx);
+};
+
 enum SigVersion
 {
     SIGVERSION_BASE = 0,
     SIGVERSION_WITNESS_V0 = 1,
 };
 
-uint256 SignatureHash(const CScript &scriptCode, const CTransaction& txTo, unsigned int nIn, int nHashType, const CAmount& amount, SigVersion sigversion);
+uint256 SignatureHash(const CScript &scriptCode, const CTransaction& txTo, unsigned int nIn, int nHashType, const CAmount& amount, SigVersion sigversion, const CachedHashes* cache = NULL);
 
 class BaseSignatureChecker
 {
@@ -133,12 +140,14 @@ class TransactionSignatureChecker : public BaseSignatureChecker
     const CTransaction* txTo;
     unsigned int nIn;
     const CAmount amount;
+    const CachedHashes* cachedHashes;
 
 protected:
     virtual bool VerifySignature(const std::vector<unsigned char>& vchSig, const CPubKey& vchPubKey, const uint256& sighash) const;
 
 public:
-    TransactionSignatureChecker(const CTransaction* txToIn, unsigned int nInIn, const CAmount& amountIn) : txTo(txToIn), nIn(nInIn), amount(amountIn) {}
+    TransactionSignatureChecker(const CTransaction* txToIn, unsigned int nInIn, const CAmount& amountIn) : txTo(txToIn), nIn(nInIn), amount(amountIn), cachedHashes(NULL) {}
+    TransactionSignatureChecker(const CTransaction* txToIn, unsigned int nInIn, const CAmount& amountIn, const CachedHashes& cachedHashesIn) : txTo(txToIn), nIn(nInIn), amount(amountIn), cachedHashes(&cachedHashesIn) {}
     bool CheckSig(const std::vector<unsigned char>& scriptSig, const std::vector<unsigned char>& vchPubKey, const CScript& scriptCode, SigVersion sigversion) const;
     bool CheckLockTime(const CScriptNum& nLockTime) const;
     bool CheckSequence(const CScriptNum& nSequence) const;
diff --git a/src/script/sigcache.h b/src/script/sigcache.h
index 050bf8cc42290..551f8b2253e76 100644
--- a/src/script/sigcache.h
+++ b/src/script/sigcache.h
@@ -22,7 +22,7 @@ class CachingTransactionSignatureChecker : public TransactionSignatureChecker
     bool store;
 
 public:
-    CachingTransactionSignatureChecker(const CTransaction* txToIn, unsigned int nInIn, const CAmount& amount, bool storeIn) : TransactionSignatureChecker(txToIn, nInIn, amount), store(storeIn) {}
+    CachingTransactionSignatureChecker(const CTransaction* txToIn, unsigned int nInIn, const CAmount& amount, bool storeIn, CachedHashes& cachedHashesIn) : TransactionSignatureChecker(txToIn, nInIn, amount, cachedHashesIn), store(storeIn) {}
 
     bool VerifySignature(const std::vector<unsigned char>& vchSig, const CPubKey& vchPubKey, const uint256& sighash) const;
 };
diff --git a/src/test/script_P2SH_tests.cpp b/src/test/script_P2SH_tests.cpp
index 5224b57ca4479..5cd7c93622977 100644
--- a/src/test/script_P2SH_tests.cpp
+++ b/src/test/script_P2SH_tests.cpp
@@ -107,18 +107,20 @@ BOOST_AUTO_TEST_CASE(sign)
     }
     // All of the above should be OK, and the txTos have valid signatures
     // Check to make sure signature verification fails if we use the wrong ScriptSig:
-    for (int i = 0; i < 8; i++)
+    for (int i = 0; i < 8; i++) {
+        CachedHashes cachedHashes(txTo[i]);
         for (int j = 0; j < 8; j++)
         {
             CScript sigSave = txTo[i].vin[0].scriptSig;
             txTo[i].vin[0].scriptSig = txTo[j].vin[0].scriptSig;
-            bool sigOK = CScriptCheck(CCoins(txFrom, 0), txTo[i], 0, SCRIPT_VERIFY_P2SH | SCRIPT_VERIFY_STRICTENC, false)();
+            bool sigOK = CScriptCheck(CCoins(txFrom, 0), txTo[i], 0, SCRIPT_VERIFY_P2SH | SCRIPT_VERIFY_STRICTENC, false, &cachedHashes)();
             if (i == j)
                 BOOST_CHECK_MESSAGE(sigOK, strprintf("VerifySignature %d %d", i, j));
             else
                 BOOST_CHECK_MESSAGE(!sigOK, strprintf("VerifySignature %d %d", i, j));
             txTo[i].vin[0].scriptSig = sigSave;
         }
+    }
 }
 
 BOOST_AUTO_TEST_CASE(norecurse)
diff --git a/src/test/transaction_tests.cpp b/src/test/transaction_tests.cpp
index fd4f174b40c80..c06515f7302b6 100644
--- a/src/test/transaction_tests.cpp
+++ b/src/test/transaction_tests.cpp
@@ -153,6 +153,7 @@ BOOST_AUTO_TEST_CASE(tx_valid)
             BOOST_CHECK_MESSAGE(CheckTransaction(tx, state), strTest);
             BOOST_CHECK(state.IsValid());
 
+            CachedHashes cachedHashes(tx);
             for (unsigned int i = 0; i < tx.vin.size(); i++)
             {
                 if (!mapprevOutScriptPubKeys.count(tx.vin[i].prevout))
@@ -168,7 +169,7 @@ BOOST_AUTO_TEST_CASE(tx_valid)
                 unsigned int verify_flags = ParseScriptFlags(test[2].get_str());
                 const CScriptWitness *witness = (i < tx.wit.vtxinwit.size()) ? &tx.wit.vtxinwit[i].scriptWitness : NULL;
                 BOOST_CHECK_MESSAGE(VerifyScript(tx.vin[i].scriptSig, mapprevOutScriptPubKeys[tx.vin[i].prevout],
-                                                 witness, verify_flags, TransactionSignatureChecker(&tx, i, amount), &err),
+                                                 witness, verify_flags, TransactionSignatureChecker(&tx, i, amount, cachedHashes), &err),
                                     strTest);
                 BOOST_CHECK_MESSAGE(err == SCRIPT_ERR_OK, ScriptErrorString(err));
             }
@@ -237,6 +238,7 @@ BOOST_AUTO_TEST_CASE(tx_invalid)
             CValidationState state;
             fValid = CheckTransaction(tx, state) && state.IsValid();
 
+            CachedHashes cachedHashes(tx);
             for (unsigned int i = 0; i < tx.vin.size() && fValid; i++)
             {
                 if (!mapprevOutScriptPubKeys.count(tx.vin[i].prevout))
@@ -252,7 +254,7 @@ BOOST_AUTO_TEST_CASE(tx_invalid)
                 }
                 const CScriptWitness *witness = (i < tx.wit.vtxinwit.size()) ? &tx.wit.vtxinwit[i].scriptWitness : NULL;
                 fValid = VerifyScript(tx.vin[i].scriptSig, mapprevOutScriptPubKeys[tx.vin[i].prevout],
-                                      witness, verify_flags, TransactionSignatureChecker(&tx, i, amount), &err);
+                                      witness, verify_flags, TransactionSignatureChecker(&tx, i, amount, cachedHashes), &err);
             }
             BOOST_CHECK_MESSAGE(!fValid, strTest);
             BOOST_CHECK_MESSAGE(err != SCRIPT_ERR_OK, ScriptErrorString(err));

From ab48c5e72156b34300db4a6521cb3c9969be3937 Mon Sep 17 00:00:00 2001
From: Nicolas DORIER <nicolas.dorier@gmail.com>
Date: Tue, 16 Aug 2016 15:37:56 +0200
Subject: [PATCH 0726/1802] Unit test for sighash caching

---
 src/test/transaction_tests.cpp | 81 ++++++++++++++++++++++++++++++++++
 1 file changed, 81 insertions(+)

diff --git a/src/test/transaction_tests.cpp b/src/test/transaction_tests.cpp
index c06515f7302b6..8f8666c76d1dc 100644
--- a/src/test/transaction_tests.cpp
+++ b/src/test/transaction_tests.cpp
@@ -7,6 +7,7 @@
 #include "test/test_bitcoin.h"
 
 #include "clientversion.h"
+#include "checkqueue.h"
 #include "consensus/validation.h"
 #include "core_io.h"
 #include "key.h"
@@ -421,6 +422,86 @@ void ReplaceRedeemScript(CScript& script, const CScript& redeemScript)
     script = PushAll(stack);
 }
 
+BOOST_AUTO_TEST_CASE(test_big_witness_transaction) {
+    CMutableTransaction mtx;
+    mtx.nVersion = 1;
+
+    CKey key;
+    key.MakeNewKey(false);
+    CBasicKeyStore keystore;
+    keystore.AddKeyPubKey(key, key.GetPubKey());
+    CKeyID hash = key.GetPubKey().GetID();
+    CScript scriptPubKey = CScript() << OP_0 << std::vector<unsigned char>(hash.begin(), hash.end());
+
+    vector<int> sigHashes;
+    sigHashes.push_back(SIGHASH_NONE | SIGHASH_ANYONECANPAY);
+    sigHashes.push_back(SIGHASH_SINGLE | SIGHASH_ANYONECANPAY);
+    sigHashes.push_back(SIGHASH_ALL | SIGHASH_ANYONECANPAY);
+    sigHashes.push_back(SIGHASH_NONE);
+    sigHashes.push_back(SIGHASH_SINGLE);
+    sigHashes.push_back(SIGHASH_ALL);
+
+    // create a big transaction of 4500 inputs signed by the same key
+    for(uint32_t ij = 0; ij < 4500; ij++) {
+        uint32_t i = mtx.vin.size();
+        uint256 prevId;
+        prevId.SetHex("0000000000000000000000000000000000000000000000000000000000000100");
+        COutPoint outpoint(prevId, i);
+
+        mtx.vin.resize(mtx.vin.size() + 1);
+        mtx.vin[i].prevout = outpoint;
+        mtx.vin[i].scriptSig = CScript();
+
+        mtx.vout.resize(mtx.vout.size() + 1);
+        mtx.vout[i].nValue = 1000;
+        mtx.vout[i].scriptPubKey = CScript() << OP_1;
+    }
+
+    // sign all inputs
+    for(uint32_t i = 0; i < mtx.vin.size(); i++) {
+        bool hashSigned = SignSignature(keystore, scriptPubKey, mtx, i, 1000, sigHashes.at(i % sigHashes.size()));
+        assert(hashSigned);
+    }
+
+    CTransaction tx;
+    CDataStream ssout(SER_NETWORK, PROTOCOL_VERSION);
+    WithOrVersion(&ssout, 0) << mtx;
+    WithOrVersion(&ssout, 0) >> tx;
+
+    // check all inputs concurrently, with the cache
+    CachedHashes cachedHashes(tx);
+    boost::thread_group threadGroup;
+    CCheckQueue<CScriptCheck> scriptcheckqueue(128);
+    CCheckQueueControl<CScriptCheck> control(&scriptcheckqueue);
+
+    for (int i=0; i<20; i++)
+        threadGroup.create_thread(boost::bind(&CCheckQueue<CScriptCheck>::Thread, boost::ref(scriptcheckqueue)));
+
+    CCoins coins;
+    coins.nVersion = 1;
+    coins.fCoinBase = false;
+    for(uint32_t i = 0; i < mtx.vin.size(); i++) {
+        CTxOut txout;
+        txout.nValue = 1000;
+        txout.scriptPubKey = scriptPubKey;
+        coins.vout.push_back(txout);
+    }
+
+    for(uint32_t i = 0; i < mtx.vin.size(); i++) {
+        std::vector<CScriptCheck> vChecks;
+        CScriptCheck check(coins, tx, i, SCRIPT_VERIFY_P2SH | SCRIPT_VERIFY_WITNESS, false, &cachedHashes);
+        vChecks.push_back(CScriptCheck());
+        check.swap(vChecks.back());
+        control.Add(vChecks);
+    }
+
+    bool controlCheck = control.Wait();
+    assert(controlCheck);
+
+    threadGroup.interrupt_all();
+    threadGroup.join_all();
+}
+
 BOOST_AUTO_TEST_CASE(test_witness)
 {
     CBasicKeyStore keystore, keystore2;

From bc1d1f266046ec79e87c7bf90aaf279f43266cf5 Mon Sep 17 00:00:00 2001
From: instagibbs <gsanders87@gmail.com>
Date: Tue, 16 Aug 2016 14:11:10 -0400
Subject: [PATCH 0727/1802] Update p2p-segwit.py to reflect correct AskFor
 behavior

---
 qa/rpc-tests/p2p-segwit.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/qa/rpc-tests/p2p-segwit.py b/qa/rpc-tests/p2p-segwit.py
index cd02692b1e88c..3813743e5b912 100755
--- a/qa/rpc-tests/p2p-segwit.py
+++ b/qa/rpc-tests/p2p-segwit.py
@@ -946,8 +946,7 @@ def test_tx_relay_after_segwit_activation(self):
         self.test_node.test_transaction_acceptance(tx, with_witness=True, accepted=False)
 
         # Verify that removing the witness succeeds.
-        # Re-announcing won't result in a getdata for ~2.5 minutes, so just
-        # deliver the modified transaction.
+        self.test_node.announce_tx_and_wait_for_getdata(tx)
         self.test_node.test_transaction_acceptance(tx, with_witness=False, accepted=True)
 
         # Now try to add extra witness data to a valid witness tx.

From eb0c52ec1d3ffd4e2d78b2044c1c3d62de7711d3 Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Wed, 17 Aug 2016 12:03:33 +0200
Subject: [PATCH 0728/1802] travis: Remove hostname hack

This was required for java, and we no longer use java for the tests.
---
 .travis.yml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a6c51753b6727..e1600cf26932a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,10 +1,5 @@
 sudo: required
 dist: trusty
-
-#workaround for https://github.com/travis-ci/travis-ci/issues/5227
-addons:
-  hostname: bitcoin-tester
-
 os: linux
 language: generic
 cache:

From fa64306520156af1d1fe90e92f6cc22ffa097c02 Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Wed, 17 Aug 2016 13:28:09 +0200
Subject: [PATCH 0729/1802] [qa] abandonconflict: Use assert_equal

---
 qa/rpc-tests/abandonconflict.py | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/qa/rpc-tests/abandonconflict.py b/qa/rpc-tests/abandonconflict.py
index c50c3cc562e5f..874df487777cf 100755
--- a/qa/rpc-tests/abandonconflict.py
+++ b/qa/rpc-tests/abandonconflict.py
@@ -68,7 +68,7 @@ def run_test(self):
 
         # In mempool txs from self should increase balance from change
         newbalance = self.nodes[0].getbalance()
-        assert(newbalance == balance - Decimal("30") + Decimal("24.9996"))
+        assert_equal(newbalance, balance - Decimal("30") + Decimal("24.9996"))
         balance = newbalance
 
         # Restart the node with a higher min relay fee so the parent tx is no longer in mempool
@@ -78,16 +78,16 @@ def run_test(self):
         self.nodes[0]=start_node(0, self.options.tmpdir, ["-debug","-logtimemicros","-minrelaytxfee=0.0001"])
 
         # Verify txs no longer in mempool
-        assert(len(self.nodes[0].getrawmempool()) == 0)
+        assert_equal(len(self.nodes[0].getrawmempool()), 0)
 
         # Not in mempool txs from self should only reduce balance
         # inputs are still spent, but change not received
         newbalance = self.nodes[0].getbalance()
-        assert(newbalance == balance - Decimal("24.9996"))
+        assert_equal(newbalance, balance - Decimal("24.9996"))
         # Unconfirmed received funds that are not in mempool, also shouldn't show
         # up in unconfirmed balance
         unconfbalance = self.nodes[0].getunconfirmedbalance() + self.nodes[0].getbalance()
-        assert(unconfbalance == newbalance)
+        assert_equal(unconfbalance, newbalance)
         # Also shouldn't show up in listunspent
         assert(not txABC2 in [utxo["txid"] for utxo in self.nodes[0].listunspent(0)])
         balance = newbalance
@@ -96,35 +96,35 @@ def run_test(self):
         # including that the child tx was also abandoned
         self.nodes[0].abandontransaction(txAB1)
         newbalance = self.nodes[0].getbalance()
-        assert(newbalance == balance + Decimal("30"))
+        assert_equal(newbalance, balance + Decimal("30"))
         balance = newbalance
 
         # Verify that even with a low min relay fee, the tx is not reaccepted from wallet on startup once abandoned
         stop_node(self.nodes[0],0)
         self.nodes[0]=start_node(0, self.options.tmpdir, ["-debug","-logtimemicros","-minrelaytxfee=0.00001"])
-        assert(len(self.nodes[0].getrawmempool()) == 0)
-        assert(self.nodes[0].getbalance() == balance)
+        assert_equal(len(self.nodes[0].getrawmempool()), 0)
+        assert_equal(self.nodes[0].getbalance(), balance)
 
         # But if its received again then it is unabandoned
         # And since now in mempool, the change is available
         # But its child tx remains abandoned
         self.nodes[0].sendrawtransaction(signed["hex"])
         newbalance = self.nodes[0].getbalance()
-        assert(newbalance == balance - Decimal("20") + Decimal("14.99998"))
+        assert_equal(newbalance, balance - Decimal("20") + Decimal("14.99998"))
         balance = newbalance
 
         # Send child tx again so its unabandoned
         self.nodes[0].sendrawtransaction(signed2["hex"])
         newbalance = self.nodes[0].getbalance()
-        assert(newbalance == balance - Decimal("10") - Decimal("14.99998") + Decimal("24.9996"))
+        assert_equal(newbalance, balance - Decimal("10") - Decimal("14.99998") + Decimal("24.9996"))
         balance = newbalance
 
         # Remove using high relay fee again
         stop_node(self.nodes[0],0)
         self.nodes[0]=start_node(0, self.options.tmpdir, ["-debug","-logtimemicros","-minrelaytxfee=0.0001"])
-        assert(len(self.nodes[0].getrawmempool()) == 0)
+        assert_equal(len(self.nodes[0].getrawmempool()), 0)
         newbalance = self.nodes[0].getbalance()
-        assert(newbalance == balance - Decimal("24.9996"))
+        assert_equal(newbalance, balance - Decimal("24.9996"))
         balance = newbalance
 
         # Create a double spend of AB1 by spending again from only A's 10 output
@@ -143,7 +143,7 @@ def run_test(self):
 
         # Verify that B and C's 10 BTC outputs are available for spending again because AB1 is now conflicted
         newbalance = self.nodes[0].getbalance()
-        assert(newbalance == balance + Decimal("20"))
+        assert_equal(newbalance, balance + Decimal("20"))
         balance = newbalance
 
         # There is currently a minor bug around this and so this test doesn't work.  See Issue #7315
@@ -151,7 +151,7 @@ def run_test(self):
         # Don't think C's should either
         self.nodes[0].invalidateblock(self.nodes[0].getbestblockhash())
         newbalance = self.nodes[0].getbalance()
-        #assert(newbalance == balance - Decimal("10"))
+        #assert_equal(newbalance, balance - Decimal("10"))
         print("If balance has not declined after invalidateblock then out of mempool wallet tx which is no longer")
         print("conflicted has not resumed causing its inputs to be seen as spent.  See Issue #7315")
         print(str(balance) + " -> " + str(newbalance) + " ?")

From fa0afdee16ddca121076784d58d79e1833381058 Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Wed, 17 Aug 2016 21:40:20 +0200
Subject: [PATCH 0730/1802] [travis] Drop java

---
 .travis.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index e1600cf26932a..0b38fd45fe46e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -24,15 +24,15 @@ env:
 # ARM
     - HOST=arm-linux-gnueabihf PACKAGES="g++-arm-linux-gnueabihf" DEP_OPTS="NO_QT=1" CHECK_DOC=1 GOAL="install" BITCOIN_CONFIG="--enable-glibc-back-compat --enable-reduce-exports"
 # Win32
-    - HOST=i686-w64-mingw32 DPKG_ADD_ARCH="i386" DEP_OPTS="NO_QT=1" PACKAGES="python3 nsis g++-mingw-w64-i686 wine1.6 bc openjdk-7-jre-headless" RUN_TESTS=true GOAL="install" BITCOIN_CONFIG="--enable-reduce-exports"
+    - HOST=i686-w64-mingw32 DPKG_ADD_ARCH="i386" DEP_OPTS="NO_QT=1" PACKAGES="python3 nsis g++-mingw-w64-i686 wine1.6 bc" RUN_TESTS=true GOAL="install" BITCOIN_CONFIG="--enable-reduce-exports"
 # 32-bit + dash
-    - HOST=i686-pc-linux-gnu PACKAGES="g++-multilib bc python3-zmq openjdk-7-jre-headless" DEP_OPTS="NO_QT=1" RUN_TESTS=true GOAL="install" BITCOIN_CONFIG="--enable-zmq --enable-glibc-back-compat --enable-reduce-exports LDFLAGS=-static-libstdc++" USE_SHELL="/bin/dash"
+    - HOST=i686-pc-linux-gnu PACKAGES="g++-multilib bc python3-zmq" DEP_OPTS="NO_QT=1" RUN_TESTS=true GOAL="install" BITCOIN_CONFIG="--enable-zmq --enable-glibc-back-compat --enable-reduce-exports LDFLAGS=-static-libstdc++" USE_SHELL="/bin/dash"
 # Win64
-    - HOST=x86_64-w64-mingw32 DPKG_ADD_ARCH="i386" DEP_OPTS="NO_QT=1" PACKAGES="python3 nsis g++-mingw-w64-x86-64 wine1.6 bc openjdk-7-jre-headless" RUN_TESTS=true GOAL="install" BITCOIN_CONFIG="--enable-reduce-exports"
+    - HOST=x86_64-w64-mingw32 DPKG_ADD_ARCH="i386" DEP_OPTS="NO_QT=1" PACKAGES="python3 nsis g++-mingw-w64-x86-64 wine1.6 bc" RUN_TESTS=true GOAL="install" BITCOIN_CONFIG="--enable-reduce-exports"
 # bitcoind
-    - HOST=x86_64-unknown-linux-gnu PACKAGES="bc python3-zmq openjdk-7-jre-headless" DEP_OPTS="NO_QT=1 NO_UPNP=1 DEBUG=1" RUN_TESTS=true GOAL="install" BITCOIN_CONFIG="--enable-zmq --enable-glibc-back-compat --enable-reduce-exports CPPFLAGS=-DDEBUG_LOCKORDER"
+    - HOST=x86_64-unknown-linux-gnu PACKAGES="bc python3-zmq" DEP_OPTS="NO_QT=1 NO_UPNP=1 DEBUG=1" RUN_TESTS=true GOAL="install" BITCOIN_CONFIG="--enable-zmq --enable-glibc-back-compat --enable-reduce-exports CPPFLAGS=-DDEBUG_LOCKORDER"
 # No wallet
-    - HOST=x86_64-unknown-linux-gnu PACKAGES=" openjdk-7-jre-headless python3" DEP_OPTS="NO_WALLET=1" RUN_TESTS=true GOAL="install" BITCOIN_CONFIG="--enable-glibc-back-compat --enable-reduce-exports"
+    - HOST=x86_64-unknown-linux-gnu PACKAGES="python3" DEP_OPTS="NO_WALLET=1" RUN_TESTS=true GOAL="install" BITCOIN_CONFIG="--enable-glibc-back-compat --enable-reduce-exports"
 # Cross-Mac
     - HOST=x86_64-apple-darwin11 PACKAGES="cmake imagemagick libcap-dev librsvg2-bin libz-dev libbz2-dev libtiff-tools python-dev" BITCOIN_CONFIG="--enable-reduce-exports" OSX_SDK=10.11 GOAL="deploy"
 

From e86eb71604e73ad35b8b1f59d73af22e353a156e Mon Sep 17 00:00:00 2001
From: Patrick Strateman <patrick.strateman@gmail.com>
Date: Mon, 1 Aug 2016 17:14:40 -0700
Subject: [PATCH 0731/1802] Move CWallet::setKeyPool to private section of
 CWallet

---
 src/init.cpp            |  9 ++++++---
 src/wallet/wallet.h     | 15 ++++++++++++++-
 src/wallet/walletdb.cpp | 10 ++--------
 3 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/src/init.cpp b/src/init.cpp
index 8d4a2cafbfbb1..a15fe2e13b94f 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -1439,9 +1439,12 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
     LogPrintf("mapBlockIndex.size() = %u\n",   mapBlockIndex.size());
     LogPrintf("nBestHeight = %d\n",                   chainActive.Height());
 #ifdef ENABLE_WALLET
-    LogPrintf("setKeyPool.size() = %u\n",      pwalletMain ? pwalletMain->setKeyPool.size() : 0);
-    LogPrintf("mapWallet.size() = %u\n",       pwalletMain ? pwalletMain->mapWallet.size() : 0);
-    LogPrintf("mapAddressBook.size() = %u\n",  pwalletMain ? pwalletMain->mapAddressBook.size() : 0);
+    if (pwalletMain) {
+        LOCK(pwalletMain->cs_wallet);
+        LogPrintf("setKeyPool.size() = %u\n",      pwalletMain->GetKeyPoolSize());
+        LogPrintf("mapWallet.size() = %u\n",       pwalletMain->mapWallet.size());
+        LogPrintf("mapAddressBook.size() = %u\n",  pwalletMain->mapAddressBook.size());
+    }
 #endif
 
     if (GetBoolArg("-listenonion", DEFAULT_LISTEN_ONION))
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
index 50c94ccfbcd95..d2e3e2c6e3ee9 100644
--- a/src/wallet/wallet.h
+++ b/src/wallet/wallet.h
@@ -582,6 +582,8 @@ class CWallet : public CCryptoKeyStore, public CValidationInterface
     CHDChain hdChain;
 
     bool fFileBacked;
+
+    std::set<int64_t> setKeyPool;
 public:
     /*
      * Main wallet lock.
@@ -594,7 +596,18 @@ class CWallet : public CCryptoKeyStore, public CValidationInterface
 
     std::string strWalletFile;
 
-    std::set<int64_t> setKeyPool;
+    void LoadKeyPool(int nIndex, const CKeyPool &keypool)
+    {
+        setKeyPool.insert(nIndex);
+
+        // If no metadata exists yet, create a default with the pool key's
+        // creation time. Note that this may be overwritten by actually
+        // stored metadata for that key later, which is fine.
+        CKeyID keyid = keypool.vchPubKey.GetID();
+        if (mapKeyMetadata.count(keyid) == 0)
+            mapKeyMetadata[keyid] = CKeyMetadata(keypool.nTime);
+    }
+
     std::map<CKeyID, CKeyMetadata> mapKeyMetadata;
 
     typedef std::map<unsigned int, CMasterKey> MasterKeyMap;
diff --git a/src/wallet/walletdb.cpp b/src/wallet/walletdb.cpp
index 543522ca6485c..025d3606d9d20 100644
--- a/src/wallet/walletdb.cpp
+++ b/src/wallet/walletdb.cpp
@@ -556,14 +556,8 @@ ReadKeyValue(CWallet* pwallet, CDataStream& ssKey, CDataStream& ssValue,
             ssKey >> nIndex;
             CKeyPool keypool;
             ssValue >> keypool;
-            pwallet->setKeyPool.insert(nIndex);
-
-            // If no metadata exists yet, create a default with the pool key's
-            // creation time. Note that this may be overwritten by actually
-            // stored metadata for that key later, which is fine.
-            CKeyID keyid = keypool.vchPubKey.GetID();
-            if (pwallet->mapKeyMetadata.count(keyid) == 0)
-                pwallet->mapKeyMetadata[keyid] = CKeyMetadata(keypool.nTime);
+
+            pwallet->LoadKeyPool(nIndex, keypool);
         }
         else if (strType == "version")
         {

From 35f64e45c207960078eef58ccc50d91e4abc2c55 Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Thu, 18 Aug 2016 09:22:57 +0200
Subject: [PATCH 0732/1802] Revert "[qa] Adjust timeouts for micro-optimization
 of run time"

This reverts commit fa2d68f79c459b505652728c3d8da60679f98ae3.

Temporary revert - see discussion in #8532.
---
 qa/rpc-tests/test_framework/util.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/qa/rpc-tests/test_framework/util.py b/qa/rpc-tests/test_framework/util.py
index 586e2a07ba925..190fa7f661a6d 100644
--- a/qa/rpc-tests/test_framework/util.py
+++ b/qa/rpc-tests/test_framework/util.py
@@ -121,7 +121,7 @@ def hex_str_to_bytes(hex_str):
 def str_to_b64str(string):
     return b64encode(string.encode('utf-8')).decode('ascii')
 
-def sync_blocks(rpc_connections, wait=0.125, timeout=60):
+def sync_blocks(rpc_connections, wait=1, timeout=60):
     """
     Wait until everybody has the same tip
     """
@@ -133,7 +133,7 @@ def sync_blocks(rpc_connections, wait=0.125, timeout=60):
         timeout -= wait
     raise AssertionError("Block sync failed")
 
-def sync_mempools(rpc_connections, wait=0.5, timeout=60):
+def sync_mempools(rpc_connections, wait=1, timeout=60):
     """
     Wait until everybody has the same transactions in their memory
     pools

From fab2e26d2033ca3c7a24f6a0ad6529fceda52ebc Mon Sep 17 00:00:00 2001
From: crowning- <crowning-@users.noreply.github.com>
Date: Thu, 18 Aug 2016 16:52:38 +0200
Subject: [PATCH 0733/1802] CDB: fix debug output

It doesn't really help to clear a variable before printing it to the debug log.
---
 src/wallet/db.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/wallet/db.cpp b/src/wallet/db.cpp
index c906785e9e2eb..cfd007ca1c807 100644
--- a/src/wallet/db.cpp
+++ b/src/wallet/db.cpp
@@ -284,7 +284,7 @@ CDB::CDB(const std::string& strFilename, const char* pszMode, bool fFlushOnClose
                 pdb = NULL;
                 --bitdb.mapFileUseCount[strFile];
                 strFile = "";
-                throw runtime_error(strprintf("CDB: Error %d, can't open database %s", ret, strFile));
+                throw runtime_error(strprintf("CDB: Error %d, can't open database %s", ret, strFilename));
             }
 
             if (fCreate && !Exists(string("version"))) {

From b4a9aa511c95a1bd0da8ae363b3b9c0b3b7afe4e Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Thu, 18 Aug 2016 16:58:04 +0200
Subject: [PATCH 0734/1802] qt: Fix random segfault when closing "Choose data
 directory" dialog

The `pickDataDirectory()` function was calling `exit(0)` to quit
the application when the user closes the dialog without choosing
a data directory.

This is a bad idea because a background thread is created (to
check free space on the drive of the currently selected datadir).
The thread is not stopped and unwound properly, resulting in a potential
race condition somewhere deep in Qt.

So replace the `exit()` by a boolean return value, and let the
stack unwind normally.
---
 src/qt/bitcoin.cpp | 3 ++-
 src/qt/intro.cpp   | 7 ++++---
 src/qt/intro.h     | 5 ++++-
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp
index 64b5c83d72a00..430e6dd0e8df8 100644
--- a/src/qt/bitcoin.cpp
+++ b/src/qt/bitcoin.cpp
@@ -578,7 +578,8 @@ int main(int argc, char *argv[])
 
     /// 5. Now that settings and translations are available, ask user for data directory
     // User language is set up: pick a data directory
-    Intro::pickDataDirectory();
+    if (!Intro::pickDataDirectory())
+        return 0;
 
     /// 6. Determine availability of data directory and parse bitcoin.conf
     /// - Do not call GetDataDir(true) before this step finishes
diff --git a/src/qt/intro.cpp b/src/qt/intro.cpp
index 6d6af54290fd5..6a5740e21d3cb 100644
--- a/src/qt/intro.cpp
+++ b/src/qt/intro.cpp
@@ -165,14 +165,14 @@ QString Intro::getDefaultDataDirectory()
     return GUIUtil::boostPathToQString(GetDefaultDataDir());
 }
 
-void Intro::pickDataDirectory()
+bool Intro::pickDataDirectory()
 {
     namespace fs = boost::filesystem;
     QSettings settings;
     /* If data directory provided on command line, no need to look at settings
        or show a picking dialog */
     if(!GetArg("-datadir", "").empty())
-        return;
+        return true;
     /* 1) Default data directory for operating system */
     QString dataDir = getDefaultDataDirectory();
     /* 2) Allow QSettings to override default dir */
@@ -190,7 +190,7 @@ void Intro::pickDataDirectory()
             if(!intro.exec())
             {
                 /* Cancel clicked */
-                exit(0);
+                return false;
             }
             dataDir = intro.getDataDirectory();
             try {
@@ -211,6 +211,7 @@ void Intro::pickDataDirectory()
      */
     if(dataDir != getDefaultDataDirectory())
         SoftSetArg("-datadir", GUIUtil::qstringToBoostPath(dataDir).string()); // use OS locale for path setting
+    return true;
 }
 
 void Intro::setStatus(int status, const QString &message, quint64 bytesAvailable)
diff --git a/src/qt/intro.h b/src/qt/intro.h
index 9e2e96dc9eca7..ee768a7ad8d1d 100644
--- a/src/qt/intro.h
+++ b/src/qt/intro.h
@@ -35,10 +35,13 @@ class Intro : public QDialog
     /**
      * Determine data directory. Let the user choose if the current one doesn't exist.
      *
+     * @returns true if a data directory was selected, false if the user cancelled the selection
+     * dialog.
+     *
      * @note do NOT call global GetDataDir() before calling this function, this
      * will cause the wrong path to be cached.
      */
-    static void pickDataDirectory();
+    static bool pickDataDirectory();
 
     /**
      * Determine default data directory for operating system.

From 5547aeb0159027912069b4773184963f54c672af Mon Sep 17 00:00:00 2001
From: instagibbs <gsanders87@gmail.com>
Date: Tue, 16 Aug 2016 15:45:42 -0400
Subject: [PATCH 0735/1802] p2psegwit.py transaction is rejected due to
 premature witness not size

---
 qa/rpc-tests/p2p-segwit.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/qa/rpc-tests/p2p-segwit.py b/qa/rpc-tests/p2p-segwit.py
index 3813743e5b912..68d8b9a006fad 100755
--- a/qa/rpc-tests/p2p-segwit.py
+++ b/qa/rpc-tests/p2p-segwit.py
@@ -302,13 +302,18 @@ def test_unnecessary_witness_before_segwit_activation(self):
         sync_blocks(self.nodes)
 
         # We'll add an unnecessary witness to this transaction that would cause
-        # it to be too large according to IsStandard.
+        # it to be non-standard, to test that violating policy with a witness before
+        # segwit activation doesn't blind a node to a transaction.  Transactions
+        # rejected for having a witness before segwit activation shouldn't be added
+        # to the rejection cache.
         tx3 = CTransaction()
         tx3.vin.append(CTxIn(COutPoint(tx2.sha256, 0), CScript([p2sh_program])))
         tx3.vout.append(CTxOut(tx2.vout[0].nValue-1000, scriptPubKey))
         tx3.wit.vtxinwit.append(CTxInWitness())
         tx3.wit.vtxinwit[0].scriptWitness.stack = [b'a'*400000]
         tx3.rehash()
+        # Note that this should be rejected for the premature witness reason,
+        # rather than a policy check, since segwit hasn't activated yet.
         self.std_node.test_transaction_acceptance(tx3, True, False, b'no-witness-yet')
 
         # If we send without witness, it should be accepted.

From 914154f0ccf2a18a273c7fdb3e80016732149303 Mon Sep 17 00:00:00 2001
From: Jonas Schnelli <dev@jonasschnelli.ch>
Date: Wed, 17 Aug 2016 14:09:47 +0200
Subject: [PATCH 0736/1802] [Qt] add HD enabled/disabled icon to the status bar

---
 contrib/debian/copyright         |   4 ++++
 src/Makefile.qt.include          |   6 ++++--
 src/qt/bitcoin.qrc               |   2 ++
 src/qt/bitcoingui.cpp            |  32 +++++++++++++++++++++----------
 src/qt/bitcoingui.h              |   9 ++++++++-
 src/qt/res/icons/hd_disabled.png | Bin 0 -> 4328 bytes
 src/qt/res/icons/hd_enabled.png  | Bin 0 -> 1889 bytes
 src/qt/res/src/hd_disabled.svg   |  26 +++++++++++++++++++++++++
 src/qt/res/src/hd_enabled.svg    |  13 +++++++++++++
 src/qt/walletmodel.cpp           |   5 +++++
 src/qt/walletmodel.h             |   2 ++
 src/qt/walletview.cpp            |   6 ++++++
 src/qt/walletview.h              |   2 ++
 src/wallet/wallet.cpp            |  15 ++++++++++-----
 src/wallet/wallet.h              |   3 +++
 15 files changed, 107 insertions(+), 18 deletions(-)
 create mode 100644 src/qt/res/icons/hd_disabled.png
 create mode 100644 src/qt/res/icons/hd_enabled.png
 create mode 100644 src/qt/res/src/hd_disabled.svg
 create mode 100644 src/qt/res/src/hd_enabled.svg

diff --git a/contrib/debian/copyright b/contrib/debian/copyright
index c039a7bae5861..cc4606ca88ad9 100644
--- a/contrib/debian/copyright
+++ b/contrib/debian/copyright
@@ -59,6 +59,10 @@ Files: src/qt/res/icons/tx_mined.png
        src/qt/res/src/mine.svg
        src/qt/res/icons/fontbigger.png
        src/qt/res/icons/fontsmaller.png
+       src/qt/res/icons/hd_disabled.png
+       src/qt/res/src/hd_disabled.svg
+       src/qt/res/icons/hd_enabled.png
+       src/qt/res/src/hd_enabled.svg
 Copyright: Jonas Schnelli
 License: Expat
 Comment:
diff --git a/src/Makefile.qt.include b/src/Makefile.qt.include
index 7730aba375c44..8947aeaca0b14 100644
--- a/src/Makefile.qt.include
+++ b/src/Makefile.qt.include
@@ -257,6 +257,8 @@ RES_ICONS = \
   qt/res/icons/filesave.png \
   qt/res/icons/fontbigger.png \
   qt/res/icons/fontsmaller.png \
+  qt/res/icons/hd_disabled.png \
+  qt/res/icons/hd_enabled.png \
   qt/res/icons/history.png \
   qt/res/icons/info.png \
   qt/res/icons/key.png \
@@ -271,14 +273,14 @@ RES_ICONS = \
   qt/res/icons/synced.png \
   qt/res/icons/transaction0.png \
   qt/res/icons/transaction2.png \
+  qt/res/icons/transaction_abandoned.png \
   qt/res/icons/transaction_conflicted.png \
   qt/res/icons/tx_inout.png \
   qt/res/icons/tx_input.png \
   qt/res/icons/tx_output.png \
   qt/res/icons/tx_mined.png \
   qt/res/icons/warning.png \
-  qt/res/icons/verify.png \
-  qt/res/icons/transaction_abandoned.png
+  qt/res/icons/verify.png
 
 BITCOIN_QT_CPP = \
   qt/bantablemodel.cpp \
diff --git a/src/qt/bitcoin.qrc b/src/qt/bitcoin.qrc
index 24b0bae3ec144..ca5b1fa67321c 100644
--- a/src/qt/bitcoin.qrc
+++ b/src/qt/bitcoin.qrc
@@ -50,6 +50,8 @@
         <file alias="fontsmaller">res/icons/fontsmaller.png</file>
         <file alias="prompticon">res/icons/chevron.png</file>
         <file alias="transaction_abandoned">res/icons/transaction_abandoned.png</file>
+        <file alias="hd_enabled">res/icons/hd_enabled.png</file>
+        <file alias="hd_disabled">res/icons/hd_disabled.png</file>
     </qresource>
     <qresource prefix="/movies">
         <file alias="spinner-000">res/movies/spinner-000.png</file>
diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp
index 2afefb733edcf..272df3fdae42c 100644
--- a/src/qt/bitcoingui.cpp
+++ b/src/qt/bitcoingui.cpp
@@ -80,7 +80,8 @@ BitcoinGUI::BitcoinGUI(const PlatformStyle *platformStyle, const NetworkStyle *n
     clientModel(0),
     walletFrame(0),
     unitDisplayControl(0),
-    labelEncryptionIcon(0),
+    labelWalletEncryptionIcon(0),
+    labelWalletHDStatusIcon(0),
     labelConnectionsIcon(0),
     labelBlocksIcon(0),
     progressBarLabel(0),
@@ -194,7 +195,8 @@ BitcoinGUI::BitcoinGUI(const PlatformStyle *platformStyle, const NetworkStyle *n
     frameBlocksLayout->setContentsMargins(3,0,3,0);
     frameBlocksLayout->setSpacing(3);
     unitDisplayControl = new UnitDisplayStatusBarControl(platformStyle);
-    labelEncryptionIcon = new QLabel();
+    labelWalletEncryptionIcon = new QLabel();
+    labelWalletHDStatusIcon = new QLabel();
     labelConnectionsIcon = new QLabel();
     labelBlocksIcon = new QLabel();
     if(enableWallet)
@@ -202,7 +204,8 @@ BitcoinGUI::BitcoinGUI(const PlatformStyle *platformStyle, const NetworkStyle *n
         frameBlocksLayout->addStretch();
         frameBlocksLayout->addWidget(unitDisplayControl);
         frameBlocksLayout->addStretch();
-        frameBlocksLayout->addWidget(labelEncryptionIcon);
+        frameBlocksLayout->addWidget(labelWalletEncryptionIcon);
+        frameBlocksLayout->addWidget(labelWalletHDStatusIcon);
     }
     frameBlocksLayout->addStretch();
     frameBlocksLayout->addWidget(labelConnectionsIcon);
@@ -988,28 +991,37 @@ bool BitcoinGUI::handlePaymentRequest(const SendCoinsRecipient& recipient)
     return false;
 }
 
+void BitcoinGUI::setHDStatus(int hdEnabled)
+{
+    labelWalletHDStatusIcon->setPixmap(platformStyle->SingleColorIcon(hdEnabled ? ":/icons/hd_enabled" : ":/icons/hd_disabled").pixmap(STATUSBAR_ICONSIZE,STATUSBAR_ICONSIZE));
+    labelWalletHDStatusIcon->setToolTip(hdEnabled ? tr("HD key generation is <b>enabled</b>") : tr("HD key generation is <b>disabled</b>"));
+
+    // eventually disable the QLabel to set its opacity to 50% 
+    labelWalletHDStatusIcon->setEnabled(hdEnabled);
+}
+
 void BitcoinGUI::setEncryptionStatus(int status)
 {
     switch(status)
     {
     case WalletModel::Unencrypted:
-        labelEncryptionIcon->hide();
+        labelWalletEncryptionIcon->hide();
         encryptWalletAction->setChecked(false);
         changePassphraseAction->setEnabled(false);
         encryptWalletAction->setEnabled(true);
         break;
     case WalletModel::Unlocked:
-        labelEncryptionIcon->show();
-        labelEncryptionIcon->setPixmap(platformStyle->SingleColorIcon(":/icons/lock_open").pixmap(STATUSBAR_ICONSIZE,STATUSBAR_ICONSIZE));
-        labelEncryptionIcon->setToolTip(tr("Wallet is <b>encrypted</b> and currently <b>unlocked</b>"));
+        labelWalletEncryptionIcon->show();
+        labelWalletEncryptionIcon->setPixmap(platformStyle->SingleColorIcon(":/icons/lock_open").pixmap(STATUSBAR_ICONSIZE,STATUSBAR_ICONSIZE));
+        labelWalletEncryptionIcon->setToolTip(tr("Wallet is <b>encrypted</b> and currently <b>unlocked</b>"));
         encryptWalletAction->setChecked(true);
         changePassphraseAction->setEnabled(true);
         encryptWalletAction->setEnabled(false); // TODO: decrypt currently not supported
         break;
     case WalletModel::Locked:
-        labelEncryptionIcon->show();
-        labelEncryptionIcon->setPixmap(platformStyle->SingleColorIcon(":/icons/lock_closed").pixmap(STATUSBAR_ICONSIZE,STATUSBAR_ICONSIZE));
-        labelEncryptionIcon->setToolTip(tr("Wallet is <b>encrypted</b> and currently <b>locked</b>"));
+        labelWalletEncryptionIcon->show();
+        labelWalletEncryptionIcon->setPixmap(platformStyle->SingleColorIcon(":/icons/lock_closed").pixmap(STATUSBAR_ICONSIZE,STATUSBAR_ICONSIZE));
+        labelWalletEncryptionIcon->setToolTip(tr("Wallet is <b>encrypted</b> and currently <b>locked</b>"));
         encryptWalletAction->setChecked(true);
         changePassphraseAction->setEnabled(true);
         encryptWalletAction->setEnabled(false); // TODO: decrypt currently not supported
diff --git a/src/qt/bitcoingui.h b/src/qt/bitcoingui.h
index 12e7702ed82d6..41770929b4706 100644
--- a/src/qt/bitcoingui.h
+++ b/src/qt/bitcoingui.h
@@ -82,7 +82,8 @@ class BitcoinGUI : public QMainWindow
     WalletFrame *walletFrame;
 
     UnitDisplayStatusBarControl *unitDisplayControl;
-    QLabel *labelEncryptionIcon;
+    QLabel *labelWalletEncryptionIcon;
+    QLabel *labelWalletHDStatusIcon;
     QLabel *labelConnectionsIcon;
     QLabel *labelBlocksIcon;
     QLabel *progressBarLabel;
@@ -169,6 +170,12 @@ public Q_SLOTS:
     */
     void setEncryptionStatus(int status);
 
+    /** Set the hd-enabled status as shown in the UI.
+     @param[in] status            current hd enabled status
+     @see WalletModel::EncryptionStatus
+     */
+    void setHDStatus(int hdEnabled);
+
     bool handlePaymentRequest(const SendCoinsRecipient& recipient);
 
     /** Show incoming transaction notification for new transactions. */
diff --git a/src/qt/res/icons/hd_disabled.png b/src/qt/res/icons/hd_disabled.png
new file mode 100644
index 0000000000000000000000000000000000000000..687b6d2e38e9e3f8955072574ce644735a249982
GIT binary patch
literal 4328
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
HpS|$k8tbb^

literal 0
HcmV?d00001

diff --git a/src/qt/res/icons/hd_enabled.png b/src/qt/res/icons/hd_enabled.png
new file mode 100644
index 0000000000000000000000000000000000000000..568dde1cd1c1dba2dc1d575365ecd89aa7e55f68
GIT binary patch
literal 1889
zcmb_dYfuwc6kZ@AP*Lea<sn@{si+~F4FpI8Nk|BfAs9j|QKAr&1yV^i>@Frmh+xa8
zbwEae`r;v0d=zN4ty6q}jt?jxR%DP@E!N3cD+mQgu~6&=0sEu$PrG+_&pmg}_nmX^
z`F3`XI40cD!Nmap0LRD(frPX<mdDPPd|z9uXd#U=5hf$z&}2fdzz~3^Lbo7bq(+f~
zNDzf8GyMl72mow6)lwND6Gd~BsD`ev#Lx{I9f<~jpb&#jq1=iP;1(oBtqrCQU2LF&
zYE>{bo+V<4bbKUL9bv?fIAe@dY22!0tEeGs!5{;NB+wv)0yJpSv^d8QOr7H8kaNp2
zL<Ofph^@iY*G0)hVvvtw2*{$de3T3(3<j|2Fw2h(!!(e|fPEpD0WsM=FwF4_;K2Ui
z^hG7JVX9<~L?E2bMS8*1RD#fPAV{y*)Ahb|6ib0%Hk%DGm=KfcLq_=EnOZ_&@X_L)
zGYkR*S7K@%p+>c!g;B8u%^-rQWTmgSpwZ3JYVqk~A`c8QD0C1^XIQp06DSh>d#FY;
z8;uhZ<W0T*NQ_G}bqFLua5Mu`l8sCDw4~B;_!y!fP)v%VX)~uNPDKe6PepYgpAUMA
z6iT($;;)<nh(w%7Elw!3N+ePcOeHDkYPE{vCkPD?@R?yOKAQ!@Vg7-EJboC{PZ&zB
z@!0-hGgtwt%+MfOVg{>vgB8w+wP-=3BQpySOuY?J2{BXyPVJeap1T(QoP5(*)!elR
z=EOo|F_5LRf9v$j5-A_cbXK>dGpl?=OUfN1b$#9b#5no6bVLexQbW%`X~OP>u|VVP
zbM%^){RXf`PIYRpl1GL1Q1b%XF9d-;nI4e4*Ne*MJgqr*zI*ld58Ackp--;b)TL4P
z4<mccqan9~4823GS)<v$DW--$LI(UFwLZIrCbu1B<5g8MnoASJvdaM`9PEJqI!@nk
z=yyqI^;q{#&$EXGy=T9_Zq&0oUA^X+FOSITmet~A%!>B$Z%X(Ts}|V%ezc*YdeN&_
z>+5RelBeD~4%{y^4eXV|lJ1H=>1OZVqK%ZM6>&v(qdq_9W;N2{XFiWbJAVqiyy5@u
z&}z@cU_)!X`^w`^q!srRaVSkte)CIADhT0b8H*CLX>sLOjQ3XEYTiIOMei-fy(T-)
zKRn4h^d(Jlxaca}nH^epBCG%HLX)vrukdW!ru@p@6~9=#&*_O<m0N{l;U<S;3*w4>
zot|`6M+<Y(MmKd=ek<_qP3+zSm~@hE*JE<rz~%yr0>9|X|8a>d4={-r4ACY7OA_*d
z$ze%dzbrYdsMkn|fNBa_7O{8%u(cs{SNou>>Q07N@vrvP`;6JYeG<toyy9;gz@~+)
z&bN*h*J9l8%Db^Swsb4g15Twe$a?I?>PB;;M^0jve|E^nljXT~{qHBbl`Jm+Chr_j
zne7TqCXid7?hJSA1zs+x=--&>#o0NKv}?Y7$C|i92W_n6_pQc?gjSo6s4nar6rWjg
zTVJ2Op#zy{80{C+tsW;|csTNtUH{VBbuY?1a}sH|y#6h#iL3SVE?qwxy~29zny@k9
zO3H_ZZ8<<$-}q2E4TqXPTMU+V>22iYgNZyKM0RRGPg90F=|S%EL&xR5PnQ!lvGKcs
z$BNPsv9nqB)YV#br29eaj&8yBhN0bies4NxPyHn>C91rx#a*Y2X3VcBbveH>XfWKI
zj|H~f^yFs6<ej!%6W!{>ms_7}i8TxRq85Wky6in)6d$Kjn%tk8cAQ9er56BYNhkLw
zo|&M<=h+oH4(M$b9!^rNKX&vzd?~3Uz0H6dcQ8`g<_uo$dax-$#2EW7_;j((HezXm
zXjlWRNl8i=(^rDrjIZyd_vVgvQc$4x?xjC-Iu2m|!%?}nZ<^gGT!6g)j}hVVin0uN
XRMO0!1b*IZ`RPT5#RzIclXm_E9we}T

literal 0
HcmV?d00001

diff --git a/src/qt/res/src/hd_disabled.svg b/src/qt/res/src/hd_disabled.svg
new file mode 100644
index 0000000000000..035f4431c7a92
--- /dev/null
+++ b/src/qt/res/src/hd_disabled.svg
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 18.1.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Ebene_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 595.3 841.9" enable-background="new 0 0 595.3 841.9" xml:space="preserve">
+<g>
+	<path d="M81.3,336.5v66.8h70.4v-66.8H190v174h-38.3v-75.1H81.3v75.1H43v-174H81.3z"/>
+	<path d="M298.7,336.5c11.2,0,21.6,1.8,31.3,5.4c9.7,3.6,18,8.9,25.1,16.1c7.1,7.2,12.6,16.1,16.6,26.8c4,10.7,6,23.3,6,37.8
+		c0,12.7-1.6,24.4-4.9,35.1c-3.3,10.7-8.2,20-14.7,27.8c-6.6,7.8-14.8,13.9-24.6,18.4c-9.8,4.5-21.4,6.7-34.7,6.7h-75.1v-174H298.7z
+		 M296,478.3c5.5,0,10.9-0.9,16.1-2.7c5.2-1.8,9.8-4.8,13.9-8.9c4.1-4.1,7.3-9.5,9.7-16.2c2.4-6.7,3.7-14.8,3.7-24.4
+		c0-8.8-0.9-16.7-2.6-23.8s-4.5-13.1-8.4-18.2c-3.9-5-9.1-8.9-15.5-11.6c-6.4-2.7-14.3-4-23.8-4h-27.3v109.7H296z"/>
+</g>
+<g>
+	<g>
+		<line x1="32" y1="555.9" x2="358" y2="293.9"/>
+	</g>
+	<g>
+		<path fill="#FFFFFF" d="M32,580.9c-7.3,0-14.6-3.2-19.5-9.3c-8.6-10.8-6.9-26.5,3.8-35.1l326-262c10.8-8.6,26.5-6.9,35.1,3.8
+			c8.6,10.8,6.9,26.5-3.8,35.1l-326,262C43,579.1,37.5,580.9,32,580.9z"/>
+	</g>
+	<g>
+		<path d="M32,573.9c-5.3,0-10.5-2.3-14-6.7c-6.2-7.7-5-19.1,2.8-25.3l326-262c7.8-6.2,19.1-5,25.3,2.8c6.2,7.7,5,19.1-2.8,25.3
+			l-326,262C40,572.6,36,573.9,32,573.9z"/>
+	</g>
+</g>
+</svg>
diff --git a/src/qt/res/src/hd_enabled.svg b/src/qt/res/src/hd_enabled.svg
new file mode 100644
index 0000000000000..cbaa16f8f0be3
--- /dev/null
+++ b/src/qt/res/src/hd_enabled.svg
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 18.1.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Ebene_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 595.3 841.9" enable-background="new 0 0 595.3 841.9" xml:space="preserve">
+<g>
+	<path d="M81.3,336.5v66.8h70.4v-66.8H190v174h-38.3v-75.1H81.3v75.1H43v-174H81.3z"/>
+	<path d="M298.7,336.5c11.2,0,21.6,1.8,31.3,5.4c9.7,3.6,18,8.9,25.1,16.1c7.1,7.2,12.6,16.1,16.6,26.8c4,10.7,6,23.3,6,37.8
+		c0,12.7-1.6,24.4-4.9,35.1c-3.3,10.7-8.2,20-14.7,27.8c-6.6,7.8-14.8,13.9-24.6,18.4c-9.8,4.5-21.4,6.7-34.7,6.7h-75.1v-174H298.7z
+		 M296,478.3c5.5,0,10.9-0.9,16.1-2.7c5.2-1.8,9.8-4.8,13.9-8.9c4.1-4.1,7.3-9.5,9.7-16.2c2.4-6.7,3.7-14.8,3.7-24.4
+		c0-8.8-0.9-16.7-2.6-23.8s-4.5-13.1-8.4-18.2c-3.9-5-9.1-8.9-15.5-11.6c-6.4-2.7-14.3-4-23.8-4h-27.3v109.7H296z"/>
+</g>
+</svg>
diff --git a/src/qt/walletmodel.cpp b/src/qt/walletmodel.cpp
index 3867310cd6857..ae7efc7a0d40b 100644
--- a/src/qt/walletmodel.cpp
+++ b/src/qt/walletmodel.cpp
@@ -683,3 +683,8 @@ bool WalletModel::abandonTransaction(uint256 hash) const
     LOCK2(cs_main, wallet->cs_wallet);
     return wallet->AbandonTransaction(hash);
 }
+
+bool WalletModel::hdEnabled() const
+{
+    return wallet->IsHDEnabled();
+}
diff --git a/src/qt/walletmodel.h b/src/qt/walletmodel.h
index e5470bf618eea..a15ecf899b87a 100644
--- a/src/qt/walletmodel.h
+++ b/src/qt/walletmodel.h
@@ -203,6 +203,8 @@ class WalletModel : public QObject
     bool transactionCanBeAbandoned(uint256 hash) const;
     bool abandonTransaction(uint256 hash) const;
 
+    bool hdEnabled() const;
+
 private:
     CWallet *wallet;
     bool fHaveWatchOnly;
diff --git a/src/qt/walletview.cpp b/src/qt/walletview.cpp
index 6ce98ef160a5c..495ebfd834bfc 100644
--- a/src/qt/walletview.cpp
+++ b/src/qt/walletview.cpp
@@ -98,6 +98,9 @@ void WalletView::setBitcoinGUI(BitcoinGUI *gui)
 
         // Pass through transaction notifications
         connect(this, SIGNAL(incomingTransaction(QString,int,CAmount,QString,QString,QString)), gui, SLOT(incomingTransaction(QString,int,CAmount,QString,QString,QString)));
+
+        // Connect HD enabled state signal 
+        connect(this, SIGNAL(hdEnabledStatusChanged(int)), gui, SLOT(setHDStatus(int)));
     }
 }
 
@@ -130,6 +133,9 @@ void WalletView::setWalletModel(WalletModel *walletModel)
         connect(walletModel, SIGNAL(encryptionStatusChanged(int)), this, SIGNAL(encryptionStatusChanged(int)));
         updateEncryptionStatus();
 
+        // update HD status
+        Q_EMIT hdEnabledStatusChanged(walletModel->hdEnabled());
+
         // Balloon pop-up for new transaction
         connect(walletModel->getTransactionTableModel(), SIGNAL(rowsInserted(QModelIndex,int,int)),
                 this, SLOT(processNewTransaction(QModelIndex,int,int)));
diff --git a/src/qt/walletview.h b/src/qt/walletview.h
index dbb289f425466..2045605954d23 100644
--- a/src/qt/walletview.h
+++ b/src/qt/walletview.h
@@ -117,6 +117,8 @@ public Q_SLOTS:
     void message(const QString &title, const QString &message, unsigned int style);
     /** Encryption status of wallet changed */
     void encryptionStatusChanged(int status);
+    /** HD-Enabled status of wallet changed (only possible during startup) */
+    void hdEnabledStatusChanged(int hdEnabled);
     /** Notify that a new transaction appeared */
     void incomingTransaction(const QString& date, int unit, const CAmount& amount, const QString& type, const QString& address, const QString& label);
 };
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index 888aa029a3dcd..22a6f9087cb24 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -98,7 +98,7 @@ CPubKey CWallet::GenerateNewKey()
     CKeyMetadata metadata(nCreationTime);
 
     // use HD key derivation if HD was enabled during wallet creation
-    if (!hdChain.masterKeyID.IsNull()) {
+    if (IsHDEnabled()) {
         // for now we use a fixed keypath scheme of m/0'/0'/k
         CKey key;                      //master key seed (256bit)
         CExtKey masterKey;             //hd master key
@@ -628,7 +628,7 @@ bool CWallet::EncryptWallet(const SecureString& strWalletPassphrase)
         Unlock(strWalletPassphrase);
 
         // if we are using HD, replace the HD master key (seed) with a new one
-        if (!hdChain.masterKeyID.IsNull()) {
+        if (IsHDEnabled()) {
             CKey key;
             CPubKey masterPubKey = GenerateNewHDMasterKey();
             if (!SetHDMasterKey(masterPubKey))
@@ -1233,6 +1233,11 @@ bool CWallet::SetHDChain(const CHDChain& chain, bool memonly)
     return true;
 }
 
+bool CWallet::IsHDEnabled()
+{
+    return !hdChain.masterKeyID.IsNull();
+}
+
 int64_t CWalletTx::GetTxTime() const
 {
     int64_t n = nTimeSmart;
@@ -3322,7 +3327,7 @@ bool CWallet::InitLoadWallet()
     if (fFirstRun)
     {
         // Create new keyUser and set as default key
-        if (GetBoolArg("-usehd", DEFAULT_USE_HD_WALLET) && walletInstance->hdChain.masterKeyID.IsNull()) {
+        if (GetBoolArg("-usehd", DEFAULT_USE_HD_WALLET) && !walletInstance->IsHDEnabled()) {
             // generate a new master key
             CKey key;
             CPubKey masterPubKey = walletInstance->GenerateNewHDMasterKey();
@@ -3340,9 +3345,9 @@ bool CWallet::InitLoadWallet()
     }
     else if (mapArgs.count("-usehd")) {
         bool useHD = GetBoolArg("-usehd", DEFAULT_USE_HD_WALLET);
-        if (!walletInstance->hdChain.masterKeyID.IsNull() && !useHD)
+        if (walletInstance->IsHDEnabled() && !useHD)
             return InitError(strprintf(_("Error loading %s: You can't disable HD on a already existing HD wallet"), walletFile));
-        if (walletInstance->hdChain.masterKeyID.IsNull() && useHD)
+        if (!walletInstance->IsHDEnabled() && useHD)
             return InitError(strprintf(_("Error loading %s: You can't enable HD on a already existing non-HD wallet"), walletFile));
     }
 
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
index 952acd1535abf..30f092e9a812d 100644
--- a/src/wallet/wallet.h
+++ b/src/wallet/wallet.h
@@ -902,6 +902,9 @@ class CWallet : public CCryptoKeyStore, public CValidationInterface
     bool SetHDChain(const CHDChain& chain, bool memonly);
     const CHDChain& GetHDChain() { return hdChain; }
 
+    /* Returns true if HD is enabled */
+    bool IsHDEnabled();
+
     /* Generates a new HD master key (will not be activated) */
     CPubKey GenerateNewHDMasterKey();
     

From fa3d9740099c8513f9942983f135f58890e62cb5 Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Mon, 13 Jun 2016 12:10:46 +0200
Subject: [PATCH 0737/1802] [doc] Update git-subtree-check.sh README

---
 contrib/devtools/README.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/contrib/devtools/README.md b/contrib/devtools/README.md
index bb8b9246b8781..af5c000b0305e 100644
--- a/contrib/devtools/README.md
+++ b/contrib/devtools/README.md
@@ -51,8 +51,9 @@ maintained:
 * for `src/secp256k1`: https://github.com/bitcoin-core/secp256k1.git (branch master)
 * for `src/leveldb`: https://github.com/bitcoin-core/leveldb.git (branch bitcoin-fork)
 * for `src/univalue`: https://github.com/bitcoin-core/univalue.git (branch master)
+* for `src/crypto/ctaes`: https://github.com/bitcoin-core/ctaes.git (branch master)
 
-Usage: `git-subtree-check.sh DIR COMMIT`
+Usage: `git-subtree-check.sh DIR (COMMIT)`
 
 `COMMIT` may be omitted, in which case `HEAD` is used.
 

From 7e5d94df1fb09ed7ee7ed50032f876972ef39489 Mon Sep 17 00:00:00 2001
From: Jonas Schnelli <dev@jonasschnelli.ch>
Date: Mon, 1 Aug 2016 15:18:15 +0200
Subject: [PATCH 0738/1802] [Wallet] Trivial cleanup of HD wallet changes

---
 src/wallet/wallet.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index ee9254050ce78..e2dea521214b9 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -1200,7 +1200,7 @@ CPubKey CWallet::GenerateNewHDMasterKey()
 
         // write the key&metadata to the database
         if (!AddKeyPubKey(key, pubkey))
-            throw std::runtime_error("CWallet::GenerateNewKey(): AddKey failed");
+            throw std::runtime_error(std::string(__func__)+": AddKeyPubKey failed");
     }
 
     return pubkey;
@@ -3323,7 +3323,6 @@ bool CWallet::InitLoadWallet()
         // Create new keyUser and set as default key
         if (GetBoolArg("-usehd", DEFAULT_USE_HD_WALLET) && walletInstance->hdChain.masterKeyID.IsNull()) {
             // generate a new master key
-            CKey key;
             CPubKey masterPubKey = walletInstance->GenerateNewHDMasterKey();
             if (!walletInstance->SetHDMasterKey(masterPubKey))
                 throw std::runtime_error("CWallet::GenerateNewKey(): Storing master key failed");

From fa785d121152c652d0704ac32ce8611262e609d2 Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Fri, 19 Aug 2016 18:31:35 +0200
Subject: [PATCH 0739/1802] Use __func__ to get function name for output
 printing

---
 src/main.cpp                   |  2 +-
 src/primitives/transaction.cpp |  2 +-
 src/wallet/wallet.cpp          | 34 +++++++++++++++++-----------------
 src/wallet/walletdb.cpp        |  4 ++--
 4 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index 46118fff81eb0..a6bf96f3e450a 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -3954,7 +3954,7 @@ CBlockIndex * InsertBlockIndex(uint256 hash)
     // Create new
     CBlockIndex* pindexNew = new CBlockIndex();
     if (!pindexNew)
-        throw runtime_error("LoadBlockIndex(): new CBlockIndex failed");
+        throw runtime_error(std::string(__func__) + ": new CBlockIndex failed");
     mi = mapBlockIndex.insert(make_pair(hash, pindexNew)).first;
     pindexNew->phashBlock = &((*mi).first);
 
diff --git a/src/primitives/transaction.cpp b/src/primitives/transaction.cpp
index 8d6380564365e..2fdc59ea07767 100644
--- a/src/primitives/transaction.cpp
+++ b/src/primitives/transaction.cpp
@@ -100,7 +100,7 @@ CAmount CTransaction::GetValueOut() const
     {
         nValueOut += it->nValue;
         if (!MoneyRange(it->nValue) || !MoneyRange(nValueOut))
-            throw std::runtime_error("CTransaction::GetValueOut(): value out of range");
+            throw std::runtime_error(std::string(__func__) + ": value out of range");
     }
     return nValueOut;
 }
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index e2dea521214b9..cb414cec1d505 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -108,7 +108,7 @@ CPubKey CWallet::GenerateNewKey()
 
         // try to get the master key
         if (!GetKey(hdChain.masterKeyID, key))
-            throw std::runtime_error("CWallet::GenerateNewKey(): Master key not found");
+            throw std::runtime_error(std::string(__func__) + ": Master key not found");
 
         masterKey.SetMaster(key.begin(), key.size());
 
@@ -135,7 +135,7 @@ CPubKey CWallet::GenerateNewKey()
 
         // update the chain model in the database
         if (!CWalletDB(strWalletFile).WriteHDChain(hdChain))
-            throw std::runtime_error("CWallet::GenerateNewKey(): Writing HD chain model failed");
+            throw std::runtime_error(std::string(__func__) + ": Writing HD chain model failed");
     } else {
         secret.MakeNewKey(fCompressed);
     }
@@ -152,7 +152,7 @@ CPubKey CWallet::GenerateNewKey()
         nTimeFirstKey = nCreationTime;
 
     if (!AddKeyPubKey(secret, pubkey))
-        throw std::runtime_error("CWallet::GenerateNewKey(): AddKey failed");
+        throw std::runtime_error(std::string(__func__) + ": AddKey failed");
     return pubkey;
 }
 
@@ -1094,7 +1094,7 @@ isminetype CWallet::IsMine(const CTxOut& txout) const
 CAmount CWallet::GetCredit(const CTxOut& txout, const isminefilter& filter) const
 {
     if (!MoneyRange(txout.nValue))
-        throw std::runtime_error("CWallet::GetCredit(): value out of range");
+        throw std::runtime_error(std::string(__func__) + ": value out of range");
     return ((IsMine(txout) & filter) ? txout.nValue : 0);
 }
 
@@ -1123,7 +1123,7 @@ bool CWallet::IsChange(const CTxOut& txout) const
 CAmount CWallet::GetChange(const CTxOut& txout) const
 {
     if (!MoneyRange(txout.nValue))
-        throw std::runtime_error("CWallet::GetChange(): value out of range");
+        throw std::runtime_error(std::string(__func__) + ": value out of range");
     return (IsChange(txout) ? txout.nValue : 0);
 }
 
@@ -1147,7 +1147,7 @@ CAmount CWallet::GetDebit(const CTransaction& tx, const isminefilter& filter) co
     {
         nDebit += GetDebit(txin, filter);
         if (!MoneyRange(nDebit))
-            throw std::runtime_error("CWallet::GetDebit(): value out of range");
+            throw std::runtime_error(std::string(__func__) + ": value out of range");
     }
     return nDebit;
 }
@@ -1159,7 +1159,7 @@ CAmount CWallet::GetCredit(const CTransaction& tx, const isminefilter& filter) c
     {
         nCredit += GetCredit(txout, filter);
         if (!MoneyRange(nCredit))
-            throw std::runtime_error("CWallet::GetCredit(): value out of range");
+            throw std::runtime_error(std::string(__func__) + ": value out of range");
     }
     return nCredit;
 }
@@ -1171,7 +1171,7 @@ CAmount CWallet::GetChange(const CTransaction& tx) const
     {
         nChange += GetChange(txout);
         if (!MoneyRange(nChange))
-            throw std::runtime_error("CWallet::GetChange(): value out of range");
+            throw std::runtime_error(std::string(__func__) + ": value out of range");
     }
     return nChange;
 }
@@ -1200,7 +1200,7 @@ CPubKey CWallet::GenerateNewHDMasterKey()
 
         // write the key&metadata to the database
         if (!AddKeyPubKey(key, pubkey))
-            throw std::runtime_error(std::string(__func__)+": AddKeyPubKey failed");
+            throw std::runtime_error(std::string(__func__) + ": AddKeyPubKey failed");
     }
 
     return pubkey;
@@ -1227,7 +1227,7 @@ bool CWallet::SetHDChain(const CHDChain& chain, bool memonly)
 {
     LOCK(cs_wallet);
     if (!memonly && !CWalletDB(strWalletFile).WriteHDChain(chain))
-        throw runtime_error("AddHDChain(): writing chain failed");
+        throw runtime_error(std::string(__func__) + ": writing chain failed");
 
     hdChain = chain;
     return true;
@@ -2706,7 +2706,7 @@ bool CWallet::TopUpKeyPool(unsigned int kpSize)
             if (!setKeyPool.empty())
                 nEnd = *(--setKeyPool.end()) + 1;
             if (!walletdb.WritePool(nEnd, CKeyPool(GenerateNewKey())))
-                throw runtime_error("TopUpKeyPool(): writing generated key failed");
+                throw runtime_error(std::string(__func__) + ": writing generated key failed");
             setKeyPool.insert(nEnd);
             LogPrintf("keypool added key %d, size=%u\n", nEnd, setKeyPool.size());
         }
@@ -2733,9 +2733,9 @@ void CWallet::ReserveKeyFromKeyPool(int64_t& nIndex, CKeyPool& keypool)
         nIndex = *(setKeyPool.begin());
         setKeyPool.erase(setKeyPool.begin());
         if (!walletdb.ReadPool(nIndex, keypool))
-            throw runtime_error("ReserveKeyFromKeyPool(): read failed");
+            throw runtime_error(std::string(__func__) + ": read failed");
         if (!HaveKey(keypool.vchPubKey.GetID()))
-            throw runtime_error("ReserveKeyFromKeyPool(): unknown key in key pool");
+            throw runtime_error(std::string(__func__) + ": unknown key in key pool");
         assert(keypool.vchPubKey.IsValid());
         LogPrintf("keypool reserve %d\n", nIndex);
     }
@@ -2794,7 +2794,7 @@ int64_t CWallet::GetOldestKeyPoolTime()
     CWalletDB walletdb(strWalletFile);
     int64_t nIndex = *(setKeyPool.begin());
     if (!walletdb.ReadPool(nIndex, keypool))
-        throw runtime_error("GetOldestKeyPoolTime(): read oldest key in keypool failed");
+        throw runtime_error(std::string(__func__) + ": read oldest key in keypool failed");
     assert(keypool.vchPubKey.IsValid());
     return keypool.nTime;
 }
@@ -3021,11 +3021,11 @@ void CWallet::GetAllReserveKeys(set<CKeyID>& setAddress) const
     {
         CKeyPool keypool;
         if (!walletdb.ReadPool(id, keypool))
-            throw runtime_error("GetAllReserveKeyHashes(): read failed");
+            throw runtime_error(std::string(__func__) + ": read failed");
         assert(keypool.vchPubKey.IsValid());
         CKeyID keyID = keypool.vchPubKey.GetID();
         if (!HaveKey(keyID))
-            throw runtime_error("GetAllReserveKeyHashes(): unknown key in key pool");
+            throw runtime_error(std::string(__func__) + ": unknown key in key pool");
         setAddress.insert(keyID);
     }
 }
@@ -3325,7 +3325,7 @@ bool CWallet::InitLoadWallet()
             // generate a new master key
             CPubKey masterPubKey = walletInstance->GenerateNewHDMasterKey();
             if (!walletInstance->SetHDMasterKey(masterPubKey))
-                throw std::runtime_error("CWallet::GenerateNewKey(): Storing master key failed");
+                throw std::runtime_error(std::string(__func__) + ": Storing master key failed");
         }
         CPubKey newDefaultKey;
         if (walletInstance->GetKeyFromPool(newDefaultKey)) {
diff --git a/src/wallet/walletdb.cpp b/src/wallet/walletdb.cpp
index 543522ca6485c..f824492cb6fd4 100644
--- a/src/wallet/walletdb.cpp
+++ b/src/wallet/walletdb.cpp
@@ -215,7 +215,7 @@ void CWalletDB::ListAccountCreditDebit(const string& strAccount, list<CAccountin
 
     Dbc* pcursor = GetCursor();
     if (!pcursor)
-        throw runtime_error("CWalletDB::ListAccountCreditDebit(): cannot create DB cursor");
+        throw runtime_error(std::string(__func__) + ": cannot create DB cursor");
     unsigned int fFlags = DB_SET_RANGE;
     while (true)
     {
@@ -231,7 +231,7 @@ void CWalletDB::ListAccountCreditDebit(const string& strAccount, list<CAccountin
         else if (ret != 0)
         {
             pcursor->close();
-            throw runtime_error("CWalletDB::ListAccountCreditDebit(): error scanning DB");
+            throw runtime_error(std::string(__func__) + ": error scanning DB");
         }
 
         // Unserialize

From faaec1377c6975a7c427bac958b67a0aba9e1694 Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Fri, 19 Aug 2016 22:41:09 +0200
Subject: [PATCH 0740/1802] [qa] Remove unused code

---
 qa/pull-tester/rpc-tests.py       | 2 --
 qa/rpc-tests/importprunedfunds.py | 2 +-
 qa/rpc-tests/rpcbind_test.py      | 6 ++----
 qa/rpc-tests/segwit.py            | 2 --
 4 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/qa/pull-tester/rpc-tests.py b/qa/pull-tester/rpc-tests.py
index a0951f31a0ecb..daaa7782f9356 100755
--- a/qa/pull-tester/rpc-tests.py
+++ b/qa/pull-tester/rpc-tests.py
@@ -77,8 +77,6 @@
 #Set env vars
 if "BITCOIND" not in os.environ:
     os.environ["BITCOIND"] = BUILDDIR + '/src/bitcoind' + EXEEXT
-if "BITCOINCLI" not in os.environ:
-    os.environ["BITCOINCLI"] = BUILDDIR + '/src/bitcoin-cli' + EXEEXT
 
 if EXEEXT == ".exe" and "-win" not in opts:
     # https://github.com/bitcoin/bitcoin/commit/d52802551752140cf41f0d9a225a43e84404d3e9
diff --git a/qa/rpc-tests/importprunedfunds.py b/qa/rpc-tests/importprunedfunds.py
index d86f51b7f3aaf..eb3c11b4d85db 100755
--- a/qa/rpc-tests/importprunedfunds.py
+++ b/qa/rpc-tests/importprunedfunds.py
@@ -5,7 +5,7 @@
 
 from test_framework.test_framework import BitcoinTestFramework
 from test_framework.util import *
-import decimal
+
 
 class ImportPrunedFundsTest(BitcoinTestFramework):
 
diff --git a/qa/rpc-tests/rpcbind_test.py b/qa/rpc-tests/rpcbind_test.py
index bf1cc8712611a..3ac32140ba898 100755
--- a/qa/rpc-tests/rpcbind_test.py
+++ b/qa/rpc-tests/rpcbind_test.py
@@ -5,13 +5,11 @@
 
 # Test for -rpcbind, as well as -rpcallowip and -rpcconnect
 
-import tempfile
-import traceback
-
 from test_framework.test_framework import BitcoinTestFramework
 from test_framework.util import *
 from test_framework.netutil import *
 
+
 class RPCBindTest(BitcoinTestFramework):
 
     def __init__(self):
@@ -109,4 +107,4 @@ def run_test(self):
             pass
 
 if __name__ == '__main__':
-    RPCBindTest ().main ()
+    RPCBindTest().main()
diff --git a/qa/rpc-tests/segwit.py b/qa/rpc-tests/segwit.py
index da82b09901611..745a1d47508cb 100755
--- a/qa/rpc-tests/segwit.py
+++ b/qa/rpc-tests/segwit.py
@@ -10,8 +10,6 @@
 from test_framework.test_framework import BitcoinTestFramework
 from test_framework.util import *
 from test_framework.mininode import sha256, ripemd160
-import os
-import shutil
 
 NODE_0 = 0
 NODE_1 = 1

From 4207630f5aef4e1937052eb96be7209e51d1371d Mon Sep 17 00:00:00 2001
From: Daniel Kraft <d@domob.eu>
Date: Sat, 20 Aug 2016 10:28:06 +0200
Subject: [PATCH 0741/1802] trivial: remove unused variable

Remove the unused variable "blockTmp" in CMerkleTx::SetMerkleBranch.  It
was previously used to read the block from disk if not provided as
argument, but is no longer needed.
---
 src/wallet/wallet.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index e19c40dbd1e16..bad82771703c4 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -3534,7 +3534,6 @@ CWalletKey::CWalletKey(int64_t nExpires)
 int CMerkleTx::SetMerkleBranch(const CBlockIndex* pindex, int posInBlock)
 {
     AssertLockHeld(cs_main);
-    CBlock blockTmp;
 
     // Update the tx's hashBlock
     hashBlock = pindex->GetBlockHash();

From 8680d3aa800aa4fab8c321b92cc7f3fa97a8a0a3 Mon Sep 17 00:00:00 2001
From: Patrick Strateman <patrick.strateman@gmail.com>
Date: Fri, 19 Aug 2016 15:50:48 -0700
Subject: [PATCH 0742/1802] Move wallet initialization logic from AppInit2 to
 CWallet::InitLoadWallet

---
 src/init.cpp          | 12 ------------
 src/wallet/wallet.cpp | 10 ++++++++++
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/src/init.cpp b/src/init.cpp
index a15fe2e13b94f..1547afe6cfd95 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -1438,15 +1438,6 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
     //// debug print
     LogPrintf("mapBlockIndex.size() = %u\n",   mapBlockIndex.size());
     LogPrintf("nBestHeight = %d\n",                   chainActive.Height());
-#ifdef ENABLE_WALLET
-    if (pwalletMain) {
-        LOCK(pwalletMain->cs_wallet);
-        LogPrintf("setKeyPool.size() = %u\n",      pwalletMain->GetKeyPoolSize());
-        LogPrintf("mapWallet.size() = %u\n",       pwalletMain->mapWallet.size());
-        LogPrintf("mapAddressBook.size() = %u\n",  pwalletMain->mapAddressBook.size());
-    }
-#endif
-
     if (GetBoolArg("-listenonion", DEFAULT_LISTEN_ONION))
         StartTorControl(threadGroup, scheduler);
 
@@ -1459,9 +1450,6 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
 
 #ifdef ENABLE_WALLET
     if (pwalletMain) {
-        // Add wallet transactions that aren't already in a block to mapTransactions
-        pwalletMain->ReacceptWalletTransactions();
-
         // Run a thread to flush wallet periodically
         threadGroup.create_thread(boost::bind(&ThreadFlushWalletDB, boost::ref(pwalletMain->strWalletFile)));
     }
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index ee9254050ce78..04f08e38c3e69 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -3411,7 +3411,17 @@ bool CWallet::InitLoadWallet()
     }
     walletInstance->SetBroadcastTransactions(GetBoolArg("-walletbroadcast", DEFAULT_WALLETBROADCAST));
 
+    {
+        LOCK(walletInstance->cs_wallet);
+        LogPrintf("setKeyPool.size() = %u\n",      walletInstance->GetKeyPoolSize());
+        LogPrintf("mapWallet.size() = %u\n",       walletInstance->mapWallet.size());
+        LogPrintf("mapAddressBook.size() = %u\n",  walletInstance->mapAddressBook.size());
+    }
+    // Add wallet transactions that aren't already in a block to mapTransactions
+    walletInstance->ReacceptWalletTransactions();
+
     pwalletMain = walletInstance;
+
     return true;
 }
 

From fab1f9272c4999cd505f1e56eb348b5eb4bb38cb Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Sun, 21 Aug 2016 21:29:18 +0200
Subject: [PATCH 0743/1802] [contrib] verifybinaries: Adjust parsing to new rc
 path

---
 contrib/verifybinaries/README.md | 1 +
 contrib/verifybinaries/verify.sh | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/contrib/verifybinaries/README.md b/contrib/verifybinaries/README.md
index 8970f3daa406a..d43a60ca0f5b0 100644
--- a/contrib/verifybinaries/README.md
+++ b/contrib/verifybinaries/README.md
@@ -10,4 +10,5 @@ Usage:
 ```sh
 ./verify.sh bitcoin-core-0.11.2
 ./verify.sh bitcoin-core-0.12.0
+./verify.sh bitcoin-core-0.13.0-rc3
 ```
diff --git a/contrib/verifybinaries/verify.sh b/contrib/verifybinaries/verify.sh
index 657c3bd33c2e2..40759c36bc6cf 100755
--- a/contrib/verifybinaries/verify.sh
+++ b/contrib/verifybinaries/verify.sh
@@ -14,11 +14,11 @@ function clean_up {
    done
 }
 
-WORKINGDIR="/tmp/bitcoin"
+WORKINGDIR="/tmp/bitcoin_verify_binaries"
 TMPFILE="hashes.tmp"
 
 SIGNATUREFILENAME="SHA256SUMS.asc"
-RCSUBDIR="test/"
+RCSUBDIR="test"
 BASEDIR="https://bitcoin.org/bin/"
 VERSIONPREFIX="bitcoin-core-"
 RCVERSIONSTRING="rc"
@@ -43,7 +43,7 @@ if [ -n "$1" ]; then
    #  and simultaneously add RCSUBDIR to BASEDIR, where we will look for SIGNATUREFILENAME
    if [[ $VERSION == *"$RCVERSIONSTRING"* ]]; then
       BASEDIR="$BASEDIR${VERSION/%-$RCVERSIONSTRING*}/"
-      BASEDIR="$BASEDIR$RCSUBDIR"
+      BASEDIR="$BASEDIR$RCSUBDIR.$RCVERSIONSTRING${VERSION: -1}/"
    else
       BASEDIR="$BASEDIR$VERSION/"
    fi
@@ -93,7 +93,7 @@ fi
 FILES=$(awk '{print $2}' "$TMPFILE")
 
 #and download these one by one
-for file in in $FILES
+for file in $FILES
 do
    wget --quiet -N "$BASEDIR$file"
 done

From fa917f662346868486cdffce92a1fbe34980a72b Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Sun, 21 Aug 2016 21:37:21 +0200
Subject: [PATCH 0744/1802] [contrib] verifybinaries: Keep downloads by default

---
 contrib/verifybinaries/README.md |  6 ++++++
 contrib/verifybinaries/verify.sh | 11 ++++++++---
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/contrib/verifybinaries/README.md b/contrib/verifybinaries/README.md
index d43a60ca0f5b0..516af8575f068 100644
--- a/contrib/verifybinaries/README.md
+++ b/contrib/verifybinaries/README.md
@@ -12,3 +12,9 @@ Usage:
 ./verify.sh bitcoin-core-0.12.0
 ./verify.sh bitcoin-core-0.13.0-rc3
 ```
+
+If you do not want to keep the downloaded binaries, specify anything as the second parameter.
+
+```sh
+./verify.sh bitcoin-core-0.13.0 delete
+```
diff --git a/contrib/verifybinaries/verify.sh b/contrib/verifybinaries/verify.sh
index 40759c36bc6cf..e22b911743b8f 100755
--- a/contrib/verifybinaries/verify.sh
+++ b/contrib/verifybinaries/verify.sh
@@ -108,11 +108,16 @@ if [ $? -eq 1 ]; then
    exit 1
 elif [ $? -gt 1 ]; then
    echo "Error executing 'diff'"
-   exit 2   
+   exit 2
 fi
 
-#everything matches! clean up the mess
-clean_up $FILES $SIGNATUREFILENAME $TMPFILE
+if [ -n "$2" ]; then
+   echo "Clean up the binaries"
+   clean_up $FILES $SIGNATUREFILENAME $TMPFILE
+else
+   echo "Keep the binaries in $WORKINGDIR"
+   clean_up $TMPFILE
+fi
 
 echo -e "Verified hashes of \n$FILES"
 

From faaed8874f83373e54a1878c5c7381ce47557bb8 Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Sun, 21 Aug 2016 21:58:29 +0200
Subject: [PATCH 0745/1802] [contrib] verifybinaries: Mention mandatory
 preparation step

---
 contrib/verifybinaries/README.md | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/contrib/verifybinaries/README.md b/contrib/verifybinaries/README.md
index 516af8575f068..ed3e14fb6c110 100644
--- a/contrib/verifybinaries/README.md
+++ b/contrib/verifybinaries/README.md
@@ -1,11 +1,24 @@
 ### Verify Binaries
+
+#### Preparation:
+
+Make sure you obtain the proper release signing key and verify the fingerprint with several independent sources.
+
+```sh
+$ gpg --fingerprint "Bitcoin Core binary release signing key"
+pub   4096R/36C2E964 2015-06-24 [expires: 2017-02-13]
+      Key fingerprint = 01EA 5486 DE18 A882 D4C2  6845 90C8 019E 36C2 E964
+uid                  Wladimir J. van der Laan (Bitcoin Core binary release signing key) <laanwj@gmail.com>
+```
+
+#### Usage:
+
 This script attempts to download the signature file `SHA256SUMS.asc` from https://bitcoin.org.
 
 It first checks if the signature passes, and then downloads the files specified in the file, and checks if the hashes of these files match those that are specified in the signature file.
 
 The script returns 0 if everything passes the checks. It returns 1 if either the signature check or the hash check doesn't pass. If an error occurs the return value is 2.
 
-Usage:
 
 ```sh
 ./verify.sh bitcoin-core-0.11.2

From 653bb3d64057f11c5c9a8f539ba57be549097cee Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Mon, 22 Aug 2016 09:24:50 +0200
Subject: [PATCH 0746/1802] Add copyright header to wallet_text_fixture.cpp

I created the file but forgot to add this header.
---
 src/wallet/test/wallet_test_fixture.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/wallet/test/wallet_test_fixture.cpp b/src/wallet/test/wallet_test_fixture.cpp
index 9036ee26d83e0..a76db376179da 100644
--- a/src/wallet/test/wallet_test_fixture.cpp
+++ b/src/wallet/test/wallet_test_fixture.cpp
@@ -1,3 +1,7 @@
+// Copyright (c) 2016 The Bitcoin Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
 #include "wallet/test/wallet_test_fixture.h"
 
 #include "rpc/server.h"

From 67a55025a1ea5d0461139cd6764686a77524feed Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Tue, 3 May 2016 18:02:46 +0200
Subject: [PATCH 0747/1802] init: Fix typo in help message for
 -whitelistforcerelay

Reported by pryds on Transifex in the Danish translation.
---
 src/init.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/init.cpp b/src/init.cpp
index 5d29f14eb8821..d9b6f1eb1523b 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -379,7 +379,7 @@ std::string HelpMessage(HelpMessageMode mode)
     strUsage += HelpMessageOpt("-whitelist=<netmask>", _("Whitelist peers connecting from the given netmask or IP address. Can be specified multiple times.") +
         " " + _("Whitelisted peers cannot be DoS banned and their transactions are always relayed, even if they are already in the mempool, useful e.g. for a gateway"));
     strUsage += HelpMessageOpt("-whitelistrelay", strprintf(_("Accept relayed transactions received from whitelisted peers even when not relaying transactions (default: %d)"), DEFAULT_WHITELISTRELAY));
-    strUsage += HelpMessageOpt("-whitelistforcerelay", strprintf(_("Force relay of transactions from whitelisted peers even they violate local relay policy (default: %d)"), DEFAULT_WHITELISTFORCERELAY));
+    strUsage += HelpMessageOpt("-whitelistforcerelay", strprintf(_("Force relay of transactions from whitelisted peers even if they violate local relay policy (default: %d)"), DEFAULT_WHITELISTFORCERELAY));
     strUsage += HelpMessageOpt("-maxuploadtarget=<n>", strprintf(_("Tries to keep outbound traffic under the given target (in MiB per 24h), 0 = no limit (default: %d)"), DEFAULT_MAX_UPLOAD_TARGET));
 
 #ifdef ENABLE_WALLET

From fabfd5dae28cbe26e71d50dbfb6feab03673f27a Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Wed, 29 Jun 2016 11:53:07 +0200
Subject: [PATCH 0748/1802] [qa] pull-tester: Don't mute zmq ImportError

---
 qa/pull-tester/rpc-tests.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/qa/pull-tester/rpc-tests.py b/qa/pull-tester/rpc-tests.py
index 37979a933fc29..ff6c0d918fe77 100755
--- a/qa/pull-tester/rpc-tests.py
+++ b/qa/pull-tester/rpc-tests.py
@@ -94,12 +94,12 @@
 if ENABLE_ZMQ:
     try:
         import zmq
-    except ImportError as e:
-        print("WARNING: \"import zmq\" failed. Set ENABLE_ZMQ=0 or " \
-            "to run zmq tests, see dependency info in /qa/README.md.")
-        ENABLE_ZMQ=0
+    except ImportError:
+        print("ERROR: \"import zmq\" failed. Set ENABLE_ZMQ=0 or "
+              "to run zmq tests, see dependency info in /qa/README.md.")
+        # ENABLE_ZMQ=0
+        raise
 
-#Tests
 testScripts = [
     # longest test should go first, to favor running tests in parallel
     'p2p-fullblocktest.py',

From fa27c0a2c4545a579bf339e816c3fa785252b7dc Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Wed, 29 Jun 2016 11:48:51 +0200
Subject: [PATCH 0749/1802] [doc] Fix typos in comments, doxygen: Fix comment
 syntax

---
 src/chain.h                  | 10 +++----
 src/consensus/validation.h   |  6 ++--
 src/rpc/protocol.h           | 54 ++++++++++++++++++------------------
 src/script/sign.h            |  2 +-
 src/zmq/zmqpublishnotifier.h |  2 +-
 5 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/src/chain.h b/src/chain.h
index 76a774c1238f1..6588e8f57d2c2 100644
--- a/src/chain.h
+++ b/src/chain.h
@@ -137,15 +137,15 @@ enum BlockStatus: uint32_t {
     BLOCK_VALID_MASK         =   BLOCK_VALID_HEADER | BLOCK_VALID_TREE | BLOCK_VALID_TRANSACTIONS |
                                  BLOCK_VALID_CHAIN | BLOCK_VALID_SCRIPTS,
 
-    BLOCK_HAVE_DATA          =    8, //! full block available in blk*.dat
-    BLOCK_HAVE_UNDO          =   16, //! undo data available in rev*.dat
+    BLOCK_HAVE_DATA          =    8, //!< full block available in blk*.dat
+    BLOCK_HAVE_UNDO          =   16, //!< undo data available in rev*.dat
     BLOCK_HAVE_MASK          =   BLOCK_HAVE_DATA | BLOCK_HAVE_UNDO,
 
-    BLOCK_FAILED_VALID       =   32, //! stage after last reached validness failed
-    BLOCK_FAILED_CHILD       =   64, //! descends from failed block
+    BLOCK_FAILED_VALID       =   32, //!< stage after last reached validness failed
+    BLOCK_FAILED_CHILD       =   64, //!< descends from failed block
     BLOCK_FAILED_MASK        =   BLOCK_FAILED_VALID | BLOCK_FAILED_CHILD,
 
-    BLOCK_OPT_WITNESS       =   128, //! block data in blk*.data was received with a witness-enforcing client
+    BLOCK_OPT_WITNESS       =   128, //!< block data in blk*.data was received with a witness-enforcing client
 };
 
 /** The block chain is a tree shaped structure starting with the
diff --git a/src/consensus/validation.h b/src/consensus/validation.h
index 000b197270271..3e24294a64208 100644
--- a/src/consensus/validation.h
+++ b/src/consensus/validation.h
@@ -22,9 +22,9 @@ static const unsigned char REJECT_CHECKPOINT = 0x43;
 class CValidationState {
 private:
     enum mode_state {
-        MODE_VALID,   //! everything ok
-        MODE_INVALID, //! network rule violation (DoS value may be set)
-        MODE_ERROR,   //! run-time error
+        MODE_VALID,   //!< everything ok
+        MODE_INVALID, //!< network rule violation (DoS value may be set)
+        MODE_ERROR,   //!< run-time error
     } mode;
     int nDoS;
     std::string strRejectReason;
diff --git a/src/rpc/protocol.h b/src/rpc/protocol.h
index 55d0aac68b785..988e0fc5facb9 100644
--- a/src/rpc/protocol.h
+++ b/src/rpc/protocol.h
@@ -38,18 +38,18 @@ enum RPCErrorCode
     RPC_PARSE_ERROR      = -32700,
 
     //! General application defined errors
-    RPC_MISC_ERROR                  = -1,  //! std::exception thrown in command handling
-    RPC_FORBIDDEN_BY_SAFE_MODE      = -2,  //! Server is in safe mode, and command is not allowed in safe mode
-    RPC_TYPE_ERROR                  = -3,  //! Unexpected type was passed as parameter
-    RPC_INVALID_ADDRESS_OR_KEY      = -5,  //! Invalid address or key
-    RPC_OUT_OF_MEMORY               = -7,  //! Ran out of memory during operation
-    RPC_INVALID_PARAMETER           = -8,  //! Invalid, missing or duplicate parameter
-    RPC_DATABASE_ERROR              = -20, //! Database error
-    RPC_DESERIALIZATION_ERROR       = -22, //! Error parsing or validating structure in raw format
-    RPC_VERIFY_ERROR                = -25, //! General error during transaction or block submission
-    RPC_VERIFY_REJECTED             = -26, //! Transaction or block was rejected by network rules
-    RPC_VERIFY_ALREADY_IN_CHAIN     = -27, //! Transaction already in chain
-    RPC_IN_WARMUP                   = -28, //! Client still warming up
+    RPC_MISC_ERROR                  = -1,  //!< std::exception thrown in command handling
+    RPC_FORBIDDEN_BY_SAFE_MODE      = -2,  //!< Server is in safe mode, and command is not allowed in safe mode
+    RPC_TYPE_ERROR                  = -3,  //!< Unexpected type was passed as parameter
+    RPC_INVALID_ADDRESS_OR_KEY      = -5,  //!< Invalid address or key
+    RPC_OUT_OF_MEMORY               = -7,  //!< Ran out of memory during operation
+    RPC_INVALID_PARAMETER           = -8,  //!< Invalid, missing or duplicate parameter
+    RPC_DATABASE_ERROR              = -20, //!< Database error
+    RPC_DESERIALIZATION_ERROR       = -22, //!< Error parsing or validating structure in raw format
+    RPC_VERIFY_ERROR                = -25, //!< General error during transaction or block submission
+    RPC_VERIFY_REJECTED             = -26, //!< Transaction or block was rejected by network rules
+    RPC_VERIFY_ALREADY_IN_CHAIN     = -27, //!< Transaction already in chain
+    RPC_IN_WARMUP                   = -28, //!< Client still warming up
 
     //! Aliases for backward compatibility
     RPC_TRANSACTION_ERROR           = RPC_VERIFY_ERROR,
@@ -57,23 +57,23 @@ enum RPCErrorCode
     RPC_TRANSACTION_ALREADY_IN_CHAIN= RPC_VERIFY_ALREADY_IN_CHAIN,
 
     //! P2P client errors
-    RPC_CLIENT_NOT_CONNECTED        = -9,  //! Bitcoin is not connected
-    RPC_CLIENT_IN_INITIAL_DOWNLOAD  = -10, //! Still downloading initial blocks
-    RPC_CLIENT_NODE_ALREADY_ADDED   = -23, //! Node is already added
-    RPC_CLIENT_NODE_NOT_ADDED       = -24, //! Node has not been added before
-    RPC_CLIENT_NODE_NOT_CONNECTED   = -29, //! Node to disconnect not found in connected nodes
-    RPC_CLIENT_INVALID_IP_OR_SUBNET = -30, //! Invalid IP/Subnet
+    RPC_CLIENT_NOT_CONNECTED        = -9,  //!< Bitcoin is not connected
+    RPC_CLIENT_IN_INITIAL_DOWNLOAD  = -10, //!< Still downloading initial blocks
+    RPC_CLIENT_NODE_ALREADY_ADDED   = -23, //!< Node is already added
+    RPC_CLIENT_NODE_NOT_ADDED       = -24, //!< Node has not been added before
+    RPC_CLIENT_NODE_NOT_CONNECTED   = -29, //!< Node to disconnect not found in connected nodes
+    RPC_CLIENT_INVALID_IP_OR_SUBNET = -30, //!< Invalid IP/Subnet
 
     //! Wallet errors
-    RPC_WALLET_ERROR                = -4,  //! Unspecified problem with wallet (key not found etc.)
-    RPC_WALLET_INSUFFICIENT_FUNDS   = -6,  //! Not enough funds in wallet or account
-    RPC_WALLET_INVALID_ACCOUNT_NAME = -11, //! Invalid account name
-    RPC_WALLET_KEYPOOL_RAN_OUT      = -12, //! Keypool ran out, call keypoolrefill first
-    RPC_WALLET_UNLOCK_NEEDED        = -13, //! Enter the wallet passphrase with walletpassphrase first
-    RPC_WALLET_PASSPHRASE_INCORRECT = -14, //! The wallet passphrase entered was incorrect
-    RPC_WALLET_WRONG_ENC_STATE      = -15, //! Command given in wrong wallet encryption state (encrypting an encrypted wallet etc.)
-    RPC_WALLET_ENCRYPTION_FAILED    = -16, //! Failed to encrypt the wallet
-    RPC_WALLET_ALREADY_UNLOCKED     = -17, //! Wallet is already unlocked
+    RPC_WALLET_ERROR                = -4,  //!< Unspecified problem with wallet (key not found etc.)
+    RPC_WALLET_INSUFFICIENT_FUNDS   = -6,  //!< Not enough funds in wallet or account
+    RPC_WALLET_INVALID_ACCOUNT_NAME = -11, //!< Invalid account name
+    RPC_WALLET_KEYPOOL_RAN_OUT      = -12, //!< Keypool ran out, call keypoolrefill first
+    RPC_WALLET_UNLOCK_NEEDED        = -13, //!< Enter the wallet passphrase with walletpassphrase first
+    RPC_WALLET_PASSPHRASE_INCORRECT = -14, //!< The wallet passphrase entered was incorrect
+    RPC_WALLET_WRONG_ENC_STATE      = -15, //!< Command given in wrong wallet encryption state (encrypting an encrypted wallet etc.)
+    RPC_WALLET_ENCRYPTION_FAILED    = -16, //!< Failed to encrypt the wallet
+    RPC_WALLET_ALREADY_UNLOCKED     = -17, //!< Wallet is already unlocked
 };
 
 std::string JSONRPCRequest(const std::string& strMethod, const UniValue& params, const UniValue& id);
diff --git a/src/script/sign.h b/src/script/sign.h
index 6404b4523ecaa..f9aa6fca27119 100644
--- a/src/script/sign.h
+++ b/src/script/sign.h
@@ -51,7 +51,7 @@ class MutableTransactionSignatureCreator : public TransactionSignatureCreator {
     MutableTransactionSignatureCreator(const CKeyStore* keystoreIn, const CMutableTransaction* txToIn, unsigned int nInIn, const CAmount& amount, int nHashTypeIn) : TransactionSignatureCreator(keystoreIn, &tx, nInIn, amount, nHashTypeIn), tx(*txToIn) {}
 };
 
-/** A signature creator that just produces 72-byte empty signatyres. */
+/** A signature creator that just produces 72-byte empty signatures. */
 class DummySignatureCreator : public BaseSignatureCreator {
 public:
     DummySignatureCreator(const CKeyStore* keystoreIn) : BaseSignatureCreator(keystoreIn) {}
diff --git a/src/zmq/zmqpublishnotifier.h b/src/zmq/zmqpublishnotifier.h
index 22f02a3d0dbb8..751ded39572d7 100644
--- a/src/zmq/zmqpublishnotifier.h
+++ b/src/zmq/zmqpublishnotifier.h
@@ -12,7 +12,7 @@ class CBlockIndex;
 class CZMQAbstractPublishNotifier : public CZMQAbstractNotifier
 {
 private:
-    uint32_t nSequence; //! upcounting per message sequence number
+    uint32_t nSequence; //!< upcounting per message sequence number
 
 public:
 

From fafe7b3432d5117e3f207eafe2fca1f9637b24f6 Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Fri, 1 Jul 2016 12:39:04 +0200
Subject: [PATCH 0750/1802] contrib: Make fix-copyright-headers.py more
 portable

---
 contrib/devtools/fix-copyright-headers.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contrib/devtools/fix-copyright-headers.py b/contrib/devtools/fix-copyright-headers.py
index b6414a551f870..31a81ae4fadb5 100755
--- a/contrib/devtools/fix-copyright-headers.py
+++ b/contrib/devtools/fix-copyright-headers.py
@@ -16,7 +16,7 @@
 import re
 
 year = time.gmtime()[0]
-CMD_GIT_DATE = 'git log --format=@%%at -1 %s | date +"%%Y" -u -f -'
+CMD_GIT_DATE = 'git log --format=%%ad --date=short -1 %s | cut -d"-" -f 1'
 CMD_REGEX= "perl -pi -e 's/(20\d\d)(?:-20\d\d)? The Bitcoin/$1-%s The Bitcoin/' %s"
 REGEX_CURRENT= re.compile("%s The Bitcoin" % year)
 CMD_LIST_FILES= "find %s | grep %s"

From 7bd5ff46237b06b3cf223176c1c71ef66383fa92 Mon Sep 17 00:00:00 2001
From: Christian Barcenas <christian@cbarcenas.com>
Date: Mon, 22 Aug 2016 20:49:36 -0400
Subject: [PATCH 0751/1802] Trivial: Fix two VarInt examples in serialize.h

---
 src/serialize.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/serialize.h b/src/serialize.h
index 378ed39074ea3..04ab9aa2e7762 100644
--- a/src/serialize.h
+++ b/src/serialize.h
@@ -322,8 +322,8 @@ uint64_t ReadCompactSize(Stream& is)
  * 0:         [0x00]  256:        [0x81 0x00]
  * 1:         [0x01]  16383:      [0xFE 0x7F]
  * 127:       [0x7F]  16384:      [0xFF 0x00]
- * 128:  [0x80 0x00]  16511: [0x80 0xFF 0x7F]
- * 255:  [0x80 0x7F]  65535: [0x82 0xFD 0x7F]
+ * 128:  [0x80 0x00]  16511:      [0xFF 0x7F]
+ * 255:  [0x80 0x7F]  65535: [0x82 0xFE 0x7F]
  * 2^32:           [0x8E 0xFE 0xFE 0xFF 0x00]
  */
 

From 259ee09f88dbf0ce1a580d3aa93b4d82acadf8f0 Mon Sep 17 00:00:00 2001
From: R E Broadley <rebroad+github@gmail.com>
Date: Tue, 23 Aug 2016 13:09:27 +0700
Subject: [PATCH 0752/1802] Show "end" instead of many zeros when getheaders
 request received with a hashStop of Null.

---
 src/main.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main.cpp b/src/main.cpp
index 27ab677eb1510..7d1686c2fa91f 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -5387,7 +5387,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
         // we must use CBlocks, as CBlockHeaders won't include the 0x00 nTx count at the end
         vector<CBlock> vHeaders;
         int nLimit = MAX_HEADERS_RESULTS;
-        LogPrint("net", "getheaders %d to %s from peer=%d\n", (pindex ? pindex->nHeight : -1), hashStop.ToString(), pfrom->id);
+        LogPrint("net", "getheaders %d to %s from peer=%d\n", (pindex ? pindex->nHeight : -1), hashStop.IsNull() ? "end" : hashStop.ToString(), pfrom->id);
         for (; pindex; pindex = chainActive.Next(pindex))
         {
             vHeaders.push_back(pindex->GetBlockHeader());

From 878faacd7b3daac437cc689b13422f6432fb5cd0 Mon Sep 17 00:00:00 2001
From: Anthony Towns <aj@erisian.com.au>
Date: Tue, 23 Aug 2016 16:55:15 +1000
Subject: [PATCH 0753/1802] Add configure check for -latomic

---
 build-aux/m4/l_atomic.m4 | 40 ++++++++++++++++++++++++++++++++++++++++
 configure.ac             |  3 +++
 2 files changed, 43 insertions(+)
 create mode 100644 build-aux/m4/l_atomic.m4

diff --git a/build-aux/m4/l_atomic.m4 b/build-aux/m4/l_atomic.m4
new file mode 100644
index 0000000000000..906724b6405d8
--- /dev/null
+++ b/build-aux/m4/l_atomic.m4
@@ -0,0 +1,40 @@
+# Some versions of gcc/libstdc++ require linking with -latomic if
+# using the C++ atomic library.
+#
+# Sourced from http://bugs.debian.org/797228
+
+m4_define([_CHECK_ATOMIC_testbody], [[
+  #include <atomic>
+  #include <cstdint>
+
+  int main() {
+    std::atomic<int64_t> a{};
+
+    int64_t v = 5;
+    int64_t r = a.fetch_add(v);
+    return static_cast<int>(r);
+  }
+]])
+
+AC_DEFUN([CHECK_ATOMIC], [
+
+  AC_LANG_PUSH(C++)
+
+  AC_MSG_CHECKING([whether std::atomic can be used without link library])
+
+  AC_LINK_IFELSE([AC_LANG_SOURCE([_CHECK_ATOMIC_testbody])],[
+      AC_MSG_RESULT([yes])
+    ],[
+      AC_MSG_RESULT([no])
+      LIBS="$LIBS -latomic"
+      AC_MSG_CHECKING([whether std::atomic needs -latomic])
+      AC_LINK_IFELSE([AC_LANG_SOURCE([_CHECK_ATOMIC_testbody])],[
+          AC_MSG_RESULT([yes])
+        ],[
+          AC_MSG_RESULT([no])
+          AC_MSG_FAILURE([cannot figure our how to use std::atomic])
+        ])
+    ])
+
+  AC_LANG_POP
+])
diff --git a/configure.ac b/configure.ac
index d332f4face3ee..335609f5e5a48 100644
--- a/configure.ac
+++ b/configure.ac
@@ -57,6 +57,9 @@ case $host in
 esac
 dnl Require C++11 compiler (no GNU extensions)
 AX_CXX_COMPILE_STDCXX([11], [noext], [mandatory])
+dnl Check if -latomic is required for <std::atomic>
+CHECK_ATOMIC
+
 dnl Libtool init checks.
 LT_INIT([pic-only])
 

From 15860448d38ba7a436cf7c08fa5c0132fe10f8d3 Mon Sep 17 00:00:00 2001
From: Jonas Schnelli <dev@jonasschnelli.ch>
Date: Sat, 20 Aug 2016 11:19:35 +0200
Subject: [PATCH 0754/1802] [Qt] RPC-Console: support nested commands and
 simple value queries

Commands can be executed with bracket syntax, example: `getwalletinfo()`.
Commands can be nested, example: `sendtoaddress(getnewaddress(), 10)`.
Simple queries are possible: `listunspent()[0][txid]`
Object values are accessed with a non-quoted string, example: [txid].

Fully backward compatible.
`generate 101` is identical to `generate(101)`
Result value queries indicated with `[]` require the new brackets syntax.
Comma as argument separator is now also possible: `sendtoaddress,<address>,<amount>`
Space as argument separator works also with the bracket syntax, example: `sendtoaddress(getnewaddress() 10)

No dept limitation, complex commands are possible:
`decoderawtransaction(getrawtransaction(getblock(getbestblockhash())[tx][0]))[vout][0][value]`
---
 src/Makefile.qttest.include    |   6 +-
 src/qt/rpcconsole.cpp          | 229 +++++++++++++++++++++++----------
 src/qt/rpcconsole.h            |   2 +
 src/qt/test/rpcnestedtests.cpp |  93 +++++++++++++
 src/qt/test/rpcnestedtests.h   |  25 ++++
 src/qt/test/test_main.cpp      |  16 ++-
 6 files changed, 300 insertions(+), 71 deletions(-)
 create mode 100644 src/qt/test/rpcnestedtests.cpp
 create mode 100644 src/qt/test/rpcnestedtests.h

diff --git a/src/Makefile.qttest.include b/src/Makefile.qttest.include
index 813a343ffa395..0a7efb5d5b2e5 100644
--- a/src/Makefile.qttest.include
+++ b/src/Makefile.qttest.include
@@ -1,13 +1,16 @@
 bin_PROGRAMS += qt/test/test_bitcoin-qt
 TESTS += qt/test/test_bitcoin-qt
 
-TEST_QT_MOC_CPP = qt/test/moc_uritests.cpp
+TEST_QT_MOC_CPP = \
+  qt/test/moc_rpcnestedtests.cpp \
+  qt/test/moc_uritests.cpp
 
 if ENABLE_WALLET
 TEST_QT_MOC_CPP += qt/test/moc_paymentservertests.cpp
 endif
 
 TEST_QT_H = \
+  qt/test/rpcnestedtests.h \
   qt/test/uritests.h \
   qt/test/paymentrequestdata.h \
   qt/test/paymentservertests.h
@@ -16,6 +19,7 @@ qt_test_test_bitcoin_qt_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(BITCOIN_
   $(QT_INCLUDES) $(QT_TEST_INCLUDES) $(PROTOBUF_CFLAGS)
 
 qt_test_test_bitcoin_qt_SOURCES = \
+  qt/test/rpcnestedtests.cpp \
   qt/test/test_main.cpp \
   qt/test/uritests.cpp \
   $(TEST_QT_H)
diff --git a/src/qt/rpcconsole.cpp b/src/qt/rpcconsole.cpp
index bcaa9164c91ba..0456b89da2a16 100644
--- a/src/qt/rpcconsole.cpp
+++ b/src/qt/rpcconsole.cpp
@@ -113,9 +113,11 @@ class QtRPCTimerInterface: public RPCTimerInterface
 #include "rpcconsole.moc"
 
 /**
- * Split shell command line into a list of arguments. Aims to emulate \c bash and friends.
+ * Split shell command line into a list of arguments and execute the command(s).
+ * Aims to emulate \c bash and friends.
  *
- * - Arguments are delimited with whitespace
+ * - Command nesting is possible with brackets [example: validateaddress(getnewaddress())]
+ * - Arguments are delimited with whitespace or comma
  * - Extra whitespace at the beginning and end and between arguments will be ignored
  * - Text can be "double" or 'single' quoted
  * - The backslash \c \ is used as escape character
@@ -123,11 +125,15 @@ class QtRPCTimerInterface: public RPCTimerInterface
  *   - Within double quotes, only escape \c " and backslashes before a \c " or another backslash
  *   - Within single quotes, no escaping is possible and no special interpretation takes place
  *
- * @param[out]   args        Parsed arguments will be appended to this list
+ * @param[out]   result      stringified Result from the executed command(chain)
  * @param[in]    strCommand  Command line to split
  */
-bool parseCommandLine(std::vector<std::string> &args, const std::string &strCommand)
+
+bool RPCConsole::RPCExecuteCommandLine(std::string &strResult, const std::string &strCommand)
 {
+    std::vector< std::vector<std::string> > stack;
+    stack.push_back(std::vector<std::string>());
+
     enum CmdParseState
     {
         STATE_EATING_SPACES,
@@ -135,95 +141,180 @@ bool parseCommandLine(std::vector<std::string> &args, const std::string &strComm
         STATE_SINGLEQUOTED,
         STATE_DOUBLEQUOTED,
         STATE_ESCAPE_OUTER,
-        STATE_ESCAPE_DOUBLEQUOTED
+        STATE_ESCAPE_DOUBLEQUOTED,
+        STATE_COMMAND_EXECUTED,
+        STATE_COMMAND_EXECUTED_INNER
     } state = STATE_EATING_SPACES;
     std::string curarg;
-    Q_FOREACH(char ch, strCommand)
+    UniValue lastResult;
+
+    std::string strCommandTerminated = strCommand;
+    if (strCommandTerminated.back() != '\n')
+        strCommandTerminated += "\n";
+    for(char ch: strCommandTerminated)
     {
         switch(state)
         {
-        case STATE_ARGUMENT: // In or after argument
-        case STATE_EATING_SPACES: // Handle runs of whitespace
-            switch(ch)
+            case STATE_COMMAND_EXECUTED_INNER:
+            case STATE_COMMAND_EXECUTED:
             {
-            case '"': state = STATE_DOUBLEQUOTED; break;
-            case '\'': state = STATE_SINGLEQUOTED; break;
-            case '\\': state = STATE_ESCAPE_OUTER; break;
-            case ' ': case '\n': case '\t':
-                if(state == STATE_ARGUMENT) // Space ends argument
+                bool breakParsing = true;
+                switch(ch)
                 {
-                    args.push_back(curarg);
-                    curarg.clear();
+                    case '[': curarg.clear(); state = STATE_COMMAND_EXECUTED_INNER; break;
+                    default:
+                        if (state == STATE_COMMAND_EXECUTED_INNER)
+                        {
+                            if (ch != ']')
+                            {
+                                // append char to the current argument (which is also used for the query command)
+                                curarg += ch;
+                                break;
+                            }
+                            if (curarg.size())
+                            {
+                                // if we have a value query, query arrays with index and objects with a string key
+                                UniValue subelement;
+                                if (lastResult.isArray())
+                                {
+                                    for(char argch: curarg)
+                                        if (!std::isdigit(argch))
+                                            throw std::runtime_error("Invalid result query");
+                                    subelement = lastResult[atoi(curarg.c_str())];
+                                }
+                                else if (lastResult.isObject())
+                                    subelement = find_value(lastResult, curarg);
+                                else
+                                    throw std::runtime_error("Invalid result query"); //no array or object: abort
+                                lastResult = subelement;
+                            }
+
+                            state = STATE_COMMAND_EXECUTED;
+                            break;
+                        }
+                        // don't break parsing when the char is required for the next argument
+                        breakParsing = false;
+
+                        // pop the stack and return the result to the current command arguments
+                        stack.pop_back();
+
+                        // don't stringify the json in case of a string to avoid doublequotes
+                        if (lastResult.isStr())
+                            curarg = lastResult.get_str();
+                        else
+                            curarg = lastResult.write(2);
+
+                        // if we have a non empty result, use it as stack argument otherwise as general result
+                        if (curarg.size())
+                        {
+                            if (stack.size())
+                                stack.back().push_back(curarg);
+                            else
+                                strResult = curarg;
+                        }
+                        curarg.clear();
+                        // assume eating space state
+                        state = STATE_EATING_SPACES;
                 }
-                state = STATE_EATING_SPACES;
-                break;
-            default: curarg += ch; state = STATE_ARGUMENT;
+                if (breakParsing)
+                    break;
             }
-            break;
-        case STATE_SINGLEQUOTED: // Single-quoted string
-            switch(ch)
+            case STATE_ARGUMENT: // In or after argument
+            case STATE_EATING_SPACES: // Handle runs of whitespace
+                switch(ch)
             {
-            case '\'': state = STATE_ARGUMENT; break;
-            default: curarg += ch;
+                case '"': state = STATE_DOUBLEQUOTED; break;
+                case '\'': state = STATE_SINGLEQUOTED; break;
+                case '\\': state = STATE_ESCAPE_OUTER; break;
+                case '(': case ')': case '\n':
+                    if (state == STATE_ARGUMENT)
+                    {
+                        if (ch == '(' && stack.size() && stack.back().size() > 0)
+                            stack.push_back(std::vector<std::string>());
+                        if (curarg.size())
+                        {
+                            // don't allow commands after executed commands on baselevel
+                            if (!stack.size())
+                                throw std::runtime_error("Invalid Syntax");
+                            stack.back().push_back(curarg);
+                        }
+                        curarg.clear();
+                        state = STATE_EATING_SPACES;
+                    }
+                    if ((ch == ')' || ch == '\n') && stack.size() > 0)
+                    {
+                        std::string strPrint;
+                        // Convert argument list to JSON objects in method-dependent way,
+                        // and pass it along with the method name to the dispatcher.
+                        lastResult = tableRPC.execute(stack.back()[0], RPCConvertValues(stack.back()[0], std::vector<std::string>(stack.back().begin() + 1, stack.back().end())));
+
+                        state = STATE_COMMAND_EXECUTED;
+                        curarg.clear();
+                    }
+                    break;
+                case ' ': case ',': case '\t':
+                    if(state == STATE_ARGUMENT) // Space ends argument
+                    {
+                        if (curarg.size())
+                            stack.back().push_back(curarg);
+                        curarg.clear();
+                    }
+                    state = STATE_EATING_SPACES;
+                    break;
+                default: curarg += ch; state = STATE_ARGUMENT;
             }
-            break;
-        case STATE_DOUBLEQUOTED: // Double-quoted string
-            switch(ch)
+                break;
+            case STATE_SINGLEQUOTED: // Single-quoted string
+                switch(ch)
             {
-            case '"': state = STATE_ARGUMENT; break;
-            case '\\': state = STATE_ESCAPE_DOUBLEQUOTED; break;
-            default: curarg += ch;
+                case '\'': state = STATE_ARGUMENT; break;
+                default: curarg += ch;
             }
-            break;
-        case STATE_ESCAPE_OUTER: // '\' outside quotes
-            curarg += ch; state = STATE_ARGUMENT;
-            break;
-        case STATE_ESCAPE_DOUBLEQUOTED: // '\' in double-quoted text
-            if(ch != '"' && ch != '\\') curarg += '\\'; // keep '\' for everything but the quote and '\' itself
-            curarg += ch; state = STATE_DOUBLEQUOTED;
-            break;
+                break;
+            case STATE_DOUBLEQUOTED: // Double-quoted string
+                switch(ch)
+            {
+                case '"': state = STATE_ARGUMENT; break;
+                case '\\': state = STATE_ESCAPE_DOUBLEQUOTED; break;
+                default: curarg += ch;
+            }
+                break;
+            case STATE_ESCAPE_OUTER: // '\' outside quotes
+                curarg += ch; state = STATE_ARGUMENT;
+                break;
+            case STATE_ESCAPE_DOUBLEQUOTED: // '\' in double-quoted text
+                if(ch != '"' && ch != '\\') curarg += '\\'; // keep '\' for everything but the quote and '\' itself
+                curarg += ch; state = STATE_DOUBLEQUOTED;
+                break;
         }
     }
     switch(state) // final state
     {
-    case STATE_EATING_SPACES:
-        return true;
-    case STATE_ARGUMENT:
-        args.push_back(curarg);
-        return true;
-    default: // ERROR to end in one of the other states
-        return false;
+        case STATE_COMMAND_EXECUTED:
+            if (lastResult.isStr())
+                strResult = lastResult.get_str();
+            else
+                strResult = lastResult.write(2);
+        case STATE_ARGUMENT:
+        case STATE_EATING_SPACES:
+            return true;
+        default: // ERROR to end in one of the other states
+            return false;
     }
 }
 
 void RPCExecutor::request(const QString &command)
 {
-    std::vector<std::string> args;
-    if(!parseCommandLine(args, command.toStdString()))
-    {
-        Q_EMIT reply(RPCConsole::CMD_ERROR, QString("Parse error: unbalanced ' or \""));
-        return;
-    }
-    if(args.empty())
-        return; // Nothing to do
     try
     {
-        std::string strPrint;
-        // Convert argument list to JSON objects in method-dependent way,
-        // and pass it along with the method name to the dispatcher.
-        UniValue result = tableRPC.execute(
-            args[0],
-            RPCConvertValues(args[0], std::vector<std::string>(args.begin() + 1, args.end())));
-
-        // Format result reply
-        if (result.isNull())
-            strPrint = "";
-        else if (result.isStr())
-            strPrint = result.get_str();
-        else
-            strPrint = result.write(2);
-
-        Q_EMIT reply(RPCConsole::CMD_REPLY, QString::fromStdString(strPrint));
+        std::string result;
+        std::string executableCommand = command.toStdString() + "\n";
+        if(!RPCConsole::RPCExecuteCommandLine(result, executableCommand))
+        {
+            Q_EMIT reply(RPCConsole::CMD_ERROR, QString("Parse error: unbalanced ' or \""));
+            return;
+        }
+        Q_EMIT reply(RPCConsole::CMD_REPLY, QString::fromStdString(result));
     }
     catch (UniValue& objError)
     {
diff --git a/src/qt/rpcconsole.h b/src/qt/rpcconsole.h
index 28affa954dca2..50224a1cc0bf1 100644
--- a/src/qt/rpcconsole.h
+++ b/src/qt/rpcconsole.h
@@ -35,6 +35,8 @@ class RPCConsole: public QWidget
     explicit RPCConsole(const PlatformStyle *platformStyle, QWidget *parent);
     ~RPCConsole();
 
+    static bool RPCExecuteCommandLine(std::string &strResult, const std::string &strCommand);
+
     void setClientModel(ClientModel *model);
 
     enum MessageClass {
diff --git a/src/qt/test/rpcnestedtests.cpp b/src/qt/test/rpcnestedtests.cpp
new file mode 100644
index 0000000000000..3dae33bafbbbf
--- /dev/null
+++ b/src/qt/test/rpcnestedtests.cpp
@@ -0,0 +1,93 @@
+// Copyright (c) 2016 The Bitcoin Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#include "rpcnestedtests.h"
+
+#include "chainparams.h"
+#include "consensus/validation.h"
+#include "main.h"
+#include "rpc/register.h"
+#include "rpc/server.h"
+#include "rpcconsole.h"
+#include "test/testutil.h"
+#include "univalue.h"
+#include "util.h"
+
+#include <QDir>
+
+#include <boost/filesystem.hpp>
+
+void RPCNestedTests::rpcNestedTests()
+{
+    UniValue jsonRPCError;
+
+    // do some test setup
+    // could be moved to a more generic place when we add more tests on QT level
+    const CChainParams& chainparams = Params();
+    RegisterAllCoreRPCCommands(tableRPC);
+    ClearDatadirCache();
+    std::string path = QDir::tempPath().toStdString() + "/" + strprintf("test_bitcoin_qt_%lu_%i", (unsigned long)GetTime(), (int)(GetRand(100000)));
+    QDir dir(QString::fromStdString(path));
+    dir.mkpath(".");
+    mapArgs["-datadir"] = path;
+    //mempool.setSanityCheck(1.0);
+    pblocktree = new CBlockTreeDB(1 << 20, true);
+    pcoinsdbview = new CCoinsViewDB(1 << 23, true);
+    pcoinsTip = new CCoinsViewCache(pcoinsdbview);
+    InitBlockIndex(chainparams);
+    {
+        CValidationState state;
+        bool ok = ActivateBestChain(state, chainparams);
+        QVERIFY(ok);
+    }
+
+    SetRPCWarmupFinished();
+
+    std::string result;
+    std::string result2;
+    RPCConsole::RPCExecuteCommandLine(result, "getblockchaininfo()[chain]"); //simple result filtering with path
+    QVERIFY(result=="main");
+
+    RPCConsole::RPCExecuteCommandLine(result, "getblock(getbestblockhash())"); //simple 2 level nesting
+    RPCConsole::RPCExecuteCommandLine(result, "getblock(getblock(getbestblockhash())[hash], true)");
+
+    RPCConsole::RPCExecuteCommandLine(result, "getblock( getblock( getblock(getbestblockhash())[hash] )[hash], true)"); //4 level nesting with whitespace, filtering path and boolean parameter
+
+    RPCConsole::RPCExecuteCommandLine(result, "getblockchaininfo");
+    QVERIFY(result.substr(0,1) == "{");
+
+    RPCConsole::RPCExecuteCommandLine(result, "getblockchaininfo()");
+    QVERIFY(result.substr(0,1) == "{");
+
+    RPCConsole::RPCExecuteCommandLine(result, "getblockchaininfo "); //whitespace at the end will be tolerated
+    QVERIFY(result.substr(0,1) == "{");
+
+#if QT_VERSION >= 0x050300
+    // do the QVERIFY_EXCEPTION_THROWN checks only with Qt5.3 and higher (QVERIFY_EXCEPTION_THROWN was introduced in Qt5.3)
+    QVERIFY_EXCEPTION_THROWN(RPCConsole::RPCExecuteCommandLine(result, "getblockchaininfo() .\n"), std::runtime_error); //invalid syntax
+    QVERIFY_EXCEPTION_THROWN(RPCConsole::RPCExecuteCommandLine(result, "getblockchaininfo() getblockchaininfo()"), std::runtime_error); //invalid syntax
+    (RPCConsole::RPCExecuteCommandLine(result, "getblockchaininfo(")); //tolerate non closing brackets if we have no arguments
+    (RPCConsole::RPCExecuteCommandLine(result, "getblockchaininfo()()()")); //tolerate non command brackts
+    QVERIFY_EXCEPTION_THROWN(RPCConsole::RPCExecuteCommandLine(result, "getblockchaininfo(True)"), UniValue); //invalid argument
+    QVERIFY_EXCEPTION_THROWN(RPCConsole::RPCExecuteCommandLine(result, "a(getblockchaininfo(True))"), UniValue); //method not found
+#endif
+
+    (RPCConsole::RPCExecuteCommandLine(result, "getblockchaininfo()[\"chain\"]")); //Quote path identifier are allowed, but look after a child contaning the quotes in the key
+    QVERIFY(result == "null");
+
+    (RPCConsole::RPCExecuteCommandLine(result, "createrawtransaction [] {} 0")); //parameter not in brackets are allowed
+    (RPCConsole::RPCExecuteCommandLine(result2, "createrawtransaction([],{},0)")); //parameter in brackets are allowed
+    QVERIFY(result == result2);
+    (RPCConsole::RPCExecuteCommandLine(result2, "createrawtransaction( [],  {} , 0   )")); //whitespace between parametres is allowed
+    QVERIFY(result == result2);
+
+    RPCConsole::RPCExecuteCommandLine(result, "getblock(getbestblockhash())[tx][0]");
+    QVERIFY(result == "4a5e1e4baab89f3a32518a88c31bc87f618f76673e2cc77ab2127b7afdeda33b");
+
+    delete pcoinsTip;
+    delete pcoinsdbview;
+    delete pblocktree;
+
+    boost::filesystem::remove_all(boost::filesystem::path(path));
+}
diff --git a/src/qt/test/rpcnestedtests.h b/src/qt/test/rpcnestedtests.h
new file mode 100644
index 0000000000000..9ad409019f281
--- /dev/null
+++ b/src/qt/test/rpcnestedtests.h
@@ -0,0 +1,25 @@
+// Copyright (c) 2016 The Bitcoin Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#ifndef BITCOIN_QT_TEST_RPC_NESTED_TESTS_H
+#define BITCOIN_QT_TEST_RPC_NESTED_TESTS_H
+
+#include <QObject>
+#include <QTest>
+
+#include "txdb.h"
+#include "txmempool.h"
+
+class RPCNestedTests : public QObject
+{
+    Q_OBJECT
+
+    private Q_SLOTS:
+    void rpcNestedTests();
+
+private:
+    CCoinsViewDB *pcoinsdbview;
+};
+
+#endif // BITCOIN_QT_TEST_RPC_NESTED_TESTS_H
diff --git a/src/qt/test/test_main.cpp b/src/qt/test/test_main.cpp
index db193420bfb6e..dbaab54fb65b4 100644
--- a/src/qt/test/test_main.cpp
+++ b/src/qt/test/test_main.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2009-2015 The Bitcoin Core developers
+// Copyright (c) 2009-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
@@ -6,6 +6,9 @@
 #include "config/bitcoin-config.h"
 #endif
 
+#include "chainparams.h"
+#include "key.h"
+#include "rpcnestedtests.h"
 #include "util.h"
 #include "uritests.h"
 
@@ -27,10 +30,17 @@ Q_IMPORT_PLUGIN(qtwcodecs)
 Q_IMPORT_PLUGIN(qkrcodecs)
 #endif
 
+extern void noui_connect();
+
 // This is all you need to run all the tests
 int main(int argc, char *argv[])
 {
+    ECC_Start();
     SetupEnvironment();
+    SetupNetworking();
+    SelectParams(CBaseChainParams::MAIN);
+    noui_connect();
+
     bool fInvalid = false;
 
     // Don't remove this, it's needed to access
@@ -48,6 +58,10 @@ int main(int argc, char *argv[])
     if (QTest::qExec(&test2) != 0)
         fInvalid = true;
 #endif
+    RPCNestedTests test3;
+    if (QTest::qExec(&test3) != 0)
+        fInvalid = true;
 
+    ECC_Stop();
     return fInvalid;
 }

From beef966e365e16a9b041321e404f7cd21a4e999e Mon Sep 17 00:00:00 2001
From: Jonas Schnelli <dev@jonasschnelli.ch>
Date: Tue, 23 Aug 2016 15:36:23 +0200
Subject: [PATCH 0755/1802] [Wallet] remove unused code/conditions in
 ReadAtCursor

---
 src/wallet/db.cpp       |  2 +-
 src/wallet/db.h         | 10 ++++------
 src/wallet/walletdb.cpp |  8 ++++----
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/src/wallet/db.cpp b/src/wallet/db.cpp
index cfd007ca1c807..652bbebded844 100644
--- a/src/wallet/db.cpp
+++ b/src/wallet/db.cpp
@@ -387,7 +387,7 @@ bool CDB::Rewrite(const string& strFile, const char* pszSkip)
                         while (fSuccess) {
                             CDataStream ssKey(SER_DISK, CLIENT_VERSION);
                             CDataStream ssValue(SER_DISK, CLIENT_VERSION);
-                            int ret = db.ReadAtCursor(pcursor, ssKey, ssValue, DB_NEXT);
+                            int ret = db.ReadAtCursor(pcursor, ssKey, ssValue);
                             if (ret == DB_NOTFOUND) {
                                 pcursor->close();
                                 break;
diff --git a/src/wallet/db.h b/src/wallet/db.h
index 01b8c71a04bbb..a0f673ecfc46f 100644
--- a/src/wallet/db.h
+++ b/src/wallet/db.h
@@ -228,19 +228,17 @@ class CDB
         return pcursor;
     }
 
-    int ReadAtCursor(Dbc* pcursor, CDataStream& ssKey, CDataStream& ssValue, unsigned int fFlags = DB_NEXT)
+    int ReadAtCursor(Dbc* pcursor, CDataStream& ssKey, CDataStream& ssValue, bool setRange = false)
     {
         // Read at cursor
         Dbt datKey;
-        if (fFlags == DB_SET || fFlags == DB_SET_RANGE || fFlags == DB_GET_BOTH || fFlags == DB_GET_BOTH_RANGE) {
+        unsigned int fFlags = DB_NEXT;
+        if (setRange) {
             datKey.set_data(&ssKey[0]);
             datKey.set_size(ssKey.size());
+            fFlags = DB_SET_RANGE;
         }
         Dbt datValue;
-        if (fFlags == DB_GET_BOTH || fFlags == DB_GET_BOTH_RANGE) {
-            datValue.set_data(&ssValue[0]);
-            datValue.set_size(ssValue.size());
-        }
         datKey.set_flags(DB_DBT_MALLOC);
         datValue.set_flags(DB_DBT_MALLOC);
         int ret = pcursor->get(&datKey, &datValue, fFlags);
diff --git a/src/wallet/walletdb.cpp b/src/wallet/walletdb.cpp
index f824492cb6fd4..a8072f1d28339 100644
--- a/src/wallet/walletdb.cpp
+++ b/src/wallet/walletdb.cpp
@@ -216,16 +216,16 @@ void CWalletDB::ListAccountCreditDebit(const string& strAccount, list<CAccountin
     Dbc* pcursor = GetCursor();
     if (!pcursor)
         throw runtime_error(std::string(__func__) + ": cannot create DB cursor");
-    unsigned int fFlags = DB_SET_RANGE;
+    bool setRange = true;
     while (true)
     {
         // Read next record
         CDataStream ssKey(SER_DISK, CLIENT_VERSION);
-        if (fFlags == DB_SET_RANGE)
+        if (setRange)
             ssKey << std::make_pair(std::string("acentry"), std::make_pair((fAllAccounts ? string("") : strAccount), uint64_t(0)));
         CDataStream ssValue(SER_DISK, CLIENT_VERSION);
-        int ret = ReadAtCursor(pcursor, ssKey, ssValue, fFlags);
-        fFlags = DB_NEXT;
+        int ret = ReadAtCursor(pcursor, ssKey, ssValue, setRange);
+        setRange = false;
         if (ret == DB_NOTFOUND)
             break;
         else if (ret != 0)

From 9358893518a19f38eab9186c768ad81c7a2f9cec Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Tue, 23 Aug 2016 17:46:54 +0200
Subject: [PATCH 0756/1802] doc: Add historical release notes for 0.12.1 0.13.0

---
 doc/release-notes/release-notes-0.12.1.md | 198 +++++
 doc/release-notes/release-notes-0.13.0.md | 863 ++++++++++++++++++++++
 2 files changed, 1061 insertions(+)
 create mode 100644 doc/release-notes/release-notes-0.12.1.md
 create mode 100644 doc/release-notes/release-notes-0.13.0.md

diff --git a/doc/release-notes/release-notes-0.12.1.md b/doc/release-notes/release-notes-0.12.1.md
new file mode 100644
index 0000000000000..610cd481de485
--- /dev/null
+++ b/doc/release-notes/release-notes-0.12.1.md
@@ -0,0 +1,198 @@
+Bitcoin Core version 0.12.1 is now available from:
+
+  <https://bitcoin.org/bin/bitcoin-core-0.12.1/>
+
+This is a new minor version release, including the BIP9, BIP68 and BIP112
+softfork, various bugfixes and updated translations.
+
+Please report bugs using the issue tracker at github:
+
+  <https://github.com/bitcoin/bitcoin/issues>
+
+Upgrading and downgrading
+=========================
+
+How to Upgrade
+--------------
+
+If you are running an older version, shut it down. Wait until it has completely
+shut down (which might take a few minutes for older versions), then run the
+installer (on Windows) or just copy over /Applications/Bitcoin-Qt (on Mac) or
+bitcoind/bitcoin-qt (on Linux).
+
+Downgrade warning
+-----------------
+
+### Downgrade to a version < 0.12.0
+
+Because release 0.12.0 and later will obfuscate the chainstate on every
+fresh sync or reindex, the chainstate is not backwards-compatible with
+pre-0.12 versions of Bitcoin Core or other software.
+
+If you want to downgrade after you have done a reindex with 0.12.0 or later,
+you will need to reindex when you first start Bitcoin Core version 0.11 or
+earlier.
+
+Notable changes
+===============
+
+First version bits BIP9 softfork deployment
+-------------------------------------------
+
+This release includes a soft fork deployment to enforce [BIP68][],
+[BIP112][] and [BIP113][] using the [BIP9][] deployment mechanism.
+
+The deployment sets the block version number to 0x20000001 between
+midnight 1st May 2016 and midnight 1st May 2017 to signal readiness for 
+deployment. The version number consists of 0x20000000 to indicate version
+bits together with setting bit 0 to indicate support for this combined
+deployment, shown as "csv" in the `getblockchaininfo` RPC call.
+
+For more information about the soft forking change, please see
+<https://github.com/bitcoin/bitcoin/pull/7648>
+
+This specific backport pull-request can be viewed at
+<https://github.com/bitcoin/bitcoin/pull/7543>
+
+[BIP9]: https://github.com/bitcoin/bips/blob/master/bip-0009.mediawiki
+[BIP68]: https://github.com/bitcoin/bips/blob/master/bip-0068.mediawiki
+[BIP112]: https://github.com/bitcoin/bips/blob/master/bip-0112.mediawiki
+[BIP113]: https://github.com/bitcoin/bips/blob/master/bip-0113.mediawiki
+
+BIP68 soft fork to enforce sequence locks for relative locktime
+---------------------------------------------------------------
+
+[BIP68][] introduces relative lock-time consensus-enforced semantics of
+the sequence number field to enable a signed transaction input to remain
+invalid for a defined period of time after confirmation of its corresponding
+outpoint.
+
+For more information about the implementation, see
+<https://github.com/bitcoin/bitcoin/pull/7184>
+
+BIP112 soft fork to enforce OP_CHECKSEQUENCEVERIFY
+--------------------------------------------------
+
+[BIP112][] redefines the existing OP_NOP3 as OP_CHECKSEQUENCEVERIFY (CSV)
+for a new opcode in the Bitcoin scripting system that in combination with
+[BIP68][] allows execution pathways of a script to be restricted based
+on the age of the output being spent.
+
+For more information about the implementation, see
+<https://github.com/bitcoin/bitcoin/pull/7524>
+
+BIP113 locktime enforcement soft fork
+-------------------------------------
+
+Bitcoin Core 0.11.2 previously introduced mempool-only locktime
+enforcement using GetMedianTimePast(). This release seeks to
+consensus enforce the rule.
+
+Bitcoin transactions currently may specify a locktime indicating when
+they may be added to a valid block.  Current consensus rules require
+that blocks have a block header time greater than the locktime specified
+in any transaction in that block.
+
+Miners get to choose what time they use for their header time, with the
+consensus rule being that no node will accept a block whose time is more
+than two hours in the future.  This creates a incentive for miners to
+set their header times to future values in order to include locktimed
+transactions which weren't supposed to be included for up to two more
+hours.
+
+The consensus rules also specify that valid blocks may have a header
+time greater than that of the median of the 11 previous blocks.  This
+GetMedianTimePast() time has a key feature we generally associate with
+time: it can't go backwards.
+
+[BIP113][] specifies a soft fork enforced in this release that
+weakens this perverse incentive for individual miners to use a future
+time by requiring that valid blocks have a computed GetMedianTimePast()
+greater than the locktime specified in any transaction in that block.
+
+Mempool inclusion rules currently require transactions to be valid for
+immediate inclusion in a block in order to be accepted into the mempool.
+This release begins applying the BIP113 rule to received transactions,
+so transaction whose time is greater than the GetMedianTimePast() will
+no longer be accepted into the mempool.
+
+**Implication for miners:** you will begin rejecting transactions that
+would not be valid under BIP113, which will prevent you from producing
+invalid blocks when BIP113 is enforced on the network. Any
+transactions which are valid under the current rules but not yet valid
+under the BIP113 rules will either be mined by other miners or delayed
+until they are valid under BIP113. Note, however, that time-based
+locktime transactions are more or less unseen on the network currently.
+
+**Implication for users:** GetMedianTimePast() always trails behind the
+current time, so a transaction locktime set to the present time will be
+rejected by nodes running this release until the median time moves
+forward. To compensate, subtract one hour (3,600 seconds) from your
+locktimes to allow those transactions to be included in mempools at
+approximately the expected time.
+
+For more information about the implementation, see
+<https://github.com/bitcoin/bitcoin/pull/6566>
+
+Miscellaneous
+-------------
+
+The p2p alert system is off by default. To turn on, use `-alert` with
+startup configuration.
+
+0.12.1 Change log
+=================
+
+Detailed release notes follow. This overview includes changes that affect
+behavior, not code moves, refactors and string updates. For convenience in locating
+the code changes and accompanying discussion, both the pull request and
+git merge commit are mentioned.
+
+### RPC and other APIs
+- #7739 `7ffc2bd` Add abandoned status to listtransactions (jonasschnelli)
+
+### Block and transaction handling
+- #7543 `834aaef` Backport BIP9, BIP68 and BIP112 with softfork (btcdrak)
+
+### P2P protocol and network code
+- #7804 `90f1d24` Track block download times per individual block (sipa)
+- #7832 `4c3a00d` Reduce block timeout to 10 minutes (laanwj)
+
+### Validation
+- #7821 `4226aac` init: allow shutdown during 'Activating best chain...' (laanwj)
+- #7835 `46898e7` Version 2 transactions remain non-standard until CSV activates (sdaftuar)
+
+### Build system
+- #7487 `00d57b4` Workaround Travis-side CI issues (luke-jr)
+- #7606 `a10da9a` No need to set -L and --location for curl (MarcoFalke)
+- #7614 `ca8f160` Add curl to packages (now needed for depends) (luke-jr)
+- #7776 `a784675` Remove unnecessary executables from gitian release (laanwj)
+
+### Wallet
+- #7715 `19866c1` Fix calculation of balances and available coins. (morcos)
+
+### Miscellaneous
+- #7617 `f04f4fd` Fix markdown syntax and line terminate LogPrint (MarcoFalke)
+- #7747 `4d035bc` added depends cross compile info (accraze)
+- #7741 `a0cea89` Mark p2p alert system as deprecated (btcdrak)
+- #7780 `c5f94f6` Disable bad-chain alert (btcdrak)
+
+Credits
+=======
+
+Thanks to everyone who directly contributed to this release:
+
+- accraze
+- Alex Morcos
+- BtcDrak
+- Jonas Schnelli
+- Luke Dashjr
+- MarcoFalke
+- Mark Friedenbach
+- NicolasDorier
+- Pieter Wuille
+- Suhas Daftuar
+- Wladimir J. van der Laan
+
+As well as everyone that helped translating on [Transifex](https://www.transifex.com/projects/p/bitcoin/).
+
diff --git a/doc/release-notes/release-notes-0.13.0.md b/doc/release-notes/release-notes-0.13.0.md
new file mode 100644
index 0000000000000..5dd3f5a651ea2
--- /dev/null
+++ b/doc/release-notes/release-notes-0.13.0.md
@@ -0,0 +1,863 @@
+Bitcoin Core version 0.13.0 is now available from:
+
+  <https://bitcoin.org/bin/bitcoin-core-0.13.0/>
+
+This is a new major version release, including new features, various bugfixes
+and performance improvements, as well as updated translations.
+
+Please report bugs using the issue tracker at github:
+
+  <https://github.com/bitcoin/bitcoin/issues>
+
+To receive security and update notifications, please subscribe to:
+
+  <https://bitcoincore.org/en/list/announcements/join/>
+
+Compatibility
+==============
+
+Microsoft ended support for Windows XP on [April 8th, 2014](https://www.microsoft.com/en-us/WindowsForBusiness/end-of-xp-support),
+an OS initially released in 2001. This means that not even critical security
+updates will be released anymore. Without security updates, using a bitcoin
+wallet on a XP machine is irresponsible at least.
+
+In addition to that, with 0.12.x there have been varied reports of Bitcoin Core
+randomly crashing on Windows XP. It is [not clear](https://github.com/bitcoin/bitcoin/issues/7681#issuecomment-217439891)
+what the source of these crashes is, but it is likely that upstream
+libraries such as Qt are no longer being tested on XP.
+
+We do not have time nor resources to provide support for an OS that is
+end-of-life. From 0.13.0 on, Windows XP is no longer supported. Users are
+suggested to upgrade to a newer verion of Windows, or install an alternative OS
+that is supported.
+
+No attempt is made to prevent installing or running the software on Windows XP,
+you can still do so at your own risk, but do not expect it to work: do not
+report issues about Windows XP to the issue tracker.
+
+Notable changes
+===============
+
+Database cache memory increased
+--------------------------------
+
+As a result of growth of the UTXO set, performance with the prior default
+database cache of 100 MiB has suffered.
+For this reason the default was changed to 300 MiB in this release.
+
+For nodes on low-memory systems, the database cache can be changed back to
+100 MiB (or to another value) by either:
+
+- Adding `dbcache=100` in bitcoin.conf
+- Changing it in the GUI under `Options → Size of database cache`
+
+Note that the database cache setting has the most performance impact
+during initial sync of a node, and when catching up after downtime.
+
+
+bitcoin-cli: arguments privacy
+------------------------------
+
+The RPC command line client gained a new argument, `-stdin`
+to read extra arguments from standard input, one per line until EOF/Ctrl-D.
+For example:
+
+    $ src/bitcoin-cli -stdin walletpassphrase
+    mysecretcode
+    120
+    ..... press Ctrl-D here to end input
+    $
+
+It is recommended to use this for sensitive information such as wallet
+passphrases, as command-line arguments can usually be read from the process
+table by any user on the system.
+
+
+C++11 and Python 3
+------------------
+
+Various code modernizations have been done. The Bitcoin Core code base has
+started using C++11. This means that a C++11-capable compiler is now needed for
+building. Effectively this means GCC 4.7 or higher, or Clang 3.3 or higher.
+
+When cross-compiling for a target that doesn't have C++11 libraries, configure with
+`./configure --enable-glibc-back-compat ... LDFLAGS=-static-libstdc++`.
+
+For running the functional tests in `qa/rpc-tests`, Python3.4 or higher is now
+required.
+
+
+Linux ARM builds
+----------------
+
+Due to popular request, Linux ARM builds have been added to the uploaded
+executables.
+
+The following extra files can be found in the download directory or torrent:
+
+- `bitcoin-${VERSION}-arm-linux-gnueabihf.tar.gz`: Linux binaries for the most
+  common 32-bit ARM architecture.
+- `bitcoin-${VERSION}-aarch64-linux-gnu.tar.gz`: Linux binaries for the most
+  common 64-bit ARM architecture.
+
+ARM builds are still experimental. If you have problems on a certain device or
+Linux distribution combination please report them on the bug tracker, it may be
+possible to resolve them.
+
+Note that Android is not considered ARM Linux in this context. The executables
+are not expected to work out of the box on Android.
+
+
+Compact Block support (BIP 152)
+-------------------------------
+
+Support for block relay using the Compact Blocks protocol has been implemented
+in PR 8068.
+
+The primary goal is reducing the bandwidth spikes at relay time, though in many
+cases it also reduces propagation delay. It is automatically enabled between
+compatible peers.
+[BIP 152](https://github.com/bitcoin/bips/blob/master/bip-0152.mediawiki)
+
+As a side-effect, ordinary non-mining nodes will download and upload blocks
+faster if those blocks were produced by miners using similar transaction
+filtering policies. This means that a miner who produces a block with many
+transactions discouraged by your node will be relayed slower than one with
+only transactions already in your memory pool. The overall effect of such
+relay differences on the network may result in blocks which include widely-
+discouraged transactions losing a stale block race, and therefore miners may
+wish to configure their node to take common relay policies into consideration.
+
+
+Hierarchical Deterministic Key Generation
+-----------------------------------------
+Newly created wallets will use hierarchical deterministic key generation
+according to BIP32 (keypath m/0'/0'/k').
+Existing wallets will still use traditional key generation.
+
+Backups of HD wallets, regardless of when they have been created, can
+therefore be used to re-generate all possible private keys, even the
+ones which haven't already been generated during the time of the backup.
+**Attention:** Encrypting the wallet will create a new seed which requires
+a new backup!
+
+Wallet dumps (created using the `dumpwallet` RPC) will contain the deterministic
+seed. This is expected to allow future versions to import the seed and all
+associated funds, but this is not yet implemented.
+
+HD key generation for new wallets can be disabled by `-usehd=0`. Keep in
+mind that this flag only has affect on newly created wallets.
+You can't disable HD key generation once you have created a HD wallet.
+
+There is no distinction between internal (change) and external keys.
+
+HD wallets are incompatible with older versions of Bitcoin Core.
+
+[Pull request](https://github.com/bitcoin/bitcoin/pull/8035/files), [BIP 32](https://github.com/bitcoin/bips/blob/master/bip-0032.mediawiki)
+
+
+Segregated Witness
+------------------
+
+The code preparations for Segregated Witness ("segwit"), as described in [BIP
+141](https://github.com/bitcoin/bips/blob/master/bip-0141.mediawiki), [BIP
+143](https://github.com/bitcoin/bips/blob/master/bip-0143.mediawiki), [BIP
+144](https://github.com/bitcoin/bips/blob/master/bip-0144.mediawiki), and [BIP
+145](https://github.com/bitcoin/bips/blob/master/bip-0145.mediawiki) are
+finished and included in this release.  However, BIP 141 does not yet specify
+activation parameters on mainnet, and so this release does not support segwit
+use on mainnet.  Testnet use is supported, and after BIP 141 is updated with
+proposed parameters, a future release of Bitcoin Core is expected that
+implements those parameters for mainnet.
+
+Furthermore, because segwit activation is not yet specified for mainnet,
+version 0.13.0 will behave similarly as other pre-segwit releases even after a
+future activation of BIP 141 on the network.  Upgrading from 0.13.0 will be
+required in order to utilize segwit-related features on mainnet (such as signal
+BIP 141 activation, mine segwit blocks, fully validate segwit blocks, relay
+segwit blocks to other segwit nodes, and use segwit transactions in the
+wallet, etc).
+
+
+Mining transaction selection ("Child Pays For Parent")
+------------------------------------------------------
+
+The mining transaction selection algorithm has been replaced with an algorithm
+that selects transactions based on their feerate inclusive of unconfirmed
+ancestor transactions.  This means that a low-fee transaction can become more
+likely to be selected if a high-fee transaction that spends its outputs is
+relayed.
+
+With this change, the `-blockminsize` command line option has been removed.
+
+The command line option `-blockmaxsize` remains an option to specify the
+maximum number of serialized bytes in a generated block.  In addition, the new
+command line option `-blockmaxweight` has been added, which specifies the
+maximum "block weight" of a generated block, as defined by [BIP 141 (Segregated
+Witness)] (https://github.com/bitcoin/bips/blob/master/bip-0141.mediawiki).
+
+In preparation for Segregated Witness, the mining algorithm has been modified
+to optimize transaction selection for a given block weight, rather than a given
+number of serialized bytes in a block.  In this release, transaction selection
+is unaffected by this distinction (as BIP 141 activation is not supported on
+mainnet in this release, see above), but in future releases and after BIP 141
+activation, these calculations would be expected to differ.
+
+For optimal runtime performance, miners using this release should specify
+`-blockmaxweight` on the command line, and not specify `-blockmaxsize`.
+Additionally (or only) specifying `-blockmaxsize`, or relying on default
+settings for both, may result in performance degradation, as the logic to
+support `-blockmaxsize` performs additional computation to ensure that
+constraint is met.  (Note that for mainnet, in this release, the equivalent
+parameter for `-blockmaxweight` would be four times the desired
+`-blockmaxsize`.  See [BIP 141]
+(https://github.com/bitcoin/bips/blob/master/bip-0141.mediawiki) for additional
+details.)
+
+In the future, the `-blockmaxsize` option may be removed, as block creation is
+no longer optimized for this metric.  Feedback is requested on whether to
+deprecate or keep this command line option in future releases.
+
+
+Reindexing changes
+------------------
+
+In earlier versions, reindexing did validation while reading through the block
+files on disk. These two have now been split up, so that all blocks are known
+before validation starts. This was necessary to make certain optimizations that
+are available during normal synchronizations also available during reindexing.
+
+The two phases are distinct in the Bitcoin-Qt GUI. During the first one,
+"Reindexing blocks on disk" is shown. During the second (slower) one,
+"Processing blocks on disk" is shown.
+
+It is possible to only redo validation now, without rebuilding the block index,
+using the command line option `-reindex-chainstate` (in addition to
+`-reindex` which does both). This new option is useful when the blocks on disk
+are assumed to be fine, but the chainstate is still corrupted. It is also
+useful for benchmarks.
+
+
+Removal of internal miner
+--------------------------
+
+As CPU mining has been useless for a long time, the internal miner has been
+removed in this release, and replaced with a simpler implementation for the
+test framework.
+
+The overall result of this is that `setgenerate` RPC call has been removed, as
+well as the `-gen` and `-genproclimit` command-line options.
+
+For testing, the `generate` call can still be used to mine a block, and a new
+RPC call `generatetoaddress` has been added to mine to a specific address. This
+works with wallet disabled.
+
+
+New bytespersigop implementation
+--------------------------------
+
+The former implementation of the bytespersigop filter accidentally broke bare
+multisig (which is meant to be controlled by the `permitbaremultisig` option),
+since the consensus protocol always counts these older transaction forms as 20
+sigops for backwards compatibility. Simply fixing this bug by counting more
+accurately would have reintroduced a vulnerability. It has therefore been
+replaced with a new implementation that rather than filter such transactions,
+instead treats them (for fee purposes only) as if they were in fact the size
+of a transaction actually using all 20 sigops.
+
+
+Low-level P2P changes
+----------------------
+
+- The optional new p2p message "feefilter" is implemented and the protocol
+  version is bumped to 70013. Upon receiving a feefilter message from a peer,
+  a node will not send invs for any transactions which do not meet the filter
+  feerate. [BIP 133](https://github.com/bitcoin/bips/blob/master/bip-0133.mediawiki)
+
+- The P2P alert system has been removed in PR #7692 and the `alert` P2P message
+  is no longer supported.
+
+- The transaction relay mechanism used to relay one quarter of all transactions
+  instantly, while queueing up the rest and sending them out in batch. As
+  this resulted in chains of dependent transactions being reordered, it
+  systematically hurt transaction relay. The relay code was redesigned in PRs
+  \#7840 and #8082, and now always batches transactions announcements while also
+  sorting them according to dependency order. This significantly reduces orphan
+  transactions. To compensate for the removal of instant relay, the frequency of
+  batch sending was doubled for outgoing peers.
+
+- Since PR #7840 the BIP35 `mempool` command is also subject to batch processing.
+  Also the `mempool` message is no longer handled for non-whitelisted peers when
+  `NODE_BLOOM` is disabled through `-peerbloomfilters=0`.
+
+- The maximum size of orphan transactions that are kept in memory until their
+  ancestors arrive has been raised in PR #8179 from 5000 to 99999 bytes. They
+  are now also removed from memory when they are included in a block, conflict
+  with a block, and time out after 20 minutes.
+
+- We respond at most once to a getaddr request during the lifetime of a
+  connection since PR #7856.
+
+- Connections to peers who have recently been the first one to give us a valid
+  new block or transaction are protected from disconnections since PR #8084.
+
+
+Low-level RPC changes
+----------------------
+
+- RPC calls have been added to output detailed statistics for individual mempool
+  entries, as well as to calculate the in-mempool ancestors or descendants of a
+  transaction: see `getmempoolentry`, `getmempoolancestors`, `getmempooldescendants`.
+
+- `gettxoutsetinfo` UTXO hash (`hash_serialized`) has changed. There was a divergence between
+  32-bit and 64-bit platforms, and the txids were missing in the hashed data. This has been
+  fixed, but this means that the output will be different than from previous versions.
+
+- Full UTF-8 support in the RPC API. Non-ASCII characters in, for example,
+  wallet labels have always been malformed because they weren't taken into account
+  properly in JSON RPC processing. This is no longer the case. This also affects
+  the GUI debug console.
+
+- Asm script outputs replacements for OP_NOP2 and OP_NOP3
+
+  - OP_NOP2 has been renamed to OP_CHECKLOCKTIMEVERIFY by [BIP 
+65](https://github.com/bitcoin/bips/blob/master/bip-0065.mediawiki)
+
+  - OP_NOP3 has been renamed to OP_CHECKSEQUENCEVERIFY by [BIP 
+112](https://github.com/bitcoin/bips/blob/master/bip-0112.mediawiki)
+
+  - The following outputs are affected by this change:
+
+    - RPC `getrawtransaction` (in verbose mode)
+    - RPC `decoderawtransaction`
+    - RPC `decodescript`
+    - REST `/rest/tx/` (JSON format)
+    - REST `/rest/block/` (JSON format when including extended tx details)
+    - `bitcoin-tx -json`
+
+- The sorting of the output of the `getrawmempool` output has changed.
+
+- New RPC commands: `generatetoaddress`, `importprunedfunds`, `removeprunedfunds`, `signmessagewithprivkey`,
+  `getmempoolancestors`, `getmempooldescendants`, `getmempoolentry`,
+  `createwitnessaddress`, `addwitnessaddress`.
+
+- Removed RPC commands: `setgenerate`, `getgenerate`.
+
+- New options were added to `fundrawtransaction`: `includeWatching`, `changeAddress`, `changePosition` and `feeRate`.
+
+
+Low-level ZMQ changes
+----------------------
+
+- Each ZMQ notification now contains an up-counting sequence number that allows
+  listeners to detect lost notifications.
+  The sequence number is always the last element in a multi-part ZMQ notification and
+  therefore backward compatible. Each message type has its own counter.
+  PR [#7762](https://github.com/bitcoin/bitcoin/pull/7762).
+
+
+0.13.0 Change log
+=================
+
+Detailed release notes follow. This overview includes changes that affect
+behavior, not code moves, refactors and string updates. For convenience in locating
+the code changes and accompanying discussion, both the pull request and
+git merge commit are mentioned.
+
+### RPC and other APIs
+
+- #7156 `9ee02cf` Remove cs_main lock from `createrawtransaction` (laanwj)
+- #7326 `2cd004b` Fix typo, wrong information in gettxout help text (paveljanik)
+- #7222 `82429d0` Indicate which transactions are signaling opt-in RBF (sdaftuar)
+- #7480 `b49a623` Changed getnetworkhps value to double to avoid overflow (instagibbs)
+- #7550 `8b958ab` Input-from-stdin mode for bitcoin-cli (laanwj)
+- #7670 `c9a1265` Use cached block hash in blockToJSON() (rat4)
+- #7726 `9af69fa` Correct importaddress help reference to importpubkey (CypherGrue)
+- #7766 `16555b6` Register calls where they are defined (laanwj)
+- #7797 `e662a76` Fix generatetoaddress failing to parse address (mruddy)
+- #7774 `916b15a` Add versionHex in getblock and getblockheader JSON results (mruddy)
+- #7863 `72c54e3` Getblockchaininfo: make bip9_softforks an object, not an array (rustyrussell)
+- #7842 `d97101e` Do not print minping time in getpeerinfo when no ping received yet (paveljanik)
+- #7518 `be14ca5` Add multiple options to fundrawtransaction (promag)
+- #7756 `9e47fce` Add cursor to iterate over utxo set, use this in `gettxoutsetinfo` (laanwj)
+- #7848 `88616d2` Divergence between 32- and 64-bit when hashing >4GB affects `gettxoutsetinfo` (laanwj)
+- #7827 `4205ad7` Speed up `getchaintips` (mrbandrews)
+- #7762 `a1eb344` Append a message sequence number to every ZMQ notification (jonasschnelli)
+- #7688 `46880ed` List solvability in listunspent output and improve help (sipa)
+- #7926 `5725807` Push back `getaddednodeinfo` dead value (instagibbs)
+- #7953 `0630353` Create `signmessagewithprivkey` rpc (achow101)
+- #8049 `c028c7b` Expose information on whether transaction relay is enabled in `getnetworkinfo` (laanwj)
+- #7967 `8c1e49b` Add feerate option to `fundrawtransaction` (jonasschnelli)
+- #8118 `9b6a48c` Reduce unnecessary hashing in `signrawtransaction` (jonasnick)
+- #7957 `79004d4` Add support for transaction sequence number (jonasschnelli)
+- #8153 `75ec320` `fundrawtransaction` feeRate: Use BTC/kB (MarcoFalke)
+- #7292 `7ce9ac5` Expose ancestor/descendant information over RPC (sdaftuar)
+- #8171 `62fcf27` Fix createrawtx sequence number unsigned int parsing (jonasschnelli)
+- #7892 `9c3d0fa` Add full UTF-8 support to RPC (laanwj)
+- #8317 `304eff3` Don't use floating point in rpcwallet (MarcoFalke)
+- #8258 `5a06ebb` Hide softfork in `getblockchaininfo` if timeout is 0 (jl2012)
+- #8244 `1922e5a` Remove unnecessary LOCK(cs_main) in getrawmempool (dcousens)
+
+### Block and transaction handling
+
+- #7056 `6a07208` Save last db read (morcos)
+- #6842 `0192806` Limitfreerelay edge case bugfix (ptschip)
+- #7084 `11d74f6` Replace maxFeeRate of 10000*minRelayTxFee with maxTxFee in mempool (MarcoFalke)
+- #7539 `9f33dba` Add tags to mempool's mapTx indices (sdaftuar)
+- #7592 `26a2a72` Re-remove ERROR logging for mempool rejects (laanwj)
+- #7187 `14d6324` Keep reorgs fast for SequenceLocks checks (morcos)
+- #7594 `01f4267` Mempool: Add tracking of ancestor packages (sdaftuar)
+- #7904 `fc9e334` Txdb: Fix assert crash in new UTXO set cursor (laanwj)
+- #7927 `f9c2ac7` Minor changes to dbwrapper to simplify support for other databases (laanwj)
+- #7933 `e26b620` Fix OOM when deserializing UTXO entries with invalid length (sipa)
+- #8020 `5e374f7` Use SipHash-2-4 for various non-cryptographic hashes (sipa)
+- #8076 `d720980` VerifyDB: don't check blocks that have been pruned (sdaftuar)
+- #8080 `862fd24` Do not use mempool for GETDATA for tx accepted after the last mempool req (gmaxwell)
+- #7997 `a82f033` Replace mapNextTx with slimmer setSpends (kazcw)
+- #8220 `1f86d64` Stop trimming when mapTx is empty (sipa)
+- #8273 `396f9d6` Bump `-dbcache` default to 300MiB (laanwj)
+- #7225 `eb33179` Eliminate unnecessary call to CheckBlock (sdaftuar)
+- #7907 `006cdf6` Optimize and Cleanup CScript::FindAndDelete (pstratem)
+- #7917 `239d419` Optimize reindex (sipa)
+- #7763 `3081fb9` Put hex-encoded version in UpdateTip (sipa)
+- #8149 `d612837` Testnet-only segregated witness (sipa)
+- #8305 `3730393` Improve handling of unconnecting headers (sdaftuar)
+- #8363 `fca1a41` Rename "block cost" to "block weight" (sdaftuar)
+- #8381 `f84ee3d` Make witness v0 outputs non-standard (jl2012)
+- #8364 `3f65ba2` Treat high-sigop transactions as larger rather than rejecting them (sipa)
+
+### P2P protocol and network code
+
+- #6589 `dc0305d` Log bytes recv/sent per command (jonasschnelli)
+- #7164 `3b43cad` Do not download transactions during initial blockchain sync (ptschip)
+- #7458 `898fedf` peers.dat, banlist.dat recreated when missing (kirkalx)
+- #7637 `3da5d1b` Fix memleak in TorController (laanwj, jonasschnelli)
+- #7553 `9f14e5a` Remove vfReachable and modify IsReachable to only use vfLimited (pstratem)
+- #7708 `9426632` De-neuter NODE_BLOOM (pstratem)
+- #7692 `29b2be6` Remove P2P alert system (btcdrak)
+- #7542 `c946a15` Implement "feefilter" P2P message (morcos)
+- #7573 `352fd57` Add `-maxtimeadjustment` command line option (mruddy)
+- #7570 `232592a` Add IPv6 Link-Local Address Support (mruddy)
+- #7874 `e6a4d48` Improve AlreadyHave (morcos)
+- #7856 `64e71b3` Only send one GetAddr response per connection (gmaxwell)
+- #7868 `7daa3ad` Split DNS resolving functionality out of net structures (theuni)
+- #7919 `7617682` Fix headers announcements edge case (sdaftuar)
+- #7514 `d9594bf` Fix IsInitialBlockDownload for testnet (jmacwhyte)
+- #7959 `03cf6e8` fix race that could fail to persist a ban (kazcw)
+- #7840 `3b9a0bf` Several performance and privacy improvements to inv/mempool handling (sipa)
+- #8011 `65aecda` Don't run ThreadMessageHandler at lowered priority (kazcw)
+- #7696 `5c3f8dd` Fix de-serialization bug where AddrMan is left corrupted (EthanHeilman)
+- #7932 `ed749bd` CAddrMan::Deserialize handle corrupt serializations better (pstratem)
+- #7906 `83121cc` Prerequisites for p2p encapsulation changes (theuni)
+- #8033 `18436d8` Fix Socks5() connect failures to be less noisy and less unnecessarily scary (wtogami)
+- #8082 `01d8359` Defer inserting into maprelay until just before relaying (gmaxwell)
+- #7960 `6a22373` Only use AddInventoryKnown for transactions (sdaftuar)
+- #8078 `2156fa2` Disable the mempool P2P command when bloom filters disabled (petertodd)
+- #8065 `67c91f8` Addrman offline attempts (gmaxwell)
+- #7703 `761cddb` Tor: Change auth order to only use password auth if -torpassword (laanwj)
+- #8083 `cd0c513` Add support for dnsseeds with option to filter by servicebits (jonasschnelli)
+- #8173 `4286f43` Use SipHash for node eviction (sipa)
+- #8154 `1445835` Drop vAddrToSend after sending big addr message (kazcw)
+- #7749 `be9711e` Enforce expected outbound services (sipa)
+- #8208 `0a64777` Do not set extra flags for unfiltered DNS seed results (sipa)
+- #8084 `e4bb4a8` Add recently accepted blocks and txn to AttemptToEvictConnection (gmaxwell)
+- #8113 `3f89a53` Rework addnode behaviour (sipa)
+- #8179 `94ab58b` Evict orphans which are included or precluded by accepted blocks (gmaxwell)
+- #8068 `e9d76a1` Compact Blocks (TheBlueMatt)
+- #8204 `0833894` Update petertodd's testnet seed (petertodd)
+- #8247 `5cd35d3` Mark my dnsseed as supporting filtering (sipa)
+- #8275 `042c323` Remove bad chain alert partition check (btcdrak)
+- #8271 `1bc9c80` Do not send witnesses in cmpctblock (sipa)
+- #8312 `ca40ef6` Fix mempool DoS vulnerability from malleated transactions (sdaftuar)
+- #7180 `16ccb74` Account for `sendheaders` `verack` messages (laanwj)
+- #8102 `425278d` Bugfix: use global ::fRelayTxes instead of CNode in version send (sipa)
+- #8408 `b7e2011` Prevent fingerprinting, disk-DoS with compact blocks (sdaftuar)
+
+### Build system
+
+- #7302 `41f1a3e` C++11 build/runtime fixes (theuni)
+- #7322 `fd9356b` c++11: add scoped enum fallbacks to CPPFLAGS rather than defining them locally (theuni)
+- #7441 `a6771fc` Use Debian 8.3 in gitian build guide (fanquake)
+- #7349 `152a821` Build against system UniValue when available (luke-jr)
+- #7520 `621940e` LibreSSL doesn't define OPENSSL_VERSION, use LIBRESSL_VERSION_TEXT instead (paveljanik)
+- #7528 `9b9bfce` autogen.sh: warn about needing autoconf if autoreconf is not found (knocte)
+- #7504 `19324cf` Crystal clean make clean (paveljanik)
+- #7619 `18b3f1b` Add missing sudo entry in gitian VM setup (btcdrak)
+- #7616 `639ec58`  [depends] Delete unused patches  (MarcoFalke)
+- #7658 `c15eb28` Add curl to Gitian setup instructions (btcdrak)
+- #7710 `909b72b` [Depends] Bump miniupnpc and config.guess+sub (fanquake)
+- #7723 `5131005` build: python 3 compatibility (laanwj)
+- #7477 `28ad4d9` Fix quoting of copyright holders in configure.ac (domob1812)
+- #7711 `a67bc5e` [build-aux] Update Boost & check macros to latest serials (fanquake)
+- #7788 `4dc1b3a` Use relative paths instead of absolute paths in protoc calls (paveljanik)
+- #7809 `bbd210d` depends: some base fixes/changes (theuni)
+- #7603 `73fc922` Build System: Use PACKAGE_TARNAME in NSIS script (JeremyRand)
+- #7905 `187186b` test: move accounting_tests and rpc_wallet_tests to wallet/test (laanwj)
+- #7911 `351abf9` leveldb: integrate leveldb into our buildsystem (theuni)
+- #7944 `a407807` Re-instate TARGET_OS=linux in configure.ac. Removed by 351abf9e035 (randy-waterhouse)
+- #7920 `c3e3cfb` Switch Travis to Trusty (theuni)
+- #7954 `08b37c5` build: quiet annoying warnings without adding new ones (theuni)
+- #7165 `06162f1` build: Enable C++11 in build, require C++11 compiler (laanwj)
+- #7982 `559fbae` build: No need to check for leveldb atomics (theuni)
+- #8002 `f9b4582` [depends] Add -stdlib=libc++ to darwin CXX flags (fanquake)
+- #7993 `6a034ed` [depends] Bump Freetype, ccache, ZeroMQ, miniupnpc, expat (fanquake)
+- #8167 `19ea173` Ship debug tarballs/zips with debug symbols (theuni)
+- #8175 `f0299d8` Add --disable-bench to config flags for windows (laanwj)
+- #7283 `fd9881a` [gitian] Default reference_datetime to commit author date (MarcoFalke)
+- #8181 `9201ce8` Get rid of `CLIENT_DATE` (laanwj)
+- #8133 `fde0ac4` Finish up out-of-tree changes (theuni)
+- #8188 `65a9d7d` Add armhf/aarch64 gitian builds (theuni)
+- #8194 `cca1c8c` [gitian] set correct PATH for wrappers (MarcoFalke)
+- #8198 `5201614` Sync ax_pthread with upstream draft4 (fanquake)
+- #8210 `12a541e` [Qt] Bump to Qt5.6.1 (jonasschnelli)
+- #8285 `da50997` windows: Add testnet link to installer (laanwj)
+- #8304 `0cca2fe` [travis] Update SDK_URL (MarcoFalke)
+- #8310 `6ae20df` Require boost for bench (theuni)
+- #8315 `2e51590` Don't require sudo for Linux (theuni)
+- #8314 `67caef6` Fix pkg-config issues for 0.13 (theuni)
+- #8373 `1fe7f40` Fix OSX non-deterministic dmg (theuni)
+- #8358 `cfd1280` Gbuild: Set memory explicitly (default is too low) (MarcoFalke)
+
+### GUI
+
+- #7154 `00b4b8d` Add InMempool() info to transaction details (jonasschnelli)
+- #7068 `5f3c670` [RPC-Tests] add simple way to run rpc test over QT clients (jonasschnelli)
+- #7218 `a1c185b` Fix misleading translation (MarcoFalke)
+- #7214 `be9a9a3` qt5: Use the fixed font the system recommends (MarcoFalke)
+- #7256 `08ab906` Add note to coin control dialog QT5 workaround (fanquake)
+- #7255 `e289807` Replace some instances of formatWithUnit with formatHtmlWithUnit (fanquake)
+- #7317 `3b57e9c` Fix RPCTimerInterface ordering issue (jonasschnelli)
+- #7327 `c079d79` Transaction View: LastMonth calculation fixed (crowning-)
+- #7334 `e1060c5` coincontrol workaround is still needed in qt5.4 (fixed in qt5.5) (MarcoFalke)
+- #7383 `ae2db67` Rename "amount" to "requested amount" in receive coins table (jonasschnelli)
+- #7396 `cdcbc59` Add option to increase/decrease font size in the console window (jonasschnelli)
+- #7437 `9645218` Disable tab navigation for peers tables (Kefkius)
+- #7604 `354b03d` build: Remove spurious dollar sign. Fixes #7189 (dooglus)
+- #7605 `7f001bd` Remove openssl info from init/log and from Qt debug window (jonasschnelli)
+- #7628 `87d6562` Add 'copy full transaction details' option (ericshawlinux)
+- #7613 `3798e5d` Add autocomplete to bitcoin-qt's console window (GamerSg)
+- #7668 `b24266c` Fix history deletion bug after font size change (achow101)
+- #7680 `41d2dfa` Remove reflection from `about` icon (laanwj)
+- #7686 `f034bce` Remove 0-fee from send dialog (MarcoFalke)
+- #7506 `b88e0b0` Use CCoinControl selection in CWallet::FundTransaction (promag)
+- #7732 `0b98dd7` Debug window: replace "Build date" with "Datadir" (jonasschnelli)
+- #7761 `60db51d` remove trailing output-index from transaction-id (jonasschnelli)
+- #7772 `6383268` Clear the input line after activating autocomplete (paveljanik)
+- #7925 `f604bf6` Fix out-of-tree GUI builds (laanwj)
+- #7939 `574ddc6` Make it possible to show details for multiple transactions (laanwj)
+- #8012 `b33824b` Delay user confirmation of send (Tyler-Hardin)
+- #8006 `7c8558d` Add option to disable the system tray icon (Tyler-Hardin)
+- #8046 `169d379` Fix Cmd-Q / Menu Quit shutdown on OSX (jonasschnelli)
+- #8042 `6929711` Don't allow to open the debug window during splashscreen & verification state (jonasschnelli)
+- #8014 `77b49ac` Sort transactions by date (Tyler-Hardin)
+- #8073 `eb2f6f7` askpassphrasedialog: Clear pass fields on accept (rat4)
+- #8129 `ee1533e` Fix RPC console auto completer (UdjinM6)
+- #7636 `fb0ac48` Add bitcoin address label to request payment QR code (makevoid)
+- #8231 `760a6c7` Fix a bug where the SplashScreen will not be hidden during startup (jonasschnelli)
+- #8256 `af2421c` BUG: bitcoin-qt crash (fsb4000)
+- #8257 `ff03c50` Do not ask a UI question from bitcoind (sipa)
+- #8288 `91abb77` Network-specific example address (laanwj)
+- #7707 `a914968` UI support for abandoned transactions (jonasschnelli)
+- #8207 `f7a403b` Add a link to the Bitcoin-Core repository and website to the About Dialog (MarcoFalke)
+- #8281 `6a87eb0` Remove client name from debug window (laanwj)
+- #8407 `45eba4b` Add dbcache migration path (jonasschnelli)
+
+### Wallet
+
+- #7262 `fc08994` Reduce inefficiency of GetAccountAddress() (dooglus)
+- #7537 `78e81b0` Warn on unexpected EOF while salvaging wallet (laanwj)
+- #7521 `3368895` Don't resend wallet txs that aren't in our own mempool (morcos)
+- #7576 `86a1ec5` Move wallet help string creation to CWallet (jonasschnelli)
+- #7577 `5b3b5a7` Move "load wallet phase" to CWallet (jonasschnelli)
+- #7608 `0735c0c` Move hardcoded file name out of log messages (MarcoFalke)
+- #7649 `4900641` Prevent multiple calls to CWallet::AvailableCoins (promag)
+- #7646 `e5c3511` Fix lockunspent help message (promag)
+- #7558 `b35a591` Add import/removeprunedfunds rpc call (instagibbs)
+- #6215 `48c5adf` add bip32 pub key serialization (jonasschnelli)
+- #7913 `bafd075` Fix for incorrect locking in GetPubKey() (keystore.cpp) (yurizhykin)
+- #8036 `41138f9` init: Move berkeleydb version reporting to wallet (laanwj)
+- #8028 `373b50d` Fix insanity of CWalletDB::WriteTx and CWalletTx::WriteToDisk (pstratem)
+- #8061 `f6b7df3` Improve Wallet encapsulation (pstratem)
+- #7891 `950be19` Always require OS randomness when generating secret keys (sipa)
+- #7689 `b89ef13` Replace OpenSSL AES with ctaes-based version (sipa)
+- #7825 `f972b04` Prevent multiple calls to ExtractDestination (pedrobranco)
+- #8137 `243ac0c` Improve CWallet API with new AccountMove function (pstratem)
+- #8142 `52c3f34` Improve CWallet API  with new GetAccountPubkey function (pstratem)
+- #8035 `b67a472` Add simplest BIP32/deterministic key generation implementation (jonasschnelli)
+- #7687 `a6ddb19` Stop treating importaddress'ed scripts as change (sipa)
+- #8298 `aef3811` wallet: Revert input selection post-pruning (laanwj)
+- #8324 `bc94b87` Keep HD seed during salvagewallet (jonasschnelli)
+- #8323 `238300b` Add HD keypath to CKeyMetadata, report metadata in validateaddress (jonasschnelli)
+- #8367 `3b38a6a` Ensure <0.13 clients can't open HD wallets (jonasschnelli)
+- #8378 `ebea651` Move SetMinVersion for FEATURE_HD to SetHDMasterKey (pstratem)
+- #8390 `73adfe3` Correct hdmasterkeyid/masterkeyid name confusion (jonasschnelli)
+- #8206 `18b8ee1` Add HD xpriv to dumpwallet (jonasschnelli)
+- #8389 `c3c82c4` Create a new HD seed after encrypting the wallet (jonasschnelli)
+
+### Tests and QA
+
+- #7320 `d3dfc6d` Test walletpassphrase timeout (MarcoFalke)
+- #7208 `47c5ed1` Make max tip age an option instead of chainparam (laanwj)
+- #7372 `21376af` Trivial: [qa] wallet: Print maintenance (MarcoFalke)
+- #7280 `668906f` [travis] Fail when documentation is outdated (MarcoFalke)
+- #7177 `93b0576` [qa] Change default block priority size to 0 (MarcoFalke)
+- #7236 `02676c5` Use createrawtx locktime parm in txn_clone (dgenr8)
+- #7212 `326ffed` Adds unittests for CAddrMan and CAddrinfo, removes source of non-determinism (EthanHeilman)
+- #7490 `d007511` tests: Remove May15 test (laanwj)
+- #7531 `18cb2d5` Add bip68-sequence.py to extended rpc tests (btcdrak)
+- #7536 `ce5fc02` test: test leading spaces for ParseHex (laanwj)
+- #7620 `1b68de3` [travis] Only run check-doc.py once (MarcoFalke)
+- #7455 `7f96671` [travis] Exit early when check-doc.py fails (MarcoFalke)
+- #7667 `56d2c4e` Move GetTempPath() to testutil (musalbas)
+- #7517 `f1ca891` test: script_error checking in script_invalid tests (laanwj)
+- #7684 `3d0dfdb` Extend tests (MarcoFalke)
+- #7697 `622fe6c` Tests: make prioritise_transaction.py more robust (sdaftuar)
+- #7709 `efde86b` Tests: fix missing import in mempool_packages (sdaftuar)
+- #7702 `29e1131` Add tests verifychain, lockunspent, getbalance, listsinceblock (MarcoFalke)
+- #7720 `3b4324b` rpc-test: Normalize assert() (MarcoFalke)
+- #7757 `26794d4` wallet: Wait for reindex to catch up (MarcoFalke)
+- #7764 `a65b36c` Don't run pruning.py twice (MarcoFalke)
+- #7773 `7c80e72` Fix comments in tests (btcdrak)
+- #7489 `e9723cb` tests: Make proxy_test work on travis servers without IPv6 (laanwj)
+- #7801 `70ac71b` Remove misleading "errorString syntax" (MarcoFalke)
+- #7803 `401c65c` maxblocksinflight: Actually enable test (MarcoFalke)
+- #7802 `3bc71e1` httpbasics: Actually test second connection (MarcoFalke)
+- #7849 `ab8586e` tests: add varints_bitpatterns test (laanwj)
+- #7846 `491171f` Clean up lockorder data of destroyed mutexes (sipa)
+- #7853 `6ef5e00` py2: Unfiddle strings into bytes explicitly (MarcoFalke)
+- #7878 `53adc83` [test] bctest.py: Revert faa41ee (MarcoFalke)
+- #7798 `cabba24` [travis] Print the commit which was evaluated (MarcoFalke)
+- #7833 `b1bf511` tests: Check Content-Type header returned from RPC server (laanwj)
+- #7851 `fa9d86f` pull-tester: Don't mute zmq ImportError (MarcoFalke)
+- #7822 `0e6fd5e` Add listunspent() test for spendable/unspendable UTXO (jpdffonseca)
+- #7912 `59ad568` Tests: Fix deserialization of reject messages (sdaftuar)
+- #7941 `0ea3941` Fixing comment in script_test.json test case (Christewart)
+- #7807 `0ad1041` Fixed miner test values, gave constants for less error-prone values (instagibbs)
+- #7980 `88b77c7` Smartfees: Properly use ordered dict (MarcoFalke)
+- #7814 `77b637f` Switch to py3 (MarcoFalke)
+- #8030 `409a8a1` Revert fatal-ness of missing python-zmq (laanwj)
+- #8018 `3e90fe6` Autofind rpc tests --srcdir (jonasschnelli)
+- #8016 `5767e80` Fix multithread CScheduler and reenable test (paveljanik)
+- #7972 `423ca30` pull-tester: Run rpc test in parallel  (MarcoFalke)
+- #8039 `69b3a6d` Bench: Add crypto hash benchmarks (laanwj)
+- #8041 `5b736dd` Fix bip9-softforks blockstore issue (MarcoFalke)
+- #7994 `1f01443` Add op csv tests to script_tests.json (Christewart)
+- #8038 `e2bf830` Various minor fixes (MarcoFalke)
+- #8072 `1b87e5b` Travis: 'make check' in parallel and verbose (MarcoFalke)
+- #8056 `8844ef1` Remove hardcoded "4 nodes" from test_framework (MarcoFalke)
+- #8047 `37f9a1f` Test_framework: Set wait-timeout for bitcoind procs (MarcoFalke)
+- #8095 `6700cc9` Test framework: only cleanup on successful test runs (sdaftuar)
+- #8098 `06bd4f6` Test_framework: Append portseed to tmpdir (MarcoFalke)
+- #8104 `6ff2c8d` Add timeout to sync_blocks() and sync_mempools() (sdaftuar)
+- #8111 `61b8684` Benchmark SipHash (sipa)
+- #8107 `52b803e` Bench: Added base58 encoding/decoding benchmarks (yurizhykin)
+- #8115 `0026e0e` Avoid integer division in the benchmark inner-most loop (gmaxwell)
+- #8090 `a2df115` Adding P2SH(p2pkh) script test case (Christewart)
+- #7992 `ec45cc5` Extend #7956 with one more test (TheBlueMatt)
+- #8139 `ae5575b` Fix interrupted HTTP RPC connection workaround for Python 3.5+ (sipa)
+- #8164 `0f24eaf` [Bitcoin-Tx] fix missing test fixtures, fix 32bit atoi issue (jonasschnelli)
+- #8166 `0b5279f` Src/test: Do not shadow local variables (paveljanik)
+- #8141 `44c1b1c` Continuing port of java comparison tool (mrbandrews)
+- #8201 `36b7400` fundrawtransaction: Fix race, assert amounts (MarcoFalke)
+- #8214 `ed2cd59` Mininode: fail on send_message instead of silent return (MarcoFalke)
+- #8215 `a072d1a` Don't use floating point in wallet tests (MarcoFalke)
+- #8066 `65c2058` Test_framework: Use different rpc_auth_pair for each node (MarcoFalke)
+- #8216 `0d41d70` Assert 'changePosition out of bounds'  (MarcoFalke)
+- #8222 `961893f` Enable mempool consistency checks in unit tests (sipa)
+- #7751 `84370d5` test_framework: python3.4 authproxy compat (laanwj)
+- #7744 `d8e862a` test_framework: detect failure of bitcoind startup (laanwj)
+- #8280 `115735d` Increase sync_blocks() timeouts in pruning.py (MarcoFalke)
+- #8340 `af9b7a9` Solve trivial merge conflict in p2p-segwit.py (MarcoFalke)
+- #8067 `3e4cf8f` Travis: use slim generic image, and some fixups (theuni)
+- #7951 `5c7df70` Test_framework: Properly print exception (MarcoFalke)
+- #8070 `7771aa5` Remove non-determinism which is breaking net_tests #8069 (EthanHeilman)
+- #8309 `bb2646a` Add wallet-hd test (MarcoFalke)
+- #8444 `cd0910b` Fix p2p-feefilter.py for changed tx relay behavior (sdaftuar)
+
+### Mining
+
+- #7507 `11c7699` Remove internal miner (Leviathn)
+- #7663 `c87f51e` Make the generate RPC call function for non-regtest (sipa)
+- #7671 `e2ebd25` Add generatetoaddress RPC to mine to an address (achow101)
+- #7935 `66ed450` Versionbits: GBT support (luke-jr)
+- #7600 `66db2d6` Select transactions using feerate-with-ancestors (sdaftuar)
+- #8295 `f5660d3` Mining-related fixups for 0.13.0 (sdaftuar)
+- #7796 `536b75e` Add support for negative fee rates, fixes `prioritizetransaction` (MarcoFalke)
+- #8362 `86edc20` Scale legacy sigop count in CreateNewBlock (sdaftuar)
+- #8489 `8b0eee6` Bugfix: Use pre-BIP141 sigops until segwit activates (GBT) (luke-jr)
+
+### Documentation and miscellaneous
+
+- #7423 `69e2a40` Add example for building with constrained resources (jarret)
+- #8254 `c2c69ed` Add OSX ZMQ requirement to QA readme (fanquake)
+- #8203 `377d131` Clarify documentation for running a tor node (nathaniel-mahieu)
+- #7428 `4b12266` Add example for listing ./configure flags (nathaniel-mahieu)
+- #7847 `3eae681` Add arch linux build example (mruddy)
+- #7968 `ff69aaf` Fedora build requirements (wtogami)
+- #8013 `fbedc09` Fedora build requirements, add gcc-c++ and fix typo (wtogami)
+- #8009 `fbd8478` Fixed invalid example paths in gitian-building.md (JeremyRand)
+- #8240 `63fbdbc` Mention Windows XP end of support in release notes (laanwj)
+- #8303 `5077d2c` Update bips.md for CSV softfork (fanquake)
+- #7789 `e0b3e19` Add note about using the Qt official binary installer (paveljanik)
+- #7791 `e30a5b0` Change Precise to Trusty in gitian-building.md (JeremyRand)
+- #7838 `8bb5d3d` Update gitian build guide to debian 8.4.0 (fanquake)
+- #7855 `b778e59` Replace precise with trusty (MarcoFalke)
+- #7975 `fc23fee` Update bitcoin-core GitHub links (MarcoFalke)
+- #8034 `e3a8207` Add basic git squash workflow (fanquake)
+- #7813 `214ec0b` Update port in tor.md (MarcoFalke)
+- #8193 `37c9830` Use Debian 8.5 in the gitian-build guide (fanquake)
+- #8261 `3685e0c` Clarify help for `getblockchaininfo` (paveljanik)
+- #7185 `ea0f5a2` Note that reviewers should mention the id of the commits they reviewed (pstratem)
+- #7290 `c851d8d` [init] Add missing help for args (MarcoFalke)
+- #7281 `f9fd4c2` Improve CheckInputs() comment about sig verification (petertodd)
+- #7417 `1e06bab` Minor improvements to the release process (PRabahy)
+- #7444 `4cdbd42` Improve block validity/ConnectBlock() comments (petertodd)
+- #7527 `db2e1c0` Fix and cleanup listreceivedbyX documentation (instagibbs)
+- #7541 `b6e00af` Clarify description of blockindex (pinheadmz)
+- #7590 `f06af57` Improving wording related to Boost library requirements [updated] (jonathancross)
+- #7635 `0fa88ef` Add dependency info to test docs (elliotolds)
+- #7609 `3ba07bd` RPM spec file project (AliceWonderMiscreations)
+- #7850 `229a17c` Removed call to `TryCreateDirectory` from `GetDefaultDataDir` in `src/util.cpp` (alexreg)
+- #7888 `ec870e1` Prevector: fix 2 bugs in currently unreached code paths (kazcw)
+- #7922 `90653bc` CBase58Data::SetString: cleanse the full vector (kazcw)
+- #7881 `c4e8390` Update release process (laanwj)
+- #7952 `a9c8b74` Log invalid block hash to make debugging easier (paveljanik)
+- #7974 `8206835` More comments on the design of AttemptToEvictConnection (gmaxwell)
+- #7795 `47a7cfb` UpdateTip: log only one line at most per block (laanwj)
+- #8110 `e7e25ea` Add benchmarking notes (fanquake)
+- #8121 `58f0c92` Update implemented BIPs list (fanquake)
+- #8029 `58725ba` Simplify OS X build notes (fanquake)
+- #8143 `d46b8b5` comment nit: miners don't vote (instagibbs)
+- #8136 `22e0b35` Log/report in 10% steps during VerifyDB (jonasschnelli)
+- #8168 `d366185` util: Add ParseUInt32 and ParseUInt64 (laanwj)
+- #8178 `f7b1bfc` Add git and github tips and tricks to developer notes (sipa)
+- #8177 `67db011` developer notes: updates for C++11 (kazcw)
+- #8229 `8ccdac1` [Doc] Update OS X build notes for 10.11 SDK (fanquake)
+- #8233 `9f1807a` Mention Linux ARM executables in release process and notes (laanwj)
+- #7540 `ff46dd4` Rename OP_NOP3 to OP_CHECKSEQUENCEVERIFY (btcdrak)
+- #8289 `26316ff` bash-completion: Adapt for 0.12 and 0.13 (roques)
+- #7453 `3dc3149` Missing patches from 0.12 (MarcoFalke)
+- #7113 `54a550b` Switch to a more efficient rolling Bloom filter (sipa)
+- #7257 `de9e5ea` Combine common error strings for different options so translations can be shared and reused (luke-jr)
+- #7304 `b8f485c` [contrib] Add clang-format-diff.py (MarcoFalke)
+- #7378 `e6f97ef` devtools: replace github-merge with python version (laanwj)
+- #7395 `0893705` devtools: show pull and commit information in github-merge (laanwj)
+- #7402 `6a5932b` devtools: github-merge get toplevel dir without extra whitespace (achow101)
+- #7425 `20a408c` devtools: Fix utf-8 support in messages for github-merge (laanwj)
+- #7632 `409f843` Delete outdated test-patches reference (Lewuathe)
+- #7662 `386f438` remove unused NOBLKS_VERSION_{START,END} constants (rat4)
+- #7737 `aa0d2b2` devtools: make github-merge.py use py3 (laanwj)
+- #7781 `55db5f0` devtools: Auto-set branch to merge to in github-merge (laanwj)
+- #7934 `f17032f` Improve rolling bloom filter performance and benchmark (sipa)
+- #8004 `2efe38b` signal handling: fReopenDebugLog and fRequestShutdown should be type sig_atomic_t (catilac)
+- #7713 `f6598df` Fixes for verify-commits script (petertodd)
+- #8412 `8360d5b` libconsensus: Expose a flag for BIP112 (jtimon)
+
+Credits
+=======
+
+Thanks to everyone who directly contributed to this release:
+
+- 21E14
+- accraze
+- Adam Brown
+- Alexander Regueiro
+- Alex Morcos
+- Alfie John
+- Alice Wonder
+- AlSzacrel
+- Andrew Chow
+- Andrés G. Aragoneses
+- Bob McElrath
+- BtcDrak
+- calebogden
+- Cédric Félizard
+- Chirag Davé
+- Chris Moore
+- Chris Stewart
+- Christian von Roques
+- Chris Wheeler
+- Cory Fields
+- crowning-
+- Daniel Cousens
+- Daniel Kraft
+- Denis Lukianov
+- Elias Rohrer
+- Elliot Olds
+- Eric Shaw
+- error10
+- Ethan Heilman
+- face
+- fanquake
+- Francesco 'makevoid' Canessa
+- fsb4000
+- Gavin Andresen
+- gladoscc
+- Gregory Maxwell
+- Gregory Sanders
+- instagibbs
+- James O'Beirne
+- Jannes Faber
+- Jarret Dyrbye
+- Jeremy Rand
+- jloughry
+- jmacwhyte
+- Joao Fonseca
+- Johnson Lau
+- Jonas Nick
+- Jonas Schnelli
+- Jonathan Cross
+- João Barbosa
+- Jorge Timón
+- Kaz Wesley
+- Kefkius
+- kirkalx
+- Krzysztof Jurewicz
+- Leviathn
+- lewuathe
+- Luke Dashjr
+- Luv Khemani
+- Marcel Krüger
+- Marco Falke
+- Mark Friedenbach
+- Matt
+- Matt Bogosian
+- Matt Corallo
+- Matthew English
+- Matthew Zipkin
+- mb300sd
+- Mitchell Cash
+- mrbandrews
+- mruddy
+- Murch
+- Mustafa
+- Nathaniel Mahieu
+- Nicolas Dorier
+- Patrick Strateman
+- Paul Rabahy
+- paveljanik
+- Pavel Janík
+- Pavel Vasin
+- Pedro Branco
+- Peter Todd
+- Philip Kaufmann
+- Pieter Wuille
+- Prayag Verma
+- ptschip
+- Puru
+- randy-waterhouse
+- R E Broadley
+- Rusty Russell
+- Suhas Daftuar
+- Suriyaa Kudo
+- TheLazieR Yip
+- Thomas Kerin
+- Tom Harding
+- Tyler Hardin
+- UdjinM6
+- Warren Togami
+- Will Binns
+- Wladimir J. van der Laan
+- Yuri Zhykin
+
+As well as everyone that helped translating on [Transifex](https://www.transifex.com/projects/p/bitcoin/).

From dbb1f640e67da25f0a41b9d2e696b789d2fd4e0d Mon Sep 17 00:00:00 2001
From: Ethan Heilman <Ethan.R.Heilman@gmail.com>
Date: Fri, 17 Jun 2016 00:10:07 -0400
Subject: [PATCH 0757/1802] Added feeler connections increasing good addrs in
 the tried table.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Tests if addresses are online or offline by briefly connecting to them. These short lived connections are referred to as feeler connections. Feeler connections are designed to increase the number of fresh online addresses in tried by selecting and connecting to addresses in new. One feeler connection is attempted on average once every two minutes.

This change was suggested as Countermeasure 4 in
Eclipse Attacks on Bitcoin’s Peer-to-Peer Network, Ethan Heilman,
Alison Kendler, Aviv Zohar, Sharon Goldberg. ePrint Archive Report
2015/263. March 2015.
---
 src/main.cpp           |  6 +++++
 src/net.cpp            | 59 ++++++++++++++++++++++++++++++++++++------
 src/net.h              |  5 +++-
 src/test/net_tests.cpp | 22 ++++++++++++++++
 4 files changed, 83 insertions(+), 9 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index 75f991d31a723..758a6dcce1924 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -4903,6 +4903,12 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
 
     if (strCommand == NetMsgType::VERSION)
     {
+        // Feeler connections exist only to verify if address is online.
+        if (pfrom->fFeeler) {
+            assert(pfrom->fInbound == false);
+            pfrom->fDisconnect = true;
+        }
+
         // Each connection can only send one version message
         if (pfrom->nVersion != 0)
         {
diff --git a/src/net.cpp b/src/net.cpp
index 39c8d12e2081f..33dc10cbcbe2a 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -43,6 +43,9 @@
 // Dump addresses to peers.dat and banlist.dat every 15 minutes (900s)
 #define DUMP_ADDRESSES_INTERVAL 900
 
+// We add a random period time (0 to 1 seconds) to feeler connections to prevent synchronization.
+#define FEELER_SLEEP_WINDOW 1
+
 #if !defined(HAVE_MSG_NOSIGNAL) && !defined(MSG_NOSIGNAL)
 #define MSG_NOSIGNAL 0
 #endif
@@ -61,6 +64,7 @@
 
 namespace {
     const int MAX_OUTBOUND_CONNECTIONS = 8;
+    const int MAX_FEELER_CONNECTIONS = 1;
 
     struct ListenSocket {
         SOCKET socket;
@@ -1017,7 +1021,8 @@ static void AcceptConnection(const ListenSocket& hListenSocket) {
     SOCKET hSocket = accept(hListenSocket.socket, (struct sockaddr*)&sockaddr, &len);
     CAddress addr;
     int nInbound = 0;
-    int nMaxInbound = nMaxConnections - MAX_OUTBOUND_CONNECTIONS;
+    int nMaxInbound = nMaxConnections - (MAX_OUTBOUND_CONNECTIONS + MAX_FEELER_CONNECTIONS);
+    assert(nMaxInbound > 0);
 
     if (hSocket != INVALID_SOCKET)
         if (!addr.SetSockAddr((const struct sockaddr*)&sockaddr))
@@ -1613,6 +1618,9 @@ void ThreadOpenConnections()
 
     // Initiate network connections
     int64_t nStart = GetTime();
+
+    // Minimum time before next feeler connection (in microseconds).
+    int64_t nNextFeeler = PoissonNextSend(nStart*1000*1000, FEELER_INTERVAL);
     while (true)
     {
         ProcessOneShot();
@@ -1652,13 +1660,36 @@ void ThreadOpenConnections()
                 }
             }
         }
+        assert(nOutbound <= (MAX_OUTBOUND_CONNECTIONS + MAX_FEELER_CONNECTIONS));
 
-        int64_t nANow = GetAdjustedTime();
+        // Feeler Connections
+        //
+        // Design goals:
+        //  * Increase the number of connectable addresses in the tried table.
+        //
+        // Method:
+        //  * Choose a random address from new and attempt to connect to it if we can connect 
+        //    successfully it is added to tried.
+        //  * Start attempting feeler connections only after node finishes making outbound 
+        //    connections.
+        //  * Only make a feeler connection once every few minutes.
+        //
+        bool fFeeler = false;
+        if (nOutbound >= MAX_OUTBOUND_CONNECTIONS) {
+            int64_t nTime = GetTimeMicros(); // The current time right now (in microseconds).
+            if (nTime > nNextFeeler) {
+                nNextFeeler = PoissonNextSend(nTime, FEELER_INTERVAL);
+                fFeeler = true;
+            } else {
+                continue;
+            }
+        }
 
+        int64_t nANow = GetAdjustedTime();
         int nTries = 0;
         while (true)
         {
-            CAddrInfo addr = addrman.Select();
+            CAddrInfo addr = addrman.Select(fFeeler);
 
             // if we selected an invalid address, restart
             if (!addr.IsValid() || setConnected.count(addr.GetGroup()) || IsLocal(addr))
@@ -1694,8 +1725,17 @@ void ThreadOpenConnections()
             break;
         }
 
-        if (addrConnect.IsValid())
-            OpenNetworkConnection(addrConnect, (int)setConnected.size() >= std::min(nMaxConnections - 1, 2), &grant);
+        if (addrConnect.IsValid()) {
+
+            if (fFeeler) {
+                // Add small amount of random noise before connection to avoid synchronization.
+                int randsleep = GetRandInt(FEELER_SLEEP_WINDOW * 1000);
+                MilliSleep(randsleep);
+                LogPrint("net", "Making feeler connection to %s\n", addrConnect.ToString());
+            }
+
+            OpenNetworkConnection(addrConnect, (int)setConnected.size() >= std::min(nMaxConnections - 1, 2), &grant, NULL, false, fFeeler);
+        }
     }
 }
 
@@ -1777,7 +1817,7 @@ void ThreadOpenAddedConnections()
 }
 
 // if successful, this moves the passed grant to the constructed node
-bool OpenNetworkConnection(const CAddress& addrConnect, bool fCountFailure, CSemaphoreGrant *grantOutbound, const char *pszDest, bool fOneShot)
+bool OpenNetworkConnection(const CAddress& addrConnect, bool fCountFailure, CSemaphoreGrant *grantOutbound, const char *pszDest, bool fOneShot, bool fFeeler)
 {
     //
     // Initiate outbound network connection
@@ -1801,6 +1841,8 @@ bool OpenNetworkConnection(const CAddress& addrConnect, bool fCountFailure, CSem
     pnode->fNetworkNode = true;
     if (fOneShot)
         pnode->fOneShot = true;
+    if (fFeeler)
+        pnode->fFeeler = true;
 
     return true;
 }
@@ -2062,7 +2104,7 @@ void StartNode(boost::thread_group& threadGroup, CScheduler& scheduler)
 
     if (semOutbound == NULL) {
         // initialize semaphore
-        int nMaxOutbound = std::min(MAX_OUTBOUND_CONNECTIONS, nMaxConnections);
+        int nMaxOutbound = std::min((MAX_OUTBOUND_CONNECTIONS + MAX_FEELER_CONNECTIONS), nMaxConnections);
         semOutbound = new CSemaphore(nMaxOutbound);
     }
 
@@ -2107,7 +2149,7 @@ bool StopNode()
     LogPrintf("StopNode()\n");
     MapPort(false);
     if (semOutbound)
-        for (int i=0; i<MAX_OUTBOUND_CONNECTIONS; i++)
+        for (int i=0; i<(MAX_OUTBOUND_CONNECTIONS + MAX_FEELER_CONNECTIONS); i++)
             semOutbound->post();
 
     if (fAddressesInitialized)
@@ -2448,6 +2490,7 @@ CNode::CNode(SOCKET hSocketIn, const CAddress& addrIn, const std::string& addrNa
     fWhitelisted = false;
     fOneShot = false;
     fClient = false; // set by version message
+    fFeeler = false;
     fInbound = fInboundIn;
     fNetworkNode = false;
     fSuccessfullyConnected = false;
diff --git a/src/net.h b/src/net.h
index ea03defc408cf..1ba2d47da7d8c 100644
--- a/src/net.h
+++ b/src/net.h
@@ -41,6 +41,8 @@ namespace boost {
 static const int PING_INTERVAL = 2 * 60;
 /** Time after which to disconnect, after waiting for a ping response (or inactivity). */
 static const int TIMEOUT_INTERVAL = 20 * 60;
+/** Run the feeler connection loop once every 2 minutes or 120 seconds. **/
+static const int FEELER_INTERVAL = 120;
 /** The maximum number of entries in an 'inv' protocol message */
 static const unsigned int MAX_INV_SZ = 50000;
 /** The maximum number of new addresses to accumulate before announcing. */
@@ -89,7 +91,7 @@ CNode* FindNode(const CSubNet& subNet);
 CNode* FindNode(const std::string& addrName);
 CNode* FindNode(const CService& ip);
 CNode* FindNode(const NodeId id); //TODO: Remove this
-bool OpenNetworkConnection(const CAddress& addrConnect, bool fCountFailure, CSemaphoreGrant *grantOutbound = NULL, const char *strDest = NULL, bool fOneShot = false);
+bool OpenNetworkConnection(const CAddress& addrConnect, bool fCountFailure, CSemaphoreGrant *grantOutbound = NULL, const char *strDest = NULL, bool fOneShot = false, bool fFeeler = false);
 void MapPort(bool fUseUPnP);
 unsigned short GetListenPort();
 bool BindListenPort(const CService &bindAddr, std::string& strError, bool fWhitelisted = false);
@@ -350,6 +352,7 @@ class CNode
     // the network or wire types and the cleaned string used when displayed or logged.
     std::string strSubVer, cleanSubVer;
     bool fWhitelisted; // This peer can bypass DoS banning.
+    bool fFeeler; // If true this node is being used as a short lived feeler.
     bool fOneShot;
     bool fClient;
     bool fInbound;
diff --git a/src/test/net_tests.cpp b/src/test/net_tests.cpp
index 6511e6ffa24f1..267d1b55e13e8 100644
--- a/src/test/net_tests.cpp
+++ b/src/test/net_tests.cpp
@@ -150,4 +150,26 @@ BOOST_AUTO_TEST_CASE(caddrdb_read_corrupted)
     BOOST_CHECK(addrman2.size() == 0);
 }
 
+BOOST_AUTO_TEST_CASE(cnode_simple_test)
+{
+    SOCKET hSocket = INVALID_SOCKET;
+
+    in_addr ipv4Addr;
+    ipv4Addr.s_addr = 0xa0b0c001;
+    
+    CAddress addr = CAddress(CService(ipv4Addr, 7777), NODE_NETWORK);
+    std::string pszDest = "";
+    bool fInboundIn = false;
+
+    // Test that fFeeler is false by default.
+    CNode* pnode1 = new CNode(hSocket, addr, pszDest, fInboundIn);
+    BOOST_CHECK(pnode1->fInbound == false);
+    BOOST_CHECK(pnode1->fFeeler == false);
+
+    fInboundIn = true;
+    CNode* pnode2 = new CNode(hSocket, addr, pszDest, fInboundIn);
+    BOOST_CHECK(pnode2->fInbound == true);
+    BOOST_CHECK(pnode2->fFeeler == false);
+}
+
 BOOST_AUTO_TEST_SUITE_END()

From c91103573b7a928eebf9f564658537111d458a4f Mon Sep 17 00:00:00 2001
From: djpnewton <djpnewton@gmail.com>
Date: Wed, 24 Aug 2016 08:41:42 +1200
Subject: [PATCH 0758/1802] Add default port numbers to REST doc

---
 doc/REST-interface.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/REST-interface.md b/doc/REST-interface.md
index bf669235e38a2..7fbb174030271 100644
--- a/doc/REST-interface.md
+++ b/doc/REST-interface.md
@@ -3,6 +3,8 @@ Unauthenticated REST Interface
 
 The REST API can be enabled with the `-rest` option.
 
+The interface runs on the same port as the JSON-RPC interface, by default port 8332 for mainnet and port 18332 for testnet.
+
 Supported API
 -------------
 

From 40a95cfd8f21bedbf35016b920f26c19bfb25c69 Mon Sep 17 00:00:00 2001
From: Jonas Schnelli <dev@jonasschnelli.ch>
Date: Wed, 24 Aug 2016 09:06:56 +0200
Subject: [PATCH 0759/1802] Set jonasschnellis dns-seeder filter flag

---
 src/chainparams.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/chainparams.cpp b/src/chainparams.cpp
index ea6e3aada24ad..e6be1b5d5b716 100644
--- a/src/chainparams.cpp
+++ b/src/chainparams.cpp
@@ -118,7 +118,7 @@ class CMainParams : public CChainParams {
         vSeeds.push_back(CDNSSeedData("dashjr.org", "dnsseed.bitcoin.dashjr.org")); // Luke Dashjr
         vSeeds.push_back(CDNSSeedData("bitcoinstats.com", "seed.bitcoinstats.com")); // Christian Decker
         vSeeds.push_back(CDNSSeedData("xf2.org", "bitseed.xf2.org")); // Jeff Garzik
-        vSeeds.push_back(CDNSSeedData("bitcoin.jonasschnelli.ch", "seed.bitcoin.jonasschnelli.ch")); // Jonas Schnelli
+        vSeeds.push_back(CDNSSeedData("bitcoin.jonasschnelli.ch", "seed.bitcoin.jonasschnelli.ch", true)); // Jonas Schnelli
 
         base58Prefixes[PUBKEY_ADDRESS] = std::vector<unsigned char>(1,0);
         base58Prefixes[SCRIPT_ADDRESS] = std::vector<unsigned char>(1,5);

From fa8dd785a2d82e190ada724aa1c46dbd66fb3067 Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Fri, 5 Aug 2016 17:09:16 +0200
Subject: [PATCH 0760/1802] [qt] Remove Priority from coincontrol dialog

---
 src/qt/coincontroldialog.cpp      | 90 ++++---------------------------
 src/qt/coincontroldialog.h        |  8 ---
 src/qt/forms/coincontroldialog.ui | 61 ++++-----------------
 src/qt/forms/sendcoinsdialog.ui   | 39 ++------------
 src/qt/sendcoinsdialog.cpp        |  9 ----
 src/qt/sendcoinsdialog.h          |  1 -
 6 files changed, 27 insertions(+), 181 deletions(-)

diff --git a/src/qt/coincontroldialog.cpp b/src/qt/coincontroldialog.cpp
index 837f8ba6c18f5..f53242100cac7 100644
--- a/src/qt/coincontroldialog.cpp
+++ b/src/qt/coincontroldialog.cpp
@@ -76,7 +76,6 @@ CoinControlDialog::CoinControlDialog(const PlatformStyle *platformStyle, QWidget
     QAction *clipboardFeeAction = new QAction(tr("Copy fee"), this);
     QAction *clipboardAfterFeeAction = new QAction(tr("Copy after fee"), this);
     QAction *clipboardBytesAction = new QAction(tr("Copy bytes"), this);
-    QAction *clipboardPriorityAction = new QAction(tr("Copy priority"), this);
     QAction *clipboardLowOutputAction = new QAction(tr("Copy dust"), this);
     QAction *clipboardChangeAction = new QAction(tr("Copy change"), this);
 
@@ -85,7 +84,6 @@ CoinControlDialog::CoinControlDialog(const PlatformStyle *platformStyle, QWidget
     connect(clipboardFeeAction, SIGNAL(triggered()), this, SLOT(clipboardFee()));
     connect(clipboardAfterFeeAction, SIGNAL(triggered()), this, SLOT(clipboardAfterFee()));
     connect(clipboardBytesAction, SIGNAL(triggered()), this, SLOT(clipboardBytes()));
-    connect(clipboardPriorityAction, SIGNAL(triggered()), this, SLOT(clipboardPriority()));
     connect(clipboardLowOutputAction, SIGNAL(triggered()), this, SLOT(clipboardLowOutput()));
     connect(clipboardChangeAction, SIGNAL(triggered()), this, SLOT(clipboardChange()));
 
@@ -94,7 +92,6 @@ CoinControlDialog::CoinControlDialog(const PlatformStyle *platformStyle, QWidget
     ui->labelCoinControlFee->addAction(clipboardFeeAction);
     ui->labelCoinControlAfterFee->addAction(clipboardAfterFeeAction);
     ui->labelCoinControlBytes->addAction(clipboardBytesAction);
-    ui->labelCoinControlPriority->addAction(clipboardPriorityAction);
     ui->labelCoinControlLowOutput->addAction(clipboardLowOutputAction);
     ui->labelCoinControlChange->addAction(clipboardChangeAction);
 
@@ -124,16 +121,14 @@ CoinControlDialog::CoinControlDialog(const PlatformStyle *platformStyle, QWidget
     ui->treeWidget->headerItem()->setText(COLUMN_CHECKBOX, QString());
 
     ui->treeWidget->setColumnWidth(COLUMN_CHECKBOX, 84);
-    ui->treeWidget->setColumnWidth(COLUMN_AMOUNT, 100);
-    ui->treeWidget->setColumnWidth(COLUMN_LABEL, 170);
-    ui->treeWidget->setColumnWidth(COLUMN_ADDRESS, 290);
-    ui->treeWidget->setColumnWidth(COLUMN_DATE, 110);
-    ui->treeWidget->setColumnWidth(COLUMN_CONFIRMATIONS, 100);
-    ui->treeWidget->setColumnWidth(COLUMN_PRIORITY, 100);
+    ui->treeWidget->setColumnWidth(COLUMN_AMOUNT, 110);
+    ui->treeWidget->setColumnWidth(COLUMN_LABEL, 190);
+    ui->treeWidget->setColumnWidth(COLUMN_ADDRESS, 320);
+    ui->treeWidget->setColumnWidth(COLUMN_DATE, 130);
+    ui->treeWidget->setColumnWidth(COLUMN_CONFIRMATIONS, 110);
     ui->treeWidget->setColumnHidden(COLUMN_TXHASH, true);         // store transaction hash in this column, but don't show it
     ui->treeWidget->setColumnHidden(COLUMN_VOUT_INDEX, true);     // store vout index in this column, but don't show it
     ui->treeWidget->setColumnHidden(COLUMN_AMOUNT_INT64, true);   // store amount int64 in this column, but don't show it
-    ui->treeWidget->setColumnHidden(COLUMN_PRIORITY_INT64, true); // store priority int64 in this column, but don't show it
     ui->treeWidget->setColumnHidden(COLUMN_DATE_INT64, true);     // store date int64 in this column, but don't show it
 
     // default view is sorted by amount desc
@@ -325,12 +320,6 @@ void CoinControlDialog::clipboardBytes()
     GUIUtil::setClipboard(ui->labelCoinControlBytes->text().replace(ASYMP_UTF8, ""));
 }
 
-// copy label "Priority" to clipboard
-void CoinControlDialog::clipboardPriority()
-{
-    GUIUtil::setClipboard(ui->labelCoinControlPriority->text());
-}
-
 // copy label "Dust" to clipboard
 void CoinControlDialog::clipboardLowOutput()
 {
@@ -419,25 +408,6 @@ void CoinControlDialog::viewItemChanged(QTreeWidgetItem* item, int column)
 #endif
 }
 
-// return human readable label for priority number
-QString CoinControlDialog::getPriorityLabel(double dPriority, double mempoolEstimatePriority)
-{
-    double dPriorityMedium = mempoolEstimatePriority;
-
-    if (dPriorityMedium <= 0)
-        dPriorityMedium = AllowFreeThreshold(); // not enough data, back to hard-coded
-
-    if      (dPriority / 1000000 > dPriorityMedium) return tr("highest");
-    else if (dPriority / 100000 > dPriorityMedium)  return tr("higher");
-    else if (dPriority / 10000 > dPriorityMedium)   return tr("high");
-    else if (dPriority / 1000 > dPriorityMedium)    return tr("medium-high");
-    else if (dPriority > dPriorityMedium)           return tr("medium");
-    else if (dPriority * 10 > dPriorityMedium)      return tr("low-medium");
-    else if (dPriority * 100 > dPriorityMedium)     return tr("low");
-    else if (dPriority * 1000 > dPriorityMedium)    return tr("lower");
-    else                                            return tr("lowest");
-}
-
 // shows count of locked unspent outputs
 void CoinControlDialog::updateLabelLocked()
 {
@@ -473,7 +443,6 @@ void CoinControlDialog::updateLabels(WalletModel *model, QDialog* dialog)
         }
     }
 
-    QString sPriorityLabel      = tr("none");
     CAmount nAmount             = 0;
     CAmount nPayFee             = 0;
     CAmount nAfterFee           = 0;
@@ -551,11 +520,6 @@ void CoinControlDialog::updateLabels(WalletModel *model, QDialog* dialog)
             nBytes += nQuantity; // account for the witness byte that holds the number of stack items for each input.
         }
 
-        // Priority
-        double mempoolEstimatePriority = mempool.estimateSmartPriority(nTxConfirmTarget);
-        dPriority = dPriorityInputs / (nBytes - nBytesInputs + (nQuantityUncompressed * 29)); // 29 = 180 - 151 (uncompressed public keys are over the limit. max 151 bytes of the input are ignored for priority)
-        sPriorityLabel = CoinControlDialog::getPriorityLabel(dPriority, mempoolEstimatePriority);
-
         // in the subtract fee from amount case, we can tell if zero change already and subtract the bytes, so that fee calculation afterwards is accurate
         if (CoinControlDialog::fSubtractFeeFromAmount)
             if (nAmount - nPayAmount == 0)
@@ -568,6 +532,8 @@ void CoinControlDialog::updateLabels(WalletModel *model, QDialog* dialog)
 
 
         // Allow free? (require at least hard-coded threshold and default to that if no estimate)
+        double mempoolEstimatePriority = mempool.estimateSmartPriority(nTxConfirmTarget);
+        dPriority = dPriorityInputs / (nBytes - nBytesInputs + (nQuantityUncompressed * 29)); // 29 = 180 - 151 (uncompressed public keys are over the limit. max 151 bytes of the input are ignored for priority)
         double dPriorityNeeded = std::max(mempoolEstimatePriority, AllowFreeThreshold());
         fAllowFree = (dPriority >= dPriorityNeeded);
 
@@ -617,7 +583,6 @@ void CoinControlDialog::updateLabels(WalletModel *model, QDialog* dialog)
     QLabel *l3 = dialog->findChild<QLabel *>("labelCoinControlFee");
     QLabel *l4 = dialog->findChild<QLabel *>("labelCoinControlAfterFee");
     QLabel *l5 = dialog->findChild<QLabel *>("labelCoinControlBytes");
-    QLabel *l6 = dialog->findChild<QLabel *>("labelCoinControlPriority");
     QLabel *l7 = dialog->findChild<QLabel *>("labelCoinControlLowOutput");
     QLabel *l8 = dialog->findChild<QLabel *>("labelCoinControlChange");
 
@@ -633,7 +598,6 @@ void CoinControlDialog::updateLabels(WalletModel *model, QDialog* dialog)
     l3->setText(BitcoinUnits::formatWithUnit(nDisplayUnit, nPayFee));        // Fee
     l4->setText(BitcoinUnits::formatWithUnit(nDisplayUnit, nAfterFee));      // After Fee
     l5->setText(((nBytes > 0) ? ASYMP_UTF8 : "") + QString::number(nBytes));        // Bytes
-    l6->setText(sPriorityLabel);                                             // Priority
     l7->setText(fDust ? tr("yes") : tr("no"));                               // Dust
     l8->setText(BitcoinUnits::formatWithUnit(nDisplayUnit, nChange));        // Change
     if (nPayFee > 0 && (coinControl->nMinimumTotalFee < nPayFee))
@@ -644,21 +608,11 @@ void CoinControlDialog::updateLabels(WalletModel *model, QDialog* dialog)
             l8->setText(ASYMP_UTF8 + l8->text());
     }
 
-    // turn labels "red"
-    l5->setStyleSheet((nBytes >= MAX_FREE_TRANSACTION_CREATE_SIZE) ? "color:red;" : "");// Bytes >= 1000
-    l6->setStyleSheet((dPriority > 0 && !fAllowFree) ? "color:red;" : "");              // Priority < "medium"
-    l7->setStyleSheet((fDust) ? "color:red;" : "");                                     // Dust = "yes"
+    // turn label red when dust
+    l7->setStyleSheet((fDust) ? "color:red;" : "");
 
     // tool tips
-    QString toolTip1 = tr("This label turns red if the transaction size is greater than 1000 bytes.") + "<br /><br />";
-    toolTip1 += tr("This means a fee of at least %1 per kB is required.").arg(BitcoinUnits::formatHtmlWithUnit(nDisplayUnit, CWallet::GetRequiredFee(1000))) + "<br /><br />";
-    toolTip1 += tr("Can vary +/- 1 byte per input.");
-
-    QString toolTip2 = tr("Transactions with higher priority are more likely to get included into a block.") + "<br /><br />";
-    toolTip2 += tr("This label turns red if the priority is smaller than \"medium\".") + "<br /><br />";
-    toolTip2 += tr("This means a fee of at least %1 per kB is required.").arg(BitcoinUnits::formatHtmlWithUnit(nDisplayUnit, CWallet::GetRequiredFee(1000)));
-
-    QString toolTip3 = tr("This label turns red if any recipient receives an amount smaller than the current dust threshold.");
+    QString toolTipDust = tr("This label turns red if any recipient receives an amount smaller than the current dust threshold.");
 
     // how many satoshis the estimated fee can vary per byte we guess wrong
     double dFeeVary;
@@ -671,14 +625,11 @@ void CoinControlDialog::updateLabels(WalletModel *model, QDialog* dialog)
 
     l3->setToolTip(toolTip4);
     l4->setToolTip(toolTip4);
-    l5->setToolTip(toolTip1);
-    l6->setToolTip(toolTip2);
-    l7->setToolTip(toolTip3);
+    l7->setToolTip(toolTipDust);
     l8->setToolTip(toolTip4);
     dialog->findChild<QLabel *>("labelCoinControlFeeText")      ->setToolTip(l3->toolTip());
     dialog->findChild<QLabel *>("labelCoinControlAfterFeeText") ->setToolTip(l4->toolTip());
     dialog->findChild<QLabel *>("labelCoinControlBytesText")    ->setToolTip(l5->toolTip());
-    dialog->findChild<QLabel *>("labelCoinControlPriorityText") ->setToolTip(l6->toolTip());
     dialog->findChild<QLabel *>("labelCoinControlLowOutputText")->setToolTip(l7->toolTip());
     dialog->findChild<QLabel *>("labelCoinControlChangeText")   ->setToolTip(l8->toolTip());
 
@@ -702,7 +653,6 @@ void CoinControlDialog::updateView()
     QFlags<Qt::ItemFlag> flgTristate = Qt::ItemIsSelectable | Qt::ItemIsEnabled | Qt::ItemIsUserCheckable | Qt::ItemIsTristate;
 
     int nDisplayUnit = model->getOptionsModel()->getDisplayUnit();
-    double mempoolEstimatePriority = mempool.estimateSmartPriority(nTxConfirmTarget);
 
     std::map<QString, std::vector<COutput> > mapCoins;
     model->listCoins(mapCoins);
@@ -731,11 +681,8 @@ void CoinControlDialog::updateView()
         }
 
         CAmount nSum = 0;
-        double dPrioritySum = 0;
         int nChildren = 0;
-        int nInputSum = 0;
         BOOST_FOREACH(const COutput& out, coins.second) {
-            int nInputSize = 0;
             nSum += out.tx->vout[out.i].nValue;
             nChildren++;
 
@@ -755,11 +702,6 @@ void CoinControlDialog::updateView()
                 // if listMode or change => show bitcoin address. In tree mode, address is not shown again for direct wallet address outputs
                 if (!treeMode || (!(sAddress == sWalletAddress)))
                     itemOutput->setText(COLUMN_ADDRESS, sAddress);
-
-                CPubKey pubkey;
-                CKeyID *keyid = boost::get<CKeyID>(&outputAddress);
-                if (keyid && model->getPubKey(*keyid, pubkey) && !pubkey.IsCompressed())
-                    nInputSize = 29; // 29 = 180 - 151 (public key is 180 bytes, priority free area is 151 bytes)
             }
 
             // label
@@ -788,13 +730,6 @@ void CoinControlDialog::updateView()
             // confirmations
             itemOutput->setText(COLUMN_CONFIRMATIONS, strPad(QString::number(out.nDepth), 8, " "));
 
-            // priority
-            double dPriority = ((double)out.tx->vout[out.i].nValue  / (nInputSize + 78)) * (out.nDepth+1); // 78 = 2 * 34 + 10
-            itemOutput->setText(COLUMN_PRIORITY, CoinControlDialog::getPriorityLabel(dPriority, mempoolEstimatePriority));
-            itemOutput->setText(COLUMN_PRIORITY_INT64, strPad(QString::number((int64_t)dPriority), 20, " "));
-            dPrioritySum += (double)out.tx->vout[out.i].nValue  * (out.nDepth+1);
-            nInputSum    += nInputSize;
-
             // transaction hash
             uint256 txhash = out.tx->GetHash();
             itemOutput->setText(COLUMN_TXHASH, QString::fromStdString(txhash.GetHex()));
@@ -819,12 +754,9 @@ void CoinControlDialog::updateView()
         // amount
         if (treeMode)
         {
-            dPrioritySum = dPrioritySum / (nInputSum + 78);
             itemWalletAddress->setText(COLUMN_CHECKBOX, "(" + QString::number(nChildren) + ")");
             itemWalletAddress->setText(COLUMN_AMOUNT, BitcoinUnits::format(nDisplayUnit, nSum));
             itemWalletAddress->setText(COLUMN_AMOUNT_INT64, strPad(QString::number(nSum), 15, " "));
-            itemWalletAddress->setText(COLUMN_PRIORITY, CoinControlDialog::getPriorityLabel(dPrioritySum, mempoolEstimatePriority));
-            itemWalletAddress->setText(COLUMN_PRIORITY_INT64, strPad(QString::number((int64_t)dPrioritySum), 20, " "));
         }
     }
 
diff --git a/src/qt/coincontroldialog.h b/src/qt/coincontroldialog.h
index 1a467eb2ffba2..7d73421e3a72b 100644
--- a/src/qt/coincontroldialog.h
+++ b/src/qt/coincontroldialog.h
@@ -40,7 +40,6 @@ class CoinControlDialog : public QDialog
 
     // static because also called from sendcoinsdialog
     static void updateLabels(WalletModel*, QDialog*);
-    static QString getPriorityLabel(double dPriority, double mempoolEstimatePriority);
 
     static QList<CAmount> payAmounts;
     static CCoinControl *coinControl;
@@ -72,11 +71,9 @@ class CoinControlDialog : public QDialog
         COLUMN_ADDRESS,
         COLUMN_DATE,
         COLUMN_CONFIRMATIONS,
-        COLUMN_PRIORITY,
         COLUMN_TXHASH,
         COLUMN_VOUT_INDEX,
         COLUMN_AMOUNT_INT64,
-        COLUMN_PRIORITY_INT64,
         COLUMN_DATE_INT64
     };
 
@@ -87,8 +84,6 @@ class CoinControlDialog : public QDialog
         {
             if (column == COLUMN_AMOUNT_INT64)
                 return COLUMN_AMOUNT;
-            else if (column == COLUMN_PRIORITY_INT64)
-                return COLUMN_PRIORITY;
             else if (column == COLUMN_DATE_INT64)
                 return COLUMN_DATE;
         }
@@ -96,8 +91,6 @@ class CoinControlDialog : public QDialog
         {
             if (column == COLUMN_AMOUNT)
                 return COLUMN_AMOUNT_INT64;
-            else if (column == COLUMN_PRIORITY)
-                return COLUMN_PRIORITY_INT64;
             else if (column == COLUMN_DATE)
                 return COLUMN_DATE_INT64;
         }
@@ -118,7 +111,6 @@ private Q_SLOTS:
     void clipboardFee();
     void clipboardAfterFee();
     void clipboardBytes();
-    void clipboardPriority();
     void clipboardLowOutput();
     void clipboardChange();
     void radioTreeMode(bool);
diff --git a/src/qt/forms/coincontroldialog.ui b/src/qt/forms/coincontroldialog.ui
index c1fef6b9b171a..1ea00eb5c3337 100644
--- a/src/qt/forms/coincontroldialog.ui
+++ b/src/qt/forms/coincontroldialog.ui
@@ -140,7 +140,10 @@
         </widget>
        </item>
        <item row="1" column="0">
-        <widget class="QLabel" name="labelCoinControlPriorityText">
+        <widget class="QLabel" name="labelCoinControlLowOutputText">
+         <property name="enabled">
+          <bool>false</bool>
+         </property>
          <property name="font">
           <font>
            <weight>75</weight>
@@ -148,12 +151,15 @@
           </font>
          </property>
          <property name="text">
-          <string>Priority:</string>
+          <string>Dust:</string>
          </property>
         </widget>
        </item>
        <item row="1" column="1">
-        <widget class="QLabel" name="labelCoinControlPriority">
+        <widget class="QLabel" name="labelCoinControlLowOutput">
+         <property name="enabled">
+          <bool>false</bool>
+         </property>
          <property name="cursor">
           <cursorShape>IBeamCursor</cursorShape>
          </property>
@@ -161,7 +167,7 @@
           <enum>Qt::ActionsContextMenu</enum>
          </property>
          <property name="text">
-          <string notr="true">medium</string>
+          <string notr="true">no</string>
          </property>
          <property name="textInteractionFlags">
           <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
@@ -213,41 +219,6 @@
          </property>
         </widget>
        </item>
-       <item row="1" column="0">
-        <widget class="QLabel" name="labelCoinControlLowOutputText">
-         <property name="enabled">
-          <bool>false</bool>
-         </property>
-         <property name="font">
-          <font>
-           <weight>75</weight>
-           <bold>true</bold>
-          </font>
-         </property>
-         <property name="text">
-          <string>Dust:</string>
-         </property>
-        </widget>
-       </item>
-       <item row="1" column="1">
-        <widget class="QLabel" name="labelCoinControlLowOutput">
-         <property name="enabled">
-          <bool>false</bool>
-         </property>
-         <property name="cursor">
-          <cursorShape>IBeamCursor</cursorShape>
-         </property>
-         <property name="contextMenuPolicy">
-          <enum>Qt::ActionsContextMenu</enum>
-         </property>
-         <property name="text">
-          <string notr="true">no</string>
-         </property>
-         <property name="textInteractionFlags">
-          <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
-         </property>
-        </widget>
-       </item>
       </layout>
      </item>
      <item>
@@ -431,7 +402,7 @@
       <bool>false</bool>
      </property>
      <property name="columnCount">
-      <number>12</number>
+      <number>10</number>
      </property>
      <attribute name="headerShowSortIndicator" stdset="0">
       <bool>true</bool>
@@ -472,16 +443,6 @@
        <string>Confirmed</string>
       </property>
      </column>
-     <column>
-      <property name="text">
-       <string>Priority</string>
-      </property>
-     </column>
-     <column>
-      <property name="text">
-       <string/>
-      </property>
-     </column>
      <column>
       <property name="text">
        <string/>
diff --git a/src/qt/forms/sendcoinsdialog.ui b/src/qt/forms/sendcoinsdialog.ui
index 12d6a62c081b3..06e09074d1453 100644
--- a/src/qt/forms/sendcoinsdialog.ui
+++ b/src/qt/forms/sendcoinsdialog.ui
@@ -332,7 +332,7 @@
                 </widget>
                </item>
                <item row="1" column="0">
-                <widget class="QLabel" name="labelCoinControlPriorityText">
+                <widget class="QLabel" name="labelCoinControlLowOutputText">
                  <property name="font">
                   <font>
                    <weight>75</weight>
@@ -340,12 +340,12 @@
                   </font>
                  </property>
                  <property name="text">
-                  <string>Priority:</string>
+                  <string>Dust:</string>
                  </property>
                 </widget>
                </item>
                <item row="1" column="1">
-                <widget class="QLabel" name="labelCoinControlPriority">
+                <widget class="QLabel" name="labelCoinControlLowOutput">
                  <property name="cursor">
                   <cursorShape>IBeamCursor</cursorShape>
                  </property>
@@ -353,7 +353,7 @@
                   <enum>Qt::ActionsContextMenu</enum>
                  </property>
                  <property name="text">
-                  <string notr="true">medium</string>
+                  <string notr="true">no</string>
                  </property>
                  <property name="textInteractionFlags">
                   <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
@@ -411,36 +411,7 @@
                  </property>
                 </widget>
                </item>
-               <item row="1" column="0">
-                <widget class="QLabel" name="labelCoinControlLowOutputText">
-                 <property name="font">
-                  <font>
-                   <weight>75</weight>
-                   <bold>true</bold>
-                  </font>
-                 </property>
-                 <property name="text">
-                  <string>Dust:</string>
-                 </property>
-                </widget>
-               </item>
-               <item row="1" column="1">
-                <widget class="QLabel" name="labelCoinControlLowOutput">
-                 <property name="cursor">
-                  <cursorShape>IBeamCursor</cursorShape>
-                 </property>
-                 <property name="contextMenuPolicy">
-                  <enum>Qt::ActionsContextMenu</enum>
-                 </property>
-                 <property name="text">
-                  <string notr="true">no</string>
-                 </property>
-                 <property name="textInteractionFlags">
-                  <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
-                 </property>
-                </widget>
-               </item>
-              </layout>
+             </layout>
              </item>
              <item>
               <layout class="QFormLayout" name="formLayoutCoinControl4">
diff --git a/src/qt/sendcoinsdialog.cpp b/src/qt/sendcoinsdialog.cpp
index 6d50be56ecba7..3e96bb18c3ebd 100644
--- a/src/qt/sendcoinsdialog.cpp
+++ b/src/qt/sendcoinsdialog.cpp
@@ -69,7 +69,6 @@ SendCoinsDialog::SendCoinsDialog(const PlatformStyle *platformStyle, QWidget *pa
     QAction *clipboardFeeAction = new QAction(tr("Copy fee"), this);
     QAction *clipboardAfterFeeAction = new QAction(tr("Copy after fee"), this);
     QAction *clipboardBytesAction = new QAction(tr("Copy bytes"), this);
-    QAction *clipboardPriorityAction = new QAction(tr("Copy priority"), this);
     QAction *clipboardLowOutputAction = new QAction(tr("Copy dust"), this);
     QAction *clipboardChangeAction = new QAction(tr("Copy change"), this);
     connect(clipboardQuantityAction, SIGNAL(triggered()), this, SLOT(coinControlClipboardQuantity()));
@@ -77,7 +76,6 @@ SendCoinsDialog::SendCoinsDialog(const PlatformStyle *platformStyle, QWidget *pa
     connect(clipboardFeeAction, SIGNAL(triggered()), this, SLOT(coinControlClipboardFee()));
     connect(clipboardAfterFeeAction, SIGNAL(triggered()), this, SLOT(coinControlClipboardAfterFee()));
     connect(clipboardBytesAction, SIGNAL(triggered()), this, SLOT(coinControlClipboardBytes()));
-    connect(clipboardPriorityAction, SIGNAL(triggered()), this, SLOT(coinControlClipboardPriority()));
     connect(clipboardLowOutputAction, SIGNAL(triggered()), this, SLOT(coinControlClipboardLowOutput()));
     connect(clipboardChangeAction, SIGNAL(triggered()), this, SLOT(coinControlClipboardChange()));
     ui->labelCoinControlQuantity->addAction(clipboardQuantityAction);
@@ -85,7 +83,6 @@ SendCoinsDialog::SendCoinsDialog(const PlatformStyle *platformStyle, QWidget *pa
     ui->labelCoinControlFee->addAction(clipboardFeeAction);
     ui->labelCoinControlAfterFee->addAction(clipboardAfterFeeAction);
     ui->labelCoinControlBytes->addAction(clipboardBytesAction);
-    ui->labelCoinControlPriority->addAction(clipboardPriorityAction);
     ui->labelCoinControlLowOutput->addAction(clipboardLowOutputAction);
     ui->labelCoinControlChange->addAction(clipboardChangeAction);
 
@@ -681,12 +678,6 @@ void SendCoinsDialog::coinControlClipboardBytes()
     GUIUtil::setClipboard(ui->labelCoinControlBytes->text().replace(ASYMP_UTF8, ""));
 }
 
-// Coin Control: copy label "Priority" to clipboard
-void SendCoinsDialog::coinControlClipboardPriority()
-{
-    GUIUtil::setClipboard(ui->labelCoinControlPriority->text());
-}
-
 // Coin Control: copy label "Dust" to clipboard
 void SendCoinsDialog::coinControlClipboardLowOutput()
 {
diff --git a/src/qt/sendcoinsdialog.h b/src/qt/sendcoinsdialog.h
index be4f2ee44ba03..83dac0bd114b9 100644
--- a/src/qt/sendcoinsdialog.h
+++ b/src/qt/sendcoinsdialog.h
@@ -88,7 +88,6 @@ private Q_SLOTS:
     void coinControlClipboardFee();
     void coinControlClipboardAfterFee();
     void coinControlClipboardBytes();
-    void coinControlClipboardPriority();
     void coinControlClipboardLowOutput();
     void coinControlClipboardChange();
     void setMinimumFee();

From 57acb82e7014f3214229349485fa3f57842b10ae Mon Sep 17 00:00:00 2001
From: Andrew Chow <achow101@gmail.com>
Date: Wed, 10 Aug 2016 15:35:22 -0400
Subject: [PATCH 0761/1802] Load choose datadir dialog after options reset

---
 src/qt/intro.cpp        | 3 ++-
 src/qt/optionsmodel.cpp | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/qt/intro.cpp b/src/qt/intro.cpp
index 6d6af54290fd5..390bcd22fbe78 100644
--- a/src/qt/intro.cpp
+++ b/src/qt/intro.cpp
@@ -178,7 +178,7 @@ void Intro::pickDataDirectory()
     /* 2) Allow QSettings to override default dir */
     dataDir = settings.value("strDataDir", dataDir).toString();
 
-    if(!fs::exists(GUIUtil::qstringToBoostPath(dataDir)) || GetBoolArg("-choosedatadir", DEFAULT_CHOOSE_DATADIR))
+    if(!fs::exists(GUIUtil::qstringToBoostPath(dataDir)) || GetBoolArg("-choosedatadir", DEFAULT_CHOOSE_DATADIR) || settings.value("fReset", false).toBool() || GetBoolArg("-resetguisettings", false))
     {
         /* If current default data directory does not exist, let the user choose one */
         Intro intro;
@@ -204,6 +204,7 @@ void Intro::pickDataDirectory()
         }
 
         settings.setValue("strDataDir", dataDir);
+        settings.setValue("fReset", false);
     }
     /* Only override -datadir if different from the default, to make it possible to
      * override -datadir in the bitcoin.conf file in the default data directory
diff --git a/src/qt/optionsmodel.cpp b/src/qt/optionsmodel.cpp
index 7987d8e7ea470..5538a28413ddd 100644
--- a/src/qt/optionsmodel.cpp
+++ b/src/qt/optionsmodel.cpp
@@ -164,6 +164,9 @@ void OptionsModel::Reset()
     // Set strDataDir
     settings.setValue("strDataDir", dataDir);
 
+    // Set that this was reset
+    settings.setValue("fReset", true);
+
     // default setting for OptionsModel::StartAtStartup - disabled
     if (GUIUtil::GetStartOnSystemStartup())
         GUIUtil::SetStartOnSystemStartup(false);

From fab5ecb7719063aa72751df1258dfa4cf4a9a4a9 Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Wed, 24 Aug 2016 19:21:27 +0200
Subject: [PATCH 0762/1802] [wallet] rpc: Drop misleading option

---
 doc/release-notes.md              |  8 +++++++
 qa/rpc-tests/importprunedfunds.py | 35 ++++++++++++-------------------
 src/wallet/rpcdump.cpp            |  7 +------
 3 files changed, 22 insertions(+), 28 deletions(-)

diff --git a/doc/release-notes.md b/doc/release-notes.md
index b99192ae97c9b..0be192233d5ea 100644
--- a/doc/release-notes.md
+++ b/doc/release-notes.md
@@ -41,6 +41,14 @@ report issues about Windows XP to the issue tracker.
 Notable changes
 ===============
 
+Low-level RPC changes
+----------------------
+
+- `importprunedfunds` only accepts two required arguments. Some versions accept
+  an optional third arg, which was always ignored. Make sure to never pass more
+  than two arguments.
+
+
 0.14.0 Change log
 =================
 
diff --git a/qa/rpc-tests/importprunedfunds.py b/qa/rpc-tests/importprunedfunds.py
index eb3c11b4d85db..0dee8ad4ec922 100755
--- a/qa/rpc-tests/importprunedfunds.py
+++ b/qa/rpc-tests/importprunedfunds.py
@@ -20,14 +20,10 @@ def setup_network(self, split=False):
         self.is_network_split=False
         self.sync_all()
 
-    def run_test (self):
-        import time
-        begintime = int(time.time())
-
+    def run_test(self):
         print("Mining blocks...")
         self.nodes[0].generate(101)
 
-        # sync
         self.sync_all()
         
         # address
@@ -72,7 +68,6 @@ def run_test (self):
         rawtxn2 = self.nodes[0].gettransaction(txnid2)['hex']
         proof2 = self.nodes[0].gettxoutproof([txnid2])
 
-
         txnid3 = self.nodes[0].sendtoaddress(address3, 0.025)
         self.nodes[0].generate(1)
         rawtxn3 = self.nodes[0].gettransaction(txnid3)['hex']
@@ -82,28 +77,27 @@ def run_test (self):
 
         #Import with no affiliated address
         try:
-            result1 = self.nodes[1].importprunedfunds(rawtxn1, proof1, "")
+            self.nodes[1].importprunedfunds(rawtxn1, proof1)
         except JSONRPCException as e:
             assert('No addresses' in e.error['message'])
         else:
             assert(False)
 
-
         balance1 = self.nodes[1].getbalance("", 0, True)
         assert_equal(balance1, Decimal(0))
 
         #Import with affiliated address with no rescan
-        self.nodes[1].importaddress(address2, "", False)
-        result2 = self.nodes[1].importprunedfunds(rawtxn2, proof2, "")
-        balance2 = Decimal(self.nodes[1].getbalance("", 0, True))
+        self.nodes[1].importaddress(address2, "add2", False)
+        result2 = self.nodes[1].importprunedfunds(rawtxn2, proof2)
+        balance2 = self.nodes[1].getbalance("add2", 0, True)
         assert_equal(balance2, Decimal('0.05'))
 
         #Import with private key with no rescan
-        self.nodes[1].importprivkey(address3_privkey, "", False)
-        result3 = self.nodes[1].importprunedfunds(rawtxn3, proof3, "")
-        balance3 = Decimal(self.nodes[1].getbalance("", 0, False))
+        self.nodes[1].importprivkey(address3_privkey, "add3", False)
+        result3 = self.nodes[1].importprunedfunds(rawtxn3, proof3)
+        balance3 = self.nodes[1].getbalance("add3", 0, False)
         assert_equal(balance3, Decimal('0.025'))
-        balance3 = Decimal(self.nodes[1].getbalance("", 0, True))
+        balance3 = self.nodes[1].getbalance("*", 0, True)
         assert_equal(balance3, Decimal('0.075'))
 
         #Addresses Test - after import
@@ -118,7 +112,6 @@ def run_test (self):
         assert_equal(address_info['ismine'], True)
 
         #Remove transactions
-
         try:
             self.nodes[1].removeprunedfunds(txnid1)
         except JSONRPCException as e:
@@ -126,18 +119,16 @@ def run_test (self):
         else:
             assert(False)
 
-
-        balance1 = Decimal(self.nodes[1].getbalance("", 0, True))
+        balance1 = self.nodes[1].getbalance("*", 0, True)
         assert_equal(balance1, Decimal('0.075'))
 
-
         self.nodes[1].removeprunedfunds(txnid2)
-        balance2 = Decimal(self.nodes[1].getbalance("", 0, True))
+        balance2 = self.nodes[1].getbalance("*", 0, True)
         assert_equal(balance2, Decimal('0.025'))
 
         self.nodes[1].removeprunedfunds(txnid3)
-        balance3 = Decimal(self.nodes[1].getbalance("", 0, True))
+        balance3 = self.nodes[1].getbalance("*", 0, True)
         assert_equal(balance3, Decimal('0.0'))
 
 if __name__ == '__main__':
-    ImportPrunedFundsTest ().main ()
+    ImportPrunedFundsTest().main()
diff --git a/src/wallet/rpcdump.cpp b/src/wallet/rpcdump.cpp
index fe8b53ceb0c1a..42ebdb9b9b861 100644
--- a/src/wallet/rpcdump.cpp
+++ b/src/wallet/rpcdump.cpp
@@ -257,14 +257,13 @@ UniValue importprunedfunds(const UniValue& params, bool fHelp)
     if (!EnsureWalletIsAvailable(fHelp))
         return NullUniValue;
 
-    if (fHelp || params.size() < 2 || params.size() > 3)
+    if (fHelp || params.size() != 2)
         throw runtime_error(
             "importprunedfunds\n"
             "\nImports funds without rescan. Corresponding address or script must previously be included in wallet. Aimed towards pruned wallets. The end-user is responsible to import additional transactions that subsequently spend the imported outputs or rescan after the point in the blockchain the transaction is included.\n"
             "\nArguments:\n"
             "1. \"rawtransaction\" (string, required) A raw transaction in hex funding an already-existing address in wallet\n"
             "2. \"txoutproof\"     (string, required) The hex output from gettxoutproof that contains the transaction\n"
-            "3. \"label\"          (string, optional) An optional label\n"
         );
 
     CTransaction tx;
@@ -277,10 +276,6 @@ UniValue importprunedfunds(const UniValue& params, bool fHelp)
     CMerkleBlock merkleBlock;
     ssMB >> merkleBlock;
 
-    string strLabel = "";
-    if (params.size() == 3)
-        strLabel = params[2].get_str();
-
     //Search partial merkle tree in proof for our transaction and index in valid block
     vector<uint256> vMatch;
     vector<unsigned int> vIndex;

From fa1cf9e7b83c7d1ac6130589c24c055406ba407a Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Wed, 24 Aug 2016 17:05:12 +0200
Subject: [PATCH 0763/1802] [test] Remove unused code

---
 src/test/base58_tests.cpp |  3 ---
 src/test/pmt_tests.cpp    |  1 -
 src/test/rpc_tests.cpp    | 12 ------------
 src/test/util_tests.cpp   |  9 ++-------
 4 files changed, 2 insertions(+), 23 deletions(-)

diff --git a/src/test/base58_tests.cpp b/src/test/base58_tests.cpp
index 01eb2aee9ed02..ac3ab4c83f99e 100644
--- a/src/test/base58_tests.cpp
+++ b/src/test/base58_tests.cpp
@@ -121,7 +121,6 @@ class TestPayloadVisitor : public boost::static_visitor<bool>
 BOOST_AUTO_TEST_CASE(base58_keys_valid_parse)
 {
     UniValue tests = read_json(std::string(json_tests::base58_keys_valid, json_tests::base58_keys_valid + sizeof(json_tests::base58_keys_valid)));
-    std::vector<unsigned char> result;
     CBitcoinSecret secret;
     CBitcoinAddress addr;
     SelectParams(CBaseChainParams::MAIN);
@@ -179,7 +178,6 @@ BOOST_AUTO_TEST_CASE(base58_keys_valid_parse)
 BOOST_AUTO_TEST_CASE(base58_keys_valid_gen)
 {
     UniValue tests = read_json(std::string(json_tests::base58_keys_valid, json_tests::base58_keys_valid + sizeof(json_tests::base58_keys_valid)));
-    std::vector<unsigned char> result;
 
     for (unsigned int idx = 0; idx < tests.size(); idx++) {
         UniValue test = tests[idx];
@@ -247,7 +245,6 @@ BOOST_AUTO_TEST_CASE(base58_keys_valid_gen)
 BOOST_AUTO_TEST_CASE(base58_keys_invalid)
 {
     UniValue tests = read_json(std::string(json_tests::base58_keys_invalid, json_tests::base58_keys_invalid + sizeof(json_tests::base58_keys_invalid))); // Negative testcases
-    std::vector<unsigned char> result;
     CBitcoinSecret secret;
     CBitcoinAddress addr;
 
diff --git a/src/test/pmt_tests.cpp b/src/test/pmt_tests.cpp
index 74ffe0cc74045..e9c8691745cc5 100644
--- a/src/test/pmt_tests.cpp
+++ b/src/test/pmt_tests.cpp
@@ -122,7 +122,6 @@ BOOST_AUTO_TEST_CASE(pmt_malleability)
     std::vector<bool> vMatch = boost::assign::list_of(false)(false)(false)(false)(false)(false)(false)(false)(false)(true)(true)(false);
 
     CPartialMerkleTree tree(vTxid, vMatch);
-    std::vector<uint256> vTxid2;
     std::vector<unsigned int> vIndex;
     BOOST_CHECK(tree.ExtractMatches(vTxid, vIndex).IsNull());
 }
diff --git a/src/test/rpc_tests.cpp b/src/test/rpc_tests.cpp
index bbda6a48f4d5a..a15915aad2f10 100644
--- a/src/test/rpc_tests.cpp
+++ b/src/test/rpc_tests.cpp
@@ -18,18 +18,6 @@
 
 using namespace std;
 
-UniValue
-createArgs(int nRequired, const char* address1=NULL, const char* address2=NULL)
-{
-    UniValue result(UniValue::VARR);
-    result.push_back(nRequired);
-    UniValue addresses(UniValue::VARR);
-    if (address1) addresses.push_back(address1);
-    if (address2) addresses.push_back(address2);
-    result.push_back(addresses);
-    return result;
-}
-
 UniValue CallRPC(string args)
 {
     vector<string> vArgs;
diff --git a/src/test/util_tests.cpp b/src/test/util_tests.cpp
index e467a4171d984..efd44987473c2 100644
--- a/src/test/util_tests.cpp
+++ b/src/test/util_tests.cpp
@@ -243,11 +243,7 @@ BOOST_AUTO_TEST_CASE(util_IsHex)
 
 BOOST_AUTO_TEST_CASE(util_seed_insecure_rand)
 {
-    int i;
-    int count=0;
-
     seed_insecure_rand(true);
-
     for (int mod=2;mod<11;mod++)
     {
         int mask = 1;
@@ -256,10 +252,9 @@ BOOST_AUTO_TEST_CASE(util_seed_insecure_rand)
         //mask is 2^ceil(log2(mod))-1
         while(mask<mod-1)mask=(mask<<1)+1;
 
-        count = 0;
+        int count = 0;
         //How often does it get a zero from the uniform range [0,mod)?
-        for (i=0;i<10000;i++)
-        {
+        for (int i = 0; i < 10000; i++) {
             uint32_t rval;
             do{
                 rval=insecure_rand()&mask;

From 4c3e2cb2dfc36d686444b65da1885c380d3643f8 Mon Sep 17 00:00:00 2001
From: R E Broadley <rebroad+github@gmail.com>
Date: Thu, 25 Aug 2016 09:21:58 +0700
Subject: [PATCH 0764/1802] Show XTHIN in GUI

---
 src/protocol.h     | 3 +++
 src/qt/guiutil.cpp | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/src/protocol.h b/src/protocol.h
index 015215b2a668b..9b474ec79c8dd 100644
--- a/src/protocol.h
+++ b/src/protocol.h
@@ -267,6 +267,9 @@ enum ServiceFlags : uint64_t {
     // Indicates that a node can be asked for blocks and transactions including
     // witness data.
     NODE_WITNESS = (1 << 3),
+    // NODE_XTHIN means the node supports Xtreme Thinblocks
+    // If this is turned off then the node will not service nor make xthin requests
+    NODE_XTHIN = (1 << 4),
 
     // Bits 24-31 are reserved for temporary experiments. Just pick a bit that
     // isn't getting used, or one not being used much, and notify the
diff --git a/src/qt/guiutil.cpp b/src/qt/guiutil.cpp
index 947a4c6821d84..c00f5e8591f3a 100644
--- a/src/qt/guiutil.cpp
+++ b/src/qt/guiutil.cpp
@@ -930,6 +930,9 @@ QString formatServicesStr(quint64 mask)
             case NODE_WITNESS:
                 strList.append("WITNESS");
                 break;
+            case NODE_XTHIN:
+                strList.append("XTHIN");
+                break;
             default:
                 strList.append(QString("%1[%2]").arg("UNKNOWN").arg(check));
             }

From fa6dc9f0e5eac8ec473b63adfd43635005778f46 Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Thu, 25 Aug 2016 12:48:23 +0200
Subject: [PATCH 0765/1802] Remove unused variables

---
 src/bitcoin-tx.cpp    | 4 +---
 src/init.cpp          | 2 +-
 src/txmempool.cpp     | 1 -
 src/wallet/wallet.cpp | 1 -
 4 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/bitcoin-tx.cpp b/src/bitcoin-tx.cpp
index 8e8ac47455cbe..5cf9b043ea94b 100644
--- a/src/bitcoin-tx.cpp
+++ b/src/bitcoin-tx.cpp
@@ -395,10 +395,8 @@ static void MutateTxSign(CMutableTransaction& tx, const string& flagStr)
 
     if (!registers.count("privatekeys"))
         throw runtime_error("privatekeys register variable must be set.");
-    bool fGivenKeys = false;
     CBasicKeyStore tempKeystore;
     UniValue keysObj = registers["privatekeys"];
-    fGivenKeys = true;
 
     for (unsigned int kidx = 0; kidx < keysObj.size(); kidx++) {
         if (!keysObj[kidx].isStr())
@@ -454,7 +452,7 @@ static void MutateTxSign(CMutableTransaction& tx, const string& flagStr)
 
             // if redeemScript given and private keys given,
             // add redeemScript to the tempKeystore so it can be signed:
-            if (fGivenKeys && (scriptPubKey.IsPayToScriptHash() || scriptPubKey.IsPayToWitnessScriptHash()) &&
+            if ((scriptPubKey.IsPayToScriptHash() || scriptPubKey.IsPayToWitnessScriptHash()) &&
                 prevOut.exists("redeemScript")) {
                 UniValue v = prevOut["redeemScript"];
                 vector<unsigned char> rsData(ParseHexUV(v, "redeemScript"));
diff --git a/src/init.cpp b/src/init.cpp
index 13c68e512a345..65ae4dbd9d1b0 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -1183,8 +1183,8 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
     fNameLookup = GetBoolArg("-dns", DEFAULT_NAME_LOOKUP);
     fRelayTxes = !GetBoolArg("-blocksonly", DEFAULT_BLOCKSONLY);
 
-    bool fBound = false;
     if (fListen) {
+        bool fBound = false;
         if (mapArgs.count("-bind") || mapArgs.count("-whitebind")) {
             BOOST_FOREACH(const std::string& strBind, mapMultiArgs["-bind"]) {
                 CService addrBind;
diff --git a/src/txmempool.cpp b/src/txmempool.cpp
index b631c48484891..0a00d757a225a 100644
--- a/src/txmempool.cpp
+++ b/src/txmempool.cpp
@@ -576,7 +576,6 @@ void CTxMemPool::removeForReorg(const CCoinsViewCache *pcoins, unsigned int nMem
 void CTxMemPool::removeConflicts(const CTransaction &tx, std::list<CTransaction>& removed)
 {
     // Remove transactions which depend on inputs of tx, recursively
-    list<CTransaction> result;
     LOCK(cs);
     BOOST_FOREACH(const CTxIn &txin, tx.vin) {
         auto it = mapNextTx.find(txin.prevout);
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index 769322969d207..10aca2e499f60 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -2461,7 +2461,6 @@ bool CWallet::CommitTransaction(CWalletTx& wtxNew, CReserveKey& reservekey)
             AddToWallet(wtxNew);
 
             // Notify that old coins are spent
-            set<CWalletTx*> setCoins;
             BOOST_FOREACH(const CTxIn& txin, wtxNew.vin)
             {
                 CWalletTx &coin = mapWallet[txin.prevout.hash];

From de1bbe3b7876e311ebba5445b7b251782c0a7e0a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pavel=20Jan=C3=ADk?= <Pavel@Janik.cz>
Date: Tue, 7 Jun 2016 18:42:42 +0200
Subject: [PATCH 0766/1802] Do not shadow global RPC table variable (tableRPC)

---
 src/rpc/blockchain.cpp     |  4 ++--
 src/rpc/mining.cpp         |  4 ++--
 src/rpc/misc.cpp           |  4 ++--
 src/rpc/net.cpp            |  4 ++--
 src/rpc/rawtransaction.cpp |  4 ++--
 src/rpc/register.h         | 12 ++++++------
 src/wallet/rpcwallet.cpp   |  4 ++--
 src/wallet/rpcwallet.h     |  2 +-
 8 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp
index e3c32d905af74..7f391da097fa3 100644
--- a/src/rpc/blockchain.cpp
+++ b/src/rpc/blockchain.cpp
@@ -1205,8 +1205,8 @@ static const CRPCCommand commands[] =
     { "hidden",             "reconsiderblock",        &reconsiderblock,        true  },
 };
 
-void RegisterBlockchainRPCCommands(CRPCTable &tableRPC)
+void RegisterBlockchainRPCCommands(CRPCTable &t)
 {
     for (unsigned int vcidx = 0; vcidx < ARRAYLEN(commands); vcidx++)
-        tableRPC.appendCommand(commands[vcidx].name, &commands[vcidx]);
+        t.appendCommand(commands[vcidx].name, &commands[vcidx]);
 }
diff --git a/src/rpc/mining.cpp b/src/rpc/mining.cpp
index 2479e5d5953d2..bc3e6c4ef7d8f 100644
--- a/src/rpc/mining.cpp
+++ b/src/rpc/mining.cpp
@@ -918,8 +918,8 @@ static const CRPCCommand commands[] =
     { "util",               "estimatesmartpriority",  &estimatesmartpriority,  true  },
 };
 
-void RegisterMiningRPCCommands(CRPCTable &tableRPC)
+void RegisterMiningRPCCommands(CRPCTable &t)
 {
     for (unsigned int vcidx = 0; vcidx < ARRAYLEN(commands); vcidx++)
-        tableRPC.appendCommand(commands[vcidx].name, &commands[vcidx]);
+        t.appendCommand(commands[vcidx].name, &commands[vcidx]);
 }
diff --git a/src/rpc/misc.cpp b/src/rpc/misc.cpp
index a8c5bcd177fbc..e96feaa864939 100644
--- a/src/rpc/misc.cpp
+++ b/src/rpc/misc.cpp
@@ -498,8 +498,8 @@ static const CRPCCommand commands[] =
     { "hidden",             "setmocktime",            &setmocktime,            true  },
 };
 
-void RegisterMiscRPCCommands(CRPCTable &tableRPC)
+void RegisterMiscRPCCommands(CRPCTable &t)
 {
     for (unsigned int vcidx = 0; vcidx < ARRAYLEN(commands); vcidx++)
-        tableRPC.appendCommand(commands[vcidx].name, &commands[vcidx]);
+        t.appendCommand(commands[vcidx].name, &commands[vcidx]);
 }
diff --git a/src/rpc/net.cpp b/src/rpc/net.cpp
index 58cf4a56e05ec..74c32c1cc14f2 100644
--- a/src/rpc/net.cpp
+++ b/src/rpc/net.cpp
@@ -590,8 +590,8 @@ static const CRPCCommand commands[] =
     { "network",            "clearbanned",            &clearbanned,            true  },
 };
 
-void RegisterNetRPCCommands(CRPCTable &tableRPC)
+void RegisterNetRPCCommands(CRPCTable &t)
 {
     for (unsigned int vcidx = 0; vcidx < ARRAYLEN(commands); vcidx++)
-        tableRPC.appendCommand(commands[vcidx].name, &commands[vcidx]);
+        t.appendCommand(commands[vcidx].name, &commands[vcidx]);
 }
diff --git a/src/rpc/rawtransaction.cpp b/src/rpc/rawtransaction.cpp
index 3270cd384f4b6..9461a7280ccac 100644
--- a/src/rpc/rawtransaction.cpp
+++ b/src/rpc/rawtransaction.cpp
@@ -910,8 +910,8 @@ static const CRPCCommand commands[] =
     { "blockchain",         "verifytxoutproof",       &verifytxoutproof,       true  },
 };
 
-void RegisterRawTransactionRPCCommands(CRPCTable &tableRPC)
+void RegisterRawTransactionRPCCommands(CRPCTable &t)
 {
     for (unsigned int vcidx = 0; vcidx < ARRAYLEN(commands); vcidx++)
-        tableRPC.appendCommand(commands[vcidx].name, &commands[vcidx]);
+        t.appendCommand(commands[vcidx].name, &commands[vcidx]);
 }
diff --git a/src/rpc/register.h b/src/rpc/register.h
index 01aa58a25d850..49aee2365f049 100644
--- a/src/rpc/register.h
+++ b/src/rpc/register.h
@@ -20,13 +20,13 @@ void RegisterMiningRPCCommands(CRPCTable &tableRPC);
 /** Register raw transaction RPC commands */
 void RegisterRawTransactionRPCCommands(CRPCTable &tableRPC);
 
-static inline void RegisterAllCoreRPCCommands(CRPCTable &tableRPC)
+static inline void RegisterAllCoreRPCCommands(CRPCTable &t)
 {
-    RegisterBlockchainRPCCommands(tableRPC);
-    RegisterNetRPCCommands(tableRPC);
-    RegisterMiscRPCCommands(tableRPC);
-    RegisterMiningRPCCommands(tableRPC);
-    RegisterRawTransactionRPCCommands(tableRPC);
+    RegisterBlockchainRPCCommands(t);
+    RegisterNetRPCCommands(t);
+    RegisterMiscRPCCommands(t);
+    RegisterMiningRPCCommands(t);
+    RegisterRawTransactionRPCCommands(t);
 }
 
 #endif
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index aa0a9374c1991..9629ec1db6f59 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -2617,8 +2617,8 @@ static const CRPCCommand commands[] =
     { "wallet",             "removeprunedfunds",        &removeprunedfunds,        true  },
 };
 
-void RegisterWalletRPCCommands(CRPCTable &tableRPC)
+void RegisterWalletRPCCommands(CRPCTable &t)
 {
     for (unsigned int vcidx = 0; vcidx < ARRAYLEN(commands); vcidx++)
-        tableRPC.appendCommand(commands[vcidx].name, &commands[vcidx]);
+        t.appendCommand(commands[vcidx].name, &commands[vcidx]);
 }
diff --git a/src/wallet/rpcwallet.h b/src/wallet/rpcwallet.h
index a5de7e2de1456..3a68ccf1b2556 100644
--- a/src/wallet/rpcwallet.h
+++ b/src/wallet/rpcwallet.h
@@ -7,6 +7,6 @@
 
 class CRPCTable;
 
-void RegisterWalletRPCCommands(CRPCTable &tableRPC);
+void RegisterWalletRPCCommands(CRPCTable &t);
 
 #endif //BITCOIN_WALLET_RPCWALLET_H

From fa28bfa341b0f1ca53ae2fc8d3d08afbf8d69a61 Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Thu, 25 Aug 2016 15:28:11 +0200
Subject: [PATCH 0767/1802] [wallet] Set fLimitFree = true

---
 src/wallet/wallet.cpp | 9 ++++-----
 src/wallet/wallet.h   | 2 +-
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index 87b85eeb72301..3275ac2ef26ae 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -1405,7 +1405,7 @@ void CWallet::ReacceptWalletTransactions()
         CWalletTx& wtx = *(item.second);
 
         LOCK(mempool.cs);
-        wtx.AcceptToMemoryPool(false, maxTxFee);
+        wtx.AcceptToMemoryPool(maxTxFee);
     }
 }
 
@@ -2450,8 +2450,7 @@ bool CWallet::CommitTransaction(CWalletTx& wtxNew, CReserveKey& reservekey)
         if (fBroadcastTransactions)
         {
             // Broadcast
-            if (!wtxNew.AcceptToMemoryPool(false, maxTxFee))
-            {
+            if (!wtxNew.AcceptToMemoryPool(maxTxFee)) {
                 // This must not fail. The transaction has already been signed and recorded.
                 LogPrintf("CommitTransaction(): Error: Transaction not valid\n");
                 return false;
@@ -3563,8 +3562,8 @@ int CMerkleTx::GetBlocksToMaturity() const
 }
 
 
-bool CMerkleTx::AcceptToMemoryPool(bool fLimitFree, CAmount nAbsurdFee)
+bool CMerkleTx::AcceptToMemoryPool(const CAmount& nAbsurdFee)
 {
     CValidationState state;
-    return ::AcceptToMemoryPool(mempool, state, *this, fLimitFree, NULL, false, nAbsurdFee);
+    return ::AcceptToMemoryPool(mempool, state, *this, true, NULL, false, nAbsurdFee);
 }
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
index 7fc6ce5de5af1..db9e9d1a157cb 100644
--- a/src/wallet/wallet.h
+++ b/src/wallet/wallet.h
@@ -212,7 +212,7 @@ class CMerkleTx : public CTransaction
     bool IsInMainChain() const { const CBlockIndex *pindexRet; return GetDepthInMainChain(pindexRet) > 0; }
     int GetBlocksToMaturity() const;
     /** Pass this transaction to the mempool. Fails if absolute fee exceeds absurd fee. */
-    bool AcceptToMemoryPool(bool fLimitFree, const CAmount nAbsurdFee);
+    bool AcceptToMemoryPool(const CAmount& nAbsurdFee);
     bool hashUnset() const { return (hashBlock.IsNull() || hashBlock == ABANDON_HASH); }
     bool isAbandoned() const { return (hashBlock == ABANDON_HASH); }
     void setAbandoned() { hashBlock = ABANDON_HASH; }

From fa8b02d36d5c75266d3c8ffb91ece761ce90e774 Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Thu, 25 Aug 2016 15:29:32 +0200
Subject: [PATCH 0768/1802] [rpc] rawtx: Prepare fLimitFree to make it an
 option

---
 src/rpc/rawtransaction.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/rpc/rawtransaction.cpp b/src/rpc/rawtransaction.cpp
index 3270cd384f4b6..b1eaa248d4b81 100644
--- a/src/rpc/rawtransaction.cpp
+++ b/src/rpc/rawtransaction.cpp
@@ -866,6 +866,7 @@ UniValue sendrawtransaction(const UniValue& params, bool fHelp)
         throw JSONRPCError(RPC_DESERIALIZATION_ERROR, "TX decode failed");
     uint256 hashTx = tx.GetHash();
 
+    bool fLimitFree = false;
     CAmount nMaxRawTxFee = maxTxFee;
     if (params.size() > 1 && params[1].get_bool())
         nMaxRawTxFee = 0;
@@ -878,7 +879,7 @@ UniValue sendrawtransaction(const UniValue& params, bool fHelp)
         // push to local node and sync with wallets
         CValidationState state;
         bool fMissingInputs;
-        if (!AcceptToMemoryPool(mempool, state, tx, false, &fMissingInputs, false, nMaxRawTxFee)) {
+        if (!AcceptToMemoryPool(mempool, state, tx, fLimitFree, &fMissingInputs, false, nMaxRawTxFee)) {
             if (state.IsInvalid()) {
                 throw JSONRPCError(RPC_TRANSACTION_REJECTED, strprintf("%i: %s", state.GetRejectCode(), state.GetRejectReason()));
             } else {

From eb3596f7c220685fe6203178d5535c6775a789df Mon Sep 17 00:00:00 2001
From: Gregory Maxwell <greg@xiph.org>
Date: Thu, 25 Aug 2016 23:42:40 +0000
Subject: [PATCH 0769/1802] Do not add random inbound peers to addrman.

We should learn about new peers via address messages.

An inbound peer connecting to us tells us nothing about
 its ability to accept incoming connections from us, so
 we shouldn't assume that we can connect to it based on
 this.

The vast majority of nodes on the network do not accept
 incoming connections, adding them will only slow down
 the process of making a successful connection in the
 future.

Nodes which have configured themselves to not announce would prefer we
 not violate their privacy by announcing them in GETADDR responses.
---
 src/main.cpp | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index 5160e60750d08..ddd05411013e7 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -5029,12 +5029,6 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
                 pfrom->fGetAddr = true;
             }
             addrman.Good(pfrom->addr);
-        } else {
-            if (((CNetAddr)pfrom->addr) == (CNetAddr)addrFrom)
-            {
-                addrman.Add(addrFrom, addrFrom);
-                addrman.Good(addrFrom);
-            }
         }
 
         pfrom->fSuccessfullyConnected = true;

From 0904c3cda4d1f40d41154bd9b2739660bdf12852 Mon Sep 17 00:00:00 2001
From: Jonas Schnelli <dev@jonasschnelli.ch>
Date: Tue, 19 Jul 2016 15:22:01 +0200
Subject: [PATCH 0770/1802] [Refactor] refactor function that forms human
 readable text out of a timeoffset

---
 src/qt/bitcoingui.cpp | 25 +------------------------
 src/qt/guiutil.cpp    | 36 ++++++++++++++++++++++++++++++++++++
 src/qt/guiutil.h      |  2 ++
 3 files changed, 39 insertions(+), 24 deletions(-)

diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp
index 272df3fdae42c..b3cd7cfbcad93 100644
--- a/src/qt/bitcoingui.cpp
+++ b/src/qt/bitcoingui.cpp
@@ -762,30 +762,7 @@ void BitcoinGUI::setNumBlocks(int count, const QDateTime& blockDate, double nVer
     }
     else
     {
-        // Represent time from last generated block in human readable text
-        QString timeBehindText;
-        const int HOUR_IN_SECONDS = 60*60;
-        const int DAY_IN_SECONDS = 24*60*60;
-        const int WEEK_IN_SECONDS = 7*24*60*60;
-        const int YEAR_IN_SECONDS = 31556952; // Average length of year in Gregorian calendar
-        if(secs < 2*DAY_IN_SECONDS)
-        {
-            timeBehindText = tr("%n hour(s)","",secs/HOUR_IN_SECONDS);
-        }
-        else if(secs < 2*WEEK_IN_SECONDS)
-        {
-            timeBehindText = tr("%n day(s)","",secs/DAY_IN_SECONDS);
-        }
-        else if(secs < YEAR_IN_SECONDS)
-        {
-            timeBehindText = tr("%n week(s)","",secs/WEEK_IN_SECONDS);
-        }
-        else
-        {
-            qint64 years = secs / YEAR_IN_SECONDS;
-            qint64 remainder = secs % YEAR_IN_SECONDS;
-            timeBehindText = tr("%1 and %2").arg(tr("%n year(s)", "", years)).arg(tr("%n week(s)","", remainder/WEEK_IN_SECONDS));
-        }
+        QString timeBehindText = GUIUtil::formateNiceTimeOffset(secs);
 
         progressBarLabel->setVisible(true);
         progressBar->setFormat(tr("%1 behind").arg(timeBehindText));
diff --git a/src/qt/guiutil.cpp b/src/qt/guiutil.cpp
index 947a4c6821d84..fe9de1c7a1bfd 100644
--- a/src/qt/guiutil.cpp
+++ b/src/qt/guiutil.cpp
@@ -952,4 +952,40 @@ QString formatTimeOffset(int64_t nTimeOffset)
   return QString(QObject::tr("%1 s")).arg(QString::number((int)nTimeOffset, 10));
 }
 
+QString formateNiceTimeOffset(qint64 secs)
+{
+    // Represent time from last generated block in human readable text
+    QString timeBehindText;
+    const int HOUR_IN_SECONDS = 60*60;
+    const int DAY_IN_SECONDS = 24*60*60;
+    const int WEEK_IN_SECONDS = 7*24*60*60;
+    const int YEAR_IN_SECONDS = 31556952; // Average length of year in Gregorian calendar
+    if(secs < 60)
+    {
+        timeBehindText = QObject::tr("%n seconds(s)","",secs);
+    }
+    else if(secs < 2*HOUR_IN_SECONDS)
+    {
+        timeBehindText = QObject::tr("%n minutes(s)","",secs/60);
+    }
+    else if(secs < 2*DAY_IN_SECONDS)
+    {
+        timeBehindText = QObject::tr("%n hour(s)","",secs/HOUR_IN_SECONDS);
+    }
+    else if(secs < 2*WEEK_IN_SECONDS)
+    {
+        timeBehindText = QObject::tr("%n day(s)","",secs/DAY_IN_SECONDS);
+    }
+    else if(secs < YEAR_IN_SECONDS)
+    {
+        timeBehindText = QObject::tr("%n week(s)","",secs/WEEK_IN_SECONDS);
+    }
+    else
+    {
+        qint64 years = secs / YEAR_IN_SECONDS;
+        qint64 remainder = secs % YEAR_IN_SECONDS;
+        timeBehindText = QObject::tr("%1 and %2").arg(QObject::tr("%n year(s)", "", years)).arg(QObject::tr("%n week(s)","", remainder/WEEK_IN_SECONDS));
+    }
+    return timeBehindText;
+}
 } // namespace GUIUtil
diff --git a/src/qt/guiutil.h b/src/qt/guiutil.h
index 9267e0a6c9db0..7697e53ae9f3d 100644
--- a/src/qt/guiutil.h
+++ b/src/qt/guiutil.h
@@ -200,6 +200,8 @@ namespace GUIUtil
     /* Format a CNodeCombinedStats.nTimeOffset into a user-readable string. */
     QString formatTimeOffset(int64_t nTimeOffset);
 
+    QString formateNiceTimeOffset(qint64 secs);
+
 #if defined(Q_OS_MAC) && QT_VERSION >= 0x050000
     // workaround for Qt OSX Bug:
     // https://bugreports.qt-project.org/browse/QTBUG-15631

From bd44a04dc3fe94d2764fadd9f9a7deb81ff49f45 Mon Sep 17 00:00:00 2001
From: Jonas Schnelli <dev@jonasschnelli.ch>
Date: Tue, 19 Jul 2016 15:27:14 +0200
Subject: [PATCH 0771/1802] [Qt] make Out-Of-Sync warning icon clickable

---
 src/qt/forms/overviewpage.ui | 4 ++--
 src/qt/overviewpage.cpp      | 7 +++++++
 src/qt/overviewpage.h        | 2 ++
 src/qt/walletframe.cpp       | 6 ++++++
 src/qt/walletframe.h         | 6 ++++++
 src/qt/walletview.cpp        | 6 ++++++
 src/qt/walletview.h          | 5 +++++
 7 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/src/qt/forms/overviewpage.ui b/src/qt/forms/overviewpage.ui
index 6d792d1475fed..923ed68996101 100644
--- a/src/qt/forms/overviewpage.ui
+++ b/src/qt/forms/overviewpage.ui
@@ -61,7 +61,7 @@
             <item>
              <widget class="QPushButton" name="labelWalletStatus">
               <property name="enabled">
-               <bool>false</bool>
+               <bool>true</bool>
               </property>
               <property name="maximumSize">
                <size>
@@ -447,7 +447,7 @@
             <item>
              <widget class="QPushButton" name="labelTransactionsStatus">
               <property name="enabled">
-               <bool>false</bool>
+               <bool>true</bool>
               </property>
               <property name="maximumSize">
                <size>
diff --git a/src/qt/overviewpage.cpp b/src/qt/overviewpage.cpp
index 6a0404cbf702f..e415a6c4dd2df 100644
--- a/src/qt/overviewpage.cpp
+++ b/src/qt/overviewpage.cpp
@@ -140,6 +140,8 @@ OverviewPage::OverviewPage(const PlatformStyle *platformStyle, QWidget *parent)
 
     // start with displaying the "out of sync" warnings
     showOutOfSyncWarning(true);
+    connect(ui->labelWalletStatus, SIGNAL(clicked()), this, SLOT(handleOutOfSyncWarningClicks()));
+    connect(ui->labelTransactionsStatus, SIGNAL(clicked()), this, SLOT(handleOutOfSyncWarningClicks()));
 }
 
 void OverviewPage::handleTransactionClicked(const QModelIndex &index)
@@ -148,6 +150,11 @@ void OverviewPage::handleTransactionClicked(const QModelIndex &index)
         Q_EMIT transactionClicked(filter->mapToSource(index));
 }
 
+void OverviewPage::handleOutOfSyncWarningClicks()
+{
+    Q_EMIT outOfSyncWarningClicked();
+}
+
 OverviewPage::~OverviewPage()
 {
     delete ui;
diff --git a/src/qt/overviewpage.h b/src/qt/overviewpage.h
index 911443c76af19..65cd3341b6b42 100644
--- a/src/qt/overviewpage.h
+++ b/src/qt/overviewpage.h
@@ -42,6 +42,7 @@ public Q_SLOTS:
 
 Q_SIGNALS:
     void transactionClicked(const QModelIndex &index);
+    void outOfSyncWarningClicked();
 
 private:
     Ui::OverviewPage *ui;
@@ -62,6 +63,7 @@ private Q_SLOTS:
     void handleTransactionClicked(const QModelIndex &index);
     void updateAlerts(const QString &warnings);
     void updateWatchOnlyLabels(bool showWatchOnly);
+    void handleOutOfSyncWarningClicks();
 };
 
 #endif // BITCOIN_QT_OVERVIEWPAGE_H
diff --git a/src/qt/walletframe.cpp b/src/qt/walletframe.cpp
index e4ca5e1831d15..9d68e54e3a27b 100644
--- a/src/qt/walletframe.cpp
+++ b/src/qt/walletframe.cpp
@@ -57,6 +57,8 @@ bool WalletFrame::addWallet(const QString& name, WalletModel *walletModel)
     // Ensure a walletView is able to show the main window
     connect(walletView, SIGNAL(showNormalIfMinimized()), gui, SLOT(showNormalIfMinimized()));
 
+    connect(walletView, SIGNAL(outOfSyncWarningClicked()), this, SLOT(outOfSyncWarningClicked()));
+
     return true;
 }
 
@@ -195,3 +197,7 @@ WalletView *WalletFrame::currentWalletView()
     return qobject_cast<WalletView*>(walletStack->currentWidget());
 }
 
+void WalletFrame::outOfSyncWarningClicked()
+{
+    Q_EMIT requestedOfSyncWarningInfo();
+}
\ No newline at end of file
diff --git a/src/qt/walletframe.h b/src/qt/walletframe.h
index 9a5bc273c2eae..7e3a5690eb00a 100644
--- a/src/qt/walletframe.h
+++ b/src/qt/walletframe.h
@@ -38,6 +38,10 @@ class WalletFrame : public QFrame
 
     void showOutOfSyncWarning(bool fShow);
 
+Q_SIGNALS:
+    /** Notify that the user has requested more information about the out-of-sync warning */
+    void requestedOfSyncWarningInfo();
+
 private:
     QStackedWidget *walletStack;
     BitcoinGUI *gui;
@@ -78,6 +82,8 @@ public Q_SLOTS:
     void usedSendingAddresses();
     /** Show used receiving addresses */
     void usedReceivingAddresses();
+    /** Pass on signal over requested out-of-sync-warning information */
+    void outOfSyncWarningClicked();
 };
 
 #endif // BITCOIN_QT_WALLETFRAME_H
diff --git a/src/qt/walletview.cpp b/src/qt/walletview.cpp
index 495ebfd834bfc..656b21586f838 100644
--- a/src/qt/walletview.cpp
+++ b/src/qt/walletview.cpp
@@ -66,6 +66,7 @@ WalletView::WalletView(const PlatformStyle *platformStyle, QWidget *parent):
 
     // Clicking on a transaction on the overview pre-selects the transaction on the transaction history page
     connect(overviewPage, SIGNAL(transactionClicked(QModelIndex)), transactionView, SLOT(focusTransaction(QModelIndex)));
+    connect(overviewPage, SIGNAL(outOfSyncWarningClicked()), this, SLOT(requestedOfSyncWarningInfo()));
 
     // Double-clicking on a transaction on the transaction history page shows details
     connect(transactionView, SIGNAL(doubleClicked(QModelIndex)), transactionView, SLOT(showDetails()));
@@ -322,3 +323,8 @@ void WalletView::showProgress(const QString &title, int nProgress)
     else if (progressDialog)
         progressDialog->setValue(nProgress);
 }
+
+void WalletView::requestedOfSyncWarningInfo()
+{
+    Q_EMIT outOfSyncWarningClicked();
+}
diff --git a/src/qt/walletview.h b/src/qt/walletview.h
index 2045605954d23..c0a27ab98970d 100644
--- a/src/qt/walletview.h
+++ b/src/qt/walletview.h
@@ -110,6 +110,9 @@ public Q_SLOTS:
     /** Show progress dialog e.g. for rescan */
     void showProgress(const QString &title, int nProgress);
 
+    /** User has requested more information about the out of sync state */
+    void requestedOfSyncWarningInfo();
+
 Q_SIGNALS:
     /** Signal that we want to show the main window */
     void showNormalIfMinimized();
@@ -121,6 +124,8 @@ public Q_SLOTS:
     void hdEnabledStatusChanged(int hdEnabled);
     /** Notify that a new transaction appeared */
     void incomingTransaction(const QString& date, int unit, const CAmount& amount, const QString& type, const QString& address, const QString& label);
+    /** Notify that the out of sync warning icon has been pressed */
+    void outOfSyncWarningClicked();
 };
 
 #endif // BITCOIN_QT_WALLETVIEW_H

From a001f1880283089d3eb0aa83e889d9707d79fd5f Mon Sep 17 00:00:00 2001
From: Jonas Schnelli <dev@jonasschnelli.ch>
Date: Tue, 19 Jul 2016 15:49:50 +0200
Subject: [PATCH 0772/1802] [Qt] Always pass the numBlocksChanged signal for
 headers tip changed

---
 src/qt/clientmodel.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/qt/clientmodel.cpp b/src/qt/clientmodel.cpp
index 14661b857a5a5..30f412dd232f8 100644
--- a/src/qt/clientmodel.cpp
+++ b/src/qt/clientmodel.cpp
@@ -234,7 +234,7 @@ static void BlockTipChanged(ClientModel *clientmodel, bool initialSync, const CB
     int64_t& nLastUpdateNotification = fHeader ? nLastHeaderTipUpdateNotification : nLastBlockTipUpdateNotification;
 
     // if we are in-sync, update the UI regardless of last update time
-    if (!initialSync || now - nLastUpdateNotification > MODEL_UPDATE_DELAY) {
+    if (fHeader || !initialSync || now - nLastUpdateNotification > MODEL_UPDATE_DELAY) {
         //pass a async signal to the UI thread
         QMetaObject::invokeMethod(clientmodel, "numBlocksChanged", Qt::QueuedConnection,
                                   Q_ARG(int, pIndex->nHeight),

From e47052f6b5ea901ecdc1cb8245dd98a98b06618a Mon Sep 17 00:00:00 2001
From: Jonas Schnelli <dev@jonasschnelli.ch>
Date: Tue, 19 Jul 2016 15:50:50 +0200
Subject: [PATCH 0773/1802] [Qt] ClientModel add method to get the height of
 the header chain

---
 src/qt/clientmodel.cpp | 8 ++++++++
 src/qt/clientmodel.h   | 1 +
 2 files changed, 9 insertions(+)

diff --git a/src/qt/clientmodel.cpp b/src/qt/clientmodel.cpp
index 30f412dd232f8..e3240b95a25f8 100644
--- a/src/qt/clientmodel.cpp
+++ b/src/qt/clientmodel.cpp
@@ -68,6 +68,14 @@ int ClientModel::getNumBlocks() const
     return chainActive.Height();
 }
 
+int ClientModel::getHeaderHeight() const
+{
+    LOCK(cs_main);
+    if (!pindexBestHeader)
+        return 0;
+    return pindexBestHeader->nHeight;
+}
+
 quint64 ClientModel::getTotalBytesRecv() const
 {
     return CNode::GetTotalBytesRecv();
diff --git a/src/qt/clientmodel.h b/src/qt/clientmodel.h
index 99fd574b9e14d..f0c9a7988a62e 100644
--- a/src/qt/clientmodel.h
+++ b/src/qt/clientmodel.h
@@ -51,6 +51,7 @@ class ClientModel : public QObject
     //! Return number of connections, default is in- and outbound (total)
     int getNumConnections(unsigned int flags = CONNECTIONS_ALL) const;
     int getNumBlocks() const;
+    int getHeaderHeight() const;
 
     //! Return number of transactions in the mempool
     long getMempoolSize() const;

From e3245b43d5c6fc984e8c60495f6db54f85d64368 Mon Sep 17 00:00:00 2001
From: Jonas Schnelli <dev@jonasschnelli.ch>
Date: Tue, 19 Jul 2016 15:51:24 +0200
Subject: [PATCH 0774/1802] [Qt] add out-of-sync modal info layer

---
 src/Makefile.qt.include      |   4 +
 src/qt/bitcoingui.cpp        |  31 ++-
 src/qt/bitcoingui.h          |   4 +
 src/qt/forms/modaloverlay.ui | 370 +++++++++++++++++++++++++++++++++++
 src/qt/modaloverlay.cpp      | 150 ++++++++++++++
 src/qt/modaloverlay.h        |  44 +++++
 6 files changed, 602 insertions(+), 1 deletion(-)
 create mode 100644 src/qt/forms/modaloverlay.ui
 create mode 100644 src/qt/modaloverlay.cpp
 create mode 100644 src/qt/modaloverlay.h

diff --git a/src/Makefile.qt.include b/src/Makefile.qt.include
index 8947aeaca0b14..ea9be82717e91 100644
--- a/src/Makefile.qt.include
+++ b/src/Makefile.qt.include
@@ -96,6 +96,7 @@ QT_FORMS_UI = \
   qt/forms/editaddressdialog.ui \
   qt/forms/helpmessagedialog.ui \
   qt/forms/intro.ui \
+  qt/forms/modaloverlay.ui \
   qt/forms/openuridialog.ui \
   qt/forms/optionsdialog.ui \
   qt/forms/overviewpage.ui \
@@ -125,6 +126,7 @@ QT_MOC_CPP = \
   qt/moc_intro.cpp \
   qt/moc_macdockiconhandler.cpp \
   qt/moc_macnotificationhandler.cpp \
+  qt/moc_modaloverlay.cpp \
   qt/moc_notificator.cpp \
   qt/moc_openuridialog.cpp \
   qt/moc_optionsdialog.cpp \
@@ -192,6 +194,7 @@ BITCOIN_QT_H = \
   qt/intro.h \
   qt/macdockiconhandler.h \
   qt/macnotificationhandler.h \
+  qt/modaloverlay.h \
   qt/networkstyle.h \
   qt/notificator.h \
   qt/openuridialog.h \
@@ -292,6 +295,7 @@ BITCOIN_QT_CPP = \
   qt/csvmodelwriter.cpp \
   qt/guiutil.cpp \
   qt/intro.cpp \
+  qt/modaloverlay.cpp \
   qt/networkstyle.cpp \
   qt/notificator.cpp \
   qt/optionsdialog.cpp \
diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp
index b3cd7cfbcad93..628d35b5ea8b5 100644
--- a/src/qt/bitcoingui.cpp
+++ b/src/qt/bitcoingui.cpp
@@ -12,6 +12,7 @@
 #include "clientmodel.h"
 #include "guiconstants.h"
 #include "guiutil.h"
+#include "modaloverlay.h"
 #include "networkstyle.h"
 #include "notificator.h"
 #include "openuridialog.h"
@@ -114,6 +115,7 @@ BitcoinGUI::BitcoinGUI(const PlatformStyle *platformStyle, const NetworkStyle *n
     notificator(0),
     rpcConsole(0),
     helpMessageDialog(0),
+    modalOverlay(0),
     prevBlocks(0),
     spinnerFrame(0),
     platformStyle(platformStyle)
@@ -241,6 +243,12 @@ BitcoinGUI::BitcoinGUI(const PlatformStyle *platformStyle, const NetworkStyle *n
 
     // Subscribe to notifications from core
     subscribeToCoreSignals();
+
+    modalOverlay = new ModalOverlay(this->centralWidget());
+#ifdef ENABLE_WALLET
+    if(enableWallet)
+        connect(walletFrame, SIGNAL(requestedOfSyncWarningInfo()), this, SLOT(showModalOverlay()));
+#endif
 }
 
 BitcoinGUI::~BitcoinGUI()
@@ -491,6 +499,8 @@ void BitcoinGUI::setClientModel(ClientModel *clientModel)
             // initialize the disable state of the tray icon with the current value in the model.
             setTrayIconVisible(optionsModel->getHideTrayIcon());
         }
+
+        modalOverlay->setKnownBestHeight(clientModel->getHeaderHeight());
     } else {
         // Disable possibility to show main window via action
         toggleHideAction->setEnabled(false);
@@ -705,7 +715,14 @@ void BitcoinGUI::setNumConnections(int count)
 
 void BitcoinGUI::setNumBlocks(int count, const QDateTime& blockDate, double nVerificationProgress, bool header)
 {
-    if(!clientModel)
+    if (modalOverlay)
+    {
+        if (header)
+            modalOverlay->setKnownBestHeight(count);
+        else
+            modalOverlay->tipUpdate(count, blockDate, nVerificationProgress);
+    }
+    if (!clientModel)
         return;
 
     // Prevent orphan statusbar messages (e.g. hover Quit in main menu, wait until chain-sync starts -> garbelled text)
@@ -754,7 +771,10 @@ void BitcoinGUI::setNumBlocks(int count, const QDateTime& blockDate, double nVer
 
 #ifdef ENABLE_WALLET
         if(walletFrame)
+        {
             walletFrame->showOutOfSyncWarning(false);
+            modalOverlay->showHide(true, true);
+        }
 #endif // ENABLE_WALLET
 
         progressBarLabel->setVisible(false);
@@ -782,7 +802,10 @@ void BitcoinGUI::setNumBlocks(int count, const QDateTime& blockDate, double nVer
 
 #ifdef ENABLE_WALLET
         if(walletFrame)
+        {
             walletFrame->showOutOfSyncWarning(true);
+            modalOverlay->showHide();
+        }
 #endif // ENABLE_WALLET
 
         tooltip += QString("<br>");
@@ -1078,6 +1101,12 @@ void BitcoinGUI::setTrayIconVisible(bool fHideTrayIcon)
     }
 }
 
+void BitcoinGUI::showModalOverlay()
+{
+    if (modalOverlay)
+        modalOverlay->showHide(false, true);
+}
+
 static bool ThreadSafeMessageBox(BitcoinGUI *gui, const std::string& message, const std::string& caption, unsigned int style)
 {
     bool modal = (style & CClientUIInterface::MODAL);
diff --git a/src/qt/bitcoingui.h b/src/qt/bitcoingui.h
index 41770929b4706..0eaa44b263ac5 100644
--- a/src/qt/bitcoingui.h
+++ b/src/qt/bitcoingui.h
@@ -29,6 +29,7 @@ class UnitDisplayStatusBarControl;
 class WalletFrame;
 class WalletModel;
 class HelpMessageDialog;
+class ModalOverlay;
 
 class CWallet;
 
@@ -118,6 +119,7 @@ class BitcoinGUI : public QMainWindow
     Notificator *notificator;
     RPCConsole *rpcConsole;
     HelpMessageDialog *helpMessageDialog;
+    ModalOverlay *modalOverlay;
 
     /** Keep track of previous number of blocks, to detect progress */
     int prevBlocks;
@@ -229,6 +231,8 @@ private Q_SLOTS:
     
     /** When hideTrayIcon setting is changed in OptionsModel hide or show the icon accordingly. */
     void setTrayIconVisible(bool);
+
+    void showModalOverlay();
 };
 
 class UnitDisplayStatusBarControl : public QLabel
diff --git a/src/qt/forms/modaloverlay.ui b/src/qt/forms/modaloverlay.ui
new file mode 100644
index 0000000000000..f1967a7c05721
--- /dev/null
+++ b/src/qt/forms/modaloverlay.ui
@@ -0,0 +1,370 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>ModalOverlay</class>
+ <widget class="ModalOverlay" name="ModalOverlay">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>640</width>
+    <height>385</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout" stretch="0">
+   <property name="sizeConstraint">
+    <enum>QLayout::SetDefaultConstraint</enum>
+   </property>
+   <property name="leftMargin">
+    <number>0</number>
+   </property>
+   <property name="topMargin">
+    <number>0</number>
+   </property>
+   <property name="rightMargin">
+    <number>0</number>
+   </property>
+   <property name="bottomMargin">
+    <number>0</number>
+   </property>
+   <item>
+    <widget class="QWidget" name="bgWidget" native="true">
+     <property name="styleSheet">
+      <string notr="true">#bgWidget { background: rgba(0,0,0,220); }</string>
+     </property>
+     <layout class="QVBoxLayout" name="verticalLayoutMain" stretch="1">
+      <property name="leftMargin">
+       <number>60</number>
+      </property>
+      <property name="topMargin">
+       <number>60</number>
+      </property>
+      <property name="rightMargin">
+       <number>60</number>
+      </property>
+      <property name="bottomMargin">
+       <number>60</number>
+      </property>
+      <item>
+       <widget class="QWidget" name="contentWidget" native="true">
+        <property name="styleSheet">
+         <string notr="true">#contentWidget { background: rgba(255,255,255,240); border-radius: 6px; }
+
+QLabel { color: rgb(40,40,40);  }</string>
+        </property>
+        <layout class="QVBoxLayout" name="verticalLayoutSub" stretch="1,0,0,0">
+         <property name="spacing">
+          <number>0</number>
+         </property>
+         <property name="leftMargin">
+          <number>10</number>
+         </property>
+         <property name="topMargin">
+          <number>10</number>
+         </property>
+         <property name="rightMargin">
+          <number>10</number>
+         </property>
+         <property name="bottomMargin">
+          <number>10</number>
+         </property>
+         <item>
+          <layout class="QHBoxLayout" name="horizontalLayoutIconText" stretch="0,1">
+           <property name="topMargin">
+            <number>20</number>
+           </property>
+           <item>
+            <layout class="QVBoxLayout" name="verticalLayoutIcon">
+             <property name="leftMargin">
+              <number>0</number>
+             </property>
+             <item>
+              <widget class="QPushButton" name="warningIcon">
+               <property name="text">
+                <string/>
+               </property>
+               <property name="icon">
+                <iconset>
+                 <normaloff>:/icons/warning</normaloff>
+                 <disabledoff>:/icons/warning</disabledoff>:/icons/warning</iconset>
+               </property>
+               <property name="iconSize">
+                <size>
+                 <width>48</width>
+                 <height>48</height>
+                </size>
+               </property>
+               <property name="flat">
+                <bool>true</bool>
+               </property>
+              </widget>
+             </item>
+             <item>
+              <spacer name="verticalSpacerWarningIcon">
+               <property name="orientation">
+                <enum>Qt::Vertical</enum>
+               </property>
+               <property name="sizeHint" stdset="0">
+                <size>
+                 <width>20</width>
+                 <height>40</height>
+                </size>
+               </property>
+              </spacer>
+             </item>
+            </layout>
+           </item>
+           <item>
+            <layout class="QVBoxLayout" name="verticalLayoutInfoText">
+             <property name="leftMargin">
+              <number>0</number>
+             </property>
+             <property name="topMargin">
+              <number>0</number>
+             </property>
+             <item>
+              <widget class="QLabel" name="infoText">
+               <property name="text">
+                <string>The displayed information may be out of date. Your wallet automatically synchronizes with the Bitcoin network after a connection is established, but this process has not completed yet.</string>
+               </property>
+               <property name="textFormat">
+                <enum>Qt::RichText</enum>
+               </property>
+               <property name="wordWrap">
+                <bool>true</bool>
+               </property>
+              </widget>
+             </item>
+             <item>
+              <widget class="QLabel" name="infoTextStrong">
+               <property name="font">
+                <font>
+                 <weight>75</weight>
+                 <bold>true</bold>
+                </font>
+               </property>
+               <property name="text">
+                <string>This means that recent transactions will not be visible, and the balance will not be up-to-date until this process has completed. Spending bitcoins is not possible during that phase!</string>
+               </property>
+               <property name="textFormat">
+                <enum>Qt::RichText</enum>
+               </property>
+               <property name="wordWrap">
+                <bool>true</bool>
+               </property>
+              </widget>
+             </item>
+             <item>
+              <spacer name="verticalSpacerInTextSpace">
+               <property name="orientation">
+                <enum>Qt::Vertical</enum>
+               </property>
+               <property name="sizeHint" stdset="0">
+                <size>
+                 <width>20</width>
+                 <height>40</height>
+                </size>
+               </property>
+              </spacer>
+             </item>
+            </layout>
+           </item>
+          </layout>
+         </item>
+         <item>
+          <spacer name="verticalSpacerAfterText">
+           <property name="orientation">
+            <enum>Qt::Vertical</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>20</width>
+             <height>40</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+         <item>
+          <layout class="QFormLayout" name="formLayout">
+           <property name="fieldGrowthPolicy">
+            <enum>QFormLayout::FieldsStayAtSizeHint</enum>
+           </property>
+           <property name="horizontalSpacing">
+            <number>6</number>
+           </property>
+           <property name="verticalSpacing">
+            <number>6</number>
+           </property>
+           <property name="topMargin">
+            <number>10</number>
+           </property>
+           <item row="0" column="0">
+            <widget class="QLabel" name="labelAmoutOfBlocksLeft">
+             <property name="font">
+              <font>
+               <weight>75</weight>
+               <bold>true</bold>
+              </font>
+             </property>
+             <property name="text">
+              <string>Amount of blocks left</string>
+             </property>
+            </widget>
+           </item>
+           <item row="0" column="1">
+            <widget class="QLabel" name="amountOfBlocksLeft">
+             <property name="text">
+              <string>unknown...</string>
+             </property>
+            </widget>
+           </item>
+           <item row="1" column="0">
+            <widget class="QLabel" name="labelLastBlockTime">
+             <property name="font">
+              <font>
+               <weight>75</weight>
+               <bold>true</bold>
+              </font>
+             </property>
+             <property name="text">
+              <string>Last block time</string>
+             </property>
+            </widget>
+           </item>
+           <item row="1" column="1">
+            <widget class="QLabel" name="newestBlockDate">
+             <property name="sizePolicy">
+              <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
+               <horstretch>0</horstretch>
+               <verstretch>0</verstretch>
+              </sizepolicy>
+             </property>
+             <property name="text">
+              <string>unknown...</string>
+             </property>
+            </widget>
+           </item>
+           <item row="2" column="0">
+            <widget class="QLabel" name="labelSyncDone">
+             <property name="font">
+              <font>
+               <weight>75</weight>
+               <bold>true</bold>
+              </font>
+             </property>
+             <property name="text">
+              <string>Progress</string>
+             </property>
+            </widget>
+           </item>
+           <item row="2" column="1">
+            <layout class="QHBoxLayout" name="horizontalLayoutSync" stretch="0,1">
+             <item>
+              <widget class="QLabel" name="percentageProgress">
+               <property name="text">
+                <string>~</string>
+               </property>
+              </widget>
+             </item>
+             <item>
+              <widget class="QProgressBar" name="progressBar">
+               <property name="value">
+                <number>24</number>
+               </property>
+              </widget>
+             </item>
+            </layout>
+           </item>
+           <item row="4" column="0">
+            <widget class="QLabel" name="labelProgressIncrease">
+             <property name="font">
+              <font>
+               <weight>75</weight>
+               <bold>true</bold>
+              </font>
+             </property>
+             <property name="text">
+              <string>Progress increase per Hour</string>
+             </property>
+            </widget>
+           </item>
+           <item row="4" column="1">
+            <widget class="QLabel" name="progressIncreasePerH">
+             <property name="text">
+              <string>calculating...</string>
+             </property>
+            </widget>
+           </item>
+           <item row="5" column="0">
+            <widget class="QLabel" name="labelEstimatedTimeLeft">
+             <property name="font">
+              <font>
+               <weight>75</weight>
+               <bold>true</bold>
+              </font>
+             </property>
+             <property name="text">
+              <string>Estimated time left until synced</string>
+             </property>
+            </widget>
+           </item>
+           <item row="5" column="1">
+            <widget class="QLabel" name="expectedTimeLeft">
+             <property name="text">
+              <string>calculating...</string>
+             </property>
+            </widget>
+           </item>
+          </layout>
+         </item>
+         <item>
+          <layout class="QHBoxLayout" name="horizontalLayoutButtons">
+           <property name="leftMargin">
+            <number>10</number>
+           </property>
+           <property name="topMargin">
+            <number>10</number>
+           </property>
+           <item>
+            <spacer name="horizontalSpacer">
+             <property name="orientation">
+              <enum>Qt::Horizontal</enum>
+             </property>
+             <property name="sizeHint" stdset="0">
+              <size>
+               <width>40</width>
+               <height>20</height>
+              </size>
+             </property>
+            </spacer>
+           </item>
+           <item>
+            <widget class="QPushButton" name="closeButton">
+             <property name="text">
+              <string>Hide</string>
+             </property>
+            </widget>
+           </item>
+          </layout>
+         </item>
+        </layout>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>ModalOverlay</class>
+   <extends>QWidget</extends>
+   <header>modaloverlay.h</header>
+   <container>1</container>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/src/qt/modaloverlay.cpp b/src/qt/modaloverlay.cpp
new file mode 100644
index 0000000000000..1cd5b199661b7
--- /dev/null
+++ b/src/qt/modaloverlay.cpp
@@ -0,0 +1,150 @@
+// Copyright (c) 2017 The Bitcoin Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#include "modaloverlay.h"
+#include "ui_modaloverlay.h"
+
+#include "guiutil.h"
+
+#include <QResizeEvent>
+#include <QPropertyAnimation>
+
+ModalOverlay::ModalOverlay(QWidget *parent) :
+QWidget(parent),
+ui(new Ui::ModalOverlay),
+bestBlockHeight(0),
+layerIsVisible(false),
+userClosed(false)
+{
+    ui->setupUi(this);
+    connect(ui->closeButton, SIGNAL(clicked()), this, SLOT(closeClicked()));
+    if (parent) {
+        parent->installEventFilter(this);
+        raise();
+    }
+
+    blockProcessTime.clear();
+    setVisible(false);
+}
+
+ModalOverlay::~ModalOverlay()
+{
+    delete ui;
+}
+
+bool ModalOverlay::eventFilter(QObject * obj, QEvent * ev) {
+    if (obj == parent()) {
+        if (ev->type() == QEvent::Resize) {
+            QResizeEvent * rev = static_cast<QResizeEvent*>(ev);
+            resize(rev->size());
+            if (!layerIsVisible)
+                setGeometry(0, height(), width(), height());
+
+        }
+        else if (ev->type() == QEvent::ChildAdded) {
+            raise();
+        }
+    }
+    return QWidget::eventFilter(obj, ev);
+}
+
+//! Tracks parent widget changes
+bool ModalOverlay::event(QEvent* ev) {
+    if (ev->type() == QEvent::ParentAboutToChange) {
+        if (parent()) parent()->removeEventFilter(this);
+    }
+    else if (ev->type() == QEvent::ParentChange) {
+        if (parent()) {
+            parent()->installEventFilter(this);
+            raise();
+        }
+    }
+    return QWidget::event(ev);
+}
+
+void ModalOverlay::setKnownBestHeight(int count)
+{
+    if (count > bestBlockHeight)
+        bestBlockHeight = count;
+}
+
+void ModalOverlay::tipUpdate(int count, const QDateTime& blockDate, double nVerificationProgress)
+{
+    QDateTime currentDate = QDateTime::currentDateTime();
+
+    // keep a vector of samples of verification progress at height
+    blockProcessTime.push_front(qMakePair(currentDate.currentMSecsSinceEpoch(), nVerificationProgress));
+
+    // show progress speed if we have more then one sample
+    if (blockProcessTime.size() >= 2)
+    {
+        // try to get the window from the last 500 seconds or at least 10 samples
+        double progressStart = blockProcessTime[0].second;
+        double progressDelta = 0;
+        double progressPerHour = 0;
+        qint64 timeDelta = 0;
+        qint64 remainingMSecs = 0;
+        double remainingProgress = 1.0 - nVerificationProgress;
+        for (int i = 1; i < blockProcessTime.size(); i++)
+        {
+            QPair<qint64, double> sample = blockProcessTime[i];
+
+            // take first sample after 500 seconds or last available one
+            if (sample.first < (currentDate.currentMSecsSinceEpoch() - 500*1000) || i == blockProcessTime.size()-1)
+            {
+                progressDelta = progressStart-sample.second;
+                timeDelta = blockProcessTime[0].first - sample.first;
+                progressPerHour = progressDelta/(double)timeDelta*1000*3600;
+                remainingMSecs = remainingProgress / progressDelta * timeDelta;
+                break;
+            }
+        }
+        // show progress increase per hour
+        ui->progressIncreasePerH->setText(QString::number(progressPerHour*100, 'f', 2)+"%");
+
+        // show expected remaining time
+        ui->expectedTimeLeft->setText(GUIUtil::formateNiceTimeOffset(remainingMSecs/1000.0));
+
+        // keep maximal 5000 samples
+        static int maxSamples = 5000;
+        if (blockProcessTime.count() > maxSamples)
+            blockProcessTime.remove(maxSamples, blockProcessTime.count()-maxSamples);
+    }
+
+    // show the last block date
+    ui->newestBlockDate->setText(blockDate.toString());
+
+    // show the percentage done according to nVerificationProgress
+    ui->percentageProgress->setText(QString::number(nVerificationProgress*100, 'f', 2)+"%");
+    ui->progressBar->setValue(nVerificationProgress*100);
+
+    // show remaining amount of blocks
+    if (bestBlockHeight > 0)
+        ui->amountOfBlocksLeft->setText(QString::number(bestBlockHeight-count));
+}
+
+void ModalOverlay::showHide(bool hide, bool userRequested)
+{
+    if ( (layerIsVisible && !hide) || (!layerIsVisible && hide) || (!hide && userClosed && !userRequested))
+        return;
+
+    if (!isVisible() && !hide)
+        setVisible(true);
+
+    setGeometry(0, hide ? 0 : height(), width(), height());
+
+    QPropertyAnimation* animation = new QPropertyAnimation(this, "pos");
+    animation->setDuration(300);
+    animation->setStartValue(QPoint(0, hide ? 0 : this->height()));
+    animation->setEndValue(QPoint(0, hide ? this->height() : 0));
+    animation->setEasingCurve(QEasingCurve::OutQuad);
+    animation->start(QAbstractAnimation::DeleteWhenStopped);
+    layerIsVisible = !hide;
+}
+
+void ModalOverlay::closeClicked()
+{
+    showHide(true);
+    userClosed = true;
+}
diff --git a/src/qt/modaloverlay.h b/src/qt/modaloverlay.h
new file mode 100644
index 0000000000000..5bf913a3f3d6f
--- /dev/null
+++ b/src/qt/modaloverlay.h
@@ -0,0 +1,44 @@
+// Copyright (c) 2017 The Bitcoin Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#ifndef BITCOIN_QT_MODALOVERLAY_H
+#define BITCOIN_QT_MODALOVERLAY_H
+
+#include <QDateTime>
+#include <QWidget>
+
+namespace Ui {
+    class ModalOverlay;
+}
+
+/** Modal overlay to display information about the chain-sync state */
+class ModalOverlay : public QWidget
+{
+    Q_OBJECT
+
+public:
+    explicit ModalOverlay(QWidget *parent);
+    ~ModalOverlay();
+
+public Q_SLOTS:
+    void tipUpdate(int count, const QDateTime& blockDate, double nVerificationProgress);
+    void setKnownBestHeight(int count);
+
+    // will show or hide the modal layer
+    void showHide(bool hide = false, bool userRequested = false);
+    void closeClicked();
+
+protected:
+    bool eventFilter(QObject * obj, QEvent * ev);
+    bool event(QEvent* ev);
+
+private:
+    Ui::ModalOverlay *ui;
+    int bestBlockHeight; //best known height (based on the headers)
+    QVector<QPair<qint64, double> > blockProcessTime;
+    bool layerIsVisible;
+    bool userClosed;
+};
+
+#endif // BITCOIN_QT_MODALOVERLAY_H

From 152f45ba58b1548bba0788ca557fd66197063aa3 Mon Sep 17 00:00:00 2001
From: Peter Todd <pete@petertodd.org>
Date: Mon, 30 Nov 2015 13:11:18 +0800
Subject: [PATCH 0775/1802] Add option to opt into full-RBF when sending funds

---
 src/wallet/wallet.cpp | 9 ++++++---
 src/wallet/wallet.h   | 3 +++
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index 769322969d207..c804d79c28ba8 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -40,6 +40,7 @@ CFeeRate payTxFee(DEFAULT_TRANSACTION_FEE);
 unsigned int nTxConfirmTarget = DEFAULT_TX_CONFIRM_TARGET;
 bool bSpendZeroConfChange = DEFAULT_SPEND_ZEROCONF_CHANGE;
 bool fSendFreeTransactions = DEFAULT_SEND_FREE_TRANSACTIONS;
+bool fOptIntoFullRbf = DEFAULT_OPT_INTO_FULL_RBF;
 
 const char * DEFAULT_WALLET_DAT = "wallet.dat";
 const uint32_t BIP32_HARDENED_KEY_LIMIT = 0x80000000;
@@ -2355,11 +2356,11 @@ bool CWallet::CreateTransaction(const vector<CRecipient>& vecSend, CWalletTx& wt
 
                 // Fill vin
                 //
-                // Note how the sequence number is set to max()-1 so that the
-                // nLockTime set above actually works.
+                // Note how the sequence number is set to non-maxint so that
+                // the nLockTime set above actually works.
                 BOOST_FOREACH(const PAIRTYPE(const CWalletTx*,unsigned int)& coin, setCoins)
                     txNew.vin.push_back(CTxIn(coin.first->GetHash(),coin.second,CScript(),
-                                              std::numeric_limits<unsigned int>::max()-1));
+                                              std::numeric_limits<unsigned int>::max() - (fOptIntoFullRbf ? 2 : 1)));
 
                 // Sign
                 int nIn = 0;
@@ -3240,6 +3241,7 @@ std::string CWallet::GetWalletHelpString(bool showDebug)
     strUsage += HelpMessageOpt("-spendzeroconfchange", strprintf(_("Spend unconfirmed change when sending transactions (default: %u)"), DEFAULT_SPEND_ZEROCONF_CHANGE));
     strUsage += HelpMessageOpt("-txconfirmtarget=<n>", strprintf(_("If paytxfee is not set, include enough fee so transactions begin confirmation on average within n blocks (default: %u)"), DEFAULT_TX_CONFIRM_TARGET));
     strUsage += HelpMessageOpt("-usehd", _("Use hierarchical deterministic key generation (HD) after BIP32. Only has effect during wallet creation/first start") + " " + strprintf(_("(default: %u)"), DEFAULT_USE_HD_WALLET));
+    strUsage += HelpMessageOpt("-optintofullrbf", strprintf(_("Send transactions with full-RBF opt-in enabled (default: %u)"), DEFAULT_OPT_INTO_FULL_RBF));
     strUsage += HelpMessageOpt("-upgradewallet", _("Upgrade wallet to latest format on startup"));
     strUsage += HelpMessageOpt("-wallet=<file>", _("Specify wallet file (within data directory)") + " " + strprintf(_("(default: %s)"), DEFAULT_WALLET_DAT));
     strUsage += HelpMessageOpt("-walletbroadcast", _("Make the wallet broadcast transactions") + " " + strprintf(_("(default: %u)"), DEFAULT_WALLETBROADCAST));
@@ -3480,6 +3482,7 @@ bool CWallet::ParameterInteraction()
     nTxConfirmTarget = GetArg("-txconfirmtarget", DEFAULT_TX_CONFIRM_TARGET);
     bSpendZeroConfChange = GetBoolArg("-spendzeroconfchange", DEFAULT_SPEND_ZEROCONF_CHANGE);
     fSendFreeTransactions = GetBoolArg("-sendfreetransactions", DEFAULT_SEND_FREE_TRANSACTIONS);
+    fOptIntoFullRbf = GetBoolArg("-optintofullrbf", DEFAULT_OPT_INTO_FULL_RBF);
 
     return true;
 }
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
index c06513650c74a..5d93d2c4d96d8 100644
--- a/src/wallet/wallet.h
+++ b/src/wallet/wallet.h
@@ -37,6 +37,7 @@ extern CFeeRate payTxFee;
 extern unsigned int nTxConfirmTarget;
 extern bool bSpendZeroConfChange;
 extern bool fSendFreeTransactions;
+extern bool fOptIntoFullRbf;
 
 static const unsigned int DEFAULT_KEYPOOL_SIZE = 100;
 //! -paytxfee default
@@ -53,6 +54,8 @@ static const bool DEFAULT_SPEND_ZEROCONF_CHANGE = true;
 static const bool DEFAULT_SEND_FREE_TRANSACTIONS = false;
 //! -txconfirmtarget default
 static const unsigned int DEFAULT_TX_CONFIRM_TARGET = 2;
+//! -optintofullrbf default
+static const bool DEFAULT_OPT_INTO_FULL_RBF = false;
 //! Largest (in bytes) free transaction we're willing to create
 static const unsigned int MAX_FREE_TRANSACTION_CREATE_SIZE = 1000;
 static const bool DEFAULT_WALLETBROADCAST = true;

From 05fa823bf60d21049caebc64dd5c5add8ba4ee10 Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Fri, 26 Aug 2016 12:13:48 +0200
Subject: [PATCH 0776/1802] wallet: Add BIP125 comment for MAXINT-1/-2 behavior

---
 src/wallet/wallet.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index c804d79c28ba8..5542a536e1d39 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -2358,6 +2358,12 @@ bool CWallet::CreateTransaction(const vector<CRecipient>& vecSend, CWalletTx& wt
                 //
                 // Note how the sequence number is set to non-maxint so that
                 // the nLockTime set above actually works.
+                //
+                // BIP125 defines opt-in RBF as any nSequence < maxint-1, so
+                // we use the highest possible value in that range (maxint-2)
+                // to avoid conflicting with other possible uses of nSequence,
+                // and in the spirit of "smallest posible change from prior
+                // behavior."
                 BOOST_FOREACH(const PAIRTYPE(const CWalletTx*,unsigned int)& coin, setCoins)
                     txNew.vin.push_back(CTxIn(coin.first->GetHash(),coin.second,CScript(),
                                               std::numeric_limits<unsigned int>::max() - (fOptIntoFullRbf ? 2 : 1)));

From ab53207b9cdb6422cbb515ca6acf1bf945651895 Mon Sep 17 00:00:00 2001
From: fanquake <fanquake@gmail.com>
Date: Fri, 26 Aug 2016 19:40:24 +0800
Subject: [PATCH 0777/1802] [trivial][doc] Mention ++i as preferred to i++ in
 dev notes

---
 doc/developer-notes.md | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/doc/developer-notes.md b/doc/developer-notes.md
index 95c46b05fe203..70c0690ba3c21 100644
--- a/doc/developer-notes.md
+++ b/doc/developer-notes.md
@@ -14,6 +14,7 @@ gradually.
   - No indentation for public/protected/private or for namespaces.
   - No extra spaces inside parenthesis; don't do ( this )
   - No space after function names; one space after if, for and while.
+  - `++i` is preferred over `i++`.
 
 Block style example:
 ```c++
@@ -24,7 +25,7 @@ class Class
     bool Function(char* psz, int n)
     {
         // Comment summarising what this section of code does
-        for (int i = 0; i < n; i++) {
+        for (int i = 0; i < n; ++i) {
             // When something fails, return early
             if (!Something())
                 return false;
@@ -231,9 +232,9 @@ General Bitcoin Core
   - *Rationale*: Makes sure that they pass thorough testing, and that the tester will keep passing
      on the master branch. Otherwise all new pull requests will start failing the tests, resulting in
      confusion and mayhem
- 
+
   - *Explanation*: If the test suite is to be updated for a change, this has to
-    be done first 
+    be done first
 
 Wallet
 -------

From c25083bcef68188bc69ec8e64e3105d262d67ab8 Mon Sep 17 00:00:00 2001
From: fanquake <fanquake@gmail.com>
Date: Fri, 26 Aug 2016 20:08:30 +0800
Subject: [PATCH 0778/1802] [trivial][doc] Mention gpg --refresh-keys in
 release-process.md

---
 doc/release-process.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/doc/release-process.md b/doc/release-process.md
index 41c1ac8556b1a..394b159b31ae5 100644
--- a/doc/release-process.md
+++ b/doc/release-process.md
@@ -137,9 +137,10 @@ Build output expected:
 
 ### Verify other gitian builders signatures to your own. (Optional)
 
-Add other gitian builders keys to your gpg keyring
+Add other gitian builders keys to your gpg keyring, and/or refresh keys.
 
     gpg --import bitcoin/contrib/gitian-keys/*.pgp
+    gpg --refresh-keys
 
 Verify the signatures
 

From 35fe0393f216aa6020fc929272118eade5628636 Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Fri, 26 Aug 2016 18:38:20 +0200
Subject: [PATCH 0779/1802] Rename to PrecomputedTransactionData

---
 src/main.cpp                    | 26 +++++++++++++-------------
 src/main.h                      | 12 ++++++------
 src/script/bitcoinconsensus.cpp |  4 ++--
 src/script/interpreter.cpp      |  6 +++---
 src/script/interpreter.h        | 12 ++++++------
 src/script/sigcache.h           |  2 +-
 src/test/script_P2SH_tests.cpp  |  4 ++--
 src/test/transaction_tests.cpp  | 12 ++++++------
 8 files changed, 39 insertions(+), 39 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index 7f48ccbae1de4..3cb476f9577ba 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1492,13 +1492,13 @@ bool AcceptToMemoryPoolWorker(CTxMemPool& pool, CValidationState& state, const C
 
         // Check against previous transactions
         // This is done last to help prevent CPU exhaustion denial-of-service attacks.
-        CachedHashes cachedHashes(tx);
-        if (!CheckInputs(tx, state, view, true, scriptVerifyFlags, true, cachedHashes)) {
+        PrecomputedTransactionData txdata(tx);
+        if (!CheckInputs(tx, state, view, true, scriptVerifyFlags, true, txdata)) {
             // SCRIPT_VERIFY_CLEANSTACK requires SCRIPT_VERIFY_WITNESS, so we
             // need to turn both off, and compare against just turning off CLEANSTACK
             // to see if the failure is specifically due to witness validation.
-            if (CheckInputs(tx, state, view, true, scriptVerifyFlags & ~(SCRIPT_VERIFY_WITNESS | SCRIPT_VERIFY_CLEANSTACK), true, cachedHashes) &&
-                !CheckInputs(tx, state, view, true, scriptVerifyFlags & ~SCRIPT_VERIFY_CLEANSTACK, true, cachedHashes)) {
+            if (CheckInputs(tx, state, view, true, scriptVerifyFlags & ~(SCRIPT_VERIFY_WITNESS | SCRIPT_VERIFY_CLEANSTACK), true, txdata) &&
+                !CheckInputs(tx, state, view, true, scriptVerifyFlags & ~SCRIPT_VERIFY_CLEANSTACK, true, txdata)) {
                 // Only the witness is wrong, so the transaction itself may be fine.
                 state.SetCorruptionPossible();
             }
@@ -1514,7 +1514,7 @@ bool AcceptToMemoryPoolWorker(CTxMemPool& pool, CValidationState& state, const C
         // There is a similar check in CreateNewBlock() to prevent creating
         // invalid blocks, however allowing such transactions into the mempool
         // can be exploited as a DoS attack.
-        if (!CheckInputs(tx, state, view, true, MANDATORY_SCRIPT_VERIFY_FLAGS, true, cachedHashes))
+        if (!CheckInputs(tx, state, view, true, MANDATORY_SCRIPT_VERIFY_FLAGS, true, txdata))
         {
             return error("%s: BUG! PLEASE REPORT THIS! ConnectInputs failed against MANDATORY but not STANDARD flags %s, %s",
                 __func__, hash.ToString(), FormatStateMessage(state));
@@ -1911,7 +1911,7 @@ void UpdateCoins(const CTransaction& tx, CCoinsViewCache& inputs, int nHeight)
 bool CScriptCheck::operator()() {
     const CScript &scriptSig = ptxTo->vin[nIn].scriptSig;
     const CScriptWitness *witness = (nIn < ptxTo->wit.vtxinwit.size()) ? &ptxTo->wit.vtxinwit[nIn].scriptWitness : NULL;
-    if (!VerifyScript(scriptSig, scriptPubKey, witness, nFlags, CachingTransactionSignatureChecker(ptxTo, nIn, amount, cacheStore, *cachedHashes), &error)) {
+    if (!VerifyScript(scriptSig, scriptPubKey, witness, nFlags, CachingTransactionSignatureChecker(ptxTo, nIn, amount, cacheStore, *txdata), &error)) {
         return false;
     }
     return true;
@@ -1970,7 +1970,7 @@ bool CheckTxInputs(const CTransaction& tx, CValidationState& state, const CCoins
 }
 }// namespace Consensus
 
-bool CheckInputs(const CTransaction& tx, CValidationState &state, const CCoinsViewCache &inputs, bool fScriptChecks, unsigned int flags, bool cacheStore, CachedHashes& cachedHashes, std::vector<CScriptCheck> *pvChecks)
+bool CheckInputs(const CTransaction& tx, CValidationState &state, const CCoinsViewCache &inputs, bool fScriptChecks, unsigned int flags, bool cacheStore, PrecomputedTransactionData& txdata, std::vector<CScriptCheck> *pvChecks)
 {
     if (!tx.IsCoinBase())
     {
@@ -1997,7 +1997,7 @@ bool CheckInputs(const CTransaction& tx, CValidationState &state, const CCoinsVi
                 assert(coins);
 
                 // Verify signature
-                CScriptCheck check(*coins, tx, i, flags, cacheStore, &cachedHashes);
+                CScriptCheck check(*coins, tx, i, flags, cacheStore, &txdata);
                 if (pvChecks) {
                     pvChecks->push_back(CScriptCheck());
                     check.swap(pvChecks->back());
@@ -2010,7 +2010,7 @@ bool CheckInputs(const CTransaction& tx, CValidationState &state, const CCoinsVi
                         // avoid splitting the network between upgraded and
                         // non-upgraded nodes.
                         CScriptCheck check2(*coins, tx, i,
-                                flags & ~STANDARD_NOT_MANDATORY_VERIFY_FLAGS, cacheStore, &cachedHashes);
+                                flags & ~STANDARD_NOT_MANDATORY_VERIFY_FLAGS, cacheStore, &txdata);
                         if (check2())
                             return state.Invalid(false, REJECT_NONSTANDARD, strprintf("non-mandatory-script-verify-flag (%s)", ScriptErrorString(check.GetScriptError())));
                     }
@@ -2406,8 +2406,8 @@ bool ConnectBlock(const CBlock& block, CValidationState& state, CBlockIndex* pin
     std::vector<std::pair<uint256, CDiskTxPos> > vPos;
     vPos.reserve(block.vtx.size());
     blockundo.vtxundo.reserve(block.vtx.size() - 1);
-    std::vector<CachedHashes> cachedHashes;
-    cachedHashes.reserve(block.vtx.size()); // Required so that pointers to individual CachedHashes don't get invalidated
+    std::vector<PrecomputedTransactionData> txdata;
+    txdata.reserve(block.vtx.size()); // Required so that pointers to individual PrecomputedTransactionData don't get invalidated
     for (unsigned int i = 0; i < block.vtx.size(); i++)
     {
         const CTransaction &tx = block.vtx[i];
@@ -2454,14 +2454,14 @@ bool ConnectBlock(const CBlock& block, CValidationState& state, CBlockIndex* pin
             return state.DoS(100, error("ConnectBlock(): too many sigops"),
                              REJECT_INVALID, "bad-blk-sigops");
 
-        cachedHashes.emplace_back(tx);
+        txdata.emplace_back(tx);
         if (!tx.IsCoinBase())
         {
             nFees += view.GetValueIn(tx)-tx.GetValueOut();
 
             std::vector<CScriptCheck> vChecks;
             bool fCacheResults = fJustCheck; /* Don't cache results if we're actually connecting blocks (still consult the cache, though) */
-            if (!CheckInputs(tx, state, view, fScriptChecks, flags, fCacheResults, cachedHashes[i], nScriptCheckThreads ? &vChecks : NULL))
+            if (!CheckInputs(tx, state, view, fScriptChecks, flags, fCacheResults, txdata[i], nScriptCheckThreads ? &vChecks : NULL))
                 return error("ConnectBlock(): CheckInputs on %s failed with %s",
                     tx.GetHash().ToString(), FormatStateMessage(state));
             control.Add(vChecks);
diff --git a/src/main.h b/src/main.h
index fbf66c0481166..1c374c8a03ae3 100644
--- a/src/main.h
+++ b/src/main.h
@@ -38,7 +38,7 @@ class CScriptCheck;
 class CTxMemPool;
 class CValidationInterface;
 class CValidationState;
-class CachedHashes;
+class PrecomputedTransactionData;
 
 struct CNodeStateStats;
 struct LockPoints;
@@ -348,7 +348,7 @@ int64_t GetTransactionSigOpCost(const CTransaction& tx, const CCoinsViewCache& i
  * instead of being performed inline.
  */
 bool CheckInputs(const CTransaction& tx, CValidationState &state, const CCoinsViewCache &view, bool fScriptChecks,
-                 unsigned int flags, bool cacheStore, CachedHashes& cachedHashes, std::vector<CScriptCheck> *pvChecks = NULL);
+                 unsigned int flags, bool cacheStore, PrecomputedTransactionData& txdata, std::vector<CScriptCheck> *pvChecks = NULL);
 
 /** Apply the effects of this transaction on the UTXO set represented by view */
 void UpdateCoins(const CTransaction& tx, CCoinsViewCache& inputs, int nHeight);
@@ -422,13 +422,13 @@ class CScriptCheck
     unsigned int nFlags;
     bool cacheStore;
     ScriptError error;
-    CachedHashes *cachedHashes;
+    PrecomputedTransactionData *txdata;
 
 public:
     CScriptCheck(): amount(0), ptxTo(0), nIn(0), nFlags(0), cacheStore(false), error(SCRIPT_ERR_UNKNOWN_ERROR) {}
-    CScriptCheck(const CCoins& txFromIn, const CTransaction& txToIn, unsigned int nInIn, unsigned int nFlagsIn, bool cacheIn, CachedHashes* cachedHashesIn) :
+    CScriptCheck(const CCoins& txFromIn, const CTransaction& txToIn, unsigned int nInIn, unsigned int nFlagsIn, bool cacheIn, PrecomputedTransactionData* txdataIn) :
         scriptPubKey(txFromIn.vout[txToIn.vin[nInIn].prevout.n].scriptPubKey), amount(txFromIn.vout[txToIn.vin[nInIn].prevout.n].nValue),
-        ptxTo(&txToIn), nIn(nInIn), nFlags(nFlagsIn), cacheStore(cacheIn), error(SCRIPT_ERR_UNKNOWN_ERROR), cachedHashes(cachedHashesIn) { }
+        ptxTo(&txToIn), nIn(nInIn), nFlags(nFlagsIn), cacheStore(cacheIn), error(SCRIPT_ERR_UNKNOWN_ERROR), txdata(txdataIn) { }
 
     bool operator()();
 
@@ -440,7 +440,7 @@ class CScriptCheck
         std::swap(nFlags, check.nFlags);
         std::swap(cacheStore, check.cacheStore);
         std::swap(error, check.error);
-        std::swap(cachedHashes, check.cachedHashes);
+        std::swap(txdata, check.txdata);
     }
 
     ScriptError GetScriptError() const { return error; }
diff --git a/src/script/bitcoinconsensus.cpp b/src/script/bitcoinconsensus.cpp
index 01a8babb679eb..b629f4278ba20 100644
--- a/src/script/bitcoinconsensus.cpp
+++ b/src/script/bitcoinconsensus.cpp
@@ -84,8 +84,8 @@ static int verify_script(const unsigned char *scriptPubKey, unsigned int scriptP
 
         // Regardless of the verification result, the tx did not error.
         set_error(err, bitcoinconsensus_ERR_OK);
-        CachedHashes cachedHashes(tx);
-        return VerifyScript(tx.vin[nIn].scriptSig, CScript(scriptPubKey, scriptPubKey + scriptPubKeyLen), nIn < tx.wit.vtxinwit.size() ? &tx.wit.vtxinwit[nIn].scriptWitness : NULL, flags, TransactionSignatureChecker(&tx, nIn, amount, cachedHashes), NULL);
+        PrecomputedTransactionData txdata(tx);
+        return VerifyScript(tx.vin[nIn].scriptSig, CScript(scriptPubKey, scriptPubKey + scriptPubKeyLen), nIn < tx.wit.vtxinwit.size() ? &tx.wit.vtxinwit[nIn].scriptWitness : NULL, flags, TransactionSignatureChecker(&tx, nIn, amount, txdata), NULL);
     } catch (const std::exception&) {
         return set_error(err, bitcoinconsensus_ERR_TX_DESERIALIZE); // Error deserializing
     }
diff --git a/src/script/interpreter.cpp b/src/script/interpreter.cpp
index 459feaa0f4826..47ea261e31040 100644
--- a/src/script/interpreter.cpp
+++ b/src/script/interpreter.cpp
@@ -1134,14 +1134,14 @@ uint256 GetOutputsHash(const CTransaction& txTo) {
 
 } // anon namespace
 
-CachedHashes::CachedHashes(const CTransaction& txTo)
+PrecomputedTransactionData::PrecomputedTransactionData(const CTransaction& txTo)
 {
     hashPrevouts = GetPrevoutHash(txTo);
     hashSequence = GetSequenceHash(txTo);
     hashOutputs = GetOutputsHash(txTo);
 }
 
-uint256 SignatureHash(const CScript& scriptCode, const CTransaction& txTo, unsigned int nIn, int nHashType, const CAmount& amount, SigVersion sigversion, const CachedHashes* cache)
+uint256 SignatureHash(const CScript& scriptCode, const CTransaction& txTo, unsigned int nIn, int nHashType, const CAmount& amount, SigVersion sigversion, const PrecomputedTransactionData* cache)
 {
     if (sigversion == SIGVERSION_WITNESS_V0) {
         uint256 hashPrevouts;
@@ -1229,7 +1229,7 @@ bool TransactionSignatureChecker::CheckSig(const vector<unsigned char>& vchSigIn
     int nHashType = vchSig.back();
     vchSig.pop_back();
 
-    uint256 sighash = SignatureHash(scriptCode, *txTo, nIn, nHashType, amount, sigversion, this->cachedHashes);
+    uint256 sighash = SignatureHash(scriptCode, *txTo, nIn, nHashType, amount, sigversion, this->txdata);
 
     if (!VerifySignature(vchSig, pubkey, sighash))
         return false;
diff --git a/src/script/interpreter.h b/src/script/interpreter.h
index b4da113eec939..e5d7865cd3de6 100644
--- a/src/script/interpreter.h
+++ b/src/script/interpreter.h
@@ -98,11 +98,11 @@ enum
 
 bool CheckSignatureEncoding(const std::vector<unsigned char> &vchSig, unsigned int flags, ScriptError* serror);
 
-struct CachedHashes
+struct PrecomputedTransactionData
 {
     uint256 hashPrevouts, hashSequence, hashOutputs;
 
-    CachedHashes(const CTransaction& tx);
+    PrecomputedTransactionData(const CTransaction& tx);
 };
 
 enum SigVersion
@@ -111,7 +111,7 @@ enum SigVersion
     SIGVERSION_WITNESS_V0 = 1,
 };
 
-uint256 SignatureHash(const CScript &scriptCode, const CTransaction& txTo, unsigned int nIn, int nHashType, const CAmount& amount, SigVersion sigversion, const CachedHashes* cache = NULL);
+uint256 SignatureHash(const CScript &scriptCode, const CTransaction& txTo, unsigned int nIn, int nHashType, const CAmount& amount, SigVersion sigversion, const PrecomputedTransactionData* cache = NULL);
 
 class BaseSignatureChecker
 {
@@ -140,14 +140,14 @@ class TransactionSignatureChecker : public BaseSignatureChecker
     const CTransaction* txTo;
     unsigned int nIn;
     const CAmount amount;
-    const CachedHashes* cachedHashes;
+    const PrecomputedTransactionData* txdata;
 
 protected:
     virtual bool VerifySignature(const std::vector<unsigned char>& vchSig, const CPubKey& vchPubKey, const uint256& sighash) const;
 
 public:
-    TransactionSignatureChecker(const CTransaction* txToIn, unsigned int nInIn, const CAmount& amountIn) : txTo(txToIn), nIn(nInIn), amount(amountIn), cachedHashes(NULL) {}
-    TransactionSignatureChecker(const CTransaction* txToIn, unsigned int nInIn, const CAmount& amountIn, const CachedHashes& cachedHashesIn) : txTo(txToIn), nIn(nInIn), amount(amountIn), cachedHashes(&cachedHashesIn) {}
+    TransactionSignatureChecker(const CTransaction* txToIn, unsigned int nInIn, const CAmount& amountIn) : txTo(txToIn), nIn(nInIn), amount(amountIn), txdata(NULL) {}
+    TransactionSignatureChecker(const CTransaction* txToIn, unsigned int nInIn, const CAmount& amountIn, const PrecomputedTransactionData& txdataIn) : txTo(txToIn), nIn(nInIn), amount(amountIn), txdata(&txdataIn) {}
     bool CheckSig(const std::vector<unsigned char>& scriptSig, const std::vector<unsigned char>& vchPubKey, const CScript& scriptCode, SigVersion sigversion) const;
     bool CheckLockTime(const CScriptNum& nLockTime) const;
     bool CheckSequence(const CScriptNum& nSequence) const;
diff --git a/src/script/sigcache.h b/src/script/sigcache.h
index 551f8b2253e76..44551ec2bc435 100644
--- a/src/script/sigcache.h
+++ b/src/script/sigcache.h
@@ -22,7 +22,7 @@ class CachingTransactionSignatureChecker : public TransactionSignatureChecker
     bool store;
 
 public:
-    CachingTransactionSignatureChecker(const CTransaction* txToIn, unsigned int nInIn, const CAmount& amount, bool storeIn, CachedHashes& cachedHashesIn) : TransactionSignatureChecker(txToIn, nInIn, amount, cachedHashesIn), store(storeIn) {}
+    CachingTransactionSignatureChecker(const CTransaction* txToIn, unsigned int nInIn, const CAmount& amount, bool storeIn, PrecomputedTransactionData& txdataIn) : TransactionSignatureChecker(txToIn, nInIn, amount, txdataIn), store(storeIn) {}
 
     bool VerifySignature(const std::vector<unsigned char>& vchSig, const CPubKey& vchPubKey, const uint256& sighash) const;
 };
diff --git a/src/test/script_P2SH_tests.cpp b/src/test/script_P2SH_tests.cpp
index 5cd7c93622977..1a01593a8e163 100644
--- a/src/test/script_P2SH_tests.cpp
+++ b/src/test/script_P2SH_tests.cpp
@@ -108,12 +108,12 @@ BOOST_AUTO_TEST_CASE(sign)
     // All of the above should be OK, and the txTos have valid signatures
     // Check to make sure signature verification fails if we use the wrong ScriptSig:
     for (int i = 0; i < 8; i++) {
-        CachedHashes cachedHashes(txTo[i]);
+        PrecomputedTransactionData txdata(txTo[i]);
         for (int j = 0; j < 8; j++)
         {
             CScript sigSave = txTo[i].vin[0].scriptSig;
             txTo[i].vin[0].scriptSig = txTo[j].vin[0].scriptSig;
-            bool sigOK = CScriptCheck(CCoins(txFrom, 0), txTo[i], 0, SCRIPT_VERIFY_P2SH | SCRIPT_VERIFY_STRICTENC, false, &cachedHashes)();
+            bool sigOK = CScriptCheck(CCoins(txFrom, 0), txTo[i], 0, SCRIPT_VERIFY_P2SH | SCRIPT_VERIFY_STRICTENC, false, &txdata)();
             if (i == j)
                 BOOST_CHECK_MESSAGE(sigOK, strprintf("VerifySignature %d %d", i, j));
             else
diff --git a/src/test/transaction_tests.cpp b/src/test/transaction_tests.cpp
index 8f8666c76d1dc..b5af400bc54b5 100644
--- a/src/test/transaction_tests.cpp
+++ b/src/test/transaction_tests.cpp
@@ -154,7 +154,7 @@ BOOST_AUTO_TEST_CASE(tx_valid)
             BOOST_CHECK_MESSAGE(CheckTransaction(tx, state), strTest);
             BOOST_CHECK(state.IsValid());
 
-            CachedHashes cachedHashes(tx);
+            PrecomputedTransactionData txdata(tx);
             for (unsigned int i = 0; i < tx.vin.size(); i++)
             {
                 if (!mapprevOutScriptPubKeys.count(tx.vin[i].prevout))
@@ -170,7 +170,7 @@ BOOST_AUTO_TEST_CASE(tx_valid)
                 unsigned int verify_flags = ParseScriptFlags(test[2].get_str());
                 const CScriptWitness *witness = (i < tx.wit.vtxinwit.size()) ? &tx.wit.vtxinwit[i].scriptWitness : NULL;
                 BOOST_CHECK_MESSAGE(VerifyScript(tx.vin[i].scriptSig, mapprevOutScriptPubKeys[tx.vin[i].prevout],
-                                                 witness, verify_flags, TransactionSignatureChecker(&tx, i, amount, cachedHashes), &err),
+                                                 witness, verify_flags, TransactionSignatureChecker(&tx, i, amount, txdata), &err),
                                     strTest);
                 BOOST_CHECK_MESSAGE(err == SCRIPT_ERR_OK, ScriptErrorString(err));
             }
@@ -239,7 +239,7 @@ BOOST_AUTO_TEST_CASE(tx_invalid)
             CValidationState state;
             fValid = CheckTransaction(tx, state) && state.IsValid();
 
-            CachedHashes cachedHashes(tx);
+            PrecomputedTransactionData txdata(tx);
             for (unsigned int i = 0; i < tx.vin.size() && fValid; i++)
             {
                 if (!mapprevOutScriptPubKeys.count(tx.vin[i].prevout))
@@ -255,7 +255,7 @@ BOOST_AUTO_TEST_CASE(tx_invalid)
                 }
                 const CScriptWitness *witness = (i < tx.wit.vtxinwit.size()) ? &tx.wit.vtxinwit[i].scriptWitness : NULL;
                 fValid = VerifyScript(tx.vin[i].scriptSig, mapprevOutScriptPubKeys[tx.vin[i].prevout],
-                                      witness, verify_flags, TransactionSignatureChecker(&tx, i, amount, cachedHashes), &err);
+                                      witness, verify_flags, TransactionSignatureChecker(&tx, i, amount, txdata), &err);
             }
             BOOST_CHECK_MESSAGE(!fValid, strTest);
             BOOST_CHECK_MESSAGE(err != SCRIPT_ERR_OK, ScriptErrorString(err));
@@ -469,7 +469,7 @@ BOOST_AUTO_TEST_CASE(test_big_witness_transaction) {
     WithOrVersion(&ssout, 0) >> tx;
 
     // check all inputs concurrently, with the cache
-    CachedHashes cachedHashes(tx);
+    PrecomputedTransactionData txdata(tx);
     boost::thread_group threadGroup;
     CCheckQueue<CScriptCheck> scriptcheckqueue(128);
     CCheckQueueControl<CScriptCheck> control(&scriptcheckqueue);
@@ -489,7 +489,7 @@ BOOST_AUTO_TEST_CASE(test_big_witness_transaction) {
 
     for(uint32_t i = 0; i < mtx.vin.size(); i++) {
         std::vector<CScriptCheck> vChecks;
-        CScriptCheck check(coins, tx, i, SCRIPT_VERIFY_P2SH | SCRIPT_VERIFY_WITNESS, false, &cachedHashes);
+        CScriptCheck check(coins, tx, i, SCRIPT_VERIFY_P2SH | SCRIPT_VERIFY_WITNESS, false, &txdata);
         vChecks.push_back(CScriptCheck());
         check.swap(vChecks.back());
         control.Add(vChecks);

From 144ed76ea0b38b7c21b224501964f8a2c65c4bb6 Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Fri, 26 Aug 2016 21:07:05 +0200
Subject: [PATCH 0780/1802] Fix some locks

This makes sure that cs_filter is never held while taking cs_main
or CNode::cs_vSend.
---
 src/main.cpp | 36 +++++++++++++++++++++---------------
 1 file changed, 21 insertions(+), 15 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index 30edc5dbebaa9..8c4447a6d5d19 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -4781,10 +4781,16 @@ void static ProcessGetData(CNode* pfrom, const Consensus::Params& consensusParam
                         pfrom->PushMessage(NetMsgType::BLOCK, block);
                     else if (inv.type == MSG_FILTERED_BLOCK)
                     {
-                        LOCK(pfrom->cs_filter);
-                        if (pfrom->pfilter)
+                        bool send = false;
+                        CMerkleBlock merkleBlock;
                         {
-                            CMerkleBlock merkleBlock(block, *pfrom->pfilter);
+                            LOCK(pfrom->cs_filter);
+                            if (pfrom->pfilter) {
+                                send = true;
+                                merkleBlock = CMerkleBlock(block, *pfrom->pfilter);
+                            }
+                        }
+                        if (send) {
                             pfrom->PushMessage(NetMsgType::MERKLEBLOCK, merkleBlock);
                             // CMerkleBlock just contains hashes, so also push any transactions in the block the client did not see
                             // This avoids hurting performance by pointlessly requiring a round-trip
@@ -6052,8 +6058,6 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
         CBloomFilter filter;
         vRecv >> filter;
 
-        LOCK(pfrom->cs_filter);
-
         if (!filter.IsWithinSizeConstraints())
         {
             // There is no excuse for sending a too-large filter
@@ -6062,11 +6066,12 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
         }
         else
         {
+            LOCK(pfrom->cs_filter);
             delete pfrom->pfilter;
             pfrom->pfilter = new CBloomFilter(filter);
             pfrom->pfilter->UpdateEmptyFull();
+            pfrom->fRelayTxes = true;
         }
-        pfrom->fRelayTxes = true;
     }
 
 
@@ -6077,20 +6082,21 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
 
         // Nodes must NEVER send a data item > 520 bytes (the max size for a script data object,
         // and thus, the maximum size any matched object can have) in a filteradd message
-        if (vData.size() > MAX_SCRIPT_ELEMENT_SIZE)
-        {
-            LOCK(cs_main);
-            Misbehaving(pfrom->GetId(), 100);
+        bool bad = false;
+        if (vData.size() > MAX_SCRIPT_ELEMENT_SIZE) {
+            bad = true;
         } else {
             LOCK(pfrom->cs_filter);
-            if (pfrom->pfilter)
+            if (pfrom->pfilter) {
                 pfrom->pfilter->insert(vData);
-            else
-            {
-                LOCK(cs_main);
-                Misbehaving(pfrom->GetId(), 100);
+            } else {
+                bad = true;
             }
         }
+        if (bad) {
+            LOCK(cs_main);
+            Misbehaving(pfrom->GetId(), 100);
+        }
     }
 
 

From 887919c7b7120ab0ca12703ea1cdfc18a5085aa2 Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Fri, 26 Aug 2016 21:44:44 +0200
Subject: [PATCH 0781/1802] Check for compatibility with download in
 FindNextBlocksToDownload

---
 src/main.cpp | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index 30edc5dbebaa9..73d8f003afce7 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -532,7 +532,7 @@ CBlockIndex* LastCommonAncestor(CBlockIndex* pa, CBlockIndex* pb) {
 
 /** Update pindexLastCommonBlock and add not-in-flight missing successors to vBlocks, until it has
  *  at most count entries. */
-void FindNextBlocksToDownload(NodeId nodeid, unsigned int count, std::vector<CBlockIndex*>& vBlocks, NodeId& nodeStaller) {
+void FindNextBlocksToDownload(NodeId nodeid, unsigned int count, std::vector<CBlockIndex*>& vBlocks, NodeId& nodeStaller, const Consensus::Params& consensusParams) {
     if (count == 0)
         return;
 
@@ -589,6 +589,10 @@ void FindNextBlocksToDownload(NodeId nodeid, unsigned int count, std::vector<CBl
                 // We consider the chain that this peer is on invalid.
                 return;
             }
+            if (!State(nodeid)->fHaveWitness && IsWitnessEnabled(pindex->pprev, consensusParams)) {
+                // We wouldn't download this block or its descendants from this peer.
+                return;
+            }
             if (pindex->nStatus & BLOCK_HAVE_DATA || chainActive.Contains(pindex)) {
                 if (pindex->nChainTx)
                     state->pindexLastCommonBlock = pindex;
@@ -6713,15 +6717,13 @@ bool SendMessages(CNode* pto)
         if (!pto->fDisconnect && !pto->fClient && (fFetch || !IsInitialBlockDownload()) && state.nBlocksInFlight < MAX_BLOCKS_IN_TRANSIT_PER_PEER) {
             vector<CBlockIndex*> vToDownload;
             NodeId staller = -1;
-            FindNextBlocksToDownload(pto->GetId(), MAX_BLOCKS_IN_TRANSIT_PER_PEER - state.nBlocksInFlight, vToDownload, staller);
+            FindNextBlocksToDownload(pto->GetId(), MAX_BLOCKS_IN_TRANSIT_PER_PEER - state.nBlocksInFlight, vToDownload, staller, consensusParams);
             BOOST_FOREACH(CBlockIndex *pindex, vToDownload) {
-                if (State(pto->GetId())->fHaveWitness || !IsWitnessEnabled(pindex->pprev, consensusParams)) {
-                    uint32_t nFetchFlags = GetFetchFlags(pto, pindex->pprev, consensusParams);
-                    vGetData.push_back(CInv(MSG_BLOCK | nFetchFlags, pindex->GetBlockHash()));
-                    MarkBlockAsInFlight(pto->GetId(), pindex->GetBlockHash(), consensusParams, pindex);
-                    LogPrint("net", "Requesting block %s (%d) peer=%d\n", pindex->GetBlockHash().ToString(),
-                        pindex->nHeight, pto->id);
-                }
+                uint32_t nFetchFlags = GetFetchFlags(pto, pindex->pprev, consensusParams);
+                vGetData.push_back(CInv(MSG_BLOCK | nFetchFlags, pindex->GetBlockHash()));
+                MarkBlockAsInFlight(pto->GetId(), pindex->GetBlockHash(), consensusParams, pindex);
+                LogPrint("net", "Requesting block %s (%d) peer=%d\n", pindex->GetBlockHash().ToString(),
+                    pindex->nHeight, pto->id);
             }
             if (state.nBlocksInFlight == 0 && staller != -1) {
                 if (State(staller)->nStallingSince == 0) {

From 5127c4f21ca3f092b3a853833631dfc7f9c9456b Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Fri, 26 Aug 2016 23:05:09 +0200
Subject: [PATCH 0782/1802] Add preciousblock RPC

Includes a bugfix by Luke-Jr.
---
 src/chain.h            |  2 +-
 src/main.cpp           | 38 ++++++++++++++++++++++++++++++++++++--
 src/main.h             |  3 +++
 src/rpc/blockchain.cpp | 40 ++++++++++++++++++++++++++++++++++++++++
 4 files changed, 80 insertions(+), 3 deletions(-)

diff --git a/src/chain.h b/src/chain.h
index 76a774c1238f1..bf801c5cbec12 100644
--- a/src/chain.h
+++ b/src/chain.h
@@ -200,7 +200,7 @@ class CBlockIndex
     unsigned int nNonce;
 
     //! (memory only) Sequential id assigned to distinguish order in which blocks are received.
-    uint32_t nSequenceId;
+    int32_t nSequenceId;
 
     void SetNull()
     {
diff --git a/src/main.cpp b/src/main.cpp
index 30edc5dbebaa9..8456039c8ffd9 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -167,7 +167,11 @@ namespace {
      */
     CCriticalSection cs_nBlockSequenceId;
     /** Blocks loaded from disk are assigned id 0, so start the counter at 1. */
-    uint32_t nBlockSequenceId = 1;
+    int32_t nBlockSequenceId = 1;
+    /** Decreasing counter (used by subsequent preciousblock calls). */
+    int32_t nBlockReverseSequenceId = -1;
+    /** chainwork for the last block that preciousblock has been applied to. */
+    arith_uint256 nLastPreciousChainwork = 0;
 
     /**
      * Sources of received blocks, saved to be able to send them reject
@@ -3107,6 +3111,36 @@ bool ActivateBestChain(CValidationState &state, const CChainParams& chainparams,
     return true;
 }
 
+
+bool PreciousBlock(CValidationState& state, const CChainParams& params, CBlockIndex *pindex)
+{
+    {
+        LOCK(cs_main);
+        if (pindex->nChainWork < chainActive.Tip()->nChainWork) {
+            // Nothing to do, this block is not at the tip.
+            return true;
+        }
+        if (chainActive.Tip()->nChainWork > nLastPreciousChainwork) {
+            // The chain has been extended since the last call, reset the counter.
+            nBlockReverseSequenceId = -1;
+        }
+        nLastPreciousChainwork = chainActive.Tip()->nChainWork;
+        setBlockIndexCandidates.erase(pindex);
+        pindex->nSequenceId = nBlockReverseSequenceId;
+        if (nBlockReverseSequenceId > std::numeric_limits<int32_t>::min()) {
+            // We can't keep reducing the counter if somebody really wants to
+            // call preciousblock 2**31-1 times on the same set of tips...
+            nBlockReverseSequenceId--;
+        }
+        if (pindex->IsValid(BLOCK_VALID_TRANSACTIONS) && pindex->nChainTx) {
+            setBlockIndexCandidates.insert(pindex);
+            PruneBlockIndexCandidates();
+        }
+    }
+
+    return ActivateBestChain(state, params);
+}
+
 bool InvalidateBlock(CValidationState& state, const CChainParams& chainparams, CBlockIndex *pindex)
 {
     AssertLockHeld(cs_main);
@@ -4501,7 +4535,7 @@ void static CheckBlockIndex(const Consensus::Params& consensusParams)
             assert(pindex->GetBlockHash() == consensusParams.hashGenesisBlock); // Genesis block's hash must match.
             assert(pindex == chainActive.Genesis()); // The current active chain's genesis block must be this block.
         }
-        if (pindex->nChainTx == 0) assert(pindex->nSequenceId == 0);  // nSequenceId can't be set for blocks that aren't linked
+        if (pindex->nChainTx == 0) assert(pindex->nSequenceId <= 0);  // nSequenceId can't be set positive for blocks that aren't linked (negative is used for preciousblock)
         // VALID_TRANSACTIONS is equivalent to nTx > 0 for all nodes (whether or not pruning has occurred).
         // HAVE_DATA is only equivalent to nTx > 0 (or VALID_TRANSACTIONS) if no pruning has occurred.
         if (!fHavePruned) {
diff --git a/src/main.h b/src/main.h
index e9106fccf7927..f809f89812860 100644
--- a/src/main.h
+++ b/src/main.h
@@ -499,6 +499,9 @@ class CVerifyDB {
 /** Find the last common block between the parameter chain and a locator. */
 CBlockIndex* FindForkInGlobalIndex(const CChain& chain, const CBlockLocator& locator);
 
+/** Mark a block as precious and reorganize. */
+bool PreciousBlock(CValidationState& state, const CChainParams& params, CBlockIndex *pindex);
+
 /** Mark a block as invalid. */
 bool InvalidateBlock(CValidationState& state, const CChainParams& chainparams, CBlockIndex *pindex);
 
diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp
index e3c32d905af74..75f49e939bac8 100644
--- a/src/rpc/blockchain.cpp
+++ b/src/rpc/blockchain.cpp
@@ -1105,6 +1105,44 @@ UniValue getmempoolinfo(const UniValue& params, bool fHelp)
     return mempoolInfoToJSON();
 }
 
+UniValue preciousblock(const UniValue& params, bool fHelp)
+{
+    if (fHelp || params.size() != 1)
+        throw runtime_error(
+            "preciousblock \"hash\"\n"
+            "\nTreats a block as if it were received before others with the same work.\n"
+            "\nA later preciousblock call can override the effect of an earlier one.\n"
+            "\nThe effects of preciousblock are not retained across restarts.\n"
+            "\nArguments:\n"
+            "1. hash   (string, required) the hash of the block to mark as precious\n"
+            "\nResult:\n"
+            "\nExamples:\n"
+            + HelpExampleCli("preciousblock", "\"blockhash\"")
+            + HelpExampleRpc("preciousblock", "\"blockhash\"")
+        );
+
+    std::string strHash = params[0].get_str();
+    uint256 hash(uint256S(strHash));
+    CBlockIndex* pblockindex;
+
+    {
+        LOCK(cs_main);
+        if (mapBlockIndex.count(hash) == 0)
+            throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Block not found");
+
+        pblockindex = mapBlockIndex[hash];
+    }
+
+    CValidationState state;
+    PreciousBlock(state, Params(), pblockindex);
+
+    if (!state.IsValid()) {
+        throw JSONRPCError(RPC_DATABASE_ERROR, state.GetRejectReason());
+    }
+
+    return NullUniValue;
+}
+
 UniValue invalidateblock(const UniValue& params, bool fHelp)
 {
     if (fHelp || params.size() != 1)
@@ -1200,6 +1238,8 @@ static const CRPCCommand commands[] =
     { "blockchain",         "gettxoutsetinfo",        &gettxoutsetinfo,        true  },
     { "blockchain",         "verifychain",            &verifychain,            true  },
 
+    { "blockchain",         "preciousblock",          &preciousblock,          true  },
+
     /* Not shown in help */
     { "hidden",             "invalidateblock",        &invalidateblock,        true  },
     { "hidden",             "reconsiderblock",        &reconsiderblock,        true  },

From 5805ac836c5847bc54cbef3e71154d022ca18eda Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Fri, 26 Aug 2016 23:05:26 +0200
Subject: [PATCH 0783/1802] Add preciousblock tests

Rebased, improved and extended by Luke-Jr.
---
 qa/pull-tester/rpc-tests.py         |   1 +
 qa/rpc-tests/preciousblock.py       | 116 ++++++++++++++++++++++++++++
 qa/rpc-tests/test_framework/util.py |  10 +++
 3 files changed, 127 insertions(+)
 create mode 100755 qa/rpc-tests/preciousblock.py

diff --git a/qa/pull-tester/rpc-tests.py b/qa/pull-tester/rpc-tests.py
index 92cce6aadde0b..bd5c5f8e1892e 100755
--- a/qa/pull-tester/rpc-tests.py
+++ b/qa/pull-tester/rpc-tests.py
@@ -140,6 +140,7 @@
     'invalidtxrequest.py',
     'abandonconflict.py',
     'p2p-versionbits-warning.py',
+    'preciousblock.py',
     'importprunedfunds.py',
     'signmessages.py',
     'p2p-compactblocks.py',
diff --git a/qa/rpc-tests/preciousblock.py b/qa/rpc-tests/preciousblock.py
new file mode 100755
index 0000000000000..854dcc7251d1d
--- /dev/null
+++ b/qa/rpc-tests/preciousblock.py
@@ -0,0 +1,116 @@
+#!/usr/bin/env python3
+# Copyright (c) 2015 The Bitcoin Core developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#
+# Test PreciousBlock code
+#
+
+from test_framework.test_framework import BitcoinTestFramework
+from test_framework.util import *
+
+def unidirectional_node_sync_via_rpc(node_src, node_dest):
+    blocks_to_copy = []
+    blockhash = node_src.getbestblockhash()
+    while True:
+        try:
+            assert(len(node_dest.getblock(blockhash, False)) > 0)
+            break
+        except:
+            blocks_to_copy.append(blockhash)
+            blockhash = node_src.getblockheader(blockhash, True)['previousblockhash']
+    blocks_to_copy.reverse()
+    for blockhash in blocks_to_copy:
+        blockdata = node_src.getblock(blockhash, False)
+        assert(node_dest.submitblock(blockdata) in (None, 'inconclusive'))
+
+def node_sync_via_rpc(nodes):
+    for node_src in nodes:
+        for node_dest in nodes:
+            if node_src is node_dest:
+                continue
+            unidirectional_node_sync_via_rpc(node_src, node_dest)
+
+class PreciousTest(BitcoinTestFramework):
+    def setup_chain(self):
+        print("Initializing test directory "+self.options.tmpdir)
+        initialize_chain_clean(self.options.tmpdir, 3)
+
+    def setup_network(self):
+        self.nodes = []
+        self.is_network_split = False
+        self.nodes.append(start_node(0, self.options.tmpdir, ["-debug"]))
+        self.nodes.append(start_node(1, self.options.tmpdir, ["-debug"]))
+        self.nodes.append(start_node(2, self.options.tmpdir, ["-debug"]))
+
+    def run_test(self):
+        print("Ensure submitblock can in principle reorg to a competing chain")
+        self.nodes[0].generate(1)
+        assert(self.nodes[0].getblockcount() == 1)
+        (hashY, hashZ) = self.nodes[1].generate(2)
+        assert(self.nodes[1].getblockcount() == 2)
+        node_sync_via_rpc(self.nodes[0:3])
+        assert(self.nodes[0].getbestblockhash() == hashZ)
+
+        print("Mine blocks A-B-C on Node 0")
+        (hashA, hashB, hashC) = self.nodes[0].generate(3)
+        assert(self.nodes[0].getblockcount() == 5)
+        print("Mine competing blocks E-F-G on Node 1")
+        (hashE, hashF, hashG) = self.nodes[1].generate(3)
+        assert(self.nodes[1].getblockcount() == 5)
+        assert(hashC != hashG)
+        print("Connect nodes and check no reorg occurs")
+        # Submit competing blocks via RPC so any reorg should occur before we proceed (no way to wait on inaction for p2p sync)
+        node_sync_via_rpc(self.nodes[0:2])
+        connect_nodes_bi(self.nodes,0,1)
+        assert(self.nodes[0].getbestblockhash() == hashC)
+        assert(self.nodes[1].getbestblockhash() == hashG)
+        print("Make Node0 prefer block G")
+        self.nodes[0].preciousblock(hashG)
+        assert(self.nodes[0].getbestblockhash() == hashG)
+        print("Make Node0 prefer block C again")
+        self.nodes[0].preciousblock(hashC)
+        assert(self.nodes[0].getbestblockhash() == hashC)
+        print("Make Node1 prefer block C")
+        self.nodes[1].preciousblock(hashC)
+        sync_chain(self.nodes[0:2]) # wait because node 1 may not have downloaded hashC
+        assert(self.nodes[1].getbestblockhash() == hashC)
+        print("Make Node1 prefer block G again")
+        self.nodes[1].preciousblock(hashG)
+        assert(self.nodes[1].getbestblockhash() == hashG)
+        print("Make Node0 prefer block G again")
+        self.nodes[0].preciousblock(hashG)
+        assert(self.nodes[0].getbestblockhash() == hashG)
+        print("Make Node1 prefer block C again")
+        self.nodes[1].preciousblock(hashC)
+        assert(self.nodes[1].getbestblockhash() == hashC)
+        print("Mine another block (E-F-G-)H on Node 0 and reorg Node 1")
+        self.nodes[0].generate(1)
+        assert(self.nodes[0].getblockcount() == 6)
+        sync_blocks(self.nodes[0:2])
+        hashH = self.nodes[0].getbestblockhash()
+        assert(self.nodes[1].getbestblockhash() == hashH)
+        print("Node1 should not be able to prefer block C anymore")
+        self.nodes[1].preciousblock(hashC)
+        assert(self.nodes[1].getbestblockhash() == hashH)
+        print("Mine competing blocks I-J-K-L on Node 2")
+        self.nodes[2].generate(4)
+        assert(self.nodes[2].getblockcount() == 6)
+        hashL = self.nodes[2].getbestblockhash()
+        print("Connect nodes and check no reorg occurs")
+        node_sync_via_rpc(self.nodes[0:3])
+        connect_nodes_bi(self.nodes,1,2)
+        connect_nodes_bi(self.nodes,0,2)
+        assert(self.nodes[0].getbestblockhash() == hashH)
+        assert(self.nodes[1].getbestblockhash() == hashH)
+        assert(self.nodes[2].getbestblockhash() == hashL)
+        print("Make Node1 prefer block L")
+        self.nodes[1].preciousblock(hashL)
+        assert(self.nodes[1].getbestblockhash() == hashL)
+        print("Make Node2 prefer block H")
+        self.nodes[2].preciousblock(hashH)
+        assert(self.nodes[2].getbestblockhash() == hashH)
+
+if __name__ == '__main__':
+    PreciousTest().main()
diff --git a/qa/rpc-tests/test_framework/util.py b/qa/rpc-tests/test_framework/util.py
index 190fa7f661a6d..bc0b801ff49a4 100644
--- a/qa/rpc-tests/test_framework/util.py
+++ b/qa/rpc-tests/test_framework/util.py
@@ -133,6 +133,16 @@ def sync_blocks(rpc_connections, wait=1, timeout=60):
         timeout -= wait
     raise AssertionError("Block sync failed")
 
+def sync_chain(rpc_connections, wait=1):
+    """
+    Wait until everybody has the same best block
+    """
+    while True:
+        counts = [ x.getbestblockhash() for x in rpc_connections ]
+        if counts == [ counts[0] ]*len(counts):
+            break
+        time.sleep(wait)
+
 def sync_mempools(rpc_connections, wait=1, timeout=60):
     """
     Wait until everybody has the same transactions in their memory

From d2cd9c033b603cb25dc4516f3511afa52dfb1ce0 Mon Sep 17 00:00:00 2001
From: nomnombtc <mastergizmo@arcor.de>
Date: Sat, 27 Aug 2016 00:59:07 +0200
Subject: [PATCH 0784/1802] add script to generate manpages with help2man

---
 contrib/devtools/gen-manpages.sh | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100755 contrib/devtools/gen-manpages.sh

diff --git a/contrib/devtools/gen-manpages.sh b/contrib/devtools/gen-manpages.sh
new file mode 100755
index 0000000000000..7cd7d1b50997a
--- /dev/null
+++ b/contrib/devtools/gen-manpages.sh
@@ -0,0 +1,18 @@
+#!/bin/sh
+
+# the autodetected version git tag at the end 
+# can screw up manpage output a little bit
+BTCVER=$(bitcoin-cli --version | cut -d"-" -f1 | cut -d"v" -f3)
+
+# Create a footer file with copyright content.
+# This gets autodetected fine for bitcoind if
+# --version-string is not set, but has different
+# outcomes for bitcoin-qt and bitcoin-cli.
+echo "[COPYRIGHT]" > footer.h2m
+bitcoind --version | sed -n '1!p' >> footer.h2m
+
+for cmd in bitcoind bitcoin-qt bitcoin-cli; do
+  help2man -N --version-string=${BTCVER} --include=footer.h2m -o ../../doc/man/${cmd}.1 ${cmd}
+done
+
+rm -f footer.h2m

From 6edf2fdb85047be2d3236a2ced4c89116aa243bc Mon Sep 17 00:00:00 2001
From: nomnombtc <mastergizmo@arcor.de>
Date: Sat, 27 Aug 2016 00:59:45 +0200
Subject: [PATCH 0785/1802] add gen-manpages.sh description to README.md

---
 contrib/devtools/README.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/contrib/devtools/README.md b/contrib/devtools/README.md
index af5c000b0305e..60fe69e7e39e8 100644
--- a/contrib/devtools/README.md
+++ b/contrib/devtools/README.md
@@ -40,6 +40,12 @@ would be changed to:
 
 ```// Copyright (c) 2009-2015 The Bitcoin Core developers```
 
+gen-manpages.sh
+===============
+
+A small script to automatically create manpages in ../../doc/man by running the release binaries with the -help option.
+This requires help2man which can be found at: https://www.gnu.org/software/help2man/
+
 git-subtree-check.sh
 ====================
 

From eb5643b7c709a86329666f0671dd899ace1012b3 Mon Sep 17 00:00:00 2001
From: nomnombtc <mastergizmo@arcor.de>
Date: Sat, 27 Aug 2016 01:03:06 +0200
Subject: [PATCH 0786/1802] add autogenerated manpages by help2man

---
 doc/man/bitcoin-cli.1 |  84 +++++++
 doc/man/bitcoin-qt.1  | 513 ++++++++++++++++++++++++++++++++++++++++++
 doc/man/bitcoind.1    | 492 ++++++++++++++++++++++++++++++++++++++++
 3 files changed, 1089 insertions(+)
 create mode 100644 doc/man/bitcoin-cli.1
 create mode 100644 doc/man/bitcoin-qt.1
 create mode 100644 doc/man/bitcoind.1

diff --git a/doc/man/bitcoin-cli.1 b/doc/man/bitcoin-cli.1
new file mode 100644
index 0000000000000..f15594080a074
--- /dev/null
+++ b/doc/man/bitcoin-cli.1
@@ -0,0 +1,84 @@
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.46.5.
+.TH BITCOIN-CLI "1" "August 2016" "bitcoin-cli 0.13.0.0" "User Commands"
+.SH NAME
+bitcoin-cli \- manual page for bitcoin-cli 0.13.0.0
+.SH DESCRIPTION
+Bitcoin Core RPC client version v0.13.0.0\-ga402396
+.SS "Usage:"
+.TP
+bitcoin\-cli [options] <command> [params]
+Send command to Bitcoin Core
+.TP
+bitcoin\-cli [options] help
+List commands
+.TP
+bitcoin\-cli [options] help <command>
+Get help for a command
+.SH OPTIONS
+.HP
+\-?
+.IP
+This help message
+.HP
+\fB\-conf=\fR<file>
+.IP
+Specify configuration file (default: bitcoin.conf)
+.HP
+\fB\-datadir=\fR<dir>
+.IP
+Specify data directory
+.PP
+Chain selection options:
+.HP
+\fB\-testnet\fR
+.IP
+Use the test chain
+.HP
+\fB\-regtest\fR
+.IP
+Enter regression test mode, which uses a special chain in which blocks
+can be solved instantly. This is intended for regression testing
+tools and app development.
+.HP
+\fB\-rpcconnect=\fR<ip>
+.IP
+Send commands to node running on <ip> (default: 127.0.0.1)
+.HP
+\fB\-rpcport=\fR<port>
+.IP
+Connect to JSON\-RPC on <port> (default: 8332 or testnet: 18332)
+.HP
+\fB\-rpcwait\fR
+.IP
+Wait for RPC server to start
+.HP
+\fB\-rpcuser=\fR<user>
+.IP
+Username for JSON\-RPC connections
+.HP
+\fB\-rpcpassword=\fR<pw>
+.IP
+Password for JSON\-RPC connections
+.HP
+\fB\-rpcclienttimeout=\fR<n>
+.IP
+Timeout during HTTP requests (default: 900)
+.HP
+\fB\-stdin\fR
+.IP
+Read extra arguments from standard input, one per line until EOF/Ctrl\-D
+(recommended for sensitive information such as passphrases)
+.SH COPYRIGHT
+Copyright (C) 2009-2016 The Bitcoin Core developers
+
+Please contribute if you find Bitcoin Core useful. Visit
+<https://bitcoincore.org> for further information about the software.
+The source code is available from <https://github.com/bitcoin/bitcoin>.
+
+This is experimental software.
+Distributed under the MIT software license, see the accompanying file COPYING
+or <http://www.opensource.org/licenses/mit-license.php>.
+
+This product includes software developed by the OpenSSL Project for use in the
+OpenSSL Toolkit <https://www.openssl.org/> and cryptographic software written
+by Eric Young and UPnP software written by Thomas Bernard.
diff --git a/doc/man/bitcoin-qt.1 b/doc/man/bitcoin-qt.1
new file mode 100644
index 0000000000000..b57e6819d93b1
--- /dev/null
+++ b/doc/man/bitcoin-qt.1
@@ -0,0 +1,513 @@
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.46.5.
+.TH BITCOIN-QT "1" "August 2016" "bitcoin-qt 0.13.0.0" "User Commands"
+.SH NAME
+bitcoin-qt \- manual page for bitcoin-qt 0.13.0.0
+.SH DESCRIPTION
+Bitcoin Core version v0.13.0.0\-ga402396 (64\-bit)
+Usage:
+.IP
+bitcoin\-qt [command\-line options]
+.SH OPTIONS
+.HP
+\-?
+.IP
+Print this help message and exit
+.HP
+\fB\-version\fR
+.IP
+Print version and exit
+.HP
+\fB\-alertnotify=\fR<cmd>
+.IP
+Execute command when a relevant alert is received or we see a really
+long fork (%s in cmd is replaced by message)
+.HP
+\fB\-blocknotify=\fR<cmd>
+.IP
+Execute command when the best block changes (%s in cmd is replaced by
+block hash)
+.HP
+\fB\-checkblocks=\fR<n>
+.IP
+How many blocks to check at startup (default: 288, 0 = all)
+.HP
+\fB\-checklevel=\fR<n>
+.IP
+How thorough the block verification of \fB\-checkblocks\fR is (0\-4, default: 3)
+.HP
+\fB\-conf=\fR<file>
+.IP
+Specify configuration file (default: bitcoin.conf)
+.HP
+\fB\-datadir=\fR<dir>
+.IP
+Specify data directory
+.HP
+\fB\-dbcache=\fR<n>
+.IP
+Set database cache size in megabytes (4 to 16384, default: 300)
+.HP
+\fB\-loadblock=\fR<file>
+.IP
+Imports blocks from external blk000??.dat file on startup
+.HP
+\fB\-maxorphantx=\fR<n>
+.IP
+Keep at most <n> unconnectable transactions in memory (default: 100)
+.HP
+\fB\-maxmempool=\fR<n>
+.IP
+Keep the transaction memory pool below <n> megabytes (default: 300)
+.HP
+\fB\-mempoolexpiry=\fR<n>
+.IP
+Do not keep transactions in the mempool longer than <n> hours (default:
+72)
+.HP
+\fB\-par=\fR<n>
+.IP
+Set the number of script verification threads (\fB\-4\fR to 16, 0 = auto, <0 =
+leave that many cores free, default: 0)
+.HP
+\fB\-pid=\fR<file>
+.IP
+Specify pid file (default: bitcoind.pid)
+.HP
+\fB\-prune=\fR<n>
+.IP
+Reduce storage requirements by pruning (deleting) old blocks. This mode
+is incompatible with \fB\-txindex\fR and \fB\-rescan\fR. Warning: Reverting
+this setting requires re\-downloading the entire blockchain.
+(default: 0 = disable pruning blocks, >550 = target size in MiB
+to use for block files)
+.HP
+\fB\-reindex\-chainstate\fR
+.IP
+Rebuild chain state from the currently indexed blocks
+.HP
+\fB\-reindex\fR
+.IP
+Rebuild chain state and block index from the blk*.dat files on disk
+.HP
+\fB\-sysperms\fR
+.IP
+Create new files with system default permissions, instead of umask 077
+(only effective with disabled wallet functionality)
+.HP
+\fB\-txindex\fR
+.IP
+Maintain a full transaction index, used by the getrawtransaction rpc
+call (default: 0)
+.PP
+Connection options:
+.HP
+\fB\-addnode=\fR<ip>
+.IP
+Add a node to connect to and attempt to keep the connection open
+.HP
+\fB\-banscore=\fR<n>
+.IP
+Threshold for disconnecting misbehaving peers (default: 100)
+.HP
+\fB\-bantime=\fR<n>
+.IP
+Number of seconds to keep misbehaving peers from reconnecting (default:
+86400)
+.HP
+\fB\-bind=\fR<addr>
+.IP
+Bind to given address and always listen on it. Use [host]:port notation
+for IPv6
+.HP
+\fB\-connect=\fR<ip>
+.IP
+Connect only to the specified node(s)
+.HP
+\fB\-discover\fR
+.IP
+Discover own IP addresses (default: 1 when listening and no \fB\-externalip\fR
+or \fB\-proxy\fR)
+.HP
+\fB\-dns\fR
+.IP
+Allow DNS lookups for \fB\-addnode\fR, \fB\-seednode\fR and \fB\-connect\fR (default: 1)
+.HP
+\fB\-dnsseed\fR
+.IP
+Query for peer addresses via DNS lookup, if low on addresses (default: 1
+unless \fB\-connect\fR)
+.HP
+\fB\-externalip=\fR<ip>
+.IP
+Specify your own public address
+.HP
+\fB\-forcednsseed\fR
+.IP
+Always query for peer addresses via DNS lookup (default: 0)
+.HP
+\fB\-listen\fR
+.IP
+Accept connections from outside (default: 1 if no \fB\-proxy\fR or \fB\-connect\fR)
+.HP
+\fB\-listenonion\fR
+.IP
+Automatically create Tor hidden service (default: 1)
+.HP
+\fB\-maxconnections=\fR<n>
+.IP
+Maintain at most <n> connections to peers (default: 125)
+.HP
+\fB\-maxreceivebuffer=\fR<n>
+.IP
+Maximum per\-connection receive buffer, <n>*1000 bytes (default: 5000)
+.HP
+\fB\-maxsendbuffer=\fR<n>
+.IP
+Maximum per\-connection send buffer, <n>*1000 bytes (default: 1000)
+.HP
+\fB\-maxtimeadjustment\fR
+.IP
+Maximum allowed median peer time offset adjustment. Local perspective of
+time may be influenced by peers forward or backward by this
+amount. (default: 4200 seconds)
+.HP
+\fB\-onion=\fR<ip:port>
+.IP
+Use separate SOCKS5 proxy to reach peers via Tor hidden services
+(default: \fB\-proxy\fR)
+.HP
+\fB\-onlynet=\fR<net>
+.IP
+Only connect to nodes in network <net> (ipv4, ipv6 or onion)
+.HP
+\fB\-permitbaremultisig\fR
+.IP
+Relay non\-P2SH multisig (default: 1)
+.HP
+\fB\-peerbloomfilters\fR
+.IP
+Support filtering of blocks and transaction with bloom filters (default:
+1)
+.HP
+\fB\-port=\fR<port>
+.IP
+Listen for connections on <port> (default: 8333 or testnet: 18333)
+.HP
+\fB\-proxy=\fR<ip:port>
+.IP
+Connect through SOCKS5 proxy
+.HP
+\fB\-proxyrandomize\fR
+.IP
+Randomize credentials for every proxy connection. This enables Tor
+stream isolation (default: 1)
+.HP
+\fB\-seednode=\fR<ip>
+.IP
+Connect to a node to retrieve peer addresses, and disconnect
+.HP
+\fB\-timeout=\fR<n>
+.IP
+Specify connection timeout in milliseconds (minimum: 1, default: 5000)
+.HP
+\fB\-torcontrol=\fR<ip>:<port>
+.IP
+Tor control port to use if onion listening enabled (default:
+127.0.0.1:9051)
+.HP
+\fB\-torpassword=\fR<pass>
+.IP
+Tor control port password (default: empty)
+.HP
+\fB\-whitebind=\fR<addr>
+.IP
+Bind to given address and whitelist peers connecting to it. Use
+[host]:port notation for IPv6
+.HP
+\fB\-whitelist=\fR<netmask>
+.IP
+Whitelist peers connecting from the given netmask or IP address. Can be
+specified multiple times. Whitelisted peers cannot be DoS banned
+and their transactions are always relayed, even if they are
+already in the mempool, useful e.g. for a gateway
+.HP
+\fB\-whitelistrelay\fR
+.IP
+Accept relayed transactions received from whitelisted peers even when
+not relaying transactions (default: 1)
+.HP
+\fB\-whitelistforcerelay\fR
+.IP
+Force relay of transactions from whitelisted peers even they violate
+local relay policy (default: 1)
+.HP
+\fB\-maxuploadtarget=\fR<n>
+.IP
+Tries to keep outbound traffic under the given target (in MiB per 24h),
+0 = no limit (default: 0)
+.PP
+Wallet options:
+.HP
+\fB\-disablewallet\fR
+.IP
+Do not load the wallet and disable wallet RPC calls
+.HP
+\fB\-keypool=\fR<n>
+.IP
+Set key pool size to <n> (default: 100)
+.HP
+\fB\-fallbackfee=\fR<amt>
+.IP
+A fee rate (in BTC/kB) that will be used when fee estimation has
+insufficient data (default: 0.0002)
+.HP
+\fB\-mintxfee=\fR<amt>
+.IP
+Fees (in BTC/kB) smaller than this are considered zero fee for
+transaction creation (default: 0.00001)
+.HP
+\fB\-paytxfee=\fR<amt>
+.IP
+Fee (in BTC/kB) to add to transactions you send (default: 0.00)
+.HP
+\fB\-rescan\fR
+.IP
+Rescan the block chain for missing wallet transactions on startup
+.HP
+\fB\-salvagewallet\fR
+.IP
+Attempt to recover private keys from a corrupt wallet on startup
+.HP
+\fB\-spendzeroconfchange\fR
+.IP
+Spend unconfirmed change when sending transactions (default: 1)
+.HP
+\fB\-txconfirmtarget=\fR<n>
+.IP
+If paytxfee is not set, include enough fee so transactions begin
+confirmation on average within n blocks (default: 2)
+.HP
+\fB\-usehd\fR
+.IP
+Use hierarchical deterministic key generation (HD) after BIP32. Only has
+effect during wallet creation/first start (default: 1)
+.HP
+\fB\-upgradewallet\fR
+.IP
+Upgrade wallet to latest format on startup
+.HP
+\fB\-wallet=\fR<file>
+.IP
+Specify wallet file (within data directory) (default: wallet.dat)
+.HP
+\fB\-walletbroadcast\fR
+.IP
+Make the wallet broadcast transactions (default: 1)
+.HP
+\fB\-walletnotify=\fR<cmd>
+.IP
+Execute command when a wallet transaction changes (%s in cmd is replaced
+by TxID)
+.HP
+\fB\-zapwallettxes=\fR<mode>
+.IP
+Delete all wallet transactions and only recover those parts of the
+blockchain through \fB\-rescan\fR on startup (1 = keep tx meta data e.g.
+account owner and payment request information, 2 = drop tx meta
+data)
+.PP
+ZeroMQ notification options:
+.HP
+\fB\-zmqpubhashblock=\fR<address>
+.IP
+Enable publish hash block in <address>
+.HP
+\fB\-zmqpubhashtx=\fR<address>
+.IP
+Enable publish hash transaction in <address>
+.HP
+\fB\-zmqpubrawblock=\fR<address>
+.IP
+Enable publish raw block in <address>
+.HP
+\fB\-zmqpubrawtx=\fR<address>
+.IP
+Enable publish raw transaction in <address>
+.PP
+Debugging/Testing options:
+.HP
+\fB\-uacomment=\fR<cmt>
+.IP
+Append comment to the user agent string
+.HP
+\fB\-debug=\fR<category>
+.IP
+Output debugging information (default: 0, supplying <category> is
+optional). If <category> is not supplied or if <category> = 1,
+output all debugging information.<category> can be: addrman,
+alert, bench, coindb, db, http, libevent, lock, mempool,
+mempoolrej, net, proxy, prune, rand, reindex, rpc, selectcoins,
+tor, zmq, qt.
+.HP
+\fB\-help\-debug\fR
+.IP
+Show all debugging options (usage: \fB\-\-help\fR \fB\-help\-debug\fR)
+.HP
+\fB\-logips\fR
+.IP
+Include IP addresses in debug output (default: 0)
+.HP
+\fB\-logtimestamps\fR
+.IP
+Prepend debug output with timestamp (default: 1)
+.HP
+\fB\-minrelaytxfee=\fR<amt>
+.IP
+Fees (in BTC/kB) smaller than this are considered zero fee for relaying,
+mining and transaction creation (default: 0.00001)
+.HP
+\fB\-maxtxfee=\fR<amt>
+.IP
+Maximum total fees (in BTC) to use in a single wallet transaction or raw
+transaction; setting this too low may abort large transactions
+(default: 0.10)
+.HP
+\fB\-printtoconsole\fR
+.IP
+Send trace/debug info to console instead of debug.log file
+.HP
+\fB\-shrinkdebugfile\fR
+.IP
+Shrink debug.log file on client startup (default: 1 when no \fB\-debug\fR)
+.PP
+Chain selection options:
+.HP
+\fB\-testnet\fR
+.IP
+Use the test chain
+.PP
+Node relay options:
+.HP
+\fB\-bytespersigop\fR
+.IP
+Equivalent bytes per sigop in transactions for relay and mining
+(default: 20)
+.HP
+\fB\-datacarrier\fR
+.IP
+Relay and mine data carrier transactions (default: 1)
+.HP
+\fB\-datacarriersize\fR
+.IP
+Maximum size of data in data carrier transactions we relay and mine
+(default: 83)
+.HP
+\fB\-mempoolreplacement\fR
+.IP
+Enable transaction replacement in the memory pool (default: 1)
+.PP
+Block creation options:
+.HP
+\fB\-blockmaxweight=\fR<n>
+.IP
+Set maximum BIP141 block weight (default: 3000000)
+.HP
+\fB\-blockmaxsize=\fR<n>
+.IP
+Set maximum block size in bytes (default: 750000)
+.HP
+\fB\-blockprioritysize=\fR<n>
+.IP
+Set maximum size of high\-priority/low\-fee transactions in bytes
+(default: 0)
+.PP
+RPC server options:
+.HP
+\fB\-server\fR
+.IP
+Accept command line and JSON\-RPC commands
+.HP
+\fB\-rest\fR
+.IP
+Accept public REST requests (default: 0)
+.HP
+\fB\-rpcbind=\fR<addr>
+.IP
+Bind to given address to listen for JSON\-RPC connections. Use
+[host]:port notation for IPv6. This option can be specified
+multiple times (default: bind to all interfaces)
+.HP
+\fB\-rpccookiefile=\fR<loc>
+.IP
+Location of the auth cookie (default: data dir)
+.HP
+\fB\-rpcuser=\fR<user>
+.IP
+Username for JSON\-RPC connections
+.HP
+\fB\-rpcpassword=\fR<pw>
+.IP
+Password for JSON\-RPC connections
+.HP
+\fB\-rpcauth=\fR<userpw>
+.IP
+Username and hashed password for JSON\-RPC connections. The field
+<userpw> comes in the format: <USERNAME>:<SALT>$<HASH>. A
+canonical python script is included in share/rpcuser. This option
+can be specified multiple times
+.HP
+\fB\-rpcport=\fR<port>
+.IP
+Listen for JSON\-RPC connections on <port> (default: 8332 or testnet:
+18332)
+.HP
+\fB\-rpcallowip=\fR<ip>
+.IP
+Allow JSON\-RPC connections from specified source. Valid for <ip> are a
+single IP (e.g. 1.2.3.4), a network/netmask (e.g.
+1.2.3.4/255.255.255.0) or a network/CIDR (e.g. 1.2.3.4/24). This
+option can be specified multiple times
+.HP
+\fB\-rpcthreads=\fR<n>
+.IP
+Set the number of threads to service RPC calls (default: 4)
+.PP
+UI Options:
+.HP
+\fB\-choosedatadir\fR
+.IP
+Choose data directory on startup (default: 0)
+.HP
+\fB\-lang=\fR<lang>
+.IP
+Set language, for example "de_DE" (default: system locale)
+.HP
+\fB\-min\fR
+.IP
+Start minimized
+.HP
+\fB\-rootcertificates=\fR<file>
+.IP
+Set SSL root certificates for payment request (default: \fB\-system\-\fR)
+.HP
+\fB\-splash\fR
+.IP
+Show splash screen on startup (default: 1)
+.HP
+\fB\-resetguisettings\fR
+.IP
+Reset all settings changed in the GUI
+.SH COPYRIGHT
+Copyright (C) 2009-2016 The Bitcoin Core developers
+
+Please contribute if you find Bitcoin Core useful. Visit
+<https://bitcoincore.org> for further information about the software.
+The source code is available from <https://github.com/bitcoin/bitcoin>.
+
+This is experimental software.
+Distributed under the MIT software license, see the accompanying file COPYING
+or <http://www.opensource.org/licenses/mit-license.php>.
+
+This product includes software developed by the OpenSSL Project for use in the
+OpenSSL Toolkit <https://www.openssl.org/> and cryptographic software written
+by Eric Young and UPnP software written by Thomas Bernard.
diff --git a/doc/man/bitcoind.1 b/doc/man/bitcoind.1
new file mode 100644
index 0000000000000..c3c55add0ce85
--- /dev/null
+++ b/doc/man/bitcoind.1
@@ -0,0 +1,492 @@
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.46.5.
+.TH BITCOIND "1" "August 2016" "bitcoind 0.13.0.0" "User Commands"
+.SH NAME
+bitcoind \- manual page for bitcoind 0.13.0.0
+.SH DESCRIPTION
+Bitcoin Core Daemon version v0.13.0.0\-ga402396
+.SS "Usage:"
+.TP
+bitcoind [options]
+Start Bitcoin Core Daemon
+.SH OPTIONS
+.HP
+\-?
+.IP
+Print this help message and exit
+.HP
+\fB\-version\fR
+.IP
+Print version and exit
+.HP
+\fB\-alertnotify=\fR<cmd>
+.IP
+Execute command when a relevant alert is received or we see a really
+long fork (%s in cmd is replaced by message)
+.HP
+\fB\-blocknotify=\fR<cmd>
+.IP
+Execute command when the best block changes (%s in cmd is replaced by
+block hash)
+.HP
+\fB\-checkblocks=\fR<n>
+.IP
+How many blocks to check at startup (default: 288, 0 = all)
+.HP
+\fB\-checklevel=\fR<n>
+.IP
+How thorough the block verification of \fB\-checkblocks\fR is (0\-4, default: 3)
+.HP
+\fB\-conf=\fR<file>
+.IP
+Specify configuration file (default: bitcoin.conf)
+.HP
+\fB\-daemon\fR
+.IP
+Run in the background as a daemon and accept commands
+.HP
+\fB\-datadir=\fR<dir>
+.IP
+Specify data directory
+.HP
+\fB\-dbcache=\fR<n>
+.IP
+Set database cache size in megabytes (4 to 16384, default: 300)
+.HP
+\fB\-loadblock=\fR<file>
+.IP
+Imports blocks from external blk000??.dat file on startup
+.HP
+\fB\-maxorphantx=\fR<n>
+.IP
+Keep at most <n> unconnectable transactions in memory (default: 100)
+.HP
+\fB\-maxmempool=\fR<n>
+.IP
+Keep the transaction memory pool below <n> megabytes (default: 300)
+.HP
+\fB\-mempoolexpiry=\fR<n>
+.IP
+Do not keep transactions in the mempool longer than <n> hours (default:
+72)
+.HP
+\fB\-par=\fR<n>
+.IP
+Set the number of script verification threads (\fB\-4\fR to 16, 0 = auto, <0 =
+leave that many cores free, default: 0)
+.HP
+\fB\-pid=\fR<file>
+.IP
+Specify pid file (default: bitcoind.pid)
+.HP
+\fB\-prune=\fR<n>
+.IP
+Reduce storage requirements by pruning (deleting) old blocks. This mode
+is incompatible with \fB\-txindex\fR and \fB\-rescan\fR. Warning: Reverting
+this setting requires re\-downloading the entire blockchain.
+(default: 0 = disable pruning blocks, >550 = target size in MiB
+to use for block files)
+.HP
+\fB\-reindex\-chainstate\fR
+.IP
+Rebuild chain state from the currently indexed blocks
+.HP
+\fB\-reindex\fR
+.IP
+Rebuild chain state and block index from the blk*.dat files on disk
+.HP
+\fB\-sysperms\fR
+.IP
+Create new files with system default permissions, instead of umask 077
+(only effective with disabled wallet functionality)
+.HP
+\fB\-txindex\fR
+.IP
+Maintain a full transaction index, used by the getrawtransaction rpc
+call (default: 0)
+.PP
+Connection options:
+.HP
+\fB\-addnode=\fR<ip>
+.IP
+Add a node to connect to and attempt to keep the connection open
+.HP
+\fB\-banscore=\fR<n>
+.IP
+Threshold for disconnecting misbehaving peers (default: 100)
+.HP
+\fB\-bantime=\fR<n>
+.IP
+Number of seconds to keep misbehaving peers from reconnecting (default:
+86400)
+.HP
+\fB\-bind=\fR<addr>
+.IP
+Bind to given address and always listen on it. Use [host]:port notation
+for IPv6
+.HP
+\fB\-connect=\fR<ip>
+.IP
+Connect only to the specified node(s)
+.HP
+\fB\-discover\fR
+.IP
+Discover own IP addresses (default: 1 when listening and no \fB\-externalip\fR
+or \fB\-proxy\fR)
+.HP
+\fB\-dns\fR
+.IP
+Allow DNS lookups for \fB\-addnode\fR, \fB\-seednode\fR and \fB\-connect\fR (default: 1)
+.HP
+\fB\-dnsseed\fR
+.IP
+Query for peer addresses via DNS lookup, if low on addresses (default: 1
+unless \fB\-connect\fR)
+.HP
+\fB\-externalip=\fR<ip>
+.IP
+Specify your own public address
+.HP
+\fB\-forcednsseed\fR
+.IP
+Always query for peer addresses via DNS lookup (default: 0)
+.HP
+\fB\-listen\fR
+.IP
+Accept connections from outside (default: 1 if no \fB\-proxy\fR or \fB\-connect\fR)
+.HP
+\fB\-listenonion\fR
+.IP
+Automatically create Tor hidden service (default: 1)
+.HP
+\fB\-maxconnections=\fR<n>
+.IP
+Maintain at most <n> connections to peers (default: 125)
+.HP
+\fB\-maxreceivebuffer=\fR<n>
+.IP
+Maximum per\-connection receive buffer, <n>*1000 bytes (default: 5000)
+.HP
+\fB\-maxsendbuffer=\fR<n>
+.IP
+Maximum per\-connection send buffer, <n>*1000 bytes (default: 1000)
+.HP
+\fB\-maxtimeadjustment\fR
+.IP
+Maximum allowed median peer time offset adjustment. Local perspective of
+time may be influenced by peers forward or backward by this
+amount. (default: 4200 seconds)
+.HP
+\fB\-onion=\fR<ip:port>
+.IP
+Use separate SOCKS5 proxy to reach peers via Tor hidden services
+(default: \fB\-proxy\fR)
+.HP
+\fB\-onlynet=\fR<net>
+.IP
+Only connect to nodes in network <net> (ipv4, ipv6 or onion)
+.HP
+\fB\-permitbaremultisig\fR
+.IP
+Relay non\-P2SH multisig (default: 1)
+.HP
+\fB\-peerbloomfilters\fR
+.IP
+Support filtering of blocks and transaction with bloom filters (default:
+1)
+.HP
+\fB\-port=\fR<port>
+.IP
+Listen for connections on <port> (default: 8333 or testnet: 18333)
+.HP
+\fB\-proxy=\fR<ip:port>
+.IP
+Connect through SOCKS5 proxy
+.HP
+\fB\-proxyrandomize\fR
+.IP
+Randomize credentials for every proxy connection. This enables Tor
+stream isolation (default: 1)
+.HP
+\fB\-seednode=\fR<ip>
+.IP
+Connect to a node to retrieve peer addresses, and disconnect
+.HP
+\fB\-timeout=\fR<n>
+.IP
+Specify connection timeout in milliseconds (minimum: 1, default: 5000)
+.HP
+\fB\-torcontrol=\fR<ip>:<port>
+.IP
+Tor control port to use if onion listening enabled (default:
+127.0.0.1:9051)
+.HP
+\fB\-torpassword=\fR<pass>
+.IP
+Tor control port password (default: empty)
+.HP
+\fB\-whitebind=\fR<addr>
+.IP
+Bind to given address and whitelist peers connecting to it. Use
+[host]:port notation for IPv6
+.HP
+\fB\-whitelist=\fR<netmask>
+.IP
+Whitelist peers connecting from the given netmask or IP address. Can be
+specified multiple times. Whitelisted peers cannot be DoS banned
+and their transactions are always relayed, even if they are
+already in the mempool, useful e.g. for a gateway
+.HP
+\fB\-whitelistrelay\fR
+.IP
+Accept relayed transactions received from whitelisted peers even when
+not relaying transactions (default: 1)
+.HP
+\fB\-whitelistforcerelay\fR
+.IP
+Force relay of transactions from whitelisted peers even they violate
+local relay policy (default: 1)
+.HP
+\fB\-maxuploadtarget=\fR<n>
+.IP
+Tries to keep outbound traffic under the given target (in MiB per 24h),
+0 = no limit (default: 0)
+.PP
+Wallet options:
+.HP
+\fB\-disablewallet\fR
+.IP
+Do not load the wallet and disable wallet RPC calls
+.HP
+\fB\-keypool=\fR<n>
+.IP
+Set key pool size to <n> (default: 100)
+.HP
+\fB\-fallbackfee=\fR<amt>
+.IP
+A fee rate (in BTC/kB) that will be used when fee estimation has
+insufficient data (default: 0.0002)
+.HP
+\fB\-mintxfee=\fR<amt>
+.IP
+Fees (in BTC/kB) smaller than this are considered zero fee for
+transaction creation (default: 0.00001)
+.HP
+\fB\-paytxfee=\fR<amt>
+.IP
+Fee (in BTC/kB) to add to transactions you send (default: 0.00)
+.HP
+\fB\-rescan\fR
+.IP
+Rescan the block chain for missing wallet transactions on startup
+.HP
+\fB\-salvagewallet\fR
+.IP
+Attempt to recover private keys from a corrupt wallet on startup
+.HP
+\fB\-spendzeroconfchange\fR
+.IP
+Spend unconfirmed change when sending transactions (default: 1)
+.HP
+\fB\-txconfirmtarget=\fR<n>
+.IP
+If paytxfee is not set, include enough fee so transactions begin
+confirmation on average within n blocks (default: 2)
+.HP
+\fB\-usehd\fR
+.IP
+Use hierarchical deterministic key generation (HD) after BIP32. Only has
+effect during wallet creation/first start (default: 1)
+.HP
+\fB\-upgradewallet\fR
+.IP
+Upgrade wallet to latest format on startup
+.HP
+\fB\-wallet=\fR<file>
+.IP
+Specify wallet file (within data directory) (default: wallet.dat)
+.HP
+\fB\-walletbroadcast\fR
+.IP
+Make the wallet broadcast transactions (default: 1)
+.HP
+\fB\-walletnotify=\fR<cmd>
+.IP
+Execute command when a wallet transaction changes (%s in cmd is replaced
+by TxID)
+.HP
+\fB\-zapwallettxes=\fR<mode>
+.IP
+Delete all wallet transactions and only recover those parts of the
+blockchain through \fB\-rescan\fR on startup (1 = keep tx meta data e.g.
+account owner and payment request information, 2 = drop tx meta
+data)
+.PP
+ZeroMQ notification options:
+.HP
+\fB\-zmqpubhashblock=\fR<address>
+.IP
+Enable publish hash block in <address>
+.HP
+\fB\-zmqpubhashtx=\fR<address>
+.IP
+Enable publish hash transaction in <address>
+.HP
+\fB\-zmqpubrawblock=\fR<address>
+.IP
+Enable publish raw block in <address>
+.HP
+\fB\-zmqpubrawtx=\fR<address>
+.IP
+Enable publish raw transaction in <address>
+.PP
+Debugging/Testing options:
+.HP
+\fB\-uacomment=\fR<cmt>
+.IP
+Append comment to the user agent string
+.HP
+\fB\-debug=\fR<category>
+.IP
+Output debugging information (default: 0, supplying <category> is
+optional). If <category> is not supplied or if <category> = 1,
+output all debugging information.<category> can be: addrman,
+alert, bench, coindb, db, http, libevent, lock, mempool,
+mempoolrej, net, proxy, prune, rand, reindex, rpc, selectcoins,
+tor, zmq.
+.HP
+\fB\-help\-debug\fR
+.IP
+Show all debugging options (usage: \fB\-\-help\fR \fB\-help\-debug\fR)
+.HP
+\fB\-logips\fR
+.IP
+Include IP addresses in debug output (default: 0)
+.HP
+\fB\-logtimestamps\fR
+.IP
+Prepend debug output with timestamp (default: 1)
+.HP
+\fB\-minrelaytxfee=\fR<amt>
+.IP
+Fees (in BTC/kB) smaller than this are considered zero fee for relaying,
+mining and transaction creation (default: 0.00001)
+.HP
+\fB\-maxtxfee=\fR<amt>
+.IP
+Maximum total fees (in BTC) to use in a single wallet transaction or raw
+transaction; setting this too low may abort large transactions
+(default: 0.10)
+.HP
+\fB\-printtoconsole\fR
+.IP
+Send trace/debug info to console instead of debug.log file
+.HP
+\fB\-shrinkdebugfile\fR
+.IP
+Shrink debug.log file on client startup (default: 1 when no \fB\-debug\fR)
+.PP
+Chain selection options:
+.HP
+\fB\-testnet\fR
+.IP
+Use the test chain
+.PP
+Node relay options:
+.HP
+\fB\-bytespersigop\fR
+.IP
+Equivalent bytes per sigop in transactions for relay and mining
+(default: 20)
+.HP
+\fB\-datacarrier\fR
+.IP
+Relay and mine data carrier transactions (default: 1)
+.HP
+\fB\-datacarriersize\fR
+.IP
+Maximum size of data in data carrier transactions we relay and mine
+(default: 83)
+.HP
+\fB\-mempoolreplacement\fR
+.IP
+Enable transaction replacement in the memory pool (default: 1)
+.PP
+Block creation options:
+.HP
+\fB\-blockmaxweight=\fR<n>
+.IP
+Set maximum BIP141 block weight (default: 3000000)
+.HP
+\fB\-blockmaxsize=\fR<n>
+.IP
+Set maximum block size in bytes (default: 750000)
+.HP
+\fB\-blockprioritysize=\fR<n>
+.IP
+Set maximum size of high\-priority/low\-fee transactions in bytes
+(default: 0)
+.PP
+RPC server options:
+.HP
+\fB\-server\fR
+.IP
+Accept command line and JSON\-RPC commands
+.HP
+\fB\-rest\fR
+.IP
+Accept public REST requests (default: 0)
+.HP
+\fB\-rpcbind=\fR<addr>
+.IP
+Bind to given address to listen for JSON\-RPC connections. Use
+[host]:port notation for IPv6. This option can be specified
+multiple times (default: bind to all interfaces)
+.HP
+\fB\-rpccookiefile=\fR<loc>
+.IP
+Location of the auth cookie (default: data dir)
+.HP
+\fB\-rpcuser=\fR<user>
+.IP
+Username for JSON\-RPC connections
+.HP
+\fB\-rpcpassword=\fR<pw>
+.IP
+Password for JSON\-RPC connections
+.HP
+\fB\-rpcauth=\fR<userpw>
+.IP
+Username and hashed password for JSON\-RPC connections. The field
+<userpw> comes in the format: <USERNAME>:<SALT>$<HASH>. A
+canonical python script is included in share/rpcuser. This option
+can be specified multiple times
+.HP
+\fB\-rpcport=\fR<port>
+.IP
+Listen for JSON\-RPC connections on <port> (default: 8332 or testnet:
+18332)
+.HP
+\fB\-rpcallowip=\fR<ip>
+.IP
+Allow JSON\-RPC connections from specified source. Valid for <ip> are a
+single IP (e.g. 1.2.3.4), a network/netmask (e.g.
+1.2.3.4/255.255.255.0) or a network/CIDR (e.g. 1.2.3.4/24). This
+option can be specified multiple times
+.HP
+\fB\-rpcthreads=\fR<n>
+.IP
+Set the number of threads to service RPC calls (default: 4)
+.SH COPYRIGHT
+Copyright (C) 2009-2016 The Bitcoin Core developers
+
+Please contribute if you find Bitcoin Core useful. Visit
+<https://bitcoincore.org> for further information about the software.
+The source code is available from <https://github.com/bitcoin/bitcoin>.
+
+This is experimental software.
+Distributed under the MIT software license, see the accompanying file COPYING
+or <http://www.opensource.org/licenses/mit-license.php>.
+
+This product includes software developed by the OpenSSL Project for use in the
+OpenSSL Toolkit <https://www.openssl.org/> and cryptographic software written
+by Eric Young and UPnP software written by Thomas Bernard.

From 00dba72cc3674f3cf60ac42c78d5792264c78e94 Mon Sep 17 00:00:00 2001
From: nomnombtc <mastergizmo@arcor.de>
Date: Sat, 27 Aug 2016 01:05:28 +0200
Subject: [PATCH 0787/1802] add doc/man/Makefile.am to include manpages

---
 doc/man/Makefile.am | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 doc/man/Makefile.am

diff --git a/doc/man/Makefile.am b/doc/man/Makefile.am
new file mode 100644
index 0000000000000..1a31039360b18
--- /dev/null
+++ b/doc/man/Makefile.am
@@ -0,0 +1 @@
+dist_man1_MANS=bitcoind.1 bitcoin-qt.1 bitcoin-cli.1

From dc84b6f4192828abd1c0c7a0960445870346c5c7 Mon Sep 17 00:00:00 2001
From: nomnombtc <mastergizmo@arcor.de>
Date: Sat, 27 Aug 2016 01:09:22 +0200
Subject: [PATCH 0788/1802] add doc/man to subdir if configure flag
 --enable-man is set

---
 Makefile.am | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/Makefile.am b/Makefile.am
index 37c1e98eca6bc..2e061c3773580 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,8 @@
 ACLOCAL_AMFLAGS = -I build-aux/m4
 SUBDIRS = src
+if ENABLE_MAN
+SUBDIRS += doc/man
+endif
 .PHONY: deploy FORCE
 
 GZIP_ENV="-9n"
@@ -213,6 +216,8 @@ DISTCLEANFILES = qa/pull-tester/tests_config.pyc
 
 .INTERMEDIATE: $(COVERAGE_INFO)
 
+DISTCHECK_CONFIGURE_FLAGS = --enable-man
+
 clean-local:
 	rm -rf coverage_percent.txt test_bitcoin.coverage/ total.coverage/ qa/tmp/ cache/ $(OSX_APP)
 	rm -rf qa/pull-tester/__pycache__

From a32c102fb1766301977d093c006f7f6cbf7fbea7 Mon Sep 17 00:00:00 2001
From: nomnombtc <mastergizmo@arcor.de>
Date: Sat, 27 Aug 2016 01:12:41 +0200
Subject: [PATCH 0789/1802] add conditional for --enable-man, default is yes

---
 configure.ac | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index d332f4face3ee..4eadd58e79c97 100644
--- a/configure.ac
+++ b/configure.ac
@@ -167,6 +167,13 @@ AC_ARG_ENABLE([zmq],
 
 AC_ARG_WITH([protoc-bindir],[AS_HELP_STRING([--with-protoc-bindir=BIN_DIR],[specify protoc bin path])], [protoc_bin_path=$withval], [])
 
+# Enable manpages
+AC_ARG_ENABLE(man,
+    [AS_HELP_STRING([--enable-man],
+                    [install man pages [default=yes]])],,
+    enable_man=yes)
+AM_CONDITIONAL(ENABLE_MAN, test "$enable_man" != no)
+
 # Enable debug
 AC_ARG_ENABLE([debug],
     [AS_HELP_STRING([--enable-debug],
@@ -1046,7 +1053,7 @@ AC_SUBST(EVENT_PTHREADS_LIBS)
 AC_SUBST(ZMQ_LIBS)
 AC_SUBST(PROTOBUF_LIBS)
 AC_SUBST(QR_LIBS)
-AC_CONFIG_FILES([Makefile src/Makefile share/setup.nsi share/qt/Info.plist src/test/buildenv.py])
+AC_CONFIG_FILES([Makefile src/Makefile doc/man/Makefile share/setup.nsi share/qt/Info.plist src/test/buildenv.py])
 AC_CONFIG_FILES([qa/pull-tester/run-bitcoind-for-test.sh],[chmod +x qa/pull-tester/run-bitcoind-for-test.sh])
 AC_CONFIG_FILES([qa/pull-tester/tests_config.py],[chmod +x qa/pull-tester/tests_config.py])
 AC_CONFIG_FILES([contrib/devtools/split-debug.sh],[chmod +x contrib/devtools/split-debug.sh])

From eda4cfb992d140c8471f6cc2bf16c4a106439225 Mon Sep 17 00:00:00 2001
From: Andrew Chow <achow101@gmail.com>
Date: Tue, 23 Aug 2016 16:20:15 -0400
Subject: [PATCH 0790/1802] Create an easy to use gitian building script

I've written a script that automates the setup and building of binaries with gitian. All of the commands are pulled from various documentation on gitian building.
---
 contrib/README.md       |   3 +
 contrib/gitian-build.sh | 362 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 365 insertions(+)
 create mode 100755 contrib/gitian-build.sh

diff --git a/contrib/README.md b/contrib/README.md
index a23b197cc6122..3e3c83da5f1e6 100644
--- a/contrib/README.md
+++ b/contrib/README.md
@@ -45,6 +45,9 @@ Scripts and notes for Mac builds.
 ### [RPM](/contrib/rpm) ###
 RPM spec file for building bitcoin-core on RPM based distributions
 
+### [Gitian-build](/contrib/gitian-build.sh) ###
+Script for running full gitian builds.
+
 Test and Verify Tools 
 ---------------------
 
diff --git a/contrib/gitian-build.sh b/contrib/gitian-build.sh
new file mode 100755
index 0000000000000..b51a91fdc0e39
--- /dev/null
+++ b/contrib/gitian-build.sh
@@ -0,0 +1,362 @@
+# What to do
+sign=false
+verify=false
+build=false
+setupenv=false
+
+# Systems to build
+linux=true
+windows=true
+osx=true
+
+# Other Basic variables
+SIGNER=
+VERSION=
+commit=false
+url=https://github.com/bitcoin/bitcoin
+proc=4
+mem=4000
+lxc=true
+osslTarUrl=http://downloads.sourceforge.net/project/osslsigncode/osslsigncode/osslsigncode-1.7.1.tar.gz
+osslPatchUrl=https://bitcoincore.org/cfields/osslsigncode-Backports-to-1.7.1.patch
+scriptName=$(basename -- "$0")
+
+# Help Message
+read -d '' usage <<- EOF
+Usage: $scriptName [-c|u|v|b|s|B|o|h|j|m|] signer version
+
+Run this script from the directory containing the bitcoin, gitian-builder, gitian.sigs, and bitcoin-detached-sigs.
+
+Arguments:
+signer          GPG signer to sign each build assert file
+version		Version number, commit, or branch to build. If building a commit or branch, the -c option must be specified
+
+Options:
+-c|--commit	Indicate that the version argument is for a commit or branch
+-u|--url	Specify the URL of the repository. Default is https://github.com/bitcoin/bitcoin
+-v|--verify 	Verify the gitian build
+-b|--build	Do a gitiain build
+-s|--sign	Make signed binaries for Windows and Mac OSX
+-B|--buildsign	Build both signed and unsigned binaries
+-o|--os		Specify which Operating Systems the build is for. Default is lwx. l for linux, w for windows, x for osx
+-j		Number of processes to use. Default 4
+-m		Memory to allocate in MiB. Default 2000
+--kvm           Use KVM instead of LXC
+--setup         Setup the gitian building environment. Uses KVM. If you want to use lxc, use the --lxc option. Only works on Debian-based systems (Ubuntu, Debian)
+-h|--help	Print this help message
+EOF
+
+# Get options and arguments
+while :; do
+    case $1 in
+        # Verify
+        -v|--verify)
+	    verify=true
+            ;;
+        # Build
+        -b|--build)
+	    build=true
+            ;;
+        # Sign binaries
+        -s|--sign)
+	    sign=true
+            ;;
+        # Build then Sign
+        -B|--buildsign)
+	    sign=true
+	    build=true
+            ;;
+        # PGP Signer
+        -S|--signer)
+	    if [ -n "$2" ]
+	    then
+		SIGNER=$2
+		shift
+	    else
+		echo 'Error: "--signer" requires a non-empty argument.'
+		exit 1
+	    fi
+           ;;
+        # Operating Systems
+        -o|--os)
+	    if [ -n "$2" ]
+	    then
+		linux=false
+		windows=false
+		osx=false
+		if [[ "$2" = *"l"* ]]
+		then
+		    linux=true
+		fi
+		if [[ "$2" = *"w"* ]]
+		then
+		    windows=true
+		fi
+		if [[ "$2" = *"x"* ]]
+		then
+		    osx=true
+		fi
+		shift
+	    else
+		echo 'Error: "--os" requires an argument containing an l (for linux), w (for windows), or x (for Mac OSX)\n'
+		exit 1
+	    fi
+	    ;;
+	# Help message
+	-h|--help)
+	    echo "$usage"
+	    exit 0
+	    ;;
+	# Commit or branch
+	-c|--commit)
+	    commit=true
+	    ;;
+	# Number of Processes
+	-j)
+	    if [ -n "$2" ]
+	    then
+		proc=$2
+		shift
+	    else
+		echo 'Error: "-j" requires an argument'
+		exit 1
+	    fi
+	    ;;
+	# Memory to allocate
+	-m)
+	    if [ -n "$2" ]
+	    then
+		mem=$2
+		shift
+	    else
+		echo 'Error: "-m" requires an argument'
+		exit 1
+	    fi
+	    ;;
+	# URL
+	-u)
+	    if [ -n "$2" ]
+	    then
+		url=$2
+		shift
+	    else
+		echo 'Error: "-u" requires an argument'
+		exit 1
+	    fi
+	    ;;
+        # kvm
+        --kvm)
+            lxc=false
+            ;;
+        # Setup
+        --setup)
+            setup=true
+            ;;
+	*)               # Default case: If no more options then break out of the loop.
+             break
+    esac
+    shift
+done
+
+# Set up LXC
+if [[ $lxc = true ]]
+then
+    export USE_LXC=1
+    export LXC_BRIDGE=lxcbr0
+    sudo ifconfig lxcbr0 up 10.0.2.2
+fi
+
+# Get signer
+if [[ -n"$1" ]]
+then
+    SIGNER=$1
+    shift
+fi
+
+# Get version
+if [[ -n "$1" ]]
+then
+    VERSION=$1
+    COMMIT=$VERSION
+    shift
+fi
+
+# Check that a signer is specified
+if [[ $SIGNER == "" ]]
+then
+    echo "$scriptName: Missing signer."
+    echo "Try $scriptName --help for more information"
+    exit 1
+fi
+
+# Check that a version is specified
+if [[ $VERSION == "" ]]
+then
+    echo "$scriptName: Missing version."
+    echo "Try $scriptName --help for more information"
+    exit 1
+fi
+
+# Add a "v" if no -c
+if [[ $commit = false ]]
+then
+	COMMIT="v${VERSION}"
+fi
+echo ${COMMIT}
+
+# Setup build environment
+if [[ $setup = true ]]
+then
+    pushd ./gitian-builder
+    sudo apt-get install ruby apache2 git apt-cacher-ng python-vm-builder qemu-kvm qemu-utils
+    git clone https://github.com/bitcoin-core/gitian.sigs.git
+    git clone https://github.com/bitcoin-core/bitcoin-detached-sigs.git
+    git clone https://github.com/devrandom/gitian-builder.git
+    if [[ -n "$USE_LXC" ]]
+    then
+        sudo apt-get install lxc
+        bin/make-base-vm --suite trusty --arch amd64 --lxc
+    else
+        bin/make-base-vm --suite trusty --arch amd64
+    fi
+    popd
+fi
+
+# Set up build
+pushd ./bitcoin
+git fetch
+git checkout ${COMMIT}
+popd
+
+# Build
+if [[ $build = true ]]
+then
+	# Make output folder
+	mkdir -p ./bitcoin-binaries/${VERSION}
+	
+	# Build Dependencies
+	echo ""
+	echo "Building Dependencies"
+	echo ""
+	pushd ./gitian-builder	
+	mkdir -p inputs
+	wget -N -P inputs $osslPatchUrl
+	wget -N -P inputs $osslTarUrl
+	make -C ../bitcoin/depends download SOURCES_PATH=`pwd`/cache/common
+
+	# Linux
+	if [[ $linux = true ]]
+	then
+            echo ""
+	    echo "Compiling ${VERSION} Linux"
+	    echo ""
+	    ./bin/gbuild -j ${proc} -m ${mem} --commit bitcoin=${COMMIT} --url bitcoin=${url} ../bitcoin/contrib/gitian-descriptors/gitian-linux.yml
+	    ./bin/gsign --signer $SIGNER --release ${VERSION}-linux --destination ../gitian.sigs/ ../bitcoin/contrib/gitian-descriptors/gitian-linux.yml
+	    mv build/out/bitcoin-*.tar.gz build/out/src/bitcoin-*.tar.gz ../bitcoin-binaries/${VERSION}
+	fi
+	# Windows
+	if [[ $windows = true ]]
+	then
+	    echo ""
+	    echo "Compiling ${VERSION} Windows"
+	    echo ""
+	    ./bin/gbuild -j ${proc} -m ${mem} --commit bitcoin=${COMMIT} --url bitcoin=${url} ../bitcoin/contrib/gitian-descriptors/gitian-win.yml
+	    ./bin/gsign --signer $SIGNER --release ${VERSION}-win-unsigned --destination ../gitian.sigs/ ../bitcoin/contrib/gitian-descriptors/gitian-win.yml
+	    mv build/out/bitcoin-*-win-unsigned.tar.gz inputs/bitcoin-win-unsigned.tar.gz
+	    mv build/out/bitcoin-*.zip build/out/bitcoin-*.exe ../bitcoin-binaries/${VERSION}
+	fi
+	# Mac OSX
+	if [[ $osx = true ]]
+	then
+	    echo ""
+	    echo "Compiling ${VERSION} Mac OSX"
+	    echo ""
+	    ./bin/gbuild -j ${proc} -m ${mem} --commit bitcoin=${COMMIT} --url bitcoin=${url} ../bitcoin/contrib/gitian-descriptors/gitian-osx.yml
+	    ./bin/gsign --signer $SIGNER --release ${VERSION}-osx-unsigned --destination ../gitian.sigs/ ../bitcoin/contrib/gitian-descriptors/gitian-osx.yml
+	    mv build/out/bitcoin-*-osx-unsigned.tar.gz inputs/bitcoin-osx-unsigned.tar.gz
+	    mv build/out/bitcoin-*.tar.gz build/out/bitcoin-*.dmg ../bitcoin-binaries/${VERSION}
+	fi
+	popd
+
+	# Commit to gitian.sigs repo
+	echo ""
+	echo "Committing ${VERSION} Unsigned Sigs"
+	echo ""
+	pushd gitian.sigs
+	git add ${VERSION}-linux/${SIGNER}
+	git add ${VERSION}-win-unsigned/${SIGNER}
+	git add ${VERSION}-osx-unsigned/${SIGNER}
+	git commit -a -m "Add ${VERSION} unsigned sigs for ${SIGNER}"
+	popd
+fi
+
+# Verify the build
+if [[ $verify = true ]]
+then
+	# Linux
+	pushd ./gitian-builder
+	echo ""
+	echo "Verifying v${VERSION} Linux"
+	echo ""
+	./bin/gverify -v -d ../gitian.sigs/ -r ${VERSION}-linux ../bitcoin/contrib/gitian-descriptors/gitian-linux.yml
+	# Windows
+	echo ""
+	echo "Verifying v${VERSION} Windows"
+	echo ""
+	./bin/gverify -v -d ../gitian.sigs/ -r ${VERSION}-win-unsigned ../bitcoin/contrib/gitian-descriptors/gitian-win.yml
+	# Mac OSX	
+	echo ""
+	echo "Verifying v${VERSION} Mac OSX"
+	echo ""	
+	./bin/gverify -v -d ../gitian.sigs/ -r ${VERSION}-osx-unsigned ../bitcoin/contrib/gitian-descriptors/gitian-osx.yml
+	# Signed Windows
+	echo ""
+	echo "Verifying v${VERSION} Signed Windows"
+	echo ""
+	./bin/gverify -v -d ../gitian.sigs/ -r ${VERSION}-osx-signed ../bitcoin/contrib/gitian-descriptors/gitian-osx-signer.yml
+	# Signed Mac OSX
+	echo ""
+	echo "Verifying v${VERSION} Signed Mac OSX"
+	echo ""
+	./bin/gverify -v -d ../gitian.sigs/ -r ${VERSION}-osx-signed ../bitcoin/contrib/gitian-descriptors/gitian-osx-signer.yml	
+	popd
+fi
+
+# Sign binaries
+if [[ $sign = true ]]
+then
+	
+        pushd ./gitian-builder
+	# Sign Windows
+	if [[ $windows = true ]]
+	then
+	    echo ""
+	    echo "Signing ${VERSION} Windows"
+	    echo ""
+	    ./bin/gbuild -i --commit signature=${COMMIT} ../bitcoin/contrib/gitian-descriptors/gitian-win-signer.yml
+	    ./bin/gsign --signer $SIGNER --release ${VERSION}-win-signed --destination ../gitian.sigs/ ../bitcoin/contrib/gitian-descriptors/gitian-win-signer.yml
+	    mv build/out/bitcoin-*win64-setup.exe ../bitcoin-binaries/${VERSION}
+	    mv build/out/bitcoin-*win32-setup.exe ../bitcoin-binaries/${VERSION}
+	fi
+	# Sign Mac OSX
+	if [[ $osx = true ]]
+	then
+	    echo ""
+	    echo "Signing ${VERSION} Mac OSX"
+	    echo ""
+	    ./bin/gbuild -i --commit signature=${COMMIT} ../bitcoin/contrib/gitian-descriptors/gitian-osx-signer.yml
+	    ./bin/gsign --signer $SIGNER --release ${VERSION}-osx-signed --destination ../gitian.sigs/ ../bitcoin/contrib/gitian-descriptors/gitian-osx-signer.yml
+	    mv build/out/bitcoin-osx-signed.dmg ../bitcoin-binaries/${VERSION}/bitcoin-${VERSION}-osx.dmg
+	fi
+	popd
+
+	# Commit Sigs
+	pushd gitian.sigs
+	echo ""
+	echo "Committing ${VERSION} Signed Sigs"
+	echo ""
+	git add ${VERSION}-win-signed/${SIGNER}
+	git add ${VERSION}-osx-signed/${SIGNER}
+	git commit -a -m "Add ${VERSION} signed binary sigs for ${SIGNER}"
+	popd
+fi

From 498d8dadbf71b96f9b2a82e449c848acf1ed03f5 Mon Sep 17 00:00:00 2001
From: Andrew Chow <achow101@gmail.com>
Date: Thu, 25 Aug 2016 15:42:39 -0400
Subject: [PATCH 0791/1802] Check for OSX SDK

---
 contrib/gitian-build.sh | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/contrib/gitian-build.sh b/contrib/gitian-build.sh
index b51a91fdc0e39..7baaabee6d669 100755
--- a/contrib/gitian-build.sh
+++ b/contrib/gitian-build.sh
@@ -166,6 +166,13 @@ then
     sudo ifconfig lxcbr0 up 10.0.2.2
 fi
 
+# Check for OSX SDK
+if [[ ! -e "gitian-builder/inputs/MacOSX10.11.sdk.tar.gz" && $osx == true ]]
+then
+    echo "Cannot build for OSX, SDK does not exist. Will build for other OSes"
+    osx=false
+fi
+
 # Get signer
 if [[ -n"$1" ]]
 then

From 6ffd6b4a573e00644b8985c825357a7aa7b8ce88 Mon Sep 17 00:00:00 2001
From: Andrew Chow <achow101@gmail.com>
Date: Thu, 25 Aug 2016 19:34:07 -0400
Subject: [PATCH 0792/1802] Create option to detach sign gitian builds and not
 commit the files in the script

Gitian builds can be done where the assert files are made but no signing is done. The sigs can also optionally not be committed automatically.
---
 contrib/gitian-build.sh | 69 ++++++++++++++++++++++++++---------------
 1 file changed, 44 insertions(+), 25 deletions(-)

diff --git a/contrib/gitian-build.sh b/contrib/gitian-build.sh
index 7baaabee6d669..e45a0d591f649 100755
--- a/contrib/gitian-build.sh
+++ b/contrib/gitian-build.sh
@@ -20,6 +20,8 @@ lxc=true
 osslTarUrl=http://downloads.sourceforge.net/project/osslsigncode/osslsigncode/osslsigncode-1.7.1.tar.gz
 osslPatchUrl=https://bitcoincore.org/cfields/osslsigncode-Backports-to-1.7.1.patch
 scriptName=$(basename -- "$0")
+signProg="gpg --detach-sign"
+commitFiles=true
 
 # Help Message
 read -d '' usage <<- EOF
@@ -43,6 +45,8 @@ Options:
 -m		Memory to allocate in MiB. Default 2000
 --kvm           Use KVM instead of LXC
 --setup         Setup the gitian building environment. Uses KVM. If you want to use lxc, use the --lxc option. Only works on Debian-based systems (Ubuntu, Debian)
+--detach-sign   Create the assert file for detached signing. Will not commit anything.
+--no-commit     Do not commit anything to git
 -h|--help	Print this help message
 EOF
 
@@ -148,6 +152,15 @@ while :; do
         --kvm)
             lxc=false
             ;;
+        # Detach sign
+        --detach-sign)
+            signProg="true"
+            commitFiles=false
+            ;;
+        # Commit files
+        --no-commit)
+            commitFiles=false
+            ;;
         # Setup
         --setup)
             setup=true
@@ -214,11 +227,11 @@ echo ${COMMIT}
 # Setup build environment
 if [[ $setup = true ]]
 then
-    pushd ./gitian-builder
     sudo apt-get install ruby apache2 git apt-cacher-ng python-vm-builder qemu-kvm qemu-utils
     git clone https://github.com/bitcoin-core/gitian.sigs.git
     git clone https://github.com/bitcoin-core/bitcoin-detached-sigs.git
     git clone https://github.com/devrandom/gitian-builder.git
+    pushd ./gitian-builder
     if [[ -n "$USE_LXC" ]]
     then
         sudo apt-get install lxc
@@ -258,7 +271,7 @@ then
 	    echo "Compiling ${VERSION} Linux"
 	    echo ""
 	    ./bin/gbuild -j ${proc} -m ${mem} --commit bitcoin=${COMMIT} --url bitcoin=${url} ../bitcoin/contrib/gitian-descriptors/gitian-linux.yml
-	    ./bin/gsign --signer $SIGNER --release ${VERSION}-linux --destination ../gitian.sigs/ ../bitcoin/contrib/gitian-descriptors/gitian-linux.yml
+	    ./bin/gsign -p $signProg --signer $SIGNER --release ${VERSION}-linux --destination ../gitian.sigs/ ../bitcoin/contrib/gitian-descriptors/gitian-linux.yml
 	    mv build/out/bitcoin-*.tar.gz build/out/src/bitcoin-*.tar.gz ../bitcoin-binaries/${VERSION}
 	fi
 	# Windows
@@ -268,7 +281,7 @@ then
 	    echo "Compiling ${VERSION} Windows"
 	    echo ""
 	    ./bin/gbuild -j ${proc} -m ${mem} --commit bitcoin=${COMMIT} --url bitcoin=${url} ../bitcoin/contrib/gitian-descriptors/gitian-win.yml
-	    ./bin/gsign --signer $SIGNER --release ${VERSION}-win-unsigned --destination ../gitian.sigs/ ../bitcoin/contrib/gitian-descriptors/gitian-win.yml
+	    ./bin/gsign -p $signProg --signer $SIGNER --release ${VERSION}-win-unsigned --destination ../gitian.sigs/ ../bitcoin/contrib/gitian-descriptors/gitian-win.yml
 	    mv build/out/bitcoin-*-win-unsigned.tar.gz inputs/bitcoin-win-unsigned.tar.gz
 	    mv build/out/bitcoin-*.zip build/out/bitcoin-*.exe ../bitcoin-binaries/${VERSION}
 	fi
@@ -279,22 +292,25 @@ then
 	    echo "Compiling ${VERSION} Mac OSX"
 	    echo ""
 	    ./bin/gbuild -j ${proc} -m ${mem} --commit bitcoin=${COMMIT} --url bitcoin=${url} ../bitcoin/contrib/gitian-descriptors/gitian-osx.yml
-	    ./bin/gsign --signer $SIGNER --release ${VERSION}-osx-unsigned --destination ../gitian.sigs/ ../bitcoin/contrib/gitian-descriptors/gitian-osx.yml
+	    ./bin/gsign -p $signProg --signer $SIGNER --release ${VERSION}-osx-unsigned --destination ../gitian.sigs/ ../bitcoin/contrib/gitian-descriptors/gitian-osx.yml
 	    mv build/out/bitcoin-*-osx-unsigned.tar.gz inputs/bitcoin-osx-unsigned.tar.gz
 	    mv build/out/bitcoin-*.tar.gz build/out/bitcoin-*.dmg ../bitcoin-binaries/${VERSION}
 	fi
 	popd
 
-	# Commit to gitian.sigs repo
-	echo ""
-	echo "Committing ${VERSION} Unsigned Sigs"
-	echo ""
-	pushd gitian.sigs
-	git add ${VERSION}-linux/${SIGNER}
-	git add ${VERSION}-win-unsigned/${SIGNER}
-	git add ${VERSION}-osx-unsigned/${SIGNER}
-	git commit -a -m "Add ${VERSION} unsigned sigs for ${SIGNER}"
-	popd
+        if [[ $commitFiles = true ]]
+        then
+	    # Commit to gitian.sigs repo
+            echo ""
+            echo "Committing ${VERSION} Unsigned Sigs"
+            echo ""
+            pushd gitian.sigs
+            git add ${VERSION}-linux/${SIGNER}
+            git add ${VERSION}-win-unsigned/${SIGNER}
+            git add ${VERSION}-osx-unsigned/${SIGNER}
+            git commit -a -m "Add ${VERSION} unsigned sigs for ${SIGNER}"
+            popd
+        fi
 fi
 
 # Verify the build
@@ -341,7 +357,7 @@ then
 	    echo "Signing ${VERSION} Windows"
 	    echo ""
 	    ./bin/gbuild -i --commit signature=${COMMIT} ../bitcoin/contrib/gitian-descriptors/gitian-win-signer.yml
-	    ./bin/gsign --signer $SIGNER --release ${VERSION}-win-signed --destination ../gitian.sigs/ ../bitcoin/contrib/gitian-descriptors/gitian-win-signer.yml
+	    ./bin/gsign -p $signProg --signer $SIGNER --release ${VERSION}-win-signed --destination ../gitian.sigs/ ../bitcoin/contrib/gitian-descriptors/gitian-win-signer.yml
 	    mv build/out/bitcoin-*win64-setup.exe ../bitcoin-binaries/${VERSION}
 	    mv build/out/bitcoin-*win32-setup.exe ../bitcoin-binaries/${VERSION}
 	fi
@@ -352,18 +368,21 @@ then
 	    echo "Signing ${VERSION} Mac OSX"
 	    echo ""
 	    ./bin/gbuild -i --commit signature=${COMMIT} ../bitcoin/contrib/gitian-descriptors/gitian-osx-signer.yml
-	    ./bin/gsign --signer $SIGNER --release ${VERSION}-osx-signed --destination ../gitian.sigs/ ../bitcoin/contrib/gitian-descriptors/gitian-osx-signer.yml
+	    ./bin/gsign -p $signProg --signer $SIGNER --release ${VERSION}-osx-signed --destination ../gitian.sigs/ ../bitcoin/contrib/gitian-descriptors/gitian-osx-signer.yml
 	    mv build/out/bitcoin-osx-signed.dmg ../bitcoin-binaries/${VERSION}/bitcoin-${VERSION}-osx.dmg
 	fi
 	popd
 
-	# Commit Sigs
-	pushd gitian.sigs
-	echo ""
-	echo "Committing ${VERSION} Signed Sigs"
-	echo ""
-	git add ${VERSION}-win-signed/${SIGNER}
-	git add ${VERSION}-osx-signed/${SIGNER}
-	git commit -a -m "Add ${VERSION} signed binary sigs for ${SIGNER}"
-	popd
+        if [[ $commitFiles = true ]]
+        then
+            # Commit Sigs
+            pushd gitian.sigs
+            echo ""
+            echo "Committing ${VERSION} Signed Sigs"
+            echo ""
+            git add ${VERSION}-win-signed/${SIGNER}
+            git add ${VERSION}-osx-signed/${SIGNER}
+            git commit -a -m "Add ${VERSION} signed binary sigs for ${SIGNER}"
+            popd
+        fi
 fi

From 203f2121be0a84e85f7dff9cca9a30387005954f Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Sat, 27 Aug 2016 15:28:20 +0200
Subject: [PATCH 0793/1802] Reduce default number of blocks to check at startup

---
 src/main.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main.h b/src/main.h
index e9106fccf7927..b22c642404321 100644
--- a/src/main.h
+++ b/src/main.h
@@ -191,7 +191,7 @@ extern uint64_t nPruneTarget;
 /** Block files containing a block-height within MIN_BLOCKS_TO_KEEP of chainActive.Tip() will not be pruned. */
 static const unsigned int MIN_BLOCKS_TO_KEEP = 288;
 
-static const signed int DEFAULT_CHECKBLOCKS = MIN_BLOCKS_TO_KEEP;
+static const signed int DEFAULT_CHECKBLOCKS = 6;
 static const unsigned int DEFAULT_CHECKLEVEL = 3;
 
 // Require that user allocate at least 550MB for block & undo files (blk???.dat and rev???.dat)

From ae6e754928b85642b7024995f1771776c064a341 Mon Sep 17 00:00:00 2001
From: nomnombtc <mastergizmo@arcor.de>
Date: Sun, 28 Aug 2016 02:46:36 +0200
Subject: [PATCH 0794/1802] change help string --enable-man to --disable-man

---
 configure.ac | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index 4eadd58e79c97..7ca254aaabead 100644
--- a/configure.ac
+++ b/configure.ac
@@ -167,10 +167,9 @@ AC_ARG_ENABLE([zmq],
 
 AC_ARG_WITH([protoc-bindir],[AS_HELP_STRING([--with-protoc-bindir=BIN_DIR],[specify protoc bin path])], [protoc_bin_path=$withval], [])
 
-# Enable manpages
 AC_ARG_ENABLE(man,
-    [AS_HELP_STRING([--enable-man],
-                    [install man pages [default=yes]])],,
+    [AS_HELP_STRING([--disable-man],
+                    [do not install man pages (default is to install)])],,
     enable_man=yes)
 AM_CONDITIONAL(ENABLE_MAN, test "$enable_man" != no)
 

From 3fe0b68fb423da2a49dee31983e865fb22a24248 Mon Sep 17 00:00:00 2001
From: Andrew Chow <achow101@gmail.com>
Date: Sun, 28 Aug 2016 09:41:50 -0400
Subject: [PATCH 0795/1802] Set defaults to gitian defaults

Set the default -j and -m to 2 and 2000 respectively, matching gitian's default values.
---
 contrib/gitian-build.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/contrib/gitian-build.sh b/contrib/gitian-build.sh
index e45a0d591f649..ee47d138f3798 100755
--- a/contrib/gitian-build.sh
+++ b/contrib/gitian-build.sh
@@ -14,8 +14,8 @@ SIGNER=
 VERSION=
 commit=false
 url=https://github.com/bitcoin/bitcoin
-proc=4
-mem=4000
+proc=2
+mem=2000
 lxc=true
 osslTarUrl=http://downloads.sourceforge.net/project/osslsigncode/osslsigncode/osslsigncode-1.7.1.tar.gz
 osslPatchUrl=https://bitcoincore.org/cfields/osslsigncode-Backports-to-1.7.1.patch
@@ -41,7 +41,7 @@ Options:
 -s|--sign	Make signed binaries for Windows and Mac OSX
 -B|--buildsign	Build both signed and unsigned binaries
 -o|--os		Specify which Operating Systems the build is for. Default is lwx. l for linux, w for windows, x for osx
--j		Number of processes to use. Default 4
+-j		Number of processes to use. Default 2
 -m		Memory to allocate in MiB. Default 2000
 --kvm           Use KVM instead of LXC
 --setup         Setup the gitian building environment. Uses KVM. If you want to use lxc, use the --lxc option. Only works on Debian-based systems (Ubuntu, Debian)

From 883175f5d361720c75c89efcbc9d199cd6d3b2ab Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Fri, 26 Aug 2016 16:26:02 +0200
Subject: [PATCH 0796/1802] build: Updates for OpenBSD

- LevelDB platform was not guessed correctly (it ended up defining
  `-DOS_OPENBSD59` instead of `-DOS_OPENBSD`)

- On OpenBSD there is no convenience link from `python3.5` to `python3`:
  add detection for other python interpreter names.

- If it has to guess the LevelDB OS, print a autoconf warning so that
  the user can check.
---
 configure.ac | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index d332f4face3ee..add8d217817ca 100644
--- a/configure.ac
+++ b/configure.ac
@@ -66,7 +66,8 @@ AC_PATH_TOOL(RANLIB, ranlib)
 AC_PATH_TOOL(STRIP, strip)
 AC_PATH_TOOL(GCOV, gcov)
 AC_PATH_PROG(LCOV, lcov)
-AC_PATH_PROGS([PYTHON], [python3 python2.7 python2 python])
+dnl Python 3.x is supported from 3.4 on (see https://github.com/bitcoin/bitcoin/issues/7893)
+AC_PATH_PROGS([PYTHON], [python3.6 python3.5 python3.4 python3 python2.7 python2 python])
 AC_PATH_PROG(GENHTML, genhtml)
 AC_PATH_PROG([GIT], [git])
 AC_PATH_PROG(CCACHE,ccache)
@@ -355,8 +356,15 @@ case $host in
      TARGET_OS=linux
      LEVELDB_TARGET_FLAGS="-DOS_LINUX"
      ;;
+   *freebsd*)
+     LEVELDB_TARGET_FLAGS="-DOS_FREEBSD"
+     ;;
+   *openbsd*)
+     LEVELDB_TARGET_FLAGS="-DOS_OPENBSD"
+     ;;
    *)
      OTHER_OS=`echo ${host_os} | awk '{print toupper($0)}'`
+     AC_MSG_WARN([Guessing LevelDB OS as OS_${OTHER_OS}, please check whether this is correct, if not add an entry to configure.ac.])
      LEVELDB_TARGET_FLAGS="-DOS_${OTHER_OS}"
      ;;
 esac

From 6275123ce960172aeecfe087c8c0e303a216736a Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Fri, 26 Aug 2016 16:26:09 +0200
Subject: [PATCH 0797/1802] doc: Update build-openbsd for 0.13.0+ and OpenBSD
 5.9

- Python 3 now supported.

- Bump boost version to 1.61 - one boost patch no longer needed.

- All checked with OpenBSD 5.9, except for the clang part, I left this
  as-is for someone adventurous.

- Mention overriding resource limits, OpenBSD's default ulimit does not
  suffice for building Bitcoin Core with gcc 4.9.3.
---
 doc/build-openbsd.md | 46 ++++++++++++++++++++++++++++----------------
 1 file changed, 29 insertions(+), 17 deletions(-)

diff --git a/doc/build-openbsd.md b/doc/build-openbsd.md
index d923301467a7f..55283d6dcea93 100644
--- a/doc/build-openbsd.md
+++ b/doc/build-openbsd.md
@@ -1,6 +1,6 @@
 OpenBSD build guide
 ======================
-(updated for OpenBSD 5.7)
+(updated for OpenBSD 5.9)
 
 This guide describes how to build bitcoind and command-line utilities on OpenBSD.
 
@@ -15,11 +15,10 @@ Run the following as root to install the base dependencies for building:
 pkg_add gmake libtool libevent
 pkg_add autoconf # (select highest version, e.g. 2.69)
 pkg_add automake # (select highest version, e.g. 1.15)
-pkg_add python # (select version 2.7.x, not 3.x)
-ln -sf /usr/local/bin/python2.7 /usr/local/bin/python2
+pkg_add python # (select highest version, e.g. 3.5)
 ```
 
-The default C++ compiler that comes with OpenBSD 5.7 is g++ 4.2. This version is old (from 2007), and is not able to compile the current version of Bitcoin Core. It is possible to patch it up to compile, but with the planned transition to C++11 this is a losing battle. So here we will be installing a newer compiler.
+The default C++ compiler that comes with OpenBSD 5.9 is g++ 4.2. This version is old (from 2007), and is not able to compile the current version of Bitcoin Core, primarily as it has no C++11 support, but even before there were issues. So here we will be installing a newer compiler.
 
 GCC
 -------
@@ -27,7 +26,7 @@ GCC
 You can install a newer version of gcc with:
 
 ```bash
-pkg_add g++ # (select newest 4.x version, e.g. 4.9.2)
+pkg_add g++ # (select newest 4.x version, e.g. 4.9.3)
 ```
 
 This compiler will not overwrite the system compiler, it will be installed as `egcc` and `eg++` in `/usr/local/bin`.
@@ -49,18 +48,15 @@ BOOST_PREFIX="${BITCOIN_ROOT}/boost"
 mkdir -p $BOOST_PREFIX
 
 # Fetch the source and verify that it is not tampered with
-wget http://heanet.dl.sourceforge.net/project/boost/boost/1.59.0/boost_1_59_0.tar.bz2
-echo '727a932322d94287b62abb1bd2d41723eec4356a7728909e38adb65ca25241ca  boost_1_59_0.tar.bz2' | sha256 -c
-# MUST output: (SHA256) boost_1_59_0.tar.bz2: OK
-tar -xjf boost_1_59_0.tar.bz2
+curl -o boost_1_61_0.tar.bz2 http://heanet.dl.sourceforge.net/project/boost/boost/1.61.0/boost_1_61_0.tar.bz2
+echo 'a547bd06c2fd9a71ba1d169d9cf0339da7ebf4753849a8f7d6fdb8feee99b640  boost_1_61_0.tar.bz2' | sha256 -c
+# MUST output: (SHA256) boost_1_61_0.tar.bz2: OK
+tar -xjf boost_1_61_0.tar.bz2
 
-# Boost 1.59 needs two small patches for OpenBSD
-cd boost_1_59_0
+# Boost 1.61 needs one small patch for OpenBSD
+cd boost_1_61_0
 # Also here: https://gist.githubusercontent.com/laanwj/bf359281dc319b8ff2e1/raw/92250de8404b97bb99d72ab898f4a8cb35ae1ea3/patch-boost_test_impl_execution_monitor_ipp.patch
 patch -p0 < /usr/ports/devel/boost/patches/patch-boost_test_impl_execution_monitor_ipp
-# https://github.com/boostorg/filesystem/commit/90517e459681790a091566dce27ca3acabf9a70c
-sed 's/__OPEN_BSD__/__OpenBSD__/g' < libs/filesystem/src/path.cpp > libs/filesystem/src/path.cpp.tmp
-mv libs/filesystem/src/path.cpp.tmp libs/filesystem/src/path.cpp
 
 # Build w/ minimum configuration necessary for bitcoin
 echo 'using gcc : : eg++ : <cxxflags>"-fvisibility=hidden -fPIC" <linkflags>"" <archiver>"ar" <striper>"strip"  <ranlib>"ranlib" <rc>"" : ;' > user-config.jam
@@ -84,7 +80,7 @@ BDB_PREFIX="${BITCOIN_ROOT}/db4"
 mkdir -p $BDB_PREFIX
 
 # Fetch the source and verify that it is not tampered with
-wget 'http://download.oracle.com/berkeley-db/db-4.8.30.NC.tar.gz'
+curl -o db-4.8.30.NC.tar.gz 'http://download.oracle.com/berkeley-db/db-4.8.30.NC.tar.gz'
 echo '12edc0df75bf9abd7f82f821795bcee50f42cb2e5f76a6a281b85732798364ef  db-4.8.30.NC.tar.gz' | sha256 -c
 # MUST output: (SHA256) db-4.8.30.NC.tar.gz: OK
 tar -xzf db-4.8.30.NC.tar.gz
@@ -93,9 +89,25 @@ tar -xzf db-4.8.30.NC.tar.gz
 cd db-4.8.30.NC/build_unix/
 #  Note: Do a static build so that it can be embedded into the executable, instead of having to find a .so at runtime
 ../dist/configure --enable-cxx --disable-shared --with-pic --prefix=$BDB_PREFIX CC=egcc CXX=eg++ CPP=ecpp
-make install
+make install # do NOT use -jX, this is broken
 ```
 
+### Resource limits
+
+The standard ulimit restrictions in OpenBSD are very strict:
+
+    data(kbytes)         1572864
+
+This is, unfortunately, no longer enough to compile some `.cpp` files in the project,
+at least with gcc 4.9.3 (see issue https://github.com/bitcoin/bitcoin/issues/6658).
+If your user is in the `staff` group the limit can be raised with:
+
+    ulimit -d 3000000
+
+The change will only affect the current shell and processes spawned by it. To
+make the change system-wide, change `datasize-cur` and `datasize-max` in
+`/etc/login.conf`, and reboot.
+
 ### Building Bitcoin Core
 
 **Important**: use `gmake`, not `make`. The non-GNU `make` will exit with a horrible error.
@@ -123,7 +135,7 @@ To configure without wallet:
 
 Build and run the tests:
 ```bash
-gmake
+gmake # can use -jX here for parallelism
 gmake check
 ```
 

From fa994a7b8e8f2dbcbfb446e2fe2845866d4cd2cc Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Sun, 28 Aug 2016 17:01:52 +0200
Subject: [PATCH 0798/1802] contrib: Don't use shell=True

---
 contrib/devtools/fix-copyright-headers.py | 77 ++++++++++++++---------
 1 file changed, 49 insertions(+), 28 deletions(-)

diff --git a/contrib/devtools/fix-copyright-headers.py b/contrib/devtools/fix-copyright-headers.py
index 31a81ae4fadb5..54836bd83f592 100755
--- a/contrib/devtools/fix-copyright-headers.py
+++ b/contrib/devtools/fix-copyright-headers.py
@@ -1,5 +1,5 @@
-#!/usr/bin/env python
-'''
+#!/usr/bin/env python3
+"""
 Run this script to update all the copyright headers of files
 that were changed this year.
 
@@ -10,37 +10,58 @@
 it will change it to
 
 // Copyright (c) 2009-2015 The Bitcoin Core developers
-'''
-import os
+"""
+import subprocess
 import time
 import re
 
-year = time.gmtime()[0]
-CMD_GIT_DATE = 'git log --format=%%ad --date=short -1 %s | cut -d"-" -f 1'
-CMD_REGEX= "perl -pi -e 's/(20\d\d)(?:-20\d\d)? The Bitcoin/$1-%s The Bitcoin/' %s"
-REGEX_CURRENT= re.compile("%s The Bitcoin" % year)
-CMD_LIST_FILES= "find %s | grep %s"
+CMD_GIT_LIST_FILES = ['git', 'ls-files']
+CMD_GIT_DATE = ['git', 'log', '--format=%ad', '--date=short', '-1']
+CMD_PERL_REGEX = ['perl', '-pi', '-e']
+REGEX_TEMPLATE = 's/(20\\d\\d)(?:-20\\d\\d)? The Bitcoin/$1-%s The Bitcoin/'
 
-FOLDERS = ["./qa", "./src"]
+FOLDERS = ["qa/", "src/"]
 EXTENSIONS = [".cpp",".h", ".py"]
 
+
 def get_git_date(file_path):
-  r = os.popen(CMD_GIT_DATE % file_path)
-  for l in r:
-    # Result is one line, so just return
-    return l.replace("\n","")
-  return ""
-
-n=1
-for folder in FOLDERS:
-  for extension in EXTENSIONS:
-    for file_path in os.popen(CMD_LIST_FILES % (folder, extension)):
-      file_path = os.getcwd() + file_path[1:-1]
-      if file_path.endswith(extension):
-        git_date = get_git_date(file_path)
-        if str(year) == git_date:
-          # Only update if current year is not found
-          if REGEX_CURRENT.search(open(file_path, "r").read()) is None:
-            print n,"Last git edit", git_date, "-", file_path
-            os.popen(CMD_REGEX % (year,file_path))
+    d = subprocess.run(CMD_GIT_DATE + [file_path],
+                       stdout=subprocess.PIPE,
+                       check=True,
+                       universal_newlines=True).stdout
+    # yyyy-mm-dd
+    return d.split('-')[0]
+
+
+def skip_file(file_path):
+    for ext in EXTENSIONS:
+        if file_path.endswith(ext):
+            return False
+    else:
+        return True
+
+if __name__ == "__main__":
+    year = str(time.gmtime()[0])
+    regex_current = re.compile("%s The Bitcoin" % year)
+    n = 1
+    for folder in FOLDERS:
+        for file_path in subprocess.run(
+            CMD_GIT_LIST_FILES + [folder],
+            stdout=subprocess.PIPE,
+            check=True,
+            universal_newlines=True
+        ).stdout.split("\n"):
+            if skip_file(file_path):
+                # print(file_path, "(skip)")
+                continue
+            git_date = get_git_date(file_path)
+            if not year == git_date:
+                # print(file_path, year, "(skip)")
+                continue
+            if regex_current.search(open(file_path, "r").read()) is not None:
+                # already up to date
+                # print(file_path, year, "(skip)")
+                continue
+            print(n, file_path, "(update to %s)" % year)
+            subprocess.run(CMD_PERL_REGEX + [REGEX_TEMPLATE % year, file_path], check=True)
             n = n + 1

From b729fcdb84f819e72d6d2bc264c76328d171abd8 Mon Sep 17 00:00:00 2001
From: Luke Dashjr <luke-jr+git@utopios.org>
Date: Sat, 27 Aug 2016 20:17:25 +0000
Subject: [PATCH 0799/1802] Include instructions to extract Mac OS X SDK on
 Linux using 7zip and SleuthKit

---
 contrib/macdeploy/extract-osx-sdk.sh | 29 ++++++++++++++++++++++++++++
 doc/README_osx.md                    | 17 +++++++++++++++-
 2 files changed, 45 insertions(+), 1 deletion(-)
 create mode 100755 contrib/macdeploy/extract-osx-sdk.sh

diff --git a/contrib/macdeploy/extract-osx-sdk.sh b/contrib/macdeploy/extract-osx-sdk.sh
new file mode 100755
index 0000000000000..46d2d825d4523
--- /dev/null
+++ b/contrib/macdeploy/extract-osx-sdk.sh
@@ -0,0 +1,29 @@
+#!/bin/bash
+set -e
+
+INPUTFILE="Xcode_7.3.1.dmg"
+HFSFILENAME="5.hfs"
+SDKDIR="Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.11.sdk"
+
+7z x "${INPUTFILE}" "${HFSFILENAME}"
+SDKNAME="$(basename "${SDKDIR}")"
+SDKDIRINODE=$(ifind -n "${SDKDIR}" "${HFSFILENAME}")
+fls "${HFSFILENAME}" -rpF ${SDKDIRINODE} |
+ while read type inode filename; do
+	inode="${inode::-1}"
+	if [ "${filename:0:14}" = "usr/share/man/" ]; then
+		continue
+	fi
+	filename="${SDKNAME}/$filename"
+	echo "Extracting $filename ..."
+	mkdir -p "$(dirname "$filename")"
+	if [ "$type" = "l/l" ]; then
+		ln -s "$(icat "${HFSFILENAME}" $inode)" "$filename"
+	else
+		icat "${HFSFILENAME}" $inode >"$filename"
+	fi
+done
+echo "Building ${SDKNAME}.tar.gz ..."
+MTIME="$(istat "${HFSFILENAME}" "${SDKDIRINODE}" | perl -nle 'm/Content Modified:\s+(.*?)\s\(/ && print $1')"
+find "${SDKNAME}" | sort | tar --no-recursion --mtime="${MTIME}" --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > "${SDKNAME}.tar.gz"
+echo 'All done!'
diff --git a/doc/README_osx.md b/doc/README_osx.md
index aed3cd97e1ecd..e934b4fc54a04 100644
--- a/doc/README_osx.md
+++ b/doc/README_osx.md
@@ -36,11 +36,26 @@ Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.1
 ```
 
 Unfortunately, the usual linux tools (7zip, hpmount, loopback mount) are incapable of opening this file.
-To create a tarball suitable for Gitian input, mount the dmg in OS X, then create it with:
+To create a tarball suitable for Gitian input, there are two options:
+
+Using Mac OS X, you can mount the dmg, and then create it with:
 ```
+  $ hdiutil attach Xcode_7.3.1.dmg
   $ tar -C /Volumes/Xcode/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/ -czf MacOSX10.11.sdk.tar.gz MacOSX10.11.sdk
 ```
 
+Alternatively, you can use 7zip and SleuthKit to extract the files one by one.
+The script contrib/macdeploy/extract-osx-sdk.sh automates this. First ensure
+the dmg file is in the current directory, and then run the script. You may wish
+to delete the intermediate 5.hfs file and MacOSX10.11.sdk (the directory) when
+you've confirmed the extraction succeeded.
+
+```bash
+apt-get install p7zip-full sleuthkit
+contrib/macdeploy/extract-osx-sdk.sh
+rm -rf 5.hfs MacOSX10.11.sdk
+```
+
 The Gitian descriptors build 2 sets of files: Linux tools, then Apple binaries
 which are created using these tools. The build process has been designed to
 avoid including the SDK's files in Gitian's outputs. All interim tarballs are

From fae6bb85cf71056aa2541d9bc5cce26946a56945 Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Mon, 29 Aug 2016 10:33:36 +0200
Subject: [PATCH 0800/1802] [doc] build: Mention curl

---
 doc/build-unix.md    | 5 +++--
 doc/build-windows.md | 6 ++++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/doc/build-unix.md b/doc/build-unix.md
index bd89978cc2a74..62e3e793e97f3 100644
--- a/doc/build-unix.md
+++ b/doc/build-unix.md
@@ -293,9 +293,10 @@ These steps can be performed on, for example, an Ubuntu VM. The depends system
 will also work on other Linux distributions, however the commands for
 installing the toolchain will be different.
 
-First install the toolchain:
+Make sure you install the build requirements mentioned above.
+Then, install the toolchain and curl:
 
-    sudo apt-get install g++-arm-linux-gnueabihf
+    sudo apt-get install g++-arm-linux-gnueabihf curl
 
 To build executables for ARM:
 
diff --git a/doc/build-windows.md b/doc/build-windows.md
index 2b9233d1e1406..129774491b2ff 100644
--- a/doc/build-windows.md
+++ b/doc/build-windows.md
@@ -16,9 +16,11 @@ These steps can be performed on, for example, an Ubuntu VM. The depends system
 will also work on other Linux distributions, however the commands for
 installing the toolchain will be different.
 
-First install the toolchains:
+Make sure you install the build requirements mentioned in
+[build-unix.md](/doc/build-unix.md).
+Then, install the toolchains and curl:
 
-    sudo apt-get install g++-mingw-w64-i686 mingw-w64-i686-dev g++-mingw-w64-x86-64 mingw-w64-x86-64-dev
+    sudo apt-get install g++-mingw-w64-i686 mingw-w64-i686-dev g++-mingw-w64-x86-64 mingw-w64-x86-64-dev curl
 
 To build executables for Windows 32-bit:
 

From 14675610245e951f2b922a0eaad6eb7d011ae87e Mon Sep 17 00:00:00 2001
From: isle2983 <isle2983@yahoo.com>
Date: Mon, 29 Aug 2016 21:01:38 -0600
Subject: [PATCH 0801/1802] [doc] - clarify statement about parallel jobs in
 rpc-tests.py

---
 qa/README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/qa/README.md b/qa/README.md
index 723660c6c857e..225207cc1cebf 100644
--- a/qa/README.md
+++ b/qa/README.md
@@ -41,8 +41,8 @@ Run all possible tests with
 
     qa/pull-tester/rpc-tests.py -extended
 
-By default, tests will be run in parallel if you want to specify how many
-tests should be run in parallel, append `-parallel=n` (default n=4).
+By default, tests will be run in parallel. To specify how many jobs to run,
+append `-parallel=n` (default n=4).
 
 If you want to create a basic coverage report for the rpc test suite, append `--coverage`.
 

From 323a5fe06af43d3922a435e696d6c52acc6fade1 Mon Sep 17 00:00:00 2001
From: Alexey Vesnin <serxis@gmail.com>
Date: Tue, 30 Aug 2016 09:00:55 +0300
Subject: [PATCH 0802/1802] Berkeley DB v6 compatibility fix
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes building error looking like this:
CXX wallet/libbitcoin_wallet_a-db.o
wallet/db.cpp: In member function ‘void CDBEnv::EnvShutdown()’:
wallet/db.cpp:46:16: error: call of overloaded ‘DbEnv(int)’ is ambiguous
DbEnv(0).remove(strPath.c_str(), 0);
^
wallet/db.cpp:46:16: note: candidates are:
In file included from wallet/db.h:21:0,
from wallet/db.cpp:6:
/usr/include/db_cxx.h:916:2: note: DbEnv::DbEnv(const DbEnv&)
DbEnv(const DbEnv &);
^
/usr/include/db_cxx.h:518:2: note: DbEnv::DbEnv(DB_ENV)
DbEnv(DB_ENV *dbenv);
^
/usr/include/db_cxx.h:516:2: note: DbEnv::DbEnv(u_int32_t)
DbEnv(u_int32_t flags);
^
Makefile:5780: recipe for target 'wallet/libbitcoin_wallet_a-db.o' failed
make[2]: ** [wallet/libbitcoin_wallet_a-db.o] Error 1
---
 src/wallet/db.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/wallet/db.cpp b/src/wallet/db.cpp
index 652bbebded844..ab7a4cf2e5f13 100644
--- a/src/wallet/db.cpp
+++ b/src/wallet/db.cpp
@@ -43,7 +43,7 @@ void CDBEnv::EnvShutdown()
     if (ret != 0)
         LogPrintf("CDBEnv::EnvShutdown: Error %d shutting down database environment: %s\n", ret, DbEnv::strerror(ret));
     if (!fMockDb)
-        DbEnv(0).remove(strPath.c_str(), 0);
+        DbEnv((u_int32_t)0).remove(strPath.c_str(), 0);
 }
 
 void CDBEnv::Reset()

From 482f852da65457eb2fbea6b259e7568133fb81c4 Mon Sep 17 00:00:00 2001
From: Johnson Lau <jl2012@xbt.hk>
Date: Wed, 31 Aug 2016 19:38:23 +0800
Subject: [PATCH 0803/1802] Implement NULLDUMMY softfork

---
 qa/pull-tester/rpc-tests.py |   1 +
 qa/rpc-tests/nulldummy.py   | 148 ++++++++++++++++++++++++++++++++++++
 src/main.cpp                |   1 +
 3 files changed, 150 insertions(+)
 create mode 100755 qa/rpc-tests/nulldummy.py

diff --git a/qa/pull-tester/rpc-tests.py b/qa/pull-tester/rpc-tests.py
index 92cce6aadde0b..cf951fe175a2b 100755
--- a/qa/pull-tester/rpc-tests.py
+++ b/qa/pull-tester/rpc-tests.py
@@ -143,6 +143,7 @@
     'importprunedfunds.py',
     'signmessages.py',
     'p2p-compactblocks.py',
+    'nulldummy.py',
 ]
 if ENABLE_ZMQ:
     testScripts.append('zmq_test.py')
diff --git a/qa/rpc-tests/nulldummy.py b/qa/rpc-tests/nulldummy.py
new file mode 100755
index 0000000000000..eaed7a8c78970
--- /dev/null
+++ b/qa/rpc-tests/nulldummy.py
@@ -0,0 +1,148 @@
+#!/usr/bin/env python3
+# Copyright (c) 2016 The Bitcoin Core developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+from test_framework.test_framework import ComparisonTestFramework
+from test_framework.util import *
+from test_framework.mininode import CTransaction, NetworkThread
+from test_framework.blocktools import create_coinbase, create_block, add_witness_commitment
+from test_framework.comptool import TestManager
+from test_framework.script import CScript
+from io import BytesIO
+import time
+
+NULLDUMMY_ERROR = "64: non-mandatory-script-verify-flag (Dummy CHECKMULTISIG argument must be zero)"
+
+def trueDummy(tx):
+    scriptSig = CScript(tx.vin[0].scriptSig)
+    newscript = []
+    for i in scriptSig:
+        if (len(newscript) == 0):
+            assert(len(i) == 0)
+            newscript.append(b'\x51')
+        else:
+            newscript.append(i)
+    tx.vin[0].scriptSig = CScript(newscript)
+    tx.rehash()
+
+'''
+This test is meant to exercise NULLDUMMY softfork.
+Connect to a single node.
+Generate 2 blocks (save the coinbases for later).
+Generate 427 more blocks.
+[Policy/Consensus] Check that NULLDUMMY compliant transactions are accepted in the 430th block.
+[Policy] Check that non-NULLDUMMY transactions are rejected before activation.
+[Consensus] Check that the new NULLDUMMY rules are not enforced on the 431st block.
+[Policy/Consensus] Check that the new NULLDUMMY rules are enforced on the 432nd block.
+'''
+
+class NULLDUMMYTest(ComparisonTestFramework):
+
+    def __init__(self):
+        super().__init__()
+        self.num_nodes = 1
+
+    def setup_network(self):
+        # Must set the blockversion for this test
+        self.nodes = start_nodes(self.num_nodes, self.options.tmpdir,
+                                 extra_args=[['-debug', '-whitelist=127.0.0.1', '-walletprematurewitness']])
+
+    def run_test(self):
+        self.address = self.nodes[0].getnewaddress()
+        self.ms_address = self.nodes[0].addmultisigaddress(1,[self.address])
+        self.wit_address = self.nodes[0].addwitnessaddress(self.address)
+        self.wit_ms_address = self.nodes[0].addwitnessaddress(self.ms_address)
+
+        test = TestManager(self, self.options.tmpdir)
+        test.add_all_connections(self.nodes)
+        NetworkThread().start() # Start up network handling in another thread
+        self.coinbase_blocks = self.nodes[0].generate(2) # Block 2
+        coinbase_txid = []
+        for i in self.coinbase_blocks:
+            coinbase_txid.append(self.nodes[0].getblock(i)['tx'][0])
+        self.nodes[0].generate(427) # Block 429
+        self.lastblockhash = self.nodes[0].getbestblockhash()
+        self.tip = int("0x" + self.lastblockhash, 0)
+        self.lastblockheight = 429
+        self.lastblocktime = int(time.time()) + 429
+
+        print ("Test 1: NULLDUMMY compliant base transactions should be accepted to mempool and mined before activation [430]")
+        test1txs = [self.create_transaction(self.nodes[0], coinbase_txid[0], self.ms_address, 49)]
+        txid1 = self.tx_submit(self.nodes[0], test1txs[0])
+        test1txs.append(self.create_transaction(self.nodes[0], txid1, self.ms_address, 48))
+        txid2 = self.tx_submit(self.nodes[0], test1txs[1])
+        test1txs.append(self.create_transaction(self.nodes[0], coinbase_txid[1], self.wit_ms_address, 49))
+        txid3 = self.tx_submit(self.nodes[0], test1txs[2])
+        self.block_submit(self.nodes[0], test1txs, False, True)
+
+        print ("Test 2: Non-NULLDUMMY base multisig transaction should not be accepted to mempool before activation")
+        test2tx = self.create_transaction(self.nodes[0], txid2, self.ms_address, 48)
+        trueDummy(test2tx)
+        txid4 = self.tx_submit(self.nodes[0], test2tx, NULLDUMMY_ERROR)
+
+        print ("Test 3: Non-NULLDUMMY base transactions should be accepted in a block before activation [431]")
+        self.block_submit(self.nodes[0], [test2tx], False, True)
+
+        print ("Test 4: Non-NULLDUMMY base multisig transaction is invalid after activation")
+        test4tx = self.create_transaction(self.nodes[0], txid4, self.address, 47)
+        test6txs=[CTransaction(test4tx)]
+        trueDummy(test4tx)
+        self.tx_submit(self.nodes[0], test4tx, NULLDUMMY_ERROR)
+        self.block_submit(self.nodes[0], [test4tx])
+
+        print ("Test 5: Non-NULLDUMMY P2WSH multisig transaction invalid after activation")
+        test5tx = self.create_transaction(self.nodes[0], txid3, self.wit_address, 48)
+        test6txs.append(CTransaction(test5tx))
+        test5tx.wit.vtxinwit[0].scriptWitness.stack[0] = b'\x01'
+        self.tx_submit(self.nodes[0], test5tx, NULLDUMMY_ERROR)
+        self.block_submit(self.nodes[0], [test5tx], True)
+
+        print ("Test 6: NULLDUMMY compliant base/witness transactions should be accepted to mempool and in block after activation [432]")
+        for i in test6txs:
+            self.tx_submit(self.nodes[0], i)
+        self.block_submit(self.nodes[0], test6txs, True, True)
+
+
+    def create_transaction(self, node, txid, to_address, amount):
+        inputs = [{ "txid" : txid, "vout" : 0}]
+        outputs = { to_address : amount }
+        rawtx = node.createrawtransaction(inputs, outputs)
+        signresult = node.signrawtransaction(rawtx)
+        tx = CTransaction()
+        f = BytesIO(hex_str_to_bytes(signresult['hex']))
+        tx.deserialize(f)
+        return tx
+
+
+    def tx_submit(self, node, tx, msg = ""):
+        tx.rehash()
+        try:
+            node.sendrawtransaction(bytes_to_hex_str(tx.serialize_with_witness()), True)
+        except JSONRPCException as exp:
+            assert_equal(exp.error["message"], msg)
+        return tx.hash
+
+
+    def block_submit(self, node, txs, witness = False, accept = False):
+        block = create_block(self.tip, create_coinbase(self.lastblockheight + 1), self.lastblocktime + 1)
+        block.nVersion = 4
+        for tx in txs:
+            tx.rehash()
+            block.vtx.append(tx)
+        block.hashMerkleRoot = block.calc_merkle_root()
+        witness and add_witness_commitment(block)
+        block.rehash()
+        block.solve()
+        node.submitblock(bytes_to_hex_str(block.serialize(True)))
+        if (accept):
+            assert_equal(node.getbestblockhash(), block.hash)
+            self.tip = block.sha256
+            self.lastblockhash = block.hash
+            self.lastblocktime += 1
+            self.lastblockheight += 1
+        else:
+            assert_equal(node.getbestblockhash(), self.lastblockhash)
+
+if __name__ == '__main__':
+    NULLDUMMYTest().main()
\ No newline at end of file
diff --git a/src/main.cpp b/src/main.cpp
index 5160e60750d08..7eb7194a3f096 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -2387,6 +2387,7 @@ bool ConnectBlock(const CBlock& block, CValidationState& state, CBlockIndex* pin
     // Start enforcing WITNESS rules using versionbits logic.
     if (IsWitnessEnabled(pindex->pprev, chainparams.GetConsensus())) {
         flags |= SCRIPT_VERIFY_WITNESS;
+        flags |= SCRIPT_VERIFY_NULLDUMMY;
     }
 
     int64_t nTime2 = GetTimeMicros(); nTimeForks += nTime2 - nTime1;

From b175cb755bd2b62a19dbf27daf07ae5354f9a079 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pavel=20Jan=C3=ADk?= <Pavel@Janik.cz>
Date: Sat, 11 Jun 2016 16:35:19 +0200
Subject: [PATCH 0804/1802] Do not shadow variables.

---
 src/wallet/db.cpp                |  6 +++---
 src/wallet/rpcwallet.cpp         | 12 ++++++------
 src/wallet/test/wallet_tests.cpp |  6 +++---
 src/wallet/walletdb.cpp          |  6 +++---
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/wallet/db.cpp b/src/wallet/db.cpp
index ab7a4cf2e5f13..a809c9ad64015 100644
--- a/src/wallet/db.cpp
+++ b/src/wallet/db.cpp
@@ -387,11 +387,11 @@ bool CDB::Rewrite(const string& strFile, const char* pszSkip)
                         while (fSuccess) {
                             CDataStream ssKey(SER_DISK, CLIENT_VERSION);
                             CDataStream ssValue(SER_DISK, CLIENT_VERSION);
-                            int ret = db.ReadAtCursor(pcursor, ssKey, ssValue);
-                            if (ret == DB_NOTFOUND) {
+                            int ret1 = db.ReadAtCursor(pcursor, ssKey, ssValue);
+                            if (ret1 == DB_NOTFOUND) {
                                 pcursor->close();
                                 break;
-                            } else if (ret != 0) {
+                            } else if (ret1 != 0) {
                                 pcursor->close();
                                 fSuccess = false;
                                 break;
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index 9629ec1db6f59..0ba6706baf830 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -1176,10 +1176,10 @@ UniValue ListReceived(const UniValue& params, bool fByAccounts)
 
         if (fByAccounts)
         {
-            tallyitem& item = mapAccountTally[strAccount];
-            item.nAmount += nAmount;
-            item.nConf = min(item.nConf, nConf);
-            item.fIsWatchonly = fIsWatchonly;
+            tallyitem& _item = mapAccountTally[strAccount];
+            _item.nAmount += nAmount;
+            _item.nConf = min(_item.nConf, nConf);
+            _item.fIsWatchonly = fIsWatchonly;
         }
         else
         {
@@ -1195,9 +1195,9 @@ UniValue ListReceived(const UniValue& params, bool fByAccounts)
             UniValue transactions(UniValue::VARR);
             if (it != mapTally.end())
             {
-                BOOST_FOREACH(const uint256& item, (*it).second.txids)
+                BOOST_FOREACH(const uint256& _item, (*it).second.txids)
                 {
-                    transactions.push_back(item.GetHex());
+                    transactions.push_back(_item.GetHex());
                 }
             }
             obj.push_back(Pair("txids", transactions));
diff --git a/src/wallet/test/wallet_tests.cpp b/src/wallet/test/wallet_tests.cpp
index c6c5058984c00..acf980c784561 100644
--- a/src/wallet/test/wallet_tests.cpp
+++ b/src/wallet/test/wallet_tests.cpp
@@ -217,7 +217,7 @@ BOOST_AUTO_TEST_CASE(coin_selection_tests)
         // run the 'mtgox' test (see http://blockexplorer.com/tx/29a3efd3ef04f9153d47a990bd7b048a4b2d213daaa5fb8ed670fb85f13bdbcf)
         // they tried to consolidate 10 50k coins into one 500k coin, and ended up with 50k in change
         empty_wallet();
-        for (int i = 0; i < 20; i++)
+        for (int j = 0; j < 20; j++)
             add_coin(50000 * COIN);
 
         BOOST_CHECK( wallet.SelectCoinsMinConf(500000 * COIN, 1, 1, vCoins, setCoinsRet, nValueRet));
@@ -296,7 +296,7 @@ BOOST_AUTO_TEST_CASE(coin_selection_tests)
             BOOST_CHECK(!equal_sets(setCoinsRet, setCoinsRet2));
 
             int fails = 0;
-            for (int i = 0; i < RANDOM_REPEATS; i++)
+            for (int j = 0; j < RANDOM_REPEATS; j++)
             {
                 // selecting 1 from 100 identical coins depends on the shuffle; this test will fail 1% of the time
                 // run the test RANDOM_REPEATS times and only complain if all of them fail
@@ -317,7 +317,7 @@ BOOST_AUTO_TEST_CASE(coin_selection_tests)
             add_coin(25 * CENT);
 
             fails = 0;
-            for (int i = 0; i < RANDOM_REPEATS; i++)
+            for (int j = 0; j < RANDOM_REPEATS; j++)
             {
                 // selecting 1 from 100 identical coins depends on the shuffle; this test will fail 1% of the time
                 // run the test RANDOM_REPEATS times and only complain if all of them fail
diff --git a/src/wallet/walletdb.cpp b/src/wallet/walletdb.cpp
index 9de0671ea2164..e9b7addef8752 100644
--- a/src/wallet/walletdb.cpp
+++ b/src/wallet/walletdb.cpp
@@ -887,8 +887,8 @@ void ThreadFlushWalletDB(const string& strFile)
                 if (nRefCount == 0)
                 {
                     boost::this_thread::interruption_point();
-                    map<string, int>::iterator mi = bitdb.mapFileUseCount.find(strFile);
-                    if (mi != bitdb.mapFileUseCount.end())
+                    map<string, int>::iterator _mi = bitdb.mapFileUseCount.find(strFile);
+                    if (_mi != bitdb.mapFileUseCount.end())
                     {
                         LogPrint("db", "Flushing %s\n", strFile);
                         nLastFlushed = nWalletDBUpdated;
@@ -898,7 +898,7 @@ void ThreadFlushWalletDB(const string& strFile)
                         bitdb.CloseDb(strFile);
                         bitdb.CheckpointLSN(strFile);
 
-                        bitdb.mapFileUseCount.erase(mi++);
+                        bitdb.mapFileUseCount.erase(_mi++);
                         LogPrint("db", "Flushed %s %dms\n", strFile, GetTimeMillis() - nStart);
                     }
                 }

From 3e7d2a24cf1a4820941dd09a4e18f2683bed2c0c Mon Sep 17 00:00:00 2001
From: Michael Ford <fanquake@users.noreply.github.com>
Date: Thu, 1 Sep 2016 08:23:33 +0800
Subject: [PATCH 0805/1802] [depends] Remove Qt46 package

---
 depends/packages/qt46.mk | 66 ----------------------------------------
 1 file changed, 66 deletions(-)
 delete mode 100644 depends/packages/qt46.mk

diff --git a/depends/packages/qt46.mk b/depends/packages/qt46.mk
deleted file mode 100644
index 8fb30a5c4471c..0000000000000
--- a/depends/packages/qt46.mk
+++ /dev/null
@@ -1,66 +0,0 @@
-PACKAGE=qt46
-$(package)_version=4.6.4
-$(package)_download_path=http://download.qt-project.org/archive/qt/4.6/
-$(package)_file_name=qt-everywhere-opensource-src-$($(package)_version).tar.gz
-$(package)_sha256_hash=9ad4d46c721b53a429ed5a2eecfd3c239a9ab566562f183f99d3125f1a234250
-$(package)_dependencies=openssl freetype dbus libX11 xproto libXext libICE libSM
-$(package)_patches=stlfix.patch 
-
-define $(package)_set_vars
-$(package)_config_opts  = -prefix $(host_prefix) -headerdir $(host_prefix)/include/qt4 -bindir $(build_prefix)/bin
-$(package)_config_opts += -release -no-separate-debug-info -opensource -confirm-license
-$(package)_config_opts += -stl -qt-zlib
-
-$(package)_config_opts += -nomake examples -nomake tests -nomake tools -nomake translations -nomake demos -nomake docs
-$(package)_config_opts += -no-audio-backend -no-glib -no-nis -no-cups -no-iconv -no-gif -no-pch
-$(package)_config_opts += -no-xkb -no-xrender -no-xrandr -no-xfixes -no-xcursor -no-xinerama -no-xsync -no-xinput -no-mitshm -no-xshape
-$(package)_config_opts += -no-libtiff -no-fontconfig -openssl-linked
-$(package)_config_opts += -no-sql-db2 -no-sql-ibase -no-sql-oci -no-sql-tds -no-sql-mysql
-$(package)_config_opts += -no-sql-odbc -no-sql-psql -no-sql-sqlite -no-sql-sqlite2
-$(package)_config_opts += -no-xmlpatterns -no-multimedia -no-phonon -no-scripttools -no-declarative
-$(package)_config_opts += -no-phonon-backend -no-webkit -no-javascript-jit -no-script
-$(package)_config_opts += -no-svg -no-libjpeg -no-libtiff -no-libpng -no-libmng -no-qt3support -no-opengl
-
-$(package)_config_opts_x86_64_linux  += -platform linux-g++-64
-$(package)_config_opts_i686_linux  = -platform linux-g++-32
-$(package)_build_env  = QT_RCC_TEST=1
-endef
-
-define $(package)_preprocess_cmds
-   sed -i.old "s|/include /usr/include||" config.tests/unix/freetype/freetype.pri && \
-   sed -i.old "s|src_plugins.depends = src_gui src_sql src_svg|src_plugins.depends = src_gui src_sql|" src/src.pro && \
-   sed -i.old "s|\.lower(|\.toLower(|g" src/network/ssl/qsslsocket_openssl.cpp && \
-   sed -i.old "s|Key_BackSpace|Key_Backspace|" src/gui/itemviews/qabstractitemview.cpp && \
-   sed -i.old "s|/usr/X11R6/lib64|$(host_prefix)/lib|" mkspecs/*/*.conf && \
-   sed -i.old "s|/usr/X11R6/lib|$(host_prefix)/lib|" mkspecs/*/*.conf && \
-   sed -i.old "s|/usr/X11R6/include|$(host_prefix)/include|" mkspecs/*/*.conf && \
-   sed -i.old "s|QMAKE_LFLAGS_SHLIB\t+= -shared|QMAKE_LFLAGS_SHLIB\t+= -shared -Wl,--exclude-libs,ALL|" mkspecs/common/g++.conf && \
-   sed -i.old "/SSLv2_client_method/d" src/network/ssl/qsslsocket_openssl.cpp src/network/ssl/qsslsocket_openssl_symbols.cpp && \
-   sed -i.old "/SSLv2_server_method/d" src/network/ssl/qsslsocket_openssl.cpp src/network/ssl/qsslsocket_openssl_symbols.cpp && \
-   patch -p1 < $($(package)_patch_dir)/stlfix.patch 
-endef
-
-define $(package)_config_cmds
-  export PKG_CONFIG_SYSROOT_DIR=/ && \
-  export PKG_CONFIG_LIBDIR=$(host_prefix)/lib/pkgconfig && \
-  export PKG_CONFIG_PATH=$(host_prefix)/share/pkgconfig  && \
-  export CPATH=$(host_prefix)/include && \
-  OPENSSL_LIBS='-L$(host_prefix)/lib -lssl -lcrypto' ./configure $($(package)_config_opts) && \
-  cd tools/linguist/lrelease; ../../../bin/qmake  -o Makefile lrelease.pro
-endef
-
-define $(package)_build_cmds
-  export CPATH=$(host_prefix)/include && \
-  $(MAKE) -C src && \
-  $(MAKE) -C tools/linguist/lrelease
-endef
-
-define $(package)_stage_cmds
-  $(MAKE) -C src INSTALL_ROOT=$($(package)_staging_dir) install && \
-  $(MAKE) -C tools/linguist/lrelease INSTALL_ROOT=$($(package)_staging_dir) install
-endef
-
-define $(package)_postprocess_cmds
-  rm -rf mkspecs/ lib/cmake/ lib/*.prl lib/*.la && \
-  find native/bin -type f -exec mv {} {}-qt4 \;
-endef

From f012a857f5e9b3bdd11a64dd0c16b4c805076594 Mon Sep 17 00:00:00 2001
From: djpnewton <djpnewton@gmail.com>
Date: Thu, 1 Sep 2016 11:52:47 +1200
Subject: [PATCH 0806/1802] rest.cpp: change HTTP_INTERNAL_SERVER_ERROR to
 HTTP_BAD_REQUEST

---
 doc/release-notes.md |  4 ++++
 qa/rpc-tests/rest.py | 10 +++++-----
 src/rest.cpp         | 14 +++++++-------
 3 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/doc/release-notes.md b/doc/release-notes.md
index 0be192233d5ea..f2d8ca3a1517b 100644
--- a/doc/release-notes.md
+++ b/doc/release-notes.md
@@ -59,6 +59,10 @@ git merge commit are mentioned.
 
 ### RPC and REST
 
+UTXO set query (`GET /rest/getutxos/<checkmempool>/<txid>-<n>/<txid>-<n>/.../<txid>-<n>.<bin|hex|json>`) responses
+were changed to return status code HTTP_BAD_REQUEST (400) instead of HTTP_INTERNAL_SERVER_ERROR (500) when requests
+contain invalid parameters.
+
 ### Configuration and command-line options
 
 ### Block and transaction handling
diff --git a/qa/rpc-tests/rest.py b/qa/rpc-tests/rest.py
index c9c2eaf7f37b9..b769cd71f2050 100755
--- a/qa/rpc-tests/rest.py
+++ b/qa/rpc-tests/rest.py
@@ -179,14 +179,14 @@ def run_test(self):
         #do some invalid requests
         json_request = '{"checkmempool'
         response = http_post_call(url.hostname, url.port, '/rest/getutxos'+self.FORMAT_SEPARATOR+'json', json_request, True)
-        assert_equal(response.status, 500) #must be a 500 because we send a invalid json request
+        assert_equal(response.status, 400) #must be a 400 because we send a invalid json request
 
         json_request = '{"checkmempool'
         response = http_post_call(url.hostname, url.port, '/rest/getutxos'+self.FORMAT_SEPARATOR+'bin', json_request, True)
-        assert_equal(response.status, 500) #must be a 500 because we send a invalid bin request
+        assert_equal(response.status, 400) #must be a 400 because we send a invalid bin request
 
         response = http_post_call(url.hostname, url.port, '/rest/getutxos/checkmempool'+self.FORMAT_SEPARATOR+'bin', '', True)
-        assert_equal(response.status, 500) #must be a 500 because we send a invalid bin request
+        assert_equal(response.status, 400) #must be a 400 because we send a invalid bin request
 
         #test limits
         json_request = '/checkmempool/'
@@ -194,14 +194,14 @@ def run_test(self):
             json_request += txid+'-'+str(n)+'/'
         json_request = json_request.rstrip("/")
         response = http_post_call(url.hostname, url.port, '/rest/getutxos'+json_request+self.FORMAT_SEPARATOR+'json', '', True)
-        assert_equal(response.status, 500) #must be a 500 because we exceeding the limits
+        assert_equal(response.status, 400) #must be a 400 because we exceeding the limits
 
         json_request = '/checkmempool/'
         for x in range(0, 15):
             json_request += txid+'-'+str(n)+'/'
         json_request = json_request.rstrip("/")
         response = http_post_call(url.hostname, url.port, '/rest/getutxos'+json_request+self.FORMAT_SEPARATOR+'json', '', True)
-        assert_equal(response.status, 200) #must be a 500 because we exceeding the limits
+        assert_equal(response.status, 200) #must be a 200 because we are within the limits
 
         self.nodes[0].generate(1) #generate block to not affect upcoming tests
         self.sync_all()
diff --git a/src/rest.cpp b/src/rest.cpp
index 2dff8d7daddfc..c81559212419f 100644
--- a/src/rest.cpp
+++ b/src/rest.cpp
@@ -420,7 +420,7 @@ static bool rest_getutxos(HTTPRequest* req, const std::string& strURIPart)
     // throw exception in case of a empty request
     std::string strRequestMutable = req->ReadBody();
     if (strRequestMutable.length() == 0 && uriParts.size() == 0)
-        return RESTERR(req, HTTP_INTERNAL_SERVER_ERROR, "Error: empty request");
+        return RESTERR(req, HTTP_BAD_REQUEST, "Error: empty request");
 
     bool fInputParsed = false;
     bool fCheckMemPool = false;
@@ -444,7 +444,7 @@ static bool rest_getutxos(HTTPRequest* req, const std::string& strURIPart)
             std::string strOutput = uriParts[i].substr(uriParts[i].find("-")+1);
 
             if (!ParseInt32(strOutput, &nOutput) || !IsHex(strTxid))
-                return RESTERR(req, HTTP_INTERNAL_SERVER_ERROR, "Parse error");
+                return RESTERR(req, HTTP_BAD_REQUEST, "Parse error");
 
             txid.SetHex(strTxid);
             vOutPoints.push_back(COutPoint(txid, (uint32_t)nOutput));
@@ -453,7 +453,7 @@ static bool rest_getutxos(HTTPRequest* req, const std::string& strURIPart)
         if (vOutPoints.size() > 0)
             fInputParsed = true;
         else
-            return RESTERR(req, HTTP_INTERNAL_SERVER_ERROR, "Error: empty request");
+            return RESTERR(req, HTTP_BAD_REQUEST, "Error: empty request");
     }
 
     switch (rf) {
@@ -469,7 +469,7 @@ static bool rest_getutxos(HTTPRequest* req, const std::string& strURIPart)
             if (strRequestMutable.size() > 0)
             {
                 if (fInputParsed) //don't allow sending input over URI and HTTP RAW DATA
-                    return RESTERR(req, HTTP_INTERNAL_SERVER_ERROR, "Combination of URI scheme inputs and raw post data is not allowed");
+                    return RESTERR(req, HTTP_BAD_REQUEST, "Combination of URI scheme inputs and raw post data is not allowed");
 
                 CDataStream oss(SER_NETWORK, PROTOCOL_VERSION);
                 oss << strRequestMutable;
@@ -478,14 +478,14 @@ static bool rest_getutxos(HTTPRequest* req, const std::string& strURIPart)
             }
         } catch (const std::ios_base::failure& e) {
             // abort in case of unreadable binary data
-            return RESTERR(req, HTTP_INTERNAL_SERVER_ERROR, "Parse error");
+            return RESTERR(req, HTTP_BAD_REQUEST, "Parse error");
         }
         break;
     }
 
     case RF_JSON: {
         if (!fInputParsed)
-            return RESTERR(req, HTTP_INTERNAL_SERVER_ERROR, "Error: empty request");
+            return RESTERR(req, HTTP_BAD_REQUEST, "Error: empty request");
         break;
     }
     default: {
@@ -495,7 +495,7 @@ static bool rest_getutxos(HTTPRequest* req, const std::string& strURIPart)
 
     // limit max outpoints
     if (vOutPoints.size() > MAX_GETUTXOS_OUTPOINTS)
-        return RESTERR(req, HTTP_INTERNAL_SERVER_ERROR, strprintf("Error: max outpoints exceeded (max: %d, tried: %d)", MAX_GETUTXOS_OUTPOINTS, vOutPoints.size()));
+        return RESTERR(req, HTTP_BAD_REQUEST, strprintf("Error: max outpoints exceeded (max: %d, tried: %d)", MAX_GETUTXOS_OUTPOINTS, vOutPoints.size()));
 
     // check spentness and form a bitmap (as well as a JSON capable human-readable string representation)
     vector<unsigned char> bitmap;

From 854f1af22e930cbe37195a5e9ad7dd7b878a9106 Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Sun, 26 Jun 2016 20:32:37 +0200
Subject: [PATCH 0807/1802] Make the dummy argument to getaddednodeinfo
 optional

---
 doc/release-notes.md |  2 ++
 src/rpc/client.cpp   |  1 -
 src/rpc/net.cpp      | 11 +++++------
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/doc/release-notes.md b/doc/release-notes.md
index f2d8ca3a1517b..58994a6839415 100644
--- a/doc/release-notes.md
+++ b/doc/release-notes.md
@@ -63,6 +63,8 @@ UTXO set query (`GET /rest/getutxos/<checkmempool>/<txid>-<n>/<txid>-<n>/.../<tx
 were changed to return status code HTTP_BAD_REQUEST (400) instead of HTTP_INTERNAL_SERVER_ERROR (500) when requests
 contain invalid parameters.
 
+The first boolean argument to `getaddednodeinfo` has been removed. This is an incompatible change.
+
 ### Configuration and command-line options
 
 ### Block and transaction handling
diff --git a/src/rpc/client.cpp b/src/rpc/client.cpp
index d0675fdb49506..3003ea34528ae 100644
--- a/src/rpc/client.cpp
+++ b/src/rpc/client.cpp
@@ -26,7 +26,6 @@ static const CRPCConvertParam vRPCConvertParams[] =
 {
     { "stop", 0 },
     { "setmocktime", 0 },
-    { "getaddednodeinfo", 0 },
     { "generate", 0 },
     { "generate", 1 },
     { "generatetoaddress", 0 },
diff --git a/src/rpc/net.cpp b/src/rpc/net.cpp
index 88da77cb42c24..840bfd5a2424b 100644
--- a/src/rpc/net.cpp
+++ b/src/rpc/net.cpp
@@ -269,14 +269,13 @@ UniValue disconnectnode(const UniValue& params, bool fHelp)
 
 UniValue getaddednodeinfo(const UniValue& params, bool fHelp)
 {
-    if (fHelp || params.size() < 1 || params.size() > 2)
+    if (fHelp || params.size() > 1)
         throw runtime_error(
-            "getaddednodeinfo dummy ( \"node\" )\n"
+            "getaddednodeinfo ( \"node\" )\n"
             "\nReturns information about the given added node, or all added nodes\n"
             "(note that onetry addnodes are not listed here)\n"
             "\nArguments:\n"
-            "1. dummy      (boolean, required) Kept for historical purposes but ignored\n"
-            "2. \"node\"   (string, optional) If provided, return information about this specific node, otherwise all nodes are returned.\n"
+            "1. \"node\"   (string, optional) If provided, return information about this specific node, otherwise all nodes are returned.\n"
             "\nResult:\n"
             "[\n"
             "  {\n"
@@ -299,10 +298,10 @@ UniValue getaddednodeinfo(const UniValue& params, bool fHelp)
 
     std::vector<AddedNodeInfo> vInfo = GetAddedNodeInfo();
 
-    if (params.size() == 2) {
+    if (params.size() == 1) {
         bool found = false;
         for (const AddedNodeInfo& info : vInfo) {
-            if (info.strAddedNode == params[1].get_str()) {
+            if (info.strAddedNode == params[0].get_str()) {
                 vInfo.assign(1, info);
                 found = true;
                 break;

From 09546ca0c939d21e9331df24cffeb96b156eaab2 Mon Sep 17 00:00:00 2001
From: nomnombtc <mastergizmo@arcor.de>
Date: Thu, 1 Sep 2016 16:36:38 +0200
Subject: [PATCH 0808/1802] regenerated all manpages with commit tag stripped,
 also add bitcoin-tx

---
 doc/man/Makefile.am   |   2 +-
 doc/man/bitcoin-cli.1 |   6 +--
 doc/man/bitcoin-qt.1  |   6 +--
 doc/man/bitcoin-tx.1  | 107 ++++++++++++++++++++++++++++++++++++++++++
 doc/man/bitcoind.1    |   6 +--
 5 files changed, 117 insertions(+), 10 deletions(-)
 create mode 100644 doc/man/bitcoin-tx.1

diff --git a/doc/man/Makefile.am b/doc/man/Makefile.am
index 1a31039360b18..5252ef4a19aa4 100644
--- a/doc/man/Makefile.am
+++ b/doc/man/Makefile.am
@@ -1 +1 @@
-dist_man1_MANS=bitcoind.1 bitcoin-qt.1 bitcoin-cli.1
+dist_man1_MANS=bitcoind.1 bitcoin-qt.1 bitcoin-cli.1 bitcoin-tx.1
diff --git a/doc/man/bitcoin-cli.1 b/doc/man/bitcoin-cli.1
index f15594080a074..11b690cf856c0 100644
--- a/doc/man/bitcoin-cli.1
+++ b/doc/man/bitcoin-cli.1
@@ -1,9 +1,9 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.46.5.
-.TH BITCOIN-CLI "1" "August 2016" "bitcoin-cli 0.13.0.0" "User Commands"
+.TH BITCOIN-CLI "1" "September 2016" "bitcoin-cli v0.13.0.0" "User Commands"
 .SH NAME
-bitcoin-cli \- manual page for bitcoin-cli 0.13.0.0
+bitcoin-cli \- manual page for bitcoin-cli v0.13.0.0
 .SH DESCRIPTION
-Bitcoin Core RPC client version v0.13.0.0\-ga402396
+Bitcoin Core RPC client version v0.13.0.0
 .SS "Usage:"
 .TP
 bitcoin\-cli [options] <command> [params]
diff --git a/doc/man/bitcoin-qt.1 b/doc/man/bitcoin-qt.1
index b57e6819d93b1..24b529dac1671 100644
--- a/doc/man/bitcoin-qt.1
+++ b/doc/man/bitcoin-qt.1
@@ -1,9 +1,9 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.46.5.
-.TH BITCOIN-QT "1" "August 2016" "bitcoin-qt 0.13.0.0" "User Commands"
+.TH BITCOIN-QT "1" "September 2016" "bitcoin-qt v0.13.0.0" "User Commands"
 .SH NAME
-bitcoin-qt \- manual page for bitcoin-qt 0.13.0.0
+bitcoin-qt \- manual page for bitcoin-qt v0.13.0.0
 .SH DESCRIPTION
-Bitcoin Core version v0.13.0.0\-ga402396 (64\-bit)
+Bitcoin Core version v0.13.0.0 (64\-bit)
 Usage:
 .IP
 bitcoin\-qt [command\-line options]
diff --git a/doc/man/bitcoin-tx.1 b/doc/man/bitcoin-tx.1
new file mode 100644
index 0000000000000..5c4e31e7f7922
--- /dev/null
+++ b/doc/man/bitcoin-tx.1
@@ -0,0 +1,107 @@
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.46.5.
+.TH BITCOIN-TX "1" "September 2016" "bitcoin-tx v0.13.0.0" "User Commands"
+.SH NAME
+bitcoin-tx \- manual page for bitcoin-tx v0.13.0.0
+.SH DESCRIPTION
+Bitcoin Core bitcoin\-tx utility version v0.13.0.0
+.SS "Usage:"
+.TP
+bitcoin\-tx [options] <hex\-tx> [commands]
+Update hex\-encoded bitcoin transaction
+.TP
+bitcoin\-tx [options] \fB\-create\fR [commands]
+Create hex\-encoded bitcoin transaction
+.SH OPTIONS
+.HP
+\-?
+.IP
+This help message
+.HP
+\fB\-create\fR
+.IP
+Create new, empty TX.
+.HP
+\fB\-json\fR
+.IP
+Select JSON output
+.HP
+\fB\-txid\fR
+.IP
+Output only the hex\-encoded transaction id of the resultant transaction.
+.PP
+Chain selection options:
+.HP
+\fB\-testnet\fR
+.IP
+Use the test chain
+.HP
+\fB\-regtest\fR
+.IP
+Enter regression test mode, which uses a special chain in which blocks
+can be solved instantly. This is intended for regression testing
+tools and app development.
+.PP
+Commands:
+.IP
+delin=N
+.IP
+Delete input N from TX
+.IP
+delout=N
+.IP
+Delete output N from TX
+.IP
+in=TXID:VOUT(:SEQUENCE_NUMBER)
+.IP
+Add input to TX
+.IP
+locktime=N
+.IP
+Set TX lock time to N
+.IP
+nversion=N
+.IP
+Set TX version to N
+.IP
+outaddr=VALUE:ADDRESS
+.IP
+Add address\-based output to TX
+.IP
+outdata=[VALUE:]DATA
+.IP
+Add data\-based output to TX
+.IP
+outscript=VALUE:SCRIPT
+.IP
+Add raw script output to TX
+.IP
+sign=SIGHASH\-FLAGS
+.IP
+Add zero or more signatures to transaction. This command requires JSON
+registers:prevtxs=JSON object, privatekeys=JSON object. See
+signrawtransaction docs for format of sighash flags, JSON
+objects.
+.PP
+Register Commands:
+.IP
+load=NAME:FILENAME
+.IP
+Load JSON file FILENAME into register NAME
+.IP
+set=NAME:JSON\-STRING
+.IP
+Set register NAME to given JSON\-STRING
+.SH COPYRIGHT
+Copyright (C) 2009-2016 The Bitcoin Core developers
+
+Please contribute if you find Bitcoin Core useful. Visit
+<https://bitcoincore.org> for further information about the software.
+The source code is available from <https://github.com/bitcoin/bitcoin>.
+
+This is experimental software.
+Distributed under the MIT software license, see the accompanying file COPYING
+or <http://www.opensource.org/licenses/mit-license.php>.
+
+This product includes software developed by the OpenSSL Project for use in the
+OpenSSL Toolkit <https://www.openssl.org/> and cryptographic software written
+by Eric Young and UPnP software written by Thomas Bernard.
diff --git a/doc/man/bitcoind.1 b/doc/man/bitcoind.1
index c3c55add0ce85..b99657a5fae3a 100644
--- a/doc/man/bitcoind.1
+++ b/doc/man/bitcoind.1
@@ -1,9 +1,9 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.46.5.
-.TH BITCOIND "1" "August 2016" "bitcoind 0.13.0.0" "User Commands"
+.TH BITCOIND "1" "September 2016" "bitcoind v0.13.0.0" "User Commands"
 .SH NAME
-bitcoind \- manual page for bitcoind 0.13.0.0
+bitcoind \- manual page for bitcoind v0.13.0.0
 .SH DESCRIPTION
-Bitcoin Core Daemon version v0.13.0.0\-ga402396
+Bitcoin Core Daemon version v0.13.0.0
 .SS "Usage:"
 .TP
 bitcoind [options]

From d19583f478f4104ea8ff787a475f9064d2c388ae Mon Sep 17 00:00:00 2001
From: nomnombtc <mastergizmo@arcor.de>
Date: Thu, 1 Sep 2016 16:51:24 +0200
Subject: [PATCH 0809/1802] improved gen-manpages.sh, includes bitcoin-tx and
 strips commit tag, now also runs binaries from build dir by default, added
 variables for more control

---
 contrib/devtools/gen-manpages.sh | 29 ++++++++++++++++++++---------
 1 file changed, 20 insertions(+), 9 deletions(-)

diff --git a/contrib/devtools/gen-manpages.sh b/contrib/devtools/gen-manpages.sh
index 7cd7d1b50997a..967717e1e0d6d 100755
--- a/contrib/devtools/gen-manpages.sh
+++ b/contrib/devtools/gen-manpages.sh
@@ -1,18 +1,29 @@
 #!/bin/sh
 
-# the autodetected version git tag at the end 
-# can screw up manpage output a little bit
-BTCVER=$(bitcoin-cli --version | cut -d"-" -f1 | cut -d"v" -f3)
+TOPDIR=${TOPDIR:-$(git rev-parse --show-toplevel)}
+SRCDIR=${SRCDIR:-$TOPDIR/src}
+MANDIR=${MANDIR:-$TOPDIR/doc/man}
+
+BITCOIND=${BITCOIND:-$SRCDIR/bitcoind}
+BITCOINCLI=${BITCOINCLI:-$SRCDIR/bitcoin-cli}
+BITCOINTX=${BITCOINTX:-$SRCDIR/bitcoin-tx}
+BITCOINQT=${BITCOINQT:-$SRCDIR/qt/bitcoin-qt}
+
+[ ! -x $BITCOIND ] && echo "$BITCOIND not found or not executable." && exit 1
+
+# The autodetected version git tag can screw up manpage output a little bit
+BTCVER=($($BITCOINCLI --version | head -n1 | awk -F'[ -]' '{ print $6, $7 }'))
 
 # Create a footer file with copyright content.
-# This gets autodetected fine for bitcoind if
-# --version-string is not set, but has different
-# outcomes for bitcoin-qt and bitcoin-cli.
+# This gets autodetected fine for bitcoind if --version-string is not set,
+# but has different outcomes for bitcoin-qt and bitcoin-cli.
 echo "[COPYRIGHT]" > footer.h2m
-bitcoind --version | sed -n '1!p' >> footer.h2m
+$BITCOIND --version | sed -n '1!p' >> footer.h2m
 
-for cmd in bitcoind bitcoin-qt bitcoin-cli; do
-  help2man -N --version-string=${BTCVER} --include=footer.h2m -o ../../doc/man/${cmd}.1 ${cmd}
+for cmd in $BITCOIND $BITCOINCLI $BITCOINTX $BITCOINQT; do
+  cmdname="${cmd##*/}"
+  help2man -N --version-string=${BTCVER[0]} --include=footer.h2m -o ${MANDIR}/${cmdname}.1 ${cmd}
+  sed -i "s/\\\-${BTCVER[1]}//g" ${MANDIR}/${cmdname}.1
 done
 
 rm -f footer.h2m

From cdd79eb70fe163a92531a6f11c72bce6d228dac6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jorge=20Tim=C3=B3n?= <jtimon@jtimon.cc>
Date: Tue, 30 Aug 2016 22:41:56 +0200
Subject: [PATCH 0810/1802] C++11: s/boost::scoped_ptr/std::unique_ptr/

---
 src/bitcoin-tx.cpp           | 2 +-
 src/dbwrapper.cpp            | 2 +-
 src/init.cpp                 | 2 +-
 src/main.cpp                 | 2 +-
 src/rpc/blockchain.cpp       | 2 +-
 src/test/dbwrapper_tests.cpp | 6 +++---
 src/txdb.cpp                 | 2 +-
 src/txdb.h                   | 2 +-
 src/wallet/walletdb.cpp      | 3 +--
 9 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/src/bitcoin-tx.cpp b/src/bitcoin-tx.cpp
index 5cf9b043ea94b..cb863bda191f8 100644
--- a/src/bitcoin-tx.cpp
+++ b/src/bitcoin-tx.cpp
@@ -515,7 +515,7 @@ class Secp256k1Init
 static void MutateTx(CMutableTransaction& tx, const string& command,
                      const string& commandVal)
 {
-    boost::scoped_ptr<Secp256k1Init> ecc;
+    std::unique_ptr<Secp256k1Init> ecc;
 
     if (command == "nversion")
         MutateTxVersion(tx, commandVal);
diff --git a/src/dbwrapper.cpp b/src/dbwrapper.cpp
index 09c68fbe550c8..4fa06135d286f 100644
--- a/src/dbwrapper.cpp
+++ b/src/dbwrapper.cpp
@@ -117,7 +117,7 @@ std::vector<unsigned char> CDBWrapper::CreateObfuscateKey() const
 
 bool CDBWrapper::IsEmpty()
 {
-    boost::scoped_ptr<CDBIterator> it(NewIterator());
+    std::unique_ptr<CDBIterator> it(NewIterator());
     it->SeekToFirst();
     return !(it->Valid());
 }
diff --git a/src/init.cpp b/src/init.cpp
index 9bd820852c778..27843fa882318 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -162,7 +162,7 @@ class CCoinsViewErrorCatcher : public CCoinsViewBacked
 
 static CCoinsViewDB *pcoinsdbview = NULL;
 static CCoinsViewErrorCatcher *pcoinscatcher = NULL;
-static boost::scoped_ptr<ECCVerifyHandle> globalVerifyHandle;
+static std::unique_ptr<ECCVerifyHandle> globalVerifyHandle;
 
 void Interrupt(boost::thread_group& threadGroup)
 {
diff --git a/src/main.cpp b/src/main.cpp
index 30edc5dbebaa9..f19fada113b01 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -196,7 +196,7 @@ namespace {
      *
      * Memory used: 1.3 MB
      */
-    boost::scoped_ptr<CRollingBloomFilter> recentRejects;
+    std::unique_ptr<CRollingBloomFilter> recentRejects;
     uint256 hashRecentRejectsChainTip;
 
     /** Blocks that are in flight, and that are in the queue to be downloaded. Protected by cs_main. */
diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp
index e3c32d905af74..0f3edde145745 100644
--- a/src/rpc/blockchain.cpp
+++ b/src/rpc/blockchain.cpp
@@ -632,7 +632,7 @@ struct CCoinsStats
 //! Calculate statistics about the unspent transaction output set
 static bool GetUTXOStats(CCoinsView *view, CCoinsStats &stats)
 {
-    boost::scoped_ptr<CCoinsViewCursor> pcursor(view->Cursor());
+    std::unique_ptr<CCoinsViewCursor> pcursor(view->Cursor());
 
     CHashWriter ss(SER_GETHASH, PROTOCOL_VERSION);
     stats.hashBlock = pcursor->GetBestBlock();
diff --git a/src/test/dbwrapper_tests.cpp b/src/test/dbwrapper_tests.cpp
index a0bdcf4afbc70..d4d825d199406 100644
--- a/src/test/dbwrapper_tests.cpp
+++ b/src/test/dbwrapper_tests.cpp
@@ -101,7 +101,7 @@ BOOST_AUTO_TEST_CASE(dbwrapper_iterator)
         uint256 in2 = GetRandHash();
         BOOST_CHECK(dbw.Write(key2, in2));
 
-        boost::scoped_ptr<CDBIterator> it(const_cast<CDBWrapper*>(&dbw)->NewIterator());
+        std::unique_ptr<CDBIterator> it(const_cast<CDBWrapper*>(&dbw)->NewIterator());
 
         // Be sure to seek past the obfuscation key (if it exists)
         it->Seek(key);
@@ -214,7 +214,7 @@ BOOST_AUTO_TEST_CASE(iterator_ordering)
         BOOST_CHECK(dbw.Write(key, value));
     }
 
-    boost::scoped_ptr<CDBIterator> it(const_cast<CDBWrapper*>(&dbw)->NewIterator());
+    std::unique_ptr<CDBIterator> it(const_cast<CDBWrapper*>(&dbw)->NewIterator());
     for (int c=0; c<2; ++c) {
         int seek_start;
         if (c == 0)
@@ -290,7 +290,7 @@ BOOST_AUTO_TEST_CASE(iterator_string_ordering)
         }
     }
 
-    boost::scoped_ptr<CDBIterator> it(const_cast<CDBWrapper*>(&dbw)->NewIterator());
+    std::unique_ptr<CDBIterator> it(const_cast<CDBWrapper*>(&dbw)->NewIterator());
     for (int c=0; c<2; ++c) {
         int seek_start;
         if (c == 0)
diff --git a/src/txdb.cpp b/src/txdb.cpp
index 078c29def319b..4f11c7b95172e 100644
--- a/src/txdb.cpp
+++ b/src/txdb.cpp
@@ -173,7 +173,7 @@ bool CBlockTreeDB::ReadFlag(const std::string &name, bool &fValue) {
 
 bool CBlockTreeDB::LoadBlockIndexGuts(boost::function<CBlockIndex*(const uint256&)> insertBlockIndex)
 {
-    boost::scoped_ptr<CDBIterator> pcursor(NewIterator());
+    std::unique_ptr<CDBIterator> pcursor(NewIterator());
 
     pcursor->Seek(make_pair(DB_BLOCK_INDEX, uint256()));
 
diff --git a/src/txdb.h b/src/txdb.h
index 5b98d2792c50d..adb3f66327223 100644
--- a/src/txdb.h
+++ b/src/txdb.h
@@ -92,7 +92,7 @@ class CCoinsViewDBCursor: public CCoinsViewCursor
 private:
     CCoinsViewDBCursor(CDBIterator* pcursorIn, const uint256 &hashBlockIn):
         CCoinsViewCursor(hashBlockIn), pcursor(pcursorIn) {}
-    boost::scoped_ptr<CDBIterator> pcursor;
+    std::unique_ptr<CDBIterator> pcursor;
     std::pair<char, uint256> keyTmp;
 
     friend class CCoinsViewDB;
diff --git a/src/wallet/walletdb.cpp b/src/wallet/walletdb.cpp
index 9de0671ea2164..239b1ac9b548a 100644
--- a/src/wallet/walletdb.cpp
+++ b/src/wallet/walletdb.cpp
@@ -18,7 +18,6 @@
 #include <boost/version.hpp>
 #include <boost/filesystem.hpp>
 #include <boost/foreach.hpp>
-#include <boost/scoped_ptr.hpp>
 #include <boost/thread.hpp>
 
 using namespace std;
@@ -941,7 +940,7 @@ bool CWalletDB::Recover(CDBEnv& dbenv, const std::string& filename, bool fOnlyKe
     }
     LogPrintf("Salvage(aggressive) found %u records\n", salvagedData.size());
 
-    boost::scoped_ptr<Db> pdbCopy(new Db(dbenv.dbenv, 0));
+    std::unique_ptr<Db> pdbCopy(new Db(dbenv.dbenv, 0));
     int ret = pdbCopy->open(NULL,               // Txn pointer
                             filename.c_str(),   // Filename
                             "main",             // Logical db name

From 38acbf83e1aa652f7af917efc31a035999a98af3 Mon Sep 17 00:00:00 2001
From: Doug <joroark@vt.edu>
Date: Thu, 1 Sep 2016 17:20:44 -0700
Subject: [PATCH 0811/1802] Remove unused Qt 4.6 patch.

Core no longer supports Qt 4. Therefore, the STL fix patch isn't needed.
---
 depends/patches/qt46/stlfix.patch | 10 ----------
 1 file changed, 10 deletions(-)
 delete mode 100644 depends/patches/qt46/stlfix.patch

diff --git a/depends/patches/qt46/stlfix.patch b/depends/patches/qt46/stlfix.patch
deleted file mode 100644
index f8f6fb04b0b70..0000000000000
--- a/depends/patches/qt46/stlfix.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- old/config.tests/unix/stl/stltest.cpp	2011-06-23 03:45:23.000000000 -0400
-+++ new/config.tests/unix/stl/stltest.cpp	2014-08-28 00:54:04.154837604 -0400
-@@ -49,6 +49,7 @@
- #include <vector>
- #include <algorithm>
- #include <iostream>
-+#include <cstddef>
- 
- // something mean to see if the compiler and C++ standard lib are good enough
- template<class K, class T>

From 4424af5190f11996e7970064b4f6553ba7cd1f9e Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Fri, 2 Sep 2016 11:43:06 +0200
Subject: [PATCH 0812/1802] Predeclare PrecomputedTransactionData as sturct

---
 src/main.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main.h b/src/main.h
index 7a2d432628957..18d674612f97e 100644
--- a/src/main.h
+++ b/src/main.h
@@ -38,8 +38,8 @@ class CScriptCheck;
 class CTxMemPool;
 class CValidationInterface;
 class CValidationState;
-class PrecomputedTransactionData;
 
+struct PrecomputedTransactionData;
 struct CNodeStateStats;
 struct LockPoints;
 

From 7c069a70931a6bb27d060927765146d4c6ceced4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pavel=20Jan=C3=ADk?= <Pavel@Janik.cz>
Date: Fri, 2 Sep 2016 20:50:59 +0200
Subject: [PATCH 0813/1802] Do not shadow global variable

---
 src/util.cpp | 12 ++++++------
 src/util.h   |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/util.cpp b/src/util.cpp
index ee12f2b443427..fe37f5e7532c6 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -601,19 +601,19 @@ bool TryCreateDirectory(const boost::filesystem::path& p)
     return false;
 }
 
-void FileCommit(FILE *fileout)
+void FileCommit(FILE *file)
 {
-    fflush(fileout); // harmless if redundantly called
+    fflush(file); // harmless if redundantly called
 #ifdef WIN32
-    HANDLE hFile = (HANDLE)_get_osfhandle(_fileno(fileout));
+    HANDLE hFile = (HANDLE)_get_osfhandle(_fileno(file));
     FlushFileBuffers(hFile);
 #else
     #if defined(__linux__) || defined(__NetBSD__)
-    fdatasync(fileno(fileout));
+    fdatasync(fileno(file));
     #elif defined(__APPLE__) && defined(F_FULLFSYNC)
-    fcntl(fileno(fileout), F_FULLFSYNC, 0);
+    fcntl(fileno(file), F_FULLFSYNC, 0);
     #else
-    fsync(fileno(fileout));
+    fsync(fileno(file));
     #endif
 #endif
 }
diff --git a/src/util.h b/src/util.h
index 39328b51ef154..45b365855781a 100644
--- a/src/util.h
+++ b/src/util.h
@@ -93,7 +93,7 @@ bool error(const char* fmt, const Args&... args)
 
 void PrintExceptionContinue(const std::exception *pex, const char* pszThread);
 void ParseParameters(int argc, const char*const argv[]);
-void FileCommit(FILE *fileout);
+void FileCommit(FILE *file);
 bool TruncateFile(FILE *file, unsigned int length);
 int RaiseFileDescriptorLimit(int nMinFD);
 void AllocateFileRange(FILE *file, unsigned int offset, unsigned int length);

From 46606af200db563ca742b56f291cee2311a27491 Mon Sep 17 00:00:00 2001
From: BtcDrak <btcdrak@gmail.com>
Date: Fri, 2 Sep 2016 23:05:29 +0100
Subject: [PATCH 0814/1802] Update btcdrak signing key

---
 contrib/gitian-keys/btcdrak-key.pgp | Bin 8954 -> 4916 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/contrib/gitian-keys/btcdrak-key.pgp b/contrib/gitian-keys/btcdrak-key.pgp
index 60d76c0ec7ab86635637ee9f49948e004fadfee4..f00dc729d57a2e7b7848324177c605dac9dc8e45 100644
GIT binary patch
literal 4916
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
z%0A~L3i=9J@!9bPL-a_~P6?yyQ^#;Ueuj8FC``}0Ib;V^oHb59Bnms7y_T7j*p-N*
zHm*69PEmN|ZOXs+g|^Q!DNa(IL1ocxSIXE6iDjOC_)7xFGJE9edBDs}?uVqS9!~-F
zD-v7_pSLlWh>RqMl#pLn8C_&5v8jVW)wXHslcGlqtAiY=4m%FZ5;5R|#)<ZO32_nS
Hli2?OBDGUH

literal 8954
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
Q0e@e&@(lU@pNm@l6O15ltpET3


From 6d0ced18655a4f3619a6f478846f3241f1d040f7 Mon Sep 17 00:00:00 2001
From: Gregory Maxwell <greg@xiph.org>
Date: Sat, 3 Sep 2016 10:24:37 +0000
Subject: [PATCH 0815/1802] Do not set an addr time penalty when a peer
 advertises itself.

Claims a peer makes about itself are inherently more credible.
---
 src/addrman.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/addrman.cpp b/src/addrman.cpp
index cebb1c8e5e708..bfb8e94575de2 100644
--- a/src/addrman.cpp
+++ b/src/addrman.cpp
@@ -255,6 +255,11 @@ bool CAddrMan::Add_(const CAddress& addr, const CNetAddr& source, int64_t nTimeP
     int nId;
     CAddrInfo* pinfo = Find(addr, &nId);
 
+    // Do not set a penality for a source's self-announcement
+    if (addr == source) {
+        nTimePenalty = 0;
+    }
+
     if (pinfo) {
         // periodically update nTime
         bool fCurrentlyOnline = (GetAdjustedTime() - addr.nTime < 24 * 60 * 60);

From ff2ed7a5bc8f56d2c0cd8d4fa6cf06ecfe17f1b2 Mon Sep 17 00:00:00 2001
From: mruddy <mruddy@users.noreply.github.com>
Date: Sun, 4 Sep 2016 11:42:07 -0400
Subject: [PATCH 0816/1802] trivial: remove unnecessary variable fDaemon

---
 src/bitcoind.cpp | 5 +----
 src/util.cpp     | 1 -
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/bitcoind.cpp b/src/bitcoind.cpp
index 28bc374acc76e..322298d1b38ab 100644
--- a/src/bitcoind.cpp
+++ b/src/bitcoind.cpp
@@ -40,8 +40,6 @@
  * Use the buttons <code>Namespaces</code>, <code>Classes</code> or <code>Files</code> at the top of the page to start navigating the code.
  */
 
-static bool fDaemon;
-
 void WaitForShutdown(boost::thread_group* threadGroup)
 {
     bool fShutdown = ShutdownRequested();
@@ -130,8 +128,7 @@ bool AppInit(int argc, char* argv[])
             exit(1);
         }
 #ifndef WIN32
-        fDaemon = GetBoolArg("-daemon", false);
-        if (fDaemon)
+        if (GetBoolArg("-daemon", false))
         {
             fprintf(stdout, "Bitcoin server starting\n");
 
diff --git a/src/util.cpp b/src/util.cpp
index ee12f2b443427..c7d147a11eebb 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -107,7 +107,6 @@ map<string, vector<string> > mapMultiArgs;
 bool fDebug = false;
 bool fPrintToConsole = false;
 bool fPrintToDebugLog = true;
-bool fDaemon = false;
 bool fServer = false;
 string strMiscWarning;
 bool fLogTimestamps = DEFAULT_LOGTIMESTAMPS;

From 438e94dc330a37600ec1d86f2ba8502385b5262d Mon Sep 17 00:00:00 2001
From: whythat <yuri.zhykin@gmail.com>
Date: Fri, 2 Sep 2016 12:38:04 +0300
Subject: [PATCH 0817/1802] remove root test directory for RPC tests

---
 qa/rpc-tests/test_framework/test_framework.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/qa/rpc-tests/test_framework/test_framework.py b/qa/rpc-tests/test_framework/test_framework.py
index a1383729fad96..186cf866cfda6 100755
--- a/qa/rpc-tests/test_framework/test_framework.py
+++ b/qa/rpc-tests/test_framework/test_framework.py
@@ -125,7 +125,8 @@ def main(self):
         self.add_options(parser)
         (self.options, self.args) = parser.parse_args()
 
-        self.options.tmpdir += '/' + str(self.options.port_seed)
+        # backup dir variable for removal at cleanup
+        self.options.root, self.options.tmpdir = self.options.tmpdir, self.options.tmpdir + '/' + str(self.options.port_seed)
 
         if self.options.trace_rpc:
             logging.basicConfig(level=logging.DEBUG, stream=sys.stdout)
@@ -176,6 +177,8 @@ def main(self):
         if not self.options.nocleanup and not self.options.noshutdown and success:
             print("Cleaning up")
             shutil.rmtree(self.options.tmpdir)
+            if not os.listdir(self.options.root):
+                os.rmdir(self.options.root)
         else:
             print("Not cleaning up dir %s" % self.options.tmpdir)
 

From c62cc4ec759a8487373f158b3cbb888efcdd753a Mon Sep 17 00:00:00 2001
From: whythat <yuri.zhykin@gmail.com>
Date: Mon, 5 Sep 2016 02:04:37 +0300
Subject: [PATCH 0818/1802] fix path for bak file

---
 qa/rpc-tests/wallet-hd.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/qa/rpc-tests/wallet-hd.py b/qa/rpc-tests/wallet-hd.py
index c11da1e9a9989..a49d91f6f4f53 100755
--- a/qa/rpc-tests/wallet-hd.py
+++ b/qa/rpc-tests/wallet-hd.py
@@ -39,8 +39,8 @@ def run_test (self):
         self.nodes[1].importprivkey(self.nodes[0].dumpprivkey(non_hd_add))
 
         # This should be enough to keep the master key and the non-HD key 
-        self.nodes[1].backupwallet(tmpdir + "hd.bak")
-        #self.nodes[1].dumpwallet(tmpdir + "hd.dump")
+        self.nodes[1].backupwallet(tmpdir + "/hd.bak")
+        #self.nodes[1].dumpwallet(tmpdir + "/hd.dump")
 
         # Derive some HD addresses and remember the last
         # Also send funds to each add
@@ -63,7 +63,7 @@ def run_test (self):
         print("Restore backup ...")
         self.stop_node(1)
         os.remove(self.options.tmpdir + "/node1/regtest/wallet.dat")
-        shutil.copyfile(tmpdir + "hd.bak", tmpdir + "/node1/regtest/wallet.dat")
+        shutil.copyfile(tmpdir + "/hd.bak", tmpdir + "/node1/regtest/wallet.dat")
         self.nodes[1] = start_node(1, self.options.tmpdir, self.node_args[1])
         #connect_nodes_bi(self.nodes, 0, 1)
 

From c40b034327bf8a30d3af1eeeef84bc4ccd57e685 Mon Sep 17 00:00:00 2001
From: Suhas Daftuar <sdaftuar@chaincode.com>
Date: Sun, 4 Sep 2016 20:02:40 -0400
Subject: [PATCH 0819/1802] Clear witness with vin/vout in
 CWallet::CreateTransaction()

---
 src/wallet/wallet.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index 10aca2e499f60..78d62582975f2 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -2209,6 +2209,7 @@ bool CWallet::CreateTransaction(const vector<CRecipient>& vecSend, CWalletTx& wt
                 nChangePosInOut = nChangePosRequest;
                 txNew.vin.clear();
                 txNew.vout.clear();
+                txNew.wit.SetNull();
                 wtxNew.fFromMe = true;
                 bool fFirst = true;
 

From 34521e4d7d176109dedf52ec8ef2b5052b9a30f3 Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Tue, 16 Aug 2016 17:38:57 +0200
Subject: [PATCH 0820/1802] Do not store witness txn in rejection cache

---
 src/main.cpp | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index aed9591f99394..d32a7e9be5c62 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1501,9 +1501,9 @@ bool AcceptToMemoryPoolWorker(CTxMemPool& pool, CValidationState& state, const C
             // SCRIPT_VERIFY_CLEANSTACK requires SCRIPT_VERIFY_WITNESS, so we
             // need to turn both off, and compare against just turning off CLEANSTACK
             // to see if the failure is specifically due to witness validation.
-            if (CheckInputs(tx, state, view, true, scriptVerifyFlags & ~(SCRIPT_VERIFY_WITNESS | SCRIPT_VERIFY_CLEANSTACK), true, txdata) &&
+            if (tx.wit.IsNull() && CheckInputs(tx, state, view, true, scriptVerifyFlags & ~(SCRIPT_VERIFY_WITNESS | SCRIPT_VERIFY_CLEANSTACK), true, txdata) &&
                 !CheckInputs(tx, state, view, true, scriptVerifyFlags & ~SCRIPT_VERIFY_CLEANSTACK, true, txdata)) {
-                // Only the witness is wrong, so the transaction itself may be fine.
+                // Only the witness is missing, so the transaction itself may be fine.
                 state.SetCorruptionPossible();
             }
             return false;
@@ -5493,7 +5493,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
                     else if (!fMissingInputs2)
                     {
                         int nDos = 0;
-                        if (stateDummy.IsInvalid(nDos) && nDos > 0 && (!state.CorruptionPossible() || State(fromPeer)->fHaveWitness))
+                        if (stateDummy.IsInvalid(nDos) && nDos > 0)
                         {
                             // Punish peer that gave us an invalid orphan tx
                             Misbehaving(fromPeer, nDos);
@@ -5504,7 +5504,10 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
                         // Probably non-standard or insufficient fee/priority
                         LogPrint("mempool", "   removed orphan tx %s\n", orphanHash.ToString());
                         vEraseQueue.push_back(orphanHash);
-                        if (!stateDummy.CorruptionPossible()) {
+                        if (orphanTx.wit.IsNull() && !stateDummy.CorruptionPossible()) {
+                            // Do not use rejection cache for witness transactions or
+                            // witness-stripped transactions, as they can have been malleated.
+                            // See https://github.com/bitcoin/bitcoin/issues/8279 for details.
                             assert(recentRejects);
                             recentRejects->insert(orphanHash);
                         }
@@ -5542,7 +5545,10 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
                 LogPrint("mempool", "not keeping orphan with rejected parents %s\n",tx.GetHash().ToString());
             }
         } else {
-            if (!state.CorruptionPossible()) {
+            if (tx.wit.IsNull() && !state.CorruptionPossible()) {
+                // Do not use rejection cache for witness transactions or
+                // witness-stripped transactions, as they can have been malleated.
+                // See https://github.com/bitcoin/bitcoin/issues/8279 for details.
                 assert(recentRejects);
                 recentRejects->insert(tx.GetHash());
             }
@@ -5574,9 +5580,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
             if (state.GetRejectCode() < REJECT_INTERNAL) // Never send AcceptToMemoryPool's internal codes over P2P
                 pfrom->PushMessage(NetMsgType::REJECT, strCommand, (unsigned char)state.GetRejectCode(),
                                    state.GetRejectReason().substr(0, MAX_REJECT_MESSAGE_LENGTH), inv.hash);
-            if (nDoS > 0 && (!state.CorruptionPossible() || State(pfrom->id)->fHaveWitness)) {
-                // When a non-witness-supporting peer gives us a transaction that would
-                // be accepted if witness validation was off, we can't blame them for it.
+            if (nDoS > 0) {
                 Misbehaving(pfrom->GetId(), nDoS);
             }
         }

From ca10a03addf70421893791c2c499e82fc494d60b Mon Sep 17 00:00:00 2001
From: instagibbs <gsanders87@gmail.com>
Date: Thu, 18 Aug 2016 12:04:33 -0400
Subject: [PATCH 0821/1802] Add basic test for IsStandard witness transaction
 blinding

---
 qa/rpc-tests/p2p-segwit.py | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/qa/rpc-tests/p2p-segwit.py b/qa/rpc-tests/p2p-segwit.py
index eb857ed983b3c..ca784644d8ee2 100755
--- a/qa/rpc-tests/p2p-segwit.py
+++ b/qa/rpc-tests/p2p-segwit.py
@@ -964,8 +964,24 @@ def test_tx_relay_after_segwit_activation(self):
 
         tx3 = CTransaction()
         tx3.vin.append(CTxIn(COutPoint(tx2.sha256, 0), b""))
-        tx3.vout.append(CTxOut(tx2.vout[0].nValue-1000, CScript([OP_TRUE])))
         tx3.wit.vtxinwit.append(CTxInWitness())
+
+        # Add too-large for IsStandard witness and check that it does not enter reject filter
+        p2sh_program = CScript([OP_TRUE])
+        p2sh_pubkey = hash160(p2sh_program)
+        witness_program2 = CScript([b'a'*400000])
+        tx3.vout.append(CTxOut(tx2.vout[0].nValue-1000, CScript([OP_HASH160, p2sh_pubkey, OP_EQUAL])))
+        tx3.wit.vtxinwit[0].scriptWitness.stack = [witness_program2]
+        tx3.rehash()
+
+        # Node will not be blinded to the transaction
+        self.std_node.announce_tx_and_wait_for_getdata(tx3)
+        self.std_node.test_transaction_acceptance(tx3, True, False, b'tx-size')
+        self.std_node.announce_tx_and_wait_for_getdata(tx3)
+        self.std_node.test_transaction_acceptance(tx3, True, False, b'tx-size')
+
+        # Remove witness stuffing, instead add extra witness push on stack
+        tx3.vout[0] = CTxOut(tx2.vout[0].nValue-1000, CScript([OP_TRUE]))
         tx3.wit.vtxinwit[0].scriptWitness.stack = [CScript([CScriptNum(1)]), witness_program ]
         tx3.rehash()
 

From 2f2548d5e0ccea6879eb7b0b851d61ad2f544423 Mon Sep 17 00:00:00 2001
From: Johnson Lau <jl2012@users.noreply.github.com>
Date: Tue, 6 Sep 2016 00:50:23 +0800
Subject: [PATCH 0822/1802] Fix SIGHASH_SINGLE bug in test_framework
 SignatureHash

The value for "other" inputs should be -1 (0xffffffffffffffff) instead of 0
---
 qa/rpc-tests/test_framework/script.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qa/rpc-tests/test_framework/script.py b/qa/rpc-tests/test_framework/script.py
index b46c643ccb114..83bbf2047964c 100644
--- a/qa/rpc-tests/test_framework/script.py
+++ b/qa/rpc-tests/test_framework/script.py
@@ -882,7 +882,7 @@ def SignatureHash(script, txTo, inIdx, hashtype):
         tmp = txtmp.vout[outIdx]
         txtmp.vout = []
         for i in range(outIdx):
-            txtmp.vout.append(CTxOut())
+            txtmp.vout.append(CTxOut(-1))
         txtmp.vout.append(tmp)
 
         for i in range(len(txtmp.vin)):

From f71d4a3786611d564e4c239099501daee989b170 Mon Sep 17 00:00:00 2001
From: Jeremy Rubin <jeremy.l.rubin@gmail.com>
Date: Tue, 6 Sep 2016 16:19:25 -0400
Subject: [PATCH 0823/1802] Minimal fix to slow prevector tests as stopgap
 measure

---
 src/test/prevector_tests.cpp | 62 +++++++++++++++++++++++++-----------
 1 file changed, 43 insertions(+), 19 deletions(-)

diff --git a/src/test/prevector_tests.cpp b/src/test/prevector_tests.cpp
index d1407c1da9339..b8c45ca564dc9 100644
--- a/src/test/prevector_tests.cpp
+++ b/src/test/prevector_tests.cpp
@@ -26,57 +26,70 @@ class prevector_tester {
     pretype pre_vector_alt;
 
     typedef typename pretype::size_type Size;
+    bool passed = true;
+    uint32_t insecure_rand_Rz_cache;
+    uint32_t insecure_rand_Rw_cache;
 
+
+    template <typename A, typename B>
+        void local_check_equal(A a, B b)
+        {
+            local_check(a == b);
+        }
+    void local_check(bool b) 
+    {
+        passed &= b;
+    }
     void test() {
         const pretype& const_pre_vector = pre_vector;
-        BOOST_CHECK_EQUAL(real_vector.size(), pre_vector.size());
-        BOOST_CHECK_EQUAL(real_vector.empty(), pre_vector.empty());
+        local_check_equal(real_vector.size(), pre_vector.size());
+        local_check_equal(real_vector.empty(), pre_vector.empty());
         for (Size s = 0; s < real_vector.size(); s++) {
-             BOOST_CHECK(real_vector[s] == pre_vector[s]);
-             BOOST_CHECK(&(pre_vector[s]) == &(pre_vector.begin()[s]));
-             BOOST_CHECK(&(pre_vector[s]) == &*(pre_vector.begin() + s));
-             BOOST_CHECK(&(pre_vector[s]) == &*((pre_vector.end() + s) - real_vector.size()));
+             local_check(real_vector[s] == pre_vector[s]);
+             local_check(&(pre_vector[s]) == &(pre_vector.begin()[s]));
+             local_check(&(pre_vector[s]) == &*(pre_vector.begin() + s));
+             local_check(&(pre_vector[s]) == &*((pre_vector.end() + s) - real_vector.size()));
         }
-        // BOOST_CHECK(realtype(pre_vector) == real_vector);
-        BOOST_CHECK(pretype(real_vector.begin(), real_vector.end()) == pre_vector);
-        BOOST_CHECK(pretype(pre_vector.begin(), pre_vector.end()) == pre_vector);
+        // local_check(realtype(pre_vector) == real_vector);
+        local_check(pretype(real_vector.begin(), real_vector.end()) == pre_vector);
+        local_check(pretype(pre_vector.begin(), pre_vector.end()) == pre_vector);
         size_t pos = 0;
         BOOST_FOREACH(const T& v, pre_vector) {
-             BOOST_CHECK(v == real_vector[pos++]);
+             local_check(v == real_vector[pos++]);
         }
         BOOST_REVERSE_FOREACH(const T& v, pre_vector) {
-             BOOST_CHECK(v == real_vector[--pos]);
+             local_check(v == real_vector[--pos]);
         }
         BOOST_FOREACH(const T& v, const_pre_vector) {
-             BOOST_CHECK(v == real_vector[pos++]);
+             local_check(v == real_vector[pos++]);
         }
         BOOST_REVERSE_FOREACH(const T& v, const_pre_vector) {
-             BOOST_CHECK(v == real_vector[--pos]);
+             local_check(v == real_vector[--pos]);
         }
         CDataStream ss1(SER_DISK, 0);
         CDataStream ss2(SER_DISK, 0);
         ss1 << real_vector;
         ss2 << pre_vector;
-        BOOST_CHECK_EQUAL(ss1.size(), ss2.size());
+        local_check_equal(ss1.size(), ss2.size());
         for (Size s = 0; s < ss1.size(); s++) {
-            BOOST_CHECK_EQUAL(ss1[s], ss2[s]);
+            local_check_equal(ss1[s], ss2[s]);
         }
     }
 
 public:
     void resize(Size s) {
         real_vector.resize(s);
-        BOOST_CHECK_EQUAL(real_vector.size(), s);
+        local_check_equal(real_vector.size(), s);
         pre_vector.resize(s);
-        BOOST_CHECK_EQUAL(pre_vector.size(), s);
+        local_check_equal(pre_vector.size(), s);
         test();
     }
 
     void reserve(Size s) {
         real_vector.reserve(s);
-        BOOST_CHECK(real_vector.capacity() >= s);
+        local_check(real_vector.capacity() >= s);
         pre_vector.reserve(s);
-        BOOST_CHECK(pre_vector.capacity() >= s);
+        local_check(pre_vector.capacity() >= s);
         test();
     }
 
@@ -157,6 +170,17 @@ class prevector_tester {
         pre_vector.swap(pre_vector_alt);
         test();
     }
+    ~prevector_tester() {
+        BOOST_CHECK_MESSAGE(passed, "insecure_rand_Rz: " 
+                << insecure_rand_Rz_cache 
+                << ", insecure_rand_Rw: "
+                << insecure_rand_Rw_cache);
+    }
+    prevector_tester() {
+        seed_insecure_rand();
+        insecure_rand_Rz_cache = insecure_rand_Rz;
+        insecure_rand_Rw_cache = insecure_rand_Rw;
+    }
 };
 
 BOOST_AUTO_TEST_CASE(PrevectorTestInt)

From 426e7bce0e365e0947f932ca46bcc48ca3a2f10e Mon Sep 17 00:00:00 2001
From: Jeremy Rubin <jeremy.l.rubin@gmail.com>
Date: Tue, 6 Sep 2016 16:22:13 -0400
Subject: [PATCH 0824/1802] Fix obvious assignment/equality error in test

---
 src/test/arith_uint256_tests.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test/arith_uint256_tests.cpp b/src/test/arith_uint256_tests.cpp
index 53ab7e95ee0cd..b19d2faea014c 100644
--- a/src/test/arith_uint256_tests.cpp
+++ b/src/test/arith_uint256_tests.cpp
@@ -112,7 +112,7 @@ BOOST_AUTO_TEST_CASE( basics ) // constructors, equality, inequality
     BOOST_CHECK( (R1L & arith_uint256("0xffffffffffffffff")) == arith_uint256(R1LLow64));
     BOOST_CHECK(ZeroL == arith_uint256(0));
     BOOST_CHECK(OneL == arith_uint256(1));
-    BOOST_CHECK(arith_uint256("0xffffffffffffffff") = arith_uint256(0xffffffffffffffffULL));
+    BOOST_CHECK(arith_uint256("0xffffffffffffffff") == arith_uint256(0xffffffffffffffffULL));
 
     // Assignment (from base_uint)
     arith_uint256 tmpL = ~ZeroL; BOOST_CHECK(tmpL == ~ZeroL);

From fdf82fba3105c3c824e594db8cd7c55c4f692744 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hampus=20Sj=C3=B6berg?= <hampus.sjoberg@gmail.com>
Date: Tue, 6 Sep 2016 22:30:30 +0200
Subject: [PATCH 0825/1802] Adding method GetTotalSize() to CTransaction

GetTotalSize() returns the total transaction size (including witness) in
bytes.
---
 src/primitives/transaction.cpp | 5 +++++
 src/primitives/transaction.h   | 7 +++++++
 2 files changed, 12 insertions(+)

diff --git a/src/primitives/transaction.cpp b/src/primitives/transaction.cpp
index 2fdc59ea07767..4afbe99fd39a9 100644
--- a/src/primitives/transaction.cpp
+++ b/src/primitives/transaction.cpp
@@ -131,6 +131,11 @@ unsigned int CTransaction::CalculateModifiedSize(unsigned int nTxSize) const
     return nTxSize;
 }
 
+unsigned int CTransaction::GetTotalSize() const
+{
+    return ::GetSerializeSize(*this, SER_NETWORK, PROTOCOL_VERSION);
+}
+
 std::string CTransaction::ToString() const
 {
     std::string str;
diff --git a/src/primitives/transaction.h b/src/primitives/transaction.h
index 5689d15bf7eb1..16c2e5c454fe4 100644
--- a/src/primitives/transaction.h
+++ b/src/primitives/transaction.h
@@ -415,6 +415,13 @@ class CTransaction
 
     // Compute modified tx size for priority calculation (optionally given tx size)
     unsigned int CalculateModifiedSize(unsigned int nTxSize=0) const;
+    
+    /**
+     * Get the total transaction size in bytes, including witness data.
+     * "Total Size" defined in BIP141 and BIP144.
+     * @return Total transaction size in bytes
+     */
+    unsigned int GetTotalSize() const;
 
     bool IsCoinBase() const
     {

From c015634400f112f8b7f037c82690f1332d7971a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hampus=20Sj=C3=B6berg?= <hampus.sjoberg@gmail.com>
Date: Tue, 6 Sep 2016 22:31:36 +0200
Subject: [PATCH 0826/1802] qt: Adding transaction size to transaction details
 window

---
 src/qt/transactiondesc.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/qt/transactiondesc.cpp b/src/qt/transactiondesc.cpp
index bae0cbd1c8681..32b3955ce57bd 100644
--- a/src/qt/transactiondesc.cpp
+++ b/src/qt/transactiondesc.cpp
@@ -241,6 +241,7 @@ QString TransactionDesc::toHTML(CWallet *wallet, CWalletTx &wtx, TransactionReco
         strHTML += "<br><b>" + tr("Comment") + ":</b><br>" + GUIUtil::HtmlEscape(wtx.mapValue["comment"], true) + "<br>";
 
     strHTML += "<b>" + tr("Transaction ID") + ":</b> " + rec->getTxID() + "<br>";
+    strHTML += "<b>" + tr("Transaction size") + ":</b> " + QString::number(wtx.GetTotalSize()) + " bytes<br>";
     strHTML += "<b>" + tr("Output index") + ":</b> " + QString::number(rec->getOutputIndex()) + "<br>";
 
     // Message from normal bitcoin:URI (bitcoin:123...?message=example)

From 125b946cb4412fdf92bc3a68e6030bf4ddfe752d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pavel=20Jan=C3=ADk?= <Pavel@Janik.cz>
Date: Wed, 7 Sep 2016 13:45:13 +0200
Subject: [PATCH 0827/1802] Do not shadow upper local variable 'send', prevent
 -Wshadow compiler warning.

---
 src/main.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index 4b42afb561472..de16b0ca4ac2a 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -4789,16 +4789,16 @@ void static ProcessGetData(CNode* pfrom, const Consensus::Params& consensusParam
                         pfrom->PushMessage(NetMsgType::BLOCK, block);
                     else if (inv.type == MSG_FILTERED_BLOCK)
                     {
-                        bool send = false;
+                        bool sendMerkleBlock = false;
                         CMerkleBlock merkleBlock;
                         {
                             LOCK(pfrom->cs_filter);
                             if (pfrom->pfilter) {
-                                send = true;
+                                sendMerkleBlock = true;
                                 merkleBlock = CMerkleBlock(block, *pfrom->pfilter);
                             }
                         }
-                        if (send) {
+                        if (sendMerkleBlock) {
                             pfrom->PushMessage(NetMsgType::MERKLEBLOCK, merkleBlock);
                             // CMerkleBlock just contains hashes, so also push any transactions in the block the client did not see
                             // This avoids hurting performance by pointlessly requiring a round-trip

From 04802930d4e1f565b3c36e1a806fbe9cd4809937 Mon Sep 17 00:00:00 2001
From: Jonas Schnelli <dev@jonasschnelli.ch>
Date: Wed, 7 Sep 2016 16:03:08 +0200
Subject: [PATCH 0828/1802] [Qt][CoinControl] fix UI bug that could result in
 paying unexpected fee

---
 src/qt/sendcoinsdialog.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/qt/sendcoinsdialog.cpp b/src/qt/sendcoinsdialog.cpp
index 3e96bb18c3ebd..8433818a64838 100644
--- a/src/qt/sendcoinsdialog.cpp
+++ b/src/qt/sendcoinsdialog.cpp
@@ -589,6 +589,9 @@ void SendCoinsDialog::updateGlobalFeeVariables()
     {
         nTxConfirmTarget = defaultConfirmTarget - ui->sliderSmartFee->value();
         payTxFee = CFeeRate(0);
+
+        // set nMinimumTotalFee to 0 to not accidentally pay a custom fee
+        CoinControlDialog::coinControl->nMinimumTotalFee = 0;
     }
     else
     {
@@ -781,7 +784,7 @@ void SendCoinsDialog::coinControlUpdateLabels()
         ui->radioCustomAtLeast->setVisible(true);
 
         // only enable the feature if inputs are selected
-        ui->radioCustomAtLeast->setEnabled(CoinControlDialog::coinControl->HasSelected());
+        ui->radioCustomAtLeast->setEnabled(ui->radioCustomFee->isChecked() && !ui->checkBoxMinimumFee->isChecked() &&CoinControlDialog::coinControl->HasSelected());
     }
     else
     {

From d6a5dc4a2eaa0d7348804254ca09e75fc3a858ab Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Thu, 1 Sep 2016 21:55:21 -0400
Subject: [PATCH 0829/1802] add waitfornewblock/waitforblock/waitforblockheight
 rpcs and use them for tests

waitfornewblock waits until a new block is received, or the timeout expires, then
returns the current block height/hash.

waitforblock waits for a specific blockhash, or until the timeout expires, then
returns the current block height/hash. If the target blockhash is the current
tip, it will return immediately.

waitforblockheight waits until the tip has reached a certain height or higher,
then returns the current height and hash.

waitforblockheight is used to avoid polling in the rpc tests.
---
 qa/rpc-tests/test_framework/util.py |   8 +-
 src/init.cpp                        |   8 ++
 src/rpc/blockchain.cpp              | 147 ++++++++++++++++++++++++++++
 src/rpc/client.cpp                  |   6 ++
 src/rpc/server.h                    |   1 +
 5 files changed, 168 insertions(+), 2 deletions(-)

diff --git a/qa/rpc-tests/test_framework/util.py b/qa/rpc-tests/test_framework/util.py
index 190fa7f661a6d..eee77f1a104cc 100644
--- a/qa/rpc-tests/test_framework/util.py
+++ b/qa/rpc-tests/test_framework/util.py
@@ -125,12 +125,16 @@ def sync_blocks(rpc_connections, wait=1, timeout=60):
     """
     Wait until everybody has the same tip
     """
+    maxheight = 0
     while timeout > 0:
-        tips = [ x.getbestblockhash() for x in rpc_connections ]
+        tips = [ x.waitforblockheight(maxheight, int(wait * 1000)) for x in rpc_connections ]
+        heights = [ x["height"] for x in tips ]
         if tips == [ tips[0] ]*len(tips):
             return True
-        time.sleep(wait)
+        if heights == [ heights[0] ]*len(heights): #heights are the same but hashes are not
+            raise AssertionError("Block sync failed")
         timeout -= wait
+        maxheight = max(heights)
     raise AssertionError("Block sync failed")
 
 def sync_mempools(rpc_connections, wait=1, timeout=60):
diff --git a/src/init.cpp b/src/init.cpp
index 27843fa882318..64e161b9b2907 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -280,9 +280,15 @@ bool static Bind(const CService &addr, unsigned int flags) {
     }
     return true;
 }
+void OnRPCStarted()
+{
+    uiInterface.NotifyBlockTip.connect(&RPCNotifyBlockChange);
+}
 
 void OnRPCStopped()
 {
+    uiInterface.NotifyBlockTip.disconnect(&RPCNotifyBlockChange);
+    RPCNotifyBlockChange(false, nullptr);
     cvBlockChange.notify_all();
     LogPrint("rpc", "RPC stopped.\n");
 }
@@ -666,6 +672,7 @@ bool InitSanityCheck(void)
 
 bool AppInitServers(boost::thread_group& threadGroup)
 {
+    RPCServer::OnStarted(&OnRPCStarted);
     RPCServer::OnStopped(&OnRPCStopped);
     RPCServer::OnPreCommand(&OnRPCPreCommand);
     if (!InitHTTPServer())
@@ -1357,6 +1364,7 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
                 {
                     LOCK(cs_main);
                     CBlockIndex* tip = chainActive.Tip();
+                    RPCNotifyBlockChange(true, tip);
                     if (tip && tip->nTime > GetAdjustedTime() + 2 * 60 * 60) {
                         strLoadError = _("The block database contains a block which appears to be from the future. "
                                 "This may be due to your computer's date and time being set incorrectly. "
diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp
index b90410017b692..dc7e4721bbc46 100644
--- a/src/rpc/blockchain.cpp
+++ b/src/rpc/blockchain.cpp
@@ -26,8 +26,20 @@
 
 #include <boost/thread/thread.hpp> // boost::thread::interrupt
 
+#include <mutex>
+#include <condition_variable>
 using namespace std;
 
+struct CUpdatedBlock
+{
+    uint256 hash;
+    int height;
+};
+
+static std::mutex cs_blockchange;
+static std::condition_variable cond_blockchange;
+static CUpdatedBlock latestblock;
+
 extern void TxToJSON(const CTransaction& tx, const uint256 hashBlock, UniValue& entry);
 void ScriptPubKeyToJSON(const CScript& scriptPubKey, UniValue& out, bool fIncludeHex);
 
@@ -168,6 +180,138 @@ UniValue getbestblockhash(const UniValue& params, bool fHelp)
     return chainActive.Tip()->GetBlockHash().GetHex();
 }
 
+void RPCNotifyBlockChange(bool ibd, const CBlockIndex * pindex)
+{
+    if(pindex) {
+        std::lock_guard<std::mutex> lock(cs_blockchange);
+        latestblock.hash = pindex->GetBlockHash();
+        latestblock.height = pindex->nHeight;
+    }
+	cond_blockchange.notify_all();
+}
+
+UniValue waitfornewblock(const UniValue& params, bool fHelp)
+{
+    if (fHelp || params.size() > 1)
+        throw runtime_error(
+            "waitfornewblock\n"
+            "\nWaits for a specific new block and returns useful info about it.\n"
+            "\nReturns the current block on timeout or exit.\n"
+            "\nArguments:\n"
+            "1. timeout (milliseconds) (int, optional, default=false)\n"
+            "\nResult::\n"
+            "{                           (json object)\n"
+            "  \"hash\" : {       (string) The blockhash\n"
+            "  \"height\" : {     (int) Block height\n"
+            "}\n"
+            "\nExamples\n"
+            + HelpExampleCli("waitfornewblock", "1000")
+            + HelpExampleRpc("waitfornewblock", "1000")
+        );
+    int timeout = 0;
+    if (params.size() > 0)
+        timeout = params[0].get_int();
+
+    CUpdatedBlock block;
+    {
+        std::unique_lock<std::mutex> lock(cs_blockchange);
+        block = latestblock;
+        if(timeout)
+            cond_blockchange.wait_for(lock, std::chrono::milliseconds(timeout), [&block]{return latestblock.height != block.height || latestblock.hash != block.hash || !IsRPCRunning(); });
+        else
+            cond_blockchange.wait(lock, [&block]{return latestblock.height != block.height || latestblock.hash != block.hash || !IsRPCRunning(); });
+        block = latestblock;
+    }
+    UniValue ret(UniValue::VOBJ);
+    ret.push_back(Pair("hash", block.hash.GetHex()));
+    ret.push_back(Pair("height", block.height));
+    return ret;
+}
+
+UniValue waitforblock(const UniValue& params, bool fHelp)
+{
+    if (fHelp || params.size() < 1 || params.size() > 2)
+        throw runtime_error(
+            "waitforblock\n"
+            "\nWaits for a specific new block and returns useful info about it.\n"
+            "\nReturns the current block on timeout or exit.\n"
+            "\nArguments:\n"
+            "1. blockhash to wait for (string)\n"
+            "2. timeout (milliseconds) (int, optional, default=false)\n"
+            "\nResult::\n"
+            "{                           (json object)\n"
+            "  \"hash\" : {       (string) The blockhash\n"
+            "  \"height\" : {     (int) Block height\n"
+            "}\n"
+            "\nExamples\n"
+            + HelpExampleCli("waitforblock", "\"0000000000079f8ef3d2c688c244eb7a4570b24c9ed7b4a8c619eb02596f8862\", 1000")
+            + HelpExampleRpc("waitforblock", "\"0000000000079f8ef3d2c688c244eb7a4570b24c9ed7b4a8c619eb02596f8862\", 1000")
+        );
+    int timeout = 0;
+
+    uint256 hash = uint256S(params[0].get_str());
+
+    if (params.size() > 1)
+        timeout = params[1].get_int();
+
+    CUpdatedBlock block;
+    {
+        std::unique_lock<std::mutex> lock(cs_blockchange);
+        if(timeout)
+            cond_blockchange.wait_for(lock, std::chrono::milliseconds(timeout), [&hash]{return latestblock.hash == hash || !IsRPCRunning();});
+        else
+            cond_blockchange.wait(lock, [&hash]{return latestblock.hash == hash || !IsRPCRunning(); });
+        block = latestblock;
+    }
+
+    UniValue ret(UniValue::VOBJ);
+    ret.push_back(Pair("hash", block.hash.GetHex()));
+    ret.push_back(Pair("height", block.height));
+    return ret;
+}
+
+UniValue waitforblockheight(const UniValue& params, bool fHelp)
+{
+    if (fHelp || params.size() < 1 || params.size() > 2)
+        throw runtime_error(
+            "waitforblock\n"
+            "\nWaits for (at least) block height and returns the height and hash\n"
+            "\nof the current tip.\n"
+            "\nReturns the current block on timeout or exit.\n"
+            "\nArguments:\n"
+            "1. block height to wait for (int)\n"
+            "2. timeout (milliseconds) (int, optional, default=false)\n"
+            "\nResult::\n"
+            "{                           (json object)\n"
+            "  \"hash\" : {       (string) The blockhash\n"
+            "  \"height\" : {     (int) Block height\n"
+            "}\n"
+            "\nExamples\n"
+            + HelpExampleCli("waitforblockheight", "\"100\", 1000")
+            + HelpExampleRpc("waitforblockheight", "\"100\", 1000")
+        );
+    int timeout = 0;
+
+    int height = params[0].get_int();
+
+    if (params.size() > 1)
+        timeout = params[1].get_int();
+
+    CUpdatedBlock block;
+    {
+        std::unique_lock<std::mutex> lock(cs_blockchange);
+        if(timeout)
+            cond_blockchange.wait_for(lock, std::chrono::milliseconds(timeout), [&height]{return latestblock.height >= height || !IsRPCRunning();});
+        else
+            cond_blockchange.wait(lock, [&height]{return latestblock.height >= height || !IsRPCRunning(); });
+        block = latestblock;
+    }
+    UniValue ret(UniValue::VOBJ);
+    ret.push_back(Pair("hash", block.hash.GetHex()));
+    ret.push_back(Pair("height", block.height));
+    return ret;
+}
+
 UniValue getdifficulty(const UniValue& params, bool fHelp)
 {
     if (fHelp || params.size() != 0)
@@ -1203,6 +1347,9 @@ static const CRPCCommand commands[] =
     /* Not shown in help */
     { "hidden",             "invalidateblock",        &invalidateblock,        true  },
     { "hidden",             "reconsiderblock",        &reconsiderblock,        true  },
+    { "hidden",             "waitfornewblock",        &waitfornewblock,        true  },
+    { "hidden",             "waitforblock",           &waitforblock,           true  },
+    { "hidden",             "waitforblockheight",     &waitforblockheight,     true  },
 };
 
 void RegisterBlockchainRPCCommands(CRPCTable &t)
diff --git a/src/rpc/client.cpp b/src/rpc/client.cpp
index 3003ea34528ae..c14d9d67474fe 100644
--- a/src/rpc/client.cpp
+++ b/src/rpc/client.cpp
@@ -46,6 +46,12 @@ static const CRPCConvertParam vRPCConvertParams[] =
     { "getbalance", 1 },
     { "getbalance", 2 },
     { "getblockhash", 0 },
+    { "waitforblockheight", 0 },
+    { "waitforblockheight", 1 },
+    { "waitforblock", 1 },
+    { "waitforblock", 2 },
+    { "waitfornewblock", 0 },
+    { "waitfornewblock", 1 },
     { "move", 2 },
     { "move", 3 },
     { "sendfrom", 2 },
diff --git a/src/rpc/server.h b/src/rpc/server.h
index b5ccc153d07ef..4e0aa2c6d6f6f 100644
--- a/src/rpc/server.h
+++ b/src/rpc/server.h
@@ -194,5 +194,6 @@ bool StartRPC();
 void InterruptRPC();
 void StopRPC();
 std::string JSONRPCExecBatch(const UniValue& vReq);
+void RPCNotifyBlockChange(bool ibd, const CBlockIndex *);
 
 #endif // BITCOIN_RPCSERVER_H

From ec81881b86b9680fcdcc42fd3ba31f04b8d09714 Mon Sep 17 00:00:00 2001
From: Jeremy Rubin <jeremy.l.rubin@gmail.com>
Date: Wed, 7 Sep 2016 18:24:40 -0400
Subject: [PATCH 0830/1802] Performance Regression Fix: Pre-Allocate txChanged
 vector

---
 src/main.cpp | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index 4b42afb561472..932e0653bc51d 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -2793,7 +2793,7 @@ static int64_t nTimePostConnect = 0;
  * Connect a new block to chainActive. pblock is either NULL or a pointer to a CBlock
  * corresponding to pindexNew, to bypass loading it again from disk.
  */
-bool static ConnectTip(CValidationState& state, const CChainParams& chainparams, CBlockIndex* pindexNew, const CBlock* pblock, std::list<CTransaction> &txConflicted, std::vector<std::tuple<CTransaction,CBlockIndex*,int> > &txChanged)
+bool static ConnectTip(CValidationState& state, const CChainParams& chainparams, CBlockIndex* pindexNew, const CBlock* pblock, std::list<CTransaction> &txConflicted, std::vector<std::tuple<CTransaction,CBlockIndex*,int>> &txChanged)
 {
     assert(pindexNew->pprev == chainActive.Tip());
     // Read block from disk.
@@ -2835,7 +2835,7 @@ bool static ConnectTip(CValidationState& state, const CChainParams& chainparams,
     UpdateTip(pindexNew, chainparams);
 
     for(unsigned int i=0; i < pblock->vtx.size(); i++)
-        txChanged.push_back(std::make_tuple(pblock->vtx[i], pindexNew, i));
+        txChanged.emplace_back(pblock->vtx[i], pindexNew, i);
 
     int64_t nTime6 = GetTimeMicros(); nTimePostConnect += nTime6 - nTime5; nTimeTotal += nTime6 - nTime1;
     LogPrint("bench", "  - Connect postprocess: %.2fms [%.2fs]\n", (nTime6 - nTime5) * 0.001, nTimePostConnect * 0.000001);
@@ -2917,7 +2917,7 @@ static void PruneBlockIndexCandidates() {
  * Try to make some progress towards making pindexMostWork the active block.
  * pblock is either NULL or a pointer to a CBlock corresponding to pindexMostWork.
  */
-static bool ActivateBestChainStep(CValidationState& state, const CChainParams& chainparams, CBlockIndex* pindexMostWork, const CBlock* pblock, bool& fInvalidFound, std::list<CTransaction>& txConflicted, std::vector<std::tuple<CTransaction,CBlockIndex*,int> >& txChanged)
+static bool ActivateBestChainStep(CValidationState& state, const CChainParams& chainparams, CBlockIndex* pindexMostWork, const CBlock* pblock, bool& fInvalidFound, std::list<CTransaction>& txConflicted, std::vector<std::tuple<CTransaction,CBlockIndex*,int>>& txChanged)
 {
     AssertLockHeld(cs_main);
     const CBlockIndex *pindexOldTip = chainActive.Tip();
@@ -3019,14 +3019,17 @@ static void NotifyHeaderTip() {
 bool ActivateBestChain(CValidationState &state, const CChainParams& chainparams, const CBlock *pblock) {
     CBlockIndex *pindexMostWork = NULL;
     CBlockIndex *pindexNewTip = NULL;
+    std::vector<std::tuple<CTransaction,CBlockIndex*,int>> txChanged;
+    if (pblock)
+        txChanged.reserve(pblock->vtx.size());
     do {
+        txChanged.clear();
         boost::this_thread::interruption_point();
         if (ShutdownRequested())
             break;
 
         const CBlockIndex *pindexFork;
         std::list<CTransaction> txConflicted;
-        std::vector<std::tuple<CTransaction,CBlockIndex*,int> > txChanged;
         bool fInitialDownload;
         int nNewHeight;
         {

From df2d2e70cac8d15ecc30bc5c46930fd27c8afac0 Mon Sep 17 00:00:00 2001
From: Gaurav Rana <bitcoinsSG@gmail.com>
Date: Thu, 8 Sep 2016 17:43:55 +0545
Subject: [PATCH 0831/1802] update name of file bitcoin.qrc

---
 doc/translation_process.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/translation_process.md b/doc/translation_process.md
index d8a85292e8ed8..a443a16fe240e 100644
--- a/doc/translation_process.md
+++ b/doc/translation_process.md
@@ -94,7 +94,7 @@ When new plurals are added to the source file, it's important to do the followin
 7. Save the source file
 
 ### Translating a new language
-To create a new language template, you will need to edit the languages manifest file `src/qt/bitcoin.qrc` and add a new entry. Below is an example of the English language entry.
+To create a new language template, you will need to edit the languages manifest file `src/qt/bitcoin_locale.qrc` and add a new entry. Below is an example of the English language entry.
 
 ```xml
 <qresource prefix="/translations">

From 531214fb100c14e62921085cd68cabe2b20ee0eb Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Fri, 19 Aug 2016 15:38:04 -0400
Subject: [PATCH 0832/1802] gui: add NodeID to the peer table

---
 src/qt/guiutil.cpp        | 8 ++++----
 src/qt/guiutil.h          | 2 +-
 src/qt/peertablemodel.cpp | 6 +++++-
 src/qt/peertablemodel.h   | 7 ++++---
 src/qt/rpcconsole.cpp     | 6 +++---
 5 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/src/qt/guiutil.cpp b/src/qt/guiutil.cpp
index c00f5e8591f3a..444e35de8af5c 100644
--- a/src/qt/guiutil.cpp
+++ b/src/qt/guiutil.cpp
@@ -291,17 +291,17 @@ void copyEntryData(QAbstractItemView *view, int column, int role)
     }
 }
 
-QString getEntryData(QAbstractItemView *view, int column, int role)
+QVariant getEntryData(QAbstractItemView *view, int column, int role)
 {
     if(!view || !view->selectionModel())
-        return QString();
+        return QVariant();
     QModelIndexList selection = view->selectionModel()->selectedRows(column);
 
     if(!selection.isEmpty()) {
         // Return first item
-        return (selection.at(0).data(role).toString());
+        return (selection.at(0).data(role));
     }
-    return QString();
+    return QVariant();
 }
 
 QString getSaveFileName(QWidget *parent, const QString &caption, const QString &dir,
diff --git a/src/qt/guiutil.h b/src/qt/guiutil.h
index 9267e0a6c9db0..d5a658e7c0add 100644
--- a/src/qt/guiutil.h
+++ b/src/qt/guiutil.h
@@ -70,7 +70,7 @@ namespace GUIUtil
        @param[in] role    Data role to extract from the model
        @see  TransactionView::copyLabel, TransactionView::copyAmount, TransactionView::copyAddress
      */
-    QString getEntryData(QAbstractItemView *view, int column, int role);
+    QVariant getEntryData(QAbstractItemView *view, int column, int role);
 
     void setClipboard(const QString& str);
 
diff --git a/src/qt/peertablemodel.cpp b/src/qt/peertablemodel.cpp
index 84ad0052fdd90..0eb28f4ae18e8 100644
--- a/src/qt/peertablemodel.cpp
+++ b/src/qt/peertablemodel.cpp
@@ -24,6 +24,8 @@ bool NodeLessThan::operator()(const CNodeCombinedStats &left, const CNodeCombine
 
     switch(column)
     {
+    case PeerTableModel::NetNodeId:
+        return pLeft->nodeid < pRight->nodeid;
     case PeerTableModel::Address:
         return pLeft->addrName.compare(pRight->addrName) < 0;
     case PeerTableModel::Subversion:
@@ -114,7 +116,7 @@ PeerTableModel::PeerTableModel(ClientModel *parent) :
     clientModel(parent),
     timer(0)
 {
-    columns << tr("Node/Service") << tr("User Agent") << tr("Ping Time");
+    columns << tr("NodeId") << tr("Node/Service") << tr("User Agent") << tr("Ping Time");
     priv = new PeerTablePriv();
     // default to unsorted
     priv->sortColumn = -1;
@@ -160,6 +162,8 @@ QVariant PeerTableModel::data(const QModelIndex &index, int role) const
     if (role == Qt::DisplayRole) {
         switch(index.column())
         {
+        case NetNodeId:
+            return rec->nodeStats.nodeid;
         case Address:
             return QString::fromStdString(rec->nodeStats.addrName);
         case Subversion:
diff --git a/src/qt/peertablemodel.h b/src/qt/peertablemodel.h
index a2aaaa5d24b94..a4f7bbdb3d708 100644
--- a/src/qt/peertablemodel.h
+++ b/src/qt/peertablemodel.h
@@ -52,9 +52,10 @@ class PeerTableModel : public QAbstractTableModel
     void stopAutoRefresh();
 
     enum ColumnIndex {
-        Address = 0,
-        Subversion = 1,
-        Ping = 2
+        NetNodeId = 0,
+        Address = 1,
+        Subversion = 2,
+        Ping = 3
     };
 
     /** @name Methods overridden from QAbstractTableModel
diff --git a/src/qt/rpcconsole.cpp b/src/qt/rpcconsole.cpp
index bcaa9164c91ba..e5720dd70e0cd 100644
--- a/src/qt/rpcconsole.cpp
+++ b/src/qt/rpcconsole.cpp
@@ -877,7 +877,7 @@ void RPCConsole::showBanTableContextMenu(const QPoint& point)
 void RPCConsole::disconnectSelectedNode()
 {
     // Get currently selected peer address
-    QString strNode = GUIUtil::getEntryData(ui->peerWidget, 0, PeerTableModel::Address);
+    QString strNode = GUIUtil::getEntryData(ui->peerWidget, 0, PeerTableModel::Address).toString();
     // Find the node, disconnect it and clear the selected node
     if (CNode *bannedNode = FindNode(strNode.toStdString())) {
         bannedNode->fDisconnect = true;
@@ -891,7 +891,7 @@ void RPCConsole::banSelectedNode(int bantime)
         return;
 
     // Get currently selected peer address
-    QString strNode = GUIUtil::getEntryData(ui->peerWidget, 0, PeerTableModel::Address);
+    QString strNode = GUIUtil::getEntryData(ui->peerWidget, 0, PeerTableModel::Address).toString();
     // Find possible nodes, ban it and clear the selected node
     if (FindNode(strNode.toStdString())) {
         std::string nStr = strNode.toStdString();
@@ -915,7 +915,7 @@ void RPCConsole::unbanSelectedNode()
         return;
 
     // Get currently selected ban address
-    QString strNode = GUIUtil::getEntryData(ui->banlistWidget, 0, BanTableModel::Address);
+    QString strNode = GUIUtil::getEntryData(ui->banlistWidget, 0, BanTableModel::Address).toString();
     CSubNet possibleSubnet;
 
     LookupSubNet(strNode.toStdString().c_str(), possibleSubnet);

From d93b14dc5ddfb937b0cc18be425b9d048cefb66b Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Sat, 16 Apr 2016 00:13:15 -0400
Subject: [PATCH 0833/1802] net: move CBanDB and CAddrDB out of net.h/cpp

This will eventually solve a circular dependency
---
 src/Makefile.am |   2 +
 src/addrdb.cpp  | 218 ++++++++++++++++++++++++++++++++++++++++++++++++
 src/addrdb.h    | 102 ++++++++++++++++++++++
 src/net.cpp     | 209 ----------------------------------------------
 src/net.h       |  84 +------------------
 5 files changed, 323 insertions(+), 292 deletions(-)
 create mode 100644 src/addrdb.cpp
 create mode 100644 src/addrdb.h

diff --git a/src/Makefile.am b/src/Makefile.am
index 03fac5bf979ac..ebdddc87f54a2 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -71,6 +71,7 @@ endif
 .PHONY: FORCE check-symbols check-security
 # bitcoin core #
 BITCOIN_CORE_H = \
+  addrdb.h \
   addrman.h \
   base58.h \
   bloom.h \
@@ -164,6 +165,7 @@ libbitcoin_server_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(MINIUPNPC_CP
 libbitcoin_server_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
 libbitcoin_server_a_SOURCES = \
   addrman.cpp \
+  addrdb.cpp \
   bloom.cpp \
   blockencodings.cpp \
   chain.cpp \
diff --git a/src/addrdb.cpp b/src/addrdb.cpp
new file mode 100644
index 0000000000000..ddf41f92de0ea
--- /dev/null
+++ b/src/addrdb.cpp
@@ -0,0 +1,218 @@
+// Copyright (c) 2009-2010 Satoshi Nakamoto
+// Copyright (c) 2009-2015 The Bitcoin Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#include "addrdb.h"
+
+#include "addrman.h"
+#include "chainparams.h"
+#include "clientversion.h"
+#include "hash.h"
+#include "random.h"
+#include "streams.h"
+#include "tinyformat.h"
+#include "util.h"
+
+#include <boost/filesystem.hpp>
+
+CBanDB::CBanDB()
+{
+    pathBanlist = GetDataDir() / "banlist.dat";
+}
+
+bool CBanDB::Write(const banmap_t& banSet)
+{
+    // Generate random temporary filename
+    unsigned short randv = 0;
+    GetRandBytes((unsigned char*)&randv, sizeof(randv));
+    std::string tmpfn = strprintf("banlist.dat.%04x", randv);
+
+    // serialize banlist, checksum data up to that point, then append csum
+    CDataStream ssBanlist(SER_DISK, CLIENT_VERSION);
+    ssBanlist << FLATDATA(Params().MessageStart());
+    ssBanlist << banSet;
+    uint256 hash = Hash(ssBanlist.begin(), ssBanlist.end());
+    ssBanlist << hash;
+
+    // open temp output file, and associate with CAutoFile
+    boost::filesystem::path pathTmp = GetDataDir() / tmpfn;
+    FILE *file = fopen(pathTmp.string().c_str(), "wb");
+    CAutoFile fileout(file, SER_DISK, CLIENT_VERSION);
+    if (fileout.IsNull())
+        return error("%s: Failed to open file %s", __func__, pathTmp.string());
+
+    // Write and commit header, data
+    try {
+        fileout << ssBanlist;
+    }
+    catch (const std::exception& e) {
+        return error("%s: Serialize or I/O error - %s", __func__, e.what());
+    }
+    FileCommit(fileout.Get());
+    fileout.fclose();
+
+    // replace existing banlist.dat, if any, with new banlist.dat.XXXX
+    if (!RenameOver(pathTmp, pathBanlist))
+        return error("%s: Rename-into-place failed", __func__);
+
+    return true;
+}
+
+bool CBanDB::Read(banmap_t& banSet)
+{
+    // open input file, and associate with CAutoFile
+    FILE *file = fopen(pathBanlist.string().c_str(), "rb");
+    CAutoFile filein(file, SER_DISK, CLIENT_VERSION);
+    if (filein.IsNull())
+        return error("%s: Failed to open file %s", __func__, pathBanlist.string());
+
+    // use file size to size memory buffer
+    uint64_t fileSize = boost::filesystem::file_size(pathBanlist);
+    uint64_t dataSize = 0;
+    // Don't try to resize to a negative number if file is small
+    if (fileSize >= sizeof(uint256))
+        dataSize = fileSize - sizeof(uint256);
+    std::vector<unsigned char> vchData;
+    vchData.resize(dataSize);
+    uint256 hashIn;
+
+    // read data and checksum from file
+    try {
+        filein.read((char *)&vchData[0], dataSize);
+        filein >> hashIn;
+    }
+    catch (const std::exception& e) {
+        return error("%s: Deserialize or I/O error - %s", __func__, e.what());
+    }
+    filein.fclose();
+
+    CDataStream ssBanlist(vchData, SER_DISK, CLIENT_VERSION);
+
+    // verify stored checksum matches input data
+    uint256 hashTmp = Hash(ssBanlist.begin(), ssBanlist.end());
+    if (hashIn != hashTmp)
+        return error("%s: Checksum mismatch, data corrupted", __func__);
+
+    unsigned char pchMsgTmp[4];
+    try {
+        // de-serialize file header (network specific magic number) and ..
+        ssBanlist >> FLATDATA(pchMsgTmp);
+
+        // ... verify the network matches ours
+        if (memcmp(pchMsgTmp, Params().MessageStart(), sizeof(pchMsgTmp)))
+            return error("%s: Invalid network magic number", __func__);
+
+        // de-serialize address data into one CAddrMan object
+        ssBanlist >> banSet;
+    }
+    catch (const std::exception& e) {
+        return error("%s: Deserialize or I/O error - %s", __func__, e.what());
+    }
+
+    return true;
+}
+
+CAddrDB::CAddrDB()
+{
+    pathAddr = GetDataDir() / "peers.dat";
+}
+
+bool CAddrDB::Write(const CAddrMan& addr)
+{
+    // Generate random temporary filename
+    unsigned short randv = 0;
+    GetRandBytes((unsigned char*)&randv, sizeof(randv));
+    std::string tmpfn = strprintf("peers.dat.%04x", randv);
+
+    // serialize addresses, checksum data up to that point, then append csum
+    CDataStream ssPeers(SER_DISK, CLIENT_VERSION);
+    ssPeers << FLATDATA(Params().MessageStart());
+    ssPeers << addr;
+    uint256 hash = Hash(ssPeers.begin(), ssPeers.end());
+    ssPeers << hash;
+
+    // open temp output file, and associate with CAutoFile
+    boost::filesystem::path pathTmp = GetDataDir() / tmpfn;
+    FILE *file = fopen(pathTmp.string().c_str(), "wb");
+    CAutoFile fileout(file, SER_DISK, CLIENT_VERSION);
+    if (fileout.IsNull())
+        return error("%s: Failed to open file %s", __func__, pathTmp.string());
+
+    // Write and commit header, data
+    try {
+        fileout << ssPeers;
+    }
+    catch (const std::exception& e) {
+        return error("%s: Serialize or I/O error - %s", __func__, e.what());
+    }
+    FileCommit(fileout.Get());
+    fileout.fclose();
+
+    // replace existing peers.dat, if any, with new peers.dat.XXXX
+    if (!RenameOver(pathTmp, pathAddr))
+        return error("%s: Rename-into-place failed", __func__);
+
+    return true;
+}
+
+bool CAddrDB::Read(CAddrMan& addr)
+{
+    // open input file, and associate with CAutoFile
+    FILE *file = fopen(pathAddr.string().c_str(), "rb");
+    CAutoFile filein(file, SER_DISK, CLIENT_VERSION);
+    if (filein.IsNull())
+        return error("%s: Failed to open file %s", __func__, pathAddr.string());
+
+    // use file size to size memory buffer
+    uint64_t fileSize = boost::filesystem::file_size(pathAddr);
+    uint64_t dataSize = 0;
+    // Don't try to resize to a negative number if file is small
+    if (fileSize >= sizeof(uint256))
+        dataSize = fileSize - sizeof(uint256);
+    std::vector<unsigned char> vchData;
+    vchData.resize(dataSize);
+    uint256 hashIn;
+
+    // read data and checksum from file
+    try {
+        filein.read((char *)&vchData[0], dataSize);
+        filein >> hashIn;
+    }
+    catch (const std::exception& e) {
+        return error("%s: Deserialize or I/O error - %s", __func__, e.what());
+    }
+    filein.fclose();
+
+    CDataStream ssPeers(vchData, SER_DISK, CLIENT_VERSION);
+
+    // verify stored checksum matches input data
+    uint256 hashTmp = Hash(ssPeers.begin(), ssPeers.end());
+    if (hashIn != hashTmp)
+        return error("%s: Checksum mismatch, data corrupted", __func__);
+
+    return Read(addr, ssPeers);
+}
+
+bool CAddrDB::Read(CAddrMan& addr, CDataStream& ssPeers)
+{
+    unsigned char pchMsgTmp[4];
+    try {
+        // de-serialize file header (network specific magic number) and ..
+        ssPeers >> FLATDATA(pchMsgTmp);
+
+        // ... verify the network matches ours
+        if (memcmp(pchMsgTmp, Params().MessageStart(), sizeof(pchMsgTmp)))
+            return error("%s: Invalid network magic number", __func__);
+
+        // de-serialize address data into one CAddrMan object
+        ssPeers >> addr;
+    }
+    catch (const std::exception& e) {
+        // de-serialization has failed, ensure addrman is left in a clean state
+        addr.Clear();
+        return error("%s: Deserialize or I/O error - %s", __func__, e.what());
+    }
+
+    return true;
+}
diff --git a/src/addrdb.h b/src/addrdb.h
new file mode 100644
index 0000000000000..3ffcfe3e17468
--- /dev/null
+++ b/src/addrdb.h
@@ -0,0 +1,102 @@
+// Copyright (c) 2009-2010 Satoshi Nakamoto
+// Copyright (c) 2009-2015 The Bitcoin Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#ifndef BITCOIN_ADDRDB_H
+#define BITCOIN_ADDRDB_H
+
+#include "serialize.h"
+
+#include <string>
+#include <map>
+#include <boost/filesystem/path.hpp>
+
+class CSubNet;
+class CAddrMan;
+
+typedef enum BanReason
+{
+    BanReasonUnknown          = 0,
+    BanReasonNodeMisbehaving  = 1,
+    BanReasonManuallyAdded    = 2
+} BanReason;
+
+class CBanEntry
+{
+public:
+    static const int CURRENT_VERSION=1;
+    int nVersion;
+    int64_t nCreateTime;
+    int64_t nBanUntil;
+    uint8_t banReason;
+
+    CBanEntry()
+    {
+        SetNull();
+    }
+
+    CBanEntry(int64_t nCreateTimeIn)
+    {
+        SetNull();
+        nCreateTime = nCreateTimeIn;
+    }
+
+    ADD_SERIALIZE_METHODS;
+
+    template <typename Stream, typename Operation>
+    inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) {
+        READWRITE(this->nVersion);
+        nVersion = this->nVersion;
+        READWRITE(nCreateTime);
+        READWRITE(nBanUntil);
+        READWRITE(banReason);
+    }
+
+    void SetNull()
+    {
+        nVersion = CBanEntry::CURRENT_VERSION;
+        nCreateTime = 0;
+        nBanUntil = 0;
+        banReason = BanReasonUnknown;
+    }
+
+    std::string banReasonToString()
+    {
+        switch (banReason) {
+        case BanReasonNodeMisbehaving:
+            return "node misbehaving";
+        case BanReasonManuallyAdded:
+            return "manually added";
+        default:
+            return "unknown";
+        }
+    }
+};
+
+typedef std::map<CSubNet, CBanEntry> banmap_t;
+
+/** Access to the (IP) address database (peers.dat) */
+class CAddrDB
+{
+private:
+    boost::filesystem::path pathAddr;
+public:
+    CAddrDB();
+    bool Write(const CAddrMan& addr);
+    bool Read(CAddrMan& addr);
+    bool Read(CAddrMan& addr, CDataStream& ssPeers);
+};
+
+/** Access to the banlist database (banlist.dat) */
+class CBanDB
+{
+private:
+    boost::filesystem::path pathBanlist;
+public:
+    CBanDB();
+    bool Write(const banmap_t& banSet);
+    bool Read(banmap_t& banSet);
+};
+
+#endif // BITCOIN_ADDRDB_H
diff --git a/src/net.cpp b/src/net.cpp
index c5b080f794096..cee149ee7ee06 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -2356,114 +2356,6 @@ void CNode::Fuzz(int nChance)
     Fuzz(2);
 }
 
-//
-// CAddrDB
-//
-
-CAddrDB::CAddrDB()
-{
-    pathAddr = GetDataDir() / "peers.dat";
-}
-
-bool CAddrDB::Write(const CAddrMan& addr)
-{
-    // Generate random temporary filename
-    unsigned short randv = 0;
-    GetRandBytes((unsigned char*)&randv, sizeof(randv));
-    std::string tmpfn = strprintf("peers.dat.%04x", randv);
-
-    // serialize addresses, checksum data up to that point, then append csum
-    CDataStream ssPeers(SER_DISK, CLIENT_VERSION);
-    ssPeers << FLATDATA(Params().MessageStart());
-    ssPeers << addr;
-    uint256 hash = Hash(ssPeers.begin(), ssPeers.end());
-    ssPeers << hash;
-
-    // open temp output file, and associate with CAutoFile
-    boost::filesystem::path pathTmp = GetDataDir() / tmpfn;
-    FILE *file = fopen(pathTmp.string().c_str(), "wb");
-    CAutoFile fileout(file, SER_DISK, CLIENT_VERSION);
-    if (fileout.IsNull())
-        return error("%s: Failed to open file %s", __func__, pathTmp.string());
-
-    // Write and commit header, data
-    try {
-        fileout << ssPeers;
-    }
-    catch (const std::exception& e) {
-        return error("%s: Serialize or I/O error - %s", __func__, e.what());
-    }
-    FileCommit(fileout.Get());
-    fileout.fclose();
-
-    // replace existing peers.dat, if any, with new peers.dat.XXXX
-    if (!RenameOver(pathTmp, pathAddr))
-        return error("%s: Rename-into-place failed", __func__);
-
-    return true;
-}
-
-bool CAddrDB::Read(CAddrMan& addr)
-{
-    // open input file, and associate with CAutoFile
-    FILE *file = fopen(pathAddr.string().c_str(), "rb");
-    CAutoFile filein(file, SER_DISK, CLIENT_VERSION);
-    if (filein.IsNull())
-        return error("%s: Failed to open file %s", __func__, pathAddr.string());
-
-    // use file size to size memory buffer
-    uint64_t fileSize = boost::filesystem::file_size(pathAddr);
-    uint64_t dataSize = 0;
-    // Don't try to resize to a negative number if file is small
-    if (fileSize >= sizeof(uint256))
-        dataSize = fileSize - sizeof(uint256);
-    std::vector<unsigned char> vchData;
-    vchData.resize(dataSize);
-    uint256 hashIn;
-
-    // read data and checksum from file
-    try {
-        filein.read((char *)&vchData[0], dataSize);
-        filein >> hashIn;
-    }
-    catch (const std::exception& e) {
-        return error("%s: Deserialize or I/O error - %s", __func__, e.what());
-    }
-    filein.fclose();
-
-    CDataStream ssPeers(vchData, SER_DISK, CLIENT_VERSION);
-
-    // verify stored checksum matches input data
-    uint256 hashTmp = Hash(ssPeers.begin(), ssPeers.end());
-    if (hashIn != hashTmp)
-        return error("%s: Checksum mismatch, data corrupted", __func__);
-
-    return Read(addr, ssPeers);
-}
-
-bool CAddrDB::Read(CAddrMan& addr, CDataStream& ssPeers)
-{
-    unsigned char pchMsgTmp[4];
-    try {
-        // de-serialize file header (network specific magic number) and ..
-        ssPeers >> FLATDATA(pchMsgTmp);
-
-        // ... verify the network matches ours
-        if (memcmp(pchMsgTmp, Params().MessageStart(), sizeof(pchMsgTmp)))
-            return error("%s: Invalid network magic number", __func__);
-
-        // de-serialize address data into one CAddrMan object
-        ssPeers >> addr;
-    }
-    catch (const std::exception& e) {
-        // de-serialization has failed, ensure addrman is left in a clean state
-        addr.Clear();
-        return error("%s: Deserialize or I/O error - %s", __func__, e.what());
-    }
-
-    return true;
-}
-
 unsigned int ReceiveFloodSize() { return 1000*GetArg("-maxreceivebuffer", DEFAULT_MAXRECEIVEBUFFER); }
 unsigned int SendBufferSize() { return 1000*GetArg("-maxsendbuffer", DEFAULT_MAXSENDBUFFER); }
 
@@ -2649,107 +2541,6 @@ void CNode::EndMessage(const char* pszCommand) UNLOCK_FUNCTION(cs_vSend)
     LEAVE_CRITICAL_SECTION(cs_vSend);
 }
 
-//
-// CBanDB
-//
-
-CBanDB::CBanDB()
-{
-    pathBanlist = GetDataDir() / "banlist.dat";
-}
-
-bool CBanDB::Write(const banmap_t& banSet)
-{
-    // Generate random temporary filename
-    unsigned short randv = 0;
-    GetRandBytes((unsigned char*)&randv, sizeof(randv));
-    std::string tmpfn = strprintf("banlist.dat.%04x", randv);
-
-    // serialize banlist, checksum data up to that point, then append csum
-    CDataStream ssBanlist(SER_DISK, CLIENT_VERSION);
-    ssBanlist << FLATDATA(Params().MessageStart());
-    ssBanlist << banSet;
-    uint256 hash = Hash(ssBanlist.begin(), ssBanlist.end());
-    ssBanlist << hash;
-
-    // open temp output file, and associate with CAutoFile
-    boost::filesystem::path pathTmp = GetDataDir() / tmpfn;
-    FILE *file = fopen(pathTmp.string().c_str(), "wb");
-    CAutoFile fileout(file, SER_DISK, CLIENT_VERSION);
-    if (fileout.IsNull())
-        return error("%s: Failed to open file %s", __func__, pathTmp.string());
-
-    // Write and commit header, data
-    try {
-        fileout << ssBanlist;
-    }
-    catch (const std::exception& e) {
-        return error("%s: Serialize or I/O error - %s", __func__, e.what());
-    }
-    FileCommit(fileout.Get());
-    fileout.fclose();
-
-    // replace existing banlist.dat, if any, with new banlist.dat.XXXX
-    if (!RenameOver(pathTmp, pathBanlist))
-        return error("%s: Rename-into-place failed", __func__);
-
-    return true;
-}
-
-bool CBanDB::Read(banmap_t& banSet)
-{
-    // open input file, and associate with CAutoFile
-    FILE *file = fopen(pathBanlist.string().c_str(), "rb");
-    CAutoFile filein(file, SER_DISK, CLIENT_VERSION);
-    if (filein.IsNull())
-        return error("%s: Failed to open file %s", __func__, pathBanlist.string());
-
-    // use file size to size memory buffer
-    uint64_t fileSize = boost::filesystem::file_size(pathBanlist);
-    uint64_t dataSize = 0;
-    // Don't try to resize to a negative number if file is small
-    if (fileSize >= sizeof(uint256))
-        dataSize = fileSize - sizeof(uint256);
-    std::vector<unsigned char> vchData;
-    vchData.resize(dataSize);
-    uint256 hashIn;
-
-    // read data and checksum from file
-    try {
-        filein.read((char *)&vchData[0], dataSize);
-        filein >> hashIn;
-    }
-    catch (const std::exception& e) {
-        return error("%s: Deserialize or I/O error - %s", __func__, e.what());
-    }
-    filein.fclose();
-
-    CDataStream ssBanlist(vchData, SER_DISK, CLIENT_VERSION);
-
-    // verify stored checksum matches input data
-    uint256 hashTmp = Hash(ssBanlist.begin(), ssBanlist.end());
-    if (hashIn != hashTmp)
-        return error("%s: Checksum mismatch, data corrupted", __func__);
-
-    unsigned char pchMsgTmp[4];
-    try {
-        // de-serialize file header (network specific magic number) and ..
-        ssBanlist >> FLATDATA(pchMsgTmp);
-
-        // ... verify the network matches ours
-        if (memcmp(pchMsgTmp, Params().MessageStart(), sizeof(pchMsgTmp)))
-            return error("%s: Invalid network magic number", __func__);
-
-        // de-serialize address data into one CAddrMan object
-        ssBanlist >> banSet;
-    }
-    catch (const std::exception& e) {
-        return error("%s: Deserialize or I/O error - %s", __func__, e.what());
-    }
-
-    return true;
-}
-
 int64_t PoissonNextSend(int64_t nNow, int average_interval_seconds) {
     return nNow + (int64_t)(log1p(GetRand(1ULL << 48) * -0.0000000000000035527136788 /* -1/2^48 */) * average_interval_seconds * -1000000.0 + 0.5);
 }
diff --git a/src/net.h b/src/net.h
index b9cc81e4e9c50..0d1c62e428fb6 100644
--- a/src/net.h
+++ b/src/net.h
@@ -6,6 +6,7 @@
 #ifndef BITCOIN_NET_H
 #define BITCOIN_NET_H
 
+#include "addrdb.h"
 #include "amount.h"
 #include "bloom.h"
 #include "compat.h"
@@ -256,67 +257,6 @@ class CNetMessage {
 };
 
 
-typedef enum BanReason
-{
-    BanReasonUnknown          = 0,
-    BanReasonNodeMisbehaving  = 1,
-    BanReasonManuallyAdded    = 2
-} BanReason;
-
-class CBanEntry
-{
-public:
-    static const int CURRENT_VERSION=1;
-    int nVersion;
-    int64_t nCreateTime;
-    int64_t nBanUntil;
-    uint8_t banReason;
-
-    CBanEntry()
-    {
-        SetNull();
-    }
-
-    CBanEntry(int64_t nCreateTimeIn)
-    {
-        SetNull();
-        nCreateTime = nCreateTimeIn;
-    }
-
-    ADD_SERIALIZE_METHODS;
-
-    template <typename Stream, typename Operation>
-    inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) {
-        READWRITE(this->nVersion);
-        nVersion = this->nVersion;
-        READWRITE(nCreateTime);
-        READWRITE(nBanUntil);
-        READWRITE(banReason);
-    }
-
-    void SetNull()
-    {
-        nVersion = CBanEntry::CURRENT_VERSION;
-        nCreateTime = 0;
-        nBanUntil = 0;
-        banReason = BanReasonUnknown;
-    }
-
-    std::string banReasonToString()
-    {
-        switch (banReason) {
-        case BanReasonNodeMisbehaving:
-            return "node misbehaving";
-        case BanReasonManuallyAdded:
-            return "manually added";
-        default:
-            return "unknown";
-        }
-    }
-};
-
-typedef std::map<CSubNet, CBanEntry> banmap_t;
-
 /** Information about a peer */
 class CNode
 {
@@ -819,28 +759,6 @@ class CNode
 class CTransaction;
 void RelayTransaction(const CTransaction& tx);
 
-/** Access to the (IP) address database (peers.dat) */
-class CAddrDB
-{
-private:
-    boost::filesystem::path pathAddr;
-public:
-    CAddrDB();
-    bool Write(const CAddrMan& addr);
-    bool Read(CAddrMan& addr);
-    bool Read(CAddrMan& addr, CDataStream& ssPeers);
-};
-
-/** Access to the banlist database (banlist.dat) */
-class CBanDB
-{
-private:
-    boost::filesystem::path pathBanlist;
-public:
-    CBanDB();
-    bool Write(const banmap_t& banSet);
-    bool Read(banmap_t& banSet);
-};
 
 /** Return a timestamp in the future (in microseconds) for exponentially distributed events. */
 int64_t PoissonNextSend(int64_t nNow, int average_interval_seconds);

From cd16f48028f54327d4afba9c1f91f25d0b072aa5 Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Sat, 16 Apr 2016 14:47:18 -0400
Subject: [PATCH 0834/1802] net: Create CConnman to encapsulate p2p connections

---
 src/addrdb.h              |   1 +
 src/init.cpp              |  14 ++++-
 src/net.cpp               | 113 +++++++++++++++++++++-----------------
 src/net.h                 |  30 +++++++++-
 src/test/test_bitcoin.cpp |   6 ++
 src/test/test_bitcoin.h   |   2 +
 6 files changed, 112 insertions(+), 54 deletions(-)

diff --git a/src/addrdb.h b/src/addrdb.h
index 3ffcfe3e17468..d8c66d872bb18 100644
--- a/src/addrdb.h
+++ b/src/addrdb.h
@@ -14,6 +14,7 @@
 
 class CSubNet;
 class CAddrMan;
+class CDataStream;
 
 typedef enum BanReason
 {
diff --git a/src/init.cpp b/src/init.cpp
index 27843fa882318..6aaa7bfc5db00 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -42,6 +42,7 @@
 #endif
 #include <stdint.h>
 #include <stdio.h>
+#include <memory>
 
 #ifndef WIN32
 #include <signal.h>
@@ -70,6 +71,7 @@ static const bool DEFAULT_REST_ENABLE = false;
 static const bool DEFAULT_DISABLE_SAFEMODE = false;
 static const bool DEFAULT_STOPAFTERBLOCKIMPORT = false;
 
+std::unique_ptr<CConnman> g_connman;
 
 #if ENABLE_ZMQ
 static CZMQNotificationInterface* pzmqNotificationInterface = NULL;
@@ -197,7 +199,9 @@ void Shutdown()
     if (pwalletMain)
         pwalletMain->Flush(false);
 #endif
-    StopNode();
+    StopNode(*g_connman);
+    g_connman.reset();
+
     StopTorControl();
     UnregisterNodeSignals(GetNodeSignals());
 
@@ -1101,6 +1105,10 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
 #endif // ENABLE_WALLET
     // ********************************************************* Step 6: network initialization
 
+    assert(!g_connman);
+    g_connman = std::unique_ptr<CConnman>(new CConnman());
+    CConnman& connman = *g_connman;
+
     RegisterNodeSignals(GetNodeSignals());
 
     // sanitize comments per BIP-0014, format user agent and check total size
@@ -1497,7 +1505,9 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
     if (GetBoolArg("-listenonion", DEFAULT_LISTEN_ONION))
         StartTorControl(threadGroup, scheduler);
 
-    StartNode(threadGroup, scheduler);
+    std::string strNodeError;
+    if(!StartNode(connman, threadGroup, scheduler, strNodeError))
+        return InitError(strNodeError);
 
     // ********************************************************* Step 12: finished
 
diff --git a/src/net.cpp b/src/net.cpp
index cee149ee7ee06..6177dc04ff4c1 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -65,13 +65,6 @@
 namespace {
     const int MAX_OUTBOUND_CONNECTIONS = 8;
     const int MAX_FEELER_CONNECTIONS = 1;
-
-    struct ListenSocket {
-        SOCKET socket;
-        bool whitelisted;
-
-        ListenSocket(SOCKET _socket, bool _whitelisted) : socket(_socket), whitelisted(_whitelisted) {}
-    };
 }
 
 const static std::string NET_MESSAGE_COMMAND_OTHER = "*other*";
@@ -1015,7 +1008,7 @@ static bool AttemptToEvictConnection() {
     return false;
 }
 
-static void AcceptConnection(const ListenSocket& hListenSocket) {
+void CConnman::AcceptConnection(const ListenSocket& hListenSocket) {
     struct sockaddr_storage sockaddr;
     socklen_t len = sizeof(sockaddr);
     SOCKET hSocket = accept(hListenSocket.socket, (struct sockaddr*)&sockaddr, &len);
@@ -1089,7 +1082,7 @@ static void AcceptConnection(const ListenSocket& hListenSocket) {
     }
 }
 
-void ThreadSocketHandler()
+void CConnman::ThreadSocketHandler()
 {
     unsigned int nPrevNodeCount = 0;
     while (true)
@@ -1497,7 +1490,7 @@ static std::string GetDNSHost(const CDNSSeedData& data, ServiceFlags* requiredSe
 }
 
 
-void ThreadDNSAddressSeed()
+void CConnman::ThreadDNSAddressSeed()
 {
     // goal: only query DNS seeds if address need is acute
     if ((addrman.size() > 0) &&
@@ -1577,7 +1570,7 @@ void DumpData()
     DumpBanlist();
 }
 
-void static ProcessOneShot()
+void CConnman::ProcessOneShot()
 {
     std::string strDest;
     {
@@ -1595,7 +1588,7 @@ void static ProcessOneShot()
     }
 }
 
-void ThreadOpenConnections()
+void CConnman::ThreadOpenConnections()
 {
     // Connect to specific addresses
     if (mapArgs.count("-connect") && mapMultiArgs["-connect"].size() > 0)
@@ -1791,7 +1784,7 @@ std::vector<AddedNodeInfo> GetAddedNodeInfo()
     return ret;
 }
 
-void ThreadOpenAddedConnections()
+void CConnman::ThreadOpenAddedConnections()
 {
     {
         LOCK(cs_vAddedNodes);
@@ -1848,7 +1841,7 @@ bool OpenNetworkConnection(const CAddress& addrConnect, bool fCountFailure, CSem
 }
 
 
-void ThreadMessageHandler()
+void CConnman::ThreadMessageHandler()
 {
     boost::mutex condition_mutex;
     boost::unique_lock<boost::mutex> lock(condition_mutex);
@@ -2064,7 +2057,11 @@ void static Discover(boost::thread_group& threadGroup)
 #endif
 }
 
-void StartNode(boost::thread_group& threadGroup, CScheduler& scheduler)
+CConnman::CConnman()
+{
+}
+
+bool StartNode(CConnman& connman, boost::thread_group& threadGroup, CScheduler& scheduler, std::string& strNodeError)
 {
     uiInterface.InitMessage(_("Loading addresses..."));
     // Load addresses from peers.dat
@@ -2102,6 +2099,17 @@ void StartNode(boost::thread_group& threadGroup, CScheduler& scheduler)
 
     fAddressesInitialized = true;
 
+    Discover(threadGroup);
+
+    bool ret = connman.Start(threadGroup, strNodeError);
+
+    // Dump network addresses
+    scheduler.scheduleEvery(DumpData, DUMP_ADDRESSES_INTERVAL);
+    return ret;
+}
+
+bool CConnman::Start(boost::thread_group& threadGroup, std::string& strNodeError)
+{
     if (semOutbound == NULL) {
         // initialize semaphore
         int nMaxOutbound = std::min((MAX_OUTBOUND_CONNECTIONS + MAX_FEELER_CONNECTIONS), nMaxConnections);
@@ -2114,8 +2122,6 @@ void StartNode(boost::thread_group& threadGroup, CScheduler& scheduler)
         pnodeLocalHost = new CNode(INVALID_SOCKET, CAddress(CService(local, 0), nLocalServices));
     }
 
-    Discover(threadGroup);
-
     //
     // Start threads
     //
@@ -2123,34 +2129,30 @@ void StartNode(boost::thread_group& threadGroup, CScheduler& scheduler)
     if (!GetBoolArg("-dnsseed", true))
         LogPrintf("DNS seeding disabled\n");
     else
-        threadGroup.create_thread(boost::bind(&TraceThread<void (*)()>, "dnsseed", &ThreadDNSAddressSeed));
+        threadGroup.create_thread(boost::bind(&TraceThread<boost::function<void()> >, "dnsseed", boost::function<void()>(boost::bind(&CConnman::ThreadDNSAddressSeed, this))));
 
     // Map ports with UPnP
     MapPort(GetBoolArg("-upnp", DEFAULT_UPNP));
 
     // Send and receive from sockets, accept connections
-    threadGroup.create_thread(boost::bind(&TraceThread<void (*)()>, "net", &ThreadSocketHandler));
+    threadGroup.create_thread(boost::bind(&TraceThread<boost::function<void()> >, "net", boost::function<void()>(boost::bind(&CConnman::ThreadSocketHandler, this))));
 
     // Initiate outbound connections from -addnode
-    threadGroup.create_thread(boost::bind(&TraceThread<void (*)()>, "addcon", &ThreadOpenAddedConnections));
+    threadGroup.create_thread(boost::bind(&TraceThread<boost::function<void()> >, "addcon", boost::function<void()>(boost::bind(&CConnman::ThreadOpenAddedConnections, this))));
 
     // Initiate outbound connections
-    threadGroup.create_thread(boost::bind(&TraceThread<void (*)()>, "opencon", &ThreadOpenConnections));
+    threadGroup.create_thread(boost::bind(&TraceThread<boost::function<void()> >, "opencon", boost::function<void()>(boost::bind(&CConnman::ThreadOpenConnections, this))));
 
     // Process messages
-    threadGroup.create_thread(boost::bind(&TraceThread<void (*)()>, "msghand", &ThreadMessageHandler));
+    threadGroup.create_thread(boost::bind(&TraceThread<boost::function<void()> >, "msghand", boost::function<void()>(boost::bind(&CConnman::ThreadMessageHandler, this))));
 
-    // Dump network addresses
-    scheduler.scheduleEvery(&DumpData, DUMP_ADDRESSES_INTERVAL);
+    return true;
 }
 
-bool StopNode()
+bool StopNode(CConnman& connman)
 {
     LogPrintf("StopNode()\n");
     MapPort(false);
-    if (semOutbound)
-        for (int i=0; i<(MAX_OUTBOUND_CONNECTIONS + MAX_FEELER_CONNECTIONS); i++)
-            semOutbound->post();
 
     if (fAddressesInitialized)
     {
@@ -2158,6 +2160,7 @@ bool StopNode()
         fAddressesInitialized = false;
     }
 
+    connman.Stop();
     return true;
 }
 
@@ -2168,28 +2171,6 @@ class CNetCleanup
 
     ~CNetCleanup()
     {
-        // Close sockets
-        BOOST_FOREACH(CNode* pnode, vNodes)
-            if (pnode->hSocket != INVALID_SOCKET)
-                CloseSocket(pnode->hSocket);
-        BOOST_FOREACH(ListenSocket& hListenSocket, vhListenSocket)
-            if (hListenSocket.socket != INVALID_SOCKET)
-                if (!CloseSocket(hListenSocket.socket))
-                    LogPrintf("CloseSocket(hListenSocket) failed with error %s\n", NetworkErrorString(WSAGetLastError()));
-
-        // clean up some globals (to help leak detection)
-        BOOST_FOREACH(CNode *pnode, vNodes)
-            delete pnode;
-        BOOST_FOREACH(CNode *pnode, vNodesDisconnected)
-            delete pnode;
-        vNodes.clear();
-        vNodesDisconnected.clear();
-        vhListenSocket.clear();
-        delete semOutbound;
-        semOutbound = NULL;
-        delete pnodeLocalHost;
-        pnodeLocalHost = NULL;
-
 #ifdef WIN32
         // Shutdown Windows Sockets
         WSACleanup();
@@ -2198,6 +2179,38 @@ class CNetCleanup
 }
 instance_of_cnetcleanup;
 
+void CConnman::Stop()
+{
+    if (semOutbound)
+        for (int i=0; i<(MAX_OUTBOUND_CONNECTIONS + MAX_FEELER_CONNECTIONS); i++)
+            semOutbound->post();
+
+    // Close sockets
+    BOOST_FOREACH(CNode* pnode, vNodes)
+        if (pnode->hSocket != INVALID_SOCKET)
+            CloseSocket(pnode->hSocket);
+    BOOST_FOREACH(ListenSocket& hListenSocket, vhListenSocket)
+        if (hListenSocket.socket != INVALID_SOCKET)
+            if (!CloseSocket(hListenSocket.socket))
+                LogPrintf("CloseSocket(hListenSocket) failed with error %s\n", NetworkErrorString(WSAGetLastError()));
+
+    // clean up some globals (to help leak detection)
+    BOOST_FOREACH(CNode *pnode, vNodes)
+        delete pnode;
+    BOOST_FOREACH(CNode *pnode, vNodesDisconnected)
+        delete pnode;
+    vNodes.clear();
+    vNodesDisconnected.clear();
+    vhListenSocket.clear();
+    delete semOutbound;
+    semOutbound = NULL;
+    delete pnodeLocalHost;
+    pnodeLocalHost = NULL;
+}
+
+CConnman::~CConnman()
+{
+}
 
 void RelayTransaction(const CTransaction& tx)
 {
diff --git a/src/net.h b/src/net.h
index 0d1c62e428fb6..7f212f233c758 100644
--- a/src/net.h
+++ b/src/net.h
@@ -21,6 +21,7 @@
 #include <atomic>
 #include <deque>
 #include <stdint.h>
+#include <memory>
 
 #ifndef WIN32
 #include <arpa/inet.h>
@@ -93,11 +94,36 @@ CNode* FindNode(const std::string& addrName);
 CNode* FindNode(const CService& ip);
 CNode* FindNode(const NodeId id); //TODO: Remove this
 bool OpenNetworkConnection(const CAddress& addrConnect, bool fCountFailure, CSemaphoreGrant *grantOutbound = NULL, const char *strDest = NULL, bool fOneShot = false, bool fFeeler = false);
+
+struct ListenSocket {
+    SOCKET socket;
+    bool whitelisted;
+
+    ListenSocket(SOCKET socket_, bool whitelisted_) : socket(socket_), whitelisted(whitelisted_) {}
+};
+
+class CConnman
+{
+public:
+    CConnman();
+    ~CConnman();
+    bool Start(boost::thread_group& threadGroup, std::string& strNodeError);
+    void Stop();
+private:
+    void ThreadOpenAddedConnections();
+    void ProcessOneShot();
+    void ThreadOpenConnections();
+    void ThreadMessageHandler();
+    void AcceptConnection(const ListenSocket& hListenSocket);
+    void ThreadSocketHandler();
+    void ThreadDNSAddressSeed();
+};
+extern std::unique_ptr<CConnman> g_connman;
 void MapPort(bool fUseUPnP);
 unsigned short GetListenPort();
 bool BindListenPort(const CService &bindAddr, std::string& strError, bool fWhitelisted = false);
-void StartNode(boost::thread_group& threadGroup, CScheduler& scheduler);
-bool StopNode();
+bool StartNode(CConnman& connman, boost::thread_group& threadGroup, CScheduler& scheduler, std::string& strNodeError);
+bool StopNode(CConnman& connman);
 void SocketSendData(CNode *pnode);
 
 struct CombinerAll
diff --git a/src/test/test_bitcoin.cpp b/src/test/test_bitcoin.cpp
index 056f2982cf1eb..ed74418e3426d 100644
--- a/src/test/test_bitcoin.cpp
+++ b/src/test/test_bitcoin.cpp
@@ -26,6 +26,8 @@
 #include <boost/test/unit_test.hpp>
 #include <boost/thread.hpp>
 
+std::unique_ptr<CConnman> g_connman;
+
 extern bool fPrintToConsole;
 extern void noui_connect();
 
@@ -43,6 +45,7 @@ BasicTestingSetup::BasicTestingSetup(const std::string& chainName)
 BasicTestingSetup::~BasicTestingSetup()
 {
         ECC_Stop();
+        g_connman.reset();
 }
 
 TestingSetup::TestingSetup(const std::string& chainName) : BasicTestingSetup(chainName)
@@ -50,6 +53,7 @@ TestingSetup::TestingSetup(const std::string& chainName) : BasicTestingSetup(cha
     const CChainParams& chainparams = Params();
         // Ideally we'd move all the RPC tests to the functional testing framework
         // instead of unit tests, but for now we need these here.
+
         RegisterAllCoreRPCCommands(tableRPC);
         ClearDatadirCache();
         pathTemp = GetTempPath() / strprintf("test_bitcoin_%lu_%i", (unsigned long)GetTime(), (int)(GetRand(100000)));
@@ -68,6 +72,8 @@ TestingSetup::TestingSetup(const std::string& chainName) : BasicTestingSetup(cha
         nScriptCheckThreads = 3;
         for (int i=0; i < nScriptCheckThreads-1; i++)
             threadGroup.create_thread(&ThreadScriptCheck);
+        g_connman = std::unique_ptr<CConnman>(new CConnman());
+        connman = g_connman.get();
         RegisterNodeSignals(GetNodeSignals());
 }
 
diff --git a/src/test/test_bitcoin.h b/src/test/test_bitcoin.h
index bc0d2fe316aa5..9819a7097dc75 100644
--- a/src/test/test_bitcoin.h
+++ b/src/test/test_bitcoin.h
@@ -27,10 +27,12 @@ struct BasicTestingSetup {
 /** Testing setup that configures a complete environment.
  * Included are data directory, coins database, script check threads setup.
  */
+class CConnman;
 struct TestingSetup: public BasicTestingSetup {
     CCoinsViewDB *pcoinsdbview;
     boost::filesystem::path pathTemp;
     boost::thread_group threadGroup;
+    CConnman* connman;
 
     TestingSetup(const std::string& chainName = CBaseChainParams::MAIN);
     ~TestingSetup();

From d7349ca50d000573d60064d4b295be308357d58e Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Thu, 26 May 2016 13:10:55 -0400
Subject: [PATCH 0835/1802] net: Add rpc error for missing/disabled p2p
 functionality

---
 src/rpc/protocol.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/rpc/protocol.h b/src/rpc/protocol.h
index 988e0fc5facb9..1d2ef0e41e67e 100644
--- a/src/rpc/protocol.h
+++ b/src/rpc/protocol.h
@@ -63,6 +63,7 @@ enum RPCErrorCode
     RPC_CLIENT_NODE_NOT_ADDED       = -24, //!< Node has not been added before
     RPC_CLIENT_NODE_NOT_CONNECTED   = -29, //!< Node to disconnect not found in connected nodes
     RPC_CLIENT_INVALID_IP_OR_SUBNET = -30, //!< Invalid IP/Subnet
+    RPC_CLIENT_P2P_DISABLED         = -31, //!< No valid connection manager instance found
 
     //! Wallet errors
     RPC_WALLET_ERROR                = -4,  //!< Unspecified problem with wallet (key not found etc.)

From 8d58c4d81f18e9a51d11ee354434cf55d03a4add Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Thu, 26 May 2016 14:26:01 -0400
Subject: [PATCH 0836/1802] net: Pass CConnman around as needed

---
 src/main.cpp              | 22 +++++++++++-----------
 src/main.h                | 10 ++++++----
 src/net.cpp               |  4 ++--
 src/net.h                 |  4 ++--
 src/rpc/blockchain.cpp    |  4 ++--
 src/rpc/mining.cpp        |  4 ++--
 src/test/DoS_tests.cpp    | 14 +++++++-------
 src/test/miner_tests.cpp  |  2 +-
 src/test/test_bitcoin.cpp |  2 +-
 9 files changed, 34 insertions(+), 32 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index 4b42afb561472..32859ebc26388 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -3016,7 +3016,7 @@ static void NotifyHeaderTip() {
  * or an activated best chain. pblock is either NULL or a pointer to a block
  * that is already loaded (to avoid loading it again from disk).
  */
-bool ActivateBestChain(CValidationState &state, const CChainParams& chainparams, const CBlock *pblock) {
+bool ActivateBestChain(CValidationState &state, const CChainParams& chainparams, const CBlock *pblock, CConnman* connman) {
     CBlockIndex *pindexMostWork = NULL;
     CBlockIndex *pindexNewTip = NULL;
     do {
@@ -3731,7 +3731,7 @@ static bool AcceptBlock(const CBlock& block, CValidationState& state, const CCha
     return true;
 }
 
-bool ProcessNewBlock(CValidationState& state, const CChainParams& chainparams, CNode* pfrom, const CBlock* pblock, bool fForceProcessing, const CDiskBlockPos* dbp)
+bool ProcessNewBlock(CValidationState& state, const CChainParams& chainparams, CNode* pfrom, const CBlock* pblock, bool fForceProcessing, const CDiskBlockPos* dbp, CConnman* connman)
 {
     {
         LOCK(cs_main);
@@ -3753,7 +3753,7 @@ bool ProcessNewBlock(CValidationState& state, const CChainParams& chainparams, C
 
     NotifyHeaderTip();
 
-    if (!ActivateBestChain(state, chainparams, pblock))
+    if (!ActivateBestChain(state, chainparams, pblock, connman))
         return error("%s: ActivateBestChain failed", __func__);
 
     return true;
@@ -4891,7 +4891,7 @@ uint32_t GetFetchFlags(CNode* pfrom, CBlockIndex* pprev, const Consensus::Params
     return nFetchFlags;
 }
 
-bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv, int64_t nTimeReceived, const CChainParams& chainparams)
+bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv, int64_t nTimeReceived, const CChainParams& chainparams, CConnman& connman)
 {
     LogPrint("net", "received: %s (%u bytes) peer=%d\n", SanitizeString(strCommand), vRecv.size(), pfrom->id);
     if (mapArgs.count("-dropmessagestest") && GetRand(atoi(mapArgs["-dropmessagestest"])) == 0)
@@ -5680,7 +5680,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
                     txn.blockhash = cmpctblock.header.GetHash();
                     CDataStream blockTxnMsg(SER_NETWORK, PROTOCOL_VERSION);
                     blockTxnMsg << txn;
-                    return ProcessMessage(pfrom, NetMsgType::BLOCKTXN, blockTxnMsg, nTimeReceived, chainparams);
+                    return ProcessMessage(pfrom, NetMsgType::BLOCKTXN, blockTxnMsg, nTimeReceived, chainparams, connman);
                 } else {
                     req.blockhash = pindex->GetBlockHash();
                     pfrom->PushMessage(NetMsgType::GETBLOCKTXN, req);
@@ -5701,7 +5701,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
                 headers.push_back(cmpctblock.header);
                 CDataStream vHeadersMsg(SER_NETWORK, PROTOCOL_VERSION);
                 vHeadersMsg << headers;
-                return ProcessMessage(pfrom, NetMsgType::HEADERS, vHeadersMsg, nTimeReceived, chainparams);
+                return ProcessMessage(pfrom, NetMsgType::HEADERS, vHeadersMsg, nTimeReceived, chainparams, connman);
             }
         }
 
@@ -5737,7 +5737,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
             pfrom->PushMessage(NetMsgType::GETDATA, invs);
         } else {
             CValidationState state;
-            ProcessNewBlock(state, chainparams, pfrom, &block, false, NULL);
+            ProcessNewBlock(state, chainparams, pfrom, &block, false, NULL, &connman);
             int nDoS;
             if (state.IsInvalid(nDoS)) {
                 assert (state.GetRejectCode() < REJECT_INTERNAL); // Blocks are never rejected with internal reject codes
@@ -5913,7 +5913,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
         // Such an unrequested block may still be processed, subject to the
         // conditions in AcceptBlock().
         bool forceProcessing = pfrom->fWhitelisted && !IsInitialBlockDownload();
-        ProcessNewBlock(state, chainparams, pfrom, &block, forceProcessing, NULL);
+        ProcessNewBlock(state, chainparams, pfrom, &block, forceProcessing, NULL, &connman);
         int nDoS;
         if (state.IsInvalid(nDoS)) {
             assert (state.GetRejectCode() < REJECT_INTERNAL); // Blocks are never rejected with internal reject codes
@@ -6163,7 +6163,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
 }
 
 // requires LOCK(cs_vRecvMsg)
-bool ProcessMessages(CNode* pfrom)
+bool ProcessMessages(CNode* pfrom, CConnman& connman)
 {
     const CChainParams& chainparams = Params();
     //if (fDebug)
@@ -6240,7 +6240,7 @@ bool ProcessMessages(CNode* pfrom)
         bool fRet = false;
         try
         {
-            fRet = ProcessMessage(pfrom, strCommand, vRecv, msg.nTime, chainparams);
+            fRet = ProcessMessage(pfrom, strCommand, vRecv, msg.nTime, chainparams, connman);
             boost::this_thread::interruption_point();
         }
         catch (const std::ios_base::failure& e)
@@ -6305,7 +6305,7 @@ class CompareInvMempoolOrder
     }
 };
 
-bool SendMessages(CNode* pto)
+bool SendMessages(CNode* pto, CConnman& connman)
 {
     const Consensus::Params& consensusParams = Params().GetConsensus();
     {
diff --git a/src/main.h b/src/main.h
index 18d674612f97e..2646d8f86b0a3 100644
--- a/src/main.h
+++ b/src/main.h
@@ -34,6 +34,7 @@ class CBlockTreeDB;
 class CBloomFilter;
 class CChainParams;
 class CInv;
+class CConnman;
 class CScriptCheck;
 class CTxMemPool;
 class CValidationInterface;
@@ -222,7 +223,7 @@ void UnregisterNodeSignals(CNodeSignals& nodeSignals);
  * @param[out]  dbp     The already known disk position of pblock, or NULL if not yet stored.
  * @return True if state.IsValid()
  */
-bool ProcessNewBlock(CValidationState& state, const CChainParams& chainparams, CNode* pfrom, const CBlock* pblock, bool fForceProcessing, const CDiskBlockPos* dbp);
+bool ProcessNewBlock(CValidationState& state, const CChainParams& chainparams, CNode* pfrom, const CBlock* pblock, bool fForceProcessing, const CDiskBlockPos* dbp, CConnman* connman);
 /** Check whether enough disk space is available for an incoming block */
 bool CheckDiskSpace(uint64_t nAdditionalBytes = 0);
 /** Open a block file (blk?????.dat) */
@@ -240,13 +241,14 @@ bool LoadBlockIndex();
 /** Unload database information */
 void UnloadBlockIndex();
 /** Process protocol messages received from a given node */
-bool ProcessMessages(CNode* pfrom);
+bool ProcessMessages(CNode* pfrom, CConnman& connman);
 /**
  * Send queued protocol messages to be sent to a give node.
  *
  * @param[in]   pto             The node which we are sending messages to.
+ * @param[in]   connman         The connection manager for that node.
  */
-bool SendMessages(CNode* pto);
+bool SendMessages(CNode* pto, CConnman& connman);
 /** Run an instance of the script checking thread */
 void ThreadScriptCheck();
 /** Check whether we are doing an initial block download (synchronizing from disk or network) */
@@ -262,7 +264,7 @@ std::string GetWarnings(const std::string& strFor);
 /** Retrieve a transaction (from memory pool, or from disk, if possible) */
 bool GetTransaction(const uint256 &hash, CTransaction &tx, const Consensus::Params& params, uint256 &hashBlock, bool fAllowSlow = false);
 /** Find the best known block, and make it the tip of the block chain */
-bool ActivateBestChain(CValidationState& state, const CChainParams& chainparams, const CBlock* pblock = NULL);
+bool ActivateBestChain(CValidationState& state, const CChainParams& chainparams, const CBlock* pblock = NULL, CConnman* connman = NULL);
 CAmount GetBlockSubsidy(int nHeight, const Consensus::Params& consensusParams);
 
 /**
diff --git a/src/net.cpp b/src/net.cpp
index 6177dc04ff4c1..b99989b289eb3 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -1869,7 +1869,7 @@ void CConnman::ThreadMessageHandler()
                 TRY_LOCK(pnode->cs_vRecvMsg, lockRecv);
                 if (lockRecv)
                 {
-                    if (!GetNodeSignals().ProcessMessages(pnode))
+                    if (!GetNodeSignals().ProcessMessages(pnode, *this))
                         pnode->CloseSocketDisconnect();
 
                     if (pnode->nSendSize < SendBufferSize())
@@ -1887,7 +1887,7 @@ void CConnman::ThreadMessageHandler()
             {
                 TRY_LOCK(pnode->cs_vSend, lockSend);
                 if (lockSend)
-                    GetNodeSignals().SendMessages(pnode);
+                    GetNodeSignals().SendMessages(pnode, *this);
             }
             boost::this_thread::interruption_point();
         }
diff --git a/src/net.h b/src/net.h
index 7f212f233c758..d2a38e7dc4ff9 100644
--- a/src/net.h
+++ b/src/net.h
@@ -145,8 +145,8 @@ struct CombinerAll
 struct CNodeSignals
 {
     boost::signals2::signal<int ()> GetHeight;
-    boost::signals2::signal<bool (CNode*), CombinerAll> ProcessMessages;
-    boost::signals2::signal<bool (CNode*), CombinerAll> SendMessages;
+    boost::signals2::signal<bool (CNode*, CConnman&), CombinerAll> ProcessMessages;
+    boost::signals2::signal<bool (CNode*, CConnman&), CombinerAll> SendMessages;
     boost::signals2::signal<void (NodeId, const CNode*)> InitializeNode;
     boost::signals2::signal<void (NodeId)> FinalizeNode;
 };
diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp
index b90410017b692..d600383c4bc18 100644
--- a/src/rpc/blockchain.cpp
+++ b/src/rpc/blockchain.cpp
@@ -1133,7 +1133,7 @@ UniValue invalidateblock(const UniValue& params, bool fHelp)
     }
 
     if (state.IsValid()) {
-        ActivateBestChain(state, Params());
+        ActivateBestChain(state, Params(), NULL, g_connman.get());
     }
 
     if (!state.IsValid()) {
@@ -1171,7 +1171,7 @@ UniValue reconsiderblock(const UniValue& params, bool fHelp)
     }
 
     CValidationState state;
-    ActivateBestChain(state, Params());
+    ActivateBestChain(state, Params(), NULL, g_connman.get());
 
     if (!state.IsValid()) {
         throw JSONRPCError(RPC_DATABASE_ERROR, state.GetRejectReason());
diff --git a/src/rpc/mining.cpp b/src/rpc/mining.cpp
index 14183c8e826f5..63ecf49ecd697 100644
--- a/src/rpc/mining.cpp
+++ b/src/rpc/mining.cpp
@@ -131,7 +131,7 @@ UniValue generateBlocks(boost::shared_ptr<CReserveScript> coinbaseScript, int nG
             continue;
         }
         CValidationState state;
-        if (!ProcessNewBlock(state, Params(), NULL, pblock, true, NULL))
+        if (!ProcessNewBlock(state, Params(), NULL, pblock, true, NULL, g_connman.get()))
             throw JSONRPCError(RPC_INTERNAL_ERROR, "ProcessNewBlock, block not accepted");
         ++nHeight;
         blockHashes.push_back(pblock->GetHash().GetHex());
@@ -754,7 +754,7 @@ UniValue submitblock(const UniValue& params, bool fHelp)
     CValidationState state;
     submitblock_StateCatcher sc(block.GetHash());
     RegisterValidationInterface(&sc);
-    bool fAccepted = ProcessNewBlock(state, Params(), NULL, &block, true, NULL);
+    bool fAccepted = ProcessNewBlock(state, Params(), NULL, &block, true, NULL, g_connman.get());
     UnregisterValidationInterface(&sc);
     if (fBlockPresent)
     {
diff --git a/src/test/DoS_tests.cpp b/src/test/DoS_tests.cpp
index a8c5f95ace4af..10529cda9e6bc 100644
--- a/src/test/DoS_tests.cpp
+++ b/src/test/DoS_tests.cpp
@@ -49,7 +49,7 @@ BOOST_AUTO_TEST_CASE(DoS_banning)
     CNode dummyNode1(INVALID_SOCKET, addr1, "", true);
     dummyNode1.nVersion = 1;
     Misbehaving(dummyNode1.GetId(), 100); // Should get banned
-    SendMessages(&dummyNode1);
+    SendMessages(&dummyNode1, *connman);
     BOOST_CHECK(CNode::IsBanned(addr1));
     BOOST_CHECK(!CNode::IsBanned(ip(0xa0b0c001|0x0000ff00))); // Different IP, not banned
 
@@ -57,11 +57,11 @@ BOOST_AUTO_TEST_CASE(DoS_banning)
     CNode dummyNode2(INVALID_SOCKET, addr2, "", true);
     dummyNode2.nVersion = 1;
     Misbehaving(dummyNode2.GetId(), 50);
-    SendMessages(&dummyNode2);
+    SendMessages(&dummyNode2, *connman);
     BOOST_CHECK(!CNode::IsBanned(addr2)); // 2 not banned yet...
     BOOST_CHECK(CNode::IsBanned(addr1));  // ... but 1 still should be
     Misbehaving(dummyNode2.GetId(), 50);
-    SendMessages(&dummyNode2);
+    SendMessages(&dummyNode2, *connman);
     BOOST_CHECK(CNode::IsBanned(addr2));
 }
 
@@ -73,13 +73,13 @@ BOOST_AUTO_TEST_CASE(DoS_banscore)
     CNode dummyNode1(INVALID_SOCKET, addr1, "", true);
     dummyNode1.nVersion = 1;
     Misbehaving(dummyNode1.GetId(), 100);
-    SendMessages(&dummyNode1);
+    SendMessages(&dummyNode1, *connman);
     BOOST_CHECK(!CNode::IsBanned(addr1));
     Misbehaving(dummyNode1.GetId(), 10);
-    SendMessages(&dummyNode1);
+    SendMessages(&dummyNode1, *connman);
     BOOST_CHECK(!CNode::IsBanned(addr1));
     Misbehaving(dummyNode1.GetId(), 1);
-    SendMessages(&dummyNode1);
+    SendMessages(&dummyNode1, *connman);
     BOOST_CHECK(CNode::IsBanned(addr1));
     mapArgs.erase("-banscore");
 }
@@ -95,7 +95,7 @@ BOOST_AUTO_TEST_CASE(DoS_bantime)
     dummyNode.nVersion = 1;
 
     Misbehaving(dummyNode.GetId(), 100);
-    SendMessages(&dummyNode);
+    SendMessages(&dummyNode, *connman);
     BOOST_CHECK(CNode::IsBanned(addr));
 
     SetMockTime(nStartTime+60*60);
diff --git a/src/test/miner_tests.cpp b/src/test/miner_tests.cpp
index 15fceb963a59f..d3aa2364d1f7b 100644
--- a/src/test/miner_tests.cpp
+++ b/src/test/miner_tests.cpp
@@ -222,7 +222,7 @@ BOOST_AUTO_TEST_CASE(CreateNewBlock_validity)
         pblock->hashMerkleRoot = BlockMerkleRoot(*pblock);
         pblock->nNonce = blockinfo[i].nonce;
         CValidationState state;
-        BOOST_CHECK(ProcessNewBlock(state, chainparams, NULL, pblock, true, NULL));
+        BOOST_CHECK(ProcessNewBlock(state, chainparams, NULL, pblock, true, NULL, connman));
         BOOST_CHECK(state.IsValid());
         pblock->hashPrevBlock = pblock->GetHash();
     }
diff --git a/src/test/test_bitcoin.cpp b/src/test/test_bitcoin.cpp
index ed74418e3426d..b1ceef4f64d07 100644
--- a/src/test/test_bitcoin.cpp
+++ b/src/test/test_bitcoin.cpp
@@ -124,7 +124,7 @@ TestChain100Setup::CreateAndProcessBlock(const std::vector<CMutableTransaction>&
     while (!CheckProofOfWork(block.GetHash(), block.nBits, chainparams.GetConsensus())) ++block.nNonce;
 
     CValidationState state;
-    ProcessNewBlock(state, chainparams, NULL, &block, true, NULL);
+    ProcessNewBlock(state, chainparams, NULL, &block, true, NULL, connman);
 
     CBlock result = block;
     delete pblocktemplate;

From 5b446dd5b11d4f403554bc2dd5a7a94c7d20422a Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Tue, 24 May 2016 20:56:17 -0400
Subject: [PATCH 0837/1802] net: Pass CConnection to wallet rather than using
 the global

---
 src/main.cpp                |  2 +-
 src/qt/walletmodel.cpp      |  2 +-
 src/validationinterface.cpp |  4 ++--
 src/validationinterface.h   |  5 +++--
 src/wallet/rpcwallet.cpp    | 15 ++++++++++++---
 src/wallet/wallet.cpp       | 14 +++++++-------
 src/wallet/wallet.h         |  8 ++++----
 7 files changed, 30 insertions(+), 20 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index 32859ebc26388..4dc9d71eea011 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -6431,7 +6431,7 @@ bool SendMessages(CNode* pto, CConnman& connman)
         // transactions become unconfirmed and spams other nodes.
         if (!fReindex && !fImporting && !IsInitialBlockDownload())
         {
-            GetMainSignals().Broadcast(nTimeBestReceived);
+            GetMainSignals().Broadcast(nTimeBestReceived, &connman);
         }
 
         //
diff --git a/src/qt/walletmodel.cpp b/src/qt/walletmodel.cpp
index ae7efc7a0d40b..73851e97fc1f1 100644
--- a/src/qt/walletmodel.cpp
+++ b/src/qt/walletmodel.cpp
@@ -328,7 +328,7 @@ WalletModel::SendCoinsReturn WalletModel::sendCoins(WalletModelTransaction &tran
         }
 
         CReserveKey *keyChange = transaction.getPossibleKeyChange();
-        if(!wallet->CommitTransaction(*newTx, *keyChange))
+        if(!wallet->CommitTransaction(*newTx, *keyChange, g_connman.get()))
             return TransactionCommitFailed;
 
         CTransaction* t = (CTransaction*)newTx;
diff --git a/src/validationinterface.cpp b/src/validationinterface.cpp
index cf1d6ca08699a..6ddf37658d854 100644
--- a/src/validationinterface.cpp
+++ b/src/validationinterface.cpp
@@ -18,7 +18,7 @@ void RegisterValidationInterface(CValidationInterface* pwalletIn) {
     g_signals.UpdatedTransaction.connect(boost::bind(&CValidationInterface::UpdatedTransaction, pwalletIn, _1));
     g_signals.SetBestChain.connect(boost::bind(&CValidationInterface::SetBestChain, pwalletIn, _1));
     g_signals.Inventory.connect(boost::bind(&CValidationInterface::Inventory, pwalletIn, _1));
-    g_signals.Broadcast.connect(boost::bind(&CValidationInterface::ResendWalletTransactions, pwalletIn, _1));
+    g_signals.Broadcast.connect(boost::bind(&CValidationInterface::ResendWalletTransactions, pwalletIn, _1, _2));
     g_signals.BlockChecked.connect(boost::bind(&CValidationInterface::BlockChecked, pwalletIn, _1, _2));
     g_signals.ScriptForMining.connect(boost::bind(&CValidationInterface::GetScriptForMining, pwalletIn, _1));
     g_signals.BlockFound.connect(boost::bind(&CValidationInterface::ResetRequestCount, pwalletIn, _1));
@@ -28,7 +28,7 @@ void UnregisterValidationInterface(CValidationInterface* pwalletIn) {
     g_signals.BlockFound.disconnect(boost::bind(&CValidationInterface::ResetRequestCount, pwalletIn, _1));
     g_signals.ScriptForMining.disconnect(boost::bind(&CValidationInterface::GetScriptForMining, pwalletIn, _1));
     g_signals.BlockChecked.disconnect(boost::bind(&CValidationInterface::BlockChecked, pwalletIn, _1, _2));
-    g_signals.Broadcast.disconnect(boost::bind(&CValidationInterface::ResendWalletTransactions, pwalletIn, _1));
+    g_signals.Broadcast.disconnect(boost::bind(&CValidationInterface::ResendWalletTransactions, pwalletIn, _1, _2));
     g_signals.Inventory.disconnect(boost::bind(&CValidationInterface::Inventory, pwalletIn, _1));
     g_signals.SetBestChain.disconnect(boost::bind(&CValidationInterface::SetBestChain, pwalletIn, _1));
     g_signals.UpdatedTransaction.disconnect(boost::bind(&CValidationInterface::UpdatedTransaction, pwalletIn, _1));
diff --git a/src/validationinterface.h b/src/validationinterface.h
index 094b1cfe26672..0c91ec8308eed 100644
--- a/src/validationinterface.h
+++ b/src/validationinterface.h
@@ -13,6 +13,7 @@ class CBlock;
 class CBlockIndex;
 struct CBlockLocator;
 class CBlockIndex;
+class CConnman;
 class CReserveScript;
 class CTransaction;
 class CValidationInterface;
@@ -37,7 +38,7 @@ class CValidationInterface {
     virtual void SetBestChain(const CBlockLocator &locator) {}
     virtual void UpdatedTransaction(const uint256 &hash) {}
     virtual void Inventory(const uint256 &hash) {}
-    virtual void ResendWalletTransactions(int64_t nBestBlockTime) {}
+    virtual void ResendWalletTransactions(int64_t nBestBlockTime, CConnman* connman) {}
     virtual void BlockChecked(const CBlock&, const CValidationState&) {}
     virtual void GetScriptForMining(boost::shared_ptr<CReserveScript>&) {};
     virtual void ResetRequestCount(const uint256 &hash) {};
@@ -58,7 +59,7 @@ struct CMainSignals {
     /** Notifies listeners about an inventory item being seen on the network. */
     boost::signals2::signal<void (const uint256 &)> Inventory;
     /** Tells listeners to broadcast their data. */
-    boost::signals2::signal<void (int64_t nBestBlockTime)> Broadcast;
+    boost::signals2::signal<void (int64_t nBestBlockTime, CConnman* connman)> Broadcast;
     /** Notifies listeners of a block validation result */
     boost::signals2::signal<void (const CBlock&, const CValidationState&)> BlockChecked;
     /** Notifies listeners that a key for mining is required (coinbase) */
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index 0ba6706baf830..a399f8ad9f3b9 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -346,6 +346,9 @@ static void SendMoney(const CTxDestination &address, CAmount nValue, bool fSubtr
     if (nValue > curBalance)
         throw JSONRPCError(RPC_WALLET_INSUFFICIENT_FUNDS, "Insufficient funds");
 
+    if (pwalletMain->GetBroadcastTransactions() && !g_connman)
+        throw JSONRPCError(RPC_CLIENT_P2P_DISABLED, "Error: Peer-to-peer functionality missing or disabled");
+
     // Parse Bitcoin address
     CScript scriptPubKey = GetScriptForDestination(address);
 
@@ -362,7 +365,7 @@ static void SendMoney(const CTxDestination &address, CAmount nValue, bool fSubtr
             strError = strprintf("Error: This transaction requires a transaction fee of at least %s because of its amount, complexity, or use of recently received funds!", FormatMoney(nFeeRequired));
         throw JSONRPCError(RPC_WALLET_ERROR, strError);
     }
-    if (!pwalletMain->CommitTransaction(wtxNew, reservekey))
+    if (!pwalletMain->CommitTransaction(wtxNew, reservekey, g_connman.get()))
         throw JSONRPCError(RPC_WALLET_ERROR, "Error: The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of the wallet and coins were spent in the copy but not marked as spent here.");
 }
 
@@ -891,6 +894,9 @@ UniValue sendmany(const UniValue& params, bool fHelp)
 
     LOCK2(cs_main, pwalletMain->cs_wallet);
 
+    if (pwalletMain->GetBroadcastTransactions() && !g_connman)
+        throw JSONRPCError(RPC_CLIENT_P2P_DISABLED, "Error: Peer-to-peer functionality missing or disabled");
+
     string strAccount = AccountFromValue(params[0]);
     UniValue sendTo = params[1].get_obj();
     int nMinDepth = 1;
@@ -953,7 +959,7 @@ UniValue sendmany(const UniValue& params, bool fHelp)
     bool fCreated = pwalletMain->CreateTransaction(vecSend, wtx, keyChange, nFeeRequired, nChangePosRet, strFailReason);
     if (!fCreated)
         throw JSONRPCError(RPC_WALLET_INSUFFICIENT_FUNDS, strFailReason);
-    if (!pwalletMain->CommitTransaction(wtx, keyChange))
+    if (!pwalletMain->CommitTransaction(wtx, keyChange, g_connman.get()))
         throw JSONRPCError(RPC_WALLET_ERROR, "Transaction commit failed");
 
     return wtx.GetHash().GetHex();
@@ -2308,9 +2314,12 @@ UniValue resendwallettransactions(const UniValue& params, bool fHelp)
             "Returns array of transaction ids that were re-broadcast.\n"
             );
 
+    if (!g_connman)
+        throw JSONRPCError(RPC_CLIENT_P2P_DISABLED, "Error: Peer-to-peer functionality missing or disabled");
+
     LOCK2(cs_main, pwalletMain->cs_wallet);
 
-    std::vector<uint256> txids = pwalletMain->ResendWalletTransactionsBefore(GetTime());
+    std::vector<uint256> txids = pwalletMain->ResendWalletTransactionsBefore(GetTime(), g_connman.get());
     UniValue result(UniValue::VARR);
     BOOST_FOREACH(const uint256& txid, txids)
     {
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index 10aca2e499f60..4396c2a2b0125 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -1453,7 +1453,7 @@ void CWallet::ReacceptWalletTransactions()
     }
 }
 
-bool CWalletTx::RelayWalletTransaction()
+bool CWalletTx::RelayWalletTransaction(CConnman* connman)
 {
     assert(pwallet->GetBroadcastTransactions());
     if (!IsCoinBase())
@@ -1688,7 +1688,7 @@ bool CWalletTx::IsEquivalentTo(const CWalletTx& tx) const
         return CTransaction(tx1) == CTransaction(tx2);
 }
 
-std::vector<uint256> CWallet::ResendWalletTransactionsBefore(int64_t nTime)
+std::vector<uint256> CWallet::ResendWalletTransactionsBefore(int64_t nTime, CConnman* connman)
 {
     std::vector<uint256> result;
 
@@ -1706,13 +1706,13 @@ std::vector<uint256> CWallet::ResendWalletTransactionsBefore(int64_t nTime)
     BOOST_FOREACH(PAIRTYPE(const unsigned int, CWalletTx*)& item, mapSorted)
     {
         CWalletTx& wtx = *item.second;
-        if (wtx.RelayWalletTransaction())
+        if (wtx.RelayWalletTransaction(connman))
             result.push_back(wtx.GetHash());
     }
     return result;
 }
 
-void CWallet::ResendWalletTransactions(int64_t nBestBlockTime)
+void CWallet::ResendWalletTransactions(int64_t nBestBlockTime, CConnman* connman)
 {
     // Do this infrequently and randomly to avoid giving away
     // that these are our transactions.
@@ -1730,7 +1730,7 @@ void CWallet::ResendWalletTransactions(int64_t nBestBlockTime)
 
     // Rebroadcast unconfirmed txes older than 5 minutes before the last
     // block was found:
-    std::vector<uint256> relayed = ResendWalletTransactionsBefore(nBestBlockTime-5*60);
+    std::vector<uint256> relayed = ResendWalletTransactionsBefore(nBestBlockTime-5*60, connman);
     if (!relayed.empty())
         LogPrintf("%s: rebroadcast %u unconfirmed transactions\n", __func__, relayed.size());
 }
@@ -2447,7 +2447,7 @@ bool CWallet::CreateTransaction(const vector<CRecipient>& vecSend, CWalletTx& wt
 /**
  * Call after CreateTransaction unless you want to abort
  */
-bool CWallet::CommitTransaction(CWalletTx& wtxNew, CReserveKey& reservekey)
+bool CWallet::CommitTransaction(CWalletTx& wtxNew, CReserveKey& reservekey, CConnman* connman)
 {
     {
         LOCK2(cs_main, cs_wallet);
@@ -2481,7 +2481,7 @@ bool CWallet::CommitTransaction(CWalletTx& wtxNew, CReserveKey& reservekey)
                 LogPrintf("CommitTransaction(): Error: Transaction not valid\n");
                 return false;
             }
-            wtxNew.RelayWalletTransaction();
+            wtxNew.RelayWalletTransaction(connman);
         }
     }
     return true;
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
index c06513650c74a..7a771350cba43 100644
--- a/src/wallet/wallet.h
+++ b/src/wallet/wallet.h
@@ -401,7 +401,7 @@ class CWalletTx : public CMerkleTx
     int64_t GetTxTime() const;
     int GetRequestCount() const;
 
-    bool RelayWalletTransaction();
+    bool RelayWalletTransaction(CConnman* connman);
 
     std::set<uint256> GetConflicts() const;
 };
@@ -748,8 +748,8 @@ class CWallet : public CCryptoKeyStore, public CValidationInterface
     bool AddToWalletIfInvolvingMe(const CTransaction& tx, const CBlockIndex* pIndex, int posInBlock, bool fUpdate);
     int ScanForWalletTransactions(CBlockIndex* pindexStart, bool fUpdate = false);
     void ReacceptWalletTransactions();
-    void ResendWalletTransactions(int64_t nBestBlockTime);
-    std::vector<uint256> ResendWalletTransactionsBefore(int64_t nTime);
+    void ResendWalletTransactions(int64_t nBestBlockTime, CConnman* connman);
+    std::vector<uint256> ResendWalletTransactionsBefore(int64_t nTime, CConnman* connman);
     CAmount GetBalance() const;
     CAmount GetUnconfirmedBalance() const;
     CAmount GetImmatureBalance() const;
@@ -770,7 +770,7 @@ class CWallet : public CCryptoKeyStore, public CValidationInterface
      */
     bool CreateTransaction(const std::vector<CRecipient>& vecSend, CWalletTx& wtxNew, CReserveKey& reservekey, CAmount& nFeeRet, int& nChangePosInOut,
                            std::string& strFailReason, const CCoinControl *coinControl = NULL, bool sign = true);
-    bool CommitTransaction(CWalletTx& wtxNew, CReserveKey& reservekey);
+    bool CommitTransaction(CWalletTx& wtxNew, CReserveKey& reservekey, CConnman* connman);
 
     bool AddAccountingEntry(const CAccountingEntry&, CWalletDB & pwalletdb);
 

From 02137f11e2ea5d153f433493639730587836a1e3 Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Sat, 16 Apr 2016 15:46:00 -0400
Subject: [PATCH 0838/1802] net: Move socket binding into CConnman

---
 src/init.cpp | 12 ++++++------
 src/net.cpp  |  3 +--
 src/net.h    | 18 +++++++++++-------
 3 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/src/init.cpp b/src/init.cpp
index 6aaa7bfc5db00..b0ffb7a40e35f 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -273,11 +273,11 @@ void HandleSIGHUP(int)
     fReopenDebugLog = true;
 }
 
-bool static Bind(const CService &addr, unsigned int flags) {
+bool static Bind(CConnman& connman, const CService &addr, unsigned int flags) {
     if (!(flags & BF_EXPLICIT) && IsLimited(addr))
         return false;
     std::string strError;
-    if (!BindListenPort(addr, strError, (flags & BF_WHITELIST) != 0)) {
+    if (!connman.BindListenPort(addr, strError, (flags & BF_WHITELIST) != 0)) {
         if (flags & BF_REPORT_ERROR)
             return InitError(strError);
         return false;
@@ -1198,7 +1198,7 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
                 CService addrBind;
                 if (!Lookup(strBind.c_str(), addrBind, GetListenPort(), false))
                     return InitError(ResolveErrMsg("bind", strBind));
-                fBound |= Bind(addrBind, (BF_EXPLICIT | BF_REPORT_ERROR));
+                fBound |= Bind(connman, addrBind, (BF_EXPLICIT | BF_REPORT_ERROR));
             }
             BOOST_FOREACH(const std::string& strBind, mapMultiArgs["-whitebind"]) {
                 CService addrBind;
@@ -1206,14 +1206,14 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
                     return InitError(ResolveErrMsg("whitebind", strBind));
                 if (addrBind.GetPort() == 0)
                     return InitError(strprintf(_("Need to specify a port with -whitebind: '%s'"), strBind));
-                fBound |= Bind(addrBind, (BF_EXPLICIT | BF_REPORT_ERROR | BF_WHITELIST));
+                fBound |= Bind(connman, addrBind, (BF_EXPLICIT | BF_REPORT_ERROR | BF_WHITELIST));
             }
         }
         else {
             struct in_addr inaddr_any;
             inaddr_any.s_addr = INADDR_ANY;
-            fBound |= Bind(CService(in6addr_any, GetListenPort()), BF_NONE);
-            fBound |= Bind(CService(inaddr_any, GetListenPort()), !fBound ? BF_REPORT_ERROR : BF_NONE);
+            fBound |= Bind(connman, CService(in6addr_any, GetListenPort()), BF_NONE);
+            fBound |= Bind(connman, CService(inaddr_any, GetListenPort()), !fBound ? BF_REPORT_ERROR : BF_NONE);
         }
         if (!fBound)
             return InitError(_("Failed to listen on any port. Use -listen=0 if you want this."));
diff --git a/src/net.cpp b/src/net.cpp
index b99989b289eb3..0069820004c58 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -84,7 +84,6 @@ std::map<CNetAddr, LocalServiceInfo> mapLocalHost;
 static bool vfLimited[NET_MAX] = {};
 static CNode* pnodeLocalHost = NULL;
 uint64_t nLocalHostNonce = 0;
-static std::vector<ListenSocket> vhListenSocket;
 CAddrMan addrman;
 int nMaxConnections = DEFAULT_MAX_PEER_CONNECTIONS;
 bool fAddressesInitialized = false;
@@ -1908,7 +1907,7 @@ void CConnman::ThreadMessageHandler()
 
 
 
-bool BindListenPort(const CService &addrBind, std::string& strError, bool fWhitelisted)
+bool CConnman::BindListenPort(const CService &addrBind, std::string& strError, bool fWhitelisted)
 {
     strError = "";
     int nOne = 1;
diff --git a/src/net.h b/src/net.h
index d2a38e7dc4ff9..4d87408e3237d 100644
--- a/src/net.h
+++ b/src/net.h
@@ -95,13 +95,6 @@ CNode* FindNode(const CService& ip);
 CNode* FindNode(const NodeId id); //TODO: Remove this
 bool OpenNetworkConnection(const CAddress& addrConnect, bool fCountFailure, CSemaphoreGrant *grantOutbound = NULL, const char *strDest = NULL, bool fOneShot = false, bool fFeeler = false);
 
-struct ListenSocket {
-    SOCKET socket;
-    bool whitelisted;
-
-    ListenSocket(SOCKET socket_, bool whitelisted_) : socket(socket_), whitelisted(whitelisted_) {}
-};
-
 class CConnman
 {
 public:
@@ -109,7 +102,16 @@ class CConnman
     ~CConnman();
     bool Start(boost::thread_group& threadGroup, std::string& strNodeError);
     void Stop();
+    bool BindListenPort(const CService &bindAddr, std::string& strError, bool fWhitelisted = false);
+
 private:
+    struct ListenSocket {
+        SOCKET socket;
+        bool whitelisted;
+
+        ListenSocket(SOCKET socket_, bool whitelisted_) : socket(socket_), whitelisted(whitelisted_) {}
+    };
+
     void ThreadOpenAddedConnections();
     void ProcessOneShot();
     void ThreadOpenConnections();
@@ -117,6 +119,8 @@ class CConnman
     void AcceptConnection(const ListenSocket& hListenSocket);
     void ThreadSocketHandler();
     void ThreadDNSAddressSeed();
+
+    std::vector<ListenSocket> vhListenSocket;
 };
 extern std::unique_ptr<CConnman> g_connman;
 void MapPort(bool fUseUPnP);

From b1a5f4320878e34eb998737dce333270dd83e436 Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Sat, 16 Apr 2016 15:59:10 -0400
Subject: [PATCH 0839/1802] net: move OpenNetworkConnection into CConnman

---
 src/net.cpp     | 4 ++--
 src/net.h       | 4 +++-
 src/rpc/net.cpp | 5 ++++-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/net.cpp b/src/net.cpp
index 0069820004c58..83a96205a35d0 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -375,7 +375,7 @@ CNode* FindNode(const NodeId nodeid)
     return NULL;
 }
 
-CNode* ConnectNode(CAddress addrConnect, const char *pszDest, bool fCountFailure)
+CNode* CConnman::ConnectNode(CAddress addrConnect, const char *pszDest, bool fCountFailure)
 {
     if (pszDest == NULL) {
         if (IsLocal(addrConnect))
@@ -1809,7 +1809,7 @@ void CConnman::ThreadOpenAddedConnections()
 }
 
 // if successful, this moves the passed grant to the constructed node
-bool OpenNetworkConnection(const CAddress& addrConnect, bool fCountFailure, CSemaphoreGrant *grantOutbound, const char *pszDest, bool fOneShot, bool fFeeler)
+bool CConnman::OpenNetworkConnection(const CAddress& addrConnect, bool fCountFailure, CSemaphoreGrant *grantOutbound, const char *pszDest, bool fOneShot, bool fFeeler)
 {
     //
     // Initiate outbound network connection
diff --git a/src/net.h b/src/net.h
index 4d87408e3237d..e0c317ae46525 100644
--- a/src/net.h
+++ b/src/net.h
@@ -93,7 +93,6 @@ CNode* FindNode(const CSubNet& subNet);
 CNode* FindNode(const std::string& addrName);
 CNode* FindNode(const CService& ip);
 CNode* FindNode(const NodeId id); //TODO: Remove this
-bool OpenNetworkConnection(const CAddress& addrConnect, bool fCountFailure, CSemaphoreGrant *grantOutbound = NULL, const char *strDest = NULL, bool fOneShot = false, bool fFeeler = false);
 
 class CConnman
 {
@@ -103,6 +102,7 @@ class CConnman
     bool Start(boost::thread_group& threadGroup, std::string& strNodeError);
     void Stop();
     bool BindListenPort(const CService &bindAddr, std::string& strError, bool fWhitelisted = false);
+    bool OpenNetworkConnection(const CAddress& addrConnect, bool fCountFailure, CSemaphoreGrant *grantOutbound = NULL, const char *strDest = NULL, bool fOneShot = false, bool fFeeler = false);
 
 private:
     struct ListenSocket {
@@ -120,6 +120,8 @@ class CConnman
     void ThreadSocketHandler();
     void ThreadDNSAddressSeed();
 
+    CNode* ConnectNode(CAddress addrConnect, const char *pszDest, bool fCountFailure);
+
     std::vector<ListenSocket> vhListenSocket;
 };
 extern std::unique_ptr<CConnman> g_connman;
diff --git a/src/rpc/net.cpp b/src/rpc/net.cpp
index 840bfd5a2424b..edf33c70be72f 100644
--- a/src/rpc/net.cpp
+++ b/src/rpc/net.cpp
@@ -214,12 +214,15 @@ UniValue addnode(const UniValue& params, bool fHelp)
             + HelpExampleRpc("addnode", "\"192.168.0.6:8333\", \"onetry\"")
         );
 
+    if(!g_connman)
+        throw JSONRPCError(RPC_CLIENT_P2P_DISABLED, "Error: Peer-to-peer functionality missing or disabled");
+
     string strNode = params[0].get_str();
 
     if (strCommand == "onetry")
     {
         CAddress addr;
-        OpenNetworkConnection(addr, false, NULL, strNode.c_str());
+        g_connman->OpenNetworkConnection(addr, false, NULL, strNode.c_str());
         return NullUniValue;
     }
 

From aaf018e3b79417ecfd39291a8c100df77969d77a Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Tue, 24 May 2016 18:59:16 -0400
Subject: [PATCH 0840/1802] net: handle nodesignals in CConnman

---
 src/main.cpp           |  5 +++--
 src/net.cpp            | 38 ++++++++++++++++++++++----------------
 src/net.h              |  3 ++-
 src/test/DoS_tests.cpp |  4 ++++
 4 files changed, 31 insertions(+), 19 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index 4dc9d71eea011..bd85fa8f07060 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -348,7 +348,8 @@ void InitializeNode(NodeId nodeid, const CNode *pnode) {
     state.address = pnode->addr;
 }
 
-void FinalizeNode(NodeId nodeid) {
+void FinalizeNode(NodeId nodeid, bool& fUpdateConnectionTime) {
+    fUpdateConnectionTime = false;
     LOCK(cs_main);
     CNodeState *state = State(nodeid);
 
@@ -356,7 +357,7 @@ void FinalizeNode(NodeId nodeid) {
         nSyncStarted--;
 
     if (state->nMisbehavior == 0 && state->fCurrentlyConnected) {
-        AddressCurrentlyConnected(state->address);
+        fUpdateConnectionTime = true;
     }
 
     BOOST_FOREACH(const QueuedBlock& entry, state->vBlocksInFlight) {
diff --git a/src/net.cpp b/src/net.cpp
index 83a96205a35d0..26bf477e999cf 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -313,12 +313,6 @@ bool IsReachable(const CNetAddr& addr)
     return IsReachable(net);
 }
 
-void AddressCurrentlyConnected(const CService& addr)
-{
-    addrman.Connected(addr);
-}
-
-
 uint64_t CNode::nTotalBytesRecv = 0;
 uint64_t CNode::nTotalBytesSent = 0;
 CCriticalSection CNode::cs_totalBytesRecv;
@@ -431,6 +425,7 @@ CNode* CConnman::ConnectNode(CAddress addrConnect, const char *pszDest, bool fCo
 
         // Add node
         CNode* pnode = new CNode(hSocket, addrConnect, pszDest ? pszDest : "", false);
+        GetNodeSignals().InitializeNode(pnode->GetId(), pnode);
         pnode->AddRef();
 
         {
@@ -1070,6 +1065,7 @@ void CConnman::AcceptConnection(const ListenSocket& hListenSocket) {
     }
 
     CNode* pnode = new CNode(hSocket, addr, "", true);
+    GetNodeSignals().InitializeNode(pnode->GetId(), pnode);
     pnode->AddRef();
     pnode->fWhitelisted = whitelisted;
 
@@ -1139,7 +1135,7 @@ void CConnman::ThreadSocketHandler()
                     if (fDelete)
                     {
                         vNodesDisconnected.remove(pnode);
-                        delete pnode;
+                        DeleteNode(pnode);
                     }
                 }
             }
@@ -2119,6 +2115,7 @@ bool CConnman::Start(boost::thread_group& threadGroup, std::string& strNodeError
         CNetAddr local;
         LookupHost("127.0.0.1", local, false);
         pnodeLocalHost = new CNode(INVALID_SOCKET, CAddress(CService(local, 0), nLocalServices));
+        GetNodeSignals().InitializeNode(pnodeLocalHost->GetId(), pnodeLocalHost);
     }
 
     //
@@ -2194,19 +2191,32 @@ void CConnman::Stop()
                 LogPrintf("CloseSocket(hListenSocket) failed with error %s\n", NetworkErrorString(WSAGetLastError()));
 
     // clean up some globals (to help leak detection)
-    BOOST_FOREACH(CNode *pnode, vNodes)
-        delete pnode;
-    BOOST_FOREACH(CNode *pnode, vNodesDisconnected)
-        delete pnode;
+    BOOST_FOREACH(CNode *pnode, vNodes) {
+        DeleteNode(pnode);
+    }
+    BOOST_FOREACH(CNode *pnode, vNodesDisconnected) {
+        DeleteNode(pnode);
+    }
     vNodes.clear();
     vNodesDisconnected.clear();
     vhListenSocket.clear();
     delete semOutbound;
     semOutbound = NULL;
-    delete pnodeLocalHost;
+    if(pnodeLocalHost)
+        DeleteNode(pnodeLocalHost);
     pnodeLocalHost = NULL;
 }
 
+void CConnman::DeleteNode(CNode* pnode)
+{
+    assert(pnode);
+    bool fUpdateConnectionTime = false;
+    GetNodeSignals().FinalizeNode(pnode->GetId(), fUpdateConnectionTime);
+    if(fUpdateConnectionTime)
+        addrman.Connected(pnode->addr);
+    delete pnode;
+}
+
 CConnman::~CConnman()
 {
 }
@@ -2442,8 +2452,6 @@ CNode::CNode(SOCKET hSocketIn, const CAddress& addrIn, const std::string& addrNa
     // Be shy and don't send version until we hear
     if (hSocket != INVALID_SOCKET && !fInbound)
         PushVersion();
-
-    GetNodeSignals().InitializeNode(GetId(), this);
 }
 
 CNode::~CNode()
@@ -2452,8 +2460,6 @@ CNode::~CNode()
 
     if (pfilter)
         delete pfilter;
-
-    GetNodeSignals().FinalizeNode(GetId());
 }
 
 void CNode::AskFor(const CInv& inv)
diff --git a/src/net.h b/src/net.h
index e0c317ae46525..b9dfaa0f40345 100644
--- a/src/net.h
+++ b/src/net.h
@@ -121,6 +121,7 @@ class CConnman
     void ThreadDNSAddressSeed();
 
     CNode* ConnectNode(CAddress addrConnect, const char *pszDest, bool fCountFailure);
+    void DeleteNode(CNode* pnode);
 
     std::vector<ListenSocket> vhListenSocket;
 };
@@ -154,7 +155,7 @@ struct CNodeSignals
     boost::signals2::signal<bool (CNode*, CConnman&), CombinerAll> ProcessMessages;
     boost::signals2::signal<bool (CNode*, CConnman&), CombinerAll> SendMessages;
     boost::signals2::signal<void (NodeId, const CNode*)> InitializeNode;
-    boost::signals2::signal<void (NodeId)> FinalizeNode;
+    boost::signals2::signal<void (NodeId, bool&)> FinalizeNode;
 };
 
 
diff --git a/src/test/DoS_tests.cpp b/src/test/DoS_tests.cpp
index 10529cda9e6bc..007ea79f9edf0 100644
--- a/src/test/DoS_tests.cpp
+++ b/src/test/DoS_tests.cpp
@@ -47,6 +47,7 @@ BOOST_AUTO_TEST_CASE(DoS_banning)
     CNode::ClearBanned();
     CAddress addr1(ip(0xa0b0c001), NODE_NONE);
     CNode dummyNode1(INVALID_SOCKET, addr1, "", true);
+    GetNodeSignals().InitializeNode(dummyNode1.GetId(), &dummyNode1);
     dummyNode1.nVersion = 1;
     Misbehaving(dummyNode1.GetId(), 100); // Should get banned
     SendMessages(&dummyNode1, *connman);
@@ -55,6 +56,7 @@ BOOST_AUTO_TEST_CASE(DoS_banning)
 
     CAddress addr2(ip(0xa0b0c002), NODE_NONE);
     CNode dummyNode2(INVALID_SOCKET, addr2, "", true);
+    GetNodeSignals().InitializeNode(dummyNode2.GetId(), &dummyNode2);
     dummyNode2.nVersion = 1;
     Misbehaving(dummyNode2.GetId(), 50);
     SendMessages(&dummyNode2, *connman);
@@ -71,6 +73,7 @@ BOOST_AUTO_TEST_CASE(DoS_banscore)
     mapArgs["-banscore"] = "111"; // because 11 is my favorite number
     CAddress addr1(ip(0xa0b0c001), NODE_NONE);
     CNode dummyNode1(INVALID_SOCKET, addr1, "", true);
+    GetNodeSignals().InitializeNode(dummyNode1.GetId(), &dummyNode1);
     dummyNode1.nVersion = 1;
     Misbehaving(dummyNode1.GetId(), 100);
     SendMessages(&dummyNode1, *connman);
@@ -92,6 +95,7 @@ BOOST_AUTO_TEST_CASE(DoS_bantime)
 
     CAddress addr(ip(0xa0b0c001), NODE_NONE);
     CNode dummyNode(INVALID_SOCKET, addr, "", true);
+    GetNodeSignals().InitializeNode(dummyNode.GetId(), &dummyNode);
     dummyNode.nVersion = 1;
 
     Misbehaving(dummyNode.GetId(), 100);

From a0f3d3cdad630103d919a4ec802c413b87fa1f1a Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Sat, 16 Apr 2016 17:43:11 -0400
Subject: [PATCH 0841/1802] net: move ban and addrman functions into CConnman

---
 src/main.cpp             |  14 ++---
 src/net.cpp              | 126 ++++++++++++++++++++++++---------------
 src/net.h                |  89 ++++++++++++++-------------
 src/qt/bantablemodel.cpp |   3 +-
 src/qt/rpcconsole.cpp    |  29 ++++-----
 src/rpc/net.cpp          |  17 ++++--
 src/test/DoS_tests.cpp   |  28 ++++-----
 7 files changed, 174 insertions(+), 132 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index bd85fa8f07060..f3babb71d219d 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -4944,7 +4944,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
         pfrom->nServices = ServiceFlags(nServiceInt);
         if (!pfrom->fInbound)
         {
-            addrman.SetServices(pfrom->addr, pfrom->nServices);
+            connman.SetServices(pfrom->addr, pfrom->nServices);
         }
         if (pfrom->nServicesExpected & ~pfrom->nServices)
         {
@@ -5038,12 +5038,12 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
             }
 
             // Get recent addresses
-            if (pfrom->fOneShot || pfrom->nVersion >= CADDR_TIME_VERSION || addrman.size() < 1000)
+            if (pfrom->fOneShot || pfrom->nVersion >= CADDR_TIME_VERSION || connman.GetAddressCount() < 1000)
             {
                 pfrom->PushMessage(NetMsgType::GETADDR);
                 pfrom->fGetAddr = true;
             }
-            addrman.Good(pfrom->addr);
+            connman.MarkAddressGood(pfrom->addr);
         }
 
         pfrom->fSuccessfullyConnected = true;
@@ -5108,7 +5108,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
         vRecv >> vAddr;
 
         // Don't want addr from older versions unless seeding
-        if (pfrom->nVersion < CADDR_TIME_VERSION && addrman.size() > 1000)
+        if (pfrom->nVersion < CADDR_TIME_VERSION && connman.GetAddressCount() > 1000)
             return true;
         if (vAddr.size() > 1000)
         {
@@ -5160,7 +5160,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
             if (fReachable)
                 vAddrOk.push_back(addr);
         }
-        addrman.Add(vAddrOk, pfrom->addr, 2 * 60 * 60);
+        connman.AddNewAddresses(vAddrOk, pfrom->addr, 2 * 60 * 60);
         if (vAddr.size() < 1000)
             pfrom->fGetAddr = false;
         if (pfrom->fOneShot)
@@ -5950,7 +5950,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
         pfrom->fSentAddr = true;
 
         pfrom->vAddrToSend.clear();
-        vector<CAddress> vAddr = addrman.GetAddr();
+        vector<CAddress> vAddr = connman.GetAddresses();
         BOOST_FOREACH(const CAddress &addr, vAddr)
             pfrom->PushAddress(addr);
     }
@@ -6393,7 +6393,7 @@ bool SendMessages(CNode* pto, CConnman& connman)
                     LogPrintf("Warning: not banning local peer %s!\n", pto->addr.ToString());
                 else
                 {
-                    CNode::Ban(pto->addr, BanReasonNodeMisbehaving);
+                    connman.Ban(pto->addr, BanReasonNodeMisbehaving);
                 }
             }
             state.fShouldBan = false;
diff --git a/src/net.cpp b/src/net.cpp
index 26bf477e999cf..eeb84fca7a20b 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -84,9 +84,7 @@ std::map<CNetAddr, LocalServiceInfo> mapLocalHost;
 static bool vfLimited[NET_MAX] = {};
 static CNode* pnodeLocalHost = NULL;
 uint64_t nLocalHostNonce = 0;
-CAddrMan addrman;
 int nMaxConnections = DEFAULT_MAX_PEER_CONNECTIONS;
-bool fAddressesInitialized = false;
 std::string strSubVersion;
 
 std::vector<CNode*> vNodes;
@@ -446,21 +444,21 @@ CNode* CConnman::ConnectNode(CAddress addrConnect, const char *pszDest, bool fCo
     return NULL;
 }
 
-static void DumpBanlist()
+void CConnman::DumpBanlist()
 {
-    CNode::SweepBanned(); // clean unused entries (if bantime has expired)
+    SweepBanned(); // clean unused entries (if bantime has expired)
 
-    if (!CNode::BannedSetIsDirty())
+    if (!BannedSetIsDirty())
         return;
 
     int64_t nStart = GetTimeMillis();
 
     CBanDB bandb;
     banmap_t banmap;
-    CNode::SetBannedSetDirty(false);
-    CNode::GetBanned(banmap);
+    SetBannedSetDirty(false);
+    GetBanned(banmap);
     if (!bandb.Write(banmap))
-        CNode::SetBannedSetDirty(true);
+        SetBannedSetDirty(true);
 
     LogPrint("net", "Flushed %d banned node ips/subnets to banlist.dat  %dms\n",
         banmap.size(), GetTimeMillis() - nStart);
@@ -501,11 +499,7 @@ void CNode::PushVersion()
 
 
 
-banmap_t CNode::setBanned;
-CCriticalSection CNode::cs_setBanned;
-bool CNode::setBannedIsDirty;
-
-void CNode::ClearBanned()
+void CConnman::ClearBanned()
 {
     {
         LOCK(cs_setBanned);
@@ -516,7 +510,7 @@ void CNode::ClearBanned()
     uiInterface.BannedListChanged();
 }
 
-bool CNode::IsBanned(CNetAddr ip)
+bool CConnman::IsBanned(CNetAddr ip)
 {
     bool fResult = false;
     {
@@ -533,7 +527,7 @@ bool CNode::IsBanned(CNetAddr ip)
     return fResult;
 }
 
-bool CNode::IsBanned(CSubNet subnet)
+bool CConnman::IsBanned(CSubNet subnet)
 {
     bool fResult = false;
     {
@@ -549,12 +543,12 @@ bool CNode::IsBanned(CSubNet subnet)
     return fResult;
 }
 
-void CNode::Ban(const CNetAddr& addr, const BanReason &banReason, int64_t bantimeoffset, bool sinceUnixEpoch) {
+void CConnman::Ban(const CNetAddr& addr, const BanReason &banReason, int64_t bantimeoffset, bool sinceUnixEpoch) {
     CSubNet subNet(addr);
     Ban(subNet, banReason, bantimeoffset, sinceUnixEpoch);
 }
 
-void CNode::Ban(const CSubNet& subNet, const BanReason &banReason, int64_t bantimeoffset, bool sinceUnixEpoch) {
+void CConnman::Ban(const CSubNet& subNet, const BanReason &banReason, int64_t bantimeoffset, bool sinceUnixEpoch) {
     CBanEntry banEntry(GetTime());
     banEntry.banReason = banReason;
     if (bantimeoffset <= 0)
@@ -585,12 +579,12 @@ void CNode::Ban(const CSubNet& subNet, const BanReason &banReason, int64_t banti
         DumpBanlist(); //store banlist to disk immediately if user requested ban
 }
 
-bool CNode::Unban(const CNetAddr &addr) {
+bool CConnman::Unban(const CNetAddr &addr) {
     CSubNet subNet(addr);
     return Unban(subNet);
 }
 
-bool CNode::Unban(const CSubNet &subNet) {
+bool CConnman::Unban(const CSubNet &subNet) {
     {
         LOCK(cs_setBanned);
         if (!setBanned.erase(subNet))
@@ -602,20 +596,20 @@ bool CNode::Unban(const CSubNet &subNet) {
     return true;
 }
 
-void CNode::GetBanned(banmap_t &banMap)
+void CConnman::GetBanned(banmap_t &banMap)
 {
     LOCK(cs_setBanned);
     banMap = setBanned; //create a thread safe copy
 }
 
-void CNode::SetBanned(const banmap_t &banMap)
+void CConnman::SetBanned(const banmap_t &banMap)
 {
     LOCK(cs_setBanned);
     setBanned = banMap;
     setBannedIsDirty = true;
 }
 
-void CNode::SweepBanned()
+void CConnman::SweepBanned()
 {
     int64_t now = GetTime();
 
@@ -636,13 +630,13 @@ void CNode::SweepBanned()
     }
 }
 
-bool CNode::BannedSetIsDirty()
+bool CConnman::BannedSetIsDirty()
 {
     LOCK(cs_setBanned);
     return setBannedIsDirty;
 }
 
-void CNode::SetBannedSetDirty(bool dirty)
+void CConnman::SetBannedSetDirty(bool dirty)
 {
     LOCK(cs_setBanned); //reuse setBanned lock for the isDirty flag
     setBannedIsDirty = dirty;
@@ -1047,7 +1041,7 @@ void CConnman::AcceptConnection(const ListenSocket& hListenSocket) {
     setsockopt(hSocket, IPPROTO_TCP, TCP_NODELAY, (void*)&set, sizeof(int));
 #endif
 
-    if (CNode::IsBanned(addr) && !whitelisted)
+    if (IsBanned(addr) && !whitelisted)
     {
         LogPrintf("connection from %s dropped (banned)\n", addr.ToString());
         CloseSocket(hSocket);
@@ -1548,7 +1542,7 @@ void CConnman::ThreadDNSAddressSeed()
 
 
 
-void DumpAddresses()
+void CConnman::DumpAddresses()
 {
     int64_t nStart = GetTimeMillis();
 
@@ -1559,7 +1553,7 @@ void DumpAddresses()
            addrman.size(), GetTimeMillis() - nStart);
 }
 
-void DumpData()
+void CConnman::DumpData()
 {
     DumpAddresses();
     DumpBanlist();
@@ -1813,7 +1807,7 @@ bool CConnman::OpenNetworkConnection(const CAddress& addrConnect, bool fCountFai
     boost::this_thread::interruption_point();
     if (!pszDest) {
         if (IsLocal(addrConnect) ||
-            FindNode((CNetAddr)addrConnect) || CNode::IsBanned(addrConnect) ||
+            FindNode((CNetAddr)addrConnect) || IsBanned(addrConnect) ||
             FindNode(addrConnect.ToStringIPPort()))
             return false;
     } else if (FindNode(std::string(pszDest)))
@@ -2054,10 +2048,22 @@ void static Discover(boost::thread_group& threadGroup)
 
 CConnman::CConnman()
 {
+    setBannedIsDirty = false;
+    fAddressesInitialized = false;
 }
 
 bool StartNode(CConnman& connman, boost::thread_group& threadGroup, CScheduler& scheduler, std::string& strNodeError)
 {
+    Discover(threadGroup);
+
+    bool ret = connman.Start(threadGroup, scheduler, strNodeError);
+
+    return ret;
+}
+
+bool CConnman::Start(boost::thread_group& threadGroup, CScheduler& scheduler, std::string& strNodeError)
+{
+
     uiInterface.InitMessage(_("Loading addresses..."));
     // Load addresses from peers.dat
     int64_t nStart = GetTimeMillis();
@@ -2078,15 +2084,15 @@ bool StartNode(CConnman& connman, boost::thread_group& threadGroup, CScheduler&
     CBanDB bandb;
     banmap_t banmap;
     if (bandb.Read(banmap)) {
-        CNode::SetBanned(banmap); // thread save setter
-        CNode::SetBannedSetDirty(false); // no need to write down, just read data
-        CNode::SweepBanned(); // sweep out unused entries
+        SetBanned(banmap); // thread save setter
+        SetBannedSetDirty(false); // no need to write down, just read data
+        SweepBanned(); // sweep out unused entries
 
         LogPrint("net", "Loaded %d banned node ips/subnets from banlist.dat  %dms\n",
             banmap.size(), GetTimeMillis() - nStart);
     } else {
         LogPrintf("Invalid or missing banlist.dat; recreating\n");
-        CNode::SetBannedSetDirty(true); // force write
+        SetBannedSetDirty(true); // force write
         DumpBanlist();
     }
 
@@ -2094,17 +2100,6 @@ bool StartNode(CConnman& connman, boost::thread_group& threadGroup, CScheduler&
 
     fAddressesInitialized = true;
 
-    Discover(threadGroup);
-
-    bool ret = connman.Start(threadGroup, strNodeError);
-
-    // Dump network addresses
-    scheduler.scheduleEvery(DumpData, DUMP_ADDRESSES_INTERVAL);
-    return ret;
-}
-
-bool CConnman::Start(boost::thread_group& threadGroup, std::string& strNodeError)
-{
     if (semOutbound == NULL) {
         // initialize semaphore
         int nMaxOutbound = std::min((MAX_OUTBOUND_CONNECTIONS + MAX_FEELER_CONNECTIONS), nMaxConnections);
@@ -2142,6 +2137,9 @@ bool CConnman::Start(boost::thread_group& threadGroup, std::string& strNodeError
     // Process messages
     threadGroup.create_thread(boost::bind(&TraceThread<boost::function<void()> >, "msghand", boost::function<void()>(boost::bind(&CConnman::ThreadMessageHandler, this))));
 
+    // Dump network addresses
+    scheduler.scheduleEvery(boost::bind(&CConnman::DumpData, this), DUMP_ADDRESSES_INTERVAL);
+
     return true;
 }
 
@@ -2150,12 +2148,6 @@ bool StopNode(CConnman& connman)
     LogPrintf("StopNode()\n");
     MapPort(false);
 
-    if (fAddressesInitialized)
-    {
-        DumpData();
-        fAddressesInitialized = false;
-    }
-
     connman.Stop();
     return true;
 }
@@ -2181,6 +2173,12 @@ void CConnman::Stop()
         for (int i=0; i<(MAX_OUTBOUND_CONNECTIONS + MAX_FEELER_CONNECTIONS); i++)
             semOutbound->post();
 
+    if (fAddressesInitialized)
+    {
+        DumpData();
+        fAddressesInitialized = false;
+    }
+
     // Close sockets
     BOOST_FOREACH(CNode* pnode, vNodes)
         if (pnode->hSocket != INVALID_SOCKET)
@@ -2221,6 +2219,36 @@ CConnman::~CConnman()
 {
 }
 
+size_t CConnman::GetAddressCount() const
+{
+    return addrman.size();
+}
+
+void CConnman::SetServices(const CService &addr, ServiceFlags nServices)
+{
+    addrman.SetServices(addr, nServices);
+}
+
+void CConnman::MarkAddressGood(const CAddress& addr)
+{
+    addrman.Good(addr);
+}
+
+void CConnman::AddNewAddress(const CAddress& addr, const CAddress& addrFrom, int64_t nTimePenalty)
+{
+    addrman.Add(addr, addrFrom, nTimePenalty);
+}
+
+void CConnman::AddNewAddresses(const std::vector<CAddress>& vAddr, const CAddress& addrFrom, int64_t nTimePenalty)
+{
+    addrman.Add(vAddr, addrFrom, nTimePenalty);
+}
+
+std::vector<CAddress> CConnman::GetAddresses()
+{
+    return addrman.GetAddr();
+}
+
 void RelayTransaction(const CTransaction& tx)
 {
     CInv inv(MSG_TX, tx.GetHash());
diff --git a/src/net.h b/src/net.h
index b9dfaa0f40345..65dafb4fd926c 100644
--- a/src/net.h
+++ b/src/net.h
@@ -7,6 +7,7 @@
 #define BITCOIN_NET_H
 
 #include "addrdb.h"
+#include "addrman.h"
 #include "amount.h"
 #include "bloom.h"
 #include "compat.h"
@@ -87,7 +88,6 @@ unsigned int SendBufferSize();
 typedef int NodeId;
 
 void AddOneShot(const std::string& strDest);
-void AddressCurrentlyConnected(const CService& addr);
 CNode* FindNode(const CNetAddr& ip);
 CNode* FindNode(const CSubNet& subNet);
 CNode* FindNode(const std::string& addrName);
@@ -99,11 +99,44 @@ class CConnman
 public:
     CConnman();
     ~CConnman();
-    bool Start(boost::thread_group& threadGroup, std::string& strNodeError);
+    bool Start(boost::thread_group& threadGroup, CScheduler& scheduler, std::string& strNodeError);
     void Stop();
     bool BindListenPort(const CService &bindAddr, std::string& strError, bool fWhitelisted = false);
     bool OpenNetworkConnection(const CAddress& addrConnect, bool fCountFailure, CSemaphoreGrant *grantOutbound = NULL, const char *strDest = NULL, bool fOneShot = false, bool fFeeler = false);
 
+    // Addrman functions
+    size_t GetAddressCount() const;
+    void SetServices(const CService &addr, ServiceFlags nServices);
+    void MarkAddressGood(const CAddress& addr);
+    void AddNewAddress(const CAddress& addr, const CAddress& addrFrom, int64_t nTimePenalty = 0);
+    void AddNewAddresses(const std::vector<CAddress>& vAddr, const CAddress& addrFrom, int64_t nTimePenalty = 0);
+    std::vector<CAddress> GetAddresses();
+    void AddressCurrentlyConnected(const CService& addr);
+
+    // Denial-of-service detection/prevention
+    // The idea is to detect peers that are behaving
+    // badly and disconnect/ban them, but do it in a
+    // one-coding-mistake-won't-shatter-the-entire-network
+    // way.
+    // IMPORTANT:  There should be nothing I can give a
+    // node that it will forward on that will make that
+    // node's peers drop it. If there is, an attacker
+    // can isolate a node and/or try to split the network.
+    // Dropping a node for sending stuff that is invalid
+    // now but might be valid in a later version is also
+    // dangerous, because it can cause a network split
+    // between nodes running old code and nodes running
+    // new code.
+    void Ban(const CNetAddr& netAddr, const BanReason& reason, int64_t bantimeoffset = 0, bool sinceUnixEpoch = false);
+    void Ban(const CSubNet& subNet, const BanReason& reason, int64_t bantimeoffset = 0, bool sinceUnixEpoch = false);
+    void ClearBanned(); // needed for unit testing
+    bool IsBanned(CNetAddr ip);
+    bool IsBanned(CSubNet subnet);
+    bool Unban(const CNetAddr &ip);
+    bool Unban(const CSubNet &ip);
+    void GetBanned(banmap_t &banmap);
+    void SetBanned(const banmap_t &banmap);
+
 private:
     struct ListenSocket {
         SOCKET socket;
@@ -122,8 +155,22 @@ class CConnman
 
     CNode* ConnectNode(CAddress addrConnect, const char *pszDest, bool fCountFailure);
     void DeleteNode(CNode* pnode);
+    //!check is the banlist has unwritten changes
+    bool BannedSetIsDirty();
+    //!set the "dirty" flag for the banlist
+    void SetBannedSetDirty(bool dirty=true);
+    //!clean unused entries (if bantime has expired)
+    void SweepBanned();
+    void DumpAddresses();
+    void DumpData();
+    void DumpBanlist();
 
     std::vector<ListenSocket> vhListenSocket;
+    banmap_t setBanned;
+    CCriticalSection cs_setBanned;
+    bool setBannedIsDirty;
+    bool fAddressesInitialized;
+    CAddrMan addrman;
 };
 extern std::unique_ptr<CConnman> g_connman;
 void MapPort(bool fUseUPnP);
@@ -195,7 +242,6 @@ extern ServiceFlags nLocalServices;
 extern ServiceFlags nRelevantServices;
 extern bool fRelayTxes;
 extern uint64_t nLocalHostNonce;
-extern CAddrMan addrman;
 
 /** Maximum number of connections to simultaneously allow (aka connection slots) */
 extern int nMaxConnections;
@@ -347,12 +393,6 @@ class CNode
     const uint64_t nKeyedNetGroup;
 protected:
 
-    // Denial-of-service detection/prevention
-    // Key is IP address, value is banned-until-time
-    static banmap_t setBanned;
-    static CCriticalSection cs_setBanned;
-    static bool setBannedIsDirty;
-
     // Whitelisted ranges. Any node connecting from these is automatically
     // whitelisted (as well as those connecting to whitelisted binds).
     static std::vector<CSubNet> vWhitelistedRange;
@@ -722,37 +762,6 @@ class CNode
 
     void CloseSocketDisconnect();
 
-    // Denial-of-service detection/prevention
-    // The idea is to detect peers that are behaving
-    // badly and disconnect/ban them, but do it in a
-    // one-coding-mistake-won't-shatter-the-entire-network
-    // way.
-    // IMPORTANT:  There should be nothing I can give a
-    // node that it will forward on that will make that
-    // node's peers drop it. If there is, an attacker
-    // can isolate a node and/or try to split the network.
-    // Dropping a node for sending stuff that is invalid
-    // now but might be valid in a later version is also
-    // dangerous, because it can cause a network split
-    // between nodes running old code and nodes running
-    // new code.
-    static void ClearBanned(); // needed for unit testing
-    static bool IsBanned(CNetAddr ip);
-    static bool IsBanned(CSubNet subnet);
-    static void Ban(const CNetAddr &ip, const BanReason &banReason, int64_t bantimeoffset = 0, bool sinceUnixEpoch = false);
-    static void Ban(const CSubNet &subNet, const BanReason &banReason, int64_t bantimeoffset = 0, bool sinceUnixEpoch = false);
-    static bool Unban(const CNetAddr &ip);
-    static bool Unban(const CSubNet &ip);
-    static void GetBanned(banmap_t &banmap);
-    static void SetBanned(const banmap_t &banmap);
-
-    //!check is the banlist has unwritten changes
-    static bool BannedSetIsDirty();
-    //!set the "dirty" flag for the banlist
-    static void SetBannedSetDirty(bool dirty=true);
-    //!clean unused entries (if bantime has expired)
-    static void SweepBanned();
-
     void copyStats(CNodeStats &stats);
 
     static bool IsWhitelistedRange(const CNetAddr &ip);
diff --git a/src/qt/bantablemodel.cpp b/src/qt/bantablemodel.cpp
index d95106b5ac87a..6e11e23904733 100644
--- a/src/qt/bantablemodel.cpp
+++ b/src/qt/bantablemodel.cpp
@@ -48,7 +48,8 @@ class BanTablePriv
     void refreshBanlist()
     {
         banmap_t banMap;
-        CNode::GetBanned(banMap);
+        if(g_connman)
+            g_connman->GetBanned(banMap);
 
         cachedBanlist.clear();
 #if QT_VERSION >= 0x040700
diff --git a/src/qt/rpcconsole.cpp b/src/qt/rpcconsole.cpp
index e5720dd70e0cd..708be6b646e8a 100644
--- a/src/qt/rpcconsole.cpp
+++ b/src/qt/rpcconsole.cpp
@@ -887,26 +887,23 @@ void RPCConsole::disconnectSelectedNode()
 
 void RPCConsole::banSelectedNode(int bantime)
 {
-    if (!clientModel)
+    if (!clientModel || !g_connman)
         return;
 
     // Get currently selected peer address
     QString strNode = GUIUtil::getEntryData(ui->peerWidget, 0, PeerTableModel::Address).toString();
     // Find possible nodes, ban it and clear the selected node
-    if (FindNode(strNode.toStdString())) {
-        std::string nStr = strNode.toStdString();
-        std::string addr;
-        int port = 0;
-        SplitHostPort(nStr, port, addr);
-
-        CNetAddr resolved;
-        if(!LookupHost(addr.c_str(), resolved, false))
-            return;
-        CNode::Ban(resolved, BanReasonManuallyAdded, bantime);
+    std::string nStr = strNode.toStdString();
+    std::string addr;
+    int port = 0;
+    SplitHostPort(nStr, port, addr);
 
-        clearSelectedNode();
-        clientModel->getBanTableModel()->refresh();
-    }
+    CNetAddr resolved;
+    if(!LookupHost(addr.c_str(), resolved, false))
+        return;
+    g_connman->Ban(resolved, BanReasonManuallyAdded, bantime);
+    clearSelectedNode();
+    clientModel->getBanTableModel()->refresh();
 }
 
 void RPCConsole::unbanSelectedNode()
@@ -919,9 +916,9 @@ void RPCConsole::unbanSelectedNode()
     CSubNet possibleSubnet;
 
     LookupSubNet(strNode.toStdString().c_str(), possibleSubnet);
-    if (possibleSubnet.IsValid())
+    if (possibleSubnet.IsValid() && g_connman)
     {
-        CNode::Unban(possibleSubnet);
+        g_connman->Unban(possibleSubnet);
         clientModel->getBanTableModel()->refresh();
     }
 }
diff --git a/src/rpc/net.cpp b/src/rpc/net.cpp
index edf33c70be72f..0244da9fea746 100644
--- a/src/rpc/net.cpp
+++ b/src/rpc/net.cpp
@@ -488,6 +488,8 @@ UniValue setban(const UniValue& params, bool fHelp)
                             + HelpExampleCli("setban", "\"192.168.0.0/24\" \"add\"")
                             + HelpExampleRpc("setban", "\"192.168.0.6\", \"add\", 86400")
                             );
+    if(!g_connman)
+        throw JSONRPCError(RPC_CLIENT_P2P_DISABLED, "Error: Peer-to-peer functionality missing or disabled");
 
     CSubNet subNet;
     CNetAddr netAddr;
@@ -509,7 +511,7 @@ UniValue setban(const UniValue& params, bool fHelp)
 
     if (strCommand == "add")
     {
-        if (isSubnet ? CNode::IsBanned(subNet) : CNode::IsBanned(netAddr))
+        if (isSubnet ? g_connman->IsBanned(subNet) : g_connman->IsBanned(netAddr))
             throw JSONRPCError(RPC_CLIENT_NODE_ALREADY_ADDED, "Error: IP/Subnet already banned");
 
         int64_t banTime = 0; //use standard bantime if not specified
@@ -520,11 +522,11 @@ UniValue setban(const UniValue& params, bool fHelp)
         if (params.size() == 4 && params[3].isTrue())
             absolute = true;
 
-        isSubnet ? CNode::Ban(subNet, BanReasonManuallyAdded, banTime, absolute) : CNode::Ban(netAddr, BanReasonManuallyAdded, banTime, absolute);
+        isSubnet ? g_connman->Ban(subNet, BanReasonManuallyAdded, banTime, absolute) : g_connman->Ban(netAddr, BanReasonManuallyAdded, banTime, absolute);
     }
     else if(strCommand == "remove")
     {
-        if (!( isSubnet ? CNode::Unban(subNet) : CNode::Unban(netAddr) ))
+        if (!( isSubnet ? g_connman->Unban(subNet) : g_connman->Unban(netAddr) ))
             throw JSONRPCError(RPC_MISC_ERROR, "Error: Unban failed");
     }
     return NullUniValue;
@@ -541,8 +543,11 @@ UniValue listbanned(const UniValue& params, bool fHelp)
                             + HelpExampleRpc("listbanned", "")
                             );
 
+    if(!g_connman)
+        throw JSONRPCError(RPC_CLIENT_P2P_DISABLED, "Error: Peer-to-peer functionality missing or disabled");
+
     banmap_t banMap;
-    CNode::GetBanned(banMap);
+    g_connman->GetBanned(banMap);
 
     UniValue bannedAddresses(UniValue::VARR);
     for (banmap_t::iterator it = banMap.begin(); it != banMap.end(); it++)
@@ -570,8 +575,10 @@ UniValue clearbanned(const UniValue& params, bool fHelp)
                             + HelpExampleCli("clearbanned", "")
                             + HelpExampleRpc("clearbanned", "")
                             );
+    if(!g_connman)
+        throw JSONRPCError(RPC_CLIENT_P2P_DISABLED, "Error: Peer-to-peer functionality missing or disabled");
 
-    CNode::ClearBanned();
+    g_connman->ClearBanned();
 
     return NullUniValue;
 }
diff --git a/src/test/DoS_tests.cpp b/src/test/DoS_tests.cpp
index 007ea79f9edf0..412f94f40d9dd 100644
--- a/src/test/DoS_tests.cpp
+++ b/src/test/DoS_tests.cpp
@@ -44,15 +44,15 @@ BOOST_FIXTURE_TEST_SUITE(DoS_tests, TestingSetup)
 
 BOOST_AUTO_TEST_CASE(DoS_banning)
 {
-    CNode::ClearBanned();
+    connman->ClearBanned();
     CAddress addr1(ip(0xa0b0c001), NODE_NONE);
     CNode dummyNode1(INVALID_SOCKET, addr1, "", true);
     GetNodeSignals().InitializeNode(dummyNode1.GetId(), &dummyNode1);
     dummyNode1.nVersion = 1;
     Misbehaving(dummyNode1.GetId(), 100); // Should get banned
     SendMessages(&dummyNode1, *connman);
-    BOOST_CHECK(CNode::IsBanned(addr1));
-    BOOST_CHECK(!CNode::IsBanned(ip(0xa0b0c001|0x0000ff00))); // Different IP, not banned
+    BOOST_CHECK(connman->IsBanned(addr1));
+    BOOST_CHECK(!connman->IsBanned(ip(0xa0b0c001|0x0000ff00))); // Different IP, not banned
 
     CAddress addr2(ip(0xa0b0c002), NODE_NONE);
     CNode dummyNode2(INVALID_SOCKET, addr2, "", true);
@@ -60,16 +60,16 @@ BOOST_AUTO_TEST_CASE(DoS_banning)
     dummyNode2.nVersion = 1;
     Misbehaving(dummyNode2.GetId(), 50);
     SendMessages(&dummyNode2, *connman);
-    BOOST_CHECK(!CNode::IsBanned(addr2)); // 2 not banned yet...
-    BOOST_CHECK(CNode::IsBanned(addr1));  // ... but 1 still should be
+    BOOST_CHECK(!connman->IsBanned(addr2)); // 2 not banned yet...
+    BOOST_CHECK(connman->IsBanned(addr1));  // ... but 1 still should be
     Misbehaving(dummyNode2.GetId(), 50);
     SendMessages(&dummyNode2, *connman);
-    BOOST_CHECK(CNode::IsBanned(addr2));
+    BOOST_CHECK(connman->IsBanned(addr2));
 }
 
 BOOST_AUTO_TEST_CASE(DoS_banscore)
 {
-    CNode::ClearBanned();
+    connman->ClearBanned();
     mapArgs["-banscore"] = "111"; // because 11 is my favorite number
     CAddress addr1(ip(0xa0b0c001), NODE_NONE);
     CNode dummyNode1(INVALID_SOCKET, addr1, "", true);
@@ -77,19 +77,19 @@ BOOST_AUTO_TEST_CASE(DoS_banscore)
     dummyNode1.nVersion = 1;
     Misbehaving(dummyNode1.GetId(), 100);
     SendMessages(&dummyNode1, *connman);
-    BOOST_CHECK(!CNode::IsBanned(addr1));
+    BOOST_CHECK(!connman->IsBanned(addr1));
     Misbehaving(dummyNode1.GetId(), 10);
     SendMessages(&dummyNode1, *connman);
-    BOOST_CHECK(!CNode::IsBanned(addr1));
+    BOOST_CHECK(!connman->IsBanned(addr1));
     Misbehaving(dummyNode1.GetId(), 1);
     SendMessages(&dummyNode1, *connman);
-    BOOST_CHECK(CNode::IsBanned(addr1));
+    BOOST_CHECK(connman->IsBanned(addr1));
     mapArgs.erase("-banscore");
 }
 
 BOOST_AUTO_TEST_CASE(DoS_bantime)
 {
-    CNode::ClearBanned();
+    connman->ClearBanned();
     int64_t nStartTime = GetTime();
     SetMockTime(nStartTime); // Overrides future calls to GetTime()
 
@@ -100,13 +100,13 @@ BOOST_AUTO_TEST_CASE(DoS_bantime)
 
     Misbehaving(dummyNode.GetId(), 100);
     SendMessages(&dummyNode, *connman);
-    BOOST_CHECK(CNode::IsBanned(addr));
+    BOOST_CHECK(connman->IsBanned(addr));
 
     SetMockTime(nStartTime+60*60);
-    BOOST_CHECK(CNode::IsBanned(addr));
+    BOOST_CHECK(connman->IsBanned(addr));
 
     SetMockTime(nStartTime+60*60*24+1);
-    BOOST_CHECK(!CNode::IsBanned(addr));
+    BOOST_CHECK(!connman->IsBanned(addr));
 }
 
 CTransaction RandomOrphan()

From 502dd3a8a0bc0d12744e75f84a22cc12074c5683 Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Sat, 16 Apr 2016 17:51:01 -0400
Subject: [PATCH 0842/1802] net: Add oneshot functions to CConnman

---
 src/init.cpp | 2 +-
 src/net.cpp  | 5 +----
 src/net.h    | 4 +++-
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/init.cpp b/src/init.cpp
index b0ffb7a40e35f..719b648c04cfd 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -1230,7 +1230,7 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
     }
 
     BOOST_FOREACH(const std::string& strDest, mapMultiArgs["-seednode"])
-        AddOneShot(strDest);
+        connman.AddOneShot(strDest);
 
 #if ENABLE_ZMQ
     pzmqNotificationInterface = CZMQNotificationInterface::CreateWithArguments(mapArgs);
diff --git a/src/net.cpp b/src/net.cpp
index eeb84fca7a20b..045939c2ea19f 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -91,9 +91,6 @@ std::vector<CNode*> vNodes;
 CCriticalSection cs_vNodes;
 limitedmap<uint256, int64_t> mapAlreadyAskedFor(MAX_INV_SZ);
 
-static std::deque<std::string> vOneShots;
-CCriticalSection cs_vOneShots;
-
 std::vector<std::string> vAddedNodes;
 CCriticalSection cs_vAddedNodes;
 
@@ -107,7 +104,7 @@ boost::condition_variable messageHandlerCondition;
 static CNodeSignals g_signals;
 CNodeSignals& GetNodeSignals() { return g_signals; }
 
-void AddOneShot(const std::string& strDest)
+void CConnman::AddOneShot(const std::string& strDest)
 {
     LOCK(cs_vOneShots);
     vOneShots.push_back(strDest);
diff --git a/src/net.h b/src/net.h
index 65dafb4fd926c..81de7f5a98f06 100644
--- a/src/net.h
+++ b/src/net.h
@@ -87,7 +87,6 @@ unsigned int SendBufferSize();
 
 typedef int NodeId;
 
-void AddOneShot(const std::string& strDest);
 CNode* FindNode(const CNetAddr& ip);
 CNode* FindNode(const CSubNet& subNet);
 CNode* FindNode(const std::string& addrName);
@@ -137,6 +136,7 @@ class CConnman
     void GetBanned(banmap_t &banmap);
     void SetBanned(const banmap_t &banmap);
 
+    void AddOneShot(const std::string& strDest);
 private:
     struct ListenSocket {
         SOCKET socket;
@@ -171,6 +171,8 @@ class CConnman
     bool setBannedIsDirty;
     bool fAddressesInitialized;
     CAddrMan addrman;
+    std::deque<std::string> vOneShots;
+    CCriticalSection cs_vOneShots;
 };
 extern std::unique_ptr<CConnman> g_connman;
 void MapPort(bool fUseUPnP);

From 8ae2dac1c65349e4620422a43b7fa9d49af52c11 Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Sat, 16 Apr 2016 18:12:58 -0400
Subject: [PATCH 0843/1802] net: move added node functions to CConnman

---
 src/net.cpp     | 29 +++++++++++++++++++++++++----
 src/net.h       | 28 +++++++++++++++-------------
 src/rpc/net.cpp | 17 ++++++-----------
 3 files changed, 46 insertions(+), 28 deletions(-)

diff --git a/src/net.cpp b/src/net.cpp
index 045939c2ea19f..8ca6df0f9ba09 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -91,9 +91,6 @@ std::vector<CNode*> vNodes;
 CCriticalSection cs_vNodes;
 limitedmap<uint256, int64_t> mapAlreadyAskedFor(MAX_INV_SZ);
 
-std::vector<std::string> vAddedNodes;
-CCriticalSection cs_vAddedNodes;
-
 NodeId nLastNodeId = 0;
 CCriticalSection cs_nLastNodeId;
 
@@ -1718,7 +1715,7 @@ void CConnman::ThreadOpenConnections()
     }
 }
 
-std::vector<AddedNodeInfo> GetAddedNodeInfo()
+std::vector<AddedNodeInfo> CConnman::GetAddedNodeInfo()
 {
     std::vector<AddedNodeInfo> ret;
 
@@ -2246,6 +2243,30 @@ std::vector<CAddress> CConnman::GetAddresses()
     return addrman.GetAddr();
 }
 
+bool CConnman::AddNode(const std::string& strNode)
+{
+    LOCK(cs_vAddedNodes);
+    for(std::vector<std::string>::const_iterator it = vAddedNodes.begin(); it != vAddedNodes.end(); ++it) {
+        if (strNode == *it)
+            return false;
+    }
+
+    vAddedNodes.push_back(strNode);
+    return true;
+}
+
+bool CConnman::RemoveAddedNode(const std::string& strNode)
+{
+    LOCK(cs_vAddedNodes);
+    for(std::vector<std::string>::iterator it = vAddedNodes.begin(); it != vAddedNodes.end(); ++it) {
+        if (strNode == *it) {
+            vAddedNodes.erase(it);
+            return true;
+        }
+    }
+    return false;
+}
+
 void RelayTransaction(const CTransaction& tx)
 {
     CInv inv(MSG_TX, tx.GetHash());
diff --git a/src/net.h b/src/net.h
index 81de7f5a98f06..f343646cba78e 100644
--- a/src/net.h
+++ b/src/net.h
@@ -87,6 +87,14 @@ unsigned int SendBufferSize();
 
 typedef int NodeId;
 
+struct AddedNodeInfo
+{
+    std::string strAddedNode;
+    CService resolvedAddress;
+    bool fConnected;
+    bool fInbound;
+};
+
 CNode* FindNode(const CNetAddr& ip);
 CNode* FindNode(const CSubNet& subNet);
 CNode* FindNode(const std::string& addrName);
@@ -137,6 +145,11 @@ class CConnman
     void SetBanned(const banmap_t &banmap);
 
     void AddOneShot(const std::string& strDest);
+
+    bool AddNode(const std::string& node);
+    bool RemoveAddedNode(const std::string& node);
+    std::vector<AddedNodeInfo> GetAddedNodeInfo();
+
 private:
     struct ListenSocket {
         SOCKET socket;
@@ -173,6 +186,8 @@ class CConnman
     CAddrMan addrman;
     std::deque<std::string> vOneShots;
     CCriticalSection cs_vOneShots;
+    std::vector<std::string> vAddedNodes;
+    CCriticalSection cs_vAddedNodes;
 };
 extern std::unique_ptr<CConnman> g_connman;
 void MapPort(bool fUseUPnP);
@@ -252,9 +267,6 @@ extern std::vector<CNode*> vNodes;
 extern CCriticalSection cs_vNodes;
 extern limitedmap<uint256, int64_t> mapAlreadyAskedFor;
 
-extern std::vector<std::string> vAddedNodes;
-extern CCriticalSection cs_vAddedNodes;
-
 extern NodeId nLastNodeId;
 extern CCriticalSection cs_nLastNodeId;
 
@@ -807,14 +819,4 @@ void RelayTransaction(const CTransaction& tx);
 /** Return a timestamp in the future (in microseconds) for exponentially distributed events. */
 int64_t PoissonNextSend(int64_t nNow, int average_interval_seconds);
 
-struct AddedNodeInfo
-{
-    std::string strAddedNode;
-    CService resolvedAddress;
-    bool fConnected;
-    bool fInbound;
-};
-
-std::vector<AddedNodeInfo> GetAddedNodeInfo();
-
 #endif // BITCOIN_NET_H
diff --git a/src/rpc/net.cpp b/src/rpc/net.cpp
index 0244da9fea746..ab475f7125ffb 100644
--- a/src/rpc/net.cpp
+++ b/src/rpc/net.cpp
@@ -226,23 +226,15 @@ UniValue addnode(const UniValue& params, bool fHelp)
         return NullUniValue;
     }
 
-    LOCK(cs_vAddedNodes);
-    vector<string>::iterator it = vAddedNodes.begin();
-    for(; it != vAddedNodes.end(); it++)
-        if (strNode == *it)
-            break;
-
     if (strCommand == "add")
     {
-        if (it != vAddedNodes.end())
+        if(!g_connman->AddNode(strNode))
             throw JSONRPCError(RPC_CLIENT_NODE_ALREADY_ADDED, "Error: Node already added");
-        vAddedNodes.push_back(strNode);
     }
     else if(strCommand == "remove")
     {
-        if (it == vAddedNodes.end())
+        if(!g_connman->RemoveAddedNode(strNode))
             throw JSONRPCError(RPC_CLIENT_NODE_NOT_ADDED, "Error: Node has not been added.");
-        vAddedNodes.erase(it);
     }
 
     return NullUniValue;
@@ -299,7 +291,10 @@ UniValue getaddednodeinfo(const UniValue& params, bool fHelp)
             + HelpExampleRpc("getaddednodeinfo", "true, \"192.168.0.201\"")
         );
 
-    std::vector<AddedNodeInfo> vInfo = GetAddedNodeInfo();
+    if(!g_connman)
+        throw JSONRPCError(RPC_CLIENT_P2P_DISABLED, "Error: Peer-to-peer functionality missing or disabled");
+
+    std::vector<AddedNodeInfo> vInfo = g_connman->GetAddedNodeInfo();
 
     if (params.size() == 1) {
         bool found = false;

From c0569c7fa1e25599b3f1d6a16b15ec23052021da Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Sat, 16 Apr 2016 18:30:03 -0400
Subject: [PATCH 0844/1802] net: Add most functions needed for vNodes to
 CConnman

---
 src/net.cpp               | 66 +++++++++++++++++++++++++++++++++++++++
 src/net.h                 | 16 ++++++++++
 src/qt/clientmodel.cpp    | 22 +++++++------
 src/qt/peertablemodel.cpp | 15 ++++-----
 src/qt/rpcconsole.cpp     |  8 ++---
 src/rpc/mining.cpp        |  5 ++-
 src/rpc/misc.cpp          |  3 +-
 src/rpc/net.cpp           | 36 ++++++++-------------
 8 files changed, 123 insertions(+), 48 deletions(-)

diff --git a/src/net.cpp b/src/net.cpp
index 8ca6df0f9ba09..e1cfc565d6051 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -2267,6 +2267,72 @@ bool CConnman::RemoveAddedNode(const std::string& strNode)
     return false;
 }
 
+size_t CConnman::GetNodeCount(NumConnections flags)
+{
+    LOCK(cs_vNodes);
+    if (flags == CConnman::CONNECTIONS_ALL) // Shortcut if we want total
+        return vNodes.size();
+
+    int nNum = 0;
+    for(std::vector<CNode*>::const_iterator it = vNodes.begin(); it != vNodes.end(); ++it)
+        if (flags & ((*it)->fInbound ? CONNECTIONS_IN : CONNECTIONS_OUT))
+            nNum++;
+
+    return nNum;
+}
+
+void CConnman::GetNodeStats(std::vector<CNodeStats>& vstats)
+{
+    vstats.clear();
+    LOCK(cs_vNodes);
+    vstats.reserve(vNodes.size());
+    for(std::vector<CNode*>::iterator it = vNodes.begin(); it != vNodes.end(); ++it) {
+        CNode* pnode = *it;
+        CNodeStats stats;
+        pnode->copyStats(stats);
+        vstats.push_back(stats);
+    }
+}
+
+bool CConnman::DisconnectAddress(const CNetAddr& netAddr)
+{
+    if (CNode* pnode = FindNode(netAddr)) {
+        pnode->fDisconnect = true;
+        return true;
+    }
+    return false;
+}
+
+bool CConnman::DisconnectSubnet(const CSubNet& subNet)
+{
+    if (CNode* pnode = FindNode(subNet)) {
+        pnode->fDisconnect = true;
+        return true;
+    }
+    return false;
+}
+
+bool CConnman::DisconnectNode(const std::string& strNode)
+{
+    if (CNode* pnode = FindNode(strNode)) {
+        pnode->fDisconnect = true;
+        return true;
+    }
+    return false;
+}
+
+bool CConnman::DisconnectNode(NodeId id)
+{
+    LOCK(cs_vNodes);
+    for(CNode* pnode : vNodes) {
+        if (id == pnode->id) {
+            pnode->fDisconnect = true;
+            return true;
+        }
+    }
+    return false;
+}
+
 void RelayTransaction(const CTransaction& tx)
 {
     CInv inv(MSG_TX, tx.GetHash());
diff --git a/src/net.h b/src/net.h
index f343646cba78e..9e2408cd7052b 100644
--- a/src/net.h
+++ b/src/net.h
@@ -101,9 +101,18 @@ CNode* FindNode(const std::string& addrName);
 CNode* FindNode(const CService& ip);
 CNode* FindNode(const NodeId id); //TODO: Remove this
 
+class CNodeStats;
 class CConnman
 {
 public:
+
+    enum NumConnections {
+        CONNECTIONS_NONE = 0,
+        CONNECTIONS_IN = (1U << 0),
+        CONNECTIONS_OUT = (1U << 1),
+        CONNECTIONS_ALL = (CONNECTIONS_IN | CONNECTIONS_OUT),
+    };
+
     CConnman();
     ~CConnman();
     bool Start(boost::thread_group& threadGroup, CScheduler& scheduler, std::string& strNodeError);
@@ -150,6 +159,13 @@ class CConnman
     bool RemoveAddedNode(const std::string& node);
     std::vector<AddedNodeInfo> GetAddedNodeInfo();
 
+    size_t GetNodeCount(NumConnections num);
+    void GetNodeStats(std::vector<CNodeStats>& vstats);
+    bool DisconnectAddress(const CNetAddr& addr);
+    bool DisconnectNode(const std::string& node);
+    bool DisconnectNode(NodeId id);
+    bool DisconnectSubnet(const CSubNet& subnet);
+
 private:
     struct ListenSocket {
         SOCKET socket;
diff --git a/src/qt/clientmodel.cpp b/src/qt/clientmodel.cpp
index 14661b857a5a5..f72bbfe6bbd09 100644
--- a/src/qt/clientmodel.cpp
+++ b/src/qt/clientmodel.cpp
@@ -50,16 +50,18 @@ ClientModel::~ClientModel()
 
 int ClientModel::getNumConnections(unsigned int flags) const
 {
-    LOCK(cs_vNodes);
-    if (flags == CONNECTIONS_ALL) // Shortcut if we want total
-        return vNodes.size();
-
-    int nNum = 0;
-    BOOST_FOREACH(const CNode* pnode, vNodes)
-        if (flags & (pnode->fInbound ? CONNECTIONS_IN : CONNECTIONS_OUT))
-            nNum++;
-
-    return nNum;
+    CConnman::NumConnections connections = CConnman::CONNECTIONS_NONE;
+
+    if(flags == CONNECTIONS_IN)
+        connections = CConnman::CONNECTIONS_IN;
+    else if (flags == CONNECTIONS_OUT)
+        connections = CConnman::CONNECTIONS_OUT;
+    else if (flags == CONNECTIONS_ALL)
+        connections = CConnman::CONNECTIONS_ALL;
+
+    if(g_connman)
+         return g_connman->GetNodeCount(connections);
+    return 0;
 }
 
 int ClientModel::getNumBlocks() const
diff --git a/src/qt/peertablemodel.cpp b/src/qt/peertablemodel.cpp
index 0eb28f4ae18e8..a820bd791f70b 100644
--- a/src/qt/peertablemodel.cpp
+++ b/src/qt/peertablemodel.cpp
@@ -54,24 +54,21 @@ class PeerTablePriv
     void refreshPeers()
     {
         {
-            TRY_LOCK(cs_vNodes, lockNodes);
-            if (!lockNodes)
-            {
-                // skip the refresh if we can't immediately get the lock
-                return;
-            }
             cachedNodeStats.clear();
+            std::vector<CNodeStats> vstats;
+            if(g_connman)
+                g_connman->GetNodeStats(vstats);
 #if QT_VERSION >= 0x040700
-            cachedNodeStats.reserve(vNodes.size());
+            cachedNodeStats.reserve(vstats.size());
 #endif
-            Q_FOREACH (CNode* pnode, vNodes)
+            Q_FOREACH (const CNodeStats& nodestats, vstats)
             {
                 CNodeCombinedStats stats;
                 stats.nodeStateStats.nMisbehavior = 0;
                 stats.nodeStateStats.nSyncHeight = -1;
                 stats.nodeStateStats.nCommonHeight = -1;
                 stats.fNodeStateStatsAvailable = false;
-                pnode->copyStats(stats.nodeStats);
+                stats.nodeStats = nodestats;
                 cachedNodeStats.append(stats);
             }
         }
diff --git a/src/qt/rpcconsole.cpp b/src/qt/rpcconsole.cpp
index 708be6b646e8a..f35f401d06b44 100644
--- a/src/qt/rpcconsole.cpp
+++ b/src/qt/rpcconsole.cpp
@@ -876,13 +876,13 @@ void RPCConsole::showBanTableContextMenu(const QPoint& point)
 
 void RPCConsole::disconnectSelectedNode()
 {
+    if(!g_connman)
+        return;
     // Get currently selected peer address
-    QString strNode = GUIUtil::getEntryData(ui->peerWidget, 0, PeerTableModel::Address).toString();
+    NodeId id = GUIUtil::getEntryData(ui->peerWidget, 0, PeerTableModel::NetNodeId).toInt();
     // Find the node, disconnect it and clear the selected node
-    if (CNode *bannedNode = FindNode(strNode.toStdString())) {
-        bannedNode->fDisconnect = true;
+    if(g_connman->DisconnectNode(id))
         clearSelectedNode();
-    }
 }
 
 void RPCConsole::banSelectedNode(int bantime)
diff --git a/src/rpc/mining.cpp b/src/rpc/mining.cpp
index 63ecf49ecd697..7794ac619d212 100644
--- a/src/rpc/mining.cpp
+++ b/src/rpc/mining.cpp
@@ -457,7 +457,10 @@ UniValue getblocktemplate(const UniValue& params, bool fHelp)
     if (strMode != "template")
         throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid mode");
 
-    if (vNodes.empty())
+    if(!g_connman)
+        throw JSONRPCError(RPC_CLIENT_P2P_DISABLED, "Error: Peer-to-peer functionality missing or disabled");
+
+    if (g_connman->GetNodeCount(CConnman::CONNECTIONS_ALL) == 0)
         throw JSONRPCError(RPC_CLIENT_NOT_CONNECTED, "Bitcoin is not connected!");
 
     if (IsInitialBlockDownload())
diff --git a/src/rpc/misc.cpp b/src/rpc/misc.cpp
index e96feaa864939..f9f1615614cd9 100644
--- a/src/rpc/misc.cpp
+++ b/src/rpc/misc.cpp
@@ -89,7 +89,8 @@ UniValue getinfo(const UniValue& params, bool fHelp)
 #endif
     obj.push_back(Pair("blocks",        (int)chainActive.Height()));
     obj.push_back(Pair("timeoffset",    GetTimeOffset()));
-    obj.push_back(Pair("connections",   (int)vNodes.size()));
+    if(g_connman)
+        obj.push_back(Pair("connections",   (int)g_connman->GetNodeCount(CConnman::CONNECTIONS_ALL)));
     obj.push_back(Pair("proxy",         (proxy.IsValid() ? proxy.proxy.ToStringIPPort() : string())));
     obj.push_back(Pair("difficulty",    (double)GetDifficulty()));
     obj.push_back(Pair("testnet",       Params().TestnetToBeDeprecatedFieldRPC()));
diff --git a/src/rpc/net.cpp b/src/rpc/net.cpp
index ab475f7125ffb..0d494a2e792ae 100644
--- a/src/rpc/net.cpp
+++ b/src/rpc/net.cpp
@@ -36,9 +36,10 @@ UniValue getconnectioncount(const UniValue& params, bool fHelp)
             + HelpExampleRpc("getconnectioncount", "")
         );
 
-    LOCK2(cs_main, cs_vNodes);
+    if(!g_connman)
+        throw JSONRPCError(RPC_CLIENT_P2P_DISABLED, "Error: Peer-to-peer functionality missing or disabled");
 
-    return (int)vNodes.size();
+    return (int)g_connman->GetNodeCount(CConnman::CONNECTIONS_ALL);
 }
 
 UniValue ping(const UniValue& params, bool fHelp)
@@ -64,19 +65,6 @@ UniValue ping(const UniValue& params, bool fHelp)
     return NullUniValue;
 }
 
-static void CopyNodeStats(std::vector<CNodeStats>& vstats)
-{
-    vstats.clear();
-
-    LOCK(cs_vNodes);
-    vstats.reserve(vNodes.size());
-    BOOST_FOREACH(CNode* pnode, vNodes) {
-        CNodeStats stats;
-        pnode->copyStats(stats);
-        vstats.push_back(stats);
-    }
-}
-
 UniValue getpeerinfo(const UniValue& params, bool fHelp)
 {
     if (fHelp || params.size() != 0)
@@ -127,10 +115,11 @@ UniValue getpeerinfo(const UniValue& params, bool fHelp)
             + HelpExampleRpc("getpeerinfo", "")
         );
 
-    LOCK(cs_main);
+    if(!g_connman)
+        throw JSONRPCError(RPC_CLIENT_P2P_DISABLED, "Error: Peer-to-peer functionality missing or disabled");
 
     vector<CNodeStats> vstats;
-    CopyNodeStats(vstats);
+    g_connman->GetNodeStats(vstats);
 
     UniValue ret(UniValue::VARR);
 
@@ -253,11 +242,12 @@ UniValue disconnectnode(const UniValue& params, bool fHelp)
             + HelpExampleRpc("disconnectnode", "\"192.168.0.6:8333\"")
         );
 
-    CNode* pNode = FindNode(params[0].get_str());
-    if (pNode == NULL)
-        throw JSONRPCError(RPC_CLIENT_NODE_NOT_CONNECTED, "Node not found in connected nodes");
+    if(!g_connman)
+        throw JSONRPCError(RPC_CLIENT_P2P_DISABLED, "Error: Peer-to-peer functionality missing or disabled");
 
-    pNode->fDisconnect = true;
+    bool ret = g_connman->DisconnectNode(params[0].get_str());
+    if (!ret)
+        throw JSONRPCError(RPC_CLIENT_NODE_NOT_CONNECTED, "Node not found in connected nodes");
 
     return NullUniValue;
 }
@@ -435,7 +425,6 @@ UniValue getnetworkinfo(const UniValue& params, bool fHelp)
         );
 
     LOCK(cs_main);
-
     UniValue obj(UniValue::VOBJ);
     obj.push_back(Pair("version",       CLIENT_VERSION));
     obj.push_back(Pair("subversion",    strSubVersion));
@@ -443,7 +432,8 @@ UniValue getnetworkinfo(const UniValue& params, bool fHelp)
     obj.push_back(Pair("localservices",       strprintf("%016x", nLocalServices)));
     obj.push_back(Pair("localrelay",     fRelayTxes));
     obj.push_back(Pair("timeoffset",    GetTimeOffset()));
-    obj.push_back(Pair("connections",   (int)vNodes.size()));
+    if(g_connman)
+        obj.push_back(Pair("connections",   (int)g_connman->GetNodeCount(CConnman::CONNECTIONS_ALL)));
     obj.push_back(Pair("networks",      GetNetworksInfo()));
     obj.push_back(Pair("relayfee",      ValueFromAmount(::minRelayTxFee.GetFeePerK())));
     UniValue localAddresses(UniValue::VARR);

From 53347f0cb99e514815e44a56439a4a10012238f8 Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Sat, 16 Apr 2016 19:13:12 -0400
Subject: [PATCH 0845/1802] net: create generic functor accessors and move
 vNodes to CConnman

---
 src/main.cpp               | 85 ++++++++++++++++++++++++--------------
 src/net.cpp                | 83 ++++++++++++++++++++++++++++---------
 src/net.h                  | 27 +++++++-----
 src/rpc/misc.cpp           |  9 ++--
 src/rpc/net.cpp            | 13 +++---
 src/rpc/rawtransaction.cpp |  9 +++-
 src/wallet/wallet.cpp      | 11 ++++-
 7 files changed, 164 insertions(+), 73 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index f3babb71d219d..af598d48739a2 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -470,7 +470,7 @@ void UpdateBlockAvailability(NodeId nodeid, const uint256 &hash) {
     }
 }
 
-void MaybeSetPeerAsAnnouncingHeaderAndIDs(const CNodeState* nodestate, CNode* pfrom) {
+void MaybeSetPeerAsAnnouncingHeaderAndIDs(const CNodeState* nodestate, CNode* pfrom, CConnman& connman) {
     if (nLocalServices & NODE_WITNESS) {
         // Don't ever request compact blocks when segwit is enabled.
         return;
@@ -484,11 +484,12 @@ void MaybeSetPeerAsAnnouncingHeaderAndIDs(const CNodeState* nodestate, CNode* pf
         if (lNodesAnnouncingHeaderAndIDs.size() >= 3) {
             // As per BIP152, we only get 3 of our peers to announce
             // blocks using compact encodings.
-            CNode* pnodeStop = FindNode(lNodesAnnouncingHeaderAndIDs.front());
-            if (pnodeStop) {
+            bool found = connman.ForNode(lNodesAnnouncingHeaderAndIDs.front(), [fAnnounceUsingCMPCTBLOCK, nCMPCTBLOCKVersion](CNode* pnodeStop){
                 pnodeStop->PushMessage(NetMsgType::SENDCMPCT, fAnnounceUsingCMPCTBLOCK, nCMPCTBLOCKVersion);
+                return true;
+            });
+            if(found)
                 lNodesAnnouncingHeaderAndIDs.pop_front();
-            }
         }
         fAnnounceUsingCMPCTBLOCK = true;
         pfrom->PushMessage(NetMsgType::SENDCMPCT, fAnnounceUsingCMPCTBLOCK, nCMPCTBLOCKVersion);
@@ -3089,15 +3090,15 @@ bool ActivateBestChain(CValidationState &state, const CChainParams& chainparams,
                 int nBlockEstimate = 0;
                 if (fCheckpointsEnabled)
                     nBlockEstimate = Checkpoints::GetTotalBlocksEstimate(chainparams.Checkpoints());
-                {
-                    LOCK(cs_vNodes);
-                    BOOST_FOREACH(CNode* pnode, vNodes) {
+                if(connman) {
+                    connman->ForEachNode([nNewHeight, nBlockEstimate, &vHashes](CNode* pnode) {
                         if (nNewHeight > (pnode->nStartingHeight != -1 ? pnode->nStartingHeight - 2000 : nBlockEstimate)) {
                             BOOST_REVERSE_FOREACH(const uint256& hash, vHashes) {
                                 pnode->PushBlockHash(hash);
                             }
                         }
-                    }
+                        return true;
+                    });
                 }
                 // Notify external listeners about the new tip.
                 if (!vHashes.empty()) {
@@ -4726,6 +4727,45 @@ bool static AlreadyHave(const CInv& inv) EXCLUSIVE_LOCKS_REQUIRED(cs_main)
     return true;
 }
 
+static void RelayTransaction(const CTransaction& tx, CConnman& connman)
+{
+    CInv inv(MSG_TX, tx.GetHash());
+    connman.ForEachNode([&inv](CNode* pnode)
+    {
+        pnode->PushInventory(inv);
+        return true;
+    });
+}
+
+static void RelayAddress(const CAddress& addr, bool fReachable, CConnman& connman)
+{
+    int nRelayNodes = fReachable ? 2 : 1; // limited relaying of addresses outside our network(s)
+
+    // Relay to a limited number of other nodes
+    // Use deterministic randomness to send to the same nodes for 24 hours
+    // at a time so the addrKnowns of the chosen nodes prevent repeats
+    static const uint64_t salt0 = GetRand(std::numeric_limits<uint64_t>::max());
+    static const uint64_t salt1 = GetRand(std::numeric_limits<uint64_t>::max());
+    uint64_t hashAddr = addr.GetHash();
+    std::multimap<uint64_t, CNode*> mapMix;
+    const CSipHasher hasher = CSipHasher(salt0, salt1).Write(hashAddr << 32).Write((GetTime() + hashAddr) / (24*60*60));
+
+    auto sortfunc = [&mapMix, &hasher](CNode* pnode) {
+        if (pnode->nVersion >= CADDR_TIME_VERSION) {
+            uint64_t hashKey = CSipHasher(hasher).Write(pnode->id).Finalize();
+            mapMix.emplace(hashKey, pnode);
+        }
+        return true;
+    };
+
+    auto pushfunc = [&addr, &mapMix, &nRelayNodes] {
+        for (auto mi = mapMix.begin(); mi != mapMix.end() && nRelayNodes-- > 0; ++mi)
+            mi->second->PushAddress(addr);
+    };
+
+    connman.ForEachNodeThen(std::move(sortfunc), std::move(pushfunc));
+}
+
 void static ProcessGetData(CNode* pfrom, const Consensus::Params& consensusParams)
 {
     std::deque<CInv>::iterator it = pfrom->vRecvGetData.begin();
@@ -5135,26 +5175,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
             if (addr.nTime > nSince && !pfrom->fGetAddr && vAddr.size() <= 10 && addr.IsRoutable())
             {
                 // Relay to a limited number of other nodes
-                {
-                    LOCK(cs_vNodes);
-                    // Use deterministic randomness to send to the same nodes for 24 hours
-                    // at a time so the addrKnowns of the chosen nodes prevent repeats
-                    static const uint64_t salt0 = GetRand(std::numeric_limits<uint64_t>::max());
-                    static const uint64_t salt1 = GetRand(std::numeric_limits<uint64_t>::max());
-                    uint64_t hashAddr = addr.GetHash();
-                    multimap<uint64_t, CNode*> mapMix;
-                    const CSipHasher hasher = CSipHasher(salt0, salt1).Write(hashAddr << 32).Write((GetTime() + hashAddr) / (24*60*60));
-                    BOOST_FOREACH(CNode* pnode, vNodes)
-                    {
-                        if (pnode->nVersion < CADDR_TIME_VERSION)
-                            continue;
-                        uint64_t hashKey = CSipHasher(hasher).Write(pnode->id).Finalize();
-                        mapMix.insert(make_pair(hashKey, pnode));
-                    }
-                    int nRelayNodes = fReachable ? 2 : 1; // limited relaying of addresses outside our network(s)
-                    for (multimap<uint64_t, CNode*>::iterator mi = mapMix.begin(); mi != mapMix.end() && nRelayNodes-- > 0; ++mi)
-                        ((*mi).second)->PushAddress(addr);
-                }
+                RelayAddress(addr, fReachable, connman);
             }
             // Do not store addresses outside our network
             if (fReachable)
@@ -5448,7 +5469,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
 
         if (!AlreadyHave(inv) && AcceptToMemoryPool(mempool, state, tx, true, &fMissingInputs)) {
             mempool.check(pcoinsTip);
-            RelayTransaction(tx);
+            RelayTransaction(tx, connman);
             for (unsigned int i = 0; i < tx.vout.size(); i++) {
                 vWorkQueue.emplace_back(inv.hash, i);
             }
@@ -5485,7 +5506,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
                         continue;
                     if (AcceptToMemoryPool(mempool, stateDummy, orphanTx, true, &fMissingInputs2)) {
                         LogPrint("mempool", "   accepted orphan tx %s\n", orphanHash.ToString());
-                        RelayTransaction(orphanTx);
+                        RelayTransaction(orphanTx, connman);
                         for (unsigned int i = 0; i < orphanTx.vout.size(); i++) {
                             vWorkQueue.emplace_back(orphanHash, i);
                         }
@@ -5560,7 +5581,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
                 int nDoS = 0;
                 if (!state.IsInvalid(nDoS) || nDoS == 0) {
                     LogPrintf("Force relaying tx %s from whitelisted peer=%d\n", tx.GetHash().ToString(), pfrom->id);
-                    RelayTransaction(tx);
+                    RelayTransaction(tx, connman);
                 } else {
                     LogPrintf("Not relaying invalid transaction %s from whitelisted peer=%d (%s)\n", tx.GetHash().ToString(), pfrom->id, FormatStateMessage(state));
                 }
@@ -5886,7 +5907,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
                     if (nodestate->fProvidesHeaderAndIDs && vGetData.size() == 1 && mapBlocksInFlight.size() == 1 && pindexLast->pprev->IsValid(BLOCK_VALID_CHAIN) && !(nLocalServices & NODE_WITNESS)) {
                         // We seem to be rather well-synced, so it appears pfrom was the first to provide us
                         // with this block! Let's get them to announce using compact blocks in the future.
-                        MaybeSetPeerAsAnnouncingHeaderAndIDs(nodestate, pfrom);
+                        MaybeSetPeerAsAnnouncingHeaderAndIDs(nodestate, pfrom, connman);
                         // In any case, we want to download using a compact block, not a regular one
                         vGetData[0] = CInv(MSG_CMPCT_BLOCK, vGetData[0].hash);
                     }
diff --git a/src/net.cpp b/src/net.cpp
index e1cfc565d6051..f20f63e04d273 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -87,8 +87,6 @@ uint64_t nLocalHostNonce = 0;
 int nMaxConnections = DEFAULT_MAX_PEER_CONNECTIONS;
 std::string strSubVersion;
 
-std::vector<CNode*> vNodes;
-CCriticalSection cs_vNodes;
 limitedmap<uint256, int64_t> mapAlreadyAskedFor(MAX_INV_SZ);
 
 NodeId nLastNodeId = 0;
@@ -315,7 +313,7 @@ uint64_t CNode::nMaxOutboundTotalBytesSentInCycle = 0;
 uint64_t CNode::nMaxOutboundTimeframe = 60*60*24; //1 day
 uint64_t CNode::nMaxOutboundCycleStartTime = 0;
 
-CNode* FindNode(const CNetAddr& ip)
+CNode* CConnman::FindNode(const CNetAddr& ip)
 {
     LOCK(cs_vNodes);
     BOOST_FOREACH(CNode* pnode, vNodes)
@@ -324,7 +322,7 @@ CNode* FindNode(const CNetAddr& ip)
     return NULL;
 }
 
-CNode* FindNode(const CSubNet& subNet)
+CNode* CConnman::FindNode(const CSubNet& subNet)
 {
     LOCK(cs_vNodes);
     BOOST_FOREACH(CNode* pnode, vNodes)
@@ -333,7 +331,7 @@ CNode* FindNode(const CSubNet& subNet)
     return NULL;
 }
 
-CNode* FindNode(const std::string& addrName)
+CNode* CConnman::FindNode(const std::string& addrName)
 {
     LOCK(cs_vNodes);
     BOOST_FOREACH(CNode* pnode, vNodes)
@@ -342,7 +340,7 @@ CNode* FindNode(const std::string& addrName)
     return NULL;
 }
 
-CNode* FindNode(const CService& addr)
+CNode* CConnman::FindNode(const CService& addr)
 {
     LOCK(cs_vNodes);
     BOOST_FOREACH(CNode* pnode, vNodes)
@@ -351,16 +349,6 @@ CNode* FindNode(const CService& addr)
     return NULL;
 }
 
-//TODO: This is used in only one place in main, and should be removed
-CNode* FindNode(const NodeId nodeid)
-{
-    LOCK(cs_vNodes);
-    BOOST_FOREACH(CNode* pnode, vNodes)
-        if (pnode->GetId() == nodeid)
-            return (pnode);
-    return NULL;
-}
-
 CNode* CConnman::ConnectNode(CAddress addrConnect, const char *pszDest, bool fCountFailure)
 {
     if (pszDest == NULL) {
@@ -899,7 +887,8 @@ static bool CompareNodeTXTime(const NodeEvictionCandidate &a, const NodeEviction
  *   to forge.  In order to partition a node the attacker must be
  *   simultaneously better at all of them than honest peers.
  */
-static bool AttemptToEvictConnection() {
+bool CConnman::AttemptToEvictConnection()
+{
     std::vector<NodeEvictionCandidate> vEvictionCandidates;
     {
         LOCK(cs_vNodes);
@@ -2320,7 +2309,6 @@ bool CConnman::DisconnectNode(const std::string& strNode)
     }
     return false;
 }
-
 bool CConnman::DisconnectNode(NodeId id)
 {
     LOCK(cs_vNodes);
@@ -2333,7 +2321,7 @@ bool CConnman::DisconnectNode(NodeId id)
     return false;
 }
 
-void RelayTransaction(const CTransaction& tx)
+void CConnman::RelayTransaction(const CTransaction& tx)
 {
     CInv inv(MSG_TX, tx.GetHash());
     LOCK(cs_vNodes);
@@ -2671,6 +2659,63 @@ void CNode::EndMessage(const char* pszCommand) UNLOCK_FUNCTION(cs_vSend)
     LEAVE_CRITICAL_SECTION(cs_vSend);
 }
 
+bool CConnman::ForNode(NodeId id, std::function<bool(CNode* pnode)> func)
+{
+    CNode* found = nullptr;
+    LOCK(cs_vNodes);
+    for (auto&& pnode : vNodes) {
+        if(pnode->id == id) {
+            found = pnode;
+            break;
+        }
+    }
+    return found != nullptr && func(found);
+}
+
+bool CConnman::ForEachNode(std::function<bool(CNode* pnode)> func)
+{
+    LOCK(cs_vNodes);
+    for (auto&& node : vNodes)
+        if(!func(node))
+            return false;
+    return true;
+}
+
+bool CConnman::ForEachNode(std::function<bool(const CNode* pnode)> func) const
+{
+    LOCK(cs_vNodes);
+    for (const auto& node : vNodes)
+        if(!func(node))
+            return false;
+    return true;
+}
+
+bool CConnman::ForEachNodeThen(std::function<bool(CNode* pnode)> pre, std::function<void()> post)
+{
+    bool ret = true;
+    LOCK(cs_vNodes);
+    for (auto&& node : vNodes)
+        if(!pre(node)) {
+            ret = false;
+            break;
+        }
+    post();
+    return ret;
+}
+
+bool CConnman::ForEachNodeThen(std::function<bool(const CNode* pnode)> pre, std::function<void()> post) const
+{
+    bool ret = true;
+    LOCK(cs_vNodes);
+    for (const auto& node : vNodes)
+        if(!pre(node)) {
+            ret = false;
+            break;
+        }
+    post();
+    return ret;
+}
+
 int64_t PoissonNextSend(int64_t nNow, int average_interval_seconds) {
     return nNow + (int64_t)(log1p(GetRand(1ULL << 48) * -0.0000000000000035527136788 /* -1/2^48 */) * average_interval_seconds * -1000000.0 + 0.5);
 }
diff --git a/src/net.h b/src/net.h
index 9e2408cd7052b..5b1e80bfbe3a8 100644
--- a/src/net.h
+++ b/src/net.h
@@ -95,12 +95,7 @@ struct AddedNodeInfo
     bool fInbound;
 };
 
-CNode* FindNode(const CNetAddr& ip);
-CNode* FindNode(const CSubNet& subNet);
-CNode* FindNode(const std::string& addrName);
-CNode* FindNode(const CService& ip);
-CNode* FindNode(const NodeId id); //TODO: Remove this
-
+class CTransaction;
 class CNodeStats;
 class CConnman
 {
@@ -120,6 +115,14 @@ class CConnman
     bool BindListenPort(const CService &bindAddr, std::string& strError, bool fWhitelisted = false);
     bool OpenNetworkConnection(const CAddress& addrConnect, bool fCountFailure, CSemaphoreGrant *grantOutbound = NULL, const char *strDest = NULL, bool fOneShot = false, bool fFeeler = false);
 
+    bool ForNode(NodeId id, std::function<bool(CNode* pnode)> func);
+    bool ForEachNode(std::function<bool(CNode* pnode)> func);
+    bool ForEachNode(std::function<bool(const CNode* pnode)> func) const;
+    bool ForEachNodeThen(std::function<bool(CNode* pnode)> pre, std::function<void()> post);
+    bool ForEachNodeThen(std::function<bool(const CNode* pnode)> pre, std::function<void()> post) const;
+
+    void RelayTransaction(const CTransaction& tx);
+
     // Addrman functions
     size_t GetAddressCount() const;
     void SetServices(const CService &addr, ServiceFlags nServices);
@@ -182,6 +185,12 @@ class CConnman
     void ThreadSocketHandler();
     void ThreadDNSAddressSeed();
 
+    CNode* FindNode(const CNetAddr& ip);
+    CNode* FindNode(const CSubNet& subNet);
+    CNode* FindNode(const std::string& addrName);
+    CNode* FindNode(const CService& addr);
+
+    bool AttemptToEvictConnection();
     CNode* ConnectNode(CAddress addrConnect, const char *pszDest, bool fCountFailure);
     void DeleteNode(CNode* pnode);
     //!check is the banlist has unwritten changes
@@ -204,6 +213,8 @@ class CConnman
     CCriticalSection cs_vOneShots;
     std::vector<std::string> vAddedNodes;
     CCriticalSection cs_vAddedNodes;
+    std::vector<CNode*> vNodes;
+    mutable CCriticalSection cs_vNodes;
 };
 extern std::unique_ptr<CConnman> g_connman;
 void MapPort(bool fUseUPnP);
@@ -279,8 +290,6 @@ extern uint64_t nLocalHostNonce;
 /** Maximum number of connections to simultaneously allow (aka connection slots) */
 extern int nMaxConnections;
 
-extern std::vector<CNode*> vNodes;
-extern CCriticalSection cs_vNodes;
 extern limitedmap<uint256, int64_t> mapAlreadyAskedFor;
 
 extern NodeId nLastNodeId;
@@ -828,8 +837,6 @@ class CNode
 
 
 
-class CTransaction;
-void RelayTransaction(const CTransaction& tx);
 
 
 /** Return a timestamp in the future (in microseconds) for exponentially distributed events. */
diff --git a/src/rpc/misc.cpp b/src/rpc/misc.cpp
index f9f1615614cd9..ffd377b4892fd 100644
--- a/src/rpc/misc.cpp
+++ b/src/rpc/misc.cpp
@@ -472,14 +472,17 @@ UniValue setmocktime(const UniValue& params, bool fHelp)
     // atomically with the time change to prevent peers from being
     // disconnected because we think we haven't communicated with them
     // in a long time.
-    LOCK2(cs_main, cs_vNodes);
+    LOCK(cs_main);
 
     RPCTypeCheck(params, boost::assign::list_of(UniValue::VNUM));
     SetMockTime(params[0].get_int64());
 
     uint64_t t = GetTime();
-    BOOST_FOREACH(CNode* pnode, vNodes) {
-        pnode->nLastSend = pnode->nLastRecv = t;
+    if(g_connman) {
+        g_connman->ForEachNode([t](CNode* pnode) {
+            pnode->nLastSend = pnode->nLastRecv = t;
+            return true;
+        });
     }
 
     return NullUniValue;
diff --git a/src/rpc/net.cpp b/src/rpc/net.cpp
index 0d494a2e792ae..509b57aa726ed 100644
--- a/src/rpc/net.cpp
+++ b/src/rpc/net.cpp
@@ -55,13 +55,14 @@ UniValue ping(const UniValue& params, bool fHelp)
             + HelpExampleRpc("ping", "")
         );
 
-    // Request that each node send a ping during next message processing pass
-    LOCK2(cs_main, cs_vNodes);
-
-    BOOST_FOREACH(CNode* pNode, vNodes) {
-        pNode->fPingQueued = true;
-    }
+    if(!g_connman)
+        throw JSONRPCError(RPC_CLIENT_P2P_DISABLED, "Error: Peer-to-peer functionality missing or disabled");
 
+    // Request that each node send a ping during next message processing pass
+    g_connman->ForEachNode([](CNode* pnode) {
+        pnode->fPingQueued = true;
+        return true;
+    });
     return NullUniValue;
 }
 
diff --git a/src/rpc/rawtransaction.cpp b/src/rpc/rawtransaction.cpp
index 9461a7280ccac..3daf1681f314a 100644
--- a/src/rpc/rawtransaction.cpp
+++ b/src/rpc/rawtransaction.cpp
@@ -891,8 +891,15 @@ UniValue sendrawtransaction(const UniValue& params, bool fHelp)
     } else if (fHaveChain) {
         throw JSONRPCError(RPC_TRANSACTION_ALREADY_IN_CHAIN, "transaction already in block chain");
     }
-    RelayTransaction(tx);
+    if(!g_connman)
+        throw JSONRPCError(RPC_CLIENT_P2P_DISABLED, "Error: Peer-to-peer functionality missing or disabled");
 
+    CInv inv(MSG_TX, hashTx);
+    g_connman->ForEachNode([&inv](CNode* pnode)
+    {
+        pnode->PushInventory(inv);
+        return true;
+    });
     return hashTx.GetHex();
 }
 
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index 4396c2a2b0125..fd8b056bfca03 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -1460,8 +1460,15 @@ bool CWalletTx::RelayWalletTransaction(CConnman* connman)
     {
         if (GetDepthInMainChain() == 0 && !isAbandoned() && InMempool()) {
             LogPrintf("Relaying wtx %s\n", GetHash().ToString());
-            RelayTransaction((CTransaction)*this);
-            return true;
+            if (connman) {
+                CInv inv(MSG_TX, GetHash());
+                connman->ForEachNode([&inv](CNode* pnode)
+                {
+                    pnode->PushInventory(inv);
+                    return true;
+                });
+                return true;
+            }
         }
     }
     return false;

From 6c19d92361fe4afb26dfa5d48a0748b84bca6f12 Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Sun, 17 Apr 2016 18:34:32 -0400
Subject: [PATCH 0846/1802] net: move whitelist functions into CConnman

---
 src/init.cpp |  2 +-
 src/net.cpp  |  9 +++------
 src/net.h    | 16 ++++++++--------
 3 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/src/init.cpp b/src/init.cpp
index 719b648c04cfd..f618e5ccc566f 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -1146,7 +1146,7 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
             LookupSubNet(net.c_str(), subnet);
             if (!subnet.IsValid())
                 return InitError(strprintf(_("Invalid netmask specified in -whitelist: '%s'"), net));
-            CNode::AddWhitelistedRange(subnet);
+            connman.AddWhitelistedRange(subnet);
         }
     }
 
diff --git a/src/net.cpp b/src/net.cpp
index f20f63e04d273..eb312ef1e4d86 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -625,10 +625,7 @@ void CConnman::SetBannedSetDirty(bool dirty)
 }
 
 
-std::vector<CSubNet> CNode::vWhitelistedRange;
-CCriticalSection CNode::cs_vWhitelistedRange;
-
-bool CNode::IsWhitelistedRange(const CNetAddr &addr) {
+bool CConnman::IsWhitelistedRange(const CNetAddr &addr) {
     LOCK(cs_vWhitelistedRange);
     BOOST_FOREACH(const CSubNet& subnet, vWhitelistedRange) {
         if (subnet.Match(addr))
@@ -637,7 +634,7 @@ bool CNode::IsWhitelistedRange(const CNetAddr &addr) {
     return false;
 }
 
-void CNode::AddWhitelistedRange(const CSubNet &subnet) {
+void CConnman::AddWhitelistedRange(const CSubNet &subnet) {
     LOCK(cs_vWhitelistedRange);
     vWhitelistedRange.push_back(subnet);
 }
@@ -992,7 +989,7 @@ void CConnman::AcceptConnection(const ListenSocket& hListenSocket) {
         if (!addr.SetSockAddr((const struct sockaddr*)&sockaddr))
             LogPrintf("Warning: Unknown socket family\n");
 
-    bool whitelisted = hListenSocket.whitelisted || CNode::IsWhitelistedRange(addr);
+    bool whitelisted = hListenSocket.whitelisted || IsWhitelistedRange(addr);
     {
         LOCK(cs_vNodes);
         BOOST_FOREACH(CNode* pnode, vNodes)
diff --git a/src/net.h b/src/net.h
index 5b1e80bfbe3a8..8d9925265dba6 100644
--- a/src/net.h
+++ b/src/net.h
@@ -169,6 +169,7 @@ class CConnman
     bool DisconnectNode(NodeId id);
     bool DisconnectSubnet(const CSubNet& subnet);
 
+    void AddWhitelistedRange(const CSubNet &subnet);
 private:
     struct ListenSocket {
         SOCKET socket;
@@ -192,6 +193,8 @@ class CConnman
 
     bool AttemptToEvictConnection();
     CNode* ConnectNode(CAddress addrConnect, const char *pszDest, bool fCountFailure);
+    bool IsWhitelistedRange(const CNetAddr &addr);
+
     void DeleteNode(CNode* pnode);
     //!check is the banlist has unwritten changes
     bool BannedSetIsDirty();
@@ -203,6 +206,11 @@ class CConnman
     void DumpData();
     void DumpBanlist();
 
+    // Whitelisted ranges. Any node connecting from these is automatically
+    // whitelisted (as well as those connecting to whitelisted binds).
+    std::vector<CSubNet> vWhitelistedRange;
+    CCriticalSection cs_vWhitelistedRange;
+
     std::vector<ListenSocket> vhListenSocket;
     banmap_t setBanned;
     CCriticalSection cs_setBanned;
@@ -432,11 +440,6 @@ class CNode
     const uint64_t nKeyedNetGroup;
 protected:
 
-    // Whitelisted ranges. Any node connecting from these is automatically
-    // whitelisted (as well as those connecting to whitelisted binds).
-    static std::vector<CSubNet> vWhitelistedRange;
-    static CCriticalSection cs_vWhitelistedRange;
-
     mapMsgCmdSize mapSendBytesPerMsgCmd;
     mapMsgCmdSize mapRecvBytesPerMsgCmd;
 
@@ -803,9 +806,6 @@ class CNode
 
     void copyStats(CNodeStats &stats);
 
-    static bool IsWhitelistedRange(const CNetAddr &ip);
-    static void AddWhitelistedRange(const CSubNet &subnet);
-
     // Network stats
     static void RecordBytesRecv(uint64_t bytes);
     static void RecordBytesSent(uint64_t bytes);

From 551e0887db9034b1e6490a267ba864b1d26ff469 Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Sun, 17 Apr 2016 20:20:34 -0400
Subject: [PATCH 0847/1802] net: move nLastNodeId to CConnman

---
 src/net.cpp            | 24 +++++++++++-------------
 src/net.h              |  9 +++++----
 src/test/DoS_tests.cpp | 10 ++++++----
 src/test/net_tests.cpp |  5 +++--
 4 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/src/net.cpp b/src/net.cpp
index eb312ef1e4d86..8bc8ecc436fd2 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -89,9 +89,6 @@ std::string strSubVersion;
 
 limitedmap<uint256, int64_t> mapAlreadyAskedFor(MAX_INV_SZ);
 
-NodeId nLastNodeId = 0;
-CCriticalSection cs_nLastNodeId;
-
 static CSemaphore *semOutbound = NULL;
 boost::condition_variable messageHandlerCondition;
 
@@ -404,7 +401,7 @@ CNode* CConnman::ConnectNode(CAddress addrConnect, const char *pszDest, bool fCo
         addrman.Attempt(addrConnect, fCountFailure);
 
         // Add node
-        CNode* pnode = new CNode(hSocket, addrConnect, pszDest ? pszDest : "", false);
+        CNode* pnode = new CNode(GetNewNodeId(), hSocket, addrConnect, pszDest ? pszDest : "", false);
         GetNodeSignals().InitializeNode(pnode->GetId(), pnode);
         pnode->AddRef();
 
@@ -1038,7 +1035,7 @@ void CConnman::AcceptConnection(const ListenSocket& hListenSocket) {
         }
     }
 
-    CNode* pnode = new CNode(hSocket, addr, "", true);
+    CNode* pnode = new CNode(GetNewNodeId(), hSocket, addr, "", true);
     GetNodeSignals().InitializeNode(pnode->GetId(), pnode);
     pnode->AddRef();
     pnode->fWhitelisted = whitelisted;
@@ -2030,6 +2027,7 @@ CConnman::CConnman()
 {
     setBannedIsDirty = false;
     fAddressesInitialized = false;
+    nLastNodeId = 0;
 }
 
 bool StartNode(CConnman& connman, boost::thread_group& threadGroup, CScheduler& scheduler, std::string& strNodeError)
@@ -2041,9 +2039,13 @@ bool StartNode(CConnman& connman, boost::thread_group& threadGroup, CScheduler&
     return ret;
 }
 
-bool CConnman::Start(boost::thread_group& threadGroup, CScheduler& scheduler, std::string& strNodeError)
+NodeId CConnman::GetNewNodeId()
 {
+    return nLastNodeId.fetch_add(1, std::memory_order_relaxed);
+}
 
+bool CConnman::Start(boost::thread_group& threadGroup, CScheduler& scheduler, std::string& strNodeError)
+{
     uiInterface.InitMessage(_("Loading addresses..."));
     // Load addresses from peers.dat
     int64_t nStart = GetTimeMillis();
@@ -2089,7 +2091,7 @@ bool CConnman::Start(boost::thread_group& threadGroup, CScheduler& scheduler, st
     if (pnodeLocalHost == NULL) {
         CNetAddr local;
         LookupHost("127.0.0.1", local, false);
-        pnodeLocalHost = new CNode(INVALID_SOCKET, CAddress(CService(local, 0), nLocalServices));
+        pnodeLocalHost = new CNode(GetNewNodeId(), INVALID_SOCKET, CAddress(CService(local, 0), nLocalServices));
         GetNodeSignals().InitializeNode(pnodeLocalHost->GetId(), pnodeLocalHost);
     }
 
@@ -2478,7 +2480,7 @@ void CNode::Fuzz(int nChance)
 unsigned int ReceiveFloodSize() { return 1000*GetArg("-maxreceivebuffer", DEFAULT_MAXRECEIVEBUFFER); }
 unsigned int SendBufferSize() { return 1000*GetArg("-maxsendbuffer", DEFAULT_MAXSENDBUFFER); }
 
-CNode::CNode(SOCKET hSocketIn, const CAddress& addrIn, const std::string& addrNameIn, bool fInboundIn) :
+CNode::CNode(NodeId idIn, SOCKET hSocketIn, const CAddress& addrIn, const std::string& addrNameIn, bool fInboundIn) :
     ssSend(SER_NETWORK, INIT_PROTO_VERSION),
     addr(addrIn),
     nKeyedNetGroup(CalculateKeyedNetGroup(addrIn)),
@@ -2531,16 +2533,12 @@ CNode::CNode(SOCKET hSocketIn, const CAddress& addrIn, const std::string& addrNa
     minFeeFilter = 0;
     lastSentFeeFilter = 0;
     nextSendTimeFeeFilter = 0;
+    id = idIn;
 
     BOOST_FOREACH(const std::string &msg, getAllNetMessageTypes())
         mapRecvBytesPerMsgCmd[msg] = 0;
     mapRecvBytesPerMsgCmd[NET_MESSAGE_COMMAND_OTHER] = 0;
 
-    {
-        LOCK(cs_nLastNodeId);
-        id = nLastNodeId++;
-    }
-
     if (fLogIPs)
         LogPrint("net", "Added connection to %s peer=%d\n", addrName, id);
     else
diff --git a/src/net.h b/src/net.h
index 8d9925265dba6..36043b0b8cb00 100644
--- a/src/net.h
+++ b/src/net.h
@@ -196,6 +196,9 @@ class CConnman
     bool IsWhitelistedRange(const CNetAddr &addr);
 
     void DeleteNode(CNode* pnode);
+
+    NodeId GetNewNodeId();
+
     //!check is the banlist has unwritten changes
     bool BannedSetIsDirty();
     //!set the "dirty" flag for the banlist
@@ -223,6 +226,7 @@ class CConnman
     CCriticalSection cs_vAddedNodes;
     std::vector<CNode*> vNodes;
     mutable CCriticalSection cs_vNodes;
+    std::atomic<NodeId> nLastNodeId;
 };
 extern std::unique_ptr<CConnman> g_connman;
 void MapPort(bool fUseUPnP);
@@ -300,9 +304,6 @@ extern int nMaxConnections;
 
 extern limitedmap<uint256, int64_t> mapAlreadyAskedFor;
 
-extern NodeId nLastNodeId;
-extern CCriticalSection cs_nLastNodeId;
-
 /** Subversion as sent to the P2P network in `version` messages */
 extern std::string strSubVersion;
 
@@ -501,7 +502,7 @@ class CNode
     CAmount lastSentFeeFilter;
     int64_t nextSendTimeFeeFilter;
 
-    CNode(SOCKET hSocketIn, const CAddress &addrIn, const std::string &addrNameIn = "", bool fInboundIn = false);
+    CNode(NodeId id, SOCKET hSocketIn, const CAddress &addrIn, const std::string &addrNameIn = "", bool fInboundIn = false);
     ~CNode();
 
 private:
diff --git a/src/test/DoS_tests.cpp b/src/test/DoS_tests.cpp
index 412f94f40d9dd..652a8e2ceadf7 100644
--- a/src/test/DoS_tests.cpp
+++ b/src/test/DoS_tests.cpp
@@ -40,13 +40,15 @@ CService ip(uint32_t i)
     return CService(CNetAddr(s), Params().GetDefaultPort());
 }
 
+static NodeId id = 0;
+
 BOOST_FIXTURE_TEST_SUITE(DoS_tests, TestingSetup)
 
 BOOST_AUTO_TEST_CASE(DoS_banning)
 {
     connman->ClearBanned();
     CAddress addr1(ip(0xa0b0c001), NODE_NONE);
-    CNode dummyNode1(INVALID_SOCKET, addr1, "", true);
+    CNode dummyNode1(id++, INVALID_SOCKET, addr1, "", true);
     GetNodeSignals().InitializeNode(dummyNode1.GetId(), &dummyNode1);
     dummyNode1.nVersion = 1;
     Misbehaving(dummyNode1.GetId(), 100); // Should get banned
@@ -55,7 +57,7 @@ BOOST_AUTO_TEST_CASE(DoS_banning)
     BOOST_CHECK(!connman->IsBanned(ip(0xa0b0c001|0x0000ff00))); // Different IP, not banned
 
     CAddress addr2(ip(0xa0b0c002), NODE_NONE);
-    CNode dummyNode2(INVALID_SOCKET, addr2, "", true);
+    CNode dummyNode2(id++, INVALID_SOCKET, addr2, "", true);
     GetNodeSignals().InitializeNode(dummyNode2.GetId(), &dummyNode2);
     dummyNode2.nVersion = 1;
     Misbehaving(dummyNode2.GetId(), 50);
@@ -72,7 +74,7 @@ BOOST_AUTO_TEST_CASE(DoS_banscore)
     connman->ClearBanned();
     mapArgs["-banscore"] = "111"; // because 11 is my favorite number
     CAddress addr1(ip(0xa0b0c001), NODE_NONE);
-    CNode dummyNode1(INVALID_SOCKET, addr1, "", true);
+    CNode dummyNode1(id++, INVALID_SOCKET, addr1, "", true);
     GetNodeSignals().InitializeNode(dummyNode1.GetId(), &dummyNode1);
     dummyNode1.nVersion = 1;
     Misbehaving(dummyNode1.GetId(), 100);
@@ -94,7 +96,7 @@ BOOST_AUTO_TEST_CASE(DoS_bantime)
     SetMockTime(nStartTime); // Overrides future calls to GetTime()
 
     CAddress addr(ip(0xa0b0c001), NODE_NONE);
-    CNode dummyNode(INVALID_SOCKET, addr, "", true);
+    CNode dummyNode(id++, INVALID_SOCKET, addr, "", true);
     GetNodeSignals().InitializeNode(dummyNode.GetId(), &dummyNode);
     dummyNode.nVersion = 1;
 
diff --git a/src/test/net_tests.cpp b/src/test/net_tests.cpp
index 267d1b55e13e8..00fb757167717 100644
--- a/src/test/net_tests.cpp
+++ b/src/test/net_tests.cpp
@@ -153,6 +153,7 @@ BOOST_AUTO_TEST_CASE(caddrdb_read_corrupted)
 BOOST_AUTO_TEST_CASE(cnode_simple_test)
 {
     SOCKET hSocket = INVALID_SOCKET;
+    NodeId id = 0;
 
     in_addr ipv4Addr;
     ipv4Addr.s_addr = 0xa0b0c001;
@@ -162,12 +163,12 @@ BOOST_AUTO_TEST_CASE(cnode_simple_test)
     bool fInboundIn = false;
 
     // Test that fFeeler is false by default.
-    CNode* pnode1 = new CNode(hSocket, addr, pszDest, fInboundIn);
+    CNode* pnode1 = new CNode(id++, hSocket, addr, pszDest, fInboundIn);
     BOOST_CHECK(pnode1->fInbound == false);
     BOOST_CHECK(pnode1->fFeeler == false);
 
     fInboundIn = true;
-    CNode* pnode2 = new CNode(hSocket, addr, pszDest, fInboundIn);
+    CNode* pnode2 = new CNode(id++, hSocket, addr, pszDest, fInboundIn);
     BOOST_CHECK(pnode2->fInbound == true);
     BOOST_CHECK(pnode2->fFeeler == false);
 }

From 960cf2e4058a9c195bf64e1aecb46024f9ef022a Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Sun, 17 Apr 2016 20:21:58 -0400
Subject: [PATCH 0848/1802] net: move nLocalHostNonce to CConnman

This behavior seems to have been quite racy and broken.

Move nLocalHostNonce into CNode, and check received nonces against all
non-fully-connected nodes. If there's a match, assume we've connected
to ourself.
---
 src/main.cpp |  2 +-
 src/net.cpp  | 14 ++++++++++++--
 src/net.h    |  7 ++++++-
 3 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index af598d48739a2..43ccb6374c35e 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -5025,7 +5025,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
         }
 
         // Disconnect if we connected to ourself
-        if (nNonce == nLocalHostNonce && nNonce > 1)
+        if (pfrom->fInbound && !connman.CheckIncomingNonce(nNonce))
         {
             LogPrintf("connected to self at %s, disconnecting\n", pfrom->addr.ToString());
             pfrom->fDisconnect = true;
diff --git a/src/net.cpp b/src/net.cpp
index 8bc8ecc436fd2..71b4b01688201 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -83,7 +83,6 @@ CCriticalSection cs_mapLocalHost;
 std::map<CNetAddr, LocalServiceInfo> mapLocalHost;
 static bool vfLimited[NET_MAX] = {};
 static CNode* pnodeLocalHost = NULL;
-uint64_t nLocalHostNonce = 0;
 int nMaxConnections = DEFAULT_MAX_PEER_CONNECTIONS;
 std::string strSubVersion;
 
@@ -346,6 +345,16 @@ CNode* CConnman::FindNode(const CService& addr)
     return NULL;
 }
 
+bool CConnman::CheckIncomingNonce(uint64_t nonce)
+{
+    LOCK(cs_vNodes);
+    BOOST_FOREACH(CNode* pnode, vNodes) {
+        if (!pnode->fSuccessfullyConnected && !pnode->fInbound && pnode->GetLocalNonce() == nonce)
+            return false;
+    }
+    return true;
+}
+
 CNode* CConnman::ConnectNode(CAddress addrConnect, const char *pszDest, bool fCountFailure)
 {
     if (pszDest == NULL) {
@@ -465,7 +474,6 @@ void CNode::PushVersion()
     int64_t nTime = (fInbound ? GetAdjustedTime() : GetTime());
     CAddress addrYou = (addr.IsRoutable() && !IsProxy(addr) ? addr : CAddress(CService(), addr.nServices));
     CAddress addrMe = GetLocalAddress(&addr);
-    GetRandBytes((unsigned char*)&nLocalHostNonce, sizeof(nLocalHostNonce));
     if (fLogIPs)
         LogPrint("net", "send version message: version %d, blocks=%d, us=%s, them=%s, peer=%d\n", PROTOCOL_VERSION, nBestHeight, addrMe.ToString(), addrYou.ToString(), id);
     else
@@ -2535,6 +2543,8 @@ CNode::CNode(NodeId idIn, SOCKET hSocketIn, const CAddress& addrIn, const std::s
     nextSendTimeFeeFilter = 0;
     id = idIn;
 
+    GetRandBytes((unsigned char*)&nLocalHostNonce, sizeof(nLocalHostNonce));
+
     BOOST_FOREACH(const std::string &msg, getAllNetMessageTypes())
         mapRecvBytesPerMsgCmd[msg] = 0;
     mapRecvBytesPerMsgCmd[NET_MESSAGE_COMMAND_OTHER] = 0;
diff --git a/src/net.h b/src/net.h
index 36043b0b8cb00..32668045c5ed7 100644
--- a/src/net.h
+++ b/src/net.h
@@ -114,6 +114,7 @@ class CConnman
     void Stop();
     bool BindListenPort(const CService &bindAddr, std::string& strError, bool fWhitelisted = false);
     bool OpenNetworkConnection(const CAddress& addrConnect, bool fCountFailure, CSemaphoreGrant *grantOutbound = NULL, const char *strDest = NULL, bool fOneShot = false, bool fFeeler = false);
+    bool CheckIncomingNonce(uint64_t nonce);
 
     bool ForNode(NodeId id, std::function<bool(CNode* pnode)> func);
     bool ForEachNode(std::function<bool(CNode* pnode)> func);
@@ -297,7 +298,6 @@ extern bool fListen;
 extern ServiceFlags nLocalServices;
 extern ServiceFlags nRelevantServices;
 extern bool fRelayTxes;
-extern uint64_t nLocalHostNonce;
 
 /** Maximum number of connections to simultaneously allow (aka connection slots) */
 extern int nMaxConnections;
@@ -523,12 +523,17 @@ class CNode
 
     static uint64_t CalculateKeyedNetGroup(const CAddress& ad);
 
+    uint64_t nLocalHostNonce;
 public:
 
     NodeId GetId() const {
       return id;
     }
 
+    uint64_t GetLocalNonce() const {
+      return nLocalHostNonce;
+    }
+
     int GetRefCount()
     {
         assert(nRefCount >= 0);

From ee44fa95761724a83a76dd862a36bd9af0fc021f Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Mon, 18 Apr 2016 21:33:54 -0400
Subject: [PATCH 0849/1802] net: move messageHandlerCondition to CConnman

---
 src/net.cpp | 11 +++++++----
 src/net.h   |  3 ++-
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/net.cpp b/src/net.cpp
index 71b4b01688201..a62ee2291c2f6 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -89,7 +89,6 @@ std::string strSubVersion;
 limitedmap<uint256, int64_t> mapAlreadyAskedFor(MAX_INV_SZ);
 
 static CSemaphore *semOutbound = NULL;
-boost::condition_variable messageHandlerCondition;
 
 // Signals for message handling
 static CNodeSignals g_signals;
@@ -688,8 +687,9 @@ void CNode::copyStats(CNodeStats &stats)
 #undef X
 
 // requires LOCK(cs_vRecvMsg)
-bool CNode::ReceiveMsgBytes(const char *pch, unsigned int nBytes)
+bool CNode::ReceiveMsgBytes(const char *pch, unsigned int nBytes, bool& complete)
 {
+    complete = false;
     while (nBytes > 0) {
 
         // get current incomplete message, or create a new one
@@ -728,7 +728,7 @@ bool CNode::ReceiveMsgBytes(const char *pch, unsigned int nBytes)
             i->second += msg.hdr.nMessageSize + CMessageHeader::HEADER_SIZE;
 
             msg.nTime = GetTimeMicros();
-            messageHandlerCondition.notify_one();
+            complete = true;
         }
     }
 
@@ -1247,8 +1247,11 @@ void CConnman::ThreadSocketHandler()
                         int nBytes = recv(pnode->hSocket, pchBuf, sizeof(pchBuf), MSG_DONTWAIT);
                         if (nBytes > 0)
                         {
-                            if (!pnode->ReceiveMsgBytes(pchBuf, nBytes))
+                            bool notify = false;
+                            if (!pnode->ReceiveMsgBytes(pchBuf, nBytes, notify))
                                 pnode->CloseSocketDisconnect();
+                            if(notify)
+                                messageHandlerCondition.notify_one();
                             pnode->nLastRecv = GetTime();
                             pnode->nRecvBytes += nBytes;
                             pnode->RecordBytesRecv(nBytes);
diff --git a/src/net.h b/src/net.h
index 32668045c5ed7..0e83ff4a0c99b 100644
--- a/src/net.h
+++ b/src/net.h
@@ -228,6 +228,7 @@ class CConnman
     std::vector<CNode*> vNodes;
     mutable CCriticalSection cs_vNodes;
     std::atomic<NodeId> nLastNodeId;
+    boost::condition_variable messageHandlerCondition;
 };
 extern std::unique_ptr<CConnman> g_connman;
 void MapPort(bool fUseUPnP);
@@ -550,7 +551,7 @@ class CNode
     }
 
     // requires LOCK(cs_vRecvMsg)
-    bool ReceiveMsgBytes(const char *pch, unsigned int nBytes);
+    bool ReceiveMsgBytes(const char *pch, unsigned int nBytes, bool& complete);
 
     // requires LOCK(cs_vRecvMsg)
     void SetRecvVersion(int nVersionIn)

From adf5d4c2e4e7a2979a6ca6de806151fe04c23162 Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Sat, 21 May 2016 12:04:02 +0200
Subject: [PATCH 0850/1802] net: SocketSendData returns written size

---
 src/net.cpp | 5 ++++-
 src/net.h   | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/net.cpp b/src/net.cpp
index a62ee2291c2f6..aded8d05d3fb5 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -791,9 +791,10 @@ int CNetMessage::readData(const char *pch, unsigned int nBytes)
 
 
 // requires LOCK(cs_vSend)
-void SocketSendData(CNode *pnode)
+size_t SocketSendData(CNode *pnode)
 {
     std::deque<CSerializeData>::iterator it = pnode->vSendMsg.begin();
+    size_t nSentSize = 0;
 
     while (it != pnode->vSendMsg.end()) {
         const CSerializeData &data = *it;
@@ -804,6 +805,7 @@ void SocketSendData(CNode *pnode)
             pnode->nSendBytes += nBytes;
             pnode->nSendOffset += nBytes;
             pnode->RecordBytesSent(nBytes);
+            nSentSize += nBytes;
             if (pnode->nSendOffset == data.size()) {
                 pnode->nSendOffset = 0;
                 pnode->nSendSize -= data.size();
@@ -832,6 +834,7 @@ void SocketSendData(CNode *pnode)
         assert(pnode->nSendSize == 0);
     }
     pnode->vSendMsg.erase(pnode->vSendMsg.begin(), it);
+    return nSentSize;
 }
 
 static std::list<CNode*> vNodesDisconnected;
diff --git a/src/net.h b/src/net.h
index 0e83ff4a0c99b..503e009c49886 100644
--- a/src/net.h
+++ b/src/net.h
@@ -236,7 +236,7 @@ unsigned short GetListenPort();
 bool BindListenPort(const CService &bindAddr, std::string& strError, bool fWhitelisted = false);
 bool StartNode(CConnman& connman, boost::thread_group& threadGroup, CScheduler& scheduler, std::string& strNodeError);
 bool StopNode(CConnman& connman);
-void SocketSendData(CNode *pnode);
+size_t SocketSendData(CNode *pnode);
 
 struct CombinerAll
 {

From 63cafa6329e1a0a1daf2d324931aca42ba1cbb19 Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Mon, 18 Apr 2016 21:44:42 -0400
Subject: [PATCH 0851/1802] net: move send/recv statistics to CConnman

---
 src/init.cpp           |  2 +-
 src/main.cpp           | 10 +++---
 src/net.cpp            | 63 +++++++++++++++++---------------
 src/net.h              | 82 +++++++++++++++++++++---------------------
 src/qt/clientmodel.cpp |  8 +++--
 src/rpc/net.cpp        | 18 +++++-----
 6 files changed, 99 insertions(+), 84 deletions(-)

diff --git a/src/init.cpp b/src/init.cpp
index f618e5ccc566f..a7f893c24fef0 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -1240,7 +1240,7 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
     }
 #endif
     if (mapArgs.count("-maxuploadtarget")) {
-        CNode::SetMaxOutboundTarget(GetArg("-maxuploadtarget", DEFAULT_MAX_UPLOAD_TARGET)*1024*1024);
+        connman.SetMaxOutboundTarget(GetArg("-maxuploadtarget", DEFAULT_MAX_UPLOAD_TARGET)*1024*1024);
     }
 
     // ********************************************************* Step 7: load block chain
diff --git a/src/main.cpp b/src/main.cpp
index 43ccb6374c35e..019db0bdb39e0 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -4766,7 +4766,7 @@ static void RelayAddress(const CAddress& addr, bool fReachable, CConnman& connma
     connman.ForEachNodeThen(std::move(sortfunc), std::move(pushfunc));
 }
 
-void static ProcessGetData(CNode* pfrom, const Consensus::Params& consensusParams)
+void static ProcessGetData(CNode* pfrom, const Consensus::Params& consensusParams, CConnman& connman)
 {
     std::deque<CInv>::iterator it = pfrom->vRecvGetData.begin();
 
@@ -4808,7 +4808,7 @@ void static ProcessGetData(CNode* pfrom, const Consensus::Params& consensusParam
                 // disconnect node in case we have reached the outbound limit for serving historical blocks
                 // never disconnect whitelisted nodes
                 static const int nOneWeek = 7 * 24 * 60 * 60; // assume > 1 week = historical
-                if (send && CNode::OutboundTargetReached(true) && ( ((pindexBestHeader != NULL) && (pindexBestHeader->GetBlockTime() - mi->second->GetBlockTime() > nOneWeek)) || inv.type == MSG_FILTERED_BLOCK) && !pfrom->fWhitelisted)
+                if (send && connman.OutboundTargetReached(true) && ( ((pindexBestHeader != NULL) && (pindexBestHeader->GetBlockTime() - mi->second->GetBlockTime() > nOneWeek)) || inv.type == MSG_FILTERED_BLOCK) && !pfrom->fWhitelisted)
                 {
                     LogPrint("net", "historical block serving limit reached, disconnect peer=%d\n", pfrom->GetId());
 
@@ -5312,7 +5312,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
             LogPrint("net", "received getdata for: %s peer=%d\n", vInv[0].ToString(), pfrom->id);
 
         pfrom->vRecvGetData.insert(pfrom->vRecvGetData.end(), vInv.begin(), vInv.end());
-        ProcessGetData(pfrom, chainparams.GetConsensus());
+        ProcessGetData(pfrom, chainparams.GetConsensus(), connman);
     }
 
 
@@ -5986,7 +5986,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
             return true;
         }
 
-        if (CNode::OutboundTargetReached(false) && !pfrom->fWhitelisted)
+        if (connman.OutboundTargetReached(false) && !pfrom->fWhitelisted)
         {
             LogPrint("net", "mempool request with bandwidth limit reached, disconnect peer=%d\n", pfrom->GetId());
             pfrom->fDisconnect = true;
@@ -6202,7 +6202,7 @@ bool ProcessMessages(CNode* pfrom, CConnman& connman)
     bool fOk = true;
 
     if (!pfrom->vRecvGetData.empty())
-        ProcessGetData(pfrom, chainparams.GetConsensus());
+        ProcessGetData(pfrom, chainparams.GetConsensus(), connman);
 
     // this maintains the order of responses
     if (!pfrom->vRecvGetData.empty()) return fOk;
diff --git a/src/net.cpp b/src/net.cpp
index aded8d05d3fb5..0787b16ad6039 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -298,15 +298,6 @@ bool IsReachable(const CNetAddr& addr)
     return IsReachable(net);
 }
 
-uint64_t CNode::nTotalBytesRecv = 0;
-uint64_t CNode::nTotalBytesSent = 0;
-CCriticalSection CNode::cs_totalBytesRecv;
-CCriticalSection CNode::cs_totalBytesSent;
-
-uint64_t CNode::nMaxOutboundLimit = 0;
-uint64_t CNode::nMaxOutboundTotalBytesSentInCycle = 0;
-uint64_t CNode::nMaxOutboundTimeframe = 60*60*24; //1 day
-uint64_t CNode::nMaxOutboundCycleStartTime = 0;
 
 CNode* CConnman::FindNode(const CNetAddr& ip)
 {
@@ -804,7 +795,6 @@ size_t SocketSendData(CNode *pnode)
             pnode->nLastSend = GetTime();
             pnode->nSendBytes += nBytes;
             pnode->nSendOffset += nBytes;
-            pnode->RecordBytesSent(nBytes);
             nSentSize += nBytes;
             if (pnode->nSendOffset == data.size()) {
                 pnode->nSendOffset = 0;
@@ -1176,9 +1166,15 @@ void CConnman::ThreadSocketHandler()
                 // * We process a message in the buffer (message handler thread).
                 {
                     TRY_LOCK(pnode->cs_vSend, lockSend);
-                    if (lockSend && !pnode->vSendMsg.empty()) {
-                        FD_SET(pnode->hSocket, &fdsetSend);
-                        continue;
+                    if (lockSend) {
+                        if (pnode->nOptimisticBytesWritten) {
+                            RecordBytesSent(pnode->nOptimisticBytesWritten);
+                            pnode->nOptimisticBytesWritten = 0;
+                        }
+                        if (!pnode->vSendMsg.empty()) {
+                            FD_SET(pnode->hSocket, &fdsetSend);
+                            continue;
+                        }
                     }
                 }
                 {
@@ -1257,7 +1253,7 @@ void CConnman::ThreadSocketHandler()
                                 messageHandlerCondition.notify_one();
                             pnode->nLastRecv = GetTime();
                             pnode->nRecvBytes += nBytes;
-                            pnode->RecordBytesRecv(nBytes);
+                            RecordBytesRecv(nBytes);
                         }
                         else if (nBytes == 0)
                         {
@@ -1289,8 +1285,11 @@ void CConnman::ThreadSocketHandler()
             if (FD_ISSET(pnode->hSocket, &fdsetSend))
             {
                 TRY_LOCK(pnode->cs_vSend, lockSend);
-                if (lockSend)
-                    SocketSendData(pnode);
+                if (lockSend) {
+                    size_t nBytes = SocketSendData(pnode);
+                    if (nBytes)
+                        RecordBytesSent(nBytes);
+                }
             }
 
             //
@@ -2060,6 +2059,13 @@ NodeId CConnman::GetNewNodeId()
 
 bool CConnman::Start(boost::thread_group& threadGroup, CScheduler& scheduler, std::string& strNodeError)
 {
+    nTotalBytesRecv = 0;
+    nTotalBytesSent = 0;
+    nMaxOutboundLimit = 0;
+    nMaxOutboundTotalBytesSentInCycle = 0;
+    nMaxOutboundTimeframe = 60*60*24; //1 day
+    nMaxOutboundCycleStartTime = 0;
+
     uiInterface.InitMessage(_("Loading addresses..."));
     // Load addresses from peers.dat
     int64_t nStart = GetTimeMillis();
@@ -2344,13 +2350,13 @@ void CConnman::RelayTransaction(const CTransaction& tx)
     }
 }
 
-void CNode::RecordBytesRecv(uint64_t bytes)
+void CConnman::RecordBytesRecv(uint64_t bytes)
 {
     LOCK(cs_totalBytesRecv);
     nTotalBytesRecv += bytes;
 }
 
-void CNode::RecordBytesSent(uint64_t bytes)
+void CConnman::RecordBytesSent(uint64_t bytes)
 {
     LOCK(cs_totalBytesSent);
     nTotalBytesSent += bytes;
@@ -2367,7 +2373,7 @@ void CNode::RecordBytesSent(uint64_t bytes)
     nMaxOutboundTotalBytesSentInCycle += bytes;
 }
 
-void CNode::SetMaxOutboundTarget(uint64_t limit)
+void CConnman::SetMaxOutboundTarget(uint64_t limit)
 {
     LOCK(cs_totalBytesSent);
     uint64_t recommendedMinimum = (nMaxOutboundTimeframe / 600) * MAX_BLOCK_SERIALIZED_SIZE;
@@ -2377,19 +2383,19 @@ void CNode::SetMaxOutboundTarget(uint64_t limit)
         LogPrintf("Max outbound target is very small (%s bytes) and will be overshot. Recommended minimum is %s bytes.\n", nMaxOutboundLimit, recommendedMinimum);
 }
 
-uint64_t CNode::GetMaxOutboundTarget()
+uint64_t CConnman::GetMaxOutboundTarget()
 {
     LOCK(cs_totalBytesSent);
     return nMaxOutboundLimit;
 }
 
-uint64_t CNode::GetMaxOutboundTimeframe()
+uint64_t CConnman::GetMaxOutboundTimeframe()
 {
     LOCK(cs_totalBytesSent);
     return nMaxOutboundTimeframe;
 }
 
-uint64_t CNode::GetMaxOutboundTimeLeftInCycle()
+uint64_t CConnman::GetMaxOutboundTimeLeftInCycle()
 {
     LOCK(cs_totalBytesSent);
     if (nMaxOutboundLimit == 0)
@@ -2403,7 +2409,7 @@ uint64_t CNode::GetMaxOutboundTimeLeftInCycle()
     return (cycleEndTime < now) ? 0 : cycleEndTime - GetTime();
 }
 
-void CNode::SetMaxOutboundTimeframe(uint64_t timeframe)
+void CConnman::SetMaxOutboundTimeframe(uint64_t timeframe)
 {
     LOCK(cs_totalBytesSent);
     if (nMaxOutboundTimeframe != timeframe)
@@ -2415,7 +2421,7 @@ void CNode::SetMaxOutboundTimeframe(uint64_t timeframe)
     nMaxOutboundTimeframe = timeframe;
 }
 
-bool CNode::OutboundTargetReached(bool historicalBlockServingLimit)
+bool CConnman::OutboundTargetReached(bool historicalBlockServingLimit)
 {
     LOCK(cs_totalBytesSent);
     if (nMaxOutboundLimit == 0)
@@ -2435,7 +2441,7 @@ bool CNode::OutboundTargetReached(bool historicalBlockServingLimit)
     return false;
 }
 
-uint64_t CNode::GetOutboundTargetBytesLeft()
+uint64_t CConnman::GetOutboundTargetBytesLeft()
 {
     LOCK(cs_totalBytesSent);
     if (nMaxOutboundLimit == 0)
@@ -2444,13 +2450,13 @@ uint64_t CNode::GetOutboundTargetBytesLeft()
     return (nMaxOutboundTotalBytesSentInCycle >= nMaxOutboundLimit) ? 0 : nMaxOutboundLimit - nMaxOutboundTotalBytesSentInCycle;
 }
 
-uint64_t CNode::GetTotalBytesRecv()
+uint64_t CConnman::GetTotalBytesRecv()
 {
     LOCK(cs_totalBytesRecv);
     return nTotalBytesRecv;
 }
 
-uint64_t CNode::GetTotalBytesSent()
+uint64_t CConnman::GetTotalBytesSent()
 {
     LOCK(cs_totalBytesSent);
     return nTotalBytesSent;
@@ -2548,6 +2554,7 @@ CNode::CNode(NodeId idIn, SOCKET hSocketIn, const CAddress& addrIn, const std::s
     lastSentFeeFilter = 0;
     nextSendTimeFeeFilter = 0;
     id = idIn;
+    nOptimisticBytesWritten = 0;
 
     GetRandBytes((unsigned char*)&nLocalHostNonce, sizeof(nLocalHostNonce));
 
@@ -2665,7 +2672,7 @@ void CNode::EndMessage(const char* pszCommand) UNLOCK_FUNCTION(cs_vSend)
 
     // If write queue empty, attempt "optimistic write"
     if (it == vSendMsg.begin())
-        SocketSendData(this);
+        nOptimisticBytesWritten += SocketSendData(this);
 
     LEAVE_CRITICAL_SECTION(cs_vSend);
 }
diff --git a/src/net.h b/src/net.h
index 503e009c49886..e2d98a90d1a96 100644
--- a/src/net.h
+++ b/src/net.h
@@ -171,6 +171,31 @@ class CConnman
     bool DisconnectSubnet(const CSubNet& subnet);
 
     void AddWhitelistedRange(const CSubNet &subnet);
+
+    //!set the max outbound target in bytes
+    void SetMaxOutboundTarget(uint64_t limit);
+    uint64_t GetMaxOutboundTarget();
+
+    //!set the timeframe for the max outbound target
+    void SetMaxOutboundTimeframe(uint64_t timeframe);
+    uint64_t GetMaxOutboundTimeframe();
+
+    //!check if the outbound target is reached
+    // if param historicalBlockServingLimit is set true, the function will
+    // response true if the limit for serving historical blocks has been reached
+    bool OutboundTargetReached(bool historicalBlockServingLimit);
+
+    //!response the bytes left in the current max outbound cycle
+    // in case of no limit, it will always response 0
+    uint64_t GetOutboundTargetBytesLeft();
+
+    //!response the time in second left in the current max outbound cycle
+    // in case of no limit, it will always response 0
+    uint64_t GetMaxOutboundTimeLeftInCycle();
+
+    uint64_t GetTotalBytesRecv();
+    uint64_t GetTotalBytesSent();
+
 private:
     struct ListenSocket {
         SOCKET socket;
@@ -210,6 +235,22 @@ class CConnman
     void DumpData();
     void DumpBanlist();
 
+    // Network stats
+    void RecordBytesRecv(uint64_t bytes);
+    void RecordBytesSent(uint64_t bytes);
+
+    // Network usage totals
+    CCriticalSection cs_totalBytesRecv;
+    CCriticalSection cs_totalBytesSent;
+    uint64_t nTotalBytesRecv;
+    uint64_t nTotalBytesSent;
+
+    // outbound limit & stats
+    uint64_t nMaxOutboundTotalBytesSentInCycle;
+    uint64_t nMaxOutboundCycleStartTime;
+    uint64_t nMaxOutboundLimit;
+    uint64_t nMaxOutboundTimeframe;
+
     // Whitelisted ranges. Any node connecting from these is automatically
     // whitelisted (as well as those connecting to whitelisted binds).
     std::vector<CSubNet> vWhitelistedRange;
@@ -396,6 +437,7 @@ class CNode
     CDataStream ssSend;
     size_t nSendSize; // total size of all vSendMsg entries
     size_t nSendOffset; // offset inside the first vSendMsg already sent
+    uint64_t nOptimisticBytesWritten;
     uint64_t nSendBytes;
     std::deque<CSerializeData> vSendMsg;
     CCriticalSection cs_vSend;
@@ -507,18 +549,6 @@ class CNode
     ~CNode();
 
 private:
-    // Network usage totals
-    static CCriticalSection cs_totalBytesRecv;
-    static CCriticalSection cs_totalBytesSent;
-    static uint64_t nTotalBytesRecv;
-    static uint64_t nTotalBytesSent;
-
-    // outbound limit & stats
-    static uint64_t nMaxOutboundTotalBytesSentInCycle;
-    static uint64_t nMaxOutboundCycleStartTime;
-    static uint64_t nMaxOutboundLimit;
-    static uint64_t nMaxOutboundTimeframe;
-
     CNode(const CNode&);
     void operator=(const CNode&);
 
@@ -812,34 +842,6 @@ class CNode
     void CloseSocketDisconnect();
 
     void copyStats(CNodeStats &stats);
-
-    // Network stats
-    static void RecordBytesRecv(uint64_t bytes);
-    static void RecordBytesSent(uint64_t bytes);
-
-    static uint64_t GetTotalBytesRecv();
-    static uint64_t GetTotalBytesSent();
-
-    //!set the max outbound target in bytes
-    static void SetMaxOutboundTarget(uint64_t limit);
-    static uint64_t GetMaxOutboundTarget();
-
-    //!set the timeframe for the max outbound target
-    static void SetMaxOutboundTimeframe(uint64_t timeframe);
-    static uint64_t GetMaxOutboundTimeframe();
-
-    //!check if the outbound target is reached
-    // if param historicalBlockServingLimit is set true, the function will
-    // response true if the limit for serving historical blocks has been reached
-    static bool OutboundTargetReached(bool historicalBlockServingLimit);
-
-    //!response the bytes left in the current max outbound cycle
-    // in case of no limit, it will always response 0
-    static uint64_t GetOutboundTargetBytesLeft();
-
-    //!response the time in second left in the current max outbound cycle
-    // in case of no limit, it will always response 0
-    static uint64_t GetMaxOutboundTimeLeftInCycle();
 };
 
 
diff --git a/src/qt/clientmodel.cpp b/src/qt/clientmodel.cpp
index f72bbfe6bbd09..83c78850e2a54 100644
--- a/src/qt/clientmodel.cpp
+++ b/src/qt/clientmodel.cpp
@@ -72,12 +72,16 @@ int ClientModel::getNumBlocks() const
 
 quint64 ClientModel::getTotalBytesRecv() const
 {
-    return CNode::GetTotalBytesRecv();
+    if(!g_connman)
+        return 0;
+    return g_connman->GetTotalBytesRecv();
 }
 
 quint64 ClientModel::getTotalBytesSent() const
 {
-    return CNode::GetTotalBytesSent();
+    if(!g_connman)
+        return 0;
+    return g_connman->GetTotalBytesSent();
 }
 
 QDateTime ClientModel::getLastBlockDate() const
diff --git a/src/rpc/net.cpp b/src/rpc/net.cpp
index 509b57aa726ed..4fe58239928c2 100644
--- a/src/rpc/net.cpp
+++ b/src/rpc/net.cpp
@@ -347,19 +347,21 @@ UniValue getnettotals(const UniValue& params, bool fHelp)
             + HelpExampleCli("getnettotals", "")
             + HelpExampleRpc("getnettotals", "")
        );
+    if(!g_connman)
+        throw JSONRPCError(RPC_CLIENT_P2P_DISABLED, "Error: Peer-to-peer functionality missing or disabled");
 
     UniValue obj(UniValue::VOBJ);
-    obj.push_back(Pair("totalbytesrecv", CNode::GetTotalBytesRecv()));
-    obj.push_back(Pair("totalbytessent", CNode::GetTotalBytesSent()));
+    obj.push_back(Pair("totalbytesrecv", g_connman->GetTotalBytesRecv()));
+    obj.push_back(Pair("totalbytessent", g_connman->GetTotalBytesSent()));
     obj.push_back(Pair("timemillis", GetTimeMillis()));
 
     UniValue outboundLimit(UniValue::VOBJ);
-    outboundLimit.push_back(Pair("timeframe", CNode::GetMaxOutboundTimeframe()));
-    outboundLimit.push_back(Pair("target", CNode::GetMaxOutboundTarget()));
-    outboundLimit.push_back(Pair("target_reached", CNode::OutboundTargetReached(false)));
-    outboundLimit.push_back(Pair("serve_historical_blocks", !CNode::OutboundTargetReached(true)));
-    outboundLimit.push_back(Pair("bytes_left_in_cycle", CNode::GetOutboundTargetBytesLeft()));
-    outboundLimit.push_back(Pair("time_left_in_cycle", CNode::GetMaxOutboundTimeLeftInCycle()));
+    outboundLimit.push_back(Pair("timeframe", g_connman->GetMaxOutboundTimeframe()));
+    outboundLimit.push_back(Pair("target", g_connman->GetMaxOutboundTarget()));
+    outboundLimit.push_back(Pair("target_reached", g_connman->OutboundTargetReached(false)));
+    outboundLimit.push_back(Pair("serve_historical_blocks", !g_connman->OutboundTargetReached(true)));
+    outboundLimit.push_back(Pair("bytes_left_in_cycle", g_connman->GetOutboundTargetBytesLeft()));
+    outboundLimit.push_back(Pair("time_left_in_cycle", g_connman->GetMaxOutboundTimeLeftInCycle()));
     obj.push_back(Pair("uploadtarget", outboundLimit));
     return obj;
 }

From be9c796dc51c05cab0b84d2e66c928973c6e5ed6 Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Tue, 19 Apr 2016 00:01:19 -0400
Subject: [PATCH 0852/1802] net: move SendBufferSize/ReceiveFloodSize to
 CConnman

---
 src/main.cpp | 10 +++++++---
 src/net.cpp  | 13 +++++++++----
 src/net.h    | 10 +++++++---
 3 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index 019db0bdb39e0..db9d0d3f186d1 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -4769,6 +4769,7 @@ static void RelayAddress(const CAddress& addr, bool fReachable, CConnman& connma
 void static ProcessGetData(CNode* pfrom, const Consensus::Params& consensusParams, CConnman& connman)
 {
     std::deque<CInv>::iterator it = pfrom->vRecvGetData.begin();
+    unsigned int nMaxSendBufferSize = connman.GetSendBufferSize();
 
     vector<CInv> vNotFound;
 
@@ -4776,7 +4777,7 @@ void static ProcessGetData(CNode* pfrom, const Consensus::Params& consensusParam
 
     while (it != pfrom->vRecvGetData.end()) {
         // Don't bother if send buffer is too full to respond anyway
-        if (pfrom->nSendSize >= SendBufferSize())
+        if (pfrom->nSendSize >= nMaxSendBufferSize)
             break;
 
         const CInv &inv = *it;
@@ -4934,6 +4935,8 @@ uint32_t GetFetchFlags(CNode* pfrom, CBlockIndex* pprev, const Consensus::Params
 
 bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv, int64_t nTimeReceived, const CChainParams& chainparams, CConnman& connman)
 {
+    unsigned int nMaxSendBufferSize = connman.GetSendBufferSize();
+
     LogPrint("net", "received: %s (%u bytes) peer=%d\n", SanitizeString(strCommand), vRecv.size(), pfrom->id);
     if (mapArgs.count("-dropmessagestest") && GetRand(atoi(mapArgs["-dropmessagestest"])) == 0)
     {
@@ -5283,7 +5286,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
             // Track requests for our stuff
             GetMainSignals().Inventory(inv.hash);
 
-            if (pfrom->nSendSize > (SendBufferSize() * 2)) {
+            if (pfrom->nSendSize > (nMaxSendBufferSize * 2)) {
                 Misbehaving(pfrom->GetId(), 50);
                 return error("send buffer size() = %u", pfrom->nSendSize);
             }
@@ -6188,6 +6191,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
 bool ProcessMessages(CNode* pfrom, CConnman& connman)
 {
     const CChainParams& chainparams = Params();
+    unsigned int nMaxSendBufferSize = connman.GetSendBufferSize();
     //if (fDebug)
     //    LogPrintf("%s(%u messages)\n", __func__, pfrom->vRecvMsg.size());
 
@@ -6210,7 +6214,7 @@ bool ProcessMessages(CNode* pfrom, CConnman& connman)
     std::deque<CNetMessage>::iterator it = pfrom->vRecvMsg.begin();
     while (!pfrom->fDisconnect && it != pfrom->vRecvMsg.end()) {
         // Don't bother if send buffer is too full to respond anyway
-        if (pfrom->nSendSize >= SendBufferSize())
+        if (pfrom->nSendSize >= nMaxSendBufferSize)
             break;
 
         // get next message
diff --git a/src/net.cpp b/src/net.cpp
index 0787b16ad6039..2839474cb95c8 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -1181,7 +1181,7 @@ void CConnman::ThreadSocketHandler()
                     TRY_LOCK(pnode->cs_vRecvMsg, lockRecv);
                     if (lockRecv && (
                         pnode->vRecvMsg.empty() || !pnode->vRecvMsg.front().complete() ||
-                        pnode->GetTotalRecvSize() <= ReceiveFloodSize()))
+                        pnode->GetTotalRecvSize() <= GetReceiveFloodSize()))
                         FD_SET(pnode->hSocket, &fdsetRecv);
                 }
             }
@@ -1851,7 +1851,7 @@ void CConnman::ThreadMessageHandler()
                     if (!GetNodeSignals().ProcessMessages(pnode, *this))
                         pnode->CloseSocketDisconnect();
 
-                    if (pnode->nSendSize < SendBufferSize())
+                    if (pnode->nSendSize < GetSendBufferSize())
                     {
                         if (!pnode->vRecvGetData.empty() || (!pnode->vRecvMsg.empty() && pnode->vRecvMsg[0].complete()))
                         {
@@ -2041,6 +2041,8 @@ CConnman::CConnman()
     setBannedIsDirty = false;
     fAddressesInitialized = false;
     nLastNodeId = 0;
+    nSendBufferMaxSize = 0;
+    nReceiveFloodSize = 0;
 }
 
 bool StartNode(CConnman& connman, boost::thread_group& threadGroup, CScheduler& scheduler, std::string& strNodeError)
@@ -2066,6 +2068,9 @@ bool CConnman::Start(boost::thread_group& threadGroup, CScheduler& scheduler, st
     nMaxOutboundTimeframe = 60*60*24; //1 day
     nMaxOutboundCycleStartTime = 0;
 
+    nSendBufferMaxSize = 1000*GetArg("-maxsendbuffer", DEFAULT_MAXSENDBUFFER);
+    nReceiveFloodSize = 1000*GetArg("-maxreceivebuffer", DEFAULT_MAXRECEIVEBUFFER);
+
     uiInterface.InitMessage(_("Loading addresses..."));
     // Load addresses from peers.dat
     int64_t nStart = GetTimeMillis();
@@ -2497,8 +2502,8 @@ void CNode::Fuzz(int nChance)
     Fuzz(2);
 }
 
-unsigned int ReceiveFloodSize() { return 1000*GetArg("-maxreceivebuffer", DEFAULT_MAXRECEIVEBUFFER); }
-unsigned int SendBufferSize() { return 1000*GetArg("-maxsendbuffer", DEFAULT_MAXSENDBUFFER); }
+unsigned int CConnman::GetReceiveFloodSize() const { return nReceiveFloodSize; }
+unsigned int CConnman::GetSendBufferSize() const{ return nSendBufferMaxSize; }
 
 CNode::CNode(NodeId idIn, SOCKET hSocketIn, const CAddress& addrIn, const std::string& addrNameIn, bool fInboundIn) :
     ssSend(SER_NETWORK, INIT_PROTO_VERSION),
diff --git a/src/net.h b/src/net.h
index e2d98a90d1a96..e5fbf65492224 100644
--- a/src/net.h
+++ b/src/net.h
@@ -82,9 +82,6 @@ static const ServiceFlags REQUIRED_SERVICES = NODE_NETWORK;
 // NOTE: When adjusting this, update rpcnet:setban's help ("24h")
 static const unsigned int DEFAULT_MISBEHAVING_BANTIME = 60 * 60 * 24;  // Default 24-hour ban
 
-unsigned int ReceiveFloodSize();
-unsigned int SendBufferSize();
-
 typedef int NodeId;
 
 struct AddedNodeInfo
@@ -170,6 +167,8 @@ class CConnman
     bool DisconnectNode(NodeId id);
     bool DisconnectSubnet(const CSubNet& subnet);
 
+    unsigned int GetSendBufferSize() const;
+
     void AddWhitelistedRange(const CSubNet &subnet);
 
     //!set the max outbound target in bytes
@@ -235,6 +234,8 @@ class CConnman
     void DumpData();
     void DumpBanlist();
 
+    unsigned int GetReceiveFloodSize() const;
+
     // Network stats
     void RecordBytesRecv(uint64_t bytes);
     void RecordBytesSent(uint64_t bytes);
@@ -256,6 +257,9 @@ class CConnman
     std::vector<CSubNet> vWhitelistedRange;
     CCriticalSection cs_vWhitelistedRange;
 
+    unsigned int nSendBufferMaxSize;
+    unsigned int nReceiveFloodSize;
+
     std::vector<ListenSocket> vhListenSocket;
     banmap_t setBanned;
     CCriticalSection cs_setBanned;

From bd72937dc462b86f0e84184b270a232f7bfaa8db Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Tue, 19 Apr 2016 00:04:58 -0400
Subject: [PATCH 0853/1802] net: move nLocalServices/nRelevantServices to
 CConnman

These are in-turn passed to CNode at connection time. This allows us to offer
different services to different peers (or test the effects of doing so).
---
 src/init.cpp           |  5 ++++-
 src/main.cpp           | 12 ++++++------
 src/net.cpp            | 32 ++++++++++++++++++--------------
 src/net.h              | 24 ++++++++++++++++++------
 src/rpc/net.cpp        |  3 ++-
 src/test/DoS_tests.cpp |  8 ++++----
 src/test/net_tests.cpp |  4 ++--
 7 files changed, 54 insertions(+), 34 deletions(-)

diff --git a/src/init.cpp b/src/init.cpp
index a7f893c24fef0..644d6721e4b00 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -982,6 +982,9 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
     // Option to startup with mocktime set (used for regression testing):
     SetMockTime(GetArg("-mocktime", 0)); // SetMockTime(0) is a no-op
 
+    ServiceFlags nLocalServices = NODE_NETWORK;
+    ServiceFlags nRelevantServices = NODE_NETWORK;
+
     if (GetBoolArg("-peerbloomfilters", DEFAULT_PEERBLOOMFILTERS))
         nLocalServices = ServiceFlags(nLocalServices | NODE_BLOOM);
 
@@ -1506,7 +1509,7 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
         StartTorControl(threadGroup, scheduler);
 
     std::string strNodeError;
-    if(!StartNode(connman, threadGroup, scheduler, strNodeError))
+    if(!StartNode(connman, threadGroup, scheduler, nLocalServices, nRelevantServices, strNodeError))
         return InitError(strNodeError);
 
     // ********************************************************* Step 12: finished
diff --git a/src/main.cpp b/src/main.cpp
index db9d0d3f186d1..a916cbc12d3a3 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -471,7 +471,7 @@ void UpdateBlockAvailability(NodeId nodeid, const uint256 &hash) {
 }
 
 void MaybeSetPeerAsAnnouncingHeaderAndIDs(const CNodeState* nodestate, CNode* pfrom, CConnman& connman) {
-    if (nLocalServices & NODE_WITNESS) {
+    if (pfrom->GetLocalServices() & NODE_WITNESS) {
         // Don't ever request compact blocks when segwit is enabled.
         return;
     }
@@ -4945,7 +4945,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
     }
 
 
-    if (!(nLocalServices & NODE_BLOOM) &&
+    if (!(pfrom->GetLocalServices() & NODE_BLOOM) &&
               (strCommand == NetMsgType::FILTERLOAD ||
                strCommand == NetMsgType::FILTERADD ||
                strCommand == NetMsgType::FILTERCLEAR))
@@ -5068,7 +5068,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
             // Advertise our address
             if (fListen && !IsInitialBlockDownload())
             {
-                CAddress addr = GetLocalAddress(&pfrom->addr);
+                CAddress addr = GetLocalAddress(&pfrom->addr, pfrom->GetLocalServices());
                 if (addr.IsRoutable())
                 {
                     LogPrint("net", "ProcessMessages: advertising address %s\n", addr.ToString());
@@ -5263,7 +5263,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
                         nodestate->nBlocksInFlight < MAX_BLOCKS_IN_TRANSIT_PER_PEER &&
                         (!IsWitnessEnabled(chainActive.Tip(), chainparams.GetConsensus()) || State(pfrom->GetId())->fHaveWitness)) {
                         inv.type |= nFetchFlags;
-                        if (nodestate->fProvidesHeaderAndIDs && !(nLocalServices & NODE_WITNESS))
+                        if (nodestate->fProvidesHeaderAndIDs && !(pfrom->GetLocalServices() & NODE_WITNESS))
                             vToFetch.push_back(CInv(MSG_CMPCT_BLOCK, inv.hash));
                         else
                             vToFetch.push_back(inv);
@@ -5907,7 +5907,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
                             pindexLast->GetBlockHash().ToString(), pindexLast->nHeight);
                 }
                 if (vGetData.size() > 0) {
-                    if (nodestate->fProvidesHeaderAndIDs && vGetData.size() == 1 && mapBlocksInFlight.size() == 1 && pindexLast->pprev->IsValid(BLOCK_VALID_CHAIN) && !(nLocalServices & NODE_WITNESS)) {
+                    if (nodestate->fProvidesHeaderAndIDs && vGetData.size() == 1 && mapBlocksInFlight.size() == 1 && pindexLast->pprev->IsValid(BLOCK_VALID_CHAIN) && !(pfrom->GetLocalServices() & NODE_WITNESS)) {
                         // We seem to be rather well-synced, so it appears pfrom was the first to provide us
                         // with this block! Let's get them to announce using compact blocks in the future.
                         MaybeSetPeerAsAnnouncingHeaderAndIDs(nodestate, pfrom, connman);
@@ -5982,7 +5982,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
 
     else if (strCommand == NetMsgType::MEMPOOL)
     {
-        if (!(nLocalServices & NODE_BLOOM) && !pfrom->fWhitelisted)
+        if (!(pfrom->GetLocalServices() & NODE_BLOOM) && !pfrom->fWhitelisted)
         {
             LogPrint("net", "mempool request with bloom filters disabled, disconnect peer=%d\n", pfrom->GetId());
             pfrom->fDisconnect = true;
diff --git a/src/net.cpp b/src/net.cpp
index 2839474cb95c8..66e3d91f4a11a 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -69,15 +69,11 @@ namespace {
 
 const static std::string NET_MESSAGE_COMMAND_OTHER = "*other*";
 
-/** Services this node implementation cares about */
-ServiceFlags nRelevantServices = NODE_NETWORK;
-
 //
 // Global state variables
 //
 bool fDiscover = true;
 bool fListen = true;
-ServiceFlags nLocalServices = NODE_NETWORK;
 bool fRelayTxes = true;
 CCriticalSection cs_mapLocalHost;
 std::map<CNetAddr, LocalServiceInfo> mapLocalHost;
@@ -155,7 +151,7 @@ static std::vector<CAddress> convertSeed6(const std::vector<SeedSpec6> &vSeedsIn
 // Otherwise, return the unroutable 0.0.0.0 but filled in with
 // the normal parameters, since the IP may be changed to a useful
 // one by discovery.
-CAddress GetLocalAddress(const CNetAddr *paddrPeer)
+CAddress GetLocalAddress(const CNetAddr *paddrPeer, ServiceFlags nLocalServices)
 {
     CAddress ret(CService(CNetAddr(),GetListenPort()), NODE_NONE);
     CService addr;
@@ -187,7 +183,7 @@ void AdvertiseLocal(CNode *pnode)
 {
     if (fListen && pnode->fSuccessfullyConnected)
     {
-        CAddress addrLocal = GetLocalAddress(&pnode->addr);
+        CAddress addrLocal = GetLocalAddress(&pnode->addr, pnode->GetLocalServices());
         // If discovery is enabled, sometimes give our peer the address it
         // tells us that it sees us as in case it has a better idea of our
         // address than we do.
@@ -400,7 +396,7 @@ CNode* CConnman::ConnectNode(CAddress addrConnect, const char *pszDest, bool fCo
         addrman.Attempt(addrConnect, fCountFailure);
 
         // Add node
-        CNode* pnode = new CNode(GetNewNodeId(), hSocket, addrConnect, pszDest ? pszDest : "", false);
+        CNode* pnode = new CNode(GetNewNodeId(), nLocalServices, hSocket, addrConnect, pszDest ? pszDest : "", false);
         GetNodeSignals().InitializeNode(pnode->GetId(), pnode);
         pnode->AddRef();
 
@@ -463,7 +459,7 @@ void CNode::PushVersion()
 
     int64_t nTime = (fInbound ? GetAdjustedTime() : GetTime());
     CAddress addrYou = (addr.IsRoutable() && !IsProxy(addr) ? addr : CAddress(CService(), addr.nServices));
-    CAddress addrMe = GetLocalAddress(&addr);
+    CAddress addrMe = GetLocalAddress(&addr, nLocalServices);
     if (fLogIPs)
         LogPrint("net", "send version message: version %d, blocks=%d, us=%s, them=%s, peer=%d\n", PROTOCOL_VERSION, nBestHeight, addrMe.ToString(), addrYou.ToString(), id);
     else
@@ -1036,7 +1032,7 @@ void CConnman::AcceptConnection(const ListenSocket& hListenSocket) {
         }
     }
 
-    CNode* pnode = new CNode(GetNewNodeId(), hSocket, addr, "", true);
+    CNode* pnode = new CNode(GetNewNodeId(), nLocalServices, hSocket, addr, "", true);
     GetNodeSignals().InitializeNode(pnode->GetId(), pnode);
     pnode->AddRef();
     pnode->fWhitelisted = whitelisted;
@@ -2045,11 +2041,11 @@ CConnman::CConnman()
     nReceiveFloodSize = 0;
 }
 
-bool StartNode(CConnman& connman, boost::thread_group& threadGroup, CScheduler& scheduler, std::string& strNodeError)
+bool StartNode(CConnman& connman, boost::thread_group& threadGroup, CScheduler& scheduler, ServiceFlags nLocalServices, ServiceFlags nRelevantServices, std::string& strNodeError)
 {
     Discover(threadGroup);
 
-    bool ret = connman.Start(threadGroup, scheduler, strNodeError);
+    bool ret = connman.Start(threadGroup, scheduler, nLocalServices, nRelevantServices, strNodeError);
 
     return ret;
 }
@@ -2059,13 +2055,15 @@ NodeId CConnman::GetNewNodeId()
     return nLastNodeId.fetch_add(1, std::memory_order_relaxed);
 }
 
-bool CConnman::Start(boost::thread_group& threadGroup, CScheduler& scheduler, std::string& strNodeError)
+bool CConnman::Start(boost::thread_group& threadGroup, CScheduler& scheduler, ServiceFlags nLocalServicesIn, ServiceFlags nRelevantServicesIn, std::string& strNodeError)
 {
     nTotalBytesRecv = 0;
     nTotalBytesSent = 0;
     nMaxOutboundLimit = 0;
     nMaxOutboundTotalBytesSentInCycle = 0;
     nMaxOutboundTimeframe = 60*60*24; //1 day
+    nLocalServices = nLocalServicesIn;
+    nRelevantServices = nRelevantServicesIn;
     nMaxOutboundCycleStartTime = 0;
 
     nSendBufferMaxSize = 1000*GetArg("-maxsendbuffer", DEFAULT_MAXSENDBUFFER);
@@ -2116,7 +2114,7 @@ bool CConnman::Start(boost::thread_group& threadGroup, CScheduler& scheduler, st
     if (pnodeLocalHost == NULL) {
         CNetAddr local;
         LookupHost("127.0.0.1", local, false);
-        pnodeLocalHost = new CNode(GetNewNodeId(), INVALID_SOCKET, CAddress(CService(local, 0), nLocalServices));
+        pnodeLocalHost = new CNode(GetNewNodeId(), nLocalServices, INVALID_SOCKET, CAddress(CService(local, 0), nLocalServices));
         GetNodeSignals().InitializeNode(pnodeLocalHost->GetId(), pnodeLocalHost);
     }
 
@@ -2467,6 +2465,11 @@ uint64_t CConnman::GetTotalBytesSent()
     return nTotalBytesSent;
 }
 
+ServiceFlags CConnman::GetLocalServices() const
+{
+    return nLocalServices;
+}
+
 void CNode::Fuzz(int nChance)
 {
     if (!fSuccessfullyConnected) return; // Don't fuzz initial handshake
@@ -2505,7 +2508,7 @@ void CNode::Fuzz(int nChance)
 unsigned int CConnman::GetReceiveFloodSize() const { return nReceiveFloodSize; }
 unsigned int CConnman::GetSendBufferSize() const{ return nSendBufferMaxSize; }
 
-CNode::CNode(NodeId idIn, SOCKET hSocketIn, const CAddress& addrIn, const std::string& addrNameIn, bool fInboundIn) :
+CNode::CNode(NodeId idIn, ServiceFlags nLocalServicesIn, SOCKET hSocketIn, const CAddress& addrIn, const std::string& addrNameIn, bool fInboundIn) :
     ssSend(SER_NETWORK, INIT_PROTO_VERSION),
     addr(addrIn),
     nKeyedNetGroup(CalculateKeyedNetGroup(addrIn)),
@@ -2560,6 +2563,7 @@ CNode::CNode(NodeId idIn, SOCKET hSocketIn, const CAddress& addrIn, const std::s
     nextSendTimeFeeFilter = 0;
     id = idIn;
     nOptimisticBytesWritten = 0;
+    nLocalServices = nLocalServicesIn;
 
     GetRandBytes((unsigned char*)&nLocalHostNonce, sizeof(nLocalHostNonce));
 
diff --git a/src/net.h b/src/net.h
index e5fbf65492224..25e473c5fc30f 100644
--- a/src/net.h
+++ b/src/net.h
@@ -107,7 +107,7 @@ class CConnman
 
     CConnman();
     ~CConnman();
-    bool Start(boost::thread_group& threadGroup, CScheduler& scheduler, std::string& strNodeError);
+    bool Start(boost::thread_group& threadGroup, CScheduler& scheduler, ServiceFlags nLocalServicesIn, ServiceFlags nRelevantServicesIn, std::string& strNodeError);
     void Stop();
     bool BindListenPort(const CService &bindAddr, std::string& strError, bool fWhitelisted = false);
     bool OpenNetworkConnection(const CAddress& addrConnect, bool fCountFailure, CSemaphoreGrant *grantOutbound = NULL, const char *strDest = NULL, bool fOneShot = false, bool fFeeler = false);
@@ -171,6 +171,8 @@ class CConnman
 
     void AddWhitelistedRange(const CSubNet &subnet);
 
+    ServiceFlags GetLocalServices() const;
+
     //!set the max outbound target in bytes
     void SetMaxOutboundTarget(uint64_t limit);
     uint64_t GetMaxOutboundTarget();
@@ -274,12 +276,18 @@ class CConnman
     mutable CCriticalSection cs_vNodes;
     std::atomic<NodeId> nLastNodeId;
     boost::condition_variable messageHandlerCondition;
+
+    /** Services this instance offers */
+    ServiceFlags nLocalServices;
+
+    /** Services this instance cares about */
+    ServiceFlags nRelevantServices;
 };
 extern std::unique_ptr<CConnman> g_connman;
 void MapPort(bool fUseUPnP);
 unsigned short GetListenPort();
 bool BindListenPort(const CService &bindAddr, std::string& strError, bool fWhitelisted = false);
-bool StartNode(CConnman& connman, boost::thread_group& threadGroup, CScheduler& scheduler, std::string& strNodeError);
+bool StartNode(CConnman& connman, boost::thread_group& threadGroup, CScheduler& scheduler, ServiceFlags nLocalServices, ServiceFlags nRelevantServices, std::string& strNodeError);
 bool StopNode(CConnman& connman);
 size_t SocketSendData(CNode *pnode);
 
@@ -336,13 +344,11 @@ bool IsLocal(const CService& addr);
 bool GetLocal(CService &addr, const CNetAddr *paddrPeer = NULL);
 bool IsReachable(enum Network net);
 bool IsReachable(const CNetAddr &addr);
-CAddress GetLocalAddress(const CNetAddr *paddrPeer = NULL);
+CAddress GetLocalAddress(const CNetAddr *paddrPeer, ServiceFlags nLocalServices);
 
 
 extern bool fDiscover;
 extern bool fListen;
-extern ServiceFlags nLocalServices;
-extern ServiceFlags nRelevantServices;
 extern bool fRelayTxes;
 
 /** Maximum number of connections to simultaneously allow (aka connection slots) */
@@ -549,7 +555,7 @@ class CNode
     CAmount lastSentFeeFilter;
     int64_t nextSendTimeFeeFilter;
 
-    CNode(NodeId id, SOCKET hSocketIn, const CAddress &addrIn, const std::string &addrNameIn = "", bool fInboundIn = false);
+    CNode(NodeId id, ServiceFlags nLocalServicesIn, SOCKET hSocketIn, const CAddress &addrIn, const std::string &addrNameIn = "", bool fInboundIn = false);
     ~CNode();
 
 private:
@@ -559,6 +565,7 @@ class CNode
     static uint64_t CalculateKeyedNetGroup(const CAddress& ad);
 
     uint64_t nLocalHostNonce;
+    ServiceFlags nLocalServices;
 public:
 
     NodeId GetId() const {
@@ -846,6 +853,11 @@ class CNode
     void CloseSocketDisconnect();
 
     void copyStats(CNodeStats &stats);
+
+    ServiceFlags GetLocalServices() const
+    {
+        return nLocalServices;
+    }
 };
 
 
diff --git a/src/rpc/net.cpp b/src/rpc/net.cpp
index 4fe58239928c2..61b6b62c9a0b6 100644
--- a/src/rpc/net.cpp
+++ b/src/rpc/net.cpp
@@ -432,7 +432,8 @@ UniValue getnetworkinfo(const UniValue& params, bool fHelp)
     obj.push_back(Pair("version",       CLIENT_VERSION));
     obj.push_back(Pair("subversion",    strSubVersion));
     obj.push_back(Pair("protocolversion",PROTOCOL_VERSION));
-    obj.push_back(Pair("localservices",       strprintf("%016x", nLocalServices)));
+    if(g_connman)
+        obj.push_back(Pair("localservices", strprintf("%016x", g_connman->GetLocalServices())));
     obj.push_back(Pair("localrelay",     fRelayTxes));
     obj.push_back(Pair("timeoffset",    GetTimeOffset()));
     if(g_connman)
diff --git a/src/test/DoS_tests.cpp b/src/test/DoS_tests.cpp
index 652a8e2ceadf7..2265f43a6e14c 100644
--- a/src/test/DoS_tests.cpp
+++ b/src/test/DoS_tests.cpp
@@ -48,7 +48,7 @@ BOOST_AUTO_TEST_CASE(DoS_banning)
 {
     connman->ClearBanned();
     CAddress addr1(ip(0xa0b0c001), NODE_NONE);
-    CNode dummyNode1(id++, INVALID_SOCKET, addr1, "", true);
+    CNode dummyNode1(id++, NODE_NETWORK, INVALID_SOCKET, addr1, "", true);
     GetNodeSignals().InitializeNode(dummyNode1.GetId(), &dummyNode1);
     dummyNode1.nVersion = 1;
     Misbehaving(dummyNode1.GetId(), 100); // Should get banned
@@ -57,7 +57,7 @@ BOOST_AUTO_TEST_CASE(DoS_banning)
     BOOST_CHECK(!connman->IsBanned(ip(0xa0b0c001|0x0000ff00))); // Different IP, not banned
 
     CAddress addr2(ip(0xa0b0c002), NODE_NONE);
-    CNode dummyNode2(id++, INVALID_SOCKET, addr2, "", true);
+    CNode dummyNode2(id++, NODE_NETWORK, INVALID_SOCKET, addr2, "", true);
     GetNodeSignals().InitializeNode(dummyNode2.GetId(), &dummyNode2);
     dummyNode2.nVersion = 1;
     Misbehaving(dummyNode2.GetId(), 50);
@@ -74,7 +74,7 @@ BOOST_AUTO_TEST_CASE(DoS_banscore)
     connman->ClearBanned();
     mapArgs["-banscore"] = "111"; // because 11 is my favorite number
     CAddress addr1(ip(0xa0b0c001), NODE_NONE);
-    CNode dummyNode1(id++, INVALID_SOCKET, addr1, "", true);
+    CNode dummyNode1(id++, NODE_NETWORK, INVALID_SOCKET, addr1, "", true);
     GetNodeSignals().InitializeNode(dummyNode1.GetId(), &dummyNode1);
     dummyNode1.nVersion = 1;
     Misbehaving(dummyNode1.GetId(), 100);
@@ -96,7 +96,7 @@ BOOST_AUTO_TEST_CASE(DoS_bantime)
     SetMockTime(nStartTime); // Overrides future calls to GetTime()
 
     CAddress addr(ip(0xa0b0c001), NODE_NONE);
-    CNode dummyNode(id++, INVALID_SOCKET, addr, "", true);
+    CNode dummyNode(id++, NODE_NETWORK, INVALID_SOCKET, addr, "", true);
     GetNodeSignals().InitializeNode(dummyNode.GetId(), &dummyNode);
     dummyNode.nVersion = 1;
 
diff --git a/src/test/net_tests.cpp b/src/test/net_tests.cpp
index 00fb757167717..1019b12c1c57a 100644
--- a/src/test/net_tests.cpp
+++ b/src/test/net_tests.cpp
@@ -163,12 +163,12 @@ BOOST_AUTO_TEST_CASE(cnode_simple_test)
     bool fInboundIn = false;
 
     // Test that fFeeler is false by default.
-    CNode* pnode1 = new CNode(id++, hSocket, addr, pszDest, fInboundIn);
+    CNode* pnode1 = new CNode(id++, NODE_NETWORK, hSocket, addr, pszDest, fInboundIn);
     BOOST_CHECK(pnode1->fInbound == false);
     BOOST_CHECK(pnode1->fFeeler == false);
 
     fInboundIn = true;
-    CNode* pnode2 = new CNode(id++, hSocket, addr, pszDest, fInboundIn);
+    CNode* pnode2 = new CNode(id++, NODE_NETWORK, hSocket, addr, pszDest, fInboundIn);
     BOOST_CHECK(pnode2->fInbound == true);
     BOOST_CHECK(pnode2->fFeeler == false);
 }

From 8a593694b1495656411717fbae5d3167576df973 Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Tue, 19 Apr 2016 00:15:52 -0400
Subject: [PATCH 0854/1802] net: move semOutbound to CConnman

---
 src/net.cpp | 3 +--
 src/net.h   | 2 ++
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/net.cpp b/src/net.cpp
index 66e3d91f4a11a..853c0cdd65f76 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -84,8 +84,6 @@ std::string strSubVersion;
 
 limitedmap<uint256, int64_t> mapAlreadyAskedFor(MAX_INV_SZ);
 
-static CSemaphore *semOutbound = NULL;
-
 // Signals for message handling
 static CNodeSignals g_signals;
 CNodeSignals& GetNodeSignals() { return g_signals; }
@@ -2039,6 +2037,7 @@ CConnman::CConnman()
     nLastNodeId = 0;
     nSendBufferMaxSize = 0;
     nReceiveFloodSize = 0;
+    semOutbound = NULL;
 }
 
 bool StartNode(CConnman& connman, boost::thread_group& threadGroup, CScheduler& scheduler, ServiceFlags nLocalServices, ServiceFlags nRelevantServices, std::string& strNodeError)
diff --git a/src/net.h b/src/net.h
index 25e473c5fc30f..36ebadf13cb19 100644
--- a/src/net.h
+++ b/src/net.h
@@ -282,6 +282,8 @@ class CConnman
 
     /** Services this instance cares about */
     ServiceFlags nRelevantServices;
+
+    CSemaphore *semOutbound;
 };
 extern std::unique_ptr<CConnman> g_connman;
 void MapPort(bool fUseUPnP);

From fdf69ff21aef8ed8071a757979f4239537f7afba Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Sun, 22 May 2016 09:52:03 +0200
Subject: [PATCH 0855/1802] net: move max/max-outbound to CConnman

---
 src/init.cpp |  5 +++--
 src/net.cpp  | 24 +++++++++++++-----------
 src/net.h    | 11 ++++++-----
 3 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/src/init.cpp b/src/init.cpp
index 644d6721e4b00..599dac39b2562 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -861,7 +861,7 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
     // Make sure enough file descriptors are available
     int nBind = std::max((int)mapArgs.count("-bind") + (int)mapArgs.count("-whitebind"), 1);
     int nUserMaxConnections = GetArg("-maxconnections", DEFAULT_MAX_PEER_CONNECTIONS);
-    nMaxConnections = std::max(nUserMaxConnections, 0);
+    int nMaxConnections = std::max(nUserMaxConnections, 0);
 
     // Trim requested connection counts, to fit into system limitations
     nMaxConnections = std::max(std::min(nMaxConnections, (int)(FD_SETSIZE - nBind - MIN_CORE_FILEDESCRIPTORS)), 0);
@@ -1509,7 +1509,8 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
         StartTorControl(threadGroup, scheduler);
 
     std::string strNodeError;
-    if(!StartNode(connman, threadGroup, scheduler, nLocalServices, nRelevantServices, strNodeError))
+    int nMaxOutbound = std::min(MAX_OUTBOUND_CONNECTIONS, nMaxConnections);
+    if(!StartNode(connman, threadGroup, scheduler, nLocalServices, nRelevantServices, nMaxConnections, nMaxOutbound, strNodeError))
         return InitError(strNodeError);
 
     // ********************************************************* Step 12: finished
diff --git a/src/net.cpp b/src/net.cpp
index 853c0cdd65f76..fe4daaaebf03a 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -63,7 +63,6 @@
 
 
 namespace {
-    const int MAX_OUTBOUND_CONNECTIONS = 8;
     const int MAX_FEELER_CONNECTIONS = 1;
 }
 
@@ -79,7 +78,6 @@ CCriticalSection cs_mapLocalHost;
 std::map<CNetAddr, LocalServiceInfo> mapLocalHost;
 static bool vfLimited[NET_MAX] = {};
 static CNode* pnodeLocalHost = NULL;
-int nMaxConnections = DEFAULT_MAX_PEER_CONNECTIONS;
 std::string strSubVersion;
 
 limitedmap<uint256, int64_t> mapAlreadyAskedFor(MAX_INV_SZ);
@@ -974,7 +972,7 @@ void CConnman::AcceptConnection(const ListenSocket& hListenSocket) {
     SOCKET hSocket = accept(hListenSocket.socket, (struct sockaddr*)&sockaddr, &len);
     CAddress addr;
     int nInbound = 0;
-    int nMaxInbound = nMaxConnections - (MAX_OUTBOUND_CONNECTIONS + MAX_FEELER_CONNECTIONS);
+    int nMaxInbound = nMaxConnections - (nMaxOutbound + MAX_FEELER_CONNECTIONS);
     assert(nMaxInbound > 0);
 
     if (hSocket != INVALID_SOCKET)
@@ -1626,7 +1624,7 @@ void CConnman::ThreadOpenConnections()
                 }
             }
         }
-        assert(nOutbound <= (MAX_OUTBOUND_CONNECTIONS + MAX_FEELER_CONNECTIONS));
+        assert(nOutbound <= (nMaxOutbound + MAX_FEELER_CONNECTIONS));
 
         // Feeler Connections
         //
@@ -1641,7 +1639,7 @@ void CConnman::ThreadOpenConnections()
         //  * Only make a feeler connection once every few minutes.
         //
         bool fFeeler = false;
-        if (nOutbound >= MAX_OUTBOUND_CONNECTIONS) {
+        if (nOutbound >= nMaxOutbound) {
             int64_t nTime = GetTimeMicros(); // The current time right now (in microseconds).
             if (nTime > nNextFeeler) {
                 nNextFeeler = PoissonNextSend(nTime, FEELER_INTERVAL);
@@ -2038,13 +2036,15 @@ CConnman::CConnman()
     nSendBufferMaxSize = 0;
     nReceiveFloodSize = 0;
     semOutbound = NULL;
+    nMaxConnections = 0;
+    nMaxOutbound = 0;
 }
 
-bool StartNode(CConnman& connman, boost::thread_group& threadGroup, CScheduler& scheduler, ServiceFlags nLocalServices, ServiceFlags nRelevantServices, std::string& strNodeError)
+bool StartNode(CConnman& connman, boost::thread_group& threadGroup, CScheduler& scheduler, ServiceFlags nLocalServices, ServiceFlags nRelevantServices, int nMaxConnectionsIn, int nMaxOutboundIn, std::string& strNodeError)
 {
     Discover(threadGroup);
 
-    bool ret = connman.Start(threadGroup, scheduler, nLocalServices, nRelevantServices, strNodeError);
+    bool ret = connman.Start(threadGroup, scheduler, nLocalServices, nRelevantServices, nMaxConnectionsIn, nMaxOutboundIn, strNodeError);
 
     return ret;
 }
@@ -2054,7 +2054,7 @@ NodeId CConnman::GetNewNodeId()
     return nLastNodeId.fetch_add(1, std::memory_order_relaxed);
 }
 
-bool CConnman::Start(boost::thread_group& threadGroup, CScheduler& scheduler, ServiceFlags nLocalServicesIn, ServiceFlags nRelevantServicesIn, std::string& strNodeError)
+bool CConnman::Start(boost::thread_group& threadGroup, CScheduler& scheduler, ServiceFlags nLocalServicesIn, ServiceFlags nRelevantServicesIn, int nMaxConnectionsIn, int nMaxOutboundIn, std::string& strNodeError)
 {
     nTotalBytesRecv = 0;
     nTotalBytesSent = 0;
@@ -2065,6 +2065,9 @@ bool CConnman::Start(boost::thread_group& threadGroup, CScheduler& scheduler, Se
     nRelevantServices = nRelevantServicesIn;
     nMaxOutboundCycleStartTime = 0;
 
+    nMaxConnections = nMaxConnectionsIn;
+    nMaxOutbound = std::min((nMaxOutboundIn), nMaxConnections);
+
     nSendBufferMaxSize = 1000*GetArg("-maxsendbuffer", DEFAULT_MAXSENDBUFFER);
     nReceiveFloodSize = 1000*GetArg("-maxreceivebuffer", DEFAULT_MAXRECEIVEBUFFER);
 
@@ -2106,8 +2109,7 @@ bool CConnman::Start(boost::thread_group& threadGroup, CScheduler& scheduler, Se
 
     if (semOutbound == NULL) {
         // initialize semaphore
-        int nMaxOutbound = std::min((MAX_OUTBOUND_CONNECTIONS + MAX_FEELER_CONNECTIONS), nMaxConnections);
-        semOutbound = new CSemaphore(nMaxOutbound);
+        semOutbound = new CSemaphore(std::min((nMaxOutbound + MAX_FEELER_CONNECTIONS), nMaxConnections));
     }
 
     if (pnodeLocalHost == NULL) {
@@ -2174,7 +2176,7 @@ instance_of_cnetcleanup;
 void CConnman::Stop()
 {
     if (semOutbound)
-        for (int i=0; i<(MAX_OUTBOUND_CONNECTIONS + MAX_FEELER_CONNECTIONS); i++)
+        for (int i=0; i<(nMaxOutbound + MAX_FEELER_CONNECTIONS); i++)
             semOutbound->post();
 
     if (fAddressesInitialized)
diff --git a/src/net.h b/src/net.h
index 36ebadf13cb19..0859190d3679d 100644
--- a/src/net.h
+++ b/src/net.h
@@ -54,6 +54,8 @@ static const unsigned int MAX_ADDR_TO_SEND = 1000;
 static const unsigned int MAX_PROTOCOL_MESSAGE_LENGTH = 4 * 1000 * 1000;
 /** Maximum length of strSubVer in `version` message */
 static const unsigned int MAX_SUBVERSION_LENGTH = 256;
+/** Maximum number of outgoing nodes */
+static const int MAX_OUTBOUND_CONNECTIONS = 8;
 /** -listen default */
 static const bool DEFAULT_LISTEN = true;
 /** -upnp default */
@@ -107,7 +109,7 @@ class CConnman
 
     CConnman();
     ~CConnman();
-    bool Start(boost::thread_group& threadGroup, CScheduler& scheduler, ServiceFlags nLocalServicesIn, ServiceFlags nRelevantServicesIn, std::string& strNodeError);
+    bool Start(boost::thread_group& threadGroup, CScheduler& scheduler, ServiceFlags nLocalServicesIn, ServiceFlags nRelevantServicesIn, int nMaxConnectionsIn, int nMaxOutboundIn, std::string& strNodeError);
     void Stop();
     bool BindListenPort(const CService &bindAddr, std::string& strError, bool fWhitelisted = false);
     bool OpenNetworkConnection(const CAddress& addrConnect, bool fCountFailure, CSemaphoreGrant *grantOutbound = NULL, const char *strDest = NULL, bool fOneShot = false, bool fFeeler = false);
@@ -284,12 +286,14 @@ class CConnman
     ServiceFlags nRelevantServices;
 
     CSemaphore *semOutbound;
+    int nMaxConnections;
+    int nMaxOutbound;
 };
 extern std::unique_ptr<CConnman> g_connman;
 void MapPort(bool fUseUPnP);
 unsigned short GetListenPort();
 bool BindListenPort(const CService &bindAddr, std::string& strError, bool fWhitelisted = false);
-bool StartNode(CConnman& connman, boost::thread_group& threadGroup, CScheduler& scheduler, ServiceFlags nLocalServices, ServiceFlags nRelevantServices, std::string& strNodeError);
+bool StartNode(CConnman& connman, boost::thread_group& threadGroup, CScheduler& scheduler, ServiceFlags nLocalServices, ServiceFlags nRelevantServices, int nMaxConnections, int nMaxOutbound, std::string& strNodeError);
 bool StopNode(CConnman& connman);
 size_t SocketSendData(CNode *pnode);
 
@@ -353,9 +357,6 @@ extern bool fDiscover;
 extern bool fListen;
 extern bool fRelayTxes;
 
-/** Maximum number of connections to simultaneously allow (aka connection slots) */
-extern int nMaxConnections;
-
 extern limitedmap<uint256, int64_t> mapAlreadyAskedFor;
 
 /** Subversion as sent to the P2P network in `version` messages */

From f60b9059e4958245bda82e9656c52a31d5268ad9 Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Tue, 24 May 2016 16:42:17 -0400
Subject: [PATCH 0856/1802] net: Pass best block known height into CConnman

CConnman then passes the current best height into CNode at creation time.

This way CConnman/CNode have no dependency on main for height, and the signals
only move in one direction.

This also helps to prevent identity leakage a tiny bit. Before this change, an
attacker could theoretically make 2 connections on different interfaces. They
would connect fully on one, and only establish the initial connection on the
other. Once they receive a new block, they would relay it to your first
connection, and immediately commence the version handshake on the second. Since
the new block height is reflected immediately, they could attempt to learn
whether the two connections were correlated.

This is, of course, incredibly unlikely to work due to the small timings
involved and receipt from other senders. But it doesn't hurt to lock-in
nBestHeight at the time of connection, rather than letting the remote choose
the time.
---
 src/init.cpp           |  2 +-
 src/main.cpp           | 10 ++--------
 src/net.cpp            | 36 ++++++++++++++++++++++++------------
 src/net.h              | 13 +++++++++----
 src/test/DoS_tests.cpp |  8 ++++----
 src/test/net_tests.cpp |  5 +++--
 6 files changed, 43 insertions(+), 31 deletions(-)

diff --git a/src/init.cpp b/src/init.cpp
index 599dac39b2562..4dce8be819cb5 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -1510,7 +1510,7 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
 
     std::string strNodeError;
     int nMaxOutbound = std::min(MAX_OUTBOUND_CONNECTIONS, nMaxConnections);
-    if(!StartNode(connman, threadGroup, scheduler, nLocalServices, nRelevantServices, nMaxConnections, nMaxOutbound, strNodeError))
+    if(!StartNode(connman, threadGroup, scheduler, nLocalServices, nRelevantServices, nMaxConnections, nMaxOutbound, chainActive.Height(), strNodeError))
         return InitError(strNodeError);
 
     // ********************************************************* Step 12: finished
diff --git a/src/main.cpp b/src/main.cpp
index a916cbc12d3a3..1835d9712b025 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -325,12 +325,6 @@ CNodeState *State(NodeId pnode) {
     return &it->second;
 }
 
-int GetHeight()
-{
-    LOCK(cs_main);
-    return chainActive.Height();
-}
-
 void UpdatePreferredDownload(CNode* node, CNodeState* state)
 {
     nPreferredDownload -= state->fPreferredDownload;
@@ -639,7 +633,6 @@ bool GetNodeStateStats(NodeId nodeid, CNodeStateStats &stats) {
 
 void RegisterNodeSignals(CNodeSignals& nodeSignals)
 {
-    nodeSignals.GetHeight.connect(&GetHeight);
     nodeSignals.ProcessMessages.connect(&ProcessMessages);
     nodeSignals.SendMessages.connect(&SendMessages);
     nodeSignals.InitializeNode.connect(&InitializeNode);
@@ -648,7 +641,6 @@ void RegisterNodeSignals(CNodeSignals& nodeSignals)
 
 void UnregisterNodeSignals(CNodeSignals& nodeSignals)
 {
-    nodeSignals.GetHeight.disconnect(&GetHeight);
     nodeSignals.ProcessMessages.disconnect(&ProcessMessages);
     nodeSignals.SendMessages.disconnect(&SendMessages);
     nodeSignals.InitializeNode.disconnect(&InitializeNode);
@@ -3058,6 +3050,8 @@ bool ActivateBestChain(CValidationState &state, const CChainParams& chainparams,
         // When we reach this point, we switched to a new tip (stored in pindexNewTip).
 
         // Notifications/callbacks that can run without cs_main
+        if(connman)
+            connman->SetBestHeight(nNewHeight);
 
         // throw all transactions though the signal-interface
         // while _not_ holding the cs_main lock
diff --git a/src/net.cpp b/src/net.cpp
index fe4daaaebf03a..d510952551a33 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -392,7 +392,7 @@ CNode* CConnman::ConnectNode(CAddress addrConnect, const char *pszDest, bool fCo
         addrman.Attempt(addrConnect, fCountFailure);
 
         // Add node
-        CNode* pnode = new CNode(GetNewNodeId(), nLocalServices, hSocket, addrConnect, pszDest ? pszDest : "", false);
+        CNode* pnode = new CNode(GetNewNodeId(), nLocalServices, GetBestHeight(), hSocket, addrConnect, pszDest ? pszDest : "", false);
         GetNodeSignals().InitializeNode(pnode->GetId(), pnode);
         pnode->AddRef();
 
@@ -451,17 +451,15 @@ void CNode::CloseSocketDisconnect()
 
 void CNode::PushVersion()
 {
-    int nBestHeight = GetNodeSignals().GetHeight().get_value_or(0);
-
     int64_t nTime = (fInbound ? GetAdjustedTime() : GetTime());
     CAddress addrYou = (addr.IsRoutable() && !IsProxy(addr) ? addr : CAddress(CService(), addr.nServices));
     CAddress addrMe = GetLocalAddress(&addr, nLocalServices);
     if (fLogIPs)
-        LogPrint("net", "send version message: version %d, blocks=%d, us=%s, them=%s, peer=%d\n", PROTOCOL_VERSION, nBestHeight, addrMe.ToString(), addrYou.ToString(), id);
+        LogPrint("net", "send version message: version %d, blocks=%d, us=%s, them=%s, peer=%d\n", PROTOCOL_VERSION, nMyStartingHeight, addrMe.ToString(), addrYou.ToString(), id);
     else
-        LogPrint("net", "send version message: version %d, blocks=%d, us=%s, peer=%d\n", PROTOCOL_VERSION, nBestHeight, addrMe.ToString(), id);
+        LogPrint("net", "send version message: version %d, blocks=%d, us=%s, peer=%d\n", PROTOCOL_VERSION, nMyStartingHeight, addrMe.ToString(), id);
     PushMessage(NetMsgType::VERSION, PROTOCOL_VERSION, (uint64_t)nLocalServices, nTime, addrYou, addrMe,
-                nLocalHostNonce, strSubVersion, nBestHeight, ::fRelayTxes);
+                nLocalHostNonce, strSubVersion, nMyStartingHeight, ::fRelayTxes);
 }
 
 
@@ -1028,7 +1026,7 @@ void CConnman::AcceptConnection(const ListenSocket& hListenSocket) {
         }
     }
 
-    CNode* pnode = new CNode(GetNewNodeId(), nLocalServices, hSocket, addr, "", true);
+    CNode* pnode = new CNode(GetNewNodeId(), nLocalServices, GetBestHeight(), hSocket, addr, "", true);
     GetNodeSignals().InitializeNode(pnode->GetId(), pnode);
     pnode->AddRef();
     pnode->fWhitelisted = whitelisted;
@@ -2038,13 +2036,14 @@ CConnman::CConnman()
     semOutbound = NULL;
     nMaxConnections = 0;
     nMaxOutbound = 0;
+    nBestHeight = 0;
 }
 
-bool StartNode(CConnman& connman, boost::thread_group& threadGroup, CScheduler& scheduler, ServiceFlags nLocalServices, ServiceFlags nRelevantServices, int nMaxConnectionsIn, int nMaxOutboundIn, std::string& strNodeError)
+bool StartNode(CConnman& connman, boost::thread_group& threadGroup, CScheduler& scheduler, ServiceFlags nLocalServices, ServiceFlags nRelevantServices, int nMaxConnectionsIn, int nMaxOutboundIn, int nBestHeightIn, std::string& strNodeError)
 {
     Discover(threadGroup);
 
-    bool ret = connman.Start(threadGroup, scheduler, nLocalServices, nRelevantServices, nMaxConnectionsIn, nMaxOutboundIn, strNodeError);
+    bool ret = connman.Start(threadGroup, scheduler, nLocalServices, nRelevantServices, nMaxConnectionsIn, nMaxOutboundIn, nBestHeightIn, strNodeError);
 
     return ret;
 }
@@ -2054,7 +2053,7 @@ NodeId CConnman::GetNewNodeId()
     return nLastNodeId.fetch_add(1, std::memory_order_relaxed);
 }
 
-bool CConnman::Start(boost::thread_group& threadGroup, CScheduler& scheduler, ServiceFlags nLocalServicesIn, ServiceFlags nRelevantServicesIn, int nMaxConnectionsIn, int nMaxOutboundIn, std::string& strNodeError)
+bool CConnman::Start(boost::thread_group& threadGroup, CScheduler& scheduler, ServiceFlags nLocalServicesIn, ServiceFlags nRelevantServicesIn, int nMaxConnectionsIn, int nMaxOutboundIn, int nBestHeightIn, std::string& strNodeError)
 {
     nTotalBytesRecv = 0;
     nTotalBytesSent = 0;
@@ -2071,6 +2070,8 @@ bool CConnman::Start(boost::thread_group& threadGroup, CScheduler& scheduler, Se
     nSendBufferMaxSize = 1000*GetArg("-maxsendbuffer", DEFAULT_MAXSENDBUFFER);
     nReceiveFloodSize = 1000*GetArg("-maxreceivebuffer", DEFAULT_MAXRECEIVEBUFFER);
 
+    SetBestHeight(nBestHeightIn);
+
     uiInterface.InitMessage(_("Loading addresses..."));
     // Load addresses from peers.dat
     int64_t nStart = GetTimeMillis();
@@ -2115,7 +2116,7 @@ bool CConnman::Start(boost::thread_group& threadGroup, CScheduler& scheduler, Se
     if (pnodeLocalHost == NULL) {
         CNetAddr local;
         LookupHost("127.0.0.1", local, false);
-        pnodeLocalHost = new CNode(GetNewNodeId(), nLocalServices, INVALID_SOCKET, CAddress(CService(local, 0), nLocalServices));
+        pnodeLocalHost = new CNode(GetNewNodeId(), nLocalServices, GetBestHeight(), INVALID_SOCKET, CAddress(CService(local, 0), nLocalServices));
         GetNodeSignals().InitializeNode(pnodeLocalHost->GetId(), pnodeLocalHost);
     }
 
@@ -2471,6 +2472,16 @@ ServiceFlags CConnman::GetLocalServices() const
     return nLocalServices;
 }
 
+void CConnman::SetBestHeight(int height)
+{
+    nBestHeight.store(height, std::memory_order_release);
+}
+
+int CConnman::GetBestHeight() const
+{
+    return nBestHeight.load(std::memory_order_acquire);
+}
+
 void CNode::Fuzz(int nChance)
 {
     if (!fSuccessfullyConnected) return; // Don't fuzz initial handshake
@@ -2509,7 +2520,7 @@ void CNode::Fuzz(int nChance)
 unsigned int CConnman::GetReceiveFloodSize() const { return nReceiveFloodSize; }
 unsigned int CConnman::GetSendBufferSize() const{ return nSendBufferMaxSize; }
 
-CNode::CNode(NodeId idIn, ServiceFlags nLocalServicesIn, SOCKET hSocketIn, const CAddress& addrIn, const std::string& addrNameIn, bool fInboundIn) :
+CNode::CNode(NodeId idIn, ServiceFlags nLocalServicesIn, int nMyStartingHeightIn, SOCKET hSocketIn, const CAddress& addrIn, const std::string& addrNameIn, bool fInboundIn) :
     ssSend(SER_NETWORK, INIT_PROTO_VERSION),
     addr(addrIn),
     nKeyedNetGroup(CalculateKeyedNetGroup(addrIn)),
@@ -2567,6 +2578,7 @@ CNode::CNode(NodeId idIn, ServiceFlags nLocalServicesIn, SOCKET hSocketIn, const
     nLocalServices = nLocalServicesIn;
 
     GetRandBytes((unsigned char*)&nLocalHostNonce, sizeof(nLocalHostNonce));
+    nMyStartingHeight = nMyStartingHeightIn;
 
     BOOST_FOREACH(const std::string &msg, getAllNetMessageTypes())
         mapRecvBytesPerMsgCmd[msg] = 0;
diff --git a/src/net.h b/src/net.h
index 0859190d3679d..852822d85b71c 100644
--- a/src/net.h
+++ b/src/net.h
@@ -109,7 +109,7 @@ class CConnman
 
     CConnman();
     ~CConnman();
-    bool Start(boost::thread_group& threadGroup, CScheduler& scheduler, ServiceFlags nLocalServicesIn, ServiceFlags nRelevantServicesIn, int nMaxConnectionsIn, int nMaxOutboundIn, std::string& strNodeError);
+    bool Start(boost::thread_group& threadGroup, CScheduler& scheduler, ServiceFlags nLocalServicesIn, ServiceFlags nRelevantServicesIn, int nMaxConnectionsIn, int nMaxOutboundIn, int nBestHeightIn, std::string& strNodeError);
     void Stop();
     bool BindListenPort(const CService &bindAddr, std::string& strError, bool fWhitelisted = false);
     bool OpenNetworkConnection(const CAddress& addrConnect, bool fCountFailure, CSemaphoreGrant *grantOutbound = NULL, const char *strDest = NULL, bool fOneShot = false, bool fFeeler = false);
@@ -199,6 +199,10 @@ class CConnman
     uint64_t GetTotalBytesRecv();
     uint64_t GetTotalBytesSent();
 
+    void SetBestHeight(int height);
+    int GetBestHeight() const;
+
+
 private:
     struct ListenSocket {
         SOCKET socket;
@@ -288,12 +292,13 @@ class CConnman
     CSemaphore *semOutbound;
     int nMaxConnections;
     int nMaxOutbound;
+    std::atomic<int> nBestHeight;
 };
 extern std::unique_ptr<CConnman> g_connman;
 void MapPort(bool fUseUPnP);
 unsigned short GetListenPort();
 bool BindListenPort(const CService &bindAddr, std::string& strError, bool fWhitelisted = false);
-bool StartNode(CConnman& connman, boost::thread_group& threadGroup, CScheduler& scheduler, ServiceFlags nLocalServices, ServiceFlags nRelevantServices, int nMaxConnections, int nMaxOutbound, std::string& strNodeError);
+bool StartNode(CConnman& connman, boost::thread_group& threadGroup, CScheduler& scheduler, ServiceFlags nLocalServices, ServiceFlags nRelevantServices, int nMaxConnections, int nMaxOutbound, int nBestHeightIn, std::string& strNodeError);
 bool StopNode(CConnman& connman);
 size_t SocketSendData(CNode *pnode);
 
@@ -315,7 +320,6 @@ struct CombinerAll
 // Signals for message handling
 struct CNodeSignals
 {
-    boost::signals2::signal<int ()> GetHeight;
     boost::signals2::signal<bool (CNode*, CConnman&), CombinerAll> ProcessMessages;
     boost::signals2::signal<bool (CNode*, CConnman&), CombinerAll> SendMessages;
     boost::signals2::signal<void (NodeId, const CNode*)> InitializeNode;
@@ -558,7 +562,7 @@ class CNode
     CAmount lastSentFeeFilter;
     int64_t nextSendTimeFeeFilter;
 
-    CNode(NodeId id, ServiceFlags nLocalServicesIn, SOCKET hSocketIn, const CAddress &addrIn, const std::string &addrNameIn = "", bool fInboundIn = false);
+    CNode(NodeId id, ServiceFlags nLocalServicesIn, int nMyStartingHeightIn, SOCKET hSocketIn, const CAddress &addrIn, const std::string &addrNameIn = "", bool fInboundIn = false);
     ~CNode();
 
 private:
@@ -569,6 +573,7 @@ class CNode
 
     uint64_t nLocalHostNonce;
     ServiceFlags nLocalServices;
+    int nMyStartingHeight;
 public:
 
     NodeId GetId() const {
diff --git a/src/test/DoS_tests.cpp b/src/test/DoS_tests.cpp
index 2265f43a6e14c..33f107d84bfdd 100644
--- a/src/test/DoS_tests.cpp
+++ b/src/test/DoS_tests.cpp
@@ -48,7 +48,7 @@ BOOST_AUTO_TEST_CASE(DoS_banning)
 {
     connman->ClearBanned();
     CAddress addr1(ip(0xa0b0c001), NODE_NONE);
-    CNode dummyNode1(id++, NODE_NETWORK, INVALID_SOCKET, addr1, "", true);
+    CNode dummyNode1(id++, NODE_NETWORK, 0, INVALID_SOCKET, addr1, "", true);
     GetNodeSignals().InitializeNode(dummyNode1.GetId(), &dummyNode1);
     dummyNode1.nVersion = 1;
     Misbehaving(dummyNode1.GetId(), 100); // Should get banned
@@ -57,7 +57,7 @@ BOOST_AUTO_TEST_CASE(DoS_banning)
     BOOST_CHECK(!connman->IsBanned(ip(0xa0b0c001|0x0000ff00))); // Different IP, not banned
 
     CAddress addr2(ip(0xa0b0c002), NODE_NONE);
-    CNode dummyNode2(id++, NODE_NETWORK, INVALID_SOCKET, addr2, "", true);
+    CNode dummyNode2(id++, NODE_NETWORK, 0, INVALID_SOCKET, addr2, "", true);
     GetNodeSignals().InitializeNode(dummyNode2.GetId(), &dummyNode2);
     dummyNode2.nVersion = 1;
     Misbehaving(dummyNode2.GetId(), 50);
@@ -74,7 +74,7 @@ BOOST_AUTO_TEST_CASE(DoS_banscore)
     connman->ClearBanned();
     mapArgs["-banscore"] = "111"; // because 11 is my favorite number
     CAddress addr1(ip(0xa0b0c001), NODE_NONE);
-    CNode dummyNode1(id++, NODE_NETWORK, INVALID_SOCKET, addr1, "", true);
+    CNode dummyNode1(id++, NODE_NETWORK, 0, INVALID_SOCKET, addr1, "", true);
     GetNodeSignals().InitializeNode(dummyNode1.GetId(), &dummyNode1);
     dummyNode1.nVersion = 1;
     Misbehaving(dummyNode1.GetId(), 100);
@@ -96,7 +96,7 @@ BOOST_AUTO_TEST_CASE(DoS_bantime)
     SetMockTime(nStartTime); // Overrides future calls to GetTime()
 
     CAddress addr(ip(0xa0b0c001), NODE_NONE);
-    CNode dummyNode(id++, NODE_NETWORK, INVALID_SOCKET, addr, "", true);
+    CNode dummyNode(id++, NODE_NETWORK, 0, INVALID_SOCKET, addr, "", true);
     GetNodeSignals().InitializeNode(dummyNode.GetId(), &dummyNode);
     dummyNode.nVersion = 1;
 
diff --git a/src/test/net_tests.cpp b/src/test/net_tests.cpp
index 1019b12c1c57a..bc9a98ab04cf8 100644
--- a/src/test/net_tests.cpp
+++ b/src/test/net_tests.cpp
@@ -154,6 +154,7 @@ BOOST_AUTO_TEST_CASE(cnode_simple_test)
 {
     SOCKET hSocket = INVALID_SOCKET;
     NodeId id = 0;
+    int height = 0;
 
     in_addr ipv4Addr;
     ipv4Addr.s_addr = 0xa0b0c001;
@@ -163,12 +164,12 @@ BOOST_AUTO_TEST_CASE(cnode_simple_test)
     bool fInboundIn = false;
 
     // Test that fFeeler is false by default.
-    CNode* pnode1 = new CNode(id++, NODE_NETWORK, hSocket, addr, pszDest, fInboundIn);
+    CNode* pnode1 = new CNode(id++, NODE_NETWORK, height, hSocket, addr, pszDest, fInboundIn);
     BOOST_CHECK(pnode1->fInbound == false);
     BOOST_CHECK(pnode1->fFeeler == false);
 
     fInboundIn = true;
-    CNode* pnode2 = new CNode(id++, NODE_NETWORK, hSocket, addr, pszDest, fInboundIn);
+    CNode* pnode2 = new CNode(id++, NODE_NETWORK, height, hSocket, addr, pszDest, fInboundIn);
     BOOST_CHECK(pnode2->fInbound == true);
     BOOST_CHECK(pnode2->fFeeler == false);
 }

From e81a602cf02edfb21c3ec097bd7cf71f189ed783 Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Wed, 25 May 2016 21:26:46 -0400
Subject: [PATCH 0857/1802] net: pass CClientUIInterface into CConnman

---
 src/init.cpp |  2 +-
 src/net.cpp  | 27 +++++++++++++++++----------
 src/net.h    |  7 +++++--
 3 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/src/init.cpp b/src/init.cpp
index 4dce8be819cb5..9e2ed62a922b9 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -1510,7 +1510,7 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
 
     std::string strNodeError;
     int nMaxOutbound = std::min(MAX_OUTBOUND_CONNECTIONS, nMaxConnections);
-    if(!StartNode(connman, threadGroup, scheduler, nLocalServices, nRelevantServices, nMaxConnections, nMaxOutbound, chainActive.Height(), strNodeError))
+    if(!StartNode(connman, threadGroup, scheduler, nLocalServices, nRelevantServices, nMaxConnections, nMaxOutbound, chainActive.Height(), &uiInterface, strNodeError))
         return InitError(strNodeError);
 
     // ********************************************************* Step 12: finished
diff --git a/src/net.cpp b/src/net.cpp
index d510952551a33..13218b4221fbd 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -474,7 +474,8 @@ void CConnman::ClearBanned()
         setBannedIsDirty = true;
     }
     DumpBanlist(); //store banlist to disk
-    uiInterface.BannedListChanged();
+    if(clientInterface)
+        clientInterface->BannedListChanged();
 }
 
 bool CConnman::IsBanned(CNetAddr ip)
@@ -534,7 +535,8 @@ void CConnman::Ban(const CSubNet& subNet, const BanReason &banReason, int64_t ba
         else
             return;
     }
-    uiInterface.BannedListChanged();
+    if(clientInterface)
+        clientInterface->BannedListChanged();
     {
         LOCK(cs_vNodes);
         BOOST_FOREACH(CNode* pnode, vNodes) {
@@ -558,7 +560,8 @@ bool CConnman::Unban(const CSubNet &subNet) {
             return false;
         setBannedIsDirty = true;
     }
-    uiInterface.BannedListChanged();
+    if(clientInterface)
+        clientInterface->BannedListChanged();
     DumpBanlist(); //store banlist to disk immediately
     return true;
 }
@@ -1104,7 +1107,8 @@ void CConnman::ThreadSocketHandler()
         }
         if(vNodes.size() != nPrevNodeCount) {
             nPrevNodeCount = vNodes.size();
-            uiInterface.NotifyNumConnectionsChanged(nPrevNodeCount);
+            if(clientInterface)
+                clientInterface->NotifyNumConnectionsChanged(nPrevNodeCount);
         }
 
         //
@@ -2037,13 +2041,14 @@ CConnman::CConnman()
     nMaxConnections = 0;
     nMaxOutbound = 0;
     nBestHeight = 0;
+    clientInterface = NULL;
 }
 
-bool StartNode(CConnman& connman, boost::thread_group& threadGroup, CScheduler& scheduler, ServiceFlags nLocalServices, ServiceFlags nRelevantServices, int nMaxConnectionsIn, int nMaxOutboundIn, int nBestHeightIn, std::string& strNodeError)
+bool StartNode(CConnman& connman, boost::thread_group& threadGroup, CScheduler& scheduler, ServiceFlags nLocalServices, ServiceFlags nRelevantServices, int nMaxConnectionsIn, int nMaxOutboundIn, int nBestHeightIn, CClientUIInterface* interfaceIn, std::string& strNodeError)
 {
     Discover(threadGroup);
 
-    bool ret = connman.Start(threadGroup, scheduler, nLocalServices, nRelevantServices, nMaxConnectionsIn, nMaxOutboundIn, nBestHeightIn, strNodeError);
+    bool ret = connman.Start(threadGroup, scheduler, nLocalServices, nRelevantServices, nMaxConnectionsIn, nMaxOutboundIn, nBestHeightIn, interfaceIn, strNodeError);
 
     return ret;
 }
@@ -2053,7 +2058,7 @@ NodeId CConnman::GetNewNodeId()
     return nLastNodeId.fetch_add(1, std::memory_order_relaxed);
 }
 
-bool CConnman::Start(boost::thread_group& threadGroup, CScheduler& scheduler, ServiceFlags nLocalServicesIn, ServiceFlags nRelevantServicesIn, int nMaxConnectionsIn, int nMaxOutboundIn, int nBestHeightIn, std::string& strNodeError)
+bool CConnman::Start(boost::thread_group& threadGroup, CScheduler& scheduler, ServiceFlags nLocalServicesIn, ServiceFlags nRelevantServicesIn, int nMaxConnectionsIn, int nMaxOutboundIn, int nBestHeightIn, CClientUIInterface* interfaceIn, std::string& strNodeError)
 {
     nTotalBytesRecv = 0;
     nTotalBytesSent = 0;
@@ -2072,7 +2077,9 @@ bool CConnman::Start(boost::thread_group& threadGroup, CScheduler& scheduler, Se
 
     SetBestHeight(nBestHeightIn);
 
-    uiInterface.InitMessage(_("Loading addresses..."));
+    clientInterface = interfaceIn;
+    if (clientInterface)
+        clientInterface->InitMessage(_("Loading addresses..."));
     // Load addresses from peers.dat
     int64_t nStart = GetTimeMillis();
     {
@@ -2085,8 +2092,8 @@ bool CConnman::Start(boost::thread_group& threadGroup, CScheduler& scheduler, Se
             DumpAddresses();
         }
     }
-
-    uiInterface.InitMessage(_("Loading banlist..."));
+    if (clientInterface)
+        clientInterface->InitMessage(_("Loading banlist..."));
     // Load addresses from banlist.dat
     nStart = GetTimeMillis();
     CBanDB bandb;
diff --git a/src/net.h b/src/net.h
index 852822d85b71c..a45e18da6725d 100644
--- a/src/net.h
+++ b/src/net.h
@@ -96,6 +96,8 @@ struct AddedNodeInfo
 
 class CTransaction;
 class CNodeStats;
+class CClientUIInterface;
+
 class CConnman
 {
 public:
@@ -109,7 +111,7 @@ class CConnman
 
     CConnman();
     ~CConnman();
-    bool Start(boost::thread_group& threadGroup, CScheduler& scheduler, ServiceFlags nLocalServicesIn, ServiceFlags nRelevantServicesIn, int nMaxConnectionsIn, int nMaxOutboundIn, int nBestHeightIn, std::string& strNodeError);
+    bool Start(boost::thread_group& threadGroup, CScheduler& scheduler, ServiceFlags nLocalServicesIn, ServiceFlags nRelevantServicesIn, int nMaxConnectionsIn, int nMaxOutboundIn, int nBestHeightIn, CClientUIInterface* interfaceIn, std::string& strNodeError);
     void Stop();
     bool BindListenPort(const CService &bindAddr, std::string& strError, bool fWhitelisted = false);
     bool OpenNetworkConnection(const CAddress& addrConnect, bool fCountFailure, CSemaphoreGrant *grantOutbound = NULL, const char *strDest = NULL, bool fOneShot = false, bool fFeeler = false);
@@ -293,12 +295,13 @@ class CConnman
     int nMaxConnections;
     int nMaxOutbound;
     std::atomic<int> nBestHeight;
+    CClientUIInterface* clientInterface;
 };
 extern std::unique_ptr<CConnman> g_connman;
 void MapPort(bool fUseUPnP);
 unsigned short GetListenPort();
 bool BindListenPort(const CService &bindAddr, std::string& strError, bool fWhitelisted = false);
-bool StartNode(CConnman& connman, boost::thread_group& threadGroup, CScheduler& scheduler, ServiceFlags nLocalServices, ServiceFlags nRelevantServices, int nMaxConnections, int nMaxOutbound, int nBestHeightIn, std::string& strNodeError);
+bool StartNode(CConnman& connman, boost::thread_group& threadGroup, CScheduler& scheduler, ServiceFlags nLocalServices, ServiceFlags nRelevantServices, int nMaxConnections, int nMaxOutbound, int nBestHeightIn, CClientUIInterface* interfaceIn, std::string& strNodeError);
 bool StopNode(CConnman& connman);
 size_t SocketSendData(CNode *pnode);
 

From bafa5fc5a1ba33337b5eb3d8ae24ba2fac2949f8 Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Thu, 26 May 2016 23:29:39 -0400
Subject: [PATCH 0858/1802] net: Drop StartNode/StopNode and use CConnman
 directly

---
 src/init.cpp | 10 ++++++++--
 src/net.cpp  | 24 ++----------------------
 src/net.h    |  3 +--
 3 files changed, 11 insertions(+), 26 deletions(-)

diff --git a/src/init.cpp b/src/init.cpp
index 9e2ed62a922b9..4e1c8e1b61184 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -199,7 +199,8 @@ void Shutdown()
     if (pwalletMain)
         pwalletMain->Flush(false);
 #endif
-    StopNode(*g_connman);
+    MapPort(false);
+    g_connman->Stop();
     g_connman.reset();
 
     StopTorControl();
@@ -1508,9 +1509,14 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
     if (GetBoolArg("-listenonion", DEFAULT_LISTEN_ONION))
         StartTorControl(threadGroup, scheduler);
 
+    Discover(threadGroup);
+
+    // Map ports with UPnP
+    MapPort(GetBoolArg("-upnp", DEFAULT_UPNP));
+
     std::string strNodeError;
     int nMaxOutbound = std::min(MAX_OUTBOUND_CONNECTIONS, nMaxConnections);
-    if(!StartNode(connman, threadGroup, scheduler, nLocalServices, nRelevantServices, nMaxConnections, nMaxOutbound, chainActive.Height(), &uiInterface, strNodeError))
+    if(!connman.Start(threadGroup, scheduler, nLocalServices, nRelevantServices, nMaxConnections, nMaxOutbound, chainActive.Height(), &uiInterface, strNodeError))
         return InitError(strNodeError);
 
     // ********************************************************* Step 12: finished
diff --git a/src/net.cpp b/src/net.cpp
index 13218b4221fbd..15c066cd7ce4d 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -1979,7 +1979,7 @@ bool CConnman::BindListenPort(const CService &addrBind, std::string& strError, b
     return true;
 }
 
-void static Discover(boost::thread_group& threadGroup)
+void Discover(boost::thread_group& threadGroup)
 {
     if (!fDiscover)
         return;
@@ -2044,15 +2044,6 @@ CConnman::CConnman()
     clientInterface = NULL;
 }
 
-bool StartNode(CConnman& connman, boost::thread_group& threadGroup, CScheduler& scheduler, ServiceFlags nLocalServices, ServiceFlags nRelevantServices, int nMaxConnectionsIn, int nMaxOutboundIn, int nBestHeightIn, CClientUIInterface* interfaceIn, std::string& strNodeError)
-{
-    Discover(threadGroup);
-
-    bool ret = connman.Start(threadGroup, scheduler, nLocalServices, nRelevantServices, nMaxConnectionsIn, nMaxOutboundIn, nBestHeightIn, interfaceIn, strNodeError);
-
-    return ret;
-}
-
 NodeId CConnman::GetNewNodeId()
 {
     return nLastNodeId.fetch_add(1, std::memory_order_relaxed);
@@ -2136,9 +2127,6 @@ bool CConnman::Start(boost::thread_group& threadGroup, CScheduler& scheduler, Se
     else
         threadGroup.create_thread(boost::bind(&TraceThread<boost::function<void()> >, "dnsseed", boost::function<void()>(boost::bind(&CConnman::ThreadDNSAddressSeed, this))));
 
-    // Map ports with UPnP
-    MapPort(GetBoolArg("-upnp", DEFAULT_UPNP));
-
     // Send and receive from sockets, accept connections
     threadGroup.create_thread(boost::bind(&TraceThread<boost::function<void()> >, "net", boost::function<void()>(boost::bind(&CConnman::ThreadSocketHandler, this))));
 
@@ -2157,15 +2145,6 @@ bool CConnman::Start(boost::thread_group& threadGroup, CScheduler& scheduler, Se
     return true;
 }
 
-bool StopNode(CConnman& connman)
-{
-    LogPrintf("StopNode()\n");
-    MapPort(false);
-
-    connman.Stop();
-    return true;
-}
-
 class CNetCleanup
 {
 public:
@@ -2183,6 +2162,7 @@ instance_of_cnetcleanup;
 
 void CConnman::Stop()
 {
+    LogPrintf("%s\n",__func__);
     if (semOutbound)
         for (int i=0; i<(nMaxOutbound + MAX_FEELER_CONNECTIONS); i++)
             semOutbound->post();
diff --git a/src/net.h b/src/net.h
index a45e18da6725d..e08409e81e217 100644
--- a/src/net.h
+++ b/src/net.h
@@ -298,11 +298,10 @@ class CConnman
     CClientUIInterface* clientInterface;
 };
 extern std::unique_ptr<CConnman> g_connman;
+void Discover(boost::thread_group& threadGroup);
 void MapPort(bool fUseUPnP);
 unsigned short GetListenPort();
 bool BindListenPort(const CService &bindAddr, std::string& strError, bool fWhitelisted = false);
-bool StartNode(CConnman& connman, boost::thread_group& threadGroup, CScheduler& scheduler, ServiceFlags nLocalServices, ServiceFlags nRelevantServices, int nMaxConnections, int nMaxOutbound, int nBestHeightIn, CClientUIInterface* interfaceIn, std::string& strNodeError);
-bool StopNode(CConnman& connman);
 size_t SocketSendData(CNode *pnode);
 
 struct CombinerAll

From a19553b992f40b9f98e6e0be4cd529a89746ef50 Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Thu, 26 May 2016 23:53:08 -0400
Subject: [PATCH 0859/1802] net: Introduce CConnection::Options to avoid
 passing so many params

---
 src/init.cpp | 11 +++++++++--
 src/net.cpp  | 14 +++++++-------
 src/net.h    | 11 ++++++++++-
 3 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/src/init.cpp b/src/init.cpp
index 4e1c8e1b61184..e1080364393df 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -1515,8 +1515,15 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
     MapPort(GetBoolArg("-upnp", DEFAULT_UPNP));
 
     std::string strNodeError;
-    int nMaxOutbound = std::min(MAX_OUTBOUND_CONNECTIONS, nMaxConnections);
-    if(!connman.Start(threadGroup, scheduler, nLocalServices, nRelevantServices, nMaxConnections, nMaxOutbound, chainActive.Height(), &uiInterface, strNodeError))
+    CConnman::Options connOptions;
+    connOptions.nLocalServices = nLocalServices;
+    connOptions.nRelevantServices = nRelevantServices;
+    connOptions.nMaxConnections = nMaxConnections;
+    connOptions.nMaxOutbound = std::min(MAX_OUTBOUND_CONNECTIONS, connOptions.nMaxConnections);
+    connOptions.nBestHeight = chainActive.Height();
+    connOptions.uiInterface = &uiInterface;
+
+    if(!connman.Start(threadGroup, scheduler, strNodeError, connOptions))
         return InitError(strNodeError);
 
     // ********************************************************* Step 12: finished
diff --git a/src/net.cpp b/src/net.cpp
index 15c066cd7ce4d..8ea600b371cae 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -2049,26 +2049,26 @@ NodeId CConnman::GetNewNodeId()
     return nLastNodeId.fetch_add(1, std::memory_order_relaxed);
 }
 
-bool CConnman::Start(boost::thread_group& threadGroup, CScheduler& scheduler, ServiceFlags nLocalServicesIn, ServiceFlags nRelevantServicesIn, int nMaxConnectionsIn, int nMaxOutboundIn, int nBestHeightIn, CClientUIInterface* interfaceIn, std::string& strNodeError)
+bool CConnman::Start(boost::thread_group& threadGroup, CScheduler& scheduler, std::string& strNodeError, Options connOptions)
 {
     nTotalBytesRecv = 0;
     nTotalBytesSent = 0;
     nMaxOutboundLimit = 0;
     nMaxOutboundTotalBytesSentInCycle = 0;
     nMaxOutboundTimeframe = 60*60*24; //1 day
-    nLocalServices = nLocalServicesIn;
-    nRelevantServices = nRelevantServicesIn;
     nMaxOutboundCycleStartTime = 0;
 
-    nMaxConnections = nMaxConnectionsIn;
-    nMaxOutbound = std::min((nMaxOutboundIn), nMaxConnections);
+    nRelevantServices = connOptions.nRelevantServices;
+    nLocalServices = connOptions.nLocalServices;
+    nMaxConnections = connOptions.nMaxConnections;
+    nMaxOutbound = std::min((connOptions.nMaxOutbound), nMaxConnections);
 
     nSendBufferMaxSize = 1000*GetArg("-maxsendbuffer", DEFAULT_MAXSENDBUFFER);
     nReceiveFloodSize = 1000*GetArg("-maxreceivebuffer", DEFAULT_MAXRECEIVEBUFFER);
 
-    SetBestHeight(nBestHeightIn);
+    SetBestHeight(connOptions.nBestHeight);
 
-    clientInterface = interfaceIn;
+    clientInterface = connOptions.uiInterface;
     if (clientInterface)
         clientInterface->InitMessage(_("Loading addresses..."));
     // Load addresses from peers.dat
diff --git a/src/net.h b/src/net.h
index e08409e81e217..8067ee68a7d39 100644
--- a/src/net.h
+++ b/src/net.h
@@ -109,9 +109,18 @@ class CConnman
         CONNECTIONS_ALL = (CONNECTIONS_IN | CONNECTIONS_OUT),
     };
 
+    struct Options
+    {
+        ServiceFlags nLocalServices = NODE_NONE;
+        ServiceFlags nRelevantServices = NODE_NONE;
+        int nMaxConnections = 0;
+        int nMaxOutbound = 0;
+        int nBestHeight = 0;
+        CClientUIInterface* uiInterface = nullptr;
+    };
     CConnman();
     ~CConnman();
-    bool Start(boost::thread_group& threadGroup, CScheduler& scheduler, ServiceFlags nLocalServicesIn, ServiceFlags nRelevantServicesIn, int nMaxConnectionsIn, int nMaxOutboundIn, int nBestHeightIn, CClientUIInterface* interfaceIn, std::string& strNodeError);
+    bool Start(boost::thread_group& threadGroup, CScheduler& scheduler, std::string& strNodeError, Options options);
     void Stop();
     bool BindListenPort(const CService &bindAddr, std::string& strError, bool fWhitelisted = false);
     bool OpenNetworkConnection(const CAddress& addrConnect, bool fCountFailure, CSemaphoreGrant *grantOutbound = NULL, const char *strDest = NULL, bool fOneShot = false, bool fFeeler = false);

From fa2f8bc47fa17deccb281b750ff6c48402c5b1ce Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Fri, 27 May 2016 00:00:02 -0400
Subject: [PATCH 0860/1802] net: add nSendBufferMaxSize/nReceiveFloodSize to
 CConnection::Options

---
 src/init.cpp | 2 ++
 src/net.cpp  | 4 ++--
 src/net.h    | 2 ++
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/init.cpp b/src/init.cpp
index e1080364393df..8f7cef20c1266 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -1522,6 +1522,8 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
     connOptions.nMaxOutbound = std::min(MAX_OUTBOUND_CONNECTIONS, connOptions.nMaxConnections);
     connOptions.nBestHeight = chainActive.Height();
     connOptions.uiInterface = &uiInterface;
+    connOptions.nSendBufferMaxSize = 1000*GetArg("-maxsendbuffer", DEFAULT_MAXSENDBUFFER);
+    connOptions.nReceiveFloodSize = 1000*GetArg("-maxreceivebuffer", DEFAULT_MAXRECEIVEBUFFER);
 
     if(!connman.Start(threadGroup, scheduler, strNodeError, connOptions))
         return InitError(strNodeError);
diff --git a/src/net.cpp b/src/net.cpp
index 8ea600b371cae..9b18a32743b4f 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -2063,8 +2063,8 @@ bool CConnman::Start(boost::thread_group& threadGroup, CScheduler& scheduler, st
     nMaxConnections = connOptions.nMaxConnections;
     nMaxOutbound = std::min((connOptions.nMaxOutbound), nMaxConnections);
 
-    nSendBufferMaxSize = 1000*GetArg("-maxsendbuffer", DEFAULT_MAXSENDBUFFER);
-    nReceiveFloodSize = 1000*GetArg("-maxreceivebuffer", DEFAULT_MAXRECEIVEBUFFER);
+    nSendBufferMaxSize = connOptions.nSendBufferMaxSize;
+    nReceiveFloodSize = connOptions.nSendBufferMaxSize;
 
     SetBestHeight(connOptions.nBestHeight);
 
diff --git a/src/net.h b/src/net.h
index 8067ee68a7d39..a50066da9a9ab 100644
--- a/src/net.h
+++ b/src/net.h
@@ -117,6 +117,8 @@ class CConnman
         int nMaxOutbound = 0;
         int nBestHeight = 0;
         CClientUIInterface* uiInterface = nullptr;
+        unsigned int nSendBufferMaxSize = 0;
+        unsigned int nReceiveFloodSize = 0;
     };
     CConnman();
     ~CConnman();

From 98591c50273b13cfc5419548b527280d6a84a43d Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Fri, 27 May 2016 01:00:01 -0400
Subject: [PATCH 0861/1802] net: move vNodesDisconnected into CConnman

---
 src/net.cpp | 2 --
 src/net.h   | 1 +
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/net.cpp b/src/net.cpp
index 9b18a32743b4f..508b0dd962e90 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -820,8 +820,6 @@ size_t SocketSendData(CNode *pnode)
     return nSentSize;
 }
 
-static std::list<CNode*> vNodesDisconnected;
-
 struct NodeEvictionCandidate
 {
     NodeId id;
diff --git a/src/net.h b/src/net.h
index a50066da9a9ab..018126d67706a 100644
--- a/src/net.h
+++ b/src/net.h
@@ -292,6 +292,7 @@ class CConnman
     std::vector<std::string> vAddedNodes;
     CCriticalSection cs_vAddedNodes;
     std::vector<CNode*> vNodes;
+    std::list<CNode*> vNodesDisconnected;
     mutable CCriticalSection cs_vNodes;
     std::atomic<NodeId> nLastNodeId;
     boost::condition_variable messageHandlerCondition;

From d1a2295f0d58423652b124b48fc887a9721b765c Mon Sep 17 00:00:00 2001
From: Jeremy Rubin <jeremy.l.rubin@gmail.com>
Date: Wed, 15 Jun 2016 19:28:04 -0400
Subject: [PATCH 0862/1802] Made the ForEachNode* functions in src/net.cpp more
 pragmatic and self documenting

---
 src/main.cpp               |  3 ---
 src/net.cpp                | 37 +++++++++++++++++++++++++++++++++----
 src/net.h                  | 12 ++++++++----
 src/rpc/misc.cpp           |  1 -
 src/rpc/net.cpp            |  1 -
 src/rpc/rawtransaction.cpp |  1 -
 src/wallet/wallet.cpp      |  1 -
 7 files changed, 41 insertions(+), 15 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index 1835d9712b025..e4c9ce5626a43 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -3091,7 +3091,6 @@ bool ActivateBestChain(CValidationState &state, const CChainParams& chainparams,
                                 pnode->PushBlockHash(hash);
                             }
                         }
-                        return true;
                     });
                 }
                 // Notify external listeners about the new tip.
@@ -4727,7 +4726,6 @@ static void RelayTransaction(const CTransaction& tx, CConnman& connman)
     connman.ForEachNode([&inv](CNode* pnode)
     {
         pnode->PushInventory(inv);
-        return true;
     });
 }
 
@@ -4749,7 +4747,6 @@ static void RelayAddress(const CAddress& addr, bool fReachable, CConnman& connma
             uint64_t hashKey = CSipHasher(hasher).Write(pnode->id).Finalize();
             mapMix.emplace(hashKey, pnode);
         }
-        return true;
     };
 
     auto pushfunc = [&addr, &mapMix, &nRelayNodes] {
diff --git a/src/net.cpp b/src/net.cpp
index 508b0dd962e90..bf5cc07db1927 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -2697,7 +2697,7 @@ bool CConnman::ForNode(NodeId id, std::function<bool(CNode* pnode)> func)
     return found != nullptr && func(found);
 }
 
-bool CConnman::ForEachNode(std::function<bool(CNode* pnode)> func)
+bool CConnman::ForEachNodeContinueIf(std::function<bool(CNode* pnode)> func)
 {
     LOCK(cs_vNodes);
     for (auto&& node : vNodes)
@@ -2706,7 +2706,7 @@ bool CConnman::ForEachNode(std::function<bool(CNode* pnode)> func)
     return true;
 }
 
-bool CConnman::ForEachNode(std::function<bool(const CNode* pnode)> func) const
+bool CConnman::ForEachNodeContinueIf(std::function<bool(const CNode* pnode)> func) const
 {
     LOCK(cs_vNodes);
     for (const auto& node : vNodes)
@@ -2715,7 +2715,7 @@ bool CConnman::ForEachNode(std::function<bool(const CNode* pnode)> func) const
     return true;
 }
 
-bool CConnman::ForEachNodeThen(std::function<bool(CNode* pnode)> pre, std::function<void()> post)
+bool CConnman::ForEachNodeContinueIfThen(std::function<bool(CNode* pnode)> pre, std::function<void()> post)
 {
     bool ret = true;
     LOCK(cs_vNodes);
@@ -2728,7 +2728,7 @@ bool CConnman::ForEachNodeThen(std::function<bool(CNode* pnode)> pre, std::funct
     return ret;
 }
 
-bool CConnman::ForEachNodeThen(std::function<bool(const CNode* pnode)> pre, std::function<void()> post) const
+bool CConnman::ForEachNodeContinueIfThen(std::function<bool(const CNode* pnode)> pre, std::function<void()> post) const
 {
     bool ret = true;
     LOCK(cs_vNodes);
@@ -2741,6 +2741,35 @@ bool CConnman::ForEachNodeThen(std::function<bool(const CNode* pnode)> pre, std:
     return ret;
 }
 
+void CConnman::ForEachNode(std::function<void(CNode* pnode)> func)
+{
+    LOCK(cs_vNodes);
+    for (auto&& node : vNodes)
+        func(node);
+}
+
+void CConnman::ForEachNode(std::function<void(const CNode* pnode)> func) const
+{
+    LOCK(cs_vNodes);
+    for (const auto& node : vNodes)
+        func(node);
+}
+
+void CConnman::ForEachNodeThen(std::function<void(CNode* pnode)> pre, std::function<void()> post)
+{
+    LOCK(cs_vNodes);
+    for (auto&& node : vNodes)
+		pre(node);
+    post();
+}
+
+void CConnman::ForEachNodeThen(std::function<void(const CNode* pnode)> pre, std::function<void()> post) const
+{
+    LOCK(cs_vNodes);
+    for (const auto& node : vNodes)
+		pre(node);
+    post();
+}
 int64_t PoissonNextSend(int64_t nNow, int average_interval_seconds) {
     return nNow + (int64_t)(log1p(GetRand(1ULL << 48) * -0.0000000000000035527136788 /* -1/2^48 */) * average_interval_seconds * -1000000.0 + 0.5);
 }
diff --git a/src/net.h b/src/net.h
index 018126d67706a..6ee0430f2214c 100644
--- a/src/net.h
+++ b/src/net.h
@@ -129,10 +129,14 @@ class CConnman
     bool CheckIncomingNonce(uint64_t nonce);
 
     bool ForNode(NodeId id, std::function<bool(CNode* pnode)> func);
-    bool ForEachNode(std::function<bool(CNode* pnode)> func);
-    bool ForEachNode(std::function<bool(const CNode* pnode)> func) const;
-    bool ForEachNodeThen(std::function<bool(CNode* pnode)> pre, std::function<void()> post);
-    bool ForEachNodeThen(std::function<bool(const CNode* pnode)> pre, std::function<void()> post) const;
+    bool ForEachNodeContinueIf(std::function<bool(CNode* pnode)> func);
+    bool ForEachNodeContinueIf(std::function<bool(const CNode* pnode)> func) const;
+    bool ForEachNodeContinueIfThen(std::function<bool(CNode* pnode)> pre, std::function<void()> post);
+    bool ForEachNodeContinueIfThen(std::function<bool(const CNode* pnode)> pre, std::function<void()> post) const;
+    void ForEachNode(std::function<void(CNode* pnode)> func);
+    void ForEachNode(std::function<void(const CNode* pnode)> func) const;
+    void ForEachNodeThen(std::function<void(CNode* pnode)> pre, std::function<void()> post);
+    void ForEachNodeThen(std::function<void(const CNode* pnode)> pre, std::function<void()> post) const;
 
     void RelayTransaction(const CTransaction& tx);
 
diff --git a/src/rpc/misc.cpp b/src/rpc/misc.cpp
index ffd377b4892fd..2b5782367ce16 100644
--- a/src/rpc/misc.cpp
+++ b/src/rpc/misc.cpp
@@ -481,7 +481,6 @@ UniValue setmocktime(const UniValue& params, bool fHelp)
     if(g_connman) {
         g_connman->ForEachNode([t](CNode* pnode) {
             pnode->nLastSend = pnode->nLastRecv = t;
-            return true;
         });
     }
 
diff --git a/src/rpc/net.cpp b/src/rpc/net.cpp
index 61b6b62c9a0b6..b011029f51c29 100644
--- a/src/rpc/net.cpp
+++ b/src/rpc/net.cpp
@@ -61,7 +61,6 @@ UniValue ping(const UniValue& params, bool fHelp)
     // Request that each node send a ping during next message processing pass
     g_connman->ForEachNode([](CNode* pnode) {
         pnode->fPingQueued = true;
-        return true;
     });
     return NullUniValue;
 }
diff --git a/src/rpc/rawtransaction.cpp b/src/rpc/rawtransaction.cpp
index 3daf1681f314a..d2ad0a52b7004 100644
--- a/src/rpc/rawtransaction.cpp
+++ b/src/rpc/rawtransaction.cpp
@@ -898,7 +898,6 @@ UniValue sendrawtransaction(const UniValue& params, bool fHelp)
     g_connman->ForEachNode([&inv](CNode* pnode)
     {
         pnode->PushInventory(inv);
-        return true;
     });
     return hashTx.GetHex();
 }
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index fd8b056bfca03..60ac2ea16611b 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -1465,7 +1465,6 @@ bool CWalletTx::RelayWalletTransaction(CConnman* connman)
                 connman->ForEachNode([&inv](CNode* pnode)
                 {
                     pnode->PushInventory(inv);
-                    return true;
                 });
                 return true;
             }

From e700cd0bc885340563df9e6b7a5b6c6603b8c984 Mon Sep 17 00:00:00 2001
From: Jeremy Rubin <jeremy.l.rubin@gmail.com>
Date: Sun, 19 Jun 2016 21:42:15 -0400
Subject: [PATCH 0863/1802] Convert ForEachNode* functions to take a templated
 function argument rather than a std::function to eliminate std::function
 overhead

---
 src/net.cpp | 73 -------------------------------------------
 src/net.h   | 90 ++++++++++++++++++++++++++++++++++++++++++++++++-----
 2 files changed, 82 insertions(+), 81 deletions(-)

diff --git a/src/net.cpp b/src/net.cpp
index bf5cc07db1927..19c14e105e597 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -2697,79 +2697,6 @@ bool CConnman::ForNode(NodeId id, std::function<bool(CNode* pnode)> func)
     return found != nullptr && func(found);
 }
 
-bool CConnman::ForEachNodeContinueIf(std::function<bool(CNode* pnode)> func)
-{
-    LOCK(cs_vNodes);
-    for (auto&& node : vNodes)
-        if(!func(node))
-            return false;
-    return true;
-}
-
-bool CConnman::ForEachNodeContinueIf(std::function<bool(const CNode* pnode)> func) const
-{
-    LOCK(cs_vNodes);
-    for (const auto& node : vNodes)
-        if(!func(node))
-            return false;
-    return true;
-}
-
-bool CConnman::ForEachNodeContinueIfThen(std::function<bool(CNode* pnode)> pre, std::function<void()> post)
-{
-    bool ret = true;
-    LOCK(cs_vNodes);
-    for (auto&& node : vNodes)
-        if(!pre(node)) {
-            ret = false;
-            break;
-        }
-    post();
-    return ret;
-}
-
-bool CConnman::ForEachNodeContinueIfThen(std::function<bool(const CNode* pnode)> pre, std::function<void()> post) const
-{
-    bool ret = true;
-    LOCK(cs_vNodes);
-    for (const auto& node : vNodes)
-        if(!pre(node)) {
-            ret = false;
-            break;
-        }
-    post();
-    return ret;
-}
-
-void CConnman::ForEachNode(std::function<void(CNode* pnode)> func)
-{
-    LOCK(cs_vNodes);
-    for (auto&& node : vNodes)
-        func(node);
-}
-
-void CConnman::ForEachNode(std::function<void(const CNode* pnode)> func) const
-{
-    LOCK(cs_vNodes);
-    for (const auto& node : vNodes)
-        func(node);
-}
-
-void CConnman::ForEachNodeThen(std::function<void(CNode* pnode)> pre, std::function<void()> post)
-{
-    LOCK(cs_vNodes);
-    for (auto&& node : vNodes)
-		pre(node);
-    post();
-}
-
-void CConnman::ForEachNodeThen(std::function<void(const CNode* pnode)> pre, std::function<void()> post) const
-{
-    LOCK(cs_vNodes);
-    for (const auto& node : vNodes)
-		pre(node);
-    post();
-}
 int64_t PoissonNextSend(int64_t nNow, int average_interval_seconds) {
     return nNow + (int64_t)(log1p(GetRand(1ULL << 48) * -0.0000000000000035527136788 /* -1/2^48 */) * average_interval_seconds * -1000000.0 + 0.5);
 }
diff --git a/src/net.h b/src/net.h
index 6ee0430f2214c..97604ca56e679 100644
--- a/src/net.h
+++ b/src/net.h
@@ -129,14 +129,88 @@ class CConnman
     bool CheckIncomingNonce(uint64_t nonce);
 
     bool ForNode(NodeId id, std::function<bool(CNode* pnode)> func);
-    bool ForEachNodeContinueIf(std::function<bool(CNode* pnode)> func);
-    bool ForEachNodeContinueIf(std::function<bool(const CNode* pnode)> func) const;
-    bool ForEachNodeContinueIfThen(std::function<bool(CNode* pnode)> pre, std::function<void()> post);
-    bool ForEachNodeContinueIfThen(std::function<bool(const CNode* pnode)> pre, std::function<void()> post) const;
-    void ForEachNode(std::function<void(CNode* pnode)> func);
-    void ForEachNode(std::function<void(const CNode* pnode)> func) const;
-    void ForEachNodeThen(std::function<void(CNode* pnode)> pre, std::function<void()> post);
-    void ForEachNodeThen(std::function<void(const CNode* pnode)> pre, std::function<void()> post) const;
+
+    template<typename Callable>
+    bool ForEachNodeContinueIf(Callable&& func)
+    {
+        LOCK(cs_vNodes);
+        for (auto&& node : vNodes)
+            if(!func(node))
+                return false;
+        return true;
+    };
+
+    template<typename Callable>
+    bool ForEachNodeContinueIf(Callable&& func) const
+    {
+        LOCK(cs_vNodes);
+        for (const auto& node : vNodes)
+            if(!func(node))
+                return false;
+        return true;
+    };
+
+    template<typename Callable, typename CallableAfter>
+    bool ForEachNodeContinueIfThen(Callable&& pre, CallableAfter&& post)
+    {
+        bool ret = true;
+        LOCK(cs_vNodes);
+        for (auto&& node : vNodes)
+            if(!pre(node)) {
+                ret = false;
+                break;
+            }
+        post();
+        return ret;
+    };
+
+    template<typename Callable, typename CallableAfter>
+    bool ForEachNodeContinueIfThen(Callable&& pre, CallableAfter&& post) const
+    {
+        bool ret = true;
+        LOCK(cs_vNodes);
+        for (const auto& node : vNodes)
+            if(!pre(node)) {
+                ret = false;
+                break;
+            }
+        post();
+        return ret;
+    };
+
+    template<typename Callable>
+    void ForEachNode(Callable&& func)
+    {
+        LOCK(cs_vNodes);
+        for (auto&& node : vNodes)
+            func(node);
+    };
+
+    template<typename Callable>
+    void ForEachNode(Callable&& func) const
+    {
+        LOCK(cs_vNodes);
+        for (const auto& node : vNodes)
+            func(node);
+    };
+
+    template<typename Callable, typename CallableAfter>
+    void ForEachNodeThen(Callable&& pre, CallableAfter&& post)
+    {
+        LOCK(cs_vNodes);
+        for (auto&& node : vNodes)
+            pre(node);
+        post();
+    };
+
+    template<typename Callable, typename CallableAfter>
+    void ForEachNodeThen(Callable&& pre, CallableAfter&& post) const
+    {
+        LOCK(cs_vNodes);
+        for (const auto& node : vNodes)
+            pre(node);
+        post();
+    };
 
     void RelayTransaction(const CTransaction& tx);
 

From 0103c5b90fa61b5d159a825fcb5a05ca31d0d1c3 Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Wed, 31 Aug 2016 13:17:28 -0400
Subject: [PATCH 0864/1802] net: move MAX_FEELER_CONNECTIONS into connman

---
 src/init.cpp |  1 +
 src/net.cpp  | 14 +++++---------
 src/net.h    |  2 ++
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/init.cpp b/src/init.cpp
index 8f7cef20c1266..a8b2cde36bb72 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -1520,6 +1520,7 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
     connOptions.nRelevantServices = nRelevantServices;
     connOptions.nMaxConnections = nMaxConnections;
     connOptions.nMaxOutbound = std::min(MAX_OUTBOUND_CONNECTIONS, connOptions.nMaxConnections);
+    connOptions.nMaxFeeler = 1;
     connOptions.nBestHeight = chainActive.Height();
     connOptions.uiInterface = &uiInterface;
     connOptions.nSendBufferMaxSize = 1000*GetArg("-maxsendbuffer", DEFAULT_MAXSENDBUFFER);
diff --git a/src/net.cpp b/src/net.cpp
index 19c14e105e597..b39ef9f54a1af 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -61,11 +61,6 @@
 #endif
 #endif
 
-
-namespace {
-    const int MAX_FEELER_CONNECTIONS = 1;
-}
-
 const static std::string NET_MESSAGE_COMMAND_OTHER = "*other*";
 
 //
@@ -971,7 +966,7 @@ void CConnman::AcceptConnection(const ListenSocket& hListenSocket) {
     SOCKET hSocket = accept(hListenSocket.socket, (struct sockaddr*)&sockaddr, &len);
     CAddress addr;
     int nInbound = 0;
-    int nMaxInbound = nMaxConnections - (nMaxOutbound + MAX_FEELER_CONNECTIONS);
+    int nMaxInbound = nMaxConnections - (nMaxOutbound + nMaxFeeler);
     assert(nMaxInbound > 0);
 
     if (hSocket != INVALID_SOCKET)
@@ -1624,7 +1619,7 @@ void CConnman::ThreadOpenConnections()
                 }
             }
         }
-        assert(nOutbound <= (nMaxOutbound + MAX_FEELER_CONNECTIONS));
+        assert(nOutbound <= (nMaxOutbound + nMaxFeeler));
 
         // Feeler Connections
         //
@@ -2060,6 +2055,7 @@ bool CConnman::Start(boost::thread_group& threadGroup, CScheduler& scheduler, st
     nLocalServices = connOptions.nLocalServices;
     nMaxConnections = connOptions.nMaxConnections;
     nMaxOutbound = std::min((connOptions.nMaxOutbound), nMaxConnections);
+    nMaxFeeler = connOptions.nMaxFeeler;
 
     nSendBufferMaxSize = connOptions.nSendBufferMaxSize;
     nReceiveFloodSize = connOptions.nSendBufferMaxSize;
@@ -2106,7 +2102,7 @@ bool CConnman::Start(boost::thread_group& threadGroup, CScheduler& scheduler, st
 
     if (semOutbound == NULL) {
         // initialize semaphore
-        semOutbound = new CSemaphore(std::min((nMaxOutbound + MAX_FEELER_CONNECTIONS), nMaxConnections));
+        semOutbound = new CSemaphore(std::min((nMaxOutbound + nMaxFeeler), nMaxConnections));
     }
 
     if (pnodeLocalHost == NULL) {
@@ -2162,7 +2158,7 @@ void CConnman::Stop()
 {
     LogPrintf("%s\n",__func__);
     if (semOutbound)
-        for (int i=0; i<(nMaxOutbound + MAX_FEELER_CONNECTIONS); i++)
+        for (int i=0; i<(nMaxOutbound + nMaxFeeler); i++)
             semOutbound->post();
 
     if (fAddressesInitialized)
diff --git a/src/net.h b/src/net.h
index 97604ca56e679..a48ee02c44906 100644
--- a/src/net.h
+++ b/src/net.h
@@ -115,6 +115,7 @@ class CConnman
         ServiceFlags nRelevantServices = NODE_NONE;
         int nMaxConnections = 0;
         int nMaxOutbound = 0;
+        int nMaxFeeler = 0;
         int nBestHeight = 0;
         CClientUIInterface* uiInterface = nullptr;
         unsigned int nSendBufferMaxSize = 0;
@@ -384,6 +385,7 @@ class CConnman
     CSemaphore *semOutbound;
     int nMaxConnections;
     int nMaxOutbound;
+    int nMaxFeeler;
     std::atomic<int> nBestHeight;
     CClientUIInterface* clientInterface;
 };

From 64d9507ea5724634783cdaa290943292132086a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pavel=20Jan=C3=ADk?= <Pavel@Janik.cz>
Date: Fri, 2 Sep 2016 22:05:47 +0200
Subject: [PATCH 0865/1802] [WIP] Remove unused statement in serialization

---
 src/addrdb.h                      | 1 -
 src/qt/recentrequeststablemodel.h | 1 -
 src/qt/walletmodel.h              | 1 -
 src/wallet/wallet.h               | 1 -
 src/wallet/walletdb.h             | 2 --
 5 files changed, 6 deletions(-)

diff --git a/src/addrdb.h b/src/addrdb.h
index d8c66d872bb18..62835a6fb40d4 100644
--- a/src/addrdb.h
+++ b/src/addrdb.h
@@ -48,7 +48,6 @@ class CBanEntry
     template <typename Stream, typename Operation>
     inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) {
         READWRITE(this->nVersion);
-        nVersion = this->nVersion;
         READWRITE(nCreateTime);
         READWRITE(nBanUntil);
         READWRITE(banReason);
diff --git a/src/qt/recentrequeststablemodel.h b/src/qt/recentrequeststablemodel.h
index f3cf03f4e3d1b..0193e748d75c2 100644
--- a/src/qt/recentrequeststablemodel.h
+++ b/src/qt/recentrequeststablemodel.h
@@ -31,7 +31,6 @@ class RecentRequestEntry
         unsigned int nDate = date.toTime_t();
 
         READWRITE(this->nVersion);
-        nVersion = this->nVersion;
         READWRITE(id);
         READWRITE(nDate);
         READWRITE(recipient);
diff --git a/src/qt/walletmodel.h b/src/qt/walletmodel.h
index a15ecf899b87a..6515faceac635 100644
--- a/src/qt/walletmodel.h
+++ b/src/qt/walletmodel.h
@@ -75,7 +75,6 @@ class SendCoinsRecipient
         std::string sAuthenticatedMerchant = authenticatedMerchant.toStdString();
 
         READWRITE(this->nVersion);
-        nVersion = this->nVersion;
         READWRITE(sAddress);
         READWRITE(sLabel);
         READWRITE(amount);
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
index 7a771350cba43..016e4a3d74ff4 100644
--- a/src/wallet/wallet.h
+++ b/src/wallet/wallet.h
@@ -194,7 +194,6 @@ class CMerkleTx : public CTransaction
     inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) {
         std::vector<uint256> vMerkleBranch; // For compatibility with older versions.
         READWRITE(*(CTransaction*)this);
-        nVersion = this->nVersion;
         READWRITE(hashBlock);
         READWRITE(vMerkleBranch);
         READWRITE(nIndex);
diff --git a/src/wallet/walletdb.h b/src/wallet/walletdb.h
index 5addd5c5c0225..9c9d4922a40a3 100644
--- a/src/wallet/walletdb.h
+++ b/src/wallet/walletdb.h
@@ -57,7 +57,6 @@ class CHDChain
     inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion)
     {
         READWRITE(this->nVersion);
-        nVersion = this->nVersion;
         READWRITE(nExternalChainCounter);
         READWRITE(masterKeyID);
     }
@@ -96,7 +95,6 @@ class CKeyMetadata
     template <typename Stream, typename Operation>
     inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) {
         READWRITE(this->nVersion);
-        nVersion = this->nVersion;
         READWRITE(nCreateTime);
         if (this->nVersion >= VERSION_WITH_HDDATA)
         {

From 62ffbbdec30699941069baeae61716ff12155ba6 Mon Sep 17 00:00:00 2001
From: instagibbs <gsanders87@gmail.com>
Date: Fri, 9 Sep 2016 12:13:18 -0400
Subject: [PATCH 0866/1802] add witness address to address book

---
 src/wallet/rpcwallet.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index 0ba6706baf830..533220ff85dc0 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -1087,6 +1087,8 @@ UniValue addwitnessaddress(const UniValue& params, bool fHelp)
         throw JSONRPCError(RPC_WALLET_ERROR, "Public key or redeemscript not known to wallet");
     }
 
+    pwalletMain->SetAddressBook(w.result, "", "receive");
+
     return CBitcoinAddress(w.result).ToString();
 }
 

From 1d635ae61b26d1dd613c1cc1cac796627af2a31e Mon Sep 17 00:00:00 2001
From: rodasmith <rodasmith@users.noreply.github.com>
Date: Sat, 10 Sep 2016 11:41:01 -0700
Subject: [PATCH 0867/1802] fix op order to append first alert

---
 src/main.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index cb6e942272994..593897f5163c1 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -4659,12 +4659,12 @@ std::string GetWarnings(const std::string& strFor)
     if (fLargeWorkForkFound)
     {
         strStatusBar = strRPC = "Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.";
-        strGUI += strGUI.empty() ? "" : uiAlertSeperator + _("Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.");
+        strGUI += (strGUI.empty() ? "" : uiAlertSeperator) + _("Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.");
     }
     else if (fLargeWorkInvalidChainFound)
     {
         strStatusBar = strRPC = "Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.";
-        strGUI += strGUI.empty() ? "" : uiAlertSeperator + _("Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.");
+        strGUI += (strGUI.empty() ? "" : uiAlertSeperator) + _("Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.");
     }
 
     if (strFor == "gui")

From 159597a2b8967c8bc8106d98705d68932500b58a Mon Sep 17 00:00:00 2001
From: isle2983 <isle2983@yahoo.com>
Date: Wed, 7 Sep 2016 19:21:41 -0600
Subject: [PATCH 0868/1802] [devtools] script support for managing source file
 copyright headers

Three subcommands to this script:

1) ./copyright_header.py report

Examines git-tracked files with extensions that match:

INCLUDE = ['*.h', '*.cpp', '*.cc', '*.c', '*.py']

Helps to:

-> Identify source files without copyright
-> Identify source files added with something other than "The Bitcoin Core
developers" holder so we can be sure it is appropriate
-> Identify unintentional typos in the copyright line

2) ./copyright_header.py update

Replaces fix-copyright-headers.py. It does file editing in native python
rather than subprocessing out to perl as was the case with
fix-copyright-headers.py. It also shares code with the 'report' functions.

3) ./copyright_header.py insert

Inserts a copyright header into a source file with the proper format and
dates.
---
 contrib/devtools/README.md                |  61 ++-
 contrib/devtools/copyright_header.py      | 610 ++++++++++++++++++++++
 contrib/devtools/fix-copyright-headers.py |  67 ---
 3 files changed, 662 insertions(+), 76 deletions(-)
 create mode 100755 contrib/devtools/copyright_header.py
 delete mode 100755 contrib/devtools/fix-copyright-headers.py

diff --git a/contrib/devtools/README.md b/contrib/devtools/README.md
index af5c000b0305e..b13dc6d3f0fc7 100644
--- a/contrib/devtools/README.md
+++ b/contrib/devtools/README.md
@@ -24,21 +24,64 @@ the script should be called from the git root folder as follows.
 ```
 git diff -U0 HEAD~1.. | ./contrib/devtools/clang-format-diff.py -p1 -i -v
 ```
+copyright\_header.py
+====================
 
-fix-copyright-headers.py
-========================
+Provides utilities for managing copyright headers of `The Bitcoin Core
+developers` in repository source files. It has three subcommands:
 
-Every year newly updated files need to have its copyright headers updated to reflect the current year.
-If you run this script from the root folder it will automatically update the year on the copyright header for all
-source files if these have a git commit from the current year.
+```
+$ ./copyright_header.py report <base_directory> [verbose]
+$ ./copyright_header.py update <base_directory>
+$ ./copyright_header.py insert <file>
+```
+Running these subcommands without arguments displays a usage string.
 
-For example a file changed in 2015 (with 2015 being the current year):
+copyright\_header.py report \<base\_directory\> [verbose]
+---------------------------------------------------------
 
-```// Copyright (c) 2009-2013 The Bitcoin Core developers```
+Produces a report of all copyright header notices found inside the source files
+of a repository. Useful to quickly visualize the state of the headers.
+Specifying `verbose` will list the full filenames of files of each category.
 
-would be changed to:
+copyright\_header.py update \<base\_directory\> [verbose]
+---------------------------------------------------------
+Updates all the copyright headers of `The Bitcoin Core developers` which were
+changed in a year more recent than is listed. For example:
+```
+// Copyright (c) <firstYear>-<lastYear> The Bitcoin Core developers
+```
+will be updated to:
+```
+// Copyright (c) <firstYear>-<lastModifiedYear> The Bitcoin Core developers
+```
+where `<lastModifiedYear>` is obtained from the `git log` history.
 
-```// Copyright (c) 2009-2015 The Bitcoin Core developers```
+This subcommand also handles copyright headers that have only a single year. In
+those cases:
+```
+// Copyright (c) <year> The Bitcoin Core developers
+```
+will be updated to:
+```
+// Copyright (c) <year>-<lastModifiedYear> The Bitcoin Core developers
+```
+where the update is appropriate.
+
+copyright\_header.py insert \<file\>
+------------------------------------
+Inserts a copyright header for `The Bitcoin Core developers` at the top of the
+file in either Python or C++ style as determined by the file extension. If the
+file is a Python file and it has  `#!` starting the first line, the header is
+inserted in the line below it.
+
+The copyright dates will be set to be `<year_introduced>-<current_year>` where
+`<year_introduced>` is according to the `git log` history. If
+`<year_introduced>` is equal to `<current_year>`, it will be set as a single
+year rather than two hyphenated years.
+
+If the file already has a copyright for `The Bitcoin Core developers`, the
+script will exit.
 
 git-subtree-check.sh
 ====================
diff --git a/contrib/devtools/copyright_header.py b/contrib/devtools/copyright_header.py
new file mode 100755
index 0000000000000..9f35c378bf54f
--- /dev/null
+++ b/contrib/devtools/copyright_header.py
@@ -0,0 +1,610 @@
+#!/usr/bin/env python3
+# Copyright (c) 2016 The Bitcoin Core developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+import re
+import fnmatch
+import sys
+import subprocess
+import datetime
+import os
+
+################################################################################
+# file filtering
+################################################################################
+
+EXCLUDE = [
+    # libsecp256k1:
+    'src/secp256k1/include/secp256k1.h',
+    'src/secp256k1/include/secp256k1_ecdh.h',
+    'src/secp256k1/include/secp256k1_recovery.h',
+    'src/secp256k1/include/secp256k1_schnorr.h',
+    'src/secp256k1/src/java/org_bitcoin_NativeSecp256k1.c',
+    'src/secp256k1/src/java/org_bitcoin_NativeSecp256k1.h',
+    'src/secp256k1/src/java/org_bitcoin_Secp256k1Context.c',
+    'src/secp256k1/src/java/org_bitcoin_Secp256k1Context.h',
+    # auto generated:
+    'src/univalue/lib/univalue_escapes.h',
+    'src/qt/bitcoinstrings.cpp',
+    'src/chainparamsseeds.h',
+    # other external copyrights:
+    'src/tinyformat.h',
+    'src/leveldb/util/env_win.cc',
+    'src/crypto/ctaes/bench.c',
+    'qa/rpc-tests/test_framework/bignum.py',
+    # python init:
+    '*__init__.py',
+]
+EXCLUDE_COMPILED = re.compile('|'.join([fnmatch.translate(m) for m in EXCLUDE]))
+
+INCLUDE = ['*.h', '*.cpp', '*.cc', '*.c', '*.py']
+INCLUDE_COMPILED = re.compile('|'.join([fnmatch.translate(m) for m in INCLUDE]))
+
+def applies_to_file(filename):
+    return ((EXCLUDE_COMPILED.match(filename) is None) and
+            (INCLUDE_COMPILED.match(filename) is not None))
+
+################################################################################
+# obtain list of files in repo according to INCLUDE and EXCLUDE
+################################################################################
+
+GIT_LS_CMD = 'git ls-files'
+
+def call_git_ls():
+    out = subprocess.check_output(GIT_LS_CMD.split(' '))
+    return [f for f in out.decode("utf-8").split('\n') if f != '']
+
+def get_filenames_to_examine():
+    filenames = call_git_ls()
+    return sorted([filename for filename in filenames if
+                   applies_to_file(filename)])
+
+################################################################################
+# define and compile regexes for the patterns we are looking for
+################################################################################
+
+
+COPYRIGHT_WITH_C = 'Copyright \(c\)'
+COPYRIGHT_WITHOUT_C = 'Copyright'
+ANY_COPYRIGHT_STYLE = '(%s|%s)' % (COPYRIGHT_WITH_C, COPYRIGHT_WITHOUT_C)
+
+YEAR = "20[0-9][0-9]"
+YEAR_RANGE = '(%s)(-%s)?' % (YEAR, YEAR)
+YEAR_LIST = '(%s)(, %s)+' % (YEAR, YEAR)
+ANY_YEAR_STYLE = '(%s|%s)' % (YEAR_RANGE, YEAR_LIST)
+ANY_COPYRIGHT_STYLE_OR_YEAR_STYLE = ("%s %s" % (ANY_COPYRIGHT_STYLE,
+                                                ANY_YEAR_STYLE))
+
+ANY_COPYRIGHT_COMPILED = re.compile(ANY_COPYRIGHT_STYLE_OR_YEAR_STYLE)
+
+def compile_copyright_regex(copyright_style, year_style, name):
+    return re.compile('%s %s %s' % (copyright_style, year_style, name))
+
+EXPECTED_HOLDER_NAMES = [
+    "Satoshi Nakamoto\n",
+    "The Bitcoin Core developers\n",
+    "The Bitcoin Core developers \n",
+    "Bitcoin Core Developers\n",
+    "the Bitcoin Core developers\n",
+    "The Bitcoin developers\n",
+    "The LevelDB Authors\. All rights reserved\.\n",
+    "BitPay Inc\.\n",
+    "BitPay, Inc\.\n",
+    "University of Illinois at Urbana-Champaign\.\n",
+    "MarcoFalke\n",
+    "Pieter Wuille\n",
+    "Pieter Wuille +\*\n",
+    "Pieter Wuille, Gregory Maxwell +\*\n",
+    "Pieter Wuille, Andrew Poelstra +\*\n",
+    "Andrew Poelstra +\*\n",
+    "Wladimir J. van der Laan\n",
+    "Jeff Garzik\n",
+    "Diederik Huys, Pieter Wuille +\*\n",
+    "Thomas Daede, Cory Fields +\*\n",
+    "Jan-Klaas Kollhof\n",
+    "Sam Rushing\n",
+    "ArtForz -- public domain half-a-node\n",
+]
+
+DOMINANT_STYLE_COMPILED = {}
+YEAR_LIST_STYLE_COMPILED = {}
+WITHOUT_C_STYLE_COMPILED = {}
+
+for holder_name in EXPECTED_HOLDER_NAMES:
+    DOMINANT_STYLE_COMPILED[holder_name] = (
+        compile_copyright_regex(COPYRIGHT_WITH_C, YEAR_RANGE, holder_name))
+    YEAR_LIST_STYLE_COMPILED[holder_name] = (
+        compile_copyright_regex(COPYRIGHT_WITH_C, YEAR_LIST, holder_name))
+    WITHOUT_C_STYLE_COMPILED[holder_name] = (
+        compile_copyright_regex(COPYRIGHT_WITHOUT_C, ANY_YEAR_STYLE,
+                                holder_name))
+
+################################################################################
+# search file contents for copyright message of particular category
+################################################################################
+
+def get_count_of_copyrights_of_any_style_any_holder(contents):
+    return len(ANY_COPYRIGHT_COMPILED.findall(contents))
+
+def file_has_dominant_style_copyright_for_holder(contents, holder_name):
+    match = DOMINANT_STYLE_COMPILED[holder_name].search(contents)
+    return match is not None
+
+def file_has_year_list_style_copyright_for_holder(contents, holder_name):
+    match = YEAR_LIST_STYLE_COMPILED[holder_name].search(contents)
+    return match is not None
+
+def file_has_without_c_style_copyright_for_holder(contents, holder_name):
+    match = WITHOUT_C_STYLE_COMPILED[holder_name].search(contents)
+    return match is not None
+
+################################################################################
+# get file info
+################################################################################
+
+def read_file(filename):
+    return open(os.path.abspath(filename), 'r').read()
+
+def gather_file_info(filename):
+    info = {}
+    info['filename'] = filename
+    c = read_file(filename)
+    info['contents'] = c
+
+    info['all_copyrights'] = get_count_of_copyrights_of_any_style_any_holder(c)
+
+    info['classified_copyrights'] = 0
+    info['dominant_style'] = {}
+    info['year_list_style'] = {}
+    info['without_c_style'] = {}
+    for holder_name in EXPECTED_HOLDER_NAMES:
+        has_dominant_style = (
+            file_has_dominant_style_copyright_for_holder(c, holder_name))
+        has_year_list_style = (
+            file_has_year_list_style_copyright_for_holder(c, holder_name))
+        has_without_c_style = (
+            file_has_without_c_style_copyright_for_holder(c, holder_name))
+        info['dominant_style'][holder_name] = has_dominant_style
+        info['year_list_style'][holder_name] = has_year_list_style
+        info['without_c_style'][holder_name] = has_without_c_style
+        if has_dominant_style or has_year_list_style or has_without_c_style:
+            info['classified_copyrights'] = info['classified_copyrights'] + 1
+    return info
+
+################################################################################
+# report execution
+################################################################################
+
+SEPARATOR = '-'.join(['' for _ in range(80)])
+
+def print_filenames(filenames, verbose):
+    if not verbose:
+        return
+    for filename in filenames:
+        print("\t%s" % filename)
+
+def print_report(file_infos, verbose):
+    print(SEPARATOR)
+    examined = [i['filename'] for i in file_infos]
+    print("%d files examined according to INCLUDE and EXCLUDE fnmatch rules" %
+          len(examined))
+    print_filenames(examined, verbose)
+
+    print(SEPARATOR)
+    print('')
+    zero_copyrights = [i['filename'] for i in file_infos if
+                       i['all_copyrights'] == 0]
+    print("%4d with zero copyrights" % len(zero_copyrights))
+    print_filenames(zero_copyrights, verbose)
+    one_copyright = [i['filename'] for i in file_infos if
+                     i['all_copyrights'] == 1]
+    print("%4d with one copyright" % len(one_copyright))
+    print_filenames(one_copyright, verbose)
+    two_copyrights = [i['filename'] for i in file_infos if
+                      i['all_copyrights'] == 2]
+    print("%4d with two copyrights" % len(two_copyrights))
+    print_filenames(two_copyrights, verbose)
+    three_copyrights = [i['filename'] for i in file_infos if
+                        i['all_copyrights'] == 3]
+    print("%4d with three copyrights" % len(three_copyrights))
+    print_filenames(three_copyrights, verbose)
+    four_or_more_copyrights = [i['filename'] for i in file_infos if
+                               i['all_copyrights'] >= 4]
+    print("%4d with four or more copyrights" % len(four_or_more_copyrights))
+    print_filenames(four_or_more_copyrights, verbose)
+    print('')
+    print(SEPARATOR)
+    print('Copyrights with dominant style:\ne.g. "Copyright (c)" and '
+          '"<year>" or "<startYear>-<endYear>":\n')
+    for holder_name in EXPECTED_HOLDER_NAMES:
+        dominant_style = [i['filename'] for i in file_infos if
+                          i['dominant_style'][holder_name]]
+        if len(dominant_style) > 0:
+            print("%4d with '%s'" % (len(dominant_style),
+                                     holder_name.replace('\n', '\\n')))
+            print_filenames(dominant_style, verbose)
+    print('')
+    print(SEPARATOR)
+    print('Copyrights with year list style:\ne.g. "Copyright (c)" and '
+          '"<year1>, <year2>, ...":\n')
+    for holder_name in EXPECTED_HOLDER_NAMES:
+        year_list_style = [i['filename'] for i in file_infos if
+                           i['year_list_style'][holder_name]]
+        if len(year_list_style) > 0:
+            print("%4d with '%s'" % (len(year_list_style),
+                                     holder_name.replace('\n', '\\n')))
+            print_filenames(year_list_style, verbose)
+    print('')
+    print(SEPARATOR)
+    print('Copyrights with no "(c)" style:\ne.g. "Copyright" and "<year>" or '
+          '"<startYear>-<endYear>":\n')
+    for holder_name in EXPECTED_HOLDER_NAMES:
+        without_c_style = [i['filename'] for i in file_infos if
+                           i['without_c_style'][holder_name]]
+        if len(without_c_style) > 0:
+            print("%4d with '%s'" % (len(without_c_style),
+                                     holder_name.replace('\n', '\\n')))
+            print_filenames(without_c_style, verbose)
+
+    print('')
+    print(SEPARATOR)
+
+    unclassified_copyrights = [i['filename'] for i in file_infos if
+                               i['classified_copyrights'] < i['all_copyrights']]
+    print("%d with unexpected copyright holder names" %
+          len(unclassified_copyrights))
+    print_filenames(unclassified_copyrights, verbose)
+    print(SEPARATOR)
+
+def exec_report(base_directory, verbose):
+    original_cwd = os.getcwd()
+    os.chdir(base_directory)
+    filenames = get_filenames_to_examine()
+    file_infos = [gather_file_info(f) for f in filenames]
+    print_report(file_infos, verbose)
+    os.chdir(original_cwd)
+
+################################################################################
+# report cmd
+################################################################################
+
+REPORT_USAGE = """
+Produces a report of all copyright header notices found inside the source files
+of a repository.
+
+Usage:
+    $ ./copyright_header.py report <base_directory> [verbose]
+
+Arguments:
+    <base_directory> - The base directory of a bitcoin source code repository.
+    [verbose] - Includes a list of every file of each subcategory in the report.
+"""
+
+def report_cmd(argv):
+    if len(argv) == 2:
+        sys.exit(REPORT_USAGE)
+        
+    base_directory = argv[2]
+    if not os.path.exists(base_directory):
+        sys.exit("*** bad <base_directory>: %s" % base_directory)
+
+    if len(argv) == 3:
+        verbose = False
+    elif argv[3] == 'verbose':
+        verbose = True
+    else:
+        sys.exit("*** unknown argument: %s" % argv[2])
+
+    exec_report(base_directory, verbose)
+
+################################################################################
+# query git for year of last change
+################################################################################
+
+GIT_LOG_CMD = "git log --pretty=format:%%ai %s"
+
+def call_git_log(filename):
+    out = subprocess.check_output((GIT_LOG_CMD % filename).split(' '))
+    return out.decode("utf-8").split('\n')
+
+def get_git_change_years(filename):
+    git_log_lines = call_git_log(filename)
+    if len(git_log_lines) == 0:
+        return [datetime.date.today().year]
+    # timestamp is in ISO 8601 format. e.g. "2016-09-05 14:25:32 -0600"
+    return [line.split(' ')[0].split('-')[0] for line in git_log_lines]
+
+def get_most_recent_git_change_year(filename):
+    return max(get_git_change_years(filename))
+
+################################################################################
+# read and write to file
+################################################################################
+
+def read_file_lines(filename):
+    f = open(os.path.abspath(filename), 'r')
+    file_lines = f.readlines()
+    f.close()
+    return file_lines
+
+def write_file_lines(filename, file_lines):
+    f = open(os.path.abspath(filename), 'w')
+    f.write(''.join(file_lines))
+    f.close()
+
+################################################################################
+# update header years execution
+################################################################################
+
+COPYRIGHT = 'Copyright \(c\)'
+YEAR = "20[0-9][0-9]"
+YEAR_RANGE = '(%s)(-%s)?' % (YEAR, YEAR)
+HOLDER = 'The Bitcoin Core developers'
+UPDATEABLE_LINE_COMPILED = re.compile(' '.join([COPYRIGHT, YEAR_RANGE, HOLDER]))
+
+def get_updatable_copyright_line(file_lines):
+    index = 0
+    for line in file_lines:
+        if UPDATEABLE_LINE_COMPILED.search(line) is not None:
+            return index, line
+        index = index + 1
+    return None, None
+
+def parse_year_range(year_range):
+    year_split = year_range.split('-')
+    start_year = year_split[0]
+    if len(year_split) == 1:
+        return start_year, start_year
+    return start_year, year_split[1]
+
+def year_range_to_str(start_year, end_year):
+    if start_year == end_year:
+        return start_year
+    return "%s-%s" % (start_year, end_year)
+
+def create_updated_copyright_line(line, last_git_change_year):
+    copyright_splitter = 'Copyright (c) '
+    copyright_split = line.split(copyright_splitter)
+    # Preserve characters on line that are ahead of the start of the copyright
+    # notice - they are part of the comment block and vary from file-to-file.
+    before_copyright = copyright_split[0]
+    after_copyright = copyright_split[1]
+
+    space_split = after_copyright.split(' ')
+    year_range = space_split[0]
+    start_year, end_year = parse_year_range(year_range)
+    if end_year == last_git_change_year:
+        return line
+    return (before_copyright + copyright_splitter +
+            year_range_to_str(start_year, last_git_change_year) + ' ' +
+            ' '.join(space_split[1:]))
+
+def update_updatable_copyright(filename):
+    file_lines = read_file_lines(filename)
+    index, line = get_updatable_copyright_line(file_lines)
+    if not line:
+        print_file_action_message(filename, "No updatable copyright.")
+        return
+    last_git_change_year = get_most_recent_git_change_year(filename)
+    new_line = create_updated_copyright_line(line, last_git_change_year)
+    if line == new_line:
+        print_file_action_message(filename, "Copyright up-to-date.")
+        return
+    file_lines[index] = new_line
+    write_file_lines(filename, file_lines)
+    print_file_action_message(filename,
+                              "Copyright updated! -> %s" % last_git_change_year)
+
+def exec_update_header_year(base_directory):
+    original_cwd = os.getcwd()
+    os.chdir(base_directory)
+    for filename in get_filenames_to_examine():
+        update_updatable_copyright(filename)
+    os.chdir(original_cwd)
+
+################################################################################
+# update cmd
+################################################################################
+
+UPDATE_USAGE = """
+Updates all the copyright headers of "The Bitcoin Core developers" which were
+changed in a year more recent than is listed. For example:
+
+// Copyright (c) <firstYear>-<lastYear> The Bitcoin Core developers
+
+will be updated to:
+
+// Copyright (c) <firstYear>-<lastModifiedYear> The Bitcoin Core developers
+
+where <lastModifiedYear> is obtained from the 'git log' history.
+
+This subcommand also handles copyright headers that have only a single year. In those cases:
+
+// Copyright (c) <year> The Bitcoin Core developers
+
+will be updated to:
+
+// Copyright (c) <year>-<lastModifiedYear> The Bitcoin Core developers
+
+where the update is appropriate.
+
+Usage:
+    $ ./copyright_header.py update <base_directory>
+
+Arguments:
+    <base_directory> - The base directory of a bitcoin source code repository.
+"""
+
+def print_file_action_message(filename, action):
+    print("%-52s %s" % (filename, action))
+
+def update_cmd(argv):
+    if len(argv) != 3:
+        sys.exit(UPDATE_USAGE)
+    
+    base_directory = argv[2]
+    if not os.path.exists(base_directory):
+        sys.exit("*** bad base_directory: %s" % base_directory)
+    exec_update_header_year(base_directory)
+
+################################################################################
+# inserted copyright header format
+################################################################################
+
+def get_header_lines(header, start_year, end_year):
+    lines = header.split('\n')[1:-1]
+    lines[0] = lines[0] % year_range_to_str(start_year, end_year)
+    return [line + '\n' for line in lines]
+
+CPP_HEADER = '''
+// Copyright (c) %s The Bitcoin Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+'''
+
+def get_cpp_header_lines_to_insert(start_year, end_year):
+    return reversed(get_header_lines(CPP_HEADER, start_year, end_year))
+
+PYTHON_HEADER = '''
+# Copyright (c) %s The Bitcoin Core developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or http://www.opensource.org/licenses/mit-license.php.
+'''
+
+def get_python_header_lines_to_insert(start_year, end_year):
+    return reversed(get_header_lines(PYTHON_HEADER, start_year, end_year))
+
+################################################################################
+# query git for year of last change
+################################################################################
+
+def get_git_change_year_range(filename):
+    years = get_git_change_years(filename)
+    return min(years), max(years)
+
+################################################################################
+# check for existing core copyright
+################################################################################
+
+def file_already_has_core_copyright(file_lines):
+    index, _ = get_updatable_copyright_line(file_lines)
+    return index != None
+
+################################################################################
+# insert header execution
+################################################################################
+
+def file_has_hashbang(file_lines):
+    if len(file_lines) < 1:
+        return False
+    if len(file_lines[0]) <= 2:
+        return False
+    return file_lines[0][:2] == '#!'
+
+def insert_python_header(filename, file_lines, start_year, end_year):
+    if file_has_hashbang(file_lines):
+        insert_idx = 1 
+    else:
+        insert_idx = 0
+    header_lines = get_python_header_lines_to_insert(start_year, end_year)
+    for line in header_lines:
+        file_lines.insert(insert_idx, line)
+    write_file_lines(filename, file_lines)
+
+def insert_cpp_header(filename, file_lines, start_year, end_year):
+    header_lines = get_cpp_header_lines_to_insert(start_year, end_year)
+    for line in header_lines:
+        file_lines.insert(0, line)
+    write_file_lines(filename, file_lines)
+
+def exec_insert_header(filename, style):
+    file_lines = read_file_lines(filename)
+    if file_already_has_core_copyright(file_lines):
+        sys.exit('*** %s already has a copyright by The Bitcoin Core developers'
+                 % (filename))
+    start_year, end_year = get_git_change_year_range(filename)
+    if style == 'python':
+        insert_python_header(filename, file_lines, start_year, end_year)
+    else:
+        insert_cpp_header(filename, file_lines, start_year, end_year)
+
+################################################################################
+# insert cmd
+################################################################################
+
+INSERT_USAGE = """
+Inserts a copyright header for "The Bitcoin Core developers" at the top of the
+file in either Python or C++ style as determined by the file extension. If the
+file is a Python file and it has a '#!' starting the first line, the header is
+inserted in the line below it.
+
+The copyright dates will be set to be:
+
+"<year_introduced>-<current_year>"
+
+where <year_introduced> is according to the 'git log' history. If
+<year_introduced> is equal to <current_year>, the date will be set to be:
+
+"<current_year>"
+
+If the file already has a copyright for "The Bitcoin Core developers", the
+script will exit.
+
+Usage:
+    $ ./copyright_header.py insert <file>
+
+Arguments:
+    <file> - A source file in the bitcoin repository.
+"""
+
+def insert_cmd(argv):
+    if len(argv) != 3:
+        sys.exit(INSERT_USAGE)
+
+    filename = argv[2]
+    if not os.path.isfile(filename):
+        sys.exit("*** bad filename: %s" % filename)
+    _, extension = os.path.splitext(filename)
+    if extension not in ['.h', '.cpp', '.cc', '.c', '.py']:
+        sys.exit("*** cannot insert for file extension %s" % extension)
+   
+    if extension == '.py': 
+        style = 'python'
+    else:
+        style = 'cpp'
+    exec_insert_header(filename, style)
+         
+################################################################################
+# UI
+################################################################################
+
+USAGE = """
+copyright_header.py - utilities for managing copyright headers of 'The Bitcoin
+Core developers' in repository source files.
+
+Usage:
+    $ ./copyright_header <subcommand>
+
+Subcommands:
+    report
+    update
+    insert
+
+To see subcommand usage, run them without arguments.
+"""
+
+SUBCOMMANDS = ['report', 'update', 'insert']
+
+if __name__ == "__main__":
+    if len(sys.argv) == 1:
+        sys.exit(USAGE)
+    subcommand = sys.argv[1]
+    if subcommand not in SUBCOMMANDS:
+        sys.exit(USAGE)
+    if subcommand == 'report':
+        report_cmd(sys.argv)
+    elif subcommand == 'update':
+        update_cmd(sys.argv)
+    elif subcommand == 'insert':
+        insert_cmd(sys.argv)
diff --git a/contrib/devtools/fix-copyright-headers.py b/contrib/devtools/fix-copyright-headers.py
deleted file mode 100755
index 54836bd83f592..0000000000000
--- a/contrib/devtools/fix-copyright-headers.py
+++ /dev/null
@@ -1,67 +0,0 @@
-#!/usr/bin/env python3
-"""
-Run this script to update all the copyright headers of files
-that were changed this year.
-
-For example:
-
-// Copyright (c) 2009-2012 The Bitcoin Core developers
-
-it will change it to
-
-// Copyright (c) 2009-2015 The Bitcoin Core developers
-"""
-import subprocess
-import time
-import re
-
-CMD_GIT_LIST_FILES = ['git', 'ls-files']
-CMD_GIT_DATE = ['git', 'log', '--format=%ad', '--date=short', '-1']
-CMD_PERL_REGEX = ['perl', '-pi', '-e']
-REGEX_TEMPLATE = 's/(20\\d\\d)(?:-20\\d\\d)? The Bitcoin/$1-%s The Bitcoin/'
-
-FOLDERS = ["qa/", "src/"]
-EXTENSIONS = [".cpp",".h", ".py"]
-
-
-def get_git_date(file_path):
-    d = subprocess.run(CMD_GIT_DATE + [file_path],
-                       stdout=subprocess.PIPE,
-                       check=True,
-                       universal_newlines=True).stdout
-    # yyyy-mm-dd
-    return d.split('-')[0]
-
-
-def skip_file(file_path):
-    for ext in EXTENSIONS:
-        if file_path.endswith(ext):
-            return False
-    else:
-        return True
-
-if __name__ == "__main__":
-    year = str(time.gmtime()[0])
-    regex_current = re.compile("%s The Bitcoin" % year)
-    n = 1
-    for folder in FOLDERS:
-        for file_path in subprocess.run(
-            CMD_GIT_LIST_FILES + [folder],
-            stdout=subprocess.PIPE,
-            check=True,
-            universal_newlines=True
-        ).stdout.split("\n"):
-            if skip_file(file_path):
-                # print(file_path, "(skip)")
-                continue
-            git_date = get_git_date(file_path)
-            if not year == git_date:
-                # print(file_path, year, "(skip)")
-                continue
-            if regex_current.search(open(file_path, "r").read()) is not None:
-                # already up to date
-                # print(file_path, year, "(skip)")
-                continue
-            print(n, file_path, "(update to %s)" % year)
-            subprocess.run(CMD_PERL_REGEX + [REGEX_TEMPLATE % year, file_path], check=True)
-            n = n + 1

From 0766d1cac38d7ea27a6323d7ca206154b2686f9b Mon Sep 17 00:00:00 2001
From: isle2983 <isle2983@yahoo.com>
Date: Sun, 11 Sep 2016 13:36:22 -0600
Subject: [PATCH 0869/1802] [copyright] add MIT license headers to .sh scripts
 where missing

Years are set according to 'git log' history
---
 contrib/devtools/git-subtree-check.sh    | 3 +++
 contrib/macdeploy/detached-sig-apply.sh  | 4 ++++
 contrib/macdeploy/detached-sig-create.sh | 4 ++++
 contrib/macdeploy/extract-osx-sdk.sh     | 4 ++++
 contrib/qos/tc.sh                        | 4 ++++
 contrib/tidy_datadir.sh                  | 3 +++
 contrib/verify-commits/gpg.sh            | 4 ++++
 contrib/verify-commits/pre-push-hook.sh  | 4 ++++
 contrib/verify-commits/verify-commits.sh | 4 ++++
 contrib/verifybinaries/verify.sh         | 3 +++
 src/qt/res/movies/makespinner.sh         | 4 ++++
 11 files changed, 41 insertions(+)

diff --git a/contrib/devtools/git-subtree-check.sh b/contrib/devtools/git-subtree-check.sh
index 1cb82fe6826c7..2384d66cad2aa 100755
--- a/contrib/devtools/git-subtree-check.sh
+++ b/contrib/devtools/git-subtree-check.sh
@@ -1,4 +1,7 @@
 #!/bin/sh
+# Copyright (c) 2015 The Bitcoin Core developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 DIR="$1"
 COMMIT="$2"
diff --git a/contrib/macdeploy/detached-sig-apply.sh b/contrib/macdeploy/detached-sig-apply.sh
index 781fe315edab5..91674a92e6fa6 100755
--- a/contrib/macdeploy/detached-sig-apply.sh
+++ b/contrib/macdeploy/detached-sig-apply.sh
@@ -1,4 +1,8 @@
 #!/bin/sh
+# Copyright (c) 2014-2015 The Bitcoin Core developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
 set -e
 
 UNSIGNED="$1"
diff --git a/contrib/macdeploy/detached-sig-create.sh b/contrib/macdeploy/detached-sig-create.sh
index 89a2da32f7a1c..5022ea88bc221 100755
--- a/contrib/macdeploy/detached-sig-create.sh
+++ b/contrib/macdeploy/detached-sig-create.sh
@@ -1,4 +1,8 @@
 #!/bin/sh
+# Copyright (c) 2014-2015 The Bitcoin Core developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
 set -e
 
 ROOTDIR=dist
diff --git a/contrib/macdeploy/extract-osx-sdk.sh b/contrib/macdeploy/extract-osx-sdk.sh
index 46d2d825d4523..ff9fbd58df071 100755
--- a/contrib/macdeploy/extract-osx-sdk.sh
+++ b/contrib/macdeploy/extract-osx-sdk.sh
@@ -1,4 +1,8 @@
 #!/bin/bash
+# Copyright (c) 2016 The Bitcoin Core developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
 set -e
 
 INPUTFILE="Xcode_7.3.1.dmg"
diff --git a/contrib/qos/tc.sh b/contrib/qos/tc.sh
index f62060421202c..aaf5e1fa11ed7 100644
--- a/contrib/qos/tc.sh
+++ b/contrib/qos/tc.sh
@@ -1,3 +1,7 @@
+# Copyright (c) 2013 The Bitcoin Core developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
 #network interface on which to limit traffic
 IF="eth0"
 #limit of the network interface in question
diff --git a/contrib/tidy_datadir.sh b/contrib/tidy_datadir.sh
index 5d6d8264442fb..8960f8811d81e 100755
--- a/contrib/tidy_datadir.sh
+++ b/contrib/tidy_datadir.sh
@@ -1,4 +1,7 @@
 #!/bin/bash
+# Copyright (c) 2013 The Bitcoin Core developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 if [ -d "$1" ]; then
   cd "$1"
diff --git a/contrib/verify-commits/gpg.sh b/contrib/verify-commits/gpg.sh
index 375d711725707..09ff23754473f 100755
--- a/contrib/verify-commits/gpg.sh
+++ b/contrib/verify-commits/gpg.sh
@@ -1,4 +1,8 @@
 #!/bin/sh
+# Copyright (c) 2014-2016 The Bitcoin Core developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
 INPUT=$(cat /dev/stdin)
 VALID=false
 REVSIG=false
diff --git a/contrib/verify-commits/pre-push-hook.sh b/contrib/verify-commits/pre-push-hook.sh
index c57222818ab8a..c21febb9e9249 100755
--- a/contrib/verify-commits/pre-push-hook.sh
+++ b/contrib/verify-commits/pre-push-hook.sh
@@ -1,4 +1,8 @@
 #!/bin/bash
+# Copyright (c) 2014-2015 The Bitcoin Core developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
 if ! [[ "$2" =~ ^(git@)?(www.)?github.com(:|/)bitcoin/bitcoin(.git)?$ ]]; then
     exit 0
 fi
diff --git a/contrib/verify-commits/verify-commits.sh b/contrib/verify-commits/verify-commits.sh
index 5219331e2e5bc..cfe4f11a0b7a2 100755
--- a/contrib/verify-commits/verify-commits.sh
+++ b/contrib/verify-commits/verify-commits.sh
@@ -1,4 +1,8 @@
 #!/bin/sh
+# Copyright (c) 2014-2016 The Bitcoin Core developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
 # Not technically POSIX-compliant due to use of "local", but almost every
 # shell anyone uses today supports it, so its probably fine
 
diff --git a/contrib/verifybinaries/verify.sh b/contrib/verifybinaries/verify.sh
index e22b911743b8f..e20770c96a967 100755
--- a/contrib/verifybinaries/verify.sh
+++ b/contrib/verifybinaries/verify.sh
@@ -1,4 +1,7 @@
 #!/bin/bash
+# Copyright (c) 2016 The Bitcoin Core developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 ###   This script attempts to download the signature file SHA256SUMS.asc from bitcoin.org
 ###   It first checks if the signature passes, and then downloads the files specified in
diff --git a/src/qt/res/movies/makespinner.sh b/src/qt/res/movies/makespinner.sh
index a4c2fddbbfe53..d0deb1238c2b8 100755
--- a/src/qt/res/movies/makespinner.sh
+++ b/src/qt/res/movies/makespinner.sh
@@ -1,3 +1,7 @@
+# Copyright (c) 2014-2015 The Bitcoin Core developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
 FRAMEDIR=$(dirname $0)
 for i in {0..35}
 do

From 783e930e68a312bc7654d833053cceead18dd688 Mon Sep 17 00:00:00 2001
From: isle2983 <isle2983@yahoo.com>
Date: Sun, 11 Sep 2016 15:25:51 -0600
Subject: [PATCH 0870/1802] [copyright] Add missing copyright headers

---
 contrib/devtools/optimize-pngs.py          | 3 +++
 contrib/gitian-build.sh                    | 4 ++++
 contrib/qt_translations.py                 | 3 +++
 contrib/seeds/makeseeds.py                 | 3 +++
 contrib/spendfrom/setup.py                 | 3 +++
 contrib/spendfrom/spendfrom.py             | 3 +++
 contrib/testgen/base58.py                  | 3 +++
 contrib/testgen/gen_base58_test_vectors.py | 3 +++
 qa/rpc-tests/test_framework/blockstore.py  | 3 +++
 9 files changed, 28 insertions(+)

diff --git a/contrib/devtools/optimize-pngs.py b/contrib/devtools/optimize-pngs.py
index 799e0cc7d0fb1..b7b8dc00820d2 100755
--- a/contrib/devtools/optimize-pngs.py
+++ b/contrib/devtools/optimize-pngs.py
@@ -1,4 +1,7 @@
 #!/usr/bin/env python
+# Copyright (c) 2014-2015 The Bitcoin Core developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or http://www.opensource.org/licenses/mit-license.php.
 '''
 Run this script every time you change one of the png files. Using pngcrush, it will optimize the png files, remove various color profiles, remove ancillary chunks (alla) and text chunks (text).
 #pngcrush -brute -ow -rem gAMA -rem cHRM -rem iCCP -rem sRGB -rem alla -rem text
diff --git a/contrib/gitian-build.sh b/contrib/gitian-build.sh
index ee47d138f3798..53c24e3a876ca 100755
--- a/contrib/gitian-build.sh
+++ b/contrib/gitian-build.sh
@@ -1,3 +1,7 @@
+# Copyright (c) 2016 The Bitcoin Core developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
 # What to do
 sign=false
 verify=false
diff --git a/contrib/qt_translations.py b/contrib/qt_translations.py
index fd8a8b71298c6..cfdeed41aba26 100755
--- a/contrib/qt_translations.py
+++ b/contrib/qt_translations.py
@@ -1,4 +1,7 @@
 #!/usr/bin/env python
+# Copyright (c) 2011 The Bitcoin Core developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 # Helpful little script that spits out a comma-separated list of
 # language codes for Qt icons that should be included
diff --git a/contrib/seeds/makeseeds.py b/contrib/seeds/makeseeds.py
index 4072405ef509a..041f224f40ebe 100755
--- a/contrib/seeds/makeseeds.py
+++ b/contrib/seeds/makeseeds.py
@@ -1,4 +1,7 @@
 #!/usr/bin/env python
+# Copyright (c) 2013-2015 The Bitcoin Core developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or http://www.opensource.org/licenses/mit-license.php.
 #
 # Generate seeds.txt from Pieter's DNS seeder
 #
diff --git a/contrib/spendfrom/setup.py b/contrib/spendfrom/setup.py
index 01b9768a5b06a..f80736752ae4f 100644
--- a/contrib/spendfrom/setup.py
+++ b/contrib/spendfrom/setup.py
@@ -1,3 +1,6 @@
+# Copyright (c) 2013 The Bitcoin Core developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or http://www.opensource.org/licenses/mit-license.php.
 from distutils.core import setup
 setup(name='btcspendfrom',
       version='1.0',
diff --git a/contrib/spendfrom/spendfrom.py b/contrib/spendfrom/spendfrom.py
index 72ee0425eb236..086b91b267ef4 100755
--- a/contrib/spendfrom/spendfrom.py
+++ b/contrib/spendfrom/spendfrom.py
@@ -1,4 +1,7 @@
 #!/usr/bin/env python
+# Copyright (c) 2013 The Bitcoin Core developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or http://www.opensource.org/licenses/mit-license.php.
 #
 # Use the raw transactions API to spend bitcoins received on particular addresses,
 # and send any change back to that same address.
diff --git a/contrib/testgen/base58.py b/contrib/testgen/base58.py
index b716495145f77..72b288b2dc9f3 100644
--- a/contrib/testgen/base58.py
+++ b/contrib/testgen/base58.py
@@ -1,3 +1,6 @@
+# Copyright (c) 2012 The Bitcoin Core developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or http://www.opensource.org/licenses/mit-license.php.
 '''
 Bitcoin base58 encoding and decoding.
 
diff --git a/contrib/testgen/gen_base58_test_vectors.py b/contrib/testgen/gen_base58_test_vectors.py
index 181343695363a..8518774db3d15 100755
--- a/contrib/testgen/gen_base58_test_vectors.py
+++ b/contrib/testgen/gen_base58_test_vectors.py
@@ -1,4 +1,7 @@
 #!/usr/bin/env python
+# Copyright (c) 2012 The Bitcoin Core developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or http://www.opensource.org/licenses/mit-license.php.
 '''
 Generate valid and invalid base58 address and private key test vectors.
 
diff --git a/qa/rpc-tests/test_framework/blockstore.py b/qa/rpc-tests/test_framework/blockstore.py
index 6120dd574b5dd..1e2bbb277ac5c 100644
--- a/qa/rpc-tests/test_framework/blockstore.py
+++ b/qa/rpc-tests/test_framework/blockstore.py
@@ -1,4 +1,7 @@
 #!/usr/bin/env python3
+# Copyright (c) 2015-2016 The Bitcoin Core developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or http://www.opensource.org/licenses/mit-license.php.
 # BlockStore: a helper class that keeps a map of blocks and implements
 #             helper functions for responding to getheaders and getdata,
 #             and for constructing a getheaders message

From 37a7fe9e440b83e2364d5498931253937abe9294 Mon Sep 17 00:00:00 2001
From: isle2983 <isle2983@yahoo.com>
Date: Sun, 11 Sep 2016 15:26:53 -0600
Subject: [PATCH 0871/1802] [copyright] add MIT License copyright header to
 zmq_sub.py

---
 contrib/zmq/zmq_sub.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/contrib/zmq/zmq_sub.py b/contrib/zmq/zmq_sub.py
index 6268123dd8e53..3dea5e3c1440c 100755
--- a/contrib/zmq/zmq_sub.py
+++ b/contrib/zmq/zmq_sub.py
@@ -1,4 +1,7 @@
 #!/usr/bin/env python2
+# Copyright (c) 2014-2016 The Bitcoin Core developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 import array
 import binascii

From 4677b197f7aa8d35bfc20a5961c3e1c41bb7de39 Mon Sep 17 00:00:00 2001
From: isle2983 <isle2983@yahoo.com>
Date: Sun, 11 Sep 2016 15:32:22 -0600
Subject: [PATCH 0872/1802] [copyright] add MIT License copyright header to
 remaining Python files

---
 contrib/devtools/security-check.py      | 3 +++
 contrib/devtools/test-security-check.py | 3 +++
 share/qt/extract_strings_qt.py          | 3 +++
 3 files changed, 9 insertions(+)

diff --git a/contrib/devtools/security-check.py b/contrib/devtools/security-check.py
index c61d652641767..b4b4b4603dbad 100755
--- a/contrib/devtools/security-check.py
+++ b/contrib/devtools/security-check.py
@@ -1,4 +1,7 @@
 #!/usr/bin/env python
+# Copyright (c) 2015-2016 The Bitcoin Core developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or http://www.opensource.org/licenses/mit-license.php.
 '''
 Perform basic ELF security checks on a series of executables.
 Exit status will be 0 if successful, and the program will be silent.
diff --git a/contrib/devtools/test-security-check.py b/contrib/devtools/test-security-check.py
index 324b7bcd85ae3..c0f120392e622 100755
--- a/contrib/devtools/test-security-check.py
+++ b/contrib/devtools/test-security-check.py
@@ -1,4 +1,7 @@
 #!/usr/bin/env python2
+# Copyright (c) 2015-2016 The Bitcoin Core developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or http://www.opensource.org/licenses/mit-license.php.
 '''
 Test script for security-check.py
 '''
diff --git a/share/qt/extract_strings_qt.py b/share/qt/extract_strings_qt.py
index 9624abf1fcdd3..92e0df259e790 100755
--- a/share/qt/extract_strings_qt.py
+++ b/share/qt/extract_strings_qt.py
@@ -1,4 +1,7 @@
 #!/usr/bin/env python
+# Copyright (c) 2012-2016 The Bitcoin Core developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or http://www.opensource.org/licenses/mit-license.php.
 '''
 Extract _("...") strings for translation and convert to Qt stringdefs so that
 they can be picked up by Qt linguist.

From 1f951c67a4d1e94895783d2c6b9bd235b2bf66b8 Mon Sep 17 00:00:00 2001
From: R E Broadley <rebroad+github@gmail.com>
Date: Tue, 13 Sep 2016 09:10:22 +0700
Subject: [PATCH 0873/1802] Allow filterclear messages for enabling TX relay
 only.

An example of where this might be useful is allowing a node to connect blocksonly during IBD but then becoming a full-node once caught up with the latest block. This might also even want to be the default behaviour since during IBD most TXs appear to be orphans, and are routinely dropped (for example when a node disconnects). Therefore, this can waste a lot of bandwidth.

Additionally, another pull could be written to stop relaying of TXs to nodes that are clearly far behind the latest block and are running a node that doesn't store many orphan TXs, such as recent versions of Bitcoin Core.
---
 src/main.cpp | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index cb6e942272994..6e3f9daf45ed1 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -4941,8 +4941,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
 
     if (!(pfrom->GetLocalServices() & NODE_BLOOM) &&
               (strCommand == NetMsgType::FILTERLOAD ||
-               strCommand == NetMsgType::FILTERADD ||
-               strCommand == NetMsgType::FILTERCLEAR))
+               strCommand == NetMsgType::FILTERADD))
     {
         if (pfrom->nVersion >= NO_BLOOM_VERSION) {
             LOCK(cs_main);
@@ -6128,8 +6127,10 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
     else if (strCommand == NetMsgType::FILTERCLEAR)
     {
         LOCK(pfrom->cs_filter);
-        delete pfrom->pfilter;
-        pfrom->pfilter = new CBloomFilter();
+        if (pfrom->GetLocalServices() & NODE_BLOOM) {
+            delete pfrom->pfilter;
+            pfrom->pfilter = new CBloomFilter();
+        }
         pfrom->fRelayTxes = true;
     }
 

From 86c3f8db0bf64693313a81d5fe92ef603499030a Mon Sep 17 00:00:00 2001
From: Johnson Lau <jl2012@xbt.hk>
Date: Mon, 12 Sep 2016 02:03:55 +0800
Subject: [PATCH 0874/1802] Remove createwitnessaddress

This RPC command is unsafe as it will return an address even if the script is invalid.
---
 src/rpc/misc.cpp | 38 --------------------------------------
 1 file changed, 38 deletions(-)

diff --git a/src/rpc/misc.cpp b/src/rpc/misc.cpp
index 2b5782367ce16..5afcf6353c731 100644
--- a/src/rpc/misc.cpp
+++ b/src/rpc/misc.cpp
@@ -321,43 +321,6 @@ UniValue createmultisig(const UniValue& params, bool fHelp)
     return result;
 }
 
-UniValue createwitnessaddress(const UniValue& params, bool fHelp)
-{
-    if (fHelp || params.size() < 1 || params.size() > 1)
-    {
-        string msg = "createwitnessaddress \"script\"\n"
-            "\nCreates a witness address for a particular script.\n"
-            "It returns a json object with the address and witness script.\n"
-
-            "\nArguments:\n"
-            "1. \"script\"       (string, required) A hex encoded script\n"
-
-            "\nResult:\n"
-            "{\n"
-            "  \"address\":\"multisigaddress\",  (string) The value of the new address (P2SH of witness script).\n"
-            "  \"witnessScript\":\"script\"      (string) The string value of the hex-encoded witness script.\n"
-            "}\n"
-        ;
-        throw runtime_error(msg);
-    }
-
-    if (!IsHex(params[0].get_str())) {
-        throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Script must be hex-encoded");
-    }
-
-    std::vector<unsigned char> code = ParseHex(params[0].get_str());
-    CScript script(code.begin(), code.end());
-    CScript witscript = GetScriptForWitness(script);
-    CScriptID witscriptid(witscript);
-    CBitcoinAddress address(witscriptid);
-
-    UniValue result(UniValue::VOBJ);
-    result.push_back(Pair("address", address.ToString()));
-    result.push_back(Pair("witnessScript", HexStr(witscript.begin(), witscript.end())));
-
-    return result;
-}
-
 UniValue verifymessage(const UniValue& params, bool fHelp)
 {
     if (fHelp || params.size() != 3)
@@ -493,7 +456,6 @@ static const CRPCCommand commands[] =
     { "control",            "getinfo",                &getinfo,                true  }, /* uses wallet if enabled */
     { "util",               "validateaddress",        &validateaddress,        true  }, /* uses wallet if enabled */
     { "util",               "createmultisig",         &createmultisig,         true  },
-    { "util",               "createwitnessaddress",   &createwitnessaddress,   true  },
     { "util",               "verifymessage",          &verifymessage,          true  },
     { "util",               "signmessagewithprivkey", &signmessagewithprivkey, true  },
 

From 86726d8680c3398c41e62924588c44f4a394367e Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Thu, 1 Sep 2016 15:24:45 +0200
Subject: [PATCH 0875/1802] Rename `-optintofullrbf` option to `-walletrbf`

This makes it clear that this is a wallet option.
---
 src/wallet/wallet.cpp | 8 ++++----
 src/wallet/wallet.h   | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index 5542a536e1d39..67a0174e1ba8e 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -40,7 +40,7 @@ CFeeRate payTxFee(DEFAULT_TRANSACTION_FEE);
 unsigned int nTxConfirmTarget = DEFAULT_TX_CONFIRM_TARGET;
 bool bSpendZeroConfChange = DEFAULT_SPEND_ZEROCONF_CHANGE;
 bool fSendFreeTransactions = DEFAULT_SEND_FREE_TRANSACTIONS;
-bool fOptIntoFullRbf = DEFAULT_OPT_INTO_FULL_RBF;
+bool fWalletRbf = DEFAULT_WALLET_RBF;
 
 const char * DEFAULT_WALLET_DAT = "wallet.dat";
 const uint32_t BIP32_HARDENED_KEY_LIMIT = 0x80000000;
@@ -2366,7 +2366,7 @@ bool CWallet::CreateTransaction(const vector<CRecipient>& vecSend, CWalletTx& wt
                 // behavior."
                 BOOST_FOREACH(const PAIRTYPE(const CWalletTx*,unsigned int)& coin, setCoins)
                     txNew.vin.push_back(CTxIn(coin.first->GetHash(),coin.second,CScript(),
-                                              std::numeric_limits<unsigned int>::max() - (fOptIntoFullRbf ? 2 : 1)));
+                                              std::numeric_limits<unsigned int>::max() - (fWalletRbf ? 2 : 1)));
 
                 // Sign
                 int nIn = 0;
@@ -3247,7 +3247,7 @@ std::string CWallet::GetWalletHelpString(bool showDebug)
     strUsage += HelpMessageOpt("-spendzeroconfchange", strprintf(_("Spend unconfirmed change when sending transactions (default: %u)"), DEFAULT_SPEND_ZEROCONF_CHANGE));
     strUsage += HelpMessageOpt("-txconfirmtarget=<n>", strprintf(_("If paytxfee is not set, include enough fee so transactions begin confirmation on average within n blocks (default: %u)"), DEFAULT_TX_CONFIRM_TARGET));
     strUsage += HelpMessageOpt("-usehd", _("Use hierarchical deterministic key generation (HD) after BIP32. Only has effect during wallet creation/first start") + " " + strprintf(_("(default: %u)"), DEFAULT_USE_HD_WALLET));
-    strUsage += HelpMessageOpt("-optintofullrbf", strprintf(_("Send transactions with full-RBF opt-in enabled (default: %u)"), DEFAULT_OPT_INTO_FULL_RBF));
+    strUsage += HelpMessageOpt("-walletrbf", strprintf(_("Send transactions with full-RBF opt-in enabled (default: %u)"), DEFAULT_WALLET_RBF));
     strUsage += HelpMessageOpt("-upgradewallet", _("Upgrade wallet to latest format on startup"));
     strUsage += HelpMessageOpt("-wallet=<file>", _("Specify wallet file (within data directory)") + " " + strprintf(_("(default: %s)"), DEFAULT_WALLET_DAT));
     strUsage += HelpMessageOpt("-walletbroadcast", _("Make the wallet broadcast transactions") + " " + strprintf(_("(default: %u)"), DEFAULT_WALLETBROADCAST));
@@ -3488,7 +3488,7 @@ bool CWallet::ParameterInteraction()
     nTxConfirmTarget = GetArg("-txconfirmtarget", DEFAULT_TX_CONFIRM_TARGET);
     bSpendZeroConfChange = GetBoolArg("-spendzeroconfchange", DEFAULT_SPEND_ZEROCONF_CHANGE);
     fSendFreeTransactions = GetBoolArg("-sendfreetransactions", DEFAULT_SEND_FREE_TRANSACTIONS);
-    fOptIntoFullRbf = GetBoolArg("-optintofullrbf", DEFAULT_OPT_INTO_FULL_RBF);
+    fWalletRbf = GetBoolArg("-walletrbf", DEFAULT_WALLET_RBF);
 
     return true;
 }
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
index 5d93d2c4d96d8..220b1e52b57e4 100644
--- a/src/wallet/wallet.h
+++ b/src/wallet/wallet.h
@@ -37,7 +37,7 @@ extern CFeeRate payTxFee;
 extern unsigned int nTxConfirmTarget;
 extern bool bSpendZeroConfChange;
 extern bool fSendFreeTransactions;
-extern bool fOptIntoFullRbf;
+extern bool fWalletRbf;
 
 static const unsigned int DEFAULT_KEYPOOL_SIZE = 100;
 //! -paytxfee default
@@ -54,8 +54,8 @@ static const bool DEFAULT_SPEND_ZEROCONF_CHANGE = true;
 static const bool DEFAULT_SEND_FREE_TRANSACTIONS = false;
 //! -txconfirmtarget default
 static const unsigned int DEFAULT_TX_CONFIRM_TARGET = 2;
-//! -optintofullrbf default
-static const bool DEFAULT_OPT_INTO_FULL_RBF = false;
+//! -walletrbf default
+static const bool DEFAULT_WALLET_RBF = false;
 //! Largest (in bytes) free transaction we're willing to create
 static const unsigned int MAX_FREE_TRANSACTION_CREATE_SIZE = 1000;
 static const bool DEFAULT_WALLETBROADCAST = true;

From d8b062ef5eea3addff00a09bad1dab162452b4b5 Mon Sep 17 00:00:00 2001
From: Jonas Schnelli <dev@jonasschnelli.ch>
Date: Tue, 13 Sep 2016 16:36:24 +0200
Subject: [PATCH 0876/1802] [Qt] only update "amount of blocks left" when the
 header chain is in-sync

---
 src/qt/bitcoingui.cpp        |  7 +++++--
 src/qt/clientmodel.cpp       | 10 +++++++++-
 src/qt/clientmodel.h         |  4 ++--
 src/qt/forms/modaloverlay.ui |  3 +++
 src/qt/modaloverlay.cpp      | 15 ++++++++++++---
 src/qt/modaloverlay.h        |  2 +-
 6 files changed, 32 insertions(+), 9 deletions(-)

diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp
index 628d35b5ea8b5..c184745dbe4fd 100644
--- a/src/qt/bitcoingui.cpp
+++ b/src/qt/bitcoingui.cpp
@@ -500,7 +500,7 @@ void BitcoinGUI::setClientModel(ClientModel *clientModel)
             setTrayIconVisible(optionsModel->getHideTrayIcon());
         }
 
-        modalOverlay->setKnownBestHeight(clientModel->getHeaderHeight());
+        modalOverlay->setKnownBestHeight(clientModel->getHeaderTipHeight(), QDateTime::fromTime_t(clientModel->getHeaderTipTime()));
     } else {
         // Disable possibility to show main window via action
         toggleHideAction->setEnabled(false);
@@ -718,7 +718,10 @@ void BitcoinGUI::setNumBlocks(int count, const QDateTime& blockDate, double nVer
     if (modalOverlay)
     {
         if (header)
-            modalOverlay->setKnownBestHeight(count);
+        {
+            /* use clientmodels getHeaderTipHeight and getHeaderTipTime because the NotifyHeaderTip signal does not fire when updating the best header */
+            modalOverlay->setKnownBestHeight(clientModel->getHeaderTipHeight(), QDateTime::fromTime_t(clientModel->getHeaderTipTime()));
+        }
         else
             modalOverlay->tipUpdate(count, blockDate, nVerificationProgress);
     }
diff --git a/src/qt/clientmodel.cpp b/src/qt/clientmodel.cpp
index e3240b95a25f8..fb0cce59ccda3 100644
--- a/src/qt/clientmodel.cpp
+++ b/src/qt/clientmodel.cpp
@@ -68,7 +68,7 @@ int ClientModel::getNumBlocks() const
     return chainActive.Height();
 }
 
-int ClientModel::getHeaderHeight() const
+int ClientModel::getHeaderTipHeight() const
 {
     LOCK(cs_main);
     if (!pindexBestHeader)
@@ -76,6 +76,14 @@ int ClientModel::getHeaderHeight() const
     return pindexBestHeader->nHeight;
 }
 
+int64_t ClientModel::getHeaderTipTime() const
+{
+    LOCK(cs_main);
+    if (!pindexBestHeader)
+        return 0;
+    return pindexBestHeader->GetBlockTime();
+}
+
 quint64 ClientModel::getTotalBytesRecv() const
 {
     return CNode::GetTotalBytesRecv();
diff --git a/src/qt/clientmodel.h b/src/qt/clientmodel.h
index f0c9a7988a62e..3fd8404cbb70b 100644
--- a/src/qt/clientmodel.h
+++ b/src/qt/clientmodel.h
@@ -51,8 +51,8 @@ class ClientModel : public QObject
     //! Return number of connections, default is in- and outbound (total)
     int getNumConnections(unsigned int flags = CONNECTIONS_ALL) const;
     int getNumBlocks() const;
-    int getHeaderHeight() const;
-
+    int getHeaderTipHeight() const;
+    int64_t getHeaderTipTime() const;
     //! Return number of transactions in the mempool
     long getMempoolSize() const;
     //! Return the dynamic memory usage of the mempool
diff --git a/src/qt/forms/modaloverlay.ui b/src/qt/forms/modaloverlay.ui
index f1967a7c05721..ce9ceaaadd7e4 100644
--- a/src/qt/forms/modaloverlay.ui
+++ b/src/qt/forms/modaloverlay.ui
@@ -82,6 +82,9 @@ QLabel { color: rgb(40,40,40);  }</string>
              </property>
              <item>
               <widget class="QPushButton" name="warningIcon">
+               <property name="enabled">
+                <bool>false</bool>
+               </property>
                <property name="text">
                 <string/>
                </property>
diff --git a/src/qt/modaloverlay.cpp b/src/qt/modaloverlay.cpp
index 1cd5b199661b7..c54889039133c 100644
--- a/src/qt/modaloverlay.cpp
+++ b/src/qt/modaloverlay.cpp
@@ -63,10 +63,17 @@ bool ModalOverlay::event(QEvent* ev) {
     return QWidget::event(ev);
 }
 
-void ModalOverlay::setKnownBestHeight(int count)
+void ModalOverlay::setKnownBestHeight(int count, const QDateTime& blockDate)
 {
-    if (count > bestBlockHeight)
-        bestBlockHeight = count;
+
+    /* only update the blockheight if the headerschain-tip is not older then 30 days */
+    int64_t now = QDateTime::currentDateTime().toTime_t();
+    int64_t btime = blockDate.toTime_t();
+    if (btime+3600*24*30 > now)
+    {
+        if (count > bestBlockHeight)
+            bestBlockHeight = count;
+    }
 }
 
 void ModalOverlay::tipUpdate(int count, const QDateTime& blockDate, double nVerificationProgress)
@@ -122,6 +129,8 @@ void ModalOverlay::tipUpdate(int count, const QDateTime& blockDate, double nVeri
     // show remaining amount of blocks
     if (bestBlockHeight > 0)
         ui->amountOfBlocksLeft->setText(QString::number(bestBlockHeight-count));
+    else
+        ui->expectedTimeLeft->setText(tr("Unknown. Syncing Headers..."));
 }
 
 void ModalOverlay::showHide(bool hide, bool userRequested)
diff --git a/src/qt/modaloverlay.h b/src/qt/modaloverlay.h
index 5bf913a3f3d6f..bdbe3c39a70ac 100644
--- a/src/qt/modaloverlay.h
+++ b/src/qt/modaloverlay.h
@@ -23,7 +23,7 @@ class ModalOverlay : public QWidget
 
 public Q_SLOTS:
     void tipUpdate(int count, const QDateTime& blockDate, double nVerificationProgress);
-    void setKnownBestHeight(int count);
+    void setKnownBestHeight(int count, const QDateTime& blockDate);
 
     // will show or hide the modal layer
     void showHide(bool hide = false, bool userRequested = false);

From 1b6bcdd3aa379a50c960e23d7c55db8294e76f7f Mon Sep 17 00:00:00 2001
From: Jonas Schnelli <dev@jonasschnelli.ch>
Date: Tue, 13 Sep 2016 18:08:17 +0200
Subject: [PATCH 0877/1802] Remove maxuploadtargets recommended minimum

---
 doc/reduce-traffic.md | 3 +--
 src/net.cpp           | 4 ----
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/doc/reduce-traffic.md b/doc/reduce-traffic.md
index 2d86588eb2ac6..697099beabe96 100644
--- a/doc/reduce-traffic.md
+++ b/doc/reduce-traffic.md
@@ -19,8 +19,7 @@ This is *not* a hard limit; only a threshold to minimize the outbound
 traffic. When the limit is about to be reached, the uploaded data is cut by no
 longer serving historic blocks (blocks older than one week).
 Keep in mind that new nodes require other nodes that are willing to serve
-historic blocks. **The recommended minimum is 144 blocks per day (max. 144MB
-per day)**
+historic blocks.
 
 Whitelisted peers will never be disconnected, although their traffic counts for
 calculating the target.
diff --git a/src/net.cpp b/src/net.cpp
index b39ef9f54a1af..888ed44377815 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -2362,11 +2362,7 @@ void CConnman::RecordBytesSent(uint64_t bytes)
 void CConnman::SetMaxOutboundTarget(uint64_t limit)
 {
     LOCK(cs_totalBytesSent);
-    uint64_t recommendedMinimum = (nMaxOutboundTimeframe / 600) * MAX_BLOCK_SERIALIZED_SIZE;
     nMaxOutboundLimit = limit;
-
-    if (limit > 0 && limit < recommendedMinimum)
-        LogPrintf("Max outbound target is very small (%s bytes) and will be overshot. Recommended minimum is %s bytes.\n", nMaxOutboundLimit, recommendedMinimum);
 }
 
 uint64_t CConnman::GetMaxOutboundTarget()

From fa27d990ee38a9dce1da71098be010e4a81b18c3 Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Tue, 13 Sep 2016 19:35:35 +0200
Subject: [PATCH 0878/1802] [qa] create_cache: Delete temp dir when done

---
 qa/rpc-tests/create_cache.py | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/qa/rpc-tests/create_cache.py b/qa/rpc-tests/create_cache.py
index b6161e0917d07..1ace6310d0d06 100755
--- a/qa/rpc-tests/create_cache.py
+++ b/qa/rpc-tests/create_cache.py
@@ -12,9 +12,15 @@
 
 class CreateCache(BitcoinTestFramework):
 
+    def __init__(self):
+        super().__init__()
+
+        # Test network and test nodes are not required:
+        self.num_nodes = 0
+        self.nodes = []
+
     def setup_network(self):
-        # Don't setup any test nodes
-        self.options.noshutdown = True
+        pass
 
     def run_test(self):
         pass

From 1111ddb9e59239f7831a9e3a81a1f67a3725c5ec Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Sun, 11 Sep 2016 20:06:20 +0200
Subject: [PATCH 0879/1802] gitignore: Remove unused lines

---
 .gitignore | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 892b2a3e08e0c..b9db7cbd39917 100644
--- a/.gitignore
+++ b/.gitignore
@@ -103,10 +103,7 @@ linux-build
 win32-build
 qa/pull-tester/run-bitcoind-for-test.sh
 qa/pull-tester/tests_config.py
-qa/pull-tester/test.*/*
-qa/tmp
 qa/cache/*
-share/BitcoindComparisonTool.jar
 
 !src/leveldb*/Makefile
 

From a56037805c68bf34331a6a05d487ae4872261538 Mon Sep 17 00:00:00 2001
From: Spencer Lievens <spencerlievens@users.noreply.github.com>
Date: Tue, 13 Sep 2016 23:30:32 +0100
Subject: [PATCH 0880/1802] [WALLET] Addition of ImmatureCreditCached to
 MarkDirty()

To protect against possible invalidation and to bring conformity to the code.
---
 src/wallet/wallet.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
index 61aff6e45a967..0d096488f67b5 100644
--- a/src/wallet/wallet.h
+++ b/src/wallet/wallet.h
@@ -361,6 +361,7 @@ class CWalletTx : public CMerkleTx
     {
         fCreditCached = false;
         fAvailableCreditCached = false;
+        fImmatureCreditCached = false;
         fWatchDebitCached = false;
         fWatchCreditCached = false;
         fAvailableWatchCreditCached = false;

From 36fa01f217fbc32afb90314fd257650c71a47045 Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Tue, 13 Sep 2016 14:42:55 -0400
Subject: [PATCH 0881/1802] net: only delete CConnman if it's been created

In the case of (for example) an already-running bitcoind, the shutdown sequence
begins before CConnman has been created, leading to a null-pointer dereference
when g_connman->Stop() is called.

Instead, Just let the CConnman dtor take care of stopping.
---
 src/init.cpp | 1 -
 src/net.cpp  | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/init.cpp b/src/init.cpp
index e9552da67d116..8d1e330a05a55 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -200,7 +200,6 @@ void Shutdown()
         pwalletMain->Flush(false);
 #endif
     MapPort(false);
-    g_connman->Stop();
     g_connman.reset();
 
     StopTorControl();
diff --git a/src/net.cpp b/src/net.cpp
index b39ef9f54a1af..30513a3b9a2a4 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -2205,6 +2205,7 @@ void CConnman::DeleteNode(CNode* pnode)
 
 CConnman::~CConnman()
 {
+    Stop();
 }
 
 size_t CConnman::GetAddressCount() const

From fa644d0053ca40740b9e7b8982ff6c5d5640e4af Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Tue, 13 Sep 2016 22:00:55 +0200
Subject: [PATCH 0882/1802] [qa] wallet: Check legacy wallet as well

---
 qa/rpc-tests/wallet.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/qa/rpc-tests/wallet.py b/qa/rpc-tests/wallet.py
index 5d96e7a6e5bec..3420be1a2ed1e 100755
--- a/qa/rpc-tests/wallet.py
+++ b/qa/rpc-tests/wallet.py
@@ -18,9 +18,10 @@ def __init__(self):
         super().__init__()
         self.setup_clean_chain = True
         self.num_nodes = 4
+        self.extra_args = [['-usehd={:d}'.format(i%2==0)] for i in range(4)]
 
     def setup_network(self, split=False):
-        self.nodes = start_nodes(3, self.options.tmpdir)
+        self.nodes = start_nodes(3, self.options.tmpdir, self.extra_args[:3])
         connect_nodes_bi(self.nodes,0,1)
         connect_nodes_bi(self.nodes,1,2)
         connect_nodes_bi(self.nodes,0,2)
@@ -154,7 +155,7 @@ def run_test (self):
         txid2 = self.nodes[1].sendtoaddress(self.nodes[0].getnewaddress(), 1)
         sync_mempools(self.nodes)
 
-        self.nodes.append(start_node(3, self.options.tmpdir))
+        self.nodes.append(start_node(3, self.options.tmpdir, self.extra_args[3]))
         connect_nodes_bi(self.nodes, 0, 3)
         sync_blocks(self.nodes)
 

From dad932c241a3fe9ef8e4dc36596381666ab4f879 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Anders=20=C3=98yvind=20Urke-S=C3=A6tre?=
 <andersoyvind@gmail.com>
Date: Wed, 14 Sep 2016 13:05:18 +0200
Subject: [PATCH 0883/1802] Minor change in section name

Changed 'build' to 'create', as the section name have changed in newer versions of release-process.md
---
 doc/gitian-building.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/gitian-building.md b/doc/gitian-building.md
index 938f92ff1281f..84dce3f082ff9 100644
--- a/doc/gitian-building.md
+++ b/doc/gitian-building.md
@@ -337,7 +337,7 @@ Getting and building the inputs
 --------------------------------
 
 Follow the instructions in [doc/release-process.md](release-process.md#fetch-and-build-inputs-first-time-or-when-dependency-versions-change)
-in the bitcoin repository under 'Fetch and build inputs' to install sources which require
+in the bitcoin repository under 'Fetch and create inputs' to install sources which require
 manual intervention. Also optionally follow the next step: 'Seed the Gitian sources cache
 and offline git repositories' which will fetch the remaining files required for building
 offline.

From fad41f308f5e0e0650e3eed96c8c8575b3f7c33e Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Wed, 14 Sep 2016 16:28:50 +0200
Subject: [PATCH 0884/1802] [qa] walletbackup: Sync blocks inside the loop

---
 qa/rpc-tests/walletbackup.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/qa/rpc-tests/walletbackup.py b/qa/rpc-tests/walletbackup.py
index b991d5c761862..e12cb10a50ad7 100755
--- a/qa/rpc-tests/walletbackup.py
+++ b/qa/rpc-tests/walletbackup.py
@@ -45,12 +45,12 @@ def __init__(self):
         super().__init__()
         self.setup_clean_chain = True
         self.num_nodes = 4
+        # nodes 1, 2,3 are spenders, let's give them a keypool=100
+        self.extra_args = [["-keypool=100"], ["-keypool=100"], ["-keypool=100"], []]
 
     # This mirrors how the network was setup in the bash test
     def setup_network(self, split=False):
-        # nodes 1, 2,3 are spenders, let's give them a keypool=100
-        extra_args = [["-keypool=100"], ["-keypool=100"], ["-keypool=100"], []]
-        self.nodes = start_nodes(self.num_nodes, self.options.tmpdir, extra_args)
+        self.nodes = start_nodes(self.num_nodes, self.options.tmpdir, self.extra_args)
         connect_nodes(self.nodes[0], 3)
         connect_nodes(self.nodes[1], 3)
         connect_nodes(self.nodes[2], 3)
@@ -79,6 +79,7 @@ def do_one_round(self):
         # Must sync mempools before mining.
         sync_mempools(self.nodes)
         self.nodes[3].generate(1)
+        sync_blocks(self.nodes)
 
     # As above, this mirrors the original bash test.
     def start_three(self):

From f3552da81393a8e78ce3e2afed0b9c9d1ff5cee0 Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Mon, 12 Sep 2016 15:04:20 -0400
Subject: [PATCH 0885/1802] net: fix maxuploadtarget setting

This was broken by 63cafa6329e1a.

Note that while this fixes the settings, it doesn't fix the actual usage of
-maxuploadtarget completely, as there is currently a bug in the
nOptimisticBytesWritten accounting that causes a delayed response if the target
is reached. That bug will be addressed separately.
---
 src/init.cpp | 8 +++++++-
 src/net.cpp  | 5 +++--
 src/net.h    | 4 ++++
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/init.cpp b/src/init.cpp
index 8d1e330a05a55..dd3fbf8502602 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -1249,8 +1249,11 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
         RegisterValidationInterface(pzmqNotificationInterface);
     }
 #endif
+    uint64_t nMaxOutboundLimit = 0; //unlimited unless -maxuploadtarget is set
+    uint64_t nMaxOutboundTimeframe = MAX_UPLOAD_TIMEFRAME;
+
     if (mapArgs.count("-maxuploadtarget")) {
-        connman.SetMaxOutboundTarget(GetArg("-maxuploadtarget", DEFAULT_MAX_UPLOAD_TARGET)*1024*1024);
+        nMaxOutboundLimit = GetArg("-maxuploadtarget", DEFAULT_MAX_UPLOAD_TARGET)*1024*1024;
     }
 
     // ********************************************************* Step 7: load block chain
@@ -1533,6 +1536,9 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
     connOptions.nSendBufferMaxSize = 1000*GetArg("-maxsendbuffer", DEFAULT_MAXSENDBUFFER);
     connOptions.nReceiveFloodSize = 1000*GetArg("-maxreceivebuffer", DEFAULT_MAXRECEIVEBUFFER);
 
+    connOptions.nMaxOutboundTimeframe = nMaxOutboundTimeframe;
+    connOptions.nMaxOutboundLimit = nMaxOutboundLimit;
+
     if(!connman.Start(threadGroup, scheduler, strNodeError, connOptions))
         return InitError(strNodeError);
 
diff --git a/src/net.cpp b/src/net.cpp
index cc9728b85395e..ac64b28ea86a7 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -2046,9 +2046,7 @@ bool CConnman::Start(boost::thread_group& threadGroup, CScheduler& scheduler, st
 {
     nTotalBytesRecv = 0;
     nTotalBytesSent = 0;
-    nMaxOutboundLimit = 0;
     nMaxOutboundTotalBytesSentInCycle = 0;
-    nMaxOutboundTimeframe = 60*60*24; //1 day
     nMaxOutboundCycleStartTime = 0;
 
     nRelevantServices = connOptions.nRelevantServices;
@@ -2060,6 +2058,9 @@ bool CConnman::Start(boost::thread_group& threadGroup, CScheduler& scheduler, st
     nSendBufferMaxSize = connOptions.nSendBufferMaxSize;
     nReceiveFloodSize = connOptions.nSendBufferMaxSize;
 
+    nMaxOutboundLimit = connOptions.nMaxOutboundLimit;
+    nMaxOutboundTimeframe = connOptions.nMaxOutboundTimeframe;
+
     SetBestHeight(connOptions.nBestHeight);
 
     clientInterface = connOptions.uiInterface;
diff --git a/src/net.h b/src/net.h
index a48ee02c44906..dbed8b3dd5ccb 100644
--- a/src/net.h
+++ b/src/net.h
@@ -72,6 +72,8 @@ static const size_t SETASKFOR_MAX_SZ = 2 * MAX_INV_SZ;
 static const unsigned int DEFAULT_MAX_PEER_CONNECTIONS = 125;
 /** The default for -maxuploadtarget. 0 = Unlimited */
 static const uint64_t DEFAULT_MAX_UPLOAD_TARGET = 0;
+/** The default timeframe for -maxuploadtarget. 1 day. */
+static const uint64_t MAX_UPLOAD_TIMEFRAME = 60 * 60 * 24;
 /** Default for blocks only*/
 static const bool DEFAULT_BLOCKSONLY = false;
 
@@ -120,6 +122,8 @@ class CConnman
         CClientUIInterface* uiInterface = nullptr;
         unsigned int nSendBufferMaxSize = 0;
         unsigned int nReceiveFloodSize = 0;
+        uint64_t nMaxOutboundTimeframe = 0;
+        uint64_t nMaxOutboundLimit = 0;
     };
     CConnman();
     ~CConnman();

From 64047f8e7feb518fc2fa79feee1af983798883cc Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Wed, 14 Sep 2016 17:25:53 +0000
Subject: [PATCH 0886/1802] depends: Add libevent compatibility patch for
 windows

Add a patch that seems to be necessary for compatibilty of libevent
2.0.22 with recent mingw-w64 gcc versions (at least GCC 5.3.1 from Ubuntu
16.04).

Without this patch the Content-Length in the HTTP header ends up as
`Content-Length: zu`, causing communication between the RPC
client and server to break down. See discussion in #8653.

Source: https://sourceforge.net/p/levent/bugs/363/

Thanks to @sstone for the suggestion.
---
 depends/packages/libevent.mk                   |  5 +++--
 .../patches/libevent/libevent-2-fixes.patch    | 18 ++++++++++++++++++
 2 files changed, 21 insertions(+), 2 deletions(-)
 create mode 100644 depends/patches/libevent/libevent-2-fixes.patch

diff --git a/depends/packages/libevent.mk b/depends/packages/libevent.mk
index 2e9be1e98cced..4b02b2eff9eb4 100644
--- a/depends/packages/libevent.mk
+++ b/depends/packages/libevent.mk
@@ -3,10 +3,11 @@ $(package)_version=2.0.22
 $(package)_download_path=https://github.com/libevent/libevent/releases/download/release-2.0.22-stable
 $(package)_file_name=$(package)-$($(package)_version)-stable.tar.gz
 $(package)_sha256_hash=71c2c49f0adadacfdbe6332a372c38cf9c8b7895bb73dabeaa53cdcc1d4e1fa3
-$(package)_patches=reuseaddr.patch
+$(package)_patches=reuseaddr.patch libevent-2-fixes.patch
 
 define $(package)_preprocess_cmds
-  patch -p1 < $($(package)_patch_dir)/reuseaddr.patch
+  patch -p1 < $($(package)_patch_dir)/reuseaddr.patch && \
+  patch -p1 < $($(package)_patch_dir)/libevent-2-fixes.patch
 endef
 
 define $(package)_set_vars
diff --git a/depends/patches/libevent/libevent-2-fixes.patch b/depends/patches/libevent/libevent-2-fixes.patch
new file mode 100644
index 0000000000000..79fec8a48851c
--- /dev/null
+++ b/depends/patches/libevent/libevent-2-fixes.patch
@@ -0,0 +1,18 @@
+--- a/util-internal.h	2013-11-01 12:18:57.000000000 -0600
++++ b/util-internal.h	2015-07-20 20:19:43.199560900 -0500
+@@ -299,8 +299,13 @@ HANDLE evutil_load_windows_system_librar
+ 
+ #if defined(__STDC__) && defined(__STDC_VERSION__)
+ #if (__STDC_VERSION__ >= 199901L)
+-#define EV_SIZE_FMT "%zu"
+-#define EV_SSIZE_FMT "%zd"
++ #if defined(_MSC_VER) || defined(__MINGW32__) || defined(__MINGW64__)
++  #define EV_SIZE_FMT "%Iu"
++  #define EV_SSIZE_FMT "%Id"
++ #else
++  #define EV_SIZE_FMT "%zu"
++  #define EV_SSIZE_FMT "%zd"
++ #endif
+ #define EV_SIZE_ARG(x) (x)
+ #define EV_SSIZE_ARG(x) (x)
+ #endif

From 159ed95f7452ab5454e9d660f6f095b8476b1eed Mon Sep 17 00:00:00 2001
From: Jiaxing Wang <hello.wjx@gmail.com>
Date: Thu, 15 Sep 2016 17:39:54 +0800
Subject: [PATCH 0887/1802] base58: Improve DecodeBase58 performance.

Improve DecodeBase58 performance the same way as commit 3252208 did
for EncodeBase58.
---
 src/base58.cpp | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/base58.cpp b/src/base58.cpp
index d1d60a6f1dcf5..405b67c153711 100644
--- a/src/base58.cpp
+++ b/src/base58.cpp
@@ -25,12 +25,14 @@ bool DecodeBase58(const char* psz, std::vector<unsigned char>& vch)
         psz++;
     // Skip and count leading '1's.
     int zeroes = 0;
+    int length = 0;
     while (*psz == '1') {
         zeroes++;
         psz++;
     }
     // Allocate enough space in big-endian base256 representation.
-    std::vector<unsigned char> b256(strlen(psz) * 733 / 1000 + 1); // log(58) / log(256), rounded up.
+    int size = strlen(psz) * 733 /1000 + 1; // log(58) / log(256), rounded up.
+    std::vector<unsigned char> b256(size);
     // Process the characters.
     while (*psz && !isspace(*psz)) {
         // Decode base58 character
@@ -39,12 +41,14 @@ bool DecodeBase58(const char* psz, std::vector<unsigned char>& vch)
             return false;
         // Apply "b256 = b256 * 58 + ch".
         int carry = ch - pszBase58;
-        for (std::vector<unsigned char>::reverse_iterator it = b256.rbegin(); it != b256.rend(); it++) {
+        int i = 0;
+        for (std::vector<unsigned char>::reverse_iterator it = b256.rbegin(); (carry != 0 || i < length) && (it != b256.rend()); it++, i++) {
             carry += 58 * (*it);
             *it = carry % 256;
             carry /= 256;
         }
         assert(carry == 0);
+        length = i;
         psz++;
     }
     // Skip trailing spaces.
@@ -53,7 +57,7 @@ bool DecodeBase58(const char* psz, std::vector<unsigned char>& vch)
     if (*psz != 0)
         return false;
     // Skip leading zeroes in b256.
-    std::vector<unsigned char>::iterator it = b256.begin();
+    std::vector<unsigned char>::iterator it = b256.begin() + (size - length);
     while (it != b256.end() && *it == 0)
         it++;
     // Copy result into output vector.

From b4fb51271905f9ef39e5c2bc7e8c15e7489394a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pavel=20Jan=C3=ADk?= <Pavel@Janik.cz>
Date: Thu, 15 Sep 2016 12:40:09 +0200
Subject: [PATCH 0888/1802] UndoReadFromDisk works on undo files (rev), not on
 block files.

---
 src/main.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main.cpp b/src/main.cpp
index 593897f5163c1..10cb54e94b7bb 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -2062,7 +2062,7 @@ bool UndoReadFromDisk(CBlockUndo& blockundo, const CDiskBlockPos& pos, const uin
     // Open history file to read
     CAutoFile filein(OpenUndoFile(pos, true), SER_DISK, CLIENT_VERSION);
     if (filein.IsNull())
-        return error("%s: OpenBlockFile failed", __func__);
+        return error("%s: OpenUndoFile failed", __func__);
 
     // Read block
     uint256 hashChecksum;

From 59adc86680911a83dcccf5b23db299a370fc92f2 Mon Sep 17 00:00:00 2001
From: Patrick Strateman <patrick.strateman@gmail.com>
Date: Fri, 9 Sep 2016 18:53:23 -0700
Subject: [PATCH 0889/1802] Add CWallet::ListAccountCreditDebit

Simple pass through for CWalletDB::ListAccountCreditDebit
---
 src/wallet/test/accounting_tests.cpp | 2 +-
 src/wallet/wallet.cpp                | 5 +++++
 src/wallet/wallet.h                  | 1 +
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/wallet/test/accounting_tests.cpp b/src/wallet/test/accounting_tests.cpp
index a6cada46a226c..1863652fd72fc 100644
--- a/src/wallet/test/accounting_tests.cpp
+++ b/src/wallet/test/accounting_tests.cpp
@@ -23,7 +23,7 @@ GetResults(CWalletDB& walletdb, std::map<CAmount, CAccountingEntry>& results)
 
     results.clear();
     BOOST_CHECK(walletdb.ReorderTransactions(pwalletMain) == DB_LOAD_OK);
-    walletdb.ListAccountCreditDebit("", aes);
+    pwalletMain->ListAccountCreditDebit("", aes);
     BOOST_FOREACH(CAccountingEntry& ae, aes)
     {
         results[ae.nOrderPos] = ae;
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index 4c10ea0edbf0a..7b55111673708 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -2501,6 +2501,11 @@ bool CWallet::CommitTransaction(CWalletTx& wtxNew, CReserveKey& reservekey, CCon
     return true;
 }
 
+void CWallet::ListAccountCreditDebit(const std::string& strAccount, std::list<CAccountingEntry>& entries) {
+    CWalletDB walletdb(strWalletFile);
+    return walletdb.ListAccountCreditDebit(strAccount, entries);
+}
+
 bool CWallet::AddAccountingEntry(const CAccountingEntry& acentry, CWalletDB & pwalletdb)
 {
     if (!pwalletdb.WriteAccountingEntry_Backend(acentry))
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
index 61aff6e45a967..160e097a8e7a4 100644
--- a/src/wallet/wallet.h
+++ b/src/wallet/wallet.h
@@ -775,6 +775,7 @@ class CWallet : public CCryptoKeyStore, public CValidationInterface
                            std::string& strFailReason, const CCoinControl *coinControl = NULL, bool sign = true);
     bool CommitTransaction(CWalletTx& wtxNew, CReserveKey& reservekey, CConnman* connman);
 
+    void ListAccountCreditDebit(const std::string& strAccount, std::list<CAccountingEntry>& entries);
     bool AddAccountingEntry(const CAccountingEntry&, CWalletDB & pwalletdb);
 
     static CFeeRate minTxFee;

From d2e678d7d220e2f430c2cb4bde559acee00c8c7c Mon Sep 17 00:00:00 2001
From: Patrick Strateman <patrick.strateman@gmail.com>
Date: Fri, 9 Sep 2016 19:21:44 -0700
Subject: [PATCH 0890/1802] Add CWallet::ReorderTransactions and use in
 accounting_tests.cpp

---
 src/wallet/test/accounting_tests.cpp | 2 +-
 src/wallet/wallet.cpp                | 6 ++++++
 src/wallet/wallet.h                  | 1 +
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/wallet/test/accounting_tests.cpp b/src/wallet/test/accounting_tests.cpp
index 1863652fd72fc..ad2f081b4edc8 100644
--- a/src/wallet/test/accounting_tests.cpp
+++ b/src/wallet/test/accounting_tests.cpp
@@ -22,7 +22,7 @@ GetResults(CWalletDB& walletdb, std::map<CAmount, CAccountingEntry>& results)
     std::list<CAccountingEntry> aes;
 
     results.clear();
-    BOOST_CHECK(walletdb.ReorderTransactions(pwalletMain) == DB_LOAD_OK);
+    BOOST_CHECK(pwalletMain->ReorderTransactions() == DB_LOAD_OK);
     pwalletMain->ListAccountCreditDebit("", aes);
     BOOST_FOREACH(CAccountingEntry& ae, aes)
     {
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index 7b55111673708..fe9671926a8d1 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -649,6 +649,12 @@ bool CWallet::EncryptWallet(const SecureString& strWalletPassphrase)
     return true;
 }
 
+DBErrors CWallet::ReorderTransactions()
+{
+    CWalletDB walletdb(strWalletFile);
+    return walletdb.ReorderTransactions(this);
+}
+
 int64_t CWallet::IncOrderPosNext(CWalletDB *pwalletdb)
 {
     AssertLockHeld(cs_wallet); // nOrderPosNext
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
index 160e097a8e7a4..2b978ba1ee092 100644
--- a/src/wallet/wallet.h
+++ b/src/wallet/wallet.h
@@ -741,6 +741,7 @@ class CWallet : public CCryptoKeyStore, public CValidationInterface
      * @return next transaction order id
      */
     int64_t IncOrderPosNext(CWalletDB *pwalletdb = NULL);
+    DBErrors ReorderTransactions();
     bool AccountMove(std::string strFrom, std::string strTo, CAmount nAmount, std::string strComment = "");
     bool GetAccountPubkey(CPubKey &pubKey, std::string strAccount, bool bForceNew = false);
 

From 157254a4bfdfc4ca3ad5bf2d84e82f290bd0c7f2 Mon Sep 17 00:00:00 2001
From: Suhas Daftuar <sdaftuar@chaincode.com>
Date: Wed, 14 Sep 2016 21:00:53 -0400
Subject: [PATCH 0891/1802] Fix broken sendcmpct test in p2p-compactblocks.py

Python lambda use was incorrect.

sendcmpct messages need to be synchronized with RPC calls to generate().

Headers need to be synced (eg with getheaders) for cmpctblock announcements
to start.

Last test omitted sending a sendcmpct message.
---
 qa/rpc-tests/p2p-compactblocks.py | 58 ++++++++++++++++++++-----------
 1 file changed, 37 insertions(+), 21 deletions(-)

diff --git a/qa/rpc-tests/p2p-compactblocks.py b/qa/rpc-tests/p2p-compactblocks.py
index 7fe7ecc16c6e1..bf4fb43add3df 100755
--- a/qa/rpc-tests/p2p-compactblocks.py
+++ b/qa/rpc-tests/p2p-compactblocks.py
@@ -78,6 +78,13 @@ def send_header_for_blocks(self, new_blocks):
         headers_message.headers = [CBlockHeader(b) for b in new_blocks]
         self.send_message(headers_message)
 
+    def request_headers_and_sync(self, locator, hashstop=0):
+        self.clear_block_announcement()
+        self.get_headers(locator, hashstop)
+        assert(wait_until(self.received_block_announcement, timeout=30))
+        assert(self.received_block_announcement())
+        self.clear_block_announcement()
+
 
 class CompactBlocksTest(BitcoinTestFramework):
     def __init__(self):
@@ -130,7 +137,7 @@ def make_utxos(self):
     # Test "sendcmpct":
     # - No compact block announcements or getdata(MSG_CMPCT_BLOCK) unless
     #   sendcmpct is sent.
-    # - If sendcmpct is sent with version > 0, the message is ignored.
+    # - If sendcmpct is sent with version > 1, the message is ignored.
     # - If sendcmpct is sent with boolean 0, then block announcements are not
     #   made with compact blocks.
     # - If sendcmpct is then sent with boolean 1, then new block announcements
@@ -142,57 +149,66 @@ def test_sendcmpct(self):
         def received_sendcmpct():
             return (self.test_node.last_sendcmpct is not None)
         got_message = wait_until(received_sendcmpct, timeout=30)
+        assert(received_sendcmpct())
         assert(got_message)
         assert_equal(self.test_node.last_sendcmpct.version, 1)
 
         tip = int(self.nodes[0].getbestblockhash(), 16)
 
         def check_announcement_of_new_block(node, peer, predicate):
-            self.test_node.clear_block_announcement()
+            peer.clear_block_announcement()
             node.generate(1)
-            got_message = wait_until(peer.received_block_announcement, timeout=30)
+            got_message = wait_until(lambda: peer.block_announced, timeout=30)
+            assert(peer.block_announced)
             assert(got_message)
             with mininode_lock:
-                assert(predicate)
+                assert(predicate(peer))
 
         # We shouldn't get any block announcements via cmpctblock yet.
-        check_announcement_of_new_block(self.nodes[0], self.test_node, lambda: self.test_node.last_cmpctblock is None)
+        check_announcement_of_new_block(self.nodes[0], self.test_node, lambda p: p.last_cmpctblock is None)
 
         # Try one more time, this time after requesting headers.
-        self.test_node.clear_block_announcement()
-        self.test_node.get_headers(locator=[tip], hashstop=0)
-        wait_until(self.test_node.received_block_announcement, timeout=30)
-        self.test_node.clear_block_announcement()
+        self.test_node.request_headers_and_sync(locator=[tip])
+        check_announcement_of_new_block(self.nodes[0], self.test_node, lambda p: p.last_cmpctblock is None and p.last_inv is not None)
 
-        check_announcement_of_new_block(self.nodes[0], self.test_node, lambda: self.test_node.last_cmpctblock is None and self.test_node.last_inv is not None)
+        # Test a few ways of using sendcmpct that should NOT
+        # result in compact block announcements.
+        # Before each test, sync the headers chain.
+        self.test_node.request_headers_and_sync(locator=[tip])
 
         # Now try a SENDCMPCT message with too-high version
         sendcmpct = msg_sendcmpct()
         sendcmpct.version = 2
-        self.test_node.send_message(sendcmpct)
+        self.test_node.send_and_ping(sendcmpct)
+        check_announcement_of_new_block(self.nodes[0], self.test_node, lambda p: p.last_cmpctblock is None)
 
-        check_announcement_of_new_block(self.nodes[0], self.test_node, lambda: self.test_node.last_cmpctblock is None)
+        # Headers sync before next test.
+        self.test_node.request_headers_and_sync(locator=[tip])
 
         # Now try a SENDCMPCT message with valid version, but announce=False
-        self.test_node.send_message(msg_sendcmpct())
-        check_announcement_of_new_block(self.nodes[0], self.test_node, lambda: self.test_node.last_cmpctblock is None)
+        self.test_node.send_and_ping(msg_sendcmpct())
+        check_announcement_of_new_block(self.nodes[0], self.test_node, lambda p: p.last_cmpctblock is None)
+
+        # Headers sync before next test.
+        self.test_node.request_headers_and_sync(locator=[tip])
 
         # Finally, try a SENDCMPCT message with announce=True
         sendcmpct.version = 1
         sendcmpct.announce = True
-        self.test_node.send_message(sendcmpct)
-        check_announcement_of_new_block(self.nodes[0], self.test_node, lambda: self.test_node.last_cmpctblock is not None)
+        self.test_node.send_and_ping(sendcmpct)
+        check_announcement_of_new_block(self.nodes[0], self.test_node, lambda p: p.last_cmpctblock is not None)
 
-        # Try one more time
-        check_announcement_of_new_block(self.nodes[0], self.test_node, lambda: self.test_node.last_cmpctblock is not None)
+        # Try one more time (no headers sync should be needed!)
+        check_announcement_of_new_block(self.nodes[0], self.test_node, lambda p: p.last_cmpctblock is not None)
 
         # Try one more time, after turning on sendheaders
-        self.test_node.send_message(msg_sendheaders())
-        check_announcement_of_new_block(self.nodes[0], self.test_node, lambda: self.test_node.last_cmpctblock is not None)
+        self.test_node.send_and_ping(msg_sendheaders())
+        check_announcement_of_new_block(self.nodes[0], self.test_node, lambda p: p.last_cmpctblock is not None)
 
         # Now turn off announcements
         sendcmpct.announce = False
-        check_announcement_of_new_block(self.nodes[0], self.test_node, lambda: self.test_node.last_cmpctblock is None and self.test_node.last_headers is not None)
+        self.test_node.send_and_ping(sendcmpct)
+        check_announcement_of_new_block(self.nodes[0], self.test_node, lambda p: p.last_cmpctblock is None and p.last_headers is not None)
 
     # This test actually causes bitcoind to (reasonably!) disconnect us, so do this last.
     def test_invalid_cmpctblock_message(self):

From 02e2a815367945ea556a1ae9c3596917553ddfdb Mon Sep 17 00:00:00 2001
From: Patrick Strateman <patrick.strateman@gmail.com>
Date: Fri, 9 Sep 2016 19:22:59 -0700
Subject: [PATCH 0892/1802] Remove pwalletdb parameter from
 CWallet::AddAccountingEntry

---
 src/wallet/test/accounting_tests.cpp |  8 ++++----
 src/wallet/wallet.cpp                | 15 +++++++++++----
 src/wallet/wallet.h                  |  3 ++-
 3 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/src/wallet/test/accounting_tests.cpp b/src/wallet/test/accounting_tests.cpp
index ad2f081b4edc8..6fc3a32aefe3a 100644
--- a/src/wallet/test/accounting_tests.cpp
+++ b/src/wallet/test/accounting_tests.cpp
@@ -45,7 +45,7 @@ BOOST_AUTO_TEST_CASE(acc_orderupgrade)
     ae.nTime = 1333333333;
     ae.strOtherAccount = "b";
     ae.strComment = "";
-    pwalletMain->AddAccountingEntry(ae, walletdb);
+    pwalletMain->AddAccountingEntry(ae);
 
     wtx.mapValue["comment"] = "z";
     pwalletMain->AddToWallet(wtx);
@@ -55,7 +55,7 @@ BOOST_AUTO_TEST_CASE(acc_orderupgrade)
 
     ae.nTime = 1333333336;
     ae.strOtherAccount = "c";
-    pwalletMain->AddAccountingEntry(ae, walletdb);
+    pwalletMain->AddAccountingEntry(ae);
 
     GetResults(walletdb, results);
 
@@ -71,7 +71,7 @@ BOOST_AUTO_TEST_CASE(acc_orderupgrade)
     ae.nTime = 1333333330;
     ae.strOtherAccount = "d";
     ae.nOrderPos = pwalletMain->IncOrderPosNext();
-    pwalletMain->AddAccountingEntry(ae, walletdb);
+    pwalletMain->AddAccountingEntry(ae);
 
     GetResults(walletdb, results);
 
@@ -121,7 +121,7 @@ BOOST_AUTO_TEST_CASE(acc_orderupgrade)
     ae.nTime = 1333333334;
     ae.strOtherAccount = "e";
     ae.nOrderPos = -1;
-    pwalletMain->AddAccountingEntry(ae, walletdb);
+    pwalletMain->AddAccountingEntry(ae);
 
     GetResults(walletdb, results);
 
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index fe9671926a8d1..1d7ddd99a3360 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -683,7 +683,7 @@ bool CWallet::AccountMove(std::string strFrom, std::string strTo, CAmount nAmoun
     debit.nTime = nNow;
     debit.strOtherAccount = strTo;
     debit.strComment = strComment;
-    AddAccountingEntry(debit, walletdb);
+    AddAccountingEntry(debit, &walletdb);
 
     // Credit
     CAccountingEntry credit;
@@ -693,7 +693,7 @@ bool CWallet::AccountMove(std::string strFrom, std::string strTo, CAmount nAmoun
     credit.nTime = nNow;
     credit.strOtherAccount = strFrom;
     credit.strComment = strComment;
-    AddAccountingEntry(credit, walletdb);
+    AddAccountingEntry(credit, &walletdb);
 
     if (!walletdb.TxnCommit())
         return false;
@@ -2512,9 +2512,16 @@ void CWallet::ListAccountCreditDebit(const std::string& strAccount, std::list<CA
     return walletdb.ListAccountCreditDebit(strAccount, entries);
 }
 
-bool CWallet::AddAccountingEntry(const CAccountingEntry& acentry, CWalletDB & pwalletdb)
+bool CWallet::AddAccountingEntry(const CAccountingEntry& acentry)
 {
-    if (!pwalletdb.WriteAccountingEntry_Backend(acentry))
+    CWalletDB walletdb(strWalletFile);
+
+    return AddAccountingEntry(acentry, &walletdb);
+}
+
+bool CWallet::AddAccountingEntry(const CAccountingEntry& acentry, CWalletDB *pwalletdb)
+{
+    if (!pwalletdb->WriteAccountingEntry_Backend(acentry))
         return false;
 
     laccentries.push_back(acentry);
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
index 2b978ba1ee092..584f013204931 100644
--- a/src/wallet/wallet.h
+++ b/src/wallet/wallet.h
@@ -777,7 +777,8 @@ class CWallet : public CCryptoKeyStore, public CValidationInterface
     bool CommitTransaction(CWalletTx& wtxNew, CReserveKey& reservekey, CConnman* connman);
 
     void ListAccountCreditDebit(const std::string& strAccount, std::list<CAccountingEntry>& entries);
-    bool AddAccountingEntry(const CAccountingEntry&, CWalletDB & pwalletdb);
+    bool AddAccountingEntry(const CAccountingEntry&);
+    bool AddAccountingEntry(const CAccountingEntry&, CWalletDB *pwalletdb);
 
     static CFeeRate minTxFee;
     static CFeeRate fallbackFee;

From 2ca6b9df1dfe50c294b01b5f06c5c5c7489f46c3 Mon Sep 17 00:00:00 2001
From: Patrick Strateman <patrick.strateman@gmail.com>
Date: Fri, 9 Sep 2016 19:23:36 -0700
Subject: [PATCH 0893/1802] Remove last reference to CWalletDB from
 accounting_tests.cpp

---
 src/wallet/test/accounting_tests.cpp | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/wallet/test/accounting_tests.cpp b/src/wallet/test/accounting_tests.cpp
index 6fc3a32aefe3a..a833be13d065a 100644
--- a/src/wallet/test/accounting_tests.cpp
+++ b/src/wallet/test/accounting_tests.cpp
@@ -3,7 +3,6 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include "wallet/wallet.h"
-#include "wallet/walletdb.h"
 
 #include "wallet/test/wallet_test_fixture.h"
 
@@ -17,7 +16,7 @@ extern CWallet* pwalletMain;
 BOOST_FIXTURE_TEST_SUITE(accounting_tests, WalletTestingSetup)
 
 static void
-GetResults(CWalletDB& walletdb, std::map<CAmount, CAccountingEntry>& results)
+GetResults(std::map<CAmount, CAccountingEntry>& results)
 {
     std::list<CAccountingEntry> aes;
 
@@ -32,7 +31,6 @@ GetResults(CWalletDB& walletdb, std::map<CAmount, CAccountingEntry>& results)
 
 BOOST_AUTO_TEST_CASE(acc_orderupgrade)
 {
-    CWalletDB walletdb(pwalletMain->strWalletFile);
     std::vector<CWalletTx*> vpwtx;
     CWalletTx wtx;
     CAccountingEntry ae;
@@ -57,7 +55,7 @@ BOOST_AUTO_TEST_CASE(acc_orderupgrade)
     ae.strOtherAccount = "c";
     pwalletMain->AddAccountingEntry(ae);
 
-    GetResults(walletdb, results);
+    GetResults(results);
 
     BOOST_CHECK(pwalletMain->nOrderPosNext == 3);
     BOOST_CHECK(2 == results.size());
@@ -73,7 +71,7 @@ BOOST_AUTO_TEST_CASE(acc_orderupgrade)
     ae.nOrderPos = pwalletMain->IncOrderPosNext();
     pwalletMain->AddAccountingEntry(ae);
 
-    GetResults(walletdb, results);
+    GetResults(results);
 
     BOOST_CHECK(results.size() == 3);
     BOOST_CHECK(pwalletMain->nOrderPosNext == 4);
@@ -105,7 +103,7 @@ BOOST_AUTO_TEST_CASE(acc_orderupgrade)
     vpwtx[2]->nTimeReceived = (unsigned int)1333333329;
     vpwtx[2]->nOrderPos = -1;
 
-    GetResults(walletdb, results);
+    GetResults(results);
 
     BOOST_CHECK(results.size() == 3);
     BOOST_CHECK(pwalletMain->nOrderPosNext == 6);
@@ -123,7 +121,7 @@ BOOST_AUTO_TEST_CASE(acc_orderupgrade)
     ae.nOrderPos = -1;
     pwalletMain->AddAccountingEntry(ae);
 
-    GetResults(walletdb, results);
+    GetResults(results);
 
     BOOST_CHECK(results.size() == 4);
     BOOST_CHECK(pwalletMain->nOrderPosNext == 7);

From d9c99c3058c90f4f7075cf5c495b8dcd2e7519a7 Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Thu, 15 Sep 2016 23:32:45 +0200
Subject: [PATCH 0894/1802] net: No longer send local address in addrMe

After #8594 the addrFrom sent by a node is not used anymore at all,
so don't bother sending it.

Also mitigates the privacy issue in (#8616). It doesn't completely solve
the issue as GetLocalAddress is also called in AdvertiseLocal, but at
least when advertising addresses it stands out less as *our* address.
---
 src/net.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/net.cpp b/src/net.cpp
index cc9728b85395e..38b1e7926a900 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -448,7 +448,7 @@ void CNode::PushVersion()
 {
     int64_t nTime = (fInbound ? GetAdjustedTime() : GetTime());
     CAddress addrYou = (addr.IsRoutable() && !IsProxy(addr) ? addr : CAddress(CService(), addr.nServices));
-    CAddress addrMe = GetLocalAddress(&addr, nLocalServices);
+    CAddress addrMe = CAddress(CService(), nLocalServices);
     if (fLogIPs)
         LogPrint("net", "send version message: version %d, blocks=%d, us=%s, them=%s, peer=%d\n", PROTOCOL_VERSION, nMyStartingHeight, addrMe.ToString(), addrYou.ToString(), id);
     else

From c4084c208509c42f796ebaa3eaded5f1cd40c506 Mon Sep 17 00:00:00 2001
From: fanquake <fanquake@gmail.com>
Date: Fri, 16 Sep 2016 11:45:08 +0800
Subject: [PATCH 0895/1802] Specify Protobuf version 2 in paymentrequest.proto

---
 src/qt/paymentrequest.proto | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/qt/paymentrequest.proto b/src/qt/paymentrequest.proto
index b2281c4c7b340..d2721a34bde8f 100644
--- a/src/qt/paymentrequest.proto
+++ b/src/qt/paymentrequest.proto
@@ -6,6 +6,8 @@
 // https://en.bitcoin.it/wiki/Payment_Request
 //
 
+syntax = "proto2";
+
 package payments;
 option java_package = "org.bitcoin.protocols.payments";
 option java_outer_classname = "Protos";

From 6b6cbddb4c028e38913730eb7f8c0dfbb55809b9 Mon Sep 17 00:00:00 2001
From: fanquake <fanquake@gmail.com>
Date: Fri, 29 Jul 2016 10:48:13 +0800
Subject: [PATCH 0896/1802] [depends] expat 2.2.0

---
 depends/packages/expat.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/depends/packages/expat.mk b/depends/packages/expat.mk
index bd2927563850b..81a660e83a557 100644
--- a/depends/packages/expat.mk
+++ b/depends/packages/expat.mk
@@ -1,8 +1,8 @@
 package=expat
-$(package)_version=2.1.1
+$(package)_version=2.2.0
 $(package)_download_path=https://downloads.sourceforge.net/project/expat/expat/$($(package)_version)
 $(package)_file_name=$(package)-$($(package)_version).tar.bz2
-$(package)_sha256_hash=aff584e5a2f759dcfc6d48671e9529f6afe1e30b0cd6a4cec200cbe3f793de67
+$(package)_sha256_hash=d9e50ff2d19b3538bd2127902a89987474e1a4db8e43a66a4d1a712ab9a504ff
 
 define $(package)_set_vars
 $(package)_config_opts=--disable-static

From 9616ac8a404dc73e7b5e8036a7ba14ccbe7b2616 Mon Sep 17 00:00:00 2001
From: fanquake <fanquake@gmail.com>
Date: Fri, 29 Jul 2016 10:48:43 +0800
Subject: [PATCH 0897/1802] [depends] ccache 3.3.1

---
 depends/packages/native_ccache.mk | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/depends/packages/native_ccache.mk b/depends/packages/native_ccache.mk
index 9216e175983a9..a3a58604e583c 100644
--- a/depends/packages/native_ccache.mk
+++ b/depends/packages/native_ccache.mk
@@ -1,8 +1,8 @@
 package=native_ccache
-$(package)_version=3.2.5
-$(package)_download_path=http://samba.org/ftp/ccache
+$(package)_version=3.3.1
+$(package)_download_path=https://samba.org/ftp/ccache
 $(package)_file_name=ccache-$($(package)_version).tar.bz2
-$(package)_sha256_hash=7a553809e90faf9de3a23ee9c5b5f786cfd4836bf502744bedb824a24bee1097
+$(package)_sha256_hash=cb6e4bafbb19ba0a2ec43386b123a5f92a20e1e3384c071d5d13e0cb3c84bf73
 
 define $(package)_set_vars
 $(package)_config_opts=

From 86d410d91b2188405a56bba5f1a1f74694be886a Mon Sep 17 00:00:00 2001
From: fanquake <fanquake@gmail.com>
Date: Sat, 3 Sep 2016 15:29:26 +0800
Subject: [PATCH 0898/1802] [depends] fontconfig 2.12.1

---
 depends/packages/fontconfig.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/depends/packages/fontconfig.mk b/depends/packages/fontconfig.mk
index 2cf553ed9657b..fb97e0b9ec1b3 100644
--- a/depends/packages/fontconfig.mk
+++ b/depends/packages/fontconfig.mk
@@ -1,8 +1,8 @@
 package=fontconfig
-$(package)_version=2.11.1
+$(package)_version=2.12.1
 $(package)_download_path=http://www.freedesktop.org/software/fontconfig/release/
 $(package)_file_name=$(package)-$($(package)_version).tar.bz2
-$(package)_sha256_hash=dc62447533bca844463a3c3fd4083b57c90f18a70506e7a9f4936b5a1e516a99
+$(package)_sha256_hash=b449a3e10c47e1d1c7a6ec6e2016cca73d3bd68fbbd4f0ae5cc6b573f7d6c7f3
 $(package)_dependencies=freetype expat
 
 define $(package)_set_vars

From e892dc1268d33bfba01f35b70359b286bb9d6376 Mon Sep 17 00:00:00 2001
From: Jiaxing Wang <hello.wjx@gmail.com>
Date: Fri, 16 Sep 2016 19:13:01 +0800
Subject: [PATCH 0899/1802] Use prefix operator in for loop of DecodeBase58.

---
 src/base58.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/base58.cpp b/src/base58.cpp
index 405b67c153711..f7768b5a647fb 100644
--- a/src/base58.cpp
+++ b/src/base58.cpp
@@ -42,7 +42,7 @@ bool DecodeBase58(const char* psz, std::vector<unsigned char>& vch)
         // Apply "b256 = b256 * 58 + ch".
         int carry = ch - pszBase58;
         int i = 0;
-        for (std::vector<unsigned char>::reverse_iterator it = b256.rbegin(); (carry != 0 || i < length) && (it != b256.rend()); it++, i++) {
+        for (std::vector<unsigned char>::reverse_iterator it = b256.rbegin(); (carry != 0 || i < length) && (it != b256.rend()); ++it, ++i) {
             carry += 58 * (*it);
             *it = carry % 256;
             carry /= 256;

From dddd04f979392a8c69cc11f5c54d817702eeed3e Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Sat, 17 Sep 2016 11:47:51 +0200
Subject: [PATCH 0900/1802] [qa] Refactor RPCTestHandler to prevent
 TimeoutExpired

---
 qa/pull-tester/rpc-tests.py | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/qa/pull-tester/rpc-tests.py b/qa/pull-tester/rpc-tests.py
index 771f6c7a0f348..9e187b019bc8e 100755
--- a/qa/pull-tester/rpc-tests.py
+++ b/qa/pull-tester/rpc-tests.py
@@ -251,21 +251,27 @@ def get_next(self):
             self.num_running += 1
             t = self.test_list.pop(0)
             port_seed = ["--portseed=%s" % len(self.test_list)]
+            log_stdout = tempfile.SpooledTemporaryFile(max_size=2**16)
+            log_stderr = tempfile.SpooledTemporaryFile(max_size=2**16)
             self.jobs.append((t,
                               time.time(),
                               subprocess.Popen((RPC_TESTS_DIR + t).split() + self.flags + port_seed,
                                                universal_newlines=True,
-                                               stdout=subprocess.PIPE,
-                                               stderr=subprocess.PIPE)))
+                                               stdout=log_stdout,
+                                               stderr=log_stderr),
+                              log_stdout,
+                              log_stderr))
         if not self.jobs:
             raise IndexError('pop from empty list')
         while True:
             # Return first proc that finishes
             time.sleep(.5)
             for j in self.jobs:
-                (name, time0, proc) = j
+                (name, time0, proc, log_out, log_err) = j
                 if proc.poll() is not None:
-                    (stdout, stderr) = proc.communicate(timeout=3)
+                    log_out.seek(0), log_err.seek(0)
+                    [stdout, stderr] = [l.read().decode('utf-8') for l in (log_out, log_err)]
+                    log_out.close(), log_err.close()
                     passed = stderr == "" and proc.returncode == 0
                     self.num_running -= 1
                     self.jobs.remove(j)

From b16a7f609fdb2efa9a8a1b82f09748b95b5ae4f6 Mon Sep 17 00:00:00 2001
From: Michael Ford <fanquake@users.noreply.github.com>
Date: Sun, 18 Sep 2016 19:53:02 +0800
Subject: [PATCH 0901/1802] [Doc] Target protobuf 2.6 in OS X build notes.

Homebrew now installs Protobuf version 3 by default, which doesn't currently compile. Install Protobuf 2.6.x from the versions tap instead.
---
 doc/build-osx.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/build-osx.md b/doc/build-osx.md
index c9eb4225abb5c..bc90a305622d5 100644
--- a/doc/build-osx.md
+++ b/doc/build-osx.md
@@ -16,7 +16,7 @@ Then install [Homebrew](http://brew.sh).
 Dependencies
 ----------------------
 
-    brew install automake berkeley-db4 libtool boost --c++11 miniupnpc openssl pkg-config protobuf --c++11 qt5 libevent
+    brew install automake berkeley-db4 libtool boost --c++11 miniupnpc openssl pkg-config homebrew/versions/protobuf260 --c++11 qt5 libevent
 
 NOTE: Building with Qt4 is still supported, however, could result in a broken UI. Building with Qt5 is recommended.
 

From d9ff591d42158e8a0a4ebdcf5fbb74978c483202 Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Fri, 9 Sep 2016 12:48:10 +0200
Subject: [PATCH 0902/1802] Move static global randomizer seeds into CConnman

---
 src/init.cpp              |  2 +-
 src/main.cpp              |  6 +++---
 src/net.cpp               | 23 +++++++++++++----------
 src/net.h                 | 13 ++++++++++---
 src/test/DoS_tests.cpp    |  8 ++++----
 src/test/net_tests.cpp    |  4 ++--
 src/test/test_bitcoin.cpp |  2 +-
 7 files changed, 34 insertions(+), 24 deletions(-)

diff --git a/src/init.cpp b/src/init.cpp
index 32b17192580c1..7b20e5b07ad08 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -1116,7 +1116,7 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
     // ********************************************************* Step 6: network initialization
 
     assert(!g_connman);
-    g_connman = std::unique_ptr<CConnman>(new CConnman());
+    g_connman = std::unique_ptr<CConnman>(new CConnman(GetRand(std::numeric_limits<uint64_t>::max()), GetRand(std::numeric_limits<uint64_t>::max())));
     CConnman& connman = *g_connman;
 
     RegisterNodeSignals(GetNodeSignals());
diff --git a/src/main.cpp b/src/main.cpp
index 593897f5163c1..1e191421b9d3b 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -113,6 +113,8 @@ CScript COINBASE_FLAGS;
 
 const string strMessageMagic = "Bitcoin Signed Message:\n";
 
+static const uint64_t RANDOMIZER_ID_ADDRESS_RELAY = 0x3cac0035b5866b90ULL; // SHA256("main address relay")[0:8]
+
 // Internal stuff
 namespace {
 
@@ -4739,11 +4741,9 @@ static void RelayAddress(const CAddress& addr, bool fReachable, CConnman& connma
     // Relay to a limited number of other nodes
     // Use deterministic randomness to send to the same nodes for 24 hours
     // at a time so the addrKnowns of the chosen nodes prevent repeats
-    static const uint64_t salt0 = GetRand(std::numeric_limits<uint64_t>::max());
-    static const uint64_t salt1 = GetRand(std::numeric_limits<uint64_t>::max());
     uint64_t hashAddr = addr.GetHash();
     std::multimap<uint64_t, CNode*> mapMix;
-    const CSipHasher hasher = CSipHasher(salt0, salt1).Write(hashAddr << 32).Write((GetTime() + hashAddr) / (24*60*60));
+    const CSipHasher hasher = connman.GetDeterministicRandomizer(RANDOMIZER_ID_ADDRESS_RELAY).Write(hashAddr << 32).Write((GetTime() + hashAddr) / (24*60*60));
 
     auto sortfunc = [&mapMix, &hasher](CNode* pnode) {
         if (pnode->nVersion >= CADDR_TIME_VERSION) {
diff --git a/src/net.cpp b/src/net.cpp
index 38b1e7926a900..5863f9d3f7ee1 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -63,6 +63,7 @@
 
 const static std::string NET_MESSAGE_COMMAND_OTHER = "*other*";
 
+static const uint64_t RANDOMIZER_ID_NETGROUP = 0x6c0edd8036ef4036ULL; // SHA256("netgroup")[0:8]
 //
 // Global state variables
 //
@@ -387,7 +388,7 @@ CNode* CConnman::ConnectNode(CAddress addrConnect, const char *pszDest, bool fCo
         addrman.Attempt(addrConnect, fCountFailure);
 
         // Add node
-        CNode* pnode = new CNode(GetNewNodeId(), nLocalServices, GetBestHeight(), hSocket, addrConnect, pszDest ? pszDest : "", false);
+        CNode* pnode = new CNode(GetNewNodeId(), nLocalServices, GetBestHeight(), hSocket, addrConnect, CalculateKeyedNetGroup(addrConnect), pszDest ? pszDest : "", false);
         GetNodeSignals().InitializeNode(pnode->GetId(), pnode);
         pnode->AddRef();
 
@@ -1022,7 +1023,7 @@ void CConnman::AcceptConnection(const ListenSocket& hListenSocket) {
         }
     }
 
-    CNode* pnode = new CNode(GetNewNodeId(), nLocalServices, GetBestHeight(), hSocket, addr, "", true);
+    CNode* pnode = new CNode(GetNewNodeId(), nLocalServices, GetBestHeight(), hSocket, addr, CalculateKeyedNetGroup(addr), "", true);
     GetNodeSignals().InitializeNode(pnode->GetId(), pnode);
     pnode->AddRef();
     pnode->fWhitelisted = whitelisted;
@@ -2023,7 +2024,7 @@ void Discover(boost::thread_group& threadGroup)
 #endif
 }
 
-CConnman::CConnman()
+CConnman::CConnman(uint64_t nSeed0In, uint64_t nSeed1In) : nSeed0(nSeed0In), nSeed1(nSeed1In)
 {
     setBannedIsDirty = false;
     fAddressesInitialized = false;
@@ -2108,7 +2109,7 @@ bool CConnman::Start(boost::thread_group& threadGroup, CScheduler& scheduler, st
     if (pnodeLocalHost == NULL) {
         CNetAddr local;
         LookupHost("127.0.0.1", local, false);
-        pnodeLocalHost = new CNode(GetNewNodeId(), nLocalServices, GetBestHeight(), INVALID_SOCKET, CAddress(CService(local, 0), nLocalServices));
+        pnodeLocalHost = new CNode(GetNewNodeId(), nLocalServices, GetBestHeight(), INVALID_SOCKET, CAddress(CService(local, 0), nLocalServices), 0);
         GetNodeSignals().InitializeNode(pnodeLocalHost->GetId(), pnodeLocalHost);
     }
 
@@ -2498,10 +2499,10 @@ void CNode::Fuzz(int nChance)
 unsigned int CConnman::GetReceiveFloodSize() const { return nReceiveFloodSize; }
 unsigned int CConnman::GetSendBufferSize() const{ return nSendBufferMaxSize; }
 
-CNode::CNode(NodeId idIn, ServiceFlags nLocalServicesIn, int nMyStartingHeightIn, SOCKET hSocketIn, const CAddress& addrIn, const std::string& addrNameIn, bool fInboundIn) :
+CNode::CNode(NodeId idIn, ServiceFlags nLocalServicesIn, int nMyStartingHeightIn, SOCKET hSocketIn, const CAddress& addrIn, uint64_t nKeyedNetGroupIn, const std::string& addrNameIn, bool fInboundIn) :
     ssSend(SER_NETWORK, INIT_PROTO_VERSION),
     addr(addrIn),
-    nKeyedNetGroup(CalculateKeyedNetGroup(addrIn)),
+    nKeyedNetGroup(nKeyedNetGroupIn),
     addrKnown(5000, 0.001),
     filterInventoryKnown(50000, 0.000001)
 {
@@ -2694,12 +2695,14 @@ int64_t PoissonNextSend(int64_t nNow, int average_interval_seconds) {
     return nNow + (int64_t)(log1p(GetRand(1ULL << 48) * -0.0000000000000035527136788 /* -1/2^48 */) * average_interval_seconds * -1000000.0 + 0.5);
 }
 
-/* static */ uint64_t CNode::CalculateKeyedNetGroup(const CAddress& ad)
+CSipHasher CConnman::GetDeterministicRandomizer(uint64_t id)
 {
-    static const uint64_t k0 = GetRand(std::numeric_limits<uint64_t>::max());
-    static const uint64_t k1 = GetRand(std::numeric_limits<uint64_t>::max());
+    return CSipHasher(nSeed0, nSeed1).Write(id);
+}
 
+uint64_t CConnman::CalculateKeyedNetGroup(const CAddress& ad)
+{
     std::vector<unsigned char> vchNetGroup(ad.GetGroup());
 
-    return CSipHasher(k0, k1).Write(&vchNetGroup[0], vchNetGroup.size()).Finalize();
+    return GetDeterministicRandomizer(RANDOMIZER_ID_NETGROUP).Write(&vchNetGroup[0], vchNetGroup.size()).Finalize();
 }
diff --git a/src/net.h b/src/net.h
index a48ee02c44906..07760f9d58d28 100644
--- a/src/net.h
+++ b/src/net.h
@@ -11,6 +11,7 @@
 #include "amount.h"
 #include "bloom.h"
 #include "compat.h"
+#include "hash.h"
 #include "limitedmap.h"
 #include "netaddress.h"
 #include "protocol.h"
@@ -121,7 +122,7 @@ class CConnman
         unsigned int nSendBufferMaxSize = 0;
         unsigned int nReceiveFloodSize = 0;
     };
-    CConnman();
+    CConnman(uint64_t seed0, uint64_t seed1);
     ~CConnman();
     bool Start(boost::thread_group& threadGroup, CScheduler& scheduler, std::string& strNodeError, Options options);
     void Stop();
@@ -294,6 +295,8 @@ class CConnman
     void SetBestHeight(int height);
     int GetBestHeight() const;
 
+    /** Get a unique deterministic randomizer. */
+    CSipHasher GetDeterministicRandomizer(uint64_t id);
 
 private:
     struct ListenSocket {
@@ -311,6 +314,8 @@ class CConnman
     void ThreadSocketHandler();
     void ThreadDNSAddressSeed();
 
+    uint64_t CalculateKeyedNetGroup(const CAddress& ad);
+
     CNode* FindNode(const CNetAddr& ip);
     CNode* FindNode(const CSubNet& subNet);
     CNode* FindNode(const std::string& addrName);
@@ -388,6 +393,9 @@ class CConnman
     int nMaxFeeler;
     std::atomic<int> nBestHeight;
     CClientUIInterface* clientInterface;
+
+    /** SipHasher seeds for deterministic randomness */
+    const uint64_t nSeed0, nSeed1;
 };
 extern std::unique_ptr<CConnman> g_connman;
 void Discover(boost::thread_group& threadGroup);
@@ -656,14 +664,13 @@ class CNode
     CAmount lastSentFeeFilter;
     int64_t nextSendTimeFeeFilter;
 
-    CNode(NodeId id, ServiceFlags nLocalServicesIn, int nMyStartingHeightIn, SOCKET hSocketIn, const CAddress &addrIn, const std::string &addrNameIn = "", bool fInboundIn = false);
+    CNode(NodeId id, ServiceFlags nLocalServicesIn, int nMyStartingHeightIn, SOCKET hSocketIn, const CAddress &addrIn, uint64_t nKeyedNetGroupIn, const std::string &addrNameIn = "", bool fInboundIn = false);
     ~CNode();
 
 private:
     CNode(const CNode&);
     void operator=(const CNode&);
 
-    static uint64_t CalculateKeyedNetGroup(const CAddress& ad);
 
     uint64_t nLocalHostNonce;
     ServiceFlags nLocalServices;
diff --git a/src/test/DoS_tests.cpp b/src/test/DoS_tests.cpp
index 33f107d84bfdd..97abeb7211c8b 100644
--- a/src/test/DoS_tests.cpp
+++ b/src/test/DoS_tests.cpp
@@ -48,7 +48,7 @@ BOOST_AUTO_TEST_CASE(DoS_banning)
 {
     connman->ClearBanned();
     CAddress addr1(ip(0xa0b0c001), NODE_NONE);
-    CNode dummyNode1(id++, NODE_NETWORK, 0, INVALID_SOCKET, addr1, "", true);
+    CNode dummyNode1(id++, NODE_NETWORK, 0, INVALID_SOCKET, addr1, 0, "", true);
     GetNodeSignals().InitializeNode(dummyNode1.GetId(), &dummyNode1);
     dummyNode1.nVersion = 1;
     Misbehaving(dummyNode1.GetId(), 100); // Should get banned
@@ -57,7 +57,7 @@ BOOST_AUTO_TEST_CASE(DoS_banning)
     BOOST_CHECK(!connman->IsBanned(ip(0xa0b0c001|0x0000ff00))); // Different IP, not banned
 
     CAddress addr2(ip(0xa0b0c002), NODE_NONE);
-    CNode dummyNode2(id++, NODE_NETWORK, 0, INVALID_SOCKET, addr2, "", true);
+    CNode dummyNode2(id++, NODE_NETWORK, 0, INVALID_SOCKET, addr2, 1, "", true);
     GetNodeSignals().InitializeNode(dummyNode2.GetId(), &dummyNode2);
     dummyNode2.nVersion = 1;
     Misbehaving(dummyNode2.GetId(), 50);
@@ -74,7 +74,7 @@ BOOST_AUTO_TEST_CASE(DoS_banscore)
     connman->ClearBanned();
     mapArgs["-banscore"] = "111"; // because 11 is my favorite number
     CAddress addr1(ip(0xa0b0c001), NODE_NONE);
-    CNode dummyNode1(id++, NODE_NETWORK, 0, INVALID_SOCKET, addr1, "", true);
+    CNode dummyNode1(id++, NODE_NETWORK, 0, INVALID_SOCKET, addr1, 3, "", true);
     GetNodeSignals().InitializeNode(dummyNode1.GetId(), &dummyNode1);
     dummyNode1.nVersion = 1;
     Misbehaving(dummyNode1.GetId(), 100);
@@ -96,7 +96,7 @@ BOOST_AUTO_TEST_CASE(DoS_bantime)
     SetMockTime(nStartTime); // Overrides future calls to GetTime()
 
     CAddress addr(ip(0xa0b0c001), NODE_NONE);
-    CNode dummyNode(id++, NODE_NETWORK, 0, INVALID_SOCKET, addr, "", true);
+    CNode dummyNode(id++, NODE_NETWORK, 0, INVALID_SOCKET, addr, 4, "", true);
     GetNodeSignals().InitializeNode(dummyNode.GetId(), &dummyNode);
     dummyNode.nVersion = 1;
 
diff --git a/src/test/net_tests.cpp b/src/test/net_tests.cpp
index bc9a98ab04cf8..680708533e475 100644
--- a/src/test/net_tests.cpp
+++ b/src/test/net_tests.cpp
@@ -164,12 +164,12 @@ BOOST_AUTO_TEST_CASE(cnode_simple_test)
     bool fInboundIn = false;
 
     // Test that fFeeler is false by default.
-    CNode* pnode1 = new CNode(id++, NODE_NETWORK, height, hSocket, addr, pszDest, fInboundIn);
+    CNode* pnode1 = new CNode(id++, NODE_NETWORK, height, hSocket, addr, 0, pszDest, fInboundIn);
     BOOST_CHECK(pnode1->fInbound == false);
     BOOST_CHECK(pnode1->fFeeler == false);
 
     fInboundIn = true;
-    CNode* pnode2 = new CNode(id++, NODE_NETWORK, height, hSocket, addr, pszDest, fInboundIn);
+    CNode* pnode2 = new CNode(id++, NODE_NETWORK, height, hSocket, addr, 1, pszDest, fInboundIn);
     BOOST_CHECK(pnode2->fInbound == true);
     BOOST_CHECK(pnode2->fFeeler == false);
 }
diff --git a/src/test/test_bitcoin.cpp b/src/test/test_bitcoin.cpp
index b1ceef4f64d07..02843d8525ea0 100644
--- a/src/test/test_bitcoin.cpp
+++ b/src/test/test_bitcoin.cpp
@@ -72,7 +72,7 @@ TestingSetup::TestingSetup(const std::string& chainName) : BasicTestingSetup(cha
         nScriptCheckThreads = 3;
         for (int i=0; i < nScriptCheckThreads-1; i++)
             threadGroup.create_thread(&ThreadScriptCheck);
-        g_connman = std::unique_ptr<CConnman>(new CConnman());
+        g_connman = std::unique_ptr<CConnman>(new CConnman(0x1337, 0x1337)); // Deterministic randomness for tests.
         connman = g_connman.get();
         RegisterNodeSignals(GetNodeSignals());
 }

From faddd62518c7b81c56ea2c9936cf850878c03e0b Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Mon, 19 Sep 2016 15:52:48 +0200
Subject: [PATCH 0903/1802] init: Get rid of some ENABLE_WALLET

---
 src/init.cpp          | 19 +++----------------
 src/wallet/wallet.cpp |  9 +++++++++
 2 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/src/init.cpp b/src/init.cpp
index 32b17192580c1..455eb8592003d 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -759,10 +759,7 @@ void InitParameterInteraction()
     if (GetBoolArg("-blocksonly", DEFAULT_BLOCKSONLY)) {
         if (SoftSetBoolArg("-whitelistrelay", false))
             LogPrintf("%s: parameter interaction: -blocksonly=1 -> setting -whitelistrelay=0\n", __func__);
-#ifdef ENABLE_WALLET
-        if (SoftSetBoolArg("-walletbroadcast", false))
-            LogPrintf("%s: parameter interaction: -blocksonly=1 -> setting -walletbroadcast=0\n", __func__);
-#endif
+        // walletbroadcast is disabled in CWallet::ParameterInteraction()
     }
 
     // Forcing relay from whitelisted hosts implies we will accept relays from them in the first place.
@@ -821,12 +818,7 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
         return InitError("Initializing networking failed");
 
 #ifndef WIN32
-    if (GetBoolArg("-sysperms", false)) {
-#ifdef ENABLE_WALLET
-        if (!GetBoolArg("-disablewallet", false))
-            return InitError("-sysperms is not allowed in combination with enabled wallet functionality");
-#endif
-    } else {
+    if (!GetBoolArg("-sysperms", false)) {
         umask(077);
     }
 
@@ -854,15 +846,10 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
 
     // also see: InitParameterInteraction()
 
-    // if using block pruning, then disable txindex
+    // if using block pruning, then disallow txindex
     if (GetArg("-prune", 0)) {
         if (GetBoolArg("-txindex", DEFAULT_TXINDEX))
             return InitError(_("Prune mode is incompatible with -txindex."));
-#ifdef ENABLE_WALLET
-        if (GetBoolArg("-rescan", false)) {
-            return InitError(_("Rescans are not possible in pruned mode. You will need to use -reindex which will download the whole blockchain again."));
-        }
-#endif
     }
 
     // Make sure enough file descriptors are available
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index 4c10ea0edbf0a..5638cec6a655d 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -3446,6 +3446,15 @@ bool CWallet::InitLoadWallet()
 
 bool CWallet::ParameterInteraction()
 {
+    if (GetBoolArg("-blocksonly", DEFAULT_BLOCKSONLY) && SoftSetBoolArg("-walletbroadcast", false)) {
+        LogPrintf("%s: parameter interaction: -blocksonly=1 -> setting -walletbroadcast=0\n", __func__);
+    }
+
+    if (GetBoolArg("-sysperms", false))
+        return InitError("-sysperms is not allowed in combination with enabled wallet functionality");
+    if (GetArg("-prune", 0) && GetBoolArg("-rescan", false))
+        return InitError(_("Rescans are not possible in pruned mode. You will need to use -reindex which will download the whole blockchain again."));
+
     if (mapArgs.count("-mintxfee"))
     {
         CAmount n = 0;

From 12a721b45e16124f48ea85f96079feec18e948ca Mon Sep 17 00:00:00 2001
From: Marty Jones <murtin.jones@gmail.com>
Date: Mon, 19 Sep 2016 21:17:27 -0500
Subject: [PATCH 0904/1802] Trivial: Fix typo

---
 doc/translation_process.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/translation_process.md b/doc/translation_process.md
index a443a16fe240e..9e9ced245722a 100644
--- a/doc/translation_process.md
+++ b/doc/translation_process.md
@@ -6,7 +6,7 @@ The Bitcoin-Core project has been designed to support multiple localisations. Th
 ### Helping to translate (using Transifex)
 Transifex is setup to monitor the Github repo for updates, and when code containing new translations is found, Transifex will process any changes. It may take several hours after a pull-request has been merged, to appear in the Transifex web interface.
 
-Multiple language support is critical in assisting Bitcoin’s global adoption, and growth. One of Bitcoin’s greatest strengths is cross-boarder money transfers, any help making that easier is greatly appreciated.
+Multiple language support is critical in assisting Bitcoin’s global adoption, and growth. One of Bitcoin’s greatest strengths is cross-border money transfers, any help making that easier is greatly appreciated.
 
 See the [Transifex Bitcoin project](https://www.transifex.com/projects/p/bitcoin/) to assist in translations. You should also join the translation mailing list for announcements - see details below.
 

From 94a34a5d951cee59ef9c9274c5ad49ac2a91ab8a Mon Sep 17 00:00:00 2001
From: maiiz <maiiz@users.noreply.github.com>
Date: Mon, 18 Jul 2016 15:01:34 +0800
Subject: [PATCH 0905/1802] Fix relaypriority calculation error

---
 src/coins.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/coins.cpp b/src/coins.cpp
index 39db7dedfbbe1..8ff652b474bc8 100644
--- a/src/coins.cpp
+++ b/src/coins.cpp
@@ -275,7 +275,7 @@ double CCoinsViewCache::GetPriority(const CTransaction &tx, int nHeight, CAmount
         assert(coins);
         if (!coins->IsAvailable(txin.prevout.n)) continue;
         if (coins->nHeight <= nHeight) {
-            dResult += coins->vout[txin.prevout.n].nValue * (nHeight-coins->nHeight);
+            dResult += (double)(coins->vout[txin.prevout.n].nValue) * (nHeight-coins->nHeight);
             inChainInputValue += coins->vout[txin.prevout.n].nValue;
         }
     }

From c6f5ca822f1308983431bf1b3c91f8aaccff51a0 Mon Sep 17 00:00:00 2001
From: Jonas Schnelli <dev@jonasschnelli.ch>
Date: Tue, 20 Sep 2016 16:18:24 +0200
Subject: [PATCH 0906/1802] [Wallet] remove "unused" ThreadFlushWalletDB from
 removeprunedfunds

---
 src/wallet/rpcdump.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/wallet/rpcdump.cpp b/src/wallet/rpcdump.cpp
index 42ebdb9b9b861..e80fa7dff81d8 100644
--- a/src/wallet/rpcdump.cpp
+++ b/src/wallet/rpcdump.cpp
@@ -344,8 +344,6 @@ UniValue removeprunedfunds(const UniValue& params, bool fHelp)
         throw JSONRPCError(RPC_INTERNAL_ERROR, "Transaction does not exist in wallet.");
     }
 
-    ThreadFlushWalletDB(pwalletMain->strWalletFile);
-
     return NullUniValue;
 }
 

From fab91070d38aa248a852e04c56dcb73e4022872d Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Mon, 19 Sep 2016 16:09:38 +0200
Subject: [PATCH 0907/1802] init: Get rid of fDisableWallet

---
 src/init.cpp             | 30 ++++++++++--------------------
 src/wallet/rpcwallet.cpp |  3 +++
 src/wallet/wallet.cpp    | 12 ++++++++++++
 3 files changed, 25 insertions(+), 20 deletions(-)

diff --git a/src/init.cpp b/src/init.cpp
index a15f1f1a4f29a..75182345ee9f0 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -935,9 +935,7 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
 
     RegisterAllCoreRPCCommands(tableRPC);
 #ifdef ENABLE_WALLET
-    bool fDisableWallet = GetBoolArg("-disablewallet", false);
-    if (!fDisableWallet)
-        RegisterWalletRPCCommands(tableRPC);
+    RegisterWalletRPCCommands(tableRPC);
 #endif
 
     nConnectTimeout = GetArg("-timeout", DEFAULT_CONNECT_TIMEOUT);
@@ -965,9 +963,9 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
     nBytesPerSigOp = GetArg("-bytespersigop", nBytesPerSigOp);
 
 #ifdef ENABLE_WALLET
-    if (!fDisableWallet && !CWallet::ParameterInteraction())
+    if (!CWallet::ParameterInteraction())
         return false;
-#endif // ENABLE_WALLET
+#endif
 
     fIsBareMultisigStd = GetBoolArg("-permitbaremultisig", DEFAULT_PERMIT_BAREMULTISIG);
     fAcceptDatacarrier = GetBoolArg("-datacarrier", DEFAULT_ACCEPT_DATACARRIER);
@@ -1095,11 +1093,9 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
 
     // ********************************************************* Step 5: verify wallet database integrity
 #ifdef ENABLE_WALLET
-    if (!fDisableWallet) {
-        if (!CWallet::Verify())
-            return false;
-    } // (!fDisableWallet)
-#endif // ENABLE_WALLET
+    if (!CWallet::Verify())
+        return false;
+#endif
     // ********************************************************* Step 6: network initialization
 
     assert(!g_connman);
@@ -1427,17 +1423,11 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
 
     // ********************************************************* Step 8: load wallet
 #ifdef ENABLE_WALLET
-    if (fDisableWallet) {
-        pwalletMain = NULL;
-        LogPrintf("Wallet disabled!\n");
-    } else {
-        CWallet::InitLoadWallet();
-        if (!pwalletMain)
-            return false;
-    }
-#else // ENABLE_WALLET
+    if (!CWallet::InitLoadWallet())
+        return false;
+#else
     LogPrintf("No wallet support compiled in!\n");
-#endif // !ENABLE_WALLET
+#endif
 
     // ********************************************************* Step 9: data directory maintenance
 
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index 993caad400c94..3eb7e5d9ba885 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -2630,6 +2630,9 @@ static const CRPCCommand commands[] =
 
 void RegisterWalletRPCCommands(CRPCTable &t)
 {
+    if (GetBoolArg("-disablewallet", false))
+        return;
+
     for (unsigned int vcidx = 0; vcidx < ARRAYLEN(commands); vcidx++)
         t.appendCommand(commands[vcidx].name, &commands[vcidx]);
 }
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index 7469fd7519297..27dd4c0a95b47 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -414,6 +414,9 @@ void CWallet::Flush(bool shutdown)
 
 bool CWallet::Verify()
 {
+    if (GetBoolArg("-disablewallet", false))
+        return true;
+
     LogPrintf("Using BerkeleyDB version %s\n", DbEnv::version(0, 0, 0));
     std::string walletFile = GetArg("-wallet", DEFAULT_WALLET_DAT);
 
@@ -3293,6 +3296,12 @@ std::string CWallet::GetWalletHelpString(bool showDebug)
 
 bool CWallet::InitLoadWallet()
 {
+    if (GetBoolArg("-disablewallet", false)) {
+        pwalletMain = NULL;
+        LogPrintf("Wallet disabled!\n");
+        return true;
+    }
+
     std::string walletFile = GetArg("-wallet", DEFAULT_WALLET_DAT);
 
     // needed to restore wallet transaction meta data after -zapwallettxes
@@ -3464,6 +3473,9 @@ bool CWallet::InitLoadWallet()
 
 bool CWallet::ParameterInteraction()
 {
+    if (GetBoolArg("-disablewallet", false))
+        return true;
+
     if (GetBoolArg("-blocksonly", DEFAULT_BLOCKSONLY) && SoftSetBoolArg("-walletbroadcast", false)) {
         LogPrintf("%s: parameter interaction: -blocksonly=1 -> setting -walletbroadcast=0\n", __func__);
     }

From 04d91f4a8c2ae683c60e94f86dce5f7bd7e716b2 Mon Sep 17 00:00:00 2001
From: unsystemizer <unsystemizer@users.noreply.github.com>
Date: Wed, 21 Sep 2016 03:38:38 +0800
Subject: [PATCH 0908/1802] Trivial: Fix ISO URL, capitalization

- Changed Debian 8.5.0 ISO CD ROM URL by redirecting from current (which now has only 8.6.0) to a persistent archive link which should not change anytime soon.
- Added a link to official Debian checksum verification procedure (which is more verbose and also acts as a backup source of SHA256sum's)
- Fix capitalization (iso)
---
 doc/gitian-building.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/gitian-building.md b/doc/gitian-building.md
index 84dce3f082ff9..aaf0b4ae87cf5 100644
--- a/doc/gitian-building.md
+++ b/doc/gitian-building.md
@@ -95,14 +95,14 @@ After creating the VM, we need to configure it.
 
 - Click `Ok` twice to save.
 
-Get the [Debian 8.x net installer](http://cdimage.debian.org/debian-cd/8.5.0/amd64/iso-cd/debian-8.5.0-amd64-netinst.iso) (a more recent minor version should also work, see also [Debian Network installation](https://www.debian.org/CD/netinst/)).
-This DVD image can be validated using a SHA256 hashing tool, for example on
+Get the [Debian 8.x net installer](http://cdimage.debian.org/mirror/cdimage/archive/8.5.0/amd64/iso-cd/debian-8.5.0-amd64-netinst.iso) (a more recent minor version should also work, see also [Debian Network installation](https://www.debian.org/CD/netinst/)).
+This DVD image can be [validated](https://www.debian.org/CD/verify) using a SHA256 hashing tool, for example on
 Unixy OSes by entering the following in a terminal:
 
     echo "ad4e8c27c561ad8248d5ebc1d36eb172f884057bfeb2c22ead823f59fa8c3dff  debian-8.5.0-amd64-netinst.iso" | sha256sum -c
     # (must return OK)
 
-Then start the VM. On the first launch you will be asked for a CD or DVD image. Choose the downloaded iso.
+Then start the VM. On the first launch you will be asked for a CD or DVD image. Choose the downloaded ISO.
 
 ![](gitian-building/select_startup_disk.png)
 

From 6f933c6bb606d35a9f4fb87a75f7cf66afd4b695 Mon Sep 17 00:00:00 2001
From: Luke Dashjr <luke-jr+git@utopios.org>
Date: Wed, 21 Sep 2016 09:48:12 +0000
Subject: [PATCH 0909/1802] Trivial Bugfix: doc/gitian-building.md: Link to
 release-process needs to be updated

Section was renamed in c907f4d56b0a27ecd002a6d7d89a38cfc6d45ee3
---
 doc/gitian-building.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/gitian-building.md b/doc/gitian-building.md
index 84dce3f082ff9..88bae468477bc 100644
--- a/doc/gitian-building.md
+++ b/doc/gitian-building.md
@@ -336,7 +336,7 @@ There will be a lot of warnings printed during the build of the image. These can
 Getting and building the inputs
 --------------------------------
 
-Follow the instructions in [doc/release-process.md](release-process.md#fetch-and-build-inputs-first-time-or-when-dependency-versions-change)
+Follow the instructions in [doc/release-process.md](release-process.md#fetch-and-create-inputs-first-time-or-when-dependency-versions-change)
 in the bitcoin repository under 'Fetch and create inputs' to install sources which require
 manual intervention. Also optionally follow the next step: 'Seed the Gitian sources cache
 and offline git repositories' which will fetch the remaining files required for building

From fa58edbffe929da45004d4406d7d1ffc7d14dc98 Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Wed, 21 Sep 2016 12:15:18 +0200
Subject: [PATCH 0910/1802] [wallet] Introduce DEFAULT_DISABLE_WALLET

---
 src/qt/bitcoingui.cpp | 2 +-
 src/wallet/wallet.cpp | 6 +++---
 src/wallet/wallet.h   | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp
index 272df3fdae42c..dcd3f155b9281 100644
--- a/src/qt/bitcoingui.cpp
+++ b/src/qt/bitcoingui.cpp
@@ -123,7 +123,7 @@ BitcoinGUI::BitcoinGUI(const PlatformStyle *platformStyle, const NetworkStyle *n
     QString windowTitle = tr(PACKAGE_NAME) + " - ";
 #ifdef ENABLE_WALLET
     /* if compiled with wallet support, -disablewallet can still disable the wallet */
-    enableWallet = !GetBoolArg("-disablewallet", false);
+    enableWallet = !GetBoolArg("-disablewallet", DEFAULT_DISABLE_WALLET);
 #else
     enableWallet = false;
 #endif // ENABLE_WALLET
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index 27dd4c0a95b47..abb1ea7e76e86 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -414,7 +414,7 @@ void CWallet::Flush(bool shutdown)
 
 bool CWallet::Verify()
 {
-    if (GetBoolArg("-disablewallet", false))
+    if (GetBoolArg("-disablewallet", DEFAULT_DISABLE_WALLET))
         return true;
 
     LogPrintf("Using BerkeleyDB version %s\n", DbEnv::version(0, 0, 0));
@@ -3296,7 +3296,7 @@ std::string CWallet::GetWalletHelpString(bool showDebug)
 
 bool CWallet::InitLoadWallet()
 {
-    if (GetBoolArg("-disablewallet", false)) {
+    if (GetBoolArg("-disablewallet", DEFAULT_DISABLE_WALLET)) {
         pwalletMain = NULL;
         LogPrintf("Wallet disabled!\n");
         return true;
@@ -3473,7 +3473,7 @@ bool CWallet::InitLoadWallet()
 
 bool CWallet::ParameterInteraction()
 {
-    if (GetBoolArg("-disablewallet", false))
+    if (GetBoolArg("-disablewallet", DEFAULT_DISABLE_WALLET))
         return true;
 
     if (GetBoolArg("-blocksonly", DEFAULT_BLOCKSONLY) && SoftSetBoolArg("-walletbroadcast", false)) {
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
index 584f013204931..f6c658928f64c 100644
--- a/src/wallet/wallet.h
+++ b/src/wallet/wallet.h
@@ -59,7 +59,7 @@ static const bool DEFAULT_WALLET_RBF = false;
 //! Largest (in bytes) free transaction we're willing to create
 static const unsigned int MAX_FREE_TRANSACTION_CREATE_SIZE = 1000;
 static const bool DEFAULT_WALLETBROADCAST = true;
-
+static const bool DEFAULT_DISABLE_WALLET = false;
 //! if set, all keys will be derived by using BIP32
 static const bool DEFAULT_USE_HD_WALLET = true;
 

From 6666ca63791788c951109b87b75c24ca99b917cd Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Wed, 21 Sep 2016 12:37:00 +0200
Subject: [PATCH 0911/1802] [qt] WalletModel: Expose disablewallet

---
 src/qt/bitcoingui.cpp  | 6 ++----
 src/qt/walletmodel.cpp | 5 +++++
 src/qt/walletmodel.h   | 2 ++
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp
index dcd3f155b9281..8bfd63b31f048 100644
--- a/src/qt/bitcoingui.cpp
+++ b/src/qt/bitcoingui.cpp
@@ -77,6 +77,7 @@ const QString BitcoinGUI::DEFAULT_WALLET = "~Default";
 
 BitcoinGUI::BitcoinGUI(const PlatformStyle *platformStyle, const NetworkStyle *networkStyle, QWidget *parent) :
     QMainWindow(parent),
+    enableWallet(false),
     clientModel(0),
     walletFrame(0),
     unitDisplayControl(0),
@@ -122,10 +123,7 @@ BitcoinGUI::BitcoinGUI(const PlatformStyle *platformStyle, const NetworkStyle *n
 
     QString windowTitle = tr(PACKAGE_NAME) + " - ";
 #ifdef ENABLE_WALLET
-    /* if compiled with wallet support, -disablewallet can still disable the wallet */
-    enableWallet = !GetBoolArg("-disablewallet", DEFAULT_DISABLE_WALLET);
-#else
-    enableWallet = false;
+    enableWallet = WalletModel::isWalletEnabled();
 #endif // ENABLE_WALLET
     if(enableWallet)
     {
diff --git a/src/qt/walletmodel.cpp b/src/qt/walletmodel.cpp
index 73851e97fc1f1..ad3ba996f1f91 100644
--- a/src/qt/walletmodel.cpp
+++ b/src/qt/walletmodel.cpp
@@ -684,6 +684,11 @@ bool WalletModel::abandonTransaction(uint256 hash) const
     return wallet->AbandonTransaction(hash);
 }
 
+bool WalletModel::isWalletEnabled()
+{
+   return !GetBoolArg("-disablewallet", DEFAULT_DISABLE_WALLET);
+}
+
 bool WalletModel::hdEnabled() const
 {
     return wallet->IsHDEnabled();
diff --git a/src/qt/walletmodel.h b/src/qt/walletmodel.h
index a15ecf899b87a..4456215512271 100644
--- a/src/qt/walletmodel.h
+++ b/src/qt/walletmodel.h
@@ -203,6 +203,8 @@ class WalletModel : public QObject
     bool transactionCanBeAbandoned(uint256 hash) const;
     bool abandonTransaction(uint256 hash) const;
 
+    static bool isWalletEnabled();
+
     bool hdEnabled() const;
 
 private:

From 381826dfee6258accafac29eef93ad264a90aaf6 Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Wed, 14 Sep 2016 15:08:34 +0200
Subject: [PATCH 0912/1802] bitcoin-cli: More detailed error reporting

Register a evhttp error handler to get a more detailed error message
if the HTTP request fails.
---
 src/bitcoin-cli.cpp | 42 +++++++++++++++++++++++++++++++++++++++---
 1 file changed, 39 insertions(+), 3 deletions(-)

diff --git a/src/bitcoin-cli.cpp b/src/bitcoin-cli.cpp
index a04101d3ed847..68f5d90f5103d 100644
--- a/src/bitcoin-cli.cpp
+++ b/src/bitcoin-cli.cpp
@@ -116,17 +116,42 @@ static bool AppInitRPC(int argc, char* argv[])
 /** Reply structure for request_done to fill in */
 struct HTTPReply
 {
+    HTTPReply(): status(0), error(-1) {}
+
     int status;
+    int error;
     std::string body;
 };
 
+const char *http_errorstring(int code)
+{
+    switch(code) {
+#if LIBEVENT_VERSION_NUMBER >= 0x02010300
+    case EVREQ_HTTP_TIMEOUT:
+        return "timeout reached";
+    case EVREQ_HTTP_EOF:
+        return "EOF reached";
+    case EVREQ_HTTP_INVALID_HEADER:
+        return "error while reading header, or invalid header";
+    case EVREQ_HTTP_BUFFER_ERROR:
+        return "error encountered while reading or writing";
+    case EVREQ_HTTP_REQUEST_CANCEL:
+        return "request was canceled";
+    case EVREQ_HTTP_DATA_TOO_LONG:
+        return "response body is larger than allowed";
+#endif
+    default:
+        return "unknown";
+    }
+}
+
 static void http_request_done(struct evhttp_request *req, void *ctx)
 {
     HTTPReply *reply = static_cast<HTTPReply*>(ctx);
 
     if (req == NULL) {
-        /* If req is NULL, it means an error occurred while connecting, but
-         * I'm not sure how to find out which one. We also don't really care.
+        /* If req is NULL, it means an error occurred while connecting: the
+         * error code will have been passed to http_error_cb.
          */
         reply->status = 0;
         return;
@@ -145,6 +170,14 @@ static void http_request_done(struct evhttp_request *req, void *ctx)
     }
 }
 
+#if LIBEVENT_VERSION_NUMBER >= 0x02010300
+static void http_error_cb(enum evhttp_request_error err, void *ctx)
+{
+    HTTPReply *reply = static_cast<HTTPReply*>(ctx);
+    reply->error = err;
+}
+#endif
+
 UniValue CallRPC(const string& strMethod, const UniValue& params)
 {
     std::string host = GetArg("-rpcconnect", DEFAULT_RPCCONNECT);
@@ -165,6 +198,9 @@ UniValue CallRPC(const string& strMethod, const UniValue& params)
     struct evhttp_request *req = evhttp_request_new(http_request_done, (void*)&response); // TODO RAII
     if (req == NULL)
         throw runtime_error("create http request failed");
+#if LIBEVENT_VERSION_NUMBER >= 0x02010300
+    evhttp_request_set_error_cb(req, http_error_cb);
+#endif
 
     // Get credentials
     std::string strRPCUserColonPass;
@@ -204,7 +240,7 @@ UniValue CallRPC(const string& strMethod, const UniValue& params)
     event_base_free(base);
 
     if (response.status == 0)
-        throw CConnectionFailed("couldn't connect to server");
+        throw CConnectionFailed(strprintf("couldn't connect to server (%d %s)", response.error, http_errorstring(response.error)));
     else if (response.status == HTTP_UNAUTHORIZED)
         throw runtime_error("incorrect rpcuser or rpcpassword (authorization failed)");
     else if (response.status >= 400 && response.status != HTTP_BAD_REQUEST && response.status != HTTP_NOT_FOUND && response.status != HTTP_INTERNAL_SERVER_ERROR)

From fa81d09e8d2cdc6c8d42bb50f71ae53dac3f0912 Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Wed, 21 Sep 2016 19:21:25 +0200
Subject: [PATCH 0913/1802] [contrib] Delete spendfrom

---
 contrib/README.md              |   8 -
 contrib/spendfrom/README.md    |  35 -----
 contrib/spendfrom/setup.py     |  12 --
 contrib/spendfrom/spendfrom.py | 270 ---------------------------------
 4 files changed, 325 deletions(-)
 delete mode 100644 contrib/spendfrom/README.md
 delete mode 100644 contrib/spendfrom/setup.py
 delete mode 100755 contrib/spendfrom/spendfrom.py

diff --git a/contrib/README.md b/contrib/README.md
index 3e3c83da5f1e6..ab5f57587e0d9 100644
--- a/contrib/README.md
+++ b/contrib/README.md
@@ -1,11 +1,3 @@
-Wallet Tools
----------------------
-
-### [SpendFrom](/contrib/spendfrom) ###
-
-Use the raw transactions API to send coins received on a particular
-address (or addresses).
-
 Repository Tools
 ---------------------
 
diff --git a/contrib/spendfrom/README.md b/contrib/spendfrom/README.md
deleted file mode 100644
index c0a9c9ccf93d3..0000000000000
--- a/contrib/spendfrom/README.md
+++ /dev/null
@@ -1,35 +0,0 @@
-### SpendFrom ###
-
-Use the raw transactions API to send coins received on a particular
-address (or addresses). 
-
-### Usage: ###
-Depends on [jsonrpc](http://json-rpc.org/).
-
-	spendfrom.py --from=FROMADDRESS1[,FROMADDRESS2] --to=TOADDRESS --amount=amount \
-	             --fee=fee --datadir=/path/to/.bitcoin --testnet --dry_run
-
-With no arguments, outputs a list of amounts associated with addresses.
-
-With arguments, sends coins received by the `FROMADDRESS` addresses to the `TOADDRESS`.
-
-### Notes ###
-
-- You may explicitly specify how much fee to pay (a fee more than 1% of the amount
-will fail,  though, to prevent bitcoin-losing accidents). Spendfrom may fail if
-it thinks the transaction would never be confirmed (if the amount being sent is
-too small, or if the transaction is too many bytes for the fee).
-
-- If a change output needs to be created, the change will be sent to the last
-`FROMADDRESS` (if you specify just one `FROMADDRESS`, change will go back to it).
-
-- If `--datadir` is not specified, the default datadir is used.
-
-- The `--dry_run` option will just create and sign the transaction and print
-the transaction data (as hexadecimal), instead of broadcasting it.
-
-- If the transaction is created and broadcast successfully, a transaction id
-is printed.
-
-- If this was a tool for end-users and not programmers, it would have much friendlier
-error-handling.
diff --git a/contrib/spendfrom/setup.py b/contrib/spendfrom/setup.py
deleted file mode 100644
index f80736752ae4f..0000000000000
--- a/contrib/spendfrom/setup.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright (c) 2013 The Bitcoin Core developers
-# Distributed under the MIT software license, see the accompanying
-# file COPYING or http://www.opensource.org/licenses/mit-license.php.
-from distutils.core import setup
-setup(name='btcspendfrom',
-      version='1.0',
-      description='Command-line utility for bitcoin "coin control"',
-      author='Gavin Andresen',
-      author_email='gavin@bitcoinfoundation.org',
-      requires=['jsonrpc'],
-      scripts=['spendfrom.py'],
-      )
diff --git a/contrib/spendfrom/spendfrom.py b/contrib/spendfrom/spendfrom.py
deleted file mode 100755
index 086b91b267ef4..0000000000000
--- a/contrib/spendfrom/spendfrom.py
+++ /dev/null
@@ -1,270 +0,0 @@
-#!/usr/bin/env python
-# Copyright (c) 2013 The Bitcoin Core developers
-# Distributed under the MIT software license, see the accompanying
-# file COPYING or http://www.opensource.org/licenses/mit-license.php.
-#
-# Use the raw transactions API to spend bitcoins received on particular addresses,
-# and send any change back to that same address.
-#
-# Example usage:
-#  spendfrom.py  # Lists available funds
-#  spendfrom.py --from=ADDRESS --to=ADDRESS --amount=11.00
-#
-# Assumes it will talk to a bitcoind or Bitcoin-Qt running
-# on localhost.
-#
-# Depends on jsonrpc
-#
-
-from decimal import *
-import getpass
-import math
-import os
-import os.path
-import platform
-import sys
-import time
-from jsonrpc import ServiceProxy, json
-
-BASE_FEE=Decimal("0.001")
-
-def check_json_precision():
-    """Make sure json library being used does not lose precision converting BTC values"""
-    n = Decimal("20000000.00000003")
-    satoshis = int(json.loads(json.dumps(float(n)))*1.0e8)
-    if satoshis != 2000000000000003:
-        raise RuntimeError("JSON encode/decode loses precision")
-
-def determine_db_dir():
-    """Return the default location of the bitcoin data directory"""
-    if platform.system() == "Darwin":
-        return os.path.expanduser("~/Library/Application Support/Bitcoin/")
-    elif platform.system() == "Windows":
-        return os.path.join(os.environ['APPDATA'], "Bitcoin")
-    return os.path.expanduser("~/.bitcoin")
-
-def read_bitcoin_config(dbdir):
-    """Read the bitcoin.conf file from dbdir, returns dictionary of settings"""
-    from ConfigParser import SafeConfigParser
-
-    class FakeSecHead(object):
-        def __init__(self, fp):
-            self.fp = fp
-            self.sechead = '[all]\n'
-        def readline(self):
-            if self.sechead:
-                try: return self.sechead
-                finally: self.sechead = None
-            else:
-                s = self.fp.readline()
-                if s.find('#') != -1:
-                    s = s[0:s.find('#')].strip() +"\n"
-                return s
-
-    config_parser = SafeConfigParser()
-    config_parser.readfp(FakeSecHead(open(os.path.join(dbdir, "bitcoin.conf"))))
-    return dict(config_parser.items("all"))
-
-def connect_JSON(config):
-    """Connect to a bitcoin JSON-RPC server"""
-    testnet = config.get('testnet', '0')
-    testnet = (int(testnet) > 0)  # 0/1 in config file, convert to True/False
-    if not 'rpcport' in config:
-        config['rpcport'] = 18332 if testnet else 8332
-    connect = "http://%s:%s@127.0.0.1:%s"%(config['rpcuser'], config['rpcpassword'], config['rpcport'])
-    try:
-        result = ServiceProxy(connect)
-        # ServiceProxy is lazy-connect, so send an RPC command mostly to catch connection errors,
-        # but also make sure the bitcoind we're talking to is/isn't testnet:
-        if result.getmininginfo()['testnet'] != testnet:
-            sys.stderr.write("RPC server at "+connect+" testnet setting mismatch\n")
-            sys.exit(1)
-        return result
-    except:
-        sys.stderr.write("Error connecting to RPC server at "+connect+"\n")
-        sys.exit(1)
-
-def unlock_wallet(bitcoind):
-    info = bitcoind.getinfo()
-    if 'unlocked_until' not in info:
-        return True # wallet is not encrypted
-    t = int(info['unlocked_until'])
-    if t <= time.time():
-        try:
-            passphrase = getpass.getpass("Wallet is locked; enter passphrase: ")
-            bitcoind.walletpassphrase(passphrase, 5)
-        except:
-            sys.stderr.write("Wrong passphrase\n")
-
-    info = bitcoind.getinfo()
-    return int(info['unlocked_until']) > time.time()
-
-def list_available(bitcoind):
-    address_summary = dict()
-
-    address_to_account = dict()
-    for info in bitcoind.listreceivedbyaddress(0):
-        address_to_account[info["address"]] = info["account"]
-
-    unspent = bitcoind.listunspent(0)
-    for output in unspent:
-        # listunspent doesn't give addresses, so:
-        rawtx = bitcoind.getrawtransaction(output['txid'], 1)
-        vout = rawtx["vout"][output['vout']]
-        pk = vout["scriptPubKey"]
-
-        # This code only deals with ordinary pay-to-bitcoin-address
-        # or pay-to-script-hash outputs right now; anything exotic is ignored.
-        if pk["type"] != "pubkeyhash" and pk["type"] != "scripthash":
-            continue
-        
-        address = pk["addresses"][0]
-        if address in address_summary:
-            address_summary[address]["total"] += vout["value"]
-            address_summary[address]["outputs"].append(output)
-        else:
-            address_summary[address] = {
-                "total" : vout["value"],
-                "outputs" : [output],
-                "account" : address_to_account.get(address, "")
-                }
-
-    return address_summary
-
-def select_coins(needed, inputs):
-    # Feel free to improve this, this is good enough for my simple needs:
-    outputs = []
-    have = Decimal("0.0")
-    n = 0
-    while have < needed and n < len(inputs):
-        outputs.append({ "txid":inputs[n]["txid"], "vout":inputs[n]["vout"]})
-        have += inputs[n]["amount"]
-        n += 1
-    return (outputs, have-needed)
-
-def create_tx(bitcoind, fromaddresses, toaddress, amount, fee):
-    all_coins = list_available(bitcoind)
-
-    total_available = Decimal("0.0")
-    needed = amount+fee
-    potential_inputs = []
-    for addr in fromaddresses:
-        if addr not in all_coins:
-            continue
-        potential_inputs.extend(all_coins[addr]["outputs"])
-        total_available += all_coins[addr]["total"]
-
-    if total_available < needed:
-        sys.stderr.write("Error, only %f BTC available, need %f\n"%(total_available, needed));
-        sys.exit(1)
-
-    #
-    # Note:
-    # Python's json/jsonrpc modules have inconsistent support for Decimal numbers.
-    # Instead of wrestling with getting json.dumps() (used by jsonrpc) to encode
-    # Decimals, I'm casting amounts to float before sending them to bitcoind.
-    #  
-    outputs = { toaddress : float(amount) }
-    (inputs, change_amount) = select_coins(needed, potential_inputs)
-    if change_amount > BASE_FEE:  # don't bother with zero or tiny change
-        change_address = fromaddresses[-1]
-        if change_address in outputs:
-            outputs[change_address] += float(change_amount)
-        else:
-            outputs[change_address] = float(change_amount)
-
-    rawtx = bitcoind.createrawtransaction(inputs, outputs)
-    signed_rawtx = bitcoind.signrawtransaction(rawtx)
-    if not signed_rawtx["complete"]:
-        sys.stderr.write("signrawtransaction failed\n")
-        sys.exit(1)
-    txdata = signed_rawtx["hex"]
-
-    return txdata
-
-def compute_amount_in(bitcoind, txinfo):
-    result = Decimal("0.0")
-    for vin in txinfo['vin']:
-        in_info = bitcoind.getrawtransaction(vin['txid'], 1)
-        vout = in_info['vout'][vin['vout']]
-        result = result + vout['value']
-    return result
-
-def compute_amount_out(txinfo):
-    result = Decimal("0.0")
-    for vout in txinfo['vout']:
-        result = result + vout['value']
-    return result
-
-def sanity_test_fee(bitcoind, txdata_hex, max_fee):
-    class FeeError(RuntimeError):
-        pass
-    try:
-        txinfo = bitcoind.decoderawtransaction(txdata_hex)
-        total_in = compute_amount_in(bitcoind, txinfo)
-        total_out = compute_amount_out(txinfo)
-        if total_in-total_out > max_fee:
-            raise FeeError("Rejecting transaction, unreasonable fee of "+str(total_in-total_out))
-
-        tx_size = len(txdata_hex)/2
-        kb = tx_size/1000  # integer division rounds down
-        if kb > 1 and fee < BASE_FEE:
-            raise FeeError("Rejecting no-fee transaction, larger than 1000 bytes")
-        if total_in < 0.01 and fee < BASE_FEE:
-            raise FeeError("Rejecting no-fee, tiny-amount transaction")
-        # Exercise for the reader: compute transaction priority, and
-        # warn if this is a very-low-priority transaction
-
-    except FeeError as err:
-        sys.stderr.write((str(err)+"\n"))
-        sys.exit(1)
-
-def main():
-    import optparse
-
-    parser = optparse.OptionParser(usage="%prog [options]")
-    parser.add_option("--from", dest="fromaddresses", default=None,
-                      help="addresses to get bitcoins from")
-    parser.add_option("--to", dest="to", default=None,
-                      help="address to get send bitcoins to")
-    parser.add_option("--amount", dest="amount", default=None,
-                      help="amount to send")
-    parser.add_option("--fee", dest="fee", default="0.0",
-                      help="fee to include")
-    parser.add_option("--datadir", dest="datadir", default=determine_db_dir(),
-                      help="location of bitcoin.conf file with RPC username/password (default: %default)")
-    parser.add_option("--testnet", dest="testnet", default=False, action="store_true",
-                      help="Use the test network")
-    parser.add_option("--dry_run", dest="dry_run", default=False, action="store_true",
-                      help="Don't broadcast the transaction, just create and print the transaction data")
-
-    (options, args) = parser.parse_args()
-
-    check_json_precision()
-    config = read_bitcoin_config(options.datadir)
-    if options.testnet: config['testnet'] = True
-    bitcoind = connect_JSON(config)
-
-    if options.amount is None:
-        address_summary = list_available(bitcoind)
-        for address,info in address_summary.iteritems():
-            n_transactions = len(info['outputs'])
-            if n_transactions > 1:
-                print("%s %.8f %s (%d transactions)"%(address, info['total'], info['account'], n_transactions))
-            else:
-                print("%s %.8f %s"%(address, info['total'], info['account']))
-    else:
-        fee = Decimal(options.fee)
-        amount = Decimal(options.amount)
-        while unlock_wallet(bitcoind) == False:
-            pass # Keep asking for passphrase until they get it right
-        txdata = create_tx(bitcoind, options.fromaddresses.split(","), options.to, amount, fee)
-        sanity_test_fee(bitcoind, txdata, amount*Decimal("0.01"))
-        if options.dry_run:
-            print(txdata)
-        else:
-            txid = bitcoind.sendrawtransaction(txdata)
-            print(txid)
-
-if __name__ == '__main__':
-    main()

From ddddaafa4aca2725a18606a38c3341a8637b0c3b Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Wed, 21 Sep 2016 21:01:42 +0200
Subject: [PATCH 0914/1802] [rpc] Deprecate getinfo

This was replaced by getmininginfo, getnetworkinfo and getwalletinfo
---
 qa/rpc-tests/p2p-versionbits-warning.py | 13 ++++++++-----
 qa/rpc-tests/rpcbind_test.py            |  4 ++--
 src/rpc/misc.cpp                        |  2 +-
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/qa/rpc-tests/p2p-versionbits-warning.py b/qa/rpc-tests/p2p-versionbits-warning.py
index 962cafef0b17b..c17bacfc79abc 100755
--- a/qa/rpc-tests/p2p-versionbits-warning.py
+++ b/qa/rpc-tests/p2p-versionbits-warning.py
@@ -122,8 +122,9 @@ def run_test(self):
         # Fill rest of period with regular version blocks
         self.nodes[0].generate(VB_PERIOD - VB_THRESHOLD + 1)
         # Check that we're not getting any versionbit-related errors in
-        # getinfo()
-        assert(not self.vb_pattern.match(self.nodes[0].getinfo()["errors"]))
+        # get*info()
+        assert(not self.vb_pattern.match(self.nodes[0].getmininginfo()["errors"]))
+        assert(not self.vb_pattern.match(self.nodes[0].getnetworkinfo()["warnings"]))
 
         # 3. Now build one period of blocks with >= VB_THRESHOLD blocks signaling
         # some unknown bit
@@ -132,8 +133,9 @@ def run_test(self):
         # Might not get a versionbits-related alert yet, as we should
         # have gotten a different alert due to more than 51/100 blocks
         # being of unexpected version.
-        # Check that getinfo() shows some kind of error.
-        assert(len(self.nodes[0].getinfo()["errors"]) != 0)
+        # Check that get*info() shows some kind of error.
+        assert("Unknown block versions" in self.nodes[0].getmininginfo()["errors"])
+        assert("Unknown block versions" in self.nodes[0].getnetworkinfo()["warnings"])
 
         # Mine a period worth of expected blocks so the generic block-version warning
         # is cleared, and restart the node. This should move the versionbit state
@@ -148,7 +150,8 @@ def run_test(self):
 
         # Connecting one block should be enough to generate an error.
         self.nodes[0].generate(1)
-        assert(len(self.nodes[0].getinfo()["errors"]) != 0)
+        assert("unknown new rules" in self.nodes[0].getmininginfo()["errors"])
+        assert("unknown new rules" in self.nodes[0].getnetworkinfo()["warnings"])
         stop_node(self.nodes[0], 0)
         wait_bitcoinds()
         self.test_versionbits_in_alert_file()
diff --git a/qa/rpc-tests/rpcbind_test.py b/qa/rpc-tests/rpcbind_test.py
index 3ac32140ba898..144c2f4cd41d7 100755
--- a/qa/rpc-tests/rpcbind_test.py
+++ b/qa/rpc-tests/rpcbind_test.py
@@ -44,7 +44,7 @@ def run_bind_test(self, allow_ips, connect_to, addresses, expected):
 
     def run_allowip_test(self, allow_ips, rpchost, rpcport):
         '''
-        Start a node with rpcwallow IP, and request getinfo
+        Start a node with rpcwallow IP, and request getnetworkinfo
         at a non-localhost IP.
         '''
         base_args = ['-disablewallet', '-nolisten'] + ['-rpcallowip='+x for x in allow_ips]
@@ -52,7 +52,7 @@ def run_allowip_test(self, allow_ips, rpchost, rpcport):
         try:
             # connect to node through non-loopback interface
             node = get_rpc_proxy(rpc_url(0, "%s:%d" % (rpchost, rpcport)), 0)
-            node.getinfo()
+            node.getnetworkinfo()
         finally:
             node = None # make sure connection will be garbage collected and closed
             stop_nodes(self.nodes)
diff --git a/src/rpc/misc.cpp b/src/rpc/misc.cpp
index 5afcf6353c731..f0b7e0a07cffa 100644
--- a/src/rpc/misc.cpp
+++ b/src/rpc/misc.cpp
@@ -44,7 +44,7 @@ UniValue getinfo(const UniValue& params, bool fHelp)
     if (fHelp || params.size() != 0)
         throw runtime_error(
             "getinfo\n"
-            "Returns an object containing various state info.\n"
+            "\nDEPRECATED. Returns an object containing various state info.\n"
             "\nResult:\n"
             "{\n"
             "  \"version\": xxxxx,           (numeric) the server version\n"

From faf87aff166489f5b6b63f4274ea995e23e1f4cc Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Wed, 21 Sep 2016 21:45:15 +0200
Subject: [PATCH 0915/1802] [contrib] delete qt_translations.py

follow-up of 1a97b22 #4185
---
 contrib/qt_translations.py | 25 -------------------------
 1 file changed, 25 deletions(-)
 delete mode 100755 contrib/qt_translations.py

diff --git a/contrib/qt_translations.py b/contrib/qt_translations.py
deleted file mode 100755
index cfdeed41aba26..0000000000000
--- a/contrib/qt_translations.py
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/usr/bin/env python
-# Copyright (c) 2011 The Bitcoin Core developers
-# Distributed under the MIT software license, see the accompanying
-# file COPYING or http://www.opensource.org/licenses/mit-license.php.
-
-# Helpful little script that spits out a comma-separated list of
-# language codes for Qt icons that should be included
-# in binary bitcoin distributions
-
-import glob
-import os
-import re
-import sys
-
-if len(sys.argv) != 3:
-  sys.exit("Usage: %s $QTDIR/translations $BITCOINDIR/src/qt/locale"%sys.argv[0])
-
-d1 = sys.argv[1]
-d2 = sys.argv[2]
-
-l1 = set([ re.search(r'qt_(.*).qm', f).group(1) for f in glob.glob(os.path.join(d1, 'qt_*.qm')) ])
-l2 = set([ re.search(r'bitcoin_(.*).qm', f).group(1) for f in glob.glob(os.path.join(d2, 'bitcoin_*.qm')) ])
-
-print ",".join(sorted(l1.intersection(l2)))
-

From f4dffdd6bffc58377b7505b639f0431244321c32 Mon Sep 17 00:00:00 2001
From: Luke Dashjr <luke-jr+git@utopios.org>
Date: Wed, 21 Sep 2016 22:31:23 +0000
Subject: [PATCH 0916/1802] Add MIT license to Makefiles

---
 Makefile.am                  | 4 ++++
 src/Makefile.am              | 4 ++++
 src/Makefile.bench.include   | 4 ++++
 src/Makefile.leveldb.include | 4 ++++
 src/Makefile.qt.include      | 4 ++++
 src/Makefile.qttest.include  | 4 ++++
 src/Makefile.test.include    | 4 ++++
 7 files changed, 28 insertions(+)

diff --git a/Makefile.am b/Makefile.am
index 2e061c3773580..44fdf9c9fb2da 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,3 +1,7 @@
+# Copyright (c) 2013-2016 The Bitcoin Core developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
 ACLOCAL_AMFLAGS = -I build-aux/m4
 SUBDIRS = src
 if ENABLE_MAN
diff --git a/src/Makefile.am b/src/Makefile.am
index ebdddc87f54a2..e7f1d82b8b88a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,3 +1,7 @@
+# Copyright (c) 2013-2016 The Bitcoin Core developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
 DIST_SUBDIRS = secp256k1 univalue
 
 AM_LDFLAGS = $(PTHREAD_CFLAGS) $(LIBTOOL_LDFLAGS) $(HARDENED_LDFLAGS)
diff --git a/src/Makefile.bench.include b/src/Makefile.bench.include
index 4067ceb3993e8..8c024a8c4ad81 100644
--- a/src/Makefile.bench.include
+++ b/src/Makefile.bench.include
@@ -1,3 +1,7 @@
+# Copyright (c) 2015-2016 The Bitcoin Core developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
 bin_PROGRAMS += bench/bench_bitcoin
 BENCH_SRCDIR = bench
 BENCH_BINARY = bench/bench_bitcoin$(EXEEXT)
diff --git a/src/Makefile.leveldb.include b/src/Makefile.leveldb.include
index 4b3cd6364a29b..d7346aa181d24 100644
--- a/src/Makefile.leveldb.include
+++ b/src/Makefile.leveldb.include
@@ -1,3 +1,7 @@
+# Copyright (c) 2016 The Bitcoin Core developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
 LIBLEVELDB_INT = leveldb/libleveldb.a
 LIBMEMENV_INT  = leveldb/libmemenv.a
 
diff --git a/src/Makefile.qt.include b/src/Makefile.qt.include
index 8947aeaca0b14..35a1f68907277 100644
--- a/src/Makefile.qt.include
+++ b/src/Makefile.qt.include
@@ -1,3 +1,7 @@
+# Copyright (c) 2013-2016 The Bitcoin Core developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
 bin_PROGRAMS += qt/bitcoin-qt
 EXTRA_LIBRARIES += qt/libbitcoinqt.a
 
diff --git a/src/Makefile.qttest.include b/src/Makefile.qttest.include
index 0a7efb5d5b2e5..cb310d5a1b157 100644
--- a/src/Makefile.qttest.include
+++ b/src/Makefile.qttest.include
@@ -1,3 +1,7 @@
+# Copyright (c) 2013-2016 The Bitcoin Core developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
 bin_PROGRAMS += qt/test/test_bitcoin-qt
 TESTS += qt/test/test_bitcoin-qt
 
diff --git a/src/Makefile.test.include b/src/Makefile.test.include
index 0748d1a39d232..5ce1bbb8963c1 100644
--- a/src/Makefile.test.include
+++ b/src/Makefile.test.include
@@ -1,3 +1,7 @@
+# Copyright (c) 2013-2016 The Bitcoin Core developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
 TESTS += test/test_bitcoin
 bin_PROGRAMS += test/test_bitcoin
 TEST_SRCDIR = test

From fa13c5ce4fe66289b93c3c9665fcd8f0831e0225 Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Thu, 22 Sep 2016 00:48:02 +0200
Subject: [PATCH 0917/1802] [share] remove qt/protobuf.pri

follow up of 35b8af92265ed74de63c3818e5290c27b3f35df2 (#2943)
---
 share/qt/protobuf.pri | 35 -----------------------------------
 1 file changed, 35 deletions(-)
 delete mode 100644 share/qt/protobuf.pri

diff --git a/share/qt/protobuf.pri b/share/qt/protobuf.pri
deleted file mode 100644
index 865fe865550ae..0000000000000
--- a/share/qt/protobuf.pri
+++ /dev/null
@@ -1,35 +0,0 @@
-# Based on: http://code.google.com/p/ostinato/source/browse/protobuf.pri
-#
-# Qt qmake integration with Google Protocol Buffers compiler protoc
-#
-# To compile protocol buffers with qt qmake, specify PROTOS variable and
-# include this file
-#
-# Example:
-# PROTOS = a.proto b.proto
-# include(protobuf.pri)
-#
-# Set PROTO_PATH if you need to set the protoc --proto_path search path
-# Set PROTOC to the path to the protoc compiler if it is not in your $PATH
-#
-
-isEmpty(PROTO_DIR):PROTO_DIR = .
-isEmpty(PROTOC):PROTOC = protoc
-
-PROTOPATHS =
-for(p, PROTO_PATH):PROTOPATHS += --proto_path=$${p}
-
-protobuf_decl.name  = protobuf header
-protobuf_decl.input = PROTOS
-protobuf_decl.output  = $${PROTO_DIR}/${QMAKE_FILE_BASE}.pb.h
-protobuf_decl.commands = $${PROTOC} --cpp_out="$${PROTO_DIR}" $${PROTOPATHS} --proto_path=${QMAKE_FILE_IN_PATH} ${QMAKE_FILE_NAME}
-protobuf_decl.variable_out = GENERATED_FILES
-QMAKE_EXTRA_COMPILERS += protobuf_decl
-
-protobuf_impl.name  = protobuf implementation
-protobuf_impl.input = PROTOS
-protobuf_impl.output  = $${PROTO_DIR}/${QMAKE_FILE_BASE}.pb.cc
-protobuf_impl.depends  = $${PROTO_DIR}/${QMAKE_FILE_BASE}.pb.h
-protobuf_impl.commands = $$escape_expand(\\n)
-protobuf_impl.variable_out = GENERATED_SOURCES
-QMAKE_EXTRA_COMPILERS += protobuf_impl

From 3b4b6dcdd77f3ba76fb0cda6f2c277ec1629d8d3 Mon Sep 17 00:00:00 2001
From: Luke Dashjr <luke-jr+git@utopios.org>
Date: Wed, 21 Sep 2016 22:35:21 +0000
Subject: [PATCH 0918/1802] Add MIT license to autogen.sh and share/genbuild.sh

---
 autogen.sh        | 4 ++++
 share/genbuild.sh | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/autogen.sh b/autogen.sh
index 46e36ff5b216c..27417daf76915 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,4 +1,8 @@
 #!/bin/sh
+# Copyright (c) 2013-2016 The Bitcoin Core developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
 set -e
 srcdir="$(dirname $0)"
 cd "$srcdir"
diff --git a/share/genbuild.sh b/share/genbuild.sh
index 1ef77d706f7aa..eecac4bd00b92 100755
--- a/share/genbuild.sh
+++ b/share/genbuild.sh
@@ -1,4 +1,8 @@
 #!/bin/sh
+# Copyright (c) 2012-2016 The Bitcoin Core developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
 if [ $# -gt 1 ]; then
     cd "$2"
 fi

From 3f8a5d8f6e95c3c1aa62433abc5edb0c93caae11 Mon Sep 17 00:00:00 2001
From: Luke Dashjr <luke-jr+git@utopios.org>
Date: Wed, 21 Sep 2016 22:54:49 +0000
Subject: [PATCH 0919/1802] Trivial: build-aux/m4/l_atomic: Fix typo

---
 build-aux/m4/l_atomic.m4 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build-aux/m4/l_atomic.m4 b/build-aux/m4/l_atomic.m4
index 906724b6405d8..1cb13587a9fb0 100644
--- a/build-aux/m4/l_atomic.m4
+++ b/build-aux/m4/l_atomic.m4
@@ -32,7 +32,7 @@ AC_DEFUN([CHECK_ATOMIC], [
           AC_MSG_RESULT([yes])
         ],[
           AC_MSG_RESULT([no])
-          AC_MSG_FAILURE([cannot figure our how to use std::atomic])
+          AC_MSG_FAILURE([cannot figure out how to use std::atomic])
         ])
     ])
 

From 0c4e6ce88f58c13ed81807e3a5bef28b673aa503 Mon Sep 17 00:00:00 2001
From: Luke Dashjr <luke-jr+git@utopios.org>
Date: Wed, 21 Sep 2016 22:54:41 +0000
Subject: [PATCH 0920/1802] Add MIT license to build-aux/m4 scripts

---
 build-aux/m4/bitcoin_find_bdb48.m4        | 4 ++++
 build-aux/m4/bitcoin_qt.m4                | 4 ++++
 build-aux/m4/bitcoin_subdir_to_include.m4 | 4 ++++
 build-aux/m4/l_atomic.m4                  | 6 ++++++
 4 files changed, 18 insertions(+)

diff --git a/build-aux/m4/bitcoin_find_bdb48.m4 b/build-aux/m4/bitcoin_find_bdb48.m4
index 2aa493a6af6b4..0c3d49c2bc0af 100644
--- a/build-aux/m4/bitcoin_find_bdb48.m4
+++ b/build-aux/m4/bitcoin_find_bdb48.m4
@@ -1,3 +1,7 @@
+dnl Copyright (c) 2013-2015 The Bitcoin Core developers
+dnl Distributed under the MIT software license, see the accompanying
+dnl file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
 AC_DEFUN([BITCOIN_FIND_BDB48],[
   AC_MSG_CHECKING([for Berkeley DB C++ headers])
   BDB_CPPFLAGS=
diff --git a/build-aux/m4/bitcoin_qt.m4 b/build-aux/m4/bitcoin_qt.m4
index d26136cbe9a45..509283a0b9cd9 100644
--- a/build-aux/m4/bitcoin_qt.m4
+++ b/build-aux/m4/bitcoin_qt.m4
@@ -1,3 +1,7 @@
+dnl Copyright (c) 2013-2016 The Bitcoin Core developers
+dnl Distributed under the MIT software license, see the accompanying
+dnl file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
 dnl Helper for cases where a qt dependency is not met.
 dnl Output: If qt version is auto, set bitcoin_enable_qt to false. Else, exit.
 AC_DEFUN([BITCOIN_QT_FAIL],[
diff --git a/build-aux/m4/bitcoin_subdir_to_include.m4 b/build-aux/m4/bitcoin_subdir_to_include.m4
index 66f106c7d47b9..7841042ac877b 100644
--- a/build-aux/m4/bitcoin_subdir_to_include.m4
+++ b/build-aux/m4/bitcoin_subdir_to_include.m4
@@ -1,3 +1,7 @@
+dnl Copyright (c) 2013-2014 The Bitcoin Core developers
+dnl Distributed under the MIT software license, see the accompanying
+dnl file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
 dnl BITCOIN_SUBDIR_TO_INCLUDE([CPPFLAGS-VARIABLE-NAME],[SUBDIRECTORY-NAME],[HEADER-FILE])
 dnl SUBDIRECTORY-NAME must end with a path separator
 AC_DEFUN([BITCOIN_SUBDIR_TO_INCLUDE],[
diff --git a/build-aux/m4/l_atomic.m4 b/build-aux/m4/l_atomic.m4
index 1cb13587a9fb0..75c43f9a92d3d 100644
--- a/build-aux/m4/l_atomic.m4
+++ b/build-aux/m4/l_atomic.m4
@@ -1,3 +1,9 @@
+dnl Copyright (c) 2015 Tim Kosse <tim.kosse@filezilla-project.org>
+dnl Copying and distribution of this file, with or without modification, are
+dnl permitted in any medium without royalty provided the copyright notice
+dnl and this notice are preserved. This file is offered as-is, without any
+dnl warranty.
+
 # Some versions of gcc/libstdc++ require linking with -latomic if
 # using the C++ atomic library.
 #

From fa427cef130583440779bce9eacfda537c2e6d14 Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Thu, 22 Sep 2016 12:41:01 +0200
Subject: [PATCH 0921/1802] [qa] pull-tester: Only print output when failed

---
 qa/pull-tester/rpc-tests.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/qa/pull-tester/rpc-tests.py b/qa/pull-tester/rpc-tests.py
index 9e187b019bc8e..07cd16cba6b8f 100755
--- a/qa/pull-tester/rpc-tests.py
+++ b/qa/pull-tester/rpc-tests.py
@@ -215,8 +215,8 @@ def runtests():
         time_sum += duration
 
         print('\n' + BOLD[1] + name + BOLD[0] + ":")
-        print(stdout)
-        print('stderr:\n' if not stderr == '' else '', stderr)
+        print('' if passed else stdout + '\n', end='')
+        print('' if stderr == '' else 'stderr:\n' + stderr + '\n', end='')
         results += "%s | %s | %s s\n" % (name.ljust(max_len_name), str(passed).ljust(6), duration)
         print("Pass: %s%s%s, Duration: %s s\n" % (BOLD[1], passed, BOLD[0], duration))
     results += BOLD[1] + "\n%s | %s | %s s (accumulated)" % ("ALL".ljust(max_len_name), str(all_passed).ljust(6), time_sum) + BOLD[0]

From 3333bd2d155cc38ed6f1e8cc90ea85817a7b6445 Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Thu, 22 Sep 2016 12:51:50 +0200
Subject: [PATCH 0922/1802] [test] Remove redundant print in addrman_tests

---
 src/test/addrman_tests.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/test/addrman_tests.cpp b/src/test/addrman_tests.cpp
index 5f150e4812af5..5ccaeb57bbe2f 100644
--- a/src/test/addrman_tests.cpp
+++ b/src/test/addrman_tests.cpp
@@ -257,8 +257,7 @@ BOOST_AUTO_TEST_CASE(addrman_tried_collisions)
         addrman.Good(CAddress(addr, NODE_NONE));
 
         //Test 15: No collision in tried table yet.
-        BOOST_TEST_MESSAGE(addrman.size());
-        BOOST_CHECK(addrman.size() == i);
+        BOOST_CHECK_EQUAL(addrman.size(), i);
     }
 
     //Test 16: tried table collision!
@@ -543,4 +542,4 @@ BOOST_AUTO_TEST_CASE(caddrinfo_get_new_bucket)
     //  than 64 buckets.
     BOOST_CHECK(buckets.size() > 64);
 }
-BOOST_AUTO_TEST_SUITE_END()
\ No newline at end of file
+BOOST_AUTO_TEST_SUITE_END()

From fa16991e7bb133ac23cc51e566b5b5f3c8e8b9a4 Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Thu, 22 Sep 2016 13:07:11 +0200
Subject: [PATCH 0923/1802] [travis] cross-mac: explicitly enable gui

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 0b38fd45fe46e..d201cea732d66 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -34,7 +34,7 @@ env:
 # No wallet
     - HOST=x86_64-unknown-linux-gnu PACKAGES="python3" DEP_OPTS="NO_WALLET=1" RUN_TESTS=true GOAL="install" BITCOIN_CONFIG="--enable-glibc-back-compat --enable-reduce-exports"
 # Cross-Mac
-    - HOST=x86_64-apple-darwin11 PACKAGES="cmake imagemagick libcap-dev librsvg2-bin libz-dev libbz2-dev libtiff-tools python-dev" BITCOIN_CONFIG="--enable-reduce-exports" OSX_SDK=10.11 GOAL="deploy"
+    - HOST=x86_64-apple-darwin11 PACKAGES="cmake imagemagick libcap-dev librsvg2-bin libz-dev libbz2-dev libtiff-tools python-dev" BITCOIN_CONFIG="--enable-gui --enable-reduce-exports" OSX_SDK=10.11 GOAL="deploy"
 
 before_install:
     - export PATH=$(echo $PATH | tr ':' "\n" | sed '/\/opt\/python/d' | tr "\n" ":" | sed "s|::|:|g")

From b5ccded57faff58f6291a0b19bb2db978ab0e8e0 Mon Sep 17 00:00:00 2001
From: instagibbs <gsanders87@gmail.com>
Date: Wed, 21 Sep 2016 17:34:10 -0400
Subject: [PATCH 0924/1802] Comment on CConnman::nLocalServices meaning

---
 src/net.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/net.h b/src/net.h
index 0173854669ba7..d0b2773623f43 100644
--- a/src/net.h
+++ b/src/net.h
@@ -677,6 +677,7 @@ class CNode
 
 
     uint64_t nLocalHostNonce;
+    // Services offered to this peer
     ServiceFlags nLocalServices;
     int nMyStartingHeight;
 public:

From 4b6740204d0768279d36544a8141f2867fd98359 Mon Sep 17 00:00:00 2001
From: Andrew Chow <achow101@gmail.com>
Date: Wed, 21 Sep 2016 21:58:18 -0400
Subject: [PATCH 0925/1802] Mandatory copyright agreement

All contributions to the repository will agree to use the MIT license
---
 CONTRIBUTING.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 62ebc7917aad4..c8cb666b4de6d 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -198,3 +198,11 @@ Release Policy
 --------------
 
 The project leader is the release manager for each Bitcoin Core release.
+
+Copyright
+---------
+
+By contributing to this repository, you agree to license your work under the 
+MIT license unless specified otherwise in `contrib/debian/copyright` or at 
+the top of the file itself. Any work contributed where you are not the original 
+author must contain its license header with the original author(s) and source.

From fd5654cab1e5d317119f747abd245c620e8ba29b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pavel=20Jan=C3=ADk?= <Pavel@Janik.cz>
Date: Thu, 22 Sep 2016 16:36:03 +0200
Subject: [PATCH 0926/1802] Check and enable -Wshadow by default.

---
 configure.ac | 1 +
 1 file changed, 1 insertion(+)

diff --git a/configure.ac b/configure.ac
index 25b828f18c6fd..c95489d4d726b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -203,6 +203,7 @@ if test "x$CXXFLAGS_overridden" = "xno"; then
   AX_CHECK_COMPILE_FLAG([-Wextra],[CXXFLAGS="$CXXFLAGS -Wextra"],,[[$CXXFLAG_WERROR]])
   AX_CHECK_COMPILE_FLAG([-Wformat],[CXXFLAGS="$CXXFLAGS -Wformat"],,[[$CXXFLAG_WERROR]])
   AX_CHECK_COMPILE_FLAG([-Wformat-security],[CXXFLAGS="$CXXFLAGS -Wformat-security"],,[[$CXXFLAG_WERROR]])
+  AX_CHECK_COMPILE_FLAG([-Wshadow],[CXXFLAGS="$CXXFLAGS -Wshadow"],,[[$CXXFLAG_WERROR]])
 
   ## Some compilers (gcc) ignore unknown -Wno-* options, but warn about all
   ## unknown options if any other warning is produced. Test the -Wfoo case, and

From faa91bc335da1c0f20b7a3375b1cfcfdc7b10af5 Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Wed, 21 Sep 2016 11:44:05 +0200
Subject: [PATCH 0927/1802] CONTRIBUTING: Mention not to open several pulls

---
 CONTRIBUTING.md | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 62ebc7917aad4..7e9b4f10df1ea 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -87,6 +87,15 @@ before it will be merged. The basic squashing workflow is shown below.
     # save and quit
     git push -f # (force push to GitHub)
 
+If you have problems with squashing (or other workflows with `git`), you can
+alternatively enable "Allow edits from maintainers" in the right GitHub
+sidebar and ask for help in the pull request.
+
+Please refrain from creating several pull requests for the same change.
+Use the pull request that is already open (or was created earlier) to amend
+changes. This preserves the discussion and review that happened earlier for
+the respective change set.
+
 The length of time required for peer review is unpredictable and will vary from
 pull request to pull request.
 

From 3f58a283ee108595cf3cc29aee9a4db2c1fcecd3 Mon Sep 17 00:00:00 2001
From: Amir Abrams <AmirAbrams@users.noreply.github.com>
Date: Wed, 21 Sep 2016 22:10:59 -0500
Subject: [PATCH 0928/1802] [Doc] Add missing autogen to example builds

---
 doc/build-windows.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/build-windows.md b/doc/build-windows.md
index 129774491b2ff..ec5f26c88b0df 100644
--- a/doc/build-windows.md
+++ b/doc/build-windows.md
@@ -27,6 +27,7 @@ To build executables for Windows 32-bit:
     cd depends
     make HOST=i686-w64-mingw32 -j4
     cd ..
+    ./autogen.sh # not required when building from tarball
     ./configure --prefix=`pwd`/depends/i686-w64-mingw32
     make
 
@@ -35,6 +36,7 @@ To build executables for Windows 64-bit:
     cd depends
     make HOST=x86_64-w64-mingw32 -j4
     cd ..
+    ./autogen.sh # not required when building from tarball
     ./configure --prefix=`pwd`/depends/x86_64-w64-mingw32
     make
 

From c72c5b1e3bd42e84465677e94aa83316ff3d9a14 Mon Sep 17 00:00:00 2001
From: Johnson Lau <jl2012@xbt.hk>
Date: Fri, 23 Sep 2016 13:06:45 +0800
Subject: [PATCH 0929/1802] Make non-minimal OP_IF/NOTIF argument non-standard
 for P2WSH

---
 src/policy/policy.h             |  1 +
 src/script/interpreter.cpp      |  6 +++
 src/script/interpreter.h        |  4 ++
 src/script/script_error.cpp     |  2 +
 src/script/script_error.h       |  3 +-
 src/test/data/script_tests.json | 85 ++++++++++++++++++++++++++++++++-
 src/test/script_tests.cpp       |  1 +
 src/test/transaction_tests.cpp  |  1 +
 8 files changed, 101 insertions(+), 2 deletions(-)

diff --git a/src/policy/policy.h b/src/policy/policy.h
index 6bf5ca0ee5567..458ec4a0cb4aa 100644
--- a/src/policy/policy.h
+++ b/src/policy/policy.h
@@ -42,6 +42,7 @@ static const unsigned int STANDARD_SCRIPT_VERIFY_FLAGS = MANDATORY_SCRIPT_VERIFY
                                                          SCRIPT_VERIFY_NULLDUMMY |
                                                          SCRIPT_VERIFY_DISCOURAGE_UPGRADABLE_NOPS |
                                                          SCRIPT_VERIFY_CLEANSTACK |
+                                                         SCRIPT_VERIFY_MINIMALIF |
                                                          SCRIPT_VERIFY_CHECKLOCKTIMEVERIFY |
                                                          SCRIPT_VERIFY_CHECKSEQUENCEVERIFY |
                                                          SCRIPT_VERIFY_LOW_S |
diff --git a/src/script/interpreter.cpp b/src/script/interpreter.cpp
index 47ea261e31040..fd356fed0ab43 100644
--- a/src/script/interpreter.cpp
+++ b/src/script/interpreter.cpp
@@ -428,6 +428,12 @@ bool EvalScript(vector<vector<unsigned char> >& stack, const CScript& script, un
                         if (stack.size() < 1)
                             return set_error(serror, SCRIPT_ERR_UNBALANCED_CONDITIONAL);
                         valtype& vch = stacktop(-1);
+                        if (sigversion == SIGVERSION_WITNESS_V0 && (flags & SCRIPT_VERIFY_MINIMALIF)) {
+                            if (vch.size() > 1)
+                                return set_error(serror, SCRIPT_ERR_MINIMALIF);
+                            if (vch.size() == 1 && vch[0] != 1)
+                                return set_error(serror, SCRIPT_ERR_MINIMALIF);
+                        }
                         fValue = CastToBool(vch);
                         if (opcode == OP_NOTIF)
                             fValue = !fValue;
diff --git a/src/script/interpreter.h b/src/script/interpreter.h
index e5d7865cd3de6..2ce4b23e54f62 100644
--- a/src/script/interpreter.h
+++ b/src/script/interpreter.h
@@ -94,6 +94,10 @@ enum
     // Making v1-v16 witness program non-standard
     //
     SCRIPT_VERIFY_DISCOURAGE_UPGRADABLE_WITNESS_PROGRAM = (1U << 12),
+
+    // Segwit script only: Require the argument of OP_IF/NOTIF to be exactly 0x01 or empty vector
+    //
+    SCRIPT_VERIFY_MINIMALIF = (1U << 13),
 };
 
 bool CheckSignatureEncoding(const std::vector<unsigned char> &vchSig, unsigned int flags, ScriptError* serror);
diff --git a/src/script/script_error.cpp b/src/script/script_error.cpp
index cef807edcf475..9969c232fc340 100644
--- a/src/script/script_error.cpp
+++ b/src/script/script_error.cpp
@@ -63,6 +63,8 @@ const char* ScriptErrorString(const ScriptError serror)
             return "Non-canonical signature: S value is unnecessarily high";
         case SCRIPT_ERR_SIG_NULLDUMMY:
             return "Dummy CHECKMULTISIG argument must be zero";
+        case SCRIPT_ERR_MINIMALIF:
+            return "OP_IF/NOTIF argument must be minimal";
         case SCRIPT_ERR_DISCOURAGE_UPGRADABLE_NOPS:
             return "NOPx reserved for soft-fork upgrades";
         case SCRIPT_ERR_DISCOURAGE_UPGRADABLE_WITNESS_PROGRAM:
diff --git a/src/script/script_error.h b/src/script/script_error.h
index 09dc6945adb45..6d34d37925bcf 100644
--- a/src/script/script_error.h
+++ b/src/script/script_error.h
@@ -39,7 +39,7 @@ typedef enum ScriptError_t
     SCRIPT_ERR_NEGATIVE_LOCKTIME,
     SCRIPT_ERR_UNSATISFIED_LOCKTIME,
 
-    /* BIP62 */
+    /* Malleability */
     SCRIPT_ERR_SIG_HASHTYPE,
     SCRIPT_ERR_SIG_DER,
     SCRIPT_ERR_MINIMALDATA,
@@ -48,6 +48,7 @@ typedef enum ScriptError_t
     SCRIPT_ERR_SIG_NULLDUMMY,
     SCRIPT_ERR_PUBKEYTYPE,
     SCRIPT_ERR_CLEANSTACK,
+    SCRIPT_ERR_MINIMALIF,
 
     /* softfork safeness */
     SCRIPT_ERR_DISCOURAGE_UPGRADABLE_NOPS,
diff --git a/src/test/data/script_tests.json b/src/test/data/script_tests.json
index fcd5457386dda..d456a8beffd67 100644
--- a/src/test/data/script_tests.json
+++ b/src/test/data/script_tests.json
@@ -2125,5 +2125,88 @@
 ["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"]
+
+["MINIMALIF tests"],
+["MINIMALIF is not applied to non-segwit scripts"],
+["1", "IF 1 ENDIF", "P2SH,WITNESS,MINIMALIF", "OK"],
+["2", "IF 1 ENDIF", "P2SH,WITNESS,MINIMALIF", "OK"],
+["0x02 0x0100", "IF 1 ENDIF", "P2SH,WITNESS,MINIMALIF", "OK"],
+["0", "IF 1 ENDIF", "P2SH,WITNESS,MINIMALIF", "EVAL_FALSE"],
+["0x01 0x00", "IF 1 ENDIF", "P2SH,WITNESS,MINIMALIF", "EVAL_FALSE"],
+["1", "NOTIF 1 ENDIF", "P2SH,WITNESS,MINIMALIF", "EVAL_FALSE"],
+["2", "NOTIF 1 ENDIF", "P2SH,WITNESS,MINIMALIF", "EVAL_FALSE"],
+["0x02 0x0100", "NOTIF 1 ENDIF", "P2SH,WITNESS,MINIMALIF", "EVAL_FALSE"],
+["0", "NOTIF 1 ENDIF", "P2SH,WITNESS,MINIMALIF", "OK"],
+["0x01 0x00", "NOTIF 1 ENDIF", "P2SH,WITNESS,MINIMALIF", "OK"],
+["Normal P2SH IF 1 ENDIF"],
+["1 0x03 0x635168", "HASH160 0x14 0xe7309652a8e3f600f06f5d8d52d6df03d2176cc3 EQUAL", "P2SH,WITNESS,MINIMALIF", "OK"],
+["2 0x03 0x635168", "HASH160 0x14 0xe7309652a8e3f600f06f5d8d52d6df03d2176cc3 EQUAL", "P2SH,WITNESS,MINIMALIF", "OK"],
+["0x02 0x0100 0x03 0x635168", "HASH160 0x14 0xe7309652a8e3f600f06f5d8d52d6df03d2176cc3 EQUAL", "P2SH,WITNESS,MINIMALIF", "OK"],
+["0 0x03 0x635168", "HASH160 0x14 0xe7309652a8e3f600f06f5d8d52d6df03d2176cc3 EQUAL", "P2SH,WITNESS,MINIMALIF", "EVAL_FALSE"],
+["0x01 0x00 0x03 0x635168", "HASH160 0x14 0xe7309652a8e3f600f06f5d8d52d6df03d2176cc3 EQUAL", "P2SH,WITNESS,MINIMALIF", "EVAL_FALSE"],
+["0x03 0x635168", "HASH160 0x14 0xe7309652a8e3f600f06f5d8d52d6df03d2176cc3 EQUAL", "P2SH,WITNESS,MINIMALIF", "UNBALANCED_CONDITIONAL"],
+["Normal P2SH NOTIF 1 ENDIF"],
+["1 0x03 0x645168", "HASH160 0x14 0x0c3f8fe3d6ca266e76311ecda544c67d15fdd5b0 EQUAL", "P2SH,WITNESS,MINIMALIF", "EVAL_FALSE"],
+["2 0x03 0x645168", "HASH160 0x14 0x0c3f8fe3d6ca266e76311ecda544c67d15fdd5b0 EQUAL", "P2SH,WITNESS,MINIMALIF", "EVAL_FALSE"],
+["0x02 0x0100 0x03 0x645168", "HASH160 0x14 0x0c3f8fe3d6ca266e76311ecda544c67d15fdd5b0 EQUAL", "P2SH,WITNESS,MINIMALIF", "EVAL_FALSE"],
+["0 0x03 0x645168", "HASH160 0x14 0x0c3f8fe3d6ca266e76311ecda544c67d15fdd5b0 EQUAL", "P2SH,WITNESS,MINIMALIF", "OK"],
+["0x01 0x00 0x03 0x645168", "HASH160 0x14 0x0c3f8fe3d6ca266e76311ecda544c67d15fdd5b0 EQUAL", "P2SH,WITNESS,MINIMALIF", "OK"],
+["0x03 0x645168", "HASH160 0x14 0x0c3f8fe3d6ca266e76311ecda544c67d15fdd5b0 EQUAL", "P2SH,WITNESS,MINIMALIF", "UNBALANCED_CONDITIONAL"],
+["P2WSH IF 1 ENDIF"],
+[["01", "635168", 0.00000001], "", "0 0x20 0xc7eaf06d5ae01a58e376e126eb1e6fab2036076922b96b2711ffbec1e590665d", "P2SH,WITNESS", "OK"],
+[["02", "635168", 0.00000001], "", "0 0x20 0xc7eaf06d5ae01a58e376e126eb1e6fab2036076922b96b2711ffbec1e590665d", "P2SH,WITNESS", "OK"],
+[["0100", "635168", 0.00000001], "", "0 0x20 0xc7eaf06d5ae01a58e376e126eb1e6fab2036076922b96b2711ffbec1e590665d", "P2SH,WITNESS", "OK"],
+[["", "635168", 0.00000001], "", "0 0x20 0xc7eaf06d5ae01a58e376e126eb1e6fab2036076922b96b2711ffbec1e590665d", "P2SH,WITNESS", "EVAL_FALSE"],
+[["00", "635168", 0.00000001], "", "0 0x20 0xc7eaf06d5ae01a58e376e126eb1e6fab2036076922b96b2711ffbec1e590665d", "P2SH,WITNESS", "EVAL_FALSE"],
+[["01", "635168", 0.00000001], "", "0 0x20 0xc7eaf06d5ae01a58e376e126eb1e6fab2036076922b96b2711ffbec1e590665d", "P2SH,WITNESS,MINIMALIF", "OK"],
+[["02", "635168", 0.00000001], "", "0 0x20 0xc7eaf06d5ae01a58e376e126eb1e6fab2036076922b96b2711ffbec1e590665d", "P2SH,WITNESS,MINIMALIF", "MINIMALIF"],
+[["0100", "635168", 0.00000001], "", "0 0x20 0xc7eaf06d5ae01a58e376e126eb1e6fab2036076922b96b2711ffbec1e590665d", "P2SH,WITNESS,MINIMALIF", "MINIMALIF"],
+[["", "635168", 0.00000001], "", "0 0x20 0xc7eaf06d5ae01a58e376e126eb1e6fab2036076922b96b2711ffbec1e590665d", "P2SH,WITNESS,MINIMALIF", "EVAL_FALSE"],
+[["00", "635168", 0.00000001], "", "0 0x20 0xc7eaf06d5ae01a58e376e126eb1e6fab2036076922b96b2711ffbec1e590665d", "P2SH,WITNESS,MINIMALIF", "MINIMALIF"],
+[["635168", 0.00000001], "", "0 0x20 0xc7eaf06d5ae01a58e376e126eb1e6fab2036076922b96b2711ffbec1e590665d", "P2SH,WITNESS", "UNBALANCED_CONDITIONAL"],
+[["635168", 0.00000001], "", "0 0x20 0xc7eaf06d5ae01a58e376e126eb1e6fab2036076922b96b2711ffbec1e590665d", "P2SH,WITNESS,MINIMALIF", "UNBALANCED_CONDITIONAL"],
+["P2WSH NOTIF 1 ENDIF"],
+[["01", "645168", 0.00000001], "", "0 0x20 0xf913eacf2e38a5d6fc3a8311d72ae704cb83866350a984dd3e5eb76d2a8c28e8", "P2SH,WITNESS", "EVAL_FALSE"],
+[["02", "645168", 0.00000001], "", "0 0x20 0xf913eacf2e38a5d6fc3a8311d72ae704cb83866350a984dd3e5eb76d2a8c28e8", "P2SH,WITNESS", "EVAL_FALSE"],
+[["0100", "645168", 0.00000001], "", "0 0x20 0xf913eacf2e38a5d6fc3a8311d72ae704cb83866350a984dd3e5eb76d2a8c28e8", "P2SH,WITNESS", "EVAL_FALSE"],
+[["", "645168", 0.00000001], "", "0 0x20 0xf913eacf2e38a5d6fc3a8311d72ae704cb83866350a984dd3e5eb76d2a8c28e8", "P2SH,WITNESS", "OK"],
+[["00", "645168", 0.00000001], "", "0 0x20 0xf913eacf2e38a5d6fc3a8311d72ae704cb83866350a984dd3e5eb76d2a8c28e8", "P2SH,WITNESS", "OK"],
+[["01", "645168", 0.00000001], "", "0 0x20 0xf913eacf2e38a5d6fc3a8311d72ae704cb83866350a984dd3e5eb76d2a8c28e8", "P2SH,WITNESS,MINIMALIF", "EVAL_FALSE"],
+[["02", "645168", 0.00000001], "", "0 0x20 0xf913eacf2e38a5d6fc3a8311d72ae704cb83866350a984dd3e5eb76d2a8c28e8", "P2SH,WITNESS,MINIMALIF", "MINIMALIF"],
+[["0100", "645168", 0.00000001], "", "0 0x20 0xf913eacf2e38a5d6fc3a8311d72ae704cb83866350a984dd3e5eb76d2a8c28e8", "P2SH,WITNESS,MINIMALIF", "MINIMALIF"],
+[["", "645168", 0.00000001], "", "0 0x20 0xf913eacf2e38a5d6fc3a8311d72ae704cb83866350a984dd3e5eb76d2a8c28e8", "P2SH,WITNESS,MINIMALIF", "OK"],
+[["00", "645168", 0.00000001], "", "0 0x20 0xf913eacf2e38a5d6fc3a8311d72ae704cb83866350a984dd3e5eb76d2a8c28e8", "P2SH,WITNESS,MINIMALIF", "MINIMALIF"],
+[["645168", 0.00000001], "", "0 0x20 0xf913eacf2e38a5d6fc3a8311d72ae704cb83866350a984dd3e5eb76d2a8c28e8", "P2SH,WITNESS", "UNBALANCED_CONDITIONAL"],
+[["645168", 0.00000001], "", "0 0x20 0xf913eacf2e38a5d6fc3a8311d72ae704cb83866350a984dd3e5eb76d2a8c28e8", "P2SH,WITNESS,MINIMALIF", "UNBALANCED_CONDITIONAL"],
+
+
+
+["P2SH-P2WSH IF 1 ENDIF"],
+[["01", "635168", 0.00000001], "0x22 0x0020c7eaf06d5ae01a58e376e126eb1e6fab2036076922b96b2711ffbec1e590665d", "HASH160 0x14 0x9b27ee6d9010c21bf837b334d043be5d150e7ba7 EQUAL", "P2SH,WITNESS", "OK"],
+[["02", "635168", 0.00000001], "0x22 0x0020c7eaf06d5ae01a58e376e126eb1e6fab2036076922b96b2711ffbec1e590665d", "HASH160 0x14 0x9b27ee6d9010c21bf837b334d043be5d150e7ba7 EQUAL", "P2SH,WITNESS", "OK"],
+[["0100", "635168", 0.00000001], "0x22 0x0020c7eaf06d5ae01a58e376e126eb1e6fab2036076922b96b2711ffbec1e590665d", "HASH160 0x14 0x9b27ee6d9010c21bf837b334d043be5d150e7ba7 EQUAL", "P2SH,WITNESS", "OK"],
+[["", "635168", 0.00000001], "0x22 0x0020c7eaf06d5ae01a58e376e126eb1e6fab2036076922b96b2711ffbec1e590665d", "HASH160 0x14 0x9b27ee6d9010c21bf837b334d043be5d150e7ba7 EQUAL", "P2SH,WITNESS", "EVAL_FALSE"],
+[["00", "635168", 0.00000001], "0x22 0x0020c7eaf06d5ae01a58e376e126eb1e6fab2036076922b96b2711ffbec1e590665d", "HASH160 0x14 0x9b27ee6d9010c21bf837b334d043be5d150e7ba7 EQUAL", "P2SH,WITNESS", "EVAL_FALSE"],
+[["01", "635168", 0.00000001], "0x22 0x0020c7eaf06d5ae01a58e376e126eb1e6fab2036076922b96b2711ffbec1e590665d", "HASH160 0x14 0x9b27ee6d9010c21bf837b334d043be5d150e7ba7 EQUAL", "P2SH,WITNESS,MINIMALIF", "OK"],
+[["02", "635168", 0.00000001], "0x22 0x0020c7eaf06d5ae01a58e376e126eb1e6fab2036076922b96b2711ffbec1e590665d", "HASH160 0x14 0x9b27ee6d9010c21bf837b334d043be5d150e7ba7 EQUAL", "P2SH,WITNESS,MINIMALIF", "MINIMALIF"],
+[["0100", "635168", 0.00000001], "0x22 0x0020c7eaf06d5ae01a58e376e126eb1e6fab2036076922b96b2711ffbec1e590665d", "HASH160 0x14 0x9b27ee6d9010c21bf837b334d043be5d150e7ba7 EQUAL", "P2SH,WITNESS,MINIMALIF", "MINIMALIF"],
+[["", "635168", 0.00000001], "0x22 0x0020c7eaf06d5ae01a58e376e126eb1e6fab2036076922b96b2711ffbec1e590665d", "HASH160 0x14 0x9b27ee6d9010c21bf837b334d043be5d150e7ba7 EQUAL", "P2SH,WITNESS,MINIMALIF", "EVAL_FALSE"],
+[["00", "635168", 0.00000001], "0x22 0x0020c7eaf06d5ae01a58e376e126eb1e6fab2036076922b96b2711ffbec1e590665d", "HASH160 0x14 0x9b27ee6d9010c21bf837b334d043be5d150e7ba7 EQUAL", "P2SH,WITNESS,MINIMALIF", "MINIMALIF"],
+[["635168", 0.00000001], "0x22 0x0020c7eaf06d5ae01a58e376e126eb1e6fab2036076922b96b2711ffbec1e590665d", "HASH160 0x14 0x9b27ee6d9010c21bf837b334d043be5d150e7ba7 EQUAL", "P2SH,WITNESS", "UNBALANCED_CONDITIONAL"],
+[["635168", 0.00000001], "0x22 0x0020c7eaf06d5ae01a58e376e126eb1e6fab2036076922b96b2711ffbec1e590665d", "HASH160 0x14 0x9b27ee6d9010c21bf837b334d043be5d150e7ba7 EQUAL", "P2SH,WITNESS,MINIMALIF", "UNBALANCED_CONDITIONAL"],
+["P2SH-P2WSH NOTIF 1 ENDIF"],
+[["01", "645168", 0.00000001], "0x22 0x0020f913eacf2e38a5d6fc3a8311d72ae704cb83866350a984dd3e5eb76d2a8c28e8", "HASH160 0x14 0xdbb7d1c0a56b7a9c423300c8cca6e6e065baf1dc EQUAL", "P2SH,WITNESS", "EVAL_FALSE"],
+[["02", "645168", 0.00000001], "0x22 0x0020f913eacf2e38a5d6fc3a8311d72ae704cb83866350a984dd3e5eb76d2a8c28e8", "HASH160 0x14 0xdbb7d1c0a56b7a9c423300c8cca6e6e065baf1dc EQUAL", "P2SH,WITNESS", "EVAL_FALSE"],
+[["0100", "645168", 0.00000001], "0x22 0x0020f913eacf2e38a5d6fc3a8311d72ae704cb83866350a984dd3e5eb76d2a8c28e8", "HASH160 0x14 0xdbb7d1c0a56b7a9c423300c8cca6e6e065baf1dc EQUAL", "P2SH,WITNESS", "EVAL_FALSE"],
+[["", "645168", 0.00000001], "0x22 0x0020f913eacf2e38a5d6fc3a8311d72ae704cb83866350a984dd3e5eb76d2a8c28e8", "HASH160 0x14 0xdbb7d1c0a56b7a9c423300c8cca6e6e065baf1dc EQUAL", "P2SH,WITNESS", "OK"],
+[["00", "645168", 0.00000001], "0x22 0x0020f913eacf2e38a5d6fc3a8311d72ae704cb83866350a984dd3e5eb76d2a8c28e8", "HASH160 0x14 0xdbb7d1c0a56b7a9c423300c8cca6e6e065baf1dc EQUAL", "P2SH,WITNESS", "OK"],
+[["01", "645168", 0.00000001], "0x22 0x0020f913eacf2e38a5d6fc3a8311d72ae704cb83866350a984dd3e5eb76d2a8c28e8", "HASH160 0x14 0xdbb7d1c0a56b7a9c423300c8cca6e6e065baf1dc EQUAL", "P2SH,WITNESS,MINIMALIF", "EVAL_FALSE"],
+[["02", "645168", 0.00000001], "0x22 0x0020f913eacf2e38a5d6fc3a8311d72ae704cb83866350a984dd3e5eb76d2a8c28e8", "HASH160 0x14 0xdbb7d1c0a56b7a9c423300c8cca6e6e065baf1dc EQUAL", "P2SH,WITNESS,MINIMALIF", "MINIMALIF"],
+[["0100", "645168", 0.00000001], "0x22 0x0020f913eacf2e38a5d6fc3a8311d72ae704cb83866350a984dd3e5eb76d2a8c28e8", "HASH160 0x14 0xdbb7d1c0a56b7a9c423300c8cca6e6e065baf1dc EQUAL", "P2SH,WITNESS,MINIMALIF", "MINIMALIF"],
+[["", "645168", 0.00000001], "0x22 0x0020f913eacf2e38a5d6fc3a8311d72ae704cb83866350a984dd3e5eb76d2a8c28e8", "HASH160 0x14 0xdbb7d1c0a56b7a9c423300c8cca6e6e065baf1dc EQUAL", "P2SH,WITNESS,MINIMALIF", "OK"],
+[["00", "645168", 0.00000001], "0x22 0x0020f913eacf2e38a5d6fc3a8311d72ae704cb83866350a984dd3e5eb76d2a8c28e8", "HASH160 0x14 0xdbb7d1c0a56b7a9c423300c8cca6e6e065baf1dc EQUAL", "P2SH,WITNESS,MINIMALIF", "MINIMALIF"],
+[["645168", 0.00000001], "0x22 0x0020f913eacf2e38a5d6fc3a8311d72ae704cb83866350a984dd3e5eb76d2a8c28e8", "HASH160 0x14 0xdbb7d1c0a56b7a9c423300c8cca6e6e065baf1dc EQUAL", "P2SH,WITNESS", "UNBALANCED_CONDITIONAL"],
+[["645168", 0.00000001], "0x22 0x0020f913eacf2e38a5d6fc3a8311d72ae704cb83866350a984dd3e5eb76d2a8c28e8", "HASH160 0x14 0xdbb7d1c0a56b7a9c423300c8cca6e6e065baf1dc EQUAL", "P2SH,WITNESS,MINIMALIF", "UNBALANCED_CONDITIONAL"],
+
+ ["The End"]
 ]
diff --git a/src/test/script_tests.cpp b/src/test/script_tests.cpp
index 5a9aaf9bc0738..36c591d616f92 100644
--- a/src/test/script_tests.cpp
+++ b/src/test/script_tests.cpp
@@ -89,6 +89,7 @@ static ScriptErrorDesc script_errors[]={
     {SCRIPT_ERR_SIG_NULLDUMMY, "SIG_NULLDUMMY"},
     {SCRIPT_ERR_PUBKEYTYPE, "PUBKEYTYPE"},
     {SCRIPT_ERR_CLEANSTACK, "CLEANSTACK"},
+    {SCRIPT_ERR_MINIMALIF, "MINIMALIF"},
     {SCRIPT_ERR_DISCOURAGE_UPGRADABLE_NOPS, "DISCOURAGE_UPGRADABLE_NOPS"},
     {SCRIPT_ERR_DISCOURAGE_UPGRADABLE_WITNESS_PROGRAM, "DISCOURAGE_UPGRADABLE_WITNESS_PROGRAM"},
     {SCRIPT_ERR_WITNESS_PROGRAM_WRONG_LENGTH, "WITNESS_PROGRAM_WRONG_LENGTH"},
diff --git a/src/test/transaction_tests.cpp b/src/test/transaction_tests.cpp
index b5af400bc54b5..165dfd9a3e06b 100644
--- a/src/test/transaction_tests.cpp
+++ b/src/test/transaction_tests.cpp
@@ -50,6 +50,7 @@ static std::map<string, unsigned int> mapFlagNames = boost::assign::map_list_of
     (string("NULLDUMMY"), (unsigned int)SCRIPT_VERIFY_NULLDUMMY)
     (string("DISCOURAGE_UPGRADABLE_NOPS"), (unsigned int)SCRIPT_VERIFY_DISCOURAGE_UPGRADABLE_NOPS)
     (string("CLEANSTACK"), (unsigned int)SCRIPT_VERIFY_CLEANSTACK)
+    (string("MINIMALIF"), (unsigned int)SCRIPT_VERIFY_MINIMALIF)
     (string("CHECKLOCKTIMEVERIFY"), (unsigned int)SCRIPT_VERIFY_CHECKLOCKTIMEVERIFY)
     (string("CHECKSEQUENCEVERIFY"), (unsigned int)SCRIPT_VERIFY_CHECKSEQUENCEVERIFY)
     (string("WITNESS"), (unsigned int)SCRIPT_VERIFY_WITNESS)

From f8393504205089112cdec27ac1829282b76b94a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pavel=20Jan=C3=ADk?= <Pavel@Janik.cz>
Date: Fri, 9 Sep 2016 13:43:29 +0200
Subject: [PATCH 0930/1802] Do not shadow in src/qt

---
 src/qt/addressbookpage.cpp         | 16 +++++------
 src/qt/addresstablemodel.cpp       | 12 ++++----
 src/qt/askpassphrasedialog.cpp     |  8 +++---
 src/qt/bitcoingui.cpp              | 44 ++++++++++++++--------------
 src/qt/clientmodel.cpp             |  4 +--
 src/qt/coincontroldialog.cpp       | 12 ++++----
 src/qt/csvmodelwriter.cpp          |  8 +++---
 src/qt/editaddressdialog.cpp       | 18 ++++++------
 src/qt/guiutil.cpp                 |  4 +--
 src/qt/intro.cpp                   |  4 +--
 src/qt/networkstyle.cpp            |  6 ++--
 src/qt/notificator.cpp             | 12 ++++----
 src/qt/optionsdialog.cpp           | 12 ++++----
 src/qt/overviewpage.cpp            |  4 +--
 src/qt/paymentserver.cpp           |  4 +--
 src/qt/platformstyle.cpp           | 10 +++----
 src/qt/qvalidatedlineedit.cpp      |  8 +++---
 src/qt/qvaluecombobox.cpp          |  4 +--
 src/qt/receivecoinsdialog.cpp      | 26 ++++++++---------
 src/qt/receiverequestdialog.cpp    | 12 ++++----
 src/qt/rpcconsole.cpp              |  8 +++---
 src/qt/sendcoinsdialog.cpp         | 46 +++++++++++++++---------------
 src/qt/sendcoinsentry.cpp          | 12 ++++----
 src/qt/signverifymessagedialog.cpp |  8 +++---
 src/qt/transactionfilterproxy.cpp  |  8 +++---
 src/qt/transactionrecord.h         | 12 ++++----
 src/qt/transactiontablemodel.cpp   | 18 ++++++------
 src/qt/transactionview.cpp         | 16 +++++------
 src/qt/walletframe.cpp             |  8 +++---
 src/qt/walletmodel.cpp             | 12 ++++----
 src/qt/walletmodel.h               |  8 +++---
 src/qt/walletmodeltransaction.cpp  |  4 +--
 src/qt/walletview.cpp              | 44 ++++++++++++++--------------
 33 files changed, 216 insertions(+), 216 deletions(-)

diff --git a/src/qt/addressbookpage.cpp b/src/qt/addressbookpage.cpp
index 135f15ffa85ad..58cf4dede046e 100644
--- a/src/qt/addressbookpage.cpp
+++ b/src/qt/addressbookpage.cpp
@@ -21,12 +21,12 @@
 #include <QMessageBox>
 #include <QSortFilterProxyModel>
 
-AddressBookPage::AddressBookPage(const PlatformStyle *platformStyle, Mode mode, Tabs tab, QWidget *parent) :
+AddressBookPage::AddressBookPage(const PlatformStyle *platformStyle, Mode _mode, Tabs _tab, QWidget *parent) :
     QDialog(parent),
     ui(new Ui::AddressBookPage),
     model(0),
-    mode(mode),
-    tab(tab)
+    mode(_mode),
+    tab(_tab)
 {
     ui->setupUi(this);
 
@@ -107,14 +107,14 @@ AddressBookPage::~AddressBookPage()
     delete ui;
 }
 
-void AddressBookPage::setModel(AddressTableModel *model)
+void AddressBookPage::setModel(AddressTableModel *_model)
 {
-    this->model = model;
-    if(!model)
+    this->model = _model;
+    if(!_model)
         return;
 
     proxyModel = new QSortFilterProxyModel(this);
-    proxyModel->setSourceModel(model);
+    proxyModel->setSourceModel(_model);
     proxyModel->setDynamicSortFilter(true);
     proxyModel->setSortCaseSensitivity(Qt::CaseInsensitive);
     proxyModel->setFilterCaseSensitivity(Qt::CaseInsensitive);
@@ -147,7 +147,7 @@ void AddressBookPage::setModel(AddressTableModel *model)
         this, SLOT(selectionChanged()));
 
     // Select row for newly created address
-    connect(model, SIGNAL(rowsInserted(QModelIndex,int,int)), this, SLOT(selectNewAddress(QModelIndex,int,int)));
+    connect(_model, SIGNAL(rowsInserted(QModelIndex,int,int)), this, SLOT(selectNewAddress(QModelIndex,int,int)));
 
     selectionChanged();
 }
diff --git a/src/qt/addresstablemodel.cpp b/src/qt/addresstablemodel.cpp
index 71ed3618e415e..830c9cdf19bb7 100644
--- a/src/qt/addresstablemodel.cpp
+++ b/src/qt/addresstablemodel.cpp
@@ -31,8 +31,8 @@ struct AddressTableEntry
     QString address;
 
     AddressTableEntry() {}
-    AddressTableEntry(Type type, const QString &label, const QString &address):
-        type(type), label(label), address(address) {}
+    AddressTableEntry(Type _type, const QString &_label, const QString &_address):
+        type(_type), label(_label), address(_address) {}
 };
 
 struct AddressTableEntryLessThan
@@ -73,8 +73,8 @@ class AddressTablePriv
     QList<AddressTableEntry> cachedAddressTable;
     AddressTableModel *parent;
 
-    AddressTablePriv(CWallet *wallet, AddressTableModel *parent):
-        wallet(wallet), parent(parent) {}
+    AddressTablePriv(CWallet *_wallet, AddressTableModel *_parent):
+        wallet(_wallet), parent(_parent) {}
 
     void refreshAddressTable()
     {
@@ -164,8 +164,8 @@ class AddressTablePriv
     }
 };
 
-AddressTableModel::AddressTableModel(CWallet *wallet, WalletModel *parent) :
-    QAbstractTableModel(parent),walletModel(parent),wallet(wallet),priv(0)
+AddressTableModel::AddressTableModel(CWallet *_wallet, WalletModel *parent) :
+    QAbstractTableModel(parent),walletModel(parent),wallet(_wallet),priv(0)
 {
     columns << tr("Label") << tr("Address");
     priv = new AddressTablePriv(wallet, this);
diff --git a/src/qt/askpassphrasedialog.cpp b/src/qt/askpassphrasedialog.cpp
index e8aa79679c04a..129ea1efa4f04 100644
--- a/src/qt/askpassphrasedialog.cpp
+++ b/src/qt/askpassphrasedialog.cpp
@@ -18,10 +18,10 @@
 #include <QMessageBox>
 #include <QPushButton>
 
-AskPassphraseDialog::AskPassphraseDialog(Mode mode, QWidget *parent) :
+AskPassphraseDialog::AskPassphraseDialog(Mode _mode, QWidget *parent) :
     QDialog(parent),
     ui(new Ui::AskPassphraseDialog),
-    mode(mode),
+    mode(_mode),
     model(0),
     fCapsLock(false)
 {
@@ -81,9 +81,9 @@ AskPassphraseDialog::~AskPassphraseDialog()
     delete ui;
 }
 
-void AskPassphraseDialog::setModel(WalletModel *model)
+void AskPassphraseDialog::setModel(WalletModel *_model)
 {
-    this->model = model;
+    this->model = _model;
 }
 
 void AskPassphraseDialog::accept()
diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp
index 8bfd63b31f048..16d7778a272c5 100644
--- a/src/qt/bitcoingui.cpp
+++ b/src/qt/bitcoingui.cpp
@@ -75,7 +75,7 @@ const std::string BitcoinGUI::DEFAULT_UIPLATFORM =
 
 const QString BitcoinGUI::DEFAULT_WALLET = "~Default";
 
-BitcoinGUI::BitcoinGUI(const PlatformStyle *platformStyle, const NetworkStyle *networkStyle, QWidget *parent) :
+BitcoinGUI::BitcoinGUI(const PlatformStyle *_platformStyle, const NetworkStyle *networkStyle, QWidget *parent) :
     QMainWindow(parent),
     enableWallet(false),
     clientModel(0),
@@ -117,7 +117,7 @@ BitcoinGUI::BitcoinGUI(const PlatformStyle *platformStyle, const NetworkStyle *n
     helpMessageDialog(0),
     prevBlocks(0),
     spinnerFrame(0),
-    platformStyle(platformStyle)
+    platformStyle(_platformStyle)
 {
     GUIUtil::restoreWindowGeometry("nWindow", QSize(850, 550), this);
 
@@ -146,13 +146,13 @@ BitcoinGUI::BitcoinGUI(const PlatformStyle *platformStyle, const NetworkStyle *n
     setUnifiedTitleAndToolBarOnMac(true);
 #endif
 
-    rpcConsole = new RPCConsole(platformStyle, 0);
+    rpcConsole = new RPCConsole(_platformStyle, 0);
     helpMessageDialog = new HelpMessageDialog(this, false);
 #ifdef ENABLE_WALLET
     if(enableWallet)
     {
         /** Create wallet frame and make it the central widget */
-        walletFrame = new WalletFrame(platformStyle, this);
+        walletFrame = new WalletFrame(_platformStyle, this);
         setCentralWidget(walletFrame);
     } else
 #endif // ENABLE_WALLET
@@ -449,38 +449,38 @@ void BitcoinGUI::createToolBars()
     }
 }
 
-void BitcoinGUI::setClientModel(ClientModel *clientModel)
+void BitcoinGUI::setClientModel(ClientModel *_clientModel)
 {
-    this->clientModel = clientModel;
-    if(clientModel)
+    this->clientModel = _clientModel;
+    if(_clientModel)
     {
         // Create system tray menu (or setup the dock menu) that late to prevent users from calling actions,
         // while the client has not yet fully loaded
         createTrayIconMenu();
 
         // Keep up to date with client
-        setNumConnections(clientModel->getNumConnections());
-        connect(clientModel, SIGNAL(numConnectionsChanged(int)), this, SLOT(setNumConnections(int)));
+        setNumConnections(_clientModel->getNumConnections());
+        connect(_clientModel, SIGNAL(numConnectionsChanged(int)), this, SLOT(setNumConnections(int)));
 
-        setNumBlocks(clientModel->getNumBlocks(), clientModel->getLastBlockDate(), clientModel->getVerificationProgress(NULL), false);
-        connect(clientModel, SIGNAL(numBlocksChanged(int,QDateTime,double,bool)), this, SLOT(setNumBlocks(int,QDateTime,double,bool)));
+        setNumBlocks(_clientModel->getNumBlocks(), _clientModel->getLastBlockDate(), _clientModel->getVerificationProgress(NULL), false);
+        connect(_clientModel, SIGNAL(numBlocksChanged(int,QDateTime,double,bool)), this, SLOT(setNumBlocks(int,QDateTime,double,bool)));
 
         // Receive and report messages from client model
-        connect(clientModel, SIGNAL(message(QString,QString,unsigned int)), this, SLOT(message(QString,QString,unsigned int)));
+        connect(_clientModel, SIGNAL(message(QString,QString,unsigned int)), this, SLOT(message(QString,QString,unsigned int)));
 
         // Show progress dialog
-        connect(clientModel, SIGNAL(showProgress(QString,int)), this, SLOT(showProgress(QString,int)));
+        connect(_clientModel, SIGNAL(showProgress(QString,int)), this, SLOT(showProgress(QString,int)));
 
-        rpcConsole->setClientModel(clientModel);
+        rpcConsole->setClientModel(_clientModel);
 #ifdef ENABLE_WALLET
         if(walletFrame)
         {
-            walletFrame->setClientModel(clientModel);
+            walletFrame->setClientModel(_clientModel);
         }
 #endif // ENABLE_WALLET
-        unitDisplayControl->setOptionsModel(clientModel->getOptionsModel());
+        unitDisplayControl->setOptionsModel(_clientModel->getOptionsModel());
         
-        OptionsModel* optionsModel = clientModel->getOptionsModel();
+        OptionsModel* optionsModel = _clientModel->getOptionsModel();
         if(optionsModel)
         {
             // be aware of the tray icon disable state change reported by the OptionsModel object.
@@ -1168,17 +1168,17 @@ void UnitDisplayStatusBarControl::createContextMenu()
 }
 
 /** Lets the control know about the Options Model (and its signals) */
-void UnitDisplayStatusBarControl::setOptionsModel(OptionsModel *optionsModel)
+void UnitDisplayStatusBarControl::setOptionsModel(OptionsModel *_optionsModel)
 {
-    if (optionsModel)
+    if (_optionsModel)
     {
-        this->optionsModel = optionsModel;
+        this->optionsModel = _optionsModel;
 
         // be aware of a display unit change reported by the OptionsModel object.
-        connect(optionsModel,SIGNAL(displayUnitChanged(int)),this,SLOT(updateDisplayUnit(int)));
+        connect(_optionsModel,SIGNAL(displayUnitChanged(int)),this,SLOT(updateDisplayUnit(int)));
 
         // initialize the display units label with the current value in the model.
-        updateDisplayUnit(optionsModel->getDisplayUnit());
+        updateDisplayUnit(_optionsModel->getDisplayUnit());
     }
 }
 
diff --git a/src/qt/clientmodel.cpp b/src/qt/clientmodel.cpp
index 83c78850e2a54..62a70bacd93c7 100644
--- a/src/qt/clientmodel.cpp
+++ b/src/qt/clientmodel.cpp
@@ -27,9 +27,9 @@ static const int64_t nClientStartupTime = GetTime();
 static int64_t nLastHeaderTipUpdateNotification = 0;
 static int64_t nLastBlockTipUpdateNotification = 0;
 
-ClientModel::ClientModel(OptionsModel *optionsModel, QObject *parent) :
+ClientModel::ClientModel(OptionsModel *_optionsModel, QObject *parent) :
     QObject(parent),
-    optionsModel(optionsModel),
+    optionsModel(_optionsModel),
     peerTableModel(0),
     banTableModel(0),
     pollTimer(0)
diff --git a/src/qt/coincontroldialog.cpp b/src/qt/coincontroldialog.cpp
index f53242100cac7..86fd4ebd656f1 100644
--- a/src/qt/coincontroldialog.cpp
+++ b/src/qt/coincontroldialog.cpp
@@ -35,11 +35,11 @@ QList<CAmount> CoinControlDialog::payAmounts;
 CCoinControl* CoinControlDialog::coinControl = new CCoinControl();
 bool CoinControlDialog::fSubtractFeeFromAmount = false;
 
-CoinControlDialog::CoinControlDialog(const PlatformStyle *platformStyle, QWidget *parent) :
+CoinControlDialog::CoinControlDialog(const PlatformStyle *_platformStyle, QWidget *parent) :
     QDialog(parent),
     ui(new Ui::CoinControlDialog),
     model(0),
-    platformStyle(platformStyle)
+    platformStyle(_platformStyle)
 {
     ui->setupUi(this);
 
@@ -152,15 +152,15 @@ CoinControlDialog::~CoinControlDialog()
     delete ui;
 }
 
-void CoinControlDialog::setModel(WalletModel *model)
+void CoinControlDialog::setModel(WalletModel *_model)
 {
-    this->model = model;
+    this->model = _model;
 
-    if(model && model->getOptionsModel() && model->getAddressTableModel())
+    if(_model && _model->getOptionsModel() && _model->getAddressTableModel())
     {
         updateView();
         updateLabelLocked();
-        CoinControlDialog::updateLabels(model, this);
+        CoinControlDialog::updateLabels(_model, this);
     }
 }
 
diff --git a/src/qt/csvmodelwriter.cpp b/src/qt/csvmodelwriter.cpp
index 8a1a49bb06c5c..f424e6cd98243 100644
--- a/src/qt/csvmodelwriter.cpp
+++ b/src/qt/csvmodelwriter.cpp
@@ -8,15 +8,15 @@
 #include <QFile>
 #include <QTextStream>
 
-CSVModelWriter::CSVModelWriter(const QString &filename, QObject *parent) :
+CSVModelWriter::CSVModelWriter(const QString &_filename, QObject *parent) :
     QObject(parent),
-    filename(filename), model(0)
+    filename(_filename), model(0)
 {
 }
 
-void CSVModelWriter::setModel(const QAbstractItemModel *model)
+void CSVModelWriter::setModel(const QAbstractItemModel *_model)
 {
-    this->model = model;
+    this->model = _model;
 }
 
 void CSVModelWriter::addColumn(const QString &title, int column, int role)
diff --git a/src/qt/editaddressdialog.cpp b/src/qt/editaddressdialog.cpp
index 5f45031e9eb54..a9ffe016fd91d 100644
--- a/src/qt/editaddressdialog.cpp
+++ b/src/qt/editaddressdialog.cpp
@@ -11,11 +11,11 @@
 #include <QDataWidgetMapper>
 #include <QMessageBox>
 
-EditAddressDialog::EditAddressDialog(Mode mode, QWidget *parent) :
+EditAddressDialog::EditAddressDialog(Mode _mode, QWidget *parent) :
     QDialog(parent),
     ui(new Ui::EditAddressDialog),
     mapper(0),
-    mode(mode),
+    mode(_mode),
     model(0)
 {
     ui->setupUi(this);
@@ -49,13 +49,13 @@ EditAddressDialog::~EditAddressDialog()
     delete ui;
 }
 
-void EditAddressDialog::setModel(AddressTableModel *model)
+void EditAddressDialog::setModel(AddressTableModel *_model)
 {
-    this->model = model;
-    if(!model)
+    this->model = _model;
+    if(!_model)
         return;
 
-    mapper->setModel(model);
+    mapper->setModel(_model);
     mapper->addMapping(ui->labelEdit, AddressTableModel::Label);
     mapper->addMapping(ui->addressEdit, AddressTableModel::Address);
 }
@@ -137,8 +137,8 @@ QString EditAddressDialog::getAddress() const
     return address;
 }
 
-void EditAddressDialog::setAddress(const QString &address)
+void EditAddressDialog::setAddress(const QString &_address)
 {
-    this->address = address;
-    ui->addressEdit->setText(address);
+    this->address = _address;
+    ui->addressEdit->setText(_address);
 }
diff --git a/src/qt/guiutil.cpp b/src/qt/guiutil.cpp
index 444e35de8af5c..277a9a1d10124 100644
--- a/src/qt/guiutil.cpp
+++ b/src/qt/guiutil.cpp
@@ -462,9 +462,9 @@ void SubstituteFonts(const QString& language)
 #endif
 }
 
-ToolTipToRichTextFilter::ToolTipToRichTextFilter(int size_threshold, QObject *parent) :
+ToolTipToRichTextFilter::ToolTipToRichTextFilter(int _size_threshold, QObject *parent) :
     QObject(parent),
-    size_threshold(size_threshold)
+    size_threshold(_size_threshold)
 {
 
 }
diff --git a/src/qt/intro.cpp b/src/qt/intro.cpp
index 1a241ae0f0e67..5a336b105ec7b 100644
--- a/src/qt/intro.cpp
+++ b/src/qt/intro.cpp
@@ -63,9 +63,9 @@ public Q_SLOTS:
 
 #include "intro.moc"
 
-FreespaceChecker::FreespaceChecker(Intro *intro)
+FreespaceChecker::FreespaceChecker(Intro *_intro)
 {
-    this->intro = intro;
+    this->intro = _intro;
 }
 
 void FreespaceChecker::check()
diff --git a/src/qt/networkstyle.cpp b/src/qt/networkstyle.cpp
index 5f31f49372724..acbfee08684d1 100644
--- a/src/qt/networkstyle.cpp
+++ b/src/qt/networkstyle.cpp
@@ -22,9 +22,9 @@ static const struct {
 static const unsigned network_styles_count = sizeof(network_styles)/sizeof(*network_styles);
 
 // titleAddText needs to be const char* for tr()
-NetworkStyle::NetworkStyle(const QString &appName, const int iconColorHueShift, const int iconColorSaturationReduction, const char *titleAddText):
-    appName(appName),
-    titleAddText(qApp->translate("SplashScreen", titleAddText))
+NetworkStyle::NetworkStyle(const QString &_appName, const int iconColorHueShift, const int iconColorSaturationReduction, const char *_titleAddText):
+    appName(_appName),
+    titleAddText(qApp->translate("SplashScreen", _titleAddText))
 {
     // load pixmap
     QPixmap pixmap(":/icons/bitcoin");
diff --git a/src/qt/notificator.cpp b/src/qt/notificator.cpp
index a45afde5660da..8277e20c909ba 100644
--- a/src/qt/notificator.cpp
+++ b/src/qt/notificator.cpp
@@ -33,17 +33,17 @@
 const int FREEDESKTOP_NOTIFICATION_ICON_SIZE = 128;
 #endif
 
-Notificator::Notificator(const QString &programName, QSystemTrayIcon *trayicon, QWidget *parent) :
-    QObject(parent),
-    parent(parent),
-    programName(programName),
+Notificator::Notificator(const QString &_programName, QSystemTrayIcon *_trayIcon, QWidget *_parent) :
+    QObject(_parent),
+    parent(_parent),
+    programName(_programName),
     mode(None),
-    trayIcon(trayicon)
+    trayIcon(_trayIcon)
 #ifdef USE_DBUS
     ,interface(0)
 #endif
 {
-    if(trayicon && trayicon->supportsMessages())
+    if(_trayIcon && _trayIcon->supportsMessages())
     {
         mode = QSystemTray;
     }
diff --git a/src/qt/optionsdialog.cpp b/src/qt/optionsdialog.cpp
index f73bb87064088..588059d0c577a 100644
--- a/src/qt/optionsdialog.cpp
+++ b/src/qt/optionsdialog.cpp
@@ -135,22 +135,22 @@ OptionsDialog::~OptionsDialog()
     delete ui;
 }
 
-void OptionsDialog::setModel(OptionsModel *model)
+void OptionsDialog::setModel(OptionsModel *_model)
 {
-    this->model = model;
+    this->model = _model;
 
-    if(model)
+    if(_model)
     {
         /* check if client restart is needed and show persistent message */
-        if (model->isRestartRequired())
+        if (_model->isRestartRequired())
             showRestartWarning(true);
 
-        QString strLabel = model->getOverriddenByCommandLine();
+        QString strLabel = _model->getOverriddenByCommandLine();
         if (strLabel.isEmpty())
             strLabel = tr("none");
         ui->overriddenByCommandLineLabel->setText(strLabel);
 
-        mapper->setModel(model);
+        mapper->setModel(_model);
         setMapper();
         mapper->toFirst();
 
diff --git a/src/qt/overviewpage.cpp b/src/qt/overviewpage.cpp
index 6a0404cbf702f..788d917bcc0df 100644
--- a/src/qt/overviewpage.cpp
+++ b/src/qt/overviewpage.cpp
@@ -25,9 +25,9 @@ class TxViewDelegate : public QAbstractItemDelegate
 {
     Q_OBJECT
 public:
-    TxViewDelegate(const PlatformStyle *platformStyle):
+    TxViewDelegate(const PlatformStyle *_platformStyle):
         QAbstractItemDelegate(), unit(BitcoinUnits::BTC),
-        platformStyle(platformStyle)
+        platformStyle(_platformStyle)
     {
 
     }
diff --git a/src/qt/paymentserver.cpp b/src/qt/paymentserver.cpp
index c80aebb0098d8..9f23e77a13700 100644
--- a/src/qt/paymentserver.cpp
+++ b/src/qt/paymentserver.cpp
@@ -749,9 +749,9 @@ void PaymentServer::reportSslErrors(QNetworkReply* reply, const QList<QSslError>
     Q_EMIT message(tr("Network request error"), errString, CClientUIInterface::MSG_ERROR);
 }
 
-void PaymentServer::setOptionsModel(OptionsModel *optionsModel)
+void PaymentServer::setOptionsModel(OptionsModel *_optionsModel)
 {
-    this->optionsModel = optionsModel;
+    this->optionsModel = _optionsModel;
 }
 
 void PaymentServer::handlePaymentACK(const QString& paymentACKMsg)
diff --git a/src/qt/platformstyle.cpp b/src/qt/platformstyle.cpp
index 11cbc7a47c06f..e4438cc43d83c 100644
--- a/src/qt/platformstyle.cpp
+++ b/src/qt/platformstyle.cpp
@@ -73,11 +73,11 @@ QIcon ColorizeIcon(const QString& filename, const QColor& colorbase)
 }
 
 
-PlatformStyle::PlatformStyle(const QString &name, bool imagesOnButtons, bool colorizeIcons, bool useExtraSpacing):
-    name(name),
-    imagesOnButtons(imagesOnButtons),
-    colorizeIcons(colorizeIcons),
-    useExtraSpacing(useExtraSpacing),
+PlatformStyle::PlatformStyle(const QString &_name, bool _imagesOnButtons, bool _colorizeIcons, bool _useExtraSpacing):
+    name(_name),
+    imagesOnButtons(_imagesOnButtons),
+    colorizeIcons(_colorizeIcons),
+    useExtraSpacing(_useExtraSpacing),
     singleColor(0,0,0),
     textColor(0,0,0)
 {
diff --git a/src/qt/qvalidatedlineedit.cpp b/src/qt/qvalidatedlineedit.cpp
index baa2eb67f7621..492b96ff09b61 100644
--- a/src/qt/qvalidatedlineedit.cpp
+++ b/src/qt/qvalidatedlineedit.cpp
@@ -15,14 +15,14 @@ QValidatedLineEdit::QValidatedLineEdit(QWidget *parent) :
     connect(this, SIGNAL(textChanged(QString)), this, SLOT(markValid()));
 }
 
-void QValidatedLineEdit::setValid(bool valid)
+void QValidatedLineEdit::setValid(bool _valid)
 {
-    if(valid == this->valid)
+    if(_valid == this->valid)
     {
         return;
     }
 
-    if(valid)
+    if(_valid)
     {
         setStyleSheet("");
     }
@@ -30,7 +30,7 @@ void QValidatedLineEdit::setValid(bool valid)
     {
         setStyleSheet(STYLE_INVALID);
     }
-    this->valid = valid;
+    this->valid = _valid;
 }
 
 void QValidatedLineEdit::focusInEvent(QFocusEvent *evt)
diff --git a/src/qt/qvaluecombobox.cpp b/src/qt/qvaluecombobox.cpp
index 146f3dd57850c..2f2478783c02c 100644
--- a/src/qt/qvaluecombobox.cpp
+++ b/src/qt/qvaluecombobox.cpp
@@ -20,9 +20,9 @@ void QValueComboBox::setValue(const QVariant &value)
     setCurrentIndex(findData(value, role));
 }
 
-void QValueComboBox::setRole(int role)
+void QValueComboBox::setRole(int _role)
 {
-    this->role = role;
+    this->role = _role;
 }
 
 void QValueComboBox::handleSelectionChanged(int idx)
diff --git a/src/qt/receivecoinsdialog.cpp b/src/qt/receivecoinsdialog.cpp
index 0b355837ab3c4..5c6dc97b20b90 100644
--- a/src/qt/receivecoinsdialog.cpp
+++ b/src/qt/receivecoinsdialog.cpp
@@ -22,24 +22,24 @@
 #include <QScrollBar>
 #include <QTextDocument>
 
-ReceiveCoinsDialog::ReceiveCoinsDialog(const PlatformStyle *platformStyle, QWidget *parent) :
+ReceiveCoinsDialog::ReceiveCoinsDialog(const PlatformStyle *_platformStyle, QWidget *parent) :
     QDialog(parent),
     ui(new Ui::ReceiveCoinsDialog),
     model(0),
-    platformStyle(platformStyle)
+    platformStyle(_platformStyle)
 {
     ui->setupUi(this);
 
-    if (!platformStyle->getImagesOnButtons()) {
+    if (!_platformStyle->getImagesOnButtons()) {
         ui->clearButton->setIcon(QIcon());
         ui->receiveButton->setIcon(QIcon());
         ui->showRequestButton->setIcon(QIcon());
         ui->removeRequestButton->setIcon(QIcon());
     } else {
-        ui->clearButton->setIcon(platformStyle->SingleColorIcon(":/icons/remove"));
-        ui->receiveButton->setIcon(platformStyle->SingleColorIcon(":/icons/receiving_addresses"));
-        ui->showRequestButton->setIcon(platformStyle->SingleColorIcon(":/icons/edit"));
-        ui->removeRequestButton->setIcon(platformStyle->SingleColorIcon(":/icons/remove"));
+        ui->clearButton->setIcon(_platformStyle->SingleColorIcon(":/icons/remove"));
+        ui->receiveButton->setIcon(_platformStyle->SingleColorIcon(":/icons/receiving_addresses"));
+        ui->showRequestButton->setIcon(_platformStyle->SingleColorIcon(":/icons/edit"));
+        ui->removeRequestButton->setIcon(_platformStyle->SingleColorIcon(":/icons/remove"));
     }
 
     // context menu actions
@@ -62,21 +62,21 @@ ReceiveCoinsDialog::ReceiveCoinsDialog(const PlatformStyle *platformStyle, QWidg
     connect(ui->clearButton, SIGNAL(clicked()), this, SLOT(clear()));
 }
 
-void ReceiveCoinsDialog::setModel(WalletModel *model)
+void ReceiveCoinsDialog::setModel(WalletModel *_model)
 {
-    this->model = model;
+    this->model = _model;
 
-    if(model && model->getOptionsModel())
+    if(_model && _model->getOptionsModel())
     {
-        model->getRecentRequestsTableModel()->sort(RecentRequestsTableModel::Date, Qt::DescendingOrder);
-        connect(model->getOptionsModel(), SIGNAL(displayUnitChanged(int)), this, SLOT(updateDisplayUnit()));
+        _model->getRecentRequestsTableModel()->sort(RecentRequestsTableModel::Date, Qt::DescendingOrder);
+        connect(_model->getOptionsModel(), SIGNAL(displayUnitChanged(int)), this, SLOT(updateDisplayUnit()));
         updateDisplayUnit();
 
         QTableView* tableView = ui->recentRequestsView;
 
         tableView->verticalHeader()->hide();
         tableView->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
-        tableView->setModel(model->getRecentRequestsTableModel());
+        tableView->setModel(_model->getRecentRequestsTableModel());
         tableView->setAlternatingRowColors(true);
         tableView->setSelectionBehavior(QAbstractItemView::SelectRows);
         tableView->setSelectionMode(QAbstractItemView::ContiguousSelection);
diff --git a/src/qt/receiverequestdialog.cpp b/src/qt/receiverequestdialog.cpp
index b13ea3df709bb..998c9176d7bca 100644
--- a/src/qt/receiverequestdialog.cpp
+++ b/src/qt/receiverequestdialog.cpp
@@ -109,20 +109,20 @@ ReceiveRequestDialog::~ReceiveRequestDialog()
     delete ui;
 }
 
-void ReceiveRequestDialog::setModel(OptionsModel *model)
+void ReceiveRequestDialog::setModel(OptionsModel *_model)
 {
-    this->model = model;
+    this->model = _model;
 
-    if (model)
-        connect(model, SIGNAL(displayUnitChanged(int)), this, SLOT(update()));
+    if (_model)
+        connect(_model, SIGNAL(displayUnitChanged(int)), this, SLOT(update()));
 
     // update the display unit if necessary
     update();
 }
 
-void ReceiveRequestDialog::setInfo(const SendCoinsRecipient &info)
+void ReceiveRequestDialog::setInfo(const SendCoinsRecipient &_info)
 {
-    this->info = info;
+    this->info = _info;
     update();
 }
 
diff --git a/src/qt/rpcconsole.cpp b/src/qt/rpcconsole.cpp
index a316b951c4ff6..ace9f1ceaad6b 100644
--- a/src/qt/rpcconsole.cpp
+++ b/src/qt/rpcconsole.cpp
@@ -83,8 +83,8 @@ class QtRPCTimerBase: public QObject, public RPCTimerBase
 {
     Q_OBJECT
 public:
-    QtRPCTimerBase(boost::function<void(void)>& func, int64_t millis):
-        func(func)
+    QtRPCTimerBase(boost::function<void(void)>& _func, int64_t millis):
+        func(_func)
     {
         timer.setSingleShot(true);
         connect(&timer, SIGNAL(timeout()), this, SLOT(timeout()));
@@ -335,13 +335,13 @@ void RPCExecutor::request(const QString &command)
     }
 }
 
-RPCConsole::RPCConsole(const PlatformStyle *platformStyle, QWidget *parent) :
+RPCConsole::RPCConsole(const PlatformStyle *_platformStyle, QWidget *parent) :
     QWidget(parent),
     ui(new Ui::RPCConsole),
     clientModel(0),
     historyPtr(0),
     cachedNodeid(-1),
-    platformStyle(platformStyle),
+    platformStyle(_platformStyle),
     peersTableContextMenu(0),
     banTableContextMenu(0),
     consoleFontSize(0)
diff --git a/src/qt/sendcoinsdialog.cpp b/src/qt/sendcoinsdialog.cpp
index 8433818a64838..4b2ba7d6241d2 100644
--- a/src/qt/sendcoinsdialog.cpp
+++ b/src/qt/sendcoinsdialog.cpp
@@ -30,25 +30,25 @@
 
 #define SEND_CONFIRM_DELAY   3
 
-SendCoinsDialog::SendCoinsDialog(const PlatformStyle *platformStyle, QWidget *parent) :
+SendCoinsDialog::SendCoinsDialog(const PlatformStyle *_platformStyle, QWidget *parent) :
     QDialog(parent),
     ui(new Ui::SendCoinsDialog),
     clientModel(0),
     model(0),
     fNewRecipientAllowed(true),
     fFeeMinimized(true),
-    platformStyle(platformStyle)
+    platformStyle(_platformStyle)
 {
     ui->setupUi(this);
 
-    if (!platformStyle->getImagesOnButtons()) {
+    if (!_platformStyle->getImagesOnButtons()) {
         ui->addButton->setIcon(QIcon());
         ui->clearButton->setIcon(QIcon());
         ui->sendButton->setIcon(QIcon());
     } else {
-        ui->addButton->setIcon(platformStyle->SingleColorIcon(":/icons/add"));
-        ui->clearButton->setIcon(platformStyle->SingleColorIcon(":/icons/remove"));
-        ui->sendButton->setIcon(platformStyle->SingleColorIcon(":/icons/send"));
+        ui->addButton->setIcon(_platformStyle->SingleColorIcon(":/icons/add"));
+        ui->clearButton->setIcon(_platformStyle->SingleColorIcon(":/icons/remove"));
+        ui->sendButton->setIcon(_platformStyle->SingleColorIcon(":/icons/send"));
     }
 
     GUIUtil::setupAddressWidget(ui->lineEditCoinControlChange, this);
@@ -116,40 +116,40 @@ SendCoinsDialog::SendCoinsDialog(const PlatformStyle *platformStyle, QWidget *pa
     minimizeFeeSection(settings.value("fFeeSectionMinimized").toBool());
 }
 
-void SendCoinsDialog::setClientModel(ClientModel *clientModel)
+void SendCoinsDialog::setClientModel(ClientModel *_clientModel)
 {
-    this->clientModel = clientModel;
+    this->clientModel = _clientModel;
 
-    if (clientModel) {
-        connect(clientModel, SIGNAL(numBlocksChanged(int,QDateTime,double,bool)), this, SLOT(updateSmartFeeLabel()));
+    if (_clientModel) {
+        connect(_clientModel, SIGNAL(numBlocksChanged(int,QDateTime,double,bool)), this, SLOT(updateSmartFeeLabel()));
     }
 }
 
-void SendCoinsDialog::setModel(WalletModel *model)
+void SendCoinsDialog::setModel(WalletModel *_model)
 {
-    this->model = model;
+    this->model = _model;
 
-    if(model && model->getOptionsModel())
+    if(_model && _model->getOptionsModel())
     {
         for(int i = 0; i < ui->entries->count(); ++i)
         {
             SendCoinsEntry *entry = qobject_cast<SendCoinsEntry*>(ui->entries->itemAt(i)->widget());
             if(entry)
             {
-                entry->setModel(model);
+                entry->setModel(_model);
             }
         }
 
-        setBalance(model->getBalance(), model->getUnconfirmedBalance(), model->getImmatureBalance(),
-                   model->getWatchBalance(), model->getWatchUnconfirmedBalance(), model->getWatchImmatureBalance());
-        connect(model, SIGNAL(balanceChanged(CAmount,CAmount,CAmount,CAmount,CAmount,CAmount)), this, SLOT(setBalance(CAmount,CAmount,CAmount,CAmount,CAmount,CAmount)));
-        connect(model->getOptionsModel(), SIGNAL(displayUnitChanged(int)), this, SLOT(updateDisplayUnit()));
+        setBalance(_model->getBalance(), _model->getUnconfirmedBalance(), _model->getImmatureBalance(),
+                   _model->getWatchBalance(), _model->getWatchUnconfirmedBalance(), _model->getWatchImmatureBalance());
+        connect(_model, SIGNAL(balanceChanged(CAmount,CAmount,CAmount,CAmount,CAmount,CAmount)), this, SLOT(setBalance(CAmount,CAmount,CAmount,CAmount,CAmount,CAmount)));
+        connect(_model->getOptionsModel(), SIGNAL(displayUnitChanged(int)), this, SLOT(updateDisplayUnit()));
         updateDisplayUnit();
 
         // Coin Control
-        connect(model->getOptionsModel(), SIGNAL(displayUnitChanged(int)), this, SLOT(coinControlUpdateLabels()));
-        connect(model->getOptionsModel(), SIGNAL(coinControlFeaturesChanged(bool)), this, SLOT(coinControlFeatureChanged(bool)));
-        ui->frameCoinControl->setVisible(model->getOptionsModel()->getCoinControlFeatures());
+        connect(_model->getOptionsModel(), SIGNAL(displayUnitChanged(int)), this, SLOT(coinControlUpdateLabels()));
+        connect(_model->getOptionsModel(), SIGNAL(coinControlFeaturesChanged(bool)), this, SLOT(coinControlFeatureChanged(bool)));
+        ui->frameCoinControl->setVisible(_model->getOptionsModel()->getCoinControlFeatures());
         coinControlUpdateLabels();
 
         // fee section
@@ -826,9 +826,9 @@ void SendCoinsDialog::coinControlUpdateLabels()
     }
 }
 
-SendConfirmationDialog::SendConfirmationDialog(const QString &title, const QString &text, int secDelay,
+SendConfirmationDialog::SendConfirmationDialog(const QString &title, const QString &text, int _secDelay,
     QWidget *parent) :
-    QMessageBox(QMessageBox::Question, title, text, QMessageBox::Yes | QMessageBox::Cancel, parent), secDelay(secDelay)
+    QMessageBox(QMessageBox::Question, title, text, QMessageBox::Yes | QMessageBox::Cancel, parent), secDelay(_secDelay)
 {
     setDefaultButton(QMessageBox::Cancel);
     yesButton = button(QMessageBox::Yes);
diff --git a/src/qt/sendcoinsentry.cpp b/src/qt/sendcoinsentry.cpp
index d063f2c89104a..7eb1eb7e3a128 100644
--- a/src/qt/sendcoinsentry.cpp
+++ b/src/qt/sendcoinsentry.cpp
@@ -15,11 +15,11 @@
 #include <QApplication>
 #include <QClipboard>
 
-SendCoinsEntry::SendCoinsEntry(const PlatformStyle *platformStyle, QWidget *parent) :
+SendCoinsEntry::SendCoinsEntry(const PlatformStyle *_platformStyle, QWidget *parent) :
     QStackedWidget(parent),
     ui(new Ui::SendCoinsEntry),
     model(0),
-    platformStyle(platformStyle)
+    platformStyle(_platformStyle)
 {
     ui->setupUi(this);
 
@@ -79,12 +79,12 @@ void SendCoinsEntry::on_payTo_textChanged(const QString &address)
     updateLabel(address);
 }
 
-void SendCoinsEntry::setModel(WalletModel *model)
+void SendCoinsEntry::setModel(WalletModel *_model)
 {
-    this->model = model;
+    this->model = _model;
 
-    if (model && model->getOptionsModel())
-        connect(model->getOptionsModel(), SIGNAL(displayUnitChanged(int)), this, SLOT(updateDisplayUnit()));
+    if (_model && _model->getOptionsModel())
+        connect(_model->getOptionsModel(), SIGNAL(displayUnitChanged(int)), this, SLOT(updateDisplayUnit()));
 
     clear();
 }
diff --git a/src/qt/signverifymessagedialog.cpp b/src/qt/signverifymessagedialog.cpp
index 8e2e8a509876e..4061909b719fb 100644
--- a/src/qt/signverifymessagedialog.cpp
+++ b/src/qt/signverifymessagedialog.cpp
@@ -20,11 +20,11 @@
 
 #include <QClipboard>
 
-SignVerifyMessageDialog::SignVerifyMessageDialog(const PlatformStyle *platformStyle, QWidget *parent) :
+SignVerifyMessageDialog::SignVerifyMessageDialog(const PlatformStyle *_platformStyle, QWidget *parent) :
     QDialog(parent),
     ui(new Ui::SignVerifyMessageDialog),
     model(0),
-    platformStyle(platformStyle)
+    platformStyle(_platformStyle)
 {
     ui->setupUi(this);
 
@@ -60,9 +60,9 @@ SignVerifyMessageDialog::~SignVerifyMessageDialog()
     delete ui;
 }
 
-void SignVerifyMessageDialog::setModel(WalletModel *model)
+void SignVerifyMessageDialog::setModel(WalletModel *_model)
 {
-    this->model = model;
+    this->model = _model;
 }
 
 void SignVerifyMessageDialog::setAddress_SM(const QString &address)
diff --git a/src/qt/transactionfilterproxy.cpp b/src/qt/transactionfilterproxy.cpp
index 9dcb72f55e44a..e21b89b935483 100644
--- a/src/qt/transactionfilterproxy.cpp
+++ b/src/qt/transactionfilterproxy.cpp
@@ -66,9 +66,9 @@ void TransactionFilterProxy::setDateRange(const QDateTime &from, const QDateTime
     invalidateFilter();
 }
 
-void TransactionFilterProxy::setAddressPrefix(const QString &addrPrefix)
+void TransactionFilterProxy::setAddressPrefix(const QString &_addrPrefix)
 {
-    this->addrPrefix = addrPrefix;
+    this->addrPrefix = _addrPrefix;
     invalidateFilter();
 }
 
@@ -95,9 +95,9 @@ void TransactionFilterProxy::setLimit(int limit)
     this->limitRows = limit;
 }
 
-void TransactionFilterProxy::setShowInactive(bool showInactive)
+void TransactionFilterProxy::setShowInactive(bool _showInactive)
 {
-    this->showInactive = showInactive;
+    this->showInactive = _showInactive;
     invalidateFilter();
 }
 
diff --git a/src/qt/transactionrecord.h b/src/qt/transactionrecord.h
index 8c754c3aadc28..8eff302affe11 100644
--- a/src/qt/transactionrecord.h
+++ b/src/qt/transactionrecord.h
@@ -88,16 +88,16 @@ class TransactionRecord
     {
     }
 
-    TransactionRecord(uint256 hash, qint64 time):
-            hash(hash), time(time), type(Other), address(""), debit(0),
+    TransactionRecord(uint256 _hash, qint64 _time):
+            hash(_hash), time(_time), type(Other), address(""), debit(0),
             credit(0), idx(0)
     {
     }
 
-    TransactionRecord(uint256 hash, qint64 time,
-                Type type, const std::string &address,
-                const CAmount& debit, const CAmount& credit):
-            hash(hash), time(time), type(type), address(address), debit(debit), credit(credit),
+    TransactionRecord(uint256 _hash, qint64 _time,
+                Type _type, const std::string &_address,
+                const CAmount& _debit, const CAmount& _credit):
+            hash(_hash), time(_time), type(_type), address(_address), debit(_debit), credit(_credit),
             idx(0)
     {
     }
diff --git a/src/qt/transactiontablemodel.cpp b/src/qt/transactiontablemodel.cpp
index b29ecf83486b0..52261ff04b34b 100644
--- a/src/qt/transactiontablemodel.cpp
+++ b/src/qt/transactiontablemodel.cpp
@@ -59,9 +59,9 @@ struct TxLessThan
 class TransactionTablePriv
 {
 public:
-    TransactionTablePriv(CWallet *wallet, TransactionTableModel *parent) :
-        wallet(wallet),
-        parent(parent)
+    TransactionTablePriv(CWallet *_wallet, TransactionTableModel *_parent) :
+        wallet(_wallet),
+        parent(_parent)
     {
     }
 
@@ -235,13 +235,13 @@ class TransactionTablePriv
     }
 };
 
-TransactionTableModel::TransactionTableModel(const PlatformStyle *platformStyle, CWallet* wallet, WalletModel *parent):
+TransactionTableModel::TransactionTableModel(const PlatformStyle *_platformStyle, CWallet* _wallet, WalletModel *parent):
         QAbstractTableModel(parent),
-        wallet(wallet),
+        wallet(_wallet),
         walletModel(parent),
-        priv(new TransactionTablePriv(wallet, this)),
+        priv(new TransactionTablePriv(_wallet, this)),
         fProcessingQueuedTransactions(false),
-        platformStyle(platformStyle)
+        platformStyle(_platformStyle)
 {
     columns << QString() << QString() << tr("Date") << tr("Type") << tr("Label") << BitcoinUnits::getAmountColumnTitle(walletModel->getOptionsModel()->getDisplayUnit());
     priv->refreshWallet();
@@ -714,8 +714,8 @@ struct TransactionNotification
 {
 public:
     TransactionNotification() {}
-    TransactionNotification(uint256 hash, ChangeType status, bool showTransaction):
-        hash(hash), status(status), showTransaction(showTransaction) {}
+    TransactionNotification(uint256 _hash, ChangeType _status, bool _showTransaction):
+        hash(_hash), status(_status), showTransaction(_showTransaction) {}
 
     void invoke(QObject *ttm)
     {
diff --git a/src/qt/transactionview.cpp b/src/qt/transactionview.cpp
index 48cf94050297b..856b16d2c46ee 100644
--- a/src/qt/transactionview.cpp
+++ b/src/qt/transactionview.cpp
@@ -184,13 +184,13 @@ TransactionView::TransactionView(const PlatformStyle *platformStyle, QWidget *pa
     connect(showDetailsAction, SIGNAL(triggered()), this, SLOT(showDetails()));
 }
 
-void TransactionView::setModel(WalletModel *model)
+void TransactionView::setModel(WalletModel *_model)
 {
-    this->model = model;
-    if(model)
+    this->model = _model;
+    if(_model)
     {
         transactionProxyModel = new TransactionFilterProxy(this);
-        transactionProxyModel->setSourceModel(model->getTransactionTableModel());
+        transactionProxyModel->setSourceModel(_model->getTransactionTableModel());
         transactionProxyModel->setDynamicSortFilter(true);
         transactionProxyModel->setSortCaseSensitivity(Qt::CaseInsensitive);
         transactionProxyModel->setFilterCaseSensitivity(Qt::CaseInsensitive);
@@ -214,10 +214,10 @@ void TransactionView::setModel(WalletModel *model)
 
         columnResizingFixer = new GUIUtil::TableViewLastColumnResizingFixer(transactionView, AMOUNT_MINIMUM_COLUMN_WIDTH, MINIMUM_COLUMN_WIDTH);
 
-        if (model->getOptionsModel())
+        if (_model->getOptionsModel())
         {
             // Add third party transaction URLs to context menu
-            QStringList listUrls = model->getOptionsModel()->getThirdPartyTxUrls().split("|", QString::SkipEmptyParts);
+            QStringList listUrls = _model->getOptionsModel()->getThirdPartyTxUrls().split("|", QString::SkipEmptyParts);
             for (int i = 0; i < listUrls.size(); ++i)
             {
                 QString host = QUrl(listUrls[i].trimmed(), QUrl::StrictMode).host();
@@ -234,10 +234,10 @@ void TransactionView::setModel(WalletModel *model)
         }
 
         // show/hide column Watch-only
-        updateWatchOnlyColumn(model->haveWatchOnly());
+        updateWatchOnlyColumn(_model->haveWatchOnly());
 
         // Watch-only signal
-        connect(model, SIGNAL(notifyWatchonlyChanged(bool)), this, SLOT(updateWatchOnlyColumn(bool)));
+        connect(_model, SIGNAL(notifyWatchonlyChanged(bool)), this, SLOT(updateWatchOnlyColumn(bool)));
     }
 }
 
diff --git a/src/qt/walletframe.cpp b/src/qt/walletframe.cpp
index e4ca5e1831d15..640be4d7a7e16 100644
--- a/src/qt/walletframe.cpp
+++ b/src/qt/walletframe.cpp
@@ -12,10 +12,10 @@
 #include <QHBoxLayout>
 #include <QLabel>
 
-WalletFrame::WalletFrame(const PlatformStyle *platformStyle, BitcoinGUI *_gui) :
+WalletFrame::WalletFrame(const PlatformStyle *_platformStyle, BitcoinGUI *_gui) :
     QFrame(_gui),
     gui(_gui),
-    platformStyle(platformStyle)
+    platformStyle(_platformStyle)
 {
     // Leave HBox hook for adding a list view later
     QHBoxLayout *walletFrameLayout = new QHBoxLayout(this);
@@ -33,9 +33,9 @@ WalletFrame::~WalletFrame()
 {
 }
 
-void WalletFrame::setClientModel(ClientModel *clientModel)
+void WalletFrame::setClientModel(ClientModel *_clientModel)
 {
-    this->clientModel = clientModel;
+    this->clientModel = _clientModel;
 }
 
 bool WalletFrame::addWallet(const QString& name, WalletModel *walletModel)
diff --git a/src/qt/walletmodel.cpp b/src/qt/walletmodel.cpp
index ad3ba996f1f91..c8a2cb37ec3f3 100644
--- a/src/qt/walletmodel.cpp
+++ b/src/qt/walletmodel.cpp
@@ -27,8 +27,8 @@
 
 #include <boost/foreach.hpp>
 
-WalletModel::WalletModel(const PlatformStyle *platformStyle, CWallet *wallet, OptionsModel *optionsModel, QObject *parent) :
-    QObject(parent), wallet(wallet), optionsModel(optionsModel), addressTableModel(0),
+WalletModel::WalletModel(const PlatformStyle *platformStyle, CWallet *_wallet, OptionsModel *_optionsModel, QObject *parent) :
+    QObject(parent), wallet(_wallet), optionsModel(_optionsModel), addressTableModel(0),
     transactionTableModel(0),
     recentRequestsTableModel(0),
     cachedBalance(0), cachedUnconfirmedBalance(0), cachedImmatureBalance(0),
@@ -531,10 +531,10 @@ WalletModel::UnlockContext WalletModel::requestUnlock()
     return UnlockContext(this, valid, was_locked);
 }
 
-WalletModel::UnlockContext::UnlockContext(WalletModel *wallet, bool valid, bool relock):
-        wallet(wallet),
-        valid(valid),
-        relock(relock)
+WalletModel::UnlockContext::UnlockContext(WalletModel *_wallet, bool _valid, bool _relock):
+        wallet(_wallet),
+        valid(_valid),
+        relock(_relock)
 {
 }
 
diff --git a/src/qt/walletmodel.h b/src/qt/walletmodel.h
index 4456215512271..e233fa690d5df 100644
--- a/src/qt/walletmodel.h
+++ b/src/qt/walletmodel.h
@@ -38,8 +38,8 @@ class SendCoinsRecipient
 {
 public:
     explicit SendCoinsRecipient() : amount(0), fSubtractFeeFromAmount(false), nVersion(SendCoinsRecipient::CURRENT_VERSION) { }
-    explicit SendCoinsRecipient(const QString &addr, const QString &label, const CAmount& amount, const QString &message):
-        address(addr), label(label), amount(amount), message(message), fSubtractFeeFromAmount(false), nVersion(SendCoinsRecipient::CURRENT_VERSION) {}
+    explicit SendCoinsRecipient(const QString &addr, const QString &_label, const CAmount& _amount, const QString &_message):
+        address(addr), label(_label), amount(_amount), message(_message), fSubtractFeeFromAmount(false), nVersion(SendCoinsRecipient::CURRENT_VERSION) {}
 
     // If from an unauthenticated payment request, this is used for storing
     // the addresses, e.g. address-A<br />address-B<br />address-C.
@@ -145,8 +145,8 @@ class WalletModel : public QObject
     // Return status record for SendCoins, contains error id + information
     struct SendCoinsReturn
     {
-        SendCoinsReturn(StatusCode status = OK):
-            status(status) {}
+        SendCoinsReturn(StatusCode _status = OK):
+            status(_status) {}
         StatusCode status;
     };
 
diff --git a/src/qt/walletmodeltransaction.cpp b/src/qt/walletmodeltransaction.cpp
index ffadf89cc8536..fdec6a1c863a0 100644
--- a/src/qt/walletmodeltransaction.cpp
+++ b/src/qt/walletmodeltransaction.cpp
@@ -7,8 +7,8 @@
 #include "policy/policy.h"
 #include "wallet/wallet.h"
 
-WalletModelTransaction::WalletModelTransaction(const QList<SendCoinsRecipient> &recipients) :
-    recipients(recipients),
+WalletModelTransaction::WalletModelTransaction(const QList<SendCoinsRecipient> &_recipients) :
+    recipients(_recipients),
     walletTransaction(0),
     keyChange(0),
     fee(0)
diff --git a/src/qt/walletview.cpp b/src/qt/walletview.cpp
index 495ebfd834bfc..2b61ca1c640da 100644
--- a/src/qt/walletview.cpp
+++ b/src/qt/walletview.cpp
@@ -29,11 +29,11 @@
 #include <QPushButton>
 #include <QVBoxLayout>
 
-WalletView::WalletView(const PlatformStyle *platformStyle, QWidget *parent):
+WalletView::WalletView(const PlatformStyle *_platformStyle, QWidget *parent):
     QStackedWidget(parent),
     clientModel(0),
     walletModel(0),
-    platformStyle(platformStyle)
+    platformStyle(_platformStyle)
 {
     // Create tabs
     overviewPage = new OverviewPage(platformStyle);
@@ -104,47 +104,47 @@ void WalletView::setBitcoinGUI(BitcoinGUI *gui)
     }
 }
 
-void WalletView::setClientModel(ClientModel *clientModel)
+void WalletView::setClientModel(ClientModel *_clientModel)
 {
-    this->clientModel = clientModel;
+    this->clientModel = _clientModel;
 
-    overviewPage->setClientModel(clientModel);
-    sendCoinsPage->setClientModel(clientModel);
+    overviewPage->setClientModel(_clientModel);
+    sendCoinsPage->setClientModel(_clientModel);
 }
 
-void WalletView::setWalletModel(WalletModel *walletModel)
+void WalletView::setWalletModel(WalletModel *_walletModel)
 {
-    this->walletModel = walletModel;
+    this->walletModel = _walletModel;
 
     // Put transaction list in tabs
-    transactionView->setModel(walletModel);
-    overviewPage->setWalletModel(walletModel);
-    receiveCoinsPage->setModel(walletModel);
-    sendCoinsPage->setModel(walletModel);
-    usedReceivingAddressesPage->setModel(walletModel->getAddressTableModel());
-    usedSendingAddressesPage->setModel(walletModel->getAddressTableModel());
-
-    if (walletModel)
+    transactionView->setModel(_walletModel);
+    overviewPage->setWalletModel(_walletModel);
+    receiveCoinsPage->setModel(_walletModel);
+    sendCoinsPage->setModel(_walletModel);
+    usedReceivingAddressesPage->setModel(_walletModel->getAddressTableModel());
+    usedSendingAddressesPage->setModel(_walletModel->getAddressTableModel());
+
+    if (_walletModel)
     {
         // Receive and pass through messages from wallet model
-        connect(walletModel, SIGNAL(message(QString,QString,unsigned int)), this, SIGNAL(message(QString,QString,unsigned int)));
+        connect(_walletModel, SIGNAL(message(QString,QString,unsigned int)), this, SIGNAL(message(QString,QString,unsigned int)));
 
         // Handle changes in encryption status
-        connect(walletModel, SIGNAL(encryptionStatusChanged(int)), this, SIGNAL(encryptionStatusChanged(int)));
+        connect(_walletModel, SIGNAL(encryptionStatusChanged(int)), this, SIGNAL(encryptionStatusChanged(int)));
         updateEncryptionStatus();
 
         // update HD status
-        Q_EMIT hdEnabledStatusChanged(walletModel->hdEnabled());
+        Q_EMIT hdEnabledStatusChanged(_walletModel->hdEnabled());
 
         // Balloon pop-up for new transaction
-        connect(walletModel->getTransactionTableModel(), SIGNAL(rowsInserted(QModelIndex,int,int)),
+        connect(_walletModel->getTransactionTableModel(), SIGNAL(rowsInserted(QModelIndex,int,int)),
                 this, SLOT(processNewTransaction(QModelIndex,int,int)));
 
         // Ask for passphrase if needed
-        connect(walletModel, SIGNAL(requireUnlock()), this, SLOT(unlockWallet()));
+        connect(_walletModel, SIGNAL(requireUnlock()), this, SLOT(unlockWallet()));
 
         // Show progress dialog
-        connect(walletModel, SIGNAL(showProgress(QString,int)), this, SLOT(showProgress(QString,int)));
+        connect(_walletModel, SIGNAL(showProgress(QString,int)), this, SLOT(showProgress(QString,int)));
     }
 }
 

From 08827df3ecce925928dc3bedcdef63bfca290300 Mon Sep 17 00:00:00 2001
From: Jonas Schnelli <dev@jonasschnelli.ch>
Date: Wed, 21 Sep 2016 10:29:57 +0200
Subject: [PATCH 0931/1802] [Qt] modalinfolayer: removed unused comments,
 renamed signal, code style overhaul

---
 src/qt/bitcoingui.cpp        | 8 ++++----
 src/qt/forms/modaloverlay.ui | 4 ++--
 src/qt/modaloverlay.cpp      | 7 +++----
 src/qt/walletframe.cpp       | 4 ++--
 src/qt/walletframe.h         | 2 +-
 src/qt/walletview.cpp        | 4 ++--
 src/qt/walletview.h          | 2 +-
 7 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp
index c184745dbe4fd..2a9afc51a0c03 100644
--- a/src/qt/bitcoingui.cpp
+++ b/src/qt/bitcoingui.cpp
@@ -247,7 +247,7 @@ BitcoinGUI::BitcoinGUI(const PlatformStyle *platformStyle, const NetworkStyle *n
     modalOverlay = new ModalOverlay(this->centralWidget());
 #ifdef ENABLE_WALLET
     if(enableWallet)
-        connect(walletFrame, SIGNAL(requestedOfSyncWarningInfo()), this, SLOT(showModalOverlay()));
+        connect(walletFrame, SIGNAL(requestedSyncWarningInfo()), this, SLOT(showModalOverlay()));
 #endif
 }
 
@@ -717,13 +717,13 @@ void BitcoinGUI::setNumBlocks(int count, const QDateTime& blockDate, double nVer
 {
     if (modalOverlay)
     {
-        if (header)
-        {
+        if (header) {
             /* use clientmodels getHeaderTipHeight and getHeaderTipTime because the NotifyHeaderTip signal does not fire when updating the best header */
             modalOverlay->setKnownBestHeight(clientModel->getHeaderTipHeight(), QDateTime::fromTime_t(clientModel->getHeaderTipTime()));
         }
-        else
+        else {
             modalOverlay->tipUpdate(count, blockDate, nVerificationProgress);
+        }
     }
     if (!clientModel)
         return;
diff --git a/src/qt/forms/modaloverlay.ui b/src/qt/forms/modaloverlay.ui
index ce9ceaaadd7e4..ccec1b3e1e50f 100644
--- a/src/qt/forms/modaloverlay.ui
+++ b/src/qt/forms/modaloverlay.ui
@@ -130,7 +130,7 @@ QLabel { color: rgb(40,40,40);  }</string>
              <item>
               <widget class="QLabel" name="infoText">
                <property name="text">
-                <string>The displayed information may be out of date. Your wallet automatically synchronizes with the Bitcoin network after a connection is established, but this process has not completed yet.</string>
+                <string>The displayed information may be out of date. Your wallet automatically synchronizes with the Bitcoin network after a connection is established, but this process has not completed yet. This means that recent transactions will not be visible, and the balance will not be up-to-date until this process has completed.</string>
                </property>
                <property name="textFormat">
                 <enum>Qt::RichText</enum>
@@ -149,7 +149,7 @@ QLabel { color: rgb(40,40,40);  }</string>
                 </font>
                </property>
                <property name="text">
-                <string>This means that recent transactions will not be visible, and the balance will not be up-to-date until this process has completed. Spending bitcoins is not possible during that phase!</string>
+                <string>Spending bitcoins may not be possible during that phase!</string>
                </property>
                <property name="textFormat">
                 <enum>Qt::RichText</enum>
diff --git a/src/qt/modaloverlay.cpp b/src/qt/modaloverlay.cpp
index c54889039133c..7b121e9e88b45 100644
--- a/src/qt/modaloverlay.cpp
+++ b/src/qt/modaloverlay.cpp
@@ -86,7 +86,6 @@ void ModalOverlay::tipUpdate(int count, const QDateTime& blockDate, double nVeri
     // show progress speed if we have more then one sample
     if (blockProcessTime.size() >= 2)
     {
-        // try to get the window from the last 500 seconds or at least 10 samples
         double progressStart = blockProcessTime[0].second;
         double progressDelta = 0;
         double progressPerHour = 0;
@@ -114,9 +113,9 @@ void ModalOverlay::tipUpdate(int count, const QDateTime& blockDate, double nVeri
         ui->expectedTimeLeft->setText(GUIUtil::formateNiceTimeOffset(remainingMSecs/1000.0));
 
         // keep maximal 5000 samples
-        static int maxSamples = 5000;
-        if (blockProcessTime.count() > maxSamples)
-            blockProcessTime.remove(maxSamples, blockProcessTime.count()-maxSamples);
+        static const int MAX_SAMPLES = 5000;
+        if (blockProcessTime.count() > MAX_SAMPLES)
+            blockProcessTime.remove(MAX_SAMPLES, blockProcessTime.count()-MAX_SAMPLES);
     }
 
     // show the last block date
diff --git a/src/qt/walletframe.cpp b/src/qt/walletframe.cpp
index 9d68e54e3a27b..518d9ea90a25f 100644
--- a/src/qt/walletframe.cpp
+++ b/src/qt/walletframe.cpp
@@ -199,5 +199,5 @@ WalletView *WalletFrame::currentWalletView()
 
 void WalletFrame::outOfSyncWarningClicked()
 {
-    Q_EMIT requestedOfSyncWarningInfo();
-}
\ No newline at end of file
+    Q_EMIT requestedSyncWarningInfo();
+}
diff --git a/src/qt/walletframe.h b/src/qt/walletframe.h
index 7e3a5690eb00a..00c2f5636379a 100644
--- a/src/qt/walletframe.h
+++ b/src/qt/walletframe.h
@@ -40,7 +40,7 @@ class WalletFrame : public QFrame
 
 Q_SIGNALS:
     /** Notify that the user has requested more information about the out-of-sync warning */
-    void requestedOfSyncWarningInfo();
+    void requestedSyncWarningInfo();
 
 private:
     QStackedWidget *walletStack;
diff --git a/src/qt/walletview.cpp b/src/qt/walletview.cpp
index 656b21586f838..b163ce3dcfc4c 100644
--- a/src/qt/walletview.cpp
+++ b/src/qt/walletview.cpp
@@ -66,7 +66,7 @@ WalletView::WalletView(const PlatformStyle *platformStyle, QWidget *parent):
 
     // Clicking on a transaction on the overview pre-selects the transaction on the transaction history page
     connect(overviewPage, SIGNAL(transactionClicked(QModelIndex)), transactionView, SLOT(focusTransaction(QModelIndex)));
-    connect(overviewPage, SIGNAL(outOfSyncWarningClicked()), this, SLOT(requestedOfSyncWarningInfo()));
+    connect(overviewPage, SIGNAL(outOfSyncWarningClicked()), this, SLOT(requestedSyncWarningInfo()));
 
     // Double-clicking on a transaction on the transaction history page shows details
     connect(transactionView, SIGNAL(doubleClicked(QModelIndex)), transactionView, SLOT(showDetails()));
@@ -324,7 +324,7 @@ void WalletView::showProgress(const QString &title, int nProgress)
         progressDialog->setValue(nProgress);
 }
 
-void WalletView::requestedOfSyncWarningInfo()
+void WalletView::requestedSyncWarningInfo()
 {
     Q_EMIT outOfSyncWarningClicked();
 }
diff --git a/src/qt/walletview.h b/src/qt/walletview.h
index c0a27ab98970d..aaa6aacbf0747 100644
--- a/src/qt/walletview.h
+++ b/src/qt/walletview.h
@@ -111,7 +111,7 @@ public Q_SLOTS:
     void showProgress(const QString &title, int nProgress);
 
     /** User has requested more information about the out of sync state */
-    void requestedOfSyncWarningInfo();
+    void requestedSyncWarningInfo();
 
 Q_SIGNALS:
     /** Signal that we want to show the main window */

From edeaf24e4c3409d5b176433cc9e4e027b87a2f6e Mon Sep 17 00:00:00 2001
From: Mitchell Cash <mitchell@fastmail.com.au>
Date: Sat, 24 Sep 2016 13:46:08 +1000
Subject: [PATCH 0932/1802] Fix future copyright year

---
 src/qt/modaloverlay.cpp | 2 +-
 src/qt/modaloverlay.h   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/qt/modaloverlay.cpp b/src/qt/modaloverlay.cpp
index 7b121e9e88b45..7951bd784ee40 100644
--- a/src/qt/modaloverlay.cpp
+++ b/src/qt/modaloverlay.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2017 The Bitcoin Core developers
+// Copyright (c) 2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/qt/modaloverlay.h b/src/qt/modaloverlay.h
index bdbe3c39a70ac..670c9e58ab3ec 100644
--- a/src/qt/modaloverlay.h
+++ b/src/qt/modaloverlay.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2017 The Bitcoin Core developers
+// Copyright (c) 2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 

From c9ce17beedba69c158fb77713b95eb48f30e7705 Mon Sep 17 00:00:00 2001
From: Derek Miller <Derek701@users.noreply.github.com>
Date: Sat, 24 Sep 2016 12:22:47 -0500
Subject: [PATCH 0933/1802] Trivial: Grammar and capitalization

---
 src/qt/forms/modaloverlay.ui | 8 ++++----
 src/qt/modaloverlay.cpp      | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/qt/forms/modaloverlay.ui b/src/qt/forms/modaloverlay.ui
index ccec1b3e1e50f..b16ecafbe430e 100644
--- a/src/qt/forms/modaloverlay.ui
+++ b/src/qt/forms/modaloverlay.ui
@@ -204,7 +204,7 @@ QLabel { color: rgb(40,40,40);  }</string>
             <number>10</number>
            </property>
            <item row="0" column="0">
-            <widget class="QLabel" name="labelAmoutOfBlocksLeft">
+            <widget class="QLabel" name="labelNumberOfBlocksLeft">
              <property name="font">
               <font>
                <weight>75</weight>
@@ -212,12 +212,12 @@ QLabel { color: rgb(40,40,40);  }</string>
               </font>
              </property>
              <property name="text">
-              <string>Amount of blocks left</string>
+              <string>Number of blocks left</string>
              </property>
             </widget>
            </item>
            <item row="0" column="1">
-            <widget class="QLabel" name="amountOfBlocksLeft">
+            <widget class="QLabel" name="numberOfBlocksLeft">
              <property name="text">
               <string>unknown...</string>
              </property>
@@ -289,7 +289,7 @@ QLabel { color: rgb(40,40,40);  }</string>
               </font>
              </property>
              <property name="text">
-              <string>Progress increase per Hour</string>
+              <string>Progress increase per hour</string>
              </property>
             </widget>
            </item>
diff --git a/src/qt/modaloverlay.cpp b/src/qt/modaloverlay.cpp
index 7b121e9e88b45..35a4a56044cd6 100644
--- a/src/qt/modaloverlay.cpp
+++ b/src/qt/modaloverlay.cpp
@@ -125,9 +125,9 @@ void ModalOverlay::tipUpdate(int count, const QDateTime& blockDate, double nVeri
     ui->percentageProgress->setText(QString::number(nVerificationProgress*100, 'f', 2)+"%");
     ui->progressBar->setValue(nVerificationProgress*100);
 
-    // show remaining amount of blocks
+    // show remaining number of blocks
     if (bestBlockHeight > 0)
-        ui->amountOfBlocksLeft->setText(QString::number(bestBlockHeight-count));
+        ui->numberOfBlocksLeft->setText(QString::number(bestBlockHeight-count));
     else
         ui->expectedTimeLeft->setText(tr("Unknown. Syncing Headers..."));
 }

From b1948723c9bc045aa43a7a2771c62d413bfd0e20 Mon Sep 17 00:00:00 2001
From: fanquake <fanquake@gmail.com>
Date: Fri, 16 Sep 2016 12:36:46 +0800
Subject: [PATCH 0934/1802] Remove old manpages from contrib/debian

---
 contrib/debian/bitcoin-qt.manpages     |  1 +
 contrib/debian/bitcoin-tx.manpages     |  1 +
 contrib/debian/bitcoind.manpages       |  5 ++---
 contrib/debian/copyright               |  4 ----
 contrib/debian/manpages/bitcoin-cli.1  | 21 ------------------
 contrib/debian/manpages/bitcoin-qt.1   | 13 -----------
 contrib/debian/manpages/bitcoin.conf.5 | 19 ----------------
 contrib/debian/manpages/bitcoind.1     | 30 --------------------------
 contrib/debian/rules                   |  3 ---
 contrib/rpm/bitcoin.spec               | 10 +++------
 doc/release-process.md                 |  2 ++
 11 files changed, 9 insertions(+), 100 deletions(-)
 create mode 100644 contrib/debian/bitcoin-qt.manpages
 create mode 100644 contrib/debian/bitcoin-tx.manpages
 delete mode 100644 contrib/debian/manpages/bitcoin-cli.1
 delete mode 100644 contrib/debian/manpages/bitcoin-qt.1
 delete mode 100644 contrib/debian/manpages/bitcoin.conf.5
 delete mode 100644 contrib/debian/manpages/bitcoind.1

diff --git a/contrib/debian/bitcoin-qt.manpages b/contrib/debian/bitcoin-qt.manpages
new file mode 100644
index 0000000000000..9a3cc31c09a8f
--- /dev/null
+++ b/contrib/debian/bitcoin-qt.manpages
@@ -0,0 +1 @@
+doc/man/bitcoin-qt.1
diff --git a/contrib/debian/bitcoin-tx.manpages b/contrib/debian/bitcoin-tx.manpages
new file mode 100644
index 0000000000000..861d49d07022e
--- /dev/null
+++ b/contrib/debian/bitcoin-tx.manpages
@@ -0,0 +1 @@
+doc/man/bitcoin-tx.1
diff --git a/contrib/debian/bitcoind.manpages b/contrib/debian/bitcoind.manpages
index 6d3e683855018..bab644ece1369 100644
--- a/contrib/debian/bitcoind.manpages
+++ b/contrib/debian/bitcoind.manpages
@@ -1,3 +1,2 @@
-debian/manpages/bitcoind.1
-debian/manpages/bitcoin.conf.5
-debian/manpages/bitcoin-cli.1
+doc/man/bitcoind.1
+doc/man/bitcoin-cli.1
diff --git a/contrib/debian/copyright b/contrib/debian/copyright
index cc4606ca88ad9..5cac6e533c5f3 100644
--- a/contrib/debian/copyright
+++ b/contrib/debian/copyright
@@ -15,10 +15,6 @@ Copyright: 2010-2011, Jonas Smedegaard <dr@jones.dk>
            2011, Matt Corallo <matt@bluematt.me>
 License: GPL-2+
 
-Files: debian/manpages/*
-Copyright: Micah Anderson <micah@debian.org>
-License: GPL-3+
-
 Files: src/qt/res/icons/add.png
        src/qt/res/icons/address-book.png
        src/qt/res/icons/chevron.png
diff --git a/contrib/debian/manpages/bitcoin-cli.1 b/contrib/debian/manpages/bitcoin-cli.1
deleted file mode 100644
index 16c338dd3e511..0000000000000
--- a/contrib/debian/manpages/bitcoin-cli.1
+++ /dev/null
@@ -1,21 +0,0 @@
-.TH BITCOIN-CLI "1" "February 2016" "bitcoin-cli 0.12"
-.SH NAME
-bitcoin-cli \- a remote procedure call client for Bitcoin Core. 
-.SH SYNOPSIS
-bitcoin-cli [options] <command> [params] \- Send command to Bitcoin Core. 
-.TP
-bitcoin-cli [options] help \- Asks Bitcoin Core for a list of supported commands.
-.SH DESCRIPTION
-This manual page documents the bitcoin-cli program. bitcoin-cli is an RPC client used to send commands to Bitcoin Core.
-
-.SH OPTIONS
-.TP
-\fB\-?\fR
-Show possible options.
-
-.SH "SEE ALSO"
-\fBbitcoind\fP, \fBbitcoin.conf\fP
-.SH AUTHOR
-This manual page was written by Ciemon Dunville <ciemon@gmail.com>. Permission is granted to copy, distribute and/or modify this document under the terms of the MIT License.
-
-The complete text of the MIT License can be found on the web at \fIhttp://opensource.org/licenses/MIT\fP.
diff --git a/contrib/debian/manpages/bitcoin-qt.1 b/contrib/debian/manpages/bitcoin-qt.1
deleted file mode 100644
index 685a282080e2b..0000000000000
--- a/contrib/debian/manpages/bitcoin-qt.1
+++ /dev/null
@@ -1,13 +0,0 @@
-.TH BITCOIN-QT "1" "February 2016" "bitcoin-qt 0.12"
-.SH NAME
-bitcoin-qt \- peer-to-peer network based digital currency
-.SH DESCRIPTION
-.SS "Usage:"
-.IP
-bitcoin\-qt [command\-line options]
-.SH OPTIONS
-.TP
-\-?
-List options.
-.SH "SEE ALSO"
-bitcoind(1)
diff --git a/contrib/debian/manpages/bitcoin.conf.5 b/contrib/debian/manpages/bitcoin.conf.5
deleted file mode 100644
index 839dc26c1aa57..0000000000000
--- a/contrib/debian/manpages/bitcoin.conf.5
+++ /dev/null
@@ -1,19 +0,0 @@
-.TH BITCOIN.CONF "5" "February 2016" "bitcoin.conf 0.12"
-.SH NAME
-bitcoin.conf \- bitcoin configuration file
-.SH SYNOPSIS
-All command-line options (except for '\-conf') may be specified in a configuration file, and all configuration file options may also be specified on the command line. Command-line options override values set in the configuration file.
-.TP
-The configuration file is a list of 'setting=value' pairs, one per line, with optional comments starting with the '#' character. Please refer to bitcoind(1) for a up to date list of valid options.
-.TP
-The configuration file is not automatically created; you can create it using your favorite plain-text editor. By default, bitcoind(1) will look for a file named bitcoin.conf(5) in the bitcoin data directory, but both the data directory and the configuration file path may be changed using the '\-datadir' and '\-conf' command-line arguments.
-.SH LOCATION
-bitcoin.conf should be located in $HOME/.bitcoin
-
-.SH "SEE ALSO"
-bitcoind(1)
-.SH AUTHOR
-This manual page was written by Micah Anderson <micah@debian.org> for the Debian system (but may be used by others). Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 3 or any later version published by the Free Software Foundation.
-
-On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL.
-
diff --git a/contrib/debian/manpages/bitcoind.1 b/contrib/debian/manpages/bitcoind.1
deleted file mode 100644
index 5c3e52f441e9e..0000000000000
--- a/contrib/debian/manpages/bitcoind.1
+++ /dev/null
@@ -1,30 +0,0 @@
-.TH BITCOIND "1" "February 2016" "bitcoind 0.12"
-.SH NAME
-bitcoind \- peer-to-peer network based digital currency
-.SH SYNOPSIS
-bitcoin [options] <command> [params]  
-.TP
-bitcoin [options] help <command> \- Get help for a command
-.SH DESCRIPTION
-This  manual page documents the bitcoind program. Bitcoin is an experimental new digital currency that enables instant payments to anyone, anywhere in the world. Bitcoin uses peer-to-peer technology to operate with no central authority: managing transactions and issuing money are carried out collectively by the network. Bitcoin Core is the name of open source software which enables the use of this currency.
-
-.SH OPTIONS
-.TP
-\-?
-List of possible options.
-.SH COMMANDS
-.TP
-\fBhelp\fR
-List commands.
-
-.TP
-\fBhelp 'command'\fR
-Get help for a command.
-
-.SH "SEE ALSO"
-bitcoin.conf(5)
-.SH AUTHOR
-This manual page was written by Micah Anderson <micah@debian.org> for the Debian system (but may be used by others). Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 3 or any later version published by the Free Software Foundation.
-
-On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL.
-
diff --git a/contrib/debian/rules b/contrib/debian/rules
index 52b357cf01a50..3896d2caa3116 100755
--- a/contrib/debian/rules
+++ b/contrib/debian/rules
@@ -5,9 +5,6 @@
 #build/bitcoind::
 #	$(if $(filter nocheck,$(DEB_BUILD_OPTIONS)),,src/test_bitcoin)
 
-DEB_INSTALL_EXAMPLES_bitcoind += debian/examples/*
-DEB_INSTALL_MANPAGES_bitcoind += debian/manpages/*
-
 %:
 	dh --with bash-completion $@
 
diff --git a/contrib/rpm/bitcoin.spec b/contrib/rpm/bitcoin.spec
index 38ae038180766..516f42334ec14 100644
--- a/contrib/rpm/bitcoin.spec
+++ b/contrib/rpm/bitcoin.spec
@@ -27,10 +27,9 @@ Source1:	http://download.oracle.com/berkeley-db/db-%{bdbv}.NC.tar.gz
 Source10:	https://raw.githubusercontent.com/bitcoin/bitcoin/v%{version}/contrib/debian/examples/bitcoin.conf
 
 #man pages
-Source20:	https://raw.githubusercontent.com/bitcoin/bitcoin/v%{version}/contrib/debian/manpages/bitcoind.1
-Source21:	https://raw.githubusercontent.com/bitcoin/bitcoin/v%{version}/contrib/debian/manpages/bitcoin-cli.1
-Source22:	https://raw.githubusercontent.com/bitcoin/bitcoin/v%{version}/contrib/debian/manpages/bitcoin-qt.1
-Source23:	https://raw.githubusercontent.com/bitcoin/bitcoin/v%{version}/contrib/debian/manpages/bitcoin.conf.5
+Source20:	https://raw.githubusercontent.com/bitcoin/bitcoin/v%{version}/doc/man/bitcoind.1
+Source21:	https://raw.githubusercontent.com/bitcoin/bitcoin/v%{version}/doc/man/bitcoin-cli.1
+Source22:	https://raw.githubusercontent.com/bitcoin/bitcoin/v%{version}/doc/man/bitcoin-qt.1
 
 #selinux
 Source30:	https://raw.githubusercontent.com/bitcoin/bitcoin/v%{version}/contrib/rpm/bitcoin.te
@@ -306,7 +305,6 @@ install -p %{SOURCE21} %{buildroot}%{_mandir}/man1/bitcoin-cli.1
 %if %{_buildqt}
 install -p %{SOURCE22} %{buildroot}%{_mandir}/man1/bitcoin-qt.1
 %endif
-install -D -p %{SOURCE23} %{buildroot}%{_mandir}/man5/bitcoin.conf.5
 
 # nuke these, we do extensive testing of binaries in %%check before packaging
 rm -f %{buildroot}%{_bindir}/test_*
@@ -415,7 +413,6 @@ rm -rf %{buildroot}
 %config(noreplace) %attr(0600,root,root) %{_sysconfdir}/sysconfig/bitcoin
 %attr(0644,root,root) %{_datadir}/selinux/*/*.pp
 %attr(0644,root,root) %{_mandir}/man1/bitcoind.1*
-%attr(0644,root,root) %{_mandir}/man5/bitcoin.conf.5*
 
 %files utils
 %defattr(-,root,root,-)
@@ -425,7 +422,6 @@ rm -rf %{buildroot}
 %attr(0755,root,root) %{_bindir}/bitcoin-tx
 %attr(0755,root,root) %{_bindir}/bench_bitcoin
 %attr(0644,root,root) %{_mandir}/man1/bitcoin-cli.1*
-%attr(0644,root,root) %{_mandir}/man5/bitcoin.conf.5*
 
 
 
diff --git a/doc/release-process.md b/doc/release-process.md
index 394b159b31ae5..04d9473c2005b 100644
--- a/doc/release-process.md
+++ b/doc/release-process.md
@@ -5,6 +5,8 @@ Before every release candidate:
 
 * Update translations (ping wumpus on IRC) see [translation_process.md](https://github.com/bitcoin/bitcoin/blob/master/doc/translation_process.md#synchronising-translations).
 
+* Update manpages, see [gen-manpages.sh](https://github.com/bitcoin/bitcoin/blob/master/contrib/devtools/README.md#gen-manpagessh).
+
 Before every minor and major release:
 
 * Update [bips.md](bips.md) to account for changes since the last release.

From fa6e71b27d00766897f3e69775d450924a58a153 Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Sun, 25 Sep 2016 15:01:31 +0200
Subject: [PATCH 0935/1802] [qa] Add getinfo smoke tests and rework versionbits
 test

---
 qa/rpc-tests/p2p-versionbits-warning.py | 41 +++++++++++++------------
 qa/rpc-tests/rpcbind_test.py            |  2 +-
 2 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/qa/rpc-tests/p2p-versionbits-warning.py b/qa/rpc-tests/p2p-versionbits-warning.py
index c17bacfc79abc..00dbbc02cf3c7 100755
--- a/qa/rpc-tests/p2p-versionbits-warning.py
+++ b/qa/rpc-tests/p2p-versionbits-warning.py
@@ -6,6 +6,7 @@
 from test_framework.mininode import *
 from test_framework.test_framework import BitcoinTestFramework
 from test_framework.util import *
+import re
 import time
 from test_framework.blocktools import create_block, create_coinbase
 
@@ -21,6 +22,10 @@
 VB_TOP_BITS = 0x20000000
 VB_UNKNOWN_BIT = 27 # Choose a bit unassigned to any deployment
 
+WARN_UNKNOWN_RULES_MINED = "Unknown block versions being mined! It's possible unknown rules are in effect"
+WARN_UNKNOWN_RULES_ACTIVE = "unknown new rules activated (versionbit {})".format(VB_UNKNOWN_BIT)
+VB_PATTERN = re.compile("^Warning.*versionbit")
+
 # TestNode: bare-bones "peer".  Used mostly as a conduit for a test to sending
 # p2p messages to a node, generating the messages in the main testing logic.
 class TestNode(NodeConnCB):
@@ -65,16 +70,12 @@ def __init__(self):
         self.num_nodes = 1
 
     def setup_network(self):
-        self.nodes = []
         self.alert_filename = os.path.join(self.options.tmpdir, "alert.txt")
         # Open and close to create zero-length file
-        with open(self.alert_filename, 'w') as f:
+        with open(self.alert_filename, 'w') as _:
             pass
-        self.node_options = ["-debug", "-logtimemicros=1", "-alertnotify=echo %s >> \"" + self.alert_filename + "\""]
-        self.nodes.append(start_node(0, self.options.tmpdir, self.node_options))
-
-        import re
-        self.vb_pattern = re.compile("^Warning.*versionbit")
+        self.extra_args = [["-debug", "-logtimemicros=1", "-alertnotify=echo %s >> \"" + self.alert_filename + "\""]]
+        self.nodes = start_nodes(self.num_nodes, self.options.tmpdir, self.extra_args)
 
     # Send numblocks blocks via peer with nVersionToUse set.
     def send_blocks_with_version(self, peer, numblocks, nVersionToUse):
@@ -83,7 +84,7 @@ def send_blocks_with_version(self, peer, numblocks, nVersionToUse):
         block_time = self.nodes[0].getblockheader(tip)["time"]+1
         tip = int(tip, 16)
 
-        for i in range(numblocks):
+        for _ in range(numblocks):
             block = create_block(tip, create_coinbase(height+1), block_time)
             block.nVersion = nVersionToUse
             block.solve()
@@ -96,7 +97,7 @@ def send_blocks_with_version(self, peer, numblocks, nVersionToUse):
     def test_versionbits_in_alert_file(self):
         with open(self.alert_filename, 'r') as f:
             alert_text = f.read()
-        assert(self.vb_pattern.match(alert_text))
+        assert(VB_PATTERN.match(alert_text))
 
     def run_test(self):
         # Setup the p2p connection and start up the network thread.
@@ -123,8 +124,9 @@ def run_test(self):
         self.nodes[0].generate(VB_PERIOD - VB_THRESHOLD + 1)
         # Check that we're not getting any versionbit-related errors in
         # get*info()
-        assert(not self.vb_pattern.match(self.nodes[0].getmininginfo()["errors"]))
-        assert(not self.vb_pattern.match(self.nodes[0].getnetworkinfo()["warnings"]))
+        assert(not VB_PATTERN.match(self.nodes[0].getinfo()["errors"]))
+        assert(not VB_PATTERN.match(self.nodes[0].getmininginfo()["errors"]))
+        assert(not VB_PATTERN.match(self.nodes[0].getnetworkinfo()["warnings"]))
 
         # 3. Now build one period of blocks with >= VB_THRESHOLD blocks signaling
         # some unknown bit
@@ -134,8 +136,9 @@ def run_test(self):
         # have gotten a different alert due to more than 51/100 blocks
         # being of unexpected version.
         # Check that get*info() shows some kind of error.
-        assert("Unknown block versions" in self.nodes[0].getmininginfo()["errors"])
-        assert("Unknown block versions" in self.nodes[0].getnetworkinfo()["warnings"])
+        assert(WARN_UNKNOWN_RULES_MINED in self.nodes[0].getinfo()["errors"])
+        assert(WARN_UNKNOWN_RULES_MINED in self.nodes[0].getmininginfo()["errors"])
+        assert(WARN_UNKNOWN_RULES_MINED in self.nodes[0].getnetworkinfo()["warnings"])
 
         # Mine a period worth of expected blocks so the generic block-version warning
         # is cleared, and restart the node. This should move the versionbit state
@@ -144,21 +147,21 @@ def run_test(self):
         stop_node(self.nodes[0], 0)
         wait_bitcoinds()
         # Empty out the alert file
-        with open(self.alert_filename, 'w') as f:
+        with open(self.alert_filename, 'w') as _:
             pass
-        self.nodes[0] = start_node(0, self.options.tmpdir, ["-debug", "-logtimemicros=1", "-alertnotify=echo %s >> \"" + self.alert_filename + "\""])
+        self.nodes = start_nodes(self.num_nodes, self.options.tmpdir, self.extra_args)
 
         # Connecting one block should be enough to generate an error.
         self.nodes[0].generate(1)
-        assert("unknown new rules" in self.nodes[0].getmininginfo()["errors"])
-        assert("unknown new rules" in self.nodes[0].getnetworkinfo()["warnings"])
+        assert(WARN_UNKNOWN_RULES_ACTIVE in self.nodes[0].getinfo()["errors"])
+        assert(WARN_UNKNOWN_RULES_ACTIVE in self.nodes[0].getmininginfo()["errors"])
+        assert(WARN_UNKNOWN_RULES_ACTIVE in self.nodes[0].getnetworkinfo()["warnings"])
         stop_node(self.nodes[0], 0)
         wait_bitcoinds()
         self.test_versionbits_in_alert_file()
 
         # Test framework expects the node to still be running...
-        self.nodes[0] = start_node(0, self.options.tmpdir, ["-debug", "-logtimemicros=1", "-alertnotify=echo %s >> \"" + self.alert_filename + "\""])
-
+        self.nodes = start_nodes(self.num_nodes, self.options.tmpdir, self.extra_args)
 
 if __name__ == '__main__':
     VersionBitsWarningTest().main()
diff --git a/qa/rpc-tests/rpcbind_test.py b/qa/rpc-tests/rpcbind_test.py
index 144c2f4cd41d7..085024e268384 100755
--- a/qa/rpc-tests/rpcbind_test.py
+++ b/qa/rpc-tests/rpcbind_test.py
@@ -44,7 +44,7 @@ def run_bind_test(self, allow_ips, connect_to, addresses, expected):
 
     def run_allowip_test(self, allow_ips, rpchost, rpcport):
         '''
-        Start a node with rpcwallow IP, and request getnetworkinfo
+        Start a node with rpcallow IP, and request getnetworkinfo
         at a non-localhost IP.
         '''
         base_args = ['-disablewallet', '-nolisten'] + ['-rpcallowip='+x for x in allow_ips]

From 3650668cdbbf369dd8f30c8e8eb5bb883325942d Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Sun, 25 Sep 2016 15:19:23 +0200
Subject: [PATCH 0936/1802] Squashed 'src/univalue/' changes from
 f32df99..daf1285

daf1285 Merge pull request #2 from jgarzik/master
d9e62d3 Merge pull request #24 from MarcoFalke/Mf1608-cleanup
faf260f Rem unused vars and prefer prefix operator for non-primitive type
09a2693 Merge pull request #22 from laanwj/2016_04_unicode
c74a04c Merge pull request #23 from paveljanik/20160527_Wshadow
fceb4f8 Do not shadow variables

git-subtree-dir: src/univalue
git-subtree-split: daf1285af60c2c73801c0f41469c9802c849343d
---
 include/univalue.h | 26 +++++++++++++-------------
 lib/univalue.cpp   | 25 +++++++++++--------------
 2 files changed, 24 insertions(+), 27 deletions(-)

diff --git a/include/univalue.h b/include/univalue.h
index 8428b1c683ac3..e48b905bfb857 100644
--- a/include/univalue.h
+++ b/include/univalue.h
@@ -56,7 +56,7 @@ class UniValue {
     bool setNumStr(const std::string& val);
     bool setInt(uint64_t val);
     bool setInt(int64_t val);
-    bool setInt(int val) { return setInt((int64_t)val); }
+    bool setInt(int val_) { return setInt((int64_t)val_); }
     bool setFloat(double val);
     bool setStr(const std::string& val);
     bool setArray();
@@ -95,28 +95,28 @@ class UniValue {
     bool push_backV(const std::vector<UniValue>& vec);
 
     bool pushKV(const std::string& key, const UniValue& val);
-    bool pushKV(const std::string& key, const std::string& val) {
-        UniValue tmpVal(VSTR, val);
+    bool pushKV(const std::string& key, const std::string& val_) {
+        UniValue tmpVal(VSTR, val_);
         return pushKV(key, tmpVal);
     }
     bool pushKV(const std::string& key, const char *val_) {
-        std::string val(val_);
-        return pushKV(key, val);
+        std::string _val(val_);
+        return pushKV(key, _val);
     }
-    bool pushKV(const std::string& key, int64_t val) {
-        UniValue tmpVal(val);
+    bool pushKV(const std::string& key, int64_t val_) {
+        UniValue tmpVal(val_);
         return pushKV(key, tmpVal);
     }
-    bool pushKV(const std::string& key, uint64_t val) {
-        UniValue tmpVal(val);
+    bool pushKV(const std::string& key, uint64_t val_) {
+        UniValue tmpVal(val_);
         return pushKV(key, tmpVal);
     }
-    bool pushKV(const std::string& key, int val) {
-        UniValue tmpVal((int64_t)val);
+    bool pushKV(const std::string& key, int val_) {
+        UniValue tmpVal((int64_t)val_);
         return pushKV(key, tmpVal);
     }
-    bool pushKV(const std::string& key, double val) {
-        UniValue tmpVal(val);
+    bool pushKV(const std::string& key, double val_) {
+        UniValue tmpVal(val_);
         return pushKV(key, tmpVal);
     }
     bool pushKVs(const UniValue& obj);
diff --git a/lib/univalue.cpp b/lib/univalue.cpp
index 0076d6678ec79..1f8cee6d29839 100644
--- a/lib/univalue.cpp
+++ b/lib/univalue.cpp
@@ -119,32 +119,29 @@ bool UniValue::setNumStr(const string& val_)
     return true;
 }
 
-bool UniValue::setInt(uint64_t val)
+bool UniValue::setInt(uint64_t val_)
 {
-    string s;
     ostringstream oss;
 
-    oss << val;
+    oss << val_;
 
     return setNumStr(oss.str());
 }
 
-bool UniValue::setInt(int64_t val)
+bool UniValue::setInt(int64_t val_)
 {
-    string s;
     ostringstream oss;
 
-    oss << val;
+    oss << val_;
 
     return setNumStr(oss.str());
 }
 
-bool UniValue::setFloat(double val)
+bool UniValue::setFloat(double val_)
 {
-    string s;
     ostringstream oss;
 
-    oss << std::setprecision(16) << val;
+    oss << std::setprecision(16) << val_;
 
     bool ret = setNumStr(oss.str());
     typ = VNUM;
@@ -173,12 +170,12 @@ bool UniValue::setObject()
     return true;
 }
 
-bool UniValue::push_back(const UniValue& val)
+bool UniValue::push_back(const UniValue& val_)
 {
     if (typ != VARR)
         return false;
 
-    values.push_back(val);
+    values.push_back(val_);
     return true;
 }
 
@@ -192,13 +189,13 @@ bool UniValue::push_backV(const std::vector<UniValue>& vec)
     return true;
 }
 
-bool UniValue::pushKV(const std::string& key, const UniValue& val)
+bool UniValue::pushKV(const std::string& key, const UniValue& val_)
 {
     if (typ != VOBJ)
         return false;
 
     keys.push_back(key);
-    values.push_back(val);
+    values.push_back(val_);
     return true;
 }
 
@@ -228,7 +225,7 @@ int UniValue::findKey(const std::string& key) const
 bool UniValue::checkObject(const std::map<std::string,UniValue::VType>& t)
 {
     for (std::map<std::string,UniValue::VType>::const_iterator it = t.begin();
-         it != t.end(); it++) {
+         it != t.end(); ++it) {
         int idx = findKey(it->first);
         if (idx < 0)
             return false;

From 0637b02fce04c800acc6747687c91c9b22f642e5 Mon Sep 17 00:00:00 2001
From: Johnson Lau <jl2012@users.noreply.github.com>
Date: Sat, 24 Sep 2016 16:26:26 +0800
Subject: [PATCH 0937/1802] Ping regularly in p2p-segwit.py to keep connection
 alive

This pings regularly while building a big block in p2p-segwit.py, to prevent timeout
---
 qa/rpc-tests/p2p-segwit.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/qa/rpc-tests/p2p-segwit.py b/qa/rpc-tests/p2p-segwit.py
index 22ec0ad8c87f5..5c1eb21b1ffd5 100755
--- a/qa/rpc-tests/p2p-segwit.py
+++ b/qa/rpc-tests/p2p-segwit.py
@@ -1392,6 +1392,9 @@ def sign_P2PK_witness_input(script, txTo, inIdx, hashtype, value, key):
         block = self.build_next_block()
         used_sighash_single_out_of_bounds = False
         for i in range(NUM_TESTS):
+            # Ping regularly to keep the connection alive
+            if (not i % 100):
+                self.test_node.sync_with_ping()
             # Choose random number of inputs to use.
             num_inputs = random.randint(1, 10)
             # Create a slight bias for producing more utxos

From 42f6aed731874d937d6f8c9f9c9a6b64d59852d8 Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Sun, 25 Sep 2016 20:02:14 +0200
Subject: [PATCH 0938/1802] tests: Add exception error message for
 JSONRPCException

This improves error reporting if `JSONRPCException` is not specifically caught
and ends up in Python's default backtrace handler.

Before:
```
Traceback (most recent call last):
  File "/.../projects/bitcoin/bitcoin/qa/rpc-tests/test_framework/authproxy.py", line 153, in __call__
    raise JSONRPCException(response['error'])
test_framework.authproxy.JSONRPCException
```

After:
```
Traceback (most recent call last):
  File "/.../projects/bitcoin/bitcoin/qa/rpc-tests/test_framework/authproxy.py", line 152, in __call__
    raise JSONRPCException(response['error'])
test_framework.authproxy.JSONRPCException: Unknown named parameter random (-8)
```
---
 qa/rpc-tests/test_framework/authproxy.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/qa/rpc-tests/test_framework/authproxy.py b/qa/rpc-tests/test_framework/authproxy.py
index d095a56ce75e3..f5e0be20d1ec9 100644
--- a/qa/rpc-tests/test_framework/authproxy.py
+++ b/qa/rpc-tests/test_framework/authproxy.py
@@ -55,7 +55,11 @@
 
 class JSONRPCException(Exception):
     def __init__(self, rpc_error):
-        Exception.__init__(self)
+        try:
+            errmsg = '%(message)s (%(code)i)' % rpc_error
+        except (KeyError, TypeError):
+            errmsg = ''
+        Exception.__init__(self, errmsg)
         self.error = rpc_error
 
 

From faef293cf311a1063b31f90b645cb491d0140930 Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Fri, 8 Jan 2016 01:14:09 +0100
Subject: [PATCH 0939/1802] [wallet] Add high transaction fee warnings

---
 src/init.cpp          |  6 +++---
 src/ui_interface.cpp  |  5 +++++
 src/ui_interface.h    |  2 ++
 src/wallet/wallet.cpp | 19 ++++++++++++++-----
 4 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/src/init.cpp b/src/init.cpp
index 75182345ee9f0..b20675dd9e981 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -951,10 +951,10 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
     if (mapArgs.count("-minrelaytxfee"))
     {
         CAmount n = 0;
-        if (ParseMoney(mapArgs["-minrelaytxfee"], n) && n > 0)
-            ::minRelayTxFee = CFeeRate(n);
-        else
+        if (!ParseMoney(mapArgs["-minrelaytxfee"], n))
             return InitError(AmountErrMsg("minrelaytxfee", mapArgs["-minrelaytxfee"]));
+        // High fee check is done afterward in CWallet::ParameterInteraction()
+        ::minRelayTxFee = CFeeRate(n);
     }
 
     fRequireStandard = !GetBoolArg("-acceptnonstdtxn", !Params().RequireStandard());
diff --git a/src/ui_interface.cpp b/src/ui_interface.cpp
index c778e40a9053a..74a13e0e052bc 100644
--- a/src/ui_interface.cpp
+++ b/src/ui_interface.cpp
@@ -18,6 +18,11 @@ void InitWarning(const std::string& str)
     uiInterface.ThreadSafeMessageBox(str, "", CClientUIInterface::MSG_WARNING);
 }
 
+std::string AmountHighWarn(const std::string& optname)
+{
+    return strprintf(_("%s is set very high!"), optname);
+}
+
 std::string AmountErrMsg(const char* const optname, const std::string& strValue)
 {
     return strprintf(_("Invalid amount for -%s=<amount>: '%s'"), optname, strValue);
diff --git a/src/ui_interface.h b/src/ui_interface.h
index 7e6557f8e21b0..177ff238db8b3 100644
--- a/src/ui_interface.h
+++ b/src/ui_interface.h
@@ -112,6 +112,8 @@ void InitWarning(const std::string& str);
 /** Show error message **/
 bool InitError(const std::string& str);
 
+std::string AmountHighWarn(const std::string& optname);
+
 std::string AmountErrMsg(const char* const optname, const std::string& strValue);
 
 extern CClientUIInterface uiInterface;
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index abb1ea7e76e86..50d63182ae181 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -3485,13 +3485,19 @@ bool CWallet::ParameterInteraction()
     if (GetArg("-prune", 0) && GetBoolArg("-rescan", false))
         return InitError(_("Rescans are not possible in pruned mode. You will need to use -reindex which will download the whole blockchain again."));
 
+    if (::minRelayTxFee.GetFeePerK() > HIGH_TX_FEE_PER_KB)
+        InitWarning(AmountHighWarn("-minrelaytxfee") + " " +
+                    _("The wallet will avoid paying less than the minimum relay fee."));
+
     if (mapArgs.count("-mintxfee"))
     {
         CAmount n = 0;
-        if (ParseMoney(mapArgs["-mintxfee"], n) && n > 0)
-            CWallet::minTxFee = CFeeRate(n);
-        else
+        if (!ParseMoney(mapArgs["-mintxfee"], n))
             return InitError(AmountErrMsg("mintxfee", mapArgs["-mintxfee"]));
+        if (n > HIGH_TX_FEE_PER_KB)
+            InitWarning(AmountHighWarn("-mintxfee") + " " +
+                        _("This is the minimum transaction fee you pay on every transaction."));
+        CWallet::minTxFee = CFeeRate(n);
     }
     if (mapArgs.count("-fallbackfee"))
     {
@@ -3499,7 +3505,8 @@ bool CWallet::ParameterInteraction()
         if (!ParseMoney(mapArgs["-fallbackfee"], nFeePerK))
             return InitError(strprintf(_("Invalid amount for -fallbackfee=<amount>: '%s'"), mapArgs["-fallbackfee"]));
         if (nFeePerK > HIGH_TX_FEE_PER_KB)
-            InitWarning(_("-fallbackfee is set very high! This is the transaction fee you may pay when fee estimates are not available."));
+            InitWarning(AmountHighWarn("-fallbackfee") + " " +
+                        _("This is the transaction fee you may pay when fee estimates are not available."));
         CWallet::fallbackFee = CFeeRate(nFeePerK);
     }
     if (mapArgs.count("-paytxfee"))
@@ -3508,7 +3515,9 @@ bool CWallet::ParameterInteraction()
         if (!ParseMoney(mapArgs["-paytxfee"], nFeePerK))
             return InitError(AmountErrMsg("paytxfee", mapArgs["-paytxfee"]));
         if (nFeePerK > HIGH_TX_FEE_PER_KB)
-            InitWarning(_("-paytxfee is set very high! This is the transaction fee you will pay if you send a transaction."));
+            InitWarning(AmountHighWarn("-paytxfee") + " " +
+                        _("This is the transaction fee you will pay if you send a transaction."));
+
         payTxFee = CFeeRate(nFeePerK, 1000);
         if (payTxFee < ::minRelayTxFee)
         {

From 9a75d29b6f0d6c4834e451b0fae2200786655a35 Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Thu, 23 Jun 2016 16:52:12 +0200
Subject: [PATCH 0940/1802] devtools: Check for high-entropy ASLR in 64-bit PE
 executables

check_PE_PIE only checked for DYNAMIC_BASE, this is not enough
for (secure) ASLR on 64-bit.
---
 contrib/devtools/security-check.py | 48 +++++++++++++++++++++++++-----
 1 file changed, 40 insertions(+), 8 deletions(-)

diff --git a/contrib/devtools/security-check.py b/contrib/devtools/security-check.py
index 301fea85c1f6f..8271240859601 100755
--- a/contrib/devtools/security-check.py
+++ b/contrib/devtools/security-check.py
@@ -12,6 +12,7 @@
 
 READELF_CMD = os.getenv('READELF', '/usr/bin/readelf')
 OBJDUMP_CMD = os.getenv('OBJDUMP', '/usr/bin/objdump')
+NONFATAL = {'HIGH_ENTROPY_VA'} # checks which are non-fatal for now but only generate a warning
 
 def check_ELF_PIE(executable):
     '''
@@ -114,26 +115,50 @@ def check_ELF_Canary(executable):
 
 def get_PE_dll_characteristics(executable):
     '''
-    Get PE DllCharacteristics bits
+    Get PE DllCharacteristics bits.
+    Returns a tuple (arch,bits) where arch is 'i386:x86-64' or 'i386'
+    and bits is the DllCharacteristics value.
     '''
     p = subprocess.Popen([OBJDUMP_CMD, '-x',  executable], stdout=subprocess.PIPE, stderr=subprocess.PIPE, stdin=subprocess.PIPE)
     (stdout, stderr) = p.communicate()
     if p.returncode:
         raise IOError('Error opening file')
+    arch = ''
+    bits = 0
     for line in stdout.split('\n'):
         tokens = line.split()
+        if len(tokens)>=2 and tokens[0] == 'architecture:':
+            arch = tokens[1].rstrip(',')
         if len(tokens)>=2 and tokens[0] == 'DllCharacteristics':
-            return int(tokens[1],16)
-    return 0
+            bits = int(tokens[1],16)
+    return (arch,bits)
 
+IMAGE_DLL_CHARACTERISTICS_HIGH_ENTROPY_VA = 0x0020
+IMAGE_DLL_CHARACTERISTICS_DYNAMIC_BASE    = 0x0040
+IMAGE_DLL_CHARACTERISTICS_NX_COMPAT       = 0x0100
 
-def check_PE_PIE(executable):
+def check_PE_DYNAMIC_BASE(executable):
     '''PIE: DllCharacteristics bit 0x40 signifies dynamicbase (ASLR)'''
-    return bool(get_PE_dll_characteristics(executable) & 0x40)
+    (arch,bits) = get_PE_dll_characteristics(executable)
+    reqbits = IMAGE_DLL_CHARACTERISTICS_DYNAMIC_BASE
+    return (bits & reqbits) == reqbits
+
+# On 64 bit, must support high-entropy 64-bit address space layout randomization in addition to DYNAMIC_BASE
+# to have secure ASLR.
+def check_PE_HIGH_ENTROPY_VA(executable):
+    '''PIE: DllCharacteristics bit 0x20 signifies high-entropy ASLR'''
+    (arch,bits) = get_PE_dll_characteristics(executable)
+    if arch == 'i386:x86-64': 
+        reqbits = IMAGE_DLL_CHARACTERISTICS_HIGH_ENTROPY_VA
+    else: # Unnecessary on 32-bit
+        assert(arch == 'i386')
+        reqbits = 0
+    return (bits & reqbits) == reqbits
 
 def check_PE_NX(executable):
     '''NX: DllCharacteristics bit 0x100 signifies nxcompat (DEP)'''
-    return bool(get_PE_dll_characteristics(executable) & 0x100)
+    (arch,bits) = get_PE_dll_characteristics(executable)
+    return (bits & IMAGE_DLL_CHARACTERISTICS_NX_COMPAT) == IMAGE_DLL_CHARACTERISTICS_NX_COMPAT
 
 CHECKS = {
 'ELF': [
@@ -143,7 +168,8 @@ def check_PE_NX(executable):
     ('Canary', check_ELF_Canary)
 ],
 'PE': [
-    ('PIE', check_PE_PIE),
+    ('DYNAMIC_BASE', check_PE_DYNAMIC_BASE),
+    ('HIGH_ENTROPY_VA', check_PE_HIGH_ENTROPY_VA),
     ('NX', check_PE_NX)
 ]
 }
@@ -168,12 +194,18 @@ def identify_executable(executable):
                 continue
 
             failed = []
+            warning = []
             for (name, func) in CHECKS[etype]:
                 if not func(filename):
-                    failed.append(name)
+                    if name in NONFATAL:
+                        warning.append(name)
+                    else:
+                        failed.append(name)
             if failed:
                 print('%s: failed %s' % (filename, ' '.join(failed)))
                 retval = 1
+            if warning:
+                print('%s: warning %s' % (filename, ' '.join(warning)))
         except IOError:
             print('%s: cannot open' % filename)
             retval = 1

From 62c291596bccca43609e61a01a027e86a81f69b2 Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Thu, 23 Jun 2016 16:54:28 +0200
Subject: [PATCH 0941/1802] build: supply `-Wl,--high-entropy-va`

This should enable high-entropy ASLR on 64-bit targets, for better
mitigation of exploits.
---
 configure.ac | 1 +
 1 file changed, 1 insertion(+)

diff --git a/configure.ac b/configure.ac
index 97af58bd7cd85..44094e8ceea17 100644
--- a/configure.ac
+++ b/configure.ac
@@ -488,6 +488,7 @@ if test x$use_hardening != xno; then
 
   AX_CHECK_LINK_FLAG([[-Wl,--dynamicbase]], [HARDENED_LDFLAGS="$HARDENED_LDFLAGS -Wl,--dynamicbase"])
   AX_CHECK_LINK_FLAG([[-Wl,--nxcompat]], [HARDENED_LDFLAGS="$HARDENED_LDFLAGS -Wl,--nxcompat"])
+  AX_CHECK_LINK_FLAG([[-Wl,--high-entropy-va]], [HARDENED_LDFLAGS="$HARDENED_LDFLAGS -Wl,--high-entropy-va"])
   AX_CHECK_LINK_FLAG([[-Wl,-z,relro]], [HARDENED_LDFLAGS="$HARDENED_LDFLAGS -Wl,-z,relro"])
   AX_CHECK_LINK_FLAG([[-Wl,-z,now]], [HARDENED_LDFLAGS="$HARDENED_LDFLAGS -Wl,-z,now"])
 

From a92bf4af66f8b5a2e6bc28baa6670065ce76daf2 Mon Sep 17 00:00:00 2001
From: Matthew King <chohag@jtan.com>
Date: Tue, 28 Jun 2016 09:35:41 +0300
Subject: [PATCH 0942/1802] bitcoind: Daemonize using daemon(3)

Simplified version of #8278. Assumes that every OS that (a) is supported
by Bitcoin Core (b) supports daemonization has the `daemon()` function
in its C library.

- Removes the fallback path for operating systems that support
  daemonization but not `daemon()`. This prevents never-exercised code from
  ending up in the repository (see discussion here:
  https://github.com/bitcoin/bitcoin/pull/8278#issuecomment-242704745).

- Removes the windows-specific path. Windows doesn't support `daemon()`,
  so it don't support daemonization there, automatically.

Original code by Matthew King, adapted by Wladimir van der Laan.
---
 configure.ac     |  3 +++
 src/bitcoind.cpp | 23 ++++++++---------------
 src/init.cpp     |  2 +-
 3 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/configure.ac b/configure.ac
index 25b828f18c6fd..e129b58461b7c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -508,6 +508,9 @@ AC_SEARCH_LIBS([inet_pton], [nsl resolv], [AC_DEFINE(HAVE_INET_PTON, 1, [Define
 
 AC_CHECK_DECLS([strnlen])
 
+# Check for daemon(3), unrelated to --with-daemon (although used by it)
+AC_CHECK_DECLS([daemon])
+
 AC_CHECK_DECLS([le16toh, le32toh, le64toh, htole16, htole32, htole64, be16toh, be32toh, be64toh, htobe16, htobe32, htobe64],,,
 		[#if HAVE_ENDIAN_H
                  #include <endian.h>
diff --git a/src/bitcoind.cpp b/src/bitcoind.cpp
index 322298d1b38ab..25d720e1e8ccb 100644
--- a/src/bitcoind.cpp
+++ b/src/bitcoind.cpp
@@ -9,6 +9,7 @@
 
 #include "chainparams.h"
 #include "clientversion.h"
+#include "compat.h"
 #include "rpc/server.h"
 #include "init.h"
 #include "noui.h"
@@ -127,29 +128,21 @@ bool AppInit(int argc, char* argv[])
             fprintf(stderr, "Error: There is no RPC client functionality in bitcoind anymore. Use the bitcoin-cli utility instead.\n");
             exit(1);
         }
-#ifndef WIN32
         if (GetBoolArg("-daemon", false))
         {
+#if HAVE_DECL_DAEMON
             fprintf(stdout, "Bitcoin server starting\n");
 
             // Daemonize
-            pid_t pid = fork();
-            if (pid < 0)
-            {
-                fprintf(stderr, "Error: fork() returned %d errno %d\n", pid, errno);
+            if (daemon(1, 0)) { // don't chdir (1), do close FDs (0)
+                fprintf(stderr, "Error: daemon() failed: %s\n", strerror(errno));
                 return false;
             }
-            if (pid > 0) // Parent process, pid is child process id
-            {
-                return true;
-            }
-            // Child process falls through to rest of initialization
-
-            pid_t sid = setsid();
-            if (sid < 0)
-                fprintf(stderr, "Error: setsid() returned %d errno %d\n", sid, errno);
+#else
+            fprintf(stderr, "Error: -daemon is not supported on this operating system\n");
+            return false;
+#endif // HAVE_DECL_DAEMON
         }
-#endif
         SoftSetBoolArg("-server", true);
 
         // Set this early so that parameter interactions go to console
diff --git a/src/init.cpp b/src/init.cpp
index 75182345ee9f0..3c4466b853759 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -324,7 +324,7 @@ std::string HelpMessage(HelpMessageMode mode)
     strUsage += HelpMessageOpt("-conf=<file>", strprintf(_("Specify configuration file (default: %s)"), BITCOIN_CONF_FILENAME));
     if (mode == HMM_BITCOIND)
     {
-#ifndef WIN32
+#if HAVE_DECL_DAEMON
         strUsage += HelpMessageOpt("-daemon", _("Run in the background as a daemon and accept commands"));
 #endif
     }

From fa4bfb48193a03d99d1dfdfd1e67b613293755bf Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Mon, 26 Sep 2016 14:49:47 +0200
Subject: [PATCH 0943/1802] [wallet, policy] ParameterInteraction: Don't allow
 0 fee

---
 src/init.cpp          | 2 +-
 src/wallet/wallet.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/init.cpp b/src/init.cpp
index b20675dd9e981..cb8da06d6444d 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -951,7 +951,7 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
     if (mapArgs.count("-minrelaytxfee"))
     {
         CAmount n = 0;
-        if (!ParseMoney(mapArgs["-minrelaytxfee"], n))
+        if (!ParseMoney(mapArgs["-minrelaytxfee"], n) || 0 == n)
             return InitError(AmountErrMsg("minrelaytxfee", mapArgs["-minrelaytxfee"]));
         // High fee check is done afterward in CWallet::ParameterInteraction()
         ::minRelayTxFee = CFeeRate(n);
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index 50d63182ae181..a5bfde6595f92 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -3492,7 +3492,7 @@ bool CWallet::ParameterInteraction()
     if (mapArgs.count("-mintxfee"))
     {
         CAmount n = 0;
-        if (!ParseMoney(mapArgs["-mintxfee"], n))
+        if (!ParseMoney(mapArgs["-mintxfee"], n) || 0 == n)
             return InitError(AmountErrMsg("mintxfee", mapArgs["-mintxfee"]));
         if (n > HIGH_TX_FEE_PER_KB)
             InitWarning(AmountHighWarn("-mintxfee") + " " +

From c14ffd524b3477d6fdf142e9dc8281b780b45923 Mon Sep 17 00:00:00 2001
From: jonnynewbs <jonnynewbs@gmail.com>
Date: Fri, 16 Sep 2016 14:54:44 -0400
Subject: [PATCH 0944/1802] [trivial] fix mempool comment (outdated by BIP125)

---
 src/txmempool.h | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/txmempool.h b/src/txmempool.h
index 2c2127f326de2..6f67dd91d685c 100644
--- a/src/txmempool.h
+++ b/src/txmempool.h
@@ -328,14 +328,17 @@ struct TxMempoolInfo
 };
 
 /**
- * CTxMemPool stores valid-according-to-the-current-best-chain
- * transactions that may be included in the next block.
+ * CTxMemPool stores valid-according-to-the-current-best-chain transactions
+ * that may be included in the next block.
  *
- * Transactions are added when they are seen on the network
- * (or created by the local node), but not all transactions seen
- * are added to the pool: if a new transaction double-spends
- * an input of a transaction in the pool, it is dropped,
- * as are non-standard transactions.
+ * Transactions are added when they are seen on the network (or created by the
+ * local node), but not all transactions seen are added to the pool. For
+ * example, the following new transactions will not be added to the mempool:
+ * - a transaction which doesn't make the mimimum fee requirements.
+ * - a new transaction that double-spends an input of a transaction already in
+ * the pool where the new transaction does not meet the Replace-By-Fee
+ * requirements as defined in BIP 125.
+ * - a non-standard transaction.
  *
  * CTxMemPool::mapTx, and CTxMemPoolEntry bookkeeping:
  *

From faa4de2a2ac2eb9bb6a419940da83fa898d16a3c Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Mon, 26 Sep 2016 18:58:51 +0200
Subject: [PATCH 0945/1802] [qt] sync-overlay: Don't block during reindex

---
 src/qt/clientmodel.cpp  |  2 +-
 src/qt/modaloverlay.cpp | 31 +++++++++++++++++++------------
 src/qt/modaloverlay.h   |  3 ++-
 3 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/src/qt/clientmodel.cpp b/src/qt/clientmodel.cpp
index 6d19b3d122b70..87704c641d489 100644
--- a/src/qt/clientmodel.cpp
+++ b/src/qt/clientmodel.cpp
@@ -256,7 +256,7 @@ static void BlockTipChanged(ClientModel *clientmodel, bool initialSync, const CB
     int64_t& nLastUpdateNotification = fHeader ? nLastHeaderTipUpdateNotification : nLastBlockTipUpdateNotification;
 
     // if we are in-sync, update the UI regardless of last update time
-    if (fHeader || !initialSync || now - nLastUpdateNotification > MODEL_UPDATE_DELAY) {
+    if (!initialSync || now - nLastUpdateNotification > MODEL_UPDATE_DELAY) {
         //pass a async signal to the UI thread
         QMetaObject::invokeMethod(clientmodel, "numBlocksChanged", Qt::QueuedConnection,
                                   Q_ARG(int, pIndex->nHeight),
diff --git a/src/qt/modaloverlay.cpp b/src/qt/modaloverlay.cpp
index 2de2dde16ad51..461077ff76e5c 100644
--- a/src/qt/modaloverlay.cpp
+++ b/src/qt/modaloverlay.cpp
@@ -13,7 +13,8 @@
 ModalOverlay::ModalOverlay(QWidget *parent) :
 QWidget(parent),
 ui(new Ui::ModalOverlay),
-bestBlockHeight(0),
+bestHeaderHeight(0),
+bestHeaderDate(QDateTime()),
 layerIsVisible(false),
 userClosed(false)
 {
@@ -65,14 +66,9 @@ bool ModalOverlay::event(QEvent* ev) {
 
 void ModalOverlay::setKnownBestHeight(int count, const QDateTime& blockDate)
 {
-
-    /* only update the blockheight if the headerschain-tip is not older then 30 days */
-    int64_t now = QDateTime::currentDateTime().toTime_t();
-    int64_t btime = blockDate.toTime_t();
-    if (btime+3600*24*30 > now)
-    {
-        if (count > bestBlockHeight)
-            bestBlockHeight = count;
+    if (count > bestHeaderHeight) {
+        bestHeaderHeight = count;
+        bestHeaderDate = blockDate;
     }
 }
 
@@ -125,11 +121,22 @@ void ModalOverlay::tipUpdate(int count, const QDateTime& blockDate, double nVeri
     ui->percentageProgress->setText(QString::number(nVerificationProgress*100, 'f', 2)+"%");
     ui->progressBar->setValue(nVerificationProgress*100);
 
+    if (!bestHeaderDate.isValid())
+        // not syncing
+        return;
+
+    // estimate the number of headers left based on nPowTargetSpacing
+    // and check if the gui is not aware of the the best header (happens rarely)
+    int estimateNumHeadersLeft = bestHeaderDate.secsTo(currentDate) / 600;
+    bool hasBestHeader = bestHeaderHeight >= count;
+
     // show remaining number of blocks
-    if (bestBlockHeight > 0)
-        ui->numberOfBlocksLeft->setText(QString::number(bestBlockHeight-count));
-    else
+    if (estimateNumHeadersLeft < 24 && hasBestHeader) {
+        ui->numberOfBlocksLeft->setText(QString::number(bestHeaderHeight - count));
+    } else {
+        ui->numberOfBlocksLeft->setText("~" + QString::number(bestHeaderHeight + estimateNumHeadersLeft - count));
         ui->expectedTimeLeft->setText(tr("Unknown. Syncing Headers..."));
+    }
 }
 
 void ModalOverlay::showHide(bool hide, bool userRequested)
diff --git a/src/qt/modaloverlay.h b/src/qt/modaloverlay.h
index 670c9e58ab3ec..66c0aa78cfb95 100644
--- a/src/qt/modaloverlay.h
+++ b/src/qt/modaloverlay.h
@@ -35,7 +35,8 @@ public Q_SLOTS:
 
 private:
     Ui::ModalOverlay *ui;
-    int bestBlockHeight; //best known height (based on the headers)
+    int bestHeaderHeight; //best known height (based on the headers)
+    QDateTime bestHeaderDate;
     QVector<QPair<qint64, double> > blockProcessTime;
     bool layerIsVisible;
     bool userClosed;

From 16f88230885bf962286c5a00fe092d3c56d4eab4 Mon Sep 17 00:00:00 2001
From: fanquake <fanquake@gmail.com>
Date: Tue, 27 Sep 2016 10:34:54 +0800
Subject: [PATCH 0946/1802] [depends] Boost 1.61.0

---
 depends/packages/boost.mk | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/depends/packages/boost.mk b/depends/packages/boost.mk
index ef1307c241b66..4173c0d168f5b 100644
--- a/depends/packages/boost.mk
+++ b/depends/packages/boost.mk
@@ -1,8 +1,8 @@
 package=boost
-$(package)_version=1_59_0
-$(package)_download_path=http://sourceforge.net/projects/boost/files/boost/1.59.0
+$(package)_version=1_61_0
+$(package)_download_path=https://sourceforge.net/projects/boost/files/boost/1.61.0
 $(package)_file_name=$(package)_$($(package)_version).tar.bz2
-$(package)_sha256_hash=727a932322d94287b62abb1bd2d41723eec4356a7728909e38adb65ca25241ca
+$(package)_sha256_hash=a547bd06c2fd9a71ba1d169d9cf0339da7ebf4753849a8f7d6fdb8feee99b640
 
 define $(package)_set_vars
 $(package)_config_opts_release=variant=release

From 5776e8a5965f1d614516dc89da5fedb324baf62a Mon Sep 17 00:00:00 2001
From: fanquake <fanquake@gmail.com>
Date: Tue, 27 Sep 2016 12:32:20 +0800
Subject: [PATCH 0947/1802] [depends] Fix Qt compilation with Xcode 8

---
 depends/packages/qt.mk                      |  3 ++-
 depends/patches/qt/configure-xcoderun.patch | 25 +++++++++++++++++++++
 2 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 depends/patches/qt/configure-xcoderun.patch

diff --git a/depends/packages/qt.mk b/depends/packages/qt.mk
index d41d0b9ea5b15..bdde15aa173df 100644
--- a/depends/packages/qt.mk
+++ b/depends/packages/qt.mk
@@ -8,7 +8,7 @@ $(package)_dependencies=openssl
 $(package)_linux_dependencies=freetype fontconfig libxcb libX11 xproto libXext
 $(package)_build_subdir=qtbase
 $(package)_qt_libs=corelib network widgets gui plugins testlib
-$(package)_patches=mac-qmake.conf mingw-uuidof.patch pidlist_absolute.patch fix-xcb-include-order.patch fix_qt_pkgconfig.patch
+$(package)_patches=mac-qmake.conf configure-xcoderun.patch mingw-uuidof.patch pidlist_absolute.patch fix-xcb-include-order.patch fix_qt_pkgconfig.patch
 
 $(package)_qttranslations_file_name=qttranslations-$($(package)_suffix)
 $(package)_qttranslations_sha256_hash=dcc1534d247babca1840cb6d0a000671801a341ea352d0535474f86adadaf028
@@ -134,6 +134,7 @@ define $(package)_preprocess_cmds
   cp -f qtbase/mkspecs/macx-clang/Info.plist.app qtbase/mkspecs/macx-clang-linux/ &&\
   cp -f qtbase/mkspecs/macx-clang/qplatformdefs.h qtbase/mkspecs/macx-clang-linux/ &&\
   cp -f $($(package)_patch_dir)/mac-qmake.conf qtbase/mkspecs/macx-clang-linux/qmake.conf && \
+  patch -p1 < $($(package)_patch_dir)/configure-xcoderun.patch && \
   patch -p1 < $($(package)_patch_dir)/mingw-uuidof.patch && \
   patch -p1 < $($(package)_patch_dir)/pidlist_absolute.patch && \
   patch -p1 < $($(package)_patch_dir)/fix-xcb-include-order.patch && \
diff --git a/depends/patches/qt/configure-xcoderun.patch b/depends/patches/qt/configure-xcoderun.patch
new file mode 100644
index 0000000000000..08286d8420bb3
--- /dev/null
+++ b/depends/patches/qt/configure-xcoderun.patch
@@ -0,0 +1,25 @@
+--- old/qtbase/configure
++++ new/qtbase/configure
+@@ -543,7 +543,7 @@ if [ "$BUILD_ON_MAC" = "yes" ]; then
+         exit 2
+     fi
+ 
+-    if ! /usr/bin/xcrun -find xcrun >/dev/null 2>&1; then
++    if ! /usr/bin/xcrun -find xcodebuild >/dev/null 2>&1; then
+         echo >&2
+         echo "   Xcode not set up properly. You may need to confirm the license" >&2
+         echo "   agreement by running /usr/bin/xcodebuild without arguments." >&2
+diff --git a/mkspecs/features/mac/default_pre.prf b/mkspecs/features/mac/default_pre.prf
+index 0cc8cd6..5df99d1 100644
+--- old/qtbase/mkspecs/features/mac/default_pre.prf
++++ new/qtbase/mkspecs/features/mac/default_pre.prf
+@@ -12,7 +12,7 @@ isEmpty(QMAKE_XCODE_DEVELOPER_PATH) {
+         error("Xcode is not installed in $${QMAKE_XCODE_DEVELOPER_PATH}. Please use xcode-select to choose Xcode installation path.")
+ 
+     # Make sure Xcode is set up properly
+-    isEmpty($$list($$system("/usr/bin/xcrun -find xcrun 2>/dev/null"))): \
++    isEmpty($$list($$system("/usr/bin/xcrun -find xcodebuild 2>/dev/null"))): \
+         error("Xcode not set up properly. You may need to confirm the license agreement by running /usr/bin/xcodebuild.")
+ }
+ 
+-- 

From 4731cab8fbff51a8178c85d572e2482040278616 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pavel=20Jan=C3=ADk?= <Pavel@Janik.cz>
Date: Fri, 2 Sep 2016 18:19:01 +0200
Subject: [PATCH 0948/1802] Do not shadow variables

---
 src/bloom.cpp             |  8 +++----
 src/key.cpp               |  6 ++---
 src/main.cpp              | 28 ++++++++++++------------
 src/pubkey.cpp            |  6 ++---
 src/pubkey.h              |  4 ++--
 src/reverselock.h         |  6 ++---
 src/rpc/blockchain.cpp    |  8 +++----
 src/rpc/mining.cpp        |  4 ++--
 src/support/pagelocker.h  |  6 ++---
 src/test/crypto_tests.cpp | 20 ++++++++---------
 src/test/net_tests.cpp    |  4 ++--
 src/test/script_tests.cpp |  8 +++----
 src/torcontrol.cpp        | 46 +++++++++++++++++++--------------------
 src/txmempool.cpp         |  8 +++----
 src/wallet/wallet.cpp     | 16 +++++++-------
 15 files changed, 89 insertions(+), 89 deletions(-)

diff --git a/src/bloom.cpp b/src/bloom.cpp
index fd328e8e96e53..2677652ada2ce 100644
--- a/src/bloom.cpp
+++ b/src/bloom.cpp
@@ -280,8 +280,8 @@ void CRollingBloomFilter::insert(const std::vector<unsigned char>& vKey)
 
 void CRollingBloomFilter::insert(const uint256& hash)
 {
-    vector<unsigned char> data(hash.begin(), hash.end());
-    insert(data);
+    vector<unsigned char> vData(hash.begin(), hash.end());
+    insert(vData);
 }
 
 bool CRollingBloomFilter::contains(const std::vector<unsigned char>& vKey) const
@@ -300,8 +300,8 @@ bool CRollingBloomFilter::contains(const std::vector<unsigned char>& vKey) const
 
 bool CRollingBloomFilter::contains(const uint256& hash) const
 {
-    vector<unsigned char> data(hash.begin(), hash.end());
-    return contains(data);
+    vector<unsigned char> vData(hash.begin(), hash.end());
+    return contains(vData);
 }
 
 void CRollingBloomFilter::reset()
diff --git a/src/key.cpp b/src/key.cpp
index 79023566c3e61..aae9b042ac6db 100644
--- a/src/key.cpp
+++ b/src/key.cpp
@@ -243,12 +243,12 @@ bool CKey::Derive(CKey& keyChild, ChainCode &ccChild, unsigned int nChild, const
     return ret;
 }
 
-bool CExtKey::Derive(CExtKey &out, unsigned int nChild) const {
+bool CExtKey::Derive(CExtKey &out, unsigned int _nChild) const {
     out.nDepth = nDepth + 1;
     CKeyID id = key.GetPubKey().GetID();
     memcpy(&out.vchFingerprint[0], &id, 4);
-    out.nChild = nChild;
-    return key.Derive(out.key, out.chaincode, nChild, chaincode);
+    out.nChild = _nChild;
+    return key.Derive(out.key, out.chaincode, _nChild, chaincode);
 }
 
 void CExtKey::SetMaster(const unsigned char *seed, unsigned int nSeedLen) {
diff --git a/src/main.cpp b/src/main.cpp
index 60bda426a67df..c33b41ac4eb75 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1185,9 +1185,9 @@ bool AcceptToMemoryPoolWorker(CTxMemPool& pool, CValidationState& state, const C
                 bool fReplacementOptOut = true;
                 if (fEnableReplacement)
                 {
-                    BOOST_FOREACH(const CTxIn &txin, ptxConflicting->vin)
+                    BOOST_FOREACH(const CTxIn &_txin, ptxConflicting->vin)
                     {
-                        if (txin.nSequence < std::numeric_limits<unsigned int>::max()-1)
+                        if (_txin.nSequence < std::numeric_limits<unsigned int>::max()-1)
                         {
                             fReplacementOptOut = false;
                             break;
@@ -2499,14 +2499,14 @@ bool ConnectBlock(const CBlock& block, CValidationState& state, CBlockIndex* pin
     if (pindex->GetUndoPos().IsNull() || !pindex->IsValid(BLOCK_VALID_SCRIPTS))
     {
         if (pindex->GetUndoPos().IsNull()) {
-            CDiskBlockPos pos;
-            if (!FindUndoPos(state, pindex->nFile, pos, ::GetSerializeSize(blockundo, SER_DISK, CLIENT_VERSION) + 40))
+            CDiskBlockPos _pos;
+            if (!FindUndoPos(state, pindex->nFile, _pos, ::GetSerializeSize(blockundo, SER_DISK, CLIENT_VERSION) + 40))
                 return error("ConnectBlock(): FindUndoPos failed");
-            if (!UndoWriteToDisk(blockundo, pos, pindex->pprev->GetBlockHash(), chainparams.MessageStart()))
+            if (!UndoWriteToDisk(blockundo, _pos, pindex->pprev->GetBlockHash(), chainparams.MessageStart()))
                 return AbortNode(state, "Failed to write undo data");
 
             // update nUndoPos in block index
-            pindex->nUndoPos = pos.nPos;
+            pindex->nUndoPos = _pos.nPos;
             pindex->nStatus |= BLOCK_HAVE_UNDO;
         }
 
@@ -3819,10 +3819,10 @@ void PruneOneBlockFile(const int fileNumber)
             // mapBlocksUnlinked or setBlockIndexCandidates.
             std::pair<std::multimap<CBlockIndex*, CBlockIndex*>::iterator, std::multimap<CBlockIndex*, CBlockIndex*>::iterator> range = mapBlocksUnlinked.equal_range(pindex->pprev);
             while (range.first != range.second) {
-                std::multimap<CBlockIndex *, CBlockIndex *>::iterator it = range.first;
+                std::multimap<CBlockIndex *, CBlockIndex *>::iterator _it = range.first;
                 range.first++;
-                if (it->second == pindex) {
-                    mapBlocksUnlinked.erase(it);
+                if (_it->second == pindex) {
+                    mapBlocksUnlinked.erase(_it);
                 }
             }
         }
@@ -5550,9 +5550,9 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
             }
             if (!fRejectedParents) {
                 BOOST_FOREACH(const CTxIn& txin, tx.vin) {
-                    CInv inv(MSG_TX, txin.prevout.hash);
-                    pfrom->AddInventoryKnown(inv);
-                    if (!AlreadyHave(inv)) pfrom->AskFor(inv);
+                    CInv _inv(MSG_TX, txin.prevout.hash);
+                    pfrom->AddInventoryKnown(_inv);
+                    if (!AlreadyHave(_inv)) pfrom->AskFor(_inv);
                 }
                 AddOrphanTx(tx, pfrom->GetId());
 
@@ -6317,9 +6317,9 @@ class CompareInvMempoolOrder
 {
     CTxMemPool *mp;
 public:
-    CompareInvMempoolOrder(CTxMemPool *mempool)
+    CompareInvMempoolOrder(CTxMemPool *_mempool)
     {
-        mp = mempool;
+        mp = _mempool;
     }
 
     bool operator()(std::set<uint256>::iterator a, std::set<uint256>::iterator b)
diff --git a/src/pubkey.cpp b/src/pubkey.cpp
index be4ee27cd48d5..91a657593a4a6 100644
--- a/src/pubkey.cpp
+++ b/src/pubkey.cpp
@@ -264,12 +264,12 @@ void CExtPubKey::Decode(const unsigned char code[BIP32_EXTKEY_SIZE]) {
     pubkey.Set(code+41, code+BIP32_EXTKEY_SIZE);
 }
 
-bool CExtPubKey::Derive(CExtPubKey &out, unsigned int nChild) const {
+bool CExtPubKey::Derive(CExtPubKey &out, unsigned int _nChild) const {
     out.nDepth = nDepth + 1;
     CKeyID id = pubkey.GetID();
     memcpy(&out.vchFingerprint[0], &id, 4);
-    out.nChild = nChild;
-    return pubkey.Derive(out.pubkey, out.chaincode, nChild, chaincode);
+    out.nChild = _nChild;
+    return pubkey.Derive(out.pubkey, out.chaincode, _nChild, chaincode);
 }
 
 /* static */ bool CPubKey::CheckLowS(const std::vector<unsigned char>& vchSig) {
diff --git a/src/pubkey.h b/src/pubkey.h
index aebfdbc826628..3a554877f8000 100644
--- a/src/pubkey.h
+++ b/src/pubkey.h
@@ -88,9 +88,9 @@ class CPubKey
     }
 
     //! Construct a public key from a byte vector.
-    CPubKey(const std::vector<unsigned char>& vch)
+    CPubKey(const std::vector<unsigned char>& _vch)
     {
-        Set(vch.begin(), vch.end());
+        Set(_vch.begin(), _vch.end());
     }
 
     //! Simple read-only vector-like interface to the pubkey data.
diff --git a/src/reverselock.h b/src/reverselock.h
index fac1ccb7931ad..1fd8de5d80747 100644
--- a/src/reverselock.h
+++ b/src/reverselock.h
@@ -13,9 +13,9 @@ class reverse_lock
 {
 public:
 
-    explicit reverse_lock(Lock& lock) : lock(lock) {
-        lock.unlock();
-        lock.swap(templock);
+    explicit reverse_lock(Lock& _lock) : lock(_lock) {
+        _lock.unlock();
+        _lock.swap(templock);
     }
 
     ~reverse_lock() {
diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp
index f05f8ff3587ad..91d3197cd0a26 100644
--- a/src/rpc/blockchain.cpp
+++ b/src/rpc/blockchain.cpp
@@ -497,10 +497,10 @@ UniValue getmempoolancestors(const UniValue& params, bool fHelp)
         UniValue o(UniValue::VOBJ);
         BOOST_FOREACH(CTxMemPool::txiter ancestorIt, setAncestors) {
             const CTxMemPoolEntry &e = *ancestorIt;
-            const uint256& hash = e.GetTx().GetHash();
+            const uint256& _hash = e.GetTx().GetHash();
             UniValue info(UniValue::VOBJ);
             entryToJSON(info, e);
-            o.push_back(Pair(hash.ToString(), info));
+            o.push_back(Pair(_hash.ToString(), info));
         }
         return o;
     }
@@ -561,10 +561,10 @@ UniValue getmempooldescendants(const UniValue& params, bool fHelp)
         UniValue o(UniValue::VOBJ);
         BOOST_FOREACH(CTxMemPool::txiter descendantIt, setDescendants) {
             const CTxMemPoolEntry &e = *descendantIt;
-            const uint256& hash = e.GetTx().GetHash();
+            const uint256& _hash = e.GetTx().GetHash();
             UniValue info(UniValue::VOBJ);
             entryToJSON(info, e);
-            o.push_back(Pair(hash.ToString(), info));
+            o.push_back(Pair(_hash.ToString(), info));
         }
         return o;
     }
diff --git a/src/rpc/mining.cpp b/src/rpc/mining.cpp
index 7794ac619d212..6b13aa5bab02a 100644
--- a/src/rpc/mining.cpp
+++ b/src/rpc/mining.cpp
@@ -607,8 +607,8 @@ UniValue getblocktemplate(const UniValue& params, bool fHelp)
 
     UniValue aRules(UniValue::VARR);
     UniValue vbavailable(UniValue::VOBJ);
-    for (int i = 0; i < (int)Consensus::MAX_VERSION_BITS_DEPLOYMENTS; ++i) {
-        Consensus::DeploymentPos pos = Consensus::DeploymentPos(i);
+    for (int j = 0; j < (int)Consensus::MAX_VERSION_BITS_DEPLOYMENTS; ++j) {
+        Consensus::DeploymentPos pos = Consensus::DeploymentPos(j);
         ThresholdState state = VersionBitsState(pindexPrev, consensusParams, pos, versionbitscache);
         switch (state) {
             case THRESHOLD_DEFINED:
diff --git a/src/support/pagelocker.h b/src/support/pagelocker.h
index 6b3979e5513b1..538bf39453e39 100644
--- a/src/support/pagelocker.h
+++ b/src/support/pagelocker.h
@@ -28,11 +28,11 @@ template <class Locker>
 class LockedPageManagerBase
 {
 public:
-    LockedPageManagerBase(size_t page_size) : page_size(page_size)
+    LockedPageManagerBase(size_t _page_size) : page_size(_page_size)
     {
         // Determine bitmask for extracting page from address
-        assert(!(page_size & (page_size - 1))); // size must be power of two
-        page_mask = ~(page_size - 1);
+        assert(!(_page_size & (_page_size - 1))); // size must be power of two
+        page_mask = ~(_page_size - 1);
     }
 
     ~LockedPageManagerBase()
diff --git a/src/test/crypto_tests.cpp b/src/test/crypto_tests.cpp
index 58a62ee02262d..ff0adae1d22b7 100644
--- a/src/test/crypto_tests.cpp
+++ b/src/test/crypto_tests.cpp
@@ -133,13 +133,13 @@ void TestAES128CBC(const std::string &hexkey, const std::string &hexiv, bool pad
     {
         std::vector<unsigned char> sub(i, in.end());
         std::vector<unsigned char> subout(sub.size() + AES_BLOCKSIZE);
-        int size = enc.Encrypt(&sub[0], sub.size(), &subout[0]);
-        if (size != 0)
+        int _size = enc.Encrypt(&sub[0], sub.size(), &subout[0]);
+        if (_size != 0)
         {
-            subout.resize(size);
+            subout.resize(_size);
             std::vector<unsigned char> subdecrypted(subout.size());
-            size = dec.Decrypt(&subout[0], subout.size(), &subdecrypted[0]);
-            subdecrypted.resize(size);
+            _size = dec.Decrypt(&subout[0], subout.size(), &subdecrypted[0]);
+            subdecrypted.resize(_size);
             BOOST_CHECK(decrypted.size() == in.size());
             BOOST_CHECK_MESSAGE(subdecrypted == sub, HexStr(subdecrypted) + std::string(" != ") + HexStr(sub));
         }
@@ -174,13 +174,13 @@ void TestAES256CBC(const std::string &hexkey, const std::string &hexiv, bool pad
     {
         std::vector<unsigned char> sub(i, in.end());
         std::vector<unsigned char> subout(sub.size() + AES_BLOCKSIZE);
-        int size = enc.Encrypt(&sub[0], sub.size(), &subout[0]);
-        if (size != 0)
+        int _size = enc.Encrypt(&sub[0], sub.size(), &subout[0]);
+        if (_size != 0)
         {
-            subout.resize(size);
+            subout.resize(_size);
             std::vector<unsigned char> subdecrypted(subout.size());
-            size = dec.Decrypt(&subout[0], subout.size(), &subdecrypted[0]);
-            subdecrypted.resize(size);
+            _size = dec.Decrypt(&subout[0], subout.size(), &subdecrypted[0]);
+            subdecrypted.resize(_size);
             BOOST_CHECK(decrypted.size() == in.size());
             BOOST_CHECK_MESSAGE(subdecrypted == sub, HexStr(subdecrypted) + std::string(" != ") + HexStr(sub));
         }
diff --git a/src/test/net_tests.cpp b/src/test/net_tests.cpp
index 680708533e475..4a7d6e778f5dc 100644
--- a/src/test/net_tests.cpp
+++ b/src/test/net_tests.cpp
@@ -62,11 +62,11 @@ class CAddrManCorrupted : public CAddrManSerializationMock
     }
 };
 
-CDataStream AddrmanToStream(CAddrManSerializationMock& addrman)
+CDataStream AddrmanToStream(CAddrManSerializationMock& _addrman)
 {
     CDataStream ssPeersIn(SER_DISK, CLIENT_VERSION);
     ssPeersIn << FLATDATA(Params().MessageStart());
-    ssPeersIn << addrman;
+    ssPeersIn << _addrman;
     std::string str = ssPeersIn.str();
     vector<unsigned char> vchData(str.begin(), str.end());
     return CDataStream(vchData, SER_DISK, CLIENT_VERSION);
diff --git a/src/test/script_tests.cpp b/src/test/script_tests.cpp
index 5a9aaf9bc0738..dad82baed5cda 100644
--- a/src/test/script_tests.cpp
+++ b/src/test/script_tests.cpp
@@ -323,10 +323,10 @@ class TestBuilder
         return *this;
     }
 
-    TestBuilder& Add(const CScript& script)
+    TestBuilder& Add(const CScript& _script)
     {
         DoPush();
-        spendTx.vin[0].scriptSig += script;
+        spendTx.vin[0].scriptSig += _script;
         return *this;
     }
 
@@ -343,8 +343,8 @@ class TestBuilder
         return *this;
     }
 
-    TestBuilder& Push(const CScript& script) {
-         DoPush(std::vector<unsigned char>(script.begin(), script.end()));
+    TestBuilder& Push(const CScript& _script) {
+         DoPush(std::vector<unsigned char>(_script.begin(), _script.end()));
         return *this;
     }
 
diff --git a/src/torcontrol.cpp b/src/torcontrol.cpp
index 99c45d489cb21..1ca6b4656661e 100644
--- a/src/torcontrol.cpp
+++ b/src/torcontrol.cpp
@@ -122,8 +122,8 @@ class TorControlConnection
     static void eventcb(struct bufferevent *bev, short what, void *ctx);
 };
 
-TorControlConnection::TorControlConnection(struct event_base *base):
-    base(base), b_conn(0)
+TorControlConnection::TorControlConnection(struct event_base *_base):
+    base(_base), b_conn(0)
 {
 }
 
@@ -194,7 +194,7 @@ void TorControlConnection::eventcb(struct bufferevent *bev, short what, void *ct
     }
 }
 
-bool TorControlConnection::Connect(const std::string &target, const ConnectionCB& connected, const ConnectionCB& disconnected)
+bool TorControlConnection::Connect(const std::string &target, const ConnectionCB& _connected, const ConnectionCB&  _disconnected)
 {
     if (b_conn)
         Disconnect();
@@ -213,8 +213,8 @@ bool TorControlConnection::Connect(const std::string &target, const ConnectionCB
         return false;
     bufferevent_setcb(b_conn, TorControlConnection::readcb, NULL, TorControlConnection::eventcb, this);
     bufferevent_enable(b_conn, EV_READ|EV_WRITE);
-    this->connected = connected;
-    this->disconnected = disconnected;
+    this->connected = _connected;
+    this->disconnected = _disconnected;
 
     // Finally, connect to target
     if (bufferevent_socket_connect(b_conn, (struct sockaddr*)&connect_to_addr, connect_to_addrlen) < 0) {
@@ -394,18 +394,18 @@ class TorController
     static void reconnect_cb(evutil_socket_t fd, short what, void *arg);
 };
 
-TorController::TorController(struct event_base* baseIn, const std::string& target):
-    base(baseIn),
-    target(target), conn(base), reconnect(true), reconnect_ev(0),
+TorController::TorController(struct event_base* _base, const std::string& _target):
+    base(_base),
+    target(_target), conn(base), reconnect(true), reconnect_ev(0),
     reconnect_timeout(RECONNECT_TIMEOUT_START)
 {
     reconnect_ev = event_new(base, -1, 0, reconnect_cb, this);
     if (!reconnect_ev)
         LogPrintf("tor: Failed to create event for reconnection: out of memory?\n");
     // Start connection attempts immediately
-    if (!conn.Connect(target, boost::bind(&TorController::connected_cb, this, _1),
+    if (!conn.Connect(_target, boost::bind(&TorController::connected_cb, this, _1),
          boost::bind(&TorController::disconnected_cb, this, _1) )) {
-        LogPrintf("tor: Initiating connection to Tor control port %s failed\n", target);
+        LogPrintf("tor: Initiating connection to Tor control port %s failed\n", _target);
     }
     // Read service private key if cached
     std::pair<bool,std::string> pkf = ReadBinaryFile(GetPrivateKeyFile());
@@ -426,7 +426,7 @@ TorController::~TorController()
     }
 }
 
-void TorController::add_onion_cb(TorControlConnection& conn, const TorControlReply& reply)
+void TorController::add_onion_cb(TorControlConnection& _conn, const TorControlReply& reply)
 {
     if (reply.code == 250) {
         LogPrint("tor", "tor: ADD_ONION successful\n");
@@ -454,7 +454,7 @@ void TorController::add_onion_cb(TorControlConnection& conn, const TorControlRep
     }
 }
 
-void TorController::auth_cb(TorControlConnection& conn, const TorControlReply& reply)
+void TorController::auth_cb(TorControlConnection& _conn, const TorControlReply& reply)
 {
     if (reply.code == 250) {
         LogPrint("tor", "tor: Authentication successful\n");
@@ -474,7 +474,7 @@ void TorController::auth_cb(TorControlConnection& conn, const TorControlReply& r
         // Request hidden service, redirect port.
         // Note that the 'virtual' port doesn't have to be the same as our internal port, but this is just a convenient
         // choice.  TODO; refactor the shutdown sequence some day.
-        conn.Command(strprintf("ADD_ONION %s Port=%i,127.0.0.1:%i", private_key, GetListenPort(), GetListenPort()),
+        _conn.Command(strprintf("ADD_ONION %s Port=%i,127.0.0.1:%i", private_key, GetListenPort(), GetListenPort()),
             boost::bind(&TorController::add_onion_cb, this, _1, _2));
     } else {
         LogPrintf("tor: Authentication failed\n");
@@ -508,7 +508,7 @@ static std::vector<uint8_t> ComputeResponse(const std::string &key, const std::v
     return computedHash;
 }
 
-void TorController::authchallenge_cb(TorControlConnection& conn, const TorControlReply& reply)
+void TorController::authchallenge_cb(TorControlConnection& _conn, const TorControlReply& reply)
 {
     if (reply.code == 250) {
         LogPrint("tor", "tor: SAFECOOKIE authentication challenge successful\n");
@@ -530,7 +530,7 @@ void TorController::authchallenge_cb(TorControlConnection& conn, const TorContro
             }
 
             std::vector<uint8_t> computedClientHash = ComputeResponse(TOR_SAFE_CLIENTKEY, cookie, clientNonce, serverNonce);
-            conn.Command("AUTHENTICATE " + HexStr(computedClientHash), boost::bind(&TorController::auth_cb, this, _1, _2));
+            _conn.Command("AUTHENTICATE " + HexStr(computedClientHash), boost::bind(&TorController::auth_cb, this, _1, _2));
         } else {
             LogPrintf("tor: Invalid reply to AUTHCHALLENGE\n");
         }
@@ -539,7 +539,7 @@ void TorController::authchallenge_cb(TorControlConnection& conn, const TorContro
     }
 }
 
-void TorController::protocolinfo_cb(TorControlConnection& conn, const TorControlReply& reply)
+void TorController::protocolinfo_cb(TorControlConnection& _conn, const TorControlReply& reply)
 {
     if (reply.code == 250) {
         std::set<std::string> methods;
@@ -579,23 +579,23 @@ void TorController::protocolinfo_cb(TorControlConnection& conn, const TorControl
             if (methods.count("HASHEDPASSWORD")) {
                 LogPrint("tor", "tor: Using HASHEDPASSWORD authentication\n");
                 boost::replace_all(torpassword, "\"", "\\\"");
-                conn.Command("AUTHENTICATE \"" + torpassword + "\"", boost::bind(&TorController::auth_cb, this, _1, _2));
+                _conn.Command("AUTHENTICATE \"" + torpassword + "\"", boost::bind(&TorController::auth_cb, this, _1, _2));
             } else {
                 LogPrintf("tor: Password provided with -torpassword, but HASHEDPASSWORD authentication is not available\n");
             }
         } else if (methods.count("NULL")) {
             LogPrint("tor", "tor: Using NULL authentication\n");
-            conn.Command("AUTHENTICATE", boost::bind(&TorController::auth_cb, this, _1, _2));
+            _conn.Command("AUTHENTICATE", boost::bind(&TorController::auth_cb, this, _1, _2));
         } else if (methods.count("SAFECOOKIE")) {
             // Cookie: hexdump -e '32/1 "%02x""\n"'  ~/.tor/control_auth_cookie
             LogPrint("tor", "tor: Using SAFECOOKIE authentication, reading cookie authentication from %s\n", cookiefile);
             std::pair<bool,std::string> status_cookie = ReadBinaryFile(cookiefile, TOR_COOKIE_SIZE);
             if (status_cookie.first && status_cookie.second.size() == TOR_COOKIE_SIZE) {
-                // conn.Command("AUTHENTICATE " + HexStr(status_cookie.second), boost::bind(&TorController::auth_cb, this, _1, _2));
+                // _conn.Command("AUTHENTICATE " + HexStr(status_cookie.second), boost::bind(&TorController::auth_cb, this, _1, _2));
                 cookie = std::vector<uint8_t>(status_cookie.second.begin(), status_cookie.second.end());
                 clientNonce = std::vector<uint8_t>(TOR_NONCE_SIZE, 0);
                 GetRandBytes(&clientNonce[0], TOR_NONCE_SIZE);
-                conn.Command("AUTHCHALLENGE SAFECOOKIE " + HexStr(clientNonce), boost::bind(&TorController::authchallenge_cb, this, _1, _2));
+                _conn.Command("AUTHCHALLENGE SAFECOOKIE " + HexStr(clientNonce), boost::bind(&TorController::authchallenge_cb, this, _1, _2));
             } else {
                 if (status_cookie.first) {
                     LogPrintf("tor: Authentication cookie %s is not exactly %i bytes, as is required by the spec\n", cookiefile, TOR_COOKIE_SIZE);
@@ -613,15 +613,15 @@ void TorController::protocolinfo_cb(TorControlConnection& conn, const TorControl
     }
 }
 
-void TorController::connected_cb(TorControlConnection& conn)
+void TorController::connected_cb(TorControlConnection& _conn)
 {
     reconnect_timeout = RECONNECT_TIMEOUT_START;
     // First send a PROTOCOLINFO command to figure out what authentication is expected
-    if (!conn.Command("PROTOCOLINFO 1", boost::bind(&TorController::protocolinfo_cb, this, _1, _2)))
+    if (!_conn.Command("PROTOCOLINFO 1", boost::bind(&TorController::protocolinfo_cb, this, _1, _2)))
         LogPrintf("tor: Error sending initial protocolinfo command\n");
 }
 
-void TorController::disconnected_cb(TorControlConnection& conn)
+void TorController::disconnected_cb(TorControlConnection& _conn)
 {
     // Stop advertising service when disconnected
     if (service.IsValid())
diff --git a/src/txmempool.cpp b/src/txmempool.cpp
index 0a00d757a225a..3586123d3e00d 100644
--- a/src/txmempool.cpp
+++ b/src/txmempool.cpp
@@ -1116,8 +1116,8 @@ void CTxMemPool::TrimToSize(size_t sizelimit, std::vector<uint256>* pvNoSpendsRe
         std::vector<CTransaction> txn;
         if (pvNoSpendsRemaining) {
             txn.reserve(stage.size());
-            BOOST_FOREACH(txiter it, stage)
-                txn.push_back(it->GetTx());
+            BOOST_FOREACH(txiter iter, stage)
+                txn.push_back(iter->GetTx());
         }
         RemoveStaged(stage, false);
         if (pvNoSpendsRemaining) {
@@ -1125,8 +1125,8 @@ void CTxMemPool::TrimToSize(size_t sizelimit, std::vector<uint256>* pvNoSpendsRe
                 BOOST_FOREACH(const CTxIn& txin, tx.vin) {
                     if (exists(txin.prevout.hash))
                         continue;
-                    auto it = mapNextTx.lower_bound(COutPoint(txin.prevout.hash, 0));
-                    if (it == mapNextTx.end() || it->first->hash != txin.prevout.hash)
+                    auto iter = mapNextTx.lower_bound(COutPoint(txin.prevout.hash, 0));
+                    if (iter == mapNextTx.end() || iter->first->hash != txin.prevout.hash)
                         pvNoSpendsRemaining->push_back(txin.prevout.hash);
                 }
             }
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index 50d63182ae181..85219c24c8d78 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -401,8 +401,8 @@ set<uint256> CWallet::GetConflicts(const uint256& txid) const
         if (mapTxSpends.count(txin.prevout) <= 1)
             continue;  // No conflict if zero or one spends
         range = mapTxSpends.equal_range(txin.prevout);
-        for (TxSpends::const_iterator it = range.first; it != range.second; ++it)
-            result.insert(it->second);
+        for (TxSpends::const_iterator _it = range.first; _it != range.second; ++_it)
+            result.insert(_it->second);
     }
     return result;
 }
@@ -1281,9 +1281,9 @@ int CWalletTx::GetRequestCount() const
                 // How about the block it's in?
                 if (nRequests == 0 && !hashUnset())
                 {
-                    map<uint256, int>::const_iterator mi = pwallet->mapRequestCount.find(hashBlock);
-                    if (mi != pwallet->mapRequestCount.end())
-                        nRequests = (*mi).second;
+                    map<uint256, int>::const_iterator _mi = pwallet->mapRequestCount.find(hashBlock);
+                    if (_mi != pwallet->mapRequestCount.end())
+                        nRequests = (*_mi).second;
                     else
                         nRequests = 1; // If it's in someone else's block it must have got out
                 }
@@ -2938,17 +2938,17 @@ set< set<CTxDestination> > CWallet::GetAddressGroupings()
 
     set< set<CTxDestination>* > uniqueGroupings; // a set of pointers to groups of addresses
     map< CTxDestination, set<CTxDestination>* > setmap;  // map addresses to the unique group containing it
-    BOOST_FOREACH(set<CTxDestination> grouping, groupings)
+    BOOST_FOREACH(set<CTxDestination> _grouping, groupings)
     {
         // make a set of all the groups hit by this new group
         set< set<CTxDestination>* > hits;
         map< CTxDestination, set<CTxDestination>* >::iterator it;
-        BOOST_FOREACH(CTxDestination address, grouping)
+        BOOST_FOREACH(CTxDestination address, _grouping)
             if ((it = setmap.find(address)) != setmap.end())
                 hits.insert((*it).second);
 
         // merge all hit groups into a new single group and delete old groups
-        set<CTxDestination>* merged = new set<CTxDestination>(grouping);
+        set<CTxDestination>* merged = new set<CTxDestination>(_grouping);
         BOOST_FOREACH(set<CTxDestination>* hit, hits)
         {
             merged->insert(hit->begin(), hit->end());

From ac01ff22bed73993261983b355c7cb3e2f3cb7cf Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Tue, 27 Sep 2016 15:03:12 +0200
Subject: [PATCH 0949/1802] doc: Add privacy recommendation when running hidden
 service

---
 doc/tor.md | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/doc/tor.md b/doc/tor.md
index 79f1563021094..2f376af4c7a7f 100644
--- a/doc/tor.md
+++ b/doc/tor.md
@@ -113,4 +113,13 @@ the user running bitcoind to the same group and setting permissions appropriatel
 Debian-based systems the user running bitcoind can be added to the debian-tor group, 
 which has the appropriate permissions. An alternative authentication method is the use 
 of the `-torpassword` flag and a `hash-password` which can be enabled and specified in 
-Tor configuration.
\ No newline at end of file
+Tor configuration.
+
+4. Privacy recommendations
+---------------------------
+
+- Do not add anything but bitcoin ports to the hidden service created in section 2.
+  If you run a web service too, create a new hidden service for that.
+  Otherwise it is trivial to link them, which may reduce privacy. Hidden
+  services created automatically (as in section 3) always have only one port
+  open.

From e41bd449ab2b8d01260795383af2c40b659d8587 Mon Sep 17 00:00:00 2001
From: Johnson Lau <jl2012@users.noreply.github.com>
Date: Thu, 22 Sep 2016 15:06:54 +0800
Subject: [PATCH 0950/1802] Add policy: null signature for failed
 CHECK(MULTI)SIG

---
 src/policy/policy.h             |  1 +
 src/script/interpreter.cpp      | 14 +++++++++++++-
 src/script/interpreter.h        |  4 ++++
 src/script/script_error.cpp     |  2 ++
 src/script/script_error.h       |  1 +
 src/test/data/script_tests.json | 33 ++++++++++++++++++++++++++++++++-
 src/test/script_tests.cpp       |  1 +
 src/test/transaction_tests.cpp  |  1 +
 8 files changed, 55 insertions(+), 2 deletions(-)

diff --git a/src/policy/policy.h b/src/policy/policy.h
index 458ec4a0cb4aa..9d6ff1233b6aa 100644
--- a/src/policy/policy.h
+++ b/src/policy/policy.h
@@ -43,6 +43,7 @@ static const unsigned int STANDARD_SCRIPT_VERIFY_FLAGS = MANDATORY_SCRIPT_VERIFY
                                                          SCRIPT_VERIFY_DISCOURAGE_UPGRADABLE_NOPS |
                                                          SCRIPT_VERIFY_CLEANSTACK |
                                                          SCRIPT_VERIFY_MINIMALIF |
+                                                         SCRIPT_VERIFY_NULLFAIL |
                                                          SCRIPT_VERIFY_CHECKLOCKTIMEVERIFY |
                                                          SCRIPT_VERIFY_CHECKSEQUENCEVERIFY |
                                                          SCRIPT_VERIFY_LOW_S |
diff --git a/src/script/interpreter.cpp b/src/script/interpreter.cpp
index fd356fed0ab43..41756ea71196d 100644
--- a/src/script/interpreter.cpp
+++ b/src/script/interpreter.cpp
@@ -885,6 +885,9 @@ bool EvalScript(vector<vector<unsigned char> >& stack, const CScript& script, un
                     }
                     bool fSuccess = checker.CheckSig(vchSig, vchPubKey, scriptCode, sigversion);
 
+                    if (!fSuccess && (flags & SCRIPT_VERIFY_NULLFAIL) && vchSig.size())
+                        return set_error(serror, SCRIPT_ERR_SIG_NULLFAIL);
+
                     popstack(stack);
                     popstack(stack);
                     stack.push_back(fSuccess ? vchTrue : vchFalse);
@@ -914,6 +917,9 @@ bool EvalScript(vector<vector<unsigned char> >& stack, const CScript& script, un
                     if (nOpCount > MAX_OPS_PER_SCRIPT)
                         return set_error(serror, SCRIPT_ERR_OP_COUNT);
                     int ikey = ++i;
+                    // ikey2 is the position of last non-signature item in the stack. Top stack item = 1.
+                    // With SCRIPT_VERIFY_NULLFAIL, this is used for cleanup if operation fails.
+                    int ikey2 = nKeysCount + 2;
                     i += nKeysCount;
                     if ((int)stack.size() < i)
                         return set_error(serror, SCRIPT_ERR_INVALID_STACK_OPERATION);
@@ -970,8 +976,14 @@ bool EvalScript(vector<vector<unsigned char> >& stack, const CScript& script, un
                     }
 
                     // Clean up stack of actual arguments
-                    while (i-- > 1)
+                    while (i-- > 1) {
+                        // If the operation failed, we require that all signatures must be empty vector
+                        if (!fSuccess && (flags & SCRIPT_VERIFY_NULLFAIL) && !ikey2 && stacktop(-1).size())
+                            return set_error(serror, SCRIPT_ERR_SIG_NULLFAIL);
+                        if (ikey2 > 0)
+                            ikey2--;
                         popstack(stack);
+                    }
 
                     // A bug causes CHECKMULTISIG to consume one extra argument
                     // whose contents were not checked in any way.
diff --git a/src/script/interpreter.h b/src/script/interpreter.h
index 2ce4b23e54f62..0adc9482ffec6 100644
--- a/src/script/interpreter.h
+++ b/src/script/interpreter.h
@@ -98,6 +98,10 @@ enum
     // Segwit script only: Require the argument of OP_IF/NOTIF to be exactly 0x01 or empty vector
     //
     SCRIPT_VERIFY_MINIMALIF = (1U << 13),
+
+    // Signature(s) must be empty vector if an CHECK(MULTI)SIG operation failed
+    //
+    SCRIPT_VERIFY_NULLFAIL = (1U << 14),
 };
 
 bool CheckSignatureEncoding(const std::vector<unsigned char> &vchSig, unsigned int flags, ScriptError* serror);
diff --git a/src/script/script_error.cpp b/src/script/script_error.cpp
index 9969c232fc340..e27b715c2cfea 100644
--- a/src/script/script_error.cpp
+++ b/src/script/script_error.cpp
@@ -65,6 +65,8 @@ const char* ScriptErrorString(const ScriptError serror)
             return "Dummy CHECKMULTISIG argument must be zero";
         case SCRIPT_ERR_MINIMALIF:
             return "OP_IF/NOTIF argument must be minimal";
+        case SCRIPT_ERR_SIG_NULLFAIL:
+            return "Signature must be zero for failed CHECK(MULTI)SIG operation";
         case SCRIPT_ERR_DISCOURAGE_UPGRADABLE_NOPS:
             return "NOPx reserved for soft-fork upgrades";
         case SCRIPT_ERR_DISCOURAGE_UPGRADABLE_WITNESS_PROGRAM:
diff --git a/src/script/script_error.h b/src/script/script_error.h
index 6d34d37925bcf..bccfdb99e23bb 100644
--- a/src/script/script_error.h
+++ b/src/script/script_error.h
@@ -49,6 +49,7 @@ typedef enum ScriptError_t
     SCRIPT_ERR_PUBKEYTYPE,
     SCRIPT_ERR_CLEANSTACK,
     SCRIPT_ERR_MINIMALIF,
+    SCRIPT_ERR_SIG_NULLFAIL,
 
     /* softfork safeness */
     SCRIPT_ERR_DISCOURAGE_UPGRADABLE_NOPS,
diff --git a/src/test/data/script_tests.json b/src/test/data/script_tests.json
index d456a8beffd67..06103ea5bdd66 100644
--- a/src/test/data/script_tests.json
+++ b/src/test/data/script_tests.json
@@ -1491,6 +1491,27 @@
     "OK",
     "BIP66 example 4, with DERSIG"
 ],
+[
+    "0x09 0x300602010102010101",
+    "0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 CHECKSIG NOT",
+    "DERSIG",
+    "OK",
+    "BIP66 example 4, with DERSIG, non-null DER-compliant signature"
+],
+[
+    "0",
+    "0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 CHECKSIG NOT",
+    "DERSIG,NULLFAIL",
+    "OK",
+    "BIP66 example 4, with DERSIG and NULLFAIL"
+],
+[
+    "0x09 0x300602010102010101",
+    "0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 CHECKSIG NOT",
+    "DERSIG,NULLFAIL",
+    "NULLFAIL",
+    "BIP66 example 4, with DERSIG and NULLFAIL, non-null DER-compliant signature"
+],
 [
     "1",
     "0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 CHECKSIG",
@@ -2208,5 +2229,15 @@
 [["645168", 0.00000001], "0x22 0x0020f913eacf2e38a5d6fc3a8311d72ae704cb83866350a984dd3e5eb76d2a8c28e8", "HASH160 0x14 0xdbb7d1c0a56b7a9c423300c8cca6e6e065baf1dc EQUAL", "P2SH,WITNESS", "UNBALANCED_CONDITIONAL"],
 [["645168", 0.00000001], "0x22 0x0020f913eacf2e38a5d6fc3a8311d72ae704cb83866350a984dd3e5eb76d2a8c28e8", "HASH160 0x14 0xdbb7d1c0a56b7a9c423300c8cca6e6e065baf1dc EQUAL", "P2SH,WITNESS,MINIMALIF", "UNBALANCED_CONDITIONAL"],
 
- ["The End"]
+["NULLFAIL should cover all signatures and signatures only"],
+["0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0", "0x01 0x14 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0x01 0x14 CHECKMULTISIG NOT", "DERSIG", "OK", "BIP66 and NULLFAIL-compliant"],
+["0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0", "0x01 0x14 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0x01 0x14 CHECKMULTISIG NOT", "DERSIG,NULLFAIL", "OK", "BIP66 and NULLFAIL-compliant"],
+["1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0", "0x01 0x14 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0x01 0x14 CHECKMULTISIG NOT", "DERSIG,NULLFAIL", "OK", "BIP66 and NULLFAIL-compliant, not NULLDUMMY-compliant"],
+["1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0", "0x01 0x14 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0x01 0x14 CHECKMULTISIG NOT", "DERSIG,NULLFAIL,NULLDUMMY", "SIG_NULLDUMMY", "BIP66 and NULLFAIL-compliant, not NULLDUMMY-compliant"],
+["0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0x09 0x300602010102010101", "0x01 0x14 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0x01 0x14 CHECKMULTISIG NOT", "DERSIG", "OK", "BIP66-compliant but not NULLFAIL-compliant"],
+["0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0x09 0x300602010102010101", "0x01 0x14 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0x01 0x14 CHECKMULTISIG NOT", "DERSIG,NULLFAIL", "NULLFAIL", "BIP66-compliant but not NULLFAIL-compliant"],
+["0 0x09 0x300602010102010101 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0", "0x01 0x14 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0x01 0x14 CHECKMULTISIG NOT", "DERSIG", "OK", "BIP66-compliant but not NULLFAIL-compliant"],
+["0 0x09 0x300602010102010101 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0", "0x01 0x14 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0x01 0x14 CHECKMULTISIG NOT", "DERSIG,NULLFAIL", "NULLFAIL", "BIP66-compliant but not NULLFAIL-compliant"],
+
+["The End"]
 ]
diff --git a/src/test/script_tests.cpp b/src/test/script_tests.cpp
index ee0f14ee5e896..7971b5122ffc9 100644
--- a/src/test/script_tests.cpp
+++ b/src/test/script_tests.cpp
@@ -90,6 +90,7 @@ static ScriptErrorDesc script_errors[]={
     {SCRIPT_ERR_PUBKEYTYPE, "PUBKEYTYPE"},
     {SCRIPT_ERR_CLEANSTACK, "CLEANSTACK"},
     {SCRIPT_ERR_MINIMALIF, "MINIMALIF"},
+    {SCRIPT_ERR_SIG_NULLFAIL, "NULLFAIL"},
     {SCRIPT_ERR_DISCOURAGE_UPGRADABLE_NOPS, "DISCOURAGE_UPGRADABLE_NOPS"},
     {SCRIPT_ERR_DISCOURAGE_UPGRADABLE_WITNESS_PROGRAM, "DISCOURAGE_UPGRADABLE_WITNESS_PROGRAM"},
     {SCRIPT_ERR_WITNESS_PROGRAM_WRONG_LENGTH, "WITNESS_PROGRAM_WRONG_LENGTH"},
diff --git a/src/test/transaction_tests.cpp b/src/test/transaction_tests.cpp
index 165dfd9a3e06b..6163d2f630604 100644
--- a/src/test/transaction_tests.cpp
+++ b/src/test/transaction_tests.cpp
@@ -51,6 +51,7 @@ static std::map<string, unsigned int> mapFlagNames = boost::assign::map_list_of
     (string("DISCOURAGE_UPGRADABLE_NOPS"), (unsigned int)SCRIPT_VERIFY_DISCOURAGE_UPGRADABLE_NOPS)
     (string("CLEANSTACK"), (unsigned int)SCRIPT_VERIFY_CLEANSTACK)
     (string("MINIMALIF"), (unsigned int)SCRIPT_VERIFY_MINIMALIF)
+    (string("NULLFAIL"), (unsigned int)SCRIPT_VERIFY_NULLFAIL)
     (string("CHECKLOCKTIMEVERIFY"), (unsigned int)SCRIPT_VERIFY_CHECKLOCKTIMEVERIFY)
     (string("CHECKSEQUENCEVERIFY"), (unsigned int)SCRIPT_VERIFY_CHECKSEQUENCEVERIFY)
     (string("WITNESS"), (unsigned int)SCRIPT_VERIFY_WITNESS)

From 41e58faf043864a64a6db08a8df527fa5fd1ec5b Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Tue, 27 Sep 2016 14:05:24 +0200
Subject: [PATCH 0951/1802] net: Consistent checksum handling

In principle, the checksums of P2P packets are simply 4-byte blobs which
are the first four bytes of SHA256(SHA256(payload)).

Currently they are handled as little-endian 32-bit integers half of the
time, as blobs the other half, sometimes copying the one to the other,
resulting in somewhat confused code.

This PR changes the handling to be consistent both at packet creation
and receiving, making it (I think) easier to understand.
---
 src/main.cpp     | 9 +++++----
 src/net.cpp      | 6 ++----
 src/protocol.cpp | 4 ++--
 src/protocol.h   | 4 ++--
 4 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index c33b41ac4eb75..ab672197144e6 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -6253,11 +6253,12 @@ bool ProcessMessages(CNode* pfrom, CConnman& connman)
         // Checksum
         CDataStream& vRecv = msg.vRecv;
         uint256 hash = Hash(vRecv.begin(), vRecv.begin() + nMessageSize);
-        unsigned int nChecksum = ReadLE32((unsigned char*)&hash);
-        if (nChecksum != hdr.nChecksum)
+        if (memcmp(hash.begin(), hdr.pchChecksum, CMessageHeader::CHECKSUM_SIZE) != 0)
         {
-            LogPrintf("%s(%s, %u bytes): CHECKSUM ERROR nChecksum=%08x hdr.nChecksum=%08x\n", __func__,
-               SanitizeString(strCommand), nMessageSize, nChecksum, hdr.nChecksum);
+            LogPrintf("%s(%s, %u bytes): CHECKSUM ERROR expected %s was %s\n", __func__,
+               SanitizeString(strCommand), nMessageSize,
+               HexStr(hash.begin(), hash.begin()+CMessageHeader::CHECKSUM_SIZE),
+               HexStr(hdr.pchChecksum, hdr.pchChecksum+CMessageHeader::CHECKSUM_SIZE));
             continue;
         }
 
diff --git a/src/net.cpp b/src/net.cpp
index cce06f2d64cf0..770e2d2959998 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -2661,10 +2661,8 @@ void CNode::EndMessage(const char* pszCommand) UNLOCK_FUNCTION(cs_vSend)
 
     // Set the checksum
     uint256 hash = Hash(ssSend.begin() + CMessageHeader::HEADER_SIZE, ssSend.end());
-    unsigned int nChecksum = 0;
-    memcpy(&nChecksum, &hash, sizeof(nChecksum));
-    assert(ssSend.size () >= CMessageHeader::CHECKSUM_OFFSET + sizeof(nChecksum));
-    memcpy((char*)&ssSend[CMessageHeader::CHECKSUM_OFFSET], &nChecksum, sizeof(nChecksum));
+    assert(ssSend.size () >= CMessageHeader::CHECKSUM_OFFSET + CMessageHeader::CHECKSUM_SIZE);
+    memcpy((char*)&ssSend[CMessageHeader::CHECKSUM_OFFSET], hash.begin(), CMessageHeader::CHECKSUM_SIZE);
 
     LogPrint("net", "(%d bytes) peer=%d\n", nSize, id);
 
diff --git a/src/protocol.cpp b/src/protocol.cpp
index 247c6c212073e..54ad62b1a2a95 100644
--- a/src/protocol.cpp
+++ b/src/protocol.cpp
@@ -79,7 +79,7 @@ CMessageHeader::CMessageHeader(const MessageStartChars& pchMessageStartIn)
     memcpy(pchMessageStart, pchMessageStartIn, MESSAGE_START_SIZE);
     memset(pchCommand, 0, sizeof(pchCommand));
     nMessageSize = -1;
-    nChecksum = 0;
+    memset(pchChecksum, 0, CHECKSUM_SIZE);
 }
 
 CMessageHeader::CMessageHeader(const MessageStartChars& pchMessageStartIn, const char* pszCommand, unsigned int nMessageSizeIn)
@@ -88,7 +88,7 @@ CMessageHeader::CMessageHeader(const MessageStartChars& pchMessageStartIn, const
     memset(pchCommand, 0, sizeof(pchCommand));
     strncpy(pchCommand, pszCommand, COMMAND_SIZE);
     nMessageSize = nMessageSizeIn;
-    nChecksum = 0;
+    memset(pchChecksum, 0, CHECKSUM_SIZE);
 }
 
 std::string CMessageHeader::GetCommand() const
diff --git a/src/protocol.h b/src/protocol.h
index 9b474ec79c8dd..177d74530815c 100644
--- a/src/protocol.h
+++ b/src/protocol.h
@@ -45,7 +45,7 @@ class CMessageHeader
         READWRITE(FLATDATA(pchMessageStart));
         READWRITE(FLATDATA(pchCommand));
         READWRITE(nMessageSize);
-        READWRITE(nChecksum);
+        READWRITE(FLATDATA(pchChecksum));
     }
 
     // TODO: make private (improves encapsulation)
@@ -62,7 +62,7 @@ class CMessageHeader
     char pchMessageStart[MESSAGE_START_SIZE];
     char pchCommand[COMMAND_SIZE];
     unsigned int nMessageSize;
-    unsigned int nChecksum;
+    uint8_t pchChecksum[CHECKSUM_SIZE];
 };
 
 /**

From 305087bdf640a5c0b3eeeb90d33ee255d2456eba Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Wed, 28 Sep 2016 15:33:45 +0200
Subject: [PATCH 0952/1802] net: Hardcode protocol sizes and use fixed-size
 types

The P2P network uses a fixed protocol, these sizes shouldn't change
based on what happens to be the architecture.
---
 src/protocol.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/protocol.h b/src/protocol.h
index 177d74530815c..1bc1c25b3714f 100644
--- a/src/protocol.h
+++ b/src/protocol.h
@@ -52,8 +52,8 @@ class CMessageHeader
 public:
     enum {
         COMMAND_SIZE = 12,
-        MESSAGE_SIZE_SIZE = sizeof(int),
-        CHECKSUM_SIZE = sizeof(int),
+        MESSAGE_SIZE_SIZE = 4,
+        CHECKSUM_SIZE = 4,
 
         MESSAGE_SIZE_OFFSET = MESSAGE_START_SIZE + COMMAND_SIZE,
         CHECKSUM_OFFSET = MESSAGE_SIZE_OFFSET + MESSAGE_SIZE_SIZE,
@@ -61,7 +61,7 @@ class CMessageHeader
     };
     char pchMessageStart[MESSAGE_START_SIZE];
     char pchCommand[COMMAND_SIZE];
-    unsigned int nMessageSize;
+    uint32_t nMessageSize;
     uint8_t pchChecksum[CHECKSUM_SIZE];
 };
 

From 7e5fd7198e3b1fae65e1feec7dae7c0083e28203 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pavel=20Jan=C3=ADk?= <Pavel@Janik.cz>
Date: Wed, 28 Sep 2016 16:40:20 +0200
Subject: [PATCH 0953/1802] Do not include env_win.cc on non-Windows systems

---
 src/Makefile.leveldb.include | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Makefile.leveldb.include b/src/Makefile.leveldb.include
index 4b3cd6364a29b..6f25fd005e78a 100644
--- a/src/Makefile.leveldb.include
+++ b/src/Makefile.leveldb.include
@@ -113,7 +113,6 @@ leveldb_libleveldb_a_SOURCES += leveldb/util/comparator.cc
 leveldb_libleveldb_a_SOURCES += leveldb/util/crc32c.cc
 leveldb_libleveldb_a_SOURCES += leveldb/util/env.cc
 leveldb_libleveldb_a_SOURCES += leveldb/util/env_posix.cc
-leveldb_libleveldb_a_SOURCES += leveldb/util/env_win.cc
 leveldb_libleveldb_a_SOURCES += leveldb/util/filter_policy.cc
 leveldb_libleveldb_a_SOURCES += leveldb/util/hash.cc
 leveldb_libleveldb_a_SOURCES += leveldb/util/histogram.cc

From a0f8482f3e9b07e37c3f1b6fa09683b448810955 Mon Sep 17 00:00:00 2001
From: Suhas Daftuar <sdaftuar@gmail.com>
Date: Wed, 28 Sep 2016 11:08:08 -0400
Subject: [PATCH 0954/1802] [qa] Split up slow RPC calls to avoid pruning test
 timeouts

---
 qa/rpc-tests/pruning.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/qa/rpc-tests/pruning.py b/qa/rpc-tests/pruning.py
index 7cbe69c29b2b9..287dbc776e1b2 100755
--- a/qa/rpc-tests/pruning.py
+++ b/qa/rpc-tests/pruning.py
@@ -157,7 +157,10 @@ def reorg_test(self):
         print("Usage possibly still high bc of stale blocks in block files:", calc_usage(self.prunedir))
 
         print("Mine 220 more blocks so we have requisite history (some blocks will be big and cause pruning of previous chain)")
-        self.nodes[0].generate(220) #node 0 has many large tx's in its mempool from the disconnects
+        for i in range(22):
+            # This can be slow, so do this in multiple RPC calls to avoid
+            # RPC timeouts.
+            self.nodes[0].generate(10) #node 0 has many large tx's in its mempool from the disconnects
         sync_blocks(self.nodes[0:3], timeout=300)
 
         usage = calc_usage(self.prunedir)

From 54e5d7c1b81e1b76f5789abfa2cb1f5963cd9d72 Mon Sep 17 00:00:00 2001
From: jnewbery <john@johnnewbery.com>
Date: Wed, 28 Sep 2016 13:36:36 -0400
Subject: [PATCH 0955/1802] Add bitcoin-tx JSON tests

---
 src/test/data/bitcoin-util-test.json     |  85 ++++++++-
 src/test/data/blanktx.json               |  10 +
 src/test/data/tt-delin1-out.json         | 216 ++++++++++++++++++++++
 src/test/data/tt-delout1-out.json        | 212 +++++++++++++++++++++
 src/test/data/tt-locktime317000-out.json | 225 +++++++++++++++++++++++
 src/test/data/txcreate1.json             |  63 +++++++
 src/test/data/txcreate2.json             |   0
 src/test/data/txcreatedata1.json         |  41 +++++
 src/test/data/txcreatedata2.json         |  41 +++++
 src/test/data/txcreatedata_seq0.json     |  32 ++++
 src/test/data/txcreatedata_seq1.json     |  41 +++++
 src/test/data/txcreatesign.json          |  32 ++++
 12 files changed, 997 insertions(+), 1 deletion(-)
 create mode 100644 src/test/data/blanktx.json
 create mode 100644 src/test/data/tt-delin1-out.json
 create mode 100644 src/test/data/tt-delout1-out.json
 create mode 100644 src/test/data/tt-locktime317000-out.json
 create mode 100644 src/test/data/txcreate1.json
 create mode 100644 src/test/data/txcreate2.json
 create mode 100644 src/test/data/txcreatedata1.json
 create mode 100644 src/test/data/txcreatedata2.json
 create mode 100644 src/test/data/txcreatedata_seq0.json
 create mode 100644 src/test/data/txcreatedata_seq1.json
 create mode 100644 src/test/data/txcreatesign.json

diff --git a/src/test/data/bitcoin-util-test.json b/src/test/data/bitcoin-util-test.json
index 5cb383de85a06..9df61a7e7932e 100644
--- a/src/test/data/bitcoin-util-test.json
+++ b/src/test/data/bitcoin-util-test.json
@@ -1,18 +1,32 @@
 [
-  { "exec": "././bitcoin-tx",
+  { "exec": "./bitcoin-tx",
     "args": ["-create"],
     "output_cmp": "blanktx.hex"
   },
+  { "exec": "./bitcoin-tx",
+    "args": ["-json","-create"],
+    "output_cmp": "blanktx.json"
+  },
   { "exec": "./bitcoin-tx",
     "args": ["-"],
     "input": "blanktx.hex",
     "output_cmp": "blanktx.hex"
   },
+  { "exec": "./bitcoin-tx",
+    "args": ["-json","-"],
+    "input": "blanktx.hex",
+    "output_cmp": "blanktx.json"
+  },
   { "exec": "./bitcoin-tx",
     "args": ["-", "delin=1"],
     "input": "tx394b54bb.hex",
     "output_cmp": "tt-delin1-out.hex"
   },
+  { "exec": "./bitcoin-tx",
+    "args": ["-json", "-", "delin=1"],
+    "input": "tx394b54bb.hex",
+    "output_cmp": "tt-delin1-out.json"
+  },
   { "exec": "./bitcoin-tx",
     "args": ["-", "delin=31"],
     "input": "tx394b54bb.hex",
@@ -23,6 +37,11 @@
     "input": "tx394b54bb.hex",
     "output_cmp": "tt-delout1-out.hex"
   },
+  { "exec": "./bitcoin-tx",
+    "args": ["-json", "-", "delout=1"],
+    "input": "tx394b54bb.hex",
+    "output_cmp": "tt-delout1-out.json"
+  },
   { "exec": "./bitcoin-tx",
     "args": ["-", "delout=2"],
     "input": "tx394b54bb.hex",
@@ -33,6 +52,11 @@
     "input": "tx394b54bb.hex",
     "output_cmp": "tt-locktime317000-out.hex"
   },
+  { "exec": "./bitcoin-tx",
+    "args": ["-json", "-", "locktime=317000"],
+    "input": "tx394b54bb.hex",
+    "output_cmp": "tt-locktime317000-out.json"
+  },
   { "exec": "./bitcoin-tx",
     "args":
     ["-create",
@@ -43,10 +67,25 @@
      "outaddr=4:1P8yWvZW8jVihP1bzHeqfE4aoXNX8AVa46"],
     "output_cmp": "txcreate1.hex"
   },
+  { "exec": "./bitcoin-tx",
+    "args":
+    ["-json",
+     "-create",
+     "in=5897de6bd6027a475eadd57019d4e6872c396d0716c4875a5f1a6fcfdf385c1f:0",
+     "in=bf829c6bcf84579331337659d31f89dfd138f7f7785802d5501c92333145ca7c:18",
+     "in=22a6f904655d53ae2ff70e701a0bbd90aa3975c0f40bfc6cc996a9049e31cdfc:1",
+     "outaddr=0.18:13tuJJDR2RgArmgfv6JScSdreahzgc4T6o",
+     "outaddr=4:1P8yWvZW8jVihP1bzHeqfE4aoXNX8AVa46"],
+    "output_cmp": "txcreate1.json"
+  },
   { "exec": "./bitcoin-tx",
     "args": ["-create", "outscript=0:"],
     "output_cmp": "txcreate2.hex"
   },
+  { "exec": "./bitcoin-tx",
+    "args": ["-json", "-create", "outscript=0:"],
+    "output_cmp": "txcreate2.json"
+  },
   { "exec": "./bitcoin-tx",
     "args":
     ["-create",
@@ -57,6 +96,17 @@
      "outaddr=0.001:193P6LtvS4nCnkDvM9uXn1gsSRqh4aDAz7"],
     "output_cmp": "txcreatesign.hex"
   },
+  { "exec": "./bitcoin-tx",
+    "args":
+    ["-json",
+     "-create",
+     "in=4d49a71ec9da436f71ec4ee231d04f292a29cd316f598bb7068feccabdc59485:0",
+     "set=privatekeys:[\"5HpHagT65TZzG1PH3CSu63k8DbpvD8s5ip4nEB3kEsreAnchuDf\"]",
+     "set=prevtxs:[{\"txid\":\"4d49a71ec9da436f71ec4ee231d04f292a29cd316f598bb7068feccabdc59485\",\"vout\":0,\"scriptPubKey\":\"76a91491b24bf9f5288532960ac687abb035127b1d28a588ac\"}]",
+     "sign=ALL",
+     "outaddr=0.001:193P6LtvS4nCnkDvM9uXn1gsSRqh4aDAz7"],
+    "output_cmp": "txcreatesign.json"
+  },
   { "exec": "./bitcoin-tx",
     "args":
     ["-create",
@@ -79,6 +129,15 @@
      "outdata=4:54686973204f505f52455455524e207472616e73616374696f6e206f7574707574207761732063726561746564206279206d6f646966696564206372656174657261777472616e73616374696f6e2e"],
     "output_cmp": "txcreatedata1.hex"
   },
+  { "exec": "./bitcoin-tx",
+    "args":
+    ["-json",
+     "-create",
+     "in=5897de6bd6027a475eadd57019d4e6872c396d0716c4875a5f1a6fcfdf385c1f:0",
+     "outaddr=0.18:13tuJJDR2RgArmgfv6JScSdreahzgc4T6o",
+     "outdata=4:54686973204f505f52455455524e207472616e73616374696f6e206f7574707574207761732063726561746564206279206d6f646966696564206372656174657261777472616e73616374696f6e2e"],
+    "output_cmp": "txcreatedata1.json"
+  },
   { "exec": "./bitcoin-tx",
     "args":
     ["-create",
@@ -87,6 +146,15 @@
      "outdata=54686973204f505f52455455524e207472616e73616374696f6e206f7574707574207761732063726561746564206279206d6f646966696564206372656174657261777472616e73616374696f6e2e"],
     "output_cmp": "txcreatedata2.hex"
   },
+  { "exec": "./bitcoin-tx",
+    "args":
+    ["-json",
+     "-create",
+     "in=5897de6bd6027a475eadd57019d4e6872c396d0716c4875a5f1a6fcfdf385c1f:0",
+     "outaddr=0.18:13tuJJDR2RgArmgfv6JScSdreahzgc4T6o",
+     "outdata=54686973204f505f52455455524e207472616e73616374696f6e206f7574707574207761732063726561746564206279206d6f646966696564206372656174657261777472616e73616374696f6e2e"],
+    "output_cmp": "txcreatedata2.json"
+  },
   { "exec": "./bitcoin-tx",
     "args":
     ["-create",
@@ -94,10 +162,25 @@
      "outaddr=0.18:13tuJJDR2RgArmgfv6JScSdreahzgc4T6o"],
     "output_cmp": "txcreatedata_seq0.hex"
   },
+  { "exec": "./bitcoin-tx",
+    "args":
+    ["-json",
+     "-create",
+     "in=5897de6bd6027a475eadd57019d4e6872c396d0716c4875a5f1a6fcfdf385c1f:0:4294967293",
+     "outaddr=0.18:13tuJJDR2RgArmgfv6JScSdreahzgc4T6o"],
+    "output_cmp": "txcreatedata_seq0.json"
+  },
   { "exec": "./bitcoin-tx",
     "args":
     ["01000000011f5c38dfcf6f1a5f5a87c416076d392c87e6d41970d5ad5e477a02d66bde97580000000000fdffffff0180a81201000000001976a9141fc11f39be1729bf973a7ab6a615ca4729d6457488ac00000000",
      "in=5897de6bd6027a475eadd57019d4e6872c396d0716c4875a5f1a6fcfdf385c1f:0:1"],
     "output_cmp": "txcreatedata_seq1.hex"
+  },
+  { "exec": "./bitcoin-tx",
+    "args":
+    ["-json",
+     "01000000011f5c38dfcf6f1a5f5a87c416076d392c87e6d41970d5ad5e477a02d66bde97580000000000fdffffff0180a81201000000001976a9141fc11f39be1729bf973a7ab6a615ca4729d6457488ac00000000",
+     "in=5897de6bd6027a475eadd57019d4e6872c396d0716c4875a5f1a6fcfdf385c1f:0:1"],
+    "output_cmp": "txcreatedata_seq1.json"
   }
 ]
diff --git a/src/test/data/blanktx.json b/src/test/data/blanktx.json
new file mode 100644
index 0000000000000..f6d6ab58842c7
--- /dev/null
+++ b/src/test/data/blanktx.json
@@ -0,0 +1,10 @@
+{
+    "txid": "d21633ba23f70118185227be58a63527675641ad37967e2aa461559f577aec43",
+    "version": 1,
+    "locktime": 0,
+    "vin": [
+    ],
+    "vout": [
+    ],
+    "hex": "01000000000000000000"
+}
diff --git a/src/test/data/tt-delin1-out.json b/src/test/data/tt-delin1-out.json
new file mode 100644
index 0000000000000..2c7a68636a2fb
--- /dev/null
+++ b/src/test/data/tt-delin1-out.json
@@ -0,0 +1,216 @@
+{
+    "txid": "81b2035be1da1abe745c6141174a73d151009ec17b3d5ebffa2e177408c50dfd",
+    "version": 1,
+    "locktime": 0,
+    "vin": [
+        {
+            "txid": "27871a1a27d833e99cd392a502a647beaaeda6da535417501c76312d52235cfd",
+            "vout": 332,
+            "scriptSig": {
+                "asm": "3046022100b4251ecd63778a3dde0155abe4cd162947620ae9ee45a874353551092325b116022100db307baf4ff3781ec520bd18f387948cedd15dc27bafe17c894b0fe6ffffcafa[ALL] 03091137f3ef23f4acfc19a5953a68b2074fae942ad3563ef28c33b0cac9a93adc",
+                "hex": "493046022100b4251ecd63778a3dde0155abe4cd162947620ae9ee45a874353551092325b116022100db307baf4ff3781ec520bd18f387948cedd15dc27bafe17c894b0fe6ffffcafa012103091137f3ef23f4acfc19a5953a68b2074fae942ad3563ef28c33b0cac9a93adc"
+            },
+            "sequence": 4294967295
+        }, 
+        {
+            "txid": "752f7f69b915637dc1c2f7aed1466ad676f6f3e24cf922809705f664e97ab3c1",
+            "vout": 1,
+            "scriptSig": {
+                "asm": "3044022079bd62ee09621a3be96b760c39e8ef78170101d46313923c6b07ae60a95c90670220238e51ea29fc70b04b65508450523caedbb11cb4dd5aa608c81487de798925ba[ALL] 027a759be8df971a6a04fafcb4f6babf75dc811c5cdaa0734cddbe9b942ce75b34",
+                "hex": "473044022079bd62ee09621a3be96b760c39e8ef78170101d46313923c6b07ae60a95c90670220238e51ea29fc70b04b65508450523caedbb11cb4dd5aa608c81487de798925ba0121027a759be8df971a6a04fafcb4f6babf75dc811c5cdaa0734cddbe9b942ce75b34"
+            },
+            "sequence": 4294967295
+        }, 
+        {
+            "txid": "b0ac9cca2e69cd02410e31b1f4402a25758e71abd1ab06c265ef9077dc05d0ed",
+            "vout": 209,
+            "scriptSig": {
+                "asm": "304502207722d6f9038673c86a1019b1c4de2d687ae246477cd4ca7002762be0299de385022100e594a11e3a313942595f7666dcf7078bcb14f1330f4206b95c917e7ec0e82fac[ALL] 03091137f3ef23f4acfc19a5953a68b2074fae942ad3563ef28c33b0cac9a93adc",
+                "hex": "48304502207722d6f9038673c86a1019b1c4de2d687ae246477cd4ca7002762be0299de385022100e594a11e3a313942595f7666dcf7078bcb14f1330f4206b95c917e7ec0e82fac012103091137f3ef23f4acfc19a5953a68b2074fae942ad3563ef28c33b0cac9a93adc"
+            },
+            "sequence": 4294967295
+        }, 
+        {
+            "txid": "a135eafb595eaf4c1ea59ccb111cdc0eae1b2c979b226a1e5aa8b76fe2d628df",
+            "vout": 0,
+            "scriptSig": {
+                "asm": "3045022100a63a4788027b79b65c6f9d9e054f68cf3b4eed19efd82a2d53f70dcbe64683390220526f243671425b2bd05745fcf2729361f985cfe84ea80c7cfc817b93d8134374[ALL] 03a621f08be22d1bbdcbe4e527ee4927006aa555fc65e2aafa767d4ea2fe9dfa52",
+                "hex": "483045022100a63a4788027b79b65c6f9d9e054f68cf3b4eed19efd82a2d53f70dcbe64683390220526f243671425b2bd05745fcf2729361f985cfe84ea80c7cfc817b93d8134374012103a621f08be22d1bbdcbe4e527ee4927006aa555fc65e2aafa767d4ea2fe9dfa52"
+            },
+            "sequence": 4294967295
+        }, 
+        {
+            "txid": "a5d6bf53ba21140b8a4d554feb00fe8bb9a62430ff9e4624aa2f58a120232aae",
+            "vout": 1,
+            "scriptSig": {
+                "asm": "3046022100b200ac6db16842f76dab9abe807ce423c992805879bc50abd46ed8275a59d9cf022100c0d518e85dd345b3c29dd4dc47b9a420d3ce817b18720e94966d2fe23413a408[ALL] 03091137f3ef23f4acfc19a5953a68b2074fae942ad3563ef28c33b0cac9a93adc",
+                "hex": "493046022100b200ac6db16842f76dab9abe807ce423c992805879bc50abd46ed8275a59d9cf022100c0d518e85dd345b3c29dd4dc47b9a420d3ce817b18720e94966d2fe23413a408012103091137f3ef23f4acfc19a5953a68b2074fae942ad3563ef28c33b0cac9a93adc"
+            },
+            "sequence": 4294967295
+        }, 
+        {
+            "txid": "1b299cf14f1a22e81ea56d71b7affbd7cf386807bf2b4d4b79a18a54125accb3",
+            "vout": 0,
+            "scriptSig": {
+                "asm": "3045022100ededc441c3103a6f2bd6cab7639421af0f6ec5e60503bce1e603cf34f00aee1c02205cb75f3f519a13fb348783b21db3085cb5ec7552c59e394fdbc3e1feea43f967[ALL] 03a621f08be22d1bbdcbe4e527ee4927006aa555fc65e2aafa767d4ea2fe9dfa52",
+                "hex": "483045022100ededc441c3103a6f2bd6cab7639421af0f6ec5e60503bce1e603cf34f00aee1c02205cb75f3f519a13fb348783b21db3085cb5ec7552c59e394fdbc3e1feea43f967012103a621f08be22d1bbdcbe4e527ee4927006aa555fc65e2aafa767d4ea2fe9dfa52"
+            },
+            "sequence": 4294967295
+        }, 
+        {
+            "txid": "071df1cdcb3f0070f9d6af7b0274f02d0be2324a274727cfd288383167531485",
+            "vout": 21,
+            "scriptSig": {
+                "asm": "3045022100d9eed5413d2a4b4b98625aa6e3169edc4fb4663e7862316d69224454e70cd8ca022061e506521d5ced51dd0ea36496e75904d756a4c4f9fb111568555075d5f68d9a[ALL] 03f1575d6124ac78be398c25b31146d08313c6072d23a4d7df5ac6a9f87346c64c",
+                "hex": "483045022100d9eed5413d2a4b4b98625aa6e3169edc4fb4663e7862316d69224454e70cd8ca022061e506521d5ced51dd0ea36496e75904d756a4c4f9fb111568555075d5f68d9a012103f1575d6124ac78be398c25b31146d08313c6072d23a4d7df5ac6a9f87346c64c"
+            },
+            "sequence": 4294967295
+        }, 
+        {
+            "txid": "b012e500eb7adf7a13ed332dd6ece849f94f7a62bb3eac5babab356d1fc19282",
+            "vout": 9,
+            "scriptSig": {
+                "asm": "304502207e84b27139c4c19c828cb1e30c349bba88e4d9b59be97286960793b5ddc0a2af0221008cdc7a951e7f31c20953ed5635fbabf228e80b7047f32faaa0313e7693005177[ALL] 03f1575d6124ac78be398c25b31146d08313c6072d23a4d7df5ac6a9f87346c64c",
+                "hex": "48304502207e84b27139c4c19c828cb1e30c349bba88e4d9b59be97286960793b5ddc0a2af0221008cdc7a951e7f31c20953ed5635fbabf228e80b7047f32faaa0313e7693005177012103f1575d6124ac78be398c25b31146d08313c6072d23a4d7df5ac6a9f87346c64c"
+            },
+            "sequence": 4294967295
+        }, 
+        {
+            "txid": "58840fee9c833f2f2d40575842f30f4b8d2553094d06ad88b03d06869acf3d88",
+            "vout": 30,
+            "scriptSig": {
+                "asm": "30440220426540dfed9c4ab5812e5f06df705b8bcf307dd7d20f7fa6512298b2a6314f420220064055096e3ca62f6c7352c66a5447767c53f946acdf35025ab3807ddb2fa404[ALL] 03f1575d6124ac78be398c25b31146d08313c6072d23a4d7df5ac6a9f87346c64c",
+                "hex": "4730440220426540dfed9c4ab5812e5f06df705b8bcf307dd7d20f7fa6512298b2a6314f420220064055096e3ca62f6c7352c66a5447767c53f946acdf35025ab3807ddb2fa404012103f1575d6124ac78be398c25b31146d08313c6072d23a4d7df5ac6a9f87346c64c"
+            },
+            "sequence": 4294967295
+        }, 
+        {
+            "txid": "e69f9cd16946e570a665245354428a3f507ea69f4568b581e4af98edb3db9766",
+            "vout": 114,
+            "scriptSig": {
+                "asm": "304402200a5e673996f2fc88e21cc8613611f08a650bc0370338803591d85d0ec5663764022040b6664a0d1ec83a7f01975b8fde5232992b8ca58bf48af6725d2f92a936ab2e[ALL] 03f1575d6124ac78be398c25b31146d08313c6072d23a4d7df5ac6a9f87346c64c",
+                "hex": "47304402200a5e673996f2fc88e21cc8613611f08a650bc0370338803591d85d0ec5663764022040b6664a0d1ec83a7f01975b8fde5232992b8ca58bf48af6725d2f92a936ab2e012103f1575d6124ac78be398c25b31146d08313c6072d23a4d7df5ac6a9f87346c64c"
+            },
+            "sequence": 4294967295
+        }, 
+        {
+            "txid": "595d1257f654ed2cbe5a65421e8aefd2b4d70b5b6c89a03f1d7e518221fc3f02",
+            "vout": 103,
+            "scriptSig": {
+                "asm": "3046022100d93b30219c5735f673be5c3b4688366d96f545561c74cb62c6958c00f6960806022100ec8200adcb028f2184fa2a4f6faac7f8bb57cb4503bb7584ac11051fece31b3d[ALL] 03091137f3ef23f4acfc19a5953a68b2074fae942ad3563ef28c33b0cac9a93adc",
+                "hex": "493046022100d93b30219c5735f673be5c3b4688366d96f545561c74cb62c6958c00f6960806022100ec8200adcb028f2184fa2a4f6faac7f8bb57cb4503bb7584ac11051fece31b3d012103091137f3ef23f4acfc19a5953a68b2074fae942ad3563ef28c33b0cac9a93adc"
+            },
+            "sequence": 4294967295
+        }, 
+        {
+            "txid": "06fc818f9555a261248ecd7aad0993eafb5a82ceb2b5c87c3ddfb06671c7f816",
+            "vout": 1,
+            "scriptSig": {
+                "asm": "3045022100a13934e68d3f5b22b130c4cb33f4da468cffc52323a47fbfbe06b64858162246022047081e0a70ff770e64a2e2d31e5d520d9102268b57a47009a72fe73ec7669018[ALL] 0234b9d9413f247bb78cd3293b7b65a2c38018ba5621ea9ee737f3a6a3523fb4cd",
+                "hex": "483045022100a13934e68d3f5b22b130c4cb33f4da468cffc52323a47fbfbe06b64858162246022047081e0a70ff770e64a2e2d31e5d520d9102268b57a47009a72fe73ec766901801210234b9d9413f247bb78cd3293b7b65a2c38018ba5621ea9ee737f3a6a3523fb4cd"
+            },
+            "sequence": 4294967295
+        }, 
+        {
+            "txid": "fb416c8155d6bb1d43f9395466ca90a638a7c2dd3ff617aadf3a7ac8f3967b19",
+            "vout": 0,
+            "scriptSig": {
+                "asm": "304602210097f1f35d5bdc1a3a60390a1b015b8e7c4f916aa3847aafd969e04975e15bbe70022100a9052eb25517d481f1fda1b129eb1b534da50ea1a51f3ee012dca3601c11b86a[ALL] 027a759be8df971a6a04fafcb4f6babf75dc811c5cdaa0734cddbe9b942ce75b34",
+                "hex": "49304602210097f1f35d5bdc1a3a60390a1b015b8e7c4f916aa3847aafd969e04975e15bbe70022100a9052eb25517d481f1fda1b129eb1b534da50ea1a51f3ee012dca3601c11b86a0121027a759be8df971a6a04fafcb4f6babf75dc811c5cdaa0734cddbe9b942ce75b34"
+            },
+            "sequence": 4294967295
+        }, 
+        {
+            "txid": "3940b9683bd6104ad24c978e640ba4095993cafdb27d2ed91baa27ee61a2d920",
+            "vout": 221,
+            "scriptSig": {
+                "asm": "3045022012b3138c591bf7154b6fef457f2c4a3c7162225003788ac0024a99355865ff13022100b71b125ae1ffb2e1d1571f580cd3ebc8cd049a2d7a8a41f138ba94aeb982106f[ALL] 03091137f3ef23f4acfc19a5953a68b2074fae942ad3563ef28c33b0cac9a93adc",
+                "hex": "483045022012b3138c591bf7154b6fef457f2c4a3c7162225003788ac0024a99355865ff13022100b71b125ae1ffb2e1d1571f580cd3ebc8cd049a2d7a8a41f138ba94aeb982106f012103091137f3ef23f4acfc19a5953a68b2074fae942ad3563ef28c33b0cac9a93adc"
+            },
+            "sequence": 4294967295
+        }, 
+        {
+            "txid": "711b5714d3b5136147c02194cd95bde94a4648c4263ca6f972d86cd1d579f150",
+            "vout": 1,
+            "scriptSig": {
+                "asm": "3045022100f834ccc8b22ee72712a3e5e6ef4acb8b2fb791b5385b70e2cd4332674d6667f4022024fbda0a997e0c253503f217501f508a4d56edce2c813ecdd9ad796dbeba9074[ALL] 0234b9d9413f247bb78cd3293b7b65a2c38018ba5621ea9ee737f3a6a3523fb4cd",
+                "hex": "483045022100f834ccc8b22ee72712a3e5e6ef4acb8b2fb791b5385b70e2cd4332674d6667f4022024fbda0a997e0c253503f217501f508a4d56edce2c813ecdd9ad796dbeba907401210234b9d9413f247bb78cd3293b7b65a2c38018ba5621ea9ee737f3a6a3523fb4cd"
+            },
+            "sequence": 4294967295
+        }, 
+        {
+            "txid": "6364b5c5efe018430789e7fb4e338209546cae5d9c5f5e300aac68155d861b55",
+            "vout": 27,
+            "scriptSig": {
+                "asm": "304502203b2fd1e39ae0e469d7a15768f262661b0de41470daf0fe8c4fd0c26542a0870002210081c57e331f9a2d214457d953e3542904727ee412c63028113635d7224da3dccc[ALL] 03f1575d6124ac78be398c25b31146d08313c6072d23a4d7df5ac6a9f87346c64c",
+                "hex": "48304502203b2fd1e39ae0e469d7a15768f262661b0de41470daf0fe8c4fd0c26542a0870002210081c57e331f9a2d214457d953e3542904727ee412c63028113635d7224da3dccc012103f1575d6124ac78be398c25b31146d08313c6072d23a4d7df5ac6a9f87346c64c"
+            },
+            "sequence": 4294967295
+        }, 
+        {
+            "txid": "0bb57f6e38012c86d4c5a28c904f2675082859147921a707d48961015a3e5057",
+            "vout": 1095,
+            "scriptSig": {
+                "asm": "304502206947a9c54f0664ece4430fd4ae999891dc50bb6126bc36b6a15a3189f29d25e9022100a86cfc4e2fdd9e39a20e305cfd1b76509c67b3e313e0f118229105caa0e823c9[ALL] 03f1575d6124ac78be398c25b31146d08313c6072d23a4d7df5ac6a9f87346c64c",
+                "hex": "48304502206947a9c54f0664ece4430fd4ae999891dc50bb6126bc36b6a15a3189f29d25e9022100a86cfc4e2fdd9e39a20e305cfd1b76509c67b3e313e0f118229105caa0e823c9012103f1575d6124ac78be398c25b31146d08313c6072d23a4d7df5ac6a9f87346c64c"
+            },
+            "sequence": 4294967295
+        }, 
+        {
+            "txid": "9b34274814a2540bb062107117f8f3e75ef85d953e9372d8261a3e9dfbc1163f",
+            "vout": 37,
+            "scriptSig": {
+                "asm": "3045022100c7128fe10b2d38744ae8177776054c29fc8ec13f07207723e70766ab7164847402201d2cf09009b9596de74c0183d1ab832e5edddb7a9965880bb400097e850850f8[ALL] 03f1575d6124ac78be398c25b31146d08313c6072d23a4d7df5ac6a9f87346c64c",
+                "hex": "483045022100c7128fe10b2d38744ae8177776054c29fc8ec13f07207723e70766ab7164847402201d2cf09009b9596de74c0183d1ab832e5edddb7a9965880bb400097e850850f8012103f1575d6124ac78be398c25b31146d08313c6072d23a4d7df5ac6a9f87346c64c"
+            },
+            "sequence": 4294967295
+        }, 
+        {
+            "txid": "b86b5cc0d8a7374d94e277850b0a249cb26a7b42ddf014f28a49b8859da64241",
+            "vout": 20,
+            "scriptSig": {
+                "asm": "304502203b89a71628a28cc3703d170ca3be77786cff6b867e38a18b719705f8a326578f022100b2a9879e1acf621faa6466c207746a7f3eb4c8514c1482969aba3f2a957f1321[ALL] 03f1575d6124ac78be398c25b31146d08313c6072d23a4d7df5ac6a9f87346c64c",
+                "hex": "48304502203b89a71628a28cc3703d170ca3be77786cff6b867e38a18b719705f8a326578f022100b2a9879e1acf621faa6466c207746a7f3eb4c8514c1482969aba3f2a957f1321012103f1575d6124ac78be398c25b31146d08313c6072d23a4d7df5ac6a9f87346c64c"
+            },
+            "sequence": 4294967295
+        }, 
+        {
+            "txid": "3d0a2353eeec44d3c10aed259038db321912122cd4150048f7bfa4c0ecfee236",
+            "vout": 242,
+            "scriptSig": {
+                "asm": "3046022100ef794a8ef7fd6752d2a183c18866ff6e8dc0f5bd889a63e2c21cf303a6302461022100c1b09662d9e92988c3f9fcf17d1bcc79b5403647095d7212b9f8a1278a532d68[ALL] 03091137f3ef23f4acfc19a5953a68b2074fae942ad3563ef28c33b0cac9a93adc",
+                "hex": "493046022100ef794a8ef7fd6752d2a183c18866ff6e8dc0f5bd889a63e2c21cf303a6302461022100c1b09662d9e92988c3f9fcf17d1bcc79b5403647095d7212b9f8a1278a532d68012103091137f3ef23f4acfc19a5953a68b2074fae942ad3563ef28c33b0cac9a93adc"
+            },
+            "sequence": 4294967295
+        }
+    ],
+    "vout": [
+        {
+            "value": 1.3782,
+            "n": 0,
+            "scriptPubKey": {
+                "asm": "OP_DUP OP_HASH160 8fd139bb39ced713f231c58a4d07bf6954d1c201 OP_EQUALVERIFY OP_CHECKSIG",
+                "hex": "76a9148fd139bb39ced713f231c58a4d07bf6954d1c20188ac",
+                "reqSigs": 1,
+                "type": "pubkeyhash",
+                "addresses": [
+                    "1E7SGgAZFCHDnVZLuRViX3gUmxpMfdvd2o"
+                ]
+            }
+        }, 
+        {
+            "value": 0.01000001,
+            "n": 1,
+            "scriptPubKey": {
+                "asm": "OP_DUP OP_HASH160 6c772e9cf96371bba3da8cb733da70a2fcf20078 OP_EQUALVERIFY OP_CHECKSIG",
+                "hex": "76a9146c772e9cf96371bba3da8cb733da70a2fcf2007888ac",
+                "reqSigs": 1,
+                "type": "pubkeyhash",
+                "addresses": [
+                    "1AtWkdmfmYkErU16d3KYykJUbEp9MAj9Sb"
+                ]
+            }
+        }
+    ],
+    "hex": "0100000014fd5c23522d31761c50175453daa6edaabe47a602a592d39ce933d8271a1a87274c0100006c493046022100b4251ecd63778a3dde0155abe4cd162947620ae9ee45a874353551092325b116022100db307baf4ff3781ec520bd18f387948cedd15dc27bafe17c894b0fe6ffffcafa012103091137f3ef23f4acfc19a5953a68b2074fae942ad3563ef28c33b0cac9a93adcffffffffc1b37ae964f605978022f94ce2f3f676d66a46d1aef7c2c17d6315b9697f2f75010000006a473044022079bd62ee09621a3be96b760c39e8ef78170101d46313923c6b07ae60a95c90670220238e51ea29fc70b04b65508450523caedbb11cb4dd5aa608c81487de798925ba0121027a759be8df971a6a04fafcb4f6babf75dc811c5cdaa0734cddbe9b942ce75b34ffffffffedd005dc7790ef65c206abd1ab718e75252a40f4b1310e4102cd692eca9cacb0d10000006b48304502207722d6f9038673c86a1019b1c4de2d687ae246477cd4ca7002762be0299de385022100e594a11e3a313942595f7666dcf7078bcb14f1330f4206b95c917e7ec0e82fac012103091137f3ef23f4acfc19a5953a68b2074fae942ad3563ef28c33b0cac9a93adcffffffffdf28d6e26fb7a85a1e6a229b972c1bae0edc1c11cb9ca51e4caf5e59fbea35a1000000006b483045022100a63a4788027b79b65c6f9d9e054f68cf3b4eed19efd82a2d53f70dcbe64683390220526f243671425b2bd05745fcf2729361f985cfe84ea80c7cfc817b93d8134374012103a621f08be22d1bbdcbe4e527ee4927006aa555fc65e2aafa767d4ea2fe9dfa52ffffffffae2a2320a1582faa24469eff3024a6b98bfe00eb4f554d8a0b1421ba53bfd6a5010000006c493046022100b200ac6db16842f76dab9abe807ce423c992805879bc50abd46ed8275a59d9cf022100c0d518e85dd345b3c29dd4dc47b9a420d3ce817b18720e94966d2fe23413a408012103091137f3ef23f4acfc19a5953a68b2074fae942ad3563ef28c33b0cac9a93adcffffffffb3cc5a12548aa1794b4d2bbf076838cfd7fbafb7716da51ee8221a4ff19c291b000000006b483045022100ededc441c3103a6f2bd6cab7639421af0f6ec5e60503bce1e603cf34f00aee1c02205cb75f3f519a13fb348783b21db3085cb5ec7552c59e394fdbc3e1feea43f967012103a621f08be22d1bbdcbe4e527ee4927006aa555fc65e2aafa767d4ea2fe9dfa52ffffffff85145367313888d2cf2747274a32e20b2df074027bafd6f970003fcbcdf11d07150000006b483045022100d9eed5413d2a4b4b98625aa6e3169edc4fb4663e7862316d69224454e70cd8ca022061e506521d5ced51dd0ea36496e75904d756a4c4f9fb111568555075d5f68d9a012103f1575d6124ac78be398c25b31146d08313c6072d23a4d7df5ac6a9f87346c64cffffffff8292c11f6d35abab5bac3ebb627a4ff949e8ecd62d33ed137adf7aeb00e512b0090000006b48304502207e84b27139c4c19c828cb1e30c349bba88e4d9b59be97286960793b5ddc0a2af0221008cdc7a951e7f31c20953ed5635fbabf228e80b7047f32faaa0313e7693005177012103f1575d6124ac78be398c25b31146d08313c6072d23a4d7df5ac6a9f87346c64cffffffff883dcf9a86063db088ad064d0953258d4b0ff3425857402d2f3f839cee0f84581e0000006a4730440220426540dfed9c4ab5812e5f06df705b8bcf307dd7d20f7fa6512298b2a6314f420220064055096e3ca62f6c7352c66a5447767c53f946acdf35025ab3807ddb2fa404012103f1575d6124ac78be398c25b31146d08313c6072d23a4d7df5ac6a9f87346c64cffffffff6697dbb3ed98afe481b568459fa67e503f8a4254532465a670e54669d19c9fe6720000006a47304402200a5e673996f2fc88e21cc8613611f08a650bc0370338803591d85d0ec5663764022040b6664a0d1ec83a7f01975b8fde5232992b8ca58bf48af6725d2f92a936ab2e012103f1575d6124ac78be398c25b31146d08313c6072d23a4d7df5ac6a9f87346c64cffffffff023ffc2182517e1d3fa0896c5b0bd7b4d2ef8a1e42655abe2ced54f657125d59670000006c493046022100d93b30219c5735f673be5c3b4688366d96f545561c74cb62c6958c00f6960806022100ec8200adcb028f2184fa2a4f6faac7f8bb57cb4503bb7584ac11051fece31b3d012103091137f3ef23f4acfc19a5953a68b2074fae942ad3563ef28c33b0cac9a93adcffffffff16f8c77166b0df3d7cc8b5b2ce825afbea9309ad7acd8e2461a255958f81fc06010000006b483045022100a13934e68d3f5b22b130c4cb33f4da468cffc52323a47fbfbe06b64858162246022047081e0a70ff770e64a2e2d31e5d520d9102268b57a47009a72fe73ec766901801210234b9d9413f247bb78cd3293b7b65a2c38018ba5621ea9ee737f3a6a3523fb4cdffffffff197b96f3c87a3adfaa17f63fddc2a738a690ca665439f9431dbbd655816c41fb000000006c49304602210097f1f35d5bdc1a3a60390a1b015b8e7c4f916aa3847aafd969e04975e15bbe70022100a9052eb25517d481f1fda1b129eb1b534da50ea1a51f3ee012dca3601c11b86a0121027a759be8df971a6a04fafcb4f6babf75dc811c5cdaa0734cddbe9b942ce75b34ffffffff20d9a261ee27aa1bd92e7db2fdca935909a40b648e974cd24a10d63b68b94039dd0000006b483045022012b3138c591bf7154b6fef457f2c4a3c7162225003788ac0024a99355865ff13022100b71b125ae1ffb2e1d1571f580cd3ebc8cd049a2d7a8a41f138ba94aeb982106f012103091137f3ef23f4acfc19a5953a68b2074fae942ad3563ef28c33b0cac9a93adcffffffff50f179d5d16cd872f9a63c26c448464ae9bd95cd9421c0476113b5d314571b71010000006b483045022100f834ccc8b22ee72712a3e5e6ef4acb8b2fb791b5385b70e2cd4332674d6667f4022024fbda0a997e0c253503f217501f508a4d56edce2c813ecdd9ad796dbeba907401210234b9d9413f247bb78cd3293b7b65a2c38018ba5621ea9ee737f3a6a3523fb4cdffffffff551b865d1568ac0a305e5f9c5dae6c540982334efbe789074318e0efc5b564631b0000006b48304502203b2fd1e39ae0e469d7a15768f262661b0de41470daf0fe8c4fd0c26542a0870002210081c57e331f9a2d214457d953e3542904727ee412c63028113635d7224da3dccc012103f1575d6124ac78be398c25b31146d08313c6072d23a4d7df5ac6a9f87346c64cffffffff57503e5a016189d407a721791459280875264f908ca2c5d4862c01386e7fb50b470400006b48304502206947a9c54f0664ece4430fd4ae999891dc50bb6126bc36b6a15a3189f29d25e9022100a86cfc4e2fdd9e39a20e305cfd1b76509c67b3e313e0f118229105caa0e823c9012103f1575d6124ac78be398c25b31146d08313c6072d23a4d7df5ac6a9f87346c64cffffffff3f16c1fb9d3e1a26d872933e955df85ee7f3f817711062b00b54a2144827349b250000006b483045022100c7128fe10b2d38744ae8177776054c29fc8ec13f07207723e70766ab7164847402201d2cf09009b9596de74c0183d1ab832e5edddb7a9965880bb400097e850850f8012103f1575d6124ac78be398c25b31146d08313c6072d23a4d7df5ac6a9f87346c64cffffffff4142a69d85b8498af214f0dd427b6ab29c240a0b8577e2944d37a7d8c05c6bb8140000006b48304502203b89a71628a28cc3703d170ca3be77786cff6b867e38a18b719705f8a326578f022100b2a9879e1acf621faa6466c207746a7f3eb4c8514c1482969aba3f2a957f1321012103f1575d6124ac78be398c25b31146d08313c6072d23a4d7df5ac6a9f87346c64cffffffff36e2feecc0a4bff7480015d42c12121932db389025ed0ac1d344ecee53230a3df20000006c493046022100ef794a8ef7fd6752d2a183c18866ff6e8dc0f5bd889a63e2c21cf303a6302461022100c1b09662d9e92988c3f9fcf17d1bcc79b5403647095d7212b9f8a1278a532d68012103091137f3ef23f4acfc19a5953a68b2074fae942ad3563ef28c33b0cac9a93adcffffffff0260f73608000000001976a9148fd139bb39ced713f231c58a4d07bf6954d1c20188ac41420f00000000001976a9146c772e9cf96371bba3da8cb733da70a2fcf2007888ac00000000"
+}
diff --git a/src/test/data/tt-delout1-out.json b/src/test/data/tt-delout1-out.json
new file mode 100644
index 0000000000000..9cf8cbb16c01e
--- /dev/null
+++ b/src/test/data/tt-delout1-out.json
@@ -0,0 +1,212 @@
+{
+    "txid": "c46ccd75b5050e942b2e86a3648f843f525fe6fc000bf0534ba5973063354493",
+    "version": 1,
+    "locktime": 0,
+    "vin": [
+        {
+            "txid": "27871a1a27d833e99cd392a502a647beaaeda6da535417501c76312d52235cfd",
+            "vout": 332,
+            "scriptSig": {
+                "asm": "3046022100b4251ecd63778a3dde0155abe4cd162947620ae9ee45a874353551092325b116022100db307baf4ff3781ec520bd18f387948cedd15dc27bafe17c894b0fe6ffffcafa[ALL] 03091137f3ef23f4acfc19a5953a68b2074fae942ad3563ef28c33b0cac9a93adc",
+                "hex": "493046022100b4251ecd63778a3dde0155abe4cd162947620ae9ee45a874353551092325b116022100db307baf4ff3781ec520bd18f387948cedd15dc27bafe17c894b0fe6ffffcafa012103091137f3ef23f4acfc19a5953a68b2074fae942ad3563ef28c33b0cac9a93adc"
+            },
+            "sequence": 4294967295
+        }, 
+        {
+            "txid": "a72ec96bd0d022d1b0c2f9078cdd46b3725b8eecdd001e17b21e3ababad14ecb",
+            "vout": 0,
+            "scriptSig": {
+                "asm": "3046022100a9b617843b68c284715d3e02fd120479cd0d96a6c43bf01e697fb0a460a21a3a022100ba0a12fbe8b993d4e7911fa3467615765dbe421ddf5c51b57a9c1ee19dcc00ba[ALL] 03e633b4fa4ceb705c2da712390767199be8ef2448b3095dc01652e11b2b751505",
+                "hex": "493046022100a9b617843b68c284715d3e02fd120479cd0d96a6c43bf01e697fb0a460a21a3a022100ba0a12fbe8b993d4e7911fa3467615765dbe421ddf5c51b57a9c1ee19dcc00ba012103e633b4fa4ceb705c2da712390767199be8ef2448b3095dc01652e11b2b751505"
+            },
+            "sequence": 4294967295
+        }, 
+        {
+            "txid": "752f7f69b915637dc1c2f7aed1466ad676f6f3e24cf922809705f664e97ab3c1",
+            "vout": 1,
+            "scriptSig": {
+                "asm": "3044022079bd62ee09621a3be96b760c39e8ef78170101d46313923c6b07ae60a95c90670220238e51ea29fc70b04b65508450523caedbb11cb4dd5aa608c81487de798925ba[ALL] 027a759be8df971a6a04fafcb4f6babf75dc811c5cdaa0734cddbe9b942ce75b34",
+                "hex": "473044022079bd62ee09621a3be96b760c39e8ef78170101d46313923c6b07ae60a95c90670220238e51ea29fc70b04b65508450523caedbb11cb4dd5aa608c81487de798925ba0121027a759be8df971a6a04fafcb4f6babf75dc811c5cdaa0734cddbe9b942ce75b34"
+            },
+            "sequence": 4294967295
+        }, 
+        {
+            "txid": "b0ac9cca2e69cd02410e31b1f4402a25758e71abd1ab06c265ef9077dc05d0ed",
+            "vout": 209,
+            "scriptSig": {
+                "asm": "304502207722d6f9038673c86a1019b1c4de2d687ae246477cd4ca7002762be0299de385022100e594a11e3a313942595f7666dcf7078bcb14f1330f4206b95c917e7ec0e82fac[ALL] 03091137f3ef23f4acfc19a5953a68b2074fae942ad3563ef28c33b0cac9a93adc",
+                "hex": "48304502207722d6f9038673c86a1019b1c4de2d687ae246477cd4ca7002762be0299de385022100e594a11e3a313942595f7666dcf7078bcb14f1330f4206b95c917e7ec0e82fac012103091137f3ef23f4acfc19a5953a68b2074fae942ad3563ef28c33b0cac9a93adc"
+            },
+            "sequence": 4294967295
+        }, 
+        {
+            "txid": "a135eafb595eaf4c1ea59ccb111cdc0eae1b2c979b226a1e5aa8b76fe2d628df",
+            "vout": 0,
+            "scriptSig": {
+                "asm": "3045022100a63a4788027b79b65c6f9d9e054f68cf3b4eed19efd82a2d53f70dcbe64683390220526f243671425b2bd05745fcf2729361f985cfe84ea80c7cfc817b93d8134374[ALL] 03a621f08be22d1bbdcbe4e527ee4927006aa555fc65e2aafa767d4ea2fe9dfa52",
+                "hex": "483045022100a63a4788027b79b65c6f9d9e054f68cf3b4eed19efd82a2d53f70dcbe64683390220526f243671425b2bd05745fcf2729361f985cfe84ea80c7cfc817b93d8134374012103a621f08be22d1bbdcbe4e527ee4927006aa555fc65e2aafa767d4ea2fe9dfa52"
+            },
+            "sequence": 4294967295
+        }, 
+        {
+            "txid": "a5d6bf53ba21140b8a4d554feb00fe8bb9a62430ff9e4624aa2f58a120232aae",
+            "vout": 1,
+            "scriptSig": {
+                "asm": "3046022100b200ac6db16842f76dab9abe807ce423c992805879bc50abd46ed8275a59d9cf022100c0d518e85dd345b3c29dd4dc47b9a420d3ce817b18720e94966d2fe23413a408[ALL] 03091137f3ef23f4acfc19a5953a68b2074fae942ad3563ef28c33b0cac9a93adc",
+                "hex": "493046022100b200ac6db16842f76dab9abe807ce423c992805879bc50abd46ed8275a59d9cf022100c0d518e85dd345b3c29dd4dc47b9a420d3ce817b18720e94966d2fe23413a408012103091137f3ef23f4acfc19a5953a68b2074fae942ad3563ef28c33b0cac9a93adc"
+            },
+            "sequence": 4294967295
+        }, 
+        {
+            "txid": "1b299cf14f1a22e81ea56d71b7affbd7cf386807bf2b4d4b79a18a54125accb3",
+            "vout": 0,
+            "scriptSig": {
+                "asm": "3045022100ededc441c3103a6f2bd6cab7639421af0f6ec5e60503bce1e603cf34f00aee1c02205cb75f3f519a13fb348783b21db3085cb5ec7552c59e394fdbc3e1feea43f967[ALL] 03a621f08be22d1bbdcbe4e527ee4927006aa555fc65e2aafa767d4ea2fe9dfa52",
+                "hex": "483045022100ededc441c3103a6f2bd6cab7639421af0f6ec5e60503bce1e603cf34f00aee1c02205cb75f3f519a13fb348783b21db3085cb5ec7552c59e394fdbc3e1feea43f967012103a621f08be22d1bbdcbe4e527ee4927006aa555fc65e2aafa767d4ea2fe9dfa52"
+            },
+            "sequence": 4294967295
+        }, 
+        {
+            "txid": "071df1cdcb3f0070f9d6af7b0274f02d0be2324a274727cfd288383167531485",
+            "vout": 21,
+            "scriptSig": {
+                "asm": "3045022100d9eed5413d2a4b4b98625aa6e3169edc4fb4663e7862316d69224454e70cd8ca022061e506521d5ced51dd0ea36496e75904d756a4c4f9fb111568555075d5f68d9a[ALL] 03f1575d6124ac78be398c25b31146d08313c6072d23a4d7df5ac6a9f87346c64c",
+                "hex": "483045022100d9eed5413d2a4b4b98625aa6e3169edc4fb4663e7862316d69224454e70cd8ca022061e506521d5ced51dd0ea36496e75904d756a4c4f9fb111568555075d5f68d9a012103f1575d6124ac78be398c25b31146d08313c6072d23a4d7df5ac6a9f87346c64c"
+            },
+            "sequence": 4294967295
+        }, 
+        {
+            "txid": "b012e500eb7adf7a13ed332dd6ece849f94f7a62bb3eac5babab356d1fc19282",
+            "vout": 9,
+            "scriptSig": {
+                "asm": "304502207e84b27139c4c19c828cb1e30c349bba88e4d9b59be97286960793b5ddc0a2af0221008cdc7a951e7f31c20953ed5635fbabf228e80b7047f32faaa0313e7693005177[ALL] 03f1575d6124ac78be398c25b31146d08313c6072d23a4d7df5ac6a9f87346c64c",
+                "hex": "48304502207e84b27139c4c19c828cb1e30c349bba88e4d9b59be97286960793b5ddc0a2af0221008cdc7a951e7f31c20953ed5635fbabf228e80b7047f32faaa0313e7693005177012103f1575d6124ac78be398c25b31146d08313c6072d23a4d7df5ac6a9f87346c64c"
+            },
+            "sequence": 4294967295
+        }, 
+        {
+            "txid": "58840fee9c833f2f2d40575842f30f4b8d2553094d06ad88b03d06869acf3d88",
+            "vout": 30,
+            "scriptSig": {
+                "asm": "30440220426540dfed9c4ab5812e5f06df705b8bcf307dd7d20f7fa6512298b2a6314f420220064055096e3ca62f6c7352c66a5447767c53f946acdf35025ab3807ddb2fa404[ALL] 03f1575d6124ac78be398c25b31146d08313c6072d23a4d7df5ac6a9f87346c64c",
+                "hex": "4730440220426540dfed9c4ab5812e5f06df705b8bcf307dd7d20f7fa6512298b2a6314f420220064055096e3ca62f6c7352c66a5447767c53f946acdf35025ab3807ddb2fa404012103f1575d6124ac78be398c25b31146d08313c6072d23a4d7df5ac6a9f87346c64c"
+            },
+            "sequence": 4294967295
+        }, 
+        {
+            "txid": "e69f9cd16946e570a665245354428a3f507ea69f4568b581e4af98edb3db9766",
+            "vout": 114,
+            "scriptSig": {
+                "asm": "304402200a5e673996f2fc88e21cc8613611f08a650bc0370338803591d85d0ec5663764022040b6664a0d1ec83a7f01975b8fde5232992b8ca58bf48af6725d2f92a936ab2e[ALL] 03f1575d6124ac78be398c25b31146d08313c6072d23a4d7df5ac6a9f87346c64c",
+                "hex": "47304402200a5e673996f2fc88e21cc8613611f08a650bc0370338803591d85d0ec5663764022040b6664a0d1ec83a7f01975b8fde5232992b8ca58bf48af6725d2f92a936ab2e012103f1575d6124ac78be398c25b31146d08313c6072d23a4d7df5ac6a9f87346c64c"
+            },
+            "sequence": 4294967295
+        }, 
+        {
+            "txid": "595d1257f654ed2cbe5a65421e8aefd2b4d70b5b6c89a03f1d7e518221fc3f02",
+            "vout": 103,
+            "scriptSig": {
+                "asm": "3046022100d93b30219c5735f673be5c3b4688366d96f545561c74cb62c6958c00f6960806022100ec8200adcb028f2184fa2a4f6faac7f8bb57cb4503bb7584ac11051fece31b3d[ALL] 03091137f3ef23f4acfc19a5953a68b2074fae942ad3563ef28c33b0cac9a93adc",
+                "hex": "493046022100d93b30219c5735f673be5c3b4688366d96f545561c74cb62c6958c00f6960806022100ec8200adcb028f2184fa2a4f6faac7f8bb57cb4503bb7584ac11051fece31b3d012103091137f3ef23f4acfc19a5953a68b2074fae942ad3563ef28c33b0cac9a93adc"
+            },
+            "sequence": 4294967295
+        }, 
+        {
+            "txid": "06fc818f9555a261248ecd7aad0993eafb5a82ceb2b5c87c3ddfb06671c7f816",
+            "vout": 1,
+            "scriptSig": {
+                "asm": "3045022100a13934e68d3f5b22b130c4cb33f4da468cffc52323a47fbfbe06b64858162246022047081e0a70ff770e64a2e2d31e5d520d9102268b57a47009a72fe73ec7669018[ALL] 0234b9d9413f247bb78cd3293b7b65a2c38018ba5621ea9ee737f3a6a3523fb4cd",
+                "hex": "483045022100a13934e68d3f5b22b130c4cb33f4da468cffc52323a47fbfbe06b64858162246022047081e0a70ff770e64a2e2d31e5d520d9102268b57a47009a72fe73ec766901801210234b9d9413f247bb78cd3293b7b65a2c38018ba5621ea9ee737f3a6a3523fb4cd"
+            },
+            "sequence": 4294967295
+        }, 
+        {
+            "txid": "fb416c8155d6bb1d43f9395466ca90a638a7c2dd3ff617aadf3a7ac8f3967b19",
+            "vout": 0,
+            "scriptSig": {
+                "asm": "304602210097f1f35d5bdc1a3a60390a1b015b8e7c4f916aa3847aafd969e04975e15bbe70022100a9052eb25517d481f1fda1b129eb1b534da50ea1a51f3ee012dca3601c11b86a[ALL] 027a759be8df971a6a04fafcb4f6babf75dc811c5cdaa0734cddbe9b942ce75b34",
+                "hex": "49304602210097f1f35d5bdc1a3a60390a1b015b8e7c4f916aa3847aafd969e04975e15bbe70022100a9052eb25517d481f1fda1b129eb1b534da50ea1a51f3ee012dca3601c11b86a0121027a759be8df971a6a04fafcb4f6babf75dc811c5cdaa0734cddbe9b942ce75b34"
+            },
+            "sequence": 4294967295
+        }, 
+        {
+            "txid": "3940b9683bd6104ad24c978e640ba4095993cafdb27d2ed91baa27ee61a2d920",
+            "vout": 221,
+            "scriptSig": {
+                "asm": "3045022012b3138c591bf7154b6fef457f2c4a3c7162225003788ac0024a99355865ff13022100b71b125ae1ffb2e1d1571f580cd3ebc8cd049a2d7a8a41f138ba94aeb982106f[ALL] 03091137f3ef23f4acfc19a5953a68b2074fae942ad3563ef28c33b0cac9a93adc",
+                "hex": "483045022012b3138c591bf7154b6fef457f2c4a3c7162225003788ac0024a99355865ff13022100b71b125ae1ffb2e1d1571f580cd3ebc8cd049a2d7a8a41f138ba94aeb982106f012103091137f3ef23f4acfc19a5953a68b2074fae942ad3563ef28c33b0cac9a93adc"
+            },
+            "sequence": 4294967295
+        }, 
+        {
+            "txid": "711b5714d3b5136147c02194cd95bde94a4648c4263ca6f972d86cd1d579f150",
+            "vout": 1,
+            "scriptSig": {
+                "asm": "3045022100f834ccc8b22ee72712a3e5e6ef4acb8b2fb791b5385b70e2cd4332674d6667f4022024fbda0a997e0c253503f217501f508a4d56edce2c813ecdd9ad796dbeba9074[ALL] 0234b9d9413f247bb78cd3293b7b65a2c38018ba5621ea9ee737f3a6a3523fb4cd",
+                "hex": "483045022100f834ccc8b22ee72712a3e5e6ef4acb8b2fb791b5385b70e2cd4332674d6667f4022024fbda0a997e0c253503f217501f508a4d56edce2c813ecdd9ad796dbeba907401210234b9d9413f247bb78cd3293b7b65a2c38018ba5621ea9ee737f3a6a3523fb4cd"
+            },
+            "sequence": 4294967295
+        }, 
+        {
+            "txid": "6364b5c5efe018430789e7fb4e338209546cae5d9c5f5e300aac68155d861b55",
+            "vout": 27,
+            "scriptSig": {
+                "asm": "304502203b2fd1e39ae0e469d7a15768f262661b0de41470daf0fe8c4fd0c26542a0870002210081c57e331f9a2d214457d953e3542904727ee412c63028113635d7224da3dccc[ALL] 03f1575d6124ac78be398c25b31146d08313c6072d23a4d7df5ac6a9f87346c64c",
+                "hex": "48304502203b2fd1e39ae0e469d7a15768f262661b0de41470daf0fe8c4fd0c26542a0870002210081c57e331f9a2d214457d953e3542904727ee412c63028113635d7224da3dccc012103f1575d6124ac78be398c25b31146d08313c6072d23a4d7df5ac6a9f87346c64c"
+            },
+            "sequence": 4294967295
+        }, 
+        {
+            "txid": "0bb57f6e38012c86d4c5a28c904f2675082859147921a707d48961015a3e5057",
+            "vout": 1095,
+            "scriptSig": {
+                "asm": "304502206947a9c54f0664ece4430fd4ae999891dc50bb6126bc36b6a15a3189f29d25e9022100a86cfc4e2fdd9e39a20e305cfd1b76509c67b3e313e0f118229105caa0e823c9[ALL] 03f1575d6124ac78be398c25b31146d08313c6072d23a4d7df5ac6a9f87346c64c",
+                "hex": "48304502206947a9c54f0664ece4430fd4ae999891dc50bb6126bc36b6a15a3189f29d25e9022100a86cfc4e2fdd9e39a20e305cfd1b76509c67b3e313e0f118229105caa0e823c9012103f1575d6124ac78be398c25b31146d08313c6072d23a4d7df5ac6a9f87346c64c"
+            },
+            "sequence": 4294967295
+        }, 
+        {
+            "txid": "9b34274814a2540bb062107117f8f3e75ef85d953e9372d8261a3e9dfbc1163f",
+            "vout": 37,
+            "scriptSig": {
+                "asm": "3045022100c7128fe10b2d38744ae8177776054c29fc8ec13f07207723e70766ab7164847402201d2cf09009b9596de74c0183d1ab832e5edddb7a9965880bb400097e850850f8[ALL] 03f1575d6124ac78be398c25b31146d08313c6072d23a4d7df5ac6a9f87346c64c",
+                "hex": "483045022100c7128fe10b2d38744ae8177776054c29fc8ec13f07207723e70766ab7164847402201d2cf09009b9596de74c0183d1ab832e5edddb7a9965880bb400097e850850f8012103f1575d6124ac78be398c25b31146d08313c6072d23a4d7df5ac6a9f87346c64c"
+            },
+            "sequence": 4294967295
+        }, 
+        {
+            "txid": "b86b5cc0d8a7374d94e277850b0a249cb26a7b42ddf014f28a49b8859da64241",
+            "vout": 20,
+            "scriptSig": {
+                "asm": "304502203b89a71628a28cc3703d170ca3be77786cff6b867e38a18b719705f8a326578f022100b2a9879e1acf621faa6466c207746a7f3eb4c8514c1482969aba3f2a957f1321[ALL] 03f1575d6124ac78be398c25b31146d08313c6072d23a4d7df5ac6a9f87346c64c",
+                "hex": "48304502203b89a71628a28cc3703d170ca3be77786cff6b867e38a18b719705f8a326578f022100b2a9879e1acf621faa6466c207746a7f3eb4c8514c1482969aba3f2a957f1321012103f1575d6124ac78be398c25b31146d08313c6072d23a4d7df5ac6a9f87346c64c"
+            },
+            "sequence": 4294967295
+        }, 
+        {
+            "txid": "3d0a2353eeec44d3c10aed259038db321912122cd4150048f7bfa4c0ecfee236",
+            "vout": 242,
+            "scriptSig": {
+                "asm": "3046022100ef794a8ef7fd6752d2a183c18866ff6e8dc0f5bd889a63e2c21cf303a6302461022100c1b09662d9e92988c3f9fcf17d1bcc79b5403647095d7212b9f8a1278a532d68[ALL] 03091137f3ef23f4acfc19a5953a68b2074fae942ad3563ef28c33b0cac9a93adc",
+                "hex": "493046022100ef794a8ef7fd6752d2a183c18866ff6e8dc0f5bd889a63e2c21cf303a6302461022100c1b09662d9e92988c3f9fcf17d1bcc79b5403647095d7212b9f8a1278a532d68012103091137f3ef23f4acfc19a5953a68b2074fae942ad3563ef28c33b0cac9a93adc"
+            },
+            "sequence": 4294967295
+        }
+    ],
+    "vout": [
+        {
+            "value": 1.3782,
+            "n": 0,
+            "scriptPubKey": {
+                "asm": "OP_DUP OP_HASH160 8fd139bb39ced713f231c58a4d07bf6954d1c201 OP_EQUALVERIFY OP_CHECKSIG",
+                "hex": "76a9148fd139bb39ced713f231c58a4d07bf6954d1c20188ac",
+                "reqSigs": 1,
+                "type": "pubkeyhash",
+                "addresses": [
+                    "1E7SGgAZFCHDnVZLuRViX3gUmxpMfdvd2o"
+                ]
+            }
+        }
+    ],
+    "hex": "0100000015fd5c23522d31761c50175453daa6edaabe47a602a592d39ce933d8271a1a87274c0100006c493046022100b4251ecd63778a3dde0155abe4cd162947620ae9ee45a874353551092325b116022100db307baf4ff3781ec520bd18f387948cedd15dc27bafe17c894b0fe6ffffcafa012103091137f3ef23f4acfc19a5953a68b2074fae942ad3563ef28c33b0cac9a93adcffffffffcb4ed1baba3a1eb2171e00ddec8e5b72b346dd8c07f9c2b0d122d0d06bc92ea7000000006c493046022100a9b617843b68c284715d3e02fd120479cd0d96a6c43bf01e697fb0a460a21a3a022100ba0a12fbe8b993d4e7911fa3467615765dbe421ddf5c51b57a9c1ee19dcc00ba012103e633b4fa4ceb705c2da712390767199be8ef2448b3095dc01652e11b2b751505ffffffffc1b37ae964f605978022f94ce2f3f676d66a46d1aef7c2c17d6315b9697f2f75010000006a473044022079bd62ee09621a3be96b760c39e8ef78170101d46313923c6b07ae60a95c90670220238e51ea29fc70b04b65508450523caedbb11cb4dd5aa608c81487de798925ba0121027a759be8df971a6a04fafcb4f6babf75dc811c5cdaa0734cddbe9b942ce75b34ffffffffedd005dc7790ef65c206abd1ab718e75252a40f4b1310e4102cd692eca9cacb0d10000006b48304502207722d6f9038673c86a1019b1c4de2d687ae246477cd4ca7002762be0299de385022100e594a11e3a313942595f7666dcf7078bcb14f1330f4206b95c917e7ec0e82fac012103091137f3ef23f4acfc19a5953a68b2074fae942ad3563ef28c33b0cac9a93adcffffffffdf28d6e26fb7a85a1e6a229b972c1bae0edc1c11cb9ca51e4caf5e59fbea35a1000000006b483045022100a63a4788027b79b65c6f9d9e054f68cf3b4eed19efd82a2d53f70dcbe64683390220526f243671425b2bd05745fcf2729361f985cfe84ea80c7cfc817b93d8134374012103a621f08be22d1bbdcbe4e527ee4927006aa555fc65e2aafa767d4ea2fe9dfa52ffffffffae2a2320a1582faa24469eff3024a6b98bfe00eb4f554d8a0b1421ba53bfd6a5010000006c493046022100b200ac6db16842f76dab9abe807ce423c992805879bc50abd46ed8275a59d9cf022100c0d518e85dd345b3c29dd4dc47b9a420d3ce817b18720e94966d2fe23413a408012103091137f3ef23f4acfc19a5953a68b2074fae942ad3563ef28c33b0cac9a93adcffffffffb3cc5a12548aa1794b4d2bbf076838cfd7fbafb7716da51ee8221a4ff19c291b000000006b483045022100ededc441c3103a6f2bd6cab7639421af0f6ec5e60503bce1e603cf34f00aee1c02205cb75f3f519a13fb348783b21db3085cb5ec7552c59e394fdbc3e1feea43f967012103a621f08be22d1bbdcbe4e527ee4927006aa555fc65e2aafa767d4ea2fe9dfa52ffffffff85145367313888d2cf2747274a32e20b2df074027bafd6f970003fcbcdf11d07150000006b483045022100d9eed5413d2a4b4b98625aa6e3169edc4fb4663e7862316d69224454e70cd8ca022061e506521d5ced51dd0ea36496e75904d756a4c4f9fb111568555075d5f68d9a012103f1575d6124ac78be398c25b31146d08313c6072d23a4d7df5ac6a9f87346c64cffffffff8292c11f6d35abab5bac3ebb627a4ff949e8ecd62d33ed137adf7aeb00e512b0090000006b48304502207e84b27139c4c19c828cb1e30c349bba88e4d9b59be97286960793b5ddc0a2af0221008cdc7a951e7f31c20953ed5635fbabf228e80b7047f32faaa0313e7693005177012103f1575d6124ac78be398c25b31146d08313c6072d23a4d7df5ac6a9f87346c64cffffffff883dcf9a86063db088ad064d0953258d4b0ff3425857402d2f3f839cee0f84581e0000006a4730440220426540dfed9c4ab5812e5f06df705b8bcf307dd7d20f7fa6512298b2a6314f420220064055096e3ca62f6c7352c66a5447767c53f946acdf35025ab3807ddb2fa404012103f1575d6124ac78be398c25b31146d08313c6072d23a4d7df5ac6a9f87346c64cffffffff6697dbb3ed98afe481b568459fa67e503f8a4254532465a670e54669d19c9fe6720000006a47304402200a5e673996f2fc88e21cc8613611f08a650bc0370338803591d85d0ec5663764022040b6664a0d1ec83a7f01975b8fde5232992b8ca58bf48af6725d2f92a936ab2e012103f1575d6124ac78be398c25b31146d08313c6072d23a4d7df5ac6a9f87346c64cffffffff023ffc2182517e1d3fa0896c5b0bd7b4d2ef8a1e42655abe2ced54f657125d59670000006c493046022100d93b30219c5735f673be5c3b4688366d96f545561c74cb62c6958c00f6960806022100ec8200adcb028f2184fa2a4f6faac7f8bb57cb4503bb7584ac11051fece31b3d012103091137f3ef23f4acfc19a5953a68b2074fae942ad3563ef28c33b0cac9a93adcffffffff16f8c77166b0df3d7cc8b5b2ce825afbea9309ad7acd8e2461a255958f81fc06010000006b483045022100a13934e68d3f5b22b130c4cb33f4da468cffc52323a47fbfbe06b64858162246022047081e0a70ff770e64a2e2d31e5d520d9102268b57a47009a72fe73ec766901801210234b9d9413f247bb78cd3293b7b65a2c38018ba5621ea9ee737f3a6a3523fb4cdffffffff197b96f3c87a3adfaa17f63fddc2a738a690ca665439f9431dbbd655816c41fb000000006c49304602210097f1f35d5bdc1a3a60390a1b015b8e7c4f916aa3847aafd969e04975e15bbe70022100a9052eb25517d481f1fda1b129eb1b534da50ea1a51f3ee012dca3601c11b86a0121027a759be8df971a6a04fafcb4f6babf75dc811c5cdaa0734cddbe9b942ce75b34ffffffff20d9a261ee27aa1bd92e7db2fdca935909a40b648e974cd24a10d63b68b94039dd0000006b483045022012b3138c591bf7154b6fef457f2c4a3c7162225003788ac0024a99355865ff13022100b71b125ae1ffb2e1d1571f580cd3ebc8cd049a2d7a8a41f138ba94aeb982106f012103091137f3ef23f4acfc19a5953a68b2074fae942ad3563ef28c33b0cac9a93adcffffffff50f179d5d16cd872f9a63c26c448464ae9bd95cd9421c0476113b5d314571b71010000006b483045022100f834ccc8b22ee72712a3e5e6ef4acb8b2fb791b5385b70e2cd4332674d6667f4022024fbda0a997e0c253503f217501f508a4d56edce2c813ecdd9ad796dbeba907401210234b9d9413f247bb78cd3293b7b65a2c38018ba5621ea9ee737f3a6a3523fb4cdffffffff551b865d1568ac0a305e5f9c5dae6c540982334efbe789074318e0efc5b564631b0000006b48304502203b2fd1e39ae0e469d7a15768f262661b0de41470daf0fe8c4fd0c26542a0870002210081c57e331f9a2d214457d953e3542904727ee412c63028113635d7224da3dccc012103f1575d6124ac78be398c25b31146d08313c6072d23a4d7df5ac6a9f87346c64cffffffff57503e5a016189d407a721791459280875264f908ca2c5d4862c01386e7fb50b470400006b48304502206947a9c54f0664ece4430fd4ae999891dc50bb6126bc36b6a15a3189f29d25e9022100a86cfc4e2fdd9e39a20e305cfd1b76509c67b3e313e0f118229105caa0e823c9012103f1575d6124ac78be398c25b31146d08313c6072d23a4d7df5ac6a9f87346c64cffffffff3f16c1fb9d3e1a26d872933e955df85ee7f3f817711062b00b54a2144827349b250000006b483045022100c7128fe10b2d38744ae8177776054c29fc8ec13f07207723e70766ab7164847402201d2cf09009b9596de74c0183d1ab832e5edddb7a9965880bb400097e850850f8012103f1575d6124ac78be398c25b31146d08313c6072d23a4d7df5ac6a9f87346c64cffffffff4142a69d85b8498af214f0dd427b6ab29c240a0b8577e2944d37a7d8c05c6bb8140000006b48304502203b89a71628a28cc3703d170ca3be77786cff6b867e38a18b719705f8a326578f022100b2a9879e1acf621faa6466c207746a7f3eb4c8514c1482969aba3f2a957f1321012103f1575d6124ac78be398c25b31146d08313c6072d23a4d7df5ac6a9f87346c64cffffffff36e2feecc0a4bff7480015d42c12121932db389025ed0ac1d344ecee53230a3df20000006c493046022100ef794a8ef7fd6752d2a183c18866ff6e8dc0f5bd889a63e2c21cf303a6302461022100c1b09662d9e92988c3f9fcf17d1bcc79b5403647095d7212b9f8a1278a532d68012103091137f3ef23f4acfc19a5953a68b2074fae942ad3563ef28c33b0cac9a93adcffffffff0160f73608000000001976a9148fd139bb39ced713f231c58a4d07bf6954d1c20188ac00000000"
+}
diff --git a/src/test/data/tt-locktime317000-out.json b/src/test/data/tt-locktime317000-out.json
new file mode 100644
index 0000000000000..65b6a4451b26a
--- /dev/null
+++ b/src/test/data/tt-locktime317000-out.json
@@ -0,0 +1,225 @@
+{
+    "txid": "aded538f642c17e15f4d3306b8be7e1a4d1ae0c4616d641ab51ea09ba65e5cb5",
+    "version": 1,
+    "locktime": 317000,
+    "vin": [
+        {
+            "txid": "27871a1a27d833e99cd392a502a647beaaeda6da535417501c76312d52235cfd",
+            "vout": 332,
+            "scriptSig": {
+                "asm": "3046022100b4251ecd63778a3dde0155abe4cd162947620ae9ee45a874353551092325b116022100db307baf4ff3781ec520bd18f387948cedd15dc27bafe17c894b0fe6ffffcafa[ALL] 03091137f3ef23f4acfc19a5953a68b2074fae942ad3563ef28c33b0cac9a93adc",
+                "hex": "493046022100b4251ecd63778a3dde0155abe4cd162947620ae9ee45a874353551092325b116022100db307baf4ff3781ec520bd18f387948cedd15dc27bafe17c894b0fe6ffffcafa012103091137f3ef23f4acfc19a5953a68b2074fae942ad3563ef28c33b0cac9a93adc"
+            },
+            "sequence": 4294967295
+        }, 
+        {
+            "txid": "a72ec96bd0d022d1b0c2f9078cdd46b3725b8eecdd001e17b21e3ababad14ecb",
+            "vout": 0,
+            "scriptSig": {
+                "asm": "3046022100a9b617843b68c284715d3e02fd120479cd0d96a6c43bf01e697fb0a460a21a3a022100ba0a12fbe8b993d4e7911fa3467615765dbe421ddf5c51b57a9c1ee19dcc00ba[ALL] 03e633b4fa4ceb705c2da712390767199be8ef2448b3095dc01652e11b2b751505",
+                "hex": "493046022100a9b617843b68c284715d3e02fd120479cd0d96a6c43bf01e697fb0a460a21a3a022100ba0a12fbe8b993d4e7911fa3467615765dbe421ddf5c51b57a9c1ee19dcc00ba012103e633b4fa4ceb705c2da712390767199be8ef2448b3095dc01652e11b2b751505"
+            },
+            "sequence": 4294967295
+        }, 
+        {
+            "txid": "752f7f69b915637dc1c2f7aed1466ad676f6f3e24cf922809705f664e97ab3c1",
+            "vout": 1,
+            "scriptSig": {
+                "asm": "3044022079bd62ee09621a3be96b760c39e8ef78170101d46313923c6b07ae60a95c90670220238e51ea29fc70b04b65508450523caedbb11cb4dd5aa608c81487de798925ba[ALL] 027a759be8df971a6a04fafcb4f6babf75dc811c5cdaa0734cddbe9b942ce75b34",
+                "hex": "473044022079bd62ee09621a3be96b760c39e8ef78170101d46313923c6b07ae60a95c90670220238e51ea29fc70b04b65508450523caedbb11cb4dd5aa608c81487de798925ba0121027a759be8df971a6a04fafcb4f6babf75dc811c5cdaa0734cddbe9b942ce75b34"
+            },
+            "sequence": 4294967295
+        }, 
+        {
+            "txid": "b0ac9cca2e69cd02410e31b1f4402a25758e71abd1ab06c265ef9077dc05d0ed",
+            "vout": 209,
+            "scriptSig": {
+                "asm": "304502207722d6f9038673c86a1019b1c4de2d687ae246477cd4ca7002762be0299de385022100e594a11e3a313942595f7666dcf7078bcb14f1330f4206b95c917e7ec0e82fac[ALL] 03091137f3ef23f4acfc19a5953a68b2074fae942ad3563ef28c33b0cac9a93adc",
+                "hex": "48304502207722d6f9038673c86a1019b1c4de2d687ae246477cd4ca7002762be0299de385022100e594a11e3a313942595f7666dcf7078bcb14f1330f4206b95c917e7ec0e82fac012103091137f3ef23f4acfc19a5953a68b2074fae942ad3563ef28c33b0cac9a93adc"
+            },
+            "sequence": 4294967295
+        }, 
+        {
+            "txid": "a135eafb595eaf4c1ea59ccb111cdc0eae1b2c979b226a1e5aa8b76fe2d628df",
+            "vout": 0,
+            "scriptSig": {
+                "asm": "3045022100a63a4788027b79b65c6f9d9e054f68cf3b4eed19efd82a2d53f70dcbe64683390220526f243671425b2bd05745fcf2729361f985cfe84ea80c7cfc817b93d8134374[ALL] 03a621f08be22d1bbdcbe4e527ee4927006aa555fc65e2aafa767d4ea2fe9dfa52",
+                "hex": "483045022100a63a4788027b79b65c6f9d9e054f68cf3b4eed19efd82a2d53f70dcbe64683390220526f243671425b2bd05745fcf2729361f985cfe84ea80c7cfc817b93d8134374012103a621f08be22d1bbdcbe4e527ee4927006aa555fc65e2aafa767d4ea2fe9dfa52"
+            },
+            "sequence": 4294967295
+        }, 
+        {
+            "txid": "a5d6bf53ba21140b8a4d554feb00fe8bb9a62430ff9e4624aa2f58a120232aae",
+            "vout": 1,
+            "scriptSig": {
+                "asm": "3046022100b200ac6db16842f76dab9abe807ce423c992805879bc50abd46ed8275a59d9cf022100c0d518e85dd345b3c29dd4dc47b9a420d3ce817b18720e94966d2fe23413a408[ALL] 03091137f3ef23f4acfc19a5953a68b2074fae942ad3563ef28c33b0cac9a93adc",
+                "hex": "493046022100b200ac6db16842f76dab9abe807ce423c992805879bc50abd46ed8275a59d9cf022100c0d518e85dd345b3c29dd4dc47b9a420d3ce817b18720e94966d2fe23413a408012103091137f3ef23f4acfc19a5953a68b2074fae942ad3563ef28c33b0cac9a93adc"
+            },
+            "sequence": 4294967295
+        }, 
+        {
+            "txid": "1b299cf14f1a22e81ea56d71b7affbd7cf386807bf2b4d4b79a18a54125accb3",
+            "vout": 0,
+            "scriptSig": {
+                "asm": "3045022100ededc441c3103a6f2bd6cab7639421af0f6ec5e60503bce1e603cf34f00aee1c02205cb75f3f519a13fb348783b21db3085cb5ec7552c59e394fdbc3e1feea43f967[ALL] 03a621f08be22d1bbdcbe4e527ee4927006aa555fc65e2aafa767d4ea2fe9dfa52",
+                "hex": "483045022100ededc441c3103a6f2bd6cab7639421af0f6ec5e60503bce1e603cf34f00aee1c02205cb75f3f519a13fb348783b21db3085cb5ec7552c59e394fdbc3e1feea43f967012103a621f08be22d1bbdcbe4e527ee4927006aa555fc65e2aafa767d4ea2fe9dfa52"
+            },
+            "sequence": 4294967295
+        }, 
+        {
+            "txid": "071df1cdcb3f0070f9d6af7b0274f02d0be2324a274727cfd288383167531485",
+            "vout": 21,
+            "scriptSig": {
+                "asm": "3045022100d9eed5413d2a4b4b98625aa6e3169edc4fb4663e7862316d69224454e70cd8ca022061e506521d5ced51dd0ea36496e75904d756a4c4f9fb111568555075d5f68d9a[ALL] 03f1575d6124ac78be398c25b31146d08313c6072d23a4d7df5ac6a9f87346c64c",
+                "hex": "483045022100d9eed5413d2a4b4b98625aa6e3169edc4fb4663e7862316d69224454e70cd8ca022061e506521d5ced51dd0ea36496e75904d756a4c4f9fb111568555075d5f68d9a012103f1575d6124ac78be398c25b31146d08313c6072d23a4d7df5ac6a9f87346c64c"
+            },
+            "sequence": 4294967295
+        }, 
+        {
+            "txid": "b012e500eb7adf7a13ed332dd6ece849f94f7a62bb3eac5babab356d1fc19282",
+            "vout": 9,
+            "scriptSig": {
+                "asm": "304502207e84b27139c4c19c828cb1e30c349bba88e4d9b59be97286960793b5ddc0a2af0221008cdc7a951e7f31c20953ed5635fbabf228e80b7047f32faaa0313e7693005177[ALL] 03f1575d6124ac78be398c25b31146d08313c6072d23a4d7df5ac6a9f87346c64c",
+                "hex": "48304502207e84b27139c4c19c828cb1e30c349bba88e4d9b59be97286960793b5ddc0a2af0221008cdc7a951e7f31c20953ed5635fbabf228e80b7047f32faaa0313e7693005177012103f1575d6124ac78be398c25b31146d08313c6072d23a4d7df5ac6a9f87346c64c"
+            },
+            "sequence": 4294967295
+        }, 
+        {
+            "txid": "58840fee9c833f2f2d40575842f30f4b8d2553094d06ad88b03d06869acf3d88",
+            "vout": 30,
+            "scriptSig": {
+                "asm": "30440220426540dfed9c4ab5812e5f06df705b8bcf307dd7d20f7fa6512298b2a6314f420220064055096e3ca62f6c7352c66a5447767c53f946acdf35025ab3807ddb2fa404[ALL] 03f1575d6124ac78be398c25b31146d08313c6072d23a4d7df5ac6a9f87346c64c",
+                "hex": "4730440220426540dfed9c4ab5812e5f06df705b8bcf307dd7d20f7fa6512298b2a6314f420220064055096e3ca62f6c7352c66a5447767c53f946acdf35025ab3807ddb2fa404012103f1575d6124ac78be398c25b31146d08313c6072d23a4d7df5ac6a9f87346c64c"
+            },
+            "sequence": 4294967295
+        }, 
+        {
+            "txid": "e69f9cd16946e570a665245354428a3f507ea69f4568b581e4af98edb3db9766",
+            "vout": 114,
+            "scriptSig": {
+                "asm": "304402200a5e673996f2fc88e21cc8613611f08a650bc0370338803591d85d0ec5663764022040b6664a0d1ec83a7f01975b8fde5232992b8ca58bf48af6725d2f92a936ab2e[ALL] 03f1575d6124ac78be398c25b31146d08313c6072d23a4d7df5ac6a9f87346c64c",
+                "hex": "47304402200a5e673996f2fc88e21cc8613611f08a650bc0370338803591d85d0ec5663764022040b6664a0d1ec83a7f01975b8fde5232992b8ca58bf48af6725d2f92a936ab2e012103f1575d6124ac78be398c25b31146d08313c6072d23a4d7df5ac6a9f87346c64c"
+            },
+            "sequence": 4294967295
+        }, 
+        {
+            "txid": "595d1257f654ed2cbe5a65421e8aefd2b4d70b5b6c89a03f1d7e518221fc3f02",
+            "vout": 103,
+            "scriptSig": {
+                "asm": "3046022100d93b30219c5735f673be5c3b4688366d96f545561c74cb62c6958c00f6960806022100ec8200adcb028f2184fa2a4f6faac7f8bb57cb4503bb7584ac11051fece31b3d[ALL] 03091137f3ef23f4acfc19a5953a68b2074fae942ad3563ef28c33b0cac9a93adc",
+                "hex": "493046022100d93b30219c5735f673be5c3b4688366d96f545561c74cb62c6958c00f6960806022100ec8200adcb028f2184fa2a4f6faac7f8bb57cb4503bb7584ac11051fece31b3d012103091137f3ef23f4acfc19a5953a68b2074fae942ad3563ef28c33b0cac9a93adc"
+            },
+            "sequence": 4294967295
+        }, 
+        {
+            "txid": "06fc818f9555a261248ecd7aad0993eafb5a82ceb2b5c87c3ddfb06671c7f816",
+            "vout": 1,
+            "scriptSig": {
+                "asm": "3045022100a13934e68d3f5b22b130c4cb33f4da468cffc52323a47fbfbe06b64858162246022047081e0a70ff770e64a2e2d31e5d520d9102268b57a47009a72fe73ec7669018[ALL] 0234b9d9413f247bb78cd3293b7b65a2c38018ba5621ea9ee737f3a6a3523fb4cd",
+                "hex": "483045022100a13934e68d3f5b22b130c4cb33f4da468cffc52323a47fbfbe06b64858162246022047081e0a70ff770e64a2e2d31e5d520d9102268b57a47009a72fe73ec766901801210234b9d9413f247bb78cd3293b7b65a2c38018ba5621ea9ee737f3a6a3523fb4cd"
+            },
+            "sequence": 4294967295
+        }, 
+        {
+            "txid": "fb416c8155d6bb1d43f9395466ca90a638a7c2dd3ff617aadf3a7ac8f3967b19",
+            "vout": 0,
+            "scriptSig": {
+                "asm": "304602210097f1f35d5bdc1a3a60390a1b015b8e7c4f916aa3847aafd969e04975e15bbe70022100a9052eb25517d481f1fda1b129eb1b534da50ea1a51f3ee012dca3601c11b86a[ALL] 027a759be8df971a6a04fafcb4f6babf75dc811c5cdaa0734cddbe9b942ce75b34",
+                "hex": "49304602210097f1f35d5bdc1a3a60390a1b015b8e7c4f916aa3847aafd969e04975e15bbe70022100a9052eb25517d481f1fda1b129eb1b534da50ea1a51f3ee012dca3601c11b86a0121027a759be8df971a6a04fafcb4f6babf75dc811c5cdaa0734cddbe9b942ce75b34"
+            },
+            "sequence": 4294967295
+        }, 
+        {
+            "txid": "3940b9683bd6104ad24c978e640ba4095993cafdb27d2ed91baa27ee61a2d920",
+            "vout": 221,
+            "scriptSig": {
+                "asm": "3045022012b3138c591bf7154b6fef457f2c4a3c7162225003788ac0024a99355865ff13022100b71b125ae1ffb2e1d1571f580cd3ebc8cd049a2d7a8a41f138ba94aeb982106f[ALL] 03091137f3ef23f4acfc19a5953a68b2074fae942ad3563ef28c33b0cac9a93adc",
+                "hex": "483045022012b3138c591bf7154b6fef457f2c4a3c7162225003788ac0024a99355865ff13022100b71b125ae1ffb2e1d1571f580cd3ebc8cd049a2d7a8a41f138ba94aeb982106f012103091137f3ef23f4acfc19a5953a68b2074fae942ad3563ef28c33b0cac9a93adc"
+            },
+            "sequence": 4294967295
+        }, 
+        {
+            "txid": "711b5714d3b5136147c02194cd95bde94a4648c4263ca6f972d86cd1d579f150",
+            "vout": 1,
+            "scriptSig": {
+                "asm": "3045022100f834ccc8b22ee72712a3e5e6ef4acb8b2fb791b5385b70e2cd4332674d6667f4022024fbda0a997e0c253503f217501f508a4d56edce2c813ecdd9ad796dbeba9074[ALL] 0234b9d9413f247bb78cd3293b7b65a2c38018ba5621ea9ee737f3a6a3523fb4cd",
+                "hex": "483045022100f834ccc8b22ee72712a3e5e6ef4acb8b2fb791b5385b70e2cd4332674d6667f4022024fbda0a997e0c253503f217501f508a4d56edce2c813ecdd9ad796dbeba907401210234b9d9413f247bb78cd3293b7b65a2c38018ba5621ea9ee737f3a6a3523fb4cd"
+            },
+            "sequence": 4294967295
+        }, 
+        {
+            "txid": "6364b5c5efe018430789e7fb4e338209546cae5d9c5f5e300aac68155d861b55",
+            "vout": 27,
+            "scriptSig": {
+                "asm": "304502203b2fd1e39ae0e469d7a15768f262661b0de41470daf0fe8c4fd0c26542a0870002210081c57e331f9a2d214457d953e3542904727ee412c63028113635d7224da3dccc[ALL] 03f1575d6124ac78be398c25b31146d08313c6072d23a4d7df5ac6a9f87346c64c",
+                "hex": "48304502203b2fd1e39ae0e469d7a15768f262661b0de41470daf0fe8c4fd0c26542a0870002210081c57e331f9a2d214457d953e3542904727ee412c63028113635d7224da3dccc012103f1575d6124ac78be398c25b31146d08313c6072d23a4d7df5ac6a9f87346c64c"
+            },
+            "sequence": 4294967295
+        }, 
+        {
+            "txid": "0bb57f6e38012c86d4c5a28c904f2675082859147921a707d48961015a3e5057",
+            "vout": 1095,
+            "scriptSig": {
+                "asm": "304502206947a9c54f0664ece4430fd4ae999891dc50bb6126bc36b6a15a3189f29d25e9022100a86cfc4e2fdd9e39a20e305cfd1b76509c67b3e313e0f118229105caa0e823c9[ALL] 03f1575d6124ac78be398c25b31146d08313c6072d23a4d7df5ac6a9f87346c64c",
+                "hex": "48304502206947a9c54f0664ece4430fd4ae999891dc50bb6126bc36b6a15a3189f29d25e9022100a86cfc4e2fdd9e39a20e305cfd1b76509c67b3e313e0f118229105caa0e823c9012103f1575d6124ac78be398c25b31146d08313c6072d23a4d7df5ac6a9f87346c64c"
+            },
+            "sequence": 4294967295
+        }, 
+        {
+            "txid": "9b34274814a2540bb062107117f8f3e75ef85d953e9372d8261a3e9dfbc1163f",
+            "vout": 37,
+            "scriptSig": {
+                "asm": "3045022100c7128fe10b2d38744ae8177776054c29fc8ec13f07207723e70766ab7164847402201d2cf09009b9596de74c0183d1ab832e5edddb7a9965880bb400097e850850f8[ALL] 03f1575d6124ac78be398c25b31146d08313c6072d23a4d7df5ac6a9f87346c64c",
+                "hex": "483045022100c7128fe10b2d38744ae8177776054c29fc8ec13f07207723e70766ab7164847402201d2cf09009b9596de74c0183d1ab832e5edddb7a9965880bb400097e850850f8012103f1575d6124ac78be398c25b31146d08313c6072d23a4d7df5ac6a9f87346c64c"
+            },
+            "sequence": 4294967295
+        }, 
+        {
+            "txid": "b86b5cc0d8a7374d94e277850b0a249cb26a7b42ddf014f28a49b8859da64241",
+            "vout": 20,
+            "scriptSig": {
+                "asm": "304502203b89a71628a28cc3703d170ca3be77786cff6b867e38a18b719705f8a326578f022100b2a9879e1acf621faa6466c207746a7f3eb4c8514c1482969aba3f2a957f1321[ALL] 03f1575d6124ac78be398c25b31146d08313c6072d23a4d7df5ac6a9f87346c64c",
+                "hex": "48304502203b89a71628a28cc3703d170ca3be77786cff6b867e38a18b719705f8a326578f022100b2a9879e1acf621faa6466c207746a7f3eb4c8514c1482969aba3f2a957f1321012103f1575d6124ac78be398c25b31146d08313c6072d23a4d7df5ac6a9f87346c64c"
+            },
+            "sequence": 4294967295
+        }, 
+        {
+            "txid": "3d0a2353eeec44d3c10aed259038db321912122cd4150048f7bfa4c0ecfee236",
+            "vout": 242,
+            "scriptSig": {
+                "asm": "3046022100ef794a8ef7fd6752d2a183c18866ff6e8dc0f5bd889a63e2c21cf303a6302461022100c1b09662d9e92988c3f9fcf17d1bcc79b5403647095d7212b9f8a1278a532d68[ALL] 03091137f3ef23f4acfc19a5953a68b2074fae942ad3563ef28c33b0cac9a93adc",
+                "hex": "493046022100ef794a8ef7fd6752d2a183c18866ff6e8dc0f5bd889a63e2c21cf303a6302461022100c1b09662d9e92988c3f9fcf17d1bcc79b5403647095d7212b9f8a1278a532d68012103091137f3ef23f4acfc19a5953a68b2074fae942ad3563ef28c33b0cac9a93adc"
+            },
+            "sequence": 4294967295
+        }
+    ],
+    "vout": [
+        {
+            "value": 1.3782,
+            "n": 0,
+            "scriptPubKey": {
+                "asm": "OP_DUP OP_HASH160 8fd139bb39ced713f231c58a4d07bf6954d1c201 OP_EQUALVERIFY OP_CHECKSIG",
+                "hex": "76a9148fd139bb39ced713f231c58a4d07bf6954d1c20188ac",
+                "reqSigs": 1,
+                "type": "pubkeyhash",
+                "addresses": [
+                    "1E7SGgAZFCHDnVZLuRViX3gUmxpMfdvd2o"
+                ]
+            }
+        }, 
+        {
+            "value": 0.01000001,
+            "n": 1,
+            "scriptPubKey": {
+                "asm": "OP_DUP OP_HASH160 6c772e9cf96371bba3da8cb733da70a2fcf20078 OP_EQUALVERIFY OP_CHECKSIG",
+                "hex": "76a9146c772e9cf96371bba3da8cb733da70a2fcf2007888ac",
+                "reqSigs": 1,
+                "type": "pubkeyhash",
+                "addresses": [
+                    "1AtWkdmfmYkErU16d3KYykJUbEp9MAj9Sb"
+                ]
+            }
+        }
+    ],
+    "hex": "0100000015fd5c23522d31761c50175453daa6edaabe47a602a592d39ce933d8271a1a87274c0100006c493046022100b4251ecd63778a3dde0155abe4cd162947620ae9ee45a874353551092325b116022100db307baf4ff3781ec520bd18f387948cedd15dc27bafe17c894b0fe6ffffcafa012103091137f3ef23f4acfc19a5953a68b2074fae942ad3563ef28c33b0cac9a93adcffffffffcb4ed1baba3a1eb2171e00ddec8e5b72b346dd8c07f9c2b0d122d0d06bc92ea7000000006c493046022100a9b617843b68c284715d3e02fd120479cd0d96a6c43bf01e697fb0a460a21a3a022100ba0a12fbe8b993d4e7911fa3467615765dbe421ddf5c51b57a9c1ee19dcc00ba012103e633b4fa4ceb705c2da712390767199be8ef2448b3095dc01652e11b2b751505ffffffffc1b37ae964f605978022f94ce2f3f676d66a46d1aef7c2c17d6315b9697f2f75010000006a473044022079bd62ee09621a3be96b760c39e8ef78170101d46313923c6b07ae60a95c90670220238e51ea29fc70b04b65508450523caedbb11cb4dd5aa608c81487de798925ba0121027a759be8df971a6a04fafcb4f6babf75dc811c5cdaa0734cddbe9b942ce75b34ffffffffedd005dc7790ef65c206abd1ab718e75252a40f4b1310e4102cd692eca9cacb0d10000006b48304502207722d6f9038673c86a1019b1c4de2d687ae246477cd4ca7002762be0299de385022100e594a11e3a313942595f7666dcf7078bcb14f1330f4206b95c917e7ec0e82fac012103091137f3ef23f4acfc19a5953a68b2074fae942ad3563ef28c33b0cac9a93adcffffffffdf28d6e26fb7a85a1e6a229b972c1bae0edc1c11cb9ca51e4caf5e59fbea35a1000000006b483045022100a63a4788027b79b65c6f9d9e054f68cf3b4eed19efd82a2d53f70dcbe64683390220526f243671425b2bd05745fcf2729361f985cfe84ea80c7cfc817b93d8134374012103a621f08be22d1bbdcbe4e527ee4927006aa555fc65e2aafa767d4ea2fe9dfa52ffffffffae2a2320a1582faa24469eff3024a6b98bfe00eb4f554d8a0b1421ba53bfd6a5010000006c493046022100b200ac6db16842f76dab9abe807ce423c992805879bc50abd46ed8275a59d9cf022100c0d518e85dd345b3c29dd4dc47b9a420d3ce817b18720e94966d2fe23413a408012103091137f3ef23f4acfc19a5953a68b2074fae942ad3563ef28c33b0cac9a93adcffffffffb3cc5a12548aa1794b4d2bbf076838cfd7fbafb7716da51ee8221a4ff19c291b000000006b483045022100ededc441c3103a6f2bd6cab7639421af0f6ec5e60503bce1e603cf34f00aee1c02205cb75f3f519a13fb348783b21db3085cb5ec7552c59e394fdbc3e1feea43f967012103a621f08be22d1bbdcbe4e527ee4927006aa555fc65e2aafa767d4ea2fe9dfa52ffffffff85145367313888d2cf2747274a32e20b2df074027bafd6f970003fcbcdf11d07150000006b483045022100d9eed5413d2a4b4b98625aa6e3169edc4fb4663e7862316d69224454e70cd8ca022061e506521d5ced51dd0ea36496e75904d756a4c4f9fb111568555075d5f68d9a012103f1575d6124ac78be398c25b31146d08313c6072d23a4d7df5ac6a9f87346c64cffffffff8292c11f6d35abab5bac3ebb627a4ff949e8ecd62d33ed137adf7aeb00e512b0090000006b48304502207e84b27139c4c19c828cb1e30c349bba88e4d9b59be97286960793b5ddc0a2af0221008cdc7a951e7f31c20953ed5635fbabf228e80b7047f32faaa0313e7693005177012103f1575d6124ac78be398c25b31146d08313c6072d23a4d7df5ac6a9f87346c64cffffffff883dcf9a86063db088ad064d0953258d4b0ff3425857402d2f3f839cee0f84581e0000006a4730440220426540dfed9c4ab5812e5f06df705b8bcf307dd7d20f7fa6512298b2a6314f420220064055096e3ca62f6c7352c66a5447767c53f946acdf35025ab3807ddb2fa404012103f1575d6124ac78be398c25b31146d08313c6072d23a4d7df5ac6a9f87346c64cffffffff6697dbb3ed98afe481b568459fa67e503f8a4254532465a670e54669d19c9fe6720000006a47304402200a5e673996f2fc88e21cc8613611f08a650bc0370338803591d85d0ec5663764022040b6664a0d1ec83a7f01975b8fde5232992b8ca58bf48af6725d2f92a936ab2e012103f1575d6124ac78be398c25b31146d08313c6072d23a4d7df5ac6a9f87346c64cffffffff023ffc2182517e1d3fa0896c5b0bd7b4d2ef8a1e42655abe2ced54f657125d59670000006c493046022100d93b30219c5735f673be5c3b4688366d96f545561c74cb62c6958c00f6960806022100ec8200adcb028f2184fa2a4f6faac7f8bb57cb4503bb7584ac11051fece31b3d012103091137f3ef23f4acfc19a5953a68b2074fae942ad3563ef28c33b0cac9a93adcffffffff16f8c77166b0df3d7cc8b5b2ce825afbea9309ad7acd8e2461a255958f81fc06010000006b483045022100a13934e68d3f5b22b130c4cb33f4da468cffc52323a47fbfbe06b64858162246022047081e0a70ff770e64a2e2d31e5d520d9102268b57a47009a72fe73ec766901801210234b9d9413f247bb78cd3293b7b65a2c38018ba5621ea9ee737f3a6a3523fb4cdffffffff197b96f3c87a3adfaa17f63fddc2a738a690ca665439f9431dbbd655816c41fb000000006c49304602210097f1f35d5bdc1a3a60390a1b015b8e7c4f916aa3847aafd969e04975e15bbe70022100a9052eb25517d481f1fda1b129eb1b534da50ea1a51f3ee012dca3601c11b86a0121027a759be8df971a6a04fafcb4f6babf75dc811c5cdaa0734cddbe9b942ce75b34ffffffff20d9a261ee27aa1bd92e7db2fdca935909a40b648e974cd24a10d63b68b94039dd0000006b483045022012b3138c591bf7154b6fef457f2c4a3c7162225003788ac0024a99355865ff13022100b71b125ae1ffb2e1d1571f580cd3ebc8cd049a2d7a8a41f138ba94aeb982106f012103091137f3ef23f4acfc19a5953a68b2074fae942ad3563ef28c33b0cac9a93adcffffffff50f179d5d16cd872f9a63c26c448464ae9bd95cd9421c0476113b5d314571b71010000006b483045022100f834ccc8b22ee72712a3e5e6ef4acb8b2fb791b5385b70e2cd4332674d6667f4022024fbda0a997e0c253503f217501f508a4d56edce2c813ecdd9ad796dbeba907401210234b9d9413f247bb78cd3293b7b65a2c38018ba5621ea9ee737f3a6a3523fb4cdffffffff551b865d1568ac0a305e5f9c5dae6c540982334efbe789074318e0efc5b564631b0000006b48304502203b2fd1e39ae0e469d7a15768f262661b0de41470daf0fe8c4fd0c26542a0870002210081c57e331f9a2d214457d953e3542904727ee412c63028113635d7224da3dccc012103f1575d6124ac78be398c25b31146d08313c6072d23a4d7df5ac6a9f87346c64cffffffff57503e5a016189d407a721791459280875264f908ca2c5d4862c01386e7fb50b470400006b48304502206947a9c54f0664ece4430fd4ae999891dc50bb6126bc36b6a15a3189f29d25e9022100a86cfc4e2fdd9e39a20e305cfd1b76509c67b3e313e0f118229105caa0e823c9012103f1575d6124ac78be398c25b31146d08313c6072d23a4d7df5ac6a9f87346c64cffffffff3f16c1fb9d3e1a26d872933e955df85ee7f3f817711062b00b54a2144827349b250000006b483045022100c7128fe10b2d38744ae8177776054c29fc8ec13f07207723e70766ab7164847402201d2cf09009b9596de74c0183d1ab832e5edddb7a9965880bb400097e850850f8012103f1575d6124ac78be398c25b31146d08313c6072d23a4d7df5ac6a9f87346c64cffffffff4142a69d85b8498af214f0dd427b6ab29c240a0b8577e2944d37a7d8c05c6bb8140000006b48304502203b89a71628a28cc3703d170ca3be77786cff6b867e38a18b719705f8a326578f022100b2a9879e1acf621faa6466c207746a7f3eb4c8514c1482969aba3f2a957f1321012103f1575d6124ac78be398c25b31146d08313c6072d23a4d7df5ac6a9f87346c64cffffffff36e2feecc0a4bff7480015d42c12121932db389025ed0ac1d344ecee53230a3df20000006c493046022100ef794a8ef7fd6752d2a183c18866ff6e8dc0f5bd889a63e2c21cf303a6302461022100c1b09662d9e92988c3f9fcf17d1bcc79b5403647095d7212b9f8a1278a532d68012103091137f3ef23f4acfc19a5953a68b2074fae942ad3563ef28c33b0cac9a93adcffffffff0260f73608000000001976a9148fd139bb39ced713f231c58a4d07bf6954d1c20188ac41420f00000000001976a9146c772e9cf96371bba3da8cb733da70a2fcf2007888ac48d60400"
+}
diff --git a/src/test/data/txcreate1.json b/src/test/data/txcreate1.json
new file mode 100644
index 0000000000000..3890dbaf6e096
--- /dev/null
+++ b/src/test/data/txcreate1.json
@@ -0,0 +1,63 @@
+{
+    "txid": "f70f0d6c71416ed538e37549f430ab3665fee2437a42f10238c1bd490e782231",
+    "version": 1,
+    "locktime": 0,
+    "vin": [
+        {
+            "txid": "5897de6bd6027a475eadd57019d4e6872c396d0716c4875a5f1a6fcfdf385c1f",
+            "vout": 0,
+            "scriptSig": {
+                "asm": "",
+                "hex": ""
+            },
+            "sequence": 4294967295
+        }, 
+        {
+            "txid": "bf829c6bcf84579331337659d31f89dfd138f7f7785802d5501c92333145ca7c",
+            "vout": 18,
+            "scriptSig": {
+                "asm": "",
+                "hex": ""
+            },
+            "sequence": 4294967295
+        }, 
+        {
+            "txid": "22a6f904655d53ae2ff70e701a0bbd90aa3975c0f40bfc6cc996a9049e31cdfc",
+            "vout": 1,
+            "scriptSig": {
+                "asm": "",
+                "hex": ""
+            },
+            "sequence": 4294967295
+        }
+    ],
+    "vout": [
+        {
+            "value": 0.18,
+            "n": 0,
+            "scriptPubKey": {
+                "asm": "OP_DUP OP_HASH160 1fc11f39be1729bf973a7ab6a615ca4729d64574 OP_EQUALVERIFY OP_CHECKSIG",
+                "hex": "76a9141fc11f39be1729bf973a7ab6a615ca4729d6457488ac",
+                "reqSigs": 1,
+                "type": "pubkeyhash",
+                "addresses": [
+                    "13tuJJDR2RgArmgfv6JScSdreahzgc4T6o"
+                ]
+            }
+        }, 
+        {
+            "value": 4.00,
+            "n": 1,
+            "scriptPubKey": {
+                "asm": "OP_DUP OP_HASH160 f2d4db28cad6502226ee484ae24505c2885cb12d OP_EQUALVERIFY OP_CHECKSIG",
+                "hex": "76a914f2d4db28cad6502226ee484ae24505c2885cb12d88ac",
+                "reqSigs": 1,
+                "type": "pubkeyhash",
+                "addresses": [
+                    "1P8yWvZW8jVihP1bzHeqfE4aoXNX8AVa46"
+                ]
+            }
+        }
+    ],
+    "hex": "01000000031f5c38dfcf6f1a5f5a87c416076d392c87e6d41970d5ad5e477a02d66bde97580000000000ffffffff7cca453133921c50d5025878f7f738d1df891fd359763331935784cf6b9c82bf1200000000fffffffffccd319e04a996c96cfc0bf4c07539aa90bd0b1a700ef72fae535d6504f9a6220100000000ffffffff0280a81201000000001976a9141fc11f39be1729bf973a7ab6a615ca4729d6457488ac0084d717000000001976a914f2d4db28cad6502226ee484ae24505c2885cb12d88ac00000000"
+}
diff --git a/src/test/data/txcreate2.json b/src/test/data/txcreate2.json
new file mode 100644
index 0000000000000..e69de29bb2d1d
diff --git a/src/test/data/txcreatedata1.json b/src/test/data/txcreatedata1.json
new file mode 100644
index 0000000000000..2fed228108728
--- /dev/null
+++ b/src/test/data/txcreatedata1.json
@@ -0,0 +1,41 @@
+{
+    "txid": "07894b4d12fe7853dd911402db1620920d261b9627c447f931417d330c25f06e",
+    "version": 1,
+    "locktime": 0,
+    "vin": [
+        {
+            "txid": "5897de6bd6027a475eadd57019d4e6872c396d0716c4875a5f1a6fcfdf385c1f",
+            "vout": 0,
+            "scriptSig": {
+                "asm": "",
+                "hex": ""
+            },
+            "sequence": 4294967295
+        }
+    ],
+    "vout": [
+        {
+            "value": 0.18,
+            "n": 0,
+            "scriptPubKey": {
+                "asm": "OP_DUP OP_HASH160 1fc11f39be1729bf973a7ab6a615ca4729d64574 OP_EQUALVERIFY OP_CHECKSIG",
+                "hex": "76a9141fc11f39be1729bf973a7ab6a615ca4729d6457488ac",
+                "reqSigs": 1,
+                "type": "pubkeyhash",
+                "addresses": [
+                    "13tuJJDR2RgArmgfv6JScSdreahzgc4T6o"
+                ]
+            }
+        }, 
+        {
+            "value": 4.00,
+            "n": 1,
+            "scriptPubKey": {
+                "asm": "OP_RETURN 54686973204f505f52455455524e207472616e73616374696f6e206f7574707574207761732063726561746564206279206d6f646966696564206372656174657261777472616e73616374696f6e2e",
+                "hex": "6a4c4f54686973204f505f52455455524e207472616e73616374696f6e206f7574707574207761732063726561746564206279206d6f646966696564206372656174657261777472616e73616374696f6e2e",
+                "type": "nulldata"
+            }
+        }
+    ],
+    "hex": "01000000011f5c38dfcf6f1a5f5a87c416076d392c87e6d41970d5ad5e477a02d66bde97580000000000ffffffff0280a81201000000001976a9141fc11f39be1729bf973a7ab6a615ca4729d6457488ac0084d71700000000526a4c4f54686973204f505f52455455524e207472616e73616374696f6e206f7574707574207761732063726561746564206279206d6f646966696564206372656174657261777472616e73616374696f6e2e00000000"
+}
diff --git a/src/test/data/txcreatedata2.json b/src/test/data/txcreatedata2.json
new file mode 100644
index 0000000000000..3d4d367f37be5
--- /dev/null
+++ b/src/test/data/txcreatedata2.json
@@ -0,0 +1,41 @@
+{
+    "txid": "4ed17118f5e932ba8c75c461787d171bc02a016d8557cb5bcf34cd416c27bb8b",
+    "version": 1,
+    "locktime": 0,
+    "vin": [
+        {
+            "txid": "5897de6bd6027a475eadd57019d4e6872c396d0716c4875a5f1a6fcfdf385c1f",
+            "vout": 0,
+            "scriptSig": {
+                "asm": "",
+                "hex": ""
+            },
+            "sequence": 4294967295
+        }
+    ],
+    "vout": [
+        {
+            "value": 0.18,
+            "n": 0,
+            "scriptPubKey": {
+                "asm": "OP_DUP OP_HASH160 1fc11f39be1729bf973a7ab6a615ca4729d64574 OP_EQUALVERIFY OP_CHECKSIG",
+                "hex": "76a9141fc11f39be1729bf973a7ab6a615ca4729d6457488ac",
+                "reqSigs": 1,
+                "type": "pubkeyhash",
+                "addresses": [
+                    "13tuJJDR2RgArmgfv6JScSdreahzgc4T6o"
+                ]
+            }
+        }, 
+        {
+            "value": 0.00,
+            "n": 1,
+            "scriptPubKey": {
+                "asm": "OP_RETURN 54686973204f505f52455455524e207472616e73616374696f6e206f7574707574207761732063726561746564206279206d6f646966696564206372656174657261777472616e73616374696f6e2e",
+                "hex": "6a4c4f54686973204f505f52455455524e207472616e73616374696f6e206f7574707574207761732063726561746564206279206d6f646966696564206372656174657261777472616e73616374696f6e2e",
+                "type": "nulldata"
+            }
+        }
+    ],
+    "hex": "01000000011f5c38dfcf6f1a5f5a87c416076d392c87e6d41970d5ad5e477a02d66bde97580000000000ffffffff0280a81201000000001976a9141fc11f39be1729bf973a7ab6a615ca4729d6457488ac0000000000000000526a4c4f54686973204f505f52455455524e207472616e73616374696f6e206f7574707574207761732063726561746564206279206d6f646966696564206372656174657261777472616e73616374696f6e2e00000000"
+}
diff --git a/src/test/data/txcreatedata_seq0.json b/src/test/data/txcreatedata_seq0.json
new file mode 100644
index 0000000000000..f25aa43c2b275
--- /dev/null
+++ b/src/test/data/txcreatedata_seq0.json
@@ -0,0 +1,32 @@
+{
+    "txid": "71603ccb1cd76d73d76eb6cfd5f0b9df6d65d90d76860ee52cb461c4be7032e8",
+    "version": 1,
+    "locktime": 0,
+    "vin": [
+        {
+            "txid": "5897de6bd6027a475eadd57019d4e6872c396d0716c4875a5f1a6fcfdf385c1f",
+            "vout": 0,
+            "scriptSig": {
+                "asm": "",
+                "hex": ""
+            },
+            "sequence": 4294967293
+        }
+    ],
+    "vout": [
+        {
+            "value": 0.18,
+            "n": 0,
+            "scriptPubKey": {
+                "asm": "OP_DUP OP_HASH160 1fc11f39be1729bf973a7ab6a615ca4729d64574 OP_EQUALVERIFY OP_CHECKSIG",
+                "hex": "76a9141fc11f39be1729bf973a7ab6a615ca4729d6457488ac",
+                "reqSigs": 1,
+                "type": "pubkeyhash",
+                "addresses": [
+                    "13tuJJDR2RgArmgfv6JScSdreahzgc4T6o"
+                ]
+            }
+        }
+    ],
+    "hex": "01000000011f5c38dfcf6f1a5f5a87c416076d392c87e6d41970d5ad5e477a02d66bde97580000000000fdffffff0180a81201000000001976a9141fc11f39be1729bf973a7ab6a615ca4729d6457488ac00000000"
+}
diff --git a/src/test/data/txcreatedata_seq1.json b/src/test/data/txcreatedata_seq1.json
new file mode 100644
index 0000000000000..33585d6dfad82
--- /dev/null
+++ b/src/test/data/txcreatedata_seq1.json
@@ -0,0 +1,41 @@
+{
+    "txid": "c4dea671b0d7b48f8ab10bc46650e8329d3c5766931f548f513847a19f5ba75b",
+    "version": 1,
+    "locktime": 0,
+    "vin": [
+        {
+            "txid": "5897de6bd6027a475eadd57019d4e6872c396d0716c4875a5f1a6fcfdf385c1f",
+            "vout": 0,
+            "scriptSig": {
+                "asm": "",
+                "hex": ""
+            },
+            "sequence": 4294967293
+        }, 
+        {
+            "txid": "5897de6bd6027a475eadd57019d4e6872c396d0716c4875a5f1a6fcfdf385c1f",
+            "vout": 0,
+            "scriptSig": {
+                "asm": "",
+                "hex": ""
+            },
+            "sequence": 1
+        }
+    ],
+    "vout": [
+        {
+            "value": 0.18,
+            "n": 0,
+            "scriptPubKey": {
+                "asm": "OP_DUP OP_HASH160 1fc11f39be1729bf973a7ab6a615ca4729d64574 OP_EQUALVERIFY OP_CHECKSIG",
+                "hex": "76a9141fc11f39be1729bf973a7ab6a615ca4729d6457488ac",
+                "reqSigs": 1,
+                "type": "pubkeyhash",
+                "addresses": [
+                    "13tuJJDR2RgArmgfv6JScSdreahzgc4T6o"
+                ]
+            }
+        }
+    ],
+    "hex": "01000000021f5c38dfcf6f1a5f5a87c416076d392c87e6d41970d5ad5e477a02d66bde97580000000000fdffffff1f5c38dfcf6f1a5f5a87c416076d392c87e6d41970d5ad5e477a02d66bde97580000000000010000000180a81201000000001976a9141fc11f39be1729bf973a7ab6a615ca4729d6457488ac00000000"
+}
diff --git a/src/test/data/txcreatesign.json b/src/test/data/txcreatesign.json
new file mode 100644
index 0000000000000..057fe9b010292
--- /dev/null
+++ b/src/test/data/txcreatesign.json
@@ -0,0 +1,32 @@
+{
+    "txid": "977e7cd286cb72cd470d539ba6cb48400f8f387d97451d45cdb8819437a303af",
+    "version": 1,
+    "locktime": 0,
+    "vin": [
+        {
+            "txid": "4d49a71ec9da436f71ec4ee231d04f292a29cd316f598bb7068feccabdc59485",
+            "vout": 0,
+            "scriptSig": {
+                "asm": "304502210096a75056c9e2cc62b7214777b3d2a592cfda7092520126d4ebfcd6d590c99bd8022051bb746359cf98c0603f3004477eac68701132380db8facba19c89dc5ab5c5e2[ALL] 0479be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8",
+                "hex": "48304502210096a75056c9e2cc62b7214777b3d2a592cfda7092520126d4ebfcd6d590c99bd8022051bb746359cf98c0603f3004477eac68701132380db8facba19c89dc5ab5c5e201410479be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8"
+            },
+            "sequence": 4294967295
+        }
+    ],
+    "vout": [
+        {
+            "value": 0.001,
+            "n": 0,
+            "scriptPubKey": {
+                "asm": "OP_DUP OP_HASH160 5834479edbbe0539b31ffd3a8f8ebadc2165ed01 OP_EQUALVERIFY OP_CHECKSIG",
+                "hex": "76a9145834479edbbe0539b31ffd3a8f8ebadc2165ed0188ac",
+                "reqSigs": 1,
+                "type": "pubkeyhash",
+                "addresses": [
+                    "193P6LtvS4nCnkDvM9uXn1gsSRqh4aDAz7"
+                ]
+            }
+        }
+    ],
+    "hex": "01000000018594c5bdcaec8f06b78b596f31cd292a294fd031e24eec716f43dac91ea7494d000000008b48304502210096a75056c9e2cc62b7214777b3d2a592cfda7092520126d4ebfcd6d590c99bd8022051bb746359cf98c0603f3004477eac68701132380db8facba19c89dc5ab5c5e201410479be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8ffffffff01a0860100000000001976a9145834479edbbe0539b31ffd3a8f8ebadc2165ed0188ac00000000"
+}

From fa05cfdf256f3bc13b89ea80231e342f4302d204 Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Wed, 28 Sep 2016 21:05:11 +0200
Subject: [PATCH 0956/1802] [rpc] throw JSONRPCError when utxo set can not be
 read

---
 src/rpc/blockchain.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp
index 91d3197cd0a26..41d862934a1b5 100644
--- a/src/rpc/blockchain.cpp
+++ b/src/rpc/blockchain.cpp
@@ -848,6 +848,8 @@ UniValue gettxoutsetinfo(const UniValue& params, bool fHelp)
         ret.push_back(Pair("bytes_serialized", (int64_t)stats.nSerializedSize));
         ret.push_back(Pair("hash_serialized", stats.hashSerialized.GetHex()));
         ret.push_back(Pair("total_amount", ValueFromAmount(stats.nTotalAmount)));
+    } else {
+        throw JSONRPCError(RPC_INTERNAL_ERROR, "Unable to read UTXO set");
     }
     return ret;
 }

From fa9cd25ed0587078e3218965606c79ebf8138d53 Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Thu, 29 Sep 2016 11:21:33 +0200
Subject: [PATCH 0957/1802] [qa] blockstore: Switch to dumb dbm

---
 qa/rpc-tests/test_framework/blockstore.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/qa/rpc-tests/test_framework/blockstore.py b/qa/rpc-tests/test_framework/blockstore.py
index 1e2bbb277ac5c..28a6b92b8192f 100644
--- a/qa/rpc-tests/test_framework/blockstore.py
+++ b/qa/rpc-tests/test_framework/blockstore.py
@@ -9,11 +9,11 @@
 
 from .mininode import *
 from io import BytesIO
-import dbm.ndbm
+import dbm.dumb as dbmd
 
 class BlockStore(object):
     def __init__(self, datadir):
-        self.blockDB = dbm.ndbm.open(datadir + "/blocks", 'c')
+        self.blockDB = dbmd.open(datadir + "/blocks", 'c')
         self.currentBlock = 0
         self.headers_map = dict()
 
@@ -123,7 +123,7 @@ def get_locator(self, current_tip=None):
 
 class TxStore(object):
     def __init__(self, datadir):
-        self.txDB = dbm.ndbm.open(datadir + "/transactions", 'c')
+        self.txDB = dbmd.open(datadir + "/transactions", 'c')
 
     def close(self):
         self.txDB.close()

From fa85e860a9261e6c585ec40e67845fa93a20c6e7 Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Thu, 29 Sep 2016 13:23:54 +0200
Subject: [PATCH 0958/1802] [qt] sync-overlay: Don't show estimated number of
 headers left

---
 src/qt/modaloverlay.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/qt/modaloverlay.cpp b/src/qt/modaloverlay.cpp
index 461077ff76e5c..5caade7d381c9 100644
--- a/src/qt/modaloverlay.cpp
+++ b/src/qt/modaloverlay.cpp
@@ -134,7 +134,6 @@ void ModalOverlay::tipUpdate(int count, const QDateTime& blockDate, double nVeri
     if (estimateNumHeadersLeft < 24 && hasBestHeader) {
         ui->numberOfBlocksLeft->setText(QString::number(bestHeaderHeight - count));
     } else {
-        ui->numberOfBlocksLeft->setText("~" + QString::number(bestHeaderHeight + estimateNumHeadersLeft - count));
         ui->expectedTimeLeft->setText(tr("Unknown. Syncing Headers..."));
     }
 }

From b82f4939385e87805b4c1896442f0e179e7d9465 Mon Sep 17 00:00:00 2001
From: jnewbery <john@johnnewbery.com>
Date: Wed, 28 Sep 2016 10:25:51 -0400
Subject: [PATCH 0959/1802] Add option to run bitcoin-util-test.py manually

---
 src/test/README.md            |  8 ++++++++
 src/test/bitcoin-util-test.py | 22 +++++++++++++++++++---
 2 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/src/test/README.md b/src/test/README.md
index 61462642bfb9c..3afdefe5fcd41 100644
--- a/src/test/README.md
+++ b/src/test/README.md
@@ -30,3 +30,11 @@ example, to run just the getarg_tests verbosely:
 
 Run `test_bitcoin --help` for the full list.
 
+### bitcoin-util-test.py
+
+The test directory also contains the bitcoin-util-test.py tool, which tests bitcoin utils (currently just bitcoin-tx). This test gets run automatically during the `make check` build process. It is also possible to run the test manually from the src directory:
+
+```
+test/bitcoin-util-test.py --srcdir=[current directory]
+
+```
\ No newline at end of file
diff --git a/src/test/bitcoin-util-test.py b/src/test/bitcoin-util-test.py
index 882b5c67b862d..225b3324e9fc8 100755
--- a/src/test/bitcoin-util-test.py
+++ b/src/test/bitcoin-util-test.py
@@ -6,8 +6,24 @@
 import os
 import bctest
 import buildenv
+import argparse
 
-if __name__ == '__main__':
-	bctest.bctester(os.environ["srcdir"] + "/test/data",
-			"bitcoin-util-test.json",buildenv)
+help_text="""Test framework for bitcoin utils.
+
+Runs automatically during `make check`.
+
+Can also be run manually from the src directory by specifiying the source directory:
 
+test/bitcoin-util-test.py --src=[srcdir]
+"""
+
+
+if __name__ == '__main__':
+    try:
+        srcdir = os.environ["srcdir"]
+    except:
+        parser = argparse.ArgumentParser(description=help_text)
+        parser.add_argument('-s', '--srcdir')
+        args = parser.parse_args()
+        srcdir = args.srcdir
+    bctest.bctester(srcdir + "/test/data", "bitcoin-util-test.json", buildenv)

From fa156c604e7d86d84f7731b05d7530bc91d2736b Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Thu, 29 Sep 2016 15:34:04 +0200
Subject: [PATCH 0960/1802] [qa] nulldummy: Don't run unused code

---
 qa/rpc-tests/nulldummy.py | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/qa/rpc-tests/nulldummy.py b/qa/rpc-tests/nulldummy.py
index eaed7a8c78970..6488a92364e79 100755
--- a/qa/rpc-tests/nulldummy.py
+++ b/qa/rpc-tests/nulldummy.py
@@ -3,11 +3,10 @@
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-from test_framework.test_framework import ComparisonTestFramework
+from test_framework.test_framework import BitcoinTestFramework
 from test_framework.util import *
 from test_framework.mininode import CTransaction, NetworkThread
 from test_framework.blocktools import create_coinbase, create_block, add_witness_commitment
-from test_framework.comptool import TestManager
 from test_framework.script import CScript
 from io import BytesIO
 import time
@@ -37,11 +36,12 @@ def trueDummy(tx):
 [Policy/Consensus] Check that the new NULLDUMMY rules are enforced on the 432nd block.
 '''
 
-class NULLDUMMYTest(ComparisonTestFramework):
+class NULLDUMMYTest(BitcoinTestFramework):
 
     def __init__(self):
         super().__init__()
         self.num_nodes = 1
+        self.setup_clean_chain = True
 
     def setup_network(self):
         # Must set the blockversion for this test
@@ -54,8 +54,6 @@ def run_test(self):
         self.wit_address = self.nodes[0].addwitnessaddress(self.address)
         self.wit_ms_address = self.nodes[0].addwitnessaddress(self.ms_address)
 
-        test = TestManager(self, self.options.tmpdir)
-        test.add_all_connections(self.nodes)
         NetworkThread().start() # Start up network handling in another thread
         self.coinbase_blocks = self.nodes[0].generate(2) # Block 2
         coinbase_txid = []
@@ -145,4 +143,4 @@ def block_submit(self, node, txs, witness = False, accept = False):
             assert_equal(node.getbestblockhash(), self.lastblockhash)
 
 if __name__ == '__main__':
-    NULLDUMMYTest().main()
\ No newline at end of file
+    NULLDUMMYTest().main()

From da9469770847df56e67e629986129a087b5bd7a5 Mon Sep 17 00:00:00 2001
From: jnewbery <john@johnnewbery.com>
Date: Thu, 29 Sep 2016 10:13:16 -0400
Subject: [PATCH 0961/1802] bitcoin-util-test.py should fail if the output file
 is empty

---
 src/test/bctest.py           |  3 +++
 src/test/data/txcreate2.json | 19 +++++++++++++++++++
 2 files changed, 22 insertions(+)

diff --git a/src/test/bctest.py b/src/test/bctest.py
index 8105b87ffa34c..39a27fcd0c4a5 100644
--- a/src/test/bctest.py
+++ b/src/test/bctest.py
@@ -24,6 +24,9 @@ def bctest(testDir, testObj, exeext):
 	if "output_cmp" in testObj:
 		outputFn = testObj['output_cmp']
 		outputData = open(testDir + "/" + outputFn).read()
+		if not outputData:
+			print("Output data missing for " + outputFn)
+			sys.exit(1)
 	proc = subprocess.Popen(execrun, stdin=stdinCfg, stdout=subprocess.PIPE, stderr=subprocess.PIPE,universal_newlines=True)
 	try:
 		outs = proc.communicate(input=inputData)
diff --git a/src/test/data/txcreate2.json b/src/test/data/txcreate2.json
index e69de29bb2d1d..c56293eaf2c66 100644
--- a/src/test/data/txcreate2.json
+++ b/src/test/data/txcreate2.json
@@ -0,0 +1,19 @@
+{
+    "txid": "cf90229625e9eb10f6be8156bf6aa5ec2eca19a42b1e05c11f3029b560a32e13",
+    "version": 1,
+    "locktime": 0,
+    "vin": [
+    ],
+    "vout": [
+        {
+            "value": 0.00,
+            "n": 0,
+            "scriptPubKey": {
+                "asm": "",
+                "hex": "",
+                "type": "nonstandard"
+            }
+        }
+    ],
+    "hex": "01000000000100000000000000000000000000"
+}

From 1d28faf9e94fcf240ece7336d61ec297b064bc37 Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Thu, 29 Sep 2016 15:02:08 +0000
Subject: [PATCH 0962/1802] test: Avoid ConnectionResetErrors during RPC tests

This is necessary on FreeBSD and MacOSX, at least.

See https://github.com/bitcoin/bitcoin/pull/8834#issuecomment-250450213
---
 qa/rpc-tests/test_framework/authproxy.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/qa/rpc-tests/test_framework/authproxy.py b/qa/rpc-tests/test_framework/authproxy.py
index f5e0be20d1ec9..fd7f32b5c6353 100644
--- a/qa/rpc-tests/test_framework/authproxy.py
+++ b/qa/rpc-tests/test_framework/authproxy.py
@@ -130,8 +130,9 @@ def _request(self, method, path, postdata):
                 return self._get_response()
             else:
                 raise
-        except BrokenPipeError:
-            # Python 3.5+ raises this instead of BadStatusLine when the connection was reset
+        except (BrokenPipeError,ConnectionResetError):
+            # Python 3.5+ raises BrokenPipeError instead of BadStatusLine when the connection was reset
+            # ConnectionResetError happens on FreeBSD with Python 3.4
             self.__conn.close()
             self.__conn.request(method, path, postdata, headers)
             return self._get_response()

From 30930e847e2483c7c8163cc581b392bc288250e9 Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Thu, 29 Sep 2016 15:34:44 +0000
Subject: [PATCH 0963/1802] test: Explicitly set encoding to utf8 when opening
 text files

These are text files but their encoding does not depend on the locale.
Not all of them require utf8 but it is better to fix it at something
to remove potential unpredictability.

This is necessary on FreeBSD where no locale is set by default,
and apparently Python defaults not only the terminal encoding to the locale
but that of every text file. So without LOCALE environment it defaults text
file encoding to ASCII. This causes problems with e.g. `bitcoin.conf`.

Luckily the locale doesn't affect the default encoding for str.encode() and
bytes.decode() on Python 3, so this is the only change necessary.
---
 qa/rpc-tests/forknotify.py              | 6 +++---
 qa/rpc-tests/multi_rpc.py               | 2 +-
 qa/rpc-tests/p2p-versionbits-warning.py | 6 +++---
 qa/rpc-tests/test_framework/coverage.py | 4 ++--
 qa/rpc-tests/test_framework/netutil.py  | 2 +-
 qa/rpc-tests/test_framework/util.py     | 2 +-
 qa/rpc-tests/wallet-dump.py             | 2 +-
 7 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/qa/rpc-tests/forknotify.py b/qa/rpc-tests/forknotify.py
index 5a3f75c808741..a1901aedab890 100755
--- a/qa/rpc-tests/forknotify.py
+++ b/qa/rpc-tests/forknotify.py
@@ -22,7 +22,7 @@ def __init__(self):
     def setup_network(self):
         self.nodes = []
         self.alert_filename = os.path.join(self.options.tmpdir, "alert.txt")
-        with open(self.alert_filename, 'w') as f:
+        with open(self.alert_filename, 'w', encoding='utf8') as f:
             pass  # Just open then close to create zero-length file
         self.nodes.append(start_node(0, self.options.tmpdir,
                             ["-blockversion=2", "-alertnotify=echo %s >> \"" + self.alert_filename + "\""]))
@@ -44,7 +44,7 @@ def run_test(self):
         self.nodes[1].generate(1)
         self.sync_all()
 
-        with open(self.alert_filename, 'r') as f:
+        with open(self.alert_filename, 'r', encoding='utf8') as f:
             alert_text = f.read()
 
         if len(alert_text) == 0:
@@ -56,7 +56,7 @@ def run_test(self):
         self.nodes[1].generate(1)
         self.sync_all()
 
-        with open(self.alert_filename, 'r') as f:
+        with open(self.alert_filename, 'r', encoding='utf8') as f:
             alert_text2 = f.read()
 
         if alert_text != alert_text2:
diff --git a/qa/rpc-tests/multi_rpc.py b/qa/rpc-tests/multi_rpc.py
index 24373b257d7e6..cdeb94caa0998 100755
--- a/qa/rpc-tests/multi_rpc.py
+++ b/qa/rpc-tests/multi_rpc.py
@@ -26,7 +26,7 @@ def setup_chain(self):
         #Append rpcauth to bitcoin.conf before initialization
         rpcauth = "rpcauth=rt:93648e835a54c573682c2eb19f882535$7681e9c5b74bdd85e78166031d2058e1069b3ed7ed967c93fc63abba06f31144"
         rpcauth2 = "rpcauth=rt2:f8607b1a88861fac29dfccf9b52ff9f$ff36a0c23c8c62b4846112e50fa888416e94c17bfd4c42f88fd8f55ec6a3137e"
-        with open(os.path.join(self.options.tmpdir+"/node0", "bitcoin.conf"), 'a') as f:
+        with open(os.path.join(self.options.tmpdir+"/node0", "bitcoin.conf"), 'a', encoding='utf8') as f:
             f.write(rpcauth+"\n")
             f.write(rpcauth2+"\n")
 
diff --git a/qa/rpc-tests/p2p-versionbits-warning.py b/qa/rpc-tests/p2p-versionbits-warning.py
index 00dbbc02cf3c7..cceaa37b3dd75 100755
--- a/qa/rpc-tests/p2p-versionbits-warning.py
+++ b/qa/rpc-tests/p2p-versionbits-warning.py
@@ -72,7 +72,7 @@ def __init__(self):
     def setup_network(self):
         self.alert_filename = os.path.join(self.options.tmpdir, "alert.txt")
         # Open and close to create zero-length file
-        with open(self.alert_filename, 'w') as _:
+        with open(self.alert_filename, 'w', encoding='utf8') as _:
             pass
         self.extra_args = [["-debug", "-logtimemicros=1", "-alertnotify=echo %s >> \"" + self.alert_filename + "\""]]
         self.nodes = start_nodes(self.num_nodes, self.options.tmpdir, self.extra_args)
@@ -95,7 +95,7 @@ def send_blocks_with_version(self, peer, numblocks, nVersionToUse):
         peer.sync_with_ping()
 
     def test_versionbits_in_alert_file(self):
-        with open(self.alert_filename, 'r') as f:
+        with open(self.alert_filename, 'r', encoding='utf8') as f:
             alert_text = f.read()
         assert(VB_PATTERN.match(alert_text))
 
@@ -147,7 +147,7 @@ def run_test(self):
         stop_node(self.nodes[0], 0)
         wait_bitcoinds()
         # Empty out the alert file
-        with open(self.alert_filename, 'w') as _:
+        with open(self.alert_filename, 'w', encoding='utf8') as _:
             pass
         self.nodes = start_nodes(self.num_nodes, self.options.tmpdir, self.extra_args)
 
diff --git a/qa/rpc-tests/test_framework/coverage.py b/qa/rpc-tests/test_framework/coverage.py
index 23fce61014040..13b33869f5472 100644
--- a/qa/rpc-tests/test_framework/coverage.py
+++ b/qa/rpc-tests/test_framework/coverage.py
@@ -50,7 +50,7 @@ def __call__(self, *args, **kwargs):
         rpc_method = self.auth_service_proxy_instance._service_name
 
         if self.coverage_logfile:
-            with open(self.coverage_logfile, 'a+') as f:
+            with open(self.coverage_logfile, 'a+', encoding='utf8') as f:
                 f.write("%s\n" % rpc_method)
 
         return return_val
@@ -100,7 +100,7 @@ def write_all_rpc_commands(dirname, node):
         if line and not line.startswith('='):
             commands.add("%s\n" % line.split()[0])
 
-    with open(filename, 'w') as f:
+    with open(filename, 'w', encoding='utf8') as f:
         f.writelines(list(commands))
 
     return True
diff --git a/qa/rpc-tests/test_framework/netutil.py b/qa/rpc-tests/test_framework/netutil.py
index 573b06772d7b3..b92a9f6e1ce43 100644
--- a/qa/rpc-tests/test_framework/netutil.py
+++ b/qa/rpc-tests/test_framework/netutil.py
@@ -58,7 +58,7 @@ def netstat(typ='tcp'):
     To get pid of all network process running on system, you must run this script
     as superuser
     '''
-    with open('/proc/net/'+typ,'r') as f:
+    with open('/proc/net/'+typ,'r',encoding='utf8') as f:
         content = f.readlines()
         content.pop(0)
     result = []
diff --git a/qa/rpc-tests/test_framework/util.py b/qa/rpc-tests/test_framework/util.py
index eee77f1a104cc..2f0d909a6e661 100644
--- a/qa/rpc-tests/test_framework/util.py
+++ b/qa/rpc-tests/test_framework/util.py
@@ -161,7 +161,7 @@ def initialize_datadir(dirname, n):
     if not os.path.isdir(datadir):
         os.makedirs(datadir)
     rpc_u, rpc_p = rpc_auth_pair(n)
-    with open(os.path.join(datadir, "bitcoin.conf"), 'w') as f:
+    with open(os.path.join(datadir, "bitcoin.conf"), 'w', encoding='utf8') as f:
         f.write("regtest=1\n")
         f.write("rpcuser=" + rpc_u + "\n")
         f.write("rpcpassword=" + rpc_p + "\n")
diff --git a/qa/rpc-tests/wallet-dump.py b/qa/rpc-tests/wallet-dump.py
index 6028d2c20b191..a37096a40ce94 100755
--- a/qa/rpc-tests/wallet-dump.py
+++ b/qa/rpc-tests/wallet-dump.py
@@ -12,7 +12,7 @@ def read_dump(file_name, addrs, hd_master_addr_old):
     Read the given dump, count the addrs that match, count change and reserve.
     Also check that the old hd_master is inactive
     """
-    with open(file_name) as inputfile:
+    with open(file_name, encoding='utf8') as inputfile:
         found_addr = 0
         found_addr_chg = 0
         found_addr_rsv = 0

From 46a4774d2bb9cc863e43507212ef989fa10d56d4 Mon Sep 17 00:00:00 2001
From: Johnson Lau <jl2012@xbt.hk>
Date: Fri, 30 Sep 2016 00:18:13 +0800
Subject: [PATCH 0964/1802] Fix nulldummy.py test

---
 qa/rpc-tests/nulldummy.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/qa/rpc-tests/nulldummy.py b/qa/rpc-tests/nulldummy.py
index 6488a92364e79..54b7eac3765e6 100755
--- a/qa/rpc-tests/nulldummy.py
+++ b/qa/rpc-tests/nulldummy.py
@@ -119,6 +119,8 @@ def tx_submit(self, node, tx, msg = ""):
             node.sendrawtransaction(bytes_to_hex_str(tx.serialize_with_witness()), True)
         except JSONRPCException as exp:
             assert_equal(exp.error["message"], msg)
+        else:
+            assert_equal('', msg)
         return tx.hash
 
 

From 2fa0063c26c80c719a1c0d30e548e338689ac917 Mon Sep 17 00:00:00 2001
From: Johnson Lau <jl2012@xbt.hk>
Date: Fri, 30 Sep 2016 23:08:29 +0800
Subject: [PATCH 0965/1802] Add NULLDUMMY verify flag in bitcoinconsensus.h

---
 doc/shared-libraries.md       | 5 +++++
 src/script/bitcoinconsensus.h | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/doc/shared-libraries.md b/doc/shared-libraries.md
index ec6f16c8aafe9..dc363582cc8de 100644
--- a/doc/shared-libraries.md
+++ b/doc/shared-libraries.md
@@ -30,12 +30,17 @@ The interface is defined in the C header `bitcoinconsensus.h` located in  `src/s
 - `bitcoinconsensus_SCRIPT_FLAGS_VERIFY_NONE`
 - `bitcoinconsensus_SCRIPT_FLAGS_VERIFY_P2SH` - Evaluate P2SH ([BIP16](https://github.com/bitcoin/bips/blob/master/bip-0016.mediawiki)) subscripts
 - `bitcoinconsensus_SCRIPT_FLAGS_VERIFY_DERSIG` - Enforce strict DER ([BIP66](https://github.com/bitcoin/bips/blob/master/bip-0066.mediawiki)) compliance
+- `bitcoinconsensus_SCRIPT_FLAGS_VERIFY_NULLDUMMY` - Enforce NULLDUMMY ([BIP147](https://github.com/bitcoin/bips/blob/master/bip-0147.mediawiki))
+- `bitcoinconsensus_SCRIPT_FLAGS_VERIFY_CHECKLOCKTIMEVERIFY` - Enable CHECKLOCKTIMEVERIFY ([BIP65](https://github.com/bitcoin/bips/blob/master/bip-0065.mediawiki))
+- `bitcoinconsensus_SCRIPT_FLAGS_VERIFY_CHECKSEQUENCEVERIFY` - Enable CHECKSEQUENCEVERIFY ([BIP112](https://github.com/bitcoin/bips/blob/master/bip-0112.mediawiki))
+- `bitcoinconsensus_SCRIPT_FLAGS_VERIFY_WITNESS` - Enable WITNESS ([BIP141](https://github.com/bitcoin/bips/blob/master/bip-0141.mediawiki))
 
 ##### Errors
 - `bitcoinconsensus_ERR_OK` - No errors with input parameters *(see the return value of `bitcoinconsensus_verify_script` for the verification status)*
 - `bitcoinconsensus_ERR_TX_INDEX` - An invalid index for `txTo`
 - `bitcoinconsensus_ERR_TX_SIZE_MISMATCH` - `txToLen` did not match with the size of `txTo`
 - `bitcoinconsensus_ERR_DESERIALIZE` - An error deserializing `txTo`
+- `bitcoinconsensus_ERR_AMOUNT_REQUIRED` - Input amount is required if WITNESS is used
 
 ### Example Implementations
 - [NBitcoin](https://github.com/NicolasDorier/NBitcoin/blob/master/NBitcoin/Script.cs#L814) (.NET Bindings)
diff --git a/src/script/bitcoinconsensus.h b/src/script/bitcoinconsensus.h
index f73a8e30bc6c4..1d2d5c23e471c 100644
--- a/src/script/bitcoinconsensus.h
+++ b/src/script/bitcoinconsensus.h
@@ -1,5 +1,5 @@
 // Copyright (c) 2009-2010 Satoshi Nakamoto
-// Copyright (c) 2009-2015 The Bitcoin Core developers
+// Copyright (c) 2009-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
@@ -50,6 +50,7 @@ enum
     bitcoinconsensus_SCRIPT_FLAGS_VERIFY_NONE                = 0,
     bitcoinconsensus_SCRIPT_FLAGS_VERIFY_P2SH                = (1U << 0), // evaluate P2SH (BIP16) subscripts
     bitcoinconsensus_SCRIPT_FLAGS_VERIFY_DERSIG              = (1U << 2), // enforce strict DER (BIP66) compliance
+    bitcoinconsensus_SCRIPT_FLAGS_VERIFY_NULLDUMMY           = (1U << 4), // enforce NULLDUMMY (BIP147)
     bitcoinconsensus_SCRIPT_FLAGS_VERIFY_CHECKLOCKTIMEVERIFY = (1U << 9), // enable CHECKLOCKTIMEVERIFY (BIP65)
     bitcoinconsensus_SCRIPT_FLAGS_VERIFY_CHECKSEQUENCEVERIFY = (1U << 10), // enable CHECKSEQUENCEVERIFY (BIP112)
     bitcoinconsensus_SCRIPT_FLAGS_VERIFY_WITNESS             = (1U << 11), // enable WITNESS (BIP141)

From 47314e6daad8157c9e36af90a47b3ae7fa0587de Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Fri, 30 Sep 2016 17:19:51 +0200
Subject: [PATCH 0966/1802] prevector: add C++11-like data() method

This returns a pointer to the beginning of the vector's data.
---
 src/prevector.h | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/prevector.h b/src/prevector.h
index a0e1e140b4013..d840dfcd08468 100644
--- a/src/prevector.h
+++ b/src/prevector.h
@@ -475,6 +475,14 @@ class prevector {
             return ((size_t)(sizeof(T))) * _union.capacity;
         }
     }
+
+    value_type* data() noexcept {
+        return item_ptr(0);
+    }
+
+    const value_type* data() const {
+        return item_ptr(0);
+    }
 };
 #pragma pack(pop)
 

From e198c521d39bb0ec17f42dfe72026969984af2c7 Mon Sep 17 00:00:00 2001
From: Patrick Strateman <patrick.strateman@gmail.com>
Date: Tue, 19 Jul 2016 16:43:11 -0700
Subject: [PATCH 0967/1802] Move key derivation logic from GenerateNewKey to
 DeriveNewChildKey

---
 src/wallet/wallet.cpp | 78 +++++++++++++++++++++++--------------------
 src/wallet/wallet.h   |  1 +
 2 files changed, 42 insertions(+), 37 deletions(-)

diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index 43e22383f4e16..a1f69dd94dd6c 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -100,43 +100,7 @@ CPubKey CWallet::GenerateNewKey()
 
     // use HD key derivation if HD was enabled during wallet creation
     if (IsHDEnabled()) {
-        // for now we use a fixed keypath scheme of m/0'/0'/k
-        CKey key;                      //master key seed (256bit)
-        CExtKey masterKey;             //hd master key
-        CExtKey accountKey;            //key at m/0'
-        CExtKey externalChainChildKey; //key at m/0'/0'
-        CExtKey childKey;              //key at m/0'/0'/<n>'
-
-        // try to get the master key
-        if (!GetKey(hdChain.masterKeyID, key))
-            throw std::runtime_error(std::string(__func__) + ": Master key not found");
-
-        masterKey.SetMaster(key.begin(), key.size());
-
-        // derive m/0'
-        // use hardened derivation (child keys >= 0x80000000 are hardened after bip32)
-        masterKey.Derive(accountKey, BIP32_HARDENED_KEY_LIMIT);
-
-        // derive m/0'/0'
-        accountKey.Derive(externalChainChildKey, BIP32_HARDENED_KEY_LIMIT);
-
-        // derive child key at next index, skip keys already known to the wallet
-        do
-        {
-            // always derive hardened keys
-            // childIndex | BIP32_HARDENED_KEY_LIMIT = derive childIndex in hardened child-index-range
-            // example: 1 | BIP32_HARDENED_KEY_LIMIT == 0x80000001 == 2147483649
-            externalChainChildKey.Derive(childKey, hdChain.nExternalChainCounter | BIP32_HARDENED_KEY_LIMIT);
-            metadata.hdKeypath     = "m/0'/0'/"+std::to_string(hdChain.nExternalChainCounter)+"'";
-            metadata.hdMasterKeyID = hdChain.masterKeyID;
-            // increment childkey index
-            hdChain.nExternalChainCounter++;
-        } while(HaveKey(childKey.key.GetPubKey().GetID()));
-        secret = childKey.key;
-
-        // update the chain model in the database
-        if (!CWalletDB(strWalletFile).WriteHDChain(hdChain))
-            throw std::runtime_error(std::string(__func__) + ": Writing HD chain model failed");
+        DeriveNewChildKey(metadata, secret);
     } else {
         secret.MakeNewKey(fCompressed);
     }
@@ -157,6 +121,46 @@ CPubKey CWallet::GenerateNewKey()
     return pubkey;
 }
 
+void CWallet::DeriveNewChildKey(CKeyMetadata& metadata, CKey& secret)
+{
+    // for now we use a fixed keypath scheme of m/0'/0'/k
+    CKey key;                      //master key seed (256bit)
+    CExtKey masterKey;             //hd master key
+    CExtKey accountKey;            //key at m/0'
+    CExtKey externalChainChildKey; //key at m/0'/0'
+    CExtKey childKey;              //key at m/0'/0'/<n>'
+
+    // try to get the master key
+    if (!GetKey(hdChain.masterKeyID, key))
+        throw std::runtime_error(std::string(__func__) + ": Master key not found");
+
+    masterKey.SetMaster(key.begin(), key.size());
+
+    // derive m/0'
+    // use hardened derivation (child keys >= 0x80000000 are hardened after bip32)
+    masterKey.Derive(accountKey, BIP32_HARDENED_KEY_LIMIT);
+
+    // derive m/0'/0'
+    accountKey.Derive(externalChainChildKey, BIP32_HARDENED_KEY_LIMIT);
+
+    // derive child key at next index, skip keys already known to the wallet
+    do {
+        // always derive hardened keys
+        // childIndex | BIP32_HARDENED_KEY_LIMIT = derive childIndex in hardened child-index-range
+        // example: 1 | BIP32_HARDENED_KEY_LIMIT == 0x80000001 == 2147483649
+        externalChainChildKey.Derive(childKey, hdChain.nExternalChainCounter | BIP32_HARDENED_KEY_LIMIT);
+        metadata.hdKeypath = "m/0'/0'/" + std::to_string(hdChain.nExternalChainCounter) + "'";
+        metadata.hdMasterKeyID = hdChain.masterKeyID;
+        // increment childkey index
+        hdChain.nExternalChainCounter++;
+    } while (HaveKey(childKey.key.GetPubKey().GetID()));
+    secret = childKey.key;
+
+    // update the chain model in the database
+    if (!CWalletDB(strWalletFile).WriteHDChain(hdChain))
+        throw std::runtime_error(std::string(__func__) + ": Writing HD chain model failed");
+}
+
 bool CWallet::AddKeyPubKey(const CKey& secret, const CPubKey &pubkey)
 {
     AssertLockHeld(cs_wallet); // mapKeyMetadata
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
index c700e0ca7c433..077edcab2daa9 100644
--- a/src/wallet/wallet.h
+++ b/src/wallet/wallet.h
@@ -698,6 +698,7 @@ class CWallet : public CCryptoKeyStore, public CValidationInterface
      * Generate a new key
      */
     CPubKey GenerateNewKey();
+    void DeriveNewChildKey(CKeyMetadata& metadata, CKey& secret);
     //! Adds a key to the store, and saves it to disk.
     bool AddKeyPubKey(const CKey& key, const CPubKey &pubkey);
     //! Adds a key to the store, without saving it to disk (used by LoadWallet)

From 2ca7faab4205822b06dc2ab2bbda0a9a70fce7e0 Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Fri, 30 Sep 2016 19:58:11 +0200
Subject: [PATCH 0968/1802] Squashed 'src/univalue/' changes from
 daf1285..16a1f7f

16a1f7f Merge #3: Pull upstream
3f03bfd Merge pull request #27 from laanwj/2016_09_const_refs
5668ca3 Return const references from getKeys, getValues, get_str
cedda14 Merge pull request #28 from MarcoFalke/patch-1
9f0b997 [travis] Work around osx libtool issue

git-subtree-dir: src/univalue
git-subtree-split: 16a1f7f6e9ed932bec7c7855003affea1e165fb5
---
 .travis.yml        | 2 +-
 include/univalue.h | 6 +++---
 lib/univalue.cpp   | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d318d9cc8f6bf..132743d34930d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,3 @@
-
 language: cpp
 
 compiler:
@@ -26,6 +25,7 @@ addons:
       - pkg-config
 
 before_script:
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew uninstall libtool; brew install libtool; fi
   - if [ -n "$USE_SHELL" ]; then export CONFIG_SHELL="$USE_SHELL"; fi
   - test -n "$USE_SHELL" && eval '"$USE_SHELL" -c "./autogen.sh"' || ./autogen.sh
 
diff --git a/include/univalue.h b/include/univalue.h
index e48b905bfb857..e8ce283519fed 100644
--- a/include/univalue.h
+++ b/include/univalue.h
@@ -142,10 +142,10 @@ class UniValue {
 public:
     // Strict type-specific getters, these throw std::runtime_error if the
     // value is of unexpected type
-    std::vector<std::string> getKeys() const;
-    std::vector<UniValue> getValues() const;
+    const std::vector<std::string>& getKeys() const;
+    const std::vector<UniValue>& getValues() const;
     bool get_bool() const;
-    std::string get_str() const;
+    const std::string& get_str() const;
     int get_int() const;
     int64_t get_int64() const;
     double get_real() const;
diff --git a/lib/univalue.cpp b/lib/univalue.cpp
index 1f8cee6d29839..5a2860c13f8d6 100644
--- a/lib/univalue.cpp
+++ b/lib/univalue.cpp
@@ -283,14 +283,14 @@ const UniValue& find_value(const UniValue& obj, const std::string& name)
     return NullUniValue;
 }
 
-std::vector<std::string> UniValue::getKeys() const
+const std::vector<std::string>& UniValue::getKeys() const
 {
     if (typ != VOBJ)
         throw std::runtime_error("JSON value is not an object as expected");
     return keys;
 }
 
-std::vector<UniValue> UniValue::getValues() const
+const std::vector<UniValue>& UniValue::getValues() const
 {
     if (typ != VOBJ && typ != VARR)
         throw std::runtime_error("JSON value is not an object or array as expected");
@@ -304,7 +304,7 @@ bool UniValue::get_bool() const
     return getBool();
 }
 
-std::string UniValue::get_str() const
+const std::string& UniValue::get_str() const
 {
     if (typ != VSTR)
         throw std::runtime_error("JSON value is not a string as expected");

From 203e2ddad8e544803491d1e9e9ca2b6e26a15f8e Mon Sep 17 00:00:00 2001
From: Lauda <lauda.m@protonmail.ch>
Date: Thu, 22 Sep 2016 15:14:19 +0200
Subject: [PATCH 0969/1802] Mention Gitian building script in doc.

---
 doc/gitian-building.md | 2 ++
 doc/release-process.md | 4 ++++
 2 files changed, 6 insertions(+)

diff --git a/doc/gitian-building.md b/doc/gitian-building.md
index 4914d90df4daf..442d2d605ffbc 100644
--- a/doc/gitian-building.md
+++ b/doc/gitian-building.md
@@ -336,6 +336,8 @@ There will be a lot of warnings printed during the build of the image. These can
 Getting and building the inputs
 --------------------------------
 
+At this point you have two options, you can either use the automated script (found in [contrib/gitian-build.sh](/contrib/gitian-build.sh)) or you could manually do everything by following this guide. If you're using the automated script, then run it with the "--setup" command. Afterwards, run it with the "--build" command (example: "contrib/gitian-building.sh -b signer 0.13.0"). Otherwise ignore this.
+
 Follow the instructions in [doc/release-process.md](release-process.md#fetch-and-create-inputs-first-time-or-when-dependency-versions-change)
 in the bitcoin repository under 'Fetch and create inputs' to install sources which require
 manual intervention. Also optionally follow the next step: 'Seed the Gitian sources cache
diff --git a/doc/release-process.md b/doc/release-process.md
index 394b159b31ae5..e2ad3949d6db4 100644
--- a/doc/release-process.md
+++ b/doc/release-process.md
@@ -17,6 +17,8 @@ Before every major release:
 
 ### First time / New builders
 
+If you're using the automated script (found in [contrib/gitian-build.sh](/contrib/gitian-build.sh)), then at this point you should run it with the "--setup" command. Otherwise ignore this.
+
 Check out the source code in the following directory hierarchy.
 
     cd /path/to/your/toplevel/build
@@ -60,6 +62,8 @@ Tag version (or release candidate) in git
 
 ### Setup and perform Gitian builds
 
+If you're using the automated script (found in [contrib/gitian-build.sh](/contrib/gitian-build.sh)), then at this point you should run it with the "--build" command. Otherwise ignore this.
+
 Setup Gitian descriptors:
 
     pushd ./bitcoin

From b5fd666984fdb7125cb809c773b36034f32128cc Mon Sep 17 00:00:00 2001
From: Suhas Daftuar <sdaftuar@chaincode.com>
Date: Fri, 30 Sep 2016 20:54:30 -0400
Subject: [PATCH 0970/1802] [qa] Fix race condition in p2p-compactblocks test

Also fix a bug in the sync_with_ping() helper function
---
 qa/rpc-tests/p2p-compactblocks.py       | 2 ++
 qa/rpc-tests/test_framework/mininode.py | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/qa/rpc-tests/p2p-compactblocks.py b/qa/rpc-tests/p2p-compactblocks.py
index bf4fb43add3df..ac4655a841ec5 100755
--- a/qa/rpc-tests/p2p-compactblocks.py
+++ b/qa/rpc-tests/p2p-compactblocks.py
@@ -237,6 +237,8 @@ def test_compactblock_construction(self):
         for i in range(num_transactions):
             self.nodes[0].sendtoaddress(address, 0.1)
 
+        self.test_node.sync_with_ping()
+
         # Now mine a block, and look at the resulting compact block.
         self.test_node.clear_block_announcement()
         block_hash = int(self.nodes[0].generate(1)[0], 16)
diff --git a/qa/rpc-tests/test_framework/mininode.py b/qa/rpc-tests/test_framework/mininode.py
index caffab35351df..0b7b17cdb5684 100755
--- a/qa/rpc-tests/test_framework/mininode.py
+++ b/qa/rpc-tests/test_framework/mininode.py
@@ -1536,7 +1536,7 @@ def sync_with_ping(self, timeout=30):
         def received_pong():
             return (self.last_pong.nonce == self.ping_counter)
         self.send_message(msg_ping(nonce=self.ping_counter))
-        success = wait_until(received_pong, timeout)
+        success = wait_until(received_pong, timeout=timeout)
         self.ping_counter += 1
         return success
 

From 3450c18a125f125aec76bfef79c69317eaad935d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jorge=20Tim=C3=B3n?= <jtimon@jtimon.cc>
Date: Wed, 28 Sep 2016 10:10:15 +0200
Subject: [PATCH 0971/1802] Globals: Decouple GetConfigFile and ReadConfigFile
 from global mapArgs

---
 src/bitcoin-cli.cpp | 4 ++--
 src/bitcoind.cpp    | 2 +-
 src/init.cpp        | 2 +-
 src/qt/bitcoin.cpp  | 2 +-
 src/util.cpp        | 9 +++++----
 src/util.h          | 4 ++--
 6 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/bitcoin-cli.cpp b/src/bitcoin-cli.cpp
index 68f5d90f5103d..9d4c4e53bd26b 100644
--- a/src/bitcoin-cli.cpp
+++ b/src/bitcoin-cli.cpp
@@ -92,7 +92,7 @@ static bool AppInitRPC(int argc, char* argv[])
         return false;
     }
     try {
-        ReadConfigFile(mapArgs, mapMultiArgs);
+        ReadConfigFile(GetArg("-conf", BITCOIN_CONF_FILENAME), mapArgs, mapMultiArgs);
     } catch (const std::exception& e) {
         fprintf(stderr,"Error reading configuration file: %s\n", e.what());
         return false;
@@ -209,7 +209,7 @@ UniValue CallRPC(const string& strMethod, const UniValue& params)
         if (!GetAuthCookie(&strRPCUserColonPass)) {
             throw runtime_error(strprintf(
                 _("Could not locate RPC credentials. No authentication cookie could be found, and no rpcpassword is set in the configuration file (%s)"),
-                    GetConfigFile().string().c_str()));
+                    GetConfigFile(GetArg("-conf", BITCOIN_CONF_FILENAME)).string().c_str()));
 
         }
     } else {
diff --git a/src/bitcoind.cpp b/src/bitcoind.cpp
index 25d720e1e8ccb..351463c256e39 100644
--- a/src/bitcoind.cpp
+++ b/src/bitcoind.cpp
@@ -104,7 +104,7 @@ bool AppInit(int argc, char* argv[])
         }
         try
         {
-            ReadConfigFile(mapArgs, mapMultiArgs);
+            ReadConfigFile(GetArg("-conf", BITCOIN_CONF_FILENAME), mapArgs, mapMultiArgs);
         } catch (const std::exception& e) {
             fprintf(stderr,"Error reading configuration file: %s\n", e.what());
             return false;
diff --git a/src/init.cpp b/src/init.cpp
index cf92347952a5d..eefef7ba0b253 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -1064,7 +1064,7 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
         LogPrintf("Startup time: %s\n", DateTimeStrFormat("%Y-%m-%d %H:%M:%S", GetTime()));
     LogPrintf("Default data directory %s\n", GetDefaultDataDir().string());
     LogPrintf("Using data directory %s\n", strDataDir);
-    LogPrintf("Using config file %s\n", GetConfigFile().string());
+    LogPrintf("Using config file %s\n", GetConfigFile(GetArg("-conf", BITCOIN_CONF_FILENAME)).string());
     LogPrintf("Using at most %i connections (%i file descriptors available)\n", nMaxConnections, nFD);
 
     LogPrintf("Using %u threads for script verification\n", nScriptCheckThreads);
diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp
index 430e6dd0e8df8..9986af4957643 100644
--- a/src/qt/bitcoin.cpp
+++ b/src/qt/bitcoin.cpp
@@ -590,7 +590,7 @@ int main(int argc, char *argv[])
         return 1;
     }
     try {
-        ReadConfigFile(mapArgs, mapMultiArgs);
+        ReadConfigFile(GetArg("-conf", BITCOIN_CONF_FILENAME), mapArgs, mapMultiArgs);
     } catch (const std::exception& e) {
         QMessageBox::critical(0, QObject::tr(PACKAGE_NAME),
                               QObject::tr("Error: Cannot parse configuration file: %1. Only use key=value syntax.").arg(e.what()));
diff --git a/src/util.cpp b/src/util.cpp
index 93cc0412b5eb4..c20ede62210b1 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -518,19 +518,20 @@ void ClearDatadirCache()
     pathCachedNetSpecific = boost::filesystem::path();
 }
 
-boost::filesystem::path GetConfigFile()
+boost::filesystem::path GetConfigFile(const std::string& confPath)
 {
-    boost::filesystem::path pathConfigFile(GetArg("-conf", BITCOIN_CONF_FILENAME));
+    boost::filesystem::path pathConfigFile(confPath);
     if (!pathConfigFile.is_complete())
         pathConfigFile = GetDataDir(false) / pathConfigFile;
 
     return pathConfigFile;
 }
 
-void ReadConfigFile(map<string, string>& mapSettingsRet,
+void ReadConfigFile(const std::string& confPath,
+                    map<string, string>& mapSettingsRet,
                     map<string, vector<string> >& mapMultiSettingsRet)
 {
-    boost::filesystem::ifstream streamConfig(GetConfigFile());
+    boost::filesystem::ifstream streamConfig(GetConfigFile(confPath));
     if (!streamConfig.good())
         return; // No bitcoin.conf file is OK
 
diff --git a/src/util.h b/src/util.h
index 45b365855781a..bbb9b5db825de 100644
--- a/src/util.h
+++ b/src/util.h
@@ -102,12 +102,12 @@ bool TryCreateDirectory(const boost::filesystem::path& p);
 boost::filesystem::path GetDefaultDataDir();
 const boost::filesystem::path &GetDataDir(bool fNetSpecific = true);
 void ClearDatadirCache();
-boost::filesystem::path GetConfigFile();
+boost::filesystem::path GetConfigFile(const std::string& confPath);
 #ifndef WIN32
 boost::filesystem::path GetPidFile();
 void CreatePidFile(const boost::filesystem::path &path, pid_t pid);
 #endif
-void ReadConfigFile(std::map<std::string, std::string>& mapSettingsRet, std::map<std::string, std::vector<std::string> >& mapMultiSettingsRet);
+void ReadConfigFile(const std::string& confPath, std::map<std::string, std::string>& mapSettingsRet, std::map<std::string, std::vector<std::string> >& mapMultiSettingsRet);
 #ifdef WIN32
 boost::filesystem::path GetSpecialFolderPath(int nFolder, bool fCreate = true);
 #endif

From 1c80386bceb216ca5b5da657e03a29f9c779d58b Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Sat, 1 Oct 2016 16:57:25 +0200
Subject: [PATCH 0972/1802] rpc: Generate auth cookie in hex instead of base64

Base64 contains '/', and the '/' character in credentials is problematic
for AuthServiceProxy which represents the RPC endpoint as an URI with
user and password embedded.

Closes #8399.
---
 src/rpc/protocol.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/rpc/protocol.cpp b/src/rpc/protocol.cpp
index f5275062a2482..bb885bb5a655d 100644
--- a/src/rpc/protocol.cpp
+++ b/src/rpc/protocol.cpp
@@ -77,9 +77,10 @@ boost::filesystem::path GetAuthCookieFile()
 
 bool GenerateAuthCookie(std::string *cookie_out)
 {
-    unsigned char rand_pwd[32];
-    GetRandBytes(rand_pwd, 32);
-    std::string cookie = COOKIEAUTH_USER + ":" + EncodeBase64(&rand_pwd[0],32);
+    const size_t COOKIE_SIZE = 32;
+    unsigned char rand_pwd[COOKIE_SIZE];
+    GetRandBytes(rand_pwd, COOKIE_SIZE);
+    std::string cookie = COOKIEAUTH_USER + ":" + HexStr(rand_pwd, rand_pwd+COOKIE_SIZE);
 
     /** the umask determines what permissions are used to create this file -
      * these are set to 077 in init.cpp unless overridden with -sysperms.

From 905bc68d05595f41cca36b3df83accd10c00cc48 Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Mon, 12 Sep 2016 21:32:53 -0400
Subject: [PATCH 0973/1802] net: fix a few cases where messages were sent
 rather than dropped upon disconnection

75ead758 turned these into crashes in the event of a handshake failure, most
notably when a peer does not offer the expected services.

There are likely other cases that these assertions will find as well.
---
 src/main.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index ab672197144e6..437e972382acd 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -6351,7 +6351,7 @@ bool SendMessages(CNode* pto, CConnman& connman)
             // Ping automatically sent as a latency probe & keepalive.
             pingSend = true;
         }
-        if (pingSend) {
+        if (pingSend && !pto->fDisconnect) {
             uint64_t nonce = 0;
             while (nonce == 0) {
                 GetRandBytes((unsigned char*)&nonce, sizeof(nonce));
@@ -6432,7 +6432,7 @@ bool SendMessages(CNode* pto, CConnman& connman)
         if (pindexBestHeader == NULL)
             pindexBestHeader = chainActive.Tip();
         bool fFetch = state.fPreferredDownload || (nPreferredDownload == 0 && !pto->fClient && !pto->fOneShot); // Download if this is a nice peer, or we have no nice peers and this one might do.
-        if (!state.fSyncStarted && !pto->fClient && !fImporting && !fReindex) {
+        if (!state.fSyncStarted && !pto->fClient && !pto->fDisconnect && !fImporting && !fReindex) {
             // Only actively request headers from a single peer, unless we're close to today.
             if ((nSyncStarted == 0 && fFetch) || pindexBestHeader->GetBlockTime() > GetAdjustedTime() - 24 * 60 * 60) {
                 state.fSyncStarted = true;

From f00705ae7ff3c1db805859e3be41e58ac70625b6 Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Fri, 30 Sep 2016 17:21:12 +0200
Subject: [PATCH 0974/1802] serialize: Deprecate `begin_ptr` / `end_ptr`

Implement `begin_ptr` and `end_ptr` in terms of C++11 code,
and add a comment that they are deprecated.

Follow-up to developer notes update in 654a21162252294b7dbd6c982fec88008af7335e.
---
 src/prevector.h |  2 +-
 src/serialize.h | 21 ++++++++++-----------
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/src/prevector.h b/src/prevector.h
index d840dfcd08468..25bce522dc9b1 100644
--- a/src/prevector.h
+++ b/src/prevector.h
@@ -476,7 +476,7 @@ class prevector {
         }
     }
 
-    value_type* data() noexcept {
+    value_type* data() {
         return item_ptr(0);
     }
 
diff --git a/src/serialize.h b/src/serialize.h
index 04ab9aa2e7762..1f51da82fffa2 100644
--- a/src/serialize.h
+++ b/src/serialize.h
@@ -44,33 +44,32 @@ inline T* NCONST_PTR(const T* val)
     return const_cast<T*>(val);
 }
 
-/** 
- * Get begin pointer of vector (non-const version).
- * @note These functions avoid the undefined case of indexing into an empty
- * vector, as well as that of indexing after the end of the vector.
+/**
+ * Important: Do not use the following functions in new code, but use v.data()
+ * and v.data() + v.size() respectively directly. They were once introduced to
+ * have a compatible, safe way to get the begin and end pointer of a vector.
+ * However with C++11 the language has built-in functionality for this and it's
+ * more readable to just use that.
  */
 template <typename V>
 inline typename V::value_type* begin_ptr(V& v)
 {
-    return v.empty() ? NULL : &v[0];
+    return v.data();
 }
-/** Get begin pointer of vector (const version) */
 template <typename V>
 inline const typename V::value_type* begin_ptr(const V& v)
 {
-    return v.empty() ? NULL : &v[0];
+    return v.data();
 }
-/** Get end pointer of vector (non-const version) */
 template <typename V>
 inline typename V::value_type* end_ptr(V& v)
 {
-    return v.empty() ? NULL : (&v[0] + v.size());
+    return v.data() + v.size();
 }
-/** Get end pointer of vector (const version) */
 template <typename V>
 inline const typename V::value_type* end_ptr(const V& v)
 {
-    return v.empty() ? NULL : (&v[0] + v.size());
+    return v.data() + v.size();
 }
 
 /*

From fa7c35c4ec630838178b4674288da33561a66f08 Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Sat, 1 Oct 2016 21:07:31 +0200
Subject: [PATCH 0975/1802] [qa] util: Move wait_bitcoinds() into stop_nodes()

---
 qa/rpc-tests/bip9-softforks.py                |  1 -
 qa/rpc-tests/fundrawtransaction.py            |  1 -
 qa/rpc-tests/p2p-versionbits-warning.py       |  6 ++----
 qa/rpc-tests/reindex.py                       | 16 +++++++++-------
 qa/rpc-tests/rpcbind_test.py                  |  2 --
 qa/rpc-tests/test_framework/test_framework.py |  4 ----
 qa/rpc-tests/test_framework/util.py           |  2 +-
 qa/rpc-tests/wallet.py                        |  3 ---
 8 files changed, 12 insertions(+), 23 deletions(-)

diff --git a/qa/rpc-tests/bip9-softforks.py b/qa/rpc-tests/bip9-softforks.py
index 979d1410c2616..be6ddde112ea2 100755
--- a/qa/rpc-tests/bip9-softforks.py
+++ b/qa/rpc-tests/bip9-softforks.py
@@ -195,7 +195,6 @@ def test_BIP(self, bipName, activated_version, invalidate, invalidatePostSignatu
         # Restart all
         self.test.block_store.close()
         stop_nodes(self.nodes)
-        wait_bitcoinds()
         shutil.rmtree(self.options.tmpdir)
         self.setup_chain()
         self.setup_network()
diff --git a/qa/rpc-tests/fundrawtransaction.py b/qa/rpc-tests/fundrawtransaction.py
index eeb8476634fcb..8c45578fcfbdd 100755
--- a/qa/rpc-tests/fundrawtransaction.py
+++ b/qa/rpc-tests/fundrawtransaction.py
@@ -470,7 +470,6 @@ def run_test(self):
         self.nodes[1].encryptwallet("test")
         self.nodes.pop(1)
         stop_nodes(self.nodes)
-        wait_bitcoinds()
 
         self.nodes = start_nodes(self.num_nodes, self.options.tmpdir)
         # This test is not meant to test fee estimation and we'd like
diff --git a/qa/rpc-tests/p2p-versionbits-warning.py b/qa/rpc-tests/p2p-versionbits-warning.py
index cceaa37b3dd75..fc3eddddee17b 100755
--- a/qa/rpc-tests/p2p-versionbits-warning.py
+++ b/qa/rpc-tests/p2p-versionbits-warning.py
@@ -144,8 +144,7 @@ def run_test(self):
         # is cleared, and restart the node. This should move the versionbit state
         # to ACTIVE.
         self.nodes[0].generate(VB_PERIOD)
-        stop_node(self.nodes[0], 0)
-        wait_bitcoinds()
+        stop_nodes(self.nodes)
         # Empty out the alert file
         with open(self.alert_filename, 'w', encoding='utf8') as _:
             pass
@@ -156,8 +155,7 @@ def run_test(self):
         assert(WARN_UNKNOWN_RULES_ACTIVE in self.nodes[0].getinfo()["errors"])
         assert(WARN_UNKNOWN_RULES_ACTIVE in self.nodes[0].getmininginfo()["errors"])
         assert(WARN_UNKNOWN_RULES_ACTIVE in self.nodes[0].getnetworkinfo()["warnings"])
-        stop_node(self.nodes[0], 0)
-        wait_bitcoinds()
+        stop_nodes(self.nodes)
         self.test_versionbits_in_alert_file()
 
         # Test framework expects the node to still be running...
diff --git a/qa/rpc-tests/reindex.py b/qa/rpc-tests/reindex.py
index abbbb1033693b..25cf4c1679b98 100755
--- a/qa/rpc-tests/reindex.py
+++ b/qa/rpc-tests/reindex.py
@@ -7,7 +7,11 @@
 # Test -reindex and -reindex-chainstate with CheckBlockIndex
 #
 from test_framework.test_framework import BitcoinTestFramework
-from test_framework.util import *
+from test_framework.util import (
+    start_nodes,
+    stop_nodes,
+    assert_equal,
+)
 import time
 
 class ReindexTest(BitcoinTestFramework):
@@ -18,16 +22,14 @@ def __init__(self):
         self.num_nodes = 1
 
     def setup_network(self):
-        self.nodes = []
-        self.is_network_split = False
-        self.nodes.append(start_node(0, self.options.tmpdir))
+        self.nodes = start_nodes(self.num_nodes, self.options.tmpdir)
 
     def reindex(self, justchainstate=False):
         self.nodes[0].generate(3)
         blockcount = self.nodes[0].getblockcount()
-        stop_node(self.nodes[0], 0)
-        wait_bitcoinds()
-        self.nodes[0]=start_node(0, self.options.tmpdir, ["-debug", "-reindex-chainstate" if justchainstate else "-reindex", "-checkblockindex=1"])
+        stop_nodes(self.nodes)
+        extra_args = [["-debug", "-reindex-chainstate" if justchainstate else "-reindex", "-checkblockindex=1"]]
+        self.nodes = start_nodes(self.num_nodes, self.options.tmpdir, extra_args)
         while self.nodes[0].getblockcount() < blockcount:
             time.sleep(0.1)
         assert_equal(self.nodes[0].getblockcount(), blockcount)
diff --git a/qa/rpc-tests/rpcbind_test.py b/qa/rpc-tests/rpcbind_test.py
index 085024e268384..d78d0b884e9ed 100755
--- a/qa/rpc-tests/rpcbind_test.py
+++ b/qa/rpc-tests/rpcbind_test.py
@@ -40,7 +40,6 @@ def run_bind_test(self, allow_ips, connect_to, addresses, expected):
             assert_equal(set(get_bind_addrs(pid)), set(expected))
         finally:
             stop_nodes(self.nodes)
-            wait_bitcoinds()
 
     def run_allowip_test(self, allow_ips, rpchost, rpcport):
         '''
@@ -56,7 +55,6 @@ def run_allowip_test(self, allow_ips, rpchost, rpcport):
         finally:
             node = None # make sure connection will be garbage collected and closed
             stop_nodes(self.nodes)
-            wait_bitcoinds()
 
     def run_test(self):
         # due to OS-specific network stats queries, this test works only on Linux
diff --git a/qa/rpc-tests/test_framework/test_framework.py b/qa/rpc-tests/test_framework/test_framework.py
index 186cf866cfda6..e6fc5fd8a20e4 100755
--- a/qa/rpc-tests/test_framework/test_framework.py
+++ b/qa/rpc-tests/test_framework/test_framework.py
@@ -21,7 +21,6 @@
     sync_mempools,
     stop_nodes,
     stop_node,
-    wait_bitcoinds,
     enable_coverage,
     check_json_precision,
     initialize_chain_clean,
@@ -81,7 +80,6 @@ def split_network(self):
         """
         assert not self.is_network_split
         stop_nodes(self.nodes)
-        wait_bitcoinds()
         self.setup_network(True)
 
     def sync_all(self):
@@ -100,7 +98,6 @@ def join_network(self):
         """
         assert self.is_network_split
         stop_nodes(self.nodes)
-        wait_bitcoinds()
         self.setup_network(False)
 
     def main(self):
@@ -170,7 +167,6 @@ def main(self):
         if not self.options.noshutdown:
             print("Stopping nodes")
             stop_nodes(self.nodes)
-            wait_bitcoinds()
         else:
             print("Note: bitcoinds were not stopped and may still be running")
 
diff --git a/qa/rpc-tests/test_framework/util.py b/qa/rpc-tests/test_framework/util.py
index 2f0d909a6e661..c6b0367b419d6 100644
--- a/qa/rpc-tests/test_framework/util.py
+++ b/qa/rpc-tests/test_framework/util.py
@@ -266,7 +266,6 @@ def initialize_chain(test_dir, num_nodes, cachedir):
 
         # Shut them down, and clean up cache directories:
         stop_nodes(rpcs)
-        wait_bitcoinds()
         disable_mocktime()
         for i in range(MAX_NODES):
             os.remove(log_filename(cachedir, i, "debug.log"))
@@ -365,6 +364,7 @@ def stop_nodes(nodes):
         except http.client.CannotSendRequest as e:
             print("WARN: Unable to stop node: " + repr(e))
     del nodes[:] # Emptying array closes connections as a side effect
+    wait_bitcoinds()
 
 def set_node_times(nodes, t):
     for node in nodes:
diff --git a/qa/rpc-tests/wallet.py b/qa/rpc-tests/wallet.py
index 3420be1a2ed1e..e43f6ea5d225e 100755
--- a/qa/rpc-tests/wallet.py
+++ b/qa/rpc-tests/wallet.py
@@ -199,7 +199,6 @@ def run_test (self):
 
         #do some -walletbroadcast tests
         stop_nodes(self.nodes)
-        wait_bitcoinds()
         self.nodes = start_nodes(3, self.options.tmpdir, [["-walletbroadcast=0"],["-walletbroadcast=0"],["-walletbroadcast=0"]])
         connect_nodes_bi(self.nodes,0,1)
         connect_nodes_bi(self.nodes,1,2)
@@ -225,7 +224,6 @@ def run_test (self):
 
         #restart the nodes with -walletbroadcast=1
         stop_nodes(self.nodes)
-        wait_bitcoinds()
         self.nodes = start_nodes(3, self.options.tmpdir)
         connect_nodes_bi(self.nodes,0,1)
         connect_nodes_bi(self.nodes,1,2)
@@ -335,7 +333,6 @@ def run_test (self):
         for m in maintenance:
             print("check " + m)
             stop_nodes(self.nodes)
-            wait_bitcoinds()
             self.nodes = start_nodes(3, self.options.tmpdir, [[m]] * 3)
             while m == '-reindex' and [block_count] * 3 != [self.nodes[i].getblockcount() for i in range(3)]:
                 # reindex will leave rpc warm up "early"; Wait for it to finish

From fa666094cf5b9ac4a7c1732a7ffa001afffcd938 Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Sat, 1 Oct 2016 11:36:25 +0200
Subject: [PATCH 0976/1802] [qa] mininode: Only allow named args in wait_until

---
 qa/rpc-tests/maxuploadtarget.py         | 2 +-
 qa/rpc-tests/p2p-mempool.py             | 2 +-
 qa/rpc-tests/test_framework/mininode.py | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/qa/rpc-tests/maxuploadtarget.py b/qa/rpc-tests/maxuploadtarget.py
index 125d4eb275190..d0e9fe9a3f592 100755
--- a/qa/rpc-tests/maxuploadtarget.py
+++ b/qa/rpc-tests/maxuploadtarget.py
@@ -75,7 +75,7 @@ def sync_with_ping(self, timeout=30):
         def received_pong():
             return (self.last_pong.nonce == self.ping_counter)
         self.connection.send_message(msg_ping(nonce=self.ping_counter))
-        success = wait_until(received_pong, timeout)
+        success = wait_until(received_pong, timeout=timeout)
         self.ping_counter += 1
         return success
 
diff --git a/qa/rpc-tests/p2p-mempool.py b/qa/rpc-tests/p2p-mempool.py
index 5c5d778f429b9..382d7f1e82ca0 100755
--- a/qa/rpc-tests/p2p-mempool.py
+++ b/qa/rpc-tests/p2p-mempool.py
@@ -63,7 +63,7 @@ def sync_with_ping(self, timeout=30):
         def received_pong():
             return (self.last_pong.nonce == self.ping_counter)
         self.connection.send_message(msg_ping(nonce=self.ping_counter))
-        success = wait_until(received_pong, timeout)
+        success = wait_until(received_pong, timeout=timeout)
         self.ping_counter += 1
         return success
 
diff --git a/qa/rpc-tests/test_framework/mininode.py b/qa/rpc-tests/test_framework/mininode.py
index 0b7b17cdb5684..88a3b7e0f7144 100755
--- a/qa/rpc-tests/test_framework/mininode.py
+++ b/qa/rpc-tests/test_framework/mininode.py
@@ -1320,7 +1320,7 @@ def __repr__(self):
             % (self.message, self.code, self.reason, self.data)
 
 # Helper function
-def wait_until(predicate, attempts=float('inf'), timeout=float('inf')):
+def wait_until(predicate, *, attempts=float('inf'), timeout=float('inf')):
     attempt = 0
     elapsed = 0
 

From 5f274a1749acfdf331bc2931e25ac80c346e5faa Mon Sep 17 00:00:00 2001
From: jnewbery <john@johnnewbery.com>
Date: Tue, 27 Sep 2016 13:40:16 -0400
Subject: [PATCH 0977/1802] log block size and weight correctly.

---
 src/miner.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/miner.cpp b/src/miner.cpp
index 9575858840df0..6cb40dae8d97e 100644
--- a/src/miner.cpp
+++ b/src/miner.cpp
@@ -168,7 +168,6 @@ CBlockTemplate* BlockAssembler::CreateNewBlock(const CScript& scriptPubKeyIn)
     nLastBlockTx = nBlockTx;
     nLastBlockSize = nBlockSize;
     nLastBlockWeight = nBlockWeight;
-    LogPrintf("CreateNewBlock(): total size %u txs: %u fees: %ld sigops %d\n", nBlockSize, nBlockTx, nFees, nBlockSigOpsCost);
 
     // Create coinbase transaction.
     CMutableTransaction coinbaseTx;
@@ -182,6 +181,9 @@ CBlockTemplate* BlockAssembler::CreateNewBlock(const CScript& scriptPubKeyIn)
     pblocktemplate->vchCoinbaseCommitment = GenerateCoinbaseCommitment(*pblock, pindexPrev, chainparams.GetConsensus());
     pblocktemplate->vTxFees[0] = -nFees;
 
+    uint64_t nSerializeSize = GetSerializeSize(*pblock, SER_NETWORK, PROTOCOL_VERSION);
+    LogPrintf("CreateNewBlock(): total size: %u block weight: %u txs: %u fees: %ld sigops %d\n", nSerializeSize, GetBlockWeight(*pblock), nBlockTx, nFees, nBlockSigOpsCost);
+
     // Fill in header
     pblock->hashPrevBlock  = pindexPrev->GetBlockHash();
     UpdateTime(pblock, chainparams.GetConsensus(), pindexPrev);

From f9bd92d235a187a9bfea4c956bf74e2e08cebb46 Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Tue, 4 Oct 2016 11:11:21 +0000
Subject: [PATCH 0978/1802] version.h: s/shord/short/ in comment

---
 src/version.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/version.h b/src/version.h
index 68ccd6d378323..87bd65506670a 100644
--- a/src/version.h
+++ b/src/version.h
@@ -39,7 +39,7 @@ static const int SENDHEADERS_VERSION = 70012;
 //! "feefilter" tells peers to filter invs to you by fee starts with this version
 static const int FEEFILTER_VERSION = 70013;
 
-//! shord-id-based block download starts with this version
+//! short-id-based block download starts with this version
 static const int SHORT_IDS_BLOCKS_VERSION = 70014;
 
 #endif // BITCOIN_VERSION_H

From 2c09a5209ab00573a2422e1e65c437a6e2f59624 Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Tue, 4 Oct 2016 11:12:23 +0000
Subject: [PATCH 0979/1802] protocol.h: Move MESSAGE_START_SIZE into
 CMessageHeader

Also move the enum to the top, and remove a deceptive TODO
comment.
---
 src/main.cpp   |  6 +++---
 src/protocol.h | 23 ++++++++++-------------
 2 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index 437e972382acd..9b66aad429f99 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -4358,11 +4358,11 @@ bool LoadExternalBlockFile(const CChainParams& chainparams, FILE* fileIn, CDiskB
             unsigned int nSize = 0;
             try {
                 // locate a header
-                unsigned char buf[MESSAGE_START_SIZE];
+                unsigned char buf[CMessageHeader::MESSAGE_START_SIZE];
                 blkdat.FindByte(chainparams.MessageStart()[0]);
                 nRewind = blkdat.GetPos()+1;
                 blkdat >> FLATDATA(buf);
-                if (memcmp(buf, chainparams.MessageStart(), MESSAGE_START_SIZE))
+                if (memcmp(buf, chainparams.MessageStart(), CMessageHeader::MESSAGE_START_SIZE))
                     continue;
                 // read size
                 blkdat >> nSize;
@@ -6232,7 +6232,7 @@ bool ProcessMessages(CNode* pfrom, CConnman& connman)
         it++;
 
         // Scan for message start
-        if (memcmp(msg.hdr.pchMessageStart, chainparams.MessageStart(), MESSAGE_START_SIZE) != 0) {
+        if (memcmp(msg.hdr.pchMessageStart, chainparams.MessageStart(), CMessageHeader::MESSAGE_START_SIZE) != 0) {
             LogPrintf("PROCESSMESSAGE: INVALID MESSAGESTART %s peer=%d\n", SanitizeString(msg.hdr.GetCommand()), pfrom->id);
             fOk = false;
             break;
diff --git a/src/protocol.h b/src/protocol.h
index 1bc1c25b3714f..cdb76b90381c5 100644
--- a/src/protocol.h
+++ b/src/protocol.h
@@ -18,8 +18,6 @@
 #include <stdint.h>
 #include <string>
 
-#define MESSAGE_START_SIZE 4
-
 /** Message header.
  * (4) message start.
  * (12) command.
@@ -29,6 +27,16 @@
 class CMessageHeader
 {
 public:
+    enum {
+        MESSAGE_START_SIZE = 4,
+        COMMAND_SIZE = 12,
+        MESSAGE_SIZE_SIZE = 4,
+        CHECKSUM_SIZE = 4,
+
+        MESSAGE_SIZE_OFFSET = MESSAGE_START_SIZE + COMMAND_SIZE,
+        CHECKSUM_OFFSET = MESSAGE_SIZE_OFFSET + MESSAGE_SIZE_SIZE,
+        HEADER_SIZE = MESSAGE_START_SIZE + COMMAND_SIZE + MESSAGE_SIZE_SIZE + CHECKSUM_SIZE
+    };
     typedef unsigned char MessageStartChars[MESSAGE_START_SIZE];
 
     CMessageHeader(const MessageStartChars& pchMessageStartIn);
@@ -48,17 +56,6 @@ class CMessageHeader
         READWRITE(FLATDATA(pchChecksum));
     }
 
-    // TODO: make private (improves encapsulation)
-public:
-    enum {
-        COMMAND_SIZE = 12,
-        MESSAGE_SIZE_SIZE = 4,
-        CHECKSUM_SIZE = 4,
-
-        MESSAGE_SIZE_OFFSET = MESSAGE_START_SIZE + COMMAND_SIZE,
-        CHECKSUM_OFFSET = MESSAGE_SIZE_OFFSET + MESSAGE_SIZE_SIZE,
-        HEADER_SIZE = MESSAGE_START_SIZE + COMMAND_SIZE + MESSAGE_SIZE_SIZE + CHECKSUM_SIZE
-    };
     char pchMessageStart[MESSAGE_START_SIZE];
     char pchCommand[COMMAND_SIZE];
     uint32_t nMessageSize;

From eeeebdd3cba1e69835f826236f7d71ee8d76ace4 Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Wed, 21 Sep 2016 12:21:13 +0200
Subject: [PATCH 0980/1802] [doc] Rework docs

* Minor formatting such as adjusting links
* Move sections of `doc/multiwallet-qt.md` to the source code and delete
  the file, as it is outdated
* Fix typo in the release notes
* Amend release process to mention update of BLOCK_CHAIN_SIZE
---
 doc/README.md                             | 10 +++--
 doc/multiwallet-qt.md                     | 48 -----------------------
 doc/release-notes/release-notes-0.13.0.md |  2 +-
 doc/release-process.md                    |  1 +
 doc/{travis-ci.txt => travis-ci.md}       |  9 +++--
 src/qt/bitcoingui.cpp                     |  2 +
 src/qt/walletframe.h                      |  7 ++++
 7 files changed, 24 insertions(+), 55 deletions(-)
 delete mode 100644 doc/multiwallet-qt.md
 rename doc/{travis-ci.txt => travis-ci.md} (88%)

diff --git a/doc/README.md b/doc/README.md
index 09a507c9ce6e9..e4fa49614ac8c 100644
--- a/doc/README.md
+++ b/doc/README.md
@@ -3,7 +3,9 @@ Bitcoin Core 0.13.99
 
 Setup
 ---------------------
-[Bitcoin Core](http://bitcoin.org/en/download) is the original Bitcoin client and it builds the backbone of the network. However, it downloads and stores the entire history of Bitcoin transactions (which is currently several GBs); depending on the speed of your computer and network connection, the synchronization process can take anywhere from a few hours to a day or more.
+Bitcoin Core is the original Bitcoin client and it builds the backbone of the network. However, it downloads and stores the entire history of Bitcoin transactions (which is currently several GBs); depending on the speed of your computer and network connection, the synchronization process can take anywhere from a few hours to a day or more.
+
+To download Bitcoin Core, visit [bitcoincore.org](https://bitcoincore.org/en/releases/).
 
 Running
 ---------------------
@@ -46,13 +48,13 @@ Development
 The Bitcoin repo's [root README](/README.md) contains relevant information on the development process and automated testing.
 
 - [Developer Notes](developer-notes.md)
-- [Multiwallet Qt Development](multiwallet-qt.md)
 - [Release Notes](release-notes.md)
 - [Release Process](release-process.md)
 - [Source Code Documentation (External Link)](https://dev.visucore.com/bitcoin/doxygen/)
 - [Translation Process](translation_process.md)
 - [Translation Strings Policy](translation_strings_policy.md)
 - [Unit Tests](unit-tests.md)
+- [Travis CI](travis-ci.md)
 - [Unauthenticated REST Interface](REST-interface.md)
 - [Shared Libraries](shared-libraries.md)
 - [BIPS](bips.md)
@@ -67,11 +69,13 @@ The Bitcoin repo's [root README](/README.md) contains relevant information on th
 ### Miscellaneous
 - [Assets Attribution](assets-attribution.md)
 - [Files](files.md)
+- [Reduce Traffic](reduce-traffic.md)
 - [Tor Support](tor.md)
 - [Init Scripts (systemd/upstart/openrc)](init.md)
+- [ZMQ](zmq.md)
 
 License
 ---------------------
-Distributed under the [MIT software license](http://www.opensource.org/licenses/mit-license.php).
+Distributed under the [MIT software license](/COPYING).
 This product includes software developed by the OpenSSL Project for use in the [OpenSSL Toolkit](https://www.openssl.org/). This product includes
 cryptographic software written by Eric Young ([eay@cryptsoft.com](mailto:eay@cryptsoft.com)), and UPnP software written by Thomas Bernard.
diff --git a/doc/multiwallet-qt.md b/doc/multiwallet-qt.md
deleted file mode 100644
index 3caab818076b8..0000000000000
--- a/doc/multiwallet-qt.md
+++ /dev/null
@@ -1,48 +0,0 @@
-Multiwallet Qt Development and Integration Strategy
-===================================================
-
-In order to support loading of multiple wallets in bitcoin-qt, a few changes in the UI architecture will be needed.
-Fortunately, only four of the files in the existing project are affected by this change.
-
-Two new classes have been implemented in two new .h/.cpp file pairs, with much of the functionality that was previously
-implemented in the BitcoinGUI class moved over to these new classes.
-
-The two existing files most affected, by far, are bitcoingui.h and bitcoingui.cpp, as the BitcoinGUI class will require
-some major retrofitting.
-
-Only requiring some minor changes is bitcoin.cpp.
-
-Finally, two new headers and source files will have to be added to bitcoin-qt.pro.
-
-Changes to class BitcoinGUI
----------------------------
-The principal change to the BitcoinGUI class concerns the QStackedWidget instance called centralWidget.
-This widget owns five page views: overviewPage, transactionsPage, addressBookPage, receiveCoinsPage, and sendCoinsPage.
-
-A new class called *WalletView* inheriting from QStackedWidget has been written to handle all renderings and updates of
-these page views. In addition to owning these five page views, a WalletView also has a pointer to a WalletModel instance.
-This allows the construction of multiple WalletView objects, each rendering a distinct wallet.
-
-A second class called *WalletFrame* inheriting from QFrame has been written as a container for embedding all wallet-related
-controls into BitcoinGUI. At present it contains the WalletView instances for the wallets and does little more than passing on messages
-from BitcoinGUI to the currently selected WalletView. It is a WalletFrame instance
-that takes the place of what used to be centralWidget in BitcoinGUI. The purpose of this class is to allow future
-refinements of the wallet controls with minimal need for further modifications to BitcoinGUI, thus greatly simplifying
-merges while reducing the risk of breaking top-level stuff.
-
-Changes to bitcoin.cpp
-----------------------
-bitcoin.cpp is the entry point into bitcoin-qt, and as such, will require some minor modifications to provide hooks for
-multiple wallet support. Most importantly will be the way it instantiates WalletModels and passes them to the
-singleton BitcoinGUI instance called window. Formerly, BitcoinGUI kept a pointer to a single instance of a WalletModel.
-The initial change required is very simple: rather than calling `window.setWalletModel(&walletModel);` we perform the
-following two steps:
-
-	window.addWallet("~Default", &walletModel);
-	window.setCurrentWallet("~Default");
-
-The string parameter is just an arbitrary name given to the default wallet. It's been prepended with a tilde to avoid name collisions in the future with additional wallets.
-
-The shutdown call `window.setWalletModel(0)` has also been removed. In its place is now:
-
-window.removeAllWallets();
diff --git a/doc/release-notes/release-notes-0.13.0.md b/doc/release-notes/release-notes-0.13.0.md
index 5dd3f5a651ea2..f9bf3d75de09d 100644
--- a/doc/release-notes/release-notes-0.13.0.md
+++ b/doc/release-notes/release-notes-0.13.0.md
@@ -643,7 +643,7 @@ git merge commit are mentioned.
 - #8041 `5b736dd` Fix bip9-softforks blockstore issue (MarcoFalke)
 - #7994 `1f01443` Add op csv tests to script_tests.json (Christewart)
 - #8038 `e2bf830` Various minor fixes (MarcoFalke)
-- #8072 `1b87e5b` Travis: 'make check' in parallel and verbose (MarcoFalke)
+- #8072 `1b87e5b` Travis: 'make check' in parallel and verbose (theuni)
 - #8056 `8844ef1` Remove hardcoded "4 nodes" from test_framework (MarcoFalke)
 - #8047 `37f9a1f` Test_framework: Set wait-timeout for bitcoind procs (MarcoFalke)
 - #8095 `6700cc9` Test framework: only cleanup on successful test runs (sdaftuar)
diff --git a/doc/release-process.md b/doc/release-process.md
index d07f9a89ad9c5..63f75fb3992a2 100644
--- a/doc/release-process.md
+++ b/doc/release-process.md
@@ -16,6 +16,7 @@ Before every minor and major release:
 Before every major release:
 
 * Update hardcoded [seeds](/contrib/seeds/README.md), see [this pull request](https://github.com/bitcoin/bitcoin/pull/7415) for an example.
+* Update [`BLOCK_CHAIN_SIZE`](/src/qt/intro.cpp) to the current size plus some overhead.
 
 ### First time / New builders
 
diff --git a/doc/travis-ci.txt b/doc/travis-ci.md
similarity index 88%
rename from doc/travis-ci.txt
rename to doc/travis-ci.md
index 06410405d6de8..38085cec353ad 100644
--- a/doc/travis-ci.txt
+++ b/doc/travis-ci.md
@@ -1,5 +1,8 @@
+Travis CI
+=========
+
 Support for using travis-ci has been added in order to automate pull-testing.
-See https://travis-ci.org/ for more info
+See [travis-ci.org](https://travis-ci.org/) for more info
 
 This procedure is different than the pull-tester that came before it in a few
 ways.
@@ -7,7 +10,7 @@ ways.
 There is nothing to administer. This is a major feature as it means
 that builds have no local state. Because there is no ability to login to the
 builders to install packages (tools, dependencies, etc), the entire build
-procedure must instead be controlled by a declarative script (.travis.yml).
+procedure must instead be controlled by a declarative script `.travis.yml`.
 This script declares each build configuration, creates virtual machines as
 necessary, builds, then discards the virtual machines.
 
@@ -16,7 +19,7 @@ than a single pass/fail. This helps to catch build failures and logic errors
 that present on platforms other than the ones the author has tested. This
 matrix is defined in the build script and can be changed at any time.
 
-All builders use the dependency-generator in the depends dir, rather than
+All builders use the dependency-generator in the [depends dir](/depends), rather than
 using apt-get to install build dependencies. This guarantees that the tester
 is using the same versions as Gitian, so the build results are nearly identical
 to what would be found in a final release. However, this also means that builds
diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp
index dd022ee7624b5..af767aa6c62c0 100644
--- a/src/qt/bitcoingui.cpp
+++ b/src/qt/bitcoingui.cpp
@@ -74,6 +74,8 @@ const std::string BitcoinGUI::DEFAULT_UIPLATFORM =
 #endif
         ;
 
+/** Display name for default wallet name. Uses tilde to avoid name
+ * collisions in the future with additional wallets */
 const QString BitcoinGUI::DEFAULT_WALLET = "~Default";
 
 BitcoinGUI::BitcoinGUI(const PlatformStyle *_platformStyle, const NetworkStyle *networkStyle, QWidget *parent) :
diff --git a/src/qt/walletframe.h b/src/qt/walletframe.h
index 00c2f5636379a..7bc6412910393 100644
--- a/src/qt/walletframe.h
+++ b/src/qt/walletframe.h
@@ -19,6 +19,13 @@ QT_BEGIN_NAMESPACE
 class QStackedWidget;
 QT_END_NAMESPACE
 
+/**
+ * A container for embedding all wallet-related
+ * controls into BitcoinGUI. The purpose of this class is to allow future
+ * refinements of the wallet controls with minimal need for further
+ * modifications to BitcoinGUI, thus greatly simplifying merges while
+ * reducing the risk of breaking top-level stuff.
+ */
 class WalletFrame : public QFrame
 {
     Q_OBJECT

From 06128da751371797683eabb577298a4966b2ce28 Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Mon, 3 Oct 2016 13:00:14 -0400
Subject: [PATCH 0981/1802] Make GetFetchFlags always request witness objects
 from witness peers

This fixes a bug where we might (in exceedingly rare circumstances)
accidentally ban a node for sending us the first (potentially few)
segwit blocks in non-segwit mode.
---
 src/main.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main.cpp b/src/main.cpp
index 437e972382acd..40c31b6ca6c76 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -4922,7 +4922,7 @@ void static ProcessGetData(CNode* pfrom, const Consensus::Params& consensusParam
 
 uint32_t GetFetchFlags(CNode* pfrom, CBlockIndex* pprev, const Consensus::Params& chainparams) {
     uint32_t nFetchFlags = 0;
-    if (IsWitnessEnabled(pprev, chainparams) && State(pfrom->GetId())->fHaveWitness) {
+    if ((pfrom->GetLocalServices() & NODE_WITNESS) && State(pfrom->GetId())->fHaveWitness) {
         nFetchFlags |= MSG_WITNESS_FLAG;
     }
     return nFetchFlags;

From be7555f0c03057bb5537cc42ca9d4937389f0670 Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Mon, 3 Oct 2016 13:33:07 -0400
Subject: [PATCH 0982/1802] Fix overly-prescriptive p2p-segwit test for new
 fetch logic

---
 qa/rpc-tests/p2p-segwit.py | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/qa/rpc-tests/p2p-segwit.py b/qa/rpc-tests/p2p-segwit.py
index 5c1eb21b1ffd5..c2ea20bb845c8 100755
--- a/qa/rpc-tests/p2p-segwit.py
+++ b/qa/rpc-tests/p2p-segwit.py
@@ -912,14 +912,6 @@ def test_witness_tx_relay_before_segwit_activation(self):
         # But eliminating the witness should fix it
         self.test_node.test_transaction_acceptance(tx, with_witness=False, accepted=True)
 
-        # Verify that inv's to test_node come with getdata's for non-witness tx's
-        # Just tweak the transaction, announce it, and verify we get a getdata
-        # for a normal tx
-        tx.vout[0].scriptPubKey = CScript([OP_TRUE, OP_TRUE])
-        tx.rehash()
-        self.test_node.announce_tx_and_wait_for_getdata(tx)
-        assert(self.test_node.last_getdata.inv[0].type == 1)
-
         # Cleanup: mine the first transaction and update utxo
         self.nodes[0].generate(1)
         assert_equal(len(self.nodes[0].getrawmempool()),  0)
@@ -1025,7 +1017,7 @@ def test_tx_relay_after_segwit_activation(self):
     def test_block_relay(self, segwit_activated):
         print("\tTesting block relay")
 
-        blocktype = 2|MSG_WITNESS_FLAG if segwit_activated else 2
+        blocktype = 2|MSG_WITNESS_FLAG
 
         # test_node has set NODE_WITNESS, so all getdata requests should be for
         # witness blocks.

From 87e7d7280739cccfabaffbbfbbbcfa21e943da3a Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Fri, 30 Sep 2016 17:40:03 -0400
Subject: [PATCH 0983/1802] Make validationinterface.UpdatedBlockTip more
 verbose

In anticipation of making all the callbacks out of block processing
flow through it. Note that vHashes will always have something in it
since pindexFork != pindexNewTip.
---
 src/main.cpp                         | 6 ++----
 src/validationinterface.cpp          | 4 ++--
 src/validationinterface.h            | 4 ++--
 src/zmq/zmqnotificationinterface.cpp | 7 +++++--
 src/zmq/zmqnotificationinterface.h   | 2 +-
 5 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index ab672197144e6..37a0a2f30d055 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -3099,11 +3099,9 @@ bool ActivateBestChain(CValidationState &state, const CChainParams& chainparams,
                         }
                     });
                 }
-                // Notify external listeners about the new tip.
-                if (!vHashes.empty()) {
-                    GetMainSignals().UpdatedBlockTip(pindexNewTip);
-                }
             }
+            // Notify external listeners about the new tip.
+            GetMainSignals().UpdatedBlockTip(pindexNewTip, pindexFork, fInitialDownload);
         }
     } while (pindexNewTip != pindexMostWork);
     CheckBlockIndex(chainparams.GetConsensus());
diff --git a/src/validationinterface.cpp b/src/validationinterface.cpp
index 6ddf37658d854..d0aa7b5f393ff 100644
--- a/src/validationinterface.cpp
+++ b/src/validationinterface.cpp
@@ -13,7 +13,7 @@ CMainSignals& GetMainSignals()
 }
 
 void RegisterValidationInterface(CValidationInterface* pwalletIn) {
-    g_signals.UpdatedBlockTip.connect(boost::bind(&CValidationInterface::UpdatedBlockTip, pwalletIn, _1));
+    g_signals.UpdatedBlockTip.connect(boost::bind(&CValidationInterface::UpdatedBlockTip, pwalletIn, _1, _2, _3));
     g_signals.SyncTransaction.connect(boost::bind(&CValidationInterface::SyncTransaction, pwalletIn, _1, _2, _3));
     g_signals.UpdatedTransaction.connect(boost::bind(&CValidationInterface::UpdatedTransaction, pwalletIn, _1));
     g_signals.SetBestChain.connect(boost::bind(&CValidationInterface::SetBestChain, pwalletIn, _1));
@@ -33,7 +33,7 @@ void UnregisterValidationInterface(CValidationInterface* pwalletIn) {
     g_signals.SetBestChain.disconnect(boost::bind(&CValidationInterface::SetBestChain, pwalletIn, _1));
     g_signals.UpdatedTransaction.disconnect(boost::bind(&CValidationInterface::UpdatedTransaction, pwalletIn, _1));
     g_signals.SyncTransaction.disconnect(boost::bind(&CValidationInterface::SyncTransaction, pwalletIn, _1, _2, _3));
-    g_signals.UpdatedBlockTip.disconnect(boost::bind(&CValidationInterface::UpdatedBlockTip, pwalletIn, _1));
+    g_signals.UpdatedBlockTip.disconnect(boost::bind(&CValidationInterface::UpdatedBlockTip, pwalletIn, _1, _2, _3));
 }
 
 void UnregisterAllValidationInterfaces() {
diff --git a/src/validationinterface.h b/src/validationinterface.h
index 0c91ec8308eed..683f8fe20cbae 100644
--- a/src/validationinterface.h
+++ b/src/validationinterface.h
@@ -33,7 +33,7 @@ void SyncWithWallets(const CTransaction& tx, const CBlockIndex *pindex, int posI
 
 class CValidationInterface {
 protected:
-    virtual void UpdatedBlockTip(const CBlockIndex *pindex) {}
+    virtual void UpdatedBlockTip(const CBlockIndex *pindexNew, const CBlockIndex *pindexFork, bool fInitialDownload) {}
     virtual void SyncTransaction(const CTransaction &tx, const CBlockIndex *pindex, int posInBlock) {}
     virtual void SetBestChain(const CBlockLocator &locator) {}
     virtual void UpdatedTransaction(const uint256 &hash) {}
@@ -49,7 +49,7 @@ class CValidationInterface {
 
 struct CMainSignals {
     /** Notifies listeners of updated block chain tip */
-    boost::signals2::signal<void (const CBlockIndex *)> UpdatedBlockTip;
+    boost::signals2::signal<void (const CBlockIndex *, const CBlockIndex *, bool fInitialDownload)> UpdatedBlockTip;
     /** Notifies listeners of updated transaction data (transaction, and optionally the block it is found in. */
     boost::signals2::signal<void (const CTransaction &, const CBlockIndex *pindex, int posInBlock)> SyncTransaction;
     /** Notifies listeners of an updated transaction without new data (for now: a coinbase potentially becoming visible). */
diff --git a/src/zmq/zmqnotificationinterface.cpp b/src/zmq/zmqnotificationinterface.cpp
index 376e7dec590b5..020cdfbdc724a 100644
--- a/src/zmq/zmqnotificationinterface.cpp
+++ b/src/zmq/zmqnotificationinterface.cpp
@@ -124,12 +124,15 @@ void CZMQNotificationInterface::Shutdown()
     }
 }
 
-void CZMQNotificationInterface::UpdatedBlockTip(const CBlockIndex *pindex)
+void CZMQNotificationInterface::UpdatedBlockTip(const CBlockIndex *pindexNew, const CBlockIndex *pindexFork, bool fInitialDownload)
 {
+    if (fInitialDownload)
+        return;
+
     for (std::list<CZMQAbstractNotifier*>::iterator i = notifiers.begin(); i!=notifiers.end(); )
     {
         CZMQAbstractNotifier *notifier = *i;
-        if (notifier->NotifyBlock(pindex))
+        if (notifier->NotifyBlock(pindexNew))
         {
             i++;
         }
diff --git a/src/zmq/zmqnotificationinterface.h b/src/zmq/zmqnotificationinterface.h
index a853447267f31..037470ec17f9f 100644
--- a/src/zmq/zmqnotificationinterface.h
+++ b/src/zmq/zmqnotificationinterface.h
@@ -25,7 +25,7 @@ class CZMQNotificationInterface : public CValidationInterface
 
     // CValidationInterface
     void SyncTransaction(const CTransaction& tx, const CBlockIndex *pindex, int posInBlock);
-    void UpdatedBlockTip(const CBlockIndex *pindex);
+    void UpdatedBlockTip(const CBlockIndex *pindexNew, const CBlockIndex *pindexFork, bool fInitialDownload);
 
 private:
     CZMQNotificationInterface();

From 0278fb5f48ae9e42ec0772f85e201051077f633c Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Fri, 30 Sep 2016 18:19:57 -0400
Subject: [PATCH 0984/1802] Remove duplicate nBlocksEstimate cmp (we already
 checked IsIBD())

---
 src/main.cpp | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index 37a0a2f30d055..2eb641e543f6e 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -3087,12 +3087,9 @@ bool ActivateBestChain(CValidationState &state, const CChainParams& chainparams,
                     }
                 }
                 // Relay inventory, but don't relay old inventory during initial block download.
-                int nBlockEstimate = 0;
-                if (fCheckpointsEnabled)
-                    nBlockEstimate = Checkpoints::GetTotalBlocksEstimate(chainparams.Checkpoints());
                 if(connman) {
-                    connman->ForEachNode([nNewHeight, nBlockEstimate, &vHashes](CNode* pnode) {
-                        if (nNewHeight > (pnode->nStartingHeight != -1 ? pnode->nStartingHeight - 2000 : nBlockEstimate)) {
+                    connman->ForEachNode([nNewHeight, &vHashes](CNode* pnode) {
+                        if (nNewHeight > (pnode->nStartingHeight != -1 ? pnode->nStartingHeight - 2000 : 0)) {
                             BOOST_REVERSE_FOREACH(const uint256& hash, vHashes) {
                                 pnode->PushBlockHash(hash);
                             }

From 6aa28abf53ef4694692474b4a3b0a8fa7559b50b Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Sat, 25 Jun 2016 19:17:45 +0200
Subject: [PATCH 0985/1802] Use cmpctblock type 2 for segwit-enabled transfer

Contains version negotiation logic by Matt Corallo and bugfixes by
Suhas Daftuar.
---
 src/blockencodings.cpp            |  4 +-
 src/blockencodings.h              |  2 +-
 src/main.cpp                      | 78 ++++++++++++++++++++++---------
 src/test/blockencodings_tests.cpp |  6 +--
 src/txmempool.cpp                 |  2 +-
 src/txmempool.h                   |  2 +-
 6 files changed, 64 insertions(+), 30 deletions(-)

diff --git a/src/blockencodings.cpp b/src/blockencodings.cpp
index df237f8f26f58..93d3fa372b3c0 100644
--- a/src/blockencodings.cpp
+++ b/src/blockencodings.cpp
@@ -17,7 +17,7 @@
 
 #define MIN_TRANSACTION_BASE_SIZE (::GetSerializeSize(CTransaction(), SER_NETWORK, PROTOCOL_VERSION | SERIALIZE_TRANSACTION_NO_WITNESS))
 
-CBlockHeaderAndShortTxIDs::CBlockHeaderAndShortTxIDs(const CBlock& block) :
+CBlockHeaderAndShortTxIDs::CBlockHeaderAndShortTxIDs(const CBlock& block, bool fUseWTXID) :
         nonce(GetRand(std::numeric_limits<uint64_t>::max())),
         shorttxids(block.vtx.size() - 1), prefilledtxn(1), header(block) {
     FillShortTxIDSelector();
@@ -25,7 +25,7 @@ CBlockHeaderAndShortTxIDs::CBlockHeaderAndShortTxIDs(const CBlock& block) :
     prefilledtxn[0] = {0, block.vtx[0]};
     for (size_t i = 1; i < block.vtx.size(); i++) {
         const CTransaction& tx = block.vtx[i];
-        shorttxids[i - 1] = GetShortID(tx.GetHash());
+        shorttxids[i - 1] = GetShortID(fUseWTXID ? tx.GetWitnessHash() : tx.GetHash());
     }
 }
 
diff --git a/src/blockencodings.h b/src/blockencodings.h
index 349fcbd50f8c7..99b1cb140d0a4 100644
--- a/src/blockencodings.h
+++ b/src/blockencodings.h
@@ -146,7 +146,7 @@ class CBlockHeaderAndShortTxIDs {
     // Dummy for deserialization
     CBlockHeaderAndShortTxIDs() {}
 
-    CBlockHeaderAndShortTxIDs(const CBlock& block);
+    CBlockHeaderAndShortTxIDs(const CBlock& block, bool fUseWTXID);
 
     uint64_t GetShortID(const uint256& txhash) const;
 
diff --git a/src/main.cpp b/src/main.cpp
index 40c31b6ca6c76..c92a38be98f23 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -289,10 +289,21 @@ struct CNodeState {
     bool fPreferHeaders;
     //! Whether this peer wants invs or cmpctblocks (when possible) for block announcements.
     bool fPreferHeaderAndIDs;
-    //! Whether this peer will send us cmpctblocks if we request them
+    /**
+      * Whether this peer will send us cmpctblocks if we request them.
+      * This is not used to gate request logic, as we really only care about fSupportsDesiredCmpctVersion,
+      * but is used as a flag to "lock in" the version of compact blocks (fWantsCmpctWitness) we send.
+      */
     bool fProvidesHeaderAndIDs;
     //! Whether this peer can give us witnesses
     bool fHaveWitness;
+    //! Whether this peer wants witnesses in cmpctblocks/blocktxns
+    bool fWantsCmpctWitness;
+    /**
+     * If we've announced NODE_WITNESS to this peer: whether the peer sends witnesses in cmpctblocks/blocktxns,
+     * otherwise: whether this peer sends non-witnesses in cmpctblocks/blocktxns.
+     */
+    bool fSupportsDesiredCmpctVersion;
 
     CNodeState() {
         fCurrentlyConnected = false;
@@ -313,6 +324,8 @@ struct CNodeState {
         fPreferHeaderAndIDs = false;
         fProvidesHeaderAndIDs = false;
         fHaveWitness = false;
+        fWantsCmpctWitness = false;
+        fSupportsDesiredCmpctVersion = false;
     }
 };
 
@@ -467,8 +480,8 @@ void UpdateBlockAvailability(NodeId nodeid, const uint256 &hash) {
 }
 
 void MaybeSetPeerAsAnnouncingHeaderAndIDs(const CNodeState* nodestate, CNode* pfrom, CConnman& connman) {
-    if (pfrom->GetLocalServices() & NODE_WITNESS) {
-        // Don't ever request compact blocks when segwit is enabled.
+    if (!nodestate->fSupportsDesiredCmpctVersion) {
+        // Never ask from peers who can't provide witnesses.
         return;
     }
     if (nodestate->fProvidesHeaderAndIDs) {
@@ -476,7 +489,7 @@ void MaybeSetPeerAsAnnouncingHeaderAndIDs(const CNodeState* nodestate, CNode* pf
             if (nodeid == pfrom->GetId())
                 return;
         bool fAnnounceUsingCMPCTBLOCK = false;
-        uint64_t nCMPCTBLOCKVersion = 1;
+        uint64_t nCMPCTBLOCKVersion = (pfrom->GetLocalServices() & NODE_WITNESS) ? 2 : 1;
         if (lNodesAnnouncingHeaderAndIDs.size() >= 3) {
             // As per BIP152, we only get 3 of our peers to announce
             // blocks using compact encodings.
@@ -4856,11 +4869,12 @@ void static ProcessGetData(CNode* pfrom, const Consensus::Params& consensusParam
                         // they wont have a useful mempool to match against a compact block,
                         // and we don't feel like constructing the object for them, so
                         // instead we respond with the full, non-compact block.
+                        bool fPeerWantsWitness = State(pfrom->GetId())->fWantsCmpctWitness;
                         if (mi->second->nHeight >= chainActive.Height() - 10) {
-                            CBlockHeaderAndShortTxIDs cmpctblock(block);
-                            pfrom->PushMessageWithFlag(SERIALIZE_TRANSACTION_NO_WITNESS, NetMsgType::CMPCTBLOCK, cmpctblock);
+                            CBlockHeaderAndShortTxIDs cmpctblock(block, fPeerWantsWitness);
+                            pfrom->PushMessageWithFlag(fPeerWantsWitness ? 0 : SERIALIZE_TRANSACTION_NO_WITNESS, NetMsgType::CMPCTBLOCK, cmpctblock);
                         } else
-                            pfrom->PushMessageWithFlag(SERIALIZE_TRANSACTION_NO_WITNESS, NetMsgType::BLOCK, block);
+                            pfrom->PushMessageWithFlag(fPeerWantsWitness ? 0 : SERIALIZE_TRANSACTION_NO_WITNESS, NetMsgType::BLOCK, block);
                     }
 
                     // Trigger the peer node to send a getblocks request for the next batch of inventory
@@ -5128,13 +5142,16 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
             pfrom->PushMessage(NetMsgType::SENDHEADERS);
         }
         if (pfrom->nVersion >= SHORT_IDS_BLOCKS_VERSION) {
-            // Tell our peer we are willing to provide version-1 cmpctblocks
+            // Tell our peer we are willing to provide version 1 or 2 cmpctblocks
             // However, we do not request new block announcements using
             // cmpctblock messages.
             // We send this to non-NODE NETWORK peers as well, because
             // they may wish to request compact blocks from us
             bool fAnnounceUsingCMPCTBLOCK = false;
-            uint64_t nCMPCTBLOCKVersion = 1;
+            uint64_t nCMPCTBLOCKVersion = 2;
+            if (pfrom->GetLocalServices() & NODE_WITNESS)
+                pfrom->PushMessage(NetMsgType::SENDCMPCT, fAnnounceUsingCMPCTBLOCK, nCMPCTBLOCKVersion);
+            nCMPCTBLOCKVersion = 1;
             pfrom->PushMessage(NetMsgType::SENDCMPCT, fAnnounceUsingCMPCTBLOCK, nCMPCTBLOCKVersion);
         }
     }
@@ -5195,12 +5212,23 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
     else if (strCommand == NetMsgType::SENDCMPCT)
     {
         bool fAnnounceUsingCMPCTBLOCK = false;
-        uint64_t nCMPCTBLOCKVersion = 1;
+        uint64_t nCMPCTBLOCKVersion = 0;
         vRecv >> fAnnounceUsingCMPCTBLOCK >> nCMPCTBLOCKVersion;
-        if (nCMPCTBLOCKVersion == 1) {
+        if (nCMPCTBLOCKVersion == 1 || ((pfrom->GetLocalServices() & NODE_WITNESS) && nCMPCTBLOCKVersion == 2)) {
             LOCK(cs_main);
-            State(pfrom->GetId())->fProvidesHeaderAndIDs = true;
-            State(pfrom->GetId())->fPreferHeaderAndIDs = fAnnounceUsingCMPCTBLOCK;
+            // fProvidesHeaderAndIDs is used to "lock in" version of compact blocks we send (fWantsCmpctWitness)
+            if (!State(pfrom->GetId())->fProvidesHeaderAndIDs) {
+                State(pfrom->GetId())->fProvidesHeaderAndIDs = true;
+                State(pfrom->GetId())->fWantsCmpctWitness = nCMPCTBLOCKVersion == 2;
+            }
+            if (State(pfrom->GetId())->fWantsCmpctWitness == (nCMPCTBLOCKVersion == 2)) // ignore later version announces
+                State(pfrom->GetId())->fPreferHeaderAndIDs = fAnnounceUsingCMPCTBLOCK;
+            if (!State(pfrom->GetId())->fSupportsDesiredCmpctVersion) {
+                if (pfrom->GetLocalServices() & NODE_WITNESS)
+                    State(pfrom->GetId())->fSupportsDesiredCmpctVersion = (nCMPCTBLOCKVersion == 2);
+                else
+                    State(pfrom->GetId())->fSupportsDesiredCmpctVersion = (nCMPCTBLOCKVersion == 1);
+            }
         }
     }
 
@@ -5258,7 +5286,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
                         nodestate->nBlocksInFlight < MAX_BLOCKS_IN_TRANSIT_PER_PEER &&
                         (!IsWitnessEnabled(chainActive.Tip(), chainparams.GetConsensus()) || State(pfrom->GetId())->fHaveWitness)) {
                         inv.type |= nFetchFlags;
-                        if (nodestate->fProvidesHeaderAndIDs && !(pfrom->GetLocalServices() & NODE_WITNESS))
+                        if (nodestate->fSupportsDesiredCmpctVersion)
                             vToFetch.push_back(CInv(MSG_CMPCT_BLOCK, inv.hash));
                         else
                             vToFetch.push_back(inv);
@@ -5386,7 +5414,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
             }
             resp.txn[i] = block.vtx[req.indexes[i]];
         }
-        pfrom->PushMessageWithFlag(SERIALIZE_TRANSACTION_NO_WITNESS, NetMsgType::BLOCKTXN, resp);
+        pfrom->PushMessageWithFlag(State(pfrom->GetId())->fWantsCmpctWitness ? 0 : SERIALIZE_TRANSACTION_NO_WITNESS, NetMsgType::BLOCKTXN, resp);
     }
 
 
@@ -5650,7 +5678,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
                 // We requested this block for some reason, but our mempool will probably be useless
                 // so we just grab the block via normal getdata
                 std::vector<CInv> vInv(1);
-                vInv[0] = CInv(MSG_BLOCK, cmpctblock.header.GetHash());
+                vInv[0] = CInv(MSG_BLOCK | GetFetchFlags(pfrom, pindex->pprev, chainparams.GetConsensus()), cmpctblock.header.GetHash());
                 pfrom->PushMessage(NetMsgType::GETDATA, vInv);
             }
             return true;
@@ -5662,6 +5690,12 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
 
         CNodeState *nodestate = State(pfrom->GetId());
 
+        if (IsWitnessEnabled(pindex->pprev, chainparams.GetConsensus()) && !nodestate->fSupportsDesiredCmpctVersion) {
+            // Don't bother trying to process compact blocks from v1 peers
+            // after segwit activates.
+            return true;
+        }
+
         // We want to be a bit conservative just to be extra careful about DoS
         // possibilities in compact block processing...
         if (pindex->nHeight <= chainActive.Height() + 2) {
@@ -5688,7 +5722,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
                 } else if (status == READ_STATUS_FAILED) {
                     // Duplicate txindexes, the block is now in-flight, so just request it
                     std::vector<CInv> vInv(1);
-                    vInv[0] = CInv(MSG_BLOCK, cmpctblock.header.GetHash());
+                    vInv[0] = CInv(MSG_BLOCK | GetFetchFlags(pfrom, pindex->pprev, chainparams.GetConsensus()), cmpctblock.header.GetHash());
                     pfrom->PushMessage(NetMsgType::GETDATA, vInv);
                     return true;
                 }
@@ -5715,7 +5749,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
                 // We requested this block, but its far into the future, so our
                 // mempool will probably be useless - request the block normally
                 std::vector<CInv> vInv(1);
-                vInv[0] = CInv(MSG_BLOCK, cmpctblock.header.GetHash());
+                vInv[0] = CInv(MSG_BLOCK | GetFetchFlags(pfrom, pindex->pprev, chainparams.GetConsensus()), cmpctblock.header.GetHash());
                 pfrom->PushMessage(NetMsgType::GETDATA, vInv);
                 return true;
             } else {
@@ -5757,7 +5791,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
         } else if (status == READ_STATUS_FAILED) {
             // Might have collided, fall back to getdata now :(
             std::vector<CInv> invs;
-            invs.push_back(CInv(MSG_BLOCK, resp.blockhash));
+            invs.push_back(CInv(MSG_BLOCK | GetFetchFlags(pfrom, chainActive.Tip(), chainparams.GetConsensus()), resp.blockhash));
             pfrom->PushMessage(NetMsgType::GETDATA, invs);
         } else {
             CValidationState state;
@@ -5906,7 +5940,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
                             pindexLast->GetBlockHash().ToString(), pindexLast->nHeight);
                 }
                 if (vGetData.size() > 0) {
-                    if (nodestate->fProvidesHeaderAndIDs && vGetData.size() == 1 && mapBlocksInFlight.size() == 1 && pindexLast->pprev->IsValid(BLOCK_VALID_CHAIN) && !(pfrom->GetLocalServices() & NODE_WITNESS)) {
+                    if (nodestate->fSupportsDesiredCmpctVersion && vGetData.size() == 1 && mapBlocksInFlight.size() == 1 && pindexLast->pprev->IsValid(BLOCK_VALID_CHAIN)) {
                         // We seem to be rather well-synced, so it appears pfrom was the first to provide us
                         // with this block! Let's get them to announce using compact blocks in the future.
                         MaybeSetPeerAsAnnouncingHeaderAndIDs(nodestate, pfrom, connman);
@@ -6536,8 +6570,8 @@ bool SendMessages(CNode* pto, CConnman& connman)
                     //TODO: Shouldn't need to reload block from disk, but requires refactor
                     CBlock block;
                     assert(ReadBlockFromDisk(block, pBestIndex, consensusParams));
-                    CBlockHeaderAndShortTxIDs cmpctblock(block);
-                    pto->PushMessageWithFlag(SERIALIZE_TRANSACTION_NO_WITNESS, NetMsgType::CMPCTBLOCK, cmpctblock);
+                    CBlockHeaderAndShortTxIDs cmpctblock(block, state.fWantsCmpctWitness);
+                    pto->PushMessageWithFlag(state.fWantsCmpctWitness ? 0 : SERIALIZE_TRANSACTION_NO_WITNESS, NetMsgType::CMPCTBLOCK, cmpctblock);
                     state.pindexBestHeaderSent = pBestIndex;
                 } else if (state.fPreferHeaders) {
                     if (vHeaders.size() > 1) {
diff --git a/src/test/blockencodings_tests.cpp b/src/test/blockencodings_tests.cpp
index d2392cfb22f0d..7530b013bd285 100644
--- a/src/test/blockencodings_tests.cpp
+++ b/src/test/blockencodings_tests.cpp
@@ -64,7 +64,7 @@ BOOST_AUTO_TEST_CASE(SimpleRoundTripTest)
 
     // Do a simple ShortTxIDs RT
     {
-        CBlockHeaderAndShortTxIDs shortIDs(block);
+        CBlockHeaderAndShortTxIDs shortIDs(block, true);
 
         CDataStream stream(SER_NETWORK, PROTOCOL_VERSION);
         stream << shortIDs;
@@ -116,7 +116,7 @@ class TestHeaderAndShortIDs {
         stream >> *this;
     }
     TestHeaderAndShortIDs(const CBlock& block) :
-        TestHeaderAndShortIDs(CBlockHeaderAndShortTxIDs(block)) {}
+        TestHeaderAndShortIDs(CBlockHeaderAndShortTxIDs(block, true)) {}
 
     uint64_t GetShortID(const uint256& txhash) const {
         CDataStream stream(SER_NETWORK, PROTOCOL_VERSION);
@@ -267,7 +267,7 @@ BOOST_AUTO_TEST_CASE(EmptyBlockRoundTripTest)
 
     // Test simple header round-trip with only coinbase
     {
-        CBlockHeaderAndShortTxIDs shortIDs(block);
+        CBlockHeaderAndShortTxIDs shortIDs(block, false);
 
         CDataStream stream(SER_NETWORK, PROTOCOL_VERSION);
         stream << shortIDs;
diff --git a/src/txmempool.cpp b/src/txmempool.cpp
index 3586123d3e00d..15fa6fbca3b09 100644
--- a/src/txmempool.cpp
+++ b/src/txmempool.cpp
@@ -444,7 +444,7 @@ bool CTxMemPool::addUnchecked(const uint256& hash, const CTxMemPoolEntry &entry,
     totalTxSize += entry.GetTxSize();
     minerPolicyEstimator->processTransaction(entry, fCurrentEstimate);
 
-    vTxHashes.emplace_back(hash, newit);
+    vTxHashes.emplace_back(tx.GetWitnessHash(), newit);
     newit->vTxHashesIdx = vTxHashes.size() - 1;
 
     return true;
diff --git a/src/txmempool.h b/src/txmempool.h
index 6f67dd91d685c..941644b2b21c1 100644
--- a/src/txmempool.h
+++ b/src/txmempool.h
@@ -465,7 +465,7 @@ class CTxMemPool
     indexed_transaction_set mapTx;
 
     typedef indexed_transaction_set::nth_index<0>::type::iterator txiter;
-    std::vector<std::pair<uint256, txiter> > vTxHashes; //!< All tx hashes/entries in mapTx, in random order
+    std::vector<std::pair<uint256, txiter> > vTxHashes; //!< All tx witness hashes/entries in mapTx, in random order
 
     struct CompareIteratorByHash {
         bool operator()(const txiter &a, const txiter &b) const {

From f5b9b8f437c040205896ad0d7a6656efa08b5601 Mon Sep 17 00:00:00 2001
From: Suhas Daftuar <sdaftuar@chaincode.com>
Date: Sat, 17 Sep 2016 22:11:00 -0400
Subject: [PATCH 0986/1802] [qa] Fix bug in mininode witness deserialization

Also improve tx printing
---
 qa/rpc-tests/test_framework/mininode.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/qa/rpc-tests/test_framework/mininode.py b/qa/rpc-tests/test_framework/mininode.py
index 88a3b7e0f7144..34beb0d30d30f 100755
--- a/qa/rpc-tests/test_framework/mininode.py
+++ b/qa/rpc-tests/test_framework/mininode.py
@@ -452,7 +452,7 @@ def deserialize(self, f):
         else:
             self.vout = deser_vector(f, CTxOut)
         if flags != 0:
-            self.wit.vtxinwit = [CTxInWitness()]*len(self.vin)
+            self.wit.vtxinwit = [CTxInWitness() for i in range(len(self.vin))]
             self.wit.deserialize(f)
         self.nLockTime = struct.unpack("<I", f.read(4))[0]
         self.sha256 = None
@@ -518,8 +518,8 @@ def is_valid(self):
         return True
 
     def __repr__(self):
-        return "CTransaction(nVersion=%i vin=%s vout=%s nLockTime=%i)" \
-            % (self.nVersion, repr(self.vin), repr(self.vout), self.nLockTime)
+        return "CTransaction(nVersion=%i vin=%s vout=%s wit=%s nLockTime=%i)" \
+            % (self.nVersion, repr(self.vin), repr(self.vout), repr(self.wit), self.nLockTime)
 
 
 class CBlockHeader(object):

From 422fac649f75c907cad6ab7e2768b9032b9eae42 Mon Sep 17 00:00:00 2001
From: Suhas Daftuar <sdaftuar@chaincode.com>
Date: Wed, 14 Sep 2016 21:00:29 -0400
Subject: [PATCH 0987/1802] [qa] Add support for compactblocks v2 to mininode

---
 qa/rpc-tests/test_framework/mininode.py | 35 ++++++++++++++++++++++---
 1 file changed, 31 insertions(+), 4 deletions(-)

diff --git a/qa/rpc-tests/test_framework/mininode.py b/qa/rpc-tests/test_framework/mininode.py
index 34beb0d30d30f..4d238c08d9c3f 100755
--- a/qa/rpc-tests/test_framework/mininode.py
+++ b/qa/rpc-tests/test_framework/mininode.py
@@ -755,6 +755,9 @@ def serialize(self, with_witness=False):
             r += self.tx.serialize_without_witness()
         return r
 
+    def serialize_with_witness(self):
+        return self.serialize(with_witness=True)
+
     def __repr__(self):
         return "PrefilledTransaction(index=%d, tx=%s)" % (self.index, repr(self.tx))
 
@@ -779,6 +782,7 @@ def deserialize(self, f):
         self.prefilled_txn = deser_vector(f, PrefilledTransaction)
         self.prefilled_txn_length = len(self.prefilled_txn)
 
+    # When using version 2 compact blocks, we must serialize with_witness.
     def serialize(self, with_witness=False):
         r = b""
         r += self.header.serialize()
@@ -787,12 +791,20 @@ def serialize(self, with_witness=False):
         for x in self.shortids:
             # We only want the first 6 bytes
             r += struct.pack("<Q", x)[0:6]
-        r += ser_vector(self.prefilled_txn)
+        if with_witness:
+            r += ser_vector(self.prefilled_txn, "serialize_with_witness")
+        else:
+            r += ser_vector(self.prefilled_txn)
         return r
 
     def __repr__(self):
         return "P2PHeaderAndShortIDs(header=%s, nonce=%d, shortids_length=%d, shortids=%s, prefilled_txn_length=%d, prefilledtxn=%s" % (repr(self.header), self.nonce, self.shortids_length, repr(self.shortids), self.prefilled_txn_length, repr(self.prefilled_txn))
 
+# P2P version of the above that will use witness serialization (for compact
+# block version 2)
+class P2PHeaderAndShortWitnessIDs(P2PHeaderAndShortIDs):
+    def serialize(self):
+        return super(P2PHeaderAndShortWitnessIDs, self).serialize(with_witness=True)
 
 # Calculate the BIP 152-compact blocks shortid for a given transaction hash
 def calculate_shortid(k0, k1, tx_hash):
@@ -808,6 +820,7 @@ def __init__(self, p2pheaders_and_shortids = None):
         self.nonce = 0
         self.shortids = []
         self.prefilled_txn = []
+        self.use_witness = False
 
         if p2pheaders_and_shortids != None:
             self.header = p2pheaders_and_shortids.header
@@ -819,7 +832,10 @@ def __init__(self, p2pheaders_and_shortids = None):
                 last_index = self.prefilled_txn[-1].index
 
     def to_p2p(self):
-        ret = P2PHeaderAndShortIDs()
+        if self.use_witness:
+            ret = P2PHeaderAndShortWitnessIDs()
+        else:
+            ret = P2PHeaderAndShortIDs()
         ret.header = self.header
         ret.nonce = self.nonce
         ret.shortids_length = len(self.shortids)
@@ -840,15 +856,20 @@ def get_siphash_keys(self):
         key1 = struct.unpack("<Q", hash_header_nonce_as_str[8:16])[0]
         return [ key0, key1 ]
 
-    def initialize_from_block(self, block, nonce=0, prefill_list = [0]):
+    # Version 2 compact blocks use wtxid in shortids (rather than txid)
+    def initialize_from_block(self, block, nonce=0, prefill_list = [0], use_witness = False):
         self.header = CBlockHeader(block)
         self.nonce = nonce
         self.prefilled_txn = [ PrefilledTransaction(i, block.vtx[i]) for i in prefill_list ]
         self.shortids = []
+        self.use_witness = use_witness
         [k0, k1] = self.get_siphash_keys()
         for i in range(len(block.vtx)):
             if i not in prefill_list:
-                self.shortids.append(calculate_shortid(k0, k1, block.vtx[i].sha256))
+                tx_hash = block.vtx[i].sha256
+                if use_witness:
+                    tx_hash = block.vtx[i].calc_sha256(with_witness=True)
+                self.shortids.append(calculate_shortid(k0, k1, tx_hash))
 
     def __repr__(self):
         return "HeaderAndShortIDs(header=%s, nonce=%d, shortids=%s, prefilledtxn=%s" % (repr(self.header), self.nonce, repr(self.shortids), repr(self.prefilled_txn))
@@ -1424,6 +1445,12 @@ def serialize(self):
     def __repr__(self):
         return "msg_blocktxn(block_transactions=%s)" % (repr(self.block_transactions))
 
+class msg_witness_blocktxn(msg_blocktxn):
+    def serialize(self):
+        r = b""
+        r += self.block_transactions.serialize(with_witness=True)
+        return r
+
 # This is what a callback should look like for NodeConn
 # Reimplement the on_* functions to provide handling for events
 class NodeConnCB(object):

From 27acfc1d2ee53cc52b54befd2d4bfa24a77a2eef Mon Sep 17 00:00:00 2001
From: Suhas Daftuar <sdaftuar@chaincode.com>
Date: Fri, 16 Sep 2016 20:48:23 -0400
Subject: [PATCH 0988/1802] [qa] Update p2p-compactblocks.py for compactblocks
 v2

---
 qa/rpc-tests/p2p-compactblocks.py | 583 ++++++++++++++++++++----------
 1 file changed, 389 insertions(+), 194 deletions(-)

diff --git a/qa/rpc-tests/p2p-compactblocks.py b/qa/rpc-tests/p2p-compactblocks.py
index ac4655a841ec5..d91e10d77cb4b 100755
--- a/qa/rpc-tests/p2p-compactblocks.py
+++ b/qa/rpc-tests/p2p-compactblocks.py
@@ -12,14 +12,16 @@
 
 '''
 CompactBlocksTest -- test compact blocks (BIP 152)
-'''
 
+Version 1 compact blocks are pre-segwit (txids)
+Version 2 compact blocks are post-segwit (wtxids)
+'''
 
 # TestNode: A peer we use to send messages to bitcoind, and store responses.
 class TestNode(SingleNodeConnCB):
     def __init__(self):
         SingleNodeConnCB.__init__(self)
-        self.last_sendcmpct = None
+        self.last_sendcmpct = []
         self.last_headers = None
         self.last_inv = None
         self.last_cmpctblock = None
@@ -30,7 +32,7 @@ def __init__(self):
         self.last_blocktxn = None
 
     def on_sendcmpct(self, conn, message):
-        self.last_sendcmpct = message
+        self.last_sendcmpct.append(message)
 
     def on_block(self, conn, message):
         self.last_block = message
@@ -90,29 +92,31 @@ class CompactBlocksTest(BitcoinTestFramework):
     def __init__(self):
         super().__init__()
         self.setup_clean_chain = True
-        self.num_nodes = 1
+        # Node0 = pre-segwit, node1 = segwit-aware
+        self.num_nodes = 2
         self.utxos = []
 
     def setup_network(self):
         self.nodes = []
 
-        # Turn off segwit in this test, as compact blocks don't currently work
-        # with segwit.  (After BIP 152 is updated to support segwit, we can
-        # test behavior with and without segwit enabled by adding a second node
-        # to the test.)
-        self.nodes = start_nodes(self.num_nodes, self.options.tmpdir, [["-debug", "-logtimemicros=1", "-bip9params=segwit:0:0"]])
+        # Start up node0 to be a version 1, pre-segwit node.
+        self.nodes = start_nodes(self.num_nodes, self.options.tmpdir, 
+                [["-debug", "-logtimemicros=1", "-bip9params=segwit:0:0"], 
+                 ["-debug", "-logtimemicros", "-txindex"]])
+        connect_nodes(self.nodes[0], 1)
 
-    def build_block_on_tip(self):
-        height = self.nodes[0].getblockcount()
-        tip = self.nodes[0].getbestblockhash()
-        mtp = self.nodes[0].getblockheader(tip)['mediantime']
+    def build_block_on_tip(self, node):
+        height = node.getblockcount()
+        tip = node.getbestblockhash()
+        mtp = node.getblockheader(tip)['mediantime']
         block = create_block(int(tip, 16), create_coinbase(height + 1), mtp + 1)
         block.solve()
         return block
 
     # Create 10 more anyone-can-spend utxo's for testing.
     def make_utxos(self):
-        block = self.build_block_on_tip()
+        # Doesn't matter which node we use, just use node0.
+        block = self.build_block_on_tip(self.nodes[0])
         self.test_node.send_and_ping(msg_block(block))
         assert(int(self.nodes[0].getbestblockhash(), 16) == block.sha256)
         self.nodes[0].generate(100)
@@ -125,7 +129,7 @@ def make_utxos(self):
             tx.vout.append(CTxOut(out_value, CScript([OP_TRUE])))
         tx.rehash()
 
-        block2 = self.build_block_on_tip()
+        block2 = self.build_block_on_tip(self.nodes[0])
         block2.vtx.append(tx)
         block2.hashMerkleRoot = block2.calc_merkle_root()
         block2.solve()
@@ -134,26 +138,30 @@ def make_utxos(self):
         self.utxos.extend([[tx.sha256, i, out_value] for i in range(10)])
         return
 
-    # Test "sendcmpct":
-    # - No compact block announcements or getdata(MSG_CMPCT_BLOCK) unless
-    #   sendcmpct is sent.
-    # - If sendcmpct is sent with version > 1, the message is ignored.
+    # Test "sendcmpct" (between peers preferring the same version):
+    # - No compact block announcements unless sendcmpct is sent.
+    # - If sendcmpct is sent with version > preferred_version, the message is ignored.
     # - If sendcmpct is sent with boolean 0, then block announcements are not
     #   made with compact blocks.
     # - If sendcmpct is then sent with boolean 1, then new block announcements
     #   are made with compact blocks.
-    def test_sendcmpct(self):
-        print("Testing SENDCMPCT p2p message... ")
-
-        # Make sure we get a version 0 SENDCMPCT message from our peer
+    # If old_node is passed in, request compact blocks with version=preferred-1
+    # and verify that it receives block announcements via compact block.
+    def test_sendcmpct(self, node, test_node, preferred_version, old_node=None):
+        # Make sure we get a SENDCMPCT message from our peer
         def received_sendcmpct():
-            return (self.test_node.last_sendcmpct is not None)
+            return (len(test_node.last_sendcmpct) > 0)
         got_message = wait_until(received_sendcmpct, timeout=30)
         assert(received_sendcmpct())
         assert(got_message)
-        assert_equal(self.test_node.last_sendcmpct.version, 1)
+        with mininode_lock:
+            # Check that the first version received is the preferred one
+            assert_equal(test_node.last_sendcmpct[0].version, preferred_version)
+            # And that we receive versions down to 1.
+            assert_equal(test_node.last_sendcmpct[-1].version, 1)
+            test_node.last_sendcmpct = []
 
-        tip = int(self.nodes[0].getbestblockhash(), 16)
+        tip = int(node.getbestblockhash(), 16)
 
         def check_announcement_of_new_block(node, peer, predicate):
             peer.clear_block_announcement()
@@ -165,56 +173,75 @@ def check_announcement_of_new_block(node, peer, predicate):
                 assert(predicate(peer))
 
         # We shouldn't get any block announcements via cmpctblock yet.
-        check_announcement_of_new_block(self.nodes[0], self.test_node, lambda p: p.last_cmpctblock is None)
+        check_announcement_of_new_block(node, test_node, lambda p: p.last_cmpctblock is None)
 
         # Try one more time, this time after requesting headers.
-        self.test_node.request_headers_and_sync(locator=[tip])
-        check_announcement_of_new_block(self.nodes[0], self.test_node, lambda p: p.last_cmpctblock is None and p.last_inv is not None)
+        test_node.request_headers_and_sync(locator=[tip])
+        check_announcement_of_new_block(node, test_node, lambda p: p.last_cmpctblock is None and p.last_inv is not None)
 
         # Test a few ways of using sendcmpct that should NOT
         # result in compact block announcements.
         # Before each test, sync the headers chain.
-        self.test_node.request_headers_and_sync(locator=[tip])
+        test_node.request_headers_and_sync(locator=[tip])
 
         # Now try a SENDCMPCT message with too-high version
         sendcmpct = msg_sendcmpct()
-        sendcmpct.version = 2
-        self.test_node.send_and_ping(sendcmpct)
-        check_announcement_of_new_block(self.nodes[0], self.test_node, lambda p: p.last_cmpctblock is None)
+        sendcmpct.version = preferred_version+1
+        sendcmpct.announce = True
+        test_node.send_and_ping(sendcmpct)
+        check_announcement_of_new_block(node, test_node, lambda p: p.last_cmpctblock is None)
 
         # Headers sync before next test.
-        self.test_node.request_headers_and_sync(locator=[tip])
+        test_node.request_headers_and_sync(locator=[tip])
 
         # Now try a SENDCMPCT message with valid version, but announce=False
-        self.test_node.send_and_ping(msg_sendcmpct())
-        check_announcement_of_new_block(self.nodes[0], self.test_node, lambda p: p.last_cmpctblock is None)
+        sendcmpct.version = preferred_version
+        sendcmpct.announce = False
+        test_node.send_and_ping(sendcmpct)
+        check_announcement_of_new_block(node, test_node, lambda p: p.last_cmpctblock is None)
 
         # Headers sync before next test.
-        self.test_node.request_headers_and_sync(locator=[tip])
+        test_node.request_headers_and_sync(locator=[tip])
 
         # Finally, try a SENDCMPCT message with announce=True
-        sendcmpct.version = 1
+        sendcmpct.version = preferred_version
         sendcmpct.announce = True
-        self.test_node.send_and_ping(sendcmpct)
-        check_announcement_of_new_block(self.nodes[0], self.test_node, lambda p: p.last_cmpctblock is not None)
+        test_node.send_and_ping(sendcmpct)
+        check_announcement_of_new_block(node, test_node, lambda p: p.last_cmpctblock is not None)
 
         # Try one more time (no headers sync should be needed!)
-        check_announcement_of_new_block(self.nodes[0], self.test_node, lambda p: p.last_cmpctblock is not None)
+        check_announcement_of_new_block(node, test_node, lambda p: p.last_cmpctblock is not None)
 
         # Try one more time, after turning on sendheaders
-        self.test_node.send_and_ping(msg_sendheaders())
-        check_announcement_of_new_block(self.nodes[0], self.test_node, lambda p: p.last_cmpctblock is not None)
+        test_node.send_and_ping(msg_sendheaders())
+        check_announcement_of_new_block(node, test_node, lambda p: p.last_cmpctblock is not None)
+
+        # Try one more time, after sending a version-1, announce=false message.
+        sendcmpct.version = preferred_version-1
+        sendcmpct.announce = False
+        test_node.send_and_ping(sendcmpct)
+        check_announcement_of_new_block(node, test_node, lambda p: p.last_cmpctblock is not None)
 
         # Now turn off announcements
+        sendcmpct.version = preferred_version
         sendcmpct.announce = False
-        self.test_node.send_and_ping(sendcmpct)
-        check_announcement_of_new_block(self.nodes[0], self.test_node, lambda p: p.last_cmpctblock is None and p.last_headers is not None)
+        test_node.send_and_ping(sendcmpct)
+        check_announcement_of_new_block(node, test_node, lambda p: p.last_cmpctblock is None and p.last_headers is not None)
+
+        if old_node is not None:
+            # Verify that a peer using an older protocol version can receive
+            # announcements from this node.
+            sendcmpct.version = preferred_version-1
+            sendcmpct.announce = True
+            old_node.send_and_ping(sendcmpct)
+            # Header sync
+            old_node.request_headers_and_sync(locator=[tip])
+            check_announcement_of_new_block(node, old_node, lambda p: p.last_cmpctblock is not None)
 
     # This test actually causes bitcoind to (reasonably!) disconnect us, so do this last.
     def test_invalid_cmpctblock_message(self):
-        print("Testing invalid index in cmpctblock message...")
         self.nodes[0].generate(101)
-        block = self.build_block_on_tip()
+        block = self.build_block_on_tip(self.nodes[0])
 
         cmpct_block = P2PHeaderAndShortIDs()
         cmpct_block.header = CBlockHeader(block)
@@ -227,45 +254,61 @@ def test_invalid_cmpctblock_message(self):
 
     # Compare the generated shortids to what we expect based on BIP 152, given
     # bitcoind's choice of nonce.
-    def test_compactblock_construction(self):
-        print("Testing compactblock headers and shortIDs are correct...")
-
+    def test_compactblock_construction(self, node, test_node, version, use_witness_address):
         # Generate a bunch of transactions.
-        self.nodes[0].generate(101)
+        node.generate(101)
         num_transactions = 25
-        address = self.nodes[0].getnewaddress()
+        address = node.getnewaddress()
+        if use_witness_address:
+            # Want at least one segwit spend, so move all funds to
+            # a witness address.
+            address = node.addwitnessaddress(address)
+            value_to_send = node.getbalance()
+            node.sendtoaddress(address, satoshi_round(value_to_send-Decimal(0.1)))
+            node.generate(1)
+
+        segwit_tx_generated = False
         for i in range(num_transactions):
-            self.nodes[0].sendtoaddress(address, 0.1)
+            txid = node.sendtoaddress(address, 0.1)
+            hex_tx = node.gettransaction(txid)["hex"]
+            tx = FromHex(CTransaction(), hex_tx)
+            if not tx.wit.is_null():
+                segwit_tx_generated = True
+
+        if use_witness_address:
+            assert(segwit_tx_generated) # check that our test is not broken
 
         self.test_node.sync_with_ping()
 
         # Now mine a block, and look at the resulting compact block.
-        self.test_node.clear_block_announcement()
-        block_hash = int(self.nodes[0].generate(1)[0], 16)
+        test_node.clear_block_announcement()
+        block_hash = int(node.generate(1)[0], 16)
 
         # Store the raw block in our internal format.
-        block = FromHex(CBlock(), self.nodes[0].getblock("%02x" % block_hash, False))
+        block = FromHex(CBlock(), node.getblock("%02x" % block_hash, False))
         [tx.calc_sha256() for tx in block.vtx]
         block.rehash()
 
         # Don't care which type of announcement came back for this test; just
         # request the compact block if we didn't get one yet.
-        wait_until(self.test_node.received_block_announcement, timeout=30)
+        wait_until(test_node.received_block_announcement, timeout=30)
+        assert(test_node.received_block_announcement())
 
         with mininode_lock:
-            if self.test_node.last_cmpctblock is None:
-                self.test_node.clear_block_announcement()
+            if test_node.last_cmpctblock is None:
+                test_node.clear_block_announcement()
                 inv = CInv(4, block_hash)  # 4 == "CompactBlock"
-                self.test_node.send_message(msg_getdata([inv]))
+                test_node.send_message(msg_getdata([inv]))
 
-        wait_until(self.test_node.received_block_announcement, timeout=30)
+        wait_until(test_node.received_block_announcement, timeout=30)
+        assert(test_node.received_block_announcement())
 
         # Now we should have the compactblock
         header_and_shortids = None
         with mininode_lock:
-            assert(self.test_node.last_cmpctblock is not None)
+            assert(test_node.last_cmpctblock is not None)
             # Convert the on-the-wire representation to absolute indexes
-            header_and_shortids = HeaderAndShortIDs(self.test_node.last_cmpctblock.header_and_shortids)
+            header_and_shortids = HeaderAndShortIDs(test_node.last_cmpctblock.header_and_shortids)
 
         # Check that we got the right block!
         header_and_shortids.header.calc_sha256()
@@ -278,8 +321,17 @@ def test_compactblock_construction(self):
         # Check that all prefilled_txn entries match what's in the block.
         for entry in header_and_shortids.prefilled_txn:
             entry.tx.calc_sha256()
+            # This checks the non-witness parts of the tx agree
             assert_equal(entry.tx.sha256, block.vtx[entry.index].sha256)
 
+            # And this checks the witness
+            wtxid = entry.tx.calc_sha256(True)
+            if version == 2:
+                assert_equal(wtxid, block.vtx[entry.index].calc_sha256(True))
+            else:
+                # Shouldn't have received a witness
+                assert(entry.tx.wit.is_null())
+
         # Check that the cmpctblock message announced all the transactions.
         assert_equal(len(header_and_shortids.prefilled_txn) + len(header_and_shortids.shortids), len(block.vtx))
 
@@ -294,7 +346,10 @@ def test_compactblock_construction(self):
                 # Already checked prefilled transactions above
                 header_and_shortids.prefilled_txn.pop(0)
             else:
-                shortid = calculate_shortid(k0, k1, block.vtx[index].sha256)
+                tx_hash = block.vtx[index].sha256
+                if version == 2:
+                    tx_hash = block.vtx[index].calc_sha256(True)
+                shortid = calculate_shortid(k0, k1, tx_hash)
                 assert_equal(shortid, header_and_shortids.shortids[0])
                 header_and_shortids.shortids.pop(0)
             index += 1
@@ -302,49 +357,50 @@ def test_compactblock_construction(self):
     # Test that bitcoind requests compact blocks when we announce new blocks
     # via header or inv, and that responding to getblocktxn causes the block
     # to be successfully reconstructed.
-    def test_compactblock_requests(self):
-        print("Testing compactblock requests... ")
-
+    # Post-segwit: upgraded nodes would only make this request of cb-version-2,
+    # NODE_WITNESS peers.  Unupgraded nodes would still make this request of
+    # any cb-version-1-supporting peer.
+    def test_compactblock_requests(self, node, test_node):
         # Try announcing a block with an inv or header, expect a compactblock
         # request
         for announce in ["inv", "header"]:
-            block = self.build_block_on_tip()
+            block = self.build_block_on_tip(node)
             with mininode_lock:
-                self.test_node.last_getdata = None
+                test_node.last_getdata = None
 
             if announce == "inv":
-                self.test_node.send_message(msg_inv([CInv(2, block.sha256)]))
+                test_node.send_message(msg_inv([CInv(2, block.sha256)]))
             else:
-                self.test_node.send_header_for_blocks([block])
-            success = wait_until(lambda: self.test_node.last_getdata is not None, timeout=30)
+                test_node.send_header_for_blocks([block])
+            success = wait_until(lambda: test_node.last_getdata is not None, timeout=30)
             assert(success)
-            assert_equal(len(self.test_node.last_getdata.inv), 1)
-            assert_equal(self.test_node.last_getdata.inv[0].type, 4)
-            assert_equal(self.test_node.last_getdata.inv[0].hash, block.sha256)
+            assert_equal(len(test_node.last_getdata.inv), 1)
+            assert_equal(test_node.last_getdata.inv[0].type, 4)
+            assert_equal(test_node.last_getdata.inv[0].hash, block.sha256)
 
             # Send back a compactblock message that omits the coinbase
             comp_block = HeaderAndShortIDs()
             comp_block.header = CBlockHeader(block)
             comp_block.nonce = 0
             comp_block.shortids = [1]  # this is useless, and wrong
-            self.test_node.send_and_ping(msg_cmpctblock(comp_block.to_p2p()))
-            assert_equal(int(self.nodes[0].getbestblockhash(), 16), block.hashPrevBlock)
+            test_node.send_and_ping(msg_cmpctblock(comp_block.to_p2p()))
+            assert_equal(int(node.getbestblockhash(), 16), block.hashPrevBlock)
             # Expect a getblocktxn message.
             with mininode_lock:
-                assert(self.test_node.last_getblocktxn is not None)
-                absolute_indexes = self.test_node.last_getblocktxn.block_txn_request.to_absolute()
+                assert(test_node.last_getblocktxn is not None)
+                absolute_indexes = test_node.last_getblocktxn.block_txn_request.to_absolute()
             assert_equal(absolute_indexes, [0])  # should be a coinbase request
 
             # Send the coinbase, and verify that the tip advances.
             msg = msg_blocktxn()
             msg.block_transactions.blockhash = block.sha256
             msg.block_transactions.transactions = [block.vtx[0]]
-            self.test_node.send_and_ping(msg)
-            assert_equal(int(self.nodes[0].getbestblockhash(), 16), block.sha256)
+            test_node.send_and_ping(msg)
+            assert_equal(int(node.getbestblockhash(), 16), block.sha256)
 
     # Create a chain of transactions from given utxo, and add to a new block.
-    def build_block_with_transactions(self, utxo, num_transactions):
-        block = self.build_block_on_tip()
+    def build_block_with_transactions(self, node, utxo, num_transactions):
+        block = self.build_block_on_tip(node)
 
         for i in range(num_transactions):
             tx = CTransaction()
@@ -361,118 +417,113 @@ def build_block_with_transactions(self, utxo, num_transactions):
     # Test that we only receive getblocktxn requests for transactions that the
     # node needs, and that responding to them causes the block to be
     # reconstructed.
-    def test_getblocktxn_requests(self):
-        print("Testing getblocktxn requests...")
+    def test_getblocktxn_requests(self, node, test_node, version):
+        with_witness = (version==2)
+
+        def test_getblocktxn_response(compact_block, peer, expected_result):
+            msg = msg_cmpctblock(compact_block.to_p2p())
+            peer.send_and_ping(msg)
+            with mininode_lock:
+                assert(peer.last_getblocktxn is not None)
+                absolute_indexes = peer.last_getblocktxn.block_txn_request.to_absolute()
+            assert_equal(absolute_indexes, expected_result)
+
+        def test_tip_after_message(node, peer, msg, tip):
+            peer.send_and_ping(msg)
+            assert_equal(int(node.getbestblockhash(), 16), tip)
 
         # First try announcing compactblocks that won't reconstruct, and verify
         # that we receive getblocktxn messages back.
         utxo = self.utxos.pop(0)
 
-        block = self.build_block_with_transactions(utxo, 5)
+        block = self.build_block_with_transactions(node, utxo, 5)
         self.utxos.append([block.vtx[-1].sha256, 0, block.vtx[-1].vout[0].nValue])
-
         comp_block = HeaderAndShortIDs()
-        comp_block.initialize_from_block(block)
+        comp_block.initialize_from_block(block, use_witness=with_witness)
 
-        self.test_node.send_and_ping(msg_cmpctblock(comp_block.to_p2p()))
-        with mininode_lock:
-            assert(self.test_node.last_getblocktxn is not None)
-            absolute_indexes = self.test_node.last_getblocktxn.block_txn_request.to_absolute()
-        assert_equal(absolute_indexes, [1, 2, 3, 4, 5])
-        msg = msg_blocktxn()
-        msg.block_transactions = BlockTransactions(block.sha256, block.vtx[1:])
-        self.test_node.send_and_ping(msg)
-        assert_equal(int(self.nodes[0].getbestblockhash(), 16), block.sha256)
+        test_getblocktxn_response(comp_block, test_node, [1, 2, 3, 4, 5])
+
+        msg_bt = msg_blocktxn()
+        if with_witness:
+            msg_bt = msg_witness_blocktxn() # serialize with witnesses
+        msg_bt.block_transactions = BlockTransactions(block.sha256, block.vtx[1:])
+        test_tip_after_message(node, test_node, msg_bt, block.sha256)
 
         utxo = self.utxos.pop(0)
-        block = self.build_block_with_transactions(utxo, 5)
+        block = self.build_block_with_transactions(node, utxo, 5)
         self.utxos.append([block.vtx[-1].sha256, 0, block.vtx[-1].vout[0].nValue])
 
         # Now try interspersing the prefilled transactions
-        comp_block.initialize_from_block(block, prefill_list=[0, 1, 5])
-        self.test_node.send_and_ping(msg_cmpctblock(comp_block.to_p2p()))
-        with mininode_lock:
-            assert(self.test_node.last_getblocktxn is not None)
-            absolute_indexes = self.test_node.last_getblocktxn.block_txn_request.to_absolute()
-        assert_equal(absolute_indexes, [2, 3, 4])
-        msg.block_transactions = BlockTransactions(block.sha256, block.vtx[2:5])
-        self.test_node.send_and_ping(msg)
-        assert_equal(int(self.nodes[0].getbestblockhash(), 16), block.sha256)
+        comp_block.initialize_from_block(block, prefill_list=[0, 1, 5], use_witness=with_witness)
+        test_getblocktxn_response(comp_block, test_node, [2, 3, 4])
+        msg_bt.block_transactions = BlockTransactions(block.sha256, block.vtx[2:5])
+        test_tip_after_message(node, test_node, msg_bt, block.sha256)
 
         # Now try giving one transaction ahead of time.
         utxo = self.utxos.pop(0)
-        block = self.build_block_with_transactions(utxo, 5)
+        block = self.build_block_with_transactions(node, utxo, 5)
         self.utxos.append([block.vtx[-1].sha256, 0, block.vtx[-1].vout[0].nValue])
-        self.test_node.send_and_ping(msg_tx(block.vtx[1]))
-        assert(block.vtx[1].hash in self.nodes[0].getrawmempool())
+        test_node.send_and_ping(msg_tx(block.vtx[1]))
+        assert(block.vtx[1].hash in node.getrawmempool())
 
         # Prefill 4 out of the 6 transactions, and verify that only the one
         # that was not in the mempool is requested.
-        comp_block.initialize_from_block(block, prefill_list=[0, 2, 3, 4])
-        self.test_node.send_and_ping(msg_cmpctblock(comp_block.to_p2p()))
-        with mininode_lock:
-            assert(self.test_node.last_getblocktxn is not None)
-            absolute_indexes = self.test_node.last_getblocktxn.block_txn_request.to_absolute()
-        assert_equal(absolute_indexes, [5])
+        comp_block.initialize_from_block(block, prefill_list=[0, 2, 3, 4], use_witness=with_witness)
+        test_getblocktxn_response(comp_block, test_node, [5])
 
-        msg.block_transactions = BlockTransactions(block.sha256, [block.vtx[5]])
-        self.test_node.send_and_ping(msg)
-        assert_equal(int(self.nodes[0].getbestblockhash(), 16), block.sha256)
+        msg_bt.block_transactions = BlockTransactions(block.sha256, [block.vtx[5]])
+        test_tip_after_message(node, test_node, msg_bt, block.sha256)
 
         # Now provide all transactions to the node before the block is
         # announced and verify reconstruction happens immediately.
         utxo = self.utxos.pop(0)
-        block = self.build_block_with_transactions(utxo, 10)
+        block = self.build_block_with_transactions(node, utxo, 10)
         self.utxos.append([block.vtx[-1].sha256, 0, block.vtx[-1].vout[0].nValue])
         for tx in block.vtx[1:]:
-            self.test_node.send_message(msg_tx(tx))
-        self.test_node.sync_with_ping()
+            test_node.send_message(msg_tx(tx))
+        test_node.sync_with_ping()
         # Make sure all transactions were accepted.
-        mempool = self.nodes[0].getrawmempool()
+        mempool = node.getrawmempool()
         for tx in block.vtx[1:]:
             assert(tx.hash in mempool)
 
         # Clear out last request.
         with mininode_lock:
-            self.test_node.last_getblocktxn = None
+            test_node.last_getblocktxn = None
 
         # Send compact block
-        comp_block.initialize_from_block(block, prefill_list=[0])
-        self.test_node.send_and_ping(msg_cmpctblock(comp_block.to_p2p()))
+        comp_block.initialize_from_block(block, prefill_list=[0], use_witness=with_witness)
+        test_tip_after_message(node, test_node, msg_cmpctblock(comp_block.to_p2p()), block.sha256)
         with mininode_lock:
             # Shouldn't have gotten a request for any transaction
-            assert(self.test_node.last_getblocktxn is None)
-        # Tip should have updated
-        assert_equal(int(self.nodes[0].getbestblockhash(), 16), block.sha256)
+            assert(test_node.last_getblocktxn is None)
 
     # Incorrectly responding to a getblocktxn shouldn't cause the block to be
     # permanently failed.
-    def test_incorrect_blocktxn_response(self):
-        print("Testing handling of incorrect blocktxn responses...")
-
+    def test_incorrect_blocktxn_response(self, node, test_node, version):
         if (len(self.utxos) == 0):
             self.make_utxos()
         utxo = self.utxos.pop(0)
 
-        block = self.build_block_with_transactions(utxo, 10)
+        block = self.build_block_with_transactions(node, utxo, 10)
         self.utxos.append([block.vtx[-1].sha256, 0, block.vtx[-1].vout[0].nValue])
         # Relay the first 5 transactions from the block in advance
         for tx in block.vtx[1:6]:
-            self.test_node.send_message(msg_tx(tx))
-        self.test_node.sync_with_ping()
+            test_node.send_message(msg_tx(tx))
+        test_node.sync_with_ping()
         # Make sure all transactions were accepted.
-        mempool = self.nodes[0].getrawmempool()
+        mempool = node.getrawmempool()
         for tx in block.vtx[1:6]:
             assert(tx.hash in mempool)
 
         # Send compact block
         comp_block = HeaderAndShortIDs()
-        comp_block.initialize_from_block(block, prefill_list=[0])
-        self.test_node.send_and_ping(msg_cmpctblock(comp_block.to_p2p()))
+        comp_block.initialize_from_block(block, prefill_list=[0], use_witness=(version == 2))
+        test_node.send_and_ping(msg_cmpctblock(comp_block.to_p2p()))
         absolute_indexes = []
         with mininode_lock:
-            assert(self.test_node.last_getblocktxn is not None)
-            absolute_indexes = self.test_node.last_getblocktxn.block_txn_request.to_absolute()
+            assert(test_node.last_getblocktxn is not None)
+            absolute_indexes = test_node.last_getblocktxn.block_txn_request.to_absolute()
         assert_equal(absolute_indexes, [6, 7, 8, 9, 10])
 
         # Now give an incorrect response.
@@ -484,100 +535,107 @@ def test_incorrect_blocktxn_response(self):
         # verifying that the block isn't marked bad permanently. This is good
         # enough for now.
         msg = msg_blocktxn()
+        if version==2:
+            msg = msg_witness_blocktxn()
         msg.block_transactions = BlockTransactions(block.sha256, [block.vtx[5]] + block.vtx[7:])
-        self.test_node.send_and_ping(msg)
+        test_node.send_and_ping(msg)
 
         # Tip should not have updated
-        assert_equal(int(self.nodes[0].getbestblockhash(), 16), block.hashPrevBlock)
+        assert_equal(int(node.getbestblockhash(), 16), block.hashPrevBlock)
 
         # We should receive a getdata request
-        success = wait_until(lambda: self.test_node.last_getdata is not None, timeout=10)
+        success = wait_until(lambda: test_node.last_getdata is not None, timeout=10)
         assert(success)
-        assert_equal(len(self.test_node.last_getdata.inv), 1)
-        assert_equal(self.test_node.last_getdata.inv[0].type, 2)
-        assert_equal(self.test_node.last_getdata.inv[0].hash, block.sha256)
+        assert_equal(len(test_node.last_getdata.inv), 1)
+        assert(test_node.last_getdata.inv[0].type == 2 or test_node.last_getdata.inv[0].type == 2|MSG_WITNESS_FLAG)
+        assert_equal(test_node.last_getdata.inv[0].hash, block.sha256)
 
         # Deliver the block
-        self.test_node.send_and_ping(msg_block(block))
-        assert_equal(int(self.nodes[0].getbestblockhash(), 16), block.sha256)
-
-    def test_getblocktxn_handler(self):
-        print("Testing getblocktxn handler...")
+        if version==2:
+            test_node.send_and_ping(msg_witness_block(block))
+        else:
+            test_node.send_and_ping(msg_block(block))
+        assert_equal(int(node.getbestblockhash(), 16), block.sha256)
 
+    def test_getblocktxn_handler(self, node, test_node, version):
         # bitcoind won't respond for blocks whose height is more than 15 blocks
         # deep.
         MAX_GETBLOCKTXN_DEPTH = 15
-        chain_height = self.nodes[0].getblockcount()
+        chain_height = node.getblockcount()
         current_height = chain_height
         while (current_height >= chain_height - MAX_GETBLOCKTXN_DEPTH):
-            block_hash = self.nodes[0].getblockhash(current_height)
-            block = FromHex(CBlock(), self.nodes[0].getblock(block_hash, False))
+            block_hash = node.getblockhash(current_height)
+            block = FromHex(CBlock(), node.getblock(block_hash, False))
 
             msg = msg_getblocktxn()
             msg.block_txn_request = BlockTransactionsRequest(int(block_hash, 16), [])
             num_to_request = random.randint(1, len(block.vtx))
             msg.block_txn_request.from_absolute(sorted(random.sample(range(len(block.vtx)), num_to_request)))
-            self.test_node.send_message(msg)
-            success = wait_until(lambda: self.test_node.last_blocktxn is not None, timeout=10)
+            test_node.send_message(msg)
+            success = wait_until(lambda: test_node.last_blocktxn is not None, timeout=10)
             assert(success)
 
             [tx.calc_sha256() for tx in block.vtx]
             with mininode_lock:
-                assert_equal(self.test_node.last_blocktxn.block_transactions.blockhash, int(block_hash, 16))
+                assert_equal(test_node.last_blocktxn.block_transactions.blockhash, int(block_hash, 16))
                 all_indices = msg.block_txn_request.to_absolute()
                 for index in all_indices:
-                    tx = self.test_node.last_blocktxn.block_transactions.transactions.pop(0)
+                    tx = test_node.last_blocktxn.block_transactions.transactions.pop(0)
                     tx.calc_sha256()
                     assert_equal(tx.sha256, block.vtx[index].sha256)
-                self.test_node.last_blocktxn = None
+                    if version == 1:
+                        # Witnesses should have been stripped
+                        assert(tx.wit.is_null())
+                    else:
+                        # Check that the witness matches
+                        assert_equal(tx.calc_sha256(True), block.vtx[index].calc_sha256(True))
+                test_node.last_blocktxn = None
             current_height -= 1
 
         # Next request should be ignored, as we're past the allowed depth.
-        block_hash = self.nodes[0].getblockhash(current_height)
+        block_hash = node.getblockhash(current_height)
         msg.block_txn_request = BlockTransactionsRequest(int(block_hash, 16), [0])
-        self.test_node.send_and_ping(msg)
+        test_node.send_and_ping(msg)
         with mininode_lock:
-            assert_equal(self.test_node.last_blocktxn, None)
-
-    def test_compactblocks_not_at_tip(self):
-        print("Testing compactblock requests/announcements not at chain tip...")
+            assert_equal(test_node.last_blocktxn, None)
 
+    def test_compactblocks_not_at_tip(self, node, test_node):
         # Test that requesting old compactblocks doesn't work.
         MAX_CMPCTBLOCK_DEPTH = 11
         new_blocks = []
         for i in range(MAX_CMPCTBLOCK_DEPTH):
-            self.test_node.clear_block_announcement()
-            new_blocks.append(self.nodes[0].generate(1)[0])
-            wait_until(self.test_node.received_block_announcement, timeout=30)
+            test_node.clear_block_announcement()
+            new_blocks.append(node.generate(1)[0])
+            wait_until(test_node.received_block_announcement, timeout=30)
 
-        self.test_node.clear_block_announcement()
-        self.test_node.send_message(msg_getdata([CInv(4, int(new_blocks[0], 16))]))
-        success = wait_until(lambda: self.test_node.last_cmpctblock is not None, timeout=30)
+        test_node.clear_block_announcement()
+        test_node.send_message(msg_getdata([CInv(4, int(new_blocks[0], 16))]))
+        success = wait_until(lambda: test_node.last_cmpctblock is not None, timeout=30)
         assert(success)
 
-        self.test_node.clear_block_announcement()
-        self.nodes[0].generate(1)
-        wait_until(self.test_node.received_block_announcement, timeout=30)
-        self.test_node.clear_block_announcement()
-        self.test_node.send_message(msg_getdata([CInv(4, int(new_blocks[0], 16))]))
-        success = wait_until(lambda: self.test_node.last_block is not None, timeout=30)
+        test_node.clear_block_announcement()
+        node.generate(1)
+        wait_until(test_node.received_block_announcement, timeout=30)
+        test_node.clear_block_announcement()
+        test_node.send_message(msg_getdata([CInv(4, int(new_blocks[0], 16))]))
+        success = wait_until(lambda: test_node.last_block is not None, timeout=30)
         assert(success)
         with mininode_lock:
-            self.test_node.last_block.block.calc_sha256()
-            assert_equal(self.test_node.last_block.block.sha256, int(new_blocks[0], 16))
+            test_node.last_block.block.calc_sha256()
+            assert_equal(test_node.last_block.block.sha256, int(new_blocks[0], 16))
 
         # Generate an old compactblock, and verify that it's not accepted.
-        cur_height = self.nodes[0].getblockcount()
-        hashPrevBlock = int(self.nodes[0].getblockhash(cur_height-5), 16)
-        block = self.build_block_on_tip()
+        cur_height = node.getblockcount()
+        hashPrevBlock = int(node.getblockhash(cur_height-5), 16)
+        block = self.build_block_on_tip(node)
         block.hashPrevBlock = hashPrevBlock
         block.solve()
 
         comp_block = HeaderAndShortIDs()
         comp_block.initialize_from_block(block)
-        self.test_node.send_and_ping(msg_cmpctblock(comp_block.to_p2p()))
+        test_node.send_and_ping(msg_cmpctblock(comp_block.to_p2p()))
 
-        tips = self.nodes[0].getchaintips()
+        tips = node.getchaintips()
         found = False
         for x in tips:
             if x["hash"] == block.hash:
@@ -591,18 +649,61 @@ def test_compactblocks_not_at_tip(self):
         msg = msg_getblocktxn()
         msg.block_txn_request = BlockTransactionsRequest(block.sha256, [0])
         with mininode_lock:
-            self.test_node.last_blocktxn = None
-        self.test_node.send_and_ping(msg)
+            test_node.last_blocktxn = None
+        test_node.send_and_ping(msg)
         with mininode_lock:
-            assert(self.test_node.last_blocktxn is None)
+            assert(test_node.last_blocktxn is None)
+
+    def activate_segwit(self, node):
+        node.generate(144*3)
+        assert_equal(get_bip9_status(node, "segwit")["status"], 'active')
+
+    def test_end_to_end_block_relay(self, node, listeners):
+        utxo = self.utxos.pop(0)
+
+        block = self.build_block_with_transactions(node, utxo, 10)
+
+        [l.clear_block_announcement() for l in listeners]
+
+        # ToHex() won't serialize with witness, but this block has no witnesses
+        # anyway. TODO: repeat this test with witness tx's to a segwit node.
+        node.submitblock(ToHex(block))
+
+        for l in listeners:
+            wait_until(lambda: l.received_block_announcement(), timeout=30)
+        with mininode_lock:
+            for l in listeners:
+                assert(l.last_cmpctblock is not None)
+                l.last_cmpctblock.header_and_shortids.header.calc_sha256()
+                assert_equal(l.last_cmpctblock.header_and_shortids.header.sha256, block.sha256)
+
+    # Helper for enabling cb announcements
+    # Send the sendcmpct request and sync headers
+    def request_cb_announcements(self, peer, node, version):
+        tip = node.getbestblockhash()
+        peer.get_headers(locator=[int(tip, 16)], hashstop=0)
+
+        msg = msg_sendcmpct()
+        msg.version = version
+        msg.announce = True
+        peer.send_and_ping(msg)
+
 
     def run_test(self):
         # Setup the p2p connections and start up the network thread.
         self.test_node = TestNode()
+        self.segwit_node = TestNode()
+        self.old_node = TestNode()  # version 1 peer <--> segwit node
 
         connections = []
         connections.append(NodeConn('127.0.0.1', p2p_port(0), self.nodes[0], self.test_node))
+        connections.append(NodeConn('127.0.0.1', p2p_port(1), self.nodes[1],
+                    self.segwit_node, services=NODE_NETWORK|NODE_WITNESS))
+        connections.append(NodeConn('127.0.0.1', p2p_port(1), self.nodes[1],
+                    self.old_node, services=NODE_NETWORK))
         self.test_node.add_connection(connections[0])
+        self.segwit_node.add_connection(connections[1])
+        self.old_node.add_connection(connections[2])
 
         NetworkThread().start()  # Start up network handling in another thread
 
@@ -612,13 +713,107 @@ def run_test(self):
         # We will need UTXOs to construct transactions in later tests.
         self.make_utxos()
 
-        self.test_sendcmpct()
-        self.test_compactblock_construction()
-        self.test_compactblock_requests()
-        self.test_getblocktxn_requests()
-        self.test_getblocktxn_handler()
-        self.test_compactblocks_not_at_tip()
-        self.test_incorrect_blocktxn_response()
+        print("Running tests, pre-segwit activation:")
+
+        print("\tTesting SENDCMPCT p2p message... ")
+        self.test_sendcmpct(self.nodes[0], self.test_node, 1)
+        sync_blocks(self.nodes)
+        self.test_sendcmpct(self.nodes[1], self.segwit_node, 2, old_node=self.old_node)
+        sync_blocks(self.nodes)
+
+        print("\tTesting compactblock construction...")
+        self.test_compactblock_construction(self.nodes[0], self.test_node, 1, False)
+        sync_blocks(self.nodes)
+        self.test_compactblock_construction(self.nodes[1], self.segwit_node, 2, False)
+        sync_blocks(self.nodes)
+
+        print("\tTesting compactblock requests... ")
+        self.test_compactblock_requests(self.nodes[0], self.test_node)
+        sync_blocks(self.nodes)
+        self.test_compactblock_requests(self.nodes[1], self.segwit_node)
+        sync_blocks(self.nodes)
+
+        print("\tTesting getblocktxn requests...")
+        self.test_getblocktxn_requests(self.nodes[0], self.test_node, 1)
+        sync_blocks(self.nodes)
+        self.test_getblocktxn_requests(self.nodes[1], self.segwit_node, 2)
+        sync_blocks(self.nodes)
+
+        print("\tTesting getblocktxn handler...")
+        self.test_getblocktxn_handler(self.nodes[0], self.test_node, 1)
+        sync_blocks(self.nodes)
+        self.test_getblocktxn_handler(self.nodes[1], self.segwit_node, 2)
+        self.test_getblocktxn_handler(self.nodes[1], self.old_node, 1)
+        sync_blocks(self.nodes)
+
+        print("\tTesting compactblock requests/announcements not at chain tip...")
+        self.test_compactblocks_not_at_tip(self.nodes[0], self.test_node)
+        sync_blocks(self.nodes)
+        self.test_compactblocks_not_at_tip(self.nodes[1], self.segwit_node)
+        self.test_compactblocks_not_at_tip(self.nodes[1], self.old_node)
+        sync_blocks(self.nodes)
+
+        print("\tTesting handling of incorrect blocktxn responses...")
+        self.test_incorrect_blocktxn_response(self.nodes[0], self.test_node, 1)
+        sync_blocks(self.nodes)
+        self.test_incorrect_blocktxn_response(self.nodes[1], self.segwit_node, 2)
+        sync_blocks(self.nodes)
+
+        # End-to-end block relay tests
+        print("\tTesting end-to-end block relay...")
+        self.request_cb_announcements(self.test_node, self.nodes[0], 1)
+        self.request_cb_announcements(self.old_node, self.nodes[1], 1)
+        self.request_cb_announcements(self.segwit_node, self.nodes[1], 2)
+        self.test_end_to_end_block_relay(self.nodes[0], [self.segwit_node, self.test_node, self.old_node])
+        self.test_end_to_end_block_relay(self.nodes[1], [self.segwit_node, self.test_node, self.old_node])
+
+        # Advance to segwit activation
+        print ("\nAdvancing to segwit activation\n")
+        self.activate_segwit(self.nodes[1])
+        print ("Running tests, post-segwit activation...")
+
+        print("\tTesting compactblock construction...")
+        self.test_compactblock_construction(self.nodes[1], self.old_node, 1, True)
+        self.test_compactblock_construction(self.nodes[1], self.segwit_node, 2, True)
+        sync_blocks(self.nodes)
+
+        print("\tTesting compactblock requests (unupgraded node)... ")
+        self.test_compactblock_requests(self.nodes[0], self.test_node)
+
+        print("\tTesting getblocktxn requests (unupgraded node)...")
+        self.test_getblocktxn_requests(self.nodes[0], self.test_node, 1)
+
+        # Need to manually sync node0 and node1, because post-segwit activation,
+        # node1 will not download blocks from node0.
+        print("\tSyncing nodes...")
+        assert(self.nodes[0].getbestblockhash() != self.nodes[1].getbestblockhash())
+        while (self.nodes[0].getblockcount() > self.nodes[1].getblockcount()):
+            block_hash = self.nodes[0].getblockhash(self.nodes[1].getblockcount()+1)
+            self.nodes[1].submitblock(self.nodes[0].getblock(block_hash, False))
+        assert_equal(self.nodes[0].getbestblockhash(), self.nodes[1].getbestblockhash())
+
+        print("\tTesting compactblock requests (segwit node)... ")
+        self.test_compactblock_requests(self.nodes[1], self.segwit_node)
+
+        print("\tTesting getblocktxn requests (segwit node)...")
+        self.test_getblocktxn_requests(self.nodes[1], self.segwit_node, 2)
+        sync_blocks(self.nodes)
+
+        print("\tTesting getblocktxn handler (segwit node should return witnesses)...")
+        self.test_getblocktxn_handler(self.nodes[1], self.segwit_node, 2)
+        self.test_getblocktxn_handler(self.nodes[1], self.old_node, 1)
+
+        # Test that if we submitblock to node1, we'll get a compact block
+        # announcement to all peers.
+        # (Post-segwit activation, blocks won't propagate from node0 to node1
+        # automatically, so don't bother testing a block announced to node0.)
+        print("\tTesting end-to-end block relay...")
+        self.request_cb_announcements(self.test_node, self.nodes[0], 1)
+        self.request_cb_announcements(self.old_node, self.nodes[1], 1)
+        self.request_cb_announcements(self.segwit_node, self.nodes[1], 2)
+        self.test_end_to_end_block_relay(self.nodes[1], [self.segwit_node, self.test_node, self.old_node])
+
+        print("\tTesting invalid index in cmpctblock message...")
         self.test_invalid_cmpctblock_message()
 
 

From aefcb7b70c923ccd341329a2d5e22238dc14ac3b Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Tue, 4 Oct 2016 13:36:11 -0400
Subject: [PATCH 0989/1802] Move net-processing logic definitions together in
 main.h

---
 src/main.h | 56 +++++++++++++++++++++++++++++-------------------------
 1 file changed, 30 insertions(+), 26 deletions(-)

diff --git a/src/main.h b/src/main.h
index 2646d8f86b0a3..3c587569f635d 100644
--- a/src/main.h
+++ b/src/main.h
@@ -41,7 +41,6 @@ class CValidationInterface;
 class CValidationState;
 
 struct PrecomputedTransactionData;
-struct CNodeStateStats;
 struct LockPoints;
 
 /** Default for DEFAULT_WHITELISTRELAY. */
@@ -206,11 +205,6 @@ static const unsigned int DEFAULT_CHECKLEVEL = 3;
 // Setting the target to > than 550MB will make it likely we can respect the target.
 static const uint64_t MIN_DISK_SPACE_FOR_BLOCK_FILES = 550 * 1024 * 1024;
 
-/** Register with a network node to receive its signals */
-void RegisterNodeSignals(CNodeSignals& nodeSignals);
-/** Unregister a network node */
-void UnregisterNodeSignals(CNodeSignals& nodeSignals);
-
 /** 
  * Process an incoming block. This only returns after the best known valid
  * block is made active. Note that it does not, however, guarantee that the
@@ -240,15 +234,6 @@ bool InitBlockIndex(const CChainParams& chainparams);
 bool LoadBlockIndex();
 /** Unload database information */
 void UnloadBlockIndex();
-/** Process protocol messages received from a given node */
-bool ProcessMessages(CNode* pfrom, CConnman& connman);
-/**
- * Send queued protocol messages to be sent to a give node.
- *
- * @param[in]   pto             The node which we are sending messages to.
- * @param[in]   connman         The connection manager for that node.
- */
-bool SendMessages(CNode* pto, CConnman& connman);
 /** Run an instance of the script checking thread */
 void ThreadScriptCheck();
 /** Check whether we are doing an initial block download (synchronizing from disk or network) */
@@ -291,10 +276,6 @@ void UnlinkPrunedFiles(std::set<int>& setFilesToPrune);
 
 /** Create a new block index entry for a given block hash */
 CBlockIndex * InsertBlockIndex(uint256 hash);
-/** Get statistics from node state */
-bool GetNodeStateStats(NodeId nodeid, CNodeStateStats &stats);
-/** Increase a node's misbehavior score. */
-void Misbehaving(NodeId nodeid, int howmuch);
 /** Flush all state, indexes and buffers to disk. */
 void FlushStateToDisk();
 /** Prune block files and flush state to disk. */
@@ -310,13 +291,6 @@ std::string FormatStateMessage(const CValidationState &state);
 /** Get the BIP9 state for a given deployment at the current tip. */
 ThresholdState VersionBitsTipState(const Consensus::Params& params, Consensus::DeploymentPos pos);
 
-struct CNodeStateStats {
-    int nMisbehavior;
-    int nSyncHeight;
-    int nCommonHeight;
-    std::vector<int> vHeightInFlight;
-};
-
 
 
 /** 
@@ -545,4 +519,34 @@ static const unsigned int REJECT_ALREADY_KNOWN = 0x101;
 /** Transaction conflicts with a transaction already known */
 static const unsigned int REJECT_CONFLICT = 0x102;
 
+// The following things handle network-processing logic
+// (and should be moved to a separate file)
+
+/** Register with a network node to receive its signals */
+void RegisterNodeSignals(CNodeSignals& nodeSignals);
+/** Unregister a network node */
+void UnregisterNodeSignals(CNodeSignals& nodeSignals);
+
+struct CNodeStateStats {
+    int nMisbehavior;
+    int nSyncHeight;
+    int nCommonHeight;
+    std::vector<int> vHeightInFlight;
+};
+
+/** Get statistics from node state */
+bool GetNodeStateStats(NodeId nodeid, CNodeStateStats &stats);
+/** Increase a node's misbehavior score. */
+void Misbehaving(NodeId nodeid, int howmuch);
+
+/** Process protocol messages received from a given node */
+bool ProcessMessages(CNode* pfrom, CConnman& connman);
+/**
+ * Send queued protocol messages to be sent to a give node.
+ *
+ * @param[in]   pto             The node which we are sending messages to.
+ * @param[in]   connman         The connection manager for that node.
+ */
+bool SendMessages(CNode* pto, CConnman& connman);
+
 #endif // BITCOIN_MAIN_H

From fef1010199b70026fd6d56ebac5c277552757307 Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Tue, 4 Oct 2016 13:49:44 -0400
Subject: [PATCH 0990/1802] Use CValidationInterface from chain logic to notify
 peer logic

This adds a new CValidationInterface subclass, defined in main.h,
to receive notifications of UpdatedBlockTip and use that to push
blocks to peers, instead of doing it directly from
ActivateBestChain.
---
 src/init.cpp |  5 +++++
 src/main.cpp | 56 ++++++++++++++++++++++++++++++----------------------
 src/main.h   | 11 +++++++++++
 3 files changed, 48 insertions(+), 24 deletions(-)

diff --git a/src/init.cpp b/src/init.cpp
index eefef7ba0b253..7045b3e6e1f4d 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -72,6 +72,7 @@ static const bool DEFAULT_DISABLE_SAFEMODE = false;
 static const bool DEFAULT_STOPAFTERBLOCKIMPORT = false;
 
 std::unique_ptr<CConnman> g_connman;
+std::unique_ptr<PeerLogicValidation> peerLogic;
 
 #if ENABLE_ZMQ
 static CZMQNotificationInterface* pzmqNotificationInterface = NULL;
@@ -200,6 +201,8 @@ void Shutdown()
         pwalletMain->Flush(false);
 #endif
     MapPort(false);
+    UnregisterValidationInterface(peerLogic.get());
+    peerLogic.reset();
     g_connman.reset();
 
     StopTorControl();
@@ -1102,6 +1105,8 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
     g_connman = std::unique_ptr<CConnman>(new CConnman(GetRand(std::numeric_limits<uint64_t>::max()), GetRand(std::numeric_limits<uint64_t>::max())));
     CConnman& connman = *g_connman;
 
+    peerLogic.reset(new PeerLogicValidation(&connman));
+    RegisterValidationInterface(peerLogic.get());
     RegisterNodeSignals(GetNodeSignals());
 
     // sanitize comments per BIP-0014, format user agent and check total size
diff --git a/src/main.cpp b/src/main.cpp
index 2eb641e543f6e..e042a73822b67 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -3073,30 +3073,6 @@ bool ActivateBestChain(CValidationState &state, const CChainParams& chainparams,
         if (pindexFork != pindexNewTip) {
             uiInterface.NotifyBlockTip(fInitialDownload, pindexNewTip);
 
-            if (!fInitialDownload) {
-                // Find the hashes of all blocks that weren't previously in the best chain.
-                std::vector<uint256> vHashes;
-                CBlockIndex *pindexToAnnounce = pindexNewTip;
-                while (pindexToAnnounce != pindexFork) {
-                    vHashes.push_back(pindexToAnnounce->GetBlockHash());
-                    pindexToAnnounce = pindexToAnnounce->pprev;
-                    if (vHashes.size() == MAX_BLOCKS_TO_ANNOUNCE) {
-                        // Limit announcements in case of a huge reorganization.
-                        // Rely on the peer's synchronization mechanism in that case.
-                        break;
-                    }
-                }
-                // Relay inventory, but don't relay old inventory during initial block download.
-                if(connman) {
-                    connman->ForEachNode([nNewHeight, &vHashes](CNode* pnode) {
-                        if (nNewHeight > (pnode->nStartingHeight != -1 ? pnode->nStartingHeight - 2000 : 0)) {
-                            BOOST_REVERSE_FOREACH(const uint256& hash, vHashes) {
-                                pnode->PushBlockHash(hash);
-                            }
-                        }
-                    });
-                }
-            }
             // Notify external listeners about the new tip.
             GetMainSignals().UpdatedBlockTip(pindexNewTip, pindexFork, fInitialDownload);
         }
@@ -4682,6 +4658,38 @@ std::string GetWarnings(const std::string& strFor)
 
 
 
+//////////////////////////////////////////////////////////////////////////////
+//
+// blockchain -> download logic notification
+//
+
+void PeerLogicValidation::UpdatedBlockTip(const CBlockIndex *pindexNew, const CBlockIndex *pindexFork, bool fInitialDownload) {
+    const int nNewHeight = pindexNew->nHeight;
+
+    if (!fInitialDownload) {
+        // Find the hashes of all blocks that weren't previously in the best chain.
+        std::vector<uint256> vHashes;
+        const CBlockIndex *pindexToAnnounce = pindexNew;
+        while (pindexToAnnounce != pindexFork) {
+            vHashes.push_back(pindexToAnnounce->GetBlockHash());
+            pindexToAnnounce = pindexToAnnounce->pprev;
+            if (vHashes.size() == MAX_BLOCKS_TO_ANNOUNCE) {
+                // Limit announcements in case of a huge reorganization.
+                // Rely on the peer's synchronization mechanism in that case.
+                break;
+            }
+        }
+        // Relay inventory, but don't relay old inventory during initial block download.
+        connman->ForEachNode([nNewHeight, &vHashes](CNode* pnode) {
+            if (nNewHeight > (pnode->nStartingHeight != -1 ? pnode->nStartingHeight - 2000 : 0)) {
+                BOOST_REVERSE_FOREACH(const uint256& hash, vHashes) {
+                    pnode->PushBlockHash(hash);
+                }
+            }
+        });
+    }
+}
+
 //////////////////////////////////////////////////////////////////////////////
 //
 // Messages
diff --git a/src/main.h b/src/main.h
index 3c587569f635d..bb5e26b0b2743 100644
--- a/src/main.h
+++ b/src/main.h
@@ -16,6 +16,7 @@
 #include "net.h"
 #include "script/script_error.h"
 #include "sync.h"
+#include "validationinterface.h"
 #include "versionbits.h"
 
 #include <algorithm>
@@ -527,6 +528,16 @@ void RegisterNodeSignals(CNodeSignals& nodeSignals);
 /** Unregister a network node */
 void UnregisterNodeSignals(CNodeSignals& nodeSignals);
 
+class PeerLogicValidation : public CValidationInterface {
+private:
+    CConnman* connman;
+
+public:
+    PeerLogicValidation(CConnman* connmanIn) : connman(connmanIn) {}
+
+    virtual void UpdatedBlockTip(const CBlockIndex *pindexNew, const CBlockIndex *pindexFork, bool fInitialDownload);
+};
+
 struct CNodeStateStats {
     int nMisbehavior;
     int nSyncHeight;

From f5efa283931ce1d52c59234b58988a221d42ecb4 Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Fri, 30 Sep 2016 18:38:05 -0400
Subject: [PATCH 0991/1802] Remove CConnman parameter from
 ProcessNewBlock/ActivateBestChain

---
 src/main.cpp              | 10 +++++-----
 src/main.h                |  4 ++--
 src/rpc/blockchain.cpp    |  4 ++--
 src/rpc/mining.cpp        |  4 ++--
 src/test/miner_tests.cpp  |  2 +-
 src/test/test_bitcoin.cpp |  2 +-
 6 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index e042a73822b67..4ad7348db0b43 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -3013,7 +3013,7 @@ static void NotifyHeaderTip() {
  * or an activated best chain. pblock is either NULL or a pointer to a block
  * that is already loaded (to avoid loading it again from disk).
  */
-bool ActivateBestChain(CValidationState &state, const CChainParams& chainparams, const CBlock *pblock, CConnman* connman) {
+bool ActivateBestChain(CValidationState &state, const CChainParams& chainparams, const CBlock *pblock) {
     CBlockIndex *pindexMostWork = NULL;
     CBlockIndex *pindexNewTip = NULL;
     std::vector<std::tuple<CTransaction,CBlockIndex*,int>> txChanged;
@@ -3703,7 +3703,7 @@ static bool AcceptBlock(const CBlock& block, CValidationState& state, const CCha
     return true;
 }
 
-bool ProcessNewBlock(CValidationState& state, const CChainParams& chainparams, CNode* pfrom, const CBlock* pblock, bool fForceProcessing, const CDiskBlockPos* dbp, CConnman* connman)
+bool ProcessNewBlock(CValidationState& state, const CChainParams& chainparams, CNode* pfrom, const CBlock* pblock, bool fForceProcessing, const CDiskBlockPos* dbp)
 {
     {
         LOCK(cs_main);
@@ -3725,7 +3725,7 @@ bool ProcessNewBlock(CValidationState& state, const CChainParams& chainparams, C
 
     NotifyHeaderTip();
 
-    if (!ActivateBestChain(state, chainparams, pblock, connman))
+    if (!ActivateBestChain(state, chainparams, pblock))
         return error("%s: ActivateBestChain failed", __func__);
 
     return true;
@@ -5764,7 +5764,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
             pfrom->PushMessage(NetMsgType::GETDATA, invs);
         } else {
             CValidationState state;
-            ProcessNewBlock(state, chainparams, pfrom, &block, false, NULL, &connman);
+            ProcessNewBlock(state, chainparams, pfrom, &block, false, NULL);
             int nDoS;
             if (state.IsInvalid(nDoS)) {
                 assert (state.GetRejectCode() < REJECT_INTERNAL); // Blocks are never rejected with internal reject codes
@@ -5940,7 +5940,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
         // Such an unrequested block may still be processed, subject to the
         // conditions in AcceptBlock().
         bool forceProcessing = pfrom->fWhitelisted && !IsInitialBlockDownload();
-        ProcessNewBlock(state, chainparams, pfrom, &block, forceProcessing, NULL, &connman);
+        ProcessNewBlock(state, chainparams, pfrom, &block, forceProcessing, NULL);
         int nDoS;
         if (state.IsInvalid(nDoS)) {
             assert (state.GetRejectCode() < REJECT_INTERNAL); // Blocks are never rejected with internal reject codes
diff --git a/src/main.h b/src/main.h
index bb5e26b0b2743..77179b25b98d8 100644
--- a/src/main.h
+++ b/src/main.h
@@ -218,7 +218,7 @@ static const uint64_t MIN_DISK_SPACE_FOR_BLOCK_FILES = 550 * 1024 * 1024;
  * @param[out]  dbp     The already known disk position of pblock, or NULL if not yet stored.
  * @return True if state.IsValid()
  */
-bool ProcessNewBlock(CValidationState& state, const CChainParams& chainparams, CNode* pfrom, const CBlock* pblock, bool fForceProcessing, const CDiskBlockPos* dbp, CConnman* connman);
+bool ProcessNewBlock(CValidationState& state, const CChainParams& chainparams, CNode* pfrom, const CBlock* pblock, bool fForceProcessing, const CDiskBlockPos* dbp);
 /** Check whether enough disk space is available for an incoming block */
 bool CheckDiskSpace(uint64_t nAdditionalBytes = 0);
 /** Open a block file (blk?????.dat) */
@@ -250,7 +250,7 @@ std::string GetWarnings(const std::string& strFor);
 /** Retrieve a transaction (from memory pool, or from disk, if possible) */
 bool GetTransaction(const uint256 &hash, CTransaction &tx, const Consensus::Params& params, uint256 &hashBlock, bool fAllowSlow = false);
 /** Find the best known block, and make it the tip of the block chain */
-bool ActivateBestChain(CValidationState& state, const CChainParams& chainparams, const CBlock* pblock = NULL, CConnman* connman = NULL);
+bool ActivateBestChain(CValidationState& state, const CChainParams& chainparams, const CBlock* pblock = NULL);
 CAmount GetBlockSubsidy(int nHeight, const Consensus::Params& consensusParams);
 
 /**
diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp
index 41d862934a1b5..d85f6fed6380f 100644
--- a/src/rpc/blockchain.cpp
+++ b/src/rpc/blockchain.cpp
@@ -1279,7 +1279,7 @@ UniValue invalidateblock(const UniValue& params, bool fHelp)
     }
 
     if (state.IsValid()) {
-        ActivateBestChain(state, Params(), NULL, g_connman.get());
+        ActivateBestChain(state, Params(), NULL);
     }
 
     if (!state.IsValid()) {
@@ -1317,7 +1317,7 @@ UniValue reconsiderblock(const UniValue& params, bool fHelp)
     }
 
     CValidationState state;
-    ActivateBestChain(state, Params(), NULL, g_connman.get());
+    ActivateBestChain(state, Params(), NULL);
 
     if (!state.IsValid()) {
         throw JSONRPCError(RPC_DATABASE_ERROR, state.GetRejectReason());
diff --git a/src/rpc/mining.cpp b/src/rpc/mining.cpp
index 6b13aa5bab02a..a54931720e45b 100644
--- a/src/rpc/mining.cpp
+++ b/src/rpc/mining.cpp
@@ -131,7 +131,7 @@ UniValue generateBlocks(boost::shared_ptr<CReserveScript> coinbaseScript, int nG
             continue;
         }
         CValidationState state;
-        if (!ProcessNewBlock(state, Params(), NULL, pblock, true, NULL, g_connman.get()))
+        if (!ProcessNewBlock(state, Params(), NULL, pblock, true, NULL))
             throw JSONRPCError(RPC_INTERNAL_ERROR, "ProcessNewBlock, block not accepted");
         ++nHeight;
         blockHashes.push_back(pblock->GetHash().GetHex());
@@ -757,7 +757,7 @@ UniValue submitblock(const UniValue& params, bool fHelp)
     CValidationState state;
     submitblock_StateCatcher sc(block.GetHash());
     RegisterValidationInterface(&sc);
-    bool fAccepted = ProcessNewBlock(state, Params(), NULL, &block, true, NULL, g_connman.get());
+    bool fAccepted = ProcessNewBlock(state, Params(), NULL, &block, true, NULL);
     UnregisterValidationInterface(&sc);
     if (fBlockPresent)
     {
diff --git a/src/test/miner_tests.cpp b/src/test/miner_tests.cpp
index d3aa2364d1f7b..15fceb963a59f 100644
--- a/src/test/miner_tests.cpp
+++ b/src/test/miner_tests.cpp
@@ -222,7 +222,7 @@ BOOST_AUTO_TEST_CASE(CreateNewBlock_validity)
         pblock->hashMerkleRoot = BlockMerkleRoot(*pblock);
         pblock->nNonce = blockinfo[i].nonce;
         CValidationState state;
-        BOOST_CHECK(ProcessNewBlock(state, chainparams, NULL, pblock, true, NULL, connman));
+        BOOST_CHECK(ProcessNewBlock(state, chainparams, NULL, pblock, true, NULL));
         BOOST_CHECK(state.IsValid());
         pblock->hashPrevBlock = pblock->GetHash();
     }
diff --git a/src/test/test_bitcoin.cpp b/src/test/test_bitcoin.cpp
index 02843d8525ea0..f36c5486556b2 100644
--- a/src/test/test_bitcoin.cpp
+++ b/src/test/test_bitcoin.cpp
@@ -124,7 +124,7 @@ TestChain100Setup::CreateAndProcessBlock(const std::vector<CMutableTransaction>&
     while (!CheckProofOfWork(block.GetHash(), block.nBits, chainparams.GetConsensus())) ++block.nNonce;
 
     CValidationState state;
-    ProcessNewBlock(state, chainparams, NULL, &block, true, NULL, connman);
+    ProcessNewBlock(state, chainparams, NULL, &block, true, NULL);
 
     CBlock result = block;
     delete pblocktemplate;

From 12ee1fe018e99bba6c2b74940ece3b39a45ed8d3 Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Tue, 4 Oct 2016 13:52:57 -0400
Subject: [PATCH 0992/1802] Always call UpdatedBlockTip, even if blocks were
 only disconnected

---
 src/main.cpp                         | 11 ++++-------
 src/zmq/zmqnotificationinterface.cpp |  2 +-
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index 4ad7348db0b43..189c265ec034e 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -3028,7 +3028,6 @@ bool ActivateBestChain(CValidationState &state, const CChainParams& chainparams,
         const CBlockIndex *pindexFork;
         std::list<CTransaction> txConflicted;
         bool fInitialDownload;
-        int nNewHeight;
         {
             LOCK(cs_main);
             CBlockIndex *pindexOldTip = chainActive.Tip();
@@ -3051,13 +3050,10 @@ bool ActivateBestChain(CValidationState &state, const CChainParams& chainparams,
             pindexNewTip = chainActive.Tip();
             pindexFork = chainActive.FindFork(pindexOldTip);
             fInitialDownload = IsInitialBlockDownload();
-            nNewHeight = chainActive.Height();
         }
         // When we reach this point, we switched to a new tip (stored in pindexNewTip).
 
         // Notifications/callbacks that can run without cs_main
-        if(connman)
-            connman->SetBestHeight(nNewHeight);
 
         // throw all transactions though the signal-interface
         // while _not_ holding the cs_main lock
@@ -3069,12 +3065,12 @@ bool ActivateBestChain(CValidationState &state, const CChainParams& chainparams,
         for(unsigned int i = 0; i < txChanged.size(); i++)
             SyncWithWallets(std::get<0>(txChanged[i]), std::get<1>(txChanged[i]), std::get<2>(txChanged[i]));
 
+        // Notify external listeners about the new tip.
+        GetMainSignals().UpdatedBlockTip(pindexNewTip, pindexFork, fInitialDownload);
+
         // Always notify the UI if a new block tip was connected
         if (pindexFork != pindexNewTip) {
             uiInterface.NotifyBlockTip(fInitialDownload, pindexNewTip);
-
-            // Notify external listeners about the new tip.
-            GetMainSignals().UpdatedBlockTip(pindexNewTip, pindexFork, fInitialDownload);
         }
     } while (pindexNewTip != pindexMostWork);
     CheckBlockIndex(chainparams.GetConsensus());
@@ -4665,6 +4661,7 @@ std::string GetWarnings(const std::string& strFor)
 
 void PeerLogicValidation::UpdatedBlockTip(const CBlockIndex *pindexNew, const CBlockIndex *pindexFork, bool fInitialDownload) {
     const int nNewHeight = pindexNew->nHeight;
+    connman->SetBestHeight(nNewHeight);
 
     if (!fInitialDownload) {
         // Find the hashes of all blocks that weren't previously in the best chain.
diff --git a/src/zmq/zmqnotificationinterface.cpp b/src/zmq/zmqnotificationinterface.cpp
index 020cdfbdc724a..a0196fe18418c 100644
--- a/src/zmq/zmqnotificationinterface.cpp
+++ b/src/zmq/zmqnotificationinterface.cpp
@@ -126,7 +126,7 @@ void CZMQNotificationInterface::Shutdown()
 
 void CZMQNotificationInterface::UpdatedBlockTip(const CBlockIndex *pindexNew, const CBlockIndex *pindexFork, bool fInitialDownload)
 {
-    if (fInitialDownload)
+    if (fInitialDownload || pindexNew == pindexFork) // In IBD or blocks were disconnected without any new ones
         return;
 
     for (std::list<CZMQAbstractNotifier*>::iterator i = notifiers.begin(); i!=notifiers.end(); )

From 7565e03b962cfa8d8e54aa0f9068f41194915523 Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Sat, 1 Oct 2016 15:29:40 -0400
Subject: [PATCH 0993/1802] Remove SyncWithWallets wrapper function

---
 src/main.cpp                | 8 ++++----
 src/validationinterface.cpp | 4 ----
 src/validationinterface.h   | 4 ++--
 3 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index 189c265ec034e..2f35288329a88 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1542,7 +1542,7 @@ bool AcceptToMemoryPoolWorker(CTxMemPool& pool, CValidationState& state, const C
         }
     }
 
-    SyncWithWallets(tx, NULL);
+    GetMainSignals().SyncTransaction(tx, NULL, CMainSignals::SYNC_TRANSACTION_NOT_IN_BLOCK);
 
     return true;
 }
@@ -2775,7 +2775,7 @@ bool static DisconnectTip(CValidationState& state, const CChainParams& chainpara
     // Let wallets know transactions went from 1-confirmed to
     // 0-confirmed or conflicted:
     BOOST_FOREACH(const CTransaction &tx, block.vtx) {
-        SyncWithWallets(tx, pindexDelete->pprev);
+        GetMainSignals().SyncTransaction(tx, pindexDelete->pprev, CMainSignals::SYNC_TRANSACTION_NOT_IN_BLOCK);
     }
     return true;
 }
@@ -3059,11 +3059,11 @@ bool ActivateBestChain(CValidationState &state, const CChainParams& chainparams,
         // while _not_ holding the cs_main lock
         BOOST_FOREACH(const CTransaction &tx, txConflicted)
         {
-            SyncWithWallets(tx, pindexNewTip);
+            GetMainSignals().SyncTransaction(tx, pindexNewTip, CMainSignals::SYNC_TRANSACTION_NOT_IN_BLOCK);
         }
         // ... and about transactions that got confirmed:
         for(unsigned int i = 0; i < txChanged.size(); i++)
-            SyncWithWallets(std::get<0>(txChanged[i]), std::get<1>(txChanged[i]), std::get<2>(txChanged[i]));
+            GetMainSignals().SyncTransaction(std::get<0>(txChanged[i]), std::get<1>(txChanged[i]), std::get<2>(txChanged[i]));
 
         // Notify external listeners about the new tip.
         GetMainSignals().UpdatedBlockTip(pindexNewTip, pindexFork, fInitialDownload);
diff --git a/src/validationinterface.cpp b/src/validationinterface.cpp
index d0aa7b5f393ff..085c336ccf6a9 100644
--- a/src/validationinterface.cpp
+++ b/src/validationinterface.cpp
@@ -47,7 +47,3 @@ void UnregisterAllValidationInterfaces() {
     g_signals.SyncTransaction.disconnect_all_slots();
     g_signals.UpdatedBlockTip.disconnect_all_slots();
 }
-
-void SyncWithWallets(const CTransaction &tx, const CBlockIndex *pindex, int posInBlock) {
-    g_signals.SyncTransaction(tx, pindex, posInBlock);
-}
diff --git a/src/validationinterface.h b/src/validationinterface.h
index 683f8fe20cbae..a29859999bfab 100644
--- a/src/validationinterface.h
+++ b/src/validationinterface.h
@@ -28,8 +28,6 @@ void RegisterValidationInterface(CValidationInterface* pwalletIn);
 void UnregisterValidationInterface(CValidationInterface* pwalletIn);
 /** Unregister all wallets from core */
 void UnregisterAllValidationInterfaces();
-/** Push an updated transaction to all registered wallets */
-void SyncWithWallets(const CTransaction& tx, const CBlockIndex *pindex, int posInBlock = -1);
 
 class CValidationInterface {
 protected:
@@ -50,6 +48,8 @@ class CValidationInterface {
 struct CMainSignals {
     /** Notifies listeners of updated block chain tip */
     boost::signals2::signal<void (const CBlockIndex *, const CBlockIndex *, bool fInitialDownload)> UpdatedBlockTip;
+    /** A posInBlock value for SyncTransaction which indicates the transaction was conflicted, disconnected, or not in a block */
+    static const int SYNC_TRANSACTION_NOT_IN_BLOCK = -1;
     /** Notifies listeners of updated transaction data (transaction, and optionally the block it is found in. */
     boost::signals2::signal<void (const CTransaction &, const CBlockIndex *pindex, int posInBlock)> SyncTransaction;
     /** Notifies listeners of an updated transaction without new data (for now: a coinbase potentially becoming visible). */

From a9aec5c24d8c4efe9e1ede54e8b8039b4b3f0835 Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Tue, 4 Oct 2016 13:54:29 -0400
Subject: [PATCH 0994/1802] Use BlockChecked signal to send reject messages
 from mapBlockSource

---
 src/main.cpp | 32 ++++++++++++++++++++------------
 src/main.h   |  1 +
 2 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index 2f35288329a88..a6a43699cd296 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1857,17 +1857,6 @@ void static InvalidChainFound(CBlockIndex* pindexNew)
 }
 
 void static InvalidBlockFound(CBlockIndex *pindex, const CValidationState &state) {
-    int nDoS = 0;
-    if (state.IsInvalid(nDoS)) {
-        std::map<uint256, NodeId>::iterator it = mapBlockSource.find(pindex->GetBlockHash());
-        if (it != mapBlockSource.end() && State(it->second)) {
-            assert (state.GetRejectCode() < REJECT_INTERNAL); // Blocks are never rejected with internal reject codes
-            CBlockReject reject = {(unsigned char)state.GetRejectCode(), state.GetRejectReason().substr(0, MAX_REJECT_MESSAGE_LENGTH), pindex->GetBlockHash()};
-            State(it->second)->rejects.push_back(reject);
-            if (nDoS > 0)
-                Misbehaving(it->second, nDoS);
-        }
-    }
     if (!state.CorruptionPossible()) {
         pindex->nStatus |= BLOCK_FAILED_VALID;
         setDirtyBlockIndex.insert(pindex);
@@ -2814,7 +2803,6 @@ bool static ConnectTip(CValidationState& state, const CChainParams& chainparams,
                 InvalidBlockFound(pindexNew, state);
             return error("ConnectTip(): ConnectBlock %s failed", pindexNew->GetBlockHash().ToString());
         }
-        mapBlockSource.erase(pindexNew->GetBlockHash());
         nTime3 = GetTimeMicros(); nTimeConnectTotal += nTime3 - nTime2;
         LogPrint("bench", "  - Connect total: %.2fms [%.2fs]\n", (nTime3 - nTime2) * 0.001, nTimeConnectTotal * 0.000001);
         assert(view.Flush());
@@ -4687,6 +4675,26 @@ void PeerLogicValidation::UpdatedBlockTip(const CBlockIndex *pindexNew, const CB
     }
 }
 
+void PeerLogicValidation::BlockChecked(const CBlock& block, const CValidationState& state) {
+    LOCK(cs_main);
+
+    const uint256 hash(block.GetHash());
+    std::map<uint256, NodeId>::iterator it = mapBlockSource.find(hash);
+
+    int nDoS = 0;
+    if (state.IsInvalid(nDoS)) {
+        if (it != mapBlockSource.end() && State(it->second)) {
+            assert (state.GetRejectCode() < REJECT_INTERNAL); // Blocks are never rejected with internal reject codes
+            CBlockReject reject = {(unsigned char)state.GetRejectCode(), state.GetRejectReason().substr(0, MAX_REJECT_MESSAGE_LENGTH), hash};
+            State(it->second)->rejects.push_back(reject);
+            if (nDoS > 0)
+                Misbehaving(it->second, nDoS);
+        }
+    }
+    if (it != mapBlockSource.end())
+        mapBlockSource.erase(it);
+}
+
 //////////////////////////////////////////////////////////////////////////////
 //
 // Messages
diff --git a/src/main.h b/src/main.h
index 77179b25b98d8..889b6a2da1bf4 100644
--- a/src/main.h
+++ b/src/main.h
@@ -536,6 +536,7 @@ class PeerLogicValidation : public CValidationInterface {
     PeerLogicValidation(CConnman* connmanIn) : connman(connmanIn) {}
 
     virtual void UpdatedBlockTip(const CBlockIndex *pindexNew, const CBlockIndex *pindexFork, bool fInitialDownload);
+    virtual void BlockChecked(const CBlock& block, const CValidationState& state);
 };
 
 struct CNodeStateStats {

From 6976db2f4687d575e1b4bee5aaf1d93a794f23c3 Mon Sep 17 00:00:00 2001
From: Suhas Daftuar <sdaftuar@gmail.com>
Date: Tue, 4 Oct 2016 15:17:19 -0400
Subject: [PATCH 0995/1802] [qa] Another attempt to fix race condition in
 p2p-compactblocks.py

sync_with_ping() only guarantees that the node has processed messages
it's received from the peer, not that block announcements from the node have
made it back to the peer.  Replace sync_with_ping() with an explicit check that
the node's tip has been announced.
---
 qa/rpc-tests/p2p-compactblocks.py | 24 ++++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/qa/rpc-tests/p2p-compactblocks.py b/qa/rpc-tests/p2p-compactblocks.py
index ac4655a841ec5..cd680437696a6 100755
--- a/qa/rpc-tests/p2p-compactblocks.py
+++ b/qa/rpc-tests/p2p-compactblocks.py
@@ -28,6 +28,10 @@ def __init__(self):
         self.last_getblocktxn = None
         self.last_block = None
         self.last_blocktxn = None
+        # Store the hashes of blocks we've seen announced.
+        # This is for synchronizing the p2p message traffic,
+        # so we can eg wait until a particular block is announced.
+        self.set_announced_blockhashes = set()
 
     def on_sendcmpct(self, conn, message):
         self.last_sendcmpct = message
@@ -38,14 +42,22 @@ def on_block(self, conn, message):
     def on_cmpctblock(self, conn, message):
         self.last_cmpctblock = message
         self.block_announced = True
+        self.last_cmpctblock.header_and_shortids.header.calc_sha256()
+        self.set_announced_blockhashes.add(self.last_cmpctblock.header_and_shortids.header.sha256)
 
     def on_headers(self, conn, message):
         self.last_headers = message
         self.block_announced = True
+        for x in self.last_headers.headers:
+            x.calc_sha256()
+            self.set_announced_blockhashes.add(x.sha256)
 
     def on_inv(self, conn, message):
         self.last_inv = message
-        self.block_announced = True
+        for x in self.last_inv.inv:
+            if x.type == 2:
+                self.block_announced = True
+                self.set_announced_blockhashes.add(x.hash)
 
     def on_getdata(self, conn, message):
         self.last_getdata = message
@@ -85,6 +97,12 @@ def request_headers_and_sync(self, locator, hashstop=0):
         assert(self.received_block_announcement())
         self.clear_block_announcement()
 
+    # Block until a block announcement for a particular block hash is
+    # received.
+    def wait_for_block_announcement(self, block_hash, timeout=30):
+        def received_hash():
+            return (block_hash in self.set_announced_blockhashes)
+        return wait_until(received_hash, timeout=timeout)
 
 class CompactBlocksTest(BitcoinTestFramework):
     def __init__(self):
@@ -237,7 +255,9 @@ def test_compactblock_construction(self):
         for i in range(num_transactions):
             self.nodes[0].sendtoaddress(address, 0.1)
 
-        self.test_node.sync_with_ping()
+        # Wait until we've seen the block announcement for the resulting tip
+        tip = int(self.nodes[0].getbestblockhash(), 16)
+        assert(self.test_node.wait_for_block_announcement(tip))
 
         # Now mine a block, and look at the resulting compact block.
         self.test_node.clear_block_announcement()

From 1880aeb0336324ed543c7d181c7b1509bc1cce7a Mon Sep 17 00:00:00 2001
From: Luke Dashjr <luke-jr+git@utopios.org>
Date: Thu, 8 Sep 2016 07:17:33 +0000
Subject: [PATCH 0996/1802] Qt: Get the private key for signing messages via
 WalletModel

---
 src/qt/signverifymessagedialog.cpp | 2 +-
 src/qt/walletmodel.cpp             | 5 +++++
 src/qt/walletmodel.h               | 1 +
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/qt/signverifymessagedialog.cpp b/src/qt/signverifymessagedialog.cpp
index 96f50a26563ff..fa8cf9d6866e5 100644
--- a/src/qt/signverifymessagedialog.cpp
+++ b/src/qt/signverifymessagedialog.cpp
@@ -142,7 +142,7 @@ void SignVerifyMessageDialog::on_signMessageButton_SM_clicked()
     }
 
     CKey key;
-    if (!pwalletMain->GetKey(keyID, key))
+    if (!model->getPrivKey(keyID, key))
     {
         ui->statusLabel_SM->setStyleSheet("QLabel { color: red; }");
         ui->statusLabel_SM->setText(tr("Private key for the entered address is not available."));
diff --git a/src/qt/walletmodel.cpp b/src/qt/walletmodel.cpp
index 690ea0811e9a8..62655be5178e8 100644
--- a/src/qt/walletmodel.cpp
+++ b/src/qt/walletmodel.cpp
@@ -563,6 +563,11 @@ bool WalletModel::havePrivKey(const CKeyID &address) const
     return wallet->HaveKey(address);
 }
 
+bool WalletModel::getPrivKey(const CKeyID &address, CKey& vchPrivKeyOut) const
+{
+    return wallet->GetKey(address, vchPrivKeyOut);
+}
+
 // returns a list of COutputs from COutPoints
 void WalletModel::getOutputs(const std::vector<COutPoint>& vOutpoints, std::vector<COutput>& vOutputs)
 {
diff --git a/src/qt/walletmodel.h b/src/qt/walletmodel.h
index a5e877d81f6aa..f15e5fc6f4d64 100644
--- a/src/qt/walletmodel.h
+++ b/src/qt/walletmodel.h
@@ -188,6 +188,7 @@ class WalletModel : public QObject
 
     bool getPubKey(const CKeyID &address, CPubKey& vchPubKeyOut) const;
     bool havePrivKey(const CKeyID &address) const;
+    bool getPrivKey(const CKeyID &address, CKey& vchPrivKeyOut) const;
     void getOutputs(const std::vector<COutPoint>& vOutpoints, std::vector<COutput>& vOutputs);
     bool isSpent(const COutPoint& outpoint) const;
     void listCoins(std::map<QString, std::vector<COutput> >& mapCoins) const;

From 178cd887eca1123fde39f530ee2b198db48363fe Mon Sep 17 00:00:00 2001
From: Luke Dashjr <luke-jr+git@utopios.org>
Date: Thu, 8 Sep 2016 19:58:30 +0000
Subject: [PATCH 0997/1802] Qt/splash: Specifically keep track of which
 wallet(s) we are connected to for later disconnecting

---
 src/qt/splashscreen.cpp | 12 +++++++-----
 src/qt/splashscreen.h   |  5 +++++
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/qt/splashscreen.cpp b/src/qt/splashscreen.cpp
index c15b64c327f76..69ed44b81f9df 100644
--- a/src/qt/splashscreen.cpp
+++ b/src/qt/splashscreen.cpp
@@ -151,9 +151,10 @@ static void ShowProgress(SplashScreen *splash, const std::string &title, int nPr
 }
 
 #ifdef ENABLE_WALLET
-static void ConnectWallet(SplashScreen *splash, CWallet* wallet)
+void SplashScreen::ConnectWallet(CWallet* wallet)
 {
-    wallet->ShowProgress.connect(boost::bind(ShowProgress, splash, _1, _2));
+    wallet->ShowProgress.connect(boost::bind(ShowProgress, this, _1, _2));
+    connectedWallets.push_back(wallet);
 }
 #endif
 
@@ -163,7 +164,7 @@ void SplashScreen::subscribeToCoreSignals()
     uiInterface.InitMessage.connect(boost::bind(InitMessage, this, _1));
     uiInterface.ShowProgress.connect(boost::bind(ShowProgress, this, _1, _2));
 #ifdef ENABLE_WALLET
-    uiInterface.LoadWallet.connect(boost::bind(ConnectWallet, this, _1));
+    uiInterface.LoadWallet.connect(boost::bind(&SplashScreen::ConnectWallet, this, _1));
 #endif
 }
 
@@ -173,8 +174,9 @@ void SplashScreen::unsubscribeFromCoreSignals()
     uiInterface.InitMessage.disconnect(boost::bind(InitMessage, this, _1));
     uiInterface.ShowProgress.disconnect(boost::bind(ShowProgress, this, _1, _2));
 #ifdef ENABLE_WALLET
-    if(pwalletMain)
-        pwalletMain->ShowProgress.disconnect(boost::bind(ShowProgress, this, _1, _2));
+    Q_FOREACH(CWallet* const & pwallet, connectedWallets) {
+        pwallet->ShowProgress.disconnect(boost::bind(ShowProgress, this, _1, _2));
+    }
 #endif
 }
 
diff --git a/src/qt/splashscreen.h b/src/qt/splashscreen.h
index 29d16d4eae2d6..8761343a7aafa 100644
--- a/src/qt/splashscreen.h
+++ b/src/qt/splashscreen.h
@@ -7,6 +7,7 @@
 
 #include <QSplashScreen>
 
+class CWallet;
 class NetworkStyle;
 
 /** Class for the splashscreen with information of the running client.
@@ -39,11 +40,15 @@ public Q_SLOTS:
     void subscribeToCoreSignals();
     /** Disconnect core signals to splash screen */
     void unsubscribeFromCoreSignals();
+    /** Connect wallet signals to splash screen */
+    void ConnectWallet(CWallet*);
 
     QPixmap pixmap;
     QString curMessage;
     QColor curColor;
     int curAlignment;
+
+    QList<CWallet*> connectedWallets;
 };
 
 #endif // BITCOIN_QT_SPLASHSCREEN_H

From a78e5428acb862bfb47e6faff39f4889f5c73269 Mon Sep 17 00:00:00 2001
From: Luke Dashjr <luke-jr+git@utopios.org>
Date: Tue, 4 Oct 2016 22:20:07 +0000
Subject: [PATCH 0998/1802] Bugfix: Trivial: RPC: getblockchaininfo help:
 pruneheight is the lowest, not highest, block

---
 src/rpc/blockchain.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp
index 20eefa1c574c5..675d9ba904c8c 100644
--- a/src/rpc/blockchain.cpp
+++ b/src/rpc/blockchain.cpp
@@ -892,7 +892,7 @@ UniValue getblockchaininfo(const UniValue& params, bool fHelp)
             "  \"verificationprogress\": xxxx, (numeric) estimate of verification progress [0..1]\n"
             "  \"chainwork\": \"xxxx\"     (string) total amount of work in active chain, in hexadecimal\n"
             "  \"pruned\": xx,             (boolean) if the blocks are subject to pruning\n"
-            "  \"pruneheight\": xxxxxx,    (numeric) heighest block available\n"
+            "  \"pruneheight\": xxxxxx,    (numeric) lowest-height complete block stored\n"
             "  \"softforks\": [            (array) status of softforks in progress\n"
             "     {\n"
             "        \"id\": \"xxxx\",        (string) name of softfork\n"

From cb78c60534e5be205f9190cb0cde700f9e9fa38d Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Tue, 4 Oct 2016 19:27:11 -0400
Subject: [PATCH 0999/1802] gui: fix ban from qt console

Rather than doing a circle and re-resolving the node's IP, just use the one
from nodestats directly.

This requires syncing the addr field from CNode.
---
 src/net.cpp           |  1 +
 src/net.h             |  1 +
 src/qt/rpcconsole.cpp | 25 +++++++++++++------------
 3 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/src/net.cpp b/src/net.cpp
index 770e2d2959998..19dd040997ad1 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -629,6 +629,7 @@ void CNode::copyStats(CNodeStats &stats)
 {
     stats.nodeid = this->GetId();
     X(nServices);
+    X(addr);
     X(fRelayTxes);
     X(nLastSend);
     X(nLastRecv);
diff --git a/src/net.h b/src/net.h
index d0b2773623f43..67f0abe4be820 100644
--- a/src/net.h
+++ b/src/net.h
@@ -505,6 +505,7 @@ class CNodeStats
     double dPingWait;
     double dPingMin;
     std::string addrLocal;
+    CAddress addr;
 };
 
 
diff --git a/src/qt/rpcconsole.cpp b/src/qt/rpcconsole.cpp
index ace9f1ceaad6b..b6ed75535c8d1 100644
--- a/src/qt/rpcconsole.cpp
+++ b/src/qt/rpcconsole.cpp
@@ -981,20 +981,21 @@ void RPCConsole::banSelectedNode(int bantime)
     if (!clientModel || !g_connman)
         return;
 
-    // Get currently selected peer address
-    QString strNode = GUIUtil::getEntryData(ui->peerWidget, 0, PeerTableModel::Address).toString();
-    // Find possible nodes, ban it and clear the selected node
-    std::string nStr = strNode.toStdString();
-    std::string addr;
-    int port = 0;
-    SplitHostPort(nStr, port, addr);
+    if(cachedNodeid == -1)
+        return;
 
-    CNetAddr resolved;
-    if(!LookupHost(addr.c_str(), resolved, false))
+    // Get currently selected peer address
+    int detailNodeRow = clientModel->getPeerTableModel()->getRowByNodeId(cachedNodeid);
+    if(detailNodeRow < 0)
         return;
-    g_connman->Ban(resolved, BanReasonManuallyAdded, bantime);
-    clearSelectedNode();
-    clientModel->getBanTableModel()->refresh();
+
+    // Find possible nodes, ban it and clear the selected node
+    const CNodeCombinedStats *stats = clientModel->getPeerTableModel()->getNodeStats(detailNodeRow);
+    if(stats) {
+        g_connman->Ban(stats->nodeStats.addr, BanReasonManuallyAdded, bantime);
+        clearSelectedNode();
+        clientModel->getBanTableModel()->refresh();
+    }
 }
 
 void RPCConsole::unbanSelectedNode()

From f2e939bdbceef1ee90d59fab9ab99b944b44bce1 Mon Sep 17 00:00:00 2001
From: fanquake <fanquake@gmail.com>
Date: Wed, 5 Oct 2016 12:59:44 +0800
Subject: [PATCH 1000/1802] [Doc] Update Doxygen configuration file

---
 doc/Doxyfile | 2746 +++++++++++++++++++++++++++++++-------------------
 1 file changed, 1727 insertions(+), 1019 deletions(-)

diff --git a/doc/Doxyfile b/doc/Doxyfile
index 22850db835429..a0cbf7139a42c 100644
--- a/doc/Doxyfile
+++ b/doc/Doxyfile
@@ -1,106 +1,122 @@
-# Doxyfile 1.7.4
-
-# !!! Invoke doxygen from project root using: 
-#    doxygen doc/Doxyfile
+# Doxyfile 1.8.12
 
 # This file describes the settings to be used by the documentation system
-# doxygen (www.doxygen.org) for a project
+# doxygen (www.doxygen.org) for a project.
+#
+# All text after a double hash (##) is considered a comment and is placed in
+# front of the TAG it is preceding.
 #
-# All text after a hash (#) is considered a comment and will be ignored
+# All text after a single hash (#) is considered a comment and will be ignored.
 # The format is:
-#       TAG = value [value, ...]
-# For lists items can also be appended using:
-#       TAG += value [value, ...]
-# Values that contain spaces should be placed between quotes (" ")
+# TAG = value [value, ...]
+# For lists, items can also be appended using:
+# TAG += value [value, ...]
+# Values that contain spaces should be placed between quotes (\" \").
 
 #---------------------------------------------------------------------------
 # Project related configuration options
 #---------------------------------------------------------------------------
 
-# This tag specifies the encoding used for all characters in the config file 
-# that follow. The default is UTF-8 which is also the encoding used for all 
-# text before the first occurrence of this tag. Doxygen uses libiconv (or the 
-# iconv built into libc) for the transcoding. See 
-# http://www.gnu.org/software/libiconv for the list of possible encodings.
+# This tag specifies the encoding used for all characters in the config file
+# that follow. The default is UTF-8 which is also the encoding used for all text
+# before the first occurrence of this tag. Doxygen uses libiconv (or the iconv
+# built into libc) for the transcoding. See http://www.gnu.org/software/libiconv
+# for the list of possible encodings.
+# The default value is: UTF-8.
 
 DOXYFILE_ENCODING      = UTF-8
 
-# The PROJECT_NAME tag is a single word (or a sequence of words surrounded 
-# by quotes) that should identify the project.
+# The PROJECT_NAME tag is a single word (or a sequence of words surrounded by
+# double-quotes, unless you are using Doxywizard) that should identify the
+# project for which the documentation is generated. This name is used in the
+# title of most generated pages and in a few other places.
+# The default value is: My Project.
 
 PROJECT_NAME           = Bitcoin
 
-# The PROJECT_NUMBER tag can be used to enter a project or revision number. 
-# This could be handy for archiving the generated documentation or 
-# if some version control system is used.
+# The PROJECT_NUMBER tag can be used to enter a project or revision number. This
+# could be handy for archiving the generated documentation or if some version
+# control system is used.
 
 PROJECT_NUMBER         = 0.13.99
 
-# Using the PROJECT_BRIEF tag one can provide an optional one line description 
-# for a project that appears at the top of each page and should give viewer 
-# a quick idea about the purpose of the project. Keep the description short.
+# Using the PROJECT_BRIEF tag one can provide an optional one line description
+# for a project that appears at the top of each page and should give viewer a
+# quick idea about the purpose of the project. Keep the description short.
 
 PROJECT_BRIEF          = "P2P Digital Currency"
 
-# With the PROJECT_LOGO tag one can specify an logo or icon that is 
-# included in the documentation. The maximum height of the logo should not 
-# exceed 55 pixels and the maximum width should not exceed 200 pixels. 
-# Doxygen will copy the logo to the output directory.
+# With the PROJECT_LOGO tag one can specify a logo or an icon that is included
+# in the documentation. The maximum height of the logo should not exceed 55
+# pixels and the maximum width should not exceed 200 pixels. Doxygen will copy
+# the logo to the output directory.
 
 PROJECT_LOGO           = doc/bitcoin_logo_doxygen.png
 
-# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) 
-# base path where the generated documentation will be put. 
-# If a relative path is entered, it will be relative to the location 
-# where doxygen was started. If left blank the current directory will be used.
+# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path
+# into which the generated documentation will be written. If a relative path is
+# entered, it will be relative to the location where doxygen was started. If
+# left blank the current directory will be used.
 
 OUTPUT_DIRECTORY       = doc/doxygen
 
-# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create 
-# 4096 sub-directories (in 2 levels) under the output directory of each output 
-# format and will distribute the generated files over these directories. 
-# Enabling this option can be useful when feeding doxygen a huge amount of 
-# source files, where putting all generated files in the same directory would 
-# otherwise cause performance problems for the file system.
+# If the CREATE_SUBDIRS tag is set to YES then doxygen will create 4096 sub-
+# directories (in 2 levels) under the output directory of each output format and
+# will distribute the generated files over these directories. Enabling this
+# option can be useful when feeding doxygen a huge amount of source files, where
+# putting all generated files in the same directory would otherwise causes
+# performance problems for the file system.
+# The default value is: NO.
 
 CREATE_SUBDIRS         = NO
 
-# The OUTPUT_LANGUAGE tag is used to specify the language in which all 
-# documentation generated by doxygen is written. Doxygen will use this 
-# information to generate all constant output in the proper language. 
-# The default language is English, other supported languages are: 
-# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional, 
-# Croatian, Czech, Danish, Dutch, Esperanto, Farsi, Finnish, French, German, 
-# Greek, Hungarian, Italian, Japanese, Japanese-en (Japanese with English 
-# messages), Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian, 
-# Polish, Portuguese, Romanian, Russian, Serbian, Serbian-Cyrillic, Slovak, 
-# Slovene, Spanish, Swedish, Ukrainian, and Vietnamese.
+# If the ALLOW_UNICODE_NAMES tag is set to YES, doxygen will allow non-ASCII
+# characters to appear in the names of generated files. If set to NO, non-ASCII
+# characters will be escaped, for example _xE3_x81_x84 will be used for Unicode
+# U+3044.
+# The default value is: NO.
+
+ALLOW_UNICODE_NAMES    = NO
+
+# The OUTPUT_LANGUAGE tag is used to specify the language in which all
+# documentation generated by doxygen is written. Doxygen will use this
+# information to generate all constant output in the proper language.
+# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Catalan, Chinese,
+# Chinese-Traditional, Croatian, Czech, Danish, Dutch, English (United States),
+# Esperanto, Farsi (Persian), Finnish, French, German, Greek, Hungarian,
+# Indonesian, Italian, Japanese, Japanese-en (Japanese with English messages),
+# Korean, Korean-en (Korean with English messages), Latvian, Lithuanian,
+# Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese, Romanian, Russian,
+# Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish, Swedish, Turkish,
+# Ukrainian and Vietnamese.
+# The default value is: English.
 
 OUTPUT_LANGUAGE        = English
 
-# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will 
-# include brief member descriptions after the members that are listed in 
-# the file and class documentation (similar to JavaDoc). 
-# Set to NO to disable this.
+# If the BRIEF_MEMBER_DESC tag is set to YES, doxygen will include brief member
+# descriptions after the members that are listed in the file and class
+# documentation (similar to Javadoc). Set to NO to disable this.
+# The default value is: YES.
 
 BRIEF_MEMBER_DESC      = YES
 
-# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend 
-# the brief description of a member or function before the detailed description. 
-# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the 
+# If the REPEAT_BRIEF tag is set to YES, doxygen will prepend the brief
+# description of a member or function before the detailed description
+#
+# Note: If both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
 # brief descriptions will be completely suppressed.
+# The default value is: YES.
 
 REPEAT_BRIEF           = YES
 
-# This tag implements a quasi-intelligent brief description abbreviator 
-# that is used to form the text in various listings. Each string 
-# in this list, if found as the leading text of the brief description, will be 
-# stripped from the text and the result after processing the whole list, is 
-# used as the annotated text. Otherwise, the brief description is used as-is. 
-# If left blank, the following values are used ("$name" is automatically 
-# replaced with the name of the entity): "The $name class" "The $name widget" 
-# "The $name file" "is" "provides" "specifies" "contains" 
-# "represents" "a" "an" "the"
+# This tag implements a quasi-intelligent brief description abbreviator that is
+# used to form the text in various listings. Each string in this list, if found
+# as the leading text of the brief description, will be stripped from the text
+# and the result, after processing the whole list, is used as the annotated
+# text. Otherwise, the brief description is used as-is. If left blank, the
+# following values are used ($name is automatically replaced with the name of
+# the entity):The $name class, The $name widget, The $name file, is, provides,
+# specifies, contains, represents, a, an and the.
 
 ABBREVIATE_BRIEF       = "The $name class" \
                          "The $name widget" \
@@ -114,531 +130,690 @@ ABBREVIATE_BRIEF       = "The $name class" \
                          an \
                          the
 
-# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then 
-# Doxygen will generate a detailed section even if there is only a brief 
+# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then
+# doxygen will generate a detailed section even if there is only a brief
 # description.
+# The default value is: NO.
 
 ALWAYS_DETAILED_SEC    = NO
 
-# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all 
-# inherited members of a class in the documentation of that class as if those 
-# members were ordinary class members. Constructors, destructors and assignment 
+# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all
+# inherited members of a class in the documentation of that class as if those
+# members were ordinary class members. Constructors, destructors and assignment
 # operators of the base classes will not be shown.
+# The default value is: NO.
 
 INLINE_INHERITED_MEMB  = NO
 
-# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full 
-# path before files name in the file list and in the header files. If set 
-# to NO the shortest path that makes the file name unique will be used.
+# If the FULL_PATH_NAMES tag is set to YES, doxygen will prepend the full path
+# before files name in the file list and in the header files. If set to NO the
+# shortest path that makes the file name unique will be used
+# The default value is: YES.
 
 FULL_PATH_NAMES        = YES
 
-# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag 
-# can be used to strip a user-defined part of the path. Stripping is 
-# only done if one of the specified strings matches the left-hand part of 
-# the path. The tag can be used to show relative paths in the file list. 
-# If left blank the directory from which doxygen is run is used as the 
-# path to strip.
+# The STRIP_FROM_PATH tag can be used to strip a user-defined part of the path.
+# Stripping is only done if one of the specified strings matches the left-hand
+# part of the path. The tag can be used to show relative paths in the file list.
+# If left blank the directory from which doxygen is run is used as the path to
+# strip.
+#
+# Note that you can specify absolute paths here, but also relative paths, which
+# will be relative from the directory where doxygen is started.
+# This tag requires that the tag FULL_PATH_NAMES is set to YES.
 
-STRIP_FROM_PATH        = 
+STRIP_FROM_PATH        =
 
-# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of 
-# the path mentioned in the documentation of a class, which tells 
-# the reader which header file to include in order to use a class. 
-# If left blank only the name of the header file containing the class 
-# definition is used. Otherwise one should specify the include paths that 
-# are normally passed to the compiler using the -I flag.
+# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of the
+# path mentioned in the documentation of a class, which tells the reader which
+# header file to include in order to use a class. If left blank only the name of
+# the header file containing the class definition is used. Otherwise one should
+# specify the list of include paths that are normally passed to the compiler
+# using the -I flag.
 
-STRIP_FROM_INC_PATH    = 
+STRIP_FROM_INC_PATH    =
 
-# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter 
-# (but less readable) file names. This can be useful if your file system 
-# doesn't support long names like on DOS, Mac, or CD-ROM.
+# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter (but
+# less readable) file names. This can be useful is your file systems doesn't
+# support long names like on DOS, Mac, or CD-ROM.
+# The default value is: NO.
 
 SHORT_NAMES            = NO
 
-# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen 
-# will interpret the first line (until the first dot) of a JavaDoc-style 
-# comment as the brief description. If set to NO, the JavaDoc 
-# comments will behave just like regular Qt-style comments 
-# (thus requiring an explicit @brief command for a brief description.)
+# If the JAVADOC_AUTOBRIEF tag is set to YES then doxygen will interpret the
+# first line (until the first dot) of a Javadoc-style comment as the brief
+# description. If set to NO, the Javadoc-style will behave just like regular Qt-
+# style comments (thus requiring an explicit @brief command for a brief
+# description.)
+# The default value is: NO.
 
 JAVADOC_AUTOBRIEF      = YES
 
-# If the QT_AUTOBRIEF tag is set to YES then Doxygen will 
-# interpret the first line (until the first dot) of a Qt-style 
-# comment as the brief description. If set to NO, the comments 
-# will behave just like regular Qt-style comments (thus requiring 
-# an explicit \brief command for a brief description.)
+# If the QT_AUTOBRIEF tag is set to YES then doxygen will interpret the first
+# line (until the first dot) of a Qt-style comment as the brief description. If
+# set to NO, the Qt-style will behave just like regular Qt-style comments (thus
+# requiring an explicit \brief command for a brief description.)
+# The default value is: NO.
 
 QT_AUTOBRIEF           = NO
 
-# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen 
-# treat a multi-line C++ special comment block (i.e. a block of //! or /// 
-# comments) as a brief description. This used to be the default behaviour. 
-# The new default is to treat a multi-line C++ comment block as a detailed 
-# description. Set this tag to YES if you prefer the old behaviour instead.
+# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make doxygen treat a
+# multi-line C++ special comment block (i.e. a block of //! or /// comments) as
+# a brief description. This used to be the default behavior. The new default is
+# to treat a multi-line C++ comment block as a detailed description. Set this
+# tag to YES if you prefer the old behavior instead.
+#
+# Note that setting this tag to YES also means that rational rose comments are
+# not recognized any more.
+# The default value is: NO.
 
 MULTILINE_CPP_IS_BRIEF = NO
 
-# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented 
-# member inherits the documentation from any documented member that it 
-# re-implements.
+# If the INHERIT_DOCS tag is set to YES then an undocumented member inherits the
+# documentation from any documented member that it re-implements.
+# The default value is: YES.
 
 INHERIT_DOCS           = YES
 
-# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce 
-# a new page for each member. If set to NO, the documentation of a member will 
-# be part of the file/class/namespace that contains it.
+# If the SEPARATE_MEMBER_PAGES tag is set to YES then doxygen will produce a new
+# page for each member. If set to NO, the documentation of a member will be part
+# of the file/class/namespace that contains it.
+# The default value is: NO.
 
 SEPARATE_MEMBER_PAGES  = NO
 
-# The TAB_SIZE tag can be used to set the number of spaces in a tab. 
-# Doxygen uses this value to replace tabs by spaces in code fragments.
+# The TAB_SIZE tag can be used to set the number of spaces in a tab. Doxygen
+# uses this value to replace tabs by spaces in code fragments.
+# Minimum value: 1, maximum value: 16, default value: 4.
 
 TAB_SIZE               = 8
 
-# This tag can be used to specify a number of aliases that acts 
-# as commands in the documentation. An alias has the form "name=value". 
-# For example adding "sideeffect=\par Side Effects:\n" will allow you to 
-# put the command \sideeffect (or @sideeffect) in the documentation, which 
-# will result in a user-defined paragraph with heading "Side Effects:". 
-# You can put \n in the value part of an alias to insert newlines.
+# This tag can be used to specify a number of aliases that act as commands in
+# the documentation. An alias has the form:
+# name=value
+# For example adding
+# "sideeffect=@par Side Effects:\n"
+# will allow you to put the command \sideeffect (or @sideeffect) in the
+# documentation, which will result in a user-defined paragraph with heading
+# "Side Effects:". You can put \n's in the value part of an alias to insert
+# newlines.
+
+ALIASES                =
+
+# This tag can be used to specify a number of word-keyword mappings (TCL only).
+# A mapping has the form "name=value". For example adding "class=itcl::class"
+# will allow you to use the command class in the itcl::class meaning.
 
-ALIASES                = 
+TCL_SUBST              =
 
-# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C 
-# sources only. Doxygen will then generate output that is more tailored for C. 
-# For instance, some of the names that are used will be different. The list 
-# of all members will be omitted, etc.
+# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
+# only. Doxygen will then generate output that is more tailored for C. For
+# instance, some of the names that are used will be different. The list of all
+# members will be omitted, etc.
+# The default value is: NO.
 
 OPTIMIZE_OUTPUT_FOR_C  = NO
 
-# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java 
-# sources only. Doxygen will then generate output that is more tailored for 
-# Java. For instance, namespaces will be presented as packages, qualified 
-# scopes will look different, etc.
+# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java or
+# Python sources only. Doxygen will then generate output that is more tailored
+# for that language. For instance, namespaces will be presented as packages,
+# qualified scopes will look different, etc.
+# The default value is: NO.
 
 OPTIMIZE_OUTPUT_JAVA   = NO
 
-# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran 
-# sources only. Doxygen will then generate output that is more tailored for 
-# Fortran.
+# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran
+# sources. Doxygen will then generate output that is tailored for Fortran.
+# The default value is: NO.
 
 OPTIMIZE_FOR_FORTRAN   = NO
 
-# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL 
-# sources. Doxygen will then generate output that is tailored for 
-# VHDL.
+# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL
+# sources. Doxygen will then generate output that is tailored for VHDL.
+# The default value is: NO.
 
 OPTIMIZE_OUTPUT_VHDL   = NO
 
-# Doxygen selects the parser to use depending on the extension of the files it 
-# parses. With this tag you can assign which parser to use for a given extension. 
-# Doxygen has a built-in mapping, but you can override or extend it using this 
-# tag. The format is ext=language, where ext is a file extension, and language 
-# is one of the parsers supported by doxygen: IDL, Java, Javascript, CSharp, C, 
-# C++, D, PHP, Objective-C, Python, Fortran, VHDL, C, C++. For instance to make 
-# doxygen treat .inc files as Fortran files (default is PHP), and .f files as C 
-# (default is Fortran), use: inc=Fortran f=C. Note that for custom extensions 
-# you also need to set FILE_PATTERNS otherwise the files are not read by doxygen.
-
-EXTENSION_MAPPING      = 
-
-# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want 
-# to include (a tag file for) the STL sources as input, then you should 
-# set this tag to YES in order to let doxygen match functions declarations and 
-# definitions whose arguments contain STL classes (e.g. func(std::string); v.s. 
-# func(std::string) {}). This also makes the inheritance and collaboration 
+# Doxygen selects the parser to use depending on the extension of the files it
+# parses. With this tag you can assign which parser to use for a given
+# extension. Doxygen has a built-in mapping, but you can override or extend it
+# using this tag. The format is ext=language, where ext is a file extension, and
+# language is one of the parsers supported by doxygen: IDL, Java, Javascript,
+# C#, C, C++, D, PHP, Objective-C, Python, Fortran (fixed format Fortran:
+# FortranFixed, free formatted Fortran: FortranFree, unknown formatted Fortran:
+# Fortran. In the later case the parser tries to guess whether the code is fixed
+# or free formatted code, this is the default for Fortran type files), VHDL. For
+# instance to make doxygen treat .inc files as Fortran files (default is PHP),
+# and .f files as C (default is Fortran), use: inc=Fortran f=C.
+#
+# Note: For files without extension you can use no_extension as a placeholder.
+#
+# Note that for custom extensions you also need to set FILE_PATTERNS otherwise
+# the files are not read by doxygen.
+
+EXTENSION_MAPPING      =
+
+# If the MARKDOWN_SUPPORT tag is enabled then doxygen pre-processes all comments
+# according to the Markdown format, which allows for more readable
+# documentation. See http://daringfireball.net/projects/markdown/ for details.
+# The output of markdown processing is further processed by doxygen, so you can
+# mix doxygen, HTML, and XML commands with Markdown formatting. Disable only in
+# case of backward compatibilities issues.
+# The default value is: YES.
+
+MARKDOWN_SUPPORT       = YES
+
+# When the TOC_INCLUDE_HEADINGS tag is set to a non-zero value, all headings up
+# to that level are automatically included in the table of contents, even if
+# they do not have an id attribute.
+# Note: This feature currently applies only to Markdown headings.
+# Minimum value: 0, maximum value: 99, default value: 0.
+# This tag requires that the tag MARKDOWN_SUPPORT is set to YES.
+
+TOC_INCLUDE_HEADINGS   = 0
+
+# When enabled doxygen tries to link words that correspond to documented
+# classes, or namespaces to their corresponding documentation. Such a link can
+# be prevented in individual cases by putting a % sign in front of the word or
+# globally by setting AUTOLINK_SUPPORT to NO.
+# The default value is: YES.
+
+AUTOLINK_SUPPORT       = YES
+
+# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want
+# to include (a tag file for) the STL sources as input, then you should set this
+# tag to YES in order to let doxygen match functions declarations and
+# definitions whose arguments contain STL classes (e.g. func(std::string);
+# versus func(std::string) {}). This also make the inheritance and collaboration
 # diagrams that involve STL classes more complete and accurate.
+# The default value is: NO.
 
 BUILTIN_STL_SUPPORT    = NO
 
-# If you use Microsoft's C++/CLI language, you should set this option to YES to 
+# If you use Microsoft's C++/CLI language, you should set this option to YES to
 # enable parsing support.
+# The default value is: NO.
 
 CPP_CLI_SUPPORT        = NO
 
-# Set the SIP_SUPPORT tag to YES if your project consists of sip sources only. 
-# Doxygen will parse them like normal C++ but will assume all classes use public 
-# instead of private inheritance when no explicit protection keyword is present.
+# Set the SIP_SUPPORT tag to YES if your project consists of sip (see:
+# http://www.riverbankcomputing.co.uk/software/sip/intro) sources only. Doxygen
+# will parse them like normal C++ but will assume all classes use public instead
+# of private inheritance when no explicit protection keyword is present.
+# The default value is: NO.
 
 SIP_SUPPORT            = NO
 
-# For Microsoft's IDL there are propget and propput attributes to indicate getter 
-# and setter methods for a property. Setting this option to YES (the default) 
-# will make doxygen replace the get and set methods by a property in the 
-# documentation. This will only work if the methods are indeed getting or 
-# setting a simple type. If this is not the case, or you want to show the 
-# methods anyway, you should set this option to NO.
+# For Microsoft's IDL there are propget and propput attributes to indicate
+# getter and setter methods for a property. Setting this option to YES will make
+# doxygen to replace the get and set methods by a property in the documentation.
+# This will only work if the methods are indeed getting or setting a simple
+# type. If this is not the case, or you want to show the methods anyway, you
+# should set this option to NO.
+# The default value is: YES.
 
 IDL_PROPERTY_SUPPORT   = YES
 
-# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC 
-# tag is set to YES, then doxygen will reuse the documentation of the first 
-# member in the group (if any) for the other members of the group. By default 
+# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC
+# tag is set to YES then doxygen will reuse the documentation of the first
+# member in the group (if any) for the other members of the group. By default
 # all members of a group must be documented explicitly.
+# The default value is: NO.
 
 DISTRIBUTE_GROUP_DOC   = NO
 
-# Set the SUBGROUPING tag to YES (the default) to allow class member groups of 
-# the same type (for instance a group of public functions) to be put as a 
-# subgroup of that type (e.g. under the Public Functions section). Set it to 
-# NO to prevent subgrouping. Alternatively, this can be done per class using 
-# the \nosubgrouping command.
+# If one adds a struct or class to a group and this option is enabled, then also
+# any nested class or struct is added to the same group. By default this option
+# is disabled and one has to add nested compounds explicitly via \ingroup.
+# The default value is: NO.
+
+GROUP_NESTED_COMPOUNDS = NO
+
+# Set the SUBGROUPING tag to YES to allow class member groups of the same type
+# (for instance a group of public functions) to be put as a subgroup of that
+# type (e.g. under the Public Functions section). Set it to NO to prevent
+# subgrouping. Alternatively, this can be done per class using the
+# \nosubgrouping command.
+# The default value is: YES.
 
 SUBGROUPING            = YES
 
-# When the INLINE_GROUPED_CLASSES tag is set to YES, classes, structs and 
-# unions are shown inside the group in which they are included (e.g. using 
-# @ingroup) instead of on a separate page (for HTML and Man pages) or 
-# section (for LaTeX and RTF).
+# When the INLINE_GROUPED_CLASSES tag is set to YES, classes, structs and unions
+# are shown inside the group in which they are included (e.g. using \ingroup)
+# instead of on a separate page (for HTML and Man pages) or section (for LaTeX
+# and RTF).
+#
+# Note that this feature does not work in combination with
+# SEPARATE_MEMBER_PAGES.
+# The default value is: NO.
 
 INLINE_GROUPED_CLASSES = NO
 
-# When TYPEDEF_HIDES_STRUCT is enabled, a typedef of a struct, union, or enum 
-# is documented as struct, union, or enum with the name of the typedef. So 
-# typedef struct TypeS {} TypeT, will appear in the documentation as a struct 
-# with name TypeT. When disabled the typedef will appear as a member of a file, 
-# namespace, or class. And the struct will be named TypeS. This can typically 
-# be useful for C code in case the coding convention dictates that all compound 
+# When the INLINE_SIMPLE_STRUCTS tag is set to YES, structs, classes, and unions
+# with only public data fields or simple typedef fields will be shown inline in
+# the documentation of the scope in which they are defined (i.e. file,
+# namespace, or group documentation), provided this scope is documented. If set
+# to NO, structs, classes, and unions are shown on a separate page (for HTML and
+# Man pages) or section (for LaTeX and RTF).
+# The default value is: NO.
+
+INLINE_SIMPLE_STRUCTS  = NO
+
+# When TYPEDEF_HIDES_STRUCT tag is enabled, a typedef of a struct, union, or
+# enum is documented as struct, union, or enum with the name of the typedef. So
+# typedef struct TypeS {} TypeT, will appear in the documentation as a struct
+# with name TypeT. When disabled the typedef will appear as a member of a file,
+# namespace, or class. And the struct will be named TypeS. This can typically be
+# useful for C code in case the coding convention dictates that all compound
 # types are typedef'ed and only the typedef is referenced, never the tag name.
+# The default value is: NO.
 
 TYPEDEF_HIDES_STRUCT   = NO
 
-# The SYMBOL_CACHE_SIZE determines the size of the internal cache use to 
-# determine which symbols to keep in memory and which to flush to disk. 
-# When the cache is full, less often used symbols will be written to disk. 
-# For small to medium size projects (<1000 input files) the default value is 
-# probably good enough. For larger projects a too small cache size can cause 
-# doxygen to be busy swapping symbols to and from disk most of the time 
-# causing a significant performance penalty. 
-# If the system has enough physical memory increasing the cache will improve the 
-# performance by keeping more symbols in memory. Note that the value works on 
-# a logarithmic scale so increasing the size by one will roughly double the 
-# memory usage. The cache size is given by this formula: 
-# 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0, 
-# corresponding to a cache size of 2^16 = 65536 symbols
-
-SYMBOL_CACHE_SIZE      = 0
+# The size of the symbol lookup cache can be set using LOOKUP_CACHE_SIZE. This
+# cache is used to resolve symbols given their name and scope. Since this can be
+# an expensive process and often the same symbol appears multiple times in the
+# code, doxygen keeps a cache of pre-resolved symbols. If the cache is too small
+# doxygen will become slower. If the cache is too large, memory is wasted. The
+# cache size is given by this formula: 2^(16+LOOKUP_CACHE_SIZE). The valid range
+# is 0..9, the default is 0, corresponding to a cache size of 2^16=65536
+# symbols. At the end of a run doxygen will report the cache usage and suggest
+# the optimal cache size from a speed point of view.
+# Minimum value: 0, maximum value: 9, default value: 0.
+
+LOOKUP_CACHE_SIZE      = 0
 
 #---------------------------------------------------------------------------
 # Build related configuration options
 #---------------------------------------------------------------------------
 
-# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in 
-# documentation are documented, even if no documentation was available. 
-# Private class members and static file members will be hidden unless 
-# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES
+# If the EXTRACT_ALL tag is set to YES, doxygen will assume all entities in
+# documentation are documented, even if no documentation was available. Private
+# class members and static file members will be hidden unless the
+# EXTRACT_PRIVATE respectively EXTRACT_STATIC tags are set to YES.
+# Note: This will also disable the warnings about undocumented members that are
+# normally produced when WARNINGS is set to YES.
+# The default value is: NO.
 
 EXTRACT_ALL            = YES
 
-# If the EXTRACT_PRIVATE tag is set to YES all private members of a class 
-# will be included in the documentation.
+# If the EXTRACT_PRIVATE tag is set to YES, all private members of a class will
+# be included in the documentation.
+# The default value is: NO.
 
 EXTRACT_PRIVATE        = YES
 
-# If the EXTRACT_STATIC tag is set to YES all static members of a file 
-# will be included in the documentation.
+# If the EXTRACT_PACKAGE tag is set to YES, all members with package or internal
+# scope will be included in the documentation.
+# The default value is: NO.
+
+EXTRACT_PACKAGE        = NO
+
+# If the EXTRACT_STATIC tag is set to YES, all static members of a file will be
+# included in the documentation.
+# The default value is: NO.
 
 EXTRACT_STATIC         = NO
 
-# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) 
-# defined locally in source files will be included in the documentation. 
-# If set to NO only classes defined in header files are included.
+# If the EXTRACT_LOCAL_CLASSES tag is set to YES, classes (and structs) defined
+# locally in source files will be included in the documentation. If set to NO,
+# only classes defined in header files are included. Does not have any effect
+# for Java sources.
+# The default value is: YES.
 
 EXTRACT_LOCAL_CLASSES  = YES
 
-# This flag is only useful for Objective-C code. When set to YES local 
-# methods, which are defined in the implementation section but not in 
-# the interface are included in the documentation. 
-# If set to NO (the default) only methods in the interface are included.
+# This flag is only useful for Objective-C code. If set to YES, local methods,
+# which are defined in the implementation section but not in the interface are
+# included in the documentation. If set to NO, only methods in the interface are
+# included.
+# The default value is: NO.
 
 EXTRACT_LOCAL_METHODS  = NO
 
-# If this flag is set to YES, the members of anonymous namespaces will be 
-# extracted and appear in the documentation as a namespace called 
-# 'anonymous_namespace{file}', where file will be replaced with the base 
-# name of the file that contains the anonymous namespace. By default 
-# anonymous namespaces are hidden.
+# If this flag is set to YES, the members of anonymous namespaces will be
+# extracted and appear in the documentation as a namespace called
+# 'anonymous_namespace{file}', where file will be replaced with the base name of
+# the file that contains the anonymous namespace. By default anonymous namespace
+# are hidden.
+# The default value is: NO.
 
 EXTRACT_ANON_NSPACES   = NO
 
-# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all 
-# undocumented members of documented classes, files or namespaces. 
-# If set to NO (the default) these members will be included in the 
-# various overviews, but no documentation section is generated. 
-# This option has no effect if EXTRACT_ALL is enabled.
+# If the HIDE_UNDOC_MEMBERS tag is set to YES, doxygen will hide all
+# undocumented members inside documented classes or files. If set to NO these
+# members will be included in the various overviews, but no documentation
+# section is generated. This option has no effect if EXTRACT_ALL is enabled.
+# The default value is: NO.
 
 HIDE_UNDOC_MEMBERS     = NO
 
-# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all 
-# undocumented classes that are normally visible in the class hierarchy. 
-# If set to NO (the default) these classes will be included in the various 
-# overviews. This option has no effect if EXTRACT_ALL is enabled.
+# If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all
+# undocumented classes that are normally visible in the class hierarchy. If set
+# to NO, these classes will be included in the various overviews. This option
+# has no effect if EXTRACT_ALL is enabled.
+# The default value is: NO.
 
 HIDE_UNDOC_CLASSES     = NO
 
-# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all 
-# friend (class|struct|union) declarations. 
-# If set to NO (the default) these declarations will be included in the 
-# documentation.
+# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend
+# (class|struct|union) declarations. If set to NO, these declarations will be
+# included in the documentation.
+# The default value is: NO.
 
 HIDE_FRIEND_COMPOUNDS  = NO
 
-# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any 
-# documentation blocks found inside the body of a function. 
-# If set to NO (the default) these blocks will be appended to the 
-# function's detailed documentation block.
+# If the HIDE_IN_BODY_DOCS tag is set to YES, doxygen will hide any
+# documentation blocks found inside the body of a function. If set to NO, these
+# blocks will be appended to the function's detailed documentation block.
+# The default value is: NO.
 
 HIDE_IN_BODY_DOCS      = NO
 
-# The INTERNAL_DOCS tag determines if documentation 
-# that is typed after a \internal command is included. If the tag is set 
-# to NO (the default) then the documentation will be excluded. 
-# Set it to YES to include the internal documentation.
+# The INTERNAL_DOCS tag determines if documentation that is typed after a
+# \internal command is included. If the tag is set to NO then the documentation
+# will be excluded. Set it to YES to include the internal documentation.
+# The default value is: NO.
 
 INTERNAL_DOCS          = NO
 
-# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate 
-# file names in lower-case letters. If set to YES upper-case letters are also 
-# allowed. This is useful if you have classes or files whose names only differ 
-# in case and if your file system supports case sensitive file names. Windows 
+# If the CASE_SENSE_NAMES tag is set to NO then doxygen will only generate file
+# names in lower-case letters. If set to YES, upper-case letters are also
+# allowed. This is useful if you have classes or files whose names only differ
+# in case and if your file system supports case sensitive file names. Windows
 # and Mac users are advised to set this option to NO.
+# The default value is: system dependent.
 
 CASE_SENSE_NAMES       = NO
 
-# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen 
-# will show members with their full class and namespace scopes in the 
-# documentation. If set to YES the scope will be hidden.
+# If the HIDE_SCOPE_NAMES tag is set to NO then doxygen will show members with
+# their full class and namespace scopes in the documentation. If set to YES, the
+# scope will be hidden.
+# The default value is: NO.
 
 HIDE_SCOPE_NAMES       = NO
 
-# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen 
-# will put a list of the files that are included by a file in the documentation 
-# of that file.
+# If the HIDE_COMPOUND_REFERENCE tag is set to NO (default) then doxygen will
+# append additional text to a page's title, such as Class Reference. If set to
+# YES the compound reference will be hidden.
+# The default value is: NO.
+
+HIDE_COMPOUND_REFERENCE= NO
+
+# If the SHOW_INCLUDE_FILES tag is set to YES then doxygen will put a list of
+# the files that are included by a file in the documentation of that file.
+# The default value is: YES.
 
 SHOW_INCLUDE_FILES     = YES
 
-# If the FORCE_LOCAL_INCLUDES tag is set to YES then Doxygen 
-# will list include files with double quotes in the documentation 
-# rather than with sharp brackets.
+# If the SHOW_GROUPED_MEMB_INC tag is set to YES then Doxygen will add for each
+# grouped member an include statement to the documentation, telling the reader
+# which file to include in order to use the member.
+# The default value is: NO.
+
+SHOW_GROUPED_MEMB_INC  = NO
+
+# If the FORCE_LOCAL_INCLUDES tag is set to YES then doxygen will list include
+# files with double quotes in the documentation rather than with sharp brackets.
+# The default value is: NO.
 
 FORCE_LOCAL_INCLUDES   = NO
 
-# If the INLINE_INFO tag is set to YES (the default) then a tag [inline] 
-# is inserted in the documentation for inline members.
+# If the INLINE_INFO tag is set to YES then a tag [inline] is inserted in the
+# documentation for inline members.
+# The default value is: YES.
 
 INLINE_INFO            = YES
 
-# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen 
-# will sort the (detailed) documentation of file and class members 
-# alphabetically by member name. If set to NO the members will appear in 
-# declaration order.
+# If the SORT_MEMBER_DOCS tag is set to YES then doxygen will sort the
+# (detailed) documentation of file and class members alphabetically by member
+# name. If set to NO, the members will appear in declaration order.
+# The default value is: YES.
 
 SORT_MEMBER_DOCS       = YES
 
-# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the 
-# brief documentation of file, namespace and class members alphabetically 
-# by member name. If set to NO (the default) the members will appear in 
-# declaration order.
+# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the brief
+# descriptions of file, namespace and class members alphabetically by member
+# name. If set to NO, the members will appear in declaration order. Note that
+# this will also influence the order of the classes in the class list.
+# The default value is: NO.
 
 SORT_BRIEF_DOCS        = NO
 
-# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen 
-# will sort the (brief and detailed) documentation of class members so that 
-# constructors and destructors are listed first. If set to NO (the default) 
-# the constructors will appear in the respective orders defined by 
-# SORT_MEMBER_DOCS and SORT_BRIEF_DOCS. 
-# This tag will be ignored for brief docs if SORT_BRIEF_DOCS is set to NO 
-# and ignored for detailed docs if SORT_MEMBER_DOCS is set to NO.
+# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen will sort the
+# (brief and detailed) documentation of class members so that constructors and
+# destructors are listed first. If set to NO the constructors will appear in the
+# respective orders defined by SORT_BRIEF_DOCS and SORT_MEMBER_DOCS.
+# Note: If SORT_BRIEF_DOCS is set to NO this option is ignored for sorting brief
+# member documentation.
+# Note: If SORT_MEMBER_DOCS is set to NO this option is ignored for sorting
+# detailed member documentation.
+# The default value is: NO.
 
 SORT_MEMBERS_CTORS_1ST = NO
 
-# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the 
-# hierarchy of group names into alphabetical order. If set to NO (the default) 
-# the group names will appear in their defined order.
+# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the hierarchy
+# of group names into alphabetical order. If set to NO the group names will
+# appear in their defined order.
+# The default value is: NO.
 
 SORT_GROUP_NAMES       = NO
 
-# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be 
-# sorted by fully-qualified names, including namespaces. If set to 
-# NO (the default), the class list will be sorted only by class name, 
-# not including the namespace part. 
-# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES. 
-# Note: This option applies only to the class list, not to the 
-# alphabetical list.
+# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be sorted by
+# fully-qualified names, including namespaces. If set to NO, the class list will
+# be sorted only by class name, not including the namespace part.
+# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.
+# Note: This option applies only to the class list, not to the alphabetical
+# list.
+# The default value is: NO.
 
 SORT_BY_SCOPE_NAME     = NO
 
-# If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to 
-# do proper type resolution of all parameters of a function it will reject a 
-# match between the prototype and the implementation of a member function even 
-# if there is only one candidate or it is obvious which candidate to choose 
-# by doing a simple string match. By disabling STRICT_PROTO_MATCHING doxygen 
-# will still accept a match between prototype and implementation in such cases.
+# If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to do proper
+# type resolution of all parameters of a function it will reject a match between
+# the prototype and the implementation of a member function even if there is
+# only one candidate or it is obvious which candidate to choose by doing a
+# simple string match. By disabling STRICT_PROTO_MATCHING doxygen will still
+# accept a match between prototype and implementation in such cases.
+# The default value is: NO.
 
 STRICT_PROTO_MATCHING  = NO
 
-# The GENERATE_TODOLIST tag can be used to enable (YES) or 
-# disable (NO) the todo list. This list is created by putting \todo 
-# commands in the documentation.
+# The GENERATE_TODOLIST tag can be used to enable (YES) or disable (NO) the todo
+# list. This list is created by putting \todo commands in the documentation.
+# The default value is: YES.
 
 GENERATE_TODOLIST      = YES
 
-# The GENERATE_TESTLIST tag can be used to enable (YES) or 
-# disable (NO) the test list. This list is created by putting \test 
-# commands in the documentation.
+# The GENERATE_TESTLIST tag can be used to enable (YES) or disable (NO) the test
+# list. This list is created by putting \test commands in the documentation.
+# The default value is: YES.
 
 GENERATE_TESTLIST      = YES
 
-# The GENERATE_BUGLIST tag can be used to enable (YES) or 
-# disable (NO) the bug list. This list is created by putting \bug 
-# commands in the documentation.
+# The GENERATE_BUGLIST tag can be used to enable (YES) or disable (NO) the bug
+# list. This list is created by putting \bug commands in the documentation.
+# The default value is: YES.
 
 GENERATE_BUGLIST       = YES
 
-# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or 
-# disable (NO) the deprecated list. This list is created by putting 
-# \deprecated commands in the documentation.
+# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or disable (NO)
+# the deprecated list. This list is created by putting \deprecated commands in
+# the documentation.
+# The default value is: YES.
 
 GENERATE_DEPRECATEDLIST= YES
 
-# The ENABLED_SECTIONS tag can be used to enable conditional 
-# documentation sections, marked by \if sectionname ... \endif.
+# The ENABLED_SECTIONS tag can be used to enable conditional documentation
+# sections, marked by \if <section_label> ... \endif and \cond <section_label>
+# ... \endcond blocks.
 
-ENABLED_SECTIONS       = 
+ENABLED_SECTIONS       =
 
-# The MAX_INITIALIZER_LINES tag determines the maximum number of lines 
-# the initial value of a variable or macro consists of for it to appear in 
-# the documentation. If the initializer consists of more lines than specified 
-# here it will be hidden. Use a value of 0 to hide initializers completely. 
-# The appearance of the initializer of individual variables and macros in the 
-# documentation can be controlled using \showinitializer or \hideinitializer 
-# command in the documentation regardless of this setting.
+# The MAX_INITIALIZER_LINES tag determines the maximum number of lines that the
+# initial value of a variable or macro / define can have for it to appear in the
+# documentation. If the initializer consists of more lines than specified here
+# it will be hidden. Use a value of 0 to hide initializers completely. The
+# appearance of the value of individual variables and macros / defines can be
+# controlled using \showinitializer or \hideinitializer command in the
+# documentation regardless of this setting.
+# Minimum value: 0, maximum value: 10000, default value: 30.
 
 MAX_INITIALIZER_LINES  = 30
 
-# Set the SHOW_USED_FILES tag to NO to disable the list of files generated 
-# at the bottom of the documentation of classes and structs. If set to YES the 
+# Set the SHOW_USED_FILES tag to NO to disable the list of files generated at
+# the bottom of the documentation of classes and structs. If set to YES, the
 # list will mention the files that were used to generate the documentation.
+# The default value is: YES.
 
 SHOW_USED_FILES        = YES
 
-# If the sources in your project are distributed over multiple directories 
-# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy 
-# in the documentation. The default is NO.
-
-SHOW_DIRECTORIES       = NO
-
-# Set the SHOW_FILES tag to NO to disable the generation of the Files page. 
-# This will remove the Files entry from the Quick Index and from the 
-# Folder Tree View (if specified). The default is YES.
+# Set the SHOW_FILES tag to NO to disable the generation of the Files page. This
+# will remove the Files entry from the Quick Index and from the Folder Tree View
+# (if specified).
+# The default value is: YES.
 
 SHOW_FILES             = YES
 
-# Set the SHOW_NAMESPACES tag to NO to disable the generation of the 
-# Namespaces page.  This will remove the Namespaces entry from the Quick Index 
-# and from the Folder Tree View (if specified). The default is YES.
+# Set the SHOW_NAMESPACES tag to NO to disable the generation of the Namespaces
+# page. This will remove the Namespaces entry from the Quick Index and from the
+# Folder Tree View (if specified).
+# The default value is: YES.
 
 SHOW_NAMESPACES        = YES
 
-# The FILE_VERSION_FILTER tag can be used to specify a program or script that 
-# doxygen should invoke to get the current version for each file (typically from 
-# the version control system). Doxygen will invoke the program by executing (via 
-# popen()) the command <command> <input-file>, where <command> is the value of 
-# the FILE_VERSION_FILTER tag, and <input-file> is the name of an input file 
-# provided by doxygen. Whatever the program writes to standard output 
-# is used as the file version. See the manual for examples.
+# The FILE_VERSION_FILTER tag can be used to specify a program or script that
+# doxygen should invoke to get the current version for each file (typically from
+# the version control system). Doxygen will invoke the program by executing (via
+# popen()) the command command input-file, where command is the value of the
+# FILE_VERSION_FILTER tag, and input-file is the name of an input file provided
+# by doxygen. Whatever the program writes to standard output is used as the file
+# version. For an example see the documentation.
+
+FILE_VERSION_FILTER    =
+
+# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed
+# by doxygen. The layout file controls the global structure of the generated
+# output files in an output format independent way. To create the layout file
+# that represents doxygen's defaults, run doxygen with the -l option. You can
+# optionally specify a file name after the option, if omitted DoxygenLayout.xml
+# will be used as the name of the layout file.
+#
+# Note that if you run doxygen from a directory containing a file called
+# DoxygenLayout.xml, doxygen will parse it automatically even if the LAYOUT_FILE
+# tag is left empty.
 
-FILE_VERSION_FILTER    = 
+LAYOUT_FILE            =
 
-# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed 
-# by doxygen. The layout file controls the global structure of the generated 
-# output files in an output format independent way. The create the layout file 
-# that represents doxygen's defaults, run doxygen with the -l option. 
-# You can optionally specify a file name after the option, if omitted 
-# DoxygenLayout.xml will be used as the name of the layout file.
+# The CITE_BIB_FILES tag can be used to specify one or more bib files containing
+# the reference definitions. This must be a list of .bib files. The .bib
+# extension is automatically appended if omitted. This requires the bibtex tool
+# to be installed. See also http://en.wikipedia.org/wiki/BibTeX for more info.
+# For LaTeX the style of the bibliography can be controlled using
+# LATEX_BIB_STYLE. To use this feature you need bibtex and perl available in the
+# search path. See also \cite for info how to create references.
 
-LAYOUT_FILE            = 
+CITE_BIB_FILES         =
 
 #---------------------------------------------------------------------------
-# configuration options related to warning and progress messages
+# Configuration options related to warning and progress messages
 #---------------------------------------------------------------------------
 
-# The QUIET tag can be used to turn on/off the messages that are generated 
-# by doxygen. Possible values are YES and NO. If left blank NO is used.
+# The QUIET tag can be used to turn on/off the messages that are generated to
+# standard output by doxygen. If QUIET is set to YES this implies that the
+# messages are off.
+# The default value is: NO.
 
 QUIET                  = NO
 
-# The WARNINGS tag can be used to turn on/off the warning messages that are 
-# generated by doxygen. Possible values are YES and NO. If left blank 
-# NO is used.
+# The WARNINGS tag can be used to turn on/off the warning messages that are
+# generated to standard error (stderr) by doxygen. If WARNINGS is set to YES
+# this implies that the warnings are on.
+#
+# Tip: Turn warnings on while writing the documentation.
+# The default value is: YES.
 
 WARNINGS               = YES
 
-# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings 
-# for undocumented members. If EXTRACT_ALL is set to YES then this flag will 
-# automatically be disabled.
+# If the WARN_IF_UNDOCUMENTED tag is set to YES then doxygen will generate
+# warnings for undocumented members. If EXTRACT_ALL is set to YES then this flag
+# will automatically be disabled.
+# The default value is: YES.
 
 WARN_IF_UNDOCUMENTED   = YES
 
-# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for 
-# potential errors in the documentation, such as not documenting some 
-# parameters in a documented function, or documenting parameters that 
-# don't exist or using markup commands wrongly.
+# If the WARN_IF_DOC_ERROR tag is set to YES, doxygen will generate warnings for
+# potential errors in the documentation, such as not documenting some parameters
+# in a documented function, or documenting parameters that don't exist or using
+# markup commands wrongly.
+# The default value is: YES.
 
 WARN_IF_DOC_ERROR      = YES
 
-# The WARN_NO_PARAMDOC option can be enabled to get warnings for 
-# functions that are documented, but have no documentation for their parameters 
-# or return value. If set to NO (the default) doxygen will only warn about 
-# wrong or incomplete parameter documentation, but not about the absence of 
-# documentation.
+# This WARN_NO_PARAMDOC option can be enabled to get warnings for functions that
+# are documented, but have no documentation for their parameters or return
+# value. If set to NO, doxygen will only warn about wrong or incomplete
+# parameter documentation, but not about the absence of documentation.
+# The default value is: NO.
 
 WARN_NO_PARAMDOC       = NO
 
-# The WARN_FORMAT tag determines the format of the warning messages that 
-# doxygen can produce. The string should contain the $file, $line, and $text 
-# tags, which will be replaced by the file and line number from which the 
-# warning originated and the warning text. Optionally the format may contain 
-# $version, which will be replaced by the version of the file (if it could 
-# be obtained via FILE_VERSION_FILTER)
+# If the WARN_AS_ERROR tag is set to YES then doxygen will immediately stop when
+# a warning is encountered.
+# The default value is: NO.
+
+WARN_AS_ERROR          = NO
+
+# The WARN_FORMAT tag determines the format of the warning messages that doxygen
+# can produce. The string should contain the $file, $line, and $text tags, which
+# will be replaced by the file and line number from which the warning originated
+# and the warning text. Optionally the format may contain $version, which will
+# be replaced by the version of the file (if it could be obtained via
+# FILE_VERSION_FILTER)
+# The default value is: $file:$line: $text.
 
 WARN_FORMAT            = "$file:$line: $text"
 
-# The WARN_LOGFILE tag can be used to specify a file to which warning 
-# and error messages should be written. If left blank the output is written 
-# to stderr.
+# The WARN_LOGFILE tag can be used to specify a file to which warning and error
+# messages should be written. If left blank the output is written to standard
+# error (stderr).
 
-WARN_LOGFILE           = 
+WARN_LOGFILE           =
 
 #---------------------------------------------------------------------------
-# configuration options related to the input files
+# Configuration options related to the input files
 #---------------------------------------------------------------------------
 
-# The INPUT tag can be used to specify the files and/or directories that contain 
-# documented source files. You may enter file names like "myfile.cpp" or 
-# directories like "/usr/src/myproject". Separate the files or directories 
-# with spaces.
+# The INPUT tag is used to specify the files and/or directories that contain
+# documented source files. You may enter file names like myfile.cpp or
+# directories like /usr/src/myproject. Separate the files or directories with
+# spaces. See also FILE_PATTERNS and EXTENSION_MAPPING
+# Note: If this tag is empty the current directory is searched.
 
 INPUT                  = src
 
-# This tag can be used to specify the character encoding of the source files 
-# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is 
-# also the default input encoding. Doxygen uses libiconv (or the iconv built 
-# into libc) for the transcoding. See http://www.gnu.org/software/libiconv for 
-# the list of possible encodings.
+# This tag can be used to specify the character encoding of the source files
+# that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
+# libiconv (or the iconv built into libc) for the transcoding. See the libiconv
+# documentation (see: http://www.gnu.org/software/libiconv) for the list of
+# possible encodings.
+# The default value is: UTF-8.
 
 INPUT_ENCODING         = UTF-8
 
-# If the value of the INPUT tag contains directories, you can use the 
-# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp 
-# and *.h) to filter out the source-files in the directories. If left 
-# blank the following patterns are tested: 
-# *.c *.cc *.cxx *.cpp *.c++ *.d *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh 
-# *.hxx *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.dox *.py 
-# *.f90 *.f *.for *.vhd *.vhdl
+# If the value of the INPUT tag contains directories, you can use the
+# FILE_PATTERNS tag to specify one or more wildcard patterns (like *.cpp and
+# *.h) to filter out the source-files in the directories.
+#
+# Note that for custom extensions or not directly supported extensions you also
+# need to set EXTENSION_MAPPING for the extension otherwise the files are not
+# read by doxygen.
+#
+# If left blank the following patterns are tested:*.c, *.cc, *.cxx, *.cpp,
+# *.c++, *.java, *.ii, *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h,
+# *.hh, *.hxx, *.hpp, *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc,
+# *.m, *.markdown, *.md, *.mm, *.dox, *.py, *.pyw, *.f90, *.f95, *.f03, *.f08,
+# *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf and *.qsf.
 
 FILE_PATTERNS          = *.c \
                          *.cc \
@@ -673,875 +848,1300 @@ FILE_PATTERNS          = *.c \
                          *.vhd \
                          *.vhdl
 
-# The RECURSIVE tag can be used to turn specify whether or not subdirectories 
-# should be searched for input files as well. Possible values are YES and NO. 
-# If left blank NO is used.
+# The RECURSIVE tag can be used to specify whether or not subdirectories should
+# be searched for input files as well.
+# The default value is: NO.
 
 RECURSIVE              = YES
 
-# The EXCLUDE tag can be used to specify files and/or directories that should 
-# excluded from the INPUT source files. This way you can easily exclude a 
+# The EXCLUDE tag can be used to specify files and/or directories that should be
+# excluded from the INPUT source files. This way you can easily exclude a
 # subdirectory from a directory tree whose root is specified with the INPUT tag.
+#
+# Note that relative paths are relative to the directory from which doxygen is
+# run.
 
-EXCLUDE                = src/leveldb src/json src/test /src/qt/test
+EXCLUDE                = src/leveldb \
+                         src/json \
+                         src/test \
+                         src/qt/test
 
-# The EXCLUDE_SYMLINKS tag can be used select whether or not files or 
-# directories that are symbolic links (a Unix file system feature) are excluded 
+# The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
+# directories that are symbolic links (a Unix file system feature) are excluded
 # from the input.
+# The default value is: NO.
 
 EXCLUDE_SYMLINKS       = NO
 
-# If the value of the INPUT tag contains directories, you can use the 
-# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude 
-# certain files from those directories. Note that the wildcards are matched 
-# against the file with absolute path, so to exclude all test directories 
-# for example use the pattern */test/*
+# If the value of the INPUT tag contains directories, you can use the
+# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude
+# certain files from those directories.
+#
+# Note that the wildcards are matched against the file with absolute path, so to
+# exclude all test directories for example use the pattern */test/*
 
-EXCLUDE_PATTERNS       = 
+EXCLUDE_PATTERNS       =
 
-# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names 
-# (namespaces, classes, functions, etc.) that should be excluded from the 
-# output. The symbol name can be a fully qualified name, a word, or if the 
-# wildcard * is used, a substring. Examples: ANamespace, AClass, 
+# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
+# (namespaces, classes, functions, etc.) that should be excluded from the
+# output. The symbol name can be a fully qualified name, a word, or if the
+# wildcard * is used, a substring. Examples: ANamespace, AClass,
 # AClass::ANamespace, ANamespace::*Test
+#
+# Note that the wildcards are matched against the file with absolute path, so to
+# exclude all test directories use the pattern */test/*
 
-EXCLUDE_SYMBOLS        = boost google
+EXCLUDE_SYMBOLS        = boost \
+                         google
 
-# The EXAMPLE_PATH tag can be used to specify one or more files or 
-# directories that contain example code fragments that are included (see 
-# the \include command).
+# The EXAMPLE_PATH tag can be used to specify one or more files or directories
+# that contain example code fragments that are included (see the \include
+# command).
 
-EXAMPLE_PATH           = 
+EXAMPLE_PATH           =
 
-# If the value of the EXAMPLE_PATH tag contains directories, you can use the 
-# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp 
-# and *.h) to filter out the source-files in the directories. If left 
-# blank all files are included.
+# If the value of the EXAMPLE_PATH tag contains directories, you can use the
+# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp and
+# *.h) to filter out the source-files in the directories. If left blank all
+# files are included.
 
 EXAMPLE_PATTERNS       = *
 
-# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be 
-# searched for input files to be used with the \include or \dontinclude 
-# commands irrespective of the value of the RECURSIVE tag. 
-# Possible values are YES and NO. If left blank NO is used.
+# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be
+# searched for input files to be used with the \include or \dontinclude commands
+# irrespective of the value of the RECURSIVE tag.
+# The default value is: NO.
 
 EXAMPLE_RECURSIVE      = NO
 
-# The IMAGE_PATH tag can be used to specify one or more files or 
-# directories that contain image that are included in the documentation (see 
-# the \image command).
+# The IMAGE_PATH tag can be used to specify one or more files or directories
+# that contain images that are to be included in the documentation (see the
+# \image command).
 
-IMAGE_PATH             = 
+IMAGE_PATH             =
 
-# The INPUT_FILTER tag can be used to specify a program that doxygen should 
-# invoke to filter for each input file. Doxygen will invoke the filter program 
-# by executing (via popen()) the command <filter> <input-file>, where <filter> 
-# is the value of the INPUT_FILTER tag, and <input-file> is the name of an 
-# input file. Doxygen will then use the output that the filter program writes 
-# to standard output.  If FILTER_PATTERNS is specified, this tag will be 
-# ignored.
+# The INPUT_FILTER tag can be used to specify a program that doxygen should
+# invoke to filter for each input file. Doxygen will invoke the filter program
+# by executing (via popen()) the command:
+#
+# <filter> <input-file>
+#
+# where <filter> is the value of the INPUT_FILTER tag, and <input-file> is the
+# name of an input file. Doxygen will then use the output that the filter
+# program writes to standard output. If FILTER_PATTERNS is specified, this tag
+# will be ignored.
+#
+# Note that the filter must not add or remove lines; it is applied before the
+# code is scanned, but not when the output code is generated. If lines are added
+# or removed, the anchors will not be placed correctly.
+#
+# Note that for custom extensions or not directly supported extensions you also
+# need to set EXTENSION_MAPPING for the extension otherwise the files are not
+# properly processed by doxygen.
+
+INPUT_FILTER           =
+
+# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern
+# basis. Doxygen will compare the file name with each pattern and apply the
+# filter if there is a match. The filters are a list of the form: pattern=filter
+# (like *.cpp=my_cpp_filter). See INPUT_FILTER for further information on how
+# filters are used. If the FILTER_PATTERNS tag is empty or if none of the
+# patterns match the file name, INPUT_FILTER is applied.
+#
+# Note that for custom extensions or not directly supported extensions you also
+# need to set EXTENSION_MAPPING for the extension otherwise the files are not
+# properly processed by doxygen.
 
-INPUT_FILTER           = 
+FILTER_PATTERNS        =
 
-# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern 
-# basis.  Doxygen will compare the file name with each pattern and apply the 
-# filter if there is a match.  The filters are a list of the form: 
-# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further 
-# info on how filters are used. If FILTER_PATTERNS is empty or if 
-# non of the patterns match the file name, INPUT_FILTER is applied.
+# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using
+# INPUT_FILTER) will also be used to filter the input files that are used for
+# producing the source files to browse (i.e. when SOURCE_BROWSER is set to YES).
+# The default value is: NO.
 
-FILTER_PATTERNS        = 
+FILTER_SOURCE_FILES    = NO
 
-# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using 
-# INPUT_FILTER) will be used to filter the input files when producing source 
-# files to browse (i.e. when SOURCE_BROWSER is set to YES).
+# The FILTER_SOURCE_PATTERNS tag can be used to specify source filters per file
+# pattern. A pattern will override the setting for FILTER_PATTERN (if any) and
+# it is also possible to disable source filtering for a specific pattern using
+# *.ext= (so without naming a filter).
+# This tag requires that the tag FILTER_SOURCE_FILES is set to YES.
 
-FILTER_SOURCE_FILES    = NO
+FILTER_SOURCE_PATTERNS =
 
-# The FILTER_SOURCE_PATTERNS tag can be used to specify source filters per file 
-# pattern. A pattern will override the setting for FILTER_PATTERN (if any) 
-# and it is also possible to disable source filtering for a specific pattern 
-# using *.ext= (so without naming a filter). This option only has effect when 
-# FILTER_SOURCE_FILES is enabled.
+# If the USE_MDFILE_AS_MAINPAGE tag refers to the name of a markdown file that
+# is part of the input, its contents will be placed on the main page
+# (index.html). This can be useful if you have a project on for instance GitHub
+# and want to reuse the introduction page also for the doxygen output.
 
-FILTER_SOURCE_PATTERNS = 
+USE_MDFILE_AS_MAINPAGE =
 
 #---------------------------------------------------------------------------
-# configuration options related to source browsing
+# Configuration options related to source browsing
 #---------------------------------------------------------------------------
 
-# If the SOURCE_BROWSER tag is set to YES then a list of source files will 
-# be generated. Documented entities will be cross-referenced with these sources. 
-# Note: To get rid of all source code in the generated output, make sure also 
-# VERBATIM_HEADERS is set to NO.
+# If the SOURCE_BROWSER tag is set to YES then a list of source files will be
+# generated. Documented entities will be cross-referenced with these sources.
+#
+# Note: To get rid of all source code in the generated output, make sure that
+# also VERBATIM_HEADERS is set to NO.
+# The default value is: NO.
 
 SOURCE_BROWSER         = YES
 
-# Setting the INLINE_SOURCES tag to YES will include the body 
-# of functions and classes directly in the documentation.
+# Setting the INLINE_SOURCES tag to YES will include the body of functions,
+# classes and enums directly into the documentation.
+# The default value is: NO.
 
 INLINE_SOURCES         = NO
 
-# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct 
-# doxygen to hide any special comment blocks from generated source code 
-# fragments. Normal C and C++ comments will always remain visible.
+# Setting the STRIP_CODE_COMMENTS tag to YES will instruct doxygen to hide any
+# special comment blocks from generated source code fragments. Normal C, C++ and
+# Fortran comments will always remain visible.
+# The default value is: YES.
 
 STRIP_CODE_COMMENTS    = YES
 
-# If the REFERENCED_BY_RELATION tag is set to YES 
-# then for each documented function all documented 
-# functions referencing it will be listed.
+# If the REFERENCED_BY_RELATION tag is set to YES then for each documented
+# function all documented functions referencing it will be listed.
+# The default value is: NO.
 
 REFERENCED_BY_RELATION = NO
 
-# If the REFERENCES_RELATION tag is set to YES 
-# then for each documented function all documented entities 
-# called/used by that function will be listed.
+# If the REFERENCES_RELATION tag is set to YES then for each documented function
+# all documented entities called/used by that function will be listed.
+# The default value is: NO.
 
 REFERENCES_RELATION    = NO
 
-# If the REFERENCES_LINK_SOURCE tag is set to YES (the default) 
-# and SOURCE_BROWSER tag is set to YES, then the hyperlinks from 
-# functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will 
-# link to the source code.  Otherwise they will link to the documentation.
+# If the REFERENCES_LINK_SOURCE tag is set to YES and SOURCE_BROWSER tag is set
+# to YES then the hyperlinks from functions in REFERENCES_RELATION and
+# REFERENCED_BY_RELATION lists will link to the source code. Otherwise they will
+# link to the documentation.
+# The default value is: YES.
 
 REFERENCES_LINK_SOURCE = YES
 
-# If the USE_HTAGS tag is set to YES then the references to source code 
-# will point to the HTML generated by the htags(1) tool instead of doxygen 
-# built-in source browser. The htags tool is part of GNU's global source 
-# tagging system (see http://www.gnu.org/software/global/global.html). You 
-# will need version 4.8.6 or higher.
+# If SOURCE_TOOLTIPS is enabled (the default) then hovering a hyperlink in the
+# source code will show a tooltip with additional information such as prototype,
+# brief description and links to the definition and documentation. Since this
+# will make the HTML file larger and loading of large files a bit slower, you
+# can opt to disable this feature.
+# The default value is: YES.
+# This tag requires that the tag SOURCE_BROWSER is set to YES.
+
+SOURCE_TOOLTIPS        = YES
+
+# If the USE_HTAGS tag is set to YES then the references to source code will
+# point to the HTML generated by the htags(1) tool instead of doxygen built-in
+# source browser. The htags tool is part of GNU's global source tagging system
+# (see http://www.gnu.org/software/global/global.html). You will need version
+# 4.8.6 or higher.
+#
+# To use it do the following:
+# - Install the latest version of global
+# - Enable SOURCE_BROWSER and USE_HTAGS in the config file
+# - Make sure the INPUT points to the root of the source tree
+# - Run doxygen as normal
+#
+# Doxygen will invoke htags (and that will in turn invoke gtags), so these
+# tools must be available from the command line (i.e. in the search path).
+#
+# The result: instead of the source browser generated by doxygen, the links to
+# source code will now point to the output of htags.
+# The default value is: NO.
+# This tag requires that the tag SOURCE_BROWSER is set to YES.
 
 USE_HTAGS              = NO
 
-# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen 
-# will generate a verbatim copy of the header file for each class for 
-# which an include is specified. Set to NO to disable this.
+# If the VERBATIM_HEADERS tag is set the YES then doxygen will generate a
+# verbatim copy of the header file for each class for which an include is
+# specified. Set to NO to disable this.
+# See also: Section \class.
+# The default value is: YES.
 
 VERBATIM_HEADERS       = YES
 
 #---------------------------------------------------------------------------
-# configuration options related to the alphabetical class index
+# Configuration options related to the alphabetical class index
 #---------------------------------------------------------------------------
 
-# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index 
-# of all compounds will be generated. Enable this if the project 
-# contains a lot of classes, structs, unions or interfaces.
+# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index of all
+# compounds will be generated. Enable this if the project contains a lot of
+# classes, structs, unions or interfaces.
+# The default value is: YES.
 
 ALPHABETICAL_INDEX     = YES
 
-# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then 
-# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns 
-# in which this list will be split (can be a number in the range [1..20])
+# The COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns in
+# which the alphabetical index list will be split.
+# Minimum value: 1, maximum value: 20, default value: 5.
+# This tag requires that the tag ALPHABETICAL_INDEX is set to YES.
 
 COLS_IN_ALPHA_INDEX    = 5
 
-# In case all classes in a project start with a common prefix, all 
-# classes will be put under the same header in the alphabetical index. 
-# The IGNORE_PREFIX tag can be used to specify one or more prefixes that 
-# should be ignored while generating the index headers.
+# In case all classes in a project start with a common prefix, all classes will
+# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag
+# can be used to specify a prefix (or a list of prefixes) that should be ignored
+# while generating the index headers.
+# This tag requires that the tag ALPHABETICAL_INDEX is set to YES.
 
-IGNORE_PREFIX          = 
+IGNORE_PREFIX          =
 
 #---------------------------------------------------------------------------
-# configuration options related to the HTML output
+# Configuration options related to the HTML output
 #---------------------------------------------------------------------------
 
-# If the GENERATE_HTML tag is set to YES (the default) Doxygen will 
-# generate HTML output.
+# If the GENERATE_HTML tag is set to YES, doxygen will generate HTML output
+# The default value is: YES.
 
 GENERATE_HTML          = YES
 
-# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. 
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
-# put in front of it. If left blank `html' will be used as the default path.
+# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: html.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 HTML_OUTPUT            = html
 
-# The HTML_FILE_EXTENSION tag can be used to specify the file extension for 
-# each generated HTML page (for example: .htm,.php,.asp). If it is left blank 
-# doxygen will generate files with .html extension.
+# The HTML_FILE_EXTENSION tag can be used to specify the file extension for each
+# generated HTML page (for example: .htm, .php, .asp).
+# The default value is: .html.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 HTML_FILE_EXTENSION    = .html
 
-# The HTML_HEADER tag can be used to specify a personal HTML header for 
-# each generated HTML page. If it is left blank doxygen will generate a 
-# standard header. Note that when using a custom header you are responsible 
-# for the proper inclusion of any scripts and style sheets that doxygen 
-# needs, which is dependent on the configuration options used. 
-# It is adviced to generate a default header using "doxygen -w html 
-# header.html footer.html stylesheet.css YourConfigFile" and then modify 
-# that header. Note that the header is subject to change so you typically 
-# have to redo this when upgrading to a newer version of doxygen or when
-# changing the value of configuration settings such as GENERATE_TREEVIEW!
-
-HTML_HEADER            = 
-
-# The HTML_FOOTER tag can be used to specify a personal HTML footer for 
-# each generated HTML page. If it is left blank doxygen will generate a 
-# standard footer.
-
-HTML_FOOTER            = 
-
-# The HTML_STYLESHEET tag can be used to specify a user-defined cascading 
-# style sheet that is used by each HTML page. It can be used to 
-# fine-tune the look of the HTML output. If the tag is left blank doxygen 
-# will generate a default style sheet. Note that doxygen will try to copy 
-# the style sheet file to the HTML output directory, so don't put your own 
-# stylesheet in the HTML output directory as well, or it will be erased!
-
-HTML_STYLESHEET        = 
-
-# The HTML_EXTRA_FILES tag can be used to specify one or more extra images or 
-# other source files which should be copied to the HTML output directory. Note 
-# that these files will be copied to the base HTML output directory. Use the 
-# $relpath$ marker in the HTML_HEADER and/or HTML_FOOTER files to load these 
-# files. In the HTML_STYLESHEET file, use the file name only. Also note that 
-# the files will be copied as-is; there are no commands or markers available.
-
-HTML_EXTRA_FILES       = 
-
-# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. 
-# Doxygen will adjust the colors in the stylesheet and background images 
-# according to this color. Hue is specified as an angle on a colorwheel, 
-# see http://en.wikipedia.org/wiki/Hue for more information. 
-# For instance the value 0 represents red, 60 is yellow, 120 is green, 
-# 180 is cyan, 240 is blue, 300 purple, and 360 is red again. 
-# The allowed range is 0 to 359.
+# The HTML_HEADER tag can be used to specify a user-defined HTML header file for
+# each generated HTML page. If the tag is left blank doxygen will generate a
+# standard header.
+#
+# To get valid HTML the header file that includes any scripts and style sheets
+# that doxygen needs, which is dependent on the configuration options used (e.g.
+# the setting GENERATE_TREEVIEW). It is highly recommended to start with a
+# default header using
+# doxygen -w html new_header.html new_footer.html new_stylesheet.css
+# YourConfigFile
+# and then modify the file new_header.html. See also section "Doxygen usage"
+# for information on how to generate the default header that doxygen normally
+# uses.
+# Note: The header is subject to change so you typically have to regenerate the
+# default header when upgrading to a newer version of doxygen. For a description
+# of the possible markers and block names see the documentation.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_HEADER            =
+
+# The HTML_FOOTER tag can be used to specify a user-defined HTML footer for each
+# generated HTML page. If the tag is left blank doxygen will generate a standard
+# footer. See HTML_HEADER for more information on how to generate a default
+# footer and what special commands can be used inside the footer. See also
+# section "Doxygen usage" for information on how to generate the default footer
+# that doxygen normally uses.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_FOOTER            =
+
+# The HTML_STYLESHEET tag can be used to specify a user-defined cascading style
+# sheet that is used by each HTML page. It can be used to fine-tune the look of
+# the HTML output. If left blank doxygen will generate a default style sheet.
+# See also section "Doxygen usage" for information on how to generate the style
+# sheet that doxygen normally uses.
+# Note: It is recommended to use HTML_EXTRA_STYLESHEET instead of this tag, as
+# it is more robust and this tag (HTML_STYLESHEET) will in the future become
+# obsolete.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_STYLESHEET        =
+
+# The HTML_EXTRA_STYLESHEET tag can be used to specify additional user-defined
+# cascading style sheets that are included after the standard style sheets
+# created by doxygen. Using this option one can overrule certain style aspects.
+# This is preferred over using HTML_STYLESHEET since it does not replace the
+# standard style sheet and is therefore more robust against future updates.
+# Doxygen will copy the style sheet files to the output directory.
+# Note: The order of the extra style sheet files is of importance (e.g. the last
+# style sheet in the list overrules the setting of the previous ones in the
+# list). For an example see the documentation.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_EXTRA_STYLESHEET  =
+
+# The HTML_EXTRA_FILES tag can be used to specify one or more extra images or
+# other source files which should be copied to the HTML output directory. Note
+# that these files will be copied to the base HTML output directory. Use the
+# $relpath^ marker in the HTML_HEADER and/or HTML_FOOTER files to load these
+# files. In the HTML_STYLESHEET file, use the file name only. Also note that the
+# files will be copied as-is; there are no commands or markers available.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_EXTRA_FILES       =
+
+# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen
+# will adjust the colors in the style sheet and background images according to
+# this color. Hue is specified as an angle on a colorwheel, see
+# http://en.wikipedia.org/wiki/Hue for more information. For instance the value
+# 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300
+# purple, and 360 is red again.
+# Minimum value: 0, maximum value: 359, default value: 220.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 HTML_COLORSTYLE_HUE    = 220
 
-# The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of 
-# the colors in the HTML output. For a value of 0 the output will use 
-# grayscales only. A value of 255 will produce the most vivid colors.
+# The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of the colors
+# in the HTML output. For a value of 0 the output will use grayscales only. A
+# value of 255 will produce the most vivid colors.
+# Minimum value: 0, maximum value: 255, default value: 100.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 HTML_COLORSTYLE_SAT    = 100
 
-# The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to 
-# the luminance component of the colors in the HTML output. Values below 
-# 100 gradually make the output lighter, whereas values above 100 make 
-# the output darker. The value divided by 100 is the actual gamma applied, 
-# so 80 represents a gamma of 0.8, The value 220 represents a gamma of 2.2, 
-# and 100 does not change the gamma.
+# The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to the
+# luminance component of the colors in the HTML output. Values below 100
+# gradually make the output lighter, whereas values above 100 make the output
+# darker. The value divided by 100 is the actual gamma applied, so 80 represents
+# a gamma of 0.8, The value 220 represents a gamma of 2.2, and 100 does not
+# change the gamma.
+# Minimum value: 40, maximum value: 240, default value: 80.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 HTML_COLORSTYLE_GAMMA  = 80
 
-# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML 
-# page will contain the date and time when the page was generated. Setting 
-# this to NO can help when comparing the output of multiple runs.
+# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML
+# page will contain the date and time when the page was generated. Setting this
+# to YES can help to show when doxygen was last run and thus if the
+# documentation is up to date.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 HTML_TIMESTAMP         = YES
 
-# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes, 
-# files or namespaces will be aligned in HTML using tables. If set to 
-# NO a bullet list will be used.
-
-HTML_ALIGN_MEMBERS     = YES
-
-# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML 
-# documentation will contain sections that can be hidden and shown after the 
-# page has loaded. For this to work a browser that supports 
-# JavaScript and DHTML is required (for instance Mozilla 1.0+, Firefox 
-# Netscape 6.0+, Internet explorer 5.0+, Konqueror, or Safari).
+# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
+# documentation will contain sections that can be hidden and shown after the
+# page has loaded.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 HTML_DYNAMIC_SECTIONS  = NO
 
-# If the GENERATE_DOCSET tag is set to YES, additional index files 
-# will be generated that can be used as input for Apple's Xcode 3 
-# integrated development environment, introduced with OSX 10.5 (Leopard). 
-# To create a documentation set, doxygen will generate a Makefile in the 
-# HTML output directory. Running make will produce the docset in that 
-# directory and running "make install" will install the docset in 
-# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find 
-# it at startup. 
-# See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html 
+# With HTML_INDEX_NUM_ENTRIES one can control the preferred number of entries
+# shown in the various tree structured indices initially; the user can expand
+# and collapse entries dynamically later on. Doxygen will expand the tree to
+# such a level that at most the specified number of entries are visible (unless
+# a fully collapsed tree already exceeds this amount). So setting the number of
+# entries 1 will produce a full collapsed tree by default. 0 is a special value
+# representing an infinite number of entries and will result in a full expanded
+# tree by default.
+# Minimum value: 0, maximum value: 9999, default value: 100.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_INDEX_NUM_ENTRIES = 100
+
+# If the GENERATE_DOCSET tag is set to YES, additional index files will be
+# generated that can be used as input for Apple's Xcode 3 integrated development
+# environment (see: http://developer.apple.com/tools/xcode/), introduced with
+# OSX 10.5 (Leopard). To create a documentation set, doxygen will generate a
+# Makefile in the HTML output directory. Running make will produce the docset in
+# that directory and running make install will install the docset in
+# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find it at
+# startup. See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html
 # for more information.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 GENERATE_DOCSET        = NO
 
-# When GENERATE_DOCSET tag is set to YES, this tag determines the name of the 
-# feed. A documentation feed provides an umbrella under which multiple 
-# documentation sets from a single provider (such as a company or product suite) 
-# can be grouped.
+# This tag determines the name of the docset feed. A documentation feed provides
+# an umbrella under which multiple documentation sets from a single provider
+# (such as a company or product suite) can be grouped.
+# The default value is: Doxygen generated docs.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
 
 DOCSET_FEEDNAME        = "Doxygen generated docs"
 
-# When GENERATE_DOCSET tag is set to YES, this tag specifies a string that 
-# should uniquely identify the documentation set bundle. This should be a 
-# reverse domain-name style string, e.g. com.mycompany.MyDocSet. Doxygen 
-# will append .docset to the name.
+# This tag specifies a string that should uniquely identify the documentation
+# set bundle. This should be a reverse domain-name style string, e.g.
+# com.mycompany.MyDocSet. Doxygen will append .docset to the name.
+# The default value is: org.doxygen.Project.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
 
-DOCSET_BUNDLE_ID       = org.doxygen.Project
+DOCSET_BUNDLE_ID       = org.bitcoin.Bitcoin-Core
 
-# When GENERATE_PUBLISHER_ID tag specifies a string that should uniquely identify 
-# the documentation publisher. This should be a reverse domain-name style 
+# The DOCSET_PUBLISHER_ID tag specifies a string that should uniquely identify
+# the documentation publisher. This should be a reverse domain-name style
 # string, e.g. com.mycompany.MyDocSet.documentation.
+# The default value is: org.doxygen.Publisher.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
 
-DOCSET_PUBLISHER_ID    = org.doxygen.Publisher
+DOCSET_PUBLISHER_ID    = org.bitcoin.Bitcoin-Core
 
-# The GENERATE_PUBLISHER_NAME tag identifies the documentation publisher.
+# The DOCSET_PUBLISHER_NAME tag identifies the documentation publisher.
+# The default value is: Publisher.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
 
 DOCSET_PUBLISHER_NAME  = Publisher
 
-# If the GENERATE_HTMLHELP tag is set to YES, additional index files 
-# will be generated that can be used as input for tools like the 
-# Microsoft HTML help workshop to generate a compiled HTML help file (.chm) 
-# of the generated HTML documentation.
+# If the GENERATE_HTMLHELP tag is set to YES then doxygen generates three
+# additional HTML index files: index.hhp, index.hhc, and index.hhk. The
+# index.hhp is a project file that can be read by Microsoft's HTML Help Workshop
+# (see: http://www.microsoft.com/en-us/download/details.aspx?id=21138) on
+# Windows.
+#
+# The HTML Help Workshop contains a compiler that can convert all HTML output
+# generated by doxygen into a single compiled HTML file (.chm). Compiled HTML
+# files are now used as the Windows 98 help format, and will replace the old
+# Windows help format (.hlp) on all Windows platforms in the future. Compressed
+# HTML files also contain an index, a table of contents, and you can search for
+# words in the documentation. The HTML workshop also contains a viewer for
+# compressed HTML files.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 GENERATE_HTMLHELP      = NO
 
-# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can 
-# be used to specify the file name of the resulting .chm file. You 
-# can add a path in front of the file if the result should not be 
+# The CHM_FILE tag can be used to specify the file name of the resulting .chm
+# file. You can add a path in front of the file if the result should not be
 # written to the html output directory.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
 
-CHM_FILE               = 
+CHM_FILE               =
 
-# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can 
-# be used to specify the location (absolute path including file name) of 
-# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run 
-# the HTML help compiler on the generated index.hhp.
+# The HHC_LOCATION tag can be used to specify the location (absolute path
+# including file name) of the HTML help compiler (hhc.exe). If non-empty,
+# doxygen will try to run the HTML help compiler on the generated index.hhp.
+# The file has to be specified with full path.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
 
-HHC_LOCATION           = 
+HHC_LOCATION           =
 
-# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag 
-# controls if a separate .chi index file is generated (YES) or that 
-# it should be included in the master .chm file (NO).
+# The GENERATE_CHI flag controls if a separate .chi index file is generated
+# (YES) or that it should be included in the master .chm file (NO).
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
 
 GENERATE_CHI           = NO
 
-# If the GENERATE_HTMLHELP tag is set to YES, the CHM_INDEX_ENCODING 
-# is used to encode HtmlHelp index (hhk), content (hhc) and project file 
-# content.
+# The CHM_INDEX_ENCODING is used to encode HtmlHelp index (hhk), content (hhc)
+# and project file content.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
 
-CHM_INDEX_ENCODING     = 
+CHM_INDEX_ENCODING     =
 
-# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag 
-# controls whether a binary table of contents is generated (YES) or a 
-# normal table of contents (NO) in the .chm file.
+# The BINARY_TOC flag controls whether a binary table of contents is generated
+# (YES) or a normal table of contents (NO) in the .chm file. Furthermore it
+# enables the Previous and Next buttons.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
 
 BINARY_TOC             = NO
 
-# The TOC_EXPAND flag can be set to YES to add extra items for group members 
-# to the contents of the HTML help documentation and to the tree view.
+# The TOC_EXPAND flag can be set to YES to add extra items for group members to
+# the table of contents of the HTML help documentation and to the tree view.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
 
 TOC_EXPAND             = NO
 
-# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and 
-# QHP_VIRTUAL_FOLDER are set, an additional index file will be generated 
-# that can be used as input for Qt's qhelpgenerator to generate a 
-# Qt Compressed Help (.qch) of the generated HTML documentation.
+# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and
+# QHP_VIRTUAL_FOLDER are set, an additional index file will be generated that
+# can be used as input for Qt's qhelpgenerator to generate a Qt Compressed Help
+# (.qch) of the generated HTML documentation.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 GENERATE_QHP           = NO
 
-# If the QHG_LOCATION tag is specified, the QCH_FILE tag can 
-# be used to specify the file name of the resulting .qch file. 
-# The path specified is relative to the HTML output folder.
+# If the QHG_LOCATION tag is specified, the QCH_FILE tag can be used to specify
+# the file name of the resulting .qch file. The path specified is relative to
+# the HTML output folder.
+# This tag requires that the tag GENERATE_QHP is set to YES.
 
-QCH_FILE               = 
+QCH_FILE               =
 
-# The QHP_NAMESPACE tag specifies the namespace to use when generating 
-# Qt Help Project output. For more information please see 
-# http://doc.trolltech.com/qthelpproject.html#namespace
+# The QHP_NAMESPACE tag specifies the namespace to use when generating Qt Help
+# Project output. For more information please see Qt Help Project / Namespace
+# (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#namespace).
+# The default value is: org.doxygen.Project.
+# This tag requires that the tag GENERATE_QHP is set to YES.
 
 QHP_NAMESPACE          = org.doxygen.Project
 
-# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating 
-# Qt Help Project output. For more information please see 
-# http://doc.trolltech.com/qthelpproject.html#virtual-folders
+# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating Qt
+# Help Project output. For more information please see Qt Help Project / Virtual
+# Folders (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#virtual-
+# folders).
+# The default value is: doc.
+# This tag requires that the tag GENERATE_QHP is set to YES.
 
 QHP_VIRTUAL_FOLDER     = doc
 
-# If QHP_CUST_FILTER_NAME is set, it specifies the name of a custom filter to 
-# add. For more information please see 
-# http://doc.trolltech.com/qthelpproject.html#custom-filters
+# If the QHP_CUST_FILTER_NAME tag is set, it specifies the name of a custom
+# filter to add. For more information please see Qt Help Project / Custom
+# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom-
+# filters).
+# This tag requires that the tag GENERATE_QHP is set to YES.
 
-QHP_CUST_FILTER_NAME   = 
+QHP_CUST_FILTER_NAME   =
 
-# The QHP_CUST_FILT_ATTRS tag specifies the list of the attributes of the 
-# custom filter to add. For more information please see 
-# <a href="http://doc.trolltech.com/qthelpproject.html#custom-filters"> 
-# Qt Help Project / Custom Filters</a>.
+# The QHP_CUST_FILTER_ATTRS tag specifies the list of the attributes of the
+# custom filter to add. For more information please see Qt Help Project / Custom
+# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom-
+# filters).
+# This tag requires that the tag GENERATE_QHP is set to YES.
 
-QHP_CUST_FILTER_ATTRS  = 
+QHP_CUST_FILTER_ATTRS  =
 
-# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this 
-# project's 
-# filter section matches. 
-# <a href="http://doc.trolltech.com/qthelpproject.html#filter-attributes"> 
-# Qt Help Project / Filter Attributes</a>.
+# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this
+# project's filter section matches. Qt Help Project / Filter Attributes (see:
+# http://qt-project.org/doc/qt-4.8/qthelpproject.html#filter-attributes).
+# This tag requires that the tag GENERATE_QHP is set to YES.
 
-QHP_SECT_FILTER_ATTRS  = 
+QHP_SECT_FILTER_ATTRS  =
 
-# If the GENERATE_QHP tag is set to YES, the QHG_LOCATION tag can 
-# be used to specify the location of Qt's qhelpgenerator. 
-# If non-empty doxygen will try to run qhelpgenerator on the generated 
-# .qhp file.
+# The QHG_LOCATION tag can be used to specify the location of Qt's
+# qhelpgenerator. If non-empty doxygen will try to run qhelpgenerator on the
+# generated .qhp file.
+# This tag requires that the tag GENERATE_QHP is set to YES.
 
-QHG_LOCATION           = 
+QHG_LOCATION           =
 
-# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files  
-# will be generated, which together with the HTML files, form an Eclipse help 
-# plugin. To install this plugin and make it available under the help contents 
-# menu in Eclipse, the contents of the directory containing the HTML and XML 
-# files needs to be copied into the plugins directory of eclipse. The name of 
-# the directory within the plugins directory should be the same as 
-# the ECLIPSE_DOC_ID value. After copying Eclipse needs to be restarted before 
-# the help appears.
+# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files will be
+# generated, together with the HTML files, they form an Eclipse help plugin. To
+# install this plugin and make it available under the help contents menu in
+# Eclipse, the contents of the directory containing the HTML and XML files needs
+# to be copied into the plugins directory of eclipse. The name of the directory
+# within the plugins directory should be the same as the ECLIPSE_DOC_ID value.
+# After copying Eclipse needs to be restarted before the help appears.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 GENERATE_ECLIPSEHELP   = NO
 
-# A unique identifier for the eclipse help plugin. When installing the plugin 
-# the directory name containing the HTML and XML files should also have 
-# this name.
+# A unique identifier for the Eclipse help plugin. When installing the plugin
+# the directory name containing the HTML and XML files should also have this
+# name. Each documentation set should have its own identifier.
+# The default value is: org.doxygen.Project.
+# This tag requires that the tag GENERATE_ECLIPSEHELP is set to YES.
 
 ECLIPSE_DOC_ID         = org.doxygen.Project
 
-# The DISABLE_INDEX tag can be used to turn on/off the condensed index at 
-# top of each HTML page. The value NO (the default) enables the index and 
-# the value YES disables it.
+# If you want full control over the layout of the generated HTML pages it might
+# be necessary to disable the index and replace it with your own. The
+# DISABLE_INDEX tag can be used to turn on/off the condensed index (tabs) at top
+# of each HTML page. A value of NO enables the index and the value YES disables
+# it. Since the tabs in the index contain the same information as the navigation
+# tree, you can set this option to YES if you also set GENERATE_TREEVIEW to YES.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 DISABLE_INDEX          = NO
 
-# The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values 
-# (range [0,1..20]) that doxygen will group on one line in the generated HTML 
-# documentation. Note that a value of 0 will completely suppress the enum 
-# values from appearing in the overview section.
-
-ENUM_VALUES_PER_LINE   = 4
-
-# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index 
-# structure should be generated to display hierarchical information. 
-# If the tag value is set to YES, a side panel will be generated 
-# containing a tree-like index structure (just like the one that 
-# is generated for HTML Help). For this to work a browser that supports 
-# JavaScript, DHTML, CSS and frames is required (i.e. any modern browser). 
-# Windows users are probably better off using the HTML help feature.
+# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index
+# structure should be generated to display hierarchical information. If the tag
+# value is set to YES, a side panel will be generated containing a tree-like
+# index structure (just like the one that is generated for HTML Help). For this
+# to work a browser that supports JavaScript, DHTML, CSS and frames is required
+# (i.e. any modern browser). Windows users are probably better off using the
+# HTML help feature. Via custom style sheets (see HTML_EXTRA_STYLESHEET) one can
+# further fine-tune the look of the index. As an example, the default style
+# sheet generated by doxygen has an example that shows how to put an image at
+# the root of the tree instead of the PROJECT_NAME. Since the tree basically has
+# the same information as the tab index, you could consider setting
+# DISABLE_INDEX to YES when enabling this option.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 GENERATE_TREEVIEW      = NO
 
-# By enabling USE_INLINE_TREES, doxygen will generate the Groups, Directories, 
-# and Class Hierarchy pages using a tree view instead of an ordered list.
+# The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values that
+# doxygen will group on one line in the generated HTML documentation.
+#
+# Note that a value of 0 will completely suppress the enum values from appearing
+# in the overview section.
+# Minimum value: 0, maximum value: 20, default value: 4.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
-USE_INLINE_TREES       = NO
+ENUM_VALUES_PER_LINE   = 4
 
-# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be 
-# used to set the initial width (in pixels) of the frame in which the tree 
-# is shown.
+# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be used
+# to set the initial width (in pixels) of the frame in which the tree is shown.
+# Minimum value: 0, maximum value: 1500, default value: 250.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 TREEVIEW_WIDTH         = 250
 
-# When the EXT_LINKS_IN_WINDOW option is set to YES doxygen will open 
-# links to external symbols imported via tag files in a separate window.
+# If the EXT_LINKS_IN_WINDOW option is set to YES, doxygen will open links to
+# external symbols imported via tag files in a separate window.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 EXT_LINKS_IN_WINDOW    = NO
 
-# Use this tag to change the font size of Latex formulas included 
-# as images in the HTML documentation. The default is 10. Note that 
-# when you change the font size after a successful doxygen run you need 
-# to manually remove any form_*.png images from the HTML output directory 
-# to force them to be regenerated.
+# Use this tag to change the font size of LaTeX formulas included as images in
+# the HTML documentation. When you change the font size after a successful
+# doxygen run you need to manually remove any form_*.png images from the HTML
+# output directory to force them to be regenerated.
+# Minimum value: 8, maximum value: 50, default value: 10.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 FORMULA_FONTSIZE       = 10
 
-# Use the FORMULA_TRANPARENT tag to determine whether or not the images 
-# generated for formulas are transparent PNGs. Transparent PNGs are 
-# not supported properly for IE 6.0, but are supported on all modern browsers. 
-# Note that when changing this option you need to delete any form_*.png files 
-# in the HTML output before the changes have effect.
+# Use the FORMULA_TRANPARENT tag to determine whether or not the images
+# generated for formulas are transparent PNGs. Transparent PNGs are not
+# supported properly for IE 6.0, but are supported on all modern browsers.
+#
+# Note that when changing this option you need to delete any form_*.png files in
+# the HTML output directory before the changes have effect.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 FORMULA_TRANSPARENT    = YES
 
-# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax 
-# (see http://www.mathjax.org) which uses client side Javascript for the 
-# rendering instead of using prerendered bitmaps. Use this if you do not 
-# have LaTeX installed or if you want to formulas look prettier in the HTML 
-# output. When enabled you also need to install MathJax separately and 
-# configure the path to it using the MATHJAX_RELPATH option.
+# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see
+# http://www.mathjax.org) which uses client side Javascript for the rendering
+# instead of using pre-rendered bitmaps. Use this if you do not have LaTeX
+# installed or if you want to formulas look prettier in the HTML output. When
+# enabled you may also need to install MathJax separately and configure the path
+# to it using the MATHJAX_RELPATH option.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 USE_MATHJAX            = NO
 
-# When MathJax is enabled you need to specify the location relative to the 
-# HTML output directory using the MATHJAX_RELPATH option. The destination 
-# directory should contain the MathJax.js script. For instance, if the mathjax 
-# directory is located at the same level as the HTML output directory, then 
-# MATHJAX_RELPATH should be ../mathjax. The default value points to the 
-# mathjax.org site, so you can quickly see the result without installing 
-# MathJax, but it is strongly recommended to install a local copy of MathJax 
-# before deployment.
+# When MathJax is enabled you can set the default output format to be used for
+# the MathJax output. See the MathJax site (see:
+# http://docs.mathjax.org/en/latest/output.html) for more details.
+# Possible values are: HTML-CSS (which is slower, but has the best
+# compatibility), NativeMML (i.e. MathML) and SVG.
+# The default value is: HTML-CSS.
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_FORMAT         = HTML-CSS
+
+# When MathJax is enabled you need to specify the location relative to the HTML
+# output directory using the MATHJAX_RELPATH option. The destination directory
+# should contain the MathJax.js script. For instance, if the mathjax directory
+# is located at the same level as the HTML output directory, then
+# MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax
+# Content Delivery Network so you can quickly see the result without installing
+# MathJax. However, it is strongly recommended to install a local copy of
+# MathJax from http://www.mathjax.org before deployment.
+# The default value is: http://cdn.mathjax.org/mathjax/latest.
+# This tag requires that the tag USE_MATHJAX is set to YES.
 
 MATHJAX_RELPATH        = http://www.mathjax.org/mathjax
 
-# When the SEARCHENGINE tag is enabled doxygen will generate a search box 
-# for the HTML output. The underlying search engine uses javascript 
-# and DHTML and should work on any modern browser. Note that when using 
-# HTML help (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets 
-# (GENERATE_DOCSET) there is already a search function so this one should 
-# typically be disabled. For large projects the javascript based search engine 
-# can be slow, then enabling SERVER_BASED_SEARCH may provide a better solution.
+# The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax
+# extension names that should be enabled during MathJax rendering. For example
+# MATHJAX_EXTENSIONS = TeX/AMSmath TeX/AMSsymbols
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_EXTENSIONS     =
+
+# The MATHJAX_CODEFILE tag can be used to specify a file with javascript pieces
+# of code that will be used on startup of the MathJax code. See the MathJax site
+# (see: http://docs.mathjax.org/en/latest/output.html) for more details. For an
+# example see the documentation.
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_CODEFILE       =
+
+# When the SEARCHENGINE tag is enabled doxygen will generate a search box for
+# the HTML output. The underlying search engine uses javascript and DHTML and
+# should work on any modern browser. Note that when using HTML help
+# (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets (GENERATE_DOCSET)
+# there is already a search function so this one should typically be disabled.
+# For large projects the javascript based search engine can be slow, then
+# enabling SERVER_BASED_SEARCH may provide a better solution. It is possible to
+# search using the keyboard; to jump to the search box use <access key> + S
+# (what the <access key> is depends on the OS and browser, but it is typically
+# <CTRL>, <ALT>/<option>, or both). Inside the search box use the <cursor down
+# key> to jump into the search results window, the results can be navigated
+# using the <cursor keys>. Press <Enter> to select an item or <escape> to cancel
+# the search. The filter options can be selected when the cursor is inside the
+# search box by pressing <Shift>+<cursor down>. Also here use the <cursor keys>
+# to select a filter and <Enter> or <escape> to activate or cancel the filter
+# option.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 SEARCHENGINE           = YES
 
-# When the SERVER_BASED_SEARCH tag is enabled the search engine will be 
-# implemented using a PHP enabled web server instead of at the web client 
-# using Javascript. Doxygen will generate the search PHP script and index 
-# file to put on the web server. The advantage of the server 
-# based approach is that it scales better to large projects and allows 
-# full text search. The disadvantages are that it is more difficult to setup 
-# and does not have live searching capabilities.
+# When the SERVER_BASED_SEARCH tag is enabled the search engine will be
+# implemented using a web server instead of a web client using Javascript. There
+# are two flavors of web server based searching depending on the EXTERNAL_SEARCH
+# setting. When disabled, doxygen will generate a PHP script for searching and
+# an index file used by the script. When EXTERNAL_SEARCH is enabled the indexing
+# and searching needs to be provided by external tools. See the section
+# "External Indexing and Searching" for details.
+# The default value is: NO.
+# This tag requires that the tag SEARCHENGINE is set to YES.
 
 SERVER_BASED_SEARCH    = NO
 
+# When EXTERNAL_SEARCH tag is enabled doxygen will no longer generate the PHP
+# script for searching. Instead the search results are written to an XML file
+# which needs to be processed by an external indexer. Doxygen will invoke an
+# external search engine pointed to by the SEARCHENGINE_URL option to obtain the
+# search results.
+#
+# Doxygen ships with an example indexer (doxyindexer) and search engine
+# (doxysearch.cgi) which are based on the open source search engine library
+# Xapian (see: http://xapian.org/).
+#
+# See the section "External Indexing and Searching" for details.
+# The default value is: NO.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+EXTERNAL_SEARCH        = NO
+
+# The SEARCHENGINE_URL should point to a search engine hosted by a web server
+# which will return the search results when EXTERNAL_SEARCH is enabled.
+#
+# Doxygen ships with an example indexer (doxyindexer) and search engine
+# (doxysearch.cgi) which are based on the open source search engine library
+# Xapian (see: http://xapian.org/). See the section "External Indexing and
+# Searching" for details.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+SEARCHENGINE_URL       =
+
+# When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the unindexed
+# search data is written to a file for indexing by an external tool. With the
+# SEARCHDATA_FILE tag the name of this file can be specified.
+# The default file is: searchdata.xml.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+SEARCHDATA_FILE        = searchdata.xml
+
+# When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the
+# EXTERNAL_SEARCH_ID tag can be used as an identifier for the project. This is
+# useful in combination with EXTRA_SEARCH_MAPPINGS to search through multiple
+# projects and redirect the results back to the right project.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+EXTERNAL_SEARCH_ID     =
+
+# The EXTRA_SEARCH_MAPPINGS tag can be used to enable searching through doxygen
+# projects other than the one defined by this configuration file, but that are
+# all added to the same external search index. Each project needs to have a
+# unique id set via EXTERNAL_SEARCH_ID. The search mapping then maps the id of
+# to a relative location where the documentation can be found. The format is:
+# EXTRA_SEARCH_MAPPINGS = tagname1=loc1 tagname2=loc2 ...
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+EXTRA_SEARCH_MAPPINGS  =
+
 #---------------------------------------------------------------------------
-# configuration options related to the LaTeX output
+# Configuration options related to the LaTeX output
 #---------------------------------------------------------------------------
 
-# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will 
-# generate Latex output.
+# If the GENERATE_LATEX tag is set to YES, doxygen will generate LaTeX output.
+# The default value is: YES.
 
 GENERATE_LATEX         = NO
 
-# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. 
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
-# put in front of it. If left blank `latex' will be used as the default path.
+# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: latex.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
 
 LATEX_OUTPUT           = latex
 
-# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be 
-# invoked. If left blank `latex' will be used as the default command name. 
-# Note that when enabling USE_PDFLATEX this option is only used for 
-# generating bitmaps for formulas in the HTML output, but not in the 
-# Makefile that is written to the output directory.
+# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be
+# invoked.
+#
+# Note that when enabling USE_PDFLATEX this option is only used for generating
+# bitmaps for formulas in the HTML output, but not in the Makefile that is
+# written to the output directory.
+# The default file is: latex.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
 
 LATEX_CMD_NAME         = latex
 
-# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to 
-# generate index for LaTeX. If left blank `makeindex' will be used as the 
-# default command name.
+# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to generate
+# index for LaTeX.
+# The default file is: makeindex.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
 
 MAKEINDEX_CMD_NAME     = makeindex
 
-# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact 
-# LaTeX documents. This may be useful for small projects and may help to 
-# save some trees in general.
+# If the COMPACT_LATEX tag is set to YES, doxygen generates more compact LaTeX
+# documents. This may be useful for small projects and may help to save some
+# trees in general.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
 
 COMPACT_LATEX          = NO
 
-# The PAPER_TYPE tag can be used to set the paper type that is used 
-# by the printer. Possible values are: a4, letter, legal and 
-# executive. If left blank a4wide will be used.
+# The PAPER_TYPE tag can be used to set the paper type that is used by the
+# printer.
+# Possible values are: a4 (210 x 297 mm), letter (8.5 x 11 inches), legal (8.5 x
+# 14 inches) and executive (7.25 x 10.5 inches).
+# The default value is: a4.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
 
 PAPER_TYPE             = a4
 
-# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX 
-# packages that should be included in the LaTeX output.
+# The EXTRA_PACKAGES tag can be used to specify one or more LaTeX package names
+# that should be included in the LaTeX output. The package can be specified just
+# by its name or with the correct syntax as to be used with the LaTeX
+# \usepackage command. To get the times font for instance you can specify :
+# EXTRA_PACKAGES=times or EXTRA_PACKAGES={times}
+# To use the option intlimits with the amsmath package you can specify:
+# EXTRA_PACKAGES=[intlimits]{amsmath}
+# If left blank no extra packages will be included.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+EXTRA_PACKAGES         =
+
+# The LATEX_HEADER tag can be used to specify a personal LaTeX header for the
+# generated LaTeX document. The header should contain everything until the first
+# chapter. If it is left blank doxygen will generate a standard header. See
+# section "Doxygen usage" for information on how to let doxygen write the
+# default header to a separate file.
+#
+# Note: Only use a user-defined header if you know what you are doing! The
+# following commands have a special meaning inside the header: $title,
+# $datetime, $date, $doxygenversion, $projectname, $projectnumber,
+# $projectbrief, $projectlogo. Doxygen will replace $title with the empty
+# string, for the replacement values of the other commands the user is referred
+# to HTML_HEADER.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_HEADER           =
+
+# The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for the
+# generated LaTeX document. The footer should contain everything after the last
+# chapter. If it is left blank doxygen will generate a standard footer. See
+# LATEX_HEADER for more information on how to generate a default footer and what
+# special commands can be used inside the footer.
+#
+# Note: Only use a user-defined footer if you know what you are doing!
+# This tag requires that the tag GENERATE_LATEX is set to YES.
 
-EXTRA_PACKAGES         = 
+LATEX_FOOTER           =
 
-# The LATEX_HEADER tag can be used to specify a personal LaTeX header for 
-# the generated latex document. The header should contain everything until 
-# the first chapter. If it is left blank doxygen will generate a 
-# standard header. Notice: only use this tag if you know what you are doing!
+# The LATEX_EXTRA_STYLESHEET tag can be used to specify additional user-defined
+# LaTeX style sheets that are included after the standard style sheets created
+# by doxygen. Using this option one can overrule certain style aspects. Doxygen
+# will copy the style sheet files to the output directory.
+# Note: The order of the extra style sheet files is of importance (e.g. the last
+# style sheet in the list overrules the setting of the previous ones in the
+# list).
+# This tag requires that the tag GENERATE_LATEX is set to YES.
 
-LATEX_HEADER           = 
+LATEX_EXTRA_STYLESHEET =
 
-# The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for 
-# the generated latex document. The footer should contain everything after 
-# the last chapter. If it is left blank doxygen will generate a 
-# standard footer. Notice: only use this tag if you know what you are doing!
+# The LATEX_EXTRA_FILES tag can be used to specify one or more extra images or
+# other source files which should be copied to the LATEX_OUTPUT output
+# directory. Note that the files will be copied as-is; there are no commands or
+# markers available.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
 
-LATEX_FOOTER           = 
+LATEX_EXTRA_FILES      =
 
-# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated 
-# is prepared for conversion to pdf (using ps2pdf). The pdf file will 
-# contain links (just like the HTML output) instead of page references 
-# This makes the output suitable for online browsing using a pdf viewer.
+# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated is
+# prepared for conversion to PDF (using ps2pdf or pdflatex). The PDF file will
+# contain links (just like the HTML output) instead of page references. This
+# makes the output suitable for online browsing using a PDF viewer.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
 
 PDF_HYPERLINKS         = YES
 
-# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of 
-# plain latex in the generated Makefile. Set this option to YES to get a 
+# If the USE_PDFLATEX tag is set to YES, doxygen will use pdflatex to generate
+# the PDF file directly from the LaTeX files. Set this option to YES, to get a
 # higher quality PDF documentation.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
 
 USE_PDFLATEX           = YES
 
-# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode. 
-# command to the generated LaTeX files. This will instruct LaTeX to keep 
-# running if errors occur, instead of asking the user for help. 
-# This option is also used when generating formulas in HTML.
+# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \batchmode
+# command to the generated LaTeX files. This will instruct LaTeX to keep running
+# if errors occur, instead of asking the user for help. This option is also used
+# when generating formulas in HTML.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
 
 LATEX_BATCHMODE        = NO
 
-# If LATEX_HIDE_INDICES is set to YES then doxygen will not 
-# include the index chapters (such as File Index, Compound Index, etc.) 
-# in the output.
+# If the LATEX_HIDE_INDICES tag is set to YES then doxygen will not include the
+# index chapters (such as File Index, Compound Index, etc.) in the output.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
 
 LATEX_HIDE_INDICES     = NO
 
-# If LATEX_SOURCE_CODE is set to YES then doxygen will include 
-# source code with syntax highlighting in the LaTeX output. 
-# Note that which sources are shown also depends on other settings 
-# such as SOURCE_BROWSER.
+# If the LATEX_SOURCE_CODE tag is set to YES then doxygen will include source
+# code with syntax highlighting in the LaTeX output.
+#
+# Note that which sources are shown also depends on other settings such as
+# SOURCE_BROWSER.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
 
 LATEX_SOURCE_CODE      = NO
 
+# The LATEX_BIB_STYLE tag can be used to specify the style to use for the
+# bibliography, e.g. plainnat, or ieeetr. See
+# http://en.wikipedia.org/wiki/BibTeX and \cite for more info.
+# The default value is: plain.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_BIB_STYLE        = plain
+
+# If the LATEX_TIMESTAMP tag is set to YES then the footer of each generated
+# page will contain the date and time when the page was generated. Setting this
+# to NO can help when comparing the output of multiple runs.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_TIMESTAMP        = NO
+
 #---------------------------------------------------------------------------
-# configuration options related to the RTF output
+# Configuration options related to the RTF output
 #---------------------------------------------------------------------------
 
-# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output 
-# The RTF output is optimized for Word 97 and may not look very pretty with 
-# other RTF readers or editors.
+# If the GENERATE_RTF tag is set to YES, doxygen will generate RTF output. The
+# RTF output is optimized for Word 97 and may not look too pretty with other RTF
+# readers/editors.
+# The default value is: NO.
 
 GENERATE_RTF           = NO
 
-# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. 
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
-# put in front of it. If left blank `rtf' will be used as the default path.
+# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: rtf.
+# This tag requires that the tag GENERATE_RTF is set to YES.
 
 RTF_OUTPUT             = rtf
 
-# If the COMPACT_RTF tag is set to YES Doxygen generates more compact 
-# RTF documents. This may be useful for small projects and may help to 
-# save some trees in general.
+# If the COMPACT_RTF tag is set to YES, doxygen generates more compact RTF
+# documents. This may be useful for small projects and may help to save some
+# trees in general.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_RTF is set to YES.
 
 COMPACT_RTF            = NO
 
-# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated 
-# will contain hyperlink fields. The RTF file will 
-# contain links (just like the HTML output) instead of page references. 
-# This makes the output suitable for online browsing using WORD or other 
-# programs which support those fields. 
-# Note: wordpad (write) and others do not support links.
+# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated will
+# contain hyperlink fields. The RTF file will contain links (just like the HTML
+# output) instead of page references. This makes the output suitable for online
+# browsing using Word or some other Word compatible readers that support those
+# fields.
+#
+# Note: WordPad (write) and others do not support links.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_RTF is set to YES.
 
 RTF_HYPERLINKS         = NO
 
-# Load stylesheet definitions from file. Syntax is similar to doxygen's 
-# config file, i.e. a series of assignments. You only have to provide 
-# replacements, missing definitions are set to their default value.
+# Load stylesheet definitions from file. Syntax is similar to doxygen's config
+# file, i.e. a series of assignments. You only have to provide replacements,
+# missing definitions are set to their default value.
+#
+# See also section "Doxygen usage" for information on how to generate the
+# default style sheet that doxygen normally uses.
+# This tag requires that the tag GENERATE_RTF is set to YES.
 
-RTF_STYLESHEET_FILE    = 
+RTF_STYLESHEET_FILE    =
 
-# Set optional variables used in the generation of an rtf document. 
-# Syntax is similar to doxygen's config file.
+# Set optional variables used in the generation of an RTF document. Syntax is
+# similar to doxygen's config file. A template extensions file can be generated
+# using doxygen -e rtf extensionFile.
+# This tag requires that the tag GENERATE_RTF is set to YES.
 
-RTF_EXTENSIONS_FILE    = 
+RTF_EXTENSIONS_FILE    =
+
+# If the RTF_SOURCE_CODE tag is set to YES then doxygen will include source code
+# with syntax highlighting in the RTF output.
+#
+# Note that which sources are shown also depends on other settings such as
+# SOURCE_BROWSER.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+RTF_SOURCE_CODE        = NO
 
 #---------------------------------------------------------------------------
-# configuration options related to the man page output
+# Configuration options related to the man page output
 #---------------------------------------------------------------------------
 
-# If the GENERATE_MAN tag is set to YES (the default) Doxygen will 
-# generate man pages
+# If the GENERATE_MAN tag is set to YES, doxygen will generate man pages for
+# classes and files.
+# The default value is: NO.
 
 GENERATE_MAN           = NO
 
-# The MAN_OUTPUT tag is used to specify where the man pages will be put. 
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
-# put in front of it. If left blank `man' will be used as the default path.
+# The MAN_OUTPUT tag is used to specify where the man pages will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it. A directory man3 will be created inside the directory specified by
+# MAN_OUTPUT.
+# The default directory is: man.
+# This tag requires that the tag GENERATE_MAN is set to YES.
 
 MAN_OUTPUT             = man
 
-# The MAN_EXTENSION tag determines the extension that is added to 
-# the generated man pages (default is the subroutine's section .3)
+# The MAN_EXTENSION tag determines the extension that is added to the generated
+# man pages. In case the manual section does not start with a number, the number
+# 3 is prepended. The dot (.) at the beginning of the MAN_EXTENSION tag is
+# optional.
+# The default value is: .3.
+# This tag requires that the tag GENERATE_MAN is set to YES.
 
 MAN_EXTENSION          = .3
 
-# If the MAN_LINKS tag is set to YES and Doxygen generates man output, 
-# then it will generate one additional man file for each entity 
-# documented in the real man page(s). These additional files 
-# only source the real man page, but without them the man command 
-# would be unable to find the correct page. The default is NO.
+# The MAN_SUBDIR tag determines the name of the directory created within
+# MAN_OUTPUT in which the man pages are placed. If defaults to man followed by
+# MAN_EXTENSION with the initial . removed.
+# This tag requires that the tag GENERATE_MAN is set to YES.
+
+MAN_SUBDIR             =
+
+# If the MAN_LINKS tag is set to YES and doxygen generates man output, then it
+# will generate one additional man file for each entity documented in the real
+# man page(s). These additional files only source the real man page, but without
+# them the man command would be unable to find the correct page.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_MAN is set to YES.
 
 MAN_LINKS              = NO
 
 #---------------------------------------------------------------------------
-# configuration options related to the XML output
+# Configuration options related to the XML output
 #---------------------------------------------------------------------------
 
-# If the GENERATE_XML tag is set to YES Doxygen will 
-# generate an XML file that captures the structure of 
-# the code including all documentation.
+# If the GENERATE_XML tag is set to YES, doxygen will generate an XML file that
+# captures the structure of the code including all documentation.
+# The default value is: NO.
 
 GENERATE_XML           = NO
 
-# The XML_OUTPUT tag is used to specify where the XML pages will be put. 
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
-# put in front of it. If left blank `xml' will be used as the default path.
+# The XML_OUTPUT tag is used to specify where the XML pages will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: xml.
+# This tag requires that the tag GENERATE_XML is set to YES.
 
 XML_OUTPUT             = xml
 
-# The XML_SCHEMA tag can be used to specify an XML schema, 
-# which can be used by a validating XML parser to check the 
-# syntax of the XML files.
+# If the XML_PROGRAMLISTING tag is set to YES, doxygen will dump the program
+# listings (including syntax highlighting and cross-referencing information) to
+# the XML output. Note that enabling this will significantly increase the size
+# of the XML output.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_XML is set to YES.
+
+XML_PROGRAMLISTING     = YES
+
+#---------------------------------------------------------------------------
+# Configuration options related to the DOCBOOK output
+#---------------------------------------------------------------------------
 
-XML_SCHEMA             = 
+# If the GENERATE_DOCBOOK tag is set to YES, doxygen will generate Docbook files
+# that can be used to generate PDF.
+# The default value is: NO.
 
-# The XML_DTD tag can be used to specify an XML DTD, 
-# which can be used by a validating XML parser to check the 
-# syntax of the XML files.
+GENERATE_DOCBOOK       = NO
 
-XML_DTD                = 
+# The DOCBOOK_OUTPUT tag is used to specify where the Docbook pages will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be put in
+# front of it.
+# The default directory is: docbook.
+# This tag requires that the tag GENERATE_DOCBOOK is set to YES.
 
-# If the XML_PROGRAMLISTING tag is set to YES Doxygen will 
-# dump the program listings (including syntax highlighting 
-# and cross-referencing information) to the XML output. Note that 
-# enabling this will significantly increase the size of the XML output.
+DOCBOOK_OUTPUT         = docbook
 
-XML_PROGRAMLISTING     = YES
+# If the DOCBOOK_PROGRAMLISTING tag is set to YES, doxygen will include the
+# program listings (including syntax highlighting and cross-referencing
+# information) to the DOCBOOK output. Note that enabling this will significantly
+# increase the size of the DOCBOOK output.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_DOCBOOK is set to YES.
+
+DOCBOOK_PROGRAMLISTING = NO
 
 #---------------------------------------------------------------------------
-# configuration options for the AutoGen Definitions output
+# Configuration options for the AutoGen Definitions output
 #---------------------------------------------------------------------------
 
-# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will 
-# generate an AutoGen Definitions (see autogen.sf.net) file 
-# that captures the structure of the code including all 
-# documentation. Note that this feature is still experimental 
-# and incomplete at the moment.
+# If the GENERATE_AUTOGEN_DEF tag is set to YES, doxygen will generate an
+# AutoGen Definitions (see http://autogen.sf.net) file that captures the
+# structure of the code including all documentation. Note that this feature is
+# still experimental and incomplete at the moment.
+# The default value is: NO.
 
 GENERATE_AUTOGEN_DEF   = NO
 
 #---------------------------------------------------------------------------
-# configuration options related to the Perl module output
+# Configuration options related to the Perl module output
 #---------------------------------------------------------------------------
 
-# If the GENERATE_PERLMOD tag is set to YES Doxygen will 
-# generate a Perl module file that captures the structure of 
-# the code including all documentation. Note that this 
-# feature is still experimental and incomplete at the 
-# moment.
+# If the GENERATE_PERLMOD tag is set to YES, doxygen will generate a Perl module
+# file that captures the structure of the code including all documentation.
+#
+# Note that this feature is still experimental and incomplete at the moment.
+# The default value is: NO.
 
 GENERATE_PERLMOD       = NO
 
-# If the PERLMOD_LATEX tag is set to YES Doxygen will generate 
-# the necessary Makefile rules, Perl scripts and LaTeX code to be able 
-# to generate PDF and DVI output from the Perl module output.
+# If the PERLMOD_LATEX tag is set to YES, doxygen will generate the necessary
+# Makefile rules, Perl scripts and LaTeX code to be able to generate PDF and DVI
+# output from the Perl module output.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_PERLMOD is set to YES.
 
 PERLMOD_LATEX          = NO
 
-# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be 
-# nicely formatted so it can be parsed by a human reader.  This is useful 
-# if you want to understand what is going on.  On the other hand, if this 
-# tag is set to NO the size of the Perl module output will be much smaller 
-# and Perl will parse it just the same.
+# If the PERLMOD_PRETTY tag is set to YES, the Perl module output will be nicely
+# formatted so it can be parsed by a human reader. This is useful if you want to
+# understand what is going on. On the other hand, if this tag is set to NO, the
+# size of the Perl module output will be much smaller and Perl will parse it
+# just the same.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_PERLMOD is set to YES.
 
 PERLMOD_PRETTY         = YES
 
-# The names of the make variables in the generated doxyrules.make file 
-# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. 
-# This is useful so different doxyrules.make files included by the same 
-# Makefile don't overwrite each other's variables.
+# The names of the make variables in the generated doxyrules.make file are
+# prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. This is useful
+# so different doxyrules.make files included by the same Makefile don't
+# overwrite each other's variables.
+# This tag requires that the tag GENERATE_PERLMOD is set to YES.
 
-PERLMOD_MAKEVAR_PREFIX = 
+PERLMOD_MAKEVAR_PREFIX =
 
 #---------------------------------------------------------------------------
 # Configuration options related to the preprocessor
 #---------------------------------------------------------------------------
 
-# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will 
-# evaluate all C-preprocessor directives found in the sources and include 
-# files.
+# If the ENABLE_PREPROCESSING tag is set to YES, doxygen will evaluate all
+# C-preprocessor directives found in the sources and include files.
+# The default value is: YES.
 
 ENABLE_PREPROCESSING   = YES
 
-# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro 
-# names in the source code. If set to NO (the default) only conditional 
-# compilation will be performed. Macro expansion can be done in a controlled 
-# way by setting EXPAND_ONLY_PREDEF to YES.
+# If the MACRO_EXPANSION tag is set to YES, doxygen will expand all macro names
+# in the source code. If set to NO, only conditional compilation will be
+# performed. Macro expansion can be done in a controlled way by setting
+# EXPAND_ONLY_PREDEF to YES.
+# The default value is: NO.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
 
 MACRO_EXPANSION        = NO
 
-# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES 
-# then the macro expansion is limited to the macros specified with the 
-# PREDEFINED and EXPAND_AS_DEFINED tags.
+# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES then
+# the macro expansion is limited to the macros specified with the PREDEFINED and
+# EXPAND_AS_DEFINED tags.
+# The default value is: NO.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
 
 EXPAND_ONLY_PREDEF     = NO
 
-# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files 
-# pointed to by INCLUDE_PATH will be searched when a #include is found.
+# If the SEARCH_INCLUDES tag is set to YES, the include files in the
+# INCLUDE_PATH will be searched if a #include is found.
+# The default value is: YES.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
 
 SEARCH_INCLUDES        = YES
 
-# The INCLUDE_PATH tag can be used to specify one or more directories that 
-# contain include files that are not input files but should be processed by 
-# the preprocessor.
+# The INCLUDE_PATH tag can be used to specify one or more directories that
+# contain include files that are not input files but should be processed by the
+# preprocessor.
+# This tag requires that the tag SEARCH_INCLUDES is set to YES.
 
-INCLUDE_PATH           = 
+INCLUDE_PATH           =
 
-# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard 
-# patterns (like *.h and *.hpp) to filter out the header-files in the 
-# directories. If left blank, the patterns specified with FILE_PATTERNS will 
-# be used.
+# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
+# patterns (like *.h and *.hpp) to filter out the header-files in the
+# directories. If left blank, the patterns specified with FILE_PATTERNS will be
+# used.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
 
-INCLUDE_FILE_PATTERNS  = 
+INCLUDE_FILE_PATTERNS  =
 
-# The PREDEFINED tag can be used to specify one or more macro names that 
-# are defined before the preprocessor is started (similar to the -D option of 
-# gcc). The argument of the tag is a list of macros of the form: name 
-# or name=definition (no spaces). If the definition and the = are 
-# omitted =1 is assumed. To prevent a macro definition from being 
-# undefined via #undef or recursively expanded use the := operator 
-# instead of the = operator.
+# The PREDEFINED tag can be used to specify one or more macro names that are
+# defined before the preprocessor is started (similar to the -D option of e.g.
+# gcc). The argument of the tag is a list of macros of the form: name or
+# name=definition (no spaces). If the definition and the "=" are omitted, "=1"
+# is assumed. To prevent a macro definition from being undefined via #undef or
+# recursively expanded use the := operator instead of the = operator.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
 
-PREDEFINED             = 
+PREDEFINED             =
 
-# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then 
-# this tag can be used to specify a list of macro names that should be expanded. 
-# The macro definition that is found in the sources will be used. 
-# Use the PREDEFINED tag if you want to use a different macro definition that 
-# overrules the definition found in the source code.
+# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this
+# tag can be used to specify a list of macro names that should be expanded. The
+# macro definition that is found in the sources will be used. Use the PREDEFINED
+# tag if you want to use a different macro definition that overrules the
+# definition found in the source code.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
 
-EXPAND_AS_DEFINED      = 
+EXPAND_AS_DEFINED      =
 
-# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then 
-# doxygen's preprocessor will remove all references to function-like macros 
-# that are alone on a line, have an all uppercase name, and do not end with a 
-# semicolon, because these will confuse the parser if not removed.
+# If the SKIP_FUNCTION_MACROS tag is set to YES then doxygen's preprocessor will
+# remove all references to function-like macros that are alone on a line, have
+# an all uppercase name, and do not end with a semicolon. Such function macros
+# are typically used for boiler-plate code, and will confuse the parser if not
+# removed.
+# The default value is: YES.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
 
 SKIP_FUNCTION_MACROS   = YES
 
 #---------------------------------------------------------------------------
-# Configuration::additions related to external references
+# Configuration options related to external references
 #---------------------------------------------------------------------------
 
-# The TAGFILES option can be used to specify one or more tagfiles. 
-# Optionally an initial location of the external documentation 
-# can be added for each tagfile. The format of a tag file without 
-# this location is as follows: 
-#   TAGFILES = file1 file2 ... 
-# Adding location for the tag files is done as follows: 
-#   TAGFILES = file1=loc1 "file2 = loc2" ... 
-# where "loc1" and "loc2" can be relative or absolute paths or 
-# URLs. If a location is present for each tag, the installdox tool 
-# does not have to be run to correct the links. 
-# Note that each tag file must have a unique name 
-# (where the name does NOT include the path) 
-# If a tag file is not located in the directory in which doxygen 
-# is run, you must also specify the path to the tagfile here.
+# The TAGFILES tag can be used to specify one or more tag files. For each tag
+# file the location of the external documentation should be added. The format of
+# a tag file without this location is as follows:
+# TAGFILES = file1 file2 ...
+# Adding location for the tag files is done as follows:
+# TAGFILES = file1=loc1 "file2 = loc2" ...
+# where loc1 and loc2 can be relative or absolute paths or URLs. See the
+# section "Linking to external documentation" for more information about the use
+# of tag files.
+# Note: Each tag file must have a unique name (where the name does NOT include
+# the path). If a tag file is not located in the directory in which doxygen is
+# run, you must also specify the path to the tagfile here.
 
-TAGFILES               = 
+TAGFILES               =
 
-# When a file name is specified after GENERATE_TAGFILE, doxygen will create 
-# a tag file that is based on the input files it reads.
+# When a file name is specified after GENERATE_TAGFILE, doxygen will create a
+# tag file that is based on the input files it reads. See section "Linking to
+# external documentation" for more information about the usage of tag files.
 
-GENERATE_TAGFILE       = 
+GENERATE_TAGFILE       =
 
-# If the ALLEXTERNALS tag is set to YES all external classes will be listed 
-# in the class index. If set to NO only the inherited external classes 
-# will be listed.
+# If the ALLEXTERNALS tag is set to YES, all external class will be listed in
+# the class index. If set to NO, only the inherited external classes will be
+# listed.
+# The default value is: NO.
 
 ALLEXTERNALS           = NO
 
-# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed 
-# in the modules index. If set to NO, only the current project's groups will 
-# be listed.
+# If the EXTERNAL_GROUPS tag is set to YES, all external groups will be listed
+# in the modules index. If set to NO, only the current project's groups will be
+# listed.
+# The default value is: YES.
 
 EXTERNAL_GROUPS        = YES
 
-# The PERL_PATH should be the absolute path and name of the perl script 
-# interpreter (i.e. the result of `which perl').
+# If the EXTERNAL_PAGES tag is set to YES, all external pages will be listed in
+# the related pages index. If set to NO, only the current project's pages will
+# be listed.
+# The default value is: YES.
+
+EXTERNAL_PAGES         = YES
+
+# The PERL_PATH should be the absolute path and name of the perl script
+# interpreter (i.e. the result of 'which perl').
+# The default file (with absolute path) is: /usr/bin/perl.
 
 PERL_PATH              = /usr/bin/perl
 
@@ -1549,204 +2149,312 @@ PERL_PATH              = /usr/bin/perl
 # Configuration options related to the dot tool
 #---------------------------------------------------------------------------
 
-# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will 
-# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base 
-# or super classes. Setting the tag to NO turns the diagrams off. Note that 
-# this option also works with HAVE_DOT disabled, but it is recommended to 
-# install and use dot, since it yields more powerful graphs.
+# If the CLASS_DIAGRAMS tag is set to YES, doxygen will generate a class diagram
+# (in HTML and LaTeX) for classes with base or super classes. Setting the tag to
+# NO turns the diagrams off. Note that this option also works with HAVE_DOT
+# disabled, but it is recommended to install and use dot, since it yields more
+# powerful graphs.
+# The default value is: YES.
 
 CLASS_DIAGRAMS         = YES
 
-# You can define message sequence charts within doxygen comments using the \msc 
-# command. Doxygen will then run the mscgen tool (see 
-# http://www.mcternan.me.uk/mscgen/) to produce the chart and insert it in the 
-# documentation. The MSCGEN_PATH tag allows you to specify the directory where 
-# the mscgen tool resides. If left empty the tool is assumed to be found in the 
+# You can define message sequence charts within doxygen comments using the \msc
+# command. Doxygen will then run the mscgen tool (see:
+# http://www.mcternan.me.uk/mscgen/)) to produce the chart and insert it in the
+# documentation. The MSCGEN_PATH tag allows you to specify the directory where
+# the mscgen tool resides. If left empty the tool is assumed to be found in the
 # default search path.
 
-MSCGEN_PATH            = 
+MSCGEN_PATH            =
 
-# If set to YES, the inheritance and collaboration graphs will hide 
-# inheritance and usage relations if the target is undocumented 
-# or is not a class.
+# You can include diagrams made with dia in doxygen documentation. Doxygen will
+# then run dia to produce the diagram and insert it in the documentation. The
+# DIA_PATH tag allows you to specify the directory where the dia binary resides.
+# If left empty dia is assumed to be found in the default search path.
+
+DIA_PATH               =
+
+# If set to YES the inheritance and collaboration graphs will hide inheritance
+# and usage relations if the target is undocumented or is not a class.
+# The default value is: YES.
 
 HIDE_UNDOC_RELATIONS   = YES
 
-# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is 
-# available from the path. This tool is part of Graphviz, a graph visualization 
-# toolkit from AT&T and Lucent Bell Labs. The other options in this section 
-# have no effect if this option is set to NO (the default)
+# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is
+# available from the path. This tool is part of Graphviz (see:
+# http://www.graphviz.org/), a graph visualization toolkit from AT&T and Lucent
+# Bell Labs. The other options in this section have no effect if this option is
+# set to NO
+# The default value is: NO.
 
 HAVE_DOT               = YES
 
-# The DOT_NUM_THREADS specifies the number of dot invocations doxygen is 
-# allowed to run in parallel. When set to 0 (the default) doxygen will 
-# base this on the number of processors available in the system. You can set it 
-# explicitly to a value larger than 0 to get control over the balance 
-# between CPU load and processing speed.
+# The DOT_NUM_THREADS specifies the number of dot invocations doxygen is allowed
+# to run in parallel. When set to 0 doxygen will base this on the number of
+# processors available in the system. You can set it explicitly to a value
+# larger than 0 to get control over the balance between CPU load and processing
+# speed.
+# Minimum value: 0, maximum value: 32, default value: 0.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 DOT_NUM_THREADS        = 0
 
-# By default doxygen will write a font called Helvetica to the output 
-# directory and reference it in all dot files that doxygen generates. 
-# When you want a differently looking font you can specify the font name 
-# using DOT_FONTNAME. You need to make sure dot is able to find the font, 
-# which can be done by putting it in a standard location or by setting the 
-# DOTFONTPATH environment variable or by setting DOT_FONTPATH to the directory 
-# containing the font.
+# When you want a differently looking font in the dot files that doxygen
+# generates you can specify the font name using DOT_FONTNAME. You need to make
+# sure dot is able to find the font, which can be done by putting it in a
+# standard location or by setting the DOTFONTPATH environment variable or by
+# setting DOT_FONTPATH to the directory containing the font.
+# The default value is: Helvetica.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 DOT_FONTNAME           = Helvetica
 
-# The DOT_FONTSIZE tag can be used to set the size of the font of dot graphs. 
-# The default size is 10pt.
+# The DOT_FONTSIZE tag can be used to set the size (in points) of the font of
+# dot graphs.
+# Minimum value: 4, maximum value: 24, default value: 10.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 DOT_FONTSIZE           = 10
 
-# By default doxygen will tell dot to use the output directory to look for the 
-# FreeSans.ttf font (which doxygen will put there itself). If you specify a 
-# different font using DOT_FONTNAME you can set the path where dot 
-# can find it using this tag.
+# By default doxygen will tell dot to use the default font as specified with
+# DOT_FONTNAME. If you specify a different font using DOT_FONTNAME you can set
+# the path where dot can find it using this tag.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
-DOT_FONTPATH           = 
+DOT_FONTPATH           =
 
-# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen 
-# will generate a graph for each documented class showing the direct and 
-# indirect inheritance relations. Setting this tag to YES will force the 
-# the CLASS_DIAGRAMS tag to NO.
+# If the CLASS_GRAPH tag is set to YES then doxygen will generate a graph for
+# each documented class showing the direct and indirect inheritance relations.
+# Setting this tag to YES will force the CLASS_DIAGRAMS tag to NO.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 CLASS_GRAPH            = YES
 
-# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen 
-# will generate a graph for each documented class showing the direct and 
-# indirect implementation dependencies (inheritance, containment, and 
-# class references variables) of the class with other documented classes.
+# If the COLLABORATION_GRAPH tag is set to YES then doxygen will generate a
+# graph for each documented class showing the direct and indirect implementation
+# dependencies (inheritance, containment, and class references variables) of the
+# class with other documented classes.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 COLLABORATION_GRAPH    = YES
 
-# If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen 
-# will generate a graph for groups, showing the direct groups dependencies
+# If the GROUP_GRAPHS tag is set to YES then doxygen will generate a graph for
+# groups, showing the direct groups dependencies.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 GROUP_GRAPHS           = YES
 
-# If the UML_LOOK tag is set to YES doxygen will generate inheritance and 
-# collaboration diagrams in a style similar to the OMG's Unified Modeling 
+# If the UML_LOOK tag is set to YES, doxygen will generate inheritance and
+# collaboration diagrams in a style similar to the OMG's Unified Modeling
 # Language.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 UML_LOOK               = NO
 
-# If set to YES, the inheritance and collaboration graphs will show the 
-# relations between templates and their instances.
+# If the UML_LOOK tag is enabled, the fields and methods are shown inside the
+# class node. If there are many fields or methods and many nodes the graph may
+# become too big to be useful. The UML_LIMIT_NUM_FIELDS threshold limits the
+# number of items for each type to make the size more manageable. Set this to 0
+# for no limit. Note that the threshold may be exceeded by 50% before the limit
+# is enforced. So when you set the threshold to 10, up to 15 fields may appear,
+# but if the number exceeds 15, the total amount of fields shown is limited to
+# 10.
+# Minimum value: 0, maximum value: 100, default value: 10.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+UML_LIMIT_NUM_FIELDS   = 10
+
+# If the TEMPLATE_RELATIONS tag is set to YES then the inheritance and
+# collaboration graphs will show the relations between templates and their
+# instances.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 TEMPLATE_RELATIONS     = NO
 
-# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT 
-# tags are set to YES then doxygen will generate a graph for each documented 
-# file showing the direct and indirect include dependencies of the file with 
-# other documented files.
+# If the INCLUDE_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are set to
+# YES then doxygen will generate a graph for each documented file showing the
+# direct and indirect include dependencies of the file with other documented
+# files.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 INCLUDE_GRAPH          = YES
 
-# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and 
-# HAVE_DOT tags are set to YES then doxygen will generate a graph for each 
-# documented header file showing the documented files that directly or 
-# indirectly include this file.
+# If the INCLUDED_BY_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are
+# set to YES then doxygen will generate a graph for each documented file showing
+# the direct and indirect include dependencies of the file with other documented
+# files.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 INCLUDED_BY_GRAPH      = YES
 
-# If the CALL_GRAPH and HAVE_DOT options are set to YES then 
-# doxygen will generate a call dependency graph for every global function 
-# or class method. Note that enabling this option will significantly increase 
-# the time of a run. So in most cases it will be better to enable call graphs 
-# for selected functions only using the \callgraph command.
+# If the CALL_GRAPH tag is set to YES then doxygen will generate a call
+# dependency graph for every global function or class method.
+#
+# Note that enabling this option will significantly increase the time of a run.
+# So in most cases it will be better to enable call graphs for selected
+# functions only using the \callgraph command. Disabling a call graph can be
+# accomplished by means of the command \hidecallgraph.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 CALL_GRAPH             = YES
 
-# If the CALLER_GRAPH and HAVE_DOT tags are set to YES then 
-# doxygen will generate a caller dependency graph for every global function 
-# or class method. Note that enabling this option will significantly increase 
-# the time of a run. So in most cases it will be better to enable caller 
-# graphs for selected functions only using the \callergraph command.
+# If the CALLER_GRAPH tag is set to YES then doxygen will generate a caller
+# dependency graph for every global function or class method.
+#
+# Note that enabling this option will significantly increase the time of a run.
+# So in most cases it will be better to enable caller graphs for selected
+# functions only using the \callergraph command. Disabling a caller graph can be
+# accomplished by means of the command \hidecallergraph.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 CALLER_GRAPH           = YES
 
-# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen 
-# will generate a graphical hierarchy of all classes instead of a textual one.
+# If the GRAPHICAL_HIERARCHY tag is set to YES then doxygen will graphical
+# hierarchy of all classes instead of a textual one.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 GRAPHICAL_HIERARCHY    = YES
 
-# If the DIRECTORY_GRAPH, SHOW_DIRECTORIES and HAVE_DOT tags are set to YES 
-# then doxygen will show the dependencies a directory has on other directories 
-# in a graphical way. The dependency relations are determined by the #include 
-# relations between the files in the directories.
+# If the DIRECTORY_GRAPH tag is set to YES then doxygen will show the
+# dependencies a directory has on other directories in a graphical way. The
+# dependency relations are determined by the #include relations between the
+# files in the directories.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 DIRECTORY_GRAPH        = YES
 
-# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images 
-# generated by dot. Possible values are svg, png, jpg, or gif. 
-# If left blank png will be used.
+# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images
+# generated by dot. For an explanation of the image formats see the section
+# output formats in the documentation of the dot tool (Graphviz (see:
+# http://www.graphviz.org/)).
+# Note: If you choose svg you need to set HTML_FILE_EXTENSION to xhtml in order
+# to make the SVG files visible in IE 9+ (other browsers do not have this
+# requirement).
+# Possible values are: png, jpg, gif, svg, png:gd, png:gd:gd, png:cairo,
+# png:cairo:gd, png:cairo:cairo, png:cairo:gdiplus, png:gdiplus and
+# png:gdiplus:gdiplus.
+# The default value is: png.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 DOT_IMAGE_FORMAT       = svg
 
-# The tag DOT_PATH can be used to specify the path where the dot tool can be 
+# If DOT_IMAGE_FORMAT is set to svg, then this option can be set to YES to
+# enable generation of interactive SVG images that allow zooming and panning.
+#
+# Note that this requires a modern browser other than Internet Explorer. Tested
+# and working are Firefox, Chrome, Safari, and Opera.
+# Note: For IE 9+ you need to set HTML_FILE_EXTENSION to xhtml in order to make
+# the SVG files visible. Older versions of IE do not have SVG support.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+INTERACTIVE_SVG        = NO
+
+# The DOT_PATH tag can be used to specify the path where the dot tool can be
 # found. If left blank, it is assumed the dot tool can be found in the path.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_PATH               =
 
-DOT_PATH               = 
+# The DOTFILE_DIRS tag can be used to specify one or more directories that
+# contain dot files that are included in the documentation (see the \dotfile
+# command).
+# This tag requires that the tag HAVE_DOT is set to YES.
 
-# The DOTFILE_DIRS tag can be used to specify one or more directories that 
-# contain dot files that are included in the documentation (see the 
-# \dotfile command).
+DOTFILE_DIRS           =
 
-DOTFILE_DIRS           = 
+# The MSCFILE_DIRS tag can be used to specify one or more directories that
+# contain msc files that are included in the documentation (see the \mscfile
+# command).
 
-# The MSCFILE_DIRS tag can be used to specify one or more directories that 
-# contain msc files that are included in the documentation (see the 
-# \mscfile command).
+MSCFILE_DIRS           =
 
-MSCFILE_DIRS           = 
+# The DIAFILE_DIRS tag can be used to specify one or more directories that
+# contain dia files that are included in the documentation (see the \diafile
+# command).
 
-# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of 
-# nodes that will be shown in the graph. If the number of nodes in a graph 
-# becomes larger than this value, doxygen will truncate the graph, which is 
-# visualized by representing a node as a red box. Note that doxygen if the 
-# number of direct children of the root node in a graph is already larger than 
-# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note 
-# that the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
+DIAFILE_DIRS           =
+
+# When using plantuml, the PLANTUML_JAR_PATH tag should be used to specify the
+# path where java can find the plantuml.jar file. If left blank, it is assumed
+# PlantUML is not used or called during a preprocessing step. Doxygen will
+# generate a warning when it encounters a \startuml command in this case and
+# will not generate output for the diagram.
+
+PLANTUML_JAR_PATH      =
+
+# When using plantuml, the specified paths are searched for files specified by
+# the !include statement in a plantuml block.
+
+PLANTUML_INCLUDE_PATH  =
+
+# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of nodes
+# that will be shown in the graph. If the number of nodes in a graph becomes
+# larger than this value, doxygen will truncate the graph, which is visualized
+# by representing a node as a red box. Note that doxygen if the number of direct
+# children of the root node in a graph is already larger than
+# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note that
+# the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
+# Minimum value: 0, maximum value: 10000, default value: 50.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 DOT_GRAPH_MAX_NODES    = 50
 
-# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the 
-# graphs generated by dot. A depth value of 3 means that only nodes reachable 
-# from the root by following a path via at most 3 edges will be shown. Nodes 
-# that lay further from the root node will be omitted. Note that setting this 
-# option to 1 or 2 may greatly reduce the computation time needed for large 
-# code bases. Also note that the size of a graph can be further restricted by 
+# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the graphs
+# generated by dot. A depth value of 3 means that only nodes reachable from the
+# root by following a path via at most 3 edges will be shown. Nodes that lay
+# further from the root node will be omitted. Note that setting this option to 1
+# or 2 may greatly reduce the computation time needed for large code bases. Also
+# note that the size of a graph can be further restricted by
 # DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction.
+# Minimum value: 0, maximum value: 1000, default value: 0.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 MAX_DOT_GRAPH_DEPTH    = 0
 
-# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent 
-# background. This is disabled by default, because dot on Windows does not 
-# seem to support this out of the box. Warning: Depending on the platform used, 
-# enabling this option may lead to badly anti-aliased labels on the edges of 
-# a graph (i.e. they become hard to read).
+# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent
+# background. This is disabled by default, because dot on Windows does not seem
+# to support this out of the box.
+#
+# Warning: Depending on the platform used, enabling this option may lead to
+# badly anti-aliased labels on the edges of a graph (i.e. they become hard to
+# read).
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 DOT_TRANSPARENT        = NO
 
-# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output 
-# files in one run (i.e. multiple -o and -T options on the command line). This 
-# makes dot run faster, but since only newer versions of dot (>1.8.10) 
-# support this, this feature is disabled by default.
+# Set the DOT_MULTI_TARGETS tag to YES to allow dot to generate multiple output
+# files in one run (i.e. multiple -o and -T options on the command line). This
+# makes dot run faster, but since only newer versions of dot (>1.8.10) support
+# this, this feature is disabled by default.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 DOT_MULTI_TARGETS      = NO
 
-# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will 
-# generate a legend page explaining the meaning of the various boxes and 
-# arrows in the dot generated graphs.
+# If the GENERATE_LEGEND tag is set to YES doxygen will generate a legend page
+# explaining the meaning of the various boxes and arrows in the dot generated
+# graphs.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 GENERATE_LEGEND        = YES
 
-# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will 
-# remove the intermediate dot files that are used to generate 
-# the various graphs.
+# If the DOT_CLEANUP tag is set to YES, doxygen will remove the intermediate dot
+# files that are used to generate the various graphs.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 DOT_CLEANUP            = YES

From 1df311118d79c04df1d41e044b19444cfda015da Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Tue, 4 Oct 2016 17:55:12 +0200
Subject: [PATCH 1001/1802] protocol.h: Make enums in GetDataMsg concrete
 values

This concretizes the numbers and adds a comment to make it clear that
these numbers are fixed by the protocol, and may avoid people forgetting
to claim numbers in the future (e.g. issue #8500).

Also gets rid of a weird unused `MSG_TYPE_MAX` in the middle of the
enumeration (thanks @paveljanik for noticing).
---
 src/protocol.h | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/protocol.h b/src/protocol.h
index cdb76b90381c5..d19e0d3a5e24e 100644
--- a/src/protocol.h
+++ b/src/protocol.h
@@ -312,20 +312,24 @@ class CAddress : public CService
     unsigned int nTime;
 };
 
-/** getdata message types */
+/** getdata message type flags */
 const uint32_t MSG_WITNESS_FLAG = 1 << 30;
 const uint32_t MSG_TYPE_MASK    = 0xffffffff >> 2;
+
+/** getdata / inv message types.
+ * These numbers are defined by the protocol. When adding a new value, be sure
+ * to mention it in the respective BIP.
+ */
 enum GetDataMsg
 {
     UNDEFINED = 0,
-    MSG_TX,
-    MSG_BLOCK,
-    MSG_TYPE_MAX = MSG_BLOCK,
+    MSG_TX = 1,
+    MSG_BLOCK = 2,
     // The following can only occur in getdata. Invs always use TX or BLOCK.
-    MSG_FILTERED_BLOCK,
-    MSG_CMPCT_BLOCK,
-    MSG_WITNESS_BLOCK = MSG_BLOCK | MSG_WITNESS_FLAG,
-    MSG_WITNESS_TX = MSG_TX | MSG_WITNESS_FLAG,
+    MSG_FILTERED_BLOCK = 3,  //!< Defined in BIP37
+    MSG_CMPCT_BLOCK = 4,     //!< Defined in BIP152
+    MSG_WITNESS_BLOCK = MSG_BLOCK | MSG_WITNESS_FLAG, //!< Defined in BIP144
+    MSG_WITNESS_TX = MSG_TX | MSG_WITNESS_FLAG,       //!< Defined in BIP144
     MSG_FILTERED_WITNESS_BLOCK = MSG_FILTERED_BLOCK | MSG_WITNESS_FLAG,
 };
 

From d51f18246165b580761af824f1bb4a49b6908f28 Mon Sep 17 00:00:00 2001
From: jnewbery <john@johnnewbery.com>
Date: Mon, 26 Sep 2016 17:01:10 -0400
Subject: [PATCH 1002/1802] Don't return the address of a P2SH of a P2SH.

---
 src/rpc/rawtransaction.cpp | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/rpc/rawtransaction.cpp b/src/rpc/rawtransaction.cpp
index d2ad0a52b7004..e48fe256519bd 100644
--- a/src/rpc/rawtransaction.cpp
+++ b/src/rpc/rawtransaction.cpp
@@ -535,7 +535,7 @@ UniValue decodescript(const UniValue& params, bool fHelp)
             "     \"address\"     (string) bitcoin address\n"
             "     ,...\n"
             "  ],\n"
-            "  \"p2sh\",\"address\" (string) script address\n"
+            "  \"p2sh\",\"address\" (string) address of P2SH script wrapping this redeem script (not returned if the script is already a P2SH).\n"
             "}\n"
             "\nExamples:\n"
             + HelpExampleCli("decodescript", "\"hexstring\"")
@@ -554,7 +554,15 @@ UniValue decodescript(const UniValue& params, bool fHelp)
     }
     ScriptPubKeyToJSON(script, r, false);
 
-    r.push_back(Pair("p2sh", CBitcoinAddress(CScriptID(script)).ToString()));
+    UniValue type;
+    type = find_value(r, "type");
+
+    if (type.isStr() && type.get_str() != "scripthash") {
+        // P2SH cannot be wrapped in a P2SH. If this script is already a P2SH,
+        // don't return the address for a P2SH of the P2SH.
+        r.push_back(Pair("p2sh", CBitcoinAddress(CScriptID(script)).ToString()));
+    }
+
     return r;
 }
 

From 4408558843c6c2b7abeb4160f641dfdbf5be5eb4 Mon Sep 17 00:00:00 2001
From: jonnynewbs <jonnynewbs@gmail.com>
Date: Wed, 21 Sep 2016 10:52:53 -0400
Subject: [PATCH 1003/1802] Update bitcoin-tx to output witness data.

---
 src/core_write.cpp                       | 11 ++++++++++-
 src/test/data/blanktx.json               |  1 +
 src/test/data/tt-delin1-out.json         |  1 +
 src/test/data/tt-delout1-out.json        |  1 +
 src/test/data/tt-locktime317000-out.json |  1 +
 src/test/data/txcreate1.json             |  1 +
 src/test/data/txcreate2.json             |  1 +
 src/test/data/txcreatedata1.json         |  1 +
 src/test/data/txcreatedata2.json         |  1 +
 src/test/data/txcreatedata_seq0.json     |  1 +
 src/test/data/txcreatedata_seq1.json     |  1 +
 src/test/data/txcreatesign.json          |  1 +
 12 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/src/core_write.cpp b/src/core_write.cpp
index 6f9e2266a3966..ea01ddc10d81a 100644
--- a/src/core_write.cpp
+++ b/src/core_write.cpp
@@ -151,11 +151,13 @@ void ScriptPubKeyToUniv(const CScript& scriptPubKey,
 void TxToUniv(const CTransaction& tx, const uint256& hashBlock, UniValue& entry)
 {
     entry.pushKV("txid", tx.GetHash().GetHex());
+    entry.pushKV("hash", tx.GetWitnessHash().GetHex());
     entry.pushKV("version", tx.nVersion);
     entry.pushKV("locktime", (int64_t)tx.nLockTime);
 
     UniValue vin(UniValue::VARR);
-    BOOST_FOREACH(const CTxIn& txin, tx.vin) {
+    for (unsigned int i = 0; i < tx.vin.size(); i++) {
+        const CTxIn& txin = tx.vin[i];
         UniValue in(UniValue::VOBJ);
         if (tx.IsCoinBase())
             in.pushKV("coinbase", HexStr(txin.scriptSig.begin(), txin.scriptSig.end()));
@@ -166,6 +168,13 @@ void TxToUniv(const CTransaction& tx, const uint256& hashBlock, UniValue& entry)
             o.pushKV("asm", ScriptToAsmStr(txin.scriptSig, true));
             o.pushKV("hex", HexStr(txin.scriptSig.begin(), txin.scriptSig.end()));
             in.pushKV("scriptSig", o);
+            if (!tx.wit.IsNull() && i < tx.wit.vtxinwit.size() && !tx.wit.vtxinwit[i].IsNull()) {
+                UniValue txinwitness(UniValue::VARR);
+                for (const auto& item : tx.wit.vtxinwit[i].scriptWitness.stack) {
+                    txinwitness.push_back(HexStr(item.begin(), item.end()));
+                }
+                in.pushKV("txinwitness", txinwitness);
+            }
         }
         in.pushKV("sequence", (int64_t)txin.nSequence);
         vin.push_back(in);
diff --git a/src/test/data/blanktx.json b/src/test/data/blanktx.json
index f6d6ab58842c7..51c25a5a98c59 100644
--- a/src/test/data/blanktx.json
+++ b/src/test/data/blanktx.json
@@ -1,5 +1,6 @@
 {
     "txid": "d21633ba23f70118185227be58a63527675641ad37967e2aa461559f577aec43",
+    "hash": "d21633ba23f70118185227be58a63527675641ad37967e2aa461559f577aec43",
     "version": 1,
     "locktime": 0,
     "vin": [
diff --git a/src/test/data/tt-delin1-out.json b/src/test/data/tt-delin1-out.json
index 2c7a68636a2fb..712a2c27f8fae 100644
--- a/src/test/data/tt-delin1-out.json
+++ b/src/test/data/tt-delin1-out.json
@@ -1,5 +1,6 @@
 {
     "txid": "81b2035be1da1abe745c6141174a73d151009ec17b3d5ebffa2e177408c50dfd",
+    "hash": "81b2035be1da1abe745c6141174a73d151009ec17b3d5ebffa2e177408c50dfd",
     "version": 1,
     "locktime": 0,
     "vin": [
diff --git a/src/test/data/tt-delout1-out.json b/src/test/data/tt-delout1-out.json
index 9cf8cbb16c01e..afc4e95762d4a 100644
--- a/src/test/data/tt-delout1-out.json
+++ b/src/test/data/tt-delout1-out.json
@@ -1,5 +1,6 @@
 {
     "txid": "c46ccd75b5050e942b2e86a3648f843f525fe6fc000bf0534ba5973063354493",
+    "hash": "c46ccd75b5050e942b2e86a3648f843f525fe6fc000bf0534ba5973063354493",
     "version": 1,
     "locktime": 0,
     "vin": [
diff --git a/src/test/data/tt-locktime317000-out.json b/src/test/data/tt-locktime317000-out.json
index 65b6a4451b26a..2b9075f8acece 100644
--- a/src/test/data/tt-locktime317000-out.json
+++ b/src/test/data/tt-locktime317000-out.json
@@ -1,5 +1,6 @@
 {
     "txid": "aded538f642c17e15f4d3306b8be7e1a4d1ae0c4616d641ab51ea09ba65e5cb5",
+    "hash": "aded538f642c17e15f4d3306b8be7e1a4d1ae0c4616d641ab51ea09ba65e5cb5",
     "version": 1,
     "locktime": 317000,
     "vin": [
diff --git a/src/test/data/txcreate1.json b/src/test/data/txcreate1.json
index 3890dbaf6e096..567e8026a321c 100644
--- a/src/test/data/txcreate1.json
+++ b/src/test/data/txcreate1.json
@@ -1,5 +1,6 @@
 {
     "txid": "f70f0d6c71416ed538e37549f430ab3665fee2437a42f10238c1bd490e782231",
+    "hash": "f70f0d6c71416ed538e37549f430ab3665fee2437a42f10238c1bd490e782231",
     "version": 1,
     "locktime": 0,
     "vin": [
diff --git a/src/test/data/txcreate2.json b/src/test/data/txcreate2.json
index c56293eaf2c66..a70c1d302a28d 100644
--- a/src/test/data/txcreate2.json
+++ b/src/test/data/txcreate2.json
@@ -1,5 +1,6 @@
 {
     "txid": "cf90229625e9eb10f6be8156bf6aa5ec2eca19a42b1e05c11f3029b560a32e13",
+    "hash": "cf90229625e9eb10f6be8156bf6aa5ec2eca19a42b1e05c11f3029b560a32e13",
     "version": 1,
     "locktime": 0,
     "vin": [
diff --git a/src/test/data/txcreatedata1.json b/src/test/data/txcreatedata1.json
index 2fed228108728..760518d30a983 100644
--- a/src/test/data/txcreatedata1.json
+++ b/src/test/data/txcreatedata1.json
@@ -1,5 +1,6 @@
 {
     "txid": "07894b4d12fe7853dd911402db1620920d261b9627c447f931417d330c25f06e",
+    "hash": "07894b4d12fe7853dd911402db1620920d261b9627c447f931417d330c25f06e",
     "version": 1,
     "locktime": 0,
     "vin": [
diff --git a/src/test/data/txcreatedata2.json b/src/test/data/txcreatedata2.json
index 3d4d367f37be5..56dfe4a1b055a 100644
--- a/src/test/data/txcreatedata2.json
+++ b/src/test/data/txcreatedata2.json
@@ -1,5 +1,6 @@
 {
     "txid": "4ed17118f5e932ba8c75c461787d171bc02a016d8557cb5bcf34cd416c27bb8b",
+    "hash": "4ed17118f5e932ba8c75c461787d171bc02a016d8557cb5bcf34cd416c27bb8b",
     "version": 1,
     "locktime": 0,
     "vin": [
diff --git a/src/test/data/txcreatedata_seq0.json b/src/test/data/txcreatedata_seq0.json
index f25aa43c2b275..9bc0ed4593609 100644
--- a/src/test/data/txcreatedata_seq0.json
+++ b/src/test/data/txcreatedata_seq0.json
@@ -1,5 +1,6 @@
 {
     "txid": "71603ccb1cd76d73d76eb6cfd5f0b9df6d65d90d76860ee52cb461c4be7032e8",
+    "hash": "71603ccb1cd76d73d76eb6cfd5f0b9df6d65d90d76860ee52cb461c4be7032e8",
     "version": 1,
     "locktime": 0,
     "vin": [
diff --git a/src/test/data/txcreatedata_seq1.json b/src/test/data/txcreatedata_seq1.json
index 33585d6dfad82..d323255418d04 100644
--- a/src/test/data/txcreatedata_seq1.json
+++ b/src/test/data/txcreatedata_seq1.json
@@ -1,5 +1,6 @@
 {
     "txid": "c4dea671b0d7b48f8ab10bc46650e8329d3c5766931f548f513847a19f5ba75b",
+    "hash": "c4dea671b0d7b48f8ab10bc46650e8329d3c5766931f548f513847a19f5ba75b",
     "version": 1,
     "locktime": 0,
     "vin": [
diff --git a/src/test/data/txcreatesign.json b/src/test/data/txcreatesign.json
index 057fe9b010292..ff39e71b40c0d 100644
--- a/src/test/data/txcreatesign.json
+++ b/src/test/data/txcreatesign.json
@@ -1,5 +1,6 @@
 {
     "txid": "977e7cd286cb72cd470d539ba6cb48400f8f387d97451d45cdb8819437a303af",
+    "hash": "977e7cd286cb72cd470d539ba6cb48400f8f387d97451d45cdb8819437a303af",
     "version": 1,
     "locktime": 0,
     "vin": [

From 621441a7a72ec0b17594a24a2c5fedcac0c605f6 Mon Sep 17 00:00:00 2001
From: jnewbery <john@johnnewbery.com>
Date: Tue, 4 Oct 2016 13:02:06 -0400
Subject: [PATCH 1004/1802] add verbose mode to bitcoin-util-test.py

---
 src/test/bctest.py                   |  6 +-
 src/test/bitcoin-util-test.py        |  5 +-
 src/test/data/bitcoin-util-test.json | 84 ++++++++++++++++++----------
 3 files changed, 65 insertions(+), 30 deletions(-)

diff --git a/src/test/bctest.py b/src/test/bctest.py
index 39a27fcd0c4a5..d801415c70f19 100644
--- a/src/test/bctest.py
+++ b/src/test/bctest.py
@@ -45,13 +45,17 @@ def bctest(testDir, testObj, exeext):
 		print("Return code mismatch for " + outputFn)
 		sys.exit(1)
 
-def bctester(testDir, input_basename, buildenv):
+def bctester(testDir, input_basename, buildenv, verbose = False):
 	input_filename = testDir + "/" + input_basename
 	raw_data = open(input_filename).read()
 	input_data = json.loads(raw_data)
 
 	for testObj in input_data:
+		if verbose and "description" in testObj:
+			print ("Testing: " + testObj["description"])
 		bctest(testDir, testObj, buildenv.exeext)
+		if verbose and "description" in testObj:
+			print ("PASS")
 
 	sys.exit(0)
 
diff --git a/src/test/bitcoin-util-test.py b/src/test/bitcoin-util-test.py
index 225b3324e9fc8..3099506d6d784 100755
--- a/src/test/bitcoin-util-test.py
+++ b/src/test/bitcoin-util-test.py
@@ -19,11 +19,14 @@
 
 
 if __name__ == '__main__':
+    verbose = False
     try:
         srcdir = os.environ["srcdir"]
     except:
         parser = argparse.ArgumentParser(description=help_text)
         parser.add_argument('-s', '--srcdir')
+        parser.add_argument('-v', '--verbose', action='store_true')
         args = parser.parse_args()
         srcdir = args.srcdir
-    bctest.bctester(srcdir + "/test/data", "bitcoin-util-test.json", buildenv)
+        verbose = args.verbose
+    bctest.bctester(srcdir + "/test/data", "bitcoin-util-test.json", buildenv, verbose = verbose)
diff --git a/src/test/data/bitcoin-util-test.json b/src/test/data/bitcoin-util-test.json
index 9df61a7e7932e..de95044597b1d 100644
--- a/src/test/data/bitcoin-util-test.json
+++ b/src/test/data/bitcoin-util-test.json
@@ -1,61 +1,73 @@
 [
   { "exec": "./bitcoin-tx",
     "args": ["-create"],
-    "output_cmp": "blanktx.hex"
+    "output_cmp": "blanktx.hex",
+    "description": "Creates a blank transaction"
   },
   { "exec": "./bitcoin-tx",
     "args": ["-json","-create"],
-    "output_cmp": "blanktx.json"
+    "output_cmp": "blanktx.json",
+    "description": "Creates a blank transaction (output in json)"
   },
   { "exec": "./bitcoin-tx",
     "args": ["-"],
     "input": "blanktx.hex",
-    "output_cmp": "blanktx.hex"
+    "output_cmp": "blanktx.hex",
+    "description": "Creates a blank transaction when nothing is piped into bitcoin-tx"
   },
   { "exec": "./bitcoin-tx",
     "args": ["-json","-"],
     "input": "blanktx.hex",
-    "output_cmp": "blanktx.json"
+    "output_cmp": "blanktx.json",
+    "description": "Creates a blank transaction when nothing is piped into bitcoin-tx (output in json)"
   },
   { "exec": "./bitcoin-tx",
     "args": ["-", "delin=1"],
     "input": "tx394b54bb.hex",
-    "output_cmp": "tt-delin1-out.hex"
+    "output_cmp": "tt-delin1-out.hex",
+    "description": "Deletes a single input from a transaction"
   },
   { "exec": "./bitcoin-tx",
     "args": ["-json", "-", "delin=1"],
     "input": "tx394b54bb.hex",
-    "output_cmp": "tt-delin1-out.json"
+    "output_cmp": "tt-delin1-out.json",
+    "description": "Deletes a single input from a transaction (output in json)"
   },
   { "exec": "./bitcoin-tx",
     "args": ["-", "delin=31"],
     "input": "tx394b54bb.hex",
-    "return_code": 1
+    "return_code": 1,
+    "description": "Attempts to delete an input with a bad index from a transaction. Expected to fail."
   },
   { "exec": "./bitcoin-tx",
     "args": ["-", "delout=1"],
     "input": "tx394b54bb.hex",
-    "output_cmp": "tt-delout1-out.hex"
+    "output_cmp": "tt-delout1-out.hex",
+    "description": "Deletes a single output from a transaction"
   },
   { "exec": "./bitcoin-tx",
     "args": ["-json", "-", "delout=1"],
     "input": "tx394b54bb.hex",
-    "output_cmp": "tt-delout1-out.json"
+    "output_cmp": "tt-delout1-out.json",
+    "description": "Deletes a single output from a transaction (output in json)"
   },
   { "exec": "./bitcoin-tx",
     "args": ["-", "delout=2"],
     "input": "tx394b54bb.hex",
-    "return_code": 1
+    "return_code": 1,
+    "description": "Attempts to delete an output with a bad index from a transaction. Expected to fail."
   },
   { "exec": "./bitcoin-tx",
     "args": ["-", "locktime=317000"],
     "input": "tx394b54bb.hex",
-    "output_cmp": "tt-locktime317000-out.hex"
+    "output_cmp": "tt-locktime317000-out.hex",
+    "description": "Adds an nlocktime to a transaction"
   },
   { "exec": "./bitcoin-tx",
     "args": ["-json", "-", "locktime=317000"],
     "input": "tx394b54bb.hex",
-    "output_cmp": "tt-locktime317000-out.json"
+    "output_cmp": "tt-locktime317000-out.json",
+    "description": "Adds an nlocktime to a transaction (output in json)"
   },
   { "exec": "./bitcoin-tx",
     "args":
@@ -65,7 +77,8 @@
      "in=22a6f904655d53ae2ff70e701a0bbd90aa3975c0f40bfc6cc996a9049e31cdfc:1",
      "outaddr=0.18:13tuJJDR2RgArmgfv6JScSdreahzgc4T6o",
      "outaddr=4:1P8yWvZW8jVihP1bzHeqfE4aoXNX8AVa46"],
-    "output_cmp": "txcreate1.hex"
+    "output_cmp": "txcreate1.hex",
+    "description": "Creates a new transaction with three inputs and two outputs"
   },
   { "exec": "./bitcoin-tx",
     "args":
@@ -76,15 +89,18 @@
      "in=22a6f904655d53ae2ff70e701a0bbd90aa3975c0f40bfc6cc996a9049e31cdfc:1",
      "outaddr=0.18:13tuJJDR2RgArmgfv6JScSdreahzgc4T6o",
      "outaddr=4:1P8yWvZW8jVihP1bzHeqfE4aoXNX8AVa46"],
-    "output_cmp": "txcreate1.json"
+    "output_cmp": "txcreate1.json",
+    "description": "Creates a new transaction with three inputs and two outputs (output in json)"
   },
   { "exec": "./bitcoin-tx",
     "args": ["-create", "outscript=0:"],
-    "output_cmp": "txcreate2.hex"
+    "output_cmp": "txcreate2.hex",
+    "description": "Creates a new transaction with a single empty output script"
   },
   { "exec": "./bitcoin-tx",
     "args": ["-json", "-create", "outscript=0:"],
-    "output_cmp": "txcreate2.json"
+    "output_cmp": "txcreate2.json",
+    "description": "Creates a new transaction with a single empty output script (output in json)"
   },
   { "exec": "./bitcoin-tx",
     "args":
@@ -94,7 +110,8 @@
      "set=prevtxs:[{\"txid\":\"4d49a71ec9da436f71ec4ee231d04f292a29cd316f598bb7068feccabdc59485\",\"vout\":0,\"scriptPubKey\":\"76a91491b24bf9f5288532960ac687abb035127b1d28a588ac\"}]",
      "sign=ALL",
      "outaddr=0.001:193P6LtvS4nCnkDvM9uXn1gsSRqh4aDAz7"],
-    "output_cmp": "txcreatesign.hex"
+    "output_cmp": "txcreatesign.hex",
+    "description": "Creates a new transaction with a single input and a single output, and then signs the transaction"
   },
   { "exec": "./bitcoin-tx",
     "args":
@@ -105,21 +122,24 @@
      "set=prevtxs:[{\"txid\":\"4d49a71ec9da436f71ec4ee231d04f292a29cd316f598bb7068feccabdc59485\",\"vout\":0,\"scriptPubKey\":\"76a91491b24bf9f5288532960ac687abb035127b1d28a588ac\"}]",
      "sign=ALL",
      "outaddr=0.001:193P6LtvS4nCnkDvM9uXn1gsSRqh4aDAz7"],
-    "output_cmp": "txcreatesign.json"
+    "output_cmp": "txcreatesign.json",
+    "description": "Creates a new transaction with a single input and a single output, and then signs the transaction (output in json)"
   },
   { "exec": "./bitcoin-tx",
     "args":
     ["-create",
      "in=5897de6bd6027a475eadd57019d4e6872c396d0716c4875a5f1a6fcfdf385c1f:0",
      "outdata=4:badhexdata"],
-    "return_code": 1
+    "return_code": 1,
+    "description": "Attempts to create a new transaction with one input and an output with malformed hex data. Expected to fail"
   },
   { "exec": "./bitcoin-tx",
     "args":
     ["-create",
      "in=5897de6bd6027a475eadd57019d4e6872c396d0716c4875a5f1a6fcfdf385c1f:0",
      "outdata=badhexdata"],
-    "return_code": 1
+    "return_code": 1,
+    "description": "Attempts to create a new transaction with one input and an output with no value and malformed hex data. Expected to fail"
   },
   { "exec": "./bitcoin-tx",
     "args":
@@ -127,7 +147,8 @@
      "in=5897de6bd6027a475eadd57019d4e6872c396d0716c4875a5f1a6fcfdf385c1f:0",
      "outaddr=0.18:13tuJJDR2RgArmgfv6JScSdreahzgc4T6o",
      "outdata=4:54686973204f505f52455455524e207472616e73616374696f6e206f7574707574207761732063726561746564206279206d6f646966696564206372656174657261777472616e73616374696f6e2e"],
-    "output_cmp": "txcreatedata1.hex"
+    "output_cmp": "txcreatedata1.hex",
+    "description": "Creates a new transaction with one input, one address output and one data output"
   },
   { "exec": "./bitcoin-tx",
     "args":
@@ -136,7 +157,8 @@
      "in=5897de6bd6027a475eadd57019d4e6872c396d0716c4875a5f1a6fcfdf385c1f:0",
      "outaddr=0.18:13tuJJDR2RgArmgfv6JScSdreahzgc4T6o",
      "outdata=4:54686973204f505f52455455524e207472616e73616374696f6e206f7574707574207761732063726561746564206279206d6f646966696564206372656174657261777472616e73616374696f6e2e"],
-    "output_cmp": "txcreatedata1.json"
+    "output_cmp": "txcreatedata1.json",
+    "description": "Creates a new transaction with one input, one address output and one data output (output in json)"
   },
   { "exec": "./bitcoin-tx",
     "args":
@@ -144,7 +166,8 @@
      "in=5897de6bd6027a475eadd57019d4e6872c396d0716c4875a5f1a6fcfdf385c1f:0",
      "outaddr=0.18:13tuJJDR2RgArmgfv6JScSdreahzgc4T6o",
      "outdata=54686973204f505f52455455524e207472616e73616374696f6e206f7574707574207761732063726561746564206279206d6f646966696564206372656174657261777472616e73616374696f6e2e"],
-    "output_cmp": "txcreatedata2.hex"
+    "output_cmp": "txcreatedata2.hex",
+    "description": "Creates a new transaction with one input, one address output and one data (zero value) output"
   },
   { "exec": "./bitcoin-tx",
     "args":
@@ -153,14 +176,16 @@
      "in=5897de6bd6027a475eadd57019d4e6872c396d0716c4875a5f1a6fcfdf385c1f:0",
      "outaddr=0.18:13tuJJDR2RgArmgfv6JScSdreahzgc4T6o",
      "outdata=54686973204f505f52455455524e207472616e73616374696f6e206f7574707574207761732063726561746564206279206d6f646966696564206372656174657261777472616e73616374696f6e2e"],
-    "output_cmp": "txcreatedata2.json"
+    "output_cmp": "txcreatedata2.json",
+    "description": "Creates a new transaction with one input, one address output and one data (zero value) output (output in json)"
   },
   { "exec": "./bitcoin-tx",
     "args":
     ["-create",
      "in=5897de6bd6027a475eadd57019d4e6872c396d0716c4875a5f1a6fcfdf385c1f:0:4294967293",
      "outaddr=0.18:13tuJJDR2RgArmgfv6JScSdreahzgc4T6o"],
-    "output_cmp": "txcreatedata_seq0.hex"
+    "output_cmp": "txcreatedata_seq0.hex",
+    "description": "Creates a new transaction with one input with sequence number and one address output"
   },
   { "exec": "./bitcoin-tx",
     "args":
@@ -168,19 +193,22 @@
      "-create",
      "in=5897de6bd6027a475eadd57019d4e6872c396d0716c4875a5f1a6fcfdf385c1f:0:4294967293",
      "outaddr=0.18:13tuJJDR2RgArmgfv6JScSdreahzgc4T6o"],
-    "output_cmp": "txcreatedata_seq0.json"
+    "output_cmp": "txcreatedata_seq0.json",
+    "description": "Creates a new transaction with one input with sequence number and one address output (output in json)"
   },
   { "exec": "./bitcoin-tx",
     "args":
     ["01000000011f5c38dfcf6f1a5f5a87c416076d392c87e6d41970d5ad5e477a02d66bde97580000000000fdffffff0180a81201000000001976a9141fc11f39be1729bf973a7ab6a615ca4729d6457488ac00000000",
      "in=5897de6bd6027a475eadd57019d4e6872c396d0716c4875a5f1a6fcfdf385c1f:0:1"],
-    "output_cmp": "txcreatedata_seq1.hex"
+    "output_cmp": "txcreatedata_seq1.hex",
+    "description": "Adds a new input with sequence number to a transaction"
   },
   { "exec": "./bitcoin-tx",
     "args":
     ["-json",
      "01000000011f5c38dfcf6f1a5f5a87c416076d392c87e6d41970d5ad5e477a02d66bde97580000000000fdffffff0180a81201000000001976a9141fc11f39be1729bf973a7ab6a615ca4729d6457488ac00000000",
      "in=5897de6bd6027a475eadd57019d4e6872c396d0716c4875a5f1a6fcfdf385c1f:0:1"],
-    "output_cmp": "txcreatedata_seq1.json"
+    "output_cmp": "txcreatedata_seq1.json",
+    "description": "Adds a new input with sequence number to a transaction (output in json)"
   }
 ]

From 2920be2a6994cfbffd93e72c6cf4c1ed19ac4339 Mon Sep 17 00:00:00 2001
From: randy-waterhouse <kiwigb@yahoo.com>
Date: Thu, 6 Oct 2016 12:27:23 +1300
Subject: [PATCH 1005/1802] Update INSTALL landing redirection notice for build
 instructions.

---
 INSTALL    | 5 -----
 INSTALL.md | 5 +++++
 2 files changed, 5 insertions(+), 5 deletions(-)
 delete mode 100644 INSTALL
 create mode 100644 INSTALL.md

diff --git a/INSTALL b/INSTALL
deleted file mode 100644
index 07ee48427cd05..0000000000000
--- a/INSTALL
+++ /dev/null
@@ -1,5 +0,0 @@
-Building Bitcoin
-
-See doc/build-*.md for instructions on building bitcoind,
-the intended-for-services, no-graphical-interface, reference
-implementation of Bitcoin.
\ No newline at end of file
diff --git a/INSTALL.md b/INSTALL.md
new file mode 100644
index 0000000000000..520a47d96078d
--- /dev/null
+++ b/INSTALL.md
@@ -0,0 +1,5 @@
+Building Bitcoin
+================
+
+See doc/build-*.md for instructions on building the various
+elements of the Bitcoin Core reference implementation of Bitcoin.

From 7d8afb4cde168659ec8363ff3b99611dd88557a5 Mon Sep 17 00:00:00 2001
From: fanquake <fanquake@gmail.com>
Date: Wed, 5 Oct 2016 11:12:17 +0800
Subject: [PATCH 1006/1802] [Doc] Improve GitHub issue template

---
 .github/ISSUE_TEMPLATE.md | 36 ++++++++++++++++++++++++------------
 1 file changed, 24 insertions(+), 12 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index a16cedd7fda0c..acb54dd3548af 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,23 +1,35 @@
 <!--- Remove sections that do not apply -->
+
+This issue tracker is only for technical issues related to bitcoin-core.
+
+General bitcoin questions and/or support requests and are best directed to the [Bitcoin StackExchange](https://bitcoin.stackexchange.com).
+
 ### Describe the issue
 
-### Is the issue reproducible?
-#### List steps to reproduce below:
-1. 
-2. 
-3. 
+### Can you reliably reproduce the issue?
+#### If so, please list the steps to reproduce below:
+1.
+2.
+3.
 
-### Expected behavior
+### Expected behaviour
 Tell us what should happen
 
-### Actual behavior
+### Actual behaviour
 Tell us what happens instead
 
-### Any information in the debug.log file related to this issue?
-
-### Screenshots (if available)
+### Screenshots.
+If the issue is related to the GUI, screenshots can be added to this issue via drag & drop.
 
-### What binary version was used (official or self compiled)
+### What version of bitcoin-core are you using?
+List the version number/commit ID, and if it is an official binary, self compiled or a distribution package such as PPA.
 
-### Machine specs: CPU, RAM, Disk space & OS (Windows, OS X, Linux) 
+### Machine specs:
+- OS:
+- CPU:
+- RAM:
+- Disk size:
+- Disk Type (HD/SDD):
 
+### Any extra information that might be useful in the debugging process.
+This is normally the contents of a `debug.log` or `config.log` file. Raw text or a link to a pastebin type site are preferred.

From ef28d8a899aeb4487ef7fbfbfca9c0f2b60bdaf6 Mon Sep 17 00:00:00 2001
From: fanquake <fanquake@gmail.com>
Date: Wed, 5 Oct 2016 16:47:57 +0800
Subject: [PATCH 1007/1802] [Doc] Update bips.md for Segregated Witness

---
 doc/bips.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/doc/bips.md b/doc/bips.md
index 039d5114fd9f1..040439fbcb195 100644
--- a/doc/bips.md
+++ b/doc/bips.md
@@ -26,4 +26,9 @@ BIPs that are implemented by Bitcoin Core (up-to-date up to **v0.13.0**):
 * [`BIP 125`](https://github.com/bitcoin/bips/blob/master/bip-0125.mediawiki): Opt-in full replace-by-fee signaling honoured in mempool and mining as of **v0.12.0** ([PR 6871](https://github.com/bitcoin/bitcoin/pull/6871)).
 * [`BIP 130`](https://github.com/bitcoin/bips/blob/master/bip-0130.mediawiki): direct headers announcement is negotiated with peer versions `>=70012` as of **v0.12.0** ([PR 6494](https://github.com/bitcoin/bitcoin/pull/6494)).
 * [`BIP 133`](https://github.com/bitcoin/bips/blob/master/bip-0133.mediawiki): feefilter messages are respected and sent for peer versions `>=70013` as of **v0.13.0** ([PR 7542](https://github.com/bitcoin/bitcoin/pull/7542)).
+* [`BIP 141`](https://github.com/bitcoin/bips/blob/master/bip-0141.mediawiki): Segregated Witness (Consensus Layer) as of **v0.13.0** ([PR 8149](https://github.com/bitcoin/bitcoin/pull/8149)).
+* [`BIP 143`](https://github.com/bitcoin/bips/blob/master/bip-0143.mediawiki): Transaction Signature Verification for Version 0 Witness Program as of **v0.13.0** ([PR 8149](https://github.com/bitcoin/bitcoin/pull/8149)).
+* [`BIP 144`](https://github.com/bitcoin/bips/blob/master/bip-0144.mediawiki): Segregated Witness as of **0.13.0** ([PR 8149](https://github.com/bitcoin/bitcoin/pull/8149)).
+* [`BIP 145`](https://github.com/bitcoin/bips/blob/master/bip-0145.mediawiki): getblocktemplate updates for Segregated Witness as of **v0.13.0** ([PR 8149](https://github.com/bitcoin/bitcoin/pull/8149)).
+* [`BIP 147`](https://github.com/bitcoin/bips/blob/master/bip-0147.mediawiki): NULLDUMMY softfork as of **v0.13.1** ([PR 8636](https://github.com/bitcoin/bitcoin/pull/8636)).
 * [`BIP 152`](https://github.com/bitcoin/bips/blob/master/bip-0152.mediawiki): Compact block transfer and related optimizations are used as of **v0.13.0** ([PR 8068](https://github.com/bitcoin/bitcoin/pull/8068)).

From b55d9411e7e1aa36ddabba3b942f2e1c736c1bd9 Mon Sep 17 00:00:00 2001
From: Suhas Daftuar <sdaftuar@chaincode.com>
Date: Thu, 6 Oct 2016 14:21:11 -0400
Subject: [PATCH 1008/1802] [qa] Fix race condition in sendheaders.py

Also de-duplicates code that has been moved to mininode
---
 qa/rpc-tests/sendheaders.py | 68 ++++++++++++++-----------------------
 1 file changed, 26 insertions(+), 42 deletions(-)

diff --git a/qa/rpc-tests/sendheaders.py b/qa/rpc-tests/sendheaders.py
index c3f3180b6bca3..81b2442e6ae67 100755
--- a/qa/rpc-tests/sendheaders.py
+++ b/qa/rpc-tests/sendheaders.py
@@ -80,20 +80,19 @@
    Expect: disconnect.
 '''
 
-class BaseNode(NodeConnCB):
+direct_fetch_response_time = 0.05
+
+class BaseNode(SingleNodeConnCB):
     def __init__(self):
-        NodeConnCB.__init__(self)
-        self.connection = None
+        SingleNodeConnCB.__init__(self)
         self.last_inv = None
         self.last_headers = None
         self.last_block = None
-        self.ping_counter = 1
-        self.last_pong = msg_pong(0)
         self.last_getdata = None
-        self.sleep_time = 0.05
         self.block_announced = False
         self.last_getheaders = None
         self.disconnected = False
+        self.last_blockhash_announced = None
 
     def clear_last_announcement(self):
         with mininode_lock:
@@ -101,9 +100,6 @@ def clear_last_announcement(self):
             self.last_inv = None
             self.last_headers = None
 
-    def add_connection(self, conn):
-        self.connection = conn
-
     # Request data for a list of block hashes
     def get_data(self, block_hashes):
         msg = msg_getdata()
@@ -122,17 +118,17 @@ def send_block_inv(self, blockhash):
         msg.inv = [CInv(2, blockhash)]
         self.connection.send_message(msg)
 
-    # Wrapper for the NodeConn's send_message function
-    def send_message(self, message):
-        self.connection.send_message(message)
-
     def on_inv(self, conn, message):
         self.last_inv = message
         self.block_announced = True
+        self.last_blockhash_announced = message.inv[-1].hash
 
     def on_headers(self, conn, message):
         self.last_headers = message
-        self.block_announced = True
+        if len(message.headers):
+            self.block_announced = True
+            message.headers[-1].calc_sha256()
+            self.last_blockhash_announced = message.headers[-1].sha256
 
     def on_block(self, conn, message):
         self.last_block = message.block
@@ -141,9 +137,6 @@ def on_block(self, conn, message):
     def on_getdata(self, conn, message):
         self.last_getdata = message
 
-    def on_pong(self, conn, message):
-        self.last_pong = message
-
     def on_getheaders(self, conn, message):
         self.last_getheaders = message
 
@@ -157,7 +150,7 @@ def check_last_announcement(self, headers=None, inv=None):
         expect_headers = headers if headers != None else []
         expect_inv = inv if inv != None else []
         test_function = lambda: self.block_announced
-        self.sync(test_function)
+        assert(wait_until(test_function, timeout=60))
         with mininode_lock:
             self.block_announced = False
 
@@ -180,30 +173,14 @@ def check_last_announcement(self, headers=None, inv=None):
         return success
 
     # Syncing helpers
-    def sync(self, test_function, timeout=60):
-        while timeout > 0:
-            with mininode_lock:
-                if test_function():
-                    return
-            time.sleep(self.sleep_time)
-            timeout -= self.sleep_time
-        raise AssertionError("Sync failed to complete")
-        
-    def sync_with_ping(self, timeout=60):
-        self.send_message(msg_ping(nonce=self.ping_counter))
-        test_function = lambda: self.last_pong.nonce == self.ping_counter
-        self.sync(test_function, timeout)
-        self.ping_counter += 1
-        return
-
     def wait_for_block(self, blockhash, timeout=60):
         test_function = lambda: self.last_block != None and self.last_block.sha256 == blockhash
-        self.sync(test_function, timeout)
+        assert(wait_until(test_function, timeout=timeout))
         return
 
     def wait_for_getheaders(self, timeout=60):
         test_function = lambda: self.last_getheaders != None
-        self.sync(test_function, timeout)
+        assert(wait_until(test_function, timeout=timeout))
         return
 
     def wait_for_getdata(self, hash_list, timeout=60):
@@ -211,12 +188,17 @@ def wait_for_getdata(self, hash_list, timeout=60):
             return
 
         test_function = lambda: self.last_getdata != None and [x.hash for x in self.last_getdata.inv] == hash_list
-        self.sync(test_function, timeout)
+        assert(wait_until(test_function, timeout=timeout))
         return
 
     def wait_for_disconnect(self, timeout=60):
         test_function = lambda: self.disconnected
-        self.sync(test_function, timeout)
+        assert(wait_until(test_function, timeout=timeout))
+        return
+
+    def wait_for_block_announcement(self, block_hash, timeout=60):
+        test_function = lambda: self.last_blockhash_announced == block_hash
+        assert(wait_until(test_function, timeout=timeout))
         return
 
     def send_header_for_blocks(self, new_blocks):
@@ -266,7 +248,9 @@ def mine_blocks(self, count):
     def mine_reorg(self, length):
         self.nodes[0].generate(length) # make sure all invalidated blocks are node0's
         sync_blocks(self.nodes, wait=0.1)
-        [x.clear_last_announcement() for x in self.p2p_connections]
+        for x in self.p2p_connections:
+            x.wait_for_block_announcement(int(self.nodes[0].getbestblockhash(), 16))
+            x.clear_last_announcement()
 
         tip_height = self.nodes[1].getblockcount()
         hash_to_invalidate = self.nodes[1].getblockhash(tip_height-(length-1))
@@ -495,7 +479,7 @@ def run_test(self):
 
         test_node.send_header_for_blocks(blocks)
         test_node.sync_with_ping()
-        test_node.wait_for_getdata([x.sha256 for x in blocks], timeout=test_node.sleep_time)
+        test_node.wait_for_getdata([x.sha256 for x in blocks], timeout=direct_fetch_response_time)
 
         [ test_node.send_message(msg_block(x)) for x in blocks ]
 
@@ -526,13 +510,13 @@ def run_test(self):
         # both blocks (same work as tip)
         test_node.send_header_for_blocks(blocks[1:2])
         test_node.sync_with_ping()
-        test_node.wait_for_getdata([x.sha256 for x in blocks[0:2]], timeout=test_node.sleep_time)
+        test_node.wait_for_getdata([x.sha256 for x in blocks[0:2]], timeout=direct_fetch_response_time)
 
         # Announcing 16 more headers should trigger direct fetch for 14 more
         # blocks
         test_node.send_header_for_blocks(blocks[2:18])
         test_node.sync_with_ping()
-        test_node.wait_for_getdata([x.sha256 for x in blocks[2:16]], timeout=test_node.sleep_time)
+        test_node.wait_for_getdata([x.sha256 for x in blocks[2:16]], timeout=direct_fetch_response_time)
 
         # Announcing 1 more header should not trigger any response
         test_node.last_getdata = None

From fafeec3cf2ceb5330a04539adc90b27dc7e6fd42 Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Tue, 27 Sep 2016 20:52:16 +0200
Subject: [PATCH 1009/1802] [qt] sync-overlay: Don't show progress twice

* Don't show integer progress in progress bar. (Already shown in front
  of progress bar)

* Also, use non-static method to get current msecs
---
 src/qt/forms/modaloverlay.ui | 3 +++
 src/qt/modaloverlay.cpp      | 6 ++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/qt/forms/modaloverlay.ui b/src/qt/forms/modaloverlay.ui
index b16ecafbe430e..73223735f5c6b 100644
--- a/src/qt/forms/modaloverlay.ui
+++ b/src/qt/forms/modaloverlay.ui
@@ -276,6 +276,9 @@ QLabel { color: rgb(40,40,40);  }</string>
                <property name="value">
                 <number>24</number>
                </property>
+               <property name="format">
+                <string/>
+               </property>
               </widget>
              </item>
             </layout>
diff --git a/src/qt/modaloverlay.cpp b/src/qt/modaloverlay.cpp
index 5caade7d381c9..ae0d8f5f63676 100644
--- a/src/qt/modaloverlay.cpp
+++ b/src/qt/modaloverlay.cpp
@@ -77,7 +77,7 @@ void ModalOverlay::tipUpdate(int count, const QDateTime& blockDate, double nVeri
     QDateTime currentDate = QDateTime::currentDateTime();
 
     // keep a vector of samples of verification progress at height
-    blockProcessTime.push_front(qMakePair(currentDate.currentMSecsSinceEpoch(), nVerificationProgress));
+    blockProcessTime.push_front(qMakePair(currentDate.toMSecsSinceEpoch(), nVerificationProgress));
 
     // show progress speed if we have more then one sample
     if (blockProcessTime.size() >= 2)
@@ -93,8 +93,7 @@ void ModalOverlay::tipUpdate(int count, const QDateTime& blockDate, double nVeri
             QPair<qint64, double> sample = blockProcessTime[i];
 
             // take first sample after 500 seconds or last available one
-            if (sample.first < (currentDate.currentMSecsSinceEpoch() - 500*1000) || i == blockProcessTime.size()-1)
-            {
+            if (sample.first < (currentDate.toMSecsSinceEpoch() - 500 * 1000) || i == blockProcessTime.size() - 1) {
                 progressDelta = progressStart-sample.second;
                 timeDelta = blockProcessTime[0].first - sample.first;
                 progressPerHour = progressDelta/(double)timeDelta*1000*3600;
@@ -108,7 +107,6 @@ void ModalOverlay::tipUpdate(int count, const QDateTime& blockDate, double nVeri
         // show expected remaining time
         ui->expectedTimeLeft->setText(GUIUtil::formateNiceTimeOffset(remainingMSecs/1000.0));
 
-        // keep maximal 5000 samples
         static const int MAX_SAMPLES = 5000;
         if (blockProcessTime.count() > MAX_SAMPLES)
             blockProcessTime.remove(MAX_SAMPLES, blockProcessTime.count()-MAX_SAMPLES);

From 4cdece40419bcc97345357f9268e03b0aff400b5 Mon Sep 17 00:00:00 2001
From: Dagur Valberg Johannsson <dagurval@pvv.ntnu.no>
Date: Sun, 9 Oct 2016 15:47:55 -0400
Subject: [PATCH 1010/1802] [qa] Fix compact block shortids for a test case

---
 qa/rpc-tests/p2p-compactblocks.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/qa/rpc-tests/p2p-compactblocks.py b/qa/rpc-tests/p2p-compactblocks.py
index d91e10d77cb4b..97e7190d16f13 100755
--- a/qa/rpc-tests/p2p-compactblocks.py
+++ b/qa/rpc-tests/p2p-compactblocks.py
@@ -382,7 +382,9 @@ def test_compactblock_requests(self, node, test_node):
             comp_block = HeaderAndShortIDs()
             comp_block.header = CBlockHeader(block)
             comp_block.nonce = 0
-            comp_block.shortids = [1]  # this is useless, and wrong
+            [k0, k1] = comp_block.get_siphash_keys()
+            comp_block.shortids = [
+                    calculate_shortid(k0, k1, block.vtx[0].sha256) ]
             test_node.send_and_ping(msg_cmpctblock(comp_block.to_p2p()))
             assert_equal(int(node.getbestblockhash(), 16), block.hashPrevBlock)
             # Expect a getblocktxn message.

From 8aed5f6c23cbaae6bf56be04f2b8d861eacf588d Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Tue, 11 Oct 2016 17:41:45 +0200
Subject: [PATCH 1011/1802] qt: Translate all files, even if wallet disabled

This passes all QT cpp files to the lupdate executable which extracts
translations, no matter what conditional functionality is enabled.
---
 src/Makefile.qt.include | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/Makefile.qt.include b/src/Makefile.qt.include
index a2ed4f47d8de7..1f9a901d75882 100644
--- a/src/Makefile.qt.include
+++ b/src/Makefile.qt.include
@@ -289,7 +289,7 @@ RES_ICONS = \
   qt/res/icons/warning.png \
   qt/res/icons/verify.png
 
-BITCOIN_QT_CPP = \
+BITCOIN_QT_BASE_CPP = \
   qt/bantablemodel.cpp \
   qt/bitcoinaddressvalidator.cpp \
   qt/bitcoinamountfield.cpp \
@@ -313,12 +313,9 @@ BITCOIN_QT_CPP = \
   qt/trafficgraphwidget.cpp \
   qt/utilitydialog.cpp
 
-if TARGET_WINDOWS
-BITCOIN_QT_CPP += qt/winshutdownmonitor.cpp
-endif
+BITCOIN_QT_WINDOWS_CPP = qt/winshutdownmonitor.cpp
 
-if ENABLE_WALLET
-BITCOIN_QT_CPP += \
+BITCOIN_QT_WALLET_CPP = \
   qt/addressbookpage.cpp \
   qt/addresstablemodel.cpp \
   qt/askpassphrasedialog.cpp \
@@ -345,6 +342,13 @@ BITCOIN_QT_CPP += \
   qt/walletmodel.cpp \
   qt/walletmodeltransaction.cpp \
   qt/walletview.cpp
+
+BITCOIN_QT_CPP = $(BITCOIN_QT_BASE_CPP)
+if TARGET_WINDOWS
+BITCOIN_QT_CPP += $(BITCOIN_QT_WINDOWS_CPP)
+endif
+if ENABLE_WALLET
+BITCOIN_QT_CPP += $(BITCOIN_QT_WALLET_CPP)
 endif
 
 RES_IMAGES = 
@@ -413,7 +417,7 @@ $(srcdir)/qt/bitcoinstrings.cpp: $(libbitcoin_server_a_SOURCES) $(libbitcoin_wal
 	@test -n $(XGETTEXT) || echo "xgettext is required for updating translations"
 	$(AM_V_GEN) cd $(srcdir); XGETTEXT=$(XGETTEXT) PACKAGE_NAME="$(PACKAGE_NAME)" COPYRIGHT_HOLDERS="$(COPYRIGHT_HOLDERS)" COPYRIGHT_HOLDERS_SUBSTITUTION="$(COPYRIGHT_HOLDERS_SUBSTITUTION)" $(PYTHON) ../share/qt/extract_strings_qt.py $^
 
-translate: $(srcdir)/qt/bitcoinstrings.cpp $(QT_FORMS_UI) $(QT_FORMS_UI) $(BITCOIN_QT_CPP) $(BITCOIN_QT_H) $(BITCOIN_MM)
+translate: $(srcdir)/qt/bitcoinstrings.cpp $(QT_FORMS_UI) $(QT_FORMS_UI) $(BITCOIN_QT_BASE_CPP) $(BITCOIN_QT_WINDOWS_CPP) $(BITCOIN_QT_WALLET_CPP) $(BITCOIN_QT_H) $(BITCOIN_MM)
 	@test -n $(LUPDATE) || echo "lupdate is required for updating translations"
 	$(AM_V_GEN) QT_SELECT=$(QT_SELECT) $(LUPDATE) $^ -locations relative -no-obsolete -ts $(srcdir)/qt/locale/bitcoin_en.ts
 

From 3f92bc9e83094421d4bfd3802fc98ac9e26405e1 Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Wed, 5 Oct 2016 10:58:57 +0200
Subject: [PATCH 1012/1802] doc: Add build instructions for FreeBSD

---
 doc/build-unix.md | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/doc/build-unix.md b/doc/build-unix.md
index 62e3e793e97f3..5202072f8b8e1 100644
--- a/doc/build-unix.md
+++ b/doc/build-unix.md
@@ -308,3 +308,35 @@ To build executables for ARM:
 
 
 For further documentation on the depends system see [README.md](../depends/README.md) in the depends directory.
+
+Building on FreeBSD
+--------------------
+
+(Updated as of FreeBSD 10.3)
+
+Clang is installed by default as `cc` compiler, this makes it easier to get
+started than on [OpenBSD](build-openbsd.md). Installing dependencies:
+
+    pkg install autoconf automake libtool pkgconf
+    pkg install boost-libs openssl libevent2
+
+(`libressl` instead of `openssl` will also work)
+
+For the wallet (optional):
+
+    pkg install db5
+
+This will give a warning "configure: WARNING: Found Berkeley DB other
+than 4.8; wallets opened by this build will not be portable!", but as FreeBSD never
+had a binary release, this may not matter. If backwards compatibility
+with 4.8-built Bitcoin Core is needed follow the steps under "Berkeley DB" above.
+
+Then build using:
+
+    ./autogen.sh
+    ./configure --with-incompatible-bdb CPPFLAGS=-I/usr/local/include/db5 LDFLAGS=-L/usr/local/lib/db5
+    make
+
+*Note on debugging*: The version of `gdb` installed by default is [ancient and considered harmful](https://wiki.freebsd.org/GdbRetirement).
+It is not suitable for debugging a multi-threaded C++ program, not even for getting backtraces. Please install the package `gdb` and
+use the versioned gdb command e.g. `gdb7111`.

From 36f60a5d5b1bc9a12b87d6475e3245b8236775e4 Mon Sep 17 00:00:00 2001
From: Peter Todd <pete@petertodd.org>
Date: Thu, 13 Oct 2016 19:31:52 +0200
Subject: [PATCH 1013/1802] Add copyright/patent issues to possible NACK
 reasons

Adding in response to a Slack discussion where someone was unclear on the fact
that a NACK may be justified if code can't be accepted due to copyright/patent
issues.  For example, it would be reasonable and prudent to NACK a contribution
of AGPL-licensed consensus code on the basis that the license terms are
incompatible with the MIT license used by the rest of the codebase.
---
 CONTRIBUTING.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index fd1a912c4fdf7..06fcd8dd81301 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -178,7 +178,9 @@ language is used within pull-request comments:
 
   - ACK means "I have tested the code and I agree it should be merged";
   - NACK means "I disagree this should be merged", and must be accompanied by
-    sound technical justification. NACKs without accompanying reasoning may be disregarded;
+    sound technical justification (or in certain cases of copyright/patent/licensing
+    issues, legal justification). NACKs without accompanying reasoning may be
+    disregarded;
   - utACK means "I have not tested the code, but I have reviewed it and it looks
     OK, I agree it can be merged";
   - Concept ACK means "I agree in the general principle of this pull request";

From 21f5a6364d5bad738d51e75ff96c8f8b88557d11 Mon Sep 17 00:00:00 2001
From: Luke Dashjr <luke-jr+git@utopios.org>
Date: Thu, 13 Oct 2016 23:27:26 +0000
Subject: [PATCH 1014/1802] Qt: Add "Copy URI" to payment request context menu

---
 src/qt/receivecoinsdialog.cpp | 39 ++++++++++++++++++++++++++++-------
 src/qt/receivecoinsdialog.h   |  2 ++
 2 files changed, 33 insertions(+), 8 deletions(-)

diff --git a/src/qt/receivecoinsdialog.cpp b/src/qt/receivecoinsdialog.cpp
index 7fb68cc32a209..e89f06484ce46 100644
--- a/src/qt/receivecoinsdialog.cpp
+++ b/src/qt/receivecoinsdialog.cpp
@@ -43,18 +43,21 @@ ReceiveCoinsDialog::ReceiveCoinsDialog(const PlatformStyle *platformStyle, QWidg
     }
 
     // context menu actions
+    QAction *copyURIAction = new QAction(tr("Copy URI"), this);
     QAction *copyLabelAction = new QAction(tr("Copy label"), this);
     QAction *copyMessageAction = new QAction(tr("Copy message"), this);
     QAction *copyAmountAction = new QAction(tr("Copy amount"), this);
 
     // context menu
     contextMenu = new QMenu();
+    contextMenu->addAction(copyURIAction);
     contextMenu->addAction(copyLabelAction);
     contextMenu->addAction(copyMessageAction);
     contextMenu->addAction(copyAmountAction);
 
     // context menu signals
     connect(ui->recentRequestsView, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(showMenu(QPoint)));
+    connect(copyURIAction, SIGNAL(triggered()), this, SLOT(copyURI()));
     connect(copyLabelAction, SIGNAL(triggered()), this, SLOT(copyLabel()));
     connect(copyMessageAction, SIGNAL(triggered()), this, SLOT(copyMessage()));
     connect(copyAmountAction, SIGNAL(triggered()), this, SLOT(copyAmount()));
@@ -227,30 +230,50 @@ void ReceiveCoinsDialog::keyPressEvent(QKeyEvent *event)
     this->QDialog::keyPressEvent(event);
 }
 
-// copy column of selected row to clipboard
-void ReceiveCoinsDialog::copyColumnToClipboard(int column)
+QModelIndex ReceiveCoinsDialog::selectedRow()
 {
     if(!model || !model->getRecentRequestsTableModel() || !ui->recentRequestsView->selectionModel())
-        return;
+        return QModelIndex();
     QModelIndexList selection = ui->recentRequestsView->selectionModel()->selectedRows();
     if(selection.empty())
-        return;
+        return QModelIndex();
     // correct for selection mode ContiguousSelection
     QModelIndex firstIndex = selection.at(0);
+    return firstIndex;
+}
+
+// copy column of selected row to clipboard
+void ReceiveCoinsDialog::copyColumnToClipboard(int column)
+{
+    QModelIndex firstIndex = selectedRow();
+    if (!firstIndex.isValid()) {
+        return;
+    }
     GUIUtil::setClipboard(model->getRecentRequestsTableModel()->data(firstIndex.child(firstIndex.row(), column), Qt::EditRole).toString());
 }
 
 // context menu
 void ReceiveCoinsDialog::showMenu(const QPoint &point)
 {
-    if(!model || !model->getRecentRequestsTableModel() || !ui->recentRequestsView->selectionModel())
-        return;
-    QModelIndexList selection = ui->recentRequestsView->selectionModel()->selectedRows();
-    if(selection.empty())
+    if (!selectedRow().isValid()) {
         return;
+    }
     contextMenu->exec(QCursor::pos());
 }
 
+// context menu action: copy URI
+void ReceiveCoinsDialog::copyURI()
+{
+    QModelIndex sel = selectedRow();
+    if (!sel.isValid()) {
+        return;
+    }
+
+    const RecentRequestsTableModel * const submodel = model->getRecentRequestsTableModel();
+    const QString uri = GUIUtil::formatBitcoinURI(submodel->entry(sel.row()).recipient);
+    GUIUtil::setClipboard(uri);
+}
+
 // context menu action: copy label
 void ReceiveCoinsDialog::copyLabel()
 {
diff --git a/src/qt/receivecoinsdialog.h b/src/qt/receivecoinsdialog.h
index eaaf129a91d5d..9612da318c9be 100644
--- a/src/qt/receivecoinsdialog.h
+++ b/src/qt/receivecoinsdialog.h
@@ -60,6 +60,7 @@ public Q_SLOTS:
     QMenu *contextMenu;
     const PlatformStyle *platformStyle;
 
+    QModelIndex selectedRow();
     void copyColumnToClipboard(int column);
     virtual void resizeEvent(QResizeEvent *event);
 
@@ -71,6 +72,7 @@ private Q_SLOTS:
     void recentRequestsView_selectionChanged(const QItemSelection &selected, const QItemSelection &deselected);
     void updateDisplayUnit();
     void showMenu(const QPoint &point);
+    void copyURI();
     void copyLabel();
     void copyMessage();
     void copyAmount();

From 032e883b937a6b70d5c367fc2ee57d7eea8cb473 Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Fri, 14 Oct 2016 12:54:15 -0400
Subject: [PATCH 1015/1802] [qa] Send segwit-encoded blocktxn messages in
 p2p-compactblocks

---
 qa/rpc-tests/p2p-compactblocks.py | 28 ++++++++++++++++++----------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/qa/rpc-tests/p2p-compactblocks.py b/qa/rpc-tests/p2p-compactblocks.py
index e7f5a1c9c6f81..1beab609b68ef 100755
--- a/qa/rpc-tests/p2p-compactblocks.py
+++ b/qa/rpc-tests/p2p-compactblocks.py
@@ -6,7 +6,7 @@
 from test_framework.mininode import *
 from test_framework.test_framework import BitcoinTestFramework
 from test_framework.util import *
-from test_framework.blocktools import create_block, create_coinbase
+from test_framework.blocktools import create_block, create_coinbase, add_witness_commitment
 from test_framework.siphash import siphash256
 from test_framework.script import CScript, OP_TRUE
 
@@ -123,11 +123,13 @@ def setup_network(self):
                  ["-debug", "-logtimemicros", "-txindex"]])
         connect_nodes(self.nodes[0], 1)
 
-    def build_block_on_tip(self, node):
+    def build_block_on_tip(self, node, segwit=False):
         height = node.getblockcount()
         tip = node.getbestblockhash()
         mtp = node.getblockheader(tip)['mediantime']
         block = create_block(int(tip, 16), create_coinbase(height + 1), mtp + 1)
+        if segwit:
+            add_witness_commitment(block)
         block.solve()
         return block
 
@@ -380,11 +382,11 @@ def test_compactblock_construction(self, node, test_node, version, use_witness_a
     # Post-segwit: upgraded nodes would only make this request of cb-version-2,
     # NODE_WITNESS peers.  Unupgraded nodes would still make this request of
     # any cb-version-1-supporting peer.
-    def test_compactblock_requests(self, node, test_node):
+    def test_compactblock_requests(self, node, test_node, version, segwit):
         # Try announcing a block with an inv or header, expect a compactblock
         # request
         for announce in ["inv", "header"]:
-            block = self.build_block_on_tip(node)
+            block = self.build_block_on_tip(node, segwit=segwit)
             with mininode_lock:
                 test_node.last_getdata = None
 
@@ -403,8 +405,11 @@ def test_compactblock_requests(self, node, test_node):
             comp_block.header = CBlockHeader(block)
             comp_block.nonce = 0
             [k0, k1] = comp_block.get_siphash_keys()
+            coinbase_hash = block.vtx[0].sha256
+            if version == 2:
+                coinbase_hash = block.vtx[0].calc_sha256(True)
             comp_block.shortids = [
-                    calculate_shortid(k0, k1, block.vtx[0].sha256) ]
+                    calculate_shortid(k0, k1, coinbase_hash) ]
             test_node.send_and_ping(msg_cmpctblock(comp_block.to_p2p()))
             assert_equal(int(node.getbestblockhash(), 16), block.hashPrevBlock)
             # Expect a getblocktxn message.
@@ -414,7 +419,10 @@ def test_compactblock_requests(self, node, test_node):
             assert_equal(absolute_indexes, [0])  # should be a coinbase request
 
             # Send the coinbase, and verify that the tip advances.
-            msg = msg_blocktxn()
+            if version == 2:
+                msg = msg_witness_blocktxn()
+            else:
+                msg = msg_blocktxn()
             msg.block_transactions.blockhash = block.sha256
             msg.block_transactions.transactions = [block.vtx[0]]
             test_node.send_and_ping(msg)
@@ -750,9 +758,9 @@ def run_test(self):
         sync_blocks(self.nodes)
 
         print("\tTesting compactblock requests... ")
-        self.test_compactblock_requests(self.nodes[0], self.test_node)
+        self.test_compactblock_requests(self.nodes[0], self.test_node, 1, False)
         sync_blocks(self.nodes)
-        self.test_compactblock_requests(self.nodes[1], self.segwit_node)
+        self.test_compactblock_requests(self.nodes[1], self.segwit_node, 2, False)
         sync_blocks(self.nodes)
 
         print("\tTesting getblocktxn requests...")
@@ -800,7 +808,7 @@ def run_test(self):
         sync_blocks(self.nodes)
 
         print("\tTesting compactblock requests (unupgraded node)... ")
-        self.test_compactblock_requests(self.nodes[0], self.test_node)
+        self.test_compactblock_requests(self.nodes[0], self.test_node, 1, True)
 
         print("\tTesting getblocktxn requests (unupgraded node)...")
         self.test_getblocktxn_requests(self.nodes[0], self.test_node, 1)
@@ -815,7 +823,7 @@ def run_test(self):
         assert_equal(self.nodes[0].getbestblockhash(), self.nodes[1].getbestblockhash())
 
         print("\tTesting compactblock requests (segwit node)... ")
-        self.test_compactblock_requests(self.nodes[1], self.segwit_node)
+        self.test_compactblock_requests(self.nodes[1], self.segwit_node, 2, True)
 
         print("\tTesting getblocktxn requests (segwit node)...")
         self.test_getblocktxn_requests(self.nodes[1], self.segwit_node, 2)

From 1724a405c9065f2c939e936aca9b5d37fca5e954 Mon Sep 17 00:00:00 2001
From: R E Broadley <rebroad+github@gmail.com>
Date: Fri, 14 Oct 2016 21:11:38 +0700
Subject: [PATCH 1016/1802] Display minimum ping in debug window.

---
 src/net.cpp                 |  2 +-
 src/net.h                   |  2 +-
 src/qt/forms/debugwindow.ui | 27 +++++++++++++++++++++++++--
 src/qt/guiutil.cpp          |  2 +-
 src/qt/peertablemodel.cpp   |  6 +++---
 src/qt/rpcconsole.cpp       |  1 +
 src/rpc/net.cpp             |  4 ++--
 7 files changed, 34 insertions(+), 10 deletions(-)

diff --git a/src/net.cpp b/src/net.cpp
index 19dd040997ad1..0f719a9c7f430 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -659,7 +659,7 @@ void CNode::copyStats(CNodeStats &stats)
 
     // Raw ping time is in microseconds, but show it to user as whole seconds (Bitcoin users should be well used to small numbers with many decimal places by now :)
     stats.dPingTime = (((double)nPingUsecTime) / 1e6);
-    stats.dPingMin  = (((double)nMinPingUsecTime) / 1e6);
+    stats.dMinPing  = (((double)nMinPingUsecTime) / 1e6);
     stats.dPingWait = (((double)nPingUsecWait) / 1e6);
 
     // Leave string empty if addrLocal invalid (not filled in yet)
diff --git a/src/net.h b/src/net.h
index 67f0abe4be820..90a4db2c63eea 100644
--- a/src/net.h
+++ b/src/net.h
@@ -503,7 +503,7 @@ class CNodeStats
     bool fWhitelisted;
     double dPingTime;
     double dPingWait;
-    double dPingMin;
+    double dMinPing;
     std::string addrLocal;
     CAddress addr;
 };
diff --git a/src/qt/forms/debugwindow.ui b/src/qt/forms/debugwindow.ui
index 9dc641979e084..8be4a955b3d34 100644
--- a/src/qt/forms/debugwindow.ui
+++ b/src/qt/forms/debugwindow.ui
@@ -1353,13 +1353,36 @@
            </widget>
           </item>
           <item row="16" column="0">
+           <widget class="QLabel" name="peerMinPingLabel">
+            <property name="text">
+             <string>Min Ping</string>
+            </property>
+           </widget>
+          </item>
+          <item row="16" column="2">
+           <widget class="QLabel" name="peerMinPing">
+            <property name="cursor">
+             <cursorShape>IBeamCursor</cursorShape>
+            </property>
+            <property name="text">
+             <string>N/A</string>
+            </property>
+            <property name="textFormat">
+             <enum>Qt::PlainText</enum>
+            </property>
+            <property name="textInteractionFlags">
+             <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
+            </property>
+           </widget>
+          </item>
+          <item row="17" column="0">
            <widget class="QLabel" name="label_timeoffset">
             <property name="text">
              <string>Time Offset</string>
             </property>
            </widget>
           </item>
-          <item row="16" column="2">
+          <item row="17" column="2">
            <widget class="QLabel" name="timeoffset">
             <property name="cursor">
              <cursorShape>IBeamCursor</cursorShape>
@@ -1375,7 +1398,7 @@
             </property>
            </widget>
           </item>
-          <item row="17" column="1">
+          <item row="18" column="1">
            <spacer name="verticalSpacer_3">
             <property name="orientation">
              <enum>Qt::Vertical</enum>
diff --git a/src/qt/guiutil.cpp b/src/qt/guiutil.cpp
index 0beaddf997cda..42dafa1175605 100644
--- a/src/qt/guiutil.cpp
+++ b/src/qt/guiutil.cpp
@@ -947,7 +947,7 @@ QString formatServicesStr(quint64 mask)
 
 QString formatPingTime(double dPingTime)
 {
-    return dPingTime == 0 ? QObject::tr("N/A") : QString(QObject::tr("%1 ms")).arg(QString::number((int)(dPingTime * 1000), 10));
+    return (dPingTime == std::numeric_limits<int64_t>::max()/1e6 || dPingTime == 0) ? QObject::tr("N/A") : QString(QObject::tr("%1 ms")).arg(QString::number((int)(dPingTime * 1000), 10));
 }
 
 QString formatTimeOffset(int64_t nTimeOffset)
diff --git a/src/qt/peertablemodel.cpp b/src/qt/peertablemodel.cpp
index a820bd791f70b..a2f9471fcc688 100644
--- a/src/qt/peertablemodel.cpp
+++ b/src/qt/peertablemodel.cpp
@@ -31,7 +31,7 @@ bool NodeLessThan::operator()(const CNodeCombinedStats &left, const CNodeCombine
     case PeerTableModel::Subversion:
         return pLeft->cleanSubVer.compare(pRight->cleanSubVer) < 0;
     case PeerTableModel::Ping:
-        return pLeft->dPingTime < pRight->dPingTime;
+        return pLeft->dMinPing < pRight->dMinPing;
     }
 
     return false;
@@ -113,7 +113,7 @@ PeerTableModel::PeerTableModel(ClientModel *parent) :
     clientModel(parent),
     timer(0)
 {
-    columns << tr("NodeId") << tr("Node/Service") << tr("User Agent") << tr("Ping Time");
+    columns << tr("NodeId") << tr("Node/Service") << tr("User Agent") << tr("Ping");
     priv = new PeerTablePriv();
     // default to unsorted
     priv->sortColumn = -1;
@@ -166,7 +166,7 @@ QVariant PeerTableModel::data(const QModelIndex &index, int role) const
         case Subversion:
             return QString::fromStdString(rec->nodeStats.cleanSubVer);
         case Ping:
-            return GUIUtil::formatPingTime(rec->nodeStats.dPingTime);
+            return GUIUtil::formatPingTime(rec->nodeStats.dMinPing);
         }
     } else if (role == Qt::TextAlignmentRole) {
         if (index.column() == Ping)
diff --git a/src/qt/rpcconsole.cpp b/src/qt/rpcconsole.cpp
index b6ed75535c8d1..a1017e6c16bb8 100644
--- a/src/qt/rpcconsole.cpp
+++ b/src/qt/rpcconsole.cpp
@@ -895,6 +895,7 @@ void RPCConsole::updateNodeDetail(const CNodeCombinedStats *stats)
     ui->peerConnTime->setText(GUIUtil::formatDurationStr(GetTime() - stats->nodeStats.nTimeConnected));
     ui->peerPingTime->setText(GUIUtil::formatPingTime(stats->nodeStats.dPingTime));
     ui->peerPingWait->setText(GUIUtil::formatPingTime(stats->nodeStats.dPingWait));
+    ui->peerMinPing->setText(GUIUtil::formatPingTime(stats->nodeStats.dMinPing));
     ui->timeoffset->setText(GUIUtil::formatTimeOffset(stats->nodeStats.nTimeOffset));
     ui->peerVersion->setText(QString("%1").arg(QString::number(stats->nodeStats.nVersion)));
     ui->peerSubversion->setText(QString::fromStdString(stats->nodeStats.cleanSubVer));
diff --git a/src/rpc/net.cpp b/src/rpc/net.cpp
index b011029f51c29..a8442d86929b7 100644
--- a/src/rpc/net.cpp
+++ b/src/rpc/net.cpp
@@ -141,8 +141,8 @@ UniValue getpeerinfo(const UniValue& params, bool fHelp)
         obj.push_back(Pair("timeoffset", stats.nTimeOffset));
         if (stats.dPingTime > 0.0)
             obj.push_back(Pair("pingtime", stats.dPingTime));
-        if (stats.dPingMin < std::numeric_limits<int64_t>::max()/1e6)
-            obj.push_back(Pair("minping", stats.dPingMin));
+        if (stats.dMinPing < std::numeric_limits<int64_t>::max()/1e6)
+            obj.push_back(Pair("minping", stats.dMinPing));
         if (stats.dPingWait > 0.0)
             obj.push_back(Pair("pingwait", stats.dPingWait));
         obj.push_back(Pair("version", stats.nVersion));

From acf853df910339412bafb1743f42af1774f5b910 Mon Sep 17 00:00:00 2001
From: Johnson Lau <jl2012@xbt.hk>
Date: Sat, 15 Oct 2016 23:45:07 +0800
Subject: [PATCH 1017/1802] Add script tests for FindAndDelete in pre-segwit
 and segwit scripts

---
 src/script/interpreter.cpp    |  4 ++--
 src/test/data/tx_invalid.json | 26 ++++++++++++++++++++++++++
 src/test/data/tx_valid.json   | 23 +++++++++++++++++++++++
 3 files changed, 51 insertions(+), 2 deletions(-)

diff --git a/src/script/interpreter.cpp b/src/script/interpreter.cpp
index 41756ea71196d..e0f2f89190d93 100644
--- a/src/script/interpreter.cpp
+++ b/src/script/interpreter.cpp
@@ -874,7 +874,7 @@ bool EvalScript(vector<vector<unsigned char> >& stack, const CScript& script, un
                     // Subset of script starting at the most recent codeseparator
                     CScript scriptCode(pbegincodehash, pend);
 
-                    // Drop the signature, since there's no way for a signature to sign itself
+                    // Drop the signature in pre-segwit scripts but not segwit scripts
                     if (sigversion == SIGVERSION_BASE) {
                         scriptCode.FindAndDelete(CScript(vchSig));
                     }
@@ -935,7 +935,7 @@ bool EvalScript(vector<vector<unsigned char> >& stack, const CScript& script, un
                     // Subset of script starting at the most recent codeseparator
                     CScript scriptCode(pbegincodehash, pend);
 
-                    // Drop the signatures, since there's no way for a signature to sign itself
+                    // Drop the signature in pre-segwit scripts but not segwit scripts
                     for (int k = 0; k < nSigsCount; k++)
                     {
                         valtype& vchSig = stacktop(-isig-k);
diff --git a/src/test/data/tx_invalid.json b/src/test/data/tx_invalid.json
index f8baee05779c3..f7d9e1847ffa0 100644
--- a/src/test/data/tx_invalid.json
+++ b/src/test/data/tx_invalid.json
@@ -314,5 +314,31 @@
 [[["0000000000000000000000000000000000000000000000000000000000000100", 0, "0x60 0x21 0xff25429251b5a84f452230a3c75fd886b7fc5a7865ce4a7bb7a9d7c5be6da3dbff", 1000]],
 "010000000100010000000000000000000000000000000000000000000000000000000000000000000000ffffffff01e803000000000000015100000000", "P2SH,WITNESS,DISCOURAGE_UPGRADABLE_WITNESS_PROGRAM"],
 
+["FindAndDelete tests"],
+["This is a test of FindAndDelete. The first tx is a spend of normal scriptPubKey and the second tx is a spend of bare P2WSH."],
+["The redeemScript/witnessScript is CHECKSIGVERIFY <0x30450220487fb382c4974de3f7d834c1b617fe15860828c7f96454490edd6d891556dcc9022100baf95feb48f845d5bfc9882eb6aeefa1bc3790e39f59eaa46ff7f15ae626c53e01>."],
+["The signature is <0x30450220487fb382c4974de3f7d834c1b617fe15860828c7f96454490edd6d891556dcc9022100baf95feb48f845d5bfc9882eb6aeefa1bc3790e39f59eaa46ff7f15ae626c53e01> <pubkey>,"],
+["where the pubkey is obtained through key recovery with sig and the wrong sighash."],
+["This is to show that FindAndDelete is applied only to non-segwit scripts"],
+["To show that the tests are 'correctly wrong', they should pass by modifying OP_CHECKSIG under interpreter.cpp"],
+["by replacing (sigversion == SIGVERSION_BASE) with (sigversion != SIGVERSION_BASE)"],
+["Non-segwit: wrong sighash (without FindAndDelete) = 1ba1fe3bc90c5d1265460e684ce6774e324f0fabdf67619eda729e64e8b6bc08"],
+[[["f18783ace138abac5d3a7a5cf08e88fe6912f267ef936452e0c27d090621c169", 7000, "HASH160 0x14 0x0c746489e2d83cdbb5b90b432773342ba809c134 EQUAL", 200000]],
+"010000000169c12106097dc2e0526493ef67f21269fe888ef05c7a3a5dacab38e1ac8387f1581b0000b64830450220487fb382c4974de3f7d834c1b617fe15860828c7f96454490edd6d891556dcc9022100baf95feb48f845d5bfc9882eb6aeefa1bc3790e39f59eaa46ff7f15ae626c53e012103b12a1ec8428fc74166926318c15e17408fea82dbb157575e16a8c365f546248f4aad4830450220487fb382c4974de3f7d834c1b617fe15860828c7f96454490edd6d891556dcc9022100baf95feb48f845d5bfc9882eb6aeefa1bc3790e39f59eaa46ff7f15ae626c53e01ffffffff0101000000000000000000000000", "P2SH,WITNESS"],
+["BIP143: wrong sighash (with FindAndDelete) = 71c9cd9b2869b9c70b01b1f0360c148f42dee72297db312638df136f43311f23"],
+[[["f18783ace138abac5d3a7a5cf08e88fe6912f267ef936452e0c27d090621c169", 7500, "0x00 0x20 0x9e1be07558ea5cc8e02ed1d80c0911048afad949affa36d5c3951e3159dbea19", 200000]],
+"0100000000010169c12106097dc2e0526493ef67f21269fe888ef05c7a3a5dacab38e1ac8387f14c1d000000ffffffff01010000000000000000034830450220487fb382c4974de3f7d834c1b617fe15860828c7f96454490edd6d891556dcc9022100baf95feb48f845d5bfc9882eb6aeefa1bc3790e39f59eaa46ff7f15ae626c53e012102a9d7ed6e161f0e255c10bbfcca0128a9e2035c2c8da58899c54d22d3a31afdef4aad4830450220487fb382c4974de3f7d834c1b617fe15860828c7f96454490edd6d891556dcc9022100baf95feb48f845d5bfc9882eb6aeefa1bc3790e39f59eaa46ff7f15ae626c53e0100000000", "P2SH,WITNESS"],
+["This is multisig version of the FindAndDelete tests"],
+["Script is 2 CHECKMULTISIGVERIFY <sig1> <sig2> DROP"],
+["52af4830450220487fb382c4974de3f7d834c1b617fe15860828c7f96454490edd6d891556dcc9022100baf95feb48f845d5bfc9882eb6aeefa1bc3790e39f59eaa46ff7f15ae626c53e0148304502205286f726690b2e9b0207f0345711e63fa7012045b9eb0f19c2458ce1db90cf43022100e89f17f86abc5b149eba4115d4f128bcf45d77fb3ecdd34f594091340c0395960175"],
+["Signature is 0 <sig1> <sig2> 2 <key1> <key2>"],
+["Should pass by replacing (sigversion == SIGVERSION_BASE) with (sigversion != SIGVERSION_BASE) under OP_CHECKMULTISIG"],
+["Non-segwit: wrong sighash (without FindAndDelete) = 4bc6a53e8e16ef508c19e38bba08831daba85228b0211f323d4cb0999cf2a5e8"],
+[[["9628667ad48219a169b41b020800162287d2c0f713c04157e95c484a8dcb7592", 7000, "HASH160 0x14 0x5748407f5ca5cdca53ba30b79040260770c9ee1b EQUAL", 200000]],
+"01000000019275cb8d4a485ce95741c013f7c0d28722160008021bb469a11982d47a662896581b0000fd6f01004830450220487fb382c4974de3f7d834c1b617fe15860828c7f96454490edd6d891556dcc9022100baf95feb48f845d5bfc9882eb6aeefa1bc3790e39f59eaa46ff7f15ae626c53e0148304502205286f726690b2e9b0207f0345711e63fa7012045b9eb0f19c2458ce1db90cf43022100e89f17f86abc5b149eba4115d4f128bcf45d77fb3ecdd34f594091340c039596015221023fd5dd42b44769c5653cbc5947ff30ab8871f240ad0c0e7432aefe84b5b4ff3421039d52178dbde360b83f19cf348deb04fa8360e1bf5634577be8e50fafc2b0e4ef4c9552af4830450220487fb382c4974de3f7d834c1b617fe15860828c7f96454490edd6d891556dcc9022100baf95feb48f845d5bfc9882eb6aeefa1bc3790e39f59eaa46ff7f15ae626c53e0148304502205286f726690b2e9b0207f0345711e63fa7012045b9eb0f19c2458ce1db90cf43022100e89f17f86abc5b149eba4115d4f128bcf45d77fb3ecdd34f594091340c0395960175ffffffff0101000000000000000000000000", "P2SH,WITNESS"],
+["BIP143: wrong sighash (with FindAndDelete) = 17c50ec2181ecdfdc85ca081174b248199ba81fff730794d4f69b8ec031f2dce"],
+[[["9628667ad48219a169b41b020800162287d2c0f713c04157e95c484a8dcb7592", 7500, "0x00 0x20 0x9b66c15b4e0b4eb49fa877982cafded24859fe5b0e2dbfbe4f0df1de7743fd52", 200000]],
+"010000000001019275cb8d4a485ce95741c013f7c0d28722160008021bb469a11982d47a6628964c1d000000ffffffff0101000000000000000007004830450220487fb382c4974de3f7d834c1b617fe15860828c7f96454490edd6d891556dcc9022100baf95feb48f845d5bfc9882eb6aeefa1bc3790e39f59eaa46ff7f15ae626c53e0148304502205286f726690b2e9b0207f0345711e63fa7012045b9eb0f19c2458ce1db90cf43022100e89f17f86abc5b149eba4115d4f128bcf45d77fb3ecdd34f594091340c03959601010221023cb6055f4b57a1580c5a753e19610cafaedf7e0ff377731c77837fd666eae1712102c1b1db303ac232ffa8e5e7cc2cf5f96c6e40d3e6914061204c0541cb2043a0969552af4830450220487fb382c4974de3f7d834c1b617fe15860828c7f96454490edd6d891556dcc9022100baf95feb48f845d5bfc9882eb6aeefa1bc3790e39f59eaa46ff7f15ae626c53e0148304502205286f726690b2e9b0207f0345711e63fa7012045b9eb0f19c2458ce1db90cf43022100e89f17f86abc5b149eba4115d4f128bcf45d77fb3ecdd34f594091340c039596017500000000", "P2SH,WITNESS"],
+
 ["Make diffs cleaner by leaving a comment here without comma at the end"]
 ]
diff --git a/src/test/data/tx_valid.json b/src/test/data/tx_valid.json
index 1ea70135b437b..2f299aa5fea37 100644
--- a/src/test/data/tx_valid.json
+++ b/src/test/data/tx_valid.json
@@ -487,5 +487,28 @@
 [[["6eb98797a21c6c10aa74edf29d618be109f48a8e94c694f3701e08ca69186436", 1, "HASH160 0x14 0x9993a429037b5d912407a71c252019287b8d27a5 EQUAL", 987654321]],
 "0100000000010136641869ca081e70f394c6948e8af409e18b619df2ed74aa106c1ca29787b96e0100000023220020a16b5755f7f6f96dbd65f5f0d6ab9418b89af4b1f14a1bb8a09062c35f0dcb54ffffffff0200e9a435000000001976a914389ffce9cd9ae88dcc0631e88a821ffdbe9bfe2688acc0832f05000000001976a9147480a33f950689af511e6e84c138dbbd3c3ee41588ac080047304402206ac44d672dac41f9b00e28f4df20c52eeb087207e8d758d76d92c6fab3b73e2b0220367750dbbe19290069cba53d096f44530e4f98acaa594810388cf7409a1870ce01473044022068c7946a43232757cbdf9176f009a928e1cd9a1a8c212f15c1e11ac9f2925d9002205b75f937ff2f9f3c1246e547e54f62e027f64eefa2695578cc6432cdabce271502473044022059ebf56d98010a932cf8ecfec54c48e6139ed6adb0728c09cbe1e4fa0915302e022007cd986c8fa870ff5d2b3a89139c9fe7e499259875357e20fcbb15571c76795403483045022100fbefd94bd0a488d50b79102b5dad4ab6ced30c4069f1eaa69a4b5a763414067e02203156c6a5c9cf88f91265f5a942e96213afae16d83321c8b31bb342142a14d16381483045022100a5263ea0553ba89221984bd7f0b13613db16e7a70c549a86de0cc0444141a407022005c360ef0ae5a5d4f9f2f87a56c1546cc8268cab08c73501d6b3be2e1e1a8a08824730440220525406a1482936d5a21888260dc165497a90a15669636d8edca6b9fe490d309c022032af0c646a34a44d1f4576bf6a4a74b67940f8faa84c7df9abe12a01a11e2b4783cf56210307b8ae49ac90a048e9b53357a2354b3334e9c8bee813ecb98e99a7e07e8c3ba32103b28f0c28bfab54554ae8c658ac5c3e0ce6e79ad336331f78c428dd43eea8449b21034b8113d703413d57761b8b9781957b8c0ac1dfe69f492580ca4195f50376ba4a21033400f6afecb833092a9a21cfdf1ed1376e58c5d1f47de74683123987e967a8f42103a6d48b1131e94ba04d9737d61acdaa1322008af9602b3b14862c07a1789aac162102d8b661b0b3302ee2f162b09e07a55ad5dfbe673a9f01d9f0c19617681024306b56ae00000000", "P2SH,WITNESS"],
 
+["FindAndDelete tests"],
+["This is a test of FindAndDelete. The first tx is a spend of normal P2SH and the second tx is a spend of bare P2WSH."],
+["The redeemScript/witnessScript is CHECKSIGVERIFY <0x30450220487fb382c4974de3f7d834c1b617fe15860828c7f96454490edd6d891556dcc9022100baf95feb48f845d5bfc9882eb6aeefa1bc3790e39f59eaa46ff7f15ae626c53e01>."],
+["The signature is <0x30450220487fb382c4974de3f7d834c1b617fe15860828c7f96454490edd6d891556dcc9022100baf95feb48f845d5bfc9882eb6aeefa1bc3790e39f59eaa46ff7f15ae626c53e01> <pubkey>,"],
+["where the pubkey is obtained through key recovery with sig and correct sighash."],
+["This is to show that FindAndDelete is applied only to non-segwit scripts"],
+["Non-segwit: correct sighash (with FindAndDelete) = 1ba1fe3bc90c5d1265460e684ce6774e324f0fabdf67619eda729e64e8b6bc08"],
+[[["f18783ace138abac5d3a7a5cf08e88fe6912f267ef936452e0c27d090621c169", 7000, "HASH160 0x14 0x0c746489e2d83cdbb5b90b432773342ba809c134 EQUAL", 200000]],
+"010000000169c12106097dc2e0526493ef67f21269fe888ef05c7a3a5dacab38e1ac8387f1581b0000b64830450220487fb382c4974de3f7d834c1b617fe15860828c7f96454490edd6d891556dcc9022100baf95feb48f845d5bfc9882eb6aeefa1bc3790e39f59eaa46ff7f15ae626c53e0121037a3fb04bcdb09eba90f69961ba1692a3528e45e67c85b200df820212d7594d334aad4830450220487fb382c4974de3f7d834c1b617fe15860828c7f96454490edd6d891556dcc9022100baf95feb48f845d5bfc9882eb6aeefa1bc3790e39f59eaa46ff7f15ae626c53e01ffffffff0101000000000000000000000000", "P2SH,WITNESS"],
+["BIP143: correct sighash (without FindAndDelete) = 71c9cd9b2869b9c70b01b1f0360c148f42dee72297db312638df136f43311f23"],
+[[["f18783ace138abac5d3a7a5cf08e88fe6912f267ef936452e0c27d090621c169", 7500, "0x00 0x20 0x9e1be07558ea5cc8e02ed1d80c0911048afad949affa36d5c3951e3159dbea19", 200000]],
+"0100000000010169c12106097dc2e0526493ef67f21269fe888ef05c7a3a5dacab38e1ac8387f14c1d000000ffffffff01010000000000000000034830450220487fb382c4974de3f7d834c1b617fe15860828c7f96454490edd6d891556dcc9022100baf95feb48f845d5bfc9882eb6aeefa1bc3790e39f59eaa46ff7f15ae626c53e012102a9781d66b61fb5a7ef00ac5ad5bc6ffc78be7b44a566e3c87870e1079368df4c4aad4830450220487fb382c4974de3f7d834c1b617fe15860828c7f96454490edd6d891556dcc9022100baf95feb48f845d5bfc9882eb6aeefa1bc3790e39f59eaa46ff7f15ae626c53e0100000000", "P2SH,WITNESS"],
+["This is multisig version of the FindAndDelete tests"],
+["Script is 2 CHECKMULTISIGVERIFY <sig1> <sig2> DROP"],
+["52af4830450220487fb382c4974de3f7d834c1b617fe15860828c7f96454490edd6d891556dcc9022100baf95feb48f845d5bfc9882eb6aeefa1bc3790e39f59eaa46ff7f15ae626c53e0148304502205286f726690b2e9b0207f0345711e63fa7012045b9eb0f19c2458ce1db90cf43022100e89f17f86abc5b149eba4115d4f128bcf45d77fb3ecdd34f594091340c0395960175"],
+["Signature is 0 <sig1> <sig2> 2 <key1> <key2>"],
+["Non-segwit: correct sighash (with FindAndDelete) = 1d50f00ba4db2917b903b0ec5002e017343bb38876398c9510570f5dce099295"],
+[[["9628667ad48219a169b41b020800162287d2c0f713c04157e95c484a8dcb7592", 7000, "HASH160 0x14 0x5748407f5ca5cdca53ba30b79040260770c9ee1b EQUAL", 200000]],
+"01000000019275cb8d4a485ce95741c013f7c0d28722160008021bb469a11982d47a662896581b0000fd6f01004830450220487fb382c4974de3f7d834c1b617fe15860828c7f96454490edd6d891556dcc9022100baf95feb48f845d5bfc9882eb6aeefa1bc3790e39f59eaa46ff7f15ae626c53e0148304502205286f726690b2e9b0207f0345711e63fa7012045b9eb0f19c2458ce1db90cf43022100e89f17f86abc5b149eba4115d4f128bcf45d77fb3ecdd34f594091340c03959601522102cd74a2809ffeeed0092bc124fd79836706e41f048db3f6ae9df8708cefb83a1c2102e615999372426e46fd107b76eaf007156a507584aa2cc21de9eee3bdbd26d36c4c9552af4830450220487fb382c4974de3f7d834c1b617fe15860828c7f96454490edd6d891556dcc9022100baf95feb48f845d5bfc9882eb6aeefa1bc3790e39f59eaa46ff7f15ae626c53e0148304502205286f726690b2e9b0207f0345711e63fa7012045b9eb0f19c2458ce1db90cf43022100e89f17f86abc5b149eba4115d4f128bcf45d77fb3ecdd34f594091340c0395960175ffffffff0101000000000000000000000000", "P2SH,WITNESS"],
+["BIP143: correct sighash (without FindAndDelete) = c1628a1e7c67f14ca0c27c06e4fdeec2e6d1a73c7a91d7c046ff83e835aebb72"],
+[[["9628667ad48219a169b41b020800162287d2c0f713c04157e95c484a8dcb7592", 7500, "0x00 0x20 0x9b66c15b4e0b4eb49fa877982cafded24859fe5b0e2dbfbe4f0df1de7743fd52", 200000]],
+"010000000001019275cb8d4a485ce95741c013f7c0d28722160008021bb469a11982d47a6628964c1d000000ffffffff0101000000000000000007004830450220487fb382c4974de3f7d834c1b617fe15860828c7f96454490edd6d891556dcc9022100baf95feb48f845d5bfc9882eb6aeefa1bc3790e39f59eaa46ff7f15ae626c53e0148304502205286f726690b2e9b0207f0345711e63fa7012045b9eb0f19c2458ce1db90cf43022100e89f17f86abc5b149eba4115d4f128bcf45d77fb3ecdd34f594091340c0395960101022102966f109c54e85d3aee8321301136cedeb9fc710fdef58a9de8a73942f8e567c021034ffc99dd9a79dd3cb31e2ab3e0b09e0e67db41ac068c625cd1f491576016c84e9552af4830450220487fb382c4974de3f7d834c1b617fe15860828c7f96454490edd6d891556dcc9022100baf95feb48f845d5bfc9882eb6aeefa1bc3790e39f59eaa46ff7f15ae626c53e0148304502205286f726690b2e9b0207f0345711e63fa7012045b9eb0f19c2458ce1db90cf43022100e89f17f86abc5b149eba4115d4f128bcf45d77fb3ecdd34f594091340c039596017500000000", "P2SH,WITNESS"],
+
 ["Make diffs cleaner by leaving a comment here without comma at the end"]
 ]

From 37aefff5fcf7169a1b07ff8939850f630640f7e7 Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Sat, 15 Oct 2016 13:19:16 -0400
Subject: [PATCH 1018/1802] Fix init segfault where InitLoadWallet() calls ATMP
 before genesis

---
 src/init.cpp          | 7 +++++++
 src/wallet/wallet.cpp | 2 --
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/init.cpp b/src/init.cpp
index eefef7ba0b253..057d8eefeef9b 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -1488,6 +1488,13 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
         uiInterface.NotifyBlockTip.disconnect(BlockNotifyGenesisWait);
     }
 
+#ifdef ENABLE_WALLET
+    // Add wallet transactions that aren't already in a block to mempool
+    // Do this here as mempool requires genesis block to be loaded
+    if (pwalletMain)
+        pwalletMain->ReacceptWalletTransactions();
+#endif
+
     // ********************************************************* Step 11: start node
 
     //// debug print
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index a1f69dd94dd6c..6f86f3360db2c 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -3467,8 +3467,6 @@ bool CWallet::InitLoadWallet()
         LogPrintf("mapWallet.size() = %u\n",       walletInstance->mapWallet.size());
         LogPrintf("mapAddressBook.size() = %u\n",  walletInstance->mapAddressBook.size());
     }
-    // Add wallet transactions that aren't already in a block to mapTransactions
-    walletInstance->ReacceptWalletTransactions();
 
     pwalletMain = walletInstance;
 

From aa9d3c9a503952589b359624bbb0da11dd7a5e3f Mon Sep 17 00:00:00 2001
From: Steven <steven@sigwo.com>
Date: Sat, 15 Oct 2016 13:57:19 -0400
Subject: [PATCH 1019/1802] add software-properties-common

This allows using `add-apt-repository`.
---
 doc/build-unix.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/build-unix.md b/doc/build-unix.md
index 5202072f8b8e1..a7221ddc6d160 100644
--- a/doc/build-unix.md
+++ b/doc/build-unix.md
@@ -82,6 +82,7 @@ install necessary parts of boost:
 BerkeleyDB is required for the wallet. db4.8 packages are available [here](https://launchpad.net/~bitcoin/+archive/bitcoin).
 You can add the repository and install using the following commands:
 
+    sudo apt-get install software-properties-common
     sudo add-apt-repository ppa:bitcoin/bitcoin
     sudo apt-get update
     sudo apt-get install libdb4.8-dev libdb4.8++-dev

From a4ad37d4ef4bcd81bc9d867b277efdebc86bc2e8 Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Sat, 15 Oct 2016 17:51:05 -0400
Subject: [PATCH 1020/1802] [qa] Build v4 blocks in p2p-compactblocktests

This fixes an issue in backporting to 0.13 as 0.13 enforces SF
activation by block version lockin instead of through a hard-coded
block height.
---
 qa/rpc-tests/p2p-compactblocks.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/qa/rpc-tests/p2p-compactblocks.py b/qa/rpc-tests/p2p-compactblocks.py
index 1beab609b68ef..131654c333d4d 100755
--- a/qa/rpc-tests/p2p-compactblocks.py
+++ b/qa/rpc-tests/p2p-compactblocks.py
@@ -128,6 +128,7 @@ def build_block_on_tip(self, node, segwit=False):
         tip = node.getbestblockhash()
         mtp = node.getblockheader(tip)['mediantime']
         block = create_block(int(tip, 16), create_coinbase(height + 1), mtp + 1)
+        block.nVersion = 4
         if segwit:
             add_witness_commitment(block)
         block.solve()

From 3ade2f64cfe43ab53e4869ffc35d5fd23201e1c1 Mon Sep 17 00:00:00 2001
From: Johnson Lau <jl2012@xbt.hk>
Date: Sun, 16 Oct 2016 23:53:16 +0800
Subject: [PATCH 1021/1802] Add standard limits for P2WSH with tests

---
 qa/rpc-tests/p2p-segwit.py | 111 +++++++++++++++++++++++++++++++++++++
 src/main.cpp               |   6 +-
 src/policy/policy.cpp      |  54 +++++++++++++++++-
 src/policy/policy.h        |  12 ++++
 4 files changed, 181 insertions(+), 2 deletions(-)

diff --git a/qa/rpc-tests/p2p-segwit.py b/qa/rpc-tests/p2p-segwit.py
index c2ea20bb845c8..16d1e8680273f 100755
--- a/qa/rpc-tests/p2p-segwit.py
+++ b/qa/rpc-tests/p2p-segwit.py
@@ -1706,6 +1706,116 @@ def test_getblocktemplate_before_lockin(self):
         assert(block_version & (1 << VB_WITNESS_BIT) != 0)
         self.nodes[0].setmocktime(0) # undo mocktime
 
+    def test_non_standard_witness(self):
+        print("\tTesting detection of non-standard P2WSH witness")
+        pad = chr(1).encode('latin-1')
+
+        # Create scripts for tests
+        scripts = []
+        scripts.append(CScript([OP_DROP] * 100))
+        scripts.append(CScript([OP_DROP] * 99))
+        scripts.append(CScript([pad * 59] * 59 + [OP_DROP] * 60))
+        scripts.append(CScript([pad * 59] * 59 + [OP_DROP] * 61))
+
+        p2wsh_scripts = []
+
+        assert(len(self.utxo))
+        tx = CTransaction()
+        tx.vin.append(CTxIn(COutPoint(self.utxo[0].sha256, self.utxo[0].n), b""))
+
+        # For each script, generate a pair of P2WSH and P2SH-P2WSH output.
+        outputvalue = (self.utxo[0].nValue - 1000) // (len(scripts) * 2)
+        for i in scripts:
+            p2wsh = CScript([OP_0, sha256(i)])
+            p2sh = hash160(p2wsh)
+            p2wsh_scripts.append(p2wsh)
+            tx.vout.append(CTxOut(outputvalue, p2wsh))
+            tx.vout.append(CTxOut(outputvalue, CScript([OP_HASH160, p2sh, OP_EQUAL])))
+        tx.rehash()
+        txid = tx.sha256
+        self.test_node.test_transaction_acceptance(tx, with_witness=False, accepted=True)
+
+        self.nodes[0].generate(1)
+        sync_blocks(self.nodes)
+
+        # Creating transactions for tests
+        p2wsh_txs = []
+        p2sh_txs = []
+        for i in range(len(scripts)):
+            p2wsh_tx = CTransaction()
+            p2wsh_tx.vin.append(CTxIn(COutPoint(txid,i*2)))
+            p2wsh_tx.vout.append(CTxOut(outputvalue - 5000, CScript([OP_0, hash160(hex_str_to_bytes(""))])))
+            p2wsh_tx.wit.vtxinwit.append(CTxInWitness())
+            p2wsh_tx.rehash()
+            p2wsh_txs.append(p2wsh_tx)
+            p2sh_tx = CTransaction()
+            p2sh_tx.vin.append(CTxIn(COutPoint(txid,i*2+1), CScript([p2wsh_scripts[i]])))
+            p2sh_tx.vout.append(CTxOut(outputvalue - 5000, CScript([OP_0, hash160(hex_str_to_bytes(""))])))
+            p2sh_tx.wit.vtxinwit.append(CTxInWitness())
+            p2sh_tx.rehash()
+            p2sh_txs.append(p2sh_tx)
+
+        # Testing native P2WSH
+        # Witness stack size, excluding witnessScript, over 100 is non-standard
+        p2wsh_txs[0].wit.vtxinwit[0].scriptWitness.stack = [pad] * 101 + [scripts[0]]
+        self.std_node.test_transaction_acceptance(p2wsh_txs[0], True, False, b'bad-witness-nonstandard')
+        # Non-standard nodes should accept
+        self.test_node.test_transaction_acceptance(p2wsh_txs[0], True, True)
+
+        # Stack element size over 80 bytes is non-standard
+        p2wsh_txs[1].wit.vtxinwit[0].scriptWitness.stack = [pad * 81] * 100 + [scripts[1]]
+        # It can't be used to blind a node to the transaction
+        self.std_node.announce_tx_and_wait_for_getdata(p2wsh_txs[1])
+        self.std_node.test_transaction_acceptance(p2wsh_txs[1], True, False, b'bad-witness-nonstandard')
+        self.std_node.announce_tx_and_wait_for_getdata(p2wsh_txs[1])
+        self.std_node.test_transaction_acceptance(p2wsh_txs[1], True, False, b'bad-witness-nonstandard')
+        # Non-standard nodes should accept
+        self.test_node.test_transaction_acceptance(p2wsh_txs[1], True, True)
+        # Standard nodes should accept if element size is not over 80 bytes
+        p2wsh_txs[1].wit.vtxinwit[0].scriptWitness.stack = [pad * 80] * 100 + [scripts[1]]
+        self.std_node.announce_tx_and_wait_for_getdata(p2wsh_txs[1])
+        self.std_node.test_transaction_acceptance(p2wsh_txs[1], True, True)
+
+        # witnessScript size at 3600 bytes is standard
+        p2wsh_txs[2].wit.vtxinwit[0].scriptWitness.stack = [pad, pad, scripts[2]]
+        self.test_node.test_transaction_acceptance(p2wsh_txs[2], True, True)
+        self.std_node.test_transaction_acceptance(p2wsh_txs[2], True, True)
+
+        # witnessScript size at 3601 bytes is non-standard
+        p2wsh_txs[3].wit.vtxinwit[0].scriptWitness.stack = [pad, pad, pad, scripts[3]]
+        self.std_node.test_transaction_acceptance(p2wsh_txs[3], True, False, b'bad-witness-nonstandard')
+        # Non-standard nodes should accept
+        self.test_node.test_transaction_acceptance(p2wsh_txs[3], True, True)
+
+        # Repeating the same tests with P2SH-P2WSH
+        p2sh_txs[0].wit.vtxinwit[0].scriptWitness.stack = [pad] * 101 + [scripts[0]]
+        self.std_node.test_transaction_acceptance(p2sh_txs[0], True, False, b'bad-witness-nonstandard')
+        self.test_node.test_transaction_acceptance(p2sh_txs[0], True, True)
+        p2sh_txs[1].wit.vtxinwit[0].scriptWitness.stack = [pad * 81] * 100 + [scripts[1]]
+        self.std_node.announce_tx_and_wait_for_getdata(p2sh_txs[1])
+        self.std_node.test_transaction_acceptance(p2sh_txs[1], True, False, b'bad-witness-nonstandard')
+        self.std_node.announce_tx_and_wait_for_getdata(p2sh_txs[1])
+        self.std_node.test_transaction_acceptance(p2sh_txs[1], True, False, b'bad-witness-nonstandard')
+        self.test_node.test_transaction_acceptance(p2sh_txs[1], True, True)
+        p2sh_txs[1].wit.vtxinwit[0].scriptWitness.stack = [pad * 80] * 100 + [scripts[1]]
+        self.std_node.announce_tx_and_wait_for_getdata(p2sh_txs[1])
+        self.std_node.test_transaction_acceptance(p2sh_txs[1], True, True)
+        p2sh_txs[2].wit.vtxinwit[0].scriptWitness.stack = [pad, pad, scripts[2]]
+        self.test_node.test_transaction_acceptance(p2sh_txs[2], True, True)
+        self.std_node.test_transaction_acceptance(p2sh_txs[2], True, True)
+        p2sh_txs[3].wit.vtxinwit[0].scriptWitness.stack = [pad, pad, pad, scripts[3]]
+        self.std_node.test_transaction_acceptance(p2sh_txs[3], True, False, b'bad-witness-nonstandard')
+        self.test_node.test_transaction_acceptance(p2sh_txs[3], True, True)
+
+        self.nodes[0].generate(1)  # Mine and clean up the mempool of non-standard node
+        # Valid but non-standard transactions in a block should be accepted by standard node
+        sync_blocks(self.nodes)
+        assert_equal(len(self.nodes[0].getrawmempool()), 0)
+        assert_equal(len(self.nodes[1].getrawmempool()), 0)
+
+        self.utxo.pop(0)
+
+
     def run_test(self):
         # Setup the p2p connections and start up the network thread.
         self.test_node = TestNode() # sets NODE_WITNESS|NODE_NETWORK
@@ -1778,6 +1888,7 @@ def run_test(self):
         self.test_segwit_versions()
         self.test_premature_coinbase_witness_spend()
         self.test_signature_version_1()
+        self.test_non_standard_witness()
         sync_blocks(self.nodes)
         if self.test_upgrade:
             self.test_upgrade_after_activation(self.nodes[2], 2)
diff --git a/src/main.cpp b/src/main.cpp
index c92a38be98f23..020378b5dc4ea 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,5 +1,5 @@
 // Copyright (c) 2009-2010 Satoshi Nakamoto
-// Copyright (c) 2009-2015 The Bitcoin Core developers
+// Copyright (c) 2009-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
@@ -1273,6 +1273,10 @@ bool AcceptToMemoryPoolWorker(CTxMemPool& pool, CValidationState& state, const C
         if (fRequireStandard && !AreInputsStandard(tx, view))
             return state.Invalid(false, REJECT_NONSTANDARD, "bad-txns-nonstandard-inputs");
 
+        // Check for non-standard witness in P2WSH
+        if (!tx.wit.IsNull() && fRequireStandard && !IsWitnessStandard(tx, view))
+            return state.DoS(0, false, REJECT_NONSTANDARD, "bad-witness-nonstandard", true);
+
         int64_t nSigOpsCost = GetTransactionSigOpCost(tx, view, STANDARD_SCRIPT_VERIFY_FLAGS);
 
         CAmount nValueOut = tx.GetValueOut();
diff --git a/src/policy/policy.cpp b/src/policy/policy.cpp
index 48080abc778d5..ae42b2bd74fd8 100644
--- a/src/policy/policy.cpp
+++ b/src/policy/policy.cpp
@@ -1,5 +1,5 @@
 // Copyright (c) 2009-2010 Satoshi Nakamoto
-// Copyright (c) 2009-2015 The Bitcoin developers
+// Copyright (c) 2009-2016 The Bitcoin developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
@@ -154,6 +154,58 @@ bool AreInputsStandard(const CTransaction& tx, const CCoinsViewCache& mapInputs)
     return true;
 }
 
+bool IsWitnessStandard(const CTransaction& tx, const CCoinsViewCache& mapInputs)
+{
+    if (tx.IsCoinBase())
+        return true; // Coinbases are skipped
+
+    for (unsigned int i = 0; i < tx.vin.size(); i++)
+    {
+        // We don't care if witness for this input is empty, since it must not be bloated.
+        // If the script is invalid without witness, it would be caught sooner or later during validation.
+        if (tx.wit.vtxinwit[i].IsNull())
+            continue;
+
+        const CTxOut &prev = mapInputs.GetOutputFor(tx.vin[i]);
+
+        // get the scriptPubKey corresponding to this input:
+        CScript prevScript = prev.scriptPubKey;
+
+        if (prevScript.IsPayToScriptHash()) {
+            std::vector <std::vector<unsigned char> > stack;
+            // If the scriptPubKey is P2SH, we try to extract the redeemScript casually by converting the scriptSig
+            // into a stack. We do not check IsPushOnly nor compare the hash as these will be done later anyway.
+            // If the check fails at this stage, we know that this txid must be a bad one.
+            if (!EvalScript(stack, tx.vin[i].scriptSig, SCRIPT_VERIFY_NONE, BaseSignatureChecker(), SIGVERSION_BASE))
+                return false;
+            if (stack.empty())
+                return false;
+            prevScript = CScript(stack.back().begin(), stack.back().end());
+        }
+
+        int witnessversion = 0;
+        std::vector<unsigned char> witnessprogram;
+
+        // Non-witness program must not be associated with any witness
+        if (!prevScript.IsWitnessProgram(witnessversion, witnessprogram))
+            return false;
+
+        // Check P2WSH standard limits
+        if (witnessversion == 0 && witnessprogram.size() == 32) {
+            if (tx.wit.vtxinwit[i].scriptWitness.stack.back().size() > MAX_STANDARD_P2WSH_SCRIPT_SIZE)
+                return false;
+            size_t sizeWitnessStack = tx.wit.vtxinwit[i].scriptWitness.stack.size() - 1;
+            if (sizeWitnessStack > MAX_STANDARD_P2WSH_STACK_ITEMS)
+                return false;
+            for (unsigned int j = 0; j < sizeWitnessStack; j++) {
+                if (tx.wit.vtxinwit[i].scriptWitness.stack[j].size() > MAX_STANDARD_P2WSH_STACK_ITEM_SIZE)
+                    return false;
+            }
+        }
+    }
+    return true;
+}
+
 unsigned int nBytesPerSigOp = DEFAULT_BYTES_PER_SIGOP;
 
 int64_t GetVirtualTransactionSize(int64_t nWeight, int64_t nSigOpCost)
diff --git a/src/policy/policy.h b/src/policy/policy.h
index 9d6ff1233b6aa..fb528d74868c5 100644
--- a/src/policy/policy.h
+++ b/src/policy/policy.h
@@ -30,6 +30,12 @@ static const unsigned int MAX_STANDARD_TX_SIGOPS_COST = MAX_BLOCK_SIGOPS_COST/5;
 static const unsigned int DEFAULT_MAX_MEMPOOL_SIZE = 300;
 /** Default for -bytespersigop */
 static const unsigned int DEFAULT_BYTES_PER_SIGOP = 20;
+/** The maximum number of witness stack items in a standard P2WSH script */
+static const unsigned int MAX_STANDARD_P2WSH_STACK_ITEMS = 100;
+/** The maximum size of each witness stack item in a standard P2WSH script */
+static const unsigned int MAX_STANDARD_P2WSH_STACK_ITEM_SIZE = 80;
+/** The maximum size of a standard witnessScript */
+static const unsigned int MAX_STANDARD_P2WSH_SCRIPT_SIZE = 3600;
 /**
  * Standard script verification flags that standard transactions will comply
  * with. However scripts violating these flags may still be present in valid
@@ -69,6 +75,12 @@ bool IsStandardTx(const CTransaction& tx, std::string& reason, const bool witnes
      * @return True if all inputs (scriptSigs) use only standard transaction forms
      */
 bool AreInputsStandard(const CTransaction& tx, const CCoinsViewCache& mapInputs);
+    /**
+     * Check if the transaction is over standard P2WSH resources limit:
+     * 3600bytes witnessScript size, 80bytes per witness stack element, 100 witness stack elements
+     * These limits are adequate for multi-signature up to n-of-100 using OP_CHECKSIG, OP_ADD, and OP_EQUAL,
+     */
+bool IsWitnessStandard(const CTransaction& tx, const CCoinsViewCache& mapInputs);
 
 extern unsigned int nBytesPerSigOp;
 

From 4c0c25a604cec39675187507df423cff5d707ab5 Mon Sep 17 00:00:00 2001
From: Johnson Lau <jl2012@xbt.hk>
Date: Sun, 2 Oct 2016 01:19:33 +0800
Subject: [PATCH 1022/1802] Require compressed keys in segwit as policy and
 disable signing with uncompressed keys for segwit scripts

---
 src/policy/policy.h            |  5 +++--
 src/script/interpreter.cpp     | 28 ++++++++++++++++++++------
 src/script/interpreter.h       |  6 +++++-
 src/script/script_error.cpp    |  2 ++
 src/script/script_error.h      |  1 +
 src/script/sign.cpp            |  6 +++++-
 src/test/script_tests.cpp      |  1 +
 src/test/transaction_tests.cpp | 36 ++++++++++------------------------
 8 files changed, 49 insertions(+), 36 deletions(-)

diff --git a/src/policy/policy.h b/src/policy/policy.h
index fb528d74868c5..814e6c0b6ff94 100644
--- a/src/policy/policy.h
+++ b/src/policy/policy.h
@@ -1,5 +1,5 @@
 // Copyright (c) 2009-2010 Satoshi Nakamoto
-// Copyright (c) 2009-2015 The Bitcoin developers
+// Copyright (c) 2009-2016 The Bitcoin developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
@@ -54,7 +54,8 @@ static const unsigned int STANDARD_SCRIPT_VERIFY_FLAGS = MANDATORY_SCRIPT_VERIFY
                                                          SCRIPT_VERIFY_CHECKSEQUENCEVERIFY |
                                                          SCRIPT_VERIFY_LOW_S |
                                                          SCRIPT_VERIFY_WITNESS |
-                                                         SCRIPT_VERIFY_DISCOURAGE_UPGRADABLE_WITNESS_PROGRAM;
+                                                         SCRIPT_VERIFY_DISCOURAGE_UPGRADABLE_WITNESS_PROGRAM |
+                                                         SCRIPT_VERIFY_WITNESS_PUBKEYTYPE;
 
 /** For convenience, standard but not mandatory verify flags. */
 static const unsigned int STANDARD_NOT_MANDATORY_VERIFY_FLAGS = STANDARD_SCRIPT_VERIFY_FLAGS & ~MANDATORY_SCRIPT_VERIFY_FLAGS;
diff --git a/src/script/interpreter.cpp b/src/script/interpreter.cpp
index 41756ea71196d..836cf9ee352a0 100644
--- a/src/script/interpreter.cpp
+++ b/src/script/interpreter.cpp
@@ -79,8 +79,20 @@ bool static IsCompressedOrUncompressedPubKey(const valtype &vchPubKey) {
             return false;
         }
     } else {
-          //  Non-canonical public key: neither compressed nor uncompressed
-          return false;
+        //  Non-canonical public key: neither compressed nor uncompressed
+        return false;
+    }
+    return true;
+}
+
+bool static IsCompressedPubKey(const valtype &vchPubKey) {
+    if (vchPubKey.size() != 33) {
+        //  Non-canonical public key: invalid length for compressed key
+        return false;
+    }
+    if (vchPubKey[0] != 0x02 && vchPubKey[0] != 0x03) {
+        //  Non-canonical public key: invalid prefix for compressed key
+        return false;
     }
     return true;
 }
@@ -199,10 +211,14 @@ bool CheckSignatureEncoding(const vector<unsigned char> &vchSig, unsigned int fl
     return true;
 }
 
-bool static CheckPubKeyEncoding(const valtype &vchSig, unsigned int flags, ScriptError* serror) {
-    if ((flags & SCRIPT_VERIFY_STRICTENC) != 0 && !IsCompressedOrUncompressedPubKey(vchSig)) {
+bool static CheckPubKeyEncoding(const valtype &vchPubKey, unsigned int flags, const SigVersion &sigversion, ScriptError* serror) {
+    if ((flags & SCRIPT_VERIFY_STRICTENC) != 0 && !IsCompressedOrUncompressedPubKey(vchPubKey)) {
         return set_error(serror, SCRIPT_ERR_PUBKEYTYPE);
     }
+    // Only compressed keys are accepted in segwit
+    if ((flags & SCRIPT_VERIFY_WITNESS_PUBKEYTYPE) != 0 && sigversion == SIGVERSION_WITNESS_V0 && !IsCompressedPubKey(vchPubKey)) {
+        return set_error(serror, SCRIPT_ERR_WITNESS_PUBKEYTYPE);
+    }
     return true;
 }
 
@@ -879,7 +895,7 @@ bool EvalScript(vector<vector<unsigned char> >& stack, const CScript& script, un
                         scriptCode.FindAndDelete(CScript(vchSig));
                     }
 
-                    if (!CheckSignatureEncoding(vchSig, flags, serror) || !CheckPubKeyEncoding(vchPubKey, flags, serror)) {
+                    if (!CheckSignatureEncoding(vchSig, flags, serror) || !CheckPubKeyEncoding(vchPubKey, flags, sigversion, serror)) {
                         //serror is set
                         return false;
                     }
@@ -953,7 +969,7 @@ bool EvalScript(vector<vector<unsigned char> >& stack, const CScript& script, un
                         // Note how this makes the exact order of pubkey/signature evaluation
                         // distinguishable by CHECKMULTISIG NOT if the STRICTENC flag is set.
                         // See the script_(in)valid tests for details.
-                        if (!CheckSignatureEncoding(vchSig, flags, serror) || !CheckPubKeyEncoding(vchPubKey, flags, serror)) {
+                        if (!CheckSignatureEncoding(vchSig, flags, serror) || !CheckPubKeyEncoding(vchPubKey, flags, sigversion, serror)) {
                             // serror is set
                             return false;
                         }
diff --git a/src/script/interpreter.h b/src/script/interpreter.h
index 0adc9482ffec6..79894c5300348 100644
--- a/src/script/interpreter.h
+++ b/src/script/interpreter.h
@@ -1,5 +1,5 @@
 // Copyright (c) 2009-2010 Satoshi Nakamoto
-// Copyright (c) 2009-2015 The Bitcoin Core developers
+// Copyright (c) 2009-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
@@ -102,6 +102,10 @@ enum
     // Signature(s) must be empty vector if an CHECK(MULTI)SIG operation failed
     //
     SCRIPT_VERIFY_NULLFAIL = (1U << 14),
+
+    // Public keys in segregated witness scripts must be compressed
+    //
+    SCRIPT_VERIFY_WITNESS_PUBKEYTYPE = (1U << 15),
 };
 
 bool CheckSignatureEncoding(const std::vector<unsigned char> &vchSig, unsigned int flags, ScriptError* serror);
diff --git a/src/script/script_error.cpp b/src/script/script_error.cpp
index e27b715c2cfea..2c5359fe8afdb 100644
--- a/src/script/script_error.cpp
+++ b/src/script/script_error.cpp
@@ -85,6 +85,8 @@ const char* ScriptErrorString(const ScriptError serror)
             return "Witness requires only-redeemscript scriptSig";
         case SCRIPT_ERR_WITNESS_UNEXPECTED:
             return "Witness provided for non-witness script";
+        case SCRIPT_ERR_WITNESS_PUBKEYTYPE:
+            return "Using non-compressed keys in segwit";
         case SCRIPT_ERR_UNKNOWN_ERROR:
         case SCRIPT_ERR_ERROR_COUNT:
         default: break;
diff --git a/src/script/script_error.h b/src/script/script_error.h
index bccfdb99e23bb..430836991b2cf 100644
--- a/src/script/script_error.h
+++ b/src/script/script_error.h
@@ -62,6 +62,7 @@ typedef enum ScriptError_t
     SCRIPT_ERR_WITNESS_MALLEATED,
     SCRIPT_ERR_WITNESS_MALLEATED_P2SH,
     SCRIPT_ERR_WITNESS_UNEXPECTED,
+    SCRIPT_ERR_WITNESS_PUBKEYTYPE,
 
     SCRIPT_ERR_ERROR_COUNT
 } ScriptError;
diff --git a/src/script/sign.cpp b/src/script/sign.cpp
index 87f38d9c72565..f552ad5bbad25 100644
--- a/src/script/sign.cpp
+++ b/src/script/sign.cpp
@@ -1,5 +1,5 @@
 // Copyright (c) 2009-2010 Satoshi Nakamoto
-// Copyright (c) 2009-2015 The Bitcoin Core developers
+// Copyright (c) 2009-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
@@ -26,6 +26,10 @@ bool TransactionSignatureCreator::CreateSig(std::vector<unsigned char>& vchSig,
     if (!keystore->GetKey(address, key))
         return false;
 
+    // Signing with uncompressed keys is disabled in witness scripts
+    if (sigversion == SIGVERSION_WITNESS_V0 && !key.IsCompressed())
+        return false;
+
     uint256 hash = SignatureHash(scriptCode, *txTo, nIn, nHashType, amount, sigversion);
     if (!key.Sign(hash, vchSig))
         return false;
diff --git a/src/test/script_tests.cpp b/src/test/script_tests.cpp
index 7971b5122ffc9..7da95488afc43 100644
--- a/src/test/script_tests.cpp
+++ b/src/test/script_tests.cpp
@@ -99,6 +99,7 @@ static ScriptErrorDesc script_errors[]={
     {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"},
 };
 
 const char *FormatScriptError(ScriptError_t err)
diff --git a/src/test/transaction_tests.cpp b/src/test/transaction_tests.cpp
index 6163d2f630604..34d9547f3dc60 100644
--- a/src/test/transaction_tests.cpp
+++ b/src/test/transaction_tests.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2011-2015 The Bitcoin Core developers
+// Copyright (c) 2011-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
@@ -55,7 +55,8 @@ static std::map<string, unsigned int> mapFlagNames = boost::assign::map_list_of
     (string("CHECKLOCKTIMEVERIFY"), (unsigned int)SCRIPT_VERIFY_CHECKLOCKTIMEVERIFY)
     (string("CHECKSEQUENCEVERIFY"), (unsigned int)SCRIPT_VERIFY_CHECKSEQUENCEVERIFY)
     (string("WITNESS"), (unsigned int)SCRIPT_VERIFY_WITNESS)
-    (string("DISCOURAGE_UPGRADABLE_WITNESS_PROGRAM"), (unsigned int)SCRIPT_VERIFY_DISCOURAGE_UPGRADABLE_WITNESS_PROGRAM);
+    (string("DISCOURAGE_UPGRADABLE_WITNESS_PROGRAM"), (unsigned int)SCRIPT_VERIFY_DISCOURAGE_UPGRADABLE_WITNESS_PROGRAM)
+    (string("WITNESS_PUBKEYTYPE"), (unsigned int)SCRIPT_VERIFY_WITNESS_PUBKEYTYPE);
 
 unsigned int ParseScriptFlags(string strFlags)
 {
@@ -429,7 +430,7 @@ BOOST_AUTO_TEST_CASE(test_big_witness_transaction) {
     mtx.nVersion = 1;
 
     CKey key;
-    key.MakeNewKey(false);
+    key.MakeNewKey(true); // Need to use compressed keys in segwit or the signing will fail
     CBasicKeyStore keystore;
     keystore.AddKeyPubKey(key, key.GetPubKey());
     CKeyID hash = key.GetPubKey().GetID();
@@ -625,30 +626,13 @@ BOOST_AUTO_TEST_CASE(test_witness)
     CheckWithFlag(output1, input2, SCRIPT_VERIFY_WITNESS | SCRIPT_VERIFY_P2SH, false);
     CheckWithFlag(output1, input2, STANDARD_SCRIPT_VERIFY_FLAGS, false);
 
-    // Witness pay-to-uncompressed-pubkey (v1).
-    CreateCreditAndSpend(keystore, GetScriptForWitness(scriptPubkey1L), output1, input1);
-    CreateCreditAndSpend(keystore, GetScriptForWitness(scriptPubkey2L), output2, input2);
-    CheckWithFlag(output1, input1, 0, true);
-    CheckWithFlag(output1, input1, SCRIPT_VERIFY_P2SH, true);
-    CheckWithFlag(output1, input1, SCRIPT_VERIFY_WITNESS | SCRIPT_VERIFY_P2SH, true);
-    CheckWithFlag(output1, input1, STANDARD_SCRIPT_VERIFY_FLAGS, true);
-    CheckWithFlag(output1, input2, 0, true);
-    CheckWithFlag(output1, input2, SCRIPT_VERIFY_P2SH, true);
-    CheckWithFlag(output1, input2, SCRIPT_VERIFY_WITNESS | SCRIPT_VERIFY_P2SH, false);
-    CheckWithFlag(output1, input2, STANDARD_SCRIPT_VERIFY_FLAGS, false);
+    // Signing disabled for witness pay-to-uncompressed-pubkey (v1).
+    CreateCreditAndSpend(keystore, GetScriptForWitness(scriptPubkey1L), output1, input1, false);
+    CreateCreditAndSpend(keystore, GetScriptForWitness(scriptPubkey2L), output2, input2, false);
 
-    // P2SH witness pay-to-uncompressed-pubkey (v1).
-    CreateCreditAndSpend(keystore, GetScriptForDestination(CScriptID(GetScriptForWitness(scriptPubkey1L))), output1, input1);
-    CreateCreditAndSpend(keystore, GetScriptForDestination(CScriptID(GetScriptForWitness(scriptPubkey2L))), output2, input2);
-    ReplaceRedeemScript(input2.vin[0].scriptSig, GetScriptForWitness(scriptPubkey1L));
-    CheckWithFlag(output1, input1, 0, true);
-    CheckWithFlag(output1, input1, SCRIPT_VERIFY_P2SH, true);
-    CheckWithFlag(output1, input1, SCRIPT_VERIFY_WITNESS | SCRIPT_VERIFY_P2SH, true);
-    CheckWithFlag(output1, input1, STANDARD_SCRIPT_VERIFY_FLAGS, true);
-    CheckWithFlag(output1, input2, 0, true);
-    CheckWithFlag(output1, input2, SCRIPT_VERIFY_P2SH, true);
-    CheckWithFlag(output1, input2, SCRIPT_VERIFY_WITNESS | SCRIPT_VERIFY_P2SH, false);
-    CheckWithFlag(output1, input2, STANDARD_SCRIPT_VERIFY_FLAGS, false);
+    // Signing disabled for P2SH witness pay-to-uncompressed-pubkey (v1).
+    CreateCreditAndSpend(keystore, GetScriptForDestination(CScriptID(GetScriptForWitness(scriptPubkey1L))), output1, input1, false);
+    CreateCreditAndSpend(keystore, GetScriptForDestination(CScriptID(GetScriptForWitness(scriptPubkey2L))), output2, input2, false);
 
     // Normal 2-of-2 multisig
     CreateCreditAndSpend(keystore, scriptMulti, output1, input1, false);

From 9f0397aff7afa2afa9328daea0a2053122e79d44 Mon Sep 17 00:00:00 2001
From: Johnson Lau <jl2012@xbt.hk>
Date: Wed, 24 Aug 2016 14:44:17 +0800
Subject: [PATCH 1023/1802] Make test framework produce lowS signatures

---
 qa/rpc-tests/test_framework/key.py | 25 +++++++++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

diff --git a/qa/rpc-tests/test_framework/key.py b/qa/rpc-tests/test_framework/key.py
index ba3038fe044f4..c63a15c1e0c92 100644
--- a/qa/rpc-tests/test_framework/key.py
+++ b/qa/rpc-tests/test_framework/key.py
@@ -75,6 +75,9 @@
 # this specifies the curve used with ECDSA.
 NID_secp256k1 = 714 # from openssl/obj_mac.h
 
+SECP256K1_ORDER = 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEBAAEDCE6AF48A03BBFD25E8CD0364141
+SECP256K1_ORDER_HALF = SECP256K1_ORDER // 2
+
 # Thx to Sam Devlin for the ctypes magic 64-bit fix.
 def _check_result(val, func, args):
     if val == 0:
@@ -147,7 +150,7 @@ def get_ecdh_key(self, other_pubkey, kdf=lambda k: hashlib.sha256(k).digest()):
         r = self.get_raw_ecdh_key(other_pubkey)
         return kdf(r)
 
-    def sign(self, hash):
+    def sign(self, hash, low_s = True):
         # FIXME: need unit tests for below cases
         if not isinstance(hash, bytes):
             raise TypeError('Hash must be bytes instance; got %r' % hash.__class__)
@@ -159,7 +162,25 @@ def sign(self, hash):
         mb_sig = ctypes.create_string_buffer(sig_size0.value)
         result = ssl.ECDSA_sign(0, hash, len(hash), mb_sig, ctypes.byref(sig_size0), self.k)
         assert 1 == result
-        return mb_sig.raw[:sig_size0.value]
+        assert mb_sig.raw[0] == 0x30
+        assert mb_sig.raw[1] == sig_size0.value - 2
+        total_size = mb_sig.raw[1]
+        assert mb_sig.raw[2] == 2
+        r_size = mb_sig.raw[3]
+        assert mb_sig.raw[4 + r_size] == 2
+        s_size = mb_sig.raw[5 + r_size]
+        s_value = int.from_bytes(mb_sig.raw[6+r_size:6+r_size+s_size], byteorder='big')
+        if (not low_s) or s_value <= SECP256K1_ORDER_HALF:
+            return mb_sig.raw[:sig_size0.value]
+        else:
+            low_s_value = SECP256K1_ORDER - s_value
+            low_s_bytes = (low_s_value).to_bytes(33, byteorder='big')
+            while len(low_s_bytes) > 1 and low_s_bytes[0] == 0 and low_s_bytes[1] < 0x80:
+                low_s_bytes = low_s_bytes[1:]
+            new_s_size = len(low_s_bytes)
+            new_total_size_byte = (total_size + new_s_size - s_size).to_bytes(1,byteorder='big')
+            new_s_size_byte = (new_s_size).to_bytes(1,byteorder='big')
+            return b'\x30' + new_total_size_byte + mb_sig.raw[2:5+r_size] + new_s_size_byte + low_s_bytes
 
     def verify(self, hash, sig):
         """Verify a DER signature"""

From b811124202152424109b8e95ebe7ac25ff2e83c0 Mon Sep 17 00:00:00 2001
From: Suhas Daftuar <sdaftuar@chaincode.com>
Date: Thu, 6 Oct 2016 13:15:33 -0400
Subject: [PATCH 1024/1802] [qa] Add tests for uncompressed pubkeys in segwit

---
 qa/rpc-tests/p2p-segwit.py | 125 ++++++++++++++++++++++++++++++++++---
 1 file changed, 117 insertions(+), 8 deletions(-)

diff --git a/qa/rpc-tests/p2p-segwit.py b/qa/rpc-tests/p2p-segwit.py
index 16d1e8680273f..fa505d60c9b66 100755
--- a/qa/rpc-tests/p2p-segwit.py
+++ b/qa/rpc-tests/p2p-segwit.py
@@ -166,6 +166,17 @@ def __init__(self, sha256, n, nValue):
         self.n = n
         self.nValue = nValue
 
+# Helper for getting the script associated with a P2PKH
+def GetP2PKHScript(pubkeyhash):
+    return CScript([CScriptOp(OP_DUP), CScriptOp(OP_HASH160), pubkeyhash, CScriptOp(OP_EQUALVERIFY), CScriptOp(OP_CHECKSIG)])
+
+# Add signature for a P2PK witness program.
+def sign_P2PK_witness_input(script, txTo, inIdx, hashtype, value, key):
+    tx_hash = SegwitVersion1SignatureHash(script, txTo, inIdx, hashtype, value)
+    signature = key.sign(tx_hash) + chr(hashtype).encode('latin-1')
+    txTo.wit.vtxinwit[inIdx].scriptWitness.stack = [signature, script]
+    txTo.rehash()
+
 
 class SegWitTest(BitcoinTestFramework):
 
@@ -1323,13 +1334,6 @@ def test_signature_version_1(self):
         sync_blocks(self.nodes)
         self.utxo.pop(0)
 
-        # Add signature for a P2PK witness program.
-        def sign_P2PK_witness_input(script, txTo, inIdx, hashtype, value, key):
-            tx_hash = SegwitVersion1SignatureHash(script, txTo, inIdx, hashtype, value)
-            signature = key.sign(tx_hash) + chr(hashtype).encode('latin-1')
-            txTo.wit.vtxinwit[inIdx].scriptWitness.stack = [signature, script]
-            txTo.rehash()
-
         # Test each hashtype
         prev_utxo = UTXO(tx.sha256, 0, tx.vout[0].nValue)
         for sigflag in [ 0, SIGHASH_ANYONECANPAY ]:
@@ -1443,7 +1447,7 @@ def sign_P2PK_witness_input(script, txTo, inIdx, hashtype, value, key):
         tx2.vin.append(CTxIn(COutPoint(tx.sha256, 0), b""))
         tx2.vout.append(CTxOut(tx.vout[0].nValue, CScript([OP_TRUE])))
 
-        script = CScript([CScriptOp(OP_DUP), CScriptOp(OP_HASH160), pubkeyhash, CScriptOp(OP_EQUALVERIFY), CScriptOp(OP_CHECKSIG)])
+        script = GetP2PKHScript(pubkeyhash)
         sig_hash = SegwitVersion1SignatureHash(script, tx2, 0, SIGHASH_ALL, tx.vout[0].nValue)
         signature = key.sign(sig_hash) + b'\x01' # 0x1 is SIGHASH_ALL
 
@@ -1706,6 +1710,110 @@ def test_getblocktemplate_before_lockin(self):
         assert(block_version & (1 << VB_WITNESS_BIT) != 0)
         self.nodes[0].setmocktime(0) # undo mocktime
 
+    # Uncompressed pubkeys are no longer supported in default relay policy,
+    # but (for now) are still valid in blocks.
+    def test_uncompressed_pubkey(self):
+        print("\tTesting uncompressed pubkeys")
+        # Segwit transactions using uncompressed pubkeys are not accepted
+        # under default policy, but should still pass consensus.
+        key = CECKey()
+        key.set_secretbytes(b"9")
+        key.set_compressed(False)
+        pubkey = CPubKey(key.get_pubkey())
+        assert_equal(len(pubkey), 65) # This should be an uncompressed pubkey
+
+        assert(len(self.utxo) > 0)
+        utxo = self.utxo.pop(0)
+
+        # Test 1: P2WPKH
+        # First create a P2WPKH output that uses an uncompressed pubkey
+        pubkeyhash = hash160(pubkey)
+        scriptPKH = CScript([OP_0, pubkeyhash])
+        tx = CTransaction()
+        tx.vin.append(CTxIn(COutPoint(utxo.sha256, utxo.n), b""))
+        tx.vout.append(CTxOut(utxo.nValue-1000, scriptPKH))
+        tx.rehash()
+
+        # Confirm it in a block.
+        block = self.build_next_block()
+        self.update_witness_block_with_transactions(block, [tx])
+        self.test_node.test_witness_block(block, accepted=True)
+
+        # Now try to spend it. Send it to a P2WSH output, which we'll
+        # use in the next test.
+        witness_program = CScript([pubkey, CScriptOp(OP_CHECKSIG)])
+        witness_hash = sha256(witness_program)
+        scriptWSH = CScript([OP_0, witness_hash])
+
+        tx2 = CTransaction()
+        tx2.vin.append(CTxIn(COutPoint(tx.sha256, 0), b""))
+        tx2.vout.append(CTxOut(tx.vout[0].nValue-1000, scriptWSH))
+        script = GetP2PKHScript(pubkeyhash)
+        sig_hash = SegwitVersion1SignatureHash(script, tx2, 0, SIGHASH_ALL, tx.vout[0].nValue)
+        signature = key.sign(sig_hash) + b'\x01' # 0x1 is SIGHASH_ALL
+        tx2.wit.vtxinwit.append(CTxInWitness())
+        tx2.wit.vtxinwit[0].scriptWitness.stack = [ signature, pubkey ]
+        tx2.rehash()
+
+        # Should fail policy test.
+        self.test_node.test_transaction_acceptance(tx2, True, False, b'non-mandatory-script-verify-flag (Using non-compressed keys in segwit)')
+        # But passes consensus.
+        block = self.build_next_block()
+        self.update_witness_block_with_transactions(block, [tx2])
+        self.test_node.test_witness_block(block, accepted=True)
+
+        # Test 2: P2WSH
+        # Try to spend the P2WSH output created in last test.
+        # Send it to a P2SH(P2WSH) output, which we'll use in the next test.
+        p2sh_witness_hash = hash160(scriptWSH)
+        scriptP2SH = CScript([OP_HASH160, p2sh_witness_hash, OP_EQUAL])
+        scriptSig = CScript([scriptWSH])
+
+        tx3 = CTransaction()
+        tx3.vin.append(CTxIn(COutPoint(tx2.sha256, 0), b""))
+        tx3.vout.append(CTxOut(tx2.vout[0].nValue-1000, scriptP2SH))
+        tx3.wit.vtxinwit.append(CTxInWitness())
+        sign_P2PK_witness_input(witness_program, tx3, 0, SIGHASH_ALL, tx2.vout[0].nValue, key)
+
+        # Should fail policy test.
+        self.test_node.test_transaction_acceptance(tx3, True, False, b'non-mandatory-script-verify-flag (Using non-compressed keys in segwit)')
+        # But passes consensus.
+        block = self.build_next_block()
+        self.update_witness_block_with_transactions(block, [tx3])
+        self.test_node.test_witness_block(block, accepted=True)
+
+        # Test 3: P2SH(P2WSH)
+        # Try to spend the P2SH output created in the last test.
+        # Send it to a P2PKH output, which we'll use in the next test.
+        scriptPubKey = GetP2PKHScript(pubkeyhash)
+        tx4 = CTransaction()
+        tx4.vin.append(CTxIn(COutPoint(tx3.sha256, 0), scriptSig))
+        tx4.vout.append(CTxOut(tx3.vout[0].nValue-1000, scriptPubKey))
+        tx4.wit.vtxinwit.append(CTxInWitness())
+        sign_P2PK_witness_input(witness_program, tx4, 0, SIGHASH_ALL, tx3.vout[0].nValue, key)
+
+        # Should fail policy test.
+        self.test_node.test_transaction_acceptance(tx4, True, False, b'non-mandatory-script-verify-flag (Using non-compressed keys in segwit)')
+        block = self.build_next_block()
+        self.update_witness_block_with_transactions(block, [tx4])
+        self.test_node.test_witness_block(block, accepted=True)
+
+        # Test 4: Uncompressed pubkeys should still be valid in non-segwit
+        # transactions.
+        tx5 = CTransaction()
+        tx5.vin.append(CTxIn(COutPoint(tx4.sha256, 0), b""))
+        tx5.vout.append(CTxOut(tx4.vout[0].nValue-1000, CScript([OP_TRUE])))
+        (sig_hash, err) = SignatureHash(scriptPubKey, tx5, 0, SIGHASH_ALL)
+        signature = key.sign(sig_hash) + b'\x01' # 0x1 is SIGHASH_ALL
+        tx5.vin[0].scriptSig = CScript([signature, pubkey])
+        tx5.rehash()
+        # Should pass policy and consensus.
+        self.test_node.test_transaction_acceptance(tx5, True, True)
+        block = self.build_next_block()
+        self.update_witness_block_with_transactions(block, [tx5])
+        self.test_node.test_witness_block(block, accepted=True)
+        self.utxo.append(UTXO(tx5.sha256, 0, tx5.vout[0].nValue))
+
     def test_non_standard_witness(self):
         print("\tTesting detection of non-standard P2WSH witness")
         pad = chr(1).encode('latin-1')
@@ -1887,6 +1995,7 @@ def run_test(self):
         self.test_standardness_v0(segwit_activated=True)
         self.test_segwit_versions()
         self.test_premature_coinbase_witness_spend()
+        self.test_uncompressed_pubkey()
         self.test_signature_version_1()
         self.test_non_standard_witness()
         sync_blocks(self.nodes)

From 248f3a76a825a332e5495c5947ad283a9e5e938f Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Mon, 17 Oct 2016 00:32:36 +0800
Subject: [PATCH 1025/1802] Fix ismine and addwitnessaddress: no uncompressed
 keys in segwit

---
 src/script/ismine.cpp    | 62 ++++++++++++++++++++++++++++++++++------
 src/script/ismine.h      | 11 +++++--
 src/wallet/rpcwallet.cpp | 17 +++++++----
 3 files changed, 75 insertions(+), 15 deletions(-)

diff --git a/src/script/ismine.cpp b/src/script/ismine.cpp
index 0bf180341e4cc..7467d23b2d3a2 100644
--- a/src/script/ismine.cpp
+++ b/src/script/ismine.cpp
@@ -29,13 +29,25 @@ unsigned int HaveKeys(const vector<valtype>& pubkeys, const CKeyStore& keystore)
     return nResult;
 }
 
-isminetype IsMine(const CKeyStore &keystore, const CTxDestination& dest)
+isminetype IsMine(const CKeyStore& keystore, const CScript& scriptPubKey, SigVersion sigversion)
+{
+    bool isInvalid = false;
+    return IsMine(keystore, scriptPubKey, isInvalid, sigversion);
+}
+
+isminetype IsMine(const CKeyStore& keystore, const CTxDestination& dest, SigVersion sigversion)
+{
+    bool isInvalid = false;
+    return IsMine(keystore, dest, isInvalid, sigversion);
+}
+
+isminetype IsMine(const CKeyStore &keystore, const CTxDestination& dest, bool& isInvalid, SigVersion sigversion)
 {
     CScript script = GetScriptForDestination(dest);
-    return IsMine(keystore, script);
+    return IsMine(keystore, script, isInvalid, sigversion);
 }
 
-isminetype IsMine(const CKeyStore &keystore, const CScript& scriptPubKey)
+isminetype IsMine(const CKeyStore &keystore, const CScript& scriptPubKey, bool& isInvalid, SigVersion sigversion)
 {
     vector<valtype> vSolutions;
     txnouttype whichType;
@@ -53,12 +65,35 @@ isminetype IsMine(const CKeyStore &keystore, const CScript& scriptPubKey)
         break;
     case TX_PUBKEY:
         keyID = CPubKey(vSolutions[0]).GetID();
+        if (sigversion != SIGVERSION_BASE && vSolutions[0].size() != 33) {
+            isInvalid = true;
+            return ISMINE_NO;
+        }
         if (keystore.HaveKey(keyID))
             return ISMINE_SPENDABLE;
         break;
-    case TX_PUBKEYHASH:
     case TX_WITNESS_V0_KEYHASH:
+    {
+        if (!keystore.HaveCScript(CScriptID(CScript() << OP_0 << vSolutions[0]))) {
+            // We do not support bare witness outputs unless the P2SH version of it would be
+            // acceptable as well. This protects against matching before segwit activates.
+            // This also applies to the P2WSH case.
+            break;
+        }
+        isminetype ret = ::IsMine(keystore, GetScriptForDestination(CKeyID(uint160(vSolutions[0]))), isInvalid, SIGVERSION_WITNESS_V0);
+        if (ret == ISMINE_SPENDABLE || ret == ISMINE_WATCH_SOLVABLE || (ret == ISMINE_NO && isInvalid))
+            return ret;
+        break;
+    }
+    case TX_PUBKEYHASH:
         keyID = CKeyID(uint160(vSolutions[0]));
+        if (sigversion != SIGVERSION_BASE) {
+            CPubKey pubkey;
+            if (keystore.GetPubKey(keyID, pubkey) && !pubkey.IsCompressed()) {
+                isInvalid = true;
+                return ISMINE_NO;
+            }
+        }
         if (keystore.HaveKey(keyID))
             return ISMINE_SPENDABLE;
         break;
@@ -67,21 +102,24 @@ isminetype IsMine(const CKeyStore &keystore, const CScript& scriptPubKey)
         CScriptID scriptID = CScriptID(uint160(vSolutions[0]));
         CScript subscript;
         if (keystore.GetCScript(scriptID, subscript)) {
-            isminetype ret = IsMine(keystore, subscript);
-            if (ret == ISMINE_SPENDABLE)
+            isminetype ret = IsMine(keystore, subscript, isInvalid);
+            if (ret == ISMINE_SPENDABLE || ret == ISMINE_WATCH_SOLVABLE || (ret == ISMINE_NO && isInvalid))
                 return ret;
         }
         break;
     }
     case TX_WITNESS_V0_SCRIPTHASH:
     {
+        if (!keystore.HaveCScript(CScriptID(CScript() << OP_0 << vSolutions[0]))) {
+            break;
+        }
         uint160 hash;
         CRIPEMD160().Write(&vSolutions[0][0], vSolutions[0].size()).Finalize(hash.begin());
         CScriptID scriptID = CScriptID(hash);
         CScript subscript;
         if (keystore.GetCScript(scriptID, subscript)) {
-            isminetype ret = IsMine(keystore, subscript);
-            if (ret == ISMINE_SPENDABLE)
+            isminetype ret = IsMine(keystore, subscript, isInvalid, SIGVERSION_WITNESS_V0);
+            if (ret == ISMINE_SPENDABLE || ret == ISMINE_WATCH_SOLVABLE || (ret == ISMINE_NO && isInvalid))
                 return ret;
         }
         break;
@@ -95,6 +133,14 @@ isminetype IsMine(const CKeyStore &keystore, const CScript& scriptPubKey)
         // them) enable spend-out-from-under-you attacks, especially
         // in shared-wallet situations.
         vector<valtype> keys(vSolutions.begin()+1, vSolutions.begin()+vSolutions.size()-1);
+        if (sigversion != SIGVERSION_BASE) {
+            for (size_t i = 0; i < keys.size(); i++) {
+                if (keys[i].size() != 33) {
+                    isInvalid = true;
+                    return ISMINE_NO;
+                }
+            }
+        }
         if (HaveKeys(keys, keystore) == keys.size())
             return ISMINE_SPENDABLE;
         break;
diff --git a/src/script/ismine.h b/src/script/ismine.h
index 4b7db8802ba54..ec7a620e330cb 100644
--- a/src/script/ismine.h
+++ b/src/script/ismine.h
@@ -28,7 +28,14 @@ enum isminetype
 /** used for bitflags of isminetype */
 typedef uint8_t isminefilter;
 
-isminetype IsMine(const CKeyStore& keystore, const CScript& scriptPubKey);
-isminetype IsMine(const CKeyStore& keystore, const CTxDestination& dest);
+/* isInvalid becomes true when the script is found invalid by consensus or policy. This will terminate the recursion
+ * and return a ISMINE_NO immediately, as an invalid script should never be considered as "mine". This is needed as
+ * different SIGVERSION may have different network rules. Currently the only use of isInvalid is indicate uncompressed
+ * keys in SIGVERSION_WITNESS_V0 script, but could also be used in similar cases in the future
+ */
+isminetype IsMine(const CKeyStore& keystore, const CScript& scriptPubKey, bool& isInvalid, SigVersion = SIGVERSION_BASE);
+isminetype IsMine(const CKeyStore& keystore, const CScript& scriptPubKey, SigVersion = SIGVERSION_BASE);
+isminetype IsMine(const CKeyStore& keystore, const CTxDestination& dest, bool& isInvalid, SigVersion = SIGVERSION_BASE);
+isminetype IsMine(const CKeyStore& keystore, const CTxDestination& dest, SigVersion = SIGVERSION_BASE);
 
 #endif // BITCOIN_SCRIPT_ISMINE_H
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index 3eb7e5d9ba885..8e95426d11bdf 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -1,5 +1,5 @@
 // Copyright (c) 2010 Satoshi Nakamoto
-// Copyright (c) 2009-2015 The Bitcoin Core developers
+// Copyright (c) 2009-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
@@ -1025,9 +1025,12 @@ class Witnessifier : public boost::static_visitor<bool>
 
     bool operator()(const CKeyID &keyID) {
         CPubKey pubkey;
-        if (pwalletMain && pwalletMain->GetPubKey(keyID, pubkey)) {
-            CScript basescript;
-            basescript << ToByteVector(pubkey) << OP_CHECKSIG;
+        if (pwalletMain) {
+            CScript basescript = GetScriptForDestination(keyID);
+            isminetype typ;
+            typ = IsMine(*pwalletMain, basescript, SIGVERSION_WITNESS_V0);
+            if (typ != ISMINE_SPENDABLE && typ != ISMINE_WATCH_SOLVABLE)
+                return false;
             CScript witscript = GetScriptForWitness(basescript);
             pwalletMain->AddCScript(witscript);
             result = CScriptID(witscript);
@@ -1045,6 +1048,10 @@ class Witnessifier : public boost::static_visitor<bool>
                 result = scriptID;
                 return true;
             }
+            isminetype typ;
+            typ = IsMine(*pwalletMain, subscript, SIGVERSION_WITNESS_V0);
+            if (typ != ISMINE_SPENDABLE && typ != ISMINE_WATCH_SOLVABLE)
+                return false;
             CScript witscript = GetScriptForWitness(subscript);
             pwalletMain->AddCScript(witscript);
             result = CScriptID(witscript);
@@ -1090,7 +1097,7 @@ UniValue addwitnessaddress(const UniValue& params, bool fHelp)
     CTxDestination dest = address.Get();
     bool ret = boost::apply_visitor(w, dest);
     if (!ret) {
-        throw JSONRPCError(RPC_WALLET_ERROR, "Public key or redeemscript not known to wallet");
+        throw JSONRPCError(RPC_WALLET_ERROR, "Public key or redeemscript not known to wallet, or the key is uncompressed");
     }
 
     pwalletMain->SetAddressBook(w.result, "", "receive");

From 9260085377e89e666d0cb95b462261d7e3a9c82f Mon Sep 17 00:00:00 2001
From: Johnson Lau <jl2012@xbt.hk>
Date: Sat, 15 Oct 2016 02:29:39 +0800
Subject: [PATCH 1026/1802] test segwit uncompressed key fixes

---
 qa/rpc-tests/segwit.py                 | 360 +++++++++++++++++++++++-
 qa/rpc-tests/test_framework/address.py |  74 +++++
 src/test/data/script_tests.json        | 368 ++++++++++++++++++++++++-
 src/test/script_tests.cpp              |  93 +++++++
 4 files changed, 893 insertions(+), 2 deletions(-)
 create mode 100644 qa/rpc-tests/test_framework/address.py

diff --git a/qa/rpc-tests/segwit.py b/qa/rpc-tests/segwit.py
index 745a1d47508cb..41a1b3b20fd00 100755
--- a/qa/rpc-tests/segwit.py
+++ b/qa/rpc-tests/segwit.py
@@ -9,7 +9,10 @@
 
 from test_framework.test_framework import BitcoinTestFramework
 from test_framework.util import *
-from test_framework.mininode import sha256, ripemd160
+from test_framework.mininode import sha256, ripemd160, CTransaction, CTxIn, COutPoint, CTxOut
+from test_framework.address import script_to_p2sh, key_to_p2pkh
+from test_framework.script import CScript, OP_HASH160, OP_CHECKSIG, OP_0, hash160, OP_EQUAL, OP_DUP, OP_EQUALVERIFY, OP_1, OP_2, OP_CHECKMULTISIG
+from io import BytesIO
 
 NODE_0 = 0
 NODE_1 = 1
@@ -242,5 +245,360 @@ def run_test(self):
             # This is an acceptable outcome
             pass
 
+        print("Verify behaviour of importaddress, addwitnessaddress and listunspent")
+
+        # Some public keys to be used later
+        pubkeys = [
+            "0363D44AABD0F1699138239DF2F042C3282C0671CC7A76826A55C8203D90E39242", # cPiM8Ub4heR9NBYmgVzJQiUH1if44GSBGiqaeJySuL2BKxubvgwb
+            "02D3E626B3E616FC8662B489C123349FECBFC611E778E5BE739B257EAE4721E5BF", # cPpAdHaD6VoYbW78kveN2bsvb45Q7G5PhaPApVUGwvF8VQ9brD97
+            "04A47F2CBCEFFA7B9BCDA184E7D5668D3DA6F9079AD41E422FA5FD7B2D458F2538A62F5BD8EC85C2477F39650BD391EA6250207065B2A81DA8B009FC891E898F0E", # 91zqCU5B9sdWxzMt1ca3VzbtVm2YM6Hi5Rxn4UDtxEaN9C9nzXV
+            "02A47F2CBCEFFA7B9BCDA184E7D5668D3DA6F9079AD41E422FA5FD7B2D458F2538", # cPQFjcVRpAUBG8BA9hzr2yEzHwKoMgLkJZBBtK9vJnvGJgMjzTbd
+            "036722F784214129FEB9E8129D626324F3F6716555B603FFE8300BBCB882151228", # cQGtcm34xiLjB1v7bkRa4V3aAc9tS2UTuBZ1UnZGeSeNy627fN66
+            "0266A8396EE936BF6D99D17920DB21C6C7B1AB14C639D5CD72B300297E416FD2EC", # cTW5mR5M45vHxXkeChZdtSPozrFwFgmEvTNnanCW6wrqwaCZ1X7K
+            "0450A38BD7F0AC212FEBA77354A9B036A32E0F7C81FC4E0C5ADCA7C549C4505D2522458C2D9AE3CEFD684E039194B72C8A10F9CB9D4764AB26FCC2718D421D3B84", # 92h2XPssjBpsJN5CqSP7v9a7cf2kgDunBC6PDFwJHMACM1rrVBJ
+        ]
+
+        # Import a compressed key and an uncompressed key, generate some multisig addresses
+        self.nodes[0].importprivkey("92e6XLo5jVAVwrQKPNTs93oQco8f8sDNBcpv73Dsrs397fQtFQn")
+        uncompressed_spendable_address = ["mvozP4UwyGD2mGZU4D2eMvMLPB9WkMmMQu"]
+        self.nodes[0].importprivkey("cNC8eQ5dg3mFAVePDX4ddmPYpPbw41r9bm2jd1nLJT77e6RrzTRR")
+        compressed_spendable_address = ["mmWQubrDomqpgSYekvsU7HWEVjLFHAakLe"]
+        assert ((self.nodes[0].validateaddress(uncompressed_spendable_address[0])['iscompressed'] == False))
+        assert ((self.nodes[0].validateaddress(compressed_spendable_address[0])['iscompressed'] == True))
+
+        self.nodes[0].importpubkey(pubkeys[0])
+        compressed_solvable_address = [key_to_p2pkh(pubkeys[0])]
+        self.nodes[0].importpubkey(pubkeys[1])
+        compressed_solvable_address.append(key_to_p2pkh(pubkeys[1]))
+        self.nodes[0].importpubkey(pubkeys[2])
+        uncompressed_solvable_address = [key_to_p2pkh(pubkeys[2])]
+
+        spendable_anytime = []                      # These outputs should be seen anytime after importprivkey and addmultisigaddress
+        spendable_after_importaddress = []          # These outputs should be seen after importaddress
+        solvable_after_importaddress = []           # These outputs should be seen after importaddress but not spendable
+        unsolvable_after_importaddress = []         # These outputs should be unsolvable after importaddress
+        solvable_anytime = []                       # These outputs should be solvable after importpubkey
+        unseen_anytime = []                         # These outputs should never be seen
+
+        uncompressed_spendable_address.append(self.nodes[0].addmultisigaddress(2, [uncompressed_spendable_address[0], compressed_spendable_address[0]]))
+        uncompressed_spendable_address.append(self.nodes[0].addmultisigaddress(2, [uncompressed_spendable_address[0], uncompressed_spendable_address[0]]))
+        compressed_spendable_address.append(self.nodes[0].addmultisigaddress(2, [compressed_spendable_address[0], compressed_spendable_address[0]]))
+        uncompressed_solvable_address.append(self.nodes[0].addmultisigaddress(2, [compressed_spendable_address[0], uncompressed_solvable_address[0]]))
+        compressed_solvable_address.append(self.nodes[0].addmultisigaddress(2, [compressed_spendable_address[0], compressed_solvable_address[0]]))
+        compressed_solvable_address.append(self.nodes[0].addmultisigaddress(2, [compressed_solvable_address[0], compressed_solvable_address[1]]))
+        unknown_address = ["mtKKyoHabkk6e4ppT7NaM7THqPUt7AzPrT", "2NDP3jLWAFT8NDAiUa9qiE6oBt2awmMq7Dx"]
+
+        # Test multisig_without_privkey
+        # We have 2 public keys without private keys, use addmultisigaddress to add to wallet.
+        # Money sent to P2SH of multisig of this should only be seen after importaddress with the BASE58 P2SH address.
+
+        multisig_without_privkey_address = self.nodes[0].addmultisigaddress(2, [pubkeys[3], pubkeys[4]])
+        script = CScript([OP_2, hex_str_to_bytes(pubkeys[3]), hex_str_to_bytes(pubkeys[4]), OP_2, OP_CHECKMULTISIG])
+        solvable_after_importaddress.append(CScript([OP_HASH160, hash160(script), OP_EQUAL]))
+
+        for i in compressed_spendable_address:
+            v = self.nodes[0].validateaddress(i)
+            if (v['isscript']):
+                [bare, p2sh, p2wsh, p2sh_p2wsh] = self.p2sh_address_to_script(v)
+                # bare and p2sh multisig with compressed keys should always be spendable
+                spendable_anytime.extend([bare, p2sh])
+                # P2WSH and P2SH(P2WSH) multisig with compressed keys are spendable after direct importaddress
+                spendable_after_importaddress.extend([p2wsh, p2sh_p2wsh])
+            else:
+                [p2wpkh, p2sh_p2wpkh, p2pk, p2pkh, p2sh_p2pk, p2sh_p2pkh, p2wsh_p2pk, p2wsh_p2pkh, p2sh_p2wsh_p2pk, p2sh_p2wsh_p2pkh] = self.p2pkh_address_to_script(v)
+                # normal P2PKH and P2PK with compressed keys should always be spendable
+                spendable_anytime.extend([p2pkh, p2pk])
+                # P2SH_P2PK, P2SH_P2PKH, and witness with compressed keys are spendable after direct importaddress
+                spendable_after_importaddress.extend([p2wpkh, p2sh_p2wpkh, p2sh_p2pk, p2sh_p2pkh, p2wsh_p2pk, p2wsh_p2pkh, p2sh_p2wsh_p2pk, p2sh_p2wsh_p2pkh])
+
+        for i in uncompressed_spendable_address:
+            v = self.nodes[0].validateaddress(i)
+            if (v['isscript']):
+                [bare, p2sh, p2wsh, p2sh_p2wsh] = self.p2sh_address_to_script(v)
+                # bare and p2sh multisig with uncompressed keys should always be spendable
+                spendable_anytime.extend([bare, p2sh])
+                # P2WSH and P2SH(P2WSH) multisig with uncompressed keys are never seen
+                unseen_anytime.extend([p2wsh, p2sh_p2wsh])
+            else:
+                [p2wpkh, p2sh_p2wpkh, p2pk, p2pkh, p2sh_p2pk, p2sh_p2pkh, p2wsh_p2pk, p2wsh_p2pkh, p2sh_p2wsh_p2pk, p2sh_p2wsh_p2pkh] = self.p2pkh_address_to_script(v)
+                # normal P2PKH and P2PK with uncompressed keys should always be spendable
+                spendable_anytime.extend([p2pkh, p2pk])
+                # P2SH_P2PK and P2SH_P2PKH are spendable after direct importaddress
+                spendable_after_importaddress.extend([p2sh_p2pk, p2sh_p2pkh])
+                # witness with uncompressed keys are never seen
+                unseen_anytime.extend([p2wpkh, p2sh_p2wpkh, p2wsh_p2pk, p2wsh_p2pkh, p2sh_p2wsh_p2pk, p2sh_p2wsh_p2pkh])
+
+        for i in compressed_solvable_address:
+            v = self.nodes[0].validateaddress(i)
+            if (v['isscript']):
+                # Multisig without private is not seen after addmultisigaddress, but seen after importaddress
+                [bare, p2sh, p2wsh, p2sh_p2wsh] = self.p2sh_address_to_script(v)
+                solvable_after_importaddress.extend([bare, p2sh, p2wsh, p2sh_p2wsh])
+            else:
+                [p2wpkh, p2sh_p2wpkh, p2pk, p2pkh, p2sh_p2pk, p2sh_p2pkh, p2wsh_p2pk, p2wsh_p2pkh, p2sh_p2wsh_p2pk, p2sh_p2wsh_p2pkh] = self.p2pkh_address_to_script(v)
+                # normal P2PKH and P2PK with compressed keys should always be seen
+                solvable_anytime.extend([p2pkh, p2pk])
+                # P2SH_P2PK, P2SH_P2PKH, and witness with compressed keys are seen after direct importaddress
+                solvable_after_importaddress.extend([p2wpkh, p2sh_p2wpkh, p2sh_p2pk, p2sh_p2pkh, p2wsh_p2pk, p2wsh_p2pkh, p2sh_p2wsh_p2pk, p2sh_p2wsh_p2pkh])
+
+        for i in uncompressed_solvable_address:
+            v = self.nodes[0].validateaddress(i)
+            if (v['isscript']):
+                [bare, p2sh, p2wsh, p2sh_p2wsh] = self.p2sh_address_to_script(v)
+                # Base uncompressed multisig without private is not seen after addmultisigaddress, but seen after importaddress
+                solvable_after_importaddress.extend([bare, p2sh])
+                # P2WSH and P2SH(P2WSH) multisig with uncompressed keys are never seen
+                unseen_anytime.extend([p2wsh, p2sh_p2wsh])
+            else:
+                [p2wpkh, p2sh_p2wpkh, p2pk, p2pkh, p2sh_p2pk, p2sh_p2pkh, p2wsh_p2pk, p2wsh_p2pkh, p2sh_p2wsh_p2pk, p2sh_p2wsh_p2pkh] = self.p2pkh_address_to_script(v)
+                # normal P2PKH and P2PK with uncompressed keys should always be seen
+                solvable_anytime.extend([p2pkh, p2pk])
+                # P2SH_P2PK, P2SH_P2PKH with uncompressed keys are seen after direct importaddress
+                solvable_after_importaddress.extend([p2sh_p2pk, p2sh_p2pkh])
+                # witness with uncompressed keys are never seen
+                unseen_anytime.extend([p2wpkh, p2sh_p2wpkh, p2wsh_p2pk, p2wsh_p2pkh, p2sh_p2wsh_p2pk, p2sh_p2wsh_p2pkh])
+
+        op1 = CScript([OP_1])
+        op0 = CScript([OP_0])
+        # 2N7MGY19ti4KDMSzRfPAssP6Pxyuxoi6jLe is the P2SH(P2PKH) version of mjoE3sSrb8ByYEvgnC3Aox86u1CHnfJA4V
+        unsolvable_address = ["mjoE3sSrb8ByYEvgnC3Aox86u1CHnfJA4V", "2N7MGY19ti4KDMSzRfPAssP6Pxyuxoi6jLe", script_to_p2sh(op1), script_to_p2sh(op0)]
+        unsolvable_address_key = hex_str_to_bytes("02341AEC7587A51CDE5279E0630A531AEA2615A9F80B17E8D9376327BAEAA59E3D")
+        unsolvablep2pkh = CScript([OP_DUP, OP_HASH160, hash160(unsolvable_address_key), OP_EQUALVERIFY, OP_CHECKSIG])
+        unsolvablep2wshp2pkh = CScript([OP_0, sha256(unsolvablep2pkh)])
+        p2shop0 = CScript([OP_HASH160, hash160(op0), OP_EQUAL])
+        p2wshop1 = CScript([OP_0, sha256(op1)])
+        unsolvable_after_importaddress.append(unsolvablep2pkh)
+        unsolvable_after_importaddress.append(unsolvablep2wshp2pkh)
+        unsolvable_after_importaddress.append(op1) # OP_1 will be imported as script
+        unsolvable_after_importaddress.append(p2wshop1)
+        unseen_anytime.append(op0) # OP_0 will be imported as P2SH address with no script provided
+        unsolvable_after_importaddress.append(p2shop0)
+
+        spendable_txid = []
+        solvable_txid = []
+        spendable_txid.append(self.mine_and_test_listunspent(spendable_anytime, 2))
+        solvable_txid.append(self.mine_and_test_listunspent(solvable_anytime, 1))
+        self.mine_and_test_listunspent(spendable_after_importaddress + solvable_after_importaddress + unseen_anytime + unsolvable_after_importaddress, 0)
+
+        importlist = []
+        for i in compressed_spendable_address + uncompressed_spendable_address + compressed_solvable_address + uncompressed_solvable_address:
+            v = self.nodes[0].validateaddress(i)
+            if (v['isscript']):
+                bare = hex_str_to_bytes(v['hex'])
+                importlist.append(bytes_to_hex_str(bare))
+                importlist.append(bytes_to_hex_str(CScript([OP_0, sha256(bare)])))
+            else:
+                pubkey = hex_str_to_bytes(v['pubkey'])
+                p2pk = CScript([pubkey, OP_CHECKSIG])
+                p2pkh = CScript([OP_DUP, OP_HASH160, hash160(pubkey), OP_EQUALVERIFY, OP_CHECKSIG])
+                importlist.append(bytes_to_hex_str(p2pk))
+                importlist.append(bytes_to_hex_str(p2pkh))
+                importlist.append(bytes_to_hex_str(CScript([OP_0, hash160(pubkey)])))
+                importlist.append(bytes_to_hex_str(CScript([OP_0, sha256(p2pk)])))
+                importlist.append(bytes_to_hex_str(CScript([OP_0, sha256(p2pkh)])))
+
+        importlist.append(bytes_to_hex_str(unsolvablep2pkh))
+        importlist.append(bytes_to_hex_str(unsolvablep2wshp2pkh))
+        importlist.append(bytes_to_hex_str(op1))
+        importlist.append(bytes_to_hex_str(p2wshop1))
+
+        for i in importlist:
+            try:
+                self.nodes[0].importaddress(i,"",False,True)
+            except JSONRPCException as exp:
+                assert_equal(exp.error["message"], "The wallet already contains the private key for this address or script")
+
+        self.nodes[0].importaddress(script_to_p2sh(op0)) # import OP_0 as address only
+        self.nodes[0].importaddress(multisig_without_privkey_address) # Test multisig_without_privkey
+
+        spendable_txid.append(self.mine_and_test_listunspent(spendable_anytime + spendable_after_importaddress, 2))
+        solvable_txid.append(self.mine_and_test_listunspent(solvable_anytime + solvable_after_importaddress, 1))
+        self.mine_and_test_listunspent(unsolvable_after_importaddress, 1)
+        self.mine_and_test_listunspent(unseen_anytime, 0)
+
+        # addwitnessaddress should refuse to return a witness address if an uncompressed key is used or the address is
+        # not in the wallet
+        # note that no witness address should be returned by unsolvable addresses
+        # the multisig_without_privkey_address will fail because its keys were not added with importpubkey
+        for i in uncompressed_spendable_address + uncompressed_solvable_address + unknown_address + unsolvable_address + [multisig_without_privkey_address]:
+            try:
+                self.nodes[0].addwitnessaddress(i)
+            except JSONRPCException as exp:
+                assert_equal(exp.error["message"], "Public key or redeemscript not known to wallet, or the key is uncompressed")
+            else:
+                assert(False)
+
+        for i in compressed_spendable_address + compressed_solvable_address:
+            witaddress = self.nodes[0].addwitnessaddress(i)
+            # addwitnessaddress should return the same address if it is a known P2SH-witness address
+            assert_equal(witaddress, self.nodes[0].addwitnessaddress(witaddress))
+
+        spendable_txid.append(self.mine_and_test_listunspent(spendable_anytime + spendable_after_importaddress, 2))
+        solvable_txid.append(self.mine_and_test_listunspent(solvable_anytime + solvable_after_importaddress, 1))
+        self.mine_and_test_listunspent(unsolvable_after_importaddress, 1)
+        self.mine_and_test_listunspent(unseen_anytime, 0)
+
+        # Repeat some tests. This time we don't add witness scripts with importaddress
+        # Import a compressed key and an uncompressed key, generate some multisig addresses
+        self.nodes[0].importprivkey("927pw6RW8ZekycnXqBQ2JS5nPyo1yRfGNN8oq74HeddWSpafDJH")
+        uncompressed_spendable_address = ["mguN2vNSCEUh6rJaXoAVwY3YZwZvEmf5xi"]
+        self.nodes[0].importprivkey("cMcrXaaUC48ZKpcyydfFo8PxHAjpsYLhdsp6nmtB3E2ER9UUHWnw")
+        compressed_spendable_address = ["n1UNmpmbVUJ9ytXYXiurmGPQ3TRrXqPWKL"]
+
+        self.nodes[0].importpubkey(pubkeys[5])
+        compressed_solvable_address = [key_to_p2pkh(pubkeys[5])]
+        self.nodes[0].importpubkey(pubkeys[6])
+        uncompressed_solvable_address = [key_to_p2pkh(pubkeys[6])]
+
+        spendable_after_addwitnessaddress = []      # These outputs should be seen after importaddress
+        solvable_after_addwitnessaddress=[]         # These outputs should be seen after importaddress but not spendable
+        unseen_anytime = []                         # These outputs should never be seen
+
+        uncompressed_spendable_address.append(self.nodes[0].addmultisigaddress(2, [uncompressed_spendable_address[0], compressed_spendable_address[0]]))
+        uncompressed_spendable_address.append(self.nodes[0].addmultisigaddress(2, [uncompressed_spendable_address[0], uncompressed_spendable_address[0]]))
+        compressed_spendable_address.append(self.nodes[0].addmultisigaddress(2, [compressed_spendable_address[0], compressed_spendable_address[0]]))
+        uncompressed_solvable_address.append(self.nodes[0].addmultisigaddress(2, [compressed_solvable_address[0], uncompressed_solvable_address[0]]))
+        compressed_solvable_address.append(self.nodes[0].addmultisigaddress(2, [compressed_spendable_address[0], compressed_solvable_address[0]]))
+
+        premature_witaddress = []
+
+        for i in compressed_spendable_address:
+            v = self.nodes[0].validateaddress(i)
+            if (v['isscript']):
+                [bare, p2sh, p2wsh, p2sh_p2wsh] = self.p2sh_address_to_script(v)
+                # P2WSH and P2SH(P2WSH) multisig with compressed keys are spendable after addwitnessaddress
+                spendable_after_addwitnessaddress.extend([p2wsh, p2sh_p2wsh])
+                premature_witaddress.append(script_to_p2sh(p2wsh))
+            else:
+                [p2wpkh, p2sh_p2wpkh, p2pk, p2pkh, p2sh_p2pk, p2sh_p2pkh, p2wsh_p2pk, p2wsh_p2pkh, p2sh_p2wsh_p2pk, p2sh_p2wsh_p2pkh] = self.p2pkh_address_to_script(v)
+                # P2WPKH, P2SH_P2WPKH are spendable after addwitnessaddress
+                spendable_after_addwitnessaddress.extend([p2wpkh, p2sh_p2wpkh])
+                premature_witaddress.append(script_to_p2sh(p2wpkh))
+
+        for i in uncompressed_spendable_address + uncompressed_solvable_address:
+            v = self.nodes[0].validateaddress(i)
+            if (v['isscript']):
+                [bare, p2sh, p2wsh, p2sh_p2wsh] = self.p2sh_address_to_script(v)
+                # P2WSH and P2SH(P2WSH) multisig with uncompressed keys are never seen
+                unseen_anytime.extend([p2wsh, p2sh_p2wsh])
+            else:
+                [p2wpkh, p2sh_p2wpkh, p2pk, p2pkh, p2sh_p2pk, p2sh_p2pkh, p2wsh_p2pk, p2wsh_p2pkh, p2sh_p2wsh_p2pk, p2sh_p2wsh_p2pkh] = self.p2pkh_address_to_script(v)
+                # P2WPKH, P2SH_P2WPKH with uncompressed keys are never seen
+                unseen_anytime.extend([p2wpkh, p2sh_p2wpkh])
+
+        for i in compressed_solvable_address:
+            v = self.nodes[0].validateaddress(i)
+            if (v['isscript']):
+                # P2WSH multisig without private key are seen after addwitnessaddress
+                [bare, p2sh, p2wsh, p2sh_p2wsh] = self.p2sh_address_to_script(v)
+                solvable_after_addwitnessaddress.extend([p2wsh, p2sh_p2wsh])
+                premature_witaddress.append(script_to_p2sh(p2wsh))
+            else:
+                [p2wpkh, p2sh_p2wpkh, p2pk, p2pkh, p2sh_p2pk, p2sh_p2pkh, p2wsh_p2pk, p2wsh_p2pkh, p2sh_p2wsh_p2pk, p2sh_p2wsh_p2pkh] = self.p2pkh_address_to_script(v)
+                # P2SH_P2PK, P2SH_P2PKH with compressed keys are seen after addwitnessaddress
+                solvable_after_addwitnessaddress.extend([p2wpkh, p2sh_p2wpkh])
+                premature_witaddress.append(script_to_p2sh(p2wpkh))
+
+        self.mine_and_test_listunspent(spendable_after_addwitnessaddress + solvable_after_addwitnessaddress + unseen_anytime, 0)
+
+        # addwitnessaddress should refuse to return a witness address if an uncompressed key is used
+        # note that a multisig address returned by addmultisigaddress is not solvable until it is added with importaddress
+        # premature_witaddress are not accepted until the script is added with addwitnessaddress first
+        for i in uncompressed_spendable_address + uncompressed_solvable_address + premature_witaddress + [compressed_solvable_address[1]]:
+            try:
+                self.nodes[0].addwitnessaddress(i)
+            except JSONRPCException as exp:
+                assert_equal(exp.error["message"], "Public key or redeemscript not known to wallet, or the key is uncompressed")
+            else:
+                assert(False)
+
+        # after importaddress it should pass addwitnessaddress
+        v = self.nodes[0].validateaddress(compressed_solvable_address[1])
+        self.nodes[0].importaddress(v['hex'],"",False,True)
+        for i in compressed_spendable_address + compressed_solvable_address + premature_witaddress:
+            witaddress = self.nodes[0].addwitnessaddress(i)
+            assert_equal(witaddress, self.nodes[0].addwitnessaddress(witaddress))
+
+        spendable_txid.append(self.mine_and_test_listunspent(spendable_after_addwitnessaddress, 2))
+        solvable_txid.append(self.mine_and_test_listunspent(solvable_after_addwitnessaddress, 1))
+        self.mine_and_test_listunspent(unseen_anytime, 0)
+
+        # Check that spendable outputs are really spendable
+        self.create_and_mine_tx_from_txids(spendable_txid)
+
+        # import all the private keys so solvable addresses become spendable
+        self.nodes[0].importprivkey("cPiM8Ub4heR9NBYmgVzJQiUH1if44GSBGiqaeJySuL2BKxubvgwb")
+        self.nodes[0].importprivkey("cPpAdHaD6VoYbW78kveN2bsvb45Q7G5PhaPApVUGwvF8VQ9brD97")
+        self.nodes[0].importprivkey("91zqCU5B9sdWxzMt1ca3VzbtVm2YM6Hi5Rxn4UDtxEaN9C9nzXV")
+        self.nodes[0].importprivkey("cPQFjcVRpAUBG8BA9hzr2yEzHwKoMgLkJZBBtK9vJnvGJgMjzTbd")
+        self.nodes[0].importprivkey("cQGtcm34xiLjB1v7bkRa4V3aAc9tS2UTuBZ1UnZGeSeNy627fN66")
+        self.nodes[0].importprivkey("cTW5mR5M45vHxXkeChZdtSPozrFwFgmEvTNnanCW6wrqwaCZ1X7K")
+        self.create_and_mine_tx_from_txids(solvable_txid)
+
+    def mine_and_test_listunspent(self, script_list, ismine):
+        utxo = find_unspent(self.nodes[0], 50)
+        tx = CTransaction()
+        tx.vin.append(CTxIn(COutPoint(int('0x'+utxo['txid'],0), utxo['vout'])))
+        for i in script_list:
+            tx.vout.append(CTxOut(10000000, i))
+        tx.rehash()
+        signresults = self.nodes[0].signrawtransaction(bytes_to_hex_str(tx.serialize_without_witness()))['hex']
+        txid = self.nodes[0].sendrawtransaction(signresults, True)
+        self.nodes[0].generate(1)
+        sync_blocks(self.nodes)
+        watchcount = 0
+        spendcount = 0
+        for i in self.nodes[0].listunspent():
+            if (i['txid'] == txid):
+                watchcount += 1
+                if (i['spendable'] == True):
+                    spendcount += 1
+        if (ismine == 2):
+            assert_equal(spendcount, len(script_list))
+        elif (ismine == 1):
+            assert_equal(watchcount, len(script_list))
+            assert_equal(spendcount, 0)
+        else:
+            assert_equal(watchcount, 0)
+        return txid
+
+    def p2sh_address_to_script(self,v):
+        bare = CScript(hex_str_to_bytes(v['hex']))
+        p2sh = CScript(hex_str_to_bytes(v['scriptPubKey']))
+        p2wsh = CScript([OP_0, sha256(bare)])
+        p2sh_p2wsh = CScript([OP_HASH160, hash160(p2wsh), OP_EQUAL])
+        return([bare, p2sh, p2wsh, p2sh_p2wsh])
+
+    def p2pkh_address_to_script(self,v):
+        pubkey = hex_str_to_bytes(v['pubkey'])
+        p2wpkh = CScript([OP_0, hash160(pubkey)])
+        p2sh_p2wpkh = CScript([OP_HASH160, hash160(p2wpkh), OP_EQUAL])
+        p2pk = CScript([pubkey, OP_CHECKSIG])
+        p2pkh = CScript(hex_str_to_bytes(v['scriptPubKey']))
+        p2sh_p2pk = CScript([OP_HASH160, hash160(p2pk), OP_EQUAL])
+        p2sh_p2pkh = CScript([OP_HASH160, hash160(p2pkh), OP_EQUAL])
+        p2wsh_p2pk = CScript([OP_0, sha256(p2pk)])
+        p2wsh_p2pkh = CScript([OP_0, sha256(p2pkh)])
+        p2sh_p2wsh_p2pk = CScript([OP_HASH160, hash160(p2wsh_p2pk), OP_EQUAL])
+        p2sh_p2wsh_p2pkh = CScript([OP_HASH160, hash160(p2wsh_p2pkh), OP_EQUAL])
+        return [p2wpkh, p2sh_p2wpkh, p2pk, p2pkh, p2sh_p2pk, p2sh_p2pkh, p2wsh_p2pk, p2wsh_p2pkh, p2sh_p2wsh_p2pk, p2sh_p2wsh_p2pkh]
+
+    def create_and_mine_tx_from_txids(self, txids, success = True):
+        tx = CTransaction()
+        for i in txids:
+            txtmp = CTransaction()
+            txraw = self.nodes[0].getrawtransaction(i)
+            f = BytesIO(hex_str_to_bytes(txraw))
+            txtmp.deserialize(f)
+            for j in range(len(txtmp.vout)):
+                tx.vin.append(CTxIn(COutPoint(int('0x'+i,0), j)))
+        tx.vout.append(CTxOut(0, CScript()))
+        tx.rehash()
+        signresults = self.nodes[0].signrawtransaction(bytes_to_hex_str(tx.serialize_without_witness()))['hex']
+        self.nodes[0].sendrawtransaction(signresults, True)
+        self.nodes[0].generate(1)
+        sync_blocks(self.nodes)
+
+
 if __name__ == '__main__':
     SegWitTest().main()
diff --git a/qa/rpc-tests/test_framework/address.py b/qa/rpc-tests/test_framework/address.py
new file mode 100644
index 0000000000000..50b999be6110d
--- /dev/null
+++ b/qa/rpc-tests/test_framework/address.py
@@ -0,0 +1,74 @@
+#!/usr/bin/env python3
+# Copyright (c) 2016 The Bitcoin Core developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#
+# address.py
+#
+# This file encodes and decodes BASE58 P2PKH and P2SH addresses
+#
+
+from .script import hash256, hash160, sha256, CScript, OP_0
+from .util import bytes_to_hex_str, hex_str_to_bytes
+
+chars = '123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz'
+
+def byte_to_base58(b, version):
+    result = ''
+    str = bytes_to_hex_str(b)
+    str = bytes_to_hex_str(chr(version).encode('latin-1')) + str
+    checksum = bytes_to_hex_str(hash256(hex_str_to_bytes(str)))
+    str += checksum[:8]
+    value = int('0x'+str,0)
+    while value > 0:
+        result = chars[value % 58] + result
+        value //= 58
+    while (str[:2] == '00'):
+        result = chars[0] + result
+        str = str[2:]
+    return result
+
+# TODO: def base58_decode
+
+def keyhash_to_p2pkh(hash, main = False):
+    assert (len(hash) == 20)
+    version = 0 if main else 111
+    return byte_to_base58(hash, version)
+
+def scripthash_to_p2sh(hash, main = False):
+    assert (len(hash) == 20)
+    version = 5 if main else 196
+    return byte_to_base58(hash, version)
+
+def key_to_p2pkh(key, main = False):
+    key = check_key(key)
+    return keyhash_to_p2pkh(hash160(key), main)
+
+def script_to_p2sh(script, main = False):
+    script = check_script(script)
+    return scripthash_to_p2sh(hash160(script), main)
+
+def key_to_p2sh_p2wpkh(key, main = False):
+    key = check_key(key)
+    p2shscript = CScript([OP_0, hash160(key)])
+    return script_to_p2sh(p2shscript, main)
+
+def script_to_p2sh_p2wsh(script, main = False):
+    script = check_script(script)
+    p2shscript = CScript([OP_0, sha256(script)])
+    return script_to_p2sh(p2shscript, main)
+
+def check_key(key):
+    if (type(key) is str):
+        key = hex_str_to_bytes(key) # Assuming this is hex string
+    if (type(key) is bytes and (len(key) == 33 or len(key) == 65)):
+        return key
+    assert(False)
+
+def check_script(script):
+    if (type(script) is str):
+        script = hex_str_to_bytes(script) # Assuming this is hex string
+    if (type(script) is bytes or type(script) is CScript):
+        return script
+    assert(False)
diff --git a/src/test/data/script_tests.json b/src/test/data/script_tests.json
index 06103ea5bdd66..5c054ed3e8fb0 100644
--- a/src/test/data/script_tests.json
+++ b/src/test/data/script_tests.json
@@ -1855,6 +1855,8 @@
     "OK",
     "P2SH with CLEANSTACK"
 ],
+
+["Testing with uncompressed keys in witness v0 without WITNESS_PUBKEYTYPE"],
 [
     [
         "304402200d461c140cfdfcf36b94961db57ae8c18d1cb80e9d95a9e47ac22470c1bf125502201c8dc1cbfef6a3ef90acbbb992ca22fe9466ee6f9d4898eda277a7ac3ab4b25101",
@@ -2139,7 +2141,371 @@
     "P2PK with witness"
 ],
 
-["CHECKSEQUENCEVERIFY tests"], 
+["Testing with compressed keys in witness v0 with WITNESS_PUBKEYTYPE"],
+[
+    [
+        "304402204256146fcf8e73b0fd817ffa2a4e408ff0418ff987dd08a4f485b62546f6c43c02203f3c8c3e2febc051e1222867f5f9d0eaf039d6792911c10940aa3cc74123378e01",
+        "210279be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798ac",
+        0.00000001
+    ],
+    "",
+    "0 0x20 0x1863143c14c5166804bd19203356da136c985678cd4d27a1b8c6329604903262",
+    "P2SH,WITNESS,WITNESS_PUBKEYTYPE",
+    "OK",
+    "Basic P2WSH with compressed key"
+],
+[
+    [
+        "304402204edf27486f11432466b744df533e1acac727e0c83e5f912eb289a3df5bf8035f022075809fdd876ede40ad21667eba8b7e96394938f9c9c50f11b6a1280cce2cea8601",
+        "0279be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798",
+        0.00000001
+    ],
+    "",
+    "0 0x14 0x751e76e8199196d454941c45d1b3a323f1433bd6",
+    "P2SH,WITNESS,WITNESS_PUBKEYTYPE",
+    "OK",
+    "Basic P2WPKH with compressed key"
+],
+[
+    [
+        "304402203a549090cc46bce1e5e95c4922ea2c12747988e0207b04c42f81cdbe87bb1539022050f57a245b875fd5119c419aaf050bcdf41384f0765f04b809e5bced1fe7093d01",
+        "210279be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798ac",
+        0.00000001
+    ],
+    "0x22 0x00201863143c14c5166804bd19203356da136c985678cd4d27a1b8c6329604903262",
+    "HASH160 0x14 0xe4300531190587e3880d4c3004f5355d88ff928d EQUAL",
+    "P2SH,WITNESS,WITNESS_PUBKEYTYPE",
+    "OK",
+    "Basic P2SH(P2WSH) with compressed key"
+],
+[
+    [
+        "304402201bc0d53046827f4a35a3166e33e3b3366c4085540dc383b95d21ed2ab11e368a0220333e78c6231214f5f8e59621e15d7eeab0d4e4d0796437e00bfbd2680c5f9c1701",
+        "0279be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798",
+        0.00000001
+    ],
+    "0x16 0x0014751e76e8199196d454941c45d1b3a323f1433bd6",
+    "HASH160 0x14 0xbcfeb728b584253d5f3f70bcb780e9ef218a68f4 EQUAL",
+    "P2SH,WITNESS,WITNESS_PUBKEYTYPE",
+    "OK",
+    "Basic P2SH(P2WPKH) with compressed key"
+],
+
+["Testing with uncompressed keys in witness v0 with WITNESS_PUBKEYTYPE"],
+[
+    [
+        "304402200d461c140cfdfcf36b94961db57ae8c18d1cb80e9d95a9e47ac22470c1bf125502201c8dc1cbfef6a3ef90acbbb992ca22fe9466ee6f9d4898eda277a7ac3ab4b25101",
+        "410479be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8ac",
+        0.00000001
+    ],
+    "",
+    "0 0x20 0xb95237b48faaa69eb078e1170be3b5cbb3fddf16d0a991e14ad274f7b33a4f64",
+    "P2SH,WITNESS,WITNESS_PUBKEYTYPE",
+    "WITNESS_PUBKEYTYPE",
+    "Basic P2WSH"
+],
+[
+    [
+        "304402201e7216e5ccb3b61d46946ec6cc7e8c4e0117d13ac2fd4b152197e4805191c74202203e9903e33e84d9ee1dd13fb057afb7ccfb47006c23f6a067185efbc9dd780fc501",
+        "0479be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8",
+        0.00000001
+    ],
+    "",
+    "0 0x14 0x91b24bf9f5288532960ac687abb035127b1d28a5",
+    "P2SH,WITNESS,WITNESS_PUBKEYTYPE",
+    "WITNESS_PUBKEYTYPE",
+    "Basic P2WPKH"
+],
+[
+    [
+        "3044022066e02c19a513049d49349cf5311a1b012b7c4fae023795a18ab1d91c23496c22022025e216342c8e07ce8ef51e8daee88f84306a9de66236cab230bb63067ded1ad301",
+        "410479be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8ac",
+        0.00000001
+    ],
+    "0x22 0x0020b95237b48faaa69eb078e1170be3b5cbb3fddf16d0a991e14ad274f7b33a4f64",
+    "HASH160 0x14 0xf386c2ba255cc56d20cfa6ea8b062f8b59945518 EQUAL",
+    "P2SH,WITNESS,WITNESS_PUBKEYTYPE",
+    "WITNESS_PUBKEYTYPE",
+    "Basic P2SH(P2WSH)"
+],
+[
+    [
+        "304402200929d11561cd958460371200f82e9cae64c727a495715a31828e27a7ad57b36d0220361732ced04a6f97351ecca21a56d0b8cd4932c1da1f8f569a2b68e5e48aed7801",
+        "0479be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8",
+        0.00000001
+    ],
+    "0x16 0x001491b24bf9f5288532960ac687abb035127b1d28a5",
+    "HASH160 0x14 0x17743beb429c55c942d2ec703b98c4d57c2df5c6 EQUAL",
+    "P2SH,WITNESS,WITNESS_PUBKEYTYPE",
+    "WITNESS_PUBKEYTYPE",
+    "Basic P2SH(P2WPKH)"
+],
+
+["Testing P2WSH multisig with compressed keys"],
+[
+    [
+        "",
+        "304402207eb8a59b5c65fc3f6aeef77066556ed5c541948a53a3ba7f7c375b8eed76ee7502201e036a7a9a98ff919ff94dc905d67a1ec006f79ef7cff0708485c8bb79dce38e01",
+        "5121038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508210279be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f8179852ae",
+        0.00000001
+    ],
+    "",
+    "0 0x20 0x06c24420938f0fa3c1cb2707d867154220dca365cdbfa0dd2a83854730221460",
+    "P2SH,WITNESS,WITNESS_PUBKEYTYPE",
+    "OK",
+    "P2WSH CHECKMULTISIG with compressed keys"
+],
+[
+    [
+        "",
+        "3044022033706aed33b8155d5486df3b9bca8cdd3bd4bdb5436dce46d72cdaba51d22b4002203626e94fe53a178af46624f17315c6931f20a30b103f5e044e1eda0c3fe185c601",
+        "5121038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508210279be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f8179852ae",
+        0.00000001
+    ],
+    "0x22 0x002006c24420938f0fa3c1cb2707d867154220dca365cdbfa0dd2a83854730221460",
+    "HASH160 0x14 0x26282aad7c29369d15fed062a778b6100d31a340 EQUAL",
+    "P2SH,WITNESS,WITNESS_PUBKEYTYPE",
+    "OK",
+    "P2SH(P2WSH) CHECKMULTISIG with compressed keys"
+],
+[
+    [
+        "",
+        "304402204048b7371ab1c544362efb89af0c80154747d665aa4fcfb2edfd2d161e57b42e02207e043748e96637080ffc3acbd4dcc6fee1e58d30f6d1269535f32188e5ddae7301",
+        "5121038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508210279be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f8179852ae",
+        0.00000001
+    ],
+    "",
+    "0 0x20 0x06c24420938f0fa3c1cb2707d867154220dca365cdbfa0dd2a83854730221460",
+    "P2SH,WITNESS,WITNESS_PUBKEYTYPE",
+    "OK",
+    "P2WSH CHECKMULTISIG with compressed keys"
+],
+[
+    [
+        "",
+        "3044022073902ef0b8a554c36c44cc03c1b64df96ce2914ebcf946f5bb36078fd5245cdf02205b148f1ba127065fb8c83a5a9576f2dcd111739788ed4bb3ee08b2bd3860c91c01",
+        "5121038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508210279be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f8179852ae",
+        0.00000001
+    ],
+    "0x22 0x002006c24420938f0fa3c1cb2707d867154220dca365cdbfa0dd2a83854730221460",
+    "HASH160 0x14 0x26282aad7c29369d15fed062a778b6100d31a340 EQUAL",
+    "P2SH,WITNESS,WITNESS_PUBKEYTYPE",
+    "OK",
+    "P2SH(P2WSH) CHECKMULTISIG with compressed keys"
+],
+
+["Testing P2WSH multisig with compressed and uncompressed keys (first key being the key closer to the top of stack)"],
+[
+    [
+        "",
+        "304402202d092ededd1f060609dbf8cb76950634ff42b3e62cf4adb69ab92397b07d742302204ff886f8d0817491a96d1daccdcc820f6feb122ee6230143303100db37dfa79f01",
+        "5121038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508410479be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b852ae",
+        0.00000001
+    ],
+    "",
+    "0 0x20 0x08a6665ebfd43b02323423e764e185d98d1587f903b81507dbb69bfc41005efa",
+    "P2SH,WITNESS",
+    "OK",
+    "P2WSH CHECKMULTISIG with first key uncompressed and signing with the first key"
+],
+[
+    [
+        "",
+        "304402202dd7e91243f2235481ffb626c3b7baf2c859ae3a5a77fb750ef97b99a8125dc002204960de3d3c3ab9496e218ec57e5240e0e10a6f9546316fe240c216d45116d29301",
+        "5121038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508410479be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b852ae",
+        0.00000001
+    ],
+    "0x22 0x002008a6665ebfd43b02323423e764e185d98d1587f903b81507dbb69bfc41005efa",
+    "HASH160 0x14 0x6f5ecd4b83b77f3c438f5214eff96454934fc5d1 EQUAL",
+    "P2SH,WITNESS",
+    "OK",
+    "P2SH(P2WSH) CHECKMULTISIG first key uncompressed and signing with the first key"
+],
+[
+    [
+        "",
+        "304402202d092ededd1f060609dbf8cb76950634ff42b3e62cf4adb69ab92397b07d742302204ff886f8d0817491a96d1daccdcc820f6feb122ee6230143303100db37dfa79f01",
+        "5121038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508410479be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b852ae",
+        0.00000001
+    ],
+    "",
+    "0 0x20 0x08a6665ebfd43b02323423e764e185d98d1587f903b81507dbb69bfc41005efa",
+    "P2SH,WITNESS,WITNESS_PUBKEYTYPE",
+    "WITNESS_PUBKEYTYPE",
+    "P2WSH CHECKMULTISIG with first key uncompressed and signing with the first key"
+],
+[
+    [
+        "",
+        "304402202dd7e91243f2235481ffb626c3b7baf2c859ae3a5a77fb750ef97b99a8125dc002204960de3d3c3ab9496e218ec57e5240e0e10a6f9546316fe240c216d45116d29301",
+        "5121038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508410479be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b852ae",
+        0.00000001
+    ],
+    "0x22 0x002008a6665ebfd43b02323423e764e185d98d1587f903b81507dbb69bfc41005efa",
+    "HASH160 0x14 0x6f5ecd4b83b77f3c438f5214eff96454934fc5d1 EQUAL",
+    "P2SH,WITNESS,WITNESS_PUBKEYTYPE",
+    "WITNESS_PUBKEYTYPE",
+    "P2SH(P2WSH) CHECKMULTISIG with first key uncompressed and signing with the first key"
+],
+[
+    [
+        "",
+        "304402201e9e6f7deef5b2f21d8223c5189b7d5e82d237c10e97165dd08f547c4e5ce6ed02206796372eb1cc6acb52e13ee2d7f45807780bf96b132cb6697f69434be74b1af901",
+        "5121038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508410479be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b852ae",
+        0.00000001
+    ],
+    "",
+    "0 0x20 0x08a6665ebfd43b02323423e764e185d98d1587f903b81507dbb69bfc41005efa",
+    "P2SH,WITNESS",
+    "OK",
+    "P2WSH CHECKMULTISIG with first key uncompressed and signing with the second key"
+],
+[
+    [
+        "",
+        "3044022045e667f3f0f3147b95597a24babe9afecea1f649fd23637dfa7ed7e9f3ac18440220295748e81005231135289fe3a88338dabba55afa1bdb4478691337009d82b68d01",
+        "5121038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508410479be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b852ae",
+        0.00000001
+    ],
+    "0x22 0x002008a6665ebfd43b02323423e764e185d98d1587f903b81507dbb69bfc41005efa",
+    "HASH160 0x14 0x6f5ecd4b83b77f3c438f5214eff96454934fc5d1 EQUAL",
+    "P2SH,WITNESS",
+    "OK",
+    "P2SH(P2WSH) CHECKMULTISIG with first key uncompressed and signing with the second key"
+],
+[
+    [
+        "",
+        "304402201e9e6f7deef5b2f21d8223c5189b7d5e82d237c10e97165dd08f547c4e5ce6ed02206796372eb1cc6acb52e13ee2d7f45807780bf96b132cb6697f69434be74b1af901",
+        "5121038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508410479be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b852ae",
+        0.00000001
+    ],
+    "",
+    "0 0x20 0x08a6665ebfd43b02323423e764e185d98d1587f903b81507dbb69bfc41005efa",
+    "P2SH,WITNESS,WITNESS_PUBKEYTYPE",
+    "WITNESS_PUBKEYTYPE",
+    "P2WSH CHECKMULTISIG with first key uncompressed and signing with the second key"
+],
+[
+    [
+        "",
+        "3044022045e667f3f0f3147b95597a24babe9afecea1f649fd23637dfa7ed7e9f3ac18440220295748e81005231135289fe3a88338dabba55afa1bdb4478691337009d82b68d01",
+        "5121038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508410479be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b852ae",
+        0.00000001
+    ],
+    "0x22 0x002008a6665ebfd43b02323423e764e185d98d1587f903b81507dbb69bfc41005efa",
+    "HASH160 0x14 0x6f5ecd4b83b77f3c438f5214eff96454934fc5d1 EQUAL",
+    "P2SH,WITNESS,WITNESS_PUBKEYTYPE",
+    "WITNESS_PUBKEYTYPE",
+    "P2SH(P2WSH) CHECKMULTISIG with first key uncompressed and signing with the second key"
+],
+[
+    [
+        "",
+        "3044022046f5367a261fd8f8d7de6eb390491344f8ec2501638fb9a1095a0599a21d3f4c02205c1b3b51d20091c5f1020841bbca87b44ebe25405c64e4acf758f2eae8665f8401",
+        "5141048282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f5150811f8a8098557dfe45e8256e830b60ace62d613ac2f7b17bed31b6eaff6e26caf210279be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f8179852ae",
+        0.00000001
+    ],
+    "",
+    "0 0x20 0x230828ed48871f0f362ce9432aa52f620f442cc8d9ce7a8b5e798365595a38bb",
+    "P2SH,WITNESS",
+    "OK",
+    "P2WSH CHECKMULTISIG with second key uncompressed and signing with the first key"
+],
+[
+    [
+        "",
+        "3044022053e210e4fb1881e6092fd75c3efc5163105599e246ded661c0ee2b5682cc2d6c02203a26b7ada8682a095b84c6d1b881637000b47d761fc837c4cee33555296d63f101",
+        "5141048282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f5150811f8a8098557dfe45e8256e830b60ace62d613ac2f7b17bed31b6eaff6e26caf210279be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f8179852ae",
+        0.00000001
+    ],
+    "0x22 0x0020230828ed48871f0f362ce9432aa52f620f442cc8d9ce7a8b5e798365595a38bb",
+    "HASH160 0x14 0x3478e7019ce61a68148f87549579b704cbe4c393 EQUAL",
+    "P2SH,WITNESS",
+    "OK",
+    "P2SH(P2WSH) CHECKMULTISIG second key uncompressed and signing with the first key"
+],
+[
+    [
+        "",
+        "3044022046f5367a261fd8f8d7de6eb390491344f8ec2501638fb9a1095a0599a21d3f4c02205c1b3b51d20091c5f1020841bbca87b44ebe25405c64e4acf758f2eae8665f8401",
+        "5141048282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f5150811f8a8098557dfe45e8256e830b60ace62d613ac2f7b17bed31b6eaff6e26caf210279be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f8179852ae",
+        0.00000001
+    ],
+    "",
+    "0 0x20 0x230828ed48871f0f362ce9432aa52f620f442cc8d9ce7a8b5e798365595a38bb",
+    "P2SH,WITNESS,WITNESS_PUBKEYTYPE",
+    "OK",
+    "P2WSH CHECKMULTISIG with second key uncompressed and signing with the first key should pass as the uncompressed key is not used"
+],
+[
+    [
+        "",
+        "3044022053e210e4fb1881e6092fd75c3efc5163105599e246ded661c0ee2b5682cc2d6c02203a26b7ada8682a095b84c6d1b881637000b47d761fc837c4cee33555296d63f101",
+        "5141048282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f5150811f8a8098557dfe45e8256e830b60ace62d613ac2f7b17bed31b6eaff6e26caf210279be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f8179852ae",
+        0.00000001
+    ],
+    "0x22 0x0020230828ed48871f0f362ce9432aa52f620f442cc8d9ce7a8b5e798365595a38bb",
+    "HASH160 0x14 0x3478e7019ce61a68148f87549579b704cbe4c393 EQUAL",
+    "P2SH,WITNESS,WITNESS_PUBKEYTYPE",
+    "OK",
+    "P2SH(P2WSH) CHECKMULTISIG with second key uncompressed and signing with the first key should pass as the uncompressed key is not used"
+],
+[
+    [
+        "",
+        "304402206c6d9f5daf85b54af2a93ec38b15ab27f205dbf5c735365ff12451e43613d1f40220736a44be63423ed5ebf53491618b7cc3d8a5093861908da853739c73717938b701",
+        "5141048282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f5150811f8a8098557dfe45e8256e830b60ace62d613ac2f7b17bed31b6eaff6e26caf210279be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f8179852ae",
+        0.00000001
+    ],
+    "",
+    "0 0x20 0x230828ed48871f0f362ce9432aa52f620f442cc8d9ce7a8b5e798365595a38bb",
+    "P2SH,WITNESS",
+    "OK",
+    "P2WSH CHECKMULTISIG with second key uncompressed and signing with the second key"
+],
+[
+    [
+        "",
+        "30440220687871bc6144012d75baf585bb26ce13997f7d8c626f4d8825b069c3b2d064470220108936fe1c57327764782253e99090b09c203ec400ed35ce9e026ce2ecf842a001",
+        "5141048282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f5150811f8a8098557dfe45e8256e830b60ace62d613ac2f7b17bed31b6eaff6e26caf210279be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f8179852ae",
+        0.00000001
+    ],
+    "0x22 0x0020230828ed48871f0f362ce9432aa52f620f442cc8d9ce7a8b5e798365595a38bb",
+    "HASH160 0x14 0x3478e7019ce61a68148f87549579b704cbe4c393 EQUAL",
+    "P2SH,WITNESS",
+    "OK",
+    "P2SH(P2WSH) CHECKMULTISIG with second key uncompressed and signing with the second key"
+],
+[
+    [
+        "",
+        "304402206c6d9f5daf85b54af2a93ec38b15ab27f205dbf5c735365ff12451e43613d1f40220736a44be63423ed5ebf53491618b7cc3d8a5093861908da853739c73717938b701",
+        "5141048282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f5150811f8a8098557dfe45e8256e830b60ace62d613ac2f7b17bed31b6eaff6e26caf210279be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f8179852ae",
+        0.00000001
+    ],
+    "",
+    "0 0x20 0x230828ed48871f0f362ce9432aa52f620f442cc8d9ce7a8b5e798365595a38bb",
+    "P2SH,WITNESS,WITNESS_PUBKEYTYPE",
+    "WITNESS_PUBKEYTYPE",
+    "P2WSH CHECKMULTISIG with second key uncompressed and signing with the second key"
+],
+[
+    [
+        "",
+        "30440220687871bc6144012d75baf585bb26ce13997f7d8c626f4d8825b069c3b2d064470220108936fe1c57327764782253e99090b09c203ec400ed35ce9e026ce2ecf842a001",
+        "5141048282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f5150811f8a8098557dfe45e8256e830b60ace62d613ac2f7b17bed31b6eaff6e26caf210279be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f8179852ae",
+        0.00000001
+    ],
+    "0x22 0x0020230828ed48871f0f362ce9432aa52f620f442cc8d9ce7a8b5e798365595a38bb",
+    "HASH160 0x14 0x3478e7019ce61a68148f87549579b704cbe4c393 EQUAL",
+    "P2SH,WITNESS,WITNESS_PUBKEYTYPE",
+    "WITNESS_PUBKEYTYPE",
+    "P2SH(P2WSH) CHECKMULTISIG with second key uncompressed and signing with the second key"
+],
+
+["CHECKSEQUENCEVERIFY tests"],
 ["", "CHECKSEQUENCEVERIFY", "CHECKSEQUENCEVERIFY", "INVALID_STACK_OPERATION", "CSV automatically fails on a 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"],
diff --git a/src/test/script_tests.cpp b/src/test/script_tests.cpp
index 7da95488afc43..561adb8ea2252 100644
--- a/src/test/script_tests.cpp
+++ b/src/test/script_tests.cpp
@@ -826,6 +826,99 @@ BOOST_AUTO_TEST_CASE(script_build)
                                 "P2PK with witness", SCRIPT_VERIFY_WITNESS | SCRIPT_VERIFY_P2SH
                                ).PushSig(keys.key0).Push("0").AsWit().ScriptError(SCRIPT_ERR_WITNESS_UNEXPECTED));
 
+    // Compressed keys should pass SCRIPT_VERIFY_WITNESS_PUBKEYTYPE
+    tests.push_back(TestBuilder(CScript() << ToByteVector(keys.pubkey0C) << OP_CHECKSIG,
+                                "Basic P2WSH with compressed key", SCRIPT_VERIFY_WITNESS | SCRIPT_VERIFY_P2SH | SCRIPT_VERIFY_WITNESS_PUBKEYTYPE, false, WITNESS_SH,
+                                0, 1).PushWitSig(keys.key0C).PushWitRedeem());
+    tests.push_back(TestBuilder(CScript() << ToByteVector(keys.pubkey0C),
+                                "Basic P2WPKH with compressed key", SCRIPT_VERIFY_WITNESS | SCRIPT_VERIFY_P2SH | SCRIPT_VERIFY_WITNESS_PUBKEYTYPE, false, WITNESS_PKH,
+                                0, 1).PushWitSig(keys.key0C).Push(keys.pubkey0C).AsWit());
+    tests.push_back(TestBuilder(CScript() << ToByteVector(keys.pubkey0C) << OP_CHECKSIG,
+                                "Basic P2SH(P2WSH) with compressed key", SCRIPT_VERIFY_WITNESS | SCRIPT_VERIFY_P2SH | SCRIPT_VERIFY_WITNESS_PUBKEYTYPE, true, WITNESS_SH,
+                                0, 1).PushWitSig(keys.key0C).PushWitRedeem().PushRedeem());
+    tests.push_back(TestBuilder(CScript() << ToByteVector(keys.pubkey0C),
+                                "Basic P2SH(P2WPKH) with compressed key", SCRIPT_VERIFY_WITNESS | SCRIPT_VERIFY_P2SH | SCRIPT_VERIFY_WITNESS_PUBKEYTYPE, true, WITNESS_PKH,
+                                0, 1).PushWitSig(keys.key0C).Push(keys.pubkey0C).AsWit().PushRedeem());
+
+    // Testing uncompressed key in witness with SCRIPT_VERIFY_WITNESS_PUBKEYTYPE
+    tests.push_back(TestBuilder(CScript() << ToByteVector(keys.pubkey0) << OP_CHECKSIG,
+                                "Basic P2WSH", SCRIPT_VERIFY_WITNESS | SCRIPT_VERIFY_P2SH | SCRIPT_VERIFY_WITNESS_PUBKEYTYPE, false, WITNESS_SH,
+                                0, 1).PushWitSig(keys.key0).PushWitRedeem().ScriptError(SCRIPT_ERR_WITNESS_PUBKEYTYPE));
+    tests.push_back(TestBuilder(CScript() << ToByteVector(keys.pubkey0),
+                                "Basic P2WPKH", SCRIPT_VERIFY_WITNESS | SCRIPT_VERIFY_P2SH | SCRIPT_VERIFY_WITNESS_PUBKEYTYPE, false, WITNESS_PKH,
+                                0, 1).PushWitSig(keys.key0).Push(keys.pubkey0).AsWit().ScriptError(SCRIPT_ERR_WITNESS_PUBKEYTYPE));
+    tests.push_back(TestBuilder(CScript() << ToByteVector(keys.pubkey0) << OP_CHECKSIG,
+                                "Basic P2SH(P2WSH)", SCRIPT_VERIFY_WITNESS | SCRIPT_VERIFY_P2SH | SCRIPT_VERIFY_WITNESS_PUBKEYTYPE, true, WITNESS_SH,
+                                0, 1).PushWitSig(keys.key0).PushWitRedeem().PushRedeem().ScriptError(SCRIPT_ERR_WITNESS_PUBKEYTYPE));
+    tests.push_back(TestBuilder(CScript() << ToByteVector(keys.pubkey0),
+                                "Basic P2SH(P2WPKH)", SCRIPT_VERIFY_WITNESS | SCRIPT_VERIFY_P2SH | SCRIPT_VERIFY_WITNESS_PUBKEYTYPE, true, WITNESS_PKH,
+                                0, 1).PushWitSig(keys.key0).Push(keys.pubkey0).AsWit().PushRedeem().ScriptError(SCRIPT_ERR_WITNESS_PUBKEYTYPE));
+
+    // P2WSH 1-of-2 multisig with compressed keys
+    tests.push_back(TestBuilder(CScript() << OP_1 << ToByteVector(keys.pubkey1C) << ToByteVector(keys.pubkey0C) << OP_2 << OP_CHECKMULTISIG,
+                                "P2WSH CHECKMULTISIG with compressed keys", SCRIPT_VERIFY_WITNESS | SCRIPT_VERIFY_P2SH | SCRIPT_VERIFY_WITNESS_PUBKEYTYPE, false, WITNESS_SH,
+                                0, 1).Push(CScript()).AsWit().PushWitSig(keys.key0C).PushWitRedeem());
+    tests.push_back(TestBuilder(CScript() << OP_1 << ToByteVector(keys.pubkey1C) << ToByteVector(keys.pubkey0C) << OP_2 << OP_CHECKMULTISIG,
+                                "P2SH(P2WSH) CHECKMULTISIG with compressed keys", SCRIPT_VERIFY_WITNESS | SCRIPT_VERIFY_P2SH | SCRIPT_VERIFY_WITNESS_PUBKEYTYPE, true, WITNESS_SH,
+                                0, 1).Push(CScript()).AsWit().PushWitSig(keys.key0C).PushWitRedeem().PushRedeem());
+    tests.push_back(TestBuilder(CScript() << OP_1 << ToByteVector(keys.pubkey1C) << ToByteVector(keys.pubkey0C) << OP_2 << OP_CHECKMULTISIG,
+                                "P2WSH CHECKMULTISIG with compressed keys", SCRIPT_VERIFY_WITNESS | SCRIPT_VERIFY_P2SH | SCRIPT_VERIFY_WITNESS_PUBKEYTYPE, false, WITNESS_SH,
+                                0, 1).Push(CScript()).AsWit().PushWitSig(keys.key1C).PushWitRedeem());
+    tests.push_back(TestBuilder(CScript() << OP_1 << ToByteVector(keys.pubkey1C) << ToByteVector(keys.pubkey0C) << OP_2 << OP_CHECKMULTISIG,
+                                "P2SH(P2WSH) CHECKMULTISIG with compressed keys", SCRIPT_VERIFY_WITNESS | SCRIPT_VERIFY_P2SH | SCRIPT_VERIFY_WITNESS_PUBKEYTYPE, true, WITNESS_SH,
+                                0, 1).Push(CScript()).AsWit().PushWitSig(keys.key1C).PushWitRedeem().PushRedeem());
+
+    // P2WSH 1-of-2 multisig with first key uncompressed
+    tests.push_back(TestBuilder(CScript() << OP_1 << ToByteVector(keys.pubkey1C) << ToByteVector(keys.pubkey0) << OP_2 << OP_CHECKMULTISIG,
+                                "P2WSH CHECKMULTISIG with first key uncompressed and signing with the first key", SCRIPT_VERIFY_WITNESS | SCRIPT_VERIFY_P2SH, false, WITNESS_SH,
+                                0, 1).Push(CScript()).AsWit().PushWitSig(keys.key0).PushWitRedeem());
+    tests.push_back(TestBuilder(CScript() << OP_1 << ToByteVector(keys.pubkey1C) << ToByteVector(keys.pubkey0) << OP_2 << OP_CHECKMULTISIG,
+                                "P2SH(P2WSH) CHECKMULTISIG first key uncompressed and signing with the first key", SCRIPT_VERIFY_WITNESS | SCRIPT_VERIFY_P2SH, true, WITNESS_SH,
+                                0, 1).Push(CScript()).AsWit().PushWitSig(keys.key0).PushWitRedeem().PushRedeem());
+    tests.push_back(TestBuilder(CScript() << OP_1 << ToByteVector(keys.pubkey1C) << ToByteVector(keys.pubkey0) << OP_2 << OP_CHECKMULTISIG,
+                                "P2WSH CHECKMULTISIG with first key uncompressed and signing with the first key", SCRIPT_VERIFY_WITNESS | SCRIPT_VERIFY_P2SH | SCRIPT_VERIFY_WITNESS_PUBKEYTYPE, false, WITNESS_SH,
+                                0, 1).Push(CScript()).AsWit().PushWitSig(keys.key0).PushWitRedeem().ScriptError(SCRIPT_ERR_WITNESS_PUBKEYTYPE));
+    tests.push_back(TestBuilder(CScript() << OP_1 << ToByteVector(keys.pubkey1C) << ToByteVector(keys.pubkey0) << OP_2 << OP_CHECKMULTISIG,
+                                "P2SH(P2WSH) CHECKMULTISIG with first key uncompressed and signing with the first key", SCRIPT_VERIFY_WITNESS | SCRIPT_VERIFY_P2SH | SCRIPT_VERIFY_WITNESS_PUBKEYTYPE, true, WITNESS_SH,
+                                0, 1).Push(CScript()).AsWit().PushWitSig(keys.key0).PushWitRedeem().PushRedeem().ScriptError(SCRIPT_ERR_WITNESS_PUBKEYTYPE));
+    tests.push_back(TestBuilder(CScript() << OP_1 << ToByteVector(keys.pubkey1C) << ToByteVector(keys.pubkey0) << OP_2 << OP_CHECKMULTISIG,
+                                "P2WSH CHECKMULTISIG with first key uncompressed and signing with the second key", SCRIPT_VERIFY_WITNESS | SCRIPT_VERIFY_P2SH, false, WITNESS_SH,
+                                0, 1).Push(CScript()).AsWit().PushWitSig(keys.key1C).PushWitRedeem());
+    tests.push_back(TestBuilder(CScript() << OP_1 << ToByteVector(keys.pubkey1C) << ToByteVector(keys.pubkey0) << OP_2 << OP_CHECKMULTISIG,
+                                "P2SH(P2WSH) CHECKMULTISIG with first key uncompressed and signing with the second key", SCRIPT_VERIFY_WITNESS | SCRIPT_VERIFY_P2SH, true, WITNESS_SH,
+                                0, 1).Push(CScript()).AsWit().PushWitSig(keys.key1C).PushWitRedeem().PushRedeem());
+    tests.push_back(TestBuilder(CScript() << OP_1 << ToByteVector(keys.pubkey1C) << ToByteVector(keys.pubkey0) << OP_2 << OP_CHECKMULTISIG,
+                                "P2WSH CHECKMULTISIG with first key uncompressed and signing with the second key", SCRIPT_VERIFY_WITNESS | SCRIPT_VERIFY_P2SH | SCRIPT_VERIFY_WITNESS_PUBKEYTYPE, false, WITNESS_SH,
+                                0, 1).Push(CScript()).AsWit().PushWitSig(keys.key1C).PushWitRedeem().ScriptError(SCRIPT_ERR_WITNESS_PUBKEYTYPE));
+    tests.push_back(TestBuilder(CScript() << OP_1 << ToByteVector(keys.pubkey1C) << ToByteVector(keys.pubkey0) << OP_2 << OP_CHECKMULTISIG,
+                                "P2SH(P2WSH) CHECKMULTISIG with first key uncompressed and signing with the second key", SCRIPT_VERIFY_WITNESS | SCRIPT_VERIFY_P2SH | SCRIPT_VERIFY_WITNESS_PUBKEYTYPE, true, WITNESS_SH,
+                                0, 1).Push(CScript()).AsWit().PushWitSig(keys.key1C).PushWitRedeem().PushRedeem().ScriptError(SCRIPT_ERR_WITNESS_PUBKEYTYPE));
+    // P2WSH 1-of-2 multisig with second key uncompressed
+    tests.push_back(TestBuilder(CScript() << OP_1 << ToByteVector(keys.pubkey1) << ToByteVector(keys.pubkey0C) << OP_2 << OP_CHECKMULTISIG,
+                                "P2WSH CHECKMULTISIG with second key uncompressed and signing with the first key", SCRIPT_VERIFY_WITNESS | SCRIPT_VERIFY_P2SH, false, WITNESS_SH,
+                                0, 1).Push(CScript()).AsWit().PushWitSig(keys.key0C).PushWitRedeem());
+    tests.push_back(TestBuilder(CScript() << OP_1 << ToByteVector(keys.pubkey1) << ToByteVector(keys.pubkey0C) << OP_2 << OP_CHECKMULTISIG,
+                                "P2SH(P2WSH) CHECKMULTISIG second key uncompressed and signing with the first key", SCRIPT_VERIFY_WITNESS | SCRIPT_VERIFY_P2SH, true, WITNESS_SH,
+                                0, 1).Push(CScript()).AsWit().PushWitSig(keys.key0C).PushWitRedeem().PushRedeem());
+    tests.push_back(TestBuilder(CScript() << OP_1 << ToByteVector(keys.pubkey1) << ToByteVector(keys.pubkey0C) << OP_2 << OP_CHECKMULTISIG,
+                                "P2WSH CHECKMULTISIG with second key uncompressed and signing with the first key should pass as the uncompressed key is not used", SCRIPT_VERIFY_WITNESS | SCRIPT_VERIFY_P2SH | SCRIPT_VERIFY_WITNESS_PUBKEYTYPE, false, WITNESS_SH,
+                                0, 1).Push(CScript()).AsWit().PushWitSig(keys.key0C).PushWitRedeem());
+    tests.push_back(TestBuilder(CScript() << OP_1 << ToByteVector(keys.pubkey1) << ToByteVector(keys.pubkey0C) << OP_2 << OP_CHECKMULTISIG,
+                                "P2SH(P2WSH) CHECKMULTISIG with second key uncompressed and signing with the first key should pass as the uncompressed key is not used", SCRIPT_VERIFY_WITNESS | SCRIPT_VERIFY_P2SH | SCRIPT_VERIFY_WITNESS_PUBKEYTYPE, true, WITNESS_SH,
+                                0, 1).Push(CScript()).AsWit().PushWitSig(keys.key0C).PushWitRedeem().PushRedeem());
+    tests.push_back(TestBuilder(CScript() << OP_1 << ToByteVector(keys.pubkey1) << ToByteVector(keys.pubkey0C) << OP_2 << OP_CHECKMULTISIG,
+                                "P2WSH CHECKMULTISIG with second key uncompressed and signing with the second key", SCRIPT_VERIFY_WITNESS | SCRIPT_VERIFY_P2SH, false, WITNESS_SH,
+                                0, 1).Push(CScript()).AsWit().PushWitSig(keys.key1).PushWitRedeem());
+    tests.push_back(TestBuilder(CScript() << OP_1 << ToByteVector(keys.pubkey1) << ToByteVector(keys.pubkey0C) << OP_2 << OP_CHECKMULTISIG,
+                                "P2SH(P2WSH) CHECKMULTISIG with second key uncompressed and signing with the second key", SCRIPT_VERIFY_WITNESS | SCRIPT_VERIFY_P2SH, true, WITNESS_SH,
+                                0, 1).Push(CScript()).AsWit().PushWitSig(keys.key1).PushWitRedeem().PushRedeem());
+    tests.push_back(TestBuilder(CScript() << OP_1 << ToByteVector(keys.pubkey1) << ToByteVector(keys.pubkey0C) << OP_2 << OP_CHECKMULTISIG,
+                                "P2WSH CHECKMULTISIG with second key uncompressed and signing with the second key", SCRIPT_VERIFY_WITNESS | SCRIPT_VERIFY_P2SH | SCRIPT_VERIFY_WITNESS_PUBKEYTYPE, false, WITNESS_SH,
+                                0, 1).Push(CScript()).AsWit().PushWitSig(keys.key1).PushWitRedeem().ScriptError(SCRIPT_ERR_WITNESS_PUBKEYTYPE));
+    tests.push_back(TestBuilder(CScript() << OP_1 << ToByteVector(keys.pubkey1) << ToByteVector(keys.pubkey0C) << OP_2 << OP_CHECKMULTISIG,
+                                "P2SH(P2WSH) CHECKMULTISIG with second key uncompressed and signing with the second key", SCRIPT_VERIFY_WITNESS | SCRIPT_VERIFY_P2SH | SCRIPT_VERIFY_WITNESS_PUBKEYTYPE, true, WITNESS_SH,
+                                0, 1).Push(CScript()).AsWit().PushWitSig(keys.key1).PushWitRedeem().PushRedeem().ScriptError(SCRIPT_ERR_WITNESS_PUBKEYTYPE));
+
     std::set<std::string> tests_set;
 
     {

From 67d6ee1e3679504f46473fe0818970565ff3b137 Mon Sep 17 00:00:00 2001
From: Johnson Lau <jl2012@xbt.hk>
Date: Mon, 17 Oct 2016 03:18:36 +0800
Subject: [PATCH 1027/1802] remove redundant tests in p2p-segwit.py

---
 qa/rpc-tests/p2p-segwit.py | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/qa/rpc-tests/p2p-segwit.py b/qa/rpc-tests/p2p-segwit.py
index fa505d60c9b66..09ab1b80fcbb2 100755
--- a/qa/rpc-tests/p2p-segwit.py
+++ b/qa/rpc-tests/p2p-segwit.py
@@ -1872,16 +1872,11 @@ def test_non_standard_witness(self):
 
         # Stack element size over 80 bytes is non-standard
         p2wsh_txs[1].wit.vtxinwit[0].scriptWitness.stack = [pad * 81] * 100 + [scripts[1]]
-        # It can't be used to blind a node to the transaction
-        self.std_node.announce_tx_and_wait_for_getdata(p2wsh_txs[1])
-        self.std_node.test_transaction_acceptance(p2wsh_txs[1], True, False, b'bad-witness-nonstandard')
-        self.std_node.announce_tx_and_wait_for_getdata(p2wsh_txs[1])
         self.std_node.test_transaction_acceptance(p2wsh_txs[1], True, False, b'bad-witness-nonstandard')
         # Non-standard nodes should accept
         self.test_node.test_transaction_acceptance(p2wsh_txs[1], True, True)
         # Standard nodes should accept if element size is not over 80 bytes
         p2wsh_txs[1].wit.vtxinwit[0].scriptWitness.stack = [pad * 80] * 100 + [scripts[1]]
-        self.std_node.announce_tx_and_wait_for_getdata(p2wsh_txs[1])
         self.std_node.test_transaction_acceptance(p2wsh_txs[1], True, True)
 
         # witnessScript size at 3600 bytes is standard
@@ -1900,13 +1895,9 @@ def test_non_standard_witness(self):
         self.std_node.test_transaction_acceptance(p2sh_txs[0], True, False, b'bad-witness-nonstandard')
         self.test_node.test_transaction_acceptance(p2sh_txs[0], True, True)
         p2sh_txs[1].wit.vtxinwit[0].scriptWitness.stack = [pad * 81] * 100 + [scripts[1]]
-        self.std_node.announce_tx_and_wait_for_getdata(p2sh_txs[1])
-        self.std_node.test_transaction_acceptance(p2sh_txs[1], True, False, b'bad-witness-nonstandard')
-        self.std_node.announce_tx_and_wait_for_getdata(p2sh_txs[1])
         self.std_node.test_transaction_acceptance(p2sh_txs[1], True, False, b'bad-witness-nonstandard')
         self.test_node.test_transaction_acceptance(p2sh_txs[1], True, True)
         p2sh_txs[1].wit.vtxinwit[0].scriptWitness.stack = [pad * 80] * 100 + [scripts[1]]
-        self.std_node.announce_tx_and_wait_for_getdata(p2sh_txs[1])
         self.std_node.test_transaction_acceptance(p2sh_txs[1], True, True)
         p2sh_txs[2].wit.vtxinwit[0].scriptWitness.stack = [pad, pad, scripts[2]]
         self.test_node.test_transaction_acceptance(p2sh_txs[2], True, True)

From b0aea8057921f0ed2288cf07048f652c7d6d9cf3 Mon Sep 17 00:00:00 2001
From: BtcDrak <btcdrak@gmail.com>
Date: Fri, 26 Aug 2016 22:35:46 +0100
Subject: [PATCH 1028/1802] Sync bitcoin-tx with tx version policy

---
 src/bitcoin-tx.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bitcoin-tx.cpp b/src/bitcoin-tx.cpp
index cb863bda191f8..e09afd632e3ff 100644
--- a/src/bitcoin-tx.cpp
+++ b/src/bitcoin-tx.cpp
@@ -164,7 +164,7 @@ static void RegisterLoad(const string& strInput)
 static void MutateTxVersion(CMutableTransaction& tx, const string& cmdVal)
 {
     int64_t newVersion = atoi64(cmdVal);
-    if (newVersion < 1 || newVersion > CTransaction::CURRENT_VERSION)
+    if (newVersion < 1 || newVersion > CTransaction::MAX_STANDARD_VERSION)
         throw runtime_error("Invalid TX version requested");
 
     tx.nVersion = (int) newVersion;

From 282abd8358e254d976cad05d0eb48586db276bcd Mon Sep 17 00:00:00 2001
From: fanquake <fanquake@gmail.com>
Date: Mon, 17 Oct 2016 11:43:24 +0800
Subject: [PATCH 1029/1802] [build-aux] Boost_Base serial 27

---
 build-aux/m4/ax_boost_base.m4 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build-aux/m4/ax_boost_base.m4 b/build-aux/m4/ax_boost_base.m4
index 45d948933d18f..650c94fa64752 100644
--- a/build-aux/m4/ax_boost_base.m4
+++ b/build-aux/m4/ax_boost_base.m4
@@ -33,7 +33,7 @@
 #   and this notice are preserved. This file is offered as-is, without any
 #   warranty.
 
-#serial 26
+#serial 27
 
 AC_DEFUN([AX_BOOST_BASE],
 [
@@ -96,7 +96,7 @@ if test "x$want_boost" = "xyes"; then
         libsubdirs="lib64 libx32 lib lib64"
         ;;
       ppc64|s390x|sparc64|aarch64|ppc64le)
-        libsubdirs="lib64 lib lib64 ppc64le"
+        libsubdirs="lib64 lib lib64"
         ;;
     esac
 

From 6dd37237222f7102e223ece948150cb5c5087e3c Mon Sep 17 00:00:00 2001
From: fanquake <fanquake@gmail.com>
Date: Mon, 17 Oct 2016 11:43:59 +0800
Subject: [PATCH 1030/1802] Set minimum required Boost to 1.47.0

---
 configure.ac | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 9ce10b745497c..705327e816d94 100644
--- a/configure.ac
+++ b/configure.ac
@@ -589,8 +589,11 @@ fi
 
 if test x$use_boost = xyes; then
 
+dnl Minimum required Boost version
+define(MINIMUM_REQUIRED_BOOST, 1.47.0)
+
 dnl Check for boost libs
-AX_BOOST_BASE
+AX_BOOST_BASE([MINIMUM_REQUIRED_BOOST])
 AX_BOOST_SYSTEM
 AX_BOOST_FILESYSTEM
 AX_BOOST_PROGRAM_OPTIONS

From 7c1716f65d1bfe5e98eec487d3484010305ab334 Mon Sep 17 00:00:00 2001
From: poole_party <james@esixteen.co>
Date: Mon, 17 Oct 2016 00:08:33 -0400
Subject: [PATCH 1031/1802] Documentation for Building on Windows with WSL

The new Windows Subsystem for Linux (WSL) allows a user to run a bash shell directly on Windows in an Ubuntu based environment.  This can be used to cross-compile Bitcoin directly on Windows without the need for a separate Linux VM or Server.  The instructions included in this commit explain how to configure the environment and build Bitcoin Core using this new feature.
---
 doc/build-windows.md | 39 +++++++++++++++++++++++++++++++++++----
 1 file changed, 35 insertions(+), 4 deletions(-)

diff --git a/doc/build-windows.md b/doc/build-windows.md
index ec5f26c88b0df..044356830a6ba 100644
--- a/doc/build-windows.md
+++ b/doc/build-windows.md
@@ -1,13 +1,45 @@
 WINDOWS BUILD NOTES
 ====================
 
-Some notes on how to build Bitcoin Core for Windows.
+Below are some notes on how to build Bitcoin Core for Windows.
 
 Most developers use cross-compilation from Ubuntu to build executables for
 Windows. This is also used to build the release binaries.
 
-Building on Windows itself is possible (for example using msys / mingw-w64),
-but no one documented the steps to do this. If you are doing this, please contribute them.
+While there are potentially a number of ways to build on Windows (for example using msys / mingw-w64),
+using the Windows Subsystem For Linux is the most straight forward.  If you are building with
+an alternative method, please contribute the instructions here for others who are running versions
+of Windows that are not compatible with the Windows Subsystem for Linux.
+
+Compiling with the Windows Subsystem For Linux
+-------------------
+
+With Windows 10, Microsoft has released a new feature named the
+[Windows Subsystem for Linux](https://msdn.microsoft.com/commandline/wsl/about).  This feature allows you to run a bash shell directly on Windows in an Ubuntu based
+environment.  Within this environment you can cross compile for Windows without the need for a separate Linux VM or Server.
+
+This feature is not supported in versions of Windows prior to Windows 10 or on Windows Server SKUs.
+
+To get the bash shell, you must first activate the feature in Windows.
+
+1. Turn on Developer Mode
+  * Open Settings -> Update and Security -> For developers
+  * Select the Developer Mode radio button
+  * Restart if necessary
+2. Enable the Windows Subsystem for Linux feature
+  * From Start, search for "Turn Windows features on or off" (type 'turn')
+  * Select Windows Subsystem for Linux (beta)
+  * Click OK
+  * Restart if necessary
+3. Complete Installation
+  * Open a cmd prompt and type "bash"
+  * Accept the license
+  * Create a new UNIX user account (this is a separate account from your Windows account)
+
+After the bash shell is active, you can follow the instructions below for Windows 64-bit Cross-compilation.
+When building dependencies within the 'depends' folder, you may encounter an error building
+the protobuf dependency.  If this occurs, re-run the command with sudo.  This is likely
+a bug with the Windows Subsystem for Linux feature and may be fixed with a future update.
 
 Cross-compilation
 -------------------
@@ -41,4 +73,3 @@ To build executables for Windows 64-bit:
     make
 
 For further documentation on the depends system see [README.md](../depends/README.md) in the depends directory.
-

From 5eaaa83ac1f5eb525f93e2808fafd73f5ed97013 Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Thu, 13 Oct 2016 16:19:20 +0200
Subject: [PATCH 1032/1802] Kill insecure_random and associated global state

There are only a few uses of `insecure_random` outside the tests.
This PR replaces uses of insecure_random (and its accompanying global
state) in the core code with an FastRandomContext that is automatically
seeded on creation.

This is meant to be used for inner loops. The FastRandomContext
can be in the outer scope, or the class itself, then rand32() is used
inside the loop. Useful e.g. for pushing addresses in CNode or the fee
rounding, or randomization for coin selection.

As a context is created per purpose, thus it gets rid of
cross-thread unprotected shared usage of a single set of globals, this
should also get rid of the potential race conditions.

- I'd say TxMempool::check is not called enough to warrant using a special
  fast random context, this is switched to GetRand() (open for
  discussion...)

- The use of `insecure_rand` in ConnectThroughProxy has been replaced by
  an atomic integer counter. The only goal here is to have a different
  credentials pair for each connection to go on a different Tor circuit,
  it does not need to be random nor unpredictable.

- To avoid having a FastRandomContext on every CNode, the context is
  passed into PushAddress as appropriate.

There remains an insecure_random for test usage in `test_random.h`.
---
 src/addrman.cpp                  |  8 ++++----
 src/addrman.h                    |  3 +++
 src/main.cpp                     | 15 ++++++++------
 src/net.cpp                      |  3 ++-
 src/net.h                        |  4 ++--
 src/netbase.cpp                  |  4 ++--
 src/policy/fees.cpp              |  2 +-
 src/policy/fees.h                |  2 ++
 src/random.cpp                   | 11 +++++-----
 src/random.h                     | 35 +++++++++++++++-----------------
 src/test/addrman_tests.cpp       |  2 +-
 src/test/coins_tests.cpp         |  2 +-
 src/test/crypto_tests.cpp        |  2 +-
 src/test/merkle_tests.cpp        |  2 +-
 src/test/net_tests.cpp           |  2 +-
 src/test/pmt_tests.cpp           |  2 +-
 src/test/prevector_tests.cpp     | 14 ++++++-------
 src/test/scheduler_tests.cpp     |  4 +---
 src/test/sighash_tests.cpp       |  2 +-
 src/test/skiplist_tests.cpp      |  2 +-
 src/test/test_bitcoin.cpp        |  1 +
 src/test/test_random.h           | 23 +++++++++++++++++++++
 src/test/util_tests.cpp          |  2 +-
 src/test/versionbits_tests.cpp   |  2 +-
 src/txmempool.cpp                |  2 +-
 src/txmempool.h                  |  1 +
 src/wallet/test/crypto_tests.cpp |  2 +-
 src/wallet/wallet.cpp            |  4 ++--
 28 files changed, 92 insertions(+), 66 deletions(-)
 create mode 100644 src/test/test_random.h

diff --git a/src/addrman.cpp b/src/addrman.cpp
index bfb8e94575de2..20165232122be 100644
--- a/src/addrman.cpp
+++ b/src/addrman.cpp
@@ -358,8 +358,8 @@ CAddrInfo CAddrMan::Select_(bool newOnly)
             int nKBucket = RandomInt(ADDRMAN_TRIED_BUCKET_COUNT);
             int nKBucketPos = RandomInt(ADDRMAN_BUCKET_SIZE);
             while (vvTried[nKBucket][nKBucketPos] == -1) {
-                nKBucket = (nKBucket + insecure_rand()) % ADDRMAN_TRIED_BUCKET_COUNT;
-                nKBucketPos = (nKBucketPos + insecure_rand()) % ADDRMAN_BUCKET_SIZE;
+                nKBucket = (nKBucket + insecure_rand.rand32()) % ADDRMAN_TRIED_BUCKET_COUNT;
+                nKBucketPos = (nKBucketPos + insecure_rand.rand32()) % ADDRMAN_BUCKET_SIZE;
             }
             int nId = vvTried[nKBucket][nKBucketPos];
             assert(mapInfo.count(nId) == 1);
@@ -375,8 +375,8 @@ CAddrInfo CAddrMan::Select_(bool newOnly)
             int nUBucket = RandomInt(ADDRMAN_NEW_BUCKET_COUNT);
             int nUBucketPos = RandomInt(ADDRMAN_BUCKET_SIZE);
             while (vvNew[nUBucket][nUBucketPos] == -1) {
-                nUBucket = (nUBucket + insecure_rand()) % ADDRMAN_NEW_BUCKET_COUNT;
-                nUBucketPos = (nUBucketPos + insecure_rand()) % ADDRMAN_BUCKET_SIZE;
+                nUBucket = (nUBucket + insecure_rand.rand32()) % ADDRMAN_NEW_BUCKET_COUNT;
+                nUBucketPos = (nUBucketPos + insecure_rand.rand32()) % ADDRMAN_BUCKET_SIZE;
             }
             int nId = vvNew[nUBucket][nUBucketPos];
             assert(mapInfo.count(nId) == 1);
diff --git a/src/addrman.h b/src/addrman.h
index 9bab39049d7ab..e9e137c978a7e 100644
--- a/src/addrman.h
+++ b/src/addrman.h
@@ -211,6 +211,9 @@ class CAddrMan
     //! secret key to randomize bucket select with
     uint256 nKey;
 
+    //! Source of random numbers for randomization in inner loops
+    FastRandomContext insecure_rand;
+
     //! Find an entry.
     CAddrInfo* Find(const CNetAddr& addr, int *pnId = NULL);
 
diff --git a/src/main.cpp b/src/main.cpp
index c92a38be98f23..ab0dc07529c47 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -4758,6 +4758,7 @@ static void RelayAddress(const CAddress& addr, bool fReachable, CConnman& connma
     uint64_t hashAddr = addr.GetHash();
     std::multimap<uint64_t, CNode*> mapMix;
     const CSipHasher hasher = connman.GetDeterministicRandomizer(RANDOMIZER_ID_ADDRESS_RELAY).Write(hashAddr << 32).Write((GetTime() + hashAddr) / (24*60*60));
+    FastRandomContext insecure_rand;
 
     auto sortfunc = [&mapMix, &hasher](CNode* pnode) {
         if (pnode->nVersion >= CADDR_TIME_VERSION) {
@@ -4766,9 +4767,9 @@ static void RelayAddress(const CAddress& addr, bool fReachable, CConnman& connma
         }
     };
 
-    auto pushfunc = [&addr, &mapMix, &nRelayNodes] {
+    auto pushfunc = [&addr, &mapMix, &nRelayNodes, &insecure_rand] {
         for (auto mi = mapMix.begin(); mi != mapMix.end() && nRelayNodes-- > 0; ++mi)
-            mi->second->PushAddress(addr);
+            mi->second->PushAddress(addr, insecure_rand);
     };
 
     connman.ForEachNodeThen(std::move(sortfunc), std::move(pushfunc));
@@ -5078,14 +5079,15 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
             if (fListen && !IsInitialBlockDownload())
             {
                 CAddress addr = GetLocalAddress(&pfrom->addr, pfrom->GetLocalServices());
+                FastRandomContext insecure_rand;
                 if (addr.IsRoutable())
                 {
                     LogPrint("net", "ProcessMessages: advertising address %s\n", addr.ToString());
-                    pfrom->PushAddress(addr);
+                    pfrom->PushAddress(addr, insecure_rand);
                 } else if (IsPeerAddrLocalGood(pfrom)) {
                     addr.SetIP(pfrom->addrLocal);
                     LogPrint("net", "ProcessMessages: advertising address %s\n", addr.ToString());
-                    pfrom->PushAddress(addr);
+                    pfrom->PushAddress(addr, insecure_rand);
                 }
             }
 
@@ -6008,8 +6010,9 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
 
         pfrom->vAddrToSend.clear();
         vector<CAddress> vAddr = connman.GetAddresses();
+        FastRandomContext insecure_rand;
         BOOST_FOREACH(const CAddress &addr, vAddr)
-            pfrom->PushAddress(addr);
+            pfrom->PushAddress(addr, insecure_rand);
     }
 
 
@@ -6842,7 +6845,7 @@ bool SendMessages(CNode* pto, CConnman& connman)
             // until scheduled broadcast, then move the broadcast to within MAX_FEEFILTER_CHANGE_DELAY.
             else if (timeNow + MAX_FEEFILTER_CHANGE_DELAY * 1000000 < pto->nextSendTimeFeeFilter &&
                      (currentFilter < 3 * pto->lastSentFeeFilter / 4 || currentFilter > 4 * pto->lastSentFeeFilter / 3)) {
-                pto->nextSendTimeFeeFilter = timeNow + (insecure_rand() % MAX_FEEFILTER_CHANGE_DELAY) * 1000000;
+                pto->nextSendTimeFeeFilter = timeNow + GetRandInt(MAX_FEEFILTER_CHANGE_DELAY) * 1000000;
             }
         }
     }
diff --git a/src/net.cpp b/src/net.cpp
index 19dd040997ad1..643dd806dfb5c 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -187,7 +187,8 @@ void AdvertiseLocal(CNode *pnode)
         if (addrLocal.IsRoutable())
         {
             LogPrint("net", "AdvertiseLocal: advertising address %s\n", addrLocal.ToString());
-            pnode->PushAddress(addrLocal);
+            FastRandomContext insecure_rand;
+            pnode->PushAddress(addrLocal, insecure_rand);
         }
     }
 }
diff --git a/src/net.h b/src/net.h
index 67f0abe4be820..3417cb2abafb1 100644
--- a/src/net.h
+++ b/src/net.h
@@ -735,14 +735,14 @@ class CNode
         addrKnown.insert(_addr.GetKey());
     }
 
-    void PushAddress(const CAddress& _addr)
+    void PushAddress(const CAddress& _addr, FastRandomContext &insecure_rand)
     {
         // Known checking here is only to save space from duplicates.
         // SendMessages will filter it again for knowns that were added
         // after addresses were pushed.
         if (_addr.IsValid() && !addrKnown.contains(_addr.GetKey())) {
             if (vAddrToSend.size() >= MAX_ADDR_TO_SEND) {
-                vAddrToSend[insecure_rand() % vAddrToSend.size()] = _addr;
+                vAddrToSend[insecure_rand.rand32() % vAddrToSend.size()] = _addr;
             } else {
                 vAddrToSend.push_back(_addr);
             }
diff --git a/src/netbase.cpp b/src/netbase.cpp
index 7d7f1b6788984..9fe34108f57d1 100644
--- a/src/netbase.cpp
+++ b/src/netbase.cpp
@@ -596,8 +596,8 @@ static bool ConnectThroughProxy(const proxyType &proxy, const std::string& strDe
     // do socks negotiation
     if (proxy.randomize_credentials) {
         ProxyCredentials random_auth;
-        random_auth.username = strprintf("%i", insecure_rand());
-        random_auth.password = strprintf("%i", insecure_rand());
+        static std::atomic_int counter;
+        random_auth.username = random_auth.password = strprintf("%i", counter++);
         if (!Socks5(strDest, (unsigned short)port, &random_auth, hSocket))
             return false;
     } else {
diff --git a/src/policy/fees.cpp b/src/policy/fees.cpp
index 7b0e8b7d08cf7..c07cd2eff8be0 100644
--- a/src/policy/fees.cpp
+++ b/src/policy/fees.cpp
@@ -594,7 +594,7 @@ FeeFilterRounder::FeeFilterRounder(const CFeeRate& minIncrementalFee)
 CAmount FeeFilterRounder::round(CAmount currentMinFee)
 {
     std::set<double>::iterator it = feeset.lower_bound(currentMinFee);
-    if ((it != feeset.begin() && insecure_rand() % 3 != 0) || it == feeset.end()) {
+    if ((it != feeset.begin() && insecure_rand.rand32() % 3 != 0) || it == feeset.end()) {
         it--;
     }
     return *it;
diff --git a/src/policy/fees.h b/src/policy/fees.h
index 463f62f710603..2c1ac3b934a12 100644
--- a/src/policy/fees.h
+++ b/src/policy/fees.h
@@ -7,6 +7,7 @@
 
 #include "amount.h"
 #include "uint256.h"
+#include "random.h"
 
 #include <map>
 #include <string>
@@ -298,5 +299,6 @@ class FeeFilterRounder
 
 private:
     std::set<double> feeset;
+    FastRandomContext insecure_rand;
 };
 #endif /*BITCOIN_POLICYESTIMATOR_H */
diff --git a/src/random.cpp b/src/random.cpp
index d9a8cc145ea91..aa027e49c437f 100644
--- a/src/random.cpp
+++ b/src/random.cpp
@@ -178,22 +178,21 @@ uint256 GetRandHash()
     return hash;
 }
 
-uint32_t insecure_rand_Rz = 11;
-uint32_t insecure_rand_Rw = 11;
-void seed_insecure_rand(bool fDeterministic)
+FastRandomContext::FastRandomContext(bool fDeterministic)
 {
     // The seed values have some unlikely fixed points which we avoid.
     if (fDeterministic) {
-        insecure_rand_Rz = insecure_rand_Rw = 11;
+        Rz = Rw = 11;
     } else {
         uint32_t tmp;
         do {
             GetRandBytes((unsigned char*)&tmp, 4);
         } while (tmp == 0 || tmp == 0x9068ffffU);
-        insecure_rand_Rz = tmp;
+        Rz = tmp;
         do {
             GetRandBytes((unsigned char*)&tmp, 4);
         } while (tmp == 0 || tmp == 0x464fffffU);
-        insecure_rand_Rw = tmp;
+        Rw = tmp;
     }
 }
+
diff --git a/src/random.h b/src/random.h
index 31b80bd565bdc..e97d2d1fb0b54 100644
--- a/src/random.h
+++ b/src/random.h
@@ -28,25 +28,22 @@ uint256 GetRandHash();
 void GetStrongRandBytes(unsigned char* buf, int num);
 
 /**
- * Seed insecure_rand using the random pool.
- * @param Deterministic Use a deterministic seed
+ * Fast randomness source. This is seeded once with secure random data, but
+ * is completely deterministic and insecure after that.
+ * This class is not thread-safe.
  */
-void seed_insecure_rand(bool fDeterministic = false);
-
-/**
- * MWC RNG of George Marsaglia
- * This is intended to be fast. It has a period of 2^59.3, though the
- * least significant 16 bits only have a period of about 2^30.1.
- *
- * @return random value
- */
-extern uint32_t insecure_rand_Rz;
-extern uint32_t insecure_rand_Rw;
-static inline uint32_t insecure_rand(void)
-{
-    insecure_rand_Rz = 36969 * (insecure_rand_Rz & 65535) + (insecure_rand_Rz >> 16);
-    insecure_rand_Rw = 18000 * (insecure_rand_Rw & 65535) + (insecure_rand_Rw >> 16);
-    return (insecure_rand_Rw << 16) + insecure_rand_Rz;
-}
+class FastRandomContext {
+public:
+    explicit FastRandomContext(bool fDeterministic=false);
+
+    uint32_t rand32() {
+        Rz = 36969 * (Rz & 65535) + (Rz >> 16);
+        Rw = 18000 * (Rw & 65535) + (Rw >> 16);
+        return (Rw << 16) + Rz;
+    }
+
+    uint32_t Rz;
+    uint32_t Rw;
+};
 
 #endif // BITCOIN_RANDOM_H
diff --git a/src/test/addrman_tests.cpp b/src/test/addrman_tests.cpp
index 5ccaeb57bbe2f..adff09f754880 100644
--- a/src/test/addrman_tests.cpp
+++ b/src/test/addrman_tests.cpp
@@ -26,7 +26,7 @@ class CAddrManTest : public CAddrMan
     void MakeDeterministic()
     {
         nKey.SetNull();
-        seed_insecure_rand(true);
+        insecure_rand = FastRandomContext(true);
     }
 
     int RandomInt(int nMax)
diff --git a/src/test/coins_tests.cpp b/src/test/coins_tests.cpp
index e6923265592d7..b487686136aaf 100644
--- a/src/test/coins_tests.cpp
+++ b/src/test/coins_tests.cpp
@@ -3,7 +3,7 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include "coins.h"
-#include "random.h"
+#include "test_random.h"
 #include "script/standard.h"
 #include "uint256.h"
 #include "utilstrencodings.h"
diff --git a/src/test/crypto_tests.cpp b/src/test/crypto_tests.cpp
index ff0adae1d22b7..c7b4fb240c20e 100644
--- a/src/test/crypto_tests.cpp
+++ b/src/test/crypto_tests.cpp
@@ -9,7 +9,7 @@
 #include "crypto/sha512.h"
 #include "crypto/hmac_sha256.h"
 #include "crypto/hmac_sha512.h"
-#include "random.h"
+#include "test_random.h"
 #include "utilstrencodings.h"
 #include "test/test_bitcoin.h"
 
diff --git a/src/test/merkle_tests.cpp b/src/test/merkle_tests.cpp
index b40ab848dcdb4..66ca381ea7023 100644
--- a/src/test/merkle_tests.cpp
+++ b/src/test/merkle_tests.cpp
@@ -4,7 +4,7 @@
 
 #include "consensus/merkle.h"
 #include "test/test_bitcoin.h"
-#include "random.h"
+#include "test_random.h"
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/src/test/net_tests.cpp b/src/test/net_tests.cpp
index 4a7d6e778f5dc..f4b5768693bde 100644
--- a/src/test/net_tests.cpp
+++ b/src/test/net_tests.cpp
@@ -23,7 +23,7 @@ class CAddrManSerializationMock : public CAddrMan
     void MakeDeterministic()
     {
         nKey.SetNull();
-        seed_insecure_rand(true);
+        insecure_rand = FastRandomContext(true);
     }
 };
 
diff --git a/src/test/pmt_tests.cpp b/src/test/pmt_tests.cpp
index e9c8691745cc5..b7f83d38f0b84 100644
--- a/src/test/pmt_tests.cpp
+++ b/src/test/pmt_tests.cpp
@@ -9,7 +9,7 @@
 #include "uint256.h"
 #include "arith_uint256.h"
 #include "version.h"
-#include "random.h"
+#include "test_random.h"
 #include "test/test_bitcoin.h"
 
 #include <vector>
diff --git a/src/test/prevector_tests.cpp b/src/test/prevector_tests.cpp
index b8c45ca564dc9..6cad02e738627 100644
--- a/src/test/prevector_tests.cpp
+++ b/src/test/prevector_tests.cpp
@@ -4,7 +4,7 @@
 
 #include <vector>
 #include "prevector.h"
-#include "random.h"
+#include "test_random.h"
 
 #include "serialize.h"
 #include "streams.h"
@@ -27,8 +27,7 @@ class prevector_tester {
 
     typedef typename pretype::size_type Size;
     bool passed = true;
-    uint32_t insecure_rand_Rz_cache;
-    uint32_t insecure_rand_Rw_cache;
+    FastRandomContext rand_cache;
 
 
     template <typename A, typename B>
@@ -171,15 +170,14 @@ class prevector_tester {
         test();
     }
     ~prevector_tester() {
-        BOOST_CHECK_MESSAGE(passed, "insecure_rand_Rz: " 
-                << insecure_rand_Rz_cache 
+        BOOST_CHECK_MESSAGE(passed, "insecure_rand_Rz: "
+                << rand_cache.Rz
                 << ", insecure_rand_Rw: "
-                << insecure_rand_Rw_cache);
+                << rand_cache.Rw);
     }
     prevector_tester() {
         seed_insecure_rand();
-        insecure_rand_Rz_cache = insecure_rand_Rz;
-        insecure_rand_Rw_cache = insecure_rand_Rw;
+        rand_cache = insecure_rand_ctx;
     }
 };
 
diff --git a/src/test/scheduler_tests.cpp b/src/test/scheduler_tests.cpp
index aa12dfbd54f8f..891ecf501567f 100644
--- a/src/test/scheduler_tests.cpp
+++ b/src/test/scheduler_tests.cpp
@@ -42,8 +42,6 @@ static void MicroSleep(uint64_t n)
 
 BOOST_AUTO_TEST_CASE(manythreads)
 {
-    seed_insecure_rand(false);
-
     // Stress test: hundreds of microsecond-scheduled tasks,
     // serviced by 10 threads.
     //
@@ -58,7 +56,7 @@ BOOST_AUTO_TEST_CASE(manythreads)
 
     boost::mutex counterMutex[10];
     int counter[10] = { 0 };
-    boost::random::mt19937 rng(insecure_rand());
+    boost::random::mt19937 rng(42);
     boost::random::uniform_int_distribution<> zeroToNine(0, 9);
     boost::random::uniform_int_distribution<> randomMsec(-11, 1000);
     boost::random::uniform_int_distribution<> randomDelta(-1000, 1000);
diff --git a/src/test/sighash_tests.cpp b/src/test/sighash_tests.cpp
index 4a48347b702dd..0b1050d020cc5 100644
--- a/src/test/sighash_tests.cpp
+++ b/src/test/sighash_tests.cpp
@@ -6,7 +6,7 @@
 #include "data/sighash.json.h"
 #include "hash.h"
 #include "main.h" // For CheckTransaction
-#include "random.h"
+#include "test_random.h"
 #include "script/interpreter.h"
 #include "script/script.h"
 #include "serialize.h"
diff --git a/src/test/skiplist_tests.cpp b/src/test/skiplist_tests.cpp
index f14b902fe19a8..b19f8fbffb33b 100644
--- a/src/test/skiplist_tests.cpp
+++ b/src/test/skiplist_tests.cpp
@@ -3,7 +3,7 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include "chain.h"
-#include "random.h"
+#include "test_random.h"
 #include "util.h"
 #include "test/test_bitcoin.h"
 
diff --git a/src/test/test_bitcoin.cpp b/src/test/test_bitcoin.cpp
index 02843d8525ea0..27ea837fbffe1 100644
--- a/src/test/test_bitcoin.cpp
+++ b/src/test/test_bitcoin.cpp
@@ -27,6 +27,7 @@
 #include <boost/thread.hpp>
 
 std::unique_ptr<CConnman> g_connman;
+FastRandomContext insecure_rand_ctx(true);
 
 extern bool fPrintToConsole;
 extern void noui_connect();
diff --git a/src/test/test_random.h b/src/test/test_random.h
new file mode 100644
index 0000000000000..e61b92b7bce94
--- /dev/null
+++ b/src/test/test_random.h
@@ -0,0 +1,23 @@
+// Copyright (c) 2009-2010 Satoshi Nakamoto
+// Copyright (c) 2009-2014 The Bitcoin Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#ifndef BITCOIN_TEST_RANDOM_H
+#define BITCOIN_TEST_RANDOM_H
+
+#include "random.h"
+
+extern FastRandomContext insecure_rand_ctx;
+
+static inline void seed_insecure_rand(bool fDeterministic = false)
+{
+    insecure_rand_ctx = FastRandomContext(fDeterministic);
+}
+
+static inline uint32_t insecure_rand(void)
+{
+    return insecure_rand_ctx.rand32();
+}
+
+#endif
diff --git a/src/test/util_tests.cpp b/src/test/util_tests.cpp
index efd44987473c2..0f1c7ab2224b2 100644
--- a/src/test/util_tests.cpp
+++ b/src/test/util_tests.cpp
@@ -6,7 +6,7 @@
 
 #include "clientversion.h"
 #include "primitives/transaction.h"
-#include "random.h"
+#include "test_random.h"
 #include "sync.h"
 #include "utilstrencodings.h"
 #include "utilmoneystr.h"
diff --git a/src/test/versionbits_tests.cpp b/src/test/versionbits_tests.cpp
index 1f86a06a3f7f7..ffc0ff6f8ead3 100644
--- a/src/test/versionbits_tests.cpp
+++ b/src/test/versionbits_tests.cpp
@@ -3,7 +3,7 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include "chain.h"
-#include "random.h"
+#include "test_random.h"
 #include "versionbits.h"
 #include "test/test_bitcoin.h"
 #include "chainparams.h"
diff --git a/src/txmempool.cpp b/src/txmempool.cpp
index 15fa6fbca3b09..0f1c166abc416 100644
--- a/src/txmempool.cpp
+++ b/src/txmempool.cpp
@@ -647,7 +647,7 @@ void CTxMemPool::check(const CCoinsViewCache *pcoins) const
     if (nCheckFrequency == 0)
         return;
 
-    if (insecure_rand() >= nCheckFrequency)
+    if (GetRand(std::numeric_limits<uint32_t>::max()) >= nCheckFrequency)
         return;
 
     LogPrint("mempool", "Checking mempool with %u transactions and %u inputs\n", (unsigned int)mapTx.size(), (unsigned int)mapNextTx.size());
diff --git a/src/txmempool.h b/src/txmempool.h
index 941644b2b21c1..1763930ba05b1 100644
--- a/src/txmempool.h
+++ b/src/txmempool.h
@@ -15,6 +15,7 @@
 #include "indirectmap.h"
 #include "primitives/transaction.h"
 #include "sync.h"
+#include "random.h"
 
 #undef foreach
 #include "boost/multi_index_container.hpp"
diff --git a/src/wallet/test/crypto_tests.cpp b/src/wallet/test/crypto_tests.cpp
index 05387f5f2b5e6..c5f55ef5f0dac 100644
--- a/src/wallet/test/crypto_tests.cpp
+++ b/src/wallet/test/crypto_tests.cpp
@@ -2,7 +2,7 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include "random.h"
+#include "test/test_random.h"
 #include "utilstrencodings.h"
 #include "test/test_bitcoin.h"
 #include "wallet/crypter.h"
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index a1f69dd94dd6c..687d84e77a46f 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -1907,7 +1907,7 @@ static void ApproximateBestSubset(vector<pair<CAmount, pair<const CWalletTx*,uns
     vfBest.assign(vValue.size(), true);
     nBest = nTotalLower;
 
-    seed_insecure_rand();
+    FastRandomContext insecure_rand;
 
     for (int nRep = 0; nRep < iterations && nBest != nTargetValue; nRep++)
     {
@@ -1924,7 +1924,7 @@ static void ApproximateBestSubset(vector<pair<CAmount, pair<const CWalletTx*,uns
                 //that the rng is fast. We do not use a constant random sequence,
                 //because there may be some privacy improvement by making
                 //the selection random.
-                if (nPass == 0 ? insecure_rand()&1 : !vfIncluded[i])
+                if (nPass == 0 ? insecure_rand.rand32()&1 : !vfIncluded[i])
                 {
                     nTotal += vValue[i].first;
                     vfIncluded[i] = true;

From f9c23dea976465c51b9fe2cead81b707678c16bb Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Mon, 17 Oct 2016 13:24:37 +0200
Subject: [PATCH 1033/1802] Define start and end time for segwit deployment

---
 src/chainparams.cpp    | 8 ++++----
 src/consensus/params.h | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/chainparams.cpp b/src/chainparams.cpp
index e6be1b5d5b716..25ec94b75710a 100644
--- a/src/chainparams.cpp
+++ b/src/chainparams.cpp
@@ -91,10 +91,10 @@ class CMainParams : public CChainParams {
         consensus.vDeployments[Consensus::DEPLOYMENT_CSV].nStartTime = 1462060800; // May 1st, 2016
         consensus.vDeployments[Consensus::DEPLOYMENT_CSV].nTimeout = 1493596800; // May 1st, 2017
 
-        // Deployment of SegWit (BIP141 and BIP143)
+        // Deployment of SegWit (BIP141, BIP143, and BIP147)
         consensus.vDeployments[Consensus::DEPLOYMENT_SEGWIT].bit = 1;
-        consensus.vDeployments[Consensus::DEPLOYMENT_SEGWIT].nStartTime = 0;
-        consensus.vDeployments[Consensus::DEPLOYMENT_SEGWIT].nTimeout = 0; // Never / undefined
+        consensus.vDeployments[Consensus::DEPLOYMENT_SEGWIT].nStartTime = 1479168000; // November 15th, 2016.
+        consensus.vDeployments[Consensus::DEPLOYMENT_SEGWIT].nTimeout = 1510704000; // November 15th, 2017.
 
         /**
          * The message start string is designed to be unlikely to occur in normal data.
@@ -186,7 +186,7 @@ class CTestNetParams : public CChainParams {
         consensus.vDeployments[Consensus::DEPLOYMENT_CSV].nStartTime = 1456790400; // March 1st, 2016
         consensus.vDeployments[Consensus::DEPLOYMENT_CSV].nTimeout = 1493596800; // May 1st, 2017
 
-        // Deployment of SegWit (BIP141 and BIP143)
+        // Deployment of SegWit (BIP141, BIP143, and BIP147)
         consensus.vDeployments[Consensus::DEPLOYMENT_SEGWIT].bit = 1;
         consensus.vDeployments[Consensus::DEPLOYMENT_SEGWIT].nStartTime = 1462060800; // May 1st 2016
         consensus.vDeployments[Consensus::DEPLOYMENT_SEGWIT].nTimeout = 1493596800; // May 1st 2017
diff --git a/src/consensus/params.h b/src/consensus/params.h
index 5b2f49184fc3f..0e73cace83171 100644
--- a/src/consensus/params.h
+++ b/src/consensus/params.h
@@ -16,7 +16,7 @@ enum DeploymentPos
 {
     DEPLOYMENT_TESTDUMMY,
     DEPLOYMENT_CSV, // Deployment of BIP68, BIP112, and BIP113.
-    DEPLOYMENT_SEGWIT, // Deployment of BIP141 and BIP143
+    DEPLOYMENT_SEGWIT, // Deployment of BIP141, BIP143, and BIP147.
     // NOTE: Also add new deployments to VersionBitsDeploymentInfo in versionbits.cpp
     MAX_VERSION_BITS_DEPLOYMENTS
 };

From 02a337defdd854efc78ecba6d1fb19cb1c075f16 Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Tue, 21 Jun 2016 13:08:29 -0700
Subject: [PATCH 1034/1802] Dont remove a "preferred" cmpctblock peer if they
 provide a block

---
 src/main.cpp | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index ad4c3fce6866c..e27fb1fae6a50 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -485,9 +485,13 @@ void MaybeSetPeerAsAnnouncingHeaderAndIDs(const CNodeState* nodestate, CNode* pf
         return;
     }
     if (nodestate->fProvidesHeaderAndIDs) {
-        BOOST_FOREACH(const NodeId nodeid, lNodesAnnouncingHeaderAndIDs)
-            if (nodeid == pfrom->GetId())
+        for (std::list<NodeId>::iterator it = lNodesAnnouncingHeaderAndIDs.begin(); it != lNodesAnnouncingHeaderAndIDs.end(); it++) {
+            if (*it == pfrom->GetId()) {
+                lNodesAnnouncingHeaderAndIDs.erase(it);
+                lNodesAnnouncingHeaderAndIDs.push_back(pfrom->GetId());
                 return;
+            }
+        }
         bool fAnnounceUsingCMPCTBLOCK = false;
         uint64_t nCMPCTBLOCKVersion = (pfrom->GetLocalServices() & NODE_WITNESS) ? 2 : 1;
         if (lNodesAnnouncingHeaderAndIDs.size() >= 3) {
@@ -5731,6 +5735,12 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
                     return true;
                 }
 
+                if (!fAlreadyInFlight && mapBlocksInFlight.size() == 1 && pindex->pprev->IsValid(BLOCK_VALID_CHAIN)) {
+                    // We seem to be rather well-synced, so it appears pfrom was the first to provide us
+                    // with this block! Let's get them to announce using compact blocks in the future.
+                    MaybeSetPeerAsAnnouncingHeaderAndIDs(nodestate, pfrom, connman);
+                }
+
                 BlockTransactionsRequest req;
                 for (size_t i = 0; i < cmpctblock.BlockTxCount(); i++) {
                     if (!partialBlock.IsTxAvailable(i))

From fe998e962dc015978f104b782afb7daec3c4d4df Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Tue, 21 Jun 2016 16:28:38 -0700
Subject: [PATCH 1035/1802] More agressively filter compact block requests

Unit test adaptations by Pieter Wuille.
---
 qa/rpc-tests/p2p-compactblocks.py | 4 ++--
 src/main.cpp                      | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/qa/rpc-tests/p2p-compactblocks.py b/qa/rpc-tests/p2p-compactblocks.py
index 131654c333d4d..a24066b0773f2 100755
--- a/qa/rpc-tests/p2p-compactblocks.py
+++ b/qa/rpc-tests/p2p-compactblocks.py
@@ -591,7 +591,7 @@ def test_incorrect_blocktxn_response(self, node, test_node, version):
     def test_getblocktxn_handler(self, node, test_node, version):
         # bitcoind won't respond for blocks whose height is more than 15 blocks
         # deep.
-        MAX_GETBLOCKTXN_DEPTH = 15
+        MAX_GETBLOCKTXN_DEPTH = 10
         chain_height = node.getblockcount()
         current_height = chain_height
         while (current_height >= chain_height - MAX_GETBLOCKTXN_DEPTH):
@@ -632,7 +632,7 @@ def test_getblocktxn_handler(self, node, test_node, version):
 
     def test_compactblocks_not_at_tip(self, node, test_node):
         # Test that requesting old compactblocks doesn't work.
-        MAX_CMPCTBLOCK_DEPTH = 11
+        MAX_CMPCTBLOCK_DEPTH = 6
         new_blocks = []
         for i in range(MAX_CMPCTBLOCK_DEPTH):
             test_node.clear_block_announcement()
diff --git a/src/main.cpp b/src/main.cpp
index e27fb1fae6a50..0002a1c08ff3d 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -4878,7 +4878,7 @@ void static ProcessGetData(CNode* pfrom, const Consensus::Params& consensusParam
                         // and we don't feel like constructing the object for them, so
                         // instead we respond with the full, non-compact block.
                         bool fPeerWantsWitness = State(pfrom->GetId())->fWantsCmpctWitness;
-                        if (mi->second->nHeight >= chainActive.Height() - 10) {
+                        if (CanDirectFetch(Params().GetConsensus()) && mi->second->nHeight >= chainActive.Height() - 5) {
                             CBlockHeaderAndShortTxIDs cmpctblock(block, fPeerWantsWitness);
                             pfrom->PushMessageWithFlag(fPeerWantsWitness ? 0 : SERIALIZE_TRANSACTION_NO_WITNESS, NetMsgType::CMPCTBLOCK, cmpctblock);
                         } else
@@ -5405,8 +5405,8 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
             return true;
         }
 
-        if (it->second->nHeight < chainActive.Height() - 15) {
-            LogPrint("net", "Peer %d sent us a getblocktxn for a block > 15 deep", pfrom->id);
+        if (it->second->nHeight < chainActive.Height() - 10) {
+            LogPrint("net", "Peer %d sent us a getblocktxn for a block > 10 deep", pfrom->id);
             return true;
         }
 

From b2e93a343ec2dc7d255b970e6ee45e9c390f7ed0 Mon Sep 17 00:00:00 2001
From: instagibbs <gsanders87@gmail.com>
Date: Wed, 22 Jun 2016 08:18:22 -0400
Subject: [PATCH 1036/1802] Add cmpctblock to debug help list

---
 src/init.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/init.cpp b/src/init.cpp
index eefef7ba0b253..685188c458462 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -423,7 +423,7 @@ std::string HelpMessage(HelpMessageMode mode)
         strUsage += HelpMessageOpt("-limitdescendantsize=<n>", strprintf("Do not accept transactions if any ancestor would have more than <n> kilobytes of in-mempool descendants (default: %u).", DEFAULT_DESCENDANT_SIZE_LIMIT));
         strUsage += HelpMessageOpt("-bip9params=deployment:start:end", "Use given start/end times for specified BIP9 deployment (regtest-only)");
     }
-    string debugCategories = "addrman, alert, bench, coindb, db, http, libevent, lock, mempool, mempoolrej, net, proxy, prune, rand, reindex, rpc, selectcoins, tor, zmq"; // Don't translate these and qt below
+    string debugCategories = "addrman, alert, bench, cmpctblock, coindb, db, http, libevent, lock, mempool, mempoolrej, net, proxy, prune, rand, reindex, rpc, selectcoins, tor, zmq"; // Don't translate these and qt below
     if (mode == HMM_BITCOIN_QT)
         debugCategories += ", qt";
     strUsage += HelpMessageOpt("-debug=<category>", strprintf(_("Output debugging information (default: %u, supplying <category> is optional)"), 0) + ". " +

From 3ac6de0a045cc9b2047ceb19af970e7ffbf905fa Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Wed, 31 Aug 2016 17:35:59 +0200
Subject: [PATCH 1037/1802] Align constant names for maximum compact block /
 blocktxn depth

---
 qa/rpc-tests/p2p-compactblocks.py | 4 ++--
 src/main.cpp                      | 6 +++---
 src/main.h                        | 5 +++++
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/qa/rpc-tests/p2p-compactblocks.py b/qa/rpc-tests/p2p-compactblocks.py
index a24066b0773f2..6b5d477131077 100755
--- a/qa/rpc-tests/p2p-compactblocks.py
+++ b/qa/rpc-tests/p2p-compactblocks.py
@@ -632,9 +632,9 @@ def test_getblocktxn_handler(self, node, test_node, version):
 
     def test_compactblocks_not_at_tip(self, node, test_node):
         # Test that requesting old compactblocks doesn't work.
-        MAX_CMPCTBLOCK_DEPTH = 6
+        MAX_CMPCTBLOCK_DEPTH = 5
         new_blocks = []
-        for i in range(MAX_CMPCTBLOCK_DEPTH):
+        for i in range(MAX_CMPCTBLOCK_DEPTH + 1):
             test_node.clear_block_announcement()
             new_blocks.append(node.generate(1)[0])
             wait_until(test_node.received_block_announcement, timeout=30)
diff --git a/src/main.cpp b/src/main.cpp
index 0002a1c08ff3d..7e27428513830 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -4878,7 +4878,7 @@ void static ProcessGetData(CNode* pfrom, const Consensus::Params& consensusParam
                         // and we don't feel like constructing the object for them, so
                         // instead we respond with the full, non-compact block.
                         bool fPeerWantsWitness = State(pfrom->GetId())->fWantsCmpctWitness;
-                        if (CanDirectFetch(Params().GetConsensus()) && mi->second->nHeight >= chainActive.Height() - 5) {
+                        if (CanDirectFetch(consensusParams) && mi->second->nHeight >= chainActive.Height() - MAX_CMPCTBLOCK_DEPTH) {
                             CBlockHeaderAndShortTxIDs cmpctblock(block, fPeerWantsWitness);
                             pfrom->PushMessageWithFlag(fPeerWantsWitness ? 0 : SERIALIZE_TRANSACTION_NO_WITNESS, NetMsgType::CMPCTBLOCK, cmpctblock);
                         } else
@@ -5405,8 +5405,8 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
             return true;
         }
 
-        if (it->second->nHeight < chainActive.Height() - 10) {
-            LogPrint("net", "Peer %d sent us a getblocktxn for a block > 10 deep", pfrom->id);
+        if (it->second->nHeight < chainActive.Height() - MAX_BLOCKTXN_DEPTH) {
+            LogPrint("net", "Peer %d sent us a getblocktxn for a block > %i deep", pfrom->id, MAX_BLOCKTXN_DEPTH);
             return true;
         }
 
diff --git a/src/main.h b/src/main.h
index 2646d8f86b0a3..db58b274872b1 100644
--- a/src/main.h
+++ b/src/main.h
@@ -90,6 +90,11 @@ static const unsigned int BLOCK_STALLING_TIMEOUT = 2;
 /** Number of headers sent in one getheaders result. We rely on the assumption that if a peer sends
  *  less than this number, we reached its tip. Changing this value is a protocol upgrade. */
 static const unsigned int MAX_HEADERS_RESULTS = 2000;
+/** Maximum depth of blocks we're willing to serve as compact blocks to peers
+ *  when requested. For older blocks, a regular BLOCK response will be sent. */
+static const int MAX_CMPCTBLOCK_DEPTH = 5;
+/** Maximum depth of blocks we're willing to respond to GETBLOCKTXN requests for. */
+static const int MAX_BLOCKTXN_DEPTH = 10;
 /** Size of the "block download window": how far ahead of our current height do we fetch?
  *  Larger windows tolerate larger download speed differences between peer, but increase the potential
  *  degree of disordering of blocks on disk (which make reindexing and in the future perhaps pruning

From 0941f556b7f228517fcb35f8b19926dfd62f481c Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Mon, 17 Oct 2016 17:09:38 +0200
Subject: [PATCH 1038/1802] Update implemented bips for 0.13.1

---
 doc/bips.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/bips.md b/doc/bips.md
index 040439fbcb195..4f4161008916e 100644
--- a/doc/bips.md
+++ b/doc/bips.md
@@ -26,9 +26,9 @@ BIPs that are implemented by Bitcoin Core (up-to-date up to **v0.13.0**):
 * [`BIP 125`](https://github.com/bitcoin/bips/blob/master/bip-0125.mediawiki): Opt-in full replace-by-fee signaling honoured in mempool and mining as of **v0.12.0** ([PR 6871](https://github.com/bitcoin/bitcoin/pull/6871)).
 * [`BIP 130`](https://github.com/bitcoin/bips/blob/master/bip-0130.mediawiki): direct headers announcement is negotiated with peer versions `>=70012` as of **v0.12.0** ([PR 6494](https://github.com/bitcoin/bitcoin/pull/6494)).
 * [`BIP 133`](https://github.com/bitcoin/bips/blob/master/bip-0133.mediawiki): feefilter messages are respected and sent for peer versions `>=70013` as of **v0.13.0** ([PR 7542](https://github.com/bitcoin/bitcoin/pull/7542)).
-* [`BIP 141`](https://github.com/bitcoin/bips/blob/master/bip-0141.mediawiki): Segregated Witness (Consensus Layer) as of **v0.13.0** ([PR 8149](https://github.com/bitcoin/bitcoin/pull/8149)).
-* [`BIP 143`](https://github.com/bitcoin/bips/blob/master/bip-0143.mediawiki): Transaction Signature Verification for Version 0 Witness Program as of **v0.13.0** ([PR 8149](https://github.com/bitcoin/bitcoin/pull/8149)).
+* [`BIP 141`](https://github.com/bitcoin/bips/blob/master/bip-0141.mediawiki): Segregated Witness (Consensus Layer) as of **v0.13.0** ([PR 8149](https://github.com/bitcoin/bitcoin/pull/8149)), and defined for mainnet as of **v0.13.1** ([PR 8937](https://github.com/bitcoin/bitcoin/pull/8937)).
+* [`BIP 143`](https://github.com/bitcoin/bips/blob/master/bip-0143.mediawiki): Transaction Signature Verification for Version 0 Witness Program as of **v0.13.0** ([PR 8149](https://github.com/bitcoin/bitcoin/pull/8149)) and defined for mainnet as of **v0.13.1** ([PR 8937](https://github.com/bitcoin/bitcoin/pull/8937)).
 * [`BIP 144`](https://github.com/bitcoin/bips/blob/master/bip-0144.mediawiki): Segregated Witness as of **0.13.0** ([PR 8149](https://github.com/bitcoin/bitcoin/pull/8149)).
 * [`BIP 145`](https://github.com/bitcoin/bips/blob/master/bip-0145.mediawiki): getblocktemplate updates for Segregated Witness as of **v0.13.0** ([PR 8149](https://github.com/bitcoin/bitcoin/pull/8149)).
-* [`BIP 147`](https://github.com/bitcoin/bips/blob/master/bip-0147.mediawiki): NULLDUMMY softfork as of **v0.13.1** ([PR 8636](https://github.com/bitcoin/bitcoin/pull/8636)).
+* [`BIP 147`](https://github.com/bitcoin/bips/blob/master/bip-0147.mediawiki): NULLDUMMY softfork as of **v0.13.1** ([PR 8636](https://github.com/bitcoin/bitcoin/pull/8636) and [PR 8937](https://github.com/bitcoin/bitcoin/pull/8937)).
 * [`BIP 152`](https://github.com/bitcoin/bips/blob/master/bip-0152.mediawiki): Compact block transfer and related optimizations are used as of **v0.13.0** ([PR 8068](https://github.com/bitcoin/bitcoin/pull/8068)).

From 164196b7c8aecb72dd20c8681bb24b81b18aecaa Mon Sep 17 00:00:00 2001
From: matthias <s.matthew.english@gmail.com>
Date: Mon, 17 Oct 2016 17:45:36 +0200
Subject: [PATCH 1039/1802] Simple Update to File 'bitcoin-qt.desktop'

---
 contrib/debian/bitcoin-qt.desktop | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/contrib/debian/bitcoin-qt.desktop b/contrib/debian/bitcoin-qt.desktop
index 61e1aca6ad0ce..593d7584ab06d 100644
--- a/contrib/debian/bitcoin-qt.desktop
+++ b/contrib/debian/bitcoin-qt.desktop
@@ -1,7 +1,8 @@
 [Desktop Entry]
 Encoding=UTF-8
-Name=Bitcoin
-Comment=Bitcoin P2P Cryptocurrency
+Name=Bitcoin Core
+Comment=Connect to the Bitcoin P2P Network
+Comment[de]=Verbinde mit dem Bitcoin peer-to-peer Netzwerk
 Comment[fr]=Bitcoin, monnaie virtuelle cryptographique pair à pair
 Comment[tr]=Bitcoin, eşten eşe kriptografik sanal para birimi
 Exec=bitcoin-qt %u

From 504c72ad346a1b619f1fc58d0edce91ec955a67d Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Mon, 17 Oct 2016 11:25:25 -0400
Subject: [PATCH 1040/1802] Comment that most dnsseeds only support some
 service bits combos

---
 src/chainparams.cpp | 5 +++--
 src/net.cpp         | 1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/chainparams.cpp b/src/chainparams.cpp
index 25ec94b75710a..8670110b9a114 100644
--- a/src/chainparams.cpp
+++ b/src/chainparams.cpp
@@ -113,12 +113,13 @@ class CMainParams : public CChainParams {
         assert(consensus.hashGenesisBlock == uint256S("0x000000000019d6689c085ae165831e934ff763ae46a2a6c172b3f1b60a8ce26f"));
         assert(genesis.hashMerkleRoot == uint256S("0x4a5e1e4baab89f3a32518a88c31bc87f618f76673e2cc77ab2127b7afdeda33b"));
 
-        vSeeds.push_back(CDNSSeedData("bitcoin.sipa.be", "seed.bitcoin.sipa.be", true)); // Pieter Wuille
+        // Note that of those with the service bits flag, most only support a subset of possible options
+        vSeeds.push_back(CDNSSeedData("bitcoin.sipa.be", "seed.bitcoin.sipa.be", true)); // Pieter Wuille, only supports x1, x5, x9, and xd
         vSeeds.push_back(CDNSSeedData("bluematt.me", "dnsseed.bluematt.me")); // Matt Corallo
         vSeeds.push_back(CDNSSeedData("dashjr.org", "dnsseed.bitcoin.dashjr.org")); // Luke Dashjr
         vSeeds.push_back(CDNSSeedData("bitcoinstats.com", "seed.bitcoinstats.com")); // Christian Decker
         vSeeds.push_back(CDNSSeedData("xf2.org", "bitseed.xf2.org")); // Jeff Garzik
-        vSeeds.push_back(CDNSSeedData("bitcoin.jonasschnelli.ch", "seed.bitcoin.jonasschnelli.ch", true)); // Jonas Schnelli
+        vSeeds.push_back(CDNSSeedData("bitcoin.jonasschnelli.ch", "seed.bitcoin.jonasschnelli.ch", true)); // Jonas Schnelli, only supports x1, x5, x9, and xd
 
         base58Prefixes[PUBKEY_ADDRESS] = std::vector<unsigned char>(1,0);
         base58Prefixes[SCRIPT_ADDRESS] = std::vector<unsigned char>(1,5);
diff --git a/src/net.cpp b/src/net.cpp
index 19dd040997ad1..5f9942c9dc0ef 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -1454,6 +1454,7 @@ static std::string GetDNSHost(const CDNSSeedData& data, ServiceFlags* requiredSe
         return data.host;
     }
 
+    // See chainparams.cpp, most dnsseeds only support one or two possible servicebits hostnames
     return strprintf("x%x.%s", *requiredServiceBits, data.host);
 }
 

From ffb4713920205db39bfd219b6162986a52ddf32b Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Mon, 17 Oct 2016 11:25:52 -0400
Subject: [PATCH 1041/1802] Add x9 service bit support to dnsseed.bluematt.me

---
 src/chainparams.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/chainparams.cpp b/src/chainparams.cpp
index 8670110b9a114..fb7097cd4d59a 100644
--- a/src/chainparams.cpp
+++ b/src/chainparams.cpp
@@ -115,7 +115,7 @@ class CMainParams : public CChainParams {
 
         // Note that of those with the service bits flag, most only support a subset of possible options
         vSeeds.push_back(CDNSSeedData("bitcoin.sipa.be", "seed.bitcoin.sipa.be", true)); // Pieter Wuille, only supports x1, x5, x9, and xd
-        vSeeds.push_back(CDNSSeedData("bluematt.me", "dnsseed.bluematt.me")); // Matt Corallo
+        vSeeds.push_back(CDNSSeedData("bluematt.me", "dnsseed.bluematt.me", true)); // Matt Corallo, only supports x9
         vSeeds.push_back(CDNSSeedData("dashjr.org", "dnsseed.bitcoin.dashjr.org")); // Luke Dashjr
         vSeeds.push_back(CDNSSeedData("bitcoinstats.com", "seed.bitcoinstats.com")); // Christian Decker
         vSeeds.push_back(CDNSSeedData("xf2.org", "bitseed.xf2.org")); // Jeff Garzik

From 2449e12681ab549695f143d9b3ad2c24be03a78d Mon Sep 17 00:00:00 2001
From: Christian Decker <decker.christian@gmail.com>
Date: Mon, 17 Oct 2016 13:27:23 -0400
Subject: [PATCH 1042/1802] My DNS seed supports filtering

Currently supports filtering by any combination of the 4 least
significant bits.
---
 src/chainparams.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/chainparams.cpp b/src/chainparams.cpp
index fb7097cd4d59a..7279570855e44 100644
--- a/src/chainparams.cpp
+++ b/src/chainparams.cpp
@@ -117,7 +117,7 @@ class CMainParams : public CChainParams {
         vSeeds.push_back(CDNSSeedData("bitcoin.sipa.be", "seed.bitcoin.sipa.be", true)); // Pieter Wuille, only supports x1, x5, x9, and xd
         vSeeds.push_back(CDNSSeedData("bluematt.me", "dnsseed.bluematt.me", true)); // Matt Corallo, only supports x9
         vSeeds.push_back(CDNSSeedData("dashjr.org", "dnsseed.bitcoin.dashjr.org")); // Luke Dashjr
-        vSeeds.push_back(CDNSSeedData("bitcoinstats.com", "seed.bitcoinstats.com")); // Christian Decker
+        vSeeds.push_back(CDNSSeedData("bitcoinstats.com", "seed.bitcoinstats.com", true)); // Christian Decker, supports x1 - xf
         vSeeds.push_back(CDNSSeedData("xf2.org", "bitseed.xf2.org")); // Jeff Garzik
         vSeeds.push_back(CDNSSeedData("bitcoin.jonasschnelli.ch", "seed.bitcoin.jonasschnelli.ch", true)); // Jonas Schnelli, only supports x1, x5, x9, and xd
 

From 1ab21cf344ed0547de5ae679b7e479cb4b1a923b Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Mon, 17 Oct 2016 16:29:03 -0400
Subject: [PATCH 1043/1802] Remove bogus assert on number of oubound
 connections.

This value can be significantly higher if the users uses addnode
---
 src/net.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/net.cpp b/src/net.cpp
index 5f9942c9dc0ef..cdd3076a2fc79 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -1622,7 +1622,6 @@ void CConnman::ThreadOpenConnections()
                 }
             }
         }
-        assert(nOutbound <= (nMaxOutbound + nMaxFeeler));
 
         // Feeler Connections
         //

From 3f7581d9a4f9cb7dc5499fc85528e959da6b0efc Mon Sep 17 00:00:00 2001
From: Micha <Michagogo@users.noreply.github.com>
Date: Tue, 18 Oct 2016 01:07:53 +0300
Subject: [PATCH 1044/1802] [TRIVIAL] reorder Windows gitian build order to
 match Linux

The consistency is helpful for gauging Gitian build progress. Right now it's necessary to remember which platform builds in which order, which can be confusing if you're attempting to get a quick idea of how far along your builds are.
---
 contrib/gitian-descriptors/gitian-win.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contrib/gitian-descriptors/gitian-win.yml b/contrib/gitian-descriptors/gitian-win.yml
index 32b57b3160bd3..fe01b5b95726a 100644
--- a/contrib/gitian-descriptors/gitian-win.yml
+++ b/contrib/gitian-descriptors/gitian-win.yml
@@ -27,7 +27,7 @@ remotes:
 files: []
 script: |
   WRAP_DIR=$HOME/wrapped
-  HOSTS="x86_64-w64-mingw32 i686-w64-mingw32"
+  HOSTS="i686-w64-mingw32 x86_64-w64-mingw32"
   CONFIGFLAGS="--enable-reduce-exports --disable-bench --disable-gui-tests"
   FAKETIME_HOST_PROGS="g++ ar ranlib nm windres strip objcopy"
   FAKETIME_PROGS="date makensis zip"

From 9583477288072e203541b747fcffe8d50cfefb8d Mon Sep 17 00:00:00 2001
From: Gregory Maxwell <greg@xiph.org>
Date: Mon, 17 Oct 2016 23:08:52 +0000
Subject: [PATCH 1045/1802] Be more aggressive in connecting to peers with
 relevant services.

Only allow skipping relevant services until there are four outbound
 connections up.

This avoids quickly filling up with peers lacking the relevant
 services when addrman has few or none of them.
---
 src/net.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/net.cpp b/src/net.cpp
index 5f9942c9dc0ef..de8f8184a28c9 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -1675,8 +1675,8 @@ void CConnman::ThreadOpenConnections()
             if (nANow - addr.nLastTry < 600 && nTries < 30)
                 continue;
 
-            // only consider nodes missing relevant services after 40 failed attempts
-            if ((addr.nServices & nRelevantServices) != nRelevantServices && nTries < 40)
+            // only consider nodes missing relevant services after 40 failed attempts and only if less than half the outbound are up.
+            if ((addr.nServices & nRelevantServices) != nRelevantServices && (nTries < 40 || nOutbound >= (nMaxOutbound >> 1)))
                 continue;
 
             // do not allow non-default ports, unless after 50 invalid addresses selected already

From a1919adab0e72e8b465f723099788d9cc00363da Mon Sep 17 00:00:00 2001
From: R E Broadley <rebroad+github@gmail.com>
Date: Mon, 12 Sep 2016 15:54:05 +0700
Subject: [PATCH 1046/1802] Report NodeId in misbehaving debug

---
 src/main.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index f3b0e3c22eb55..1e59f80e13f59 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1846,10 +1846,10 @@ void Misbehaving(NodeId pnode, int howmuch)
     int banscore = GetArg("-banscore", DEFAULT_BANSCORE_THRESHOLD);
     if (state->nMisbehavior >= banscore && state->nMisbehavior - howmuch < banscore)
     {
-        LogPrintf("%s: %s (%d -> %d) BAN THRESHOLD EXCEEDED\n", __func__, state->name, state->nMisbehavior-howmuch, state->nMisbehavior);
+        LogPrintf("%s: %s peer=%d (%d -> %d) BAN THRESHOLD EXCEEDED\n", __func__, state->name, pnode, state->nMisbehavior-howmuch, state->nMisbehavior);
         state->fShouldBan = true;
     } else
-        LogPrintf("%s: %s (%d -> %d)\n", __func__, state->name, state->nMisbehavior-howmuch, state->nMisbehavior);
+        LogPrintf("%s: %s peer=%d (%d -> %d)\n", __func__, state->name, pnode, state->nMisbehavior-howmuch, state->nMisbehavior);
 }
 
 void static InvalidChainFound(CBlockIndex* pindexNew)

From b26a7b5377f400760f49ba3aed468469ef27786e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jorge=20Tim=C3=B3n?= <jtimon@jtimon.cc>
Date: Fri, 14 Oct 2016 00:57:18 +0200
Subject: [PATCH 1047/1802] RPC: Chainparams: Remove
 Chainparams::fTestnetToBeDeprecatedFieldRPC

---
 doc/release-notes.md | 2 ++
 src/chainparams.cpp  | 3 ---
 src/chainparams.h    | 3 ---
 src/rpc/mining.cpp   | 2 --
 src/rpc/misc.cpp     | 2 +-
 5 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/doc/release-notes.md b/doc/release-notes.md
index 58994a6839415..0463cb8a613e2 100644
--- a/doc/release-notes.md
+++ b/doc/release-notes.md
@@ -65,6 +65,8 @@ contain invalid parameters.
 
 The first boolean argument to `getaddednodeinfo` has been removed. This is an incompatible change.
 
+Call "getmininginfo" loses the "testnet" field in favor of the more generic "chain" (which has been present for years).
+
 ### Configuration and command-line options
 
 ### Block and transaction handling
diff --git a/src/chainparams.cpp b/src/chainparams.cpp
index e6be1b5d5b716..5509f11b67e14 100644
--- a/src/chainparams.cpp
+++ b/src/chainparams.cpp
@@ -132,7 +132,6 @@ class CMainParams : public CChainParams {
         fDefaultConsistencyChecks = false;
         fRequireStandard = true;
         fMineBlocksOnDemand = false;
-        fTestnetToBeDeprecatedFieldRPC = false;
 
         checkpointData = (CCheckpointData) {
             boost::assign::map_list_of
@@ -223,7 +222,6 @@ class CTestNetParams : public CChainParams {
         fDefaultConsistencyChecks = false;
         fRequireStandard = false;
         fMineBlocksOnDemand = false;
-        fTestnetToBeDeprecatedFieldRPC = true;
 
         checkpointData = (CCheckpointData) {
             boost::assign::map_list_of
@@ -285,7 +283,6 @@ class CRegTestParams : public CChainParams {
         fDefaultConsistencyChecks = true;
         fRequireStandard = false;
         fMineBlocksOnDemand = true;
-        fTestnetToBeDeprecatedFieldRPC = false;
 
         checkpointData = (CCheckpointData){
             boost::assign::map_list_of
diff --git a/src/chainparams.h b/src/chainparams.h
index 0c3820b7c6e72..633fbd51203f1 100644
--- a/src/chainparams.h
+++ b/src/chainparams.h
@@ -67,8 +67,6 @@ class CChainParams
     uint64_t PruneAfterHeight() const { return nPruneAfterHeight; }
     /** Make miner stop after a block is found. In RPC, don't return until nGenProcLimit blocks are generated */
     bool MineBlocksOnDemand() const { return fMineBlocksOnDemand; }
-    /** In the future use NetworkIDString() for RPC fields */
-    bool TestnetToBeDeprecatedFieldRPC() const { return fTestnetToBeDeprecatedFieldRPC; }
     /** Return the BIP70 network string (main, test or regtest) */
     std::string NetworkIDString() const { return strNetworkID; }
     const std::vector<CDNSSeedData>& DNSSeeds() const { return vSeeds; }
@@ -91,7 +89,6 @@ class CChainParams
     bool fDefaultConsistencyChecks;
     bool fRequireStandard;
     bool fMineBlocksOnDemand;
-    bool fTestnetToBeDeprecatedFieldRPC;
     CCheckpointData checkpointData;
 };
 
diff --git a/src/rpc/mining.cpp b/src/rpc/mining.cpp
index 6b13aa5bab02a..fa64ce8fad4b2 100644
--- a/src/rpc/mining.cpp
+++ b/src/rpc/mining.cpp
@@ -230,7 +230,6 @@ UniValue getmininginfo(const UniValue& params, bool fHelp)
             "  \"errors\": \"...\"            (string) Current errors\n"
             "  \"networkhashps\": nnn,      (numeric) The network hashes per second\n"
             "  \"pooledtx\": n              (numeric) The size of the mem pool\n"
-            "  \"testnet\": true|false      (boolean) If using testnet or not\n"
             "  \"chain\": \"xxxx\",           (string) current network name as defined in BIP70 (main, test, regtest)\n"
             "}\n"
             "\nExamples:\n"
@@ -250,7 +249,6 @@ UniValue getmininginfo(const UniValue& params, bool fHelp)
     obj.push_back(Pair("errors",           GetWarnings("statusbar")));
     obj.push_back(Pair("networkhashps",    getnetworkhashps(params, false)));
     obj.push_back(Pair("pooledtx",         (uint64_t)mempool.size()));
-    obj.push_back(Pair("testnet",          Params().TestnetToBeDeprecatedFieldRPC()));
     obj.push_back(Pair("chain",            Params().NetworkIDString()));
     return obj;
 }
diff --git a/src/rpc/misc.cpp b/src/rpc/misc.cpp
index f0b7e0a07cffa..6bbb3925ddece 100644
--- a/src/rpc/misc.cpp
+++ b/src/rpc/misc.cpp
@@ -93,7 +93,7 @@ UniValue getinfo(const UniValue& params, bool fHelp)
         obj.push_back(Pair("connections",   (int)g_connman->GetNodeCount(CConnman::CONNECTIONS_ALL)));
     obj.push_back(Pair("proxy",         (proxy.IsValid() ? proxy.proxy.ToStringIPPort() : string())));
     obj.push_back(Pair("difficulty",    (double)GetDifficulty()));
-    obj.push_back(Pair("testnet",       Params().TestnetToBeDeprecatedFieldRPC()));
+    obj.push_back(Pair("testnet",       Params().NetworkIDString() == CBaseChainParams::TESTNET));
 #ifdef ENABLE_WALLET
     if (pwalletMain) {
         obj.push_back(Pair("keypoololdest", pwalletMain->GetOldestKeyPoolTime()));

From fab5ca8fee25839b76084cabf70f3f92395112c2 Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Tue, 18 Oct 2016 15:09:32 +0200
Subject: [PATCH 1048/1802] contrib: Add README for pgp keys

---
 contrib/gitian-keys/README.md | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 contrib/gitian-keys/README.md

diff --git a/contrib/gitian-keys/README.md b/contrib/gitian-keys/README.md
new file mode 100644
index 0000000000000..439910330d14a
--- /dev/null
+++ b/contrib/gitian-keys/README.md
@@ -0,0 +1,16 @@
+PGP keys
+========
+
+This folder contains the public keys of developers and active contributors.
+
+The keys are mainly used to sign git commits or the build results of gitian
+builds.
+
+You can import the keys into gpg as follows. Also, make sure to fetch the
+latest version from the key server to see if any key was revoked in the
+meantime.
+
+```sh
+gpg --import ./*.pgp
+gpg --refresh-keys
+```

From 83c0f7fea8f40292700742f958d0bcab81560b85 Mon Sep 17 00:00:00 2001
From: mruddy <mruddy@users.noreply.github.com>
Date: Tue, 18 Oct 2016 09:58:20 -0400
Subject: [PATCH 1049/1802] trivial: update 0.13.0 release note info on linux
 arm builds

---
 doc/release-notes/release-notes-0.13.0.md | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/doc/release-notes/release-notes-0.13.0.md b/doc/release-notes/release-notes-0.13.0.md
index f9bf3d75de09d..4c3cb97df34cf 100644
--- a/doc/release-notes/release-notes-0.13.0.md
+++ b/doc/release-notes/release-notes-0.13.0.md
@@ -95,14 +95,19 @@ executables.
 
 The following extra files can be found in the download directory or torrent:
 
-- `bitcoin-${VERSION}-arm-linux-gnueabihf.tar.gz`: Linux binaries for the most
-  common 32-bit ARM architecture.
-- `bitcoin-${VERSION}-aarch64-linux-gnu.tar.gz`: Linux binaries for the most
-  common 64-bit ARM architecture.
+- `bitcoin-${VERSION}-arm-linux-gnueabihf.tar.gz`: Linux binaries targeting
+  the 32-bit ARMv7-A architecture.
+- `bitcoin-${VERSION}-aarch64-linux-gnu.tar.gz`: Linux binaries targeting
+  the 64-bit ARMv8-A architecture.
 
 ARM builds are still experimental. If you have problems on a certain device or
 Linux distribution combination please report them on the bug tracker, it may be
-possible to resolve them.
+possible to resolve them. Note that the device you use must be (backward)
+compatible with the architecture targeted by the binary that you use.
+For example, a Raspberry Pi 2 Model B or Raspberry Pi 3 Model B (in its 32-bit
+execution state) device, can run the 32-bit ARMv7-A targeted binary. However,
+no model of Raspberry Pi 1 device can run either binary because they are all
+ARMv6 architecture devices that are not compatible with ARMv7-A or ARMv8-A.
 
 Note that Android is not considered ARM Linux in this context. The executables
 are not expected to work out of the box on Android.

From 72ca7d924e3896838d2709d95f4c8cca670af8cf Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Fri, 30 Sep 2016 17:12:00 -0400
Subject: [PATCH 1050/1802] Don't hold cs_main when calling ProcessNewBlock
 from a cmpctblock

---
 src/main.cpp | 47 ++++++++++++++++++++++++++---------------------
 1 file changed, 26 insertions(+), 21 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index 9f3116e358c24..4199cb30e8397 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -5787,29 +5787,34 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
         BlockTransactions resp;
         vRecv >> resp;
 
-        LOCK(cs_main);
+        CBlock block;
+        bool fBlockRead = false;
+        {
+            LOCK(cs_main);
 
-        map<uint256, pair<NodeId, list<QueuedBlock>::iterator> >::iterator it = mapBlocksInFlight.find(resp.blockhash);
-        if (it == mapBlocksInFlight.end() || !it->second.second->partialBlock ||
-                it->second.first != pfrom->GetId()) {
-            LogPrint("net", "Peer %d sent us block transactions for block we weren't expecting\n", pfrom->id);
-            return true;
-        }
+            map<uint256, pair<NodeId, list<QueuedBlock>::iterator> >::iterator it = mapBlocksInFlight.find(resp.blockhash);
+            if (it == mapBlocksInFlight.end() || !it->second.second->partialBlock ||
+                    it->second.first != pfrom->GetId()) {
+                LogPrint("net", "Peer %d sent us block transactions for block we weren't expecting\n", pfrom->id);
+                return true;
+            }
 
-        PartiallyDownloadedBlock& partialBlock = *it->second.second->partialBlock;
-        CBlock block;
-        ReadStatus status = partialBlock.FillBlock(block, resp.txn);
-        if (status == READ_STATUS_INVALID) {
-            MarkBlockAsReceived(resp.blockhash); // Reset in-flight state in case of whitelist
-            Misbehaving(pfrom->GetId(), 100);
-            LogPrintf("Peer %d sent us invalid compact block/non-matching block transactions\n", pfrom->id);
-            return true;
-        } else if (status == READ_STATUS_FAILED) {
-            // Might have collided, fall back to getdata now :(
-            std::vector<CInv> invs;
-            invs.push_back(CInv(MSG_BLOCK | GetFetchFlags(pfrom, chainActive.Tip(), chainparams.GetConsensus()), resp.blockhash));
-            pfrom->PushMessage(NetMsgType::GETDATA, invs);
-        } else {
+            PartiallyDownloadedBlock& partialBlock = *it->second.second->partialBlock;
+            ReadStatus status = partialBlock.FillBlock(block, resp.txn);
+            if (status == READ_STATUS_INVALID) {
+                MarkBlockAsReceived(resp.blockhash); // Reset in-flight state in case of whitelist
+                Misbehaving(pfrom->GetId(), 100);
+                LogPrintf("Peer %d sent us invalid compact block/non-matching block transactions\n", pfrom->id);
+                return true;
+            } else if (status == READ_STATUS_FAILED) {
+                // Might have collided, fall back to getdata now :(
+                std::vector<CInv> invs;
+                invs.push_back(CInv(MSG_BLOCK | GetFetchFlags(pfrom, chainActive.Tip(), chainparams.GetConsensus()), resp.blockhash));
+                pfrom->PushMessage(NetMsgType::GETDATA, invs);
+            } else
+                fBlockRead = true;
+        } // Don't hold cs_main when we call into ProcessNewBlock
+        if (fBlockRead) {
             CValidationState state;
             ProcessNewBlock(state, chainparams, pfrom, &block, false, NULL, &connman);
             int nDoS;

From b55d823369b163edfe23f92983b2287441b98fa2 Mon Sep 17 00:00:00 2001
From: anduck <anduck@users.noreply.github.com>
Date: Tue, 18 Oct 2016 22:43:03 +0300
Subject: [PATCH 1051/1802] Explicitly state that PPA is for Ubuntu only

---
 doc/build-unix.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/doc/build-unix.md b/doc/build-unix.md
index 5202072f8b8e1..d2fe2f9985b4d 100644
--- a/doc/build-unix.md
+++ b/doc/build-unix.md
@@ -79,7 +79,9 @@ install necessary parts of boost:
 
         sudo apt-get install libboost-all-dev
 
-BerkeleyDB is required for the wallet. db4.8 packages are available [here](https://launchpad.net/~bitcoin/+archive/bitcoin).
+BerkeleyDB is required for the wallet.
+
+**For Ubuntu only:** db4.8 packages are available [here](https://launchpad.net/~bitcoin/+archive/bitcoin).
 You can add the repository and install using the following commands:
 
     sudo add-apt-repository ppa:bitcoin/bitcoin

From 18dacf9bd25154e184b097ee4e8f786d9be25637 Mon Sep 17 00:00:00 2001
From: Russell Yanofsky <russ@yanofsky.org>
Date: Sun, 2 Oct 2016 17:38:48 -0400
Subject: [PATCH 1052/1802] Add microbenchmarks to profile more code paths.

The new benchmarks exercise script validation, CCoinsDBView caching,
mempool eviction, and wallet coin selection code.

All of the benchmarks added here are extremely simple and don't
necessarily mirror common real world conditions or interesting
performance edge cases. Details about how specific benchmarks can be
improved are noted in comments.

Github-Issue: #7883
---
 src/Makefile.bench.include     |   6 +-
 src/bench/ccoins_caching.cpp   |  87 +++++++++++++++++++++++++
 src/bench/coin_selection.cpp   |  62 ++++++++++++++++++
 src/bench/mempool_eviction.cpp | 115 +++++++++++++++++++++++++++++++++
 src/bench/verify_script.cpp    | 103 +++++++++++++++++++++++++++++
 5 files changed, 372 insertions(+), 1 deletion(-)
 create mode 100644 src/bench/ccoins_caching.cpp
 create mode 100644 src/bench/coin_selection.cpp
 create mode 100644 src/bench/mempool_eviction.cpp
 create mode 100644 src/bench/verify_script.cpp

diff --git a/src/Makefile.bench.include b/src/Makefile.bench.include
index 8c024a8c4ad81..c83432e91a600 100644
--- a/src/Makefile.bench.include
+++ b/src/Makefile.bench.include
@@ -14,6 +14,9 @@ bench_bench_bitcoin_SOURCES = \
   bench/Examples.cpp \
   bench/rollingbloom.cpp \
   bench/crypto_hash.cpp \
+  bench/ccoins_caching.cpp \
+  bench/mempool_eviction.cpp \
+  bench/verify_script.cpp \
   bench/base58.cpp
 
 bench_bench_bitcoin_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(EVENT_CLFAGS) $(EVENT_PTHREADS_CFLAGS) -I$(builddir)/bench/
@@ -34,7 +37,8 @@ bench_bench_bitcoin_LDADD += $(LIBBITCOIN_ZMQ) $(ZMQ_LIBS)
 endif
 
 if ENABLE_WALLET
-bench_bench_bitcoin_LDADD += $(LIBBITCOIN_WALLET)
+bench_bench_bitcoin_SOURCES += bench/coin_selection.cpp
+bench_bench_bitcoin_LDADD += $(LIBBITCOIN_WALLET) $(LIBBITCOIN_CRYPTO)
 endif
 
 bench_bench_bitcoin_LDADD += $(BOOST_LIBS) $(BDB_LIBS) $(SSL_LIBS) $(CRYPTO_LIBS) $(MINIUPNPC_LIBS) $(EVENT_PTHREADS_LIBS) $(EVENT_LIBS)
diff --git a/src/bench/ccoins_caching.cpp b/src/bench/ccoins_caching.cpp
new file mode 100644
index 0000000000000..1e8e3d462fc15
--- /dev/null
+++ b/src/bench/ccoins_caching.cpp
@@ -0,0 +1,87 @@
+// Copyright (c) 2016 The Bitcoin Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#include "bench.h"
+#include "coins.h"
+#include "policy/policy.h"
+#include "wallet/crypter.h"
+
+#include <vector>
+
+// FIXME: Dedup with SetupDummyInputs in test/transaction_tests.cpp.
+//
+// Helper: create two dummy transactions, each with
+// two outputs.  The first has 11 and 50 CENT outputs
+// paid to a TX_PUBKEY, the second 21 and 22 CENT outputs
+// paid to a TX_PUBKEYHASH.
+//
+static std::vector<CMutableTransaction>
+SetupDummyInputs(CBasicKeyStore& keystoreRet, CCoinsViewCache& coinsRet)
+{
+    std::vector<CMutableTransaction> dummyTransactions;
+    dummyTransactions.resize(2);
+
+    // Add some keys to the keystore:
+    CKey key[4];
+    for (int i = 0; i < 4; i++) {
+        key[i].MakeNewKey(i % 2);
+        keystoreRet.AddKey(key[i]);
+    }
+
+    // Create some dummy input transactions
+    dummyTransactions[0].vout.resize(2);
+    dummyTransactions[0].vout[0].nValue = 11 * CENT;
+    dummyTransactions[0].vout[0].scriptPubKey << ToByteVector(key[0].GetPubKey()) << OP_CHECKSIG;
+    dummyTransactions[0].vout[1].nValue = 50 * CENT;
+    dummyTransactions[0].vout[1].scriptPubKey << ToByteVector(key[1].GetPubKey()) << OP_CHECKSIG;
+    coinsRet.ModifyCoins(dummyTransactions[0].GetHash())->FromTx(dummyTransactions[0], 0);
+
+    dummyTransactions[1].vout.resize(2);
+    dummyTransactions[1].vout[0].nValue = 21 * CENT;
+    dummyTransactions[1].vout[0].scriptPubKey = GetScriptForDestination(key[2].GetPubKey().GetID());
+    dummyTransactions[1].vout[1].nValue = 22 * CENT;
+    dummyTransactions[1].vout[1].scriptPubKey = GetScriptForDestination(key[3].GetPubKey().GetID());
+    coinsRet.ModifyCoins(dummyTransactions[1].GetHash())->FromTx(dummyTransactions[1], 0);
+
+    return dummyTransactions;
+}
+
+// Microbenchmark for simple accesses to a CCoinsViewCache database. Note from
+// laanwj, "replicating the actual usage patterns of the client is hard though,
+// many times micro-benchmarks of the database showed completely different
+// characteristics than e.g. reindex timings. But that's not a requirement of
+// every benchmark."
+// (https://github.com/bitcoin/bitcoin/issues/7883#issuecomment-224807484)
+static void CCoinsCaching(benchmark::State& state)
+{
+    CBasicKeyStore keystore;
+    CCoinsView coinsDummy;
+    CCoinsViewCache coins(&coinsDummy);
+    std::vector<CMutableTransaction> dummyTransactions = SetupDummyInputs(keystore, coins);
+
+    CMutableTransaction t1;
+    t1.vin.resize(3);
+    t1.vin[0].prevout.hash = dummyTransactions[0].GetHash();
+    t1.vin[0].prevout.n = 1;
+    t1.vin[0].scriptSig << std::vector<unsigned char>(65, 0);
+    t1.vin[1].prevout.hash = dummyTransactions[1].GetHash();
+    t1.vin[1].prevout.n = 0;
+    t1.vin[1].scriptSig << std::vector<unsigned char>(65, 0) << std::vector<unsigned char>(33, 4);
+    t1.vin[2].prevout.hash = dummyTransactions[1].GetHash();
+    t1.vin[2].prevout.n = 1;
+    t1.vin[2].scriptSig << std::vector<unsigned char>(65, 0) << std::vector<unsigned char>(33, 4);
+    t1.vout.resize(2);
+    t1.vout[0].nValue = 90 * CENT;
+    t1.vout[0].scriptPubKey << OP_1;
+
+    // Benchmark.
+    while (state.KeepRunning()) {
+        bool success = AreInputsStandard(t1, coins);
+        assert(success);
+        CAmount value = coins.GetValueIn(t1);
+        assert(value == (50 + 21 + 22) * CENT);
+    }
+}
+
+BENCHMARK(CCoinsCaching);
diff --git a/src/bench/coin_selection.cpp b/src/bench/coin_selection.cpp
new file mode 100644
index 0000000000000..7091ee3e11435
--- /dev/null
+++ b/src/bench/coin_selection.cpp
@@ -0,0 +1,62 @@
+// Copyright (c) 2012-2015 The Bitcoin Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#include "bench.h"
+#include "wallet/wallet.h"
+
+#include <boost/foreach.hpp>
+#include <set>
+
+using namespace std;
+
+static void addCoin(const CAmount& nValue, const CWallet& wallet, vector<COutput>& vCoins)
+{
+    int nInput = 0;
+
+    static int nextLockTime = 0;
+    CMutableTransaction tx;
+    tx.nLockTime = nextLockTime++; // so all transactions get different hashes
+    tx.vout.resize(nInput + 1);
+    tx.vout[nInput].nValue = nValue;
+    CWalletTx* wtx = new CWalletTx(&wallet, tx);
+
+    int nAge = 6 * 24;
+    COutput output(wtx, nInput, nAge, true, true);
+    vCoins.push_back(output);
+}
+
+// Simple benchmark for wallet coin selection. Note that it maybe be necessary
+// to build up more complicated scenarios in order to get meaningful
+// measurements of performance. From laanwj, "Wallet coin selection is probably
+// the hardest, as you need a wider selection of scenarios, just testing the
+// same one over and over isn't too useful. Generating random isn't useful
+// either for measurements."
+// (https://github.com/bitcoin/bitcoin/issues/7883#issuecomment-224807484)
+static void CoinSelection(benchmark::State& state)
+{
+    const CWallet wallet;
+    vector<COutput> vCoins;
+    LOCK(wallet.cs_wallet);
+
+    while (state.KeepRunning()) {
+        // Empty wallet.
+        BOOST_FOREACH (COutput output, vCoins)
+            delete output.tx;
+        vCoins.clear();
+
+        // Add coins.
+        for (int i = 0; i < 1000; i++)
+            addCoin(1000 * COIN, wallet, vCoins);
+        addCoin(3 * COIN, wallet, vCoins);
+
+        set<pair<const CWalletTx*, unsigned int> > setCoinsRet;
+        CAmount nValueRet;
+        bool success = wallet.SelectCoinsMinConf(1003 * COIN, 1, 6, vCoins, setCoinsRet, nValueRet);
+        assert(success);
+        assert(nValueRet == 1003 * COIN);
+        assert(setCoinsRet.size() == 2);
+    }
+}
+
+BENCHMARK(CoinSelection);
diff --git a/src/bench/mempool_eviction.cpp b/src/bench/mempool_eviction.cpp
new file mode 100644
index 0000000000000..0ae69c75fcaeb
--- /dev/null
+++ b/src/bench/mempool_eviction.cpp
@@ -0,0 +1,115 @@
+// Copyright (c) 2011-2015 The Bitcoin Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#include "bench.h"
+#include "policy/policy.h"
+#include "txmempool.h"
+
+#include <list>
+#include <vector>
+
+static void AddTx(const CTransaction& tx, const CAmount& nFee, CTxMemPool& pool)
+{
+    int64_t nTime = 0;
+    double dPriority = 10.0;
+    unsigned int nHeight = 1;
+    bool spendsCoinbase = false;
+    unsigned int sigOpCost = 4;
+    LockPoints lp;
+    pool.addUnchecked(tx.GetHash(), CTxMemPoolEntry(
+                                        tx, nFee, nTime, dPriority, nHeight, pool.HasNoInputsOf(tx),
+                                        tx.GetValueOut(), spendsCoinbase, sigOpCost, lp));
+}
+
+// Right now this is only testing eviction performance in an extremely small
+// mempool. Code needs to be written to generate a much wider variety of
+// unique transactions for a more meaningful performance measurement.
+static void MempoolEviction(benchmark::State& state)
+{
+    CMutableTransaction tx1 = CMutableTransaction();
+    tx1.vin.resize(1);
+    tx1.vin[0].scriptSig = CScript() << OP_1;
+    tx1.vout.resize(1);
+    tx1.vout[0].scriptPubKey = CScript() << OP_1 << OP_EQUAL;
+    tx1.vout[0].nValue = 10 * COIN;
+
+    CMutableTransaction tx2 = CMutableTransaction();
+    tx2.vin.resize(1);
+    tx2.vin[0].scriptSig = CScript() << OP_2;
+    tx2.vout.resize(1);
+    tx2.vout[0].scriptPubKey = CScript() << OP_2 << OP_EQUAL;
+    tx2.vout[0].nValue = 10 * COIN;
+
+    CMutableTransaction tx3 = CMutableTransaction();
+    tx3.vin.resize(1);
+    tx3.vin[0].prevout = COutPoint(tx2.GetHash(), 0);
+    tx3.vin[0].scriptSig = CScript() << OP_2;
+    tx3.vout.resize(1);
+    tx3.vout[0].scriptPubKey = CScript() << OP_3 << OP_EQUAL;
+    tx3.vout[0].nValue = 10 * COIN;
+
+    CMutableTransaction tx4 = CMutableTransaction();
+    tx4.vin.resize(2);
+    tx4.vin[0].prevout.SetNull();
+    tx4.vin[0].scriptSig = CScript() << OP_4;
+    tx4.vin[1].prevout.SetNull();
+    tx4.vin[1].scriptSig = CScript() << OP_4;
+    tx4.vout.resize(2);
+    tx4.vout[0].scriptPubKey = CScript() << OP_4 << OP_EQUAL;
+    tx4.vout[0].nValue = 10 * COIN;
+    tx4.vout[1].scriptPubKey = CScript() << OP_4 << OP_EQUAL;
+    tx4.vout[1].nValue = 10 * COIN;
+
+    CMutableTransaction tx5 = CMutableTransaction();
+    tx5.vin.resize(2);
+    tx5.vin[0].prevout = COutPoint(tx4.GetHash(), 0);
+    tx5.vin[0].scriptSig = CScript() << OP_4;
+    tx5.vin[1].prevout.SetNull();
+    tx5.vin[1].scriptSig = CScript() << OP_5;
+    tx5.vout.resize(2);
+    tx5.vout[0].scriptPubKey = CScript() << OP_5 << OP_EQUAL;
+    tx5.vout[0].nValue = 10 * COIN;
+    tx5.vout[1].scriptPubKey = CScript() << OP_5 << OP_EQUAL;
+    tx5.vout[1].nValue = 10 * COIN;
+
+    CMutableTransaction tx6 = CMutableTransaction();
+    tx6.vin.resize(2);
+    tx6.vin[0].prevout = COutPoint(tx4.GetHash(), 1);
+    tx6.vin[0].scriptSig = CScript() << OP_4;
+    tx6.vin[1].prevout.SetNull();
+    tx6.vin[1].scriptSig = CScript() << OP_6;
+    tx6.vout.resize(2);
+    tx6.vout[0].scriptPubKey = CScript() << OP_6 << OP_EQUAL;
+    tx6.vout[0].nValue = 10 * COIN;
+    tx6.vout[1].scriptPubKey = CScript() << OP_6 << OP_EQUAL;
+    tx6.vout[1].nValue = 10 * COIN;
+
+    CMutableTransaction tx7 = CMutableTransaction();
+    tx7.vin.resize(2);
+    tx7.vin[0].prevout = COutPoint(tx5.GetHash(), 0);
+    tx7.vin[0].scriptSig = CScript() << OP_5;
+    tx7.vin[1].prevout = COutPoint(tx6.GetHash(), 0);
+    tx7.vin[1].scriptSig = CScript() << OP_6;
+    tx7.vout.resize(2);
+    tx7.vout[0].scriptPubKey = CScript() << OP_7 << OP_EQUAL;
+    tx7.vout[0].nValue = 10 * COIN;
+    tx7.vout[1].scriptPubKey = CScript() << OP_7 << OP_EQUAL;
+    tx7.vout[1].nValue = 10 * COIN;
+
+    CTxMemPool pool(CFeeRate(1000));
+
+    while (state.KeepRunning()) {
+        AddTx(tx1, 10000LL, pool);
+        AddTx(tx2, 5000LL, pool);
+        AddTx(tx3, 20000LL, pool);
+        AddTx(tx4, 7000LL, pool);
+        AddTx(tx5, 1000LL, pool);
+        AddTx(tx6, 1100LL, pool);
+        AddTx(tx7, 9000LL, pool);
+        pool.TrimToSize(pool.DynamicMemoryUsage() * 3 / 4);
+        pool.TrimToSize(GetVirtualTransactionSize(tx1));
+    }
+}
+
+BENCHMARK(MempoolEviction);
diff --git a/src/bench/verify_script.cpp b/src/bench/verify_script.cpp
new file mode 100644
index 0000000000000..dc3940cdbdd99
--- /dev/null
+++ b/src/bench/verify_script.cpp
@@ -0,0 +1,103 @@
+// Copyright (c) 2016 The Bitcoin Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#include "bench.h"
+#include "key.h"
+#if defined(HAVE_CONSENSUS_LIB)
+#include "script/bitcoinconsensus.h"
+#endif
+#include "script/script.h"
+#include "script/sign.h"
+#include "streams.h"
+
+// FIXME: Dedup with BuildCreditingTransaction in test/script_tests.cpp.
+static CMutableTransaction BuildCreditingTransaction(const CScript& scriptPubKey)
+{
+    CMutableTransaction txCredit;
+    txCredit.nVersion = 1;
+    txCredit.nLockTime = 0;
+    txCredit.vin.resize(1);
+    txCredit.vout.resize(1);
+    txCredit.vin[0].prevout.SetNull();
+    txCredit.vin[0].scriptSig = CScript() << CScriptNum(0) << CScriptNum(0);
+    txCredit.vin[0].nSequence = CTxIn::SEQUENCE_FINAL;
+    txCredit.vout[0].scriptPubKey = scriptPubKey;
+    txCredit.vout[0].nValue = 1;
+
+    return txCredit;
+}
+
+// FIXME: Dedup with BuildSpendingTransaction in test/script_tests.cpp.
+static CMutableTransaction BuildSpendingTransaction(const CScript& scriptSig, const CMutableTransaction& txCredit)
+{
+    CMutableTransaction txSpend;
+    txSpend.nVersion = 1;
+    txSpend.nLockTime = 0;
+    txSpend.vin.resize(1);
+    txSpend.vout.resize(1);
+    txSpend.wit.vtxinwit.resize(1);
+    txSpend.vin[0].prevout.hash = txCredit.GetHash();
+    txSpend.vin[0].prevout.n = 0;
+    txSpend.vin[0].scriptSig = scriptSig;
+    txSpend.vin[0].nSequence = CTxIn::SEQUENCE_FINAL;
+    txSpend.vout[0].scriptPubKey = CScript();
+    txSpend.vout[0].nValue = txCredit.vout[0].nValue;
+
+    return txSpend;
+}
+
+// Microbenchmark for verification of a basic P2WPKH script. Can be easily
+// modified to measure performance of other types of scripts.
+static void VerifyScriptBench(benchmark::State& state)
+{
+    const int flags = SCRIPT_VERIFY_WITNESS | SCRIPT_VERIFY_P2SH;
+    const int witnessversion = 0;
+
+    // Keypair.
+    CKey key;
+    const unsigned char vchKey[32] = {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, 1};
+    key.Set(vchKey, vchKey + 32, false);
+    CPubKey pubkey = key.GetPubKey();
+    uint160 pubkeyHash;
+    CHash160().Write(pubkey.begin(), pubkey.size()).Finalize(pubkeyHash.begin());
+
+    // Script.
+    CScript scriptPubKey = CScript() << witnessversion << ToByteVector(pubkeyHash);
+    CScript scriptSig;
+    CScript witScriptPubkey = CScript() << OP_DUP << OP_HASH160 << ToByteVector(pubkeyHash) << OP_EQUALVERIFY << OP_CHECKSIG;
+    CTransaction txCredit = BuildCreditingTransaction(scriptPubKey);
+    CMutableTransaction txSpend = BuildSpendingTransaction(scriptSig, txCredit);
+    CScriptWitness& witness = txSpend.wit.vtxinwit[0].scriptWitness;
+    witness.stack.emplace_back();
+    key.Sign(SignatureHash(witScriptPubkey, txSpend, 0, SIGHASH_ALL, txCredit.vout[0].nValue, SIGVERSION_WITNESS_V0), witness.stack.back(), 0);
+    witness.stack.back().push_back(static_cast<unsigned char>(SIGHASH_ALL));
+    witness.stack.push_back(ToByteVector(pubkey));
+
+    // Benchmark.
+    while (state.KeepRunning()) {
+        ScriptError err;
+        bool success = VerifyScript(
+            txSpend.vin[0].scriptSig,
+            txCredit.vout[0].scriptPubKey,
+            &txSpend.wit.vtxinwit[0].scriptWitness,
+            flags,
+            MutableTransactionSignatureChecker(&txSpend, 0, txCredit.vout[0].nValue),
+            &err);
+        assert(err == SCRIPT_ERR_OK);
+        assert(success);
+
+#if defined(HAVE_CONSENSUS_LIB)
+        CDataStream stream(SER_NETWORK, PROTOCOL_VERSION);
+        stream << txSpend;
+        int csuccess = bitcoinconsensus_verify_script_with_amount(
+            begin_ptr(txCredit.vout[0].scriptPubKey),
+            txCredit.vout[0].scriptPubKey.size(),
+            txCredit.vout[0].nValue,
+            (const unsigned char*)&stream[0], stream.size(), 0, flags, nullptr);
+        assert(csuccess == 1);
+#endif
+    }
+}
+
+BENCHMARK(VerifyScriptBench);

From 46304791353d2bb61004a035869612620c30b4eb Mon Sep 17 00:00:00 2001
From: Gregory Maxwell <greg@xiph.org>
Date: Mon, 17 Oct 2016 23:11:35 +0000
Subject: [PATCH 1053/1802] Make dnsseed's definition of acute need include
 relevant services.

We normally prefer to connect to peers offering the relevant services.

If we're not connected to enough peers with relevant services, we
 probably don't know about them and could use dnsseed's help.
---
 src/net.cpp | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/net.cpp b/src/net.cpp
index de8f8184a28c9..99f5604ff220e 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -1462,12 +1462,19 @@ static std::string GetDNSHost(const CDNSSeedData& data, ServiceFlags* requiredSe
 void CConnman::ThreadDNSAddressSeed()
 {
     // goal: only query DNS seeds if address need is acute
+    // Avoiding DNS seeds when we don't need them improves user privacy by
+    //  creating fewer identifying DNS requests, reduces trust by giving seeds
+    //  less influence on the network topology, and reduces traffic to the seeds.
     if ((addrman.size() > 0) &&
         (!GetBoolArg("-forcednsseed", DEFAULT_FORCEDNSSEED))) {
         MilliSleep(11 * 1000);
 
         LOCK(cs_vNodes);
-        if (vNodes.size() >= 2) {
+        int nRelevant = 0;
+        for (auto pnode : vNodes) {
+            nRelevant += pnode->fSuccessfullyConnected && ((pnode->nServices & nRelevantServices) == nRelevantServices);
+        }
+        if (nRelevant >= 2) {
             LogPrintf("P2P peers available. Skipped DNS seeding.\n");
             return;
         }

From 59daa58d6a17bb1170c724f2d01d43c2ec21a9b4 Mon Sep 17 00:00:00 2001
From: Luke Dashjr <luke-jr+git@utopios.org>
Date: Tue, 18 Oct 2016 07:17:19 +0000
Subject: [PATCH 1054/1802] RPC/Mining: getblocktemplate: Update and fix
 formatting of help

---
 src/rpc/mining.cpp | 66 +++++++++++++++++++++++++---------------------
 1 file changed, 36 insertions(+), 30 deletions(-)

diff --git a/src/rpc/mining.cpp b/src/rpc/mining.cpp
index 92ca4bab6bc1e..33c1893ff6944 100644
--- a/src/rpc/mining.cpp
+++ b/src/rpc/mining.cpp
@@ -319,67 +319,73 @@ UniValue getblocktemplate(const UniValue& params, bool fHelp)
 {
     if (fHelp || params.size() > 1)
         throw runtime_error(
-            "getblocktemplate ( \"jsonrequestobject\" )\n"
+            "getblocktemplate ( TemplateRequest )\n"
             "\nIf the request parameters include a 'mode' key, that is used to explicitly select between the default 'template' request or a 'proposal'.\n"
             "It returns data needed to construct a block to work on.\n"
-            "For full specification, see BIPs 22 and 9:\n"
+            "For full specification, see BIPs 22, 23, 9, and 145:\n"
             "    https://github.com/bitcoin/bips/blob/master/bip-0022.mediawiki\n"
+            "    https://github.com/bitcoin/bips/blob/master/bip-0023.mediawiki\n"
             "    https://github.com/bitcoin/bips/blob/master/bip-0009.mediawiki#getblocktemplate_changes\n"
+            "    https://github.com/bitcoin/bips/blob/master/bip-0145.mediawiki\n"
 
             "\nArguments:\n"
-            "1. \"jsonrequestobject\"       (string, optional) A json object in the following spec\n"
+            "1. TemplateRequest          (json object, optional) A json object in the following spec\n"
             "     {\n"
-            "       \"mode\":\"template\"    (string, optional) This must be set to \"template\" or omitted\n"
-            "       \"capabilities\":[       (array, optional) A list of strings\n"
-            "           \"support\"           (string) client side supported feature, 'longpoll', 'coinbasetxn', 'coinbasevalue', 'proposal', 'serverlist', 'workid'\n"
+            "       \"mode\":\"template\"    (string, optional) This must be set to \"template\", \"proposal\" (see BIP 23), or omitted\n"
+            "       \"capabilities\":[     (array, optional) A list of strings\n"
+            "           \"support\"          (string) client side supported feature, 'longpoll', 'coinbasetxn', 'coinbasevalue', 'proposal', 'serverlist', 'workid'\n"
             "           ,...\n"
-            "         ]\n"
+            "       ],\n"
+            "       \"rules\":[            (array, optional) A list of strings\n"
+            "           \"support\"          (string) client side supported softfork deployment\n"
+            "           ,...\n"
+            "       ]\n"
             "     }\n"
             "\n"
 
             "\nResult:\n"
             "{\n"
-            "  \"version\" : n,                    (numeric) The block version\n"
+            "  \"version\" : n,                    (numeric) The preferred block version\n"
             "  \"rules\" : [ \"rulename\", ... ],    (array of strings) specific block rules that are to be enforced\n"
             "  \"vbavailable\" : {                 (json object) set of pending, supported versionbit (BIP 9) softfork deployments\n"
-            "      \"rulename\" : bitnumber        (numeric) identifies the bit number as indicating acceptance and readiness for the named softfork rule\n"
+            "      \"rulename\" : bitnumber          (numeric) identifies the bit number as indicating acceptance and readiness for the named softfork rule\n"
             "      ,...\n"
             "  },\n"
             "  \"vbrequired\" : n,                 (numeric) bit mask of versionbits the server requires set in submissions\n"
-            "  \"previousblockhash\" : \"xxxx\",    (string) The hash of current highest block\n"
+            "  \"previousblockhash\" : \"xxxx\",     (string) The hash of current highest block\n"
             "  \"transactions\" : [                (array) contents of non-coinbase transactions that should be included in the next block\n"
             "      {\n"
-            "         \"data\" : \"xxxx\",          (string) transaction data encoded in hexadecimal (byte-for-byte)\n"
-            "         \"txid\" : \"xxxx\",          (string) transaction id encoded in little-endian hexadecimal\n"
-            "         \"hash\" : \"xxxx\",          (string) hash encoded in little-endian hexadecimal (including witness data)\n"
-            "         \"depends\" : [              (array) array of numbers \n"
-            "             n                        (numeric) transactions before this one (by 1-based index in 'transactions' list) that must be present in the final block if this one is\n"
+            "         \"data\" : \"xxxx\",             (string) transaction data encoded in hexadecimal (byte-for-byte)\n"
+            "         \"txid\" : \"xxxx\",             (string) transaction id encoded in little-endian hexadecimal\n"
+            "         \"hash\" : \"xxxx\",             (string) hash encoded in little-endian hexadecimal (including witness data)\n"
+            "         \"depends\" : [                (array) array of numbers \n"
+            "             n                          (numeric) transactions before this one (by 1-based index in 'transactions' list) that must be present in the final block if this one is\n"
             "             ,...\n"
             "         ],\n"
-            "         \"fee\": n,                   (numeric) difference in value between transaction inputs and outputs (in Satoshis); for coinbase transactions, this is a negative Number of the total collected block fees (ie, not including the block subsidy); if key is not present, fee is unknown and clients MUST NOT assume there isn't one\n"
-            "         \"sigops\" : n,               (numeric) total SigOps cost, as counted for purposes of block limits; if key is not present, sigop cost is unknown and clients MUST NOT assume it is zero\n"
-            "         \"weight\" : n,               (numeric) total transaction weight, as counted for purposes of block limits\n"
-            "         \"required\" : true|false     (boolean) if provided and true, this transaction must be in the final block\n"
+            "         \"fee\": n,                    (numeric) difference in value between transaction inputs and outputs (in Satoshis); for coinbase transactions, this is a negative Number of the total collected block fees (ie, not including the block subsidy); if key is not present, fee is unknown and clients MUST NOT assume there isn't one\n"
+            "         \"sigops\" : n,                (numeric) total SigOps cost, as counted for purposes of block limits; if key is not present, sigop cost is unknown and clients MUST NOT assume it is zero\n"
+            "         \"weight\" : n,                (numeric) total transaction weight, as counted for purposes of block limits\n"
+            "         \"required\" : true|false      (boolean) if provided and true, this transaction must be in the final block\n"
             "      }\n"
             "      ,...\n"
             "  ],\n"
-            "  \"coinbaseaux\" : {                  (json object) data that should be included in the coinbase's scriptSig content\n"
-            "      \"flags\" : \"flags\"            (string) \n"
+            "  \"coinbaseaux\" : {                 (json object) data that should be included in the coinbase's scriptSig content\n"
+            "      \"flags\" : \"xx\"                  (string) key name is to be ignored, and value included in scriptSig\n"
             "  },\n"
-            "  \"coinbasevalue\" : n,               (numeric) maximum allowable input to coinbase transaction, including the generation award and transaction fees (in Satoshis)\n"
-            "  \"coinbasetxn\" : { ... },           (json object) information for coinbase transaction\n"
-            "  \"target\" : \"xxxx\",               (string) The hash target\n"
-            "  \"mintime\" : xxx,                   (numeric) The minimum timestamp appropriate for next block time in seconds since epoch (Jan 1 1970 GMT)\n"
-            "  \"mutable\" : [                      (array of string) list of ways the block template may be changed \n"
-            "     \"value\"                         (string) A way the block template may be changed, e.g. 'time', 'transactions', 'prevblock'\n"
+            "  \"coinbasevalue\" : n,              (numeric) maximum allowable input to coinbase transaction, including the generation award and transaction fees (in Satoshis)\n"
+            "  \"coinbasetxn\" : { ... },          (json object) information for coinbase transaction\n"
+            "  \"target\" : \"xxxx\",                (string) The hash target\n"
+            "  \"mintime\" : xxx,                  (numeric) The minimum timestamp appropriate for next block time in seconds since epoch (Jan 1 1970 GMT)\n"
+            "  \"mutable\" : [                     (array of string) list of ways the block template may be changed \n"
+            "     \"value\"                          (string) A way the block template may be changed, e.g. 'time', 'transactions', 'prevblock'\n"
             "     ,...\n"
             "  ],\n"
-            "  \"noncerange\" : \"00000000ffffffff\",   (string) A range of valid nonces\n"
-            "  \"sigoplimit\" : n,                 (numeric) cost limit of sigops in blocks\n"
+            "  \"noncerange\" : \"00000000ffffffff\",(string) A range of valid nonces\n"
+            "  \"sigoplimit\" : n,                 (numeric) limit of sigops in blocks\n"
             "  \"sizelimit\" : n,                  (numeric) limit of block size\n"
             "  \"weightlimit\" : n,                (numeric) limit of block weight\n"
             "  \"curtime\" : ttt,                  (numeric) current timestamp in seconds since epoch (Jan 1 1970 GMT)\n"
-            "  \"bits\" : \"xxx\",                 (string) compressed target of next block\n"
+            "  \"bits\" : \"xxxxxxxx\",              (string) compressed target of next block\n"
             "  \"height\" : n                      (numeric) The height of the next block\n"
             "}\n"
 

From ef0c9ee2960fda58b2fe5b0c3b4c672231b30322 Mon Sep 17 00:00:00 2001
From: Jonas Schnelli <dev@jonasschnelli.ch>
Date: Mon, 30 Nov 2015 20:57:20 +0100
Subject: [PATCH 1055/1802] [Qt] make warnings label selectable

---
 src/qt/forms/overviewpage.ui | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/qt/forms/overviewpage.ui b/src/qt/forms/overviewpage.ui
index 6d792d1475fed..4a6ee92508d5e 100644
--- a/src/qt/forms/overviewpage.ui
+++ b/src/qt/forms/overviewpage.ui
@@ -20,7 +20,7 @@
       <bool>false</bool>
      </property>
      <property name="styleSheet">
-      <string notr="true">background-color: qlineargradient(x1: 0, y1: 0, x2: 1, y2: 0, stop:0 #F0D0A0, stop:1 #F8D488); color:#000000;</string>
+      <string notr="true">QLabel { background-color: qlineargradient(x1: 0, y1: 0, x2: 1, y2: 0, stop:0 #F0D0A0, stop:1 #F8D488); color:#000000; }</string>
      </property>
      <property name="wordWrap">
       <bool>true</bool>
@@ -28,6 +28,9 @@
      <property name="margin">
       <number>3</number>
      </property>
+     <property name="textInteractionFlags">
+      <set>Qt::TextSelectableByMouse</set>
+     </property>
     </widget>
    </item>
    <item>

From 23c32a9694e119f957c124f4501294ae7a5fd99a Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Thu, 29 Sep 2016 18:48:27 +0200
Subject: [PATCH 1056/1802] rpc: Change JSONRPCRequest to JSONRPCRequestObj

This is more consistent with `JSONRPCReplyObj`.
---
 src/bitcoin-cli.cpp  | 2 +-
 src/rpc/protocol.cpp | 4 ++--
 src/rpc/protocol.h   | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/bitcoin-cli.cpp b/src/bitcoin-cli.cpp
index 9d4c4e53bd26b..2d66448d80ac3 100644
--- a/src/bitcoin-cli.cpp
+++ b/src/bitcoin-cli.cpp
@@ -223,7 +223,7 @@ UniValue CallRPC(const string& strMethod, const UniValue& params)
     evhttp_add_header(output_headers, "Authorization", (std::string("Basic ") + EncodeBase64(strRPCUserColonPass)).c_str());
 
     // Attach request data
-    std::string strRequest = JSONRPCRequest(strMethod, params, 1);
+    std::string strRequest = JSONRPCRequestObj(strMethod, params, 1).write() + "\n";
     struct evbuffer * output_buffer = evhttp_request_get_output_buffer(req);
     assert(output_buffer);
     evbuffer_add(output_buffer, strRequest.data(), strRequest.size());
diff --git a/src/rpc/protocol.cpp b/src/rpc/protocol.cpp
index bb885bb5a655d..ec186f4fc5888 100644
--- a/src/rpc/protocol.cpp
+++ b/src/rpc/protocol.cpp
@@ -26,13 +26,13 @@ using namespace std;
  * 1.2 spec: http://jsonrpc.org/historical/json-rpc-over-http.html
  */
 
-string JSONRPCRequest(const string& strMethod, const UniValue& params, const UniValue& id)
+UniValue JSONRPCRequestObj(const string& strMethod, const UniValue& params, const UniValue& id)
 {
     UniValue request(UniValue::VOBJ);
     request.push_back(Pair("method", strMethod));
     request.push_back(Pair("params", params));
     request.push_back(Pair("id", id));
-    return request.write() + "\n";
+    return request;
 }
 
 UniValue JSONRPCReplyObj(const UniValue& result, const UniValue& error, const UniValue& id)
diff --git a/src/rpc/protocol.h b/src/rpc/protocol.h
index 1d2ef0e41e67e..c74fa0070fc6d 100644
--- a/src/rpc/protocol.h
+++ b/src/rpc/protocol.h
@@ -77,7 +77,7 @@ enum RPCErrorCode
     RPC_WALLET_ALREADY_UNLOCKED     = -17, //!< Wallet is already unlocked
 };
 
-std::string JSONRPCRequest(const std::string& strMethod, const UniValue& params, const UniValue& id);
+UniValue JSONRPCRequestObj(const std::string& strMethod, const UniValue& params, const UniValue& id);
 UniValue JSONRPCReplyObj(const UniValue& result, const UniValue& error, const UniValue& id);
 std::string JSONRPCReply(const UniValue& result, const UniValue& error, const UniValue& id);
 UniValue JSONRPCError(int code, const std::string& message);

From 69d1c25768a8649bfc7eb8e9c35b8fe9874ac9fc Mon Sep 17 00:00:00 2001
From: Jonas Schnelli <dev@jonasschnelli.ch>
Date: Thu, 22 Sep 2016 09:46:41 +0200
Subject: [PATCH 1057/1802] [RPC] Give RPC commands more information about the
 RPC request

---
 src/httprpc.cpp            |   7 +-
 src/qt/rpcconsole.cpp      |   5 +-
 src/rest.cpp               |   6 +-
 src/rpc/blockchain.cpp     | 158 ++++++------
 src/rpc/mining.cpp         |  90 +++----
 src/rpc/misc.cpp           |  42 ++--
 src/rpc/net.cpp            |  72 +++---
 src/rpc/rawtransaction.cpp |  90 +++----
 src/rpc/server.cpp         |  29 +--
 src/rpc/server.h           |  13 +-
 src/test/rpc_tests.cpp     |   7 +-
 src/wallet/rpcdump.cpp     | 100 ++++----
 src/wallet/rpcwallet.cpp   | 486 ++++++++++++++++++-------------------
 13 files changed, 558 insertions(+), 547 deletions(-)

diff --git a/src/httprpc.cpp b/src/httprpc.cpp
index 6a6c5276cc1e5..54651911aa38d 100644
--- a/src/httprpc.cpp
+++ b/src/httprpc.cpp
@@ -172,19 +172,22 @@ static bool HTTPReq_JSONRPC(HTTPRequest* req, const std::string &)
         return false;
     }
 
-    JSONRequest jreq;
+    JSONRPCRequest jreq;
     try {
         // Parse request
         UniValue valRequest;
         if (!valRequest.read(req->ReadBody()))
             throw JSONRPCError(RPC_PARSE_ERROR, "Parse error");
 
+        // Set the URI
+        jreq.URI = req->GetURI();
+
         std::string strReply;
         // singleton request
         if (valRequest.isObject()) {
             jreq.parse(valRequest);
 
-            UniValue result = tableRPC.execute(jreq.strMethod, jreq.params);
+            UniValue result = tableRPC.execute(jreq);
 
             // Send reply
             strReply = JSONRPCReply(result, NullUniValue, jreq.id);
diff --git a/src/qt/rpcconsole.cpp b/src/qt/rpcconsole.cpp
index a1017e6c16bb8..f10dddf589e28 100644
--- a/src/qt/rpcconsole.cpp
+++ b/src/qt/rpcconsole.cpp
@@ -246,7 +246,10 @@ bool RPCConsole::RPCExecuteCommandLine(std::string &strResult, const std::string
                         std::string strPrint;
                         // Convert argument list to JSON objects in method-dependent way,
                         // and pass it along with the method name to the dispatcher.
-                        lastResult = tableRPC.execute(stack.back()[0], RPCConvertValues(stack.back()[0], std::vector<std::string>(stack.back().begin() + 1, stack.back().end())));
+                        JSONRPCRequest req;
+                        req.params = RPCConvertValues(stack.back()[0], std::vector<std::string>(stack.back().begin() + 1, stack.back().end()));
+                        req.strMethod = stack.back()[0];
+                        lastResult = tableRPC.execute(req);
 
                         state = STATE_COMMAND_EXECUTED;
                         curarg.clear();
diff --git a/src/rest.cpp b/src/rest.cpp
index c81559212419f..707dfe69871f7 100644
--- a/src/rest.cpp
+++ b/src/rest.cpp
@@ -274,7 +274,7 @@ static bool rest_block_notxdetails(HTTPRequest* req, const std::string& strURIPa
 }
 
 // A bit of a hack - dependency on a function defined in rpc/blockchain.cpp
-UniValue getblockchaininfo(const UniValue& params, bool fHelp);
+UniValue getblockchaininfo(const JSONRPCRequest& request);
 
 static bool rest_chaininfo(HTTPRequest* req, const std::string& strURIPart)
 {
@@ -285,8 +285,8 @@ static bool rest_chaininfo(HTTPRequest* req, const std::string& strURIPart)
 
     switch (rf) {
     case RF_JSON: {
-        UniValue rpcParams(UniValue::VARR);
-        UniValue chainInfoObject = getblockchaininfo(rpcParams, false);
+        JSONRPCRequest jsonRequest;
+        UniValue chainInfoObject = getblockchaininfo(jsonRequest);
         string strJSON = chainInfoObject.write() + "\n";
         req->WriteHeader("Content-Type", "application/json");
         req->WriteReply(HTTP_OK, strJSON);
diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp
index 5414ac9ffd449..0c827a1e3881d 100644
--- a/src/rpc/blockchain.cpp
+++ b/src/rpc/blockchain.cpp
@@ -146,9 +146,9 @@ UniValue blockToJSON(const CBlock& block, const CBlockIndex* blockindex, bool tx
     return result;
 }
 
-UniValue getblockcount(const UniValue& params, bool fHelp)
+UniValue getblockcount(const JSONRPCRequest& request)
 {
-    if (fHelp || params.size() != 0)
+    if (request.fHelp || request.params.size() != 0)
         throw runtime_error(
             "getblockcount\n"
             "\nReturns the number of blocks in the longest block chain.\n"
@@ -163,9 +163,9 @@ UniValue getblockcount(const UniValue& params, bool fHelp)
     return chainActive.Height();
 }
 
-UniValue getbestblockhash(const UniValue& params, bool fHelp)
+UniValue getbestblockhash(const JSONRPCRequest& request)
 {
-    if (fHelp || params.size() != 0)
+    if (request.fHelp || request.params.size() != 0)
         throw runtime_error(
             "getbestblockhash\n"
             "\nReturns the hash of the best (tip) block in the longest block chain.\n"
@@ -190,9 +190,9 @@ void RPCNotifyBlockChange(bool ibd, const CBlockIndex * pindex)
 	cond_blockchange.notify_all();
 }
 
-UniValue waitfornewblock(const UniValue& params, bool fHelp)
+UniValue waitfornewblock(const JSONRPCRequest& request)
 {
-    if (fHelp || params.size() > 1)
+    if (request.fHelp || request.params.size() > 1)
         throw runtime_error(
             "waitfornewblock\n"
             "\nWaits for a specific new block and returns useful info about it.\n"
@@ -209,8 +209,8 @@ UniValue waitfornewblock(const UniValue& params, bool fHelp)
             + HelpExampleRpc("waitfornewblock", "1000")
         );
     int timeout = 0;
-    if (params.size() > 0)
-        timeout = params[0].get_int();
+    if (request.params.size() > 0)
+        timeout = request.params[0].get_int();
 
     CUpdatedBlock block;
     {
@@ -228,9 +228,9 @@ UniValue waitfornewblock(const UniValue& params, bool fHelp)
     return ret;
 }
 
-UniValue waitforblock(const UniValue& params, bool fHelp)
+UniValue waitforblock(const JSONRPCRequest& request)
 {
-    if (fHelp || params.size() < 1 || params.size() > 2)
+    if (request.fHelp || request.params.size() < 1 || request.params.size() > 2)
         throw runtime_error(
             "waitforblock\n"
             "\nWaits for a specific new block and returns useful info about it.\n"
@@ -249,10 +249,10 @@ UniValue waitforblock(const UniValue& params, bool fHelp)
         );
     int timeout = 0;
 
-    uint256 hash = uint256S(params[0].get_str());
+    uint256 hash = uint256S(request.params[0].get_str());
 
-    if (params.size() > 1)
-        timeout = params[1].get_int();
+    if (request.params.size() > 1)
+        timeout = request.params[1].get_int();
 
     CUpdatedBlock block;
     {
@@ -270,9 +270,9 @@ UniValue waitforblock(const UniValue& params, bool fHelp)
     return ret;
 }
 
-UniValue waitforblockheight(const UniValue& params, bool fHelp)
+UniValue waitforblockheight(const JSONRPCRequest& request)
 {
-    if (fHelp || params.size() < 1 || params.size() > 2)
+    if (request.fHelp || request.params.size() < 1 || request.params.size() > 2)
         throw runtime_error(
             "waitforblock\n"
             "\nWaits for (at least) block height and returns the height and hash\n"
@@ -292,10 +292,10 @@ UniValue waitforblockheight(const UniValue& params, bool fHelp)
         );
     int timeout = 0;
 
-    int height = params[0].get_int();
+    int height = request.params[0].get_int();
 
-    if (params.size() > 1)
-        timeout = params[1].get_int();
+    if (request.params.size() > 1)
+        timeout = request.params[1].get_int();
 
     CUpdatedBlock block;
     {
@@ -312,9 +312,9 @@ UniValue waitforblockheight(const UniValue& params, bool fHelp)
     return ret;
 }
 
-UniValue getdifficulty(const UniValue& params, bool fHelp)
+UniValue getdifficulty(const JSONRPCRequest& request)
 {
-    if (fHelp || params.size() != 0)
+    if (request.fHelp || request.params.size() != 0)
         throw runtime_error(
             "getdifficulty\n"
             "\nReturns the proof-of-work difficulty as a multiple of the minimum difficulty.\n"
@@ -411,9 +411,9 @@ UniValue mempoolToJSON(bool fVerbose = false)
     }
 }
 
-UniValue getrawmempool(const UniValue& params, bool fHelp)
+UniValue getrawmempool(const JSONRPCRequest& request)
 {
-    if (fHelp || params.size() > 1)
+    if (request.fHelp || request.params.size() > 1)
         throw runtime_error(
             "getrawmempool ( verbose )\n"
             "\nReturns all transaction ids in memory pool as a json array of string transaction ids.\n"
@@ -436,15 +436,15 @@ UniValue getrawmempool(const UniValue& params, bool fHelp)
         );
 
     bool fVerbose = false;
-    if (params.size() > 0)
-        fVerbose = params[0].get_bool();
+    if (request.params.size() > 0)
+        fVerbose = request.params[0].get_bool();
 
     return mempoolToJSON(fVerbose);
 }
 
-UniValue getmempoolancestors(const UniValue& params, bool fHelp)
+UniValue getmempoolancestors(const JSONRPCRequest& request)
 {
-    if (fHelp || params.size() < 1 || params.size() > 2) {
+    if (request.fHelp || request.params.size() < 1 || request.params.size() > 2) {
         throw runtime_error(
             "getmempoolancestors txid (verbose)\n"
             "\nIf txid is in the mempool, returns all in-mempool ancestors.\n"
@@ -469,10 +469,10 @@ UniValue getmempoolancestors(const UniValue& params, bool fHelp)
     }
 
     bool fVerbose = false;
-    if (params.size() > 1)
-        fVerbose = params[1].get_bool();
+    if (request.params.size() > 1)
+        fVerbose = request.params[1].get_bool();
 
-    uint256 hash = ParseHashV(params[0], "parameter 1");
+    uint256 hash = ParseHashV(request.params[0], "parameter 1");
 
     LOCK(mempool.cs);
 
@@ -506,9 +506,9 @@ UniValue getmempoolancestors(const UniValue& params, bool fHelp)
     }
 }
 
-UniValue getmempooldescendants(const UniValue& params, bool fHelp)
+UniValue getmempooldescendants(const JSONRPCRequest& request)
 {
-    if (fHelp || params.size() < 1 || params.size() > 2) {
+    if (request.fHelp || request.params.size() < 1 || request.params.size() > 2) {
         throw runtime_error(
             "getmempooldescendants txid (verbose)\n"
             "\nIf txid is in the mempool, returns all in-mempool descendants.\n"
@@ -533,10 +533,10 @@ UniValue getmempooldescendants(const UniValue& params, bool fHelp)
     }
 
     bool fVerbose = false;
-    if (params.size() > 1)
-        fVerbose = params[1].get_bool();
+    if (request.params.size() > 1)
+        fVerbose = request.params[1].get_bool();
 
-    uint256 hash = ParseHashV(params[0], "parameter 1");
+    uint256 hash = ParseHashV(request.params[0], "parameter 1");
 
     LOCK(mempool.cs);
 
@@ -570,9 +570,9 @@ UniValue getmempooldescendants(const UniValue& params, bool fHelp)
     }
 }
 
-UniValue getmempoolentry(const UniValue& params, bool fHelp)
+UniValue getmempoolentry(const JSONRPCRequest& request)
 {
-    if (fHelp || params.size() != 1) {
+    if (request.fHelp || request.params.size() != 1) {
         throw runtime_error(
             "getmempoolentry txid\n"
             "\nReturns mempool data for given transaction\n"
@@ -588,7 +588,7 @@ UniValue getmempoolentry(const UniValue& params, bool fHelp)
         );
     }
 
-    uint256 hash = ParseHashV(params[0], "parameter 1");
+    uint256 hash = ParseHashV(request.params[0], "parameter 1");
 
     LOCK(mempool.cs);
 
@@ -603,9 +603,9 @@ UniValue getmempoolentry(const UniValue& params, bool fHelp)
     return info;
 }
 
-UniValue getblockhash(const UniValue& params, bool fHelp)
+UniValue getblockhash(const JSONRPCRequest& request)
 {
-    if (fHelp || params.size() != 1)
+    if (request.fHelp || request.params.size() != 1)
         throw runtime_error(
             "getblockhash index\n"
             "\nReturns hash of block in best-block-chain at index provided.\n"
@@ -620,7 +620,7 @@ UniValue getblockhash(const UniValue& params, bool fHelp)
 
     LOCK(cs_main);
 
-    int nHeight = params[0].get_int();
+    int nHeight = request.params[0].get_int();
     if (nHeight < 0 || nHeight > chainActive.Height())
         throw JSONRPCError(RPC_INVALID_PARAMETER, "Block height out of range");
 
@@ -628,9 +628,9 @@ UniValue getblockhash(const UniValue& params, bool fHelp)
     return pblockindex->GetBlockHash().GetHex();
 }
 
-UniValue getblockheader(const UniValue& params, bool fHelp)
+UniValue getblockheader(const JSONRPCRequest& request)
 {
-    if (fHelp || params.size() < 1 || params.size() > 2)
+    if (request.fHelp || request.params.size() < 1 || request.params.size() > 2)
         throw runtime_error(
             "getblockheader \"hash\" ( verbose )\n"
             "\nIf verbose is false, returns a string that is serialized, hex-encoded data for blockheader 'hash'.\n"
@@ -664,12 +664,12 @@ UniValue getblockheader(const UniValue& params, bool fHelp)
 
     LOCK(cs_main);
 
-    std::string strHash = params[0].get_str();
+    std::string strHash = request.params[0].get_str();
     uint256 hash(uint256S(strHash));
 
     bool fVerbose = true;
-    if (params.size() > 1)
-        fVerbose = params[1].get_bool();
+    if (request.params.size() > 1)
+        fVerbose = request.params[1].get_bool();
 
     if (mapBlockIndex.count(hash) == 0)
         throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Block not found");
@@ -687,9 +687,9 @@ UniValue getblockheader(const UniValue& params, bool fHelp)
     return blockheaderToJSON(pblockindex);
 }
 
-UniValue getblock(const UniValue& params, bool fHelp)
+UniValue getblock(const JSONRPCRequest& request)
 {
-    if (fHelp || params.size() < 1 || params.size() > 2)
+    if (request.fHelp || request.params.size() < 1 || request.params.size() > 2)
         throw runtime_error(
             "getblock \"hash\" ( verbose )\n"
             "\nIf verbose is false, returns a string that is serialized, hex-encoded data for block 'hash'.\n"
@@ -730,12 +730,12 @@ UniValue getblock(const UniValue& params, bool fHelp)
 
     LOCK(cs_main);
 
-    std::string strHash = params[0].get_str();
+    std::string strHash = request.params[0].get_str();
     uint256 hash(uint256S(strHash));
 
     bool fVerbose = true;
-    if (params.size() > 1)
-        fVerbose = params[1].get_bool();
+    if (request.params.size() > 1)
+        fVerbose = request.params[1].get_bool();
 
     if (mapBlockIndex.count(hash) == 0)
         throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Block not found");
@@ -814,9 +814,9 @@ static bool GetUTXOStats(CCoinsView *view, CCoinsStats &stats)
     return true;
 }
 
-UniValue gettxoutsetinfo(const UniValue& params, bool fHelp)
+UniValue gettxoutsetinfo(const JSONRPCRequest& request)
 {
-    if (fHelp || params.size() != 0)
+    if (request.fHelp || request.params.size() != 0)
         throw runtime_error(
             "gettxoutsetinfo\n"
             "\nReturns statistics about the unspent transaction output set.\n"
@@ -854,9 +854,9 @@ UniValue gettxoutsetinfo(const UniValue& params, bool fHelp)
     return ret;
 }
 
-UniValue gettxout(const UniValue& params, bool fHelp)
+UniValue gettxout(const JSONRPCRequest& request)
 {
-    if (fHelp || params.size() < 2 || params.size() > 3)
+    if (request.fHelp || request.params.size() < 2 || request.params.size() > 3)
         throw runtime_error(
             "gettxout \"txid\" n ( includemempool )\n"
             "\nReturns details about an unspent transaction output.\n"
@@ -896,12 +896,12 @@ UniValue gettxout(const UniValue& params, bool fHelp)
 
     UniValue ret(UniValue::VOBJ);
 
-    std::string strHash = params[0].get_str();
+    std::string strHash = request.params[0].get_str();
     uint256 hash(uint256S(strHash));
-    int n = params[1].get_int();
+    int n = request.params[1].get_int();
     bool fMempool = true;
-    if (params.size() > 2)
-        fMempool = params[2].get_bool();
+    if (request.params.size() > 2)
+        fMempool = request.params[2].get_bool();
 
     CCoins coins;
     if (fMempool) {
@@ -934,11 +934,11 @@ UniValue gettxout(const UniValue& params, bool fHelp)
     return ret;
 }
 
-UniValue verifychain(const UniValue& params, bool fHelp)
+UniValue verifychain(const JSONRPCRequest& request)
 {
     int nCheckLevel = GetArg("-checklevel", DEFAULT_CHECKLEVEL);
     int nCheckDepth = GetArg("-checkblocks", DEFAULT_CHECKBLOCKS);
-    if (fHelp || params.size() > 2)
+    if (request.fHelp || request.params.size() > 2)
         throw runtime_error(
             "verifychain ( checklevel numblocks )\n"
             "\nVerifies blockchain database.\n"
@@ -954,10 +954,10 @@ UniValue verifychain(const UniValue& params, bool fHelp)
 
     LOCK(cs_main);
 
-    if (params.size() > 0)
-        nCheckLevel = params[0].get_int();
-    if (params.size() > 1)
-        nCheckDepth = params[1].get_int();
+    if (request.params.size() > 0)
+        nCheckLevel = request.params[0].get_int();
+    if (request.params.size() > 1)
+        nCheckDepth = request.params[1].get_int();
 
     return CVerifyDB().VerifyDB(Params(), pcoinsTip, nCheckLevel, nCheckDepth);
 }
@@ -1021,9 +1021,9 @@ void BIP9SoftForkDescPushBack(UniValue& bip9_softforks, const std::string &name,
         bip9_softforks.push_back(Pair(name, BIP9SoftForkDesc(consensusParams, id)));
 }
 
-UniValue getblockchaininfo(const UniValue& params, bool fHelp)
+UniValue getblockchaininfo(const JSONRPCRequest& request)
 {
-    if (fHelp || params.size() != 0)
+    if (request.fHelp || request.params.size() != 0)
         throw runtime_error(
             "getblockchaininfo\n"
             "Returns an object containing various state info regarding block chain processing.\n"
@@ -1113,9 +1113,9 @@ struct CompareBlocksByHeight
     }
 };
 
-UniValue getchaintips(const UniValue& params, bool fHelp)
+UniValue getchaintips(const JSONRPCRequest& request)
 {
-    if (fHelp || params.size() != 0)
+    if (request.fHelp || request.params.size() != 0)
         throw runtime_error(
             "getchaintips\n"
             "Return information about all known tips in the block tree,"
@@ -1229,9 +1229,9 @@ UniValue mempoolInfoToJSON()
     return ret;
 }
 
-UniValue getmempoolinfo(const UniValue& params, bool fHelp)
+UniValue getmempoolinfo(const JSONRPCRequest& request)
 {
-    if (fHelp || params.size() != 0)
+    if (request.fHelp || request.params.size() != 0)
         throw runtime_error(
             "getmempoolinfo\n"
             "\nReturns details on the active state of the TX memory pool.\n"
@@ -1251,9 +1251,9 @@ UniValue getmempoolinfo(const UniValue& params, bool fHelp)
     return mempoolInfoToJSON();
 }
 
-UniValue preciousblock(const UniValue& params, bool fHelp)
+UniValue preciousblock(const JSONRPCRequest& request)
 {
-    if (fHelp || params.size() != 1)
+    if (request.fHelp || request.params.size() != 1)
         throw runtime_error(
             "preciousblock \"hash\"\n"
             "\nTreats a block as if it were received before others with the same work.\n"
@@ -1267,7 +1267,7 @@ UniValue preciousblock(const UniValue& params, bool fHelp)
             + HelpExampleRpc("preciousblock", "\"blockhash\"")
         );
 
-    std::string strHash = params[0].get_str();
+    std::string strHash = request.params[0].get_str();
     uint256 hash(uint256S(strHash));
     CBlockIndex* pblockindex;
 
@@ -1289,9 +1289,9 @@ UniValue preciousblock(const UniValue& params, bool fHelp)
     return NullUniValue;
 }
 
-UniValue invalidateblock(const UniValue& params, bool fHelp)
+UniValue invalidateblock(const JSONRPCRequest& request)
 {
-    if (fHelp || params.size() != 1)
+    if (request.fHelp || request.params.size() != 1)
         throw runtime_error(
             "invalidateblock \"hash\"\n"
             "\nPermanently marks a block as invalid, as if it violated a consensus rule.\n"
@@ -1303,7 +1303,7 @@ UniValue invalidateblock(const UniValue& params, bool fHelp)
             + HelpExampleRpc("invalidateblock", "\"blockhash\"")
         );
 
-    std::string strHash = params[0].get_str();
+    std::string strHash = request.params[0].get_str();
     uint256 hash(uint256S(strHash));
     CValidationState state;
 
@@ -1327,9 +1327,9 @@ UniValue invalidateblock(const UniValue& params, bool fHelp)
     return NullUniValue;
 }
 
-UniValue reconsiderblock(const UniValue& params, bool fHelp)
+UniValue reconsiderblock(const JSONRPCRequest& request)
 {
-    if (fHelp || params.size() != 1)
+    if (request.fHelp || request.params.size() != 1)
         throw runtime_error(
             "reconsiderblock \"hash\"\n"
             "\nRemoves invalidity status of a block and its descendants, reconsider them for activation.\n"
@@ -1342,7 +1342,7 @@ UniValue reconsiderblock(const UniValue& params, bool fHelp)
             + HelpExampleRpc("reconsiderblock", "\"blockhash\"")
         );
 
-    std::string strHash = params[0].get_str();
+    std::string strHash = request.params[0].get_str();
     uint256 hash(uint256S(strHash));
 
     {
diff --git a/src/rpc/mining.cpp b/src/rpc/mining.cpp
index 891b04482c963..d509dd691f55d 100644
--- a/src/rpc/mining.cpp
+++ b/src/rpc/mining.cpp
@@ -74,9 +74,9 @@ UniValue GetNetworkHashPS(int lookup, int height) {
     return workDiff.getdouble() / timeDiff;
 }
 
-UniValue getnetworkhashps(const UniValue& params, bool fHelp)
+UniValue getnetworkhashps(const JSONRPCRequest& request)
 {
-    if (fHelp || params.size() > 2)
+    if (request.fHelp || request.params.size() > 2)
         throw runtime_error(
             "getnetworkhashps ( blocks height )\n"
             "\nReturns the estimated network hashes per second based on the last n blocks.\n"
@@ -93,7 +93,7 @@ UniValue getnetworkhashps(const UniValue& params, bool fHelp)
        );
 
     LOCK(cs_main);
-    return GetNetworkHashPS(params.size() > 0 ? params[0].get_int() : 120, params.size() > 1 ? params[1].get_int() : -1);
+    return GetNetworkHashPS(request.params.size() > 0 ? request.params[0].get_int() : 120, request.params.size() > 1 ? request.params[1].get_int() : -1);
 }
 
 UniValue generateBlocks(boost::shared_ptr<CReserveScript> coinbaseScript, int nGenerate, uint64_t nMaxTries, bool keepScript)
@@ -146,9 +146,9 @@ UniValue generateBlocks(boost::shared_ptr<CReserveScript> coinbaseScript, int nG
     return blockHashes;
 }
 
-UniValue generate(const UniValue& params, bool fHelp)
+UniValue generate(const JSONRPCRequest& request)
 {
-    if (fHelp || params.size() < 1 || params.size() > 2)
+    if (request.fHelp || request.params.size() < 1 || request.params.size() > 2)
         throw runtime_error(
             "generate numblocks ( maxtries )\n"
             "\nMine up to numblocks blocks immediately (before the RPC call returns)\n"
@@ -162,10 +162,10 @@ UniValue generate(const UniValue& params, bool fHelp)
             + HelpExampleCli("generate", "11")
         );
 
-    int nGenerate = params[0].get_int();
+    int nGenerate = request.params[0].get_int();
     uint64_t nMaxTries = 1000000;
-    if (params.size() > 1) {
-        nMaxTries = params[1].get_int();
+    if (request.params.size() > 1) {
+        nMaxTries = request.params[1].get_int();
     }
 
     boost::shared_ptr<CReserveScript> coinbaseScript;
@@ -182,9 +182,9 @@ UniValue generate(const UniValue& params, bool fHelp)
     return generateBlocks(coinbaseScript, nGenerate, nMaxTries, true);
 }
 
-UniValue generatetoaddress(const UniValue& params, bool fHelp)
+UniValue generatetoaddress(const JSONRPCRequest& request)
 {
-    if (fHelp || params.size() < 2 || params.size() > 3)
+    if (request.fHelp || request.params.size() < 2 || request.params.size() > 3)
         throw runtime_error(
             "generatetoaddress numblocks address (maxtries)\n"
             "\nMine blocks immediately to a specified address (before the RPC call returns)\n"
@@ -199,13 +199,13 @@ UniValue generatetoaddress(const UniValue& params, bool fHelp)
             + HelpExampleCli("generatetoaddress", "11 \"myaddress\"")
         );
 
-    int nGenerate = params[0].get_int();
+    int nGenerate = request.params[0].get_int();
     uint64_t nMaxTries = 1000000;
-    if (params.size() > 2) {
-        nMaxTries = params[2].get_int();
+    if (request.params.size() > 2) {
+        nMaxTries = request.params[2].get_int();
     }
 
-    CBitcoinAddress address(params[1].get_str());
+    CBitcoinAddress address(request.params[1].get_str());
     if (!address.IsValid())
         throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Error: Invalid address");
     
@@ -215,9 +215,9 @@ UniValue generatetoaddress(const UniValue& params, bool fHelp)
     return generateBlocks(coinbaseScript, nGenerate, nMaxTries, false);
 }
 
-UniValue getmininginfo(const UniValue& params, bool fHelp)
+UniValue getmininginfo(const JSONRPCRequest& request)
 {
-    if (fHelp || params.size() != 0)
+    if (request.fHelp || request.params.size() != 0)
         throw runtime_error(
             "getmininginfo\n"
             "\nReturns a json object containing mining-related information."
@@ -248,7 +248,7 @@ UniValue getmininginfo(const UniValue& params, bool fHelp)
     obj.push_back(Pair("currentblocktx",   (uint64_t)nLastBlockTx));
     obj.push_back(Pair("difficulty",       (double)GetDifficulty()));
     obj.push_back(Pair("errors",           GetWarnings("statusbar")));
-    obj.push_back(Pair("networkhashps",    getnetworkhashps(params, false)));
+    obj.push_back(Pair("networkhashps",    getnetworkhashps(request)));
     obj.push_back(Pair("pooledtx",         (uint64_t)mempool.size()));
     obj.push_back(Pair("chain",            Params().NetworkIDString()));
     return obj;
@@ -256,9 +256,9 @@ UniValue getmininginfo(const UniValue& params, bool fHelp)
 
 
 // NOTE: Unlike wallet RPC (which use BTC values), mining RPCs follow GBT (BIP 22) in using satoshi amounts
-UniValue prioritisetransaction(const UniValue& params, bool fHelp)
+UniValue prioritisetransaction(const JSONRPCRequest& request)
 {
-    if (fHelp || params.size() != 3)
+    if (request.fHelp || request.params.size() != 3)
         throw runtime_error(
             "prioritisetransaction <txid> <priority delta> <fee delta>\n"
             "Accepts the transaction into mined blocks at a higher (or lower) priority\n"
@@ -279,10 +279,10 @@ UniValue prioritisetransaction(const UniValue& params, bool fHelp)
 
     LOCK(cs_main);
 
-    uint256 hash = ParseHashStr(params[0].get_str(), "txid");
-    CAmount nAmount = params[2].get_int64();
+    uint256 hash = ParseHashStr(request.params[0].get_str(), "txid");
+    CAmount nAmount = request.params[2].get_int64();
 
-    mempool.PrioritiseTransaction(hash, params[0].get_str(), params[1].get_real(), nAmount);
+    mempool.PrioritiseTransaction(hash, request.params[0].get_str(), request.params[1].get_real(), nAmount);
     return true;
 }
 
@@ -315,9 +315,9 @@ std::string gbt_vb_name(const Consensus::DeploymentPos pos) {
     return s;
 }
 
-UniValue getblocktemplate(const UniValue& params, bool fHelp)
+UniValue getblocktemplate(const JSONRPCRequest& request)
 {
-    if (fHelp || params.size() > 1)
+    if (request.fHelp || request.params.size() > 1)
         throw runtime_error(
             "getblocktemplate ( TemplateRequest )\n"
             "\nIf the request parameters include a 'mode' key, that is used to explicitly select between the default 'template' request or a 'proposal'.\n"
@@ -400,9 +400,9 @@ UniValue getblocktemplate(const UniValue& params, bool fHelp)
     UniValue lpval = NullUniValue;
     std::set<std::string> setClientRules;
     int64_t nMaxVersionPreVB = -1;
-    if (params.size() > 0)
+    if (request.params.size() > 0)
     {
-        const UniValue& oparam = params[0].get_obj();
+        const UniValue& oparam = request.params[0].get_obj();
         const UniValue& modeval = find_value(oparam, "mode");
         if (modeval.isStr())
             strMode = modeval.get_str();
@@ -705,9 +705,9 @@ class submitblock_StateCatcher : public CValidationInterface
     };
 };
 
-UniValue submitblock(const UniValue& params, bool fHelp)
+UniValue submitblock(const JSONRPCRequest& request)
 {
-    if (fHelp || params.size() < 1 || params.size() > 2)
+    if (request.fHelp || request.params.size() < 1 || request.params.size() > 2)
         throw runtime_error(
             "submitblock \"hexdata\" ( \"jsonparametersobject\" )\n"
             "\nAttempts to submit new block to network.\n"
@@ -727,7 +727,7 @@ UniValue submitblock(const UniValue& params, bool fHelp)
         );
 
     CBlock block;
-    if (!DecodeHexBlk(block, params[0].get_str()))
+    if (!DecodeHexBlk(block, request.params[0].get_str()))
         throw JSONRPCError(RPC_DESERIALIZATION_ERROR, "Block decode failed");
 
     uint256 hash = block.GetHash();
@@ -774,9 +774,9 @@ UniValue submitblock(const UniValue& params, bool fHelp)
     return BIP22ValidationResult(state);
 }
 
-UniValue estimatefee(const UniValue& params, bool fHelp)
+UniValue estimatefee(const JSONRPCRequest& request)
 {
-    if (fHelp || params.size() != 1)
+    if (request.fHelp || request.params.size() != 1)
         throw runtime_error(
             "estimatefee nblocks\n"
             "\nEstimates the approximate fee per kilobyte needed for a transaction to begin\n"
@@ -792,9 +792,9 @@ UniValue estimatefee(const UniValue& params, bool fHelp)
             + HelpExampleCli("estimatefee", "6")
             );
 
-    RPCTypeCheck(params, boost::assign::list_of(UniValue::VNUM));
+    RPCTypeCheck(request.params, boost::assign::list_of(UniValue::VNUM));
 
-    int nBlocks = params[0].get_int();
+    int nBlocks = request.params[0].get_int();
     if (nBlocks < 1)
         nBlocks = 1;
 
@@ -805,9 +805,9 @@ UniValue estimatefee(const UniValue& params, bool fHelp)
     return ValueFromAmount(feeRate.GetFeePerK());
 }
 
-UniValue estimatepriority(const UniValue& params, bool fHelp)
+UniValue estimatepriority(const JSONRPCRequest& request)
 {
-    if (fHelp || params.size() != 1)
+    if (request.fHelp || request.params.size() != 1)
         throw runtime_error(
             "estimatepriority nblocks\n"
             "\nEstimates the approximate priority a zero-fee transaction needs to begin\n"
@@ -823,18 +823,18 @@ UniValue estimatepriority(const UniValue& params, bool fHelp)
             + HelpExampleCli("estimatepriority", "6")
             );
 
-    RPCTypeCheck(params, boost::assign::list_of(UniValue::VNUM));
+    RPCTypeCheck(request.params, boost::assign::list_of(UniValue::VNUM));
 
-    int nBlocks = params[0].get_int();
+    int nBlocks = request.params[0].get_int();
     if (nBlocks < 1)
         nBlocks = 1;
 
     return mempool.estimatePriority(nBlocks);
 }
 
-UniValue estimatesmartfee(const UniValue& params, bool fHelp)
+UniValue estimatesmartfee(const JSONRPCRequest& request)
 {
-    if (fHelp || params.size() != 1)
+    if (request.fHelp || request.params.size() != 1)
         throw runtime_error(
             "estimatesmartfee nblocks\n"
             "\nWARNING: This interface is unstable and may disappear or change!\n"
@@ -856,9 +856,9 @@ UniValue estimatesmartfee(const UniValue& params, bool fHelp)
             + HelpExampleCli("estimatesmartfee", "6")
             );
 
-    RPCTypeCheck(params, boost::assign::list_of(UniValue::VNUM));
+    RPCTypeCheck(request.params, boost::assign::list_of(UniValue::VNUM));
 
-    int nBlocks = params[0].get_int();
+    int nBlocks = request.params[0].get_int();
 
     UniValue result(UniValue::VOBJ);
     int answerFound;
@@ -868,9 +868,9 @@ UniValue estimatesmartfee(const UniValue& params, bool fHelp)
     return result;
 }
 
-UniValue estimatesmartpriority(const UniValue& params, bool fHelp)
+UniValue estimatesmartpriority(const JSONRPCRequest& request)
 {
-    if (fHelp || params.size() != 1)
+    if (request.fHelp || request.params.size() != 1)
         throw runtime_error(
             "estimatesmartpriority nblocks\n"
             "\nWARNING: This interface is unstable and may disappear or change!\n"
@@ -892,9 +892,9 @@ UniValue estimatesmartpriority(const UniValue& params, bool fHelp)
             + HelpExampleCli("estimatesmartpriority", "6")
             );
 
-    RPCTypeCheck(params, boost::assign::list_of(UniValue::VNUM));
+    RPCTypeCheck(request.params, boost::assign::list_of(UniValue::VNUM));
 
-    int nBlocks = params[0].get_int();
+    int nBlocks = request.params[0].get_int();
 
     UniValue result(UniValue::VOBJ);
     int answerFound;
diff --git a/src/rpc/misc.cpp b/src/rpc/misc.cpp
index 6bbb3925ddece..eaef4856b3c5e 100644
--- a/src/rpc/misc.cpp
+++ b/src/rpc/misc.cpp
@@ -39,9 +39,9 @@ using namespace std;
  *
  * Or alternatively, create a specific query method for the information.
  **/
-UniValue getinfo(const UniValue& params, bool fHelp)
+UniValue getinfo(const JSONRPCRequest& request)
 {
-    if (fHelp || params.size() != 0)
+    if (request.fHelp || request.params.size() != 0)
         throw runtime_error(
             "getinfo\n"
             "\nDEPRECATED. Returns an object containing various state info.\n"
@@ -148,9 +148,9 @@ class DescribeAddressVisitor : public boost::static_visitor<UniValue>
 };
 #endif
 
-UniValue validateaddress(const UniValue& params, bool fHelp)
+UniValue validateaddress(const JSONRPCRequest& request)
 {
-    if (fHelp || params.size() != 1)
+    if (request.fHelp || request.params.size() != 1)
         throw runtime_error(
             "validateaddress \"bitcoinaddress\"\n"
             "\nReturn information about the given bitcoin address.\n"
@@ -181,7 +181,7 @@ UniValue validateaddress(const UniValue& params, bool fHelp)
     LOCK(cs_main);
 #endif
 
-    CBitcoinAddress address(params[0].get_str());
+    CBitcoinAddress address(request.params[0].get_str());
     bool isValid = address.IsValid();
 
     UniValue ret(UniValue::VOBJ);
@@ -278,9 +278,9 @@ CScript _createmultisig_redeemScript(const UniValue& params)
     return result;
 }
 
-UniValue createmultisig(const UniValue& params, bool fHelp)
+UniValue createmultisig(const JSONRPCRequest& request)
 {
-    if (fHelp || params.size() < 2 || params.size() > 2)
+    if (request.fHelp || request.params.size() < 2 || request.params.size() > 2)
     {
         string msg = "createmultisig nrequired [\"key\",...]\n"
             "\nCreates a multi-signature address with n signature of m keys required.\n"
@@ -310,7 +310,7 @@ UniValue createmultisig(const UniValue& params, bool fHelp)
     }
 
     // Construct using pay-to-script-hash:
-    CScript inner = _createmultisig_redeemScript(params);
+    CScript inner = _createmultisig_redeemScript(request.params);
     CScriptID innerID(inner);
     CBitcoinAddress address(innerID);
 
@@ -321,9 +321,9 @@ UniValue createmultisig(const UniValue& params, bool fHelp)
     return result;
 }
 
-UniValue verifymessage(const UniValue& params, bool fHelp)
+UniValue verifymessage(const JSONRPCRequest& request)
 {
-    if (fHelp || params.size() != 3)
+    if (request.fHelp || request.params.size() != 3)
         throw runtime_error(
             "verifymessage \"bitcoinaddress\" \"signature\" \"message\"\n"
             "\nVerify a signed message\n"
@@ -346,9 +346,9 @@ UniValue verifymessage(const UniValue& params, bool fHelp)
 
     LOCK(cs_main);
 
-    string strAddress  = params[0].get_str();
-    string strSign     = params[1].get_str();
-    string strMessage  = params[2].get_str();
+    string strAddress  = request.params[0].get_str();
+    string strSign     = request.params[1].get_str();
+    string strMessage  = request.params[2].get_str();
 
     CBitcoinAddress addr(strAddress);
     if (!addr.IsValid())
@@ -375,9 +375,9 @@ UniValue verifymessage(const UniValue& params, bool fHelp)
     return (pubkey.GetID() == keyID);
 }
 
-UniValue signmessagewithprivkey(const UniValue& params, bool fHelp)
+UniValue signmessagewithprivkey(const JSONRPCRequest& request)
 {
-    if (fHelp || params.size() != 2)
+    if (request.fHelp || request.params.size() != 2)
         throw runtime_error(
             "signmessagewithprivkey \"privkey\" \"message\"\n"
             "\nSign a message with the private key of an address\n"
@@ -395,8 +395,8 @@ UniValue signmessagewithprivkey(const UniValue& params, bool fHelp)
             + HelpExampleRpc("signmessagewithprivkey", "\"privkey\", \"my message\"")
         );
 
-    string strPrivkey = params[0].get_str();
-    string strMessage = params[1].get_str();
+    string strPrivkey = request.params[0].get_str();
+    string strMessage = request.params[1].get_str();
 
     CBitcoinSecret vchSecret;
     bool fGood = vchSecret.SetString(strPrivkey);
@@ -417,9 +417,9 @@ UniValue signmessagewithprivkey(const UniValue& params, bool fHelp)
     return EncodeBase64(&vchSig[0], vchSig.size());
 }
 
-UniValue setmocktime(const UniValue& params, bool fHelp)
+UniValue setmocktime(const JSONRPCRequest& request)
 {
-    if (fHelp || params.size() != 1)
+    if (request.fHelp || request.params.size() != 1)
         throw runtime_error(
             "setmocktime timestamp\n"
             "\nSet the local time to given timestamp (-regtest only)\n"
@@ -437,8 +437,8 @@ UniValue setmocktime(const UniValue& params, bool fHelp)
     // in a long time.
     LOCK(cs_main);
 
-    RPCTypeCheck(params, boost::assign::list_of(UniValue::VNUM));
-    SetMockTime(params[0].get_int64());
+    RPCTypeCheck(request.params, boost::assign::list_of(UniValue::VNUM));
+    SetMockTime(request.params[0].get_int64());
 
     uint64_t t = GetTime();
     if(g_connman) {
diff --git a/src/rpc/net.cpp b/src/rpc/net.cpp
index a8442d86929b7..2b43f08f0be0a 100644
--- a/src/rpc/net.cpp
+++ b/src/rpc/net.cpp
@@ -23,9 +23,9 @@
 
 using namespace std;
 
-UniValue getconnectioncount(const UniValue& params, bool fHelp)
+UniValue getconnectioncount(const JSONRPCRequest& request)
 {
-    if (fHelp || params.size() != 0)
+    if (request.fHelp || request.params.size() != 0)
         throw runtime_error(
             "getconnectioncount\n"
             "\nReturns the number of connections to other nodes.\n"
@@ -42,9 +42,9 @@ UniValue getconnectioncount(const UniValue& params, bool fHelp)
     return (int)g_connman->GetNodeCount(CConnman::CONNECTIONS_ALL);
 }
 
-UniValue ping(const UniValue& params, bool fHelp)
+UniValue ping(const JSONRPCRequest& request)
 {
-    if (fHelp || params.size() != 0)
+    if (request.fHelp || request.params.size() != 0)
         throw runtime_error(
             "ping\n"
             "\nRequests that a ping be sent to all other nodes, to measure ping time.\n"
@@ -65,9 +65,9 @@ UniValue ping(const UniValue& params, bool fHelp)
     return NullUniValue;
 }
 
-UniValue getpeerinfo(const UniValue& params, bool fHelp)
+UniValue getpeerinfo(const JSONRPCRequest& request)
 {
-    if (fHelp || params.size() != 0)
+    if (request.fHelp || request.params.size() != 0)
         throw runtime_error(
             "getpeerinfo\n"
             "\nReturns data about each connected network node as a json array of objects.\n"
@@ -184,12 +184,12 @@ UniValue getpeerinfo(const UniValue& params, bool fHelp)
     return ret;
 }
 
-UniValue addnode(const UniValue& params, bool fHelp)
+UniValue addnode(const JSONRPCRequest& request)
 {
     string strCommand;
-    if (params.size() == 2)
-        strCommand = params[1].get_str();
-    if (fHelp || params.size() != 2 ||
+    if (request.params.size() == 2)
+        strCommand = request.params[1].get_str();
+    if (request.fHelp || request.params.size() != 2 ||
         (strCommand != "onetry" && strCommand != "add" && strCommand != "remove"))
         throw runtime_error(
             "addnode \"node\" \"add|remove|onetry\"\n"
@@ -206,7 +206,7 @@ UniValue addnode(const UniValue& params, bool fHelp)
     if(!g_connman)
         throw JSONRPCError(RPC_CLIENT_P2P_DISABLED, "Error: Peer-to-peer functionality missing or disabled");
 
-    string strNode = params[0].get_str();
+    string strNode = request.params[0].get_str();
 
     if (strCommand == "onetry")
     {
@@ -229,9 +229,9 @@ UniValue addnode(const UniValue& params, bool fHelp)
     return NullUniValue;
 }
 
-UniValue disconnectnode(const UniValue& params, bool fHelp)
+UniValue disconnectnode(const JSONRPCRequest& request)
 {
-    if (fHelp || params.size() != 1)
+    if (request.fHelp || request.params.size() != 1)
         throw runtime_error(
             "disconnectnode \"node\" \n"
             "\nImmediately disconnects from the specified node.\n"
@@ -245,16 +245,16 @@ UniValue disconnectnode(const UniValue& params, bool fHelp)
     if(!g_connman)
         throw JSONRPCError(RPC_CLIENT_P2P_DISABLED, "Error: Peer-to-peer functionality missing or disabled");
 
-    bool ret = g_connman->DisconnectNode(params[0].get_str());
+    bool ret = g_connman->DisconnectNode(request.params[0].get_str());
     if (!ret)
         throw JSONRPCError(RPC_CLIENT_NODE_NOT_CONNECTED, "Node not found in connected nodes");
 
     return NullUniValue;
 }
 
-UniValue getaddednodeinfo(const UniValue& params, bool fHelp)
+UniValue getaddednodeinfo(const JSONRPCRequest& request)
 {
-    if (fHelp || params.size() > 1)
+    if (request.fHelp || request.params.size() > 1)
         throw runtime_error(
             "getaddednodeinfo ( \"node\" )\n"
             "\nReturns information about the given added node, or all added nodes\n"
@@ -286,10 +286,10 @@ UniValue getaddednodeinfo(const UniValue& params, bool fHelp)
 
     std::vector<AddedNodeInfo> vInfo = g_connman->GetAddedNodeInfo();
 
-    if (params.size() == 1) {
+    if (request.params.size() == 1) {
         bool found = false;
         for (const AddedNodeInfo& info : vInfo) {
-            if (info.strAddedNode == params[0].get_str()) {
+            if (info.strAddedNode == request.params[0].get_str()) {
                 vInfo.assign(1, info);
                 found = true;
                 break;
@@ -320,9 +320,9 @@ UniValue getaddednodeinfo(const UniValue& params, bool fHelp)
     return ret;
 }
 
-UniValue getnettotals(const UniValue& params, bool fHelp)
+UniValue getnettotals(const JSONRPCRequest& request)
 {
-    if (fHelp || params.size() > 0)
+    if (request.fHelp || request.params.size() > 0)
         throw runtime_error(
             "getnettotals\n"
             "\nReturns information about network traffic, including bytes in, bytes out,\n"
@@ -386,9 +386,9 @@ static UniValue GetNetworksInfo()
     return networks;
 }
 
-UniValue getnetworkinfo(const UniValue& params, bool fHelp)
+UniValue getnetworkinfo(const JSONRPCRequest& request)
 {
-    if (fHelp || params.size() != 0)
+    if (request.fHelp || request.params.size() != 0)
         throw runtime_error(
             "getnetworkinfo\n"
             "Returns an object containing various state info regarding P2P networking.\n"
@@ -456,12 +456,12 @@ UniValue getnetworkinfo(const UniValue& params, bool fHelp)
     return obj;
 }
 
-UniValue setban(const UniValue& params, bool fHelp)
+UniValue setban(const JSONRPCRequest& request)
 {
     string strCommand;
-    if (params.size() >= 2)
-        strCommand = params[1].get_str();
-    if (fHelp || params.size() < 2 ||
+    if (request.params.size() >= 2)
+        strCommand = request.params[1].get_str();
+    if (request.fHelp || request.params.size() < 2 ||
         (strCommand != "add" && strCommand != "remove"))
         throw runtime_error(
                             "setban \"ip(/netmask)\" \"add|remove\" (bantime) (absolute)\n"
@@ -483,16 +483,16 @@ UniValue setban(const UniValue& params, bool fHelp)
     CNetAddr netAddr;
     bool isSubnet = false;
 
-    if (params[0].get_str().find("/") != string::npos)
+    if (request.params[0].get_str().find("/") != string::npos)
         isSubnet = true;
 
     if (!isSubnet) {
         CNetAddr resolved;
-        LookupHost(params[0].get_str().c_str(), resolved, false);
+        LookupHost(request.params[0].get_str().c_str(), resolved, false);
         netAddr = resolved;
     }
     else
-        LookupSubNet(params[0].get_str().c_str(), subNet);
+        LookupSubNet(request.params[0].get_str().c_str(), subNet);
 
     if (! (isSubnet ? subNet.IsValid() : netAddr.IsValid()) )
         throw JSONRPCError(RPC_CLIENT_NODE_ALREADY_ADDED, "Error: Invalid IP/Subnet");
@@ -503,11 +503,11 @@ UniValue setban(const UniValue& params, bool fHelp)
             throw JSONRPCError(RPC_CLIENT_NODE_ALREADY_ADDED, "Error: IP/Subnet already banned");
 
         int64_t banTime = 0; //use standard bantime if not specified
-        if (params.size() >= 3 && !params[2].isNull())
-            banTime = params[2].get_int64();
+        if (request.params.size() >= 3 && !request.params[2].isNull())
+            banTime = request.params[2].get_int64();
 
         bool absolute = false;
-        if (params.size() == 4 && params[3].isTrue())
+        if (request.params.size() == 4 && request.params[3].isTrue())
             absolute = true;
 
         isSubnet ? g_connman->Ban(subNet, BanReasonManuallyAdded, banTime, absolute) : g_connman->Ban(netAddr, BanReasonManuallyAdded, banTime, absolute);
@@ -520,9 +520,9 @@ UniValue setban(const UniValue& params, bool fHelp)
     return NullUniValue;
 }
 
-UniValue listbanned(const UniValue& params, bool fHelp)
+UniValue listbanned(const JSONRPCRequest& request)
 {
-    if (fHelp || params.size() != 0)
+    if (request.fHelp || request.params.size() != 0)
         throw runtime_error(
                             "listbanned\n"
                             "\nList all banned IPs/Subnets.\n"
@@ -553,9 +553,9 @@ UniValue listbanned(const UniValue& params, bool fHelp)
     return bannedAddresses;
 }
 
-UniValue clearbanned(const UniValue& params, bool fHelp)
+UniValue clearbanned(const JSONRPCRequest& request)
 {
-    if (fHelp || params.size() != 0)
+    if (request.fHelp || request.params.size() != 0)
         throw runtime_error(
                             "clearbanned\n"
                             "\nClear all banned IPs.\n"
diff --git a/src/rpc/rawtransaction.cpp b/src/rpc/rawtransaction.cpp
index 2ea65b8e99ac4..0656a61755382 100644
--- a/src/rpc/rawtransaction.cpp
+++ b/src/rpc/rawtransaction.cpp
@@ -126,9 +126,9 @@ void TxToJSON(const CTransaction& tx, const uint256 hashBlock, UniValue& entry)
     }
 }
 
-UniValue getrawtransaction(const UniValue& params, bool fHelp)
+UniValue getrawtransaction(const JSONRPCRequest& request)
 {
-    if (fHelp || params.size() < 1 || params.size() > 2)
+    if (request.fHelp || request.params.size() < 1 || request.params.size() > 2)
         throw runtime_error(
             "getrawtransaction \"txid\" ( verbose )\n"
             "\nNOTE: By default this function only works sometimes. This is when the tx is in the mempool\n"
@@ -198,11 +198,11 @@ UniValue getrawtransaction(const UniValue& params, bool fHelp)
 
     LOCK(cs_main);
 
-    uint256 hash = ParseHashV(params[0], "parameter 1");
+    uint256 hash = ParseHashV(request.params[0], "parameter 1");
 
     bool fVerbose = false;
-    if (params.size() > 1)
-        fVerbose = (params[1].get_int() != 0);
+    if (request.params.size() > 1)
+        fVerbose = (request.params[1].get_int() != 0);
 
     CTransaction tx;
     uint256 hashBlock;
@@ -220,9 +220,9 @@ UniValue getrawtransaction(const UniValue& params, bool fHelp)
     return result;
 }
 
-UniValue gettxoutproof(const UniValue& params, bool fHelp)
+UniValue gettxoutproof(const JSONRPCRequest& request)
 {
-    if (fHelp || (params.size() != 1 && params.size() != 2))
+    if (request.fHelp || (request.params.size() != 1 && request.params.size() != 2))
         throw runtime_error(
             "gettxoutproof [\"txid\",...] ( blockhash )\n"
             "\nReturns a hex-encoded proof that \"txid\" was included in a block.\n"
@@ -244,7 +244,7 @@ UniValue gettxoutproof(const UniValue& params, bool fHelp)
 
     set<uint256> setTxids;
     uint256 oneTxid;
-    UniValue txids = params[0].get_array();
+    UniValue txids = request.params[0].get_array();
     for (unsigned int idx = 0; idx < txids.size(); idx++) {
         const UniValue& txid = txids[idx];
         if (txid.get_str().length() != 64 || !IsHex(txid.get_str()))
@@ -261,9 +261,9 @@ UniValue gettxoutproof(const UniValue& params, bool fHelp)
     CBlockIndex* pblockindex = NULL;
 
     uint256 hashBlock;
-    if (params.size() > 1)
+    if (request.params.size() > 1)
     {
-        hashBlock = uint256S(params[1].get_str());
+        hashBlock = uint256S(request.params[1].get_str());
         if (!mapBlockIndex.count(hashBlock))
             throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Block not found");
         pblockindex = mapBlockIndex[hashBlock];
@@ -301,9 +301,9 @@ UniValue gettxoutproof(const UniValue& params, bool fHelp)
     return strHex;
 }
 
-UniValue verifytxoutproof(const UniValue& params, bool fHelp)
+UniValue verifytxoutproof(const JSONRPCRequest& request)
 {
-    if (fHelp || params.size() != 1)
+    if (request.fHelp || request.params.size() != 1)
         throw runtime_error(
             "verifytxoutproof \"proof\"\n"
             "\nVerifies that a proof points to a transaction in a block, returning the transaction it commits to\n"
@@ -314,7 +314,7 @@ UniValue verifytxoutproof(const UniValue& params, bool fHelp)
             "[\"txid\"]      (array, strings) The txid(s) which the proof commits to, or empty array if the proof is invalid\n"
         );
 
-    CDataStream ssMB(ParseHexV(params[0], "proof"), SER_NETWORK, PROTOCOL_VERSION | SERIALIZE_TRANSACTION_NO_WITNESS);
+    CDataStream ssMB(ParseHexV(request.params[0], "proof"), SER_NETWORK, PROTOCOL_VERSION | SERIALIZE_TRANSACTION_NO_WITNESS);
     CMerkleBlock merkleBlock;
     ssMB >> merkleBlock;
 
@@ -335,9 +335,9 @@ UniValue verifytxoutproof(const UniValue& params, bool fHelp)
     return res;
 }
 
-UniValue createrawtransaction(const UniValue& params, bool fHelp)
+UniValue createrawtransaction(const JSONRPCRequest& request)
 {
-    if (fHelp || params.size() < 2 || params.size() > 3)
+    if (request.fHelp || request.params.size() < 2 || request.params.size() > 3)
         throw runtime_error(
             "createrawtransaction [{\"txid\":\"id\",\"vout\":n},...] {\"address\":amount,\"data\":\"hex\",...} ( locktime )\n"
             "\nCreate a transaction spending the given inputs and creating new outputs.\n"
@@ -373,17 +373,17 @@ UniValue createrawtransaction(const UniValue& params, bool fHelp)
             + HelpExampleRpc("createrawtransaction", "\"[{\\\"txid\\\":\\\"myid\\\",\\\"vout\\\":0}]\", \"{\\\"data\\\":\\\"00010203\\\"}\"")
         );
 
-    RPCTypeCheck(params, boost::assign::list_of(UniValue::VARR)(UniValue::VOBJ)(UniValue::VNUM), true);
-    if (params[0].isNull() || params[1].isNull())
+    RPCTypeCheck(request.params, boost::assign::list_of(UniValue::VARR)(UniValue::VOBJ)(UniValue::VNUM), true);
+    if (request.params[0].isNull() || request.params[1].isNull())
         throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid parameter, arguments 1 and 2 must be non-null");
 
-    UniValue inputs = params[0].get_array();
-    UniValue sendTo = params[1].get_obj();
+    UniValue inputs = request.params[0].get_array();
+    UniValue sendTo = request.params[1].get_obj();
 
     CMutableTransaction rawTx;
 
-    if (params.size() > 2 && !params[2].isNull()) {
-        int64_t nLockTime = params[2].get_int64();
+    if (request.params.size() > 2 && !request.params[2].isNull()) {
+        int64_t nLockTime = request.params[2].get_int64();
         if (nLockTime < 0 || nLockTime > std::numeric_limits<uint32_t>::max())
             throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid parameter, locktime out of range");
         rawTx.nLockTime = nLockTime;
@@ -448,9 +448,9 @@ UniValue createrawtransaction(const UniValue& params, bool fHelp)
     return EncodeHexTx(rawTx);
 }
 
-UniValue decoderawtransaction(const UniValue& params, bool fHelp)
+UniValue decoderawtransaction(const JSONRPCRequest& request)
 {
-    if (fHelp || params.size() != 1)
+    if (request.fHelp || request.params.size() != 1)
         throw runtime_error(
             "decoderawtransaction \"hexstring\"\n"
             "\nReturn a JSON object representing the serialized, hex-encoded transaction.\n"
@@ -504,11 +504,11 @@ UniValue decoderawtransaction(const UniValue& params, bool fHelp)
         );
 
     LOCK(cs_main);
-    RPCTypeCheck(params, boost::assign::list_of(UniValue::VSTR));
+    RPCTypeCheck(request.params, boost::assign::list_of(UniValue::VSTR));
 
     CTransaction tx;
 
-    if (!DecodeHexTx(tx, params[0].get_str(), true))
+    if (!DecodeHexTx(tx, request.params[0].get_str(), true))
         throw JSONRPCError(RPC_DESERIALIZATION_ERROR, "TX decode failed");
 
     UniValue result(UniValue::VOBJ);
@@ -517,9 +517,9 @@ UniValue decoderawtransaction(const UniValue& params, bool fHelp)
     return result;
 }
 
-UniValue decodescript(const UniValue& params, bool fHelp)
+UniValue decodescript(const JSONRPCRequest& request)
 {
-    if (fHelp || params.size() != 1)
+    if (request.fHelp || request.params.size() != 1)
         throw runtime_error(
             "decodescript \"hex\"\n"
             "\nDecode a hex-encoded script.\n"
@@ -542,12 +542,12 @@ UniValue decodescript(const UniValue& params, bool fHelp)
             + HelpExampleRpc("decodescript", "\"hexstring\"")
         );
 
-    RPCTypeCheck(params, boost::assign::list_of(UniValue::VSTR));
+    RPCTypeCheck(request.params, boost::assign::list_of(UniValue::VSTR));
 
     UniValue r(UniValue::VOBJ);
     CScript script;
-    if (params[0].get_str().size() > 0){
-        vector<unsigned char> scriptData(ParseHexV(params[0], "argument"));
+    if (request.params[0].get_str().size() > 0){
+        vector<unsigned char> scriptData(ParseHexV(request.params[0], "argument"));
         script = CScript(scriptData.begin(), scriptData.end());
     } else {
         // Empty scripts are valid
@@ -578,9 +578,9 @@ static void TxInErrorToJSON(const CTxIn& txin, UniValue& vErrorsRet, const std::
     vErrorsRet.push_back(entry);
 }
 
-UniValue signrawtransaction(const UniValue& params, bool fHelp)
+UniValue signrawtransaction(const JSONRPCRequest& request)
 {
-    if (fHelp || params.size() < 1 || params.size() > 4)
+    if (request.fHelp || request.params.size() < 1 || request.params.size() > 4)
         throw runtime_error(
             "signrawtransaction \"hexstring\" ( [{\"txid\":\"id\",\"vout\":n,\"scriptPubKey\":\"hex\",\"redeemScript\":\"hex\"},...] [\"privatekey1\",...] sighashtype )\n"
             "\nSign inputs for raw transaction (serialized, hex-encoded).\n"
@@ -644,9 +644,9 @@ UniValue signrawtransaction(const UniValue& params, bool fHelp)
 #else
     LOCK(cs_main);
 #endif
-    RPCTypeCheck(params, boost::assign::list_of(UniValue::VSTR)(UniValue::VARR)(UniValue::VARR)(UniValue::VSTR), true);
+    RPCTypeCheck(request.params, boost::assign::list_of(UniValue::VSTR)(UniValue::VARR)(UniValue::VARR)(UniValue::VSTR), true);
 
-    vector<unsigned char> txData(ParseHexV(params[0], "argument 1"));
+    vector<unsigned char> txData(ParseHexV(request.params[0], "argument 1"));
     CDataStream ssData(txData, SER_NETWORK, PROTOCOL_VERSION);
     vector<CMutableTransaction> txVariants;
     while (!ssData.empty()) {
@@ -687,9 +687,9 @@ UniValue signrawtransaction(const UniValue& params, bool fHelp)
 
     bool fGivenKeys = false;
     CBasicKeyStore tempKeystore;
-    if (params.size() > 2 && !params[2].isNull()) {
+    if (request.params.size() > 2 && !request.params[2].isNull()) {
         fGivenKeys = true;
-        UniValue keys = params[2].get_array();
+        UniValue keys = request.params[2].get_array();
         for (unsigned int idx = 0; idx < keys.size(); idx++) {
             UniValue k = keys[idx];
             CBitcoinSecret vchSecret;
@@ -708,8 +708,8 @@ UniValue signrawtransaction(const UniValue& params, bool fHelp)
 #endif
 
     // Add previous txouts given in the RPC call:
-    if (params.size() > 1 && !params[1].isNull()) {
-        UniValue prevTxs = params[1].get_array();
+    if (request.params.size() > 1 && !request.params[1].isNull()) {
+        UniValue prevTxs = request.params[1].get_array();
         for (unsigned int idx = 0; idx < prevTxs.size(); idx++) {
             const UniValue& p = prevTxs[idx];
             if (!p.isObject())
@@ -777,7 +777,7 @@ UniValue signrawtransaction(const UniValue& params, bool fHelp)
 #endif
 
     int nHashType = SIGHASH_ALL;
-    if (params.size() > 3 && !params[3].isNull()) {
+    if (request.params.size() > 3 && !request.params[3].isNull()) {
         static map<string, int> mapSigHashValues =
             boost::assign::map_list_of
             (string("ALL"), int(SIGHASH_ALL))
@@ -787,7 +787,7 @@ UniValue signrawtransaction(const UniValue& params, bool fHelp)
             (string("SINGLE"), int(SIGHASH_SINGLE))
             (string("SINGLE|ANYONECANPAY"), int(SIGHASH_SINGLE|SIGHASH_ANYONECANPAY))
             ;
-        string strHashType = params[3].get_str();
+        string strHashType = request.params[3].get_str();
         if (mapSigHashValues.count(strHashType))
             nHashType = mapSigHashValues[strHashType];
         else
@@ -842,9 +842,9 @@ UniValue signrawtransaction(const UniValue& params, bool fHelp)
     return result;
 }
 
-UniValue sendrawtransaction(const UniValue& params, bool fHelp)
+UniValue sendrawtransaction(const JSONRPCRequest& request)
 {
-    if (fHelp || params.size() < 1 || params.size() > 2)
+    if (request.fHelp || request.params.size() < 1 || request.params.size() > 2)
         throw runtime_error(
             "sendrawtransaction \"hexstring\" ( allowhighfees )\n"
             "\nSubmits raw transaction (serialized, hex-encoded) to local node and network.\n"
@@ -866,17 +866,17 @@ UniValue sendrawtransaction(const UniValue& params, bool fHelp)
         );
 
     LOCK(cs_main);
-    RPCTypeCheck(params, boost::assign::list_of(UniValue::VSTR)(UniValue::VBOOL));
+    RPCTypeCheck(request.params, boost::assign::list_of(UniValue::VSTR)(UniValue::VBOOL));
 
     // parse hex string from parameter
     CTransaction tx;
-    if (!DecodeHexTx(tx, params[0].get_str()))
+    if (!DecodeHexTx(tx, request.params[0].get_str()))
         throw JSONRPCError(RPC_DESERIALIZATION_ERROR, "TX decode failed");
     uint256 hashTx = tx.GetHash();
 
     bool fLimitFree = false;
     CAmount nMaxRawTxFee = maxTxFee;
-    if (params.size() > 1 && params[1].get_bool())
+    if (request.params.size() > 1 && request.params[1].get_bool())
         nMaxRawTxFee = 0;
 
     CCoinsViewCache &view = *pcoinsTip;
diff --git a/src/rpc/server.cpp b/src/rpc/server.cpp
index 5fb97f7496217..29d0bee1b2789 100644
--- a/src/rpc/server.cpp
+++ b/src/rpc/server.cpp
@@ -195,10 +195,11 @@ std::string CRPCTable::help(const std::string& strCommand) const
             continue;
         try
         {
-            UniValue params;
+            JSONRPCRequest jreq;
+            jreq.fHelp = true;
             rpcfn_type pfn = pcmd->actor;
             if (setDone.insert(pfn).second)
-                (*pfn)(params, true);
+                (*pfn)(jreq);
         }
         catch (const std::exception& e)
         {
@@ -228,9 +229,9 @@ std::string CRPCTable::help(const std::string& strCommand) const
     return strRet;
 }
 
-UniValue help(const UniValue& params, bool fHelp)
+UniValue help(const JSONRPCRequest& jsonRequest)
 {
-    if (fHelp || params.size() > 1)
+    if (jsonRequest.fHelp || jsonRequest.params.size() > 1)
         throw runtime_error(
             "help ( \"command\" )\n"
             "\nList all commands, or get help for a specified command.\n"
@@ -241,17 +242,17 @@ UniValue help(const UniValue& params, bool fHelp)
         );
 
     string strCommand;
-    if (params.size() > 0)
-        strCommand = params[0].get_str();
+    if (jsonRequest.params.size() > 0)
+        strCommand = jsonRequest.params[0].get_str();
 
     return tableRPC.help(strCommand);
 }
 
 
-UniValue stop(const UniValue& params, bool fHelp)
+UniValue stop(const JSONRPCRequest& jsonRequest)
 {
     // Accept the deprecated and ignored 'detach' boolean argument
-    if (fHelp || params.size() > 1)
+    if (jsonRequest.fHelp || jsonRequest.params.size() > 1)
         throw runtime_error(
             "stop\n"
             "\nStop Bitcoin server.");
@@ -354,7 +355,7 @@ bool RPCIsInWarmup(std::string *outStatus)
     return fRPCInWarmup;
 }
 
-void JSONRequest::parse(const UniValue& valRequest)
+void JSONRPCRequest::parse(const UniValue& valRequest)
 {
     // Parse request
     if (!valRequest.isObject())
@@ -388,11 +389,11 @@ static UniValue JSONRPCExecOne(const UniValue& req)
 {
     UniValue rpc_result(UniValue::VOBJ);
 
-    JSONRequest jreq;
+    JSONRPCRequest jreq;
     try {
         jreq.parse(req);
 
-        UniValue result = tableRPC.execute(jreq.strMethod, jreq.params);
+        UniValue result = tableRPC.execute(jreq);
         rpc_result = JSONRPCReplyObj(result, NullUniValue, jreq.id);
     }
     catch (const UniValue& objError)
@@ -417,7 +418,7 @@ std::string JSONRPCExecBatch(const UniValue& vReq)
     return ret.write() + "\n";
 }
 
-UniValue CRPCTable::execute(const std::string &strMethod, const UniValue &params) const
+UniValue CRPCTable::execute(const JSONRPCRequest &request) const
 {
     // Return immediately if in warmup
     {
@@ -427,7 +428,7 @@ UniValue CRPCTable::execute(const std::string &strMethod, const UniValue &params
     }
 
     // Find method
-    const CRPCCommand *pcmd = tableRPC[strMethod];
+    const CRPCCommand *pcmd = tableRPC[request.strMethod];
     if (!pcmd)
         throw JSONRPCError(RPC_METHOD_NOT_FOUND, "Method not found");
 
@@ -436,7 +437,7 @@ UniValue CRPCTable::execute(const std::string &strMethod, const UniValue &params
     try
     {
         // Execute
-        return pcmd->actor(params, false);
+        return pcmd->actor(request);
     }
     catch (const std::exception& e)
     {
diff --git a/src/rpc/server.h b/src/rpc/server.h
index 4e0aa2c6d6f6f..d8b5097035c91 100644
--- a/src/rpc/server.h
+++ b/src/rpc/server.h
@@ -41,14 +41,16 @@ struct UniValueType {
     UniValue::VType type;
 };
 
-class JSONRequest
+class JSONRPCRequest
 {
 public:
     UniValue id;
     std::string strMethod;
     UniValue params;
+    bool fHelp;
+    std::string URI;
 
-    JSONRequest() { id = NullUniValue; }
+    JSONRPCRequest() { id = NullUniValue; }
     void parse(const UniValue& valRequest);
 };
 
@@ -122,7 +124,7 @@ void RPCUnsetTimerInterface(RPCTimerInterface *iface);
  */
 void RPCRunLater(const std::string& name, boost::function<void(void)> func, int64_t nSeconds);
 
-typedef UniValue(*rpcfn_type)(const UniValue& params, bool fHelp);
+typedef UniValue(*rpcfn_type)(const JSONRPCRequest& jsonRequest);
 
 class CRPCCommand
 {
@@ -147,12 +149,11 @@ class CRPCTable
 
     /**
      * Execute a method.
-     * @param method   Method to execute
-     * @param params   UniValue Array of arguments (JSON objects)
+     * @param request The JSONRPCRequest to execute
      * @returns Result of the call.
      * @throws an exception (UniValue) when an error happens.
      */
-    UniValue execute(const std::string &method, const UniValue &params) const;
+    UniValue execute(const JSONRPCRequest &request) const;
 
     /**
     * Returns a list of registered commands
diff --git a/src/test/rpc_tests.cpp b/src/test/rpc_tests.cpp
index a15915aad2f10..a3d1a2558904d 100644
--- a/src/test/rpc_tests.cpp
+++ b/src/test/rpc_tests.cpp
@@ -24,11 +24,14 @@ UniValue CallRPC(string args)
     boost::split(vArgs, args, boost::is_any_of(" \t"));
     string strMethod = vArgs[0];
     vArgs.erase(vArgs.begin());
-    UniValue params = RPCConvertValues(strMethod, vArgs);
+    JSONRPCRequest request;
+    request.strMethod = strMethod;
+    request.params = RPCConvertValues(strMethod, vArgs);
+    request.fHelp = false;
     BOOST_CHECK(tableRPC[strMethod]);
     rpcfn_type method = tableRPC[strMethod]->actor;
     try {
-        UniValue result = (*method)(params, false);
+        UniValue result = (*method)(request);
         return result;
     }
     catch (const UniValue& objError) {
diff --git a/src/wallet/rpcdump.cpp b/src/wallet/rpcdump.cpp
index e80fa7dff81d8..8a1bbd5684526 100644
--- a/src/wallet/rpcdump.cpp
+++ b/src/wallet/rpcdump.cpp
@@ -74,12 +74,12 @@ std::string DecodeDumpString(const std::string &str) {
     return ret.str();
 }
 
-UniValue importprivkey(const UniValue& params, bool fHelp)
+UniValue importprivkey(const JSONRPCRequest& request)
 {
-    if (!EnsureWalletIsAvailable(fHelp))
+    if (!EnsureWalletIsAvailable(request.fHelp))
         return NullUniValue;
     
-    if (fHelp || params.size() < 1 || params.size() > 3)
+    if (request.fHelp || request.params.size() < 1 || request.params.size() > 3)
         throw runtime_error(
             "importprivkey \"bitcoinprivkey\" ( \"label\" rescan )\n"
             "\nAdds a private key (as returned by dumpprivkey) to your wallet.\n"
@@ -104,15 +104,15 @@ UniValue importprivkey(const UniValue& params, bool fHelp)
 
     EnsureWalletIsUnlocked();
 
-    string strSecret = params[0].get_str();
+    string strSecret = request.params[0].get_str();
     string strLabel = "";
-    if (params.size() > 1)
-        strLabel = params[1].get_str();
+    if (request.params.size() > 1)
+        strLabel = request.params[1].get_str();
 
     // Whether to perform rescan after import
     bool fRescan = true;
-    if (params.size() > 2)
-        fRescan = params[2].get_bool();
+    if (request.params.size() > 2)
+        fRescan = request.params[2].get_bool();
 
     if (fRescan && fPruneMode)
         throw JSONRPCError(RPC_WALLET_ERROR, "Rescan is disabled in pruned mode");
@@ -184,12 +184,12 @@ void ImportAddress(const CBitcoinAddress& address, const string& strLabel)
         pwalletMain->SetAddressBook(address.Get(), strLabel, "receive");
 }
 
-UniValue importaddress(const UniValue& params, bool fHelp)
+UniValue importaddress(const JSONRPCRequest& request)
 {
-    if (!EnsureWalletIsAvailable(fHelp))
+    if (!EnsureWalletIsAvailable(request.fHelp))
         return NullUniValue;
     
-    if (fHelp || params.size() < 1 || params.size() > 4)
+    if (request.fHelp || request.params.size() < 1 || request.params.size() > 4)
         throw runtime_error(
             "importaddress \"address\" ( \"label\" rescan p2sh )\n"
             "\nAdds a script (in hex) or address that can be watched as if it were in your wallet but cannot be used to spend.\n"
@@ -213,31 +213,31 @@ UniValue importaddress(const UniValue& params, bool fHelp)
 
 
     string strLabel = "";
-    if (params.size() > 1)
-        strLabel = params[1].get_str();
+    if (request.params.size() > 1)
+        strLabel = request.params[1].get_str();
 
     // Whether to perform rescan after import
     bool fRescan = true;
-    if (params.size() > 2)
-        fRescan = params[2].get_bool();
+    if (request.params.size() > 2)
+        fRescan = request.params[2].get_bool();
 
     if (fRescan && fPruneMode)
         throw JSONRPCError(RPC_WALLET_ERROR, "Rescan is disabled in pruned mode");
 
     // Whether to import a p2sh version, too
     bool fP2SH = false;
-    if (params.size() > 3)
-        fP2SH = params[3].get_bool();
+    if (request.params.size() > 3)
+        fP2SH = request.params[3].get_bool();
 
     LOCK2(cs_main, pwalletMain->cs_wallet);
 
-    CBitcoinAddress address(params[0].get_str());
+    CBitcoinAddress address(request.params[0].get_str());
     if (address.IsValid()) {
         if (fP2SH)
             throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Cannot use the p2sh flag with an address - use a script instead");
         ImportAddress(address, strLabel);
-    } else if (IsHex(params[0].get_str())) {
-        std::vector<unsigned char> data(ParseHex(params[0].get_str()));
+    } else if (IsHex(request.params[0].get_str())) {
+        std::vector<unsigned char> data(ParseHex(request.params[0].get_str()));
         ImportScript(CScript(data.begin(), data.end()), strLabel, fP2SH);
     } else {
         throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid Bitcoin address or script");
@@ -252,12 +252,12 @@ UniValue importaddress(const UniValue& params, bool fHelp)
     return NullUniValue;
 }
 
-UniValue importprunedfunds(const UniValue& params, bool fHelp)
+UniValue importprunedfunds(const JSONRPCRequest& request)
 {
-    if (!EnsureWalletIsAvailable(fHelp))
+    if (!EnsureWalletIsAvailable(request.fHelp))
         return NullUniValue;
 
-    if (fHelp || params.size() != 2)
+    if (request.fHelp || request.params.size() != 2)
         throw runtime_error(
             "importprunedfunds\n"
             "\nImports funds without rescan. Corresponding address or script must previously be included in wallet. Aimed towards pruned wallets. The end-user is responsible to import additional transactions that subsequently spend the imported outputs or rescan after the point in the blockchain the transaction is included.\n"
@@ -267,12 +267,12 @@ UniValue importprunedfunds(const UniValue& params, bool fHelp)
         );
 
     CTransaction tx;
-    if (!DecodeHexTx(tx, params[0].get_str()))
+    if (!DecodeHexTx(tx, request.params[0].get_str()))
         throw JSONRPCError(RPC_DESERIALIZATION_ERROR, "TX decode failed");
     uint256 hashTx = tx.GetHash();
     CWalletTx wtx(pwalletMain,tx);
 
-    CDataStream ssMB(ParseHexV(params[1], "proof"), SER_NETWORK, PROTOCOL_VERSION);
+    CDataStream ssMB(ParseHexV(request.params[1], "proof"), SER_NETWORK, PROTOCOL_VERSION);
     CMerkleBlock merkleBlock;
     ssMB >> merkleBlock;
 
@@ -311,12 +311,12 @@ UniValue importprunedfunds(const UniValue& params, bool fHelp)
     throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "No addresses in wallet correspond to included transaction");
 }
 
-UniValue removeprunedfunds(const UniValue& params, bool fHelp)
+UniValue removeprunedfunds(const JSONRPCRequest& request)
 {
-    if (!EnsureWalletIsAvailable(fHelp))
+    if (!EnsureWalletIsAvailable(request.fHelp))
         return NullUniValue;
 
-    if (fHelp || params.size() != 1)
+    if (request.fHelp || request.params.size() != 1)
         throw runtime_error(
             "removeprunedfunds \"txid\"\n"
             "\nDeletes the specified transaction from the wallet. Meant for use with pruned wallets and as a companion to importprunedfunds. This will effect wallet balances.\n"
@@ -331,7 +331,7 @@ UniValue removeprunedfunds(const UniValue& params, bool fHelp)
     LOCK2(cs_main, pwalletMain->cs_wallet);
 
     uint256 hash;
-    hash.SetHex(params[0].get_str());
+    hash.SetHex(request.params[0].get_str());
     vector<uint256> vHash;
     vHash.push_back(hash);
     vector<uint256> vHashOut;
@@ -347,12 +347,12 @@ UniValue removeprunedfunds(const UniValue& params, bool fHelp)
     return NullUniValue;
 }
 
-UniValue importpubkey(const UniValue& params, bool fHelp)
+UniValue importpubkey(const JSONRPCRequest& request)
 {
-    if (!EnsureWalletIsAvailable(fHelp))
+    if (!EnsureWalletIsAvailable(request.fHelp))
         return NullUniValue;
 
-    if (fHelp || params.size() < 1 || params.size() > 4)
+    if (request.fHelp || request.params.size() < 1 || request.params.size() > 4)
         throw runtime_error(
             "importpubkey \"pubkey\" ( \"label\" rescan )\n"
             "\nAdds a public key (in hex) that can be watched as if it were in your wallet but cannot be used to spend.\n"
@@ -372,20 +372,20 @@ UniValue importpubkey(const UniValue& params, bool fHelp)
 
 
     string strLabel = "";
-    if (params.size() > 1)
-        strLabel = params[1].get_str();
+    if (request.params.size() > 1)
+        strLabel = request.params[1].get_str();
 
     // Whether to perform rescan after import
     bool fRescan = true;
-    if (params.size() > 2)
-        fRescan = params[2].get_bool();
+    if (request.params.size() > 2)
+        fRescan = request.params[2].get_bool();
 
     if (fRescan && fPruneMode)
         throw JSONRPCError(RPC_WALLET_ERROR, "Rescan is disabled in pruned mode");
 
-    if (!IsHex(params[0].get_str()))
+    if (!IsHex(request.params[0].get_str()))
         throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Pubkey must be a hex string");
-    std::vector<unsigned char> data(ParseHex(params[0].get_str()));
+    std::vector<unsigned char> data(ParseHex(request.params[0].get_str()));
     CPubKey pubKey(data.begin(), data.end());
     if (!pubKey.IsFullyValid())
         throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Pubkey is not a valid public key");
@@ -405,12 +405,12 @@ UniValue importpubkey(const UniValue& params, bool fHelp)
 }
 
 
-UniValue importwallet(const UniValue& params, bool fHelp)
+UniValue importwallet(const JSONRPCRequest& request)
 {
-    if (!EnsureWalletIsAvailable(fHelp))
+    if (!EnsureWalletIsAvailable(request.fHelp))
         return NullUniValue;
     
-    if (fHelp || params.size() != 1)
+    if (request.fHelp || request.params.size() != 1)
         throw runtime_error(
             "importwallet \"filename\"\n"
             "\nImports keys from a wallet dump file (see dumpwallet).\n"
@@ -433,7 +433,7 @@ UniValue importwallet(const UniValue& params, bool fHelp)
     EnsureWalletIsUnlocked();
 
     ifstream file;
-    file.open(params[0].get_str().c_str(), std::ios::in | std::ios::ate);
+    file.open(request.params[0].get_str().c_str(), std::ios::in | std::ios::ate);
     if (!file.is_open())
         throw JSONRPCError(RPC_INVALID_PARAMETER, "Cannot open wallet dump file");
 
@@ -512,12 +512,12 @@ UniValue importwallet(const UniValue& params, bool fHelp)
     return NullUniValue;
 }
 
-UniValue dumpprivkey(const UniValue& params, bool fHelp)
+UniValue dumpprivkey(const JSONRPCRequest& request)
 {
-    if (!EnsureWalletIsAvailable(fHelp))
+    if (!EnsureWalletIsAvailable(request.fHelp))
         return NullUniValue;
     
-    if (fHelp || params.size() != 1)
+    if (request.fHelp || request.params.size() != 1)
         throw runtime_error(
             "dumpprivkey \"bitcoinaddress\"\n"
             "\nReveals the private key corresponding to 'bitcoinaddress'.\n"
@@ -536,7 +536,7 @@ UniValue dumpprivkey(const UniValue& params, bool fHelp)
 
     EnsureWalletIsUnlocked();
 
-    string strAddress = params[0].get_str();
+    string strAddress = request.params[0].get_str();
     CBitcoinAddress address;
     if (!address.SetString(strAddress))
         throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid Bitcoin address");
@@ -550,12 +550,12 @@ UniValue dumpprivkey(const UniValue& params, bool fHelp)
 }
 
 
-UniValue dumpwallet(const UniValue& params, bool fHelp)
+UniValue dumpwallet(const JSONRPCRequest& request)
 {
-    if (!EnsureWalletIsAvailable(fHelp))
+    if (!EnsureWalletIsAvailable(request.fHelp))
         return NullUniValue;
     
-    if (fHelp || params.size() != 1)
+    if (request.fHelp || request.params.size() != 1)
         throw runtime_error(
             "dumpwallet \"filename\"\n"
             "\nDumps all wallet keys in a human-readable format.\n"
@@ -571,7 +571,7 @@ UniValue dumpwallet(const UniValue& params, bool fHelp)
     EnsureWalletIsUnlocked();
 
     ofstream file;
-    file.open(params[0].get_str().c_str());
+    file.open(request.params[0].get_str().c_str());
     if (!file.is_open())
         throw JSONRPCError(RPC_INVALID_PARAMETER, "Cannot open wallet dump file");
 
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index 8e95426d11bdf..33620aa6ff59e 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -101,12 +101,12 @@ string AccountFromValue(const UniValue& value)
     return strAccount;
 }
 
-UniValue getnewaddress(const UniValue& params, bool fHelp)
+UniValue getnewaddress(const JSONRPCRequest& request)
 {
-    if (!EnsureWalletIsAvailable(fHelp))
+    if (!EnsureWalletIsAvailable(request.fHelp))
         return NullUniValue;
 
-    if (fHelp || params.size() > 1)
+    if (request.fHelp || request.params.size() > 1)
         throw runtime_error(
             "getnewaddress ( \"account\" )\n"
             "\nReturns a new Bitcoin address for receiving payments.\n"
@@ -125,8 +125,8 @@ UniValue getnewaddress(const UniValue& params, bool fHelp)
 
     // Parse the account first so we don't generate a key if there's an error
     string strAccount;
-    if (params.size() > 0)
-        strAccount = AccountFromValue(params[0]);
+    if (request.params.size() > 0)
+        strAccount = AccountFromValue(request.params[0]);
 
     if (!pwalletMain->IsLocked())
         pwalletMain->TopUpKeyPool();
@@ -153,12 +153,12 @@ CBitcoinAddress GetAccountAddress(string strAccount, bool bForceNew=false)
     return CBitcoinAddress(pubKey.GetID());
 }
 
-UniValue getaccountaddress(const UniValue& params, bool fHelp)
+UniValue getaccountaddress(const JSONRPCRequest& request)
 {
-    if (!EnsureWalletIsAvailable(fHelp))
+    if (!EnsureWalletIsAvailable(request.fHelp))
         return NullUniValue;
 
-    if (fHelp || params.size() != 1)
+    if (request.fHelp || request.params.size() != 1)
         throw runtime_error(
             "getaccountaddress \"account\"\n"
             "\nDEPRECATED. Returns the current Bitcoin address for receiving payments to this account.\n"
@@ -176,7 +176,7 @@ UniValue getaccountaddress(const UniValue& params, bool fHelp)
     LOCK2(cs_main, pwalletMain->cs_wallet);
 
     // Parse the account first so we don't generate a key if there's an error
-    string strAccount = AccountFromValue(params[0]);
+    string strAccount = AccountFromValue(request.params[0]);
 
     UniValue ret(UniValue::VSTR);
 
@@ -185,12 +185,12 @@ UniValue getaccountaddress(const UniValue& params, bool fHelp)
 }
 
 
-UniValue getrawchangeaddress(const UniValue& params, bool fHelp)
+UniValue getrawchangeaddress(const JSONRPCRequest& request)
 {
-    if (!EnsureWalletIsAvailable(fHelp))
+    if (!EnsureWalletIsAvailable(request.fHelp))
         return NullUniValue;
 
-    if (fHelp || params.size() > 1)
+    if (request.fHelp || request.params.size() > 1)
         throw runtime_error(
             "getrawchangeaddress\n"
             "\nReturns a new Bitcoin address, for receiving change.\n"
@@ -220,12 +220,12 @@ UniValue getrawchangeaddress(const UniValue& params, bool fHelp)
 }
 
 
-UniValue setaccount(const UniValue& params, bool fHelp)
+UniValue setaccount(const JSONRPCRequest& request)
 {
-    if (!EnsureWalletIsAvailable(fHelp))
+    if (!EnsureWalletIsAvailable(request.fHelp))
         return NullUniValue;
 
-    if (fHelp || params.size() < 1 || params.size() > 2)
+    if (request.fHelp || request.params.size() < 1 || request.params.size() > 2)
         throw runtime_error(
             "setaccount \"bitcoinaddress\" \"account\"\n"
             "\nDEPRECATED. Sets the account associated with the given address.\n"
@@ -239,13 +239,13 @@ UniValue setaccount(const UniValue& params, bool fHelp)
 
     LOCK2(cs_main, pwalletMain->cs_wallet);
 
-    CBitcoinAddress address(params[0].get_str());
+    CBitcoinAddress address(request.params[0].get_str());
     if (!address.IsValid())
         throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid Bitcoin address");
 
     string strAccount;
-    if (params.size() > 1)
-        strAccount = AccountFromValue(params[1]);
+    if (request.params.size() > 1)
+        strAccount = AccountFromValue(request.params[1]);
 
     // Only add the account if the address is yours.
     if (IsMine(*pwalletMain, address.Get()))
@@ -266,12 +266,12 @@ UniValue setaccount(const UniValue& params, bool fHelp)
 }
 
 
-UniValue getaccount(const UniValue& params, bool fHelp)
+UniValue getaccount(const JSONRPCRequest& request)
 {
-    if (!EnsureWalletIsAvailable(fHelp))
+    if (!EnsureWalletIsAvailable(request.fHelp))
         return NullUniValue;
 
-    if (fHelp || params.size() != 1)
+    if (request.fHelp || request.params.size() != 1)
         throw runtime_error(
             "getaccount \"bitcoinaddress\"\n"
             "\nDEPRECATED. Returns the account associated with the given address.\n"
@@ -286,7 +286,7 @@ UniValue getaccount(const UniValue& params, bool fHelp)
 
     LOCK2(cs_main, pwalletMain->cs_wallet);
 
-    CBitcoinAddress address(params[0].get_str());
+    CBitcoinAddress address(request.params[0].get_str());
     if (!address.IsValid())
         throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid Bitcoin address");
 
@@ -298,12 +298,12 @@ UniValue getaccount(const UniValue& params, bool fHelp)
 }
 
 
-UniValue getaddressesbyaccount(const UniValue& params, bool fHelp)
+UniValue getaddressesbyaccount(const JSONRPCRequest& request)
 {
-    if (!EnsureWalletIsAvailable(fHelp))
+    if (!EnsureWalletIsAvailable(request.fHelp))
         return NullUniValue;
 
-    if (fHelp || params.size() != 1)
+    if (request.fHelp || request.params.size() != 1)
         throw runtime_error(
             "getaddressesbyaccount \"account\"\n"
             "\nDEPRECATED. Returns the list of addresses for the given account.\n"
@@ -321,7 +321,7 @@ UniValue getaddressesbyaccount(const UniValue& params, bool fHelp)
 
     LOCK2(cs_main, pwalletMain->cs_wallet);
 
-    string strAccount = AccountFromValue(params[0]);
+    string strAccount = AccountFromValue(request.params[0]);
 
     // Find all addresses that have the given account
     UniValue ret(UniValue::VARR);
@@ -369,12 +369,12 @@ static void SendMoney(const CTxDestination &address, CAmount nValue, bool fSubtr
         throw JSONRPCError(RPC_WALLET_ERROR, "Error: The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of the wallet and coins were spent in the copy but not marked as spent here.");
 }
 
-UniValue sendtoaddress(const UniValue& params, bool fHelp)
+UniValue sendtoaddress(const JSONRPCRequest& request)
 {
-    if (!EnsureWalletIsAvailable(fHelp))
+    if (!EnsureWalletIsAvailable(request.fHelp))
         return NullUniValue;
 
-    if (fHelp || params.size() < 2 || params.size() > 5)
+    if (request.fHelp || request.params.size() < 2 || request.params.size() > 5)
         throw runtime_error(
             "sendtoaddress \"bitcoinaddress\" amount ( \"comment\" \"comment-to\" subtractfeefromamount )\n"
             "\nSend an amount to a given address.\n"
@@ -400,25 +400,25 @@ UniValue sendtoaddress(const UniValue& params, bool fHelp)
 
     LOCK2(cs_main, pwalletMain->cs_wallet);
 
-    CBitcoinAddress address(params[0].get_str());
+    CBitcoinAddress address(request.params[0].get_str());
     if (!address.IsValid())
         throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid Bitcoin address");
 
     // Amount
-    CAmount nAmount = AmountFromValue(params[1]);
+    CAmount nAmount = AmountFromValue(request.params[1]);
     if (nAmount <= 0)
         throw JSONRPCError(RPC_TYPE_ERROR, "Invalid amount for send");
 
     // Wallet comments
     CWalletTx wtx;
-    if (params.size() > 2 && !params[2].isNull() && !params[2].get_str().empty())
-        wtx.mapValue["comment"] = params[2].get_str();
-    if (params.size() > 3 && !params[3].isNull() && !params[3].get_str().empty())
-        wtx.mapValue["to"]      = params[3].get_str();
+    if (request.params.size() > 2 && !request.params[2].isNull() && !request.params[2].get_str().empty())
+        wtx.mapValue["comment"] = request.params[2].get_str();
+    if (request.params.size() > 3 && !request.params[3].isNull() && !request.params[3].get_str().empty())
+        wtx.mapValue["to"]      = request.params[3].get_str();
 
     bool fSubtractFeeFromAmount = false;
-    if (params.size() > 4)
-        fSubtractFeeFromAmount = params[4].get_bool();
+    if (request.params.size() > 4)
+        fSubtractFeeFromAmount = request.params[4].get_bool();
 
     EnsureWalletIsUnlocked();
 
@@ -427,12 +427,12 @@ UniValue sendtoaddress(const UniValue& params, bool fHelp)
     return wtx.GetHash().GetHex();
 }
 
-UniValue listaddressgroupings(const UniValue& params, bool fHelp)
+UniValue listaddressgroupings(const JSONRPCRequest& request)
 {
-    if (!EnsureWalletIsAvailable(fHelp))
+    if (!EnsureWalletIsAvailable(request.fHelp))
         return NullUniValue;
 
-    if (fHelp)
+    if (request.fHelp)
         throw runtime_error(
             "listaddressgroupings\n"
             "\nLists groups of addresses which have had their common ownership\n"
@@ -478,12 +478,12 @@ UniValue listaddressgroupings(const UniValue& params, bool fHelp)
     return jsonGroupings;
 }
 
-UniValue signmessage(const UniValue& params, bool fHelp)
+UniValue signmessage(const JSONRPCRequest& request)
 {
-    if (!EnsureWalletIsAvailable(fHelp))
+    if (!EnsureWalletIsAvailable(request.fHelp))
         return NullUniValue;
 
-    if (fHelp || params.size() != 2)
+    if (request.fHelp || request.params.size() != 2)
         throw runtime_error(
             "signmessage \"bitcoinaddress\" \"message\"\n"
             "\nSign a message with the private key of an address"
@@ -508,8 +508,8 @@ UniValue signmessage(const UniValue& params, bool fHelp)
 
     EnsureWalletIsUnlocked();
 
-    string strAddress = params[0].get_str();
-    string strMessage = params[1].get_str();
+    string strAddress = request.params[0].get_str();
+    string strMessage = request.params[1].get_str();
 
     CBitcoinAddress addr(strAddress);
     if (!addr.IsValid())
@@ -534,12 +534,12 @@ UniValue signmessage(const UniValue& params, bool fHelp)
     return EncodeBase64(&vchSig[0], vchSig.size());
 }
 
-UniValue getreceivedbyaddress(const UniValue& params, bool fHelp)
+UniValue getreceivedbyaddress(const JSONRPCRequest& request)
 {
-    if (!EnsureWalletIsAvailable(fHelp))
+    if (!EnsureWalletIsAvailable(request.fHelp))
         return NullUniValue;
 
-    if (fHelp || params.size() < 1 || params.size() > 2)
+    if (request.fHelp || request.params.size() < 1 || request.params.size() > 2)
         throw runtime_error(
             "getreceivedbyaddress \"bitcoinaddress\" ( minconf )\n"
             "\nReturns the total amount received by the given bitcoinaddress in transactions with at least minconf confirmations.\n"
@@ -562,7 +562,7 @@ UniValue getreceivedbyaddress(const UniValue& params, bool fHelp)
     LOCK2(cs_main, pwalletMain->cs_wallet);
 
     // Bitcoin address
-    CBitcoinAddress address = CBitcoinAddress(params[0].get_str());
+    CBitcoinAddress address = CBitcoinAddress(request.params[0].get_str());
     if (!address.IsValid())
         throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid Bitcoin address");
     CScript scriptPubKey = GetScriptForDestination(address.Get());
@@ -571,8 +571,8 @@ UniValue getreceivedbyaddress(const UniValue& params, bool fHelp)
 
     // Minimum confirmations
     int nMinDepth = 1;
-    if (params.size() > 1)
-        nMinDepth = params[1].get_int();
+    if (request.params.size() > 1)
+        nMinDepth = request.params[1].get_int();
 
     // Tally
     CAmount nAmount = 0;
@@ -592,12 +592,12 @@ UniValue getreceivedbyaddress(const UniValue& params, bool fHelp)
 }
 
 
-UniValue getreceivedbyaccount(const UniValue& params, bool fHelp)
+UniValue getreceivedbyaccount(const JSONRPCRequest& request)
 {
-    if (!EnsureWalletIsAvailable(fHelp))
+    if (!EnsureWalletIsAvailable(request.fHelp))
         return NullUniValue;
 
-    if (fHelp || params.size() < 1 || params.size() > 2)
+    if (request.fHelp || request.params.size() < 1 || request.params.size() > 2)
         throw runtime_error(
             "getreceivedbyaccount \"account\" ( minconf )\n"
             "\nDEPRECATED. Returns the total amount received by addresses with <account> in transactions with at least [minconf] confirmations.\n"
@@ -621,11 +621,11 @@ UniValue getreceivedbyaccount(const UniValue& params, bool fHelp)
 
     // Minimum confirmations
     int nMinDepth = 1;
-    if (params.size() > 1)
-        nMinDepth = params[1].get_int();
+    if (request.params.size() > 1)
+        nMinDepth = request.params[1].get_int();
 
     // Get the set of pub keys assigned to account
-    string strAccount = AccountFromValue(params[0]);
+    string strAccount = AccountFromValue(request.params[0]);
     set<CTxDestination> setAddress = pwalletMain->GetAccountAddresses(strAccount);
 
     // Tally
@@ -649,12 +649,12 @@ UniValue getreceivedbyaccount(const UniValue& params, bool fHelp)
 }
 
 
-UniValue getbalance(const UniValue& params, bool fHelp)
+UniValue getbalance(const JSONRPCRequest& request)
 {
-    if (!EnsureWalletIsAvailable(fHelp))
+    if (!EnsureWalletIsAvailable(request.fHelp))
         return NullUniValue;
 
-    if (fHelp || params.size() > 3)
+    if (request.fHelp || request.params.size() > 3)
         throw runtime_error(
             "getbalance ( \"account\" minconf includeWatchonly )\n"
             "\nIf account is not specified, returns the server's total available balance.\n"
@@ -678,18 +678,18 @@ UniValue getbalance(const UniValue& params, bool fHelp)
 
     LOCK2(cs_main, pwalletMain->cs_wallet);
 
-    if (params.size() == 0)
+    if (request.params.size() == 0)
         return  ValueFromAmount(pwalletMain->GetBalance());
 
     int nMinDepth = 1;
-    if (params.size() > 1)
-        nMinDepth = params[1].get_int();
+    if (request.params.size() > 1)
+        nMinDepth = request.params[1].get_int();
     isminefilter filter = ISMINE_SPENDABLE;
-    if(params.size() > 2)
-        if(params[2].get_bool())
+    if(request.params.size() > 2)
+        if(request.params[2].get_bool())
             filter = filter | ISMINE_WATCH_ONLY;
 
-    if (params[0].get_str() == "*") {
+    if (request.params[0].get_str() == "*") {
         // Calculate total balance a different way from GetBalance()
         // (GetBalance() sums up all unspent TxOuts)
         // getbalance and "getbalance * 1 true" should return the same number
@@ -717,19 +717,19 @@ UniValue getbalance(const UniValue& params, bool fHelp)
         return  ValueFromAmount(nBalance);
     }
 
-    string strAccount = AccountFromValue(params[0]);
+    string strAccount = AccountFromValue(request.params[0]);
 
     CAmount nBalance = pwalletMain->GetAccountBalance(strAccount, nMinDepth, filter);
 
     return ValueFromAmount(nBalance);
 }
 
-UniValue getunconfirmedbalance(const UniValue &params, bool fHelp)
+UniValue getunconfirmedbalance(const JSONRPCRequest &request)
 {
-    if (!EnsureWalletIsAvailable(fHelp))
+    if (!EnsureWalletIsAvailable(request.fHelp))
         return NullUniValue;
 
-    if (fHelp || params.size() > 0)
+    if (request.fHelp || request.params.size() > 0)
         throw runtime_error(
                 "getunconfirmedbalance\n"
                 "Returns the server's total unconfirmed balance\n");
@@ -740,12 +740,12 @@ UniValue getunconfirmedbalance(const UniValue &params, bool fHelp)
 }
 
 
-UniValue movecmd(const UniValue& params, bool fHelp)
+UniValue movecmd(const JSONRPCRequest& request)
 {
-    if (!EnsureWalletIsAvailable(fHelp))
+    if (!EnsureWalletIsAvailable(request.fHelp))
         return NullUniValue;
 
-    if (fHelp || params.size() < 3 || params.size() > 5)
+    if (request.fHelp || request.params.size() < 3 || request.params.size() > 5)
         throw runtime_error(
             "move \"fromaccount\" \"toaccount\" amount ( minconf \"comment\" )\n"
             "\nDEPRECATED. Move a specified amount from one account in your wallet to another.\n"
@@ -768,17 +768,17 @@ UniValue movecmd(const UniValue& params, bool fHelp)
 
     LOCK2(cs_main, pwalletMain->cs_wallet);
 
-    string strFrom = AccountFromValue(params[0]);
-    string strTo = AccountFromValue(params[1]);
-    CAmount nAmount = AmountFromValue(params[2]);
+    string strFrom = AccountFromValue(request.params[0]);
+    string strTo = AccountFromValue(request.params[1]);
+    CAmount nAmount = AmountFromValue(request.params[2]);
     if (nAmount <= 0)
         throw JSONRPCError(RPC_TYPE_ERROR, "Invalid amount for send");
-    if (params.size() > 3)
+    if (request.params.size() > 3)
         // unused parameter, used to be nMinDepth, keep type-checking it though
-        (void)params[3].get_int();
+        (void)request.params[3].get_int();
     string strComment;
-    if (params.size() > 4)
-        strComment = params[4].get_str();
+    if (request.params.size() > 4)
+        strComment = request.params[4].get_str();
 
     if (!pwalletMain->AccountMove(strFrom, strTo, nAmount, strComment))
         throw JSONRPCError(RPC_DATABASE_ERROR, "database error");
@@ -787,12 +787,12 @@ UniValue movecmd(const UniValue& params, bool fHelp)
 }
 
 
-UniValue sendfrom(const UniValue& params, bool fHelp)
+UniValue sendfrom(const JSONRPCRequest& request)
 {
-    if (!EnsureWalletIsAvailable(fHelp))
+    if (!EnsureWalletIsAvailable(request.fHelp))
         return NullUniValue;
 
-    if (fHelp || params.size() < 3 || params.size() > 6)
+    if (request.fHelp || request.params.size() < 3 || request.params.size() > 6)
         throw runtime_error(
             "sendfrom \"fromaccount\" \"tobitcoinaddress\" amount ( minconf \"comment\" \"comment-to\" )\n"
             "\nDEPRECATED (use sendtoaddress). Sent an amount from an account to a bitcoin address."
@@ -820,23 +820,23 @@ UniValue sendfrom(const UniValue& params, bool fHelp)
 
     LOCK2(cs_main, pwalletMain->cs_wallet);
 
-    string strAccount = AccountFromValue(params[0]);
-    CBitcoinAddress address(params[1].get_str());
+    string strAccount = AccountFromValue(request.params[0]);
+    CBitcoinAddress address(request.params[1].get_str());
     if (!address.IsValid())
         throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid Bitcoin address");
-    CAmount nAmount = AmountFromValue(params[2]);
+    CAmount nAmount = AmountFromValue(request.params[2]);
     if (nAmount <= 0)
         throw JSONRPCError(RPC_TYPE_ERROR, "Invalid amount for send");
     int nMinDepth = 1;
-    if (params.size() > 3)
-        nMinDepth = params[3].get_int();
+    if (request.params.size() > 3)
+        nMinDepth = request.params[3].get_int();
 
     CWalletTx wtx;
     wtx.strFromAccount = strAccount;
-    if (params.size() > 4 && !params[4].isNull() && !params[4].get_str().empty())
-        wtx.mapValue["comment"] = params[4].get_str();
-    if (params.size() > 5 && !params[5].isNull() && !params[5].get_str().empty())
-        wtx.mapValue["to"]      = params[5].get_str();
+    if (request.params.size() > 4 && !request.params[4].isNull() && !request.params[4].get_str().empty())
+        wtx.mapValue["comment"] = request.params[4].get_str();
+    if (request.params.size() > 5 && !request.params[5].isNull() && !request.params[5].get_str().empty())
+        wtx.mapValue["to"]      = request.params[5].get_str();
 
     EnsureWalletIsUnlocked();
 
@@ -851,12 +851,12 @@ UniValue sendfrom(const UniValue& params, bool fHelp)
 }
 
 
-UniValue sendmany(const UniValue& params, bool fHelp)
+UniValue sendmany(const JSONRPCRequest& request)
 {
-    if (!EnsureWalletIsAvailable(fHelp))
+    if (!EnsureWalletIsAvailable(request.fHelp))
         return NullUniValue;
 
-    if (fHelp || params.size() < 2 || params.size() > 5)
+    if (request.fHelp || request.params.size() < 2 || request.params.size() > 5)
         throw runtime_error(
             "sendmany \"fromaccount\" {\"address\":amount,...} ( minconf \"comment\" [\"address\",...] )\n"
             "\nSend multiple times. Amounts are double-precision floating point numbers."
@@ -897,20 +897,20 @@ UniValue sendmany(const UniValue& params, bool fHelp)
     if (pwalletMain->GetBroadcastTransactions() && !g_connman)
         throw JSONRPCError(RPC_CLIENT_P2P_DISABLED, "Error: Peer-to-peer functionality missing or disabled");
 
-    string strAccount = AccountFromValue(params[0]);
-    UniValue sendTo = params[1].get_obj();
+    string strAccount = AccountFromValue(request.params[0]);
+    UniValue sendTo = request.params[1].get_obj();
     int nMinDepth = 1;
-    if (params.size() > 2)
-        nMinDepth = params[2].get_int();
+    if (request.params.size() > 2)
+        nMinDepth = request.params[2].get_int();
 
     CWalletTx wtx;
     wtx.strFromAccount = strAccount;
-    if (params.size() > 3 && !params[3].isNull() && !params[3].get_str().empty())
-        wtx.mapValue["comment"] = params[3].get_str();
+    if (request.params.size() > 3 && !request.params[3].isNull() && !request.params[3].get_str().empty())
+        wtx.mapValue["comment"] = request.params[3].get_str();
 
     UniValue subtractFeeFromAmount(UniValue::VARR);
-    if (params.size() > 4)
-        subtractFeeFromAmount = params[4].get_array();
+    if (request.params.size() > 4)
+        subtractFeeFromAmount = request.params[4].get_array();
 
     set<CBitcoinAddress> setAddress;
     vector<CRecipient> vecSend;
@@ -968,12 +968,12 @@ UniValue sendmany(const UniValue& params, bool fHelp)
 // Defined in rpc/misc.cpp
 extern CScript _createmultisig_redeemScript(const UniValue& params);
 
-UniValue addmultisigaddress(const UniValue& params, bool fHelp)
+UniValue addmultisigaddress(const JSONRPCRequest& request)
 {
-    if (!EnsureWalletIsAvailable(fHelp))
+    if (!EnsureWalletIsAvailable(request.fHelp))
         return NullUniValue;
 
-    if (fHelp || params.size() < 2 || params.size() > 3)
+    if (request.fHelp || request.params.size() < 2 || request.params.size() > 3)
     {
         string msg = "addmultisigaddress nrequired [\"key\",...] ( \"account\" )\n"
             "\nAdd a nrequired-to-sign multisignature address to the wallet.\n"
@@ -1004,11 +1004,11 @@ UniValue addmultisigaddress(const UniValue& params, bool fHelp)
     LOCK2(cs_main, pwalletMain->cs_wallet);
 
     string strAccount;
-    if (params.size() > 2)
-        strAccount = AccountFromValue(params[2]);
+    if (request.params.size() > 2)
+        strAccount = AccountFromValue(request.params[2]);
 
     // Construct using pay-to-script-hash:
-    CScript inner = _createmultisig_redeemScript(params);
+    CScript inner = _createmultisig_redeemScript(request.params);
     CScriptID innerID(inner);
     pwalletMain->AddCScript(inner);
 
@@ -1061,12 +1061,12 @@ class Witnessifier : public boost::static_visitor<bool>
     }
 };
 
-UniValue addwitnessaddress(const UniValue& params, bool fHelp)
+UniValue addwitnessaddress(const JSONRPCRequest& request)
 {
-    if (!EnsureWalletIsAvailable(fHelp))
+    if (!EnsureWalletIsAvailable(request.fHelp))
         return NullUniValue;
 
-    if (fHelp || params.size() < 1 || params.size() > 1)
+    if (request.fHelp || request.params.size() < 1 || request.params.size() > 1)
     {
         string msg = "addwitnessaddress \"address\"\n"
             "\nAdd a witness address for a script (with pubkey or redeemscript known).\n"
@@ -1089,7 +1089,7 @@ UniValue addwitnessaddress(const UniValue& params, bool fHelp)
         }
     }
 
-    CBitcoinAddress address(params[0].get_str());
+    CBitcoinAddress address(request.params[0].get_str());
     if (!address.IsValid())
         throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid Bitcoin address");
 
@@ -1239,12 +1239,12 @@ UniValue ListReceived(const UniValue& params, bool fByAccounts)
     return ret;
 }
 
-UniValue listreceivedbyaddress(const UniValue& params, bool fHelp)
+UniValue listreceivedbyaddress(const JSONRPCRequest& request)
 {
-    if (!EnsureWalletIsAvailable(fHelp))
+    if (!EnsureWalletIsAvailable(request.fHelp))
         return NullUniValue;
 
-    if (fHelp || params.size() > 3)
+    if (request.fHelp || request.params.size() > 3)
         throw runtime_error(
             "listreceivedbyaddress ( minconf includeempty includeWatchonly)\n"
             "\nList balances by receiving address.\n"
@@ -1274,15 +1274,15 @@ UniValue listreceivedbyaddress(const UniValue& params, bool fHelp)
 
     LOCK2(cs_main, pwalletMain->cs_wallet);
 
-    return ListReceived(params, false);
+    return ListReceived(request.params, false);
 }
 
-UniValue listreceivedbyaccount(const UniValue& params, bool fHelp)
+UniValue listreceivedbyaccount(const JSONRPCRequest& request)
 {
-    if (!EnsureWalletIsAvailable(fHelp))
+    if (!EnsureWalletIsAvailable(request.fHelp))
         return NullUniValue;
 
-    if (fHelp || params.size() > 3)
+    if (request.fHelp || request.params.size() > 3)
         throw runtime_error(
             "listreceivedbyaccount ( minconf includeempty includeWatchonly)\n"
             "\nDEPRECATED. List balances by account.\n"
@@ -1311,7 +1311,7 @@ UniValue listreceivedbyaccount(const UniValue& params, bool fHelp)
 
     LOCK2(cs_main, pwalletMain->cs_wallet);
 
-    return ListReceived(params, true);
+    return ListReceived(request.params, true);
 }
 
 static void MaybePushAddress(UniValue & entry, const CTxDestination &dest)
@@ -1413,12 +1413,12 @@ void AcentryToJSON(const CAccountingEntry& acentry, const string& strAccount, Un
     }
 }
 
-UniValue listtransactions(const UniValue& params, bool fHelp)
+UniValue listtransactions(const JSONRPCRequest& request)
 {
-    if (!EnsureWalletIsAvailable(fHelp))
+    if (!EnsureWalletIsAvailable(request.fHelp))
         return NullUniValue;
 
-    if (fHelp || params.size() > 4)
+    if (request.fHelp || request.params.size() > 4)
         throw runtime_error(
             "listtransactions ( \"account\" count from includeWatchonly)\n"
             "\nReturns up to 'count' most recent transactions skipping the first 'from' transactions for account 'account'.\n"
@@ -1480,17 +1480,17 @@ UniValue listtransactions(const UniValue& params, bool fHelp)
     LOCK2(cs_main, pwalletMain->cs_wallet);
 
     string strAccount = "*";
-    if (params.size() > 0)
-        strAccount = params[0].get_str();
+    if (request.params.size() > 0)
+        strAccount = request.params[0].get_str();
     int nCount = 10;
-    if (params.size() > 1)
-        nCount = params[1].get_int();
+    if (request.params.size() > 1)
+        nCount = request.params[1].get_int();
     int nFrom = 0;
-    if (params.size() > 2)
-        nFrom = params[2].get_int();
+    if (request.params.size() > 2)
+        nFrom = request.params[2].get_int();
     isminefilter filter = ISMINE_SPENDABLE;
-    if(params.size() > 3)
-        if(params[3].get_bool())
+    if(request.params.size() > 3)
+        if(request.params[3].get_bool())
             filter = filter | ISMINE_WATCH_ONLY;
 
     if (nCount < 0)
@@ -1540,12 +1540,12 @@ UniValue listtransactions(const UniValue& params, bool fHelp)
     return ret;
 }
 
-UniValue listaccounts(const UniValue& params, bool fHelp)
+UniValue listaccounts(const JSONRPCRequest& request)
 {
-    if (!EnsureWalletIsAvailable(fHelp))
+    if (!EnsureWalletIsAvailable(request.fHelp))
         return NullUniValue;
 
-    if (fHelp || params.size() > 2)
+    if (request.fHelp || request.params.size() > 2)
         throw runtime_error(
             "listaccounts ( minconf includeWatchonly)\n"
             "\nDEPRECATED. Returns Object that has account names as keys, account balances as values.\n"
@@ -1571,11 +1571,11 @@ UniValue listaccounts(const UniValue& params, bool fHelp)
     LOCK2(cs_main, pwalletMain->cs_wallet);
 
     int nMinDepth = 1;
-    if (params.size() > 0)
-        nMinDepth = params[0].get_int();
+    if (request.params.size() > 0)
+        nMinDepth = request.params[0].get_int();
     isminefilter includeWatchonly = ISMINE_SPENDABLE;
-    if(params.size() > 1)
-        if(params[1].get_bool())
+    if(request.params.size() > 1)
+        if(request.params[1].get_bool())
             includeWatchonly = includeWatchonly | ISMINE_WATCH_ONLY;
 
     map<string, CAmount> mapAccountBalances;
@@ -1619,12 +1619,12 @@ UniValue listaccounts(const UniValue& params, bool fHelp)
     return ret;
 }
 
-UniValue listsinceblock(const UniValue& params, bool fHelp)
+UniValue listsinceblock(const JSONRPCRequest& request)
 {
-    if (!EnsureWalletIsAvailable(fHelp))
+    if (!EnsureWalletIsAvailable(request.fHelp))
         return NullUniValue;
 
-    if (fHelp)
+    if (request.fHelp)
         throw runtime_error(
             "listsinceblock ( \"blockhash\" target-confirmations includeWatchonly)\n"
             "\nGet all transactions in blocks since block [blockhash], or all transactions if omitted\n"
@@ -1667,26 +1667,26 @@ UniValue listsinceblock(const UniValue& params, bool fHelp)
     int target_confirms = 1;
     isminefilter filter = ISMINE_SPENDABLE;
 
-    if (params.size() > 0)
+    if (request.params.size() > 0)
     {
         uint256 blockId;
 
-        blockId.SetHex(params[0].get_str());
+        blockId.SetHex(request.params[0].get_str());
         BlockMap::iterator it = mapBlockIndex.find(blockId);
         if (it != mapBlockIndex.end())
             pindex = it->second;
     }
 
-    if (params.size() > 1)
+    if (request.params.size() > 1)
     {
-        target_confirms = params[1].get_int();
+        target_confirms = request.params[1].get_int();
 
         if (target_confirms < 1)
             throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid parameter");
     }
 
-    if(params.size() > 2)
-        if(params[2].get_bool())
+    if(request.params.size() > 2)
+        if(request.params[2].get_bool())
             filter = filter | ISMINE_WATCH_ONLY;
 
     int depth = pindex ? (1 + chainActive.Height() - pindex->nHeight) : -1;
@@ -1711,12 +1711,12 @@ UniValue listsinceblock(const UniValue& params, bool fHelp)
     return ret;
 }
 
-UniValue gettransaction(const UniValue& params, bool fHelp)
+UniValue gettransaction(const JSONRPCRequest& request)
 {
-    if (!EnsureWalletIsAvailable(fHelp))
+    if (!EnsureWalletIsAvailable(request.fHelp))
         return NullUniValue;
 
-    if (fHelp || params.size() < 1 || params.size() > 2)
+    if (request.fHelp || request.params.size() < 1 || request.params.size() > 2)
         throw runtime_error(
             "gettransaction \"txid\" ( includeWatchonly )\n"
             "\nGet detailed information about in-wallet transaction <txid>\n"
@@ -1758,11 +1758,11 @@ UniValue gettransaction(const UniValue& params, bool fHelp)
     LOCK2(cs_main, pwalletMain->cs_wallet);
 
     uint256 hash;
-    hash.SetHex(params[0].get_str());
+    hash.SetHex(request.params[0].get_str());
 
     isminefilter filter = ISMINE_SPENDABLE;
-    if(params.size() > 1)
-        if(params[1].get_bool())
+    if(request.params.size() > 1)
+        if(request.params[1].get_bool())
             filter = filter | ISMINE_WATCH_ONLY;
 
     UniValue entry(UniValue::VOBJ);
@@ -1791,12 +1791,12 @@ UniValue gettransaction(const UniValue& params, bool fHelp)
     return entry;
 }
 
-UniValue abandontransaction(const UniValue& params, bool fHelp)
+UniValue abandontransaction(const JSONRPCRequest& request)
 {
-    if (!EnsureWalletIsAvailable(fHelp))
+    if (!EnsureWalletIsAvailable(request.fHelp))
         return NullUniValue;
 
-    if (fHelp || params.size() != 1)
+    if (request.fHelp || request.params.size() != 1)
         throw runtime_error(
             "abandontransaction \"txid\"\n"
             "\nMark in-wallet transaction <txid> as abandoned\n"
@@ -1815,7 +1815,7 @@ UniValue abandontransaction(const UniValue& params, bool fHelp)
     LOCK2(cs_main, pwalletMain->cs_wallet);
 
     uint256 hash;
-    hash.SetHex(params[0].get_str());
+    hash.SetHex(request.params[0].get_str());
 
     if (!pwalletMain->mapWallet.count(hash))
         throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid or non-wallet transaction id");
@@ -1826,12 +1826,12 @@ UniValue abandontransaction(const UniValue& params, bool fHelp)
 }
 
 
-UniValue backupwallet(const UniValue& params, bool fHelp)
+UniValue backupwallet(const JSONRPCRequest& request)
 {
-    if (!EnsureWalletIsAvailable(fHelp))
+    if (!EnsureWalletIsAvailable(request.fHelp))
         return NullUniValue;
 
-    if (fHelp || params.size() != 1)
+    if (request.fHelp || request.params.size() != 1)
         throw runtime_error(
             "backupwallet \"destination\"\n"
             "\nSafely copies current wallet file to destination, which can be a directory or a path with filename.\n"
@@ -1844,7 +1844,7 @@ UniValue backupwallet(const UniValue& params, bool fHelp)
 
     LOCK2(cs_main, pwalletMain->cs_wallet);
 
-    string strDest = params[0].get_str();
+    string strDest = request.params[0].get_str();
     if (!pwalletMain->BackupWallet(strDest))
         throw JSONRPCError(RPC_WALLET_ERROR, "Error: Wallet backup failed!");
 
@@ -1852,12 +1852,12 @@ UniValue backupwallet(const UniValue& params, bool fHelp)
 }
 
 
-UniValue keypoolrefill(const UniValue& params, bool fHelp)
+UniValue keypoolrefill(const JSONRPCRequest& request)
 {
-    if (!EnsureWalletIsAvailable(fHelp))
+    if (!EnsureWalletIsAvailable(request.fHelp))
         return NullUniValue;
 
-    if (fHelp || params.size() > 1)
+    if (request.fHelp || request.params.size() > 1)
         throw runtime_error(
             "keypoolrefill ( newsize )\n"
             "\nFills the keypool."
@@ -1873,10 +1873,10 @@ UniValue keypoolrefill(const UniValue& params, bool fHelp)
 
     // 0 is interpreted by TopUpKeyPool() as the default keypool size given by -keypool
     unsigned int kpSize = 0;
-    if (params.size() > 0) {
-        if (params[0].get_int() < 0)
+    if (request.params.size() > 0) {
+        if (request.params[0].get_int() < 0)
             throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid parameter, expected valid size.");
-        kpSize = (unsigned int)params[0].get_int();
+        kpSize = (unsigned int)request.params[0].get_int();
     }
 
     EnsureWalletIsUnlocked();
@@ -1896,12 +1896,12 @@ static void LockWallet(CWallet* pWallet)
     pWallet->Lock();
 }
 
-UniValue walletpassphrase(const UniValue& params, bool fHelp)
+UniValue walletpassphrase(const JSONRPCRequest& request)
 {
-    if (!EnsureWalletIsAvailable(fHelp))
+    if (!EnsureWalletIsAvailable(request.fHelp))
         return NullUniValue;
 
-    if (pwalletMain->IsCrypted() && (fHelp || params.size() != 2))
+    if (pwalletMain->IsCrypted() && (request.fHelp || request.params.size() != 2))
         throw runtime_error(
             "walletpassphrase \"passphrase\" timeout\n"
             "\nStores the wallet decryption key in memory for 'timeout' seconds.\n"
@@ -1923,17 +1923,17 @@ UniValue walletpassphrase(const UniValue& params, bool fHelp)
 
     LOCK2(cs_main, pwalletMain->cs_wallet);
 
-    if (fHelp)
+    if (request.fHelp)
         return true;
     if (!pwalletMain->IsCrypted())
         throw JSONRPCError(RPC_WALLET_WRONG_ENC_STATE, "Error: running with an unencrypted wallet, but walletpassphrase was called.");
 
-    // Note that the walletpassphrase is stored in params[0] which is not mlock()ed
+    // Note that the walletpassphrase is stored in request.params[0] which is not mlock()ed
     SecureString strWalletPass;
     strWalletPass.reserve(100);
     // TODO: get rid of this .c_str() by implementing SecureString::operator=(std::string)
-    // Alternately, find a way to make params[0] mlock()'d to begin with.
-    strWalletPass = params[0].get_str().c_str();
+    // Alternately, find a way to make request.params[0] mlock()'d to begin with.
+    strWalletPass = request.params[0].get_str().c_str();
 
     if (strWalletPass.length() > 0)
     {
@@ -1947,7 +1947,7 @@ UniValue walletpassphrase(const UniValue& params, bool fHelp)
 
     pwalletMain->TopUpKeyPool();
 
-    int64_t nSleepTime = params[1].get_int64();
+    int64_t nSleepTime = request.params[1].get_int64();
     LOCK(cs_nWalletUnlockTime);
     nWalletUnlockTime = GetTime() + nSleepTime;
     RPCRunLater("lockwallet", boost::bind(LockWallet, pwalletMain), nSleepTime);
@@ -1956,12 +1956,12 @@ UniValue walletpassphrase(const UniValue& params, bool fHelp)
 }
 
 
-UniValue walletpassphrasechange(const UniValue& params, bool fHelp)
+UniValue walletpassphrasechange(const JSONRPCRequest& request)
 {
-    if (!EnsureWalletIsAvailable(fHelp))
+    if (!EnsureWalletIsAvailable(request.fHelp))
         return NullUniValue;
 
-    if (pwalletMain->IsCrypted() && (fHelp || params.size() != 2))
+    if (pwalletMain->IsCrypted() && (request.fHelp || request.params.size() != 2))
         throw runtime_error(
             "walletpassphrasechange \"oldpassphrase\" \"newpassphrase\"\n"
             "\nChanges the wallet passphrase from 'oldpassphrase' to 'newpassphrase'.\n"
@@ -1975,20 +1975,20 @@ UniValue walletpassphrasechange(const UniValue& params, bool fHelp)
 
     LOCK2(cs_main, pwalletMain->cs_wallet);
 
-    if (fHelp)
+    if (request.fHelp)
         return true;
     if (!pwalletMain->IsCrypted())
         throw JSONRPCError(RPC_WALLET_WRONG_ENC_STATE, "Error: running with an unencrypted wallet, but walletpassphrasechange was called.");
 
     // TODO: get rid of these .c_str() calls by implementing SecureString::operator=(std::string)
-    // Alternately, find a way to make params[0] mlock()'d to begin with.
+    // Alternately, find a way to make request.params[0] mlock()'d to begin with.
     SecureString strOldWalletPass;
     strOldWalletPass.reserve(100);
-    strOldWalletPass = params[0].get_str().c_str();
+    strOldWalletPass = request.params[0].get_str().c_str();
 
     SecureString strNewWalletPass;
     strNewWalletPass.reserve(100);
-    strNewWalletPass = params[1].get_str().c_str();
+    strNewWalletPass = request.params[1].get_str().c_str();
 
     if (strOldWalletPass.length() < 1 || strNewWalletPass.length() < 1)
         throw runtime_error(
@@ -2002,12 +2002,12 @@ UniValue walletpassphrasechange(const UniValue& params, bool fHelp)
 }
 
 
-UniValue walletlock(const UniValue& params, bool fHelp)
+UniValue walletlock(const JSONRPCRequest& request)
 {
-    if (!EnsureWalletIsAvailable(fHelp))
+    if (!EnsureWalletIsAvailable(request.fHelp))
         return NullUniValue;
 
-    if (pwalletMain->IsCrypted() && (fHelp || params.size() != 0))
+    if (pwalletMain->IsCrypted() && (request.fHelp || request.params.size() != 0))
         throw runtime_error(
             "walletlock\n"
             "\nRemoves the wallet encryption key from memory, locking the wallet.\n"
@@ -2026,7 +2026,7 @@ UniValue walletlock(const UniValue& params, bool fHelp)
 
     LOCK2(cs_main, pwalletMain->cs_wallet);
 
-    if (fHelp)
+    if (request.fHelp)
         return true;
     if (!pwalletMain->IsCrypted())
         throw JSONRPCError(RPC_WALLET_WRONG_ENC_STATE, "Error: running with an unencrypted wallet, but walletlock was called.");
@@ -2041,12 +2041,12 @@ UniValue walletlock(const UniValue& params, bool fHelp)
 }
 
 
-UniValue encryptwallet(const UniValue& params, bool fHelp)
+UniValue encryptwallet(const JSONRPCRequest& request)
 {
-    if (!EnsureWalletIsAvailable(fHelp))
+    if (!EnsureWalletIsAvailable(request.fHelp))
         return NullUniValue;
 
-    if (!pwalletMain->IsCrypted() && (fHelp || params.size() != 1))
+    if (!pwalletMain->IsCrypted() && (request.fHelp || request.params.size() != 1))
         throw runtime_error(
             "encryptwallet \"passphrase\"\n"
             "\nEncrypts the wallet with 'passphrase'. This is for first time encryption.\n"
@@ -2072,16 +2072,16 @@ UniValue encryptwallet(const UniValue& params, bool fHelp)
 
     LOCK2(cs_main, pwalletMain->cs_wallet);
 
-    if (fHelp)
+    if (request.fHelp)
         return true;
     if (pwalletMain->IsCrypted())
         throw JSONRPCError(RPC_WALLET_WRONG_ENC_STATE, "Error: running with an encrypted wallet, but encryptwallet was called.");
 
     // TODO: get rid of this .c_str() by implementing SecureString::operator=(std::string)
-    // Alternately, find a way to make params[0] mlock()'d to begin with.
+    // Alternately, find a way to make request.params[0] mlock()'d to begin with.
     SecureString strWalletPass;
     strWalletPass.reserve(100);
-    strWalletPass = params[0].get_str().c_str();
+    strWalletPass = request.params[0].get_str().c_str();
 
     if (strWalletPass.length() < 1)
         throw runtime_error(
@@ -2098,12 +2098,12 @@ UniValue encryptwallet(const UniValue& params, bool fHelp)
     return "wallet encrypted; Bitcoin server stopping, restart to run with encrypted wallet. The keypool has been flushed and a new HD seed was generated (if you are using HD). You need to make a new backup.";
 }
 
-UniValue lockunspent(const UniValue& params, bool fHelp)
+UniValue lockunspent(const JSONRPCRequest& request)
 {
-    if (!EnsureWalletIsAvailable(fHelp))
+    if (!EnsureWalletIsAvailable(request.fHelp))
         return NullUniValue;
 
-    if (fHelp || params.size() < 1 || params.size() > 2)
+    if (request.fHelp || request.params.size() < 1 || request.params.size() > 2)
         throw runtime_error(
             "lockunspent unlock ([{\"txid\":\"txid\",\"vout\":n},...])\n"
             "\nUpdates list of temporarily unspendable outputs.\n"
@@ -2142,20 +2142,20 @@ UniValue lockunspent(const UniValue& params, bool fHelp)
 
     LOCK2(cs_main, pwalletMain->cs_wallet);
 
-    if (params.size() == 1)
-        RPCTypeCheck(params, boost::assign::list_of(UniValue::VBOOL));
+    if (request.params.size() == 1)
+        RPCTypeCheck(request.params, boost::assign::list_of(UniValue::VBOOL));
     else
-        RPCTypeCheck(params, boost::assign::list_of(UniValue::VBOOL)(UniValue::VARR));
+        RPCTypeCheck(request.params, boost::assign::list_of(UniValue::VBOOL)(UniValue::VARR));
 
-    bool fUnlock = params[0].get_bool();
+    bool fUnlock = request.params[0].get_bool();
 
-    if (params.size() == 1) {
+    if (request.params.size() == 1) {
         if (fUnlock)
             pwalletMain->UnlockAllCoins();
         return true;
     }
 
-    UniValue outputs = params[1].get_array();
+    UniValue outputs = request.params[1].get_array();
     for (unsigned int idx = 0; idx < outputs.size(); idx++) {
         const UniValue& output = outputs[idx];
         if (!output.isObject())
@@ -2187,12 +2187,12 @@ UniValue lockunspent(const UniValue& params, bool fHelp)
     return true;
 }
 
-UniValue listlockunspent(const UniValue& params, bool fHelp)
+UniValue listlockunspent(const JSONRPCRequest& request)
 {
-    if (!EnsureWalletIsAvailable(fHelp))
+    if (!EnsureWalletIsAvailable(request.fHelp))
         return NullUniValue;
 
-    if (fHelp || params.size() > 0)
+    if (request.fHelp || request.params.size() > 0)
         throw runtime_error(
             "listlockunspent\n"
             "\nReturns list of temporarily unspendable outputs.\n"
@@ -2236,12 +2236,12 @@ UniValue listlockunspent(const UniValue& params, bool fHelp)
     return ret;
 }
 
-UniValue settxfee(const UniValue& params, bool fHelp)
+UniValue settxfee(const JSONRPCRequest& request)
 {
-    if (!EnsureWalletIsAvailable(fHelp))
+    if (!EnsureWalletIsAvailable(request.fHelp))
         return NullUniValue;
 
-    if (fHelp || params.size() < 1 || params.size() > 1)
+    if (request.fHelp || request.params.size() < 1 || request.params.size() > 1)
         throw runtime_error(
             "settxfee amount\n"
             "\nSet the transaction fee per kB. Overwrites the paytxfee parameter.\n"
@@ -2257,18 +2257,18 @@ UniValue settxfee(const UniValue& params, bool fHelp)
     LOCK2(cs_main, pwalletMain->cs_wallet);
 
     // Amount
-    CAmount nAmount = AmountFromValue(params[0]);
+    CAmount nAmount = AmountFromValue(request.params[0]);
 
     payTxFee = CFeeRate(nAmount, 1000);
     return true;
 }
 
-UniValue getwalletinfo(const UniValue& params, bool fHelp)
+UniValue getwalletinfo(const JSONRPCRequest& request)
 {
-    if (!EnsureWalletIsAvailable(fHelp))
+    if (!EnsureWalletIsAvailable(request.fHelp))
         return NullUniValue;
 
-    if (fHelp || params.size() != 0)
+    if (request.fHelp || request.params.size() != 0)
         throw runtime_error(
             "getwalletinfo\n"
             "Returns an object containing various wallet state info.\n"
@@ -2309,12 +2309,12 @@ UniValue getwalletinfo(const UniValue& params, bool fHelp)
     return obj;
 }
 
-UniValue resendwallettransactions(const UniValue& params, bool fHelp)
+UniValue resendwallettransactions(const JSONRPCRequest& request)
 {
-    if (!EnsureWalletIsAvailable(fHelp))
+    if (!EnsureWalletIsAvailable(request.fHelp))
         return NullUniValue;
 
-    if (fHelp || params.size() != 0)
+    if (request.fHelp || request.params.size() != 0)
         throw runtime_error(
             "resendwallettransactions\n"
             "Immediately re-broadcast unconfirmed wallet transactions to all peers.\n"
@@ -2337,12 +2337,12 @@ UniValue resendwallettransactions(const UniValue& params, bool fHelp)
     return result;
 }
 
-UniValue listunspent(const UniValue& params, bool fHelp)
+UniValue listunspent(const JSONRPCRequest& request)
 {
-    if (!EnsureWalletIsAvailable(fHelp))
+    if (!EnsureWalletIsAvailable(request.fHelp))
         return NullUniValue;
 
-    if (fHelp || params.size() > 3)
+    if (request.fHelp || request.params.size() > 3)
         throw runtime_error(
             "listunspent ( minconf maxconf  [\"address\",...] )\n"
             "\nReturns array of unspent transaction outputs\n"
@@ -2379,19 +2379,19 @@ UniValue listunspent(const UniValue& params, bool fHelp)
             + HelpExampleRpc("listunspent", "6, 9999999 \"[\\\"1PGFqEzfmQch1gKD3ra4k18PNj3tTUUSqg\\\",\\\"1LtvqCaApEdUGFkpKMM4MstjcaL4dKg8SP\\\"]\"")
         );
 
-    RPCTypeCheck(params, boost::assign::list_of(UniValue::VNUM)(UniValue::VNUM)(UniValue::VARR));
+    RPCTypeCheck(request.params, boost::assign::list_of(UniValue::VNUM)(UniValue::VNUM)(UniValue::VARR));
 
     int nMinDepth = 1;
-    if (params.size() > 0)
-        nMinDepth = params[0].get_int();
+    if (request.params.size() > 0)
+        nMinDepth = request.params[0].get_int();
 
     int nMaxDepth = 9999999;
-    if (params.size() > 1)
-        nMaxDepth = params[1].get_int();
+    if (request.params.size() > 1)
+        nMaxDepth = request.params[1].get_int();
 
     set<CBitcoinAddress> setAddress;
-    if (params.size() > 2) {
-        UniValue inputs = params[2].get_array();
+    if (request.params.size() > 2) {
+        UniValue inputs = request.params[2].get_array();
         for (unsigned int idx = 0; idx < inputs.size(); idx++) {
             const UniValue& input = inputs[idx];
             CBitcoinAddress address(input.get_str());
@@ -2448,12 +2448,12 @@ UniValue listunspent(const UniValue& params, bool fHelp)
     return results;
 }
 
-UniValue fundrawtransaction(const UniValue& params, bool fHelp)
+UniValue fundrawtransaction(const JSONRPCRequest& request)
 {
-    if (!EnsureWalletIsAvailable(fHelp))
+    if (!EnsureWalletIsAvailable(request.fHelp))
         return NullUniValue;
 
-    if (fHelp || params.size() < 1 || params.size() > 2)
+    if (request.fHelp || request.params.size() < 1 || request.params.size() > 2)
         throw runtime_error(
                             "fundrawtransaction \"hexstring\" ( options )\n"
                             "\nAdd inputs to a transaction until it has enough in value to meet its out value.\n"
@@ -2494,7 +2494,7 @@ UniValue fundrawtransaction(const UniValue& params, bool fHelp)
                             + HelpExampleCli("sendrawtransaction", "\"signedtransactionhex\"")
                             );
 
-    RPCTypeCheck(params, boost::assign::list_of(UniValue::VSTR));
+    RPCTypeCheck(request.params, boost::assign::list_of(UniValue::VSTR));
 
     CTxDestination changeAddress = CNoDestination();
     int changePosition = -1;
@@ -2503,15 +2503,15 @@ UniValue fundrawtransaction(const UniValue& params, bool fHelp)
     CFeeRate feeRate = CFeeRate(0);
     bool overrideEstimatedFeerate = false;
 
-    if (params.size() > 1) {
-      if (params[1].type() == UniValue::VBOOL) {
+    if (request.params.size() > 1) {
+      if (request.params[1].type() == UniValue::VBOOL) {
         // backward compatibility bool only fallback
-        includeWatching = params[1].get_bool();
+        includeWatching = request.params[1].get_bool();
       }
       else {
-        RPCTypeCheck(params, boost::assign::list_of(UniValue::VSTR)(UniValue::VOBJ));
+        RPCTypeCheck(request.params, boost::assign::list_of(UniValue::VSTR)(UniValue::VOBJ));
 
-        UniValue options = params[1];
+        UniValue options = request.params[1];
 
         RPCTypeCheckObj(options,
             {
@@ -2551,7 +2551,7 @@ UniValue fundrawtransaction(const UniValue& params, bool fHelp)
 
     // parse hex string from parameter
     CTransaction origTx;
-    if (!DecodeHexTx(origTx, params[0].get_str(), true))
+    if (!DecodeHexTx(origTx, request.params[0].get_str(), true))
         throw JSONRPCError(RPC_DESERIALIZATION_ERROR, "TX decode failed");
 
     if (origTx.vout.size() == 0)
@@ -2575,14 +2575,14 @@ UniValue fundrawtransaction(const UniValue& params, bool fHelp)
     return result;
 }
 
-extern UniValue dumpprivkey(const UniValue& params, bool fHelp); // in rpcdump.cpp
-extern UniValue importprivkey(const UniValue& params, bool fHelp);
-extern UniValue importaddress(const UniValue& params, bool fHelp);
-extern UniValue importpubkey(const UniValue& params, bool fHelp);
-extern UniValue dumpwallet(const UniValue& params, bool fHelp);
-extern UniValue importwallet(const UniValue& params, bool fHelp);
-extern UniValue importprunedfunds(const UniValue& params, bool fHelp);
-extern UniValue removeprunedfunds(const UniValue& params, bool fHelp);
+extern UniValue dumpprivkey(const JSONRPCRequest& request); // in rpcdump.cpp
+extern UniValue importprivkey(const JSONRPCRequest& request);
+extern UniValue importaddress(const JSONRPCRequest& request);
+extern UniValue importpubkey(const JSONRPCRequest& request);
+extern UniValue dumpwallet(const JSONRPCRequest& request);
+extern UniValue importwallet(const JSONRPCRequest& request);
+extern UniValue importprunedfunds(const JSONRPCRequest& request);
+extern UniValue removeprunedfunds(const JSONRPCRequest& request);
 
 static const CRPCCommand commands[] =
 { //  category              name                        actor (function)           okSafeMode

From e7156ad61be2fe935fdb64e9d0e877fa0e9f7f9e Mon Sep 17 00:00:00 2001
From: Jonas Schnelli <dev@jonasschnelli.ch>
Date: Thu, 22 Sep 2016 09:58:13 +0200
Subject: [PATCH 1058/1802] [RPC] pass HTTP basic authentication username to
 the JSONRequest object

---
 src/httprpc.cpp  | 11 +++++++----
 src/rest.cpp     |  1 +
 src/rpc/server.h |  3 ++-
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/httprpc.cpp b/src/httprpc.cpp
index 54651911aa38d..e35acb6cd99ce 100644
--- a/src/httprpc.cpp
+++ b/src/httprpc.cpp
@@ -127,7 +127,7 @@ static bool multiUserAuthorized(std::string strUserPass)
     return false;
 }
 
-static bool RPCAuthorized(const std::string& strAuth)
+static bool RPCAuthorized(const std::string& strAuth, std::string& strAuthUsernameOut)
 {
     if (strRPCUserColonPass.empty()) // Belt-and-suspenders measure if InitRPCAuthentication was not called
         return false;
@@ -136,7 +136,10 @@ static bool RPCAuthorized(const std::string& strAuth)
     std::string strUserPass64 = strAuth.substr(6);
     boost::trim(strUserPass64);
     std::string strUserPass = DecodeBase64(strUserPass64);
-    
+
+    if (strUserPass.find(":") != std::string::npos)
+        strAuthUsernameOut = strUserPass.substr(0, strUserPass.find(":"));
+
     //Check if authorized under single-user field
     if (TimingResistantEqual(strUserPass, strRPCUserColonPass)) {
         return true;
@@ -159,7 +162,8 @@ static bool HTTPReq_JSONRPC(HTTPRequest* req, const std::string &)
         return false;
     }
 
-    if (!RPCAuthorized(authHeader.second)) {
+    JSONRPCRequest jreq;
+    if (!RPCAuthorized(authHeader.second, jreq.authUser)) {
         LogPrintf("ThreadRPCServer incorrect password attempt from %s\n", req->GetPeer().ToString());
 
         /* Deter brute-forcing
@@ -172,7 +176,6 @@ static bool HTTPReq_JSONRPC(HTTPRequest* req, const std::string &)
         return false;
     }
 
-    JSONRPCRequest jreq;
     try {
         // Parse request
         UniValue valRequest;
diff --git a/src/rest.cpp b/src/rest.cpp
index 707dfe69871f7..b8b5420626d3b 100644
--- a/src/rest.cpp
+++ b/src/rest.cpp
@@ -286,6 +286,7 @@ static bool rest_chaininfo(HTTPRequest* req, const std::string& strURIPart)
     switch (rf) {
     case RF_JSON: {
         JSONRPCRequest jsonRequest;
+        jsonRequest.params = UniValue(UniValue::VARR);
         UniValue chainInfoObject = getblockchaininfo(jsonRequest);
         string strJSON = chainInfoObject.write() + "\n";
         req->WriteHeader("Content-Type", "application/json");
diff --git a/src/rpc/server.h b/src/rpc/server.h
index d8b5097035c91..c59886222c276 100644
--- a/src/rpc/server.h
+++ b/src/rpc/server.h
@@ -49,8 +49,9 @@ class JSONRPCRequest
     UniValue params;
     bool fHelp;
     std::string URI;
+    std::string authUser;
 
-    JSONRPCRequest() { id = NullUniValue; }
+    JSONRPCRequest() { id = NullUniValue; params = NullUniValue; fHelp = false; }
     void parse(const UniValue& valRequest);
 };
 

From fc146095d20452686efe1944b143452bec394343 Mon Sep 17 00:00:00 2001
From: mruddy <mruddy@users.noreply.github.com>
Date: Fri, 6 May 2016 22:08:39 +0000
Subject: [PATCH 1059/1802] RPC: augment getblockchaininfo bip9_softforks data

---
 qa/rpc-tests/bip9-softforks.py |   9 +++
 src/main.cpp                   |   6 ++
 src/main.h                     |   3 +-
 src/rpc/blockchain.cpp         |   4 +-
 src/test/versionbits_tests.cpp | 104 ++++++++++++++++++++-------------
 src/versionbits.cpp            |  35 +++++++++++
 src/versionbits.h              |   4 +-
 7 files changed, 121 insertions(+), 44 deletions(-)

diff --git a/qa/rpc-tests/bip9-softforks.py b/qa/rpc-tests/bip9-softforks.py
index be6ddde112ea2..c42ed44c259a3 100755
--- a/qa/rpc-tests/bip9-softforks.py
+++ b/qa/rpc-tests/bip9-softforks.py
@@ -81,6 +81,9 @@ def get_bip9_status(self, key):
         return info['bip9_softforks'][key]
 
     def test_BIP(self, bipName, activated_version, invalidate, invalidatePostSignature, bitno):
+        assert_equal(self.get_bip9_status(bipName)['status'], 'defined')
+        assert_equal(self.get_bip9_status(bipName)['since'], 0)
+
         # generate some coins for later
         self.coinbase_blocks = self.nodes[0].generate(2)
         self.height = 3  # height of the next block to build
@@ -89,6 +92,7 @@ def test_BIP(self, bipName, activated_version, invalidate, invalidatePostSignatu
         self.last_block_time = int(time.time())
 
         assert_equal(self.get_bip9_status(bipName)['status'], 'defined')
+        assert_equal(self.get_bip9_status(bipName)['since'], 0)
         tmpl = self.nodes[0].getblocktemplate({})
         assert(bipName not in tmpl['rules'])
         assert(bipName not in tmpl['vbavailable'])
@@ -101,6 +105,7 @@ def test_BIP(self, bipName, activated_version, invalidate, invalidatePostSignatu
         yield TestInstance(test_blocks, sync_every_block=False)
 
         assert_equal(self.get_bip9_status(bipName)['status'], 'started')
+        assert_equal(self.get_bip9_status(bipName)['since'], 144)
         tmpl = self.nodes[0].getblocktemplate({})
         assert(bipName not in tmpl['rules'])
         assert_equal(tmpl['vbavailable'][bipName], bitno)
@@ -117,6 +122,7 @@ def test_BIP(self, bipName, activated_version, invalidate, invalidatePostSignatu
         yield TestInstance(test_blocks, sync_every_block=False)
 
         assert_equal(self.get_bip9_status(bipName)['status'], 'started')
+        assert_equal(self.get_bip9_status(bipName)['since'], 144)
         tmpl = self.nodes[0].getblocktemplate({})
         assert(bipName not in tmpl['rules'])
         assert_equal(tmpl['vbavailable'][bipName], bitno)
@@ -133,6 +139,7 @@ def test_BIP(self, bipName, activated_version, invalidate, invalidatePostSignatu
         yield TestInstance(test_blocks, sync_every_block=False)
 
         assert_equal(self.get_bip9_status(bipName)['status'], 'locked_in')
+        assert_equal(self.get_bip9_status(bipName)['since'], 432)
         tmpl = self.nodes[0].getblocktemplate({})
         assert(bipName not in tmpl['rules'])
 
@@ -142,6 +149,7 @@ def test_BIP(self, bipName, activated_version, invalidate, invalidatePostSignatu
         yield TestInstance(test_blocks, sync_every_block=False)
 
         assert_equal(self.get_bip9_status(bipName)['status'], 'locked_in')
+        assert_equal(self.get_bip9_status(bipName)['since'], 432)
         tmpl = self.nodes[0].getblocktemplate({})
         assert(bipName not in tmpl['rules'])
 
@@ -167,6 +175,7 @@ def test_BIP(self, bipName, activated_version, invalidate, invalidatePostSignatu
         yield TestInstance([[block, True]])
 
         assert_equal(self.get_bip9_status(bipName)['status'], 'active')
+        assert_equal(self.get_bip9_status(bipName)['since'], 576)
         tmpl = self.nodes[0].getblocktemplate({})
         assert(bipName in tmpl['rules'])
         assert(bipName not in tmpl['vbavailable'])
diff --git a/src/main.cpp b/src/main.cpp
index 1777717cd9db2..50158b468780a 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -6918,6 +6918,12 @@ ThresholdState VersionBitsTipState(const Consensus::Params& params, Consensus::D
     return VersionBitsState(chainActive.Tip(), params, pos, versionbitscache);
 }
 
+int VersionBitsTipStateSinceHeight(const Consensus::Params& params, Consensus::DeploymentPos pos)
+{
+    LOCK(cs_main);
+    return VersionBitsStateSinceHeight(chainActive.Tip(), params, pos, versionbitscache);
+}
+
 class CMainCleanup
 {
 public:
diff --git a/src/main.h b/src/main.h
index e91f6e46fed5c..3eab9b89daa66 100644
--- a/src/main.h
+++ b/src/main.h
@@ -297,7 +297,8 @@ std::string FormatStateMessage(const CValidationState &state);
 /** Get the BIP9 state for a given deployment at the current tip. */
 ThresholdState VersionBitsTipState(const Consensus::Params& params, Consensus::DeploymentPos pos);
 
-
+/** Get the block height at which the BIP9 deployment switched into the state for the block building on the current tip. */
+int VersionBitsTipStateSinceHeight(const Consensus::Params& params, Consensus::DeploymentPos pos);
 
 /** 
  * Count ECDSA signature operations the old-fashioned (pre-0.6) way
diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp
index 5414ac9ffd449..141ca87b69bdc 100644
--- a/src/rpc/blockchain.cpp
+++ b/src/rpc/blockchain.cpp
@@ -1009,6 +1009,7 @@ static UniValue BIP9SoftForkDesc(const Consensus::Params& consensusParams, Conse
     }
     rv.push_back(Pair("startTime", consensusParams.vDeployments[id].nStartTime));
     rv.push_back(Pair("timeout", consensusParams.vDeployments[id].nTimeout));
+    rv.push_back(Pair("since", VersionBitsTipStateSinceHeight(consensusParams, id)));
     return rv;
 }
 
@@ -1053,7 +1054,8 @@ UniValue getblockchaininfo(const UniValue& params, bool fHelp)
             "        \"status\": \"xxxx\",    (string) one of \"defined\", \"started\", \"locked_in\", \"active\", \"failed\"\n"
             "        \"bit\": xx,             (numeric) the bit (0-28) in the block version field used to signal this softfork (only for \"started\" status)\n"
             "        \"startTime\": xx,       (numeric) the minimum median time past of a block at which the bit gains its meaning\n"
-            "        \"timeout\": xx          (numeric) the median time past of a block at which the deployment is considered failed if not yet locked in\n"
+            "        \"timeout\": xx,         (numeric) the median time past of a block at which the deployment is considered failed if not yet locked in\n"
+            "        \"since\": xx            (numeric) height of the first block to which the status applies\n"
             "     }\n"
             "  }\n"
             "}\n"
diff --git a/src/test/versionbits_tests.cpp b/src/test/versionbits_tests.cpp
index ffc0ff6f8ead3..784e796998524 100644
--- a/src/test/versionbits_tests.cpp
+++ b/src/test/versionbits_tests.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2015 The Bitcoin Core developers
+// Copyright (c) 2014-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
@@ -30,6 +30,7 @@ class TestConditionChecker : public AbstractThresholdConditionChecker
     bool Condition(const CBlockIndex* pindex, const Consensus::Params& params) const { return (pindex->nVersion & 0x100); }
 
     ThresholdState GetStateFor(const CBlockIndex* pindexPrev) const { return AbstractThresholdConditionChecker::GetStateFor(pindexPrev, paramsDummy, cache); }
+    int GetStateSinceHeightFor(const CBlockIndex* pindexPrev) const { return AbstractThresholdConditionChecker::GetStateSinceHeightFor(pindexPrev, paramsDummy, cache); }
 };
 
 #define CHECKERS 6
@@ -78,6 +79,16 @@ class VersionBitsTester
         return *this;
     }
 
+    VersionBitsTester& TestStateSinceHeight(int height) {
+        for (int i = 0; i < CHECKERS; i++) {
+            if ((insecure_rand() & ((1 << i) - 1)) == 0) {
+                BOOST_CHECK_MESSAGE(checker[i].GetStateSinceHeightFor(vpblock.empty() ? NULL : vpblock.back()) == height, strprintf("Test %i for StateSinceHeight", num));
+            }
+        }
+        num++;
+        return *this;
+    }
+
     VersionBitsTester& TestDefined() {
         for (int i = 0; i < CHECKERS; i++) {
             if ((insecure_rand() & ((1 << i) - 1)) == 0) {
@@ -137,53 +148,64 @@ BOOST_AUTO_TEST_CASE(versionbits_test)
 {
     for (int i = 0; i < 64; i++) {
         // DEFINED -> FAILED
-        VersionBitsTester().TestDefined()
-                           .Mine(1, TestTime(1), 0x100).TestDefined()
-                           .Mine(11, TestTime(11), 0x100).TestDefined()
-                           .Mine(989, TestTime(989), 0x100).TestDefined()
-                           .Mine(999, TestTime(20000), 0x100).TestDefined()
-                           .Mine(1000, TestTime(20000), 0x100).TestFailed()
-                           .Mine(1999, TestTime(30001), 0x100).TestFailed()
-                           .Mine(2000, TestTime(30002), 0x100).TestFailed()
-                           .Mine(2001, TestTime(30003), 0x100).TestFailed()
-                           .Mine(2999, TestTime(30004), 0x100).TestFailed()
-                           .Mine(3000, TestTime(30005), 0x100).TestFailed()
+        VersionBitsTester().TestDefined().TestStateSinceHeight(0)
+                           .Mine(1, TestTime(1), 0x100).TestDefined().TestStateSinceHeight(0)
+                           .Mine(11, TestTime(11), 0x100).TestDefined().TestStateSinceHeight(0)
+                           .Mine(989, TestTime(989), 0x100).TestDefined().TestStateSinceHeight(0)
+                           .Mine(999, TestTime(20000), 0x100).TestDefined().TestStateSinceHeight(0)
+                           .Mine(1000, TestTime(20000), 0x100).TestFailed().TestStateSinceHeight(1000)
+                           .Mine(1999, TestTime(30001), 0x100).TestFailed().TestStateSinceHeight(1000)
+                           .Mine(2000, TestTime(30002), 0x100).TestFailed().TestStateSinceHeight(1000)
+                           .Mine(2001, TestTime(30003), 0x100).TestFailed().TestStateSinceHeight(1000)
+                           .Mine(2999, TestTime(30004), 0x100).TestFailed().TestStateSinceHeight(1000)
+                           .Mine(3000, TestTime(30005), 0x100).TestFailed().TestStateSinceHeight(1000)
 
         // DEFINED -> STARTED -> FAILED
-                           .Reset().TestDefined()
-                           .Mine(1, TestTime(1), 0).TestDefined()
-                           .Mine(1000, TestTime(10000) - 1, 0x100).TestDefined() // One second more and it would be defined
-                           .Mine(2000, TestTime(10000), 0x100).TestStarted() // So that's what happens the next period
-                           .Mine(2051, TestTime(10010), 0).TestStarted() // 51 old blocks
-                           .Mine(2950, TestTime(10020), 0x100).TestStarted() // 899 new blocks
-                           .Mine(3000, TestTime(20000), 0).TestFailed() // 50 old blocks (so 899 out of the past 1000)
-                           .Mine(4000, TestTime(20010), 0x100).TestFailed()
+                           .Reset().TestDefined().TestStateSinceHeight(0)
+                           .Mine(1, TestTime(1), 0).TestDefined().TestStateSinceHeight(0)
+                           .Mine(1000, TestTime(10000) - 1, 0x100).TestDefined().TestStateSinceHeight(0) // One second more and it would be defined
+                           .Mine(2000, TestTime(10000), 0x100).TestStarted().TestStateSinceHeight(2000) // So that's what happens the next period
+                           .Mine(2051, TestTime(10010), 0).TestStarted().TestStateSinceHeight(2000) // 51 old blocks
+                           .Mine(2950, TestTime(10020), 0x100).TestStarted().TestStateSinceHeight(2000) // 899 new blocks
+                           .Mine(3000, TestTime(20000), 0).TestFailed().TestStateSinceHeight(3000) // 50 old blocks (so 899 out of the past 1000)
+                           .Mine(4000, TestTime(20010), 0x100).TestFailed().TestStateSinceHeight(3000)
 
         // DEFINED -> STARTED -> FAILED while threshold reached
-                           .Reset().TestDefined()
-                           .Mine(1, TestTime(1), 0).TestDefined()
-                           .Mine(1000, TestTime(10000) - 1, 0x101).TestDefined() // One second more and it would be defined
-                           .Mine(2000, TestTime(10000), 0x101).TestStarted() // So that's what happens the next period
-                           .Mine(2999, TestTime(30000), 0x100).TestStarted() // 999 new blocks
-                           .Mine(3000, TestTime(30000), 0x100).TestFailed() // 1 new block (so 1000 out of the past 1000 are new)
-                           .Mine(3999, TestTime(30001), 0).TestFailed()
-                           .Mine(4000, TestTime(30002), 0).TestFailed()
-                           .Mine(14333, TestTime(30003), 0).TestFailed()
-                           .Mine(24000, TestTime(40000), 0).TestFailed()
+                           .Reset().TestDefined().TestStateSinceHeight(0)
+                           .Mine(1, TestTime(1), 0).TestDefined().TestStateSinceHeight(0)
+                           .Mine(1000, TestTime(10000) - 1, 0x101).TestDefined().TestStateSinceHeight(0) // One second more and it would be defined
+                           .Mine(2000, TestTime(10000), 0x101).TestStarted().TestStateSinceHeight(2000) // So that's what happens the next period
+                           .Mine(2999, TestTime(30000), 0x100).TestStarted().TestStateSinceHeight(2000) // 999 new blocks
+                           .Mine(3000, TestTime(30000), 0x100).TestFailed().TestStateSinceHeight(3000) // 1 new block (so 1000 out of the past 1000 are new)
+                           .Mine(3999, TestTime(30001), 0).TestFailed().TestStateSinceHeight(3000)
+                           .Mine(4000, TestTime(30002), 0).TestFailed().TestStateSinceHeight(3000)
+                           .Mine(14333, TestTime(30003), 0).TestFailed().TestStateSinceHeight(3000)
+                           .Mine(24000, TestTime(40000), 0).TestFailed().TestStateSinceHeight(3000)
 
         // DEFINED -> STARTED -> LOCKEDIN at the last minute -> ACTIVE
                            .Reset().TestDefined()
-                           .Mine(1, TestTime(1), 0).TestDefined()
-                           .Mine(1000, TestTime(10000) - 1, 0x101).TestDefined() // One second more and it would be defined
-                           .Mine(2000, TestTime(10000), 0x101).TestStarted() // So that's what happens the next period
-                           .Mine(2050, TestTime(10010), 0x200).TestStarted() // 50 old blocks
-                           .Mine(2950, TestTime(10020), 0x100).TestStarted() // 900 new blocks
-                           .Mine(2999, TestTime(19999), 0x200).TestStarted() // 49 old blocks
-                           .Mine(3000, TestTime(29999), 0x200).TestLockedIn() // 1 old block (so 900 out of the past 1000)
-                           .Mine(3999, TestTime(30001), 0).TestLockedIn()
-                           .Mine(4000, TestTime(30002), 0).TestActive()
-                           .Mine(14333, TestTime(30003), 0).TestActive()
-                           .Mine(24000, TestTime(40000), 0).TestActive();
+                           .Mine(1, TestTime(1), 0).TestDefined().TestStateSinceHeight(0)
+                           .Mine(1000, TestTime(10000) - 1, 0x101).TestDefined().TestStateSinceHeight(0) // One second more and it would be defined
+                           .Mine(2000, TestTime(10000), 0x101).TestStarted().TestStateSinceHeight(2000) // So that's what happens the next period
+                           .Mine(2050, TestTime(10010), 0x200).TestStarted().TestStateSinceHeight(2000) // 50 old blocks
+                           .Mine(2950, TestTime(10020), 0x100).TestStarted().TestStateSinceHeight(2000) // 900 new blocks
+                           .Mine(2999, TestTime(19999), 0x200).TestStarted().TestStateSinceHeight(2000) // 49 old blocks
+                           .Mine(3000, TestTime(29999), 0x200).TestLockedIn().TestStateSinceHeight(3000) // 1 old block (so 900 out of the past 1000)
+                           .Mine(3999, TestTime(30001), 0).TestLockedIn().TestStateSinceHeight(3000)
+                           .Mine(4000, TestTime(30002), 0).TestActive().TestStateSinceHeight(4000)
+                           .Mine(14333, TestTime(30003), 0).TestActive().TestStateSinceHeight(4000)
+                           .Mine(24000, TestTime(40000), 0).TestActive().TestStateSinceHeight(4000)
+
+        // DEFINED multiple periods -> STARTED multiple periods -> FAILED
+                           .Reset().TestDefined().TestStateSinceHeight(0)
+                           .Mine(999, TestTime(999), 0).TestDefined().TestStateSinceHeight(0)
+                           .Mine(1000, TestTime(1000), 0).TestDefined().TestStateSinceHeight(0)
+                           .Mine(2000, TestTime(2000), 0).TestDefined().TestStateSinceHeight(0)
+                           .Mine(3000, TestTime(10000), 0).TestStarted().TestStateSinceHeight(3000)
+                           .Mine(4000, TestTime(10000), 0).TestStarted().TestStateSinceHeight(3000)
+                           .Mine(5000, TestTime(10000), 0).TestStarted().TestStateSinceHeight(3000)
+                           .Mine(6000, TestTime(20000), 0).TestFailed().TestStateSinceHeight(6000)
+                           .Mine(7000, TestTime(20000), 0x100).TestFailed().TestStateSinceHeight(6000);
     }
 
     // Sanity checks of version bit deployments
diff --git a/src/versionbits.cpp b/src/versionbits.cpp
index bf32ae6627945..d73f3405109d0 100644
--- a/src/versionbits.cpp
+++ b/src/versionbits.cpp
@@ -105,6 +105,36 @@ ThresholdState AbstractThresholdConditionChecker::GetStateFor(const CBlockIndex*
     return state;
 }
 
+int AbstractThresholdConditionChecker::GetStateSinceHeightFor(const CBlockIndex* pindexPrev, const Consensus::Params& params, ThresholdConditionCache& cache) const
+{
+    const ThresholdState initialState = GetStateFor(pindexPrev, params, cache);
+
+    // BIP 9 about state DEFINED: "The genesis block is by definition in this state for each deployment."
+    if (initialState == THRESHOLD_DEFINED) {
+        return 0;
+    }
+
+    const int nPeriod = Period(params);
+
+    // A block's state is always the same as that of the first of its period, so it is computed based on a pindexPrev whose height equals a multiple of nPeriod - 1.
+    // To ease understanding of the following height calculation, it helps to remember that
+    // right now pindexPrev points to the block prior to the block that we are computing for, thus:
+    // if we are computing for the last block of a period, then pindexPrev points to the second to last block of the period, and
+    // if we are computing for the first block of a period, then pindexPrev points to the last block of the previous period.
+    // The parent of the genesis block is represented by NULL.
+    pindexPrev = pindexPrev->GetAncestor(pindexPrev->nHeight - ((pindexPrev->nHeight + 1) % nPeriod));
+
+    const CBlockIndex* previousPeriodParent = pindexPrev->GetAncestor(pindexPrev->nHeight - nPeriod);
+
+    while (previousPeriodParent != NULL && GetStateFor(previousPeriodParent, params, cache) == initialState) {
+        pindexPrev = previousPeriodParent;
+        previousPeriodParent = pindexPrev->GetAncestor(pindexPrev->nHeight - nPeriod);
+    }
+
+    // Adjust the result because right now we point to the parent block.
+    return pindexPrev->nHeight + 1;
+}
+
 namespace
 {
 /**
@@ -137,6 +167,11 @@ ThresholdState VersionBitsState(const CBlockIndex* pindexPrev, const Consensus::
     return VersionBitsConditionChecker(pos).GetStateFor(pindexPrev, params, cache.caches[pos]);
 }
 
+int VersionBitsStateSinceHeight(const CBlockIndex* pindexPrev, const Consensus::Params& params, Consensus::DeploymentPos pos, VersionBitsCache& cache)
+{
+    return VersionBitsConditionChecker(pos).GetStateSinceHeightFor(pindexPrev, params, cache.caches[pos]);
+}
+
 uint32_t VersionBitsMask(const Consensus::Params& params, Consensus::DeploymentPos pos)
 {
     return VersionBitsConditionChecker(pos).Mask(params);
diff --git a/src/versionbits.h b/src/versionbits.h
index ede2dcdda8a7a..7a929266aa24c 100644
--- a/src/versionbits.h
+++ b/src/versionbits.h
@@ -51,8 +51,9 @@ class AbstractThresholdConditionChecker {
     virtual int Threshold(const Consensus::Params& params) const =0;
 
 public:
-    // Note that the function below takes a pindexPrev as input: they compute information for block B based on its parent.
+    // Note that the functions below take a pindexPrev as input: they compute information for block B based on its parent.
     ThresholdState GetStateFor(const CBlockIndex* pindexPrev, const Consensus::Params& params, ThresholdConditionCache& cache) const;
+    int GetStateSinceHeightFor(const CBlockIndex* pindexPrev, const Consensus::Params& params, ThresholdConditionCache& cache) const;
 };
 
 struct VersionBitsCache
@@ -63,6 +64,7 @@ struct VersionBitsCache
 };
 
 ThresholdState VersionBitsState(const CBlockIndex* pindexPrev, const Consensus::Params& params, Consensus::DeploymentPos pos, VersionBitsCache& cache);
+int VersionBitsStateSinceHeight(const CBlockIndex* pindexPrev, const Consensus::Params& params, Consensus::DeploymentPos pos, VersionBitsCache& cache);
 uint32_t VersionBitsMask(const Consensus::Params& params, Consensus::DeploymentPos pos);
 
 #endif

From cb08fdbf78685b55029768524ca867772711c32b Mon Sep 17 00:00:00 2001
From: Pedro Branco <branco@uphold.com>
Date: Thu, 16 Jun 2016 15:57:48 +0100
Subject: [PATCH 1060/1802] Add importmulti rpc call

---
 qa/pull-tester/rpc-tests.py |   1 +
 qa/rpc-tests/importmulti.py | 293 +++++++++++++++++++++++++++
 src/chain.cpp               |   7 +
 src/chain.h                 |   3 +
 src/rpc/client.cpp          |   2 +
 src/wallet/rpcdump.cpp      | 390 ++++++++++++++++++++++++++++++++++++
 src/wallet/rpcwallet.cpp    |   2 +
 7 files changed, 698 insertions(+)
 create mode 100755 qa/rpc-tests/importmulti.py

diff --git a/qa/pull-tester/rpc-tests.py b/qa/pull-tester/rpc-tests.py
index 7430bb22565e4..778f8d8a77818 100755
--- a/qa/pull-tester/rpc-tests.py
+++ b/qa/pull-tester/rpc-tests.py
@@ -145,6 +145,7 @@
     'signmessages.py',
     'p2p-compactblocks.py',
     'nulldummy.py',
+    'importmulti.py',
 ]
 if ENABLE_ZMQ:
     testScripts.append('zmq_test.py')
diff --git a/qa/rpc-tests/importmulti.py b/qa/rpc-tests/importmulti.py
new file mode 100755
index 0000000000000..960cb63d768c5
--- /dev/null
+++ b/qa/rpc-tests/importmulti.py
@@ -0,0 +1,293 @@
+#!/usr/bin/env python3
+# Copyright (c) 2014-2016 The Bitcoin Core developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+from test_framework.test_framework import BitcoinTestFramework
+from test_framework.util import *
+
+class ImportMultiTest (BitcoinTestFramework):
+    def __init__(self):
+        super().__init__()
+        self.num_nodes = 2
+        self.setup_clean_chain = True
+
+    def setup_network(self, split=False):
+        self.nodes = start_nodes(2, self.options.tmpdir)
+        self.is_network_split=False
+
+    def run_test (self):
+        print ("Mining blocks...")
+        self.nodes[0].generate(1)
+        self.nodes[1].generate(1)
+
+        # keyword definition
+        PRIV_KEY = 'privkey'
+        PUB_KEY = 'pubkey'
+        ADDRESS_KEY = 'address'
+        SCRIPT_KEY = 'script'
+
+
+        node0_address1 = self.nodes[0].validateaddress(self.nodes[0].getnewaddress())
+        node0_address2 = self.nodes[0].validateaddress(self.nodes[0].getnewaddress())
+        node0_address3 = self.nodes[0].validateaddress(self.nodes[0].getnewaddress())
+
+        #Check only one address
+        assert_equal(node0_address1['ismine'], True)
+
+        #Node 1 sync test
+        assert_equal(self.nodes[1].getblockcount(),1)
+
+        #Address Test - before import
+        address_info = self.nodes[1].validateaddress(node0_address1['address'])
+        assert_equal(address_info['iswatchonly'], False)
+        assert_equal(address_info['ismine'], False)
+
+
+        # RPC importmulti -----------------------------------------------
+
+        # Bitcoin Address
+        print("Should import an address")
+        address = self.nodes[0].validateaddress(self.nodes[0].getnewaddress())
+        result = self.nodes[1].importmulti([{
+            "scriptPubKey": {
+                "address": address['address']
+            }
+        }])
+        assert_equal(result[0]['success'], True)
+        address_assert = self.nodes[1].validateaddress(address['address'])
+        assert_equal(address_assert['iswatchonly'], True)
+        assert_equal(address_assert['ismine'], False)
+
+
+        # ScriptPubKey + internal
+        print("Should import a scriptPubKey with internal flag")
+        address = self.nodes[0].validateaddress(self.nodes[0].getnewaddress())
+        result = self.nodes[1].importmulti([{
+            "scriptPubKey": address['scriptPubKey'],
+            "internal": True
+        }])
+        assert_equal(result[0]['success'], True)
+        address_assert = self.nodes[1].validateaddress(address['address'])
+        assert_equal(address_assert['iswatchonly'], True)
+        assert_equal(address_assert['ismine'], False)
+
+        # ScriptPubKey + !internal
+        print("Should not import a scriptPubKey without internal flag")
+        address = self.nodes[0].validateaddress(self.nodes[0].getnewaddress())
+        result = self.nodes[1].importmulti([{
+            "scriptPubKey": address['scriptPubKey']
+        }])
+        assert_equal(result[0]['success'], False)
+        assert_equal(result[0]['error']['code'], -8)
+        assert_equal(result[0]['error']['message'], 'Internal must be set for hex scriptPubKey')
+        address_assert = self.nodes[1].validateaddress(address['address'])
+        assert_equal(address_assert['iswatchonly'], False)
+        assert_equal(address_assert['ismine'], False)
+
+
+        # Address + Public key + !Internal
+        print("Should import an address with public key")
+        address = self.nodes[0].validateaddress(self.nodes[0].getnewaddress())
+        result = self.nodes[1].importmulti([{
+            "scriptPubKey": {
+                "address": address['address']
+            },
+            "pubkeys": [ address['pubkey'] ]
+        }])
+        assert_equal(result[0]['success'], True)
+        address_assert = self.nodes[1].validateaddress(address['address'])
+        assert_equal(address_assert['iswatchonly'], True)
+        assert_equal(address_assert['ismine'], False)
+
+
+        # ScriptPubKey + Public key + internal
+        print("Should import a scriptPubKey with internal and with public key")
+        address = self.nodes[0].validateaddress(self.nodes[0].getnewaddress())
+        request = [{
+            "scriptPubKey": address['scriptPubKey'],
+            "pubkeys": [ address['pubkey'] ],
+            "internal": True
+        }];
+        result = self.nodes[1].importmulti(request)
+        assert_equal(result[0]['success'], True)
+        address_assert = self.nodes[1].validateaddress(address['address'])
+        assert_equal(address_assert['iswatchonly'], True)
+        assert_equal(address_assert['ismine'], False)
+
+        # ScriptPubKey + Public key + !internal
+        print("Should not import a scriptPubKey without internal and with public key")
+        address = self.nodes[0].validateaddress(self.nodes[0].getnewaddress())
+        request = [{
+            "scriptPubKey": address['scriptPubKey'],
+            "pubkeys": [ address['pubkey'] ]
+        }];
+        result = self.nodes[1].importmulti(request)
+        assert_equal(result[0]['success'], False)
+        assert_equal(result[0]['error']['code'], -8)
+        assert_equal(result[0]['error']['message'], 'Internal must be set for hex scriptPubKey')
+        address_assert = self.nodes[1].validateaddress(address['address'])
+        assert_equal(address_assert['iswatchonly'], False)
+        assert_equal(address_assert['ismine'], False)
+
+        # Address + Private key + !watchonly
+        print("Should import an address with private key")
+        address = self.nodes[0].validateaddress(self.nodes[0].getnewaddress())
+        result = self.nodes[1].importmulti([{
+            "scriptPubKey": {
+                "address": address['address']
+            },
+            "keys": [ self.nodes[0].dumpprivkey(address['address']) ]
+        }])
+        assert_equal(result[0]['success'], True)
+        address_assert = self.nodes[1].validateaddress(address['address'])
+        assert_equal(address_assert['iswatchonly'], False)
+        assert_equal(address_assert['ismine'], True)
+
+        # Address + Private key + watchonly
+        print("Should not import an address with private key and with watchonly")
+        address = self.nodes[0].validateaddress(self.nodes[0].getnewaddress())
+        result = self.nodes[1].importmulti([{
+            "scriptPubKey": {
+                "address": address['address']
+            },
+            "keys": [ self.nodes[0].dumpprivkey(address['address']) ],
+            "watchonly": True
+        }])
+        assert_equal(result[0]['success'], False)
+        assert_equal(result[0]['error']['code'], -8)
+        assert_equal(result[0]['error']['message'], 'Incompatibility found between watchonly and keys')
+        address_assert = self.nodes[1].validateaddress(address['address'])
+        assert_equal(address_assert['iswatchonly'], False)
+        assert_equal(address_assert['ismine'], False)
+
+        # ScriptPubKey + Private key + internal
+        print("Should import a scriptPubKey with internal and with private key")
+        address = self.nodes[0].validateaddress(self.nodes[0].getnewaddress())
+        result = self.nodes[1].importmulti([{
+            "scriptPubKey": address['scriptPubKey'],
+            "keys": [ self.nodes[0].dumpprivkey(address['address']) ],
+            "internal": True
+        }])
+        assert_equal(result[0]['success'], True)
+        address_assert = self.nodes[1].validateaddress(address['address'])
+        assert_equal(address_assert['iswatchonly'], False)
+        assert_equal(address_assert['ismine'], True)
+
+        # ScriptPubKey + Private key + !internal
+        print("Should not import a scriptPubKey without internal and with private key")
+        address = self.nodes[0].validateaddress(self.nodes[0].getnewaddress())
+        result = self.nodes[1].importmulti([{
+            "scriptPubKey": address['scriptPubKey'],
+            "keys": [ self.nodes[0].dumpprivkey(address['address']) ]
+        }])
+        assert_equal(result[0]['success'], False)
+        assert_equal(result[0]['error']['code'], -8)
+        assert_equal(result[0]['error']['message'], 'Internal must be set for hex scriptPubKey')
+        address_assert = self.nodes[1].validateaddress(address['address'])
+        assert_equal(address_assert['iswatchonly'], False)
+        assert_equal(address_assert['ismine'], False)
+
+
+        # P2SH address
+        sig_address_1 = self.nodes[0].validateaddress(self.nodes[0].getnewaddress())
+        sig_address_2 = self.nodes[0].validateaddress(self.nodes[0].getnewaddress())
+        sig_address_3 = self.nodes[0].validateaddress(self.nodes[0].getnewaddress())
+        multi_sig_script = self.nodes[0].createmultisig(2, [sig_address_1['address'], sig_address_2['address'], sig_address_3['pubkey']])
+        self.nodes[1].generate(100)
+        transactionid = self.nodes[1].sendtoaddress(multi_sig_script['address'], 10.00)
+        self.nodes[1].generate(1)
+        transaction = self.nodes[1].gettransaction(transactionid);
+
+        print("Should import a p2sh")
+        result = self.nodes[1].importmulti([{
+            "scriptPubKey": {
+                "address": multi_sig_script['address']
+            }
+        }])
+        assert_equal(result[0]['success'], True)
+        address_assert = self.nodes[1].validateaddress(multi_sig_script['address'])
+        assert_equal(address_assert['isscript'], True)
+        assert_equal(address_assert['iswatchonly'], True)
+        p2shunspent = self.nodes[1].listunspent(0,999999, [multi_sig_script['address']])[0]
+        assert_equal(p2shunspent['spendable'], False)
+        assert_equal(p2shunspent['solvable'], False)
+
+
+        # P2SH + Redeem script
+        sig_address_1 = self.nodes[0].validateaddress(self.nodes[0].getnewaddress())
+        sig_address_2 = self.nodes[0].validateaddress(self.nodes[0].getnewaddress())
+        sig_address_3 = self.nodes[0].validateaddress(self.nodes[0].getnewaddress())
+        multi_sig_script = self.nodes[0].createmultisig(2, [sig_address_1['address'], sig_address_2['address'], sig_address_3['pubkey']])
+        self.nodes[1].generate(100)
+        transactionid = self.nodes[1].sendtoaddress(multi_sig_script['address'], 10.00)
+        self.nodes[1].generate(1)
+        transaction = self.nodes[1].gettransaction(transactionid);
+
+        print("Should import a p2sh with respective redeem script")
+        result = self.nodes[1].importmulti([{
+            "scriptPubKey": {
+                "address": multi_sig_script['address']
+            },
+            "redeemscript": multi_sig_script['redeemScript']
+        }])
+        assert_equal(result[0]['success'], True)
+
+        p2shunspent = self.nodes[1].listunspent(0,999999, [multi_sig_script['address']])[0]
+        assert_equal(p2shunspent['spendable'], False)
+        assert_equal(p2shunspent['solvable'], True)
+
+
+        # P2SH + Redeem script + Private Keys + !Watchonly
+        sig_address_1 = self.nodes[0].validateaddress(self.nodes[0].getnewaddress())
+        sig_address_2 = self.nodes[0].validateaddress(self.nodes[0].getnewaddress())
+        sig_address_3 = self.nodes[0].validateaddress(self.nodes[0].getnewaddress())
+        multi_sig_script = self.nodes[0].createmultisig(2, [sig_address_1['address'], sig_address_2['address'], sig_address_3['pubkey']])
+        self.nodes[1].generate(100)
+        transactionid = self.nodes[1].sendtoaddress(multi_sig_script['address'], 10.00)
+        self.nodes[1].generate(1)
+        transaction = self.nodes[1].gettransaction(transactionid);
+
+        print("Should import a p2sh with respective redeem script and private keys")
+        result = self.nodes[1].importmulti([{
+            "scriptPubKey": {
+                "address": multi_sig_script['address']
+            },
+            "redeemscript": multi_sig_script['redeemScript'],
+            "keys": [ self.nodes[0].dumpprivkey(sig_address_1['address']), self.nodes[0].dumpprivkey(sig_address_2['address'])]
+        }])
+        assert_equal(result[0]['success'], True)
+
+        p2shunspent = self.nodes[1].listunspent(0,999999, [multi_sig_script['address']])[0]
+        assert_equal(p2shunspent['spendable'], False)
+        assert_equal(p2shunspent['solvable'], True)
+
+        # P2SH + Redeem script + Private Keys + Watchonly
+        sig_address_1 = self.nodes[0].validateaddress(self.nodes[0].getnewaddress())
+        sig_address_2 = self.nodes[0].validateaddress(self.nodes[0].getnewaddress())
+        sig_address_3 = self.nodes[0].validateaddress(self.nodes[0].getnewaddress())
+        multi_sig_script = self.nodes[0].createmultisig(2, [sig_address_1['address'], sig_address_2['address'], sig_address_3['pubkey']])
+        self.nodes[1].generate(100)
+        transactionid = self.nodes[1].sendtoaddress(multi_sig_script['address'], 10.00)
+        self.nodes[1].generate(1)
+        transaction = self.nodes[1].gettransaction(transactionid);
+
+        print("Should import a p2sh with respective redeem script and private keys")
+        result = self.nodes[1].importmulti([{
+            "scriptPubKey": {
+                "address": multi_sig_script['address']
+            },
+            "redeemscript": multi_sig_script['redeemScript'],
+            "keys": [ self.nodes[0].dumpprivkey(sig_address_1['address']), self.nodes[0].dumpprivkey(sig_address_2['address'])],
+            "watchonly": True
+        }])
+        assert_equal(result[0]['success'], False)
+        assert_equal(result[0]['error']['code'], -8)
+        assert_equal(result[0]['error']['message'], 'Incompatibility found between watchonly and keys')
+
+        # TODO Consistency tests?
+
+
+
+if __name__ == '__main__':
+    ImportMultiTest ().main ()
diff --git a/src/chain.cpp b/src/chain.cpp
index 77e924e703043..1e611906d146f 100644
--- a/src/chain.cpp
+++ b/src/chain.cpp
@@ -61,6 +61,13 @@ const CBlockIndex *CChain::FindFork(const CBlockIndex *pindex) const {
     return pindex;
 }
 
+CBlockIndex* CChain::FindLatestBefore(int64_t nTime) const
+{
+    std::vector<CBlockIndex*>::const_iterator lower = std::lower_bound(vChain.begin(), vChain.end(), nTime,
+        [](CBlockIndex* pBlock, const int64_t& time) -> bool { return pBlock->GetBlockTime() < time; });
+    return (lower == vChain.end() ? NULL : *lower);
+}
+
 /** Turn the lowest '1' bit in the binary representation of a number into a '0'. */
 int static inline InvertLowestOne(int n) { return n & (n - 1); }
 
diff --git a/src/chain.h b/src/chain.h
index e2f8c565224c2..46a16a30617f4 100644
--- a/src/chain.h
+++ b/src/chain.h
@@ -459,6 +459,9 @@ class CChain {
 
     /** Find the last common block between this chain and a block index entry. */
     const CBlockIndex *FindFork(const CBlockIndex *pindex) const;
+
+    /** Find the most recent block with timestamp lower than the given. */
+    CBlockIndex* FindLatestBefore(int64_t nTime) const;
 };
 
 #endif // BITCOIN_CHAIN_H
diff --git a/src/rpc/client.cpp b/src/rpc/client.cpp
index c14d9d67474fe..8370a0f43effb 100644
--- a/src/rpc/client.cpp
+++ b/src/rpc/client.cpp
@@ -95,6 +95,8 @@ static const CRPCConvertParam vRPCConvertParams[] =
     { "importaddress", 2 },
     { "importaddress", 3 },
     { "importpubkey", 2 },
+    { "importmulti", 0 },
+    { "importmulti", 1 },
     { "verifychain", 0 },
     { "verifychain", 1 },
     { "keypoolrefill", 0 },
diff --git a/src/wallet/rpcdump.cpp b/src/wallet/rpcdump.cpp
index 8a1bbd5684526..0297337c2a399 100644
--- a/src/wallet/rpcdump.cpp
+++ b/src/wallet/rpcdump.cpp
@@ -24,6 +24,7 @@
 
 #include <univalue.h>
 
+#include <boost/assign/list_of.hpp>
 #include <boost/foreach.hpp>
 
 using namespace std;
@@ -637,3 +638,392 @@ UniValue dumpwallet(const JSONRPCRequest& request)
     file.close();
     return NullUniValue;
 }
+
+
+UniValue processImport(const UniValue& data) {
+    // TODO List:
+    // - Check consistency between pubkeys/privkeys and scriptPubKey/redeemScript.
+
+    try {
+        bool success = false;
+
+        // Required fields.
+        const UniValue& scriptPubKey = data["scriptPubKey"];
+
+        // Should have script or JSON with "address".
+        if (!(scriptPubKey.getType() == UniValue::VOBJ && scriptPubKey.exists("address")) && !(scriptPubKey.getType() == UniValue::VSTR)) {
+            throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid scriptPubKey");
+        }
+
+        // Optional fields.
+        const string& strRedeemScript = data.exists("redeemscript") ? data["redeemscript"].get_str() : "";
+        const UniValue& pubKeys = data.exists("pubkeys") ? data["pubkeys"].get_array() : UniValue();
+        const UniValue& keys = data.exists("keys") ? data["keys"].get_array() : UniValue();
+        const bool& internal = data.exists("internal") ? data["internal"].get_bool() : false;
+        const bool& watchOnly = data.exists("watchonly") ? data["watchonly"].get_bool() : false;
+        const string& label = data.exists("label") && !internal ? data["label"].get_str() : "";
+        const int64_t& timestamp = data.exists("timestamp") && data["timestamp"].get_int64() > 1 ? data["timestamp"].get_int64() : 1;
+
+        bool isScript = scriptPubKey.getType() == UniValue::VSTR;
+        bool isP2SH = strRedeemScript.length() > 0;
+        const string& output = isScript ? scriptPubKey.get_str() : scriptPubKey["address"].get_str();
+
+        // Parse the output.
+        CScript script;
+        CBitcoinAddress address;
+
+        if (!isScript) {
+            address = CBitcoinAddress(output);
+            script = GetScriptForDestination(address.Get());
+        } else {
+            if (!IsHex(output)) {
+                throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid scriptPubKey");
+            }
+
+            std::vector<unsigned char> vData(ParseHex(output));
+            script = CScript(vData.begin(), vData.end());
+        }
+
+        // Watchonly and private keys
+        if (watchOnly && keys.size()) {
+            throw JSONRPCError(RPC_INVALID_PARAMETER, "Incompatibility found between watchonly and keys");
+        }
+
+        // Internal + Label
+        if (internal && data.exists("label")) {
+            throw JSONRPCError(RPC_INVALID_PARAMETER, "Incompatibility found between internal and label");
+        }
+
+        // Not having Internal + Script
+        if (!internal && isScript) {
+            throw JSONRPCError(RPC_INVALID_PARAMETER, "Internal must be set for hex scriptPubKey");
+        }
+
+        // Keys / PubKeys size check.
+        if (!isP2SH && (keys.size() > 1 || pubKeys.size() > 1)) { // Address / scriptPubKey
+            throw JSONRPCError(RPC_INVALID_PARAMETER, "More than private key given for one address");
+        }
+
+        // Invalid P2SH redeemScript
+        if (isP2SH && !IsHex(strRedeemScript)) {
+            throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid redeem script");
+        }
+
+        // Process. //
+
+        // P2SH
+        if (isP2SH) {
+            // TODO: check consistency between private keys and p2sh redeemscript + p2sh address
+
+            // Import redeem script.
+            std::vector<unsigned char> vData(ParseHex(strRedeemScript));
+            CScript redeemScript = CScript(vData.begin(), vData.end());
+
+            // Invalid P2SH address
+            if (!script.IsPayToScriptHash()) {
+                throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid P2SH address / script");
+            }
+
+            pwalletMain->MarkDirty();
+
+            if (!pwalletMain->HaveWatchOnly(redeemScript) && !pwalletMain->AddWatchOnly(redeemScript)) {
+                throw JSONRPCError(RPC_WALLET_ERROR, "Error adding address to wallet");
+            }
+
+            if (!pwalletMain->HaveCScript(redeemScript) && !pwalletMain->AddCScript(redeemScript)) {
+                throw JSONRPCError(RPC_WALLET_ERROR, "Error adding p2sh redeemScript to wallet");
+            }
+
+            CBitcoinAddress redeemAddress = CBitcoinAddress(CScriptID(redeemScript));
+            CScript redeemDestination = GetScriptForDestination(redeemAddress.Get());
+
+            if (::IsMine(*pwalletMain, redeemDestination) == ISMINE_SPENDABLE) {
+                throw JSONRPCError(RPC_WALLET_ERROR, "The wallet already contains the private key for this address or script");
+            }
+
+            pwalletMain->MarkDirty();
+
+            if (!pwalletMain->HaveWatchOnly(redeemDestination) && !pwalletMain->AddWatchOnly(redeemDestination)) {
+                throw JSONRPCError(RPC_WALLET_ERROR, "Error adding address to wallet");
+            }
+
+            // add to address book or update label
+            if (address.IsValid()) {
+                pwalletMain->SetAddressBook(address.Get(), label, "receive");
+            }
+
+            // Import private keys.
+            if (keys.size()) {
+                for (size_t i = 0; i < keys.size(); i++) {
+                    const string& privkey = keys[i].get_str();
+
+                    CBitcoinSecret vchSecret;
+                    bool fGood = vchSecret.SetString(privkey);
+
+                    if (!fGood) {
+                        throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid private key encoding");
+                    }
+
+                    CKey key = vchSecret.GetKey();
+
+                    if (!key.IsValid()) {
+                        throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Private key outside allowed range");
+                    }
+
+                    CPubKey pubkey = key.GetPubKey();
+                    assert(key.VerifyPubKey(pubkey));
+
+                    CKeyID vchAddress = pubkey.GetID();
+                    pwalletMain->MarkDirty();
+                    pwalletMain->SetAddressBook(vchAddress, label, "receive");
+
+                    if (pwalletMain->HaveKey(vchAddress)) {
+                        throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Already have this key");
+                    }
+
+                    pwalletMain->mapKeyMetadata[vchAddress].nCreateTime = timestamp;
+
+                    if (!pwalletMain->AddKeyPubKey(key, pubkey)) {
+                        throw JSONRPCError(RPC_WALLET_ERROR, "Error adding key to wallet");
+                    }
+
+                    if (timestamp < pwalletMain->nTimeFirstKey) {
+                        pwalletMain->nTimeFirstKey = timestamp;
+                    }
+                }
+            }
+
+            success = true;
+        } else {
+            // TODO: check consistency between private/public keys and scriptPubKey / address
+
+            // Import public keys.
+            if (pubKeys.size() && keys.size() == 0) {
+                const string& strPubKey = pubKeys[0].get_str();
+
+                if (!IsHex(strPubKey)) {
+                    throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Pubkey must be a hex string");
+                }
+
+                std::vector<unsigned char> data(ParseHex(strPubKey));
+                CPubKey pubKey(data.begin(), data.end());
+
+                if (!pubKey.IsFullyValid()) {
+                    throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Pubkey is not a valid public key");
+                }
+
+                CBitcoinAddress pubKeyAddress = CBitcoinAddress(pubKey.GetID());
+                CScript pubKeyScript = GetScriptForDestination(pubKeyAddress.Get());
+
+                if (::IsMine(*pwalletMain, pubKeyScript) == ISMINE_SPENDABLE) {
+                    throw JSONRPCError(RPC_WALLET_ERROR, "The wallet already contains the private key for this address or script");
+                }
+
+                pwalletMain->MarkDirty();
+
+                if (!pwalletMain->HaveWatchOnly(pubKeyScript) && !pwalletMain->AddWatchOnly(pubKeyScript)) {
+                    throw JSONRPCError(RPC_WALLET_ERROR, "Error adding address to wallet");
+                }
+
+                // add to address book or update label
+                if (pubKeyAddress.IsValid()) {
+                    pwalletMain->SetAddressBook(pubKeyAddress.Get(), label, "receive");
+                }
+
+                // TODO Is this necessary?
+                CScript scriptRawPubKey = GetScriptForRawPubKey(pubKey);
+
+                if (::IsMine(*pwalletMain, scriptRawPubKey) == ISMINE_SPENDABLE) {
+                    throw JSONRPCError(RPC_WALLET_ERROR, "The wallet already contains the private key for this address or script");
+                }
+
+                pwalletMain->MarkDirty();
+
+                if (!pwalletMain->HaveWatchOnly(scriptRawPubKey) && !pwalletMain->AddWatchOnly(scriptRawPubKey)) {
+                    throw JSONRPCError(RPC_WALLET_ERROR, "Error adding address to wallet");
+                }
+
+                success = true;
+            }
+
+            // Import private keys.
+            if (keys.size()) {
+                const string& strPrivkey = keys[0].get_str();
+
+                // Checks.
+                CBitcoinSecret vchSecret;
+                bool fGood = vchSecret.SetString(strPrivkey);
+
+                if (!fGood) {
+                    throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid private key encoding");
+                }
+
+                CKey key = vchSecret.GetKey();
+                if (!key.IsValid()) {
+                    throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Private key outside allowed range");
+                }
+
+                CPubKey pubKey = key.GetPubKey();
+                assert(key.VerifyPubKey(pubKey));
+
+                CKeyID vchAddress = pubkey.GetID();
+                pwalletMain->MarkDirty();
+                pwalletMain->SetAddressBook(vchAddress, label, "receive");
+
+                if (pwalletMain->HaveKey(vchAddress)) {
+                    return false;
+                }
+
+                pwalletMain->mapKeyMetadata[vchAddress].nCreateTime = timestamp;
+
+                if (!pwalletMain->AddKeyPubKey(key, pubKey)) {
+                    throw JSONRPCError(RPC_WALLET_ERROR, "Error adding key to wallet");
+                }
+
+                if (timestamp < pwalletMain->nTimeFirstKey) {
+                    pwalletMain->nTimeFirstKey = timestamp;
+                }
+
+                success = true;
+            }
+
+            // Import scriptPubKey only.
+            if (pubKeys.size() == 0 && keys.size() == 0) {
+                if (::IsMine(*pwalletMain, script) == ISMINE_SPENDABLE) {
+                    throw JSONRPCError(RPC_WALLET_ERROR, "The wallet already contains the private key for this address or script");
+                }
+
+                pwalletMain->MarkDirty();
+
+                if (!pwalletMain->HaveWatchOnly(script) && !pwalletMain->AddWatchOnly(script)) {
+                    throw JSONRPCError(RPC_WALLET_ERROR, "Error adding address to wallet");
+                }
+
+                if (scriptPubKey.getType() == UniValue::VOBJ) {
+                    // add to address book or update label
+                    if (address.IsValid()) {
+                        pwalletMain->SetAddressBook(address.Get(), label, "receive");
+                    }
+                }
+
+                success = true;
+            }
+        }
+
+        UniValue result = UniValue(UniValue::VOBJ);
+        result.pushKV("success", UniValue(success));
+        return result;
+    } catch (const UniValue& e) {
+        UniValue result = UniValue(UniValue::VOBJ);
+        result.pushKV("success", UniValue(false));
+        result.pushKV("error", e);
+        return result;
+    } catch (...) {
+        UniValue result = UniValue(UniValue::VOBJ);
+        result.pushKV("success", UniValue(false));
+        result.pushKV("error", JSONRPCError(RPC_MISC_ERROR, "Missing required fields"));
+        return result;
+    }
+}
+
+UniValue importmulti(const JSONRPCRequest& mainRequest)
+{
+    // clang-format off
+    if (mainRequest.fHelp || mainRequest.params.size() < 1 || mainRequest.params.size() > 2)
+        throw runtime_error(
+            "importmulti '[<json import requests>]' '<json options>' \n\n"
+            "Import addresses/scripts (with private or public keys, redeem script (P2SH)), rescanning all addresses in one-shot-only (rescan can be disabled via options).\n\n"
+            "Arguments:\n"
+            "1. request array     (array, required) Data to be imported\n"
+            "  [     (array of json objects)\n"
+            "    {\n"
+            "      \"scriptPubKey\": \"<script>\" | { \"address\":\"<address>\" }, (string / json, required) Type of scriptPubKey (string for script, json for address)\n"
+            "      \"redeemscript\": \"<script>\"                            , (string, optional) Allowed only if the scriptPubKey is a P2SH address or a P2SH scriptPubKey\n"
+            "      \"pubkeys\": [\"<pubKey>\", ... ]                         , (array, optional) Array of strings giving pubkeys that must occur in the output or redeemscript\n"
+            "      \"keys\": [\"<key>\", ... ]                               , (array, optional) Array of strings giving private keys whose corresponding public keys must occur in the output or redeemscript\n"
+            "      \"internal\": <true>                                    , (boolean, optional, default: false) Stating whether matching outputs should be be treated as not incoming payments\n"
+            "      \"watchonly\": <true>                                   , (boolean, optional, default: false) Stating whether matching outputs should be considered watched even when they're not spendable, only allowed if keys are empty\n"
+            "      \"label\": <label>                                      , (string, optional, default: '') Label to assign to the address (aka account name, for now), only allowed with internal=false\n"
+            "      \"timestamp\": 1454686740,                                (integer, optional, default now) Timestamp\n"
+            "    }\n"
+            "  ,...\n"
+            "  ]\n"
+            "2. json options                 (json, optional)\n"
+            "  {\n"
+            "     \"rescan\": <false>,         (boolean, optional, default: true) Stating if should rescan the blockchain after all imports\n"
+            "  }\n"
+            "\nExamples:\n" +
+            HelpExampleCli("importmulti", "'[{ \"scriptPubKey\": { \"address\": \"<my address>\" }, \"timestamp\":1455191478 }, "
+                                          "{ \"scriptPubKey\": { \"address\": \"<my 2nd address>\" }, \"label\": \"example 2\", \"timestamp\": 1455191480 }]'") +
+            HelpExampleCli("importmulti", "'[{ \"scriptPubKey\": { \"address\": \"<my address>\" }, \"timestamp\":1455191478 }]' '{ \"rescan\": false}'") +
+
+            "\nResponse is an array with the same size as the input that has the execution result :\n"
+            "  [{ \"success\": true } , { \"success\": false, \"error\": { \"code\": -1, \"message\": \"Internal Server Error\"} }, ... ]\n");
+
+    // clang-format on
+    if (!EnsureWalletIsAvailable(mainRequest.fHelp)) {
+        return NullUniValue;
+    }
+
+    RPCTypeCheck(mainRequest.params, boost::assign::list_of(UniValue::VARR)(UniValue::VOBJ));
+
+    const UniValue& requests = mainRequest.params[0];
+
+    //Default options
+    bool fRescan = true;
+
+    if (mainRequest.params.size() > 1) {
+        const UniValue& options = mainRequest.params[1];
+
+        if (options.exists("rescan")) {
+            fRescan = options["rescan"].get_bool();
+        }
+    }
+
+    LOCK2(cs_main, pwalletMain->cs_wallet);
+    EnsureWalletIsUnlocked();
+
+    bool fRunScan = false;
+    const int64_t minimumTimestamp = 1;
+    int64_t nLowestTimestamp;
+
+    if (fRescan && chainActive.Tip()) {
+        nLowestTimestamp = chainActive.Tip()->GetBlockTime();
+    } else {
+        fRescan = false;
+    }
+
+    UniValue response(UniValue::VARR);
+
+    BOOST_FOREACH (const UniValue& data, requests.getValues()) {
+        const UniValue result = processImport(data);
+        response.push_back(result);
+
+        if (!fRescan) {
+            continue;
+        }
+
+        // If at least one request was successful then allow rescan.
+        if (result["success"].get_bool()) {
+            fRunScan = true;
+        }
+
+        // Get the lowest timestamp.
+        const int64_t& timestamp = data.exists("timestamp") && data["timestamp"].get_int64() > minimumTimestamp ? data["timestamp"].get_int64() : minimumTimestamp;
+
+        if (timestamp < nLowestTimestamp) {
+            nLowestTimestamp = timestamp;
+        }
+    }
+
+    if (fRescan && fRunScan && requests.size() && nLowestTimestamp <= chainActive.Tip()->GetBlockTime()) {
+        CBlockIndex* pindex = nLowestTimestamp > minimumTimestamp ? chainActive.FindLatestBefore(nLowestTimestamp) : chainActive.Genesis();
+
+        if (pindex) {
+            pwalletMain->ScanForWalletTransactions(pindex, true);
+            pwalletMain->ReacceptWalletTransactions();
+        }
+    }
+
+    return response;
+}
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index 33620aa6ff59e..ab7e74988a00f 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -2583,6 +2583,7 @@ extern UniValue dumpwallet(const JSONRPCRequest& request);
 extern UniValue importwallet(const JSONRPCRequest& request);
 extern UniValue importprunedfunds(const JSONRPCRequest& request);
 extern UniValue removeprunedfunds(const JSONRPCRequest& request);
+extern UniValue importmulti(const JSONRPCRequest& request);
 
 static const CRPCCommand commands[] =
 { //  category              name                        actor (function)           okSafeMode
@@ -2607,6 +2608,7 @@ static const CRPCCommand commands[] =
     { "wallet",             "gettransaction",           &gettransaction,           false },
     { "wallet",             "getunconfirmedbalance",    &getunconfirmedbalance,    false },
     { "wallet",             "getwalletinfo",            &getwalletinfo,            false },
+    { "wallet",             "importmulti",              &importmulti,              true  },
     { "wallet",             "importprivkey",            &importprivkey,            true  },
     { "wallet",             "importwallet",             &importwallet,             true  },
     { "wallet",             "importaddress",            &importaddress,            true  },

From 999e4c91c2cd93f4cd8760b3572780c9d568f2f0 Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Sun, 18 Sep 2016 08:23:29 +0200
Subject: [PATCH 1061/1802] wallet: Change CCrypter to use vectors with secure
 allocator

Change CCrypter to use vectors with secure allocator instead of buffers
on in the object itself which will end up on the stack. This avoids
having to call LockedPageManager to lock stack memory pages to prevent the
memory from being swapped to disk. This is wasteful.
---
 src/wallet/crypter.cpp           | 14 +++++++-------
 src/wallet/crypter.h             | 19 ++++++-------------
 src/wallet/test/crypto_tests.cpp | 12 ++++++------
 3 files changed, 19 insertions(+), 26 deletions(-)

diff --git a/src/wallet/crypter.cpp b/src/wallet/crypter.cpp
index 190f8ecf2ab49..31ee060677104 100644
--- a/src/wallet/crypter.cpp
+++ b/src/wallet/crypter.cpp
@@ -48,12 +48,12 @@ bool CCrypter::SetKeyFromPassphrase(const SecureString& strKeyData, const std::v
 
     int i = 0;
     if (nDerivationMethod == 0)
-        i = BytesToKeySHA512AES(chSalt, strKeyData, nRounds, chKey, chIV);
+        i = BytesToKeySHA512AES(chSalt, strKeyData, nRounds, vchKey.data(), vchIV.data());
 
     if (i != (int)WALLET_CRYPTO_KEY_SIZE)
     {
-        memory_cleanse(chKey, sizeof(chKey));
-        memory_cleanse(chIV, sizeof(chIV));
+        memory_cleanse(vchKey.data(), vchKey.size());
+        memory_cleanse(vchIV.data(), vchIV.size());
         return false;
     }
 
@@ -66,8 +66,8 @@ bool CCrypter::SetKey(const CKeyingMaterial& chNewKey, const std::vector<unsigne
     if (chNewKey.size() != WALLET_CRYPTO_KEY_SIZE || chNewIV.size() != WALLET_CRYPTO_IV_SIZE)
         return false;
 
-    memcpy(&chKey[0], &chNewKey[0], sizeof chKey);
-    memcpy(&chIV[0], &chNewIV[0], sizeof chIV);
+    memcpy(vchKey.data(), chNewKey.data(), chNewKey.size());
+    memcpy(vchIV.data(), chNewIV.data(), chNewIV.size());
 
     fKeySet = true;
     return true;
@@ -82,7 +82,7 @@ bool CCrypter::Encrypt(const CKeyingMaterial& vchPlaintext, std::vector<unsigned
     // n + AES_BLOCKSIZE bytes
     vchCiphertext.resize(vchPlaintext.size() + AES_BLOCKSIZE);
 
-    AES256CBCEncrypt enc(chKey, chIV, true);
+    AES256CBCEncrypt enc(vchKey.data(), vchIV.data(), true);
     size_t nLen = enc.Encrypt(&vchPlaintext[0], vchPlaintext.size(), &vchCiphertext[0]);
     if(nLen < vchPlaintext.size())
         return false;
@@ -101,7 +101,7 @@ bool CCrypter::Decrypt(const std::vector<unsigned char>& vchCiphertext, CKeyingM
 
     vchPlaintext.resize(nLen);
 
-    AES256CBCDecrypt dec(chKey, chIV, true);
+    AES256CBCDecrypt dec(vchKey.data(), vchIV.data(), true);
     nLen = dec.Decrypt(&vchCiphertext[0], vchCiphertext.size(), &vchPlaintext[0]);
     if(nLen == 0)
         return false;
diff --git a/src/wallet/crypter.h b/src/wallet/crypter.h
index 5d0a4a3305b8c..f00f7fa7315b1 100644
--- a/src/wallet/crypter.h
+++ b/src/wallet/crypter.h
@@ -77,8 +77,8 @@ class CCrypter
 {
 friend class wallet_crypto::TestCrypter; // for test access to chKey/chIV
 private:
-    unsigned char chKey[WALLET_CRYPTO_KEY_SIZE];
-    unsigned char chIV[WALLET_CRYPTO_IV_SIZE];
+    std::vector<unsigned char, secure_allocator<unsigned char>> vchKey;
+    std::vector<unsigned char, secure_allocator<unsigned char>> vchIV;
     bool fKeySet;
 
     int BytesToKeySHA512AES(const std::vector<unsigned char>& chSalt, const SecureString& strKeyData, int count, unsigned char *key,unsigned char *iv) const;
@@ -91,28 +91,21 @@ friend class wallet_crypto::TestCrypter; // for test access to chKey/chIV
 
     void CleanKey()
     {
-        memory_cleanse(chKey, sizeof(chKey));
-        memory_cleanse(chIV, sizeof(chIV));
+        memory_cleanse(vchKey.data(), vchKey.size());
+        memory_cleanse(vchIV.data(), vchIV.size());
         fKeySet = false;
     }
 
     CCrypter()
     {
         fKeySet = false;
-
-        // Try to keep the key data out of swap (and be a bit over-careful to keep the IV that we don't even use out of swap)
-        // Note that this does nothing about suspend-to-disk (which will put all our key data on disk)
-        // Note as well that at no point in this program is any attempt made to prevent stealing of keys by reading the memory of the running process.
-        LockedPageManager::Instance().LockRange(&chKey[0], sizeof chKey);
-        LockedPageManager::Instance().LockRange(&chIV[0], sizeof chIV);
+        vchKey.resize(WALLET_CRYPTO_KEY_SIZE);
+        vchIV.resize(WALLET_CRYPTO_IV_SIZE);
     }
 
     ~CCrypter()
     {
         CleanKey();
-
-        LockedPageManager::Instance().UnlockRange(&chKey[0], sizeof chKey);
-        LockedPageManager::Instance().UnlockRange(&chIV[0], sizeof chIV);
     }
 };
 
diff --git a/src/wallet/test/crypto_tests.cpp b/src/wallet/test/crypto_tests.cpp
index c5f55ef5f0dac..ce35c53c48737 100644
--- a/src/wallet/test/crypto_tests.cpp
+++ b/src/wallet/test/crypto_tests.cpp
@@ -97,10 +97,10 @@ static void TestPassphraseSingle(const std::vector<unsigned char>& vchSalt, cons
 
     OldSetKeyFromPassphrase(passphrase, vchSalt, rounds, 0, chKey, chIV);
 
-    BOOST_CHECK_MESSAGE(memcmp(chKey, crypt.chKey, sizeof(chKey)) == 0, \
-        HexStr(chKey, chKey+sizeof(chKey)) + std::string(" != ") + HexStr(crypt.chKey, crypt.chKey + (sizeof crypt.chKey)));
-    BOOST_CHECK_MESSAGE(memcmp(chIV, crypt.chIV, sizeof(chIV)) == 0, \
-        HexStr(chIV, chIV+sizeof(chIV)) + std::string(" != ") + HexStr(crypt.chIV, crypt.chIV + (sizeof crypt.chIV)));
+    BOOST_CHECK_MESSAGE(memcmp(chKey, crypt.vchKey.data(), crypt.vchKey.size()) == 0, \
+        HexStr(chKey, chKey+sizeof(chKey)) + std::string(" != ") + HexStr(crypt.vchKey));
+    BOOST_CHECK_MESSAGE(memcmp(chIV, crypt.vchIV.data(), crypt.vchIV.size()) == 0, \
+        HexStr(chIV, chIV+sizeof(chIV)) + std::string(" != ") + HexStr(crypt.vchIV));
 
     if(!correctKey.empty())
         BOOST_CHECK_MESSAGE(memcmp(chKey, &correctKey[0], sizeof(chKey)) == 0, \
@@ -127,7 +127,7 @@ static void TestDecrypt(const CCrypter& crypt, const std::vector<unsigned char>&
     CKeyingMaterial vchDecrypted2;
     int result1, result2;
     result1 = crypt.Decrypt(vchCiphertext, vchDecrypted1);
-    result2 = OldDecrypt(vchCiphertext, vchDecrypted2, crypt.chKey, crypt.chIV);
+    result2 = OldDecrypt(vchCiphertext, vchDecrypted2, crypt.vchKey.data(), crypt.vchIV.data());
     BOOST_CHECK(result1 == result2);
 
     // These two should be equal. However, OpenSSL 1.0.1j introduced a change
@@ -152,7 +152,7 @@ static void TestEncryptSingle(const CCrypter& crypt, const CKeyingMaterial& vchP
     std::vector<unsigned char> vchCiphertext2;
     int result1 = crypt.Encrypt(vchPlaintext, vchCiphertext1);
 
-    int result2 = OldEncrypt(vchPlaintext, vchCiphertext2, crypt.chKey, crypt.chIV);
+    int result2 = OldEncrypt(vchPlaintext, vchCiphertext2, crypt.vchKey.data(), crypt.vchIV.data());
     BOOST_CHECK(result1 == result2);
     BOOST_CHECK(vchCiphertext1 == vchCiphertext2);
 

From f4d1fc259b5a62580d952c180b1189ccaa6af1bc Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Sun, 18 Sep 2016 08:40:14 +0200
Subject: [PATCH 1062/1802] wallet: Get rid of LockObject and UnlockObject
 calls in key.h

Replace these with vectors allocated from the secure allocator.

This avoids mlock syscall churn on stack pages, as well as makes
it possible to get rid of these functions.

Please review this commit and the previous one carefully that
no `sizeof(vectortype)` remains in the memcpys and memcmps usage
(ick!), and `.data()` or `&vec[x]` is used as appropriate instead of
&vec.
---
 src/key.cpp              | 34 ++++++++++++++--------------------
 src/key.h                | 27 +++++++++------------------
 src/support/pagelocker.h | 17 -----------------
 3 files changed, 23 insertions(+), 55 deletions(-)

diff --git a/src/key.cpp b/src/key.cpp
index aae9b042ac6db..b3ea98fb92e6d 100644
--- a/src/key.cpp
+++ b/src/key.cpp
@@ -125,8 +125,8 @@ bool CKey::Check(const unsigned char *vch) {
 
 void CKey::MakeNewKey(bool fCompressedIn) {
     do {
-        GetStrongRandBytes(vch, sizeof(vch));
-    } while (!Check(vch));
+        GetStrongRandBytes(keydata.data(), keydata.size());
+    } while (!Check(keydata.data()));
     fValid = true;
     fCompressed = fCompressedIn;
 }
@@ -224,20 +224,18 @@ bool CKey::Load(CPrivKey &privkey, CPubKey &vchPubKey, bool fSkipCheck=false) {
 bool CKey::Derive(CKey& keyChild, ChainCode &ccChild, unsigned int nChild, const ChainCode& cc) const {
     assert(IsValid());
     assert(IsCompressed());
-    unsigned char out[64];
-    LockObject(out);
+    std::vector<unsigned char, secure_allocator<unsigned char>> vout(64);
     if ((nChild >> 31) == 0) {
         CPubKey pubkey = GetPubKey();
         assert(pubkey.begin() + 33 == pubkey.end());
-        BIP32Hash(cc, nChild, *pubkey.begin(), pubkey.begin()+1, out);
+        BIP32Hash(cc, nChild, *pubkey.begin(), pubkey.begin()+1, vout.data());
     } else {
         assert(begin() + 32 == end());
-        BIP32Hash(cc, nChild, 0, begin(), out);
+        BIP32Hash(cc, nChild, 0, begin(), vout.data());
     }
-    memcpy(ccChild.begin(), out+32, 32);
+    memcpy(ccChild.begin(), vout.data()+32, 32);
     memcpy((unsigned char*)keyChild.begin(), begin(), 32);
-    bool ret = secp256k1_ec_privkey_tweak_add(secp256k1_context_sign, (unsigned char*)keyChild.begin(), out);
-    UnlockObject(out);
+    bool ret = secp256k1_ec_privkey_tweak_add(secp256k1_context_sign, (unsigned char*)keyChild.begin(), vout.data());
     keyChild.fCompressed = true;
     keyChild.fValid = ret;
     return ret;
@@ -253,12 +251,10 @@ bool CExtKey::Derive(CExtKey &out, unsigned int _nChild) const {
 
 void CExtKey::SetMaster(const unsigned char *seed, unsigned int nSeedLen) {
     static const unsigned char hashkey[] = {'B','i','t','c','o','i','n',' ','s','e','e','d'};
-    unsigned char out[64];
-    LockObject(out);
-    CHMAC_SHA512(hashkey, sizeof(hashkey)).Write(seed, nSeedLen).Finalize(out);
-    key.Set(&out[0], &out[32], true);
-    memcpy(chaincode.begin(), &out[32], 32);
-    UnlockObject(out);
+    std::vector<unsigned char, secure_allocator<unsigned char>> vout(64);
+    CHMAC_SHA512(hashkey, sizeof(hashkey)).Write(seed, nSeedLen).Finalize(vout.data());
+    key.Set(&vout[0], &vout[32], true);
+    memcpy(chaincode.begin(), &vout[32], 32);
     nDepth = 0;
     nChild = 0;
     memset(vchFingerprint, 0, sizeof(vchFingerprint));
@@ -308,12 +304,10 @@ void ECC_Start() {
 
     {
         // Pass in a random blinding seed to the secp256k1 context.
-        unsigned char seed[32];
-        LockObject(seed);
-        GetRandBytes(seed, 32);
-        bool ret = secp256k1_context_randomize(ctx, seed);
+        std::vector<unsigned char, secure_allocator<unsigned char>> vseed(32);
+        GetRandBytes(vseed.data(), 32);
+        bool ret = secp256k1_context_randomize(ctx, vseed.data());
         assert(ret);
-        UnlockObject(seed);
     }
 
     secp256k1_context_sign = ctx;
diff --git a/src/key.h b/src/key.h
index b589710badffb..48a07d62c9ccd 100644
--- a/src/key.h
+++ b/src/key.h
@@ -43,9 +43,7 @@ class CKey
     bool fCompressed;
 
     //! The actual byte data
-    unsigned char vch[32];
-
-    static_assert(sizeof(vch) == 32, "vch must be 32 bytes in length to not break serialization");
+    std::vector<unsigned char, secure_allocator<unsigned char> > keydata;
 
     //! Check whether the 32-byte array pointed to be vch is valid keydata.
     bool static Check(const unsigned char* vch);
@@ -54,37 +52,30 @@ class CKey
     //! Construct an invalid private key.
     CKey() : fValid(false), fCompressed(false)
     {
-        LockObject(vch);
-    }
-
-    //! Copy constructor. This is necessary because of memlocking.
-    CKey(const CKey& secret) : fValid(secret.fValid), fCompressed(secret.fCompressed)
-    {
-        LockObject(vch);
-        memcpy(vch, secret.vch, sizeof(vch));
+        // Important: vch must be 32 bytes in length to not break serialization
+        keydata.resize(32);
     }
 
     //! Destructor (again necessary because of memlocking).
     ~CKey()
     {
-        UnlockObject(vch);
     }
 
     friend bool operator==(const CKey& a, const CKey& b)
     {
         return a.fCompressed == b.fCompressed &&
             a.size() == b.size() &&
-            memcmp(&a.vch[0], &b.vch[0], a.size()) == 0;
+            memcmp(a.keydata.data(), b.keydata.data(), a.size()) == 0;
     }
 
     //! Initialize using begin and end iterators to byte data.
     template <typename T>
     void Set(const T pbegin, const T pend, bool fCompressedIn)
     {
-        if (pend - pbegin != sizeof(vch)) {
+        if (size_t(pend - pbegin) != keydata.size()) {
             fValid = false;
         } else if (Check(&pbegin[0])) {
-            memcpy(vch, (unsigned char*)&pbegin[0], sizeof(vch));
+            memcpy(keydata.data(), (unsigned char*)&pbegin[0], keydata.size());
             fValid = true;
             fCompressed = fCompressedIn;
         } else {
@@ -93,9 +84,9 @@ class CKey
     }
 
     //! Simple read-only vector-like interface.
-    unsigned int size() const { return (fValid ? sizeof(vch) : 0); }
-    const unsigned char* begin() const { return vch; }
-    const unsigned char* end() const { return vch + size(); }
+    unsigned int size() const { return (fValid ? keydata.size() : 0); }
+    const unsigned char* begin() const { return keydata.data(); }
+    const unsigned char* end() const { return keydata.data() + size(); }
 
     //! Check whether this private key is valid.
     bool IsValid() const { return fValid; }
diff --git a/src/support/pagelocker.h b/src/support/pagelocker.h
index 538bf39453e39..042144fad5614 100644
--- a/src/support/pagelocker.h
+++ b/src/support/pagelocker.h
@@ -157,21 +157,4 @@ class LockedPageManager : public LockedPageManagerBase<MemoryPageLocker>
     static boost::once_flag init_flag;
 };
 
-//
-// Functions for directly locking/unlocking memory objects.
-// Intended for non-dynamically allocated structures.
-//
-template <typename T>
-void LockObject(const T& t)
-{
-    LockedPageManager::Instance().LockRange((void*)(&t), sizeof(T));
-}
-
-template <typename T>
-void UnlockObject(const T& t)
-{
-    memory_cleanse((void*)(&t), sizeof(T));
-    LockedPageManager::Instance().UnlockRange((void*)(&t), sizeof(T));
-}
-
 #endif // BITCOIN_SUPPORT_PAGELOCKER_H

From 215caba4ed4547d6f2a0954fa9fe1ae78f4a7c40 Mon Sep 17 00:00:00 2001
From: Pedro Branco <branco@uphold.com>
Date: Wed, 19 Oct 2016 15:17:42 +0100
Subject: [PATCH 1063/1802] Add consistency check to RPC call importmulti

---
 qa/rpc-tests/importmulti.py | 69 ++++++++++++++++++++++++++++++++++++-
 src/wallet/rpcdump.cpp      | 48 +++++++++++++++++++++-----
 2 files changed, 108 insertions(+), 9 deletions(-)

diff --git a/qa/rpc-tests/importmulti.py b/qa/rpc-tests/importmulti.py
index 960cb63d768c5..5c536f2f49528 100755
--- a/qa/rpc-tests/importmulti.py
+++ b/qa/rpc-tests/importmulti.py
@@ -285,9 +285,76 @@ def run_test (self):
         assert_equal(result[0]['error']['code'], -8)
         assert_equal(result[0]['error']['message'], 'Incompatibility found between watchonly and keys')
 
-        # TODO Consistency tests?
 
+        # Address + Public key + !Internal + Wrong pubkey
+        print("Should not import an address with a wrong public key")
+        address = self.nodes[0].validateaddress(self.nodes[0].getnewaddress())
+        address2 = self.nodes[0].validateaddress(self.nodes[0].getnewaddress())
+        result = self.nodes[1].importmulti([{
+            "scriptPubKey": {
+                "address": address['address']
+            },
+            "pubkeys": [ address2['pubkey'] ]
+        }])
+        assert_equal(result[0]['success'], False)
+        assert_equal(result[0]['error']['code'], -5)
+        assert_equal(result[0]['error']['message'], 'Consistency check failed')
+        address_assert = self.nodes[1].validateaddress(address['address'])
+        assert_equal(address_assert['iswatchonly'], False)
+        assert_equal(address_assert['ismine'], False)
+
+
+        # ScriptPubKey + Public key + internal + Wrong pubkey
+        print("Should not import a scriptPubKey with internal and with a wrong public key")
+        address = self.nodes[0].validateaddress(self.nodes[0].getnewaddress())
+        address2 = self.nodes[0].validateaddress(self.nodes[0].getnewaddress())
+        request = [{
+            "scriptPubKey": address['scriptPubKey'],
+            "pubkeys": [ address2['pubkey'] ],
+            "internal": True
+        }];
+        result = self.nodes[1].importmulti(request)
+        assert_equal(result[0]['success'], False)
+        assert_equal(result[0]['error']['code'], -5)
+        assert_equal(result[0]['error']['message'], 'Consistency check failed')
+        address_assert = self.nodes[1].validateaddress(address['address'])
+        assert_equal(address_assert['iswatchonly'], False)
+        assert_equal(address_assert['ismine'], False)
 
 
+        # Address + Private key + !watchonly + Wrong private key
+        print("Should not import an address with a wrong private key")
+        address = self.nodes[0].validateaddress(self.nodes[0].getnewaddress())
+        address2 = self.nodes[0].validateaddress(self.nodes[0].getnewaddress())
+        result = self.nodes[1].importmulti([{
+            "scriptPubKey": {
+                "address": address['address']
+            },
+            "keys": [ self.nodes[0].dumpprivkey(address2['address']) ]
+        }])
+        assert_equal(result[0]['success'], False)
+        assert_equal(result[0]['error']['code'], -5)
+        assert_equal(result[0]['error']['message'], 'Consistency check failed')
+        address_assert = self.nodes[1].validateaddress(address['address'])
+        assert_equal(address_assert['iswatchonly'], False)
+        assert_equal(address_assert['ismine'], False)
+
+
+        # ScriptPubKey + Private key + internal + Wrong private key
+        print("Should not import a scriptPubKey with internal and with a wrong private key")
+        address = self.nodes[0].validateaddress(self.nodes[0].getnewaddress())
+        address2 = self.nodes[0].validateaddress(self.nodes[0].getnewaddress())
+        result = self.nodes[1].importmulti([{
+            "scriptPubKey": address['scriptPubKey'],
+            "keys": [ self.nodes[0].dumpprivkey(address2['address']) ],
+            "internal": True
+        }])
+        assert_equal(result[0]['success'], False)
+        assert_equal(result[0]['error']['code'], -5)
+        assert_equal(result[0]['error']['message'], 'Consistency check failed')
+        address_assert = self.nodes[1].validateaddress(address['address'])
+        assert_equal(address_assert['iswatchonly'], False)
+        assert_equal(address_assert['ismine'], False)
+
 if __name__ == '__main__':
     ImportMultiTest ().main ()
diff --git a/src/wallet/rpcdump.cpp b/src/wallet/rpcdump.cpp
index 0297337c2a399..7b16b4adfb324 100644
--- a/src/wallet/rpcdump.cpp
+++ b/src/wallet/rpcdump.cpp
@@ -641,9 +641,6 @@ UniValue dumpwallet(const JSONRPCRequest& request)
 
 
 UniValue processImport(const UniValue& data) {
-    // TODO List:
-    // - Check consistency between pubkeys/privkeys and scriptPubKey/redeemScript.
-
     try {
         bool success = false;
 
@@ -713,8 +710,6 @@ UniValue processImport(const UniValue& data) {
 
         // P2SH
         if (isP2SH) {
-            // TODO: check consistency between private keys and p2sh redeemscript + p2sh address
-
             // Import redeem script.
             std::vector<unsigned char> vData(ParseHex(strRedeemScript));
             CScript redeemScript = CScript(vData.begin(), vData.end());
@@ -795,8 +790,6 @@ UniValue processImport(const UniValue& data) {
 
             success = true;
         } else {
-            // TODO: check consistency between private/public keys and scriptPubKey / address
-
             // Import public keys.
             if (pubKeys.size() && keys.size() == 0) {
                 const string& strPubKey = pubKeys[0].get_str();
@@ -813,6 +806,25 @@ UniValue processImport(const UniValue& data) {
                 }
 
                 CBitcoinAddress pubKeyAddress = CBitcoinAddress(pubKey.GetID());
+
+                // Consistency check.
+                if (!isScript && pubKeyAddress.Get() != address.Get()) {
+                    throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Consistency check failed");
+                }
+
+                // Consistency check.
+                if (isScript) {
+                    CBitcoinAddress scriptAddress;
+                    CTxDestination destination;
+
+                    if (ExtractDestination(script, destination)) {
+                        scriptAddress = CBitcoinAddress(destination);
+                        if (scriptAddress.Get() != pubKeyAddress.Get()) {
+                            throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Consistency check failed");
+                        }
+                    }
+                }
+
                 CScript pubKeyScript = GetScriptForDestination(pubKeyAddress.Get());
 
                 if (::IsMine(*pwalletMain, pubKeyScript) == ISMINE_SPENDABLE) {
@@ -866,7 +878,27 @@ UniValue processImport(const UniValue& data) {
                 CPubKey pubKey = key.GetPubKey();
                 assert(key.VerifyPubKey(pubKey));
 
-                CKeyID vchAddress = pubkey.GetID();
+                CBitcoinAddress pubKeyAddress = CBitcoinAddress(pubKey.GetID());
+
+                // Consistency check.
+                if (!isScript && pubKeyAddress.Get() != address.Get()) {
+                    throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Consistency check failed");
+                }
+
+                // Consistency check.
+                if (isScript) {
+                    CBitcoinAddress scriptAddress;
+                    CTxDestination destination;
+
+                    if (ExtractDestination(script, destination)) {
+                        scriptAddress = CBitcoinAddress(destination);
+                        if (scriptAddress.Get() != pubKeyAddress.Get()) {
+                            throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Consistency check failed");
+                        }
+                    }
+                }
+
+                CKeyID vchAddress = pubKey.GetID();
                 pwalletMain->MarkDirty();
                 pwalletMain->SetAddressBook(vchAddress, label, "receive");
 

From 6f2f639cdf12ee337dbb75ec5517bec841d4f348 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jorge=20Tim=C3=B3n?= <jtimon@jtimon.cc>
Date: Wed, 19 Oct 2016 04:33:53 +0200
Subject: [PATCH 1064/1802] Chainparams: Trivial: In AppInit2(),
 s/Params()/chainparams/

---
 src/init.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/init.cpp b/src/init.cpp
index d3efc9f9787f1..e2f25eda744e3 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -960,8 +960,8 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
         ::minRelayTxFee = CFeeRate(n);
     }
 
-    fRequireStandard = !GetBoolArg("-acceptnonstdtxn", !Params().RequireStandard());
-    if (Params().RequireStandard() && !fRequireStandard)
+    fRequireStandard = !GetBoolArg("-acceptnonstdtxn", !chainparams.RequireStandard());
+    if (chainparams.RequireStandard() && !fRequireStandard)
         return InitError(strprintf("acceptnonstdtxn is not currently supported for %s chain", chainparams.NetworkIDString()));
     nBytesPerSigOp = GetArg("-bytespersigop", nBytesPerSigOp);
 
@@ -996,7 +996,7 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
 
     if (!mapMultiArgs["-bip9params"].empty()) {
         // Allow overriding BIP9 parameters for testing
-        if (!Params().MineBlocksOnDemand()) {
+        if (!chainparams.MineBlocksOnDemand()) {
             return InitError("BIP9 parameters may only be overridden on regtest.");
         }
         const vector<string>& deployments = mapMultiArgs["-bip9params"];
@@ -1447,7 +1447,7 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
         }
     }
 
-    if (Params().GetConsensus().vDeployments[Consensus::DEPLOYMENT_SEGWIT].nTimeout != 0) {
+    if (chainparams.GetConsensus().vDeployments[Consensus::DEPLOYMENT_SEGWIT].nTimeout != 0) {
         // Only advertize witness capabilities if they have a reasonable start time.
         // This allows us to have the code merged without a defined softfork, by setting its
         // end time to 0.

From cab1da745b2a36407bb9493343cc74213854419d Mon Sep 17 00:00:00 2001
From: Jonas Schnelli <dev@jonasschnelli.ch>
Date: Thu, 20 Oct 2016 09:22:13 +0200
Subject: [PATCH 1065/1802] [Wallet] Refactor wallet/init interaction (Reaccept
 wtx, flush thread)

---
 src/init.cpp          | 13 ++-----------
 src/wallet/wallet.cpp | 10 ++++++++++
 src/wallet/wallet.h   |  7 +++++++
 3 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/src/init.cpp b/src/init.cpp
index d3efc9f9787f1..9665d0e06dc58 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -1493,13 +1493,6 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
         uiInterface.NotifyBlockTip.disconnect(BlockNotifyGenesisWait);
     }
 
-#ifdef ENABLE_WALLET
-    // Add wallet transactions that aren't already in a block to mempool
-    // Do this here as mempool requires genesis block to be loaded
-    if (pwalletMain)
-        pwalletMain->ReacceptWalletTransactions();
-#endif
-
     // ********************************************************* Step 11: start node
 
     //// debug print
@@ -1537,10 +1530,8 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
     uiInterface.InitMessage(_("Done loading"));
 
 #ifdef ENABLE_WALLET
-    if (pwalletMain) {
-        // Run a thread to flush wallet periodically
-        threadGroup.create_thread(boost::bind(&ThreadFlushWalletDB, boost::ref(pwalletMain->strWalletFile)));
-    }
+    if (pwalletMain)
+        pwalletMain->postInitProcess(threadGroup);
 #endif
 
     return !fRequestShutdown;
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index c7f98b238e771..66f92d887b78d 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -3472,6 +3472,16 @@ bool CWallet::InitLoadWallet()
     return true;
 }
 
+void CWallet::postInitProcess(boost::thread_group& threadGroup)
+{
+    // Add wallet transactions that aren't already in a block to mempool
+    // Do this here as mempool requires genesis block to be loaded
+    ReacceptWalletTransactions();
+
+    // Run a thread to flush wallet periodically
+    threadGroup.create_thread(boost::bind(&ThreadFlushWalletDB, boost::ref(this->strWalletFile)));
+}
+
 bool CWallet::ParameterInteraction()
 {
     if (GetBoolArg("-disablewallet", DEFAULT_DISABLE_WALLET))
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
index 3b37f7cb1fd63..5e50eaedc3a3d 100644
--- a/src/wallet/wallet.h
+++ b/src/wallet/wallet.h
@@ -27,6 +27,7 @@
 #include <vector>
 
 #include <boost/shared_ptr.hpp>
+#include <boost/thread.hpp>
 
 extern CWallet* pwalletMain;
 
@@ -912,6 +913,12 @@ class CWallet : public CCryptoKeyStore, public CValidationInterface
     /* Initializes the wallet, returns a new CWallet instance or a null pointer in case of an error */
     static bool InitLoadWallet();
 
+    /**
+     * Wallet post-init setup
+     * Gives the wallet a chance to register repetitive tasks and complete post-init tasks
+     */
+    void postInitProcess(boost::thread_group& threadGroup);
+
     /* Wallets parameter interaction */
     static bool ParameterInteraction();
 

From 7942d31d5fa0c78136fc51d4746d6d61eeb587a7 Mon Sep 17 00:00:00 2001
From: Luke Dashjr <luke-jr+git@utopios.org>
Date: Thu, 20 Oct 2016 10:18:02 +0000
Subject: [PATCH 1066/1802] RPC: importmulti: Avoid using
 boost::variant::operator!=, which is only in newer boost versions

---
 src/wallet/rpcdump.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/wallet/rpcdump.cpp b/src/wallet/rpcdump.cpp
index 7b16b4adfb324..b638810e9dd4c 100644
--- a/src/wallet/rpcdump.cpp
+++ b/src/wallet/rpcdump.cpp
@@ -808,7 +808,7 @@ UniValue processImport(const UniValue& data) {
                 CBitcoinAddress pubKeyAddress = CBitcoinAddress(pubKey.GetID());
 
                 // Consistency check.
-                if (!isScript && pubKeyAddress.Get() != address.Get()) {
+                if (!isScript && !(pubKeyAddress.Get() == address.Get())) {
                     throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Consistency check failed");
                 }
 
@@ -819,7 +819,7 @@ UniValue processImport(const UniValue& data) {
 
                     if (ExtractDestination(script, destination)) {
                         scriptAddress = CBitcoinAddress(destination);
-                        if (scriptAddress.Get() != pubKeyAddress.Get()) {
+                        if (!(scriptAddress.Get() == pubKeyAddress.Get())) {
                             throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Consistency check failed");
                         }
                     }
@@ -881,7 +881,7 @@ UniValue processImport(const UniValue& data) {
                 CBitcoinAddress pubKeyAddress = CBitcoinAddress(pubKey.GetID());
 
                 // Consistency check.
-                if (!isScript && pubKeyAddress.Get() != address.Get()) {
+                if (!isScript && !(pubKeyAddress.Get() == address.Get())) {
                     throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Consistency check failed");
                 }
 
@@ -892,7 +892,7 @@ UniValue processImport(const UniValue& data) {
 
                     if (ExtractDestination(script, destination)) {
                         scriptAddress = CBitcoinAddress(destination);
-                        if (scriptAddress.Get() != pubKeyAddress.Get()) {
+                        if (!(scriptAddress.Get() == pubKeyAddress.Get())) {
                             throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Consistency check failed");
                         }
                     }

From ff6639b0f5484b392546752477d3de8c9e66dae4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pavel=20Jan=C3=ADk?= <Pavel@Janik.cz>
Date: Thu, 20 Oct 2016 12:31:05 +0200
Subject: [PATCH 1067/1802] Do not shadow local variable

---
 src/wallet/rpcdump.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/wallet/rpcdump.cpp b/src/wallet/rpcdump.cpp
index 7b16b4adfb324..a3dd8b69b671c 100644
--- a/src/wallet/rpcdump.cpp
+++ b/src/wallet/rpcdump.cpp
@@ -798,8 +798,8 @@ UniValue processImport(const UniValue& data) {
                     throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Pubkey must be a hex string");
                 }
 
-                std::vector<unsigned char> data(ParseHex(strPubKey));
-                CPubKey pubKey(data.begin(), data.end());
+                std::vector<unsigned char> vData(ParseHex(strPubKey));
+                CPubKey pubKey(vData.begin(), vData.end());
 
                 if (!pubKey.IsFullyValid()) {
                     throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Pubkey is not a valid public key");

From 3a286abf8fe1ab1f4234c45de819fb1014141364 Mon Sep 17 00:00:00 2001
From: "S. Matthew English" <s-matthew-english@users.noreply.github.com>
Date: Thu, 20 Oct 2016 12:39:48 +0200
Subject: [PATCH 1068/1802] Eliminating Inconsistencies in Textual Output
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

There were discrepancies between usage of "block chain" and "blockchain", I've changed them to the latter. The reason for this was that Wikipedia when describing this data structure writes "A blockchain — *originally block chain*", so it seemed the more appropriate term.
---
 src/rpc/blockchain.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp
index f538ddcc04822..7c128885daf36 100644
--- a/src/rpc/blockchain.cpp
+++ b/src/rpc/blockchain.cpp
@@ -151,7 +151,7 @@ UniValue getblockcount(const JSONRPCRequest& request)
     if (request.fHelp || request.params.size() != 0)
         throw runtime_error(
             "getblockcount\n"
-            "\nReturns the number of blocks in the longest block chain.\n"
+            "\nReturns the number of blocks in the longest blockchain.\n"
             "\nResult:\n"
             "n    (numeric) The current block count\n"
             "\nExamples:\n"
@@ -168,7 +168,7 @@ UniValue getbestblockhash(const JSONRPCRequest& request)
     if (request.fHelp || request.params.size() != 0)
         throw runtime_error(
             "getbestblockhash\n"
-            "\nReturns the hash of the best (tip) block in the longest block chain.\n"
+            "\nReturns the hash of the best (tip) block in the longest blockchain.\n"
             "\nResult\n"
             "\"hex\"      (string) the block hash hex encoded\n"
             "\nExamples\n"
@@ -1027,7 +1027,7 @@ UniValue getblockchaininfo(const JSONRPCRequest& request)
     if (request.fHelp || request.params.size() != 0)
         throw runtime_error(
             "getblockchaininfo\n"
-            "Returns an object containing various state info regarding block chain processing.\n"
+            "Returns an object containing various state info regarding blockchain processing.\n"
             "\nResult:\n"
             "{\n"
             "  \"chain\": \"xxxx\",        (string) current network name as defined in BIP70 (main, test, regtest)\n"

From 0a261b63fd4f1b07431f8a65762ef9f1ef1c11c8 Mon Sep 17 00:00:00 2001
From: Jonas Schnelli <dev@jonasschnelli.ch>
Date: Thu, 20 Oct 2016 18:53:05 +0200
Subject: [PATCH 1069/1802] Use pindexBestHeader instead of
 setBlockIndexCandidates for NotifyHeaderTip()

---
 src/main.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index 50158b468780a..8c95f36db2f63 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -3006,9 +3006,8 @@ static void NotifyHeaderTip() {
     CBlockIndex* pindexHeader = NULL;
     {
         LOCK(cs_main);
-        if (!setBlockIndexCandidates.empty()) {
-            pindexHeader = *setBlockIndexCandidates.rbegin();
-        }
+        pindexHeader = pindexBestHeader;
+
         if (pindexHeader != pindexHeaderOld) {
             fNotify = true;
             fInitialBlockDownload = IsInitialBlockDownload();

From 3154d6e3a207812578cb37a505f140b46b17c945 Mon Sep 17 00:00:00 2001
From: Jonas Schnelli <dev@jonasschnelli.ch>
Date: Thu, 20 Oct 2016 18:56:03 +0200
Subject: [PATCH 1070/1802] [Qt] use NotifyHeaderTip's height and date for the
 progress update

---
 src/qt/bitcoingui.cpp        | 9 +++------
 src/qt/forms/modaloverlay.ui | 4 ++--
 src/qt/modaloverlay.cpp      | 3 ++-
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp
index af767aa6c62c0..ee5102c4f99cf 100644
--- a/src/qt/bitcoingui.cpp
+++ b/src/qt/bitcoingui.cpp
@@ -717,13 +717,10 @@ void BitcoinGUI::setNumBlocks(int count, const QDateTime& blockDate, double nVer
 {
     if (modalOverlay)
     {
-        if (header) {
-            /* use clientmodels getHeaderTipHeight and getHeaderTipTime because the NotifyHeaderTip signal does not fire when updating the best header */
-            modalOverlay->setKnownBestHeight(clientModel->getHeaderTipHeight(), QDateTime::fromTime_t(clientModel->getHeaderTipTime()));
-        }
-        else {
+        if (header)
+            modalOverlay->setKnownBestHeight(count, blockDate);
+        else
             modalOverlay->tipUpdate(count, blockDate, nVerificationProgress);
-        }
     }
     if (!clientModel)
         return;
diff --git a/src/qt/forms/modaloverlay.ui b/src/qt/forms/modaloverlay.ui
index 73223735f5c6b..27998f90c5597 100644
--- a/src/qt/forms/modaloverlay.ui
+++ b/src/qt/forms/modaloverlay.ui
@@ -219,7 +219,7 @@ QLabel { color: rgb(40,40,40);  }</string>
            <item row="0" column="1">
             <widget class="QLabel" name="numberOfBlocksLeft">
              <property name="text">
-              <string>unknown...</string>
+              <string>Unknown...</string>
              </property>
             </widget>
            </item>
@@ -245,7 +245,7 @@ QLabel { color: rgb(40,40,40);  }</string>
               </sizepolicy>
              </property>
              <property name="text">
-              <string>unknown...</string>
+              <string>Unknown...</string>
              </property>
             </widget>
            </item>
diff --git a/src/qt/modaloverlay.cpp b/src/qt/modaloverlay.cpp
index ae0d8f5f63676..1a843a07ace81 100644
--- a/src/qt/modaloverlay.cpp
+++ b/src/qt/modaloverlay.cpp
@@ -132,7 +132,8 @@ void ModalOverlay::tipUpdate(int count, const QDateTime& blockDate, double nVeri
     if (estimateNumHeadersLeft < 24 && hasBestHeader) {
         ui->numberOfBlocksLeft->setText(QString::number(bestHeaderHeight - count));
     } else {
-        ui->expectedTimeLeft->setText(tr("Unknown. Syncing Headers..."));
+        ui->numberOfBlocksLeft->setText(tr("Unknown. Syncing Headers (%1)...").arg(bestHeaderHeight));
+        ui->expectedTimeLeft->setText(tr("Unknown..."));
     }
 }
 

From 5ca8ef299a08aae91d5061750533694b58d810b2 Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Thu, 20 Oct 2016 08:30:03 +0200
Subject: [PATCH 1071/1802] libconsensus: Add input validation of flags

Makes it an error to use flags that have not been defined
on the libconsensus API.

There has been some confusion as to what pass to libconsensus, and
(combined with mention in the release notes) this should clear it up.

Using undocumented flags is a risk because their meaning,
and what combinations are allowed, changes from release to release.
E.g. it is no longer possible to pass (CLEANSTACK | P2SH) without
running into an assertion after the segwit changes.
---
 src/script/bitcoinconsensus.cpp |  9 +++++++++
 src/script/bitcoinconsensus.h   |  4 ++++
 src/test/script_tests.cpp       | 13 ++++++++-----
 3 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/src/script/bitcoinconsensus.cpp b/src/script/bitcoinconsensus.cpp
index b629f4278ba20..1d0ca0c5acd82 100644
--- a/src/script/bitcoinconsensus.cpp
+++ b/src/script/bitcoinconsensus.cpp
@@ -69,10 +69,19 @@ struct ECCryptoClosure
 ECCryptoClosure instance_of_eccryptoclosure;
 }
 
+/** Check that all specified flags are part of the libconsensus interface. */
+static bool verify_flags(unsigned int flags)
+{
+    return (flags & ~(bitcoinconsensus_SCRIPT_FLAGS_VERIFY_ALL)) == 0;
+}
+
 static int verify_script(const unsigned char *scriptPubKey, unsigned int scriptPubKeyLen, CAmount amount,
                                     const unsigned char *txTo        , unsigned int txToLen,
                                     unsigned int nIn, unsigned int flags, bitcoinconsensus_error* err)
 {
+    if (!verify_flags(flags)) {
+        return bitcoinconsensus_ERR_INVALID_FLAGS;
+    }
     try {
         TxInputStream stream(SER_NETWORK, PROTOCOL_VERSION, txTo, txToLen);
         CTransaction tx;
diff --git a/src/script/bitcoinconsensus.h b/src/script/bitcoinconsensus.h
index 1d2d5c23e471c..1bef4fe9e975f 100644
--- a/src/script/bitcoinconsensus.h
+++ b/src/script/bitcoinconsensus.h
@@ -42,6 +42,7 @@ typedef enum bitcoinconsensus_error_t
     bitcoinconsensus_ERR_TX_SIZE_MISMATCH,
     bitcoinconsensus_ERR_TX_DESERIALIZE,
     bitcoinconsensus_ERR_AMOUNT_REQUIRED,
+    bitcoinconsensus_ERR_INVALID_FLAGS,
 } bitcoinconsensus_error;
 
 /** Script verification flags */
@@ -54,6 +55,9 @@ enum
     bitcoinconsensus_SCRIPT_FLAGS_VERIFY_CHECKLOCKTIMEVERIFY = (1U << 9), // enable CHECKLOCKTIMEVERIFY (BIP65)
     bitcoinconsensus_SCRIPT_FLAGS_VERIFY_CHECKSEQUENCEVERIFY = (1U << 10), // enable CHECKSEQUENCEVERIFY (BIP112)
     bitcoinconsensus_SCRIPT_FLAGS_VERIFY_WITNESS             = (1U << 11), // enable WITNESS (BIP141)
+    bitcoinconsensus_SCRIPT_FLAGS_VERIFY_ALL                 = bitcoinconsensus_SCRIPT_FLAGS_VERIFY_P2SH | bitcoinconsensus_SCRIPT_FLAGS_VERIFY_DERSIG |
+                                                               bitcoinconsensus_SCRIPT_FLAGS_VERIFY_NULLDUMMY | bitcoinconsensus_SCRIPT_FLAGS_VERIFY_CHECKLOCKTIMEVERIFY |
+                                                               bitcoinconsensus_SCRIPT_FLAGS_VERIFY_CHECKSEQUENCEVERIFY | bitcoinconsensus_SCRIPT_FLAGS_VERIFY_WITNESS
 };
 
 /// Returns 1 if the input nIn of the serialized transaction pointed to by
diff --git a/src/test/script_tests.cpp b/src/test/script_tests.cpp
index 561adb8ea2252..3169afb13a419 100644
--- a/src/test/script_tests.cpp
+++ b/src/test/script_tests.cpp
@@ -173,11 +173,14 @@ void DoTest(const CScript& scriptPubKey, const CScript& scriptSig, const CScript
 #if defined(HAVE_CONSENSUS_LIB)
     CDataStream stream(SER_NETWORK, PROTOCOL_VERSION);
     stream << tx2;
-    if (flags & bitcoinconsensus_SCRIPT_FLAGS_VERIFY_WITNESS) {
-        BOOST_CHECK_MESSAGE(bitcoinconsensus_verify_script_with_amount(begin_ptr(scriptPubKey), scriptPubKey.size(), txCredit.vout[0].nValue, (const unsigned char*)&stream[0], stream.size(), 0, flags, NULL) == expect, message);
-    } else {
-        BOOST_CHECK_MESSAGE(bitcoinconsensus_verify_script_with_amount(begin_ptr(scriptPubKey), scriptPubKey.size(), 0, (const unsigned char*)&stream[0], stream.size(), 0, flags, NULL) == expect, message);
-        BOOST_CHECK_MESSAGE(bitcoinconsensus_verify_script(begin_ptr(scriptPubKey), scriptPubKey.size(), (const unsigned char*)&stream[0], stream.size(), 0, flags, NULL) == expect,message);
+    int libconsensus_flags = flags & bitcoinconsensus_SCRIPT_FLAGS_VERIFY_ALL;
+    if (libconsensus_flags == flags) {
+        if (flags & bitcoinconsensus_SCRIPT_FLAGS_VERIFY_WITNESS) {
+            BOOST_CHECK_MESSAGE(bitcoinconsensus_verify_script_with_amount(begin_ptr(scriptPubKey), scriptPubKey.size(), txCredit.vout[0].nValue, (const unsigned char*)&stream[0], stream.size(), 0, libconsensus_flags, NULL) == expect, message);
+        } else {
+            BOOST_CHECK_MESSAGE(bitcoinconsensus_verify_script_with_amount(begin_ptr(scriptPubKey), scriptPubKey.size(), 0, (const unsigned char*)&stream[0], stream.size(), 0, libconsensus_flags, NULL) == expect, message);
+            BOOST_CHECK_MESSAGE(bitcoinconsensus_verify_script(begin_ptr(scriptPubKey), scriptPubKey.size(), (const unsigned char*)&stream[0], stream.size(), 0, libconsensus_flags, NULL) == expect,message);
+        }
     }
 #endif
 }

From 1ae5839ff024096c65e1590084f2720fa08d3e23 Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Fri, 21 Oct 2016 11:47:10 +0200
Subject: [PATCH 1072/1802] moveonly: move `coincontrol` to `src/wallet`

---
 src/Makefile.am                | 2 +-
 src/qt/coincontroldialog.cpp   | 2 +-
 src/qt/sendcoinsdialog.cpp     | 2 +-
 src/{ => wallet}/coincontrol.h | 6 +++---
 src/wallet/wallet.cpp          | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)
 rename src/{ => wallet}/coincontrol.h (93%)

diff --git a/src/Makefile.am b/src/Makefile.am
index e7f1d82b8b88a..ab3104ec632d7 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -87,7 +87,6 @@ BITCOIN_CORE_H = \
   checkpoints.h \
   checkqueue.h \
   clientversion.h \
-  coincontrol.h \
   coins.h \
   compat.h \
   compat/byteswap.h \
@@ -147,6 +146,7 @@ BITCOIN_CORE_H = \
   utiltime.h \
   validationinterface.h \
   versionbits.h \
+  wallet/coincontrol.h \
   wallet/crypter.h \
   wallet/db.h \
   wallet/rpcwallet.h \
diff --git a/src/qt/coincontroldialog.cpp b/src/qt/coincontroldialog.cpp
index 86fd4ebd656f1..1a1671f0ee830 100644
--- a/src/qt/coincontroldialog.cpp
+++ b/src/qt/coincontroldialog.cpp
@@ -13,7 +13,7 @@
 #include "txmempool.h"
 #include "walletmodel.h"
 
-#include "coincontrol.h"
+#include "wallet/coincontrol.h"
 #include "init.h"
 #include "main.h" // For minRelayTxFee
 #include "wallet/wallet.h"
diff --git a/src/qt/sendcoinsdialog.cpp b/src/qt/sendcoinsdialog.cpp
index 4b2ba7d6241d2..f1c867e6f8ac3 100644
--- a/src/qt/sendcoinsdialog.cpp
+++ b/src/qt/sendcoinsdialog.cpp
@@ -16,7 +16,7 @@
 #include "walletmodel.h"
 
 #include "base58.h"
-#include "coincontrol.h"
+#include "wallet/coincontrol.h"
 #include "main.h" // mempool and minRelayTxFee
 #include "ui_interface.h"
 #include "txmempool.h"
diff --git a/src/coincontrol.h b/src/wallet/coincontrol.h
similarity index 93%
rename from src/coincontrol.h
rename to src/wallet/coincontrol.h
index e33adc4d2b00c..78516770e602c 100644
--- a/src/coincontrol.h
+++ b/src/wallet/coincontrol.h
@@ -2,8 +2,8 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#ifndef BITCOIN_COINCONTROL_H
-#define BITCOIN_COINCONTROL_H
+#ifndef BITCOIN_WALLET_COINCONTROL_H
+#define BITCOIN_WALLET_COINCONTROL_H
 
 #include "primitives/transaction.h"
 
@@ -73,4 +73,4 @@ class CCoinControl
     std::set<COutPoint> setSelected;
 };
 
-#endif // BITCOIN_COINCONTROL_H
+#endif // BITCOIN_WALLET_COINCONTROL_H
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index c7f98b238e771..60a769704b655 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -8,7 +8,7 @@
 #include "base58.h"
 #include "checkpoints.h"
 #include "chain.h"
-#include "coincontrol.h"
+#include "wallet/coincontrol.h"
 #include "consensus/consensus.h"
 #include "consensus/validation.h"
 #include "key.h"

From dfe79060a62c8de098e75d527d97b99c3b10de50 Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Fri, 21 Oct 2016 12:15:19 -0400
Subject: [PATCH 1073/1802] Add missing cs_main lock to ::GETBLOCKTXN
 processing

Note that this is not a major issue as, in order for the missing
lock to cause issues, you have to receive a GETBLOCKTXN message
while reindexing, adding a block header via RPC, etc, which results
in either a table rehash or an insert into the bucket which you are
currently looking at.
---
 src/main.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/main.cpp b/src/main.cpp
index df4f5e3959e0e..37daa08da9a26 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -5442,6 +5442,8 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
         BlockTransactionsRequest req;
         vRecv >> req;
 
+        LOCK(cs_main);
+
         BlockMap::iterator it = mapBlockIndex.find(req.blockhash);
         if (it == mapBlockIndex.end() || !(it->second->nStatus & BLOCK_HAVE_DATA)) {
             LogPrintf("Peer %d sent us a getblocktxn for a block we don't have", pfrom->id);

From 1d8e12ba48154b2c59213e92efb50958d430a007 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pavel=20Jan=C3=ADk?= <Pavel@Janik.cz>
Date: Fri, 21 Oct 2016 23:42:37 +0200
Subject: [PATCH 1074/1802] Fix doxygen comment: the transaction is returned in
 txOut

---
 src/main.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main.cpp b/src/main.cpp
index df4f5e3959e0e..4e1c20de2a91a 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1584,7 +1584,7 @@ bool AcceptToMemoryPool(CTxMemPool& pool, CValidationState &state, const CTransa
     return res;
 }
 
-/** Return transaction in tx, and if it was found inside a block, its hash is placed in hashBlock */
+/** Return transaction in txOut, and if it was found inside a block, its hash is placed in hashBlock */
 bool GetTransaction(const uint256 &hash, CTransaction &txOut, const Consensus::Params& consensusParams, uint256 &hashBlock, bool fAllowSlow)
 {
     CBlockIndex *pindexSlow = NULL;

From f48211b700d171f7bcee7d3088269fdaaf1b5c13 Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Mon, 15 Aug 2016 12:20:13 +0200
Subject: [PATCH 1075/1802] Bypass removeRecursive in removeForReorg

---
 src/txmempool.cpp | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/txmempool.cpp b/src/txmempool.cpp
index 0f1c166abc416..9816c9dcbbf7c 100644
--- a/src/txmempool.cpp
+++ b/src/txmempool.cpp
@@ -541,7 +541,7 @@ void CTxMemPool::removeForReorg(const CCoinsViewCache *pcoins, unsigned int nMem
 {
     // Remove transactions spending a coinbase which are now immature and no-longer-final transactions
     LOCK(cs);
-    list<CTransaction> transactionsToRemove;
+    setEntries txToRemove;
     for (indexed_transaction_set::const_iterator it = mapTx.begin(); it != mapTx.end(); it++) {
         const CTransaction& tx = it->GetTx();
         LockPoints lp = it->GetLockPoints();
@@ -549,16 +549,16 @@ void CTxMemPool::removeForReorg(const CCoinsViewCache *pcoins, unsigned int nMem
         if (!CheckFinalTx(tx, flags) || !CheckSequenceLocks(tx, flags, &lp, validLP)) {
             // Note if CheckSequenceLocks fails the LockPoints may still be invalid
             // So it's critical that we remove the tx and not depend on the LockPoints.
-            transactionsToRemove.push_back(tx);
+            txToRemove.insert(it);
         } else if (it->GetSpendsCoinbase()) {
             BOOST_FOREACH(const CTxIn& txin, tx.vin) {
                 indexed_transaction_set::const_iterator it2 = mapTx.find(txin.prevout.hash);
                 if (it2 != mapTx.end())
                     continue;
                 const CCoins *coins = pcoins->AccessCoins(txin.prevout.hash);
-		if (nCheckFrequency != 0) assert(coins);
+                if (nCheckFrequency != 0) assert(coins);
                 if (!coins || (coins->IsCoinBase() && ((signed long)nMemPoolHeight) - coins->nHeight < COINBASE_MATURITY)) {
-                    transactionsToRemove.push_back(tx);
+                    txToRemove.insert(it);
                     break;
                 }
             }
@@ -567,10 +567,11 @@ void CTxMemPool::removeForReorg(const CCoinsViewCache *pcoins, unsigned int nMem
             mapTx.modify(it, update_lock_points(lp));
         }
     }
-    BOOST_FOREACH(const CTransaction& tx, transactionsToRemove) {
-        list<CTransaction> removed;
-        removeRecursive(tx, removed);
+    setEntries setAllRemoves;
+    for (txiter it : txToRemove) {
+        CalculateDescendants(it, setAllRemoves);
     }
+    RemoveStaged(setAllRemoves, false);
 }
 
 void CTxMemPool::removeConflicts(const CTransaction &tx, std::list<CTransaction>& removed)

From 51f278329d43398428d60f5986f8d29a2041d28d Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Mon, 15 Aug 2016 13:10:57 +0200
Subject: [PATCH 1076/1802] Make removed and conflicted arguments optional to
 remove

---
 src/main.cpp                       |  5 ++---
 src/test/blockencodings_tests.cpp  |  2 +-
 src/test/mempool_tests.cpp         | 27 ++++++++++++---------------
 src/test/miner_tests.cpp           |  3 +--
 src/test/policyestimator_tests.cpp | 11 +++++------
 src/txmempool.cpp                  | 12 +++++++-----
 src/txmempool.h                    |  6 +++---
 7 files changed, 31 insertions(+), 35 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index df4f5e3959e0e..a60e47504ff21 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -2768,10 +2768,9 @@ bool static DisconnectTip(CValidationState& state, const CChainParams& chainpara
         std::vector<uint256> vHashUpdate;
         BOOST_FOREACH(const CTransaction &tx, block.vtx) {
             // ignore validation errors in resurrected transactions
-            list<CTransaction> removed;
             CValidationState stateDummy;
             if (tx.IsCoinBase() || !AcceptToMemoryPool(mempool, stateDummy, tx, false, NULL, true)) {
-                mempool.removeRecursive(tx, removed);
+                mempool.removeRecursive(tx);
             } else if (mempool.exists(tx.GetHash())) {
                 vHashUpdate.push_back(tx.GetHash());
             }
@@ -2840,7 +2839,7 @@ bool static ConnectTip(CValidationState& state, const CChainParams& chainparams,
     int64_t nTime5 = GetTimeMicros(); nTimeChainState += nTime5 - nTime4;
     LogPrint("bench", "  - Writing chainstate: %.2fms [%.2fs]\n", (nTime5 - nTime4) * 0.001, nTimeChainState * 0.000001);
     // Remove conflicting transactions from the mempool.;
-    mempool.removeForBlock(pblock->vtx, pindexNew->nHeight, txConflicted, !IsInitialBlockDownload());
+    mempool.removeForBlock(pblock->vtx, pindexNew->nHeight, &txConflicted, !IsInitialBlockDownload());
     // Update chainActive & related variables.
     UpdateTip(pindexNew, chainparams);
 
diff --git a/src/test/blockencodings_tests.cpp b/src/test/blockencodings_tests.cpp
index 7530b013bd285..f3f1befbc0912 100644
--- a/src/test/blockencodings_tests.cpp
+++ b/src/test/blockencodings_tests.cpp
@@ -81,7 +81,7 @@ BOOST_AUTO_TEST_CASE(SimpleRoundTripTest)
         BOOST_CHECK_EQUAL(pool.mapTx.find(block.vtx[2].GetHash())->GetSharedTx().use_count(), SHARED_TX_OFFSET + 1);
 
         std::list<CTransaction> removed;
-        pool.removeRecursive(block.vtx[2], removed);
+        pool.removeRecursive(block.vtx[2], &removed);
         BOOST_CHECK_EQUAL(removed.size(), 1);
 
         CBlock block2;
diff --git a/src/test/mempool_tests.cpp b/src/test/mempool_tests.cpp
index 033a50f94f578..003daa203f2ed 100644
--- a/src/test/mempool_tests.cpp
+++ b/src/test/mempool_tests.cpp
@@ -58,12 +58,12 @@ BOOST_AUTO_TEST_CASE(MempoolRemoveTest)
     std::list<CTransaction> removed;
 
     // Nothing in pool, remove should do nothing:
-    testPool.removeRecursive(txParent, removed);
+    testPool.removeRecursive(txParent, &removed);
     BOOST_CHECK_EQUAL(removed.size(), 0);
 
     // Just the parent:
     testPool.addUnchecked(txParent.GetHash(), entry.FromTx(txParent));
-    testPool.removeRecursive(txParent, removed);
+    testPool.removeRecursive(txParent, &removed);
     BOOST_CHECK_EQUAL(removed.size(), 1);
     removed.clear();
     
@@ -75,16 +75,16 @@ BOOST_AUTO_TEST_CASE(MempoolRemoveTest)
         testPool.addUnchecked(txGrandChild[i].GetHash(), entry.FromTx(txGrandChild[i]));
     }
     // Remove Child[0], GrandChild[0] should be removed:
-    testPool.removeRecursive(txChild[0], removed);
+    testPool.removeRecursive(txChild[0], &removed);
     BOOST_CHECK_EQUAL(removed.size(), 2);
     removed.clear();
     // ... make sure grandchild and child are gone:
-    testPool.removeRecursive(txGrandChild[0], removed);
+    testPool.removeRecursive(txGrandChild[0], &removed);
     BOOST_CHECK_EQUAL(removed.size(), 0);
-    testPool.removeRecursive(txChild[0], removed);
+    testPool.removeRecursive(txChild[0], &removed);
     BOOST_CHECK_EQUAL(removed.size(), 0);
     // Remove parent, all children/grandchildren should go:
-    testPool.removeRecursive(txParent, removed);
+    testPool.removeRecursive(txParent, &removed);
     BOOST_CHECK_EQUAL(removed.size(), 5);
     BOOST_CHECK_EQUAL(testPool.size(), 0);
     removed.clear();
@@ -97,7 +97,7 @@ BOOST_AUTO_TEST_CASE(MempoolRemoveTest)
     }
     // Now remove the parent, as might happen if a block-re-org occurs but the parent cannot be
     // put into the mempool (maybe because it is non-standard):
-    testPool.removeRecursive(txParent, removed);
+    testPool.removeRecursive(txParent, &removed);
     BOOST_CHECK_EQUAL(removed.size(), 6);
     BOOST_CHECK_EQUAL(testPool.size(), 0);
     removed.clear();
@@ -281,12 +281,11 @@ BOOST_AUTO_TEST_CASE(MempoolIndexingTest)
     BOOST_CHECK_EQUAL(pool.size(), 10);
 
     // Now try removing tx10 and verify the sort order returns to normal
-    std::list<CTransaction> removed;
-    pool.removeRecursive(pool.mapTx.find(tx10.GetHash())->GetTx(), removed);
+    pool.removeRecursive(pool.mapTx.find(tx10.GetHash())->GetTx());
     CheckSort<descendant_score>(pool, snapshotOrder);
 
-    pool.removeRecursive(pool.mapTx.find(tx9.GetHash())->GetTx(), removed);
-    pool.removeRecursive(pool.mapTx.find(tx8.GetHash())->GetTx(), removed);
+    pool.removeRecursive(pool.mapTx.find(tx9.GetHash())->GetTx());
+    pool.removeRecursive(pool.mapTx.find(tx8.GetHash())->GetTx());
     /* Now check the sort on the mining score index.
      * Final order should be:
      *
@@ -413,8 +412,7 @@ BOOST_AUTO_TEST_CASE(MempoolAncestorIndexingTest)
     /* after tx6 is mined, tx7 should move up in the sort */
     std::vector<CTransaction> vtx;
     vtx.push_back(tx6);
-    std::list<CTransaction> dummy;
-    pool.removeForBlock(vtx, 1, dummy, false);
+    pool.removeForBlock(vtx, 1, NULL, false);
 
     sortedOrder.erase(sortedOrder.begin()+1);
     sortedOrder.pop_back();
@@ -549,12 +547,11 @@ BOOST_AUTO_TEST_CASE(MempoolSizeLimitTest)
     pool.addUnchecked(tx7.GetHash(), entry.Fee(9000LL).FromTx(tx7, &pool));
 
     std::vector<CTransaction> vtx;
-    std::list<CTransaction> conflicts;
     SetMockTime(42);
     SetMockTime(42 + CTxMemPool::ROLLING_FEE_HALFLIFE);
     BOOST_CHECK_EQUAL(pool.GetMinFee(1).GetFeePerK(), maxFeeRateRemoved.GetFeePerK() + 1000);
     // ... we should keep the same min fee until we get a block
-    pool.removeForBlock(vtx, 1, conflicts);
+    pool.removeForBlock(vtx, 1);
     SetMockTime(42 + 2*CTxMemPool::ROLLING_FEE_HALFLIFE);
     BOOST_CHECK_EQUAL(pool.GetMinFee(1).GetFeePerK(), (maxFeeRateRemoved.GetFeePerK() + 1000)/2);
     // ... then feerate should drop 1/2 each halflife
diff --git a/src/test/miner_tests.cpp b/src/test/miner_tests.cpp
index d6d7b5716ead5..a94979fd77d07 100644
--- a/src/test/miner_tests.cpp
+++ b/src/test/miner_tests.cpp
@@ -137,8 +137,7 @@ void TestPackageSelection(const CChainParams& chainparams, CScript scriptPubKey,
     // Test that packages above the min relay fee do get included, even if one
     // of the transactions is below the min relay fee
     // Remove the low fee transaction and replace with a higher fee transaction
-    std::list<CTransaction> dummy;
-    mempool.removeRecursive(tx, dummy);
+    mempool.removeRecursive(tx);
     tx.vout[0].nValue -= 2; // Now we should be just over the min relay fee
     hashLowFeeTx = tx.GetHash();
     mempool.addUnchecked(hashLowFeeTx, entry.Fee(feeToUse+2).FromTx(tx));
diff --git a/src/test/policyestimator_tests.cpp b/src/test/policyestimator_tests.cpp
index 5c902387f1214..f57c24270c112 100644
--- a/src/test/policyestimator_tests.cpp
+++ b/src/test/policyestimator_tests.cpp
@@ -46,7 +46,6 @@ BOOST_AUTO_TEST_CASE(BlockPolicyEstimates)
     for (unsigned int i = 0; i < 128; i++)
         garbage.push_back('X');
     CMutableTransaction tx;
-    std::list<CTransaction> dummyConflicted;
     tx.vin.resize(1);
     tx.vin[0].scriptSig = garbage;
     tx.vout.resize(1);
@@ -81,7 +80,7 @@ BOOST_AUTO_TEST_CASE(BlockPolicyEstimates)
                 txHashes[9-h].pop_back();
             }
         }
-        mpool.removeForBlock(block, ++blocknum, dummyConflicted);
+        mpool.removeForBlock(block, ++blocknum);
         block.clear();
         if (blocknum == 30) {
             // At this point we should need to combine 5 buckets to get enough data points
@@ -125,7 +124,7 @@ BOOST_AUTO_TEST_CASE(BlockPolicyEstimates)
     // Mine 50 more blocks with no transactions happening, estimates shouldn't change
     // We haven't decayed the moving average enough so we still have enough data points in every bucket
     while (blocknum < 250)
-        mpool.removeForBlock(block, ++blocknum, dummyConflicted);
+        mpool.removeForBlock(block, ++blocknum);
 
     for (int i = 1; i < 10;i++) {
         BOOST_CHECK(mpool.estimateFee(i).GetFeePerK() < origFeeEst[i-1] + deltaFee);
@@ -146,7 +145,7 @@ BOOST_AUTO_TEST_CASE(BlockPolicyEstimates)
                 txHashes[j].push_back(hash);
             }
         }
-        mpool.removeForBlock(block, ++blocknum, dummyConflicted);
+        mpool.removeForBlock(block, ++blocknum);
     }
 
     int answerFound;
@@ -167,7 +166,7 @@ BOOST_AUTO_TEST_CASE(BlockPolicyEstimates)
             txHashes[j].pop_back();
         }
     }
-    mpool.removeForBlock(block, 265, dummyConflicted);
+    mpool.removeForBlock(block, 265);
     block.clear();
     for (int i = 1; i < 10;i++) {
         BOOST_CHECK(mpool.estimateFee(i).GetFeePerK() > origFeeEst[i-1] - deltaFee);
@@ -187,7 +186,7 @@ BOOST_AUTO_TEST_CASE(BlockPolicyEstimates)
                     block.push_back(*ptx);
             }
         }
-        mpool.removeForBlock(block, ++blocknum, dummyConflicted);
+        mpool.removeForBlock(block, ++blocknum);
         block.clear();
     }
     for (int i = 1; i < 10; i++) {
diff --git a/src/txmempool.cpp b/src/txmempool.cpp
index 9816c9dcbbf7c..193542ee5e619 100644
--- a/src/txmempool.cpp
+++ b/src/txmempool.cpp
@@ -503,7 +503,7 @@ void CTxMemPool::CalculateDescendants(txiter entryit, setEntries &setDescendants
     }
 }
 
-void CTxMemPool::removeRecursive(const CTransaction &origTx, std::list<CTransaction>& removed)
+void CTxMemPool::removeRecursive(const CTransaction &origTx, std::list<CTransaction>* removed)
 {
     // Remove transaction from memory pool
     {
@@ -530,8 +530,10 @@ void CTxMemPool::removeRecursive(const CTransaction &origTx, std::list<CTransact
         BOOST_FOREACH(txiter it, txToRemove) {
             CalculateDescendants(it, setAllRemoves);
         }
-        BOOST_FOREACH(txiter it, setAllRemoves) {
-            removed.push_back(it->GetTx());
+        if (removed) {
+            BOOST_FOREACH(txiter it, setAllRemoves) {
+                removed->push_back(it->GetTx());
+            }
         }
         RemoveStaged(setAllRemoves, false);
     }
@@ -574,7 +576,7 @@ void CTxMemPool::removeForReorg(const CCoinsViewCache *pcoins, unsigned int nMem
     RemoveStaged(setAllRemoves, false);
 }
 
-void CTxMemPool::removeConflicts(const CTransaction &tx, std::list<CTransaction>& removed)
+void CTxMemPool::removeConflicts(const CTransaction &tx, std::list<CTransaction>* removed)
 {
     // Remove transactions which depend on inputs of tx, recursively
     LOCK(cs);
@@ -595,7 +597,7 @@ void CTxMemPool::removeConflicts(const CTransaction &tx, std::list<CTransaction>
  * Called when a block is connected. Removes from mempool and updates the miner fee estimator.
  */
 void CTxMemPool::removeForBlock(const std::vector<CTransaction>& vtx, unsigned int nBlockHeight,
-                                std::list<CTransaction>& conflicts, bool fCurrentEstimate)
+                                std::list<CTransaction>* conflicts, bool fCurrentEstimate)
 {
     LOCK(cs);
     std::vector<CTxMemPoolEntry> entries;
diff --git a/src/txmempool.h b/src/txmempool.h
index 1763930ba05b1..297f5b8e5a261 100644
--- a/src/txmempool.h
+++ b/src/txmempool.h
@@ -521,11 +521,11 @@ class CTxMemPool
     bool addUnchecked(const uint256& hash, const CTxMemPoolEntry &entry, bool fCurrentEstimate = true);
     bool addUnchecked(const uint256& hash, const CTxMemPoolEntry &entry, setEntries &setAncestors, bool fCurrentEstimate = true);
 
-    void removeRecursive(const CTransaction &tx, std::list<CTransaction>& removed);
+    void removeRecursive(const CTransaction &tx, std::list<CTransaction>* removed = NULL);
     void removeForReorg(const CCoinsViewCache *pcoins, unsigned int nMemPoolHeight, int flags);
-    void removeConflicts(const CTransaction &tx, std::list<CTransaction>& removed);
+    void removeConflicts(const CTransaction &tx, std::list<CTransaction>* removed = NULL);
     void removeForBlock(const std::vector<CTransaction>& vtx, unsigned int nBlockHeight,
-                        std::list<CTransaction>& conflicts, bool fCurrentEstimate = true);
+                        std::list<CTransaction>* conflicts = NULL, bool fCurrentEstimate = true);
     void clear();
     void _clear(); //lock free
     bool CompareDepthAndScore(const uint256& hasha, const uint256& hashb);

From 4100499db4e886d7a9ad2dcf4007ce44fb2c1a62 Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Mon, 15 Aug 2016 12:57:10 +0200
Subject: [PATCH 1077/1802] Return shared_ptr<CTransaction> from mempool
 removes

---
 src/main.cpp                      | 10 +++++-----
 src/test/blockencodings_tests.cpp |  2 +-
 src/test/mempool_tests.cpp        |  3 ++-
 src/txmempool.cpp                 |  8 ++++----
 src/txmempool.h                   |  7 +++----
 5 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index a60e47504ff21..0e97b1ea1470b 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -2803,7 +2803,7 @@ static int64_t nTimePostConnect = 0;
  * Connect a new block to chainActive. pblock is either NULL or a pointer to a CBlock
  * corresponding to pindexNew, to bypass loading it again from disk.
  */
-bool static ConnectTip(CValidationState& state, const CChainParams& chainparams, CBlockIndex* pindexNew, const CBlock* pblock, std::list<CTransaction> &txConflicted, std::vector<std::tuple<CTransaction,CBlockIndex*,int>> &txChanged)
+bool static ConnectTip(CValidationState& state, const CChainParams& chainparams, CBlockIndex* pindexNew, const CBlock* pblock, std::vector<std::shared_ptr<const CTransaction>> &txConflicted, std::vector<std::tuple<CTransaction,CBlockIndex*,int>> &txChanged)
 {
     assert(pindexNew->pprev == chainActive.Tip());
     // Read block from disk.
@@ -2926,7 +2926,7 @@ static void PruneBlockIndexCandidates() {
  * Try to make some progress towards making pindexMostWork the active block.
  * pblock is either NULL or a pointer to a CBlock corresponding to pindexMostWork.
  */
-static bool ActivateBestChainStep(CValidationState& state, const CChainParams& chainparams, CBlockIndex* pindexMostWork, const CBlock* pblock, bool& fInvalidFound, std::list<CTransaction>& txConflicted, std::vector<std::tuple<CTransaction,CBlockIndex*,int>>& txChanged)
+static bool ActivateBestChainStep(CValidationState& state, const CChainParams& chainparams, CBlockIndex* pindexMostWork, const CBlock* pblock, bool& fInvalidFound, std::vector<std::shared_ptr<const CTransaction>>& txConflicted, std::vector<std::tuple<CTransaction,CBlockIndex*,int>>& txChanged)
 {
     AssertLockHeld(cs_main);
     const CBlockIndex *pindexOldTip = chainActive.Tip();
@@ -3037,7 +3037,7 @@ bool ActivateBestChain(CValidationState &state, const CChainParams& chainparams,
             break;
 
         const CBlockIndex *pindexFork;
-        std::list<CTransaction> txConflicted;
+        std::vector<std::shared_ptr<const CTransaction>> txConflicted;
         bool fInitialDownload;
         {
             LOCK(cs_main);
@@ -3068,9 +3068,9 @@ bool ActivateBestChain(CValidationState &state, const CChainParams& chainparams,
 
         // throw all transactions though the signal-interface
         // while _not_ holding the cs_main lock
-        BOOST_FOREACH(const CTransaction &tx, txConflicted)
+        for(std::shared_ptr<const CTransaction> tx : txConflicted)
         {
-            GetMainSignals().SyncTransaction(tx, pindexNewTip, CMainSignals::SYNC_TRANSACTION_NOT_IN_BLOCK);
+            GetMainSignals().SyncTransaction(*tx, pindexNewTip, CMainSignals::SYNC_TRANSACTION_NOT_IN_BLOCK);
         }
         // ... and about transactions that got confirmed:
         for(unsigned int i = 0; i < txChanged.size(); i++)
diff --git a/src/test/blockencodings_tests.cpp b/src/test/blockencodings_tests.cpp
index f3f1befbc0912..b0d9184816ee9 100644
--- a/src/test/blockencodings_tests.cpp
+++ b/src/test/blockencodings_tests.cpp
@@ -80,7 +80,7 @@ BOOST_AUTO_TEST_CASE(SimpleRoundTripTest)
 
         BOOST_CHECK_EQUAL(pool.mapTx.find(block.vtx[2].GetHash())->GetSharedTx().use_count(), SHARED_TX_OFFSET + 1);
 
-        std::list<CTransaction> removed;
+        std::vector<std::shared_ptr<const CTransaction>> removed;
         pool.removeRecursive(block.vtx[2], &removed);
         BOOST_CHECK_EQUAL(removed.size(), 1);
 
diff --git a/src/test/mempool_tests.cpp b/src/test/mempool_tests.cpp
index 003daa203f2ed..555d36faacc87 100644
--- a/src/test/mempool_tests.cpp
+++ b/src/test/mempool_tests.cpp
@@ -55,7 +55,7 @@ BOOST_AUTO_TEST_CASE(MempoolRemoveTest)
 
 
     CTxMemPool testPool(CFeeRate(0));
-    std::list<CTransaction> removed;
+    std::vector<std::shared_ptr<const CTransaction>> removed;
 
     // Nothing in pool, remove should do nothing:
     testPool.removeRecursive(txParent, &removed);
@@ -547,6 +547,7 @@ BOOST_AUTO_TEST_CASE(MempoolSizeLimitTest)
     pool.addUnchecked(tx7.GetHash(), entry.Fee(9000LL).FromTx(tx7, &pool));
 
     std::vector<CTransaction> vtx;
+    std::vector<std::shared_ptr<const CTransaction>> conflicts;
     SetMockTime(42);
     SetMockTime(42 + CTxMemPool::ROLLING_FEE_HALFLIFE);
     BOOST_CHECK_EQUAL(pool.GetMinFee(1).GetFeePerK(), maxFeeRateRemoved.GetFeePerK() + 1000);
diff --git a/src/txmempool.cpp b/src/txmempool.cpp
index 193542ee5e619..e5d28ac2eaa8b 100644
--- a/src/txmempool.cpp
+++ b/src/txmempool.cpp
@@ -503,7 +503,7 @@ void CTxMemPool::CalculateDescendants(txiter entryit, setEntries &setDescendants
     }
 }
 
-void CTxMemPool::removeRecursive(const CTransaction &origTx, std::list<CTransaction>* removed)
+void CTxMemPool::removeRecursive(const CTransaction &origTx, std::vector<std::shared_ptr<const CTransaction>>* removed)
 {
     // Remove transaction from memory pool
     {
@@ -532,7 +532,7 @@ void CTxMemPool::removeRecursive(const CTransaction &origTx, std::list<CTransact
         }
         if (removed) {
             BOOST_FOREACH(txiter it, setAllRemoves) {
-                removed->push_back(it->GetTx());
+                removed->emplace_back(it->GetSharedTx());
             }
         }
         RemoveStaged(setAllRemoves, false);
@@ -576,7 +576,7 @@ void CTxMemPool::removeForReorg(const CCoinsViewCache *pcoins, unsigned int nMem
     RemoveStaged(setAllRemoves, false);
 }
 
-void CTxMemPool::removeConflicts(const CTransaction &tx, std::list<CTransaction>* removed)
+void CTxMemPool::removeConflicts(const CTransaction &tx, std::vector<std::shared_ptr<const CTransaction>>* removed)
 {
     // Remove transactions which depend on inputs of tx, recursively
     LOCK(cs);
@@ -597,7 +597,7 @@ void CTxMemPool::removeConflicts(const CTransaction &tx, std::list<CTransaction>
  * Called when a block is connected. Removes from mempool and updates the miner fee estimator.
  */
 void CTxMemPool::removeForBlock(const std::vector<CTransaction>& vtx, unsigned int nBlockHeight,
-                                std::list<CTransaction>* conflicts, bool fCurrentEstimate)
+                                std::vector<std::shared_ptr<const CTransaction>>* conflicts, bool fCurrentEstimate)
 {
     LOCK(cs);
     std::vector<CTxMemPoolEntry> entries;
diff --git a/src/txmempool.h b/src/txmempool.h
index 297f5b8e5a261..1a7e054e376a9 100644
--- a/src/txmempool.h
+++ b/src/txmempool.h
@@ -6,7 +6,6 @@
 #ifndef BITCOIN_TXMEMPOOL_H
 #define BITCOIN_TXMEMPOOL_H
 
-#include <list>
 #include <memory>
 #include <set>
 
@@ -521,11 +520,11 @@ class CTxMemPool
     bool addUnchecked(const uint256& hash, const CTxMemPoolEntry &entry, bool fCurrentEstimate = true);
     bool addUnchecked(const uint256& hash, const CTxMemPoolEntry &entry, setEntries &setAncestors, bool fCurrentEstimate = true);
 
-    void removeRecursive(const CTransaction &tx, std::list<CTransaction>* removed = NULL);
+    void removeRecursive(const CTransaction &tx, std::vector<std::shared_ptr<const CTransaction>>* removed = NULL);
     void removeForReorg(const CCoinsViewCache *pcoins, unsigned int nMemPoolHeight, int flags);
-    void removeConflicts(const CTransaction &tx, std::list<CTransaction>* removed = NULL);
+    void removeConflicts(const CTransaction &tx, std::vector<std::shared_ptr<const CTransaction>>* removed = NULL);
     void removeForBlock(const std::vector<CTransaction>& vtx, unsigned int nBlockHeight,
-                        std::list<CTransaction>* conflicts = NULL, bool fCurrentEstimate = true);
+                        std::vector<std::shared_ptr<const CTransaction>>* conflicts = NULL, bool fCurrentEstimate = true);
     void clear();
     void _clear(); //lock free
     bool CompareDepthAndScore(const uint256& hasha, const uint256& hashb);

From 0334430b396acd1b1c248ad98c6fdbd50c4c4309 Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Sun, 28 Aug 2016 01:26:41 +0200
Subject: [PATCH 1078/1802] Add some missing includes

---
 src/txmempool.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/txmempool.h b/src/txmempool.h
index 1a7e054e376a9..bb2638c3b7808 100644
--- a/src/txmempool.h
+++ b/src/txmempool.h
@@ -8,6 +8,10 @@
 
 #include <memory>
 #include <set>
+#include <map>
+#include <vector>
+#include <utility>
+#include <string>
 
 #include "amount.h"
 #include "coins.h"

From 3421e746017079b119a661108334d58e4bfde34b Mon Sep 17 00:00:00 2001
From: unsystemizer <unsystemizer@users.noreply.github.com>
Date: Mon, 24 Oct 2016 15:49:46 +0800
Subject: [PATCH 1079/1802] Clarify `listenonion`

> This new feature is enabled by default if Bitcoin Core is listening, and a connection to Tor can be made. It can be configured with the -listenonion, -torcontrol and -torpassword settings. To show verbose debugging information, pass -debug=tor.

But it is correct to say that the feature is enabled *regardless* of whether a connection to Tor can be made.

I propose to clarify that so that users can eliminate these in their logs (when `listen=1` and no Tor).
And I think it's okay to clarify about the `listen` option, because on several occasions when I read this before I always assumed `listening` meant `server=1` which cost me a lot of time in troubleshooting.

```
2016-10-24 06:19:22.551029 tor: Error connecting to Tor control socket
2016-10-24 06:19:22.551700 tor: Not connected to Tor control port 127.0.0.1:9051, trying to reconnect
```

### What version of bitcoin-core are you using?
0.12.1
---
 doc/tor.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/doc/tor.md b/doc/tor.md
index 2f376af4c7a7f..a05979fca84e3 100644
--- a/doc/tor.md
+++ b/doc/tor.md
@@ -99,10 +99,10 @@ This means that if Tor is running (and proper authentication has been configured
 Bitcoin Core automatically creates a hidden service to listen on. This will positively 
 affect the number of available .onion nodes.
 
-This new feature is enabled by default if Bitcoin Core is listening, and
-a connection to Tor can be made. It can be configured with the `-listenonion`,
-`-torcontrol` and `-torpassword` settings. To show verbose debugging
-information, pass `-debug=tor`.
+This new feature is enabled by default if Bitcoin Core is listening (`-listen`), and
+requires a Tor connection to work. It can be explicitly disabled with `-listenonion=0`
+and, if not disabled, configured using the `-torcontrol` and `-torpassword` settings.
+To show verbose debugging information, pass `-debug=tor`.
 
 Connecting to Tor's control socket API requires one of two authentication methods to be 
 configured. For cookie authentication the user running bitcoind must have write access 

From 7c9a98aac843c9efabd8653caebc35e968b2f335 Mon Sep 17 00:00:00 2001
From: Jon Lund Steffensen <jonlst@gmail.com>
Date: Tue, 26 Mar 2013 02:33:25 +0100
Subject: [PATCH 1080/1802] Allow network activity to be temporarily suspended.

Added the function SetNetworkActive() which when called with argument set to false disconnects all nodes and sets the flag fNetworkActive to false. As long as this flag is false no new connections are attempted and no incoming connections are accepted. Network activity is reenabled by calling the function with argument true.
---
 src/net.cpp | 29 +++++++++++++++++++++++++++++
 src/net.h   |  2 ++
 2 files changed, 31 insertions(+)

diff --git a/src/net.cpp b/src/net.cpp
index cce06f2d64cf0..973e278e0e17f 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -990,6 +990,12 @@ void CConnman::AcceptConnection(const ListenSocket& hListenSocket) {
         return;
     }
 
+    if (!fNetworkActive) {
+        LogPrintf("connection from %s dropped: not accepting new connections\n", addr.ToString());
+        CloseSocket(hSocket);
+        return;
+    }
+
     if (!IsSelectableSocket(hSocket))
     {
         LogPrintf("connection from %s dropped: non-selectable socket\n", addr.ToString());
@@ -1783,6 +1789,9 @@ bool CConnman::OpenNetworkConnection(const CAddress& addrConnect, bool fCountFai
     // Initiate outbound network connection
     //
     boost::this_thread::interruption_point();
+    if (!fNetworkActive) {
+        return false;
+    }
     if (!pszDest) {
         if (IsLocal(addrConnect) ||
             FindNode((CNetAddr)addrConnect) || IsBanned(addrConnect) ||
@@ -2024,8 +2033,28 @@ void Discover(boost::thread_group& threadGroup)
 #endif
 }
 
+void CConnman::SetNetworkActive(bool active)
+{
+    if (fDebug) {
+        LogPrint("net", "SetNetworkActive: %s\n", active);
+    }
+
+    if (!active) {
+        fNetworkActive = false;
+
+        LOCK(cs_vNodes);
+        // Close sockets to all nodes
+        BOOST_FOREACH(CNode* pnode, vNodes) {
+            pnode->CloseSocketDisconnect();
+        }
+    } else {
+        fNetworkActive = true;
+    }
+}
+
 CConnman::CConnman(uint64_t nSeed0In, uint64_t nSeed1In) : nSeed0(nSeed0In), nSeed1(nSeed1In)
 {
+    fNetworkActive = true;
     setBannedIsDirty = false;
     fAddressesInitialized = false;
     nLastNodeId = 0;
diff --git a/src/net.h b/src/net.h
index d0b2773623f43..6912c0f97b419 100644
--- a/src/net.h
+++ b/src/net.h
@@ -131,6 +131,7 @@ class CConnman
     bool Start(boost::thread_group& threadGroup, CScheduler& scheduler, std::string& strNodeError, Options options);
     void Stop();
     bool BindListenPort(const CService &bindAddr, std::string& strError, bool fWhitelisted = false);
+    void SetNetworkActive(bool active);
     bool OpenNetworkConnection(const CAddress& addrConnect, bool fCountFailure, CSemaphoreGrant *grantOutbound = NULL, const char *strDest = NULL, bool fOneShot = false, bool fFeeler = false);
     bool CheckIncomingNonce(uint64_t nonce);
 
@@ -370,6 +371,7 @@ class CConnman
     unsigned int nReceiveFloodSize;
 
     std::vector<ListenSocket> vhListenSocket;
+    bool fNetworkActive;
     banmap_t setBanned;
     CCriticalSection cs_setBanned;
     bool setBannedIsDirty;

From e38993bb36801d492cad87479b8473794f19c9da Mon Sep 17 00:00:00 2001
From: Jon Lund Steffensen <jonlst@gmail.com>
Date: Tue, 26 Mar 2013 02:38:24 +0100
Subject: [PATCH 1081/1802] RPC: Add "togglenetwork" method to toggle network
 activity temporarily

RPC command "togglenetwork" toggles network and returns new state after command.
RPC command "getinfo" returns "networkactive" field in output.
---
 src/net.h        |  1 +
 src/rpc/misc.cpp |  4 +++-
 src/rpc/net.cpp  | 19 +++++++++++++++++++
 3 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/src/net.h b/src/net.h
index 6912c0f97b419..1d911664ffba7 100644
--- a/src/net.h
+++ b/src/net.h
@@ -131,6 +131,7 @@ class CConnman
     bool Start(boost::thread_group& threadGroup, CScheduler& scheduler, std::string& strNodeError, Options options);
     void Stop();
     bool BindListenPort(const CService &bindAddr, std::string& strError, bool fWhitelisted = false);
+    bool GetNetworkActive() const { return fNetworkActive; };
     void SetNetworkActive(bool active);
     bool OpenNetworkConnection(const CAddress& addrConnect, bool fCountFailure, CSemaphoreGrant *grantOutbound = NULL, const char *strDest = NULL, bool fOneShot = false, bool fFeeler = false);
     bool CheckIncomingNonce(uint64_t nonce);
diff --git a/src/rpc/misc.cpp b/src/rpc/misc.cpp
index 5afcf6353c731..4bfcc9387cf73 100644
--- a/src/rpc/misc.cpp
+++ b/src/rpc/misc.cpp
@@ -89,8 +89,10 @@ UniValue getinfo(const UniValue& params, bool fHelp)
 #endif
     obj.push_back(Pair("blocks",        (int)chainActive.Height()));
     obj.push_back(Pair("timeoffset",    GetTimeOffset()));
-    if(g_connman)
+    if (g_connman) {
+        obj.push_back(Pair("networkactive", g_connman->GetNetworkActive()));
         obj.push_back(Pair("connections",   (int)g_connman->GetNodeCount(CConnman::CONNECTIONS_ALL)));
+    }
     obj.push_back(Pair("proxy",         (proxy.IsValid() ? proxy.proxy.ToStringIPPort() : string())));
     obj.push_back(Pair("difficulty",    (double)GetDifficulty()));
     obj.push_back(Pair("testnet",       Params().TestnetToBeDeprecatedFieldRPC()));
diff --git a/src/rpc/net.cpp b/src/rpc/net.cpp
index b011029f51c29..7f5b107997aa2 100644
--- a/src/rpc/net.cpp
+++ b/src/rpc/net.cpp
@@ -571,6 +571,24 @@ UniValue clearbanned(const UniValue& params, bool fHelp)
     return NullUniValue;
 }
 
+UniValue togglenetwork(const JSONRPCRequest& request)
+{
+    if (request.fHelp || request.params.size() != 0) {
+        throw runtime_error(
+            "togglenetwork\n"
+            "Toggle all network activity temporarily."
+        );
+    }
+
+    if (!g_connman) {
+        throw JSONRPCError(RPC_CLIENT_P2P_DISABLED, "Error: Peer-to-peer functionality missing or disabled");
+    }
+
+    g_connman->SetNetworkActive(!g_connman->GetNetworkActive());
+
+    return g_connman->GetNetworkActive();
+}
+
 static const CRPCCommand commands[] =
 { //  category              name                      actor (function)         okSafeMode
   //  --------------------- ------------------------  -----------------------  ----------
@@ -585,6 +603,7 @@ static const CRPCCommand commands[] =
     { "network",            "setban",                 &setban,                 true  },
     { "network",            "listbanned",             &listbanned,             true  },
     { "network",            "clearbanned",            &clearbanned,            true  },
+    { "network",            "togglenetwork",          &togglenetwork,          true, },
 };
 
 void RegisterNetRPCCommands(CRPCTable &t)

From 32efa79e0e63b6d3f055326b2e6b794815d408ad Mon Sep 17 00:00:00 2001
From: Jon Lund Steffensen <jonlst@gmail.com>
Date: Tue, 26 Mar 2013 03:07:06 +0100
Subject: [PATCH 1082/1802] Qt: Add GUI feedback and control of network
 activity state.

Add getNetworkActive()/setNetworkActive() method to client model.
Send network active status through NotifyNetworkActiveChanged.
Indicate in tool tip of gui status bar network indicator whether network activity is disabled.
Indicate in debug window whether network activity is disabled and add button to allow user to toggle network activity state.
---
 src/net.cpp            |  2 ++
 src/qt/bitcoingui.cpp  | 23 ++++++++++++++++++++---
 src/qt/bitcoingui.h    |  5 +++++
 src/qt/clientmodel.cpp | 28 ++++++++++++++++++++++++++++
 src/qt/clientmodel.h   |  6 ++++++
 src/qt/rpcconsole.cpp  | 30 ++++++++++++++++++++++++++----
 src/qt/rpcconsole.h    |  7 +++++++
 src/ui_interface.h     |  3 +++
 8 files changed, 97 insertions(+), 7 deletions(-)

diff --git a/src/net.cpp b/src/net.cpp
index 973e278e0e17f..7c5e00c6fceec 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -2050,6 +2050,8 @@ void CConnman::SetNetworkActive(bool active)
     } else {
         fNetworkActive = true;
     }
+
+    uiInterface.NotifyNetworkActiveChanged(fNetworkActive);
 }
 
 CConnman::CConnman(uint64_t nSeed0In, uint64_t nSeed1In) : nSeed0(nSeed0In), nSeed1(nSeed1In)
diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp
index 16d7778a272c5..69cdfc9c0737d 100644
--- a/src/qt/bitcoingui.cpp
+++ b/src/qt/bitcoingui.cpp
@@ -459,8 +459,9 @@ void BitcoinGUI::setClientModel(ClientModel *_clientModel)
         createTrayIconMenu();
 
         // Keep up to date with client
-        setNumConnections(_clientModel->getNumConnections());
+        updateNetworkState();
         connect(_clientModel, SIGNAL(numConnectionsChanged(int)), this, SLOT(setNumConnections(int)));
+        connect(_clientModel, SIGNAL(networkActiveChanged(bool)), this, SLOT(setNetworkActive(bool)));
 
         setNumBlocks(_clientModel->getNumBlocks(), _clientModel->getLastBlockDate(), _clientModel->getVerificationProgress(NULL), false);
         connect(_clientModel, SIGNAL(numBlocksChanged(int,QDateTime,double,bool)), this, SLOT(setNumBlocks(int,QDateTime,double,bool)));
@@ -686,8 +687,9 @@ void BitcoinGUI::gotoVerifyMessageTab(QString addr)
 }
 #endif // ENABLE_WALLET
 
-void BitcoinGUI::setNumConnections(int count)
+void BitcoinGUI::updateNetworkState()
 {
+    int count = clientModel->getNumConnections();
     QString icon;
     switch(count)
     {
@@ -698,7 +700,22 @@ void BitcoinGUI::setNumConnections(int count)
     default: icon = ":/icons/connect_4"; break;
     }
     labelConnectionsIcon->setPixmap(platformStyle->SingleColorIcon(icon).pixmap(STATUSBAR_ICONSIZE,STATUSBAR_ICONSIZE));
-    labelConnectionsIcon->setToolTip(tr("%n active connection(s) to Bitcoin network", "", count));
+
+    if (clientModel->getNetworkActive()) {
+        labelConnectionsIcon->setToolTip(tr("%n active connection(s) to Bitcoin network", "", count));
+    } else {
+        labelConnectionsIcon->setToolTip(tr("Network activity disabled"));
+    }
+}
+
+void BitcoinGUI::setNumConnections(int count)
+{
+    updateNetworkState();
+}
+
+void BitcoinGUI::setNetworkActive(bool networkActive)
+{
+    updateNetworkState();
 }
 
 void BitcoinGUI::setNumBlocks(int count, const QDateTime& blockDate, double nVerificationProgress, bool header)
diff --git a/src/qt/bitcoingui.h b/src/qt/bitcoingui.h
index 41770929b4706..2eae60d41b260 100644
--- a/src/qt/bitcoingui.h
+++ b/src/qt/bitcoingui.h
@@ -144,6 +144,9 @@ class BitcoinGUI : public QMainWindow
     /** Disconnect core signals from GUI client */
     void unsubscribeFromCoreSignals();
 
+    /** Update UI with latest network info from model. */
+    void updateNetworkState();
+
 Q_SIGNALS:
     /** Signal raised when a URI was entered or dragged to the GUI */
     void receivedURI(const QString &uri);
@@ -151,6 +154,8 @@ class BitcoinGUI : public QMainWindow
 public Q_SLOTS:
     /** Set number of connections shown in the UI */
     void setNumConnections(int count);
+    /** Set network state shown in the UI */
+    void setNetworkActive(bool networkActive);
     /** Set number of blocks and last block date shown in the UI */
     void setNumBlocks(int count, const QDateTime& blockDate, double nVerificationProgress, bool headers);
 
diff --git a/src/qt/clientmodel.cpp b/src/qt/clientmodel.cpp
index 62a70bacd93c7..3e062bffb5201 100644
--- a/src/qt/clientmodel.cpp
+++ b/src/qt/clientmodel.cpp
@@ -128,6 +128,11 @@ void ClientModel::updateNumConnections(int numConnections)
     Q_EMIT numConnectionsChanged(numConnections);
 }
 
+void ClientModel::updateNetworkActive(bool networkActive)
+{
+    Q_EMIT networkActiveChanged(networkActive);
+}
+
 void ClientModel::updateAlert()
 {
     Q_EMIT alertsChanged(getStatusBarWarnings());
@@ -150,6 +155,21 @@ enum BlockSource ClientModel::getBlockSource() const
     return BLOCK_SOURCE_NONE;
 }
 
+void ClientModel::setNetworkActive(bool active)
+{
+    if (g_connman) {
+         g_connman->SetNetworkActive(active);
+    }
+}
+
+bool ClientModel::getNetworkActive() const
+{
+    if (g_connman) {
+        return g_connman->GetNetworkActive();
+    }
+    return false;
+}
+
 QString ClientModel::getStatusBarWarnings() const
 {
     return QString::fromStdString(GetWarnings("gui"));
@@ -216,6 +236,12 @@ static void NotifyNumConnectionsChanged(ClientModel *clientmodel, int newNumConn
                               Q_ARG(int, newNumConnections));
 }
 
+static void NotifyNetworkActiveChanged(ClientModel *clientmodel, bool networkActive)
+{
+    QMetaObject::invokeMethod(clientmodel, "updateNetworkActive", Qt::QueuedConnection,
+                              Q_ARG(bool, networkActive));
+}
+
 static void NotifyAlertChanged(ClientModel *clientmodel)
 {
     qDebug() << "NotifyAlertChanged";
@@ -256,6 +282,7 @@ void ClientModel::subscribeToCoreSignals()
     // Connect signals to client
     uiInterface.ShowProgress.connect(boost::bind(ShowProgress, this, _1, _2));
     uiInterface.NotifyNumConnectionsChanged.connect(boost::bind(NotifyNumConnectionsChanged, this, _1));
+    uiInterface.NotifyNetworkActiveChanged.connect(boost::bind(NotifyNetworkActiveChanged, this, _1));
     uiInterface.NotifyAlertChanged.connect(boost::bind(NotifyAlertChanged, this));
     uiInterface.BannedListChanged.connect(boost::bind(BannedListChanged, this));
     uiInterface.NotifyBlockTip.connect(boost::bind(BlockTipChanged, this, _1, _2, false));
@@ -267,6 +294,7 @@ void ClientModel::unsubscribeFromCoreSignals()
     // Disconnect signals from client
     uiInterface.ShowProgress.disconnect(boost::bind(ShowProgress, this, _1, _2));
     uiInterface.NotifyNumConnectionsChanged.disconnect(boost::bind(NotifyNumConnectionsChanged, this, _1));
+    uiInterface.NotifyNetworkActiveChanged.disconnect(boost::bind(NotifyNetworkActiveChanged, this, _1));
     uiInterface.NotifyAlertChanged.disconnect(boost::bind(NotifyAlertChanged, this));
     uiInterface.BannedListChanged.disconnect(boost::bind(BannedListChanged, this));
     uiInterface.NotifyBlockTip.disconnect(boost::bind(BlockTipChanged, this, _1, _2, false));
diff --git a/src/qt/clientmodel.h b/src/qt/clientmodel.h
index 99fd574b9e14d..52ca0e3121f15 100644
--- a/src/qt/clientmodel.h
+++ b/src/qt/clientmodel.h
@@ -67,6 +67,10 @@ class ClientModel : public QObject
     bool inInitialBlockDownload() const;
     //! Return true if core is importing blocks
     enum BlockSource getBlockSource() const;
+    //! Return true if network activity in core is enabled
+    bool getNetworkActive() const;
+    //! Toggle network activity state in core
+    void setNetworkActive(bool active);
     //! Return warnings to be displayed in status bar
     QString getStatusBarWarnings() const;
 
@@ -90,6 +94,7 @@ class ClientModel : public QObject
     void numConnectionsChanged(int count);
     void numBlocksChanged(int count, const QDateTime& blockDate, double nVerificationProgress, bool header);
     void mempoolSizeChanged(long count, size_t mempoolSizeInBytes);
+    void networkActiveChanged(bool networkActive);
     void alertsChanged(const QString &warnings);
     void bytesChanged(quint64 totalBytesIn, quint64 totalBytesOut);
 
@@ -102,6 +107,7 @@ class ClientModel : public QObject
 public Q_SLOTS:
     void updateTimer();
     void updateNumConnections(int numConnections);
+    void updateNetworkActive(bool networkActive);
     void updateAlert();
     void updateBanlist();
 };
diff --git a/src/qt/rpcconsole.cpp b/src/qt/rpcconsole.cpp
index ace9f1ceaad6b..05a59378f9e04 100644
--- a/src/qt/rpcconsole.cpp
+++ b/src/qt/rpcconsole.cpp
@@ -456,6 +456,9 @@ void RPCConsole::setClientModel(ClientModel *model)
         setNumBlocks(model->getNumBlocks(), model->getLastBlockDate(), model->getVerificationProgress(NULL), false);
         connect(model, SIGNAL(numBlocksChanged(int,QDateTime,double,bool)), this, SLOT(setNumBlocks(int,QDateTime,double,bool)));
 
+        updateNetworkState();
+        connect(model, SIGNAL(networkActiveChanged(bool)), this, SLOT(setNetworkActive(bool)));
+
         updateTrafficStats(model->getTotalBytesRecv(), model->getTotalBytesSent());
         connect(model, SIGNAL(bytesChanged(quint64,quint64)), this, SLOT(updateTrafficStats(quint64, quint64)));
 
@@ -670,16 +673,30 @@ void RPCConsole::message(int category, const QString &message, bool html)
     ui->messagesWidget->append(out);
 }
 
+void RPCConsole::updateNetworkState()
+{
+    QString connections = QString::number(clientModel->getNumConnections()) + " (";
+    connections += tr("In:") + " " + QString::number(clientModel->getNumConnections(CONNECTIONS_IN)) + " / ";
+    connections += tr("Out:") + " " + QString::number(clientModel->getNumConnections(CONNECTIONS_OUT)) + ")";
+
+    if(!clientModel->getNetworkActive()) {
+        connections += " (" + tr("Network activity disabled") + ")";
+    }
+
+    ui->numberOfConnections->setText(connections);
+}
+
 void RPCConsole::setNumConnections(int count)
 {
     if (!clientModel)
         return;
 
-    QString connections = QString::number(count) + " (";
-    connections += tr("In:") + " " + QString::number(clientModel->getNumConnections(CONNECTIONS_IN)) + " / ";
-    connections += tr("Out:") + " " + QString::number(clientModel->getNumConnections(CONNECTIONS_OUT)) + ")";
+    updateNetworkState();
+}
 
-    ui->numberOfConnections->setText(connections);
+void RPCConsole::setNetworkActive(bool networkActive)
+{
+    updateNetworkState();
 }
 
 void RPCConsole::setNumBlocks(int count, const QDateTime& blockDate, double nVerificationProgress, bool headers)
@@ -1036,3 +1053,8 @@ void RPCConsole::setTabFocus(enum TabTypes tabType)
 {
     ui->tabWidget->setCurrentIndex(tabType);
 }
+
+void RPCConsole::on_toggleNetworkActiveButton_clicked()
+{
+    clientModel->setNetworkActive(!clientModel->getNetworkActive());
+}
diff --git a/src/qt/rpcconsole.h b/src/qt/rpcconsole.h
index 50224a1cc0bf1..2a5686b67231c 100644
--- a/src/qt/rpcconsole.h
+++ b/src/qt/rpcconsole.h
@@ -61,6 +61,8 @@ class RPCConsole: public QWidget
 private Q_SLOTS:
     void on_lineEdit_returnPressed();
     void on_tabWidget_currentChanged(int index);
+    /** toggle network activity */
+    void on_toggleNetworkActiveButton_clicked();
     /** open the debug.log from the current datadir */
     void on_openDebugLogfileButton_clicked();
     /** change the time range of the network traffic graph */
@@ -88,6 +90,8 @@ public Q_SLOTS:
     void message(int category, const QString &message, bool html = false);
     /** Set number of connections shown in the UI */
     void setNumConnections(int count);
+    /** Set network state shown in the UI */
+    void setNetworkActive(bool networkActive);
     /** Set number of blocks and last block date shown in the UI */
     void setNumBlocks(int count, const QDateTime& blockDate, double nVerificationProgress, bool headers);
     /** Set size (number of transactions and memory usage) of the mempool in the UI */
@@ -142,6 +146,9 @@ public Q_SLOTS:
     QMenu *banTableContextMenu;
     int consoleFontSize;
     QCompleter *autoCompleter;
+
+    /** Update UI with latest network info from model. */
+    void updateNetworkState();
 };
 
 #endif // BITCOIN_QT_RPCCONSOLE_H
diff --git a/src/ui_interface.h b/src/ui_interface.h
index 7e6557f8e21b0..d2a393a35e9b2 100644
--- a/src/ui_interface.h
+++ b/src/ui_interface.h
@@ -85,6 +85,9 @@ class CClientUIInterface
     /** Number of network connections changed. */
     boost::signals2::signal<void (int newNumConnections)> NotifyNumConnectionsChanged;
 
+    /** Network activity state changed. */
+    boost::signals2::signal<void (bool networkActive)> NotifyNetworkActiveChanged;
+
     /**
      * Status bar alerts changed.
      */

From b2b33d9017cd7bc92099338773313fdf4572dc4a Mon Sep 17 00:00:00 2001
From: Jonas Schnelli <jonas.schnelli@include7.ch>
Date: Wed, 19 Nov 2014 13:33:34 +0100
Subject: [PATCH 1083/1802] Overhaul network activity toggle

- Rename RPC command "togglenetwork" to "setnetworkactive (true|false)"
- Add simple test case
- GUI toggle added to connections icon in statusbar
---
 contrib/debian/copyright              |   1 +
 src/Makefile.qt.include               |   1 +
 src/qt/bitcoin.qrc                    |   1 +
 src/qt/bitcoingui.cpp                 |  30 ++++++++++++++++++++------
 src/qt/bitcoingui.h                   |  16 +++++++++++++-
 src/qt/res/icons/network_disabled.png | Bin 0 -> 435 bytes
 src/rpc/client.cpp                    |   1 +
 src/rpc/net.cpp                       |  17 +++++++++------
 src/test/rpc_tests.cpp                |  22 +++++++++++++++++++
 9 files changed, 75 insertions(+), 14 deletions(-)
 create mode 100644 src/qt/res/icons/network_disabled.png

diff --git a/contrib/debian/copyright b/contrib/debian/copyright
index cc4606ca88ad9..011cb4a4d9227 100644
--- a/contrib/debian/copyright
+++ b/contrib/debian/copyright
@@ -34,6 +34,7 @@ Files: src/qt/res/icons/add.png
        src/qt/res/icons/info.png
        src/qt/res/icons/key.png
        src/qt/res/icons/lock_*.png
+       src/qt/res/icons/network_disabled.png
        src/qt/res/icons/open.png
        src/qt/res/icons/overview.png
        src/qt/res/icons/quit.png
diff --git a/src/Makefile.qt.include b/src/Makefile.qt.include
index 8947aeaca0b14..277cbb9debc63 100644
--- a/src/Makefile.qt.include
+++ b/src/Makefile.qt.include
@@ -264,6 +264,7 @@ RES_ICONS = \
   qt/res/icons/key.png \
   qt/res/icons/lock_closed.png \
   qt/res/icons/lock_open.png \
+  qt/res/icons/network_disabled.png \
   qt/res/icons/open.png \
   qt/res/icons/overview.png \
   qt/res/icons/quit.png \
diff --git a/src/qt/bitcoin.qrc b/src/qt/bitcoin.qrc
index ca5b1fa67321c..451d391237fda 100644
--- a/src/qt/bitcoin.qrc
+++ b/src/qt/bitcoin.qrc
@@ -52,6 +52,7 @@
         <file alias="transaction_abandoned">res/icons/transaction_abandoned.png</file>
         <file alias="hd_enabled">res/icons/hd_enabled.png</file>
         <file alias="hd_disabled">res/icons/hd_disabled.png</file>
+        <file alias="network_disabled">res/icons/network_disabled.png</file>
     </qresource>
     <qresource prefix="/movies">
         <file alias="spinner-000">res/movies/spinner-000.png</file>
diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp
index 69cdfc9c0737d..4cc30454a217a 100644
--- a/src/qt/bitcoingui.cpp
+++ b/src/qt/bitcoingui.cpp
@@ -83,7 +83,7 @@ BitcoinGUI::BitcoinGUI(const PlatformStyle *_platformStyle, const NetworkStyle *
     unitDisplayControl(0),
     labelWalletEncryptionIcon(0),
     labelWalletHDStatusIcon(0),
-    labelConnectionsIcon(0),
+    connectionsControl(0),
     labelBlocksIcon(0),
     progressBarLabel(0),
     progressBar(0),
@@ -195,7 +195,7 @@ BitcoinGUI::BitcoinGUI(const PlatformStyle *_platformStyle, const NetworkStyle *
     unitDisplayControl = new UnitDisplayStatusBarControl(platformStyle);
     labelWalletEncryptionIcon = new QLabel();
     labelWalletHDStatusIcon = new QLabel();
-    labelConnectionsIcon = new QLabel();
+    connectionsControl = new NetworkToggleStatusBarControl();
     labelBlocksIcon = new QLabel();
     if(enableWallet)
     {
@@ -206,7 +206,7 @@ BitcoinGUI::BitcoinGUI(const PlatformStyle *_platformStyle, const NetworkStyle *
         frameBlocksLayout->addWidget(labelWalletHDStatusIcon);
     }
     frameBlocksLayout->addStretch();
-    frameBlocksLayout->addWidget(labelConnectionsIcon);
+    frameBlocksLayout->addWidget(connectionsControl);
     frameBlocksLayout->addStretch();
     frameBlocksLayout->addWidget(labelBlocksIcon);
     frameBlocksLayout->addStretch();
@@ -480,6 +480,7 @@ void BitcoinGUI::setClientModel(ClientModel *_clientModel)
         }
 #endif // ENABLE_WALLET
         unitDisplayControl->setOptionsModel(_clientModel->getOptionsModel());
+        connectionsControl->setClientModel(_clientModel);
         
         OptionsModel* optionsModel = _clientModel->getOptionsModel();
         if(optionsModel)
@@ -699,13 +700,15 @@ void BitcoinGUI::updateNetworkState()
     case 7: case 8: case 9: icon = ":/icons/connect_3"; break;
     default: icon = ":/icons/connect_4"; break;
     }
-    labelConnectionsIcon->setPixmap(platformStyle->SingleColorIcon(icon).pixmap(STATUSBAR_ICONSIZE,STATUSBAR_ICONSIZE));
 
     if (clientModel->getNetworkActive()) {
-        labelConnectionsIcon->setToolTip(tr("%n active connection(s) to Bitcoin network", "", count));
+        connectionsControl->setToolTip(tr("%n active connection(s) to Bitcoin network", "", count));
     } else {
-        labelConnectionsIcon->setToolTip(tr("Network activity disabled"));
+        connectionsControl->setToolTip(tr("Network activity disabled"));
+        icon = ":/icons/network_disabled";
     }
+
+    connectionsControl->setPixmap(platformStyle->SingleColorIcon(icon).pixmap(STATUSBAR_ICONSIZE,STATUSBAR_ICONSIZE));
 }
 
 void BitcoinGUI::setNumConnections(int count)
@@ -1220,3 +1223,18 @@ void UnitDisplayStatusBarControl::onMenuSelection(QAction* action)
         optionsModel->setDisplayUnit(action->data());
     }
 }
+
+void NetworkToggleStatusBarControl::mousePressEvent(QMouseEvent *event)
+{
+    if (clientModel) {
+        clientModel->setNetworkActive(!clientModel->getNetworkActive());
+    }
+}
+
+/** Lets the control know about the Client Model */
+void NetworkToggleStatusBarControl::setClientModel(ClientModel *_clientModel)
+{
+    if (_clientModel) {
+        this->clientModel = _clientModel;
+    }
+}
diff --git a/src/qt/bitcoingui.h b/src/qt/bitcoingui.h
index 2eae60d41b260..83634b9597b26 100644
--- a/src/qt/bitcoingui.h
+++ b/src/qt/bitcoingui.h
@@ -26,6 +26,7 @@ class PlatformStyle;
 class RPCConsole;
 class SendCoinsRecipient;
 class UnitDisplayStatusBarControl;
+class NetworkToggleStatusBarControl;
 class WalletFrame;
 class WalletModel;
 class HelpMessageDialog;
@@ -84,7 +85,7 @@ class BitcoinGUI : public QMainWindow
     UnitDisplayStatusBarControl *unitDisplayControl;
     QLabel *labelWalletEncryptionIcon;
     QLabel *labelWalletHDStatusIcon;
-    QLabel *labelConnectionsIcon;
+    NetworkToggleStatusBarControl *connectionsControl;
     QLabel *labelBlocksIcon;
     QLabel *progressBarLabel;
     QProgressBar *progressBar;
@@ -265,4 +266,17 @@ private Q_SLOTS:
     void onMenuSelection(QAction* action);
 };
 
+class NetworkToggleStatusBarControl : public QLabel
+{
+    Q_OBJECT
+    
+public:
+    void setClientModel(ClientModel *clientModel);
+protected:
+    void mousePressEvent(QMouseEvent *event);
+    
+private:
+    ClientModel *clientModel;
+};
+
 #endif // BITCOIN_QT_BITCOINGUI_H
diff --git a/src/qt/res/icons/network_disabled.png b/src/qt/res/icons/network_disabled.png
new file mode 100644
index 0000000000000000000000000000000000000000..c802e3981866fc4e431ece80c5295f66f518d41c
GIT binary patch
literal 435
zcmV;k0ZjghP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzRY^oaRCwC#SnUylFbu65FoGlC2Hik6
zkWsn`=Lk+vH^2>W1Ka?^9sc2tHf@s@G4JmEQQ-RW)g(#@1OkCTK!X}+fEGBe(9X})
zTRQj!*f|cp#%_MM7>*umV`=AaWw-i3aQH8WoZe^%558oR!}23DgFJBvjQJ_?D$jE-
z;0^d#{H}p#L<M>SPxE(3fl1gNAy6Z#mMs}N7%xr#x0IpeLuj4Hh)^C89pw!hlZ;qT
zxQs(`V;fJ*r;5;y_YG(A_6Q4NMRc6W?6VGq2$z@H1n7WR_KDD30xG0{R1upHkRn2t
z4xv;LMFg0H`o0vwn#4BprVJ6$bCyvP5k?^*2JVZjW^NZo?pDIr%(cjB7Sj-BYo}WV
zPms^Z7GW_=PV@@5sVFv5K7sd@k@AXIp|FjVn;h!@ZmqJ5#nvuXi@R9v?q<C%5C{Z<
d-^E9O0RYLYS;x%lYn1>1002ovPDHLkV1n7kw<-Vt

literal 0
HcmV?d00001

diff --git a/src/rpc/client.cpp b/src/rpc/client.cpp
index c14d9d67474fe..66648b68539ec 100644
--- a/src/rpc/client.cpp
+++ b/src/rpc/client.cpp
@@ -107,6 +107,7 @@ static const CRPCConvertParam vRPCConvertParams[] =
     { "prioritisetransaction", 2 },
     { "setban", 2 },
     { "setban", 3 },
+    { "setnetworkactive", 0 },
     { "getmempoolancestors", 1 },
     { "getmempooldescendants", 1 },
 };
diff --git a/src/rpc/net.cpp b/src/rpc/net.cpp
index 7f5b107997aa2..045089e2e59e6 100644
--- a/src/rpc/net.cpp
+++ b/src/rpc/net.cpp
@@ -401,6 +401,7 @@ UniValue getnetworkinfo(const UniValue& params, bool fHelp)
             "  \"localrelay\": true|false,              (bool) true if transaction relay is requested from peers\n"
             "  \"timeoffset\": xxxxx,                   (numeric) the time offset\n"
             "  \"connections\": xxxxx,                  (numeric) the number of connections\n"
+            "  \"networkactive\": x,                    (numeric) the number of connections\n"
             "  \"networks\": [                          (array) information per network\n"
             "  {\n"
             "    \"name\": \"xxx\",                     (string) network (ipv4, ipv6 or onion)\n"
@@ -435,8 +436,10 @@ UniValue getnetworkinfo(const UniValue& params, bool fHelp)
         obj.push_back(Pair("localservices", strprintf("%016x", g_connman->GetLocalServices())));
     obj.push_back(Pair("localrelay",     fRelayTxes));
     obj.push_back(Pair("timeoffset",    GetTimeOffset()));
-    if(g_connman)
+    if (g_connman) {
+        obj.push_back(Pair("networkactive", (int)g_connman->GetNetworkActive()));
         obj.push_back(Pair("connections",   (int)g_connman->GetNodeCount(CConnman::CONNECTIONS_ALL)));
+    }
     obj.push_back(Pair("networks",      GetNetworksInfo()));
     obj.push_back(Pair("relayfee",      ValueFromAmount(::minRelayTxFee.GetFeePerK())));
     UniValue localAddresses(UniValue::VARR);
@@ -571,12 +574,12 @@ UniValue clearbanned(const UniValue& params, bool fHelp)
     return NullUniValue;
 }
 
-UniValue togglenetwork(const JSONRPCRequest& request)
+UniValue setnetworkactive(const JSONRPCRequest& request)
 {
-    if (request.fHelp || request.params.size() != 0) {
+    if (request.fHelp || request.params.size() != 1) {
         throw runtime_error(
-            "togglenetwork\n"
-            "Toggle all network activity temporarily."
+            "setnetworkactive \"true|false\"\n"
+            "Disable/Re-Enable all network activity temporarily."
         );
     }
 
@@ -584,7 +587,7 @@ UniValue togglenetwork(const JSONRPCRequest& request)
         throw JSONRPCError(RPC_CLIENT_P2P_DISABLED, "Error: Peer-to-peer functionality missing or disabled");
     }
 
-    g_connman->SetNetworkActive(!g_connman->GetNetworkActive());
+    g_connman->SetNetworkActive(request.params[0].get_bool());
 
     return g_connman->GetNetworkActive();
 }
@@ -603,7 +606,7 @@ static const CRPCCommand commands[] =
     { "network",            "setban",                 &setban,                 true  },
     { "network",            "listbanned",             &listbanned,             true  },
     { "network",            "clearbanned",            &clearbanned,            true  },
-    { "network",            "togglenetwork",          &togglenetwork,          true, },
+    { "network",            "setnetworkactive",       &setnetworkactive,       true, },
 };
 
 void RegisterNetRPCCommands(CRPCTable &t)
diff --git a/src/test/rpc_tests.cpp b/src/test/rpc_tests.cpp
index a15915aad2f10..03594878ed03e 100644
--- a/src/test/rpc_tests.cpp
+++ b/src/test/rpc_tests.cpp
@@ -81,6 +81,28 @@ BOOST_AUTO_TEST_CASE(rpc_rawparams)
     BOOST_CHECK_THROW(CallRPC(string("sendrawtransaction ")+rawtx+" extra"), runtime_error);
 }
 
+BOOST_AUTO_TEST_CASE(rpc_togglenetwork)
+{
+    UniValue r;
+
+    r = CallRPC("getnetworkinfo");
+    int netState = find_value(r.get_obj(), "networkactive").get_int();
+    BOOST_CHECK_EQUAL(netState, 1);
+
+    BOOST_CHECK_NO_THROW(CallRPC("setnetworkactive false"));
+    r = CallRPC("getnetworkinfo");
+    int numConnection = find_value(r.get_obj(), "connections").get_int();
+    BOOST_CHECK_EQUAL(numConnection, 0);
+
+    netState = find_value(r.get_obj(), "networkactive").get_int();
+    BOOST_CHECK_EQUAL(netState, 0);
+
+    BOOST_CHECK_NO_THROW(CallRPC("setnetworkactive true"));
+    r = CallRPC("getnetworkinfo");
+    netState = find_value(r.get_obj(), "networkactive").get_int();
+    BOOST_CHECK_EQUAL(netState, 1);
+}
+
 BOOST_AUTO_TEST_CASE(rpc_rawsign)
 {
     UniValue r;

From 54cf99745ffa8f437c63f9f86c5c9d5e6bb04028 Mon Sep 17 00:00:00 2001
From: Luke Dashjr <luke-jr+git@utopios.org>
Date: Sun, 23 Oct 2016 05:35:52 +0000
Subject: [PATCH 1084/1802] RPC/Net: Use boolean consistently for
 networkactive, and remove from getinfo

---
 src/rpc/misc.cpp       |  4 +---
 src/rpc/net.cpp        |  8 ++++----
 src/test/rpc_tests.cpp | 12 ++++++------
 3 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/src/rpc/misc.cpp b/src/rpc/misc.cpp
index 4bfcc9387cf73..5afcf6353c731 100644
--- a/src/rpc/misc.cpp
+++ b/src/rpc/misc.cpp
@@ -89,10 +89,8 @@ UniValue getinfo(const UniValue& params, bool fHelp)
 #endif
     obj.push_back(Pair("blocks",        (int)chainActive.Height()));
     obj.push_back(Pair("timeoffset",    GetTimeOffset()));
-    if (g_connman) {
-        obj.push_back(Pair("networkactive", g_connman->GetNetworkActive()));
+    if(g_connman)
         obj.push_back(Pair("connections",   (int)g_connman->GetNodeCount(CConnman::CONNECTIONS_ALL)));
-    }
     obj.push_back(Pair("proxy",         (proxy.IsValid() ? proxy.proxy.ToStringIPPort() : string())));
     obj.push_back(Pair("difficulty",    (double)GetDifficulty()));
     obj.push_back(Pair("testnet",       Params().TestnetToBeDeprecatedFieldRPC()));
diff --git a/src/rpc/net.cpp b/src/rpc/net.cpp
index 045089e2e59e6..c470a546b9d28 100644
--- a/src/rpc/net.cpp
+++ b/src/rpc/net.cpp
@@ -401,7 +401,7 @@ UniValue getnetworkinfo(const UniValue& params, bool fHelp)
             "  \"localrelay\": true|false,              (bool) true if transaction relay is requested from peers\n"
             "  \"timeoffset\": xxxxx,                   (numeric) the time offset\n"
             "  \"connections\": xxxxx,                  (numeric) the number of connections\n"
-            "  \"networkactive\": x,                    (numeric) the number of connections\n"
+            "  \"networkactive\": true|false,           (bool) whether p2p networking is enabled\n"
             "  \"networks\": [                          (array) information per network\n"
             "  {\n"
             "    \"name\": \"xxx\",                     (string) network (ipv4, ipv6 or onion)\n"
@@ -437,7 +437,7 @@ UniValue getnetworkinfo(const UniValue& params, bool fHelp)
     obj.push_back(Pair("localrelay",     fRelayTxes));
     obj.push_back(Pair("timeoffset",    GetTimeOffset()));
     if (g_connman) {
-        obj.push_back(Pair("networkactive", (int)g_connman->GetNetworkActive()));
+        obj.push_back(Pair("networkactive", g_connman->GetNetworkActive()));
         obj.push_back(Pair("connections",   (int)g_connman->GetNodeCount(CConnman::CONNECTIONS_ALL)));
     }
     obj.push_back(Pair("networks",      GetNetworksInfo()));
@@ -578,8 +578,8 @@ UniValue setnetworkactive(const JSONRPCRequest& request)
 {
     if (request.fHelp || request.params.size() != 1) {
         throw runtime_error(
-            "setnetworkactive \"true|false\"\n"
-            "Disable/Re-Enable all network activity temporarily."
+            "setnetworkactive true|false\n"
+            "Disable/enable all p2p network activity."
         );
     }
 
diff --git a/src/test/rpc_tests.cpp b/src/test/rpc_tests.cpp
index 03594878ed03e..c98d4b11d9f34 100644
--- a/src/test/rpc_tests.cpp
+++ b/src/test/rpc_tests.cpp
@@ -86,21 +86,21 @@ BOOST_AUTO_TEST_CASE(rpc_togglenetwork)
     UniValue r;
 
     r = CallRPC("getnetworkinfo");
-    int netState = find_value(r.get_obj(), "networkactive").get_int();
-    BOOST_CHECK_EQUAL(netState, 1);
+    bool netState = find_value(r.get_obj(), "networkactive").get_bool();
+    BOOST_CHECK_EQUAL(netState, true);
 
     BOOST_CHECK_NO_THROW(CallRPC("setnetworkactive false"));
     r = CallRPC("getnetworkinfo");
     int numConnection = find_value(r.get_obj(), "connections").get_int();
     BOOST_CHECK_EQUAL(numConnection, 0);
 
-    netState = find_value(r.get_obj(), "networkactive").get_int();
-    BOOST_CHECK_EQUAL(netState, 0);
+    netState = find_value(r.get_obj(), "networkactive").get_bool();
+    BOOST_CHECK_EQUAL(netState, false);
 
     BOOST_CHECK_NO_THROW(CallRPC("setnetworkactive true"));
     r = CallRPC("getnetworkinfo");
-    netState = find_value(r.get_obj(), "networkactive").get_int();
-    BOOST_CHECK_EQUAL(netState, 1);
+    netState = find_value(r.get_obj(), "networkactive").get_bool();
+    BOOST_CHECK_EQUAL(netState, true);
 }
 
 BOOST_AUTO_TEST_CASE(rpc_rawsign)

From 19f46f177ec5e1913f9be5b257dad95bc7a57c38 Mon Sep 17 00:00:00 2001
From: Luke Dashjr <luke-jr+git@utopios.org>
Date: Mon, 24 Oct 2016 09:21:03 +0000
Subject: [PATCH 1085/1802] Qt: New network_disabled icon

---
 contrib/debian/copyright              |   4 +-
 src/qt/res/icons/network_disabled.png | Bin 435 -> 591 bytes
 src/qt/res/src/network_disabled.svg   |  68 ++++++++++++++++++++++++++
 3 files changed, 71 insertions(+), 1 deletion(-)
 create mode 100644 src/qt/res/src/network_disabled.svg

diff --git a/contrib/debian/copyright b/contrib/debian/copyright
index 011cb4a4d9227..b44244ad8c810 100644
--- a/contrib/debian/copyright
+++ b/contrib/debian/copyright
@@ -34,7 +34,6 @@ Files: src/qt/res/icons/add.png
        src/qt/res/icons/info.png
        src/qt/res/icons/key.png
        src/qt/res/icons/lock_*.png
-       src/qt/res/icons/network_disabled.png
        src/qt/res/icons/open.png
        src/qt/res/icons/overview.png
        src/qt/res/icons/quit.png
@@ -52,7 +51,10 @@ Comment: Site: https://github.com/stephenhutchings/typicons.font
 
 Files: src/qt/res/icons/connect*.png
        src/qt/res/src/connect-*.svg
+       src/qt/res/icons/network_disabled.png
+       src/qt/res/src/network_disabled.svg
 Copyright: Marco Falke
+           Luke Dashjr
 License: Expat
 Comment: Inspired by Stephan Hutchings Typicons
 
diff --git a/src/qt/res/icons/network_disabled.png b/src/qt/res/icons/network_disabled.png
index c802e3981866fc4e431ece80c5295f66f518d41c..49f728693d8c0fc5d63c4911b84f431961631434 100644
GIT binary patch
literal 591
zcmV-V0<iswP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00006VoOIv0RI60
z0RN!9r;`8x0t87!K~zYIz1F{PO<@=Z@XxJ8N}_%xm7;#6W`m7E{0~;0gtS7cDi(vX
zH8F@mt9~^%L1>W}3`_<w7(|G{K;sI<K#(iaf#E$TdA&X7-quZglQZ1&KF{-g-tY6{
zT>cX(*poe#fAC*~6L^bnc#QS2K`(x1&n2`ikYEJ2aWjhZ3CoHI8j)0R0Ix6`+0S4i
ziSY=Ba>uqTXfu*?!u5AxaTDKujHcO*CWe<IlI?hdF5Jbh#5VP*VjvH`0h9QQ?<Eey
zIE_Kv67)?Ix`EX=o+Z;!!E!vu*-XckxQ|WI?XKV}-eDcyV+;Bsn`c;qc09lkYH$P>
z{f(ulC)xePJ&XwjER%8$#<8#9eNjysX<mvUTu9!v3$533aDwJF9L5T4#FQ{R1kK9`
z)@C;GB!9%U=nQPe9elwDoXngEZP|=qMChy@bY^6)MUz~H`PN}ZkTu3t(ImGLysQp=
zl1XkB`~^-4Et<A)9ZQlJRSe{-xd&&kQ&<5tY>SNNGicM;C9Lay?8jDEl{p?1rn*`n
zL1&ivZd}LSl3Uh=Mwvu+&U_T-OC0j&hp-{Lgo5@okaA8<#<S}*TG#EFd{2cIj?r}0
z58`2BFd+;~{(BZLg^x|qC$)&AH$UtU)^vU_CG7j*f<TRslJv%h-FPBw%xN4e$+Q_-
d{qwMJ`~lly?nsk6D((OP002ovPDHLkV1m114h;YR

literal 435
zcmV;k0ZjghP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzRY^oaRCwC#SnUylFbu65FoGlC2Hik6
zkWsn`=Lk+vH^2>W1Ka?^9sc2tHf@s@G4JmEQQ-RW)g(#@1OkCTK!X}+fEGBe(9X})
zTRQj!*f|cp#%_MM7>*umV`=AaWw-i3aQH8WoZe^%558oR!}23DgFJBvjQJ_?D$jE-
z;0^d#{H}p#L<M>SPxE(3fl1gNAy6Z#mMs}N7%xr#x0IpeLuj4Hh)^C89pw!hlZ;qT
zxQs(`V;fJ*r;5;y_YG(A_6Q4NMRc6W?6VGq2$z@H1n7WR_KDD30xG0{R1upHkRn2t
z4xv;LMFg0H`o0vwn#4BprVJ6$bCyvP5k?^*2JVZjW^NZo?pDIr%(cjB7Sj-BYo}WV
zPms^Z7GW_=PV@@5sVFv5K7sd@k@AXIp|FjVn;h!@ZmqJ5#nvuXi@R9v?q<C%5C{Z<
d-^E9O0RYLYS;x%lYn1>1002ovPDHLkV1n7kw<-Vt

diff --git a/src/qt/res/src/network_disabled.svg b/src/qt/res/src/network_disabled.svg
new file mode 100644
index 0000000000000..e95a5eb5bbd30
--- /dev/null
+++ b/src/qt/res/src/network_disabled.svg
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   id="svg2"
+   viewBox="0 0 24 24"
+   height="24"
+   width="24"
+   version="1.2">
+  <metadata
+     id="metadata10">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs8" />
+  <g
+     id="g4142"
+     transform="matrix(0,-1,-1,0,23.96,24)">
+    <g
+       id="g4210"
+       transform="matrix(-1,0,0,1,59.86,-106.6)">
+      <g
+         id="g4289"
+         transform="matrix(-1,0,0,1,-16.98,0.8136)">
+        <g
+           id="g4291">
+          <path
+             id="path4293"
+             d="m -65.35,116.3 0,3 0.5,0 c 0.54,0 1,0.5 1,1 l 0,2.6 c -1.15,0.5 -2,1.6 -2,3 0,2 1.59,3.5 3.5,3.5 1.91,0 3.5,-1.5 3.5,-3.5 0,-1.4 -0.85,-2.5 -2,-3 l 0,-2.6 c 0,-2.3 -1.81,-4 -4,-4 z m 1,1.2 c 1.39,0.3 2.5,1.3 2.5,2.8 l 0,3.2 0.34,0.1 c 0.96,0.3 1.66,1.2 1.66,2.3 0,1.4 -1.11,2.5 -2.5,2.5 -1.39,0 -2.5,-1.1 -2.5,-2.5 0,-1.1 0.69,-2 1.66,-2.3 l 0.34,-0.1 0,-3.2 c 0,-0.9 -0.67,-1.5 -1.5,-1.8 z"
+             style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+          <g
+             style="fill:#969696;fill-opacity:1"
+             id="g4295">
+            <path
+               id="path4297"
+               d="m -67.35,106.1 c -1.94,0 -3.5,1.6 -3.5,3.5 0,1.4 0.85,2.5 2,3 l 0,2.7 c 0,2.2 1.79,4 4,4 l 0.5,0 0,-0.5 0,-2.5 -0.5,0 c -0.55,0 -1,-0.5 -1,-1 l 0,-2.7 c 1.15,-0.5 2,-1.6 2,-3 0,-1.9 -1.57,-3.5 -3.5,-3.5 z m 0,1 c 1.37,0 2.5,1.2 2.5,2.5 0,1.1 -0.7,2 -1.66,2.3 l -0.34,0.1 0,3.3 c 0,0.9 0.67,1.5 1.5,1.8 l 0,1 c -1.38,-0.3 -2.5,-1.4 -2.5,-2.8 l 0,-3.3 -0.34,-0.1 c -0.96,-0.3 -1.66,-1.2 -1.66,-2.3 0,-1.3 1.12,-2.5 2.5,-2.5 z"
+               style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+            <path
+               id="path4299"
+               d="m -57.35,106.1 c -1.93,0 -3.5,1.6 -3.5,3.5 0,1.4 0.85,2.5 2,3 l 0,2.7 c 0,0.5 -0.45,1 -1,1 l -4.85,0 3.17,3 1.68,0 c 2.21,0 4,-1.8 4,-4 l 0,-2.7 c 1.15,-0.5 2,-1.6 2,-3 0,-1.9 -1.56,-3.5 -3.5,-3.5 z m 0,1 c 1.38,0 2.5,1.2 2.5,2.5 0,1.1 -0.7,2 -1.66,2.3 l -0.34,0.1 0,3.3 c 0,1.6 -1.35,3 -3,3 l -1.81,0 -2.04,-1 3.85,0 c 1.11,0 2,-0.9 2,-2 l 0,-3.3 -0.34,-0.1 c -0.96,-0.3 -1.66,-1.2 -1.66,-2.3 0,-1.3 1.13,-2.5 2.5,-2.5 z"
+               style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+          </g>
+          <path
+             id="path4301"
+             d="m -69.84,116.3 c -2.19,0 -4,1.7 -4,4 l 0,2.6 c -1.14,0.6 -1.99,1.6 -1.99,3 0,2 1.6,3.5 3.51,3.5 1.91,0 3.5,-1.5 3.5,-3.5 0,-1.4 -0.85,-2.5 -2,-3 l 0,-2.6 c 0,-0.5 0.45,-1 1,-1 l 5.01,0 -3.36,-3 z m 0,1 1.84,0 2.19,1 -4.01,0 c -1.11,0 -2,0.9 -2,2 l 0,3.2 0.34,0.1 c 0.96,0.3 1.66,1.2 1.66,2.3 0,1.4 -1.11,2.5 -2.5,2.5 -1.39,0 -2.51,-1.1 -2.51,-2.5 0,-1.1 0.7,-2 1.66,-2.3 l 0.33,-0.1 0,-0.4 0,-2.8 c 0,-1.7 1.33,-3 3,-3 z"
+             style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+        </g>
+      </g>
+    </g>
+    <path
+       id="path4165"
+       d="m 12,8.77 c -0.84,0 -1.66,0.341 -2.254,0.937 -0.599,0.593 -0.942,1.403 -0.945,2.253 0,0.85 0.337,1.67 0.933,2.26 a 0.6001,0.6001 0 0 0 0,0 c 0.594,0.6 1.424,0.94 2.264,0.94 0.84,0 1.67,-0.34 2.26,-0.94 0.6,-0.59 0.94,-1.41 0.94,-2.26 0,-0.84 -0.34,-1.66 -0.95,-2.253 C 13.66,9.111 12.84,8.77 12,8.77 Z"
+       style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:10;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  </g>
+  <path d="M 3,3 l 18,18" style="stroke-width: 3; stroke: #000000; stroke-linecap: round;" />
+  <path d="M 21,3 l -18,18" style="stroke-width: 3; stroke: #000000; stroke-linecap: round;" />
+</svg>

From fa1c3c2eb0a1853ed0e0662fc2bdbca51e05ccf5 Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Mon, 24 Oct 2016 21:38:20 +0200
Subject: [PATCH 1086/1802] [net] Remove assert(nMaxInbound > 0)

nMaxInbound might very well be 0 or -1, if the user prefers to keep
a small number of maxconnections.

Note: nMaxInbound of -1 means that the user set maxconnections
to 8 or less, but we still want to keep an additional slot for
the feeler connection.
---
 src/net.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/net.cpp b/src/net.cpp
index 1bca168d1d15c..83a85dfbdd64b 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -970,7 +970,6 @@ void CConnman::AcceptConnection(const ListenSocket& hListenSocket) {
     CAddress addr;
     int nInbound = 0;
     int nMaxInbound = nMaxConnections - (nMaxOutbound + nMaxFeeler);
-    assert(nMaxInbound > 0);
 
     if (hSocket != INVALID_SOCKET)
         if (!addr.SetSockAddr((const struct sockaddr*)&sockaddr))

From 515e2642eb45bda56156b1213b25fb4886d3fdbe Mon Sep 17 00:00:00 2001
From: Gregory Maxwell <greg@xiph.org>
Date: Mon, 24 Oct 2016 01:21:04 +0000
Subject: [PATCH 1087/1802] Make connect=0 disable automatic outbound
 connections.

Otherwise it just responds to this obvious bit of configuration by
 trying to connect to "0" in a loop.
---
 src/init.cpp | 6 +++---
 src/net.cpp  | 5 +++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/init.cpp b/src/init.cpp
index e2f25eda744e3..84b0108ea8770 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -359,13 +359,13 @@ std::string HelpMessage(HelpMessageMode mode)
     strUsage += HelpMessageOpt("-banscore=<n>", strprintf(_("Threshold for disconnecting misbehaving peers (default: %u)"), DEFAULT_BANSCORE_THRESHOLD));
     strUsage += HelpMessageOpt("-bantime=<n>", strprintf(_("Number of seconds to keep misbehaving peers from reconnecting (default: %u)"), DEFAULT_MISBEHAVING_BANTIME));
     strUsage += HelpMessageOpt("-bind=<addr>", _("Bind to given address and always listen on it. Use [host]:port notation for IPv6"));
-    strUsage += HelpMessageOpt("-connect=<ip>", _("Connect only to the specified node(s)"));
+    strUsage += HelpMessageOpt("-connect=<ip>", _("Connect only to the specified node(s); -noconnect or -connect=0 alone to disable automatic connections"));
     strUsage += HelpMessageOpt("-discover", _("Discover own IP addresses (default: 1 when listening and no -externalip or -proxy)"));
     strUsage += HelpMessageOpt("-dns", _("Allow DNS lookups for -addnode, -seednode and -connect") + " " + strprintf(_("(default: %u)"), DEFAULT_NAME_LOOKUP));
-    strUsage += HelpMessageOpt("-dnsseed", _("Query for peer addresses via DNS lookup, if low on addresses (default: 1 unless -connect)"));
+    strUsage += HelpMessageOpt("-dnsseed", _("Query for peer addresses via DNS lookup, if low on addresses (default: 1 unless -connect/-noconnect)"));
     strUsage += HelpMessageOpt("-externalip=<ip>", _("Specify your own public address"));
     strUsage += HelpMessageOpt("-forcednsseed", strprintf(_("Always query for peer addresses via DNS lookup (default: %u)"), DEFAULT_FORCEDNSSEED));
-    strUsage += HelpMessageOpt("-listen", _("Accept connections from outside (default: 1 if no -proxy or -connect)"));
+    strUsage += HelpMessageOpt("-listen", _("Accept connections from outside (default: 1 if no -proxy or -connect/-noconnect)"));
     strUsage += HelpMessageOpt("-listenonion", strprintf(_("Automatically create Tor hidden service (default: %d)"), DEFAULT_LISTEN_ONION));
     strUsage += HelpMessageOpt("-maxconnections=<n>", strprintf(_("Maintain at most <n> connections to peers (default: %u)"), DEFAULT_MAX_PEER_CONNECTIONS));
     strUsage += HelpMessageOpt("-maxreceivebuffer=<n>", strprintf(_("Maximum per-connection receive buffer, <n>*1000 bytes (default: %u)"), DEFAULT_MAXRECEIVEBUFFER));
diff --git a/src/net.cpp b/src/net.cpp
index 1bca168d1d15c..953377a9f0c23 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -2138,8 +2138,9 @@ bool CConnman::Start(boost::thread_group& threadGroup, CScheduler& scheduler, st
     // Initiate outbound connections from -addnode
     threadGroup.create_thread(boost::bind(&TraceThread<boost::function<void()> >, "addcon", boost::function<void()>(boost::bind(&CConnman::ThreadOpenAddedConnections, this))));
 
-    // Initiate outbound connections
-    threadGroup.create_thread(boost::bind(&TraceThread<boost::function<void()> >, "opencon", boost::function<void()>(boost::bind(&CConnman::ThreadOpenConnections, this))));
+    // Initiate outbound connections unless connect=0
+    if (!mapArgs.count("-connect") || mapMultiArgs["-connect"].size() != 1 || mapMultiArgs["-connect"][0] != "0")
+        threadGroup.create_thread(boost::bind(&TraceThread<boost::function<void()> >, "opencon", boost::function<void()>(boost::bind(&CConnman::ThreadOpenConnections, this))));
 
     // Process messages
     threadGroup.create_thread(boost::bind(&TraceThread<boost::function<void()> >, "msghand", boost::function<void()>(boost::bind(&CConnman::ThreadMessageHandler, this))));

From d0b01f3a859eacc51a28fc18d2ed7e361ec90833 Mon Sep 17 00:00:00 2001
From: Geoffrey Tsui <tsui.geoffrey@gmail.com>
Date: Tue, 25 Oct 2016 22:35:26 +0800
Subject: [PATCH 1088/1802] Explicitly pass const CChainParams& to
 LoadBlockIndexDB()

---
 src/init.cpp | 2 +-
 src/main.cpp | 7 +++----
 src/main.h   | 2 +-
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/init.cpp b/src/init.cpp
index 84b0108ea8770..b03b5096345f3 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -1320,7 +1320,7 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
                         CleanupBlockRevFiles();
                 }
 
-                if (!LoadBlockIndex()) {
+                if (!LoadBlockIndex(chainparams)) {
                     strLoadError = _("Error loading block database");
                     break;
                 }
diff --git a/src/main.cpp b/src/main.cpp
index 5e17ec6251ece..0ee54a27d5d9b 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -3966,9 +3966,8 @@ CBlockIndex * InsertBlockIndex(uint256 hash)
     return pindexNew;
 }
 
-bool static LoadBlockIndexDB()
+bool static LoadBlockIndexDB(const CChainParams& chainparams)
 {
-    const CChainParams& chainparams = Params();
     if (!pblocktree->LoadBlockIndexGuts(InsertBlockIndex))
         return false;
 
@@ -4297,10 +4296,10 @@ void UnloadBlockIndex()
     fHavePruned = false;
 }
 
-bool LoadBlockIndex()
+bool LoadBlockIndex(const CChainParams& chainparams)
 {
     // Load block index from databases
-    if (!fReindex && !LoadBlockIndexDB())
+    if (!fReindex && !LoadBlockIndexDB(chainparams))
         return false;
     return true;
 }
diff --git a/src/main.h b/src/main.h
index 3eab9b89daa66..6bd6479dcc413 100644
--- a/src/main.h
+++ b/src/main.h
@@ -237,7 +237,7 @@ bool LoadExternalBlockFile(const CChainParams& chainparams, FILE* fileIn, CDiskB
 /** Initialize a new block tree database + block data on disk */
 bool InitBlockIndex(const CChainParams& chainparams);
 /** Load the block tree and coins database from disk */
-bool LoadBlockIndex();
+bool LoadBlockIndex(const CChainParams& chainparams);
 /** Unload database information */
 void UnloadBlockIndex();
 /** Run an instance of the script checking thread */

From 339c4b6c3a8e68e4bba1969d144e413a462b68f1 Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Tue, 25 Oct 2016 14:04:33 -0400
Subject: [PATCH 1089/1802] release: bump required osx version to 10.8. Credit
 jonasschnelli.

libc++ on 10.7 causes too many issues.

See #8577 for discussion/details.
---
 share/qt/Info.plist.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/share/qt/Info.plist.in b/share/qt/Info.plist.in
index 6a34d64cd5323..5ca6d9d015b45 100644
--- a/share/qt/Info.plist.in
+++ b/share/qt/Info.plist.in
@@ -3,7 +3,7 @@
 <plist version="0.9">
 <dict>
   <key>LSMinimumSystemVersion</key>
-  <string>10.7.0</string>
+  <string>10.8.0</string>
 
   <key>LSArchitecturePriority</key>
   <array>

From 67c6326abd1788e6f411feb4f44b69774e76aae2 Mon Sep 17 00:00:00 2001
From: Russell Yanofsky <russ@chaincode.com>
Date: Tue, 25 Oct 2016 15:30:55 -0400
Subject: [PATCH 1090/1802] Send tip change notification from invalidateblock

This change is needed to prevent sync_blocks timeouts in the mempool_reorg
test after the sync_blocks update in the upcoming commit
"[qa] Change sync_blocks to pick smarter maxheight".

This change was initially suggested by Suhas Daftuar <sdaftuar@chaincode.com>
in https://github.com/bitcoin/bitcoin/pull/8680#r78209060
---
 src/main.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main.cpp b/src/main.cpp
index e868e3c5f9ee5..305f431a31338 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -3201,6 +3201,7 @@ bool InvalidateBlock(CValidationState& state, const CChainParams& chainparams, C
 
     InvalidChainFound(pindex);
     mempool.removeForReorg(pcoinsTip, chainActive.Tip()->nHeight + 1, STANDARD_LOCKTIME_VERIFY_FLAGS);
+    uiInterface.NotifyBlockTip(IsInitialBlockDownload(), pindex->pprev);
     return true;
 }
 

From 04c1c155440405aa47586962e038696b9a2bc046 Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Wed, 26 Oct 2016 11:57:05 +0200
Subject: [PATCH 1091/1802] rpc: Remove invalid explanation from wallet fee
 message

---
 src/wallet/rpcwallet.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index ab7e74988a00f..d8b7e05148e89 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -362,7 +362,7 @@ static void SendMoney(const CTxDestination &address, CAmount nValue, bool fSubtr
     vecSend.push_back(recipient);
     if (!pwalletMain->CreateTransaction(vecSend, wtxNew, reservekey, nFeeRequired, nChangePosRet, strError)) {
         if (!fSubtractFeeFromAmount && nValue + nFeeRequired > pwalletMain->GetBalance())
-            strError = strprintf("Error: This transaction requires a transaction fee of at least %s because of its amount, complexity, or use of recently received funds!", FormatMoney(nFeeRequired));
+            strError = strprintf("Error: This transaction requires a transaction fee of at least %s", FormatMoney(nFeeRequired));
         throw JSONRPCError(RPC_WALLET_ERROR, strError);
     }
     if (!pwalletMain->CommitTransaction(wtxNew, reservekey, g_connman.get()))

From 169bdabe14ef5988ff92a7370114edc85b070b27 Mon Sep 17 00:00:00 2001
From: instagibbs <gsanders87@gmail.com>
Date: Tue, 25 Oct 2016 14:27:04 -0400
Subject: [PATCH 1092/1802] Return useful error message on ATMP failure

---
 src/qt/walletmodel.cpp   |  4 +++-
 src/wallet/rpcwallet.cpp | 15 +++++++++++----
 src/wallet/wallet.cpp    | 12 ++++++------
 src/wallet/wallet.h      |  4 ++--
 4 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/src/qt/walletmodel.cpp b/src/qt/walletmodel.cpp
index 305cb4fefa4f4..d3dc865684bf1 100644
--- a/src/qt/walletmodel.cpp
+++ b/src/qt/walletmodel.cpp
@@ -5,6 +5,7 @@
 #include "walletmodel.h"
 
 #include "addresstablemodel.h"
+#include "consensus/validation.h"
 #include "guiconstants.h"
 #include "guiutil.h"
 #include "paymentserver.h"
@@ -328,7 +329,8 @@ WalletModel::SendCoinsReturn WalletModel::sendCoins(WalletModelTransaction &tran
         }
 
         CReserveKey *keyChange = transaction.getPossibleKeyChange();
-        if(!wallet->CommitTransaction(*newTx, *keyChange, g_connman.get()))
+        CValidationState state;
+        if(!wallet->CommitTransaction(*newTx, *keyChange, g_connman.get(), state))
             return TransactionCommitFailed;
 
         CTransaction* t = (CTransaction*)newTx;
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index ab7e74988a00f..c6a4dcc006afe 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -6,6 +6,7 @@
 #include "amount.h"
 #include "base58.h"
 #include "chain.h"
+#include "consensus/validation.h"
 #include "core_io.h"
 #include "init.h"
 #include "main.h"
@@ -365,8 +366,11 @@ static void SendMoney(const CTxDestination &address, CAmount nValue, bool fSubtr
             strError = strprintf("Error: This transaction requires a transaction fee of at least %s because of its amount, complexity, or use of recently received funds!", FormatMoney(nFeeRequired));
         throw JSONRPCError(RPC_WALLET_ERROR, strError);
     }
-    if (!pwalletMain->CommitTransaction(wtxNew, reservekey, g_connman.get()))
-        throw JSONRPCError(RPC_WALLET_ERROR, "Error: The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of the wallet and coins were spent in the copy but not marked as spent here.");
+    CValidationState state;
+    if (!pwalletMain->CommitTransaction(wtxNew, reservekey, g_connman.get(), state)) {
+        strError = strprintf("Error: The transaction was rejected! Reason given: %s", state.GetRejectReason());
+        throw JSONRPCError(RPC_WALLET_ERROR, strError);
+    }
 }
 
 UniValue sendtoaddress(const JSONRPCRequest& request)
@@ -959,8 +963,11 @@ UniValue sendmany(const JSONRPCRequest& request)
     bool fCreated = pwalletMain->CreateTransaction(vecSend, wtx, keyChange, nFeeRequired, nChangePosRet, strFailReason);
     if (!fCreated)
         throw JSONRPCError(RPC_WALLET_INSUFFICIENT_FUNDS, strFailReason);
-    if (!pwalletMain->CommitTransaction(wtx, keyChange, g_connman.get()))
-        throw JSONRPCError(RPC_WALLET_ERROR, "Transaction commit failed");
+    CValidationState state;
+    if (!pwalletMain->CommitTransaction(wtx, keyChange, g_connman.get(), state)) {
+        strFailReason = strprintf("Transaction commit failed:: %s", state.GetRejectReason());
+        throw JSONRPCError(RPC_WALLET_ERROR, strFailReason);
+    }
 
     return wtx.GetHash().GetHex();
 }
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index 60a769704b655..3fc05c1c1d189 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -1463,7 +1463,8 @@ void CWallet::ReacceptWalletTransactions()
         CWalletTx& wtx = *(item.second);
 
         LOCK(mempool.cs);
-        wtx.AcceptToMemoryPool(maxTxFee);
+        CValidationState state;
+        wtx.AcceptToMemoryPool(maxTxFee, state);
     }
 }
 
@@ -2474,7 +2475,7 @@ bool CWallet::CreateTransaction(const vector<CRecipient>& vecSend, CWalletTx& wt
 /**
  * Call after CreateTransaction unless you want to abort
  */
-bool CWallet::CommitTransaction(CWalletTx& wtxNew, CReserveKey& reservekey, CConnman* connman)
+bool CWallet::CommitTransaction(CWalletTx& wtxNew, CReserveKey& reservekey, CConnman* connman, CValidationState& state)
 {
     {
         LOCK2(cs_main, cs_wallet);
@@ -2502,9 +2503,9 @@ bool CWallet::CommitTransaction(CWalletTx& wtxNew, CReserveKey& reservekey, CCon
         if (fBroadcastTransactions)
         {
             // Broadcast
-            if (!wtxNew.AcceptToMemoryPool(maxTxFee)) {
+            if (!wtxNew.AcceptToMemoryPool(maxTxFee, state)) {
                 // This must not fail. The transaction has already been signed and recorded.
-                LogPrintf("CommitTransaction(): Error: Transaction not valid\n");
+                LogPrintf("CommitTransaction(): Error: Transaction not valid, %s\n", state.GetRejectReason());
                 return false;
             }
             wtxNew.RelayWalletTransaction(connman);
@@ -3649,8 +3650,7 @@ int CMerkleTx::GetBlocksToMaturity() const
 }
 
 
-bool CMerkleTx::AcceptToMemoryPool(const CAmount& nAbsurdFee)
+bool CMerkleTx::AcceptToMemoryPool(const CAmount& nAbsurdFee, CValidationState& state)
 {
-    CValidationState state;
     return ::AcceptToMemoryPool(mempool, state, *this, true, NULL, false, nAbsurdFee);
 }
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
index 3b37f7cb1fd63..c33a6ca91f670 100644
--- a/src/wallet/wallet.h
+++ b/src/wallet/wallet.h
@@ -215,7 +215,7 @@ class CMerkleTx : public CTransaction
     bool IsInMainChain() const { const CBlockIndex *pindexRet; return GetDepthInMainChain(pindexRet) > 0; }
     int GetBlocksToMaturity() const;
     /** Pass this transaction to the mempool. Fails if absolute fee exceeds absurd fee. */
-    bool AcceptToMemoryPool(const CAmount& nAbsurdFee);
+    bool AcceptToMemoryPool(const CAmount& nAbsurdFee, CValidationState& state);
     bool hashUnset() const { return (hashBlock.IsNull() || hashBlock == ABANDON_HASH); }
     bool isAbandoned() const { return (hashBlock == ABANDON_HASH); }
     void setAbandoned() { hashBlock = ABANDON_HASH; }
@@ -774,7 +774,7 @@ class CWallet : public CCryptoKeyStore, public CValidationInterface
      */
     bool CreateTransaction(const std::vector<CRecipient>& vecSend, CWalletTx& wtxNew, CReserveKey& reservekey, CAmount& nFeeRet, int& nChangePosInOut,
                            std::string& strFailReason, const CCoinControl *coinControl = NULL, bool sign = true);
-    bool CommitTransaction(CWalletTx& wtxNew, CReserveKey& reservekey, CConnman* connman);
+    bool CommitTransaction(CWalletTx& wtxNew, CReserveKey& reservekey, CConnman* connman, CValidationState& state);
 
     void ListAccountCreditDebit(const std::string& strAccount, std::list<CAccountingEntry>& entries);
     bool AddAccountingEntry(const CAccountingEntry&);

From 4536148b15595229d0563fb60913b23cb78788ed Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Sun, 18 Sep 2016 09:55:14 +0200
Subject: [PATCH 1093/1802] support: Add LockedPool

Add a pool for locked memory chunks, replacing LockedPageManager.

This is something I've been wanting to do for a long time. The current
approach of locking objects where they happen to be on the stack or heap
in-place causes a lot of mlock/munlock system call overhead, slowing
down any handling of keys.

Also locked memory is a limited resource on many operating systems (and
using a lot of it bogs down the system), so the previous approach of
locking every page that may contain any key information (but also other
information) is wasteful.
---
 src/Makefile.am                 |   4 +-
 src/support/allocators/secure.h |  12 +-
 src/support/lockedpool.cpp      | 383 ++++++++++++++++++++++++++++++++
 src/support/lockedpool.h        | 251 +++++++++++++++++++++
 src/support/pagelocker.cpp      |  70 ------
 src/support/pagelocker.h        | 160 -------------
 src/test/allocator_tests.cpp    | 280 +++++++++++++++--------
 7 files changed, 832 insertions(+), 328 deletions(-)
 create mode 100644 src/support/lockedpool.cpp
 create mode 100644 src/support/lockedpool.h
 delete mode 100644 src/support/pagelocker.cpp
 delete mode 100644 src/support/pagelocker.h

diff --git a/src/Makefile.am b/src/Makefile.am
index e7f1d82b8b88a..54abd2ce46936 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -133,7 +133,7 @@ BITCOIN_CORE_H = \
   support/allocators/secure.h \
   support/allocators/zeroafterfree.h \
   support/cleanse.h \
-  support/pagelocker.h \
+  support/lockedpool.h \
   sync.h \
   threadsafety.h \
   timedata.h \
@@ -310,7 +310,7 @@ libbitcoin_common_a_SOURCES = \
 libbitcoin_util_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES)
 libbitcoin_util_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
 libbitcoin_util_a_SOURCES = \
-  support/pagelocker.cpp \
+  support/lockedpool.cpp \
   chainparamsbase.cpp \
   clientversion.cpp \
   compat/glibc_sanity.cpp \
diff --git a/src/support/allocators/secure.h b/src/support/allocators/secure.h
index 1ec40fe83003f..67064314ef1fb 100644
--- a/src/support/allocators/secure.h
+++ b/src/support/allocators/secure.h
@@ -6,7 +6,8 @@
 #ifndef BITCOIN_SUPPORT_ALLOCATORS_SECURE_H
 #define BITCOIN_SUPPORT_ALLOCATORS_SECURE_H
 
-#include "support/pagelocker.h"
+#include "support/lockedpool.h"
+#include "support/cleanse.h"
 
 #include <string>
 
@@ -39,20 +40,15 @@ struct secure_allocator : public std::allocator<T> {
 
     T* allocate(std::size_t n, const void* hint = 0)
     {
-        T* p;
-        p = std::allocator<T>::allocate(n, hint);
-        if (p != NULL)
-            LockedPageManager::Instance().LockRange(p, sizeof(T) * n);
-        return p;
+        return static_cast<T*>(LockedPoolManager::Instance().alloc(sizeof(T) * n));
     }
 
     void deallocate(T* p, std::size_t n)
     {
         if (p != NULL) {
             memory_cleanse(p, sizeof(T) * n);
-            LockedPageManager::Instance().UnlockRange(p, sizeof(T) * n);
         }
-        std::allocator<T>::deallocate(p, n);
+        LockedPoolManager::Instance().free(p);
     }
 };
 
diff --git a/src/support/lockedpool.cpp b/src/support/lockedpool.cpp
new file mode 100644
index 0000000000000..63050f006b053
--- /dev/null
+++ b/src/support/lockedpool.cpp
@@ -0,0 +1,383 @@
+// Copyright (c) 2016 The Bitcoin Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#include "support/lockedpool.h"
+#include "support/cleanse.h"
+
+#if defined(HAVE_CONFIG_H)
+#include "config/bitcoin-config.h"
+#endif
+
+#ifdef WIN32
+#ifdef _WIN32_WINNT
+#undef _WIN32_WINNT
+#endif
+#define _WIN32_WINNT 0x0501
+#define WIN32_LEAN_AND_MEAN 1
+#ifndef NOMINMAX
+#define NOMINMAX
+#endif
+#include <windows.h>
+#else
+#include <sys/mman.h> // for mmap
+#include <sys/resource.h> // for getrlimit
+#include <limits.h> // for PAGESIZE
+#include <unistd.h> // for sysconf
+#endif
+
+LockedPoolManager* LockedPoolManager::_instance = NULL;
+std::once_flag LockedPoolManager::init_flag;
+
+/*******************************************************************************/
+// Utilities
+//
+/** Align up to power of 2 */
+static inline size_t align_up(size_t x, size_t align)
+{
+    return (x + align - 1) & ~(align - 1);
+}
+
+/*******************************************************************************/
+// Implementation: Arena
+
+Arena::Arena(void *base_in, size_t size_in, size_t alignment_in):
+    base(static_cast<char*>(base_in)), end(static_cast<char*>(base_in) + size_in), alignment(alignment_in)
+{
+    // Start with one free chunk that covers the entire arena
+    chunks.emplace(base, Chunk(size_in, false));
+}
+
+Arena::~Arena()
+{
+}
+
+void* Arena::alloc(size_t size)
+{
+    // Round to next multiple of alignment
+    size = align_up(size, alignment);
+
+    // Don't handle zero-sized chunks, or those bigger than MAX_SIZE
+    if (size == 0 || size >= Chunk::MAX_SIZE) {
+        return nullptr;
+    }
+
+    for (auto& chunk: chunks) {
+        if (!chunk.second.isInUse() && size <= chunk.second.getSize()) {
+            char* base = chunk.first;
+            size_t leftover = chunk.second.getSize() - size;
+            if (leftover > 0) { // Split chunk
+                chunks.emplace(base + size, Chunk(leftover, false));
+                chunk.second.setSize(size);
+            }
+            chunk.second.setInUse(true);
+            return reinterpret_cast<void*>(base);
+        }
+    }
+    return nullptr;
+}
+
+void Arena::free(void *ptr)
+{
+    // Freeing the NULL pointer is OK.
+    if (ptr == nullptr) {
+        return;
+    }
+    auto i = chunks.find(static_cast<char*>(ptr));
+    if (i == chunks.end() || !i->second.isInUse()) {
+        throw std::runtime_error("Arena: invalid or double free");
+    }
+
+    i->second.setInUse(false);
+
+    if (i != chunks.begin()) { // Absorb into previous chunk if exists and free
+        auto prev = i;
+        --prev;
+        if (!prev->second.isInUse()) {
+            // Absorb current chunk size into previous chunk.
+            prev->second.setSize(prev->second.getSize() + i->second.getSize());
+            // Erase current chunk. Erasing does not invalidate current
+            // iterators for a map, except for that pointing to the object
+            // itself, which will be overwritten in the next statement.
+            chunks.erase(i);
+            // From here on, the previous chunk is our current chunk.
+            i = prev;
+        }
+    }
+    auto next = i;
+    ++next;
+    if (next != chunks.end()) { // Absorb next chunk if exists and free
+        if (!next->second.isInUse()) {
+            // Absurb next chunk size into current chunk
+            i->second.setSize(i->second.getSize() + next->second.getSize());
+            // Erase next chunk.
+            chunks.erase(next);
+        }
+    }
+}
+
+Arena::Stats Arena::stats() const
+{
+    Arena::Stats r;
+    r.used = r.free = r.total = r.chunks_used = r.chunks_free = 0;
+    for (const auto& chunk: chunks) {
+        if (chunk.second.isInUse()) {
+            r.used += chunk.second.getSize();
+            r.chunks_used += 1;
+        } else {
+            r.free += chunk.second.getSize();
+            r.chunks_free += 1;
+        }
+        r.total += chunk.second.getSize();
+    }
+    return r;
+}
+
+#ifdef ARENA_DEBUG
+void Arena::walk() const
+{
+    for (const auto& chunk: chunks) {
+        std::cout <<
+            "0x" << std::hex << std::setw(16) << std::setfill('0') << chunk.first <<
+            " 0x" << std::hex << std::setw(16) << std::setfill('0') << chunk.second.getSize() <<
+            " 0x" << chunk.second.isInUse() << std::endl;
+    }
+    std::cout << std::endl;
+}
+#endif
+
+/*******************************************************************************/
+// Implementation: Win32LockedPageAllocator
+
+#ifdef WIN32
+/** LockedPageAllocator specialized for Windows.
+ */
+class Win32LockedPageAllocator: public LockedPageAllocator
+{
+public:
+    Win32LockedPageAllocator();
+    void* AllocateLocked(size_t len, bool *lockingSuccess);
+    void FreeLocked(void* addr, size_t len);
+    size_t GetLimit();
+private:
+    size_t page_size;
+};
+
+Win32LockedPageAllocator::Win32LockedPageAllocator()
+{
+    // Determine system page size in bytes
+    SYSTEM_INFO sSysInfo;
+    GetSystemInfo(&sSysInfo);
+    page_size = sSysInfo.dwPageSize;
+}
+void *Win32LockedPageAllocator::AllocateLocked(size_t len, bool *lockingSuccess)
+{
+    len = align_up(len, page_size);
+    void *addr = VirtualAlloc(nullptr, len, MEM_COMMIT | MEM_RESERVE, PAGE_READWRITE);
+    if (addr) {
+        // VirtualLock is used to attempt to keep keying material out of swap. Note
+        // that it does not provide this as a guarantee, but, in practice, memory
+        // that has been VirtualLock'd almost never gets written to the pagefile
+        // except in rare circumstances where memory is extremely low.
+        *lockingSuccess = VirtualLock(const_cast<void*>(addr), len) != 0;
+    }
+    return addr;
+}
+void Win32LockedPageAllocator::FreeLocked(void* addr, size_t len)
+{
+    len = align_up(len, page_size);
+    memory_cleanse(addr, len);
+    VirtualUnlock(const_cast<void*>(addr), len);
+}
+
+size_t Win32LockedPageAllocator::GetLimit()
+{
+    // TODO is there a limit on windows, how to get it?
+    return std::numeric_limits<size_t>::max();
+}
+#endif
+
+/*******************************************************************************/
+// Implementation: PosixLockedPageAllocator
+
+#ifndef WIN32
+/** LockedPageAllocator specialized for OSes that don't try to be
+ * special snowflakes.
+ */
+class PosixLockedPageAllocator: public LockedPageAllocator
+{
+public:
+    PosixLockedPageAllocator();
+    void* AllocateLocked(size_t len, bool *lockingSuccess);
+    void FreeLocked(void* addr, size_t len);
+    size_t GetLimit();
+private:
+    size_t page_size;
+};
+
+PosixLockedPageAllocator::PosixLockedPageAllocator()
+{
+    // Determine system page size in bytes
+#if defined(PAGESIZE) // defined in limits.h
+    page_size = PAGESIZE;
+#else                   // assume some POSIX OS
+    page_size = sysconf(_SC_PAGESIZE);
+#endif
+}
+void *PosixLockedPageAllocator::AllocateLocked(size_t len, bool *lockingSuccess)
+{
+    void *addr;
+    len = align_up(len, page_size);
+    addr = mmap(nullptr, len, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0);
+    if (addr) {
+        *lockingSuccess = mlock(addr, len) == 0;
+    }
+    return addr;
+}
+void PosixLockedPageAllocator::FreeLocked(void* addr, size_t len)
+{
+    len = align_up(len, page_size);
+    memory_cleanse(addr, len);
+    munlock(addr, len);
+    munmap(addr, len);
+}
+size_t PosixLockedPageAllocator::GetLimit()
+{
+#ifdef RLIMIT_MEMLOCK
+    struct rlimit rlim;
+    if (getrlimit(RLIMIT_MEMLOCK, &rlim) == 0) {
+        if (rlim.rlim_cur != RLIM_INFINITY) {
+            return rlim.rlim_cur;
+        }
+    }
+#endif
+    return std::numeric_limits<size_t>::max();
+}
+#endif
+
+/*******************************************************************************/
+// Implementation: LockedPool
+
+LockedPool::LockedPool(std::unique_ptr<LockedPageAllocator> allocator_in, LockingFailed_Callback lf_cb_in):
+    allocator(std::move(allocator_in)), lf_cb(lf_cb_in), cumulative_bytes_locked(0)
+{
+}
+
+LockedPool::~LockedPool()
+{
+}
+void* LockedPool::alloc(size_t size)
+{
+    std::lock_guard<std::mutex> lock(mutex);
+    // Try allocating from each current arena
+    for (auto &arena: arenas) {
+        void *addr = arena.alloc(size);
+        if (addr) {
+            return addr;
+        }
+    }
+    // If that fails, create a new one
+    if (new_arena(ARENA_SIZE, ARENA_ALIGN)) {
+        return arenas.back().alloc(size);
+    }
+    return nullptr;
+}
+
+void LockedPool::free(void *ptr)
+{
+    std::lock_guard<std::mutex> lock(mutex);
+    // TODO we can do better than this linear search by keeping a map of arena
+    // extents to arena, and looking up the address.
+    for (auto &arena: arenas) {
+        if (arena.addressInArena(ptr)) {
+            arena.free(ptr);
+            return;
+        }
+    }
+    throw std::runtime_error("LockedPool: invalid address not pointing to any arena");
+}
+
+LockedPool::Stats LockedPool::stats() const
+{
+    std::lock_guard<std::mutex> lock(mutex);
+    LockedPool::Stats r;
+    r.used = r.free = r.total = r.chunks_used = r.chunks_free = 0;
+    r.locked = cumulative_bytes_locked;
+    for (const auto &arena: arenas) {
+        Arena::Stats i = arena.stats();
+        r.used += i.used;
+        r.free += i.free;
+        r.total += i.total;
+        r.chunks_used += i.chunks_used;
+        r.chunks_free += i.chunks_free;
+    }
+    return r;
+}
+
+bool LockedPool::new_arena(size_t size, size_t align)
+{
+    bool locked;
+    // If this is the first arena, handle this specially: Cap the upper size
+    // by the process limit. This makes sure that the first arena will at least
+    // be locked. An exception to this is if the process limit is 0:
+    // in this case no memory can be locked at all so we'll skip past this logic.
+    if (arenas.empty()) {
+        size_t limit = allocator->GetLimit();
+        if (limit > 0) {
+            size = std::min(size, limit);
+        }
+    }
+    void *addr = allocator->AllocateLocked(size, &locked);
+    if (!addr) {
+        return false;
+    }
+    if (locked) {
+        cumulative_bytes_locked += size;
+    } else if (lf_cb) { // Call the locking-failed callback if locking failed
+        if (!lf_cb()) { // If the callback returns false, free the memory and fail, otherwise consider the user warned and proceed.
+            allocator->FreeLocked(addr, size);
+            return false;
+        }
+    }
+    arenas.emplace_back(allocator.get(), addr, size, align);
+    return true;
+}
+
+LockedPool::LockedPageArena::LockedPageArena(LockedPageAllocator *allocator_in, void *base_in, size_t size_in, size_t align_in):
+    Arena(base_in, size_in, align_in), base(base_in), size(size_in), allocator(allocator_in)
+{
+}
+LockedPool::LockedPageArena::~LockedPageArena()
+{
+    allocator->FreeLocked(base, size);
+}
+
+/*******************************************************************************/
+// Implementation: LockedPoolManager
+//
+LockedPoolManager::LockedPoolManager(std::unique_ptr<LockedPageAllocator> allocator):
+    LockedPool(std::move(allocator), &LockedPoolManager::LockingFailed)
+{
+}
+
+bool LockedPoolManager::LockingFailed()
+{
+    // TODO: log something but how? without including util.h
+    return true;
+}
+
+void LockedPoolManager::CreateInstance()
+{
+    // Using a local static instance guarantees that the object is initialized
+    // when it's first needed and also deinitialized after all objects that use
+    // it are done with it.  I can think of one unlikely scenario where we may
+    // have a static deinitialization order/problem, but the check in
+    // LockedPoolManagerBase's destructor helps us detect if that ever happens.
+#ifdef WIN32
+    std::unique_ptr<LockedPageAllocator> allocator(new Win32LockedPageAllocator());
+#else
+    std::unique_ptr<LockedPageAllocator> allocator(new PosixLockedPageAllocator());
+#endif
+    static LockedPoolManager instance(std::move(allocator));
+    LockedPoolManager::_instance = &instance;
+}
diff --git a/src/support/lockedpool.h b/src/support/lockedpool.h
new file mode 100644
index 0000000000000..526c17a73fe76
--- /dev/null
+++ b/src/support/lockedpool.h
@@ -0,0 +1,251 @@
+// Copyright (c) 2016 The Bitcoin Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#ifndef BITCOIN_SUPPORT_LOCKEDPOOL_H
+#define BITCOIN_SUPPORT_LOCKEDPOOL_H
+
+#include <stdint.h>
+#include <list>
+#include <map>
+#include <mutex>
+#include <memory>
+
+/**
+ * OS-dependent allocation and deallocation of locked/pinned memory pages.
+ * Abstract base class.
+ */
+class LockedPageAllocator
+{
+public:
+    virtual ~LockedPageAllocator() {}
+    /** Allocate and lock memory pages.
+     * If len is not a multiple of the system page size, it is rounded up.
+     * Returns 0 in case of allocation failure.
+     *
+     * If locking the memory pages could not be accomplished it will still
+     * return the memory, however the lockingSuccess flag will be false.
+     * lockingSuccess is undefined if the allocation fails.
+     */
+    virtual void* AllocateLocked(size_t len, bool *lockingSuccess) = 0;
+
+    /** Unlock and free memory pages.
+     * Clear the memory before unlocking.
+     */
+    virtual void FreeLocked(void* addr, size_t len) = 0;
+
+    /** Get the total limit on the amount of memory that may be locked by this
+     * process, in bytes. Return size_t max if there is no limit or the limit
+     * is unknown. Return 0 if no memory can be locked at all.
+     */
+    virtual size_t GetLimit() = 0;
+};
+
+/* An arena manages a contiguous region of memory by dividing it into
+ * chunks.
+ */
+class Arena
+{
+public:
+    Arena(void *base, size_t size, size_t alignment);
+    virtual ~Arena();
+
+    /** A chunk of memory.
+     */
+    struct Chunk
+    {
+        /** Most significant bit of size_t. This is used to mark
+         * in-usedness of chunk.
+         */
+        const static size_t SIZE_MSB = 1LLU << ((sizeof(size_t)*8)-1);
+        /** Maximum size of a chunk */
+        const static size_t MAX_SIZE = SIZE_MSB - 1;
+
+        Chunk(size_t size_in, bool used_in):
+            size(size_in | (used_in ? SIZE_MSB : 0)) {}
+
+        bool isInUse() const { return size & SIZE_MSB; }
+        void setInUse(bool used_in) { size = (size & ~SIZE_MSB) | (used_in ? SIZE_MSB : 0); }
+        size_t getSize() const { return size & ~SIZE_MSB; }
+        void setSize(size_t size_in) { size = (size & SIZE_MSB) | size_in; }
+    private:
+        size_t size;
+    };
+    /** Memory statistics. */
+    struct Stats
+    {
+        size_t used;
+        size_t free;
+        size_t total;
+        size_t chunks_used;
+        size_t chunks_free;
+    };
+
+    /** Allocate size bytes from this arena.
+     * Returns pointer on success, or 0 if memory is full or
+     * the application tried to allocate 0 bytes.
+     */
+    void* alloc(size_t size);
+
+    /** Free a previously allocated chunk of memory.
+     * Freeing the zero pointer has no effect.
+     * Raises std::runtime_error in case of error.
+     */
+    void free(void *ptr);
+
+    /** Get arena usage statistics */
+    Stats stats() const;
+
+#ifdef ARENA_DEBUG
+    void walk() const;
+#endif
+
+    /** Return whether a pointer points inside this arena.
+     * This returns base <= ptr < (base+size) so only use it for (inclusive)
+     * chunk starting addresses.
+     */
+    bool addressInArena(void *ptr) const { return ptr >= base && ptr < end; }
+private:
+    Arena(const Arena& other) = delete; // non construction-copyable
+    Arena& operator=(const Arena&) = delete; // non copyable
+
+    /** Map of chunk address to chunk information. This class makes use of the
+     * sorted order to merge previous and next chunks during deallocation.
+     */
+    std::map<char*, Chunk> chunks;
+    /** Base address of arena */
+    char* base;
+    /** End address of arena */
+    char* end;
+    /** Minimum chunk alignment */
+    size_t alignment;
+};
+
+/** Pool for locked memory chunks.
+ *
+ * To avoid sensitive key data from being swapped to disk, the memory in this pool
+ * is locked/pinned.
+ *
+ * An arena manages a contiguous region of memory. The pool starts out with one arena
+ * but can grow to multiple arenas if the need arises.
+ *
+ * Unlike a normal C heap, the administrative structures are seperate from the managed
+ * memory. This has been done as the sizes and bases of objects are not in themselves sensitive
+ * information, as to conserve precious locked memory. In some operating systems
+ * the amount of memory that can be locked is small.
+ */
+class LockedPool
+{
+public:
+    /** Size of one arena of locked memory. This is a compromise.
+     * Do not set this too low, as managing many arenas will increase
+     * allocation and deallocation overhead. Setting it too high allocates
+     * more locked memory from the OS than strictly necessary.
+     */
+    static const size_t ARENA_SIZE = 256*1024;
+    /** Chunk alignment. Another compromise. Setting this too high will waste
+     * memory, setting it too low will facilitate fragmentation.
+     */
+    static const size_t ARENA_ALIGN = 16;
+
+    /** Callback when allocation succeeds but locking fails.
+     */
+    typedef bool (*LockingFailed_Callback)();
+
+    /** Memory statistics. */
+    struct Stats
+    {
+        size_t used;
+        size_t free;
+        size_t total;
+        size_t locked;
+        size_t chunks_used;
+        size_t chunks_free;
+    };
+
+    /** Create a new LockedPool. This takes ownership of the MemoryPageLocker,
+     * you can only instantiate this with LockedPool(std::move(...)).
+     *
+     * The second argument is an optional callback when locking a newly allocated arena failed.
+     * If this callback is provided and returns false, the allocation fails (hard fail), if
+     * it returns true the allocation proceeds, but it could warn.
+     */
+    LockedPool(std::unique_ptr<LockedPageAllocator> allocator, LockingFailed_Callback lf_cb_in = 0);
+    ~LockedPool();
+
+    /** Allocate size bytes from this arena.
+     * Returns pointer on success, or 0 if memory is full or
+     * the application tried to allocate 0 bytes.
+     */
+    void* alloc(size_t size);
+
+    /** Free a previously allocated chunk of memory.
+     * Freeing the zero pointer has no effect.
+     * Raises std::runtime_error in case of error.
+     */
+    void free(void *ptr);
+
+    /** Get pool usage statistics */
+    Stats stats() const;
+private:
+    LockedPool(const LockedPool& other) = delete; // non construction-copyable
+    LockedPool& operator=(const LockedPool&) = delete; // non copyable
+
+    std::unique_ptr<LockedPageAllocator> allocator;
+
+    /** Create an arena from locked pages */
+    class LockedPageArena: public Arena
+    {
+    public:
+        LockedPageArena(LockedPageAllocator *alloc_in, void *base_in, size_t size, size_t align);
+        ~LockedPageArena();
+    private:
+        void *base;
+        size_t size;
+        LockedPageAllocator *allocator;
+    };
+
+    bool new_arena(size_t size, size_t align);
+
+    std::list<LockedPageArena> arenas;
+    LockingFailed_Callback lf_cb;
+    size_t cumulative_bytes_locked;
+    /** Mutex protects access to this pool's data structures, including arenas.
+     */
+    mutable std::mutex mutex;
+};
+
+/**
+ * Singleton class to keep track of locked (ie, non-swappable) memory, for use in
+ * std::allocator templates.
+ *
+ * Some implementations of the STL allocate memory in some constructors (i.e., see
+ * MSVC's vector<T> implementation where it allocates 1 byte of memory in the allocator.)
+ * Due to the unpredictable order of static initializers, we have to make sure the
+ * LockedPoolManager instance exists before any other STL-based objects that use
+ * secure_allocator are created. So instead of having LockedPoolManager also be
+ * static-initialized, it is created on demand.
+ */
+class LockedPoolManager : public LockedPool
+{
+public:
+    /** Return the current instance, or create it once */
+    static LockedPoolManager& Instance()
+    {
+        std::call_once(LockedPoolManager::init_flag, LockedPoolManager::CreateInstance);
+        return *LockedPoolManager::_instance;
+    }
+
+private:
+    LockedPoolManager(std::unique_ptr<LockedPageAllocator> allocator);
+
+    /** Create a new LockedPoolManager specialized to the OS */
+    static void CreateInstance();
+    /** Called when locking fails, warn the user here */
+    static bool LockingFailed();
+
+    static LockedPoolManager* _instance;
+    static std::once_flag init_flag;
+};
+
+#endif // BITCOIN_SUPPORT_LOCKEDPOOL_H
diff --git a/src/support/pagelocker.cpp b/src/support/pagelocker.cpp
deleted file mode 100644
index 7cea2d88c55c6..0000000000000
--- a/src/support/pagelocker.cpp
+++ /dev/null
@@ -1,70 +0,0 @@
-// Copyright (c) 2009-2015 The Bitcoin Core developers
-// Distributed under the MIT software license, see the accompanying
-// file COPYING or http://www.opensource.org/licenses/mit-license.php.
-
-#include "support/pagelocker.h"
-
-#if defined(HAVE_CONFIG_H)
-#include "config/bitcoin-config.h"
-#endif
-
-#ifdef WIN32
-#ifdef _WIN32_WINNT
-#undef _WIN32_WINNT
-#endif
-#define _WIN32_WINNT 0x0501
-#define WIN32_LEAN_AND_MEAN 1
-#ifndef NOMINMAX
-#define NOMINMAX
-#endif
-#include <windows.h>
-// This is used to attempt to keep keying material out of swap
-// Note that VirtualLock does not provide this as a guarantee on Windows,
-// but, in practice, memory that has been VirtualLock'd almost never gets written to
-// the pagefile except in rare circumstances where memory is extremely low.
-#else
-#include <sys/mman.h>
-#include <limits.h> // for PAGESIZE
-#include <unistd.h> // for sysconf
-#endif
-
-LockedPageManager* LockedPageManager::_instance = NULL;
-boost::once_flag LockedPageManager::init_flag = BOOST_ONCE_INIT;
-
-/** Determine system page size in bytes */
-static inline size_t GetSystemPageSize()
-{
-    size_t page_size;
-#if defined(WIN32)
-    SYSTEM_INFO sSysInfo;
-    GetSystemInfo(&sSysInfo);
-    page_size = sSysInfo.dwPageSize;
-#elif defined(PAGESIZE) // defined in limits.h
-    page_size = PAGESIZE;
-#else                   // assume some POSIX OS
-    page_size = sysconf(_SC_PAGESIZE);
-#endif
-    return page_size;
-}
-
-bool MemoryPageLocker::Lock(const void* addr, size_t len)
-{
-#ifdef WIN32
-    return VirtualLock(const_cast<void*>(addr), len) != 0;
-#else
-    return mlock(addr, len) == 0;
-#endif
-}
-
-bool MemoryPageLocker::Unlock(const void* addr, size_t len)
-{
-#ifdef WIN32
-    return VirtualUnlock(const_cast<void*>(addr), len) != 0;
-#else
-    return munlock(addr, len) == 0;
-#endif
-}
-
-LockedPageManager::LockedPageManager() : LockedPageManagerBase<MemoryPageLocker>(GetSystemPageSize())
-{
-}
diff --git a/src/support/pagelocker.h b/src/support/pagelocker.h
deleted file mode 100644
index 042144fad5614..0000000000000
--- a/src/support/pagelocker.h
+++ /dev/null
@@ -1,160 +0,0 @@
-// Copyright (c) 2009-2010 Satoshi Nakamoto
-// Copyright (c) 2009-2015 The Bitcoin Core developers
-// Distributed under the MIT software license, see the accompanying
-// file COPYING or http://www.opensource.org/licenses/mit-license.php.
-
-#ifndef BITCOIN_SUPPORT_PAGELOCKER_H
-#define BITCOIN_SUPPORT_PAGELOCKER_H
-
-#include "support/cleanse.h"
-
-#include <map>
-
-#include <boost/thread/mutex.hpp>
-#include <boost/thread/once.hpp>
-
-/**
- * Thread-safe class to keep track of locked (ie, non-swappable) memory pages.
- *
- * Memory locks do not stack, that is, pages which have been locked several times by calls to mlock()
- * will be unlocked by a single call to munlock(). This can result in keying material ending up in swap when
- * those functions are used naively. This class simulates stacking memory locks by keeping a counter per page.
- *
- * @note By using a map from each page base address to lock count, this class is optimized for
- * small objects that span up to a few pages, mostly smaller than a page. To support large allocations,
- * something like an interval tree would be the preferred data structure.
- */
-template <class Locker>
-class LockedPageManagerBase
-{
-public:
-    LockedPageManagerBase(size_t _page_size) : page_size(_page_size)
-    {
-        // Determine bitmask for extracting page from address
-        assert(!(_page_size & (_page_size - 1))); // size must be power of two
-        page_mask = ~(_page_size - 1);
-    }
-
-    ~LockedPageManagerBase()
-    {
-    }
-
-
-    // For all pages in affected range, increase lock count
-    void LockRange(void* p, size_t size)
-    {
-        boost::mutex::scoped_lock lock(mutex);
-        if (!size)
-            return;
-        const size_t base_addr = reinterpret_cast<size_t>(p);
-        const size_t start_page = base_addr & page_mask;
-        const size_t end_page = (base_addr + size - 1) & page_mask;
-        for (size_t page = start_page; page <= end_page; page += page_size) {
-            Histogram::iterator it = histogram.find(page);
-            if (it == histogram.end()) // Newly locked page
-            {
-                locker.Lock(reinterpret_cast<void*>(page), page_size);
-                histogram.insert(std::make_pair(page, 1));
-            } else // Page was already locked; increase counter
-            {
-                it->second += 1;
-            }
-        }
-    }
-
-    // For all pages in affected range, decrease lock count
-    void UnlockRange(void* p, size_t size)
-    {
-        boost::mutex::scoped_lock lock(mutex);
-        if (!size)
-            return;
-        const size_t base_addr = reinterpret_cast<size_t>(p);
-        const size_t start_page = base_addr & page_mask;
-        const size_t end_page = (base_addr + size - 1) & page_mask;
-        for (size_t page = start_page; page <= end_page; page += page_size) {
-            Histogram::iterator it = histogram.find(page);
-            assert(it != histogram.end()); // Cannot unlock an area that was not locked
-            // Decrease counter for page, when it is zero, the page will be unlocked
-            it->second -= 1;
-            if (it->second == 0) // Nothing on the page anymore that keeps it locked
-            {
-                // Unlock page and remove the count from histogram
-                locker.Unlock(reinterpret_cast<void*>(page), page_size);
-                histogram.erase(it);
-            }
-        }
-    }
-
-    // Get number of locked pages for diagnostics
-    int GetLockedPageCount()
-    {
-        boost::mutex::scoped_lock lock(mutex);
-        return histogram.size();
-    }
-
-private:
-    Locker locker;
-    boost::mutex mutex;
-    size_t page_size, page_mask;
-    // map of page base address to lock count
-    typedef std::map<size_t, int> Histogram;
-    Histogram histogram;
-};
-
-
-/**
- * OS-dependent memory page locking/unlocking.
- * Defined as policy class to make stubbing for test possible.
- */
-class MemoryPageLocker
-{
-public:
-    /** Lock memory pages.
-     * addr and len must be a multiple of the system page size
-     */
-    bool Lock(const void* addr, size_t len);
-    /** Unlock memory pages.
-     * addr and len must be a multiple of the system page size
-     */
-    bool Unlock(const void* addr, size_t len);
-};
-
-/**
- * Singleton class to keep track of locked (ie, non-swappable) memory pages, for use in
- * std::allocator templates.
- *
- * Some implementations of the STL allocate memory in some constructors (i.e., see
- * MSVC's vector<T> implementation where it allocates 1 byte of memory in the allocator.)
- * Due to the unpredictable order of static initializers, we have to make sure the
- * LockedPageManager instance exists before any other STL-based objects that use
- * secure_allocator are created. So instead of having LockedPageManager also be
- * static-initialized, it is created on demand.
- */
-class LockedPageManager : public LockedPageManagerBase<MemoryPageLocker>
-{
-public:
-    static LockedPageManager& Instance()
-    {
-        boost::call_once(LockedPageManager::CreateInstance, LockedPageManager::init_flag);
-        return *LockedPageManager::_instance;
-    }
-
-private:
-    LockedPageManager();
-
-    static void CreateInstance()
-    {
-        // Using a local static instance guarantees that the object is initialized
-        // when it's first needed and also deinitialized after all objects that use
-        // it are done with it.  I can think of one unlikely scenario where we may
-        // have a static deinitialization order/problem, but the check in
-        // LockedPageManagerBase's destructor helps us detect if that ever happens.
-        static LockedPageManager instance;
-        LockedPageManager::_instance = &instance;
-    }
-
-    static LockedPageManager* _instance;
-    static boost::once_flag init_flag;
-};
-
-#endif // BITCOIN_SUPPORT_PAGELOCKER_H
diff --git a/src/test/allocator_tests.cpp b/src/test/allocator_tests.cpp
index 613f6c12d76f8..f0e848655f205 100644
--- a/src/test/allocator_tests.cpp
+++ b/src/test/allocator_tests.cpp
@@ -11,110 +11,214 @@
 
 BOOST_FIXTURE_TEST_SUITE(allocator_tests, BasicTestingSetup)
 
-// Dummy memory page locker for platform independent tests
-static const void *last_lock_addr, *last_unlock_addr;
-static size_t last_lock_len, last_unlock_len;
-class TestLocker
+BOOST_AUTO_TEST_CASE(arena_tests)
 {
-public:
-    bool Lock(const void *addr, size_t len)
+    // Fake memory base address for testing
+    // without actually using memory.
+    void *synth_base = reinterpret_cast<void*>(0x08000000);
+    const size_t synth_size = 1024*1024;
+    Arena b(synth_base, synth_size, 16);
+    void *chunk = b.alloc(1000);
+#ifdef ARENA_DEBUG
+    b.walk();
+#endif
+    BOOST_CHECK(chunk != nullptr);
+    BOOST_CHECK(b.stats().used == 1008); // Aligned to 16
+    BOOST_CHECK(b.stats().total == synth_size); // Nothing has disappeared?
+    b.free(chunk);
+#ifdef ARENA_DEBUG
+    b.walk();
+#endif
+    BOOST_CHECK(b.stats().used == 0);
+    BOOST_CHECK(b.stats().free == synth_size);
+    try { // Test exception on double-free
+        b.free(chunk);
+        BOOST_CHECK(0);
+    } catch(std::runtime_error &)
     {
-        last_lock_addr = addr;
-        last_lock_len = len;
-        return true;
     }
-    bool Unlock(const void *addr, size_t len)
-    {
-        last_unlock_addr = addr;
-        last_unlock_len = len;
-        return true;
+
+    void *a0 = b.alloc(128);
+    BOOST_CHECK(a0 == synth_base); // first allocation must start at beginning
+    void *a1 = b.alloc(256);
+    void *a2 = b.alloc(512);
+    BOOST_CHECK(b.stats().used == 896);
+    BOOST_CHECK(b.stats().total == synth_size);
+#ifdef ARENA_DEBUG
+    b.walk();
+#endif
+    b.free(a0);
+#ifdef ARENA_DEBUG
+    b.walk();
+#endif
+    BOOST_CHECK(b.stats().used == 768);
+    b.free(a1);
+    BOOST_CHECK(b.stats().used == 512);
+    void *a3 = b.alloc(128);
+#ifdef ARENA_DEBUG
+    b.walk();
+#endif
+    BOOST_CHECK(b.stats().used == 640);
+    b.free(a2);
+    BOOST_CHECK(b.stats().used == 128);
+    b.free(a3);
+    BOOST_CHECK(b.stats().used == 0);
+    BOOST_CHECK(b.stats().total == synth_size);
+    BOOST_CHECK(b.stats().free == synth_size);
+
+    std::vector<void*> addr;
+    BOOST_CHECK(b.alloc(0) == nullptr); // allocating 0 always returns nullptr
+#ifdef ARENA_DEBUG
+    b.walk();
+#endif
+    // Sweeping allocate all memory
+    for (int x=0; x<1024; ++x)
+        addr.push_back(b.alloc(1024));
+    BOOST_CHECK(addr[0] == synth_base); // first allocation must start at beginning
+    BOOST_CHECK(b.stats().free == 0);
+    BOOST_CHECK(b.alloc(1024) == nullptr); // memory is full, this must return nullptr
+    BOOST_CHECK(b.alloc(0) == nullptr);
+    for (int x=0; x<1024; ++x)
+        b.free(addr[x]);
+    addr.clear();
+    BOOST_CHECK(b.stats().total == synth_size);
+    BOOST_CHECK(b.stats().free == synth_size);
+
+    // Now in the other direction...
+    for (int x=0; x<1024; ++x)
+        addr.push_back(b.alloc(1024));
+    for (int x=0; x<1024; ++x)
+        b.free(addr[1023-x]);
+    addr.clear();
+
+    // Now allocate in smaller unequal chunks, then deallocate haphazardly
+    // Not all the chunks will succeed allocating, but freeing nullptr is
+    // allowed so that is no problem.
+    for (int x=0; x<2048; ++x)
+        addr.push_back(b.alloc(x+1));
+    for (int x=0; x<2048; ++x)
+        b.free(addr[((x*23)%2048)^242]);
+    addr.clear();
+
+    // Go entirely wild: free and alloc interleaved,
+    // generate targets and sizes using pseudo-randomness.
+    for (int x=0; x<2048; ++x)
+        addr.push_back(0);
+    uint32_t s = 0x12345678;
+    for (int x=0; x<5000; ++x) {
+        int idx = s & (addr.size()-1);
+        if (s & 0x80000000) {
+            b.free(addr[idx]);
+            addr[idx] = 0;
+        } else if(!addr[idx]) {
+            addr[idx] = b.alloc((s >> 16) & 2047);
+        }
+        bool lsb = s & 1;
+        s >>= 1;
+        if (lsb)
+            s ^= 0xf00f00f0; // LFSR period 0xf7ffffe0
     }
-};
+    for (void *ptr: addr)
+        b.free(ptr);
+    addr.clear();
 
-BOOST_AUTO_TEST_CASE(test_LockedPageManagerBase)
+    BOOST_CHECK(b.stats().total == synth_size);
+    BOOST_CHECK(b.stats().free == synth_size);
+}
+
+/** Mock LockedPageAllocator for testing */
+class TestLockedPageAllocator: public LockedPageAllocator
 {
-    const size_t test_page_size = 4096;
-    LockedPageManagerBase<TestLocker> lpm(test_page_size);
-    size_t addr;
-    last_lock_addr = last_unlock_addr = 0;
-    last_lock_len = last_unlock_len = 0;
-
-    /* Try large number of small objects */
-    addr = 0;
-    for(int i=0; i<1000; ++i)
-    {
-        lpm.LockRange(reinterpret_cast<void*>(addr), 33);
-        addr += 33;
-    }
-    /* Try small number of page-sized objects, straddling two pages */
-    addr = test_page_size*100 + 53;
-    for(int i=0; i<100; ++i)
-    {
-        lpm.LockRange(reinterpret_cast<void*>(addr), test_page_size);
-        addr += test_page_size;
-    }
-    /* Try small number of page-sized objects aligned to exactly one page */
-    addr = test_page_size*300;
-    for(int i=0; i<100; ++i)
-    {
-        lpm.LockRange(reinterpret_cast<void*>(addr), test_page_size);
-        addr += test_page_size;
-    }
-    /* one very large object, straddling pages */
-    lpm.LockRange(reinterpret_cast<void*>(test_page_size*600+1), test_page_size*500);
-    BOOST_CHECK(last_lock_addr == reinterpret_cast<void*>(test_page_size*(600+500)));
-    /* one very large object, page aligned */
-    lpm.LockRange(reinterpret_cast<void*>(test_page_size*1200), test_page_size*500-1);
-    BOOST_CHECK(last_lock_addr == reinterpret_cast<void*>(test_page_size*(1200+500-1)));
-
-    BOOST_CHECK(lpm.GetLockedPageCount() == (
-        (1000*33+test_page_size-1)/test_page_size + // small objects
-        101 + 100 +  // page-sized objects
-        501 + 500)); // large objects
-    BOOST_CHECK((last_lock_len & (test_page_size-1)) == 0); // always lock entire pages
-    BOOST_CHECK(last_unlock_len == 0); // nothing unlocked yet
-
-    /* And unlock again */
-    addr = 0;
-    for(int i=0; i<1000; ++i)
+public:
+    TestLockedPageAllocator(int count_in, int lockedcount_in): count(count_in), lockedcount(lockedcount_in) {}
+    void* AllocateLocked(size_t len, bool *lockingSuccess)
     {
-        lpm.UnlockRange(reinterpret_cast<void*>(addr), 33);
-        addr += 33;
+        *lockingSuccess = false;
+        if (count > 0) {
+            --count;
+
+            if (lockedcount > 0) {
+                --lockedcount;
+                *lockingSuccess = true;
+            }
+
+            return reinterpret_cast<void*>(0x08000000 + (count<<24)); // Fake address, do not actually use this memory
+        }
+        return 0;
     }
-    addr = test_page_size*100 + 53;
-    for(int i=0; i<100; ++i)
+    void FreeLocked(void* addr, size_t len)
     {
-        lpm.UnlockRange(reinterpret_cast<void*>(addr), test_page_size);
-        addr += test_page_size;
     }
-    addr = test_page_size*300;
-    for(int i=0; i<100; ++i)
+    size_t GetLimit()
     {
-        lpm.UnlockRange(reinterpret_cast<void*>(addr), test_page_size);
-        addr += test_page_size;
+        return std::numeric_limits<size_t>::max();
     }
-    lpm.UnlockRange(reinterpret_cast<void*>(test_page_size*600+1), test_page_size*500);
-    lpm.UnlockRange(reinterpret_cast<void*>(test_page_size*1200), test_page_size*500-1);
+private:
+    int count;
+    int lockedcount;
+};
 
-    /* Check that everything is released */
-    BOOST_CHECK(lpm.GetLockedPageCount() == 0);
+BOOST_AUTO_TEST_CASE(lockedpool_tests_mock)
+{
+    // Test over three virtual arenas, of which one will succeed being locked
+    std::unique_ptr<LockedPageAllocator> x(new TestLockedPageAllocator(3, 1));
+    LockedPool pool(std::move(x));
+    BOOST_CHECK(pool.stats().total == 0);
+    BOOST_CHECK(pool.stats().locked == 0);
 
-    /* A few and unlocks of size zero (should have no effect) */
-    addr = 0;
-    for(int i=0; i<1000; ++i)
-    {
-        lpm.LockRange(reinterpret_cast<void*>(addr), 0);
-        addr += 1;
-    }
-    BOOST_CHECK(lpm.GetLockedPageCount() == 0);
-    addr = 0;
-    for(int i=0; i<1000; ++i)
+    void *a0 = pool.alloc(LockedPool::ARENA_SIZE / 2);
+    BOOST_CHECK(a0);
+    BOOST_CHECK(pool.stats().locked == LockedPool::ARENA_SIZE);
+    void *a1 = pool.alloc(LockedPool::ARENA_SIZE / 2);
+    BOOST_CHECK(a1);
+    void *a2 = pool.alloc(LockedPool::ARENA_SIZE / 2);
+    BOOST_CHECK(a2);
+    void *a3 = pool.alloc(LockedPool::ARENA_SIZE / 2);
+    BOOST_CHECK(a3);
+    void *a4 = pool.alloc(LockedPool::ARENA_SIZE / 2);
+    BOOST_CHECK(a4);
+    void *a5 = pool.alloc(LockedPool::ARENA_SIZE / 2);
+    BOOST_CHECK(a5);
+    // We've passed a count of three arenas, so this allocation should fail
+    void *a6 = pool.alloc(16);
+    BOOST_CHECK(!a6);
+
+    pool.free(a0);
+    pool.free(a2);
+    pool.free(a4);
+    pool.free(a1);
+    pool.free(a3);
+    pool.free(a5);
+    BOOST_CHECK(pool.stats().total == 3*LockedPool::ARENA_SIZE);
+    BOOST_CHECK(pool.stats().locked == LockedPool::ARENA_SIZE);
+    BOOST_CHECK(pool.stats().used == 0);
+}
+
+// These tests used the live LockedPoolManager object, this is also used
+// by other tests so the conditions are somewhat less controllable and thus the
+// tests are somewhat more error-prone.
+BOOST_AUTO_TEST_CASE(lockedpool_tests_live)
+{
+    LockedPoolManager &pool = LockedPoolManager::Instance();
+    LockedPool::Stats initial = pool.stats();
+
+    void *a0 = pool.alloc(16);
+    BOOST_CHECK(a0);
+    // Test reading and writing the allocated memory
+    *((uint32_t*)a0) = 0x1234;
+    BOOST_CHECK(*((uint32_t*)a0) == 0x1234);
+
+    pool.free(a0);
+    try { // Test exception on double-free
+        pool.free(a0);
+        BOOST_CHECK(0);
+    } catch(std::runtime_error &)
     {
-        lpm.UnlockRange(reinterpret_cast<void*>(addr), 0);
-        addr += 1;
     }
-    BOOST_CHECK(lpm.GetLockedPageCount() == 0);
-    BOOST_CHECK((last_unlock_len & (test_page_size-1)) == 0); // always unlock entire pages
+    // If more than one new arena was allocated for the above tests, something is wrong
+    BOOST_CHECK(pool.stats().total <= (initial.total + LockedPool::ARENA_SIZE));
+    // Usage must be back to where it started
+    BOOST_CHECK(pool.stats().used == initial.used);
 }
 
 BOOST_AUTO_TEST_SUITE_END()

From 65679990967c0fa4fc0320907d9cd33c801faf5a Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Sun, 18 Sep 2016 10:22:30 +0200
Subject: [PATCH 1094/1802] rpc: Add `getmemoryinfo` call

```
getmemoryinfo
Returns an object containing information about memory usage.

Result:
{
  "locked": {               (json object) Information about locked memory manager
    "used": xxxxx,          (numeric) Number of bytes used
    "free": xxxxx,          (numeric) Number of bytes available in current arenas
    "total": xxxxxxx,       (numeric) Total number of bytes managed
    "locked": xxxxxx,       (numeric) Amount of bytes that succeeded locking. If this number is smaller than total, locking pages failed at some point and key data could be swapped to disk.
  }
}

Examples:
> bitcoin-cli getmemoryinfo
> curl --user myusername --data-binary '{"jsonrpc": "1.0", "id":"curltest", "method": "getmemoryinfo", "params": [] }' -H 'content-type: text/plain;' http://127.0.0.1:8332/
```
---
 src/rpc/misc.cpp | 43 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)

diff --git a/src/rpc/misc.cpp b/src/rpc/misc.cpp
index eaef4856b3c5e..30db06dd321b5 100644
--- a/src/rpc/misc.cpp
+++ b/src/rpc/misc.cpp
@@ -450,10 +450,53 @@ UniValue setmocktime(const JSONRPCRequest& request)
     return NullUniValue;
 }
 
+static UniValue RPCLockedMemoryInfo()
+{
+    LockedPool::Stats stats = LockedPoolManager::Instance().stats();
+    UniValue obj(UniValue::VOBJ);
+    obj.push_back(Pair("used", uint64_t(stats.used)));
+    obj.push_back(Pair("free", uint64_t(stats.free)));
+    obj.push_back(Pair("total", uint64_t(stats.total)));
+    obj.push_back(Pair("locked", uint64_t(stats.locked)));
+    obj.push_back(Pair("chunks_used", uint64_t(stats.chunks_used)));
+    obj.push_back(Pair("chunks_free", uint64_t(stats.chunks_free)));
+    return obj;
+}
+
+UniValue getmemoryinfo(const JSONRPCRequest& request)
+{
+    /* Please, avoid using the word "pool" here in the RPC interface or help,
+     * as users will undoubtedly confuse it with the other "memory pool"
+     */
+    if (request.fHelp || request.params.size() != 0)
+        throw runtime_error(
+            "getmemoryinfo\n"
+            "Returns an object containing information about memory usage.\n"
+            "\nResult:\n"
+            "{\n"
+            "  \"locked\": {               (json object) Information about locked memory manager\n"
+            "    \"used\": xxxxx,          (numeric) Number of bytes used\n"
+            "    \"free\": xxxxx,          (numeric) Number of bytes available in current arenas\n"
+            "    \"total\": xxxxxxx,       (numeric) Total number of bytes managed\n"
+            "    \"locked\": xxxxxx,       (numeric) Amount of bytes that succeeded locking. If this number is smaller than total, locking pages failed at some point and key data could be swapped to disk.\n"
+            "    \"chunks_used\": xxxxx,   (numeric) Number allocated chunks\n"
+            "    \"chunks_free\": xxxxx,   (numeric) Number unused chunks\n"
+            "  }\n"
+            "}\n"
+            "\nExamples:\n"
+            + HelpExampleCli("getmemoryinfo", "")
+            + HelpExampleRpc("getmemoryinfo", "")
+        );
+    UniValue obj(UniValue::VOBJ);
+    obj.push_back(Pair("locked", RPCLockedMemoryInfo()));
+    return obj;
+}
+
 static const CRPCCommand commands[] =
 { //  category              name                      actor (function)         okSafeMode
   //  --------------------- ------------------------  -----------------------  ----------
     { "control",            "getinfo",                &getinfo,                true  }, /* uses wallet if enabled */
+    { "control",            "getmemoryinfo",          &getmemoryinfo,          true  },
     { "util",               "validateaddress",        &validateaddress,        true  }, /* uses wallet if enabled */
     { "util",               "createmultisig",         &createmultisig,         true  },
     { "util",               "verifymessage",          &verifymessage,          true  },

From 444c673d85ba0787b2c2ff1ab0f3814ce02622a5 Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Tue, 18 Oct 2016 17:49:02 +0200
Subject: [PATCH 1095/1802] bench: Add benchmark for lockedpool
 allocation/deallocation

---
 src/Makefile.bench.include |  3 ++-
 src/bench/lockedpool.cpp   | 47 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 49 insertions(+), 1 deletion(-)
 create mode 100644 src/bench/lockedpool.cpp

diff --git a/src/Makefile.bench.include b/src/Makefile.bench.include
index c83432e91a600..9760ad089c93c 100644
--- a/src/Makefile.bench.include
+++ b/src/Makefile.bench.include
@@ -17,7 +17,8 @@ bench_bench_bitcoin_SOURCES = \
   bench/ccoins_caching.cpp \
   bench/mempool_eviction.cpp \
   bench/verify_script.cpp \
-  bench/base58.cpp
+  bench/base58.cpp \
+  bench/lockedpool.cpp
 
 bench_bench_bitcoin_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(EVENT_CLFAGS) $(EVENT_PTHREADS_CFLAGS) -I$(builddir)/bench/
 bench_bench_bitcoin_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
diff --git a/src/bench/lockedpool.cpp b/src/bench/lockedpool.cpp
new file mode 100644
index 0000000000000..5df5b1ac6e640
--- /dev/null
+++ b/src/bench/lockedpool.cpp
@@ -0,0 +1,47 @@
+// Copyright (c) 2016 The Bitcoin Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#include "bench.h"
+
+#include "support/lockedpool.h"
+
+#include <iostream>
+#include <vector>
+
+#define ASIZE 2048
+#define BITER 5000
+#define MSIZE 2048
+
+static void LockedPool(benchmark::State& state)
+{
+    void *synth_base = reinterpret_cast<void*>(0x08000000);
+    const size_t synth_size = 1024*1024;
+    Arena b(synth_base, synth_size, 16);
+
+    std::vector<void*> addr;
+    for (int x=0; x<ASIZE; ++x)
+        addr.push_back(0);
+    uint32_t s = 0x12345678;
+    while (state.KeepRunning()) {
+        for (int x=0; x<BITER; ++x) {
+            int idx = s & (addr.size()-1);
+            if (s & 0x80000000) {
+                b.free(addr[idx]);
+                addr[idx] = 0;
+            } else if(!addr[idx]) {
+                addr[idx] = b.alloc((s >> 16) & (MSIZE-1));
+            }
+            bool lsb = s & 1;
+            s >>= 1;
+            if (lsb)
+                s ^= 0xf00f00f0; // LFSR period 0xf7ffffe0
+        }
+    }
+    for (void *ptr: addr)
+        b.free(ptr);
+    addr.clear();
+}
+
+BENCHMARK(LockedPool);
+

From ba26d415c0d557d59e920547a54b17928e71522a Mon Sep 17 00:00:00 2001
From: Michael Ford <fanquake@gmail.com>
Date: Wed, 26 Oct 2016 18:04:27 +0800
Subject: [PATCH 1096/1802] Update build notes for dropping osx 10.7 support

Github-Pull: #9022
Rebased-From: 1d1246314f761b3f84c869cb7b0af49cc25b55b3
---
 doc/build-osx.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/build-osx.md b/doc/build-osx.md
index bc90a305622d5..63a7ee28ca931 100644
--- a/doc/build-osx.md
+++ b/doc/build-osx.md
@@ -90,6 +90,6 @@ Uncheck everything except Qt Creator during the installation process.
 Notes
 -----
 
-* Tested on OS X 10.7 through 10.11 on 64-bit Intel processors only.
+* Tested on OS X 10.8 through 10.12 on 64-bit Intel processors only.
 
 * Building with downloaded Qt binaries is not officially supported. See the notes in [#7714](https://github.com/bitcoin/bitcoin/issues/7714)

From a49b4a75a1b671492e65eed17d6894d85ea5ebfd Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Thu, 27 Oct 2016 14:57:28 +0200
Subject: [PATCH 1097/1802] doc: Add release notes for 0.13.1 release

---
 doc/release-notes/release-notes-0.13.1.md | 410 ++++++++++++++++++++++
 1 file changed, 410 insertions(+)
 create mode 100644 doc/release-notes/release-notes-0.13.1.md

diff --git a/doc/release-notes/release-notes-0.13.1.md b/doc/release-notes/release-notes-0.13.1.md
new file mode 100644
index 0000000000000..75c2d61be8d3c
--- /dev/null
+++ b/doc/release-notes/release-notes-0.13.1.md
@@ -0,0 +1,410 @@
+Bitcoin Core version 0.13.1 is now available from:
+
+  <https://bitcoin.org/bin/bitcoin-core-0.13.1/>
+
+This is a new minor version release, including activation parameters for the
+segwit softfork, various bugfixes and performance improvements, as well as
+updated translations.
+
+Please report bugs using the issue tracker at github:
+
+  <https://github.com/bitcoin/bitcoin/issues>
+
+To receive security and update notifications, please subscribe to:
+
+  <https://bitcoincore.org/en/list/announcements/join/>
+
+Compatibility
+==============
+
+Microsoft ended support for Windows XP on [April 8th, 2014](https://www.microsoft.com/en-us/WindowsForBusiness/end-of-xp-support),
+an OS initially released in 2001. This means that not even critical security
+updates will be released anymore. Without security updates, using a bitcoin
+wallet on a XP machine is irresponsible at least.
+
+In addition to that, with 0.12.x there have been varied reports of Bitcoin Core
+randomly crashing on Windows XP. It is [not clear](https://github.com/bitcoin/bitcoin/issues/7681#issuecomment-217439891)
+what the source of these crashes is, but it is likely that upstream
+libraries such as Qt are no longer being tested on XP.
+
+We do not have time nor resources to provide support for an OS that is
+end-of-life. From 0.13.0 on, Windows XP is no longer supported. Users are
+suggested to upgrade to a newer version of Windows, or install an alternative OS
+that is supported.
+
+No attempt is made to prevent installing or running the software on Windows XP,
+you can still do so at your own risk, but do not expect it to work: do not
+report issues about Windows XP to the issue tracker.
+
+From 0.13.1 onwards OS X 10.7 is no longer supported. 0.13.0 was intended to work on 10.7+, 
+but severe issues with the libc++ version on 10.7.x keep it from running reliably. 
+0.13.1 now requires 10.8+, and will communicate that to 10.7 users, rather than crashing unexpectedly.
+
+Notable changes
+===============
+
+Segregated witness soft fork
+----------------------------
+
+Segregated witness (segwit) is a soft fork that, if activated, will
+allow transaction-producing software to separate (segregate) transaction
+signatures (witnesses) from the part of the data in a transaction that is
+covered by the txid. This provides several immediate benefits:
+
+- **Elimination of unwanted transaction malleability:** Segregating the witness
+  allows both existing and upgraded software to calculate the transaction
+  identifier (txid) of transactions without referencing the witness, which can
+  sometimes be changed by third-parties (such as miners) or by co-signers in a
+  multisig spend. This solves all known cases of unwanted transaction
+  malleability, which is a problem that makes programming Bitcoin wallet
+  software more difficult and which seriously complicates the design of smart
+  contracts for Bitcoin.
+
+- **Capacity increase:** Segwit transactions contain new fields that are not
+  part of the data currently used to calculate the size of a block, which
+  allows a block containing segwit transactions to hold more data than allowed
+  by the current maximum block size. Estimates based on the transactions
+  currently found in blocks indicate that if all wallets switch to using
+  segwit, the network will be able to support about 70% more transactions. The
+  network will also be able to support more of the advanced-style payments
+  (such as multisig) than it can support now because of the different weighting
+  given to different parts of a transaction after segwit activates (see the
+  following section for details).
+
+- **Weighting data based on how it affects node performance:** Some parts of
+  each Bitcoin block need to be stored by nodes in order to validate future
+  blocks; other parts of a block can be immediately forgotten (pruned) or used
+  only for helping other nodes sync their copy of the block chain.  One large
+  part of the immediately prunable data are transaction signatures (witnesses),
+  and segwit makes it possible to give a different "weight" to segregated
+  witnesses to correspond with the lower demands they place on node resources.
+  Specifically, each byte of a segregated witness is given a weight of 1, each
+  other byte in a block is given a weight of 4, and the maximum allowed weight
+  of a block is 4 million.  Weighting the data this way better aligns the most
+  profitable strategy for creating blocks with the long-term costs of block
+  validation.
+
+- **Signature covers value:** A simple improvement in the way signatures are
+  generated in segwit simplifies the design of secure signature generators
+  (such as hardware wallets), reduces the amount of data the signature
+  generator needs to download, and allows the signature generator to operate
+  more quickly.  This is made possible by having the generator sign the amount
+  of bitcoins they think they are spending, and by having full nodes refuse to
+  accept those signatures unless the amount of bitcoins being spent is exactly
+  the same as was signed.  For non-segwit transactions, wallets instead had to
+  download the complete previous transactions being spent for every payment
+  they made, which could be a slow operation on hardware wallets and in other
+  situations where bandwidth or computation speed was constrained.
+
+- **Linear scaling of sighash operations:** In 2015 a block was produced that
+  required about 25 seconds to validate on modern hardware because of the way
+  transaction signature hashes are performed.  Other similar blocks, or blocks
+  that could take even longer to validate, can still be produced today.  The
+  problem that caused this can't be fixed in a soft fork without unwanted
+  side-effects, but transactions that opt-in to using segwit will now use a
+  different signature method that doesn't suffer from this problem and doesn't
+  have any unwanted side-effects.
+
+- **Increased security for multisig:** Bitcoin addresses (both P2PKH addresses
+  that start with a '1' and P2SH addresses that start with a '3') use a hash
+  function known as RIPEMD-160.  For P2PKH addresses, this provides about 160
+  bits of security---which is beyond what cryptographers believe can be broken
+  today.  But because P2SH is more flexible, only about 80 bits of security is
+  provided per address. Although 80 bits is very strong security, it is within
+  the realm of possibility that it can be broken by a powerful adversary.
+  Segwit allows advanced transactions to use the SHA256 hash function instead,
+  which provides about 128 bits of security  (that is 281 trillion times as
+  much security as 80 bits and is equivalent to the maximum bits of security
+  believed to be provided by Bitcoin's choice of parameters for its Elliptic
+  Curve Digital Security Algorithm [ECDSA].)
+
+- **More efficient almost-full-node security** Satoshi Nakamoto's original
+  Bitcoin paper describes a method for allowing newly-started full nodes to
+  skip downloading and validating some data from historic blocks that are
+  protected by large amounts of proof of work.  Unfortunately, Nakamoto's
+  method can't guarantee that a newly-started node using this method will
+  produce an accurate copy of Bitcoin's current ledger (called the UTXO set),
+  making the node vulnerable to falling out of consensus with other nodes.
+  Although the problems with Nakamoto's method can't be fixed in a soft fork,
+  Segwit accomplishes something similar to his original proposal: it makes it
+  possible for a node to optionally skip downloading some blockchain data
+  (specifically, the segregated witnesses) while still ensuring that the node
+  can build an accurate copy of the UTXO set for the block chain with the most
+  proof of work.  Segwit enables this capability at the consensus layer, but
+  note that Bitcoin Core does not provide an option to use this capability as
+  of this 0.13.1 release.
+
+- **Script versioning:** Segwit makes it easy for future soft forks to allow
+  Bitcoin users to individually opt-in to almost any change in the Bitcoin
+  Script language when those users receive new transactions.  Features
+  currently being researched by Bitcoin Core contributors that may use this
+  capability include support for Schnorr signatures, which can improve the
+  privacy and efficiency of multisig transactions (or transactions with
+  multiple inputs), and Merklized Abstract Syntax Trees (MAST), which can
+  improve the privacy and efficiency of scripts with two or more conditions.
+  Other Bitcoin community members are studying several other improvements
+  that can be made using script versioning.
+
+Activation for the segwit soft fork is being managed using BIP9
+versionbits.  Segwit's version bit is bit 1, and nodes will begin
+tracking which blocks signal support for segwit at the beginning of the
+first retarget period after segwit's start date of 15 November 2016.  If
+95% of blocks within a 2,016-block retarget period (about two weeks)
+signal support for segwit, the soft fork will be locked in.  After
+another 2,016 blocks, segwit will activate.
+
+For more information about segwit, please see the [segwit FAQ][], the
+[segwit wallet developers guide][] or BIPs [141][BIP141], [143][BIP143],
+[144][BIP144], and [145][BIP145].  If you're a miner or mining pool
+operator, please see the [versionbits FAQ][] for information about
+signaling support for a soft fork.
+
+[Segwit FAQ]: https://bitcoincore.org/en/2016/01/26/segwit-benefits/
+[segwit wallet developers guide]: https://bitcoincore.org/en/segwit_wallet_dev/
+[BIP141]: https://github.com/bitcoin/bips/blob/master/bip-0141.mediawiki
+[BIP143]: https://github.com/bitcoin/bips/blob/master/bip-0143.mediawiki
+[BIP144]: https://github.com/bitcoin/bips/blob/master/bip-0144.mediawiki
+[BIP145]: https://github.com/bitcoin/bips/blob/master/bip-0145.mediawiki
+[versionbits FAQ]: https://bitcoincore.org/en/2016/06/08/version-bits-miners-faq/
+
+
+Null dummy soft fork
+-------------------
+
+Combined with the segwit soft fork is an additional change that turns a
+long-existing network relay policy into a consensus rule. The
+`OP_CHECKMULTISIG` and `OP_CHECKMULTISIGVERIFY` opcodes consume an extra
+stack element ("dummy element") after signature validation. The dummy
+element is not inspected in any manner, and could be replaced by any
+value without invalidating the script.
+
+Because any value can be used for this dummy element, it's possible for
+a third-party to insert data into other people's transactions, changing
+the transaction's txid (called transaction malleability) and possibly
+causing other problems.
+
+Since Bitcoin Core 0.10.0, nodes have defaulted to only relaying and
+mining transactions whose dummy element was a null value (0x00, also
+called OP_0).  The null dummy soft fork turns this relay rule into a
+consensus rule both for non-segwit transactions and segwit transactions,
+so that this method of mutating transactions is permanently eliminated
+from the network.
+
+Signaling for the null dummy soft fork is done by signaling support
+for segwit, and the null dummy soft fork will activate at the same time
+as segwit.
+
+For more information, please see [BIP147][].
+
+[BIP147]: https://github.com/bitcoin/bips/blob/master/bip-0147.mediawiki
+
+Low-level RPC changes
+---------------------
+
+- `importprunedfunds` only accepts two required arguments. Some versions accept
+  an optional third arg, which was always ignored. Make sure to never pass more
+  than two arguments.
+
+
+Linux ARM builds
+----------------
+
+With the 0.13.0 release, pre-built Linux ARM binaries were added to the set of
+uploaded executables. Additional detail on the ARM architecture targeted by each
+is provided below.
+
+The following extra files can be found in the download directory or torrent:
+
+- `bitcoin-${VERSION}-arm-linux-gnueabihf.tar.gz`: Linux binaries targeting
+  the 32-bit ARMv7-A architecture.
+- `bitcoin-${VERSION}-aarch64-linux-gnu.tar.gz`: Linux binaries targeting
+  the 64-bit ARMv8-A architecture.
+
+ARM builds are still experimental. If you have problems on a certain device or
+Linux distribution combination please report them on the bug tracker, it may be
+possible to resolve them. Note that the device you use must be (backward)
+compatible with the architecture targeted by the binary that you use.
+For example, a Raspberry Pi 2 Model B or Raspberry Pi 3 Model B (in its 32-bit
+execution state) device, can run the 32-bit ARMv7-A targeted binary. However,
+no model of Raspberry Pi 1 device can run either binary because they are all
+ARMv6 architecture devices that are not compatible with ARMv7-A or ARMv8-A.
+
+Note that Android is not considered ARM Linux in this context. The executables
+are not expected to work out of the box on Android.
+
+
+0.13.1 Change log
+=================
+
+Detailed release notes follow. This overview includes changes that affect
+behavior, not code moves, refactors and string updates. For convenience in locating
+the code changes and accompanying discussion, both the pull request and
+git merge commit are mentioned.
+
+### Consensus
+- #8636 `9dfa0c8` Implement NULLDUMMY softfork (BIP147) (jl2012)
+- #8848 `7a34a46` Add NULLDUMMY verify flag in bitcoinconsensus.h (jl2012)
+- #8937 `8b66659` Define start and end time for segwit deployment (sipa)
+
+### RPC and other APIs
+- #8581 `526d2b0` Drop misleading option in importprunedfunds (MarcoFalke)
+- #8699 `a5ec248` Remove createwitnessaddress RPC command (jl2012)
+- #8780 `794b007` Deprecate getinfo (MarcoFalke)
+- #8832 `83ad563` Throw JSONRPCError when utxo set can not be read (MarcoFalke)
+- #8884 `b987348` getblockchaininfo help: pruneheight is the lowest, not highest, block (luke-jr)
+- #8858 `3f508ed` rpc: Generate auth cookie in hex instead of base64 (laanwj)
+- #8951 `7c2bf4b` RPC/Mining: getblocktemplate: Update and fix formatting of help (luke-jr)
+
+### Block and transaction handling
+- #8611 `a9429ca` Reduce default number of blocks to check at startup (sipa)
+- #8634 `3e80ab7` Add policy: null signature for failed CHECK(MULTI)SIG (jl2012)
+- #8525 `1672225` Do not store witness txn in rejection cache (sipa)
+- #8499 `9777fe1` Add several policy limits and disable uncompressed keys for segwit scripts (jl2012)
+- #8526 `0027672` Make non-minimal OP_IF/NOTIF argument non-standard for P2WSH (jl2012)
+- #8524 `b8c79a0` Precompute sighashes (sipa)
+- #8651 `b8c79a0` Predeclare PrecomputedTransactionData as struct (sipa)
+
+### P2P protocol and network code
+- #8740 `42ea51a` No longer send local address in addrMe (laanwj)
+- #8427 `69d1cd2` Ignore `notfound` P2P messages (laanwj)
+- #8573 `4f84082` Set jonasschnellis dns-seeder filter flag (jonasschnelli)
+- #8712 `23feab1` Remove maxuploadtargets recommended minimum (jonasschnelli)
+- #8862 `7ae6242` Fix a few cases where messages were sent after requested disconnect (theuni)
+- #8393 `fe1975a` Support for compact blocks together with segwit (sipa)
+- #8282 `2611ad7` Feeler connections to increase online addrs in the tried table (EthanHeilman)
+- #8612 `2215c22` Check for compatibility with download in FindNextBlocksToDownload (sipa)
+- #8606 `bbf379b` Fix some locks (sipa)
+- #8594 `ab295bb` Do not add random inbound peers to addrman (gmaxwell)
+- #8940 `5b4192b` Add x9 service bit support to dnsseed.bluematt.me, seed.bitcoinstats.com (TheBlueMatt, cdecker)
+- #8944 `685e4c7` Remove bogus assert on number of oubound connections. (TheBlueMatt)
+- #8949 `0dbc48a` Be more agressive in getting connections to peers with relevant services (gmaxwell)
+
+### Build system
+- #8293 `fa5b249` Allow building libbitcoinconsensus without any univalue (luke-jr)
+- #8492 `8b0bdd3` Allow building bench_bitcoin by itself (luke-jr)
+- #8563 `147003c` Add configure check for -latomic (ajtowns)
+- #8626 `ea51b0f` Berkeley DB v6 compatibility fix (netsafe)
+- #8520 `75f2065` Remove check for `openssl/ec.h` (laanwj)
+
+### GUI
+- #8481 `d9f0d4e` Fix minimize and close bugs (adlawren)
+- #8487 `a37cec5` Persist the datadir after option reset (achow101)
+- #8697 `41fd852` Fix op order to append first alert (rodasmith)
+- #8678 `8e03382` Fix UI bug that could result in paying unexpected fee (jonasschnelli)
+- #8911 `7634d8e` Translate all files, even if wallet disabled (laanwj)
+- #8540 `1db3352` Fix random segfault when closing "Choose data directory" dialog (laanwj)
+- #7579 `f1c0d78` Show network/chain errors in the GUI (jonasschnelli)
+
+### Wallet
+- #8443 `464dedd` Trivial cleanup of HD wallet changes (jonasschnelli)
+- #8539 `cb07f19` CDB: fix debug output (crowning-)
+- #8664 `091cdeb` Fix segwit-related wallet bug (sdaftuar)
+- #8693 `c6a6291` Add witness address to address book (instagibbs)
+- #8765 `6288659` Remove "unused" ThreadFlushWalletDB from removeprunedfunds (jonasschnelli)
+
+### Tests and QA
+- #8713 `ae8c7df` create_cache: Delete temp dir when done (MarcoFalke)
+- #8716 `e34374e` Check legacy wallet as well (MarcoFalke)
+- #8750 `d6ebe13` Refactor RPCTestHandler to prevent TimeoutExpired (MarcoFalke)
+- #8652 `63462c2` remove root test directory for RPC tests (yurizhykin)
+- #8724 `da94272` walletbackup: Sync blocks inside the loop (MarcoFalke)
+- #8400 `bea02dc` enable rpcbind_test (yurizhykin)
+- #8417 `f70be14` Add walletdump RPC test (including HD- & encryption-tests) (jonasschnelli)
+- #8419 `a7aa3cc` Enable size accounting in mining unit tests (sdaftuar)
+- #8442 `8bb1efd` Rework hd wallet dump test (MarcoFalke)
+- #8528 `3606b6b` Update p2p-segwit.py to reflect correct behavior (instagibbs)
+- #8531 `a27cdd8` abandonconflict: Use assert_equal (MarcoFalke)
+- #8667 `6b07362` Fix SIGHASH_SINGLE bug in test_framework SignatureHash (jl2012)
+- #8673 `03b0196` Fix obvious assignment/equality error in test (JeremyRubin)
+- #8739 `cef633c` Fix broken sendcmpct test in p2p-compactblocks.py (sdaftuar)
+- #8418 `ff893aa` Add tests for compact blocks (sdaftuar)
+- #8803 `375437c` Ping regularly in p2p-segwit.py to keep connection alive (jl2012)
+- #8827 `9bbe66e` Split up slow RPC calls to avoid pruning test timeouts (sdaftuar)
+- #8829 `2a8bca4` Add bitcoin-tx JSON tests (jnewbery)
+- #8834 `1dd1783` blockstore: Switch to dumb dbm (MarcoFalke)
+- #8835 `d87227d` nulldummy.py: Don't run unused code (MarcoFalke)
+- #8836 `eb18cc1` bitcoin-util-test.py should fail if the output file is empty (jnewbery)
+- #8839 `31ab2f8` Avoid ConnectionResetErrors during RPC tests (laanwj)
+- #8840 `cbc3fe5` Explicitly set encoding to utf8 when opening text files (laanwj)
+- #8841 `3e4abb5` Fix nulldummy test (jl2012)
+- #8854 `624a007` Fix race condition in p2p-compactblocks test (sdaftuar)
+- #8857 `1f60d45` mininode: Only allow named args in wait_until (MarcoFalke)
+- #8860 `0bee740` util: Move wait_bitcoinds() into stop_nodes() (MarcoFalke)
+- #8882 `b73f065` Fix race conditions in p2p-compactblocks.py and sendheaders.py (sdaftuar)
+- #8904 `cc6f551` Fix compact block shortids for a test case (dagurval)
+
+### Documentation
+- #8754 `0e2c6bd` Target protobuf 2.6 in OS X build notes. (fanquake)
+- #8461 `b17a3f9` Document return value of networkhashps for getmininginfo RPC endpoint (jlopp)
+- #8512 `156e305` Corrected JSON typo on setban of net.cpp (sevastos)
+- #8683 `8a7d7ff` Fix incorrect file name bitcoin.qrc  (bitcoinsSG)
+- #8891 `5e0dd9e` Update bips.md for Segregated Witness (fanquake)
+- #8545 `863ae74` Update git-subtree-check.sh README (MarcoFalke)
+- #8607 `486650a` Fix doxygen off-by-one comments, fix typos (MarcoFalke)
+- #8560 `c493f43` Fix two VarInt examples in serialize.h (cbarcenas)
+- #8737 `084cae9` UndoReadFromDisk works on undo files (rev), not on block files (paveljanik)
+- #8625 `0a35573` Clarify statement about parallel jobs in rpc-tests.py (isle2983)
+- #8624 `0e6d753` build: Mention curl (MarcoFalke)
+- #8604 `b09e13c` build,doc: Update for 0.13.0+ and OpenBSD 5.9 (laanwj)
+- #8939 `06d15fb` Update implemented bips for 0.13.1 (sipa)
+
+### Miscellaneous
+- #8742 `d31ac72` Specify Protobuf version 2 in paymentrequest.proto (fanquake)
+- #8414,#8558,#8676,#8700,#8701,#8702 Add missing copyright headers (isle2983, kazcw)
+- #8899 `4ed2627` Fix wake from sleep issue with Boost 1.59.0 (fanquake)
+- #8817 `bcf3806` update bitcoin-tx to output witness data (jnewbery)
+- #8513 `4e5fc31` Fix a type error that would not compile on OSX. (JeremyRubin)
+- #8392 `30eac2d` Fix several node initialization issues (sipa)
+- #8548 `305d8ac` Use `__func__` to get function name for output printing (MarcoFalke)
+- #8291 `a987431` [util] CopyrightHolders: Check for untranslated substitution (MarcoFalke)
+
+Credits
+=======
+
+Thanks to everyone who directly contributed to this release:
+
+- adlawren
+- Alexey Vesnin
+- Anders Øyvind Urke-Sætre
+- Andrew Chow
+- Anthony Towns
+- BtcDrak
+- Chris Stewart
+- Christian Barcenas
+- Christian Decker
+- Cory Fields
+- crowning-
+- Dagur Valberg Johannsson
+- David A. Harding
+- Eric Lombrozo
+- Ethan Heilman
+- fanquake
+- Gaurav Rana
+- Gregory Maxwell
+- instagibbs
+- isle2983
+- Jameson Lopp
+- Jeremy Rubin
+- jnewbery
+- Johnson Lau
+- Jonas Schnelli
+- jonnynewbs
+- Justin Camarena
+- Kaz Wesley
+- leijurv
+- Luke Dashjr
+- MarcoFalke
+- Marty Jones
+- Matt Corallo
+- Micha
+- Michael Ford
+- mruddy
+- Pavel Janík
+- Pieter Wuille
+- rodasmith
+- Sev
+- Suhas Daftuar
+- whythat
+- Wladimir J. van der Laan
+
+As well as everyone that helped translating on [Transifex](https://www.transifex.com/projects/p/bitcoin/).

From 1c3ecc70c8cd6c33cf3ff4e2099c8e7d8a8ca9d2 Mon Sep 17 00:00:00 2001
From: "S. Matthew English" <s-matthew-english@users.noreply.github.com>
Date: Thu, 27 Oct 2016 12:13:03 +0200
Subject: [PATCH 1098/1802] instance of 'mem pool' to 'mempool'

there was only one instance of  'mem pool' and not 'mempool', so I changed it to conform to the others
---
 src/rpc/blockchain.cpp | 2 +-
 src/rpc/mining.cpp     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp
index 7c128885daf36..8caea14adbcac 100644
--- a/src/rpc/blockchain.cpp
+++ b/src/rpc/blockchain.cpp
@@ -863,7 +863,7 @@ UniValue gettxout(const JSONRPCRequest& request)
             "\nArguments:\n"
             "1. \"txid\"       (string, required) The transaction id\n"
             "2. n              (numeric, required) vout number\n"
-            "3. includemempool  (boolean, optional) Whether to include the mem pool\n"
+            "3. includemempool  (boolean, optional) Whether to include the mempool\n"
             "\nResult:\n"
             "{\n"
             "  \"bestblock\" : \"hash\",    (string) the block hash\n"
diff --git a/src/rpc/mining.cpp b/src/rpc/mining.cpp
index d509dd691f55d..be0776ea22b76 100644
--- a/src/rpc/mining.cpp
+++ b/src/rpc/mining.cpp
@@ -230,7 +230,7 @@ UniValue getmininginfo(const JSONRPCRequest& request)
             "  \"difficulty\": xxx.xxxxx    (numeric) The current difficulty\n"
             "  \"errors\": \"...\"            (string) Current errors\n"
             "  \"networkhashps\": nnn,      (numeric) The network hashes per second\n"
-            "  \"pooledtx\": n              (numeric) The size of the mem pool\n"
+            "  \"pooledtx\": n              (numeric) The size of the mempool\n"
             "  \"chain\": \"xxxx\",           (string) current network name as defined in BIP70 (main, test, regtest)\n"
             "}\n"
             "\nExamples:\n"

From 004168dcb75750ea3f30e1349e4802c20bf4b860 Mon Sep 17 00:00:00 2001
From: Jonas Schnelli <dev@jonasschnelli.ch>
Date: Fri, 21 Oct 2016 10:09:02 +0200
Subject: [PATCH 1099/1802] CoinControl: add option for custom confirmation
 target

---
 src/wallet/coincontrol.h | 3 +++
 src/wallet/wallet.cpp    | 9 +++++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/wallet/coincontrol.h b/src/wallet/coincontrol.h
index 78516770e602c..08d23688ff079 100644
--- a/src/wallet/coincontrol.h
+++ b/src/wallet/coincontrol.h
@@ -22,6 +22,8 @@ class CCoinControl
     bool fOverrideFeeRate;
     //! Feerate to use if overrideFeeRate is true
     CFeeRate nFeeRate;
+    //! Override the default confirmation target, 0 = use default
+    int nConfirmTarget;
 
     CCoinControl()
     {
@@ -37,6 +39,7 @@ class CCoinControl
         nMinimumTotalFee = 0;
         nFeeRate = CFeeRate(0);
         fOverrideFeeRate = false;
+        nConfirmTarget = 0;
     }
 
     bool HasSelected() const
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index 60a769704b655..894da23cd0c02 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -2433,17 +2433,22 @@ bool CWallet::CreateTransaction(const vector<CRecipient>& vecSend, CWalletTx& wt
 
                 dPriority = wtxNew.ComputePriority(dPriority, nBytes);
 
+                // Allow to override the default confirmation target over the CoinControl instance
+                int currentConfirmationTarget = nTxConfirmTarget;
+                if (coinControl && coinControl->nConfirmTarget > 0)
+                    currentConfirmationTarget = coinControl->nConfirmTarget;
+
                 // Can we complete this as a free transaction?
                 if (fSendFreeTransactions && nBytes <= MAX_FREE_TRANSACTION_CREATE_SIZE)
                 {
                     // Not enough fee: enough priority?
-                    double dPriorityNeeded = mempool.estimateSmartPriority(nTxConfirmTarget);
+                    double dPriorityNeeded = mempool.estimateSmartPriority(currentConfirmationTarget);
                     // Require at least hard-coded AllowFree.
                     if (dPriority >= dPriorityNeeded && AllowFree(dPriority))
                         break;
                 }
 
-                CAmount nFeeNeeded = GetMinimumFee(nBytes, nTxConfirmTarget, mempool);
+                CAmount nFeeNeeded = GetMinimumFee(nBytes, currentConfirmationTarget, mempool);
                 if (coinControl && nFeeNeeded > 0 && coinControl->nMinimumTotalFee > nFeeNeeded) {
                     nFeeNeeded = coinControl->nMinimumTotalFee;
                 }

From 6f0289967fa12afa4bc3299f433bb496a8e7c229 Mon Sep 17 00:00:00 2001
From: Jonas Schnelli <dev@jonasschnelli.ch>
Date: Fri, 21 Oct 2016 10:24:03 +0200
Subject: [PATCH 1100/1802] [Qt] Hide nTxConfirmTarget behind WalletModel

---
 src/qt/walletmodel.cpp | 5 +++++
 src/qt/walletmodel.h   | 2 ++
 2 files changed, 7 insertions(+)

diff --git a/src/qt/walletmodel.cpp b/src/qt/walletmodel.cpp
index 305cb4fefa4f4..079b8d3a7b86a 100644
--- a/src/qt/walletmodel.cpp
+++ b/src/qt/walletmodel.cpp
@@ -698,3 +698,8 @@ bool WalletModel::hdEnabled() const
 {
     return wallet->IsHDEnabled();
 }
+
+int WalletModel::getDefaultConfirmTarget() const
+{
+    return nTxConfirmTarget;
+}
diff --git a/src/qt/walletmodel.h b/src/qt/walletmodel.h
index cdac60da36672..521d8459976c7 100644
--- a/src/qt/walletmodel.h
+++ b/src/qt/walletmodel.h
@@ -207,6 +207,8 @@ class WalletModel : public QObject
 
     bool hdEnabled() const;
 
+    int getDefaultConfirmTarget() const;
+
 private:
     CWallet *wallet;
     bool fHaveWatchOnly;

From cfe77ef412776390ec4575f2d5f7230391a4d198 Mon Sep 17 00:00:00 2001
From: Jonas Schnelli <dev@jonasschnelli.ch>
Date: Fri, 21 Oct 2016 10:53:37 +0200
Subject: [PATCH 1101/1802] [Qt] overhaul smart-fee slider, adjust default
 confirmation target

---
 src/qt/forms/sendcoinsdialog.ui | 24 ++++++++++++++++++++++--
 src/qt/sendcoinsdialog.cpp      | 32 +++++++++++++++++++++++++-------
 src/qt/sendcoinsdialog.h        |  2 --
 3 files changed, 47 insertions(+), 11 deletions(-)

diff --git a/src/qt/forms/sendcoinsdialog.ui b/src/qt/forms/sendcoinsdialog.ui
index 06e09074d1453..33db9f8938247 100644
--- a/src/qt/forms/sendcoinsdialog.ui
+++ b/src/qt/forms/sendcoinsdialog.ui
@@ -411,7 +411,7 @@
                  </property>
                 </widget>
                </item>
-             </layout>
+              </layout>
              </item>
              <item>
               <layout class="QFormLayout" name="formLayoutCoinControl4">
@@ -1031,7 +1031,7 @@
                    <item>
                     <widget class="QLabel" name="labelSmartFee3">
                      <property name="text">
-                      <string>Confirmation time:</string>
+                      <string>Confirmation time target:</string>
                      </property>
                      <property name="margin">
                       <number>2</number>
@@ -1095,6 +1095,26 @@
                        </property>
                       </widget>
                      </item>
+                     <item>
+                      <spacer name="horizontalSpacer_7">
+                       <property name="orientation">
+                        <enum>Qt::Horizontal</enum>
+                       </property>
+                       <property name="sizeHint" stdset="0">
+                        <size>
+                         <width>40</width>
+                         <height>20</height>
+                        </size>
+                       </property>
+                      </spacer>
+                     </item>
+                     <item>
+                      <widget class="QLabel" name="confirmationTargetLabel">
+                       <property name="text">
+                        <string>(count)</string>
+                       </property>
+                      </widget>
+                     </item>
                      <item>
                       <spacer name="horizontalSpacer_3">
                        <property name="orientation">
diff --git a/src/qt/sendcoinsdialog.cpp b/src/qt/sendcoinsdialog.cpp
index f1c867e6f8ac3..d338bbf68839b 100644
--- a/src/qt/sendcoinsdialog.cpp
+++ b/src/qt/sendcoinsdialog.cpp
@@ -110,7 +110,6 @@ SendCoinsDialog::SendCoinsDialog(const PlatformStyle *_platformStyle, QWidget *p
     ui->groupCustomFee->setId(ui->radioCustomPerKilobyte, 0);
     ui->groupCustomFee->setId(ui->radioCustomAtLeast, 1);
     ui->groupCustomFee->button((int)std::max(0, std::min(1, settings.value("nCustomFeeRadio").toInt())))->setChecked(true);
-    ui->sliderSmartFee->setValue(settings.value("nSmartFeeSliderPosition").toInt());
     ui->customFee->setValue(settings.value("nTransactionFee").toLongLong());
     ui->checkBoxMinimumFee->setChecked(settings.value("fPayOnlyMinFee").toBool());
     minimizeFeeSection(settings.value("fFeeSectionMinimized").toBool());
@@ -172,6 +171,13 @@ void SendCoinsDialog::setModel(WalletModel *_model)
         updateMinFeeLabel();
         updateSmartFeeLabel();
         updateGlobalFeeVariables();
+
+        // set the smartfee-sliders default value (wallets default conf.target or last stored value)
+        QSettings settings;
+        if (settings.value("nSmartFeeSliderPosition").toInt() == 0)
+            ui->sliderSmartFee->setValue(ui->sliderSmartFee->maximum() - model->getDefaultConfirmTarget() + 1);
+        else
+            ui->sliderSmartFee->setValue(settings.value("nSmartFeeSliderPosition").toInt());
     }
 }
 
@@ -229,10 +235,17 @@ void SendCoinsDialog::on_sendButton_clicked()
     // prepare transaction for getting txFee earlier
     WalletModelTransaction currentTransaction(recipients);
     WalletModel::SendCoinsReturn prepareStatus;
-    if (model->getOptionsModel()->getCoinControlFeatures()) // coin control enabled
-        prepareStatus = model->prepareTransaction(currentTransaction, CoinControlDialog::coinControl);
+
+    // Always use a CCoinControl instance, use the CoinControlDialog instance if CoinControl has been enabled
+    CCoinControl ctrl;
+    if (model->getOptionsModel()->getCoinControlFeatures())
+        ctrl = *CoinControlDialog::coinControl;
+    if (ui->radioSmartFee->isChecked())
+        ctrl.nConfirmTarget = ui->sliderSmartFee->maximum() - ui->sliderSmartFee->value() + 1;
     else
-        prepareStatus = model->prepareTransaction(currentTransaction);
+        ctrl.nConfirmTarget = 0;
+
+    prepareStatus = model->prepareTransaction(currentTransaction, &ctrl);
 
     // process prepareStatus and on error generate message shown to user
     processSendCoinsReturn(prepareStatus,
@@ -576,6 +589,7 @@ void SendCoinsDialog::updateFeeSectionControls()
     ui->labelFeeEstimation      ->setEnabled(ui->radioSmartFee->isChecked());
     ui->labelSmartFeeNormal     ->setEnabled(ui->radioSmartFee->isChecked());
     ui->labelSmartFeeFast       ->setEnabled(ui->radioSmartFee->isChecked());
+    ui->confirmationTargetLabel ->setEnabled(ui->radioSmartFee->isChecked());
     ui->checkBoxMinimumFee      ->setEnabled(ui->radioCustomFee->isChecked());
     ui->labelMinFeeWarning      ->setEnabled(ui->radioCustomFee->isChecked());
     ui->radioCustomPerKilobyte  ->setEnabled(ui->radioCustomFee->isChecked() && !ui->checkBoxMinimumFee->isChecked());
@@ -587,15 +601,17 @@ void SendCoinsDialog::updateGlobalFeeVariables()
 {
     if (ui->radioSmartFee->isChecked())
     {
-        nTxConfirmTarget = defaultConfirmTarget - ui->sliderSmartFee->value();
+        int nConfirmTarget = ui->sliderSmartFee->maximum() - ui->sliderSmartFee->value() + 1;
         payTxFee = CFeeRate(0);
 
         // set nMinimumTotalFee to 0 to not accidentally pay a custom fee
         CoinControlDialog::coinControl->nMinimumTotalFee = 0;
+
+        // show the estimated reuquired time for confirmation
+        ui->confirmationTargetLabel->setText(GUIUtil::formatDurationStr(nConfirmTarget*600)+" / "+tr("%n block(s)", "", nConfirmTarget));
     }
     else
     {
-        nTxConfirmTarget = defaultConfirmTarget;
         payTxFee = CFeeRate(ui->customFee->value());
 
         // if user has selected to set a minimum absolute fee, pass the value to coincontrol
@@ -630,7 +646,7 @@ void SendCoinsDialog::updateSmartFeeLabel()
     if(!model || !model->getOptionsModel())
         return;
 
-    int nBlocksToConfirm = defaultConfirmTarget - ui->sliderSmartFee->value();
+    int nBlocksToConfirm = ui->sliderSmartFee->maximum() - ui->sliderSmartFee->value() + 1;
     int estimateFoundAtBlocks = nBlocksToConfirm;
     CFeeRate feeRate = mempool.estimateSmartFee(nBlocksToConfirm, &estimateFoundAtBlocks);
     if (feeRate <= CFeeRate(0)) // not enough data => minfee
@@ -701,6 +717,8 @@ void SendCoinsDialog::coinControlFeatureChanged(bool checked)
     if (!checked && model) // coin control features disabled
         CoinControlDialog::coinControl->SetNull();
 
+    // make sure we set back the confirmation target
+    updateGlobalFeeVariables();
     coinControlUpdateLabels();
 }
 
diff --git a/src/qt/sendcoinsdialog.h b/src/qt/sendcoinsdialog.h
index 83dac0bd114b9..b0df495a98699 100644
--- a/src/qt/sendcoinsdialog.h
+++ b/src/qt/sendcoinsdialog.h
@@ -26,8 +26,6 @@ QT_BEGIN_NAMESPACE
 class QUrl;
 QT_END_NAMESPACE
 
-const int defaultConfirmTarget = 25;
-
 /** Dialog for sending bitcoins */
 class SendCoinsDialog : public QDialog
 {

From 0fdf810d267928b4c26a2e2cbb8c02b79e7b0ccb Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Fri, 28 Oct 2016 14:15:46 +0200
Subject: [PATCH 1102/1802] wallet: Change default confirm target from 2 to 6

Recent discussion (in IRC meetings, and e.g. #8989) has shown a
preference for the default confirm target for smartfees to be 6 instead
of 2, to avoid overpaying fees for questionable gain.

6 is also a compromise between the GUI's pre-#8989 value of 25 and the
bitcoind `-txconfirmtarget` default of 2. These were unified in #8989,
but this has made the (overly expensive) default of 2 as GUI default.
---
 src/wallet/wallet.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
index c33a6ca91f670..9de996224d18d 100644
--- a/src/wallet/wallet.h
+++ b/src/wallet/wallet.h
@@ -53,7 +53,7 @@ static const bool DEFAULT_SPEND_ZEROCONF_CHANGE = true;
 //! Default for -sendfreetransactions
 static const bool DEFAULT_SEND_FREE_TRANSACTIONS = false;
 //! -txconfirmtarget default
-static const unsigned int DEFAULT_TX_CONFIRM_TARGET = 2;
+static const unsigned int DEFAULT_TX_CONFIRM_TARGET = 6;
 //! -walletrbf default
 static const bool DEFAULT_WALLET_RBF = false;
 //! Largest (in bytes) free transaction we're willing to create

From 6c5cd9d022347abed8b61ca4ae4dc101461582fe Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Thu, 27 Oct 2016 14:05:59 +0200
Subject: [PATCH 1103/1802] test: Add format-dependent comparison to bctest

This splits the output comparison for `bitcoin-tx` into two steps:

- First, check for data mismatch, parsing the data as json or hex
  depending on the extension of the output file

- Then, check if the literal string matches

For either of these cases give a different error.

This prevents wild goose chases when e.g. a trailing space doesn't match
exactly, and makes sure that both test output and examples are valid
data of the purported format.
---
 src/test/bctest.py | 30 +++++++++++++++++++++++++++---
 1 file changed, 27 insertions(+), 3 deletions(-)

diff --git a/src/test/bctest.py b/src/test/bctest.py
index d801415c70f19..eab4fb734a2d4 100644
--- a/src/test/bctest.py
+++ b/src/test/bctest.py
@@ -6,6 +6,15 @@
 import os
 import json
 import sys
+import binascii
+
+def parse_output(a, fmt):
+	if fmt == 'json': # json: compare parsed data
+		return json.loads(a)
+	elif fmt == 'hex': # hex: parse and compare binary data
+		return binascii.a2b_hex(a.strip())
+	else:
+		raise NotImplementedError("Don't know how to compare %s" % fmt)
 
 def bctest(testDir, testObj, exeext):
 
@@ -23,6 +32,7 @@ def bctest(testDir, testObj, exeext):
 	outputData = None
 	if "output_cmp" in testObj:
 		outputFn = testObj['output_cmp']
+		outputType = os.path.splitext(outputFn)[1][1:] # output type from file extension (determines how to compare)
 		outputData = open(testDir + "/" + outputFn).read()
 		if not outputData:
 			print("Output data missing for " + outputFn)
@@ -34,9 +44,23 @@ def bctest(testDir, testObj, exeext):
 		print("OSError, Failed to execute " + execprog)
 		sys.exit(1)
 
-	if outputData and (outs[0] != outputData):
-		print("Output data mismatch for " + outputFn)
-		sys.exit(1)
+	if outputData:
+		try:
+			a_parsed = parse_output(outs[0], outputType)
+		except Exception as e:
+			print('Error parsing command output as %s: %s' % (outputType,e))
+			sys.exit(1)
+		try:
+			b_parsed = parse_output(outputData, outputType)
+		except Exception as e:
+			print('Error parsing expected output %s as %s: %s' % (outputFn,outputType,e))
+			sys.exit(1)
+		if a_parsed != b_parsed:
+			print("Output data mismatch for " + outputFn + " (format " + outputType + ")")
+			sys.exit(1)
+		if outs[0] != outputData:
+			print("Output formatting mismatch for " + outputFn + " (format " + outputType + ")")
+			sys.exit(1)
 
 	wantRC = 0
 	if "return_code" in testObj:

From 86029e72c96436605f47153c1f09e151e1847c28 Mon Sep 17 00:00:00 2001
From: Patrick Strateman <patrick.strateman@gmail.com>
Date: Wed, 28 Sep 2016 08:57:25 -0700
Subject: [PATCH 1104/1802] Move CWalletDB::ReorderTransactions to CWallet

---
 src/wallet/wallet.cpp   | 73 +++++++++++++++++++++++++++++++++++++-
 src/wallet/walletdb.cpp | 78 +----------------------------------------
 src/wallet/walletdb.h   |  3 +-
 3 files changed, 74 insertions(+), 80 deletions(-)

diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index c9e926266cab7..9e19138099eb6 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -658,8 +658,79 @@ bool CWallet::EncryptWallet(const SecureString& strWalletPassphrase)
 
 DBErrors CWallet::ReorderTransactions()
 {
+    LOCK(cs_wallet);
     CWalletDB walletdb(strWalletFile);
-    return walletdb.ReorderTransactions(this);
+
+    // Old wallets didn't have any defined order for transactions
+    // Probably a bad idea to change the output of this
+
+    // First: get all CWalletTx and CAccountingEntry into a sorted-by-time multimap.
+    typedef pair<CWalletTx*, CAccountingEntry*> TxPair;
+    typedef multimap<int64_t, TxPair > TxItems;
+    TxItems txByTime;
+
+    for (map<uint256, CWalletTx>::iterator it = mapWallet.begin(); it != mapWallet.end(); ++it)
+    {
+        CWalletTx* wtx = &((*it).second);
+        txByTime.insert(make_pair(wtx->nTimeReceived, TxPair(wtx, (CAccountingEntry*)0)));
+    }
+    list<CAccountingEntry> acentries;
+    walletdb.ListAccountCreditDebit("", acentries);
+    BOOST_FOREACH(CAccountingEntry& entry, acentries)
+    {
+        txByTime.insert(make_pair(entry.nTime, TxPair((CWalletTx*)0, &entry)));
+    }
+
+    nOrderPosNext = 0;
+    std::vector<int64_t> nOrderPosOffsets;
+    for (TxItems::iterator it = txByTime.begin(); it != txByTime.end(); ++it)
+    {
+        CWalletTx *const pwtx = (*it).second.first;
+        CAccountingEntry *const pacentry = (*it).second.second;
+        int64_t& nOrderPos = (pwtx != 0) ? pwtx->nOrderPos : pacentry->nOrderPos;
+
+        if (nOrderPos == -1)
+        {
+            nOrderPos = nOrderPosNext++;
+            nOrderPosOffsets.push_back(nOrderPos);
+
+            if (pwtx)
+            {
+                if (!walletdb.WriteTx(*pwtx))
+                    return DB_LOAD_FAIL;
+            }
+            else
+                if (!walletdb.WriteAccountingEntry(pacentry->nEntryNo, *pacentry))
+                    return DB_LOAD_FAIL;
+        }
+        else
+        {
+            int64_t nOrderPosOff = 0;
+            BOOST_FOREACH(const int64_t& nOffsetStart, nOrderPosOffsets)
+            {
+                if (nOrderPos >= nOffsetStart)
+                    ++nOrderPosOff;
+            }
+            nOrderPos += nOrderPosOff;
+            nOrderPosNext = std::max(nOrderPosNext, nOrderPos + 1);
+
+            if (!nOrderPosOff)
+                continue;
+
+            // Since we're changing the order, write it back
+            if (pwtx)
+            {
+                if (!walletdb.WriteTx(*pwtx))
+                    return DB_LOAD_FAIL;
+            }
+            else
+                if (!walletdb.WriteAccountingEntry(pacentry->nEntryNo, *pacentry))
+                    return DB_LOAD_FAIL;
+        }
+    }
+    walletdb.WriteOrderPosNext(nOrderPosNext);
+
+    return DB_LOAD_OK;
 }
 
 int64_t CWallet::IncOrderPosNext(CWalletDB *pwalletdb)
diff --git a/src/wallet/walletdb.cpp b/src/wallet/walletdb.cpp
index 80bfe8255d6ea..43fd6a20adc81 100644
--- a/src/wallet/walletdb.cpp
+++ b/src/wallet/walletdb.cpp
@@ -251,82 +251,6 @@ void CWalletDB::ListAccountCreditDebit(const string& strAccount, list<CAccountin
     pcursor->close();
 }
 
-DBErrors CWalletDB::ReorderTransactions(CWallet* pwallet)
-{
-    LOCK(pwallet->cs_wallet);
-    // Old wallets didn't have any defined order for transactions
-    // Probably a bad idea to change the output of this
-
-    // First: get all CWalletTx and CAccountingEntry into a sorted-by-time multimap.
-    typedef pair<CWalletTx*, CAccountingEntry*> TxPair;
-    typedef multimap<int64_t, TxPair > TxItems;
-    TxItems txByTime;
-
-    for (map<uint256, CWalletTx>::iterator it = pwallet->mapWallet.begin(); it != pwallet->mapWallet.end(); ++it)
-    {
-        CWalletTx* wtx = &((*it).second);
-        txByTime.insert(make_pair(wtx->nTimeReceived, TxPair(wtx, (CAccountingEntry*)0)));
-    }
-    list<CAccountingEntry> acentries;
-    ListAccountCreditDebit("", acentries);
-    BOOST_FOREACH(CAccountingEntry& entry, acentries)
-    {
-        txByTime.insert(make_pair(entry.nTime, TxPair((CWalletTx*)0, &entry)));
-    }
-
-    int64_t& nOrderPosNext = pwallet->nOrderPosNext;
-    nOrderPosNext = 0;
-    std::vector<int64_t> nOrderPosOffsets;
-    for (TxItems::iterator it = txByTime.begin(); it != txByTime.end(); ++it)
-    {
-        CWalletTx *const pwtx = (*it).second.first;
-        CAccountingEntry *const pacentry = (*it).second.second;
-        int64_t& nOrderPos = (pwtx != 0) ? pwtx->nOrderPos : pacentry->nOrderPos;
-
-        if (nOrderPos == -1)
-        {
-            nOrderPos = nOrderPosNext++;
-            nOrderPosOffsets.push_back(nOrderPos);
-
-            if (pwtx)
-            {
-                if (!WriteTx(*pwtx))
-                    return DB_LOAD_FAIL;
-            }
-            else
-                if (!WriteAccountingEntry(pacentry->nEntryNo, *pacentry))
-                    return DB_LOAD_FAIL;
-        }
-        else
-        {
-            int64_t nOrderPosOff = 0;
-            BOOST_FOREACH(const int64_t& nOffsetStart, nOrderPosOffsets)
-            {
-                if (nOrderPos >= nOffsetStart)
-                    ++nOrderPosOff;
-            }
-            nOrderPos += nOrderPosOff;
-            nOrderPosNext = std::max(nOrderPosNext, nOrderPos + 1);
-
-            if (!nOrderPosOff)
-                continue;
-
-            // Since we're changing the order, write it back
-            if (pwtx)
-            {
-                if (!WriteTx(*pwtx))
-                    return DB_LOAD_FAIL;
-            }
-            else
-                if (!WriteAccountingEntry(pacentry->nEntryNo, *pacentry))
-                    return DB_LOAD_FAIL;
-        }
-    }
-    WriteOrderPosNext(nOrderPosNext);
-
-    return DB_LOAD_OK;
-}
-
 class CWalletScanState {
 public:
     unsigned int nKeys;
@@ -711,7 +635,7 @@ DBErrors CWalletDB::LoadWallet(CWallet* pwallet)
         WriteVersion(CLIENT_VERSION);
 
     if (wss.fAnyUnordered)
-        result = ReorderTransactions(pwallet);
+        result = pwallet->ReorderTransactions();
 
     pwallet->laccentries.clear();
     ListAccountCreditDebit("*", pwallet->laccentries);
diff --git a/src/wallet/walletdb.h b/src/wallet/walletdb.h
index 9c9d4922a40a3..a0525bd9a7ce8 100644
--- a/src/wallet/walletdb.h
+++ b/src/wallet/walletdb.h
@@ -153,6 +153,7 @@ class CWalletDB : public CDB
 
     /// This writes directly to the database, and will not update the CWallet's cached accounting entries!
     /// Use wallet.AddAccountingEntry instead, to write *and* update its caches.
+    bool WriteAccountingEntry(const uint64_t nAccEntryNum, const CAccountingEntry& acentry);
     bool WriteAccountingEntry_Backend(const CAccountingEntry& acentry);
     bool ReadAccount(const std::string& strAccount, CAccount& account);
     bool WriteAccount(const std::string& strAccount, const CAccount& account);
@@ -165,7 +166,6 @@ class CWalletDB : public CDB
     CAmount GetAccountCreditDebit(const std::string& strAccount);
     void ListAccountCreditDebit(const std::string& strAccount, std::list<CAccountingEntry>& acentries);
 
-    DBErrors ReorderTransactions(CWallet* pwallet);
     DBErrors LoadWallet(CWallet* pwallet);
     DBErrors FindWalletTx(CWallet* pwallet, std::vector<uint256>& vTxHash, std::vector<CWalletTx>& vWtx);
     DBErrors ZapWalletTx(CWallet* pwallet, std::vector<CWalletTx>& vWtx);
@@ -180,7 +180,6 @@ class CWalletDB : public CDB
     CWalletDB(const CWalletDB&);
     void operator=(const CWalletDB&);
 
-    bool WriteAccountingEntry(const uint64_t nAccEntryNum, const CAccountingEntry& acentry);
 };
 
 void ThreadFlushWalletDB(const std::string& strFile);

From 3333e5a1e582225907b201cca64322d7620fbeec Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Sun, 30 Oct 2016 18:22:22 +0100
Subject: [PATCH 1105/1802] [qt] Return useful error message on ATMP failure

---
 src/qt/sendcoinsdialog.cpp | 2 +-
 src/qt/walletmodel.cpp     | 2 +-
 src/qt/walletmodel.h       | 8 ++++++--
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/qt/sendcoinsdialog.cpp b/src/qt/sendcoinsdialog.cpp
index d338bbf68839b..57b21794356ea 100644
--- a/src/qt/sendcoinsdialog.cpp
+++ b/src/qt/sendcoinsdialog.cpp
@@ -534,7 +534,7 @@ void SendCoinsDialog::processSendCoinsReturn(const WalletModel::SendCoinsReturn
         msgParams.second = CClientUIInterface::MSG_ERROR;
         break;
     case WalletModel::TransactionCommitFailed:
-        msgParams.first = tr("The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.");
+        msgParams.first = tr("The transaction was rejected with the following reason: %1").arg(sendCoinsReturn.reasonCommitFailed);
         msgParams.second = CClientUIInterface::MSG_ERROR;
         break;
     case WalletModel::AbsurdFee:
diff --git a/src/qt/walletmodel.cpp b/src/qt/walletmodel.cpp
index 4bf03f78d025b..3490d1c1ccd1a 100644
--- a/src/qt/walletmodel.cpp
+++ b/src/qt/walletmodel.cpp
@@ -331,7 +331,7 @@ WalletModel::SendCoinsReturn WalletModel::sendCoins(WalletModelTransaction &tran
         CReserveKey *keyChange = transaction.getPossibleKeyChange();
         CValidationState state;
         if(!wallet->CommitTransaction(*newTx, *keyChange, g_connman.get(), state))
-            return TransactionCommitFailed;
+            return SendCoinsReturn(TransactionCommitFailed, QString::fromStdString(state.GetRejectReason()));
 
         CTransaction* t = (CTransaction*)newTx;
         CDataStream ssTx(SER_NETWORK, PROTOCOL_VERSION);
diff --git a/src/qt/walletmodel.h b/src/qt/walletmodel.h
index 521d8459976c7..6a5670e3782d4 100644
--- a/src/qt/walletmodel.h
+++ b/src/qt/walletmodel.h
@@ -144,9 +144,13 @@ class WalletModel : public QObject
     // Return status record for SendCoins, contains error id + information
     struct SendCoinsReturn
     {
-        SendCoinsReturn(StatusCode _status = OK):
-            status(_status) {}
+        SendCoinsReturn(StatusCode _status = OK, QString _reasonCommitFailed = "")
+            : status(_status),
+              reasonCommitFailed(_reasonCommitFailed)
+        {
+        }
         StatusCode status;
+        QString reasonCommitFailed;
     };
 
     // prepare transaction for getting txfee before sending coins

From fe1dc62cef88280d2490a619beded052f313c6fc Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Sun, 30 Oct 2016 18:02:16 -0400
Subject: [PATCH 1106/1802] Hash P2P messages as they are received instead of
 at process-time

---
 src/main.cpp | 2 +-
 src/net.cpp  | 9 +++++++++
 src/net.h    | 5 +++++
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/main.cpp b/src/main.cpp
index 5e17ec6251ece..56c24d93b8ba5 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -6350,7 +6350,7 @@ bool ProcessMessages(CNode* pfrom, CConnman& connman)
 
         // Checksum
         CDataStream& vRecv = msg.vRecv;
-        uint256 hash = Hash(vRecv.begin(), vRecv.begin() + nMessageSize);
+        const uint256& hash = msg.GetMessageHash();
         if (memcmp(hash.begin(), hdr.pchChecksum, CMessageHeader::CHECKSUM_SIZE) != 0)
         {
             LogPrintf("%s(%s, %u bytes): CHECKSUM ERROR expected %s was %s\n", __func__,
diff --git a/src/net.cpp b/src/net.cpp
index 48ba9588d9dc3..a2414acf46e8e 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -758,12 +758,21 @@ int CNetMessage::readData(const char *pch, unsigned int nBytes)
         vRecv.resize(std::min(hdr.nMessageSize, nDataPos + nCopy + 256 * 1024));
     }
 
+    hasher.Write((const unsigned char*)pch, nCopy);
     memcpy(&vRecv[nDataPos], pch, nCopy);
     nDataPos += nCopy;
 
     return nCopy;
 }
 
+const uint256& CNetMessage::GetMessageHash() const
+{
+    assert(complete());
+    if (data_hash.IsNull())
+        hasher.Finalize(data_hash.begin());
+    return data_hash;
+}
+
 
 
 
diff --git a/src/net.h b/src/net.h
index 58b492e5929f2..955bad488a2bf 100644
--- a/src/net.h
+++ b/src/net.h
@@ -512,6 +512,9 @@ class CNodeStats
 
 
 class CNetMessage {
+private:
+    mutable CHash256 hasher;
+    mutable uint256 data_hash;
 public:
     bool in_data;                   // parsing header (false) or data (true)
 
@@ -539,6 +542,8 @@ class CNetMessage {
         return (hdr.nMessageSize == nDataPos);
     }
 
+    const uint256& GetMessageHash() const;
+
     void SetVersion(int nVersionIn)
     {
         hdrbuf.SetVersion(nVersionIn);

From 7f61b49de82989dc692e7750860eb1ec4044db7a Mon Sep 17 00:00:00 2001
From: matthias <s.matthew.english@gmail.com>
Date: Mon, 31 Oct 2016 01:11:46 +0100
Subject: [PATCH 1107/1802] Change all instance of 'GMT epoch' to 'Unix epoch'

---
 src/rpc/misc.cpp         | 2 +-
 src/wallet/rpcwallet.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/rpc/misc.cpp b/src/rpc/misc.cpp
index eaef4856b3c5e..850ecffb0ec6b 100644
--- a/src/rpc/misc.cpp
+++ b/src/rpc/misc.cpp
@@ -57,7 +57,7 @@ UniValue getinfo(const JSONRPCRequest& request)
             "  \"proxy\": \"host:port\",     (string, optional) the proxy used by the server\n"
             "  \"difficulty\": xxxxxx,       (numeric) the current difficulty\n"
             "  \"testnet\": true|false,      (boolean) if the server is using testnet or not\n"
-            "  \"keypoololdest\": xxxxxx,    (numeric) the timestamp (seconds since GMT epoch) of the oldest pre-generated key in the key pool\n"
+            "  \"keypoololdest\": xxxxxx,    (numeric) the timestamp (seconds since Unix epoch) of the oldest pre-generated key in the key pool\n"
             "  \"keypoolsize\": xxxx,        (numeric) how many new keys are pre-generated\n"
             "  \"unlocked_until\": ttt,      (numeric) the timestamp in seconds since epoch (midnight Jan 1 1970 GMT) that the wallet is unlocked for transfers, or 0 if the wallet is locked\n"
             "  \"paytxfee\": x.xxxx,         (numeric) the transaction fee set in " + CURRENCY_UNIT + "/kB\n"
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index 5a8212fd01f2b..5a22e0278da5a 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -2286,7 +2286,7 @@ UniValue getwalletinfo(const JSONRPCRequest& request)
             "  \"unconfirmed_balance\": xxx,   (numeric) the total unconfirmed balance of the wallet in " + CURRENCY_UNIT + "\n"
             "  \"immature_balance\": xxxxxx,   (numeric) the total immature balance of the wallet in " + CURRENCY_UNIT + "\n"
             "  \"txcount\": xxxxxxx,           (numeric) the total number of transactions in the wallet\n"
-            "  \"keypoololdest\": xxxxxx,      (numeric) the timestamp (seconds since GMT epoch) of the oldest pre-generated key in the key pool\n"
+            "  \"keypoololdest\": xxxxxx,      (numeric) the timestamp (seconds since Unix epoch) of the oldest pre-generated key in the key pool\n"
             "  \"keypoolsize\": xxxx,          (numeric) how many new keys are pre-generated\n"
             "  \"unlocked_until\": ttt,        (numeric) the timestamp in seconds since epoch (midnight Jan 1 1970 GMT) that the wallet is unlocked for transfers, or 0 if the wallet is locked\n"
             "  \"paytxfee\": x.xxxx,           (numeric) the transaction fee configuration, set in " + CURRENCY_UNIT + "/kB\n"

From c3efb586223c0459cdb47913375c2df805be925e Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Sun, 31 Jul 2016 20:53:17 +0200
Subject: [PATCH 1108/1802] Add feedelta to TxMempoolInfo

---
 src/txmempool.cpp | 8 ++++++--
 src/txmempool.h   | 3 +++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/txmempool.cpp b/src/txmempool.cpp
index e5d28ac2eaa8b..313d33507f329 100644
--- a/src/txmempool.cpp
+++ b/src/txmempool.cpp
@@ -833,6 +833,10 @@ void CTxMemPool::queryHashes(vector<uint256>& vtxid)
     }
 }
 
+static TxMempoolInfo GetInfo(CTxMemPool::indexed_transaction_set::const_iterator it) {
+    return TxMempoolInfo{it->GetSharedTx(), it->GetTime(), CFeeRate(it->GetFee(), it->GetTxSize()), it->GetModifiedFee() - it->GetFee()};
+}
+
 std::vector<TxMempoolInfo> CTxMemPool::infoAll() const
 {
     LOCK(cs);
@@ -841,7 +845,7 @@ std::vector<TxMempoolInfo> CTxMemPool::infoAll() const
     std::vector<TxMempoolInfo> ret;
     ret.reserve(mapTx.size());
     for (auto it : iters) {
-        ret.push_back(TxMempoolInfo{it->GetSharedTx(), it->GetTime(), CFeeRate(it->GetFee(), it->GetTxSize())});
+        ret.push_back(GetInfo(it));
     }
 
     return ret;
@@ -862,7 +866,7 @@ TxMempoolInfo CTxMemPool::info(const uint256& hash) const
     indexed_transaction_set::const_iterator i = mapTx.find(hash);
     if (i == mapTx.end())
         return TxMempoolInfo();
-    return TxMempoolInfo{i->GetSharedTx(), i->GetTime(), CFeeRate(i->GetFee(), i->GetTxSize())};
+    return GetInfo(i);
 }
 
 CFeeRate CTxMemPool::estimateFee(int nBlocks) const
diff --git a/src/txmempool.h b/src/txmempool.h
index bb2638c3b7808..9b0ca4655ec3f 100644
--- a/src/txmempool.h
+++ b/src/txmempool.h
@@ -329,6 +329,9 @@ struct TxMempoolInfo
 
     /** Feerate of the transaction. */
     CFeeRate feeRate;
+
+    /** The fee delta. */
+    int64_t nFeeDelta;
 };
 
 /**

From ced7c949e8648b727c05adccdc2a977f129ca2cd Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Sun, 30 Oct 2016 23:24:41 -0700
Subject: [PATCH 1109/1802] Add AcceptToMemoryPoolWithTime function

---
 src/main.cpp | 16 +++++++++++-----
 src/main.h   |  4 ++++
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index 5e17ec6251ece..ccf7efcf0da5d 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1135,7 +1135,7 @@ std::string FormatStateMessage(const CValidationState &state)
 }
 
 bool AcceptToMemoryPoolWorker(CTxMemPool& pool, CValidationState& state, const CTransaction& tx, bool fLimitFree,
-                              bool* pfMissingInputs, bool fOverrideMempoolLimit, const CAmount& nAbsurdFee,
+                              bool* pfMissingInputs, int64_t nAcceptTime, bool fOverrideMempoolLimit, const CAmount& nAbsurdFee,
                               std::vector<uint256>& vHashTxnToUncache)
 {
     const uint256 hash = tx.GetHash();
@@ -1308,7 +1308,7 @@ bool AcceptToMemoryPoolWorker(CTxMemPool& pool, CValidationState& state, const C
             }
         }
 
-        CTxMemPoolEntry entry(tx, nFees, GetTime(), dPriority, chainActive.Height(), pool.HasNoInputsOf(tx), inChainInputValue, fSpendsCoinbase, nSigOpsCost, lp);
+        CTxMemPoolEntry entry(tx, nFees, nAcceptTime, dPriority, chainActive.Height(), pool.HasNoInputsOf(tx), inChainInputValue, fSpendsCoinbase, nSigOpsCost, lp);
         unsigned int nSize = entry.GetTxSize();
 
         // Check that the transaction doesn't have an excessive number of
@@ -1572,11 +1572,11 @@ bool AcceptToMemoryPoolWorker(CTxMemPool& pool, CValidationState& state, const C
     return true;
 }
 
-bool AcceptToMemoryPool(CTxMemPool& pool, CValidationState &state, const CTransaction &tx, bool fLimitFree,
-                        bool* pfMissingInputs, bool fOverrideMempoolLimit, const CAmount nAbsurdFee)
+bool AcceptToMemoryPoolWithTime(CTxMemPool& pool, CValidationState &state, const CTransaction &tx, bool fLimitFree,
+                        bool* pfMissingInputs, int64_t nAcceptTime, bool fOverrideMempoolLimit, const CAmount nAbsurdFee)
 {
     std::vector<uint256> vHashTxToUncache;
-    bool res = AcceptToMemoryPoolWorker(pool, state, tx, fLimitFree, pfMissingInputs, fOverrideMempoolLimit, nAbsurdFee, vHashTxToUncache);
+    bool res = AcceptToMemoryPoolWorker(pool, state, tx, fLimitFree, pfMissingInputs, nAcceptTime, fOverrideMempoolLimit, nAbsurdFee, vHashTxToUncache);
     if (!res) {
         BOOST_FOREACH(const uint256& hashTx, vHashTxToUncache)
             pcoinsTip->Uncache(hashTx);
@@ -1584,6 +1584,12 @@ bool AcceptToMemoryPool(CTxMemPool& pool, CValidationState &state, const CTransa
     return res;
 }
 
+bool AcceptToMemoryPool(CTxMemPool& pool, CValidationState &state, const CTransaction &tx, bool fLimitFree,
+                        bool* pfMissingInputs, bool fOverrideMempoolLimit, const CAmount nAbsurdFee)
+{
+    return AcceptToMemoryPoolWithTime(pool, state, tx, fLimitFree, pfMissingInputs, GetTime(), fOverrideMempoolLimit, nAbsurdFee);
+}
+
 /** Return transaction in txOut, and if it was found inside a block, its hash is placed in hashBlock */
 bool GetTransaction(const uint256 &hash, CTransaction &txOut, const Consensus::Params& consensusParams, uint256 &hashBlock, bool fAllowSlow)
 {
diff --git a/src/main.h b/src/main.h
index 3eab9b89daa66..5a3af52fed02d 100644
--- a/src/main.h
+++ b/src/main.h
@@ -291,6 +291,10 @@ void PruneAndFlush();
 bool AcceptToMemoryPool(CTxMemPool& pool, CValidationState &state, const CTransaction &tx, bool fLimitFree,
                         bool* pfMissingInputs, bool fOverrideMempoolLimit=false, const CAmount nAbsurdFee=0);
 
+/** (try to) add transaction to memory pool with a specified acceptance time **/
+bool AcceptToMemoryPoolWithTime(CTxMemPool& pool, CValidationState &state, const CTransaction &tx, bool fLimitFree,
+                        bool* pfMissingInputs, int64_t nAcceptTime, bool fOverrideMempoolLimit=false, const CAmount nAbsurdFee=0);
+
 /** Convert CValidationState to a human-readable message for logging */
 std::string FormatStateMessage(const CValidationState &state);
 

From 3f78562df5e86a2a0a21812047fc3a7db8cee988 Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Sun, 30 Oct 2016 23:53:38 -0700
Subject: [PATCH 1110/1802] Add DumpMempool and LoadMempool

---
 src/init.cpp |   3 ++
 src/main.cpp | 113 +++++++++++++++++++++++++++++++++++++++++++++++++++
 src/main.h   |   6 +++
 3 files changed, 122 insertions(+)

diff --git a/src/init.cpp b/src/init.cpp
index 84b0108ea8770..efaf821f4feb5 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -207,6 +207,7 @@ void Shutdown()
 
     StopTorControl();
     UnregisterNodeSignals(GetNodeSignals());
+    DumpMempool();
 
     if (fFeeEstimatesInitialized)
     {
@@ -659,6 +660,8 @@ void ThreadImport(std::vector<boost::filesystem::path> vImportFiles)
         LogPrintf("Stopping after block import\n");
         StartShutdown();
     }
+
+    LoadMempool();
 }
 
 /** Sanity checks
diff --git a/src/main.cpp b/src/main.cpp
index ccf7efcf0da5d..11abc0d175879 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -6935,6 +6935,119 @@ int VersionBitsTipStateSinceHeight(const Consensus::Params& params, Consensus::D
     return VersionBitsStateSinceHeight(chainActive.Tip(), params, pos, versionbitscache);
 }
 
+static const uint64_t MEMPOOL_DUMP_VERSION = 1;
+
+bool LoadMempool(void)
+{
+    int64_t nExpiryTimeout = GetArg("-mempoolexpiry", DEFAULT_MEMPOOL_EXPIRY) * 60 * 60;
+    FILE* filestr = fopen((GetDataDir() / "mempool.dat").string().c_str(), "r");
+    CAutoFile file(filestr, SER_DISK, CLIENT_VERSION);
+    if (file.IsNull()) {
+        LogPrintf("Failed to open mempool file from disk. Continuing anyway.\n");
+        return false;
+    }
+
+    int64_t count = 0;
+    int64_t skipped = 0;
+    int64_t failed = 0;
+    int64_t nNow = GetTime();
+
+    try {
+        uint64_t version;
+        file >> version;
+        if (version != MEMPOOL_DUMP_VERSION) {
+            return false;
+        }
+        uint64_t num;
+        file >> num;
+        double prioritydummy = 0;
+        while (num--) {
+            CTransaction tx;
+            int64_t nTime;
+            int64_t nFeeDelta;
+            file >> tx;
+            file >> nTime;
+            file >> nFeeDelta;
+
+            CAmount amountdelta = nFeeDelta;
+            if (amountdelta) {
+                mempool.PrioritiseTransaction(tx.GetHash(), tx.GetHash().ToString(), prioritydummy, amountdelta);
+            }
+            CValidationState state;
+            if (nTime + nExpiryTimeout > nNow) {
+                LOCK(cs_main);
+                AcceptToMemoryPoolWithTime(mempool, state, tx, true, NULL, nTime);
+                if (state.IsValid()) {
+                    ++count;
+                } else {
+                    ++failed;
+                }
+            } else {
+                ++skipped;
+            }
+        }
+        std::map<uint256, CAmount> mapDeltas;
+        file >> mapDeltas;
+
+        for (const auto& i : mapDeltas) {
+            mempool.PrioritiseTransaction(i.first, i.first.ToString(), prioritydummy, i.second);
+        }
+    } catch (const std::exception& e) {
+        LogPrintf("Failed to deserialize mempool data on disk: %s. Continuing anyway.\n", e.what());
+        return false;
+    }
+
+    LogPrintf("Imported mempool transactions from disk: %i successes, %i failed, %i expired\n", count, failed, skipped);
+    return true;
+}
+
+void DumpMempool(void)
+{
+    int64_t start = GetTimeMicros();
+
+    std::map<uint256, CAmount> mapDeltas;
+    std::vector<TxMempoolInfo> vinfo;
+
+    {
+        LOCK(mempool.cs);
+        for (const auto &i : mempool.mapDeltas) {
+            mapDeltas[i.first] = i.second.first;
+        }
+        vinfo = mempool.infoAll();
+    }
+
+    int64_t mid = GetTimeMicros();
+
+    try {
+        FILE* filestr = fopen((GetDataDir() / "mempool.dat.new").string().c_str(), "w");
+        if (!filestr) {
+            return;
+        }
+
+        CAutoFile file(filestr, SER_DISK, CLIENT_VERSION);
+
+        uint64_t version = MEMPOOL_DUMP_VERSION;
+        file << version;
+
+        file << (uint64_t)vinfo.size();
+        for (const auto& i : vinfo) {
+            file << *(i.tx);
+            file << (int64_t)i.nTime;
+            file << (int64_t)i.nFeeDelta;
+            mapDeltas.erase(i.tx->GetHash());
+        }
+
+        file << mapDeltas;
+        FileCommit(file.Get());
+        file.fclose();
+        RenameOver(GetDataDir() / "mempool.dat.new", GetDataDir() / "mempool.dat");
+        int64_t last = GetTimeMicros();
+        LogPrintf("Dumped mempool: %gs to copy, %gs to dump\n", (mid-start)*0.000001, (last-mid)*0.000001);
+    } catch (const std::exception& e) {
+        LogPrintf("Failed to dump mempool: %s. Continuing anyway.\n", e.what());
+    }
+}
+
 class CMainCleanup
 {
 public:
diff --git a/src/main.h b/src/main.h
index 5a3af52fed02d..4c6af9514206c 100644
--- a/src/main.h
+++ b/src/main.h
@@ -533,6 +533,12 @@ static const unsigned int REJECT_ALREADY_KNOWN = 0x101;
 /** Transaction conflicts with a transaction already known */
 static const unsigned int REJECT_CONFLICT = 0x102;
 
+/** Dump the mempool to disk. */
+void DumpMempool();
+
+/** Load the mempool from disk. */
+bool LoadMempool();
+
 // The following things handle network-processing logic
 // (and should be moved to a separate file)
 

From 582068aa907127c12db53fbd65667dc7810d42b0 Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Mon, 31 Oct 2016 00:07:56 -0700
Subject: [PATCH 1111/1802] Add mempool.dat to doc/files.md

---
 doc/files.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/files.md b/doc/files.md
index f7eca57dcb08f..928977143be3b 100644
--- a/doc/files.md
+++ b/doc/files.md
@@ -10,6 +10,7 @@
 * db.log: wallet database log file
 * debug.log: contains debug information and general logging generated by bitcoind or bitcoin-qt
 * fee_estimates.dat: stores statistics used to estimate minimum transaction fees and priorities required for confirmation; since 0.10.0
+* mempool.dat: dump of the mempool's transactions; since 0.14.0.
 * peers.dat: peer IP address database (custom format); since 0.7.0
 * wallet.dat: personal wallet (BDB) with keys and transactions
 * .cookie: session RPC authentication cookie (written at start when cookie authentication is used, deleted on shutdown): since 0.12.0

From fa326193ad739d1f93da456b3fa73af0bbf9fdd1 Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Sun, 30 Oct 2016 16:58:13 +0100
Subject: [PATCH 1112/1802] [rpc] ParseHash: Fail when length is not 64

---
 src/rpc/server.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/rpc/server.cpp b/src/rpc/server.cpp
index 29d0bee1b2789..164e0f00e2edb 100644
--- a/src/rpc/server.cpp
+++ b/src/rpc/server.cpp
@@ -147,6 +147,8 @@ uint256 ParseHashV(const UniValue& v, string strName)
         strHex = v.get_str();
     if (!IsHex(strHex)) // Note: IsHex("") is false
         throw JSONRPCError(RPC_INVALID_PARAMETER, strName+" must be hexadecimal string (not '"+strHex+"')");
+    if (64 != strHex.length())
+        throw JSONRPCError(RPC_INVALID_PARAMETER, strprintf("%s must be of length %d (not %d)", strName, 64, strHex.length()));
     uint256 result;
     result.SetHex(strHex);
     return result;

From 65f35eb91b4ad11c96703150b202c1e9b9d12266 Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Mon, 3 Oct 2016 10:06:10 -0400
Subject: [PATCH 1113/1802] Move FlushStateToDisk call out of
 ProcessMessages::TX into ATMP

---
 src/main.cpp | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index 5e17ec6251ece..83e85f3d244bb 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -691,6 +691,16 @@ CBlockIndex* FindForkInGlobalIndex(const CChain& chain, const CBlockLocator& loc
 CCoinsViewCache *pcoinsTip = NULL;
 CBlockTreeDB *pblocktree = NULL;
 
+enum FlushStateMode {
+    FLUSH_STATE_NONE,
+    FLUSH_STATE_IF_NEEDED,
+    FLUSH_STATE_PERIODIC,
+    FLUSH_STATE_ALWAYS
+};
+
+// See definition for documentation
+bool static FlushStateToDisk(CValidationState &state, FlushStateMode mode);
+
 //////////////////////////////////////////////////////////////////////////////
 //
 // mapOrphanTransactions
@@ -1581,6 +1591,9 @@ bool AcceptToMemoryPool(CTxMemPool& pool, CValidationState &state, const CTransa
         BOOST_FOREACH(const uint256& hashTx, vHashTxToUncache)
             pcoinsTip->Uncache(hashTx);
     }
+    // After we've (potentially) uncached entries, ensure our coins cache is still within its size limits
+    CValidationState stateDummy;
+    FlushStateToDisk(stateDummy, FLUSH_STATE_PERIODIC);
     return res;
 }
 
@@ -2558,13 +2571,6 @@ bool ConnectBlock(const CBlock& block, CValidationState& state, CBlockIndex* pin
     return true;
 }
 
-enum FlushStateMode {
-    FLUSH_STATE_NONE,
-    FLUSH_STATE_IF_NEEDED,
-    FLUSH_STATE_PERIODIC,
-    FLUSH_STATE_ALWAYS
-};
-
 /**
  * Update the on-disk chain state.
  * The caches and indexes are flushed depending on the mode we're called with
@@ -5684,7 +5690,6 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
                 Misbehaving(pfrom->GetId(), nDoS);
             }
         }
-        FlushStateToDisk(state, FLUSH_STATE_PERIODIC);
     }
 
 

From fc0c24f67b4323f215f908767b644bf022c7fe9a Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Sat, 1 Oct 2016 23:44:40 -0400
Subject: [PATCH 1114/1802] Move MarkBlockAsReceived out of ProcessNewMessage

---
 src/main.cpp | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index 83e85f3d244bb..c6b82bf82512d 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -3702,6 +3702,11 @@ static bool AcceptBlock(const CBlock& block, CValidationState& state, const CCha
     // not process unrequested blocks.
     bool fTooFarAhead = (pindex->nHeight > int(chainActive.Height() + MIN_BLOCKS_TO_KEEP));
 
+    // TODO: Decouple this function from the block download logic by removing fRequested
+    // This requires some new chain datastructure to efficiently look up if a
+    // block is in a chain leading to a candidate for best tip, despite not
+    // being such a candidate itself.
+
     // TODO: deal better with return value and error conditions for duplicate
     // and unrequested blocks.
     if (fAlreadyHave) return true;
@@ -3750,13 +3755,11 @@ bool ProcessNewBlock(CValidationState& state, const CChainParams& chainparams, C
 {
     {
         LOCK(cs_main);
-        bool fRequested = MarkBlockAsReceived(pblock->GetHash());
-        fRequested |= fForceProcessing;
 
         // Store to disk
         CBlockIndex *pindex = NULL;
         bool fNewBlock = false;
-        bool ret = AcceptBlock(*pblock, state, chainparams, &pindex, fRequested, dbp, &fNewBlock);
+        bool ret = AcceptBlock(*pblock, state, chainparams, &pindex, fForceProcessing, dbp, &fNewBlock);
         if (pindex && pfrom) {
             mapBlockSource[pindex->GetBlockHash()] = pfrom->GetId();
             if (fNewBlock) pfrom->nLastBlockTime = GetTime();
@@ -5858,12 +5861,16 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
                 std::vector<CInv> invs;
                 invs.push_back(CInv(MSG_BLOCK | GetFetchFlags(pfrom, chainActive.Tip(), chainparams.GetConsensus()), resp.blockhash));
                 pfrom->PushMessage(NetMsgType::GETDATA, invs);
-            } else
+            } else {
+                MarkBlockAsReceived(resp.blockhash); // it is now an empty pointer
                 fBlockRead = true;
+            }
         } // Don't hold cs_main when we call into ProcessNewBlock
         if (fBlockRead) {
             CValidationState state;
-            ProcessNewBlock(state, chainparams, pfrom, &block, false, NULL);
+            // Since we requested this block (it was in mapBlocksInFlight), force it to be processed,
+            // even if it would not be a candidate for new tip (missing previous block, chain not long enough, etc)
+            ProcessNewBlock(state, chainparams, pfrom, &block, true, NULL);
             int nDoS;
             if (state.IsInvalid(nDoS)) {
                 assert (state.GetRejectCode() < REJECT_INTERNAL); // Blocks are never rejected with internal reject codes
@@ -6039,6 +6046,12 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
         // Such an unrequested block may still be processed, subject to the
         // conditions in AcceptBlock().
         bool forceProcessing = pfrom->fWhitelisted && !IsInitialBlockDownload();
+        {
+            LOCK(cs_main);
+            // Also always process if we requested the block explicitly, as we may
+            // need it even though it is not a candidate for a new best tip.
+            forceProcessing |= MarkBlockAsReceived(block.GetHash());
+        }
         ProcessNewBlock(state, chainparams, pfrom, &block, forceProcessing, NULL);
         int nDoS;
         if (state.IsInvalid(nDoS)) {

From d6ea737be19a0001e69e4e854eb1cef21523ea7a Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Sun, 2 Oct 2016 11:29:35 -0400
Subject: [PATCH 1115/1802] Remove network state wipe from UnloadBlockIndex.

UnloadBlockIndex is only used during init if we end up reindexing
to clear our block state so that we can start over. However, at
that time no connections have been brought up as CConnman hasn't
been started yet, so all of the network processing state logic is
empty when its called.

Additionally, the initialization of the recentRejects set is moved
to InitPeerLogic.
---
 src/init.cpp |  4 ++++
 src/main.cpp | 17 ++++++++---------
 src/main.h   |  2 +-
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/src/init.cpp b/src/init.cpp
index 84b0108ea8770..0f42d907b9b4a 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -1100,6 +1100,10 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
         return false;
 #endif
     // ********************************************************* Step 6: network initialization
+    // Note that we absolutely cannot open any actual connections
+    // until the very end ("start node") as the UTXO/block state
+    // is not yet setup and may end up being set up twice if we
+    // need to reindex later.
 
     assert(!g_connman);
     g_connman = std::unique_ptr<CConnman>(new CConnman(GetRand(std::numeric_limits<uint64_t>::max()), GetRand(std::numeric_limits<uint64_t>::max())));
diff --git a/src/main.cpp b/src/main.cpp
index c6b82bf82512d..5be97d586749f 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -4272,6 +4272,9 @@ bool RewindBlockIndex(const CChainParams& params)
     return true;
 }
 
+// May NOT be used after any connections are up as much
+// of the peer-processing logic assumes a consistent
+// block index state
 void UnloadBlockIndex()
 {
     LOCK(cs_main);
@@ -4282,18 +4285,12 @@ void UnloadBlockIndex()
     mempool.clear();
     mapOrphanTransactions.clear();
     mapOrphanTransactionsByPrev.clear();
-    nSyncStarted = 0;
     mapBlocksUnlinked.clear();
     vinfoBlockFile.clear();
     nLastBlockFile = 0;
     nBlockSequenceId = 1;
-    mapBlockSource.clear();
-    mapBlocksInFlight.clear();
-    nPreferredDownload = 0;
     setDirtyBlockIndex.clear();
     setDirtyFileInfo.clear();
-    mapNodeState.clear();
-    recentRejects.reset(NULL);
     versionbitscache.Clear();
     for (int b = 0; b < VERSIONBITS_NUM_BITS; b++) {
         warningcache[b].clear();
@@ -4318,9 +4315,6 @@ bool InitBlockIndex(const CChainParams& chainparams)
 {
     LOCK(cs_main);
 
-    // Initialize global variables that cannot be constructed at startup.
-    recentRejects.reset(new CRollingBloomFilter(120000, 0.000001));
-
     // Check whether we're already initialized
     if (chainActive.Genesis() != NULL)
         return true;
@@ -4709,6 +4703,11 @@ std::string GetWarnings(const std::string& strFor)
 // blockchain -> download logic notification
 //
 
+PeerLogicValidation::PeerLogicValidation(CConnman* connmanIn) : connman(connmanIn) {
+    // Initialize global variables that cannot be constructed at startup.
+    recentRejects.reset(new CRollingBloomFilter(120000, 0.000001));
+}
+
 void PeerLogicValidation::UpdatedBlockTip(const CBlockIndex *pindexNew, const CBlockIndex *pindexFork, bool fInitialDownload) {
     const int nNewHeight = pindexNew->nHeight;
     connman->SetBestHeight(nNewHeight);
diff --git a/src/main.h b/src/main.h
index 3eab9b89daa66..3cab1e6afae0e 100644
--- a/src/main.h
+++ b/src/main.h
@@ -542,7 +542,7 @@ class PeerLogicValidation : public CValidationInterface {
     CConnman* connman;
 
 public:
-    PeerLogicValidation(CConnman* connmanIn) : connman(connmanIn) {}
+    PeerLogicValidation(CConnman* connmanIn);
 
     virtual void UpdatedBlockTip(const CBlockIndex *pindexNew, const CBlockIndex *pindexFork, bool fInitialDownload);
     virtual void BlockChecked(const CBlock& block, const CValidationState& state);

From d8670fb103f95e6dc6f469d71c9ee4f6ff2407e0 Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Sun, 2 Oct 2016 12:45:24 -0400
Subject: [PATCH 1116/1802] Move all calls to CheckBlockIndex out of
 net-processing logic

This will result in many more calls to CheckBlockIndex when
connecting a list of headers (eg in ::HEADERS messages processing)
but its only enabled in debug mode, and that should mostly just be
during IBD, so it should be OK.
---
 src/main.cpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index 5be97d586749f..b99515a656352 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -3675,6 +3675,8 @@ static bool AcceptBlockHeader(const CBlockHeader& block, CValidationState& state
     if (ppindex)
         *ppindex = pindex;
 
+    CheckBlockIndex(chainparams.GetConsensus());
+
     return true;
 }
 
@@ -5827,8 +5829,6 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
                 return ProcessMessage(pfrom, NetMsgType::HEADERS, vHeadersMsg, nTimeReceived, chainparams, connman);
             }
         }
-
-        CheckBlockIndex(chainparams.GetConsensus());
     }
 
     else if (strCommand == NetMsgType::BLOCKTXN && !fImporting && !fReindex) // Ignore blocks received while importing
@@ -6025,8 +6025,6 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
                 }
             }
         }
-
-        CheckBlockIndex(chainparams.GetConsensus());
         }
 
         NotifyHeaderTip();

From f5b960be4e9a9ab669e1436194fa904ccba58900 Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Thu, 6 Oct 2016 14:11:45 -0400
Subject: [PATCH 1117/1802] Move nTimeBestReceived updating into net processing
 code

---
 src/main.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index b99515a656352..8232b0f74b3b4 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -63,7 +63,7 @@ CCriticalSection cs_main;
 BlockMap mapBlockIndex;
 CChain chainActive;
 CBlockIndex *pindexBestHeader = NULL;
-int64_t nTimeBestReceived = 0;
+int64_t nTimeBestReceived = 0; // Used only to inform the wallet of when we last received a block
 CWaitableCriticalSection csBestBlock;
 CConditionVariable cvBlockChange;
 int nScriptCheckThreads = 0;
@@ -2690,7 +2690,6 @@ void static UpdateTip(CBlockIndex *pindexNew, const CChainParams& chainParams) {
     chainActive.SetTip(pindexNew);
 
     // New best block
-    nTimeBestReceived = GetTime();
     mempool.AddTransactionsUpdated(1);
 
     cvBlockChange.notify_all();
@@ -4736,6 +4735,8 @@ void PeerLogicValidation::UpdatedBlockTip(const CBlockIndex *pindexNew, const CB
             }
         });
     }
+
+    nTimeBestReceived = GetTime();
 }
 
 void PeerLogicValidation::BlockChecked(const CBlock& block, const CValidationState& state) {

From aff6584e09938768838a768b67722db553cf8ef4 Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Mon, 31 Oct 2016 17:06:15 -0400
Subject: [PATCH 1118/1802] net: constify a few CNode vars to indicate that
 they're threadsafe

---
 src/net.cpp | 11 +++++------
 src/net.h   |  8 ++++----
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/net.cpp b/src/net.cpp
index 48ba9588d9dc3..f27516aae6477 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -2512,9 +2512,13 @@ unsigned int CConnman::GetSendBufferSize() const{ return nSendBufferMaxSize; }
 CNode::CNode(NodeId idIn, ServiceFlags nLocalServicesIn, int nMyStartingHeightIn, SOCKET hSocketIn, const CAddress& addrIn, uint64_t nKeyedNetGroupIn, const std::string& addrNameIn, bool fInboundIn) :
     ssSend(SER_NETWORK, INIT_PROTO_VERSION),
     addr(addrIn),
+    fInbound(fInboundIn),
+    id(idIn),
     nKeyedNetGroup(nKeyedNetGroupIn),
     addrKnown(5000, 0.001),
-    filterInventoryKnown(50000, 0.000001)
+    filterInventoryKnown(50000, 0.000001),
+    nLocalServices(nLocalServicesIn),
+    nMyStartingHeight(nMyStartingHeightIn)
 {
     nServices = NODE_NONE;
     nServicesExpected = NODE_NONE;
@@ -2533,7 +2537,6 @@ CNode::CNode(NodeId idIn, ServiceFlags nLocalServicesIn, int nMyStartingHeightIn
     fOneShot = false;
     fClient = false; // set by version message
     fFeeler = false;
-    fInbound = fInboundIn;
     fNetworkNode = false;
     fSuccessfullyConnected = false;
     fDisconnect = false;
@@ -2562,12 +2565,8 @@ CNode::CNode(NodeId idIn, ServiceFlags nLocalServicesIn, int nMyStartingHeightIn
     minFeeFilter = 0;
     lastSentFeeFilter = 0;
     nextSendTimeFeeFilter = 0;
-    id = idIn;
     nOptimisticBytesWritten = 0;
-    nLocalServices = nLocalServicesIn;
-
     GetRandBytes((unsigned char*)&nLocalHostNonce, sizeof(nLocalHostNonce));
-    nMyStartingHeight = nMyStartingHeightIn;
 
     BOOST_FOREACH(const std::string &msg, getAllNetMessageTypes())
         mapRecvBytesPerMsgCmd[msg] = 0;
diff --git a/src/net.h b/src/net.h
index 58b492e5929f2..a065a990b9e37 100644
--- a/src/net.h
+++ b/src/net.h
@@ -589,7 +589,7 @@ class CNode
     bool fFeeler; // If true this node is being used as a short lived feeler.
     bool fOneShot;
     bool fClient;
-    bool fInbound;
+    const bool fInbound;
     bool fNetworkNode;
     bool fSuccessfullyConnected;
     bool fDisconnect;
@@ -603,7 +603,7 @@ class CNode
     CCriticalSection cs_filter;
     CBloomFilter* pfilter;
     int nRefCount;
-    NodeId id;
+    const NodeId id;
 
     const uint64_t nKeyedNetGroup;
 protected:
@@ -679,8 +679,8 @@ class CNode
 
     uint64_t nLocalHostNonce;
     // Services offered to this peer
-    ServiceFlags nLocalServices;
-    int nMyStartingHeight;
+    const ServiceFlags nLocalServices;
+    const int nMyStartingHeight;
 public:
 
     NodeId GetId() const {

From 59ac5c5b72fef6a70fe621537faf27df1076b524 Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Wed, 26 Oct 2016 15:10:15 -0400
Subject: [PATCH 1119/1802] net: Use deterministic randomness for CNode's
 nonce, and make it const

---
 src/net.cpp            | 21 ++++++++++++++++-----
 src/net.h              |  4 ++--
 src/test/DoS_tests.cpp |  8 ++++----
 src/test/net_tests.cpp |  4 ++--
 4 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/src/net.cpp b/src/net.cpp
index f27516aae6477..18d25cbcd1128 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -64,6 +64,7 @@
 const static std::string NET_MESSAGE_COMMAND_OTHER = "*other*";
 
 static const uint64_t RANDOMIZER_ID_NETGROUP = 0x6c0edd8036ef4036ULL; // SHA256("netgroup")[0:8]
+static const uint64_t RANDOMIZER_ID_LOCALHOSTNONCE = 0xd93e69e2bbfa5735ULL; // SHA256("localhostnonce")[0:8]
 //
 // Global state variables
 //
@@ -389,7 +390,10 @@ CNode* CConnman::ConnectNode(CAddress addrConnect, const char *pszDest, bool fCo
         addrman.Attempt(addrConnect, fCountFailure);
 
         // Add node
-        CNode* pnode = new CNode(GetNewNodeId(), nLocalServices, GetBestHeight(), hSocket, addrConnect, CalculateKeyedNetGroup(addrConnect), pszDest ? pszDest : "", false);
+        NodeId id = GetNewNodeId();
+        uint64_t nonce = GetDeterministicRandomizer(RANDOMIZER_ID_LOCALHOSTNONCE).Write(id).Finalize();
+        CNode* pnode = new CNode(id, nLocalServices, GetBestHeight(), hSocket, addrConnect, CalculateKeyedNetGroup(addrConnect), nonce, pszDest ? pszDest : "", false);
+
         GetNodeSignals().InitializeNode(pnode->GetId(), pnode);
         pnode->AddRef();
 
@@ -1024,7 +1028,10 @@ void CConnman::AcceptConnection(const ListenSocket& hListenSocket) {
         }
     }
 
-    CNode* pnode = new CNode(GetNewNodeId(), nLocalServices, GetBestHeight(), hSocket, addr, CalculateKeyedNetGroup(addr), "", true);
+    NodeId id = GetNewNodeId();
+    uint64_t nonce = GetDeterministicRandomizer(RANDOMIZER_ID_LOCALHOSTNONCE).Write(id).Finalize();
+
+    CNode* pnode = new CNode(id, nLocalServices, GetBestHeight(), hSocket, addr, CalculateKeyedNetGroup(addr), nonce, "", true);
     GetNodeSignals().InitializeNode(pnode->GetId(), pnode);
     pnode->AddRef();
     pnode->fWhitelisted = whitelisted;
@@ -2118,7 +2125,11 @@ bool CConnman::Start(boost::thread_group& threadGroup, CScheduler& scheduler, st
     if (pnodeLocalHost == NULL) {
         CNetAddr local;
         LookupHost("127.0.0.1", local, false);
-        pnodeLocalHost = new CNode(GetNewNodeId(), nLocalServices, GetBestHeight(), INVALID_SOCKET, CAddress(CService(local, 0), nLocalServices), 0);
+
+        NodeId id = GetNewNodeId();
+        uint64_t nonce = GetDeterministicRandomizer(RANDOMIZER_ID_LOCALHOSTNONCE).Write(id).Finalize();
+
+        pnodeLocalHost = new CNode(id, nLocalServices, GetBestHeight(), INVALID_SOCKET, CAddress(CService(local, 0), nLocalServices), 0, nonce);
         GetNodeSignals().InitializeNode(pnodeLocalHost->GetId(), pnodeLocalHost);
     }
 
@@ -2509,7 +2520,7 @@ void CNode::Fuzz(int nChance)
 unsigned int CConnman::GetReceiveFloodSize() const { return nReceiveFloodSize; }
 unsigned int CConnman::GetSendBufferSize() const{ return nSendBufferMaxSize; }
 
-CNode::CNode(NodeId idIn, ServiceFlags nLocalServicesIn, int nMyStartingHeightIn, SOCKET hSocketIn, const CAddress& addrIn, uint64_t nKeyedNetGroupIn, const std::string& addrNameIn, bool fInboundIn) :
+CNode::CNode(NodeId idIn, ServiceFlags nLocalServicesIn, int nMyStartingHeightIn, SOCKET hSocketIn, const CAddress& addrIn, uint64_t nKeyedNetGroupIn, uint64_t nLocalHostNonceIn, const std::string& addrNameIn, bool fInboundIn) :
     ssSend(SER_NETWORK, INIT_PROTO_VERSION),
     addr(addrIn),
     fInbound(fInboundIn),
@@ -2517,6 +2528,7 @@ CNode::CNode(NodeId idIn, ServiceFlags nLocalServicesIn, int nMyStartingHeightIn
     nKeyedNetGroup(nKeyedNetGroupIn),
     addrKnown(5000, 0.001),
     filterInventoryKnown(50000, 0.000001),
+    nLocalHostNonce(nLocalHostNonceIn),
     nLocalServices(nLocalServicesIn),
     nMyStartingHeight(nMyStartingHeightIn)
 {
@@ -2566,7 +2578,6 @@ CNode::CNode(NodeId idIn, ServiceFlags nLocalServicesIn, int nMyStartingHeightIn
     lastSentFeeFilter = 0;
     nextSendTimeFeeFilter = 0;
     nOptimisticBytesWritten = 0;
-    GetRandBytes((unsigned char*)&nLocalHostNonce, sizeof(nLocalHostNonce));
 
     BOOST_FOREACH(const std::string &msg, getAllNetMessageTypes())
         mapRecvBytesPerMsgCmd[msg] = 0;
diff --git a/src/net.h b/src/net.h
index a065a990b9e37..bfce516237df8 100644
--- a/src/net.h
+++ b/src/net.h
@@ -669,7 +669,7 @@ class CNode
     CAmount lastSentFeeFilter;
     int64_t nextSendTimeFeeFilter;
 
-    CNode(NodeId id, ServiceFlags nLocalServicesIn, int nMyStartingHeightIn, SOCKET hSocketIn, const CAddress &addrIn, uint64_t nKeyedNetGroupIn, const std::string &addrNameIn = "", bool fInboundIn = false);
+    CNode(NodeId id, ServiceFlags nLocalServicesIn, int nMyStartingHeightIn, SOCKET hSocketIn, const CAddress &addrIn, uint64_t nKeyedNetGroupIn, uint64_t nLocalHostNonceIn, const std::string &addrNameIn = "", bool fInboundIn = false);
     ~CNode();
 
 private:
@@ -677,7 +677,7 @@ class CNode
     void operator=(const CNode&);
 
 
-    uint64_t nLocalHostNonce;
+    const uint64_t nLocalHostNonce;
     // Services offered to this peer
     const ServiceFlags nLocalServices;
     const int nMyStartingHeight;
diff --git a/src/test/DoS_tests.cpp b/src/test/DoS_tests.cpp
index 97abeb7211c8b..4aa7166815790 100644
--- a/src/test/DoS_tests.cpp
+++ b/src/test/DoS_tests.cpp
@@ -48,7 +48,7 @@ BOOST_AUTO_TEST_CASE(DoS_banning)
 {
     connman->ClearBanned();
     CAddress addr1(ip(0xa0b0c001), NODE_NONE);
-    CNode dummyNode1(id++, NODE_NETWORK, 0, INVALID_SOCKET, addr1, 0, "", true);
+    CNode dummyNode1(id++, NODE_NETWORK, 0, INVALID_SOCKET, addr1, 0, 0, "", true);
     GetNodeSignals().InitializeNode(dummyNode1.GetId(), &dummyNode1);
     dummyNode1.nVersion = 1;
     Misbehaving(dummyNode1.GetId(), 100); // Should get banned
@@ -57,7 +57,7 @@ BOOST_AUTO_TEST_CASE(DoS_banning)
     BOOST_CHECK(!connman->IsBanned(ip(0xa0b0c001|0x0000ff00))); // Different IP, not banned
 
     CAddress addr2(ip(0xa0b0c002), NODE_NONE);
-    CNode dummyNode2(id++, NODE_NETWORK, 0, INVALID_SOCKET, addr2, 1, "", true);
+    CNode dummyNode2(id++, NODE_NETWORK, 0, INVALID_SOCKET, addr2, 1, 1, "", true);
     GetNodeSignals().InitializeNode(dummyNode2.GetId(), &dummyNode2);
     dummyNode2.nVersion = 1;
     Misbehaving(dummyNode2.GetId(), 50);
@@ -74,7 +74,7 @@ BOOST_AUTO_TEST_CASE(DoS_banscore)
     connman->ClearBanned();
     mapArgs["-banscore"] = "111"; // because 11 is my favorite number
     CAddress addr1(ip(0xa0b0c001), NODE_NONE);
-    CNode dummyNode1(id++, NODE_NETWORK, 0, INVALID_SOCKET, addr1, 3, "", true);
+    CNode dummyNode1(id++, NODE_NETWORK, 0, INVALID_SOCKET, addr1, 3, 1, "", true);
     GetNodeSignals().InitializeNode(dummyNode1.GetId(), &dummyNode1);
     dummyNode1.nVersion = 1;
     Misbehaving(dummyNode1.GetId(), 100);
@@ -96,7 +96,7 @@ BOOST_AUTO_TEST_CASE(DoS_bantime)
     SetMockTime(nStartTime); // Overrides future calls to GetTime()
 
     CAddress addr(ip(0xa0b0c001), NODE_NONE);
-    CNode dummyNode(id++, NODE_NETWORK, 0, INVALID_SOCKET, addr, 4, "", true);
+    CNode dummyNode(id++, NODE_NETWORK, 0, INVALID_SOCKET, addr, 4, 4, "", true);
     GetNodeSignals().InitializeNode(dummyNode.GetId(), &dummyNode);
     dummyNode.nVersion = 1;
 
diff --git a/src/test/net_tests.cpp b/src/test/net_tests.cpp
index f4b5768693bde..e0460109d5c23 100644
--- a/src/test/net_tests.cpp
+++ b/src/test/net_tests.cpp
@@ -164,12 +164,12 @@ BOOST_AUTO_TEST_CASE(cnode_simple_test)
     bool fInboundIn = false;
 
     // Test that fFeeler is false by default.
-    CNode* pnode1 = new CNode(id++, NODE_NETWORK, height, hSocket, addr, 0, pszDest, fInboundIn);
+    CNode* pnode1 = new CNode(id++, NODE_NETWORK, height, hSocket, addr, 0, 0, pszDest, fInboundIn);
     BOOST_CHECK(pnode1->fInbound == false);
     BOOST_CHECK(pnode1->fFeeler == false);
 
     fInboundIn = true;
-    CNode* pnode2 = new CNode(id++, NODE_NETWORK, height, hSocket, addr, 1, pszDest, fInboundIn);
+    CNode* pnode2 = new CNode(id++, NODE_NETWORK, height, hSocket, addr, 1, 1, pszDest, fInboundIn);
     BOOST_CHECK(pnode2->fInbound == true);
     BOOST_CHECK(pnode2->fFeeler == false);
 }

From d32036a47d9ccdc38628a7a75bb8b711af462e4f Mon Sep 17 00:00:00 2001
From: Gregory Maxwell <greg@xiph.org>
Date: Tue, 1 Nov 2016 00:08:47 +0000
Subject: [PATCH 1120/1802] Use RelevantServices instead of node_network in
 AttemptToEvict.

Use of node_network here is really meant to be a proxy of "likely to
 send us blocks in the future".  RelevantServices is the right criteria
 now.
---
 src/net.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/net.cpp b/src/net.cpp
index 48ba9588d9dc3..6020da16f91e5 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -825,7 +825,7 @@ struct NodeEvictionCandidate
     int64_t nMinPingUsecTime;
     int64_t nLastBlockTime;
     int64_t nLastTXTime;
-    bool fNetworkNode;
+    bool fRelevantServices;
     bool fRelayTxes;
     bool fBloomFilter;
     CAddress addr;
@@ -850,7 +850,7 @@ static bool CompareNodeBlockTime(const NodeEvictionCandidate &a, const NodeEvict
 {
     // There is a fall-through here because it is common for a node to have many peers which have not yet relayed a block.
     if (a.nLastBlockTime != b.nLastBlockTime) return a.nLastBlockTime < b.nLastBlockTime;
-    if (a.fNetworkNode != b.fNetworkNode) return b.fNetworkNode;
+    if (a.fRelevantServices != b.fRelevantServices) return b.fRelevantServices;
     return a.nTimeConnected > b.nTimeConnected;
 }
 
@@ -885,7 +885,8 @@ bool CConnman::AttemptToEvictConnection()
             if (node->fDisconnect)
                 continue;
             NodeEvictionCandidate candidate = {node->id, node->nTimeConnected, node->nMinPingUsecTime,
-                                               node->nLastBlockTime, node->nLastTXTime, node->fNetworkNode,
+                                               node->nLastBlockTime, node->nLastTXTime,
+                                               (node->nServices & nRelevantServices) == nRelevantServices,
                                                node->fRelayTxes, node->pfilter != NULL, node->addr, node->nKeyedNetGroup};
             vEvictionCandidates.push_back(candidate);
         }

From cccf73db0483cc3945bf8389ce197df35e931e16 Mon Sep 17 00:00:00 2001
From: Robert McLaughlin <robert@sparkk.us>
Date: Tue, 1 Nov 2016 21:04:26 -0400
Subject: [PATCH 1121/1802] trivial: fix bloom filter init to isEmpty = true

Fixes newly initialized bloom filters being
constructed with isEmpty(false), which still
works but loses the possible speedup when
checking for key membership in an empty filter.
---
 src/bloom.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bloom.cpp b/src/bloom.cpp
index 2677652ada2ce..d00befc61ca68 100644
--- a/src/bloom.cpp
+++ b/src/bloom.cpp
@@ -34,7 +34,7 @@ CBloomFilter::CBloomFilter(unsigned int nElements, double nFPRate, unsigned int
      * See https://en.wikipedia.org/wiki/Bloom_filter for an explanation of these formulas
      */
     isFull(false),
-    isEmpty(false),
+    isEmpty(true),
     nHashFuncs(min((unsigned int)(vData.size() * 8 / nElements * LN2), MAX_HASH_FUNCS)),
     nTweak(nTweakIn),
     nFlags(nFlagsIn)

From fd46136dfaf68a7046cf7b8693824d73ac6b1caf Mon Sep 17 00:00:00 2001
From: Gregory Maxwell <greg@xiph.org>
Date: Sat, 22 Oct 2016 05:33:25 +0000
Subject: [PATCH 1122/1802] IBD check uses minimumchain work instead of
 checkpoints.

This introduces a 'minimum chain work' chainparam which is intended
 to be the known amount of work in the chain for the network at the
 time of software release.  If you don't have this much work, you're
 not yet caught up.

This is used instead of the count of blocks test from checkpoints.

This criteria is trivial to keep updated as there is no element of
subjectivity, trust, or position dependence to it. It is also a more
reliable metric of sync status than a block count.
---
 doc/release-process.md |  1 +
 src/chainparams.cpp    | 10 ++++++++++
 src/consensus/params.h |  1 +
 src/main.cpp           |  6 ++++--
 4 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/doc/release-process.md b/doc/release-process.md
index 63f75fb3992a2..85cf160f47a27 100644
--- a/doc/release-process.md
+++ b/doc/release-process.md
@@ -12,6 +12,7 @@ Before every minor and major release:
 * Update [bips.md](bips.md) to account for changes since the last release.
 * Update version in sources (see below)
 * Write release notes (see below)
+* Update `src/chainparams.cpp` nMinimumChainWork with information from the getblockchaininfo rpc.
 
 Before every major release:
 
diff --git a/src/chainparams.cpp b/src/chainparams.cpp
index 5850016ae2785..a57ab632e4cfe 100644
--- a/src/chainparams.cpp
+++ b/src/chainparams.cpp
@@ -96,6 +96,9 @@ class CMainParams : public CChainParams {
         consensus.vDeployments[Consensus::DEPLOYMENT_SEGWIT].nStartTime = 1479168000; // November 15th, 2016.
         consensus.vDeployments[Consensus::DEPLOYMENT_SEGWIT].nTimeout = 1510704000; // November 15th, 2017.
 
+        // The best chain should have at least this much work.
+        consensus.nMinimumChainWork = uint256S("0x0000000000000000000000000000000000000000002cb971dd56d1c583c20f90");
+
         /**
          * The message start string is designed to be unlikely to occur in normal data.
          * The characters are rarely used upper ASCII, not valid as UTF-8, and produce
@@ -191,6 +194,9 @@ class CTestNetParams : public CChainParams {
         consensus.vDeployments[Consensus::DEPLOYMENT_SEGWIT].nStartTime = 1462060800; // May 1st 2016
         consensus.vDeployments[Consensus::DEPLOYMENT_SEGWIT].nTimeout = 1493596800; // May 1st 2017
 
+        // The best chain should have at least this much work.
+        consensus.nMinimumChainWork = uint256S("0x0000000000000000000000000000000000000000000000198b4def2baa9338d6");
+
         pchMessageStart[0] = 0x0b;
         pchMessageStart[1] = 0x11;
         pchMessageStart[2] = 0x09;
@@ -224,6 +230,7 @@ class CTestNetParams : public CChainParams {
         fRequireStandard = false;
         fMineBlocksOnDemand = false;
 
+
         checkpointData = (CCheckpointData) {
             boost::assign::map_list_of
             ( 546, uint256S("000000002a936ca763904c3c35fce2f3556c559c0214345d31b1bcebf76acb70")),
@@ -265,6 +272,9 @@ class CRegTestParams : public CChainParams {
         consensus.vDeployments[Consensus::DEPLOYMENT_SEGWIT].nStartTime = 0;
         consensus.vDeployments[Consensus::DEPLOYMENT_SEGWIT].nTimeout = 999999999999ULL;
 
+        // The best chain should have at least this much work.
+        consensus.nMinimumChainWork = uint256S("0x00");
+
         pchMessageStart[0] = 0xfa;
         pchMessageStart[1] = 0xbf;
         pchMessageStart[2] = 0xb5;
diff --git a/src/consensus/params.h b/src/consensus/params.h
index 0e73cace83171..20efc68ade8ec 100644
--- a/src/consensus/params.h
+++ b/src/consensus/params.h
@@ -61,6 +61,7 @@ struct Params {
     int64_t nPowTargetSpacing;
     int64_t nPowTargetTimespan;
     int64_t DifficultyAdjustmentInterval() const { return nPowTargetTimespan / nPowTargetSpacing; }
+    uint256 nMinimumChainWork;
 };
 } // namespace Consensus
 
diff --git a/src/main.cpp b/src/main.cpp
index 5e17ec6251ece..6b33539a2efb2 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1740,7 +1740,9 @@ bool IsInitialBlockDownload()
         return false;
     if (fImporting || fReindex)
         return true;
-    if (fCheckpointsEnabled && chainActive.Height() < Checkpoints::GetTotalBlocksEstimate(chainParams.Checkpoints()))
+    if (chainActive.Tip() == NULL)
+        return true;
+    if (chainActive.Tip()->nChainWork < UintToArith256(chainParams.GetConsensus().nMinimumChainWork))
         return true;
     bool state = (chainActive.Height() < pindexBestHeader->nHeight - 24 * 6 ||
             std::max(chainActive.Tip()->GetBlockTime(), pindexBestHeader->GetBlockTime()) < GetTime() - nMaxTipAge);
@@ -1774,7 +1776,7 @@ void CheckForkWarningConditions()
 {
     AssertLockHeld(cs_main);
     // Before we get past initial download, we cannot reliably alert about forks
-    // (we assume we don't get stuck on a fork before the last checkpoint)
+    // (we assume we don't get stuck on a fork before finishing our initial sync)
     if (IsInitialBlockDownload())
         return;
 

From 2082b5574cec783f4ff99941492d92e05680b293 Mon Sep 17 00:00:00 2001
From: Gregory Maxwell <greg@xiph.org>
Date: Wed, 2 Nov 2016 01:49:45 +0000
Subject: [PATCH 1123/1802] Remove GetTotalBlocksEstimate and checkpoint tests
 that test nothing.

GetTotalBlocksEstimate is no longer used and it was the only thing
 the checkpoint tests were testing.

Since checkpoints are on their way out it makes more sense to remove
 the test file than to cook up a new pointless test.
---
 src/Makefile.test.include      |  1 -
 src/checkpoints.cpp            | 10 ----------
 src/checkpoints.h              |  3 ---
 src/test/Checkpoints_tests.cpp | 27 ---------------------------
 4 files changed, 41 deletions(-)
 delete mode 100644 src/test/Checkpoints_tests.cpp

diff --git a/src/Makefile.test.include b/src/Makefile.test.include
index 5ce1bbb8963c1..4e4cca14caf03 100644
--- a/src/Makefile.test.include
+++ b/src/Makefile.test.include
@@ -50,7 +50,6 @@ BITCOIN_TESTS =\
   test/bip32_tests.cpp \
   test/blockencodings_tests.cpp \
   test/bloom_tests.cpp \
-  test/Checkpoints_tests.cpp \
   test/coins_tests.cpp \
   test/compress_tests.cpp \
   test/crypto_tests.cpp \
diff --git a/src/checkpoints.cpp b/src/checkpoints.cpp
index aefddce464152..d22c188c16e00 100644
--- a/src/checkpoints.cpp
+++ b/src/checkpoints.cpp
@@ -55,16 +55,6 @@ namespace Checkpoints {
         return fWorkBefore / (fWorkBefore + fWorkAfter);
     }
 
-    int GetTotalBlocksEstimate(const CCheckpointData& data)
-    {
-        const MapCheckpoints& checkpoints = data.mapCheckpoints;
-
-        if (checkpoints.empty())
-            return 0;
-
-        return checkpoints.rbegin()->first;
-    }
-
     CBlockIndex* GetLastCheckpoint(const CCheckpointData& data)
     {
         const MapCheckpoints& checkpoints = data.mapCheckpoints;
diff --git a/src/checkpoints.h b/src/checkpoints.h
index cd25ea5379dbd..04346f35ffa7c 100644
--- a/src/checkpoints.h
+++ b/src/checkpoints.h
@@ -19,9 +19,6 @@ struct CCheckpointData;
 namespace Checkpoints
 {
 
-//! Return conservative estimate of total number of blocks, 0 if unknown
-int GetTotalBlocksEstimate(const CCheckpointData& data);
-
 //! Returns last CBlockIndex* in mapBlockIndex that is a checkpoint
 CBlockIndex* GetLastCheckpoint(const CCheckpointData& data);
 
diff --git a/src/test/Checkpoints_tests.cpp b/src/test/Checkpoints_tests.cpp
deleted file mode 100644
index 1b7d368e13ec0..0000000000000
--- a/src/test/Checkpoints_tests.cpp
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright (c) 2011-2015 The Bitcoin Core developers
-// Distributed under the MIT software license, see the accompanying
-// file COPYING or http://www.opensource.org/licenses/mit-license.php.
-
-//
-// Unit tests for block-chain checkpoints
-//
-
-#include "checkpoints.h"
-
-#include "uint256.h"
-#include "test/test_bitcoin.h"
-#include "chainparams.h"
-
-#include <boost/test/unit_test.hpp>
-
-using namespace std;
-
-BOOST_FIXTURE_TEST_SUITE(Checkpoints_tests, BasicTestingSetup)
-
-BOOST_AUTO_TEST_CASE(sanity)
-{
-    const CCheckpointData& checkpoints = Params(CBaseChainParams::MAIN).Checkpoints();
-    BOOST_CHECK(Checkpoints::GetTotalBlocksEstimate(checkpoints) >= 134444);
-}
-
-BOOST_AUTO_TEST_SUITE_END()

From e141beb6a9816b7e1e680fb0a8bae16d42a3e557 Mon Sep 17 00:00:00 2001
From: Gregory Maxwell <greg@xiph.org>
Date: Tue, 1 Nov 2016 00:37:54 +0000
Subject: [PATCH 1124/1802] IsInitialBlockDownload no longer uses header-only
 timestamps.

This avoids a corner case (mostly visible on testnet) where bogus
 headers can keep nodes in IsInitialBlockDownload.
---
 src/main.cpp | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index 6b33539a2efb2..46320604effb0 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1744,11 +1744,10 @@ bool IsInitialBlockDownload()
         return true;
     if (chainActive.Tip()->nChainWork < UintToArith256(chainParams.GetConsensus().nMinimumChainWork))
         return true;
-    bool state = (chainActive.Height() < pindexBestHeader->nHeight - 24 * 6 ||
-            std::max(chainActive.Tip()->GetBlockTime(), pindexBestHeader->GetBlockTime()) < GetTime() - nMaxTipAge);
-    if (!state)
-        latchToFalse.store(true, std::memory_order_relaxed);
-    return state;
+    if (chainActive.Tip()->GetBlockTime() < (GetTime() - nMaxTipAge))
+        return true;
+    latchToFalse.store(true, std::memory_order_relaxed);
+    return false;
 }
 
 bool fLargeWorkForkFound = false;

From 4a9f3c50ccc8a467fda84bfd8ff7cfd831edb7c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pavel=20Jan=C3=ADk?= <Pavel@Janik.cz>
Date: Wed, 2 Nov 2016 14:18:19 +0100
Subject: [PATCH 1125/1802] Do not shadow variable, use deprecated MAP_ANON if
 MAP_ANONYMOUS is not defined.

---
 src/support/lockedpool.cpp | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/support/lockedpool.cpp b/src/support/lockedpool.cpp
index 63050f006b053..813869a131cfb 100644
--- a/src/support/lockedpool.cpp
+++ b/src/support/lockedpool.cpp
@@ -64,14 +64,14 @@ void* Arena::alloc(size_t size)
 
     for (auto& chunk: chunks) {
         if (!chunk.second.isInUse() && size <= chunk.second.getSize()) {
-            char* base = chunk.first;
+            char* _base = chunk.first;
             size_t leftover = chunk.second.getSize() - size;
             if (leftover > 0) { // Split chunk
-                chunks.emplace(base + size, Chunk(leftover, false));
+                chunks.emplace(_base + size, Chunk(leftover, false));
                 chunk.second.setSize(size);
             }
             chunk.second.setInUse(true);
-            return reinterpret_cast<void*>(base);
+            return reinterpret_cast<void*>(_base);
         }
     }
     return nullptr;
@@ -224,6 +224,13 @@ PosixLockedPageAllocator::PosixLockedPageAllocator()
     page_size = sysconf(_SC_PAGESIZE);
 #endif
 }
+
+// Some systems (at least OS X) do not define MAP_ANONYMOUS yet and define
+// MAP_ANON which is deprecated
+#ifndef MAP_ANONYMOUS
+#define MAP_ANONYMOUS MAP_ANON
+#endif
+
 void *PosixLockedPageAllocator::AllocateLocked(size_t len, bool *lockingSuccess)
 {
     void *addr;

From eedc4618820ea4acc5a34a7761a3511ede95dc9e Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Wed, 2 Nov 2016 18:16:32 +0100
Subject: [PATCH 1126/1802] Merge `doc/unit-tests.md` into `src/test/README.md`

Refer to the right file in the top-level README.md.

Having only one file with test documentation saves some confusion about
where things are documented.
---
 README.md          |  5 +++--
 doc/README.md      |  1 -
 doc/unit-tests.md  | 18 ------------------
 src/test/README.md | 47 +++++++++++++++++++++++++++++++++-------------
 4 files changed, 37 insertions(+), 34 deletions(-)
 delete mode 100644 doc/unit-tests.md

diff --git a/README.md b/README.md
index 3c41649c1b8d9..38a90dde4969f 100644
--- a/README.md
+++ b/README.md
@@ -49,9 +49,10 @@ lots of money.
 
 ### Automated Testing
 
-Developers are strongly encouraged to write [unit tests](/doc/unit-tests.md) for new code, and to
+Developers are strongly encouraged to write [unit tests](src/test/README.md) for new code, and to
 submit new unit tests for old code. Unit tests can be compiled and run
-(assuming they weren't disabled in configure) with: `make check`
+(assuming they weren't disabled in configure) with: `make check`. Further details on running
+and extending unit tests can be found in [/src/test/README.md](/src/test/README.md).
 
 There are also [regression and integration tests](/qa) of the RPC interface, written
 in Python, that are run automatically on the build server.
diff --git a/doc/README.md b/doc/README.md
index e4fa49614ac8c..8b9c0ea2625f0 100644
--- a/doc/README.md
+++ b/doc/README.md
@@ -53,7 +53,6 @@ The Bitcoin repo's [root README](/README.md) contains relevant information on th
 - [Source Code Documentation (External Link)](https://dev.visucore.com/bitcoin/doxygen/)
 - [Translation Process](translation_process.md)
 - [Translation Strings Policy](translation_strings_policy.md)
-- [Unit Tests](unit-tests.md)
 - [Travis CI](travis-ci.md)
 - [Unauthenticated REST Interface](REST-interface.md)
 - [Shared Libraries](shared-libraries.md)
diff --git a/doc/unit-tests.md b/doc/unit-tests.md
deleted file mode 100644
index afaece829c77d..0000000000000
--- a/doc/unit-tests.md
+++ /dev/null
@@ -1,18 +0,0 @@
-Compiling/running unit tests
-------------------------------------
-
-Unit tests will be automatically compiled if dependencies were met in `./configure`
-and tests weren't explicitly disabled.
-
-After configuring, they can be run with `make check`.
-
-To run the bitcoind tests manually, launch `src/test/test_bitcoin`.
-
-To add more bitcoind tests, add `BOOST_AUTO_TEST_CASE` functions to the existing
-.cpp files in the `test/` directory or add new .cpp files that
-implement new BOOST_AUTO_TEST_SUITE sections.
-
-To run the bitcoin-qt tests manually, launch `src/qt/test/test_bitcoin-qt`
-
-To add more bitcoin-qt tests, add them to the `src/qt/test/` directory and
-the `src/qt/test/test_main.cpp` file.
diff --git a/src/test/README.md b/src/test/README.md
index 3afdefe5fcd41..8f99804e100dd 100644
--- a/src/test/README.md
+++ b/src/test/README.md
@@ -1,4 +1,36 @@
-# Notes
+### Compiling/running unit tests
+
+Unit tests will be automatically compiled if dependencies were met in `./configure`
+and tests weren't explicitly disabled.
+
+After configuring, they can be run with `make check`.
+
+To run the bitcoind tests manually, launch `src/test/test_bitcoin`.
+
+To add more bitcoind tests, add `BOOST_AUTO_TEST_CASE` functions to the existing
+.cpp files in the `test/` directory or add new .cpp files that
+implement new BOOST_AUTO_TEST_SUITE sections.
+
+To run the bitcoin-qt tests manually, launch `src/qt/test/test_bitcoin-qt`
+
+To add more bitcoin-qt tests, add them to the `src/qt/test/` directory and
+the `src/qt/test/test_main.cpp` file.
+
+### Running individual tests
+
+test_bitcoin has some built-in command-line arguments; for
+example, to run just the getarg_tests verbosely:
+
+    test_bitcoin --log_level=all --run_test=getarg_tests
+
+... or to run just the doubledash test:
+
+    test_bitcoin --run_test=getarg_tests/doubledash
+
+Run `test_bitcoin --help` for the full list.
+
+### Note on adding test cases
+
 The sources in this directory are unit test cases.  Boost includes a
 unit testing framework, and since bitcoin already uses boost, it makes
 sense to simply use this framework rather than require developers to
@@ -19,17 +51,6 @@ For further reading, I found the following website to be helpful in
 explaining how the boost unit test framework works:
 [http://www.alittlemadness.com/2009/03/31/c-unit-testing-with-boosttest/](http://www.alittlemadness.com/2009/03/31/c-unit-testing-with-boosttest/).
 
-test_bitcoin has some built-in command-line arguments; for
-example, to run just the getarg_tests verbosely:
-
-    test_bitcoin --log_level=all --run_test=getarg_tests
-
-... or to run just the doubledash test:
-
-    test_bitcoin --run_test=getarg_tests/doubledash
-
-Run `test_bitcoin --help` for the full list.
-
 ### bitcoin-util-test.py
 
 The test directory also contains the bitcoin-util-test.py tool, which tests bitcoin utils (currently just bitcoin-tx). This test gets run automatically during the `make check` build process. It is also possible to run the test manually from the src directory:
@@ -37,4 +58,4 @@ The test directory also contains the bitcoin-util-test.py tool, which tests bitc
 ```
 test/bitcoin-util-test.py --srcdir=[current directory]
 
-```
\ No newline at end of file
+```

From 32c0d6e1d2b360501370efef40468ca28cc2cd89 Mon Sep 17 00:00:00 2001
From: jnewbery <john@johnnewbery.com>
Date: Mon, 24 Oct 2016 12:49:25 +0100
Subject: [PATCH 1127/1802] Add logging to bitcoin-util-test.py

- Use the python standard logging library
- Run all tests and report all failing test-cases (rather than stop after one test case fails)
- If output is different from expected output, log a contextual diff.
---
 src/test/bctest.py            | 63 +++++++++++++++++++++++------------
 src/test/bitcoin-util-test.py | 15 +++++++--
 2 files changed, 54 insertions(+), 24 deletions(-)

diff --git a/src/test/bctest.py b/src/test/bctest.py
index eab4fb734a2d4..00d96eff19947 100644
--- a/src/test/bctest.py
+++ b/src/test/bctest.py
@@ -7,6 +7,8 @@
 import json
 import sys
 import binascii
+import difflib
+import logging
 
 def parse_output(a, fmt):
 	if fmt == 'json': # json: compare parsed data
@@ -33,53 +35,70 @@ def bctest(testDir, testObj, exeext):
 	if "output_cmp" in testObj:
 		outputFn = testObj['output_cmp']
 		outputType = os.path.splitext(outputFn)[1][1:] # output type from file extension (determines how to compare)
-		outputData = open(testDir + "/" + outputFn).read()
+		try:
+			outputData = open(testDir + "/" + outputFn).read()
+		except:
+			logging.error("Output file " + outputFn + " can not be opened")
+			raise
 		if not outputData:
-			print("Output data missing for " + outputFn)
-			sys.exit(1)
+			logging.error("Output data missing for " + outputFn)
+			raise Exception
+
 	proc = subprocess.Popen(execrun, stdin=stdinCfg, stdout=subprocess.PIPE, stderr=subprocess.PIPE,universal_newlines=True)
 	try:
 		outs = proc.communicate(input=inputData)
 	except OSError:
-		print("OSError, Failed to execute " + execprog)
-		sys.exit(1)
+		logging.error("OSError, Failed to execute " + execprog)
+		raise
 
 	if outputData:
 		try:
 			a_parsed = parse_output(outs[0], outputType)
 		except Exception as e:
-			print('Error parsing command output as %s: %s' % (outputType,e))
-			sys.exit(1)
+			logging.error('Error parsing command output as %s: %s' % (outputType,e))
+			raise
 		try:
 			b_parsed = parse_output(outputData, outputType)
 		except Exception as e:
-			print('Error parsing expected output %s as %s: %s' % (outputFn,outputType,e))
-			sys.exit(1)
+			logging.error('Error parsing expected output %s as %s: %s' % (outputFn,outputType,e))
+			raise
 		if a_parsed != b_parsed:
-			print("Output data mismatch for " + outputFn + " (format " + outputType + ")")
-			sys.exit(1)
+			logging.error("Output data mismatch for " + outputFn + " (format " + outputType + ")")
+			raise Exception
 		if outs[0] != outputData:
-			print("Output formatting mismatch for " + outputFn + " (format " + outputType + ")")
-			sys.exit(1)
+			error_message = "Output formatting mismatch for " + outputFn + ":\n"
+			error_message += "".join(difflib.context_diff(outputData.splitlines(True),
+				                                          outs[0].splitlines(True),
+				                                          fromfile=outputFn,
+				                                          tofile="returned"))
+			logging.error(error_message)
+			raise Exception
 
 	wantRC = 0
 	if "return_code" in testObj:
 		wantRC = testObj['return_code']
 	if proc.returncode != wantRC:
-		print("Return code mismatch for " + outputFn)
-		sys.exit(1)
+		logging.error("Return code mismatch for " + outputFn)
+		raise Exception
 
-def bctester(testDir, input_basename, buildenv, verbose = False):
+def bctester(testDir, input_basename, buildenv):
 	input_filename = testDir + "/" + input_basename
 	raw_data = open(input_filename).read()
 	input_data = json.loads(raw_data)
 
+	failed_testcases = []
+
 	for testObj in input_data:
-		if verbose and "description" in testObj:
-			print ("Testing: " + testObj["description"])
-		bctest(testDir, testObj, buildenv.exeext)
-		if verbose and "description" in testObj:
-			print ("PASS")
+		try:
+			bctest(testDir, testObj, buildenv.exeext)
+			logging.info("PASSED: " + testObj["description"])
+		except:
+			logging.info("FAILED: " + testObj["description"])
+			failed_testcases.append(testObj["description"])
 
-	sys.exit(0)
+	if failed_testcases:
+		logging.error("FAILED TESTCASES: [" + ", ".join(failed_testcases) + "]")
+		sys.exit(1)
+	else:
+		sys.exit(0)
 
diff --git a/src/test/bitcoin-util-test.py b/src/test/bitcoin-util-test.py
index 3099506d6d784..9afe91aca0624 100755
--- a/src/test/bitcoin-util-test.py
+++ b/src/test/bitcoin-util-test.py
@@ -4,9 +4,11 @@
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 from __future__ import division,print_function,unicode_literals
 import os
+import sys
 import bctest
 import buildenv
 import argparse
+import logging
 
 help_text="""Test framework for bitcoin utils.
 
@@ -19,9 +21,9 @@
 
 
 if __name__ == '__main__':
-    verbose = False
     try:
         srcdir = os.environ["srcdir"]
+        verbose = False
     except:
         parser = argparse.ArgumentParser(description=help_text)
         parser.add_argument('-s', '--srcdir')
@@ -29,4 +31,13 @@
         args = parser.parse_args()
         srcdir = args.srcdir
         verbose = args.verbose
-    bctest.bctester(srcdir + "/test/data", "bitcoin-util-test.json", buildenv, verbose = verbose)
+
+    if verbose:
+        level = logging.DEBUG
+    else:
+        level = logging.ERROR
+    formatter = '%(asctime)s - %(levelname)s - %(message)s'
+    # Add the format/level to the logger
+    logging.basicConfig(format = formatter, level=level)
+
+    bctest.bctester(srcdir + "/test/data", "bitcoin-util-test.json", buildenv)

From f91afe9aacc4ece2df76338e6ea270b9a6a3bc1a Mon Sep 17 00:00:00 2001
From: Daniel Kraft <d@domob.eu>
Date: Wed, 2 Nov 2016 19:31:19 +0100
Subject: [PATCH 1128/1802] trivial: Remove variable unused after refactoring

Remove a variable that is now unused after the recent refactoring
(in 51f278329d43398428d60f5986f8d29a2041d28d) but has not been cleaned
up so far.
---
 src/test/mempool_tests.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/test/mempool_tests.cpp b/src/test/mempool_tests.cpp
index 555d36faacc87..a73dbe725c9c4 100644
--- a/src/test/mempool_tests.cpp
+++ b/src/test/mempool_tests.cpp
@@ -547,7 +547,6 @@ BOOST_AUTO_TEST_CASE(MempoolSizeLimitTest)
     pool.addUnchecked(tx7.GetHash(), entry.Fee(9000LL).FromTx(tx7, &pool));
 
     std::vector<CTransaction> vtx;
-    std::vector<std::shared_ptr<const CTransaction>> conflicts;
     SetMockTime(42);
     SetMockTime(42 + CTxMemPool::ROLLING_FEE_HALFLIFE);
     BOOST_CHECK_EQUAL(pool.GetMinFee(1).GetFeePerK(), maxFeeRateRemoved.GetFeePerK() + 1000);

From 47e9659ecfbe07077a4564591095bd5510e0f917 Mon Sep 17 00:00:00 2001
From: Russell Yanofsky <russ@chaincode.com>
Date: Mon, 24 Oct 2016 15:33:14 -0400
Subject: [PATCH 1129/1802] [qa] Fix bug in compactblocks v2 merge

Bug caused the wait_for_block_announcement to be called on the wrong node,
leading to nondeterminism and occasional test failures. Bug was introduced in
merge commit:

d075479 Merge #8882: [qa] Fix race conditions in p2p-compactblocks.py and sendheaders.py

Underlying commits which conflicted were:

27acfc1 [qa] Update p2p-compactblocks.py for compactblocks v2
6976db2 [qa] Another attempt to fix race condition in p2p-compactblocks.py

The first commit changed the test_compactblock_construction function signature
and second commit added code which wasn't updated during the merge to use the
new arguments.

Suhas Daftuar <sdaftuar@chaincode.com> noticed the bug and suggested the fix.
---
 qa/rpc-tests/p2p-compactblocks.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/qa/rpc-tests/p2p-compactblocks.py b/qa/rpc-tests/p2p-compactblocks.py
index 6b5d477131077..8a5f589d0fdda 100755
--- a/qa/rpc-tests/p2p-compactblocks.py
+++ b/qa/rpc-tests/p2p-compactblocks.py
@@ -300,8 +300,8 @@ def test_compactblock_construction(self, node, test_node, version, use_witness_a
             assert(segwit_tx_generated) # check that our test is not broken
 
         # Wait until we've seen the block announcement for the resulting tip
-        tip = int(self.nodes[0].getbestblockhash(), 16)
-        assert(self.test_node.wait_for_block_announcement(tip))
+        tip = int(node.getbestblockhash(), 16)
+        assert(test_node.wait_for_block_announcement(tip))
 
         # Now mine a block, and look at the resulting compact block.
         test_node.clear_block_announcement()

From 55bfddcabbf9e8a3743f77167ba4a43aaba9f948 Mon Sep 17 00:00:00 2001
From: Russell Yanofsky <russ@chaincode.com>
Date: Wed, 26 Oct 2016 14:15:16 -0400
Subject: [PATCH 1130/1802] [qa] Fix stale data bug in
 test_compactblocks_not_at_tip

Clear test_node.last_block before requesting blocks in the
compactblocks_not_at_tip test so comparisons won't fail if a blocks were received
before the test started.

The bug doesn't currently cause any problems due to the order tests run, but
this will change in the next commit.
---
 qa/rpc-tests/p2p-compactblocks.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/qa/rpc-tests/p2p-compactblocks.py b/qa/rpc-tests/p2p-compactblocks.py
index 8a5f589d0fdda..4b49dad03442c 100755
--- a/qa/rpc-tests/p2p-compactblocks.py
+++ b/qa/rpc-tests/p2p-compactblocks.py
@@ -648,6 +648,8 @@ def test_compactblocks_not_at_tip(self, node, test_node):
         node.generate(1)
         wait_until(test_node.received_block_announcement, timeout=30)
         test_node.clear_block_announcement()
+        with mininode_lock:
+            test_node.last_block = None
         test_node.send_message(msg_getdata([CInv(4, int(new_blocks[0], 16))]))
         success = wait_until(lambda: test_node.last_block is not None, timeout=30)
         assert(success)

From 21b8f3db31f05f7756c4291e460544ce0457fd87 Mon Sep 17 00:00:00 2001
From: Kaz Wesley <keziahw@gmail.com>
Date: Wed, 2 Nov 2016 14:03:50 -0700
Subject: [PATCH 1131/1802] LockedPool: test handling of invalid allocations

(Currently fails due to bug)
---
 src/test/allocator_tests.cpp | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/test/allocator_tests.cpp b/src/test/allocator_tests.cpp
index f0e848655f205..a853aececb478 100644
--- a/src/test/allocator_tests.cpp
+++ b/src/test/allocator_tests.cpp
@@ -166,6 +166,16 @@ BOOST_AUTO_TEST_CASE(lockedpool_tests_mock)
     BOOST_CHECK(pool.stats().total == 0);
     BOOST_CHECK(pool.stats().locked == 0);
 
+    // Ensure unreasonable requests are refused without allocating anything
+    void *invalid_toosmall = pool.alloc(0);
+    BOOST_CHECK(invalid_toosmall == nullptr);
+    BOOST_CHECK(pool.stats().used == 0);
+    BOOST_CHECK(pool.stats().free == 0);
+    void *invalid_toobig = pool.alloc(LockedPool::ARENA_SIZE+1);
+    BOOST_CHECK(invalid_toobig == nullptr);
+    BOOST_CHECK(pool.stats().used == 0);
+    BOOST_CHECK(pool.stats().free == 0);
+
     void *a0 = pool.alloc(LockedPool::ARENA_SIZE / 2);
     BOOST_CHECK(a0);
     BOOST_CHECK(pool.stats().locked == LockedPool::ARENA_SIZE);

From 0b59f80625923978583efca08f8e763ea1710bb2 Mon Sep 17 00:00:00 2001
From: Kaz Wesley <keziahw@gmail.com>
Date: Wed, 2 Nov 2016 14:11:07 -0700
Subject: [PATCH 1132/1802] LockedPool: fix explosion for illegal-sized alloc

Check for unreasonable alloc size in LockedPool rather than lancing through new
Arenas until we improbably find one worthy of the quixotic request or the system
can support no more Arenas.
---
 src/support/lockedpool.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/support/lockedpool.cpp b/src/support/lockedpool.cpp
index 813869a131cfb..be5aac8227127 100644
--- a/src/support/lockedpool.cpp
+++ b/src/support/lockedpool.cpp
@@ -276,6 +276,11 @@ LockedPool::~LockedPool()
 void* LockedPool::alloc(size_t size)
 {
     std::lock_guard<std::mutex> lock(mutex);
+
+    // Don't handle impossible sizes
+    if (size == 0 || size > ARENA_SIZE)
+        return nullptr;
+
     // Try allocating from each current arena
     for (auto &arena: arenas) {
         void *addr = arena.alloc(size);

From b3ddc5e76f457d504b05273429e06e684e76f5de Mon Sep 17 00:00:00 2001
From: Kaz Wesley <keziahw@gmail.com>
Date: Wed, 2 Nov 2016 14:09:03 -0700
Subject: [PATCH 1133/1802] LockedPool: avoid quadratic-time allocation

Use separate maps for used/free chunks to avoid linear scan through alloced
chunks for each alloc.
---
 src/support/lockedpool.cpp   | 122 ++++++++++++++++-------------------
 src/support/lockedpool.h     |  24 +------
 src/test/allocator_tests.cpp |   4 +-
 3 files changed, 60 insertions(+), 90 deletions(-)

diff --git a/src/support/lockedpool.cpp b/src/support/lockedpool.cpp
index be5aac8227127..01273c9791727 100644
--- a/src/support/lockedpool.cpp
+++ b/src/support/lockedpool.cpp
@@ -26,6 +26,8 @@
 #include <unistd.h> // for sysconf
 #endif
 
+#include <algorithm>
+
 LockedPoolManager* LockedPoolManager::_instance = NULL;
 std::once_flag LockedPoolManager::init_flag;
 
@@ -45,7 +47,7 @@ Arena::Arena(void *base_in, size_t size_in, size_t alignment_in):
     base(static_cast<char*>(base_in)), end(static_cast<char*>(base_in) + size_in), alignment(alignment_in)
 {
     // Start with one free chunk that covers the entire arena
-    chunks.emplace(base, Chunk(size_in, false));
+    chunks_free.emplace(base, size_in);
 }
 
 Arena::~Arena()
@@ -57,24 +59,30 @@ void* Arena::alloc(size_t size)
     // Round to next multiple of alignment
     size = align_up(size, alignment);
 
-    // Don't handle zero-sized chunks, or those bigger than MAX_SIZE
-    if (size == 0 || size >= Chunk::MAX_SIZE) {
+    // Don't handle zero-sized chunks
+    if (size == 0)
         return nullptr;
-    }
 
-    for (auto& chunk: chunks) {
-        if (!chunk.second.isInUse() && size <= chunk.second.getSize()) {
-            char* _base = chunk.first;
-            size_t leftover = chunk.second.getSize() - size;
-            if (leftover > 0) { // Split chunk
-                chunks.emplace(_base + size, Chunk(leftover, false));
-                chunk.second.setSize(size);
-            }
-            chunk.second.setInUse(true);
-            return reinterpret_cast<void*>(_base);
-        }
+    // Pick a large enough free-chunk
+    auto it = std::find_if(chunks_free.begin(), chunks_free.end(),
+        [=](const std::map<char*, size_t>::value_type& chunk){ return chunk.second >= size; });
+    if (it == chunks_free.end())
+        return nullptr;
+
+    // Create the used-chunk, taking its space from the end of the free-chunk
+    auto alloced = chunks_used.emplace(it->first + it->second - size, size).first;
+    if (!(it->second -= size))
+        chunks_free.erase(it);
+    return reinterpret_cast<void*>(alloced->first);
+}
+
+/* extend the Iterator if other begins at its end */
+template <class Iterator, class Pair> bool extend(Iterator it, const Pair& other) {
+    if (it->first + it->second == other.first) {
+        it->second += other.second;
+        return true;
     }
-    return nullptr;
+    return false;
 }
 
 void Arena::free(void *ptr)
@@ -83,65 +91,49 @@ void Arena::free(void *ptr)
     if (ptr == nullptr) {
         return;
     }
-    auto i = chunks.find(static_cast<char*>(ptr));
-    if (i == chunks.end() || !i->second.isInUse()) {
-        throw std::runtime_error("Arena: invalid or double free");
-    }
 
-    i->second.setInUse(false);
-
-    if (i != chunks.begin()) { // Absorb into previous chunk if exists and free
-        auto prev = i;
-        --prev;
-        if (!prev->second.isInUse()) {
-            // Absorb current chunk size into previous chunk.
-            prev->second.setSize(prev->second.getSize() + i->second.getSize());
-            // Erase current chunk. Erasing does not invalidate current
-            // iterators for a map, except for that pointing to the object
-            // itself, which will be overwritten in the next statement.
-            chunks.erase(i);
-            // From here on, the previous chunk is our current chunk.
-            i = prev;
-        }
-    }
-    auto next = i;
-    ++next;
-    if (next != chunks.end()) { // Absorb next chunk if exists and free
-        if (!next->second.isInUse()) {
-            // Absurb next chunk size into current chunk
-            i->second.setSize(i->second.getSize() + next->second.getSize());
-            // Erase next chunk.
-            chunks.erase(next);
-        }
+    // Remove chunk from used map
+    auto i = chunks_used.find(static_cast<char*>(ptr));
+    if (i == chunks_used.end()) {
+        throw std::runtime_error("Arena: invalid or double free");
     }
+    auto freed = *i;
+    chunks_used.erase(i);
+
+    // Add space to free map, coalescing contiguous chunks
+    auto next = chunks_free.upper_bound(freed.first);
+    auto prev = (next == chunks_free.begin()) ? chunks_free.end() : std::prev(next);
+    if (prev == chunks_free.end() || !extend(prev, freed))
+        prev = chunks_free.emplace_hint(next, freed);
+    if (next != chunks_free.end() && extend(prev, *next))
+        chunks_free.erase(next);
 }
 
 Arena::Stats Arena::stats() const
 {
-    Arena::Stats r;
-    r.used = r.free = r.total = r.chunks_used = r.chunks_free = 0;
-    for (const auto& chunk: chunks) {
-        if (chunk.second.isInUse()) {
-            r.used += chunk.second.getSize();
-            r.chunks_used += 1;
-        } else {
-            r.free += chunk.second.getSize();
-            r.chunks_free += 1;
-        }
-        r.total += chunk.second.getSize();
-    }
+    Arena::Stats r{ 0, 0, 0, chunks_used.size(), chunks_free.size() };
+    for (const auto& chunk: chunks_used)
+        r.used += chunk.second;
+    for (const auto& chunk: chunks_free)
+        r.free += chunk.second;
+    r.total = r.used + r.free;
     return r;
 }
 
 #ifdef ARENA_DEBUG
+void printchunk(char* base, size_t sz, bool used) {
+    std::cout <<
+        "0x" << std::hex << std::setw(16) << std::setfill('0') << base <<
+        " 0x" << std::hex << std::setw(16) << std::setfill('0') << sz <<
+        " 0x" << used << std::endl;
+}
 void Arena::walk() const
 {
-    for (const auto& chunk: chunks) {
-        std::cout <<
-            "0x" << std::hex << std::setw(16) << std::setfill('0') << chunk.first <<
-            " 0x" << std::hex << std::setw(16) << std::setfill('0') << chunk.second.getSize() <<
-            " 0x" << chunk.second.isInUse() << std::endl;
-    }
+    for (const auto& chunk: chunks_used)
+        printchunk(chunk.first, chunk.second, true);
+    std::cout << std::endl;
+    for (const auto& chunk: chunks_free)
+        printchunk(chunk.first, chunk.second, false);
     std::cout << std::endl;
 }
 #endif
@@ -312,9 +304,7 @@ void LockedPool::free(void *ptr)
 LockedPool::Stats LockedPool::stats() const
 {
     std::lock_guard<std::mutex> lock(mutex);
-    LockedPool::Stats r;
-    r.used = r.free = r.total = r.chunks_used = r.chunks_free = 0;
-    r.locked = cumulative_bytes_locked;
+    LockedPool::Stats r{0, 0, 0, cumulative_bytes_locked, 0, 0};
     for (const auto &arena: arenas) {
         Arena::Stats i = arena.stats();
         r.used += i.used;
diff --git a/src/support/lockedpool.h b/src/support/lockedpool.h
index 526c17a73fe76..3403415436cc2 100644
--- a/src/support/lockedpool.h
+++ b/src/support/lockedpool.h
@@ -50,27 +50,6 @@ class Arena
     Arena(void *base, size_t size, size_t alignment);
     virtual ~Arena();
 
-    /** A chunk of memory.
-     */
-    struct Chunk
-    {
-        /** Most significant bit of size_t. This is used to mark
-         * in-usedness of chunk.
-         */
-        const static size_t SIZE_MSB = 1LLU << ((sizeof(size_t)*8)-1);
-        /** Maximum size of a chunk */
-        const static size_t MAX_SIZE = SIZE_MSB - 1;
-
-        Chunk(size_t size_in, bool used_in):
-            size(size_in | (used_in ? SIZE_MSB : 0)) {}
-
-        bool isInUse() const { return size & SIZE_MSB; }
-        void setInUse(bool used_in) { size = (size & ~SIZE_MSB) | (used_in ? SIZE_MSB : 0); }
-        size_t getSize() const { return size & ~SIZE_MSB; }
-        void setSize(size_t size_in) { size = (size & SIZE_MSB) | size_in; }
-    private:
-        size_t size;
-    };
     /** Memory statistics. */
     struct Stats
     {
@@ -112,7 +91,8 @@ class Arena
     /** Map of chunk address to chunk information. This class makes use of the
      * sorted order to merge previous and next chunks during deallocation.
      */
-    std::map<char*, Chunk> chunks;
+    std::map<char*, size_t> chunks_free;
+    std::map<char*, size_t> chunks_used;
     /** Base address of arena */
     char* base;
     /** End address of arena */
diff --git a/src/test/allocator_tests.cpp b/src/test/allocator_tests.cpp
index a853aececb478..77e9df5d828be 100644
--- a/src/test/allocator_tests.cpp
+++ b/src/test/allocator_tests.cpp
@@ -39,7 +39,6 @@ BOOST_AUTO_TEST_CASE(arena_tests)
     }
 
     void *a0 = b.alloc(128);
-    BOOST_CHECK(a0 == synth_base); // first allocation must start at beginning
     void *a1 = b.alloc(256);
     void *a2 = b.alloc(512);
     BOOST_CHECK(b.stats().used == 896);
@@ -63,8 +62,10 @@ BOOST_AUTO_TEST_CASE(arena_tests)
     BOOST_CHECK(b.stats().used == 128);
     b.free(a3);
     BOOST_CHECK(b.stats().used == 0);
+    BOOST_CHECK_EQUAL(b.stats().chunks_used, 0);
     BOOST_CHECK(b.stats().total == synth_size);
     BOOST_CHECK(b.stats().free == synth_size);
+    BOOST_CHECK_EQUAL(b.stats().chunks_free, 1);
 
     std::vector<void*> addr;
     BOOST_CHECK(b.alloc(0) == nullptr); // allocating 0 always returns nullptr
@@ -74,7 +75,6 @@ BOOST_AUTO_TEST_CASE(arena_tests)
     // Sweeping allocate all memory
     for (int x=0; x<1024; ++x)
         addr.push_back(b.alloc(1024));
-    BOOST_CHECK(addr[0] == synth_base); // first allocation must start at beginning
     BOOST_CHECK(b.stats().free == 0);
     BOOST_CHECK(b.alloc(1024) == nullptr); // memory is full, this must return nullptr
     BOOST_CHECK(b.alloc(0) == nullptr);

From 2ca882ad41f170e705e71766d2b20ea08dbd6a7a Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Wed, 2 Nov 2016 17:29:16 -0700
Subject: [PATCH 1134/1802] Declare wallet.h functions inline

---
 src/wallet/wallet.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
index d7d1f5513a15e..cb48da4461af3 100644
--- a/src/wallet/wallet.h
+++ b/src/wallet/wallet.h
@@ -134,7 +134,7 @@ struct CRecipient
 typedef std::map<std::string, std::string> mapValue_t;
 
 
-static void ReadOrderPos(int64_t& nOrderPos, mapValue_t& mapValue)
+static inline void ReadOrderPos(int64_t& nOrderPos, mapValue_t& mapValue)
 {
     if (!mapValue.count("n"))
     {
@@ -145,7 +145,7 @@ static void ReadOrderPos(int64_t& nOrderPos, mapValue_t& mapValue)
 }
 
 
-static void WriteOrderPos(const int64_t& nOrderPos, mapValue_t& mapValue)
+static inline void WriteOrderPos(const int64_t& nOrderPos, mapValue_t& mapValue)
 {
     if (nOrderPos == -1)
         return;

From a33b1691f11316f839ddfdf51e1950acf0bc08aa Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Fri, 9 Sep 2016 13:56:03 +0200
Subject: [PATCH 1135/1802] Do not fully sort all nodes for addr relay

As we only need 1 or 2, explicitly keep track of the best ones.
---
 src/main.cpp | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index 44031e69e73eb..f5e94d8ec7fae 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -4804,26 +4804,35 @@ static void RelayTransaction(const CTransaction& tx, CConnman& connman)
 
 static void RelayAddress(const CAddress& addr, bool fReachable, CConnman& connman)
 {
-    int nRelayNodes = fReachable ? 2 : 1; // limited relaying of addresses outside our network(s)
+    unsigned int nRelayNodes = fReachable ? 2 : 1; // limited relaying of addresses outside our network(s)
 
     // Relay to a limited number of other nodes
     // Use deterministic randomness to send to the same nodes for 24 hours
     // at a time so the addrKnowns of the chosen nodes prevent repeats
     uint64_t hashAddr = addr.GetHash();
-    std::multimap<uint64_t, CNode*> mapMix;
     const CSipHasher hasher = connman.GetDeterministicRandomizer(RANDOMIZER_ID_ADDRESS_RELAY).Write(hashAddr << 32).Write((GetTime() + hashAddr) / (24*60*60));
     FastRandomContext insecure_rand;
 
-    auto sortfunc = [&mapMix, &hasher](CNode* pnode) {
+    std::array<std::pair<uint64_t, CNode*>,2> best{{{0, nullptr}, {0, nullptr}}};
+    assert(nRelayNodes <= best.size());
+
+    auto sortfunc = [&best, &hasher, nRelayNodes](CNode* pnode) {
         if (pnode->nVersion >= CADDR_TIME_VERSION) {
             uint64_t hashKey = CSipHasher(hasher).Write(pnode->id).Finalize();
-            mapMix.emplace(hashKey, pnode);
+            for (unsigned int i = 0; i < nRelayNodes; i++) {
+                 if (hashKey > best[i].first) {
+                     std::copy(best.begin() + i, best.begin() + nRelayNodes - 1, best.begin() + i + 1);
+                     best[i] = std::make_pair(hashKey, pnode);
+                     break;
+                 }
+            }
         }
     };
 
-    auto pushfunc = [&addr, &mapMix, &nRelayNodes, &insecure_rand] {
-        for (auto mi = mapMix.begin(); mi != mapMix.end() && nRelayNodes-- > 0; ++mi)
-            mi->second->PushAddress(addr, insecure_rand);
+    auto pushfunc = [&addr, &best, nRelayNodes, &insecure_rand] {
+        for (unsigned int i = 0; i < nRelayNodes && best[i].first != 0; i++) {
+            best[i].second->PushAddress(addr, insecure_rand);
+        }
     };
 
     connman.ForEachNodeThen(std::move(sortfunc), std::move(pushfunc));

From 2b175d4b018be432e333bf8a343b85c5f284264f Mon Sep 17 00:00:00 2001
From: John Newbery <john@johnnewbery.com>
Date: Wed, 2 Nov 2016 22:56:32 +0000
Subject: [PATCH 1136/1802] Clean up bctest.py and bitcoin-util-test.py

- remove newlines
- change tabs for spaces, to align with convention in other py files
- add comments
- add 'Bitcoin Core Developers' copyright notice
---
 src/test/bctest.py            | 175 +++++++++++++++++++---------------
 src/test/bitcoin-util-test.py |   7 +-
 2 files changed, 101 insertions(+), 81 deletions(-)

diff --git a/src/test/bctest.py b/src/test/bctest.py
index 00d96eff19947..47cff98bca2ed 100644
--- a/src/test/bctest.py
+++ b/src/test/bctest.py
@@ -1,4 +1,5 @@
 # Copyright 2014 BitPay, Inc.
+# Copyright 2016 The Bitcoin Core developers
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 from __future__ import division,print_function,unicode_literals
@@ -11,94 +12,110 @@
 import logging
 
 def parse_output(a, fmt):
-	if fmt == 'json': # json: compare parsed data
-		return json.loads(a)
-	elif fmt == 'hex': # hex: parse and compare binary data
-		return binascii.a2b_hex(a.strip())
-	else:
-		raise NotImplementedError("Don't know how to compare %s" % fmt)
+    """Parse the output according to specified format.
+
+    Raise an error if the output can't be parsed."""
+    if fmt == 'json': # json: compare parsed data
+        return json.loads(a)
+    elif fmt == 'hex': # hex: parse and compare binary data
+        return binascii.a2b_hex(a.strip())
+    else:
+        raise NotImplementedError("Don't know how to compare %s" % fmt)
 
 def bctest(testDir, testObj, exeext):
+    """Runs a single test, comparing output and RC to expected output and RC.
 
-	execprog = testObj['exec'] + exeext
-	execargs = testObj['args']
-	execrun = [execprog] + execargs
-	stdinCfg = None
-	inputData = None
-	if "input" in testObj:
-		filename = testDir + "/" + testObj['input']
-		inputData = open(filename).read()
-		stdinCfg = subprocess.PIPE
+    Raises an error if input can't be read, executable fails, or output/RC
+    are not as expected. Error is caught by bctester() and reported.
+    """
+    # Get the exec names and arguments
+    execprog = testObj['exec'] + exeext
+    execargs = testObj['args']
+    execrun = [execprog] + execargs
 
-	outputFn = None
-	outputData = None
-	if "output_cmp" in testObj:
-		outputFn = testObj['output_cmp']
-		outputType = os.path.splitext(outputFn)[1][1:] # output type from file extension (determines how to compare)
-		try:
-			outputData = open(testDir + "/" + outputFn).read()
-		except:
-			logging.error("Output file " + outputFn + " can not be opened")
-			raise
-		if not outputData:
-			logging.error("Output data missing for " + outputFn)
-			raise Exception
+    # Read the input data (if there is any)
+    stdinCfg = None
+    inputData = None
+    if "input" in testObj:
+        filename = testDir + "/" + testObj['input']
+        inputData = open(filename).read()
+        stdinCfg = subprocess.PIPE
 
-	proc = subprocess.Popen(execrun, stdin=stdinCfg, stdout=subprocess.PIPE, stderr=subprocess.PIPE,universal_newlines=True)
-	try:
-		outs = proc.communicate(input=inputData)
-	except OSError:
-		logging.error("OSError, Failed to execute " + execprog)
-		raise
+    # Read the expected output data (if there is any)
+    outputFn = None
+    outputData = None
+    if "output_cmp" in testObj:
+        outputFn = testObj['output_cmp']
+        outputType = os.path.splitext(outputFn)[1][1:] # output type from file extension (determines how to compare)
+        try:
+            outputData = open(testDir + "/" + outputFn).read()
+        except:
+            logging.error("Output file " + outputFn + " can not be opened")
+            raise
+        if not outputData:
+            logging.error("Output data missing for " + outputFn)
+            raise Exception
 
-	if outputData:
-		try:
-			a_parsed = parse_output(outs[0], outputType)
-		except Exception as e:
-			logging.error('Error parsing command output as %s: %s' % (outputType,e))
-			raise
-		try:
-			b_parsed = parse_output(outputData, outputType)
-		except Exception as e:
-			logging.error('Error parsing expected output %s as %s: %s' % (outputFn,outputType,e))
-			raise
-		if a_parsed != b_parsed:
-			logging.error("Output data mismatch for " + outputFn + " (format " + outputType + ")")
-			raise Exception
-		if outs[0] != outputData:
-			error_message = "Output formatting mismatch for " + outputFn + ":\n"
-			error_message += "".join(difflib.context_diff(outputData.splitlines(True),
-				                                          outs[0].splitlines(True),
-				                                          fromfile=outputFn,
-				                                          tofile="returned"))
-			logging.error(error_message)
-			raise Exception
+    # Run the test
+    proc = subprocess.Popen(execrun, stdin=stdinCfg, stdout=subprocess.PIPE, stderr=subprocess.PIPE,universal_newlines=True)
+    try:
+        outs = proc.communicate(input=inputData)
+    except OSError:
+        logging.error("OSError, Failed to execute " + execprog)
+        raise
 
-	wantRC = 0
-	if "return_code" in testObj:
-		wantRC = testObj['return_code']
-	if proc.returncode != wantRC:
-		logging.error("Return code mismatch for " + outputFn)
-		raise Exception
+    if outputData:
+        # Parse command output and expected output
+        try:
+            a_parsed = parse_output(outs[0], outputType)
+        except Exception as e:
+            logging.error('Error parsing command output as %s: %s' % (outputType,e))
+            raise
+        try:
+            b_parsed = parse_output(outputData, outputType)
+        except Exception as e:
+            logging.error('Error parsing expected output %s as %s: %s' % (outputFn,outputType,e))
+            raise
+        # Compare data
+        if a_parsed != b_parsed:
+            logging.error("Output data mismatch for " + outputFn + " (format " + outputType + ")")
+            raise Exception
+        # Compare formatting
+        if outs[0] != outputData:
+            error_message = "Output formatting mismatch for " + outputFn + ":\n"
+            error_message += "".join(difflib.context_diff(outputData.splitlines(True),
+                                                          outs[0].splitlines(True),
+                                                          fromfile=outputFn,
+                                                          tofile="returned"))
+            logging.error(error_message)
+            raise Exception
 
-def bctester(testDir, input_basename, buildenv):
-	input_filename = testDir + "/" + input_basename
-	raw_data = open(input_filename).read()
-	input_data = json.loads(raw_data)
+    # Compare the return code to the expected return code
+    wantRC = 0
+    if "return_code" in testObj:
+        wantRC = testObj['return_code']
+    if proc.returncode != wantRC:
+        logging.error("Return code mismatch for " + outputFn)
+        raise Exception
 
-	failed_testcases = []
+def bctester(testDir, input_basename, buildenv):
+    """ Loads and parses the input file, runs all tests and reports results"""
+    input_filename = testDir + "/" + input_basename
+    raw_data = open(input_filename).read()
+    input_data = json.loads(raw_data)
 
-	for testObj in input_data:
-		try:
-			bctest(testDir, testObj, buildenv.exeext)
-			logging.info("PASSED: " + testObj["description"])
-		except:
-			logging.info("FAILED: " + testObj["description"])
-			failed_testcases.append(testObj["description"])
+    failed_testcases = []
 
-	if failed_testcases:
-		logging.error("FAILED TESTCASES: [" + ", ".join(failed_testcases) + "]")
-		sys.exit(1)
-	else:
-		sys.exit(0)
+    for testObj in input_data:
+        try:
+            bctest(testDir, testObj, buildenv.exeext)
+            logging.info("PASSED: " + testObj["description"])
+        except:
+            logging.info("FAILED: " + testObj["description"])
+            failed_testcases.append(testObj["description"])
 
+    if failed_testcases:
+        logging.error("FAILED TESTCASES: [" + ", ".join(failed_testcases) + "]")
+        sys.exit(1)
+    else:
+        sys.exit(0)
diff --git a/src/test/bitcoin-util-test.py b/src/test/bitcoin-util-test.py
index 9afe91aca0624..eeb05c0b889a3 100755
--- a/src/test/bitcoin-util-test.py
+++ b/src/test/bitcoin-util-test.py
@@ -1,5 +1,6 @@
 #!/usr/bin/env python
 # Copyright 2014 BitPay, Inc.
+# Copyright 2016 The Bitcoin Core developers
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 from __future__ import division,print_function,unicode_literals
@@ -16,11 +17,13 @@
 
 Can also be run manually from the src directory by specifiying the source directory:
 
-test/bitcoin-util-test.py --src=[srcdir]
+test/bitcoin-util-test.py --srcdir='srcdir' [--verbose]
 """
 
-
 if __name__ == '__main__':
+    # Try to get the source directory from the environment variables. This will
+    # be set for `make check` automated runs. If environment variable is not set,
+    # then get the source directory from command line args.
     try:
         srcdir = os.environ["srcdir"]
         verbose = False

From 8f329f991bc81ddcfb4f51574e2003edde14e996 Mon Sep 17 00:00:00 2001
From: instagibbs <gsanders87@gmail.com>
Date: Thu, 3 Nov 2016 09:56:26 -0400
Subject: [PATCH 1137/1802] Add common failure cases for rpc server connection
 failure

---
 src/bitcoin-cli.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bitcoin-cli.cpp b/src/bitcoin-cli.cpp
index 2d66448d80ac3..8a2f380e67b13 100644
--- a/src/bitcoin-cli.cpp
+++ b/src/bitcoin-cli.cpp
@@ -240,7 +240,7 @@ UniValue CallRPC(const string& strMethod, const UniValue& params)
     event_base_free(base);
 
     if (response.status == 0)
-        throw CConnectionFailed(strprintf("couldn't connect to server (%d %s)", response.error, http_errorstring(response.error)));
+        throw CConnectionFailed(strprintf("couldn't connect to server\n(make sure server is running and you are connecting to the correct RPC port: %d %s)", response.error, http_errorstring(response.error)));
     else if (response.status == HTTP_UNAUTHORIZED)
         throw runtime_error("incorrect rpcuser or rpcpassword (authorization failed)");
     else if (response.status >= 400 && response.status != HTTP_BAD_REQUEST && response.status != HTTP_NOT_FOUND && response.status != HTTP_INTERNAL_SERVER_ERROR)

From c93beac43fa66c8431e3952283edb5be8c65606c Mon Sep 17 00:00:00 2001
From: Suhas Daftuar <sdaftuar@gmail.com>
Date: Wed, 26 Oct 2016 13:03:30 -0400
Subject: [PATCH 1138/1802] [qa] Test that invalid compactblocks don't result
 in ban

---
 qa/rpc-tests/p2p-compactblocks.py | 37 +++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/qa/rpc-tests/p2p-compactblocks.py b/qa/rpc-tests/p2p-compactblocks.py
index 6b5d477131077..6d1fb3fd9aa30 100755
--- a/qa/rpc-tests/p2p-compactblocks.py
+++ b/qa/rpc-tests/p2p-compactblocks.py
@@ -708,6 +708,33 @@ def test_end_to_end_block_relay(self, node, listeners):
                 l.last_cmpctblock.header_and_shortids.header.calc_sha256()
                 assert_equal(l.last_cmpctblock.header_and_shortids.header.sha256, block.sha256)
 
+    # Test that we don't get disconnected if we relay a compact block with valid header,
+    # but invalid transactions.
+    def test_invalid_tx_in_compactblock(self, node, test_node, use_segwit):
+        assert(len(self.utxos))
+        utxo = self.utxos[0]
+
+        block = self.build_block_with_transactions(node, utxo, 5)
+        del block.vtx[3]
+        block.hashMerkleRoot = block.calc_merkle_root()
+        if use_segwit:
+            # If we're testing with segwit, also drop the coinbase witness,
+            # but include the witness commitment.
+            add_witness_commitment(block)
+            block.vtx[0].wit.vtxinwit = []
+        block.solve()
+
+        # Now send the compact block with all transactions prefilled, and
+        # verify that we don't get disconnected.
+        comp_block = HeaderAndShortIDs()
+        comp_block.initialize_from_block(block, prefill_list=[0, 1, 2, 3, 4], use_witness=use_segwit)
+        msg = msg_cmpctblock(comp_block.to_p2p())
+        test_node.send_and_ping(msg)
+
+        # Check that the tip didn't advance
+        assert(int(node.getbestblockhash(), 16) is not block.sha256)
+        test_node.sync_with_ping()
+
     # Helper for enabling cb announcements
     # Send the sendcmpct request and sync headers
     def request_cb_announcements(self, peer, node, version):
@@ -798,6 +825,11 @@ def run_test(self):
         self.test_end_to_end_block_relay(self.nodes[0], [self.segwit_node, self.test_node, self.old_node])
         self.test_end_to_end_block_relay(self.nodes[1], [self.segwit_node, self.test_node, self.old_node])
 
+        print("\tTesting handling of invalid compact blocks...")
+        self.test_invalid_tx_in_compactblock(self.nodes[0], self.test_node, False)
+        self.test_invalid_tx_in_compactblock(self.nodes[1], self.segwit_node, False)
+        self.test_invalid_tx_in_compactblock(self.nodes[1], self.old_node, False)
+
         # Advance to segwit activation
         print ("\nAdvancing to segwit activation\n")
         self.activate_segwit(self.nodes[1])
@@ -844,6 +876,11 @@ def run_test(self):
         self.request_cb_announcements(self.segwit_node, self.nodes[1], 2)
         self.test_end_to_end_block_relay(self.nodes[1], [self.segwit_node, self.test_node, self.old_node])
 
+        print("\tTesting handling of invalid compact blocks...")
+        self.test_invalid_tx_in_compactblock(self.nodes[0], self.test_node, False)
+        self.test_invalid_tx_in_compactblock(self.nodes[1], self.segwit_node, True)
+        self.test_invalid_tx_in_compactblock(self.nodes[1], self.old_node, True)
+
         print("\tTesting invalid index in cmpctblock message...")
         self.test_invalid_cmpctblock_message()
 

From 88c35491ab19f9afdf9b3fa9356a072f70ef2f55 Mon Sep 17 00:00:00 2001
From: Suhas Daftuar <sdaftuar@gmail.com>
Date: Mon, 31 Oct 2016 10:03:49 -0400
Subject: [PATCH 1139/1802] Fix compact block handling to not ban if block is
 invalid

---
 src/blockencodings.cpp    |  2 +-
 src/blockencodings.h      |  2 ++
 src/main.cpp              | 46 +++++++++++++++++++++++++++------------
 src/main.h                |  2 +-
 src/rpc/mining.cpp        |  4 ++--
 src/test/miner_tests.cpp  |  2 +-
 src/test/test_bitcoin.cpp |  2 +-
 7 files changed, 40 insertions(+), 20 deletions(-)

diff --git a/src/blockencodings.cpp b/src/blockencodings.cpp
index 93d3fa372b3c0..737102f1680e1 100644
--- a/src/blockencodings.cpp
+++ b/src/blockencodings.cpp
@@ -167,7 +167,7 @@ ReadStatus PartiallyDownloadedBlock::FillBlock(CBlock& block, const std::vector<
         // check its own merkle root and cache that check.
         if (state.CorruptionPossible())
             return READ_STATUS_FAILED; // Possible Short ID collision
-        return READ_STATUS_INVALID;
+        return READ_STATUS_CHECKBLOCK_FAILED;
     }
 
     LogPrint("cmpctblock", "Successfully reconstructed block %s with %lu txn prefilled, %lu txn from mempool and %lu txn requested\n", header.GetHash().ToString(), prefilled_count, mempool_count, vtx_missing.size());
diff --git a/src/blockencodings.h b/src/blockencodings.h
index 99b1cb140d0a4..705eaf28aa50b 100644
--- a/src/blockencodings.h
+++ b/src/blockencodings.h
@@ -124,6 +124,8 @@ typedef enum ReadStatus_t
     READ_STATUS_OK,
     READ_STATUS_INVALID, // Invalid object, peer is sending bogus crap
     READ_STATUS_FAILED, // Failed to process object
+    READ_STATUS_CHECKBLOCK_FAILED, // Used only by FillBlock to indicate a
+                                   // failure in CheckBlock.
 } ReadStatus;
 
 class CBlockHeaderAndShortTxIDs {
diff --git a/src/main.cpp b/src/main.cpp
index 3f706b1503aa2..b65b9874e9314 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -179,8 +179,10 @@ namespace {
      * Sources of received blocks, saved to be able to send them reject
      * messages or ban them when processing happens afterwards. Protected by
      * cs_main.
+     * Set mapBlockSource[hash].second to false if the node should not be
+     * punished if the block is invalid.
      */
-    map<uint256, NodeId> mapBlockSource;
+    map<uint256, std::pair<NodeId, bool>> mapBlockSource;
 
     /**
      * Filter for transactions that were recently rejected by
@@ -3759,7 +3761,7 @@ static bool AcceptBlock(const CBlock& block, CValidationState& state, const CCha
     return true;
 }
 
-bool ProcessNewBlock(CValidationState& state, const CChainParams& chainparams, CNode* pfrom, const CBlock* pblock, bool fForceProcessing, const CDiskBlockPos* dbp)
+bool ProcessNewBlock(CValidationState& state, const CChainParams& chainparams, CNode* pfrom, const CBlock* pblock, bool fForceProcessing, const CDiskBlockPos* dbp, bool fMayBanPeerIfInvalid)
 {
     {
         LOCK(cs_main);
@@ -3769,7 +3771,7 @@ bool ProcessNewBlock(CValidationState& state, const CChainParams& chainparams, C
         bool fNewBlock = false;
         bool ret = AcceptBlock(*pblock, state, chainparams, &pindex, fForceProcessing, dbp, &fNewBlock);
         if (pindex && pfrom) {
-            mapBlockSource[pindex->GetBlockHash()] = pfrom->GetId();
+            mapBlockSource[pindex->GetBlockHash()] = std::make_pair(pfrom->GetId(), fMayBanPeerIfInvalid);
             if (fNewBlock) pfrom->nLastBlockTime = GetTime();
         }
         CheckBlockIndex(chainparams.GetConsensus());
@@ -4749,16 +4751,16 @@ void PeerLogicValidation::BlockChecked(const CBlock& block, const CValidationSta
     LOCK(cs_main);
 
     const uint256 hash(block.GetHash());
-    std::map<uint256, NodeId>::iterator it = mapBlockSource.find(hash);
+    std::map<uint256, std::pair<NodeId, bool>>::iterator it = mapBlockSource.find(hash);
 
     int nDoS = 0;
     if (state.IsInvalid(nDoS)) {
-        if (it != mapBlockSource.end() && State(it->second)) {
+        if (it != mapBlockSource.end() && State(it->second.first)) {
             assert (state.GetRejectCode() < REJECT_INTERNAL); // Blocks are never rejected with internal reject codes
             CBlockReject reject = {(unsigned char)state.GetRejectCode(), state.GetRejectReason().substr(0, MAX_REJECT_MESSAGE_LENGTH), hash};
-            State(it->second)->rejects.push_back(reject);
-            if (nDoS > 0)
-                Misbehaving(it->second, nDoS);
+            State(it->second.first)->rejects.push_back(reject);
+            if (nDoS > 0 && it->second.second)
+                Misbehaving(it->second.first, nDoS);
         }
     }
     if (it != mapBlockSource.end())
@@ -5868,6 +5870,23 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
                 invs.push_back(CInv(MSG_BLOCK | GetFetchFlags(pfrom, chainActive.Tip(), chainparams.GetConsensus()), resp.blockhash));
                 pfrom->PushMessage(NetMsgType::GETDATA, invs);
             } else {
+                // Block is either okay, or possibly we received
+                // READ_STATUS_CHECKBLOCK_FAILED.
+                // Note that CheckBlock can only fail for one of a few reasons:
+                // 1. bad-proof-of-work (impossible here, because we've already
+                //    accepted the header)
+                // 2. merkleroot doesn't match the transactions given (already
+                //    caught in FillBlock with READ_STATUS_FAILED, so
+                //    impossible here)
+                // 3. the block is otherwise invalid (eg invalid coinbase,
+                //    block is too big, too many legacy sigops, etc).
+                // So if CheckBlock failed, #3 is the only possibility.
+                // Under BIP 152, we don't DoS-ban unless proof of work is
+                // invalid (we don't require all the stateless checks to have
+                // been run).  This is handled below, so just treat this as
+                // though the block was successfully read, and rely on the
+                // handling in ProcessNewBlock to ensure the block index is
+                // updated, reject messages go out, etc.
                 MarkBlockAsReceived(resp.blockhash); // it is now an empty pointer
                 fBlockRead = true;
             }
@@ -5876,16 +5895,15 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
             CValidationState state;
             // Since we requested this block (it was in mapBlocksInFlight), force it to be processed,
             // even if it would not be a candidate for new tip (missing previous block, chain not long enough, etc)
-            ProcessNewBlock(state, chainparams, pfrom, &block, true, NULL);
+            // BIP 152 permits peers to relay compact blocks after validating
+            // the header only; we should not punish peers if the block turns
+            // out to be invalid.
+            ProcessNewBlock(state, chainparams, pfrom, &block, true, NULL, false);
             int nDoS;
             if (state.IsInvalid(nDoS)) {
                 assert (state.GetRejectCode() < REJECT_INTERNAL); // Blocks are never rejected with internal reject codes
                 pfrom->PushMessage(NetMsgType::REJECT, strCommand, (unsigned char)state.GetRejectCode(),
                                    state.GetRejectReason().substr(0, MAX_REJECT_MESSAGE_LENGTH), block.GetHash());
-                if (nDoS > 0) {
-                    LOCK(cs_main);
-                    Misbehaving(pfrom->GetId(), nDoS);
-                }
             }
         }
     }
@@ -6056,7 +6074,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
             // need it even though it is not a candidate for a new best tip.
             forceProcessing |= MarkBlockAsReceived(block.GetHash());
         }
-        ProcessNewBlock(state, chainparams, pfrom, &block, forceProcessing, NULL);
+        ProcessNewBlock(state, chainparams, pfrom, &block, forceProcessing, NULL, true);
         int nDoS;
         if (state.IsInvalid(nDoS)) {
             assert (state.GetRejectCode() < REJECT_INTERNAL); // Blocks are never rejected with internal reject codes
diff --git a/src/main.h b/src/main.h
index e80314a64b9fd..9343330587aff 100644
--- a/src/main.h
+++ b/src/main.h
@@ -223,7 +223,7 @@ static const uint64_t MIN_DISK_SPACE_FOR_BLOCK_FILES = 550 * 1024 * 1024;
  * @param[out]  dbp     The already known disk position of pblock, or NULL if not yet stored.
  * @return True if state.IsValid()
  */
-bool ProcessNewBlock(CValidationState& state, const CChainParams& chainparams, CNode* pfrom, const CBlock* pblock, bool fForceProcessing, const CDiskBlockPos* dbp);
+bool ProcessNewBlock(CValidationState& state, const CChainParams& chainparams, CNode* pfrom, const CBlock* pblock, bool fForceProcessing, const CDiskBlockPos* dbp, bool fMayBanPeerIfInvalid);
 /** Check whether enough disk space is available for an incoming block */
 bool CheckDiskSpace(uint64_t nAdditionalBytes = 0);
 /** Open a block file (blk?????.dat) */
diff --git a/src/rpc/mining.cpp b/src/rpc/mining.cpp
index be0776ea22b76..564102ff952c7 100644
--- a/src/rpc/mining.cpp
+++ b/src/rpc/mining.cpp
@@ -132,7 +132,7 @@ UniValue generateBlocks(boost::shared_ptr<CReserveScript> coinbaseScript, int nG
             continue;
         }
         CValidationState state;
-        if (!ProcessNewBlock(state, Params(), NULL, pblock, true, NULL))
+        if (!ProcessNewBlock(state, Params(), NULL, pblock, true, NULL, false))
             throw JSONRPCError(RPC_INTERNAL_ERROR, "ProcessNewBlock, block not accepted");
         ++nHeight;
         blockHashes.push_back(pblock->GetHash().GetHex());
@@ -757,7 +757,7 @@ UniValue submitblock(const JSONRPCRequest& request)
     CValidationState state;
     submitblock_StateCatcher sc(block.GetHash());
     RegisterValidationInterface(&sc);
-    bool fAccepted = ProcessNewBlock(state, Params(), NULL, &block, true, NULL);
+    bool fAccepted = ProcessNewBlock(state, Params(), NULL, &block, true, NULL, false);
     UnregisterValidationInterface(&sc);
     if (fBlockPresent)
     {
diff --git a/src/test/miner_tests.cpp b/src/test/miner_tests.cpp
index a94979fd77d07..2762cafa38caf 100644
--- a/src/test/miner_tests.cpp
+++ b/src/test/miner_tests.cpp
@@ -223,7 +223,7 @@ BOOST_AUTO_TEST_CASE(CreateNewBlock_validity)
         pblock->hashMerkleRoot = BlockMerkleRoot(*pblock);
         pblock->nNonce = blockinfo[i].nonce;
         CValidationState state;
-        BOOST_CHECK(ProcessNewBlock(state, chainparams, NULL, pblock, true, NULL));
+        BOOST_CHECK(ProcessNewBlock(state, chainparams, NULL, pblock, true, NULL, false));
         BOOST_CHECK(state.IsValid());
         pblock->hashPrevBlock = pblock->GetHash();
     }
diff --git a/src/test/test_bitcoin.cpp b/src/test/test_bitcoin.cpp
index 98f4ed939ff18..3da0be8ca409d 100644
--- a/src/test/test_bitcoin.cpp
+++ b/src/test/test_bitcoin.cpp
@@ -127,7 +127,7 @@ TestChain100Setup::CreateAndProcessBlock(const std::vector<CMutableTransaction>&
     while (!CheckProofOfWork(block.GetHash(), block.nBits, chainparams.GetConsensus())) ++block.nNonce;
 
     CValidationState state;
-    ProcessNewBlock(state, chainparams, NULL, &block, true, NULL);
+    ProcessNewBlock(state, chainparams, NULL, &block, true, NULL, false);
 
     CBlock result = block;
     return result;

From d4833ff74701cc97aab733c54adb8f46e602fa5e Mon Sep 17 00:00:00 2001
From: Suhas Daftuar <sdaftuar@gmail.com>
Date: Tue, 1 Nov 2016 11:12:43 -0400
Subject: [PATCH 1140/1802] Bump the protocol version to distinguish new
 banning behavior.

This allows future software that would relay compact blocks before
full validation to announce only to peers that will not ban if the
block turns out to be invalid.
---
 src/version.h | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/version.h b/src/version.h
index 87bd65506670a..87fb1a3a75b08 100644
--- a/src/version.h
+++ b/src/version.h
@@ -9,7 +9,7 @@
  * network protocol versioning
  */
 
-static const int PROTOCOL_VERSION = 70014;
+static const int PROTOCOL_VERSION = 70015;
 
 //! initial proto version, to be increased after version/verack negotiation
 static const int INIT_PROTO_VERSION = 209;
@@ -42,4 +42,7 @@ static const int FEEFILTER_VERSION = 70013;
 //! short-id-based block download starts with this version
 static const int SHORT_IDS_BLOCKS_VERSION = 70014;
 
+//! not banning for invalid compact blocks starts with this version
+static const int INVALID_CB_NO_BAN_VERSION = 70015;
+
 #endif // BITCOIN_VERSION_H

From b98c14c4e362a8e59d7a3b021651a19ea61b29dd Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Mon, 12 Sep 2016 14:38:01 -0400
Subject: [PATCH 1141/1802] serialization: teach serializers variadics

Also add a variadic CDataStream ctor for ease-of-use.
---
 src/serialize.h              | 49 +++++++++++++++++++++++++
 src/streams.h                |  7 ++++
 src/test/serialize_tests.cpp | 71 +++++++++++++++++++++++++++++++++++-
 3 files changed, 126 insertions(+), 1 deletion(-)

diff --git a/src/serialize.h b/src/serialize.h
index 1f51da82fffa2..82870c45b3b0b 100644
--- a/src/serialize.h
+++ b/src/serialize.h
@@ -160,6 +160,7 @@ enum
 };
 
 #define READWRITE(obj)      (::SerReadWrite(s, (obj), nType, nVersion, ser_action))
+#define READWRITEMANY(...)      (::SerReadWriteMany(s, nType, nVersion, ser_action, __VA_ARGS__))
 
 /** 
  * Implement three methods for serializable objects. These are actually wrappers over
@@ -960,4 +961,52 @@ class CSizeComputer
     }
 };
 
+template<typename Stream>
+void SerializeMany(Stream& s, int nType, int nVersion)
+{
+}
+
+template<typename Stream, typename Arg>
+void SerializeMany(Stream& s, int nType, int nVersion, Arg&& arg)
+{
+    ::Serialize(s, std::forward<Arg>(arg), nType, nVersion);
+}
+
+template<typename Stream, typename Arg, typename... Args>
+void SerializeMany(Stream& s, int nType, int nVersion, Arg&& arg, Args&&... args)
+{
+    ::Serialize(s, std::forward<Arg>(arg), nType, nVersion);
+    ::SerializeMany(s, nType, nVersion, std::forward<Args>(args)...);
+}
+
+template<typename Stream>
+inline void UnserializeMany(Stream& s, int nType, int nVersion)
+{
+}
+
+template<typename Stream, typename Arg>
+inline void UnserializeMany(Stream& s, int nType, int nVersion, Arg& arg)
+{
+    ::Unserialize(s, arg, nType, nVersion);
+}
+
+template<typename Stream, typename Arg, typename... Args>
+inline void UnserializeMany(Stream& s, int nType, int nVersion, Arg& arg, Args&... args)
+{
+    ::Unserialize(s, arg, nType, nVersion);
+    ::UnserializeMany(s, nType, nVersion, args...);
+}
+
+template<typename Stream, typename... Args>
+inline void SerReadWriteMany(Stream& s, int nType, int nVersion, CSerActionSerialize ser_action, Args&&... args)
+{
+    ::SerializeMany(s, nType, nVersion, std::forward<Args>(args)...);
+}
+
+template<typename Stream, typename... Args>
+inline void SerReadWriteMany(Stream& s, int nType, int nVersion, CSerActionUnserialize ser_action, Args&... args)
+{
+    ::UnserializeMany(s, nType, nVersion, args...);
+}
+
 #endif // BITCOIN_SERIALIZE_H
diff --git a/src/streams.h b/src/streams.h
index 7132364eb1951..fa001c112accc 100644
--- a/src/streams.h
+++ b/src/streams.h
@@ -112,6 +112,13 @@ class CDataStream
         Init(nTypeIn, nVersionIn);
     }
 
+    template <typename... Args>
+    CDataStream(int nTypeIn, int nVersionIn, Args&&... args)
+    {
+        Init(nTypeIn, nVersionIn);
+        ::SerializeMany(*this, nType, nVersion, std::forward<Args>(args)...);
+    }
+
     void Init(int nTypeIn, int nVersionIn)
     {
         nReadPos = 0;
diff --git a/src/test/serialize_tests.cpp b/src/test/serialize_tests.cpp
index bec2c7459d8c9..4c0fdc77f70be 100644
--- a/src/test/serialize_tests.cpp
+++ b/src/test/serialize_tests.cpp
@@ -10,11 +10,54 @@
 #include <stdint.h>
 
 #include <boost/test/unit_test.hpp>
-
 using namespace std;
 
 BOOST_FIXTURE_TEST_SUITE(serialize_tests, BasicTestingSetup)
 
+class CSerializeMethodsTestSingle
+{
+protected:
+    int intval;
+    bool boolval;
+    std::string stringval;
+    const char* charstrval;
+    CTransaction txval;
+public:
+    CSerializeMethodsTestSingle() = default;
+    CSerializeMethodsTestSingle(int intvalin, bool boolvalin, std::string stringvalin, const char* charstrvalin, CTransaction txvalin) : intval(intvalin), boolval(boolvalin), stringval(std::move(stringvalin)), charstrval(charstrvalin), txval(txvalin){}
+    ADD_SERIALIZE_METHODS;
+
+    template <typename Stream, typename Operation>
+    inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) {
+        READWRITE(intval);
+        READWRITE(boolval);
+        READWRITE(stringval);
+        READWRITE(FLATDATA(charstrval));
+        READWRITE(txval);
+    }
+
+    bool operator==(const CSerializeMethodsTestSingle& rhs)
+    {
+        return  intval == rhs.intval && \
+                boolval == rhs.boolval && \
+                stringval == rhs.stringval && \
+                strcmp(charstrval, rhs.charstrval) == 0 && \
+                txval == rhs.txval;
+    }
+};
+
+class CSerializeMethodsTestMany : public CSerializeMethodsTestSingle
+{
+public:
+    using CSerializeMethodsTestSingle::CSerializeMethodsTestSingle;
+    ADD_SERIALIZE_METHODS;
+
+    template <typename Stream, typename Operation>
+    inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) {
+        READWRITEMANY(intval, boolval, stringval, FLATDATA(charstrval), txval);
+    }
+};
+
 BOOST_AUTO_TEST_CASE(sizes)
 {
     BOOST_CHECK_EQUAL(sizeof(char), GetSerializeSize(char(0), 0));
@@ -297,4 +340,30 @@ BOOST_AUTO_TEST_CASE(insert_delete)
     BOOST_CHECK_EQUAL(ss.size(), 0);
 }
 
+BOOST_AUTO_TEST_CASE(class_methods)
+{
+    int intval(100);
+    bool boolval(true);
+    std::string stringval("testing");
+    const char* charstrval("testing charstr");
+    CMutableTransaction txval;
+    CSerializeMethodsTestSingle methodtest1(intval, boolval, stringval, charstrval, txval);
+    CSerializeMethodsTestMany methodtest2(intval, boolval, stringval, charstrval, txval);
+    CSerializeMethodsTestSingle methodtest3;
+    CSerializeMethodsTestMany methodtest4;
+    CDataStream ss(SER_DISK, PROTOCOL_VERSION);
+    BOOST_CHECK(methodtest1 == methodtest2);
+    ss << methodtest1;
+    ss >> methodtest4;
+    ss << methodtest2;
+    ss >> methodtest3;
+    BOOST_CHECK(methodtest1 == methodtest2);
+    BOOST_CHECK(methodtest2 == methodtest3);
+    BOOST_CHECK(methodtest3 == methodtest4);
+
+    CDataStream ss2(SER_DISK, PROTOCOL_VERSION, intval, boolval, stringval, FLATDATA(charstrval), txval);
+    ss2 >> methodtest3;
+    BOOST_CHECK(methodtest3 == methodtest4);
+}
+
 BOOST_AUTO_TEST_SUITE_END()

From 3e32cd09f643bf7d4344d3bb2e1136f186f3d109 Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Mon, 12 Sep 2016 20:00:33 -0400
Subject: [PATCH 1142/1802] connman is in charge of pushing messages

The changes here are dense and subtle, but hopefully all is more explicit
than before.

- CConnman is now in charge of sending data rather than the nodes themselves.
  This is necessary because many decisions need to be made with all nodes in
  mind, and a model that requires the nodes calling up to their manager quickly
  turns to spaghetti.

- The per-node-serializer (ssSend) has been replaced with a (quasi-)const
  send-version. Since the send version for serialization can only change once
  per connection, we now explicitly tag messages with INIT_PROTO_VERSION if
  they are sent before the handshake. With this done, there's no need to lock
  for access to nSendVersion.

  Also, a new stream is used for each message, so there's no need to lock
  during the serialization process.

- This takes care of accounting for optimistic sends, so the
  nOptimisticBytesWritten hack can be removed.

- -dropmessagestest and -fuzzmessagestest have not been preserved, as I suspect
  they haven't been used in years.
---
 src/main.cpp           | 14 +++----
 src/net.cpp            | 91 ++++++++++++++++++++++++++++++++----------
 src/net.h              | 58 +++++++++++++++++++++++++--
 src/test/DoS_tests.cpp |  4 ++
 4 files changed, 135 insertions(+), 32 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index 3f706b1503aa2..62fbf9e455e06 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -5047,7 +5047,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
         // Each connection can only send one version message
         if (pfrom->nVersion != 0)
         {
-            pfrom->PushMessage(NetMsgType::REJECT, strCommand, REJECT_DUPLICATE, string("Duplicate version message"));
+            connman.PushMessageWithVersion(pfrom, INIT_PROTO_VERSION, NetMsgType::REJECT, strCommand, REJECT_DUPLICATE, string("Duplicate version message"));
             LOCK(cs_main);
             Misbehaving(pfrom->GetId(), 1);
             return false;
@@ -5067,7 +5067,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
         if (pfrom->nServicesExpected & ~pfrom->nServices)
         {
             LogPrint("net", "peer=%d does not offer the expected services (%08x offered, %08x expected); disconnecting\n", pfrom->id, pfrom->nServices, pfrom->nServicesExpected);
-            pfrom->PushMessage(NetMsgType::REJECT, strCommand, REJECT_NONSTANDARD,
+            connman.PushMessageWithVersion(pfrom, INIT_PROTO_VERSION, NetMsgType::REJECT, strCommand, REJECT_NONSTANDARD,
                                strprintf("Expected to offer services %08x", pfrom->nServicesExpected));
             pfrom->fDisconnect = true;
             return false;
@@ -5077,7 +5077,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
         {
             // disconnect from peers older than this proto version
             LogPrintf("peer=%d using obsolete version %i; disconnecting\n", pfrom->id, pfrom->nVersion);
-            pfrom->PushMessage(NetMsgType::REJECT, strCommand, REJECT_OBSOLETE,
+            connman.PushMessageWithVersion(pfrom, INIT_PROTO_VERSION, NetMsgType::REJECT, strCommand, REJECT_OBSOLETE,
                                strprintf("Version must be %d or greater", MIN_PEER_PROTO_VERSION));
             pfrom->fDisconnect = true;
             return false;
@@ -5118,7 +5118,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
 
         // Be shy and don't send version until we hear
         if (pfrom->fInbound)
-            pfrom->PushVersion();
+            connman.PushVersion(pfrom, GetAdjustedTime());
 
         pfrom->fClient = !(pfrom->nServices & NODE_NETWORK);
 
@@ -5135,8 +5135,8 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
         }
 
         // Change version
-        pfrom->PushMessage(NetMsgType::VERACK);
-        pfrom->ssSend.SetVersion(min(pfrom->nVersion, PROTOCOL_VERSION));
+        connman.PushMessageWithVersion(pfrom, INIT_PROTO_VERSION, NetMsgType::VERACK);
+        pfrom->SetSendVersion(min(pfrom->nVersion, PROTOCOL_VERSION));
 
         if (!pfrom->fInbound)
         {
@@ -6391,7 +6391,7 @@ bool ProcessMessages(CNode* pfrom, CConnman& connman)
         }
         catch (const std::ios_base::failure& e)
         {
-            pfrom->PushMessage(NetMsgType::REJECT, strCommand, REJECT_MALFORMED, string("error parsing message"));
+            connman.PushMessageWithVersion(pfrom, INIT_PROTO_VERSION, NetMsgType::REJECT, strCommand, REJECT_MALFORMED, string("error parsing message"));
             if (strstr(e.what(), "end of data"))
             {
                 // Allow exceptions from under-length message on vRecv
diff --git a/src/net.cpp b/src/net.cpp
index 18d25cbcd1128..f271aed242b74 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -394,6 +394,9 @@ CNode* CConnman::ConnectNode(CAddress addrConnect, const char *pszDest, bool fCo
         uint64_t nonce = GetDeterministicRandomizer(RANDOMIZER_ID_LOCALHOSTNONCE).Write(id).Finalize();
         CNode* pnode = new CNode(id, nLocalServices, GetBestHeight(), hSocket, addrConnect, CalculateKeyedNetGroup(addrConnect), nonce, pszDest ? pszDest : "", false);
 
+
+        PushVersion(pnode, GetTime());
+
         GetNodeSignals().InitializeNode(pnode->GetId(), pnode);
         pnode->AddRef();
 
@@ -415,6 +418,24 @@ CNode* CConnman::ConnectNode(CAddress addrConnect, const char *pszDest, bool fCo
     return NULL;
 }
 
+void CConnman::PushVersion(CNode* pnode, int64_t nTime)
+{
+    ServiceFlags nLocalNodeServices = pnode->GetLocalServices();
+    CAddress addrYou = (pnode->addr.IsRoutable() && !IsProxy(pnode->addr) ? pnode->addr : CAddress(CService(), pnode->addr.nServices));
+    CAddress addrMe = CAddress(CService(), nLocalNodeServices);
+    uint64_t nonce = pnode->GetLocalNonce();
+    int nNodeStartingHeight = pnode->nMyStartingHeight;
+    NodeId id = pnode->GetId();
+
+    PushMessageWithVersion(pnode, INIT_PROTO_VERSION, NetMsgType::VERSION, PROTOCOL_VERSION, (uint64_t)nLocalNodeServices, nTime, addrYou, addrMe,
+            nonce, strSubVersion, nNodeStartingHeight, ::fRelayTxes);
+
+    if (fLogIPs)
+        LogPrint("net", "send version message: version %d, blocks=%d, us=%s, them=%s, peer=%d\n", PROTOCOL_VERSION, nNodeStartingHeight, addrMe.ToString(), addrYou.ToString(), id);
+    else
+        LogPrint("net", "send version message: version %d, blocks=%d, us=%s, peer=%d\n", PROTOCOL_VERSION, nNodeStartingHeight, addrMe.ToString(), id);
+}
+
 void CConnman::DumpBanlist()
 {
     SweepBanned(); // clean unused entries (if bantime has expired)
@@ -450,23 +471,6 @@ void CNode::CloseSocketDisconnect()
         vRecvMsg.clear();
 }
 
-void CNode::PushVersion()
-{
-    int64_t nTime = (fInbound ? GetAdjustedTime() : GetTime());
-    CAddress addrYou = (addr.IsRoutable() && !IsProxy(addr) ? addr : CAddress(CService(), addr.nServices));
-    CAddress addrMe = CAddress(CService(), nLocalServices);
-    if (fLogIPs)
-        LogPrint("net", "send version message: version %d, blocks=%d, us=%s, them=%s, peer=%d\n", PROTOCOL_VERSION, nMyStartingHeight, addrMe.ToString(), addrYou.ToString(), id);
-    else
-        LogPrint("net", "send version message: version %d, blocks=%d, us=%s, peer=%d\n", PROTOCOL_VERSION, nMyStartingHeight, addrMe.ToString(), id);
-    PushMessage(NetMsgType::VERSION, PROTOCOL_VERSION, (uint64_t)nLocalServices, nTime, addrYou, addrMe,
-                nLocalHostNonce, strSubVersion, nMyStartingHeight, ::fRelayTxes);
-}
-
-
-
-
-
 void CConnman::ClearBanned()
 {
     {
@@ -2530,7 +2534,8 @@ CNode::CNode(NodeId idIn, ServiceFlags nLocalServicesIn, int nMyStartingHeightIn
     filterInventoryKnown(50000, 0.000001),
     nLocalHostNonce(nLocalHostNonceIn),
     nLocalServices(nLocalServicesIn),
-    nMyStartingHeight(nMyStartingHeightIn)
+    nMyStartingHeight(nMyStartingHeightIn),
+    nSendVersion(0)
 {
     nServices = NODE_NONE;
     nServicesExpected = NODE_NONE;
@@ -2587,10 +2592,6 @@ CNode::CNode(NodeId idIn, ServiceFlags nLocalServicesIn, int nMyStartingHeightIn
         LogPrint("net", "Added connection to %s peer=%d\n", addrName, id);
     else
         LogPrint("net", "Added connection peer=%d\n", id);
-
-    // Be shy and don't send version until we hear
-    if (hSocket != INVALID_SOCKET && !fInbound)
-        PushVersion();
 }
 
 CNode::~CNode()
@@ -2696,6 +2697,52 @@ void CNode::EndMessage(const char* pszCommand) UNLOCK_FUNCTION(cs_vSend)
     LEAVE_CRITICAL_SECTION(cs_vSend);
 }
 
+CDataStream CConnman::BeginMessage(CNode* pnode, int nVersion, int flags, const std::string& sCommand)
+{
+    return {SER_NETWORK, (nVersion ? nVersion : pnode->GetSendVersion()) | flags, CMessageHeader(Params().MessageStart(), sCommand.c_str(), 0) };
+}
+
+void CConnman::EndMessage(CDataStream& strm)
+{
+    // Set the size
+    assert(strm.size () >= CMessageHeader::HEADER_SIZE);
+    unsigned int nSize = strm.size() - CMessageHeader::HEADER_SIZE;
+    WriteLE32((uint8_t*)&strm[CMessageHeader::MESSAGE_SIZE_OFFSET], nSize);
+    // Set the checksum
+    uint256 hash = Hash(strm.begin() + CMessageHeader::HEADER_SIZE, strm.end());
+    memcpy((char*)&strm[CMessageHeader::CHECKSUM_OFFSET], hash.begin(), CMessageHeader::CHECKSUM_SIZE);
+
+}
+
+void CConnman::PushMessage(CNode* pnode, CDataStream& strm, const std::string& sCommand)
+{
+    if(strm.empty())
+        return;
+
+    unsigned int nSize = strm.size() - CMessageHeader::HEADER_SIZE;
+    LogPrint("net", "sending %s (%d bytes) peer=%d\n",  SanitizeString(sCommand.c_str()), nSize, pnode->id);
+
+    size_t nBytesSent = 0;
+    {
+        LOCK(pnode->cs_vSend);
+        if(pnode->hSocket == INVALID_SOCKET) {
+            return;
+        }
+        bool optimisticSend(pnode->vSendMsg.empty());
+        pnode->vSendMsg.emplace_back(strm.begin(), strm.end());
+
+        //log total amount of bytes per command
+        pnode->mapSendBytesPerMsgCmd[sCommand] += strm.size();
+        pnode->nSendSize += strm.size();
+
+        // If write queue empty, attempt "optimistic write"
+        if (optimisticSend == true)
+            nBytesSent = SocketSendData(pnode);
+    }
+    if (nBytesSent)
+        RecordBytesSent(nBytesSent);
+}
+
 bool CConnman::ForNode(NodeId id, std::function<bool(CNode* pnode)> func)
 {
     CNode* found = nullptr;
diff --git a/src/net.h b/src/net.h
index bfce516237df8..c33de9824b411 100644
--- a/src/net.h
+++ b/src/net.h
@@ -136,6 +136,36 @@ class CConnman
 
     bool ForNode(NodeId id, std::function<bool(CNode* pnode)> func);
 
+    template <typename... Args>
+    void PushMessageWithVersionAndFlag(CNode* pnode, int nVersion, int flag, const std::string& sCommand, Args&&... args)
+    {
+        auto msg(BeginMessage(pnode, nVersion, flag, sCommand));
+        ::SerializeMany(msg, msg.nType, msg.nVersion, std::forward<Args>(args)...);
+        EndMessage(msg);
+        PushMessage(pnode, msg, sCommand);
+    }
+
+    template <typename... Args>
+    void PushMessageWithFlag(CNode* pnode, int flag, const std::string& sCommand, Args&&... args)
+    {
+        PushMessageWithVersionAndFlag(pnode, 0, flag, sCommand, std::forward<Args>(args)...);
+    }
+
+    template <typename... Args>
+    void PushMessageWithVersion(CNode* pnode, int nVersion, const std::string& sCommand, Args&&... args)
+    {
+        PushMessageWithVersionAndFlag(pnode, nVersion, 0, sCommand, std::forward<Args>(args)...);
+    }
+
+    template <typename... Args>
+    void PushMessage(CNode* pnode, const std::string& sCommand, Args&&... args)
+    {
+        PushMessageWithVersionAndFlag(pnode, 0, 0, sCommand, std::forward<Args>(args)...);
+    }
+
+    void PushVersion(CNode* pnode, int64_t nTime);
+
+
     template<typename Callable>
     bool ForEachNodeContinueIf(Callable&& func)
     {
@@ -345,6 +375,10 @@ class CConnman
 
     unsigned int GetReceiveFloodSize() const;
 
+    CDataStream BeginMessage(CNode* node, int nVersion, int flags, const std::string& sCommand);
+    void PushMessage(CNode* pnode, CDataStream& strm, const std::string& sCommand);
+    void EndMessage(CDataStream& strm);
+
     // Network stats
     void RecordBytesRecv(uint64_t bytes);
     void RecordBytesSent(uint64_t bytes);
@@ -553,6 +587,7 @@ class CNetMessage {
 /** Information about a peer */
 class CNode
 {
+    friend class CConnman;
 public:
     // socket
     ServiceFlags nServices;
@@ -681,6 +716,7 @@ class CNode
     // Services offered to this peer
     const ServiceFlags nLocalServices;
     const int nMyStartingHeight;
+    int nSendVersion;
 public:
 
     NodeId GetId() const {
@@ -716,6 +752,25 @@ class CNode
         BOOST_FOREACH(CNetMessage &msg, vRecvMsg)
             msg.SetVersion(nVersionIn);
     }
+    void SetSendVersion(int nVersionIn)
+    {
+        // Send version may only be changed in the version message, and
+        // only one version message is allowed per session. We can therefore
+        // treat this value as const and even atomic as long as it's only used
+        // once the handshake is complete. Any attempt to set this twice is an
+        // error.
+        assert(nSendVersion == 0);
+        nSendVersion = nVersionIn;
+    }
+
+    int GetSendVersion() const
+    {
+        // The send version should always be explicitly set to
+        // INIT_PROTO_VERSION rather than using this value until the handshake
+        // is complete. See PushMessageWithVersion().
+        assert(nSendVersion != 0);
+        return nSendVersion;
+    }
 
     CNode* AddRef()
     {
@@ -787,9 +842,6 @@ class CNode
     // TODO: Document the precondition of this function.  Is cs_vSend locked?
     void EndMessage(const char* pszCommand) UNLOCK_FUNCTION(cs_vSend);
 
-    void PushVersion();
-
-
     void PushMessage(const char* pszCommand)
     {
         try
diff --git a/src/test/DoS_tests.cpp b/src/test/DoS_tests.cpp
index 4aa7166815790..47979a6f86747 100644
--- a/src/test/DoS_tests.cpp
+++ b/src/test/DoS_tests.cpp
@@ -49,6 +49,7 @@ BOOST_AUTO_TEST_CASE(DoS_banning)
     connman->ClearBanned();
     CAddress addr1(ip(0xa0b0c001), NODE_NONE);
     CNode dummyNode1(id++, NODE_NETWORK, 0, INVALID_SOCKET, addr1, 0, 0, "", true);
+    dummyNode1.SetSendVersion(PROTOCOL_VERSION);
     GetNodeSignals().InitializeNode(dummyNode1.GetId(), &dummyNode1);
     dummyNode1.nVersion = 1;
     Misbehaving(dummyNode1.GetId(), 100); // Should get banned
@@ -58,6 +59,7 @@ BOOST_AUTO_TEST_CASE(DoS_banning)
 
     CAddress addr2(ip(0xa0b0c002), NODE_NONE);
     CNode dummyNode2(id++, NODE_NETWORK, 0, INVALID_SOCKET, addr2, 1, 1, "", true);
+    dummyNode2.SetSendVersion(PROTOCOL_VERSION);
     GetNodeSignals().InitializeNode(dummyNode2.GetId(), &dummyNode2);
     dummyNode2.nVersion = 1;
     Misbehaving(dummyNode2.GetId(), 50);
@@ -75,6 +77,7 @@ BOOST_AUTO_TEST_CASE(DoS_banscore)
     mapArgs["-banscore"] = "111"; // because 11 is my favorite number
     CAddress addr1(ip(0xa0b0c001), NODE_NONE);
     CNode dummyNode1(id++, NODE_NETWORK, 0, INVALID_SOCKET, addr1, 3, 1, "", true);
+    dummyNode1.SetSendVersion(PROTOCOL_VERSION);
     GetNodeSignals().InitializeNode(dummyNode1.GetId(), &dummyNode1);
     dummyNode1.nVersion = 1;
     Misbehaving(dummyNode1.GetId(), 100);
@@ -97,6 +100,7 @@ BOOST_AUTO_TEST_CASE(DoS_bantime)
 
     CAddress addr(ip(0xa0b0c001), NODE_NONE);
     CNode dummyNode(id++, NODE_NETWORK, 0, INVALID_SOCKET, addr, 4, 4, "", true);
+    dummyNode.SetSendVersion(PROTOCOL_VERSION);
     GetNodeSignals().InitializeNode(dummyNode.GetId(), &dummyNode);
     dummyNode.nVersion = 1;
 

From ea3326891d8c3dcbcff178b618108d657c5586a3 Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Mon, 12 Sep 2016 20:07:44 -0400
Subject: [PATCH 1143/1802] net: switch all callers to connman for pushing
 messages

Drop all of the old stuff.
---
 src/main.cpp |  98 +++++++++++++--------------
 src/net.cpp  |  61 -----------------
 src/net.h    | 184 ---------------------------------------------------
 3 files changed, 49 insertions(+), 294 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index 62fbf9e455e06..5f5b1e3b7c3af 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -501,15 +501,15 @@ void MaybeSetPeerAsAnnouncingHeaderAndIDs(const CNodeState* nodestate, CNode* pf
         if (lNodesAnnouncingHeaderAndIDs.size() >= 3) {
             // As per BIP152, we only get 3 of our peers to announce
             // blocks using compact encodings.
-            bool found = connman.ForNode(lNodesAnnouncingHeaderAndIDs.front(), [fAnnounceUsingCMPCTBLOCK, nCMPCTBLOCKVersion](CNode* pnodeStop){
-                pnodeStop->PushMessage(NetMsgType::SENDCMPCT, fAnnounceUsingCMPCTBLOCK, nCMPCTBLOCKVersion);
+            bool found = connman.ForNode(lNodesAnnouncingHeaderAndIDs.front(), [&connman, fAnnounceUsingCMPCTBLOCK, nCMPCTBLOCKVersion](CNode* pnodeStop){
+                connman.PushMessage(pnodeStop, NetMsgType::SENDCMPCT, fAnnounceUsingCMPCTBLOCK, nCMPCTBLOCKVersion);
                 return true;
             });
             if(found)
                 lNodesAnnouncingHeaderAndIDs.pop_front();
         }
         fAnnounceUsingCMPCTBLOCK = true;
-        pfrom->PushMessage(NetMsgType::SENDCMPCT, fAnnounceUsingCMPCTBLOCK, nCMPCTBLOCKVersion);
+        connman.PushMessage(pfrom, NetMsgType::SENDCMPCT, fAnnounceUsingCMPCTBLOCK, nCMPCTBLOCKVersion);
         lNodesAnnouncingHeaderAndIDs.push_back(pfrom->GetId());
     }
 }
@@ -4900,9 +4900,9 @@ void static ProcessGetData(CNode* pfrom, const Consensus::Params& consensusParam
                     if (!ReadBlockFromDisk(block, (*mi).second, consensusParams))
                         assert(!"cannot load block from disk");
                     if (inv.type == MSG_BLOCK)
-                        pfrom->PushMessageWithFlag(SERIALIZE_TRANSACTION_NO_WITNESS, NetMsgType::BLOCK, block);
+                        connman.PushMessageWithFlag(pfrom, SERIALIZE_TRANSACTION_NO_WITNESS, NetMsgType::BLOCK, block);
                     else if (inv.type == MSG_WITNESS_BLOCK)
-                        pfrom->PushMessage(NetMsgType::BLOCK, block);
+                        connman.PushMessage(pfrom, NetMsgType::BLOCK, block);
                     else if (inv.type == MSG_FILTERED_BLOCK)
                     {
                         bool sendMerkleBlock = false;
@@ -4915,7 +4915,7 @@ void static ProcessGetData(CNode* pfrom, const Consensus::Params& consensusParam
                             }
                         }
                         if (sendMerkleBlock) {
-                            pfrom->PushMessage(NetMsgType::MERKLEBLOCK, merkleBlock);
+                            connman.PushMessage(pfrom, NetMsgType::MERKLEBLOCK, merkleBlock);
                             // CMerkleBlock just contains hashes, so also push any transactions in the block the client did not see
                             // This avoids hurting performance by pointlessly requiring a round-trip
                             // Note that there is currently no way for a node to request any single transactions we didn't send here -
@@ -4924,7 +4924,7 @@ void static ProcessGetData(CNode* pfrom, const Consensus::Params& consensusParam
                             // however we MUST always provide at least what the remote peer needs
                             typedef std::pair<unsigned int, uint256> PairType;
                             BOOST_FOREACH(PairType& pair, merkleBlock.vMatchedTxn)
-                                pfrom->PushMessageWithFlag(SERIALIZE_TRANSACTION_NO_WITNESS, NetMsgType::TX, block.vtx[pair.first]);
+                                connman.PushMessageWithFlag(pfrom, SERIALIZE_TRANSACTION_NO_WITNESS, NetMsgType::TX, block.vtx[pair.first]);
                         }
                         // else
                             // no response
@@ -4938,9 +4938,9 @@ void static ProcessGetData(CNode* pfrom, const Consensus::Params& consensusParam
                         bool fPeerWantsWitness = State(pfrom->GetId())->fWantsCmpctWitness;
                         if (CanDirectFetch(consensusParams) && mi->second->nHeight >= chainActive.Height() - MAX_CMPCTBLOCK_DEPTH) {
                             CBlockHeaderAndShortTxIDs cmpctblock(block, fPeerWantsWitness);
-                            pfrom->PushMessageWithFlag(fPeerWantsWitness ? 0 : SERIALIZE_TRANSACTION_NO_WITNESS, NetMsgType::CMPCTBLOCK, cmpctblock);
+                            connman.PushMessageWithFlag(pfrom, fPeerWantsWitness ? 0 : SERIALIZE_TRANSACTION_NO_WITNESS, NetMsgType::CMPCTBLOCK, cmpctblock);
                         } else
-                            pfrom->PushMessageWithFlag(fPeerWantsWitness ? 0 : SERIALIZE_TRANSACTION_NO_WITNESS, NetMsgType::BLOCK, block);
+                            connman.PushMessageWithFlag(pfrom, fPeerWantsWitness ? 0 : SERIALIZE_TRANSACTION_NO_WITNESS, NetMsgType::BLOCK, block);
                     }
 
                     // Trigger the peer node to send a getblocks request for the next batch of inventory
@@ -4951,7 +4951,7 @@ void static ProcessGetData(CNode* pfrom, const Consensus::Params& consensusParam
                         // wait for other stuff first.
                         vector<CInv> vInv;
                         vInv.push_back(CInv(MSG_BLOCK, chainActive.Tip()->GetBlockHash()));
-                        pfrom->PushMessage(NetMsgType::INV, vInv);
+                        connman.PushMessage(pfrom, NetMsgType::INV, vInv);
                         pfrom->hashContinue.SetNull();
                     }
                 }
@@ -4962,14 +4962,14 @@ void static ProcessGetData(CNode* pfrom, const Consensus::Params& consensusParam
                 bool push = false;
                 auto mi = mapRelay.find(inv.hash);
                 if (mi != mapRelay.end()) {
-                    pfrom->PushMessageWithFlag(inv.type == MSG_TX ? SERIALIZE_TRANSACTION_NO_WITNESS : 0, NetMsgType::TX, *mi->second);
+                    connman.PushMessageWithFlag(pfrom, inv.type == MSG_TX ? SERIALIZE_TRANSACTION_NO_WITNESS : 0, NetMsgType::TX, *mi->second);
                     push = true;
                 } else if (pfrom->timeLastMempoolReq) {
                     auto txinfo = mempool.info(inv.hash);
                     // To protect privacy, do not answer getdata using the mempool when
                     // that TX couldn't have been INVed in reply to a MEMPOOL request.
                     if (txinfo.tx && txinfo.nTime <= pfrom->timeLastMempoolReq) {
-                        pfrom->PushMessageWithFlag(inv.type == MSG_TX ? SERIALIZE_TRANSACTION_NO_WITNESS : 0, NetMsgType::TX, *txinfo.tx);
+                        connman.PushMessageWithFlag(pfrom, inv.type == MSG_TX ? SERIALIZE_TRANSACTION_NO_WITNESS : 0, NetMsgType::TX, *txinfo.tx);
                         push = true;
                     }
                 }
@@ -4996,7 +4996,7 @@ void static ProcessGetData(CNode* pfrom, const Consensus::Params& consensusParam
         // do that because they want to know about (and store and rebroadcast and
         // risk analyze) the dependencies of transactions relevant to them, without
         // having to download the entire memory pool.
-        pfrom->PushMessage(NetMsgType::NOTFOUND, vNotFound);
+        connman.PushMessage(pfrom, NetMsgType::NOTFOUND, vNotFound);
     }
 }
 
@@ -5159,7 +5159,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
             // Get recent addresses
             if (pfrom->fOneShot || pfrom->nVersion >= CADDR_TIME_VERSION || connman.GetAddressCount() < 1000)
             {
-                pfrom->PushMessage(NetMsgType::GETADDR);
+                connman.PushMessage(pfrom, NetMsgType::GETADDR);
                 pfrom->fGetAddr = true;
             }
             connman.MarkAddressGood(pfrom->addr);
@@ -5206,7 +5206,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
             // We send this to non-NODE NETWORK peers as well, because even
             // non-NODE NETWORK peers can announce blocks (such as pruning
             // nodes)
-            pfrom->PushMessage(NetMsgType::SENDHEADERS);
+            connman.PushMessage(pfrom, NetMsgType::SENDHEADERS);
         }
         if (pfrom->nVersion >= SHORT_IDS_BLOCKS_VERSION) {
             // Tell our peer we are willing to provide version 1 or 2 cmpctblocks
@@ -5217,9 +5217,9 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
             bool fAnnounceUsingCMPCTBLOCK = false;
             uint64_t nCMPCTBLOCKVersion = 2;
             if (pfrom->GetLocalServices() & NODE_WITNESS)
-                pfrom->PushMessage(NetMsgType::SENDCMPCT, fAnnounceUsingCMPCTBLOCK, nCMPCTBLOCKVersion);
+                connman.PushMessage(pfrom, NetMsgType::SENDCMPCT, fAnnounceUsingCMPCTBLOCK, nCMPCTBLOCKVersion);
             nCMPCTBLOCKVersion = 1;
-            pfrom->PushMessage(NetMsgType::SENDCMPCT, fAnnounceUsingCMPCTBLOCK, nCMPCTBLOCKVersion);
+            connman.PushMessage(pfrom, NetMsgType::SENDCMPCT, fAnnounceUsingCMPCTBLOCK, nCMPCTBLOCKVersion);
         }
     }
 
@@ -5347,7 +5347,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
                     // time the block arrives, the header chain leading up to it is already validated. Not
                     // doing this will result in the received block being rejected as an orphan in case it is
                     // not a direct successor.
-                    pfrom->PushMessage(NetMsgType::GETHEADERS, chainActive.GetLocator(pindexBestHeader), inv.hash);
+                    connman.PushMessage(pfrom, NetMsgType::GETHEADERS, chainActive.GetLocator(pindexBestHeader), inv.hash);
                     CNodeState *nodestate = State(pfrom->GetId());
                     if (CanDirectFetch(chainparams.GetConsensus()) &&
                         nodestate->nBlocksInFlight < MAX_BLOCKS_IN_TRANSIT_PER_PEER &&
@@ -5383,7 +5383,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
         }
 
         if (!vToFetch.empty())
-            pfrom->PushMessage(NetMsgType::GETDATA, vToFetch);
+            connman.PushMessage(pfrom, NetMsgType::GETDATA, vToFetch);
     }
 
 
@@ -5483,7 +5483,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
             }
             resp.txn[i] = block.vtx[req.indexes[i]];
         }
-        pfrom->PushMessageWithFlag(State(pfrom->GetId())->fWantsCmpctWitness ? 0 : SERIALIZE_TRANSACTION_NO_WITNESS, NetMsgType::BLOCKTXN, resp);
+        connman.PushMessageWithFlag(pfrom, State(pfrom->GetId())->fWantsCmpctWitness ? 0 : SERIALIZE_TRANSACTION_NO_WITNESS, NetMsgType::BLOCKTXN, resp);
     }
 
 
@@ -5532,7 +5532,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
         // headers message). In both cases it's safe to update
         // pindexBestHeaderSent to be our tip.
         nodestate->pindexBestHeaderSent = pindex ? pindex : chainActive.Tip();
-        pfrom->PushMessage(NetMsgType::HEADERS, vHeaders);
+        connman.PushMessage(pfrom, NetMsgType::HEADERS, vHeaders);
     }
 
 
@@ -5695,7 +5695,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
                 pfrom->id,
                 FormatStateMessage(state));
             if (state.GetRejectCode() < REJECT_INTERNAL) // Never send AcceptToMemoryPool's internal codes over P2P
-                pfrom->PushMessage(NetMsgType::REJECT, strCommand, (unsigned char)state.GetRejectCode(),
+                connman.PushMessage(pfrom, NetMsgType::REJECT, strCommand, (unsigned char)state.GetRejectCode(),
                                    state.GetRejectReason().substr(0, MAX_REJECT_MESSAGE_LENGTH), inv.hash);
             if (nDoS > 0) {
                 Misbehaving(pfrom->GetId(), nDoS);
@@ -5714,7 +5714,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
         if (mapBlockIndex.find(cmpctblock.header.hashPrevBlock) == mapBlockIndex.end()) {
             // Doesn't connect (or is genesis), instead of DoSing in AcceptBlockHeader, request deeper headers
             if (!IsInitialBlockDownload())
-                pfrom->PushMessage(NetMsgType::GETHEADERS, chainActive.GetLocator(pindexBestHeader), uint256());
+                connman.PushMessage(pfrom, NetMsgType::GETHEADERS, chainActive.GetLocator(pindexBestHeader), uint256());
             return true;
         }
 
@@ -5747,7 +5747,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
                 // so we just grab the block via normal getdata
                 std::vector<CInv> vInv(1);
                 vInv[0] = CInv(MSG_BLOCK | GetFetchFlags(pfrom, pindex->pprev, chainparams.GetConsensus()), cmpctblock.header.GetHash());
-                pfrom->PushMessage(NetMsgType::GETDATA, vInv);
+                connman.PushMessage(pfrom, NetMsgType::GETDATA, vInv);
             }
             return true;
         }
@@ -5791,7 +5791,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
                     // Duplicate txindexes, the block is now in-flight, so just request it
                     std::vector<CInv> vInv(1);
                     vInv[0] = CInv(MSG_BLOCK | GetFetchFlags(pfrom, pindex->pprev, chainparams.GetConsensus()), cmpctblock.header.GetHash());
-                    pfrom->PushMessage(NetMsgType::GETDATA, vInv);
+                    connman.PushMessage(pfrom, NetMsgType::GETDATA, vInv);
                     return true;
                 }
 
@@ -5815,7 +5815,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
                     return ProcessMessage(pfrom, NetMsgType::BLOCKTXN, blockTxnMsg, nTimeReceived, chainparams, connman);
                 } else {
                     req.blockhash = pindex->GetBlockHash();
-                    pfrom->PushMessage(NetMsgType::GETBLOCKTXN, req);
+                    connman.PushMessage(pfrom, NetMsgType::GETBLOCKTXN, req);
                 }
             }
         } else {
@@ -5824,7 +5824,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
                 // mempool will probably be useless - request the block normally
                 std::vector<CInv> vInv(1);
                 vInv[0] = CInv(MSG_BLOCK | GetFetchFlags(pfrom, pindex->pprev, chainparams.GetConsensus()), cmpctblock.header.GetHash());
-                pfrom->PushMessage(NetMsgType::GETDATA, vInv);
+                connman.PushMessage(pfrom, NetMsgType::GETDATA, vInv);
                 return true;
             } else {
                 // If this was an announce-cmpctblock, we want the same treatment as a header message
@@ -5866,7 +5866,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
                 // Might have collided, fall back to getdata now :(
                 std::vector<CInv> invs;
                 invs.push_back(CInv(MSG_BLOCK | GetFetchFlags(pfrom, chainActive.Tip(), chainparams.GetConsensus()), resp.blockhash));
-                pfrom->PushMessage(NetMsgType::GETDATA, invs);
+                connman.PushMessage(pfrom, NetMsgType::GETDATA, invs);
             } else {
                 MarkBlockAsReceived(resp.blockhash); // it is now an empty pointer
                 fBlockRead = true;
@@ -5880,7 +5880,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
             int nDoS;
             if (state.IsInvalid(nDoS)) {
                 assert (state.GetRejectCode() < REJECT_INTERNAL); // Blocks are never rejected with internal reject codes
-                pfrom->PushMessage(NetMsgType::REJECT, strCommand, (unsigned char)state.GetRejectCode(),
+                connman.PushMessage(pfrom, NetMsgType::REJECT, strCommand, (unsigned char)state.GetRejectCode(),
                                    state.GetRejectReason().substr(0, MAX_REJECT_MESSAGE_LENGTH), block.GetHash());
                 if (nDoS > 0) {
                     LOCK(cs_main);
@@ -5928,7 +5928,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
         //   nUnconnectingHeaders gets reset back to 0.
         if (mapBlockIndex.find(headers[0].hashPrevBlock) == mapBlockIndex.end() && nCount < MAX_BLOCKS_TO_ANNOUNCE) {
             nodestate->nUnconnectingHeaders++;
-            pfrom->PushMessage(NetMsgType::GETHEADERS, chainActive.GetLocator(pindexBestHeader), uint256());
+            connman.PushMessage(pfrom, NetMsgType::GETHEADERS, chainActive.GetLocator(pindexBestHeader), uint256());
             LogPrint("net", "received header %s: missing prev block %s, sending getheaders (%d) to end (peer=%d, nUnconnectingHeaders=%d)\n",
                     headers[0].GetHash().ToString(),
                     headers[0].hashPrevBlock.ToString(),
@@ -5975,7 +5975,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
             // TODO: optimize: if pindexLast is an ancestor of chainActive.Tip or pindexBestHeader, continue
             // from there instead.
             LogPrint("net", "more getheaders (%d) to end to peer=%d (startheight:%d)\n", pindexLast->nHeight, pfrom->id, pfrom->nStartingHeight);
-            pfrom->PushMessage(NetMsgType::GETHEADERS, chainActive.GetLocator(pindexLast), uint256());
+            connman.PushMessage(pfrom, NetMsgType::GETHEADERS, chainActive.GetLocator(pindexLast), uint256());
         }
 
         bool fCanDirectFetch = CanDirectFetch(chainparams.GetConsensus());
@@ -6028,7 +6028,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
                         // In any case, we want to download using a compact block, not a regular one
                         vGetData[0] = CInv(MSG_CMPCT_BLOCK, vGetData[0].hash);
                     }
-                    pfrom->PushMessage(NetMsgType::GETDATA, vGetData);
+                    connman.PushMessage(pfrom, NetMsgType::GETDATA, vGetData);
                 }
             }
         }
@@ -6060,7 +6060,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
         int nDoS;
         if (state.IsInvalid(nDoS)) {
             assert (state.GetRejectCode() < REJECT_INTERNAL); // Blocks are never rejected with internal reject codes
-            pfrom->PushMessage(NetMsgType::REJECT, strCommand, (unsigned char)state.GetRejectCode(),
+            connman.PushMessage(pfrom, NetMsgType::REJECT, strCommand, (unsigned char)state.GetRejectCode(),
                                state.GetRejectReason().substr(0, MAX_REJECT_MESSAGE_LENGTH), block.GetHash());
             if (nDoS > 0) {
                 LOCK(cs_main);
@@ -6137,7 +6137,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
             // it, if the remote node sends a ping once per second and this node takes 5
             // seconds to respond to each, the 5th ping the remote sends would appear to
             // return very quickly.
-            pfrom->PushMessage(NetMsgType::PONG, nonce);
+            connman.PushMessage(pfrom, NetMsgType::PONG, nonce);
         }
     }
 
@@ -6480,11 +6480,11 @@ bool SendMessages(CNode* pto, CConnman& connman)
             pto->nPingUsecStart = GetTimeMicros();
             if (pto->nVersion > BIP0031_VERSION) {
                 pto->nPingNonceSent = nonce;
-                pto->PushMessage(NetMsgType::PING, nonce);
+                connman.PushMessage(pto, NetMsgType::PING, nonce);
             } else {
                 // Peer is too old to support ping command with nonce, pong will never arrive.
                 pto->nPingNonceSent = 0;
-                pto->PushMessage(NetMsgType::PING);
+                connman.PushMessage(pto, NetMsgType::PING);
             }
         }
 
@@ -6515,14 +6515,14 @@ bool SendMessages(CNode* pto, CConnman& connman)
                     // receiver rejects addr messages larger than 1000
                     if (vAddr.size() >= 1000)
                     {
-                        pto->PushMessage(NetMsgType::ADDR, vAddr);
+                        connman.PushMessage(pto, NetMsgType::ADDR, vAddr);
                         vAddr.clear();
                     }
                 }
             }
             pto->vAddrToSend.clear();
             if (!vAddr.empty())
-                pto->PushMessage(NetMsgType::ADDR, vAddr);
+                connman.PushMessage(pto, NetMsgType::ADDR, vAddr);
             // we only send the big addr message once
             if (pto->vAddrToSend.capacity() > 40)
                 pto->vAddrToSend.shrink_to_fit();
@@ -6545,7 +6545,7 @@ bool SendMessages(CNode* pto, CConnman& connman)
         }
 
         BOOST_FOREACH(const CBlockReject& reject, state.rejects)
-            pto->PushMessage(NetMsgType::REJECT, (string)NetMsgType::BLOCK, reject.chRejectCode, reject.strRejectReason, reject.hashBlock);
+            connman.PushMessage(pto, NetMsgType::REJECT, (string)NetMsgType::BLOCK, reject.chRejectCode, reject.strRejectReason, reject.hashBlock);
         state.rejects.clear();
 
         // Start block sync
@@ -6568,7 +6568,7 @@ bool SendMessages(CNode* pto, CConnman& connman)
                 if (pindexStart->pprev)
                     pindexStart = pindexStart->pprev;
                 LogPrint("net", "initial getheaders (%d) to peer=%d (startheight:%d)\n", pindexStart->nHeight, pto->id, pto->nStartingHeight);
-                pto->PushMessage(NetMsgType::GETHEADERS, chainActive.GetLocator(pindexStart), uint256());
+                connman.PushMessage(pto, NetMsgType::GETHEADERS, chainActive.GetLocator(pindexStart), uint256());
             }
         }
 
@@ -6657,7 +6657,7 @@ bool SendMessages(CNode* pto, CConnman& connman)
                     CBlock block;
                     assert(ReadBlockFromDisk(block, pBestIndex, consensusParams));
                     CBlockHeaderAndShortTxIDs cmpctblock(block, state.fWantsCmpctWitness);
-                    pto->PushMessageWithFlag(state.fWantsCmpctWitness ? 0 : SERIALIZE_TRANSACTION_NO_WITNESS, NetMsgType::CMPCTBLOCK, cmpctblock);
+                    connman.PushMessageWithFlag(pto, state.fWantsCmpctWitness ? 0 : SERIALIZE_TRANSACTION_NO_WITNESS, NetMsgType::CMPCTBLOCK, cmpctblock);
                     state.pindexBestHeaderSent = pBestIndex;
                 } else if (state.fPreferHeaders) {
                     if (vHeaders.size() > 1) {
@@ -6669,7 +6669,7 @@ bool SendMessages(CNode* pto, CConnman& connman)
                         LogPrint("net", "%s: sending header %s to peer=%d\n", __func__,
                                 vHeaders.front().GetHash().ToString(), pto->id);
                     }
-                    pto->PushMessage(NetMsgType::HEADERS, vHeaders);
+                    connman.PushMessage(pto, NetMsgType::HEADERS, vHeaders);
                     state.pindexBestHeaderSent = pBestIndex;
                 } else
                     fRevertToInv = true;
@@ -6715,7 +6715,7 @@ bool SendMessages(CNode* pto, CConnman& connman)
             BOOST_FOREACH(const uint256& hash, pto->vInventoryBlockToSend) {
                 vInv.push_back(CInv(MSG_BLOCK, hash));
                 if (vInv.size() == MAX_INV_SZ) {
-                    pto->PushMessage(NetMsgType::INV, vInv);
+                    connman.PushMessage(pto, NetMsgType::INV, vInv);
                     vInv.clear();
                 }
             }
@@ -6761,7 +6761,7 @@ bool SendMessages(CNode* pto, CConnman& connman)
                     pto->filterInventoryKnown.insert(hash);
                     vInv.push_back(inv);
                     if (vInv.size() == MAX_INV_SZ) {
-                        pto->PushMessage(NetMsgType::INV, vInv);
+                        connman.PushMessage(pto, NetMsgType::INV, vInv);
                         vInv.clear();
                     }
                 }
@@ -6827,7 +6827,7 @@ bool SendMessages(CNode* pto, CConnman& connman)
                         }
                     }
                     if (vInv.size() == MAX_INV_SZ) {
-                        pto->PushMessage(NetMsgType::INV, vInv);
+                        connman.PushMessage(pto, NetMsgType::INV, vInv);
                         vInv.clear();
                     }
                     pto->filterInventoryKnown.insert(hash);
@@ -6835,7 +6835,7 @@ bool SendMessages(CNode* pto, CConnman& connman)
             }
         }
         if (!vInv.empty())
-            pto->PushMessage(NetMsgType::INV, vInv);
+            connman.PushMessage(pto, NetMsgType::INV, vInv);
 
         // Detect whether we're stalling
         nNow = GetTimeMicros();
@@ -6896,7 +6896,7 @@ bool SendMessages(CNode* pto, CConnman& connman)
                 vGetData.push_back(inv);
                 if (vGetData.size() >= 1000)
                 {
-                    pto->PushMessage(NetMsgType::GETDATA, vGetData);
+                    connman.PushMessage(pto, NetMsgType::GETDATA, vGetData);
                     vGetData.clear();
                 }
             } else {
@@ -6906,7 +6906,7 @@ bool SendMessages(CNode* pto, CConnman& connman)
             pto->mapAskFor.erase(pto->mapAskFor.begin());
         }
         if (!vGetData.empty())
-            pto->PushMessage(NetMsgType::GETDATA, vGetData);
+            connman.PushMessage(pto, NetMsgType::GETDATA, vGetData);
 
         //
         // Message: feefilter
@@ -6919,7 +6919,7 @@ bool SendMessages(CNode* pto, CConnman& connman)
             if (timeNow > pto->nextSendTimeFeeFilter) {
                 CAmount filterToSend = filterRounder.round(currentFilter);
                 if (filterToSend != pto->lastSentFeeFilter) {
-                    pto->PushMessage(NetMsgType::FEEFILTER, filterToSend);
+                    connman.PushMessage(pto, NetMsgType::FEEFILTER, filterToSend);
                     pto->lastSentFeeFilter = filterToSend;
                 }
                 pto->nextSendTimeFeeFilter = PoissonNextSend(timeNow, AVG_FEEFILTER_BROADCAST_INTERVAL);
diff --git a/src/net.cpp b/src/net.cpp
index f271aed242b74..2cc14a222391e 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -2636,67 +2636,6 @@ void CNode::AskFor(const CInv& inv)
     mapAskFor.insert(std::make_pair(nRequestTime, inv));
 }
 
-void CNode::BeginMessage(const char* pszCommand) EXCLUSIVE_LOCK_FUNCTION(cs_vSend)
-{
-    ENTER_CRITICAL_SECTION(cs_vSend);
-    assert(ssSend.size() == 0);
-    ssSend << CMessageHeader(Params().MessageStart(), pszCommand, 0);
-    LogPrint("net", "sending: %s ", SanitizeString(pszCommand));
-}
-
-void CNode::AbortMessage() UNLOCK_FUNCTION(cs_vSend)
-{
-    ssSend.clear();
-
-    LEAVE_CRITICAL_SECTION(cs_vSend);
-
-    LogPrint("net", "(aborted)\n");
-}
-
-void CNode::EndMessage(const char* pszCommand) UNLOCK_FUNCTION(cs_vSend)
-{
-    // The -*messagestest options are intentionally not documented in the help message,
-    // since they are only used during development to debug the networking code and are
-    // not intended for end-users.
-    if (mapArgs.count("-dropmessagestest") && GetRand(GetArg("-dropmessagestest", 2)) == 0)
-    {
-        LogPrint("net", "dropmessages DROPPING SEND MESSAGE\n");
-        AbortMessage();
-        return;
-    }
-    if (mapArgs.count("-fuzzmessagestest"))
-        Fuzz(GetArg("-fuzzmessagestest", 10));
-
-    if (ssSend.size() == 0)
-    {
-        LEAVE_CRITICAL_SECTION(cs_vSend);
-        return;
-    }
-    // Set the size
-    unsigned int nSize = ssSend.size() - CMessageHeader::HEADER_SIZE;
-    WriteLE32((uint8_t*)&ssSend[CMessageHeader::MESSAGE_SIZE_OFFSET], nSize);
-
-    //log total amount of bytes per command
-    mapSendBytesPerMsgCmd[std::string(pszCommand)] += nSize + CMessageHeader::HEADER_SIZE;
-
-    // Set the checksum
-    uint256 hash = Hash(ssSend.begin() + CMessageHeader::HEADER_SIZE, ssSend.end());
-    assert(ssSend.size () >= CMessageHeader::CHECKSUM_OFFSET + CMessageHeader::CHECKSUM_SIZE);
-    memcpy((char*)&ssSend[CMessageHeader::CHECKSUM_OFFSET], hash.begin(), CMessageHeader::CHECKSUM_SIZE);
-
-    LogPrint("net", "(%d bytes) peer=%d\n", nSize, id);
-
-    std::deque<CSerializeData>::iterator it = vSendMsg.insert(vSendMsg.end(), CSerializeData());
-    ssSend.GetAndClear(*it);
-    nSendSize += (*it).size();
-
-    // If write queue empty, attempt "optimistic write"
-    if (it == vSendMsg.begin())
-        nOptimisticBytesWritten += SocketSendData(this);
-
-    LEAVE_CRITICAL_SECTION(cs_vSend);
-}
-
 CDataStream CConnman::BeginMessage(CNode* pnode, int nVersion, int flags, const std::string& sCommand)
 {
     return {SER_NETWORK, (nVersion ? nVersion : pnode->GetSendVersion()) | flags, CMessageHeader(Params().MessageStart(), sCommand.c_str(), 0) };
diff --git a/src/net.h b/src/net.h
index c33de9824b411..559c22bbd3f93 100644
--- a/src/net.h
+++ b/src/net.h
@@ -833,190 +833,6 @@ class CNode
 
     void AskFor(const CInv& inv);
 
-    // TODO: Document the postcondition of this function.  Is cs_vSend locked?
-    void BeginMessage(const char* pszCommand) EXCLUSIVE_LOCK_FUNCTION(cs_vSend);
-
-    // TODO: Document the precondition of this function.  Is cs_vSend locked?
-    void AbortMessage() UNLOCK_FUNCTION(cs_vSend);
-
-    // TODO: Document the precondition of this function.  Is cs_vSend locked?
-    void EndMessage(const char* pszCommand) UNLOCK_FUNCTION(cs_vSend);
-
-    void PushMessage(const char* pszCommand)
-    {
-        try
-        {
-            BeginMessage(pszCommand);
-            EndMessage(pszCommand);
-        }
-        catch (...)
-        {
-            AbortMessage();
-            throw;
-        }
-    }
-
-    template<typename T1>
-    void PushMessage(const char* pszCommand, const T1& a1)
-    {
-        try
-        {
-            BeginMessage(pszCommand);
-            ssSend << a1;
-            EndMessage(pszCommand);
-        }
-        catch (...)
-        {
-            AbortMessage();
-            throw;
-        }
-    }
-
-    /** Send a message containing a1, serialized with flag flag. */
-    template<typename T1>
-    void PushMessageWithFlag(int flag, const char* pszCommand, const T1& a1)
-    {
-        try
-        {
-            BeginMessage(pszCommand);
-            WithOrVersion(&ssSend, flag) << a1;
-            EndMessage(pszCommand);
-        }
-        catch (...)
-        {
-            AbortMessage();
-            throw;
-        }
-    }
-
-    template<typename T1, typename T2>
-    void PushMessage(const char* pszCommand, const T1& a1, const T2& a2)
-    {
-        try
-        {
-            BeginMessage(pszCommand);
-            ssSend << a1 << a2;
-            EndMessage(pszCommand);
-        }
-        catch (...)
-        {
-            AbortMessage();
-            throw;
-        }
-    }
-
-    template<typename T1, typename T2, typename T3>
-    void PushMessage(const char* pszCommand, const T1& a1, const T2& a2, const T3& a3)
-    {
-        try
-        {
-            BeginMessage(pszCommand);
-            ssSend << a1 << a2 << a3;
-            EndMessage(pszCommand);
-        }
-        catch (...)
-        {
-            AbortMessage();
-            throw;
-        }
-    }
-
-    template<typename T1, typename T2, typename T3, typename T4>
-    void PushMessage(const char* pszCommand, const T1& a1, const T2& a2, const T3& a3, const T4& a4)
-    {
-        try
-        {
-            BeginMessage(pszCommand);
-            ssSend << a1 << a2 << a3 << a4;
-            EndMessage(pszCommand);
-        }
-        catch (...)
-        {
-            AbortMessage();
-            throw;
-        }
-    }
-
-    template<typename T1, typename T2, typename T3, typename T4, typename T5>
-    void PushMessage(const char* pszCommand, const T1& a1, const T2& a2, const T3& a3, const T4& a4, const T5& a5)
-    {
-        try
-        {
-            BeginMessage(pszCommand);
-            ssSend << a1 << a2 << a3 << a4 << a5;
-            EndMessage(pszCommand);
-        }
-        catch (...)
-        {
-            AbortMessage();
-            throw;
-        }
-    }
-
-    template<typename T1, typename T2, typename T3, typename T4, typename T5, typename T6>
-    void PushMessage(const char* pszCommand, const T1& a1, const T2& a2, const T3& a3, const T4& a4, const T5& a5, const T6& a6)
-    {
-        try
-        {
-            BeginMessage(pszCommand);
-            ssSend << a1 << a2 << a3 << a4 << a5 << a6;
-            EndMessage(pszCommand);
-        }
-        catch (...)
-        {
-            AbortMessage();
-            throw;
-        }
-    }
-
-    template<typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7>
-    void PushMessage(const char* pszCommand, const T1& a1, const T2& a2, const T3& a3, const T4& a4, const T5& a5, const T6& a6, const T7& a7)
-    {
-        try
-        {
-            BeginMessage(pszCommand);
-            ssSend << a1 << a2 << a3 << a4 << a5 << a6 << a7;
-            EndMessage(pszCommand);
-        }
-        catch (...)
-        {
-            AbortMessage();
-            throw;
-        }
-    }
-
-    template<typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7, typename T8>
-    void PushMessage(const char* pszCommand, const T1& a1, const T2& a2, const T3& a3, const T4& a4, const T5& a5, const T6& a6, const T7& a7, const T8& a8)
-    {
-        try
-        {
-            BeginMessage(pszCommand);
-            ssSend << a1 << a2 << a3 << a4 << a5 << a6 << a7 << a8;
-            EndMessage(pszCommand);
-        }
-        catch (...)
-        {
-            AbortMessage();
-            throw;
-        }
-    }
-
-    template<typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7, typename T8, typename T9>
-    void PushMessage(const char* pszCommand, const T1& a1, const T2& a2, const T3& a3, const T4& a4, const T5& a5, const T6& a6, const T7& a7, const T8& a8, const T9& a9)
-    {
-        try
-        {
-            BeginMessage(pszCommand);
-            ssSend << a1 << a2 << a3 << a4 << a5 << a6 << a7 << a8 << a9;
-            EndMessage(pszCommand);
-        }
-        catch (...)
-        {
-            AbortMessage();
-            throw;
-        }
-    }
-
     void CloseSocketDisconnect();
 
     void copyStats(CNodeStats &stats);

From 5c2169cc3f263b39ba42d66bcf014163fada2390 Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Mon, 12 Sep 2016 20:09:24 -0400
Subject: [PATCH 1144/1802] drop the optimistic write counter hack

This is now handled properly in realtime.
---
 src/net.cpp | 5 -----
 src/net.h   | 1 -
 2 files changed, 6 deletions(-)

diff --git a/src/net.cpp b/src/net.cpp
index 2cc14a222391e..2d6573f7f0731 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -1167,10 +1167,6 @@ void CConnman::ThreadSocketHandler()
                 {
                     TRY_LOCK(pnode->cs_vSend, lockSend);
                     if (lockSend) {
-                        if (pnode->nOptimisticBytesWritten) {
-                            RecordBytesSent(pnode->nOptimisticBytesWritten);
-                            pnode->nOptimisticBytesWritten = 0;
-                        }
                         if (!pnode->vSendMsg.empty()) {
                             FD_SET(pnode->hSocket, &fdsetSend);
                             continue;
@@ -2582,7 +2578,6 @@ CNode::CNode(NodeId idIn, ServiceFlags nLocalServicesIn, int nMyStartingHeightIn
     minFeeFilter = 0;
     lastSentFeeFilter = 0;
     nextSendTimeFeeFilter = 0;
-    nOptimisticBytesWritten = 0;
 
     BOOST_FOREACH(const std::string &msg, getAllNetMessageTypes())
         mapRecvBytesPerMsgCmd[msg] = 0;
diff --git a/src/net.h b/src/net.h
index 559c22bbd3f93..3f9efbbea3b5d 100644
--- a/src/net.h
+++ b/src/net.h
@@ -596,7 +596,6 @@ class CNode
     CDataStream ssSend;
     size_t nSendSize; // total size of all vSendMsg entries
     size_t nSendOffset; // offset inside the first vSendMsg already sent
-    uint64_t nOptimisticBytesWritten;
     uint64_t nSendBytes;
     std::deque<CSerializeData> vSendMsg;
     CCriticalSection cs_vSend;

From 440f1d3e4c60c9c3e0a1a74d3321b0a8e37a1e8d Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Fri, 30 Sep 2016 15:03:57 -0400
Subject: [PATCH 1145/1802] net: remove now-unused ssSend and Fuzz

---
 src/net.cpp | 38 +-------------------------------------
 src/net.h   |  4 ----
 2 files changed, 1 insertion(+), 41 deletions(-)

diff --git a/src/net.cpp b/src/net.cpp
index 2d6573f7f0731..16d9527eeb2fa 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -1063,7 +1063,7 @@ void CConnman::ThreadSocketHandler()
             BOOST_FOREACH(CNode* pnode, vNodesCopy)
             {
                 if (pnode->fDisconnect ||
-                    (pnode->GetRefCount() <= 0 && pnode->vRecvMsg.empty() && pnode->nSendSize == 0 && pnode->ssSend.empty()))
+                    (pnode->GetRefCount() <= 0 && pnode->vRecvMsg.empty() && pnode->nSendSize == 0))
                 {
                     // remove from vNodes
                     vNodes.erase(remove(vNodes.begin(), vNodes.end(), pnode), vNodes.end());
@@ -2482,46 +2482,10 @@ int CConnman::GetBestHeight() const
     return nBestHeight.load(std::memory_order_acquire);
 }
 
-void CNode::Fuzz(int nChance)
-{
-    if (!fSuccessfullyConnected) return; // Don't fuzz initial handshake
-    if (GetRand(nChance) != 0) return; // Fuzz 1 of every nChance messages
-
-    switch (GetRand(3))
-    {
-    case 0:
-        // xor a random byte with a random value:
-        if (!ssSend.empty()) {
-            CDataStream::size_type pos = GetRand(ssSend.size());
-            ssSend[pos] ^= (unsigned char)(GetRand(256));
-        }
-        break;
-    case 1:
-        // delete a random byte:
-        if (!ssSend.empty()) {
-            CDataStream::size_type pos = GetRand(ssSend.size());
-            ssSend.erase(ssSend.begin()+pos);
-        }
-        break;
-    case 2:
-        // insert a random byte at a random position
-        {
-            CDataStream::size_type pos = GetRand(ssSend.size());
-            char ch = (char)GetRand(256);
-            ssSend.insert(ssSend.begin()+pos, ch);
-        }
-        break;
-    }
-    // Chance of more than one change half the time:
-    // (more changes exponentially less likely):
-    Fuzz(2);
-}
-
 unsigned int CConnman::GetReceiveFloodSize() const { return nReceiveFloodSize; }
 unsigned int CConnman::GetSendBufferSize() const{ return nSendBufferMaxSize; }
 
 CNode::CNode(NodeId idIn, ServiceFlags nLocalServicesIn, int nMyStartingHeightIn, SOCKET hSocketIn, const CAddress& addrIn, uint64_t nKeyedNetGroupIn, uint64_t nLocalHostNonceIn, const std::string& addrNameIn, bool fInboundIn) :
-    ssSend(SER_NETWORK, INIT_PROTO_VERSION),
     addr(addrIn),
     fInbound(fInboundIn),
     id(idIn),
diff --git a/src/net.h b/src/net.h
index 3f9efbbea3b5d..99ca5bc0db3e3 100644
--- a/src/net.h
+++ b/src/net.h
@@ -593,7 +593,6 @@ class CNode
     ServiceFlags nServices;
     ServiceFlags nServicesExpected;
     SOCKET hSocket;
-    CDataStream ssSend;
     size_t nSendSize; // total size of all vSendMsg entries
     size_t nSendOffset; // offset inside the first vSendMsg already sent
     uint64_t nSendBytes;
@@ -645,9 +644,6 @@ class CNode
     mapMsgCmdSize mapSendBytesPerMsgCmd;
     mapMsgCmdSize mapRecvBytesPerMsgCmd;
 
-    // Basic fuzz-testing
-    void Fuzz(int nChance); // modifies ssSend
-
 public:
     uint256 hashContinue;
     int nStartingHeight;

From 7588b85cd2fc0a37c260d014206d5badde4b2c78 Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Wed, 26 Oct 2016 17:41:44 -0400
Subject: [PATCH 1146/1802] net: construct CNodeStates in place

---
 src/main.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index 5f5b1e3b7c3af..2d02f59d2d79c 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -257,7 +257,7 @@ struct CBlockReject {
  */
 struct CNodeState {
     //! The peer's address
-    CService address;
+    const CService address;
     //! Whether we have a fully established connection.
     bool fCurrentlyConnected;
     //! Accumulated misbehaviour score for this peer.
@@ -265,7 +265,7 @@ struct CNodeState {
     //! Whether this peer should be disconnected and banned (unless whitelisted).
     bool fShouldBan;
     //! String name of this peer (debugging/logging purposes).
-    std::string name;
+    const std::string name;
     //! List of asynchronously-determined block rejections to notify this peer about.
     std::vector<CBlockReject> rejects;
     //! The best known block we know this peer has announced.
@@ -309,7 +309,7 @@ struct CNodeState {
      */
     bool fSupportsDesiredCmpctVersion;
 
-    CNodeState() {
+    CNodeState(CAddress addrIn, std::string addrNameIn) : address(addrIn), name(addrNameIn) {
         fCurrentlyConnected = false;
         nMisbehavior = 0;
         fShouldBan = false;
@@ -355,10 +355,10 @@ void UpdatePreferredDownload(CNode* node, CNodeState* state)
 }
 
 void InitializeNode(NodeId nodeid, const CNode *pnode) {
+    CAddress addr = pnode->addr;
+    std::string addrName = pnode->addrName;
     LOCK(cs_main);
-    CNodeState &state = mapNodeState.insert(std::make_pair(nodeid, CNodeState())).first->second;
-    state.name = pnode->addrName;
-    state.address = pnode->addr;
+    mapNodeState.emplace_hint(mapNodeState.end(), std::piecewise_construct, std::forward_as_tuple(nodeid), std::forward_as_tuple(addr, std::move(addrName)));
 }
 
 void FinalizeNode(NodeId nodeid, bool& fUpdateConnectionTime) {

From 902768099cb92b39f5ff509cd91fdd8970759b8a Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Wed, 26 Oct 2016 18:08:11 -0400
Subject: [PATCH 1147/1802] net: handle version push in InitializeNode

---
 src/main.cpp           | 34 ++++++++++++++++++++++++++++++----
 src/net.cpp            | 34 +++++-----------------------------
 src/net.h              |  9 +++++----
 src/test/DoS_tests.cpp |  8 ++++----
 4 files changed, 44 insertions(+), 41 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index 2d02f59d2d79c..590f19526e78a 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -18,6 +18,7 @@
 #include "init.h"
 #include "merkleblock.h"
 #include "net.h"
+#include "netbase.h"
 #include "policy/fees.h"
 #include "policy/policy.h"
 #include "pow.h"
@@ -354,11 +355,36 @@ void UpdatePreferredDownload(CNode* node, CNodeState* state)
     nPreferredDownload += state->fPreferredDownload;
 }
 
-void InitializeNode(NodeId nodeid, const CNode *pnode) {
+void PushNodeVersion(CNode *pnode, CConnman& connman, int64_t nTime)
+{
+    ServiceFlags nLocalNodeServices = pnode->GetLocalServices();
+    uint64_t nonce = pnode->GetLocalNonce();
+    int nNodeStartingHeight = pnode->GetMyStartingHeight();
+    NodeId nodeid = pnode->GetId();
+    CAddress addr = pnode->addr;
+
+    CAddress addrYou = (addr.IsRoutable() && !IsProxy(addr) ? addr : CAddress(CService(), addr.nServices));
+    CAddress addrMe = CAddress(CService(), nLocalNodeServices);
+
+    connman.PushMessageWithVersion(pnode, INIT_PROTO_VERSION, NetMsgType::VERSION, PROTOCOL_VERSION, (uint64_t)nLocalNodeServices, nTime, addrYou, addrMe,
+            nonce, strSubVersion, nNodeStartingHeight, ::fRelayTxes);
+
+    if (fLogIPs)
+        LogPrint("net", "send version message: version %d, blocks=%d, us=%s, them=%s, peer=%d\n", PROTOCOL_VERSION, nNodeStartingHeight, addrMe.ToString(), addrYou.ToString(), nodeid);
+    else
+        LogPrint("net", "send version message: version %d, blocks=%d, us=%s, peer=%d\n", PROTOCOL_VERSION, nNodeStartingHeight, addrMe.ToString(), nodeid);
+}
+
+void InitializeNode(CNode *pnode, CConnman& connman) {
     CAddress addr = pnode->addr;
     std::string addrName = pnode->addrName;
-    LOCK(cs_main);
-    mapNodeState.emplace_hint(mapNodeState.end(), std::piecewise_construct, std::forward_as_tuple(nodeid), std::forward_as_tuple(addr, std::move(addrName)));
+    NodeId nodeid = pnode->GetId();
+    {
+        LOCK(cs_main);
+        mapNodeState.emplace_hint(mapNodeState.end(), std::piecewise_construct, std::forward_as_tuple(nodeid), std::forward_as_tuple(addr, std::move(addrName)));
+    }
+    if(!pnode->fInbound)
+        PushNodeVersion(pnode, connman, GetTime());
 }
 
 void FinalizeNode(NodeId nodeid, bool& fUpdateConnectionTime) {
@@ -5118,7 +5144,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
 
         // Be shy and don't send version until we hear
         if (pfrom->fInbound)
-            connman.PushVersion(pfrom, GetAdjustedTime());
+            PushNodeVersion(pfrom, connman, GetAdjustedTime());
 
         pfrom->fClient = !(pfrom->nServices & NODE_NETWORK);
 
diff --git a/src/net.cpp b/src/net.cpp
index 16d9527eeb2fa..15cf7ce8b2ba8 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -393,21 +393,15 @@ CNode* CConnman::ConnectNode(CAddress addrConnect, const char *pszDest, bool fCo
         NodeId id = GetNewNodeId();
         uint64_t nonce = GetDeterministicRandomizer(RANDOMIZER_ID_LOCALHOSTNONCE).Write(id).Finalize();
         CNode* pnode = new CNode(id, nLocalServices, GetBestHeight(), hSocket, addrConnect, CalculateKeyedNetGroup(addrConnect), nonce, pszDest ? pszDest : "", false);
-
-
-        PushVersion(pnode, GetTime());
-
-        GetNodeSignals().InitializeNode(pnode->GetId(), pnode);
+        pnode->nServicesExpected = ServiceFlags(addrConnect.nServices & nRelevantServices);
+        pnode->nTimeConnected = GetTime();
         pnode->AddRef();
-
+        GetNodeSignals().InitializeNode(pnode, *this);
         {
             LOCK(cs_vNodes);
             vNodes.push_back(pnode);
         }
 
-        pnode->nServicesExpected = ServiceFlags(addrConnect.nServices & nRelevantServices);
-        pnode->nTimeConnected = GetTime();
-
         return pnode;
     } else if (!proxyConnectionFailed) {
         // If connecting to the node failed, and failure is not caused by a problem connecting to
@@ -418,24 +412,6 @@ CNode* CConnman::ConnectNode(CAddress addrConnect, const char *pszDest, bool fCo
     return NULL;
 }
 
-void CConnman::PushVersion(CNode* pnode, int64_t nTime)
-{
-    ServiceFlags nLocalNodeServices = pnode->GetLocalServices();
-    CAddress addrYou = (pnode->addr.IsRoutable() && !IsProxy(pnode->addr) ? pnode->addr : CAddress(CService(), pnode->addr.nServices));
-    CAddress addrMe = CAddress(CService(), nLocalNodeServices);
-    uint64_t nonce = pnode->GetLocalNonce();
-    int nNodeStartingHeight = pnode->nMyStartingHeight;
-    NodeId id = pnode->GetId();
-
-    PushMessageWithVersion(pnode, INIT_PROTO_VERSION, NetMsgType::VERSION, PROTOCOL_VERSION, (uint64_t)nLocalNodeServices, nTime, addrYou, addrMe,
-            nonce, strSubVersion, nNodeStartingHeight, ::fRelayTxes);
-
-    if (fLogIPs)
-        LogPrint("net", "send version message: version %d, blocks=%d, us=%s, them=%s, peer=%d\n", PROTOCOL_VERSION, nNodeStartingHeight, addrMe.ToString(), addrYou.ToString(), id);
-    else
-        LogPrint("net", "send version message: version %d, blocks=%d, us=%s, peer=%d\n", PROTOCOL_VERSION, nNodeStartingHeight, addrMe.ToString(), id);
-}
-
 void CConnman::DumpBanlist()
 {
     SweepBanned(); // clean unused entries (if bantime has expired)
@@ -1036,9 +1012,9 @@ void CConnman::AcceptConnection(const ListenSocket& hListenSocket) {
     uint64_t nonce = GetDeterministicRandomizer(RANDOMIZER_ID_LOCALHOSTNONCE).Write(id).Finalize();
 
     CNode* pnode = new CNode(id, nLocalServices, GetBestHeight(), hSocket, addr, CalculateKeyedNetGroup(addr), nonce, "", true);
-    GetNodeSignals().InitializeNode(pnode->GetId(), pnode);
     pnode->AddRef();
     pnode->fWhitelisted = whitelisted;
+    GetNodeSignals().InitializeNode(pnode, *this);
 
     LogPrint("net", "connection from %s accepted\n", addr.ToString());
 
@@ -2130,7 +2106,7 @@ bool CConnman::Start(boost::thread_group& threadGroup, CScheduler& scheduler, st
         uint64_t nonce = GetDeterministicRandomizer(RANDOMIZER_ID_LOCALHOSTNONCE).Write(id).Finalize();
 
         pnodeLocalHost = new CNode(id, nLocalServices, GetBestHeight(), INVALID_SOCKET, CAddress(CService(local, 0), nLocalServices), 0, nonce);
-        GetNodeSignals().InitializeNode(pnodeLocalHost->GetId(), pnodeLocalHost);
+        GetNodeSignals().InitializeNode(pnodeLocalHost, *this);
     }
 
     //
diff --git a/src/net.h b/src/net.h
index 99ca5bc0db3e3..22b80fc504cc8 100644
--- a/src/net.h
+++ b/src/net.h
@@ -163,9 +163,6 @@ class CConnman
         PushMessageWithVersionAndFlag(pnode, 0, 0, sCommand, std::forward<Args>(args)...);
     }
 
-    void PushVersion(CNode* pnode, int64_t nTime);
-
-
     template<typename Callable>
     bool ForEachNodeContinueIf(Callable&& func)
     {
@@ -462,7 +459,7 @@ struct CNodeSignals
 {
     boost::signals2::signal<bool (CNode*, CConnman&), CombinerAll> ProcessMessages;
     boost::signals2::signal<bool (CNode*, CConnman&), CombinerAll> SendMessages;
-    boost::signals2::signal<void (NodeId, const CNode*)> InitializeNode;
+    boost::signals2::signal<void (CNode*, CConnman&)> InitializeNode;
     boost::signals2::signal<void (NodeId, bool&)> FinalizeNode;
 };
 
@@ -722,6 +719,10 @@ class CNode
       return nLocalHostNonce;
     }
 
+    int GetMyStartingHeight() const {
+      return nMyStartingHeight;
+    }
+
     int GetRefCount()
     {
         assert(nRefCount >= 0);
diff --git a/src/test/DoS_tests.cpp b/src/test/DoS_tests.cpp
index 47979a6f86747..6eed63608084f 100644
--- a/src/test/DoS_tests.cpp
+++ b/src/test/DoS_tests.cpp
@@ -50,7 +50,7 @@ BOOST_AUTO_TEST_CASE(DoS_banning)
     CAddress addr1(ip(0xa0b0c001), NODE_NONE);
     CNode dummyNode1(id++, NODE_NETWORK, 0, INVALID_SOCKET, addr1, 0, 0, "", true);
     dummyNode1.SetSendVersion(PROTOCOL_VERSION);
-    GetNodeSignals().InitializeNode(dummyNode1.GetId(), &dummyNode1);
+    GetNodeSignals().InitializeNode(&dummyNode1, *connman);
     dummyNode1.nVersion = 1;
     Misbehaving(dummyNode1.GetId(), 100); // Should get banned
     SendMessages(&dummyNode1, *connman);
@@ -60,7 +60,7 @@ BOOST_AUTO_TEST_CASE(DoS_banning)
     CAddress addr2(ip(0xa0b0c002), NODE_NONE);
     CNode dummyNode2(id++, NODE_NETWORK, 0, INVALID_SOCKET, addr2, 1, 1, "", true);
     dummyNode2.SetSendVersion(PROTOCOL_VERSION);
-    GetNodeSignals().InitializeNode(dummyNode2.GetId(), &dummyNode2);
+    GetNodeSignals().InitializeNode(&dummyNode2, *connman);
     dummyNode2.nVersion = 1;
     Misbehaving(dummyNode2.GetId(), 50);
     SendMessages(&dummyNode2, *connman);
@@ -78,7 +78,7 @@ BOOST_AUTO_TEST_CASE(DoS_banscore)
     CAddress addr1(ip(0xa0b0c001), NODE_NONE);
     CNode dummyNode1(id++, NODE_NETWORK, 0, INVALID_SOCKET, addr1, 3, 1, "", true);
     dummyNode1.SetSendVersion(PROTOCOL_VERSION);
-    GetNodeSignals().InitializeNode(dummyNode1.GetId(), &dummyNode1);
+    GetNodeSignals().InitializeNode(&dummyNode1, *connman);
     dummyNode1.nVersion = 1;
     Misbehaving(dummyNode1.GetId(), 100);
     SendMessages(&dummyNode1, *connman);
@@ -101,7 +101,7 @@ BOOST_AUTO_TEST_CASE(DoS_bantime)
     CAddress addr(ip(0xa0b0c001), NODE_NONE);
     CNode dummyNode(id++, NODE_NETWORK, 0, INVALID_SOCKET, addr, 4, 4, "", true);
     dummyNode.SetSendVersion(PROTOCOL_VERSION);
-    GetNodeSignals().InitializeNode(dummyNode.GetId(), &dummyNode);
+    GetNodeSignals().InitializeNode(&dummyNode, *connman);
     dummyNode.nVersion = 1;
 
     Misbehaving(dummyNode.GetId(), 100);

From 7451cf59cd7b3a917fe7e4c7210d43b2f5adaad3 Mon Sep 17 00:00:00 2001
From: jnewbery <john@johnnewbery.com>
Date: Thu, 29 Sep 2016 10:14:05 -0400
Subject: [PATCH 1148/1802] Allow bitcoin-tx to parse partial transactions

Restore pre V0.13.1 functionality to bitcoin-tx and allow it to parse 0-input partial transactions.
---
 src/bitcoin-tx.cpp                   |  2 +-
 src/test/data/bitcoin-util-test.json | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/bitcoin-tx.cpp b/src/bitcoin-tx.cpp
index e09afd632e3ff..66c2166fe0789 100644
--- a/src/bitcoin-tx.cpp
+++ b/src/bitcoin-tx.cpp
@@ -629,7 +629,7 @@ static int CommandLineRawTx(int argc, char* argv[])
             if (strHexTx == "-")                 // "-" implies standard input
                 strHexTx = readStdin();
 
-            if (!DecodeHexTx(txDecodeTmp, strHexTx))
+            if (!DecodeHexTx(txDecodeTmp, strHexTx, true))
                 throw runtime_error("invalid transaction encoding");
 
             startArg = 2;
diff --git a/src/test/data/bitcoin-util-test.json b/src/test/data/bitcoin-util-test.json
index de95044597b1d..98be75919bc6d 100644
--- a/src/test/data/bitcoin-util-test.json
+++ b/src/test/data/bitcoin-util-test.json
@@ -102,6 +102,16 @@
     "output_cmp": "txcreate2.json",
     "description": "Creates a new transaction with a single empty output script (output in json)"
   },
+  { "exec": "./bitcoin-tx",
+    "args": ["01000000000100000000000000000000000000"],
+    "output_cmp": "txcreate2.hex",
+    "description": "Parses a transation with no inputs and a single output script"
+  },
+  { "exec": "./bitcoin-tx",
+    "args": ["-json", "01000000000100000000000000000000000000"],
+    "output_cmp": "txcreate2.json",
+    "description": "Parses a transation with no inputs and a single output script (output in json)"
+  },
   { "exec": "./bitcoin-tx",
     "args":
     ["-create",

From 66ca6cda4c67a6c279d086223b69f398dc140724 Mon Sep 17 00:00:00 2001
From: "S. Matthew English" <s-matthew-english@users.noreply.github.com>
Date: Fri, 4 Nov 2016 13:02:13 +0100
Subject: [PATCH 1149/1802] Enforcing consistency, 'gitian' to 'Gitian'

There was once instance of 'gitian'. I changed it to 'Gitian' so that it would be consistent with all other instances in the file.
---
 contrib/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contrib/README.md b/contrib/README.md
index ab5f57587e0d9..4ea9700f59d95 100644
--- a/contrib/README.md
+++ b/contrib/README.md
@@ -38,7 +38,7 @@ Scripts and notes for Mac builds.
 RPM spec file for building bitcoin-core on RPM based distributions
 
 ### [Gitian-build](/contrib/gitian-build.sh) ###
-Script for running full gitian builds.
+Script for running full Gitian builds.
 
 Test and Verify Tools 
 ---------------------

From 190fd321ad772dd2e9d11ec2395a807bc72de5a7 Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Fri, 4 Nov 2016 10:50:43 -0400
Subject: [PATCH 1150/1802] Remove unused CTxOut::GetHash()

---
 src/primitives/transaction.cpp | 5 -----
 src/primitives/transaction.h   | 2 --
 2 files changed, 7 deletions(-)

diff --git a/src/primitives/transaction.cpp b/src/primitives/transaction.cpp
index 4afbe99fd39a9..7acdac17f2d6d 100644
--- a/src/primitives/transaction.cpp
+++ b/src/primitives/transaction.cpp
@@ -49,11 +49,6 @@ CTxOut::CTxOut(const CAmount& nValueIn, CScript scriptPubKeyIn)
     scriptPubKey = scriptPubKeyIn;
 }
 
-uint256 CTxOut::GetHash() const
-{
-    return SerializeHash(*this);
-}
-
 std::string CTxOut::ToString() const
 {
     return strprintf("CTxOut(nValue=%d.%08d, scriptPubKey=%s)", nValue / COIN, nValue % COIN, HexStr(scriptPubKey).substr(0, 30));
diff --git a/src/primitives/transaction.h b/src/primitives/transaction.h
index 16c2e5c454fe4..1afeb8703903c 100644
--- a/src/primitives/transaction.h
+++ b/src/primitives/transaction.h
@@ -160,8 +160,6 @@ class CTxOut
         return (nValue == -1);
     }
 
-    uint256 GetHash() const;
-
     CAmount GetDustThreshold(const CFeeRate &minRelayTxFee) const
     {
         // "Dust" is defined in terms of CTransaction::minRelayTxFee,

From bd0de1386e1c7f9b875d52290de0d561c8d56bc9 Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@dash.org>
Date: Wed, 2 Nov 2016 21:59:09 +0300
Subject: [PATCH 1151/1802] Fix exit codes: - `--help`, `--version` etc should
 exit with `0` i.e. no error ("not enough args" case should still trigger an
 error) - error reading config file should exit with `1`

Slightly refactor AppInitRPC/AppInitRawTx to return standard exit codes (EXIT_FAILURE/EXIT_SUCCESS) or CONTINUE_EXECUTION (-1)
---
 src/bitcoin-cli.cpp | 28 +++++++++++++++++++---------
 src/bitcoin-tx.cpp  | 20 +++++++++++++++-----
 src/bitcoind.cpp    |  2 +-
 src/qt/bitcoin.cpp  |  4 ++--
 4 files changed, 37 insertions(+), 17 deletions(-)

diff --git a/src/bitcoin-cli.cpp b/src/bitcoin-cli.cpp
index 2d66448d80ac3..380b8dadd723b 100644
--- a/src/bitcoin-cli.cpp
+++ b/src/bitcoin-cli.cpp
@@ -28,6 +28,7 @@ using namespace std;
 
 static const char DEFAULT_RPCCONNECT[] = "127.0.0.1";
 static const int DEFAULT_HTTP_CLIENT_TIMEOUT=900;
+static const int CONTINUE_EXECUTION=-1;
 
 std::string HelpMessageCli()
 {
@@ -67,7 +68,11 @@ class CConnectionFailed : public std::runtime_error
 
 };
 
-static bool AppInitRPC(int argc, char* argv[])
+//
+// This function returns either one of EXIT_ codes when it's expected to stop the process or
+// CONTINUE_EXECUTION when it's expected to continue further.
+//
+static int AppInitRPC(int argc, char* argv[])
 {
     //
     // Parameters
@@ -85,31 +90,35 @@ static bool AppInitRPC(int argc, char* argv[])
         }
 
         fprintf(stdout, "%s", strUsage.c_str());
-        return false;
+        if (argc < 2) {
+            fprintf(stderr, "Error: too few parameters\n");
+            return EXIT_FAILURE;
+        }
+        return EXIT_SUCCESS;
     }
     if (!boost::filesystem::is_directory(GetDataDir(false))) {
         fprintf(stderr, "Error: Specified data directory \"%s\" does not exist.\n", mapArgs["-datadir"].c_str());
-        return false;
+        return EXIT_FAILURE;
     }
     try {
         ReadConfigFile(GetArg("-conf", BITCOIN_CONF_FILENAME), mapArgs, mapMultiArgs);
     } catch (const std::exception& e) {
         fprintf(stderr,"Error reading configuration file: %s\n", e.what());
-        return false;
+        return EXIT_FAILURE;
     }
     // Check for -testnet or -regtest parameter (BaseParams() calls are only valid after this clause)
     try {
         SelectBaseParams(ChainNameFromCommandLine());
     } catch (const std::exception& e) {
         fprintf(stderr, "Error: %s\n", e.what());
-        return false;
+        return EXIT_FAILURE;
     }
     if (GetBoolArg("-rpcssl", false))
     {
         fprintf(stderr, "Error: SSL mode for RPC (-rpcssl) is no longer supported.\n");
-        return false;
+        return EXIT_FAILURE;
     }
-    return true;
+    return CONTINUE_EXECUTION;
 }
 
 
@@ -354,8 +363,9 @@ int main(int argc, char* argv[])
     }
 
     try {
-        if(!AppInitRPC(argc, argv))
-            return EXIT_FAILURE;
+        int ret = AppInitRPC(argc, argv);
+        if (ret != CONTINUE_EXECUTION)
+            return ret;
     }
     catch (const std::exception& e) {
         PrintExceptionContinue(&e, "AppInitRPC()");
diff --git a/src/bitcoin-tx.cpp b/src/bitcoin-tx.cpp
index e09afd632e3ff..ecc19c44ad6e3 100644
--- a/src/bitcoin-tx.cpp
+++ b/src/bitcoin-tx.cpp
@@ -30,8 +30,13 @@ using namespace std;
 
 static bool fCreateBlank;
 static map<string,UniValue> registers;
+static const int CONTINUE_EXECUTION=-1;
 
-static bool AppInitRawTx(int argc, char* argv[])
+//
+// This function returns either one of EXIT_ codes when it's expected to stop the process or
+// CONTINUE_EXECUTION when it's expected to continue further.
+//
+static int AppInitRawTx(int argc, char* argv[])
 {
     //
     // Parameters
@@ -89,9 +94,13 @@ static bool AppInitRawTx(int argc, char* argv[])
         strUsage += HelpMessageOpt("set=NAME:JSON-STRING", _("Set register NAME to given JSON-STRING"));
         fprintf(stdout, "%s", strUsage.c_str());
 
-        return false;
+        if (argc < 2) {
+            fprintf(stderr, "Error: too few parameters\n");
+            return EXIT_FAILURE;
+        }
+        return EXIT_SUCCESS;
     }
-    return true;
+    return CONTINUE_EXECUTION;
 }
 
 static void RegisterSetJson(const string& key, const string& rawJson)
@@ -678,8 +687,9 @@ int main(int argc, char* argv[])
     SetupEnvironment();
 
     try {
-        if(!AppInitRawTx(argc, argv))
-            return EXIT_FAILURE;
+        int ret = AppInitRawTx(argc, argv);
+        if (ret != CONTINUE_EXECUTION)
+            return ret;
     }
     catch (const std::exception& e) {
         PrintExceptionContinue(&e, "AppInitRawTx()");
diff --git a/src/bitcoind.cpp b/src/bitcoind.cpp
index 351463c256e39..a0d039359445a 100644
--- a/src/bitcoind.cpp
+++ b/src/bitcoind.cpp
@@ -92,7 +92,7 @@ bool AppInit(int argc, char* argv[])
         }
 
         fprintf(stdout, "%s", strUsage.c_str());
-        return false;
+        return true;
     }
 
     try
diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp
index 9986af4957643..fb66ff00794ce 100644
--- a/src/qt/bitcoin.cpp
+++ b/src/qt/bitcoin.cpp
@@ -573,7 +573,7 @@ int main(int argc, char *argv[])
     {
         HelpMessageDialog help(NULL, mapArgs.count("-version"));
         help.showOrPrint();
-        return 1;
+        return 0;
     }
 
     /// 5. Now that settings and translations are available, ask user for data directory
@@ -594,7 +594,7 @@ int main(int argc, char *argv[])
     } catch (const std::exception& e) {
         QMessageBox::critical(0, QObject::tr(PACKAGE_NAME),
                               QObject::tr("Error: Cannot parse configuration file: %1. Only use key=value syntax.").arg(e.what()));
-        return false;
+        return 1;
     }
 
     /// 7. Determine network (and switch to network specific options)

From 77cbbd9ecffaeadd42b86a37bc83921be8b7dee5 Mon Sep 17 00:00:00 2001
From: R E Broadley <rebroad+github@gmail.com>
Date: Sat, 5 Nov 2016 15:17:14 +0800
Subject: [PATCH 1152/1802] Make warning message about wallet balance possibly
 being incorrect less ambiguous.

Fixes #9079
---
 src/qt/forms/modaloverlay.ui | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/qt/forms/modaloverlay.ui b/src/qt/forms/modaloverlay.ui
index 27998f90c5597..a37672ad536bf 100644
--- a/src/qt/forms/modaloverlay.ui
+++ b/src/qt/forms/modaloverlay.ui
@@ -130,7 +130,7 @@ QLabel { color: rgb(40,40,40);  }</string>
              <item>
               <widget class="QLabel" name="infoText">
                <property name="text">
-                <string>The displayed information may be out of date. Your wallet automatically synchronizes with the Bitcoin network after a connection is established, but this process has not completed yet. This means that recent transactions will not be visible, and the balance will not be up-to-date until this process has completed.</string>
+                <string>Recent transactions may not yet be visible, and therefore your wallet's balance might be incorrect. This information will be correct once your wallet has finished synchronizing with the bitcoin network, as detailed below.</string>
                </property>
                <property name="textFormat">
                 <enum>Qt::RichText</enum>
@@ -149,7 +149,7 @@ QLabel { color: rgb(40,40,40);  }</string>
                 </font>
                </property>
                <property name="text">
-                <string>Spending bitcoins may not be possible during that phase!</string>
+                <string>Attempting to spend bitcoins that are affected by not-yet-displayed transactions will not be accepted by the network.</string>
                </property>
                <property name="textFormat">
                 <enum>Qt::RichText</enum>

From 4b04e32c20b3e00ce30f3555677d9c937ca7482f Mon Sep 17 00:00:00 2001
From: isle2983 <isle2983@yahoo.com>
Date: Sun, 6 Nov 2016 10:12:50 -0700
Subject: [PATCH 1153/1802] [copyright] copyright header style uniform

Three categories of modifications:

1)

1 instance of 'The Bitcoin Core developers \n',
1 instance of 'the Bitcoin Core developers\n',
3 instances of 'Bitcoin Core Developers\n', and
12 instances of 'The Bitcoin developers\n'

are made uniform with the 443 instances of 'The Bitcoin Core developers\n'

2)

3 instances of 'BitPay, Inc\.\n' are made uniform with the other 6
instances of 'BitPay Inc\.\n'

3)

4 instances where there was no '(c)' between the 'Copyright' and the year
where it deviates from the style of the local directory.
---
 contrib/devtools/github-merge.py         | 2 +-
 qa/rpc-tests/test_framework/authproxy.py | 2 +-
 share/rpcuser/rpcuser.py                 | 2 +-
 src/arith_uint256.cpp                    | 2 +-
 src/arith_uint256.h                      | 2 +-
 src/bench/base58.cpp                     | 2 +-
 src/compat/byteswap.h                    | 2 +-
 src/compat/endian.h                      | 2 +-
 src/memusage.h                           | 2 +-
 src/policy/fees.cpp                      | 2 +-
 src/policy/fees.h                        | 2 +-
 src/policy/policy.cpp                    | 2 +-
 src/policy/policy.h                      | 2 +-
 src/policy/rbf.cpp                       | 2 +-
 src/policy/rbf.h                         | 2 +-
 src/qt/paymentrequestplus.h              | 2 +-
 src/test/bctest.py                       | 2 +-
 src/test/bitcoin-util-test.py            | 2 +-
 src/test/univalue_tests.cpp              | 2 +-
 19 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/contrib/devtools/github-merge.py b/contrib/devtools/github-merge.py
index f82362fe417e3..aae966a8f6b07 100755
--- a/contrib/devtools/github-merge.py
+++ b/contrib/devtools/github-merge.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-# Copyright (c) 2016 Bitcoin Core Developers
+# Copyright (c) 2016 The Bitcoin Core developers
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/qa/rpc-tests/test_framework/authproxy.py b/qa/rpc-tests/test_framework/authproxy.py
index fd7f32b5c6353..2858de645dec3 100644
--- a/qa/rpc-tests/test_framework/authproxy.py
+++ b/qa/rpc-tests/test_framework/authproxy.py
@@ -1,6 +1,6 @@
 
 """
-  Copyright 2011 Jeff Garzik
+  Copyright (c) 2011 Jeff Garzik
 
   AuthServiceProxy has the following improvements over python-jsonrpc's
   ServiceProxy class:
diff --git a/share/rpcuser/rpcuser.py b/share/rpcuser/rpcuser.py
index 9fd176908b788..f806a810e08c9 100755
--- a/share/rpcuser/rpcuser.py
+++ b/share/rpcuser/rpcuser.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python2 
-# Copyright (c) 2015 The Bitcoin Core developers 
+# Copyright (c) 2015 The Bitcoin Core developers
 # Distributed under the MIT software license, see the accompanying 
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/arith_uint256.cpp b/src/arith_uint256.cpp
index 2e613635761d8..a58ad01b5af5b 100644
--- a/src/arith_uint256.cpp
+++ b/src/arith_uint256.cpp
@@ -1,5 +1,5 @@
 // Copyright (c) 2009-2010 Satoshi Nakamoto
-// Copyright (c) 2009-2014 The Bitcoin developers
+// Copyright (c) 2009-2014 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/arith_uint256.h b/src/arith_uint256.h
index ba3d620158d47..5cc52f6e72af0 100644
--- a/src/arith_uint256.h
+++ b/src/arith_uint256.h
@@ -1,5 +1,5 @@
 // Copyright (c) 2009-2010 Satoshi Nakamoto
-// Copyright (c) 2009-2015 The Bitcoin developers
+// Copyright (c) 2009-2015 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/bench/base58.cpp b/src/bench/base58.cpp
index 1279c3e7df5dd..a791b5b7faa7f 100644
--- a/src/bench/base58.cpp
+++ b/src/bench/base58.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2016 the Bitcoin Core developers
+// Copyright (c) 2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/compat/byteswap.h b/src/compat/byteswap.h
index 899220bdc5490..07ca535728ec3 100644
--- a/src/compat/byteswap.h
+++ b/src/compat/byteswap.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2014 The Bitcoin developers
+// Copyright (c) 2014 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/compat/endian.h b/src/compat/endian.h
index 6bfae42c7709f..f7c1f9318a20b 100644
--- a/src/compat/endian.h
+++ b/src/compat/endian.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2015 The Bitcoin developers
+// Copyright (c) 2014-2015 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/memusage.h b/src/memusage.h
index 3810bfad07a91..2e3c5a9b92de7 100644
--- a/src/memusage.h
+++ b/src/memusage.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2015 The Bitcoin developers
+// Copyright (c) 2015 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/policy/fees.cpp b/src/policy/fees.cpp
index c07cd2eff8be0..dae00d08a4591 100644
--- a/src/policy/fees.cpp
+++ b/src/policy/fees.cpp
@@ -1,5 +1,5 @@
 // Copyright (c) 2009-2010 Satoshi Nakamoto
-// Copyright (c) 2009-2015 The Bitcoin developers
+// Copyright (c) 2009-2015 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/policy/fees.h b/src/policy/fees.h
index 2c1ac3b934a12..bff6488d0880e 100644
--- a/src/policy/fees.h
+++ b/src/policy/fees.h
@@ -1,5 +1,5 @@
 // Copyright (c) 2009-2010 Satoshi Nakamoto
-// Copyright (c) 2009-2015 The Bitcoin developers
+// Copyright (c) 2009-2015 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 #ifndef BITCOIN_POLICYESTIMATOR_H
diff --git a/src/policy/policy.cpp b/src/policy/policy.cpp
index ae42b2bd74fd8..a3eee474abacd 100644
--- a/src/policy/policy.cpp
+++ b/src/policy/policy.cpp
@@ -1,5 +1,5 @@
 // Copyright (c) 2009-2010 Satoshi Nakamoto
-// Copyright (c) 2009-2016 The Bitcoin developers
+// Copyright (c) 2009-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/policy/policy.h b/src/policy/policy.h
index 814e6c0b6ff94..764ee278061ba 100644
--- a/src/policy/policy.h
+++ b/src/policy/policy.h
@@ -1,5 +1,5 @@
 // Copyright (c) 2009-2010 Satoshi Nakamoto
-// Copyright (c) 2009-2016 The Bitcoin developers
+// Copyright (c) 2009-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/policy/rbf.cpp b/src/policy/rbf.cpp
index 133cff611d34b..d9b47e71bbe09 100644
--- a/src/policy/rbf.cpp
+++ b/src/policy/rbf.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2016 The Bitcoin developers
+// Copyright (c) 2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/policy/rbf.h b/src/policy/rbf.h
index 5a711dba07370..139aec57602c8 100644
--- a/src/policy/rbf.h
+++ b/src/policy/rbf.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2016 The Bitcoin developers
+// Copyright (c) 2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/qt/paymentrequestplus.h b/src/qt/paymentrequestplus.h
index a73fe5f29dd60..a8bfcd2ac401f 100644
--- a/src/qt/paymentrequestplus.h
+++ b/src/qt/paymentrequestplus.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011-2015 The Bitcoin developers
+// Copyright (c) 2011-2015 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/test/bctest.py b/src/test/bctest.py
index 47cff98bca2ed..adc5d0e41819a 100644
--- a/src/test/bctest.py
+++ b/src/test/bctest.py
@@ -1,4 +1,4 @@
-# Copyright 2014 BitPay, Inc.
+# Copyright 2014 BitPay Inc.
 # Copyright 2016 The Bitcoin Core developers
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
diff --git a/src/test/bitcoin-util-test.py b/src/test/bitcoin-util-test.py
index eeb05c0b889a3..4301b93b7c50e 100755
--- a/src/test/bitcoin-util-test.py
+++ b/src/test/bitcoin-util-test.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Copyright 2014 BitPay, Inc.
+# Copyright 2014 BitPay Inc.
 # Copyright 2016 The Bitcoin Core developers
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
diff --git a/src/test/univalue_tests.cpp b/src/test/univalue_tests.cpp
index 45d480c816db4..7f794fcbe9fc9 100644
--- a/src/test/univalue_tests.cpp
+++ b/src/test/univalue_tests.cpp
@@ -1,4 +1,4 @@
-// Copyright 2014 BitPay, Inc.
+// Copyright (c) 2014 BitPay Inc.
 // Copyright (c) 2014-2015 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.

From faead5e1a92cd6b46b04f4e973336ef73c4e3a4e Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Mon, 7 Nov 2016 11:08:13 +0100
Subject: [PATCH 1154/1802] [doc] release-process: Mention GitHub release and
 archived release notes

---
 doc/release-process.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/doc/release-process.md b/doc/release-process.md
index 85cf160f47a27..61f05b0771f3e 100644
--- a/doc/release-process.md
+++ b/doc/release-process.md
@@ -280,6 +280,8 @@ bitcoin.org (see below for bitcoin.org update instructions).
 
   - Notify BlueMatt so that he can start building [the PPAs](https://launchpad.net/~bitcoin/+archive/ubuntu/bitcoin)
 
-  - Add release notes for the new version to the directory `doc/release-notes` in git master
+  - Archive release notes for the new version to `doc/release-notes/` (branch `master` and branch of the release)
+
+  - Create a [new GitHub release](https://github.com/bitcoin/bitcoin/releases/new) with a link to the archived release notes.
 
   - Celebrate

From e760b307f6210bee293796d606bcca87f86be200 Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Mon, 7 Nov 2016 12:11:59 +0100
Subject: [PATCH 1155/1802] qt: Use correct conversion function for boost::path
 datadir

Fixes #9089.
---
 src/qt/clientmodel.cpp   | 3 ++-
 src/qt/paymentserver.cpp | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/qt/clientmodel.cpp b/src/qt/clientmodel.cpp
index 87704c641d489..f9caca6878e51 100644
--- a/src/qt/clientmodel.cpp
+++ b/src/qt/clientmodel.cpp
@@ -6,6 +6,7 @@
 
 #include "bantablemodel.h"
 #include "guiconstants.h"
+#include "guiutil.h"
 #include "peertablemodel.h"
 
 #include "chainparams.h"
@@ -208,7 +209,7 @@ QString ClientModel::formatClientStartupTime() const
 
 QString ClientModel::dataDir() const
 {
-    return QString::fromStdString(GetDataDir().string());
+    return GUIUtil::boostPathToQString(GetDataDir());
 }
 
 void ClientModel::updateBanlist()
diff --git a/src/qt/paymentserver.cpp b/src/qt/paymentserver.cpp
index 9f23e77a13700..478f5ccf1274f 100644
--- a/src/qt/paymentserver.cpp
+++ b/src/qt/paymentserver.cpp
@@ -80,7 +80,7 @@ static QString ipcServerName()
     // Append a simple hash of the datadir
     // Note that GetDataDir(true) returns a different path
     // for -testnet versus main net
-    QString ddir(QString::fromStdString(GetDataDir(true).string()));
+    QString ddir(GUIUtil::boostPathToQString(GetDataDir(true)));
     name.append(QString::number(qHash(ddir)));
 
     return name;

From 1ee6f9116ac61b493a96db21461bb5ccf720e829 Mon Sep 17 00:00:00 2001
From: nomnombtc <mastergizmo@arcor.de>
Date: Wed, 24 Aug 2016 03:23:52 +0200
Subject: [PATCH 1156/1802] new var DIST_CONTRIB adds useful things for
 packagers from contrib/ to EXTRA_DIST

---
 Makefile.am | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/Makefile.am b/Makefile.am
index 37c1e98eca6bc..4ca12cf25392f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -32,6 +32,11 @@ OSX_PLIST=$(top_builddir)/share/qt/Info.plist #not installed
 OSX_QT_TRANSLATIONS = da,de,es,hu,ru,uk,zh_CN,zh_TW
 
 DIST_DOCS = $(wildcard doc/*.md) $(wildcard doc/release-notes/*.md)
+DIST_CONTRIB = $(top_srcdir)/contrib/bitcoin-cli.bash-completion \
+	       $(top_srcdir)/contrib/bitcoin-tx.bash-completion \
+	       $(top_srcdir)/contrib/bitcoind.bash-completion \
+	       $(top_srcdir)/contrib/init \
+	       $(top_srcdir)/contrib/rpm
 
 BIN_CHECKS=$(top_srcdir)/contrib/devtools/symbol-check.py \
            $(top_srcdir)/contrib/devtools/security-check.py
@@ -204,7 +209,7 @@ endif
 
 dist_noinst_SCRIPTS = autogen.sh
 
-EXTRA_DIST = $(top_srcdir)/share/genbuild.sh qa/pull-tester/rpc-tests.py qa/rpc-tests $(DIST_DOCS) $(WINDOWS_PACKAGING) $(OSX_PACKAGING) $(BIN_CHECKS)
+EXTRA_DIST = $(top_srcdir)/share/genbuild.sh qa/pull-tester/rpc-tests.py qa/rpc-tests $(DIST_CONTRIB) $(DIST_DOCS) $(WINDOWS_PACKAGING) $(OSX_PACKAGING) $(BIN_CHECKS)
 
 CLEANFILES = $(OSX_DMG) $(BITCOIN_WIN_INSTALLER)
 

From b2322e0fc6def0baf8581bbd2f4135e61c47d142 Mon Sep 17 00:00:00 2001
From: Alex Morcos <morcos@chaincode.com>
Date: Mon, 21 Mar 2016 13:04:40 -0400
Subject: [PATCH 1157/1802] Remove priority estimation

---
 src/policy/fees.cpp                | 168 ++++++-----------------------
 src/policy/fees.h                  | 115 ++++++++------------
 src/rpc/mining.cpp                 |   4 +-
 src/test/policyestimator_tests.cpp |  60 ++++-------
 src/txmempool.cpp                  |   5 +-
 5 files changed, 101 insertions(+), 251 deletions(-)

diff --git a/src/policy/fees.cpp b/src/policy/fees.cpp
index c07cd2eff8be0..77510b564f428 100644
--- a/src/policy/fees.cpp
+++ b/src/policy/fees.cpp
@@ -14,10 +14,9 @@
 #include "util.h"
 
 void TxConfirmStats::Initialize(std::vector<double>& defaultBuckets,
-                                unsigned int maxConfirms, double _decay, std::string _dataTypeString)
+                                unsigned int maxConfirms, double _decay)
 {
     decay = _decay;
-    dataTypeString = _dataTypeString;
     for (unsigned int i = 0; i < defaultBuckets.size(); i++) {
         buckets.push_back(defaultBuckets[i]);
         bucketMap[defaultBuckets[i]] = i;
@@ -87,10 +86,10 @@ double TxConfirmStats::EstimateMedianVal(int confTarget, double sufficientTxVal,
 
     int maxbucketindex = buckets.size() - 1;
 
-    // requireGreater means we are looking for the lowest fee/priority such that all higher
-    // values pass, so we start at maxbucketindex (highest fee) and look at successively
+    // requireGreater means we are looking for the lowest feerate such that all higher
+    // values pass, so we start at maxbucketindex (highest feerate) and look at successively
     // smaller buckets until we reach failure.  Otherwise, we are looking for the highest
-    // fee/priority such that all lower values fail, and we go in the opposite direction.
+    // feerate such that all lower values fail, and we go in the opposite direction.
     unsigned int startbucket = requireGreater ? maxbucketindex : 0;
     int step = requireGreater ? -1 : 1;
 
@@ -107,7 +106,7 @@ double TxConfirmStats::EstimateMedianVal(int confTarget, double sufficientTxVal,
     bool foundAnswer = false;
     unsigned int bins = unconfTxs.size();
 
-    // Start counting from highest(default) or lowest fee/pri transactions
+    // Start counting from highest(default) or lowest feerate transactions
     for (int bucket = startbucket; bucket >= 0 && bucket <= maxbucketindex; bucket += step) {
         curFarBucket = bucket;
         nConf += confAvg[confTarget - 1][bucket];
@@ -145,8 +144,8 @@ double TxConfirmStats::EstimateMedianVal(int confTarget, double sufficientTxVal,
     double median = -1;
     double txSum = 0;
 
-    // Calculate the "average" fee of the best bucket range that met success conditions
-    // Find the bucket with the median transaction and then report the average fee from that bucket
+    // Calculate the "average" feerate of the best bucket range that met success conditions
+    // Find the bucket with the median transaction and then report the average feerate from that bucket
     // This is a compromise between finding the median which we can't since we don't save all tx's
     // and reporting the average which is less accurate
     unsigned int minBucket = bestNearBucket < bestFarBucket ? bestNearBucket : bestFarBucket;
@@ -166,8 +165,8 @@ double TxConfirmStats::EstimateMedianVal(int confTarget, double sufficientTxVal,
         }
     }
 
-    LogPrint("estimatefee", "%3d: For conf success %s %4.2f need %s %s: %12.5g from buckets %8g - %8g  Cur Bucket stats %6.2f%%  %8.1f/(%.1f+%d mempool)\n",
-             confTarget, requireGreater ? ">" : "<", successBreakPoint, dataTypeString,
+    LogPrint("estimatefee", "%3d: For conf success %s %4.2f need feerate %s: %12.5g from buckets %8g - %8g  Cur Bucket stats %6.2f%%  %8.1f/(%.1f+%d mempool)\n",
+             confTarget, requireGreater ? ">" : "<", successBreakPoint,
              requireGreater ? ">" : "<", median, buckets[minBucket], buckets[maxBucket],
              100 * nConf / (totalNum + extraNum), nConf, totalNum, extraNum);
 
@@ -200,10 +199,10 @@ void TxConfirmStats::Read(CAutoFile& filein)
     filein >> fileBuckets;
     numBuckets = fileBuckets.size();
     if (numBuckets <= 1 || numBuckets > 1000)
-        throw std::runtime_error("Corrupt estimates file. Must have between 2 and 1000 fee/pri buckets");
+        throw std::runtime_error("Corrupt estimates file. Must have between 2 and 1000 feerate buckets");
     filein >> fileAvg;
     if (fileAvg.size() != numBuckets)
-        throw std::runtime_error("Corrupt estimates file. Mismatch in fee/pri average bucket count");
+        throw std::runtime_error("Corrupt estimates file. Mismatch in feerate average bucket count");
     filein >> fileTxCtAvg;
     if (fileTxCtAvg.size() != numBuckets)
         throw std::runtime_error("Corrupt estimates file. Mismatch in tx count bucket count");
@@ -213,9 +212,9 @@ void TxConfirmStats::Read(CAutoFile& filein)
         throw std::runtime_error("Corrupt estimates file.  Must maintain estimates for between 1 and 1008 (one week) confirms");
     for (unsigned int i = 0; i < maxConfirms; i++) {
         if (fileConfAvg[i].size() != numBuckets)
-            throw std::runtime_error("Corrupt estimates file. Mismatch in fee/pri conf average bucket count");
+            throw std::runtime_error("Corrupt estimates file. Mismatch in feerate conf average bucket count");
     }
-    // Now that we've processed the entire fee estimate data file and not
+    // Now that we've processed the entire feerate estimate data file and not
     // thrown any errors, we can copy it to our data structures
     decay = fileDecay;
     buckets = fileBuckets;
@@ -242,8 +241,8 @@ void TxConfirmStats::Read(CAutoFile& filein)
     for (unsigned int i = 0; i < buckets.size(); i++)
         bucketMap[buckets[i]] = i;
 
-    LogPrint("estimatefee", "Reading estimates: %u %s buckets counting confirms up to %u blocks\n",
-             numBuckets, dataTypeString, maxConfirms);
+    LogPrint("estimatefee", "Reading estimates: %u buckets counting confirms up to %u blocks\n",
+             numBuckets, maxConfirms);
 }
 
 unsigned int TxConfirmStats::NewTx(unsigned int nBlockHeight, double val)
@@ -251,7 +250,6 @@ unsigned int TxConfirmStats::NewTx(unsigned int nBlockHeight, double val)
     unsigned int bucketindex = bucketMap.lower_bound(val)->second;
     unsigned int blockIndex = nBlockHeight % unconfTxs.size();
     unconfTxs[blockIndex][bucketindex]++;
-    LogPrint("estimatefee", "adding to %s", dataTypeString);
     return bucketindex;
 }
 
@@ -291,12 +289,10 @@ void CBlockPolicyEstimator::removeTx(uint256 hash)
                  hash.ToString().c_str());
         return;
     }
-    TxConfirmStats *stats = pos->second.stats;
     unsigned int entryHeight = pos->second.blockHeight;
     unsigned int bucketIndex = pos->second.bucketIndex;
 
-    if (stats != NULL)
-        stats->removeTx(entryHeight, nBestSeenHeight, bucketIndex);
+    feeStats.removeTx(entryHeight, nBestSeenHeight, bucketIndex);
     mapMemPoolTxs.erase(hash);
 }
 
@@ -309,45 +305,14 @@ CBlockPolicyEstimator::CBlockPolicyEstimator(const CFeeRate& _minRelayFee)
         vfeelist.push_back(bucketBoundary);
     }
     vfeelist.push_back(INF_FEERATE);
-    feeStats.Initialize(vfeelist, MAX_BLOCK_CONFIRMS, DEFAULT_DECAY, "FeeRate");
-
-    minTrackedPriority = AllowFreeThreshold() < MIN_PRIORITY ? MIN_PRIORITY : AllowFreeThreshold();
-    std::vector<double> vprilist;
-    for (double bucketBoundary = minTrackedPriority; bucketBoundary <= MAX_PRIORITY; bucketBoundary *= PRI_SPACING) {
-        vprilist.push_back(bucketBoundary);
-    }
-    vprilist.push_back(INF_PRIORITY);
-    priStats.Initialize(vprilist, MAX_BLOCK_CONFIRMS, DEFAULT_DECAY, "Priority");
-
-    feeUnlikely = CFeeRate(0);
-    feeLikely = CFeeRate(INF_FEERATE);
-    priUnlikely = 0;
-    priLikely = INF_PRIORITY;
-}
-
-bool CBlockPolicyEstimator::isFeeDataPoint(const CFeeRate &fee, double pri)
-{
-    if ((pri < minTrackedPriority && fee >= minTrackedFee) ||
-        (pri < priUnlikely && fee > feeLikely)) {
-        return true;
-    }
-    return false;
-}
-
-bool CBlockPolicyEstimator::isPriDataPoint(const CFeeRate &fee, double pri)
-{
-    if ((fee < minTrackedFee && pri >= minTrackedPriority) ||
-        (fee < feeUnlikely && pri > priLikely)) {
-        return true;
-    }
-    return false;
+    feeStats.Initialize(vfeelist, MAX_BLOCK_CONFIRMS, DEFAULT_DECAY);
 }
 
 void CBlockPolicyEstimator::processTransaction(const CTxMemPoolEntry& entry, bool fCurrentEstimate)
 {
     unsigned int txHeight = entry.GetHeight();
     uint256 hash = entry.GetTx().GetHash();
-    if (mapMemPoolTxs[hash].stats != NULL) {
+    if (mapMemPoolTxs.count(hash)) {
         LogPrint("estimatefee", "Blockpolicy error mempool tx %s already being tracked\n",
                  hash.ToString().c_str());
 	return;
@@ -371,30 +336,11 @@ void CBlockPolicyEstimator::processTransaction(const CTxMemPoolEntry& entry, boo
         return;
     }
 
-    // Fees are stored and reported as BTC-per-kb:
+    // Feerates are stored and reported as BTC-per-kb:
     CFeeRate feeRate(entry.GetFee(), entry.GetTxSize());
 
-    // Want the priority of the tx at confirmation. However we don't know
-    // what that will be and its too hard to continue updating it
-    // so use starting priority as a proxy
-    double curPri = entry.GetPriority(txHeight);
     mapMemPoolTxs[hash].blockHeight = txHeight;
-
-    LogPrint("estimatefee", "Blockpolicy mempool tx %s ", hash.ToString().substr(0,10));
-    // Record this as a priority estimate
-    if (entry.GetFee() == 0 || isPriDataPoint(feeRate, curPri)) {
-        mapMemPoolTxs[hash].stats = &priStats;
-        mapMemPoolTxs[hash].bucketIndex =  priStats.NewTx(txHeight, curPri);
-    }
-    // Record this as a fee estimate
-    else if (isFeeDataPoint(feeRate, curPri)) {
-        mapMemPoolTxs[hash].stats = &feeStats;
-        mapMemPoolTxs[hash].bucketIndex = feeStats.NewTx(txHeight, (double)feeRate.GetFeePerK());
-    }
-    else {
-        LogPrint("estimatefee", "not adding");
-    }
-    LogPrint("estimatefee", "\n");
+    mapMemPoolTxs[hash].bucketIndex = feeStats.NewTx(txHeight, (double)feeRate.GetFeePerK());
 }
 
 void CBlockPolicyEstimator::processBlockTx(unsigned int nBlockHeight, const CTxMemPoolEntry& entry)
@@ -417,21 +363,10 @@ void CBlockPolicyEstimator::processBlockTx(unsigned int nBlockHeight, const CTxM
         return;
     }
 
-    // Fees are stored and reported as BTC-per-kb:
+    // Feerates are stored and reported as BTC-per-kb:
     CFeeRate feeRate(entry.GetFee(), entry.GetTxSize());
 
-    // Want the priority of the tx at confirmation.  The priority when it
-    // entered the mempool could easily be very small and change quickly
-    double curPri = entry.GetPriority(nBlockHeight);
-
-    // Record this as a priority estimate
-    if (entry.GetFee() == 0 || isPriDataPoint(feeRate, curPri)) {
-        priStats.Record(blocksToConfirm, curPri);
-    }
-    // Record this as a fee estimate
-    else if (isFeeDataPoint(feeRate, curPri)) {
-        feeStats.Record(blocksToConfirm, (double)feeRate.GetFeePerK());
-    }
+    feeStats.Record(blocksToConfirm, (double)feeRate.GetFeePerK());
 }
 
 void CBlockPolicyEstimator::processBlock(unsigned int nBlockHeight,
@@ -452,41 +387,15 @@ void CBlockPolicyEstimator::processBlock(unsigned int nBlockHeight,
     if (!fCurrentEstimate)
         return;
 
-    // Update the dynamic cutoffs
-    // a fee/priority is "likely" the reason your tx was included in a block if >85% of such tx's
-    // were confirmed in 2 blocks and is "unlikely" if <50% were confirmed in 10 blocks
-    LogPrint("estimatefee", "Blockpolicy recalculating dynamic cutoffs:\n");
-    priLikely = priStats.EstimateMedianVal(2, SUFFICIENT_PRITXS, MIN_SUCCESS_PCT, true, nBlockHeight);
-    if (priLikely == -1)
-        priLikely = INF_PRIORITY;
-
-    double feeLikelyEst = feeStats.EstimateMedianVal(2, SUFFICIENT_FEETXS, MIN_SUCCESS_PCT, true, nBlockHeight);
-    if (feeLikelyEst == -1)
-        feeLikely = CFeeRate(INF_FEERATE);
-    else
-        feeLikely = CFeeRate(feeLikelyEst);
-
-    priUnlikely = priStats.EstimateMedianVal(10, SUFFICIENT_PRITXS, UNLIKELY_PCT, false, nBlockHeight);
-    if (priUnlikely == -1)
-        priUnlikely = 0;
-
-    double feeUnlikelyEst = feeStats.EstimateMedianVal(10, SUFFICIENT_FEETXS, UNLIKELY_PCT, false, nBlockHeight);
-    if (feeUnlikelyEst == -1)
-        feeUnlikely = CFeeRate(0);
-    else
-        feeUnlikely = CFeeRate(feeUnlikelyEst);
-
-    // Clear the current block states
+    // Clear the current block state
     feeStats.ClearCurrent(nBlockHeight);
-    priStats.ClearCurrent(nBlockHeight);
 
     // Repopulate the current block states
     for (unsigned int i = 0; i < entries.size(); i++)
         processBlockTx(nBlockHeight, entries[i]);
 
-    // Update all exponential averages with the current block states
+    // Update all exponential averages with the current block state
     feeStats.UpdateMovingAverages();
-    priStats.UpdateMovingAverages();
 
     LogPrint("estimatefee", "Blockpolicy after updating estimates for %u confirmed entries, new mempool map size %u\n",
              entries.size(), mapMemPoolTxs.size());
@@ -522,7 +431,7 @@ CFeeRate CBlockPolicyEstimator::estimateSmartFee(int confTarget, int *answerFoun
     if (answerFoundAtTarget)
         *answerFoundAtTarget = confTarget - 1;
 
-    // If mempool is limiting txs , return at least the min fee from the mempool
+    // If mempool is limiting txs , return at least the min feerate from the mempool
     CAmount minPoolFee = pool.GetMinFee(GetArg("-maxmempool", DEFAULT_MAX_MEMPOOL_SIZE) * 1000000).GetFeePerK();
     if (minPoolFee > 0 && minPoolFee > median)
         return CFeeRate(minPoolFee);
@@ -535,51 +444,38 @@ CFeeRate CBlockPolicyEstimator::estimateSmartFee(int confTarget, int *answerFoun
 
 double CBlockPolicyEstimator::estimatePriority(int confTarget)
 {
-    // Return failure if trying to analyze a target we're not tracking
-    if (confTarget <= 0 || (unsigned int)confTarget > priStats.GetMaxConfirms())
-        return -1;
-
-    return priStats.EstimateMedianVal(confTarget, SUFFICIENT_PRITXS, MIN_SUCCESS_PCT, true, nBestSeenHeight);
+    return -1;
 }
 
 double CBlockPolicyEstimator::estimateSmartPriority(int confTarget, int *answerFoundAtTarget, const CTxMemPool& pool)
 {
     if (answerFoundAtTarget)
         *answerFoundAtTarget = confTarget;
-    // Return failure if trying to analyze a target we're not tracking
-    if (confTarget <= 0 || (unsigned int)confTarget > priStats.GetMaxConfirms())
-        return -1;
 
     // If mempool is limiting txs, no priority txs are allowed
     CAmount minPoolFee = pool.GetMinFee(GetArg("-maxmempool", DEFAULT_MAX_MEMPOOL_SIZE) * 1000000).GetFeePerK();
     if (minPoolFee > 0)
         return INF_PRIORITY;
 
-    double median = -1;
-    while (median < 0 && (unsigned int)confTarget <= priStats.GetMaxConfirms()) {
-        median = priStats.EstimateMedianVal(confTarget++, SUFFICIENT_PRITXS, MIN_SUCCESS_PCT, true, nBestSeenHeight);
-    }
-
-    if (answerFoundAtTarget)
-        *answerFoundAtTarget = confTarget - 1;
-
-    return median;
+    return -1;
 }
 
 void CBlockPolicyEstimator::Write(CAutoFile& fileout)
 {
     fileout << nBestSeenHeight;
     feeStats.Write(fileout);
-    priStats.Write(fileout);
 }
 
-void CBlockPolicyEstimator::Read(CAutoFile& filein)
+void CBlockPolicyEstimator::Read(CAutoFile& filein, int nFileVersion)
 {
     int nFileBestSeenHeight;
     filein >> nFileBestSeenHeight;
     feeStats.Read(filein);
-    priStats.Read(filein);
     nBestSeenHeight = nFileBestSeenHeight;
+    if (nFileVersion < 139900) {
+        TxConfirmStats priStats;
+        priStats.Read(filein);
+    }
 }
 
 FeeFilterRounder::FeeFilterRounder(const CFeeRate& minIncrementalFee)
diff --git a/src/policy/fees.h b/src/policy/fees.h
index 2c1ac3b934a12..b5881afadf055 100644
--- a/src/policy/fees.h
+++ b/src/policy/fees.h
@@ -19,60 +19,50 @@ class CTxMemPoolEntry;
 class CTxMemPool;
 
 /** \class CBlockPolicyEstimator
- * The BlockPolicyEstimator is used for estimating the fee or priority needed
+ * The BlockPolicyEstimator is used for estimating the feerate needed
  * for a transaction to be included in a block within a certain number of
  * blocks.
  *
  * At a high level the algorithm works by grouping transactions into buckets
- * based on having similar priorities or fees and then tracking how long it
+ * based on having similar feerates and then tracking how long it
  * takes transactions in the various buckets to be mined.  It operates under
- * the assumption that in general transactions of higher fee/priority will be
- * included in blocks before transactions of lower fee/priority.   So for
- * example if you wanted to know what fee you should put on a transaction to
+ * the assumption that in general transactions of higher feerate will be
+ * included in blocks before transactions of lower feerate.   So for
+ * example if you wanted to know what feerate you should put on a transaction to
  * be included in a block within the next 5 blocks, you would start by looking
- * at the bucket with the highest fee transactions and verifying that a
+ * at the bucket with the highest feerate transactions and verifying that a
  * sufficiently high percentage of them were confirmed within 5 blocks and
- * then you would look at the next highest fee bucket, and so on, stopping at
- * the last bucket to pass the test.   The average fee of transactions in this
- * bucket will give you an indication of the lowest fee you can put on a
+ * then you would look at the next highest feerate bucket, and so on, stopping at
+ * the last bucket to pass the test.   The average feerate of transactions in this
+ * bucket will give you an indication of the lowest feerate you can put on a
  * transaction and still have a sufficiently high chance of being confirmed
  * within your desired 5 blocks.
  *
- * When a transaction enters the mempool or is included within a block we
- * decide whether it can be used as a data point for fee estimation, priority
- * estimation or neither.  If the value of exactly one of those properties was
- * below the required minimum it can be used to estimate the other.  In
- * addition, if a priori our estimation code would indicate that the
- * transaction would be much more quickly included in a block because of one
- * of the properties compared to the other, we can also decide to use it as
- * an estimate for that property.
- *
- * Here is a brief description of the implementation for fee estimation.
- * When a transaction that counts for fee estimation enters the mempool, we
+ * Here is a brief description of the implementation:
+ * When a transaction enters the mempool, we
  * track the height of the block chain at entry.  Whenever a block comes in,
- * we count the number of transactions in each bucket and the total amount of fee
+ * we count the number of transactions in each bucket and the total amount of feerate
  * paid in each bucket. Then we calculate how many blocks Y it took each
  * transaction to be mined and we track an array of counters in each bucket
  * for how long it to took transactions to get confirmed from 1 to a max of 25
  * and we increment all the counters from Y up to 25. This is because for any
  * number Z>=Y the transaction was successfully mined within Z blocks.  We
  * want to save a history of this information, so at any time we have a
- * counter of the total number of transactions that happened in a given fee
+ * counter of the total number of transactions that happened in a given feerate
  * bucket and the total number that were confirmed in each number 1-25 blocks
  * or less for any bucket.   We save this history by keeping an exponentially
  * decaying moving average of each one of these stats.  Furthermore we also
  * keep track of the number unmined (in mempool) transactions in each bucket
  * and for how many blocks they have been outstanding and use that to increase
- * the number of transactions we've seen in that fee bucket when calculating
+ * the number of transactions we've seen in that feerate bucket when calculating
  * an estimate for any number of confirmations below the number of blocks
  * they've been outstanding.
  */
 
 /**
- * We will instantiate two instances of this class, one to track transactions
- * that were included in a block due to fee, and one for tx's included due to
- * priority.  We will lump transactions into a bucket according to their approximate
- * fee or priority and then track how long it took for those txs to be included in a block
+ * We will instantiate an instance of this class to track transactions that were
+ * included in a block. We will lump transactions into a bucket according to their
+ * approximate feerate and then track how long it took for those txs to be included in a block
  *
  * The tracking of unconfirmed (mempool) transactions is completely independent of the
  * historical tracking of transactions that have been confirmed in a block.
@@ -80,7 +70,7 @@ class CTxMemPool;
 class TxConfirmStats
 {
 private:
-    //Define the buckets we will group transactions into (both fee buckets and priority buckets)
+    //Define the buckets we will group transactions into
     std::vector<double> buckets;              // The upper-bound of the range for the bucket (inclusive)
     std::map<double, unsigned int> bucketMap; // Map of bucket upper-bound to index into all vectors by bucket
 
@@ -97,16 +87,15 @@ class TxConfirmStats
     // and calculate the totals for the current block to update the moving averages
     std::vector<std::vector<int> > curBlockConf; // curBlockConf[Y][X]
 
-    // Sum the total priority/fee of all tx's in each bucket
+    // Sum the total feerate of all tx's in each bucket
     // Track the historical moving average of this total over blocks
     std::vector<double> avg;
     // and calculate the total for the current block to update the moving average
     std::vector<double> curBlockVal;
 
     // Combine the conf counts with tx counts to calculate the confirmation % for each Y,X
-    // Combine the total value with the tx counts to calculate the avg fee/priority per bucket
+    // Combine the total value with the tx counts to calculate the avg feerate per bucket
 
-    std::string dataTypeString;
     double decay;
 
     // Mempool counts of outstanding transactions
@@ -123,9 +112,8 @@ class TxConfirmStats
      * @param defaultBuckets contains the upper limits for the bucket boundaries
      * @param maxConfirms max number of confirms to track
      * @param decay how much to decay the historical moving average per block
-     * @param dataTypeString for logging purposes
      */
-    void Initialize(std::vector<double>& defaultBuckets, unsigned int maxConfirms, double decay, std::string dataTypeString);
+    void Initialize(std::vector<double>& defaultBuckets, unsigned int maxConfirms, double decay);
 
     /** Clear the state of the curBlock variables to start counting for the new block */
     void ClearCurrent(unsigned int nBlockHeight);
@@ -133,7 +121,7 @@ class TxConfirmStats
     /**
      * Record a new transaction data point in the current block stats
      * @param blocksToConfirm the number of blocks it took this transaction to confirm
-     * @param val either the fee or the priority when entered of the transaction
+     * @param val the feerate of the transaction
      * @warning blocksToConfirm is 1-based and has to be >= 1
      */
     void Record(int blocksToConfirm, double val);
@@ -150,14 +138,14 @@ class TxConfirmStats
     void UpdateMovingAverages();
 
     /**
-     * Calculate a fee or priority estimate.  Find the lowest value bucket (or range of buckets
+     * Calculate a feerate estimate.  Find the lowest value bucket (or range of buckets
      * to make sure we have enough data points) whose transactions still have sufficient likelihood
      * of being confirmed within the target number of confirmations
      * @param confTarget target number of confirmations
      * @param sufficientTxVal required average number of transactions per block in a bucket range
      * @param minSuccess the success probability we require
-     * @param requireGreater return the lowest fee/pri such that all higher values pass minSuccess OR
-     *        return the highest fee/pri such that all lower values fail minSuccess
+     * @param requireGreater return the lowest feerate such that all higher values pass minSuccess OR
+     *        return the highest feerate such that all lower values fail minSuccess
      * @param nBlockHeight the current block height
      */
     double EstimateMedianVal(int confTarget, double sufficientTxVal,
@@ -184,35 +172,27 @@ static const unsigned int MAX_BLOCK_CONFIRMS = 25;
 /** Decay of .998 is a half-life of 346 blocks or about 2.4 days */
 static const double DEFAULT_DECAY = .998;
 
-/** Require greater than 95% of X fee transactions to be confirmed within Y blocks for X to be big enough */
+/** Require greater than 95% of X feerate transactions to be confirmed within Y blocks for X to be big enough */
 static const double MIN_SUCCESS_PCT = .95;
 static const double UNLIKELY_PCT = .5;
 
-/** Require an avg of 1 tx in the combined fee bucket per block to have stat significance */
+/** Require an avg of 1 tx in the combined feerate bucket per block to have stat significance */
 static const double SUFFICIENT_FEETXS = 1;
 
-/** Require only an avg of 1 tx every 5 blocks in the combined pri bucket (way less pri txs) */
-static const double SUFFICIENT_PRITXS = .2;
-
-// Minimum and Maximum values for tracking fees and priorities
+// Minimum and Maximum values for tracking feerates
 static const double MIN_FEERATE = 10;
 static const double MAX_FEERATE = 1e7;
 static const double INF_FEERATE = MAX_MONEY;
-static const double MIN_PRIORITY = 10;
-static const double MAX_PRIORITY = 1e16;
 static const double INF_PRIORITY = 1e9 * MAX_MONEY;
 
-// We have to lump transactions into buckets based on fee or priority, but we want to be able
-// to give accurate estimates over a large range of potential fees and priorities
+// We have to lump transactions into buckets based on feerate, but we want to be able
+// to give accurate estimates over a large range of potential feerates
 // Therefore it makes sense to exponentially space the buckets
 /** Spacing of FeeRate buckets */
 static const double FEE_SPACING = 1.1;
 
-/** Spacing of Priority buckets */
-static const double PRI_SPACING = 2;
-
 /**
- *  We want to be able to estimate fees or priorities that are needed on tx's to be included in
+ *  We want to be able to estimate feerates that are needed on tx's to be included in
  * a certain number of blocks.  Every time a block is added to the best chain, this class records
  * stats on the transactions included in that block
  */
@@ -235,27 +215,26 @@ class CBlockPolicyEstimator
     /** Remove a transaction from the mempool tracking stats*/
     void removeTx(uint256 hash);
 
-    /** Is this transaction likely included in a block because of its fee?*/
-    bool isFeeDataPoint(const CFeeRate &fee, double pri);
-
-    /** Is this transaction likely included in a block because of its priority?*/
-    bool isPriDataPoint(const CFeeRate &fee, double pri);
-
-    /** Return a fee estimate */
+    /** Return a feerate estimate */
     CFeeRate estimateFee(int confTarget);
 
-    /** Estimate fee rate needed to get be included in a block within
+    /** Estimate feerate needed to get be included in a block within
      *  confTarget blocks. If no answer can be given at confTarget, return an
      *  estimate at the lowest target where one can be given.
      */
     CFeeRate estimateSmartFee(int confTarget, int *answerFoundAtTarget, const CTxMemPool& pool);
 
-    /** Return a priority estimate */
+    /** Return a priority estimate.
+     *  DEPRECATED
+     *  Returns -1
+     */
     double estimatePriority(int confTarget);
 
     /** Estimate priority needed to get be included in a block within
-     *  confTarget blocks. If no answer can be given at confTarget, return an
-     *  estimate at the lowest target where one can be given.
+     *  confTarget blocks.
+     *  DEPRECATED
+     *  Returns -1 unless mempool is currently limited then returns INF_PRIORITY
+     *  answerFoundAtTarget is set to confTarget
      */
     double estimateSmartPriority(int confTarget, int *answerFoundAtTarget, const CTxMemPool& pool);
 
@@ -263,29 +242,23 @@ class CBlockPolicyEstimator
     void Write(CAutoFile& fileout);
 
     /** Read estimation data from a file */
-    void Read(CAutoFile& filein);
+    void Read(CAutoFile& filein, int nFileVersion);
 
 private:
     CFeeRate minTrackedFee;    //!< Passed to constructor to avoid dependency on main
-    double minTrackedPriority; //!< Set to AllowFreeThreshold
     unsigned int nBestSeenHeight;
     struct TxStatsInfo
     {
-        TxConfirmStats *stats;
         unsigned int blockHeight;
         unsigned int bucketIndex;
-        TxStatsInfo() : stats(NULL), blockHeight(0), bucketIndex(0) {}
+        TxStatsInfo() : blockHeight(0), bucketIndex(0) {}
     };
 
     // map of txids to information about that transaction
     std::map<uint256, TxStatsInfo> mapMemPoolTxs;
 
     /** Classes to track historical data on transaction confirmations */
-    TxConfirmStats feeStats, priStats;
-
-    /** Breakpoints to help determine whether a transaction was confirmed by priority or Fee */
-    CFeeRate feeLikely, feeUnlikely;
-    double priLikely, priUnlikely;
+    TxConfirmStats feeStats;
 };
 
 class FeeFilterRounder
diff --git a/src/rpc/mining.cpp b/src/rpc/mining.cpp
index be0776ea22b76..f418262f020a1 100644
--- a/src/rpc/mining.cpp
+++ b/src/rpc/mining.cpp
@@ -810,7 +810,7 @@ UniValue estimatepriority(const JSONRPCRequest& request)
     if (request.fHelp || request.params.size() != 1)
         throw runtime_error(
             "estimatepriority nblocks\n"
-            "\nEstimates the approximate priority a zero-fee transaction needs to begin\n"
+            "\nDEPRECATED. Estimates the approximate priority a zero-fee transaction needs to begin\n"
             "confirmation within nblocks blocks.\n"
             "\nArguments:\n"
             "1. nblocks     (numeric)\n"
@@ -873,7 +873,7 @@ UniValue estimatesmartpriority(const JSONRPCRequest& request)
     if (request.fHelp || request.params.size() != 1)
         throw runtime_error(
             "estimatesmartpriority nblocks\n"
-            "\nWARNING: This interface is unstable and may disappear or change!\n"
+            "\nDEPRECATED. WARNING: This interface is unstable and may disappear or change!\n"
             "\nEstimates the approximate priority a zero-fee transaction needs to begin\n"
             "confirmation within nblocks blocks if possible and return the number of blocks\n"
             "for which the estimate is valid.\n"
diff --git a/src/test/policyestimator_tests.cpp b/src/test/policyestimator_tests.cpp
index f57c24270c112..38aaaba26723b 100644
--- a/src/test/policyestimator_tests.cpp
+++ b/src/test/policyestimator_tests.cpp
@@ -19,26 +19,18 @@ BOOST_AUTO_TEST_CASE(BlockPolicyEstimates)
     CTxMemPool mpool(CFeeRate(1000));
     TestMemPoolEntryHelper entry;
     CAmount basefee(2000);
-    double basepri = 1e6;
     CAmount deltaFee(100);
-    double deltaPri=5e5;
-    std::vector<CAmount> feeV[2];
-    std::vector<double> priV[2];
+    std::vector<CAmount> feeV;
 
-    // Populate vectors of increasing fees or priorities
+    // Populate vectors of increasing fees
     for (int j = 0; j < 10; j++) {
-        //V[0] is for fee transactions
-        feeV[0].push_back(basefee * (j+1));
-        priV[0].push_back(0);
-        //V[1] is for priority transactions
-        feeV[1].push_back(CAmount(0));
-        priV[1].push_back(basepri * pow(10, j+1));
+        feeV.push_back(basefee * (j+1));
     }
 
     // Store the hashes of transactions that have been
-    // added to the mempool by their associate fee/pri
+    // added to the mempool by their associate fee
     // txHashes[j] is populated with transactions either of
-    // fee = basefee * (j+1)  OR  pri = 10^6 * 10^(j+1)
+    // fee = basefee * (j+1)
     std::vector<uint256> txHashes[10];
 
     // Create a transaction template
@@ -60,19 +52,19 @@ BOOST_AUTO_TEST_CASE(BlockPolicyEstimates)
     // At a decay .998 and 4 fee transactions per block
     // This makes the tx count about 1.33 per bucket, above the 1 threshold
     while (blocknum < 200) {
-        for (int j = 0; j < 10; j++) { // For each fee/pri multiple
-            for (int k = 0; k < 5; k++) { // add 4 fee txs for every priority tx
+        for (int j = 0; j < 10; j++) { // For each fee
+            for (int k = 0; k < 4; k++) { // add 4 fee txs
                 tx.vin[0].prevout.n = 10000*blocknum+100*j+k; // make transaction unique
                 uint256 hash = tx.GetHash();
-                mpool.addUnchecked(hash, entry.Fee(feeV[k/4][j]).Time(GetTime()).Priority(priV[k/4][j]).Height(blocknum).FromTx(tx, &mpool));
+                mpool.addUnchecked(hash, entry.Fee(feeV[j]).Time(GetTime()).Priority(0).Height(blocknum).FromTx(tx, &mpool));
                 txHashes[j].push_back(hash);
             }
         }
-        //Create blocks where higher fee/pri txs are included more often
+        //Create blocks where higher fee txs are included more often
         for (int h = 0; h <= blocknum%10; h++) {
-            // 10/10 blocks add highest fee/pri transactions
+            // 10/10 blocks add highest fee transactions
             // 9/10 blocks add 2nd highest and so on until ...
-            // 1/10 blocks add lowest fee/pri transactions
+            // 1/10 blocks add lowest fee transactions
             while (txHashes[9-h].size()) {
                 std::shared_ptr<const CTransaction> ptx = mpool.get(txHashes[9-h].back());
                 if (ptx)
@@ -100,7 +92,6 @@ BOOST_AUTO_TEST_CASE(BlockPolicyEstimates)
     }
 
     std::vector<CAmount> origFeeEst;
-    std::vector<double> origPriEst;
     // Highest feerate is 10*baseRate and gets in all blocks,
     // second highest feerate is 9*baseRate and gets in 9/10 blocks = 90%,
     // third highest feerate is 8*base rate, and gets in 8/10 blocks = 80%,
@@ -109,16 +100,12 @@ BOOST_AUTO_TEST_CASE(BlockPolicyEstimates)
     // so estimateFee(2) should return 9*baseRate etc...
     for (int i = 1; i < 10;i++) {
         origFeeEst.push_back(mpool.estimateFee(i).GetFeePerK());
-        origPriEst.push_back(mpool.estimatePriority(i));
         if (i > 1) { // Fee estimates should be monotonically decreasing
             BOOST_CHECK(origFeeEst[i-1] <= origFeeEst[i-2]);
-            BOOST_CHECK(origPriEst[i-1] <= origPriEst[i-2]);
         }
         int mult = 11-i;
         BOOST_CHECK(origFeeEst[i-1] < mult*baseRate.GetFeePerK() + deltaFee);
         BOOST_CHECK(origFeeEst[i-1] > mult*baseRate.GetFeePerK() - deltaFee);
-        BOOST_CHECK(origPriEst[i-1] < pow(10,mult) * basepri + deltaPri);
-        BOOST_CHECK(origPriEst[i-1] > pow(10,mult) * basepri - deltaPri);
     }
 
     // Mine 50 more blocks with no transactions happening, estimates shouldn't change
@@ -129,19 +116,17 @@ BOOST_AUTO_TEST_CASE(BlockPolicyEstimates)
     for (int i = 1; i < 10;i++) {
         BOOST_CHECK(mpool.estimateFee(i).GetFeePerK() < origFeeEst[i-1] + deltaFee);
         BOOST_CHECK(mpool.estimateFee(i).GetFeePerK() > origFeeEst[i-1] - deltaFee);
-        BOOST_CHECK(mpool.estimatePriority(i) < origPriEst[i-1] + deltaPri);
-        BOOST_CHECK(mpool.estimatePriority(i) > origPriEst[i-1] - deltaPri);
     }
 
 
     // Mine 15 more blocks with lots of transactions happening and not getting mined
     // Estimates should go up
     while (blocknum < 265) {
-        for (int j = 0; j < 10; j++) { // For each fee/pri multiple
-            for (int k = 0; k < 5; k++) { // add 4 fee txs for every priority tx
+        for (int j = 0; j < 10; j++) { // For each fee multiple
+            for (int k = 0; k < 4; k++) { // add 4 fee txs
                 tx.vin[0].prevout.n = 10000*blocknum+100*j+k;
                 uint256 hash = tx.GetHash();
-                mpool.addUnchecked(hash, entry.Fee(feeV[k/4][j]).Time(GetTime()).Priority(priV[k/4][j]).Height(blocknum).FromTx(tx, &mpool));
+                mpool.addUnchecked(hash, entry.Fee(feeV[j]).Time(GetTime()).Priority(0).Height(blocknum).FromTx(tx, &mpool));
                 txHashes[j].push_back(hash);
             }
         }
@@ -152,8 +137,6 @@ BOOST_AUTO_TEST_CASE(BlockPolicyEstimates)
     for (int i = 1; i < 10;i++) {
         BOOST_CHECK(mpool.estimateFee(i) == CFeeRate(0) || mpool.estimateFee(i).GetFeePerK() > origFeeEst[i-1] - deltaFee);
         BOOST_CHECK(mpool.estimateSmartFee(i, &answerFound).GetFeePerK() > origFeeEst[answerFound-1] - deltaFee);
-        BOOST_CHECK(mpool.estimatePriority(i) == -1 || mpool.estimatePriority(i) > origPriEst[i-1] - deltaPri);
-        BOOST_CHECK(mpool.estimateSmartPriority(i, &answerFound) > origPriEst[answerFound-1] - deltaPri);
     }
 
     // Mine all those transactions
@@ -170,20 +153,20 @@ BOOST_AUTO_TEST_CASE(BlockPolicyEstimates)
     block.clear();
     for (int i = 1; i < 10;i++) {
         BOOST_CHECK(mpool.estimateFee(i).GetFeePerK() > origFeeEst[i-1] - deltaFee);
-        BOOST_CHECK(mpool.estimatePriority(i) > origPriEst[i-1] - deltaPri);
     }
 
     // Mine 200 more blocks where everything is mined every block
     // Estimates should be below original estimates
     while (blocknum < 465) {
-        for (int j = 0; j < 10; j++) { // For each fee/pri multiple
-            for (int k = 0; k < 5; k++) { // add 4 fee txs for every priority tx
+        for (int j = 0; j < 10; j++) { // For each fee multiple
+            for (int k = 0; k < 4; k++) { // add 4 fee txs
                 tx.vin[0].prevout.n = 10000*blocknum+100*j+k;
                 uint256 hash = tx.GetHash();
-                mpool.addUnchecked(hash, entry.Fee(feeV[k/4][j]).Time(GetTime()).Priority(priV[k/4][j]).Height(blocknum).FromTx(tx, &mpool));
+                mpool.addUnchecked(hash, entry.Fee(feeV[j]).Time(GetTime()).Priority(0).Height(blocknum).FromTx(tx, &mpool));
                 std::shared_ptr<const CTransaction> ptx = mpool.get(hash);
                 if (ptx)
                     block.push_back(*ptx);
+
             }
         }
         mpool.removeForBlock(block, ++blocknum);
@@ -191,15 +174,14 @@ BOOST_AUTO_TEST_CASE(BlockPolicyEstimates)
     }
     for (int i = 1; i < 10; i++) {
         BOOST_CHECK(mpool.estimateFee(i).GetFeePerK() < origFeeEst[i-1] - deltaFee);
-        BOOST_CHECK(mpool.estimatePriority(i) < origPriEst[i-1] - deltaPri);
     }
 
     // Test that if the mempool is limited, estimateSmartFee won't return a value below the mempool min fee
     // and that estimateSmartPriority returns essentially an infinite value
-    mpool.addUnchecked(tx.GetHash(),  entry.Fee(feeV[0][5]).Time(GetTime()).Priority(priV[1][5]).Height(blocknum).FromTx(tx, &mpool));
-    // evict that transaction which should set a mempool min fee of minRelayTxFee + feeV[0][5]
+    mpool.addUnchecked(tx.GetHash(),  entry.Fee(feeV[5]).Time(GetTime()).Priority(0).Height(blocknum).FromTx(tx, &mpool));
+    // evict that transaction which should set a mempool min fee of minRelayTxFee + feeV[5]
     mpool.TrimToSize(1);
-    BOOST_CHECK(mpool.GetMinFee(1).GetFeePerK() > feeV[0][5]);
+    BOOST_CHECK(mpool.GetMinFee(1).GetFeePerK() > feeV[5]);
     for (int i = 1; i < 10; i++) {
         BOOST_CHECK(mpool.estimateSmartFee(i).GetFeePerK() >= mpool.estimateFee(i).GetFeePerK());
         BOOST_CHECK(mpool.estimateSmartFee(i).GetFeePerK() >= mpool.GetMinFee(1).GetFeePerK());
diff --git a/src/txmempool.cpp b/src/txmempool.cpp
index 313d33507f329..45135a5f7347c 100644
--- a/src/txmempool.cpp
+++ b/src/txmempool.cpp
@@ -895,7 +895,7 @@ CTxMemPool::WriteFeeEstimates(CAutoFile& fileout) const
 {
     try {
         LOCK(cs);
-        fileout << 109900; // version required to read: 0.10.99 or later
+        fileout << 139900; // version required to read: 0.13.99 or later
         fileout << CLIENT_VERSION; // version that wrote the file
         minerPolicyEstimator->Write(fileout);
     }
@@ -914,9 +914,8 @@ CTxMemPool::ReadFeeEstimates(CAutoFile& filein)
         filein >> nVersionRequired >> nVersionThatWrote;
         if (nVersionRequired > CLIENT_VERSION)
             return error("CTxMemPool::ReadFeeEstimates(): up-version (%d) fee estimate file", nVersionRequired);
-
         LOCK(cs);
-        minerPolicyEstimator->Read(filein);
+        minerPolicyEstimator->Read(filein, nVersionThatWrote);
     }
     catch (const std::exception&) {
         LogPrintf("CTxMemPool::ReadFeeEstimates(): unable to read policy estimator data (non-fatal)\n");

From 0bd581ae8df941c769194becf190393b288cfca3 Mon Sep 17 00:00:00 2001
From: Alex Morcos <morcos@chaincode.com>
Date: Fri, 4 Nov 2016 12:03:35 -0400
Subject: [PATCH 1158/1802] add release notes for removal of priority
 estimation

---
 doc/release-notes.md | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/doc/release-notes.md b/doc/release-notes.md
index 0463cb8a613e2..f511fee22ea46 100644
--- a/doc/release-notes.md
+++ b/doc/release-notes.md
@@ -48,6 +48,15 @@ Low-level RPC changes
   an optional third arg, which was always ignored. Make sure to never pass more
   than two arguments.
 
+Removal of Priority Estimation
+------------------------------
+
+- Estimation of "priority" needed for a transaction to be included within a target
+  number of blocks has been removed.  The rpc calls are deprecated and will either
+  return -1 or 1e24 appropriately. The format for fee_estimates.dat has also
+  changed to no longer save these priority estimates. It will automatically be
+  converted to the new format which is not readable by prior versions of the
+  software.
 
 0.14.0 Change log
 =================

From fa8278e845b6a80164e13a39f917a101fe14b10d Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Mon, 7 Nov 2016 15:04:57 +0100
Subject: [PATCH 1159/1802] test: Fix test_random includes

---
 src/Makefile.test.include      | 1 +
 src/test/coins_tests.cpp       | 2 +-
 src/test/crypto_tests.cpp      | 2 +-
 src/test/merkle_tests.cpp      | 2 +-
 src/test/pmt_tests.cpp         | 2 +-
 src/test/prevector_tests.cpp   | 2 +-
 src/test/sighash_tests.cpp     | 2 +-
 src/test/skiplist_tests.cpp    | 2 +-
 src/test/util_tests.cpp        | 2 +-
 src/test/versionbits_tests.cpp | 2 +-
 10 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/Makefile.test.include b/src/Makefile.test.include
index 4e4cca14caf03..fa610e300c99b 100644
--- a/src/Makefile.test.include
+++ b/src/Makefile.test.include
@@ -84,6 +84,7 @@ BITCOIN_TESTS =\
   test/streams_tests.cpp \
   test/test_bitcoin.cpp \
   test/test_bitcoin.h \
+  test/test_random.h \
   test/testutil.cpp \
   test/testutil.h \
   test/timedata_tests.cpp \
diff --git a/src/test/coins_tests.cpp b/src/test/coins_tests.cpp
index b487686136aaf..82de302053d41 100644
--- a/src/test/coins_tests.cpp
+++ b/src/test/coins_tests.cpp
@@ -3,11 +3,11 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include "coins.h"
-#include "test_random.h"
 #include "script/standard.h"
 #include "uint256.h"
 #include "utilstrencodings.h"
 #include "test/test_bitcoin.h"
+#include "test/test_random.h"
 #include "main.h"
 #include "consensus/validation.h"
 
diff --git a/src/test/crypto_tests.cpp b/src/test/crypto_tests.cpp
index c7b4fb240c20e..7dcd548edfc0c 100644
--- a/src/test/crypto_tests.cpp
+++ b/src/test/crypto_tests.cpp
@@ -9,9 +9,9 @@
 #include "crypto/sha512.h"
 #include "crypto/hmac_sha256.h"
 #include "crypto/hmac_sha512.h"
-#include "test_random.h"
 #include "utilstrencodings.h"
 #include "test/test_bitcoin.h"
+#include "test/test_random.h"
 
 #include <vector>
 
diff --git a/src/test/merkle_tests.cpp b/src/test/merkle_tests.cpp
index 66ca381ea7023..706d30f489da4 100644
--- a/src/test/merkle_tests.cpp
+++ b/src/test/merkle_tests.cpp
@@ -4,7 +4,7 @@
 
 #include "consensus/merkle.h"
 #include "test/test_bitcoin.h"
-#include "test_random.h"
+#include "test/test_random.h"
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/src/test/pmt_tests.cpp b/src/test/pmt_tests.cpp
index b7f83d38f0b84..c7731296408c1 100644
--- a/src/test/pmt_tests.cpp
+++ b/src/test/pmt_tests.cpp
@@ -9,8 +9,8 @@
 #include "uint256.h"
 #include "arith_uint256.h"
 #include "version.h"
-#include "test_random.h"
 #include "test/test_bitcoin.h"
+#include "test/test_random.h"
 
 #include <vector>
 
diff --git a/src/test/prevector_tests.cpp b/src/test/prevector_tests.cpp
index 6cad02e738627..1e5de2021c9de 100644
--- a/src/test/prevector_tests.cpp
+++ b/src/test/prevector_tests.cpp
@@ -4,12 +4,12 @@
 
 #include <vector>
 #include "prevector.h"
-#include "test_random.h"
 
 #include "serialize.h"
 #include "streams.h"
 
 #include "test/test_bitcoin.h"
+#include "test/test_random.h"
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/src/test/sighash_tests.cpp b/src/test/sighash_tests.cpp
index 0b1050d020cc5..3bc8341b024e7 100644
--- a/src/test/sighash_tests.cpp
+++ b/src/test/sighash_tests.cpp
@@ -6,12 +6,12 @@
 #include "data/sighash.json.h"
 #include "hash.h"
 #include "main.h" // For CheckTransaction
-#include "test_random.h"
 #include "script/interpreter.h"
 #include "script/script.h"
 #include "serialize.h"
 #include "streams.h"
 #include "test/test_bitcoin.h"
+#include "test/test_random.h"
 #include "util.h"
 #include "utilstrencodings.h"
 #include "version.h"
diff --git a/src/test/skiplist_tests.cpp b/src/test/skiplist_tests.cpp
index b19f8fbffb33b..d6835df71f792 100644
--- a/src/test/skiplist_tests.cpp
+++ b/src/test/skiplist_tests.cpp
@@ -3,9 +3,9 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include "chain.h"
-#include "test_random.h"
 #include "util.h"
 #include "test/test_bitcoin.h"
+#include "test/test_random.h"
 
 #include <vector>
 
diff --git a/src/test/util_tests.cpp b/src/test/util_tests.cpp
index 0f1c7ab2224b2..bad72ffc0fc5f 100644
--- a/src/test/util_tests.cpp
+++ b/src/test/util_tests.cpp
@@ -6,11 +6,11 @@
 
 #include "clientversion.h"
 #include "primitives/transaction.h"
-#include "test_random.h"
 #include "sync.h"
 #include "utilstrencodings.h"
 #include "utilmoneystr.h"
 #include "test/test_bitcoin.h"
+#include "test/test_random.h"
 
 #include <stdint.h>
 #include <vector>
diff --git a/src/test/versionbits_tests.cpp b/src/test/versionbits_tests.cpp
index 784e796998524..c05d593ed6971 100644
--- a/src/test/versionbits_tests.cpp
+++ b/src/test/versionbits_tests.cpp
@@ -3,9 +3,9 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include "chain.h"
-#include "test_random.h"
 #include "versionbits.h"
 #include "test/test_bitcoin.h"
+#include "test/test_random.h"
 #include "chainparams.h"
 #include "main.h"
 #include "consensus/params.h"

From 8463aaa63c5ac76421c4d2754ea9e17a31584c93 Mon Sep 17 00:00:00 2001
From: Russell Yanofsky <russ@yanofsky.org>
Date: Wed, 2 Nov 2016 09:46:55 -0400
Subject: [PATCH 1160/1802] [qa] Increase wallet-dump RPC timeout

Increase wallet-dump RPC timeout from 30 seconds to 1 minute. This avoids a
timeout error that seemed to happen regularly (around 50% of builds) on a
particular jenkins server during the first getnewaddress RPC call made by the
test.

The failing stack trace looked like:

    Unexpected exception caught during testing: timeout('timed out',)

    File ".../bitcoin/qa/rpc-tests/test_framework/test_framework.py", line 146, in main
      self.run_test()
    File ".../bitcoin/qa/rpc-tests/wallet-dump.py", line 73, in run_test
      addr = self.nodes[0].getnewaddress()
    File ".../bitcoin/qa/rpc-tests/test_framework/coverage.py", line 49, in __call__
      return_val = self.auth_service_proxy_instance.__call__(*args, **kwargs)
    File ".../bitcoin/qa/rpc-tests/test_framework/authproxy.py", line 145, in __call__
      response = self._request('POST', self.__url.path, postdata.encode('utf-8'))
    File ".../bitcoin/qa/rpc-tests/test_framework/authproxy.py", line 121, in _request
      return self._get_response()
    File ".../bitcoin/qa/rpc-tests/test_framework/authproxy.py", line 160, in _get_response
      http_response = self.__conn.getresponse()
    File "/usr/lib/python3.4/http/client.py", line 1171, in getresponse
      response.begin()
    File "/usr/lib/python3.4/http/client.py", line 351, in begin
      version, status, reason = self._read_status()
    File "/usr/lib/python3.4/http/client.py", line 313, in _read_status
      line = str(self.fp.readline(_MAXLINE + 1), "iso-8859-1")
    File "/usr/lib/python3.4/socket.py", line 374, in readinto
      return self._sock.recv_into(b)
---
 qa/rpc-tests/test_framework/util.py | 4 ++--
 qa/rpc-tests/wallet-dump.py         | 6 +++++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/qa/rpc-tests/test_framework/util.py b/qa/rpc-tests/test_framework/util.py
index c818af4bd7155..c0c2b3a6ef474 100644
--- a/qa/rpc-tests/test_framework/util.py
+++ b/qa/rpc-tests/test_framework/util.py
@@ -341,7 +341,7 @@ def start_node(i, dirname, extra_args=None, rpchost=None, timewait=None, binary=
 
     return proxy
 
-def start_nodes(num_nodes, dirname, extra_args=None, rpchost=None, binary=None):
+def start_nodes(num_nodes, dirname, extra_args=None, rpchost=None, timewait=None, binary=None):
     """
     Start multiple bitcoinds, return RPC connections to them
     """
@@ -350,7 +350,7 @@ def start_nodes(num_nodes, dirname, extra_args=None, rpchost=None, binary=None):
     rpcs = []
     try:
         for i in range(num_nodes):
-            rpcs.append(start_node(i, dirname, extra_args[i], rpchost, binary=binary[i]))
+            rpcs.append(start_node(i, dirname, extra_args[i], rpchost, timewait=timewait, binary=binary[i]))
     except: # If one node failed to start, stop the others
         stop_nodes(rpcs)
         raise
diff --git a/qa/rpc-tests/wallet-dump.py b/qa/rpc-tests/wallet-dump.py
index a37096a40ce94..c6dc2e3d10749 100755
--- a/qa/rpc-tests/wallet-dump.py
+++ b/qa/rpc-tests/wallet-dump.py
@@ -61,7 +61,11 @@ def __init__(self):
         self.extra_args = [["-keypool=90"]]
 
     def setup_network(self, split=False):
-        self.nodes = start_nodes(self.num_nodes, self.options.tmpdir, self.extra_args)
+        # Use 1 minute timeout because the initial getnewaddress RPC can take
+        # longer than the default 30 seconds due to an expensive
+        # CWallet::TopUpKeyPool call, and the encryptwallet RPC made later in
+        # the test often takes even longer.
+        self.nodes = start_nodes(self.num_nodes, self.options.tmpdir, self.extra_args, timewait=60)
 
     def run_test (self):
         tmpdir = self.options.tmpdir

From e89614b6abf28d7fe201c3db44a0df6e4db6de03 Mon Sep 17 00:00:00 2001
From: Russell Yanofsky <russ@yanofsky.org>
Date: Wed, 2 Nov 2016 15:08:54 -0400
Subject: [PATCH 1161/1802] [qa] Add more helpful RPC timeout message

Replace previous timeout('timed out',) exception with more detailed error.
---
 qa/rpc-tests/test_framework/authproxy.py | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/qa/rpc-tests/test_framework/authproxy.py b/qa/rpc-tests/test_framework/authproxy.py
index fd7f32b5c6353..dd183815da502 100644
--- a/qa/rpc-tests/test_framework/authproxy.py
+++ b/qa/rpc-tests/test_framework/authproxy.py
@@ -42,6 +42,7 @@
 import decimal
 import json
 import logging
+import socket
 try:
     import urllib.parse as urlparse
 except ImportError:
@@ -161,7 +162,15 @@ def _batch(self, rpc_call_list):
         return self._request('POST', self.__url.path, postdata.encode('utf-8'))
 
     def _get_response(self):
-        http_response = self.__conn.getresponse()
+        try:
+            http_response = self.__conn.getresponse()
+        except socket.timeout as e:
+            raise JSONRPCException({
+                'code': -344,
+                'message': '%r RPC took longer than %f seconds. Consider '
+                           'using larger timeout for calls that take '
+                           'longer to return.' % (self._service_name,
+                                                  self.__conn.timeout)})
         if http_response is None:
             raise JSONRPCException({
                 'code': -342, 'message': 'missing HTTP response from server'})

From 50e8a9ccd78c8c20c3eac6618da7293078446b58 Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Fri, 28 Oct 2016 16:53:00 -0700
Subject: [PATCH 1162/1802] Remove unused ReadVersion and WriteVersion

CDataStream and CAutoFile had a ReadVersion and WriteVersion method
that was never used. Remove them.
---
 src/streams.h | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/streams.h b/src/streams.h
index fa001c112accc..c66a996519d81 100644
--- a/src/streams.h
+++ b/src/streams.h
@@ -254,8 +254,6 @@ class CDataStream
     int GetType()                { return nType; }
     void SetVersion(int n)       { nVersion = n; }
     int GetVersion()             { return nVersion; }
-    void ReadVersion()           { *this >> nVersion; }
-    void WriteVersion()          { *this << nVersion; }
 
     CDataStream& read(char* pch, size_t nSize)
     {
@@ -434,8 +432,6 @@ class CAutoFile
     int GetType()                { return nType; }
     void SetVersion(int n)       { nVersion = n; }
     int GetVersion()             { return nVersion; }
-    void ReadVersion()           { *this >> nVersion; }
-    void WriteVersion()          { *this << nVersion; }
 
     CAutoFile& read(char* pch, size_t nSize)
     {

From c2c5d42f36f4440aaddc4a64974a52fdb07af08b Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Fri, 28 Oct 2016 21:55:12 -0700
Subject: [PATCH 1163/1802] Make streams' read and write return void

The stream implementations had two cascading layers (the upper one
with operator<< and operator>>, and a lower one with read and write).
The lower layer's functions are never cascaded (nor should they, as
they should only be used from the higher layer), so make them return
void instead.
---
 src/hash.h                      |  3 +--
 src/script/bitcoinconsensus.cpp |  3 +--
 src/serialize.h                 |  3 +--
 src/streams.h                   | 25 +++++++++----------------
 4 files changed, 12 insertions(+), 22 deletions(-)

diff --git a/src/hash.h b/src/hash.h
index db4e130ae7fec..88926ab31fec8 100644
--- a/src/hash.h
+++ b/src/hash.h
@@ -138,9 +138,8 @@ class CHashWriter
 
     CHashWriter(int nTypeIn, int nVersionIn) : nType(nTypeIn), nVersion(nVersionIn) {}
 
-    CHashWriter& write(const char *pch, size_t size) {
+    void write(const char *pch, size_t size) {
         ctx.Write((const unsigned char*)pch, size);
-        return (*this);
     }
 
     // invalidates the object
diff --git a/src/script/bitcoinconsensus.cpp b/src/script/bitcoinconsensus.cpp
index 1d0ca0c5acd82..4e2358d9a276b 100644
--- a/src/script/bitcoinconsensus.cpp
+++ b/src/script/bitcoinconsensus.cpp
@@ -23,7 +23,7 @@ class TxInputStream
     m_remaining(txToLen)
     {}
 
-    TxInputStream& read(char* pch, size_t nSize)
+    void read(char* pch, size_t nSize)
     {
         if (nSize > m_remaining)
             throw std::ios_base::failure(std::string(__func__) + ": end of data");
@@ -37,7 +37,6 @@ class TxInputStream
         memcpy(pch, m_data, nSize);
         m_remaining -= nSize;
         m_data += nSize;
-        return *this;
     }
 
     template<typename T>
diff --git a/src/serialize.h b/src/serialize.h
index 82870c45b3b0b..f8e82edf8b909 100644
--- a/src/serialize.h
+++ b/src/serialize.h
@@ -943,10 +943,9 @@ class CSizeComputer
 
     CSizeComputer(int nTypeIn, int nVersionIn) : nSize(0), nType(nTypeIn), nVersion(nVersionIn) {}
 
-    CSizeComputer& write(const char *psz, size_t nSize)
+    void write(const char *psz, size_t nSize)
     {
         this->nSize += nSize;
-        return *this;
     }
 
     template<typename T>
diff --git a/src/streams.h b/src/streams.h
index c66a996519d81..582443ab4f880 100644
--- a/src/streams.h
+++ b/src/streams.h
@@ -255,7 +255,7 @@ class CDataStream
     void SetVersion(int n)       { nVersion = n; }
     int GetVersion()             { return nVersion; }
 
-    CDataStream& read(char* pch, size_t nSize)
+    void read(char* pch, size_t nSize)
     {
         // Read from the beginning of the buffer
         unsigned int nReadPosNext = nReadPos + nSize;
@@ -268,14 +268,13 @@ class CDataStream
             memcpy(pch, &vch[nReadPos], nSize);
             nReadPos = 0;
             vch.clear();
-            return (*this);
+            return;
         }
         memcpy(pch, &vch[nReadPos], nSize);
         nReadPos = nReadPosNext;
-        return (*this);
     }
 
-    CDataStream& ignore(int nSize)
+    void ignore(int nSize)
     {
         // Ignore from the beginning of the buffer
         if (nSize < 0) {
@@ -288,17 +287,15 @@ class CDataStream
                 throw std::ios_base::failure("CDataStream::ignore(): end of data");
             nReadPos = 0;
             vch.clear();
-            return (*this);
+            return;
         }
         nReadPos = nReadPosNext;
-        return (*this);
     }
 
-    CDataStream& write(const char* pch, size_t nSize)
+    void write(const char* pch, size_t nSize)
     {
         // Write to the end of the buffer
         vch.insert(vch.end(), pch, pch + nSize);
-        return (*this);
     }
 
     template<typename Stream>
@@ -433,16 +430,15 @@ class CAutoFile
     void SetVersion(int n)       { nVersion = n; }
     int GetVersion()             { return nVersion; }
 
-    CAutoFile& read(char* pch, size_t nSize)
+    void read(char* pch, size_t nSize)
     {
         if (!file)
             throw std::ios_base::failure("CAutoFile::read: file handle is NULL");
         if (fread(pch, 1, nSize, file) != nSize)
             throw std::ios_base::failure(feof(file) ? "CAutoFile::read: end of file" : "CAutoFile::read: fread failed");
-        return (*this);
     }
 
-    CAutoFile& ignore(size_t nSize)
+    void ignore(size_t nSize)
     {
         if (!file)
             throw std::ios_base::failure("CAutoFile::ignore: file handle is NULL");
@@ -453,16 +449,14 @@ class CAutoFile
                 throw std::ios_base::failure(feof(file) ? "CAutoFile::ignore: end of file" : "CAutoFile::read: fread failed");
             nSize -= nNow;
         }
-        return (*this);
     }
 
-    CAutoFile& write(const char* pch, size_t nSize)
+    void write(const char* pch, size_t nSize)
     {
         if (!file)
             throw std::ios_base::failure("CAutoFile::write: file handle is NULL");
         if (fwrite(pch, 1, nSize, file) != nSize)
             throw std::ios_base::failure("CAutoFile::write: write failed");
-        return (*this);
     }
 
     template<typename T>
@@ -563,7 +557,7 @@ class CBufferedFile
     }
 
     // read a number of bytes
-    CBufferedFile& read(char *pch, size_t nSize) {
+    void read(char *pch, size_t nSize) {
         if (nSize + nReadPos > nReadLimit)
             throw std::ios_base::failure("Read attempted past buffer limit");
         if (nSize + nRewind > vchBuf.size())
@@ -582,7 +576,6 @@ class CBufferedFile
             pch += nNow;
             nSize -= nNow;
         }
-        return (*this);
     }
 
     // return the current reading position

From fac1141600e15216aea96da5ec0c257d89fcaa00 Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Mon, 7 Nov 2016 19:24:32 +0100
Subject: [PATCH 1164/1802] [qa] preciousblock: Use assert_equal and
 BitcoinTestFramework.__init__

---
 qa/rpc-tests/preciousblock.py | 65 ++++++++++++++++++-----------------
 1 file changed, 34 insertions(+), 31 deletions(-)

diff --git a/qa/rpc-tests/preciousblock.py b/qa/rpc-tests/preciousblock.py
index 854dcc7251d1d..3cefa51c0a7f0 100755
--- a/qa/rpc-tests/preciousblock.py
+++ b/qa/rpc-tests/preciousblock.py
@@ -8,7 +8,12 @@
 #
 
 from test_framework.test_framework import BitcoinTestFramework
-from test_framework.util import *
+from test_framework.util import (
+    assert_equal,
+    connect_nodes_bi,
+    sync_chain,
+    sync_blocks,
+)
 
 def unidirectional_node_sync_via_rpc(node_src, node_dest):
     blocks_to_copy = []
@@ -33,84 +38,82 @@ def node_sync_via_rpc(nodes):
             unidirectional_node_sync_via_rpc(node_src, node_dest)
 
 class PreciousTest(BitcoinTestFramework):
-    def setup_chain(self):
-        print("Initializing test directory "+self.options.tmpdir)
-        initialize_chain_clean(self.options.tmpdir, 3)
+    def __init__(self):
+        super().__init__()
+        self.setup_clean_chain = True
+        self.num_nodes = 3
+        self.extra_args = [["-debug"]] * self.num_nodes
 
     def setup_network(self):
-        self.nodes = []
-        self.is_network_split = False
-        self.nodes.append(start_node(0, self.options.tmpdir, ["-debug"]))
-        self.nodes.append(start_node(1, self.options.tmpdir, ["-debug"]))
-        self.nodes.append(start_node(2, self.options.tmpdir, ["-debug"]))
+        self.nodes = self.setup_nodes()
 
     def run_test(self):
         print("Ensure submitblock can in principle reorg to a competing chain")
         self.nodes[0].generate(1)
-        assert(self.nodes[0].getblockcount() == 1)
+        assert_equal(self.nodes[0].getblockcount(), 1)
         (hashY, hashZ) = self.nodes[1].generate(2)
-        assert(self.nodes[1].getblockcount() == 2)
+        assert_equal(self.nodes[1].getblockcount(), 2)
         node_sync_via_rpc(self.nodes[0:3])
-        assert(self.nodes[0].getbestblockhash() == hashZ)
+        assert_equal(self.nodes[0].getbestblockhash(), hashZ)
 
         print("Mine blocks A-B-C on Node 0")
         (hashA, hashB, hashC) = self.nodes[0].generate(3)
-        assert(self.nodes[0].getblockcount() == 5)
+        assert_equal(self.nodes[0].getblockcount(), 5)
         print("Mine competing blocks E-F-G on Node 1")
         (hashE, hashF, hashG) = self.nodes[1].generate(3)
-        assert(self.nodes[1].getblockcount() == 5)
+        assert_equal(self.nodes[1].getblockcount(), 5)
         assert(hashC != hashG)
         print("Connect nodes and check no reorg occurs")
         # Submit competing blocks via RPC so any reorg should occur before we proceed (no way to wait on inaction for p2p sync)
         node_sync_via_rpc(self.nodes[0:2])
         connect_nodes_bi(self.nodes,0,1)
-        assert(self.nodes[0].getbestblockhash() == hashC)
-        assert(self.nodes[1].getbestblockhash() == hashG)
+        assert_equal(self.nodes[0].getbestblockhash(), hashC)
+        assert_equal(self.nodes[1].getbestblockhash(), hashG)
         print("Make Node0 prefer block G")
         self.nodes[0].preciousblock(hashG)
-        assert(self.nodes[0].getbestblockhash() == hashG)
+        assert_equal(self.nodes[0].getbestblockhash(), hashG)
         print("Make Node0 prefer block C again")
         self.nodes[0].preciousblock(hashC)
-        assert(self.nodes[0].getbestblockhash() == hashC)
+        assert_equal(self.nodes[0].getbestblockhash(), hashC)
         print("Make Node1 prefer block C")
         self.nodes[1].preciousblock(hashC)
         sync_chain(self.nodes[0:2]) # wait because node 1 may not have downloaded hashC
-        assert(self.nodes[1].getbestblockhash() == hashC)
+        assert_equal(self.nodes[1].getbestblockhash(), hashC)
         print("Make Node1 prefer block G again")
         self.nodes[1].preciousblock(hashG)
-        assert(self.nodes[1].getbestblockhash() == hashG)
+        assert_equal(self.nodes[1].getbestblockhash(), hashG)
         print("Make Node0 prefer block G again")
         self.nodes[0].preciousblock(hashG)
-        assert(self.nodes[0].getbestblockhash() == hashG)
+        assert_equal(self.nodes[0].getbestblockhash(), hashG)
         print("Make Node1 prefer block C again")
         self.nodes[1].preciousblock(hashC)
-        assert(self.nodes[1].getbestblockhash() == hashC)
+        assert_equal(self.nodes[1].getbestblockhash(), hashC)
         print("Mine another block (E-F-G-)H on Node 0 and reorg Node 1")
         self.nodes[0].generate(1)
-        assert(self.nodes[0].getblockcount() == 6)
+        assert_equal(self.nodes[0].getblockcount(), 6)
         sync_blocks(self.nodes[0:2])
         hashH = self.nodes[0].getbestblockhash()
-        assert(self.nodes[1].getbestblockhash() == hashH)
+        assert_equal(self.nodes[1].getbestblockhash(), hashH)
         print("Node1 should not be able to prefer block C anymore")
         self.nodes[1].preciousblock(hashC)
-        assert(self.nodes[1].getbestblockhash() == hashH)
+        assert_equal(self.nodes[1].getbestblockhash(), hashH)
         print("Mine competing blocks I-J-K-L on Node 2")
         self.nodes[2].generate(4)
-        assert(self.nodes[2].getblockcount() == 6)
+        assert_equal(self.nodes[2].getblockcount(), 6)
         hashL = self.nodes[2].getbestblockhash()
         print("Connect nodes and check no reorg occurs")
         node_sync_via_rpc(self.nodes[0:3])
         connect_nodes_bi(self.nodes,1,2)
         connect_nodes_bi(self.nodes,0,2)
-        assert(self.nodes[0].getbestblockhash() == hashH)
-        assert(self.nodes[1].getbestblockhash() == hashH)
-        assert(self.nodes[2].getbestblockhash() == hashL)
+        assert_equal(self.nodes[0].getbestblockhash(), hashH)
+        assert_equal(self.nodes[1].getbestblockhash(), hashH)
+        assert_equal(self.nodes[2].getbestblockhash(), hashL)
         print("Make Node1 prefer block L")
         self.nodes[1].preciousblock(hashL)
-        assert(self.nodes[1].getbestblockhash() == hashL)
+        assert_equal(self.nodes[1].getbestblockhash(), hashL)
         print("Make Node2 prefer block H")
         self.nodes[2].preciousblock(hashH)
-        assert(self.nodes[2].getbestblockhash() == hashH)
+        assert_equal(self.nodes[2].getbestblockhash(), hashH)
 
 if __name__ == '__main__':
     PreciousTest().main()

From 4441018d0860fce64ee74fa78da79bbb21114ca9 Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@dash.org>
Date: Mon, 7 Nov 2016 21:31:38 +0300
Subject: [PATCH 1165/1802] Every main()/exit() should return/use one of EXIT_
 codes instead of magic numbers

---
 src/bitcoind.cpp   |  4 ++--
 src/qt/bitcoin.cpp | 14 +++++++-------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/bitcoind.cpp b/src/bitcoind.cpp
index a0d039359445a..3352a76de6ca0 100644
--- a/src/bitcoind.cpp
+++ b/src/bitcoind.cpp
@@ -126,7 +126,7 @@ bool AppInit(int argc, char* argv[])
         if (fCommandLine)
         {
             fprintf(stderr, "Error: There is no RPC client functionality in bitcoind anymore. Use the bitcoin-cli utility instead.\n");
-            exit(1);
+            exit(EXIT_FAILURE);
         }
         if (GetBoolArg("-daemon", false))
         {
@@ -177,5 +177,5 @@ int main(int argc, char* argv[])
     // Connect bitcoind signal handlers
     noui_connect();
 
-    return (AppInit(argc, argv) ? 0 : 1);
+    return (AppInit(argc, argv) ? EXIT_SUCCESS : EXIT_FAILURE);
 }
diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp
index fb66ff00794ce..c828234f44262 100644
--- a/src/qt/bitcoin.cpp
+++ b/src/qt/bitcoin.cpp
@@ -496,7 +496,7 @@ void BitcoinApplication::shutdownResult(int retval)
 void BitcoinApplication::handleRunawayException(const QString &message)
 {
     QMessageBox::critical(0, "Runaway exception", BitcoinGUI::tr("A fatal error occurred. Bitcoin can no longer continue safely and will quit.") + QString("\n\n") + message);
-    ::exit(1);
+    ::exit(EXIT_FAILURE);
 }
 
 WId BitcoinApplication::getMainWinId() const
@@ -573,13 +573,13 @@ int main(int argc, char *argv[])
     {
         HelpMessageDialog help(NULL, mapArgs.count("-version"));
         help.showOrPrint();
-        return 0;
+        return EXIT_SUCCESS;
     }
 
     /// 5. Now that settings and translations are available, ask user for data directory
     // User language is set up: pick a data directory
     if (!Intro::pickDataDirectory())
-        return 0;
+        return EXIT_SUCCESS;
 
     /// 6. Determine availability of data directory and parse bitcoin.conf
     /// - Do not call GetDataDir(true) before this step finishes
@@ -587,14 +587,14 @@ int main(int argc, char *argv[])
     {
         QMessageBox::critical(0, QObject::tr(PACKAGE_NAME),
                               QObject::tr("Error: Specified data directory \"%1\" does not exist.").arg(QString::fromStdString(mapArgs["-datadir"])));
-        return 1;
+        return EXIT_FAILURE;
     }
     try {
         ReadConfigFile(GetArg("-conf", BITCOIN_CONF_FILENAME), mapArgs, mapMultiArgs);
     } catch (const std::exception& e) {
         QMessageBox::critical(0, QObject::tr(PACKAGE_NAME),
                               QObject::tr("Error: Cannot parse configuration file: %1. Only use key=value syntax.").arg(e.what()));
-        return 1;
+        return EXIT_FAILURE;
     }
 
     /// 7. Determine network (and switch to network specific options)
@@ -608,7 +608,7 @@ int main(int argc, char *argv[])
         SelectParams(ChainNameFromCommandLine());
     } catch(std::exception &e) {
         QMessageBox::critical(0, QObject::tr(PACKAGE_NAME), QObject::tr("Error: %1").arg(e.what()));
-        return 1;
+        return EXIT_FAILURE;
     }
 #ifdef ENABLE_WALLET
     // Parse URIs on command line -- this can affect Params()
@@ -630,7 +630,7 @@ int main(int argc, char *argv[])
     // - Do this after creating app and setting up translations, so errors are
     // translated properly.
     if (PaymentServer::ipcSendCommandLine())
-        exit(0);
+        exit(EXIT_SUCCESS);
 
     // Start up the payment server early, too, so impatient users that click on
     // bitcoin: links repeatedly have their payment requests routed to this process:

From dac53b58b555183ccc0d5e64c428528267cd98b3 Mon Sep 17 00:00:00 2001
From: Russell Yanofsky <russ@chaincode.com>
Date: Wed, 26 Oct 2016 14:53:18 -0400
Subject: [PATCH 1166/1802] Modify getblocktxn handler not to drop requests for
 old blocks

The current getblocktxn implementation drops and ignores requests for old
blocks, which causes occasional sync_block timeouts during the
p2p-compactblocks.py test as reported in
https://github.com/bitcoin/bitcoin/issues/8842.

The p2p-compactblocks.py test setup creates many new blocks in a short
period of time, which can lead to getblocktxn requests for blocks below the
hardcoded depth limit of 10 blocks. This commit changes the getblocktxn
handler not to ignore these requests, so the peer nodes in the test setup
will reliably be able to sync.

The protocol change is documented in BIP-152 update "Allow block responses
to getblocktxn requests" at https://github.com/bitcoin/bips/pull/469.

The protocol change is not expected to affect nodes running outside the test
environment, because there shouldn't normally be lots of new blocks being
rapidly added that need to be synced.
---
 qa/rpc-tests/p2p-compactblocks.py | 12 +++++++++---
 src/main.cpp                      | 12 ++++++++++++
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/qa/rpc-tests/p2p-compactblocks.py b/qa/rpc-tests/p2p-compactblocks.py
index 4b49dad03442c..ecd1e42169d02 100755
--- a/qa/rpc-tests/p2p-compactblocks.py
+++ b/qa/rpc-tests/p2p-compactblocks.py
@@ -589,8 +589,8 @@ def test_incorrect_blocktxn_response(self, node, test_node, version):
         assert_equal(int(node.getbestblockhash(), 16), block.sha256)
 
     def test_getblocktxn_handler(self, node, test_node, version):
-        # bitcoind won't respond for blocks whose height is more than 15 blocks
-        # deep.
+        # bitcoind will not send blocktxn responses for blocks whose height is
+        # more than 10 blocks deep.
         MAX_GETBLOCKTXN_DEPTH = 10
         chain_height = node.getblockcount()
         current_height = chain_height
@@ -623,11 +623,17 @@ def test_getblocktxn_handler(self, node, test_node, version):
                 test_node.last_blocktxn = None
             current_height -= 1
 
-        # Next request should be ignored, as we're past the allowed depth.
+        # Next request should send a full block response, as we're past the
+        # allowed depth for a blocktxn response.
         block_hash = node.getblockhash(current_height)
         msg.block_txn_request = BlockTransactionsRequest(int(block_hash, 16), [0])
+        with mininode_lock:
+            test_node.last_block = None
+            test_node.last_blocktxn = None
         test_node.send_and_ping(msg)
         with mininode_lock:
+            test_node.last_block.block.calc_sha256()
+            assert_equal(test_node.last_block.block.sha256, int(block_hash, 16))
             assert_equal(test_node.last_blocktxn, None)
 
     def test_compactblocks_not_at_tip(self, node, test_node):
diff --git a/src/main.cpp b/src/main.cpp
index 5e17ec6251ece..55e3d934ea6bb 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -5450,7 +5450,19 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
         }
 
         if (it->second->nHeight < chainActive.Height() - MAX_BLOCKTXN_DEPTH) {
+            // If an older block is requested (should never happen in practice,
+            // but can happen in tests) send a block response instead of a
+            // blocktxn response. Sending a full block response instead of a
+            // small blocktxn response is preferable in the case where a peer
+            // might maliciously send lots of getblocktxn requests to trigger
+            // expensive disk reads, because it will require the peer to
+            // actually receive all the data read from disk over the network.
             LogPrint("net", "Peer %d sent us a getblocktxn for a block > %i deep", pfrom->id, MAX_BLOCKTXN_DEPTH);
+            CInv vInv;
+            vInv.type = State(pfrom->GetId())->fWantsCmpctWitness ? MSG_WITNESS_BLOCK : MSG_BLOCK;
+            vInv.hash = req.blockhash;
+            pfrom->vRecvGetData.push_back(vInv);
+            ProcessGetData(pfrom, chainparams.GetConsensus(), connman);
             return true;
         }
 

From fa97ccb06d59f56d215004ee1aa7dd786fae9d6d Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Mon, 7 Nov 2016 19:52:41 +0100
Subject: [PATCH 1167/1802] [qa] util: Rework sync_*()

* Only allow named args in sync_*()
* Make sync_* fails more verbose
* Add timeout to sync_chain()
---
 qa/rpc-tests/smartfees.py           |  6 +++---
 qa/rpc-tests/test_framework/util.py | 32 +++++++++++++++--------------
 2 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/qa/rpc-tests/smartfees.py b/qa/rpc-tests/smartfees.py
index d76fba4b075ce..74a74f679a85d 100755
--- a/qa/rpc-tests/smartfees.py
+++ b/qa/rpc-tests/smartfees.py
@@ -225,9 +225,9 @@ def transact_and_mine(self, numblocks, mining_node):
                                                       self.memutxo, Decimal("0.005"), min_fee, min_fee)
                 tx_kbytes = (len(txhex) // 2) / 1000.0
                 self.fees_per_kb.append(float(fee)/tx_kbytes)
-            sync_mempools(self.nodes[0:3],.1)
+            sync_mempools(self.nodes[0:3], wait=.1)
             mined = mining_node.getblock(mining_node.generate(1)[0],True)["tx"]
-            sync_blocks(self.nodes[0:3],.1)
+            sync_blocks(self.nodes[0:3], wait=.1)
             # update which txouts are confirmed
             newmem = []
             for utx in self.memutxo:
@@ -259,7 +259,7 @@ def run_test(self):
         while len(self.nodes[1].getrawmempool()) > 0:
             self.nodes[1].generate(1)
 
-        sync_blocks(self.nodes[0:3],.1)
+        sync_blocks(self.nodes[0:3], wait=.1)
         print("Final estimates after emptying mempools")
         check_estimates(self.nodes[1], self.fees_per_kb, 2)
 
diff --git a/qa/rpc-tests/test_framework/util.py b/qa/rpc-tests/test_framework/util.py
index c0c2b3a6ef474..b5ef0689b47a1 100644
--- a/qa/rpc-tests/test_framework/util.py
+++ b/qa/rpc-tests/test_framework/util.py
@@ -121,33 +121,35 @@ def hex_str_to_bytes(hex_str):
 def str_to_b64str(string):
     return b64encode(string.encode('utf-8')).decode('ascii')
 
-def sync_blocks(rpc_connections, wait=1, timeout=60):
+def sync_blocks(rpc_connections, *, wait=1, timeout=60):
     """
     Wait until everybody has the same tip
     """
     maxheight = 0
     while timeout > 0:
-        tips = [ x.waitforblockheight(maxheight, int(wait * 1000)) for x in rpc_connections ]
-        heights = [ x["height"] for x in tips ]
-        if tips == [ tips[0] ]*len(tips):
-            return True
-        if heights == [ heights[0] ]*len(heights): #heights are the same but hashes are not
-            raise AssertionError("Block sync failed")
+        tips = [r.waitforblockheight(maxheight, int(wait * 1000)) for r in rpc_connections]
+        heights = [t["height"] for t in tips]
+        if tips == [tips[0]] * len(tips):
+            return
+        if heights == [heights[0]] * len(heights):
+            raise AssertionError("Block sync failed: (Hashes don't match)")
         timeout -= wait
         maxheight = max(heights)
-    raise AssertionError("Block sync failed")
+    raise AssertionError("Block sync failed with heights: {}".format(heights))
 
-def sync_chain(rpc_connections, wait=1):
+def sync_chain(rpc_connections, *, wait=1, timeout=60):
     """
     Wait until everybody has the same best block
     """
-    while True:
-        counts = [ x.getbestblockhash() for x in rpc_connections ]
-        if counts == [ counts[0] ]*len(counts):
-            break
+    while timeout > 0:
+        best_hash = [x.getbestblockhash() for x in rpc_connections]
+        if best_hash == [best_hash[0]]*len(best_hash):
+            return
         time.sleep(wait)
+        timeout -= wait
+    raise AssertionError("Chain sync failed: Best block hashes don't match")
 
-def sync_mempools(rpc_connections, wait=1, timeout=60):
+def sync_mempools(rpc_connections, *, wait=1, timeout=60):
     """
     Wait until everybody has the same transactions in their memory
     pools
@@ -159,7 +161,7 @@ def sync_mempools(rpc_connections, wait=1, timeout=60):
             if set(rpc_connections[i].getrawmempool()) == pool:
                 num_match = num_match+1
         if num_match == len(rpc_connections):
-            return True
+            return
         time.sleep(wait)
         timeout -= wait
     raise AssertionError("Mempool sync failed")

From fad9b66504f176ed3624515f3bf4d428cf687607 Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Fri, 28 Oct 2016 16:57:24 -0700
Subject: [PATCH 1168/1802] Make nType and nVersion private and sometimes const

Make the various stream implementations' nType and nVersion private
and const (except in CDataStream where we really need a setter).
---
 src/hash.h      |  4 ++--
 src/net.h       |  2 +-
 src/serialize.h |  4 ++--
 src/streams.h   | 34 +++++++++++++++-------------------
 4 files changed, 20 insertions(+), 24 deletions(-)

diff --git a/src/hash.h b/src/hash.h
index 88926ab31fec8..73e31580d22d7 100644
--- a/src/hash.h
+++ b/src/hash.h
@@ -132,9 +132,9 @@ class CHashWriter
 private:
     CHash256 ctx;
 
+    const int nType;
+    const int nVersion;
 public:
-    int nType;
-    int nVersion;
 
     CHashWriter(int nTypeIn, int nVersionIn) : nType(nTypeIn), nVersion(nVersionIn) {}
 
diff --git a/src/net.h b/src/net.h
index 22b80fc504cc8..4ceeec2f0ca9b 100644
--- a/src/net.h
+++ b/src/net.h
@@ -140,7 +140,7 @@ class CConnman
     void PushMessageWithVersionAndFlag(CNode* pnode, int nVersion, int flag, const std::string& sCommand, Args&&... args)
     {
         auto msg(BeginMessage(pnode, nVersion, flag, sCommand));
-        ::SerializeMany(msg, msg.nType, msg.nVersion, std::forward<Args>(args)...);
+        ::SerializeMany(msg, msg.GetType(), msg.GetVersion(), std::forward<Args>(args)...);
         EndMessage(msg);
         PushMessage(pnode, msg, sCommand);
     }
diff --git a/src/serialize.h b/src/serialize.h
index f8e82edf8b909..68a8e28477ee6 100644
--- a/src/serialize.h
+++ b/src/serialize.h
@@ -937,9 +937,9 @@ class CSizeComputer
 protected:
     size_t nSize;
 
+    const int nType;
+    const int nVersion;
 public:
-    int nType;
-    int nVersion;
 
     CSizeComputer(int nTypeIn, int nVersionIn) : nSize(0), nType(nTypeIn), nVersion(nVersionIn) {}
 
diff --git a/src/streams.h b/src/streams.h
index 582443ab4f880..12a36a4a70b02 100644
--- a/src/streams.h
+++ b/src/streams.h
@@ -26,10 +26,11 @@ template<typename Stream>
 class OverrideStream
 {
     Stream* stream;
-public:
+
     const int nType;
     const int nVersion;
 
+public:
     OverrideStream(Stream* stream_, int nType_, int nVersion_) : stream(stream_), nType(nType_), nVersion(nVersion_) {}
 
     template<typename T>
@@ -66,9 +67,10 @@ class CDataStream
     typedef CSerializeData vector_type;
     vector_type vch;
     unsigned int nReadPos;
-public:
+
     int nType;
     int nVersion;
+public:
 
     typedef vector_type::allocator_type   allocator_type;
     typedef vector_type::size_type        size_type;
@@ -251,9 +253,9 @@ class CDataStream
     int in_avail()               { return size(); }
 
     void SetType(int n)          { nType = n; }
-    int GetType()                { return nType; }
+    int GetType() const          { return nType; }
     void SetVersion(int n)       { nVersion = n; }
-    int GetVersion()             { return nVersion; }
+    int GetVersion() const       { return nVersion; }
 
     void read(char* pch, size_t nSize)
     {
@@ -380,17 +382,15 @@ class CAutoFile
     CAutoFile(const CAutoFile&);
     CAutoFile& operator=(const CAutoFile&);
 
-    int nType;
-    int nVersion;
-	
+    const int nType;
+    const int nVersion;
+
     FILE* file;	
 
 public:
-    CAutoFile(FILE* filenew, int nTypeIn, int nVersionIn)
+    CAutoFile(FILE* filenew, int nTypeIn, int nVersionIn) : nType(nTypeIn), nVersion(nVersionIn)
     {
         file = filenew;
-        nType = nTypeIn;
-        nVersion = nVersionIn;
     }
 
     ~CAutoFile()
@@ -425,10 +425,8 @@ class CAutoFile
     //
     // Stream subset
     //
-    void SetType(int n)          { nType = n; }
-    int GetType()                { return nType; }
-    void SetVersion(int n)       { nVersion = n; }
-    int GetVersion()             { return nVersion; }
+    int GetType() const          { return nType; }
+    int GetVersion() const       { return nVersion; }
 
     void read(char* pch, size_t nSize)
     {
@@ -500,8 +498,8 @@ class CBufferedFile
     CBufferedFile(const CBufferedFile&);
     CBufferedFile& operator=(const CBufferedFile&);
 
-    int nType;
-    int nVersion;
+    const int nType;
+    const int nVersion;
 
     FILE *src;            // source file
     uint64_t nSrcPos;     // how many bytes have been read from source
@@ -531,11 +529,9 @@ class CBufferedFile
 
 public:
     CBufferedFile(FILE *fileIn, uint64_t nBufSize, uint64_t nRewindIn, int nTypeIn, int nVersionIn) :
-        nSrcPos(0), nReadPos(0), nReadLimit((uint64_t)(-1)), nRewind(nRewindIn), vchBuf(nBufSize, 0)
+        nType(nTypeIn), nVersion(nVersionIn), nSrcPos(0), nReadPos(0), nReadLimit((uint64_t)(-1)), nRewind(nRewindIn), vchBuf(nBufSize, 0)
     {
         src = fileIn;
-        nType = nTypeIn;
-        nVersion = nVersionIn;
     }
 
     ~CBufferedFile()

From fae19aa1da0858678874815b344de83e1ee3a1bd Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Mon, 7 Nov 2016 23:00:54 +0100
Subject: [PATCH 1169/1802] [qa] test_framework: Exit when tmpdir exists

---
 qa/rpc-tests/test_framework/test_framework.py | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/qa/rpc-tests/test_framework/test_framework.py b/qa/rpc-tests/test_framework/test_framework.py
index e6fc5fd8a20e4..e6d3e9ab9a169 100755
--- a/qa/rpc-tests/test_framework/test_framework.py
+++ b/qa/rpc-tests/test_framework/test_framework.py
@@ -139,16 +139,11 @@ def main(self):
 
         success = False
         try:
-            if not os.path.isdir(self.options.tmpdir):
-                os.makedirs(self.options.tmpdir)
+            os.makedirs(self.options.tmpdir, exist_ok=False)
             self.setup_chain()
-
             self.setup_network()
-
             self.run_test()
-
             success = True
-
         except JSONRPCException as e:
             print("JSONRPC error: "+e.error['message'])
             traceback.print_tb(sys.exc_info()[2])

From 657e05ab2e87ff725723fe8a375fc3f8aad02126 Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Fri, 28 Oct 2016 16:51:33 -0700
Subject: [PATCH 1170/1802] Make GetSerializeSize a wrapper on top of
 CSizeComputer

Given that in default GetSerializeSize implementations created by
ADD_SERIALIZE_METHODS we're already using CSizeComputer(), get rid
of the specialized GetSerializeSize methods everywhere, and just use
CSizeComputer. This removes a lot of code which isn't actually used
anywhere.

For CCompactSize and CVarInt this actually removes a more efficient
size computing algorithm, which is brought back in a later commit.
---
 src/addrman.h                   |   5 --
 src/blockencodings.cpp          |   2 +-
 src/coins.h                     |  23 ------
 src/compressor.h                |   8 --
 src/dbwrapper.h                 |  12 +--
 src/main.cpp                    |   4 +-
 src/primitives/transaction.h    |   2 +-
 src/pubkey.h                    |   8 --
 src/script/bitcoinconsensus.cpp |   2 +-
 src/serialize.h                 | 138 +++-----------------------------
 src/streams.h                   |  14 ----
 src/test/uint256_tests.cpp      |   8 +-
 src/uint256.h                   |   5 --
 src/undo.h                      |   6 --
 14 files changed, 27 insertions(+), 210 deletions(-)

diff --git a/src/addrman.h b/src/addrman.h
index e9e137c978a7e..03b380165f339 100644
--- a/src/addrman.h
+++ b/src/addrman.h
@@ -448,11 +448,6 @@ class CAddrMan
         Check();
     }
 
-    unsigned int GetSerializeSize(int nType, int nVersion) const
-    {
-        return (CSizeComputer(nType, nVersion) << *this).size();
-    }
-
     void Clear()
     {
         std::vector<int>().swap(vRandom);
diff --git a/src/blockencodings.cpp b/src/blockencodings.cpp
index 93d3fa372b3c0..bde8463b337fd 100644
--- a/src/blockencodings.cpp
+++ b/src/blockencodings.cpp
@@ -131,7 +131,7 @@ ReadStatus PartiallyDownloadedBlock::InitData(const CBlockHeaderAndShortTxIDs& c
             break;
     }
 
-    LogPrint("cmpctblock", "Initialized PartiallyDownloadedBlock for block %s using a cmpctblock of size %lu\n", cmpctblock.header.GetHash().ToString(), cmpctblock.GetSerializeSize(SER_NETWORK, PROTOCOL_VERSION));
+    LogPrint("cmpctblock", "Initialized PartiallyDownloadedBlock for block %s using a cmpctblock of size %lu\n", cmpctblock.header.GetHash().ToString(), GetSerializeSize(cmpctblock, SER_NETWORK, PROTOCOL_VERSION));
 
     return READ_STATUS_OK;
 }
diff --git a/src/coins.h b/src/coins.h
index 033651a435c04..3e134cf675663 100644
--- a/src/coins.h
+++ b/src/coins.h
@@ -153,29 +153,6 @@ class CCoins
         return fCoinBase;
     }
 
-    unsigned int GetSerializeSize(int nType, int nVersion) const {
-        unsigned int nSize = 0;
-        unsigned int nMaskSize = 0, nMaskCode = 0;
-        CalcMaskSize(nMaskSize, nMaskCode);
-        bool fFirst = vout.size() > 0 && !vout[0].IsNull();
-        bool fSecond = vout.size() > 1 && !vout[1].IsNull();
-        assert(fFirst || fSecond || nMaskCode);
-        unsigned int nCode = 8*(nMaskCode - (fFirst || fSecond ? 0 : 1)) + (fCoinBase ? 1 : 0) + (fFirst ? 2 : 0) + (fSecond ? 4 : 0);
-        // version
-        nSize += ::GetSerializeSize(VARINT(this->nVersion), nType, nVersion);
-        // size of header code
-        nSize += ::GetSerializeSize(VARINT(nCode), nType, nVersion);
-        // spentness bitmask
-        nSize += nMaskSize;
-        // txouts themself
-        for (unsigned int i = 0; i < vout.size(); i++)
-            if (!vout[i].IsNull())
-                nSize += ::GetSerializeSize(CTxOutCompressor(REF(vout[i])), nType, nVersion);
-        // height
-        nSize += ::GetSerializeSize(VARINT(nHeight), nType, nVersion);
-        return nSize;
-    }
-
     template<typename Stream>
     void Serialize(Stream &s, int nType, int nVersion) const {
         unsigned int nMaskSize = 0, nMaskCode = 0;
diff --git a/src/compressor.h b/src/compressor.h
index fa702f0dfa900..90749499d10a1 100644
--- a/src/compressor.h
+++ b/src/compressor.h
@@ -55,14 +55,6 @@ class CScriptCompressor
 public:
     CScriptCompressor(CScript &scriptIn) : script(scriptIn) { }
 
-    unsigned int GetSerializeSize(int nType, int nVersion) const {
-        std::vector<unsigned char> compr;
-        if (Compress(compr))
-            return compr.size();
-        unsigned int nSize = script.size() + nSpecialScripts;
-        return script.size() + VARINT(nSize).GetSerializeSize(nType, nVersion);
-    }
-
     template<typename Stream>
     void Serialize(Stream &s, int nType, int nVersion) const {
         std::vector<unsigned char> compr;
diff --git a/src/dbwrapper.h b/src/dbwrapper.h
index 47bdb31b5b888..7728b49d93f0b 100644
--- a/src/dbwrapper.h
+++ b/src/dbwrapper.h
@@ -60,12 +60,12 @@ class CDBBatch
     void Write(const K& key, const V& value)
     {
         CDataStream ssKey(SER_DISK, CLIENT_VERSION);
-        ssKey.reserve(ssKey.GetSerializeSize(key));
+        ssKey.reserve(GetSerializeSize(ssKey, key));
         ssKey << key;
         leveldb::Slice slKey(&ssKey[0], ssKey.size());
 
         CDataStream ssValue(SER_DISK, CLIENT_VERSION);
-        ssValue.reserve(ssValue.GetSerializeSize(value));
+        ssValue.reserve(GetSerializeSize(ssValue, value));
         ssValue << value;
         ssValue.Xor(dbwrapper_private::GetObfuscateKey(parent));
         leveldb::Slice slValue(&ssValue[0], ssValue.size());
@@ -77,7 +77,7 @@ class CDBBatch
     void Erase(const K& key)
     {
         CDataStream ssKey(SER_DISK, CLIENT_VERSION);
-        ssKey.reserve(ssKey.GetSerializeSize(key));
+        ssKey.reserve(GetSerializeSize(ssKey, key));
         ssKey << key;
         leveldb::Slice slKey(&ssKey[0], ssKey.size());
 
@@ -107,7 +107,7 @@ class CDBIterator
 
     template<typename K> void Seek(const K& key) {
         CDataStream ssKey(SER_DISK, CLIENT_VERSION);
-        ssKey.reserve(ssKey.GetSerializeSize(key));
+        ssKey.reserve(GetSerializeSize(ssKey, key));
         ssKey << key;
         leveldb::Slice slKey(&ssKey[0], ssKey.size());
         piter->Seek(slKey);
@@ -200,7 +200,7 @@ class CDBWrapper
     bool Read(const K& key, V& value) const
     {
         CDataStream ssKey(SER_DISK, CLIENT_VERSION);
-        ssKey.reserve(ssKey.GetSerializeSize(key));
+        ssKey.reserve(GetSerializeSize(ssKey, key));
         ssKey << key;
         leveldb::Slice slKey(&ssKey[0], ssKey.size());
 
@@ -234,7 +234,7 @@ class CDBWrapper
     bool Exists(const K& key) const
     {
         CDataStream ssKey(SER_DISK, CLIENT_VERSION);
-        ssKey.reserve(ssKey.GetSerializeSize(key));
+        ssKey.reserve(GetSerializeSize(ssKey, key));
         ssKey << key;
         leveldb::Slice slKey(&ssKey[0], ssKey.size());
 
diff --git a/src/main.cpp b/src/main.cpp
index e0c614b731c48..13872c4bf20cb 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1710,7 +1710,7 @@ bool WriteBlockToDisk(const CBlock& block, CDiskBlockPos& pos, const CMessageHea
         return error("WriteBlockToDisk: OpenBlockFile failed");
 
     // Write index header
-    unsigned int nSize = fileout.GetSerializeSize(block);
+    unsigned int nSize = GetSerializeSize(fileout, block);
     fileout << FLATDATA(messageStart) << nSize;
 
     // Write block
@@ -2100,7 +2100,7 @@ bool UndoWriteToDisk(const CBlockUndo& blockundo, CDiskBlockPos& pos, const uint
         return error("%s: OpenUndoFile failed", __func__);
 
     // Write index header
-    unsigned int nSize = fileout.GetSerializeSize(blockundo);
+    unsigned int nSize = GetSerializeSize(fileout, blockundo);
     fileout << FLATDATA(messageStart) << nSize;
 
     // Write undo data
diff --git a/src/primitives/transaction.h b/src/primitives/transaction.h
index 1afeb8703903c..714ab34548a86 100644
--- a/src/primitives/transaction.h
+++ b/src/primitives/transaction.h
@@ -177,7 +177,7 @@ class CTxOut
         if (scriptPubKey.IsUnspendable())
             return 0;
 
-        size_t nSize = GetSerializeSize(SER_DISK, 0);
+        size_t nSize = GetSerializeSize(*this, SER_DISK, 0);
         int witnessversion = 0;
         std::vector<unsigned char> witnessprogram;
 
diff --git a/src/pubkey.h b/src/pubkey.h
index 3a554877f8000..3277218bb6b72 100644
--- a/src/pubkey.h
+++ b/src/pubkey.h
@@ -116,10 +116,6 @@ class CPubKey
     }
 
     //! Implement serialization, as if this was a byte vector.
-    unsigned int GetSerializeSize(int nType, int nVersion) const
-    {
-        return size() + 1;
-    }
     template <typename Stream>
     void Serialize(Stream& s, int nType, int nVersion) const
     {
@@ -214,10 +210,6 @@ struct CExtPubKey {
     void Decode(const unsigned char code[BIP32_EXTKEY_SIZE]);
     bool Derive(CExtPubKey& out, unsigned int nChild) const;
 
-    unsigned int GetSerializeSize(int nType, int nVersion) const
-    {
-        return BIP32_EXTKEY_SIZE+1; //add one byte for the size (compact int)
-    }
     template <typename Stream>
     void Serialize(Stream& s, int nType, int nVersion) const
     {
diff --git a/src/script/bitcoinconsensus.cpp b/src/script/bitcoinconsensus.cpp
index 4e2358d9a276b..ec573c3183238 100644
--- a/src/script/bitcoinconsensus.cpp
+++ b/src/script/bitcoinconsensus.cpp
@@ -87,7 +87,7 @@ static int verify_script(const unsigned char *scriptPubKey, unsigned int scriptP
         stream >> tx;
         if (nIn >= tx.vin.size())
             return set_error(err, bitcoinconsensus_ERR_TX_INDEX);
-        if (tx.GetSerializeSize(SER_NETWORK, PROTOCOL_VERSION) != txToLen)
+        if (GetSerializeSize(tx, SER_NETWORK, PROTOCOL_VERSION) != txToLen)
             return set_error(err, bitcoinconsensus_ERR_TX_SIZE_MISMATCH);
 
         // Regardless of the verification result, the tx did not error.
diff --git a/src/serialize.h b/src/serialize.h
index 68a8e28477ee6..80289a365ae6f 100644
--- a/src/serialize.h
+++ b/src/serialize.h
@@ -169,11 +169,6 @@ enum
  * added as members. 
  */
 #define ADD_SERIALIZE_METHODS                                                          \
-    size_t GetSerializeSize(int nType, int nVersion) const {                         \
-        CSizeComputer s(nType, nVersion);                                            \
-        NCONST_PTR(this)->SerializationOp(s, CSerActionSerialize(), nType, nVersion);\
-        return s.size();                                                             \
-    }                                                                                \
     template<typename Stream>                                                        \
     void Serialize(Stream& s, int nType, int nVersion) const {                       \
         NCONST_PTR(this)->SerializationOp(s, CSerActionSerialize(), nType, nVersion);\
@@ -186,18 +181,6 @@ enum
 /*
  * Basic Types
  */
-inline unsigned int GetSerializeSize(char a,      int, int=0) { return 1; }
-inline unsigned int GetSerializeSize(int8_t a,    int, int=0) { return 1; }
-inline unsigned int GetSerializeSize(uint8_t a,   int, int=0) { return 1; }
-inline unsigned int GetSerializeSize(int16_t a,   int, int=0) { return 2; }
-inline unsigned int GetSerializeSize(uint16_t a,  int, int=0) { return 2; }
-inline unsigned int GetSerializeSize(int32_t a,   int, int=0) { return 4; }
-inline unsigned int GetSerializeSize(uint32_t a,  int, int=0) { return 4; }
-inline unsigned int GetSerializeSize(int64_t a,   int, int=0) { return 8; }
-inline unsigned int GetSerializeSize(uint64_t a,  int, int=0) { return 8; }
-inline unsigned int GetSerializeSize(float a,     int, int=0) { return 4; }
-inline unsigned int GetSerializeSize(double a,    int, int=0) { return 8; }
-
 template<typename Stream> inline void Serialize(Stream& s, char a,         int, int=0) { ser_writedata8(s, a); } // TODO Get rid of bare char
 template<typename Stream> inline void Serialize(Stream& s, int8_t a,       int, int=0) { ser_writedata8(s, a); }
 template<typename Stream> inline void Serialize(Stream& s, uint8_t a,      int, int=0) { ser_writedata8(s, a); }
@@ -222,7 +205,6 @@ template<typename Stream> inline void Unserialize(Stream& s, uint64_t& a,  int,
 template<typename Stream> inline void Unserialize(Stream& s, float& a,     int, int=0) { a = ser_uint32_to_float(ser_readdata32(s)); }
 template<typename Stream> inline void Unserialize(Stream& s, double& a,    int, int=0) { a = ser_uint64_to_double(ser_readdata64(s)); }
 
-inline unsigned int GetSerializeSize(bool a, int, int=0)                          { return sizeof(char); }
 template<typename Stream> inline void Serialize(Stream& s, bool a, int, int=0)    { char f=a; ser_writedata8(s, f); }
 template<typename Stream> inline void Unserialize(Stream& s, bool& a, int, int=0) { char f=ser_readdata8(s); a=f; }
 
@@ -403,11 +385,6 @@ class CFlatData
     char* end() { return pend; }
     const char* end() const { return pend; }
 
-    unsigned int GetSerializeSize(int, int=0) const
-    {
-        return pend - pbegin;
-    }
-
     template<typename Stream>
     void Serialize(Stream& s, int, int=0) const
     {
@@ -429,10 +406,6 @@ class CVarInt
 public:
     CVarInt(I& nIn) : n(nIn) { }
 
-    unsigned int GetSerializeSize(int, int) const {
-        return GetSizeOfVarInt<I>(n);
-    }
-
     template<typename Stream>
     void Serialize(Stream &s, int, int) const {
         WriteVarInt<Stream,I>(s, n);
@@ -451,10 +424,6 @@ class CCompactSize
 public:
     CCompactSize(uint64_t& nIn) : n(nIn) { }
 
-    unsigned int GetSerializeSize(int, int) const {
-        return GetSizeOfCompactSize(n);
-    }
-
     template<typename Stream>
     void Serialize(Stream &s, int, int) const {
         WriteCompactSize<Stream>(s, n);
@@ -493,11 +462,6 @@ class LimitedString
         if (!string.empty())
             s.write((char*)&string[0], string.size());
     }
-
-    unsigned int GetSerializeSize(int, int=0) const
-    {
-        return GetSizeOfCompactSize(string.size()) + string.size();
-    }
 };
 
 template<typename I>
@@ -510,7 +474,6 @@ CVarInt<I> WrapVarInt(I& n) { return CVarInt<I>(n); }
 /**
  *  string
  */
-template<typename C> unsigned int GetSerializeSize(const std::basic_string<C>& str, int, int=0);
 template<typename Stream, typename C> void Serialize(Stream& os, const std::basic_string<C>& str, int, int=0);
 template<typename Stream, typename C> void Unserialize(Stream& is, std::basic_string<C>& str, int, int=0);
 
@@ -518,9 +481,6 @@ template<typename Stream, typename C> void Unserialize(Stream& is, std::basic_st
  * prevector
  * prevectors of unsigned char are a special case and are intended to be serialized as a single opaque blob.
  */
-template<unsigned int N, typename T> unsigned int GetSerializeSize_impl(const prevector<N, T>& v, int nType, int nVersion, const unsigned char&);
-template<unsigned int N, typename T, typename V> unsigned int GetSerializeSize_impl(const prevector<N, T>& v, int nType, int nVersion, const V&);
-template<unsigned int N, typename T> inline unsigned int GetSerializeSize(const prevector<N, T>& v, int nType, int nVersion);
 template<typename Stream, unsigned int N, typename T> void Serialize_impl(Stream& os, const prevector<N, T>& v, int nType, int nVersion, const unsigned char&);
 template<typename Stream, unsigned int N, typename T, typename V> void Serialize_impl(Stream& os, const prevector<N, T>& v, int nType, int nVersion, const V&);
 template<typename Stream, unsigned int N, typename T> inline void Serialize(Stream& os, const prevector<N, T>& v, int nType, int nVersion);
@@ -532,9 +492,6 @@ template<typename Stream, unsigned int N, typename T> inline void Unserialize(St
  * vector
  * vectors of unsigned char are a special case and are intended to be serialized as a single opaque blob.
  */
-template<typename T, typename A> unsigned int GetSerializeSize_impl(const std::vector<T, A>& v, int nType, int nVersion, const unsigned char&);
-template<typename T, typename A, typename V> unsigned int GetSerializeSize_impl(const std::vector<T, A>& v, int nType, int nVersion, const V&);
-template<typename T, typename A> inline unsigned int GetSerializeSize(const std::vector<T, A>& v, int nType, int nVersion);
 template<typename Stream, typename T, typename A> void Serialize_impl(Stream& os, const std::vector<T, A>& v, int nType, int nVersion, const unsigned char&);
 template<typename Stream, typename T, typename A, typename V> void Serialize_impl(Stream& os, const std::vector<T, A>& v, int nType, int nVersion, const V&);
 template<typename Stream, typename T, typename A> inline void Serialize(Stream& os, const std::vector<T, A>& v, int nType, int nVersion);
@@ -545,21 +502,18 @@ template<typename Stream, typename T, typename A> inline void Unserialize(Stream
 /**
  * pair
  */
-template<typename K, typename T> unsigned int GetSerializeSize(const std::pair<K, T>& item, int nType, int nVersion);
 template<typename Stream, typename K, typename T> void Serialize(Stream& os, const std::pair<K, T>& item, int nType, int nVersion);
 template<typename Stream, typename K, typename T> void Unserialize(Stream& is, std::pair<K, T>& item, int nType, int nVersion);
 
 /**
  * map
  */
-template<typename K, typename T, typename Pred, typename A> unsigned int GetSerializeSize(const std::map<K, T, Pred, A>& m, int nType, int nVersion);
 template<typename Stream, typename K, typename T, typename Pred, typename A> void Serialize(Stream& os, const std::map<K, T, Pred, A>& m, int nType, int nVersion);
 template<typename Stream, typename K, typename T, typename Pred, typename A> void Unserialize(Stream& is, std::map<K, T, Pred, A>& m, int nType, int nVersion);
 
 /**
  * set
  */
-template<typename K, typename Pred, typename A> unsigned int GetSerializeSize(const std::set<K, Pred, A>& m, int nType, int nVersion);
 template<typename Stream, typename K, typename Pred, typename A> void Serialize(Stream& os, const std::set<K, Pred, A>& m, int nType, int nVersion);
 template<typename Stream, typename K, typename Pred, typename A> void Unserialize(Stream& is, std::set<K, Pred, A>& m, int nType, int nVersion);
 
@@ -573,12 +527,6 @@ template<typename Stream, typename K, typename Pred, typename A> void Unserializ
  * The compiler will only cast int to long if none of the other templates matched.
  * Thanks to Boost serialization for this idea.
  */
-template<typename T>
-inline unsigned int GetSerializeSize(const T& a, long nType, int nVersion)
-{
-    return a.GetSerializeSize((int)nType, nVersion);
-}
-
 template<typename Stream, typename T>
 inline void Serialize(Stream& os, const T& a, long nType, int nVersion)
 {
@@ -598,12 +546,6 @@ inline void Unserialize(Stream& is, T& a, long nType, int nVersion)
 /**
  * string
  */
-template<typename C>
-unsigned int GetSerializeSize(const std::basic_string<C>& str, int, int)
-{
-    return GetSizeOfCompactSize(str.size()) + str.size() * sizeof(str[0]);
-}
-
 template<typename Stream, typename C>
 void Serialize(Stream& os, const std::basic_string<C>& str, int, int)
 {
@@ -626,28 +568,6 @@ void Unserialize(Stream& is, std::basic_string<C>& str, int, int)
 /**
  * prevector
  */
-template<unsigned int N, typename T>
-unsigned int GetSerializeSize_impl(const prevector<N, T>& v, int nType, int nVersion, const unsigned char&)
-{
-    return (GetSizeOfCompactSize(v.size()) + v.size() * sizeof(T));
-}
-
-template<unsigned int N, typename T, typename V>
-unsigned int GetSerializeSize_impl(const prevector<N, T>& v, int nType, int nVersion, const V&)
-{
-    unsigned int nSize = GetSizeOfCompactSize(v.size());
-    for (typename prevector<N, T>::const_iterator vi = v.begin(); vi != v.end(); ++vi)
-        nSize += GetSerializeSize((*vi), nType, nVersion);
-    return nSize;
-}
-
-template<unsigned int N, typename T>
-inline unsigned int GetSerializeSize(const prevector<N, T>& v, int nType, int nVersion)
-{
-    return GetSerializeSize_impl(v, nType, nVersion, T());
-}
-
-
 template<typename Stream, unsigned int N, typename T>
 void Serialize_impl(Stream& os, const prevector<N, T>& v, int nType, int nVersion, const unsigned char&)
 {
@@ -716,28 +636,6 @@ inline void Unserialize(Stream& is, prevector<N, T>& v, int nType, int nVersion)
 /**
  * vector
  */
-template<typename T, typename A>
-unsigned int GetSerializeSize_impl(const std::vector<T, A>& v, int nType, int nVersion, const unsigned char&)
-{
-    return (GetSizeOfCompactSize(v.size()) + v.size() * sizeof(T));
-}
-
-template<typename T, typename A, typename V>
-unsigned int GetSerializeSize_impl(const std::vector<T, A>& v, int nType, int nVersion, const V&)
-{
-    unsigned int nSize = GetSizeOfCompactSize(v.size());
-    for (typename std::vector<T, A>::const_iterator vi = v.begin(); vi != v.end(); ++vi)
-        nSize += GetSerializeSize((*vi), nType, nVersion);
-    return nSize;
-}
-
-template<typename T, typename A>
-inline unsigned int GetSerializeSize(const std::vector<T, A>& v, int nType, int nVersion)
-{
-    return GetSerializeSize_impl(v, nType, nVersion, T());
-}
-
-
 template<typename Stream, typename T, typename A>
 void Serialize_impl(Stream& os, const std::vector<T, A>& v, int nType, int nVersion, const unsigned char&)
 {
@@ -806,12 +704,6 @@ inline void Unserialize(Stream& is, std::vector<T, A>& v, int nType, int nVersio
 /**
  * pair
  */
-template<typename K, typename T>
-unsigned int GetSerializeSize(const std::pair<K, T>& item, int nType, int nVersion)
-{
-    return GetSerializeSize(item.first, nType, nVersion) + GetSerializeSize(item.second, nType, nVersion);
-}
-
 template<typename Stream, typename K, typename T>
 void Serialize(Stream& os, const std::pair<K, T>& item, int nType, int nVersion)
 {
@@ -831,15 +723,6 @@ void Unserialize(Stream& is, std::pair<K, T>& item, int nType, int nVersion)
 /**
  * map
  */
-template<typename K, typename T, typename Pred, typename A>
-unsigned int GetSerializeSize(const std::map<K, T, Pred, A>& m, int nType, int nVersion)
-{
-    unsigned int nSize = GetSizeOfCompactSize(m.size());
-    for (typename std::map<K, T, Pred, A>::const_iterator mi = m.begin(); mi != m.end(); ++mi)
-        nSize += GetSerializeSize((*mi), nType, nVersion);
-    return nSize;
-}
-
 template<typename Stream, typename K, typename T, typename Pred, typename A>
 void Serialize(Stream& os, const std::map<K, T, Pred, A>& m, int nType, int nVersion)
 {
@@ -867,15 +750,6 @@ void Unserialize(Stream& is, std::map<K, T, Pred, A>& m, int nType, int nVersion
 /**
  * set
  */
-template<typename K, typename Pred, typename A>
-unsigned int GetSerializeSize(const std::set<K, Pred, A>& m, int nType, int nVersion)
-{
-    unsigned int nSize = GetSizeOfCompactSize(m.size());
-    for (typename std::set<K, Pred, A>::const_iterator it = m.begin(); it != m.end(); ++it)
-        nSize += GetSerializeSize((*it), nType, nVersion);
-    return nSize;
-}
-
 template<typename Stream, typename K, typename Pred, typename A>
 void Serialize(Stream& os, const std::set<K, Pred, A>& m, int nType, int nVersion)
 {
@@ -1008,4 +882,16 @@ inline void SerReadWriteMany(Stream& s, int nType, int nVersion, CSerActionUnser
     ::UnserializeMany(s, nType, nVersion, args...);
 }
 
+template <typename T>
+size_t GetSerializeSize(const T& t, int nType, int nVersion = 0)
+{
+    return (CSizeComputer(nType, nVersion) << t).size();
+}
+
+template <typename S, typename T>
+size_t GetSerializeSize(const S& s, const T& t)
+{
+    return (CSizeComputer(s.GetType(), s.GetVersion()) << t).size();
+}
+
 #endif // BITCOIN_SERIALIZE_H
diff --git a/src/streams.h b/src/streams.h
index 12a36a4a70b02..d9965b534d6b4 100644
--- a/src/streams.h
+++ b/src/streams.h
@@ -308,13 +308,6 @@ class CDataStream
             s.write((char*)&vch[0], vch.size() * sizeof(vch[0]));
     }
 
-    template<typename T>
-    unsigned int GetSerializeSize(const T& obj)
-    {
-        // Tells the size of the object if serialized to this stream
-        return ::GetSerializeSize(obj, nType, nVersion);
-    }
-
     template<typename T>
     CDataStream& operator<<(const T& obj)
     {
@@ -457,13 +450,6 @@ class CAutoFile
             throw std::ios_base::failure("CAutoFile::write: write failed");
     }
 
-    template<typename T>
-    unsigned int GetSerializeSize(const T& obj)
-    {
-        // Tells the size of the object if serialized to this stream
-        return ::GetSerializeSize(obj, nType, nVersion);
-    }
-
     template<typename T>
     CAutoFile& operator<<(const T& obj)
     {
diff --git a/src/test/uint256_tests.cpp b/src/test/uint256_tests.cpp
index da0a3d73e07be..ba8eb16ba9662 100644
--- a/src/test/uint256_tests.cpp
+++ b/src/test/uint256_tests.cpp
@@ -184,8 +184,8 @@ BOOST_AUTO_TEST_CASE( methods ) // GetHex SetHex begin() end() size() GetLow64 G
     BOOST_CHECK(OneL.begin() + 32 == OneL.end());
     BOOST_CHECK(MaxL.begin() + 32 == MaxL.end());
     BOOST_CHECK(TmpL.begin() + 32 == TmpL.end());
-    BOOST_CHECK(R1L.GetSerializeSize(0,PROTOCOL_VERSION) == 32);
-    BOOST_CHECK(ZeroL.GetSerializeSize(0,PROTOCOL_VERSION) == 32);
+    BOOST_CHECK(GetSerializeSize(R1L, 0, PROTOCOL_VERSION) == 32);
+    BOOST_CHECK(GetSerializeSize(ZeroL, 0, PROTOCOL_VERSION) == 32);
 
     std::stringstream ss;
     R1L.Serialize(ss,0,PROTOCOL_VERSION);
@@ -230,8 +230,8 @@ BOOST_AUTO_TEST_CASE( methods ) // GetHex SetHex begin() end() size() GetLow64 G
     BOOST_CHECK(OneS.begin() + 20 == OneS.end());
     BOOST_CHECK(MaxS.begin() + 20 == MaxS.end());
     BOOST_CHECK(TmpS.begin() + 20 == TmpS.end());
-    BOOST_CHECK(R1S.GetSerializeSize(0,PROTOCOL_VERSION) == 20);
-    BOOST_CHECK(ZeroS.GetSerializeSize(0,PROTOCOL_VERSION) == 20);
+    BOOST_CHECK(GetSerializeSize(R1S, 0, PROTOCOL_VERSION) == 20);
+    BOOST_CHECK(GetSerializeSize(ZeroS, 0, PROTOCOL_VERSION) == 20);
 
     R1S.Serialize(ss,0,PROTOCOL_VERSION);
     BOOST_CHECK(ss.str() == std::string(R1Array,R1Array+20));
diff --git a/src/uint256.h b/src/uint256.h
index dd8432d74cab5..94fe66d26cd6b 100644
--- a/src/uint256.h
+++ b/src/uint256.h
@@ -78,11 +78,6 @@ class base_blob
         return sizeof(data);
     }
 
-    unsigned int GetSerializeSize(int nType, int nVersion) const
-    {
-        return sizeof(data);
-    }
-
     uint64_t GetUint64(int pos) const
     {
         const uint8_t* ptr = data + pos * 8;
diff --git a/src/undo.h b/src/undo.h
index d4fc84c90c0d0..9d6f9bd0d0073 100644
--- a/src/undo.h
+++ b/src/undo.h
@@ -27,12 +27,6 @@ class CTxInUndo
     CTxInUndo() : txout(), fCoinBase(false), nHeight(0), nVersion(0) {}
     CTxInUndo(const CTxOut &txoutIn, bool fCoinBaseIn = false, unsigned int nHeightIn = 0, int nVersionIn = 0) : txout(txoutIn), fCoinBase(fCoinBaseIn), nHeight(nHeightIn), nVersion(nVersionIn) { }
 
-    unsigned int GetSerializeSize(int nType, int nVersion) const {
-        return ::GetSerializeSize(VARINT(nHeight*2+(fCoinBase ? 1 : 0)), nType, nVersion) +
-               (nHeight > 0 ? ::GetSerializeSize(VARINT(this->nVersion), nType, nVersion) : 0) +
-               ::GetSerializeSize(CTxOutCompressor(REF(txout)), nType, nVersion);
-    }
-
     template<typename Stream>
     void Serialize(Stream &s, int nType, int nVersion) const {
         ::Serialize(s, VARINT(nHeight*2+(fCoinBase ? 1 : 0)), nType, nVersion);

From 528472111b4965b1a99c4bcf08ac5ec93d87f10f Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Fri, 28 Oct 2016 16:29:17 -0700
Subject: [PATCH 1171/1802] Get rid of nType and nVersion

Remove the nType and nVersion as parameters to all serialization methods
and functions. There is only one place where it's read and has an impact
(in CAddress), and even there it does not impact any of the recursively
invoked serializers.

Instead, the few places that need nType or nVersion are changed to read
it directly from the stream object, through GetType() and GetVersion()
methods which are added to all stream classes.
---
 src/addrdb.h                      |   2 +-
 src/addrman.h                     |   6 +-
 src/amount.h                      |   2 +-
 src/blockencodings.h              |  10 +-
 src/bloom.h                       |   2 +-
 src/chain.h                       |   9 +-
 src/coins.h                       |  24 +--
 src/compressor.h                  |   6 +-
 src/hash.h                        |   5 +-
 src/key.h                         |   4 +-
 src/merkleblock.h                 |   4 +-
 src/net.h                         |   2 +-
 src/netaddress.h                  |   6 +-
 src/primitives/block.h            |   9 +-
 src/primitives/transaction.h      |  22 +--
 src/protocol.h                    |  13 +-
 src/pubkey.h                      |   8 +-
 src/qt/recentrequeststablemodel.h |   2 +-
 src/qt/walletmodel.h              |   2 +-
 src/rest.cpp                      |   2 +-
 src/script/bitcoinconsensus.cpp   |   4 +-
 src/script/interpreter.cpp        |  30 ++--
 src/serialize.h                   | 256 +++++++++++++++---------------
 src/streams.h                     |  34 ++--
 src/test/blockencodings_tests.cpp |   2 +-
 src/test/bloom_tests.cpp          |   6 +-
 src/test/dbwrapper_tests.cpp      |   2 +-
 src/test/net_tests.cpp            |   8 +-
 src/test/serialize_tests.cpp      |   4 +-
 src/test/uint256_tests.cpp        |  38 ++---
 src/txdb.h                        |   2 +-
 src/uint256.h                     |   4 +-
 src/undo.h                        |  20 +--
 src/wallet/crypter.h              |   2 +-
 src/wallet/wallet.h               |  28 ++--
 src/wallet/walletdb.h             |   4 +-
 36 files changed, 304 insertions(+), 280 deletions(-)

diff --git a/src/addrdb.h b/src/addrdb.h
index 62835a6fb40d4..339943ca5af31 100644
--- a/src/addrdb.h
+++ b/src/addrdb.h
@@ -46,7 +46,7 @@ class CBanEntry
     ADD_SERIALIZE_METHODS;
 
     template <typename Stream, typename Operation>
-    inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) {
+    inline void SerializationOp(Stream& s, Operation ser_action) {
         READWRITE(this->nVersion);
         READWRITE(nCreateTime);
         READWRITE(nBanUntil);
diff --git a/src/addrman.h b/src/addrman.h
index 03b380165f339..cabacbbea9716 100644
--- a/src/addrman.h
+++ b/src/addrman.h
@@ -58,7 +58,7 @@ class CAddrInfo : public CAddress
     ADD_SERIALIZE_METHODS;
 
     template <typename Stream, typename Operation>
-    inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) {
+    inline void SerializationOp(Stream& s, Operation ser_action) {
         READWRITE(*(CAddress*)this);
         READWRITE(source);
         READWRITE(nLastSuccess);
@@ -293,7 +293,7 @@ class CAddrMan
      * very little in common.
      */
     template<typename Stream>
-    void Serialize(Stream &s, int nType, int nVersionDummy) const
+    void Serialize(Stream &s) const
     {
         LOCK(cs);
 
@@ -343,7 +343,7 @@ class CAddrMan
     }
 
     template<typename Stream>
-    void Unserialize(Stream& s, int nType, int nVersionDummy)
+    void Unserialize(Stream& s)
     {
         LOCK(cs);
 
diff --git a/src/amount.h b/src/amount.h
index 5e52f37f2369d..ba0c86040f18c 100644
--- a/src/amount.h
+++ b/src/amount.h
@@ -64,7 +64,7 @@ class CFeeRate
     ADD_SERIALIZE_METHODS;
 
     template <typename Stream, typename Operation>
-    inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) {
+    inline void SerializationOp(Stream& s, Operation ser_action) {
         READWRITE(nSatoshisPerK);
     }
 };
diff --git a/src/blockencodings.h b/src/blockencodings.h
index 99b1cb140d0a4..4035b87eb2163 100644
--- a/src/blockencodings.h
+++ b/src/blockencodings.h
@@ -21,7 +21,7 @@ struct TransactionCompressor {
     ADD_SERIALIZE_METHODS;
 
     template <typename Stream, typename Operation>
-    inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) {
+    inline void SerializationOp(Stream& s, Operation ser_action) {
         READWRITE(tx); //TODO: Compress tx encoding
     }
 };
@@ -35,7 +35,7 @@ class BlockTransactionsRequest {
     ADD_SERIALIZE_METHODS;
 
     template <typename Stream, typename Operation>
-    inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) {
+    inline void SerializationOp(Stream& s, Operation ser_action) {
         READWRITE(blockhash);
         uint64_t indexes_size = (uint64_t)indexes.size();
         READWRITE(COMPACTSIZE(indexes_size));
@@ -81,7 +81,7 @@ class BlockTransactions {
     ADD_SERIALIZE_METHODS;
 
     template <typename Stream, typename Operation>
-    inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) {
+    inline void SerializationOp(Stream& s, Operation ser_action) {
         READWRITE(blockhash);
         uint64_t txn_size = (uint64_t)txn.size();
         READWRITE(COMPACTSIZE(txn_size));
@@ -109,7 +109,7 @@ struct PrefilledTransaction {
     ADD_SERIALIZE_METHODS;
 
     template <typename Stream, typename Operation>
-    inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) {
+    inline void SerializationOp(Stream& s, Operation ser_action) {
         uint64_t idx = index;
         READWRITE(COMPACTSIZE(idx));
         if (idx > std::numeric_limits<uint16_t>::max())
@@ -155,7 +155,7 @@ class CBlockHeaderAndShortTxIDs {
     ADD_SERIALIZE_METHODS;
 
     template <typename Stream, typename Operation>
-    inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) {
+    inline void SerializationOp(Stream& s, Operation ser_action) {
         READWRITE(header);
         READWRITE(nonce);
 
diff --git a/src/bloom.h b/src/bloom.h
index ad6de625d8f8a..d3a017371f30a 100644
--- a/src/bloom.h
+++ b/src/bloom.h
@@ -73,7 +73,7 @@ class CBloomFilter
     ADD_SERIALIZE_METHODS;
 
     template <typename Stream, typename Operation>
-    inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) {
+    inline void SerializationOp(Stream& s, Operation ser_action) {
         READWRITE(vData);
         READWRITE(nHashFuncs);
         READWRITE(nTweak);
diff --git a/src/chain.h b/src/chain.h
index 46a16a30617f4..0aac5de5c2297 100644
--- a/src/chain.h
+++ b/src/chain.h
@@ -28,7 +28,7 @@ class CBlockFileInfo
     ADD_SERIALIZE_METHODS;
 
     template <typename Stream, typename Operation>
-    inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) {
+    inline void SerializationOp(Stream& s, Operation ser_action) {
         READWRITE(VARINT(nBlocks));
         READWRITE(VARINT(nSize));
         READWRITE(VARINT(nUndoSize));
@@ -76,7 +76,7 @@ struct CDiskBlockPos
     ADD_SERIALIZE_METHODS;
 
     template <typename Stream, typename Operation>
-    inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) {
+    inline void SerializationOp(Stream& s, Operation ser_action) {
         READWRITE(VARINT(nFile));
         READWRITE(VARINT(nPos));
     }
@@ -357,8 +357,9 @@ class CDiskBlockIndex : public CBlockIndex
     ADD_SERIALIZE_METHODS;
 
     template <typename Stream, typename Operation>
-    inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) {
-        if (!(nType & SER_GETHASH))
+    inline void SerializationOp(Stream& s, Operation ser_action) {
+        int nVersion = s.GetVersion();
+        if (!(s.GetType() & SER_GETHASH))
             READWRITE(VARINT(nVersion));
 
         READWRITE(VARINT(nHeight));
diff --git a/src/coins.h b/src/coins.h
index 3e134cf675663..d295b3c940d66 100644
--- a/src/coins.h
+++ b/src/coins.h
@@ -154,7 +154,7 @@ class CCoins
     }
 
     template<typename Stream>
-    void Serialize(Stream &s, int nType, int nVersion) const {
+    void Serialize(Stream &s) const {
         unsigned int nMaskSize = 0, nMaskCode = 0;
         CalcMaskSize(nMaskSize, nMaskCode);
         bool fFirst = vout.size() > 0 && !vout[0].IsNull();
@@ -162,33 +162,33 @@ class CCoins
         assert(fFirst || fSecond || nMaskCode);
         unsigned int nCode = 8*(nMaskCode - (fFirst || fSecond ? 0 : 1)) + (fCoinBase ? 1 : 0) + (fFirst ? 2 : 0) + (fSecond ? 4 : 0);
         // version
-        ::Serialize(s, VARINT(this->nVersion), nType, nVersion);
+        ::Serialize(s, VARINT(this->nVersion));
         // header code
-        ::Serialize(s, VARINT(nCode), nType, nVersion);
+        ::Serialize(s, VARINT(nCode));
         // spentness bitmask
         for (unsigned int b = 0; b<nMaskSize; b++) {
             unsigned char chAvail = 0;
             for (unsigned int i = 0; i < 8 && 2+b*8+i < vout.size(); i++)
                 if (!vout[2+b*8+i].IsNull())
                     chAvail |= (1 << i);
-            ::Serialize(s, chAvail, nType, nVersion);
+            ::Serialize(s, chAvail);
         }
         // txouts themself
         for (unsigned int i = 0; i < vout.size(); i++) {
             if (!vout[i].IsNull())
-                ::Serialize(s, CTxOutCompressor(REF(vout[i])), nType, nVersion);
+                ::Serialize(s, CTxOutCompressor(REF(vout[i])));
         }
         // coinbase height
-        ::Serialize(s, VARINT(nHeight), nType, nVersion);
+        ::Serialize(s, VARINT(nHeight));
     }
 
     template<typename Stream>
-    void Unserialize(Stream &s, int nType, int nVersion) {
+    void Unserialize(Stream &s) {
         unsigned int nCode = 0;
         // version
-        ::Unserialize(s, VARINT(this->nVersion), nType, nVersion);
+        ::Unserialize(s, VARINT(this->nVersion));
         // header code
-        ::Unserialize(s, VARINT(nCode), nType, nVersion);
+        ::Unserialize(s, VARINT(nCode));
         fCoinBase = nCode & 1;
         std::vector<bool> vAvail(2, false);
         vAvail[0] = (nCode & 2) != 0;
@@ -197,7 +197,7 @@ class CCoins
         // spentness bitmask
         while (nMaskCode > 0) {
             unsigned char chAvail = 0;
-            ::Unserialize(s, chAvail, nType, nVersion);
+            ::Unserialize(s, chAvail);
             for (unsigned int p = 0; p < 8; p++) {
                 bool f = (chAvail & (1 << p)) != 0;
                 vAvail.push_back(f);
@@ -209,10 +209,10 @@ class CCoins
         vout.assign(vAvail.size(), CTxOut());
         for (unsigned int i = 0; i < vAvail.size(); i++) {
             if (vAvail[i])
-                ::Unserialize(s, REF(CTxOutCompressor(vout[i])), nType, nVersion);
+                ::Unserialize(s, REF(CTxOutCompressor(vout[i])));
         }
         // coinbase height
-        ::Unserialize(s, VARINT(nHeight), nType, nVersion);
+        ::Unserialize(s, VARINT(nHeight));
         Cleanup();
     }
 
diff --git a/src/compressor.h b/src/compressor.h
index 90749499d10a1..961365d2618a4 100644
--- a/src/compressor.h
+++ b/src/compressor.h
@@ -56,7 +56,7 @@ class CScriptCompressor
     CScriptCompressor(CScript &scriptIn) : script(scriptIn) { }
 
     template<typename Stream>
-    void Serialize(Stream &s, int nType, int nVersion) const {
+    void Serialize(Stream &s) const {
         std::vector<unsigned char> compr;
         if (Compress(compr)) {
             s << CFlatData(compr);
@@ -68,7 +68,7 @@ class CScriptCompressor
     }
 
     template<typename Stream>
-    void Unserialize(Stream &s, int nType, int nVersion) {
+    void Unserialize(Stream &s) {
         unsigned int nSize = 0;
         s >> VARINT(nSize);
         if (nSize < nSpecialScripts) {
@@ -104,7 +104,7 @@ class CTxOutCompressor
     ADD_SERIALIZE_METHODS;
 
     template <typename Stream, typename Operation>
-    inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) {
+    inline void SerializationOp(Stream& s, Operation ser_action) {
         if (!ser_action.ForRead()) {
             uint64_t nVal = CompressAmount(txout.nValue);
             READWRITE(VARINT(nVal));
diff --git a/src/hash.h b/src/hash.h
index 73e31580d22d7..94e7f5ea6ccb8 100644
--- a/src/hash.h
+++ b/src/hash.h
@@ -138,6 +138,9 @@ class CHashWriter
 
     CHashWriter(int nTypeIn, int nVersionIn) : nType(nTypeIn), nVersion(nVersionIn) {}
 
+    int GetType() const { return nType; }
+    int GetVersion() const { return nVersion; }
+
     void write(const char *pch, size_t size) {
         ctx.Write((const unsigned char*)pch, size);
     }
@@ -152,7 +155,7 @@ class CHashWriter
     template<typename T>
     CHashWriter& operator<<(const T& obj) {
         // Serialize to this stream
-        ::Serialize(*this, obj, nType, nVersion);
+        ::Serialize(*this, obj);
         return (*this);
     }
 };
diff --git a/src/key.h b/src/key.h
index 48a07d62c9ccd..ff5252b7a0fd9 100644
--- a/src/key.h
+++ b/src/key.h
@@ -162,7 +162,7 @@ struct CExtKey {
     CExtPubKey Neuter() const;
     void SetMaster(const unsigned char* seed, unsigned int nSeedLen);
     template <typename Stream>
-    void Serialize(Stream& s, int nType, int nVersion) const
+    void Serialize(Stream& s) const
     {
         unsigned int len = BIP32_EXTKEY_SIZE;
         ::WriteCompactSize(s, len);
@@ -171,7 +171,7 @@ struct CExtKey {
         s.write((const char *)&code[0], len);
     }
     template <typename Stream>
-    void Unserialize(Stream& s, int nType, int nVersion)
+    void Unserialize(Stream& s)
     {
         unsigned int len = ::ReadCompactSize(s);
         unsigned char code[BIP32_EXTKEY_SIZE];
diff --git a/src/merkleblock.h b/src/merkleblock.h
index 835cbcce5550d..17c33194a95b1 100644
--- a/src/merkleblock.h
+++ b/src/merkleblock.h
@@ -85,7 +85,7 @@ class CPartialMerkleTree
     ADD_SERIALIZE_METHODS;
 
     template <typename Stream, typename Operation>
-    inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) {
+    inline void SerializationOp(Stream& s, Operation ser_action) {
         READWRITE(nTransactions);
         READWRITE(vHash);
         std::vector<unsigned char> vBytes;
@@ -148,7 +148,7 @@ class CMerkleBlock
     ADD_SERIALIZE_METHODS;
 
     template <typename Stream, typename Operation>
-    inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) {
+    inline void SerializationOp(Stream& s, Operation ser_action) {
         READWRITE(header);
         READWRITE(txn);
     }
diff --git a/src/net.h b/src/net.h
index 4ceeec2f0ca9b..8289a06d94136 100644
--- a/src/net.h
+++ b/src/net.h
@@ -140,7 +140,7 @@ class CConnman
     void PushMessageWithVersionAndFlag(CNode* pnode, int nVersion, int flag, const std::string& sCommand, Args&&... args)
     {
         auto msg(BeginMessage(pnode, nVersion, flag, sCommand));
-        ::SerializeMany(msg, msg.GetType(), msg.GetVersion(), std::forward<Args>(args)...);
+        ::SerializeMany(msg, std::forward<Args>(args)...);
         EndMessage(msg);
         PushMessage(pnode, msg, sCommand);
     }
diff --git a/src/netaddress.h b/src/netaddress.h
index 9330fe3328582..9dffaa57e7a6a 100644
--- a/src/netaddress.h
+++ b/src/netaddress.h
@@ -85,7 +85,7 @@ class CNetAddr
         ADD_SERIALIZE_METHODS;
 
         template <typename Stream, typename Operation>
-        inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) {
+        inline void SerializationOp(Stream& s, Operation ser_action) {
             READWRITE(FLATDATA(ip));
         }
 
@@ -122,7 +122,7 @@ class CSubNet
         ADD_SERIALIZE_METHODS;
 
         template <typename Stream, typename Operation>
-        inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) {
+        inline void SerializationOp(Stream& s, Operation ser_action) {
             READWRITE(network);
             READWRITE(FLATDATA(netmask));
             READWRITE(FLATDATA(valid));
@@ -159,7 +159,7 @@ class CService : public CNetAddr
         ADD_SERIALIZE_METHODS;
 
         template <typename Stream, typename Operation>
-        inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) {
+        inline void SerializationOp(Stream& s, Operation ser_action) {
             READWRITE(FLATDATA(ip));
             unsigned short portN = htons(port);
             READWRITE(FLATDATA(portN));
diff --git a/src/primitives/block.h b/src/primitives/block.h
index 72dfed985ae93..d148aec1e0389 100644
--- a/src/primitives/block.h
+++ b/src/primitives/block.h
@@ -36,7 +36,7 @@ class CBlockHeader
     ADD_SERIALIZE_METHODS;
 
     template <typename Stream, typename Operation>
-    inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) {
+    inline void SerializationOp(Stream& s, Operation ser_action) {
         READWRITE(this->nVersion);
         READWRITE(hashPrevBlock);
         READWRITE(hashMerkleRoot);
@@ -92,7 +92,7 @@ class CBlock : public CBlockHeader
     ADD_SERIALIZE_METHODS;
 
     template <typename Stream, typename Operation>
-    inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) {
+    inline void SerializationOp(Stream& s, Operation ser_action) {
         READWRITE(*(CBlockHeader*)this);
         READWRITE(vtx);
     }
@@ -137,8 +137,9 @@ struct CBlockLocator
     ADD_SERIALIZE_METHODS;
 
     template <typename Stream, typename Operation>
-    inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) {
-        if (!(nType & SER_GETHASH))
+    inline void SerializationOp(Stream& s, Operation ser_action) {
+        int nVersion = s.GetVersion();
+        if (!(s.GetType() & SER_GETHASH))
             READWRITE(nVersion);
         READWRITE(vHave);
     }
diff --git a/src/primitives/transaction.h b/src/primitives/transaction.h
index 714ab34548a86..1d176e5d8cdee 100644
--- a/src/primitives/transaction.h
+++ b/src/primitives/transaction.h
@@ -28,7 +28,7 @@ class COutPoint
     ADD_SERIALIZE_METHODS;
 
     template <typename Stream, typename Operation>
-    inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) {
+    inline void SerializationOp(Stream& s, Operation ser_action) {
         READWRITE(hash);
         READWRITE(n);
     }
@@ -104,7 +104,7 @@ class CTxIn
     ADD_SERIALIZE_METHODS;
 
     template <typename Stream, typename Operation>
-    inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) {
+    inline void SerializationOp(Stream& s, Operation ser_action) {
         READWRITE(prevout);
         READWRITE(*(CScriptBase*)(&scriptSig));
         READWRITE(nSequence);
@@ -144,7 +144,7 @@ class CTxOut
     ADD_SERIALIZE_METHODS;
 
     template <typename Stream, typename Operation>
-    inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) {
+    inline void SerializationOp(Stream& s, Operation ser_action) {
         READWRITE(nValue);
         READWRITE(*(CScriptBase*)(&scriptPubKey));
     }
@@ -219,7 +219,7 @@ class CTxInWitness
     ADD_SERIALIZE_METHODS;
 
     template <typename Stream, typename Operation>
-    inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion)
+    inline void SerializationOp(Stream& s, Operation ser_action)
     {
         READWRITE(scriptWitness.stack);
     }
@@ -255,7 +255,7 @@ class CTxWitness
     }
 
     template <typename Stream, typename Operation>
-    inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion)
+    inline void SerializationOp(Stream& s, Operation ser_action)
     {
         for (size_t n = 0; n < vtxinwit.size(); n++) {
             READWRITE(vtxinwit[n]);
@@ -287,8 +287,8 @@ struct CMutableTransaction;
  * - uint32_t nLockTime
  */
 template<typename Stream, typename Operation, typename TxType>
-inline void SerializeTransaction(TxType& tx, Stream& s, Operation ser_action, int nType, int nVersion) {
-    const bool fAllowWitness = !(nVersion & SERIALIZE_TRANSACTION_NO_WITNESS);
+inline void SerializeTransaction(TxType& tx, Stream& s, Operation ser_action) {
+    const bool fAllowWitness = !(s.GetVersion() & SERIALIZE_TRANSACTION_NO_WITNESS);
 
     READWRITE(*const_cast<int32_t*>(&tx.nVersion));
     unsigned char flags = 0;
@@ -385,8 +385,8 @@ class CTransaction
     ADD_SERIALIZE_METHODS;
 
     template <typename Stream, typename Operation>
-    inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) {
-        SerializeTransaction(*this, s, ser_action, nType, nVersion);
+    inline void SerializationOp(Stream& s, Operation ser_action) {
+        SerializeTransaction(*this, s, ser_action);
         if (ser_action.ForRead()) {
             UpdateHash();
         }
@@ -456,8 +456,8 @@ struct CMutableTransaction
     ADD_SERIALIZE_METHODS;
 
     template <typename Stream, typename Operation>
-    inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) {
-        SerializeTransaction(*this, s, ser_action, nType, nVersion);
+    inline void SerializationOp(Stream& s, Operation ser_action) {
+        SerializeTransaction(*this, s, ser_action);
     }
 
     /** Compute the hash of this CMutableTransaction. This is computed on the
diff --git a/src/protocol.h b/src/protocol.h
index d19e0d3a5e24e..a52d9a67b0e4b 100644
--- a/src/protocol.h
+++ b/src/protocol.h
@@ -48,7 +48,7 @@ class CMessageHeader
     ADD_SERIALIZE_METHODS;
 
     template <typename Stream, typename Operation>
-    inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion)
+    inline void SerializationOp(Stream& s, Operation ser_action)
     {
         READWRITE(FLATDATA(pchMessageStart));
         READWRITE(FLATDATA(pchCommand));
@@ -289,14 +289,15 @@ class CAddress : public CService
     ADD_SERIALIZE_METHODS;
 
     template <typename Stream, typename Operation>
-    inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion)
+    inline void SerializationOp(Stream& s, Operation ser_action)
     {
         if (ser_action.ForRead())
             Init();
-        if (nType & SER_DISK)
+        int nVersion = s.GetVersion();
+        if (s.GetType() & SER_DISK)
             READWRITE(nVersion);
-        if ((nType & SER_DISK) ||
-            (nVersion >= CADDR_TIME_VERSION && !(nType & SER_GETHASH)))
+        if ((s.GetType() & SER_DISK) ||
+            (nVersion >= CADDR_TIME_VERSION && !(s.GetType() & SER_GETHASH)))
             READWRITE(nTime);
         uint64_t nServicesInt = nServices;
         READWRITE(nServicesInt);
@@ -343,7 +344,7 @@ class CInv
     ADD_SERIALIZE_METHODS;
 
     template <typename Stream, typename Operation>
-    inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion)
+    inline void SerializationOp(Stream& s, Operation ser_action)
     {
         READWRITE(type);
         READWRITE(hash);
diff --git a/src/pubkey.h b/src/pubkey.h
index 3277218bb6b72..15207f89e1300 100644
--- a/src/pubkey.h
+++ b/src/pubkey.h
@@ -117,14 +117,14 @@ class CPubKey
 
     //! Implement serialization, as if this was a byte vector.
     template <typename Stream>
-    void Serialize(Stream& s, int nType, int nVersion) const
+    void Serialize(Stream& s) const
     {
         unsigned int len = size();
         ::WriteCompactSize(s, len);
         s.write((char*)vch, len);
     }
     template <typename Stream>
-    void Unserialize(Stream& s, int nType, int nVersion)
+    void Unserialize(Stream& s)
     {
         unsigned int len = ::ReadCompactSize(s);
         if (len <= 65) {
@@ -211,7 +211,7 @@ struct CExtPubKey {
     bool Derive(CExtPubKey& out, unsigned int nChild) const;
 
     template <typename Stream>
-    void Serialize(Stream& s, int nType, int nVersion) const
+    void Serialize(Stream& s) const
     {
         unsigned int len = BIP32_EXTKEY_SIZE;
         ::WriteCompactSize(s, len);
@@ -220,7 +220,7 @@ struct CExtPubKey {
         s.write((const char *)&code[0], len);
     }
     template <typename Stream>
-    void Unserialize(Stream& s, int nType, int nVersion)
+    void Unserialize(Stream& s)
     {
         unsigned int len = ::ReadCompactSize(s);
         unsigned char code[BIP32_EXTKEY_SIZE];
diff --git a/src/qt/recentrequeststablemodel.h b/src/qt/recentrequeststablemodel.h
index 0193e748d75c2..8ee2c9cbac309 100644
--- a/src/qt/recentrequeststablemodel.h
+++ b/src/qt/recentrequeststablemodel.h
@@ -27,7 +27,7 @@ class RecentRequestEntry
     ADD_SERIALIZE_METHODS;
 
     template <typename Stream, typename Operation>
-    inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) {
+    inline void SerializationOp(Stream& s, Operation ser_action) {
         unsigned int nDate = date.toTime_t();
 
         READWRITE(this->nVersion);
diff --git a/src/qt/walletmodel.h b/src/qt/walletmodel.h
index 6a5670e3782d4..eedf6e8cea712 100644
--- a/src/qt/walletmodel.h
+++ b/src/qt/walletmodel.h
@@ -65,7 +65,7 @@ class SendCoinsRecipient
     ADD_SERIALIZE_METHODS;
 
     template <typename Stream, typename Operation>
-    inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) {
+    inline void SerializationOp(Stream& s, Operation ser_action) {
         std::string sAddress = address.toStdString();
         std::string sLabel = label.toStdString();
         std::string sMessage = message.toStdString();
diff --git a/src/rest.cpp b/src/rest.cpp
index b8b5420626d3b..90cca6f48055d 100644
--- a/src/rest.cpp
+++ b/src/rest.cpp
@@ -50,7 +50,7 @@ struct CCoin {
     ADD_SERIALIZE_METHODS;
 
     template <typename Stream, typename Operation>
-    inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion)
+    inline void SerializationOp(Stream& s, Operation ser_action)
     {
         READWRITE(nTxVer);
         READWRITE(nHeight);
diff --git a/src/script/bitcoinconsensus.cpp b/src/script/bitcoinconsensus.cpp
index ec573c3183238..069ac55bfba06 100644
--- a/src/script/bitcoinconsensus.cpp
+++ b/src/script/bitcoinconsensus.cpp
@@ -42,10 +42,12 @@ class TxInputStream
     template<typename T>
     TxInputStream& operator>>(T& obj)
     {
-        ::Unserialize(*this, obj, m_type, m_version);
+        ::Unserialize(*this, obj);
         return *this;
     }
 
+    int GetVersion() const { return m_version; }
+    int GetType() const { return m_type; }
 private:
     const int m_type;
     const int m_version;
diff --git a/src/script/interpreter.cpp b/src/script/interpreter.cpp
index 0e17ddc130b8c..a6403f9363745 100644
--- a/src/script/interpreter.cpp
+++ b/src/script/interpreter.cpp
@@ -1069,7 +1069,7 @@ class CTransactionSignatureSerializer {
 
     /** Serialize the passed scriptCode, skipping OP_CODESEPARATORs */
     template<typename S>
-    void SerializeScriptCode(S &s, int nType, int nVersion) const {
+    void SerializeScriptCode(S &s) const {
         CScript::const_iterator it = scriptCode.begin();
         CScript::const_iterator itBegin = it;
         opcodetype opcode;
@@ -1092,53 +1092,53 @@ class CTransactionSignatureSerializer {
 
     /** Serialize an input of txTo */
     template<typename S>
-    void SerializeInput(S &s, unsigned int nInput, int nType, int nVersion) const {
+    void SerializeInput(S &s, unsigned int nInput) const {
         // In case of SIGHASH_ANYONECANPAY, only the input being signed is serialized
         if (fAnyoneCanPay)
             nInput = nIn;
         // Serialize the prevout
-        ::Serialize(s, txTo.vin[nInput].prevout, nType, nVersion);
+        ::Serialize(s, txTo.vin[nInput].prevout);
         // Serialize the script
         if (nInput != nIn)
             // Blank out other inputs' signatures
-            ::Serialize(s, CScriptBase(), nType, nVersion);
+            ::Serialize(s, CScriptBase());
         else
-            SerializeScriptCode(s, nType, nVersion);
+            SerializeScriptCode(s);
         // Serialize the nSequence
         if (nInput != nIn && (fHashSingle || fHashNone))
             // let the others update at will
-            ::Serialize(s, (int)0, nType, nVersion);
+            ::Serialize(s, (int)0);
         else
-            ::Serialize(s, txTo.vin[nInput].nSequence, nType, nVersion);
+            ::Serialize(s, txTo.vin[nInput].nSequence);
     }
 
     /** Serialize an output of txTo */
     template<typename S>
-    void SerializeOutput(S &s, unsigned int nOutput, int nType, int nVersion) const {
+    void SerializeOutput(S &s, unsigned int nOutput) const {
         if (fHashSingle && nOutput != nIn)
             // Do not lock-in the txout payee at other indices as txin
-            ::Serialize(s, CTxOut(), nType, nVersion);
+            ::Serialize(s, CTxOut());
         else
-            ::Serialize(s, txTo.vout[nOutput], nType, nVersion);
+            ::Serialize(s, txTo.vout[nOutput]);
     }
 
     /** Serialize txTo */
     template<typename S>
-    void Serialize(S &s, int nType, int nVersion) const {
+    void Serialize(S &s) const {
         // Serialize nVersion
-        ::Serialize(s, txTo.nVersion, nType, nVersion);
+        ::Serialize(s, txTo.nVersion);
         // Serialize vin
         unsigned int nInputs = fAnyoneCanPay ? 1 : txTo.vin.size();
         ::WriteCompactSize(s, nInputs);
         for (unsigned int nInput = 0; nInput < nInputs; nInput++)
-             SerializeInput(s, nInput, nType, nVersion);
+             SerializeInput(s, nInput);
         // Serialize vout
         unsigned int nOutputs = fHashNone ? 0 : (fHashSingle ? nIn+1 : txTo.vout.size());
         ::WriteCompactSize(s, nOutputs);
         for (unsigned int nOutput = 0; nOutput < nOutputs; nOutput++)
-             SerializeOutput(s, nOutput, nType, nVersion);
+             SerializeOutput(s, nOutput);
         // Serialize nLockTime
-        ::Serialize(s, txTo.nLockTime, nType, nVersion);
+        ::Serialize(s, txTo.nLockTime);
     }
 };
 
diff --git a/src/serialize.h b/src/serialize.h
index 80289a365ae6f..fc4291fe95ca0 100644
--- a/src/serialize.h
+++ b/src/serialize.h
@@ -159,8 +159,8 @@ enum
     SER_GETHASH         = (1 << 2),
 };
 
-#define READWRITE(obj)      (::SerReadWrite(s, (obj), nType, nVersion, ser_action))
-#define READWRITEMANY(...)      (::SerReadWriteMany(s, nType, nVersion, ser_action, __VA_ARGS__))
+#define READWRITE(obj)      (::SerReadWrite(s, (obj), ser_action))
+#define READWRITEMANY(...)      (::SerReadWriteMany(s, ser_action, __VA_ARGS__))
 
 /** 
  * Implement three methods for serializable objects. These are actually wrappers over
@@ -168,45 +168,42 @@ enum
  * code. Adding "ADD_SERIALIZE_METHODS" in the body of the class causes these wrappers to be
  * added as members. 
  */
-#define ADD_SERIALIZE_METHODS                                                          \
-    template<typename Stream>                                                        \
-    void Serialize(Stream& s, int nType, int nVersion) const {                       \
-        NCONST_PTR(this)->SerializationOp(s, CSerActionSerialize(), nType, nVersion);\
-    }                                                                                \
-    template<typename Stream>                                                        \
-    void Unserialize(Stream& s, int nType, int nVersion) {                           \
-        SerializationOp(s, CSerActionUnserialize(), nType, nVersion);                \
+#define ADD_SERIALIZE_METHODS                                         \
+    template<typename Stream>                                         \
+    void Serialize(Stream& s) const {                                 \
+        NCONST_PTR(this)->SerializationOp(s, CSerActionSerialize());  \
+    }                                                                 \
+    template<typename Stream>                                         \
+    void Unserialize(Stream& s) {                                     \
+        SerializationOp(s, CSerActionUnserialize());                  \
     }
 
-/*
- * Basic Types
- */
-template<typename Stream> inline void Serialize(Stream& s, char a,         int, int=0) { ser_writedata8(s, a); } // TODO Get rid of bare char
-template<typename Stream> inline void Serialize(Stream& s, int8_t a,       int, int=0) { ser_writedata8(s, a); }
-template<typename Stream> inline void Serialize(Stream& s, uint8_t a,      int, int=0) { ser_writedata8(s, a); }
-template<typename Stream> inline void Serialize(Stream& s, int16_t a,      int, int=0) { ser_writedata16(s, a); }
-template<typename Stream> inline void Serialize(Stream& s, uint16_t a,     int, int=0) { ser_writedata16(s, a); }
-template<typename Stream> inline void Serialize(Stream& s, int32_t a,      int, int=0) { ser_writedata32(s, a); }
-template<typename Stream> inline void Serialize(Stream& s, uint32_t a,     int, int=0) { ser_writedata32(s, a); }
-template<typename Stream> inline void Serialize(Stream& s, int64_t a,      int, int=0) { ser_writedata64(s, a); }
-template<typename Stream> inline void Serialize(Stream& s, uint64_t a,     int, int=0) { ser_writedata64(s, a); }
-template<typename Stream> inline void Serialize(Stream& s, float a,        int, int=0) { ser_writedata32(s, ser_float_to_uint32(a)); }
-template<typename Stream> inline void Serialize(Stream& s, double a,       int, int=0) { ser_writedata64(s, ser_double_to_uint64(a)); }
+template<typename Stream> inline void Serialize(Stream& s, char a    ) { ser_writedata8(s, a); } // TODO Get rid of bare char
+template<typename Stream> inline void Serialize(Stream& s, int8_t a  ) { ser_writedata8(s, a); }
+template<typename Stream> inline void Serialize(Stream& s, uint8_t a ) { ser_writedata8(s, a); }
+template<typename Stream> inline void Serialize(Stream& s, int16_t a ) { ser_writedata16(s, a); }
+template<typename Stream> inline void Serialize(Stream& s, uint16_t a) { ser_writedata16(s, a); }
+template<typename Stream> inline void Serialize(Stream& s, int32_t a ) { ser_writedata32(s, a); }
+template<typename Stream> inline void Serialize(Stream& s, uint32_t a) { ser_writedata32(s, a); }
+template<typename Stream> inline void Serialize(Stream& s, int64_t a ) { ser_writedata64(s, a); }
+template<typename Stream> inline void Serialize(Stream& s, uint64_t a) { ser_writedata64(s, a); }
+template<typename Stream> inline void Serialize(Stream& s, float a   ) { ser_writedata32(s, ser_float_to_uint32(a)); }
+template<typename Stream> inline void Serialize(Stream& s, double a  ) { ser_writedata64(s, ser_double_to_uint64(a)); }
 
-template<typename Stream> inline void Unserialize(Stream& s, char& a,      int, int=0) { a = ser_readdata8(s); } // TODO Get rid of bare char
-template<typename Stream> inline void Unserialize(Stream& s, int8_t& a,    int, int=0) { a = ser_readdata8(s); }
-template<typename Stream> inline void Unserialize(Stream& s, uint8_t& a,   int, int=0) { a = ser_readdata8(s); }
-template<typename Stream> inline void Unserialize(Stream& s, int16_t& a,   int, int=0) { a = ser_readdata16(s); }
-template<typename Stream> inline void Unserialize(Stream& s, uint16_t& a,  int, int=0) { a = ser_readdata16(s); }
-template<typename Stream> inline void Unserialize(Stream& s, int32_t& a,   int, int=0) { a = ser_readdata32(s); }
-template<typename Stream> inline void Unserialize(Stream& s, uint32_t& a,  int, int=0) { a = ser_readdata32(s); }
-template<typename Stream> inline void Unserialize(Stream& s, int64_t& a,   int, int=0) { a = ser_readdata64(s); }
-template<typename Stream> inline void Unserialize(Stream& s, uint64_t& a,  int, int=0) { a = ser_readdata64(s); }
-template<typename Stream> inline void Unserialize(Stream& s, float& a,     int, int=0) { a = ser_uint32_to_float(ser_readdata32(s)); }
-template<typename Stream> inline void Unserialize(Stream& s, double& a,    int, int=0) { a = ser_uint64_to_double(ser_readdata64(s)); }
+template<typename Stream> inline void Unserialize(Stream& s, char& a    ) { a = ser_readdata8(s); } // TODO Get rid of bare char
+template<typename Stream> inline void Unserialize(Stream& s, int8_t& a  ) { a = ser_readdata8(s); }
+template<typename Stream> inline void Unserialize(Stream& s, uint8_t& a ) { a = ser_readdata8(s); }
+template<typename Stream> inline void Unserialize(Stream& s, int16_t& a ) { a = ser_readdata16(s); }
+template<typename Stream> inline void Unserialize(Stream& s, uint16_t& a) { a = ser_readdata16(s); }
+template<typename Stream> inline void Unserialize(Stream& s, int32_t& a ) { a = ser_readdata32(s); }
+template<typename Stream> inline void Unserialize(Stream& s, uint32_t& a) { a = ser_readdata32(s); }
+template<typename Stream> inline void Unserialize(Stream& s, int64_t& a ) { a = ser_readdata64(s); }
+template<typename Stream> inline void Unserialize(Stream& s, uint64_t& a) { a = ser_readdata64(s); }
+template<typename Stream> inline void Unserialize(Stream& s, float& a   ) { a = ser_uint32_to_float(ser_readdata32(s)); }
+template<typename Stream> inline void Unserialize(Stream& s, double& a  ) { a = ser_uint64_to_double(ser_readdata64(s)); }
 
-template<typename Stream> inline void Serialize(Stream& s, bool a, int, int=0)    { char f=a; ser_writedata8(s, f); }
-template<typename Stream> inline void Unserialize(Stream& s, bool& a, int, int=0) { char f=ser_readdata8(s); a=f; }
+template<typename Stream> inline void Serialize(Stream& s, bool a)    { char f=a; ser_writedata8(s, f); }
+template<typename Stream> inline void Unserialize(Stream& s, bool& a) { char f=ser_readdata8(s); a=f; }
 
 
 
@@ -386,13 +383,13 @@ class CFlatData
     const char* end() const { return pend; }
 
     template<typename Stream>
-    void Serialize(Stream& s, int, int=0) const
+    void Serialize(Stream& s) const
     {
         s.write(pbegin, pend - pbegin);
     }
 
     template<typename Stream>
-    void Unserialize(Stream& s, int, int=0)
+    void Unserialize(Stream& s)
     {
         s.read(pbegin, pend - pbegin);
     }
@@ -407,12 +404,12 @@ class CVarInt
     CVarInt(I& nIn) : n(nIn) { }
 
     template<typename Stream>
-    void Serialize(Stream &s, int, int) const {
+    void Serialize(Stream &s) const {
         WriteVarInt<Stream,I>(s, n);
     }
 
     template<typename Stream>
-    void Unserialize(Stream& s, int, int) {
+    void Unserialize(Stream& s) {
         n = ReadVarInt<Stream,I>(s);
     }
 };
@@ -425,12 +422,12 @@ class CCompactSize
     CCompactSize(uint64_t& nIn) : n(nIn) { }
 
     template<typename Stream>
-    void Serialize(Stream &s, int, int) const {
+    void Serialize(Stream &s) const {
         WriteCompactSize<Stream>(s, n);
     }
 
     template<typename Stream>
-    void Unserialize(Stream& s, int, int) {
+    void Unserialize(Stream& s) {
         n = ReadCompactSize<Stream>(s);
     }
 };
@@ -444,7 +441,7 @@ class LimitedString
     LimitedString(std::string& string) : string(string) {}
 
     template<typename Stream>
-    void Unserialize(Stream& s, int, int=0)
+    void Unserialize(Stream& s)
     {
         size_t size = ReadCompactSize(s);
         if (size > Limit) {
@@ -456,7 +453,7 @@ class LimitedString
     }
 
     template<typename Stream>
-    void Serialize(Stream& s, int, int=0) const
+    void Serialize(Stream& s) const
     {
         WriteCompactSize(s, string.size());
         if (!string.empty())
@@ -474,48 +471,48 @@ CVarInt<I> WrapVarInt(I& n) { return CVarInt<I>(n); }
 /**
  *  string
  */
-template<typename Stream, typename C> void Serialize(Stream& os, const std::basic_string<C>& str, int, int=0);
-template<typename Stream, typename C> void Unserialize(Stream& is, std::basic_string<C>& str, int, int=0);
+template<typename Stream, typename C> void Serialize(Stream& os, const std::basic_string<C>& str);
+template<typename Stream, typename C> void Unserialize(Stream& is, std::basic_string<C>& str);
 
 /**
  * prevector
  * prevectors of unsigned char are a special case and are intended to be serialized as a single opaque blob.
  */
-template<typename Stream, unsigned int N, typename T> void Serialize_impl(Stream& os, const prevector<N, T>& v, int nType, int nVersion, const unsigned char&);
-template<typename Stream, unsigned int N, typename T, typename V> void Serialize_impl(Stream& os, const prevector<N, T>& v, int nType, int nVersion, const V&);
-template<typename Stream, unsigned int N, typename T> inline void Serialize(Stream& os, const prevector<N, T>& v, int nType, int nVersion);
-template<typename Stream, unsigned int N, typename T> void Unserialize_impl(Stream& is, prevector<N, T>& v, int nType, int nVersion, const unsigned char&);
-template<typename Stream, unsigned int N, typename T, typename V> void Unserialize_impl(Stream& is, prevector<N, T>& v, int nType, int nVersion, const V&);
-template<typename Stream, unsigned int N, typename T> inline void Unserialize(Stream& is, prevector<N, T>& v, int nType, int nVersion);
+template<typename Stream, unsigned int N, typename T> void Serialize_impl(Stream& os, const prevector<N, T>& v, const unsigned char&);
+template<typename Stream, unsigned int N, typename T, typename V> void Serialize_impl(Stream& os, const prevector<N, T>& v, const V&);
+template<typename Stream, unsigned int N, typename T> inline void Serialize(Stream& os, const prevector<N, T>& v);
+template<typename Stream, unsigned int N, typename T> void Unserialize_impl(Stream& is, prevector<N, T>& v, const unsigned char&);
+template<typename Stream, unsigned int N, typename T, typename V> void Unserialize_impl(Stream& is, prevector<N, T>& v, const V&);
+template<typename Stream, unsigned int N, typename T> inline void Unserialize(Stream& is, prevector<N, T>& v);
 
 /**
  * vector
  * vectors of unsigned char are a special case and are intended to be serialized as a single opaque blob.
  */
-template<typename Stream, typename T, typename A> void Serialize_impl(Stream& os, const std::vector<T, A>& v, int nType, int nVersion, const unsigned char&);
-template<typename Stream, typename T, typename A, typename V> void Serialize_impl(Stream& os, const std::vector<T, A>& v, int nType, int nVersion, const V&);
-template<typename Stream, typename T, typename A> inline void Serialize(Stream& os, const std::vector<T, A>& v, int nType, int nVersion);
-template<typename Stream, typename T, typename A> void Unserialize_impl(Stream& is, std::vector<T, A>& v, int nType, int nVersion, const unsigned char&);
-template<typename Stream, typename T, typename A, typename V> void Unserialize_impl(Stream& is, std::vector<T, A>& v, int nType, int nVersion, const V&);
-template<typename Stream, typename T, typename A> inline void Unserialize(Stream& is, std::vector<T, A>& v, int nType, int nVersion);
+template<typename Stream, typename T, typename A> void Serialize_impl(Stream& os, const std::vector<T, A>& v, const unsigned char&);
+template<typename Stream, typename T, typename A, typename V> void Serialize_impl(Stream& os, const std::vector<T, A>& v, const V&);
+template<typename Stream, typename T, typename A> inline void Serialize(Stream& os, const std::vector<T, A>& v);
+template<typename Stream, typename T, typename A> void Unserialize_impl(Stream& is, std::vector<T, A>& v, const unsigned char&);
+template<typename Stream, typename T, typename A, typename V> void Unserialize_impl(Stream& is, std::vector<T, A>& v, const V&);
+template<typename Stream, typename T, typename A> inline void Unserialize(Stream& is, std::vector<T, A>& v);
 
 /**
  * pair
  */
-template<typename Stream, typename K, typename T> void Serialize(Stream& os, const std::pair<K, T>& item, int nType, int nVersion);
-template<typename Stream, typename K, typename T> void Unserialize(Stream& is, std::pair<K, T>& item, int nType, int nVersion);
+template<typename Stream, typename K, typename T> void Serialize(Stream& os, const std::pair<K, T>& item);
+template<typename Stream, typename K, typename T> void Unserialize(Stream& is, std::pair<K, T>& item);
 
 /**
  * map
  */
-template<typename Stream, typename K, typename T, typename Pred, typename A> void Serialize(Stream& os, const std::map<K, T, Pred, A>& m, int nType, int nVersion);
-template<typename Stream, typename K, typename T, typename Pred, typename A> void Unserialize(Stream& is, std::map<K, T, Pred, A>& m, int nType, int nVersion);
+template<typename Stream, typename K, typename T, typename Pred, typename A> void Serialize(Stream& os, const std::map<K, T, Pred, A>& m);
+template<typename Stream, typename K, typename T, typename Pred, typename A> void Unserialize(Stream& is, std::map<K, T, Pred, A>& m);
 
 /**
  * set
  */
-template<typename Stream, typename K, typename Pred, typename A> void Serialize(Stream& os, const std::set<K, Pred, A>& m, int nType, int nVersion);
-template<typename Stream, typename K, typename Pred, typename A> void Unserialize(Stream& is, std::set<K, Pred, A>& m, int nType, int nVersion);
+template<typename Stream, typename K, typename Pred, typename A> void Serialize(Stream& os, const std::set<K, Pred, A>& m);
+template<typename Stream, typename K, typename Pred, typename A> void Unserialize(Stream& is, std::set<K, Pred, A>& m);
 
 
 
@@ -523,20 +520,17 @@ template<typename Stream, typename K, typename Pred, typename A> void Unserializ
 
 /**
  * If none of the specialized versions above matched, default to calling member function.
- * "int nType" is changed to "long nType" to keep from getting an ambiguous overload error.
- * The compiler will only cast int to long if none of the other templates matched.
- * Thanks to Boost serialization for this idea.
  */
 template<typename Stream, typename T>
-inline void Serialize(Stream& os, const T& a, long nType, int nVersion)
+inline void Serialize(Stream& os, const T& a)
 {
-    a.Serialize(os, (int)nType, nVersion);
+    a.Serialize(os);
 }
 
 template<typename Stream, typename T>
-inline void Unserialize(Stream& is, T& a, long nType, int nVersion)
+inline void Unserialize(Stream& is, T& a)
 {
-    a.Unserialize(is, (int)nType, nVersion);
+    a.Unserialize(is);
 }
 
 
@@ -547,7 +541,7 @@ inline void Unserialize(Stream& is, T& a, long nType, int nVersion)
  * string
  */
 template<typename Stream, typename C>
-void Serialize(Stream& os, const std::basic_string<C>& str, int, int)
+void Serialize(Stream& os, const std::basic_string<C>& str)
 {
     WriteCompactSize(os, str.size());
     if (!str.empty())
@@ -555,7 +549,7 @@ void Serialize(Stream& os, const std::basic_string<C>& str, int, int)
 }
 
 template<typename Stream, typename C>
-void Unserialize(Stream& is, std::basic_string<C>& str, int, int)
+void Unserialize(Stream& is, std::basic_string<C>& str)
 {
     unsigned int nSize = ReadCompactSize(is);
     str.resize(nSize);
@@ -569,7 +563,7 @@ void Unserialize(Stream& is, std::basic_string<C>& str, int, int)
  * prevector
  */
 template<typename Stream, unsigned int N, typename T>
-void Serialize_impl(Stream& os, const prevector<N, T>& v, int nType, int nVersion, const unsigned char&)
+void Serialize_impl(Stream& os, const prevector<N, T>& v, const unsigned char&)
 {
     WriteCompactSize(os, v.size());
     if (!v.empty())
@@ -577,22 +571,22 @@ void Serialize_impl(Stream& os, const prevector<N, T>& v, int nType, int nVersio
 }
 
 template<typename Stream, unsigned int N, typename T, typename V>
-void Serialize_impl(Stream& os, const prevector<N, T>& v, int nType, int nVersion, const V&)
+void Serialize_impl(Stream& os, const prevector<N, T>& v, const V&)
 {
     WriteCompactSize(os, v.size());
     for (typename prevector<N, T>::const_iterator vi = v.begin(); vi != v.end(); ++vi)
-        ::Serialize(os, (*vi), nType, nVersion);
+        ::Serialize(os, (*vi));
 }
 
 template<typename Stream, unsigned int N, typename T>
-inline void Serialize(Stream& os, const prevector<N, T>& v, int nType, int nVersion)
+inline void Serialize(Stream& os, const prevector<N, T>& v)
 {
-    Serialize_impl(os, v, nType, nVersion, T());
+    Serialize_impl(os, v, T());
 }
 
 
 template<typename Stream, unsigned int N, typename T>
-void Unserialize_impl(Stream& is, prevector<N, T>& v, int nType, int nVersion, const unsigned char&)
+void Unserialize_impl(Stream& is, prevector<N, T>& v, const unsigned char&)
 {
     // Limit size per read so bogus size value won't cause out of memory
     v.clear();
@@ -608,7 +602,7 @@ void Unserialize_impl(Stream& is, prevector<N, T>& v, int nType, int nVersion, c
 }
 
 template<typename Stream, unsigned int N, typename T, typename V>
-void Unserialize_impl(Stream& is, prevector<N, T>& v, int nType, int nVersion, const V&)
+void Unserialize_impl(Stream& is, prevector<N, T>& v, const V&)
 {
     v.clear();
     unsigned int nSize = ReadCompactSize(is);
@@ -621,14 +615,14 @@ void Unserialize_impl(Stream& is, prevector<N, T>& v, int nType, int nVersion, c
             nMid = nSize;
         v.resize(nMid);
         for (; i < nMid; i++)
-            Unserialize(is, v[i], nType, nVersion);
+            Unserialize(is, v[i]);
     }
 }
 
 template<typename Stream, unsigned int N, typename T>
-inline void Unserialize(Stream& is, prevector<N, T>& v, int nType, int nVersion)
+inline void Unserialize(Stream& is, prevector<N, T>& v)
 {
-    Unserialize_impl(is, v, nType, nVersion, T());
+    Unserialize_impl(is, v, T());
 }
 
 
@@ -637,7 +631,7 @@ inline void Unserialize(Stream& is, prevector<N, T>& v, int nType, int nVersion)
  * vector
  */
 template<typename Stream, typename T, typename A>
-void Serialize_impl(Stream& os, const std::vector<T, A>& v, int nType, int nVersion, const unsigned char&)
+void Serialize_impl(Stream& os, const std::vector<T, A>& v, const unsigned char&)
 {
     WriteCompactSize(os, v.size());
     if (!v.empty())
@@ -645,22 +639,22 @@ void Serialize_impl(Stream& os, const std::vector<T, A>& v, int nType, int nVers
 }
 
 template<typename Stream, typename T, typename A, typename V>
-void Serialize_impl(Stream& os, const std::vector<T, A>& v, int nType, int nVersion, const V&)
+void Serialize_impl(Stream& os, const std::vector<T, A>& v, const V&)
 {
     WriteCompactSize(os, v.size());
     for (typename std::vector<T, A>::const_iterator vi = v.begin(); vi != v.end(); ++vi)
-        ::Serialize(os, (*vi), nType, nVersion);
+        ::Serialize(os, (*vi));
 }
 
 template<typename Stream, typename T, typename A>
-inline void Serialize(Stream& os, const std::vector<T, A>& v, int nType, int nVersion)
+inline void Serialize(Stream& os, const std::vector<T, A>& v)
 {
-    Serialize_impl(os, v, nType, nVersion, T());
+    Serialize_impl(os, v, T());
 }
 
 
 template<typename Stream, typename T, typename A>
-void Unserialize_impl(Stream& is, std::vector<T, A>& v, int nType, int nVersion, const unsigned char&)
+void Unserialize_impl(Stream& is, std::vector<T, A>& v, const unsigned char&)
 {
     // Limit size per read so bogus size value won't cause out of memory
     v.clear();
@@ -676,7 +670,7 @@ void Unserialize_impl(Stream& is, std::vector<T, A>& v, int nType, int nVersion,
 }
 
 template<typename Stream, typename T, typename A, typename V>
-void Unserialize_impl(Stream& is, std::vector<T, A>& v, int nType, int nVersion, const V&)
+void Unserialize_impl(Stream& is, std::vector<T, A>& v, const V&)
 {
     v.clear();
     unsigned int nSize = ReadCompactSize(is);
@@ -689,14 +683,14 @@ void Unserialize_impl(Stream& is, std::vector<T, A>& v, int nType, int nVersion,
             nMid = nSize;
         v.resize(nMid);
         for (; i < nMid; i++)
-            Unserialize(is, v[i], nType, nVersion);
+            Unserialize(is, v[i]);
     }
 }
 
 template<typename Stream, typename T, typename A>
-inline void Unserialize(Stream& is, std::vector<T, A>& v, int nType, int nVersion)
+inline void Unserialize(Stream& is, std::vector<T, A>& v)
 {
-    Unserialize_impl(is, v, nType, nVersion, T());
+    Unserialize_impl(is, v, T());
 }
 
 
@@ -705,17 +699,17 @@ inline void Unserialize(Stream& is, std::vector<T, A>& v, int nType, int nVersio
  * pair
  */
 template<typename Stream, typename K, typename T>
-void Serialize(Stream& os, const std::pair<K, T>& item, int nType, int nVersion)
+void Serialize(Stream& os, const std::pair<K, T>& item)
 {
-    Serialize(os, item.first, nType, nVersion);
-    Serialize(os, item.second, nType, nVersion);
+    Serialize(os, item.first);
+    Serialize(os, item.second);
 }
 
 template<typename Stream, typename K, typename T>
-void Unserialize(Stream& is, std::pair<K, T>& item, int nType, int nVersion)
+void Unserialize(Stream& is, std::pair<K, T>& item)
 {
-    Unserialize(is, item.first, nType, nVersion);
-    Unserialize(is, item.second, nType, nVersion);
+    Unserialize(is, item.first);
+    Unserialize(is, item.second);
 }
 
 
@@ -724,15 +718,15 @@ void Unserialize(Stream& is, std::pair<K, T>& item, int nType, int nVersion)
  * map
  */
 template<typename Stream, typename K, typename T, typename Pred, typename A>
-void Serialize(Stream& os, const std::map<K, T, Pred, A>& m, int nType, int nVersion)
+void Serialize(Stream& os, const std::map<K, T, Pred, A>& m)
 {
     WriteCompactSize(os, m.size());
     for (typename std::map<K, T, Pred, A>::const_iterator mi = m.begin(); mi != m.end(); ++mi)
-        Serialize(os, (*mi), nType, nVersion);
+        Serialize(os, (*mi));
 }
 
 template<typename Stream, typename K, typename T, typename Pred, typename A>
-void Unserialize(Stream& is, std::map<K, T, Pred, A>& m, int nType, int nVersion)
+void Unserialize(Stream& is, std::map<K, T, Pred, A>& m)
 {
     m.clear();
     unsigned int nSize = ReadCompactSize(is);
@@ -740,7 +734,7 @@ void Unserialize(Stream& is, std::map<K, T, Pred, A>& m, int nType, int nVersion
     for (unsigned int i = 0; i < nSize; i++)
     {
         std::pair<K, T> item;
-        Unserialize(is, item, nType, nVersion);
+        Unserialize(is, item);
         mi = m.insert(mi, item);
     }
 }
@@ -751,15 +745,15 @@ void Unserialize(Stream& is, std::map<K, T, Pred, A>& m, int nType, int nVersion
  * set
  */
 template<typename Stream, typename K, typename Pred, typename A>
-void Serialize(Stream& os, const std::set<K, Pred, A>& m, int nType, int nVersion)
+void Serialize(Stream& os, const std::set<K, Pred, A>& m)
 {
     WriteCompactSize(os, m.size());
     for (typename std::set<K, Pred, A>::const_iterator it = m.begin(); it != m.end(); ++it)
-        Serialize(os, (*it), nType, nVersion);
+        Serialize(os, (*it));
 }
 
 template<typename Stream, typename K, typename Pred, typename A>
-void Unserialize(Stream& is, std::set<K, Pred, A>& m, int nType, int nVersion)
+void Unserialize(Stream& is, std::set<K, Pred, A>& m)
 {
     m.clear();
     unsigned int nSize = ReadCompactSize(is);
@@ -767,7 +761,7 @@ void Unserialize(Stream& is, std::set<K, Pred, A>& m, int nType, int nVersion)
     for (unsigned int i = 0; i < nSize; i++)
     {
         K key;
-        Unserialize(is, key, nType, nVersion);
+        Unserialize(is, key);
         it = m.insert(it, key);
     }
 }
@@ -787,15 +781,15 @@ struct CSerActionUnserialize
 };
 
 template<typename Stream, typename T>
-inline void SerReadWrite(Stream& s, const T& obj, int nType, int nVersion, CSerActionSerialize ser_action)
+inline void SerReadWrite(Stream& s, const T& obj, CSerActionSerialize ser_action)
 {
-    ::Serialize(s, obj, nType, nVersion);
+    ::Serialize(s, obj);
 }
 
 template<typename Stream, typename T>
-inline void SerReadWrite(Stream& s, T& obj, int nType, int nVersion, CSerActionUnserialize ser_action)
+inline void SerReadWrite(Stream& s, T& obj, CSerActionUnserialize ser_action)
 {
-    ::Unserialize(s, obj, nType, nVersion);
+    ::Unserialize(s, obj);
 }
 
 
@@ -814,7 +808,6 @@ class CSizeComputer
     const int nType;
     const int nVersion;
 public:
-
     CSizeComputer(int nTypeIn, int nVersionIn) : nSize(0), nType(nTypeIn), nVersion(nVersionIn) {}
 
     void write(const char *psz, size_t nSize)
@@ -825,61 +818,64 @@ class CSizeComputer
     template<typename T>
     CSizeComputer& operator<<(const T& obj)
     {
-        ::Serialize(*this, obj, nType, nVersion);
+        ::Serialize(*this, obj);
         return (*this);
     }
 
     size_t size() const {
         return nSize;
     }
+
+    int GetVersion() const { return nVersion; }
+    int GetType() const { return nType; }
 };
 
 template<typename Stream>
-void SerializeMany(Stream& s, int nType, int nVersion)
+void SerializeMany(Stream& s)
 {
 }
 
 template<typename Stream, typename Arg>
-void SerializeMany(Stream& s, int nType, int nVersion, Arg&& arg)
+void SerializeMany(Stream& s, Arg&& arg)
 {
-    ::Serialize(s, std::forward<Arg>(arg), nType, nVersion);
+    ::Serialize(s, std::forward<Arg>(arg));
 }
 
 template<typename Stream, typename Arg, typename... Args>
-void SerializeMany(Stream& s, int nType, int nVersion, Arg&& arg, Args&&... args)
+void SerializeMany(Stream& s, Arg&& arg, Args&&... args)
 {
-    ::Serialize(s, std::forward<Arg>(arg), nType, nVersion);
-    ::SerializeMany(s, nType, nVersion, std::forward<Args>(args)...);
+    ::Serialize(s, std::forward<Arg>(arg));
+    ::SerializeMany(s, std::forward<Args>(args)...);
 }
 
 template<typename Stream>
-inline void UnserializeMany(Stream& s, int nType, int nVersion)
+inline void UnserializeMany(Stream& s)
 {
 }
 
 template<typename Stream, typename Arg>
-inline void UnserializeMany(Stream& s, int nType, int nVersion, Arg& arg)
+inline void UnserializeMany(Stream& s, Arg& arg)
 {
-    ::Unserialize(s, arg, nType, nVersion);
+    ::Unserialize(s, arg);
 }
 
 template<typename Stream, typename Arg, typename... Args>
-inline void UnserializeMany(Stream& s, int nType, int nVersion, Arg& arg, Args&... args)
+inline void UnserializeMany(Stream& s, Arg& arg, Args&... args)
 {
-    ::Unserialize(s, arg, nType, nVersion);
-    ::UnserializeMany(s, nType, nVersion, args...);
+    ::Unserialize(s, arg);
+    ::UnserializeMany(s, args...);
 }
 
 template<typename Stream, typename... Args>
-inline void SerReadWriteMany(Stream& s, int nType, int nVersion, CSerActionSerialize ser_action, Args&&... args)
+inline void SerReadWriteMany(Stream& s, CSerActionSerialize ser_action, Args&&... args)
 {
-    ::SerializeMany(s, nType, nVersion, std::forward<Args>(args)...);
+    ::SerializeMany(s, std::forward<Args>(args)...);
 }
 
 template<typename Stream, typename... Args>
-inline void SerReadWriteMany(Stream& s, int nType, int nVersion, CSerActionUnserialize ser_action, Args&... args)
+inline void SerReadWriteMany(Stream& s, CSerActionUnserialize ser_action, Args&... args)
 {
-    ::UnserializeMany(s, nType, nVersion, args...);
+    ::UnserializeMany(s, args...);
 }
 
 template <typename T>
diff --git a/src/streams.h b/src/streams.h
index d9965b534d6b4..c3e7c9e9e4a49 100644
--- a/src/streams.h
+++ b/src/streams.h
@@ -37,7 +37,7 @@ class OverrideStream
     OverrideStream<Stream>& operator<<(const T& obj)
     {
         // Serialize to this stream
-        ::Serialize(*this->stream, obj, nType, nVersion);
+        ::Serialize(*this, obj);
         return (*this);
     }
 
@@ -45,9 +45,22 @@ class OverrideStream
     OverrideStream<Stream>& operator>>(T& obj)
     {
         // Unserialize from this stream
-        ::Unserialize(*this->stream, obj, nType, nVersion);
+        ::Unserialize(*this, obj);
         return (*this);
     }
+
+    void write(const char* pch, size_t nSize)
+    {
+        stream->write(pch, nSize);
+    }
+
+    void read(char* pch, size_t nSize)
+    {
+        stream->read(pch, nSize);
+    }
+
+    int GetVersion() const { return nVersion; }
+    int GetType() const { return nType; }
 };
 
 template<typename S>
@@ -118,7 +131,7 @@ class CDataStream
     CDataStream(int nTypeIn, int nVersionIn, Args&&... args)
     {
         Init(nTypeIn, nVersionIn);
-        ::SerializeMany(*this, nType, nVersion, std::forward<Args>(args)...);
+        ::SerializeMany(*this, std::forward<Args>(args)...);
     }
 
     void Init(int nTypeIn, int nVersionIn)
@@ -301,7 +314,7 @@ class CDataStream
     }
 
     template<typename Stream>
-    void Serialize(Stream& s, int nType, int nVersion) const
+    void Serialize(Stream& s) const
     {
         // Special case: stream << stream concatenates like stream += stream
         if (!vch.empty())
@@ -312,7 +325,7 @@ class CDataStream
     CDataStream& operator<<(const T& obj)
     {
         // Serialize to this stream
-        ::Serialize(*this, obj, nType, nVersion);
+        ::Serialize(*this, obj);
         return (*this);
     }
 
@@ -320,7 +333,7 @@ class CDataStream
     CDataStream& operator>>(T& obj)
     {
         // Unserialize from this stream
-        ::Unserialize(*this, obj, nType, nVersion);
+        ::Unserialize(*this, obj);
         return (*this);
     }
 
@@ -456,7 +469,7 @@ class CAutoFile
         // Serialize to this stream
         if (!file)
             throw std::ios_base::failure("CAutoFile::operator<<: file handle is NULL");
-        ::Serialize(*this, obj, nType, nVersion);
+        ::Serialize(*this, obj);
         return (*this);
     }
 
@@ -466,7 +479,7 @@ class CAutoFile
         // Unserialize from this stream
         if (!file)
             throw std::ios_base::failure("CAutoFile::operator>>: file handle is NULL");
-        ::Unserialize(*this, obj, nType, nVersion);
+        ::Unserialize(*this, obj);
         return (*this);
     }
 };
@@ -525,6 +538,9 @@ class CBufferedFile
         fclose();
     }
 
+    int GetVersion() const { return nVersion; }
+    int GetType() const { return nType; }
+
     void fclose()
     {
         if (src) {
@@ -603,7 +619,7 @@ class CBufferedFile
     template<typename T>
     CBufferedFile& operator>>(T& obj) {
         // Unserialize from this stream
-        ::Unserialize(*this, obj, nType, nVersion);
+        ::Unserialize(*this, obj);
         return (*this);
     }
 
diff --git a/src/test/blockencodings_tests.cpp b/src/test/blockencodings_tests.cpp
index b0d9184816ee9..0ed5d62ef67e1 100644
--- a/src/test/blockencodings_tests.cpp
+++ b/src/test/blockencodings_tests.cpp
@@ -129,7 +129,7 @@ class TestHeaderAndShortIDs {
     ADD_SERIALIZE_METHODS;
 
     template <typename Stream, typename Operation>
-    inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) {
+    inline void SerializationOp(Stream& s, Operation ser_action) {
         READWRITE(header);
         READWRITE(nonce);
         size_t shorttxids_size = shorttxids.size();
diff --git a/src/test/bloom_tests.cpp b/src/test/bloom_tests.cpp
index 042fad42dae89..25fb9ea2b757c 100644
--- a/src/test/bloom_tests.cpp
+++ b/src/test/bloom_tests.cpp
@@ -41,7 +41,7 @@ BOOST_AUTO_TEST_CASE(bloom_create_insert_serialize)
     BOOST_CHECK_MESSAGE(filter.contains(ParseHex("b9300670b4c5366e95b2699e8b18bc75e5f729c5")), "BloomFilter doesn't contain just-inserted object (3)!");
 
     CDataStream stream(SER_NETWORK, PROTOCOL_VERSION);
-    filter.Serialize(stream, SER_NETWORK, PROTOCOL_VERSION);
+    stream << filter;
 
     vector<unsigned char> vch = ParseHex("03614e9b050000000000000001");
     vector<char> expected(vch.size());
@@ -73,7 +73,7 @@ BOOST_AUTO_TEST_CASE(bloom_create_insert_serialize_with_tweak)
     BOOST_CHECK_MESSAGE(filter.contains(ParseHex("b9300670b4c5366e95b2699e8b18bc75e5f729c5")), "BloomFilter doesn't contain just-inserted object (3)!");
 
     CDataStream stream(SER_NETWORK, PROTOCOL_VERSION);
-    filter.Serialize(stream, SER_NETWORK, PROTOCOL_VERSION);
+    stream << filter;
 
     vector<unsigned char> vch = ParseHex("03ce4299050000000100008001");
     vector<char> expected(vch.size());
@@ -100,7 +100,7 @@ BOOST_AUTO_TEST_CASE(bloom_create_insert_key)
     filter.insert(vector<unsigned char>(hash.begin(), hash.end()));
 
     CDataStream stream(SER_NETWORK, PROTOCOL_VERSION);
-    filter.Serialize(stream, SER_NETWORK, PROTOCOL_VERSION);
+    stream << filter;
 
     vector<unsigned char> vch = ParseHex("038fc16b080000000000000001");
     vector<char> expected(vch.size());
diff --git a/src/test/dbwrapper_tests.cpp b/src/test/dbwrapper_tests.cpp
index d4d825d199406..2d791ee18d5a8 100644
--- a/src/test/dbwrapper_tests.cpp
+++ b/src/test/dbwrapper_tests.cpp
@@ -254,7 +254,7 @@ struct StringContentsSerializer {
     ADD_SERIALIZE_METHODS;
 
     template <typename Stream, typename Operation>
-    inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) {
+    inline void SerializationOp(Stream& s, Operation ser_action) {
         if (ser_action.ForRead()) {
             str.clear();
             char c = 0;
diff --git a/src/test/net_tests.cpp b/src/test/net_tests.cpp
index e0460109d5c23..87cb38daac3d2 100644
--- a/src/test/net_tests.cpp
+++ b/src/test/net_tests.cpp
@@ -17,7 +17,7 @@ using namespace std;
 class CAddrManSerializationMock : public CAddrMan
 {
 public:
-    virtual void Serialize(CDataStream& s, int nType, int nVersionDummy) const = 0;
+    virtual void Serialize(CDataStream& s) const = 0;
 
     //! Ensure that bucket placement is always the same for testing purposes.
     void MakeDeterministic()
@@ -30,16 +30,16 @@ class CAddrManSerializationMock : public CAddrMan
 class CAddrManUncorrupted : public CAddrManSerializationMock
 {
 public:
-    void Serialize(CDataStream& s, int nType, int nVersionDummy) const
+    void Serialize(CDataStream& s) const
     {
-        CAddrMan::Serialize(s, nType, nVersionDummy);
+        CAddrMan::Serialize(s);
     }
 };
 
 class CAddrManCorrupted : public CAddrManSerializationMock
 {
 public:
-    void Serialize(CDataStream& s, int nType, int nVersionDummy) const
+    void Serialize(CDataStream& s) const
     {
         // Produces corrupt output that claims addrman has 20 addrs when it only has one addr.
         unsigned char nVersion = 1;
diff --git a/src/test/serialize_tests.cpp b/src/test/serialize_tests.cpp
index 4c0fdc77f70be..bbadf57957c94 100644
--- a/src/test/serialize_tests.cpp
+++ b/src/test/serialize_tests.cpp
@@ -28,7 +28,7 @@ class CSerializeMethodsTestSingle
     ADD_SERIALIZE_METHODS;
 
     template <typename Stream, typename Operation>
-    inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) {
+    inline void SerializationOp(Stream& s, Operation ser_action) {
         READWRITE(intval);
         READWRITE(boolval);
         READWRITE(stringval);
@@ -53,7 +53,7 @@ class CSerializeMethodsTestMany : public CSerializeMethodsTestSingle
     ADD_SERIALIZE_METHODS;
 
     template <typename Stream, typename Operation>
-    inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) {
+    inline void SerializationOp(Stream& s, Operation ser_action) {
         READWRITEMANY(intval, boolval, stringval, FLATDATA(charstrval), txval);
     }
 };
diff --git a/src/test/uint256_tests.cpp b/src/test/uint256_tests.cpp
index ba8eb16ba9662..2732948060a79 100644
--- a/src/test/uint256_tests.cpp
+++ b/src/test/uint256_tests.cpp
@@ -187,22 +187,22 @@ BOOST_AUTO_TEST_CASE( methods ) // GetHex SetHex begin() end() size() GetLow64 G
     BOOST_CHECK(GetSerializeSize(R1L, 0, PROTOCOL_VERSION) == 32);
     BOOST_CHECK(GetSerializeSize(ZeroL, 0, PROTOCOL_VERSION) == 32);
 
-    std::stringstream ss;
-    R1L.Serialize(ss,0,PROTOCOL_VERSION);
+    CDataStream ss(0, PROTOCOL_VERSION);
+    ss << R1L;
     BOOST_CHECK(ss.str() == std::string(R1Array,R1Array+32));
-    TmpL.Unserialize(ss,0,PROTOCOL_VERSION);
+    ss >> TmpL;
     BOOST_CHECK(R1L == TmpL);
-    ss.str("");
-    ZeroL.Serialize(ss,0,PROTOCOL_VERSION);
+    ss.clear();
+    ss << ZeroL;
     BOOST_CHECK(ss.str() == std::string(ZeroArray,ZeroArray+32));
-    TmpL.Unserialize(ss,0,PROTOCOL_VERSION);
+    ss >> TmpL;
     BOOST_CHECK(ZeroL == TmpL);
-    ss.str("");
-    MaxL.Serialize(ss,0,PROTOCOL_VERSION);
+    ss.clear();
+    ss << MaxL;
     BOOST_CHECK(ss.str() == std::string(MaxArray,MaxArray+32));
-    TmpL.Unserialize(ss,0,PROTOCOL_VERSION);
+    ss >> TmpL;
     BOOST_CHECK(MaxL == TmpL);
-    ss.str("");
+    ss.clear();
 
     BOOST_CHECK(R1S.GetHex() == R1S.ToString());
     BOOST_CHECK(R2S.GetHex() == R2S.ToString());
@@ -233,21 +233,21 @@ BOOST_AUTO_TEST_CASE( methods ) // GetHex SetHex begin() end() size() GetLow64 G
     BOOST_CHECK(GetSerializeSize(R1S, 0, PROTOCOL_VERSION) == 20);
     BOOST_CHECK(GetSerializeSize(ZeroS, 0, PROTOCOL_VERSION) == 20);
 
-    R1S.Serialize(ss,0,PROTOCOL_VERSION);
+    ss << R1S;
     BOOST_CHECK(ss.str() == std::string(R1Array,R1Array+20));
-    TmpS.Unserialize(ss,0,PROTOCOL_VERSION);
+    ss >> TmpS;
     BOOST_CHECK(R1S == TmpS);
-    ss.str("");
-    ZeroS.Serialize(ss,0,PROTOCOL_VERSION);
+    ss.clear();
+    ss << ZeroS;
     BOOST_CHECK(ss.str() == std::string(ZeroArray,ZeroArray+20));
-    TmpS.Unserialize(ss,0,PROTOCOL_VERSION);
+    ss >> TmpS;
     BOOST_CHECK(ZeroS == TmpS);
-    ss.str("");
-    MaxS.Serialize(ss,0,PROTOCOL_VERSION);
+    ss.clear();
+    ss << MaxS;
     BOOST_CHECK(ss.str() == std::string(MaxArray,MaxArray+20));
-    TmpS.Unserialize(ss,0,PROTOCOL_VERSION);
+    ss >> TmpS;
     BOOST_CHECK(MaxS == TmpS);
-    ss.str("");
+    ss.clear();
 }
 
 BOOST_AUTO_TEST_CASE( conversion )
diff --git a/src/txdb.h b/src/txdb.h
index adb3f66327223..687c686775b03 100644
--- a/src/txdb.h
+++ b/src/txdb.h
@@ -43,7 +43,7 @@ struct CDiskTxPos : public CDiskBlockPos
     ADD_SERIALIZE_METHODS;
 
     template <typename Stream, typename Operation>
-    inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) {
+    inline void SerializationOp(Stream& s, Operation ser_action) {
         READWRITE(*(CDiskBlockPos*)this);
         READWRITE(VARINT(nTxOffset));
     }
diff --git a/src/uint256.h b/src/uint256.h
index 94fe66d26cd6b..86e7c0b6c64a7 100644
--- a/src/uint256.h
+++ b/src/uint256.h
@@ -92,13 +92,13 @@ class base_blob
     }
 
     template<typename Stream>
-    void Serialize(Stream& s, int nType, int nVersion) const
+    void Serialize(Stream& s) const
     {
         s.write((char*)data, sizeof(data));
     }
 
     template<typename Stream>
-    void Unserialize(Stream& s, int nType, int nVersion)
+    void Unserialize(Stream& s)
     {
         s.read((char*)data, sizeof(data));
     }
diff --git a/src/undo.h b/src/undo.h
index 9d6f9bd0d0073..a5d276e7f33ed 100644
--- a/src/undo.h
+++ b/src/undo.h
@@ -28,22 +28,22 @@ class CTxInUndo
     CTxInUndo(const CTxOut &txoutIn, bool fCoinBaseIn = false, unsigned int nHeightIn = 0, int nVersionIn = 0) : txout(txoutIn), fCoinBase(fCoinBaseIn), nHeight(nHeightIn), nVersion(nVersionIn) { }
 
     template<typename Stream>
-    void Serialize(Stream &s, int nType, int nVersion) const {
-        ::Serialize(s, VARINT(nHeight*2+(fCoinBase ? 1 : 0)), nType, nVersion);
+    void Serialize(Stream &s) const {
+        ::Serialize(s, VARINT(nHeight*2+(fCoinBase ? 1 : 0)));
         if (nHeight > 0)
-            ::Serialize(s, VARINT(this->nVersion), nType, nVersion);
-        ::Serialize(s, CTxOutCompressor(REF(txout)), nType, nVersion);
+            ::Serialize(s, VARINT(this->nVersion));
+        ::Serialize(s, CTxOutCompressor(REF(txout)));
     }
 
     template<typename Stream>
-    void Unserialize(Stream &s, int nType, int nVersion) {
+    void Unserialize(Stream &s) {
         unsigned int nCode = 0;
-        ::Unserialize(s, VARINT(nCode), nType, nVersion);
+        ::Unserialize(s, VARINT(nCode));
         nHeight = nCode / 2;
         fCoinBase = nCode & 1;
         if (nHeight > 0)
-            ::Unserialize(s, VARINT(this->nVersion), nType, nVersion);
-        ::Unserialize(s, REF(CTxOutCompressor(REF(txout))), nType, nVersion);
+            ::Unserialize(s, VARINT(this->nVersion));
+        ::Unserialize(s, REF(CTxOutCompressor(REF(txout))));
     }
 };
 
@@ -57,7 +57,7 @@ class CTxUndo
     ADD_SERIALIZE_METHODS;
 
     template <typename Stream, typename Operation>
-    inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) {
+    inline void SerializationOp(Stream& s, Operation ser_action) {
         READWRITE(vprevout);
     }
 };
@@ -71,7 +71,7 @@ class CBlockUndo
     ADD_SERIALIZE_METHODS;
 
     template <typename Stream, typename Operation>
-    inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) {
+    inline void SerializationOp(Stream& s, Operation ser_action) {
         READWRITE(vtxundo);
     }
 };
diff --git a/src/wallet/crypter.h b/src/wallet/crypter.h
index f00f7fa7315b1..e89c15b5d4a4f 100644
--- a/src/wallet/crypter.h
+++ b/src/wallet/crypter.h
@@ -47,7 +47,7 @@ class CMasterKey
     ADD_SERIALIZE_METHODS;
 
     template <typename Stream, typename Operation>
-    inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) {
+    inline void SerializationOp(Stream& s, Operation ser_action) {
         READWRITE(vchCryptedKey);
         READWRITE(vchSalt);
         READWRITE(nDerivationMethod);
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
index 57b17d87ad1a0..a527c6d84ef1b 100644
--- a/src/wallet/wallet.h
+++ b/src/wallet/wallet.h
@@ -100,8 +100,9 @@ class CKeyPool
     ADD_SERIALIZE_METHODS;
 
     template <typename Stream, typename Operation>
-    inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) {
-        if (!(nType & SER_GETHASH))
+    inline void SerializationOp(Stream& s, Operation ser_action) {
+        int nVersion = s.GetVersion();
+        if (!(s.GetType() & SER_GETHASH))
             READWRITE(nVersion);
         READWRITE(nTime);
         READWRITE(vchPubKey);
@@ -195,7 +196,7 @@ class CMerkleTx : public CTransaction
     ADD_SERIALIZE_METHODS;
 
     template <typename Stream, typename Operation>
-    inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) {
+    inline void SerializationOp(Stream& s, Operation ser_action) {
         std::vector<uint256> vMerkleBranch; // For compatibility with older versions.
         READWRITE(*(CTransaction*)this);
         READWRITE(hashBlock);
@@ -315,7 +316,7 @@ class CWalletTx : public CMerkleTx
     ADD_SERIALIZE_METHODS;
 
     template <typename Stream, typename Operation>
-    inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) {
+    inline void SerializationOp(Stream& s, Operation ser_action) {
         if (ser_action.ForRead())
             Init(NULL);
         char fSpent = false;
@@ -448,8 +449,9 @@ class CWalletKey
     ADD_SERIALIZE_METHODS;
 
     template <typename Stream, typename Operation>
-    inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) {
-        if (!(nType & SER_GETHASH))
+    inline void SerializationOp(Stream& s, Operation ser_action) {
+        int nVersion = s.GetVersion();
+        if (!(s.GetType() & SER_GETHASH))
             READWRITE(nVersion);
         READWRITE(vchPrivKey);
         READWRITE(nTimeCreated);
@@ -493,8 +495,9 @@ class CAccountingEntry
     ADD_SERIALIZE_METHODS;
 
     template <typename Stream, typename Operation>
-    inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) {
-        if (!(nType & SER_GETHASH))
+    inline void SerializationOp(Stream& s, Operation ser_action) {
+        int nVersion = s.GetVersion();
+        if (!(s.GetType() & SER_GETHASH))
             READWRITE(nVersion);
         //! Note: strAccount is serialized as part of the key, not here.
         READWRITE(nCreditDebit);
@@ -507,7 +510,7 @@ class CAccountingEntry
 
             if (!(mapValue.empty() && _ssExtra.empty()))
             {
-                CDataStream ss(nType, nVersion);
+                CDataStream ss(s.GetType(), s.GetVersion());
                 ss.insert(ss.begin(), '\0');
                 ss << mapValue;
                 ss.insert(ss.end(), _ssExtra.begin(), _ssExtra.end());
@@ -523,7 +526,7 @@ class CAccountingEntry
             mapValue.clear();
             if (std::string::npos != nSepPos)
             {
-                CDataStream ss(std::vector<char>(strComment.begin() + nSepPos + 1, strComment.end()), nType, nVersion);
+                CDataStream ss(std::vector<char>(strComment.begin() + nSepPos + 1, strComment.end()), s.GetType(), s.GetVersion());
                 ss >> mapValue;
                 _ssExtra = std::vector<char>(ss.begin(), ss.end());
             }
@@ -986,8 +989,9 @@ class CAccount
     ADD_SERIALIZE_METHODS;
 
     template <typename Stream, typename Operation>
-    inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) {
-        if (!(nType & SER_GETHASH))
+    inline void SerializationOp(Stream& s, Operation ser_action) {
+        int nVersion = s.GetVersion();
+        if (!(s.GetType() & SER_GETHASH))
             READWRITE(nVersion);
         READWRITE(vchPubKey);
     }
diff --git a/src/wallet/walletdb.h b/src/wallet/walletdb.h
index a0525bd9a7ce8..eb25ac613dd33 100644
--- a/src/wallet/walletdb.h
+++ b/src/wallet/walletdb.h
@@ -54,7 +54,7 @@ class CHDChain
     CHDChain() { SetNull(); }
     ADD_SERIALIZE_METHODS;
     template <typename Stream, typename Operation>
-    inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion)
+    inline void SerializationOp(Stream& s, Operation ser_action)
     {
         READWRITE(this->nVersion);
         READWRITE(nExternalChainCounter);
@@ -93,7 +93,7 @@ class CKeyMetadata
     ADD_SERIALIZE_METHODS;
 
     template <typename Stream, typename Operation>
-    inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) {
+    inline void SerializationOp(Stream& s, Operation ser_action) {
         READWRITE(this->nVersion);
         READWRITE(nCreateTime);
         if (this->nVersion >= VERSION_WITH_HDDATA)

From a603925c77d7cd15c03d8028414c8917347e81b7 Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Sun, 30 Oct 2016 13:09:20 -0700
Subject: [PATCH 1172/1802] Avoid -Wshadow errors

Suggested by Pavel Janik.
---
 src/serialize.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/serialize.h b/src/serialize.h
index fc4291fe95ca0..d26d2d52e6046 100644
--- a/src/serialize.h
+++ b/src/serialize.h
@@ -438,7 +438,7 @@ class LimitedString
 protected:
     std::string& string;
 public:
-    LimitedString(std::string& string) : string(string) {}
+    LimitedString(std::string& _string) : string(_string) {}
 
     template<typename Stream>
     void Unserialize(Stream& s)
@@ -810,9 +810,9 @@ class CSizeComputer
 public:
     CSizeComputer(int nTypeIn, int nVersionIn) : nSize(0), nType(nTypeIn), nVersion(nVersionIn) {}
 
-    void write(const char *psz, size_t nSize)
+    void write(const char *psz, size_t _nSize)
     {
-        this->nSize += nSize;
+        this->nSize += _nSize;
     }
 
     template<typename T>

From a2929a26f5cf3501804fd12071dd6cf6b464a545 Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Fri, 28 Oct 2016 17:07:29 -0700
Subject: [PATCH 1173/1802] Make CSerAction's ForRead() constexpr

The CSerAction's ForRead() method does not depend on any runtime
data, so guarantee that requests to it can be optimized out by
making it constexpr.

Suggested by Cory Fields.
---
 src/serialize.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/serialize.h b/src/serialize.h
index d26d2d52e6046..8e37f567238f0 100644
--- a/src/serialize.h
+++ b/src/serialize.h
@@ -773,11 +773,11 @@ void Unserialize(Stream& is, std::set<K, Pred, A>& m)
  */
 struct CSerActionSerialize
 {
-    bool ForRead() const { return false; }
+    constexpr bool ForRead() const { return false; }
 };
 struct CSerActionUnserialize
 {
-    bool ForRead() const { return true; }
+    constexpr bool ForRead() const { return true; }
 };
 
 template<typename Stream, typename T>

From 25a211aa9edfeccc1e65bf699e0b32619cef2157 Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Fri, 28 Oct 2016 17:50:04 -0700
Subject: [PATCH 1174/1802] Add optimized CSizeComputer serializers

To get the advantages of faster GetSerializeSize() implementations
back that were removed in "Make GetSerializeSize a wrapper on top of
CSizeComputer", reintroduce them in the few places in the form of a
specialized Serialize() implementation. This actually gets us in a
better state than before, as these even get used when they're invoked
indirectly in the serialization of another object.
---
 src/pubkey.h    |  5 +++++
 src/serialize.h | 35 +++++++++++++++++++++++++++++++++++
 2 files changed, 40 insertions(+)

diff --git a/src/pubkey.h b/src/pubkey.h
index 15207f89e1300..9499862210ae5 100644
--- a/src/pubkey.h
+++ b/src/pubkey.h
@@ -210,6 +210,11 @@ struct CExtPubKey {
     void Decode(const unsigned char code[BIP32_EXTKEY_SIZE]);
     bool Derive(CExtPubKey& out, unsigned int nChild) const;
 
+    void Serialize(CSizeComputer& s) const
+    {
+        // Optimized implementation for ::GetSerializeSize that avoids copying.
+        s.seek(BIP32_EXTKEY_SIZE + 1); // add one byte for the size (compact int)
+    }
     template <typename Stream>
     void Serialize(Stream& s) const
     {
diff --git a/src/serialize.h b/src/serialize.h
index 8e37f567238f0..91864e1b647c0 100644
--- a/src/serialize.h
+++ b/src/serialize.h
@@ -151,6 +151,8 @@ inline float ser_uint32_to_float(uint32_t y)
 // i.e. anything that supports .read(char*, size_t) and .write(char*, size_t)
 //
 
+class CSizeComputer;
+
 enum
 {
     // primary actions
@@ -225,6 +227,8 @@ inline unsigned int GetSizeOfCompactSize(uint64_t nSize)
     else                         return sizeof(unsigned char) + sizeof(uint64_t);
 }
 
+inline void WriteCompactSize(CSizeComputer& os, uint64_t nSize);
+
 template<typename Stream>
 void WriteCompactSize(Stream& os, uint64_t nSize)
 {
@@ -319,6 +323,9 @@ inline unsigned int GetSizeOfVarInt(I n)
     return nRet;
 }
 
+template<typename I>
+inline void WriteVarInt(CSizeComputer& os, I n);
+
 template<typename Stream, typename I>
 void WriteVarInt(Stream& os, I n)
 {
@@ -800,6 +807,17 @@ inline void SerReadWrite(Stream& s, T& obj, CSerActionUnserialize ser_action)
 
 
 
+/* ::GetSerializeSize implementations
+ *
+ * Computing the serialized size of objects is done through a special stream
+ * object of type CSizeComputer, which only records the number of bytes written
+ * to it.
+ *
+ * If your Serialize or SerializationOp method has non-trivial overhead for
+ * serialization, it may be worthwhile to implement a specialized version for
+ * CSizeComputer, which uses the s.seek() method to record bytes that would
+ * be written instead.
+ */
 class CSizeComputer
 {
 protected:
@@ -815,6 +833,12 @@ class CSizeComputer
         this->nSize += _nSize;
     }
 
+    /** Pretend _nSize bytes are written, without specifying them. */
+    void seek(size_t _nSize)
+    {
+        this->nSize += _nSize;
+    }
+
     template<typename T>
     CSizeComputer& operator<<(const T& obj)
     {
@@ -878,6 +902,17 @@ inline void SerReadWriteMany(Stream& s, CSerActionUnserialize ser_action, Args&.
     ::UnserializeMany(s, args...);
 }
 
+template<typename I>
+inline void WriteVarInt(CSizeComputer &s, I n)
+{
+    s.seek(GetSizeOfVarInt<I>(n));
+}
+
+inline void WriteCompactSize(CSizeComputer &s, uint64_t nSize)
+{
+    s.seek(GetSizeOfCompactSize(nSize));
+}
+
 template <typename T>
 size_t GetSerializeSize(const T& t, int nType, int nVersion = 0)
 {

From d59a518466f6b9012666a3f9392ec12fff8830b5 Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Fri, 28 Oct 2016 19:12:39 -0700
Subject: [PATCH 1175/1802] Use fixed preallocation instead of costly
 GetSerializeSize

Dbwrapper used GetSerializeSize() to compute the size of the buffer
to preallocate. For some cases (specifically: CCoins) this requires
a costly compression call. Avoid this by just using fixed size
preallocations instead.
---
 src/dbwrapper.h | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/dbwrapper.h b/src/dbwrapper.h
index 7728b49d93f0b..4a79bbd17dfec 100644
--- a/src/dbwrapper.h
+++ b/src/dbwrapper.h
@@ -17,6 +17,9 @@
 #include <leveldb/db.h>
 #include <leveldb/write_batch.h>
 
+static const size_t DBWRAPPER_PREALLOC_KEY_SIZE = 64;
+static const size_t DBWRAPPER_PREALLOC_VALUE_SIZE = 1024;
+
 class dbwrapper_error : public std::runtime_error
 {
 public:
@@ -60,12 +63,12 @@ class CDBBatch
     void Write(const K& key, const V& value)
     {
         CDataStream ssKey(SER_DISK, CLIENT_VERSION);
-        ssKey.reserve(GetSerializeSize(ssKey, key));
+        ssKey.reserve(DBWRAPPER_PREALLOC_KEY_SIZE);
         ssKey << key;
         leveldb::Slice slKey(&ssKey[0], ssKey.size());
 
         CDataStream ssValue(SER_DISK, CLIENT_VERSION);
-        ssValue.reserve(GetSerializeSize(ssValue, value));
+        ssValue.reserve(DBWRAPPER_PREALLOC_VALUE_SIZE);
         ssValue << value;
         ssValue.Xor(dbwrapper_private::GetObfuscateKey(parent));
         leveldb::Slice slValue(&ssValue[0], ssValue.size());
@@ -77,7 +80,7 @@ class CDBBatch
     void Erase(const K& key)
     {
         CDataStream ssKey(SER_DISK, CLIENT_VERSION);
-        ssKey.reserve(GetSerializeSize(ssKey, key));
+        ssKey.reserve(DBWRAPPER_PREALLOC_KEY_SIZE);
         ssKey << key;
         leveldb::Slice slKey(&ssKey[0], ssKey.size());
 
@@ -107,7 +110,7 @@ class CDBIterator
 
     template<typename K> void Seek(const K& key) {
         CDataStream ssKey(SER_DISK, CLIENT_VERSION);
-        ssKey.reserve(GetSerializeSize(ssKey, key));
+        ssKey.reserve(DBWRAPPER_PREALLOC_KEY_SIZE);
         ssKey << key;
         leveldb::Slice slKey(&ssKey[0], ssKey.size());
         piter->Seek(slKey);
@@ -200,7 +203,7 @@ class CDBWrapper
     bool Read(const K& key, V& value) const
     {
         CDataStream ssKey(SER_DISK, CLIENT_VERSION);
-        ssKey.reserve(GetSerializeSize(ssKey, key));
+        ssKey.reserve(DBWRAPPER_PREALLOC_KEY_SIZE);
         ssKey << key;
         leveldb::Slice slKey(&ssKey[0], ssKey.size());
 
@@ -234,7 +237,7 @@ class CDBWrapper
     bool Exists(const K& key) const
     {
         CDataStream ssKey(SER_DISK, CLIENT_VERSION);
-        ssKey.reserve(GetSerializeSize(ssKey, key));
+        ssKey.reserve(DBWRAPPER_PREALLOC_KEY_SIZE);
         ssKey << key;
         leveldb::Slice slKey(&ssKey[0], ssKey.size());
 

From d768f151f63eb3bb505676bca07be24da151f6b2 Mon Sep 17 00:00:00 2001
From: mrbandrews <bandrewsny@gmail.com>
Date: Wed, 26 Oct 2016 10:53:46 -0400
Subject: [PATCH 1176/1802] [qa] Make comptool push blocks instead of relying
 on inv-fetch

---
 qa/rpc-tests/test_framework/comptool.py | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/qa/rpc-tests/test_framework/comptool.py b/qa/rpc-tests/test_framework/comptool.py
index 7c92d3f828917..17679fc7e1996 100755
--- a/qa/rpc-tests/test_framework/comptool.py
+++ b/qa/rpc-tests/test_framework/comptool.py
@@ -111,6 +111,11 @@ def send_getheaders(self):
         m.locator = self.block_store.get_locator(self.bestblockhash)
         self.conn.send_message(m)
 
+    def send_header(self, header):
+        m = msg_headers()
+        m.headers.append(header)
+        self.conn.send_message(m)
+
     # This assumes BIP31
     def send_ping(self, nonce):
         self.pingMap[nonce] = True
@@ -345,8 +350,16 @@ def run(self):
                     # Either send inv's to each node and sync, or add
                     # to invqueue for later inv'ing.
                     if (test_instance.sync_every_block):
-                        [ c.cb.send_inv(block) for c in self.connections ]
-                        self.sync_blocks(block.sha256, 1)
+                        # if we expect success, send inv and sync every block
+                        # if we expect failure, just push the block and see what happens.
+                        if outcome == True:
+                            [ c.cb.send_inv(block) for c in self.connections ]
+                            self.sync_blocks(block.sha256, 1)
+                        else:
+                            [ c.send_message(msg_block(block)) for c in self.connections ]
+                            [ c.cb.send_ping(self.ping_counter) for c in self.connections ]
+                            self.wait_for_pings(self.ping_counter)
+                            self.ping_counter += 1
                         if (not self.check_results(tip, outcome)):
                             raise AssertionError("Test failed at test %d" % test_number)
                     else:
@@ -354,6 +367,8 @@ def run(self):
                 elif isinstance(b_or_t, CBlockHeader):
                     block_header = b_or_t
                     self.block_store.add_header(block_header)
+                    [ c.cb.send_header(block_header) for c in self.connections ]
+
                 else:  # Tx test runner
                     assert(isinstance(b_or_t, CTransaction))
                     tx = b_or_t

From 3451203b5c67c234d168a409d69ff9623573dae3 Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Mon, 3 Oct 2016 18:30:52 -0400
Subject: [PATCH 1177/1802] [qa] Respond to getheaders and do not assume a
 getdata on inv

---
 qa/rpc-tests/p2p-compactblocks.py |  7 +++++++
 qa/rpc-tests/p2p-segwit.py        | 14 ++++++++++++--
 qa/rpc-tests/sendheaders.py       | 11 +++++------
 3 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/qa/rpc-tests/p2p-compactblocks.py b/qa/rpc-tests/p2p-compactblocks.py
index 6b5d477131077..722ec0f62e792 100755
--- a/qa/rpc-tests/p2p-compactblocks.py
+++ b/qa/rpc-tests/p2p-compactblocks.py
@@ -27,6 +27,7 @@ def __init__(self):
         self.last_cmpctblock = None
         self.block_announced = False
         self.last_getdata = None
+        self.last_getheaders = None
         self.last_getblocktxn = None
         self.last_block = None
         self.last_blocktxn = None
@@ -64,6 +65,9 @@ def on_inv(self, conn, message):
     def on_getdata(self, conn, message):
         self.last_getdata = message
 
+    def on_getheaders(self, conn, message):
+        self.last_getheaders = message
+
     def on_getblocktxn(self, conn, message):
         self.last_getblocktxn = message
 
@@ -393,6 +397,9 @@ def test_compactblock_requests(self, node, test_node, version, segwit):
 
             if announce == "inv":
                 test_node.send_message(msg_inv([CInv(2, block.sha256)]))
+                success = wait_until(lambda: test_node.last_getheaders is not None, timeout=30)
+                assert(success)
+                test_node.send_header_for_blocks([block])
             else:
                 test_node.send_header_for_blocks([block])
             success = wait_until(lambda: test_node.last_getdata is not None, timeout=30)
diff --git a/qa/rpc-tests/p2p-segwit.py b/qa/rpc-tests/p2p-segwit.py
index 09ab1b80fcbb2..6ecd84c3f08c2 100755
--- a/qa/rpc-tests/p2p-segwit.py
+++ b/qa/rpc-tests/p2p-segwit.py
@@ -64,6 +64,9 @@ def on_getdata(self, conn, message):
             self.getdataset.add(inv.hash)
         self.last_getdata = message
 
+    def on_getheaders(self, conn, message):
+        self.last_getheaders = message
+
     def on_pong(self, conn, message):
         self.last_pong = message
 
@@ -97,6 +100,10 @@ def wait_for_getdata(self, timeout=60):
         test_function = lambda: self.last_getdata != None
         self.sync(test_function, timeout)
 
+    def wait_for_getheaders(self, timeout=60):
+        test_function = lambda: self.last_getheaders != None
+        self.sync(test_function, timeout)
+
     def wait_for_inv(self, expected_inv, timeout=60):
         test_function = lambda: self.last_inv != expected_inv
         self.sync(test_function, timeout)
@@ -111,12 +118,15 @@ def announce_tx_and_wait_for_getdata(self, tx, timeout=60):
     def announce_block_and_wait_for_getdata(self, block, use_header, timeout=60):
         with mininode_lock:
             self.last_getdata = None
+            self.last_getheaders = None
+        msg = msg_headers()
+        msg.headers = [ CBlockHeader(block) ]
         if use_header:
-            msg = msg_headers()
-            msg.headers = [ CBlockHeader(block) ]
             self.send_message(msg)
         else:
             self.send_message(msg_inv(inv=[CInv(2, block.sha256)]))
+            self.wait_for_getheaders()
+            self.send_message(msg)
         self.wait_for_getdata()
         return
 
diff --git a/qa/rpc-tests/sendheaders.py b/qa/rpc-tests/sendheaders.py
index 81b2442e6ae67..37b98c576e837 100755
--- a/qa/rpc-tests/sendheaders.py
+++ b/qa/rpc-tests/sendheaders.py
@@ -348,14 +348,13 @@ def run_test(self):
                 if j == 0:
                     # Announce via inv
                     test_node.send_block_inv(tip)
-                    test_node.wait_for_getdata([tip], timeout=5)
+                    test_node.wait_for_getheaders(timeout=5)
+                    # Should have received a getheaders now
+                    test_node.send_header_for_blocks(blocks)
                     # Test that duplicate inv's won't result in duplicate
                     # getdata requests, or duplicate headers announcements
-                    inv_node.send_block_inv(tip)
-                    # Should have received a getheaders as well!
-                    test_node.send_header_for_blocks(blocks)
-                    test_node.wait_for_getdata([x.sha256 for x in blocks[0:-1]], timeout=5)
-                    [ inv_node.send_block_inv(x.sha256) for x in blocks[0:-1] ]
+                    [ inv_node.send_block_inv(x.sha256) for x in blocks ]
+                    test_node.wait_for_getdata([x.sha256 for x in blocks], timeout=5)
                     inv_node.sync_with_ping()
                 else:
                     # Announce via headers

From 037159cebf1eae4445050cec029986514ed4e9e2 Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Wed, 26 Oct 2016 16:17:20 -0400
Subject: [PATCH 1178/1802] Remove block-request logic from INV message
 processing

---
 src/main.cpp | 26 +++++---------------------
 1 file changed, 5 insertions(+), 21 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index 2fb143e6a0c58..cb6cb145a746b 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -5364,28 +5364,12 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
             if (inv.type == MSG_BLOCK) {
                 UpdateBlockAvailability(pfrom->GetId(), inv.hash);
                 if (!fAlreadyHave && !fImporting && !fReindex && !mapBlocksInFlight.count(inv.hash)) {
-                    // First request the headers preceding the announced block. In the normal fully-synced
-                    // case where a new block is announced that succeeds the current tip (no reorganization),
-                    // there are no such headers.
-                    // Secondly, and only when we are close to being synced, we request the announced block directly,
-                    // to avoid an extra round-trip. Note that we must *first* ask for the headers, so by the
-                    // time the block arrives, the header chain leading up to it is already validated. Not
-                    // doing this will result in the received block being rejected as an orphan in case it is
-                    // not a direct successor.
+                    // We used to request the full block here, but since headers-announcements are now the
+                    // primary method of announcement on the network, and since, in the case that a node
+                    // fell back to inv we probably have a reorg which we should get the headers for first,
+                    // we now only provide a getheaders response here. When we receive the headers, we will
+                    // then ask for the blocks we need.
                     connman.PushMessage(pfrom, NetMsgType::GETHEADERS, chainActive.GetLocator(pindexBestHeader), inv.hash);
-                    CNodeState *nodestate = State(pfrom->GetId());
-                    if (CanDirectFetch(chainparams.GetConsensus()) &&
-                        nodestate->nBlocksInFlight < MAX_BLOCKS_IN_TRANSIT_PER_PEER &&
-                        (!IsWitnessEnabled(chainActive.Tip(), chainparams.GetConsensus()) || State(pfrom->GetId())->fHaveWitness)) {
-                        inv.type |= nFetchFlags;
-                        if (nodestate->fSupportsDesiredCmpctVersion)
-                            vToFetch.push_back(CInv(MSG_CMPCT_BLOCK, inv.hash));
-                        else
-                            vToFetch.push_back(inv);
-                        // Mark block as in flight already, even though the actual "getdata" message only goes out
-                        // later (within the same cs_main lock, though).
-                        MarkBlockAsInFlight(pfrom->GetId(), inv.hash, chainparams.GetConsensus());
-                    }
                     LogPrint("net", "getheaders (%d) %s to peer=%d\n", pindexBestHeader->nHeight, inv.hash.ToString(), pfrom->id);
                 }
             }

From 5262a151e1bd3208a26d1b728c32f7ea04d5e34e Mon Sep 17 00:00:00 2001
From: Daniel Cousens <github@dcousens.com>
Date: Tue, 8 Nov 2016 11:58:37 +1100
Subject: [PATCH 1179/1802] tx_valid: re-order inputs to how they are encoded

---
 src/test/data/tx_valid.json | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/test/data/tx_valid.json b/src/test/data/tx_valid.json
index 2f299aa5fea37..27acb2f16a0ab 100644
--- a/src/test/data/tx_valid.json
+++ b/src/test/data/tx_valid.json
@@ -53,7 +53,7 @@
 ["The following tests for the presence of a bug in the handling of SIGHASH_SINGLE"],
 ["It results in signing the constant 1, instead of something generated based on the transaction,"],
 ["when the input doing the signing has an index greater than the maximum output index"],
-[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "DUP HASH160 0x14 0xe52b482f2faa8ecbf0db344f93c84ac908557f33 EQUALVERIFY CHECKSIG"], ["0000000000000000000000000000000000000000000000000000000000000200", 0, "1"]],
+[[["0000000000000000000000000000000000000000000000000000000000000200", 0, "1"], ["0000000000000000000000000000000000000000000000000000000000000100", 0, "DUP HASH160 0x14 0xe52b482f2faa8ecbf0db344f93c84ac908557f33 EQUALVERIFY CHECKSIG"]],
 "01000000020002000000000000000000000000000000000000000000000000000000000000000000000151ffffffff0001000000000000000000000000000000000000000000000000000000000000000000006b483045022100c9cdd08798a28af9d1baf44a6c77bcc7e279f47dc487c8c899911bc48feaffcc0220503c5c50ae3998a733263c5c0f7061b483e2b56c4c41b456e7d2f5a78a74c077032102d5c25adb51b61339d2b05315791e21bbe80ea470a49db0135720983c905aace0ffffffff010000000000000000015100000000", "P2SH"],
 
 ["An invalid P2SH Transaction"],
@@ -334,9 +334,9 @@
 "0100000000010100010000000000000000000000000000000000000000000000000000000000000000000023220020ff25429251b5a84f452230a3c75fd886b7fc5a7865ce4a7bb7a9d7c5be6da3dbffffffff01e8030000000000001976a9144c9c3dfac4207d5d8cb89df5722cb3d712385e3f88ac02483045022100aa5d8aa40a90f23ce2c3d11bc845ca4a12acd99cbea37de6b9f6d86edebba8cb022022dedc2aa0a255f74d04c0b76ece2d7c691f9dd11a64a8ac49f62a99c3a05f9d01232103596d3451025c19dbbdeb932d6bf8bfb4ad499b95b6f88db8899efac102e5fc71ac00000000", "P2SH,WITNESS"],
 
 ["Witness with SigHash Single|AnyoneCanPay"],
-[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "0x51", 1100],
+[[["0000000000000000000000000000000000000000000000000000000000000100", 2, "0x51", 3100],
 ["0000000000000000000000000000000000000000000000000000000000000100", 1, "0x00 0x14 0x4c9c3dfac4207d5d8cb89df5722cb3d712385e3f", 2000],
-["0000000000000000000000000000000000000000000000000000000000000100", 2, "0x51", 3100],
+["0000000000000000000000000000000000000000000000000000000000000100", 0, "0x51", 1100],
 ["0000000000000000000000000000000000000000000000000000000000000100", 3, "0x51", 4100]],
 "0100000000010400010000000000000000000000000000000000000000000000000000000000000200000000ffffffff00010000000000000000000000000000000000000000000000000000000000000100000000ffffffff00010000000000000000000000000000000000000000000000000000000000000000000000ffffffff00010000000000000000000000000000000000000000000000000000000000000300000000ffffffff05540b0000000000000151d0070000000000000151840300000000000001513c0f00000000000001512c010000000000000151000248304502210092f4777a0f17bf5aeb8ae768dec5f2c14feabf9d1fe2c89c78dfed0f13fdb86902206da90a86042e252bcd1e80a168c719e4a1ddcc3cebea24b9812c5453c79107e9832103596d3451025c19dbbdeb932d6bf8bfb4ad499b95b6f88db8899efac102e5fc71000000000000", "P2SH,WITNESS"],
 
@@ -359,9 +359,9 @@
 "0100000000010300010000000000000000000000000000000000000000000000000000000000000000000000ffffffff00010000000000000000000000000000000000000000000000000000000000000100000000ffffffff00010000000000000000000000000000000000000000000000000000000000000200000000ffffffff03e8030000000000000151d0070000000000000151b80b000000000000015100024730440220699e6b0cfe015b64ca3283e6551440a34f901ba62dd4c72fe1cb815afb2e6761022021cc5e84db498b1479de14efda49093219441adc6c543e5534979605e273d80b032103596d3451025c19dbbdeb932d6bf8bfb4ad499b95b6f88db8899efac102e5fc710000000000", "P2SH,WITNESS"],
 
 ["Witness with SigHash None|AnyoneCanPay"],
-[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "0x51", 1100],
+[[["0000000000000000000000000000000000000000000000000000000000000100", 2, "0x51", 3100],
+["0000000000000000000000000000000000000000000000000000000000000100", 0, "0x51", 1100],
 ["0000000000000000000000000000000000000000000000000000000000000100", 1, "0x00 0x14 0x4c9c3dfac4207d5d8cb89df5722cb3d712385e3f", 2000],
-["0000000000000000000000000000000000000000000000000000000000000100", 2, "0x51", 3100],
 ["0000000000000000000000000000000000000000000000000000000000000100", 3, "0x51", 4100]],
 "0100000000010400010000000000000000000000000000000000000000000000000000000000000200000000ffffffff00010000000000000000000000000000000000000000000000000000000000000000000000ffffffff00010000000000000000000000000000000000000000000000000000000000000100000000ffffffff00010000000000000000000000000000000000000000000000000000000000000300000000ffffffff04b60300000000000001519e070000000000000151860b00000000000001009600000000000000015100000248304502210091b32274295c2a3fa02f5bce92fb2789e3fc6ea947fbe1a76e52ea3f4ef2381a022079ad72aefa3837a2e0c033a8652a59731da05fa4a813f4fc48e87c075037256b822103596d3451025c19dbbdeb932d6bf8bfb4ad499b95b6f88db8899efac102e5fc710000000000", "P2SH,WITNESS"],
 
@@ -390,9 +390,9 @@
 "01000000000103000100000000000000000000000000000000000000000000000000000000000000000000000200000000010000000000000000000000000000000000000000000000000000000000000100000000ffffffff000100000000000000000000000000000000000000000000000000000000000002000000000200000003e8030000000000000151d0070000000000000151b80b00000000000001510002473044022022fceb54f62f8feea77faac7083c3b56c4676a78f93745adc8a35800bc36adfa022026927df9abcf0a8777829bcfcce3ff0a385fa54c3f9df577405e3ef24ee56479022103596d3451025c19dbbdeb932d6bf8bfb4ad499b95b6f88db8899efac102e5fc710000000000", "P2SH,WITNESS"],
 
 ["Witness with SigHash All|AnyoneCanPay"],
-[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "0x51", 1100],
+[[["0000000000000000000000000000000000000000000000000000000000000100", 2, "0x51", 3100],
+["0000000000000000000000000000000000000000000000000000000000000100", 0, "0x51", 1100],
 ["0000000000000000000000000000000000000000000000000000000000000100", 1, "0x00 0x14 0x4c9c3dfac4207d5d8cb89df5722cb3d712385e3f", 2000],
-["0000000000000000000000000000000000000000000000000000000000000100", 2, "0x51", 3100],
 ["0000000000000000000000000000000000000000000000000000000000000100", 3, "0x51", 4100]],
 "0100000000010400010000000000000000000000000000000000000000000000000000000000000200000000ffffffff00010000000000000000000000000000000000000000000000000000000000000000000000ffffffff00010000000000000000000000000000000000000000000000000000000000000100000000ffffffff00010000000000000000000000000000000000000000000000000000000000000300000000ffffffff03e8030000000000000151d0070000000000000151b80b0000000000000151000002483045022100a3cec69b52cba2d2de623eeef89e0ba1606184ea55476c0f8189fda231bc9cbb022003181ad597f7c380a7d1c740286b1d022b8b04ded028b833282e055e03b8efef812103596d3451025c19dbbdeb932d6bf8bfb4ad499b95b6f88db8899efac102e5fc710000000000", "P2SH,WITNESS"],
 
@@ -458,8 +458,8 @@
 "0100000000010200010000000000000000000000000000000000000000000000000000000000000000000000ffffffff00010000000000000000000000000000000000000000000000000000000000000100000000ffffffff02e8030000000000000151e90300000000000001510247304402206d59682663faab5e4cb733c562e22cdae59294895929ec38d7c016621ff90da0022063ef0af5f970afe8a45ea836e3509b8847ed39463253106ac17d19c437d3d56b832103596d3451025c19dbbdeb932d6bf8bfb4ad499b95b6f88db8899efac102e5fc710248304502210085001a820bfcbc9f9de0298af714493f8a37b3b354bfd21a7097c3e009f2018c022050a8b4dbc8155d4d04da2f5cdd575dcf8dd0108de8bec759bd897ea01ecb3af7832103596d3451025c19dbbdeb932d6bf8bfb4ad499b95b6f88db8899efac102e5fc7100000000", "P2SH,WITNESS"],
 
 ["Witness Single|AnyoneCanPay does not hash input's position (permutation)"],
-[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "0x00 0x14 0x4c9c3dfac4207d5d8cb89df5722cb3d712385e3f", 1000],
-["0000000000000000000000000000000000000000000000000000000000000100", 1, "0x00 0x14 0x4c9c3dfac4207d5d8cb89df5722cb3d712385e3f", 1001]],
+[[["0000000000000000000000000000000000000000000000000000000000000100", 1, "0x00 0x14 0x4c9c3dfac4207d5d8cb89df5722cb3d712385e3f", 1001],
+["0000000000000000000000000000000000000000000000000000000000000100", 0, "0x00 0x14 0x4c9c3dfac4207d5d8cb89df5722cb3d712385e3f", 1000]],
 "0100000000010200010000000000000000000000000000000000000000000000000000000000000100000000ffffffff00010000000000000000000000000000000000000000000000000000000000000000000000ffffffff02e9030000000000000151e80300000000000001510248304502210085001a820bfcbc9f9de0298af714493f8a37b3b354bfd21a7097c3e009f2018c022050a8b4dbc8155d4d04da2f5cdd575dcf8dd0108de8bec759bd897ea01ecb3af7832103596d3451025c19dbbdeb932d6bf8bfb4ad499b95b6f88db8899efac102e5fc710247304402206d59682663faab5e4cb733c562e22cdae59294895929ec38d7c016621ff90da0022063ef0af5f970afe8a45ea836e3509b8847ed39463253106ac17d19c437d3d56b832103596d3451025c19dbbdeb932d6bf8bfb4ad499b95b6f88db8899efac102e5fc7100000000", "P2SH,WITNESS"],
 
 ["Non witness Single|AnyoneCanPay hash input's position"],

From fab0f07dec8d6e21ab70843fdce101f1703588fd Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Mon, 7 Nov 2016 22:33:22 +0100
Subject: [PATCH 1180/1802] [qa] rpc-tests: Apply random offset to portseed

This helps to skip over resources, which are blocked by regtest bitcoind
zombie nodes
---
 qa/pull-tester/rpc-tests.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/qa/pull-tester/rpc-tests.py b/qa/pull-tester/rpc-tests.py
index 778f8d8a77818..58bd00fdfc2b5 100755
--- a/qa/pull-tester/rpc-tests.py
+++ b/qa/pull-tester/rpc-tests.py
@@ -246,6 +246,10 @@ def __init__(self, num_tests_parallel, test_list=None, flags=None):
         self.test_list = test_list
         self.flags = flags
         self.num_running = 0
+        # In case there is a graveyard of zombie bitcoinds, we can apply a
+        # pseudorandom offset to hopefully jump over them.
+        # (625 is PORT_RANGE/MAX_NODES)
+        self.portseed_offset = int(time.time() * 1000) % 625
         self.jobs = []
 
     def get_next(self):
@@ -253,7 +257,7 @@ def get_next(self):
             # Add tests
             self.num_running += 1
             t = self.test_list.pop(0)
-            port_seed = ["--portseed=%s" % len(self.test_list)]
+            port_seed = ["--portseed={}".format(len(self.test_list) + self.portseed_offset)]
             log_stdout = tempfile.SpooledTemporaryFile(max_size=2**16)
             log_stderr = tempfile.SpooledTemporaryFile(max_size=2**16)
             self.jobs.append((t,

From addfdebe1a2ec45f718638f39a9ae3afb531805f Mon Sep 17 00:00:00 2001
From: Andrew Chow <achow101@gmail.com>
Date: Mon, 3 Oct 2016 19:40:40 -0400
Subject: [PATCH 1181/1802] Multiple Selection for peer and ban tables

Allows multiple selection and action for the nodes in the peer and ban tables in the Debug Window.
---
 src/qt/guiutil.cpp    | 12 ++----
 src/qt/guiutil.h      |  3 +-
 src/qt/rpcconsole.cpp | 86 +++++++++++++++++++++++++------------------
 3 files changed, 55 insertions(+), 46 deletions(-)

diff --git a/src/qt/guiutil.cpp b/src/qt/guiutil.cpp
index 42dafa1175605..9dc75c2e1a25e 100644
--- a/src/qt/guiutil.cpp
+++ b/src/qt/guiutil.cpp
@@ -291,17 +291,11 @@ void copyEntryData(QAbstractItemView *view, int column, int role)
     }
 }
 
-QVariant getEntryData(QAbstractItemView *view, int column, int role)
+QList<QModelIndex> getEntryData(QAbstractItemView *view, int column)
 {
     if(!view || !view->selectionModel())
-        return QVariant();
-    QModelIndexList selection = view->selectionModel()->selectedRows(column);
-
-    if(!selection.isEmpty()) {
-        // Return first item
-        return (selection.at(0).data(role));
-    }
-    return QVariant();
+        return QList<QModelIndex>();
+    return view->selectionModel()->selectedRows(column);
 }
 
 QString getSaveFileName(QWidget *parent, const QString &caption, const QString &dir,
diff --git a/src/qt/guiutil.h b/src/qt/guiutil.h
index e28f68930fc16..64cbd51eb6f39 100644
--- a/src/qt/guiutil.h
+++ b/src/qt/guiutil.h
@@ -67,10 +67,9 @@ namespace GUIUtil
     /** Return a field of the currently selected entry as a QString. Does nothing if nothing
         is selected.
        @param[in] column  Data column to extract from the model
-       @param[in] role    Data role to extract from the model
        @see  TransactionView::copyLabel, TransactionView::copyAmount, TransactionView::copyAddress
      */
-    QVariant getEntryData(QAbstractItemView *view, int column, int role);
+    QList<QModelIndex> getEntryData(QAbstractItemView *view, int column);
 
     void setClipboard(const QString& str);
 
diff --git a/src/qt/rpcconsole.cpp b/src/qt/rpcconsole.cpp
index f10dddf589e28..7320c3bf73686 100644
--- a/src/qt/rpcconsole.cpp
+++ b/src/qt/rpcconsole.cpp
@@ -469,7 +469,7 @@ void RPCConsole::setClientModel(ClientModel *model)
         ui->peerWidget->verticalHeader()->hide();
         ui->peerWidget->setEditTriggers(QAbstractItemView::NoEditTriggers);
         ui->peerWidget->setSelectionBehavior(QAbstractItemView::SelectRows);
-        ui->peerWidget->setSelectionMode(QAbstractItemView::SingleSelection);
+        ui->peerWidget->setSelectionMode(QAbstractItemView::ExtendedSelection);
         ui->peerWidget->setContextMenuPolicy(Qt::CustomContextMenu);
         ui->peerWidget->setColumnWidth(PeerTableModel::Address, ADDRESS_COLUMN_WIDTH);
         ui->peerWidget->setColumnWidth(PeerTableModel::Subversion, SUBVERSION_COLUMN_WIDTH);
@@ -477,11 +477,11 @@ void RPCConsole::setClientModel(ClientModel *model)
         ui->peerWidget->horizontalHeader()->setStretchLastSection(true);
 
         // create peer table context menu actions
-        QAction* disconnectAction = new QAction(tr("&Disconnect Node"), this);
-        QAction* banAction1h      = new QAction(tr("Ban Node for") + " " + tr("1 &hour"), this);
-        QAction* banAction24h     = new QAction(tr("Ban Node for") + " " + tr("1 &day"), this);
-        QAction* banAction7d      = new QAction(tr("Ban Node for") + " " + tr("1 &week"), this);
-        QAction* banAction365d    = new QAction(tr("Ban Node for") + " " + tr("1 &year"), this);
+        QAction* disconnectAction = new QAction(tr("&Disconnect"), this);
+        QAction* banAction1h      = new QAction(tr("Ban for") + " " + tr("1 &hour"), this);
+        QAction* banAction24h     = new QAction(tr("Ban for") + " " + tr("1 &day"), this);
+        QAction* banAction7d      = new QAction(tr("Ban for") + " " + tr("1 &week"), this);
+        QAction* banAction365d    = new QAction(tr("Ban for") + " " + tr("1 &year"), this);
 
         // create peer table context menu
         peersTableContextMenu = new QMenu();
@@ -527,7 +527,7 @@ void RPCConsole::setClientModel(ClientModel *model)
         ui->banlistWidget->horizontalHeader()->setStretchLastSection(true);
 
         // create ban table context menu action
-        QAction* unbanAction = new QAction(tr("&Unban Node"), this);
+        QAction* unbanAction = new QAction(tr("&Unban"), this);
 
         // create ban table context menu
         banTableContextMenu = new QMenu();
@@ -973,33 +973,44 @@ void RPCConsole::disconnectSelectedNode()
 {
     if(!g_connman)
         return;
-    // Get currently selected peer address
-    NodeId id = GUIUtil::getEntryData(ui->peerWidget, 0, PeerTableModel::NetNodeId).toInt();
-    // Find the node, disconnect it and clear the selected node
-    if(g_connman->DisconnectNode(id))
-        clearSelectedNode();
+    
+    // Get selected peer addresses
+    QList<QModelIndex> nodes = GUIUtil::getEntryData(ui->peerWidget, 0);
+    for(int i = 0; i < nodes.count(); i++)
+    {
+        // Get currently selected peer address
+        NodeId id = nodes.at(i).data(PeerTableModel::NetNodeId).toInt();
+        // Find the node, disconnect it and clear the selected node
+        if(g_connman->DisconnectNode(id))
+            clearSelectedNode();
+    }
 }
 
 void RPCConsole::banSelectedNode(int bantime)
 {
     if (!clientModel || !g_connman)
         return;
-
-    if(cachedNodeid == -1)
-        return;
-
-    // Get currently selected peer address
-    int detailNodeRow = clientModel->getPeerTableModel()->getRowByNodeId(cachedNodeid);
-    if(detailNodeRow < 0)
-        return;
-
-    // Find possible nodes, ban it and clear the selected node
-    const CNodeCombinedStats *stats = clientModel->getPeerTableModel()->getNodeStats(detailNodeRow);
-    if(stats) {
-        g_connman->Ban(stats->nodeStats.addr, BanReasonManuallyAdded, bantime);
-        clearSelectedNode();
-        clientModel->getBanTableModel()->refresh();
+    
+    // Get selected peer addresses
+    QList<QModelIndex> nodes = GUIUtil::getEntryData(ui->peerWidget, 0);
+    for(int i = 0; i < nodes.count(); i++)
+    {
+        // Get currently selected peer address
+        NodeId id = nodes.at(i).data(PeerTableModel::NetNodeId).toInt();
+
+	// Get currently selected peer address
+	int detailNodeRow = clientModel->getPeerTableModel()->getRowByNodeId(id);
+	if(detailNodeRow < 0)
+	    return;
+
+	// Find possible nodes, ban it and clear the selected node
+	const CNodeCombinedStats *stats = clientModel->getPeerTableModel()->getNodeStats(detailNodeRow);
+	if(stats) {
+	    g_connman->Ban(stats->nodeStats.addr, BanReasonManuallyAdded, bantime);
+	}
     }
+    clearSelectedNode();
+    clientModel->getBanTableModel()->refresh();
 }
 
 void RPCConsole::unbanSelectedNode()
@@ -1007,15 +1018,20 @@ void RPCConsole::unbanSelectedNode()
     if (!clientModel)
         return;
 
-    // Get currently selected ban address
-    QString strNode = GUIUtil::getEntryData(ui->banlistWidget, 0, BanTableModel::Address).toString();
-    CSubNet possibleSubnet;
-
-    LookupSubNet(strNode.toStdString().c_str(), possibleSubnet);
-    if (possibleSubnet.IsValid() && g_connman)
+    // Get selected ban addresses
+    QList<QModelIndex> nodes = GUIUtil::getEntryData(ui->banlistWidget, 0);
+    for(int i = 0; i < nodes.count(); i++)
     {
-        g_connman->Unban(possibleSubnet);
-        clientModel->getBanTableModel()->refresh();
+        // Get currently selected ban address
+        QString strNode = nodes.at(i).data(BanTableModel::Address).toString();
+        CSubNet possibleSubnet;
+
+        LookupSubNet(strNode.toStdString().c_str(), possibleSubnet);
+        if (possibleSubnet.IsValid() && g_connman)
+        {
+            g_connman->Unban(possibleSubnet);
+            clientModel->getBanTableModel()->refresh();
+        }
     }
 }
 

From 1adf82ac394ca16308e1004495b76529d54018ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jorge=20Tim=C3=B3n?= <jtimon@jtimon.cc>
Date: Sat, 5 Nov 2016 01:54:00 +0100
Subject: [PATCH 1182/1802] RPC: Give more details when "generate" fails

---
 src/rpc/mining.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/rpc/mining.cpp b/src/rpc/mining.cpp
index 3e91a79a649a1..8824898febddc 100644
--- a/src/rpc/mining.cpp
+++ b/src/rpc/mining.cpp
@@ -133,7 +133,7 @@ UniValue generateBlocks(boost::shared_ptr<CReserveScript> coinbaseScript, int nG
         }
         CValidationState state;
         if (!ProcessNewBlock(state, Params(), NULL, pblock, true, NULL, false))
-            throw JSONRPCError(RPC_INTERNAL_ERROR, "ProcessNewBlock, block not accepted");
+            throw JSONRPCError(RPC_INTERNAL_ERROR, strprintf("ProcessNewBlock: block not accepted: %s", FormatStateMessage(state)));
         ++nHeight;
         blockHashes.push_back(pblock->GetHash().GetHex());
 

From 1077577546334bc26daa3ab8580f24063a0b67c6 Mon Sep 17 00:00:00 2001
From: Andrew Chow <achow101@gmail.com>
Date: Tue, 8 Nov 2016 10:41:23 -0500
Subject: [PATCH 1183/1802] Fix auto-deselection of peers

---
 src/qt/rpcconsole.cpp | 30 +++++++++++++++++++++---------
 src/qt/rpcconsole.h   |  4 +++-
 2 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/src/qt/rpcconsole.cpp b/src/qt/rpcconsole.cpp
index 7320c3bf73686..a9fef731e1979 100644
--- a/src/qt/rpcconsole.cpp
+++ b/src/qt/rpcconsole.cpp
@@ -343,7 +343,6 @@ RPCConsole::RPCConsole(const PlatformStyle *_platformStyle, QWidget *parent) :
     ui(new Ui::RPCConsole),
     clientModel(0),
     historyPtr(0),
-    cachedNodeid(-1),
     platformStyle(_platformStyle),
     peersTableContextMenu(0),
     banTableContextMenu(0),
@@ -514,7 +513,9 @@ void RPCConsole::setClientModel(ClientModel *model)
             this, SLOT(peerSelected(const QItemSelection &, const QItemSelection &)));
         // peer table signal handling - update peer details when new nodes are added to the model
         connect(model->getPeerTableModel(), SIGNAL(layoutChanged()), this, SLOT(peerLayoutChanged()));
-
+        // peer table signal handling - cache selected node ids
+        connect(model->getPeerTableModel(), SIGNAL(layoutAboutToChange()), this, SLOT(peerLayoutAboutToChange()));
+        
         // set up ban table
         ui->banlistWidget->setModel(model->getBanTableModel());
         ui->banlistWidget->verticalHeader()->hide();
@@ -825,6 +826,17 @@ void RPCConsole::peerSelected(const QItemSelection &selected, const QItemSelecti
         updateNodeDetail(stats);
 }
 
+void RPCConsole::peerLayoutAboutToChange()
+{
+    QModelIndexList selected = ui->peerWidget->selectionModel()->selectedIndexes();
+    cachedNodeids.clear();
+    for(int i = 0; i < selected.size(); i++)
+    {
+        const CNodeCombinedStats *stats = clientModel->getPeerTableModel()->getNodeStats(selected.at(i).row());
+        cachedNodeids.append(stats->nodeStats.nodeid);
+    }
+}
+
 void RPCConsole::peerLayoutChanged()
 {
     if (!clientModel || !clientModel->getPeerTableModel())
@@ -834,7 +846,7 @@ void RPCConsole::peerLayoutChanged()
     bool fUnselect = false;
     bool fReselect = false;
 
-    if (cachedNodeid == -1) // no node selected yet
+    if (cachedNodeids.empty()) // no node selected yet
         return;
 
     // find the currently selected row
@@ -846,7 +858,7 @@ void RPCConsole::peerLayoutChanged()
 
     // check if our detail node has a row in the table (it may not necessarily
     // be at selectedRow since its position can change after a layout change)
-    int detailNodeRow = clientModel->getPeerTableModel()->getRowByNodeId(cachedNodeid);
+    int detailNodeRow = clientModel->getPeerTableModel()->getRowByNodeId(cachedNodeids.first());
 
     if (detailNodeRow < 0)
     {
@@ -872,7 +884,10 @@ void RPCConsole::peerLayoutChanged()
 
     if (fReselect)
     {
-        ui->peerWidget->selectRow(detailNodeRow);
+        for(int i = 0; i < cachedNodeids.size(); i++)
+        {
+            ui->peerWidget->selectRow(clientModel->getPeerTableModel()->getRowByNodeId(cachedNodeids.at(i)));
+        }
     }
 
     if (stats)
@@ -881,9 +896,6 @@ void RPCConsole::peerLayoutChanged()
 
 void RPCConsole::updateNodeDetail(const CNodeCombinedStats *stats)
 {
-    // Update cached nodeid
-    cachedNodeid = stats->nodeStats.nodeid;
-
     // update the detail ui with latest node information
     QString peerAddrDetails(QString::fromStdString(stats->nodeStats.addrName) + " ");
     peerAddrDetails += tr("(node id: %1)").arg(QString::number(stats->nodeStats.nodeid));
@@ -1038,7 +1050,7 @@ void RPCConsole::unbanSelectedNode()
 void RPCConsole::clearSelectedNode()
 {
     ui->peerWidget->selectionModel()->clearSelection();
-    cachedNodeid = -1;
+    cachedNodeids.clear();
     ui->detailWidget->hide();
     ui->peerHeading->setText(tr("Select a peer to view detailed information."));
 }
diff --git a/src/qt/rpcconsole.h b/src/qt/rpcconsole.h
index 50224a1cc0bf1..8e1d878ae5199 100644
--- a/src/qt/rpcconsole.h
+++ b/src/qt/rpcconsole.h
@@ -98,6 +98,8 @@ public Q_SLOTS:
     void scrollToEnd();
     /** Handle selection of peer in peers list */
     void peerSelected(const QItemSelection &selected, const QItemSelection &deselected);
+    /** Handle selection caching before update */
+    void peerLayoutAboutToChange();
     /** Handle updated peer information */
     void peerLayoutChanged();
     /** Disconnect a selected node on the Peers tab */
@@ -135,7 +137,7 @@ public Q_SLOTS:
     ClientModel *clientModel;
     QStringList history;
     int historyPtr;
-    NodeId cachedNodeid;
+    QList<NodeId> cachedNodeids;
     const PlatformStyle *platformStyle;
     RPCTimerInterface *rpcTimerInterface;
     QMenu *peersTableContextMenu;

From e2e069dabcd7e61e14bb7bceda6c19ec3afa358a Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Tue, 8 Nov 2016 17:39:44 -0800
Subject: [PATCH 1184/1802] Revert "RPC: Give more details when "generate"
 fails"

This only returned information in the case of CheckBlock failure,
but breaks future changes.
---
 src/rpc/mining.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/rpc/mining.cpp b/src/rpc/mining.cpp
index 8824898febddc..3e91a79a649a1 100644
--- a/src/rpc/mining.cpp
+++ b/src/rpc/mining.cpp
@@ -133,7 +133,7 @@ UniValue generateBlocks(boost::shared_ptr<CReserveScript> coinbaseScript, int nG
         }
         CValidationState state;
         if (!ProcessNewBlock(state, Params(), NULL, pblock, true, NULL, false))
-            throw JSONRPCError(RPC_INTERNAL_ERROR, strprintf("ProcessNewBlock: block not accepted: %s", FormatStateMessage(state)));
+            throw JSONRPCError(RPC_INTERNAL_ERROR, "ProcessNewBlock, block not accepted");
         ++nHeight;
         blockHashes.push_back(pblock->GetHash().GetHex());
 

From e5d682faa3e8bdb7be2ea1d4b9835ee563a351f4 Mon Sep 17 00:00:00 2001
From: jnewbery <john@johnnewbery.com>
Date: Wed, 5 Oct 2016 14:24:36 -0400
Subject: [PATCH 1185/1802] Fix mininode version message format

---
 qa/rpc-tests/test_framework/mininode.py | 26 +++++++++++++++++++------
 1 file changed, 20 insertions(+), 6 deletions(-)

diff --git a/qa/rpc-tests/test_framework/mininode.py b/qa/rpc-tests/test_framework/mininode.py
index 4d238c08d9c3f..495c6bdf350d0 100755
--- a/qa/rpc-tests/test_framework/mininode.py
+++ b/qa/rpc-tests/test_framework/mininode.py
@@ -41,6 +41,7 @@
 BIP0031_VERSION = 60000
 MY_VERSION = 70014  # past bip-31 for ping/pong
 MY_SUBVERSION = b"/python-mininode-tester:0.0.3/"
+MY_RELAY = 1 # from version 70001 onwards, fRelay should be appended to version messages (BIP37)
 
 MAX_INV_SZ = 50000
 MAX_BLOCK_SIZE = 1000000
@@ -951,6 +952,7 @@ def __init__(self):
         self.nNonce = random.getrandbits(64)
         self.strSubVer = MY_SUBVERSION
         self.nStartingHeight = -1
+        self.nRelay = MY_RELAY
 
     def deserialize(self, f):
         self.nVersion = struct.unpack("<i", f.read(4))[0]
@@ -960,21 +962,32 @@ def deserialize(self, f):
         self.nTime = struct.unpack("<q", f.read(8))[0]
         self.addrTo = CAddress()
         self.addrTo.deserialize(f)
+
         if self.nVersion >= 106:
             self.addrFrom = CAddress()
             self.addrFrom.deserialize(f)
             self.nNonce = struct.unpack("<Q", f.read(8))[0]
             self.strSubVer = deser_string(f)
-            if self.nVersion >= 209:
-                self.nStartingHeight = struct.unpack("<i", f.read(4))[0]
-            else:
-                self.nStartingHeight = None
         else:
             self.addrFrom = None
             self.nNonce = None
             self.strSubVer = None
             self.nStartingHeight = None
 
+        if self.nVersion >= 209:
+            self.nStartingHeight = struct.unpack("<i", f.read(4))[0]
+        else:
+            self.nStartingHeight = None
+
+        if self.nVersion >= 70001:
+            # Relay field is optional for version 70001 onwards
+            try:
+                self.nRelay = struct.unpack("<b", f.read(1))[0]
+            except:
+                self.nRelay = 0
+        else:
+            self.nRelay = 0
+
     def serialize(self):
         r = b""
         r += struct.pack("<i", self.nVersion)
@@ -985,13 +998,14 @@ def serialize(self):
         r += struct.pack("<Q", self.nNonce)
         r += ser_string(self.strSubVer)
         r += struct.pack("<i", self.nStartingHeight)
+        r += struct.pack("<b", self.nRelay)
         return r
 
     def __repr__(self):
-        return 'msg_version(nVersion=%i nServices=%i nTime=%s addrTo=%s addrFrom=%s nNonce=0x%016X strSubVer=%s nStartingHeight=%i)' \
+        return 'msg_version(nVersion=%i nServices=%i nTime=%s addrTo=%s addrFrom=%s nNonce=0x%016X strSubVer=%s nStartingHeight=%i nRelay=%i)' \
             % (self.nVersion, self.nServices, time.ctime(self.nTime),
                repr(self.addrTo), repr(self.addrFrom), self.nNonce,
-               self.strSubVer, self.nStartingHeight)
+               self.strSubVer, self.nStartingHeight, self.nRelay)
 
 
 class msg_verack(object):

From d8edf03db7777752535b6f69dcbf2115f3f9a312 Mon Sep 17 00:00:00 2001
From: fanquake <fanquake@gmail.com>
Date: Wed, 9 Nov 2016 17:51:27 +0800
Subject: [PATCH 1186/1802] Remove unused var UNLIKELY_PCT from fees.h

---
 src/policy/fees.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/policy/fees.h b/src/policy/fees.h
index c7d2febfa5ce9..ea4c70e6167af 100644
--- a/src/policy/fees.h
+++ b/src/policy/fees.h
@@ -174,7 +174,6 @@ static const double DEFAULT_DECAY = .998;
 
 /** Require greater than 95% of X feerate transactions to be confirmed within Y blocks for X to be big enough */
 static const double MIN_SUCCESS_PCT = .95;
-static const double UNLIKELY_PCT = .5;
 
 /** Require an avg of 1 tx in the combined feerate bucket per block to have stat significance */
 static const double SUFFICIENT_FEETXS = 1;

From e9f25ddd0063f7ea65595178d04370d27344305c Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Wed, 9 Nov 2016 11:09:16 +0100
Subject: [PATCH 1187/1802] Avoid ugly exception in log on unknown inv type

It is unexpected behavior for `ToString` to raise an exception. It
is expected to do a best-effort attempt at formatting but never fail.

Catch the exception and simply print unknown inv types as hexadecimal.

Fixes #9110.
---
 src/protocol.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/protocol.cpp b/src/protocol.cpp
index 54ad62b1a2a95..87d6e06848c1c 100644
--- a/src/protocol.cpp
+++ b/src/protocol.cpp
@@ -181,7 +181,11 @@ std::string CInv::GetCommand() const
 
 std::string CInv::ToString() const
 {
-    return strprintf("%s %s", GetCommand(), hash.ToString());
+    try {
+        return strprintf("%s %s", GetCommand(), hash.ToString());
+    } catch(const std::out_of_range &) {
+        return strprintf("0x%08x %s", type, hash.ToString());
+    }
 }
 
 const std::vector<std::string> &getAllNetMessageTypes()

From 617c96d5b3dd1b4665edff80913f473635ed0efb Mon Sep 17 00:00:00 2001
From: fanquake <fanquake@gmail.com>
Date: Wed, 9 Nov 2016 18:55:04 +0800
Subject: [PATCH 1188/1802] [depends] Set OSX_MIN_VERSION to 10.8

---
 depends/hosts/darwin.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/depends/hosts/darwin.mk b/depends/hosts/darwin.mk
index 985649619ffec..4e58bec74e395 100644
--- a/depends/hosts/darwin.mk
+++ b/depends/hosts/darwin.mk
@@ -1,4 +1,4 @@
-OSX_MIN_VERSION=10.7
+OSX_MIN_VERSION=10.8
 OSX_SDK_VERSION=10.11
 OSX_SDK=$(SDK_PATH)/MacOSX$(OSX_SDK_VERSION).sdk
 LD64_VERSION=253.9

From 359bac7cff235f60c8f5abb66a861c5a7b9a2b6d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pavel=20Jan=C3=ADk?= <Pavel@Janik.cz>
Date: Thu, 22 Sep 2016 16:39:25 +0200
Subject: [PATCH 1189/1802] Add notes about variable names and shadowing

---
 doc/developer-notes.md | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/doc/developer-notes.md b/doc/developer-notes.md
index 70c0690ba3c21..b0794e6d30c45 100644
--- a/doc/developer-notes.md
+++ b/doc/developer-notes.md
@@ -331,6 +331,32 @@ Strings and formatting
 
   - *Rationale*: Bitcoin Core uses tinyformat, which is type safe. Leave them out to avoid confusion
 
+Variable names
+--------------
+
+The shadowing warning (`-Wshadow`) is enabled by default. It prevents issues rising
+from using a different variable with the same name.
+
+Please name variables so that their names do not shadow variables defined in the source code.
+
+E.g. in member initializers, prepend `_` to the argument name shadowing the
+member name:
+
+```c++
+class AddressBookPage
+{
+    Mode mode;
+}
+
+AddressBookPage::AddressBookPage(Mode _mode) :
+      mode(_mode)
+...
+```
+
+When using nested cycles, do not name the inner cycle variable the same as in
+upper cycle etc.
+
+
 Threads and synchronization
 ----------------------------
 

From 46625538d674a5aaf1bcfa7c8be8a49e5a23fa9e Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Wed, 9 Nov 2016 12:45:13 -0500
Subject: [PATCH 1190/1802] net: don't send feefilter messages before the
 version handshake is complete

---
 src/main.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main.cpp b/src/main.cpp
index 2fb143e6a0c58..01e2f15812698 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -6939,7 +6939,7 @@ bool SendMessages(CNode* pto, CConnman& connman)
         // Message: feefilter
         //
         // We don't want white listed peers to filter txs to us if we have -whitelistforcerelay
-        if (pto->nVersion >= FEEFILTER_VERSION && GetBoolArg("-feefilter", DEFAULT_FEEFILTER) &&
+        if (!pto->fDisconnect && pto->nVersion >= FEEFILTER_VERSION && GetBoolArg("-feefilter", DEFAULT_FEEFILTER) &&
             !(pto->fWhitelisted && GetBoolArg("-whitelistforcerelay", DEFAULT_WHITELISTFORCERELAY))) {
             CAmount currentFilter = mempool.GetMinFee(GetArg("-maxmempool", DEFAULT_MAX_MEMPOOL_SIZE) * 1000000).GetFeePerK();
             int64_t timeNow = GetTimeMicros();

From 7c98ce584ec23bcddcba8cdb33efa6547212f6ef Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Sun, 2 Oct 2016 11:04:49 -0400
Subject: [PATCH 1191/1802] Remove pfrom parameter from ProcessNewBlock

This further decouples ProcessNewBlock from networking/peer logic.
---
 src/main.cpp              | 35 +++++++++++++++++++++++------------
 src/main.h                |  4 ++--
 src/rpc/mining.cpp        |  4 ++--
 src/test/miner_tests.cpp  |  2 +-
 src/test/test_bitcoin.cpp |  2 +-
 5 files changed, 29 insertions(+), 18 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index 7e5b9528b9235..7b203cf62bcf5 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -3787,19 +3787,15 @@ static bool AcceptBlock(const CBlock& block, CValidationState& state, const CCha
     return true;
 }
 
-bool ProcessNewBlock(CValidationState& state, const CChainParams& chainparams, CNode* pfrom, const CBlock* pblock, bool fForceProcessing, const CDiskBlockPos* dbp, bool fMayBanPeerIfInvalid)
+bool ProcessNewBlock(CValidationState& state, const CChainParams& chainparams, const CBlock* pblock, bool fForceProcessing, const CDiskBlockPos* dbp, bool *fNewBlock)
 {
     {
         LOCK(cs_main);
 
         // Store to disk
         CBlockIndex *pindex = NULL;
-        bool fNewBlock = false;
-        bool ret = AcceptBlock(*pblock, state, chainparams, &pindex, fForceProcessing, dbp, &fNewBlock);
-        if (pindex && pfrom) {
-            mapBlockSource[pindex->GetBlockHash()] = std::make_pair(pfrom->GetId(), fMayBanPeerIfInvalid);
-            if (fNewBlock) pfrom->nLastBlockTime = GetTime();
-        }
+        if (fNewBlock) *fNewBlock = false;
+        bool ret = AcceptBlock(*pblock, state, chainparams, &pindex, fForceProcessing, dbp, fNewBlock);
         CheckBlockIndex(chainparams.GetConsensus());
         if (!ret)
             return error("%s: AcceptBlock FAILED", __func__);
@@ -5914,22 +5910,29 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
                 // updated, reject messages go out, etc.
                 MarkBlockAsReceived(resp.blockhash); // it is now an empty pointer
                 fBlockRead = true;
+                // mapBlockSource is only used for sending reject messages and DoS scores,
+                // so the race between here and cs_main in ProcessNewBlock is fine.
+                mapBlockSource.emplace(resp.blockhash, std::make_pair(pfrom->GetId(), false));
             }
         } // Don't hold cs_main when we call into ProcessNewBlock
         if (fBlockRead) {
             CValidationState state;
+            bool fNewBlock = false;
             // Since we requested this block (it was in mapBlocksInFlight), force it to be processed,
             // even if it would not be a candidate for new tip (missing previous block, chain not long enough, etc)
             // BIP 152 permits peers to relay compact blocks after validating
             // the header only; we should not punish peers if the block turns
             // out to be invalid.
-            ProcessNewBlock(state, chainparams, pfrom, &block, true, NULL, false);
+            ProcessNewBlock(state, chainparams, &block, true, NULL, &fNewBlock);
             int nDoS;
             if (state.IsInvalid(nDoS)) {
                 assert (state.GetRejectCode() < REJECT_INTERNAL); // Blocks are never rejected with internal reject codes
                 connman.PushMessage(pfrom, NetMsgType::REJECT, strCommand, (unsigned char)state.GetRejectCode(),
                                    state.GetRejectReason().substr(0, MAX_REJECT_MESSAGE_LENGTH), block.GetHash());
-            }
+                LOCK(cs_main);
+                mapBlockSource.erase(resp.blockhash);
+            } else if (fNewBlock)
+                pfrom->nLastBlockTime = GetTime();
         }
     }
 
@@ -6093,13 +6096,18 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
         // Such an unrequested block may still be processed, subject to the
         // conditions in AcceptBlock().
         bool forceProcessing = pfrom->fWhitelisted && !IsInitialBlockDownload();
+        const uint256 hash(block.GetHash());
         {
             LOCK(cs_main);
             // Also always process if we requested the block explicitly, as we may
             // need it even though it is not a candidate for a new best tip.
-            forceProcessing |= MarkBlockAsReceived(block.GetHash());
+            forceProcessing |= MarkBlockAsReceived(hash);
+            // mapBlockSource is only used for sending reject messages and DoS scores,
+            // so the race between here and cs_main in ProcessNewBlock is fine.
+            mapBlockSource.emplace(hash, std::make_pair(pfrom->GetId(), true));
         }
-        ProcessNewBlock(state, chainparams, pfrom, &block, forceProcessing, NULL, true);
+        bool fNewBlock = false;
+        ProcessNewBlock(state, chainparams, &block, forceProcessing, NULL, &fNewBlock);
         int nDoS;
         if (state.IsInvalid(nDoS)) {
             assert (state.GetRejectCode() < REJECT_INTERNAL); // Blocks are never rejected with internal reject codes
@@ -6109,7 +6117,10 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
                 LOCK(cs_main);
                 Misbehaving(pfrom->GetId(), nDoS);
             }
-        }
+            LOCK(cs_main);
+            mapBlockSource.erase(hash);
+        } else if (fNewBlock)
+            pfrom->nLastBlockTime = GetTime();
 
     }
 
diff --git a/src/main.h b/src/main.h
index 9343330587aff..5e5d083efa7f7 100644
--- a/src/main.h
+++ b/src/main.h
@@ -217,13 +217,13 @@ static const uint64_t MIN_DISK_SPACE_FOR_BLOCK_FILES = 550 * 1024 * 1024;
  * specific block passed to it has been checked for validity!
  * 
  * @param[out]  state   This may be set to an Error state if any error occurred processing it, including during validation/connection/etc of otherwise unrelated blocks during reorganization; or it may be set to an Invalid state if pblock is itself invalid (but this is not guaranteed even when the block is checked). If you want to *possibly* get feedback on whether pblock is valid, you must also install a CValidationInterface (see validationinterface.h) - this will have its BlockChecked method called whenever *any* block completes validation.
- * @param[in]   pfrom   The node which we are receiving the block from; it is added to mapBlockSource and may be penalised if the block is invalid.
  * @param[in]   pblock  The block we want to process.
  * @param[in]   fForceProcessing Process this block even if unrequested; used for non-network block sources and whitelisted peers.
  * @param[out]  dbp     The already known disk position of pblock, or NULL if not yet stored.
+ * @param[out]  fNewBlock A boolean which is set to indicate if the block was first received via this call
  * @return True if state.IsValid()
  */
-bool ProcessNewBlock(CValidationState& state, const CChainParams& chainparams, CNode* pfrom, const CBlock* pblock, bool fForceProcessing, const CDiskBlockPos* dbp, bool fMayBanPeerIfInvalid);
+bool ProcessNewBlock(CValidationState& state, const CChainParams& chainparams, const CBlock* pblock, bool fForceProcessing, const CDiskBlockPos* dbp, bool* fNewBlock);
 /** Check whether enough disk space is available for an incoming block */
 bool CheckDiskSpace(uint64_t nAdditionalBytes = 0);
 /** Open a block file (blk?????.dat) */
diff --git a/src/rpc/mining.cpp b/src/rpc/mining.cpp
index 3e91a79a649a1..d9fe9530a10c0 100644
--- a/src/rpc/mining.cpp
+++ b/src/rpc/mining.cpp
@@ -132,7 +132,7 @@ UniValue generateBlocks(boost::shared_ptr<CReserveScript> coinbaseScript, int nG
             continue;
         }
         CValidationState state;
-        if (!ProcessNewBlock(state, Params(), NULL, pblock, true, NULL, false))
+        if (!ProcessNewBlock(state, Params(), pblock, true, NULL, NULL))
             throw JSONRPCError(RPC_INTERNAL_ERROR, "ProcessNewBlock, block not accepted");
         ++nHeight;
         blockHashes.push_back(pblock->GetHash().GetHex());
@@ -757,7 +757,7 @@ UniValue submitblock(const JSONRPCRequest& request)
     CValidationState state;
     submitblock_StateCatcher sc(block.GetHash());
     RegisterValidationInterface(&sc);
-    bool fAccepted = ProcessNewBlock(state, Params(), NULL, &block, true, NULL, false);
+    bool fAccepted = ProcessNewBlock(state, Params(), &block, true, NULL, NULL);
     UnregisterValidationInterface(&sc);
     if (fBlockPresent)
     {
diff --git a/src/test/miner_tests.cpp b/src/test/miner_tests.cpp
index 2762cafa38caf..e71a4b1ebc643 100644
--- a/src/test/miner_tests.cpp
+++ b/src/test/miner_tests.cpp
@@ -223,7 +223,7 @@ BOOST_AUTO_TEST_CASE(CreateNewBlock_validity)
         pblock->hashMerkleRoot = BlockMerkleRoot(*pblock);
         pblock->nNonce = blockinfo[i].nonce;
         CValidationState state;
-        BOOST_CHECK(ProcessNewBlock(state, chainparams, NULL, pblock, true, NULL, false));
+        BOOST_CHECK(ProcessNewBlock(state, chainparams, pblock, true, NULL, NULL));
         BOOST_CHECK(state.IsValid());
         pblock->hashPrevBlock = pblock->GetHash();
     }
diff --git a/src/test/test_bitcoin.cpp b/src/test/test_bitcoin.cpp
index 3da0be8ca409d..4440585c01cd3 100644
--- a/src/test/test_bitcoin.cpp
+++ b/src/test/test_bitcoin.cpp
@@ -127,7 +127,7 @@ TestChain100Setup::CreateAndProcessBlock(const std::vector<CMutableTransaction>&
     while (!CheckProofOfWork(block.GetHash(), block.nBits, chainparams.GetConsensus())) ++block.nNonce;
 
     CValidationState state;
-    ProcessNewBlock(state, chainparams, NULL, &block, true, NULL, false);
+    ProcessNewBlock(state, chainparams, &block, true, NULL, NULL);
 
     CBlock result = block;
     return result;

From ae223576077448bd4ec250c73f5d8fe5e9a9ac7d Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Thu, 27 Oct 2016 16:30:17 -0400
Subject: [PATCH 1192/1802] Replace CValidationState param in ProcessNewBlock
 with BlockChecked

---
 src/main.cpp              | 43 ++++++++++++---------------------------
 src/main.h                | 10 +++++++--
 src/rpc/mining.cpp        | 16 +++++----------
 src/test/miner_tests.cpp  |  4 +---
 src/test/test_bitcoin.cpp |  3 +--
 5 files changed, 28 insertions(+), 48 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index 7b203cf62bcf5..14923163fbf66 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -3787,7 +3787,7 @@ static bool AcceptBlock(const CBlock& block, CValidationState& state, const CCha
     return true;
 }
 
-bool ProcessNewBlock(CValidationState& state, const CChainParams& chainparams, const CBlock* pblock, bool fForceProcessing, const CDiskBlockPos* dbp, bool *fNewBlock)
+bool ProcessNewBlock(const CChainParams& chainparams, const CBlock* pblock, bool fForceProcessing, const CDiskBlockPos* dbp, bool *fNewBlock)
 {
     {
         LOCK(cs_main);
@@ -3795,14 +3795,18 @@ bool ProcessNewBlock(CValidationState& state, const CChainParams& chainparams, c
         // Store to disk
         CBlockIndex *pindex = NULL;
         if (fNewBlock) *fNewBlock = false;
+        CValidationState state;
         bool ret = AcceptBlock(*pblock, state, chainparams, &pindex, fForceProcessing, dbp, fNewBlock);
         CheckBlockIndex(chainparams.GetConsensus());
-        if (!ret)
+        if (!ret) {
+            GetMainSignals().BlockChecked(*pblock, state);
             return error("%s: AcceptBlock FAILED", __func__);
+        }
     }
 
     NotifyHeaderTip();
 
+    CValidationState state; // Only used to report errors, not invalidity - ignore it
     if (!ActivateBestChain(state, chainparams, pblock))
         return error("%s: ActivateBestChain failed", __func__);
 
@@ -5912,26 +5916,18 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
                 fBlockRead = true;
                 // mapBlockSource is only used for sending reject messages and DoS scores,
                 // so the race between here and cs_main in ProcessNewBlock is fine.
+                // BIP 152 permits peers to relay compact blocks after validating
+                // the header only; we should not punish peers if the block turns
+                // out to be invalid.
                 mapBlockSource.emplace(resp.blockhash, std::make_pair(pfrom->GetId(), false));
             }
         } // Don't hold cs_main when we call into ProcessNewBlock
         if (fBlockRead) {
-            CValidationState state;
             bool fNewBlock = false;
             // Since we requested this block (it was in mapBlocksInFlight), force it to be processed,
             // even if it would not be a candidate for new tip (missing previous block, chain not long enough, etc)
-            // BIP 152 permits peers to relay compact blocks after validating
-            // the header only; we should not punish peers if the block turns
-            // out to be invalid.
-            ProcessNewBlock(state, chainparams, &block, true, NULL, &fNewBlock);
-            int nDoS;
-            if (state.IsInvalid(nDoS)) {
-                assert (state.GetRejectCode() < REJECT_INTERNAL); // Blocks are never rejected with internal reject codes
-                connman.PushMessage(pfrom, NetMsgType::REJECT, strCommand, (unsigned char)state.GetRejectCode(),
-                                   state.GetRejectReason().substr(0, MAX_REJECT_MESSAGE_LENGTH), block.GetHash());
-                LOCK(cs_main);
-                mapBlockSource.erase(resp.blockhash);
-            } else if (fNewBlock)
+            ProcessNewBlock(chainparams, &block, true, NULL, &fNewBlock);
+            if (fNewBlock)
                 pfrom->nLastBlockTime = GetTime();
         }
     }
@@ -6090,7 +6086,6 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
 
         LogPrint("net", "received block %s peer=%d\n", block.GetHash().ToString(), pfrom->id);
 
-        CValidationState state;
         // Process all blocks from whitelisted peers, even if not requested,
         // unless we're still syncing with the network.
         // Such an unrequested block may still be processed, subject to the
@@ -6107,21 +6102,9 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
             mapBlockSource.emplace(hash, std::make_pair(pfrom->GetId(), true));
         }
         bool fNewBlock = false;
-        ProcessNewBlock(state, chainparams, &block, forceProcessing, NULL, &fNewBlock);
-        int nDoS;
-        if (state.IsInvalid(nDoS)) {
-            assert (state.GetRejectCode() < REJECT_INTERNAL); // Blocks are never rejected with internal reject codes
-            connman.PushMessage(pfrom, NetMsgType::REJECT, strCommand, (unsigned char)state.GetRejectCode(),
-                               state.GetRejectReason().substr(0, MAX_REJECT_MESSAGE_LENGTH), block.GetHash());
-            if (nDoS > 0) {
-                LOCK(cs_main);
-                Misbehaving(pfrom->GetId(), nDoS);
-            }
-            LOCK(cs_main);
-            mapBlockSource.erase(hash);
-        } else if (fNewBlock)
+        ProcessNewBlock(chainparams, &block, forceProcessing, NULL, &fNewBlock);
+        if (fNewBlock)
             pfrom->nLastBlockTime = GetTime();
-
     }
 
 
diff --git a/src/main.h b/src/main.h
index 5e5d083efa7f7..4a589a163daad 100644
--- a/src/main.h
+++ b/src/main.h
@@ -215,15 +215,21 @@ static const uint64_t MIN_DISK_SPACE_FOR_BLOCK_FILES = 550 * 1024 * 1024;
  * Process an incoming block. This only returns after the best known valid
  * block is made active. Note that it does not, however, guarantee that the
  * specific block passed to it has been checked for validity!
+ *
+ * If you want to *possibly* get feedback on whether pblock is valid, you must
+ * install a CValidationInterface (see validationinterface.h) - this will have
+ * its BlockChecked method called whenever *any* block completes validation.
+ *
+ * Note that we guarantee that either the proof-of-work is valid on pblock, or
+ * (and possibly also) BlockChecked will have been called.
  * 
- * @param[out]  state   This may be set to an Error state if any error occurred processing it, including during validation/connection/etc of otherwise unrelated blocks during reorganization; or it may be set to an Invalid state if pblock is itself invalid (but this is not guaranteed even when the block is checked). If you want to *possibly* get feedback on whether pblock is valid, you must also install a CValidationInterface (see validationinterface.h) - this will have its BlockChecked method called whenever *any* block completes validation.
  * @param[in]   pblock  The block we want to process.
  * @param[in]   fForceProcessing Process this block even if unrequested; used for non-network block sources and whitelisted peers.
  * @param[out]  dbp     The already known disk position of pblock, or NULL if not yet stored.
  * @param[out]  fNewBlock A boolean which is set to indicate if the block was first received via this call
  * @return True if state.IsValid()
  */
-bool ProcessNewBlock(CValidationState& state, const CChainParams& chainparams, const CBlock* pblock, bool fForceProcessing, const CDiskBlockPos* dbp, bool* fNewBlock);
+bool ProcessNewBlock(const CChainParams& chainparams, const CBlock* pblock, bool fForceProcessing, const CDiskBlockPos* dbp, bool* fNewBlock);
 /** Check whether enough disk space is available for an incoming block */
 bool CheckDiskSpace(uint64_t nAdditionalBytes = 0);
 /** Open a block file (blk?????.dat) */
diff --git a/src/rpc/mining.cpp b/src/rpc/mining.cpp
index d9fe9530a10c0..ad545bdf0d102 100644
--- a/src/rpc/mining.cpp
+++ b/src/rpc/mining.cpp
@@ -131,8 +131,7 @@ UniValue generateBlocks(boost::shared_ptr<CReserveScript> coinbaseScript, int nG
         if (pblock->nNonce == nInnerLoopCount) {
             continue;
         }
-        CValidationState state;
-        if (!ProcessNewBlock(state, Params(), pblock, true, NULL, NULL))
+        if (!ProcessNewBlock(Params(), pblock, true, NULL, NULL))
             throw JSONRPCError(RPC_INTERNAL_ERROR, "ProcessNewBlock, block not accepted");
         ++nHeight;
         blockHashes.push_back(pblock->GetHash().GetHex());
@@ -754,10 +753,9 @@ UniValue submitblock(const JSONRPCRequest& request)
         }
     }
 
-    CValidationState state;
     submitblock_StateCatcher sc(block.GetHash());
     RegisterValidationInterface(&sc);
-    bool fAccepted = ProcessNewBlock(state, Params(), &block, true, NULL, NULL);
+    bool fAccepted = ProcessNewBlock(Params(), &block, true, NULL, NULL);
     UnregisterValidationInterface(&sc);
     if (fBlockPresent)
     {
@@ -765,13 +763,9 @@ UniValue submitblock(const JSONRPCRequest& request)
             return "duplicate-inconclusive";
         return "duplicate";
     }
-    if (fAccepted)
-    {
-        if (!sc.found)
-            return "inconclusive";
-        state = sc.state;
-    }
-    return BIP22ValidationResult(state);
+    if (!sc.found)
+        return "inconclusive";
+    return BIP22ValidationResult(sc.state);
 }
 
 UniValue estimatefee(const JSONRPCRequest& request)
diff --git a/src/test/miner_tests.cpp b/src/test/miner_tests.cpp
index e71a4b1ebc643..1ef70c343c3ec 100644
--- a/src/test/miner_tests.cpp
+++ b/src/test/miner_tests.cpp
@@ -222,9 +222,7 @@ BOOST_AUTO_TEST_CASE(CreateNewBlock_validity)
             txFirst.push_back(new CTransaction(pblock->vtx[0]));
         pblock->hashMerkleRoot = BlockMerkleRoot(*pblock);
         pblock->nNonce = blockinfo[i].nonce;
-        CValidationState state;
-        BOOST_CHECK(ProcessNewBlock(state, chainparams, pblock, true, NULL, NULL));
-        BOOST_CHECK(state.IsValid());
+        BOOST_CHECK(ProcessNewBlock(chainparams, pblock, true, NULL, NULL));
         pblock->hashPrevBlock = pblock->GetHash();
     }
 
diff --git a/src/test/test_bitcoin.cpp b/src/test/test_bitcoin.cpp
index 4440585c01cd3..3f7416f23f99d 100644
--- a/src/test/test_bitcoin.cpp
+++ b/src/test/test_bitcoin.cpp
@@ -126,8 +126,7 @@ TestChain100Setup::CreateAndProcessBlock(const std::vector<CMutableTransaction>&
 
     while (!CheckProofOfWork(block.GetHash(), block.nBits, chainparams.GetConsensus())) ++block.nNonce;
 
-    CValidationState state;
-    ProcessNewBlock(state, chainparams, &block, true, NULL, NULL);
+    ProcessNewBlock(chainparams, &block, true, NULL, NULL);
 
     CBlock result = block;
     return result;

From b2e178a2d2e387b147f0d87e64fc773d5ec799d0 Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Wed, 1 Jun 2016 01:39:56 -0700
Subject: [PATCH 1193/1802] Add deserialize + CheckBlock benchmarks, and a full
 block hex

---
 src/Makefile.bench.include     |  17 +++++++++-
 src/bench/checkblock.cpp       |  55 +++++++++++++++++++++++++++++++++
 src/bench/data/block413567.raw | Bin 0 -> 999887 bytes
 3 files changed, 71 insertions(+), 1 deletion(-)
 create mode 100644 src/bench/checkblock.cpp
 create mode 100644 src/bench/data/block413567.raw

diff --git a/src/Makefile.bench.include b/src/Makefile.bench.include
index 9760ad089c93c..840d33c1b5f82 100644
--- a/src/Makefile.bench.include
+++ b/src/Makefile.bench.include
@@ -6,11 +6,15 @@ bin_PROGRAMS += bench/bench_bitcoin
 BENCH_SRCDIR = bench
 BENCH_BINARY = bench/bench_bitcoin$(EXEEXT)
 
+RAW_TEST_FILES = \
+  bench/data/block413567.raw
+GENERATED_TEST_FILES = $(RAW_TEST_FILES:.raw=.raw.h)
 
 bench_bench_bitcoin_SOURCES = \
   bench/bench_bitcoin.cpp \
   bench/bench.cpp \
   bench/bench.h \
+  bench/checkblock.cpp \
   bench/Examples.cpp \
   bench/rollingbloom.cpp \
   bench/crypto_hash.cpp \
@@ -20,6 +24,8 @@ bench_bench_bitcoin_SOURCES = \
   bench/base58.cpp \
   bench/lockedpool.cpp
 
+nodist_bench_bench_bitcoin_SOURCES = $(GENERATED_TEST_FILES)
+
 bench_bench_bitcoin_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(EVENT_CLFAGS) $(EVENT_PTHREADS_CFLAGS) -I$(builddir)/bench/
 bench_bench_bitcoin_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
 bench_bench_bitcoin_LDADD = \
@@ -45,10 +51,12 @@ endif
 bench_bench_bitcoin_LDADD += $(BOOST_LIBS) $(BDB_LIBS) $(SSL_LIBS) $(CRYPTO_LIBS) $(MINIUPNPC_LIBS) $(EVENT_PTHREADS_LIBS) $(EVENT_LIBS)
 bench_bench_bitcoin_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS)
 
-CLEAN_BITCOIN_BENCH = bench/*.gcda bench/*.gcno
+CLEAN_BITCOIN_BENCH = bench/*.gcda bench/*.gcno $(GENERATED_TEST_FILES)
 
 CLEANFILES += $(CLEAN_BITCOIN_BENCH)
 
+bench/checkblock.cpp: bench/data/block413567.raw.h
+
 bitcoin_bench: $(BENCH_BINARY)
 
 bench: $(BENCH_BINARY) FORCE
@@ -56,3 +64,10 @@ bench: $(BENCH_BINARY) FORCE
 
 bitcoin_bench_clean : FORCE
 	rm -f $(CLEAN_BITCOIN_BENCH) $(bench_bench_bitcoin_OBJECTS) $(BENCH_BINARY)
+
+%.raw.h: %.raw
+	@$(MKDIR_P) $(@D)
+	@echo "static unsigned const char $(*F)[] = {" >> $@
+	@$(HEXDUMP) -v -e '8/1 "0x%02x, "' -e '"\n"' $< | $(SED) -e 's/0x  ,//g' >> $@
+	@echo "};" >> $@
+	@echo "Generated $@"
diff --git a/src/bench/checkblock.cpp b/src/bench/checkblock.cpp
new file mode 100644
index 0000000000000..bb596ce7f9ccc
--- /dev/null
+++ b/src/bench/checkblock.cpp
@@ -0,0 +1,55 @@
+// Copyright (c) 2016 The Bitcoin Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#include "bench.h"
+
+#include "chainparams.h"
+#include "main.h"
+#include "consensus/validation.h"
+
+namespace block_bench {
+#include "bench/data/block413567.raw.h"
+}
+
+// These are the two major time-sinks which happen after we have fully received
+// a block off the wire, but before we can relay the block on to peers using
+// compact block relay.
+
+static void DeserializeBlockTest(benchmark::State& state)
+{
+    CDataStream stream((const char*)block_bench::block413567,
+            (const char*)&block_bench::block413567[sizeof(block_bench::block413567)],
+            SER_NETWORK, PROTOCOL_VERSION);
+    char a;
+    stream.write(&a, 1); // Prevent compaction
+
+    while (state.KeepRunning()) {
+        CBlock block;
+        stream >> block;
+        assert(stream.Rewind(sizeof(block_bench::block413567)));
+    }
+}
+
+static void DeserializeAndCheckBlockTest(benchmark::State& state)
+{
+    CDataStream stream((const char*)block_bench::block413567,
+            (const char*)&block_bench::block413567[sizeof(block_bench::block413567)],
+            SER_NETWORK, PROTOCOL_VERSION);
+    char a;
+    stream.write(&a, 1); // Prevent compaction
+
+    Consensus::Params params = Params(CBaseChainParams::MAIN).GetConsensus();
+
+    while (state.KeepRunning()) {
+        CBlock block; // Note that CBlock caches its checked state, so we need to recreate it here
+        stream >> block;
+        assert(stream.Rewind(sizeof(block_bench::block413567)));
+
+        CValidationState state;
+        assert(CheckBlock(block, state, params));
+    }
+}
+
+BENCHMARK(DeserializeBlockTest);
+BENCHMARK(DeserializeAndCheckBlockTest);
diff --git a/src/bench/data/block413567.raw b/src/bench/data/block413567.raw
new file mode 100644
index 0000000000000000000000000000000000000000..67d2d5d38205e6ac9b281c742717ae720b228c9a
GIT binary patch
literal 999887
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

literal 0
HcmV?d00001


From eecffe50efc3944d713c701fa375dacbf17fb7cf Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Tue, 1 Nov 2016 11:03:18 -0400
Subject: [PATCH 1194/1802] Remove redundant duplicate-input check from
 CheckTransaction

---
 src/main.cpp | 20 +++++++++++---------
 src/main.h   |  2 +-
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index 7e5b9528b9235..c8af01983cbc9 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1104,7 +1104,7 @@ int64_t GetTransactionSigOpCost(const CTransaction& tx, const CCoinsViewCache& i
 
 
 
-bool CheckTransaction(const CTransaction& tx, CValidationState &state)
+bool CheckTransaction(const CTransaction& tx, CValidationState &state, bool fCheckDuplicateInputs)
 {
     // Basic checks that don't depend on any context
     if (tx.vin.empty())
@@ -1128,13 +1128,15 @@ bool CheckTransaction(const CTransaction& tx, CValidationState &state)
             return state.DoS(100, false, REJECT_INVALID, "bad-txns-txouttotal-toolarge");
     }
 
-    // Check for duplicate inputs
-    set<COutPoint> vInOutPoints;
-    for (const auto& txin : tx.vin)
-    {
-        if (vInOutPoints.count(txin.prevout))
-            return state.DoS(100, false, REJECT_INVALID, "bad-txns-inputs-duplicate");
-        vInOutPoints.insert(txin.prevout);
+    // Check for duplicate inputs - note that this check is slow so we skip it in CheckBlock
+    if (fCheckDuplicateInputs) {
+        set<COutPoint> vInOutPoints;
+        for (const auto& txin : tx.vin)
+        {
+            if (vInOutPoints.count(txin.prevout))
+                return state.DoS(100, false, REJECT_INVALID, "bad-txns-inputs-duplicate");
+            vInOutPoints.insert(txin.prevout);
+        }
     }
 
     if (tx.IsCoinBase())
@@ -3461,7 +3463,7 @@ bool CheckBlock(const CBlock& block, CValidationState& state, const Consensus::P
 
     // Check transactions
     for (const auto& tx : block.vtx)
-        if (!CheckTransaction(tx, state))
+        if (!CheckTransaction(tx, state, false))
             return state.Invalid(false, state.GetRejectCode(), state.GetRejectReason(),
                                  strprintf("Transaction check failed (tx hash %s) %s", tx.GetHash().ToString(), state.GetDebugMessage()));
 
diff --git a/src/main.h b/src/main.h
index 9343330587aff..21829b6c25a38 100644
--- a/src/main.h
+++ b/src/main.h
@@ -343,7 +343,7 @@ void UpdateCoins(const CTransaction& tx, CCoinsViewCache& inputs, int nHeight);
 /** Transaction validation functions */
 
 /** Context-independent validity checks */
-bool CheckTransaction(const CTransaction& tx, CValidationState& state);
+bool CheckTransaction(const CTransaction& tx, CValidationState& state, bool fCheckDuplicateInputs=true);
 
 namespace Consensus {
 

From e2b3fb349ed99f05ea518c7eb260db606350a2b5 Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Wed, 9 Nov 2016 11:28:41 -0800
Subject: [PATCH 1195/1802] Optimize vInOutPoints insertion a bit

---
 src/main.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index c8af01983cbc9..6e19123a41903 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1133,9 +1133,8 @@ bool CheckTransaction(const CTransaction& tx, CValidationState &state, bool fChe
         set<COutPoint> vInOutPoints;
         for (const auto& txin : tx.vin)
         {
-            if (vInOutPoints.count(txin.prevout))
+            if (!vInOutPoints.insert(txin.prevout).second)
                 return state.DoS(100, false, REJECT_INVALID, "bad-txns-inputs-duplicate");
-            vInOutPoints.insert(txin.prevout);
         }
     }
 

From f445d886126c00814c71b855fc2f36fdd7e11098 Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Wed, 9 Nov 2016 21:27:49 +0100
Subject: [PATCH 1196/1802] Revert "Check and enable -Wshadow by default."

This reverts commit fd5654cab1e5d317119f747abd245c620e8ba29b.

This is still causing too many warnings for some compiler combinations,
forget it for now.
---
 configure.ac | 1 -
 1 file changed, 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 29e3115e7c6f3..705327e816d94 100644
--- a/configure.ac
+++ b/configure.ac
@@ -203,7 +203,6 @@ if test "x$CXXFLAGS_overridden" = "xno"; then
   AX_CHECK_COMPILE_FLAG([-Wextra],[CXXFLAGS="$CXXFLAGS -Wextra"],,[[$CXXFLAG_WERROR]])
   AX_CHECK_COMPILE_FLAG([-Wformat],[CXXFLAGS="$CXXFLAGS -Wformat"],,[[$CXXFLAG_WERROR]])
   AX_CHECK_COMPILE_FLAG([-Wformat-security],[CXXFLAGS="$CXXFLAGS -Wformat-security"],,[[$CXXFLAG_WERROR]])
-  AX_CHECK_COMPILE_FLAG([-Wshadow],[CXXFLAGS="$CXXFLAGS -Wshadow"],,[[$CXXFLAG_WERROR]])
 
   ## Some compilers (gcc) ignore unknown -Wno-* options, but warn about all
   ## unknown options if any other warning is produced. Test the -Wfoo case, and

From 45d372f88900bda74835a20a44246746c2ac94e6 Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@dash.org>
Date: Thu, 10 Nov 2016 00:53:55 +0300
Subject: [PATCH 1197/1802] Missed one "return false" in recent refactoring in
 #9067

---
 src/bitcoin-tx.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bitcoin-tx.cpp b/src/bitcoin-tx.cpp
index ecc19c44ad6e3..6c66efcc9cb29 100644
--- a/src/bitcoin-tx.cpp
+++ b/src/bitcoin-tx.cpp
@@ -48,7 +48,7 @@ static int AppInitRawTx(int argc, char* argv[])
         SelectParams(ChainNameFromCommandLine());
     } catch (const std::exception& e) {
         fprintf(stderr, "Error: %s\n", e.what());
-        return false;
+        return EXIT_FAILURE;
     }
 
     fCreateBlank = GetBoolArg("-create", false);

From bdcba6d93308551788a23f75bec194433c30ebfe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pavel=20Jan=C3=ADk?= <Pavel@Janik.cz>
Date: Thu, 10 Nov 2016 08:11:51 +0100
Subject: [PATCH 1198/1802] Initialize variable to prevent compiler warning

---
 src/wallet/rpcdump.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/wallet/rpcdump.cpp b/src/wallet/rpcdump.cpp
index c5feb478993ce..bb5337c4adb3a 100644
--- a/src/wallet/rpcdump.cpp
+++ b/src/wallet/rpcdump.cpp
@@ -1017,7 +1017,7 @@ UniValue importmulti(const JSONRPCRequest& mainRequest)
 
     bool fRunScan = false;
     const int64_t minimumTimestamp = 1;
-    int64_t nLowestTimestamp;
+    int64_t nLowestTimestamp = 0;
 
     if (fRescan && chainActive.Tip()) {
         nLowestTimestamp = chainActive.Tip()->GetBlockTime();

From a79f864945d7abe05e777a942864c181311e5070 Mon Sep 17 00:00:00 2001
From: Masahiko Hyuga <mail@mhyuga.jp>
Date: Thu, 10 Nov 2016 18:18:52 +0900
Subject: [PATCH 1199/1802] fix getnettotals RPC description about timemillis.

---
 src/rpc/net.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/rpc/net.cpp b/src/rpc/net.cpp
index 2b43f08f0be0a..bd68abdbb8fe7 100644
--- a/src/rpc/net.cpp
+++ b/src/rpc/net.cpp
@@ -331,7 +331,7 @@ UniValue getnettotals(const JSONRPCRequest& request)
             "{\n"
             "  \"totalbytesrecv\": n,   (numeric) Total bytes received\n"
             "  \"totalbytessent\": n,   (numeric) Total bytes sent\n"
-            "  \"timemillis\": t,       (numeric) Total cpu time\n"
+            "  \"timemillis\": t,       (numeric) Current UNIX time in milliseconds\n"
             "  \"uploadtarget\":\n"
             "  {\n"
             "    \"timeframe\": n,                         (numeric) Length of the measuring timeframe in seconds\n"

From 7d1de3032d3d17a2e3bc672c0e60233f64cd3523 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pavel=20Jan=C3=ADk?= <Pavel@Janik.cz>
Date: Wed, 9 Nov 2016 12:50:38 +0100
Subject: [PATCH 1200/1802] Mention reporting security issues responsibly

---
 .github/ISSUE_TEMPLATE.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index acb54dd3548af..28c1814998256 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -4,6 +4,8 @@ This issue tracker is only for technical issues related to bitcoin-core.
 
 General bitcoin questions and/or support requests and are best directed to the [Bitcoin StackExchange](https://bitcoin.stackexchange.com).
 
+For reporting security issues, please read instructions at [https://bitcoincore.org/en/contact/](https://bitcoincore.org/en/contact/).
+
 ### Describe the issue
 
 ### Can you reliably reproduce the issue?

From bf49f107ef4fa32c3271010ccd394e2ab3c44b68 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pavel=20Jan=C3=ADk?= <Pavel@Janik.cz>
Date: Thu, 10 Nov 2016 21:38:07 +0100
Subject: [PATCH 1201/1802] Use better name for local variable to prevent
 -Wshadow compiler warning

---
 src/bench/checkblock.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/bench/checkblock.cpp b/src/bench/checkblock.cpp
index bb596ce7f9ccc..4a564d3fc8254 100644
--- a/src/bench/checkblock.cpp
+++ b/src/bench/checkblock.cpp
@@ -46,8 +46,8 @@ static void DeserializeAndCheckBlockTest(benchmark::State& state)
         stream >> block;
         assert(stream.Rewind(sizeof(block_bench::block413567)));
 
-        CValidationState state;
-        assert(CheckBlock(block, state, params));
+        CValidationState validationState;
+        assert(CheckBlock(block, validationState, params));
     }
 }
 

From fb0c934d1b2d58b165e13d2b301e54870c5dc60f Mon Sep 17 00:00:00 2001
From: Luke Dashjr <luke-jr+git@utopios.org>
Date: Fri, 9 Sep 2016 08:15:01 +0000
Subject: [PATCH 1202/1802] Wallet: Let the interval-flushing thread figure out
 the filename

---
 src/wallet/wallet.cpp   | 6 +++++-
 src/wallet/wallet.h     | 3 +++
 src/wallet/walletdb.cpp | 3 ++-
 src/wallet/walletdb.h   | 2 +-
 4 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index c2bac6e330539..36b7ddbbc584c 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -3549,6 +3549,8 @@ bool CWallet::InitLoadWallet()
     return true;
 }
 
+std::atomic<bool> CWallet::fFlushThreadRunning(false);
+
 void CWallet::postInitProcess(boost::thread_group& threadGroup)
 {
     // Add wallet transactions that aren't already in a block to mempool
@@ -3556,7 +3558,9 @@ void CWallet::postInitProcess(boost::thread_group& threadGroup)
     ReacceptWalletTransactions();
 
     // Run a thread to flush wallet periodically
-    threadGroup.create_thread(boost::bind(&ThreadFlushWalletDB, boost::ref(this->strWalletFile)));
+    if (!CWallet::fFlushThreadRunning.exchange(true)) {
+        threadGroup.create_thread(ThreadFlushWalletDB);
+    }
 }
 
 bool CWallet::ParameterInteraction()
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
index a527c6d84ef1b..1814870c5e9fb 100644
--- a/src/wallet/wallet.h
+++ b/src/wallet/wallet.h
@@ -18,6 +18,7 @@
 #include "wallet/rpcwallet.h"
 
 #include <algorithm>
+#include <atomic>
 #include <map>
 #include <set>
 #include <stdexcept>
@@ -550,6 +551,8 @@ class CAccountingEntry
 class CWallet : public CCryptoKeyStore, public CValidationInterface
 {
 private:
+    static std::atomic<bool> fFlushThreadRunning;
+
     /**
      * Select a set of coins such that nValueRet >= nTargetValue and at least
      * all coins from coinControl are selected; Never select unconfirmed coins
diff --git a/src/wallet/walletdb.cpp b/src/wallet/walletdb.cpp
index 43fd6a20adc81..9496c4404d51b 100644
--- a/src/wallet/walletdb.cpp
+++ b/src/wallet/walletdb.cpp
@@ -768,7 +768,7 @@ DBErrors CWalletDB::ZapWalletTx(CWallet* pwallet, vector<CWalletTx>& vWtx)
     return DB_LOAD_OK;
 }
 
-void ThreadFlushWalletDB(const string& strFile)
+void ThreadFlushWalletDB()
 {
     // Make this thread recognisable as the wallet flushing thread
     RenameThread("bitcoin-wallet");
@@ -810,6 +810,7 @@ void ThreadFlushWalletDB(const string& strFile)
                 if (nRefCount == 0)
                 {
                     boost::this_thread::interruption_point();
+                    const std::string& strFile = pwalletMain->strWalletFile;
                     map<string, int>::iterator _mi = bitdb.mapFileUseCount.find(strFile);
                     if (_mi != bitdb.mapFileUseCount.end())
                     {
diff --git a/src/wallet/walletdb.h b/src/wallet/walletdb.h
index eb25ac613dd33..efb5e54786f61 100644
--- a/src/wallet/walletdb.h
+++ b/src/wallet/walletdb.h
@@ -182,6 +182,6 @@ class CWalletDB : public CDB
 
 };
 
-void ThreadFlushWalletDB(const std::string& strFile);
+void ThreadFlushWalletDB();
 
 #endif // BITCOIN_WALLET_WALLETDB_H

From 5394b3940dec1fd35952d344e6373fb7115c5490 Mon Sep 17 00:00:00 2001
From: Luke Dashjr <luke-jr+git@utopios.org>
Date: Fri, 9 Sep 2016 08:44:47 +0000
Subject: [PATCH 1203/1802] Wallet: Split main logic from InitLoadWallet into
 CreateWalletFromFile

---
 src/wallet/wallet.cpp | 81 ++++++++++++++++++++++++++++---------------
 src/wallet/wallet.h   |  1 +
 2 files changed, 54 insertions(+), 28 deletions(-)

diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index 36b7ddbbc584c..f88da978d4c04 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -3374,16 +3374,8 @@ std::string CWallet::GetWalletHelpString(bool showDebug)
     return strUsage;
 }
 
-bool CWallet::InitLoadWallet()
+CWallet* CWallet::CreateWalletFromFile(const std::string walletFile)
 {
-    if (GetBoolArg("-disablewallet", DEFAULT_DISABLE_WALLET)) {
-        pwalletMain = NULL;
-        LogPrintf("Wallet disabled!\n");
-        return true;
-    }
-
-    std::string walletFile = GetArg("-wallet", DEFAULT_WALLET_DAT);
-
     // needed to restore wallet transaction meta data after -zapwallettxes
     std::vector<CWalletTx> vWtx;
 
@@ -3393,7 +3385,8 @@ bool CWallet::InitLoadWallet()
         CWallet *tempWallet = new CWallet(walletFile);
         DBErrors nZapWalletRet = tempWallet->ZapWalletTx(vWtx);
         if (nZapWalletRet != DB_LOAD_OK) {
-            return InitError(strprintf(_("Error loading %s: Wallet corrupted"), walletFile));
+            InitError(strprintf(_("Error loading %s: Wallet corrupted"), walletFile));
+            return NULL;
         }
 
         delete tempWallet;
@@ -3408,23 +3401,29 @@ bool CWallet::InitLoadWallet()
     DBErrors nLoadWalletRet = walletInstance->LoadWallet(fFirstRun);
     if (nLoadWalletRet != DB_LOAD_OK)
     {
-        if (nLoadWalletRet == DB_CORRUPT)
-            return InitError(strprintf(_("Error loading %s: Wallet corrupted"), walletFile));
+        if (nLoadWalletRet == DB_CORRUPT) {
+            InitError(strprintf(_("Error loading %s: Wallet corrupted"), walletFile));
+            return NULL;
+        }
         else if (nLoadWalletRet == DB_NONCRITICAL_ERROR)
         {
             InitWarning(strprintf(_("Error reading %s! All keys read correctly, but transaction data"
                                          " or address book entries might be missing or incorrect."),
                 walletFile));
         }
-        else if (nLoadWalletRet == DB_TOO_NEW)
-            return InitError(strprintf(_("Error loading %s: Wallet requires newer version of %s"),
-                               walletFile, _(PACKAGE_NAME)));
+        else if (nLoadWalletRet == DB_TOO_NEW) {
+            InitError(strprintf(_("Error loading %s: Wallet requires newer version of %s"), walletFile, _(PACKAGE_NAME)));
+            return NULL;
+        }
         else if (nLoadWalletRet == DB_NEED_REWRITE)
         {
-            return InitError(strprintf(_("Wallet needed to be rewritten: restart %s to complete"), _(PACKAGE_NAME)));
+            InitError(strprintf(_("Wallet needed to be rewritten: restart %s to complete"), _(PACKAGE_NAME)));
+            return NULL;
+        }
+        else {
+            InitError(strprintf(_("Error loading %s"), walletFile));
+            return NULL;
         }
-        else
-            return InitError(strprintf(_("Error loading %s"), walletFile));
     }
 
     if (GetBoolArg("-upgradewallet", fFirstRun))
@@ -3440,7 +3439,8 @@ bool CWallet::InitLoadWallet()
             LogPrintf("Allowing wallet upgrade up to %i\n", nMaxVersion);
         if (nMaxVersion < walletInstance->GetVersion())
         {
-            return InitError(_("Cannot downgrade wallet"));
+            InitError(_("Cannot downgrade wallet"));
+            return NULL;
         }
         walletInstance->SetMaxVersion(nMaxVersion);
     }
@@ -3457,18 +3457,24 @@ bool CWallet::InitLoadWallet()
         CPubKey newDefaultKey;
         if (walletInstance->GetKeyFromPool(newDefaultKey)) {
             walletInstance->SetDefaultKey(newDefaultKey);
-            if (!walletInstance->SetAddressBook(walletInstance->vchDefaultKey.GetID(), "", "receive"))
-                return InitError(_("Cannot write default address") += "\n");
+            if (!walletInstance->SetAddressBook(walletInstance->vchDefaultKey.GetID(), "", "receive")) {
+                InitError(_("Cannot write default address") += "\n");
+                return NULL;
+            }
         }
 
         walletInstance->SetBestChain(chainActive.GetLocator());
     }
     else if (mapArgs.count("-usehd")) {
         bool useHD = GetBoolArg("-usehd", DEFAULT_USE_HD_WALLET);
-        if (walletInstance->IsHDEnabled() && !useHD)
-            return InitError(strprintf(_("Error loading %s: You can't disable HD on a already existing HD wallet"), walletFile));
-        if (!walletInstance->IsHDEnabled() && useHD)
-            return InitError(strprintf(_("Error loading %s: You can't enable HD on a already existing non-HD wallet"), walletFile));
+        if (walletInstance->IsHDEnabled() && !useHD) {
+            InitError(strprintf(_("Error loading %s: You can't disable HD on a already existing HD wallet"), walletFile));
+            return NULL;
+        }
+        if (!walletInstance->IsHDEnabled() && useHD) {
+            InitError(strprintf(_("Error loading %s: You can't enable HD on a already existing non-HD wallet"), walletFile));
+            return NULL;
+        }
     }
 
     LogPrintf(" wallet      %15dms\n", GetTimeMillis() - nStart);
@@ -3498,8 +3504,10 @@ bool CWallet::InitLoadWallet()
             while (block && block->pprev && (block->pprev->nStatus & BLOCK_HAVE_DATA) && block->pprev->nTx > 0 && pindexRescan != block)
                 block = block->pprev;
 
-            if (pindexRescan != block)
-                return InitError(_("Prune: last wallet synchronisation goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of pruned node)"));
+            if (pindexRescan != block) {
+                InitError(_("Prune: last wallet synchronisation goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of pruned node)"));
+                return NULL;
+            }
         }
 
         uiInterface.InitMessage(_("Rescanning..."));
@@ -3544,7 +3552,24 @@ bool CWallet::InitLoadWallet()
         LogPrintf("mapAddressBook.size() = %u\n",  walletInstance->mapAddressBook.size());
     }
 
-    pwalletMain = walletInstance;
+    return walletInstance;
+}
+
+bool CWallet::InitLoadWallet()
+{
+    if (GetBoolArg("-disablewallet", DEFAULT_DISABLE_WALLET)) {
+        pwalletMain = NULL;
+        LogPrintf("Wallet disabled!\n");
+        return true;
+    }
+
+    std::string walletFile = GetArg("-wallet", DEFAULT_WALLET_DAT);
+
+    CWallet * const pwallet = CreateWalletFromFile(walletFile);
+    if (!pwallet) {
+        return false;
+    }
+    pwalletMain = pwallet;
 
     return true;
 }
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
index 1814870c5e9fb..f536dbe5c8e87 100644
--- a/src/wallet/wallet.h
+++ b/src/wallet/wallet.h
@@ -917,6 +917,7 @@ class CWallet : public CCryptoKeyStore, public CValidationInterface
     static std::string GetWalletHelpString(bool showDebug);
 
     /* Initializes the wallet, returns a new CWallet instance or a null pointer in case of an error */
+    static CWallet* CreateWalletFromFile(const std::string walletFile);
     static bool InitLoadWallet();
 
     /**

From 079142b75771c5b39a76a1eaa6347bce5e99c0b3 Mon Sep 17 00:00:00 2001
From: Jonas Schnelli <dev@jonasschnelli.ch>
Date: Fri, 11 Nov 2016 14:09:52 +0100
Subject: [PATCH 1204/1802] fNetworkActive is not protected by a lock, use an
 atomic

---
 src/net.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/net.h b/src/net.h
index e2d88b478de64..7a32e21f4a436 100644
--- a/src/net.h
+++ b/src/net.h
@@ -403,7 +403,7 @@ class CConnman
     unsigned int nReceiveFloodSize;
 
     std::vector<ListenSocket> vhListenSocket;
-    bool fNetworkActive;
+    std::atomic<bool> fNetworkActive;
     banmap_t setBanned;
     CCriticalSection cs_setBanned;
     bool setBannedIsDirty;

From f7345050e9ad6a67b722c092735518bd2f6f152a Mon Sep 17 00:00:00 2001
From: Jonas Schnelli <dev@jonasschnelli.ch>
Date: Fri, 11 Nov 2016 14:32:38 +0100
Subject: [PATCH 1205/1802] Make strWalletFile const

---
 src/wallet/wallet.h | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
index a527c6d84ef1b..409d817046424 100644
--- a/src/wallet/wallet.h
+++ b/src/wallet/wallet.h
@@ -600,7 +600,7 @@ class CWallet : public CCryptoKeyStore, public CValidationInterface
      */
     mutable CCriticalSection cs_wallet;
 
-    std::string strWalletFile;
+    const std::string strWalletFile;
 
     void LoadKeyPool(int nIndex, const CKeyPool &keypool)
     {
@@ -625,11 +625,9 @@ class CWallet : public CCryptoKeyStore, public CValidationInterface
         SetNull();
     }
 
-    CWallet(const std::string& strWalletFileIn)
+    CWallet(const std::string& strWalletFileIn) : strWalletFile(strWalletFileIn)
     {
         SetNull();
-
-        strWalletFile = strWalletFileIn;
         fFileBacked = true;
     }
 

From 79f755db4114ad25c6f856c9a07e7101f2044af3 Mon Sep 17 00:00:00 2001
From: Alex Morcos <morcos@chaincode.com>
Date: Fri, 4 Nov 2016 14:34:36 -0400
Subject: [PATCH 1206/1802] Unset fImporting for loading mempool

---
 src/init.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/init.cpp b/src/init.cpp
index 31e3efb459d6c..b5606069e16ba 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -601,6 +601,8 @@ void ThreadImport(std::vector<boost::filesystem::path> vImportFiles)
 {
     const CChainParams& chainparams = Params();
     RenameThread("bitcoin-loadblk");
+
+    {
     CImportingNow imp;
 
     // -reindex
@@ -660,7 +662,7 @@ void ThreadImport(std::vector<boost::filesystem::path> vImportFiles)
         LogPrintf("Stopping after block import\n");
         StartShutdown();
     }
-
+    } // End scope of CImportingNow
     LoadMempool();
 }
 

From 1126c853d9a1a3d2a6a5d85f045e338d78df2296 Mon Sep 17 00:00:00 2001
From: Russell Yanofsky <russ@yanofsky.org>
Date: Fri, 11 Nov 2016 15:46:14 -0500
Subject: [PATCH 1207/1802] [qa] Change sync_blocks to pick smarter maxheight

Instead of syncing to max height returned by the waitforblockheight RPC, sync
to the max height returned by the getblockcount RPC.

This change was suggested by Suhas Daftuar <sdaftuar@chaincode.com>.
---
 qa/rpc-tests/test_framework/util.py | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/qa/rpc-tests/test_framework/util.py b/qa/rpc-tests/test_framework/util.py
index bf13b7fd8480b..1923ca8977bc5 100644
--- a/qa/rpc-tests/test_framework/util.py
+++ b/qa/rpc-tests/test_framework/util.py
@@ -129,17 +129,19 @@ def sync_blocks(rpc_connections, *, wait=1, timeout=60):
     one node already synced to the latest, stable tip, otherwise there's a
     chance it might return before all nodes are stably synced.
     """
-    maxheight = 0
+    # Use getblockcount() instead of waitforblockheight() to determine the
+    # initial max height because the two RPCs look at different internal global
+    # variables (chainActive vs latestBlock) and the former gets updated
+    # earlier.
+    maxheight = max(x.getblockcount() for x in rpc_connections)
     start_time = cur_time = time.time()
     while cur_time <= start_time + timeout:
         tips = [r.waitforblockheight(maxheight, int(wait * 1000)) for r in rpc_connections]
-        heights = [t["height"] for t in tips]
-        if all(t == tips[0] for t in tips):
-            return
-        if all(h == heights[0] for h in heights):
+        if all(t["height"] == maxheight for t in tips):
+            if all(t["hash"] == tips[0]["hash"] for t in tips):
+                return
             raise AssertionError("Block sync failed, mismatched block hashes:{}".format(
                                  "".join("\n  {!r}".format(tip) for tip in tips)))
-        maxheight = max(heights)
         cur_time = time.time()
     raise AssertionError("Block sync to height {} timed out:{}".format(
                          maxheight, "".join("\n  {!r}".format(tip) for tip in tips)))

From b74ff5cf0c902b993a759f9ac92d95e186397662 Mon Sep 17 00:00:00 2001
From: Luke Dashjr <luke-jr+git@utopios.org>
Date: Sat, 12 Nov 2016 07:15:02 +0000
Subject: [PATCH 1208/1802] Bugfix: Correctly replace generated headers and
 fail cleanly

Also removes generation of headers for *.raw files in test_bitcoin (none exist anymore)
---
 src/Makefile.bench.include |  8 +++++---
 src/Makefile.test.include  | 18 ++++++------------
 2 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/src/Makefile.bench.include b/src/Makefile.bench.include
index 840d33c1b5f82..246797a1b275e 100644
--- a/src/Makefile.bench.include
+++ b/src/Makefile.bench.include
@@ -67,7 +67,9 @@ bitcoin_bench_clean : FORCE
 
 %.raw.h: %.raw
 	@$(MKDIR_P) $(@D)
-	@echo "static unsigned const char $(*F)[] = {" >> $@
-	@$(HEXDUMP) -v -e '8/1 "0x%02x, "' -e '"\n"' $< | $(SED) -e 's/0x  ,//g' >> $@
-	@echo "};" >> $@
+	@{ \
+	 echo "static unsigned const char $(*F)[] = {" && \
+	 $(HEXDUMP) -v -e '8/1 "0x%02x, "' -e '"\n"' $< | $(SED) -e 's/0x  ,//g' && \
+	 echo "};"; \
+	} > "$@.new" && mv -f "$@.new" "$@"
 	@echo "Generated $@"
diff --git a/src/Makefile.test.include b/src/Makefile.test.include
index fa610e300c99b..a14adc7876563 100644
--- a/src/Makefile.test.include
+++ b/src/Makefile.test.include
@@ -149,16 +149,10 @@ endif
 
 %.json.h: %.json
 	@$(MKDIR_P) $(@D)
-	@echo "namespace json_tests{" > $@
-	@echo "static unsigned const char $(*F)[] = {" >> $@
-	@$(HEXDUMP) -v -e '8/1 "0x%02x, "' -e '"\n"' $< | $(SED) -e 's/0x  ,//g' >> $@
-	@echo "};};" >> $@
-	@echo "Generated $@"
-
-%.raw.h: %.raw
-	@$(MKDIR_P) $(@D)
-	@echo "namespace alert_tests{" > $@
-	@echo "static unsigned const char $(*F)[] = {" >> $@
-	@$(HEXDUMP) -v -e '8/1 "0x%02x, "' -e '"\n"' $< | $(SED) -e 's/0x  ,//g' >> $@
-	@echo "};};" >> $@
+	@{ \
+	 echo "namespace json_tests{" && \
+	 echo "static unsigned const char $(*F)[] = {" && \
+	 $(HEXDUMP) -v -e '8/1 "0x%02x, "' -e '"\n"' $< | $(SED) -e 's/0x  ,//g' && \
+	 echo "};};"; \
+	} > "$@.new" && mv -f "$@.new" "$@"
 	@echo "Generated $@"

From 2e448930815074bbb07214604ed16e905f68558d Mon Sep 17 00:00:00 2001
From: Jonas Schnelli <dev@jonasschnelli.ch>
Date: Sat, 12 Nov 2016 10:23:57 +0100
Subject: [PATCH 1209/1802] Move -salvagewallet, -zap(wtx) to where they belong

---
 src/init.cpp          | 15 +--------------
 src/wallet/wallet.cpp | 10 ++++++++++
 2 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/src/init.cpp b/src/init.cpp
index 31e3efb459d6c..8c93d3426872f 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -749,23 +749,10 @@ void InitParameterInteraction()
             LogPrintf("%s: parameter interaction: -externalip set -> setting -discover=0\n", __func__);
     }
 
-    if (GetBoolArg("-salvagewallet", false)) {
-        // Rewrite just private keys: rescan to find transactions
-        if (SoftSetBoolArg("-rescan", true))
-            LogPrintf("%s: parameter interaction: -salvagewallet=1 -> setting -rescan=1\n", __func__);
-    }
-
-    // -zapwallettx implies a rescan
-    if (GetBoolArg("-zapwallettxes", false)) {
-        if (SoftSetBoolArg("-rescan", true))
-            LogPrintf("%s: parameter interaction: -zapwallettxes=<mode> -> setting -rescan=1\n", __func__);
-    }
-
-    // disable walletbroadcast and whitelistrelay in blocksonly mode
+    // disable whitelistrelay in blocksonly mode
     if (GetBoolArg("-blocksonly", DEFAULT_BLOCKSONLY)) {
         if (SoftSetBoolArg("-whitelistrelay", false))
             LogPrintf("%s: parameter interaction: -blocksonly=1 -> setting -whitelistrelay=0\n", __func__);
-        // walletbroadcast is disabled in CWallet::ParameterInteraction()
     }
 
     // Forcing relay from whitelisted hosts implies we will accept relays from them in the first place.
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index c2bac6e330539..75376048144b0 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -3568,6 +3568,16 @@ bool CWallet::ParameterInteraction()
         LogPrintf("%s: parameter interaction: -blocksonly=1 -> setting -walletbroadcast=0\n", __func__);
     }
 
+    if (GetBoolArg("-salvagewallet", false) && SoftSetBoolArg("-rescan", true)) {
+        // Rewrite just private keys: rescan to find transactions
+        LogPrintf("%s: parameter interaction: -salvagewallet=1 -> setting -rescan=1\n", __func__);
+    }
+
+    // -zapwallettx implies a rescan
+    if (GetBoolArg("-zapwallettxes", false) && SoftSetBoolArg("-rescan", true)) {
+        LogPrintf("%s: parameter interaction: -zapwallettxes=<mode> -> setting -rescan=1\n", __func__);
+    }
+
     if (GetBoolArg("-sysperms", false))
         return InitError("-sysperms is not allowed in combination with enabled wallet functionality");
     if (GetArg("-prune", 0) && GetBoolArg("-rescan", false))

From 1260c1103bf3f5d6b4a9109949346ef4568a9c60 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pavel=20Jan=C3=ADk?= <Pavel@Janik.cz>
Date: Fri, 11 Nov 2016 11:59:33 +0100
Subject: [PATCH 1210/1802] Mention the new network toggle functionality in the
 tooltip.

---
 src/qt/bitcoingui.cpp | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp
index b2c9a704ed30f..b7302e3969b34 100644
--- a/src/qt/bitcoingui.cpp
+++ b/src/qt/bitcoingui.cpp
@@ -713,13 +713,19 @@ void BitcoinGUI::updateNetworkState()
     default: icon = ":/icons/connect_4"; break;
     }
 
+    QString tooltip;
+
     if (clientModel->getNetworkActive()) {
-        connectionsControl->setToolTip(tr("%n active connection(s) to Bitcoin network", "", count));
+        tooltip = tr("%n active connection(s) to Bitcoin network", "", count) + QString(".<br>") + tr("Click to disable network activity.");
     } else {
-        connectionsControl->setToolTip(tr("Network activity disabled"));
+        tooltip = tr("Network activity disabled.") + QString("<br>") + tr("Click to enable network activity again.");
         icon = ":/icons/network_disabled";
     }
 
+    // Don't word-wrap this (fixed-width) tooltip
+    tooltip = QString("<nobr>") + tooltip + QString("</nobr>");
+    connectionsControl->setToolTip(tooltip);
+
     connectionsControl->setPixmap(platformStyle->SingleColorIcon(icon).pixmap(STATUSBAR_ICONSIZE,STATUSBAR_ICONSIZE));
 }
 

From 4512550fa01708a67a8386e54e7060db7997590c Mon Sep 17 00:00:00 2001
From: Jonas Schnelli <dev@jonasschnelli.ch>
Date: Sat, 12 Nov 2016 10:05:09 +0100
Subject: [PATCH 1211/1802] Remove unnecessary calls to CheckFinalTx

---
 src/wallet/wallet.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index c2bac6e330539..59fee46b43043 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -2929,7 +2929,7 @@ std::map<CTxDestination, CAmount> CWallet::GetAddressBalances()
         {
             CWalletTx *pcoin = &walletEntry.second;
 
-            if (!CheckFinalTx(*pcoin) || !pcoin->IsTrusted())
+            if (!pcoin->IsTrusted())
                 continue;
 
             if (pcoin->IsCoinBase() && pcoin->GetBlocksToMaturity() > 0)

From fa42e4a082e409794d0a00a8bbffc35142a17d32 Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Sat, 12 Nov 2016 14:49:28 +0100
Subject: [PATCH 1212/1802] [qt] Make network disabled icon 50% opaque

---
 src/qt/res/icons/network_disabled.png | Bin 591 -> 2438 bytes
 src/qt/res/src/connect-0.svg          |   4 ++--
 src/qt/res/src/connect-1.svg          |   4 ++--
 src/qt/res/src/connect-2.svg          |   4 ++--
 src/qt/res/src/connect-3.svg          |   4 ++--
 src/qt/res/src/connect-4.svg          |   4 ++--
 src/qt/res/src/network_disabled.svg   |  29 +++++---------------------
 7 files changed, 15 insertions(+), 34 deletions(-)

diff --git a/src/qt/res/icons/network_disabled.png b/src/qt/res/icons/network_disabled.png
index 49f728693d8c0fc5d63c4911b84f431961631434..269c3cfab894b2ae60f8bbad6887978c77f8eec0 100644
GIT binary patch
literal 2438
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
Ef}@$NZ~y=R

literal 591
zcmV-V0<iswP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00006VoOIv0RI60
z0RN!9r;`8x0t87!K~zYIz1F{PO<@=Z@XxJ8N}_%xm7;#6W`m7E{0~;0gtS7cDi(vX
zH8F@mt9~^%L1>W}3`_<w7(|G{K;sI<K#(iaf#E$TdA&X7-quZglQZ1&KF{-g-tY6{
zT>cX(*poe#fAC*~6L^bnc#QS2K`(x1&n2`ikYEJ2aWjhZ3CoHI8j)0R0Ix6`+0S4i
ziSY=Ba>uqTXfu*?!u5AxaTDKujHcO*CWe<IlI?hdF5Jbh#5VP*VjvH`0h9QQ?<Eey
zIE_Kv67)?Ix`EX=o+Z;!!E!vu*-XckxQ|WI?XKV}-eDcyV+;Bsn`c;qc09lkYH$P>
z{f(ulC)xePJ&XwjER%8$#<8#9eNjysX<mvUTu9!v3$533aDwJF9L5T4#FQ{R1kK9`
z)@C;GB!9%U=nQPe9elwDoXngEZP|=qMChy@bY^6)MUz~H`PN}ZkTu3t(ImGLysQp=
zl1XkB`~^-4Et<A)9ZQlJRSe{-xd&&kQ&<5tY>SNNGicM;C9Lay?8jDEl{p?1rn*`n
zL1&ivZd}LSl3Uh=Mwvu+&U_T-OC0j&hp-{Lgo5@okaA8<#<S}*TG#EFd{2cIj?r}0
z58`2BFd+;~{(BZLg^x|qC$)&AH$UtU)^vU_CG7j*f<TRslJv%h-FPBw%xN4e$+Q_-
d{qwMJ`~lly?nsk6D((OP002ovPDHLkV1m114h;YR

diff --git a/src/qt/res/src/connect-0.svg b/src/qt/res/src/connect-0.svg
index 7d2afac6227a8..0920555b96165 100644
--- a/src/qt/res/src/connect-0.svg
+++ b/src/qt/res/src/connect-0.svg
@@ -7,8 +7,8 @@
    xmlns="http://www.w3.org/2000/svg"
    id="svg2"
    viewBox="0 0 24 24"
-   height="24"
-   width="24"
+   height="92"
+   width="92"
    version="1.2">
   <metadata
      id="metadata10">
diff --git a/src/qt/res/src/connect-1.svg b/src/qt/res/src/connect-1.svg
index d17928c97d01e..25dea4cd3a922 100644
--- a/src/qt/res/src/connect-1.svg
+++ b/src/qt/res/src/connect-1.svg
@@ -6,8 +6,8 @@
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
    version="1.2"
-   width="24"
-   height="24"
+   width="92"
+   height="92"
    viewBox="0 0 24 24"
    id="svg2">
   <metadata
diff --git a/src/qt/res/src/connect-2.svg b/src/qt/res/src/connect-2.svg
index 841ca6071dd6f..bb98333d233ec 100644
--- a/src/qt/res/src/connect-2.svg
+++ b/src/qt/res/src/connect-2.svg
@@ -6,8 +6,8 @@
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
    version="1.2"
-   width="24"
-   height="24"
+   width="92"
+   height="92"
    viewBox="0 0 24 24"
    id="svg2">
   <metadata
diff --git a/src/qt/res/src/connect-3.svg b/src/qt/res/src/connect-3.svg
index b06e67daf87e1..a54a55ef614a2 100644
--- a/src/qt/res/src/connect-3.svg
+++ b/src/qt/res/src/connect-3.svg
@@ -7,8 +7,8 @@
    xmlns="http://www.w3.org/2000/svg"
    id="svg2"
    viewBox="0 0 24 24"
-   height="24"
-   width="24"
+   height="92"
+   width="92"
    version="1.2">
   <metadata
      id="metadata10">
diff --git a/src/qt/res/src/connect-4.svg b/src/qt/res/src/connect-4.svg
index 0abc7955fdbda..b83b9f9d03611 100644
--- a/src/qt/res/src/connect-4.svg
+++ b/src/qt/res/src/connect-4.svg
@@ -6,8 +6,8 @@
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
    version="1.2"
-   width="24"
-   height="24"
+   width="92"
+   height="92"
    viewBox="0 0 24 24"
    id="svg2">
   <metadata
diff --git a/src/qt/res/src/network_disabled.svg b/src/qt/res/src/network_disabled.svg
index e95a5eb5bbd30..a041d77439a9f 100644
--- a/src/qt/res/src/network_disabled.svg
+++ b/src/qt/res/src/network_disabled.svg
@@ -7,8 +7,8 @@
    xmlns="http://www.w3.org/2000/svg"
    id="svg2"
    viewBox="0 0 24 24"
-   height="24"
-   width="24"
+   width="92"
+   height="92"
    version="1.2">
   <metadata
      id="metadata10">
@@ -37,31 +37,12 @@
            id="g4291">
           <path
              id="path4293"
-             d="m -65.35,116.3 0,3 0.5,0 c 0.54,0 1,0.5 1,1 l 0,2.6 c -1.15,0.5 -2,1.6 -2,3 0,2 1.59,3.5 3.5,3.5 1.91,0 3.5,-1.5 3.5,-3.5 0,-1.4 -0.85,-2.5 -2,-3 l 0,-2.6 c 0,-2.3 -1.81,-4 -4,-4 z m 1,1.2 c 1.39,0.3 2.5,1.3 2.5,2.8 l 0,3.2 0.34,0.1 c 0.96,0.3 1.66,1.2 1.66,2.3 0,1.4 -1.11,2.5 -2.5,2.5 -1.39,0 -2.5,-1.1 -2.5,-2.5 0,-1.1 0.69,-2 1.66,-2.3 l 0.34,-0.1 0,-3.2 c 0,-0.9 -0.67,-1.5 -1.5,-1.8 z"
-             style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
-          <g
-             style="fill:#969696;fill-opacity:1"
-             id="g4295">
-            <path
-               id="path4297"
-               d="m -67.35,106.1 c -1.94,0 -3.5,1.6 -3.5,3.5 0,1.4 0.85,2.5 2,3 l 0,2.7 c 0,2.2 1.79,4 4,4 l 0.5,0 0,-0.5 0,-2.5 -0.5,0 c -0.55,0 -1,-0.5 -1,-1 l 0,-2.7 c 1.15,-0.5 2,-1.6 2,-3 0,-1.9 -1.57,-3.5 -3.5,-3.5 z m 0,1 c 1.37,0 2.5,1.2 2.5,2.5 0,1.1 -0.7,2 -1.66,2.3 l -0.34,0.1 0,3.3 c 0,0.9 0.67,1.5 1.5,1.8 l 0,1 c -1.38,-0.3 -2.5,-1.4 -2.5,-2.8 l 0,-3.3 -0.34,-0.1 c -0.96,-0.3 -1.66,-1.2 -1.66,-2.3 0,-1.3 1.12,-2.5 2.5,-2.5 z"
-               style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
-            <path
-               id="path4299"
-               d="m -57.35,106.1 c -1.93,0 -3.5,1.6 -3.5,3.5 0,1.4 0.85,2.5 2,3 l 0,2.7 c 0,0.5 -0.45,1 -1,1 l -4.85,0 3.17,3 1.68,0 c 2.21,0 4,-1.8 4,-4 l 0,-2.7 c 1.15,-0.5 2,-1.6 2,-3 0,-1.9 -1.56,-3.5 -3.5,-3.5 z m 0,1 c 1.38,0 2.5,1.2 2.5,2.5 0,1.1 -0.7,2 -1.66,2.3 l -0.34,0.1 0,3.3 c 0,1.6 -1.35,3 -3,3 l -1.81,0 -2.04,-1 3.85,0 c 1.11,0 2,-0.9 2,-2 l 0,-3.3 -0.34,-0.1 c -0.96,-0.3 -1.66,-1.2 -1.66,-2.3 0,-1.3 1.13,-2.5 2.5,-2.5 z"
-               style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
-          </g>
-          <path
-             id="path4301"
-             d="m -69.84,116.3 c -2.19,0 -4,1.7 -4,4 l 0,2.6 c -1.14,0.6 -1.99,1.6 -1.99,3 0,2 1.6,3.5 3.51,3.5 1.91,0 3.5,-1.5 3.5,-3.5 0,-1.4 -0.85,-2.5 -2,-3 l 0,-2.6 c 0,-0.5 0.45,-1 1,-1 l 5.01,0 -3.36,-3 z m 0,1 1.84,0 2.19,1 -4.01,0 c -1.11,0 -2,0.9 -2,2 l 0,3.2 0.34,0.1 c 0.96,0.3 1.66,1.2 1.66,2.3 0,1.4 -1.11,2.5 -2.5,2.5 -1.39,0 -2.51,-1.1 -2.51,-2.5 0,-1.1 0.7,-2 1.66,-2.3 l 0.33,-0.1 0,-0.4 0,-2.8 c 0,-1.7 1.33,-3 3,-3 z"
-             style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+             transform="matrix(0,-1,-1,0,-52.84,129.7464)"
+             d="M 20.146484 1.0097656 C 18.746484 1.0097656 17.646484 1.8597656 17.146484 3.0097656 L 14.447266 3.0097656 C 12.247266 3.0097656 10.447266 4.7997656 10.447266 7.0097656 L 10.447266 8.1425781 C 10.128283 8.0634395 9.7980674 8.0097656 9.4472656 8.0097656 L 6.8457031 8.0097656 C 6.3457031 6.8597656 5.2457031 6.0097656 3.8457031 6.0097656 C 1.8457031 6.0097656 0.34570312 7.5997656 0.34570312 9.5097656 C 0.34570312 11.419766 1.8457031 13.009766 3.8457031 13.009766 C 5.2457031 13.009766 6.3457031 12.159766 6.8457031 11.009766 L 8.9746094 11.009766 C 8.8693536 11.330059 8.8007812 11.663345 8.8007812 12.001953 C 8.8007813 12.841953 9.1402344 13.671625 9.7402344 14.265625 C 9.9479364 14.475439 10.191281 14.640988 10.447266 14.783203 L 10.447266 16.980469 C 10.447266 17.530469 9.9472656 17.980469 9.4472656 17.980469 L 6.8457031 17.980469 C 6.3457031 16.830469 5.2457031 15.980469 3.8457031 15.980469 C 1.8457031 15.980469 0.34570312 17.570469 0.34570312 19.480469 C 0.34570312 21.390469 1.8457031 22.990234 3.8457031 22.990234 C 5.2457031 22.990234 6.2457031 22.14 6.8457031 21 L 9.4472656 21 C 11.747266 21 13.447266 19.19 13.447266 17 L 13.447266 15.869141 C 13.768504 15.952624 14.100702 16.009766 14.447266 16.009766 L 17.146484 16.009766 C 17.646484 17.159766 18.746484 18.009766 20.146484 18.009766 C 22.046484 18.009766 23.646484 16.449766 23.646484 14.509766 C 23.646484 12.579766 22.046484 11.009766 20.146484 11.009766 C 18.746484 11.009766 17.646484 11.859766 17.146484 13.009766 L 15.009766 13.009766 C 15.119625 12.684735 15.189453 12.346256 15.189453 12 C 15.189453 11.16 14.849906 10.339953 14.253906 9.7519531 C 14.0189 9.51021 13.74069 9.3244522 13.447266 9.171875 L 13.447266 7.0097656 C 13.447266 6.4597656 13.947266 6.0097656 14.447266 6.0097656 L 17.146484 6.0097656 C 17.646484 7.1597656 18.746484 8.0097656 20.146484 8.0097656 C 22.046484 8.0097656 23.646484 6.4397656 23.646484 4.5097656 C 23.646484 2.5697656 22.046484 1.0097656 20.146484 1.0097656 z M 20.146484 2.0097656 C 21.446484 2.0097656 22.646484 3.1297656 22.646484 4.5097656 C 22.646484 5.8797656 21.446484 7.0097656 20.146484 7.0097656 C 19.046484 7.0097656 18.145703 6.3096094 17.845703 5.3496094 L 17.746094 5.0097656 L 14.447266 5.0097656 C 13.347266 5.0097656 12.447266 5.8997656 12.447266 7.0097656 L 12.447266 8.8476562 C 12.298996 8.8261586 12.150754 8.8027344 12 8.8027344 C 11.954455 8.8027344 11.910576 8.8144662 11.865234 8.8164062 C 11.733157 8.716719 11.592447 8.6297054 11.447266 8.546875 L 11.447266 7.0097656 C 11.447266 5.3597656 12.847266 4.0097656 14.447266 4.0097656 L 17.746094 4.0097656 L 17.845703 3.6699219 C 18.145703 2.7099219 19.046484 2.0097656 20.146484 2.0097656 z M 3.8457031 7.0097656 C 4.9457031 7.0097656 5.8464844 7.7099219 6.1464844 8.6699219 L 6.2460938 9.0097656 L 9.4472656 9.0097656 C 9.8222656 9.0097656 10.165234 9.0792969 10.474609 9.2050781 C 10.207952 9.3508551 9.9554097 9.5233651 9.7402344 9.7421875 C 9.6554755 9.8255337 9.5878282 9.9233484 9.5136719 10.015625 C 9.4909069 10.014746 9.470428 10.009766 9.4472656 10.009766 L 6.2460938 10.009766 L 6.1464844 10.349609 C 5.8464844 11.319609 4.9457031 12.009766 3.8457031 12.009766 C 2.4457031 12.009766 1.3457031 10.899766 1.3457031 9.5097656 C 1.3457031 8.1197656 2.4457031 7.0097656 3.8457031 7.0097656 z M 20.146484 12.009766 C 21.446484 12.009766 22.646484 13.139766 22.646484 14.509766 C 22.646484 15.889766 21.446484 17.009766 20.146484 17.009766 C 19.046484 17.009766 18.145703 16.309609 17.845703 15.349609 L 17.746094 15.009766 L 14.447266 15.009766 C 14.100959 15.009766 13.772729 14.94045 13.470703 14.816406 C 13.754756 14.666178 14.02454 14.485593 14.253906 14.253906 C 14.328913 14.179151 14.386367 14.091269 14.453125 14.009766 L 17.746094 14.009766 L 17.845703 13.669922 C 18.145703 12.709922 19.046484 12.009766 20.146484 12.009766 z M 11.447266 15.144531 C 11.629002 15.17624 11.813246 15.199219 12 15.199219 C 12.018544 15.199153 12.036184 15.193748 12.054688 15.193359 C 12.180437 15.288088 12.3107 15.373496 12.447266 15.453125 L 12.447266 17 C 12.447266 18.67 11.147266 20 9.4472656 20 L 6.6464844 20 L 6.2460938 20 L 6.1464844 20.330078 C 5.8464844 21.290078 4.9457031 21.990234 3.8457031 21.990234 C 2.4457031 21.990234 1.3457031 20.870469 1.3457031 19.480469 C 1.3457031 18.090469 2.4457031 16.980469 3.8457031 16.980469 C 4.9457031 16.980469 5.8464844 17.680625 6.1464844 18.640625 L 6.2460938 18.980469 L 9.4472656 18.980469 C 10.547266 18.980469 11.447266 18.090469 11.447266 16.980469 L 11.447266 15.144531 z "
+             style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:0.5;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
         </g>
       </g>
     </g>
-    <path
-       id="path4165"
-       d="m 12,8.77 c -0.84,0 -1.66,0.341 -2.254,0.937 -0.599,0.593 -0.942,1.403 -0.945,2.253 0,0.85 0.337,1.67 0.933,2.26 a 0.6001,0.6001 0 0 0 0,0 c 0.594,0.6 1.424,0.94 2.264,0.94 0.84,0 1.67,-0.34 2.26,-0.94 0.6,-0.59 0.94,-1.41 0.94,-2.26 0,-0.84 -0.34,-1.66 -0.95,-2.253 C 13.66,9.111 12.84,8.77 12,8.77 Z"
-       style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:10;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
   </g>
   <path d="M 3,3 l 18,18" style="stroke-width: 3; stroke: #000000; stroke-linecap: round;" />
   <path d="M 21,3 l -18,18" style="stroke-width: 3; stroke: #000000; stroke-linecap: round;" />

From fa80ef8173f9562f9701ee025c846bbf3bc4b5e1 Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Sun, 13 Nov 2016 22:34:09 +0100
Subject: [PATCH 1213/1802] [qa] proxy_test: Calculate hardcoded port numbers
 instead

---
 qa/rpc-tests/proxy_test.py | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/qa/rpc-tests/proxy_test.py b/qa/rpc-tests/proxy_test.py
index 27160cae07762..9ccc0ffbb02a7 100755
--- a/qa/rpc-tests/proxy_test.py
+++ b/qa/rpc-tests/proxy_test.py
@@ -4,10 +4,16 @@
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 import socket
+import os
 
 from test_framework.socks5 import Socks5Configuration, Socks5Command, Socks5Server, AddressType
 from test_framework.test_framework import BitcoinTestFramework
-from test_framework.util import *
+from test_framework.util import (
+    PORT_MIN,
+    PORT_RANGE,
+    start_nodes,
+    assert_equal,
+)
 from test_framework.netutil import test_ipv6_local
 '''
 Test plan:
@@ -33,6 +39,8 @@
 addnode connect to generic DNS name
 '''
 
+RANGE_BEGIN = PORT_MIN + 2 * PORT_RANGE  # Start after p2p and rpc ports
+
 
 class ProxyTest(BitcoinTestFramework):
     def __init__(self):
@@ -44,19 +52,19 @@ def __init__(self):
         # Create two proxies on different ports
         # ... one unauthenticated
         self.conf1 = Socks5Configuration()
-        self.conf1.addr = ('127.0.0.1', 13000 + (os.getpid() % 1000))
+        self.conf1.addr = ('127.0.0.1', RANGE_BEGIN + (os.getpid() % 1000))
         self.conf1.unauth = True
         self.conf1.auth = False
         # ... one supporting authenticated and unauthenticated (Tor)
         self.conf2 = Socks5Configuration()
-        self.conf2.addr = ('127.0.0.1', 14000 + (os.getpid() % 1000))
+        self.conf2.addr = ('127.0.0.1', RANGE_BEGIN + 1000 + (os.getpid() % 1000))
         self.conf2.unauth = True
         self.conf2.auth = True
         if self.have_ipv6:
             # ... one on IPv6 with similar configuration
             self.conf3 = Socks5Configuration()
             self.conf3.af = socket.AF_INET6
-            self.conf3.addr = ('::1', 15000 + (os.getpid() % 1000))
+            self.conf3.addr = ('::1', RANGE_BEGIN + 2000 + (os.getpid() % 1000))
             self.conf3.unauth = True
             self.conf3.auth = True
         else:

From 07ede5d711e7fd601770c1f57110830bf540f0bc Mon Sep 17 00:00:00 2001
From: Brian Deery <brian@factom.org>
Date: Mon, 14 Nov 2016 00:38:07 -0600
Subject: [PATCH 1214/1802] update comments for tx weight

---
 src/policy/policy.cpp            | 2 +-
 src/wallet/test/wallet_tests.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/policy/policy.cpp b/src/policy/policy.cpp
index a3eee474abacd..3ad1ff7baed49 100644
--- a/src/policy/policy.cpp
+++ b/src/policy/policy.cpp
@@ -66,7 +66,7 @@ bool IsStandardTx(const CTransaction& tx, std::string& reason, const bool witnes
     // Extremely large transactions with lots of inputs can cost the network
     // almost as much to process as they cost the sender in fees, because
     // computing signature hashes is O(ninputs*txsize). Limiting transactions
-    // to MAX_STANDARD_TX_SIZE mitigates CPU exhaustion attacks.
+    // to MAX_STANDARD_TX_WEIGHT mitigates CPU exhaustion attacks.
     unsigned int sz = GetTransactionWeight(tx);
     if (sz >= MAX_STANDARD_TX_WEIGHT) {
         reason = "tx-size";
diff --git a/src/wallet/test/wallet_tests.cpp b/src/wallet/test/wallet_tests.cpp
index acf980c784561..ecbbcb145da51 100644
--- a/src/wallet/test/wallet_tests.cpp
+++ b/src/wallet/test/wallet_tests.cpp
@@ -266,7 +266,7 @@ BOOST_AUTO_TEST_CASE(coin_selection_tests)
         // test with many inputs
         for (CAmount amt=1500; amt < COIN; amt*=10) {
              empty_wallet();
-             // Create 676 inputs (= MAX_STANDARD_TX_SIZE / 148 bytes per input)
+             // Create 676 inputs (=  (old MAX_STANDARD_TX_SIZE == 100000)  / 148 bytes per input)
              for (uint16_t j = 0; j < 676; j++)
                  add_coin(amt);
              BOOST_CHECK(wallet.SelectCoinsMinConf(2000, 1, 1, vCoins, setCoinsRet, nValueRet));

From fd6bb700b77491689f0b5f34bdfb75764138f406 Mon Sep 17 00:00:00 2001
From: Russell Yanofsky <russ@yanofsky.org>
Date: Fri, 11 Nov 2016 15:38:59 -0500
Subject: [PATCH 1215/1802] [qa] Improve sync_blocks error messages.

---
 qa/rpc-tests/test_framework/util.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/qa/rpc-tests/test_framework/util.py b/qa/rpc-tests/test_framework/util.py
index b5ef0689b47a1..2de4d5e303c91 100644
--- a/qa/rpc-tests/test_framework/util.py
+++ b/qa/rpc-tests/test_framework/util.py
@@ -132,10 +132,12 @@ def sync_blocks(rpc_connections, *, wait=1, timeout=60):
         if tips == [tips[0]] * len(tips):
             return
         if heights == [heights[0]] * len(heights):
-            raise AssertionError("Block sync failed: (Hashes don't match)")
+            raise AssertionError("Block sync failed, mismatched block hashes:{}".format(
+                                 "".join("\n  {!r}".format(tip) for tip in tips)))
         timeout -= wait
         maxheight = max(heights)
-    raise AssertionError("Block sync failed with heights: {}".format(heights))
+    raise AssertionError("Block sync to height {} timed out:{}".format(
+                         maxheight, "".join("\n  {!r}".format(tip) for tip in tips)))
 
 def sync_chain(rpc_connections, *, wait=1, timeout=60):
     """

From 05e57ccd746b2e14699d2b1980927f30070cb3ad Mon Sep 17 00:00:00 2001
From: Russell Yanofsky <russ@yanofsky.org>
Date: Fri, 11 Nov 2016 15:40:48 -0500
Subject: [PATCH 1216/1802] [qa] Fix sync_blocks timeout argument

Motivation for this change is mainly to make sync_blocks behavior easier to
understand. Behavior is unchanged in the normal case when there are only 2
nodes in the rpc_connections set. When there are more than 2 nodes, the
previous "timeout -= wait" statement wouldn't take into account time spent
waiting for all nodes and as a result could lead to blocking for longer than
the requested timeout.
---
 qa/rpc-tests/test_framework/util.py | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/qa/rpc-tests/test_framework/util.py b/qa/rpc-tests/test_framework/util.py
index 2de4d5e303c91..01bde0c84db19 100644
--- a/qa/rpc-tests/test_framework/util.py
+++ b/qa/rpc-tests/test_framework/util.py
@@ -123,10 +123,15 @@ def str_to_b64str(string):
 
 def sync_blocks(rpc_connections, *, wait=1, timeout=60):
     """
-    Wait until everybody has the same tip
+    Wait until everybody has the same tip.
+
+    sync_blocks needs to be called with an rpc_connections set that has least
+    one node already synced to the latest, stable tip, otherwise there's a
+    chance it might return before all nodes are stably synced.
     """
     maxheight = 0
-    while timeout > 0:
+    start_time = cur_time = time.time()
+    while cur_time <= start_time + timeout:
         tips = [r.waitforblockheight(maxheight, int(wait * 1000)) for r in rpc_connections]
         heights = [t["height"] for t in tips]
         if tips == [tips[0]] * len(tips):
@@ -134,8 +139,8 @@ def sync_blocks(rpc_connections, *, wait=1, timeout=60):
         if heights == [heights[0]] * len(heights):
             raise AssertionError("Block sync failed, mismatched block hashes:{}".format(
                                  "".join("\n  {!r}".format(tip) for tip in tips)))
-        timeout -= wait
         maxheight = max(heights)
+        cur_time = time.time()
     raise AssertionError("Block sync to height {} timed out:{}".format(
                          maxheight, "".join("\n  {!r}".format(tip) for tip in tips)))
 

From 7943b13ab3e005e1dd5c277efdbc06088d89f6de Mon Sep 17 00:00:00 2001
From: Russell Yanofsky <russ@yanofsky.org>
Date: Fri, 11 Nov 2016 15:43:15 -0500
Subject: [PATCH 1217/1802] [qa] Avoid 2 list comprehensions in sync_blocks

---
 qa/rpc-tests/test_framework/util.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/qa/rpc-tests/test_framework/util.py b/qa/rpc-tests/test_framework/util.py
index 01bde0c84db19..bf13b7fd8480b 100644
--- a/qa/rpc-tests/test_framework/util.py
+++ b/qa/rpc-tests/test_framework/util.py
@@ -134,9 +134,9 @@ def sync_blocks(rpc_connections, *, wait=1, timeout=60):
     while cur_time <= start_time + timeout:
         tips = [r.waitforblockheight(maxheight, int(wait * 1000)) for r in rpc_connections]
         heights = [t["height"] for t in tips]
-        if tips == [tips[0]] * len(tips):
+        if all(t == tips[0] for t in tips):
             return
-        if heights == [heights[0]] * len(heights):
+        if all(h == heights[0] for h in heights):
             raise AssertionError("Block sync failed, mismatched block hashes:{}".format(
                                  "".join("\n  {!r}".format(tip) for tip in tips)))
         maxheight = max(heights)

From dfa44d1b07a6d1022005dba63dd6372739eee8a0 Mon Sep 17 00:00:00 2001
From: Russell Yanofsky <russ@yanofsky.org>
Date: Mon, 14 Nov 2016 09:58:30 -0500
Subject: [PATCH 1218/1802] [qa] Wait for specific block announcement in
 p2p-compactblocks

Change check_announcement_of_new_block() to wait specifically for the
announcement of the newly created block, instead of waiting for any
announcement at all. A difficult to reproduce failure in
check_announcement_of_new_block() that happened in a travis build
(https://travis-ci.org/bitcoin/bitcoin/jobs/175198367) might have happened
because an older announcement was mistaken for the expected one. The error
looked like:

  Assertion failed: Failed

  File ".../bitcoin/qa/rpc-tests/test_framework/test_framework.py", line 145, in main
    self.run_test()
  File ".../bitcoin/build/../qa/rpc-tests/p2p-compactblocks.py", line 787, in run_test
    self.test_sendcmpct(self.nodes[1], self.segwit_node, 2, old_node=self.old_node)
  File ".../bitcoin/build/../qa/rpc-tests/p2p-compactblocks.py", line 201, in test_sendcmpct
    check_announcement_of_new_block(node, test_node, lambda p: p.last_cmpctblock is None and p.last_inv is not None)
  File ".../bitcoin/build/../qa/rpc-tests/p2p-compactblocks.py", line 194, in check_announcement_of_new_block
    assert(predicate(peer))

This commit also changes the assertion failed message above to include more
detailed information for debug.
---
 qa/rpc-tests/p2p-compactblocks.py | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/qa/rpc-tests/p2p-compactblocks.py b/qa/rpc-tests/p2p-compactblocks.py
index 1b4c8d90e7722..e0b72e68402ec 100755
--- a/qa/rpc-tests/p2p-compactblocks.py
+++ b/qa/rpc-tests/p2p-compactblocks.py
@@ -186,12 +186,15 @@ def received_sendcmpct():
 
         def check_announcement_of_new_block(node, peer, predicate):
             peer.clear_block_announcement()
-            node.generate(1)
-            got_message = wait_until(lambda: peer.block_announced, timeout=30)
+            block_hash = int(node.generate(1)[0], 16)
+            peer.wait_for_block_announcement(block_hash, timeout=30)
             assert(peer.block_announced)
             assert(got_message)
+
             with mininode_lock:
-                assert(predicate(peer))
+                assert predicate(peer), (
+                    "block_hash={!r}, cmpctblock={!r}, inv={!r}".format(
+                        block_hash, peer.last_cmpctblock, peer.last_inv))
 
         # We shouldn't get any block announcements via cmpctblock yet.
         check_announcement_of_new_block(node, test_node, lambda p: p.last_cmpctblock is None)

From ec34648766c4052816e4072cc61ad429430bcfd9 Mon Sep 17 00:00:00 2001
From: Russell Yanofsky <russ@yanofsky.org>
Date: Mon, 14 Nov 2016 11:09:12 -0500
Subject: [PATCH 1219/1802] [trivial] Fix hungarian variable name

Follow up to comment https://github.com/bitcoin/bitcoin/pull/9058#discussion_r87676593
---
 src/main.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index e868e3c5f9ee5..10f9b15ec6c67 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -5503,10 +5503,10 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
             // expensive disk reads, because it will require the peer to
             // actually receive all the data read from disk over the network.
             LogPrint("net", "Peer %d sent us a getblocktxn for a block > %i deep", pfrom->id, MAX_BLOCKTXN_DEPTH);
-            CInv vInv;
-            vInv.type = State(pfrom->GetId())->fWantsCmpctWitness ? MSG_WITNESS_BLOCK : MSG_BLOCK;
-            vInv.hash = req.blockhash;
-            pfrom->vRecvGetData.push_back(vInv);
+            CInv inv;
+            inv.type = State(pfrom->GetId())->fWantsCmpctWitness ? MSG_WITNESS_BLOCK : MSG_BLOCK;
+            inv.hash = req.blockhash;
+            pfrom->vRecvGetData.push_back(inv);
             ProcessGetData(pfrom, chainparams.GetConsensus(), connman);
             return true;
         }

From 20c3215a9031b3dbbde641b933246b3e222e4eca Mon Sep 17 00:00:00 2001
From: Gregory Sanders <gsanders87@gmail.com>
Date: Tue, 15 Nov 2016 09:19:23 -0500
Subject: [PATCH 1220/1802] credit values are CAmount

---
 src/wallet/wallet.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index c2bac6e330539..3e18cb702cdd2 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -1608,7 +1608,7 @@ CAmount CWalletTx::GetCredit(const isminefilter& filter) const
     if (IsCoinBase() && GetBlocksToMaturity() > 0)
         return 0;
 
-    int64_t credit = 0;
+    CAmount credit = 0;
     if (filter & ISMINE_SPENDABLE)
     {
         // GetBalance can assume transactions in mapWallet won't change

From ea83d0098a2eb29a3b1398f3ecf907f7eece1eee Mon Sep 17 00:00:00 2001
From: instagibbs <gsanders87@gmail.com>
Date: Tue, 15 Nov 2016 11:31:40 -0500
Subject: [PATCH 1221/1802] SendMoney: use already-calculated balance

---
 src/wallet/rpcwallet.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index 5a22e0278da5a..0e2105fc59dd9 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -362,7 +362,7 @@ static void SendMoney(const CTxDestination &address, CAmount nValue, bool fSubtr
     CRecipient recipient = {scriptPubKey, nValue, fSubtractFeeFromAmount};
     vecSend.push_back(recipient);
     if (!pwalletMain->CreateTransaction(vecSend, wtxNew, reservekey, nFeeRequired, nChangePosRet, strError)) {
-        if (!fSubtractFeeFromAmount && nValue + nFeeRequired > pwalletMain->GetBalance())
+        if (!fSubtractFeeFromAmount && nValue + nFeeRequired > curBalance)
             strError = strprintf("Error: This transaction requires a transaction fee of at least %s", FormatMoney(nFeeRequired));
         throw JSONRPCError(RPC_WALLET_ERROR, strError);
     }

From 307acdd3df03082295ac0f7fe9eba7dd35973bc4 Mon Sep 17 00:00:00 2001
From: mrbandrews <bandrewsny@gmail.com>
Date: Tue, 15 Nov 2016 15:37:46 -0500
Subject: [PATCH 1222/1802] [qa] add assert_raises_message to check specific
 error message

---
 qa/rpc-tests/test_framework/util.py | 8 ++++++--
 qa/rpc-tests/wallet.py              | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/qa/rpc-tests/test_framework/util.py b/qa/rpc-tests/test_framework/util.py
index bf13b7fd8480b..0b3585c6b2ba4 100644
--- a/qa/rpc-tests/test_framework/util.py
+++ b/qa/rpc-tests/test_framework/util.py
@@ -531,10 +531,14 @@ def assert_greater_than(thing1, thing2):
         raise AssertionError("%s <= %s"%(str(thing1),str(thing2)))
 
 def assert_raises(exc, fun, *args, **kwds):
+    assert_raises_message(exc, None, fun, *args, **kwds)
+
+def assert_raises_message(exc, message, fun, *args, **kwds):
     try:
         fun(*args, **kwds)
-    except exc:
-        pass
+    except exc as e:
+        if message is not None and message not in e.error['message']:
+            raise AssertionError("Expected substring not found:"+e.error['message'])
     except Exception as e:
         raise AssertionError("Unexpected exception raised: "+type(e).__name__)
     else:
diff --git a/qa/rpc-tests/wallet.py b/qa/rpc-tests/wallet.py
index e43f6ea5d225e..3c0dc0f4ea1bb 100755
--- a/qa/rpc-tests/wallet.py
+++ b/qa/rpc-tests/wallet.py
@@ -71,7 +71,7 @@ def run_test (self):
         unspent_0 = self.nodes[2].listunspent()[0]
         unspent_0 = {"txid": unspent_0["txid"], "vout": unspent_0["vout"]}
         self.nodes[2].lockunspent(False, [unspent_0])
-        assert_raises(JSONRPCException, self.nodes[2].sendtoaddress, self.nodes[2].getnewaddress(), 20)
+        assert_raises_message(JSONRPCException, "Insufficient funds", self.nodes[2].sendtoaddress, self.nodes[2].getnewaddress(), 20)
         assert_equal([unspent_0], self.nodes[2].listlockunspent())
         self.nodes[2].lockunspent(True, [unspent_0])
         assert_equal(len(self.nodes[2].listlockunspent()), 0)

From 70266e98292bf9c8f019ca4b11d681b575f71448 Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Tue, 15 Nov 2016 16:12:17 -0500
Subject: [PATCH 1223/1802] build: fix qt5.7 build under macOS

OBJCXX's std flags don't get defined by our cxx macro. Rather than hard-coding
to c++11, just force OBJCXX to be the same as CXX unless the user specified
otherwise.
---
 configure.ac | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 705327e816d94..7347277a56460 100644
--- a/configure.ac
+++ b/configure.ac
@@ -45,7 +45,6 @@ else
   CXXFLAGS_overridden=no
 fi
 AC_PROG_CXX
-m4_ifdef([AC_PROG_OBJCXX],[AC_PROG_OBJCXX])
 
 dnl By default, libtool for mingw refuses to link static libs into a dll for
 dnl fear of mixing pic/non-pic objects, and import/export complications. Since
@@ -60,6 +59,15 @@ AX_CXX_COMPILE_STDCXX([11], [noext], [mandatory])
 dnl Check if -latomic is required for <std::atomic>
 CHECK_ATOMIC
 
+dnl Unless the user specified OBJCXX, force it to be the same as CXX. This ensures
+dnl that we get the same -std flags for both.
+m4_ifdef([AC_PROG_OBJCXX],[
+if test "x${OBJCXX+set}" = "x"; then
+  OBJCXX="${CXX}"
+fi
+AC_PROG_OBJCXX
+])
+
 dnl Libtool init checks.
 LT_INIT([pic-only])
 

From d8274bcd00865d829808e8e05651c61dff7ccac0 Mon Sep 17 00:00:00 2001
From: Jonas Schnelli <dev@jonasschnelli.ch>
Date: Mon, 14 Nov 2016 10:55:56 +0100
Subject: [PATCH 1224/1802] Add compile and link options echo to configure

---
 configure.ac | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/configure.ac b/configure.ac
index 705327e816d94..7ad4fe0ac4f82 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1126,3 +1126,28 @@ case ${OS} in
      mv qa/pull-tester/tests_config-2.py qa/pull-tester/tests_config.py
    ;;
 esac
+
+echo 
+echo "Options used to compile and link:"
+echo "  with wallet   = $enable_wallet"
+echo "  with gui / qt = $bitcoin_enable_qt"
+if test x$bitcoin_enable_qt != xno; then
+    echo "    qt version  = $bitcoin_qt_got_major_vers"
+    echo "    with qr     = $use_qr"
+fi
+echo "  with zmq      = $use_zmq"
+echo "  with test     = $use_tests"
+echo "  with bench    = $use_bench"
+echo "  with upnp     = $use_upnp"
+echo "  debug enabled = $enable_debug"
+echo 
+echo "  target os     = $TARGET_OS"
+echo "  build os      = $BUILD_OS"
+echo
+echo "  CC            = $CC"
+echo "  CFLAGS        = $CFLAGS"
+echo "  CPPFLAGS      = $CPPFLAGS"
+echo "  CXX           = $CXX"
+echo "  CXXFLAGS      = $CXXFLAGS"
+echo "  LDFLAGS       = $LDFLAGS"
+echo 

From fa63ee8e3eeef8379360c125eeb690a37f097da2 Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Thu, 17 Nov 2016 14:41:18 +0100
Subject: [PATCH 1225/1802] Doxygen: Set PROJECT_NAME = "Bitcoin Core"

---
 doc/Doxyfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/Doxyfile b/doc/Doxyfile
index a0cbf7139a42c..ef55acdbc330c 100644
--- a/doc/Doxyfile
+++ b/doc/Doxyfile
@@ -32,7 +32,7 @@ DOXYFILE_ENCODING      = UTF-8
 # title of most generated pages and in a few other places.
 # The default value is: My Project.
 
-PROJECT_NAME           = Bitcoin
+PROJECT_NAME           = "Bitcoin Core"
 
 # The PROJECT_NUMBER tag can be used to enter a project or revision number. This
 # could be handy for archiving the generated documentation or if some version

From fa7cc5a508921182a4ebf1f9ed296664e5044007 Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Fri, 18 Nov 2016 00:15:15 +0100
Subject: [PATCH 1226/1802] Set DEFAULT_LIMITFREERELAY = 0 kB/minute

---
 doc/release-notes.md | 6 +++++-
 src/main.h           | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/doc/release-notes.md b/doc/release-notes.md
index f511fee22ea46..fe7f69d1f890b 100644
--- a/doc/release-notes.md
+++ b/doc/release-notes.md
@@ -53,11 +53,15 @@ Removal of Priority Estimation
 
 - Estimation of "priority" needed for a transaction to be included within a target
   number of blocks has been removed.  The rpc calls are deprecated and will either
-  return -1 or 1e24 appropriately. The format for fee_estimates.dat has also
+  return -1 or 1e24 appropriately. The format for `fee_estimates.dat` has also
   changed to no longer save these priority estimates. It will automatically be
   converted to the new format which is not readable by prior versions of the
   software.
 
+- The concept of "priority" transactions is planned to be removed in the next
+  major version. To prepare for this, the default for the rate limit of priority
+  transactions (`-limitfreerelay`) has been set to `0` kB/minute.
+
 0.14.0 Change log
 =================
 
diff --git a/src/main.h b/src/main.h
index 21829b6c25a38..304c4cf1eaddc 100644
--- a/src/main.h
+++ b/src/main.h
@@ -125,7 +125,7 @@ static const int64_t BLOCK_DOWNLOAD_TIMEOUT_BASE = 1000000;
 /** Additional block download timeout per parallel downloading peer (i.e. 5 min) */
 static const int64_t BLOCK_DOWNLOAD_TIMEOUT_PER_PEER = 500000;
 
-static const unsigned int DEFAULT_LIMITFREERELAY = 15;
+static const unsigned int DEFAULT_LIMITFREERELAY = 0;
 static const bool DEFAULT_RELAYPRIORITY = true;
 static const int64_t DEFAULT_MAX_TIP_AGE = 24 * 60 * 60;
 

From ec4525ccc1c1b66bc99f064348a9842e163c1324 Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Sat, 15 Oct 2016 17:34:02 -0400
Subject: [PATCH 1227/1802] Move orphan processing to ActivateBestChain

This further decouples "main" and "net" processing logic by moving
orphan processing out of the chain-connecting cs_main lock and
into its own cs_main lock, beside all of the other chain callbacks.

Once further decoupling of net and main processing logic occurs,
orphan handing should move to its own lock, out of cs_main.

Note that this will introduce a race if there are any cases where
we assume the orphan map to be consistent with the current chain
tip, however I am confident there is no such case (ATMP will fail
without DoS score in all such cases).
---
 src/main.cpp | 47 +++++++++++++++++++++++++++--------------------
 1 file changed, 27 insertions(+), 20 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index 263421aea4201..d587b39e64abe 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -2461,7 +2461,6 @@ bool ConnectBlock(const CBlock& block, CValidationState& state, CBlockIndex* pin
 
     CCheckQueueControl<CScriptCheck> control(fScriptChecks && nScriptCheckThreads ? &scriptcheckqueue : NULL);
 
-    std::vector<uint256> vOrphanErase;
     std::vector<int> prevheights;
     CAmount nFees = 0;
     int nInputs = 0;
@@ -2492,17 +2491,6 @@ bool ConnectBlock(const CBlock& block, CValidationState& state, CBlockIndex* pin
                 prevheights[j] = view.AccessCoins(tx.vin[j].prevout.hash)->nHeight;
             }
 
-            // Which orphan pool entries must we evict?
-            for (size_t j = 0; j < tx.vin.size(); j++) {
-                auto itByPrev = mapOrphanTransactionsByPrev.find(tx.vin[j].prevout);
-                if (itByPrev == mapOrphanTransactionsByPrev.end()) continue;
-                for (auto mi = itByPrev->second.begin(); mi != itByPrev->second.end(); ++mi) {
-                    const CTransaction& orphanTx = (*mi)->second.tx;
-                    const uint256& orphanHash = orphanTx.GetHash();
-                    vOrphanErase.push_back(orphanHash);
-                }
-            }
-
             if (!SequenceLocks(tx, nLockTimeFlags, &prevheights, *pindex)) {
                 return state.DoS(100, error("%s: contains a non-BIP68-final transaction", __func__),
                                  REJECT_INVALID, "bad-txns-nonfinal");
@@ -2592,14 +2580,6 @@ bool ConnectBlock(const CBlock& block, CValidationState& state, CBlockIndex* pin
     GetMainSignals().UpdatedTransaction(hashPrevBestCoinBase);
     hashPrevBestCoinBase = block.vtx[0].GetHash();
 
-    // Erase orphan transactions include or precluded by this block
-    if (vOrphanErase.size()) {
-        int nErased = 0;
-        BOOST_FOREACH(uint256 &orphanHash, vOrphanErase) {
-            nErased += EraseOrphanTx(orphanHash);
-        }
-        LogPrint("mempool", "Erased %d orphan tx included or conflicted by block\n", nErased);
-    }
 
     int64_t nTime6 = GetTimeMicros(); nTimeCallbacks += nTime6 - nTime5;
     LogPrint("bench", "    - Callbacks: %.2fms [%.2fs]\n", 0.001 * (nTime6 - nTime5), nTimeCallbacks * 0.000001);
@@ -3105,6 +3085,33 @@ bool ActivateBestChain(CValidationState &state, const CChainParams& chainparams,
         }
         // When we reach this point, we switched to a new tip (stored in pindexNewTip).
 
+        // Remove orphan transactions with cs_main
+        {
+            LOCK(cs_main);
+            std::vector<uint256> vOrphanErase;
+            for(unsigned int i = 0; i < txChanged.size(); i++) {
+                const CTransaction& tx = std::get<0>(txChanged[i]);
+                // Which orphan pool entries must we evict?
+                for (size_t j = 0; j < tx.vin.size(); j++) {
+                    auto itByPrev = mapOrphanTransactionsByPrev.find(tx.vin[j].prevout);
+                    if (itByPrev == mapOrphanTransactionsByPrev.end()) continue;
+                    for (auto mi = itByPrev->second.begin(); mi != itByPrev->second.end(); ++mi) {
+                        const CTransaction& orphanTx = (*mi)->second.tx;
+                        const uint256& orphanHash = orphanTx.GetHash();
+                        vOrphanErase.push_back(orphanHash);
+                    }
+                }
+            }
+            // Erase orphan transactions include or precluded by this block
+            if (vOrphanErase.size()) {
+                int nErased = 0;
+                BOOST_FOREACH(uint256 &orphanHash, vOrphanErase) {
+                    nErased += EraseOrphanTx(orphanHash);
+                }
+                LogPrint("mempool", "Erased %d orphan tx included or conflicted by block\n", nErased);
+            }
+        }
+
         // Notifications/callbacks that can run without cs_main
 
         // throw all transactions though the signal-interface

From 97e28029c94bc187721242a8c59468cebd73441b Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Thu, 3 Nov 2016 14:53:12 -0400
Subject: [PATCH 1228/1802] Erase orphans per-transaction instead of per-block

---
 src/main.cpp | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index d587b39e64abe..a5b00813634ea 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -3088,8 +3088,8 @@ bool ActivateBestChain(CValidationState &state, const CChainParams& chainparams,
         // Remove orphan transactions with cs_main
         {
             LOCK(cs_main);
-            std::vector<uint256> vOrphanErase;
             for(unsigned int i = 0; i < txChanged.size(); i++) {
+                std::vector<uint256> vOrphanErase;
                 const CTransaction& tx = std::get<0>(txChanged[i]);
                 // Which orphan pool entries must we evict?
                 for (size_t j = 0; j < tx.vin.size(); j++) {
@@ -3101,14 +3101,15 @@ bool ActivateBestChain(CValidationState &state, const CChainParams& chainparams,
                         vOrphanErase.push_back(orphanHash);
                     }
                 }
-            }
-            // Erase orphan transactions include or precluded by this block
-            if (vOrphanErase.size()) {
-                int nErased = 0;
-                BOOST_FOREACH(uint256 &orphanHash, vOrphanErase) {
-                    nErased += EraseOrphanTx(orphanHash);
+
+                // Erase orphan transactions include or precluded by this block
+                if (vOrphanErase.size()) {
+                    int nErased = 0;
+                    BOOST_FOREACH(uint256 &orphanHash, vOrphanErase) {
+                        nErased += EraseOrphanTx(orphanHash);
+                    }
+                    LogPrint("mempool", "Erased %d orphan tx included or conflicted by block\n", nErased);
                 }
-                LogPrint("mempool", "Erased %d orphan tx included or conflicted by block\n", nErased);
             }
         }
 

From 76af4eb876814a916dd4f26cf71faa20bdc54f2d Mon Sep 17 00:00:00 2001
From: Jonas Schnelli <dev@jonasschnelli.ch>
Date: Fri, 18 Nov 2016 10:26:38 +0100
Subject: [PATCH 1229/1802] [Qt] fix coincontrol sort issue

---
 src/qt/coincontroldialog.cpp | 21 +++++++++++++++------
 src/qt/coincontroldialog.h   | 12 ++++++++++++
 2 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/src/qt/coincontroldialog.cpp b/src/qt/coincontroldialog.cpp
index 1a1671f0ee830..42a32a1a228e2 100644
--- a/src/qt/coincontroldialog.cpp
+++ b/src/qt/coincontroldialog.cpp
@@ -35,6 +35,15 @@ QList<CAmount> CoinControlDialog::payAmounts;
 CCoinControl* CoinControlDialog::coinControl = new CCoinControl();
 bool CoinControlDialog::fSubtractFeeFromAmount = false;
 
+bool CCoinControlWidgetItem::operator<(const QTreeWidgetItem &other) const {
+    int column = treeWidget()->sortColumn();
+    if (column == CoinControlDialog::COLUMN_AMOUNT_INT64 || column == CoinControlDialog::COLUMN_AMOUNT_INT64)
+        return data(CoinControlDialog::COLUMN_AMOUNT_INT64, Qt::DisplayRole).toULongLong() < other.data(CoinControlDialog::COLUMN_AMOUNT_INT64, Qt::DisplayRole).toULongLong();
+    if (column == CoinControlDialog::COLUMN_DATE || column == CoinControlDialog::COLUMN_DATE_INT64)
+        return data(CoinControlDialog::COLUMN_DATE_INT64, Qt::DisplayRole).toULongLong() < other.data(CoinControlDialog::COLUMN_DATE_INT64, Qt::DisplayRole).toULongLong();
+    return QTreeWidgetItem::operator<(other);
+}
+
 CoinControlDialog::CoinControlDialog(const PlatformStyle *_platformStyle, QWidget *parent) :
     QDialog(parent),
     ui(new Ui::CoinControlDialog),
@@ -658,7 +667,7 @@ void CoinControlDialog::updateView()
     model->listCoins(mapCoins);
 
     BOOST_FOREACH(const PAIRTYPE(QString, std::vector<COutput>)& coins, mapCoins) {
-        QTreeWidgetItem *itemWalletAddress = new QTreeWidgetItem();
+        CCoinControlWidgetItem *itemWalletAddress = new CCoinControlWidgetItem();
         itemWalletAddress->setCheckState(COLUMN_CHECKBOX, Qt::Unchecked);
         QString sWalletAddress = coins.first;
         QString sWalletLabel = model->getAddressTableModel()->labelForAddress(sWalletAddress);
@@ -686,9 +695,9 @@ void CoinControlDialog::updateView()
             nSum += out.tx->vout[out.i].nValue;
             nChildren++;
 
-            QTreeWidgetItem *itemOutput;
-            if (treeMode)    itemOutput = new QTreeWidgetItem(itemWalletAddress);
-            else             itemOutput = new QTreeWidgetItem(ui->treeWidget);
+            CCoinControlWidgetItem *itemOutput;
+            if (treeMode)    itemOutput = new CCoinControlWidgetItem(itemWalletAddress);
+            else             itemOutput = new CCoinControlWidgetItem(ui->treeWidget);
             itemOutput->setFlags(flgCheckbox);
             itemOutput->setCheckState(COLUMN_CHECKBOX,Qt::Unchecked);
 
@@ -721,11 +730,11 @@ void CoinControlDialog::updateView()
 
             // amount
             itemOutput->setText(COLUMN_AMOUNT, BitcoinUnits::format(nDisplayUnit, out.tx->vout[out.i].nValue));
-            itemOutput->setText(COLUMN_AMOUNT_INT64, strPad(QString::number(out.tx->vout[out.i].nValue), 15, " ")); // padding so that sorting works correctly
+            itemOutput->setData(COLUMN_AMOUNT_INT64, Qt::DisplayRole, QVariant((qlonglong)out.tx->vout[out.i].nValue)); // padding so that sorting works correctly
 
             // date
             itemOutput->setText(COLUMN_DATE, GUIUtil::dateTimeStr(out.tx->GetTxTime()));
-            itemOutput->setText(COLUMN_DATE_INT64, strPad(QString::number(out.tx->GetTxTime()), 20, " "));
+            itemOutput->setData(COLUMN_DATE_INT64, Qt::DisplayRole, QVariant((qlonglong)out.tx->GetTxTime()));
 
             // confirmations
             itemOutput->setText(COLUMN_CONFIRMATIONS, strPad(QString::number(out.nDepth), 8, " "));
diff --git a/src/qt/coincontroldialog.h b/src/qt/coincontroldialog.h
index 7d73421e3a72b..960e92f79b260 100644
--- a/src/qt/coincontroldialog.h
+++ b/src/qt/coincontroldialog.h
@@ -28,6 +28,17 @@ namespace Ui {
 
 #define ASYMP_UTF8 "\xE2\x89\x88"
 
+class CCoinControlWidgetItem : public QTreeWidgetItem
+{
+public:
+    CCoinControlWidgetItem(QTreeWidget *parent, int type = Type) : QTreeWidgetItem(parent, type) {}
+    CCoinControlWidgetItem(int type = Type) : QTreeWidgetItem(type) {}
+    CCoinControlWidgetItem(QTreeWidgetItem *parent, int type = Type) : QTreeWidgetItem(parent, type) {}
+
+    bool operator<(const QTreeWidgetItem &other) const;
+};
+
+
 class CoinControlDialog : public QDialog
 {
     Q_OBJECT
@@ -76,6 +87,7 @@ class CoinControlDialog : public QDialog
         COLUMN_AMOUNT_INT64,
         COLUMN_DATE_INT64
     };
+    friend class CCoinControlWidgetItem;
 
     // some columns have a hidden column containing the value used for sorting
     int getMappedColumn(int column, bool fVisibleColumn = true)

From 12519bf62b8c49b1c1744eca6ea5b3162a61f962 Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Fri, 18 Nov 2016 13:08:30 +0100
Subject: [PATCH 1230/1802] test: Fix use-after-free in scheduler tests

Make a copy of the boost time-point to wait for, otherwise the head of
the queue may be deleted by another thread while this one is waiting,
while the boost function still has a reference to it.

Although this problem is in non-test code, this is not an actual problem
outside of the tests because we use the thread scheduler with only one
service thread, so there will never be threads fighting at the head of
the queue.

The old boost fallback escapes this problem because it passes a scalar
value to wait_until instead of a const object reference.

Found by running the tests in LLVM-4.0-master asan.
---
 src/scheduler.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/scheduler.cpp b/src/scheduler.cpp
index 52777b61f96c8..27c03f154cb98 100644
--- a/src/scheduler.cpp
+++ b/src/scheduler.cpp
@@ -54,9 +54,10 @@ void CScheduler::serviceQueue()
 #else
             // Some boost versions have a conflicting overload of wait_until that returns void.
             // Explicitly use a template here to avoid hitting that overload.
-            while (!shouldStop() && !taskQueue.empty() &&
-                   newTaskScheduled.wait_until<>(lock, taskQueue.begin()->first) != boost::cv_status::timeout) {
-                // Keep waiting until timeout
+            while (!shouldStop() && !taskQueue.empty()) {
+                boost::chrono::system_clock::time_point timeToWaitFor = taskQueue.begin()->first;
+                if (newTaskScheduled.wait_until<>(lock, timeToWaitFor) == boost::cv_status::timeout)
+                    break; // Exit loop after timeout, it means we reached the time of the event
             }
 #endif
             // If there are multiple threads, the queue can empty while we're waiting (another

From 5b0150a060208faf436c09b0ca9463407a869c72 Mon Sep 17 00:00:00 2001
From: Gregory Maxwell <greg@xiph.org>
Date: Fri, 18 Nov 2016 19:11:08 +0000
Subject: [PATCH 1231/1802] Make orphan parent fetching ask for witnesses.

In 0.13 orphan transactions began being treated as implicit
 INVs for their parents.  But the resulting getdata were
 not getting the witness flag.

This fixes issue #9182 reported by chjj and roasbeef on IRC.
---
 src/main.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main.cpp b/src/main.cpp
index 263421aea4201..9af612bb5f448 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -5686,8 +5686,9 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
                 }
             }
             if (!fRejectedParents) {
+                uint32_t nFetchFlags = GetFetchFlags(pfrom, chainActive.Tip(), chainparams.GetConsensus());
                 BOOST_FOREACH(const CTxIn& txin, tx.vin) {
-                    CInv _inv(MSG_TX, txin.prevout.hash);
+                    CInv _inv(MSG_TX | nFetchFlags, txin.prevout.hash);
                     pfrom->AddInventoryKnown(_inv);
                     if (!AlreadyHave(_inv)) pfrom->AskFor(_inv);
                 }

From 0e85204a1001397f11bad94f1c9c2cb11f8fb4af Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Thu, 10 Nov 2016 10:54:14 -0800
Subject: [PATCH 1232/1802] Add serialization for unique_ptr and shared_ptr

---
 src/serialize.h | 59 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 59 insertions(+)

diff --git a/src/serialize.h b/src/serialize.h
index 91864e1b647c0..e28ca548c0818 100644
--- a/src/serialize.h
+++ b/src/serialize.h
@@ -13,6 +13,7 @@
 #include <ios>
 #include <limits>
 #include <map>
+#include <memory>
 #include <set>
 #include <stdint.h>
 #include <string>
@@ -24,6 +25,20 @@
 
 static const unsigned int MAX_SIZE = 0x02000000;
 
+/**
+ * Dummy data type to identify deserializing constructors.
+ *
+ * By convention, a constructor of a type T with signature
+ *
+ *   template <typename Stream> T::T(deserialize_type, Stream& s)
+ *
+ * is a deserializing constructor, which builds the type by
+ * deserializing it from s. If T contains const fields, this
+ * is likely the only way to do so.
+ */
+struct deserialize_type {};
+constexpr deserialize_type deserialize {};
+
 /**
  * Used to bypass the rule against non-const reference to temporary
  * where it makes sense with wrappers such as CFlatData or CTxDB
@@ -521,7 +536,17 @@ template<typename Stream, typename K, typename T, typename Pred, typename A> voi
 template<typename Stream, typename K, typename Pred, typename A> void Serialize(Stream& os, const std::set<K, Pred, A>& m);
 template<typename Stream, typename K, typename Pred, typename A> void Unserialize(Stream& is, std::set<K, Pred, A>& m);
 
+/**
+ * shared_ptr
+ */
+template<typename Stream, typename T> void Serialize(Stream& os, const std::shared_ptr<const T>& p);
+template<typename Stream, typename T> void Unserialize(Stream& os, std::shared_ptr<const T>& p);
 
+/**
+ * unique_ptr
+ */
+template<typename Stream, typename T> void Serialize(Stream& os, const std::unique_ptr<const T>& p);
+template<typename Stream, typename T> void Unserialize(Stream& os, std::unique_ptr<const T>& p);
 
 
 
@@ -775,6 +800,40 @@ void Unserialize(Stream& is, std::set<K, Pred, A>& m)
 
 
 
+/**
+ * unique_ptr
+ */
+template<typename Stream, typename T> void
+Serialize(Stream& os, const std::unique_ptr<const T>& p)
+{
+    Serialize(os, *p);
+}
+
+template<typename Stream, typename T>
+void Unserialize(Stream& is, std::unique_ptr<const T>& p)
+{
+    p.reset(new T(deserialize, is));
+}
+
+
+
+/**
+ * shared_ptr
+ */
+template<typename Stream, typename T> void
+Serialize(Stream& os, const std::shared_ptr<const T>& p)
+{
+    Serialize(os, *p);
+}
+
+template<typename Stream, typename T>
+void Unserialize(Stream& is, std::shared_ptr<const T>& p)
+{
+    p = std::make_shared<const T>(deserialize, is);
+}
+
+
+
 /**
  * Support for ADD_SERIALIZE_METHODS and READWRITE macro
  */

From da60506fc80f6a78f1b271a9a53b956b49b37234 Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Thu, 10 Nov 2016 15:53:43 -0800
Subject: [PATCH 1233/1802] Add deserializing constructors to CTransaction and
 CMutableTransaction

---
 src/primitives/transaction.cpp | 4 ++++
 src/primitives/transaction.h   | 9 +++++++++
 2 files changed, 13 insertions(+)

diff --git a/src/primitives/transaction.cpp b/src/primitives/transaction.cpp
index 7acdac17f2d6d..91f4d29488b16 100644
--- a/src/primitives/transaction.cpp
+++ b/src/primitives/transaction.cpp
@@ -78,6 +78,10 @@ CTransaction::CTransaction(const CMutableTransaction &tx) : nVersion(tx.nVersion
     UpdateHash();
 }
 
+CTransaction::CTransaction(CMutableTransaction &&tx) : nVersion(tx.nVersion), vin(std::move(tx.vin)), vout(std::move(tx.vout)), wit(std::move(tx.wit)), nLockTime(tx.nLockTime) {
+    UpdateHash();
+}
+
 CTransaction& CTransaction::operator=(const CTransaction &tx) {
     *const_cast<int*>(&nVersion) = tx.nVersion;
     *const_cast<std::vector<CTxIn>*>(&vin) = tx.vin;
diff --git a/src/primitives/transaction.h b/src/primitives/transaction.h
index 1d176e5d8cdee..015a89ff107fa 100644
--- a/src/primitives/transaction.h
+++ b/src/primitives/transaction.h
@@ -379,6 +379,7 @@ class CTransaction
 
     /** Convert a CMutableTransaction into a CTransaction. */
     CTransaction(const CMutableTransaction &tx);
+    CTransaction(CMutableTransaction &&tx);
 
     CTransaction& operator=(const CTransaction& tx);
 
@@ -392,6 +393,9 @@ class CTransaction
         }
     }
 
+    template <typename Stream>
+    CTransaction(deserialize_type, Stream& s) : CTransaction(CMutableTransaction(deserialize, s)) {}
+
     bool IsNull() const {
         return vin.empty() && vout.empty();
     }
@@ -460,6 +464,11 @@ struct CMutableTransaction
         SerializeTransaction(*this, s, ser_action);
     }
 
+    template <typename Stream>
+    CMutableTransaction(deserialize_type, Stream& s) {
+        Unserialize(s);
+    }
+
     /** Compute the hash of this CMutableTransaction. This is computed on the
      * fly, as opposed to GetHash() in CTransaction, which uses a cached result.
      */

From 1662b437b33b7ec5a1723f6ae6187d3bdd06f593 Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Thu, 10 Nov 2016 17:26:00 -0800
Subject: [PATCH 1234/1802] Make CBlock::vtx a vector of
 shared_ptr<CTransaction>

---
 src/blockencodings.cpp             | 14 ++---
 src/blockencodings.h               | 10 ++--
 src/chainparams.cpp                |  2 +-
 src/consensus/merkle.cpp           |  6 +--
 src/core_memusage.h                |  4 +-
 src/main.cpp                       | 87 +++++++++++++++---------------
 src/merkleblock.cpp                |  6 +--
 src/miner.cpp                      | 12 ++---
 src/primitives/block.cpp           |  2 +-
 src/primitives/block.h             |  2 +-
 src/rpc/blockchain.cpp             |  6 +--
 src/rpc/mining.cpp                 |  5 +-
 src/rpc/rawtransaction.cpp         |  4 +-
 src/test/blockencodings_tests.cpp  | 61 ++++++++++++---------
 src/test/mempool_tests.cpp         |  6 +--
 src/test/merkle_tests.cpp          |  8 +--
 src/test/miner_tests.cpp           | 33 ++++++------
 src/test/pmt_tests.cpp             |  4 +-
 src/test/policyestimator_tests.cpp |  8 +--
 src/test/test_bitcoin.cpp          |  8 +--
 src/test/test_bitcoin.h            |  4 +-
 src/txmempool.cpp                  | 14 ++---
 src/txmempool.h                    |  2 +-
 src/wallet/wallet.cpp              |  2 +-
 24 files changed, 161 insertions(+), 149 deletions(-)

diff --git a/src/blockencodings.cpp b/src/blockencodings.cpp
index dbed90583d4a5..fac52474ec7f8 100644
--- a/src/blockencodings.cpp
+++ b/src/blockencodings.cpp
@@ -24,7 +24,7 @@ CBlockHeaderAndShortTxIDs::CBlockHeaderAndShortTxIDs(const CBlock& block, bool f
     //TODO: Use our mempool prior to block acceptance to predictively fill more than just the coinbase
     prefilledtxn[0] = {0, block.vtx[0]};
     for (size_t i = 1; i < block.vtx.size(); i++) {
-        const CTransaction& tx = block.vtx[i];
+        const CTransaction& tx = *block.vtx[i];
         shorttxids[i - 1] = GetShortID(fUseWTXID ? tx.GetWitnessHash() : tx.GetHash());
     }
 }
@@ -59,7 +59,7 @@ ReadStatus PartiallyDownloadedBlock::InitData(const CBlockHeaderAndShortTxIDs& c
 
     int32_t lastprefilledindex = -1;
     for (size_t i = 0; i < cmpctblock.prefilledtxn.size(); i++) {
-        if (cmpctblock.prefilledtxn[i].tx.IsNull())
+        if (cmpctblock.prefilledtxn[i].tx->IsNull())
             return READ_STATUS_INVALID;
 
         lastprefilledindex += cmpctblock.prefilledtxn[i].index + 1; //index is a uint16_t, so cant overflow here
@@ -71,7 +71,7 @@ ReadStatus PartiallyDownloadedBlock::InitData(const CBlockHeaderAndShortTxIDs& c
             // have neither a prefilled txn or a shorttxid!
             return READ_STATUS_INVALID;
         }
-        txn_available[lastprefilledindex] = std::make_shared<CTransaction>(cmpctblock.prefilledtxn[i].tx);
+        txn_available[lastprefilledindex] = cmpctblock.prefilledtxn[i].tx;
     }
     prefilled_count = cmpctblock.prefilledtxn.size();
 
@@ -142,7 +142,7 @@ bool PartiallyDownloadedBlock::IsTxAvailable(size_t index) const {
     return txn_available[index] ? true : false;
 }
 
-ReadStatus PartiallyDownloadedBlock::FillBlock(CBlock& block, const std::vector<CTransaction>& vtx_missing) const {
+ReadStatus PartiallyDownloadedBlock::FillBlock(CBlock& block, const std::vector<std::shared_ptr<const CTransaction>>& vtx_missing) const {
     assert(!header.IsNull());
     block = header;
     block.vtx.resize(txn_available.size());
@@ -154,7 +154,7 @@ ReadStatus PartiallyDownloadedBlock::FillBlock(CBlock& block, const std::vector<
                 return READ_STATUS_INVALID;
             block.vtx[i] = vtx_missing[tx_missing_offset++];
         } else
-            block.vtx[i] = *txn_available[i];
+            block.vtx[i] = txn_available[i];
     }
     if (vtx_missing.size() != tx_missing_offset)
         return READ_STATUS_INVALID;
@@ -172,8 +172,8 @@ ReadStatus PartiallyDownloadedBlock::FillBlock(CBlock& block, const std::vector<
 
     LogPrint("cmpctblock", "Successfully reconstructed block %s with %lu txn prefilled, %lu txn from mempool and %lu txn requested\n", header.GetHash().ToString(), prefilled_count, mempool_count, vtx_missing.size());
     if (vtx_missing.size() < 5) {
-        for(const CTransaction& tx : vtx_missing)
-            LogPrint("cmpctblock", "Reconstructed block %s required tx %s\n", header.GetHash().ToString(), tx.GetHash().ToString());
+        for (const auto& tx : vtx_missing)
+            LogPrint("cmpctblock", "Reconstructed block %s required tx %s\n", header.GetHash().ToString(), tx->GetHash().ToString());
     }
 
     return READ_STATUS_OK;
diff --git a/src/blockencodings.h b/src/blockencodings.h
index 1f9491867a0ba..ffe189a940ba2 100644
--- a/src/blockencodings.h
+++ b/src/blockencodings.h
@@ -14,9 +14,9 @@ class CTxMemPool;
 // Dumb helper to handle CTransaction compression at serialize-time
 struct TransactionCompressor {
 private:
-    CTransaction& tx;
+    std::shared_ptr<const CTransaction>& tx;
 public:
-    TransactionCompressor(CTransaction& txIn) : tx(txIn) {}
+    TransactionCompressor(std::shared_ptr<const CTransaction>& txIn) : tx(txIn) {}
 
     ADD_SERIALIZE_METHODS;
 
@@ -72,7 +72,7 @@ class BlockTransactions {
 public:
     // A BlockTransactions message
     uint256 blockhash;
-    std::vector<CTransaction> txn;
+    std::vector<std::shared_ptr<const CTransaction>> txn;
 
     BlockTransactions() {}
     BlockTransactions(const BlockTransactionsRequest& req) :
@@ -104,7 +104,7 @@ struct PrefilledTransaction {
     // Used as an offset since last prefilled tx in CBlockHeaderAndShortTxIDs,
     // as a proper transaction-in-block-index in PartiallyDownloadedBlock
     uint16_t index;
-    CTransaction tx;
+    std::shared_ptr<const CTransaction> tx;
 
     ADD_SERIALIZE_METHODS;
 
@@ -202,7 +202,7 @@ class PartiallyDownloadedBlock {
 
     ReadStatus InitData(const CBlockHeaderAndShortTxIDs& cmpctblock);
     bool IsTxAvailable(size_t index) const;
-    ReadStatus FillBlock(CBlock& block, const std::vector<CTransaction>& vtx_missing) const;
+    ReadStatus FillBlock(CBlock& block, const std::vector<std::shared_ptr<const CTransaction>>& vtx_missing) const;
 };
 
 #endif
diff --git a/src/chainparams.cpp b/src/chainparams.cpp
index a57ab632e4cfe..77eb586b67ece 100644
--- a/src/chainparams.cpp
+++ b/src/chainparams.cpp
@@ -31,7 +31,7 @@ static CBlock CreateGenesisBlock(const char* pszTimestamp, const CScript& genesi
     genesis.nBits    = nBits;
     genesis.nNonce   = nNonce;
     genesis.nVersion = nVersion;
-    genesis.vtx.push_back(txNew);
+    genesis.vtx.push_back(std::make_shared<const CTransaction>(std::move(txNew)));
     genesis.hashPrevBlock.SetNull();
     genesis.hashMerkleRoot = BlockMerkleRoot(genesis);
     return genesis;
diff --git a/src/consensus/merkle.cpp b/src/consensus/merkle.cpp
index 35f7d2e05a937..6fa96ddf45fb1 100644
--- a/src/consensus/merkle.cpp
+++ b/src/consensus/merkle.cpp
@@ -160,7 +160,7 @@ uint256 BlockMerkleRoot(const CBlock& block, bool* mutated)
     std::vector<uint256> leaves;
     leaves.resize(block.vtx.size());
     for (size_t s = 0; s < block.vtx.size(); s++) {
-        leaves[s] = block.vtx[s].GetHash();
+        leaves[s] = block.vtx[s]->GetHash();
     }
     return ComputeMerkleRoot(leaves, mutated);
 }
@@ -171,7 +171,7 @@ uint256 BlockWitnessMerkleRoot(const CBlock& block, bool* mutated)
     leaves.resize(block.vtx.size());
     leaves[0].SetNull(); // The witness hash of the coinbase is 0.
     for (size_t s = 1; s < block.vtx.size(); s++) {
-        leaves[s] = block.vtx[s].GetWitnessHash();
+        leaves[s] = block.vtx[s]->GetWitnessHash();
     }
     return ComputeMerkleRoot(leaves, mutated);
 }
@@ -181,7 +181,7 @@ std::vector<uint256> BlockMerkleBranch(const CBlock& block, uint32_t position)
     std::vector<uint256> leaves;
     leaves.resize(block.vtx.size());
     for (size_t s = 0; s < block.vtx.size(); s++) {
-        leaves[s] = block.vtx[s].GetHash();
+        leaves[s] = block.vtx[s]->GetHash();
     }
     return ComputeMerkleBranch(leaves, position);
 }
diff --git a/src/core_memusage.h b/src/core_memusage.h
index b8e0f08bbf7be..0dcc24c40c822 100644
--- a/src/core_memusage.h
+++ b/src/core_memusage.h
@@ -69,8 +69,8 @@ static inline size_t RecursiveDynamicUsage(const CMutableTransaction& tx) {
 
 static inline size_t RecursiveDynamicUsage(const CBlock& block) {
     size_t mem = memusage::DynamicUsage(block.vtx);
-    for (std::vector<CTransaction>::const_iterator it = block.vtx.begin(); it != block.vtx.end(); it++) {
-        mem += RecursiveDynamicUsage(*it);
+    for (const auto& tx : block.vtx) {
+        mem += memusage::DynamicUsage(tx) + RecursiveDynamicUsage(*tx);
     }
     return mem;
 }
diff --git a/src/main.cpp b/src/main.cpp
index 263421aea4201..7b84ab7ba1a89 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1682,9 +1682,9 @@ bool GetTransaction(const uint256 &hash, CTransaction &txOut, const Consensus::P
     if (pindexSlow) {
         CBlock block;
         if (ReadBlockFromDisk(block, pindexSlow, consensusParams)) {
-            BOOST_FOREACH(const CTransaction &tx, block.vtx) {
-                if (tx.GetHash() == hash) {
-                    txOut = tx;
+            for (const auto& tx : block.vtx) {
+                if (tx->GetHash() == hash) {
+                    txOut = *tx;
                     hashBlock = pindexSlow->GetBlockHash();
                     return true;
                 }
@@ -2223,7 +2223,7 @@ bool DisconnectBlock(const CBlock& block, CValidationState& state, const CBlockI
 
     // undo transactions in reverse order
     for (int i = block.vtx.size() - 1; i >= 0; i--) {
-        const CTransaction &tx = block.vtx[i];
+        const CTransaction &tx = *(block.vtx[i]);
         uint256 hash = tx.GetHash();
 
         // Check that all outputs are available and match the outputs in the block itself
@@ -2417,8 +2417,8 @@ bool ConnectBlock(const CBlock& block, CValidationState& state, CBlockIndex* pin
     fEnforceBIP30 = fEnforceBIP30 && (!pindexBIP34height || !(pindexBIP34height->GetBlockHash() == chainparams.GetConsensus().BIP34Hash));
 
     if (fEnforceBIP30) {
-        BOOST_FOREACH(const CTransaction& tx, block.vtx) {
-            const CCoins* coins = view.AccessCoins(tx.GetHash());
+        for (const auto& tx : block.vtx) {
+            const CCoins* coins = view.AccessCoins(tx->GetHash());
             if (coins && !coins->IsPruned())
                 return state.DoS(100, error("ConnectBlock(): tried to overwrite transaction"),
                                  REJECT_INVALID, "bad-txns-BIP30");
@@ -2474,7 +2474,7 @@ bool ConnectBlock(const CBlock& block, CValidationState& state, CBlockIndex* pin
     txdata.reserve(block.vtx.size()); // Required so that pointers to individual PrecomputedTransactionData don't get invalidated
     for (unsigned int i = 0; i < block.vtx.size(); i++)
     {
-        const CTransaction &tx = block.vtx[i];
+        const CTransaction &tx = *(block.vtx[i]);
 
         nInputs += tx.vin.size();
 
@@ -2544,10 +2544,10 @@ bool ConnectBlock(const CBlock& block, CValidationState& state, CBlockIndex* pin
     LogPrint("bench", "      - Connect %u transactions: %.2fms (%.3fms/tx, %.3fms/txin) [%.2fs]\n", (unsigned)block.vtx.size(), 0.001 * (nTime3 - nTime2), 0.001 * (nTime3 - nTime2) / block.vtx.size(), nInputs <= 1 ? 0 : 0.001 * (nTime3 - nTime2) / (nInputs-1), nTimeConnect * 0.000001);
 
     CAmount blockReward = nFees + GetBlockSubsidy(pindex->nHeight, chainparams.GetConsensus());
-    if (block.vtx[0].GetValueOut() > blockReward)
+    if (block.vtx[0]->GetValueOut() > blockReward)
         return state.DoS(100,
                          error("ConnectBlock(): coinbase pays too much (actual=%d vs limit=%d)",
-                               block.vtx[0].GetValueOut(), blockReward),
+                               block.vtx[0]->GetValueOut(), blockReward),
                                REJECT_INVALID, "bad-cb-amount");
 
     if (!control.Wait())
@@ -2590,7 +2590,7 @@ bool ConnectBlock(const CBlock& block, CValidationState& state, CBlockIndex* pin
     // Watch for changes to the previous coinbase transaction.
     static uint256 hashPrevBestCoinBase;
     GetMainSignals().UpdatedTransaction(hashPrevBestCoinBase);
-    hashPrevBestCoinBase = block.vtx[0].GetHash();
+    hashPrevBestCoinBase = block.vtx[0]->GetHash();
 
     // Erase orphan transactions include or precluded by this block
     if (vOrphanErase.size()) {
@@ -2807,7 +2807,8 @@ bool static DisconnectTip(CValidationState& state, const CChainParams& chainpara
     if (!fBare) {
         // Resurrect mempool transactions from the disconnected block.
         std::vector<uint256> vHashUpdate;
-        BOOST_FOREACH(const CTransaction &tx, block.vtx) {
+        for (const auto& it : block.vtx) {
+            const CTransaction& tx = *it;
             // ignore validation errors in resurrected transactions
             CValidationState stateDummy;
             if (tx.IsCoinBase() || !AcceptToMemoryPool(mempool, stateDummy, tx, false, NULL, true)) {
@@ -2828,8 +2829,8 @@ bool static DisconnectTip(CValidationState& state, const CChainParams& chainpara
     UpdateTip(pindexDelete->pprev, chainparams);
     // Let wallets know transactions went from 1-confirmed to
     // 0-confirmed or conflicted:
-    BOOST_FOREACH(const CTransaction &tx, block.vtx) {
-        GetMainSignals().SyncTransaction(tx, pindexDelete->pprev, CMainSignals::SYNC_TRANSACTION_NOT_IN_BLOCK);
+    for (const auto& tx : block.vtx) {
+        GetMainSignals().SyncTransaction(*tx, pindexDelete->pprev, CMainSignals::SYNC_TRANSACTION_NOT_IN_BLOCK);
     }
     return true;
 }
@@ -2844,7 +2845,7 @@ static int64_t nTimePostConnect = 0;
  * Connect a new block to chainActive. pblock is either NULL or a pointer to a CBlock
  * corresponding to pindexNew, to bypass loading it again from disk.
  */
-bool static ConnectTip(CValidationState& state, const CChainParams& chainparams, CBlockIndex* pindexNew, const CBlock* pblock, std::vector<std::shared_ptr<const CTransaction>> &txConflicted, std::vector<std::tuple<CTransaction,CBlockIndex*,int>> &txChanged)
+bool static ConnectTip(CValidationState& state, const CChainParams& chainparams, CBlockIndex* pindexNew, const CBlock* pblock, std::vector<std::shared_ptr<const CTransaction>> &txConflicted, std::vector<std::tuple<std::shared_ptr<const CTransaction>,CBlockIndex*,int>> &txChanged)
 {
     assert(pindexNew->pprev == chainActive.Tip());
     // Read block from disk.
@@ -2884,7 +2885,7 @@ bool static ConnectTip(CValidationState& state, const CChainParams& chainparams,
     // Update chainActive & related variables.
     UpdateTip(pindexNew, chainparams);
 
-    for(unsigned int i=0; i < pblock->vtx.size(); i++)
+    for (unsigned int i=0; i < pblock->vtx.size(); i++)
         txChanged.emplace_back(pblock->vtx[i], pindexNew, i);
 
     int64_t nTime6 = GetTimeMicros(); nTimePostConnect += nTime6 - nTime5; nTimeTotal += nTime6 - nTime1;
@@ -2967,7 +2968,7 @@ static void PruneBlockIndexCandidates() {
  * Try to make some progress towards making pindexMostWork the active block.
  * pblock is either NULL or a pointer to a CBlock corresponding to pindexMostWork.
  */
-static bool ActivateBestChainStep(CValidationState& state, const CChainParams& chainparams, CBlockIndex* pindexMostWork, const CBlock* pblock, bool& fInvalidFound, std::vector<std::shared_ptr<const CTransaction>>& txConflicted, std::vector<std::tuple<CTransaction,CBlockIndex*,int>>& txChanged)
+static bool ActivateBestChainStep(CValidationState& state, const CChainParams& chainparams, CBlockIndex* pindexMostWork, const CBlock* pblock, bool& fInvalidFound, std::vector<std::shared_ptr<const CTransaction>>& txConflicted, std::vector<std::tuple<std::shared_ptr<const CTransaction>,CBlockIndex*,int>>& txChanged)
 {
     AssertLockHeld(cs_main);
     const CBlockIndex *pindexOldTip = chainActive.Tip();
@@ -3068,7 +3069,7 @@ static void NotifyHeaderTip() {
 bool ActivateBestChain(CValidationState &state, const CChainParams& chainparams, const CBlock *pblock) {
     CBlockIndex *pindexMostWork = NULL;
     CBlockIndex *pindexNewTip = NULL;
-    std::vector<std::tuple<CTransaction,CBlockIndex*,int>> txChanged;
+    std::vector<std::tuple<std::shared_ptr<const CTransaction>,CBlockIndex*,int>> txChanged;
     if (pblock)
         txChanged.reserve(pblock->vtx.size());
     do {
@@ -3109,13 +3110,13 @@ bool ActivateBestChain(CValidationState &state, const CChainParams& chainparams,
 
         // throw all transactions though the signal-interface
         // while _not_ holding the cs_main lock
-        for(std::shared_ptr<const CTransaction> tx : txConflicted)
+        for (const auto& tx : txConflicted)
         {
             GetMainSignals().SyncTransaction(*tx, pindexNewTip, CMainSignals::SYNC_TRANSACTION_NOT_IN_BLOCK);
         }
         // ... and about transactions that got confirmed:
-        for(unsigned int i = 0; i < txChanged.size(); i++)
-            GetMainSignals().SyncTransaction(std::get<0>(txChanged[i]), std::get<1>(txChanged[i]), std::get<2>(txChanged[i]));
+        for (unsigned int i = 0; i < txChanged.size(); i++)
+            GetMainSignals().SyncTransaction(*std::get<0>(txChanged[i]), std::get<1>(txChanged[i]), std::get<2>(txChanged[i]));
 
         // Notify external listeners about the new tip.
         GetMainSignals().UpdatedBlockTip(pindexNewTip, pindexFork, fInitialDownload);
@@ -3454,22 +3455,22 @@ bool CheckBlock(const CBlock& block, CValidationState& state, const Consensus::P
         return state.DoS(100, false, REJECT_INVALID, "bad-blk-length", false, "size limits failed");
 
     // First transaction must be coinbase, the rest must not be
-    if (block.vtx.empty() || !block.vtx[0].IsCoinBase())
+    if (block.vtx.empty() || !block.vtx[0]->IsCoinBase())
         return state.DoS(100, false, REJECT_INVALID, "bad-cb-missing", false, "first tx is not coinbase");
     for (unsigned int i = 1; i < block.vtx.size(); i++)
-        if (block.vtx[i].IsCoinBase())
+        if (block.vtx[i]->IsCoinBase())
             return state.DoS(100, false, REJECT_INVALID, "bad-cb-multiple", false, "more than one coinbase");
 
     // Check transactions
     for (const auto& tx : block.vtx)
-        if (!CheckTransaction(tx, state, false))
+        if (!CheckTransaction(*tx, state, false))
             return state.Invalid(false, state.GetRejectCode(), state.GetRejectReason(),
-                                 strprintf("Transaction check failed (tx hash %s) %s", tx.GetHash().ToString(), state.GetDebugMessage()));
+                                 strprintf("Transaction check failed (tx hash %s) %s", tx->GetHash().ToString(), state.GetDebugMessage()));
 
     unsigned int nSigOps = 0;
     for (const auto& tx : block.vtx)
     {
-        nSigOps += GetLegacySigOpCount(tx);
+        nSigOps += GetLegacySigOpCount(*tx);
     }
     if (nSigOps * WITNESS_SCALE_FACTOR > MAX_BLOCK_SIGOPS_COST)
         return state.DoS(100, false, REJECT_INVALID, "bad-blk-sigops", false, "out-of-bounds SigOpCount");
@@ -3505,8 +3506,8 @@ bool IsWitnessEnabled(const CBlockIndex* pindexPrev, const Consensus::Params& pa
 static int GetWitnessCommitmentIndex(const CBlock& block)
 {
     int commitpos = -1;
-    for (size_t o = 0; o < block.vtx[0].vout.size(); o++) {
-        if (block.vtx[0].vout[o].scriptPubKey.size() >= 38 && block.vtx[0].vout[o].scriptPubKey[0] == OP_RETURN && block.vtx[0].vout[o].scriptPubKey[1] == 0x24 && block.vtx[0].vout[o].scriptPubKey[2] == 0xaa && block.vtx[0].vout[o].scriptPubKey[3] == 0x21 && block.vtx[0].vout[o].scriptPubKey[4] == 0xa9 && block.vtx[0].vout[o].scriptPubKey[5] == 0xed) {
+    for (size_t o = 0; o < block.vtx[0]->vout.size(); o++) {
+        if (block.vtx[0]->vout[o].scriptPubKey.size() >= 38 && block.vtx[0]->vout[o].scriptPubKey[0] == OP_RETURN && block.vtx[0]->vout[o].scriptPubKey[1] == 0x24 && block.vtx[0]->vout[o].scriptPubKey[2] == 0xaa && block.vtx[0]->vout[o].scriptPubKey[3] == 0x21 && block.vtx[0]->vout[o].scriptPubKey[4] == 0xa9 && block.vtx[0]->vout[o].scriptPubKey[5] == 0xed) {
             commitpos = o;
         }
     }
@@ -3517,10 +3518,12 @@ void UpdateUncommittedBlockStructures(CBlock& block, const CBlockIndex* pindexPr
 {
     int commitpos = GetWitnessCommitmentIndex(block);
     static const std::vector<unsigned char> nonce(32, 0x00);
-    if (commitpos != -1 && IsWitnessEnabled(pindexPrev, consensusParams) && block.vtx[0].wit.IsEmpty()) {
-        block.vtx[0].wit.vtxinwit.resize(1);
-        block.vtx[0].wit.vtxinwit[0].scriptWitness.stack.resize(1);
-        block.vtx[0].wit.vtxinwit[0].scriptWitness.stack[0] = nonce;
+    if (commitpos != -1 && IsWitnessEnabled(pindexPrev, consensusParams) && block.vtx[0]->wit.IsEmpty()) {
+        CMutableTransaction tx(*block.vtx[0]);
+        tx.wit.vtxinwit.resize(1);
+        tx.wit.vtxinwit[0].scriptWitness.stack.resize(1);
+        tx.wit.vtxinwit[0].scriptWitness.stack[0] = nonce;
+        block.vtx[0] = std::make_shared<const CTransaction>(std::move(tx));
     }
 }
 
@@ -3530,7 +3533,7 @@ std::vector<unsigned char> GenerateCoinbaseCommitment(CBlock& block, const CBloc
     int commitpos = GetWitnessCommitmentIndex(block);
     bool fHaveWitness = false;
     for (size_t t = 1; t < block.vtx.size(); t++) {
-        if (!block.vtx[t].wit.IsNull()) {
+        if (!block.vtx[t]->wit.IsNull()) {
             fHaveWitness = true;
             break;
         }
@@ -3551,8 +3554,8 @@ std::vector<unsigned char> GenerateCoinbaseCommitment(CBlock& block, const CBloc
             out.scriptPubKey[5] = 0xed;
             memcpy(&out.scriptPubKey[6], witnessroot.begin(), 32);
             commitment = std::vector<unsigned char>(out.scriptPubKey.begin(), out.scriptPubKey.end());
-            const_cast<std::vector<CTxOut>*>(&block.vtx[0].vout)->push_back(out);
-            block.vtx[0].UpdateHash();
+            const_cast<std::vector<CTxOut>*>(&block.vtx[0]->vout)->push_back(out);
+            block.vtx[0]->UpdateHash();
         }
     }
     UpdateUncommittedBlockStructures(block, pindexPrev, consensusParams);
@@ -3601,7 +3604,7 @@ bool ContextualCheckBlock(const CBlock& block, CValidationState& state, const Co
 
     // Check that all transactions are finalized
     for (const auto& tx : block.vtx) {
-        if (!IsFinalTx(tx, nHeight, nLockTimeCutoff)) {
+        if (!IsFinalTx(*tx, nHeight, nLockTimeCutoff)) {
             return state.DoS(10, false, REJECT_INVALID, "bad-txns-nonfinal", false, "non-final transaction");
         }
     }
@@ -3610,8 +3613,8 @@ bool ContextualCheckBlock(const CBlock& block, CValidationState& state, const Co
     if (nHeight >= consensusParams.BIP34Height)
     {
         CScript expect = CScript() << nHeight;
-        if (block.vtx[0].vin[0].scriptSig.size() < expect.size() ||
-            !std::equal(expect.begin(), expect.end(), block.vtx[0].vin[0].scriptSig.begin())) {
+        if (block.vtx[0]->vin[0].scriptSig.size() < expect.size() ||
+            !std::equal(expect.begin(), expect.end(), block.vtx[0]->vin[0].scriptSig.begin())) {
             return state.DoS(100, false, REJECT_INVALID, "bad-cb-height", false, "block height mismatch in coinbase");
         }
     }
@@ -3633,11 +3636,11 @@ bool ContextualCheckBlock(const CBlock& block, CValidationState& state, const Co
             // The malleation check is ignored; as the transaction tree itself
             // already does not permit it, it is impossible to trigger in the
             // witness tree.
-            if (block.vtx[0].wit.vtxinwit.size() != 1 || block.vtx[0].wit.vtxinwit[0].scriptWitness.stack.size() != 1 || block.vtx[0].wit.vtxinwit[0].scriptWitness.stack[0].size() != 32) {
+            if (block.vtx[0]->wit.vtxinwit.size() != 1 || block.vtx[0]->wit.vtxinwit[0].scriptWitness.stack.size() != 1 || block.vtx[0]->wit.vtxinwit[0].scriptWitness.stack[0].size() != 32) {
                 return state.DoS(100, false, REJECT_INVALID, "bad-witness-nonce-size", true, strprintf("%s : invalid witness nonce size", __func__));
             }
-            CHash256().Write(hashWitness.begin(), 32).Write(&block.vtx[0].wit.vtxinwit[0].scriptWitness.stack[0][0], 32).Finalize(hashWitness.begin());
-            if (memcmp(hashWitness.begin(), &block.vtx[0].vout[commitpos].scriptPubKey[6], 32)) {
+            CHash256().Write(hashWitness.begin(), 32).Write(&block.vtx[0]->wit.vtxinwit[0].scriptWitness.stack[0][0], 32).Finalize(hashWitness.begin());
+            if (memcmp(hashWitness.begin(), &block.vtx[0]->vout[commitpos].scriptPubKey[6], 32)) {
                 return state.DoS(100, false, REJECT_INVALID, "bad-witness-merkle-match", true, strprintf("%s : witness merkle commitment mismatch", __func__));
             }
             fHaveWitness = true;
@@ -3647,7 +3650,7 @@ bool ContextualCheckBlock(const CBlock& block, CValidationState& state, const Co
     // No witness data is allowed in blocks that don't commit to witness data, as this would otherwise leave room for spam
     if (!fHaveWitness) {
         for (size_t i = 0; i < block.vtx.size(); i++) {
-            if (!block.vtx[i].wit.IsNull()) {
+            if (!block.vtx[i]->wit.IsNull()) {
                 return state.DoS(100, false, REJECT_INVALID, "unexpected-witness", true, strprintf("%s : unexpected witness data found", __func__));
             }
         }
@@ -4953,7 +4956,7 @@ void static ProcessGetData(CNode* pfrom, const Consensus::Params& consensusParam
                             // however we MUST always provide at least what the remote peer needs
                             typedef std::pair<unsigned int, uint256> PairType;
                             BOOST_FOREACH(PairType& pair, merkleBlock.vMatchedTxn)
-                                connman.PushMessageWithFlag(pfrom, SERIALIZE_TRANSACTION_NO_WITNESS, NetMsgType::TX, block.vtx[pair.first]);
+                                connman.PushMessageWithFlag(pfrom, SERIALIZE_TRANSACTION_NO_WITNESS, NetMsgType::TX, *block.vtx[pair.first]);
                         }
                         // else
                             // no response
diff --git a/src/merkleblock.cpp b/src/merkleblock.cpp
index 31332526a916e..882717ac56b0e 100644
--- a/src/merkleblock.cpp
+++ b/src/merkleblock.cpp
@@ -23,8 +23,8 @@ CMerkleBlock::CMerkleBlock(const CBlock& block, CBloomFilter& filter)
 
     for (unsigned int i = 0; i < block.vtx.size(); i++)
     {
-        const uint256& hash = block.vtx[i].GetHash();
-        if (filter.IsRelevantAndUpdate(block.vtx[i]))
+        const uint256& hash = block.vtx[i]->GetHash();
+        if (filter.IsRelevantAndUpdate(*block.vtx[i]))
         {
             vMatch.push_back(true);
             vMatchedTxn.push_back(make_pair(i, hash));
@@ -49,7 +49,7 @@ CMerkleBlock::CMerkleBlock(const CBlock& block, const std::set<uint256>& txids)
 
     for (unsigned int i = 0; i < block.vtx.size(); i++)
     {
-        const uint256& hash = block.vtx[i].GetHash();
+        const uint256& hash = block.vtx[i]->GetHash();
         if (txids.count(hash))
             vMatch.push_back(true);
         else
diff --git a/src/miner.cpp b/src/miner.cpp
index 6ad63207cc272..2b65cbc65e9e3 100644
--- a/src/miner.cpp
+++ b/src/miner.cpp
@@ -134,7 +134,7 @@ std::unique_ptr<CBlockTemplate> BlockAssembler::CreateNewBlock(const CScript& sc
     pblock = &pblocktemplate->block; // pointer for convenience
 
     // Add dummy coinbase tx as first transaction
-    pblock->vtx.push_back(CTransaction());
+    pblock->vtx.emplace_back();
     pblocktemplate->vTxFees.push_back(-1); // updated at end
     pblocktemplate->vTxSigOpsCost.push_back(-1); // updated at end
 
@@ -178,7 +178,7 @@ std::unique_ptr<CBlockTemplate> BlockAssembler::CreateNewBlock(const CScript& sc
     coinbaseTx.vout[0].scriptPubKey = scriptPubKeyIn;
     coinbaseTx.vout[0].nValue = nFees + GetBlockSubsidy(nHeight, chainparams.GetConsensus());
     coinbaseTx.vin[0].scriptSig = CScript() << nHeight << OP_0;
-    pblock->vtx[0] = coinbaseTx;
+    pblock->vtx[0] = std::make_shared<const CTransaction>(std::move(coinbaseTx));
     pblocktemplate->vchCoinbaseCommitment = GenerateCoinbaseCommitment(*pblock, pindexPrev, chainparams.GetConsensus());
     pblocktemplate->vTxFees[0] = -nFees;
 
@@ -190,7 +190,7 @@ std::unique_ptr<CBlockTemplate> BlockAssembler::CreateNewBlock(const CScript& sc
     UpdateTime(pblock, chainparams.GetConsensus(), pindexPrev);
     pblock->nBits          = GetNextWorkRequired(pindexPrev, pblock, chainparams.GetConsensus());
     pblock->nNonce         = 0;
-    pblocktemplate->vTxSigOpsCost[0] = WITNESS_SCALE_FACTOR * GetLegacySigOpCount(pblock->vtx[0]);
+    pblocktemplate->vTxSigOpsCost[0] = WITNESS_SCALE_FACTOR * GetLegacySigOpCount(*pblock->vtx[0]);
 
     CValidationState state;
     if (!TestBlockValidity(state, chainparams, *pblock, pindexPrev, false, false)) {
@@ -312,7 +312,7 @@ bool BlockAssembler::TestForBlock(CTxMemPool::txiter iter)
 
 void BlockAssembler::AddToBlock(CTxMemPool::txiter iter)
 {
-    pblock->vtx.push_back(iter->GetTx());
+    pblock->vtx.emplace_back(iter->GetSharedTx());
     pblocktemplate->vTxFees.push_back(iter->GetFee());
     pblocktemplate->vTxSigOpsCost.push_back(iter->GetSigOpCost());
     if (fNeedSizeAccounting) {
@@ -601,10 +601,10 @@ void IncrementExtraNonce(CBlock* pblock, const CBlockIndex* pindexPrev, unsigned
     }
     ++nExtraNonce;
     unsigned int nHeight = pindexPrev->nHeight+1; // Height first in coinbase required for block.version=2
-    CMutableTransaction txCoinbase(pblock->vtx[0]);
+    CMutableTransaction txCoinbase(*pblock->vtx[0]);
     txCoinbase.vin[0].scriptSig = (CScript() << nHeight << CScriptNum(nExtraNonce)) + COINBASE_FLAGS;
     assert(txCoinbase.vin[0].scriptSig.size() <= 100);
 
-    pblock->vtx[0] = txCoinbase;
+    pblock->vtx[0] = std::make_shared<const CTransaction>(std::move(txCoinbase));
     pblock->hashMerkleRoot = BlockMerkleRoot(*pblock);
 }
diff --git a/src/primitives/block.cpp b/src/primitives/block.cpp
index 0e6ab4dd718b3..95bd2211f91d7 100644
--- a/src/primitives/block.cpp
+++ b/src/primitives/block.cpp
@@ -27,7 +27,7 @@ std::string CBlock::ToString() const
         vtx.size());
     for (unsigned int i = 0; i < vtx.size(); i++)
     {
-        s << "  " << vtx[i].ToString() << "\n";
+        s << "  " << vtx[i]->ToString() << "\n";
     }
     return s.str();
 }
diff --git a/src/primitives/block.h b/src/primitives/block.h
index d148aec1e0389..45b4895eba06b 100644
--- a/src/primitives/block.h
+++ b/src/primitives/block.h
@@ -73,7 +73,7 @@ class CBlock : public CBlockHeader
 {
 public:
     // network and disk
-    std::vector<CTransaction> vtx;
+    std::vector<std::shared_ptr<const CTransaction>> vtx;
 
     // memory only
     mutable bool fChecked;
diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp
index 8caea14adbcac..154107c0dcf33 100644
--- a/src/rpc/blockchain.cpp
+++ b/src/rpc/blockchain.cpp
@@ -119,16 +119,16 @@ UniValue blockToJSON(const CBlock& block, const CBlockIndex* blockindex, bool tx
     result.push_back(Pair("versionHex", strprintf("%08x", block.nVersion)));
     result.push_back(Pair("merkleroot", block.hashMerkleRoot.GetHex()));
     UniValue txs(UniValue::VARR);
-    BOOST_FOREACH(const CTransaction&tx, block.vtx)
+    for(const auto& tx : block.vtx)
     {
         if(txDetails)
         {
             UniValue objTx(UniValue::VOBJ);
-            TxToJSON(tx, uint256(), objTx);
+            TxToJSON(*tx, uint256(), objTx);
             txs.push_back(objTx);
         }
         else
-            txs.push_back(tx.GetHash().GetHex());
+            txs.push_back(tx->GetHash().GetHex());
     }
     result.push_back(Pair("tx", txs));
     result.push_back(Pair("time", block.GetBlockTime()));
diff --git a/src/rpc/mining.cpp b/src/rpc/mining.cpp
index ad545bdf0d102..6b0e52a309376 100644
--- a/src/rpc/mining.cpp
+++ b/src/rpc/mining.cpp
@@ -557,7 +557,8 @@ UniValue getblocktemplate(const JSONRPCRequest& request)
     UniValue transactions(UniValue::VARR);
     map<uint256, int64_t> setTxIndex;
     int i = 0;
-    BOOST_FOREACH (CTransaction& tx, pblock->vtx) {
+    for (const auto& it : pblock->vtx) {
+        const CTransaction& tx = *it;
         uint256 txHash = tx.GetHash();
         setTxIndex[txHash] = i++;
 
@@ -662,7 +663,7 @@ UniValue getblocktemplate(const JSONRPCRequest& request)
     result.push_back(Pair("previousblockhash", pblock->hashPrevBlock.GetHex()));
     result.push_back(Pair("transactions", transactions));
     result.push_back(Pair("coinbaseaux", aux));
-    result.push_back(Pair("coinbasevalue", (int64_t)pblock->vtx[0].vout[0].nValue));
+    result.push_back(Pair("coinbasevalue", (int64_t)pblock->vtx[0]->vout[0].nValue));
     result.push_back(Pair("longpollid", chainActive.Tip()->GetBlockHash().GetHex() + i64tostr(nTransactionsUpdatedLast)));
     result.push_back(Pair("target", hashTarget.GetHex()));
     result.push_back(Pair("mintime", (int64_t)pindexPrev->GetMedianTimePast()+1));
diff --git a/src/rpc/rawtransaction.cpp b/src/rpc/rawtransaction.cpp
index 0656a61755382..b9b81600ba767 100644
--- a/src/rpc/rawtransaction.cpp
+++ b/src/rpc/rawtransaction.cpp
@@ -288,8 +288,8 @@ UniValue gettxoutproof(const JSONRPCRequest& request)
         throw JSONRPCError(RPC_INTERNAL_ERROR, "Can't read block from disk");
 
     unsigned int ntxFound = 0;
-    BOOST_FOREACH(const CTransaction&tx, block.vtx)
-        if (setTxids.count(tx.GetHash()))
+    for (const auto& tx : block.vtx)
+        if (setTxids.count(tx->GetHash()))
             ntxFound++;
     if (ntxFound != setTxids.size())
         throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "(Not all) transactions not found in specified block");
diff --git a/src/test/blockencodings_tests.cpp b/src/test/blockencodings_tests.cpp
index 0ed5d62ef67e1..6899bd6328681 100644
--- a/src/test/blockencodings_tests.cpp
+++ b/src/test/blockencodings_tests.cpp
@@ -26,21 +26,21 @@ static CBlock BuildBlockTestCase() {
     tx.vout[0].nValue = 42;
 
     block.vtx.resize(3);
-    block.vtx[0] = tx;
+    block.vtx[0] = std::make_shared<const CTransaction>(tx);
     block.nVersion = 42;
     block.hashPrevBlock = GetRandHash();
     block.nBits = 0x207fffff;
 
     tx.vin[0].prevout.hash = GetRandHash();
     tx.vin[0].prevout.n = 0;
-    block.vtx[1] = tx;
+    block.vtx[1] = std::make_shared<const CTransaction>(tx);
 
     tx.vin.resize(10);
     for (size_t i = 0; i < tx.vin.size(); i++) {
         tx.vin[i].prevout.hash = GetRandHash();
         tx.vin[i].prevout.n = 0;
     }
-    block.vtx[2] = tx;
+    block.vtx[2] = std::make_shared<const CTransaction>(tx);
 
     bool mutated;
     block.hashMerkleRoot = BlockMerkleRoot(block, &mutated);
@@ -59,8 +59,8 @@ BOOST_AUTO_TEST_CASE(SimpleRoundTripTest)
     TestMemPoolEntryHelper entry;
     CBlock block(BuildBlockTestCase());
 
-    pool.addUnchecked(block.vtx[2].GetHash(), entry.FromTx(block.vtx[2]));
-    BOOST_CHECK_EQUAL(pool.mapTx.find(block.vtx[2].GetHash())->GetSharedTx().use_count(), SHARED_TX_OFFSET + 0);
+    pool.addUnchecked(block.vtx[2]->GetHash(), entry.FromTx(*block.vtx[2]));
+    BOOST_CHECK_EQUAL(pool.mapTx.find(block.vtx[2]->GetHash())->GetSharedTx().use_count(), SHARED_TX_OFFSET + 0);
 
     // Do a simple ShortTxIDs RT
     {
@@ -78,14 +78,14 @@ BOOST_AUTO_TEST_CASE(SimpleRoundTripTest)
         BOOST_CHECK(!partialBlock.IsTxAvailable(1));
         BOOST_CHECK( partialBlock.IsTxAvailable(2));
 
-        BOOST_CHECK_EQUAL(pool.mapTx.find(block.vtx[2].GetHash())->GetSharedTx().use_count(), SHARED_TX_OFFSET + 1);
+        BOOST_CHECK_EQUAL(pool.mapTx.find(block.vtx[2]->GetHash())->GetSharedTx().use_count(), SHARED_TX_OFFSET + 1);
 
         std::vector<std::shared_ptr<const CTransaction>> removed;
-        pool.removeRecursive(block.vtx[2], &removed);
+        pool.removeRecursive(*block.vtx[2], &removed);
         BOOST_CHECK_EQUAL(removed.size(), 1);
 
         CBlock block2;
-        std::vector<CTransaction> vtx_missing;
+        std::vector<std::shared_ptr<const CTransaction>> vtx_missing;
         BOOST_CHECK(partialBlock.FillBlock(block2, vtx_missing) == READ_STATUS_INVALID); // No transactions
 
         vtx_missing.push_back(block.vtx[2]); // Wrong transaction
@@ -152,8 +152,10 @@ BOOST_AUTO_TEST_CASE(NonCoinbasePreforwardRTTest)
     TestMemPoolEntryHelper entry;
     CBlock block(BuildBlockTestCase());
 
-    pool.addUnchecked(block.vtx[2].GetHash(), entry.FromTx(block.vtx[2]));
-    BOOST_CHECK_EQUAL(pool.mapTx.find(block.vtx[2].GetHash())->GetSharedTx().use_count(), SHARED_TX_OFFSET + 0);
+    pool.addUnchecked(block.vtx[2]->GetHash(), entry.FromTx(*block.vtx[2]));
+    BOOST_CHECK_EQUAL(pool.mapTx.find(block.vtx[2]->GetHash())->GetSharedTx().use_count(), SHARED_TX_OFFSET + 0);
+
+    uint256 txhash;
 
     // Test with pre-forwarding tx 1, but not coinbase
     {
@@ -161,8 +163,8 @@ BOOST_AUTO_TEST_CASE(NonCoinbasePreforwardRTTest)
         shortIDs.prefilledtxn.resize(1);
         shortIDs.prefilledtxn[0] = {1, block.vtx[1]};
         shortIDs.shorttxids.resize(2);
-        shortIDs.shorttxids[0] = shortIDs.GetShortID(block.vtx[0].GetHash());
-        shortIDs.shorttxids[1] = shortIDs.GetShortID(block.vtx[2].GetHash());
+        shortIDs.shorttxids[0] = shortIDs.GetShortID(block.vtx[0]->GetHash());
+        shortIDs.shorttxids[1] = shortIDs.GetShortID(block.vtx[2]->GetHash());
 
         CDataStream stream(SER_NETWORK, PROTOCOL_VERSION);
         stream << shortIDs;
@@ -176,10 +178,10 @@ BOOST_AUTO_TEST_CASE(NonCoinbasePreforwardRTTest)
         BOOST_CHECK( partialBlock.IsTxAvailable(1));
         BOOST_CHECK( partialBlock.IsTxAvailable(2));
 
-        BOOST_CHECK_EQUAL(pool.mapTx.find(block.vtx[2].GetHash())->GetSharedTx().use_count(), SHARED_TX_OFFSET + 1);
+        BOOST_CHECK_EQUAL(pool.mapTx.find(block.vtx[2]->GetHash())->GetSharedTx().use_count(), SHARED_TX_OFFSET + 1);
 
         CBlock block2;
-        std::vector<CTransaction> vtx_missing;
+        std::vector<std::shared_ptr<const CTransaction>> vtx_missing;
         BOOST_CHECK(partialBlock.FillBlock(block2, vtx_missing) == READ_STATUS_INVALID); // No transactions
 
         vtx_missing.push_back(block.vtx[1]); // Wrong transaction
@@ -194,9 +196,13 @@ BOOST_AUTO_TEST_CASE(NonCoinbasePreforwardRTTest)
         BOOST_CHECK_EQUAL(block.hashMerkleRoot.ToString(), BlockMerkleRoot(block3, &mutated).ToString());
         BOOST_CHECK(!mutated);
 
-        BOOST_CHECK_EQUAL(pool.mapTx.find(block.vtx[2].GetHash())->GetSharedTx().use_count(), SHARED_TX_OFFSET + 1);
+        txhash = block.vtx[2]->GetHash();
+        block.vtx.clear();
+        block2.vtx.clear();
+        block3.vtx.clear();
+        BOOST_CHECK_EQUAL(pool.mapTx.find(txhash)->GetSharedTx().use_count(), SHARED_TX_OFFSET + 1);
     }
-    BOOST_CHECK_EQUAL(pool.mapTx.find(block.vtx[2].GetHash())->GetSharedTx().use_count(), SHARED_TX_OFFSET + 0);
+    BOOST_CHECK_EQUAL(pool.mapTx.find(txhash)->GetSharedTx().use_count(), SHARED_TX_OFFSET + 0);
 }
 
 BOOST_AUTO_TEST_CASE(SufficientPreforwardRTTest)
@@ -205,8 +211,10 @@ BOOST_AUTO_TEST_CASE(SufficientPreforwardRTTest)
     TestMemPoolEntryHelper entry;
     CBlock block(BuildBlockTestCase());
 
-    pool.addUnchecked(block.vtx[1].GetHash(), entry.FromTx(block.vtx[1]));
-    BOOST_CHECK_EQUAL(pool.mapTx.find(block.vtx[1].GetHash())->GetSharedTx().use_count(), SHARED_TX_OFFSET + 0);
+    pool.addUnchecked(block.vtx[1]->GetHash(), entry.FromTx(*block.vtx[1]));
+    BOOST_CHECK_EQUAL(pool.mapTx.find(block.vtx[1]->GetHash())->GetSharedTx().use_count(), SHARED_TX_OFFSET + 0);
+
+    uint256 txhash;
 
     // Test with pre-forwarding coinbase + tx 2 with tx 1 in mempool
     {
@@ -215,7 +223,7 @@ BOOST_AUTO_TEST_CASE(SufficientPreforwardRTTest)
         shortIDs.prefilledtxn[0] = {0, block.vtx[0]};
         shortIDs.prefilledtxn[1] = {1, block.vtx[2]}; // id == 1 as it is 1 after index 1
         shortIDs.shorttxids.resize(1);
-        shortIDs.shorttxids[0] = shortIDs.GetShortID(block.vtx[1].GetHash());
+        shortIDs.shorttxids[0] = shortIDs.GetShortID(block.vtx[1]->GetHash());
 
         CDataStream stream(SER_NETWORK, PROTOCOL_VERSION);
         stream << shortIDs;
@@ -229,19 +237,22 @@ BOOST_AUTO_TEST_CASE(SufficientPreforwardRTTest)
         BOOST_CHECK( partialBlock.IsTxAvailable(1));
         BOOST_CHECK( partialBlock.IsTxAvailable(2));
 
-        BOOST_CHECK_EQUAL(pool.mapTx.find(block.vtx[1].GetHash())->GetSharedTx().use_count(), SHARED_TX_OFFSET + 1);
+        BOOST_CHECK_EQUAL(pool.mapTx.find(block.vtx[1]->GetHash())->GetSharedTx().use_count(), SHARED_TX_OFFSET + 1);
 
         CBlock block2;
-        std::vector<CTransaction> vtx_missing;
+        std::vector<std::shared_ptr<const CTransaction>> vtx_missing;
         BOOST_CHECK(partialBlock.FillBlock(block2, vtx_missing) == READ_STATUS_OK);
         BOOST_CHECK_EQUAL(block.GetHash().ToString(), block2.GetHash().ToString());
         bool mutated;
         BOOST_CHECK_EQUAL(block.hashMerkleRoot.ToString(), BlockMerkleRoot(block2, &mutated).ToString());
         BOOST_CHECK(!mutated);
 
-        BOOST_CHECK_EQUAL(pool.mapTx.find(block.vtx[1].GetHash())->GetSharedTx().use_count(), SHARED_TX_OFFSET + 1);
+        txhash = block.vtx[1]->GetHash();
+        block.vtx.clear();
+        block2.vtx.clear();
+        BOOST_CHECK_EQUAL(pool.mapTx.find(txhash)->GetSharedTx().use_count(), SHARED_TX_OFFSET + 1);
     }
-    BOOST_CHECK_EQUAL(pool.mapTx.find(block.vtx[1].GetHash())->GetSharedTx().use_count(), SHARED_TX_OFFSET + 0);
+    BOOST_CHECK_EQUAL(pool.mapTx.find(txhash)->GetSharedTx().use_count(), SHARED_TX_OFFSET + 0);
 }
 
 BOOST_AUTO_TEST_CASE(EmptyBlockRoundTripTest)
@@ -255,7 +266,7 @@ BOOST_AUTO_TEST_CASE(EmptyBlockRoundTripTest)
 
     CBlock block;
     block.vtx.resize(1);
-    block.vtx[0] = coinbase;
+    block.vtx[0] = std::make_shared<const CTransaction>(std::move(coinbase));
     block.nVersion = 42;
     block.hashPrevBlock = GetRandHash();
     block.nBits = 0x207fffff;
@@ -280,7 +291,7 @@ BOOST_AUTO_TEST_CASE(EmptyBlockRoundTripTest)
         BOOST_CHECK(partialBlock.IsTxAvailable(0));
 
         CBlock block2;
-        std::vector<CTransaction> vtx_missing;
+        std::vector<std::shared_ptr<const CTransaction>> vtx_missing;
         BOOST_CHECK(partialBlock.FillBlock(block2, vtx_missing) == READ_STATUS_OK);
         BOOST_CHECK_EQUAL(block.GetHash().ToString(), block2.GetHash().ToString());
         BOOST_CHECK_EQUAL(block.hashMerkleRoot.ToString(), BlockMerkleRoot(block2, &mutated).ToString());
diff --git a/src/test/mempool_tests.cpp b/src/test/mempool_tests.cpp
index a73dbe725c9c4..4a6a060012154 100644
--- a/src/test/mempool_tests.cpp
+++ b/src/test/mempool_tests.cpp
@@ -410,8 +410,8 @@ BOOST_AUTO_TEST_CASE(MempoolAncestorIndexingTest)
     CheckSort<ancestor_score>(pool, sortedOrder);
 
     /* after tx6 is mined, tx7 should move up in the sort */
-    std::vector<CTransaction> vtx;
-    vtx.push_back(tx6);
+    std::vector<std::shared_ptr<const CTransaction>> vtx;
+    vtx.push_back(std::make_shared<const CTransaction>(tx6));
     pool.removeForBlock(vtx, 1, NULL, false);
 
     sortedOrder.erase(sortedOrder.begin()+1);
@@ -546,7 +546,7 @@ BOOST_AUTO_TEST_CASE(MempoolSizeLimitTest)
     pool.addUnchecked(tx5.GetHash(), entry.Fee(1000LL).FromTx(tx5, &pool));
     pool.addUnchecked(tx7.GetHash(), entry.Fee(9000LL).FromTx(tx7, &pool));
 
-    std::vector<CTransaction> vtx;
+    std::vector<std::shared_ptr<const CTransaction>> vtx;
     SetMockTime(42);
     SetMockTime(42 + CTxMemPool::ROLLING_FEE_HALFLIFE);
     BOOST_CHECK_EQUAL(pool.GetMinFee(1).GetFeePerK(), maxFeeRateRemoved.GetFeePerK() + 1000);
diff --git a/src/test/merkle_tests.cpp b/src/test/merkle_tests.cpp
index 706d30f489da4..8aea571e127d6 100644
--- a/src/test/merkle_tests.cpp
+++ b/src/test/merkle_tests.cpp
@@ -15,8 +15,8 @@ static uint256 BlockBuildMerkleTree(const CBlock& block, bool* fMutated, std::ve
 {
     vMerkleTree.clear();
     vMerkleTree.reserve(block.vtx.size() * 2 + 16); // Safe upper bound for the number of total nodes.
-    for (std::vector<CTransaction>::const_iterator it(block.vtx.begin()); it != block.vtx.end(); ++it)
-        vMerkleTree.push_back(it->GetHash());
+    for (std::vector<std::shared_ptr<const CTransaction>>::const_iterator it(block.vtx.begin()); it != block.vtx.end(); ++it)
+        vMerkleTree.push_back((*it)->GetHash());
     int j = 0;
     bool mutated = false;
     for (int nSize = block.vtx.size(); nSize > 1; nSize = (nSize + 1) / 2)
@@ -86,7 +86,7 @@ BOOST_AUTO_TEST_CASE(merkle_test)
             for (int j = 0; j < ntx; j++) {
                 CMutableTransaction mtx;
                 mtx.nLockTime = j;
-                block.vtx[j] = mtx;
+                block.vtx[j] = std::make_shared<const CTransaction>(mtx);
             }
             // Compute the root of the block before mutating it.
             bool unmutatedMutated = false;
@@ -126,7 +126,7 @@ BOOST_AUTO_TEST_CASE(merkle_test)
                     std::vector<uint256> newBranch = BlockMerkleBranch(block, mtx);
                     std::vector<uint256> oldBranch = BlockGetMerkleBranch(block, merkleTree, mtx);
                     BOOST_CHECK(oldBranch == newBranch);
-                    BOOST_CHECK(ComputeMerkleRootFromBranch(block.vtx[mtx].GetHash(), newBranch, mtx) == oldRoot);
+                    BOOST_CHECK(ComputeMerkleRootFromBranch(block.vtx[mtx]->GetHash(), newBranch, mtx) == oldRoot);
                 }
             }
         }
diff --git a/src/test/miner_tests.cpp b/src/test/miner_tests.cpp
index 1ef70c343c3ec..56dab347fb41c 100644
--- a/src/test/miner_tests.cpp
+++ b/src/test/miner_tests.cpp
@@ -77,7 +77,7 @@ bool TestSequenceLocks(const CTransaction &tx, int flags)
 // Implemented as an additional function, rather than a separate test case,
 // to allow reusing the blockchain created in CreateNewBlock_validity.
 // Note that this test assumes blockprioritysize is 0.
-void TestPackageSelection(const CChainParams& chainparams, CScript scriptPubKey, std::vector<CTransaction *>& txFirst)
+void TestPackageSelection(const CChainParams& chainparams, CScript scriptPubKey, std::vector<std::shared_ptr<const CTransaction>>& txFirst)
 {
     // Test the ancestor feerate transaction selection.
     TestMemPoolEntryHelper entry;
@@ -108,9 +108,9 @@ void TestPackageSelection(const CChainParams& chainparams, CScript scriptPubKey,
     mempool.addUnchecked(hashHighFeeTx, entry.Fee(50000).Time(GetTime()).SpendsCoinbase(false).FromTx(tx));
 
     std::unique_ptr<CBlockTemplate> pblocktemplate = BlockAssembler(chainparams).CreateNewBlock(scriptPubKey);
-    BOOST_CHECK(pblocktemplate->block.vtx[1].GetHash() == hashParentTx);
-    BOOST_CHECK(pblocktemplate->block.vtx[2].GetHash() == hashHighFeeTx);
-    BOOST_CHECK(pblocktemplate->block.vtx[3].GetHash() == hashMediumFeeTx);
+    BOOST_CHECK(pblocktemplate->block.vtx[1]->GetHash() == hashParentTx);
+    BOOST_CHECK(pblocktemplate->block.vtx[2]->GetHash() == hashHighFeeTx);
+    BOOST_CHECK(pblocktemplate->block.vtx[3]->GetHash() == hashMediumFeeTx);
 
     // Test that a package below the min relay fee doesn't get included
     tx.vin[0].prevout.hash = hashHighFeeTx;
@@ -130,8 +130,8 @@ void TestPackageSelection(const CChainParams& chainparams, CScript scriptPubKey,
     pblocktemplate = BlockAssembler(chainparams).CreateNewBlock(scriptPubKey);
     // Verify that the free tx and the low fee tx didn't get selected
     for (size_t i=0; i<pblocktemplate->block.vtx.size(); ++i) {
-        BOOST_CHECK(pblocktemplate->block.vtx[i].GetHash() != hashFreeTx);
-        BOOST_CHECK(pblocktemplate->block.vtx[i].GetHash() != hashLowFeeTx);
+        BOOST_CHECK(pblocktemplate->block.vtx[i]->GetHash() != hashFreeTx);
+        BOOST_CHECK(pblocktemplate->block.vtx[i]->GetHash() != hashLowFeeTx);
     }
 
     // Test that packages above the min relay fee do get included, even if one
@@ -142,8 +142,8 @@ void TestPackageSelection(const CChainParams& chainparams, CScript scriptPubKey,
     hashLowFeeTx = tx.GetHash();
     mempool.addUnchecked(hashLowFeeTx, entry.Fee(feeToUse+2).FromTx(tx));
     pblocktemplate = BlockAssembler(chainparams).CreateNewBlock(scriptPubKey);
-    BOOST_CHECK(pblocktemplate->block.vtx[4].GetHash() == hashFreeTx);
-    BOOST_CHECK(pblocktemplate->block.vtx[5].GetHash() == hashLowFeeTx);
+    BOOST_CHECK(pblocktemplate->block.vtx[4]->GetHash() == hashFreeTx);
+    BOOST_CHECK(pblocktemplate->block.vtx[5]->GetHash() == hashLowFeeTx);
 
     // Test that transaction selection properly updates ancestor fee
     // calculations as ancestor transactions get included in a block.
@@ -166,8 +166,8 @@ void TestPackageSelection(const CChainParams& chainparams, CScript scriptPubKey,
 
     // Verify that this tx isn't selected.
     for (size_t i=0; i<pblocktemplate->block.vtx.size(); ++i) {
-        BOOST_CHECK(pblocktemplate->block.vtx[i].GetHash() != hashFreeTx2);
-        BOOST_CHECK(pblocktemplate->block.vtx[i].GetHash() != hashLowFeeTx2);
+        BOOST_CHECK(pblocktemplate->block.vtx[i]->GetHash() != hashFreeTx2);
+        BOOST_CHECK(pblocktemplate->block.vtx[i]->GetHash() != hashLowFeeTx2);
     }
 
     // This tx will be mineable, and should cause hashLowFeeTx2 to be selected
@@ -176,7 +176,7 @@ void TestPackageSelection(const CChainParams& chainparams, CScript scriptPubKey,
     tx.vout[0].nValue = 100000000 - 10000; // 10k satoshi fee
     mempool.addUnchecked(tx.GetHash(), entry.Fee(10000).FromTx(tx));
     pblocktemplate = BlockAssembler(chainparams).CreateNewBlock(scriptPubKey);
-    BOOST_CHECK(pblocktemplate->block.vtx[8].GetHash() == hashLowFeeTx2);
+    BOOST_CHECK(pblocktemplate->block.vtx[8]->GetHash() == hashLowFeeTx2);
 }
 
 // NOTE: These tests rely on CreateNewBlock doing its own self-validation!
@@ -203,23 +203,23 @@ BOOST_AUTO_TEST_CASE(CreateNewBlock_validity)
     // We can't make transactions until we have inputs
     // Therefore, load 100 blocks :)
     int baseheight = 0;
-    std::vector<CTransaction*>txFirst;
+    std::vector<std::shared_ptr<const CTransaction>> txFirst;
     for (unsigned int i = 0; i < sizeof(blockinfo)/sizeof(*blockinfo); ++i)
     {
         CBlock *pblock = &pblocktemplate->block; // pointer for convenience
         pblock->nVersion = 1;
         pblock->nTime = chainActive.Tip()->GetMedianTimePast()+1;
-        CMutableTransaction txCoinbase(pblock->vtx[0]);
+        CMutableTransaction txCoinbase(*pblock->vtx[0]);
         txCoinbase.nVersion = 1;
         txCoinbase.vin[0].scriptSig = CScript();
         txCoinbase.vin[0].scriptSig.push_back(blockinfo[i].extranonce);
         txCoinbase.vin[0].scriptSig.push_back(chainActive.Height());
         txCoinbase.vout[0].scriptPubKey = CScript();
-        pblock->vtx[0] = CTransaction(txCoinbase);
+        pblock->vtx[0] = std::make_shared<const CTransaction>(std::move(txCoinbase));
         if (txFirst.size() == 0)
             baseheight = chainActive.Height();
         if (txFirst.size() < 4)
-            txFirst.push_back(new CTransaction(pblock->vtx[0]));
+            txFirst.push_back(pblock->vtx[0]);
         pblock->hashMerkleRoot = BlockMerkleRoot(*pblock);
         pblock->nNonce = blockinfo[i].nonce;
         BOOST_CHECK(ProcessNewBlock(chainparams, pblock, true, NULL, NULL));
@@ -485,9 +485,6 @@ BOOST_AUTO_TEST_CASE(CreateNewBlock_validity)
 
     TestPackageSelection(chainparams, scriptPubKey, txFirst);
 
-    BOOST_FOREACH(CTransaction *_tx, txFirst)
-        delete _tx;
-
     fCheckpointsEnabled = true;
 }
 
diff --git a/src/test/pmt_tests.cpp b/src/test/pmt_tests.cpp
index c7731296408c1..1552cb4bafbd8 100644
--- a/src/test/pmt_tests.cpp
+++ b/src/test/pmt_tests.cpp
@@ -45,14 +45,14 @@ BOOST_AUTO_TEST_CASE(pmt_test1)
         for (unsigned int j=0; j<nTx; j++) {
             CMutableTransaction tx;
             tx.nLockTime = j; // actual transaction data doesn't matter; just make the nLockTime's unique
-            block.vtx.push_back(CTransaction(tx));
+            block.vtx.push_back(std::make_shared<const CTransaction>(tx));
         }
 
         // calculate actual merkle root and height
         uint256 merkleRoot1 = BlockMerkleRoot(block);
         std::vector<uint256> vTxid(nTx, uint256());
         for (unsigned int j=0; j<nTx; j++)
-            vTxid[j] = block.vtx[j].GetHash();
+            vTxid[j] = block.vtx[j]->GetHash();
         int nHeight = 1, nTx_ = nTx;
         while (nTx_ > 1) {
             nTx_ = (nTx_+1)/2;
diff --git a/src/test/policyestimator_tests.cpp b/src/test/policyestimator_tests.cpp
index 38aaaba26723b..08e5e774e1345 100644
--- a/src/test/policyestimator_tests.cpp
+++ b/src/test/policyestimator_tests.cpp
@@ -45,7 +45,7 @@ BOOST_AUTO_TEST_CASE(BlockPolicyEstimates)
     CFeeRate baseRate(basefee, GetVirtualTransactionSize(tx));
 
     // Create a fake block
-    std::vector<CTransaction> block;
+    std::vector<std::shared_ptr<const CTransaction>> block;
     int blocknum = 0;
 
     // Loop through 200 blocks
@@ -68,7 +68,7 @@ BOOST_AUTO_TEST_CASE(BlockPolicyEstimates)
             while (txHashes[9-h].size()) {
                 std::shared_ptr<const CTransaction> ptx = mpool.get(txHashes[9-h].back());
                 if (ptx)
-                    block.push_back(*ptx);
+                    block.push_back(ptx);
                 txHashes[9-h].pop_back();
             }
         }
@@ -145,7 +145,7 @@ BOOST_AUTO_TEST_CASE(BlockPolicyEstimates)
         while(txHashes[j].size()) {
             std::shared_ptr<const CTransaction> ptx = mpool.get(txHashes[j].back());
             if (ptx)
-                block.push_back(*ptx);
+                block.push_back(ptx);
             txHashes[j].pop_back();
         }
     }
@@ -165,7 +165,7 @@ BOOST_AUTO_TEST_CASE(BlockPolicyEstimates)
                 mpool.addUnchecked(hash, entry.Fee(feeV[j]).Time(GetTime()).Priority(0).Height(blocknum).FromTx(tx, &mpool));
                 std::shared_ptr<const CTransaction> ptx = mpool.get(hash);
                 if (ptx)
-                    block.push_back(*ptx);
+                    block.push_back(ptx);
 
             }
         }
diff --git a/src/test/test_bitcoin.cpp b/src/test/test_bitcoin.cpp
index 3f7416f23f99d..f932cbe23814f 100644
--- a/src/test/test_bitcoin.cpp
+++ b/src/test/test_bitcoin.cpp
@@ -101,7 +101,7 @@ TestChain100Setup::TestChain100Setup() : TestingSetup(CBaseChainParams::REGTEST)
     {
         std::vector<CMutableTransaction> noTxns;
         CBlock b = CreateAndProcessBlock(noTxns, scriptPubKey);
-        coinbaseTxns.push_back(b.vtx[0]);
+        coinbaseTxns.push_back(*b.vtx[0]);
     }
 }
 
@@ -119,7 +119,7 @@ TestChain100Setup::CreateAndProcessBlock(const std::vector<CMutableTransaction>&
     // Replace mempool-selected txns with just coinbase plus passed-in txns:
     block.vtx.resize(1);
     BOOST_FOREACH(const CMutableTransaction& tx, txns)
-        block.vtx.push_back(tx);
+        block.vtx.push_back(std::make_shared<const CTransaction>(tx));
     // IncrementExtraNonce creates a valid coinbase and merkleRoot
     unsigned int extraNonce = 0;
     IncrementExtraNonce(&block, chainActive.Tip(), extraNonce);
@@ -137,12 +137,12 @@ TestChain100Setup::~TestChain100Setup()
 }
 
 
-CTxMemPoolEntry TestMemPoolEntryHelper::FromTx(CMutableTransaction &tx, CTxMemPool *pool) {
+CTxMemPoolEntry TestMemPoolEntryHelper::FromTx(const CMutableTransaction &tx, CTxMemPool *pool) {
     CTransaction txn(tx);
     return FromTx(txn, pool);
 }
 
-CTxMemPoolEntry TestMemPoolEntryHelper::FromTx(CTransaction &txn, CTxMemPool *pool) {
+CTxMemPoolEntry TestMemPoolEntryHelper::FromTx(const CTransaction &txn, CTxMemPool *pool) {
     bool hasNoDependencies = pool ? pool->HasNoInputsOf(txn) : hadNoDependencies;
     // Hack to assume either its completely dependent on other mempool txs or not at all
     CAmount inChainValue = hasNoDependencies ? txn.GetValueOut() : 0;
diff --git a/src/test/test_bitcoin.h b/src/test/test_bitcoin.h
index 9819a7097dc75..3dea20445d82a 100644
--- a/src/test/test_bitcoin.h
+++ b/src/test/test_bitcoin.h
@@ -79,8 +79,8 @@ struct TestMemPoolEntryHelper
         nFee(0), nTime(0), dPriority(0.0), nHeight(1),
         hadNoDependencies(false), spendsCoinbase(false), sigOpCost(4) { }
     
-    CTxMemPoolEntry FromTx(CMutableTransaction &tx, CTxMemPool *pool = NULL);
-    CTxMemPoolEntry FromTx(CTransaction &tx, CTxMemPool *pool = NULL);
+    CTxMemPoolEntry FromTx(const CMutableTransaction &tx, CTxMemPool *pool = NULL);
+    CTxMemPoolEntry FromTx(const CTransaction &tx, CTxMemPool *pool = NULL);
 
     // Change the default value
     TestMemPoolEntryHelper &Fee(CAmount _fee) { nFee = _fee; return *this; }
diff --git a/src/txmempool.cpp b/src/txmempool.cpp
index 45135a5f7347c..fff20a609deac 100644
--- a/src/txmempool.cpp
+++ b/src/txmempool.cpp
@@ -596,29 +596,29 @@ void CTxMemPool::removeConflicts(const CTransaction &tx, std::vector<std::shared
 /**
  * Called when a block is connected. Removes from mempool and updates the miner fee estimator.
  */
-void CTxMemPool::removeForBlock(const std::vector<CTransaction>& vtx, unsigned int nBlockHeight,
+void CTxMemPool::removeForBlock(const std::vector<shared_ptr<const CTransaction>>& vtx, unsigned int nBlockHeight,
                                 std::vector<std::shared_ptr<const CTransaction>>* conflicts, bool fCurrentEstimate)
 {
     LOCK(cs);
     std::vector<CTxMemPoolEntry> entries;
-    BOOST_FOREACH(const CTransaction& tx, vtx)
+    for (const auto& tx : vtx)
     {
-        uint256 hash = tx.GetHash();
+        uint256 hash = tx->GetHash();
 
         indexed_transaction_set::iterator i = mapTx.find(hash);
         if (i != mapTx.end())
             entries.push_back(*i);
     }
-    BOOST_FOREACH(const CTransaction& tx, vtx)
+    for (const auto& tx : vtx)
     {
-        txiter it = mapTx.find(tx.GetHash());
+        txiter it = mapTx.find(tx->GetHash());
         if (it != mapTx.end()) {
             setEntries stage;
             stage.insert(it);
             RemoveStaged(stage, true);
         }
-        removeConflicts(tx, conflicts);
-        ClearPrioritisation(tx.GetHash());
+        removeConflicts(*tx, conflicts);
+        ClearPrioritisation(tx->GetHash());
     }
     // After the txs in the new block have been removed from the mempool, update policy estimates
     minerPolicyEstimator->processBlock(nBlockHeight, entries, fCurrentEstimate);
diff --git a/src/txmempool.h b/src/txmempool.h
index 9b0ca4655ec3f..6952cc9006f0d 100644
--- a/src/txmempool.h
+++ b/src/txmempool.h
@@ -530,7 +530,7 @@ class CTxMemPool
     void removeRecursive(const CTransaction &tx, std::vector<std::shared_ptr<const CTransaction>>* removed = NULL);
     void removeForReorg(const CCoinsViewCache *pcoins, unsigned int nMemPoolHeight, int flags);
     void removeConflicts(const CTransaction &tx, std::vector<std::shared_ptr<const CTransaction>>* removed = NULL);
-    void removeForBlock(const std::vector<CTransaction>& vtx, unsigned int nBlockHeight,
+    void removeForBlock(const std::vector<std::shared_ptr<const CTransaction>>& vtx, unsigned int nBlockHeight,
                         std::vector<std::shared_ptr<const CTransaction>>* conflicts = NULL, bool fCurrentEstimate = true);
     void clear();
     void _clear(); //lock free
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index 3e18cb702cdd2..2e512fd57f125 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -1492,7 +1492,7 @@ int CWallet::ScanForWalletTransactions(CBlockIndex* pindexStart, bool fUpdate)
             int posInBlock;
             for (posInBlock = 0; posInBlock < (int)block.vtx.size(); posInBlock++)
             {
-                if (AddToWalletIfInvolvingMe(block.vtx[posInBlock], pindex, posInBlock, fUpdate))
+                if (AddToWalletIfInvolvingMe(*block.vtx[posInBlock], pindex, posInBlock, fUpdate))
                     ret++;
             }
             pindex = chainActive.Next(pindex);

From b4e4ba475a5679e09f279aaf2a83dcf93c632bdb Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Thu, 10 Nov 2016 17:34:17 -0800
Subject: [PATCH 1235/1802] Introduce convenience type CTransactionRef

---
 src/blockencodings.cpp             |  2 +-
 src/blockencodings.h               | 12 ++++++------
 src/chainparams.cpp                |  2 +-
 src/main.cpp                       | 14 +++++++-------
 src/miner.cpp                      |  4 ++--
 src/primitives/block.h             |  2 +-
 src/primitives/transaction.h       |  6 ++++++
 src/test/blockencodings_tests.cpp  | 18 +++++++++---------
 src/test/mempool_tests.cpp         |  8 ++++----
 src/test/merkle_tests.cpp          |  4 ++--
 src/test/miner_tests.cpp           |  6 +++---
 src/test/pmt_tests.cpp             |  2 +-
 src/test/policyestimator_tests.cpp |  8 ++++----
 src/test/test_bitcoin.cpp          |  2 +-
 src/txmempool.cpp                  | 14 +++++++-------
 src/txmempool.h                    | 16 ++++++++--------
 16 files changed, 63 insertions(+), 57 deletions(-)

diff --git a/src/blockencodings.cpp b/src/blockencodings.cpp
index fac52474ec7f8..f14ae1c412fe7 100644
--- a/src/blockencodings.cpp
+++ b/src/blockencodings.cpp
@@ -142,7 +142,7 @@ bool PartiallyDownloadedBlock::IsTxAvailable(size_t index) const {
     return txn_available[index] ? true : false;
 }
 
-ReadStatus PartiallyDownloadedBlock::FillBlock(CBlock& block, const std::vector<std::shared_ptr<const CTransaction>>& vtx_missing) const {
+ReadStatus PartiallyDownloadedBlock::FillBlock(CBlock& block, const std::vector<CTransactionRef>& vtx_missing) const {
     assert(!header.IsNull());
     block = header;
     block.vtx.resize(txn_available.size());
diff --git a/src/blockencodings.h b/src/blockencodings.h
index ffe189a940ba2..27baf1f8f8263 100644
--- a/src/blockencodings.h
+++ b/src/blockencodings.h
@@ -14,9 +14,9 @@ class CTxMemPool;
 // Dumb helper to handle CTransaction compression at serialize-time
 struct TransactionCompressor {
 private:
-    std::shared_ptr<const CTransaction>& tx;
+    CTransactionRef& tx;
 public:
-    TransactionCompressor(std::shared_ptr<const CTransaction>& txIn) : tx(txIn) {}
+    TransactionCompressor(CTransactionRef& txIn) : tx(txIn) {}
 
     ADD_SERIALIZE_METHODS;
 
@@ -72,7 +72,7 @@ class BlockTransactions {
 public:
     // A BlockTransactions message
     uint256 blockhash;
-    std::vector<std::shared_ptr<const CTransaction>> txn;
+    std::vector<CTransactionRef> txn;
 
     BlockTransactions() {}
     BlockTransactions(const BlockTransactionsRequest& req) :
@@ -104,7 +104,7 @@ struct PrefilledTransaction {
     // Used as an offset since last prefilled tx in CBlockHeaderAndShortTxIDs,
     // as a proper transaction-in-block-index in PartiallyDownloadedBlock
     uint16_t index;
-    std::shared_ptr<const CTransaction> tx;
+    CTransactionRef tx;
 
     ADD_SERIALIZE_METHODS;
 
@@ -193,7 +193,7 @@ class CBlockHeaderAndShortTxIDs {
 
 class PartiallyDownloadedBlock {
 protected:
-    std::vector<std::shared_ptr<const CTransaction> > txn_available;
+    std::vector<CTransactionRef> txn_available;
     size_t prefilled_count = 0, mempool_count = 0;
     CTxMemPool* pool;
 public:
@@ -202,7 +202,7 @@ class PartiallyDownloadedBlock {
 
     ReadStatus InitData(const CBlockHeaderAndShortTxIDs& cmpctblock);
     bool IsTxAvailable(size_t index) const;
-    ReadStatus FillBlock(CBlock& block, const std::vector<std::shared_ptr<const CTransaction>>& vtx_missing) const;
+    ReadStatus FillBlock(CBlock& block, const std::vector<CTransactionRef>& vtx_missing) const;
 };
 
 #endif
diff --git a/src/chainparams.cpp b/src/chainparams.cpp
index 77eb586b67ece..3b3c0a5d3e2b0 100644
--- a/src/chainparams.cpp
+++ b/src/chainparams.cpp
@@ -31,7 +31,7 @@ static CBlock CreateGenesisBlock(const char* pszTimestamp, const CScript& genesi
     genesis.nBits    = nBits;
     genesis.nNonce   = nNonce;
     genesis.nVersion = nVersion;
-    genesis.vtx.push_back(std::make_shared<const CTransaction>(std::move(txNew)));
+    genesis.vtx.push_back(MakeTransactionRef(std::move(txNew)));
     genesis.hashPrevBlock.SetNull();
     genesis.hashMerkleRoot = BlockMerkleRoot(genesis);
     return genesis;
diff --git a/src/main.cpp b/src/main.cpp
index 7b84ab7ba1a89..aeeb31ec40097 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -233,7 +233,7 @@ namespace {
     int nPeersWithValidatedDownloads = 0;
 
     /** Relay map, protected by cs_main. */
-    typedef std::map<uint256, std::shared_ptr<const CTransaction>> MapRelay;
+    typedef std::map<uint256, CTransactionRef> MapRelay;
     MapRelay mapRelay;
     /** Expiration-time ordered list of (expire time, relay map entry) pairs, protected by cs_main). */
     std::deque<std::pair<int64_t, MapRelay::iterator>> vRelayExpiration;
@@ -1639,7 +1639,7 @@ bool GetTransaction(const uint256 &hash, CTransaction &txOut, const Consensus::P
 
     LOCK(cs_main);
 
-    std::shared_ptr<const CTransaction> ptx = mempool.get(hash);
+    CTransactionRef ptx = mempool.get(hash);
     if (ptx)
     {
         txOut = *ptx;
@@ -2845,7 +2845,7 @@ static int64_t nTimePostConnect = 0;
  * Connect a new block to chainActive. pblock is either NULL or a pointer to a CBlock
  * corresponding to pindexNew, to bypass loading it again from disk.
  */
-bool static ConnectTip(CValidationState& state, const CChainParams& chainparams, CBlockIndex* pindexNew, const CBlock* pblock, std::vector<std::shared_ptr<const CTransaction>> &txConflicted, std::vector<std::tuple<std::shared_ptr<const CTransaction>,CBlockIndex*,int>> &txChanged)
+bool static ConnectTip(CValidationState& state, const CChainParams& chainparams, CBlockIndex* pindexNew, const CBlock* pblock, std::vector<CTransactionRef> &txConflicted, std::vector<std::tuple<CTransactionRef,CBlockIndex*,int>> &txChanged)
 {
     assert(pindexNew->pprev == chainActive.Tip());
     // Read block from disk.
@@ -2968,7 +2968,7 @@ static void PruneBlockIndexCandidates() {
  * Try to make some progress towards making pindexMostWork the active block.
  * pblock is either NULL or a pointer to a CBlock corresponding to pindexMostWork.
  */
-static bool ActivateBestChainStep(CValidationState& state, const CChainParams& chainparams, CBlockIndex* pindexMostWork, const CBlock* pblock, bool& fInvalidFound, std::vector<std::shared_ptr<const CTransaction>>& txConflicted, std::vector<std::tuple<std::shared_ptr<const CTransaction>,CBlockIndex*,int>>& txChanged)
+static bool ActivateBestChainStep(CValidationState& state, const CChainParams& chainparams, CBlockIndex* pindexMostWork, const CBlock* pblock, bool& fInvalidFound, std::vector<CTransactionRef>& txConflicted, std::vector<std::tuple<CTransactionRef,CBlockIndex*,int>>& txChanged)
 {
     AssertLockHeld(cs_main);
     const CBlockIndex *pindexOldTip = chainActive.Tip();
@@ -3069,7 +3069,7 @@ static void NotifyHeaderTip() {
 bool ActivateBestChain(CValidationState &state, const CChainParams& chainparams, const CBlock *pblock) {
     CBlockIndex *pindexMostWork = NULL;
     CBlockIndex *pindexNewTip = NULL;
-    std::vector<std::tuple<std::shared_ptr<const CTransaction>,CBlockIndex*,int>> txChanged;
+    std::vector<std::tuple<CTransactionRef,CBlockIndex*,int>> txChanged;
     if (pblock)
         txChanged.reserve(pblock->vtx.size());
     do {
@@ -3079,7 +3079,7 @@ bool ActivateBestChain(CValidationState &state, const CChainParams& chainparams,
             break;
 
         const CBlockIndex *pindexFork;
-        std::vector<std::shared_ptr<const CTransaction>> txConflicted;
+        std::vector<CTransactionRef> txConflicted;
         bool fInitialDownload;
         {
             LOCK(cs_main);
@@ -3523,7 +3523,7 @@ void UpdateUncommittedBlockStructures(CBlock& block, const CBlockIndex* pindexPr
         tx.wit.vtxinwit.resize(1);
         tx.wit.vtxinwit[0].scriptWitness.stack.resize(1);
         tx.wit.vtxinwit[0].scriptWitness.stack[0] = nonce;
-        block.vtx[0] = std::make_shared<const CTransaction>(std::move(tx));
+        block.vtx[0] = MakeTransactionRef(std::move(tx));
     }
 }
 
diff --git a/src/miner.cpp b/src/miner.cpp
index 2b65cbc65e9e3..c40b12cd8ec11 100644
--- a/src/miner.cpp
+++ b/src/miner.cpp
@@ -178,7 +178,7 @@ std::unique_ptr<CBlockTemplate> BlockAssembler::CreateNewBlock(const CScript& sc
     coinbaseTx.vout[0].scriptPubKey = scriptPubKeyIn;
     coinbaseTx.vout[0].nValue = nFees + GetBlockSubsidy(nHeight, chainparams.GetConsensus());
     coinbaseTx.vin[0].scriptSig = CScript() << nHeight << OP_0;
-    pblock->vtx[0] = std::make_shared<const CTransaction>(std::move(coinbaseTx));
+    pblock->vtx[0] = MakeTransactionRef(std::move(coinbaseTx));
     pblocktemplate->vchCoinbaseCommitment = GenerateCoinbaseCommitment(*pblock, pindexPrev, chainparams.GetConsensus());
     pblocktemplate->vTxFees[0] = -nFees;
 
@@ -605,6 +605,6 @@ void IncrementExtraNonce(CBlock* pblock, const CBlockIndex* pindexPrev, unsigned
     txCoinbase.vin[0].scriptSig = (CScript() << nHeight << CScriptNum(nExtraNonce)) + COINBASE_FLAGS;
     assert(txCoinbase.vin[0].scriptSig.size() <= 100);
 
-    pblock->vtx[0] = std::make_shared<const CTransaction>(std::move(txCoinbase));
+    pblock->vtx[0] = MakeTransactionRef(std::move(txCoinbase));
     pblock->hashMerkleRoot = BlockMerkleRoot(*pblock);
 }
diff --git a/src/primitives/block.h b/src/primitives/block.h
index 45b4895eba06b..b037fc839c9d9 100644
--- a/src/primitives/block.h
+++ b/src/primitives/block.h
@@ -73,7 +73,7 @@ class CBlock : public CBlockHeader
 {
 public:
     // network and disk
-    std::vector<std::shared_ptr<const CTransaction>> vtx;
+    std::vector<CTransactionRef> vtx;
 
     // memory only
     mutable bool fChecked;
diff --git a/src/primitives/transaction.h b/src/primitives/transaction.h
index 015a89ff107fa..0fa85a15195a0 100644
--- a/src/primitives/transaction.h
+++ b/src/primitives/transaction.h
@@ -475,6 +475,12 @@ struct CMutableTransaction
     uint256 GetHash() const;
 };
 
+typedef std::shared_ptr<const CTransaction> CTransactionRef;
+static inline CTransactionRef MakeTransactionRef() { return std::make_shared<const CTransaction>(); }
+template <typename Tx> static inline CTransactionRef MakeTransactionRef(Tx&& txIn) { return std::make_shared<const CTransaction>(std::forward<Tx>(txIn)); }
+static inline CTransactionRef MakeTransactionRef(const CTransactionRef& txIn) { return txIn; }
+static inline CTransactionRef MakeTransactionRef(CTransactionRef&& txIn) { return std::move(txIn); }
+
 /** Compute the weight of a transaction, as defined by BIP 141 */
 int64_t GetTransactionWeight(const CTransaction &tx);
 
diff --git a/src/test/blockencodings_tests.cpp b/src/test/blockencodings_tests.cpp
index 6899bd6328681..b013cda6d7a63 100644
--- a/src/test/blockencodings_tests.cpp
+++ b/src/test/blockencodings_tests.cpp
@@ -26,21 +26,21 @@ static CBlock BuildBlockTestCase() {
     tx.vout[0].nValue = 42;
 
     block.vtx.resize(3);
-    block.vtx[0] = std::make_shared<const CTransaction>(tx);
+    block.vtx[0] = MakeTransactionRef(tx);
     block.nVersion = 42;
     block.hashPrevBlock = GetRandHash();
     block.nBits = 0x207fffff;
 
     tx.vin[0].prevout.hash = GetRandHash();
     tx.vin[0].prevout.n = 0;
-    block.vtx[1] = std::make_shared<const CTransaction>(tx);
+    block.vtx[1] = MakeTransactionRef(tx);
 
     tx.vin.resize(10);
     for (size_t i = 0; i < tx.vin.size(); i++) {
         tx.vin[i].prevout.hash = GetRandHash();
         tx.vin[i].prevout.n = 0;
     }
-    block.vtx[2] = std::make_shared<const CTransaction>(tx);
+    block.vtx[2] = MakeTransactionRef(tx);
 
     bool mutated;
     block.hashMerkleRoot = BlockMerkleRoot(block, &mutated);
@@ -80,12 +80,12 @@ BOOST_AUTO_TEST_CASE(SimpleRoundTripTest)
 
         BOOST_CHECK_EQUAL(pool.mapTx.find(block.vtx[2]->GetHash())->GetSharedTx().use_count(), SHARED_TX_OFFSET + 1);
 
-        std::vector<std::shared_ptr<const CTransaction>> removed;
+        std::vector<CTransactionRef> removed;
         pool.removeRecursive(*block.vtx[2], &removed);
         BOOST_CHECK_EQUAL(removed.size(), 1);
 
         CBlock block2;
-        std::vector<std::shared_ptr<const CTransaction>> vtx_missing;
+        std::vector<CTransactionRef> vtx_missing;
         BOOST_CHECK(partialBlock.FillBlock(block2, vtx_missing) == READ_STATUS_INVALID); // No transactions
 
         vtx_missing.push_back(block.vtx[2]); // Wrong transaction
@@ -181,7 +181,7 @@ BOOST_AUTO_TEST_CASE(NonCoinbasePreforwardRTTest)
         BOOST_CHECK_EQUAL(pool.mapTx.find(block.vtx[2]->GetHash())->GetSharedTx().use_count(), SHARED_TX_OFFSET + 1);
 
         CBlock block2;
-        std::vector<std::shared_ptr<const CTransaction>> vtx_missing;
+        std::vector<CTransactionRef> vtx_missing;
         BOOST_CHECK(partialBlock.FillBlock(block2, vtx_missing) == READ_STATUS_INVALID); // No transactions
 
         vtx_missing.push_back(block.vtx[1]); // Wrong transaction
@@ -240,7 +240,7 @@ BOOST_AUTO_TEST_CASE(SufficientPreforwardRTTest)
         BOOST_CHECK_EQUAL(pool.mapTx.find(block.vtx[1]->GetHash())->GetSharedTx().use_count(), SHARED_TX_OFFSET + 1);
 
         CBlock block2;
-        std::vector<std::shared_ptr<const CTransaction>> vtx_missing;
+        std::vector<CTransactionRef> vtx_missing;
         BOOST_CHECK(partialBlock.FillBlock(block2, vtx_missing) == READ_STATUS_OK);
         BOOST_CHECK_EQUAL(block.GetHash().ToString(), block2.GetHash().ToString());
         bool mutated;
@@ -266,7 +266,7 @@ BOOST_AUTO_TEST_CASE(EmptyBlockRoundTripTest)
 
     CBlock block;
     block.vtx.resize(1);
-    block.vtx[0] = std::make_shared<const CTransaction>(std::move(coinbase));
+    block.vtx[0] = MakeTransactionRef(std::move(coinbase));
     block.nVersion = 42;
     block.hashPrevBlock = GetRandHash();
     block.nBits = 0x207fffff;
@@ -291,7 +291,7 @@ BOOST_AUTO_TEST_CASE(EmptyBlockRoundTripTest)
         BOOST_CHECK(partialBlock.IsTxAvailable(0));
 
         CBlock block2;
-        std::vector<std::shared_ptr<const CTransaction>> vtx_missing;
+        std::vector<CTransactionRef> vtx_missing;
         BOOST_CHECK(partialBlock.FillBlock(block2, vtx_missing) == READ_STATUS_OK);
         BOOST_CHECK_EQUAL(block.GetHash().ToString(), block2.GetHash().ToString());
         BOOST_CHECK_EQUAL(block.hashMerkleRoot.ToString(), BlockMerkleRoot(block2, &mutated).ToString());
diff --git a/src/test/mempool_tests.cpp b/src/test/mempool_tests.cpp
index 4a6a060012154..1faf8b6aeb66b 100644
--- a/src/test/mempool_tests.cpp
+++ b/src/test/mempool_tests.cpp
@@ -55,7 +55,7 @@ BOOST_AUTO_TEST_CASE(MempoolRemoveTest)
 
 
     CTxMemPool testPool(CFeeRate(0));
-    std::vector<std::shared_ptr<const CTransaction>> removed;
+    std::vector<CTransactionRef> removed;
 
     // Nothing in pool, remove should do nothing:
     testPool.removeRecursive(txParent, &removed);
@@ -410,8 +410,8 @@ BOOST_AUTO_TEST_CASE(MempoolAncestorIndexingTest)
     CheckSort<ancestor_score>(pool, sortedOrder);
 
     /* after tx6 is mined, tx7 should move up in the sort */
-    std::vector<std::shared_ptr<const CTransaction>> vtx;
-    vtx.push_back(std::make_shared<const CTransaction>(tx6));
+    std::vector<CTransactionRef> vtx;
+    vtx.push_back(MakeTransactionRef(tx6));
     pool.removeForBlock(vtx, 1, NULL, false);
 
     sortedOrder.erase(sortedOrder.begin()+1);
@@ -546,7 +546,7 @@ BOOST_AUTO_TEST_CASE(MempoolSizeLimitTest)
     pool.addUnchecked(tx5.GetHash(), entry.Fee(1000LL).FromTx(tx5, &pool));
     pool.addUnchecked(tx7.GetHash(), entry.Fee(9000LL).FromTx(tx7, &pool));
 
-    std::vector<std::shared_ptr<const CTransaction>> vtx;
+    std::vector<CTransactionRef> vtx;
     SetMockTime(42);
     SetMockTime(42 + CTxMemPool::ROLLING_FEE_HALFLIFE);
     BOOST_CHECK_EQUAL(pool.GetMinFee(1).GetFeePerK(), maxFeeRateRemoved.GetFeePerK() + 1000);
diff --git a/src/test/merkle_tests.cpp b/src/test/merkle_tests.cpp
index 8aea571e127d6..55e6852a159be 100644
--- a/src/test/merkle_tests.cpp
+++ b/src/test/merkle_tests.cpp
@@ -15,7 +15,7 @@ static uint256 BlockBuildMerkleTree(const CBlock& block, bool* fMutated, std::ve
 {
     vMerkleTree.clear();
     vMerkleTree.reserve(block.vtx.size() * 2 + 16); // Safe upper bound for the number of total nodes.
-    for (std::vector<std::shared_ptr<const CTransaction>>::const_iterator it(block.vtx.begin()); it != block.vtx.end(); ++it)
+    for (std::vector<CTransactionRef>::const_iterator it(block.vtx.begin()); it != block.vtx.end(); ++it)
         vMerkleTree.push_back((*it)->GetHash());
     int j = 0;
     bool mutated = false;
@@ -86,7 +86,7 @@ BOOST_AUTO_TEST_CASE(merkle_test)
             for (int j = 0; j < ntx; j++) {
                 CMutableTransaction mtx;
                 mtx.nLockTime = j;
-                block.vtx[j] = std::make_shared<const CTransaction>(mtx);
+                block.vtx[j] = MakeTransactionRef(std::move(mtx));
             }
             // Compute the root of the block before mutating it.
             bool unmutatedMutated = false;
diff --git a/src/test/miner_tests.cpp b/src/test/miner_tests.cpp
index 56dab347fb41c..aea8920936b37 100644
--- a/src/test/miner_tests.cpp
+++ b/src/test/miner_tests.cpp
@@ -77,7 +77,7 @@ bool TestSequenceLocks(const CTransaction &tx, int flags)
 // Implemented as an additional function, rather than a separate test case,
 // to allow reusing the blockchain created in CreateNewBlock_validity.
 // Note that this test assumes blockprioritysize is 0.
-void TestPackageSelection(const CChainParams& chainparams, CScript scriptPubKey, std::vector<std::shared_ptr<const CTransaction>>& txFirst)
+void TestPackageSelection(const CChainParams& chainparams, CScript scriptPubKey, std::vector<CTransactionRef>& txFirst)
 {
     // Test the ancestor feerate transaction selection.
     TestMemPoolEntryHelper entry;
@@ -203,7 +203,7 @@ BOOST_AUTO_TEST_CASE(CreateNewBlock_validity)
     // We can't make transactions until we have inputs
     // Therefore, load 100 blocks :)
     int baseheight = 0;
-    std::vector<std::shared_ptr<const CTransaction>> txFirst;
+    std::vector<CTransactionRef> txFirst;
     for (unsigned int i = 0; i < sizeof(blockinfo)/sizeof(*blockinfo); ++i)
     {
         CBlock *pblock = &pblocktemplate->block; // pointer for convenience
@@ -215,7 +215,7 @@ BOOST_AUTO_TEST_CASE(CreateNewBlock_validity)
         txCoinbase.vin[0].scriptSig.push_back(blockinfo[i].extranonce);
         txCoinbase.vin[0].scriptSig.push_back(chainActive.Height());
         txCoinbase.vout[0].scriptPubKey = CScript();
-        pblock->vtx[0] = std::make_shared<const CTransaction>(std::move(txCoinbase));
+        pblock->vtx[0] = MakeTransactionRef(std::move(txCoinbase));
         if (txFirst.size() == 0)
             baseheight = chainActive.Height();
         if (txFirst.size() < 4)
diff --git a/src/test/pmt_tests.cpp b/src/test/pmt_tests.cpp
index 1552cb4bafbd8..e6b689bc6ca9e 100644
--- a/src/test/pmt_tests.cpp
+++ b/src/test/pmt_tests.cpp
@@ -45,7 +45,7 @@ BOOST_AUTO_TEST_CASE(pmt_test1)
         for (unsigned int j=0; j<nTx; j++) {
             CMutableTransaction tx;
             tx.nLockTime = j; // actual transaction data doesn't matter; just make the nLockTime's unique
-            block.vtx.push_back(std::make_shared<const CTransaction>(tx));
+            block.vtx.push_back(MakeTransactionRef(std::move(tx)));
         }
 
         // calculate actual merkle root and height
diff --git a/src/test/policyestimator_tests.cpp b/src/test/policyestimator_tests.cpp
index 08e5e774e1345..7dc8f226c93a9 100644
--- a/src/test/policyestimator_tests.cpp
+++ b/src/test/policyestimator_tests.cpp
@@ -45,7 +45,7 @@ BOOST_AUTO_TEST_CASE(BlockPolicyEstimates)
     CFeeRate baseRate(basefee, GetVirtualTransactionSize(tx));
 
     // Create a fake block
-    std::vector<std::shared_ptr<const CTransaction>> block;
+    std::vector<CTransactionRef> block;
     int blocknum = 0;
 
     // Loop through 200 blocks
@@ -66,7 +66,7 @@ BOOST_AUTO_TEST_CASE(BlockPolicyEstimates)
             // 9/10 blocks add 2nd highest and so on until ...
             // 1/10 blocks add lowest fee transactions
             while (txHashes[9-h].size()) {
-                std::shared_ptr<const CTransaction> ptx = mpool.get(txHashes[9-h].back());
+                CTransactionRef ptx = mpool.get(txHashes[9-h].back());
                 if (ptx)
                     block.push_back(ptx);
                 txHashes[9-h].pop_back();
@@ -143,7 +143,7 @@ BOOST_AUTO_TEST_CASE(BlockPolicyEstimates)
     // Estimates should still not be below original
     for (int j = 0; j < 10; j++) {
         while(txHashes[j].size()) {
-            std::shared_ptr<const CTransaction> ptx = mpool.get(txHashes[j].back());
+            CTransactionRef ptx = mpool.get(txHashes[j].back());
             if (ptx)
                 block.push_back(ptx);
             txHashes[j].pop_back();
@@ -163,7 +163,7 @@ BOOST_AUTO_TEST_CASE(BlockPolicyEstimates)
                 tx.vin[0].prevout.n = 10000*blocknum+100*j+k;
                 uint256 hash = tx.GetHash();
                 mpool.addUnchecked(hash, entry.Fee(feeV[j]).Time(GetTime()).Priority(0).Height(blocknum).FromTx(tx, &mpool));
-                std::shared_ptr<const CTransaction> ptx = mpool.get(hash);
+                CTransactionRef ptx = mpool.get(hash);
                 if (ptx)
                     block.push_back(ptx);
 
diff --git a/src/test/test_bitcoin.cpp b/src/test/test_bitcoin.cpp
index f932cbe23814f..6cbe314a76515 100644
--- a/src/test/test_bitcoin.cpp
+++ b/src/test/test_bitcoin.cpp
@@ -119,7 +119,7 @@ TestChain100Setup::CreateAndProcessBlock(const std::vector<CMutableTransaction>&
     // Replace mempool-selected txns with just coinbase plus passed-in txns:
     block.vtx.resize(1);
     BOOST_FOREACH(const CMutableTransaction& tx, txns)
-        block.vtx.push_back(std::make_shared<const CTransaction>(tx));
+        block.vtx.push_back(MakeTransactionRef(tx));
     // IncrementExtraNonce creates a valid coinbase and merkleRoot
     unsigned int extraNonce = 0;
     IncrementExtraNonce(&block, chainActive.Tip(), extraNonce);
diff --git a/src/txmempool.cpp b/src/txmempool.cpp
index fff20a609deac..417a88cbef013 100644
--- a/src/txmempool.cpp
+++ b/src/txmempool.cpp
@@ -24,7 +24,7 @@ CTxMemPoolEntry::CTxMemPoolEntry(const CTransaction& _tx, const CAmount& _nFee,
                                  int64_t _nTime, double _entryPriority, unsigned int _entryHeight,
                                  bool poolHasNoInputsOf, CAmount _inChainInputValue,
                                  bool _spendsCoinbase, int64_t _sigOpsCost, LockPoints lp):
-    tx(std::make_shared<CTransaction>(_tx)), nFee(_nFee), nTime(_nTime), entryPriority(_entryPriority), entryHeight(_entryHeight),
+    tx(MakeTransactionRef(_tx)), nFee(_nFee), nTime(_nTime), entryPriority(_entryPriority), entryHeight(_entryHeight),
     hadNoDependencies(poolHasNoInputsOf), inChainInputValue(_inChainInputValue),
     spendsCoinbase(_spendsCoinbase), sigOpCost(_sigOpsCost), lockPoints(lp)
 {
@@ -503,7 +503,7 @@ void CTxMemPool::CalculateDescendants(txiter entryit, setEntries &setDescendants
     }
 }
 
-void CTxMemPool::removeRecursive(const CTransaction &origTx, std::vector<std::shared_ptr<const CTransaction>>* removed)
+void CTxMemPool::removeRecursive(const CTransaction &origTx, std::vector<CTransactionRef>* removed)
 {
     // Remove transaction from memory pool
     {
@@ -576,7 +576,7 @@ void CTxMemPool::removeForReorg(const CCoinsViewCache *pcoins, unsigned int nMem
     RemoveStaged(setAllRemoves, false);
 }
 
-void CTxMemPool::removeConflicts(const CTransaction &tx, std::vector<std::shared_ptr<const CTransaction>>* removed)
+void CTxMemPool::removeConflicts(const CTransaction &tx, std::vector<CTransactionRef>* removed)
 {
     // Remove transactions which depend on inputs of tx, recursively
     LOCK(cs);
@@ -596,8 +596,8 @@ void CTxMemPool::removeConflicts(const CTransaction &tx, std::vector<std::shared
 /**
  * Called when a block is connected. Removes from mempool and updates the miner fee estimator.
  */
-void CTxMemPool::removeForBlock(const std::vector<shared_ptr<const CTransaction>>& vtx, unsigned int nBlockHeight,
-                                std::vector<std::shared_ptr<const CTransaction>>* conflicts, bool fCurrentEstimate)
+void CTxMemPool::removeForBlock(const std::vector<CTransactionRef>& vtx, unsigned int nBlockHeight,
+                                std::vector<CTransactionRef>* conflicts, bool fCurrentEstimate)
 {
     LOCK(cs);
     std::vector<CTxMemPoolEntry> entries;
@@ -851,7 +851,7 @@ std::vector<TxMempoolInfo> CTxMemPool::infoAll() const
     return ret;
 }
 
-std::shared_ptr<const CTransaction> CTxMemPool::get(const uint256& hash) const
+CTransactionRef CTxMemPool::get(const uint256& hash) const
 {
     LOCK(cs);
     indexed_transaction_set::const_iterator i = mapTx.find(hash);
@@ -978,7 +978,7 @@ bool CCoinsViewMemPool::GetCoins(const uint256 &txid, CCoins &coins) const {
     // If an entry in the mempool exists, always return that one, as it's guaranteed to never
     // conflict with the underlying cache, and it cannot have pruned entries (as it contains full)
     // transactions. First checking the underlying cache risks returning a pruned entry instead.
-    shared_ptr<const CTransaction> ptx = mempool.get(txid);
+    CTransactionRef ptx = mempool.get(txid);
     if (ptx) {
         coins = CCoins(*ptx, MEMPOOL_HEIGHT);
         return true;
diff --git a/src/txmempool.h b/src/txmempool.h
index 6952cc9006f0d..29b59363a2eb4 100644
--- a/src/txmempool.h
+++ b/src/txmempool.h
@@ -80,7 +80,7 @@ class CTxMemPool;
 class CTxMemPoolEntry
 {
 private:
-    std::shared_ptr<const CTransaction> tx;
+    CTransactionRef tx;
     CAmount nFee;              //!< Cached to avoid expensive parent-transaction lookups
     size_t nTxWeight;          //!< ... and avoid recomputing tx weight (also used for GetTxSize())
     size_t nModSize;           //!< ... and modified size for priority
@@ -118,7 +118,7 @@ class CTxMemPoolEntry
     CTxMemPoolEntry(const CTxMemPoolEntry& other);
 
     const CTransaction& GetTx() const { return *this->tx; }
-    std::shared_ptr<const CTransaction> GetSharedTx() const { return this->tx; }
+    CTransactionRef GetSharedTx() const { return this->tx; }
     /**
      * Fast calculation of lower bound of current priority as update
      * from entry priority. Only inputs that were originally in-chain will age.
@@ -322,7 +322,7 @@ class CBlockPolicyEstimator;
 struct TxMempoolInfo
 {
     /** The transaction itself */
-    std::shared_ptr<const CTransaction> tx;
+    CTransactionRef tx;
 
     /** Time the transaction entered the mempool. */
     int64_t nTime;
@@ -527,11 +527,11 @@ class CTxMemPool
     bool addUnchecked(const uint256& hash, const CTxMemPoolEntry &entry, bool fCurrentEstimate = true);
     bool addUnchecked(const uint256& hash, const CTxMemPoolEntry &entry, setEntries &setAncestors, bool fCurrentEstimate = true);
 
-    void removeRecursive(const CTransaction &tx, std::vector<std::shared_ptr<const CTransaction>>* removed = NULL);
+    void removeRecursive(const CTransaction &tx, std::vector<CTransactionRef>* removed = NULL);
     void removeForReorg(const CCoinsViewCache *pcoins, unsigned int nMemPoolHeight, int flags);
-    void removeConflicts(const CTransaction &tx, std::vector<std::shared_ptr<const CTransaction>>* removed = NULL);
-    void removeForBlock(const std::vector<std::shared_ptr<const CTransaction>>& vtx, unsigned int nBlockHeight,
-                        std::vector<std::shared_ptr<const CTransaction>>* conflicts = NULL, bool fCurrentEstimate = true);
+    void removeConflicts(const CTransaction &tx, std::vector<CTransactionRef>* removed = NULL);
+    void removeForBlock(const std::vector<CTransactionRef>& vtx, unsigned int nBlockHeight,
+                        std::vector<CTransactionRef>* conflicts = NULL, bool fCurrentEstimate = true);
     void clear();
     void _clear(); //lock free
     bool CompareDepthAndScore(const uint256& hasha, const uint256& hashb);
@@ -623,7 +623,7 @@ class CTxMemPool
         return (mapTx.count(hash) != 0);
     }
 
-    std::shared_ptr<const CTransaction> get(const uint256& hash) const;
+    CTransactionRef get(const uint256& hash) const;
     TxMempoolInfo info(const uint256& hash) const;
     std::vector<TxMempoolInfo> infoAll() const;
 

From 4231032bfcb9728f0f629b3d67884ba9de63e4ff Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Fri, 18 Nov 2016 14:33:34 +0100
Subject: [PATCH 1236/1802] [Qt] Clean up and fix coincontrol tree widget
 handling

- Do sorting for date, amount and confirmations column as longlong, not
  unsigned longlong.
- Use `UserRole` to store our own data. This makes it treated as
  ancillary data prevents it from being displayed.
- Get rid of `getMappedColumn` `strPad` - these are no longer necessary.
- Get rid of hidden `_INT64` columns.
- Start enumeration from 0 (otherwise values are undefined).
---
 src/qt/coincontroldialog.cpp | 34 ++++++++++------------------------
 src/qt/coincontroldialog.h   | 26 +-------------------------
 2 files changed, 11 insertions(+), 49 deletions(-)

diff --git a/src/qt/coincontroldialog.cpp b/src/qt/coincontroldialog.cpp
index 42a32a1a228e2..1010a62fc4680 100644
--- a/src/qt/coincontroldialog.cpp
+++ b/src/qt/coincontroldialog.cpp
@@ -37,10 +37,8 @@ bool CoinControlDialog::fSubtractFeeFromAmount = false;
 
 bool CCoinControlWidgetItem::operator<(const QTreeWidgetItem &other) const {
     int column = treeWidget()->sortColumn();
-    if (column == CoinControlDialog::COLUMN_AMOUNT_INT64 || column == CoinControlDialog::COLUMN_AMOUNT_INT64)
-        return data(CoinControlDialog::COLUMN_AMOUNT_INT64, Qt::DisplayRole).toULongLong() < other.data(CoinControlDialog::COLUMN_AMOUNT_INT64, Qt::DisplayRole).toULongLong();
-    if (column == CoinControlDialog::COLUMN_DATE || column == CoinControlDialog::COLUMN_DATE_INT64)
-        return data(CoinControlDialog::COLUMN_DATE_INT64, Qt::DisplayRole).toULongLong() < other.data(CoinControlDialog::COLUMN_DATE_INT64, Qt::DisplayRole).toULongLong();
+    if (column == CoinControlDialog::COLUMN_AMOUNT || column == CoinControlDialog::COLUMN_DATE || column == CoinControlDialog::COLUMN_CONFIRMATIONS)
+        return data(column, Qt::UserRole).toLongLong() < other.data(column, Qt::UserRole).toLongLong();
     return QTreeWidgetItem::operator<(other);
 }
 
@@ -137,11 +135,9 @@ CoinControlDialog::CoinControlDialog(const PlatformStyle *_platformStyle, QWidge
     ui->treeWidget->setColumnWidth(COLUMN_CONFIRMATIONS, 110);
     ui->treeWidget->setColumnHidden(COLUMN_TXHASH, true);         // store transaction hash in this column, but don't show it
     ui->treeWidget->setColumnHidden(COLUMN_VOUT_INDEX, true);     // store vout index in this column, but don't show it
-    ui->treeWidget->setColumnHidden(COLUMN_AMOUNT_INT64, true);   // store amount int64 in this column, but don't show it
-    ui->treeWidget->setColumnHidden(COLUMN_DATE_INT64, true);     // store date int64 in this column, but don't show it
 
     // default view is sorted by amount desc
-    sortView(COLUMN_AMOUNT_INT64, Qt::DescendingOrder);
+    sortView(COLUMN_AMOUNT, Qt::DescendingOrder);
 
     // restore list mode and sortorder as a convenience feature
     QSettings settings;
@@ -173,15 +169,6 @@ void CoinControlDialog::setModel(WalletModel *_model)
     }
 }
 
-// helper function str_pad
-QString CoinControlDialog::strPad(QString s, int nPadLength, QString sPadding)
-{
-    while (s.length() < nPadLength)
-        s = sPadding + s;
-
-    return s;
-}
-
 // ok button
 void CoinControlDialog::buttonBoxClicked(QAbstractButton* button)
 {
@@ -347,7 +334,7 @@ void CoinControlDialog::sortView(int column, Qt::SortOrder order)
     sortColumn = column;
     sortOrder = order;
     ui->treeWidget->sortItems(column, order);
-    ui->treeWidget->header()->setSortIndicator(getMappedColumn(sortColumn), sortOrder);
+    ui->treeWidget->header()->setSortIndicator(sortColumn, sortOrder);
 }
 
 // treeview: clicked on header
@@ -355,12 +342,10 @@ void CoinControlDialog::headerSectionClicked(int logicalIndex)
 {
     if (logicalIndex == COLUMN_CHECKBOX) // click on most left column -> do nothing
     {
-        ui->treeWidget->header()->setSortIndicator(getMappedColumn(sortColumn), sortOrder);
+        ui->treeWidget->header()->setSortIndicator(sortColumn, sortOrder);
     }
     else
     {
-        logicalIndex = getMappedColumn(logicalIndex, false);
-
         if (sortColumn == logicalIndex)
             sortOrder = ((sortOrder == Qt::AscendingOrder) ? Qt::DescendingOrder : Qt::AscendingOrder);
         else
@@ -730,14 +715,15 @@ void CoinControlDialog::updateView()
 
             // amount
             itemOutput->setText(COLUMN_AMOUNT, BitcoinUnits::format(nDisplayUnit, out.tx->vout[out.i].nValue));
-            itemOutput->setData(COLUMN_AMOUNT_INT64, Qt::DisplayRole, QVariant((qlonglong)out.tx->vout[out.i].nValue)); // padding so that sorting works correctly
+            itemOutput->setData(COLUMN_AMOUNT, Qt::UserRole, QVariant((qlonglong)out.tx->vout[out.i].nValue)); // padding so that sorting works correctly
 
             // date
             itemOutput->setText(COLUMN_DATE, GUIUtil::dateTimeStr(out.tx->GetTxTime()));
-            itemOutput->setData(COLUMN_DATE_INT64, Qt::DisplayRole, QVariant((qlonglong)out.tx->GetTxTime()));
+            itemOutput->setData(COLUMN_DATE, Qt::UserRole, QVariant((qlonglong)out.tx->GetTxTime()));
 
             // confirmations
-            itemOutput->setText(COLUMN_CONFIRMATIONS, strPad(QString::number(out.nDepth), 8, " "));
+            itemOutput->setText(COLUMN_CONFIRMATIONS, QString::number(out.nDepth));
+            itemOutput->setData(COLUMN_CONFIRMATIONS, Qt::UserRole, QVariant((qlonglong)out.nDepth));
 
             // transaction hash
             uint256 txhash = out.tx->GetHash();
@@ -765,7 +751,7 @@ void CoinControlDialog::updateView()
         {
             itemWalletAddress->setText(COLUMN_CHECKBOX, "(" + QString::number(nChildren) + ")");
             itemWalletAddress->setText(COLUMN_AMOUNT, BitcoinUnits::format(nDisplayUnit, nSum));
-            itemWalletAddress->setText(COLUMN_AMOUNT_INT64, strPad(QString::number(nSum), 15, " "));
+            itemWalletAddress->setData(COLUMN_AMOUNT, Qt::UserRole, QVariant((qlonglong)nSum));
         }
     }
 
diff --git a/src/qt/coincontroldialog.h b/src/qt/coincontroldialog.h
index 960e92f79b260..7c2269b1eb673 100644
--- a/src/qt/coincontroldialog.h
+++ b/src/qt/coincontroldialog.h
@@ -70,13 +70,12 @@ class CoinControlDialog : public QDialog
 
     const PlatformStyle *platformStyle;
 
-    QString strPad(QString, int, QString);
     void sortView(int, Qt::SortOrder);
     void updateView();
 
     enum
     {
-        COLUMN_CHECKBOX,
+        COLUMN_CHECKBOX = 0,
         COLUMN_AMOUNT,
         COLUMN_LABEL,
         COLUMN_ADDRESS,
@@ -84,32 +83,9 @@ class CoinControlDialog : public QDialog
         COLUMN_CONFIRMATIONS,
         COLUMN_TXHASH,
         COLUMN_VOUT_INDEX,
-        COLUMN_AMOUNT_INT64,
-        COLUMN_DATE_INT64
     };
     friend class CCoinControlWidgetItem;
 
-    // some columns have a hidden column containing the value used for sorting
-    int getMappedColumn(int column, bool fVisibleColumn = true)
-    {
-        if (fVisibleColumn)
-        {
-            if (column == COLUMN_AMOUNT_INT64)
-                return COLUMN_AMOUNT;
-            else if (column == COLUMN_DATE_INT64)
-                return COLUMN_DATE;
-        }
-        else
-        {
-            if (column == COLUMN_AMOUNT)
-                return COLUMN_AMOUNT_INT64;
-            else if (column == COLUMN_DATE)
-                return COLUMN_DATE_INT64;
-        }
-
-        return column;
-    }
-
 private Q_SLOTS:
     void showMenu(const QPoint &);
     void copyAmount();

From 09dc4064aca45a544a22e28e016cc3064985f25a Mon Sep 17 00:00:00 2001
From: BtcDrak <btcdrak@gmail.com>
Date: Mon, 21 Nov 2016 21:29:22 +0000
Subject: [PATCH 1237/1802] Make test constant consistent with consensus.h

---
 qa/rpc-tests/p2p-fullblocktest.py       | 26 ++++++++++++-------------
 qa/rpc-tests/p2p-segwit.py              | 14 ++++++-------
 qa/rpc-tests/prioritise_transaction.py  |  6 +++---
 qa/rpc-tests/test_framework/mininode.py |  2 +-
 4 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/qa/rpc-tests/p2p-fullblocktest.py b/qa/rpc-tests/p2p-fullblocktest.py
index 9aee81164f088..e4b889d761bec 100755
--- a/qa/rpc-tests/p2p-fullblocktest.py
+++ b/qa/rpc-tests/p2p-fullblocktest.py
@@ -351,7 +351,7 @@ def update_block(block_number, new_transactions):
         block(22, spend=out[5])
         yield rejected()
 
-        # Create a block on either side of MAX_BLOCK_SIZE and make sure its accepted/rejected
+        # Create a block on either side of MAX_BLOCK_BASE_SIZE and make sure its accepted/rejected
         #     genesis -> b1 (0) -> b2 (1) -> b5 (2) -> b6  (3)
         #                                          \-> b12 (3) -> b13 (4) -> b15 (5) -> b23 (6)
         #                                                                           \-> b24 (6) -> b25 (7)
@@ -359,24 +359,24 @@ def update_block(block_number, new_transactions):
         tip(15)
         b23 = block(23, spend=out[6])
         tx = CTransaction()
-        script_length = MAX_BLOCK_SIZE - len(b23.serialize()) - 69
+        script_length = MAX_BLOCK_BASE_SIZE - len(b23.serialize()) - 69
         script_output = CScript([b'\x00' * script_length])
         tx.vout.append(CTxOut(0, script_output))
         tx.vin.append(CTxIn(COutPoint(b23.vtx[1].sha256, 0)))
         b23 = update_block(23, [tx])
         # Make sure the math above worked out to produce a max-sized block
-        assert_equal(len(b23.serialize()), MAX_BLOCK_SIZE)
+        assert_equal(len(b23.serialize()), MAX_BLOCK_BASE_SIZE)
         yield accepted()
         save_spendable_output()
 
         # Make the next block one byte bigger and check that it fails
         tip(15)
         b24 = block(24, spend=out[6])
-        script_length = MAX_BLOCK_SIZE - len(b24.serialize()) - 69
+        script_length = MAX_BLOCK_BASE_SIZE - len(b24.serialize()) - 69
         script_output = CScript([b'\x00' * (script_length+1)])
         tx.vout = [CTxOut(0, script_output)]
         b24 = update_block(24, [tx])
-        assert_equal(len(b24.serialize()), MAX_BLOCK_SIZE+1)
+        assert_equal(len(b24.serialize()), MAX_BLOCK_BASE_SIZE+1)
         yield rejected(RejectResult(16, b'bad-blk-length'))
 
         block(25, spend=out[7])
@@ -523,12 +523,12 @@ def update_block(block_number, new_transactions):
         tx_new = None
         tx_last = tx
         total_size=len(b39.serialize())
-        while(total_size < MAX_BLOCK_SIZE):
+        while(total_size < MAX_BLOCK_BASE_SIZE):
             tx_new = create_tx(tx_last, 1, 1, p2sh_script)
             tx_new.vout.append(CTxOut(tx_last.vout[1].nValue - 1, CScript([OP_TRUE])))
             tx_new.rehash()
             total_size += len(tx_new.serialize())
-            if total_size >= MAX_BLOCK_SIZE:
+            if total_size >= MAX_BLOCK_BASE_SIZE:
                 break
             b39.vtx.append(tx_new) # add tx to block
             tx_last = tx_new
@@ -877,7 +877,7 @@ def update_block(block_number, new_transactions):
 
 
         #  This checks that a block with a bloated VARINT between the block_header and the array of tx such that
-        #  the block is > MAX_BLOCK_SIZE with the bloated varint, but <= MAX_BLOCK_SIZE without the bloated varint,
+        #  the block is > MAX_BLOCK_BASE_SIZE with the bloated varint, but <= MAX_BLOCK_BASE_SIZE without the bloated varint,
         #  does not cause a subsequent, identical block with canonical encoding to be rejected.  The test does not
         #  care whether the bloated block is accepted or rejected; it only cares that the second block is accepted.
         #
@@ -901,12 +901,12 @@ def update_block(block_number, new_transactions):
         tx = CTransaction()
 
         # use canonical serialization to calculate size
-        script_length = MAX_BLOCK_SIZE - len(b64a.normal_serialize()) - 69
+        script_length = MAX_BLOCK_BASE_SIZE - len(b64a.normal_serialize()) - 69
         script_output = CScript([b'\x00' * script_length])
         tx.vout.append(CTxOut(0, script_output))
         tx.vin.append(CTxIn(COutPoint(b64a.vtx[1].sha256, 0)))
         b64a = update_block("64a", [tx])
-        assert_equal(len(b64a.serialize()), MAX_BLOCK_SIZE + 8)
+        assert_equal(len(b64a.serialize()), MAX_BLOCK_BASE_SIZE + 8)
         yield TestInstance([[self.tip, None]])
 
         # comptool workaround: to make sure b64 is delivered, manually erase b64a from blockstore
@@ -916,7 +916,7 @@ def update_block(block_number, new_transactions):
         b64 = CBlock(b64a)
         b64.vtx = copy.deepcopy(b64a.vtx)
         assert_equal(b64.hash, b64a.hash)
-        assert_equal(len(b64.serialize()), MAX_BLOCK_SIZE)
+        assert_equal(len(b64.serialize()), MAX_BLOCK_BASE_SIZE)
         self.blocks[64] = b64
         update_block(64, [])
         yield accepted()
@@ -1250,12 +1250,12 @@ def update_block(block_number, new_transactions):
             for i in range(89, LARGE_REORG_SIZE + 89):
                 b = block(i, spend)
                 tx = CTransaction()
-                script_length = MAX_BLOCK_SIZE - len(b.serialize()) - 69
+                script_length = MAX_BLOCK_BASE_SIZE - len(b.serialize()) - 69
                 script_output = CScript([b'\x00' * script_length])
                 tx.vout.append(CTxOut(0, script_output))
                 tx.vin.append(CTxIn(COutPoint(b.vtx[1].sha256, 0)))
                 b = update_block(i, [tx])
-                assert_equal(len(b.serialize()), MAX_BLOCK_SIZE)
+                assert_equal(len(b.serialize()), MAX_BLOCK_BASE_SIZE)
                 test1.blocks_and_transactions.append([self.tip, True])
                 save_spendable_output()
                 spend = get_spendable_output()
diff --git a/qa/rpc-tests/p2p-segwit.py b/qa/rpc-tests/p2p-segwit.py
index 6ecd84c3f08c2..62969aed64805 100755
--- a/qa/rpc-tests/p2p-segwit.py
+++ b/qa/rpc-tests/p2p-segwit.py
@@ -498,7 +498,7 @@ def test_block_malleability(self):
         block.solve()
 
         block.vtx[0].wit.vtxinwit[0].scriptWitness.stack.append(b'a'*5000000)
-        assert(get_virtual_size(block) > MAX_BLOCK_SIZE)
+        assert(get_virtual_size(block) > MAX_BLOCK_BASE_SIZE)
 
         # We can't send over the p2p network, because this is too big to relay
         # TODO: repeat this test with a block that can be relayed
@@ -507,7 +507,7 @@ def test_block_malleability(self):
         assert(self.nodes[0].getbestblockhash() != block.hash)
 
         block.vtx[0].wit.vtxinwit[0].scriptWitness.stack.pop()
-        assert(get_virtual_size(block) < MAX_BLOCK_SIZE)
+        assert(get_virtual_size(block) < MAX_BLOCK_BASE_SIZE)
         self.nodes[0].submitblock(bytes_to_hex_str(block.serialize(True)))
 
         assert(self.nodes[0].getbestblockhash() == block.hash)
@@ -572,10 +572,10 @@ def test_witness_block_size(self):
         self.update_witness_block_with_transactions(block, [parent_tx, child_tx])
 
         vsize = get_virtual_size(block)
-        additional_bytes = (MAX_BLOCK_SIZE - vsize)*4
+        additional_bytes = (MAX_BLOCK_BASE_SIZE - vsize)*4
         i = 0
         while additional_bytes > 0:
-            # Add some more bytes to each input until we hit MAX_BLOCK_SIZE+1
+            # Add some more bytes to each input until we hit MAX_BLOCK_BASE_SIZE+1
             extra_bytes = min(additional_bytes+1, 55)
             block.vtx[-1].wit.vtxinwit[int(i/(2*NUM_DROPS))].scriptWitness.stack[i%(2*NUM_DROPS)] = b'a'*(195+extra_bytes)
             additional_bytes -= extra_bytes
@@ -585,7 +585,7 @@ def test_witness_block_size(self):
         add_witness_commitment(block)
         block.solve()
         vsize = get_virtual_size(block)
-        assert_equal(vsize, MAX_BLOCK_SIZE + 1)
+        assert_equal(vsize, MAX_BLOCK_BASE_SIZE + 1)
         # Make sure that our test case would exceed the old max-network-message
         # limit
         assert(len(block.serialize(True)) > 2*1024*1024)
@@ -598,7 +598,7 @@ def test_witness_block_size(self):
         block.vtx[0].vout.pop()
         add_witness_commitment(block)
         block.solve()
-        assert(get_virtual_size(block) == MAX_BLOCK_SIZE)
+        assert(get_virtual_size(block) == MAX_BLOCK_BASE_SIZE)
 
         self.test_node.test_witness_block(block, accepted=True)
 
@@ -1433,7 +1433,7 @@ def test_signature_version_1(self):
             block.vtx.append(tx)
 
             # Test the block periodically, if we're close to maxblocksize
-            if (get_virtual_size(block) > MAX_BLOCK_SIZE - 1000):
+            if (get_virtual_size(block) > MAX_BLOCK_BASE_SIZE - 1000):
                 self.update_witness_block_with_transactions(block, [])
                 self.test_node.test_witness_block(block, accepted=True)
                 block = self.build_next_block()
diff --git a/qa/rpc-tests/prioritise_transaction.py b/qa/rpc-tests/prioritise_transaction.py
index e1771231c066e..85afeab2e3eb6 100755
--- a/qa/rpc-tests/prioritise_transaction.py
+++ b/qa/rpc-tests/prioritise_transaction.py
@@ -9,7 +9,7 @@
 
 from test_framework.test_framework import BitcoinTestFramework
 from test_framework.util import *
-from test_framework.mininode import COIN, MAX_BLOCK_SIZE
+from test_framework.mininode import COIN, MAX_BLOCK_BASE_SIZE
 
 class PrioritiseTransactionTest(BitcoinTestFramework):
 
@@ -42,7 +42,7 @@ def run_test(self):
             txids[i] = create_lots_of_big_transactions(self.nodes[0], self.txouts, utxos[start_range:end_range], (i+1)*base_fee)
 
         # Make sure that the size of each group of transactions exceeds
-        # MAX_BLOCK_SIZE -- otherwise the test needs to be revised to create
+        # MAX_BLOCK_BASE_SIZE -- otherwise the test needs to be revised to create
         # more transactions.
         mempool = self.nodes[0].getrawmempool(True)
         sizes = [0, 0, 0]
@@ -50,7 +50,7 @@ def run_test(self):
             for j in txids[i]:
                 assert(j in mempool)
                 sizes[i] += mempool[j]['size']
-            assert(sizes[i] > MAX_BLOCK_SIZE) # Fail => raise utxo_count
+            assert(sizes[i] > MAX_BLOCK_BASE_SIZE) # Fail => raise utxo_count
 
         # add a fee delta to something in the cheapest bucket and make sure it gets mined
         # also check that a different entry in the cheapest bucket is NOT mined (lower
diff --git a/qa/rpc-tests/test_framework/mininode.py b/qa/rpc-tests/test_framework/mininode.py
index 495c6bdf350d0..91daa4ab1f585 100755
--- a/qa/rpc-tests/test_framework/mininode.py
+++ b/qa/rpc-tests/test_framework/mininode.py
@@ -44,7 +44,7 @@
 MY_RELAY = 1 # from version 70001 onwards, fRelay should be appended to version messages (BIP37)
 
 MAX_INV_SZ = 50000
-MAX_BLOCK_SIZE = 1000000
+MAX_BLOCK_BASE_SIZE = 1000000
 
 COIN = 100000000 # 1 btc in satoshis
 

From ad04d1cb35b9612d36078c62213bdbb13f56d73d Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Fri, 18 Nov 2016 12:15:01 -0800
Subject: [PATCH 1238/1802] Always add default_witness_commitment with GBT
 client support

---
 src/main.cpp             | 9 +--------
 src/rpc/mining.cpp       | 4 +++-
 src/test/miner_tests.cpp | 1 +
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index 4293a6bebf645..56a5103849cf7 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -3531,15 +3531,8 @@ std::vector<unsigned char> GenerateCoinbaseCommitment(CBlock& block, const CBloc
 {
     std::vector<unsigned char> commitment;
     int commitpos = GetWitnessCommitmentIndex(block);
-    bool fHaveWitness = false;
-    for (size_t t = 1; t < block.vtx.size(); t++) {
-        if (!block.vtx[t]->wit.IsNull()) {
-            fHaveWitness = true;
-            break;
-        }
-    }
     std::vector<unsigned char> ret(32, 0x00);
-    if (fHaveWitness && IsWitnessEnabled(pindexPrev, consensusParams)) {
+    if (consensusParams.vDeployments[Consensus::DEPLOYMENT_SEGWIT].nTimeout != 0) {
         if (commitpos == -1) {
             uint256 witnessroot = BlockWitnessMerkleRoot(block, NULL);
             CHash256().Write(witnessroot.begin(), 32).Write(&ret[0], 32).Finalize(witnessroot.begin());
diff --git a/src/rpc/mining.cpp b/src/rpc/mining.cpp
index 6b0e52a309376..f3cd1fbf0b9b9 100644
--- a/src/rpc/mining.cpp
+++ b/src/rpc/mining.cpp
@@ -680,7 +680,9 @@ UniValue getblocktemplate(const JSONRPCRequest& request)
     result.push_back(Pair("curtime", pblock->GetBlockTime()));
     result.push_back(Pair("bits", strprintf("%08x", pblock->nBits)));
     result.push_back(Pair("height", (int64_t)(pindexPrev->nHeight+1)));
-    if (!pblocktemplate->vchCoinbaseCommitment.empty()) {
+
+    const struct BIP9DeploymentInfo& segwit_info = VersionBitsDeploymentInfo[Consensus::DEPLOYMENT_SEGWIT];
+    if (!pblocktemplate->vchCoinbaseCommitment.empty() && setClientRules.find(segwit_info.name) != setClientRules.end()) {
         result.push_back(Pair("default_witness_commitment", HexStr(pblocktemplate->vchCoinbaseCommitment.begin(), pblocktemplate->vchCoinbaseCommitment.end())));
     }
 
diff --git a/src/test/miner_tests.cpp b/src/test/miner_tests.cpp
index aea8920936b37..85a2e907c2d07 100644
--- a/src/test/miner_tests.cpp
+++ b/src/test/miner_tests.cpp
@@ -214,6 +214,7 @@ BOOST_AUTO_TEST_CASE(CreateNewBlock_validity)
         txCoinbase.vin[0].scriptSig = CScript();
         txCoinbase.vin[0].scriptSig.push_back(blockinfo[i].extranonce);
         txCoinbase.vin[0].scriptSig.push_back(chainActive.Height());
+        txCoinbase.vout.resize(1); // Ignore the (optional) segwit commitment added by CreateNewBlock (as the hardcoded nonces don't account for this)
         txCoinbase.vout[0].scriptPubKey = CScript();
         pblock->vtx[0] = MakeTransactionRef(std::move(txCoinbase));
         if (txFirst.size() == 0)

From 95f4a03777ec2ad82a94a3e2890192a93ad83509 Mon Sep 17 00:00:00 2001
From: Suhas Daftuar <sdaftuar@chaincode.com>
Date: Sat, 19 Nov 2016 06:55:25 -0500
Subject: [PATCH 1239/1802] [qa] Test getblocktemplate
 default_witness_commitment

---
 qa/rpc-tests/p2p-segwit.py | 70 +++++++++++++++++++++++++-------------
 1 file changed, 47 insertions(+), 23 deletions(-)

diff --git a/qa/rpc-tests/p2p-segwit.py b/qa/rpc-tests/p2p-segwit.py
index 6ecd84c3f08c2..d344a16a4b9ec 100755
--- a/qa/rpc-tests/p2p-segwit.py
+++ b/qa/rpc-tests/p2p-segwit.py
@@ -195,11 +195,6 @@ def __init__(self):
         self.setup_clean_chain = True
         self.num_nodes = 3
 
-    def add_options(self, parser):
-        parser.add_option("--oldbinary", dest="oldbinary",
-                          default=None,
-                          help="pre-segwit bitcoind binary for upgrade testing")
-
     def setup_network(self):
         self.nodes = []
         self.nodes.append(start_node(0, self.options.tmpdir, ["-debug", "-logtimemicros=1", "-whitelist=127.0.0.1"]))
@@ -207,12 +202,9 @@ def setup_network(self):
         self.nodes.append(start_node(1, self.options.tmpdir, ["-debug", "-logtimemicros=1", "-whitelist=127.0.0.1", "-acceptnonstdtxn=0"]))
         connect_nodes(self.nodes[0], 1)
 
-        # If an old bitcoind is given, do the upgrade-after-activation test.
-        self.test_upgrade = False
-        if (self.options.oldbinary != None):
-            self.nodes.append(start_node(2, self.options.tmpdir, ["-debug", "-whitelist=127.0.0.1"], binary=self.options.oldbinary))
-            connect_nodes(self.nodes[0], 2)
-            self.test_upgrade = True
+        # Disable segwit's bip9 parameter to simulate upgrading after activation.
+        self.nodes.append(start_node(2, self.options.tmpdir, ["-debug", "-whitelist=127.0.0.1", "-bip9params=segwit:0:0"]))
+        connect_nodes(self.nodes[0], 2)
 
     ''' Helpers '''
     # Build a block on top of node0's tip.
@@ -1177,7 +1169,7 @@ def test_standardness_v0(self, segwit_activated):
         if segwit_activated:
             # tx and tx2 were both accepted.  Don't bother trying to reclaim the
             # P2PKH output; just send tx's first output back to an anyone-can-spend.
-            sync_mempools(self.nodes)
+            sync_mempools([self.nodes[0], self.nodes[1]])
             tx3.vin = [CTxIn(COutPoint(tx.sha256, 0), b"")]
             tx3.vout = [CTxOut(tx.vout[0].nValue-1000, CScript([OP_TRUE]))]
             tx3.wit.vtxinwit.append(CTxInWitness())
@@ -1706,19 +1698,53 @@ def test_witness_sigops(self):
 
     def test_getblocktemplate_before_lockin(self):
         print("\tTesting getblocktemplate setting of segwit versionbit (before lockin)")
-        block_version = (self.nodes[0].getblocktemplate())['version']
-        assert_equal(block_version & (1 << VB_WITNESS_BIT), 0)
+        # Node0 is segwit aware, node2 is not.
+        for node in [self.nodes[0], self.nodes[2]]:
+            gbt_results = node.getblocktemplate()
+            block_version = gbt_results['version']
+            # If we're not indicating segwit support, we should not be signalling
+            # for segwit activation, nor should we get a witness commitment.
+            assert_equal(block_version & (1 << VB_WITNESS_BIT), 0)
+            assert('default_witness_commitment' not in gbt_results)
 
         # Workaround:
         # Can either change the tip, or change the mempool and wait 5 seconds
         # to trigger a recomputation of getblocktemplate.
-        self.nodes[0].sendtoaddress(self.nodes[0].getnewaddress(), 1)
+        txid = int(self.nodes[0].sendtoaddress(self.nodes[0].getnewaddress(), 1), 16)
         # Using mocktime lets us avoid sleep()
+        sync_mempools(self.nodes)
         self.nodes[0].setmocktime(int(time.time())+10)
-
-        block_version = self.nodes[0].getblocktemplate({"rules" : ["segwit"]})['version']
-        assert(block_version & (1 << VB_WITNESS_BIT) != 0)
-        self.nodes[0].setmocktime(0) # undo mocktime
+        self.nodes[2].setmocktime(int(time.time())+10)
+
+        for node in [self.nodes[0], self.nodes[2]]:
+            gbt_results = node.getblocktemplate({"rules" : ["segwit"]})
+            block_version = gbt_results['version']
+            if node == self.nodes[2]:
+                # If this is a non-segwit node, we should still not get a witness
+                # commitment, nor a version bit signalling segwit.
+                assert_equal(block_version & (1 << VB_WITNESS_BIT), 0)
+                assert('default_witness_commitment' not in gbt_results)
+            else:
+                # For segwit-aware nodes, check the version bit and the witness
+                # commitment are correct.
+                assert(block_version & (1 << VB_WITNESS_BIT) != 0)
+                assert('default_witness_commitment' in gbt_results)
+                witness_commitment = gbt_results['default_witness_commitment']
+
+                # TODO: this duplicates some code from blocktools.py, would be nice
+                # to refactor.
+                # Check that default_witness_commitment is present.
+                block = CBlock()
+                witness_root = block.get_merkle_root([ser_uint256(0), ser_uint256(txid)])
+                check_commitment = uint256_from_str(hash256(ser_uint256(witness_root)+ser_uint256(0)))
+                from test_framework.blocktools import WITNESS_COMMITMENT_HEADER
+                output_data = WITNESS_COMMITMENT_HEADER + ser_uint256(check_commitment)
+                script = CScript([OP_RETURN, output_data])
+                assert_equal(witness_commitment, bytes_to_hex_str(script))
+
+        # undo mocktime
+        self.nodes[0].setmocktime(0)
+        self.nodes[2].setmocktime(0)
 
     # Uncompressed pubkeys are no longer supported in default relay policy,
     # but (for now) are still valid in blocks.
@@ -1958,6 +1984,7 @@ def run_test(self):
 
         # Advance to segwit being 'started'
         self.advance_to_segwit_started()
+        sync_blocks(self.nodes)
         self.test_getblocktemplate_before_lockin()
 
         sync_blocks(self.nodes)
@@ -2000,10 +2027,7 @@ def run_test(self):
         self.test_signature_version_1()
         self.test_non_standard_witness()
         sync_blocks(self.nodes)
-        if self.test_upgrade:
-            self.test_upgrade_after_activation(self.nodes[2], 2)
-        else:
-            print("\tSkipping upgrade-after-activation test (use --oldbinary to enable)")
+        self.test_upgrade_after_activation(self.nodes[2], 2)
         self.test_witness_sigops()
 
 

From ca8549d2bd32f17f8b69d1edbe3f2976fba504b4 Mon Sep 17 00:00:00 2001
From: Gregory Maxwell <greg@xiph.org>
Date: Tue, 22 Nov 2016 02:50:24 +0000
Subject: [PATCH 1240/1802] Always drop the least preferred HB peer when adding
 a new one.

When a BIP152 HB-mode peer is in the least preferred position and
 disconnects, they will not be by ForNode on the next loop. They
 will continue to sit in that position and prevent deactivating
 HB mode for peers that are still connected.

There is no reason for them to stay in the list if already gone,
 so drop the first element unconditionally if there are too many.

Fixes issue #9163.
---
 src/main.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index 4293a6bebf645..dd57153eaeed0 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -529,12 +529,11 @@ void MaybeSetPeerAsAnnouncingHeaderAndIDs(const CNodeState* nodestate, CNode* pf
         if (lNodesAnnouncingHeaderAndIDs.size() >= 3) {
             // As per BIP152, we only get 3 of our peers to announce
             // blocks using compact encodings.
-            bool found = connman.ForNode(lNodesAnnouncingHeaderAndIDs.front(), [&connman, fAnnounceUsingCMPCTBLOCK, nCMPCTBLOCKVersion](CNode* pnodeStop){
+            connman.ForNode(lNodesAnnouncingHeaderAndIDs.front(), [&connman, fAnnounceUsingCMPCTBLOCK, nCMPCTBLOCKVersion](CNode* pnodeStop){
                 connman.PushMessage(pnodeStop, NetMsgType::SENDCMPCT, fAnnounceUsingCMPCTBLOCK, nCMPCTBLOCKVersion);
                 return true;
             });
-            if(found)
-                lNodesAnnouncingHeaderAndIDs.pop_front();
+            lNodesAnnouncingHeaderAndIDs.pop_front();
         }
         fAnnounceUsingCMPCTBLOCK = true;
         connman.PushMessage(pfrom, NetMsgType::SENDCMPCT, fAnnounceUsingCMPCTBLOCK, nCMPCTBLOCKVersion);

From e0a9cb25b0af87723d50cb8d8cffa10f1ebf7dcc Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Tue, 22 Nov 2016 09:59:50 +0100
Subject: [PATCH 1241/1802] bench: Fix subtle counting issue when rescaling
 iteration count

Make sure that the count is a zero modulo the new mask before
scaling, otherwise the next time until a measure triggers
will take only 1/2 as long as accounted for. This caused
the 'min time' to be potentially off by as much as 100%.
---
 src/bench/bench.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/bench/bench.cpp b/src/bench/bench.cpp
index 227546a7a78a3..8942da8c74ac6 100644
--- a/src/bench/bench.cpp
+++ b/src/bench/bench.cpp
@@ -64,8 +64,11 @@ bool State::KeepRunning()
           return true;
         }
         if (elapsed*16 < maxElapsed) {
-          countMask = ((countMask<<1)|1) & ((1LL<<60)-1);
-          countMaskInv = 1./(countMask+1);
+          uint64_t newCountMask = ((countMask<<1)|1) & ((1LL<<60)-1);
+          if ((count & newCountMask)==0) {
+              countMask = newCountMask;
+              countMaskInv = 1./(countMask+1);
+          }
         }
     }
     lastTime = now;

From 35328187463a7078b4206e394c21d5515929c7de Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Tue, 22 Nov 2016 10:22:08 +0100
Subject: [PATCH 1242/1802] bench: Add support for measuring CPU cycles

This adds cycle min/max/avg to the statistics.

Supported on x86 and x86_64 (natively through rdtsc), as well as Linux
(perf syscall).
---
 src/Makefile.bench.include |  4 ++-
 src/bench/bench.cpp        | 22 ++++++++++++++--
 src/bench/bench.h          | 10 +++++--
 src/bench/perf.cpp         | 53 ++++++++++++++++++++++++++++++++++++++
 src/bench/perf.h           | 37 ++++++++++++++++++++++++++
 5 files changed, 121 insertions(+), 5 deletions(-)
 create mode 100644 src/bench/perf.cpp
 create mode 100644 src/bench/perf.h

diff --git a/src/Makefile.bench.include b/src/Makefile.bench.include
index 246797a1b275e..e58bd9dfbf807 100644
--- a/src/Makefile.bench.include
+++ b/src/Makefile.bench.include
@@ -22,7 +22,9 @@ bench_bench_bitcoin_SOURCES = \
   bench/mempool_eviction.cpp \
   bench/verify_script.cpp \
   bench/base58.cpp \
-  bench/lockedpool.cpp
+  bench/lockedpool.cpp \
+  bench/perf.cpp \
+  bench/perf.h
 
 nodist_bench_bench_bitcoin_SOURCES = $(GENERATED_TEST_FILES)
 
diff --git a/src/bench/bench.cpp b/src/bench/bench.cpp
index 8942da8c74ac6..af3d152c9a4ce 100644
--- a/src/bench/bench.cpp
+++ b/src/bench/bench.cpp
@@ -3,6 +3,7 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include "bench.h"
+#include "perf.h"
 
 #include <iostream>
 #include <iomanip>
@@ -26,7 +27,9 @@ BenchRunner::BenchRunner(std::string name, BenchFunction func)
 void
 BenchRunner::RunAll(double elapsedTimeForOne)
 {
-    std::cout << "#Benchmark" << "," << "count" << "," << "min" << "," << "max" << "," << "average" << "\n";
+    perf_init();
+    std::cout << "#Benchmark" << "," << "count" << "," << "min" << "," << "max" << "," << "average" << ","
+              << "min_cycles" << "," << "max_cycles" << "," << "average_cycles" << "\n";
 
     for (std::map<std::string,BenchFunction>::iterator it = benchmarks.begin();
          it != benchmarks.end(); ++it) {
@@ -35,6 +38,7 @@ BenchRunner::RunAll(double elapsedTimeForOne)
         BenchFunction& func = it->second;
         func(state);
     }
+    perf_fini();
 }
 
 bool State::KeepRunning()
@@ -44,8 +48,10 @@ bool State::KeepRunning()
       return true;
     }
     double now;
+    uint64_t nowCycles;
     if (count == 0) {
         lastTime = beginTime = now = gettimedouble();
+        lastCycles = beginCycles = nowCycles = perf_cpucycles();
     }
     else {
         now = gettimedouble();
@@ -53,6 +59,13 @@ bool State::KeepRunning()
         double elapsedOne = elapsed * countMaskInv;
         if (elapsedOne < minTime) minTime = elapsedOne;
         if (elapsedOne > maxTime) maxTime = elapsedOne;
+
+        // We only use relative values, so don't have to handle 64-bit wrap-around specially
+        nowCycles = perf_cpucycles();
+        uint64_t elapsedOneCycles = (nowCycles - lastCycles) * countMaskInv;
+        if (elapsedOneCycles < minCycles) minCycles = elapsedOneCycles;
+        if (elapsedOneCycles > maxCycles) maxCycles = elapsedOneCycles;
+
         if (elapsed*128 < maxElapsed) {
           // If the execution was much too fast (1/128th of maxElapsed), increase the count mask by 8x and restart timing.
           // The restart avoids including the overhead of this code in the measurement.
@@ -61,6 +74,8 @@ bool State::KeepRunning()
           count = 0;
           minTime = std::numeric_limits<double>::max();
           maxTime = std::numeric_limits<double>::min();
+          minCycles = std::numeric_limits<uint64_t>::max();
+          maxCycles = std::numeric_limits<uint64_t>::min();
           return true;
         }
         if (elapsed*16 < maxElapsed) {
@@ -72,6 +87,7 @@ bool State::KeepRunning()
         }
     }
     lastTime = now;
+    lastCycles = nowCycles;
     ++count;
 
     if (now - beginTime < maxElapsed) return true; // Keep going
@@ -80,7 +96,9 @@ bool State::KeepRunning()
 
     // Output results
     double average = (now-beginTime)/count;
-    std::cout << std::fixed << std::setprecision(15) << name << "," << count << "," << minTime << "," << maxTime << "," << average << "\n";
+    int64_t averageCycles = (nowCycles-beginCycles)/count;
+    std::cout << std::fixed << std::setprecision(15) << name << "," << count << "," << minTime << "," << maxTime << "," << average << ","
+              << minCycles << "," << maxCycles << "," << averageCycles << "\n";
 
     return false;
 }
diff --git a/src/bench/bench.h b/src/bench/bench.h
index f13b145aaf0c7..caf73e949b4f7 100644
--- a/src/bench/bench.h
+++ b/src/bench/bench.h
@@ -41,12 +41,18 @@ namespace benchmark {
         double maxElapsed;
         double beginTime;
         double lastTime, minTime, maxTime, countMaskInv;
-        int64_t count;
-        int64_t countMask;
+        uint64_t count;
+        uint64_t countMask;
+        uint64_t beginCycles;
+        uint64_t lastCycles;
+        uint64_t minCycles;
+        uint64_t maxCycles;
     public:
         State(std::string _name, double _maxElapsed) : name(_name), maxElapsed(_maxElapsed), count(0) {
             minTime = std::numeric_limits<double>::max();
             maxTime = std::numeric_limits<double>::min();
+            minCycles = std::numeric_limits<uint64_t>::max();
+            maxCycles = std::numeric_limits<uint64_t>::min();
             countMask = 1;
             countMaskInv = 1./(countMask + 1);
         }
diff --git a/src/bench/perf.cpp b/src/bench/perf.cpp
new file mode 100644
index 0000000000000..1f43e5d3ac6f1
--- /dev/null
+++ b/src/bench/perf.cpp
@@ -0,0 +1,53 @@
+// Copyright (c) 2016 The Bitcoin Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#include "perf.h"
+
+#if defined(__i386__) || defined(__x86_64__)
+
+/* These architectures support quering the cycle counter
+ * from user space, no need for any syscall overhead.
+ */
+void perf_init(void) { }
+void perf_fini(void) { }
+
+#elif defined(__linux__)
+
+#include <unistd.h>
+#include <sys/syscall.h>
+#include <linux/perf_event.h>
+
+static int fd = -1;
+static struct perf_event_attr attr;
+
+void perf_init(void)
+{
+    attr.type = PERF_TYPE_HARDWARE;
+    attr.config = PERF_COUNT_HW_CPU_CYCLES;
+    fd = syscall(__NR_perf_event_open, &attr, 0, -1, -1, 0);
+}
+
+void perf_fini(void)
+{
+    if (fd != -1) {
+        close(fd);
+    }
+}
+
+uint64_t perf_cpucycles(void)
+{
+    uint64_t result = 0;
+    if (fd == -1 || read(fd, &result, sizeof(result)) < (ssize_t)sizeof(result)) {
+        return 0;
+    }
+    return result;
+}
+
+#else /* Unhandled platform */
+
+void perf_init(void) { }
+void perf_fini(void) { }
+uint64_t perf_cpucycles(void) { return 0; }
+
+#endif
diff --git a/src/bench/perf.h b/src/bench/perf.h
new file mode 100644
index 0000000000000..681bd0c8a27e6
--- /dev/null
+++ b/src/bench/perf.h
@@ -0,0 +1,37 @@
+// Copyright (c) 2016 The Bitcoin Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+/** Functions for measurement of CPU cycles */
+#ifndef H_PERF
+#define H_PERF
+
+#include <stdint.h>
+
+#if defined(__i386__)
+
+static inline uint64_t perf_cpucycles(void)
+{
+    uint64_t x;
+    __asm__ volatile (".byte 0x0f, 0x31" : "=A" (x));
+    return x;
+}
+
+#elif defined(__x86_64__)
+
+static inline uint64_t perf_cpucycles(void)
+{
+    uint32_t hi, lo;
+    __asm__ __volatile__ ("rdtsc" : "=a"(lo), "=d"(hi));
+    return ((uint64_t)lo)|(((uint64_t)hi)<<32);
+}
+#else
+
+uint64_t perf_cpucycles(void);
+
+#endif
+
+void perf_init(void);
+void perf_fini(void);
+
+#endif // H_PERF

From ce2bb23aa5be10232726d063bfae6063a14720b9 Mon Sep 17 00:00:00 2001
From: jnewbery <john@johnnewbery.com>
Date: Wed, 26 Oct 2016 13:09:54 +0100
Subject: [PATCH 1243/1802] getrawtransaction should take a bool for verbose

---
 src/rpc/rawtransaction.cpp | 32 +++++++++++++++++++++++---------
 1 file changed, 23 insertions(+), 9 deletions(-)

diff --git a/src/rpc/rawtransaction.cpp b/src/rpc/rawtransaction.cpp
index 0656a61755382..0e5964474f0d9 100644
--- a/src/rpc/rawtransaction.cpp
+++ b/src/rpc/rawtransaction.cpp
@@ -135,17 +135,17 @@ UniValue getrawtransaction(const JSONRPCRequest& request)
             "or there is an unspent output in the utxo for this transaction. To make it always work,\n"
             "you need to maintain a transaction index, using the -txindex command line option.\n"
             "\nReturn the raw transaction data.\n"
-            "\nIf verbose=0, returns a string that is serialized, hex-encoded data for 'txid'.\n"
-            "If verbose is non-zero, returns an Object with information about 'txid'.\n"
+            "\nIf verbose is 'true', returns an Object with information about 'txid'.\n"
+            "If verbose is 'false' or omitted, returns a string that is serialized, hex-encoded data for 'txid'.\n"
 
             "\nArguments:\n"
             "1. \"txid\"      (string, required) The transaction id\n"
-            "2. verbose       (numeric, optional, default=0) If 0, return a string, other return a json object\n"
+            "2. verbose       (bool, optional, default=false) If true, return a string, other return a json object\n"
 
-            "\nResult (if verbose is not set or set to 0):\n"
+            "\nResult (if verbose is not set or set to false):\n"
             "\"data\"      (string) The serialized, hex-encoded data for 'txid'\n"
 
-            "\nResult (if verbose > 0):\n"
+            "\nResult (if verbose is set to true):\n"
             "{\n"
             "  \"hex\" : \"data\",       (string) The serialized, hex-encoded data for 'txid'\n"
             "  \"txid\" : \"id\",        (string) The transaction id (same as provided)\n"
@@ -192,17 +192,31 @@ UniValue getrawtransaction(const JSONRPCRequest& request)
 
             "\nExamples:\n"
             + HelpExampleCli("getrawtransaction", "\"mytxid\"")
-            + HelpExampleCli("getrawtransaction", "\"mytxid\" 1")
-            + HelpExampleRpc("getrawtransaction", "\"mytxid\", 1")
+            + HelpExampleCli("getrawtransaction", "\"mytxid\" true")
+            + HelpExampleRpc("getrawtransaction", "\"mytxid\", true")
         );
 
     LOCK(cs_main);
 
     uint256 hash = ParseHashV(request.params[0], "parameter 1");
 
+    // Accept either a bool (true) or a num (>=1) to indicate verbose output.
     bool fVerbose = false;
-    if (request.params.size() > 1)
-        fVerbose = (request.params[1].get_int() != 0);
+    if (request.params.size() > 1) {
+        if (request.params[1].isNum()) {
+            if (request.params[1].get_int() != 0) {
+                fVerbose = true;
+            }
+        }
+        else if(request.params[1].isBool()) {
+            if(request.params[1].isTrue()) {
+                fVerbose = true;
+            }
+        }
+        else {
+            throw JSONRPCError(RPC_TYPE_ERROR, "Invalid type provided. Verbose parameter must be a boolean.");
+        } 
+    }
 
     CTransaction tx;
     uint256 hashBlock;

From 240189b2c14244c3058e80b40bd4dacbd200c4c7 Mon Sep 17 00:00:00 2001
From: John Newbery <john@johnnewbery.com>
Date: Tue, 22 Nov 2016 14:37:59 +0000
Subject: [PATCH 1244/1802] add testcases for getrawtransaction

---
 qa/rpc-tests/rawtransactions.py | 39 +++++++++++++++++++++++++++++----
 1 file changed, 35 insertions(+), 4 deletions(-)

diff --git a/qa/rpc-tests/rawtransactions.py b/qa/rpc-tests/rawtransactions.py
index ab6d2e8def148..33a6f2b0ccaac 100755
--- a/qa/rpc-tests/rawtransactions.py
+++ b/qa/rpc-tests/rawtransactions.py
@@ -2,11 +2,15 @@
 # Copyright (c) 2014-2016 The Bitcoin Core developers
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
+"""rawtranscation RPCs QA test.
 
-#
-# Test re-org scenarios with a mempool that contains transactions
-# that spend (directly or indirectly) coinbase transactions.
-#
+# Tests the following RPCs:
+#    - createrawtransaction
+#    - signrawtransaction
+#    - sendrawtransaction
+#    - decoderawtransaction
+#    - getrawtransaction
+"""
 
 from test_framework.test_framework import BitcoinTestFramework
 from test_framework.util import *
@@ -138,6 +142,33 @@ def run_test(self):
         self.sync_all()
         assert_equal(self.nodes[0].getbalance(), bal+Decimal('50.00000000')+Decimal('2.19000000')) #block reward + tx
 
+        # getrawtransaction tests
+        # 1. valid parameters - only supply txid
+        txHash = rawTx["hash"]
+        assert_equal(self.nodes[0].getrawtransaction(txHash), rawTxSigned['hex'])
+
+        # 2. valid parameters - supply txid and 0 for non-verbose
+        assert_equal(self.nodes[0].getrawtransaction(txHash, 0), rawTxSigned['hex'])
+
+        # 3. valid parameters - supply txid and False for non-verbose
+        assert_equal(self.nodes[0].getrawtransaction(txHash, False), rawTxSigned['hex'])
+
+        # 4. valid parameters - supply txid and 1 for verbose.
+        # We only check the "hex" field of the output so we don't need to update this test every time the output format changes.
+        assert_equal(self.nodes[0].getrawtransaction(txHash, 1)["hex"], rawTxSigned['hex'])
+
+        # 5. valid parameters - supply txid and True for non-verbose
+        assert_equal(self.nodes[0].getrawtransaction(txHash, True)["hex"], rawTxSigned['hex'])
+
+        # 6. invalid parameters - supply txid and string "Flase"
+        assert_raises(JSONRPCException, self.nodes[0].getrawtransaction, txHash, "Flase")
+
+        # 7. invalid parameters - supply txid and empty array
+        assert_raises(JSONRPCException, self.nodes[0].getrawtransaction, txHash, [])
+
+        # 8. invalid parameters - supply txid and empty dict
+        assert_raises(JSONRPCException, self.nodes[0].getrawtransaction, txHash, {})
+
         inputs  = [ {'txid' : "1d1d4e24ed99057e84c3f80fd8fbec79ed9e1acee37da269356ecea000000000", 'vout' : 1, 'sequence' : 1000}]
         outputs = { self.nodes[0].getnewaddress() : 1 }
         rawtx   = self.nodes[0].createrawtransaction(inputs, outputs)

From 918b126901d6fd76f8ec49fce69a60d7819d3a57 Mon Sep 17 00:00:00 2001
From: instagibbs <gsanders87@gmail.com>
Date: Tue, 22 Nov 2016 12:48:01 -0500
Subject: [PATCH 1245/1802] fix CreateTransaction error messages

---
 src/wallet/wallet.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index 2e512fd57f125..83ab9051a13af 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -2238,7 +2238,7 @@ bool CWallet::CreateTransaction(const vector<CRecipient>& vecSend, CWalletTx& wt
     {
         if (nValue < 0 || recipient.nAmount < 0)
         {
-            strFailReason = _("Transaction amounts must be positive");
+            strFailReason = _("Transaction amounts must not be negative");
             return false;
         }
         nValue += recipient.nAmount;
@@ -2246,9 +2246,9 @@ bool CWallet::CreateTransaction(const vector<CRecipient>& vecSend, CWalletTx& wt
         if (recipient.fSubtractFeeFromAmount)
             nSubtractFeeFromAmount++;
     }
-    if (vecSend.empty() || nValue < 0)
+    if (vecSend.empty())
     {
-        strFailReason = _("Transaction amounts must be positive");
+        strFailReason = _("Transaction must have at least one recipient");
         return false;
     }
 

From f004e67df3a0802e3cea1e65d2302f0330f5d278 Mon Sep 17 00:00:00 2001
From: Greg Walker <greg@learnmeabitcoin.com>
Date: Tue, 22 Nov 2016 18:59:20 +0000
Subject: [PATCH 1246/1802] Minor change to comment above new NODE_WITNESS
 service flag to keep it consitent with existing comment structure. Helps with
 readability.

---
 src/protocol.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/protocol.h b/src/protocol.h
index a52d9a67b0e4b..dea409c5b77fb 100644
--- a/src/protocol.h
+++ b/src/protocol.h
@@ -261,7 +261,7 @@ enum ServiceFlags : uint64_t {
     // Bitcoin Core nodes used to support this by default, without advertising this bit,
     // but no longer do as of protocol version 70011 (= NO_BLOOM_VERSION)
     NODE_BLOOM = (1 << 2),
-    // Indicates that a node can be asked for blocks and transactions including
+    // NODE_WITNESS indicates that a node can be asked for blocks and transactions including
     // witness data.
     NODE_WITNESS = (1 << 3),
     // NODE_XTHIN means the node supports Xtreme Thinblocks

From 69bc8e79676a0bde3e1b28da8cdd832842ff18bc Mon Sep 17 00:00:00 2001
From: Amir Abrams <AmirAbrams@users.noreply.github.com>
Date: Wed, 23 Nov 2016 01:46:46 -0600
Subject: [PATCH 1247/1802] [Doc] Move comments above bash command

---
 doc/build-unix.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/doc/build-unix.md b/doc/build-unix.md
index ba7b9cd18d186..5b0a38457e8e5 100644
--- a/doc/build-unix.md
+++ b/doc/build-unix.md
@@ -96,13 +96,13 @@ pass `--with-incompatible-bdb` to configure.
 
 See the section "Disable-wallet mode" to build Bitcoin Core without wallet.
 
-Optional:
+Optional (see --with-miniupnpc and --enable-upnp-default):
 
-    sudo apt-get install libminiupnpc-dev (see --with-miniupnpc and --enable-upnp-default)
+    sudo apt-get install libminiupnpc-dev
 
-ZMQ dependencies:
+ZMQ dependencies (provides ZMQ API 4.x):
 
-    sudo apt-get install libzmq3-dev (provides ZMQ API 4.x)
+    sudo apt-get install libzmq3-dev
 
 Dependencies for the GUI: Ubuntu & Debian
 -----------------------------------------

From 47db07537746940ee7dd0739a8c73e328837813f Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Fri, 18 Nov 2016 15:47:20 +0100
Subject: [PATCH 1248/1802] qt: Plug many memory leaks

None of these are very serious, and are leaks in objects that are
created at most one time.

In most cases this means properly using the QObject parent hierarchy,
except for BanTablePriv/PeerTablePriv which are not QObject,
so use a std::unique_ptr instead.
---
 src/qt/addressbookpage.cpp          |  2 +-
 src/qt/bantablemodel.cpp            |  7 ++++++-
 src/qt/bantablemodel.h              |  3 ++-
 src/qt/bitcoingui.cpp               |  2 +-
 src/qt/coincontroldialog.cpp        |  2 +-
 src/qt/guiutil.cpp                  |  3 ++-
 src/qt/guiutil.h                    |  2 +-
 src/qt/overviewpage.cpp             | 11 +++++------
 src/qt/overviewpage.h               |  3 ++-
 src/qt/peertablemodel.cpp           |  9 +++++++--
 src/qt/peertablemodel.h             |  3 ++-
 src/qt/receivecoinsdialog.cpp       |  5 +++--
 src/qt/receiverequestdialog.cpp     |  2 +-
 src/qt/recentrequeststablemodel.cpp |  2 +-
 src/qt/rpcconsole.cpp               |  4 ++--
 src/qt/transactionview.cpp          |  6 +++---
 16 files changed, 40 insertions(+), 26 deletions(-)

diff --git a/src/qt/addressbookpage.cpp b/src/qt/addressbookpage.cpp
index 58cf4dede046e..6076837fde843 100644
--- a/src/qt/addressbookpage.cpp
+++ b/src/qt/addressbookpage.cpp
@@ -83,7 +83,7 @@ AddressBookPage::AddressBookPage(const PlatformStyle *platformStyle, Mode _mode,
     deleteAction = new QAction(ui->deleteAddress->text(), this);
 
     // Build context menu
-    contextMenu = new QMenu();
+    contextMenu = new QMenu(this);
     contextMenu->addAction(copyAddressAction);
     contextMenu->addAction(copyLabelAction);
     contextMenu->addAction(editAction);
diff --git a/src/qt/bantablemodel.cpp b/src/qt/bantablemodel.cpp
index 6e11e23904733..fe53d89ba9343 100644
--- a/src/qt/bantablemodel.cpp
+++ b/src/qt/bantablemodel.cpp
@@ -87,7 +87,7 @@ BanTableModel::BanTableModel(ClientModel *parent) :
     clientModel(parent)
 {
     columns << tr("IP/Netmask") << tr("Banned Until");
-    priv = new BanTablePriv();
+    priv.reset(new BanTablePriv());
     // default to unsorted
     priv->sortColumn = -1;
 
@@ -95,6 +95,11 @@ BanTableModel::BanTableModel(ClientModel *parent) :
     refresh();
 }
 
+BanTableModel::~BanTableModel()
+{
+    // Intentionally left empty
+}
+
 int BanTableModel::rowCount(const QModelIndex &parent) const
 {
     Q_UNUSED(parent);
diff --git a/src/qt/bantablemodel.h b/src/qt/bantablemodel.h
index fe9600ac0bdec..3c03d05c05177 100644
--- a/src/qt/bantablemodel.h
+++ b/src/qt/bantablemodel.h
@@ -40,6 +40,7 @@ class BanTableModel : public QAbstractTableModel
 
 public:
     explicit BanTableModel(ClientModel *parent = 0);
+    ~BanTableModel();
     void startAutoRefresh();
     void stopAutoRefresh();
 
@@ -66,7 +67,7 @@ public Q_SLOTS:
 private:
     ClientModel *clientModel;
     QStringList columns;
-    BanTablePriv *priv;
+    std::unique_ptr<BanTablePriv> priv;
 };
 
 #endif // BITCOIN_QT_BANTABLEMODEL_H
diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp
index b2c9a704ed30f..4d78fd13c0fa1 100644
--- a/src/qt/bitcoingui.cpp
+++ b/src/qt/bitcoingui.cpp
@@ -1185,7 +1185,7 @@ void UnitDisplayStatusBarControl::mousePressEvent(QMouseEvent *event)
 /** Creates context menu, its actions, and wires up all the relevant signals for mouse events. */
 void UnitDisplayStatusBarControl::createContextMenu()
 {
-    menu = new QMenu();
+    menu = new QMenu(this);
     Q_FOREACH(BitcoinUnits::Unit u, BitcoinUnits::availableUnits())
     {
         QAction *menuAction = new QAction(QString(BitcoinUnits::name(u)), this);
diff --git a/src/qt/coincontroldialog.cpp b/src/qt/coincontroldialog.cpp
index 1a1671f0ee830..20c8fc845b431 100644
--- a/src/qt/coincontroldialog.cpp
+++ b/src/qt/coincontroldialog.cpp
@@ -52,7 +52,7 @@ CoinControlDialog::CoinControlDialog(const PlatformStyle *_platformStyle, QWidge
              unlockAction = new QAction(tr("Unlock unspent"), this);                    // we need to enable/disable this
 
     // context menu
-    contextMenu = new QMenu();
+    contextMenu = new QMenu(this);
     contextMenu->addAction(copyAddressAction);
     contextMenu->addAction(copyLabelAction);
     contextMenu->addAction(copyAmountAction);
diff --git a/src/qt/guiutil.cpp b/src/qt/guiutil.cpp
index 9dc75c2e1a25e..130cfc6e7d9a9 100644
--- a/src/qt/guiutil.cpp
+++ b/src/qt/guiutil.cpp
@@ -585,7 +585,8 @@ void TableViewLastColumnResizingFixer::on_geometriesChanged()
  * Initializes all internal variables and prepares the
  * the resize modes of the last 2 columns of the table and
  */
-TableViewLastColumnResizingFixer::TableViewLastColumnResizingFixer(QTableView* table, int lastColMinimumWidth, int allColsMinimumWidth) :
+TableViewLastColumnResizingFixer::TableViewLastColumnResizingFixer(QTableView* table, int lastColMinimumWidth, int allColsMinimumWidth, QObject *parent) :
+    QObject(parent),
     tableView(table),
     lastColumnMinimumWidth(lastColMinimumWidth),
     allColumnsMinimumWidth(allColsMinimumWidth)
diff --git a/src/qt/guiutil.h b/src/qt/guiutil.h
index 64cbd51eb6f39..8f1f3fbb2c47e 100644
--- a/src/qt/guiutil.h
+++ b/src/qt/guiutil.h
@@ -149,7 +149,7 @@ namespace GUIUtil
         Q_OBJECT
 
         public:
-            TableViewLastColumnResizingFixer(QTableView* table, int lastColMinimumWidth, int allColsMinimumWidth);
+            TableViewLastColumnResizingFixer(QTableView* table, int lastColMinimumWidth, int allColsMinimumWidth, QObject *parent);
             void stretchColumnWidth(int column);
 
         private:
diff --git a/src/qt/overviewpage.cpp b/src/qt/overviewpage.cpp
index 7ccdb89c0cdf5..ea1bb2fc94b4a 100644
--- a/src/qt/overviewpage.cpp
+++ b/src/qt/overviewpage.cpp
@@ -25,8 +25,8 @@ class TxViewDelegate : public QAbstractItemDelegate
 {
     Q_OBJECT
 public:
-    TxViewDelegate(const PlatformStyle *_platformStyle):
-        QAbstractItemDelegate(), unit(BitcoinUnits::BTC),
+    TxViewDelegate(const PlatformStyle *_platformStyle, QObject *parent=nullptr):
+        QAbstractItemDelegate(parent), unit(BitcoinUnits::BTC),
         platformStyle(_platformStyle)
     {
 
@@ -119,8 +119,7 @@ OverviewPage::OverviewPage(const PlatformStyle *platformStyle, QWidget *parent)
     currentWatchOnlyBalance(-1),
     currentWatchUnconfBalance(-1),
     currentWatchImmatureBalance(-1),
-    txdelegate(new TxViewDelegate(platformStyle)),
-    filter(0)
+    txdelegate(new TxViewDelegate(platformStyle, this))
 {
     ui->setupUi(this);
 
@@ -220,7 +219,7 @@ void OverviewPage::setWalletModel(WalletModel *model)
     if(model && model->getOptionsModel())
     {
         // Set up transaction list
-        filter = new TransactionFilterProxy();
+        filter.reset(new TransactionFilterProxy());
         filter->setSourceModel(model->getTransactionTableModel());
         filter->setLimit(NUM_ITEMS);
         filter->setDynamicSortFilter(true);
@@ -228,7 +227,7 @@ void OverviewPage::setWalletModel(WalletModel *model)
         filter->setShowInactive(false);
         filter->sort(TransactionTableModel::Date, Qt::DescendingOrder);
 
-        ui->listTransactions->setModel(filter);
+        ui->listTransactions->setModel(filter.get());
         ui->listTransactions->setModelColumn(TransactionTableModel::ToAddress);
 
         // Keep up to date with wallet
diff --git a/src/qt/overviewpage.h b/src/qt/overviewpage.h
index 65cd3341b6b42..ffe0de328c603 100644
--- a/src/qt/overviewpage.h
+++ b/src/qt/overviewpage.h
@@ -8,6 +8,7 @@
 #include "amount.h"
 
 #include <QWidget>
+#include <memory>
 
 class ClientModel;
 class TransactionFilterProxy;
@@ -56,7 +57,7 @@ public Q_SLOTS:
     CAmount currentWatchImmatureBalance;
 
     TxViewDelegate *txdelegate;
-    TransactionFilterProxy *filter;
+    std::unique_ptr<TransactionFilterProxy> filter;
 
 private Q_SLOTS:
     void updateDisplayUnit();
diff --git a/src/qt/peertablemodel.cpp b/src/qt/peertablemodel.cpp
index a2f9471fcc688..c0b4900285427 100644
--- a/src/qt/peertablemodel.cpp
+++ b/src/qt/peertablemodel.cpp
@@ -114,12 +114,12 @@ PeerTableModel::PeerTableModel(ClientModel *parent) :
     timer(0)
 {
     columns << tr("NodeId") << tr("Node/Service") << tr("User Agent") << tr("Ping");
-    priv = new PeerTablePriv();
+    priv.reset(new PeerTablePriv());
     // default to unsorted
     priv->sortColumn = -1;
 
     // set up timer for auto refresh
-    timer = new QTimer();
+    timer = new QTimer(this);
     connect(timer, SIGNAL(timeout()), SLOT(refresh()));
     timer->setInterval(MODEL_UPDATE_DELAY);
 
@@ -127,6 +127,11 @@ PeerTableModel::PeerTableModel(ClientModel *parent) :
     refresh();
 }
 
+PeerTableModel::~PeerTableModel()
+{
+    // Intentionally left empty
+}
+
 void PeerTableModel::startAutoRefresh()
 {
     timer->start();
diff --git a/src/qt/peertablemodel.h b/src/qt/peertablemodel.h
index a4f7bbdb3d708..af34b147b1eb8 100644
--- a/src/qt/peertablemodel.h
+++ b/src/qt/peertablemodel.h
@@ -46,6 +46,7 @@ class PeerTableModel : public QAbstractTableModel
 
 public:
     explicit PeerTableModel(ClientModel *parent = 0);
+    ~PeerTableModel();
     const CNodeCombinedStats *getNodeStats(int idx);
     int getRowByNodeId(NodeId nodeid);
     void startAutoRefresh();
@@ -75,7 +76,7 @@ public Q_SLOTS:
 private:
     ClientModel *clientModel;
     QStringList columns;
-    PeerTablePriv *priv;
+    std::unique_ptr<PeerTablePriv> priv;
     QTimer *timer;
 };
 
diff --git a/src/qt/receivecoinsdialog.cpp b/src/qt/receivecoinsdialog.cpp
index b50cad4975a81..dd83547a91731 100644
--- a/src/qt/receivecoinsdialog.cpp
+++ b/src/qt/receivecoinsdialog.cpp
@@ -25,6 +25,7 @@
 ReceiveCoinsDialog::ReceiveCoinsDialog(const PlatformStyle *_platformStyle, QWidget *parent) :
     QDialog(parent),
     ui(new Ui::ReceiveCoinsDialog),
+    columnResizingFixer(0),
     model(0),
     platformStyle(_platformStyle)
 {
@@ -49,7 +50,7 @@ ReceiveCoinsDialog::ReceiveCoinsDialog(const PlatformStyle *_platformStyle, QWid
     QAction *copyAmountAction = new QAction(tr("Copy amount"), this);
 
     // context menu
-    contextMenu = new QMenu();
+    contextMenu = new QMenu(this);
     contextMenu->addAction(copyURIAction);
     contextMenu->addAction(copyLabelAction);
     contextMenu->addAction(copyMessageAction);
@@ -91,7 +92,7 @@ void ReceiveCoinsDialog::setModel(WalletModel *_model)
             SIGNAL(selectionChanged(QItemSelection, QItemSelection)), this,
             SLOT(recentRequestsView_selectionChanged(QItemSelection, QItemSelection)));
         // Last 2 columns are set by the columnResizingFixer, when the table geometry is ready.
-        columnResizingFixer = new GUIUtil::TableViewLastColumnResizingFixer(tableView, AMOUNT_MINIMUM_COLUMN_WIDTH, DATE_COLUMN_WIDTH);
+        columnResizingFixer = new GUIUtil::TableViewLastColumnResizingFixer(tableView, AMOUNT_MINIMUM_COLUMN_WIDTH, DATE_COLUMN_WIDTH, this);
     }
 }
 
diff --git a/src/qt/receiverequestdialog.cpp b/src/qt/receiverequestdialog.cpp
index 998c9176d7bca..f896461735ce5 100644
--- a/src/qt/receiverequestdialog.cpp
+++ b/src/qt/receiverequestdialog.cpp
@@ -32,7 +32,7 @@
 QRImageWidget::QRImageWidget(QWidget *parent):
     QLabel(parent), contextMenu(0)
 {
-    contextMenu = new QMenu();
+    contextMenu = new QMenu(this);
     QAction *saveImageAction = new QAction(tr("&Save Image..."), this);
     connect(saveImageAction, SIGNAL(triggered()), this, SLOT(saveImage()));
     contextMenu->addAction(saveImageAction);
diff --git a/src/qt/recentrequeststablemodel.cpp b/src/qt/recentrequeststablemodel.cpp
index 2335d6b282a6e..35d37bb22bb08 100644
--- a/src/qt/recentrequeststablemodel.cpp
+++ b/src/qt/recentrequeststablemodel.cpp
@@ -14,7 +14,7 @@
 #include <boost/foreach.hpp>
 
 RecentRequestsTableModel::RecentRequestsTableModel(CWallet *wallet, WalletModel *parent) :
-    walletModel(parent)
+    QAbstractTableModel(parent), walletModel(parent)
 {
     Q_UNUSED(wallet);
     nReceiveRequestsMaxId = 0;
diff --git a/src/qt/rpcconsole.cpp b/src/qt/rpcconsole.cpp
index 47af6a5724858..7f5bb29f160b8 100644
--- a/src/qt/rpcconsole.cpp
+++ b/src/qt/rpcconsole.cpp
@@ -486,7 +486,7 @@ void RPCConsole::setClientModel(ClientModel *model)
         QAction* banAction365d    = new QAction(tr("Ban for") + " " + tr("1 &year"), this);
 
         // create peer table context menu
-        peersTableContextMenu = new QMenu();
+        peersTableContextMenu = new QMenu(this);
         peersTableContextMenu->addAction(disconnectAction);
         peersTableContextMenu->addAction(banAction1h);
         peersTableContextMenu->addAction(banAction24h);
@@ -534,7 +534,7 @@ void RPCConsole::setClientModel(ClientModel *model)
         QAction* unbanAction = new QAction(tr("&Unban"), this);
 
         // create ban table context menu
-        banTableContextMenu = new QMenu();
+        banTableContextMenu = new QMenu(this);
         banTableContextMenu->addAction(unbanAction);
 
         // ban table context menu signals
diff --git a/src/qt/transactionview.cpp b/src/qt/transactionview.cpp
index 856b16d2c46ee..f5cbde6238d7f 100644
--- a/src/qt/transactionview.cpp
+++ b/src/qt/transactionview.cpp
@@ -37,7 +37,7 @@
 
 TransactionView::TransactionView(const PlatformStyle *platformStyle, QWidget *parent) :
     QWidget(parent), model(0), transactionProxyModel(0),
-    transactionView(0), abandonAction(0)
+    transactionView(0), abandonAction(0), columnResizingFixer(0)
 {
     // Build filter row
     setContentsMargins(0,0,0,0);
@@ -147,7 +147,7 @@ TransactionView::TransactionView(const PlatformStyle *platformStyle, QWidget *pa
     QAction *editLabelAction = new QAction(tr("Edit label"), this);
     QAction *showDetailsAction = new QAction(tr("Show transaction details"), this);
 
-    contextMenu = new QMenu();
+    contextMenu = new QMenu(this);
     contextMenu->addAction(copyAddressAction);
     contextMenu->addAction(copyLabelAction);
     contextMenu->addAction(copyAmountAction);
@@ -212,7 +212,7 @@ void TransactionView::setModel(WalletModel *_model)
         transactionView->setColumnWidth(TransactionTableModel::Type, TYPE_COLUMN_WIDTH);
         transactionView->setColumnWidth(TransactionTableModel::Amount, AMOUNT_MINIMUM_COLUMN_WIDTH);
 
-        columnResizingFixer = new GUIUtil::TableViewLastColumnResizingFixer(transactionView, AMOUNT_MINIMUM_COLUMN_WIDTH, MINIMUM_COLUMN_WIDTH);
+        columnResizingFixer = new GUIUtil::TableViewLastColumnResizingFixer(transactionView, AMOUNT_MINIMUM_COLUMN_WIDTH, MINIMUM_COLUMN_WIDTH, this);
 
         if (_model->getOptionsModel())
         {

From 693384eedb1ac7f449e226edd53e2cb52a86e279 Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Fri, 18 Nov 2016 16:35:14 +0100
Subject: [PATCH 1249/1802] qt: Prevent thread/memory leak on exiting
 RPCConsole

Make ownership of the QThread object clear, so that the RPCConsole
can wait for the executor thread to quit before shutdown is called. This
increases overall thread safety, and prevents some objects from leaking
on exit.
---
 src/qt/bitcoin.cpp    |  8 +++++---
 src/qt/bitcoingui.cpp | 11 ++++++++---
 src/qt/rpcconsole.cpp | 24 ++++++++++++++----------
 src/qt/rpcconsole.h   |  2 ++
 4 files changed, 29 insertions(+), 16 deletions(-)

diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp
index c828234f44262..1434c45dd4f11 100644
--- a/src/qt/bitcoin.cpp
+++ b/src/qt/bitcoin.cpp
@@ -409,6 +409,11 @@ void BitcoinApplication::requestInitialize()
 
 void BitcoinApplication::requestShutdown()
 {
+    // Show a simple window indicating shutdown status
+    // Do this first as some of the steps may take some time below,
+    // for example the RPC console may still be executing a command.
+    ShutdownWindow::showShutdownWindow(window);
+
     qDebug() << __func__ << ": Requesting shutdown";
     startThread();
     window->hide();
@@ -423,9 +428,6 @@ void BitcoinApplication::requestShutdown()
     delete clientModel;
     clientModel = 0;
 
-    // Show a simple window indicating shutdown status
-    ShutdownWindow::showShutdownWindow(window);
-
     // Request shutdown from core thread
     Q_EMIT requestedShutdown();
 }
diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp
index 4d78fd13c0fa1..788fc9af31726 100644
--- a/src/qt/bitcoingui.cpp
+++ b/src/qt/bitcoingui.cpp
@@ -511,6 +511,13 @@ void BitcoinGUI::setClientModel(ClientModel *_clientModel)
             // Disable context menu on tray icon
             trayIconMenu->clear();
         }
+        // Propagate cleared model to child objects
+        rpcConsole->setClientModel(nullptr);
+#ifdef ENABLE_WALLET
+        walletFrame->setClientModel(nullptr);
+#endif // ENABLE_WALLET
+        unitDisplayControl->setOptionsModel(nullptr);
+        connectionsControl->setClientModel(nullptr);
     }
 }
 
@@ -1242,7 +1249,5 @@ void NetworkToggleStatusBarControl::mousePressEvent(QMouseEvent *event)
 /** Lets the control know about the Client Model */
 void NetworkToggleStatusBarControl::setClientModel(ClientModel *_clientModel)
 {
-    if (_clientModel) {
-        this->clientModel = _clientModel;
-    }
+    this->clientModel = _clientModel;
 }
diff --git a/src/qt/rpcconsole.cpp b/src/qt/rpcconsole.cpp
index 7f5bb29f160b8..520d22990189f 100644
--- a/src/qt/rpcconsole.cpp
+++ b/src/qt/rpcconsole.cpp
@@ -382,7 +382,6 @@ RPCConsole::RPCConsole(const PlatformStyle *_platformStyle, QWidget *parent) :
     // based timer interface
     RPCSetTimerInterfaceIfUnset(rpcTimerInterface);
 
-    startExecutor();
     setTrafficGraphRange(INITIAL_TRAFFIC_GRAPH_MINS);
 
     ui->detailWidget->hide();
@@ -396,7 +395,6 @@ RPCConsole::RPCConsole(const PlatformStyle *_platformStyle, QWidget *parent) :
 RPCConsole::~RPCConsole()
 {
     GUIUtil::saveWindowGeometry("nRPCConsoleWindow", this);
-    Q_EMIT stopExecutor();
     RPCUnsetTimerInterface(rpcTimerInterface);
     delete rpcTimerInterface;
     delete ui;
@@ -565,6 +563,14 @@ void RPCConsole::setClientModel(ClientModel *model)
         autoCompleter = new QCompleter(wordList, this);
         ui->lineEdit->setCompleter(autoCompleter);
         autoCompleter->popup()->installEventFilter(this);
+        // Start thread to execute RPC commands.
+        startExecutor();
+    }
+    if (!model) {
+        // Client model is being set to 0, this means shutdown() is about to be called.
+        // Make sure we clean up the executor thread
+        Q_EMIT stopExecutor();
+        thread.wait();
     }
 }
 
@@ -759,9 +765,8 @@ void RPCConsole::browseHistory(int offset)
 
 void RPCConsole::startExecutor()
 {
-    QThread *thread = new QThread;
     RPCExecutor *executor = new RPCExecutor();
-    executor->moveToThread(thread);
+    executor->moveToThread(&thread);
 
     // Replies from executor object must go to this object
     connect(executor, SIGNAL(reply(int,QString)), this, SLOT(message(int,QString)));
@@ -769,16 +774,15 @@ void RPCConsole::startExecutor()
     connect(this, SIGNAL(cmdRequest(QString)), executor, SLOT(request(QString)));
 
     // On stopExecutor signal
-    // - queue executor for deletion (in execution thread)
     // - quit the Qt event loop in the execution thread
-    connect(this, SIGNAL(stopExecutor()), executor, SLOT(deleteLater()));
-    connect(this, SIGNAL(stopExecutor()), thread, SLOT(quit()));
-    // Queue the thread for deletion (in this thread) when it is finished
-    connect(thread, SIGNAL(finished()), thread, SLOT(deleteLater()));
+    connect(this, SIGNAL(stopExecutor()), &thread, SLOT(quit()));
+    // - queue executor for deletion (in execution thread)
+    connect(&thread, SIGNAL(finished()), executor, SLOT(deleteLater()), Qt::DirectConnection);
+    connect(&thread, SIGNAL(finished()), this, SLOT(test()), Qt::DirectConnection);
 
     // Default implementation of QThread::run() simply spins up an event loop in the thread,
     // which is what we want.
-    thread->start();
+    thread.start();
 }
 
 void RPCConsole::on_tabWidget_currentChanged(int index)
diff --git a/src/qt/rpcconsole.h b/src/qt/rpcconsole.h
index 8c20379a8c02a..344d5ecb98d15 100644
--- a/src/qt/rpcconsole.h
+++ b/src/qt/rpcconsole.h
@@ -12,6 +12,7 @@
 
 #include <QWidget>
 #include <QCompleter>
+#include <QThread>
 
 class ClientModel;
 class PlatformStyle;
@@ -148,6 +149,7 @@ public Q_SLOTS:
     QMenu *banTableContextMenu;
     int consoleFontSize;
     QCompleter *autoCompleter;
+    QThread thread;
 
     /** Update UI with latest network info from model. */
     void updateNetworkState();

From e4f126a7ba66e7317718c30276dff6db92dc1986 Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Sat, 19 Nov 2016 11:08:19 +0100
Subject: [PATCH 1250/1802] qt: Avoid splash-screen related memory leak

Make splash screen queue its own deletion when it receives the finished
command, instead of relying on WA_DeleteOnClose which doesn't work under
these circumstances.
---
 src/qt/bitcoin.cpp      | 5 ++---
 src/qt/splashscreen.cpp | 1 +
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp
index 1434c45dd4f11..d63964805d5bf 100644
--- a/src/qt/bitcoin.cpp
+++ b/src/qt/bitcoin.cpp
@@ -365,9 +365,8 @@ void BitcoinApplication::createWindow(const NetworkStyle *networkStyle)
 void BitcoinApplication::createSplashScreen(const NetworkStyle *networkStyle)
 {
     SplashScreen *splash = new SplashScreen(0, networkStyle);
-    // We don't hold a direct pointer to the splash screen after creation, so use
-    // Qt::WA_DeleteOnClose to make sure that the window will be deleted eventually.
-    splash->setAttribute(Qt::WA_DeleteOnClose);
+    // We don't hold a direct pointer to the splash screen after creation, but the splash
+    // screen will take care of deleting itself when slotFinish happens.
     splash->show();
     connect(this, SIGNAL(splashFinished(QWidget*)), splash, SLOT(slotFinish(QWidget*)));
     connect(this, SIGNAL(requestedShutdown()), splash, SLOT(close()));
diff --git a/src/qt/splashscreen.cpp b/src/qt/splashscreen.cpp
index cd273856531a7..1b6e28e93e67a 100644
--- a/src/qt/splashscreen.cpp
+++ b/src/qt/splashscreen.cpp
@@ -147,6 +147,7 @@ void SplashScreen::slotFinish(QWidget *mainWin)
     if (isMinimized())
         showNormal();
     hide();
+    deleteLater(); // No more need for this
 }
 
 static void InitMessage(SplashScreen *splash, const std::string &message)

From 5204598f8d07d7432d91e9b8781806d2f3d16415 Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Sat, 19 Nov 2016 14:28:55 +0100
Subject: [PATCH 1251/1802] qt: Avoid shutdownwindow-related memory leak

Store a reference to the shutdown window on BitcoinApplication,
so that it will be deleted when exiting the main loop.
---
 src/qt/bitcoin.cpp       | 3 ++-
 src/qt/utilitydialog.cpp | 8 +++-----
 src/qt/utilitydialog.h   | 2 +-
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp
index d63964805d5bf..d7452f308e50e 100644
--- a/src/qt/bitcoin.cpp
+++ b/src/qt/bitcoin.cpp
@@ -245,6 +245,7 @@ public Q_SLOTS:
 #endif
     int returnValue;
     const PlatformStyle *platformStyle;
+    std::unique_ptr<QWidget> shutdownWindow;
 
     void startThread();
 };
@@ -411,7 +412,7 @@ void BitcoinApplication::requestShutdown()
     // Show a simple window indicating shutdown status
     // Do this first as some of the steps may take some time below,
     // for example the RPC console may still be executing a command.
-    ShutdownWindow::showShutdownWindow(window);
+    shutdownWindow.reset(ShutdownWindow::showShutdownWindow(window));
 
     qDebug() << __func__ << ": Requesting shutdown";
     startThread();
diff --git a/src/qt/utilitydialog.cpp b/src/qt/utilitydialog.cpp
index 947bcdb15ae17..4ec022881c1a7 100644
--- a/src/qt/utilitydialog.cpp
+++ b/src/qt/utilitydialog.cpp
@@ -171,22 +171,20 @@ ShutdownWindow::ShutdownWindow(QWidget *parent, Qt::WindowFlags f):
     setLayout(layout);
 }
 
-void ShutdownWindow::showShutdownWindow(BitcoinGUI *window)
+QWidget *ShutdownWindow::showShutdownWindow(BitcoinGUI *window)
 {
     if (!window)
-        return;
+        return nullptr;
 
     // Show a simple window indicating shutdown status
     QWidget *shutdownWindow = new ShutdownWindow();
-    // We don't hold a direct pointer to the shutdown window after creation, so use
-    // Qt::WA_DeleteOnClose to make sure that the window will be deleted eventually.
-    shutdownWindow->setAttribute(Qt::WA_DeleteOnClose);
     shutdownWindow->setWindowTitle(window->windowTitle());
 
     // Center shutdown window at where main window was
     const QPoint global = window->mapToGlobal(window->rect().center());
     shutdownWindow->move(global.x() - shutdownWindow->width() / 2, global.y() - shutdownWindow->height() / 2);
     shutdownWindow->show();
+    return shutdownWindow;
 }
 
 void ShutdownWindow::closeEvent(QCloseEvent *event)
diff --git a/src/qt/utilitydialog.h b/src/qt/utilitydialog.h
index 843bd7f67bc06..b930429578c43 100644
--- a/src/qt/utilitydialog.h
+++ b/src/qt/utilitydialog.h
@@ -43,7 +43,7 @@ class ShutdownWindow : public QWidget
 
 public:
     ShutdownWindow(QWidget *parent=0, Qt::WindowFlags f=0);
-    static void showShutdownWindow(BitcoinGUI *window);
+    static QWidget *showShutdownWindow(BitcoinGUI *window);
 
 protected:
     void closeEvent(QCloseEvent *event);

From ed998ea7a0ecf294211b06e9ef82f1548a621a1d Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Sat, 19 Nov 2016 16:12:23 +0100
Subject: [PATCH 1252/1802] qt: Avoid OpenSSL certstore-related memory leak

- Correctly manage the X509 and X509_STORE objects lifetime.
---
 src/qt/paymentserver.cpp | 43 ++++++++++++++++++++++------------------
 src/qt/paymentserver.h   |  5 +----
 2 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/src/qt/paymentserver.cpp b/src/qt/paymentserver.cpp
index 478f5ccf1274f..229752cad2206 100644
--- a/src/qt/paymentserver.cpp
+++ b/src/qt/paymentserver.cpp
@@ -58,14 +58,19 @@ const char* BIP71_MIMETYPE_PAYMENTREQUEST = "application/bitcoin-paymentrequest"
 // BIP70 max payment request size in bytes (DoS protection)
 const qint64 BIP70_MAX_PAYMENTREQUEST_SIZE = 50000;
 
-X509_STORE* PaymentServer::certStore = NULL;
-void PaymentServer::freeCertStore()
+struct X509StoreDeleter {
+      void operator()(X509_STORE* b) {
+          X509_STORE_free(b);
+      }
+};
+
+struct X509Deleter {
+      void operator()(X509* b) { X509_free(b); }
+};
+
+namespace // Anon namespace
 {
-    if (PaymentServer::certStore != NULL)
-    {
-        X509_STORE_free(PaymentServer::certStore);
-        PaymentServer::certStore = NULL;
-    }
+    std::unique_ptr<X509_STORE, X509StoreDeleter> certStore;
 }
 
 //
@@ -107,20 +112,15 @@ static void ReportInvalidCertificate(const QSslCertificate& cert)
 //
 void PaymentServer::LoadRootCAs(X509_STORE* _store)
 {
-    if (PaymentServer::certStore == NULL)
-        atexit(PaymentServer::freeCertStore);
-    else
-        freeCertStore();
-
     // Unit tests mostly use this, to pass in fake root CAs:
     if (_store)
     {
-        PaymentServer::certStore = _store;
+        certStore.reset(_store);
         return;
     }
 
     // Normal execution, use either -rootcertificates or system certs:
-    PaymentServer::certStore = X509_STORE_new();
+    certStore.reset(X509_STORE_new());
 
     // Note: use "-system-" default here so that users can pass -rootcertificates=""
     // and get 'I don't like X.509 certificates, don't trust anybody' behavior:
@@ -167,11 +167,11 @@ void PaymentServer::LoadRootCAs(X509_STORE* _store)
         QByteArray certData = cert.toDer();
         const unsigned char *data = (const unsigned char *)certData.data();
 
-        X509* x509 = d2i_X509(0, &data, certData.size());
-        if (x509 && X509_STORE_add_cert(PaymentServer::certStore, x509))
+        std::unique_ptr<X509, X509Deleter> x509(d2i_X509(0, &data, certData.size()));
+        if (x509 && X509_STORE_add_cert(certStore.get(), x509.get()))
         {
-            // Note: X509_STORE_free will free the X509* objects when
-            // the PaymentServer is destroyed
+            // Note: X509_STORE increases the reference count to the X509 object,
+            // we still have to release our reference to it.
             ++nRootCerts;
         }
         else
@@ -550,7 +550,7 @@ bool PaymentServer::processPaymentRequest(const PaymentRequestPlus& request, Sen
     recipient.paymentRequest = request;
     recipient.message = GUIUtil::HtmlEscape(request.getDetails().memo());
 
-    request.getMerchant(PaymentServer::certStore, recipient.authenticatedMerchant);
+    request.getMerchant(certStore.get(), recipient.authenticatedMerchant);
 
     QList<std::pair<CScript, CAmount> > sendingTos = request.getPayTo();
     QStringList addresses;
@@ -807,3 +807,8 @@ bool PaymentServer::verifyAmount(const CAmount& requestAmount)
     }
     return fVerified;
 }
+
+X509_STORE* PaymentServer::getCertStore()
+{
+    return certStore.get();
+}
diff --git a/src/qt/paymentserver.h b/src/qt/paymentserver.h
index 2d27ed078b537..7202e7dada7b9 100644
--- a/src/qt/paymentserver.h
+++ b/src/qt/paymentserver.h
@@ -83,7 +83,7 @@ class PaymentServer : public QObject
     static void LoadRootCAs(X509_STORE* store = NULL);
 
     // Return certificate store
-    static X509_STORE* getCertStore() { return certStore; }
+    static X509_STORE* getCertStore();
 
     // OptionsModel is used for getting proxy settings and display unit
     void setOptionsModel(OptionsModel *optionsModel);
@@ -140,9 +140,6 @@ private Q_SLOTS:
     bool saveURIs;                      // true during startup
     QLocalServer* uriServer;
 
-    static X509_STORE* certStore;       // Trusted root certificates
-    static void freeCertStore();
-
     QNetworkAccessManager* netManager;  // Used to fetch payment requests
 
     OptionsModel *optionsModel;

From d2b88f97a1235057290f9e8ca0bf11437ba919f8 Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Thu, 3 Nov 2016 14:58:29 -0400
Subject: [PATCH 1253/1802] Move orphan-conflict removal from main logic into a
 callback

This makes the orphan map a part of net-processing logic instead
of main logic.
---
 src/main.cpp | 56 ++++++++++++++++++++++++++--------------------------
 src/main.h   |  1 +
 2 files changed, 29 insertions(+), 28 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index a5b00813634ea..025449ad69ba9 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -3085,34 +3085,6 @@ bool ActivateBestChain(CValidationState &state, const CChainParams& chainparams,
         }
         // When we reach this point, we switched to a new tip (stored in pindexNewTip).
 
-        // Remove orphan transactions with cs_main
-        {
-            LOCK(cs_main);
-            for(unsigned int i = 0; i < txChanged.size(); i++) {
-                std::vector<uint256> vOrphanErase;
-                const CTransaction& tx = std::get<0>(txChanged[i]);
-                // Which orphan pool entries must we evict?
-                for (size_t j = 0; j < tx.vin.size(); j++) {
-                    auto itByPrev = mapOrphanTransactionsByPrev.find(tx.vin[j].prevout);
-                    if (itByPrev == mapOrphanTransactionsByPrev.end()) continue;
-                    for (auto mi = itByPrev->second.begin(); mi != itByPrev->second.end(); ++mi) {
-                        const CTransaction& orphanTx = (*mi)->second.tx;
-                        const uint256& orphanHash = orphanTx.GetHash();
-                        vOrphanErase.push_back(orphanHash);
-                    }
-                }
-
-                // Erase orphan transactions include or precluded by this block
-                if (vOrphanErase.size()) {
-                    int nErased = 0;
-                    BOOST_FOREACH(uint256 &orphanHash, vOrphanErase) {
-                        nErased += EraseOrphanTx(orphanHash);
-                    }
-                    LogPrint("mempool", "Erased %d orphan tx included or conflicted by block\n", nErased);
-                }
-            }
-        }
-
         // Notifications/callbacks that can run without cs_main
 
         // throw all transactions though the signal-interface
@@ -4752,6 +4724,34 @@ PeerLogicValidation::PeerLogicValidation(CConnman* connmanIn) : connman(connmanI
     recentRejects.reset(new CRollingBloomFilter(120000, 0.000001));
 }
 
+void PeerLogicValidation::SyncTransaction(const CTransaction& tx, const CBlockIndex* pindex, int nPosInBlock) {
+    if (nPosInBlock == CMainSignals::SYNC_TRANSACTION_NOT_IN_BLOCK)
+        return;
+
+    LOCK(cs_main);
+
+    std::vector<uint256> vOrphanErase;
+    // Which orphan pool entries must we evict?
+    for (size_t j = 0; j < tx.vin.size(); j++) {
+        auto itByPrev = mapOrphanTransactionsByPrev.find(tx.vin[j].prevout);
+        if (itByPrev == mapOrphanTransactionsByPrev.end()) continue;
+        for (auto mi = itByPrev->second.begin(); mi != itByPrev->second.end(); ++mi) {
+            const CTransaction& orphanTx = (*mi)->second.tx;
+            const uint256& orphanHash = orphanTx.GetHash();
+            vOrphanErase.push_back(orphanHash);
+        }
+    }
+
+    // Erase orphan transactions include or precluded by this block
+    if (vOrphanErase.size()) {
+        int nErased = 0;
+        BOOST_FOREACH(uint256 &orphanHash, vOrphanErase) {
+            nErased += EraseOrphanTx(orphanHash);
+        }
+        LogPrint("mempool", "Erased %d orphan tx included or conflicted by block\n", nErased);
+    }
+}
+
 void PeerLogicValidation::UpdatedBlockTip(const CBlockIndex *pindexNew, const CBlockIndex *pindexFork, bool fInitialDownload) {
     const int nNewHeight = pindexNew->nHeight;
     connman->SetBestHeight(nNewHeight);
diff --git a/src/main.h b/src/main.h
index 678f0fd99dcdb..6d4240c26ca5d 100644
--- a/src/main.h
+++ b/src/main.h
@@ -560,6 +560,7 @@ class PeerLogicValidation : public CValidationInterface {
 public:
     PeerLogicValidation(CConnman* connmanIn);
 
+    virtual void SyncTransaction(const CTransaction& tx, const CBlockIndex* pindex, int nPosInBlock);
     virtual void UpdatedBlockTip(const CBlockIndex *pindexNew, const CBlockIndex *pindexFork, bool fInitialDownload);
     virtual void BlockChecked(const CBlock& block, const CValidationState& state);
 };

From 4a6b1f36b773001f6c5a8e1d3d196833e4fb872d Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Sun, 2 Oct 2016 12:22:05 -0400
Subject: [PATCH 1254/1802] Expose AcceptBlockHeader through main.h

---
 src/main.cpp | 17 ++++++++++++++++-
 src/main.h   | 11 +++++++++++
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/src/main.cpp b/src/main.cpp
index 05442057e49a1..4a2682bc7838f 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -3649,7 +3649,7 @@ bool ContextualCheckBlock(const CBlock& block, CValidationState& state, const Co
     return true;
 }
 
-static bool AcceptBlockHeader(const CBlockHeader& block, CValidationState& state, const CChainParams& chainparams, CBlockIndex** ppindex=NULL)
+static bool AcceptBlockHeader(const CBlockHeader& block, CValidationState& state, const CChainParams& chainparams, CBlockIndex** ppindex)
 {
     AssertLockHeld(cs_main);
     // Check for duplicate
@@ -3698,6 +3698,21 @@ static bool AcceptBlockHeader(const CBlockHeader& block, CValidationState& state
     return true;
 }
 
+// Exposed wrapper for AcceptBlockHeader
+bool ProcessNewBlockHeaders(const std::vector<CBlockHeader>& headers, CValidationState& state, const CChainParams& chainparams, CBlockIndex** ppindex)
+{
+    {
+        LOCK(cs_main);
+        for (const CBlockHeader& header : headers) {
+            if (!AcceptBlockHeader(header, state, chainparams, ppindex)) {
+                return false;
+            }
+        }
+    }
+    NotifyHeaderTip();
+    return true;
+}
+
 /** Store block on disk. If dbp is non-NULL, the file is known to already reside on disk */
 static bool AcceptBlock(const CBlock& block, CValidationState& state, const CChainParams& chainparams, CBlockIndex** ppindex, bool fRequested, const CDiskBlockPos* dbp, bool* fNewBlock)
 {
diff --git a/src/main.h b/src/main.h
index 43c62f6de6c27..9fb6b298c4cec 100644
--- a/src/main.h
+++ b/src/main.h
@@ -230,6 +230,17 @@ static const uint64_t MIN_DISK_SPACE_FOR_BLOCK_FILES = 550 * 1024 * 1024;
  * @return True if state.IsValid()
  */
 bool ProcessNewBlock(const CChainParams& chainparams, const CBlock* pblock, bool fForceProcessing, const CDiskBlockPos* dbp, bool* fNewBlock);
+
+/**
+ * Process incoming block headers.
+ *
+ * @param[in]  block The block headers themselves
+ * @param[out] state This may be set to an Error state if any error occurred processing them
+ * @param[in]  chainparams The params for the chain we want to connect to
+ * @param[out] ppindex If set, the pointer will be set to point to the last new block index object for the given headers
+ */
+bool ProcessNewBlockHeaders(const std::vector<CBlockHeader>& block, CValidationState& state, const CChainParams& chainparams, CBlockIndex** ppindex=NULL);
+
 /** Check whether enough disk space is available for an incoming block */
 bool CheckDiskSpace(uint64_t nAdditionalBytes = 0);
 /** Open a block file (blk?????.dat) */

From 63fd101c529cf6e2bc5ecab244fd56e2c5be521f Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Thu, 3 Nov 2016 16:34:31 -0400
Subject: [PATCH 1255/1802] Split ::HEADERS processing into two separate
 cs_main locks

This will allow NotifyHeaderTip to be called from an
AcceptBlockHeader wrapper function without holding cs_main.
---
 src/main.cpp | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index 4a2682bc7838f..4cd5bebb7ccf3 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -5982,14 +5982,14 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
             ReadCompactSize(vRecv); // ignore tx count; assume it is 0.
         }
 
-        {
-        LOCK(cs_main);
-
         if (nCount == 0) {
             // Nothing interesting. Stop asking this peers for more headers.
             return true;
         }
 
+        CBlockIndex *pindexLast = NULL;
+        {
+        LOCK(cs_main);
         CNodeState *nodestate = State(pfrom->GetId());
 
         // If this looks like it could be a block announcement (nCount <
@@ -6019,7 +6019,6 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
             return true;
         }
 
-        CBlockIndex *pindexLast = NULL;
         BOOST_FOREACH(const CBlockHeader& header, headers) {
             CValidationState state;
             if (pindexLast != NULL && header.hashPrevBlock != pindexLast->GetBlockHash()) {
@@ -6035,7 +6034,11 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
                 }
             }
         }
+        }
 
+        {
+        LOCK(cs_main);
+        CNodeState *nodestate = State(pfrom->GetId());
         if (nodestate->nUnconnectingHeaders > 0) {
             LogPrint("net", "peer=%d: resetting nUnconnectingHeaders (%d -> 0)\n", pfrom->id, nodestate->nUnconnectingHeaders);
         }

From d74e352e0136bb746c2975f9a4092f23b9d8899c Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Tue, 15 Nov 2016 17:26:32 -0500
Subject: [PATCH 1256/1802] net: Set feelers to disconnect at the end of the
 version message

This way we're not relying on messages going out after fDisconnect has been
set.

This should not cause any real behavioral changes, though feelers should
arguably disconnect earlier in the process. That can be addressed in a later
functional change.
---
 src/main.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index 05442057e49a1..bc4be84e0220d 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -5086,12 +5086,6 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
 
     if (strCommand == NetMsgType::VERSION)
     {
-        // Feeler connections exist only to verify if address is online.
-        if (pfrom->fFeeler) {
-            assert(pfrom->fInbound == false);
-            pfrom->fDisconnect = true;
-        }
-
         // Each connection can only send one version message
         if (pfrom->nVersion != 0)
         {
@@ -5227,6 +5221,12 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
         int64_t nTimeOffset = nTime - GetTime();
         pfrom->nTimeOffset = nTimeOffset;
         AddTimeData(pfrom->addr, nTimeOffset);
+
+        // Feeler connections exist only to verify if address is online.
+        if (pfrom->fFeeler) {
+            assert(pfrom->fInbound == false);
+            pfrom->fDisconnect = true;
+        }
     }
 
 

From fedea8a14d482c31e1736fe1d2d0668f06b8b398 Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Wed, 9 Nov 2016 14:17:51 -0500
Subject: [PATCH 1257/1802] net: don't send any messages before handshake or
 after requested disconnect

Also, send reject messages earlier in SendMessages(), so that disconnections are
processed earlier.

These changes combined should ensure that no message is ever sent after
fDisconnect is set.
---
 src/main.cpp | 46 +++++++++++++++++++++++++---------------------
 1 file changed, 25 insertions(+), 21 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index bc4be84e0220d..24f320832f84a 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -6512,7 +6512,7 @@ bool SendMessages(CNode* pto, CConnman& connman)
     const Consensus::Params& consensusParams = Params().GetConsensus();
     {
         // Don't send anything until we get its version message
-        if (pto->nVersion == 0)
+        if (pto->nVersion == 0 || pto->fDisconnect)
             return true;
 
         //
@@ -6548,6 +6548,28 @@ bool SendMessages(CNode* pto, CConnman& connman)
         if (!lockMain)
             return true;
 
+        CNodeState &state = *State(pto->GetId());
+
+        BOOST_FOREACH(const CBlockReject& reject, state.rejects)
+            connman.PushMessage(pto, NetMsgType::REJECT, (string)NetMsgType::BLOCK, reject.chRejectCode, reject.strRejectReason, reject.hashBlock);
+        state.rejects.clear();
+
+        if (state.fShouldBan) {
+            state.fShouldBan = false;
+            if (pto->fWhitelisted)
+                LogPrintf("Warning: not punishing whitelisted peer %s!\n", pto->addr.ToString());
+            else {
+                pto->fDisconnect = true;
+                if (pto->addr.IsLocal())
+                    LogPrintf("Warning: not banning local peer %s!\n", pto->addr.ToString());
+                else
+                {
+                    connman.Ban(pto->addr, BanReasonNodeMisbehaving);
+                }
+                return true;
+            }
+        }
+
         // Address refresh broadcast
         int64_t nNow = GetTimeMicros();
         if (!IsInitialBlockDownload() && pto->nNextLocalAddrSend < nNow) {
@@ -6584,26 +6606,6 @@ bool SendMessages(CNode* pto, CConnman& connman)
                 pto->vAddrToSend.shrink_to_fit();
         }
 
-        CNodeState &state = *State(pto->GetId());
-        if (state.fShouldBan) {
-            if (pto->fWhitelisted)
-                LogPrintf("Warning: not punishing whitelisted peer %s!\n", pto->addr.ToString());
-            else {
-                pto->fDisconnect = true;
-                if (pto->addr.IsLocal())
-                    LogPrintf("Warning: not banning local peer %s!\n", pto->addr.ToString());
-                else
-                {
-                    connman.Ban(pto->addr, BanReasonNodeMisbehaving);
-                }
-            }
-            state.fShouldBan = false;
-        }
-
-        BOOST_FOREACH(const CBlockReject& reject, state.rejects)
-            connman.PushMessage(pto, NetMsgType::REJECT, (string)NetMsgType::BLOCK, reject.chRejectCode, reject.strRejectReason, reject.hashBlock);
-        state.rejects.clear();
-
         // Start block sync
         if (pindexBestHeader == NULL)
             pindexBestHeader = chainActive.Tip();
@@ -6901,6 +6903,7 @@ bool SendMessages(CNode* pto, CConnman& connman)
             // should only happen during initial block download.
             LogPrintf("Peer=%d is stalling block download, disconnecting\n", pto->id);
             pto->fDisconnect = true;
+            return true;
         }
         // In case there is a block that has been in flight from this peer for 2 + 0.5 * N times the block interval
         // (with N the number of peers from which we're downloading validated blocks), disconnect due to timeout.
@@ -6913,6 +6916,7 @@ bool SendMessages(CNode* pto, CConnman& connman)
             if (nNow > state.nDownloadingSince + consensusParams.nPowTargetSpacing * (BLOCK_DOWNLOAD_TIMEOUT_BASE + BLOCK_DOWNLOAD_TIMEOUT_PER_PEER * nOtherPeersWithValidatedDownloads)) {
                 LogPrintf("Timeout downloading block %s from peer=%d, disconnecting\n", queuedBlock.hash.ToString(), pto->id);
                 pto->fDisconnect = true;
+                return true;
             }
         }
 

From f26da35142c1d8869cb171d3053aaf2ec3f6cca1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pavel=20Jan=C3=ADk?= <Pavel@Janik.cz>
Date: Thu, 24 Nov 2016 12:12:57 +0100
Subject: [PATCH 1258/1802] Fix copypasted comment.

---
 src/addrdb.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/addrdb.cpp b/src/addrdb.cpp
index ddf41f92de0ea..23715bbea466a 100644
--- a/src/addrdb.cpp
+++ b/src/addrdb.cpp
@@ -103,7 +103,7 @@ bool CBanDB::Read(banmap_t& banSet)
         if (memcmp(pchMsgTmp, Params().MessageStart(), sizeof(pchMsgTmp)))
             return error("%s: Invalid network magic number", __func__);
 
-        // de-serialize address data into one CAddrMan object
+        // de-serialize ban data
         ssBanlist >> banSet;
     }
     catch (const std::exception& e) {

From e3c4f7e18246f0872c816358d4013d229261bbcf Mon Sep 17 00:00:00 2001
From: fanquake <fanquake@gmail.com>
Date: Sat, 12 Nov 2016 20:27:36 +0800
Subject: [PATCH 1259/1802] Correct help output for waitfor RPC commands

---
 src/rpc/blockchain.cpp | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp
index 154107c0dcf33..733d14d24e2ab 100644
--- a/src/rpc/blockchain.cpp
+++ b/src/rpc/blockchain.cpp
@@ -194,12 +194,12 @@ UniValue waitfornewblock(const JSONRPCRequest& request)
 {
     if (request.fHelp || request.params.size() > 1)
         throw runtime_error(
-            "waitfornewblock\n"
+            "waitfornewblock (timeout)\n"
             "\nWaits for a specific new block and returns useful info about it.\n"
             "\nReturns the current block on timeout or exit.\n"
             "\nArguments:\n"
-            "1. timeout (milliseconds) (int, optional, default=false)\n"
-            "\nResult::\n"
+            "1. timeout (int, optional, default=0) Time in milliseconds to wait for a response. 0 indicates no timeout.\n"
+            "\nResult:\n"
             "{                           (json object)\n"
             "  \"hash\" : {       (string) The blockhash\n"
             "  \"height\" : {     (int) Block height\n"
@@ -232,13 +232,13 @@ UniValue waitforblock(const JSONRPCRequest& request)
 {
     if (request.fHelp || request.params.size() < 1 || request.params.size() > 2)
         throw runtime_error(
-            "waitforblock\n"
+            "waitforblock <blockhash> (timeout)\n"
             "\nWaits for a specific new block and returns useful info about it.\n"
             "\nReturns the current block on timeout or exit.\n"
             "\nArguments:\n"
             "1. blockhash to wait for (string)\n"
-            "2. timeout (milliseconds) (int, optional, default=false)\n"
-            "\nResult::\n"
+            "2. timeout (int, optional, default=0) Time in milliseconds to wait for a response. 0 indicates no timeout.\n"
+            "\nResult:\n"
             "{                           (json object)\n"
             "  \"hash\" : {       (string) The blockhash\n"
             "  \"height\" : {     (int) Block height\n"
@@ -274,14 +274,14 @@ UniValue waitforblockheight(const JSONRPCRequest& request)
 {
     if (request.fHelp || request.params.size() < 1 || request.params.size() > 2)
         throw runtime_error(
-            "waitforblock\n"
+            "waitforblockheight <blockheight> (timeout)\n"
             "\nWaits for (at least) block height and returns the height and hash\n"
-            "\nof the current tip.\n"
+            "of the current tip.\n"
             "\nReturns the current block on timeout or exit.\n"
             "\nArguments:\n"
             "1. block height to wait for (int)\n"
-            "2. timeout (milliseconds) (int, optional, default=false)\n"
-            "\nResult::\n"
+            "2. timeout (int, optional, default=0) Time in milliseconds to wait for a response. 0 indicates no timeout.\n"
+            "\nResult:\n"
             "{                           (json object)\n"
             "  \"hash\" : {       (string) The blockhash\n"
             "  \"height\" : {     (int) Block height\n"

From 827d9a3be8209587c532f061753e99730b9be4c4 Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Thu, 24 Nov 2016 14:26:20 +0100
Subject: [PATCH 1260/1802] qt: Replace NetworkToggleStatusBarControl with
 generic ClickableLabel

Generalize the clickable label functionality.

We will use this to add similar functionality to the sync icon.
---
 src/qt/bitcoingui.cpp | 26 ++++++++++----------------
 src/qt/bitcoingui.h   | 19 ++++---------------
 src/qt/guiutil.cpp    |  7 +++++++
 src/qt/guiutil.h      | 14 ++++++++++++++
 4 files changed, 35 insertions(+), 31 deletions(-)

diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp
index 6112a1d256cd6..0f046f30e9fbf 100644
--- a/src/qt/bitcoingui.cpp
+++ b/src/qt/bitcoingui.cpp
@@ -199,7 +199,7 @@ BitcoinGUI::BitcoinGUI(const PlatformStyle *_platformStyle, const NetworkStyle *
     unitDisplayControl = new UnitDisplayStatusBarControl(platformStyle);
     labelWalletEncryptionIcon = new QLabel();
     labelWalletHDStatusIcon = new QLabel();
-    connectionsControl = new NetworkToggleStatusBarControl();
+    connectionsControl = new GUIUtil::ClickableLabel();
     labelBlocksIcon = new QLabel();
     if(enableWallet)
     {
@@ -244,6 +244,8 @@ BitcoinGUI::BitcoinGUI(const PlatformStyle *_platformStyle, const NetworkStyle *
     // Subscribe to notifications from core
     subscribeToCoreSignals();
 
+    connect(connectionsControl, SIGNAL(clicked(QPoint)), this, SLOT(toggleNetworkActive()));
+
     modalOverlay = new ModalOverlay(this->centralWidget());
 #ifdef ENABLE_WALLET
     if(enableWallet)
@@ -490,7 +492,6 @@ void BitcoinGUI::setClientModel(ClientModel *_clientModel)
         }
 #endif // ENABLE_WALLET
         unitDisplayControl->setOptionsModel(_clientModel->getOptionsModel());
-        connectionsControl->setClientModel(_clientModel);
         
         OptionsModel* optionsModel = _clientModel->getOptionsModel();
         if(optionsModel)
@@ -517,7 +518,6 @@ void BitcoinGUI::setClientModel(ClientModel *_clientModel)
         walletFrame->setClientModel(nullptr);
 #endif // ENABLE_WALLET
         unitDisplayControl->setOptionsModel(nullptr);
-        connectionsControl->setClientModel(nullptr);
     }
 }
 
@@ -1171,6 +1171,13 @@ void BitcoinGUI::unsubscribeFromCoreSignals()
     uiInterface.ThreadSafeQuestion.disconnect(boost::bind(ThreadSafeMessageBox, this, _1, _3, _4));
 }
 
+void BitcoinGUI::toggleNetworkActive()
+{
+    if (clientModel) {
+        clientModel->setNetworkActive(!clientModel->getNetworkActive());
+    }
+}
+
 UnitDisplayStatusBarControl::UnitDisplayStatusBarControl(const PlatformStyle *platformStyle) :
     optionsModel(0),
     menu(0)
@@ -1244,16 +1251,3 @@ void UnitDisplayStatusBarControl::onMenuSelection(QAction* action)
         optionsModel->setDisplayUnit(action->data());
     }
 }
-
-void NetworkToggleStatusBarControl::mousePressEvent(QMouseEvent *event)
-{
-    if (clientModel) {
-        clientModel->setNetworkActive(!clientModel->getNetworkActive());
-    }
-}
-
-/** Lets the control know about the Client Model */
-void NetworkToggleStatusBarControl::setClientModel(ClientModel *_clientModel)
-{
-    this->clientModel = _clientModel;
-}
diff --git a/src/qt/bitcoingui.h b/src/qt/bitcoingui.h
index 1b02e77fc4eb5..59540bfe6baa7 100644
--- a/src/qt/bitcoingui.h
+++ b/src/qt/bitcoingui.h
@@ -26,7 +26,6 @@ class PlatformStyle;
 class RPCConsole;
 class SendCoinsRecipient;
 class UnitDisplayStatusBarControl;
-class NetworkToggleStatusBarControl;
 class WalletFrame;
 class WalletModel;
 class HelpMessageDialog;
@@ -86,7 +85,7 @@ class BitcoinGUI : public QMainWindow
     UnitDisplayStatusBarControl *unitDisplayControl;
     QLabel *labelWalletEncryptionIcon;
     QLabel *labelWalletHDStatusIcon;
-    NetworkToggleStatusBarControl *connectionsControl;
+    QLabel *connectionsControl;
     QLabel *labelBlocksIcon;
     QLabel *progressBarLabel;
     QProgressBar *progressBar;
@@ -238,6 +237,9 @@ private Q_SLOTS:
     /** When hideTrayIcon setting is changed in OptionsModel hide or show the icon accordingly. */
     void setTrayIconVisible(bool);
 
+    /** Toggle networking */
+    void toggleNetworkActive();
+
     void showModalOverlay();
 };
 
@@ -270,17 +272,4 @@ private Q_SLOTS:
     void onMenuSelection(QAction* action);
 };
 
-class NetworkToggleStatusBarControl : public QLabel
-{
-    Q_OBJECT
-    
-public:
-    void setClientModel(ClientModel *clientModel);
-protected:
-    void mousePressEvent(QMouseEvent *event);
-    
-private:
-    ClientModel *clientModel;
-};
-
 #endif // BITCOIN_QT_BITCOINGUI_H
diff --git a/src/qt/guiutil.cpp b/src/qt/guiutil.cpp
index 130cfc6e7d9a9..b2e811929939b 100644
--- a/src/qt/guiutil.cpp
+++ b/src/qt/guiutil.cpp
@@ -55,6 +55,7 @@
 #include <QSettings>
 #include <QTextDocument> // for Qt::mightBeRichText
 #include <QThread>
+#include <QMouseEvent>
 
 #if QT_VERSION < 0x050000
 #include <QUrl>
@@ -986,4 +987,10 @@ QString formateNiceTimeOffset(qint64 secs)
     }
     return timeBehindText;
 }
+
+void ClickableLabel::mousePressEvent(QMouseEvent *event)
+{
+    Q_EMIT clicked(event->pos());
+}
+
 } // namespace GUIUtil
diff --git a/src/qt/guiutil.h b/src/qt/guiutil.h
index 8f1f3fbb2c47e..9a17d24f07863 100644
--- a/src/qt/guiutil.h
+++ b/src/qt/guiutil.h
@@ -14,6 +14,7 @@
 #include <QProgressBar>
 #include <QString>
 #include <QTableView>
+#include <QLabel>
 
 #include <boost/filesystem.hpp>
 
@@ -215,6 +216,19 @@ namespace GUIUtil
     typedef QProgressBar ProgressBar;
 #endif
 
+    class ClickableLabel : public QLabel
+    {
+        Q_OBJECT
+
+    Q_SIGNALS:
+        /** Emitted when the label is clicked. The relative mouse coordinates of the click are
+         * passed to the signal.
+         */
+        void clicked(const QPoint& point);
+    protected:
+        void mousePressEvent(QMouseEvent *event);
+    };
+
 } // namespace GUIUtil
 
 #endif // BITCOIN_QT_GUIUTIL_H

From 042f9fa071fd76ab310cd47b73d0e620a7850660 Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Thu, 24 Nov 2016 14:37:36 +0100
Subject: [PATCH 1261/1802] qt: Show progress overlay when clicking spinner
 icon

Bring up the modal progress overlay when the user clicks the spinner
icon in the task bar.

I think this is the intuitive thing to do when that icon is clicked.
---
 src/qt/bitcoingui.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp
index 0f046f30e9fbf..54ed867de0ea3 100644
--- a/src/qt/bitcoingui.cpp
+++ b/src/qt/bitcoingui.cpp
@@ -200,7 +200,7 @@ BitcoinGUI::BitcoinGUI(const PlatformStyle *_platformStyle, const NetworkStyle *
     labelWalletEncryptionIcon = new QLabel();
     labelWalletHDStatusIcon = new QLabel();
     connectionsControl = new GUIUtil::ClickableLabel();
-    labelBlocksIcon = new QLabel();
+    labelBlocksIcon = new GUIUtil::ClickableLabel();
     if(enableWallet)
     {
         frameBlocksLayout->addStretch();
@@ -248,8 +248,10 @@ BitcoinGUI::BitcoinGUI(const PlatformStyle *_platformStyle, const NetworkStyle *
 
     modalOverlay = new ModalOverlay(this->centralWidget());
 #ifdef ENABLE_WALLET
-    if(enableWallet)
+    if(enableWallet) {
         connect(walletFrame, SIGNAL(requestedSyncWarningInfo()), this, SLOT(showModalOverlay()));
+        connect(labelBlocksIcon, SIGNAL(clicked(QPoint)), this, SLOT(showModalOverlay()));
+    }
 #endif
 }
 

From 2f2625a0bb94db220a6f5560fa942159b66ac61e Mon Sep 17 00:00:00 2001
From: Karl-Johan Alm <karljohan-alm@garage.co.jp>
Date: Fri, 25 Nov 2016 17:17:57 +0900
Subject: [PATCH 1262/1802] Removed using namespace std from bitcoin-cli/-tx
 and added std:: in appropriate places.

---
 src/bitcoin-cli.cpp |  30 ++++---
 src/bitcoin-tx.cpp  | 190 ++++++++++++++++++++++----------------------
 2 files changed, 108 insertions(+), 112 deletions(-)

diff --git a/src/bitcoin-cli.cpp b/src/bitcoin-cli.cpp
index 392d1b9329e49..b2726408199f5 100644
--- a/src/bitcoin-cli.cpp
+++ b/src/bitcoin-cli.cpp
@@ -24,15 +24,13 @@
 
 #include <univalue.h>
 
-using namespace std;
-
 static const char DEFAULT_RPCCONNECT[] = "127.0.0.1";
 static const int DEFAULT_HTTP_CLIENT_TIMEOUT=900;
 static const int CONTINUE_EXECUTION=-1;
 
 std::string HelpMessageCli()
 {
-    string strUsage;
+    std::string strUsage;
     strUsage += HelpMessageGroup(_("Options:"));
     strUsage += HelpMessageOpt("-?", _("This help message"));
     strUsage += HelpMessageOpt("-conf=<file>", strprintf(_("Specify configuration file (default: %s)"), BITCOIN_CONF_FILENAME));
@@ -187,7 +185,7 @@ static void http_error_cb(enum evhttp_request_error err, void *ctx)
 }
 #endif
 
-UniValue CallRPC(const string& strMethod, const UniValue& params)
+UniValue CallRPC(const std::string& strMethod, const UniValue& params)
 {
     std::string host = GetArg("-rpcconnect", DEFAULT_RPCCONNECT);
     int port = GetArg("-rpcport", BaseParams().RPCPort());
@@ -195,18 +193,18 @@ UniValue CallRPC(const string& strMethod, const UniValue& params)
     // Create event base
     struct event_base *base = event_base_new(); // TODO RAII
     if (!base)
-        throw runtime_error("cannot create event_base");
+        throw std::runtime_error("cannot create event_base");
 
     // Synchronously look up hostname
     struct evhttp_connection *evcon = evhttp_connection_base_new(base, NULL, host.c_str(), port); // TODO RAII
     if (evcon == NULL)
-        throw runtime_error("create connection failed");
+        throw std::runtime_error("create connection failed");
     evhttp_connection_set_timeout(evcon, GetArg("-rpcclienttimeout", DEFAULT_HTTP_CLIENT_TIMEOUT));
 
     HTTPReply response;
     struct evhttp_request *req = evhttp_request_new(http_request_done, (void*)&response); // TODO RAII
     if (req == NULL)
-        throw runtime_error("create http request failed");
+        throw std::runtime_error("create http request failed");
 #if LIBEVENT_VERSION_NUMBER >= 0x02010300
     evhttp_request_set_error_cb(req, http_error_cb);
 #endif
@@ -216,7 +214,7 @@ UniValue CallRPC(const string& strMethod, const UniValue& params)
     if (mapArgs["-rpcpassword"] == "") {
         // Try fall back to cookie-based authentication if no password is provided
         if (!GetAuthCookie(&strRPCUserColonPass)) {
-            throw runtime_error(strprintf(
+            throw std::runtime_error(strprintf(
                 _("Could not locate RPC credentials. No authentication cookie could be found, and no rpcpassword is set in the configuration file (%s)"),
                     GetConfigFile(GetArg("-conf", BITCOIN_CONF_FILENAME)).string().c_str()));
 
@@ -251,26 +249,26 @@ UniValue CallRPC(const string& strMethod, const UniValue& params)
     if (response.status == 0)
         throw CConnectionFailed(strprintf("couldn't connect to server\n(make sure server is running and you are connecting to the correct RPC port: %d %s)", response.error, http_errorstring(response.error)));
     else if (response.status == HTTP_UNAUTHORIZED)
-        throw runtime_error("incorrect rpcuser or rpcpassword (authorization failed)");
+        throw std::runtime_error("incorrect rpcuser or rpcpassword (authorization failed)");
     else if (response.status >= 400 && response.status != HTTP_BAD_REQUEST && response.status != HTTP_NOT_FOUND && response.status != HTTP_INTERNAL_SERVER_ERROR)
-        throw runtime_error(strprintf("server returned HTTP error %d", response.status));
+        throw std::runtime_error(strprintf("server returned HTTP error %d", response.status));
     else if (response.body.empty())
-        throw runtime_error("no response from server");
+        throw std::runtime_error("no response from server");
 
     // Parse reply
     UniValue valReply(UniValue::VSTR);
     if (!valReply.read(response.body))
-        throw runtime_error("couldn't parse reply from server");
+        throw std::runtime_error("couldn't parse reply from server");
     const UniValue& reply = valReply.get_obj();
     if (reply.empty())
-        throw runtime_error("expected reply to have result, error and id properties");
+        throw std::runtime_error("expected reply to have result, error and id properties");
 
     return reply;
 }
 
 int CommandLineRPC(int argc, char *argv[])
 {
-    string strPrint;
+    std::string strPrint;
     int nRet = 0;
     try {
         // Skip switches
@@ -286,7 +284,7 @@ int CommandLineRPC(int argc, char *argv[])
                 args.push_back(line);
         }
         if (args.size() < 1)
-            throw runtime_error("too few parameters (need at least command)");
+            throw std::runtime_error("too few parameters (need at least command)");
         std::string strMethod = args[0];
         UniValue params = RPCConvertValues(strMethod, std::vector<std::string>(args.begin()+1, args.end()));
 
@@ -340,7 +338,7 @@ int CommandLineRPC(int argc, char *argv[])
         throw;
     }
     catch (const std::exception& e) {
-        strPrint = string("error: ") + e.what();
+        strPrint = std::string("error: ") + e.what();
         nRet = EXIT_FAILURE;
     }
     catch (...) {
diff --git a/src/bitcoin-tx.cpp b/src/bitcoin-tx.cpp
index 6d17bc392f724..346d8e180d39e 100644
--- a/src/bitcoin-tx.cpp
+++ b/src/bitcoin-tx.cpp
@@ -26,10 +26,8 @@
 #include <boost/algorithm/string.hpp>
 #include <boost/assign/list_of.hpp>
 
-using namespace std;
-
 static bool fCreateBlank;
-static map<string,UniValue> registers;
+static std::map<std::string,UniValue> registers;
 static const int CONTINUE_EXECUTION=-1;
 
 //
@@ -103,52 +101,52 @@ static int AppInitRawTx(int argc, char* argv[])
     return CONTINUE_EXECUTION;
 }
 
-static void RegisterSetJson(const string& key, const string& rawJson)
+static void RegisterSetJson(const std::string& key, const std::string& rawJson)
 {
     UniValue val;
     if (!val.read(rawJson)) {
-        string strErr = "Cannot parse JSON for key " + key;
-        throw runtime_error(strErr);
+        std::string strErr = "Cannot parse JSON for key " + key;
+        throw std::runtime_error(strErr);
     }
 
     registers[key] = val;
 }
 
-static void RegisterSet(const string& strInput)
+static void RegisterSet(const std::string& strInput)
 {
     // separate NAME:VALUE in string
     size_t pos = strInput.find(':');
-    if ((pos == string::npos) ||
+    if ((pos == std::string::npos) ||
         (pos == 0) ||
         (pos == (strInput.size() - 1)))
-        throw runtime_error("Register input requires NAME:VALUE");
+        throw std::runtime_error("Register input requires NAME:VALUE");
 
-    string key = strInput.substr(0, pos);
-    string valStr = strInput.substr(pos + 1, string::npos);
+    std::string key = strInput.substr(0, pos);
+    std::string valStr = strInput.substr(pos + 1, std::string::npos);
 
     RegisterSetJson(key, valStr);
 }
 
-static void RegisterLoad(const string& strInput)
+static void RegisterLoad(const std::string& strInput)
 {
     // separate NAME:FILENAME in string
     size_t pos = strInput.find(':');
-    if ((pos == string::npos) ||
+    if ((pos == std::string::npos) ||
         (pos == 0) ||
         (pos == (strInput.size() - 1)))
-        throw runtime_error("Register load requires NAME:FILENAME");
+        throw std::runtime_error("Register load requires NAME:FILENAME");
 
-    string key = strInput.substr(0, pos);
-    string filename = strInput.substr(pos + 1, string::npos);
+    std::string key = strInput.substr(0, pos);
+    std::string filename = strInput.substr(pos + 1, std::string::npos);
 
     FILE *f = fopen(filename.c_str(), "r");
     if (!f) {
-        string strErr = "Cannot open file " + filename;
-        throw runtime_error(strErr);
+        std::string strErr = "Cannot open file " + filename;
+        throw std::runtime_error(strErr);
     }
 
     // load file chunks into one big buffer
-    string valStr;
+    std::string valStr;
     while ((!feof(f)) && (!ferror(f))) {
         char buf[4096];
         int bread = fread(buf, 1, sizeof(buf), f);
@@ -162,55 +160,55 @@ static void RegisterLoad(const string& strInput)
     fclose(f);
 
     if (error) {
-        string strErr = "Error reading file " + filename;
-        throw runtime_error(strErr);
+        std::string strErr = "Error reading file " + filename;
+        throw std::runtime_error(strErr);
     }
 
     // evaluate as JSON buffer register
     RegisterSetJson(key, valStr);
 }
 
-static void MutateTxVersion(CMutableTransaction& tx, const string& cmdVal)
+static void MutateTxVersion(CMutableTransaction& tx, const std::string& cmdVal)
 {
     int64_t newVersion = atoi64(cmdVal);
     if (newVersion < 1 || newVersion > CTransaction::MAX_STANDARD_VERSION)
-        throw runtime_error("Invalid TX version requested");
+        throw std::runtime_error("Invalid TX version requested");
 
     tx.nVersion = (int) newVersion;
 }
 
-static void MutateTxLocktime(CMutableTransaction& tx, const string& cmdVal)
+static void MutateTxLocktime(CMutableTransaction& tx, const std::string& cmdVal)
 {
     int64_t newLocktime = atoi64(cmdVal);
     if (newLocktime < 0LL || newLocktime > 0xffffffffLL)
-        throw runtime_error("Invalid TX locktime requested");
+        throw std::runtime_error("Invalid TX locktime requested");
 
     tx.nLockTime = (unsigned int) newLocktime;
 }
 
-static void MutateTxAddInput(CMutableTransaction& tx, const string& strInput)
+static void MutateTxAddInput(CMutableTransaction& tx, const std::string& strInput)
 {
     std::vector<std::string> vStrInputParts;
     boost::split(vStrInputParts, strInput, boost::is_any_of(":"));
 
     // separate TXID:VOUT in string
     if (vStrInputParts.size()<2)
-        throw runtime_error("TX input missing separator");
+        throw std::runtime_error("TX input missing separator");
 
     // extract and validate TXID
-    string strTxid = vStrInputParts[0];
+    std::string strTxid = vStrInputParts[0];
     if ((strTxid.size() != 64) || !IsHex(strTxid))
-        throw runtime_error("invalid TX input txid");
+        throw std::runtime_error("invalid TX input txid");
     uint256 txid(uint256S(strTxid));
 
     static const unsigned int minTxOutSz = 9;
     static const unsigned int maxVout = MAX_BLOCK_BASE_SIZE / minTxOutSz;
 
     // extract and validate vout
-    string strVout = vStrInputParts[1];
+    std::string strVout = vStrInputParts[1];
     int vout = atoi(strVout);
     if ((vout < 0) || (vout > (int)maxVout))
-        throw runtime_error("invalid TX input vout");
+        throw std::runtime_error("invalid TX input vout");
 
     // extract the optional sequence number
     uint32_t nSequenceIn=std::numeric_limits<unsigned int>::max();
@@ -222,26 +220,26 @@ static void MutateTxAddInput(CMutableTransaction& tx, const string& strInput)
     tx.vin.push_back(txin);
 }
 
-static void MutateTxAddOutAddr(CMutableTransaction& tx, const string& strInput)
+static void MutateTxAddOutAddr(CMutableTransaction& tx, const std::string& strInput)
 {
     // separate VALUE:ADDRESS in string
     size_t pos = strInput.find(':');
-    if ((pos == string::npos) ||
+    if ((pos == std::string::npos) ||
         (pos == 0) ||
         (pos == (strInput.size() - 1)))
-        throw runtime_error("TX output missing separator");
+        throw std::runtime_error("TX output missing separator");
 
     // extract and validate VALUE
-    string strValue = strInput.substr(0, pos);
+    std::string strValue = strInput.substr(0, pos);
     CAmount value;
     if (!ParseMoney(strValue, value))
-        throw runtime_error("invalid TX output value");
+        throw std::runtime_error("invalid TX output value");
 
     // extract and validate ADDRESS
-    string strAddr = strInput.substr(pos + 1, string::npos);
+    std::string strAddr = strInput.substr(pos + 1, std::string::npos);
     CBitcoinAddress addr(strAddr);
     if (!addr.IsValid())
-        throw runtime_error("invalid TX output address");
+        throw std::runtime_error("invalid TX output address");
 
     // build standard output script via GetScriptForDestination()
     CScript scriptPubKey = GetScriptForDestination(addr.Get());
@@ -251,7 +249,7 @@ static void MutateTxAddOutAddr(CMutableTransaction& tx, const string& strInput)
     tx.vout.push_back(txout);
 }
 
-static void MutateTxAddOutData(CMutableTransaction& tx, const string& strInput)
+static void MutateTxAddOutData(CMutableTransaction& tx, const std::string& strInput)
 {
     CAmount value = 0;
 
@@ -259,20 +257,20 @@ static void MutateTxAddOutData(CMutableTransaction& tx, const string& strInput)
     size_t pos = strInput.find(':');
 
     if (pos==0)
-        throw runtime_error("TX output value not specified");
+        throw std::runtime_error("TX output value not specified");
 
-    if (pos != string::npos) {
+    if (pos != std::string::npos) {
         // extract and validate VALUE
-        string strValue = strInput.substr(0, pos);
+        std::string strValue = strInput.substr(0, pos);
         if (!ParseMoney(strValue, value))
-            throw runtime_error("invalid TX output value");
+            throw std::runtime_error("invalid TX output value");
     }
 
     // extract and validate DATA
-    string strData = strInput.substr(pos + 1, string::npos);
+    std::string strData = strInput.substr(pos + 1, std::string::npos);
 
     if (!IsHex(strData))
-        throw runtime_error("invalid TX output data");
+        throw std::runtime_error("invalid TX output data");
 
     std::vector<unsigned char> data = ParseHex(strData);
 
@@ -280,22 +278,22 @@ static void MutateTxAddOutData(CMutableTransaction& tx, const string& strInput)
     tx.vout.push_back(txout);
 }
 
-static void MutateTxAddOutScript(CMutableTransaction& tx, const string& strInput)
+static void MutateTxAddOutScript(CMutableTransaction& tx, const std::string& strInput)
 {
     // separate VALUE:SCRIPT in string
     size_t pos = strInput.find(':');
-    if ((pos == string::npos) ||
+    if ((pos == std::string::npos) ||
         (pos == 0))
-        throw runtime_error("TX output missing separator");
+        throw std::runtime_error("TX output missing separator");
 
     // extract and validate VALUE
-    string strValue = strInput.substr(0, pos);
+    std::string strValue = strInput.substr(0, pos);
     CAmount value;
     if (!ParseMoney(strValue, value))
-        throw runtime_error("invalid TX output value");
+        throw std::runtime_error("invalid TX output value");
 
     // extract and validate script
-    string strScript = strInput.substr(pos + 1, string::npos);
+    std::string strScript = strInput.substr(pos + 1, std::string::npos);
     CScript scriptPubKey = ParseScript(strScript); // throws on err
 
     // construct TxOut, append to transaction output list
@@ -303,26 +301,26 @@ static void MutateTxAddOutScript(CMutableTransaction& tx, const string& strInput
     tx.vout.push_back(txout);
 }
 
-static void MutateTxDelInput(CMutableTransaction& tx, const string& strInIdx)
+static void MutateTxDelInput(CMutableTransaction& tx, const std::string& strInIdx)
 {
     // parse requested deletion index
     int inIdx = atoi(strInIdx);
     if (inIdx < 0 || inIdx >= (int)tx.vin.size()) {
-        string strErr = "Invalid TX input index '" + strInIdx + "'";
-        throw runtime_error(strErr.c_str());
+        std::string strErr = "Invalid TX input index '" + strInIdx + "'";
+        throw std::runtime_error(strErr.c_str());
     }
 
     // delete input from transaction
     tx.vin.erase(tx.vin.begin() + inIdx);
 }
 
-static void MutateTxDelOutput(CMutableTransaction& tx, const string& strOutIdx)
+static void MutateTxDelOutput(CMutableTransaction& tx, const std::string& strOutIdx)
 {
     // parse requested deletion index
     int outIdx = atoi(strOutIdx);
     if (outIdx < 0 || outIdx >= (int)tx.vout.size()) {
-        string strErr = "Invalid TX output index '" + strOutIdx + "'";
-        throw runtime_error(strErr.c_str());
+        std::string strErr = "Invalid TX output index '" + strOutIdx + "'";
+        throw std::runtime_error(strErr.c_str());
     }
 
     // delete output from transaction
@@ -342,7 +340,7 @@ static const struct {
     {"SINGLE|ANYONECANPAY", SIGHASH_SINGLE|SIGHASH_ANYONECANPAY},
 };
 
-static bool findSighashFlags(int& flags, const string& flagStr)
+static bool findSighashFlags(int& flags, const std::string& flagStr)
 {
     flags = 0;
 
@@ -356,17 +354,17 @@ static bool findSighashFlags(int& flags, const string& flagStr)
     return false;
 }
 
-uint256 ParseHashUO(map<string,UniValue>& o, string strKey)
+uint256 ParseHashUO(std::map<std::string,UniValue>& o, std::string strKey)
 {
     if (!o.count(strKey))
         return uint256();
     return ParseHashUV(o[strKey], strKey);
 }
 
-vector<unsigned char> ParseHexUO(map<string,UniValue>& o, string strKey)
+std::vector<unsigned char> ParseHexUO(std::map<std::string,UniValue>& o, std::string strKey)
 {
     if (!o.count(strKey)) {
-        vector<unsigned char> emptyVec;
+        std::vector<unsigned char> emptyVec;
         return emptyVec;
     }
     return ParseHexUV(o[strKey], strKey);
@@ -375,24 +373,24 @@ vector<unsigned char> ParseHexUO(map<string,UniValue>& o, string strKey)
 static CAmount AmountFromValue(const UniValue& value)
 {
     if (!value.isNum() && !value.isStr())
-        throw runtime_error("Amount is not a number or string");
+        throw std::runtime_error("Amount is not a number or string");
     CAmount amount;
     if (!ParseFixedPoint(value.getValStr(), 8, &amount))
-        throw runtime_error("Invalid amount");
+        throw std::runtime_error("Invalid amount");
     if (!MoneyRange(amount))
-        throw runtime_error("Amount out of range");
+        throw std::runtime_error("Amount out of range");
     return amount;
 }
 
-static void MutateTxSign(CMutableTransaction& tx, const string& flagStr)
+static void MutateTxSign(CMutableTransaction& tx, const std::string& flagStr)
 {
     int nHashType = SIGHASH_ALL;
 
     if (flagStr.size() > 0)
         if (!findSighashFlags(nHashType, flagStr))
-            throw runtime_error("unknown sighash flag/sign option");
+            throw std::runtime_error("unknown sighash flag/sign option");
 
-    vector<CTransaction> txVariants;
+    std::vector<CTransaction> txVariants;
     txVariants.push_back(tx);
 
     // mergedTx will end up with all the signatures; it
@@ -403,17 +401,17 @@ static void MutateTxSign(CMutableTransaction& tx, const string& flagStr)
     CCoinsViewCache view(&viewDummy);
 
     if (!registers.count("privatekeys"))
-        throw runtime_error("privatekeys register variable must be set.");
+        throw std::runtime_error("privatekeys register variable must be set.");
     CBasicKeyStore tempKeystore;
     UniValue keysObj = registers["privatekeys"];
 
     for (unsigned int kidx = 0; kidx < keysObj.size(); kidx++) {
         if (!keysObj[kidx].isStr())
-            throw runtime_error("privatekey not a string");
+            throw std::runtime_error("privatekey not a std::string");
         CBitcoinSecret vchSecret;
         bool fGood = vchSecret.SetString(keysObj[kidx].getValStr());
         if (!fGood)
-            throw runtime_error("privatekey not valid");
+            throw std::runtime_error("privatekey not valid");
 
         CKey key = vchSecret.GetKey();
         tempKeystore.AddKey(key);
@@ -421,34 +419,34 @@ static void MutateTxSign(CMutableTransaction& tx, const string& flagStr)
 
     // Add previous txouts given in the RPC call:
     if (!registers.count("prevtxs"))
-        throw runtime_error("prevtxs register variable must be set.");
+        throw std::runtime_error("prevtxs register variable must be set.");
     UniValue prevtxsObj = registers["prevtxs"];
     {
         for (unsigned int previdx = 0; previdx < prevtxsObj.size(); previdx++) {
             UniValue prevOut = prevtxsObj[previdx];
             if (!prevOut.isObject())
-                throw runtime_error("expected prevtxs internal object");
+                throw std::runtime_error("expected prevtxs internal object");
 
-            map<string,UniValue::VType> types = boost::assign::map_list_of("txid", UniValue::VSTR)("vout",UniValue::VNUM)("scriptPubKey",UniValue::VSTR);
+            std::map<std::string,UniValue::VType> types = boost::assign::map_list_of("txid", UniValue::VSTR)("vout",UniValue::VNUM)("scriptPubKey",UniValue::VSTR);
             if (!prevOut.checkObject(types))
-                throw runtime_error("prevtxs internal object typecheck fail");
+                throw std::runtime_error("prevtxs internal object typecheck fail");
 
             uint256 txid = ParseHashUV(prevOut["txid"], "txid");
 
             int nOut = atoi(prevOut["vout"].getValStr());
             if (nOut < 0)
-                throw runtime_error("vout must be positive");
+                throw std::runtime_error("vout must be positive");
 
-            vector<unsigned char> pkData(ParseHexUV(prevOut["scriptPubKey"], "scriptPubKey"));
+            std::vector<unsigned char> pkData(ParseHexUV(prevOut["scriptPubKey"], "scriptPubKey"));
             CScript scriptPubKey(pkData.begin(), pkData.end());
 
             {
                 CCoinsModifier coins = view.ModifyCoins(txid);
                 if (coins->IsAvailable(nOut) && coins->vout[nOut].scriptPubKey != scriptPubKey) {
-                    string err("Previous output scriptPubKey mismatch:\n");
+                    std::string err("Previous output scriptPubKey mismatch:\n");
                     err = err + ScriptToAsmStr(coins->vout[nOut].scriptPubKey) + "\nvs:\n"+
                         ScriptToAsmStr(scriptPubKey);
-                    throw runtime_error(err);
+                    throw std::runtime_error(err);
                 }
                 if ((unsigned int)nOut >= coins->vout.size())
                     coins->vout.resize(nOut+1);
@@ -464,7 +462,7 @@ static void MutateTxSign(CMutableTransaction& tx, const string& flagStr)
             if ((scriptPubKey.IsPayToScriptHash() || scriptPubKey.IsPayToWitnessScriptHash()) &&
                 prevOut.exists("redeemScript")) {
                 UniValue v = prevOut["redeemScript"];
-                vector<unsigned char> rsData(ParseHexUV(v, "redeemScript"));
+                std::vector<unsigned char> rsData(ParseHexUV(v, "redeemScript"));
                 CScript redeemScript(rsData.begin(), rsData.end());
                 tempKeystore.AddCScript(redeemScript);
             }
@@ -521,8 +519,8 @@ class Secp256k1Init
     }
 };
 
-static void MutateTx(CMutableTransaction& tx, const string& command,
-                     const string& commandVal)
+static void MutateTx(CMutableTransaction& tx, const std::string& command,
+                     const std::string& commandVal)
 {
     std::unique_ptr<Secp256k1Init> ecc;
 
@@ -557,7 +555,7 @@ static void MutateTx(CMutableTransaction& tx, const string& command,
         RegisterSet(commandVal);
 
     else
-        throw runtime_error("unknown command");
+        throw std::runtime_error("unknown command");
 }
 
 static void OutputTxJSON(const CTransaction& tx)
@@ -565,20 +563,20 @@ static void OutputTxJSON(const CTransaction& tx)
     UniValue entry(UniValue::VOBJ);
     TxToUniv(tx, uint256(), entry);
 
-    string jsonOutput = entry.write(4);
+    std::string jsonOutput = entry.write(4);
     fprintf(stdout, "%s\n", jsonOutput.c_str());
 }
 
 static void OutputTxHash(const CTransaction& tx)
 {
-    string strHexHash = tx.GetHash().GetHex(); // the hex-encoded transaction hash (aka the transaction id)
+    std::string strHexHash = tx.GetHash().GetHex(); // the hex-encoded transaction hash (aka the transaction id)
 
     fprintf(stdout, "%s\n", strHexHash.c_str());
 }
 
 static void OutputTxHex(const CTransaction& tx)
 {
-    string strHex = EncodeHexTx(tx);
+    std::string strHex = EncodeHexTx(tx);
 
     fprintf(stdout, "%s\n", strHex.c_str());
 }
@@ -593,10 +591,10 @@ static void OutputTx(const CTransaction& tx)
         OutputTxHex(tx);
 }
 
-static string readStdin()
+static std::string readStdin()
 {
     char buf[4096];
-    string ret;
+    std::string ret;
 
     while (!feof(stdin)) {
         size_t bread = fread(buf, 1, sizeof(buf), stdin);
@@ -606,7 +604,7 @@ static string readStdin()
     }
 
     if (ferror(stdin))
-        throw runtime_error("error reading stdin");
+        throw std::runtime_error("error reading stdin");
 
     boost::algorithm::trim_right(ret);
 
@@ -615,7 +613,7 @@ static string readStdin()
 
 static int CommandLineRawTx(int argc, char* argv[])
 {
-    string strPrint;
+    std::string strPrint;
     int nRet = 0;
     try {
         // Skip switches; Permit common stdin convention "-"
@@ -631,15 +629,15 @@ static int CommandLineRawTx(int argc, char* argv[])
         if (!fCreateBlank) {
             // require at least one param
             if (argc < 2)
-                throw runtime_error("too few parameters");
+                throw std::runtime_error("too few parameters");
 
             // param: hex-encoded bitcoin transaction
-            string strHexTx(argv[1]);
+            std::string strHexTx(argv[1]);
             if (strHexTx == "-")                 // "-" implies standard input
                 strHexTx = readStdin();
 
             if (!DecodeHexTx(txDecodeTmp, strHexTx, true))
-                throw runtime_error("invalid transaction encoding");
+                throw std::runtime_error("invalid transaction encoding");
 
             startArg = 2;
         } else
@@ -648,10 +646,10 @@ static int CommandLineRawTx(int argc, char* argv[])
         CMutableTransaction tx(txDecodeTmp);
 
         for (int i = startArg; i < argc; i++) {
-            string arg = argv[i];
-            string key, value;
+            std::string arg = argv[i];
+            std::string key, value;
             size_t eqpos = arg.find('=');
-            if (eqpos == string::npos)
+            if (eqpos == std::string::npos)
                 key = arg;
             else {
                 key = arg.substr(0, eqpos);
@@ -668,7 +666,7 @@ static int CommandLineRawTx(int argc, char* argv[])
         throw;
     }
     catch (const std::exception& e) {
-        strPrint = string("error: ") + e.what();
+        strPrint = std::string("error: ") + e.what();
         nRet = EXIT_FAILURE;
     }
     catch (...) {

From dd34570c451b522a8eedd7b4d1b4a9c305a5d631 Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Fri, 25 Nov 2016 09:20:00 +0100
Subject: [PATCH 1263/1802] doc: Improve windows build instructions using Linux
 subsystem

I did a build on a windows 10 laptop and took notes, and tried
to improve the document:

- It's the Linux subsystem for Windows, not the other way around.

- Split out dependencies: general ones, 64-bit, 32-bit. Remove the
  reference to `build-unix.md`, easy enough to be self-contained.

- Place 64-bit instructions first. 99% will want these.

- Installation instructions: recommend using `/` for prefix, same as we
  do on gitian builds. This will allow copying the files to a usable
  (from Windows) place using just `make DESTDIR=...`.

- Remove double spaces / consistent width reformatting.
---
 doc/build-windows.md | 66 ++++++++++++++++++++++++++++++--------------
 1 file changed, 46 insertions(+), 20 deletions(-)

diff --git a/doc/build-windows.md b/doc/build-windows.md
index 044356830a6ba..b6a047b9c380b 100644
--- a/doc/build-windows.md
+++ b/doc/build-windows.md
@@ -7,16 +7,18 @@ Most developers use cross-compilation from Ubuntu to build executables for
 Windows. This is also used to build the release binaries.
 
 While there are potentially a number of ways to build on Windows (for example using msys / mingw-w64),
-using the Windows Subsystem For Linux is the most straight forward.  If you are building with
-an alternative method, please contribute the instructions here for others who are running versions
+using the Windows Subsystem For Linux is the most straightforward. If you are building with
+another method, please contribute the instructions here for others who are running versions
 of Windows that are not compatible with the Windows Subsystem for Linux.
 
-Compiling with the Windows Subsystem For Linux
--------------------
+Compiling with Windows Subsystem For Linux
+-------------------------------------------
 
-With Windows 10, Microsoft has released a new feature named the
-[Windows Subsystem for Linux](https://msdn.microsoft.com/commandline/wsl/about).  This feature allows you to run a bash shell directly on Windows in an Ubuntu based
-environment.  Within this environment you can cross compile for Windows without the need for a separate Linux VM or Server.
+With Windows 10, Microsoft has released a new feature named the [Windows
+Subsystem for Linux](https://msdn.microsoft.com/commandline/wsl/about). This
+feature allows you to run a bash shell directly on Windows in an Ubuntu based
+environment. Within this environment you can cross compile for Windows without
+the need for a separate Linux VM or Server.
 
 This feature is not supported in versions of Windows prior to Windows 10 or on Windows Server SKUs.
 
@@ -37,9 +39,6 @@ To get the bash shell, you must first activate the feature in Windows.
   * Create a new UNIX user account (this is a separate account from your Windows account)
 
 After the bash shell is active, you can follow the instructions below for Windows 64-bit Cross-compilation.
-When building dependencies within the 'depends' folder, you may encounter an error building
-the protobuf dependency.  If this occurs, re-run the command with sudo.  This is likely
-a bug with the Windows Subsystem for Linux feature and may be fixed with a future update.
 
 Cross-compilation
 -------------------
@@ -48,28 +47,55 @@ These steps can be performed on, for example, an Ubuntu VM. The depends system
 will also work on other Linux distributions, however the commands for
 installing the toolchain will be different.
 
-Make sure you install the build requirements mentioned in
-[build-unix.md](/doc/build-unix.md).
-Then, install the toolchains and curl:
+First, install the general dependencies:
+
+    sudo apt-get install build-essential libtool autotools-dev automake pkg-config bsdmainutils curl
+
+A host toolchain (`build-essential`) is necessary because some dependency
+packages (such as `protobuf`) need to build host utilities that are used in the
+build process.
+
+## Building for 64-bit Windows
+
+To build executables for Windows 64-bit, install the following dependencies:
 
-    sudo apt-get install g++-mingw-w64-i686 mingw-w64-i686-dev g++-mingw-w64-x86-64 mingw-w64-x86-64-dev curl
+    sudo apt-get install g++-mingw-w64-x86-64 mingw-w64-x86-64-dev
 
-To build executables for Windows 32-bit:
+Then build using:
 
     cd depends
-    make HOST=i686-w64-mingw32 -j4
+    make HOST=x86_64-w64-mingw32 -j4
     cd ..
     ./autogen.sh # not required when building from tarball
-    ./configure --prefix=`pwd`/depends/i686-w64-mingw32
+    CONFIG_SITE=$PWD/depends/x86_64-w64-mingw32/share/config.site ./configure --prefix=/
     make
 
-To build executables for Windows 64-bit:
+## Building for 32-bit Windows
+
+To build executables for Windows 32-bit, install the following dependencies:
+
+    sudo apt-get install g++-mingw-w64-i686 mingw-w64-i686-dev 
+
+Then build using:
 
     cd depends
-    make HOST=x86_64-w64-mingw32 -j4
+    make HOST=i686-w64-mingw32 -j4
     cd ..
     ./autogen.sh # not required when building from tarball
-    ./configure --prefix=`pwd`/depends/x86_64-w64-mingw32
+    CONFIG_SITE=$PWD/depends/i686-w64-mingw32/share/config.site ./configure --prefix=/
     make
 
+## Depends system
+
 For further documentation on the depends system see [README.md](../depends/README.md) in the depends directory.
+
+Installation
+-------------
+
+After building using the Windows subsystem it can be useful to copy the compiled
+executables to a directory on the windows drive in the same directory structure
+as they appear in the release `.zip` archive. This can be done in the following
+way. This will install to `c:\workspace\bitcoin`, for example:
+
+    make install DESTDIR=/mnt/c/workspace/bitcoin
+

From b7695c2275d977f20343020f2e9ba5d746928a6e Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Wed, 9 Nov 2016 14:25:19 -0500
Subject: [PATCH 1264/1802] net: No need to check individually for
 disconnection anymore

---
 src/main.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index 24f320832f84a..11c7b2ec6a057 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -6527,7 +6527,7 @@ bool SendMessages(CNode* pto, CConnman& connman)
             // Ping automatically sent as a latency probe & keepalive.
             pingSend = true;
         }
-        if (pingSend && !pto->fDisconnect) {
+        if (pingSend) {
             uint64_t nonce = 0;
             while (nonce == 0) {
                 GetRandBytes((unsigned char*)&nonce, sizeof(nonce));
@@ -6610,7 +6610,7 @@ bool SendMessages(CNode* pto, CConnman& connman)
         if (pindexBestHeader == NULL)
             pindexBestHeader = chainActive.Tip();
         bool fFetch = state.fPreferredDownload || (nPreferredDownload == 0 && !pto->fClient && !pto->fOneShot); // Download if this is a nice peer, or we have no nice peers and this one might do.
-        if (!state.fSyncStarted && !pto->fClient && !pto->fDisconnect && !fImporting && !fReindex) {
+        if (!state.fSyncStarted && !pto->fClient && !fImporting && !fReindex) {
             // Only actively request headers from a single peer, unless we're close to today.
             if ((nSyncStarted == 0 && fFetch) || pindexBestHeader->GetBlockTime() > GetAdjustedTime() - 24 * 60 * 60) {
                 state.fSyncStarted = true;
@@ -6897,7 +6897,7 @@ bool SendMessages(CNode* pto, CConnman& connman)
 
         // Detect whether we're stalling
         nNow = GetTimeMicros();
-        if (!pto->fDisconnect && state.nStallingSince && state.nStallingSince < nNow - 1000000 * BLOCK_STALLING_TIMEOUT) {
+        if (state.nStallingSince && state.nStallingSince < nNow - 1000000 * BLOCK_STALLING_TIMEOUT) {
             // Stalling only triggers when the block download window cannot move. During normal steady state,
             // the download window should be much larger than the to-be-downloaded set of blocks, so disconnection
             // should only happen during initial block download.
@@ -6910,7 +6910,7 @@ bool SendMessages(CNode* pto, CConnman& connman)
         // We compensate for other peers to prevent killing off peers due to our own downstream link
         // being saturated. We only count validated in-flight blocks so peers can't advertise non-existing block hashes
         // to unreasonably increase our timeout.
-        if (!pto->fDisconnect && state.vBlocksInFlight.size() > 0) {
+        if (state.vBlocksInFlight.size() > 0) {
             QueuedBlock &queuedBlock = state.vBlocksInFlight.front();
             int nOtherPeersWithValidatedDownloads = nPeersWithValidatedDownloads - (state.nBlocksInFlightValidHeaders > 0);
             if (nNow > state.nDownloadingSince + consensusParams.nPowTargetSpacing * (BLOCK_DOWNLOAD_TIMEOUT_BASE + BLOCK_DOWNLOAD_TIMEOUT_PER_PEER * nOtherPeersWithValidatedDownloads)) {
@@ -6924,7 +6924,7 @@ bool SendMessages(CNode* pto, CConnman& connman)
         // Message: getdata (blocks)
         //
         vector<CInv> vGetData;
-        if (!pto->fDisconnect && !pto->fClient && (fFetch || !IsInitialBlockDownload()) && state.nBlocksInFlight < MAX_BLOCKS_IN_TRANSIT_PER_PEER) {
+        if (!pto->fClient && (fFetch || !IsInitialBlockDownload()) && state.nBlocksInFlight < MAX_BLOCKS_IN_TRANSIT_PER_PEER) {
             vector<CBlockIndex*> vToDownload;
             NodeId staller = -1;
             FindNextBlocksToDownload(pto->GetId(), MAX_BLOCKS_IN_TRANSIT_PER_PEER - state.nBlocksInFlight, vToDownload, staller, consensusParams);
@@ -6946,7 +6946,7 @@ bool SendMessages(CNode* pto, CConnman& connman)
         //
         // Message: getdata (non-blocks)
         //
-        while (!pto->fDisconnect && !pto->mapAskFor.empty() && (*pto->mapAskFor.begin()).first <= nNow)
+        while (!pto->mapAskFor.empty() && (*pto->mapAskFor.begin()).first <= nNow)
         {
             const CInv& inv = (*pto->mapAskFor.begin()).second;
             if (!AlreadyHave(inv))
@@ -6972,7 +6972,7 @@ bool SendMessages(CNode* pto, CConnman& connman)
         // Message: feefilter
         //
         // We don't want white listed peers to filter txs to us if we have -whitelistforcerelay
-        if (!pto->fDisconnect && pto->nVersion >= FEEFILTER_VERSION && GetBoolArg("-feefilter", DEFAULT_FEEFILTER) &&
+        if (pto->nVersion >= FEEFILTER_VERSION && GetBoolArg("-feefilter", DEFAULT_FEEFILTER) &&
             !(pto->fWhitelisted && GetBoolArg("-whitelistforcerelay", DEFAULT_WHITELISTFORCERELAY))) {
             CAmount currentFilter = mempool.GetMinFee(GetArg("-maxmempool", DEFAULT_MAX_MEMPOOL_SIZE) * 1000000).GetFeePerK();
             int64_t timeNow = GetTimeMicros();

From 2ec935dcaab9557addcf73c33aa7f2db8cc01fee Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Thu, 10 Nov 2016 17:05:23 -0500
Subject: [PATCH 1265/1802] net: add CVectorWriter and CNetMsgMaker

CVectorWriter is useful for overwriting or appending an existing byte vector.

CNetMsgMaker is a shortcut for creating messages on-the-fly which are suitable
for pushing to CConnman.
---
 src/Makefile.am            |  1 +
 src/net.h                  | 14 ++++++++
 src/netmessagemaker.h      | 36 ++++++++++++++++++++
 src/streams.h              | 69 ++++++++++++++++++++++++++++++++++++++
 src/test/streams_tests.cpp | 58 ++++++++++++++++++++++++++++++++
 5 files changed, 178 insertions(+)
 create mode 100644 src/netmessagemaker.h

diff --git a/src/Makefile.am b/src/Makefile.am
index 5a5e3abcfa646..69ae02f582b30 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -111,6 +111,7 @@ BITCOIN_CORE_H = \
   net.h \
   netaddress.h \
   netbase.h \
+  netmessagemaker.h \
   noui.h \
   policy/fees.h \
   policy/policy.h \
diff --git a/src/net.h b/src/net.h
index 7a32e21f4a436..9ea056c6eeb5d 100644
--- a/src/net.h
+++ b/src/net.h
@@ -101,6 +101,20 @@ class CTransaction;
 class CNodeStats;
 class CClientUIInterface;
 
+struct CSerializedNetMsg
+{
+    CSerializedNetMsg() = default;
+    CSerializedNetMsg(CSerializedNetMsg&&) = default;
+    CSerializedNetMsg& operator=(CSerializedNetMsg&&) = default;
+    // No copying, only moves.
+    CSerializedNetMsg(const CSerializedNetMsg& msg) = delete;
+    CSerializedNetMsg& operator=(const CSerializedNetMsg&) = delete;
+
+    std::vector<unsigned char> data;
+    std::string command;
+};
+
+
 class CConnman
 {
 public:
diff --git a/src/netmessagemaker.h b/src/netmessagemaker.h
new file mode 100644
index 0000000000000..7167434a19ebe
--- /dev/null
+++ b/src/netmessagemaker.h
@@ -0,0 +1,36 @@
+// Copyright (c) 2009-2010 Satoshi Nakamoto
+// Copyright (c) 2009-2016 The Bitcoin Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#ifndef BITCOIN_NETMESSAGEMAKER_H
+#define BITCOIN_NETMESSAGEMAKER_H
+
+#include "net.h"
+#include "serialize.h"
+
+class CNetMsgMaker
+{
+public:
+    CNetMsgMaker(int nVersionIn) : nVersion(nVersionIn){}
+
+    template <typename... Args>
+    CSerializedNetMsg Make(int nFlags, std::string sCommand, Args&&... args)
+    {
+        CSerializedNetMsg msg;
+        msg.command = std::move(sCommand);
+        CVectorWriter{ SER_NETWORK, nFlags | nVersion, msg.data, 0, std::forward<Args>(args)... };
+        return msg;
+    }
+
+    template <typename... Args>
+    CSerializedNetMsg Make(std::string sCommand, Args&&... args)
+    {
+        return Make(0, std::move(sCommand), std::forward<Args>(args)...);
+    }
+
+private:
+    const int nVersion;
+};
+
+#endif // BITCOIN_NETMESSAGEMAKER_H
diff --git a/src/streams.h b/src/streams.h
index c3e7c9e9e4a49..b508784238de7 100644
--- a/src/streams.h
+++ b/src/streams.h
@@ -69,6 +69,75 @@ OverrideStream<S> WithOrVersion(S* s, int nVersionFlag)
     return OverrideStream<S>(s, s->GetType(), s->GetVersion() | nVersionFlag);
 }
 
+/* Minimal stream for overwriting and/or appending to an existing byte vector
+ *
+ * The referenced vector will grow as necessary
+ */
+class CVectorWriter
+{
+ public:
+
+/*
+ * @param[in]  nTypeIn Serialization Type
+ * @param[in]  nVersionIn Serialization Version (including any flags)
+ * @param[in]  vchDataIn  Referenced byte vector to overwrite/append
+ * @param[in]  nPosIn Starting position. Vector index where writes should start. The vector will initially
+ *                    grow as necessary to  max(index, vec.size()). So to append, use vec.size().
+*/
+    CVectorWriter(int nTypeIn, int nVersionIn, std::vector<unsigned char>& vchDataIn, size_t nPosIn) : nType(nTypeIn), nVersion(nVersionIn), vchData(vchDataIn), nPos(nPosIn)
+    {
+        if(nPos > vchData.size())
+            vchData.resize(nPos);
+    }
+/*
+ * (other params same as above)
+ * @param[in]  args  A list of items to serialize starting at nPos.
+*/
+    template <typename... Args>
+    CVectorWriter(int nTypeIn, int nVersionIn, std::vector<unsigned char>& vchDataIn, size_t nPosIn, Args&&... args) : CVectorWriter(nTypeIn, nVersionIn, vchDataIn, nPosIn)
+    {
+        ::SerializeMany(*this, std::forward<Args>(args)...);
+    }
+    void write(const char* pch, size_t nSize)
+    {
+        assert(nPos <= vchData.size());
+        size_t nOverwrite = std::min(nSize, vchData.size() - nPos);
+        if (nOverwrite) {
+            memcpy(vchData.data() + nPos, reinterpret_cast<const unsigned char*>(pch), nOverwrite);
+        }
+        if (nOverwrite < nSize) {
+            vchData.insert(vchData.end(), reinterpret_cast<const unsigned char*>(pch) + nOverwrite, reinterpret_cast<const unsigned char*>(pch) + nSize);
+        }
+        nPos += nSize;
+    }
+    template<typename T>
+    CVectorWriter& operator<<(const T& obj)
+    {
+        // Serialize to this stream
+        ::Serialize(*this, obj);
+        return (*this);
+    }
+    int GetVersion() const
+    {
+        return nVersion;
+    }
+    int GetType() const
+    {
+        return nType;
+    }
+    void seek(size_t nSize)
+    {
+        nPos += nSize;
+        if(nPos > vchData.size())
+            vchData.resize(nPos);
+    }
+private:
+    const int nType;
+    const int nVersion;
+    std::vector<unsigned char>& vchData;
+    size_t nPos;
+};
+
 /** Double ended buffer combining vector and stream-like interfaces.
  *
  * >> and << read and write unformatted data using the above serialization templates.
diff --git a/src/test/streams_tests.cpp b/src/test/streams_tests.cpp
index 34f501e867e71..8b715ce93eefd 100644
--- a/src/test/streams_tests.cpp
+++ b/src/test/streams_tests.cpp
@@ -15,6 +15,64 @@ using namespace boost::assign; // bring 'operator+=()' into scope
 
 BOOST_FIXTURE_TEST_SUITE(streams_tests, BasicTestingSetup)
 
+BOOST_AUTO_TEST_CASE(streams_vector_writer)
+{
+    unsigned char a(1);
+    unsigned char b(2);
+    unsigned char bytes[] = { 3, 4, 5, 6 };
+    std::vector<unsigned char> vch;
+
+    // Each test runs twice. Serializing a second time at the same starting
+    // point should yield the same results, even if the first test grew the
+    // vector.
+
+    CVectorWriter(SER_NETWORK, INIT_PROTO_VERSION, vch, 0, a, b);
+    BOOST_CHECK((vch == std::vector<unsigned char>{{1, 2}}));
+    CVectorWriter(SER_NETWORK, INIT_PROTO_VERSION, vch, 0, a, b);
+    BOOST_CHECK((vch == std::vector<unsigned char>{{1, 2}}));
+    vch.clear();
+
+    CVectorWriter(SER_NETWORK, INIT_PROTO_VERSION, vch, 2, a, b);
+    BOOST_CHECK((vch == std::vector<unsigned char>{{0, 0, 1, 2}}));
+    CVectorWriter(SER_NETWORK, INIT_PROTO_VERSION, vch, 2, a, b);
+    BOOST_CHECK((vch == std::vector<unsigned char>{{0, 0, 1, 2}}));
+    vch.clear();
+
+    vch.resize(5, 0);
+    CVectorWriter(SER_NETWORK, INIT_PROTO_VERSION, vch, 2, a, b);
+    BOOST_CHECK((vch == std::vector<unsigned char>{{0, 0, 1, 2, 0}}));
+    CVectorWriter(SER_NETWORK, INIT_PROTO_VERSION, vch, 2, a, b);
+    BOOST_CHECK((vch == std::vector<unsigned char>{{0, 0, 1, 2, 0}}));
+    vch.clear();
+
+    vch.resize(4, 0);
+    CVectorWriter(SER_NETWORK, INIT_PROTO_VERSION, vch, 3, a, b);
+    BOOST_CHECK((vch == std::vector<unsigned char>{{0, 0, 0, 1, 2}}));
+    CVectorWriter(SER_NETWORK, INIT_PROTO_VERSION, vch, 3, a, b);
+    BOOST_CHECK((vch == std::vector<unsigned char>{{0, 0, 0, 1, 2}}));
+    vch.clear();
+
+    vch.resize(4, 0);
+    CVectorWriter(SER_NETWORK, INIT_PROTO_VERSION, vch, 4, a, b);
+    BOOST_CHECK((vch == std::vector<unsigned char>{{0, 0, 0, 0, 1, 2}}));
+    CVectorWriter(SER_NETWORK, INIT_PROTO_VERSION, vch, 4, a, b);
+    BOOST_CHECK((vch == std::vector<unsigned char>{{0, 0, 0, 0, 1, 2}}));
+    vch.clear();
+
+    CVectorWriter(SER_NETWORK, INIT_PROTO_VERSION, vch, 0, FLATDATA(bytes));
+    BOOST_CHECK((vch == std::vector<unsigned char>{{3, 4, 5, 6}}));
+    CVectorWriter(SER_NETWORK, INIT_PROTO_VERSION, vch, 0, FLATDATA(bytes));
+    BOOST_CHECK((vch == std::vector<unsigned char>{{3, 4, 5, 6}}));
+    vch.clear();
+
+    vch.resize(4, 8);
+    CVectorWriter(SER_NETWORK, INIT_PROTO_VERSION, vch, 2, a, FLATDATA(bytes), b);
+    BOOST_CHECK((vch == std::vector<unsigned char>{{8, 8, 1, 3, 4, 5, 6, 2}}));
+    CVectorWriter(SER_NETWORK, INIT_PROTO_VERSION, vch, 2, a, FLATDATA(bytes), b);
+    BOOST_CHECK((vch == std::vector<unsigned char>{{8, 8, 1, 3, 4, 5, 6, 2}}));
+    vch.clear();
+}
+
 BOOST_AUTO_TEST_CASE(streams_serializedata_xor)
 {
     std::vector<char> in;

From c7be56dceff625991cb2884f2ce053996ac613cd Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Thu, 10 Nov 2016 20:17:30 -0500
Subject: [PATCH 1266/1802] net: push only raw data into CConnman

This fixes one of the last major layer violations in the networking stack.

The network side is no longer in charge of message serialization, so it is now
decoupled from Bitcoin structures. Only the header is serialized and attached
to the payload.
---
 src/main.cpp | 131 ++++++++++++++++++++++++++++-----------------------
 src/net.cpp  |  46 ++++++++----------
 src/net.h    |  35 ++------------
 3 files changed, 93 insertions(+), 119 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index 11c7b2ec6a057..559538165c1f2 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -18,6 +18,7 @@
 #include "init.h"
 #include "merkleblock.h"
 #include "net.h"
+#include "netmessagemaker.h"
 #include "netbase.h"
 #include "policy/fees.h"
 #include "policy/policy.h"
@@ -368,8 +369,8 @@ void PushNodeVersion(CNode *pnode, CConnman& connman, int64_t nTime)
     CAddress addrYou = (addr.IsRoutable() && !IsProxy(addr) ? addr : CAddress(CService(), addr.nServices));
     CAddress addrMe = CAddress(CService(), nLocalNodeServices);
 
-    connman.PushMessageWithVersion(pnode, INIT_PROTO_VERSION, NetMsgType::VERSION, PROTOCOL_VERSION, (uint64_t)nLocalNodeServices, nTime, addrYou, addrMe,
-            nonce, strSubVersion, nNodeStartingHeight, ::fRelayTxes);
+    connman.PushMessage(pnode, CNetMsgMaker(INIT_PROTO_VERSION).Make(NetMsgType::VERSION, PROTOCOL_VERSION, (uint64_t)nLocalNodeServices, nTime, addrYou, addrMe,
+            nonce, strSubVersion, nNodeStartingHeight, ::fRelayTxes));
 
     if (fLogIPs)
         LogPrint("net", "send version message: version %d, blocks=%d, us=%s, them=%s, peer=%d\n", PROTOCOL_VERSION, nNodeStartingHeight, addrMe.ToString(), addrYou.ToString(), nodeid);
@@ -530,13 +531,13 @@ void MaybeSetPeerAsAnnouncingHeaderAndIDs(const CNodeState* nodestate, CNode* pf
             // As per BIP152, we only get 3 of our peers to announce
             // blocks using compact encodings.
             connman.ForNode(lNodesAnnouncingHeaderAndIDs.front(), [&connman, fAnnounceUsingCMPCTBLOCK, nCMPCTBLOCKVersion](CNode* pnodeStop){
-                connman.PushMessage(pnodeStop, NetMsgType::SENDCMPCT, fAnnounceUsingCMPCTBLOCK, nCMPCTBLOCKVersion);
+                connman.PushMessage(pnodeStop, CNetMsgMaker(pnodeStop->GetSendVersion()).Make(NetMsgType::SENDCMPCT, fAnnounceUsingCMPCTBLOCK, nCMPCTBLOCKVersion));
                 return true;
             });
             lNodesAnnouncingHeaderAndIDs.pop_front();
         }
         fAnnounceUsingCMPCTBLOCK = true;
-        connman.PushMessage(pfrom, NetMsgType::SENDCMPCT, fAnnounceUsingCMPCTBLOCK, nCMPCTBLOCKVersion);
+        connman.PushMessage(pfrom, CNetMsgMaker(pfrom->GetSendVersion()).Make(NetMsgType::SENDCMPCT, fAnnounceUsingCMPCTBLOCK, nCMPCTBLOCKVersion));
         lNodesAnnouncingHeaderAndIDs.push_back(pfrom->GetId());
     }
 }
@@ -4893,9 +4894,8 @@ void static ProcessGetData(CNode* pfrom, const Consensus::Params& consensusParam
 {
     std::deque<CInv>::iterator it = pfrom->vRecvGetData.begin();
     unsigned int nMaxSendBufferSize = connman.GetSendBufferSize();
-
     vector<CInv> vNotFound;
-
+    CNetMsgMaker msgMaker(pfrom->GetSendVersion());
     LOCK(cs_main);
 
     while (it != pfrom->vRecvGetData.end()) {
@@ -4949,9 +4949,9 @@ void static ProcessGetData(CNode* pfrom, const Consensus::Params& consensusParam
                     if (!ReadBlockFromDisk(block, (*mi).second, consensusParams))
                         assert(!"cannot load block from disk");
                     if (inv.type == MSG_BLOCK)
-                        connman.PushMessageWithFlag(pfrom, SERIALIZE_TRANSACTION_NO_WITNESS, NetMsgType::BLOCK, block);
+                        connman.PushMessage(pfrom, msgMaker.Make(SERIALIZE_TRANSACTION_NO_WITNESS, NetMsgType::BLOCK, block));
                     else if (inv.type == MSG_WITNESS_BLOCK)
-                        connman.PushMessage(pfrom, NetMsgType::BLOCK, block);
+                        connman.PushMessage(pfrom, msgMaker.Make(NetMsgType::BLOCK, block));
                     else if (inv.type == MSG_FILTERED_BLOCK)
                     {
                         bool sendMerkleBlock = false;
@@ -4964,7 +4964,7 @@ void static ProcessGetData(CNode* pfrom, const Consensus::Params& consensusParam
                             }
                         }
                         if (sendMerkleBlock) {
-                            connman.PushMessage(pfrom, NetMsgType::MERKLEBLOCK, merkleBlock);
+                            connman.PushMessage(pfrom, msgMaker.Make(NetMsgType::MERKLEBLOCK, merkleBlock));
                             // CMerkleBlock just contains hashes, so also push any transactions in the block the client did not see
                             // This avoids hurting performance by pointlessly requiring a round-trip
                             // Note that there is currently no way for a node to request any single transactions we didn't send here -
@@ -4973,7 +4973,7 @@ void static ProcessGetData(CNode* pfrom, const Consensus::Params& consensusParam
                             // however we MUST always provide at least what the remote peer needs
                             typedef std::pair<unsigned int, uint256> PairType;
                             BOOST_FOREACH(PairType& pair, merkleBlock.vMatchedTxn)
-                                connman.PushMessageWithFlag(pfrom, SERIALIZE_TRANSACTION_NO_WITNESS, NetMsgType::TX, *block.vtx[pair.first]);
+                                connman.PushMessage(pfrom, msgMaker.Make(SERIALIZE_TRANSACTION_NO_WITNESS, NetMsgType::TX, *block.vtx[pair.first]));
                         }
                         // else
                             // no response
@@ -4985,11 +4985,12 @@ void static ProcessGetData(CNode* pfrom, const Consensus::Params& consensusParam
                         // and we don't feel like constructing the object for them, so
                         // instead we respond with the full, non-compact block.
                         bool fPeerWantsWitness = State(pfrom->GetId())->fWantsCmpctWitness;
+                        int nSendFlags = fPeerWantsWitness ? 0 : SERIALIZE_TRANSACTION_NO_WITNESS;
                         if (CanDirectFetch(consensusParams) && mi->second->nHeight >= chainActive.Height() - MAX_CMPCTBLOCK_DEPTH) {
                             CBlockHeaderAndShortTxIDs cmpctblock(block, fPeerWantsWitness);
-                            connman.PushMessageWithFlag(pfrom, fPeerWantsWitness ? 0 : SERIALIZE_TRANSACTION_NO_WITNESS, NetMsgType::CMPCTBLOCK, cmpctblock);
+                            connman.PushMessage(pfrom, msgMaker.Make(nSendFlags, NetMsgType::CMPCTBLOCK, cmpctblock));
                         } else
-                            connman.PushMessageWithFlag(pfrom, fPeerWantsWitness ? 0 : SERIALIZE_TRANSACTION_NO_WITNESS, NetMsgType::BLOCK, block);
+                            connman.PushMessage(pfrom, msgMaker.Make(nSendFlags, NetMsgType::BLOCK, block));
                     }
 
                     // Trigger the peer node to send a getblocks request for the next batch of inventory
@@ -5000,7 +5001,7 @@ void static ProcessGetData(CNode* pfrom, const Consensus::Params& consensusParam
                         // wait for other stuff first.
                         vector<CInv> vInv;
                         vInv.push_back(CInv(MSG_BLOCK, chainActive.Tip()->GetBlockHash()));
-                        connman.PushMessage(pfrom, NetMsgType::INV, vInv);
+                        connman.PushMessage(pfrom, msgMaker.Make(NetMsgType::INV, vInv));
                         pfrom->hashContinue.SetNull();
                     }
                 }
@@ -5010,15 +5011,16 @@ void static ProcessGetData(CNode* pfrom, const Consensus::Params& consensusParam
                 // Send stream from relay memory
                 bool push = false;
                 auto mi = mapRelay.find(inv.hash);
+                int nSendFlags = (inv.type == MSG_TX ? SERIALIZE_TRANSACTION_NO_WITNESS : 0);
                 if (mi != mapRelay.end()) {
-                    connman.PushMessageWithFlag(pfrom, inv.type == MSG_TX ? SERIALIZE_TRANSACTION_NO_WITNESS : 0, NetMsgType::TX, *mi->second);
+                    connman.PushMessage(pfrom, msgMaker.Make(nSendFlags, NetMsgType::TX, *mi->second));
                     push = true;
                 } else if (pfrom->timeLastMempoolReq) {
                     auto txinfo = mempool.info(inv.hash);
                     // To protect privacy, do not answer getdata using the mempool when
                     // that TX couldn't have been INVed in reply to a MEMPOOL request.
                     if (txinfo.tx && txinfo.nTime <= pfrom->timeLastMempoolReq) {
-                        connman.PushMessageWithFlag(pfrom, inv.type == MSG_TX ? SERIALIZE_TRANSACTION_NO_WITNESS : 0, NetMsgType::TX, *txinfo.tx);
+                        connman.PushMessage(pfrom, msgMaker.Make(nSendFlags, NetMsgType::TX, *txinfo.tx));
                         push = true;
                     }
                 }
@@ -5045,7 +5047,7 @@ void static ProcessGetData(CNode* pfrom, const Consensus::Params& consensusParam
         // do that because they want to know about (and store and rebroadcast and
         // risk analyze) the dependencies of transactions relevant to them, without
         // having to download the entire memory pool.
-        connman.PushMessage(pfrom, NetMsgType::NOTFOUND, vNotFound);
+        connman.PushMessage(pfrom, msgMaker.Make(NetMsgType::NOTFOUND, vNotFound));
     }
 }
 
@@ -5089,7 +5091,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
         // Each connection can only send one version message
         if (pfrom->nVersion != 0)
         {
-            connman.PushMessageWithVersion(pfrom, INIT_PROTO_VERSION, NetMsgType::REJECT, strCommand, REJECT_DUPLICATE, string("Duplicate version message"));
+            connman.PushMessage(pfrom, CNetMsgMaker(INIT_PROTO_VERSION).Make(NetMsgType::REJECT, strCommand, REJECT_DUPLICATE, string("Duplicate version message")));
             LOCK(cs_main);
             Misbehaving(pfrom->GetId(), 1);
             return false;
@@ -5109,8 +5111,8 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
         if (pfrom->nServicesExpected & ~pfrom->nServices)
         {
             LogPrint("net", "peer=%d does not offer the expected services (%08x offered, %08x expected); disconnecting\n", pfrom->id, pfrom->nServices, pfrom->nServicesExpected);
-            connman.PushMessageWithVersion(pfrom, INIT_PROTO_VERSION, NetMsgType::REJECT, strCommand, REJECT_NONSTANDARD,
-                               strprintf("Expected to offer services %08x", pfrom->nServicesExpected));
+            connman.PushMessage(pfrom, CNetMsgMaker(INIT_PROTO_VERSION).Make(NetMsgType::REJECT, strCommand, REJECT_NONSTANDARD,
+                               strprintf("Expected to offer services %08x", pfrom->nServicesExpected)));
             pfrom->fDisconnect = true;
             return false;
         }
@@ -5119,8 +5121,8 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
         {
             // disconnect from peers older than this proto version
             LogPrintf("peer=%d using obsolete version %i; disconnecting\n", pfrom->id, pfrom->nVersion);
-            connman.PushMessageWithVersion(pfrom, INIT_PROTO_VERSION, NetMsgType::REJECT, strCommand, REJECT_OBSOLETE,
-                               strprintf("Version must be %d or greater", MIN_PEER_PROTO_VERSION));
+            connman.PushMessage(pfrom, CNetMsgMaker(INIT_PROTO_VERSION).Make(NetMsgType::REJECT, strCommand, REJECT_OBSOLETE,
+                               strprintf("Version must be %d or greater", MIN_PEER_PROTO_VERSION)));
             pfrom->fDisconnect = true;
             return false;
         }
@@ -5177,8 +5179,9 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
         }
 
         // Change version
-        connman.PushMessageWithVersion(pfrom, INIT_PROTO_VERSION, NetMsgType::VERACK);
-        pfrom->SetSendVersion(min(pfrom->nVersion, PROTOCOL_VERSION));
+        connman.PushMessage(pfrom, CNetMsgMaker(INIT_PROTO_VERSION).Make(NetMsgType::VERACK));
+        int nSendVersion = std::min(pfrom->nVersion, PROTOCOL_VERSION);
+        pfrom->SetSendVersion(nSendVersion);
 
         if (!pfrom->fInbound)
         {
@@ -5201,7 +5204,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
             // Get recent addresses
             if (pfrom->fOneShot || pfrom->nVersion >= CADDR_TIME_VERSION || connman.GetAddressCount() < 1000)
             {
-                connman.PushMessage(pfrom, NetMsgType::GETADDR);
+                connman.PushMessage(pfrom, CNetMsgMaker(nSendVersion).Make(NetMsgType::GETADDR));
                 pfrom->fGetAddr = true;
             }
             connman.MarkAddressGood(pfrom->addr);
@@ -5227,6 +5230,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
             assert(pfrom->fInbound == false);
             pfrom->fDisconnect = true;
         }
+        return true;
     }
 
 
@@ -5238,8 +5242,10 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
         return false;
     }
 
+    // At this point, the outgoing message serialization version can't change.
+    CNetMsgMaker msgMaker(pfrom->GetSendVersion());
 
-    else if (strCommand == NetMsgType::VERACK)
+    if (strCommand == NetMsgType::VERACK)
     {
         pfrom->SetRecvVersion(min(pfrom->nVersion, PROTOCOL_VERSION));
 
@@ -5254,7 +5260,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
             // We send this to non-NODE NETWORK peers as well, because even
             // non-NODE NETWORK peers can announce blocks (such as pruning
             // nodes)
-            connman.PushMessage(pfrom, NetMsgType::SENDHEADERS);
+            connman.PushMessage(pfrom, msgMaker.Make(NetMsgType::SENDHEADERS));
         }
         if (pfrom->nVersion >= SHORT_IDS_BLOCKS_VERSION) {
             // Tell our peer we are willing to provide version 1 or 2 cmpctblocks
@@ -5265,9 +5271,9 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
             bool fAnnounceUsingCMPCTBLOCK = false;
             uint64_t nCMPCTBLOCKVersion = 2;
             if (pfrom->GetLocalServices() & NODE_WITNESS)
-                connman.PushMessage(pfrom, NetMsgType::SENDCMPCT, fAnnounceUsingCMPCTBLOCK, nCMPCTBLOCKVersion);
+                connman.PushMessage(pfrom, msgMaker.Make(NetMsgType::SENDCMPCT, fAnnounceUsingCMPCTBLOCK, nCMPCTBLOCKVersion));
             nCMPCTBLOCKVersion = 1;
-            connman.PushMessage(pfrom, NetMsgType::SENDCMPCT, fAnnounceUsingCMPCTBLOCK, nCMPCTBLOCKVersion);
+            connman.PushMessage(pfrom, msgMaker.Make(NetMsgType::SENDCMPCT, fAnnounceUsingCMPCTBLOCK, nCMPCTBLOCKVersion));
         }
     }
 
@@ -5392,7 +5398,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
                     // fell back to inv we probably have a reorg which we should get the headers for first,
                     // we now only provide a getheaders response here. When we receive the headers, we will
                     // then ask for the blocks we need.
-                    connman.PushMessage(pfrom, NetMsgType::GETHEADERS, chainActive.GetLocator(pindexBestHeader), inv.hash);
+                    connman.PushMessage(pfrom, msgMaker.Make(NetMsgType::GETHEADERS, chainActive.GetLocator(pindexBestHeader), inv.hash));
                     LogPrint("net", "getheaders (%d) %s to peer=%d\n", pindexBestHeader->nHeight, inv.hash.ToString(), pfrom->id);
                 }
             }
@@ -5415,7 +5421,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
         }
 
         if (!vToFetch.empty())
-            connman.PushMessage(pfrom, NetMsgType::GETDATA, vToFetch);
+            connman.PushMessage(pfrom, msgMaker.Make(NetMsgType::GETDATA, vToFetch));
     }
 
 
@@ -5527,7 +5533,8 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
             }
             resp.txn[i] = block.vtx[req.indexes[i]];
         }
-        connman.PushMessageWithFlag(pfrom, State(pfrom->GetId())->fWantsCmpctWitness ? 0 : SERIALIZE_TRANSACTION_NO_WITNESS, NetMsgType::BLOCKTXN, resp);
+        int nSendFlags = State(pfrom->GetId())->fWantsCmpctWitness ? 0 : SERIALIZE_TRANSACTION_NO_WITNESS;
+        connman.PushMessage(pfrom, msgMaker.Make(nSendFlags, NetMsgType::BLOCKTXN, resp));
     }
 
 
@@ -5576,7 +5583,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
         // headers message). In both cases it's safe to update
         // pindexBestHeaderSent to be our tip.
         nodestate->pindexBestHeaderSent = pindex ? pindex : chainActive.Tip();
-        connman.PushMessage(pfrom, NetMsgType::HEADERS, vHeaders);
+        connman.PushMessage(pfrom, msgMaker.Make(NetMsgType::HEADERS, vHeaders));
     }
 
 
@@ -5739,8 +5746,8 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
                 pfrom->id,
                 FormatStateMessage(state));
             if (state.GetRejectCode() < REJECT_INTERNAL) // Never send AcceptToMemoryPool's internal codes over P2P
-                connman.PushMessage(pfrom, NetMsgType::REJECT, strCommand, (unsigned char)state.GetRejectCode(),
-                                   state.GetRejectReason().substr(0, MAX_REJECT_MESSAGE_LENGTH), inv.hash);
+                connman.PushMessage(pfrom, msgMaker.Make(NetMsgType::REJECT, strCommand, (unsigned char)state.GetRejectCode(),
+                                   state.GetRejectReason().substr(0, MAX_REJECT_MESSAGE_LENGTH), inv.hash));
             if (nDoS > 0) {
                 Misbehaving(pfrom->GetId(), nDoS);
             }
@@ -5758,7 +5765,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
         if (mapBlockIndex.find(cmpctblock.header.hashPrevBlock) == mapBlockIndex.end()) {
             // Doesn't connect (or is genesis), instead of DoSing in AcceptBlockHeader, request deeper headers
             if (!IsInitialBlockDownload())
-                connman.PushMessage(pfrom, NetMsgType::GETHEADERS, chainActive.GetLocator(pindexBestHeader), uint256());
+                connman.PushMessage(pfrom, msgMaker.Make(NetMsgType::GETHEADERS, chainActive.GetLocator(pindexBestHeader), uint256()));
             return true;
         }
 
@@ -5791,7 +5798,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
                 // so we just grab the block via normal getdata
                 std::vector<CInv> vInv(1);
                 vInv[0] = CInv(MSG_BLOCK | GetFetchFlags(pfrom, pindex->pprev, chainparams.GetConsensus()), cmpctblock.header.GetHash());
-                connman.PushMessage(pfrom, NetMsgType::GETDATA, vInv);
+                connman.PushMessage(pfrom, msgMaker.Make(NetMsgType::GETDATA, vInv));
             }
             return true;
         }
@@ -5835,7 +5842,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
                     // Duplicate txindexes, the block is now in-flight, so just request it
                     std::vector<CInv> vInv(1);
                     vInv[0] = CInv(MSG_BLOCK | GetFetchFlags(pfrom, pindex->pprev, chainparams.GetConsensus()), cmpctblock.header.GetHash());
-                    connman.PushMessage(pfrom, NetMsgType::GETDATA, vInv);
+                    connman.PushMessage(pfrom, msgMaker.Make(NetMsgType::GETDATA, vInv));
                     return true;
                 }
 
@@ -5859,7 +5866,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
                     return ProcessMessage(pfrom, NetMsgType::BLOCKTXN, blockTxnMsg, nTimeReceived, chainparams, connman);
                 } else {
                     req.blockhash = pindex->GetBlockHash();
-                    connman.PushMessage(pfrom, NetMsgType::GETBLOCKTXN, req);
+                    connman.PushMessage(pfrom, msgMaker.Make(NetMsgType::GETBLOCKTXN, req));
                 }
             }
         } else {
@@ -5868,7 +5875,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
                 // mempool will probably be useless - request the block normally
                 std::vector<CInv> vInv(1);
                 vInv[0] = CInv(MSG_BLOCK | GetFetchFlags(pfrom, pindex->pprev, chainparams.GetConsensus()), cmpctblock.header.GetHash());
-                connman.PushMessage(pfrom, NetMsgType::GETDATA, vInv);
+                connman.PushMessage(pfrom, msgMaker.Make(NetMsgType::GETDATA, vInv));
                 return true;
             } else {
                 // If this was an announce-cmpctblock, we want the same treatment as a header message
@@ -5910,7 +5917,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
                 // Might have collided, fall back to getdata now :(
                 std::vector<CInv> invs;
                 invs.push_back(CInv(MSG_BLOCK | GetFetchFlags(pfrom, chainActive.Tip(), chainparams.GetConsensus()), resp.blockhash));
-                connman.PushMessage(pfrom, NetMsgType::GETDATA, invs);
+                connman.PushMessage(pfrom, msgMaker.Make(NetMsgType::GETDATA, invs));
             } else {
                 // Block is either okay, or possibly we received
                 // READ_STATUS_CHECKBLOCK_FAILED.
@@ -5987,7 +5994,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
         //   nUnconnectingHeaders gets reset back to 0.
         if (mapBlockIndex.find(headers[0].hashPrevBlock) == mapBlockIndex.end() && nCount < MAX_BLOCKS_TO_ANNOUNCE) {
             nodestate->nUnconnectingHeaders++;
-            connman.PushMessage(pfrom, NetMsgType::GETHEADERS, chainActive.GetLocator(pindexBestHeader), uint256());
+            connman.PushMessage(pfrom, msgMaker.Make(NetMsgType::GETHEADERS, chainActive.GetLocator(pindexBestHeader), uint256()));
             LogPrint("net", "received header %s: missing prev block %s, sending getheaders (%d) to end (peer=%d, nUnconnectingHeaders=%d)\n",
                     headers[0].GetHash().ToString(),
                     headers[0].hashPrevBlock.ToString(),
@@ -6034,7 +6041,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
             // TODO: optimize: if pindexLast is an ancestor of chainActive.Tip or pindexBestHeader, continue
             // from there instead.
             LogPrint("net", "more getheaders (%d) to end to peer=%d (startheight:%d)\n", pindexLast->nHeight, pfrom->id, pfrom->nStartingHeight);
-            connman.PushMessage(pfrom, NetMsgType::GETHEADERS, chainActive.GetLocator(pindexLast), uint256());
+            connman.PushMessage(pfrom, msgMaker.Make(NetMsgType::GETHEADERS, chainActive.GetLocator(pindexLast), uint256()));
         }
 
         bool fCanDirectFetch = CanDirectFetch(chainparams.GetConsensus());
@@ -6087,7 +6094,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
                         // In any case, we want to download using a compact block, not a regular one
                         vGetData[0] = CInv(MSG_CMPCT_BLOCK, vGetData[0].hash);
                     }
-                    connman.PushMessage(pfrom, NetMsgType::GETDATA, vGetData);
+                    connman.PushMessage(pfrom, msgMaker.Make(NetMsgType::GETDATA, vGetData));
                 }
             }
         }
@@ -6191,7 +6198,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
             // it, if the remote node sends a ping once per second and this node takes 5
             // seconds to respond to each, the 5th ping the remote sends would appear to
             // return very quickly.
-            connman.PushMessage(pfrom, NetMsgType::PONG, nonce);
+            connman.PushMessage(pfrom, msgMaker.Make(NetMsgType::PONG, nonce));
         }
     }
 
@@ -6447,7 +6454,7 @@ bool ProcessMessages(CNode* pfrom, CConnman& connman)
         }
         catch (const std::ios_base::failure& e)
         {
-            connman.PushMessageWithVersion(pfrom, INIT_PROTO_VERSION, NetMsgType::REJECT, strCommand, REJECT_MALFORMED, string("error parsing message"));
+            connman.PushMessage(pfrom, CNetMsgMaker(INIT_PROTO_VERSION).Make(NetMsgType::REJECT, strCommand, REJECT_MALFORMED, string("error parsing message")));
             if (strstr(e.what(), "end of data"))
             {
                 // Allow exceptions from under-length message on vRecv
@@ -6515,6 +6522,9 @@ bool SendMessages(CNode* pto, CConnman& connman)
         if (pto->nVersion == 0 || pto->fDisconnect)
             return true;
 
+        // If we get here, the outgoing message serialization version is set and can't change.
+        CNetMsgMaker msgMaker(pto->GetSendVersion());
+
         //
         // Message: ping
         //
@@ -6536,11 +6546,11 @@ bool SendMessages(CNode* pto, CConnman& connman)
             pto->nPingUsecStart = GetTimeMicros();
             if (pto->nVersion > BIP0031_VERSION) {
                 pto->nPingNonceSent = nonce;
-                connman.PushMessage(pto, NetMsgType::PING, nonce);
+                connman.PushMessage(pto, msgMaker.Make(NetMsgType::PING, nonce));
             } else {
                 // Peer is too old to support ping command with nonce, pong will never arrive.
                 pto->nPingNonceSent = 0;
-                connman.PushMessage(pto, NetMsgType::PING);
+                connman.PushMessage(pto, msgMaker.Make(NetMsgType::PING));
             }
         }
 
@@ -6551,7 +6561,7 @@ bool SendMessages(CNode* pto, CConnman& connman)
         CNodeState &state = *State(pto->GetId());
 
         BOOST_FOREACH(const CBlockReject& reject, state.rejects)
-            connman.PushMessage(pto, NetMsgType::REJECT, (string)NetMsgType::BLOCK, reject.chRejectCode, reject.strRejectReason, reject.hashBlock);
+            connman.PushMessage(pto, msgMaker.Make(NetMsgType::REJECT, (string)NetMsgType::BLOCK, reject.chRejectCode, reject.strRejectReason, reject.hashBlock));
         state.rejects.clear();
 
         if (state.fShouldBan) {
@@ -6593,14 +6603,14 @@ bool SendMessages(CNode* pto, CConnman& connman)
                     // receiver rejects addr messages larger than 1000
                     if (vAddr.size() >= 1000)
                     {
-                        connman.PushMessage(pto, NetMsgType::ADDR, vAddr);
+                        connman.PushMessage(pto, msgMaker.Make(NetMsgType::ADDR, vAddr));
                         vAddr.clear();
                     }
                 }
             }
             pto->vAddrToSend.clear();
             if (!vAddr.empty())
-                connman.PushMessage(pto, NetMsgType::ADDR, vAddr);
+                connman.PushMessage(pto, msgMaker.Make(NetMsgType::ADDR, vAddr));
             // we only send the big addr message once
             if (pto->vAddrToSend.capacity() > 40)
                 pto->vAddrToSend.shrink_to_fit();
@@ -6626,7 +6636,7 @@ bool SendMessages(CNode* pto, CConnman& connman)
                 if (pindexStart->pprev)
                     pindexStart = pindexStart->pprev;
                 LogPrint("net", "initial getheaders (%d) to peer=%d (startheight:%d)\n", pindexStart->nHeight, pto->id, pto->nStartingHeight);
-                connman.PushMessage(pto, NetMsgType::GETHEADERS, chainActive.GetLocator(pindexStart), uint256());
+                connman.PushMessage(pto, msgMaker.Make(NetMsgType::GETHEADERS, chainActive.GetLocator(pindexStart), uint256()));
             }
         }
 
@@ -6715,7 +6725,8 @@ bool SendMessages(CNode* pto, CConnman& connman)
                     CBlock block;
                     assert(ReadBlockFromDisk(block, pBestIndex, consensusParams));
                     CBlockHeaderAndShortTxIDs cmpctblock(block, state.fWantsCmpctWitness);
-                    connman.PushMessageWithFlag(pto, state.fWantsCmpctWitness ? 0 : SERIALIZE_TRANSACTION_NO_WITNESS, NetMsgType::CMPCTBLOCK, cmpctblock);
+                    int nSendFlags = state.fWantsCmpctWitness ? 0 : SERIALIZE_TRANSACTION_NO_WITNESS;
+                    connman.PushMessage(pto, msgMaker.Make(nSendFlags, NetMsgType::CMPCTBLOCK, cmpctblock));
                     state.pindexBestHeaderSent = pBestIndex;
                 } else if (state.fPreferHeaders) {
                     if (vHeaders.size() > 1) {
@@ -6727,7 +6738,7 @@ bool SendMessages(CNode* pto, CConnman& connman)
                         LogPrint("net", "%s: sending header %s to peer=%d\n", __func__,
                                 vHeaders.front().GetHash().ToString(), pto->id);
                     }
-                    connman.PushMessage(pto, NetMsgType::HEADERS, vHeaders);
+                    connman.PushMessage(pto, msgMaker.Make(NetMsgType::HEADERS, vHeaders));
                     state.pindexBestHeaderSent = pBestIndex;
                 } else
                     fRevertToInv = true;
@@ -6773,7 +6784,7 @@ bool SendMessages(CNode* pto, CConnman& connman)
             BOOST_FOREACH(const uint256& hash, pto->vInventoryBlockToSend) {
                 vInv.push_back(CInv(MSG_BLOCK, hash));
                 if (vInv.size() == MAX_INV_SZ) {
-                    connman.PushMessage(pto, NetMsgType::INV, vInv);
+                    connman.PushMessage(pto, msgMaker.Make(NetMsgType::INV, vInv));
                     vInv.clear();
                 }
             }
@@ -6819,7 +6830,7 @@ bool SendMessages(CNode* pto, CConnman& connman)
                     pto->filterInventoryKnown.insert(hash);
                     vInv.push_back(inv);
                     if (vInv.size() == MAX_INV_SZ) {
-                        connman.PushMessage(pto, NetMsgType::INV, vInv);
+                        connman.PushMessage(pto, msgMaker.Make(NetMsgType::INV, vInv));
                         vInv.clear();
                     }
                 }
@@ -6885,7 +6896,7 @@ bool SendMessages(CNode* pto, CConnman& connman)
                         }
                     }
                     if (vInv.size() == MAX_INV_SZ) {
-                        connman.PushMessage(pto, NetMsgType::INV, vInv);
+                        connman.PushMessage(pto, msgMaker.Make(NetMsgType::INV, vInv));
                         vInv.clear();
                     }
                     pto->filterInventoryKnown.insert(hash);
@@ -6893,7 +6904,7 @@ bool SendMessages(CNode* pto, CConnman& connman)
             }
         }
         if (!vInv.empty())
-            connman.PushMessage(pto, NetMsgType::INV, vInv);
+            connman.PushMessage(pto, msgMaker.Make(NetMsgType::INV, vInv));
 
         // Detect whether we're stalling
         nNow = GetTimeMicros();
@@ -6956,7 +6967,7 @@ bool SendMessages(CNode* pto, CConnman& connman)
                 vGetData.push_back(inv);
                 if (vGetData.size() >= 1000)
                 {
-                    connman.PushMessage(pto, NetMsgType::GETDATA, vGetData);
+                    connman.PushMessage(pto, msgMaker.Make(NetMsgType::GETDATA, vGetData));
                     vGetData.clear();
                 }
             } else {
@@ -6966,7 +6977,7 @@ bool SendMessages(CNode* pto, CConnman& connman)
             pto->mapAskFor.erase(pto->mapAskFor.begin());
         }
         if (!vGetData.empty())
-            connman.PushMessage(pto, NetMsgType::GETDATA, vGetData);
+            connman.PushMessage(pto, msgMaker.Make(NetMsgType::GETDATA, vGetData));
 
         //
         // Message: feefilter
@@ -6979,7 +6990,7 @@ bool SendMessages(CNode* pto, CConnman& connman)
             if (timeNow > pto->nextSendTimeFeeFilter) {
                 CAmount filterToSend = filterRounder.round(currentFilter);
                 if (filterToSend != pto->lastSentFeeFilter) {
-                    connman.PushMessage(pto, NetMsgType::FEEFILTER, filterToSend);
+                    connman.PushMessage(pto, msgMaker.Make(NetMsgType::FEEFILTER, filterToSend));
                     pto->lastSentFeeFilter = filterToSend;
                 }
                 pto->nextSendTimeFeeFilter = PoissonNextSend(timeNow, AVG_FEEFILTER_BROADCAST_INTERVAL);
diff --git a/src/net.cpp b/src/net.cpp
index 15c4514f152ac..ce87150ae365f 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -768,13 +768,13 @@ const uint256& CNetMessage::GetMessageHash() const
 // requires LOCK(cs_vSend)
 size_t SocketSendData(CNode *pnode)
 {
-    std::deque<CSerializeData>::iterator it = pnode->vSendMsg.begin();
+    auto it = pnode->vSendMsg.begin();
     size_t nSentSize = 0;
 
     while (it != pnode->vSendMsg.end()) {
-        const CSerializeData &data = *it;
+        const auto &data = *it;
         assert(data.size() > pnode->nSendOffset);
-        int nBytes = send(pnode->hSocket, &data[pnode->nSendOffset], data.size() - pnode->nSendOffset, MSG_NOSIGNAL | MSG_DONTWAIT);
+        int nBytes = send(pnode->hSocket, reinterpret_cast<const char*>(data.data()) + pnode->nSendOffset, data.size() - pnode->nSendOffset, MSG_NOSIGNAL | MSG_DONTWAIT);
         if (nBytes > 0) {
             pnode->nLastSend = GetTime();
             pnode->nSendBytes += nBytes;
@@ -2612,30 +2612,19 @@ void CNode::AskFor(const CInv& inv)
     mapAskFor.insert(std::make_pair(nRequestTime, inv));
 }
 
-CDataStream CConnman::BeginMessage(CNode* pnode, int nVersion, int flags, const std::string& sCommand)
+void CConnman::PushMessage(CNode* pnode, CSerializedNetMsg&& msg)
 {
-    return {SER_NETWORK, (nVersion ? nVersion : pnode->GetSendVersion()) | flags, CMessageHeader(Params().MessageStart(), sCommand.c_str(), 0) };
-}
-
-void CConnman::EndMessage(CDataStream& strm)
-{
-    // Set the size
-    assert(strm.size () >= CMessageHeader::HEADER_SIZE);
-    unsigned int nSize = strm.size() - CMessageHeader::HEADER_SIZE;
-    WriteLE32((uint8_t*)&strm[CMessageHeader::MESSAGE_SIZE_OFFSET], nSize);
-    // Set the checksum
-    uint256 hash = Hash(strm.begin() + CMessageHeader::HEADER_SIZE, strm.end());
-    memcpy((char*)&strm[CMessageHeader::CHECKSUM_OFFSET], hash.begin(), CMessageHeader::CHECKSUM_SIZE);
-
-}
+    size_t nMessageSize = msg.data.size();
+    size_t nTotalSize = nMessageSize + CMessageHeader::HEADER_SIZE;
+    LogPrint("net", "sending %s (%d bytes) peer=%d\n",  SanitizeString(msg.command.c_str()), nMessageSize, pnode->id);
 
-void CConnman::PushMessage(CNode* pnode, CDataStream& strm, const std::string& sCommand)
-{
-    if(strm.empty())
-        return;
+    std::vector<unsigned char> serializedHeader;
+    serializedHeader.reserve(CMessageHeader::HEADER_SIZE);
+    uint256 hash = Hash(msg.data.data(), msg.data.data() + nMessageSize);
+    CMessageHeader hdr(Params().MessageStart(), msg.command.c_str(), nMessageSize);
+    memcpy(hdr.pchChecksum, hash.begin(), CMessageHeader::CHECKSUM_SIZE);
 
-    unsigned int nSize = strm.size() - CMessageHeader::HEADER_SIZE;
-    LogPrint("net", "sending %s (%d bytes) peer=%d\n",  SanitizeString(sCommand.c_str()), nSize, pnode->id);
+    CVectorWriter{SER_NETWORK, INIT_PROTO_VERSION, serializedHeader, 0, hdr};
 
     size_t nBytesSent = 0;
     {
@@ -2644,11 +2633,14 @@ void CConnman::PushMessage(CNode* pnode, CDataStream& strm, const std::string& s
             return;
         }
         bool optimisticSend(pnode->vSendMsg.empty());
-        pnode->vSendMsg.emplace_back(strm.begin(), strm.end());
 
         //log total amount of bytes per command
-        pnode->mapSendBytesPerMsgCmd[sCommand] += strm.size();
-        pnode->nSendSize += strm.size();
+        pnode->mapSendBytesPerMsgCmd[msg.command] += nTotalSize;
+        pnode->nSendSize += nTotalSize;
+
+        pnode->vSendMsg.push_back(std::move(serializedHeader));
+        if (nMessageSize)
+            pnode->vSendMsg.push_back(std::move(msg.data));
 
         // If write queue empty, attempt "optimistic write"
         if (optimisticSend == true)
diff --git a/src/net.h b/src/net.h
index 9ea056c6eeb5d..a4a9fb676af75 100644
--- a/src/net.h
+++ b/src/net.h
@@ -152,32 +152,7 @@ class CConnman
 
     bool ForNode(NodeId id, std::function<bool(CNode* pnode)> func);
 
-    template <typename... Args>
-    void PushMessageWithVersionAndFlag(CNode* pnode, int nVersion, int flag, const std::string& sCommand, Args&&... args)
-    {
-        auto msg(BeginMessage(pnode, nVersion, flag, sCommand));
-        ::SerializeMany(msg, std::forward<Args>(args)...);
-        EndMessage(msg);
-        PushMessage(pnode, msg, sCommand);
-    }
-
-    template <typename... Args>
-    void PushMessageWithFlag(CNode* pnode, int flag, const std::string& sCommand, Args&&... args)
-    {
-        PushMessageWithVersionAndFlag(pnode, 0, flag, sCommand, std::forward<Args>(args)...);
-    }
-
-    template <typename... Args>
-    void PushMessageWithVersion(CNode* pnode, int nVersion, const std::string& sCommand, Args&&... args)
-    {
-        PushMessageWithVersionAndFlag(pnode, nVersion, 0, sCommand, std::forward<Args>(args)...);
-    }
-
-    template <typename... Args>
-    void PushMessage(CNode* pnode, const std::string& sCommand, Args&&... args)
-    {
-        PushMessageWithVersionAndFlag(pnode, 0, 0, sCommand, std::forward<Args>(args)...);
-    }
+    void PushMessage(CNode* pnode, CSerializedNetMsg&& msg);
 
     template<typename Callable>
     bool ForEachNodeContinueIf(Callable&& func)
@@ -388,10 +363,6 @@ class CConnman
 
     unsigned int GetReceiveFloodSize() const;
 
-    CDataStream BeginMessage(CNode* node, int nVersion, int flags, const std::string& sCommand);
-    void PushMessage(CNode* pnode, CDataStream& strm, const std::string& sCommand);
-    void EndMessage(CDataStream& strm);
-
     // Network stats
     void RecordBytesRecv(uint64_t bytes);
     void RecordBytesSent(uint64_t bytes);
@@ -615,7 +586,7 @@ class CNode
     size_t nSendSize; // total size of all vSendMsg entries
     size_t nSendOffset; // offset inside the first vSendMsg already sent
     uint64_t nSendBytes;
-    std::deque<CSerializeData> vSendMsg;
+    std::deque<std::vector<unsigned char>> vSendMsg;
     CCriticalSection cs_vSend;
 
     std::deque<CInv> vRecvGetData;
@@ -785,7 +756,7 @@ class CNode
     {
         // The send version should always be explicitly set to
         // INIT_PROTO_VERSION rather than using this value until the handshake
-        // is complete. See PushMessageWithVersion().
+        // is complete.
         assert(nSendVersion != 0);
         return nSendVersion;
     }

From 42071ca2640c6de156d72a32b52bff1020c4a38d Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Fri, 25 Nov 2016 18:03:12 -0800
Subject: [PATCH 1267/1802] Make fDisconnect an std::atomic

---
 src/net.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/net.h b/src/net.h
index 7a32e21f4a436..31385c231ec2a 100644
--- a/src/net.h
+++ b/src/net.h
@@ -630,7 +630,7 @@ class CNode
     const bool fInbound;
     bool fNetworkNode;
     bool fSuccessfullyConnected;
-    bool fDisconnect;
+    std::atomic_bool fDisconnect;
     // We use fRelayTxes for two purposes -
     // a) it allows us to not relay tx invs before receiving the peer's version message
     // b) the peer may tell us in its version message that we should not relay tx invs

From b7aa2902fd3c29487f585c264d8845899f4c1846 Mon Sep 17 00:00:00 2001
From: "S. Matthew English" <s-matthew-english@users.noreply.github.com>
Date: Sat, 26 Nov 2016 14:57:19 +0100
Subject: [PATCH 1268/1802] unification of Bloom filter representation

Output instances of "BloomFilter" changed to "Bloom filter", in accordance with Wikipedia standard notation:

https://en.wikipedia.org/wiki/Bloom_filter

also to sync with the majority of cases in the self-same file
---
 src/test/bloom_tests.cpp | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/test/bloom_tests.cpp b/src/test/bloom_tests.cpp
index 25fb9ea2b757c..ffa1fb6ad005a 100644
--- a/src/test/bloom_tests.cpp
+++ b/src/test/bloom_tests.cpp
@@ -30,15 +30,15 @@ BOOST_AUTO_TEST_CASE(bloom_create_insert_serialize)
     CBloomFilter filter(3, 0.01, 0, BLOOM_UPDATE_ALL);
 
     filter.insert(ParseHex("99108ad8ed9bb6274d3980bab5a85c048f0950c8"));
-    BOOST_CHECK_MESSAGE( filter.contains(ParseHex("99108ad8ed9bb6274d3980bab5a85c048f0950c8")), "BloomFilter doesn't contain just-inserted object!");
+    BOOST_CHECK_MESSAGE( filter.contains(ParseHex("99108ad8ed9bb6274d3980bab5a85c048f0950c8")), "Bloom filter doesn't contain just-inserted object!");
     // One bit different in first byte
-    BOOST_CHECK_MESSAGE(!filter.contains(ParseHex("19108ad8ed9bb6274d3980bab5a85c048f0950c8")), "BloomFilter contains something it shouldn't!");
+    BOOST_CHECK_MESSAGE(!filter.contains(ParseHex("19108ad8ed9bb6274d3980bab5a85c048f0950c8")), "Bloom filter contains something it shouldn't!");
 
     filter.insert(ParseHex("b5a2c786d9ef4658287ced5914b37a1b4aa32eee"));
-    BOOST_CHECK_MESSAGE(filter.contains(ParseHex("b5a2c786d9ef4658287ced5914b37a1b4aa32eee")), "BloomFilter doesn't contain just-inserted object (2)!");
+    BOOST_CHECK_MESSAGE(filter.contains(ParseHex("b5a2c786d9ef4658287ced5914b37a1b4aa32eee")), "Bloom filter doesn't contain just-inserted object (2)!");
 
     filter.insert(ParseHex("b9300670b4c5366e95b2699e8b18bc75e5f729c5"));
-    BOOST_CHECK_MESSAGE(filter.contains(ParseHex("b9300670b4c5366e95b2699e8b18bc75e5f729c5")), "BloomFilter doesn't contain just-inserted object (3)!");
+    BOOST_CHECK_MESSAGE(filter.contains(ParseHex("b9300670b4c5366e95b2699e8b18bc75e5f729c5")), "Bloom filter doesn't contain just-inserted object (3)!");
 
     CDataStream stream(SER_NETWORK, PROTOCOL_VERSION);
     stream << filter;
@@ -51,9 +51,9 @@ BOOST_AUTO_TEST_CASE(bloom_create_insert_serialize)
 
     BOOST_CHECK_EQUAL_COLLECTIONS(stream.begin(), stream.end(), expected.begin(), expected.end());
 
-    BOOST_CHECK_MESSAGE( filter.contains(ParseHex("99108ad8ed9bb6274d3980bab5a85c048f0950c8")), "BloomFilter doesn't contain just-inserted object!");
+    BOOST_CHECK_MESSAGE( filter.contains(ParseHex("99108ad8ed9bb6274d3980bab5a85c048f0950c8")), "Bloom filter doesn't contain just-inserted object!");
     filter.clear();
-    BOOST_CHECK_MESSAGE( !filter.contains(ParseHex("99108ad8ed9bb6274d3980bab5a85c048f0950c8")), "BloomFilter should be empty!");
+    BOOST_CHECK_MESSAGE( !filter.contains(ParseHex("99108ad8ed9bb6274d3980bab5a85c048f0950c8")), "Bloom filter should be empty!");
 }
 
 BOOST_AUTO_TEST_CASE(bloom_create_insert_serialize_with_tweak)
@@ -62,15 +62,15 @@ BOOST_AUTO_TEST_CASE(bloom_create_insert_serialize_with_tweak)
     CBloomFilter filter(3, 0.01, 2147483649UL, BLOOM_UPDATE_ALL);
 
     filter.insert(ParseHex("99108ad8ed9bb6274d3980bab5a85c048f0950c8"));
-    BOOST_CHECK_MESSAGE( filter.contains(ParseHex("99108ad8ed9bb6274d3980bab5a85c048f0950c8")), "BloomFilter doesn't contain just-inserted object!");
+    BOOST_CHECK_MESSAGE( filter.contains(ParseHex("99108ad8ed9bb6274d3980bab5a85c048f0950c8")), "Bloom filter doesn't contain just-inserted object!");
     // One bit different in first byte
-    BOOST_CHECK_MESSAGE(!filter.contains(ParseHex("19108ad8ed9bb6274d3980bab5a85c048f0950c8")), "BloomFilter contains something it shouldn't!");
+    BOOST_CHECK_MESSAGE(!filter.contains(ParseHex("19108ad8ed9bb6274d3980bab5a85c048f0950c8")), "Bloom filter contains something it shouldn't!");
 
     filter.insert(ParseHex("b5a2c786d9ef4658287ced5914b37a1b4aa32eee"));
-    BOOST_CHECK_MESSAGE(filter.contains(ParseHex("b5a2c786d9ef4658287ced5914b37a1b4aa32eee")), "BloomFilter doesn't contain just-inserted object (2)!");
+    BOOST_CHECK_MESSAGE(filter.contains(ParseHex("b5a2c786d9ef4658287ced5914b37a1b4aa32eee")), "Bloom filter doesn't contain just-inserted object (2)!");
 
     filter.insert(ParseHex("b9300670b4c5366e95b2699e8b18bc75e5f729c5"));
-    BOOST_CHECK_MESSAGE(filter.contains(ParseHex("b9300670b4c5366e95b2699e8b18bc75e5f729c5")), "BloomFilter doesn't contain just-inserted object (3)!");
+    BOOST_CHECK_MESSAGE(filter.contains(ParseHex("b9300670b4c5366e95b2699e8b18bc75e5f729c5")), "Bloom filter doesn't contain just-inserted object (3)!");
 
     CDataStream stream(SER_NETWORK, PROTOCOL_VERSION);
     stream << filter;

From 047ea1052d4f20c762b1b75099c8421932021b8a Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Fri, 25 Nov 2016 21:52:44 -0800
Subject: [PATCH 1269/1802] Make fImporting an std::atomic

---
 src/main.cpp | 2 +-
 src/main.h   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index 05442057e49a1..d1ff8699e956c 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -68,7 +68,7 @@ int64_t nTimeBestReceived = 0; // Used only to inform the wallet of when we last
 CWaitableCriticalSection csBestBlock;
 CConditionVariable cvBlockChange;
 int nScriptCheckThreads = 0;
-bool fImporting = false;
+std::atomic_bool fImporting(false);
 bool fReindex = false;
 bool fTxIndex = false;
 bool fHavePruned = false;
diff --git a/src/main.h b/src/main.h
index 43c62f6de6c27..c98ed057262db 100644
--- a/src/main.h
+++ b/src/main.h
@@ -165,7 +165,7 @@ extern uint64_t nLastBlockWeight;
 extern const std::string strMessageMagic;
 extern CWaitableCriticalSection csBestBlock;
 extern CConditionVariable cvBlockChange;
-extern bool fImporting;
+extern std::atomic_bool fImporting;
 extern bool fReindex;
 extern int nScriptCheckThreads;
 extern bool fTxIndex;

From dbfaade72a9d9c1e503c47f8e12d26b1540a921b Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Fri, 25 Nov 2016 18:11:25 -0800
Subject: [PATCH 1270/1802] Fix AddrMan locking

---
 src/addrman.h | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/src/addrman.h b/src/addrman.h
index cabacbbea9716..d466eefb82e52 100644
--- a/src/addrman.h
+++ b/src/addrman.h
@@ -482,6 +482,7 @@ class CAddrMan
     //! Return the number of (unique) addresses in all tables.
     size_t size() const
     {
+        LOCK(cs); // TODO: Cache this in an atomic to avoid this overhead
         return vRandom.size();
     }
 
@@ -501,13 +502,11 @@ class CAddrMan
     //! Add a single address.
     bool Add(const CAddress &addr, const CNetAddr& source, int64_t nTimePenalty = 0)
     {
+        LOCK(cs);
         bool fRet = false;
-        {
-            LOCK(cs);
-            Check();
-            fRet |= Add_(addr, source, nTimePenalty);
-            Check();
-        }
+        Check();
+        fRet |= Add_(addr, source, nTimePenalty);
+        Check();
         if (fRet)
             LogPrint("addrman", "Added %s from %s: %i tried, %i new\n", addr.ToStringIPPort(), source.ToString(), nTried, nNew);
         return fRet;
@@ -516,14 +515,12 @@ class CAddrMan
     //! Add multiple addresses.
     bool Add(const std::vector<CAddress> &vAddr, const CNetAddr& source, int64_t nTimePenalty = 0)
     {
+        LOCK(cs);
         int nAdd = 0;
-        {
-            LOCK(cs);
-            Check();
-            for (std::vector<CAddress>::const_iterator it = vAddr.begin(); it != vAddr.end(); it++)
-                nAdd += Add_(*it, source, nTimePenalty) ? 1 : 0;
-            Check();
-        }
+        Check();
+        for (std::vector<CAddress>::const_iterator it = vAddr.begin(); it != vAddr.end(); it++)
+            nAdd += Add_(*it, source, nTimePenalty) ? 1 : 0;
+        Check();
         if (nAdd)
             LogPrint("addrman", "Added %i addresses from %s: %i tried, %i new\n", nAdd, source.ToString(), nTried, nNew);
         return nAdd > 0;

From 303352286f2af0f12fd5ae7f65ad48330b5a00ec Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Fri, 25 Nov 2016 18:13:48 -0800
Subject: [PATCH 1271/1802] Remove double brackets in addrman

---
 src/addrman.h | 30 ++++++++++++------------------
 1 file changed, 12 insertions(+), 18 deletions(-)

diff --git a/src/addrman.h b/src/addrman.h
index d466eefb82e52..76e7b210f7c34 100644
--- a/src/addrman.h
+++ b/src/addrman.h
@@ -529,23 +529,19 @@ class CAddrMan
     //! Mark an entry as accessible.
     void Good(const CService &addr, int64_t nTime = GetAdjustedTime())
     {
-        {
-            LOCK(cs);
-            Check();
-            Good_(addr, nTime);
-            Check();
-        }
+        LOCK(cs);
+        Check();
+        Good_(addr, nTime);
+        Check();
     }
 
     //! Mark an entry as connection attempted to.
     void Attempt(const CService &addr, bool fCountFailure, int64_t nTime = GetAdjustedTime())
     {
-        {
-            LOCK(cs);
-            Check();
-            Attempt_(addr, fCountFailure, nTime);
-            Check();
-        }
+        LOCK(cs);
+        Check();
+        Attempt_(addr, fCountFailure, nTime);
+        Check();
     }
 
     /**
@@ -579,12 +575,10 @@ class CAddrMan
     //! Mark an entry as currently-connected-to.
     void Connected(const CService &addr, int64_t nTime = GetAdjustedTime())
     {
-        {
-            LOCK(cs);
-            Check();
-            Connected_(addr, nTime);
-            Check();
-        }
+        LOCK(cs);
+        Check();
+        Connected_(addr, nTime);
+        Check();
     }
 
     void SetServices(const CService &addr, ServiceFlags nServices)

From dfed983f19e7b61da243362f00fa3a14c92dae45 Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Fri, 25 Nov 2016 19:29:55 -0800
Subject: [PATCH 1272/1802] Fix unlocked access to vNodes.size()

---
 src/net.cpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/net.cpp b/src/net.cpp
index 15c4514f152ac..233c0fbc807bc 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -1103,8 +1103,13 @@ void CConnman::ThreadSocketHandler()
                 }
             }
         }
-        if(vNodes.size() != nPrevNodeCount) {
-            nPrevNodeCount = vNodes.size();
+        size_t vNodesSize;
+        {
+            LOCK(cs_vNodes);
+            vNodesSize = vNodes.size();
+        }
+        if(vNodesSize != nPrevNodeCount) {
+            nPrevNodeCount = vNodesSize;
             if(clientInterface)
                 clientInterface->NotifyNumConnectionsChanged(nPrevNodeCount);
         }

From 083f20369878196785151e038e5f5126fed74021 Mon Sep 17 00:00:00 2001
From: Gregory Maxwell <greg@xiph.org>
Date: Sun, 27 Nov 2016 02:47:22 +0000
Subject: [PATCH 1273/1802] Remove fNetworkNode.

Matt pointed out to me that this appeared to be doing nothing (except involving itself in data races).
---
 src/main.cpp | 4 ++--
 src/net.cpp  | 5 +----
 src/net.h    | 1 -
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index 6bb81fab24618..4b6872146c531 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -5242,8 +5242,8 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
     {
         pfrom->SetRecvVersion(min(pfrom->nVersion, PROTOCOL_VERSION));
 
-        // Mark this node as currently connected, so we update its timestamp later.
-        if (pfrom->fNetworkNode) {
+        if (!pfrom->fInbound) {
+            // Mark this node as currently connected, so we update its timestamp later.
             LOCK(cs_main);
             State(pfrom->GetId())->fCurrentlyConnected = true;
         }
diff --git a/src/net.cpp b/src/net.cpp
index ce87150ae365f..08115a3518f2e 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -1067,8 +1067,7 @@ void CConnman::ThreadSocketHandler()
                     pnode->CloseSocketDisconnect();
 
                     // hold in disconnected pool until all refs are released
-                    if (pnode->fNetworkNode || pnode->fInbound)
-                        pnode->Release();
+                    pnode->Release();
                     vNodesDisconnected.push_back(pnode);
                 }
             }
@@ -1808,7 +1807,6 @@ bool CConnman::OpenNetworkConnection(const CAddress& addrConnect, bool fCountFai
         return false;
     if (grantOutbound)
         grantOutbound->MoveTo(pnode->grantOutbound);
-    pnode->fNetworkNode = true;
     if (fOneShot)
         pnode->fOneShot = true;
     if (fFeeler)
@@ -2531,7 +2529,6 @@ CNode::CNode(NodeId idIn, ServiceFlags nLocalServicesIn, int nMyStartingHeightIn
     fOneShot = false;
     fClient = false; // set by version message
     fFeeler = false;
-    fNetworkNode = false;
     fSuccessfullyConnected = false;
     fDisconnect = false;
     nRefCount = 0;
diff --git a/src/net.h b/src/net.h
index a4a9fb676af75..ebea488a4d9b6 100644
--- a/src/net.h
+++ b/src/net.h
@@ -613,7 +613,6 @@ class CNode
     bool fOneShot;
     bool fClient;
     const bool fInbound;
-    bool fNetworkNode;
     bool fSuccessfullyConnected;
     bool fDisconnect;
     // We use fRelayTxes for two purposes -

From bdb922b34c9a477c4ebf358653f6bcfb9bee48ce Mon Sep 17 00:00:00 2001
From: Gregory Maxwell <greg@xiph.org>
Date: Sun, 27 Nov 2016 04:19:37 +0000
Subject: [PATCH 1274/1802] Remove pnodeLocalHost.

Mostly a legacy of the long removed pub/sub system.
---
 src/net.cpp | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/src/net.cpp b/src/net.cpp
index 08115a3518f2e..c9317c30254d0 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -74,7 +74,6 @@ bool fRelayTxes = true;
 CCriticalSection cs_mapLocalHost;
 std::map<CNetAddr, LocalServiceInfo> mapLocalHost;
 static bool vfLimited[NET_MAX] = {};
-static CNode* pnodeLocalHost = NULL;
 std::string strSubVersion;
 
 limitedmap<uint256, int64_t> mapAlreadyAskedFor(MAX_INV_SZ);
@@ -2137,17 +2136,6 @@ bool CConnman::Start(boost::thread_group& threadGroup, CScheduler& scheduler, st
         semOutbound = new CSemaphore(std::min((nMaxOutbound + nMaxFeeler), nMaxConnections));
     }
 
-    if (pnodeLocalHost == NULL) {
-        CNetAddr local;
-        LookupHost("127.0.0.1", local, false);
-
-        NodeId id = GetNewNodeId();
-        uint64_t nonce = GetDeterministicRandomizer(RANDOMIZER_ID_LOCALHOSTNONCE).Write(id).Finalize();
-
-        pnodeLocalHost = new CNode(id, nLocalServices, GetBestHeight(), INVALID_SOCKET, CAddress(CService(local, 0), nLocalServices), 0, nonce);
-        GetNodeSignals().InitializeNode(pnodeLocalHost, *this);
-    }
-
     //
     // Start threads
     //
@@ -2225,9 +2213,6 @@ void CConnman::Stop()
     vhListenSocket.clear();
     delete semOutbound;
     semOutbound = NULL;
-    if(pnodeLocalHost)
-        DeleteNode(pnodeLocalHost);
-    pnodeLocalHost = NULL;
 }
 
 void CConnman::DeleteNode(CNode* pnode)

From 507145d78595e052ce13368e122f72c85093992c Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Sun, 27 Nov 2016 15:11:49 -0800
Subject: [PATCH 1275/1802] Fix race when accessing std::locale::classic()

See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=78552
---
 src/utiltime.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/utiltime.cpp b/src/utiltime.cpp
index da590f8889346..51d545ef8a7bd 100644
--- a/src/utiltime.cpp
+++ b/src/utiltime.cpp
@@ -74,8 +74,9 @@ void MilliSleep(int64_t n)
 
 std::string DateTimeStrFormat(const char* pszFormat, int64_t nTime)
 {
+    static std::locale classic(std::locale::classic());
     // std::locale takes ownership of the pointer
-    std::locale loc(std::locale::classic(), new boost::posix_time::time_facet(pszFormat));
+    std::locale loc(classic, new boost::posix_time::time_facet(pszFormat));
     std::stringstream ss;
     ss.imbue(loc);
     ss << boost::posix_time::from_time_t(nTime);

From 8b22efb6f7c406951f33a04e84377fd16f02121c Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Sun, 27 Nov 2016 15:14:36 -0800
Subject: [PATCH 1276/1802] Make fStartedNewLine an std::atomic_bool

While this doesnt really fix the race of adding timestamps
mid-logical-line, it avoids the undefined behavior of using a
bool in multiple threads.
---
 src/util.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/util.cpp b/src/util.cpp
index c20ede62210b1..a1f87a264579c 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -259,7 +259,7 @@ bool LogAcceptCategory(const char* category)
  * suppress printing of the timestamp when multiple calls are made that don't
  * end in a newline. Initialize it to true, and hold it, in the calling context.
  */
-static std::string LogTimestampStr(const std::string &str, bool *fStartedNewLine)
+static std::string LogTimestampStr(const std::string &str, std::atomic_bool *fStartedNewLine)
 {
     string strStamped;
 
@@ -286,7 +286,7 @@ static std::string LogTimestampStr(const std::string &str, bool *fStartedNewLine
 int LogPrintStr(const std::string &str)
 {
     int ret = 0; // Returns total number of characters written
-    static bool fStartedNewLine = true;
+    static std::atomic_bool fStartedNewLine(true);
 
     string strTimestamped = LogTimestampStr(str, &fStartedNewLine);
 

From 15fa95d7e576041a20d47907356a2be5a327b4ca Mon Sep 17 00:00:00 2001
From: fsb4000 <fsb4000@yandex.ru>
Date: Mon, 28 Nov 2016 15:19:05 +0700
Subject: [PATCH 1277/1802] Fix some typos

---
 qa/rpc-tests/multi_rpc.py           | 2 +-
 qa/rpc-tests/test_framework/util.py | 6 +++---
 src/blockencodings.cpp              | 2 +-
 src/crypto/ctaes/test.c             | 2 +-
 src/main.cpp                        | 2 +-
 src/qt/optionsmodel.h               | 2 +-
 src/support/lockedpool.h            | 2 +-
 src/test/bitcoin-util-test.py       | 2 +-
 src/test/limitedmap_tests.cpp       | 2 +-
 src/txmempool.h                     | 2 +-
 10 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/qa/rpc-tests/multi_rpc.py b/qa/rpc-tests/multi_rpc.py
index cdeb94caa0998..95d9090ce25d1 100755
--- a/qa/rpc-tests/multi_rpc.py
+++ b/qa/rpc-tests/multi_rpc.py
@@ -4,7 +4,7 @@
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #
-# Test mulitple rpc user config option rpcauth
+# Test multiple rpc user config option rpcauth
 #
 
 from test_framework.test_framework import BitcoinTestFramework
diff --git a/qa/rpc-tests/test_framework/util.py b/qa/rpc-tests/test_framework/util.py
index 24a9d434af3f0..99c30f7651b1b 100644
--- a/qa/rpc-tests/test_framework/util.py
+++ b/qa/rpc-tests/test_framework/util.py
@@ -223,7 +223,7 @@ def wait_for_bitcoind_start(process, url, i):
                 raise # unknown IO error
         except JSONRPCException as e: # Initialization phase
             if e.error['code'] != -28: # RPC in warmup?
-                raise # unkown JSON RPC exception
+                raise # unknown JSON RPC exception
         time.sleep(0.25)
 
 def initialize_chain(test_dir, num_nodes, cachedir):
@@ -257,7 +257,7 @@ def initialize_chain(test_dir, num_nodes, cachedir):
                 print("initialize_chain: bitcoind started, waiting for RPC to come up")
             wait_for_bitcoind_start(bitcoind_processes[i], rpc_url(i), i)
             if os.getenv("PYTHON_DEBUG", ""):
-                print("initialize_chain: RPC succesfully started")
+                print("initialize_chain: RPC successfully started")
 
         rpcs = []
         for i in range(MAX_NODES):
@@ -344,7 +344,7 @@ def start_node(i, dirname, extra_args=None, rpchost=None, timewait=None, binary=
     url = rpc_url(i, rpchost)
     wait_for_bitcoind_start(bitcoind_processes[i], url, i)
     if os.getenv("PYTHON_DEBUG", ""):
-        print("start_node: RPC succesfully started")
+        print("start_node: RPC successfully started")
     proxy = get_rpc_proxy(url, i, timeout=timewait)
 
     if COVERAGE_DIR:
diff --git a/src/blockencodings.cpp b/src/blockencodings.cpp
index f14ae1c412fe7..2efeda9cc6d22 100644
--- a/src/blockencodings.cpp
+++ b/src/blockencodings.cpp
@@ -62,7 +62,7 @@ ReadStatus PartiallyDownloadedBlock::InitData(const CBlockHeaderAndShortTxIDs& c
         if (cmpctblock.prefilledtxn[i].tx->IsNull())
             return READ_STATUS_INVALID;
 
-        lastprefilledindex += cmpctblock.prefilledtxn[i].index + 1; //index is a uint16_t, so cant overflow here
+        lastprefilledindex += cmpctblock.prefilledtxn[i].index + 1; //index is a uint16_t, so can't overflow here
         if (lastprefilledindex > std::numeric_limits<uint16_t>::max())
             return READ_STATUS_INVALID;
         if ((uint32_t)lastprefilledindex > cmpctblock.shorttxids.size() + i) {
diff --git a/src/crypto/ctaes/test.c b/src/crypto/ctaes/test.c
index fce1696acdc2d..21439a16f136e 100644
--- a/src/crypto/ctaes/test.c
+++ b/src/crypto/ctaes/test.c
@@ -102,7 +102,7 @@ int main(void) {
         }
     }
     if (fail == 0) {
-        fprintf(stderr, "All tests succesful\n");
+        fprintf(stderr, "All tests successful\n");
     } else {
         fprintf(stderr, "%i tests failed\n", fail);
     }
diff --git a/src/main.cpp b/src/main.cpp
index 6bb81fab24618..067b3941047b7 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -4974,7 +4974,7 @@ void static ProcessGetData(CNode* pfrom, const Consensus::Params& consensusParam
                     else if (inv.type == MSG_CMPCT_BLOCK)
                     {
                         // If a peer is asking for old blocks, we're almost guaranteed
-                        // they wont have a useful mempool to match against a compact block,
+                        // they won't have a useful mempool to match against a compact block,
                         // and we don't feel like constructing the object for them, so
                         // instead we respond with the full, non-compact block.
                         bool fPeerWantsWitness = State(pfrom->GetId())->fWantsCmpctWitness;
diff --git a/src/qt/optionsmodel.h b/src/qt/optionsmodel.h
index b23b5f2607a6c..d2e1fb23a3dd0 100644
--- a/src/qt/optionsmodel.h
+++ b/src/qt/optionsmodel.h
@@ -81,7 +81,7 @@ class OptionsModel : public QAbstractListModel
     int nDisplayUnit;
     QString strThirdPartyTxUrls;
     bool fCoinControlFeatures;
-    /* settings that were overriden by command-line */
+    /* settings that were overridden by command-line */
     QString strOverriddenByCommandLine;
 
     // Add option to list of GUI options overridden through command line/config file
diff --git a/src/support/lockedpool.h b/src/support/lockedpool.h
index 3403415436cc2..f5212bc266651 100644
--- a/src/support/lockedpool.h
+++ b/src/support/lockedpool.h
@@ -109,7 +109,7 @@ class Arena
  * An arena manages a contiguous region of memory. The pool starts out with one arena
  * but can grow to multiple arenas if the need arises.
  *
- * Unlike a normal C heap, the administrative structures are seperate from the managed
+ * Unlike a normal C heap, the administrative structures are separate from the managed
  * memory. This has been done as the sizes and bases of objects are not in themselves sensitive
  * information, as to conserve precious locked memory. In some operating systems
  * the amount of memory that can be locked is small.
diff --git a/src/test/bitcoin-util-test.py b/src/test/bitcoin-util-test.py
index 4301b93b7c50e..1c090b3f3f1e9 100755
--- a/src/test/bitcoin-util-test.py
+++ b/src/test/bitcoin-util-test.py
@@ -15,7 +15,7 @@
 
 Runs automatically during `make check`.
 
-Can also be run manually from the src directory by specifiying the source directory:
+Can also be run manually from the src directory by specifying the source directory:
 
 test/bitcoin-util-test.py --srcdir='srcdir' [--verbose]
 """
diff --git a/src/test/limitedmap_tests.cpp b/src/test/limitedmap_tests.cpp
index faaddffad8a82..e3531486aa333 100644
--- a/src/test/limitedmap_tests.cpp
+++ b/src/test/limitedmap_tests.cpp
@@ -47,7 +47,7 @@ BOOST_AUTO_TEST_CASE(limitedmap_test)
         // make sure the item is present
         BOOST_CHECK(map.count(i) == 1);
 
-        // use the iterator to check for the expected key adn value
+        // use the iterator to check for the expected key and value
         BOOST_CHECK(it->first == i);
         BOOST_CHECK(it->second == i + 1);
         
diff --git a/src/txmempool.h b/src/txmempool.h
index 29b59363a2eb4..23fe5a7abead8 100644
--- a/src/txmempool.h
+++ b/src/txmempool.h
@@ -62,7 +62,7 @@ class CTxMemPool;
 
 /** \class CTxMemPoolEntry
  *
- * CTxMemPoolEntry stores data about the correponding transaction, as well
+ * CTxMemPoolEntry stores data about the corresponding transaction, as well
  * as data about all in-mempool transactions that depend on the transaction
  * ("descendant" transactions).
  *

From 7d3b627395582ae7c9d54ebdbc68096d7042162b Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Mon, 28 Nov 2016 17:13:51 +0100
Subject: [PATCH 1278/1802] torcontrol: Explicitly request RSA1024 private key

When generating a new service key, explicitly request a RSA1024 one.

The bitcoin P2P protocol has no support for the longer hidden service names
that will come with ed25519 keys, until it does, we depend on the old
hidden service type so make this explicit.

See #9214.
---
 src/torcontrol.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/torcontrol.cpp b/src/torcontrol.cpp
index 1ca6b4656661e..ffb9993f90b8e 100644
--- a/src/torcontrol.cpp
+++ b/src/torcontrol.cpp
@@ -470,7 +470,7 @@ void TorController::auth_cb(TorControlConnection& _conn, const TorControlReply&
 
         // Finally - now create the service
         if (private_key.empty()) // No private key, generate one
-            private_key = "NEW:BEST";
+            private_key = "NEW:RSA1024"; // Explicitly request RSA1024 - see issue #9214
         // Request hidden service, redirect port.
         // Note that the 'virtual' port doesn't have to be the same as our internal port, but this is just a convenient
         // choice.  TODO; refactor the shutdown sequence some day.

From 498a1d75e75649b02caeca7b1bc9bbc19e51a566 Mon Sep 17 00:00:00 2001
From: Ivo van der Sangen <ivdsangen@gmail.com>
Date: Sun, 27 Nov 2016 12:08:39 +0100
Subject: [PATCH 1279/1802] Include select.h when WIN32 is not defined

---
 src/compat.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/compat.h b/src/compat.h
index 79a297e5e4010..2578d6d3445c4 100644
--- a/src/compat.h
+++ b/src/compat.h
@@ -34,6 +34,7 @@
 #else
 #include <sys/fcntl.h>
 #include <sys/mman.h>
+#include <sys/select.h>
 #include <sys/socket.h>
 #include <sys/types.h>
 #include <net/if.h>

From 0cc8b6bc44bea29e24fa4e13d8a9bbe4f1483680 Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Tue, 25 Oct 2016 11:34:27 +0200
Subject: [PATCH 1280/1802] init: Split up AppInit2 into multiple phases

This allows doing some of the steps before e.g. daemonization and some
fater.
---
 src/bitcoind.cpp   | 26 ++++++++++++++++++++-----
 src/init.cpp       | 48 ++++++++++++++++++++++++++++++++--------------
 src/init.h         | 25 +++++++++++++++++++++++-
 src/qt/bitcoin.cpp | 17 +++++++++++++++-
 4 files changed, 95 insertions(+), 21 deletions(-)

diff --git a/src/bitcoind.cpp b/src/bitcoind.cpp
index 351463c256e39..a89b8cd4eeeac 100644
--- a/src/bitcoind.cpp
+++ b/src/bitcoind.cpp
@@ -128,6 +128,26 @@ bool AppInit(int argc, char* argv[])
             fprintf(stderr, "Error: There is no RPC client functionality in bitcoind anymore. Use the bitcoin-cli utility instead.\n");
             exit(1);
         }
+        // -server defaults to true for bitcoind but not for the GUI so do this here
+        SoftSetBoolArg("-server", true);
+        // Set this early so that parameter interactions go to console
+        InitLogging();
+        InitParameterInteraction();
+        if (!AppInitBasicSetup())
+        {
+            // InitError will have been called with detailed error, which ends up on console
+            exit(1);
+        }
+        if (!AppInitParameterInteraction())
+        {
+            // InitError will have been called with detailed error, which ends up on console
+            exit(1);
+        }
+        if (!AppInitSanityChecks())
+        {
+            // InitError will have been called with detailed error, which ends up on console
+            exit(1);
+        }
         if (GetBoolArg("-daemon", false))
         {
 #if HAVE_DECL_DAEMON
@@ -143,12 +163,8 @@ bool AppInit(int argc, char* argv[])
             return false;
 #endif // HAVE_DECL_DAEMON
         }
-        SoftSetBoolArg("-server", true);
 
-        // Set this early so that parameter interactions go to console
-        InitLogging();
-        InitParameterInteraction();
-        fRet = AppInit2(threadGroup, scheduler);
+        fRet = AppInitMain(threadGroup, scheduler);
     }
     catch (const std::exception& e) {
         PrintExceptionContinue(&e, "AppInit()");
diff --git a/src/init.cpp b/src/init.cpp
index e2f25eda744e3..4f435dc7cf3e9 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -788,10 +788,17 @@ void InitLogging()
     LogPrintf("Bitcoin version %s\n", FormatFullVersion());
 }
 
-/** Initialize bitcoin.
- *  @pre Parameters should be parsed and config file should be read.
- */
-bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
+namespace { // Variables internal to initialization process only
+
+ServiceFlags nRelevantServices = NODE_NETWORK;
+int nMaxConnections;
+int nUserMaxConnections;
+int nFD;
+ServiceFlags nLocalServices = NODE_NETWORK;
+
+}
+
+bool AppInitBasicSetup()
 {
     // ********************************************************* Step 1: setup
 #ifdef _MSC_VER
@@ -843,9 +850,13 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
     // Ignore SIGPIPE, otherwise it will bring the daemon down if the client closes unexpectedly
     signal(SIGPIPE, SIG_IGN);
 #endif
+    return true;
+}
 
-    // ********************************************************* Step 2: parameter interactions
+bool AppInitParameterInteraction()
+{
     const CChainParams& chainparams = Params();
+    // ********************************************************* Step 2: parameter interactions
 
     // also see: InitParameterInteraction()
 
@@ -857,12 +868,12 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
 
     // Make sure enough file descriptors are available
     int nBind = std::max((int)mapArgs.count("-bind") + (int)mapArgs.count("-whitebind"), 1);
-    int nUserMaxConnections = GetArg("-maxconnections", DEFAULT_MAX_PEER_CONNECTIONS);
-    int nMaxConnections = std::max(nUserMaxConnections, 0);
+    nUserMaxConnections = GetArg("-maxconnections", DEFAULT_MAX_PEER_CONNECTIONS);
+    nMaxConnections = std::max(nUserMaxConnections, 0);
 
     // Trim requested connection counts, to fit into system limitations
     nMaxConnections = std::max(std::min(nMaxConnections, (int)(FD_SETSIZE - nBind - MIN_CORE_FILEDESCRIPTORS)), 0);
-    int nFD = RaiseFileDescriptorLimit(nMaxConnections + MIN_CORE_FILEDESCRIPTORS);
+    nFD = RaiseFileDescriptorLimit(nMaxConnections + MIN_CORE_FILEDESCRIPTORS);
     if (nFD < MIN_CORE_FILEDESCRIPTORS)
         return InitError(_("Not enough file descriptors available."));
     nMaxConnections = std::min(nFD - MIN_CORE_FILEDESCRIPTORS, nMaxConnections);
@@ -977,9 +988,6 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
     // Option to startup with mocktime set (used for regression testing):
     SetMockTime(GetArg("-mocktime", 0)); // SetMockTime(0) is a no-op
 
-    ServiceFlags nLocalServices = NODE_NETWORK;
-    ServiceFlags nRelevantServices = NODE_NETWORK;
-
     if (GetBoolArg("-peerbloomfilters", DEFAULT_PEERBLOOMFILTERS))
         nLocalServices = ServiceFlags(nLocalServices | NODE_BLOOM);
 
@@ -1028,8 +1036,12 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
             }
         }
     }
+    return true;
+}
 
-    // ********************************************************* Step 4: application initialization: dir lock, daemonize, pidfile, debug log
+bool AppInitSanityChecks()
+{
+    // ********************************************************* Step 4: sanity checks
 
     // Initialize elliptic curve code
     ECC_Start();
@@ -1048,11 +1060,19 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
 
     try {
         static boost::interprocess::file_lock lock(pathLockFile.string().c_str());
-        if (!lock.try_lock())
+        if (!lock.try_lock()) {
             return InitError(strprintf(_("Cannot obtain a lock on data directory %s. %s is probably already running."), strDataDir, _(PACKAGE_NAME)));
+        }
     } catch(const boost::interprocess::interprocess_exception& e) {
         return InitError(strprintf(_("Cannot obtain a lock on data directory %s. %s is probably already running.") + " %s.", strDataDir, _(PACKAGE_NAME), e.what()));
     }
+    return true;
+}
+
+bool AppInitMain(boost::thread_group& threadGroup, CScheduler& scheduler)
+{
+    const CChainParams& chainparams = Params();
+    // ********************************************************* Step 4a: application initialization
 
 #ifndef WIN32
     CreatePidFile(GetPidFile(), getpid());
@@ -1066,7 +1086,7 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
     if (!fLogTimestamps)
         LogPrintf("Startup time: %s\n", DateTimeStrFormat("%Y-%m-%d %H:%M:%S", GetTime()));
     LogPrintf("Default data directory %s\n", GetDefaultDataDir().string());
-    LogPrintf("Using data directory %s\n", strDataDir);
+    LogPrintf("Using data directory %s\n", GetDataDir().string());
     LogPrintf("Using config file %s\n", GetConfigFile(GetArg("-conf", BITCOIN_CONF_FILENAME)).string());
     LogPrintf("Using at most %i connections (%i file descriptors available)\n", nMaxConnections, nFD);
 
diff --git a/src/init.h b/src/init.h
index 63e07ccb3c66a..1b87e0ec52013 100644
--- a/src/init.h
+++ b/src/init.h
@@ -25,7 +25,30 @@ void Shutdown();
 void InitLogging();
 //!Parameter interaction: change current parameters depending on various rules
 void InitParameterInteraction();
-bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler);
+
+/** Initialize bitcoin core: Basic context setup.
+ *  @note This can be done before daemonization.
+ *  @pre Parameters should be parsed and config file should be read.
+ */
+bool AppInitBasicSetup();
+/**
+ * Initialization: parameter interaction.
+ * @note This can be done before daemonization.
+ * @pre Parameters should be parsed and config file should be read, AppInitBasicSetup should have been called.
+ */
+bool AppInitParameterInteraction();
+/**
+ * Initialization sanity checks: ecc init, sanity checks, dir lock.
+ * @note This can be done before daemonization.
+ * @pre Parameters should be parsed and config file should be read, AppInitParameterInteraction should have been called.
+ */
+bool AppInitSanityChecks();
+/**
+ * Bitcoin core main initialization.
+ * @note This should only be done after daemonization.
+ * @pre Parameters should be parsed and config file should be read, AppInitSanityChecks should have been called.
+ */
+bool AppInitMain(boost::thread_group& threadGroup, CScheduler& scheduler);
 
 /** The help message mode determines what help message to show */
 enum HelpMessageMode {
diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp
index 9986af4957643..5e1a41d5a7fcf 100644
--- a/src/qt/bitcoin.cpp
+++ b/src/qt/bitcoin.cpp
@@ -267,7 +267,22 @@ void BitcoinCore::initialize()
     try
     {
         qDebug() << __func__ << ": Running AppInit2 in thread";
-        int rv = AppInit2(threadGroup, scheduler);
+        if (!AppInitBasicSetup())
+        {
+            Q_EMIT initializeResult(false);
+            return;
+        }
+        if (!AppInitParameterInteraction())
+        {
+            Q_EMIT initializeResult(false);
+            return;
+        }
+        if (!AppInitSanityChecks())
+        {
+            Q_EMIT initializeResult(false);
+            return;
+        }
+        int rv = AppInitMain(threadGroup, scheduler);
         Q_EMIT initializeResult(rv);
     } catch (const std::exception& e) {
         handleRunawayException(&e);

From 16ca0bfd2848424de7deae307283d9eb9de8a978 Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Tue, 25 Oct 2016 12:03:22 +0200
Subject: [PATCH 1281/1802] init: Try to aquire datadir lock before and after
 daemonization

Before daemonization, just probe the data directory lock and print an
early error message if possible.

After daemonization get the data directory lock again and hold on to it until exit
This creates a slight window for a race condition to happen, however this condition is harmless: it
will at most make us exit without printing a message to console.

    $ src/bitcoind -testnet -daemon
    Bitcoin server starting
    $ src/bitcoind -testnet -daemon
    Error: Cannot obtain a lock on data directory /home/orion/.bitcoin/testnet3. Bitcoin Core is probably already running.
---
 src/init.cpp | 38 +++++++++++++++++++++++++++-----------
 1 file changed, 27 insertions(+), 11 deletions(-)

diff --git a/src/init.cpp b/src/init.cpp
index 4f435dc7cf3e9..b70e6e915849b 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -1039,18 +1039,8 @@ bool AppInitParameterInteraction()
     return true;
 }
 
-bool AppInitSanityChecks()
+static bool LockDataDirectory(bool probeOnly)
 {
-    // ********************************************************* Step 4: sanity checks
-
-    // Initialize elliptic curve code
-    ECC_Start();
-    globalVerifyHandle.reset(new ECCVerifyHandle());
-
-    // Sanity check
-    if (!InitSanityCheck())
-        return InitError(strprintf(_("Initialization sanity check failed. %s is shutting down."), _(PACKAGE_NAME)));
-
     std::string strDataDir = GetDataDir().string();
 
     // Make sure only a single Bitcoin process is using the data directory.
@@ -1063,16 +1053,42 @@ bool AppInitSanityChecks()
         if (!lock.try_lock()) {
             return InitError(strprintf(_("Cannot obtain a lock on data directory %s. %s is probably already running."), strDataDir, _(PACKAGE_NAME)));
         }
+        if (probeOnly) {
+            lock.unlock();
+        }
     } catch(const boost::interprocess::interprocess_exception& e) {
         return InitError(strprintf(_("Cannot obtain a lock on data directory %s. %s is probably already running.") + " %s.", strDataDir, _(PACKAGE_NAME), e.what()));
     }
     return true;
 }
 
+bool AppInitSanityChecks()
+{
+    // ********************************************************* Step 4: sanity checks
+
+    // Initialize elliptic curve code
+    ECC_Start();
+    globalVerifyHandle.reset(new ECCVerifyHandle());
+
+    // Sanity check
+    if (!InitSanityCheck())
+        return InitError(strprintf(_("Initialization sanity check failed. %s is shutting down."), _(PACKAGE_NAME)));
+
+    // Probe the data directory lock to give an early error message, if possible
+    return LockDataDirectory(true);
+}
+
 bool AppInitMain(boost::thread_group& threadGroup, CScheduler& scheduler)
 {
     const CChainParams& chainparams = Params();
     // ********************************************************* Step 4a: application initialization
+    // After daemonization get the data directory lock again and hold on to it until exit
+    // This creates a slight window for a race condition to happen, however this condition is harmless: it
+    // will at most make us exit without printing a message to console.
+    if (!LockDataDirectory(false)) {
+        // Detailed error printed inside LockDataDirectory
+        return false;
+    }
 
 #ifndef WIN32
     CreatePidFile(GetPidFile(), getpid());

From deec83fd2cc8af39c28c74161650fbff432502ce Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Tue, 29 Nov 2016 12:44:14 +0100
Subject: [PATCH 1282/1802] init: Get rid of fServer flag

There is no need to store this flag globally, the variable is only used
inside the initialization process.

Thanks to Alex Morcos for the idea.
---
 src/init.cpp | 4 +---
 src/util.cpp | 1 -
 src/util.h   | 1 -
 3 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/init.cpp b/src/init.cpp
index b70e6e915849b..fb51eb76338b5 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -931,8 +931,6 @@ bool AppInitParameterInteraction()
     else if (nScriptCheckThreads > MAX_SCRIPTCHECK_THREADS)
         nScriptCheckThreads = MAX_SCRIPTCHECK_THREADS;
 
-    fServer = GetBoolArg("-server", false);
-
     // block pruning; get the amount of disk space (in MiB) to allot for block & undo files
     int64_t nSignedPruneTarget = GetArg("-prune", 0) * 1024 * 1024;
     if (nSignedPruneTarget < 0) {
@@ -1121,7 +1119,7 @@ bool AppInitMain(boost::thread_group& threadGroup, CScheduler& scheduler)
      * that the server is there and will be ready later).  Warmup mode will
      * be disabled when initialisation is finished.
      */
-    if (fServer)
+    if (GetBoolArg("-server", false))
     {
         uiInterface.InitMessage.connect(SetRPCWarmupStatus);
         if (!AppInitServers(threadGroup))
diff --git a/src/util.cpp b/src/util.cpp
index c20ede62210b1..332e077627e46 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -107,7 +107,6 @@ map<string, vector<string> > mapMultiArgs;
 bool fDebug = false;
 bool fPrintToConsole = false;
 bool fPrintToDebugLog = true;
-bool fServer = false;
 string strMiscWarning;
 bool fLogTimestamps = DEFAULT_LOGTIMESTAMPS;
 bool fLogTimeMicros = DEFAULT_LOGTIMEMICROS;
diff --git a/src/util.h b/src/util.h
index bbb9b5db825de..e8aa266f287bb 100644
--- a/src/util.h
+++ b/src/util.h
@@ -46,7 +46,6 @@ extern std::map<std::string, std::vector<std::string> > mapMultiArgs;
 extern bool fDebug;
 extern bool fPrintToConsole;
 extern bool fPrintToDebugLog;
-extern bool fServer;
 extern std::string strMiscWarning;
 extern bool fLogTimestamps;
 extern bool fLogTimeMicros;

From d824ad030e70bc72e0c63e1b0d00b08413024b55 Mon Sep 17 00:00:00 2001
From: Alex Morcos <morcos@chaincode.com>
Date: Tue, 29 Nov 2016 12:18:44 -0500
Subject: [PATCH 1283/1802] Disable fee estimates for a confirm target of 1
 block

---
 src/policy/fees.cpp                |  7 ++++++-
 src/rpc/mining.cpp                 |  2 ++
 src/test/policyestimator_tests.cpp | 22 +++++++++++++++-------
 3 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/src/policy/fees.cpp b/src/policy/fees.cpp
index 7113390cdf53b..9eb831bc17c42 100644
--- a/src/policy/fees.cpp
+++ b/src/policy/fees.cpp
@@ -404,7 +404,8 @@ void CBlockPolicyEstimator::processBlock(unsigned int nBlockHeight,
 CFeeRate CBlockPolicyEstimator::estimateFee(int confTarget)
 {
     // Return failure if trying to analyze a target we're not tracking
-    if (confTarget <= 0 || (unsigned int)confTarget > feeStats.GetMaxConfirms())
+    // It's not possible to get reasonable estimates for confTarget of 1
+    if (confTarget <= 1 || (unsigned int)confTarget > feeStats.GetMaxConfirms())
         return CFeeRate(0);
 
     double median = feeStats.EstimateMedianVal(confTarget, SUFFICIENT_FEETXS, MIN_SUCCESS_PCT, true, nBestSeenHeight);
@@ -423,6 +424,10 @@ CFeeRate CBlockPolicyEstimator::estimateSmartFee(int confTarget, int *answerFoun
     if (confTarget <= 0 || (unsigned int)confTarget > feeStats.GetMaxConfirms())
         return CFeeRate(0);
 
+    // It's not possible to get reasonable estimates for confTarget of 1
+    if (confTarget == 1)
+        confTarget = 2;
+
     double median = -1;
     while (median < 0 && (unsigned int)confTarget <= feeStats.GetMaxConfirms()) {
         median = feeStats.EstimateMedianVal(confTarget++, SUFFICIENT_FEETXS, MIN_SUCCESS_PCT, true, nBestSeenHeight);
diff --git a/src/rpc/mining.cpp b/src/rpc/mining.cpp
index f3cd1fbf0b9b9..c2e5791572d32 100644
--- a/src/rpc/mining.cpp
+++ b/src/rpc/mining.cpp
@@ -785,6 +785,8 @@ UniValue estimatefee(const JSONRPCRequest& request)
             "\n"
             "A negative value is returned if not enough transactions and blocks\n"
             "have been observed to make an estimate.\n"
+            "-1 is always returned for nblocks == 1 as it is impossible to calculate\n"
+            "a fee that is high enough to get reliably included in the next block.\n"
             "\nExample:\n"
             + HelpExampleCli("estimatefee", "6")
             );
diff --git a/src/test/policyestimator_tests.cpp b/src/test/policyestimator_tests.cpp
index 7dc8f226c93a9..c57feaec909a5 100644
--- a/src/test/policyestimator_tests.cpp
+++ b/src/test/policyestimator_tests.cpp
@@ -95,17 +95,22 @@ BOOST_AUTO_TEST_CASE(BlockPolicyEstimates)
     // Highest feerate is 10*baseRate and gets in all blocks,
     // second highest feerate is 9*baseRate and gets in 9/10 blocks = 90%,
     // third highest feerate is 8*base rate, and gets in 8/10 blocks = 80%,
-    // so estimateFee(1) should return 10*baseRate.
+    // so estimateFee(1) would return 10*baseRate but is hardcoded to return failure
     // Second highest feerate has 100% chance of being included by 2 blocks,
     // so estimateFee(2) should return 9*baseRate etc...
     for (int i = 1; i < 10;i++) {
         origFeeEst.push_back(mpool.estimateFee(i).GetFeePerK());
-        if (i > 1) { // Fee estimates should be monotonically decreasing
+        if (i > 2) { // Fee estimates should be monotonically decreasing
             BOOST_CHECK(origFeeEst[i-1] <= origFeeEst[i-2]);
         }
         int mult = 11-i;
-        BOOST_CHECK(origFeeEst[i-1] < mult*baseRate.GetFeePerK() + deltaFee);
-        BOOST_CHECK(origFeeEst[i-1] > mult*baseRate.GetFeePerK() - deltaFee);
+        if (i > 1) {
+            BOOST_CHECK(origFeeEst[i-1] < mult*baseRate.GetFeePerK() + deltaFee);
+            BOOST_CHECK(origFeeEst[i-1] > mult*baseRate.GetFeePerK() - deltaFee);
+        }
+        else {
+            BOOST_CHECK(origFeeEst[i-1] == CFeeRate(0).GetFeePerK());
+        }
     }
 
     // Mine 50 more blocks with no transactions happening, estimates shouldn't change
@@ -113,7 +118,8 @@ BOOST_AUTO_TEST_CASE(BlockPolicyEstimates)
     while (blocknum < 250)
         mpool.removeForBlock(block, ++blocknum);
 
-    for (int i = 1; i < 10;i++) {
+    BOOST_CHECK(mpool.estimateFee(1) == CFeeRate(0));
+    for (int i = 2; i < 10;i++) {
         BOOST_CHECK(mpool.estimateFee(i).GetFeePerK() < origFeeEst[i-1] + deltaFee);
         BOOST_CHECK(mpool.estimateFee(i).GetFeePerK() > origFeeEst[i-1] - deltaFee);
     }
@@ -151,7 +157,8 @@ BOOST_AUTO_TEST_CASE(BlockPolicyEstimates)
     }
     mpool.removeForBlock(block, 265);
     block.clear();
-    for (int i = 1; i < 10;i++) {
+    BOOST_CHECK(mpool.estimateFee(1) == CFeeRate(0));
+    for (int i = 2; i < 10;i++) {
         BOOST_CHECK(mpool.estimateFee(i).GetFeePerK() > origFeeEst[i-1] - deltaFee);
     }
 
@@ -172,7 +179,8 @@ BOOST_AUTO_TEST_CASE(BlockPolicyEstimates)
         mpool.removeForBlock(block, ++blocknum);
         block.clear();
     }
-    for (int i = 1; i < 10; i++) {
+    BOOST_CHECK(mpool.estimateFee(1) == CFeeRate(0));
+    for (int i = 2; i < 10; i++) {
         BOOST_CHECK(mpool.estimateFee(i).GetFeePerK() < origFeeEst[i-1] - deltaFee);
     }
 

From e878689e5539d8de30283d1461d6466eac65f894 Mon Sep 17 00:00:00 2001
From: Alex Morcos <morcos@chaincode.com>
Date: Tue, 29 Nov 2016 12:49:03 -0500
Subject: [PATCH 1284/1802] Make GUI incapable of setting tx confirm target of
 1

---
 src/qt/forms/sendcoinsdialog.ui | 2 +-
 src/qt/sendcoinsdialog.cpp      | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/qt/forms/sendcoinsdialog.ui b/src/qt/forms/sendcoinsdialog.ui
index 33db9f8938247..0a8afa2e76e49 100644
--- a/src/qt/forms/sendcoinsdialog.ui
+++ b/src/qt/forms/sendcoinsdialog.ui
@@ -1064,7 +1064,7 @@
                       <number>0</number>
                      </property>
                      <property name="maximum">
-                      <number>24</number>
+                      <number>23</number>
                      </property>
                      <property name="pageStep">
                       <number>1</number>
diff --git a/src/qt/sendcoinsdialog.cpp b/src/qt/sendcoinsdialog.cpp
index 57b21794356ea..bd3f20e9dc220 100644
--- a/src/qt/sendcoinsdialog.cpp
+++ b/src/qt/sendcoinsdialog.cpp
@@ -175,7 +175,7 @@ void SendCoinsDialog::setModel(WalletModel *_model)
         // set the smartfee-sliders default value (wallets default conf.target or last stored value)
         QSettings settings;
         if (settings.value("nSmartFeeSliderPosition").toInt() == 0)
-            ui->sliderSmartFee->setValue(ui->sliderSmartFee->maximum() - model->getDefaultConfirmTarget() + 1);
+            ui->sliderSmartFee->setValue(ui->sliderSmartFee->maximum() - model->getDefaultConfirmTarget() + 2);
         else
             ui->sliderSmartFee->setValue(settings.value("nSmartFeeSliderPosition").toInt());
     }
@@ -241,7 +241,7 @@ void SendCoinsDialog::on_sendButton_clicked()
     if (model->getOptionsModel()->getCoinControlFeatures())
         ctrl = *CoinControlDialog::coinControl;
     if (ui->radioSmartFee->isChecked())
-        ctrl.nConfirmTarget = ui->sliderSmartFee->maximum() - ui->sliderSmartFee->value() + 1;
+        ctrl.nConfirmTarget = ui->sliderSmartFee->maximum() - ui->sliderSmartFee->value() + 2;
     else
         ctrl.nConfirmTarget = 0;
 
@@ -601,7 +601,7 @@ void SendCoinsDialog::updateGlobalFeeVariables()
 {
     if (ui->radioSmartFee->isChecked())
     {
-        int nConfirmTarget = ui->sliderSmartFee->maximum() - ui->sliderSmartFee->value() + 1;
+        int nConfirmTarget = ui->sliderSmartFee->maximum() - ui->sliderSmartFee->value() + 2;
         payTxFee = CFeeRate(0);
 
         // set nMinimumTotalFee to 0 to not accidentally pay a custom fee
@@ -646,7 +646,7 @@ void SendCoinsDialog::updateSmartFeeLabel()
     if(!model || !model->getOptionsModel())
         return;
 
-    int nBlocksToConfirm = ui->sliderSmartFee->maximum() - ui->sliderSmartFee->value() + 1;
+    int nBlocksToConfirm = ui->sliderSmartFee->maximum() - ui->sliderSmartFee->value() + 2;
     int estimateFoundAtBlocks = nBlocksToConfirm;
     CFeeRate feeRate = mempool.estimateSmartFee(nBlocksToConfirm, &estimateFoundAtBlocks);
     if (feeRate <= CFeeRate(0)) // not enough data => minfee

From 446a8f9c90400518bbd4f52f82520c9a97b3a7b3 Mon Sep 17 00:00:00 2001
From: Karl-Johan Alm <karljohan-alm@garage.co.jp>
Date: Wed, 30 Nov 2016 10:27:21 +0900
Subject: [PATCH 1285/1802] Trivial refactor: Remove extern keyword from
 function declarations, as they are extern by default.

---
 src/core_io.h | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/core_io.h b/src/core_io.h
index b559d44bf5a8a..5aecbc44897a6 100644
--- a/src/core_io.h
+++ b/src/core_io.h
@@ -15,18 +15,18 @@ class uint256;
 class UniValue;
 
 // core_read.cpp
-extern CScript ParseScript(const std::string& s);
-extern std::string ScriptToAsmStr(const CScript& script, const bool fAttemptSighashDecode = false);
-extern bool DecodeHexTx(CTransaction& tx, const std::string& strHexTx, bool fTryNoWitness = false);
-extern bool DecodeHexBlk(CBlock&, const std::string& strHexBlk);
-extern uint256 ParseHashUV(const UniValue& v, const std::string& strName);
-extern uint256 ParseHashStr(const std::string&, const std::string& strName);
-extern std::vector<unsigned char> ParseHexUV(const UniValue& v, const std::string& strName);
+CScript ParseScript(const std::string& s);
+std::string ScriptToAsmStr(const CScript& script, const bool fAttemptSighashDecode = false);
+bool DecodeHexTx(CTransaction& tx, const std::string& strHexTx, bool fTryNoWitness = false);
+bool DecodeHexBlk(CBlock&, const std::string& strHexBlk);
+uint256 ParseHashUV(const UniValue& v, const std::string& strName);
+uint256 ParseHashStr(const std::string&, const std::string& strName);
+std::vector<unsigned char> ParseHexUV(const UniValue& v, const std::string& strName);
 
 // core_write.cpp
-extern std::string FormatScript(const CScript& script);
-extern std::string EncodeHexTx(const CTransaction& tx);
-extern void ScriptPubKeyToUniv(const CScript& scriptPubKey, UniValue& out, bool fIncludeHex);
-extern void TxToUniv(const CTransaction& tx, const uint256& hashBlock, UniValue& entry);
+std::string FormatScript(const CScript& script);
+std::string EncodeHexTx(const CTransaction& tx);
+void ScriptPubKeyToUniv(const CScript& scriptPubKey, UniValue& out, bool fIncludeHex);
+void TxToUniv(const CTransaction& tx, const uint256& hashBlock, UniValue& entry);
 
 #endif // BITCOIN_CORE_IO_H

From 0828619e9660bef4454c5a447a0962b8f906a33d Mon Sep 17 00:00:00 2001
From: Suhas Daftuar <sdaftuar@gmail.com>
Date: Wed, 30 Nov 2016 11:16:05 -0500
Subject: [PATCH 1286/1802] [qa] Dump debug logs on travis failures.

---
 qa/rpc-tests/test_framework/test_framework.py | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/qa/rpc-tests/test_framework/test_framework.py b/qa/rpc-tests/test_framework/test_framework.py
index e6d3e9ab9a169..98c4f6070be80 100755
--- a/qa/rpc-tests/test_framework/test_framework.py
+++ b/qa/rpc-tests/test_framework/test_framework.py
@@ -172,7 +172,16 @@ def main(self):
                 os.rmdir(self.options.root)
         else:
             print("Not cleaning up dir %s" % self.options.tmpdir)
-
+            if os.getenv("PYTHON_DEBUG", ""):
+                # Dump the end of the debug logs, to aid in debugging rare
+                # travis failures.
+                import glob
+                filenames = glob.glob(self.options.tmpdir + "/node*/regtest/debug.log")
+                MAX_LINES_TO_PRINT = 1000
+                for f in filenames:
+                    print("From" , f, ":")
+                    from collections import deque
+                    print("".join(deque(open(f), MAX_LINES_TO_PRINT)))
         if success:
             print("Tests successful")
             sys.exit(0)

From 8a70a9da3da0df5c376042b18b87f0a63e88d2e3 Mon Sep 17 00:00:00 2001
From: wodry <wodry@users.noreply.github.com>
Date: Wed, 30 Nov 2016 17:19:08 +0100
Subject: [PATCH 1287/1802] Improvement of documentation of command line
 parameter 'whitelist'

---
 src/init.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/init.cpp b/src/init.cpp
index ca5437fb9117e..31be6fb48a047 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -391,7 +391,7 @@ std::string HelpMessage(HelpMessageMode mode)
 #endif
 #endif
     strUsage += HelpMessageOpt("-whitebind=<addr>", _("Bind to given address and whitelist peers connecting to it. Use [host]:port notation for IPv6"));
-    strUsage += HelpMessageOpt("-whitelist=<netmask>", _("Whitelist peers connecting from the given netmask or IP address. Can be specified multiple times.") +
+    strUsage += HelpMessageOpt("-whitelist=<IP address or network>", _("Whitelist peers connecting from the given IP address (e.g. 1.2.3.4) or CIDR notated network (e.g. 1.2.3.0/24). Can be specified multiple times.") +
         " " + _("Whitelisted peers cannot be DoS banned and their transactions are always relayed, even if they are already in the mempool, useful e.g. for a gateway"));
     strUsage += HelpMessageOpt("-whitelistrelay", strprintf(_("Accept relayed transactions received from whitelisted peers even when not relaying transactions (default: %d)"), DEFAULT_WHITELISTRELAY));
     strUsage += HelpMessageOpt("-whitelistforcerelay", strprintf(_("Force relay of transactions from whitelisted peers even if they violate local relay policy (default: %d)"), DEFAULT_WHITELISTFORCERELAY));

From 9e1f46821d5bb69e2cbf25738eefa7c6cb99c838 Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Tue, 29 Nov 2016 17:49:08 -0800
Subject: [PATCH 1288/1802] Fix calculation of number of bound sockets to use

---
 src/init.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/init.cpp b/src/init.cpp
index 63ec744812295..377d196f2b874 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -859,7 +859,9 @@ bool AppInitParameterInteraction()
     }
 
     // Make sure enough file descriptors are available
-    int nBind = std::max((int)mapArgs.count("-bind") + (int)mapArgs.count("-whitebind"), 1);
+    int nBind = std::max(
+                (mapMultiArgs.count("-bind") ? mapMultiArgs.at("-bind").size() : 0) +
+                (mapMultiArgs.count("-whitebind") ? mapMultiArgs.at("-whitebind").size() : 0), size_t(1));
     nUserMaxConnections = GetArg("-maxconnections", DEFAULT_MAX_PEER_CONNECTIONS);
     nMaxConnections = std::max(nUserMaxConnections, 0);
 

From 297cc20e70dff6565bde13fc5386327b312333df Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Thu, 1 Dec 2016 11:21:47 +0100
Subject: [PATCH 1289/1802] qt: layoutAboutToChange signal is called
 layoutAboutToBeChanged

This was misnamed, resulting in a warning message and missing
functionality. I'm not sure what the change in behavior will be here,
this needs testing.

Also remove connection to non-existing slot "test".
This was used for testing if the signal arrived. It is no
longer necessary.

Fixes:

    2016-12-01 10:04:06 GUI: QObject::connect: No such signal PeerTableModel::layoutAboutToChange() in qt/rpcconsole.cpp:518
    2016-12-01 10:04:06 GUI: QObject::connect:  (receiver name: 'RPCConsole')
    2016-12-01 10:04:06 GUI: QObject::connect: No such slot RPCConsole::test() in qt/rpcconsole.cpp:781
    2016-12-01 10:04:06 GUI: QObject::connect:  (receiver name: 'RPCConsole')
---
 src/qt/rpcconsole.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/qt/rpcconsole.cpp b/src/qt/rpcconsole.cpp
index 520d22990189f..e87de158a2210 100644
--- a/src/qt/rpcconsole.cpp
+++ b/src/qt/rpcconsole.cpp
@@ -515,7 +515,7 @@ void RPCConsole::setClientModel(ClientModel *model)
         // peer table signal handling - update peer details when new nodes are added to the model
         connect(model->getPeerTableModel(), SIGNAL(layoutChanged()), this, SLOT(peerLayoutChanged()));
         // peer table signal handling - cache selected node ids
-        connect(model->getPeerTableModel(), SIGNAL(layoutAboutToChange()), this, SLOT(peerLayoutAboutToChange()));
+        connect(model->getPeerTableModel(), SIGNAL(layoutAboutToBeChanged()), this, SLOT(peerLayoutAboutToChange()));
         
         // set up ban table
         ui->banlistWidget->setModel(model->getBanTableModel());
@@ -778,7 +778,6 @@ void RPCConsole::startExecutor()
     connect(this, SIGNAL(stopExecutor()), &thread, SLOT(quit()));
     // - queue executor for deletion (in execution thread)
     connect(&thread, SIGNAL(finished()), executor, SLOT(deleteLater()), Qt::DirectConnection);
-    connect(&thread, SIGNAL(finished()), this, SLOT(test()), Qt::DirectConnection);
 
     // Default implementation of QThread::run() simply spins up an event loop in the thread,
     // which is what we want.

From a8b936df2053e68208d106cddec06227ef563e41 Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Thu, 3 Nov 2016 16:56:33 -0400
Subject: [PATCH 1290/1802] Use exposed ProcessNewBlockHeaders from
 ProcessMessages

---
 src/main.cpp | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index 4cd5bebb7ccf3..f88efe7b50008 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -6019,22 +6019,27 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
             return true;
         }
 
-        BOOST_FOREACH(const CBlockHeader& header, headers) {
-            CValidationState state;
-            if (pindexLast != NULL && header.hashPrevBlock != pindexLast->GetBlockHash()) {
+        uint256 hashLastBlock;
+        for (const CBlockHeader& header : headers) {
+            if (!hashLastBlock.IsNull() && header.hashPrevBlock != hashLastBlock) {
                 Misbehaving(pfrom->GetId(), 20);
                 return error("non-continuous headers sequence");
             }
-            if (!AcceptBlockHeader(header, state, chainparams, &pindexLast)) {
-                int nDoS;
-                if (state.IsInvalid(nDoS)) {
-                    if (nDoS > 0)
-                        Misbehaving(pfrom->GetId(), nDoS);
-                    return error("invalid header received");
+            hashLastBlock = header.GetHash();
+        }
+        }
+
+        CValidationState state;
+        if (!ProcessNewBlockHeaders(headers, state, chainparams, &pindexLast)) {
+            int nDoS;
+            if (state.IsInvalid(nDoS)) {
+                if (nDoS > 0) {
+                    LOCK(cs_main);
+                    Misbehaving(pfrom->GetId(), nDoS);
                 }
+                return error("invalid header received");
             }
         }
-        }
 
         {
         LOCK(cs_main);
@@ -6110,8 +6115,6 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
             }
         }
         }
-
-        NotifyHeaderTip();
     }
 
     else if (strCommand == NetMsgType::BLOCK && !fImporting && !fReindex) // Ignore blocks received while importing

From 58a215ce8c13b900cf982c39f8ee4879290d1a95 Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Thu, 3 Nov 2016 17:01:39 -0400
Subject: [PATCH 1291/1802] Use ProcessNewBlockHeaders in CMPCTBLOCK processing

---
 src/main.cpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index f88efe7b50008..04a55b3dcc51f 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -5768,6 +5768,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
         CBlockHeaderAndShortTxIDs cmpctblock;
         vRecv >> cmpctblock;
 
+        {
         LOCK(cs_main);
 
         if (mapBlockIndex.find(cmpctblock.header.hashPrevBlock) == mapBlockIndex.end()) {
@@ -5776,19 +5777,23 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
                 connman.PushMessage(pfrom, NetMsgType::GETHEADERS, chainActive.GetLocator(pindexBestHeader), uint256());
             return true;
         }
+        }
 
         CBlockIndex *pindex = NULL;
         CValidationState state;
-        if (!AcceptBlockHeader(cmpctblock.header, state, chainparams, &pindex)) {
+        if (!ProcessNewBlockHeaders({cmpctblock.header}, state, chainparams, &pindex)) {
             int nDoS;
             if (state.IsInvalid(nDoS)) {
-                if (nDoS > 0)
+                if (nDoS > 0) {
+                    LOCK(cs_main);
                     Misbehaving(pfrom->GetId(), nDoS);
+                }
                 LogPrintf("Peer %d sent us invalid header via cmpctblock\n", pfrom->id);
                 return true;
             }
         }
 
+        LOCK(cs_main);
         // If AcceptBlockHeader returned true, it set pindex
         assert(pindex);
         UpdateBlockAvailability(pfrom->GetId(), pindex->GetBlockHash());

From 2c8c57e72fe32cac909278312955145632da6d82 Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Thu, 1 Dec 2016 11:02:23 -0800
Subject: [PATCH 1292/1802] Document cs_main status when calling into PNB or
 PNBH

---
 src/main.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/main.h b/src/main.h
index 9fb6b298c4cec..8f51e33242edf 100644
--- a/src/main.h
+++ b/src/main.h
@@ -223,6 +223,8 @@ static const uint64_t MIN_DISK_SPACE_FOR_BLOCK_FILES = 550 * 1024 * 1024;
  * Note that we guarantee that either the proof-of-work is valid on pblock, or
  * (and possibly also) BlockChecked will have been called.
  * 
+ * Call without cs_main held.
+ *
  * @param[in]   pblock  The block we want to process.
  * @param[in]   fForceProcessing Process this block even if unrequested; used for non-network block sources and whitelisted peers.
  * @param[out]  dbp     The already known disk position of pblock, or NULL if not yet stored.
@@ -234,6 +236,8 @@ bool ProcessNewBlock(const CChainParams& chainparams, const CBlock* pblock, bool
 /**
  * Process incoming block headers.
  *
+ * Call without cs_main held.
+ *
  * @param[in]  block The block headers themselves
  * @param[out] state This may be set to an Error state if any error occurred processing them
  * @param[in]  chainparams The params for the chain we want to connect to

From 10ae7a7b2316f8052ec58ef237ce6dd987300900 Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Thu, 1 Dec 2016 14:31:38 -0800
Subject: [PATCH 1293/1802] Revert "Use async name resolving to improve net
 thread responsiveness"

This reverts commit caf6150e9785da408f1e603ae70eae25b5202d98.

getaddrinfo_a has a nasty tendency to segfault internally in its
background thread, on every version of glibc I tested, especially
under helgrind.

See https://sourceware.org/bugzilla/show_bug.cgi?id=20874
---
 configure.ac    |  2 --
 src/netbase.cpp | 48 +-----------------------------------------------
 2 files changed, 1 insertion(+), 49 deletions(-)

diff --git a/configure.ac b/configure.ac
index 319e1afe27e48..29e674d48e27f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -512,8 +512,6 @@ if test x$TARGET_OS = xdarwin; then
 fi
 
 AC_CHECK_HEADERS([endian.h sys/endian.h byteswap.h stdio.h stdlib.h unistd.h strings.h sys/types.h sys/stat.h sys/select.h sys/prctl.h])
-AC_SEARCH_LIBS([getaddrinfo_a], [anl], [AC_DEFINE(HAVE_GETADDRINFO_A, 1, [Define this symbol if you have getaddrinfo_a])])
-AC_SEARCH_LIBS([inet_pton], [nsl resolv], [AC_DEFINE(HAVE_INET_PTON, 1, [Define this symbol if you have inet_pton])])
 
 AC_CHECK_DECLS([strnlen])
 
diff --git a/src/netbase.cpp b/src/netbase.cpp
index 9fe34108f57d1..9118584b80c44 100644
--- a/src/netbase.cpp
+++ b/src/netbase.cpp
@@ -94,30 +94,9 @@ bool static LookupIntern(const char *pszName, std::vector<CNetAddr>& vIP, unsign
         }
     }
 
-#ifdef HAVE_GETADDRINFO_A
-    struct in_addr ipv4_addr;
-#ifdef HAVE_INET_PTON
-    if (inet_pton(AF_INET, pszName, &ipv4_addr) > 0) {
-        vIP.push_back(CNetAddr(ipv4_addr));
-        return true;
-    }
-
-    struct in6_addr ipv6_addr;
-    if (inet_pton(AF_INET6, pszName, &ipv6_addr) > 0) {
-        vIP.push_back(CNetAddr(ipv6_addr));
-        return true;
-    }
-#else
-    ipv4_addr.s_addr = inet_addr(pszName);
-    if (ipv4_addr.s_addr != INADDR_NONE) {
-        vIP.push_back(CNetAddr(ipv4_addr));
-        return true;
-    }
-#endif
-#endif
-
     struct addrinfo aiHint;
     memset(&aiHint, 0, sizeof(struct addrinfo));
+
     aiHint.ai_socktype = SOCK_STREAM;
     aiHint.ai_protocol = IPPROTO_TCP;
     aiHint.ai_family = AF_UNSPEC;
@@ -126,33 +105,8 @@ bool static LookupIntern(const char *pszName, std::vector<CNetAddr>& vIP, unsign
 #else
     aiHint.ai_flags = fAllowLookup ? AI_ADDRCONFIG : AI_NUMERICHOST;
 #endif
-
     struct addrinfo *aiRes = NULL;
-#ifdef HAVE_GETADDRINFO_A
-    struct gaicb gcb, *query = &gcb;
-    memset(query, 0, sizeof(struct gaicb));
-    gcb.ar_name = pszName;
-    gcb.ar_request = &aiHint;
-    int nErr = getaddrinfo_a(GAI_NOWAIT, &query, 1, NULL);
-    if (nErr)
-        return false;
-
-    do {
-        // Should set the timeout limit to a reasonable value to avoid
-        // generating unnecessary checking call during the polling loop,
-        // while it can still response to stop request quick enough.
-        // 2 seconds looks fine in our situation.
-        struct timespec ts = { 2, 0 };
-        gai_suspend(&query, 1, &ts);
-        boost::this_thread::interruption_point();
-
-        nErr = gai_error(query);
-        if (0 == nErr)
-            aiRes = query->ar_result;
-    } while (nErr == EAI_INPROGRESS);
-#else
     int nErr = getaddrinfo(pszName, NULL, &aiHint, &aiRes);
-#endif
     if (nErr)
         return false;
 

From 87c35f584397e2309970afdcca8e03731a86639e Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Thu, 1 Dec 2016 15:00:37 -0800
Subject: [PATCH 1294/1802] Remove orphan state wipe from UnloadBlockIndex.

As orphan state is now "network state", like in
d6ea737be19a0001e69e4e854eb1cef21523ea7a,

UnloadBlockIndex is only used during init if we end up reindexing
to clear our block state so that we can start over. However, at
that time no connections have been brought up as CConnman hasn't
been started yet, so all of the network processing state logic is
empty when its called.
---
 src/main.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index e2a1f31228272..66d50c5df0eee 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -4311,8 +4311,6 @@ void UnloadBlockIndex()
     pindexBestInvalid = NULL;
     pindexBestHeader = NULL;
     mempool.clear();
-    mapOrphanTransactions.clear();
-    mapOrphanTransactionsByPrev.clear();
     mapBlocksUnlinked.clear();
     vinfoBlockFile.clear();
     nLastBlockFile = 0;

From 634ad517037b319147816f1d112b066528e1724a Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Thu, 1 Dec 2016 16:14:45 -0800
Subject: [PATCH 1295/1802] Squashed 'src/leveldb/' changes from
 20ca81f..a31c8aa

a31c8aa Add NewAppendableFile for win32 environment
1913d71 Merge upstream LevelDB 1.19
3080a45 Increase leveldb version to 1.19.
fa6dc01 A zippy change broke test assumptions about the size of compressed output. Fix the tests by allowing more slop in zippy's behavior. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=123432472
06a191b fix problems in LevelDB's caching code
a7bff69 Fix LevelDB build when asserts are enabled in release builds. (#367)
ea992b4 Change std::uint64_t to uint64_t (#354)
e84b5bd This CL fixes a bug encountered when reading records from leveldb files that have been split, as in a [] input task split.
3211343 Deleted redundant null ptr check prior to delete.
7306ef8 Merge pull request #348 from randomascii/master
6b18316 Fix signed/unsigned mismatch on VC++ builds
adbe3eb Putting build artifacts in subdirectory.
2d0320a Merge pull request #329 from ralphtheninja/travis-badge
dd1c3c3 add travis build badge
43fcf23 Merge pull request #328 from cmumford/master
9fcae61 Added a Travis CI build file.
dac40d2 Merge pull request #284 from ideawu/master
8ec241a Merge pull request #317 from falvojr/patch-1
5d36bed Merge pull request #272 from vapier/master
4753c9b Added a contributors section to README.md
e2446d0 Merge pull request #275 from paulirish/patch-1
706b7f8 Resolve race when getting approximate-memory-usage property
3c9ff3c Only compiling TrimSpace on linux.
f8d205c Including atomic_pointer.h in port_posix
889de31 Let LevelDB use xcrun to determine Xcode.app path instead of using a hardcoded path.
528c2bc Add "approximate-memory-usage" property to leveldb::DB::GetProperty
359b6bc Add leveldb::Cache::Prune
50e77a8 Fix size_t/int comparison/conversion issues in leveldb.
5208e79 Added leveldb::Status::IsInvalidArgument() method.
ce45404 Suppress error reporting after seeking but before a valid First or Full record is encountered.
b9afa1f include <assert> -> <cassert>
edf2939 Update README.md
65190ac Will not reuse manifest if reuse_logs options is false.
ac1d69d LevelDB now attempts to reuse the preceding MANIFEST and log file when re-opened.
76bba13 fix indent
8fcceb2 log compaction output file's level along with number
0e0f074 documentation. improved link
c85addc readme: improved documentation link
ceff6f1 Fix Android/MIPS build.
77948e7 Add benchmark that measures cost of repeatedly opening the database.
34ad72e Move header guard below copyright banner.
a75d435 Clean up layering of storage/leveldb/...
b234f65 Added a new fault injection test.
c4c38f9 Add arm64 support to leveldb.
cea9b10 Fixed incorrect comment wording for Iterator::Seek.
c00c569 Deleted old README file.

git-subtree-dir: src/leveldb
git-subtree-split: a31c8aa408d5594830f7cb20ead1ef1dff51b79e
---
 .travis.yml                            |  13 +
 Makefile                               | 467 ++++++++++++++-------
 README                                 |  51 ---
 README.md                              |  39 +-
 build_detect_platform                  |   2 +-
 db/corruption_test.cc                  |   2 +-
 db/db_bench.cc                         |  24 +-
 db/db_impl.cc                          | 194 +++++----
 db/db_impl.h                           |   8 +-
 db/db_test.cc                          |  32 +-
 db/fault_injection_test.cc             | 554 +++++++++++++++++++++++++
 db/{leveldb_main.cc => leveldbutil.cc} |   0
 db/log_reader.cc                       |  22 +-
 db/log_reader.h                        |   5 +
 db/log_test.cc                         | 101 ++++-
 db/log_writer.cc                       |  17 +-
 db/log_writer.h                        |   6 +
 db/memtable.h                          |   5 +-
 db/recovery_test.cc                    | 324 +++++++++++++++
 db/skiplist.h                          |   8 +-
 db/skiplist_test.cc                    |   2 +-
 db/snapshot.h                          |   1 +
 db/version_set.cc                      |  40 +-
 db/version_set.h                       |   4 +-
 db/write_batch_internal.h              |   1 +
 doc/index.html                         |   2 +-
 helpers/memenv/memenv.cc               |  13 +
 helpers/memenv/memenv_test.cc          |  13 +-
 include/leveldb/cache.h                |  11 +
 include/leveldb/db.h                   |   4 +-
 include/leveldb/env.h                  |  18 +
 include/leveldb/iterator.h             |   2 +-
 include/leveldb/options.h              |   6 +
 include/leveldb/status.h               |   6 +
 port/atomic_pointer.h                  |  19 +
 port/port_posix.cc                     |   1 -
 table/filter_block.cc                  |   4 +-
 table/format.cc                        |   3 +-
 table/iterator_wrapper.h               |   3 +
 table/table.cc                         |   2 +-
 table/table_test.cc                    |  20 +-
 util/arena.cc                          |   6 +-
 util/arena.h                           |  10 +-
 util/bloom.cc                          |   2 +-
 util/bloom_test.cc                     |   3 +-
 util/cache.cc                          | 136 ++++--
 util/cache_test.cc                     |  42 +-
 util/env.cc                            |   4 +
 util/env_posix.cc                      |  13 +
 util/env_win.cc                        |  37 +-
 util/options.cc                        |   2 +-
 util/testutil.h                        |  10 +
 52 files changed, 1942 insertions(+), 372 deletions(-)
 create mode 100644 .travis.yml
 delete mode 100644 README
 create mode 100644 db/fault_injection_test.cc
 rename db/{leveldb_main.cc => leveldbutil.cc} (100%)
 create mode 100644 db/recovery_test.cc

diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000000000..f5bd74c454126
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,13 @@
+language: cpp
+compiler:
+- clang
+- gcc
+os:
+- linux
+- osx
+sudo: false
+before_install:
+- echo $LANG
+- echo $LC_ALL
+script:
+- make -j 4 check
diff --git a/Makefile b/Makefile
index 2bd2cadcddeb9..07a5a1ead6fd8 100644
--- a/Makefile
+++ b/Makefile
@@ -20,208 +20,395 @@ $(shell CC="$(CC)" CXX="$(CXX)" TARGET_OS="$(TARGET_OS)" \
 # this file is generated by the previous line to set build flags and sources
 include build_config.mk
 
+TESTS = \
+	db/autocompact_test \
+	db/c_test \
+	db/corruption_test \
+	db/db_test \
+	db/dbformat_test \
+	db/fault_injection_test \
+	db/filename_test \
+	db/log_test \
+	db/recovery_test \
+	db/skiplist_test \
+	db/version_edit_test \
+	db/version_set_test \
+	db/write_batch_test \
+	helpers/memenv/memenv_test \
+	issues/issue178_test \
+	issues/issue200_test \
+	table/filter_block_test \
+	table/table_test \
+	util/arena_test \
+	util/bloom_test \
+	util/cache_test \
+	util/coding_test \
+	util/crc32c_test \
+	util/env_test \
+	util/hash_test
+
+UTILS = \
+	db/db_bench \
+	db/leveldbutil
+
+# Put the object files in a subdirectory, but the application at the top of the object dir.
+PROGNAMES := $(notdir $(TESTS) $(UTILS))
+
+# On Linux may need libkyotocabinet-dev for dependency.
+BENCHMARKS = \
+	doc/bench/db_bench_sqlite3 \
+	doc/bench/db_bench_tree_db
+
 CFLAGS += -I. -I./include $(PLATFORM_CCFLAGS) $(OPT)
 CXXFLAGS += -I. -I./include $(PLATFORM_CXXFLAGS) $(OPT)
 
 LDFLAGS += $(PLATFORM_LDFLAGS)
 LIBS += $(PLATFORM_LIBS)
 
-LIBOBJECTS = $(SOURCES:.cc=.o)
-MEMENVOBJECTS = $(MEMENV_SOURCES:.cc=.o)
-
-TESTUTIL = ./util/testutil.o
-TESTHARNESS = ./util/testharness.o $(TESTUTIL)
+SIMULATOR_OUTDIR=out-ios-x86
+DEVICE_OUTDIR=out-ios-arm
 
-# Note: iOS should probably be using libtool, not ar.
 ifeq ($(PLATFORM), IOS)
+# Note: iOS should probably be using libtool, not ar.
 AR=xcrun ar
+SIMULATORSDK=$(shell xcrun -sdk iphonesimulator --show-sdk-path)
+DEVICESDK=$(shell xcrun -sdk iphoneos --show-sdk-path)
+DEVICE_CFLAGS = -isysroot "$(DEVICESDK)" -arch armv6 -arch armv7 -arch armv7s -arch arm64
+SIMULATOR_CFLAGS = -isysroot "$(SIMULATORSDK)" -arch i686 -arch x86_64
+STATIC_OUTDIR=out-ios-universal
+else
+STATIC_OUTDIR=out-static
+SHARED_OUTDIR=out-shared
+STATIC_PROGRAMS := $(addprefix $(STATIC_OUTDIR)/, $(PROGNAMES))
+SHARED_PROGRAMS := $(addprefix $(SHARED_OUTDIR)/, db_bench)
 endif
 
-TESTS = \
-	arena_test \
-	autocompact_test \
-	bloom_test \
-	c_test \
-	cache_test \
-	coding_test \
-	corruption_test \
-	crc32c_test \
-	db_test \
-	dbformat_test \
-	env_test \
-	filename_test \
-	filter_block_test \
-	hash_test \
-	issue178_test \
-	issue200_test \
-	log_test \
-	memenv_test \
-	skiplist_test \
-	table_test \
-	version_edit_test \
-	version_set_test \
-	write_batch_test
-
-PROGRAMS = db_bench leveldbutil $(TESTS)
-BENCHMARKS = db_bench_sqlite3 db_bench_tree_db
-
-LIBRARY = libleveldb.a
-MEMENVLIBRARY = libmemenv.a
+STATIC_LIBOBJECTS := $(addprefix $(STATIC_OUTDIR)/, $(SOURCES:.cc=.o))
+STATIC_MEMENVOBJECTS := $(addprefix $(STATIC_OUTDIR)/, $(MEMENV_SOURCES:.cc=.o))
+
+DEVICE_LIBOBJECTS := $(addprefix $(DEVICE_OUTDIR)/, $(SOURCES:.cc=.o))
+DEVICE_MEMENVOBJECTS := $(addprefix $(DEVICE_OUTDIR)/, $(MEMENV_SOURCES:.cc=.o))
+
+SIMULATOR_LIBOBJECTS := $(addprefix $(SIMULATOR_OUTDIR)/, $(SOURCES:.cc=.o))
+SIMULATOR_MEMENVOBJECTS := $(addprefix $(SIMULATOR_OUTDIR)/, $(MEMENV_SOURCES:.cc=.o))
+
+SHARED_LIBOBJECTS := $(addprefix $(SHARED_OUTDIR)/, $(SOURCES:.cc=.o))
+SHARED_MEMENVOBJECTS := $(addprefix $(SHARED_OUTDIR)/, $(MEMENV_SOURCES:.cc=.o))
+
+TESTUTIL := $(STATIC_OUTDIR)/util/testutil.o
+TESTHARNESS := $(STATIC_OUTDIR)/util/testharness.o $(TESTUTIL)
+
+STATIC_TESTOBJS := $(addprefix $(STATIC_OUTDIR)/, $(addsuffix .o, $(TESTS)))
+STATIC_UTILOBJS := $(addprefix $(STATIC_OUTDIR)/, $(addsuffix .o, $(UTILS)))
+STATIC_ALLOBJS := $(STATIC_LIBOBJECTS) $(STATIC_MEMENVOBJECTS) $(STATIC_TESTOBJS) $(STATIC_UTILOBJS) $(TESTHARNESS)
+DEVICE_ALLOBJS := $(DEVICE_LIBOBJECTS) $(DEVICE_MEMENVOBJECTS)
+SIMULATOR_ALLOBJS := $(SIMULATOR_LIBOBJECTS) $(SIMULATOR_MEMENVOBJECTS)
 
 default: all
 
 # Should we build shared libraries?
 ifneq ($(PLATFORM_SHARED_EXT),)
 
+# Many leveldb test apps use non-exported API's. Only build a subset for testing.
+SHARED_ALLOBJS := $(SHARED_LIBOBJECTS) $(SHARED_MEMENVOBJECTS) $(TESTHARNESS)
+
 ifneq ($(PLATFORM_SHARED_VERSIONED),true)
-SHARED1 = libleveldb.$(PLATFORM_SHARED_EXT)
-SHARED2 = $(SHARED1)
-SHARED3 = $(SHARED1)
-SHARED = $(SHARED1)
+SHARED_LIB1 = libleveldb.$(PLATFORM_SHARED_EXT)
+SHARED_LIB2 = $(SHARED_LIB1)
+SHARED_LIB3 = $(SHARED_LIB1)
+SHARED_LIBS = $(SHARED_LIB1)
+SHARED_MEMENVLIB = $(SHARED_OUTDIR)/libmemenv.a
 else
 # Update db.h if you change these.
-SHARED_MAJOR = 1
-SHARED_MINOR = 18
-SHARED1 = libleveldb.$(PLATFORM_SHARED_EXT)
-SHARED2 = $(SHARED1).$(SHARED_MAJOR)
-SHARED3 = $(SHARED1).$(SHARED_MAJOR).$(SHARED_MINOR)
-SHARED = $(SHARED1) $(SHARED2) $(SHARED3)
-$(SHARED1): $(SHARED3)
-	ln -fs $(SHARED3) $(SHARED1)
-$(SHARED2): $(SHARED3)
-	ln -fs $(SHARED3) $(SHARED2)
+SHARED_VERSION_MAJOR = 1
+SHARED_VERSION_MINOR = 19
+SHARED_LIB1 = libleveldb.$(PLATFORM_SHARED_EXT)
+SHARED_LIB2 = $(SHARED_LIB1).$(SHARED_VERSION_MAJOR)
+SHARED_LIB3 = $(SHARED_LIB1).$(SHARED_VERSION_MAJOR).$(SHARED_VERSION_MINOR)
+SHARED_LIBS = $(SHARED_OUTDIR)/$(SHARED_LIB1) $(SHARED_OUTDIR)/$(SHARED_LIB2) $(SHARED_OUTDIR)/$(SHARED_LIB3)
+$(SHARED_OUTDIR)/$(SHARED_LIB1): $(SHARED_OUTDIR)/$(SHARED_LIB3)
+	ln -fs $(SHARED_LIB3) $(SHARED_OUTDIR)/$(SHARED_LIB1)
+$(SHARED_OUTDIR)/$(SHARED_LIB2): $(SHARED_OUTDIR)/$(SHARED_LIB3)
+	ln -fs $(SHARED_LIB3) $(SHARED_OUTDIR)/$(SHARED_LIB2)
+SHARED_MEMENVLIB = $(SHARED_OUTDIR)/libmemenv.a
 endif
 
-$(SHARED3):
-	$(CXX) $(LDFLAGS) $(PLATFORM_SHARED_LDFLAGS)$(SHARED2) $(CXXFLAGS) $(PLATFORM_SHARED_CFLAGS) $(SOURCES) -o $(SHARED3) $(LIBS)
+$(SHARED_OUTDIR)/$(SHARED_LIB3): $(SHARED_LIBOBJECTS)
+	$(CXX) $(LDFLAGS) $(PLATFORM_SHARED_LDFLAGS)$(SHARED_LIB2) $(SHARED_LIBOBJECTS) -o $(SHARED_OUTDIR)/$(SHARED_LIB3) $(LIBS)
 
 endif  # PLATFORM_SHARED_EXT
 
-all: $(SHARED) $(LIBRARY)
+all: $(SHARED_LIBS) $(SHARED_PROGRAMS) $(STATIC_OUTDIR)/libleveldb.a $(STATIC_OUTDIR)/libmemenv.a $(STATIC_PROGRAMS)
 
-check: all $(PROGRAMS) $(TESTS)
-	for t in $(TESTS); do echo "***** Running $$t"; ./$$t || exit 1; done
+check: $(STATIC_PROGRAMS)
+	for t in $(notdir $(TESTS)); do echo "***** Running $$t"; $(STATIC_OUTDIR)/$$t || exit 1; done
 
 clean:
-	-rm -f $(PROGRAMS) $(BENCHMARKS) $(LIBRARY) $(SHARED) $(MEMENVLIBRARY) */*.o */*/*.o ios-x86/*/*.o ios-arm/*/*.o build_config.mk
-	-rm -rf ios-x86/* ios-arm/*
+	-rm -rf out-static out-shared out-ios-x86 out-ios-arm out-ios-universal
+	-rm -f build_config.mk
+	-rm -rf ios-x86 ios-arm
 
-$(LIBRARY): $(LIBOBJECTS)
-	rm -f $@
-	$(AR) -rs $@ $(LIBOBJECTS)
+$(STATIC_OUTDIR):
+	mkdir $@
 
-db_bench: db/db_bench.o $(LIBOBJECTS) $(TESTUTIL)
-	$(CXX) $(LDFLAGS) db/db_bench.o $(LIBOBJECTS) $(TESTUTIL) -o $@ $(LIBS)
+$(STATIC_OUTDIR)/db: | $(STATIC_OUTDIR)
+	mkdir $@
 
-db_bench_sqlite3: doc/bench/db_bench_sqlite3.o $(LIBOBJECTS) $(TESTUTIL)
-	$(CXX) $(LDFLAGS) doc/bench/db_bench_sqlite3.o $(LIBOBJECTS) $(TESTUTIL) -o $@ -lsqlite3 $(LIBS)
+$(STATIC_OUTDIR)/helpers/memenv: | $(STATIC_OUTDIR)
+	mkdir -p $@
 
-db_bench_tree_db: doc/bench/db_bench_tree_db.o $(LIBOBJECTS) $(TESTUTIL)
-	$(CXX) $(LDFLAGS) doc/bench/db_bench_tree_db.o $(LIBOBJECTS) $(TESTUTIL) -o $@ -lkyotocabinet $(LIBS)
+$(STATIC_OUTDIR)/port: | $(STATIC_OUTDIR)
+	mkdir $@
 
-leveldbutil: db/leveldb_main.o $(LIBOBJECTS)
-	$(CXX) $(LDFLAGS) db/leveldb_main.o $(LIBOBJECTS) -o $@ $(LIBS)
+$(STATIC_OUTDIR)/table: | $(STATIC_OUTDIR)
+	mkdir $@
 
-arena_test: util/arena_test.o $(LIBOBJECTS) $(TESTHARNESS)
-	$(CXX) $(LDFLAGS) util/arena_test.o $(LIBOBJECTS) $(TESTHARNESS) -o $@ $(LIBS)
+$(STATIC_OUTDIR)/util: | $(STATIC_OUTDIR)
+	mkdir $@
 
-autocompact_test: db/autocompact_test.o $(LIBOBJECTS) $(TESTHARNESS)
-	$(CXX) $(LDFLAGS) db/autocompact_test.o $(LIBOBJECTS) $(TESTHARNESS) -o $@ $(LIBS)
+.PHONY: STATIC_OBJDIRS
+STATIC_OBJDIRS: \
+	$(STATIC_OUTDIR)/db \
+	$(STATIC_OUTDIR)/port \
+	$(STATIC_OUTDIR)/table \
+	$(STATIC_OUTDIR)/util \
+	$(STATIC_OUTDIR)/helpers/memenv
 
-bloom_test: util/bloom_test.o $(LIBOBJECTS) $(TESTHARNESS)
-	$(CXX) $(LDFLAGS) util/bloom_test.o $(LIBOBJECTS) $(TESTHARNESS) -o $@ $(LIBS)
+$(SHARED_OUTDIR):
+	mkdir $@
 
-c_test: db/c_test.o $(LIBOBJECTS) $(TESTHARNESS)
-	$(CXX) $(LDFLAGS) db/c_test.o $(LIBOBJECTS) $(TESTHARNESS) -o $@ $(LIBS)
+$(SHARED_OUTDIR)/db: | $(SHARED_OUTDIR)
+	mkdir $@
 
-cache_test: util/cache_test.o $(LIBOBJECTS) $(TESTHARNESS)
-	$(CXX) $(LDFLAGS) util/cache_test.o $(LIBOBJECTS) $(TESTHARNESS) -o $@ $(LIBS)
+$(SHARED_OUTDIR)/helpers/memenv: | $(SHARED_OUTDIR)
+	mkdir -p $@
 
-coding_test: util/coding_test.o $(LIBOBJECTS) $(TESTHARNESS)
-	$(CXX) $(LDFLAGS) util/coding_test.o $(LIBOBJECTS) $(TESTHARNESS) -o $@ $(LIBS)
+$(SHARED_OUTDIR)/port: | $(SHARED_OUTDIR)
+	mkdir $@
 
-corruption_test: db/corruption_test.o $(LIBOBJECTS) $(TESTHARNESS)
-	$(CXX) $(LDFLAGS) db/corruption_test.o $(LIBOBJECTS) $(TESTHARNESS) -o $@ $(LIBS)
+$(SHARED_OUTDIR)/table: | $(SHARED_OUTDIR)
+	mkdir $@
 
-crc32c_test: util/crc32c_test.o $(LIBOBJECTS) $(TESTHARNESS)
-	$(CXX) $(LDFLAGS) util/crc32c_test.o $(LIBOBJECTS) $(TESTHARNESS) -o $@ $(LIBS)
+$(SHARED_OUTDIR)/util: | $(SHARED_OUTDIR)
+	mkdir $@
 
-db_test: db/db_test.o $(LIBOBJECTS) $(TESTHARNESS)
-	$(CXX) $(LDFLAGS) db/db_test.o $(LIBOBJECTS) $(TESTHARNESS) -o $@ $(LIBS)
+.PHONY: SHARED_OBJDIRS
+SHARED_OBJDIRS: \
+	$(SHARED_OUTDIR)/db \
+	$(SHARED_OUTDIR)/port \
+	$(SHARED_OUTDIR)/table \
+	$(SHARED_OUTDIR)/util \
+	$(SHARED_OUTDIR)/helpers/memenv
 
-dbformat_test: db/dbformat_test.o $(LIBOBJECTS) $(TESTHARNESS)
-	$(CXX) $(LDFLAGS) db/dbformat_test.o $(LIBOBJECTS) $(TESTHARNESS) -o $@ $(LIBS)
+$(DEVICE_OUTDIR):
+	mkdir $@
 
-env_test: util/env_test.o $(LIBOBJECTS) $(TESTHARNESS)
-	$(CXX) $(LDFLAGS) util/env_test.o $(LIBOBJECTS) $(TESTHARNESS) -o $@ $(LIBS)
+$(DEVICE_OUTDIR)/db: | $(DEVICE_OUTDIR)
+	mkdir $@
 
-filename_test: db/filename_test.o $(LIBOBJECTS) $(TESTHARNESS)
-	$(CXX) $(LDFLAGS) db/filename_test.o $(LIBOBJECTS) $(TESTHARNESS) -o $@ $(LIBS)
+$(DEVICE_OUTDIR)/helpers/memenv: | $(DEVICE_OUTDIR)
+	mkdir -p $@
 
-filter_block_test: table/filter_block_test.o $(LIBOBJECTS) $(TESTHARNESS)
-	$(CXX) $(LDFLAGS) table/filter_block_test.o $(LIBOBJECTS) $(TESTHARNESS) -o $@ $(LIBS)
+$(DEVICE_OUTDIR)/port: | $(DEVICE_OUTDIR)
+	mkdir $@
 
-hash_test: util/hash_test.o $(LIBOBJECTS) $(TESTHARNESS)
-	$(CXX) $(LDFLAGS) util/hash_test.o $(LIBOBJECTS) $(TESTHARNESS) -o $@ $(LIBS)
+$(DEVICE_OUTDIR)/table: | $(DEVICE_OUTDIR)
+	mkdir $@
 
-issue178_test: issues/issue178_test.o $(LIBOBJECTS) $(TESTHARNESS)
-	$(CXX) $(LDFLAGS) issues/issue178_test.o $(LIBOBJECTS) $(TESTHARNESS) -o $@ $(LIBS)
+$(DEVICE_OUTDIR)/util: | $(DEVICE_OUTDIR)
+	mkdir $@
 
-issue200_test: issues/issue200_test.o $(LIBOBJECTS) $(TESTHARNESS)
-	$(CXX) $(LDFLAGS) issues/issue200_test.o $(LIBOBJECTS) $(TESTHARNESS) -o $@ $(LIBS)
+.PHONY: DEVICE_OBJDIRS
+DEVICE_OBJDIRS: \
+	$(DEVICE_OUTDIR)/db \
+	$(DEVICE_OUTDIR)/port \
+	$(DEVICE_OUTDIR)/table \
+	$(DEVICE_OUTDIR)/util \
+	$(DEVICE_OUTDIR)/helpers/memenv
 
-log_test: db/log_test.o $(LIBOBJECTS) $(TESTHARNESS)
-	$(CXX) $(LDFLAGS) db/log_test.o $(LIBOBJECTS) $(TESTHARNESS) -o $@ $(LIBS)
+$(SIMULATOR_OUTDIR):
+	mkdir $@
 
-table_test: table/table_test.o $(LIBOBJECTS) $(TESTHARNESS)
-	$(CXX) $(LDFLAGS) table/table_test.o $(LIBOBJECTS) $(TESTHARNESS) -o $@ $(LIBS)
+$(SIMULATOR_OUTDIR)/db: | $(SIMULATOR_OUTDIR)
+	mkdir $@
 
-skiplist_test: db/skiplist_test.o $(LIBOBJECTS) $(TESTHARNESS)
-	$(CXX) $(LDFLAGS) db/skiplist_test.o $(LIBOBJECTS) $(TESTHARNESS) -o $@ $(LIBS)
+$(SIMULATOR_OUTDIR)/helpers/memenv: | $(SIMULATOR_OUTDIR)
+	mkdir -p $@
 
-version_edit_test: db/version_edit_test.o $(LIBOBJECTS) $(TESTHARNESS)
-	$(CXX) $(LDFLAGS) db/version_edit_test.o $(LIBOBJECTS) $(TESTHARNESS) -o $@ $(LIBS)
+$(SIMULATOR_OUTDIR)/port: | $(SIMULATOR_OUTDIR)
+	mkdir $@
 
-version_set_test: db/version_set_test.o $(LIBOBJECTS) $(TESTHARNESS)
-	$(CXX) $(LDFLAGS) db/version_set_test.o $(LIBOBJECTS) $(TESTHARNESS) -o $@ $(LIBS)
+$(SIMULATOR_OUTDIR)/table: | $(SIMULATOR_OUTDIR)
+	mkdir $@
 
-write_batch_test: db/write_batch_test.o $(LIBOBJECTS) $(TESTHARNESS)
-	$(CXX) $(LDFLAGS) db/write_batch_test.o $(LIBOBJECTS) $(TESTHARNESS) -o $@ $(LIBS)
+$(SIMULATOR_OUTDIR)/util: | $(SIMULATOR_OUTDIR)
+	mkdir $@
 
-$(MEMENVLIBRARY) : $(MEMENVOBJECTS)
-	rm -f $@
-	$(AR) -rs $@ $(MEMENVOBJECTS)
+.PHONY: SIMULATOR_OBJDIRS
+SIMULATOR_OBJDIRS: \
+	$(SIMULATOR_OUTDIR)/db \
+	$(SIMULATOR_OUTDIR)/port \
+	$(SIMULATOR_OUTDIR)/table \
+	$(SIMULATOR_OUTDIR)/util \
+	$(SIMULATOR_OUTDIR)/helpers/memenv
 
-memenv_test : helpers/memenv/memenv_test.o $(MEMENVLIBRARY) $(LIBRARY) $(TESTHARNESS)
-	$(CXX) $(LDFLAGS) helpers/memenv/memenv_test.o $(MEMENVLIBRARY) $(LIBRARY) $(TESTHARNESS) -o $@ $(LIBS)
+$(STATIC_ALLOBJS): | STATIC_OBJDIRS
+$(DEVICE_ALLOBJS): | DEVICE_OBJDIRS
+$(SIMULATOR_ALLOBJS): | SIMULATOR_OBJDIRS
+$(SHARED_ALLOBJS): | SHARED_OBJDIRS
 
 ifeq ($(PLATFORM), IOS)
-# For iOS, create universal object files to be used on both the simulator and
+$(DEVICE_OUTDIR)/libleveldb.a: $(DEVICE_LIBOBJECTS)
+	rm -f $@
+	$(AR) -rs $@ $(DEVICE_LIBOBJECTS)
+
+$(SIMULATOR_OUTDIR)/libleveldb.a: $(SIMULATOR_LIBOBJECTS)
+	rm -f $@
+	$(AR) -rs $@ $(SIMULATOR_LIBOBJECTS)
+
+$(DEVICE_OUTDIR)/libmemenv.a: $(DEVICE_MEMENVOBJECTS)
+	rm -f $@
+	$(AR) -rs $@ $(DEVICE_MEMENVOBJECTS)
+
+$(SIMULATOR_OUTDIR)/libmemenv.a: $(SIMULATOR_MEMENVOBJECTS)
+	rm -f $@
+	$(AR) -rs $@ $(SIMULATOR_MEMENVOBJECTS)
+
+# For iOS, create universal object libraries to be used on both the simulator and
 # a device.
-PLATFORMSROOT=/Applications/Xcode.app/Contents/Developer/Platforms
-SIMULATORROOT=$(PLATFORMSROOT)/iPhoneSimulator.platform/Developer
-DEVICEROOT=$(PLATFORMSROOT)/iPhoneOS.platform/Developer
-IOSVERSION=$(shell defaults read $(PLATFORMSROOT)/iPhoneOS.platform/version CFBundleShortVersionString)
-IOSARCH=-arch armv6 -arch armv7 -arch armv7s -arch arm64
-
-.cc.o:
-	mkdir -p ios-x86/$(dir $@)
-	xcrun -sdk iphonesimulator $(CXX) $(CXXFLAGS) -isysroot $(SIMULATORROOT)/SDKs/iPhoneSimulator$(IOSVERSION).sdk -arch i686 -arch x86_64 -c $< -o ios-x86/$@
-	mkdir -p ios-arm/$(dir $@)
-	xcrun -sdk iphoneos $(CXX) $(CXXFLAGS) -isysroot $(DEVICEROOT)/SDKs/iPhoneOS$(IOSVERSION).sdk $(IOSARCH) -c $< -o ios-arm/$@
-	xcrun lipo ios-x86/$@ ios-arm/$@ -create -output $@
-
-.c.o:
-	mkdir -p ios-x86/$(dir $@)
-	xcrun -sdk iphonesimulator $(CC) $(CFLAGS) -isysroot $(SIMULATORROOT)/SDKs/iPhoneSimulator$(IOSVERSION).sdk -arch i686 -arch x86_64 -c $< -o ios-x86/$@
-	mkdir -p ios-arm/$(dir $@)
-	xcrun -sdk iphoneos $(CC) $(CFLAGS) -isysroot $(DEVICEROOT)/SDKs/iPhoneOS$(IOSVERSION).sdk $(IOSARCH) -c $< -o ios-arm/$@
-	xcrun lipo ios-x86/$@ ios-arm/$@ -create -output $@
+$(STATIC_OUTDIR)/libleveldb.a: $(STATIC_OUTDIR) $(DEVICE_OUTDIR)/libleveldb.a $(SIMULATOR_OUTDIR)/libleveldb.a
+	lipo -create $(DEVICE_OUTDIR)/libleveldb.a $(SIMULATOR_OUTDIR)/libleveldb.a -output $@
 
+$(STATIC_OUTDIR)/libmemenv.a: $(STATIC_OUTDIR) $(DEVICE_OUTDIR)/libmemenv.a $(SIMULATOR_OUTDIR)/libmemenv.a
+	lipo -create $(DEVICE_OUTDIR)/libmemenv.a $(SIMULATOR_OUTDIR)/libmemenv.a -output $@
 else
-.cc.o:
+$(STATIC_OUTDIR)/libleveldb.a:$(STATIC_LIBOBJECTS)
+	rm -f $@
+	$(AR) -rs $@ $(STATIC_LIBOBJECTS)
+
+$(STATIC_OUTDIR)/libmemenv.a:$(STATIC_MEMENVOBJECTS)
+	rm -f $@
+	$(AR) -rs $@ $(STATIC_MEMENVOBJECTS)
+endif
+
+$(SHARED_MEMENVLIB):$(SHARED_MEMENVOBJECTS)
+	rm -f $@
+	$(AR) -rs $@ $(SHARED_MEMENVOBJECTS)
+
+$(STATIC_OUTDIR)/db_bench:db/db_bench.cc $(STATIC_LIBOBJECTS) $(TESTUTIL)
+	$(CXX) $(LDFLAGS) $(CXXFLAGS) db/db_bench.cc $(STATIC_LIBOBJECTS) $(TESTUTIL) -o $@ $(LIBS)
+
+$(STATIC_OUTDIR)/db_bench_sqlite3:doc/bench/db_bench_sqlite3.cc $(STATIC_LIBOBJECTS) $(TESTUTIL)
+	$(CXX) $(LDFLAGS) $(CXXFLAGS) doc/bench/db_bench_sqlite3.cc $(STATIC_LIBOBJECTS) $(TESTUTIL) -o $@ -lsqlite3 $(LIBS)
+
+$(STATIC_OUTDIR)/db_bench_tree_db:doc/bench/db_bench_tree_db.cc $(STATIC_LIBOBJECTS) $(TESTUTIL)
+	$(CXX) $(LDFLAGS) $(CXXFLAGS) doc/bench/db_bench_tree_db.cc $(STATIC_LIBOBJECTS) $(TESTUTIL) -o $@ -lkyotocabinet $(LIBS)
+
+$(STATIC_OUTDIR)/leveldbutil:db/leveldbutil.cc $(STATIC_LIBOBJECTS)
+	$(CXX) $(LDFLAGS) $(CXXFLAGS) db/leveldbutil.cc $(STATIC_LIBOBJECTS) -o $@ $(LIBS)
+
+$(STATIC_OUTDIR)/arena_test:util/arena_test.cc $(STATIC_LIBOBJECTS) $(TESTHARNESS)
+	$(CXX) $(LDFLAGS) $(CXXFLAGS) util/arena_test.cc $(STATIC_LIBOBJECTS) $(TESTHARNESS) -o $@ $(LIBS)
+
+$(STATIC_OUTDIR)/autocompact_test:db/autocompact_test.cc $(STATIC_LIBOBJECTS) $(TESTHARNESS)
+	$(CXX) $(LDFLAGS) $(CXXFLAGS) db/autocompact_test.cc $(STATIC_LIBOBJECTS) $(TESTHARNESS) -o $@ $(LIBS)
+
+$(STATIC_OUTDIR)/bloom_test:util/bloom_test.cc $(STATIC_LIBOBJECTS) $(TESTHARNESS)
+	$(CXX) $(LDFLAGS) $(CXXFLAGS) util/bloom_test.cc $(STATIC_LIBOBJECTS) $(TESTHARNESS) -o $@ $(LIBS)
+
+$(STATIC_OUTDIR)/c_test:$(STATIC_OUTDIR)/db/c_test.o $(STATIC_LIBOBJECTS) $(TESTHARNESS)
+	$(CXX) $(LDFLAGS) $(STATIC_OUTDIR)/db/c_test.o $(STATIC_LIBOBJECTS) $(TESTHARNESS) -o $@ $(LIBS)
+
+$(STATIC_OUTDIR)/cache_test:util/cache_test.cc $(STATIC_LIBOBJECTS) $(TESTHARNESS)
+	$(CXX) $(LDFLAGS) $(CXXFLAGS) util/cache_test.cc $(STATIC_LIBOBJECTS) $(TESTHARNESS) -o $@ $(LIBS)
+
+$(STATIC_OUTDIR)/coding_test:util/coding_test.cc $(STATIC_LIBOBJECTS) $(TESTHARNESS)
+	$(CXX) $(LDFLAGS) $(CXXFLAGS) util/coding_test.cc $(STATIC_LIBOBJECTS) $(TESTHARNESS) -o $@ $(LIBS)
+
+$(STATIC_OUTDIR)/corruption_test:db/corruption_test.cc $(STATIC_LIBOBJECTS) $(TESTHARNESS)
+	$(CXX) $(LDFLAGS) $(CXXFLAGS) db/corruption_test.cc $(STATIC_LIBOBJECTS) $(TESTHARNESS) -o $@ $(LIBS)
+
+$(STATIC_OUTDIR)/crc32c_test:util/crc32c_test.cc $(STATIC_LIBOBJECTS) $(TESTHARNESS)
+	$(CXX) $(LDFLAGS) $(CXXFLAGS) util/crc32c_test.cc $(STATIC_LIBOBJECTS) $(TESTHARNESS) -o $@ $(LIBS)
+
+$(STATIC_OUTDIR)/db_test:db/db_test.cc $(STATIC_LIBOBJECTS) $(TESTHARNESS)
+	$(CXX) $(LDFLAGS) $(CXXFLAGS) db/db_test.cc $(STATIC_LIBOBJECTS) $(TESTHARNESS) -o $@ $(LIBS)
+
+$(STATIC_OUTDIR)/dbformat_test:db/dbformat_test.cc $(STATIC_LIBOBJECTS) $(TESTHARNESS)
+	$(CXX) $(LDFLAGS) $(CXXFLAGS) db/dbformat_test.cc $(STATIC_LIBOBJECTS) $(TESTHARNESS) -o $@ $(LIBS)
+
+$(STATIC_OUTDIR)/env_test:util/env_test.cc $(STATIC_LIBOBJECTS) $(TESTHARNESS)
+	$(CXX) $(LDFLAGS) $(CXXFLAGS) util/env_test.cc $(STATIC_LIBOBJECTS) $(TESTHARNESS) -o $@ $(LIBS)
+
+$(STATIC_OUTDIR)/fault_injection_test:db/fault_injection_test.cc $(STATIC_LIBOBJECTS) $(TESTHARNESS)
+	$(CXX) $(LDFLAGS) $(CXXFLAGS) db/fault_injection_test.cc $(STATIC_LIBOBJECTS) $(TESTHARNESS) -o $@ $(LIBS)
+
+$(STATIC_OUTDIR)/filename_test:db/filename_test.cc $(STATIC_LIBOBJECTS) $(TESTHARNESS)
+	$(CXX) $(LDFLAGS) $(CXXFLAGS) db/filename_test.cc $(STATIC_LIBOBJECTS) $(TESTHARNESS) -o $@ $(LIBS)
+
+$(STATIC_OUTDIR)/filter_block_test:table/filter_block_test.cc $(STATIC_LIBOBJECTS) $(TESTHARNESS)
+	$(CXX) $(LDFLAGS) $(CXXFLAGS) table/filter_block_test.cc $(STATIC_LIBOBJECTS) $(TESTHARNESS) -o $@ $(LIBS)
+
+$(STATIC_OUTDIR)/hash_test:util/hash_test.cc $(STATIC_LIBOBJECTS) $(TESTHARNESS)
+	$(CXX) $(LDFLAGS) $(CXXFLAGS) util/hash_test.cc $(STATIC_LIBOBJECTS) $(TESTHARNESS) -o $@ $(LIBS)
+
+$(STATIC_OUTDIR)/issue178_test:issues/issue178_test.cc $(STATIC_LIBOBJECTS) $(TESTHARNESS)
+	$(CXX) $(LDFLAGS) $(CXXFLAGS) issues/issue178_test.cc $(STATIC_LIBOBJECTS) $(TESTHARNESS) -o $@ $(LIBS)
+
+$(STATIC_OUTDIR)/issue200_test:issues/issue200_test.cc $(STATIC_LIBOBJECTS) $(TESTHARNESS)
+	$(CXX) $(LDFLAGS) $(CXXFLAGS) issues/issue200_test.cc $(STATIC_LIBOBJECTS) $(TESTHARNESS) -o $@ $(LIBS)
+
+$(STATIC_OUTDIR)/log_test:db/log_test.cc $(STATIC_LIBOBJECTS) $(TESTHARNESS)
+	$(CXX) $(LDFLAGS) $(CXXFLAGS) db/log_test.cc $(STATIC_LIBOBJECTS) $(TESTHARNESS) -o $@ $(LIBS)
+
+$(STATIC_OUTDIR)/recovery_test:db/recovery_test.cc $(STATIC_LIBOBJECTS) $(TESTHARNESS)
+	$(CXX) $(LDFLAGS) $(CXXFLAGS) db/recovery_test.cc $(STATIC_LIBOBJECTS) $(TESTHARNESS) -o $@ $(LIBS)
+
+$(STATIC_OUTDIR)/table_test:table/table_test.cc $(STATIC_LIBOBJECTS) $(TESTHARNESS)
+	$(CXX) $(LDFLAGS) $(CXXFLAGS) table/table_test.cc $(STATIC_LIBOBJECTS) $(TESTHARNESS) -o $@ $(LIBS)
+
+$(STATIC_OUTDIR)/skiplist_test:db/skiplist_test.cc $(STATIC_LIBOBJECTS) $(TESTHARNESS)
+	$(CXX) $(LDFLAGS) $(CXXFLAGS) db/skiplist_test.cc $(STATIC_LIBOBJECTS) $(TESTHARNESS) -o $@ $(LIBS)
+
+$(STATIC_OUTDIR)/version_edit_test:db/version_edit_test.cc $(STATIC_LIBOBJECTS) $(TESTHARNESS)
+	$(CXX) $(LDFLAGS) $(CXXFLAGS) db/version_edit_test.cc $(STATIC_LIBOBJECTS) $(TESTHARNESS) -o $@ $(LIBS)
+
+$(STATIC_OUTDIR)/version_set_test:db/version_set_test.cc $(STATIC_LIBOBJECTS) $(TESTHARNESS)
+	$(CXX) $(LDFLAGS) $(CXXFLAGS) db/version_set_test.cc $(STATIC_LIBOBJECTS) $(TESTHARNESS) -o $@ $(LIBS)
+
+$(STATIC_OUTDIR)/write_batch_test:db/write_batch_test.cc $(STATIC_LIBOBJECTS) $(TESTHARNESS)
+	$(CXX) $(LDFLAGS) $(CXXFLAGS) db/write_batch_test.cc $(STATIC_LIBOBJECTS) $(TESTHARNESS) -o $@ $(LIBS)
+
+$(STATIC_OUTDIR)/memenv_test:$(STATIC_OUTDIR)/helpers/memenv/memenv_test.o $(STATIC_OUTDIR)/libmemenv.a $(STATIC_OUTDIR)/libleveldb.a $(TESTHARNESS)
+	$(XCRUN) $(CXX) $(LDFLAGS) $(STATIC_OUTDIR)/helpers/memenv/memenv_test.o $(STATIC_OUTDIR)/libmemenv.a $(STATIC_OUTDIR)/libleveldb.a $(TESTHARNESS) -o $@ $(LIBS)
+
+$(SHARED_OUTDIR)/db_bench:$(SHARED_OUTDIR)/db/db_bench.o $(SHARED_LIBS) $(TESTUTIL)
+	$(XCRUN) $(CXX) $(LDFLAGS) $(CXXFLAGS) $(PLATFORM_SHARED_CFLAGS) $(SHARED_OUTDIR)/db/db_bench.o $(TESTUTIL) $(SHARED_OUTDIR)/$(SHARED_LIB3) -o $@ $(LIBS)
+
+.PHONY: run-shared
+run-shared: $(SHARED_OUTDIR)/db_bench
+	LD_LIBRARY_PATH=$(SHARED_OUTDIR) $(SHARED_OUTDIR)/db_bench
+
+$(SIMULATOR_OUTDIR)/%.o: %.cc
+	xcrun -sdk iphonesimulator $(CXX) $(CXXFLAGS) $(SIMULATOR_CFLAGS) -c $< -o $@
+
+$(DEVICE_OUTDIR)/%.o: %.cc
+	xcrun -sdk iphoneos $(CXX) $(CXXFLAGS) $(DEVICE_CFLAGS) -c $< -o $@
+
+$(SIMULATOR_OUTDIR)/%.o: %.c
+	xcrun -sdk iphonesimulator $(CC) $(CFLAGS) $(SIMULATOR_CFLAGS) -c $< -o $@
+
+$(DEVICE_OUTDIR)/%.o: %.c
+	xcrun -sdk iphoneos $(CC) $(CFLAGS) $(DEVICE_CFLAGS) -c $< -o $@
+
+$(STATIC_OUTDIR)/%.o: %.cc
 	$(CXX) $(CXXFLAGS) -c $< -o $@
 
-.c.o:
+$(STATIC_OUTDIR)/%.o: %.c
 	$(CC) $(CFLAGS) -c $< -o $@
-endif
+
+$(SHARED_OUTDIR)/%.o: %.cc
+	$(CXX) $(CXXFLAGS) $(PLATFORM_SHARED_CFLAGS) -c $< -o $@
+
+$(SHARED_OUTDIR)/%.o: %.c
+	$(CC) $(CFLAGS) $(PLATFORM_SHARED_CFLAGS) -c $< -o $@
diff --git a/README b/README
deleted file mode 100644
index 3618adeeedbea..0000000000000
--- a/README
+++ /dev/null
@@ -1,51 +0,0 @@
-leveldb: A key-value store
-Authors: Sanjay Ghemawat (sanjay@google.com) and Jeff Dean (jeff@google.com)
-
-The code under this directory implements a system for maintaining a
-persistent key/value store.
-
-See doc/index.html for more explanation.
-See doc/impl.html for a brief overview of the implementation.
-
-The public interface is in include/*.h.  Callers should not include or
-rely on the details of any other header files in this package.  Those
-internal APIs may be changed without warning.
-
-Guide to header files:
-
-include/db.h
-    Main interface to the DB: Start here
-
-include/options.h
-    Control over the behavior of an entire database, and also
-    control over the behavior of individual reads and writes.
-
-include/comparator.h
-    Abstraction for user-specified comparison function.  If you want
-    just bytewise comparison of keys, you can use the default comparator,
-    but clients can write their own comparator implementations if they
-    want custom ordering (e.g. to handle different character
-    encodings, etc.)
-
-include/iterator.h
-    Interface for iterating over data. You can get an iterator
-    from a DB object.
-
-include/write_batch.h
-    Interface for atomically applying multiple updates to a database.
-
-include/slice.h
-    A simple module for maintaining a pointer and a length into some
-    other byte array.
-
-include/status.h
-    Status is returned from many of the public interfaces and is used
-    to report success and various kinds of errors.
-
-include/env.h
-    Abstraction of the OS environment.  A posix implementation of
-    this interface is in util/env_posix.cc
-
-include/table.h
-include/table_builder.h
-    Lower-level modules that most clients probably won't use directly
diff --git a/README.md b/README.md
index 480affb5ca1de..c75b185e0e746 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,7 @@
 **LevelDB is a fast key-value storage library written at Google that provides an ordered mapping from string keys to string values.**
 
+[![Build Status](https://travis-ci.org/google/leveldb.svg?branch=master)](https://travis-ci.org/google/leveldb)
+
 Authors: Sanjay Ghemawat (sanjay@google.com) and Jeff Dean (jeff@google.com)
 
 # Features
@@ -10,9 +12,11 @@ Authors: Sanjay Ghemawat (sanjay@google.com) and Jeff Dean (jeff@google.com)
   * Multiple changes can be made in one atomic batch.
   * Users can create a transient snapshot to get a consistent view of data.
   * Forward and backward iteration is supported over the data.
-  * Data is automatically compressed using the [Snappy compression library](http://code.google.com/p/snappy).
+  * Data is automatically compressed using the [Snappy compression library](http://google.github.io/snappy/).
   * External activity (file system operations etc.) is relayed through a virtual interface so users can customize the operating system interactions.
-  * [Detailed documentation](http://htmlpreview.github.io/?https://github.com/google/leveldb/blob/master/doc/index.html) about how to use the library is included with the source code.
+
+# Documentation
+  [LevelDB library documentation](https://rawgit.com/google/leveldb/master/doc/index.html) is online and bundled with the source code.
 
 
 # Limitations
@@ -20,6 +24,37 @@ Authors: Sanjay Ghemawat (sanjay@google.com) and Jeff Dean (jeff@google.com)
   * Only a single process (possibly multi-threaded) can access a particular database at a time.
   * There is no client-server support builtin to the library.  An application that needs such support will have to wrap their own server around the library.
 
+# Contributing to the leveldb Project
+The leveldb project welcomes contributions. leveldb's primary goal is to be
+a reliable and fast key/value store. Changes that are in line with the
+features/limitations outlined above, and meet the requirements below,
+will be considered.
+
+Contribution requirements:
+
+1. **POSIX only**. We _generally_ will only accept changes that are both
+   compiled, and tested on a POSIX platform - usually Linux. Very small
+   changes will sometimes be accepted, but consider that more of an
+   exception than the rule.
+
+2. **Stable API**. We strive very hard to maintain a stable API. Changes that
+   require changes for projects using leveldb _might_ be rejected without
+   sufficient benefit to the project.
+
+3. **Tests**: All changes must be accompanied by a new (or changed) test, or
+   a sufficient explanation as to why a new (or changed) test is not required.
+
+## Submitting a Pull Request
+Before any pull request will be accepted the author must first sign a
+Contributor License Agreement (CLA) at https://cla.developers.google.com/.
+
+In order to keep the commit timeline linear
+[squash](https://git-scm.com/book/en/v2/Git-Tools-Rewriting-History#Squashing-Commits)
+your changes down to a single commit and [rebase](https://git-scm.com/docs/git-rebase)
+on google/leveldb/master. This keeps the commit timeline linear and more easily sync'ed
+with the internal repository at Google. More information at GitHub's
+[About Git rebase](https://help.github.com/articles/about-git-rebase/) page.
+
 # Performance
 
 Here is a performance report (with explanations) from the run of the
diff --git a/build_detect_platform b/build_detect_platform
index a1101c1bdad89..d7edab1d87bb5 100755
--- a/build_detect_platform
+++ b/build_detect_platform
@@ -175,7 +175,7 @@ DIRS="$PREFIX/db $PREFIX/util $PREFIX/table"
 set -f # temporarily disable globbing so that our patterns aren't expanded
 PRUNE_TEST="-name *test*.cc -prune"
 PRUNE_BENCH="-name *_bench.cc -prune"
-PRUNE_TOOL="-name leveldb_main.cc -prune"
+PRUNE_TOOL="-name leveldbutil.cc -prune"
 PORTABLE_FILES=`find $DIRS $PRUNE_TEST -o $PRUNE_BENCH -o $PRUNE_TOOL -o -name '*.cc' -print | sort | sed "s,^$PREFIX/,," | tr "\n" " "`
 
 set +f # re-enable globbing
diff --git a/db/corruption_test.cc b/db/corruption_test.cc
index 96afc68913ce2..37a484d25fea2 100644
--- a/db/corruption_test.cc
+++ b/db/corruption_test.cc
@@ -36,7 +36,7 @@ class CorruptionTest {
     tiny_cache_ = NewLRUCache(100);
     options_.env = &env_;
     options_.block_cache = tiny_cache_;
-    dbname_ = test::TmpDir() + "/db_test";
+    dbname_ = test::TmpDir() + "/corruption_test";
     DestroyDB(dbname_, options_);
 
     db_ = NULL;
diff --git a/db/db_bench.cc b/db/db_bench.cc
index 705a170aae471..7a0f5e08cdd58 100644
--- a/db/db_bench.cc
+++ b/db/db_bench.cc
@@ -33,6 +33,7 @@
 //      readmissing   -- read N missing keys in random order
 //      readhot       -- read N times in random order from 1% section of DB
 //      seekrandom    -- N random seeks
+//      open          -- cost of opening a DB
 //      crc32c        -- repeated crc32c of 4K of data
 //      acquireload   -- load N*1000 times
 //   Meta operations:
@@ -99,6 +100,9 @@ static int FLAGS_bloom_bits = -1;
 // benchmark will fail.
 static bool FLAGS_use_existing_db = false;
 
+// If true, reuse existing log/MANIFEST files when re-opening a database.
+static bool FLAGS_reuse_logs = false;
+
 // Use the db with the following name.
 static const char* FLAGS_db = NULL;
 
@@ -138,6 +142,7 @@ class RandomGenerator {
   }
 };
 
+#if defined(__linux)
 static Slice TrimSpace(Slice s) {
   size_t start = 0;
   while (start < s.size() && isspace(s[start])) {
@@ -149,6 +154,7 @@ static Slice TrimSpace(Slice s) {
   }
   return Slice(s.data() + start, limit - start);
 }
+#endif
 
 static void AppendWithSpace(std::string* str, Slice msg) {
   if (msg.empty()) return;
@@ -442,7 +448,11 @@ class Benchmark {
       bool fresh_db = false;
       int num_threads = FLAGS_threads;
 
-      if (name == Slice("fillseq")) {
+      if (name == Slice("open")) {
+        method = &Benchmark::OpenBench;
+        num_ /= 10000;
+        if (num_ < 1) num_ = 1;
+      } else if (name == Slice("fillseq")) {
         fresh_db = true;
         method = &Benchmark::WriteSeq;
       } else if (name == Slice("fillbatch")) {
@@ -695,6 +705,7 @@ class Benchmark {
     options.write_buffer_size = FLAGS_write_buffer_size;
     options.max_open_files = FLAGS_open_files;
     options.filter_policy = filter_policy_;
+    options.reuse_logs = FLAGS_reuse_logs;
     Status s = DB::Open(options, FLAGS_db, &db_);
     if (!s.ok()) {
       fprintf(stderr, "open error: %s\n", s.ToString().c_str());
@@ -702,6 +713,14 @@ class Benchmark {
     }
   }
 
+  void OpenBench(ThreadState* thread) {
+    for (int i = 0; i < num_; i++) {
+      delete db_;
+      Open();
+      thread->stats.FinishedSingleOp();
+    }
+  }
+
   void WriteSeq(ThreadState* thread) {
     DoWrite(thread, true);
   }
@@ -941,6 +960,9 @@ int main(int argc, char** argv) {
     } else if (sscanf(argv[i], "--use_existing_db=%d%c", &n, &junk) == 1 &&
                (n == 0 || n == 1)) {
       FLAGS_use_existing_db = n;
+    } else if (sscanf(argv[i], "--reuse_logs=%d%c", &n, &junk) == 1 &&
+               (n == 0 || n == 1)) {
+      FLAGS_reuse_logs = n;
     } else if (sscanf(argv[i], "--num=%d%c", &n, &junk) == 1) {
       FLAGS_num = n;
     } else if (sscanf(argv[i], "--reads=%d%c", &n, &junk) == 1) {
diff --git a/db/db_impl.cc b/db/db_impl.cc
index 49b95953b4e96..60f4e66e55796 100644
--- a/db/db_impl.cc
+++ b/db/db_impl.cc
@@ -125,7 +125,7 @@ DBImpl::DBImpl(const Options& raw_options, const std::string& dbname)
       db_lock_(NULL),
       shutting_down_(NULL),
       bg_cv_(&mutex_),
-      mem_(new MemTable(internal_comparator_)),
+      mem_(NULL),
       imm_(NULL),
       logfile_(NULL),
       logfile_number_(0),
@@ -134,7 +134,6 @@ DBImpl::DBImpl(const Options& raw_options, const std::string& dbname)
       tmp_batch_(new WriteBatch),
       bg_compaction_scheduled_(false),
       manual_compaction_(NULL) {
-  mem_->Ref();
   has_imm_.Release_Store(NULL);
 
   // Reserve ten files or so for other uses and give the rest to TableCache.
@@ -271,7 +270,7 @@ void DBImpl::DeleteObsoleteFiles() {
   }
 }
 
-Status DBImpl::Recover(VersionEdit* edit) {
+Status DBImpl::Recover(VersionEdit* edit, bool *save_manifest) {
   mutex_.AssertHeld();
 
   // Ignore error from CreateDir since the creation of the DB is
@@ -301,66 +300,69 @@ Status DBImpl::Recover(VersionEdit* edit) {
     }
   }
 
-  s = versions_->Recover();
-  if (s.ok()) {
-    SequenceNumber max_sequence(0);
-
-    // Recover from all newer log files than the ones named in the
-    // descriptor (new log files may have been added by the previous
-    // incarnation without registering them in the descriptor).
-    //
-    // Note that PrevLogNumber() is no longer used, but we pay
-    // attention to it in case we are recovering a database
-    // produced by an older version of leveldb.
-    const uint64_t min_log = versions_->LogNumber();
-    const uint64_t prev_log = versions_->PrevLogNumber();
-    std::vector<std::string> filenames;
-    s = env_->GetChildren(dbname_, &filenames);
+  s = versions_->Recover(save_manifest);
+  if (!s.ok()) {
+    return s;
+  }
+  SequenceNumber max_sequence(0);
+
+  // Recover from all newer log files than the ones named in the
+  // descriptor (new log files may have been added by the previous
+  // incarnation without registering them in the descriptor).
+  //
+  // Note that PrevLogNumber() is no longer used, but we pay
+  // attention to it in case we are recovering a database
+  // produced by an older version of leveldb.
+  const uint64_t min_log = versions_->LogNumber();
+  const uint64_t prev_log = versions_->PrevLogNumber();
+  std::vector<std::string> filenames;
+  s = env_->GetChildren(dbname_, &filenames);
+  if (!s.ok()) {
+    return s;
+  }
+  std::set<uint64_t> expected;
+  versions_->AddLiveFiles(&expected);
+  uint64_t number;
+  FileType type;
+  std::vector<uint64_t> logs;
+  for (size_t i = 0; i < filenames.size(); i++) {
+    if (ParseFileName(filenames[i], &number, &type)) {
+      expected.erase(number);
+      if (type == kLogFile && ((number >= min_log) || (number == prev_log)))
+        logs.push_back(number);
+    }
+  }
+  if (!expected.empty()) {
+    char buf[50];
+    snprintf(buf, sizeof(buf), "%d missing files; e.g.",
+             static_cast<int>(expected.size()));
+    return Status::Corruption(buf, TableFileName(dbname_, *(expected.begin())));
+  }
+
+  // Recover in the order in which the logs were generated
+  std::sort(logs.begin(), logs.end());
+  for (size_t i = 0; i < logs.size(); i++) {
+    s = RecoverLogFile(logs[i], (i == logs.size() - 1), save_manifest, edit,
+                       &max_sequence);
     if (!s.ok()) {
       return s;
     }
-    std::set<uint64_t> expected;
-    versions_->AddLiveFiles(&expected);
-    uint64_t number;
-    FileType type;
-    std::vector<uint64_t> logs;
-    for (size_t i = 0; i < filenames.size(); i++) {
-      if (ParseFileName(filenames[i], &number, &type)) {
-        expected.erase(number);
-        if (type == kLogFile && ((number >= min_log) || (number == prev_log)))
-          logs.push_back(number);
-      }
-    }
-    if (!expected.empty()) {
-      char buf[50];
-      snprintf(buf, sizeof(buf), "%d missing files; e.g.",
-               static_cast<int>(expected.size()));
-      return Status::Corruption(buf, TableFileName(dbname_, *(expected.begin())));
-    }
-
-    // Recover in the order in which the logs were generated
-    std::sort(logs.begin(), logs.end());
-    for (size_t i = 0; i < logs.size(); i++) {
-      s = RecoverLogFile(logs[i], edit, &max_sequence);
 
-      // The previous incarnation may not have written any MANIFEST
-      // records after allocating this log number.  So we manually
-      // update the file number allocation counter in VersionSet.
-      versions_->MarkFileNumberUsed(logs[i]);
-    }
+    // The previous incarnation may not have written any MANIFEST
+    // records after allocating this log number.  So we manually
+    // update the file number allocation counter in VersionSet.
+    versions_->MarkFileNumberUsed(logs[i]);
+  }
 
-    if (s.ok()) {
-      if (versions_->LastSequence() < max_sequence) {
-        versions_->SetLastSequence(max_sequence);
-      }
-    }
+  if (versions_->LastSequence() < max_sequence) {
+    versions_->SetLastSequence(max_sequence);
   }
 
-  return s;
+  return Status::OK();
 }
 
-Status DBImpl::RecoverLogFile(uint64_t log_number,
-                              VersionEdit* edit,
+Status DBImpl::RecoverLogFile(uint64_t log_number, bool last_log,
+                              bool* save_manifest, VersionEdit* edit,
                               SequenceNumber* max_sequence) {
   struct LogReporter : public log::Reader::Reporter {
     Env* env;
@@ -405,6 +407,7 @@ Status DBImpl::RecoverLogFile(uint64_t log_number,
   std::string scratch;
   Slice record;
   WriteBatch batch;
+  int compactions = 0;
   MemTable* mem = NULL;
   while (reader.ReadRecord(&record, &scratch) &&
          status.ok()) {
@@ -432,25 +435,52 @@ Status DBImpl::RecoverLogFile(uint64_t log_number,
     }
 
     if (mem->ApproximateMemoryUsage() > options_.write_buffer_size) {
+      compactions++;
+      *save_manifest = true;
       status = WriteLevel0Table(mem, edit, NULL);
+      mem->Unref();
+      mem = NULL;
       if (!status.ok()) {
         // Reflect errors immediately so that conditions like full
         // file-systems cause the DB::Open() to fail.
         break;
       }
-      mem->Unref();
-      mem = NULL;
     }
   }
 
-  if (status.ok() && mem != NULL) {
-    status = WriteLevel0Table(mem, edit, NULL);
-    // Reflect errors immediately so that conditions like full
-    // file-systems cause the DB::Open() to fail.
+  delete file;
+
+  // See if we should keep reusing the last log file.
+  if (status.ok() && options_.reuse_logs && last_log && compactions == 0) {
+    assert(logfile_ == NULL);
+    assert(log_ == NULL);
+    assert(mem_ == NULL);
+    uint64_t lfile_size;
+    if (env_->GetFileSize(fname, &lfile_size).ok() &&
+        env_->NewAppendableFile(fname, &logfile_).ok()) {
+      Log(options_.info_log, "Reusing old log %s \n", fname.c_str());
+      log_ = new log::Writer(logfile_, lfile_size);
+      logfile_number_ = log_number;
+      if (mem != NULL) {
+        mem_ = mem;
+        mem = NULL;
+      } else {
+        // mem can be NULL if lognum exists but was empty.
+        mem_ = new MemTable(internal_comparator_);
+        mem_->Ref();
+      }
+    }
+  }
+
+  if (mem != NULL) {
+    // mem did not get reused; compact it.
+    if (status.ok()) {
+      *save_manifest = true;
+      status = WriteLevel0Table(mem, edit, NULL);
+    }
+    mem->Unref();
   }
 
-  if (mem != NULL) mem->Unref();
-  delete file;
   return status;
 }
 
@@ -821,8 +851,9 @@ Status DBImpl::FinishCompactionOutputFile(CompactionState* compact,
     delete iter;
     if (s.ok()) {
       Log(options_.info_log,
-          "Generated table #%llu: %lld keys, %lld bytes",
+          "Generated table #%llu@%d: %lld keys, %lld bytes",
           (unsigned long long) output_number,
+          compact->compaction->level(),
           (unsigned long long) current_entries,
           (unsigned long long) current_bytes);
     }
@@ -1395,6 +1426,19 @@ bool DBImpl::GetProperty(const Slice& property, std::string* value) {
   } else if (in == "sstables") {
     *value = versions_->current()->DebugString();
     return true;
+  } else if (in == "approximate-memory-usage") {
+    size_t total_usage = options_.block_cache->TotalCharge();
+    if (mem_) {
+      total_usage += mem_->ApproximateMemoryUsage();
+    }
+    if (imm_) {
+      total_usage += imm_->ApproximateMemoryUsage();
+    }
+    char buf[50];
+    snprintf(buf, sizeof(buf), "%llu",
+             static_cast<unsigned long long>(total_usage));
+    value->append(buf);
+    return true;
   }
 
   return false;
@@ -1449,8 +1493,11 @@ Status DB::Open(const Options& options, const std::string& dbname,
   DBImpl* impl = new DBImpl(options, dbname);
   impl->mutex_.Lock();
   VersionEdit edit;
-  Status s = impl->Recover(&edit); // Handles create_if_missing, error_if_exists
-  if (s.ok()) {
+  // Recover handles create_if_missing, error_if_exists
+  bool save_manifest = false;
+  Status s = impl->Recover(&edit, &save_manifest);
+  if (s.ok() && impl->mem_ == NULL) {
+    // Create new log and a corresponding memtable.
     uint64_t new_log_number = impl->versions_->NewFileNumber();
     WritableFile* lfile;
     s = options.env->NewWritableFile(LogFileName(dbname, new_log_number),
@@ -1460,15 +1507,22 @@ Status DB::Open(const Options& options, const std::string& dbname,
       impl->logfile_ = lfile;
       impl->logfile_number_ = new_log_number;
       impl->log_ = new log::Writer(lfile);
-      s = impl->versions_->LogAndApply(&edit, &impl->mutex_);
-    }
-    if (s.ok()) {
-      impl->DeleteObsoleteFiles();
-      impl->MaybeScheduleCompaction();
+      impl->mem_ = new MemTable(impl->internal_comparator_);
+      impl->mem_->Ref();
     }
   }
+  if (s.ok() && save_manifest) {
+    edit.SetPrevLogNumber(0);  // No older logs needed after recovery.
+    edit.SetLogNumber(impl->logfile_number_);
+    s = impl->versions_->LogAndApply(&edit, &impl->mutex_);
+  }
+  if (s.ok()) {
+    impl->DeleteObsoleteFiles();
+    impl->MaybeScheduleCompaction();
+  }
   impl->mutex_.Unlock();
   if (s.ok()) {
+    assert(impl->mem_ != NULL);
     *dbptr = impl;
   } else {
     delete impl;
diff --git a/db/db_impl.h b/db/db_impl.h
index cfc998164af60..8ff323e728799 100644
--- a/db/db_impl.h
+++ b/db/db_impl.h
@@ -78,7 +78,8 @@ class DBImpl : public DB {
   // Recover the descriptor from persistent storage.  May do a significant
   // amount of work to recover recently logged updates.  Any changes to
   // be made to the descriptor are added to *edit.
-  Status Recover(VersionEdit* edit) EXCLUSIVE_LOCKS_REQUIRED(mutex_);
+  Status Recover(VersionEdit* edit, bool* save_manifest)
+      EXCLUSIVE_LOCKS_REQUIRED(mutex_);
 
   void MaybeIgnoreError(Status* s) const;
 
@@ -90,9 +91,8 @@ class DBImpl : public DB {
   // Errors are recorded in bg_error_.
   void CompactMemTable() EXCLUSIVE_LOCKS_REQUIRED(mutex_);
 
-  Status RecoverLogFile(uint64_t log_number,
-                        VersionEdit* edit,
-                        SequenceNumber* max_sequence)
+  Status RecoverLogFile(uint64_t log_number, bool last_log, bool* save_manifest,
+                        VersionEdit* edit, SequenceNumber* max_sequence)
       EXCLUSIVE_LOCKS_REQUIRED(mutex_);
 
   Status WriteLevel0Table(MemTable* mem, VersionEdit* edit, Version* base)
diff --git a/db/db_test.cc b/db/db_test.cc
index 0fed9137d5ff8..a0b08bc19c651 100644
--- a/db/db_test.cc
+++ b/db/db_test.cc
@@ -193,6 +193,7 @@ class DBTest {
   // Sequence of option configurations to try
   enum OptionConfig {
     kDefault,
+    kReuse,
     kFilter,
     kUncompressed,
     kEnd
@@ -237,7 +238,11 @@ class DBTest {
   // Return the current option configuration.
   Options CurrentOptions() {
     Options options;
+    options.reuse_logs = false;
     switch (option_config_) {
+      case kReuse:
+        options.reuse_logs = true;
+        break;
       case kFilter:
         options.filter_policy = filter_policy_;
         break;
@@ -558,6 +563,17 @@ TEST(DBTest, GetFromVersions) {
   } while (ChangeOptions());
 }
 
+TEST(DBTest, GetMemUsage) {
+  do {
+    ASSERT_OK(Put("foo", "v1"));
+    std::string val;
+    ASSERT_TRUE(db_->GetProperty("leveldb.approximate-memory-usage", &val));
+    int mem_usage = atoi(val.c_str());
+    ASSERT_GT(mem_usage, 0);
+    ASSERT_LT(mem_usage, 5*1024*1024);
+  } while (ChangeOptions());
+}
+
 TEST(DBTest, GetSnapshot) {
   do {
     // Try with both a short key and a long key
@@ -1080,6 +1096,14 @@ TEST(DBTest, ApproximateSizes) {
     // 0 because GetApproximateSizes() does not account for memtable space
     ASSERT_TRUE(Between(Size("", Key(50)), 0, 0));
 
+    if (options.reuse_logs) {
+      // Recovery will reuse memtable, and GetApproximateSizes() does not
+      // account for memtable usage;
+      Reopen(&options);
+      ASSERT_TRUE(Between(Size("", Key(50)), 0, 0));
+      continue;
+    }
+
     // Check sizes across recovery by reopening a few times
     for (int run = 0; run < 3; run++) {
       Reopen(&options);
@@ -1123,6 +1147,11 @@ TEST(DBTest, ApproximateSizes_MixOfSmallAndLarge) {
     ASSERT_OK(Put(Key(6), RandomString(&rnd, 300000)));
     ASSERT_OK(Put(Key(7), RandomString(&rnd, 10000)));
 
+    if (options.reuse_logs) {
+      // Need to force a memtable compaction since recovery does not do so.
+      ASSERT_OK(dbfull()->TEST_CompactMemTable());
+    }
+
     // Check sizes across recovery by reopening a few times
     for (int run = 0; run < 3; run++) {
       Reopen(&options);
@@ -2084,7 +2113,8 @@ void BM_LogAndApply(int iters, int num_base_files) {
   InternalKeyComparator cmp(BytewiseComparator());
   Options options;
   VersionSet vset(dbname, &options, NULL, &cmp);
-  ASSERT_OK(vset.Recover());
+  bool save_manifest;
+  ASSERT_OK(vset.Recover(&save_manifest));
   VersionEdit vbase;
   uint64_t fnum = 1;
   for (int i = 0; i < num_base_files; i++) {
diff --git a/db/fault_injection_test.cc b/db/fault_injection_test.cc
new file mode 100644
index 0000000000000..875dfe81eeab3
--- /dev/null
+++ b/db/fault_injection_test.cc
@@ -0,0 +1,554 @@
+// Copyright 2014 The LevelDB Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file. See the AUTHORS file for names of contributors.
+
+// This test uses a custom Env to keep track of the state of a filesystem as of
+// the last "sync". It then checks for data loss errors by purposely dropping
+// file data (or entire files) not protected by a "sync".
+
+#include "leveldb/db.h"
+
+#include <map>
+#include <set>
+#include "db/db_impl.h"
+#include "db/filename.h"
+#include "db/log_format.h"
+#include "db/version_set.h"
+#include "leveldb/cache.h"
+#include "leveldb/env.h"
+#include "leveldb/table.h"
+#include "leveldb/write_batch.h"
+#include "util/logging.h"
+#include "util/mutexlock.h"
+#include "util/testharness.h"
+#include "util/testutil.h"
+
+namespace leveldb {
+
+static const int kValueSize = 1000;
+static const int kMaxNumValues = 2000;
+static const size_t kNumIterations = 3;
+
+class FaultInjectionTestEnv;
+
+namespace {
+
+// Assume a filename, and not a directory name like "/foo/bar/"
+static std::string GetDirName(const std::string filename) {
+  size_t found = filename.find_last_of("/\\");
+  if (found == std::string::npos) {
+    return "";
+  } else {
+    return filename.substr(0, found);
+  }
+}
+
+Status SyncDir(const std::string& dir) {
+  // As this is a test it isn't required to *actually* sync this directory.
+  return Status::OK();
+}
+
+// A basic file truncation function suitable for this test.
+Status Truncate(const std::string& filename, uint64_t length) {
+  leveldb::Env* env = leveldb::Env::Default();
+
+  SequentialFile* orig_file;
+  Status s = env->NewSequentialFile(filename, &orig_file);
+  if (!s.ok())
+    return s;
+
+  char* scratch = new char[length];
+  leveldb::Slice result;
+  s = orig_file->Read(length, &result, scratch);
+  delete orig_file;
+  if (s.ok()) {
+    std::string tmp_name = GetDirName(filename) + "/truncate.tmp";
+    WritableFile* tmp_file;
+    s = env->NewWritableFile(tmp_name, &tmp_file);
+    if (s.ok()) {
+      s = tmp_file->Append(result);
+      delete tmp_file;
+      if (s.ok()) {
+        s = env->RenameFile(tmp_name, filename);
+      } else {
+        env->DeleteFile(tmp_name);
+      }
+    }
+  }
+
+  delete[] scratch;
+
+  return s;
+}
+
+struct FileState {
+  std::string filename_;
+  ssize_t pos_;
+  ssize_t pos_at_last_sync_;
+  ssize_t pos_at_last_flush_;
+
+  FileState(const std::string& filename)
+      : filename_(filename),
+        pos_(-1),
+        pos_at_last_sync_(-1),
+        pos_at_last_flush_(-1) { }
+
+  FileState() : pos_(-1), pos_at_last_sync_(-1), pos_at_last_flush_(-1) {}
+
+  bool IsFullySynced() const { return pos_ <= 0 || pos_ == pos_at_last_sync_; }
+
+  Status DropUnsyncedData() const;
+};
+
+}  // anonymous namespace
+
+// A wrapper around WritableFile which informs another Env whenever this file
+// is written to or sync'ed.
+class TestWritableFile : public WritableFile {
+ public:
+  TestWritableFile(const FileState& state,
+                   WritableFile* f,
+                   FaultInjectionTestEnv* env);
+  virtual ~TestWritableFile();
+  virtual Status Append(const Slice& data);
+  virtual Status Close();
+  virtual Status Flush();
+  virtual Status Sync();
+
+ private:
+  FileState state_;
+  WritableFile* target_;
+  bool writable_file_opened_;
+  FaultInjectionTestEnv* env_;
+
+  Status SyncParent();
+};
+
+class FaultInjectionTestEnv : public EnvWrapper {
+ public:
+  FaultInjectionTestEnv() : EnvWrapper(Env::Default()), filesystem_active_(true) {}
+  virtual ~FaultInjectionTestEnv() { }
+  virtual Status NewWritableFile(const std::string& fname,
+                                 WritableFile** result);
+  virtual Status NewAppendableFile(const std::string& fname,
+                                   WritableFile** result);
+  virtual Status DeleteFile(const std::string& f);
+  virtual Status RenameFile(const std::string& s, const std::string& t);
+
+  void WritableFileClosed(const FileState& state);
+  Status DropUnsyncedFileData();
+  Status DeleteFilesCreatedAfterLastDirSync();
+  void DirWasSynced();
+  bool IsFileCreatedSinceLastDirSync(const std::string& filename);
+  void ResetState();
+  void UntrackFile(const std::string& f);
+  // Setting the filesystem to inactive is the test equivalent to simulating a
+  // system reset. Setting to inactive will freeze our saved filesystem state so
+  // that it will stop being recorded. It can then be reset back to the state at
+  // the time of the reset.
+  bool IsFilesystemActive() const { return filesystem_active_; }
+  void SetFilesystemActive(bool active) { filesystem_active_ = active; }
+
+ private:
+  port::Mutex mutex_;
+  std::map<std::string, FileState> db_file_state_;
+  std::set<std::string> new_files_since_last_dir_sync_;
+  bool filesystem_active_;  // Record flushes, syncs, writes
+};
+
+TestWritableFile::TestWritableFile(const FileState& state,
+                                   WritableFile* f,
+                                   FaultInjectionTestEnv* env)
+    : state_(state),
+      target_(f),
+      writable_file_opened_(true),
+      env_(env) {
+  assert(f != NULL);
+}
+
+TestWritableFile::~TestWritableFile() {
+  if (writable_file_opened_) {
+    Close();
+  }
+  delete target_;
+}
+
+Status TestWritableFile::Append(const Slice& data) {
+  Status s = target_->Append(data);
+  if (s.ok() && env_->IsFilesystemActive()) {
+    state_.pos_ += data.size();
+  }
+  return s;
+}
+
+Status TestWritableFile::Close() {
+  writable_file_opened_ = false;
+  Status s = target_->Close();
+  if (s.ok()) {
+    env_->WritableFileClosed(state_);
+  }
+  return s;
+}
+
+Status TestWritableFile::Flush() {
+  Status s = target_->Flush();
+  if (s.ok() && env_->IsFilesystemActive()) {
+    state_.pos_at_last_flush_ = state_.pos_;
+  }
+  return s;
+}
+
+Status TestWritableFile::SyncParent() {
+  Status s = SyncDir(GetDirName(state_.filename_));
+  if (s.ok()) {
+    env_->DirWasSynced();
+  }
+  return s;
+}
+
+Status TestWritableFile::Sync() {
+  if (!env_->IsFilesystemActive()) {
+    return Status::OK();
+  }
+  // Ensure new files referred to by the manifest are in the filesystem.
+  Status s = target_->Sync();
+  if (s.ok()) {
+    state_.pos_at_last_sync_ = state_.pos_;
+  }
+  if (env_->IsFileCreatedSinceLastDirSync(state_.filename_)) {
+    Status ps = SyncParent();
+    if (s.ok() && !ps.ok()) {
+      s = ps;
+    }
+  }
+  return s;
+}
+
+Status FaultInjectionTestEnv::NewWritableFile(const std::string& fname,
+                                              WritableFile** result) {
+  WritableFile* actual_writable_file;
+  Status s = target()->NewWritableFile(fname, &actual_writable_file);
+  if (s.ok()) {
+    FileState state(fname);
+    state.pos_ = 0;
+    *result = new TestWritableFile(state, actual_writable_file, this);
+    // NewWritableFile doesn't append to files, so if the same file is
+    // opened again then it will be truncated - so forget our saved
+    // state.
+    UntrackFile(fname);
+    MutexLock l(&mutex_);
+    new_files_since_last_dir_sync_.insert(fname);
+  }
+  return s;
+}
+
+Status FaultInjectionTestEnv::NewAppendableFile(const std::string& fname,
+                                                WritableFile** result) {
+  WritableFile* actual_writable_file;
+  Status s = target()->NewAppendableFile(fname, &actual_writable_file);
+  if (s.ok()) {
+    FileState state(fname);
+    state.pos_ = 0;
+    {
+      MutexLock l(&mutex_);
+      if (db_file_state_.count(fname) == 0) {
+        new_files_since_last_dir_sync_.insert(fname);
+      } else {
+        state = db_file_state_[fname];
+      }
+    }
+    *result = new TestWritableFile(state, actual_writable_file, this);
+  }
+  return s;
+}
+
+Status FaultInjectionTestEnv::DropUnsyncedFileData() {
+  Status s;
+  MutexLock l(&mutex_);
+  for (std::map<std::string, FileState>::const_iterator it =
+           db_file_state_.begin();
+       s.ok() && it != db_file_state_.end(); ++it) {
+    const FileState& state = it->second;
+    if (!state.IsFullySynced()) {
+      s = state.DropUnsyncedData();
+    }
+  }
+  return s;
+}
+
+void FaultInjectionTestEnv::DirWasSynced() {
+  MutexLock l(&mutex_);
+  new_files_since_last_dir_sync_.clear();
+}
+
+bool FaultInjectionTestEnv::IsFileCreatedSinceLastDirSync(
+    const std::string& filename) {
+  MutexLock l(&mutex_);
+  return new_files_since_last_dir_sync_.find(filename) !=
+         new_files_since_last_dir_sync_.end();
+}
+
+void FaultInjectionTestEnv::UntrackFile(const std::string& f) {
+  MutexLock l(&mutex_);
+  db_file_state_.erase(f);
+  new_files_since_last_dir_sync_.erase(f);
+}
+
+Status FaultInjectionTestEnv::DeleteFile(const std::string& f) {
+  Status s = EnvWrapper::DeleteFile(f);
+  ASSERT_OK(s);
+  if (s.ok()) {
+    UntrackFile(f);
+  }
+  return s;
+}
+
+Status FaultInjectionTestEnv::RenameFile(const std::string& s,
+                                         const std::string& t) {
+  Status ret = EnvWrapper::RenameFile(s, t);
+
+  if (ret.ok()) {
+    MutexLock l(&mutex_);
+    if (db_file_state_.find(s) != db_file_state_.end()) {
+      db_file_state_[t] = db_file_state_[s];
+      db_file_state_.erase(s);
+    }
+
+    if (new_files_since_last_dir_sync_.erase(s) != 0) {
+      assert(new_files_since_last_dir_sync_.find(t) ==
+             new_files_since_last_dir_sync_.end());
+      new_files_since_last_dir_sync_.insert(t);
+    }
+  }
+
+  return ret;
+}
+
+void FaultInjectionTestEnv::ResetState() {
+  // Since we are not destroying the database, the existing files
+  // should keep their recorded synced/flushed state. Therefore
+  // we do not reset db_file_state_ and new_files_since_last_dir_sync_.
+  MutexLock l(&mutex_);
+  SetFilesystemActive(true);
+}
+
+Status FaultInjectionTestEnv::DeleteFilesCreatedAfterLastDirSync() {
+  // Because DeleteFile access this container make a copy to avoid deadlock
+  mutex_.Lock();
+  std::set<std::string> new_files(new_files_since_last_dir_sync_.begin(),
+                                  new_files_since_last_dir_sync_.end());
+  mutex_.Unlock();
+  Status s;
+  std::set<std::string>::const_iterator it;
+  for (it = new_files.begin(); s.ok() && it != new_files.end(); ++it) {
+    s = DeleteFile(*it);
+  }
+  return s;
+}
+
+void FaultInjectionTestEnv::WritableFileClosed(const FileState& state) {
+  MutexLock l(&mutex_);
+  db_file_state_[state.filename_] = state;
+}
+
+Status FileState::DropUnsyncedData() const {
+  ssize_t sync_pos = pos_at_last_sync_ == -1 ? 0 : pos_at_last_sync_;
+  return Truncate(filename_, sync_pos);
+}
+
+class FaultInjectionTest {
+ public:
+  enum ExpectedVerifResult { VAL_EXPECT_NO_ERROR, VAL_EXPECT_ERROR };
+  enum ResetMethod { RESET_DROP_UNSYNCED_DATA, RESET_DELETE_UNSYNCED_FILES };
+
+  FaultInjectionTestEnv* env_;
+  std::string dbname_;
+  Cache* tiny_cache_;
+  Options options_;
+  DB* db_;
+
+  FaultInjectionTest()
+      : env_(new FaultInjectionTestEnv),
+        tiny_cache_(NewLRUCache(100)),
+        db_(NULL) {
+    dbname_ = test::TmpDir() + "/fault_test";
+    DestroyDB(dbname_, Options());  // Destroy any db from earlier run
+    options_.reuse_logs = true;
+    options_.env = env_;
+    options_.paranoid_checks = true;
+    options_.block_cache = tiny_cache_;
+    options_.create_if_missing = true;
+  }
+
+  ~FaultInjectionTest() {
+    CloseDB();
+    DestroyDB(dbname_, Options());
+    delete tiny_cache_;
+    delete env_;
+  }
+
+  void ReuseLogs(bool reuse) {
+    options_.reuse_logs = reuse;
+  }
+
+  void Build(int start_idx, int num_vals) {
+    std::string key_space, value_space;
+    WriteBatch batch;
+    for (int i = start_idx; i < start_idx + num_vals; i++) {
+      Slice key = Key(i, &key_space);
+      batch.Clear();
+      batch.Put(key, Value(i, &value_space));
+      WriteOptions options;
+      ASSERT_OK(db_->Write(options, &batch));
+    }
+  }
+
+  Status ReadValue(int i, std::string* val) const {
+    std::string key_space, value_space;
+    Slice key = Key(i, &key_space);
+    Value(i, &value_space);
+    ReadOptions options;
+    return db_->Get(options, key, val);
+  }
+
+  Status Verify(int start_idx, int num_vals,
+                ExpectedVerifResult expected) const {
+    std::string val;
+    std::string value_space;
+    Status s;
+    for (int i = start_idx; i < start_idx + num_vals && s.ok(); i++) {
+      Value(i, &value_space);
+      s = ReadValue(i, &val);
+      if (expected == VAL_EXPECT_NO_ERROR) {
+        if (s.ok()) {
+          ASSERT_EQ(value_space, val);
+        }
+      } else if (s.ok()) {
+        fprintf(stderr, "Expected an error at %d, but was OK\n", i);
+        s = Status::IOError(dbname_, "Expected value error:");
+      } else {
+        s = Status::OK();  // An expected error
+      }
+    }
+    return s;
+  }
+
+  // Return the ith key
+  Slice Key(int i, std::string* storage) const {
+    char buf[100];
+    snprintf(buf, sizeof(buf), "%016d", i);
+    storage->assign(buf, strlen(buf));
+    return Slice(*storage);
+  }
+
+  // Return the value to associate with the specified key
+  Slice Value(int k, std::string* storage) const {
+    Random r(k);
+    return test::RandomString(&r, kValueSize, storage);
+  }
+
+  Status OpenDB() {
+    delete db_;
+    db_ = NULL;
+    env_->ResetState();
+    return DB::Open(options_, dbname_, &db_);
+  }
+
+  void CloseDB() {
+    delete db_;
+    db_ = NULL;
+  }
+
+  void DeleteAllData() {
+    Iterator* iter = db_->NewIterator(ReadOptions());
+    WriteOptions options;
+    for (iter->SeekToFirst(); iter->Valid(); iter->Next()) {
+      ASSERT_OK(db_->Delete(WriteOptions(), iter->key()));
+    }
+
+    delete iter;
+  }
+
+  void ResetDBState(ResetMethod reset_method) {
+    switch (reset_method) {
+      case RESET_DROP_UNSYNCED_DATA:
+        ASSERT_OK(env_->DropUnsyncedFileData());
+        break;
+      case RESET_DELETE_UNSYNCED_FILES:
+        ASSERT_OK(env_->DeleteFilesCreatedAfterLastDirSync());
+        break;
+      default:
+        assert(false);
+    }
+  }
+
+  void PartialCompactTestPreFault(int num_pre_sync, int num_post_sync) {
+    DeleteAllData();
+    Build(0, num_pre_sync);
+    db_->CompactRange(NULL, NULL);
+    Build(num_pre_sync, num_post_sync);
+  }
+
+  void PartialCompactTestReopenWithFault(ResetMethod reset_method,
+                                         int num_pre_sync,
+                                         int num_post_sync) {
+    env_->SetFilesystemActive(false);
+    CloseDB();
+    ResetDBState(reset_method);
+    ASSERT_OK(OpenDB());
+    ASSERT_OK(Verify(0, num_pre_sync, FaultInjectionTest::VAL_EXPECT_NO_ERROR));
+    ASSERT_OK(Verify(num_pre_sync, num_post_sync, FaultInjectionTest::VAL_EXPECT_ERROR));
+  }
+
+  void NoWriteTestPreFault() {
+  }
+
+  void NoWriteTestReopenWithFault(ResetMethod reset_method) {
+    CloseDB();
+    ResetDBState(reset_method);
+    ASSERT_OK(OpenDB());
+  }
+
+  void DoTest() {
+    Random rnd(0);
+    ASSERT_OK(OpenDB());
+    for (size_t idx = 0; idx < kNumIterations; idx++) {
+      int num_pre_sync = rnd.Uniform(kMaxNumValues);
+      int num_post_sync = rnd.Uniform(kMaxNumValues);
+
+      PartialCompactTestPreFault(num_pre_sync, num_post_sync);
+      PartialCompactTestReopenWithFault(RESET_DROP_UNSYNCED_DATA,
+                                        num_pre_sync,
+                                        num_post_sync);
+
+      NoWriteTestPreFault();
+      NoWriteTestReopenWithFault(RESET_DROP_UNSYNCED_DATA);
+
+      PartialCompactTestPreFault(num_pre_sync, num_post_sync);
+      // No new files created so we expect all values since no files will be
+      // dropped.
+      PartialCompactTestReopenWithFault(RESET_DELETE_UNSYNCED_FILES,
+                                        num_pre_sync + num_post_sync,
+                                        0);
+
+      NoWriteTestPreFault();
+      NoWriteTestReopenWithFault(RESET_DELETE_UNSYNCED_FILES);
+    }
+  }
+};
+
+TEST(FaultInjectionTest, FaultTestNoLogReuse) {
+  ReuseLogs(false);
+  DoTest();
+}
+
+TEST(FaultInjectionTest, FaultTestWithLogReuse) {
+  ReuseLogs(true);
+  DoTest();
+}
+
+}  // namespace leveldb
+
+int main(int argc, char** argv) {
+  return leveldb::test::RunAllTests();
+}
diff --git a/db/leveldb_main.cc b/db/leveldbutil.cc
similarity index 100%
rename from db/leveldb_main.cc
rename to db/leveldbutil.cc
diff --git a/db/log_reader.cc b/db/log_reader.cc
index e44b66c85bf7c..a6d304545d828 100644
--- a/db/log_reader.cc
+++ b/db/log_reader.cc
@@ -25,7 +25,8 @@ Reader::Reader(SequentialFile* file, Reporter* reporter, bool checksum,
       eof_(false),
       last_record_offset_(0),
       end_of_buffer_offset_(0),
-      initial_offset_(initial_offset) {
+      initial_offset_(initial_offset),
+      resyncing_(initial_offset > 0) {
 }
 
 Reader::~Reader() {
@@ -72,8 +73,25 @@ bool Reader::ReadRecord(Slice* record, std::string* scratch) {
 
   Slice fragment;
   while (true) {
-    uint64_t physical_record_offset = end_of_buffer_offset_ - buffer_.size();
     const unsigned int record_type = ReadPhysicalRecord(&fragment);
+
+    // ReadPhysicalRecord may have only had an empty trailer remaining in its
+    // internal buffer. Calculate the offset of the next physical record now
+    // that it has returned, properly accounting for its header size.
+    uint64_t physical_record_offset =
+        end_of_buffer_offset_ - buffer_.size() - kHeaderSize - fragment.size();
+
+    if (resyncing_) {
+      if (record_type == kMiddleType) {
+        continue;
+      } else if (record_type == kLastType) {
+        resyncing_ = false;
+        continue;
+      } else {
+        resyncing_ = false;
+      }
+    }
+
     switch (record_type) {
       case kFullType:
         if (in_fragmented_record) {
diff --git a/db/log_reader.h b/db/log_reader.h
index 6aff7917162b7..8389d61f8f1dd 100644
--- a/db/log_reader.h
+++ b/db/log_reader.h
@@ -73,6 +73,11 @@ class Reader {
   // Offset at which to start looking for the first record to return
   uint64_t const initial_offset_;
 
+  // True if we are resynchronizing after a seek (initial_offset_ > 0). In
+  // particular, a run of kMiddleType and kLastType records can be silently
+  // skipped in this mode
+  bool resyncing_;
+
   // Extend record types with the following special values
   enum {
     kEof = kMaxRecordType + 1,
diff --git a/db/log_test.cc b/db/log_test.cc
index dcf056265297e..48a5928657e0f 100644
--- a/db/log_test.cc
+++ b/db/log_test.cc
@@ -79,7 +79,7 @@ class LogTest {
     virtual Status Skip(uint64_t n) {
       if (n > contents_.size()) {
         contents_.clear();
-        return Status::NotFound("in-memory file skipepd past end");
+        return Status::NotFound("in-memory file skipped past end");
       }
 
       contents_.remove_prefix(n);
@@ -104,23 +104,34 @@ class LogTest {
   StringSource source_;
   ReportCollector report_;
   bool reading_;
-  Writer writer_;
-  Reader reader_;
+  Writer* writer_;
+  Reader* reader_;
 
   // Record metadata for testing initial offset functionality
   static size_t initial_offset_record_sizes_[];
   static uint64_t initial_offset_last_record_offsets_[];
+  static int num_initial_offset_records_;
 
  public:
   LogTest() : reading_(false),
-              writer_(&dest_),
-              reader_(&source_, &report_, true/*checksum*/,
-                      0/*initial_offset*/) {
+              writer_(new Writer(&dest_)),
+              reader_(new Reader(&source_, &report_, true/*checksum*/,
+                      0/*initial_offset*/)) {
+  }
+
+  ~LogTest() {
+    delete writer_;
+    delete reader_;
+  }
+
+  void ReopenForAppend() {
+    delete writer_;
+    writer_ = new Writer(&dest_, dest_.contents_.size());
   }
 
   void Write(const std::string& msg) {
     ASSERT_TRUE(!reading_) << "Write() after starting to read";
-    writer_.AddRecord(Slice(msg));
+    writer_->AddRecord(Slice(msg));
   }
 
   size_t WrittenBytes() const {
@@ -134,7 +145,7 @@ class LogTest {
     }
     std::string scratch;
     Slice record;
-    if (reader_.ReadRecord(&record, &scratch)) {
+    if (reader_->ReadRecord(&record, &scratch)) {
       return record.ToString();
     } else {
       return "EOF";
@@ -182,13 +193,18 @@ class LogTest {
   }
 
   void WriteInitialOffsetLog() {
-    for (int i = 0; i < 4; i++) {
+    for (int i = 0; i < num_initial_offset_records_; i++) {
       std::string record(initial_offset_record_sizes_[i],
                          static_cast<char>('a' + i));
       Write(record);
     }
   }
 
+  void StartReadingAt(uint64_t initial_offset) {
+    delete reader_;
+    reader_ = new Reader(&source_, &report_, true/*checksum*/, initial_offset);
+  }
+
   void CheckOffsetPastEndReturnsNoRecords(uint64_t offset_past_end) {
     WriteInitialOffsetLog();
     reading_ = true;
@@ -208,32 +224,48 @@ class LogTest {
     source_.contents_ = Slice(dest_.contents_);
     Reader* offset_reader = new Reader(&source_, &report_, true/*checksum*/,
                                        initial_offset);
-    Slice record;
-    std::string scratch;
-    ASSERT_TRUE(offset_reader->ReadRecord(&record, &scratch));
-    ASSERT_EQ(initial_offset_record_sizes_[expected_record_offset],
-              record.size());
-    ASSERT_EQ(initial_offset_last_record_offsets_[expected_record_offset],
-              offset_reader->LastRecordOffset());
-    ASSERT_EQ((char)('a' + expected_record_offset), record.data()[0]);
+
+    // Read all records from expected_record_offset through the last one.
+    ASSERT_LT(expected_record_offset, num_initial_offset_records_);
+    for (; expected_record_offset < num_initial_offset_records_;
+         ++expected_record_offset) {
+      Slice record;
+      std::string scratch;
+      ASSERT_TRUE(offset_reader->ReadRecord(&record, &scratch));
+      ASSERT_EQ(initial_offset_record_sizes_[expected_record_offset],
+                record.size());
+      ASSERT_EQ(initial_offset_last_record_offsets_[expected_record_offset],
+                offset_reader->LastRecordOffset());
+      ASSERT_EQ((char)('a' + expected_record_offset), record.data()[0]);
+    }
     delete offset_reader;
   }
-
 };
 
 size_t LogTest::initial_offset_record_sizes_[] =
     {10000,  // Two sizable records in first block
      10000,
      2 * log::kBlockSize - 1000,  // Span three blocks
-     1};
+     1,
+     13716,  // Consume all but two bytes of block 3.
+     log::kBlockSize - kHeaderSize, // Consume the entirety of block 4.
+    };
 
 uint64_t LogTest::initial_offset_last_record_offsets_[] =
     {0,
      kHeaderSize + 10000,
      2 * (kHeaderSize + 10000),
      2 * (kHeaderSize + 10000) +
-         (2 * log::kBlockSize - 1000) + 3 * kHeaderSize};
+         (2 * log::kBlockSize - 1000) + 3 * kHeaderSize,
+     2 * (kHeaderSize + 10000) +
+         (2 * log::kBlockSize - 1000) + 3 * kHeaderSize
+         + kHeaderSize + 1,
+     3 * log::kBlockSize,
+    };
 
+// LogTest::initial_offset_last_record_offsets_ must be defined before this.
+int LogTest::num_initial_offset_records_ =
+    sizeof(LogTest::initial_offset_last_record_offsets_)/sizeof(uint64_t);
 
 TEST(LogTest, Empty) {
   ASSERT_EQ("EOF", Read());
@@ -318,6 +350,15 @@ TEST(LogTest, AlignedEof) {
   ASSERT_EQ("EOF", Read());
 }
 
+TEST(LogTest, OpenForAppend) {
+  Write("hello");
+  ReopenForAppend();
+  Write("world");
+  ASSERT_EQ("hello", Read());
+  ASSERT_EQ("world", Read());
+  ASSERT_EQ("EOF", Read());
+}
+
 TEST(LogTest, RandomRead) {
   const int N = 500;
   Random write_rnd(301);
@@ -445,6 +486,22 @@ TEST(LogTest, PartialLastIsIgnored) {
   ASSERT_EQ(0, DroppedBytes());
 }
 
+TEST(LogTest, SkipIntoMultiRecord) {
+  // Consider a fragmented record:
+  //    first(R1), middle(R1), last(R1), first(R2)
+  // If initial_offset points to a record after first(R1) but before first(R2)
+  // incomplete fragment errors are not actual errors, and must be suppressed
+  // until a new first or full record is encountered.
+  Write(BigString("foo", 3*kBlockSize));
+  Write("correct");
+  StartReadingAt(kBlockSize);
+
+  ASSERT_EQ("correct", Read());
+  ASSERT_EQ("", ReportMessage());
+  ASSERT_EQ(0, DroppedBytes());
+  ASSERT_EQ("EOF", Read());
+}
+
 TEST(LogTest, ErrorJoinsRecords) {
   // Consider two fragmented records:
   //    first(R1) last(R1) first(R2) last(R2)
@@ -514,6 +571,10 @@ TEST(LogTest, ReadFourthStart) {
       3);
 }
 
+TEST(LogTest, ReadInitialOffsetIntoBlockPadding) {
+  CheckInitialOffsetRecord(3 * log::kBlockSize - 3, 5);
+}
+
 TEST(LogTest, ReadEnd) {
   CheckOffsetPastEndReturnsNoRecords(0);
 }
diff --git a/db/log_writer.cc b/db/log_writer.cc
index 2da99ac088663..74a03270da850 100644
--- a/db/log_writer.cc
+++ b/db/log_writer.cc
@@ -12,15 +12,24 @@
 namespace leveldb {
 namespace log {
 
-Writer::Writer(WritableFile* dest)
-    : dest_(dest),
-      block_offset_(0) {
+static void InitTypeCrc(uint32_t* type_crc) {
   for (int i = 0; i <= kMaxRecordType; i++) {
     char t = static_cast<char>(i);
-    type_crc_[i] = crc32c::Value(&t, 1);
+    type_crc[i] = crc32c::Value(&t, 1);
   }
 }
 
+Writer::Writer(WritableFile* dest)
+    : dest_(dest),
+      block_offset_(0) {
+  InitTypeCrc(type_crc_);
+}
+
+Writer::Writer(WritableFile* dest, uint64_t dest_length)
+    : dest_(dest), block_offset_(dest_length % kBlockSize) {
+  InitTypeCrc(type_crc_);
+}
+
 Writer::~Writer() {
 }
 
diff --git a/db/log_writer.h b/db/log_writer.h
index a3a954d967325..9e7cc4705b014 100644
--- a/db/log_writer.h
+++ b/db/log_writer.h
@@ -22,6 +22,12 @@ class Writer {
   // "*dest" must be initially empty.
   // "*dest" must remain live while this Writer is in use.
   explicit Writer(WritableFile* dest);
+
+  // Create a writer that will append data to "*dest".
+  // "*dest" must have initial length "dest_length".
+  // "*dest" must remain live while this Writer is in use.
+  Writer(WritableFile* dest, uint64_t dest_length);
+
   ~Writer();
 
   Status AddRecord(const Slice& slice);
diff --git a/db/memtable.h b/db/memtable.h
index 92e90bb099f33..9f41567cde23d 100644
--- a/db/memtable.h
+++ b/db/memtable.h
@@ -36,10 +36,7 @@ class MemTable {
   }
 
   // Returns an estimate of the number of bytes of data in use by this
-  // data structure.
-  //
-  // REQUIRES: external synchronization to prevent simultaneous
-  // operations on the same MemTable.
+  // data structure. It is safe to call when MemTable is being modified.
   size_t ApproximateMemoryUsage();
 
   // Return an iterator that yields the contents of the memtable.
diff --git a/db/recovery_test.cc b/db/recovery_test.cc
new file mode 100644
index 0000000000000..9596f4288a84e
--- /dev/null
+++ b/db/recovery_test.cc
@@ -0,0 +1,324 @@
+// Copyright (c) 2014 The LevelDB Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file. See the AUTHORS file for names of contributors.
+
+#include "db/db_impl.h"
+#include "db/filename.h"
+#include "db/version_set.h"
+#include "db/write_batch_internal.h"
+#include "leveldb/db.h"
+#include "leveldb/env.h"
+#include "leveldb/write_batch.h"
+#include "util/logging.h"
+#include "util/testharness.h"
+#include "util/testutil.h"
+
+namespace leveldb {
+
+class RecoveryTest {
+ public:
+  RecoveryTest() : env_(Env::Default()), db_(NULL) {
+    dbname_ = test::TmpDir() + "/recovery_test";
+    DestroyDB(dbname_, Options());
+    Open();
+  }
+
+  ~RecoveryTest() {
+    Close();
+    DestroyDB(dbname_, Options());
+  }
+
+  DBImpl* dbfull() const { return reinterpret_cast<DBImpl*>(db_); }
+  Env* env() const { return env_; }
+
+  bool CanAppend() {
+    WritableFile* tmp;
+    Status s = env_->NewAppendableFile(CurrentFileName(dbname_), &tmp);
+    delete tmp;
+    if (s.IsNotSupportedError()) {
+      return false;
+    } else {
+      return true;
+    }
+  }
+
+  void Close() {
+    delete db_;
+    db_ = NULL;
+  }
+
+  void Open(Options* options = NULL) {
+    Close();
+    Options opts;
+    if (options != NULL) {
+      opts = *options;
+    } else {
+      opts.reuse_logs = true;  // TODO(sanjay): test both ways
+      opts.create_if_missing = true;
+    }
+    if (opts.env == NULL) {
+      opts.env = env_;
+    }
+    ASSERT_OK(DB::Open(opts, dbname_, &db_));
+    ASSERT_EQ(1, NumLogs());
+  }
+
+  Status Put(const std::string& k, const std::string& v) {
+    return db_->Put(WriteOptions(), k, v);
+  }
+
+  std::string Get(const std::string& k, const Snapshot* snapshot = NULL) {
+    std::string result;
+    Status s = db_->Get(ReadOptions(), k, &result);
+    if (s.IsNotFound()) {
+      result = "NOT_FOUND";
+    } else if (!s.ok()) {
+      result = s.ToString();
+    }
+    return result;
+  }
+
+  std::string ManifestFileName() {
+    std::string current;
+    ASSERT_OK(ReadFileToString(env_, CurrentFileName(dbname_), &current));
+    size_t len = current.size();
+    if (len > 0 && current[len-1] == '\n') {
+      current.resize(len - 1);
+    }
+    return dbname_ + "/" + current;
+  }
+
+  std::string LogName(uint64_t number) {
+    return LogFileName(dbname_, number);
+  }
+
+  size_t DeleteLogFiles() {
+    std::vector<uint64_t> logs = GetFiles(kLogFile);
+    for (size_t i = 0; i < logs.size(); i++) {
+      ASSERT_OK(env_->DeleteFile(LogName(logs[i]))) << LogName(logs[i]);
+    }
+    return logs.size();
+  }
+
+  uint64_t FirstLogFile() {
+    return GetFiles(kLogFile)[0];
+  }
+
+  std::vector<uint64_t> GetFiles(FileType t) {
+    std::vector<std::string> filenames;
+    ASSERT_OK(env_->GetChildren(dbname_, &filenames));
+    std::vector<uint64_t> result;
+    for (size_t i = 0; i < filenames.size(); i++) {
+      uint64_t number;
+      FileType type;
+      if (ParseFileName(filenames[i], &number, &type) && type == t) {
+        result.push_back(number);
+      }
+    }
+    return result;
+  }
+
+  int NumLogs() {
+    return GetFiles(kLogFile).size();
+  }
+
+  int NumTables() {
+    return GetFiles(kTableFile).size();
+  }
+
+  uint64_t FileSize(const std::string& fname) {
+    uint64_t result;
+    ASSERT_OK(env_->GetFileSize(fname, &result)) << fname;
+    return result;
+  }
+
+  void CompactMemTable() {
+    dbfull()->TEST_CompactMemTable();
+  }
+
+  // Directly construct a log file that sets key to val.
+  void MakeLogFile(uint64_t lognum, SequenceNumber seq, Slice key, Slice val) {
+    std::string fname = LogFileName(dbname_, lognum);
+    WritableFile* file;
+    ASSERT_OK(env_->NewWritableFile(fname, &file));
+    log::Writer writer(file);
+    WriteBatch batch;
+    batch.Put(key, val);
+    WriteBatchInternal::SetSequence(&batch, seq);
+    ASSERT_OK(writer.AddRecord(WriteBatchInternal::Contents(&batch)));
+    ASSERT_OK(file->Flush());
+    delete file;
+  }
+
+ private:
+  std::string dbname_;
+  Env* env_;
+  DB* db_;
+};
+
+TEST(RecoveryTest, ManifestReused) {
+  if (!CanAppend()) {
+    fprintf(stderr, "skipping test because env does not support appending\n");
+    return;
+  }
+  ASSERT_OK(Put("foo", "bar"));
+  Close();
+  std::string old_manifest = ManifestFileName();
+  Open();
+  ASSERT_EQ(old_manifest, ManifestFileName());
+  ASSERT_EQ("bar", Get("foo"));
+  Open();
+  ASSERT_EQ(old_manifest, ManifestFileName());
+  ASSERT_EQ("bar", Get("foo"));
+}
+
+TEST(RecoveryTest, LargeManifestCompacted) {
+  if (!CanAppend()) {
+    fprintf(stderr, "skipping test because env does not support appending\n");
+    return;
+  }
+  ASSERT_OK(Put("foo", "bar"));
+  Close();
+  std::string old_manifest = ManifestFileName();
+
+  // Pad with zeroes to make manifest file very big.
+  {
+    uint64_t len = FileSize(old_manifest);
+    WritableFile* file;
+    ASSERT_OK(env()->NewAppendableFile(old_manifest, &file));
+    std::string zeroes(3*1048576 - static_cast<size_t>(len), 0);
+    ASSERT_OK(file->Append(zeroes));
+    ASSERT_OK(file->Flush());
+    delete file;
+  }
+
+  Open();
+  std::string new_manifest = ManifestFileName();
+  ASSERT_NE(old_manifest, new_manifest);
+  ASSERT_GT(10000, FileSize(new_manifest));
+  ASSERT_EQ("bar", Get("foo"));
+
+  Open();
+  ASSERT_EQ(new_manifest, ManifestFileName());
+  ASSERT_EQ("bar", Get("foo"));
+}
+
+TEST(RecoveryTest, NoLogFiles) {
+  ASSERT_OK(Put("foo", "bar"));
+  ASSERT_EQ(1, DeleteLogFiles());
+  Open();
+  ASSERT_EQ("NOT_FOUND", Get("foo"));
+  Open();
+  ASSERT_EQ("NOT_FOUND", Get("foo"));
+}
+
+TEST(RecoveryTest, LogFileReuse) {
+  if (!CanAppend()) {
+    fprintf(stderr, "skipping test because env does not support appending\n");
+    return;
+  }
+  for (int i = 0; i < 2; i++) {
+    ASSERT_OK(Put("foo", "bar"));
+    if (i == 0) {
+      // Compact to ensure current log is empty
+      CompactMemTable();
+    }
+    Close();
+    ASSERT_EQ(1, NumLogs());
+    uint64_t number = FirstLogFile();
+    if (i == 0) {
+      ASSERT_EQ(0, FileSize(LogName(number)));
+    } else {
+      ASSERT_LT(0, FileSize(LogName(number)));
+    }
+    Open();
+    ASSERT_EQ(1, NumLogs());
+    ASSERT_EQ(number, FirstLogFile()) << "did not reuse log file";
+    ASSERT_EQ("bar", Get("foo"));
+    Open();
+    ASSERT_EQ(1, NumLogs());
+    ASSERT_EQ(number, FirstLogFile()) << "did not reuse log file";
+    ASSERT_EQ("bar", Get("foo"));
+  }
+}
+
+TEST(RecoveryTest, MultipleMemTables) {
+  // Make a large log.
+  const int kNum = 1000;
+  for (int i = 0; i < kNum; i++) {
+    char buf[100];
+    snprintf(buf, sizeof(buf), "%050d", i);
+    ASSERT_OK(Put(buf, buf));
+  }
+  ASSERT_EQ(0, NumTables());
+  Close();
+  ASSERT_EQ(0, NumTables());
+  ASSERT_EQ(1, NumLogs());
+  uint64_t old_log_file = FirstLogFile();
+
+  // Force creation of multiple memtables by reducing the write buffer size.
+  Options opt;
+  opt.reuse_logs = true;
+  opt.write_buffer_size = (kNum*100) / 2;
+  Open(&opt);
+  ASSERT_LE(2, NumTables());
+  ASSERT_EQ(1, NumLogs());
+  ASSERT_NE(old_log_file, FirstLogFile()) << "must not reuse log";
+  for (int i = 0; i < kNum; i++) {
+    char buf[100];
+    snprintf(buf, sizeof(buf), "%050d", i);
+    ASSERT_EQ(buf, Get(buf));
+  }
+}
+
+TEST(RecoveryTest, MultipleLogFiles) {
+  ASSERT_OK(Put("foo", "bar"));
+  Close();
+  ASSERT_EQ(1, NumLogs());
+
+  // Make a bunch of uncompacted log files.
+  uint64_t old_log = FirstLogFile();
+  MakeLogFile(old_log+1, 1000, "hello", "world");
+  MakeLogFile(old_log+2, 1001, "hi", "there");
+  MakeLogFile(old_log+3, 1002, "foo", "bar2");
+
+  // Recover and check that all log files were processed.
+  Open();
+  ASSERT_LE(1, NumTables());
+  ASSERT_EQ(1, NumLogs());
+  uint64_t new_log = FirstLogFile();
+  ASSERT_LE(old_log+3, new_log);
+  ASSERT_EQ("bar2", Get("foo"));
+  ASSERT_EQ("world", Get("hello"));
+  ASSERT_EQ("there", Get("hi"));
+
+  // Test that previous recovery produced recoverable state.
+  Open();
+  ASSERT_LE(1, NumTables());
+  ASSERT_EQ(1, NumLogs());
+  if (CanAppend()) {
+    ASSERT_EQ(new_log, FirstLogFile());
+  }
+  ASSERT_EQ("bar2", Get("foo"));
+  ASSERT_EQ("world", Get("hello"));
+  ASSERT_EQ("there", Get("hi"));
+
+  // Check that introducing an older log file does not cause it to be re-read.
+  Close();
+  MakeLogFile(old_log+1, 2000, "hello", "stale write");
+  Open();
+  ASSERT_LE(1, NumTables());
+  ASSERT_EQ(1, NumLogs());
+  if (CanAppend()) {
+    ASSERT_EQ(new_log, FirstLogFile());
+  }
+  ASSERT_EQ("bar2", Get("foo"));
+  ASSERT_EQ("world", Get("hello"));
+  ASSERT_EQ("there", Get("hi"));
+}
+
+}  // namespace leveldb
+
+int main(int argc, char** argv) {
+  return leveldb::test::RunAllTests();
+}
diff --git a/db/skiplist.h b/db/skiplist.h
index ed8b092203b68..8bd77764d8fb3 100644
--- a/db/skiplist.h
+++ b/db/skiplist.h
@@ -1,10 +1,10 @@
-#ifndef STORAGE_LEVELDB_DB_SKIPLIST_H_
-#define STORAGE_LEVELDB_DB_SKIPLIST_H_
-
 // Copyright (c) 2011 The LevelDB Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file. See the AUTHORS file for names of contributors.
-//
+
+#ifndef STORAGE_LEVELDB_DB_SKIPLIST_H_
+#define STORAGE_LEVELDB_DB_SKIPLIST_H_
+
 // Thread safety
 // -------------
 //
diff --git a/db/skiplist_test.cc b/db/skiplist_test.cc
index c78f4b4fb1a0f..aee1461e1b256 100644
--- a/db/skiplist_test.cc
+++ b/db/skiplist_test.cc
@@ -250,7 +250,7 @@ class ConcurrentTest {
         // Note that generation 0 is never inserted, so it is ok if
         // <*,0,*> is missing.
         ASSERT_TRUE((gen(pos) == 0) ||
-                    (gen(pos) > initial_state.Get(key(pos)))
+                    (gen(pos) > static_cast<Key>(initial_state.Get(key(pos))))
                     ) << "key: " << key(pos)
                       << "; gen: " << gen(pos)
                       << "; initgen: "
diff --git a/db/snapshot.h b/db/snapshot.h
index e7f8fd2c37cf8..6ed413c42d4f4 100644
--- a/db/snapshot.h
+++ b/db/snapshot.h
@@ -5,6 +5,7 @@
 #ifndef STORAGE_LEVELDB_DB_SNAPSHOT_H_
 #define STORAGE_LEVELDB_DB_SNAPSHOT_H_
 
+#include "db/dbformat.h"
 #include "leveldb/db.h"
 
 namespace leveldb {
diff --git a/db/version_set.cc b/db/version_set.cc
index aa83df55e4ce1..a5e0f77a6a913 100644
--- a/db/version_set.cc
+++ b/db/version_set.cc
@@ -893,7 +893,7 @@ Status VersionSet::LogAndApply(VersionEdit* edit, port::Mutex* mu) {
   return s;
 }
 
-Status VersionSet::Recover() {
+Status VersionSet::Recover(bool *save_manifest) {
   struct LogReporter : public log::Reader::Reporter {
     Status* status;
     virtual void Corruption(size_t bytes, const Status& s) {
@@ -1003,11 +1003,49 @@ Status VersionSet::Recover() {
     last_sequence_ = last_sequence;
     log_number_ = log_number;
     prev_log_number_ = prev_log_number;
+
+    // See if we can reuse the existing MANIFEST file.
+    if (ReuseManifest(dscname, current)) {
+      // No need to save new manifest
+    } else {
+      *save_manifest = true;
+    }
   }
 
   return s;
 }
 
+bool VersionSet::ReuseManifest(const std::string& dscname,
+                               const std::string& dscbase) {
+  if (!options_->reuse_logs) {
+    return false;
+  }
+  FileType manifest_type;
+  uint64_t manifest_number;
+  uint64_t manifest_size;
+  if (!ParseFileName(dscbase, &manifest_number, &manifest_type) ||
+      manifest_type != kDescriptorFile ||
+      !env_->GetFileSize(dscname, &manifest_size).ok() ||
+      // Make new compacted MANIFEST if old one is too big
+      manifest_size >= kTargetFileSize) {
+    return false;
+  }
+
+  assert(descriptor_file_ == NULL);
+  assert(descriptor_log_ == NULL);
+  Status r = env_->NewAppendableFile(dscname, &descriptor_file_);
+  if (!r.ok()) {
+    Log(options_->info_log, "Reuse MANIFEST: %s\n", r.ToString().c_str());
+    assert(descriptor_file_ == NULL);
+    return false;
+  }
+
+  Log(options_->info_log, "Reusing MANIFEST %s\n", dscname.c_str());
+  descriptor_log_ = new log::Writer(descriptor_file_, manifest_size);
+  manifest_file_number_ = manifest_number;
+  return true;
+}
+
 void VersionSet::MarkFileNumberUsed(uint64_t number) {
   if (next_file_number_ <= number) {
     next_file_number_ = number + 1;
diff --git a/db/version_set.h b/db/version_set.h
index 8dc14b8e01c9b..1dec745673809 100644
--- a/db/version_set.h
+++ b/db/version_set.h
@@ -179,7 +179,7 @@ class VersionSet {
       EXCLUSIVE_LOCKS_REQUIRED(mu);
 
   // Recover the last saved descriptor from persistent storage.
-  Status Recover();
+  Status Recover(bool *save_manifest);
 
   // Return the current version.
   Version* current() const { return current_; }
@@ -274,6 +274,8 @@ class VersionSet {
   friend class Compaction;
   friend class Version;
 
+  bool ReuseManifest(const std::string& dscname, const std::string& dscbase);
+
   void Finalize(Version* v);
 
   void GetRange(const std::vector<FileMetaData*>& inputs,
diff --git a/db/write_batch_internal.h b/db/write_batch_internal.h
index 310a3c891220b..9448ef7b21c3a 100644
--- a/db/write_batch_internal.h
+++ b/db/write_batch_internal.h
@@ -5,6 +5,7 @@
 #ifndef STORAGE_LEVELDB_DB_WRITE_BATCH_INTERNAL_H_
 #define STORAGE_LEVELDB_DB_WRITE_BATCH_INTERNAL_H_
 
+#include "db/dbformat.h"
 #include "leveldb/write_batch.h"
 
 namespace leveldb {
diff --git a/doc/index.html b/doc/index.html
index 3ed0ed9d9e305..2155192581e7b 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -22,7 +22,7 @@ <h1>Opening A Database</h1>
 creating it if necessary:
 <p>
 <pre>
-  #include &lt;assert&gt;
+  #include &lt;cassert&gt;
   #include "leveldb/db.h"
 
   leveldb::DB* db;
diff --git a/helpers/memenv/memenv.cc b/helpers/memenv/memenv.cc
index 43ef2e0729755..9a98884daf8d4 100644
--- a/helpers/memenv/memenv.cc
+++ b/helpers/memenv/memenv.cc
@@ -277,6 +277,19 @@ class InMemoryEnv : public EnvWrapper {
     return Status::OK();
   }
 
+  virtual Status NewAppendableFile(const std::string& fname,
+                                   WritableFile** result) {
+    MutexLock lock(&mutex_);
+    FileState** sptr = &file_map_[fname];
+    FileState* file = *sptr;
+    if (file == NULL) {
+      file = new FileState();
+      file->Ref();
+    }
+    *result = new WritableFileImpl(file);
+    return Status::OK();
+  }
+
   virtual bool FileExists(const std::string& fname) {
     MutexLock lock(&mutex_);
     return file_map_.find(fname) != file_map_.end();
diff --git a/helpers/memenv/memenv_test.cc b/helpers/memenv/memenv_test.cc
index a44310fed80cd..5cff77613f11d 100644
--- a/helpers/memenv/memenv_test.cc
+++ b/helpers/memenv/memenv_test.cc
@@ -40,6 +40,8 @@ TEST(MemEnvTest, Basics) {
 
   // Create a file.
   ASSERT_OK(env_->NewWritableFile("/dir/f", &writable_file));
+  ASSERT_OK(env_->GetFileSize("/dir/f", &file_size));
+  ASSERT_EQ(0, file_size);
   delete writable_file;
 
   // Check that the file exists.
@@ -55,9 +57,16 @@ TEST(MemEnvTest, Basics) {
   ASSERT_OK(writable_file->Append("abc"));
   delete writable_file;
 
-  // Check for expected size.
+  // Check that append works.
+  ASSERT_OK(env_->NewAppendableFile("/dir/f", &writable_file));
   ASSERT_OK(env_->GetFileSize("/dir/f", &file_size));
   ASSERT_EQ(3, file_size);
+  ASSERT_OK(writable_file->Append("hello"));
+  delete writable_file;
+
+  // Check for expected size.
+  ASSERT_OK(env_->GetFileSize("/dir/f", &file_size));
+  ASSERT_EQ(8, file_size);
 
   // Check that renaming works.
   ASSERT_TRUE(!env_->RenameFile("/dir/non_existent", "/dir/g").ok());
@@ -65,7 +74,7 @@ TEST(MemEnvTest, Basics) {
   ASSERT_TRUE(!env_->FileExists("/dir/f"));
   ASSERT_TRUE(env_->FileExists("/dir/g"));
   ASSERT_OK(env_->GetFileSize("/dir/g", &file_size));
-  ASSERT_EQ(3, file_size);
+  ASSERT_EQ(8, file_size);
 
   // Check that opening non-existent file fails.
   SequentialFile* seq_file;
diff --git a/include/leveldb/cache.h b/include/leveldb/cache.h
index 1a201e5e0a994..6819d5bc49f67 100644
--- a/include/leveldb/cache.h
+++ b/include/leveldb/cache.h
@@ -81,6 +81,17 @@ class Cache {
   // its cache keys.
   virtual uint64_t NewId() = 0;
 
+  // Remove all cache entries that are not actively in use.  Memory-constrained
+  // applications may wish to call this method to reduce memory usage.
+  // Default implementation of Prune() does nothing.  Subclasses are strongly
+  // encouraged to override the default implementation.  A future release of
+  // leveldb may change Prune() to a pure abstract method.
+  virtual void Prune() {}
+
+  // Return an estimate of the combined charges of all elements stored in the
+  // cache.
+  virtual size_t TotalCharge() const = 0;
+
  private:
   void LRU_Remove(Handle* e);
   void LRU_Append(Handle* e);
diff --git a/include/leveldb/db.h b/include/leveldb/db.h
index 4c169bf22ed92..9752cbad512de 100644
--- a/include/leveldb/db.h
+++ b/include/leveldb/db.h
@@ -14,7 +14,7 @@ namespace leveldb {
 
 // Update Makefile if you change these
 static const int kMajorVersion = 1;
-static const int kMinorVersion = 18;
+static const int kMinorVersion = 19;
 
 struct Options;
 struct ReadOptions;
@@ -115,6 +115,8 @@ class DB {
   //     about the internal operation of the DB.
   //  "leveldb.sstables" - returns a multi-line string that describes all
   //     of the sstables that make up the db contents.
+  //  "leveldb.approximate-memory-usage" - returns the approximate number of
+  //     bytes of memory in use by the DB.
   virtual bool GetProperty(const Slice& property, std::string* value) = 0;
 
   // For each i in [0,n-1], store in "sizes[i]", the approximate
diff --git a/include/leveldb/env.h b/include/leveldb/env.h
index f709514da6c28..99b6c21414b2e 100644
--- a/include/leveldb/env.h
+++ b/include/leveldb/env.h
@@ -69,6 +69,21 @@ class Env {
   virtual Status NewWritableFile(const std::string& fname,
                                  WritableFile** result) = 0;
 
+  // Create an object that either appends to an existing file, or
+  // writes to a new file (if the file does not exist to begin with).
+  // On success, stores a pointer to the new file in *result and
+  // returns OK.  On failure stores NULL in *result and returns
+  // non-OK.
+  //
+  // The returned file will only be accessed by one thread at a time.
+  //
+  // May return an IsNotSupportedError error if this Env does
+  // not allow appending to an existing file.  Users of Env (including
+  // the leveldb implementation) must be prepared to deal with
+  // an Env that does not support appending.
+  virtual Status NewAppendableFile(const std::string& fname,
+                                   WritableFile** result);
+
   // Returns true iff the named file exists.
   virtual bool FileExists(const std::string& fname) = 0;
 
@@ -289,6 +304,9 @@ class EnvWrapper : public Env {
   Status NewWritableFile(const std::string& f, WritableFile** r) {
     return target_->NewWritableFile(f, r);
   }
+  Status NewAppendableFile(const std::string& f, WritableFile** r) {
+    return target_->NewAppendableFile(f, r);
+  }
   bool FileExists(const std::string& f) { return target_->FileExists(f); }
   Status GetChildren(const std::string& dir, std::vector<std::string>* r) {
     return target_->GetChildren(dir, r);
diff --git a/include/leveldb/iterator.h b/include/leveldb/iterator.h
index 76aced04bddf8..da631ed9d89bb 100644
--- a/include/leveldb/iterator.h
+++ b/include/leveldb/iterator.h
@@ -37,7 +37,7 @@ class Iterator {
   // Valid() after this call iff the source is not empty.
   virtual void SeekToLast() = 0;
 
-  // Position at the first key in the source that at or past target
+  // Position at the first key in the source that is at or past target.
   // The iterator is Valid() after this call iff the source contains
   // an entry that comes at or past target.
   virtual void Seek(const Slice& target) = 0;
diff --git a/include/leveldb/options.h b/include/leveldb/options.h
index 7c9b973454e2b..83a1ef39a4814 100644
--- a/include/leveldb/options.h
+++ b/include/leveldb/options.h
@@ -128,6 +128,12 @@ struct Options {
   // efficiently detect that and will switch to uncompressed mode.
   CompressionType compression;
 
+  // EXPERIMENTAL: If true, append to existing MANIFEST and log files
+  // when a database is opened.  This can significantly speed up open.
+  //
+  // Default: currently false, but may become true later.
+  bool reuse_logs;
+
   // If non-NULL, use the specified filter policy to reduce disk reads.
   // Many applications will benefit from passing the result of
   // NewBloomFilterPolicy() here.
diff --git a/include/leveldb/status.h b/include/leveldb/status.h
index 11dbd4b47ed38..d9575f97532eb 100644
--- a/include/leveldb/status.h
+++ b/include/leveldb/status.h
@@ -60,6 +60,12 @@ class Status {
   // Returns true iff the status indicates an IOError.
   bool IsIOError() const { return code() == kIOError; }
 
+  // Returns true iff the status indicates a NotSupportedError.
+  bool IsNotSupportedError() const { return code() == kNotSupported; }
+
+  // Returns true iff the status indicates an InvalidArgument.
+  bool IsInvalidArgument() const { return code() == kInvalidArgument; }
+
   // Return a string representation of this status suitable for printing.
   // Returns the string "OK" for success.
   std::string ToString() const;
diff --git a/port/atomic_pointer.h b/port/atomic_pointer.h
index 9bf091f757c25..1c4c7aafc63eb 100644
--- a/port/atomic_pointer.h
+++ b/port/atomic_pointer.h
@@ -35,8 +35,12 @@
 #define ARCH_CPU_X86_FAMILY 1
 #elif defined(__ARMEL__)
 #define ARCH_CPU_ARM_FAMILY 1
+#elif defined(__aarch64__)
+#define ARCH_CPU_ARM64_FAMILY 1
 #elif defined(__ppc__) || defined(__powerpc__) || defined(__powerpc64__)
 #define ARCH_CPU_PPC_FAMILY 1
+#elif defined(__mips__)
+#define ARCH_CPU_MIPS_FAMILY 1
 #endif
 
 namespace leveldb {
@@ -92,6 +96,13 @@ inline void MemoryBarrier() {
 }
 #define LEVELDB_HAVE_MEMORY_BARRIER
 
+// ARM64
+#elif defined(ARCH_CPU_ARM64_FAMILY)
+inline void MemoryBarrier() {
+  asm volatile("dmb sy" : : : "memory");
+}
+#define LEVELDB_HAVE_MEMORY_BARRIER
+
 // PPC
 #elif defined(ARCH_CPU_PPC_FAMILY) && defined(__GNUC__)
 inline void MemoryBarrier() {
@@ -101,6 +112,13 @@ inline void MemoryBarrier() {
 }
 #define LEVELDB_HAVE_MEMORY_BARRIER
 
+// MIPS
+#elif defined(ARCH_CPU_MIPS_FAMILY) && defined(__GNUC__)
+inline void MemoryBarrier() {
+  __asm__ __volatile__("sync" : : : "memory");
+}
+#define LEVELDB_HAVE_MEMORY_BARRIER
+
 #endif
 
 // AtomicPointer built using platform-specific MemoryBarrier()
@@ -215,6 +233,7 @@ class AtomicPointer {
 #undef LEVELDB_HAVE_MEMORY_BARRIER
 #undef ARCH_CPU_X86_FAMILY
 #undef ARCH_CPU_ARM_FAMILY
+#undef ARCH_CPU_ARM64_FAMILY
 #undef ARCH_CPU_PPC_FAMILY
 
 }  // namespace port
diff --git a/port/port_posix.cc b/port/port_posix.cc
index 5ba127a5b91bf..30e8007ae3cf1 100644
--- a/port/port_posix.cc
+++ b/port/port_posix.cc
@@ -7,7 +7,6 @@
 #include <cstdlib>
 #include <stdio.h>
 #include <string.h>
-#include "util/logging.h"
 
 namespace leveldb {
 namespace port {
diff --git a/table/filter_block.cc b/table/filter_block.cc
index 203e15c8bcb13..4e78b954f8d90 100644
--- a/table/filter_block.cc
+++ b/table/filter_block.cc
@@ -68,7 +68,7 @@ void FilterBlockBuilder::GenerateFilter() {
 
   // Generate filter for current set of keys and append to result_.
   filter_offsets_.push_back(result_.size());
-  policy_->CreateFilter(&tmp_keys_[0], num_keys, &result_);
+  policy_->CreateFilter(&tmp_keys_[0], static_cast<int>(num_keys), &result_);
 
   tmp_keys_.clear();
   keys_.clear();
@@ -97,7 +97,7 @@ bool FilterBlockReader::KeyMayMatch(uint64_t block_offset, const Slice& key) {
   if (index < num_) {
     uint32_t start = DecodeFixed32(offset_ + index*4);
     uint32_t limit = DecodeFixed32(offset_ + index*4 + 4);
-    if (start <= limit && limit <= (offset_ - data_)) {
+    if (start <= limit && limit <= static_cast<size_t>(offset_ - data_)) {
       Slice filter = Slice(data_ + start, limit - start);
       return policy_->KeyMayMatch(key, filter);
     } else if (start == limit) {
diff --git a/table/format.cc b/table/format.cc
index aa63144c9e7a7..24e4e02445b8a 100644
--- a/table/format.cc
+++ b/table/format.cc
@@ -30,15 +30,14 @@ Status BlockHandle::DecodeFrom(Slice* input) {
 }
 
 void Footer::EncodeTo(std::string* dst) const {
-#ifndef NDEBUG
   const size_t original_size = dst->size();
-#endif
   metaindex_handle_.EncodeTo(dst);
   index_handle_.EncodeTo(dst);
   dst->resize(2 * BlockHandle::kMaxEncodedLength);  // Padding
   PutFixed32(dst, static_cast<uint32_t>(kTableMagicNumber & 0xffffffffu));
   PutFixed32(dst, static_cast<uint32_t>(kTableMagicNumber >> 32));
   assert(dst->size() == original_size + kEncodedLength);
+  (void)original_size;  // Disable unused variable warning.
 }
 
 Status Footer::DecodeFrom(Slice* input) {
diff --git a/table/iterator_wrapper.h b/table/iterator_wrapper.h
index 9e16b3dbedebe..f410c3fabe610 100644
--- a/table/iterator_wrapper.h
+++ b/table/iterator_wrapper.h
@@ -5,6 +5,9 @@
 #ifndef STORAGE_LEVELDB_TABLE_ITERATOR_WRAPPER_H_
 #define STORAGE_LEVELDB_TABLE_ITERATOR_WRAPPER_H_
 
+#include "leveldb/iterator.h"
+#include "leveldb/slice.h"
+
 namespace leveldb {
 
 // A internal wrapper class with an interface similar to Iterator that
diff --git a/table/table.cc b/table/table.cc
index dff8a82590a63..decf8082cc183 100644
--- a/table/table.cc
+++ b/table/table.cc
@@ -82,7 +82,7 @@ Status Table::Open(const Options& options,
     *table = new Table(rep);
     (*table)->ReadMeta(footer);
   } else {
-    if (index_block) delete index_block;
+    delete index_block;
   }
 
   return s;
diff --git a/table/table_test.cc b/table/table_test.cc
index c723bf84cf5f5..abf6e246ff8e2 100644
--- a/table/table_test.cc
+++ b/table/table_test.cc
@@ -853,12 +853,20 @@ TEST(TableTest, ApproximateOffsetOfCompressed) {
   options.compression = kSnappyCompression;
   c.Finish(options, &keys, &kvmap);
 
-  ASSERT_TRUE(Between(c.ApproximateOffsetOf("abc"),       0,      0));
-  ASSERT_TRUE(Between(c.ApproximateOffsetOf("k01"),       0,      0));
-  ASSERT_TRUE(Between(c.ApproximateOffsetOf("k02"),       0,      0));
-  ASSERT_TRUE(Between(c.ApproximateOffsetOf("k03"),    2000,   3000));
-  ASSERT_TRUE(Between(c.ApproximateOffsetOf("k04"),    2000,   3000));
-  ASSERT_TRUE(Between(c.ApproximateOffsetOf("xyz"),    4000,   6000));
+  // Expected upper and lower bounds of space used by compressible strings.
+  static const int kSlop = 1000;  // Compressor effectiveness varies.
+  const int expected = 2500;  // 10000 * compression ratio (0.25)
+  const int min_z = expected - kSlop;
+  const int max_z = expected + kSlop;
+
+  ASSERT_TRUE(Between(c.ApproximateOffsetOf("abc"), 0, kSlop));
+  ASSERT_TRUE(Between(c.ApproximateOffsetOf("k01"), 0, kSlop));
+  ASSERT_TRUE(Between(c.ApproximateOffsetOf("k02"), 0, kSlop));
+  // Have now emitted a large compressible string, so adjust expected offset.
+  ASSERT_TRUE(Between(c.ApproximateOffsetOf("k03"), min_z, max_z));
+  ASSERT_TRUE(Between(c.ApproximateOffsetOf("k04"), min_z, max_z));
+  // Have now emitted two large compressible strings, so adjust expected offset.
+  ASSERT_TRUE(Between(c.ApproximateOffsetOf("xyz"), 2 * min_z, 2 * max_z));
 }
 
 }  // namespace leveldb
diff --git a/util/arena.cc b/util/arena.cc
index 9367f714924d2..74078213eedac 100644
--- a/util/arena.cc
+++ b/util/arena.cc
@@ -9,8 +9,7 @@ namespace leveldb {
 
 static const int kBlockSize = 4096;
 
-Arena::Arena() {
-  blocks_memory_ = 0;
+Arena::Arena() : memory_usage_(0) {
   alloc_ptr_ = NULL;  // First allocation will allocate a block
   alloc_bytes_remaining_ = 0;
 }
@@ -60,8 +59,9 @@ char* Arena::AllocateAligned(size_t bytes) {
 
 char* Arena::AllocateNewBlock(size_t block_bytes) {
   char* result = new char[block_bytes];
-  blocks_memory_ += block_bytes;
   blocks_.push_back(result);
+  memory_usage_.NoBarrier_Store(
+      reinterpret_cast<void*>(MemoryUsage() + block_bytes + sizeof(char*)));
   return result;
 }
 
diff --git a/util/arena.h b/util/arena.h
index 73bbf1cb9bfb5..48bab33741595 100644
--- a/util/arena.h
+++ b/util/arena.h
@@ -9,6 +9,7 @@
 #include <assert.h>
 #include <stddef.h>
 #include <stdint.h>
+#include "port/port.h"
 
 namespace leveldb {
 
@@ -24,10 +25,9 @@ class Arena {
   char* AllocateAligned(size_t bytes);
 
   // Returns an estimate of the total memory usage of data allocated
-  // by the arena (including space allocated but not yet used for user
-  // allocations).
+  // by the arena.
   size_t MemoryUsage() const {
-    return blocks_memory_ + blocks_.capacity() * sizeof(char*);
+    return reinterpret_cast<uintptr_t>(memory_usage_.NoBarrier_Load());
   }
 
  private:
@@ -41,8 +41,8 @@ class Arena {
   // Array of new[] allocated memory blocks
   std::vector<char*> blocks_;
 
-  // Bytes of memory in blocks allocated so far
-  size_t blocks_memory_;
+  // Total memory usage of the arena.
+  port::AtomicPointer memory_usage_;
 
   // No copying allowed
   Arena(const Arena&);
diff --git a/util/bloom.cc b/util/bloom.cc
index a27a2ace28868..bf3e4ca6e9314 100644
--- a/util/bloom.cc
+++ b/util/bloom.cc
@@ -47,7 +47,7 @@ class BloomFilterPolicy : public FilterPolicy {
     dst->resize(init_size + bytes, 0);
     dst->push_back(static_cast<char>(k_));  // Remember # of probes in filter
     char* array = &(*dst)[init_size];
-    for (size_t i = 0; i < n; i++) {
+    for (int i = 0; i < n; i++) {
       // Use double-hashing to generate a sequence of hash values.
       // See analysis in [Kirsch,Mitzenmacher 2006].
       uint32_t h = BloomHash(keys[i]);
diff --git a/util/bloom_test.cc b/util/bloom_test.cc
index 77fb1b315958f..1b87a2be3f540 100644
--- a/util/bloom_test.cc
+++ b/util/bloom_test.cc
@@ -46,7 +46,8 @@ class BloomTest {
       key_slices.push_back(Slice(keys_[i]));
     }
     filter_.clear();
-    policy_->CreateFilter(&key_slices[0], key_slices.size(), &filter_);
+    policy_->CreateFilter(&key_slices[0], static_cast<int>(key_slices.size()),
+                          &filter_);
     keys_.clear();
     if (kVerbose >= 2) DumpFilter();
   }
diff --git a/util/cache.cc b/util/cache.cc
index 8b197bc02a98e..ce46886171ad4 100644
--- a/util/cache.cc
+++ b/util/cache.cc
@@ -19,6 +19,23 @@ Cache::~Cache() {
 namespace {
 
 // LRU cache implementation
+//
+// Cache entries have an "in_cache" boolean indicating whether the cache has a
+// reference on the entry.  The only ways that this can become false without the
+// entry being passed to its "deleter" are via Erase(), via Insert() when
+// an element with a duplicate key is inserted, or on destruction of the cache.
+//
+// The cache keeps two linked lists of items in the cache.  All items in the
+// cache are in one list or the other, and never both.  Items still referenced
+// by clients but erased from the cache are in neither list.  The lists are:
+// - in-use:  contains the items currently referenced by clients, in no
+//   particular order.  (This list is used for invariant checking.  If we
+//   removed the check, elements that would otherwise be on this list could be
+//   left as disconnected singleton lists.)
+// - LRU:  contains the items not currently referenced by clients, in LRU order
+// Elements are moved between these lists by the Ref() and Unref() methods,
+// when they detect an element in the cache acquiring or losing its only
+// external reference.
 
 // An entry is a variable length heap-allocated structure.  Entries
 // are kept in a circular doubly linked list ordered by access time.
@@ -30,7 +47,8 @@ struct LRUHandle {
   LRUHandle* prev;
   size_t charge;      // TODO(opt): Only allow uint32_t?
   size_t key_length;
-  uint32_t refs;
+  bool in_cache;      // Whether entry is in the cache.
+  uint32_t refs;      // References, including cache reference, if present.
   uint32_t hash;      // Hash of key(); used for fast sharding and comparisons
   char key_data[1];   // Beginning of key
 
@@ -147,49 +165,77 @@ class LRUCache {
   Cache::Handle* Lookup(const Slice& key, uint32_t hash);
   void Release(Cache::Handle* handle);
   void Erase(const Slice& key, uint32_t hash);
+  void Prune();
+  size_t TotalCharge() const {
+    MutexLock l(&mutex_);
+    return usage_;
+  }
 
  private:
   void LRU_Remove(LRUHandle* e);
-  void LRU_Append(LRUHandle* e);
+  void LRU_Append(LRUHandle*list, LRUHandle* e);
+  void Ref(LRUHandle* e);
   void Unref(LRUHandle* e);
+  bool FinishErase(LRUHandle* e);
 
   // Initialized before use.
   size_t capacity_;
 
   // mutex_ protects the following state.
-  port::Mutex mutex_;
+  mutable port::Mutex mutex_;
   size_t usage_;
 
   // Dummy head of LRU list.
   // lru.prev is newest entry, lru.next is oldest entry.
+  // Entries have refs==1 and in_cache==true.
   LRUHandle lru_;
 
+  // Dummy head of in-use list.
+  // Entries are in use by clients, and have refs >= 2 and in_cache==true.
+  LRUHandle in_use_;
+
   HandleTable table_;
 };
 
 LRUCache::LRUCache()
     : usage_(0) {
-  // Make empty circular linked list
+  // Make empty circular linked lists.
   lru_.next = &lru_;
   lru_.prev = &lru_;
+  in_use_.next = &in_use_;
+  in_use_.prev = &in_use_;
 }
 
 LRUCache::~LRUCache() {
+  assert(in_use_.next == &in_use_);  // Error if caller has an unreleased handle
   for (LRUHandle* e = lru_.next; e != &lru_; ) {
     LRUHandle* next = e->next;
-    assert(e->refs == 1);  // Error if caller has an unreleased handle
+    assert(e->in_cache);
+    e->in_cache = false;
+    assert(e->refs == 1);  // Invariant of lru_ list.
     Unref(e);
     e = next;
   }
 }
 
+void LRUCache::Ref(LRUHandle* e) {
+  if (e->refs == 1 && e->in_cache) {  // If on lru_ list, move to in_use_ list.
+    LRU_Remove(e);
+    LRU_Append(&in_use_, e);
+  }
+  e->refs++;
+}
+
 void LRUCache::Unref(LRUHandle* e) {
   assert(e->refs > 0);
   e->refs--;
-  if (e->refs <= 0) {
-    usage_ -= e->charge;
+  if (e->refs == 0) { // Deallocate.
+    assert(!e->in_cache);
     (*e->deleter)(e->key(), e->value);
     free(e);
+  } else if (e->in_cache && e->refs == 1) {  // No longer in use; move to lru_ list.
+    LRU_Remove(e);
+    LRU_Append(&lru_, e);
   }
 }
 
@@ -198,10 +244,10 @@ void LRUCache::LRU_Remove(LRUHandle* e) {
   e->prev->next = e->next;
 }
 
-void LRUCache::LRU_Append(LRUHandle* e) {
-  // Make "e" newest entry by inserting just before lru_
-  e->next = &lru_;
-  e->prev = lru_.prev;
+void LRUCache::LRU_Append(LRUHandle* list, LRUHandle* e) {
+  // Make "e" newest entry by inserting just before *list
+  e->next = list;
+  e->prev = list->prev;
   e->prev->next = e;
   e->next->prev = e;
 }
@@ -210,9 +256,7 @@ Cache::Handle* LRUCache::Lookup(const Slice& key, uint32_t hash) {
   MutexLock l(&mutex_);
   LRUHandle* e = table_.Lookup(key, hash);
   if (e != NULL) {
-    e->refs++;
-    LRU_Remove(e);
-    LRU_Append(e);
+    Ref(e);
   }
   return reinterpret_cast<Cache::Handle*>(e);
 }
@@ -234,34 +278,58 @@ Cache::Handle* LRUCache::Insert(
   e->charge = charge;
   e->key_length = key.size();
   e->hash = hash;
-  e->refs = 2;  // One from LRUCache, one for the returned handle
+  e->in_cache = false;
+  e->refs = 1;  // for the returned handle.
   memcpy(e->key_data, key.data(), key.size());
-  LRU_Append(e);
-  usage_ += charge;
 
-  LRUHandle* old = table_.Insert(e);
-  if (old != NULL) {
-    LRU_Remove(old);
-    Unref(old);
-  }
+  if (capacity_ > 0) {
+    e->refs++;  // for the cache's reference.
+    e->in_cache = true;
+    LRU_Append(&in_use_, e);
+    usage_ += charge;
+    FinishErase(table_.Insert(e));
+  } // else don't cache.  (Tests use capacity_==0 to turn off caching.)
 
   while (usage_ > capacity_ && lru_.next != &lru_) {
     LRUHandle* old = lru_.next;
-    LRU_Remove(old);
-    table_.Remove(old->key(), old->hash);
-    Unref(old);
+    assert(old->refs == 1);
+    bool erased = FinishErase(table_.Remove(old->key(), old->hash));
+    if (!erased) {  // to avoid unused variable when compiled NDEBUG
+      assert(erased);
+    }
   }
 
   return reinterpret_cast<Cache::Handle*>(e);
 }
 
-void LRUCache::Erase(const Slice& key, uint32_t hash) {
-  MutexLock l(&mutex_);
-  LRUHandle* e = table_.Remove(key, hash);
+// If e != NULL, finish removing *e from the cache; it has already been removed
+// from the hash table.  Return whether e != NULL.  Requires mutex_ held.
+bool LRUCache::FinishErase(LRUHandle* e) {
   if (e != NULL) {
+    assert(e->in_cache);
     LRU_Remove(e);
+    e->in_cache = false;
+    usage_ -= e->charge;
     Unref(e);
   }
+  return e != NULL;
+}
+
+void LRUCache::Erase(const Slice& key, uint32_t hash) {
+  MutexLock l(&mutex_);
+  FinishErase(table_.Remove(key, hash));
+}
+
+void LRUCache::Prune() {
+  MutexLock l(&mutex_);
+  while (lru_.next != &lru_) {
+    LRUHandle* e = lru_.next;
+    assert(e->refs == 1);
+    bool erased = FinishErase(table_.Remove(e->key(), e->hash));
+    if (!erased) {  // to avoid unused variable when compiled NDEBUG
+      assert(erased);
+    }
+  }
 }
 
 static const int kNumShardBits = 4;
@@ -314,6 +382,18 @@ class ShardedLRUCache : public Cache {
     MutexLock l(&id_mutex_);
     return ++(last_id_);
   }
+  virtual void Prune() {
+    for (int s = 0; s < kNumShards; s++) {
+      shard_[s].Prune();
+    }
+  }
+  virtual size_t TotalCharge() const {
+    size_t total = 0;
+    for (int s = 0; s < kNumShards; s++) {
+      total += shard_[s].TotalCharge();
+    }
+    return total;
+  }
 };
 
 }  // end anonymous namespace
diff --git a/util/cache_test.cc b/util/cache_test.cc
index 43716715a89f4..468f7a6425bfa 100644
--- a/util/cache_test.cc
+++ b/util/cache_test.cc
@@ -59,6 +59,11 @@ class CacheTest {
                                    &CacheTest::Deleter));
   }
 
+  Cache::Handle* InsertAndReturnHandle(int key, int value, int charge = 1) {
+    return cache_->Insert(EncodeKey(key), EncodeValue(value), charge,
+                          &CacheTest::Deleter);
+  }
+
   void Erase(int key) {
     cache_->Erase(EncodeKey(key));
   }
@@ -135,8 +140,11 @@ TEST(CacheTest, EntriesArePinned) {
 TEST(CacheTest, EvictionPolicy) {
   Insert(100, 101);
   Insert(200, 201);
+  Insert(300, 301);
+  Cache::Handle* h = cache_->Lookup(EncodeKey(300));
 
-  // Frequently used entry must be kept around
+  // Frequently used entry must be kept around,
+  // as must things that are still in use.
   for (int i = 0; i < kCacheSize + 100; i++) {
     Insert(1000+i, 2000+i);
     ASSERT_EQ(2000+i, Lookup(1000+i));
@@ -144,6 +152,25 @@ TEST(CacheTest, EvictionPolicy) {
   }
   ASSERT_EQ(101, Lookup(100));
   ASSERT_EQ(-1, Lookup(200));
+  ASSERT_EQ(301, Lookup(300));
+  cache_->Release(h);
+}
+
+TEST(CacheTest, UseExceedsCacheSize) {
+  // Overfill the cache, keeping handles on all inserted entries.
+  std::vector<Cache::Handle*> h;
+  for (int i = 0; i < kCacheSize + 100; i++) {
+    h.push_back(InsertAndReturnHandle(1000+i, 2000+i));
+  }
+
+  // Check that all the entries can be found in the cache.
+  for (int i = 0; i < h.size(); i++) {
+    ASSERT_EQ(2000+i, Lookup(1000+i));
+  }
+
+  for (int i = 0; i < h.size(); i++) {
+    cache_->Release(h[i]);
+  }
 }
 
 TEST(CacheTest, HeavyEntries) {
@@ -179,6 +206,19 @@ TEST(CacheTest, NewId) {
   ASSERT_NE(a, b);
 }
 
+TEST(CacheTest, Prune) {
+  Insert(1, 100);
+  Insert(2, 200);
+
+  Cache::Handle* handle = cache_->Lookup(EncodeKey(1));
+  ASSERT_TRUE(handle);
+  cache_->Prune();
+  cache_->Release(handle);
+
+  ASSERT_EQ(100, Lookup(1));
+  ASSERT_EQ(-1, Lookup(2));
+}
+
 }  // namespace leveldb
 
 int main(int argc, char** argv) {
diff --git a/util/env.cc b/util/env.cc
index c2600e964a260..c58a0821ef7a3 100644
--- a/util/env.cc
+++ b/util/env.cc
@@ -9,6 +9,10 @@ namespace leveldb {
 Env::~Env() {
 }
 
+Status Env::NewAppendableFile(const std::string& fname, WritableFile** result) {
+  return Status::NotSupported("NewAppendableFile", fname);
+}
+
 SequentialFile::~SequentialFile() {
 }
 
diff --git a/util/env_posix.cc b/util/env_posix.cc
index ba2667864acb0..e0fca52f4632a 100644
--- a/util/env_posix.cc
+++ b/util/env_posix.cc
@@ -351,6 +351,19 @@ class PosixEnv : public Env {
     return s;
   }
 
+  virtual Status NewAppendableFile(const std::string& fname,
+                                   WritableFile** result) {
+    Status s;
+    FILE* f = fopen(fname.c_str(), "a");
+    if (f == NULL) {
+      *result = NULL;
+      s = IOError(fname, errno);
+    } else {
+      *result = new PosixWritableFile(fname, f);
+    }
+    return s;
+  }
+
   virtual bool FileExists(const std::string& fname) {
     return access(fname.c_str(), F_OK) == 0;
   }
diff --git a/util/env_win.cc b/util/env_win.cc
index e11a96b791871..b074b7579ec2d 100644
--- a/util/env_win.cc
+++ b/util/env_win.cc
@@ -106,7 +106,7 @@ class Win32RandomAccessFile : public RandomAccessFile
 class Win32WritableFile : public WritableFile
 {
 public:
-    Win32WritableFile(const std::string& fname);
+    Win32WritableFile(const std::string& fname, bool append);
     ~Win32WritableFile();
 
     virtual Status Append(const Slice& data);
@@ -158,6 +158,8 @@ class Win32Env : public Env
         RandomAccessFile** result);
     virtual Status NewWritableFile(const std::string& fname,
         WritableFile** result);
+    virtual Status NewAppendableFile(const std::string& fname,
+        WritableFile** result);
 
     virtual bool FileExists(const std::string& fname);
 
@@ -423,17 +425,23 @@ void Win32RandomAccessFile::_CleanUp()
     }
 }
 
-Win32WritableFile::Win32WritableFile(const std::string& fname)
+Win32WritableFile::Win32WritableFile(const std::string& fname, bool append)
     : filename_(fname)
 {
     std::wstring path;
     ToWidePath(fname, path);
-    DWORD Flag = PathFileExistsW(path.c_str()) ? OPEN_EXISTING : CREATE_ALWAYS;
+    // NewAppendableFile: append to an existing file, or create a new one
+    //     if none exists - this is OPEN_ALWAYS behavior, with
+    //     FILE_APPEND_DATA to avoid having to manually position the file
+    //     pointer at the end of the file.
+    // NewWritableFile: create a new file, delete if it exists - this is
+    //     CREATE_ALWAYS behavior. This file is used for writing only so
+    //     use GENERIC_WRITE.
     _hFile = CreateFileW(path.c_str(),
-                         GENERIC_READ | GENERIC_WRITE,
+                         append ? FILE_APPEND_DATA : GENERIC_WRITE,
                          FILE_SHARE_READ|FILE_SHARE_DELETE|FILE_SHARE_WRITE,
                          NULL,
-                         Flag,
+                         append ? OPEN_ALWAYS : CREATE_ALWAYS,
                          FILE_ATTRIBUTE_NORMAL,
                          NULL);
     // CreateFileW returns INVALID_HANDLE_VALUE in case of error, always check isEnable() before use
@@ -823,7 +831,9 @@ Status Win32Env::NewLogger( const std::string& fname, Logger** result )
 {
     Status sRet;
     std::string path = fname;
-    Win32WritableFile* pMapFile = new Win32WritableFile(ModifyPath(path));
+    // Logs are opened with write semantics, not with append semantics
+    // (see PosixEnv::NewLogger)
+    Win32WritableFile* pMapFile = new Win32WritableFile(ModifyPath(path), false);
     if(!pMapFile->isEnable()){
         delete pMapFile;
         *result = NULL;
@@ -837,7 +847,20 @@ Status Win32Env::NewWritableFile( const std::string& fname, WritableFile** resul
 {
     Status sRet;
     std::string path = fname;
-    Win32WritableFile* pFile = new Win32WritableFile(ModifyPath(path));
+    Win32WritableFile* pFile = new Win32WritableFile(ModifyPath(path), false);
+    if(!pFile->isEnable()){
+        *result = NULL;
+        sRet = Status::IOError(fname,Win32::GetLastErrSz());
+    }else
+        *result = pFile;
+    return sRet;
+}
+
+Status Win32Env::NewAppendableFile( const std::string& fname, WritableFile** result )
+{
+    Status sRet;
+    std::string path = fname;
+    Win32WritableFile* pFile = new Win32WritableFile(ModifyPath(path), true);
     if(!pFile->isEnable()){
         *result = NULL;
         sRet = Status::IOError(fname,Win32::GetLastErrSz());
diff --git a/util/options.cc b/util/options.cc
index 76af5b9302d43..8b618fb1ae858 100644
--- a/util/options.cc
+++ b/util/options.cc
@@ -22,8 +22,8 @@ Options::Options()
       block_size(4096),
       block_restart_interval(16),
       compression(kSnappyCompression),
+      reuse_logs(false),
       filter_policy(NULL) {
 }
 
-
 }  // namespace leveldb
diff --git a/util/testutil.h b/util/testutil.h
index adad3fc1eacb7..d7e45837027db 100644
--- a/util/testutil.h
+++ b/util/testutil.h
@@ -45,6 +45,16 @@ class ErrorEnv : public EnvWrapper {
     }
     return target()->NewWritableFile(fname, result);
   }
+
+  virtual Status NewAppendableFile(const std::string& fname,
+                                   WritableFile** result) {
+    if (writable_file_error_) {
+      ++num_writable_file_errors_;
+      *result = NULL;
+      return Status::IOError(fname, "fake error");
+    }
+    return target()->NewAppendableFile(fname, result);
+  }
 };
 
 }  // namespace test

From fe37fbe606f099e81c693fae248c23c8f8fd5735 Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Fri, 2 Dec 2016 08:51:36 +0100
Subject: [PATCH 1296/1802] bitcoin-cli: Make error message less confusing

Sorry for the churn on this, but the current message (introduced in #9073)
isn't acceptable:

    $ src/bitcoin-cli getinfo
    rpc: couldn't connect to server
    (make sure server is running and you are connecting to the correct RPC port: -1 unknown)

Putting the error code after the words "RPC port" made me wonder whether
there was a port configuration issue.

This changes it to:

    $ src/bitcoin-cli getinfo
    error: couldn't connect to server: unknown (code -1)
    (make sure server is running and you are connecting to the correct RPC port)
---
 src/bitcoin-cli.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bitcoin-cli.cpp b/src/bitcoin-cli.cpp
index b2726408199f5..596cc8eada94a 100644
--- a/src/bitcoin-cli.cpp
+++ b/src/bitcoin-cli.cpp
@@ -247,7 +247,7 @@ UniValue CallRPC(const std::string& strMethod, const UniValue& params)
     event_base_free(base);
 
     if (response.status == 0)
-        throw CConnectionFailed(strprintf("couldn't connect to server\n(make sure server is running and you are connecting to the correct RPC port: %d %s)", response.error, http_errorstring(response.error)));
+        throw CConnectionFailed(strprintf("couldn't connect to server: %s (code %d)\n(make sure server is running and you are connecting to the correct RPC port)", http_errorstring(response.error), response.error));
     else if (response.status == HTTP_UNAUTHORIZED)
         throw std::runtime_error("incorrect rpcuser or rpcpassword (authorization failed)");
     else if (response.status >= 400 && response.status != HTTP_BAD_REQUEST && response.status != HTTP_NOT_FOUND && response.status != HTTP_INTERNAL_SERVER_ERROR)

From df17fe046f11cf1d1dafa6d9bad9f84679611e83 Mon Sep 17 00:00:00 2001
From: Luke Dashjr <luke-jr+git@utopios.org>
Date: Fri, 2 Dec 2016 13:48:33 +0000
Subject: [PATCH 1297/1802] Bugfix: Qt/RPCConsole: Put column enum in the right
 places

QModelIndex::data argument is a role, not a column
---
 src/qt/rpcconsole.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/qt/rpcconsole.cpp b/src/qt/rpcconsole.cpp
index 7320c3bf73686..f09f3e4181792 100644
--- a/src/qt/rpcconsole.cpp
+++ b/src/qt/rpcconsole.cpp
@@ -975,11 +975,11 @@ void RPCConsole::disconnectSelectedNode()
         return;
     
     // Get selected peer addresses
-    QList<QModelIndex> nodes = GUIUtil::getEntryData(ui->peerWidget, 0);
+    QList<QModelIndex> nodes = GUIUtil::getEntryData(ui->peerWidget, PeerTableModel::NetNodeId);
     for(int i = 0; i < nodes.count(); i++)
     {
         // Get currently selected peer address
-        NodeId id = nodes.at(i).data(PeerTableModel::NetNodeId).toInt();
+        NodeId id = nodes.at(i).data().toInt();
         // Find the node, disconnect it and clear the selected node
         if(g_connman->DisconnectNode(id))
             clearSelectedNode();
@@ -992,11 +992,11 @@ void RPCConsole::banSelectedNode(int bantime)
         return;
     
     // Get selected peer addresses
-    QList<QModelIndex> nodes = GUIUtil::getEntryData(ui->peerWidget, 0);
+    QList<QModelIndex> nodes = GUIUtil::getEntryData(ui->peerWidget, PeerTableModel::NetNodeId);
     for(int i = 0; i < nodes.count(); i++)
     {
         // Get currently selected peer address
-        NodeId id = nodes.at(i).data(PeerTableModel::NetNodeId).toInt();
+        NodeId id = nodes.at(i).data().toInt();
 
 	// Get currently selected peer address
 	int detailNodeRow = clientModel->getPeerTableModel()->getRowByNodeId(id);
@@ -1019,11 +1019,11 @@ void RPCConsole::unbanSelectedNode()
         return;
 
     // Get selected ban addresses
-    QList<QModelIndex> nodes = GUIUtil::getEntryData(ui->banlistWidget, 0);
+    QList<QModelIndex> nodes = GUIUtil::getEntryData(ui->banlistWidget, BanTableModel::Address);
     for(int i = 0; i < nodes.count(); i++)
     {
         // Get currently selected ban address
-        QString strNode = nodes.at(i).data(BanTableModel::Address).toString();
+        QString strNode = nodes.at(i).data().toString();
         CSubNet possibleSubnet;
 
         LookupSubNet(strNode.toStdString().c_str(), possibleSubnet);

From 08ed8c1d071d661f3d92947692d5fcd6fda07706 Mon Sep 17 00:00:00 2001
From: Gregory Maxwell <greg@xiph.org>
Date: Wed, 30 Nov 2016 08:45:01 +0000
Subject: [PATCH 1298/1802] Developer docs about existing subtrees.

Add some notes about the workflow for changes to code that exists in subtrees.
---
 doc/developer-notes.md | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/doc/developer-notes.md b/doc/developer-notes.md
index b0794e6d30c45..ba03579e8687e 100644
--- a/doc/developer-notes.md
+++ b/doc/developer-notes.md
@@ -408,6 +408,37 @@ GUI
     should not interact with the user. That's where View classes come in. The converse also
     holds: try to not directly access core data structures from Views.
 
+Subtrees
+----------
+
+Several parts of the repository are subtrees of software maintained elsewhere.
+
+Some of these are maintained by active developers of Bitcoin Core, in which case changes should probably go
+directly upstream without being PRed directly against the project.  They will be merged back in the next
+subtree merge.
+
+Others are external projects without a tight relationship with our project.  Changes to these should also
+be sent upstream but bugfixes may also be prudent to PR against Bitcoin Core so that they can be integrated
+quickly.  Cosmetic changes should be purely taken upstream.
+
+There is a tool in contrib/devtools/git-subtree-check.sh to check a subtree directory for consistency with
+its upstream repository.
+
+Current subtrees include:
+
+- src/leveldb
+  - Upstream at https://github.com/google/leveldb ; Maintained by Google, but open important PRs to Core to avoid delay
+
+- src/libsecp256k1
+  - Upstream at https://github.com/bitcoin-core/secp256k1/ ; actively maintaned by Core contributors.
+
+- src/crypto/ctaes
+  - Upstream at https://github.com/bitcoin-core/ctaes ; actively maintained by Core contributors.
+
+- src/univalue
+  - Upstream at https://github.com/jgarzik/univalue ; report important PRs to Core to avoid delay.
+
+
 Git and github tips
 ---------------------
 

From facbfa5816b5c947627f9c840169484605a5ca38 Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Sat, 1 Oct 2016 18:44:54 +0200
Subject: [PATCH 1299/1802] [qa] Get rid of duplicate code

---
 qa/rpc-tests/maxuploadtarget.py     | 38 ++----------------------
 qa/rpc-tests/pruning.py             | 45 +++--------------------------
 qa/rpc-tests/test_framework/util.py | 18 ++++++++----
 3 files changed, 19 insertions(+), 82 deletions(-)

diff --git a/qa/rpc-tests/maxuploadtarget.py b/qa/rpc-tests/maxuploadtarget.py
index d0e9fe9a3f592..83168a7ce7a4f 100755
--- a/qa/rpc-tests/maxuploadtarget.py
+++ b/qa/rpc-tests/maxuploadtarget.py
@@ -81,49 +81,16 @@ def received_pong():
 
 class MaxUploadTest(BitcoinTestFramework):
  
-    def add_options(self, parser):
-        parser.add_option("--testbinary", dest="testbinary",
-                          default=os.getenv("BITCOIND", "bitcoind"),
-                          help="bitcoind binary to test")
-
     def __init__(self):
         super().__init__()
         self.setup_clean_chain = True
         self.num_nodes = 1
 
-        self.utxo = []
-        self.txouts = gen_return_txouts()
-
     def setup_network(self):
         # Start a node with maxuploadtarget of 200 MB (/24h)
         self.nodes = []
         self.nodes.append(start_node(0, self.options.tmpdir, ["-debug", "-maxuploadtarget=800", "-blockmaxsize=999000"]))
 
-    def mine_full_block(self, node, address):
-        # Want to create a full block
-        # We'll generate a 66k transaction below, and 14 of them is close to the 1MB block limit
-        for j in range(14):
-            if len(self.utxo) < 14:
-                self.utxo = node.listunspent()
-            inputs=[]
-            outputs = {}
-            t = self.utxo.pop()
-            inputs.append({ "txid" : t["txid"], "vout" : t["vout"]})
-            remchange = t["amount"] - Decimal("0.001000")
-            outputs[address]=remchange
-            # Create a basic transaction that will send change back to ourself after account for a fee
-            # And then insert the 128 generated transaction outs in the middle rawtx[92] is where the #
-            # of txouts is stored and is the only thing we overwrite from the original transaction
-            rawtx = node.createrawtransaction(inputs, outputs)
-            newtx = rawtx[0:92]
-            newtx = newtx + self.txouts
-            newtx = newtx + rawtx[94:]
-            # Appears to be ever so slightly faster to sign with SIGHASH_NONE
-            signresult = node.signrawtransaction(newtx,None,None,"NONE")
-            txid = node.sendrawtransaction(signresult["hex"], True)
-        # Mine a full sized block which will be these transactions we just created
-        node.generate(1)
-
     def run_test(self):
         # Before we connect anything, we first set the time on the node
         # to be in the past, otherwise things break because the CNode
@@ -151,7 +118,7 @@ def run_test(self):
         # Test logic begins here
 
         # Now mine a big block
-        self.mine_full_block(self.nodes[0], self.nodes[0].getnewaddress())
+        mine_large_block(self.nodes[0])
 
         # Store the hash; we'll request this later
         big_old_block = self.nodes[0].getbestblockhash()
@@ -162,11 +129,10 @@ def run_test(self):
         self.nodes[0].setmocktime(int(time.time()) - 2*60*60*24)
 
         # Mine one more block, so that the prior block looks old
-        self.mine_full_block(self.nodes[0], self.nodes[0].getnewaddress())
+        mine_large_block(self.nodes[0])
 
         # We'll be requesting this new block too
         big_new_block = self.nodes[0].getbestblockhash()
-        new_block_size = self.nodes[0].getblock(big_new_block)['size']
         big_new_block = int(big_new_block, 16)
 
         # test_nodes[0] will test what happens if we just keep requesting the
diff --git a/qa/rpc-tests/pruning.py b/qa/rpc-tests/pruning.py
index 287dbc776e1b2..6635b0dff2315 100755
--- a/qa/rpc-tests/pruning.py
+++ b/qa/rpc-tests/pruning.py
@@ -24,10 +24,6 @@ def __init__(self):
         self.setup_clean_chain = True
         self.num_nodes = 3
 
-        self.utxo = []
-        self.address = ["",""]
-        self.txouts = gen_return_txouts()
-
     def setup_network(self):
         self.nodes = []
         self.is_network_split = False
@@ -40,12 +36,6 @@ def setup_network(self):
         self.nodes.append(start_node(2, self.options.tmpdir, ["-debug","-maxreceivebuffer=20000","-prune=550"], timewait=900))
         self.prunedir = self.options.tmpdir+"/node2/regtest/blocks/"
 
-        self.address[0] = self.nodes[0].getnewaddress()
-        self.address[1] = self.nodes[1].getnewaddress()
-
-        # Determine default relay fee
-        self.relayfee = self.nodes[0].getnetworkinfo()["relayfee"]
-
         connect_nodes(self.nodes[0], 1)
         connect_nodes(self.nodes[1], 2)
         connect_nodes(self.nodes[2], 0)
@@ -58,7 +48,7 @@ def create_big_chain(self):
         self.nodes[0].generate(150)
         # Then mine enough full blocks to create more than 550MiB of data
         for i in range(645):
-            self.mine_full_block(self.nodes[0], self.address[0])
+            mine_large_block(self.nodes[0])
 
         sync_blocks(self.nodes[0:3])
 
@@ -70,7 +60,7 @@ def test_height_min(self):
         print("Mining 25 more blocks should cause the first block file to be pruned")
         # Pruning doesn't run until we're allocating another chunk, 20 full blocks past the height cutoff will ensure this
         for i in range(25):
-            self.mine_full_block(self.nodes[0],self.address[0])
+            mine_large_block(self.nodes[0])
 
         waitstart = time.time()
         while os.path.isfile(self.prunedir+"blk00000.dat"):
@@ -95,17 +85,15 @@ def create_chain_with_staleblocks(self):
             stop_node(self.nodes[0],0)
             self.nodes[0]=start_node(0, self.options.tmpdir, ["-debug","-maxreceivebuffer=20000","-blockmaxsize=999000", "-checkblocks=5"], timewait=900)
             # Mine 24 blocks in node 1
-            self.utxo = self.nodes[1].listunspent()
             for i in range(24):
                 if j == 0:
-                    self.mine_full_block(self.nodes[1],self.address[1])
+                    mine_large_block(self.nodes[1])
                 else:
                     self.nodes[1].generate(1) #tx's already in mempool from previous disconnects
 
             # Reorg back with 25 block chain from node 0
-            self.utxo = self.nodes[0].listunspent()
             for i in range(25):
-                self.mine_full_block(self.nodes[0],self.address[0])
+                mine_large_block(self.nodes[0])
 
             # Create connections in the order so both nodes can see the reorg at the same time
             connect_nodes(self.nodes[1], 0)
@@ -217,31 +205,6 @@ def reorg_back(self):
         # Verify we can now have the data for a block previously pruned
         assert(self.nodes[2].getblock(self.forkhash)["height"] == self.forkheight)
 
-    def mine_full_block(self, node, address):
-        # Want to create a full block
-        # We'll generate a 66k transaction below, and 14 of them is close to the 1MB block limit
-        for j in range(14):
-            if len(self.utxo) < 14:
-                self.utxo = node.listunspent()
-            inputs=[]
-            outputs = {}
-            t = self.utxo.pop()
-            inputs.append({ "txid" : t["txid"], "vout" : t["vout"]})
-            remchange = t["amount"] - 100*self.relayfee # Fee must be above min relay rate for 66kb tx
-            outputs[address]=remchange
-            # Create a basic transaction that will send change back to ourself after account for a fee
-            # And then insert the 128 generated transaction outs in the middle rawtx[92] is where the #
-            # of txouts is stored and is the only thing we overwrite from the original transaction
-            rawtx = node.createrawtransaction(inputs, outputs)
-            newtx = rawtx[0:92]
-            newtx = newtx + self.txouts
-            newtx = newtx + rawtx[94:]
-            # Appears to be ever so slightly faster to sign with SIGHASH_NONE
-            signresult = node.signrawtransaction(newtx,None,None,"NONE")
-            txid = node.sendrawtransaction(signresult["hex"], True)
-        # Mine a full sized block which will be these transactions we just created
-        node.generate(1)
-
 
     def run_test(self):
         print("Warning! This test requires 4GB of disk space and takes over 30 mins (up to 2 hours)")
diff --git a/qa/rpc-tests/test_framework/util.py b/qa/rpc-tests/test_framework/util.py
index 24a9d434af3f0..2c428d1687c76 100644
--- a/qa/rpc-tests/test_framework/util.py
+++ b/qa/rpc-tests/test_framework/util.py
@@ -657,13 +657,12 @@ def create_tx(node, coinbase, to_address, amount):
 def create_lots_of_big_transactions(node, txouts, utxos, fee):
     addr = node.getnewaddress()
     txids = []
-    for i in range(len(utxos)):
+    for _ in range(len(utxos)):
         t = utxos.pop()
-        inputs = []
-        inputs.append({ "txid" : t["txid"], "vout" : t["vout"]})
+        inputs=[{ "txid" : t["txid"], "vout" : t["vout"]}]
         outputs = {}
-        send_value = t['amount'] - fee
-        outputs[addr] = satoshi_round(send_value)
+        change = t['amount'] - fee
+        outputs[addr] = satoshi_round(change)
         rawtx = node.createrawtransaction(inputs, outputs)
         newtx = rawtx[0:92]
         newtx = newtx + txouts
@@ -673,6 +672,15 @@ def create_lots_of_big_transactions(node, txouts, utxos, fee):
         txids.append(txid)
     return txids
 
+def mine_large_block(node):
+    # generate a 66k transaction,
+    # and 14 of them is close to the 1MB block limit
+    txouts = gen_return_txouts()
+    utxos = node.listunspent()[:14]
+    fee = 100 * node.getnetworkinfo()["relayfee"]
+    create_lots_of_big_transactions(node, txouts, utxos, fee=fee)
+    node.generate(1)
+
 def get_bip9_status(node, key):
     info = node.getblockchaininfo()
     return info['bip9_softforks'][key]

From e736772c56a883e2649cc8534dd7857a0718ec56 Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Thu, 1 Dec 2016 15:45:50 -0800
Subject: [PATCH 1300/1802] Move network-msg-processing code out of main to its
 own file

---
 src/Makefile.am                |    2 +
 src/bench/checkblock.cpp       |    1 +
 src/init.cpp                   |    1 +
 src/main.cpp                   | 3005 +------------------------------
 src/main.h                     |   48 +-
 src/net_processing.cpp         | 3026 ++++++++++++++++++++++++++++++++
 src/net_processing.h           |   51 +
 src/qt/clientmodel.cpp         |    1 +
 src/qt/peertablemodel.cpp      |    1 +
 src/qt/peertablemodel.h        |    2 +-
 src/qt/walletmodel.cpp         |    2 +
 src/rpc/net.cpp                |    1 +
 src/test/DoS_tests.cpp         |    2 +-
 src/test/main_tests.cpp        |    1 +
 src/test/test_bitcoin.cpp      |    1 +
 src/zmq/zmqpublishnotifier.cpp |    1 +
 16 files changed, 3107 insertions(+), 3039 deletions(-)
 create mode 100644 src/net_processing.cpp
 create mode 100644 src/net_processing.h

diff --git a/src/Makefile.am b/src/Makefile.am
index 69ae02f582b30..1df48305e741d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -109,6 +109,7 @@ BITCOIN_CORE_H = \
   merkleblock.h \
   miner.h \
   net.h \
+  net_processing.h \
   netaddress.h \
   netbase.h \
   netmessagemaker.h \
@@ -183,6 +184,7 @@ libbitcoin_server_a_SOURCES = \
   merkleblock.cpp \
   miner.cpp \
   net.cpp \
+  net_processing.cpp \
   noui.cpp \
   policy/fees.cpp \
   policy/policy.cpp \
diff --git a/src/bench/checkblock.cpp b/src/bench/checkblock.cpp
index 4a564d3fc8254..5243682f88b7e 100644
--- a/src/bench/checkblock.cpp
+++ b/src/bench/checkblock.cpp
@@ -6,6 +6,7 @@
 
 #include "chainparams.h"
 #include "main.h"
+#include "streams.h"
 #include "consensus/validation.h"
 
 namespace block_bench {
diff --git a/src/init.cpp b/src/init.cpp
index 377d196f2b874..e27e827ed7bce 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -23,6 +23,7 @@
 #include "miner.h"
 #include "netbase.h"
 #include "net.h"
+#include "net_processing.h"
 #include "policy/policy.h"
 #include "rpc/server.h"
 #include "rpc/register.h"
diff --git a/src/main.cpp b/src/main.cpp
index 66d50c5df0eee..ec5b8f09dab3f 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -5,9 +5,7 @@
 
 #include "main.h"
 
-#include "addrman.h"
 #include "arith_uint256.h"
-#include "blockencodings.h"
 #include "chainparams.h"
 #include "checkpoints.h"
 #include "checkqueue.h"
@@ -16,10 +14,6 @@
 #include "consensus/validation.h"
 #include "hash.h"
 #include "init.h"
-#include "merkleblock.h"
-#include "net.h"
-#include "netmessagemaker.h"
-#include "netbase.h"
 #include "policy/fees.h"
 #include "policy/policy.h"
 #include "pow.h"
@@ -29,6 +23,7 @@
 #include "script/script.h"
 #include "script/sigcache.h"
 #include "script/standard.h"
+#include "timedata.h"
 #include "tinyformat.h"
 #include "txdb.h"
 #include "txmempool.h"
@@ -65,7 +60,6 @@ CCriticalSection cs_main;
 BlockMap mapBlockIndex;
 CChain chainActive;
 CBlockIndex *pindexBestHeader = NULL;
-int64_t nTimeBestReceived = 0; // Used only to inform the wallet of when we last received a block
 CWaitableCriticalSection csBestBlock;
 CConditionVariable cvBlockChange;
 int nScriptCheckThreads = 0;
@@ -88,25 +82,6 @@ CFeeRate minRelayTxFee = CFeeRate(DEFAULT_MIN_RELAY_TX_FEE);
 CAmount maxTxFee = DEFAULT_TRANSACTION_MAXFEE;
 
 CTxMemPool mempool(::minRelayTxFee);
-FeeFilterRounder filterRounder(::minRelayTxFee);
-
-struct IteratorComparator
-{
-    template<typename I>
-    bool operator()(const I& a, const I& b)
-    {
-        return &(*a) < &(*b);
-    }
-};
-
-struct COrphanTx {
-    CTransaction tx;
-    NodeId fromPeer;
-    int64_t nTimeExpire;
-};
-map<uint256, COrphanTx> mapOrphanTransactions GUARDED_BY(cs_main);
-map<COutPoint, set<map<uint256, COrphanTx>::iterator, IteratorComparator>> mapOrphanTransactionsByPrev GUARDED_BY(cs_main);
-void EraseOrphansFor(NodeId peer) EXCLUSIVE_LOCKS_REQUIRED(cs_main);
 
 static void CheckBlockIndex(const Consensus::Params& consensusParams);
 
@@ -115,8 +90,6 @@ CScript COINBASE_FLAGS;
 
 const string strMessageMagic = "Bitcoin Signed Message:\n";
 
-static const uint64_t RANDOMIZER_ID_ADDRESS_RELAY = 0x3cac0035b5866b90ULL; // SHA256("main address relay")[0:8]
-
 // Internal stuff
 namespace {
 
@@ -149,8 +122,6 @@ namespace {
      * missing the data for the block.
      */
     set<CBlockIndex*, CBlockIndexWorkComparator> setBlockIndexCandidates;
-    /** Number of nodes with fSyncStarted. */
-    int nSyncStarted = 0;
     /** All pairs A->B, where A (or one of its ancestors) misses transactions, but B has transactions.
      * Pruned nodes may have entries where B is missing data.
      */
@@ -177,527 +148,13 @@ namespace {
     /** chainwork for the last block that preciousblock has been applied to. */
     arith_uint256 nLastPreciousChainwork = 0;
 
-    /**
-     * Sources of received blocks, saved to be able to send them reject
-     * messages or ban them when processing happens afterwards. Protected by
-     * cs_main.
-     * Set mapBlockSource[hash].second to false if the node should not be
-     * punished if the block is invalid.
-     */
-    map<uint256, std::pair<NodeId, bool>> mapBlockSource;
-
-    /**
-     * Filter for transactions that were recently rejected by
-     * AcceptToMemoryPool. These are not rerequested until the chain tip
-     * changes, at which point the entire filter is reset. Protected by
-     * cs_main.
-     *
-     * Without this filter we'd be re-requesting txs from each of our peers,
-     * increasing bandwidth consumption considerably. For instance, with 100
-     * peers, half of which relay a tx we don't accept, that might be a 50x
-     * bandwidth increase. A flooding attacker attempting to roll-over the
-     * filter using minimum-sized, 60byte, transactions might manage to send
-     * 1000/sec if we have fast peers, so we pick 120,000 to give our peers a
-     * two minute window to send invs to us.
-     *
-     * Decreasing the false positive rate is fairly cheap, so we pick one in a
-     * million to make it highly unlikely for users to have issues with this
-     * filter.
-     *
-     * Memory used: 1.3 MB
-     */
-    std::unique_ptr<CRollingBloomFilter> recentRejects;
-    uint256 hashRecentRejectsChainTip;
-
-    /** Blocks that are in flight, and that are in the queue to be downloaded. Protected by cs_main. */
-    struct QueuedBlock {
-        uint256 hash;
-        CBlockIndex* pindex;                                     //!< Optional.
-        bool fValidatedHeaders;                                  //!< Whether this block has validated headers at the time of request.
-        std::unique_ptr<PartiallyDownloadedBlock> partialBlock;  //!< Optional, used for CMPCTBLOCK downloads
-    };
-    map<uint256, pair<NodeId, list<QueuedBlock>::iterator> > mapBlocksInFlight;
-
-    /** Stack of nodes which we have set to announce using compact blocks */
-    list<NodeId> lNodesAnnouncingHeaderAndIDs;
-
-    /** Number of preferable block download peers. */
-    int nPreferredDownload = 0;
-
     /** Dirty block index entries. */
     set<CBlockIndex*> setDirtyBlockIndex;
 
     /** Dirty block file entries. */
     set<int> setDirtyFileInfo;
-
-    /** Number of peers from which we're downloading blocks. */
-    int nPeersWithValidatedDownloads = 0;
-
-    /** Relay map, protected by cs_main. */
-    typedef std::map<uint256, CTransactionRef> MapRelay;
-    MapRelay mapRelay;
-    /** Expiration-time ordered list of (expire time, relay map entry) pairs, protected by cs_main). */
-    std::deque<std::pair<int64_t, MapRelay::iterator>> vRelayExpiration;
-} // anon namespace
-
-//////////////////////////////////////////////////////////////////////////////
-//
-// Registration of network node signals.
-//
-
-namespace {
-
-struct CBlockReject {
-    unsigned char chRejectCode;
-    string strRejectReason;
-    uint256 hashBlock;
-};
-
-/**
- * Maintain validation-specific state about nodes, protected by cs_main, instead
- * by CNode's own locks. This simplifies asynchronous operation, where
- * processing of incoming data is done after the ProcessMessage call returns,
- * and we're no longer holding the node's locks.
- */
-struct CNodeState {
-    //! The peer's address
-    const CService address;
-    //! Whether we have a fully established connection.
-    bool fCurrentlyConnected;
-    //! Accumulated misbehaviour score for this peer.
-    int nMisbehavior;
-    //! Whether this peer should be disconnected and banned (unless whitelisted).
-    bool fShouldBan;
-    //! String name of this peer (debugging/logging purposes).
-    const std::string name;
-    //! List of asynchronously-determined block rejections to notify this peer about.
-    std::vector<CBlockReject> rejects;
-    //! The best known block we know this peer has announced.
-    CBlockIndex *pindexBestKnownBlock;
-    //! The hash of the last unknown block this peer has announced.
-    uint256 hashLastUnknownBlock;
-    //! The last full block we both have.
-    CBlockIndex *pindexLastCommonBlock;
-    //! The best header we have sent our peer.
-    CBlockIndex *pindexBestHeaderSent;
-    //! Length of current-streak of unconnecting headers announcements
-    int nUnconnectingHeaders;
-    //! Whether we've started headers synchronization with this peer.
-    bool fSyncStarted;
-    //! Since when we're stalling block download progress (in microseconds), or 0.
-    int64_t nStallingSince;
-    list<QueuedBlock> vBlocksInFlight;
-    //! When the first entry in vBlocksInFlight started downloading. Don't care when vBlocksInFlight is empty.
-    int64_t nDownloadingSince;
-    int nBlocksInFlight;
-    int nBlocksInFlightValidHeaders;
-    //! Whether we consider this a preferred download peer.
-    bool fPreferredDownload;
-    //! Whether this peer wants invs or headers (when possible) for block announcements.
-    bool fPreferHeaders;
-    //! Whether this peer wants invs or cmpctblocks (when possible) for block announcements.
-    bool fPreferHeaderAndIDs;
-    /**
-      * Whether this peer will send us cmpctblocks if we request them.
-      * This is not used to gate request logic, as we really only care about fSupportsDesiredCmpctVersion,
-      * but is used as a flag to "lock in" the version of compact blocks (fWantsCmpctWitness) we send.
-      */
-    bool fProvidesHeaderAndIDs;
-    //! Whether this peer can give us witnesses
-    bool fHaveWitness;
-    //! Whether this peer wants witnesses in cmpctblocks/blocktxns
-    bool fWantsCmpctWitness;
-    /**
-     * If we've announced NODE_WITNESS to this peer: whether the peer sends witnesses in cmpctblocks/blocktxns,
-     * otherwise: whether this peer sends non-witnesses in cmpctblocks/blocktxns.
-     */
-    bool fSupportsDesiredCmpctVersion;
-
-    CNodeState(CAddress addrIn, std::string addrNameIn) : address(addrIn), name(addrNameIn) {
-        fCurrentlyConnected = false;
-        nMisbehavior = 0;
-        fShouldBan = false;
-        pindexBestKnownBlock = NULL;
-        hashLastUnknownBlock.SetNull();
-        pindexLastCommonBlock = NULL;
-        pindexBestHeaderSent = NULL;
-        nUnconnectingHeaders = 0;
-        fSyncStarted = false;
-        nStallingSince = 0;
-        nDownloadingSince = 0;
-        nBlocksInFlight = 0;
-        nBlocksInFlightValidHeaders = 0;
-        fPreferredDownload = false;
-        fPreferHeaders = false;
-        fPreferHeaderAndIDs = false;
-        fProvidesHeaderAndIDs = false;
-        fHaveWitness = false;
-        fWantsCmpctWitness = false;
-        fSupportsDesiredCmpctVersion = false;
-    }
-};
-
-/** Map maintaining per-node state. Requires cs_main. */
-map<NodeId, CNodeState> mapNodeState;
-
-// Requires cs_main.
-CNodeState *State(NodeId pnode) {
-    map<NodeId, CNodeState>::iterator it = mapNodeState.find(pnode);
-    if (it == mapNodeState.end())
-        return NULL;
-    return &it->second;
-}
-
-void UpdatePreferredDownload(CNode* node, CNodeState* state)
-{
-    nPreferredDownload -= state->fPreferredDownload;
-
-    // Whether this node should be marked as a preferred download node.
-    state->fPreferredDownload = (!node->fInbound || node->fWhitelisted) && !node->fOneShot && !node->fClient;
-
-    nPreferredDownload += state->fPreferredDownload;
-}
-
-void PushNodeVersion(CNode *pnode, CConnman& connman, int64_t nTime)
-{
-    ServiceFlags nLocalNodeServices = pnode->GetLocalServices();
-    uint64_t nonce = pnode->GetLocalNonce();
-    int nNodeStartingHeight = pnode->GetMyStartingHeight();
-    NodeId nodeid = pnode->GetId();
-    CAddress addr = pnode->addr;
-
-    CAddress addrYou = (addr.IsRoutable() && !IsProxy(addr) ? addr : CAddress(CService(), addr.nServices));
-    CAddress addrMe = CAddress(CService(), nLocalNodeServices);
-
-    connman.PushMessage(pnode, CNetMsgMaker(INIT_PROTO_VERSION).Make(NetMsgType::VERSION, PROTOCOL_VERSION, (uint64_t)nLocalNodeServices, nTime, addrYou, addrMe,
-            nonce, strSubVersion, nNodeStartingHeight, ::fRelayTxes));
-
-    if (fLogIPs)
-        LogPrint("net", "send version message: version %d, blocks=%d, us=%s, them=%s, peer=%d\n", PROTOCOL_VERSION, nNodeStartingHeight, addrMe.ToString(), addrYou.ToString(), nodeid);
-    else
-        LogPrint("net", "send version message: version %d, blocks=%d, us=%s, peer=%d\n", PROTOCOL_VERSION, nNodeStartingHeight, addrMe.ToString(), nodeid);
-}
-
-void InitializeNode(CNode *pnode, CConnman& connman) {
-    CAddress addr = pnode->addr;
-    std::string addrName = pnode->addrName;
-    NodeId nodeid = pnode->GetId();
-    {
-        LOCK(cs_main);
-        mapNodeState.emplace_hint(mapNodeState.end(), std::piecewise_construct, std::forward_as_tuple(nodeid), std::forward_as_tuple(addr, std::move(addrName)));
-    }
-    if(!pnode->fInbound)
-        PushNodeVersion(pnode, connman, GetTime());
-}
-
-void FinalizeNode(NodeId nodeid, bool& fUpdateConnectionTime) {
-    fUpdateConnectionTime = false;
-    LOCK(cs_main);
-    CNodeState *state = State(nodeid);
-
-    if (state->fSyncStarted)
-        nSyncStarted--;
-
-    if (state->nMisbehavior == 0 && state->fCurrentlyConnected) {
-        fUpdateConnectionTime = true;
-    }
-
-    BOOST_FOREACH(const QueuedBlock& entry, state->vBlocksInFlight) {
-        mapBlocksInFlight.erase(entry.hash);
-    }
-    EraseOrphansFor(nodeid);
-    nPreferredDownload -= state->fPreferredDownload;
-    nPeersWithValidatedDownloads -= (state->nBlocksInFlightValidHeaders != 0);
-    assert(nPeersWithValidatedDownloads >= 0);
-
-    mapNodeState.erase(nodeid);
-
-    if (mapNodeState.empty()) {
-        // Do a consistency check after the last peer is removed.
-        assert(mapBlocksInFlight.empty());
-        assert(nPreferredDownload == 0);
-        assert(nPeersWithValidatedDownloads == 0);
-    }
-}
-
-// Requires cs_main.
-// Returns a bool indicating whether we requested this block.
-// Also used if a block was /not/ received and timed out or started with another peer
-bool MarkBlockAsReceived(const uint256& hash) {
-    map<uint256, pair<NodeId, list<QueuedBlock>::iterator> >::iterator itInFlight = mapBlocksInFlight.find(hash);
-    if (itInFlight != mapBlocksInFlight.end()) {
-        CNodeState *state = State(itInFlight->second.first);
-        state->nBlocksInFlightValidHeaders -= itInFlight->second.second->fValidatedHeaders;
-        if (state->nBlocksInFlightValidHeaders == 0 && itInFlight->second.second->fValidatedHeaders) {
-            // Last validated block on the queue was received.
-            nPeersWithValidatedDownloads--;
-        }
-        if (state->vBlocksInFlight.begin() == itInFlight->second.second) {
-            // First block on the queue was received, update the start download time for the next one
-            state->nDownloadingSince = std::max(state->nDownloadingSince, GetTimeMicros());
-        }
-        state->vBlocksInFlight.erase(itInFlight->second.second);
-        state->nBlocksInFlight--;
-        state->nStallingSince = 0;
-        mapBlocksInFlight.erase(itInFlight);
-        return true;
-    }
-    return false;
-}
-
-// Requires cs_main.
-// returns false, still setting pit, if the block was already in flight from the same peer
-// pit will only be valid as long as the same cs_main lock is being held
-bool MarkBlockAsInFlight(NodeId nodeid, const uint256& hash, const Consensus::Params& consensusParams, CBlockIndex *pindex = NULL, list<QueuedBlock>::iterator **pit = NULL) {
-    CNodeState *state = State(nodeid);
-    assert(state != NULL);
-
-    // Short-circuit most stuff in case its from the same node
-    map<uint256, pair<NodeId, list<QueuedBlock>::iterator> >::iterator itInFlight = mapBlocksInFlight.find(hash);
-    if (itInFlight != mapBlocksInFlight.end() && itInFlight->second.first == nodeid) {
-        *pit = &itInFlight->second.second;
-        return false;
-    }
-
-    // Make sure it's not listed somewhere already.
-    MarkBlockAsReceived(hash);
-
-    list<QueuedBlock>::iterator it = state->vBlocksInFlight.insert(state->vBlocksInFlight.end(),
-            {hash, pindex, pindex != NULL, std::unique_ptr<PartiallyDownloadedBlock>(pit ? new PartiallyDownloadedBlock(&mempool) : NULL)});
-    state->nBlocksInFlight++;
-    state->nBlocksInFlightValidHeaders += it->fValidatedHeaders;
-    if (state->nBlocksInFlight == 1) {
-        // We're starting a block download (batch) from this peer.
-        state->nDownloadingSince = GetTimeMicros();
-    }
-    if (state->nBlocksInFlightValidHeaders == 1 && pindex != NULL) {
-        nPeersWithValidatedDownloads++;
-    }
-    itInFlight = mapBlocksInFlight.insert(std::make_pair(hash, std::make_pair(nodeid, it))).first;
-    if (pit)
-        *pit = &itInFlight->second.second;
-    return true;
-}
-
-/** Check whether the last unknown block a peer advertised is not yet known. */
-void ProcessBlockAvailability(NodeId nodeid) {
-    CNodeState *state = State(nodeid);
-    assert(state != NULL);
-
-    if (!state->hashLastUnknownBlock.IsNull()) {
-        BlockMap::iterator itOld = mapBlockIndex.find(state->hashLastUnknownBlock);
-        if (itOld != mapBlockIndex.end() && itOld->second->nChainWork > 0) {
-            if (state->pindexBestKnownBlock == NULL || itOld->second->nChainWork >= state->pindexBestKnownBlock->nChainWork)
-                state->pindexBestKnownBlock = itOld->second;
-            state->hashLastUnknownBlock.SetNull();
-        }
-    }
-}
-
-/** Update tracking information about which blocks a peer is assumed to have. */
-void UpdateBlockAvailability(NodeId nodeid, const uint256 &hash) {
-    CNodeState *state = State(nodeid);
-    assert(state != NULL);
-
-    ProcessBlockAvailability(nodeid);
-
-    BlockMap::iterator it = mapBlockIndex.find(hash);
-    if (it != mapBlockIndex.end() && it->second->nChainWork > 0) {
-        // An actually better block was announced.
-        if (state->pindexBestKnownBlock == NULL || it->second->nChainWork >= state->pindexBestKnownBlock->nChainWork)
-            state->pindexBestKnownBlock = it->second;
-    } else {
-        // An unknown block was announced; just assume that the latest one is the best one.
-        state->hashLastUnknownBlock = hash;
-    }
-}
-
-void MaybeSetPeerAsAnnouncingHeaderAndIDs(const CNodeState* nodestate, CNode* pfrom, CConnman& connman) {
-    if (!nodestate->fSupportsDesiredCmpctVersion) {
-        // Never ask from peers who can't provide witnesses.
-        return;
-    }
-    if (nodestate->fProvidesHeaderAndIDs) {
-        for (std::list<NodeId>::iterator it = lNodesAnnouncingHeaderAndIDs.begin(); it != lNodesAnnouncingHeaderAndIDs.end(); it++) {
-            if (*it == pfrom->GetId()) {
-                lNodesAnnouncingHeaderAndIDs.erase(it);
-                lNodesAnnouncingHeaderAndIDs.push_back(pfrom->GetId());
-                return;
-            }
-        }
-        bool fAnnounceUsingCMPCTBLOCK = false;
-        uint64_t nCMPCTBLOCKVersion = (pfrom->GetLocalServices() & NODE_WITNESS) ? 2 : 1;
-        if (lNodesAnnouncingHeaderAndIDs.size() >= 3) {
-            // As per BIP152, we only get 3 of our peers to announce
-            // blocks using compact encodings.
-            connman.ForNode(lNodesAnnouncingHeaderAndIDs.front(), [&connman, fAnnounceUsingCMPCTBLOCK, nCMPCTBLOCKVersion](CNode* pnodeStop){
-                connman.PushMessage(pnodeStop, CNetMsgMaker(pnodeStop->GetSendVersion()).Make(NetMsgType::SENDCMPCT, fAnnounceUsingCMPCTBLOCK, nCMPCTBLOCKVersion));
-                return true;
-            });
-            lNodesAnnouncingHeaderAndIDs.pop_front();
-        }
-        fAnnounceUsingCMPCTBLOCK = true;
-        connman.PushMessage(pfrom, CNetMsgMaker(pfrom->GetSendVersion()).Make(NetMsgType::SENDCMPCT, fAnnounceUsingCMPCTBLOCK, nCMPCTBLOCKVersion));
-        lNodesAnnouncingHeaderAndIDs.push_back(pfrom->GetId());
-    }
-}
-
-// Requires cs_main
-bool CanDirectFetch(const Consensus::Params &consensusParams)
-{
-    return chainActive.Tip()->GetBlockTime() > GetAdjustedTime() - consensusParams.nPowTargetSpacing * 20;
-}
-
-// Requires cs_main
-bool PeerHasHeader(CNodeState *state, CBlockIndex *pindex)
-{
-    if (state->pindexBestKnownBlock && pindex == state->pindexBestKnownBlock->GetAncestor(pindex->nHeight))
-        return true;
-    if (state->pindexBestHeaderSent && pindex == state->pindexBestHeaderSent->GetAncestor(pindex->nHeight))
-        return true;
-    return false;
-}
-
-/** Find the last common ancestor two blocks have.
- *  Both pa and pb must be non-NULL. */
-CBlockIndex* LastCommonAncestor(CBlockIndex* pa, CBlockIndex* pb) {
-    if (pa->nHeight > pb->nHeight) {
-        pa = pa->GetAncestor(pb->nHeight);
-    } else if (pb->nHeight > pa->nHeight) {
-        pb = pb->GetAncestor(pa->nHeight);
-    }
-
-    while (pa != pb && pa && pb) {
-        pa = pa->pprev;
-        pb = pb->pprev;
-    }
-
-    // Eventually all chain branches meet at the genesis block.
-    assert(pa == pb);
-    return pa;
-}
-
-/** Update pindexLastCommonBlock and add not-in-flight missing successors to vBlocks, until it has
- *  at most count entries. */
-void FindNextBlocksToDownload(NodeId nodeid, unsigned int count, std::vector<CBlockIndex*>& vBlocks, NodeId& nodeStaller, const Consensus::Params& consensusParams) {
-    if (count == 0)
-        return;
-
-    vBlocks.reserve(vBlocks.size() + count);
-    CNodeState *state = State(nodeid);
-    assert(state != NULL);
-
-    // Make sure pindexBestKnownBlock is up to date, we'll need it.
-    ProcessBlockAvailability(nodeid);
-
-    if (state->pindexBestKnownBlock == NULL || state->pindexBestKnownBlock->nChainWork < chainActive.Tip()->nChainWork) {
-        // This peer has nothing interesting.
-        return;
-    }
-
-    if (state->pindexLastCommonBlock == NULL) {
-        // Bootstrap quickly by guessing a parent of our best tip is the forking point.
-        // Guessing wrong in either direction is not a problem.
-        state->pindexLastCommonBlock = chainActive[std::min(state->pindexBestKnownBlock->nHeight, chainActive.Height())];
-    }
-
-    // If the peer reorganized, our previous pindexLastCommonBlock may not be an ancestor
-    // of its current tip anymore. Go back enough to fix that.
-    state->pindexLastCommonBlock = LastCommonAncestor(state->pindexLastCommonBlock, state->pindexBestKnownBlock);
-    if (state->pindexLastCommonBlock == state->pindexBestKnownBlock)
-        return;
-
-    std::vector<CBlockIndex*> vToFetch;
-    CBlockIndex *pindexWalk = state->pindexLastCommonBlock;
-    // Never fetch further than the best block we know the peer has, or more than BLOCK_DOWNLOAD_WINDOW + 1 beyond the last
-    // linked block we have in common with this peer. The +1 is so we can detect stalling, namely if we would be able to
-    // download that next block if the window were 1 larger.
-    int nWindowEnd = state->pindexLastCommonBlock->nHeight + BLOCK_DOWNLOAD_WINDOW;
-    int nMaxHeight = std::min<int>(state->pindexBestKnownBlock->nHeight, nWindowEnd + 1);
-    NodeId waitingfor = -1;
-    while (pindexWalk->nHeight < nMaxHeight) {
-        // Read up to 128 (or more, if more blocks than that are needed) successors of pindexWalk (towards
-        // pindexBestKnownBlock) into vToFetch. We fetch 128, because CBlockIndex::GetAncestor may be as expensive
-        // as iterating over ~100 CBlockIndex* entries anyway.
-        int nToFetch = std::min(nMaxHeight - pindexWalk->nHeight, std::max<int>(count - vBlocks.size(), 128));
-        vToFetch.resize(nToFetch);
-        pindexWalk = state->pindexBestKnownBlock->GetAncestor(pindexWalk->nHeight + nToFetch);
-        vToFetch[nToFetch - 1] = pindexWalk;
-        for (unsigned int i = nToFetch - 1; i > 0; i--) {
-            vToFetch[i - 1] = vToFetch[i]->pprev;
-        }
-
-        // Iterate over those blocks in vToFetch (in forward direction), adding the ones that
-        // are not yet downloaded and not in flight to vBlocks. In the mean time, update
-        // pindexLastCommonBlock as long as all ancestors are already downloaded, or if it's
-        // already part of our chain (and therefore don't need it even if pruned).
-        BOOST_FOREACH(CBlockIndex* pindex, vToFetch) {
-            if (!pindex->IsValid(BLOCK_VALID_TREE)) {
-                // We consider the chain that this peer is on invalid.
-                return;
-            }
-            if (!State(nodeid)->fHaveWitness && IsWitnessEnabled(pindex->pprev, consensusParams)) {
-                // We wouldn't download this block or its descendants from this peer.
-                return;
-            }
-            if (pindex->nStatus & BLOCK_HAVE_DATA || chainActive.Contains(pindex)) {
-                if (pindex->nChainTx)
-                    state->pindexLastCommonBlock = pindex;
-            } else if (mapBlocksInFlight.count(pindex->GetBlockHash()) == 0) {
-                // The block is not already downloaded, and not yet in flight.
-                if (pindex->nHeight > nWindowEnd) {
-                    // We reached the end of the window.
-                    if (vBlocks.size() == 0 && waitingfor != nodeid) {
-                        // We aren't able to fetch anything, but we would be if the download window was one larger.
-                        nodeStaller = waitingfor;
-                    }
-                    return;
-                }
-                vBlocks.push_back(pindex);
-                if (vBlocks.size() == count) {
-                    return;
-                }
-            } else if (waitingfor == -1) {
-                // This is the first already-in-flight block.
-                waitingfor = mapBlocksInFlight[pindex->GetBlockHash()].first;
-            }
-        }
-    }
-}
-
 } // anon namespace
 
-bool GetNodeStateStats(NodeId nodeid, CNodeStateStats &stats) {
-    LOCK(cs_main);
-    CNodeState *state = State(nodeid);
-    if (state == NULL)
-        return false;
-    stats.nMisbehavior = state->nMisbehavior;
-    stats.nSyncHeight = state->pindexBestKnownBlock ? state->pindexBestKnownBlock->nHeight : -1;
-    stats.nCommonHeight = state->pindexLastCommonBlock ? state->pindexLastCommonBlock->nHeight : -1;
-    BOOST_FOREACH(const QueuedBlock& queue, state->vBlocksInFlight) {
-        if (queue.pindex)
-            stats.vHeightInFlight.push_back(queue.pindex->nHeight);
-    }
-    return true;
-}
-
-void RegisterNodeSignals(CNodeSignals& nodeSignals)
-{
-    nodeSignals.ProcessMessages.connect(&ProcessMessages);
-    nodeSignals.SendMessages.connect(&SendMessages);
-    nodeSignals.InitializeNode.connect(&InitializeNode);
-    nodeSignals.FinalizeNode.connect(&FinalizeNode);
-}
-
-void UnregisterNodeSignals(CNodeSignals& nodeSignals)
-{
-    nodeSignals.ProcessMessages.disconnect(&ProcessMessages);
-    nodeSignals.SendMessages.disconnect(&SendMessages);
-    nodeSignals.InitializeNode.disconnect(&InitializeNode);
-    nodeSignals.FinalizeNode.disconnect(&FinalizeNode);
-}
-
 CBlockIndex* FindForkInGlobalIndex(const CChain& chain, const CBlockLocator& locator)
 {
     // Find the first block the caller has in the main chain
@@ -729,112 +186,6 @@ enum FlushStateMode {
 // See definition for documentation
 bool static FlushStateToDisk(CValidationState &state, FlushStateMode mode);
 
-//////////////////////////////////////////////////////////////////////////////
-//
-// mapOrphanTransactions
-//
-
-bool AddOrphanTx(const CTransaction& tx, NodeId peer) EXCLUSIVE_LOCKS_REQUIRED(cs_main)
-{
-    uint256 hash = tx.GetHash();
-    if (mapOrphanTransactions.count(hash))
-        return false;
-
-    // Ignore big transactions, to avoid a
-    // send-big-orphans memory exhaustion attack. If a peer has a legitimate
-    // large transaction with a missing parent then we assume
-    // it will rebroadcast it later, after the parent transaction(s)
-    // have been mined or received.
-    // 100 orphans, each of which is at most 99,999 bytes big is
-    // at most 10 megabytes of orphans and somewhat more byprev index (in the worst case):
-    unsigned int sz = GetTransactionWeight(tx);
-    if (sz >= MAX_STANDARD_TX_WEIGHT)
-    {
-        LogPrint("mempool", "ignoring large orphan tx (size: %u, hash: %s)\n", sz, hash.ToString());
-        return false;
-    }
-
-    auto ret = mapOrphanTransactions.emplace(hash, COrphanTx{tx, peer, GetTime() + ORPHAN_TX_EXPIRE_TIME});
-    assert(ret.second);
-    BOOST_FOREACH(const CTxIn& txin, tx.vin) {
-        mapOrphanTransactionsByPrev[txin.prevout].insert(ret.first);
-    }
-
-    LogPrint("mempool", "stored orphan tx %s (mapsz %u outsz %u)\n", hash.ToString(),
-             mapOrphanTransactions.size(), mapOrphanTransactionsByPrev.size());
-    return true;
-}
-
-int static EraseOrphanTx(uint256 hash) EXCLUSIVE_LOCKS_REQUIRED(cs_main)
-{
-    map<uint256, COrphanTx>::iterator it = mapOrphanTransactions.find(hash);
-    if (it == mapOrphanTransactions.end())
-        return 0;
-    BOOST_FOREACH(const CTxIn& txin, it->second.tx.vin)
-    {
-        auto itPrev = mapOrphanTransactionsByPrev.find(txin.prevout);
-        if (itPrev == mapOrphanTransactionsByPrev.end())
-            continue;
-        itPrev->second.erase(it);
-        if (itPrev->second.empty())
-            mapOrphanTransactionsByPrev.erase(itPrev);
-    }
-    mapOrphanTransactions.erase(it);
-    return 1;
-}
-
-void EraseOrphansFor(NodeId peer)
-{
-    int nErased = 0;
-    map<uint256, COrphanTx>::iterator iter = mapOrphanTransactions.begin();
-    while (iter != mapOrphanTransactions.end())
-    {
-        map<uint256, COrphanTx>::iterator maybeErase = iter++; // increment to avoid iterator becoming invalid
-        if (maybeErase->second.fromPeer == peer)
-        {
-            nErased += EraseOrphanTx(maybeErase->second.tx.GetHash());
-        }
-    }
-    if (nErased > 0) LogPrint("mempool", "Erased %d orphan tx from peer %d\n", nErased, peer);
-}
-
-
-unsigned int LimitOrphanTxSize(unsigned int nMaxOrphans) EXCLUSIVE_LOCKS_REQUIRED(cs_main)
-{
-    unsigned int nEvicted = 0;
-    static int64_t nNextSweep;
-    int64_t nNow = GetTime();
-    if (nNextSweep <= nNow) {
-        // Sweep out expired orphan pool entries:
-        int nErased = 0;
-        int64_t nMinExpTime = nNow + ORPHAN_TX_EXPIRE_TIME - ORPHAN_TX_EXPIRE_INTERVAL;
-        map<uint256, COrphanTx>::iterator iter = mapOrphanTransactions.begin();
-        while (iter != mapOrphanTransactions.end())
-        {
-            map<uint256, COrphanTx>::iterator maybeErase = iter++;
-            if (maybeErase->second.nTimeExpire <= nNow) {
-                nErased += EraseOrphanTx(maybeErase->second.tx.GetHash());
-            } else {
-                nMinExpTime = std::min(maybeErase->second.nTimeExpire, nMinExpTime);
-            }
-        }
-        // Sweep again 5 minutes after the next entry that expires in order to batch the linear scan.
-        nNextSweep = nMinExpTime + ORPHAN_TX_EXPIRE_INTERVAL;
-        if (nErased > 0) LogPrint("mempool", "Erased %d orphan tx due to expiration\n", nErased);
-    }
-    while (mapOrphanTransactions.size() > nMaxOrphans)
-    {
-        // Evict a random orphan:
-        uint256 randomhash = GetRandHash();
-        map<uint256, COrphanTx>::iterator it = mapOrphanTransactions.lower_bound(randomhash);
-        if (it == mapOrphanTransactions.end())
-            it = mapOrphanTransactions.begin();
-        EraseOrphanTx(it->first);
-        ++nEvicted;
-    }
-    return nEvicted;
-}
-
 bool IsFinalTx(const CTransaction &tx, int nBlockHeight, int64_t nBlockTime)
 {
     if (tx.nLockTime == 0)
@@ -1893,26 +1244,6 @@ void CheckForkWarningConditionsOnNewFork(CBlockIndex* pindexNewForkTip)
     CheckForkWarningConditions();
 }
 
-// Requires cs_main.
-void Misbehaving(NodeId pnode, int howmuch)
-{
-    if (howmuch == 0)
-        return;
-
-    CNodeState *state = State(pnode);
-    if (state == NULL)
-        return;
-
-    state->nMisbehavior += howmuch;
-    int banscore = GetArg("-banscore", DEFAULT_BANSCORE_THRESHOLD);
-    if (state->nMisbehavior >= banscore && state->nMisbehavior - howmuch < banscore)
-    {
-        LogPrintf("%s: %s peer=%d (%d -> %d) BAN THRESHOLD EXCEEDED\n", __func__, state->name, pnode, state->nMisbehavior-howmuch, state->nMisbehavior);
-        state->fShouldBan = true;
-    } else
-        LogPrintf("%s: %s peer=%d (%d -> %d)\n", __func__, state->name, pnode, state->nMisbehavior-howmuch, state->nMisbehavior);
-}
-
 void static InvalidChainFound(CBlockIndex* pindexNew)
 {
     if (!pindexBestInvalid || pindexNew->nChainWork > pindexBestInvalid->nChainWork)
@@ -4716,2333 +4047,25 @@ std::string GetWarnings(const std::string& strFor)
     assert(!"GetWarnings(): invalid parameter");
     return "error";
 }
+ std::string CBlockFileInfo::ToString() const {
+     return strprintf("CBlockFileInfo(blocks=%u, size=%u, heights=%u...%u, time=%s...%s)", nBlocks, nSize, nHeightFirst, nHeightLast, DateTimeStrFormat("%Y-%m-%d", nTimeFirst), DateTimeStrFormat("%Y-%m-%d", nTimeLast));
+ }
 
-
-
-
-
-
-
-
-//////////////////////////////////////////////////////////////////////////////
-//
-// blockchain -> download logic notification
-//
-
-PeerLogicValidation::PeerLogicValidation(CConnman* connmanIn) : connman(connmanIn) {
-    // Initialize global variables that cannot be constructed at startup.
-    recentRejects.reset(new CRollingBloomFilter(120000, 0.000001));
-}
-
-void PeerLogicValidation::SyncTransaction(const CTransaction& tx, const CBlockIndex* pindex, int nPosInBlock) {
-    if (nPosInBlock == CMainSignals::SYNC_TRANSACTION_NOT_IN_BLOCK)
-        return;
-
+ThresholdState VersionBitsTipState(const Consensus::Params& params, Consensus::DeploymentPos pos)
+{
     LOCK(cs_main);
-
-    std::vector<uint256> vOrphanErase;
-    // Which orphan pool entries must we evict?
-    for (size_t j = 0; j < tx.vin.size(); j++) {
-        auto itByPrev = mapOrphanTransactionsByPrev.find(tx.vin[j].prevout);
-        if (itByPrev == mapOrphanTransactionsByPrev.end()) continue;
-        for (auto mi = itByPrev->second.begin(); mi != itByPrev->second.end(); ++mi) {
-            const CTransaction& orphanTx = (*mi)->second.tx;
-            const uint256& orphanHash = orphanTx.GetHash();
-            vOrphanErase.push_back(orphanHash);
-        }
-    }
-
-    // Erase orphan transactions include or precluded by this block
-    if (vOrphanErase.size()) {
-        int nErased = 0;
-        BOOST_FOREACH(uint256 &orphanHash, vOrphanErase) {
-            nErased += EraseOrphanTx(orphanHash);
-        }
-        LogPrint("mempool", "Erased %d orphan tx included or conflicted by block\n", nErased);
-    }
-}
-
-void PeerLogicValidation::UpdatedBlockTip(const CBlockIndex *pindexNew, const CBlockIndex *pindexFork, bool fInitialDownload) {
-    const int nNewHeight = pindexNew->nHeight;
-    connman->SetBestHeight(nNewHeight);
-
-    if (!fInitialDownload) {
-        // Find the hashes of all blocks that weren't previously in the best chain.
-        std::vector<uint256> vHashes;
-        const CBlockIndex *pindexToAnnounce = pindexNew;
-        while (pindexToAnnounce != pindexFork) {
-            vHashes.push_back(pindexToAnnounce->GetBlockHash());
-            pindexToAnnounce = pindexToAnnounce->pprev;
-            if (vHashes.size() == MAX_BLOCKS_TO_ANNOUNCE) {
-                // Limit announcements in case of a huge reorganization.
-                // Rely on the peer's synchronization mechanism in that case.
-                break;
-            }
-        }
-        // Relay inventory, but don't relay old inventory during initial block download.
-        connman->ForEachNode([nNewHeight, &vHashes](CNode* pnode) {
-            if (nNewHeight > (pnode->nStartingHeight != -1 ? pnode->nStartingHeight - 2000 : 0)) {
-                BOOST_REVERSE_FOREACH(const uint256& hash, vHashes) {
-                    pnode->PushBlockHash(hash);
-                }
-            }
-        });
-    }
-
-    nTimeBestReceived = GetTime();
+    return VersionBitsState(chainActive.Tip(), params, pos, versionbitscache);
 }
 
-void PeerLogicValidation::BlockChecked(const CBlock& block, const CValidationState& state) {
+int VersionBitsTipStateSinceHeight(const Consensus::Params& params, Consensus::DeploymentPos pos)
+{
     LOCK(cs_main);
-
-    const uint256 hash(block.GetHash());
-    std::map<uint256, std::pair<NodeId, bool>>::iterator it = mapBlockSource.find(hash);
-
-    int nDoS = 0;
-    if (state.IsInvalid(nDoS)) {
-        if (it != mapBlockSource.end() && State(it->second.first)) {
-            assert (state.GetRejectCode() < REJECT_INTERNAL); // Blocks are never rejected with internal reject codes
-            CBlockReject reject = {(unsigned char)state.GetRejectCode(), state.GetRejectReason().substr(0, MAX_REJECT_MESSAGE_LENGTH), hash};
-            State(it->second.first)->rejects.push_back(reject);
-            if (nDoS > 0 && it->second.second)
-                Misbehaving(it->second.first, nDoS);
-        }
-    }
-    if (it != mapBlockSource.end())
-        mapBlockSource.erase(it);
+    return VersionBitsStateSinceHeight(chainActive.Tip(), params, pos, versionbitscache);
 }
 
-//////////////////////////////////////////////////////////////////////////////
-//
-// Messages
-//
-
+static const uint64_t MEMPOOL_DUMP_VERSION = 1;
 
-bool static AlreadyHave(const CInv& inv) EXCLUSIVE_LOCKS_REQUIRED(cs_main)
-{
-    switch (inv.type)
-    {
-    case MSG_TX:
-    case MSG_WITNESS_TX:
-        {
-            assert(recentRejects);
-            if (chainActive.Tip()->GetBlockHash() != hashRecentRejectsChainTip)
-            {
-                // If the chain tip has changed previously rejected transactions
-                // might be now valid, e.g. due to a nLockTime'd tx becoming valid,
-                // or a double-spend. Reset the rejects filter and give those
-                // txs a second chance.
-                hashRecentRejectsChainTip = chainActive.Tip()->GetBlockHash();
-                recentRejects->reset();
-            }
-
-            // Use pcoinsTip->HaveCoinsInCache as a quick approximation to exclude
-            // requesting or processing some txs which have already been included in a block
-            return recentRejects->contains(inv.hash) ||
-                   mempool.exists(inv.hash) ||
-                   mapOrphanTransactions.count(inv.hash) ||
-                   pcoinsTip->HaveCoinsInCache(inv.hash);
-        }
-    case MSG_BLOCK:
-    case MSG_WITNESS_BLOCK:
-        return mapBlockIndex.count(inv.hash);
-    }
-    // Don't know what it is, just say we already got one
-    return true;
-}
-
-static void RelayTransaction(const CTransaction& tx, CConnman& connman)
-{
-    CInv inv(MSG_TX, tx.GetHash());
-    connman.ForEachNode([&inv](CNode* pnode)
-    {
-        pnode->PushInventory(inv);
-    });
-}
-
-static void RelayAddress(const CAddress& addr, bool fReachable, CConnman& connman)
-{
-    unsigned int nRelayNodes = fReachable ? 2 : 1; // limited relaying of addresses outside our network(s)
-
-    // Relay to a limited number of other nodes
-    // Use deterministic randomness to send to the same nodes for 24 hours
-    // at a time so the addrKnowns of the chosen nodes prevent repeats
-    uint64_t hashAddr = addr.GetHash();
-    const CSipHasher hasher = connman.GetDeterministicRandomizer(RANDOMIZER_ID_ADDRESS_RELAY).Write(hashAddr << 32).Write((GetTime() + hashAddr) / (24*60*60));
-    FastRandomContext insecure_rand;
-
-    std::array<std::pair<uint64_t, CNode*>,2> best{{{0, nullptr}, {0, nullptr}}};
-    assert(nRelayNodes <= best.size());
-
-    auto sortfunc = [&best, &hasher, nRelayNodes](CNode* pnode) {
-        if (pnode->nVersion >= CADDR_TIME_VERSION) {
-            uint64_t hashKey = CSipHasher(hasher).Write(pnode->id).Finalize();
-            for (unsigned int i = 0; i < nRelayNodes; i++) {
-                 if (hashKey > best[i].first) {
-                     std::copy(best.begin() + i, best.begin() + nRelayNodes - 1, best.begin() + i + 1);
-                     best[i] = std::make_pair(hashKey, pnode);
-                     break;
-                 }
-            }
-        }
-    };
-
-    auto pushfunc = [&addr, &best, nRelayNodes, &insecure_rand] {
-        for (unsigned int i = 0; i < nRelayNodes && best[i].first != 0; i++) {
-            best[i].second->PushAddress(addr, insecure_rand);
-        }
-    };
-
-    connman.ForEachNodeThen(std::move(sortfunc), std::move(pushfunc));
-}
-
-void static ProcessGetData(CNode* pfrom, const Consensus::Params& consensusParams, CConnman& connman)
-{
-    std::deque<CInv>::iterator it = pfrom->vRecvGetData.begin();
-    unsigned int nMaxSendBufferSize = connman.GetSendBufferSize();
-    vector<CInv> vNotFound;
-    CNetMsgMaker msgMaker(pfrom->GetSendVersion());
-    LOCK(cs_main);
-
-    while (it != pfrom->vRecvGetData.end()) {
-        // Don't bother if send buffer is too full to respond anyway
-        if (pfrom->nSendSize >= nMaxSendBufferSize)
-            break;
-
-        const CInv &inv = *it;
-        {
-            boost::this_thread::interruption_point();
-            it++;
-
-            if (inv.type == MSG_BLOCK || inv.type == MSG_FILTERED_BLOCK || inv.type == MSG_CMPCT_BLOCK || inv.type == MSG_WITNESS_BLOCK)
-            {
-                bool send = false;
-                BlockMap::iterator mi = mapBlockIndex.find(inv.hash);
-                if (mi != mapBlockIndex.end())
-                {
-                    if (chainActive.Contains(mi->second)) {
-                        send = true;
-                    } else {
-                        static const int nOneMonth = 30 * 24 * 60 * 60;
-                        // To prevent fingerprinting attacks, only send blocks outside of the active
-                        // chain if they are valid, and no more than a month older (both in time, and in
-                        // best equivalent proof of work) than the best header chain we know about.
-                        send = mi->second->IsValid(BLOCK_VALID_SCRIPTS) && (pindexBestHeader != NULL) &&
-                            (pindexBestHeader->GetBlockTime() - mi->second->GetBlockTime() < nOneMonth) &&
-                            (GetBlockProofEquivalentTime(*pindexBestHeader, *mi->second, *pindexBestHeader, consensusParams) < nOneMonth);
-                        if (!send) {
-                            LogPrintf("%s: ignoring request from peer=%i for old block that isn't in the main chain\n", __func__, pfrom->GetId());
-                        }
-                    }
-                }
-                // disconnect node in case we have reached the outbound limit for serving historical blocks
-                // never disconnect whitelisted nodes
-                static const int nOneWeek = 7 * 24 * 60 * 60; // assume > 1 week = historical
-                if (send && connman.OutboundTargetReached(true) && ( ((pindexBestHeader != NULL) && (pindexBestHeader->GetBlockTime() - mi->second->GetBlockTime() > nOneWeek)) || inv.type == MSG_FILTERED_BLOCK) && !pfrom->fWhitelisted)
-                {
-                    LogPrint("net", "historical block serving limit reached, disconnect peer=%d\n", pfrom->GetId());
-
-                    //disconnect node
-                    pfrom->fDisconnect = true;
-                    send = false;
-                }
-                // Pruned nodes may have deleted the block, so check whether
-                // it's available before trying to send.
-                if (send && (mi->second->nStatus & BLOCK_HAVE_DATA))
-                {
-                    // Send block from disk
-                    CBlock block;
-                    if (!ReadBlockFromDisk(block, (*mi).second, consensusParams))
-                        assert(!"cannot load block from disk");
-                    if (inv.type == MSG_BLOCK)
-                        connman.PushMessage(pfrom, msgMaker.Make(SERIALIZE_TRANSACTION_NO_WITNESS, NetMsgType::BLOCK, block));
-                    else if (inv.type == MSG_WITNESS_BLOCK)
-                        connman.PushMessage(pfrom, msgMaker.Make(NetMsgType::BLOCK, block));
-                    else if (inv.type == MSG_FILTERED_BLOCK)
-                    {
-                        bool sendMerkleBlock = false;
-                        CMerkleBlock merkleBlock;
-                        {
-                            LOCK(pfrom->cs_filter);
-                            if (pfrom->pfilter) {
-                                sendMerkleBlock = true;
-                                merkleBlock = CMerkleBlock(block, *pfrom->pfilter);
-                            }
-                        }
-                        if (sendMerkleBlock) {
-                            connman.PushMessage(pfrom, msgMaker.Make(NetMsgType::MERKLEBLOCK, merkleBlock));
-                            // CMerkleBlock just contains hashes, so also push any transactions in the block the client did not see
-                            // This avoids hurting performance by pointlessly requiring a round-trip
-                            // Note that there is currently no way for a node to request any single transactions we didn't send here -
-                            // they must either disconnect and retry or request the full block.
-                            // Thus, the protocol spec specified allows for us to provide duplicate txn here,
-                            // however we MUST always provide at least what the remote peer needs
-                            typedef std::pair<unsigned int, uint256> PairType;
-                            BOOST_FOREACH(PairType& pair, merkleBlock.vMatchedTxn)
-                                connman.PushMessage(pfrom, msgMaker.Make(SERIALIZE_TRANSACTION_NO_WITNESS, NetMsgType::TX, *block.vtx[pair.first]));
-                        }
-                        // else
-                            // no response
-                    }
-                    else if (inv.type == MSG_CMPCT_BLOCK)
-                    {
-                        // If a peer is asking for old blocks, we're almost guaranteed
-                        // they won't have a useful mempool to match against a compact block,
-                        // and we don't feel like constructing the object for them, so
-                        // instead we respond with the full, non-compact block.
-                        bool fPeerWantsWitness = State(pfrom->GetId())->fWantsCmpctWitness;
-                        int nSendFlags = fPeerWantsWitness ? 0 : SERIALIZE_TRANSACTION_NO_WITNESS;
-                        if (CanDirectFetch(consensusParams) && mi->second->nHeight >= chainActive.Height() - MAX_CMPCTBLOCK_DEPTH) {
-                            CBlockHeaderAndShortTxIDs cmpctblock(block, fPeerWantsWitness);
-                            connman.PushMessage(pfrom, msgMaker.Make(nSendFlags, NetMsgType::CMPCTBLOCK, cmpctblock));
-                        } else
-                            connman.PushMessage(pfrom, msgMaker.Make(nSendFlags, NetMsgType::BLOCK, block));
-                    }
-
-                    // Trigger the peer node to send a getblocks request for the next batch of inventory
-                    if (inv.hash == pfrom->hashContinue)
-                    {
-                        // Bypass PushInventory, this must send even if redundant,
-                        // and we want it right after the last block so they don't
-                        // wait for other stuff first.
-                        vector<CInv> vInv;
-                        vInv.push_back(CInv(MSG_BLOCK, chainActive.Tip()->GetBlockHash()));
-                        connman.PushMessage(pfrom, msgMaker.Make(NetMsgType::INV, vInv));
-                        pfrom->hashContinue.SetNull();
-                    }
-                }
-            }
-            else if (inv.type == MSG_TX || inv.type == MSG_WITNESS_TX)
-            {
-                // Send stream from relay memory
-                bool push = false;
-                auto mi = mapRelay.find(inv.hash);
-                int nSendFlags = (inv.type == MSG_TX ? SERIALIZE_TRANSACTION_NO_WITNESS : 0);
-                if (mi != mapRelay.end()) {
-                    connman.PushMessage(pfrom, msgMaker.Make(nSendFlags, NetMsgType::TX, *mi->second));
-                    push = true;
-                } else if (pfrom->timeLastMempoolReq) {
-                    auto txinfo = mempool.info(inv.hash);
-                    // To protect privacy, do not answer getdata using the mempool when
-                    // that TX couldn't have been INVed in reply to a MEMPOOL request.
-                    if (txinfo.tx && txinfo.nTime <= pfrom->timeLastMempoolReq) {
-                        connman.PushMessage(pfrom, msgMaker.Make(nSendFlags, NetMsgType::TX, *txinfo.tx));
-                        push = true;
-                    }
-                }
-                if (!push) {
-                    vNotFound.push_back(inv);
-                }
-            }
-
-            // Track requests for our stuff.
-            GetMainSignals().Inventory(inv.hash);
-
-            if (inv.type == MSG_BLOCK || inv.type == MSG_FILTERED_BLOCK || inv.type == MSG_CMPCT_BLOCK || inv.type == MSG_WITNESS_BLOCK)
-                break;
-        }
-    }
-
-    pfrom->vRecvGetData.erase(pfrom->vRecvGetData.begin(), it);
-
-    if (!vNotFound.empty()) {
-        // Let the peer know that we didn't find what it asked for, so it doesn't
-        // have to wait around forever. Currently only SPV clients actually care
-        // about this message: it's needed when they are recursively walking the
-        // dependencies of relevant unconfirmed transactions. SPV clients want to
-        // do that because they want to know about (and store and rebroadcast and
-        // risk analyze) the dependencies of transactions relevant to them, without
-        // having to download the entire memory pool.
-        connman.PushMessage(pfrom, msgMaker.Make(NetMsgType::NOTFOUND, vNotFound));
-    }
-}
-
-uint32_t GetFetchFlags(CNode* pfrom, CBlockIndex* pprev, const Consensus::Params& chainparams) {
-    uint32_t nFetchFlags = 0;
-    if ((pfrom->GetLocalServices() & NODE_WITNESS) && State(pfrom->GetId())->fHaveWitness) {
-        nFetchFlags |= MSG_WITNESS_FLAG;
-    }
-    return nFetchFlags;
-}
-
-bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv, int64_t nTimeReceived, const CChainParams& chainparams, CConnman& connman)
-{
-    unsigned int nMaxSendBufferSize = connman.GetSendBufferSize();
-
-    LogPrint("net", "received: %s (%u bytes) peer=%d\n", SanitizeString(strCommand), vRecv.size(), pfrom->id);
-    if (mapArgs.count("-dropmessagestest") && GetRand(atoi(mapArgs["-dropmessagestest"])) == 0)
-    {
-        LogPrintf("dropmessagestest DROPPING RECV MESSAGE\n");
-        return true;
-    }
-
-
-    if (!(pfrom->GetLocalServices() & NODE_BLOOM) &&
-              (strCommand == NetMsgType::FILTERLOAD ||
-               strCommand == NetMsgType::FILTERADD))
-    {
-        if (pfrom->nVersion >= NO_BLOOM_VERSION) {
-            LOCK(cs_main);
-            Misbehaving(pfrom->GetId(), 100);
-            return false;
-        } else {
-            pfrom->fDisconnect = true;
-            return false;
-        }
-    }
-
-
-    if (strCommand == NetMsgType::VERSION)
-    {
-        // Each connection can only send one version message
-        if (pfrom->nVersion != 0)
-        {
-            connman.PushMessage(pfrom, CNetMsgMaker(INIT_PROTO_VERSION).Make(NetMsgType::REJECT, strCommand, REJECT_DUPLICATE, string("Duplicate version message")));
-            LOCK(cs_main);
-            Misbehaving(pfrom->GetId(), 1);
-            return false;
-        }
-
-        int64_t nTime;
-        CAddress addrMe;
-        CAddress addrFrom;
-        uint64_t nNonce = 1;
-        uint64_t nServiceInt;
-        vRecv >> pfrom->nVersion >> nServiceInt >> nTime >> addrMe;
-        pfrom->nServices = ServiceFlags(nServiceInt);
-        if (!pfrom->fInbound)
-        {
-            connman.SetServices(pfrom->addr, pfrom->nServices);
-        }
-        if (pfrom->nServicesExpected & ~pfrom->nServices)
-        {
-            LogPrint("net", "peer=%d does not offer the expected services (%08x offered, %08x expected); disconnecting\n", pfrom->id, pfrom->nServices, pfrom->nServicesExpected);
-            connman.PushMessage(pfrom, CNetMsgMaker(INIT_PROTO_VERSION).Make(NetMsgType::REJECT, strCommand, REJECT_NONSTANDARD,
-                               strprintf("Expected to offer services %08x", pfrom->nServicesExpected)));
-            pfrom->fDisconnect = true;
-            return false;
-        }
-
-        if (pfrom->nVersion < MIN_PEER_PROTO_VERSION)
-        {
-            // disconnect from peers older than this proto version
-            LogPrintf("peer=%d using obsolete version %i; disconnecting\n", pfrom->id, pfrom->nVersion);
-            connman.PushMessage(pfrom, CNetMsgMaker(INIT_PROTO_VERSION).Make(NetMsgType::REJECT, strCommand, REJECT_OBSOLETE,
-                               strprintf("Version must be %d or greater", MIN_PEER_PROTO_VERSION)));
-            pfrom->fDisconnect = true;
-            return false;
-        }
-
-        if (pfrom->nVersion == 10300)
-            pfrom->nVersion = 300;
-        if (!vRecv.empty())
-            vRecv >> addrFrom >> nNonce;
-        if (!vRecv.empty()) {
-            vRecv >> LIMITED_STRING(pfrom->strSubVer, MAX_SUBVERSION_LENGTH);
-            pfrom->cleanSubVer = SanitizeString(pfrom->strSubVer);
-        }
-        if (!vRecv.empty()) {
-            vRecv >> pfrom->nStartingHeight;
-        }
-        {
-            LOCK(pfrom->cs_filter);
-            if (!vRecv.empty())
-                vRecv >> pfrom->fRelayTxes; // set to true after we get the first filter* message
-            else
-                pfrom->fRelayTxes = true;
-        }
-
-        // Disconnect if we connected to ourself
-        if (pfrom->fInbound && !connman.CheckIncomingNonce(nNonce))
-        {
-            LogPrintf("connected to self at %s, disconnecting\n", pfrom->addr.ToString());
-            pfrom->fDisconnect = true;
-            return true;
-        }
-
-        pfrom->addrLocal = addrMe;
-        if (pfrom->fInbound && addrMe.IsRoutable())
-        {
-            SeenLocal(addrMe);
-        }
-
-        // Be shy and don't send version until we hear
-        if (pfrom->fInbound)
-            PushNodeVersion(pfrom, connman, GetAdjustedTime());
-
-        pfrom->fClient = !(pfrom->nServices & NODE_NETWORK);
-
-        if((pfrom->nServices & NODE_WITNESS))
-        {
-            LOCK(cs_main);
-            State(pfrom->GetId())->fHaveWitness = true;
-        }
-
-        // Potentially mark this peer as a preferred download peer.
-        {
-        LOCK(cs_main);
-        UpdatePreferredDownload(pfrom, State(pfrom->GetId()));
-        }
-
-        // Change version
-        connman.PushMessage(pfrom, CNetMsgMaker(INIT_PROTO_VERSION).Make(NetMsgType::VERACK));
-        int nSendVersion = std::min(pfrom->nVersion, PROTOCOL_VERSION);
-        pfrom->SetSendVersion(nSendVersion);
-
-        if (!pfrom->fInbound)
-        {
-            // Advertise our address
-            if (fListen && !IsInitialBlockDownload())
-            {
-                CAddress addr = GetLocalAddress(&pfrom->addr, pfrom->GetLocalServices());
-                FastRandomContext insecure_rand;
-                if (addr.IsRoutable())
-                {
-                    LogPrint("net", "ProcessMessages: advertising address %s\n", addr.ToString());
-                    pfrom->PushAddress(addr, insecure_rand);
-                } else if (IsPeerAddrLocalGood(pfrom)) {
-                    addr.SetIP(pfrom->addrLocal);
-                    LogPrint("net", "ProcessMessages: advertising address %s\n", addr.ToString());
-                    pfrom->PushAddress(addr, insecure_rand);
-                }
-            }
-
-            // Get recent addresses
-            if (pfrom->fOneShot || pfrom->nVersion >= CADDR_TIME_VERSION || connman.GetAddressCount() < 1000)
-            {
-                connman.PushMessage(pfrom, CNetMsgMaker(nSendVersion).Make(NetMsgType::GETADDR));
-                pfrom->fGetAddr = true;
-            }
-            connman.MarkAddressGood(pfrom->addr);
-        }
-
-        pfrom->fSuccessfullyConnected = true;
-
-        string remoteAddr;
-        if (fLogIPs)
-            remoteAddr = ", peeraddr=" + pfrom->addr.ToString();
-
-        LogPrintf("receive version message: %s: version %d, blocks=%d, us=%s, peer=%d%s\n",
-                  pfrom->cleanSubVer, pfrom->nVersion,
-                  pfrom->nStartingHeight, addrMe.ToString(), pfrom->id,
-                  remoteAddr);
-
-        int64_t nTimeOffset = nTime - GetTime();
-        pfrom->nTimeOffset = nTimeOffset;
-        AddTimeData(pfrom->addr, nTimeOffset);
-
-        // Feeler connections exist only to verify if address is online.
-        if (pfrom->fFeeler) {
-            assert(pfrom->fInbound == false);
-            pfrom->fDisconnect = true;
-        }
-        return true;
-    }
-
-
-    else if (pfrom->nVersion == 0)
-    {
-        // Must have a version message before anything else
-        LOCK(cs_main);
-        Misbehaving(pfrom->GetId(), 1);
-        return false;
-    }
-
-    // At this point, the outgoing message serialization version can't change.
-    CNetMsgMaker msgMaker(pfrom->GetSendVersion());
-
-    if (strCommand == NetMsgType::VERACK)
-    {
-        pfrom->SetRecvVersion(min(pfrom->nVersion, PROTOCOL_VERSION));
-
-        if (!pfrom->fInbound) {
-            // Mark this node as currently connected, so we update its timestamp later.
-            LOCK(cs_main);
-            State(pfrom->GetId())->fCurrentlyConnected = true;
-        }
-
-        if (pfrom->nVersion >= SENDHEADERS_VERSION) {
-            // Tell our peer we prefer to receive headers rather than inv's
-            // We send this to non-NODE NETWORK peers as well, because even
-            // non-NODE NETWORK peers can announce blocks (such as pruning
-            // nodes)
-            connman.PushMessage(pfrom, msgMaker.Make(NetMsgType::SENDHEADERS));
-        }
-        if (pfrom->nVersion >= SHORT_IDS_BLOCKS_VERSION) {
-            // Tell our peer we are willing to provide version 1 or 2 cmpctblocks
-            // However, we do not request new block announcements using
-            // cmpctblock messages.
-            // We send this to non-NODE NETWORK peers as well, because
-            // they may wish to request compact blocks from us
-            bool fAnnounceUsingCMPCTBLOCK = false;
-            uint64_t nCMPCTBLOCKVersion = 2;
-            if (pfrom->GetLocalServices() & NODE_WITNESS)
-                connman.PushMessage(pfrom, msgMaker.Make(NetMsgType::SENDCMPCT, fAnnounceUsingCMPCTBLOCK, nCMPCTBLOCKVersion));
-            nCMPCTBLOCKVersion = 1;
-            connman.PushMessage(pfrom, msgMaker.Make(NetMsgType::SENDCMPCT, fAnnounceUsingCMPCTBLOCK, nCMPCTBLOCKVersion));
-        }
-    }
-
-
-    else if (strCommand == NetMsgType::ADDR)
-    {
-        vector<CAddress> vAddr;
-        vRecv >> vAddr;
-
-        // Don't want addr from older versions unless seeding
-        if (pfrom->nVersion < CADDR_TIME_VERSION && connman.GetAddressCount() > 1000)
-            return true;
-        if (vAddr.size() > 1000)
-        {
-            LOCK(cs_main);
-            Misbehaving(pfrom->GetId(), 20);
-            return error("message addr size() = %u", vAddr.size());
-        }
-
-        // Store the new addresses
-        vector<CAddress> vAddrOk;
-        int64_t nNow = GetAdjustedTime();
-        int64_t nSince = nNow - 10 * 60;
-        BOOST_FOREACH(CAddress& addr, vAddr)
-        {
-            boost::this_thread::interruption_point();
-
-            if ((addr.nServices & REQUIRED_SERVICES) != REQUIRED_SERVICES)
-                continue;
-
-            if (addr.nTime <= 100000000 || addr.nTime > nNow + 10 * 60)
-                addr.nTime = nNow - 5 * 24 * 60 * 60;
-            pfrom->AddAddressKnown(addr);
-            bool fReachable = IsReachable(addr);
-            if (addr.nTime > nSince && !pfrom->fGetAddr && vAddr.size() <= 10 && addr.IsRoutable())
-            {
-                // Relay to a limited number of other nodes
-                RelayAddress(addr, fReachable, connman);
-            }
-            // Do not store addresses outside our network
-            if (fReachable)
-                vAddrOk.push_back(addr);
-        }
-        connman.AddNewAddresses(vAddrOk, pfrom->addr, 2 * 60 * 60);
-        if (vAddr.size() < 1000)
-            pfrom->fGetAddr = false;
-        if (pfrom->fOneShot)
-            pfrom->fDisconnect = true;
-    }
-
-    else if (strCommand == NetMsgType::SENDHEADERS)
-    {
-        LOCK(cs_main);
-        State(pfrom->GetId())->fPreferHeaders = true;
-    }
-
-    else if (strCommand == NetMsgType::SENDCMPCT)
-    {
-        bool fAnnounceUsingCMPCTBLOCK = false;
-        uint64_t nCMPCTBLOCKVersion = 0;
-        vRecv >> fAnnounceUsingCMPCTBLOCK >> nCMPCTBLOCKVersion;
-        if (nCMPCTBLOCKVersion == 1 || ((pfrom->GetLocalServices() & NODE_WITNESS) && nCMPCTBLOCKVersion == 2)) {
-            LOCK(cs_main);
-            // fProvidesHeaderAndIDs is used to "lock in" version of compact blocks we send (fWantsCmpctWitness)
-            if (!State(pfrom->GetId())->fProvidesHeaderAndIDs) {
-                State(pfrom->GetId())->fProvidesHeaderAndIDs = true;
-                State(pfrom->GetId())->fWantsCmpctWitness = nCMPCTBLOCKVersion == 2;
-            }
-            if (State(pfrom->GetId())->fWantsCmpctWitness == (nCMPCTBLOCKVersion == 2)) // ignore later version announces
-                State(pfrom->GetId())->fPreferHeaderAndIDs = fAnnounceUsingCMPCTBLOCK;
-            if (!State(pfrom->GetId())->fSupportsDesiredCmpctVersion) {
-                if (pfrom->GetLocalServices() & NODE_WITNESS)
-                    State(pfrom->GetId())->fSupportsDesiredCmpctVersion = (nCMPCTBLOCKVersion == 2);
-                else
-                    State(pfrom->GetId())->fSupportsDesiredCmpctVersion = (nCMPCTBLOCKVersion == 1);
-            }
-        }
-    }
-
-
-    else if (strCommand == NetMsgType::INV)
-    {
-        vector<CInv> vInv;
-        vRecv >> vInv;
-        if (vInv.size() > MAX_INV_SZ)
-        {
-            LOCK(cs_main);
-            Misbehaving(pfrom->GetId(), 20);
-            return error("message inv size() = %u", vInv.size());
-        }
-
-        bool fBlocksOnly = !fRelayTxes;
-
-        // Allow whitelisted peers to send data other than blocks in blocks only mode if whitelistrelay is true
-        if (pfrom->fWhitelisted && GetBoolArg("-whitelistrelay", DEFAULT_WHITELISTRELAY))
-            fBlocksOnly = false;
-
-        LOCK(cs_main);
-
-        uint32_t nFetchFlags = GetFetchFlags(pfrom, chainActive.Tip(), chainparams.GetConsensus());
-
-        std::vector<CInv> vToFetch;
-
-        for (unsigned int nInv = 0; nInv < vInv.size(); nInv++)
-        {
-            CInv &inv = vInv[nInv];
-
-            boost::this_thread::interruption_point();
-
-            bool fAlreadyHave = AlreadyHave(inv);
-            LogPrint("net", "got inv: %s  %s peer=%d\n", inv.ToString(), fAlreadyHave ? "have" : "new", pfrom->id);
-
-            if (inv.type == MSG_TX) {
-                inv.type |= nFetchFlags;
-            }
-
-            if (inv.type == MSG_BLOCK) {
-                UpdateBlockAvailability(pfrom->GetId(), inv.hash);
-                if (!fAlreadyHave && !fImporting && !fReindex && !mapBlocksInFlight.count(inv.hash)) {
-                    // We used to request the full block here, but since headers-announcements are now the
-                    // primary method of announcement on the network, and since, in the case that a node
-                    // fell back to inv we probably have a reorg which we should get the headers for first,
-                    // we now only provide a getheaders response here. When we receive the headers, we will
-                    // then ask for the blocks we need.
-                    connman.PushMessage(pfrom, msgMaker.Make(NetMsgType::GETHEADERS, chainActive.GetLocator(pindexBestHeader), inv.hash));
-                    LogPrint("net", "getheaders (%d) %s to peer=%d\n", pindexBestHeader->nHeight, inv.hash.ToString(), pfrom->id);
-                }
-            }
-            else
-            {
-                pfrom->AddInventoryKnown(inv);
-                if (fBlocksOnly)
-                    LogPrint("net", "transaction (%s) inv sent in violation of protocol peer=%d\n", inv.hash.ToString(), pfrom->id);
-                else if (!fAlreadyHave && !fImporting && !fReindex && !IsInitialBlockDownload())
-                    pfrom->AskFor(inv);
-            }
-
-            // Track requests for our stuff
-            GetMainSignals().Inventory(inv.hash);
-
-            if (pfrom->nSendSize > (nMaxSendBufferSize * 2)) {
-                Misbehaving(pfrom->GetId(), 50);
-                return error("send buffer size() = %u", pfrom->nSendSize);
-            }
-        }
-
-        if (!vToFetch.empty())
-            connman.PushMessage(pfrom, msgMaker.Make(NetMsgType::GETDATA, vToFetch));
-    }
-
-
-    else if (strCommand == NetMsgType::GETDATA)
-    {
-        vector<CInv> vInv;
-        vRecv >> vInv;
-        if (vInv.size() > MAX_INV_SZ)
-        {
-            LOCK(cs_main);
-            Misbehaving(pfrom->GetId(), 20);
-            return error("message getdata size() = %u", vInv.size());
-        }
-
-        if (fDebug || (vInv.size() != 1))
-            LogPrint("net", "received getdata (%u invsz) peer=%d\n", vInv.size(), pfrom->id);
-
-        if ((fDebug && vInv.size() > 0) || (vInv.size() == 1))
-            LogPrint("net", "received getdata for: %s peer=%d\n", vInv[0].ToString(), pfrom->id);
-
-        pfrom->vRecvGetData.insert(pfrom->vRecvGetData.end(), vInv.begin(), vInv.end());
-        ProcessGetData(pfrom, chainparams.GetConsensus(), connman);
-    }
-
-
-    else if (strCommand == NetMsgType::GETBLOCKS)
-    {
-        CBlockLocator locator;
-        uint256 hashStop;
-        vRecv >> locator >> hashStop;
-
-        LOCK(cs_main);
-
-        // Find the last block the caller has in the main chain
-        CBlockIndex* pindex = FindForkInGlobalIndex(chainActive, locator);
-
-        // Send the rest of the chain
-        if (pindex)
-            pindex = chainActive.Next(pindex);
-        int nLimit = 500;
-        LogPrint("net", "getblocks %d to %s limit %d from peer=%d\n", (pindex ? pindex->nHeight : -1), hashStop.IsNull() ? "end" : hashStop.ToString(), nLimit, pfrom->id);
-        for (; pindex; pindex = chainActive.Next(pindex))
-        {
-            if (pindex->GetBlockHash() == hashStop)
-            {
-                LogPrint("net", "  getblocks stopping at %d %s\n", pindex->nHeight, pindex->GetBlockHash().ToString());
-                break;
-            }
-            // If pruning, don't inv blocks unless we have on disk and are likely to still have
-            // for some reasonable time window (1 hour) that block relay might require.
-            const int nPrunedBlocksLikelyToHave = MIN_BLOCKS_TO_KEEP - 3600 / chainparams.GetConsensus().nPowTargetSpacing;
-            if (fPruneMode && (!(pindex->nStatus & BLOCK_HAVE_DATA) || pindex->nHeight <= chainActive.Tip()->nHeight - nPrunedBlocksLikelyToHave))
-            {
-                LogPrint("net", " getblocks stopping, pruned or too old block at %d %s\n", pindex->nHeight, pindex->GetBlockHash().ToString());
-                break;
-            }
-            pfrom->PushInventory(CInv(MSG_BLOCK, pindex->GetBlockHash()));
-            if (--nLimit <= 0)
-            {
-                // When this block is requested, we'll send an inv that'll
-                // trigger the peer to getblocks the next batch of inventory.
-                LogPrint("net", "  getblocks stopping at limit %d %s\n", pindex->nHeight, pindex->GetBlockHash().ToString());
-                pfrom->hashContinue = pindex->GetBlockHash();
-                break;
-            }
-        }
-    }
-
-
-    else if (strCommand == NetMsgType::GETBLOCKTXN)
-    {
-        BlockTransactionsRequest req;
-        vRecv >> req;
-
-        LOCK(cs_main);
-
-        BlockMap::iterator it = mapBlockIndex.find(req.blockhash);
-        if (it == mapBlockIndex.end() || !(it->second->nStatus & BLOCK_HAVE_DATA)) {
-            LogPrintf("Peer %d sent us a getblocktxn for a block we don't have", pfrom->id);
-            return true;
-        }
-
-        if (it->second->nHeight < chainActive.Height() - MAX_BLOCKTXN_DEPTH) {
-            // If an older block is requested (should never happen in practice,
-            // but can happen in tests) send a block response instead of a
-            // blocktxn response. Sending a full block response instead of a
-            // small blocktxn response is preferable in the case where a peer
-            // might maliciously send lots of getblocktxn requests to trigger
-            // expensive disk reads, because it will require the peer to
-            // actually receive all the data read from disk over the network.
-            LogPrint("net", "Peer %d sent us a getblocktxn for a block > %i deep", pfrom->id, MAX_BLOCKTXN_DEPTH);
-            CInv inv;
-            inv.type = State(pfrom->GetId())->fWantsCmpctWitness ? MSG_WITNESS_BLOCK : MSG_BLOCK;
-            inv.hash = req.blockhash;
-            pfrom->vRecvGetData.push_back(inv);
-            ProcessGetData(pfrom, chainparams.GetConsensus(), connman);
-            return true;
-        }
-
-        CBlock block;
-        assert(ReadBlockFromDisk(block, it->second, chainparams.GetConsensus()));
-
-        BlockTransactions resp(req);
-        for (size_t i = 0; i < req.indexes.size(); i++) {
-            if (req.indexes[i] >= block.vtx.size()) {
-                Misbehaving(pfrom->GetId(), 100);
-                LogPrintf("Peer %d sent us a getblocktxn with out-of-bounds tx indices", pfrom->id);
-                return true;
-            }
-            resp.txn[i] = block.vtx[req.indexes[i]];
-        }
-        int nSendFlags = State(pfrom->GetId())->fWantsCmpctWitness ? 0 : SERIALIZE_TRANSACTION_NO_WITNESS;
-        connman.PushMessage(pfrom, msgMaker.Make(nSendFlags, NetMsgType::BLOCKTXN, resp));
-    }
-
-
-    else if (strCommand == NetMsgType::GETHEADERS)
-    {
-        CBlockLocator locator;
-        uint256 hashStop;
-        vRecv >> locator >> hashStop;
-
-        LOCK(cs_main);
-        if (IsInitialBlockDownload() && !pfrom->fWhitelisted) {
-            LogPrint("net", "Ignoring getheaders from peer=%d because node is in initial block download\n", pfrom->id);
-            return true;
-        }
-
-        CNodeState *nodestate = State(pfrom->GetId());
-        CBlockIndex* pindex = NULL;
-        if (locator.IsNull())
-        {
-            // If locator is null, return the hashStop block
-            BlockMap::iterator mi = mapBlockIndex.find(hashStop);
-            if (mi == mapBlockIndex.end())
-                return true;
-            pindex = (*mi).second;
-        }
-        else
-        {
-            // Find the last block the caller has in the main chain
-            pindex = FindForkInGlobalIndex(chainActive, locator);
-            if (pindex)
-                pindex = chainActive.Next(pindex);
-        }
-
-        // we must use CBlocks, as CBlockHeaders won't include the 0x00 nTx count at the end
-        vector<CBlock> vHeaders;
-        int nLimit = MAX_HEADERS_RESULTS;
-        LogPrint("net", "getheaders %d to %s from peer=%d\n", (pindex ? pindex->nHeight : -1), hashStop.IsNull() ? "end" : hashStop.ToString(), pfrom->id);
-        for (; pindex; pindex = chainActive.Next(pindex))
-        {
-            vHeaders.push_back(pindex->GetBlockHeader());
-            if (--nLimit <= 0 || pindex->GetBlockHash() == hashStop)
-                break;
-        }
-        // pindex can be NULL either if we sent chainActive.Tip() OR
-        // if our peer has chainActive.Tip() (and thus we are sending an empty
-        // headers message). In both cases it's safe to update
-        // pindexBestHeaderSent to be our tip.
-        nodestate->pindexBestHeaderSent = pindex ? pindex : chainActive.Tip();
-        connman.PushMessage(pfrom, msgMaker.Make(NetMsgType::HEADERS, vHeaders));
-    }
-
-
-    else if (strCommand == NetMsgType::TX)
-    {
-        // Stop processing the transaction early if
-        // We are in blocks only mode and peer is either not whitelisted or whitelistrelay is off
-        if (!fRelayTxes && (!pfrom->fWhitelisted || !GetBoolArg("-whitelistrelay", DEFAULT_WHITELISTRELAY)))
-        {
-            LogPrint("net", "transaction sent in violation of protocol peer=%d\n", pfrom->id);
-            return true;
-        }
-
-        deque<COutPoint> vWorkQueue;
-        vector<uint256> vEraseQueue;
-        CTransaction tx;
-        vRecv >> tx;
-
-        CInv inv(MSG_TX, tx.GetHash());
-        pfrom->AddInventoryKnown(inv);
-
-        LOCK(cs_main);
-
-        bool fMissingInputs = false;
-        CValidationState state;
-
-        pfrom->setAskFor.erase(inv.hash);
-        mapAlreadyAskedFor.erase(inv.hash);
-
-        if (!AlreadyHave(inv) && AcceptToMemoryPool(mempool, state, tx, true, &fMissingInputs)) {
-            mempool.check(pcoinsTip);
-            RelayTransaction(tx, connman);
-            for (unsigned int i = 0; i < tx.vout.size(); i++) {
-                vWorkQueue.emplace_back(inv.hash, i);
-            }
-
-            pfrom->nLastTXTime = GetTime();
-
-            LogPrint("mempool", "AcceptToMemoryPool: peer=%d: accepted %s (poolsz %u txn, %u kB)\n",
-                pfrom->id,
-                tx.GetHash().ToString(),
-                mempool.size(), mempool.DynamicMemoryUsage() / 1000);
-
-            // Recursively process any orphan transactions that depended on this one
-            set<NodeId> setMisbehaving;
-            while (!vWorkQueue.empty()) {
-                auto itByPrev = mapOrphanTransactionsByPrev.find(vWorkQueue.front());
-                vWorkQueue.pop_front();
-                if (itByPrev == mapOrphanTransactionsByPrev.end())
-                    continue;
-                for (auto mi = itByPrev->second.begin();
-                     mi != itByPrev->second.end();
-                     ++mi)
-                {
-                    const CTransaction& orphanTx = (*mi)->second.tx;
-                    const uint256& orphanHash = orphanTx.GetHash();
-                    NodeId fromPeer = (*mi)->second.fromPeer;
-                    bool fMissingInputs2 = false;
-                    // Use a dummy CValidationState so someone can't setup nodes to counter-DoS based on orphan
-                    // resolution (that is, feeding people an invalid transaction based on LegitTxX in order to get
-                    // anyone relaying LegitTxX banned)
-                    CValidationState stateDummy;
-
-
-                    if (setMisbehaving.count(fromPeer))
-                        continue;
-                    if (AcceptToMemoryPool(mempool, stateDummy, orphanTx, true, &fMissingInputs2)) {
-                        LogPrint("mempool", "   accepted orphan tx %s\n", orphanHash.ToString());
-                        RelayTransaction(orphanTx, connman);
-                        for (unsigned int i = 0; i < orphanTx.vout.size(); i++) {
-                            vWorkQueue.emplace_back(orphanHash, i);
-                        }
-                        vEraseQueue.push_back(orphanHash);
-                    }
-                    else if (!fMissingInputs2)
-                    {
-                        int nDos = 0;
-                        if (stateDummy.IsInvalid(nDos) && nDos > 0)
-                        {
-                            // Punish peer that gave us an invalid orphan tx
-                            Misbehaving(fromPeer, nDos);
-                            setMisbehaving.insert(fromPeer);
-                            LogPrint("mempool", "   invalid orphan tx %s\n", orphanHash.ToString());
-                        }
-                        // Has inputs but not accepted to mempool
-                        // Probably non-standard or insufficient fee/priority
-                        LogPrint("mempool", "   removed orphan tx %s\n", orphanHash.ToString());
-                        vEraseQueue.push_back(orphanHash);
-                        if (orphanTx.wit.IsNull() && !stateDummy.CorruptionPossible()) {
-                            // Do not use rejection cache for witness transactions or
-                            // witness-stripped transactions, as they can have been malleated.
-                            // See https://github.com/bitcoin/bitcoin/issues/8279 for details.
-                            assert(recentRejects);
-                            recentRejects->insert(orphanHash);
-                        }
-                    }
-                    mempool.check(pcoinsTip);
-                }
-            }
-
-            BOOST_FOREACH(uint256 hash, vEraseQueue)
-                EraseOrphanTx(hash);
-        }
-        else if (fMissingInputs)
-        {
-            bool fRejectedParents = false; // It may be the case that the orphans parents have all been rejected
-            BOOST_FOREACH(const CTxIn& txin, tx.vin) {
-                if (recentRejects->contains(txin.prevout.hash)) {
-                    fRejectedParents = true;
-                    break;
-                }
-            }
-            if (!fRejectedParents) {
-                uint32_t nFetchFlags = GetFetchFlags(pfrom, chainActive.Tip(), chainparams.GetConsensus());
-                BOOST_FOREACH(const CTxIn& txin, tx.vin) {
-                    CInv _inv(MSG_TX | nFetchFlags, txin.prevout.hash);
-                    pfrom->AddInventoryKnown(_inv);
-                    if (!AlreadyHave(_inv)) pfrom->AskFor(_inv);
-                }
-                AddOrphanTx(tx, pfrom->GetId());
-
-                // DoS prevention: do not allow mapOrphanTransactions to grow unbounded
-                unsigned int nMaxOrphanTx = (unsigned int)std::max((int64_t)0, GetArg("-maxorphantx", DEFAULT_MAX_ORPHAN_TRANSACTIONS));
-                unsigned int nEvicted = LimitOrphanTxSize(nMaxOrphanTx);
-                if (nEvicted > 0)
-                    LogPrint("mempool", "mapOrphan overflow, removed %u tx\n", nEvicted);
-            } else {
-                LogPrint("mempool", "not keeping orphan with rejected parents %s\n",tx.GetHash().ToString());
-            }
-        } else {
-            if (tx.wit.IsNull() && !state.CorruptionPossible()) {
-                // Do not use rejection cache for witness transactions or
-                // witness-stripped transactions, as they can have been malleated.
-                // See https://github.com/bitcoin/bitcoin/issues/8279 for details.
-                assert(recentRejects);
-                recentRejects->insert(tx.GetHash());
-            }
-
-            if (pfrom->fWhitelisted && GetBoolArg("-whitelistforcerelay", DEFAULT_WHITELISTFORCERELAY)) {
-                // Always relay transactions received from whitelisted peers, even
-                // if they were already in the mempool or rejected from it due
-                // to policy, allowing the node to function as a gateway for
-                // nodes hidden behind it.
-                //
-                // Never relay transactions that we would assign a non-zero DoS
-                // score for, as we expect peers to do the same with us in that
-                // case.
-                int nDoS = 0;
-                if (!state.IsInvalid(nDoS) || nDoS == 0) {
-                    LogPrintf("Force relaying tx %s from whitelisted peer=%d\n", tx.GetHash().ToString(), pfrom->id);
-                    RelayTransaction(tx, connman);
-                } else {
-                    LogPrintf("Not relaying invalid transaction %s from whitelisted peer=%d (%s)\n", tx.GetHash().ToString(), pfrom->id, FormatStateMessage(state));
-                }
-            }
-        }
-        int nDoS = 0;
-        if (state.IsInvalid(nDoS))
-        {
-            LogPrint("mempoolrej", "%s from peer=%d was not accepted: %s\n", tx.GetHash().ToString(),
-                pfrom->id,
-                FormatStateMessage(state));
-            if (state.GetRejectCode() < REJECT_INTERNAL) // Never send AcceptToMemoryPool's internal codes over P2P
-                connman.PushMessage(pfrom, msgMaker.Make(NetMsgType::REJECT, strCommand, (unsigned char)state.GetRejectCode(),
-                                   state.GetRejectReason().substr(0, MAX_REJECT_MESSAGE_LENGTH), inv.hash));
-            if (nDoS > 0) {
-                Misbehaving(pfrom->GetId(), nDoS);
-            }
-        }
-    }
-
-
-    else if (strCommand == NetMsgType::CMPCTBLOCK && !fImporting && !fReindex) // Ignore blocks received while importing
-    {
-        CBlockHeaderAndShortTxIDs cmpctblock;
-        vRecv >> cmpctblock;
-
-        {
-        LOCK(cs_main);
-
-        if (mapBlockIndex.find(cmpctblock.header.hashPrevBlock) == mapBlockIndex.end()) {
-            // Doesn't connect (or is genesis), instead of DoSing in AcceptBlockHeader, request deeper headers
-            if (!IsInitialBlockDownload())
-                connman.PushMessage(pfrom, msgMaker.Make(NetMsgType::GETHEADERS, chainActive.GetLocator(pindexBestHeader), uint256()));
-            return true;
-        }
-        }
-
-        CBlockIndex *pindex = NULL;
-        CValidationState state;
-        if (!ProcessNewBlockHeaders({cmpctblock.header}, state, chainparams, &pindex)) {
-            int nDoS;
-            if (state.IsInvalid(nDoS)) {
-                if (nDoS > 0) {
-                    LOCK(cs_main);
-                    Misbehaving(pfrom->GetId(), nDoS);
-                }
-                LogPrintf("Peer %d sent us invalid header via cmpctblock\n", pfrom->id);
-                return true;
-            }
-        }
-
-        LOCK(cs_main);
-        // If AcceptBlockHeader returned true, it set pindex
-        assert(pindex);
-        UpdateBlockAvailability(pfrom->GetId(), pindex->GetBlockHash());
-
-        std::map<uint256, pair<NodeId, list<QueuedBlock>::iterator> >::iterator blockInFlightIt = mapBlocksInFlight.find(pindex->GetBlockHash());
-        bool fAlreadyInFlight = blockInFlightIt != mapBlocksInFlight.end();
-
-        if (pindex->nStatus & BLOCK_HAVE_DATA) // Nothing to do here
-            return true;
-
-        if (pindex->nChainWork <= chainActive.Tip()->nChainWork || // We know something better
-                pindex->nTx != 0) { // We had this block at some point, but pruned it
-            if (fAlreadyInFlight) {
-                // We requested this block for some reason, but our mempool will probably be useless
-                // so we just grab the block via normal getdata
-                std::vector<CInv> vInv(1);
-                vInv[0] = CInv(MSG_BLOCK | GetFetchFlags(pfrom, pindex->pprev, chainparams.GetConsensus()), cmpctblock.header.GetHash());
-                connman.PushMessage(pfrom, msgMaker.Make(NetMsgType::GETDATA, vInv));
-            }
-            return true;
-        }
-
-        // If we're not close to tip yet, give up and let parallel block fetch work its magic
-        if (!fAlreadyInFlight && !CanDirectFetch(chainparams.GetConsensus()))
-            return true;
-
-        CNodeState *nodestate = State(pfrom->GetId());
-
-        if (IsWitnessEnabled(pindex->pprev, chainparams.GetConsensus()) && !nodestate->fSupportsDesiredCmpctVersion) {
-            // Don't bother trying to process compact blocks from v1 peers
-            // after segwit activates.
-            return true;
-        }
-
-        // We want to be a bit conservative just to be extra careful about DoS
-        // possibilities in compact block processing...
-        if (pindex->nHeight <= chainActive.Height() + 2) {
-            if ((!fAlreadyInFlight && nodestate->nBlocksInFlight < MAX_BLOCKS_IN_TRANSIT_PER_PEER) ||
-                 (fAlreadyInFlight && blockInFlightIt->second.first == pfrom->GetId())) {
-                list<QueuedBlock>::iterator *queuedBlockIt = NULL;
-                if (!MarkBlockAsInFlight(pfrom->GetId(), pindex->GetBlockHash(), chainparams.GetConsensus(), pindex, &queuedBlockIt)) {
-                    if (!(*queuedBlockIt)->partialBlock)
-                        (*queuedBlockIt)->partialBlock.reset(new PartiallyDownloadedBlock(&mempool));
-                    else {
-                        // The block was already in flight using compact blocks from the same peer
-                        LogPrint("net", "Peer sent us compact block we were already syncing!\n");
-                        return true;
-                    }
-                }
-
-                PartiallyDownloadedBlock& partialBlock = *(*queuedBlockIt)->partialBlock;
-                ReadStatus status = partialBlock.InitData(cmpctblock);
-                if (status == READ_STATUS_INVALID) {
-                    MarkBlockAsReceived(pindex->GetBlockHash()); // Reset in-flight state in case of whitelist
-                    Misbehaving(pfrom->GetId(), 100);
-                    LogPrintf("Peer %d sent us invalid compact block\n", pfrom->id);
-                    return true;
-                } else if (status == READ_STATUS_FAILED) {
-                    // Duplicate txindexes, the block is now in-flight, so just request it
-                    std::vector<CInv> vInv(1);
-                    vInv[0] = CInv(MSG_BLOCK | GetFetchFlags(pfrom, pindex->pprev, chainparams.GetConsensus()), cmpctblock.header.GetHash());
-                    connman.PushMessage(pfrom, msgMaker.Make(NetMsgType::GETDATA, vInv));
-                    return true;
-                }
-
-                if (!fAlreadyInFlight && mapBlocksInFlight.size() == 1 && pindex->pprev->IsValid(BLOCK_VALID_CHAIN)) {
-                    // We seem to be rather well-synced, so it appears pfrom was the first to provide us
-                    // with this block! Let's get them to announce using compact blocks in the future.
-                    MaybeSetPeerAsAnnouncingHeaderAndIDs(nodestate, pfrom, connman);
-                }
-
-                BlockTransactionsRequest req;
-                for (size_t i = 0; i < cmpctblock.BlockTxCount(); i++) {
-                    if (!partialBlock.IsTxAvailable(i))
-                        req.indexes.push_back(i);
-                }
-                if (req.indexes.empty()) {
-                    // Dirty hack to jump to BLOCKTXN code (TODO: move message handling into their own functions)
-                    BlockTransactions txn;
-                    txn.blockhash = cmpctblock.header.GetHash();
-                    CDataStream blockTxnMsg(SER_NETWORK, PROTOCOL_VERSION);
-                    blockTxnMsg << txn;
-                    return ProcessMessage(pfrom, NetMsgType::BLOCKTXN, blockTxnMsg, nTimeReceived, chainparams, connman);
-                } else {
-                    req.blockhash = pindex->GetBlockHash();
-                    connman.PushMessage(pfrom, msgMaker.Make(NetMsgType::GETBLOCKTXN, req));
-                }
-            }
-        } else {
-            if (fAlreadyInFlight) {
-                // We requested this block, but its far into the future, so our
-                // mempool will probably be useless - request the block normally
-                std::vector<CInv> vInv(1);
-                vInv[0] = CInv(MSG_BLOCK | GetFetchFlags(pfrom, pindex->pprev, chainparams.GetConsensus()), cmpctblock.header.GetHash());
-                connman.PushMessage(pfrom, msgMaker.Make(NetMsgType::GETDATA, vInv));
-                return true;
-            } else {
-                // If this was an announce-cmpctblock, we want the same treatment as a header message
-                // Dirty hack to process as if it were just a headers message (TODO: move message handling into their own functions)
-                std::vector<CBlock> headers;
-                headers.push_back(cmpctblock.header);
-                CDataStream vHeadersMsg(SER_NETWORK, PROTOCOL_VERSION);
-                vHeadersMsg << headers;
-                return ProcessMessage(pfrom, NetMsgType::HEADERS, vHeadersMsg, nTimeReceived, chainparams, connman);
-            }
-        }
-    }
-
-    else if (strCommand == NetMsgType::BLOCKTXN && !fImporting && !fReindex) // Ignore blocks received while importing
-    {
-        BlockTransactions resp;
-        vRecv >> resp;
-
-        CBlock block;
-        bool fBlockRead = false;
-        {
-            LOCK(cs_main);
-
-            map<uint256, pair<NodeId, list<QueuedBlock>::iterator> >::iterator it = mapBlocksInFlight.find(resp.blockhash);
-            if (it == mapBlocksInFlight.end() || !it->second.second->partialBlock ||
-                    it->second.first != pfrom->GetId()) {
-                LogPrint("net", "Peer %d sent us block transactions for block we weren't expecting\n", pfrom->id);
-                return true;
-            }
-
-            PartiallyDownloadedBlock& partialBlock = *it->second.second->partialBlock;
-            ReadStatus status = partialBlock.FillBlock(block, resp.txn);
-            if (status == READ_STATUS_INVALID) {
-                MarkBlockAsReceived(resp.blockhash); // Reset in-flight state in case of whitelist
-                Misbehaving(pfrom->GetId(), 100);
-                LogPrintf("Peer %d sent us invalid compact block/non-matching block transactions\n", pfrom->id);
-                return true;
-            } else if (status == READ_STATUS_FAILED) {
-                // Might have collided, fall back to getdata now :(
-                std::vector<CInv> invs;
-                invs.push_back(CInv(MSG_BLOCK | GetFetchFlags(pfrom, chainActive.Tip(), chainparams.GetConsensus()), resp.blockhash));
-                connman.PushMessage(pfrom, msgMaker.Make(NetMsgType::GETDATA, invs));
-            } else {
-                // Block is either okay, or possibly we received
-                // READ_STATUS_CHECKBLOCK_FAILED.
-                // Note that CheckBlock can only fail for one of a few reasons:
-                // 1. bad-proof-of-work (impossible here, because we've already
-                //    accepted the header)
-                // 2. merkleroot doesn't match the transactions given (already
-                //    caught in FillBlock with READ_STATUS_FAILED, so
-                //    impossible here)
-                // 3. the block is otherwise invalid (eg invalid coinbase,
-                //    block is too big, too many legacy sigops, etc).
-                // So if CheckBlock failed, #3 is the only possibility.
-                // Under BIP 152, we don't DoS-ban unless proof of work is
-                // invalid (we don't require all the stateless checks to have
-                // been run).  This is handled below, so just treat this as
-                // though the block was successfully read, and rely on the
-                // handling in ProcessNewBlock to ensure the block index is
-                // updated, reject messages go out, etc.
-                MarkBlockAsReceived(resp.blockhash); // it is now an empty pointer
-                fBlockRead = true;
-                // mapBlockSource is only used for sending reject messages and DoS scores,
-                // so the race between here and cs_main in ProcessNewBlock is fine.
-                // BIP 152 permits peers to relay compact blocks after validating
-                // the header only; we should not punish peers if the block turns
-                // out to be invalid.
-                mapBlockSource.emplace(resp.blockhash, std::make_pair(pfrom->GetId(), false));
-            }
-        } // Don't hold cs_main when we call into ProcessNewBlock
-        if (fBlockRead) {
-            bool fNewBlock = false;
-            // Since we requested this block (it was in mapBlocksInFlight), force it to be processed,
-            // even if it would not be a candidate for new tip (missing previous block, chain not long enough, etc)
-            ProcessNewBlock(chainparams, &block, true, NULL, &fNewBlock);
-            if (fNewBlock)
-                pfrom->nLastBlockTime = GetTime();
-        }
-    }
-
-
-    else if (strCommand == NetMsgType::HEADERS && !fImporting && !fReindex) // Ignore headers received while importing
-    {
-        std::vector<CBlockHeader> headers;
-
-        // Bypass the normal CBlock deserialization, as we don't want to risk deserializing 2000 full blocks.
-        unsigned int nCount = ReadCompactSize(vRecv);
-        if (nCount > MAX_HEADERS_RESULTS) {
-            LOCK(cs_main);
-            Misbehaving(pfrom->GetId(), 20);
-            return error("headers message size = %u", nCount);
-        }
-        headers.resize(nCount);
-        for (unsigned int n = 0; n < nCount; n++) {
-            vRecv >> headers[n];
-            ReadCompactSize(vRecv); // ignore tx count; assume it is 0.
-        }
-
-        if (nCount == 0) {
-            // Nothing interesting. Stop asking this peers for more headers.
-            return true;
-        }
-
-        CBlockIndex *pindexLast = NULL;
-        {
-        LOCK(cs_main);
-        CNodeState *nodestate = State(pfrom->GetId());
-
-        // If this looks like it could be a block announcement (nCount <
-        // MAX_BLOCKS_TO_ANNOUNCE), use special logic for handling headers that
-        // don't connect:
-        // - Send a getheaders message in response to try to connect the chain.
-        // - The peer can send up to MAX_UNCONNECTING_HEADERS in a row that
-        //   don't connect before giving DoS points
-        // - Once a headers message is received that is valid and does connect,
-        //   nUnconnectingHeaders gets reset back to 0.
-        if (mapBlockIndex.find(headers[0].hashPrevBlock) == mapBlockIndex.end() && nCount < MAX_BLOCKS_TO_ANNOUNCE) {
-            nodestate->nUnconnectingHeaders++;
-            connman.PushMessage(pfrom, msgMaker.Make(NetMsgType::GETHEADERS, chainActive.GetLocator(pindexBestHeader), uint256()));
-            LogPrint("net", "received header %s: missing prev block %s, sending getheaders (%d) to end (peer=%d, nUnconnectingHeaders=%d)\n",
-                    headers[0].GetHash().ToString(),
-                    headers[0].hashPrevBlock.ToString(),
-                    pindexBestHeader->nHeight,
-                    pfrom->id, nodestate->nUnconnectingHeaders);
-            // Set hashLastUnknownBlock for this peer, so that if we
-            // eventually get the headers - even from a different peer -
-            // we can use this peer to download.
-            UpdateBlockAvailability(pfrom->GetId(), headers.back().GetHash());
-
-            if (nodestate->nUnconnectingHeaders % MAX_UNCONNECTING_HEADERS == 0) {
-                Misbehaving(pfrom->GetId(), 20);
-            }
-            return true;
-        }
-
-        uint256 hashLastBlock;
-        for (const CBlockHeader& header : headers) {
-            if (!hashLastBlock.IsNull() && header.hashPrevBlock != hashLastBlock) {
-                Misbehaving(pfrom->GetId(), 20);
-                return error("non-continuous headers sequence");
-            }
-            hashLastBlock = header.GetHash();
-        }
-        }
-
-        CValidationState state;
-        if (!ProcessNewBlockHeaders(headers, state, chainparams, &pindexLast)) {
-            int nDoS;
-            if (state.IsInvalid(nDoS)) {
-                if (nDoS > 0) {
-                    LOCK(cs_main);
-                    Misbehaving(pfrom->GetId(), nDoS);
-                }
-                return error("invalid header received");
-            }
-        }
-
-        {
-        LOCK(cs_main);
-        CNodeState *nodestate = State(pfrom->GetId());
-        if (nodestate->nUnconnectingHeaders > 0) {
-            LogPrint("net", "peer=%d: resetting nUnconnectingHeaders (%d -> 0)\n", pfrom->id, nodestate->nUnconnectingHeaders);
-        }
-        nodestate->nUnconnectingHeaders = 0;
-
-        assert(pindexLast);
-        UpdateBlockAvailability(pfrom->GetId(), pindexLast->GetBlockHash());
-
-        if (nCount == MAX_HEADERS_RESULTS) {
-            // Headers message had its maximum size; the peer may have more headers.
-            // TODO: optimize: if pindexLast is an ancestor of chainActive.Tip or pindexBestHeader, continue
-            // from there instead.
-            LogPrint("net", "more getheaders (%d) to end to peer=%d (startheight:%d)\n", pindexLast->nHeight, pfrom->id, pfrom->nStartingHeight);
-            connman.PushMessage(pfrom, msgMaker.Make(NetMsgType::GETHEADERS, chainActive.GetLocator(pindexLast), uint256()));
-        }
-
-        bool fCanDirectFetch = CanDirectFetch(chainparams.GetConsensus());
-        // If this set of headers is valid and ends in a block with at least as
-        // much work as our tip, download as much as possible.
-        if (fCanDirectFetch && pindexLast->IsValid(BLOCK_VALID_TREE) && chainActive.Tip()->nChainWork <= pindexLast->nChainWork) {
-            vector<CBlockIndex *> vToFetch;
-            CBlockIndex *pindexWalk = pindexLast;
-            // Calculate all the blocks we'd need to switch to pindexLast, up to a limit.
-            while (pindexWalk && !chainActive.Contains(pindexWalk) && vToFetch.size() <= MAX_BLOCKS_IN_TRANSIT_PER_PEER) {
-                if (!(pindexWalk->nStatus & BLOCK_HAVE_DATA) &&
-                        !mapBlocksInFlight.count(pindexWalk->GetBlockHash()) &&
-                        (!IsWitnessEnabled(pindexWalk->pprev, chainparams.GetConsensus()) || State(pfrom->GetId())->fHaveWitness)) {
-                    // We don't have this block, and it's not yet in flight.
-                    vToFetch.push_back(pindexWalk);
-                }
-                pindexWalk = pindexWalk->pprev;
-            }
-            // If pindexWalk still isn't on our main chain, we're looking at a
-            // very large reorg at a time we think we're close to caught up to
-            // the main chain -- this shouldn't really happen.  Bail out on the
-            // direct fetch and rely on parallel download instead.
-            if (!chainActive.Contains(pindexWalk)) {
-                LogPrint("net", "Large reorg, won't direct fetch to %s (%d)\n",
-                        pindexLast->GetBlockHash().ToString(),
-                        pindexLast->nHeight);
-            } else {
-                vector<CInv> vGetData;
-                // Download as much as possible, from earliest to latest.
-                BOOST_REVERSE_FOREACH(CBlockIndex *pindex, vToFetch) {
-                    if (nodestate->nBlocksInFlight >= MAX_BLOCKS_IN_TRANSIT_PER_PEER) {
-                        // Can't download any more from this peer
-                        break;
-                    }
-                    uint32_t nFetchFlags = GetFetchFlags(pfrom, pindex->pprev, chainparams.GetConsensus());
-                    vGetData.push_back(CInv(MSG_BLOCK | nFetchFlags, pindex->GetBlockHash()));
-                    MarkBlockAsInFlight(pfrom->GetId(), pindex->GetBlockHash(), chainparams.GetConsensus(), pindex);
-                    LogPrint("net", "Requesting block %s from  peer=%d\n",
-                            pindex->GetBlockHash().ToString(), pfrom->id);
-                }
-                if (vGetData.size() > 1) {
-                    LogPrint("net", "Downloading blocks toward %s (%d) via headers direct fetch\n",
-                            pindexLast->GetBlockHash().ToString(), pindexLast->nHeight);
-                }
-                if (vGetData.size() > 0) {
-                    if (nodestate->fSupportsDesiredCmpctVersion && vGetData.size() == 1 && mapBlocksInFlight.size() == 1 && pindexLast->pprev->IsValid(BLOCK_VALID_CHAIN)) {
-                        // We seem to be rather well-synced, so it appears pfrom was the first to provide us
-                        // with this block! Let's get them to announce using compact blocks in the future.
-                        MaybeSetPeerAsAnnouncingHeaderAndIDs(nodestate, pfrom, connman);
-                        // In any case, we want to download using a compact block, not a regular one
-                        vGetData[0] = CInv(MSG_CMPCT_BLOCK, vGetData[0].hash);
-                    }
-                    connman.PushMessage(pfrom, msgMaker.Make(NetMsgType::GETDATA, vGetData));
-                }
-            }
-        }
-        }
-    }
-
-    else if (strCommand == NetMsgType::BLOCK && !fImporting && !fReindex) // Ignore blocks received while importing
-    {
-        CBlock block;
-        vRecv >> block;
-
-        LogPrint("net", "received block %s peer=%d\n", block.GetHash().ToString(), pfrom->id);
-
-        // Process all blocks from whitelisted peers, even if not requested,
-        // unless we're still syncing with the network.
-        // Such an unrequested block may still be processed, subject to the
-        // conditions in AcceptBlock().
-        bool forceProcessing = pfrom->fWhitelisted && !IsInitialBlockDownload();
-        const uint256 hash(block.GetHash());
-        {
-            LOCK(cs_main);
-            // Also always process if we requested the block explicitly, as we may
-            // need it even though it is not a candidate for a new best tip.
-            forceProcessing |= MarkBlockAsReceived(hash);
-            // mapBlockSource is only used for sending reject messages and DoS scores,
-            // so the race between here and cs_main in ProcessNewBlock is fine.
-            mapBlockSource.emplace(hash, std::make_pair(pfrom->GetId(), true));
-        }
-        bool fNewBlock = false;
-        ProcessNewBlock(chainparams, &block, forceProcessing, NULL, &fNewBlock);
-        if (fNewBlock)
-            pfrom->nLastBlockTime = GetTime();
-    }
-
-
-    else if (strCommand == NetMsgType::GETADDR)
-    {
-        // This asymmetric behavior for inbound and outbound connections was introduced
-        // to prevent a fingerprinting attack: an attacker can send specific fake addresses
-        // to users' AddrMan and later request them by sending getaddr messages.
-        // Making nodes which are behind NAT and can only make outgoing connections ignore
-        // the getaddr message mitigates the attack.
-        if (!pfrom->fInbound) {
-            LogPrint("net", "Ignoring \"getaddr\" from outbound connection. peer=%d\n", pfrom->id);
-            return true;
-        }
-
-        // Only send one GetAddr response per connection to reduce resource waste
-        //  and discourage addr stamping of INV announcements.
-        if (pfrom->fSentAddr) {
-            LogPrint("net", "Ignoring repeated \"getaddr\". peer=%d\n", pfrom->id);
-            return true;
-        }
-        pfrom->fSentAddr = true;
-
-        pfrom->vAddrToSend.clear();
-        vector<CAddress> vAddr = connman.GetAddresses();
-        FastRandomContext insecure_rand;
-        BOOST_FOREACH(const CAddress &addr, vAddr)
-            pfrom->PushAddress(addr, insecure_rand);
-    }
-
-
-    else if (strCommand == NetMsgType::MEMPOOL)
-    {
-        if (!(pfrom->GetLocalServices() & NODE_BLOOM) && !pfrom->fWhitelisted)
-        {
-            LogPrint("net", "mempool request with bloom filters disabled, disconnect peer=%d\n", pfrom->GetId());
-            pfrom->fDisconnect = true;
-            return true;
-        }
-
-        if (connman.OutboundTargetReached(false) && !pfrom->fWhitelisted)
-        {
-            LogPrint("net", "mempool request with bandwidth limit reached, disconnect peer=%d\n", pfrom->GetId());
-            pfrom->fDisconnect = true;
-            return true;
-        }
-
-        LOCK(pfrom->cs_inventory);
-        pfrom->fSendMempool = true;
-    }
-
-
-    else if (strCommand == NetMsgType::PING)
-    {
-        if (pfrom->nVersion > BIP0031_VERSION)
-        {
-            uint64_t nonce = 0;
-            vRecv >> nonce;
-            // Echo the message back with the nonce. This allows for two useful features:
-            //
-            // 1) A remote node can quickly check if the connection is operational
-            // 2) Remote nodes can measure the latency of the network thread. If this node
-            //    is overloaded it won't respond to pings quickly and the remote node can
-            //    avoid sending us more work, like chain download requests.
-            //
-            // The nonce stops the remote getting confused between different pings: without
-            // it, if the remote node sends a ping once per second and this node takes 5
-            // seconds to respond to each, the 5th ping the remote sends would appear to
-            // return very quickly.
-            connman.PushMessage(pfrom, msgMaker.Make(NetMsgType::PONG, nonce));
-        }
-    }
-
-
-    else if (strCommand == NetMsgType::PONG)
-    {
-        int64_t pingUsecEnd = nTimeReceived;
-        uint64_t nonce = 0;
-        size_t nAvail = vRecv.in_avail();
-        bool bPingFinished = false;
-        std::string sProblem;
-
-        if (nAvail >= sizeof(nonce)) {
-            vRecv >> nonce;
-
-            // Only process pong message if there is an outstanding ping (old ping without nonce should never pong)
-            if (pfrom->nPingNonceSent != 0) {
-                if (nonce == pfrom->nPingNonceSent) {
-                    // Matching pong received, this ping is no longer outstanding
-                    bPingFinished = true;
-                    int64_t pingUsecTime = pingUsecEnd - pfrom->nPingUsecStart;
-                    if (pingUsecTime > 0) {
-                        // Successful ping time measurement, replace previous
-                        pfrom->nPingUsecTime = pingUsecTime;
-                        pfrom->nMinPingUsecTime = std::min(pfrom->nMinPingUsecTime, pingUsecTime);
-                    } else {
-                        // This should never happen
-                        sProblem = "Timing mishap";
-                    }
-                } else {
-                    // Nonce mismatches are normal when pings are overlapping
-                    sProblem = "Nonce mismatch";
-                    if (nonce == 0) {
-                        // This is most likely a bug in another implementation somewhere; cancel this ping
-                        bPingFinished = true;
-                        sProblem = "Nonce zero";
-                    }
-                }
-            } else {
-                sProblem = "Unsolicited pong without ping";
-            }
-        } else {
-            // This is most likely a bug in another implementation somewhere; cancel this ping
-            bPingFinished = true;
-            sProblem = "Short payload";
-        }
-
-        if (!(sProblem.empty())) {
-            LogPrint("net", "pong peer=%d: %s, %x expected, %x received, %u bytes\n",
-                pfrom->id,
-                sProblem,
-                pfrom->nPingNonceSent,
-                nonce,
-                nAvail);
-        }
-        if (bPingFinished) {
-            pfrom->nPingNonceSent = 0;
-        }
-    }
-
-
-    else if (strCommand == NetMsgType::FILTERLOAD)
-    {
-        CBloomFilter filter;
-        vRecv >> filter;
-
-        if (!filter.IsWithinSizeConstraints())
-        {
-            // There is no excuse for sending a too-large filter
-            LOCK(cs_main);
-            Misbehaving(pfrom->GetId(), 100);
-        }
-        else
-        {
-            LOCK(pfrom->cs_filter);
-            delete pfrom->pfilter;
-            pfrom->pfilter = new CBloomFilter(filter);
-            pfrom->pfilter->UpdateEmptyFull();
-            pfrom->fRelayTxes = true;
-        }
-    }
-
-
-    else if (strCommand == NetMsgType::FILTERADD)
-    {
-        vector<unsigned char> vData;
-        vRecv >> vData;
-
-        // Nodes must NEVER send a data item > 520 bytes (the max size for a script data object,
-        // and thus, the maximum size any matched object can have) in a filteradd message
-        bool bad = false;
-        if (vData.size() > MAX_SCRIPT_ELEMENT_SIZE) {
-            bad = true;
-        } else {
-            LOCK(pfrom->cs_filter);
-            if (pfrom->pfilter) {
-                pfrom->pfilter->insert(vData);
-            } else {
-                bad = true;
-            }
-        }
-        if (bad) {
-            LOCK(cs_main);
-            Misbehaving(pfrom->GetId(), 100);
-        }
-    }
-
-
-    else if (strCommand == NetMsgType::FILTERCLEAR)
-    {
-        LOCK(pfrom->cs_filter);
-        if (pfrom->GetLocalServices() & NODE_BLOOM) {
-            delete pfrom->pfilter;
-            pfrom->pfilter = new CBloomFilter();
-        }
-        pfrom->fRelayTxes = true;
-    }
-
-
-    else if (strCommand == NetMsgType::REJECT)
-    {
-        if (fDebug) {
-            try {
-                string strMsg; unsigned char ccode; string strReason;
-                vRecv >> LIMITED_STRING(strMsg, CMessageHeader::COMMAND_SIZE) >> ccode >> LIMITED_STRING(strReason, MAX_REJECT_MESSAGE_LENGTH);
-
-                ostringstream ss;
-                ss << strMsg << " code " << itostr(ccode) << ": " << strReason;
-
-                if (strMsg == NetMsgType::BLOCK || strMsg == NetMsgType::TX)
-                {
-                    uint256 hash;
-                    vRecv >> hash;
-                    ss << ": hash " << hash.ToString();
-                }
-                LogPrint("net", "Reject %s\n", SanitizeString(ss.str()));
-            } catch (const std::ios_base::failure&) {
-                // Avoid feedback loops by preventing reject messages from triggering a new reject message.
-                LogPrint("net", "Unparseable reject message received\n");
-            }
-        }
-    }
-
-    else if (strCommand == NetMsgType::FEEFILTER) {
-        CAmount newFeeFilter = 0;
-        vRecv >> newFeeFilter;
-        if (MoneyRange(newFeeFilter)) {
-            {
-                LOCK(pfrom->cs_feeFilter);
-                pfrom->minFeeFilter = newFeeFilter;
-            }
-            LogPrint("net", "received: feefilter of %s from peer=%d\n", CFeeRate(newFeeFilter).ToString(), pfrom->id);
-        }
-    }
-
-    else if (strCommand == NetMsgType::NOTFOUND) {
-        // We do not care about the NOTFOUND message, but logging an Unknown Command
-        // message would be undesirable as we transmit it ourselves.
-    }
-
-    else {
-        // Ignore unknown commands for extensibility
-        LogPrint("net", "Unknown command \"%s\" from peer=%d\n", SanitizeString(strCommand), pfrom->id);
-    }
-
-
-
-    return true;
-}
-
-// requires LOCK(cs_vRecvMsg)
-bool ProcessMessages(CNode* pfrom, CConnman& connman)
-{
-    const CChainParams& chainparams = Params();
-    unsigned int nMaxSendBufferSize = connman.GetSendBufferSize();
-    //if (fDebug)
-    //    LogPrintf("%s(%u messages)\n", __func__, pfrom->vRecvMsg.size());
-
-    //
-    // Message format
-    //  (4) message start
-    //  (12) command
-    //  (4) size
-    //  (4) checksum
-    //  (x) data
-    //
-    bool fOk = true;
-
-    if (!pfrom->vRecvGetData.empty())
-        ProcessGetData(pfrom, chainparams.GetConsensus(), connman);
-
-    // this maintains the order of responses
-    if (!pfrom->vRecvGetData.empty()) return fOk;
-
-    std::deque<CNetMessage>::iterator it = pfrom->vRecvMsg.begin();
-    while (!pfrom->fDisconnect && it != pfrom->vRecvMsg.end()) {
-        // Don't bother if send buffer is too full to respond anyway
-        if (pfrom->nSendSize >= nMaxSendBufferSize)
-            break;
-
-        // get next message
-        CNetMessage& msg = *it;
-
-        //if (fDebug)
-        //    LogPrintf("%s(message %u msgsz, %u bytes, complete:%s)\n", __func__,
-        //            msg.hdr.nMessageSize, msg.vRecv.size(),
-        //            msg.complete() ? "Y" : "N");
-
-        // end, if an incomplete message is found
-        if (!msg.complete())
-            break;
-
-        // at this point, any failure means we can delete the current message
-        it++;
-
-        // Scan for message start
-        if (memcmp(msg.hdr.pchMessageStart, chainparams.MessageStart(), CMessageHeader::MESSAGE_START_SIZE) != 0) {
-            LogPrintf("PROCESSMESSAGE: INVALID MESSAGESTART %s peer=%d\n", SanitizeString(msg.hdr.GetCommand()), pfrom->id);
-            fOk = false;
-            break;
-        }
-
-        // Read header
-        CMessageHeader& hdr = msg.hdr;
-        if (!hdr.IsValid(chainparams.MessageStart()))
-        {
-            LogPrintf("PROCESSMESSAGE: ERRORS IN HEADER %s peer=%d\n", SanitizeString(hdr.GetCommand()), pfrom->id);
-            continue;
-        }
-        string strCommand = hdr.GetCommand();
-
-        // Message size
-        unsigned int nMessageSize = hdr.nMessageSize;
-
-        // Checksum
-        CDataStream& vRecv = msg.vRecv;
-        const uint256& hash = msg.GetMessageHash();
-        if (memcmp(hash.begin(), hdr.pchChecksum, CMessageHeader::CHECKSUM_SIZE) != 0)
-        {
-            LogPrintf("%s(%s, %u bytes): CHECKSUM ERROR expected %s was %s\n", __func__,
-               SanitizeString(strCommand), nMessageSize,
-               HexStr(hash.begin(), hash.begin()+CMessageHeader::CHECKSUM_SIZE),
-               HexStr(hdr.pchChecksum, hdr.pchChecksum+CMessageHeader::CHECKSUM_SIZE));
-            continue;
-        }
-
-        // Process message
-        bool fRet = false;
-        try
-        {
-            fRet = ProcessMessage(pfrom, strCommand, vRecv, msg.nTime, chainparams, connman);
-            boost::this_thread::interruption_point();
-        }
-        catch (const std::ios_base::failure& e)
-        {
-            connman.PushMessage(pfrom, CNetMsgMaker(INIT_PROTO_VERSION).Make(NetMsgType::REJECT, strCommand, REJECT_MALFORMED, string("error parsing message")));
-            if (strstr(e.what(), "end of data"))
-            {
-                // Allow exceptions from under-length message on vRecv
-                LogPrintf("%s(%s, %u bytes): Exception '%s' caught, normally caused by a message being shorter than its stated length\n", __func__, SanitizeString(strCommand), nMessageSize, e.what());
-            }
-            else if (strstr(e.what(), "size too large"))
-            {
-                // Allow exceptions from over-long size
-                LogPrintf("%s(%s, %u bytes): Exception '%s' caught\n", __func__, SanitizeString(strCommand), nMessageSize, e.what());
-            }
-            else if (strstr(e.what(), "non-canonical ReadCompactSize()"))
-            {
-                // Allow exceptions from non-canonical encoding
-                LogPrintf("%s(%s, %u bytes): Exception '%s' caught\n", __func__, SanitizeString(strCommand), nMessageSize, e.what());
-            }
-            else
-            {
-                PrintExceptionContinue(&e, "ProcessMessages()");
-            }
-        }
-        catch (const boost::thread_interrupted&) {
-            throw;
-        }
-        catch (const std::exception& e) {
-            PrintExceptionContinue(&e, "ProcessMessages()");
-        } catch (...) {
-            PrintExceptionContinue(NULL, "ProcessMessages()");
-        }
-
-        if (!fRet)
-            LogPrintf("%s(%s, %u bytes) FAILED peer=%d\n", __func__, SanitizeString(strCommand), nMessageSize, pfrom->id);
-
-        break;
-    }
-
-    // In case the connection got shut down, its receive buffer was wiped
-    if (!pfrom->fDisconnect)
-        pfrom->vRecvMsg.erase(pfrom->vRecvMsg.begin(), it);
-
-    return fOk;
-}
-
-class CompareInvMempoolOrder
-{
-    CTxMemPool *mp;
-public:
-    CompareInvMempoolOrder(CTxMemPool *_mempool)
-    {
-        mp = _mempool;
-    }
-
-    bool operator()(std::set<uint256>::iterator a, std::set<uint256>::iterator b)
-    {
-        /* As std::make_heap produces a max-heap, we want the entries with the
-         * fewest ancestors/highest fee to sort later. */
-        return mp->CompareDepthAndScore(*b, *a);
-    }
-};
-
-bool SendMessages(CNode* pto, CConnman& connman)
-{
-    const Consensus::Params& consensusParams = Params().GetConsensus();
-    {
-        // Don't send anything until we get its version message
-        if (pto->nVersion == 0 || pto->fDisconnect)
-            return true;
-
-        // If we get here, the outgoing message serialization version is set and can't change.
-        CNetMsgMaker msgMaker(pto->GetSendVersion());
-
-        //
-        // Message: ping
-        //
-        bool pingSend = false;
-        if (pto->fPingQueued) {
-            // RPC ping request by user
-            pingSend = true;
-        }
-        if (pto->nPingNonceSent == 0 && pto->nPingUsecStart + PING_INTERVAL * 1000000 < GetTimeMicros()) {
-            // Ping automatically sent as a latency probe & keepalive.
-            pingSend = true;
-        }
-        if (pingSend) {
-            uint64_t nonce = 0;
-            while (nonce == 0) {
-                GetRandBytes((unsigned char*)&nonce, sizeof(nonce));
-            }
-            pto->fPingQueued = false;
-            pto->nPingUsecStart = GetTimeMicros();
-            if (pto->nVersion > BIP0031_VERSION) {
-                pto->nPingNonceSent = nonce;
-                connman.PushMessage(pto, msgMaker.Make(NetMsgType::PING, nonce));
-            } else {
-                // Peer is too old to support ping command with nonce, pong will never arrive.
-                pto->nPingNonceSent = 0;
-                connman.PushMessage(pto, msgMaker.Make(NetMsgType::PING));
-            }
-        }
-
-        TRY_LOCK(cs_main, lockMain); // Acquire cs_main for IsInitialBlockDownload() and CNodeState()
-        if (!lockMain)
-            return true;
-
-        CNodeState &state = *State(pto->GetId());
-
-        BOOST_FOREACH(const CBlockReject& reject, state.rejects)
-            connman.PushMessage(pto, msgMaker.Make(NetMsgType::REJECT, (string)NetMsgType::BLOCK, reject.chRejectCode, reject.strRejectReason, reject.hashBlock));
-        state.rejects.clear();
-
-        if (state.fShouldBan) {
-            state.fShouldBan = false;
-            if (pto->fWhitelisted)
-                LogPrintf("Warning: not punishing whitelisted peer %s!\n", pto->addr.ToString());
-            else {
-                pto->fDisconnect = true;
-                if (pto->addr.IsLocal())
-                    LogPrintf("Warning: not banning local peer %s!\n", pto->addr.ToString());
-                else
-                {
-                    connman.Ban(pto->addr, BanReasonNodeMisbehaving);
-                }
-                return true;
-            }
-        }
-
-        // Address refresh broadcast
-        int64_t nNow = GetTimeMicros();
-        if (!IsInitialBlockDownload() && pto->nNextLocalAddrSend < nNow) {
-            AdvertiseLocal(pto);
-            pto->nNextLocalAddrSend = PoissonNextSend(nNow, AVG_LOCAL_ADDRESS_BROADCAST_INTERVAL);
-        }
-
-        //
-        // Message: addr
-        //
-        if (pto->nNextAddrSend < nNow) {
-            pto->nNextAddrSend = PoissonNextSend(nNow, AVG_ADDRESS_BROADCAST_INTERVAL);
-            vector<CAddress> vAddr;
-            vAddr.reserve(pto->vAddrToSend.size());
-            BOOST_FOREACH(const CAddress& addr, pto->vAddrToSend)
-            {
-                if (!pto->addrKnown.contains(addr.GetKey()))
-                {
-                    pto->addrKnown.insert(addr.GetKey());
-                    vAddr.push_back(addr);
-                    // receiver rejects addr messages larger than 1000
-                    if (vAddr.size() >= 1000)
-                    {
-                        connman.PushMessage(pto, msgMaker.Make(NetMsgType::ADDR, vAddr));
-                        vAddr.clear();
-                    }
-                }
-            }
-            pto->vAddrToSend.clear();
-            if (!vAddr.empty())
-                connman.PushMessage(pto, msgMaker.Make(NetMsgType::ADDR, vAddr));
-            // we only send the big addr message once
-            if (pto->vAddrToSend.capacity() > 40)
-                pto->vAddrToSend.shrink_to_fit();
-        }
-
-        // Start block sync
-        if (pindexBestHeader == NULL)
-            pindexBestHeader = chainActive.Tip();
-        bool fFetch = state.fPreferredDownload || (nPreferredDownload == 0 && !pto->fClient && !pto->fOneShot); // Download if this is a nice peer, or we have no nice peers and this one might do.
-        if (!state.fSyncStarted && !pto->fClient && !fImporting && !fReindex) {
-            // Only actively request headers from a single peer, unless we're close to today.
-            if ((nSyncStarted == 0 && fFetch) || pindexBestHeader->GetBlockTime() > GetAdjustedTime() - 24 * 60 * 60) {
-                state.fSyncStarted = true;
-                nSyncStarted++;
-                const CBlockIndex *pindexStart = pindexBestHeader;
-                /* If possible, start at the block preceding the currently
-                   best known header.  This ensures that we always get a
-                   non-empty list of headers back as long as the peer
-                   is up-to-date.  With a non-empty response, we can initialise
-                   the peer's known best block.  This wouldn't be possible
-                   if we requested starting at pindexBestHeader and
-                   got back an empty response.  */
-                if (pindexStart->pprev)
-                    pindexStart = pindexStart->pprev;
-                LogPrint("net", "initial getheaders (%d) to peer=%d (startheight:%d)\n", pindexStart->nHeight, pto->id, pto->nStartingHeight);
-                connman.PushMessage(pto, msgMaker.Make(NetMsgType::GETHEADERS, chainActive.GetLocator(pindexStart), uint256()));
-            }
-        }
-
-        // Resend wallet transactions that haven't gotten in a block yet
-        // Except during reindex, importing and IBD, when old wallet
-        // transactions become unconfirmed and spams other nodes.
-        if (!fReindex && !fImporting && !IsInitialBlockDownload())
-        {
-            GetMainSignals().Broadcast(nTimeBestReceived, &connman);
-        }
-
-        //
-        // Try sending block announcements via headers
-        //
-        {
-            // If we have less than MAX_BLOCKS_TO_ANNOUNCE in our
-            // list of block hashes we're relaying, and our peer wants
-            // headers announcements, then find the first header
-            // not yet known to our peer but would connect, and send.
-            // If no header would connect, or if we have too many
-            // blocks, or if the peer doesn't want headers, just
-            // add all to the inv queue.
-            LOCK(pto->cs_inventory);
-            vector<CBlock> vHeaders;
-            bool fRevertToInv = ((!state.fPreferHeaders &&
-                                 (!state.fPreferHeaderAndIDs || pto->vBlockHashesToAnnounce.size() > 1)) ||
-                                pto->vBlockHashesToAnnounce.size() > MAX_BLOCKS_TO_ANNOUNCE);
-            CBlockIndex *pBestIndex = NULL; // last header queued for delivery
-            ProcessBlockAvailability(pto->id); // ensure pindexBestKnownBlock is up-to-date
-
-            if (!fRevertToInv) {
-                bool fFoundStartingHeader = false;
-                // Try to find first header that our peer doesn't have, and
-                // then send all headers past that one.  If we come across any
-                // headers that aren't on chainActive, give up.
-                BOOST_FOREACH(const uint256 &hash, pto->vBlockHashesToAnnounce) {
-                    BlockMap::iterator mi = mapBlockIndex.find(hash);
-                    assert(mi != mapBlockIndex.end());
-                    CBlockIndex *pindex = mi->second;
-                    if (chainActive[pindex->nHeight] != pindex) {
-                        // Bail out if we reorged away from this block
-                        fRevertToInv = true;
-                        break;
-                    }
-                    if (pBestIndex != NULL && pindex->pprev != pBestIndex) {
-                        // This means that the list of blocks to announce don't
-                        // connect to each other.
-                        // This shouldn't really be possible to hit during
-                        // regular operation (because reorgs should take us to
-                        // a chain that has some block not on the prior chain,
-                        // which should be caught by the prior check), but one
-                        // way this could happen is by using invalidateblock /
-                        // reconsiderblock repeatedly on the tip, causing it to
-                        // be added multiple times to vBlockHashesToAnnounce.
-                        // Robustly deal with this rare situation by reverting
-                        // to an inv.
-                        fRevertToInv = true;
-                        break;
-                    }
-                    pBestIndex = pindex;
-                    if (fFoundStartingHeader) {
-                        // add this to the headers message
-                        vHeaders.push_back(pindex->GetBlockHeader());
-                    } else if (PeerHasHeader(&state, pindex)) {
-                        continue; // keep looking for the first new block
-                    } else if (pindex->pprev == NULL || PeerHasHeader(&state, pindex->pprev)) {
-                        // Peer doesn't have this header but they do have the prior one.
-                        // Start sending headers.
-                        fFoundStartingHeader = true;
-                        vHeaders.push_back(pindex->GetBlockHeader());
-                    } else {
-                        // Peer doesn't have this header or the prior one -- nothing will
-                        // connect, so bail out.
-                        fRevertToInv = true;
-                        break;
-                    }
-                }
-            }
-            if (!fRevertToInv && !vHeaders.empty()) {
-                if (vHeaders.size() == 1 && state.fPreferHeaderAndIDs) {
-                    // We only send up to 1 block as header-and-ids, as otherwise
-                    // probably means we're doing an initial-ish-sync or they're slow
-                    LogPrint("net", "%s sending header-and-ids %s to peer %d\n", __func__,
-                            vHeaders.front().GetHash().ToString(), pto->id);
-                    //TODO: Shouldn't need to reload block from disk, but requires refactor
-                    CBlock block;
-                    assert(ReadBlockFromDisk(block, pBestIndex, consensusParams));
-                    CBlockHeaderAndShortTxIDs cmpctblock(block, state.fWantsCmpctWitness);
-                    int nSendFlags = state.fWantsCmpctWitness ? 0 : SERIALIZE_TRANSACTION_NO_WITNESS;
-                    connman.PushMessage(pto, msgMaker.Make(nSendFlags, NetMsgType::CMPCTBLOCK, cmpctblock));
-                    state.pindexBestHeaderSent = pBestIndex;
-                } else if (state.fPreferHeaders) {
-                    if (vHeaders.size() > 1) {
-                        LogPrint("net", "%s: %u headers, range (%s, %s), to peer=%d\n", __func__,
-                                vHeaders.size(),
-                                vHeaders.front().GetHash().ToString(),
-                                vHeaders.back().GetHash().ToString(), pto->id);
-                    } else {
-                        LogPrint("net", "%s: sending header %s to peer=%d\n", __func__,
-                                vHeaders.front().GetHash().ToString(), pto->id);
-                    }
-                    connman.PushMessage(pto, msgMaker.Make(NetMsgType::HEADERS, vHeaders));
-                    state.pindexBestHeaderSent = pBestIndex;
-                } else
-                    fRevertToInv = true;
-            }
-            if (fRevertToInv) {
-                // If falling back to using an inv, just try to inv the tip.
-                // The last entry in vBlockHashesToAnnounce was our tip at some point
-                // in the past.
-                if (!pto->vBlockHashesToAnnounce.empty()) {
-                    const uint256 &hashToAnnounce = pto->vBlockHashesToAnnounce.back();
-                    BlockMap::iterator mi = mapBlockIndex.find(hashToAnnounce);
-                    assert(mi != mapBlockIndex.end());
-                    CBlockIndex *pindex = mi->second;
-
-                    // Warn if we're announcing a block that is not on the main chain.
-                    // This should be very rare and could be optimized out.
-                    // Just log for now.
-                    if (chainActive[pindex->nHeight] != pindex) {
-                        LogPrint("net", "Announcing block %s not on main chain (tip=%s)\n",
-                            hashToAnnounce.ToString(), chainActive.Tip()->GetBlockHash().ToString());
-                    }
-
-                    // If the peer's chain has this block, don't inv it back.
-                    if (!PeerHasHeader(&state, pindex)) {
-                        pto->PushInventory(CInv(MSG_BLOCK, hashToAnnounce));
-                        LogPrint("net", "%s: sending inv peer=%d hash=%s\n", __func__,
-                            pto->id, hashToAnnounce.ToString());
-                    }
-                }
-            }
-            pto->vBlockHashesToAnnounce.clear();
-        }
-
-        //
-        // Message: inventory
-        //
-        vector<CInv> vInv;
-        {
-            LOCK(pto->cs_inventory);
-            vInv.reserve(std::max<size_t>(pto->vInventoryBlockToSend.size(), INVENTORY_BROADCAST_MAX));
-
-            // Add blocks
-            BOOST_FOREACH(const uint256& hash, pto->vInventoryBlockToSend) {
-                vInv.push_back(CInv(MSG_BLOCK, hash));
-                if (vInv.size() == MAX_INV_SZ) {
-                    connman.PushMessage(pto, msgMaker.Make(NetMsgType::INV, vInv));
-                    vInv.clear();
-                }
-            }
-            pto->vInventoryBlockToSend.clear();
-
-            // Check whether periodic sends should happen
-            bool fSendTrickle = pto->fWhitelisted;
-            if (pto->nNextInvSend < nNow) {
-                fSendTrickle = true;
-                // Use half the delay for outbound peers, as there is less privacy concern for them.
-                pto->nNextInvSend = PoissonNextSend(nNow, INVENTORY_BROADCAST_INTERVAL >> !pto->fInbound);
-            }
-
-            // Time to send but the peer has requested we not relay transactions.
-            if (fSendTrickle) {
-                LOCK(pto->cs_filter);
-                if (!pto->fRelayTxes) pto->setInventoryTxToSend.clear();
-            }
-
-            // Respond to BIP35 mempool requests
-            if (fSendTrickle && pto->fSendMempool) {
-                auto vtxinfo = mempool.infoAll();
-                pto->fSendMempool = false;
-                CAmount filterrate = 0;
-                {
-                    LOCK(pto->cs_feeFilter);
-                    filterrate = pto->minFeeFilter;
-                }
-
-                LOCK(pto->cs_filter);
-
-                for (const auto& txinfo : vtxinfo) {
-                    const uint256& hash = txinfo.tx->GetHash();
-                    CInv inv(MSG_TX, hash);
-                    pto->setInventoryTxToSend.erase(hash);
-                    if (filterrate) {
-                        if (txinfo.feeRate.GetFeePerK() < filterrate)
-                            continue;
-                    }
-                    if (pto->pfilter) {
-                        if (!pto->pfilter->IsRelevantAndUpdate(*txinfo.tx)) continue;
-                    }
-                    pto->filterInventoryKnown.insert(hash);
-                    vInv.push_back(inv);
-                    if (vInv.size() == MAX_INV_SZ) {
-                        connman.PushMessage(pto, msgMaker.Make(NetMsgType::INV, vInv));
-                        vInv.clear();
-                    }
-                }
-                pto->timeLastMempoolReq = GetTime();
-            }
-
-            // Determine transactions to relay
-            if (fSendTrickle) {
-                // Produce a vector with all candidates for sending
-                vector<std::set<uint256>::iterator> vInvTx;
-                vInvTx.reserve(pto->setInventoryTxToSend.size());
-                for (std::set<uint256>::iterator it = pto->setInventoryTxToSend.begin(); it != pto->setInventoryTxToSend.end(); it++) {
-                    vInvTx.push_back(it);
-                }
-                CAmount filterrate = 0;
-                {
-                    LOCK(pto->cs_feeFilter);
-                    filterrate = pto->minFeeFilter;
-                }
-                // Topologically and fee-rate sort the inventory we send for privacy and priority reasons.
-                // A heap is used so that not all items need sorting if only a few are being sent.
-                CompareInvMempoolOrder compareInvMempoolOrder(&mempool);
-                std::make_heap(vInvTx.begin(), vInvTx.end(), compareInvMempoolOrder);
-                // No reason to drain out at many times the network's capacity,
-                // especially since we have many peers and some will draw much shorter delays.
-                unsigned int nRelayedTransactions = 0;
-                LOCK(pto->cs_filter);
-                while (!vInvTx.empty() && nRelayedTransactions < INVENTORY_BROADCAST_MAX) {
-                    // Fetch the top element from the heap
-                    std::pop_heap(vInvTx.begin(), vInvTx.end(), compareInvMempoolOrder);
-                    std::set<uint256>::iterator it = vInvTx.back();
-                    vInvTx.pop_back();
-                    uint256 hash = *it;
-                    // Remove it from the to-be-sent set
-                    pto->setInventoryTxToSend.erase(it);
-                    // Check if not in the filter already
-                    if (pto->filterInventoryKnown.contains(hash)) {
-                        continue;
-                    }
-                    // Not in the mempool anymore? don't bother sending it.
-                    auto txinfo = mempool.info(hash);
-                    if (!txinfo.tx) {
-                        continue;
-                    }
-                    if (filterrate && txinfo.feeRate.GetFeePerK() < filterrate) {
-                        continue;
-                    }
-                    if (pto->pfilter && !pto->pfilter->IsRelevantAndUpdate(*txinfo.tx)) continue;
-                    // Send
-                    vInv.push_back(CInv(MSG_TX, hash));
-                    nRelayedTransactions++;
-                    {
-                        // Expire old relay messages
-                        while (!vRelayExpiration.empty() && vRelayExpiration.front().first < nNow)
-                        {
-                            mapRelay.erase(vRelayExpiration.front().second);
-                            vRelayExpiration.pop_front();
-                        }
-
-                        auto ret = mapRelay.insert(std::make_pair(hash, std::move(txinfo.tx)));
-                        if (ret.second) {
-                            vRelayExpiration.push_back(std::make_pair(nNow + 15 * 60 * 1000000, ret.first));
-                        }
-                    }
-                    if (vInv.size() == MAX_INV_SZ) {
-                        connman.PushMessage(pto, msgMaker.Make(NetMsgType::INV, vInv));
-                        vInv.clear();
-                    }
-                    pto->filterInventoryKnown.insert(hash);
-                }
-            }
-        }
-        if (!vInv.empty())
-            connman.PushMessage(pto, msgMaker.Make(NetMsgType::INV, vInv));
-
-        // Detect whether we're stalling
-        nNow = GetTimeMicros();
-        if (state.nStallingSince && state.nStallingSince < nNow - 1000000 * BLOCK_STALLING_TIMEOUT) {
-            // Stalling only triggers when the block download window cannot move. During normal steady state,
-            // the download window should be much larger than the to-be-downloaded set of blocks, so disconnection
-            // should only happen during initial block download.
-            LogPrintf("Peer=%d is stalling block download, disconnecting\n", pto->id);
-            pto->fDisconnect = true;
-            return true;
-        }
-        // In case there is a block that has been in flight from this peer for 2 + 0.5 * N times the block interval
-        // (with N the number of peers from which we're downloading validated blocks), disconnect due to timeout.
-        // We compensate for other peers to prevent killing off peers due to our own downstream link
-        // being saturated. We only count validated in-flight blocks so peers can't advertise non-existing block hashes
-        // to unreasonably increase our timeout.
-        if (state.vBlocksInFlight.size() > 0) {
-            QueuedBlock &queuedBlock = state.vBlocksInFlight.front();
-            int nOtherPeersWithValidatedDownloads = nPeersWithValidatedDownloads - (state.nBlocksInFlightValidHeaders > 0);
-            if (nNow > state.nDownloadingSince + consensusParams.nPowTargetSpacing * (BLOCK_DOWNLOAD_TIMEOUT_BASE + BLOCK_DOWNLOAD_TIMEOUT_PER_PEER * nOtherPeersWithValidatedDownloads)) {
-                LogPrintf("Timeout downloading block %s from peer=%d, disconnecting\n", queuedBlock.hash.ToString(), pto->id);
-                pto->fDisconnect = true;
-                return true;
-            }
-        }
-
-        //
-        // Message: getdata (blocks)
-        //
-        vector<CInv> vGetData;
-        if (!pto->fClient && (fFetch || !IsInitialBlockDownload()) && state.nBlocksInFlight < MAX_BLOCKS_IN_TRANSIT_PER_PEER) {
-            vector<CBlockIndex*> vToDownload;
-            NodeId staller = -1;
-            FindNextBlocksToDownload(pto->GetId(), MAX_BLOCKS_IN_TRANSIT_PER_PEER - state.nBlocksInFlight, vToDownload, staller, consensusParams);
-            BOOST_FOREACH(CBlockIndex *pindex, vToDownload) {
-                uint32_t nFetchFlags = GetFetchFlags(pto, pindex->pprev, consensusParams);
-                vGetData.push_back(CInv(MSG_BLOCK | nFetchFlags, pindex->GetBlockHash()));
-                MarkBlockAsInFlight(pto->GetId(), pindex->GetBlockHash(), consensusParams, pindex);
-                LogPrint("net", "Requesting block %s (%d) peer=%d\n", pindex->GetBlockHash().ToString(),
-                    pindex->nHeight, pto->id);
-            }
-            if (state.nBlocksInFlight == 0 && staller != -1) {
-                if (State(staller)->nStallingSince == 0) {
-                    State(staller)->nStallingSince = nNow;
-                    LogPrint("net", "Stall started peer=%d\n", staller);
-                }
-            }
-        }
-
-        //
-        // Message: getdata (non-blocks)
-        //
-        while (!pto->mapAskFor.empty() && (*pto->mapAskFor.begin()).first <= nNow)
-        {
-            const CInv& inv = (*pto->mapAskFor.begin()).second;
-            if (!AlreadyHave(inv))
-            {
-                if (fDebug)
-                    LogPrint("net", "Requesting %s peer=%d\n", inv.ToString(), pto->id);
-                vGetData.push_back(inv);
-                if (vGetData.size() >= 1000)
-                {
-                    connman.PushMessage(pto, msgMaker.Make(NetMsgType::GETDATA, vGetData));
-                    vGetData.clear();
-                }
-            } else {
-                //If we're not going to ask, don't expect a response.
-                pto->setAskFor.erase(inv.hash);
-            }
-            pto->mapAskFor.erase(pto->mapAskFor.begin());
-        }
-        if (!vGetData.empty())
-            connman.PushMessage(pto, msgMaker.Make(NetMsgType::GETDATA, vGetData));
-
-        //
-        // Message: feefilter
-        //
-        // We don't want white listed peers to filter txs to us if we have -whitelistforcerelay
-        if (pto->nVersion >= FEEFILTER_VERSION && GetBoolArg("-feefilter", DEFAULT_FEEFILTER) &&
-            !(pto->fWhitelisted && GetBoolArg("-whitelistforcerelay", DEFAULT_WHITELISTFORCERELAY))) {
-            CAmount currentFilter = mempool.GetMinFee(GetArg("-maxmempool", DEFAULT_MAX_MEMPOOL_SIZE) * 1000000).GetFeePerK();
-            int64_t timeNow = GetTimeMicros();
-            if (timeNow > pto->nextSendTimeFeeFilter) {
-                CAmount filterToSend = filterRounder.round(currentFilter);
-                if (filterToSend != pto->lastSentFeeFilter) {
-                    connman.PushMessage(pto, msgMaker.Make(NetMsgType::FEEFILTER, filterToSend));
-                    pto->lastSentFeeFilter = filterToSend;
-                }
-                pto->nextSendTimeFeeFilter = PoissonNextSend(timeNow, AVG_FEEFILTER_BROADCAST_INTERVAL);
-            }
-            // If the fee filter has changed substantially and it's still more than MAX_FEEFILTER_CHANGE_DELAY
-            // until scheduled broadcast, then move the broadcast to within MAX_FEEFILTER_CHANGE_DELAY.
-            else if (timeNow + MAX_FEEFILTER_CHANGE_DELAY * 1000000 < pto->nextSendTimeFeeFilter &&
-                     (currentFilter < 3 * pto->lastSentFeeFilter / 4 || currentFilter > 4 * pto->lastSentFeeFilter / 3)) {
-                pto->nextSendTimeFeeFilter = timeNow + GetRandInt(MAX_FEEFILTER_CHANGE_DELAY) * 1000000;
-            }
-        }
-    }
-    return true;
-}
-
- std::string CBlockFileInfo::ToString() const {
-     return strprintf("CBlockFileInfo(blocks=%u, size=%u, heights=%u...%u, time=%s...%s)", nBlocks, nSize, nHeightFirst, nHeightLast, DateTimeStrFormat("%Y-%m-%d", nTimeFirst), DateTimeStrFormat("%Y-%m-%d", nTimeLast));
- }
-
-ThresholdState VersionBitsTipState(const Consensus::Params& params, Consensus::DeploymentPos pos)
-{
-    LOCK(cs_main);
-    return VersionBitsState(chainActive.Tip(), params, pos, versionbitscache);
-}
-
-int VersionBitsTipStateSinceHeight(const Consensus::Params& params, Consensus::DeploymentPos pos)
-{
-    LOCK(cs_main);
-    return VersionBitsStateSinceHeight(chainActive.Tip(), params, pos, versionbitscache);
-}
-
-static const uint64_t MEMPOOL_DUMP_VERSION = 1;
-
-bool LoadMempool(void)
+bool LoadMempool(void)
 {
     int64_t nExpiryTimeout = GetArg("-mempoolexpiry", DEFAULT_MEMPOOL_EXPIRY) * 60 * 60;
     FILE* filestr = fopen((GetDataDir() / "mempool.dat").string().c_str(), "r");
@@ -7163,9 +4186,5 @@ class CMainCleanup
         for (; it1 != mapBlockIndex.end(); it1++)
             delete (*it1).second;
         mapBlockIndex.clear();
-
-        // orphan transactions
-        mapOrphanTransactions.clear();
-        mapOrphanTransactionsByPrev.clear();
     }
 } instance_of_cmaincleanup;
diff --git a/src/main.h b/src/main.h
index 6b2668e5687b4..e5e1a68414181 100644
--- a/src/main.h
+++ b/src/main.h
@@ -13,10 +13,9 @@
 #include "amount.h"
 #include "chain.h"
 #include "coins.h"
-#include "net.h"
+#include "protocol.h" // For CMessageHeader::MessageStartChars
 #include "script/script_error.h"
 #include "sync.h"
-#include "validationinterface.h"
 #include "versionbits.h"
 
 #include <algorithm>
@@ -28,7 +27,10 @@
 #include <utility>
 #include <vector>
 
+#include <atomic>
+
 #include <boost/unordered_map.hpp>
+#include <boost/filesystem/path.hpp>
 
 class CBlockIndex;
 class CBlockTreeDB;
@@ -560,46 +562,4 @@ void DumpMempool();
 /** Load the mempool from disk. */
 bool LoadMempool();
 
-// The following things handle network-processing logic
-// (and should be moved to a separate file)
-
-/** Register with a network node to receive its signals */
-void RegisterNodeSignals(CNodeSignals& nodeSignals);
-/** Unregister a network node */
-void UnregisterNodeSignals(CNodeSignals& nodeSignals);
-
-class PeerLogicValidation : public CValidationInterface {
-private:
-    CConnman* connman;
-
-public:
-    PeerLogicValidation(CConnman* connmanIn);
-
-    virtual void SyncTransaction(const CTransaction& tx, const CBlockIndex* pindex, int nPosInBlock);
-    virtual void UpdatedBlockTip(const CBlockIndex *pindexNew, const CBlockIndex *pindexFork, bool fInitialDownload);
-    virtual void BlockChecked(const CBlock& block, const CValidationState& state);
-};
-
-struct CNodeStateStats {
-    int nMisbehavior;
-    int nSyncHeight;
-    int nCommonHeight;
-    std::vector<int> vHeightInFlight;
-};
-
-/** Get statistics from node state */
-bool GetNodeStateStats(NodeId nodeid, CNodeStateStats &stats);
-/** Increase a node's misbehavior score. */
-void Misbehaving(NodeId nodeid, int howmuch);
-
-/** Process protocol messages received from a given node */
-bool ProcessMessages(CNode* pfrom, CConnman& connman);
-/**
- * Send queued protocol messages to be sent to a give node.
- *
- * @param[in]   pto             The node which we are sending messages to.
- * @param[in]   connman         The connection manager for that node.
- */
-bool SendMessages(CNode* pto, CConnman& connman);
-
 #endif // BITCOIN_MAIN_H
diff --git a/src/net_processing.cpp b/src/net_processing.cpp
new file mode 100644
index 0000000000000..78c864e96ff87
--- /dev/null
+++ b/src/net_processing.cpp
@@ -0,0 +1,3026 @@
+// Copyright (c) 2009-2010 Satoshi Nakamoto
+// Copyright (c) 2009-2016 The Bitcoin Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#include "net_processing.h"
+
+#include "addrman.h"
+#include "arith_uint256.h"
+#include "blockencodings.h"
+#include "chainparams.h"
+#include "consensus/validation.h"
+#include "hash.h"
+#include "init.h"
+#include "main.h"
+#include "merkleblock.h"
+#include "net.h"
+#include "netmessagemaker.h"
+#include "netbase.h"
+#include "policy/fees.h"
+#include "policy/policy.h"
+#include "primitives/block.h"
+#include "primitives/transaction.h"
+#include "random.h"
+#include "tinyformat.h"
+#include "txmempool.h"
+#include "ui_interface.h"
+#include "util.h"
+#include "utilmoneystr.h"
+#include "utilstrencodings.h"
+#include "validationinterface.h"
+
+#include <boost/thread.hpp>
+
+using namespace std;
+
+#if defined(NDEBUG)
+# error "Bitcoin cannot be compiled without assertions."
+#endif
+
+int64_t nTimeBestReceived = 0; // Used only to inform the wallet of when we last received a block
+
+struct IteratorComparator
+{
+    template<typename I>
+    bool operator()(const I& a, const I& b)
+    {
+        return &(*a) < &(*b);
+    }
+};
+
+struct COrphanTx {
+    CTransaction tx;
+    NodeId fromPeer;
+    int64_t nTimeExpire;
+};
+map<uint256, COrphanTx> mapOrphanTransactions GUARDED_BY(cs_main);
+map<COutPoint, set<map<uint256, COrphanTx>::iterator, IteratorComparator>> mapOrphanTransactionsByPrev GUARDED_BY(cs_main);
+void EraseOrphansFor(NodeId peer) EXCLUSIVE_LOCKS_REQUIRED(cs_main);
+
+static const uint64_t RANDOMIZER_ID_ADDRESS_RELAY = 0x3cac0035b5866b90ULL; // SHA256("main address relay")[0:8]
+
+// Internal stuff
+namespace {
+    /** Number of nodes with fSyncStarted. */
+    int nSyncStarted = 0;
+
+    /**
+     * Sources of received blocks, saved to be able to send them reject
+     * messages or ban them when processing happens afterwards. Protected by
+     * cs_main.
+     * Set mapBlockSource[hash].second to false if the node should not be
+     * punished if the block is invalid.
+     */
+    map<uint256, std::pair<NodeId, bool>> mapBlockSource;
+
+    /**
+     * Filter for transactions that were recently rejected by
+     * AcceptToMemoryPool. These are not rerequested until the chain tip
+     * changes, at which point the entire filter is reset. Protected by
+     * cs_main.
+     *
+     * Without this filter we'd be re-requesting txs from each of our peers,
+     * increasing bandwidth consumption considerably. For instance, with 100
+     * peers, half of which relay a tx we don't accept, that might be a 50x
+     * bandwidth increase. A flooding attacker attempting to roll-over the
+     * filter using minimum-sized, 60byte, transactions might manage to send
+     * 1000/sec if we have fast peers, so we pick 120,000 to give our peers a
+     * two minute window to send invs to us.
+     *
+     * Decreasing the false positive rate is fairly cheap, so we pick one in a
+     * million to make it highly unlikely for users to have issues with this
+     * filter.
+     *
+     * Memory used: 1.3 MB
+     */
+    std::unique_ptr<CRollingBloomFilter> recentRejects;
+    uint256 hashRecentRejectsChainTip;
+
+    /** Blocks that are in flight, and that are in the queue to be downloaded. Protected by cs_main. */
+    struct QueuedBlock {
+        uint256 hash;
+        CBlockIndex* pindex;                                     //!< Optional.
+        bool fValidatedHeaders;                                  //!< Whether this block has validated headers at the time of request.
+        std::unique_ptr<PartiallyDownloadedBlock> partialBlock;  //!< Optional, used for CMPCTBLOCK downloads
+    };
+    map<uint256, pair<NodeId, list<QueuedBlock>::iterator> > mapBlocksInFlight;
+
+    /** Stack of nodes which we have set to announce using compact blocks */
+    list<NodeId> lNodesAnnouncingHeaderAndIDs;
+
+    /** Number of preferable block download peers. */
+    int nPreferredDownload = 0;
+
+    /** Number of peers from which we're downloading blocks. */
+    int nPeersWithValidatedDownloads = 0;
+
+    /** Relay map, protected by cs_main. */
+    typedef std::map<uint256, CTransactionRef> MapRelay;
+    MapRelay mapRelay;
+    /** Expiration-time ordered list of (expire time, relay map entry) pairs, protected by cs_main). */
+    std::deque<std::pair<int64_t, MapRelay::iterator>> vRelayExpiration;
+} // anon namespace
+
+//////////////////////////////////////////////////////////////////////////////
+//
+// Registration of network node signals.
+//
+
+namespace {
+
+struct CBlockReject {
+    unsigned char chRejectCode;
+    string strRejectReason;
+    uint256 hashBlock;
+};
+
+/**
+ * Maintain validation-specific state about nodes, protected by cs_main, instead
+ * by CNode's own locks. This simplifies asynchronous operation, where
+ * processing of incoming data is done after the ProcessMessage call returns,
+ * and we're no longer holding the node's locks.
+ */
+struct CNodeState {
+    //! The peer's address
+    const CService address;
+    //! Whether we have a fully established connection.
+    bool fCurrentlyConnected;
+    //! Accumulated misbehaviour score for this peer.
+    int nMisbehavior;
+    //! Whether this peer should be disconnected and banned (unless whitelisted).
+    bool fShouldBan;
+    //! String name of this peer (debugging/logging purposes).
+    const std::string name;
+    //! List of asynchronously-determined block rejections to notify this peer about.
+    std::vector<CBlockReject> rejects;
+    //! The best known block we know this peer has announced.
+    CBlockIndex *pindexBestKnownBlock;
+    //! The hash of the last unknown block this peer has announced.
+    uint256 hashLastUnknownBlock;
+    //! The last full block we both have.
+    CBlockIndex *pindexLastCommonBlock;
+    //! The best header we have sent our peer.
+    CBlockIndex *pindexBestHeaderSent;
+    //! Length of current-streak of unconnecting headers announcements
+    int nUnconnectingHeaders;
+    //! Whether we've started headers synchronization with this peer.
+    bool fSyncStarted;
+    //! Since when we're stalling block download progress (in microseconds), or 0.
+    int64_t nStallingSince;
+    list<QueuedBlock> vBlocksInFlight;
+    //! When the first entry in vBlocksInFlight started downloading. Don't care when vBlocksInFlight is empty.
+    int64_t nDownloadingSince;
+    int nBlocksInFlight;
+    int nBlocksInFlightValidHeaders;
+    //! Whether we consider this a preferred download peer.
+    bool fPreferredDownload;
+    //! Whether this peer wants invs or headers (when possible) for block announcements.
+    bool fPreferHeaders;
+    //! Whether this peer wants invs or cmpctblocks (when possible) for block announcements.
+    bool fPreferHeaderAndIDs;
+    /**
+      * Whether this peer will send us cmpctblocks if we request them.
+      * This is not used to gate request logic, as we really only care about fSupportsDesiredCmpctVersion,
+      * but is used as a flag to "lock in" the version of compact blocks (fWantsCmpctWitness) we send.
+      */
+    bool fProvidesHeaderAndIDs;
+    //! Whether this peer can give us witnesses
+    bool fHaveWitness;
+    //! Whether this peer wants witnesses in cmpctblocks/blocktxns
+    bool fWantsCmpctWitness;
+    /**
+     * If we've announced NODE_WITNESS to this peer: whether the peer sends witnesses in cmpctblocks/blocktxns,
+     * otherwise: whether this peer sends non-witnesses in cmpctblocks/blocktxns.
+     */
+    bool fSupportsDesiredCmpctVersion;
+
+    CNodeState(CAddress addrIn, std::string addrNameIn) : address(addrIn), name(addrNameIn) {
+        fCurrentlyConnected = false;
+        nMisbehavior = 0;
+        fShouldBan = false;
+        pindexBestKnownBlock = NULL;
+        hashLastUnknownBlock.SetNull();
+        pindexLastCommonBlock = NULL;
+        pindexBestHeaderSent = NULL;
+        nUnconnectingHeaders = 0;
+        fSyncStarted = false;
+        nStallingSince = 0;
+        nDownloadingSince = 0;
+        nBlocksInFlight = 0;
+        nBlocksInFlightValidHeaders = 0;
+        fPreferredDownload = false;
+        fPreferHeaders = false;
+        fPreferHeaderAndIDs = false;
+        fProvidesHeaderAndIDs = false;
+        fHaveWitness = false;
+        fWantsCmpctWitness = false;
+        fSupportsDesiredCmpctVersion = false;
+    }
+};
+
+/** Map maintaining per-node state. Requires cs_main. */
+map<NodeId, CNodeState> mapNodeState;
+
+// Requires cs_main.
+CNodeState *State(NodeId pnode) {
+    map<NodeId, CNodeState>::iterator it = mapNodeState.find(pnode);
+    if (it == mapNodeState.end())
+        return NULL;
+    return &it->second;
+}
+
+void UpdatePreferredDownload(CNode* node, CNodeState* state)
+{
+    nPreferredDownload -= state->fPreferredDownload;
+
+    // Whether this node should be marked as a preferred download node.
+    state->fPreferredDownload = (!node->fInbound || node->fWhitelisted) && !node->fOneShot && !node->fClient;
+
+    nPreferredDownload += state->fPreferredDownload;
+}
+
+void PushNodeVersion(CNode *pnode, CConnman& connman, int64_t nTime)
+{
+    ServiceFlags nLocalNodeServices = pnode->GetLocalServices();
+    uint64_t nonce = pnode->GetLocalNonce();
+    int nNodeStartingHeight = pnode->GetMyStartingHeight();
+    NodeId nodeid = pnode->GetId();
+    CAddress addr = pnode->addr;
+
+    CAddress addrYou = (addr.IsRoutable() && !IsProxy(addr) ? addr : CAddress(CService(), addr.nServices));
+    CAddress addrMe = CAddress(CService(), nLocalNodeServices);
+
+    connman.PushMessage(pnode, CNetMsgMaker(INIT_PROTO_VERSION).Make(NetMsgType::VERSION, PROTOCOL_VERSION, (uint64_t)nLocalNodeServices, nTime, addrYou, addrMe,
+            nonce, strSubVersion, nNodeStartingHeight, ::fRelayTxes));
+
+    if (fLogIPs)
+        LogPrint("net", "send version message: version %d, blocks=%d, us=%s, them=%s, peer=%d\n", PROTOCOL_VERSION, nNodeStartingHeight, addrMe.ToString(), addrYou.ToString(), nodeid);
+    else
+        LogPrint("net", "send version message: version %d, blocks=%d, us=%s, peer=%d\n", PROTOCOL_VERSION, nNodeStartingHeight, addrMe.ToString(), nodeid);
+}
+
+void InitializeNode(CNode *pnode, CConnman& connman) {
+    CAddress addr = pnode->addr;
+    std::string addrName = pnode->addrName;
+    NodeId nodeid = pnode->GetId();
+    {
+        LOCK(cs_main);
+        mapNodeState.emplace_hint(mapNodeState.end(), std::piecewise_construct, std::forward_as_tuple(nodeid), std::forward_as_tuple(addr, std::move(addrName)));
+    }
+    if(!pnode->fInbound)
+        PushNodeVersion(pnode, connman, GetTime());
+}
+
+void FinalizeNode(NodeId nodeid, bool& fUpdateConnectionTime) {
+    fUpdateConnectionTime = false;
+    LOCK(cs_main);
+    CNodeState *state = State(nodeid);
+
+    if (state->fSyncStarted)
+        nSyncStarted--;
+
+    if (state->nMisbehavior == 0 && state->fCurrentlyConnected) {
+        fUpdateConnectionTime = true;
+    }
+
+    BOOST_FOREACH(const QueuedBlock& entry, state->vBlocksInFlight) {
+        mapBlocksInFlight.erase(entry.hash);
+    }
+    EraseOrphansFor(nodeid);
+    nPreferredDownload -= state->fPreferredDownload;
+    nPeersWithValidatedDownloads -= (state->nBlocksInFlightValidHeaders != 0);
+    assert(nPeersWithValidatedDownloads >= 0);
+
+    mapNodeState.erase(nodeid);
+
+    if (mapNodeState.empty()) {
+        // Do a consistency check after the last peer is removed.
+        assert(mapBlocksInFlight.empty());
+        assert(nPreferredDownload == 0);
+        assert(nPeersWithValidatedDownloads == 0);
+    }
+}
+
+// Requires cs_main.
+// Returns a bool indicating whether we requested this block.
+// Also used if a block was /not/ received and timed out or started with another peer
+bool MarkBlockAsReceived(const uint256& hash) {
+    map<uint256, pair<NodeId, list<QueuedBlock>::iterator> >::iterator itInFlight = mapBlocksInFlight.find(hash);
+    if (itInFlight != mapBlocksInFlight.end()) {
+        CNodeState *state = State(itInFlight->second.first);
+        state->nBlocksInFlightValidHeaders -= itInFlight->second.second->fValidatedHeaders;
+        if (state->nBlocksInFlightValidHeaders == 0 && itInFlight->second.second->fValidatedHeaders) {
+            // Last validated block on the queue was received.
+            nPeersWithValidatedDownloads--;
+        }
+        if (state->vBlocksInFlight.begin() == itInFlight->second.second) {
+            // First block on the queue was received, update the start download time for the next one
+            state->nDownloadingSince = std::max(state->nDownloadingSince, GetTimeMicros());
+        }
+        state->vBlocksInFlight.erase(itInFlight->second.second);
+        state->nBlocksInFlight--;
+        state->nStallingSince = 0;
+        mapBlocksInFlight.erase(itInFlight);
+        return true;
+    }
+    return false;
+}
+
+// Requires cs_main.
+// returns false, still setting pit, if the block was already in flight from the same peer
+// pit will only be valid as long as the same cs_main lock is being held
+bool MarkBlockAsInFlight(NodeId nodeid, const uint256& hash, const Consensus::Params& consensusParams, CBlockIndex *pindex = NULL, list<QueuedBlock>::iterator **pit = NULL) {
+    CNodeState *state = State(nodeid);
+    assert(state != NULL);
+
+    // Short-circuit most stuff in case its from the same node
+    map<uint256, pair<NodeId, list<QueuedBlock>::iterator> >::iterator itInFlight = mapBlocksInFlight.find(hash);
+    if (itInFlight != mapBlocksInFlight.end() && itInFlight->second.first == nodeid) {
+        *pit = &itInFlight->second.second;
+        return false;
+    }
+
+    // Make sure it's not listed somewhere already.
+    MarkBlockAsReceived(hash);
+
+    list<QueuedBlock>::iterator it = state->vBlocksInFlight.insert(state->vBlocksInFlight.end(),
+            {hash, pindex, pindex != NULL, std::unique_ptr<PartiallyDownloadedBlock>(pit ? new PartiallyDownloadedBlock(&mempool) : NULL)});
+    state->nBlocksInFlight++;
+    state->nBlocksInFlightValidHeaders += it->fValidatedHeaders;
+    if (state->nBlocksInFlight == 1) {
+        // We're starting a block download (batch) from this peer.
+        state->nDownloadingSince = GetTimeMicros();
+    }
+    if (state->nBlocksInFlightValidHeaders == 1 && pindex != NULL) {
+        nPeersWithValidatedDownloads++;
+    }
+    itInFlight = mapBlocksInFlight.insert(std::make_pair(hash, std::make_pair(nodeid, it))).first;
+    if (pit)
+        *pit = &itInFlight->second.second;
+    return true;
+}
+
+/** Check whether the last unknown block a peer advertised is not yet known. */
+void ProcessBlockAvailability(NodeId nodeid) {
+    CNodeState *state = State(nodeid);
+    assert(state != NULL);
+
+    if (!state->hashLastUnknownBlock.IsNull()) {
+        BlockMap::iterator itOld = mapBlockIndex.find(state->hashLastUnknownBlock);
+        if (itOld != mapBlockIndex.end() && itOld->second->nChainWork > 0) {
+            if (state->pindexBestKnownBlock == NULL || itOld->second->nChainWork >= state->pindexBestKnownBlock->nChainWork)
+                state->pindexBestKnownBlock = itOld->second;
+            state->hashLastUnknownBlock.SetNull();
+        }
+    }
+}
+
+/** Update tracking information about which blocks a peer is assumed to have. */
+void UpdateBlockAvailability(NodeId nodeid, const uint256 &hash) {
+    CNodeState *state = State(nodeid);
+    assert(state != NULL);
+
+    ProcessBlockAvailability(nodeid);
+
+    BlockMap::iterator it = mapBlockIndex.find(hash);
+    if (it != mapBlockIndex.end() && it->second->nChainWork > 0) {
+        // An actually better block was announced.
+        if (state->pindexBestKnownBlock == NULL || it->second->nChainWork >= state->pindexBestKnownBlock->nChainWork)
+            state->pindexBestKnownBlock = it->second;
+    } else {
+        // An unknown block was announced; just assume that the latest one is the best one.
+        state->hashLastUnknownBlock = hash;
+    }
+}
+
+void MaybeSetPeerAsAnnouncingHeaderAndIDs(const CNodeState* nodestate, CNode* pfrom, CConnman& connman) {
+    if (!nodestate->fSupportsDesiredCmpctVersion) {
+        // Never ask from peers who can't provide witnesses.
+        return;
+    }
+    if (nodestate->fProvidesHeaderAndIDs) {
+        for (std::list<NodeId>::iterator it = lNodesAnnouncingHeaderAndIDs.begin(); it != lNodesAnnouncingHeaderAndIDs.end(); it++) {
+            if (*it == pfrom->GetId()) {
+                lNodesAnnouncingHeaderAndIDs.erase(it);
+                lNodesAnnouncingHeaderAndIDs.push_back(pfrom->GetId());
+                return;
+            }
+        }
+        bool fAnnounceUsingCMPCTBLOCK = false;
+        uint64_t nCMPCTBLOCKVersion = (pfrom->GetLocalServices() & NODE_WITNESS) ? 2 : 1;
+        if (lNodesAnnouncingHeaderAndIDs.size() >= 3) {
+            // As per BIP152, we only get 3 of our peers to announce
+            // blocks using compact encodings.
+            connman.ForNode(lNodesAnnouncingHeaderAndIDs.front(), [&connman, fAnnounceUsingCMPCTBLOCK, nCMPCTBLOCKVersion](CNode* pnodeStop){
+                connman.PushMessage(pnodeStop, CNetMsgMaker(pnodeStop->GetSendVersion()).Make(NetMsgType::SENDCMPCT, fAnnounceUsingCMPCTBLOCK, nCMPCTBLOCKVersion));
+                return true;
+            });
+            lNodesAnnouncingHeaderAndIDs.pop_front();
+        }
+        fAnnounceUsingCMPCTBLOCK = true;
+        connman.PushMessage(pfrom, CNetMsgMaker(pfrom->GetSendVersion()).Make(NetMsgType::SENDCMPCT, fAnnounceUsingCMPCTBLOCK, nCMPCTBLOCKVersion));
+        lNodesAnnouncingHeaderAndIDs.push_back(pfrom->GetId());
+    }
+}
+
+// Requires cs_main
+bool CanDirectFetch(const Consensus::Params &consensusParams)
+{
+    return chainActive.Tip()->GetBlockTime() > GetAdjustedTime() - consensusParams.nPowTargetSpacing * 20;
+}
+
+// Requires cs_main
+bool PeerHasHeader(CNodeState *state, CBlockIndex *pindex)
+{
+    if (state->pindexBestKnownBlock && pindex == state->pindexBestKnownBlock->GetAncestor(pindex->nHeight))
+        return true;
+    if (state->pindexBestHeaderSent && pindex == state->pindexBestHeaderSent->GetAncestor(pindex->nHeight))
+        return true;
+    return false;
+}
+
+/** Find the last common ancestor two blocks have.
+ *  Both pa and pb must be non-NULL. */
+CBlockIndex* LastCommonAncestor(CBlockIndex* pa, CBlockIndex* pb) {
+    if (pa->nHeight > pb->nHeight) {
+        pa = pa->GetAncestor(pb->nHeight);
+    } else if (pb->nHeight > pa->nHeight) {
+        pb = pb->GetAncestor(pa->nHeight);
+    }
+
+    while (pa != pb && pa && pb) {
+        pa = pa->pprev;
+        pb = pb->pprev;
+    }
+
+    // Eventually all chain branches meet at the genesis block.
+    assert(pa == pb);
+    return pa;
+}
+
+/** Update pindexLastCommonBlock and add not-in-flight missing successors to vBlocks, until it has
+ *  at most count entries. */
+void FindNextBlocksToDownload(NodeId nodeid, unsigned int count, std::vector<CBlockIndex*>& vBlocks, NodeId& nodeStaller, const Consensus::Params& consensusParams) {
+    if (count == 0)
+        return;
+
+    vBlocks.reserve(vBlocks.size() + count);
+    CNodeState *state = State(nodeid);
+    assert(state != NULL);
+
+    // Make sure pindexBestKnownBlock is up to date, we'll need it.
+    ProcessBlockAvailability(nodeid);
+
+    if (state->pindexBestKnownBlock == NULL || state->pindexBestKnownBlock->nChainWork < chainActive.Tip()->nChainWork) {
+        // This peer has nothing interesting.
+        return;
+    }
+
+    if (state->pindexLastCommonBlock == NULL) {
+        // Bootstrap quickly by guessing a parent of our best tip is the forking point.
+        // Guessing wrong in either direction is not a problem.
+        state->pindexLastCommonBlock = chainActive[std::min(state->pindexBestKnownBlock->nHeight, chainActive.Height())];
+    }
+
+    // If the peer reorganized, our previous pindexLastCommonBlock may not be an ancestor
+    // of its current tip anymore. Go back enough to fix that.
+    state->pindexLastCommonBlock = LastCommonAncestor(state->pindexLastCommonBlock, state->pindexBestKnownBlock);
+    if (state->pindexLastCommonBlock == state->pindexBestKnownBlock)
+        return;
+
+    std::vector<CBlockIndex*> vToFetch;
+    CBlockIndex *pindexWalk = state->pindexLastCommonBlock;
+    // Never fetch further than the best block we know the peer has, or more than BLOCK_DOWNLOAD_WINDOW + 1 beyond the last
+    // linked block we have in common with this peer. The +1 is so we can detect stalling, namely if we would be able to
+    // download that next block if the window were 1 larger.
+    int nWindowEnd = state->pindexLastCommonBlock->nHeight + BLOCK_DOWNLOAD_WINDOW;
+    int nMaxHeight = std::min<int>(state->pindexBestKnownBlock->nHeight, nWindowEnd + 1);
+    NodeId waitingfor = -1;
+    while (pindexWalk->nHeight < nMaxHeight) {
+        // Read up to 128 (or more, if more blocks than that are needed) successors of pindexWalk (towards
+        // pindexBestKnownBlock) into vToFetch. We fetch 128, because CBlockIndex::GetAncestor may be as expensive
+        // as iterating over ~100 CBlockIndex* entries anyway.
+        int nToFetch = std::min(nMaxHeight - pindexWalk->nHeight, std::max<int>(count - vBlocks.size(), 128));
+        vToFetch.resize(nToFetch);
+        pindexWalk = state->pindexBestKnownBlock->GetAncestor(pindexWalk->nHeight + nToFetch);
+        vToFetch[nToFetch - 1] = pindexWalk;
+        for (unsigned int i = nToFetch - 1; i > 0; i--) {
+            vToFetch[i - 1] = vToFetch[i]->pprev;
+        }
+
+        // Iterate over those blocks in vToFetch (in forward direction), adding the ones that
+        // are not yet downloaded and not in flight to vBlocks. In the mean time, update
+        // pindexLastCommonBlock as long as all ancestors are already downloaded, or if it's
+        // already part of our chain (and therefore don't need it even if pruned).
+        BOOST_FOREACH(CBlockIndex* pindex, vToFetch) {
+            if (!pindex->IsValid(BLOCK_VALID_TREE)) {
+                // We consider the chain that this peer is on invalid.
+                return;
+            }
+            if (!State(nodeid)->fHaveWitness && IsWitnessEnabled(pindex->pprev, consensusParams)) {
+                // We wouldn't download this block or its descendants from this peer.
+                return;
+            }
+            if (pindex->nStatus & BLOCK_HAVE_DATA || chainActive.Contains(pindex)) {
+                if (pindex->nChainTx)
+                    state->pindexLastCommonBlock = pindex;
+            } else if (mapBlocksInFlight.count(pindex->GetBlockHash()) == 0) {
+                // The block is not already downloaded, and not yet in flight.
+                if (pindex->nHeight > nWindowEnd) {
+                    // We reached the end of the window.
+                    if (vBlocks.size() == 0 && waitingfor != nodeid) {
+                        // We aren't able to fetch anything, but we would be if the download window was one larger.
+                        nodeStaller = waitingfor;
+                    }
+                    return;
+                }
+                vBlocks.push_back(pindex);
+                if (vBlocks.size() == count) {
+                    return;
+                }
+            } else if (waitingfor == -1) {
+                // This is the first already-in-flight block.
+                waitingfor = mapBlocksInFlight[pindex->GetBlockHash()].first;
+            }
+        }
+    }
+}
+
+} // anon namespace
+
+bool GetNodeStateStats(NodeId nodeid, CNodeStateStats &stats) {
+    LOCK(cs_main);
+    CNodeState *state = State(nodeid);
+    if (state == NULL)
+        return false;
+    stats.nMisbehavior = state->nMisbehavior;
+    stats.nSyncHeight = state->pindexBestKnownBlock ? state->pindexBestKnownBlock->nHeight : -1;
+    stats.nCommonHeight = state->pindexLastCommonBlock ? state->pindexLastCommonBlock->nHeight : -1;
+    BOOST_FOREACH(const QueuedBlock& queue, state->vBlocksInFlight) {
+        if (queue.pindex)
+            stats.vHeightInFlight.push_back(queue.pindex->nHeight);
+    }
+    return true;
+}
+
+void RegisterNodeSignals(CNodeSignals& nodeSignals)
+{
+    nodeSignals.ProcessMessages.connect(&ProcessMessages);
+    nodeSignals.SendMessages.connect(&SendMessages);
+    nodeSignals.InitializeNode.connect(&InitializeNode);
+    nodeSignals.FinalizeNode.connect(&FinalizeNode);
+}
+
+void UnregisterNodeSignals(CNodeSignals& nodeSignals)
+{
+    nodeSignals.ProcessMessages.disconnect(&ProcessMessages);
+    nodeSignals.SendMessages.disconnect(&SendMessages);
+    nodeSignals.InitializeNode.disconnect(&InitializeNode);
+    nodeSignals.FinalizeNode.disconnect(&FinalizeNode);
+}
+
+//////////////////////////////////////////////////////////////////////////////
+//
+// mapOrphanTransactions
+//
+
+bool AddOrphanTx(const CTransaction& tx, NodeId peer) EXCLUSIVE_LOCKS_REQUIRED(cs_main)
+{
+    uint256 hash = tx.GetHash();
+    if (mapOrphanTransactions.count(hash))
+        return false;
+
+    // Ignore big transactions, to avoid a
+    // send-big-orphans memory exhaustion attack. If a peer has a legitimate
+    // large transaction with a missing parent then we assume
+    // it will rebroadcast it later, after the parent transaction(s)
+    // have been mined or received.
+    // 100 orphans, each of which is at most 99,999 bytes big is
+    // at most 10 megabytes of orphans and somewhat more byprev index (in the worst case):
+    unsigned int sz = GetTransactionWeight(tx);
+    if (sz >= MAX_STANDARD_TX_WEIGHT)
+    {
+        LogPrint("mempool", "ignoring large orphan tx (size: %u, hash: %s)\n", sz, hash.ToString());
+        return false;
+    }
+
+    auto ret = mapOrphanTransactions.emplace(hash, COrphanTx{tx, peer, GetTime() + ORPHAN_TX_EXPIRE_TIME});
+    assert(ret.second);
+    BOOST_FOREACH(const CTxIn& txin, tx.vin) {
+        mapOrphanTransactionsByPrev[txin.prevout].insert(ret.first);
+    }
+
+    LogPrint("mempool", "stored orphan tx %s (mapsz %u outsz %u)\n", hash.ToString(),
+             mapOrphanTransactions.size(), mapOrphanTransactionsByPrev.size());
+    return true;
+}
+
+int static EraseOrphanTx(uint256 hash) EXCLUSIVE_LOCKS_REQUIRED(cs_main)
+{
+    map<uint256, COrphanTx>::iterator it = mapOrphanTransactions.find(hash);
+    if (it == mapOrphanTransactions.end())
+        return 0;
+    BOOST_FOREACH(const CTxIn& txin, it->second.tx.vin)
+    {
+        auto itPrev = mapOrphanTransactionsByPrev.find(txin.prevout);
+        if (itPrev == mapOrphanTransactionsByPrev.end())
+            continue;
+        itPrev->second.erase(it);
+        if (itPrev->second.empty())
+            mapOrphanTransactionsByPrev.erase(itPrev);
+    }
+    mapOrphanTransactions.erase(it);
+    return 1;
+}
+
+void EraseOrphansFor(NodeId peer)
+{
+    int nErased = 0;
+    map<uint256, COrphanTx>::iterator iter = mapOrphanTransactions.begin();
+    while (iter != mapOrphanTransactions.end())
+    {
+        map<uint256, COrphanTx>::iterator maybeErase = iter++; // increment to avoid iterator becoming invalid
+        if (maybeErase->second.fromPeer == peer)
+        {
+            nErased += EraseOrphanTx(maybeErase->second.tx.GetHash());
+        }
+    }
+    if (nErased > 0) LogPrint("mempool", "Erased %d orphan tx from peer %d\n", nErased, peer);
+}
+
+
+unsigned int LimitOrphanTxSize(unsigned int nMaxOrphans) EXCLUSIVE_LOCKS_REQUIRED(cs_main)
+{
+    unsigned int nEvicted = 0;
+    static int64_t nNextSweep;
+    int64_t nNow = GetTime();
+    if (nNextSweep <= nNow) {
+        // Sweep out expired orphan pool entries:
+        int nErased = 0;
+        int64_t nMinExpTime = nNow + ORPHAN_TX_EXPIRE_TIME - ORPHAN_TX_EXPIRE_INTERVAL;
+        map<uint256, COrphanTx>::iterator iter = mapOrphanTransactions.begin();
+        while (iter != mapOrphanTransactions.end())
+        {
+            map<uint256, COrphanTx>::iterator maybeErase = iter++;
+            if (maybeErase->second.nTimeExpire <= nNow) {
+                nErased += EraseOrphanTx(maybeErase->second.tx.GetHash());
+            } else {
+                nMinExpTime = std::min(maybeErase->second.nTimeExpire, nMinExpTime);
+            }
+        }
+        // Sweep again 5 minutes after the next entry that expires in order to batch the linear scan.
+        nNextSweep = nMinExpTime + ORPHAN_TX_EXPIRE_INTERVAL;
+        if (nErased > 0) LogPrint("mempool", "Erased %d orphan tx due to expiration\n", nErased);
+    }
+    while (mapOrphanTransactions.size() > nMaxOrphans)
+    {
+        // Evict a random orphan:
+        uint256 randomhash = GetRandHash();
+        map<uint256, COrphanTx>::iterator it = mapOrphanTransactions.lower_bound(randomhash);
+        if (it == mapOrphanTransactions.end())
+            it = mapOrphanTransactions.begin();
+        EraseOrphanTx(it->first);
+        ++nEvicted;
+    }
+    return nEvicted;
+}
+
+// Requires cs_main.
+void Misbehaving(NodeId pnode, int howmuch)
+{
+    if (howmuch == 0)
+        return;
+
+    CNodeState *state = State(pnode);
+    if (state == NULL)
+        return;
+
+    state->nMisbehavior += howmuch;
+    int banscore = GetArg("-banscore", DEFAULT_BANSCORE_THRESHOLD);
+    if (state->nMisbehavior >= banscore && state->nMisbehavior - howmuch < banscore)
+    {
+        LogPrintf("%s: %s peer=%d (%d -> %d) BAN THRESHOLD EXCEEDED\n", __func__, state->name, pnode, state->nMisbehavior-howmuch, state->nMisbehavior);
+        state->fShouldBan = true;
+    } else
+        LogPrintf("%s: %s peer=%d (%d -> %d)\n", __func__, state->name, pnode, state->nMisbehavior-howmuch, state->nMisbehavior);
+}
+
+
+
+
+
+
+
+
+//////////////////////////////////////////////////////////////////////////////
+//
+// blockchain -> download logic notification
+//
+
+PeerLogicValidation::PeerLogicValidation(CConnman* connmanIn) : connman(connmanIn) {
+    // Initialize global variables that cannot be constructed at startup.
+    recentRejects.reset(new CRollingBloomFilter(120000, 0.000001));
+}
+
+void PeerLogicValidation::SyncTransaction(const CTransaction& tx, const CBlockIndex* pindex, int nPosInBlock) {
+    if (nPosInBlock == CMainSignals::SYNC_TRANSACTION_NOT_IN_BLOCK)
+        return;
+
+    LOCK(cs_main);
+
+    std::vector<uint256> vOrphanErase;
+    // Which orphan pool entries must we evict?
+    for (size_t j = 0; j < tx.vin.size(); j++) {
+        auto itByPrev = mapOrphanTransactionsByPrev.find(tx.vin[j].prevout);
+        if (itByPrev == mapOrphanTransactionsByPrev.end()) continue;
+        for (auto mi = itByPrev->second.begin(); mi != itByPrev->second.end(); ++mi) {
+            const CTransaction& orphanTx = (*mi)->second.tx;
+            const uint256& orphanHash = orphanTx.GetHash();
+            vOrphanErase.push_back(orphanHash);
+        }
+    }
+
+    // Erase orphan transactions include or precluded by this block
+    if (vOrphanErase.size()) {
+        int nErased = 0;
+        BOOST_FOREACH(uint256 &orphanHash, vOrphanErase) {
+            nErased += EraseOrphanTx(orphanHash);
+        }
+        LogPrint("mempool", "Erased %d orphan tx included or conflicted by block\n", nErased);
+    }
+}
+
+void PeerLogicValidation::UpdatedBlockTip(const CBlockIndex *pindexNew, const CBlockIndex *pindexFork, bool fInitialDownload) {
+    const int nNewHeight = pindexNew->nHeight;
+    connman->SetBestHeight(nNewHeight);
+
+    if (!fInitialDownload) {
+        // Find the hashes of all blocks that weren't previously in the best chain.
+        std::vector<uint256> vHashes;
+        const CBlockIndex *pindexToAnnounce = pindexNew;
+        while (pindexToAnnounce != pindexFork) {
+            vHashes.push_back(pindexToAnnounce->GetBlockHash());
+            pindexToAnnounce = pindexToAnnounce->pprev;
+            if (vHashes.size() == MAX_BLOCKS_TO_ANNOUNCE) {
+                // Limit announcements in case of a huge reorganization.
+                // Rely on the peer's synchronization mechanism in that case.
+                break;
+            }
+        }
+        // Relay inventory, but don't relay old inventory during initial block download.
+        connman->ForEachNode([nNewHeight, &vHashes](CNode* pnode) {
+            if (nNewHeight > (pnode->nStartingHeight != -1 ? pnode->nStartingHeight - 2000 : 0)) {
+                BOOST_REVERSE_FOREACH(const uint256& hash, vHashes) {
+                    pnode->PushBlockHash(hash);
+                }
+            }
+        });
+    }
+
+    nTimeBestReceived = GetTime();
+}
+
+void PeerLogicValidation::BlockChecked(const CBlock& block, const CValidationState& state) {
+    LOCK(cs_main);
+
+    const uint256 hash(block.GetHash());
+    std::map<uint256, std::pair<NodeId, bool>>::iterator it = mapBlockSource.find(hash);
+
+    int nDoS = 0;
+    if (state.IsInvalid(nDoS)) {
+        if (it != mapBlockSource.end() && State(it->second.first)) {
+            assert (state.GetRejectCode() < REJECT_INTERNAL); // Blocks are never rejected with internal reject codes
+            CBlockReject reject = {(unsigned char)state.GetRejectCode(), state.GetRejectReason().substr(0, MAX_REJECT_MESSAGE_LENGTH), hash};
+            State(it->second.first)->rejects.push_back(reject);
+            if (nDoS > 0 && it->second.second)
+                Misbehaving(it->second.first, nDoS);
+        }
+    }
+    if (it != mapBlockSource.end())
+        mapBlockSource.erase(it);
+}
+
+//////////////////////////////////////////////////////////////////////////////
+//
+// Messages
+//
+
+
+bool static AlreadyHave(const CInv& inv) EXCLUSIVE_LOCKS_REQUIRED(cs_main)
+{
+    switch (inv.type)
+    {
+    case MSG_TX:
+    case MSG_WITNESS_TX:
+        {
+            assert(recentRejects);
+            if (chainActive.Tip()->GetBlockHash() != hashRecentRejectsChainTip)
+            {
+                // If the chain tip has changed previously rejected transactions
+                // might be now valid, e.g. due to a nLockTime'd tx becoming valid,
+                // or a double-spend. Reset the rejects filter and give those
+                // txs a second chance.
+                hashRecentRejectsChainTip = chainActive.Tip()->GetBlockHash();
+                recentRejects->reset();
+            }
+
+            // Use pcoinsTip->HaveCoinsInCache as a quick approximation to exclude
+            // requesting or processing some txs which have already been included in a block
+            return recentRejects->contains(inv.hash) ||
+                   mempool.exists(inv.hash) ||
+                   mapOrphanTransactions.count(inv.hash) ||
+                   pcoinsTip->HaveCoinsInCache(inv.hash);
+        }
+    case MSG_BLOCK:
+    case MSG_WITNESS_BLOCK:
+        return mapBlockIndex.count(inv.hash);
+    }
+    // Don't know what it is, just say we already got one
+    return true;
+}
+
+static void RelayTransaction(const CTransaction& tx, CConnman& connman)
+{
+    CInv inv(MSG_TX, tx.GetHash());
+    connman.ForEachNode([&inv](CNode* pnode)
+    {
+        pnode->PushInventory(inv);
+    });
+}
+
+static void RelayAddress(const CAddress& addr, bool fReachable, CConnman& connman)
+{
+    unsigned int nRelayNodes = fReachable ? 2 : 1; // limited relaying of addresses outside our network(s)
+
+    // Relay to a limited number of other nodes
+    // Use deterministic randomness to send to the same nodes for 24 hours
+    // at a time so the addrKnowns of the chosen nodes prevent repeats
+    uint64_t hashAddr = addr.GetHash();
+    const CSipHasher hasher = connman.GetDeterministicRandomizer(RANDOMIZER_ID_ADDRESS_RELAY).Write(hashAddr << 32).Write((GetTime() + hashAddr) / (24*60*60));
+    FastRandomContext insecure_rand;
+
+    std::array<std::pair<uint64_t, CNode*>,2> best{{{0, nullptr}, {0, nullptr}}};
+    assert(nRelayNodes <= best.size());
+
+    auto sortfunc = [&best, &hasher, nRelayNodes](CNode* pnode) {
+        if (pnode->nVersion >= CADDR_TIME_VERSION) {
+            uint64_t hashKey = CSipHasher(hasher).Write(pnode->id).Finalize();
+            for (unsigned int i = 0; i < nRelayNodes; i++) {
+                 if (hashKey > best[i].first) {
+                     std::copy(best.begin() + i, best.begin() + nRelayNodes - 1, best.begin() + i + 1);
+                     best[i] = std::make_pair(hashKey, pnode);
+                     break;
+                 }
+            }
+        }
+    };
+
+    auto pushfunc = [&addr, &best, nRelayNodes, &insecure_rand] {
+        for (unsigned int i = 0; i < nRelayNodes && best[i].first != 0; i++) {
+            best[i].second->PushAddress(addr, insecure_rand);
+        }
+    };
+
+    connman.ForEachNodeThen(std::move(sortfunc), std::move(pushfunc));
+}
+
+void static ProcessGetData(CNode* pfrom, const Consensus::Params& consensusParams, CConnman& connman)
+{
+    std::deque<CInv>::iterator it = pfrom->vRecvGetData.begin();
+    unsigned int nMaxSendBufferSize = connman.GetSendBufferSize();
+    vector<CInv> vNotFound;
+    CNetMsgMaker msgMaker(pfrom->GetSendVersion());
+    LOCK(cs_main);
+
+    while (it != pfrom->vRecvGetData.end()) {
+        // Don't bother if send buffer is too full to respond anyway
+        if (pfrom->nSendSize >= nMaxSendBufferSize)
+            break;
+
+        const CInv &inv = *it;
+        {
+            boost::this_thread::interruption_point();
+            it++;
+
+            if (inv.type == MSG_BLOCK || inv.type == MSG_FILTERED_BLOCK || inv.type == MSG_CMPCT_BLOCK || inv.type == MSG_WITNESS_BLOCK)
+            {
+                bool send = false;
+                BlockMap::iterator mi = mapBlockIndex.find(inv.hash);
+                if (mi != mapBlockIndex.end())
+                {
+                    if (chainActive.Contains(mi->second)) {
+                        send = true;
+                    } else {
+                        static const int nOneMonth = 30 * 24 * 60 * 60;
+                        // To prevent fingerprinting attacks, only send blocks outside of the active
+                        // chain if they are valid, and no more than a month older (both in time, and in
+                        // best equivalent proof of work) than the best header chain we know about.
+                        send = mi->second->IsValid(BLOCK_VALID_SCRIPTS) && (pindexBestHeader != NULL) &&
+                            (pindexBestHeader->GetBlockTime() - mi->second->GetBlockTime() < nOneMonth) &&
+                            (GetBlockProofEquivalentTime(*pindexBestHeader, *mi->second, *pindexBestHeader, consensusParams) < nOneMonth);
+                        if (!send) {
+                            LogPrintf("%s: ignoring request from peer=%i for old block that isn't in the main chain\n", __func__, pfrom->GetId());
+                        }
+                    }
+                }
+                // disconnect node in case we have reached the outbound limit for serving historical blocks
+                // never disconnect whitelisted nodes
+                static const int nOneWeek = 7 * 24 * 60 * 60; // assume > 1 week = historical
+                if (send && connman.OutboundTargetReached(true) && ( ((pindexBestHeader != NULL) && (pindexBestHeader->GetBlockTime() - mi->second->GetBlockTime() > nOneWeek)) || inv.type == MSG_FILTERED_BLOCK) && !pfrom->fWhitelisted)
+                {
+                    LogPrint("net", "historical block serving limit reached, disconnect peer=%d\n", pfrom->GetId());
+
+                    //disconnect node
+                    pfrom->fDisconnect = true;
+                    send = false;
+                }
+                // Pruned nodes may have deleted the block, so check whether
+                // it's available before trying to send.
+                if (send && (mi->second->nStatus & BLOCK_HAVE_DATA))
+                {
+                    // Send block from disk
+                    CBlock block;
+                    if (!ReadBlockFromDisk(block, (*mi).second, consensusParams))
+                        assert(!"cannot load block from disk");
+                    if (inv.type == MSG_BLOCK)
+                        connman.PushMessage(pfrom, msgMaker.Make(SERIALIZE_TRANSACTION_NO_WITNESS, NetMsgType::BLOCK, block));
+                    else if (inv.type == MSG_WITNESS_BLOCK)
+                        connman.PushMessage(pfrom, msgMaker.Make(NetMsgType::BLOCK, block));
+                    else if (inv.type == MSG_FILTERED_BLOCK)
+                    {
+                        bool sendMerkleBlock = false;
+                        CMerkleBlock merkleBlock;
+                        {
+                            LOCK(pfrom->cs_filter);
+                            if (pfrom->pfilter) {
+                                sendMerkleBlock = true;
+                                merkleBlock = CMerkleBlock(block, *pfrom->pfilter);
+                            }
+                        }
+                        if (sendMerkleBlock) {
+                            connman.PushMessage(pfrom, msgMaker.Make(NetMsgType::MERKLEBLOCK, merkleBlock));
+                            // CMerkleBlock just contains hashes, so also push any transactions in the block the client did not see
+                            // This avoids hurting performance by pointlessly requiring a round-trip
+                            // Note that there is currently no way for a node to request any single transactions we didn't send here -
+                            // they must either disconnect and retry or request the full block.
+                            // Thus, the protocol spec specified allows for us to provide duplicate txn here,
+                            // however we MUST always provide at least what the remote peer needs
+                            typedef std::pair<unsigned int, uint256> PairType;
+                            BOOST_FOREACH(PairType& pair, merkleBlock.vMatchedTxn)
+                                connman.PushMessage(pfrom, msgMaker.Make(SERIALIZE_TRANSACTION_NO_WITNESS, NetMsgType::TX, *block.vtx[pair.first]));
+                        }
+                        // else
+                            // no response
+                    }
+                    else if (inv.type == MSG_CMPCT_BLOCK)
+                    {
+                        // If a peer is asking for old blocks, we're almost guaranteed
+                        // they won't have a useful mempool to match against a compact block,
+                        // and we don't feel like constructing the object for them, so
+                        // instead we respond with the full, non-compact block.
+                        bool fPeerWantsWitness = State(pfrom->GetId())->fWantsCmpctWitness;
+                        int nSendFlags = fPeerWantsWitness ? 0 : SERIALIZE_TRANSACTION_NO_WITNESS;
+                        if (CanDirectFetch(consensusParams) && mi->second->nHeight >= chainActive.Height() - MAX_CMPCTBLOCK_DEPTH) {
+                            CBlockHeaderAndShortTxIDs cmpctblock(block, fPeerWantsWitness);
+                            connman.PushMessage(pfrom, msgMaker.Make(nSendFlags, NetMsgType::CMPCTBLOCK, cmpctblock));
+                        } else
+                            connman.PushMessage(pfrom, msgMaker.Make(nSendFlags, NetMsgType::BLOCK, block));
+                    }
+
+                    // Trigger the peer node to send a getblocks request for the next batch of inventory
+                    if (inv.hash == pfrom->hashContinue)
+                    {
+                        // Bypass PushInventory, this must send even if redundant,
+                        // and we want it right after the last block so they don't
+                        // wait for other stuff first.
+                        vector<CInv> vInv;
+                        vInv.push_back(CInv(MSG_BLOCK, chainActive.Tip()->GetBlockHash()));
+                        connman.PushMessage(pfrom, msgMaker.Make(NetMsgType::INV, vInv));
+                        pfrom->hashContinue.SetNull();
+                    }
+                }
+            }
+            else if (inv.type == MSG_TX || inv.type == MSG_WITNESS_TX)
+            {
+                // Send stream from relay memory
+                bool push = false;
+                auto mi = mapRelay.find(inv.hash);
+                int nSendFlags = (inv.type == MSG_TX ? SERIALIZE_TRANSACTION_NO_WITNESS : 0);
+                if (mi != mapRelay.end()) {
+                    connman.PushMessage(pfrom, msgMaker.Make(nSendFlags, NetMsgType::TX, *mi->second));
+                    push = true;
+                } else if (pfrom->timeLastMempoolReq) {
+                    auto txinfo = mempool.info(inv.hash);
+                    // To protect privacy, do not answer getdata using the mempool when
+                    // that TX couldn't have been INVed in reply to a MEMPOOL request.
+                    if (txinfo.tx && txinfo.nTime <= pfrom->timeLastMempoolReq) {
+                        connman.PushMessage(pfrom, msgMaker.Make(nSendFlags, NetMsgType::TX, *txinfo.tx));
+                        push = true;
+                    }
+                }
+                if (!push) {
+                    vNotFound.push_back(inv);
+                }
+            }
+
+            // Track requests for our stuff.
+            GetMainSignals().Inventory(inv.hash);
+
+            if (inv.type == MSG_BLOCK || inv.type == MSG_FILTERED_BLOCK || inv.type == MSG_CMPCT_BLOCK || inv.type == MSG_WITNESS_BLOCK)
+                break;
+        }
+    }
+
+    pfrom->vRecvGetData.erase(pfrom->vRecvGetData.begin(), it);
+
+    if (!vNotFound.empty()) {
+        // Let the peer know that we didn't find what it asked for, so it doesn't
+        // have to wait around forever. Currently only SPV clients actually care
+        // about this message: it's needed when they are recursively walking the
+        // dependencies of relevant unconfirmed transactions. SPV clients want to
+        // do that because they want to know about (and store and rebroadcast and
+        // risk analyze) the dependencies of transactions relevant to them, without
+        // having to download the entire memory pool.
+        connman.PushMessage(pfrom, msgMaker.Make(NetMsgType::NOTFOUND, vNotFound));
+    }
+}
+
+uint32_t GetFetchFlags(CNode* pfrom, CBlockIndex* pprev, const Consensus::Params& chainparams) {
+    uint32_t nFetchFlags = 0;
+    if ((pfrom->GetLocalServices() & NODE_WITNESS) && State(pfrom->GetId())->fHaveWitness) {
+        nFetchFlags |= MSG_WITNESS_FLAG;
+    }
+    return nFetchFlags;
+}
+
+bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv, int64_t nTimeReceived, const CChainParams& chainparams, CConnman& connman)
+{
+    unsigned int nMaxSendBufferSize = connman.GetSendBufferSize();
+
+    LogPrint("net", "received: %s (%u bytes) peer=%d\n", SanitizeString(strCommand), vRecv.size(), pfrom->id);
+    if (mapArgs.count("-dropmessagestest") && GetRand(atoi(mapArgs["-dropmessagestest"])) == 0)
+    {
+        LogPrintf("dropmessagestest DROPPING RECV MESSAGE\n");
+        return true;
+    }
+
+
+    if (!(pfrom->GetLocalServices() & NODE_BLOOM) &&
+              (strCommand == NetMsgType::FILTERLOAD ||
+               strCommand == NetMsgType::FILTERADD))
+    {
+        if (pfrom->nVersion >= NO_BLOOM_VERSION) {
+            LOCK(cs_main);
+            Misbehaving(pfrom->GetId(), 100);
+            return false;
+        } else {
+            pfrom->fDisconnect = true;
+            return false;
+        }
+    }
+
+
+    if (strCommand == NetMsgType::VERSION)
+    {
+        // Each connection can only send one version message
+        if (pfrom->nVersion != 0)
+        {
+            connman.PushMessage(pfrom, CNetMsgMaker(INIT_PROTO_VERSION).Make(NetMsgType::REJECT, strCommand, REJECT_DUPLICATE, string("Duplicate version message")));
+            LOCK(cs_main);
+            Misbehaving(pfrom->GetId(), 1);
+            return false;
+        }
+
+        int64_t nTime;
+        CAddress addrMe;
+        CAddress addrFrom;
+        uint64_t nNonce = 1;
+        uint64_t nServiceInt;
+        vRecv >> pfrom->nVersion >> nServiceInt >> nTime >> addrMe;
+        pfrom->nServices = ServiceFlags(nServiceInt);
+        if (!pfrom->fInbound)
+        {
+            connman.SetServices(pfrom->addr, pfrom->nServices);
+        }
+        if (pfrom->nServicesExpected & ~pfrom->nServices)
+        {
+            LogPrint("net", "peer=%d does not offer the expected services (%08x offered, %08x expected); disconnecting\n", pfrom->id, pfrom->nServices, pfrom->nServicesExpected);
+            connman.PushMessage(pfrom, CNetMsgMaker(INIT_PROTO_VERSION).Make(NetMsgType::REJECT, strCommand, REJECT_NONSTANDARD,
+                               strprintf("Expected to offer services %08x", pfrom->nServicesExpected)));
+            pfrom->fDisconnect = true;
+            return false;
+        }
+
+        if (pfrom->nVersion < MIN_PEER_PROTO_VERSION)
+        {
+            // disconnect from peers older than this proto version
+            LogPrintf("peer=%d using obsolete version %i; disconnecting\n", pfrom->id, pfrom->nVersion);
+            connman.PushMessage(pfrom, CNetMsgMaker(INIT_PROTO_VERSION).Make(NetMsgType::REJECT, strCommand, REJECT_OBSOLETE,
+                               strprintf("Version must be %d or greater", MIN_PEER_PROTO_VERSION)));
+            pfrom->fDisconnect = true;
+            return false;
+        }
+
+        if (pfrom->nVersion == 10300)
+            pfrom->nVersion = 300;
+        if (!vRecv.empty())
+            vRecv >> addrFrom >> nNonce;
+        if (!vRecv.empty()) {
+            vRecv >> LIMITED_STRING(pfrom->strSubVer, MAX_SUBVERSION_LENGTH);
+            pfrom->cleanSubVer = SanitizeString(pfrom->strSubVer);
+        }
+        if (!vRecv.empty()) {
+            vRecv >> pfrom->nStartingHeight;
+        }
+        {
+            LOCK(pfrom->cs_filter);
+            if (!vRecv.empty())
+                vRecv >> pfrom->fRelayTxes; // set to true after we get the first filter* message
+            else
+                pfrom->fRelayTxes = true;
+        }
+
+        // Disconnect if we connected to ourself
+        if (pfrom->fInbound && !connman.CheckIncomingNonce(nNonce))
+        {
+            LogPrintf("connected to self at %s, disconnecting\n", pfrom->addr.ToString());
+            pfrom->fDisconnect = true;
+            return true;
+        }
+
+        pfrom->addrLocal = addrMe;
+        if (pfrom->fInbound && addrMe.IsRoutable())
+        {
+            SeenLocal(addrMe);
+        }
+
+        // Be shy and don't send version until we hear
+        if (pfrom->fInbound)
+            PushNodeVersion(pfrom, connman, GetAdjustedTime());
+
+        pfrom->fClient = !(pfrom->nServices & NODE_NETWORK);
+
+        if((pfrom->nServices & NODE_WITNESS))
+        {
+            LOCK(cs_main);
+            State(pfrom->GetId())->fHaveWitness = true;
+        }
+
+        // Potentially mark this peer as a preferred download peer.
+        {
+        LOCK(cs_main);
+        UpdatePreferredDownload(pfrom, State(pfrom->GetId()));
+        }
+
+        // Change version
+        connman.PushMessage(pfrom, CNetMsgMaker(INIT_PROTO_VERSION).Make(NetMsgType::VERACK));
+        int nSendVersion = std::min(pfrom->nVersion, PROTOCOL_VERSION);
+        pfrom->SetSendVersion(nSendVersion);
+
+        if (!pfrom->fInbound)
+        {
+            // Advertise our address
+            if (fListen && !IsInitialBlockDownload())
+            {
+                CAddress addr = GetLocalAddress(&pfrom->addr, pfrom->GetLocalServices());
+                FastRandomContext insecure_rand;
+                if (addr.IsRoutable())
+                {
+                    LogPrint("net", "ProcessMessages: advertising address %s\n", addr.ToString());
+                    pfrom->PushAddress(addr, insecure_rand);
+                } else if (IsPeerAddrLocalGood(pfrom)) {
+                    addr.SetIP(pfrom->addrLocal);
+                    LogPrint("net", "ProcessMessages: advertising address %s\n", addr.ToString());
+                    pfrom->PushAddress(addr, insecure_rand);
+                }
+            }
+
+            // Get recent addresses
+            if (pfrom->fOneShot || pfrom->nVersion >= CADDR_TIME_VERSION || connman.GetAddressCount() < 1000)
+            {
+                connman.PushMessage(pfrom, CNetMsgMaker(nSendVersion).Make(NetMsgType::GETADDR));
+                pfrom->fGetAddr = true;
+            }
+            connman.MarkAddressGood(pfrom->addr);
+        }
+
+        pfrom->fSuccessfullyConnected = true;
+
+        string remoteAddr;
+        if (fLogIPs)
+            remoteAddr = ", peeraddr=" + pfrom->addr.ToString();
+
+        LogPrintf("receive version message: %s: version %d, blocks=%d, us=%s, peer=%d%s\n",
+                  pfrom->cleanSubVer, pfrom->nVersion,
+                  pfrom->nStartingHeight, addrMe.ToString(), pfrom->id,
+                  remoteAddr);
+
+        int64_t nTimeOffset = nTime - GetTime();
+        pfrom->nTimeOffset = nTimeOffset;
+        AddTimeData(pfrom->addr, nTimeOffset);
+
+        // Feeler connections exist only to verify if address is online.
+        if (pfrom->fFeeler) {
+            assert(pfrom->fInbound == false);
+            pfrom->fDisconnect = true;
+        }
+        return true;
+    }
+
+
+    else if (pfrom->nVersion == 0)
+    {
+        // Must have a version message before anything else
+        LOCK(cs_main);
+        Misbehaving(pfrom->GetId(), 1);
+        return false;
+    }
+
+    // At this point, the outgoing message serialization version can't change.
+    CNetMsgMaker msgMaker(pfrom->GetSendVersion());
+
+    if (strCommand == NetMsgType::VERACK)
+    {
+        pfrom->SetRecvVersion(min(pfrom->nVersion, PROTOCOL_VERSION));
+
+        if (!pfrom->fInbound) {
+            // Mark this node as currently connected, so we update its timestamp later.
+            LOCK(cs_main);
+            State(pfrom->GetId())->fCurrentlyConnected = true;
+        }
+
+        if (pfrom->nVersion >= SENDHEADERS_VERSION) {
+            // Tell our peer we prefer to receive headers rather than inv's
+            // We send this to non-NODE NETWORK peers as well, because even
+            // non-NODE NETWORK peers can announce blocks (such as pruning
+            // nodes)
+            connman.PushMessage(pfrom, msgMaker.Make(NetMsgType::SENDHEADERS));
+        }
+        if (pfrom->nVersion >= SHORT_IDS_BLOCKS_VERSION) {
+            // Tell our peer we are willing to provide version 1 or 2 cmpctblocks
+            // However, we do not request new block announcements using
+            // cmpctblock messages.
+            // We send this to non-NODE NETWORK peers as well, because
+            // they may wish to request compact blocks from us
+            bool fAnnounceUsingCMPCTBLOCK = false;
+            uint64_t nCMPCTBLOCKVersion = 2;
+            if (pfrom->GetLocalServices() & NODE_WITNESS)
+                connman.PushMessage(pfrom, msgMaker.Make(NetMsgType::SENDCMPCT, fAnnounceUsingCMPCTBLOCK, nCMPCTBLOCKVersion));
+            nCMPCTBLOCKVersion = 1;
+            connman.PushMessage(pfrom, msgMaker.Make(NetMsgType::SENDCMPCT, fAnnounceUsingCMPCTBLOCK, nCMPCTBLOCKVersion));
+        }
+    }
+
+
+    else if (strCommand == NetMsgType::ADDR)
+    {
+        vector<CAddress> vAddr;
+        vRecv >> vAddr;
+
+        // Don't want addr from older versions unless seeding
+        if (pfrom->nVersion < CADDR_TIME_VERSION && connman.GetAddressCount() > 1000)
+            return true;
+        if (vAddr.size() > 1000)
+        {
+            LOCK(cs_main);
+            Misbehaving(pfrom->GetId(), 20);
+            return error("message addr size() = %u", vAddr.size());
+        }
+
+        // Store the new addresses
+        vector<CAddress> vAddrOk;
+        int64_t nNow = GetAdjustedTime();
+        int64_t nSince = nNow - 10 * 60;
+        BOOST_FOREACH(CAddress& addr, vAddr)
+        {
+            boost::this_thread::interruption_point();
+
+            if ((addr.nServices & REQUIRED_SERVICES) != REQUIRED_SERVICES)
+                continue;
+
+            if (addr.nTime <= 100000000 || addr.nTime > nNow + 10 * 60)
+                addr.nTime = nNow - 5 * 24 * 60 * 60;
+            pfrom->AddAddressKnown(addr);
+            bool fReachable = IsReachable(addr);
+            if (addr.nTime > nSince && !pfrom->fGetAddr && vAddr.size() <= 10 && addr.IsRoutable())
+            {
+                // Relay to a limited number of other nodes
+                RelayAddress(addr, fReachable, connman);
+            }
+            // Do not store addresses outside our network
+            if (fReachable)
+                vAddrOk.push_back(addr);
+        }
+        connman.AddNewAddresses(vAddrOk, pfrom->addr, 2 * 60 * 60);
+        if (vAddr.size() < 1000)
+            pfrom->fGetAddr = false;
+        if (pfrom->fOneShot)
+            pfrom->fDisconnect = true;
+    }
+
+    else if (strCommand == NetMsgType::SENDHEADERS)
+    {
+        LOCK(cs_main);
+        State(pfrom->GetId())->fPreferHeaders = true;
+    }
+
+    else if (strCommand == NetMsgType::SENDCMPCT)
+    {
+        bool fAnnounceUsingCMPCTBLOCK = false;
+        uint64_t nCMPCTBLOCKVersion = 0;
+        vRecv >> fAnnounceUsingCMPCTBLOCK >> nCMPCTBLOCKVersion;
+        if (nCMPCTBLOCKVersion == 1 || ((pfrom->GetLocalServices() & NODE_WITNESS) && nCMPCTBLOCKVersion == 2)) {
+            LOCK(cs_main);
+            // fProvidesHeaderAndIDs is used to "lock in" version of compact blocks we send (fWantsCmpctWitness)
+            if (!State(pfrom->GetId())->fProvidesHeaderAndIDs) {
+                State(pfrom->GetId())->fProvidesHeaderAndIDs = true;
+                State(pfrom->GetId())->fWantsCmpctWitness = nCMPCTBLOCKVersion == 2;
+            }
+            if (State(pfrom->GetId())->fWantsCmpctWitness == (nCMPCTBLOCKVersion == 2)) // ignore later version announces
+                State(pfrom->GetId())->fPreferHeaderAndIDs = fAnnounceUsingCMPCTBLOCK;
+            if (!State(pfrom->GetId())->fSupportsDesiredCmpctVersion) {
+                if (pfrom->GetLocalServices() & NODE_WITNESS)
+                    State(pfrom->GetId())->fSupportsDesiredCmpctVersion = (nCMPCTBLOCKVersion == 2);
+                else
+                    State(pfrom->GetId())->fSupportsDesiredCmpctVersion = (nCMPCTBLOCKVersion == 1);
+            }
+        }
+    }
+
+
+    else if (strCommand == NetMsgType::INV)
+    {
+        vector<CInv> vInv;
+        vRecv >> vInv;
+        if (vInv.size() > MAX_INV_SZ)
+        {
+            LOCK(cs_main);
+            Misbehaving(pfrom->GetId(), 20);
+            return error("message inv size() = %u", vInv.size());
+        }
+
+        bool fBlocksOnly = !fRelayTxes;
+
+        // Allow whitelisted peers to send data other than blocks in blocks only mode if whitelistrelay is true
+        if (pfrom->fWhitelisted && GetBoolArg("-whitelistrelay", DEFAULT_WHITELISTRELAY))
+            fBlocksOnly = false;
+
+        LOCK(cs_main);
+
+        uint32_t nFetchFlags = GetFetchFlags(pfrom, chainActive.Tip(), chainparams.GetConsensus());
+
+        std::vector<CInv> vToFetch;
+
+        for (unsigned int nInv = 0; nInv < vInv.size(); nInv++)
+        {
+            CInv &inv = vInv[nInv];
+
+            boost::this_thread::interruption_point();
+
+            bool fAlreadyHave = AlreadyHave(inv);
+            LogPrint("net", "got inv: %s  %s peer=%d\n", inv.ToString(), fAlreadyHave ? "have" : "new", pfrom->id);
+
+            if (inv.type == MSG_TX) {
+                inv.type |= nFetchFlags;
+            }
+
+            if (inv.type == MSG_BLOCK) {
+                UpdateBlockAvailability(pfrom->GetId(), inv.hash);
+                if (!fAlreadyHave && !fImporting && !fReindex && !mapBlocksInFlight.count(inv.hash)) {
+                    // We used to request the full block here, but since headers-announcements are now the
+                    // primary method of announcement on the network, and since, in the case that a node
+                    // fell back to inv we probably have a reorg which we should get the headers for first,
+                    // we now only provide a getheaders response here. When we receive the headers, we will
+                    // then ask for the blocks we need.
+                    connman.PushMessage(pfrom, msgMaker.Make(NetMsgType::GETHEADERS, chainActive.GetLocator(pindexBestHeader), inv.hash));
+                    LogPrint("net", "getheaders (%d) %s to peer=%d\n", pindexBestHeader->nHeight, inv.hash.ToString(), pfrom->id);
+                }
+            }
+            else
+            {
+                pfrom->AddInventoryKnown(inv);
+                if (fBlocksOnly)
+                    LogPrint("net", "transaction (%s) inv sent in violation of protocol peer=%d\n", inv.hash.ToString(), pfrom->id);
+                else if (!fAlreadyHave && !fImporting && !fReindex && !IsInitialBlockDownload())
+                    pfrom->AskFor(inv);
+            }
+
+            // Track requests for our stuff
+            GetMainSignals().Inventory(inv.hash);
+
+            if (pfrom->nSendSize > (nMaxSendBufferSize * 2)) {
+                Misbehaving(pfrom->GetId(), 50);
+                return error("send buffer size() = %u", pfrom->nSendSize);
+            }
+        }
+
+        if (!vToFetch.empty())
+            connman.PushMessage(pfrom, msgMaker.Make(NetMsgType::GETDATA, vToFetch));
+    }
+
+
+    else if (strCommand == NetMsgType::GETDATA)
+    {
+        vector<CInv> vInv;
+        vRecv >> vInv;
+        if (vInv.size() > MAX_INV_SZ)
+        {
+            LOCK(cs_main);
+            Misbehaving(pfrom->GetId(), 20);
+            return error("message getdata size() = %u", vInv.size());
+        }
+
+        if (fDebug || (vInv.size() != 1))
+            LogPrint("net", "received getdata (%u invsz) peer=%d\n", vInv.size(), pfrom->id);
+
+        if ((fDebug && vInv.size() > 0) || (vInv.size() == 1))
+            LogPrint("net", "received getdata for: %s peer=%d\n", vInv[0].ToString(), pfrom->id);
+
+        pfrom->vRecvGetData.insert(pfrom->vRecvGetData.end(), vInv.begin(), vInv.end());
+        ProcessGetData(pfrom, chainparams.GetConsensus(), connman);
+    }
+
+
+    else if (strCommand == NetMsgType::GETBLOCKS)
+    {
+        CBlockLocator locator;
+        uint256 hashStop;
+        vRecv >> locator >> hashStop;
+
+        LOCK(cs_main);
+
+        // Find the last block the caller has in the main chain
+        CBlockIndex* pindex = FindForkInGlobalIndex(chainActive, locator);
+
+        // Send the rest of the chain
+        if (pindex)
+            pindex = chainActive.Next(pindex);
+        int nLimit = 500;
+        LogPrint("net", "getblocks %d to %s limit %d from peer=%d\n", (pindex ? pindex->nHeight : -1), hashStop.IsNull() ? "end" : hashStop.ToString(), nLimit, pfrom->id);
+        for (; pindex; pindex = chainActive.Next(pindex))
+        {
+            if (pindex->GetBlockHash() == hashStop)
+            {
+                LogPrint("net", "  getblocks stopping at %d %s\n", pindex->nHeight, pindex->GetBlockHash().ToString());
+                break;
+            }
+            // If pruning, don't inv blocks unless we have on disk and are likely to still have
+            // for some reasonable time window (1 hour) that block relay might require.
+            const int nPrunedBlocksLikelyToHave = MIN_BLOCKS_TO_KEEP - 3600 / chainparams.GetConsensus().nPowTargetSpacing;
+            if (fPruneMode && (!(pindex->nStatus & BLOCK_HAVE_DATA) || pindex->nHeight <= chainActive.Tip()->nHeight - nPrunedBlocksLikelyToHave))
+            {
+                LogPrint("net", " getblocks stopping, pruned or too old block at %d %s\n", pindex->nHeight, pindex->GetBlockHash().ToString());
+                break;
+            }
+            pfrom->PushInventory(CInv(MSG_BLOCK, pindex->GetBlockHash()));
+            if (--nLimit <= 0)
+            {
+                // When this block is requested, we'll send an inv that'll
+                // trigger the peer to getblocks the next batch of inventory.
+                LogPrint("net", "  getblocks stopping at limit %d %s\n", pindex->nHeight, pindex->GetBlockHash().ToString());
+                pfrom->hashContinue = pindex->GetBlockHash();
+                break;
+            }
+        }
+    }
+
+
+    else if (strCommand == NetMsgType::GETBLOCKTXN)
+    {
+        BlockTransactionsRequest req;
+        vRecv >> req;
+
+        LOCK(cs_main);
+
+        BlockMap::iterator it = mapBlockIndex.find(req.blockhash);
+        if (it == mapBlockIndex.end() || !(it->second->nStatus & BLOCK_HAVE_DATA)) {
+            LogPrintf("Peer %d sent us a getblocktxn for a block we don't have", pfrom->id);
+            return true;
+        }
+
+        if (it->second->nHeight < chainActive.Height() - MAX_BLOCKTXN_DEPTH) {
+            // If an older block is requested (should never happen in practice,
+            // but can happen in tests) send a block response instead of a
+            // blocktxn response. Sending a full block response instead of a
+            // small blocktxn response is preferable in the case where a peer
+            // might maliciously send lots of getblocktxn requests to trigger
+            // expensive disk reads, because it will require the peer to
+            // actually receive all the data read from disk over the network.
+            LogPrint("net", "Peer %d sent us a getblocktxn for a block > %i deep", pfrom->id, MAX_BLOCKTXN_DEPTH);
+            CInv inv;
+            inv.type = State(pfrom->GetId())->fWantsCmpctWitness ? MSG_WITNESS_BLOCK : MSG_BLOCK;
+            inv.hash = req.blockhash;
+            pfrom->vRecvGetData.push_back(inv);
+            ProcessGetData(pfrom, chainparams.GetConsensus(), connman);
+            return true;
+        }
+
+        CBlock block;
+        assert(ReadBlockFromDisk(block, it->second, chainparams.GetConsensus()));
+
+        BlockTransactions resp(req);
+        for (size_t i = 0; i < req.indexes.size(); i++) {
+            if (req.indexes[i] >= block.vtx.size()) {
+                Misbehaving(pfrom->GetId(), 100);
+                LogPrintf("Peer %d sent us a getblocktxn with out-of-bounds tx indices", pfrom->id);
+                return true;
+            }
+            resp.txn[i] = block.vtx[req.indexes[i]];
+        }
+        int nSendFlags = State(pfrom->GetId())->fWantsCmpctWitness ? 0 : SERIALIZE_TRANSACTION_NO_WITNESS;
+        connman.PushMessage(pfrom, msgMaker.Make(nSendFlags, NetMsgType::BLOCKTXN, resp));
+    }
+
+
+    else if (strCommand == NetMsgType::GETHEADERS)
+    {
+        CBlockLocator locator;
+        uint256 hashStop;
+        vRecv >> locator >> hashStop;
+
+        LOCK(cs_main);
+        if (IsInitialBlockDownload() && !pfrom->fWhitelisted) {
+            LogPrint("net", "Ignoring getheaders from peer=%d because node is in initial block download\n", pfrom->id);
+            return true;
+        }
+
+        CNodeState *nodestate = State(pfrom->GetId());
+        CBlockIndex* pindex = NULL;
+        if (locator.IsNull())
+        {
+            // If locator is null, return the hashStop block
+            BlockMap::iterator mi = mapBlockIndex.find(hashStop);
+            if (mi == mapBlockIndex.end())
+                return true;
+            pindex = (*mi).second;
+        }
+        else
+        {
+            // Find the last block the caller has in the main chain
+            pindex = FindForkInGlobalIndex(chainActive, locator);
+            if (pindex)
+                pindex = chainActive.Next(pindex);
+        }
+
+        // we must use CBlocks, as CBlockHeaders won't include the 0x00 nTx count at the end
+        vector<CBlock> vHeaders;
+        int nLimit = MAX_HEADERS_RESULTS;
+        LogPrint("net", "getheaders %d to %s from peer=%d\n", (pindex ? pindex->nHeight : -1), hashStop.IsNull() ? "end" : hashStop.ToString(), pfrom->id);
+        for (; pindex; pindex = chainActive.Next(pindex))
+        {
+            vHeaders.push_back(pindex->GetBlockHeader());
+            if (--nLimit <= 0 || pindex->GetBlockHash() == hashStop)
+                break;
+        }
+        // pindex can be NULL either if we sent chainActive.Tip() OR
+        // if our peer has chainActive.Tip() (and thus we are sending an empty
+        // headers message). In both cases it's safe to update
+        // pindexBestHeaderSent to be our tip.
+        nodestate->pindexBestHeaderSent = pindex ? pindex : chainActive.Tip();
+        connman.PushMessage(pfrom, msgMaker.Make(NetMsgType::HEADERS, vHeaders));
+    }
+
+
+    else if (strCommand == NetMsgType::TX)
+    {
+        // Stop processing the transaction early if
+        // We are in blocks only mode and peer is either not whitelisted or whitelistrelay is off
+        if (!fRelayTxes && (!pfrom->fWhitelisted || !GetBoolArg("-whitelistrelay", DEFAULT_WHITELISTRELAY)))
+        {
+            LogPrint("net", "transaction sent in violation of protocol peer=%d\n", pfrom->id);
+            return true;
+        }
+
+        deque<COutPoint> vWorkQueue;
+        vector<uint256> vEraseQueue;
+        CTransaction tx;
+        vRecv >> tx;
+
+        CInv inv(MSG_TX, tx.GetHash());
+        pfrom->AddInventoryKnown(inv);
+
+        LOCK(cs_main);
+
+        bool fMissingInputs = false;
+        CValidationState state;
+
+        pfrom->setAskFor.erase(inv.hash);
+        mapAlreadyAskedFor.erase(inv.hash);
+
+        if (!AlreadyHave(inv) && AcceptToMemoryPool(mempool, state, tx, true, &fMissingInputs)) {
+            mempool.check(pcoinsTip);
+            RelayTransaction(tx, connman);
+            for (unsigned int i = 0; i < tx.vout.size(); i++) {
+                vWorkQueue.emplace_back(inv.hash, i);
+            }
+
+            pfrom->nLastTXTime = GetTime();
+
+            LogPrint("mempool", "AcceptToMemoryPool: peer=%d: accepted %s (poolsz %u txn, %u kB)\n",
+                pfrom->id,
+                tx.GetHash().ToString(),
+                mempool.size(), mempool.DynamicMemoryUsage() / 1000);
+
+            // Recursively process any orphan transactions that depended on this one
+            set<NodeId> setMisbehaving;
+            while (!vWorkQueue.empty()) {
+                auto itByPrev = mapOrphanTransactionsByPrev.find(vWorkQueue.front());
+                vWorkQueue.pop_front();
+                if (itByPrev == mapOrphanTransactionsByPrev.end())
+                    continue;
+                for (auto mi = itByPrev->second.begin();
+                     mi != itByPrev->second.end();
+                     ++mi)
+                {
+                    const CTransaction& orphanTx = (*mi)->second.tx;
+                    const uint256& orphanHash = orphanTx.GetHash();
+                    NodeId fromPeer = (*mi)->second.fromPeer;
+                    bool fMissingInputs2 = false;
+                    // Use a dummy CValidationState so someone can't setup nodes to counter-DoS based on orphan
+                    // resolution (that is, feeding people an invalid transaction based on LegitTxX in order to get
+                    // anyone relaying LegitTxX banned)
+                    CValidationState stateDummy;
+
+
+                    if (setMisbehaving.count(fromPeer))
+                        continue;
+                    if (AcceptToMemoryPool(mempool, stateDummy, orphanTx, true, &fMissingInputs2)) {
+                        LogPrint("mempool", "   accepted orphan tx %s\n", orphanHash.ToString());
+                        RelayTransaction(orphanTx, connman);
+                        for (unsigned int i = 0; i < orphanTx.vout.size(); i++) {
+                            vWorkQueue.emplace_back(orphanHash, i);
+                        }
+                        vEraseQueue.push_back(orphanHash);
+                    }
+                    else if (!fMissingInputs2)
+                    {
+                        int nDos = 0;
+                        if (stateDummy.IsInvalid(nDos) && nDos > 0)
+                        {
+                            // Punish peer that gave us an invalid orphan tx
+                            Misbehaving(fromPeer, nDos);
+                            setMisbehaving.insert(fromPeer);
+                            LogPrint("mempool", "   invalid orphan tx %s\n", orphanHash.ToString());
+                        }
+                        // Has inputs but not accepted to mempool
+                        // Probably non-standard or insufficient fee/priority
+                        LogPrint("mempool", "   removed orphan tx %s\n", orphanHash.ToString());
+                        vEraseQueue.push_back(orphanHash);
+                        if (orphanTx.wit.IsNull() && !stateDummy.CorruptionPossible()) {
+                            // Do not use rejection cache for witness transactions or
+                            // witness-stripped transactions, as they can have been malleated.
+                            // See https://github.com/bitcoin/bitcoin/issues/8279 for details.
+                            assert(recentRejects);
+                            recentRejects->insert(orphanHash);
+                        }
+                    }
+                    mempool.check(pcoinsTip);
+                }
+            }
+
+            BOOST_FOREACH(uint256 hash, vEraseQueue)
+                EraseOrphanTx(hash);
+        }
+        else if (fMissingInputs)
+        {
+            bool fRejectedParents = false; // It may be the case that the orphans parents have all been rejected
+            BOOST_FOREACH(const CTxIn& txin, tx.vin) {
+                if (recentRejects->contains(txin.prevout.hash)) {
+                    fRejectedParents = true;
+                    break;
+                }
+            }
+            if (!fRejectedParents) {
+                uint32_t nFetchFlags = GetFetchFlags(pfrom, chainActive.Tip(), chainparams.GetConsensus());
+                BOOST_FOREACH(const CTxIn& txin, tx.vin) {
+                    CInv _inv(MSG_TX | nFetchFlags, txin.prevout.hash);
+                    pfrom->AddInventoryKnown(_inv);
+                    if (!AlreadyHave(_inv)) pfrom->AskFor(_inv);
+                }
+                AddOrphanTx(tx, pfrom->GetId());
+
+                // DoS prevention: do not allow mapOrphanTransactions to grow unbounded
+                unsigned int nMaxOrphanTx = (unsigned int)std::max((int64_t)0, GetArg("-maxorphantx", DEFAULT_MAX_ORPHAN_TRANSACTIONS));
+                unsigned int nEvicted = LimitOrphanTxSize(nMaxOrphanTx);
+                if (nEvicted > 0)
+                    LogPrint("mempool", "mapOrphan overflow, removed %u tx\n", nEvicted);
+            } else {
+                LogPrint("mempool", "not keeping orphan with rejected parents %s\n",tx.GetHash().ToString());
+            }
+        } else {
+            if (tx.wit.IsNull() && !state.CorruptionPossible()) {
+                // Do not use rejection cache for witness transactions or
+                // witness-stripped transactions, as they can have been malleated.
+                // See https://github.com/bitcoin/bitcoin/issues/8279 for details.
+                assert(recentRejects);
+                recentRejects->insert(tx.GetHash());
+            }
+
+            if (pfrom->fWhitelisted && GetBoolArg("-whitelistforcerelay", DEFAULT_WHITELISTFORCERELAY)) {
+                // Always relay transactions received from whitelisted peers, even
+                // if they were already in the mempool or rejected from it due
+                // to policy, allowing the node to function as a gateway for
+                // nodes hidden behind it.
+                //
+                // Never relay transactions that we would assign a non-zero DoS
+                // score for, as we expect peers to do the same with us in that
+                // case.
+                int nDoS = 0;
+                if (!state.IsInvalid(nDoS) || nDoS == 0) {
+                    LogPrintf("Force relaying tx %s from whitelisted peer=%d\n", tx.GetHash().ToString(), pfrom->id);
+                    RelayTransaction(tx, connman);
+                } else {
+                    LogPrintf("Not relaying invalid transaction %s from whitelisted peer=%d (%s)\n", tx.GetHash().ToString(), pfrom->id, FormatStateMessage(state));
+                }
+            }
+        }
+        int nDoS = 0;
+        if (state.IsInvalid(nDoS))
+        {
+            LogPrint("mempoolrej", "%s from peer=%d was not accepted: %s\n", tx.GetHash().ToString(),
+                pfrom->id,
+                FormatStateMessage(state));
+            if (state.GetRejectCode() < REJECT_INTERNAL) // Never send AcceptToMemoryPool's internal codes over P2P
+                connman.PushMessage(pfrom, msgMaker.Make(NetMsgType::REJECT, strCommand, (unsigned char)state.GetRejectCode(),
+                                   state.GetRejectReason().substr(0, MAX_REJECT_MESSAGE_LENGTH), inv.hash));
+            if (nDoS > 0) {
+                Misbehaving(pfrom->GetId(), nDoS);
+            }
+        }
+    }
+
+
+    else if (strCommand == NetMsgType::CMPCTBLOCK && !fImporting && !fReindex) // Ignore blocks received while importing
+    {
+        CBlockHeaderAndShortTxIDs cmpctblock;
+        vRecv >> cmpctblock;
+
+        {
+        LOCK(cs_main);
+
+        if (mapBlockIndex.find(cmpctblock.header.hashPrevBlock) == mapBlockIndex.end()) {
+            // Doesn't connect (or is genesis), instead of DoSing in AcceptBlockHeader, request deeper headers
+            if (!IsInitialBlockDownload())
+                connman.PushMessage(pfrom, msgMaker.Make(NetMsgType::GETHEADERS, chainActive.GetLocator(pindexBestHeader), uint256()));
+            return true;
+        }
+        }
+
+        CBlockIndex *pindex = NULL;
+        CValidationState state;
+        if (!ProcessNewBlockHeaders({cmpctblock.header}, state, chainparams, &pindex)) {
+            int nDoS;
+            if (state.IsInvalid(nDoS)) {
+                if (nDoS > 0) {
+                    LOCK(cs_main);
+                    Misbehaving(pfrom->GetId(), nDoS);
+                }
+                LogPrintf("Peer %d sent us invalid header via cmpctblock\n", pfrom->id);
+                return true;
+            }
+        }
+
+        LOCK(cs_main);
+        // If AcceptBlockHeader returned true, it set pindex
+        assert(pindex);
+        UpdateBlockAvailability(pfrom->GetId(), pindex->GetBlockHash());
+
+        std::map<uint256, pair<NodeId, list<QueuedBlock>::iterator> >::iterator blockInFlightIt = mapBlocksInFlight.find(pindex->GetBlockHash());
+        bool fAlreadyInFlight = blockInFlightIt != mapBlocksInFlight.end();
+
+        if (pindex->nStatus & BLOCK_HAVE_DATA) // Nothing to do here
+            return true;
+
+        if (pindex->nChainWork <= chainActive.Tip()->nChainWork || // We know something better
+                pindex->nTx != 0) { // We had this block at some point, but pruned it
+            if (fAlreadyInFlight) {
+                // We requested this block for some reason, but our mempool will probably be useless
+                // so we just grab the block via normal getdata
+                std::vector<CInv> vInv(1);
+                vInv[0] = CInv(MSG_BLOCK | GetFetchFlags(pfrom, pindex->pprev, chainparams.GetConsensus()), cmpctblock.header.GetHash());
+                connman.PushMessage(pfrom, msgMaker.Make(NetMsgType::GETDATA, vInv));
+            }
+            return true;
+        }
+
+        // If we're not close to tip yet, give up and let parallel block fetch work its magic
+        if (!fAlreadyInFlight && !CanDirectFetch(chainparams.GetConsensus()))
+            return true;
+
+        CNodeState *nodestate = State(pfrom->GetId());
+
+        if (IsWitnessEnabled(pindex->pprev, chainparams.GetConsensus()) && !nodestate->fSupportsDesiredCmpctVersion) {
+            // Don't bother trying to process compact blocks from v1 peers
+            // after segwit activates.
+            return true;
+        }
+
+        // We want to be a bit conservative just to be extra careful about DoS
+        // possibilities in compact block processing...
+        if (pindex->nHeight <= chainActive.Height() + 2) {
+            if ((!fAlreadyInFlight && nodestate->nBlocksInFlight < MAX_BLOCKS_IN_TRANSIT_PER_PEER) ||
+                 (fAlreadyInFlight && blockInFlightIt->second.first == pfrom->GetId())) {
+                list<QueuedBlock>::iterator *queuedBlockIt = NULL;
+                if (!MarkBlockAsInFlight(pfrom->GetId(), pindex->GetBlockHash(), chainparams.GetConsensus(), pindex, &queuedBlockIt)) {
+                    if (!(*queuedBlockIt)->partialBlock)
+                        (*queuedBlockIt)->partialBlock.reset(new PartiallyDownloadedBlock(&mempool));
+                    else {
+                        // The block was already in flight using compact blocks from the same peer
+                        LogPrint("net", "Peer sent us compact block we were already syncing!\n");
+                        return true;
+                    }
+                }
+
+                PartiallyDownloadedBlock& partialBlock = *(*queuedBlockIt)->partialBlock;
+                ReadStatus status = partialBlock.InitData(cmpctblock);
+                if (status == READ_STATUS_INVALID) {
+                    MarkBlockAsReceived(pindex->GetBlockHash()); // Reset in-flight state in case of whitelist
+                    Misbehaving(pfrom->GetId(), 100);
+                    LogPrintf("Peer %d sent us invalid compact block\n", pfrom->id);
+                    return true;
+                } else if (status == READ_STATUS_FAILED) {
+                    // Duplicate txindexes, the block is now in-flight, so just request it
+                    std::vector<CInv> vInv(1);
+                    vInv[0] = CInv(MSG_BLOCK | GetFetchFlags(pfrom, pindex->pprev, chainparams.GetConsensus()), cmpctblock.header.GetHash());
+                    connman.PushMessage(pfrom, msgMaker.Make(NetMsgType::GETDATA, vInv));
+                    return true;
+                }
+
+                if (!fAlreadyInFlight && mapBlocksInFlight.size() == 1 && pindex->pprev->IsValid(BLOCK_VALID_CHAIN)) {
+                    // We seem to be rather well-synced, so it appears pfrom was the first to provide us
+                    // with this block! Let's get them to announce using compact blocks in the future.
+                    MaybeSetPeerAsAnnouncingHeaderAndIDs(nodestate, pfrom, connman);
+                }
+
+                BlockTransactionsRequest req;
+                for (size_t i = 0; i < cmpctblock.BlockTxCount(); i++) {
+                    if (!partialBlock.IsTxAvailable(i))
+                        req.indexes.push_back(i);
+                }
+                if (req.indexes.empty()) {
+                    // Dirty hack to jump to BLOCKTXN code (TODO: move message handling into their own functions)
+                    BlockTransactions txn;
+                    txn.blockhash = cmpctblock.header.GetHash();
+                    CDataStream blockTxnMsg(SER_NETWORK, PROTOCOL_VERSION);
+                    blockTxnMsg << txn;
+                    return ProcessMessage(pfrom, NetMsgType::BLOCKTXN, blockTxnMsg, nTimeReceived, chainparams, connman);
+                } else {
+                    req.blockhash = pindex->GetBlockHash();
+                    connman.PushMessage(pfrom, msgMaker.Make(NetMsgType::GETBLOCKTXN, req));
+                }
+            }
+        } else {
+            if (fAlreadyInFlight) {
+                // We requested this block, but its far into the future, so our
+                // mempool will probably be useless - request the block normally
+                std::vector<CInv> vInv(1);
+                vInv[0] = CInv(MSG_BLOCK | GetFetchFlags(pfrom, pindex->pprev, chainparams.GetConsensus()), cmpctblock.header.GetHash());
+                connman.PushMessage(pfrom, msgMaker.Make(NetMsgType::GETDATA, vInv));
+                return true;
+            } else {
+                // If this was an announce-cmpctblock, we want the same treatment as a header message
+                // Dirty hack to process as if it were just a headers message (TODO: move message handling into their own functions)
+                std::vector<CBlock> headers;
+                headers.push_back(cmpctblock.header);
+                CDataStream vHeadersMsg(SER_NETWORK, PROTOCOL_VERSION);
+                vHeadersMsg << headers;
+                return ProcessMessage(pfrom, NetMsgType::HEADERS, vHeadersMsg, nTimeReceived, chainparams, connman);
+            }
+        }
+    }
+
+    else if (strCommand == NetMsgType::BLOCKTXN && !fImporting && !fReindex) // Ignore blocks received while importing
+    {
+        BlockTransactions resp;
+        vRecv >> resp;
+
+        CBlock block;
+        bool fBlockRead = false;
+        {
+            LOCK(cs_main);
+
+            map<uint256, pair<NodeId, list<QueuedBlock>::iterator> >::iterator it = mapBlocksInFlight.find(resp.blockhash);
+            if (it == mapBlocksInFlight.end() || !it->second.second->partialBlock ||
+                    it->second.first != pfrom->GetId()) {
+                LogPrint("net", "Peer %d sent us block transactions for block we weren't expecting\n", pfrom->id);
+                return true;
+            }
+
+            PartiallyDownloadedBlock& partialBlock = *it->second.second->partialBlock;
+            ReadStatus status = partialBlock.FillBlock(block, resp.txn);
+            if (status == READ_STATUS_INVALID) {
+                MarkBlockAsReceived(resp.blockhash); // Reset in-flight state in case of whitelist
+                Misbehaving(pfrom->GetId(), 100);
+                LogPrintf("Peer %d sent us invalid compact block/non-matching block transactions\n", pfrom->id);
+                return true;
+            } else if (status == READ_STATUS_FAILED) {
+                // Might have collided, fall back to getdata now :(
+                std::vector<CInv> invs;
+                invs.push_back(CInv(MSG_BLOCK | GetFetchFlags(pfrom, chainActive.Tip(), chainparams.GetConsensus()), resp.blockhash));
+                connman.PushMessage(pfrom, msgMaker.Make(NetMsgType::GETDATA, invs));
+            } else {
+                // Block is either okay, or possibly we received
+                // READ_STATUS_CHECKBLOCK_FAILED.
+                // Note that CheckBlock can only fail for one of a few reasons:
+                // 1. bad-proof-of-work (impossible here, because we've already
+                //    accepted the header)
+                // 2. merkleroot doesn't match the transactions given (already
+                //    caught in FillBlock with READ_STATUS_FAILED, so
+                //    impossible here)
+                // 3. the block is otherwise invalid (eg invalid coinbase,
+                //    block is too big, too many legacy sigops, etc).
+                // So if CheckBlock failed, #3 is the only possibility.
+                // Under BIP 152, we don't DoS-ban unless proof of work is
+                // invalid (we don't require all the stateless checks to have
+                // been run).  This is handled below, so just treat this as
+                // though the block was successfully read, and rely on the
+                // handling in ProcessNewBlock to ensure the block index is
+                // updated, reject messages go out, etc.
+                MarkBlockAsReceived(resp.blockhash); // it is now an empty pointer
+                fBlockRead = true;
+                // mapBlockSource is only used for sending reject messages and DoS scores,
+                // so the race between here and cs_main in ProcessNewBlock is fine.
+                // BIP 152 permits peers to relay compact blocks after validating
+                // the header only; we should not punish peers if the block turns
+                // out to be invalid.
+                mapBlockSource.emplace(resp.blockhash, std::make_pair(pfrom->GetId(), false));
+            }
+        } // Don't hold cs_main when we call into ProcessNewBlock
+        if (fBlockRead) {
+            bool fNewBlock = false;
+            // Since we requested this block (it was in mapBlocksInFlight), force it to be processed,
+            // even if it would not be a candidate for new tip (missing previous block, chain not long enough, etc)
+            ProcessNewBlock(chainparams, &block, true, NULL, &fNewBlock);
+            if (fNewBlock)
+                pfrom->nLastBlockTime = GetTime();
+        }
+    }
+
+
+    else if (strCommand == NetMsgType::HEADERS && !fImporting && !fReindex) // Ignore headers received while importing
+    {
+        std::vector<CBlockHeader> headers;
+
+        // Bypass the normal CBlock deserialization, as we don't want to risk deserializing 2000 full blocks.
+        unsigned int nCount = ReadCompactSize(vRecv);
+        if (nCount > MAX_HEADERS_RESULTS) {
+            LOCK(cs_main);
+            Misbehaving(pfrom->GetId(), 20);
+            return error("headers message size = %u", nCount);
+        }
+        headers.resize(nCount);
+        for (unsigned int n = 0; n < nCount; n++) {
+            vRecv >> headers[n];
+            ReadCompactSize(vRecv); // ignore tx count; assume it is 0.
+        }
+
+        if (nCount == 0) {
+            // Nothing interesting. Stop asking this peers for more headers.
+            return true;
+        }
+
+        CBlockIndex *pindexLast = NULL;
+        {
+        LOCK(cs_main);
+        CNodeState *nodestate = State(pfrom->GetId());
+
+        // If this looks like it could be a block announcement (nCount <
+        // MAX_BLOCKS_TO_ANNOUNCE), use special logic for handling headers that
+        // don't connect:
+        // - Send a getheaders message in response to try to connect the chain.
+        // - The peer can send up to MAX_UNCONNECTING_HEADERS in a row that
+        //   don't connect before giving DoS points
+        // - Once a headers message is received that is valid and does connect,
+        //   nUnconnectingHeaders gets reset back to 0.
+        if (mapBlockIndex.find(headers[0].hashPrevBlock) == mapBlockIndex.end() && nCount < MAX_BLOCKS_TO_ANNOUNCE) {
+            nodestate->nUnconnectingHeaders++;
+            connman.PushMessage(pfrom, msgMaker.Make(NetMsgType::GETHEADERS, chainActive.GetLocator(pindexBestHeader), uint256()));
+            LogPrint("net", "received header %s: missing prev block %s, sending getheaders (%d) to end (peer=%d, nUnconnectingHeaders=%d)\n",
+                    headers[0].GetHash().ToString(),
+                    headers[0].hashPrevBlock.ToString(),
+                    pindexBestHeader->nHeight,
+                    pfrom->id, nodestate->nUnconnectingHeaders);
+            // Set hashLastUnknownBlock for this peer, so that if we
+            // eventually get the headers - even from a different peer -
+            // we can use this peer to download.
+            UpdateBlockAvailability(pfrom->GetId(), headers.back().GetHash());
+
+            if (nodestate->nUnconnectingHeaders % MAX_UNCONNECTING_HEADERS == 0) {
+                Misbehaving(pfrom->GetId(), 20);
+            }
+            return true;
+        }
+
+        uint256 hashLastBlock;
+        for (const CBlockHeader& header : headers) {
+            if (!hashLastBlock.IsNull() && header.hashPrevBlock != hashLastBlock) {
+                Misbehaving(pfrom->GetId(), 20);
+                return error("non-continuous headers sequence");
+            }
+            hashLastBlock = header.GetHash();
+        }
+        }
+
+        CValidationState state;
+        if (!ProcessNewBlockHeaders(headers, state, chainparams, &pindexLast)) {
+            int nDoS;
+            if (state.IsInvalid(nDoS)) {
+                if (nDoS > 0) {
+                    LOCK(cs_main);
+                    Misbehaving(pfrom->GetId(), nDoS);
+                }
+                return error("invalid header received");
+            }
+        }
+
+        {
+        LOCK(cs_main);
+        CNodeState *nodestate = State(pfrom->GetId());
+        if (nodestate->nUnconnectingHeaders > 0) {
+            LogPrint("net", "peer=%d: resetting nUnconnectingHeaders (%d -> 0)\n", pfrom->id, nodestate->nUnconnectingHeaders);
+        }
+        nodestate->nUnconnectingHeaders = 0;
+
+        assert(pindexLast);
+        UpdateBlockAvailability(pfrom->GetId(), pindexLast->GetBlockHash());
+
+        if (nCount == MAX_HEADERS_RESULTS) {
+            // Headers message had its maximum size; the peer may have more headers.
+            // TODO: optimize: if pindexLast is an ancestor of chainActive.Tip or pindexBestHeader, continue
+            // from there instead.
+            LogPrint("net", "more getheaders (%d) to end to peer=%d (startheight:%d)\n", pindexLast->nHeight, pfrom->id, pfrom->nStartingHeight);
+            connman.PushMessage(pfrom, msgMaker.Make(NetMsgType::GETHEADERS, chainActive.GetLocator(pindexLast), uint256()));
+        }
+
+        bool fCanDirectFetch = CanDirectFetch(chainparams.GetConsensus());
+        // If this set of headers is valid and ends in a block with at least as
+        // much work as our tip, download as much as possible.
+        if (fCanDirectFetch && pindexLast->IsValid(BLOCK_VALID_TREE) && chainActive.Tip()->nChainWork <= pindexLast->nChainWork) {
+            vector<CBlockIndex *> vToFetch;
+            CBlockIndex *pindexWalk = pindexLast;
+            // Calculate all the blocks we'd need to switch to pindexLast, up to a limit.
+            while (pindexWalk && !chainActive.Contains(pindexWalk) && vToFetch.size() <= MAX_BLOCKS_IN_TRANSIT_PER_PEER) {
+                if (!(pindexWalk->nStatus & BLOCK_HAVE_DATA) &&
+                        !mapBlocksInFlight.count(pindexWalk->GetBlockHash()) &&
+                        (!IsWitnessEnabled(pindexWalk->pprev, chainparams.GetConsensus()) || State(pfrom->GetId())->fHaveWitness)) {
+                    // We don't have this block, and it's not yet in flight.
+                    vToFetch.push_back(pindexWalk);
+                }
+                pindexWalk = pindexWalk->pprev;
+            }
+            // If pindexWalk still isn't on our main chain, we're looking at a
+            // very large reorg at a time we think we're close to caught up to
+            // the main chain -- this shouldn't really happen.  Bail out on the
+            // direct fetch and rely on parallel download instead.
+            if (!chainActive.Contains(pindexWalk)) {
+                LogPrint("net", "Large reorg, won't direct fetch to %s (%d)\n",
+                        pindexLast->GetBlockHash().ToString(),
+                        pindexLast->nHeight);
+            } else {
+                vector<CInv> vGetData;
+                // Download as much as possible, from earliest to latest.
+                BOOST_REVERSE_FOREACH(CBlockIndex *pindex, vToFetch) {
+                    if (nodestate->nBlocksInFlight >= MAX_BLOCKS_IN_TRANSIT_PER_PEER) {
+                        // Can't download any more from this peer
+                        break;
+                    }
+                    uint32_t nFetchFlags = GetFetchFlags(pfrom, pindex->pprev, chainparams.GetConsensus());
+                    vGetData.push_back(CInv(MSG_BLOCK | nFetchFlags, pindex->GetBlockHash()));
+                    MarkBlockAsInFlight(pfrom->GetId(), pindex->GetBlockHash(), chainparams.GetConsensus(), pindex);
+                    LogPrint("net", "Requesting block %s from  peer=%d\n",
+                            pindex->GetBlockHash().ToString(), pfrom->id);
+                }
+                if (vGetData.size() > 1) {
+                    LogPrint("net", "Downloading blocks toward %s (%d) via headers direct fetch\n",
+                            pindexLast->GetBlockHash().ToString(), pindexLast->nHeight);
+                }
+                if (vGetData.size() > 0) {
+                    if (nodestate->fSupportsDesiredCmpctVersion && vGetData.size() == 1 && mapBlocksInFlight.size() == 1 && pindexLast->pprev->IsValid(BLOCK_VALID_CHAIN)) {
+                        // We seem to be rather well-synced, so it appears pfrom was the first to provide us
+                        // with this block! Let's get them to announce using compact blocks in the future.
+                        MaybeSetPeerAsAnnouncingHeaderAndIDs(nodestate, pfrom, connman);
+                        // In any case, we want to download using a compact block, not a regular one
+                        vGetData[0] = CInv(MSG_CMPCT_BLOCK, vGetData[0].hash);
+                    }
+                    connman.PushMessage(pfrom, msgMaker.Make(NetMsgType::GETDATA, vGetData));
+                }
+            }
+        }
+        }
+    }
+
+    else if (strCommand == NetMsgType::BLOCK && !fImporting && !fReindex) // Ignore blocks received while importing
+    {
+        CBlock block;
+        vRecv >> block;
+
+        LogPrint("net", "received block %s peer=%d\n", block.GetHash().ToString(), pfrom->id);
+
+        // Process all blocks from whitelisted peers, even if not requested,
+        // unless we're still syncing with the network.
+        // Such an unrequested block may still be processed, subject to the
+        // conditions in AcceptBlock().
+        bool forceProcessing = pfrom->fWhitelisted && !IsInitialBlockDownload();
+        const uint256 hash(block.GetHash());
+        {
+            LOCK(cs_main);
+            // Also always process if we requested the block explicitly, as we may
+            // need it even though it is not a candidate for a new best tip.
+            forceProcessing |= MarkBlockAsReceived(hash);
+            // mapBlockSource is only used for sending reject messages and DoS scores,
+            // so the race between here and cs_main in ProcessNewBlock is fine.
+            mapBlockSource.emplace(hash, std::make_pair(pfrom->GetId(), true));
+        }
+        bool fNewBlock = false;
+        ProcessNewBlock(chainparams, &block, forceProcessing, NULL, &fNewBlock);
+        if (fNewBlock)
+            pfrom->nLastBlockTime = GetTime();
+    }
+
+
+    else if (strCommand == NetMsgType::GETADDR)
+    {
+        // This asymmetric behavior for inbound and outbound connections was introduced
+        // to prevent a fingerprinting attack: an attacker can send specific fake addresses
+        // to users' AddrMan and later request them by sending getaddr messages.
+        // Making nodes which are behind NAT and can only make outgoing connections ignore
+        // the getaddr message mitigates the attack.
+        if (!pfrom->fInbound) {
+            LogPrint("net", "Ignoring \"getaddr\" from outbound connection. peer=%d\n", pfrom->id);
+            return true;
+        }
+
+        // Only send one GetAddr response per connection to reduce resource waste
+        //  and discourage addr stamping of INV announcements.
+        if (pfrom->fSentAddr) {
+            LogPrint("net", "Ignoring repeated \"getaddr\". peer=%d\n", pfrom->id);
+            return true;
+        }
+        pfrom->fSentAddr = true;
+
+        pfrom->vAddrToSend.clear();
+        vector<CAddress> vAddr = connman.GetAddresses();
+        FastRandomContext insecure_rand;
+        BOOST_FOREACH(const CAddress &addr, vAddr)
+            pfrom->PushAddress(addr, insecure_rand);
+    }
+
+
+    else if (strCommand == NetMsgType::MEMPOOL)
+    {
+        if (!(pfrom->GetLocalServices() & NODE_BLOOM) && !pfrom->fWhitelisted)
+        {
+            LogPrint("net", "mempool request with bloom filters disabled, disconnect peer=%d\n", pfrom->GetId());
+            pfrom->fDisconnect = true;
+            return true;
+        }
+
+        if (connman.OutboundTargetReached(false) && !pfrom->fWhitelisted)
+        {
+            LogPrint("net", "mempool request with bandwidth limit reached, disconnect peer=%d\n", pfrom->GetId());
+            pfrom->fDisconnect = true;
+            return true;
+        }
+
+        LOCK(pfrom->cs_inventory);
+        pfrom->fSendMempool = true;
+    }
+
+
+    else if (strCommand == NetMsgType::PING)
+    {
+        if (pfrom->nVersion > BIP0031_VERSION)
+        {
+            uint64_t nonce = 0;
+            vRecv >> nonce;
+            // Echo the message back with the nonce. This allows for two useful features:
+            //
+            // 1) A remote node can quickly check if the connection is operational
+            // 2) Remote nodes can measure the latency of the network thread. If this node
+            //    is overloaded it won't respond to pings quickly and the remote node can
+            //    avoid sending us more work, like chain download requests.
+            //
+            // The nonce stops the remote getting confused between different pings: without
+            // it, if the remote node sends a ping once per second and this node takes 5
+            // seconds to respond to each, the 5th ping the remote sends would appear to
+            // return very quickly.
+            connman.PushMessage(pfrom, msgMaker.Make(NetMsgType::PONG, nonce));
+        }
+    }
+
+
+    else if (strCommand == NetMsgType::PONG)
+    {
+        int64_t pingUsecEnd = nTimeReceived;
+        uint64_t nonce = 0;
+        size_t nAvail = vRecv.in_avail();
+        bool bPingFinished = false;
+        std::string sProblem;
+
+        if (nAvail >= sizeof(nonce)) {
+            vRecv >> nonce;
+
+            // Only process pong message if there is an outstanding ping (old ping without nonce should never pong)
+            if (pfrom->nPingNonceSent != 0) {
+                if (nonce == pfrom->nPingNonceSent) {
+                    // Matching pong received, this ping is no longer outstanding
+                    bPingFinished = true;
+                    int64_t pingUsecTime = pingUsecEnd - pfrom->nPingUsecStart;
+                    if (pingUsecTime > 0) {
+                        // Successful ping time measurement, replace previous
+                        pfrom->nPingUsecTime = pingUsecTime;
+                        pfrom->nMinPingUsecTime = std::min(pfrom->nMinPingUsecTime, pingUsecTime);
+                    } else {
+                        // This should never happen
+                        sProblem = "Timing mishap";
+                    }
+                } else {
+                    // Nonce mismatches are normal when pings are overlapping
+                    sProblem = "Nonce mismatch";
+                    if (nonce == 0) {
+                        // This is most likely a bug in another implementation somewhere; cancel this ping
+                        bPingFinished = true;
+                        sProblem = "Nonce zero";
+                    }
+                }
+            } else {
+                sProblem = "Unsolicited pong without ping";
+            }
+        } else {
+            // This is most likely a bug in another implementation somewhere; cancel this ping
+            bPingFinished = true;
+            sProblem = "Short payload";
+        }
+
+        if (!(sProblem.empty())) {
+            LogPrint("net", "pong peer=%d: %s, %x expected, %x received, %u bytes\n",
+                pfrom->id,
+                sProblem,
+                pfrom->nPingNonceSent,
+                nonce,
+                nAvail);
+        }
+        if (bPingFinished) {
+            pfrom->nPingNonceSent = 0;
+        }
+    }
+
+
+    else if (strCommand == NetMsgType::FILTERLOAD)
+    {
+        CBloomFilter filter;
+        vRecv >> filter;
+
+        if (!filter.IsWithinSizeConstraints())
+        {
+            // There is no excuse for sending a too-large filter
+            LOCK(cs_main);
+            Misbehaving(pfrom->GetId(), 100);
+        }
+        else
+        {
+            LOCK(pfrom->cs_filter);
+            delete pfrom->pfilter;
+            pfrom->pfilter = new CBloomFilter(filter);
+            pfrom->pfilter->UpdateEmptyFull();
+            pfrom->fRelayTxes = true;
+        }
+    }
+
+
+    else if (strCommand == NetMsgType::FILTERADD)
+    {
+        vector<unsigned char> vData;
+        vRecv >> vData;
+
+        // Nodes must NEVER send a data item > 520 bytes (the max size for a script data object,
+        // and thus, the maximum size any matched object can have) in a filteradd message
+        bool bad = false;
+        if (vData.size() > MAX_SCRIPT_ELEMENT_SIZE) {
+            bad = true;
+        } else {
+            LOCK(pfrom->cs_filter);
+            if (pfrom->pfilter) {
+                pfrom->pfilter->insert(vData);
+            } else {
+                bad = true;
+            }
+        }
+        if (bad) {
+            LOCK(cs_main);
+            Misbehaving(pfrom->GetId(), 100);
+        }
+    }
+
+
+    else if (strCommand == NetMsgType::FILTERCLEAR)
+    {
+        LOCK(pfrom->cs_filter);
+        if (pfrom->GetLocalServices() & NODE_BLOOM) {
+            delete pfrom->pfilter;
+            pfrom->pfilter = new CBloomFilter();
+        }
+        pfrom->fRelayTxes = true;
+    }
+
+
+    else if (strCommand == NetMsgType::REJECT)
+    {
+        if (fDebug) {
+            try {
+                string strMsg; unsigned char ccode; string strReason;
+                vRecv >> LIMITED_STRING(strMsg, CMessageHeader::COMMAND_SIZE) >> ccode >> LIMITED_STRING(strReason, MAX_REJECT_MESSAGE_LENGTH);
+
+                ostringstream ss;
+                ss << strMsg << " code " << itostr(ccode) << ": " << strReason;
+
+                if (strMsg == NetMsgType::BLOCK || strMsg == NetMsgType::TX)
+                {
+                    uint256 hash;
+                    vRecv >> hash;
+                    ss << ": hash " << hash.ToString();
+                }
+                LogPrint("net", "Reject %s\n", SanitizeString(ss.str()));
+            } catch (const std::ios_base::failure&) {
+                // Avoid feedback loops by preventing reject messages from triggering a new reject message.
+                LogPrint("net", "Unparseable reject message received\n");
+            }
+        }
+    }
+
+    else if (strCommand == NetMsgType::FEEFILTER) {
+        CAmount newFeeFilter = 0;
+        vRecv >> newFeeFilter;
+        if (MoneyRange(newFeeFilter)) {
+            {
+                LOCK(pfrom->cs_feeFilter);
+                pfrom->minFeeFilter = newFeeFilter;
+            }
+            LogPrint("net", "received: feefilter of %s from peer=%d\n", CFeeRate(newFeeFilter).ToString(), pfrom->id);
+        }
+    }
+
+    else if (strCommand == NetMsgType::NOTFOUND) {
+        // We do not care about the NOTFOUND message, but logging an Unknown Command
+        // message would be undesirable as we transmit it ourselves.
+    }
+
+    else {
+        // Ignore unknown commands for extensibility
+        LogPrint("net", "Unknown command \"%s\" from peer=%d\n", SanitizeString(strCommand), pfrom->id);
+    }
+
+
+
+    return true;
+}
+
+// requires LOCK(cs_vRecvMsg)
+bool ProcessMessages(CNode* pfrom, CConnman& connman)
+{
+    const CChainParams& chainparams = Params();
+    unsigned int nMaxSendBufferSize = connman.GetSendBufferSize();
+    //if (fDebug)
+    //    LogPrintf("%s(%u messages)\n", __func__, pfrom->vRecvMsg.size());
+
+    //
+    // Message format
+    //  (4) message start
+    //  (12) command
+    //  (4) size
+    //  (4) checksum
+    //  (x) data
+    //
+    bool fOk = true;
+
+    if (!pfrom->vRecvGetData.empty())
+        ProcessGetData(pfrom, chainparams.GetConsensus(), connman);
+
+    // this maintains the order of responses
+    if (!pfrom->vRecvGetData.empty()) return fOk;
+
+    std::deque<CNetMessage>::iterator it = pfrom->vRecvMsg.begin();
+    while (!pfrom->fDisconnect && it != pfrom->vRecvMsg.end()) {
+        // Don't bother if send buffer is too full to respond anyway
+        if (pfrom->nSendSize >= nMaxSendBufferSize)
+            break;
+
+        // get next message
+        CNetMessage& msg = *it;
+
+        //if (fDebug)
+        //    LogPrintf("%s(message %u msgsz, %u bytes, complete:%s)\n", __func__,
+        //            msg.hdr.nMessageSize, msg.vRecv.size(),
+        //            msg.complete() ? "Y" : "N");
+
+        // end, if an incomplete message is found
+        if (!msg.complete())
+            break;
+
+        // at this point, any failure means we can delete the current message
+        it++;
+
+        // Scan for message start
+        if (memcmp(msg.hdr.pchMessageStart, chainparams.MessageStart(), CMessageHeader::MESSAGE_START_SIZE) != 0) {
+            LogPrintf("PROCESSMESSAGE: INVALID MESSAGESTART %s peer=%d\n", SanitizeString(msg.hdr.GetCommand()), pfrom->id);
+            fOk = false;
+            break;
+        }
+
+        // Read header
+        CMessageHeader& hdr = msg.hdr;
+        if (!hdr.IsValid(chainparams.MessageStart()))
+        {
+            LogPrintf("PROCESSMESSAGE: ERRORS IN HEADER %s peer=%d\n", SanitizeString(hdr.GetCommand()), pfrom->id);
+            continue;
+        }
+        string strCommand = hdr.GetCommand();
+
+        // Message size
+        unsigned int nMessageSize = hdr.nMessageSize;
+
+        // Checksum
+        CDataStream& vRecv = msg.vRecv;
+        const uint256& hash = msg.GetMessageHash();
+        if (memcmp(hash.begin(), hdr.pchChecksum, CMessageHeader::CHECKSUM_SIZE) != 0)
+        {
+            LogPrintf("%s(%s, %u bytes): CHECKSUM ERROR expected %s was %s\n", __func__,
+               SanitizeString(strCommand), nMessageSize,
+               HexStr(hash.begin(), hash.begin()+CMessageHeader::CHECKSUM_SIZE),
+               HexStr(hdr.pchChecksum, hdr.pchChecksum+CMessageHeader::CHECKSUM_SIZE));
+            continue;
+        }
+
+        // Process message
+        bool fRet = false;
+        try
+        {
+            fRet = ProcessMessage(pfrom, strCommand, vRecv, msg.nTime, chainparams, connman);
+            boost::this_thread::interruption_point();
+        }
+        catch (const std::ios_base::failure& e)
+        {
+            connman.PushMessage(pfrom, CNetMsgMaker(INIT_PROTO_VERSION).Make(NetMsgType::REJECT, strCommand, REJECT_MALFORMED, string("error parsing message")));
+            if (strstr(e.what(), "end of data"))
+            {
+                // Allow exceptions from under-length message on vRecv
+                LogPrintf("%s(%s, %u bytes): Exception '%s' caught, normally caused by a message being shorter than its stated length\n", __func__, SanitizeString(strCommand), nMessageSize, e.what());
+            }
+            else if (strstr(e.what(), "size too large"))
+            {
+                // Allow exceptions from over-long size
+                LogPrintf("%s(%s, %u bytes): Exception '%s' caught\n", __func__, SanitizeString(strCommand), nMessageSize, e.what());
+            }
+            else if (strstr(e.what(), "non-canonical ReadCompactSize()"))
+            {
+                // Allow exceptions from non-canonical encoding
+                LogPrintf("%s(%s, %u bytes): Exception '%s' caught\n", __func__, SanitizeString(strCommand), nMessageSize, e.what());
+            }
+            else
+            {
+                PrintExceptionContinue(&e, "ProcessMessages()");
+            }
+        }
+        catch (const boost::thread_interrupted&) {
+            throw;
+        }
+        catch (const std::exception& e) {
+            PrintExceptionContinue(&e, "ProcessMessages()");
+        } catch (...) {
+            PrintExceptionContinue(NULL, "ProcessMessages()");
+        }
+
+        if (!fRet)
+            LogPrintf("%s(%s, %u bytes) FAILED peer=%d\n", __func__, SanitizeString(strCommand), nMessageSize, pfrom->id);
+
+        break;
+    }
+
+    // In case the connection got shut down, its receive buffer was wiped
+    if (!pfrom->fDisconnect)
+        pfrom->vRecvMsg.erase(pfrom->vRecvMsg.begin(), it);
+
+    return fOk;
+}
+
+class CompareInvMempoolOrder
+{
+    CTxMemPool *mp;
+public:
+    CompareInvMempoolOrder(CTxMemPool *_mempool)
+    {
+        mp = _mempool;
+    }
+
+    bool operator()(std::set<uint256>::iterator a, std::set<uint256>::iterator b)
+    {
+        /* As std::make_heap produces a max-heap, we want the entries with the
+         * fewest ancestors/highest fee to sort later. */
+        return mp->CompareDepthAndScore(*b, *a);
+    }
+};
+
+bool SendMessages(CNode* pto, CConnman& connman)
+{
+    const Consensus::Params& consensusParams = Params().GetConsensus();
+    {
+        // Don't send anything until we get its version message
+        if (pto->nVersion == 0 || pto->fDisconnect)
+            return true;
+
+        // If we get here, the outgoing message serialization version is set and can't change.
+        CNetMsgMaker msgMaker(pto->GetSendVersion());
+
+        //
+        // Message: ping
+        //
+        bool pingSend = false;
+        if (pto->fPingQueued) {
+            // RPC ping request by user
+            pingSend = true;
+        }
+        if (pto->nPingNonceSent == 0 && pto->nPingUsecStart + PING_INTERVAL * 1000000 < GetTimeMicros()) {
+            // Ping automatically sent as a latency probe & keepalive.
+            pingSend = true;
+        }
+        if (pingSend) {
+            uint64_t nonce = 0;
+            while (nonce == 0) {
+                GetRandBytes((unsigned char*)&nonce, sizeof(nonce));
+            }
+            pto->fPingQueued = false;
+            pto->nPingUsecStart = GetTimeMicros();
+            if (pto->nVersion > BIP0031_VERSION) {
+                pto->nPingNonceSent = nonce;
+                connman.PushMessage(pto, msgMaker.Make(NetMsgType::PING, nonce));
+            } else {
+                // Peer is too old to support ping command with nonce, pong will never arrive.
+                pto->nPingNonceSent = 0;
+                connman.PushMessage(pto, msgMaker.Make(NetMsgType::PING));
+            }
+        }
+
+        TRY_LOCK(cs_main, lockMain); // Acquire cs_main for IsInitialBlockDownload() and CNodeState()
+        if (!lockMain)
+            return true;
+
+        CNodeState &state = *State(pto->GetId());
+
+        BOOST_FOREACH(const CBlockReject& reject, state.rejects)
+            connman.PushMessage(pto, msgMaker.Make(NetMsgType::REJECT, (string)NetMsgType::BLOCK, reject.chRejectCode, reject.strRejectReason, reject.hashBlock));
+        state.rejects.clear();
+
+        if (state.fShouldBan) {
+            state.fShouldBan = false;
+            if (pto->fWhitelisted)
+                LogPrintf("Warning: not punishing whitelisted peer %s!\n", pto->addr.ToString());
+            else {
+                pto->fDisconnect = true;
+                if (pto->addr.IsLocal())
+                    LogPrintf("Warning: not banning local peer %s!\n", pto->addr.ToString());
+                else
+                {
+                    connman.Ban(pto->addr, BanReasonNodeMisbehaving);
+                }
+                return true;
+            }
+        }
+
+        // Address refresh broadcast
+        int64_t nNow = GetTimeMicros();
+        if (!IsInitialBlockDownload() && pto->nNextLocalAddrSend < nNow) {
+            AdvertiseLocal(pto);
+            pto->nNextLocalAddrSend = PoissonNextSend(nNow, AVG_LOCAL_ADDRESS_BROADCAST_INTERVAL);
+        }
+
+        //
+        // Message: addr
+        //
+        if (pto->nNextAddrSend < nNow) {
+            pto->nNextAddrSend = PoissonNextSend(nNow, AVG_ADDRESS_BROADCAST_INTERVAL);
+            vector<CAddress> vAddr;
+            vAddr.reserve(pto->vAddrToSend.size());
+            BOOST_FOREACH(const CAddress& addr, pto->vAddrToSend)
+            {
+                if (!pto->addrKnown.contains(addr.GetKey()))
+                {
+                    pto->addrKnown.insert(addr.GetKey());
+                    vAddr.push_back(addr);
+                    // receiver rejects addr messages larger than 1000
+                    if (vAddr.size() >= 1000)
+                    {
+                        connman.PushMessage(pto, msgMaker.Make(NetMsgType::ADDR, vAddr));
+                        vAddr.clear();
+                    }
+                }
+            }
+            pto->vAddrToSend.clear();
+            if (!vAddr.empty())
+                connman.PushMessage(pto, msgMaker.Make(NetMsgType::ADDR, vAddr));
+            // we only send the big addr message once
+            if (pto->vAddrToSend.capacity() > 40)
+                pto->vAddrToSend.shrink_to_fit();
+        }
+
+        // Start block sync
+        if (pindexBestHeader == NULL)
+            pindexBestHeader = chainActive.Tip();
+        bool fFetch = state.fPreferredDownload || (nPreferredDownload == 0 && !pto->fClient && !pto->fOneShot); // Download if this is a nice peer, or we have no nice peers and this one might do.
+        if (!state.fSyncStarted && !pto->fClient && !fImporting && !fReindex) {
+            // Only actively request headers from a single peer, unless we're close to today.
+            if ((nSyncStarted == 0 && fFetch) || pindexBestHeader->GetBlockTime() > GetAdjustedTime() - 24 * 60 * 60) {
+                state.fSyncStarted = true;
+                nSyncStarted++;
+                const CBlockIndex *pindexStart = pindexBestHeader;
+                /* If possible, start at the block preceding the currently
+                   best known header.  This ensures that we always get a
+                   non-empty list of headers back as long as the peer
+                   is up-to-date.  With a non-empty response, we can initialise
+                   the peer's known best block.  This wouldn't be possible
+                   if we requested starting at pindexBestHeader and
+                   got back an empty response.  */
+                if (pindexStart->pprev)
+                    pindexStart = pindexStart->pprev;
+                LogPrint("net", "initial getheaders (%d) to peer=%d (startheight:%d)\n", pindexStart->nHeight, pto->id, pto->nStartingHeight);
+                connman.PushMessage(pto, msgMaker.Make(NetMsgType::GETHEADERS, chainActive.GetLocator(pindexStart), uint256()));
+            }
+        }
+
+        // Resend wallet transactions that haven't gotten in a block yet
+        // Except during reindex, importing and IBD, when old wallet
+        // transactions become unconfirmed and spams other nodes.
+        if (!fReindex && !fImporting && !IsInitialBlockDownload())
+        {
+            GetMainSignals().Broadcast(nTimeBestReceived, &connman);
+        }
+
+        //
+        // Try sending block announcements via headers
+        //
+        {
+            // If we have less than MAX_BLOCKS_TO_ANNOUNCE in our
+            // list of block hashes we're relaying, and our peer wants
+            // headers announcements, then find the first header
+            // not yet known to our peer but would connect, and send.
+            // If no header would connect, or if we have too many
+            // blocks, or if the peer doesn't want headers, just
+            // add all to the inv queue.
+            LOCK(pto->cs_inventory);
+            vector<CBlock> vHeaders;
+            bool fRevertToInv = ((!state.fPreferHeaders &&
+                                 (!state.fPreferHeaderAndIDs || pto->vBlockHashesToAnnounce.size() > 1)) ||
+                                pto->vBlockHashesToAnnounce.size() > MAX_BLOCKS_TO_ANNOUNCE);
+            CBlockIndex *pBestIndex = NULL; // last header queued for delivery
+            ProcessBlockAvailability(pto->id); // ensure pindexBestKnownBlock is up-to-date
+
+            if (!fRevertToInv) {
+                bool fFoundStartingHeader = false;
+                // Try to find first header that our peer doesn't have, and
+                // then send all headers past that one.  If we come across any
+                // headers that aren't on chainActive, give up.
+                BOOST_FOREACH(const uint256 &hash, pto->vBlockHashesToAnnounce) {
+                    BlockMap::iterator mi = mapBlockIndex.find(hash);
+                    assert(mi != mapBlockIndex.end());
+                    CBlockIndex *pindex = mi->second;
+                    if (chainActive[pindex->nHeight] != pindex) {
+                        // Bail out if we reorged away from this block
+                        fRevertToInv = true;
+                        break;
+                    }
+                    if (pBestIndex != NULL && pindex->pprev != pBestIndex) {
+                        // This means that the list of blocks to announce don't
+                        // connect to each other.
+                        // This shouldn't really be possible to hit during
+                        // regular operation (because reorgs should take us to
+                        // a chain that has some block not on the prior chain,
+                        // which should be caught by the prior check), but one
+                        // way this could happen is by using invalidateblock /
+                        // reconsiderblock repeatedly on the tip, causing it to
+                        // be added multiple times to vBlockHashesToAnnounce.
+                        // Robustly deal with this rare situation by reverting
+                        // to an inv.
+                        fRevertToInv = true;
+                        break;
+                    }
+                    pBestIndex = pindex;
+                    if (fFoundStartingHeader) {
+                        // add this to the headers message
+                        vHeaders.push_back(pindex->GetBlockHeader());
+                    } else if (PeerHasHeader(&state, pindex)) {
+                        continue; // keep looking for the first new block
+                    } else if (pindex->pprev == NULL || PeerHasHeader(&state, pindex->pprev)) {
+                        // Peer doesn't have this header but they do have the prior one.
+                        // Start sending headers.
+                        fFoundStartingHeader = true;
+                        vHeaders.push_back(pindex->GetBlockHeader());
+                    } else {
+                        // Peer doesn't have this header or the prior one -- nothing will
+                        // connect, so bail out.
+                        fRevertToInv = true;
+                        break;
+                    }
+                }
+            }
+            if (!fRevertToInv && !vHeaders.empty()) {
+                if (vHeaders.size() == 1 && state.fPreferHeaderAndIDs) {
+                    // We only send up to 1 block as header-and-ids, as otherwise
+                    // probably means we're doing an initial-ish-sync or they're slow
+                    LogPrint("net", "%s sending header-and-ids %s to peer %d\n", __func__,
+                            vHeaders.front().GetHash().ToString(), pto->id);
+                    //TODO: Shouldn't need to reload block from disk, but requires refactor
+                    CBlock block;
+                    assert(ReadBlockFromDisk(block, pBestIndex, consensusParams));
+                    CBlockHeaderAndShortTxIDs cmpctblock(block, state.fWantsCmpctWitness);
+                    int nSendFlags = state.fWantsCmpctWitness ? 0 : SERIALIZE_TRANSACTION_NO_WITNESS;
+                    connman.PushMessage(pto, msgMaker.Make(nSendFlags, NetMsgType::CMPCTBLOCK, cmpctblock));
+                    state.pindexBestHeaderSent = pBestIndex;
+                } else if (state.fPreferHeaders) {
+                    if (vHeaders.size() > 1) {
+                        LogPrint("net", "%s: %u headers, range (%s, %s), to peer=%d\n", __func__,
+                                vHeaders.size(),
+                                vHeaders.front().GetHash().ToString(),
+                                vHeaders.back().GetHash().ToString(), pto->id);
+                    } else {
+                        LogPrint("net", "%s: sending header %s to peer=%d\n", __func__,
+                                vHeaders.front().GetHash().ToString(), pto->id);
+                    }
+                    connman.PushMessage(pto, msgMaker.Make(NetMsgType::HEADERS, vHeaders));
+                    state.pindexBestHeaderSent = pBestIndex;
+                } else
+                    fRevertToInv = true;
+            }
+            if (fRevertToInv) {
+                // If falling back to using an inv, just try to inv the tip.
+                // The last entry in vBlockHashesToAnnounce was our tip at some point
+                // in the past.
+                if (!pto->vBlockHashesToAnnounce.empty()) {
+                    const uint256 &hashToAnnounce = pto->vBlockHashesToAnnounce.back();
+                    BlockMap::iterator mi = mapBlockIndex.find(hashToAnnounce);
+                    assert(mi != mapBlockIndex.end());
+                    CBlockIndex *pindex = mi->second;
+
+                    // Warn if we're announcing a block that is not on the main chain.
+                    // This should be very rare and could be optimized out.
+                    // Just log for now.
+                    if (chainActive[pindex->nHeight] != pindex) {
+                        LogPrint("net", "Announcing block %s not on main chain (tip=%s)\n",
+                            hashToAnnounce.ToString(), chainActive.Tip()->GetBlockHash().ToString());
+                    }
+
+                    // If the peer's chain has this block, don't inv it back.
+                    if (!PeerHasHeader(&state, pindex)) {
+                        pto->PushInventory(CInv(MSG_BLOCK, hashToAnnounce));
+                        LogPrint("net", "%s: sending inv peer=%d hash=%s\n", __func__,
+                            pto->id, hashToAnnounce.ToString());
+                    }
+                }
+            }
+            pto->vBlockHashesToAnnounce.clear();
+        }
+
+        //
+        // Message: inventory
+        //
+        vector<CInv> vInv;
+        {
+            LOCK(pto->cs_inventory);
+            vInv.reserve(std::max<size_t>(pto->vInventoryBlockToSend.size(), INVENTORY_BROADCAST_MAX));
+
+            // Add blocks
+            BOOST_FOREACH(const uint256& hash, pto->vInventoryBlockToSend) {
+                vInv.push_back(CInv(MSG_BLOCK, hash));
+                if (vInv.size() == MAX_INV_SZ) {
+                    connman.PushMessage(pto, msgMaker.Make(NetMsgType::INV, vInv));
+                    vInv.clear();
+                }
+            }
+            pto->vInventoryBlockToSend.clear();
+
+            // Check whether periodic sends should happen
+            bool fSendTrickle = pto->fWhitelisted;
+            if (pto->nNextInvSend < nNow) {
+                fSendTrickle = true;
+                // Use half the delay for outbound peers, as there is less privacy concern for them.
+                pto->nNextInvSend = PoissonNextSend(nNow, INVENTORY_BROADCAST_INTERVAL >> !pto->fInbound);
+            }
+
+            // Time to send but the peer has requested we not relay transactions.
+            if (fSendTrickle) {
+                LOCK(pto->cs_filter);
+                if (!pto->fRelayTxes) pto->setInventoryTxToSend.clear();
+            }
+
+            // Respond to BIP35 mempool requests
+            if (fSendTrickle && pto->fSendMempool) {
+                auto vtxinfo = mempool.infoAll();
+                pto->fSendMempool = false;
+                CAmount filterrate = 0;
+                {
+                    LOCK(pto->cs_feeFilter);
+                    filterrate = pto->minFeeFilter;
+                }
+
+                LOCK(pto->cs_filter);
+
+                for (const auto& txinfo : vtxinfo) {
+                    const uint256& hash = txinfo.tx->GetHash();
+                    CInv inv(MSG_TX, hash);
+                    pto->setInventoryTxToSend.erase(hash);
+                    if (filterrate) {
+                        if (txinfo.feeRate.GetFeePerK() < filterrate)
+                            continue;
+                    }
+                    if (pto->pfilter) {
+                        if (!pto->pfilter->IsRelevantAndUpdate(*txinfo.tx)) continue;
+                    }
+                    pto->filterInventoryKnown.insert(hash);
+                    vInv.push_back(inv);
+                    if (vInv.size() == MAX_INV_SZ) {
+                        connman.PushMessage(pto, msgMaker.Make(NetMsgType::INV, vInv));
+                        vInv.clear();
+                    }
+                }
+                pto->timeLastMempoolReq = GetTime();
+            }
+
+            // Determine transactions to relay
+            if (fSendTrickle) {
+                // Produce a vector with all candidates for sending
+                vector<std::set<uint256>::iterator> vInvTx;
+                vInvTx.reserve(pto->setInventoryTxToSend.size());
+                for (std::set<uint256>::iterator it = pto->setInventoryTxToSend.begin(); it != pto->setInventoryTxToSend.end(); it++) {
+                    vInvTx.push_back(it);
+                }
+                CAmount filterrate = 0;
+                {
+                    LOCK(pto->cs_feeFilter);
+                    filterrate = pto->minFeeFilter;
+                }
+                // Topologically and fee-rate sort the inventory we send for privacy and priority reasons.
+                // A heap is used so that not all items need sorting if only a few are being sent.
+                CompareInvMempoolOrder compareInvMempoolOrder(&mempool);
+                std::make_heap(vInvTx.begin(), vInvTx.end(), compareInvMempoolOrder);
+                // No reason to drain out at many times the network's capacity,
+                // especially since we have many peers and some will draw much shorter delays.
+                unsigned int nRelayedTransactions = 0;
+                LOCK(pto->cs_filter);
+                while (!vInvTx.empty() && nRelayedTransactions < INVENTORY_BROADCAST_MAX) {
+                    // Fetch the top element from the heap
+                    std::pop_heap(vInvTx.begin(), vInvTx.end(), compareInvMempoolOrder);
+                    std::set<uint256>::iterator it = vInvTx.back();
+                    vInvTx.pop_back();
+                    uint256 hash = *it;
+                    // Remove it from the to-be-sent set
+                    pto->setInventoryTxToSend.erase(it);
+                    // Check if not in the filter already
+                    if (pto->filterInventoryKnown.contains(hash)) {
+                        continue;
+                    }
+                    // Not in the mempool anymore? don't bother sending it.
+                    auto txinfo = mempool.info(hash);
+                    if (!txinfo.tx) {
+                        continue;
+                    }
+                    if (filterrate && txinfo.feeRate.GetFeePerK() < filterrate) {
+                        continue;
+                    }
+                    if (pto->pfilter && !pto->pfilter->IsRelevantAndUpdate(*txinfo.tx)) continue;
+                    // Send
+                    vInv.push_back(CInv(MSG_TX, hash));
+                    nRelayedTransactions++;
+                    {
+                        // Expire old relay messages
+                        while (!vRelayExpiration.empty() && vRelayExpiration.front().first < nNow)
+                        {
+                            mapRelay.erase(vRelayExpiration.front().second);
+                            vRelayExpiration.pop_front();
+                        }
+
+                        auto ret = mapRelay.insert(std::make_pair(hash, std::move(txinfo.tx)));
+                        if (ret.second) {
+                            vRelayExpiration.push_back(std::make_pair(nNow + 15 * 60 * 1000000, ret.first));
+                        }
+                    }
+                    if (vInv.size() == MAX_INV_SZ) {
+                        connman.PushMessage(pto, msgMaker.Make(NetMsgType::INV, vInv));
+                        vInv.clear();
+                    }
+                    pto->filterInventoryKnown.insert(hash);
+                }
+            }
+        }
+        if (!vInv.empty())
+            connman.PushMessage(pto, msgMaker.Make(NetMsgType::INV, vInv));
+
+        // Detect whether we're stalling
+        nNow = GetTimeMicros();
+        if (state.nStallingSince && state.nStallingSince < nNow - 1000000 * BLOCK_STALLING_TIMEOUT) {
+            // Stalling only triggers when the block download window cannot move. During normal steady state,
+            // the download window should be much larger than the to-be-downloaded set of blocks, so disconnection
+            // should only happen during initial block download.
+            LogPrintf("Peer=%d is stalling block download, disconnecting\n", pto->id);
+            pto->fDisconnect = true;
+            return true;
+        }
+        // In case there is a block that has been in flight from this peer for 2 + 0.5 * N times the block interval
+        // (with N the number of peers from which we're downloading validated blocks), disconnect due to timeout.
+        // We compensate for other peers to prevent killing off peers due to our own downstream link
+        // being saturated. We only count validated in-flight blocks so peers can't advertise non-existing block hashes
+        // to unreasonably increase our timeout.
+        if (state.vBlocksInFlight.size() > 0) {
+            QueuedBlock &queuedBlock = state.vBlocksInFlight.front();
+            int nOtherPeersWithValidatedDownloads = nPeersWithValidatedDownloads - (state.nBlocksInFlightValidHeaders > 0);
+            if (nNow > state.nDownloadingSince + consensusParams.nPowTargetSpacing * (BLOCK_DOWNLOAD_TIMEOUT_BASE + BLOCK_DOWNLOAD_TIMEOUT_PER_PEER * nOtherPeersWithValidatedDownloads)) {
+                LogPrintf("Timeout downloading block %s from peer=%d, disconnecting\n", queuedBlock.hash.ToString(), pto->id);
+                pto->fDisconnect = true;
+                return true;
+            }
+        }
+
+        //
+        // Message: getdata (blocks)
+        //
+        vector<CInv> vGetData;
+        if (!pto->fClient && (fFetch || !IsInitialBlockDownload()) && state.nBlocksInFlight < MAX_BLOCKS_IN_TRANSIT_PER_PEER) {
+            vector<CBlockIndex*> vToDownload;
+            NodeId staller = -1;
+            FindNextBlocksToDownload(pto->GetId(), MAX_BLOCKS_IN_TRANSIT_PER_PEER - state.nBlocksInFlight, vToDownload, staller, consensusParams);
+            BOOST_FOREACH(CBlockIndex *pindex, vToDownload) {
+                uint32_t nFetchFlags = GetFetchFlags(pto, pindex->pprev, consensusParams);
+                vGetData.push_back(CInv(MSG_BLOCK | nFetchFlags, pindex->GetBlockHash()));
+                MarkBlockAsInFlight(pto->GetId(), pindex->GetBlockHash(), consensusParams, pindex);
+                LogPrint("net", "Requesting block %s (%d) peer=%d\n", pindex->GetBlockHash().ToString(),
+                    pindex->nHeight, pto->id);
+            }
+            if (state.nBlocksInFlight == 0 && staller != -1) {
+                if (State(staller)->nStallingSince == 0) {
+                    State(staller)->nStallingSince = nNow;
+                    LogPrint("net", "Stall started peer=%d\n", staller);
+                }
+            }
+        }
+
+        //
+        // Message: getdata (non-blocks)
+        //
+        while (!pto->mapAskFor.empty() && (*pto->mapAskFor.begin()).first <= nNow)
+        {
+            const CInv& inv = (*pto->mapAskFor.begin()).second;
+            if (!AlreadyHave(inv))
+            {
+                if (fDebug)
+                    LogPrint("net", "Requesting %s peer=%d\n", inv.ToString(), pto->id);
+                vGetData.push_back(inv);
+                if (vGetData.size() >= 1000)
+                {
+                    connman.PushMessage(pto, msgMaker.Make(NetMsgType::GETDATA, vGetData));
+                    vGetData.clear();
+                }
+            } else {
+                //If we're not going to ask, don't expect a response.
+                pto->setAskFor.erase(inv.hash);
+            }
+            pto->mapAskFor.erase(pto->mapAskFor.begin());
+        }
+        if (!vGetData.empty())
+            connman.PushMessage(pto, msgMaker.Make(NetMsgType::GETDATA, vGetData));
+
+        //
+        // Message: feefilter
+        //
+        // We don't want white listed peers to filter txs to us if we have -whitelistforcerelay
+        if (pto->nVersion >= FEEFILTER_VERSION && GetBoolArg("-feefilter", DEFAULT_FEEFILTER) &&
+            !(pto->fWhitelisted && GetBoolArg("-whitelistforcerelay", DEFAULT_WHITELISTFORCERELAY))) {
+            CAmount currentFilter = mempool.GetMinFee(GetArg("-maxmempool", DEFAULT_MAX_MEMPOOL_SIZE) * 1000000).GetFeePerK();
+            int64_t timeNow = GetTimeMicros();
+            if (timeNow > pto->nextSendTimeFeeFilter) {
+                static FeeFilterRounder filterRounder(::minRelayTxFee);
+                CAmount filterToSend = filterRounder.round(currentFilter);
+                if (filterToSend != pto->lastSentFeeFilter) {
+                    connman.PushMessage(pto, msgMaker.Make(NetMsgType::FEEFILTER, filterToSend));
+                    pto->lastSentFeeFilter = filterToSend;
+                }
+                pto->nextSendTimeFeeFilter = PoissonNextSend(timeNow, AVG_FEEFILTER_BROADCAST_INTERVAL);
+            }
+            // If the fee filter has changed substantially and it's still more than MAX_FEEFILTER_CHANGE_DELAY
+            // until scheduled broadcast, then move the broadcast to within MAX_FEEFILTER_CHANGE_DELAY.
+            else if (timeNow + MAX_FEEFILTER_CHANGE_DELAY * 1000000 < pto->nextSendTimeFeeFilter &&
+                     (currentFilter < 3 * pto->lastSentFeeFilter / 4 || currentFilter > 4 * pto->lastSentFeeFilter / 3)) {
+                pto->nextSendTimeFeeFilter = timeNow + GetRandInt(MAX_FEEFILTER_CHANGE_DELAY) * 1000000;
+            }
+        }
+    }
+    return true;
+}
+
+class CNetProcessingCleanup
+{
+public:
+    CNetProcessingCleanup() {}
+    ~CNetProcessingCleanup() {
+        // orphan transactions
+        mapOrphanTransactions.clear();
+        mapOrphanTransactionsByPrev.clear();
+    }
+} instance_of_cnetprocessingcleanup;
diff --git a/src/net_processing.h b/src/net_processing.h
new file mode 100644
index 0000000000000..130433cc7c005
--- /dev/null
+++ b/src/net_processing.h
@@ -0,0 +1,51 @@
+// Copyright (c) 2009-2010 Satoshi Nakamoto
+// Copyright (c) 2009-2015 The Bitcoin Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#ifndef BITCOIN_NET_PROCESSING_H
+#define BITCOIN_NET_PROCESSING_H
+
+#include "net.h"
+#include "validationinterface.h"
+
+/** Register with a network node to receive its signals */
+void RegisterNodeSignals(CNodeSignals& nodeSignals);
+/** Unregister a network node */
+void UnregisterNodeSignals(CNodeSignals& nodeSignals);
+
+class PeerLogicValidation : public CValidationInterface {
+private:
+    CConnman* connman;
+
+public:
+    PeerLogicValidation(CConnman* connmanIn);
+
+    virtual void SyncTransaction(const CTransaction& tx, const CBlockIndex* pindex, int nPosInBlock);
+    virtual void UpdatedBlockTip(const CBlockIndex *pindexNew, const CBlockIndex *pindexFork, bool fInitialDownload);
+    virtual void BlockChecked(const CBlock& block, const CValidationState& state);
+};
+
+struct CNodeStateStats {
+    int nMisbehavior;
+    int nSyncHeight;
+    int nCommonHeight;
+    std::vector<int> vHeightInFlight;
+};
+
+/** Get statistics from node state */
+bool GetNodeStateStats(NodeId nodeid, CNodeStateStats &stats);
+/** Increase a node's misbehavior score. */
+void Misbehaving(NodeId nodeid, int howmuch);
+
+/** Process protocol messages received from a given node */
+bool ProcessMessages(CNode* pfrom, CConnman& connman);
+/**
+ * Send queued protocol messages to be sent to a give node.
+ *
+ * @param[in]   pto             The node which we are sending messages to.
+ * @param[in]   connman         The connection manager for that node.
+ */
+bool SendMessages(CNode* pto, CConnman& connman);
+
+#endif // BITCOIN_NET_PROCESSING_H
diff --git a/src/qt/clientmodel.cpp b/src/qt/clientmodel.cpp
index a4bb2f77fe024..09ea998471822 100644
--- a/src/qt/clientmodel.cpp
+++ b/src/qt/clientmodel.cpp
@@ -12,6 +12,7 @@
 #include "chainparams.h"
 #include "checkpoints.h"
 #include "clientversion.h"
+#include "main.h"
 #include "net.h"
 #include "txmempool.h"
 #include "ui_interface.h"
diff --git a/src/qt/peertablemodel.cpp b/src/qt/peertablemodel.cpp
index c0b4900285427..4f8affa6e61b6 100644
--- a/src/qt/peertablemodel.cpp
+++ b/src/qt/peertablemodel.cpp
@@ -8,6 +8,7 @@
 #include "guiconstants.h"
 #include "guiutil.h"
 
+#include "main.h" // for cs_main
 #include "sync.h"
 
 #include <QDebug>
diff --git a/src/qt/peertablemodel.h b/src/qt/peertablemodel.h
index af34b147b1eb8..3e4f0a68c460d 100644
--- a/src/qt/peertablemodel.h
+++ b/src/qt/peertablemodel.h
@@ -5,7 +5,7 @@
 #ifndef BITCOIN_QT_PEERTABLEMODEL_H
 #define BITCOIN_QT_PEERTABLEMODEL_H
 
-#include "main.h" // For CNodeStateStats
+#include "net_processing.h" // For CNodeStateStats
 #include "net.h"
 
 #include <QAbstractTableModel>
diff --git a/src/qt/walletmodel.cpp b/src/qt/walletmodel.cpp
index 3490d1c1ccd1a..c3de61297c54a 100644
--- a/src/qt/walletmodel.cpp
+++ b/src/qt/walletmodel.cpp
@@ -15,8 +15,10 @@
 #include "base58.h"
 #include "keystore.h"
 #include "main.h"
+#include "net.h" // for g_connman
 #include "sync.h"
 #include "ui_interface.h"
+#include "util.h" // for GetBoolArg
 #include "wallet/wallet.h"
 #include "wallet/walletdb.h" // for BackupWallet
 
diff --git a/src/rpc/net.cpp b/src/rpc/net.cpp
index f57ba76d3a865..43f5470431604 100644
--- a/src/rpc/net.cpp
+++ b/src/rpc/net.cpp
@@ -8,6 +8,7 @@
 #include "clientversion.h"
 #include "main.h"
 #include "net.h"
+#include "net_processing.h"
 #include "netbase.h"
 #include "protocol.h"
 #include "sync.h"
diff --git a/src/test/DoS_tests.cpp b/src/test/DoS_tests.cpp
index 6eed63608084f..1a818a5756989 100644
--- a/src/test/DoS_tests.cpp
+++ b/src/test/DoS_tests.cpp
@@ -6,8 +6,8 @@
 
 #include "chainparams.h"
 #include "keystore.h"
-#include "main.h"
 #include "net.h"
+#include "net_processing.h"
 #include "pow.h"
 #include "script/sign.h"
 #include "serialize.h"
diff --git a/src/test/main_tests.cpp b/src/test/main_tests.cpp
index dbfbdd934f827..1942fefce719b 100644
--- a/src/test/main_tests.cpp
+++ b/src/test/main_tests.cpp
@@ -4,6 +4,7 @@
 
 #include "chainparams.h"
 #include "main.h"
+#include "net.h"
 
 #include "test/test_bitcoin.h"
 
diff --git a/src/test/test_bitcoin.cpp b/src/test/test_bitcoin.cpp
index 6cbe314a76515..56c51b0b134d0 100644
--- a/src/test/test_bitcoin.cpp
+++ b/src/test/test_bitcoin.cpp
@@ -12,6 +12,7 @@
 #include "key.h"
 #include "main.h"
 #include "miner.h"
+#include "net_processing.h"
 #include "pubkey.h"
 #include "random.h"
 #include "txdb.h"
diff --git a/src/zmq/zmqpublishnotifier.cpp b/src/zmq/zmqpublishnotifier.cpp
index b6c907980f0c3..dba37b96cf2b5 100644
--- a/src/zmq/zmqpublishnotifier.cpp
+++ b/src/zmq/zmqpublishnotifier.cpp
@@ -3,6 +3,7 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include "chainparams.h"
+#include "streams.h"
 #include "zmqpublishnotifier.h"
 #include "main.h"
 #include "util.h"

From 76faa3cdfedbd3fc91be4ecfff77fc6dc18134fb Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Thu, 1 Dec 2016 16:06:41 -0800
Subject: [PATCH 1301/1802] Rename the remaining main.{h,cpp} to
 validation.{h,cpp}

---
 configure.ac                         | 2 +-
 src/Makefile.am                      | 4 ++--
 src/bench/Examples.cpp               | 2 +-
 src/bench/base58.cpp                 | 2 +-
 src/bench/bench_bitcoin.cpp          | 2 +-
 src/bench/checkblock.cpp             | 2 +-
 src/blockencodings.cpp               | 2 +-
 src/checkpoints.cpp                  | 2 +-
 src/init.cpp                         | 2 +-
 src/miner.cpp                        | 2 +-
 src/net_processing.cpp               | 2 +-
 src/policy/policy.cpp                | 2 +-
 src/qt/clientmodel.cpp               | 2 +-
 src/qt/coincontroldialog.cpp         | 2 +-
 src/qt/guiutil.cpp                   | 2 +-
 src/qt/optionsdialog.cpp             | 2 +-
 src/qt/optionsmodel.cpp              | 2 +-
 src/qt/paymentserver.cpp             | 2 +-
 src/qt/peertablemodel.cpp            | 2 +-
 src/qt/sendcoinsdialog.cpp           | 2 +-
 src/qt/signverifymessagedialog.cpp   | 2 +-
 src/qt/test/rpcnestedtests.cpp       | 2 +-
 src/qt/transactiondesc.cpp           | 2 +-
 src/qt/transactionrecord.cpp         | 2 +-
 src/qt/transactiontablemodel.cpp     | 2 +-
 src/qt/walletmodel.cpp               | 2 +-
 src/rest.cpp                         | 2 +-
 src/rpc/blockchain.cpp               | 2 +-
 src/rpc/mining.cpp                   | 2 +-
 src/rpc/misc.cpp                     | 2 +-
 src/rpc/net.cpp                      | 2 +-
 src/rpc/rawtransaction.cpp           | 2 +-
 src/test/coins_tests.cpp             | 2 +-
 src/test/main_tests.cpp              | 2 +-
 src/test/miner_tests.cpp             | 2 +-
 src/test/script_P2SH_tests.cpp       | 2 +-
 src/test/sighash_tests.cpp           | 2 +-
 src/test/sigopcount_tests.cpp        | 2 +-
 src/test/test_bitcoin.cpp            | 2 +-
 src/test/transaction_tests.cpp       | 2 +-
 src/test/txvalidationcache_tests.cpp | 2 +-
 src/test/versionbits_tests.cpp       | 2 +-
 src/txmempool.cpp                    | 2 +-
 src/{main.cpp => validation.cpp}     | 2 +-
 src/{main.h => validation.h}         | 6 +++---
 src/wallet/rpcdump.cpp               | 2 +-
 src/wallet/rpcwallet.cpp             | 2 +-
 src/wallet/wallet.cpp                | 2 +-
 src/wallet/walletdb.cpp              | 2 +-
 src/zmq/zmqnotificationinterface.cpp | 2 +-
 src/zmq/zmqpublishnotifier.cpp       | 2 +-
 51 files changed, 54 insertions(+), 54 deletions(-)
 rename src/{main.cpp => validation.cpp} (99%)
 rename src/{main.h => validation.h} (99%)

diff --git a/configure.ac b/configure.ac
index 319e1afe27e48..f668c03ac47cc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ define(_COPYRIGHT_YEAR, 2016)
 define(_COPYRIGHT_HOLDERS,[The %s developers])
 define(_COPYRIGHT_HOLDERS_SUBSTITUTION,[[Bitcoin Core]])
 AC_INIT([Bitcoin Core],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_REVISION],[https://github.com/bitcoin/bitcoin/issues],[bitcoin],[https://bitcoincore.org/])
-AC_CONFIG_SRCDIR([src/main.cpp])
+AC_CONFIG_SRCDIR([src/validation.cpp])
 AC_CONFIG_HEADERS([src/config/bitcoin-config.h])
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_MACRO_DIR([build-aux/m4])
diff --git a/src/Makefile.am b/src/Makefile.am
index 1df48305e741d..8c12aee217576 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -104,7 +104,6 @@ BITCOIN_CORE_H = \
   keystore.h \
   dbwrapper.h \
   limitedmap.h \
-  main.h \
   memusage.h \
   merkleblock.h \
   miner.h \
@@ -146,6 +145,7 @@ BITCOIN_CORE_H = \
   util.h \
   utilmoneystr.h \
   utiltime.h \
+  validation.h \
   validationinterface.h \
   versionbits.h \
   wallet/coincontrol.h \
@@ -180,7 +180,6 @@ libbitcoin_server_a_SOURCES = \
   httpserver.cpp \
   init.cpp \
   dbwrapper.cpp \
-  main.cpp \
   merkleblock.cpp \
   miner.cpp \
   net.cpp \
@@ -203,6 +202,7 @@ libbitcoin_server_a_SOURCES = \
   txdb.cpp \
   txmempool.cpp \
   ui_interface.cpp \
+  validation.cpp \
   validationinterface.cpp \
   versionbits.cpp \
   $(BITCOIN_CORE_H)
diff --git a/src/bench/Examples.cpp b/src/bench/Examples.cpp
index b6b020a97189d..9f35a1ea04b1c 100644
--- a/src/bench/Examples.cpp
+++ b/src/bench/Examples.cpp
@@ -3,7 +3,7 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include "bench.h"
-#include "main.h"
+#include "validation.h"
 #include "utiltime.h"
 
 // Sanity test: this should loop ten times, and
diff --git a/src/bench/base58.cpp b/src/bench/base58.cpp
index a791b5b7faa7f..3319c179bf549 100644
--- a/src/bench/base58.cpp
+++ b/src/bench/base58.cpp
@@ -4,7 +4,7 @@
 
 #include "bench.h"
 
-#include "main.h"
+#include "validation.h"
 #include "base58.h"
 
 #include <vector>
diff --git a/src/bench/bench_bitcoin.cpp b/src/bench/bench_bitcoin.cpp
index db1402216d823..bd768180c6d86 100644
--- a/src/bench/bench_bitcoin.cpp
+++ b/src/bench/bench_bitcoin.cpp
@@ -5,7 +5,7 @@
 #include "bench.h"
 
 #include "key.h"
-#include "main.h"
+#include "validation.h"
 #include "util.h"
 
 int
diff --git a/src/bench/checkblock.cpp b/src/bench/checkblock.cpp
index 5243682f88b7e..230e4ca773aed 100644
--- a/src/bench/checkblock.cpp
+++ b/src/bench/checkblock.cpp
@@ -5,7 +5,7 @@
 #include "bench.h"
 
 #include "chainparams.h"
-#include "main.h"
+#include "validation.h"
 #include "streams.h"
 #include "consensus/validation.h"
 
diff --git a/src/blockencodings.cpp b/src/blockencodings.cpp
index 2efeda9cc6d22..914af0c670f3e 100644
--- a/src/blockencodings.cpp
+++ b/src/blockencodings.cpp
@@ -10,7 +10,7 @@
 #include "random.h"
 #include "streams.h"
 #include "txmempool.h"
-#include "main.h"
+#include "validation.h"
 #include "util.h"
 
 #include <unordered_map>
diff --git a/src/checkpoints.cpp b/src/checkpoints.cpp
index d22c188c16e00..a487fb1dc4678 100644
--- a/src/checkpoints.cpp
+++ b/src/checkpoints.cpp
@@ -6,7 +6,7 @@
 
 #include "chain.h"
 #include "chainparams.h"
-#include "main.h"
+#include "validation.h"
 #include "uint256.h"
 
 #include <stdint.h>
diff --git a/src/init.cpp b/src/init.cpp
index e27e827ed7bce..bbcc41c55503f 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -19,7 +19,7 @@
 #include "httpserver.h"
 #include "httprpc.h"
 #include "key.h"
-#include "main.h"
+#include "validation.h"
 #include "miner.h"
 #include "netbase.h"
 #include "net.h"
diff --git a/src/miner.cpp b/src/miner.cpp
index c40b12cd8ec11..e80e8a2656c70 100644
--- a/src/miner.cpp
+++ b/src/miner.cpp
@@ -13,7 +13,7 @@
 #include "consensus/merkle.h"
 #include "consensus/validation.h"
 #include "hash.h"
-#include "main.h"
+#include "validation.h"
 #include "net.h"
 #include "policy/policy.h"
 #include "pow.h"
diff --git a/src/net_processing.cpp b/src/net_processing.cpp
index 78c864e96ff87..747167264b772 100644
--- a/src/net_processing.cpp
+++ b/src/net_processing.cpp
@@ -12,7 +12,7 @@
 #include "consensus/validation.h"
 #include "hash.h"
 #include "init.h"
-#include "main.h"
+#include "validation.h"
 #include "merkleblock.h"
 #include "net.h"
 #include "netmessagemaker.h"
diff --git a/src/policy/policy.cpp b/src/policy/policy.cpp
index 3ad1ff7baed49..0c71a079fb0c9 100644
--- a/src/policy/policy.cpp
+++ b/src/policy/policy.cpp
@@ -7,7 +7,7 @@
 
 #include "policy/policy.h"
 
-#include "main.h"
+#include "validation.h"
 #include "tinyformat.h"
 #include "util.h"
 #include "utilstrencodings.h"
diff --git a/src/qt/clientmodel.cpp b/src/qt/clientmodel.cpp
index 09ea998471822..e63a9cc7b8b10 100644
--- a/src/qt/clientmodel.cpp
+++ b/src/qt/clientmodel.cpp
@@ -12,7 +12,7 @@
 #include "chainparams.h"
 #include "checkpoints.h"
 #include "clientversion.h"
-#include "main.h"
+#include "validation.h"
 #include "net.h"
 #include "txmempool.h"
 #include "ui_interface.h"
diff --git a/src/qt/coincontroldialog.cpp b/src/qt/coincontroldialog.cpp
index d77db39b3cda9..704e2e2569ae6 100644
--- a/src/qt/coincontroldialog.cpp
+++ b/src/qt/coincontroldialog.cpp
@@ -15,7 +15,7 @@
 
 #include "wallet/coincontrol.h"
 #include "init.h"
-#include "main.h" // For minRelayTxFee
+#include "validation.h" // For minRelayTxFee
 #include "wallet/wallet.h"
 
 #include <boost/assign/list_of.hpp> // for 'map_list_of()'
diff --git a/src/qt/guiutil.cpp b/src/qt/guiutil.cpp
index 130cfc6e7d9a9..23f80ebb86ece 100644
--- a/src/qt/guiutil.cpp
+++ b/src/qt/guiutil.cpp
@@ -11,7 +11,7 @@
 
 #include "primitives/transaction.h"
 #include "init.h"
-#include "main.h" // For minRelayTxFee
+#include "validation.h" // For minRelayTxFee
 #include "protocol.h"
 #include "script/script.h"
 #include "script/standard.h"
diff --git a/src/qt/optionsdialog.cpp b/src/qt/optionsdialog.cpp
index 588059d0c577a..2d5e9ff686dcb 100644
--- a/src/qt/optionsdialog.cpp
+++ b/src/qt/optionsdialog.cpp
@@ -13,7 +13,7 @@
 #include "guiutil.h"
 #include "optionsmodel.h"
 
-#include "main.h" // for DEFAULT_SCRIPTCHECK_THREADS and MAX_SCRIPTCHECK_THREADS
+#include "validation.h" // for DEFAULT_SCRIPTCHECK_THREADS and MAX_SCRIPTCHECK_THREADS
 #include "netbase.h"
 #include "txdb.h" // for -dbcache defaults
 
diff --git a/src/qt/optionsmodel.cpp b/src/qt/optionsmodel.cpp
index f82e153b677f9..d48c4d91e78b7 100644
--- a/src/qt/optionsmodel.cpp
+++ b/src/qt/optionsmodel.cpp
@@ -13,7 +13,7 @@
 
 #include "amount.h"
 #include "init.h"
-#include "main.h" // For DEFAULT_SCRIPTCHECK_THREADS
+#include "validation.h" // For DEFAULT_SCRIPTCHECK_THREADS
 #include "net.h"
 #include "netbase.h"
 #include "txdb.h" // for -dbcache defaults
diff --git a/src/qt/paymentserver.cpp b/src/qt/paymentserver.cpp
index 229752cad2206..d5f0156d6cc73 100644
--- a/src/qt/paymentserver.cpp
+++ b/src/qt/paymentserver.cpp
@@ -10,7 +10,7 @@
 
 #include "base58.h"
 #include "chainparams.h"
-#include "main.h" // For minRelayTxFee
+#include "validation.h" // For minRelayTxFee
 #include "ui_interface.h"
 #include "util.h"
 #include "wallet/wallet.h"
diff --git a/src/qt/peertablemodel.cpp b/src/qt/peertablemodel.cpp
index 4f8affa6e61b6..dd4bd5539640d 100644
--- a/src/qt/peertablemodel.cpp
+++ b/src/qt/peertablemodel.cpp
@@ -8,7 +8,7 @@
 #include "guiconstants.h"
 #include "guiutil.h"
 
-#include "main.h" // for cs_main
+#include "validation.h" // for cs_main
 #include "sync.h"
 
 #include <QDebug>
diff --git a/src/qt/sendcoinsdialog.cpp b/src/qt/sendcoinsdialog.cpp
index 57b21794356ea..e94875d688413 100644
--- a/src/qt/sendcoinsdialog.cpp
+++ b/src/qt/sendcoinsdialog.cpp
@@ -17,7 +17,7 @@
 
 #include "base58.h"
 #include "wallet/coincontrol.h"
-#include "main.h" // mempool and minRelayTxFee
+#include "validation.h" // mempool and minRelayTxFee
 #include "ui_interface.h"
 #include "txmempool.h"
 #include "wallet/wallet.h"
diff --git a/src/qt/signverifymessagedialog.cpp b/src/qt/signverifymessagedialog.cpp
index 3e42f3a7b0a87..e28a6b47af570 100644
--- a/src/qt/signverifymessagedialog.cpp
+++ b/src/qt/signverifymessagedialog.cpp
@@ -12,7 +12,7 @@
 
 #include "base58.h"
 #include "init.h"
-#include "main.h" // For strMessageMagic
+#include "validation.h" // For strMessageMagic
 #include "wallet/wallet.h"
 
 #include <string>
diff --git a/src/qt/test/rpcnestedtests.cpp b/src/qt/test/rpcnestedtests.cpp
index 3dae33bafbbbf..69757f9a931ff 100644
--- a/src/qt/test/rpcnestedtests.cpp
+++ b/src/qt/test/rpcnestedtests.cpp
@@ -6,7 +6,7 @@
 
 #include "chainparams.h"
 #include "consensus/validation.h"
-#include "main.h"
+#include "validation.h"
 #include "rpc/register.h"
 #include "rpc/server.h"
 #include "rpcconsole.h"
diff --git a/src/qt/transactiondesc.cpp b/src/qt/transactiondesc.cpp
index 65144e7865c5d..01f6ab867ffea 100644
--- a/src/qt/transactiondesc.cpp
+++ b/src/qt/transactiondesc.cpp
@@ -11,7 +11,7 @@
 
 #include "base58.h"
 #include "consensus/consensus.h"
-#include "main.h"
+#include "validation.h"
 #include "script/script.h"
 #include "timedata.h"
 #include "util.h"
diff --git a/src/qt/transactionrecord.cpp b/src/qt/transactionrecord.cpp
index 4fe47181f626e..7d7bce7be2de4 100644
--- a/src/qt/transactionrecord.cpp
+++ b/src/qt/transactionrecord.cpp
@@ -6,7 +6,7 @@
 
 #include "base58.h"
 #include "consensus/consensus.h"
-#include "main.h"
+#include "validation.h"
 #include "timedata.h"
 #include "wallet/wallet.h"
 
diff --git a/src/qt/transactiontablemodel.cpp b/src/qt/transactiontablemodel.cpp
index 52261ff04b34b..da0742aa6a314 100644
--- a/src/qt/transactiontablemodel.cpp
+++ b/src/qt/transactiontablemodel.cpp
@@ -14,7 +14,7 @@
 #include "walletmodel.h"
 
 #include "core_io.h"
-#include "main.h"
+#include "validation.h"
 #include "sync.h"
 #include "uint256.h"
 #include "util.h"
diff --git a/src/qt/walletmodel.cpp b/src/qt/walletmodel.cpp
index c3de61297c54a..ab6c4b92747c0 100644
--- a/src/qt/walletmodel.cpp
+++ b/src/qt/walletmodel.cpp
@@ -14,7 +14,7 @@
 
 #include "base58.h"
 #include "keystore.h"
-#include "main.h"
+#include "validation.h"
 #include "net.h" // for g_connman
 #include "sync.h"
 #include "ui_interface.h"
diff --git a/src/rest.cpp b/src/rest.cpp
index 90cca6f48055d..7d7a7d3225747 100644
--- a/src/rest.cpp
+++ b/src/rest.cpp
@@ -7,7 +7,7 @@
 #include "chainparams.h"
 #include "primitives/block.h"
 #include "primitives/transaction.h"
-#include "main.h"
+#include "validation.h"
 #include "httpserver.h"
 #include "rpc/server.h"
 #include "streams.h"
diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp
index 733d14d24e2ab..b9b68fc10f06f 100644
--- a/src/rpc/blockchain.cpp
+++ b/src/rpc/blockchain.cpp
@@ -9,7 +9,7 @@
 #include "checkpoints.h"
 #include "coins.h"
 #include "consensus/validation.h"
-#include "main.h"
+#include "validation.h"
 #include "policy/policy.h"
 #include "primitives/transaction.h"
 #include "rpc/server.h"
diff --git a/src/rpc/mining.cpp b/src/rpc/mining.cpp
index f3cd1fbf0b9b9..15d14738a839b 100644
--- a/src/rpc/mining.cpp
+++ b/src/rpc/mining.cpp
@@ -12,7 +12,7 @@
 #include "consensus/validation.h"
 #include "core_io.h"
 #include "init.h"
-#include "main.h"
+#include "validation.h"
 #include "miner.h"
 #include "net.h"
 #include "pow.h"
diff --git a/src/rpc/misc.cpp b/src/rpc/misc.cpp
index 31939858038fc..2aaee7f3f5326 100644
--- a/src/rpc/misc.cpp
+++ b/src/rpc/misc.cpp
@@ -6,7 +6,7 @@
 #include "base58.h"
 #include "clientversion.h"
 #include "init.h"
-#include "main.h"
+#include "validation.h"
 #include "net.h"
 #include "netbase.h"
 #include "rpc/server.h"
diff --git a/src/rpc/net.cpp b/src/rpc/net.cpp
index 43f5470431604..53c0f993dc28c 100644
--- a/src/rpc/net.cpp
+++ b/src/rpc/net.cpp
@@ -6,7 +6,7 @@
 
 #include "chainparams.h"
 #include "clientversion.h"
-#include "main.h"
+#include "validation.h"
 #include "net.h"
 #include "net_processing.h"
 #include "netbase.h"
diff --git a/src/rpc/rawtransaction.cpp b/src/rpc/rawtransaction.cpp
index 370c021ea6e81..ce16870d3c549 100644
--- a/src/rpc/rawtransaction.cpp
+++ b/src/rpc/rawtransaction.cpp
@@ -10,7 +10,7 @@
 #include "core_io.h"
 #include "init.h"
 #include "keystore.h"
-#include "main.h"
+#include "validation.h"
 #include "merkleblock.h"
 #include "net.h"
 #include "policy/policy.h"
diff --git a/src/test/coins_tests.cpp b/src/test/coins_tests.cpp
index 82de302053d41..79dea00e46edb 100644
--- a/src/test/coins_tests.cpp
+++ b/src/test/coins_tests.cpp
@@ -8,7 +8,7 @@
 #include "utilstrencodings.h"
 #include "test/test_bitcoin.h"
 #include "test/test_random.h"
-#include "main.h"
+#include "validation.h"
 #include "consensus/validation.h"
 
 #include <vector>
diff --git a/src/test/main_tests.cpp b/src/test/main_tests.cpp
index 1942fefce719b..697fbf792c689 100644
--- a/src/test/main_tests.cpp
+++ b/src/test/main_tests.cpp
@@ -3,7 +3,7 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include "chainparams.h"
-#include "main.h"
+#include "validation.h"
 #include "net.h"
 
 #include "test/test_bitcoin.h"
diff --git a/src/test/miner_tests.cpp b/src/test/miner_tests.cpp
index 85a2e907c2d07..ca703841db63c 100644
--- a/src/test/miner_tests.cpp
+++ b/src/test/miner_tests.cpp
@@ -7,7 +7,7 @@
 #include "consensus/consensus.h"
 #include "consensus/merkle.h"
 #include "consensus/validation.h"
-#include "main.h"
+#include "validation.h"
 #include "miner.h"
 #include "pubkey.h"
 #include "script/standard.h"
diff --git a/src/test/script_P2SH_tests.cpp b/src/test/script_P2SH_tests.cpp
index 1a01593a8e163..789cc70d7f363 100644
--- a/src/test/script_P2SH_tests.cpp
+++ b/src/test/script_P2SH_tests.cpp
@@ -5,7 +5,7 @@
 #include "core_io.h"
 #include "key.h"
 #include "keystore.h"
-#include "main.h"
+#include "validation.h"
 #include "policy/policy.h"
 #include "script/script.h"
 #include "script/script_error.h"
diff --git a/src/test/sighash_tests.cpp b/src/test/sighash_tests.cpp
index 3bc8341b024e7..38d58e7ab0181 100644
--- a/src/test/sighash_tests.cpp
+++ b/src/test/sighash_tests.cpp
@@ -5,7 +5,7 @@
 #include "consensus/validation.h"
 #include "data/sighash.json.h"
 #include "hash.h"
-#include "main.h" // For CheckTransaction
+#include "validation.h" // For CheckTransaction
 #include "script/interpreter.h"
 #include "script/script.h"
 #include "serialize.h"
diff --git a/src/test/sigopcount_tests.cpp b/src/test/sigopcount_tests.cpp
index e8a63ae60ca81..2e974cc612e2d 100644
--- a/src/test/sigopcount_tests.cpp
+++ b/src/test/sigopcount_tests.cpp
@@ -2,7 +2,7 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include "main.h"
+#include "validation.h"
 #include "pubkey.h"
 #include "key.h"
 #include "script/script.h"
diff --git a/src/test/test_bitcoin.cpp b/src/test/test_bitcoin.cpp
index 56c51b0b134d0..f979d01a37eab 100644
--- a/src/test/test_bitcoin.cpp
+++ b/src/test/test_bitcoin.cpp
@@ -10,7 +10,7 @@
 #include "consensus/consensus.h"
 #include "consensus/validation.h"
 #include "key.h"
-#include "main.h"
+#include "validation.h"
 #include "miner.h"
 #include "net_processing.h"
 #include "pubkey.h"
diff --git a/src/test/transaction_tests.cpp b/src/test/transaction_tests.cpp
index 34d9547f3dc60..7b4763669a871 100644
--- a/src/test/transaction_tests.cpp
+++ b/src/test/transaction_tests.cpp
@@ -12,7 +12,7 @@
 #include "core_io.h"
 #include "key.h"
 #include "keystore.h"
-#include "main.h" // For CheckTransaction
+#include "validation.h" // For CheckTransaction
 #include "policy/policy.h"
 #include "script/script.h"
 #include "script/sign.h"
diff --git a/src/test/txvalidationcache_tests.cpp b/src/test/txvalidationcache_tests.cpp
index 76e4e7a4be865..55b4d28fb24b0 100644
--- a/src/test/txvalidationcache_tests.cpp
+++ b/src/test/txvalidationcache_tests.cpp
@@ -4,7 +4,7 @@
 
 #include "consensus/validation.h"
 #include "key.h"
-#include "main.h"
+#include "validation.h"
 #include "miner.h"
 #include "pubkey.h"
 #include "txmempool.h"
diff --git a/src/test/versionbits_tests.cpp b/src/test/versionbits_tests.cpp
index c05d593ed6971..bae0eff7e55c7 100644
--- a/src/test/versionbits_tests.cpp
+++ b/src/test/versionbits_tests.cpp
@@ -7,7 +7,7 @@
 #include "test/test_bitcoin.h"
 #include "test/test_random.h"
 #include "chainparams.h"
-#include "main.h"
+#include "validation.h"
 #include "consensus/params.h"
 
 #include <boost/test/unit_test.hpp>
diff --git a/src/txmempool.cpp b/src/txmempool.cpp
index 417a88cbef013..c035a84db5bb6 100644
--- a/src/txmempool.cpp
+++ b/src/txmempool.cpp
@@ -8,7 +8,7 @@
 #include "clientversion.h"
 #include "consensus/consensus.h"
 #include "consensus/validation.h"
-#include "main.h"
+#include "validation.h"
 #include "policy/policy.h"
 #include "policy/fees.h"
 #include "streams.h"
diff --git a/src/main.cpp b/src/validation.cpp
similarity index 99%
rename from src/main.cpp
rename to src/validation.cpp
index ec5b8f09dab3f..9cfb5221a62d8 100644
--- a/src/main.cpp
+++ b/src/validation.cpp
@@ -3,7 +3,7 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include "main.h"
+#include "validation.h"
 
 #include "arith_uint256.h"
 #include "chainparams.h"
diff --git a/src/main.h b/src/validation.h
similarity index 99%
rename from src/main.h
rename to src/validation.h
index e5e1a68414181..a798cf37022e8 100644
--- a/src/main.h
+++ b/src/validation.h
@@ -3,8 +3,8 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#ifndef BITCOIN_MAIN_H
-#define BITCOIN_MAIN_H
+#ifndef BITCOIN_VALIDATION_H
+#define BITCOIN_VALIDATION_H
 
 #if defined(HAVE_CONFIG_H)
 #include "config/bitcoin-config.h"
@@ -562,4 +562,4 @@ void DumpMempool();
 /** Load the mempool from disk. */
 bool LoadMempool();
 
-#endif // BITCOIN_MAIN_H
+#endif // BITCOIN_VALIDATION_H
diff --git a/src/wallet/rpcdump.cpp b/src/wallet/rpcdump.cpp
index bb5337c4adb3a..671b391c78bf2 100644
--- a/src/wallet/rpcdump.cpp
+++ b/src/wallet/rpcdump.cpp
@@ -6,7 +6,7 @@
 #include "chain.h"
 #include "rpc/server.h"
 #include "init.h"
-#include "main.h"
+#include "validation.h"
 #include "script/script.h"
 #include "script/standard.h"
 #include "sync.h"
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index 5a22e0278da5a..d0c13c41d1088 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -9,7 +9,7 @@
 #include "consensus/validation.h"
 #include "core_io.h"
 #include "init.h"
-#include "main.h"
+#include "validation.h"
 #include "net.h"
 #include "policy/rbf.h"
 #include "rpc/server.h"
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index 39c4fc3f1bbcb..102c191d6ad10 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -13,7 +13,7 @@
 #include "consensus/validation.h"
 #include "key.h"
 #include "keystore.h"
-#include "main.h"
+#include "validation.h"
 #include "net.h"
 #include "policy/policy.h"
 #include "primitives/block.h"
diff --git a/src/wallet/walletdb.cpp b/src/wallet/walletdb.cpp
index 43fd6a20adc81..0395e4a072ed5 100644
--- a/src/wallet/walletdb.cpp
+++ b/src/wallet/walletdb.cpp
@@ -7,7 +7,7 @@
 
 #include "base58.h"
 #include "consensus/validation.h"
-#include "main.h" // For CheckTransaction
+#include "validation.h" // For CheckTransaction
 #include "protocol.h"
 #include "serialize.h"
 #include "sync.h"
diff --git a/src/zmq/zmqnotificationinterface.cpp b/src/zmq/zmqnotificationinterface.cpp
index a0196fe18418c..a7e20a8356192 100644
--- a/src/zmq/zmqnotificationinterface.cpp
+++ b/src/zmq/zmqnotificationinterface.cpp
@@ -6,7 +6,7 @@
 #include "zmqpublishnotifier.h"
 
 #include "version.h"
-#include "main.h"
+#include "validation.h"
 #include "streams.h"
 #include "util.h"
 
diff --git a/src/zmq/zmqpublishnotifier.cpp b/src/zmq/zmqpublishnotifier.cpp
index dba37b96cf2b5..99d42ab526f38 100644
--- a/src/zmq/zmqpublishnotifier.cpp
+++ b/src/zmq/zmqpublishnotifier.cpp
@@ -5,7 +5,7 @@
 #include "chainparams.h"
 #include "streams.h"
 #include "zmqpublishnotifier.h"
-#include "main.h"
+#include "validation.h"
 #include "util.h"
 
 static std::multimap<std::string, CZMQAbstractPublishNotifier*> mapPublishNotifiers;

From a1883536b455b889f1ebfca9e50d1e0ef28a7731 Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Fri, 11 Nov 2016 16:30:38 -0800
Subject: [PATCH 1302/1802] Switch GetTransaction to returning a
 CTransactionRef

---
 src/rest.cpp               | 4 ++--
 src/rpc/rawtransaction.cpp | 8 ++++----
 src/validation.cpp         | 8 ++++----
 src/validation.h           | 2 +-
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/rest.cpp b/src/rest.cpp
index 7d7a7d3225747..6379061f8f4bc 100644
--- a/src/rest.cpp
+++ b/src/rest.cpp
@@ -363,7 +363,7 @@ static bool rest_tx(HTTPRequest* req, const std::string& strURIPart)
     if (!ParseHashStr(hashStr, hash))
         return RESTERR(req, HTTP_BAD_REQUEST, "Invalid hash: " + hashStr);
 
-    CTransaction tx;
+    CTransactionRef tx;
     uint256 hashBlock = uint256();
     if (!GetTransaction(hash, tx, Params().GetConsensus(), hashBlock, true))
         return RESTERR(req, HTTP_NOT_FOUND, hashStr + " not found");
@@ -388,7 +388,7 @@ static bool rest_tx(HTTPRequest* req, const std::string& strURIPart)
 
     case RF_JSON: {
         UniValue objTx(UniValue::VOBJ);
-        TxToJSON(tx, hashBlock, objTx);
+        TxToJSON(*tx, hashBlock, objTx);
         string strJSON = objTx.write() + "\n";
         req->WriteHeader("Content-Type", "application/json");
         req->WriteReply(HTTP_OK, strJSON);
diff --git a/src/rpc/rawtransaction.cpp b/src/rpc/rawtransaction.cpp
index ce16870d3c549..673979886a9cb 100644
--- a/src/rpc/rawtransaction.cpp
+++ b/src/rpc/rawtransaction.cpp
@@ -218,19 +218,19 @@ UniValue getrawtransaction(const JSONRPCRequest& request)
         } 
     }
 
-    CTransaction tx;
+    CTransactionRef tx;
     uint256 hashBlock;
     if (!GetTransaction(hash, tx, Params().GetConsensus(), hashBlock, true))
         throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "No information available about transaction");
 
-    string strHex = EncodeHexTx(tx);
+    string strHex = EncodeHexTx(*tx);
 
     if (!fVerbose)
         return strHex;
 
     UniValue result(UniValue::VOBJ);
     result.push_back(Pair("hex", strHex));
-    TxToJSON(tx, hashBlock, result);
+    TxToJSON(*tx, hashBlock, result);
     return result;
 }
 
@@ -289,7 +289,7 @@ UniValue gettxoutproof(const JSONRPCRequest& request)
 
     if (pblockindex == NULL)
     {
-        CTransaction tx;
+        CTransactionRef tx;
         if (!GetTransaction(oneTxid, tx, Params().GetConsensus(), hashBlock, false) || hashBlock.IsNull())
             throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Transaction not yet in block");
         if (!mapBlockIndex.count(hashBlock))
diff --git a/src/validation.cpp b/src/validation.cpp
index 9cfb5221a62d8..fe34565131138 100644
--- a/src/validation.cpp
+++ b/src/validation.cpp
@@ -984,7 +984,7 @@ bool AcceptToMemoryPool(CTxMemPool& pool, CValidationState &state, const CTransa
 }
 
 /** Return transaction in txOut, and if it was found inside a block, its hash is placed in hashBlock */
-bool GetTransaction(const uint256 &hash, CTransaction &txOut, const Consensus::Params& consensusParams, uint256 &hashBlock, bool fAllowSlow)
+bool GetTransaction(const uint256 &hash, CTransactionRef &txOut, const Consensus::Params& consensusParams, uint256 &hashBlock, bool fAllowSlow)
 {
     CBlockIndex *pindexSlow = NULL;
 
@@ -993,7 +993,7 @@ bool GetTransaction(const uint256 &hash, CTransaction &txOut, const Consensus::P
     CTransactionRef ptx = mempool.get(hash);
     if (ptx)
     {
-        txOut = *ptx;
+        txOut = ptx;
         return true;
     }
 
@@ -1012,7 +1012,7 @@ bool GetTransaction(const uint256 &hash, CTransaction &txOut, const Consensus::P
                 return error("%s: Deserialize or I/O error - %s", __func__, e.what());
             }
             hashBlock = header.GetHash();
-            if (txOut.GetHash() != hash)
+            if (txOut->GetHash() != hash)
                 return error("%s: txid mismatch", __func__);
             return true;
         }
@@ -1035,7 +1035,7 @@ bool GetTransaction(const uint256 &hash, CTransaction &txOut, const Consensus::P
         if (ReadBlockFromDisk(block, pindexSlow, consensusParams)) {
             for (const auto& tx : block.vtx) {
                 if (tx->GetHash() == hash) {
-                    txOut = *tx;
+                    txOut = tx;
                     hashBlock = pindexSlow->GetBlockHash();
                     return true;
                 }
diff --git a/src/validation.h b/src/validation.h
index a798cf37022e8..f242c20ab9fcb 100644
--- a/src/validation.h
+++ b/src/validation.h
@@ -276,7 +276,7 @@ bool IsInitialBlockDownload();
  */
 std::string GetWarnings(const std::string& strFor);
 /** Retrieve a transaction (from memory pool, or from disk, if possible) */
-bool GetTransaction(const uint256 &hash, CTransaction &tx, const Consensus::Params& params, uint256 &hashBlock, bool fAllowSlow = false);
+bool GetTransaction(const uint256 &hash, CTransactionRef &tx, const Consensus::Params& params, uint256 &hashBlock, bool fAllowSlow = false);
 /** Find the best known block, and make it the tip of the block chain */
 bool ActivateBestChain(CValidationState& state, const CChainParams& chainparams, const CBlock* pblock = NULL);
 CAmount GetBlockSubsidy(int nHeight, const Consensus::Params& consensusParams);

From c3f5673a6304e3ea9fa56fff66b6ea1cb73cc98f Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Fri, 11 Nov 2016 16:54:51 -0800
Subject: [PATCH 1303/1802] Make CWalletTx store a CTransactionRef instead of
 inheriting

---
 src/bench/coin_selection.cpp         |   2 +-
 src/qt/coincontroldialog.cpp         |  16 ++--
 src/qt/transactiondesc.cpp           |  30 ++++----
 src/qt/transactionrecord.cpp         |  18 ++---
 src/qt/walletmodel.cpp               |  12 +--
 src/qt/walletmodeltransaction.cpp    |   4 +-
 src/wallet/rpcdump.cpp               |   2 +-
 src/wallet/rpcwallet.cpp             |  18 ++---
 src/wallet/test/accounting_tests.cpp |   4 +-
 src/wallet/test/wallet_tests.cpp     |   2 +-
 src/wallet/wallet.cpp                | 110 +++++++++++++--------------
 src/wallet/wallet.h                  |  33 ++++----
 12 files changed, 128 insertions(+), 123 deletions(-)

diff --git a/src/bench/coin_selection.cpp b/src/bench/coin_selection.cpp
index 7091ee3e11435..32690fe484be4 100644
--- a/src/bench/coin_selection.cpp
+++ b/src/bench/coin_selection.cpp
@@ -19,7 +19,7 @@ static void addCoin(const CAmount& nValue, const CWallet& wallet, vector<COutput
     tx.nLockTime = nextLockTime++; // so all transactions get different hashes
     tx.vout.resize(nInput + 1);
     tx.vout[nInput].nValue = nValue;
-    CWalletTx* wtx = new CWalletTx(&wallet, tx);
+    CWalletTx* wtx = new CWalletTx(&wallet, MakeTransactionRef(std::move(tx)));
 
     int nAge = 6 * 24;
     COutput output(wtx, nInput, nAge, true, true);
diff --git a/src/qt/coincontroldialog.cpp b/src/qt/coincontroldialog.cpp
index 704e2e2569ae6..4d34bf95e9d18 100644
--- a/src/qt/coincontroldialog.cpp
+++ b/src/qt/coincontroldialog.cpp
@@ -470,21 +470,21 @@ void CoinControlDialog::updateLabels(WalletModel *model, QDialog* dialog)
         nQuantity++;
 
         // Amount
-        nAmount += out.tx->vout[out.i].nValue;
+        nAmount += out.tx->tx->vout[out.i].nValue;
 
         // Priority
-        dPriorityInputs += (double)out.tx->vout[out.i].nValue * (out.nDepth+1);
+        dPriorityInputs += (double)out.tx->tx->vout[out.i].nValue * (out.nDepth+1);
 
         // Bytes
         CTxDestination address;
         int witnessversion = 0;
         std::vector<unsigned char> witnessprogram;
-        if (out.tx->vout[out.i].scriptPubKey.IsWitnessProgram(witnessversion, witnessprogram))
+        if (out.tx->tx->vout[out.i].scriptPubKey.IsWitnessProgram(witnessversion, witnessprogram))
         {
             nBytesInputs += (32 + 4 + 1 + (107 / WITNESS_SCALE_FACTOR) + 4);
             fWitness = true;
         }
-        else if(ExtractDestination(out.tx->vout[out.i].scriptPubKey, address))
+        else if(ExtractDestination(out.tx->tx->vout[out.i].scriptPubKey, address))
         {
             CPubKey pubkey;
             CKeyID *keyid = boost::get<CKeyID>(&address);
@@ -677,7 +677,7 @@ void CoinControlDialog::updateView()
         CAmount nSum = 0;
         int nChildren = 0;
         BOOST_FOREACH(const COutput& out, coins.second) {
-            nSum += out.tx->vout[out.i].nValue;
+            nSum += out.tx->tx->vout[out.i].nValue;
             nChildren++;
 
             CCoinControlWidgetItem *itemOutput;
@@ -689,7 +689,7 @@ void CoinControlDialog::updateView()
             // address
             CTxDestination outputAddress;
             QString sAddress = "";
-            if(ExtractDestination(out.tx->vout[out.i].scriptPubKey, outputAddress))
+            if(ExtractDestination(out.tx->tx->vout[out.i].scriptPubKey, outputAddress))
             {
                 sAddress = QString::fromStdString(CBitcoinAddress(outputAddress).ToString());
 
@@ -714,8 +714,8 @@ void CoinControlDialog::updateView()
             }
 
             // amount
-            itemOutput->setText(COLUMN_AMOUNT, BitcoinUnits::format(nDisplayUnit, out.tx->vout[out.i].nValue));
-            itemOutput->setData(COLUMN_AMOUNT, Qt::UserRole, QVariant((qlonglong)out.tx->vout[out.i].nValue)); // padding so that sorting works correctly
+            itemOutput->setText(COLUMN_AMOUNT, BitcoinUnits::format(nDisplayUnit, out.tx->tx->vout[out.i].nValue));
+            itemOutput->setData(COLUMN_AMOUNT, Qt::UserRole, QVariant((qlonglong)out.tx->tx->vout[out.i].nValue)); // padding so that sorting works correctly
 
             // date
             itemOutput->setText(COLUMN_DATE, GUIUtil::dateTimeStr(out.tx->GetTxTime()));
diff --git a/src/qt/transactiondesc.cpp b/src/qt/transactiondesc.cpp
index 01f6ab867ffea..e7d03a6119ea4 100644
--- a/src/qt/transactiondesc.cpp
+++ b/src/qt/transactiondesc.cpp
@@ -26,10 +26,10 @@ QString TransactionDesc::FormatTxStatus(const CWalletTx& wtx)
     AssertLockHeld(cs_main);
     if (!CheckFinalTx(wtx))
     {
-        if (wtx.nLockTime < LOCKTIME_THRESHOLD)
-            return tr("Open for %n more block(s)", "", wtx.nLockTime - chainActive.Height());
+        if (wtx.tx->nLockTime < LOCKTIME_THRESHOLD)
+            return tr("Open for %n more block(s)", "", wtx.tx->nLockTime - chainActive.Height());
         else
-            return tr("Open until %1").arg(GUIUtil::dateTimeStr(wtx.nLockTime));
+            return tr("Open until %1").arg(GUIUtil::dateTimeStr(wtx.tx->nLockTime));
     }
     else
     {
@@ -133,7 +133,7 @@ QString TransactionDesc::toHTML(CWallet *wallet, CWalletTx &wtx, TransactionReco
         // Coinbase
         //
         CAmount nUnmatured = 0;
-        BOOST_FOREACH(const CTxOut& txout, wtx.vout)
+        BOOST_FOREACH(const CTxOut& txout, wtx.tx->vout)
             nUnmatured += wallet->GetCredit(txout, ISMINE_ALL);
         strHTML += "<b>" + tr("Credit") + ":</b> ";
         if (wtx.IsInMainChain())
@@ -152,14 +152,14 @@ QString TransactionDesc::toHTML(CWallet *wallet, CWalletTx &wtx, TransactionReco
     else
     {
         isminetype fAllFromMe = ISMINE_SPENDABLE;
-        BOOST_FOREACH(const CTxIn& txin, wtx.vin)
+        BOOST_FOREACH(const CTxIn& txin, wtx.tx->vin)
         {
             isminetype mine = wallet->IsMine(txin);
             if(fAllFromMe > mine) fAllFromMe = mine;
         }
 
         isminetype fAllToMe = ISMINE_SPENDABLE;
-        BOOST_FOREACH(const CTxOut& txout, wtx.vout)
+        BOOST_FOREACH(const CTxOut& txout, wtx.tx->vout)
         {
             isminetype mine = wallet->IsMine(txout);
             if(fAllToMe > mine) fAllToMe = mine;
@@ -173,7 +173,7 @@ QString TransactionDesc::toHTML(CWallet *wallet, CWalletTx &wtx, TransactionReco
             //
             // Debit
             //
-            BOOST_FOREACH(const CTxOut& txout, wtx.vout)
+            BOOST_FOREACH(const CTxOut& txout, wtx.tx->vout)
             {
                 // Ignore change
                 isminetype toSelf = wallet->IsMine(txout);
@@ -212,7 +212,7 @@ QString TransactionDesc::toHTML(CWallet *wallet, CWalletTx &wtx, TransactionReco
                 strHTML += "<b>" + tr("Total credit") + ":</b> " + BitcoinUnits::formatHtmlWithUnit(unit, nValue) + "<br>";
             }
 
-            CAmount nTxFee = nDebit - wtx.GetValueOut();
+            CAmount nTxFee = nDebit - wtx.tx->GetValueOut();
             if (nTxFee > 0)
                 strHTML += "<b>" + tr("Transaction fee") + ":</b> " + BitcoinUnits::formatHtmlWithUnit(unit, -nTxFee) + "<br>";
         }
@@ -221,10 +221,10 @@ QString TransactionDesc::toHTML(CWallet *wallet, CWalletTx &wtx, TransactionReco
             //
             // Mixed debit transaction
             //
-            BOOST_FOREACH(const CTxIn& txin, wtx.vin)
+            BOOST_FOREACH(const CTxIn& txin, wtx.tx->vin)
                 if (wallet->IsMine(txin))
                     strHTML += "<b>" + tr("Debit") + ":</b> " + BitcoinUnits::formatHtmlWithUnit(unit, -wallet->GetDebit(txin, ISMINE_ALL)) + "<br>";
-            BOOST_FOREACH(const CTxOut& txout, wtx.vout)
+            BOOST_FOREACH(const CTxOut& txout, wtx.tx->vout)
                 if (wallet->IsMine(txout))
                     strHTML += "<b>" + tr("Credit") + ":</b> " + BitcoinUnits::formatHtmlWithUnit(unit, wallet->GetCredit(txout, ISMINE_ALL)) + "<br>";
         }
@@ -241,7 +241,7 @@ QString TransactionDesc::toHTML(CWallet *wallet, CWalletTx &wtx, TransactionReco
         strHTML += "<br><b>" + tr("Comment") + ":</b><br>" + GUIUtil::HtmlEscape(wtx.mapValue["comment"], true) + "<br>";
 
     strHTML += "<b>" + tr("Transaction ID") + ":</b> " + rec->getTxID() + "<br>";
-    strHTML += "<b>" + tr("Transaction total size") + ":</b> " + QString::number(wtx.GetTotalSize()) + " bytes<br>";
+    strHTML += "<b>" + tr("Transaction total size") + ":</b> " + QString::number(wtx.tx->GetTotalSize()) + " bytes<br>";
     strHTML += "<b>" + tr("Output index") + ":</b> " + QString::number(rec->getOutputIndex()) + "<br>";
 
     // Message from normal bitcoin:URI (bitcoin:123...?message=example)
@@ -276,20 +276,20 @@ QString TransactionDesc::toHTML(CWallet *wallet, CWalletTx &wtx, TransactionReco
     if (fDebug)
     {
         strHTML += "<hr><br>" + tr("Debug information") + "<br><br>";
-        BOOST_FOREACH(const CTxIn& txin, wtx.vin)
+        BOOST_FOREACH(const CTxIn& txin, wtx.tx->vin)
             if(wallet->IsMine(txin))
                 strHTML += "<b>" + tr("Debit") + ":</b> " + BitcoinUnits::formatHtmlWithUnit(unit, -wallet->GetDebit(txin, ISMINE_ALL)) + "<br>";
-        BOOST_FOREACH(const CTxOut& txout, wtx.vout)
+        BOOST_FOREACH(const CTxOut& txout, wtx.tx->vout)
             if(wallet->IsMine(txout))
                 strHTML += "<b>" + tr("Credit") + ":</b> " + BitcoinUnits::formatHtmlWithUnit(unit, wallet->GetCredit(txout, ISMINE_ALL)) + "<br>";
 
         strHTML += "<br><b>" + tr("Transaction") + ":</b><br>";
-        strHTML += GUIUtil::HtmlEscape(wtx.ToString(), true);
+        strHTML += GUIUtil::HtmlEscape(wtx.tx->ToString(), true);
 
         strHTML += "<br><b>" + tr("Inputs") + ":</b>";
         strHTML += "<ul>";
 
-        BOOST_FOREACH(const CTxIn& txin, wtx.vin)
+        BOOST_FOREACH(const CTxIn& txin, wtx.tx->vin)
         {
             COutPoint prevout = txin.prevout;
 
diff --git a/src/qt/transactionrecord.cpp b/src/qt/transactionrecord.cpp
index 7d7bce7be2de4..a1d14223176cb 100644
--- a/src/qt/transactionrecord.cpp
+++ b/src/qt/transactionrecord.cpp
@@ -47,7 +47,7 @@ QList<TransactionRecord> TransactionRecord::decomposeTransaction(const CWallet *
         //
         // Credit
         //
-        BOOST_FOREACH(const CTxOut& txout, wtx.vout)
+        BOOST_FOREACH(const CTxOut& txout, wtx.tx->vout)
         {
             isminetype mine = wallet->IsMine(txout);
             if(mine)
@@ -83,7 +83,7 @@ QList<TransactionRecord> TransactionRecord::decomposeTransaction(const CWallet *
     {
         bool involvesWatchAddress = false;
         isminetype fAllFromMe = ISMINE_SPENDABLE;
-        BOOST_FOREACH(const CTxIn& txin, wtx.vin)
+        BOOST_FOREACH(const CTxIn& txin, wtx.tx->vin)
         {
             isminetype mine = wallet->IsMine(txin);
             if(mine & ISMINE_WATCH_ONLY) involvesWatchAddress = true;
@@ -91,7 +91,7 @@ QList<TransactionRecord> TransactionRecord::decomposeTransaction(const CWallet *
         }
 
         isminetype fAllToMe = ISMINE_SPENDABLE;
-        BOOST_FOREACH(const CTxOut& txout, wtx.vout)
+        BOOST_FOREACH(const CTxOut& txout, wtx.tx->vout)
         {
             isminetype mine = wallet->IsMine(txout);
             if(mine & ISMINE_WATCH_ONLY) involvesWatchAddress = true;
@@ -112,11 +112,11 @@ QList<TransactionRecord> TransactionRecord::decomposeTransaction(const CWallet *
             //
             // Debit
             //
-            CAmount nTxFee = nDebit - wtx.GetValueOut();
+            CAmount nTxFee = nDebit - wtx.tx->GetValueOut();
 
-            for (unsigned int nOut = 0; nOut < wtx.vout.size(); nOut++)
+            for (unsigned int nOut = 0; nOut < wtx.tx->vout.size(); nOut++)
             {
-                const CTxOut& txout = wtx.vout[nOut];
+                const CTxOut& txout = wtx.tx->vout[nOut];
                 TransactionRecord sub(hash, nTime);
                 sub.idx = parts.size();
                 sub.involvesWatchAddress = involvesWatchAddress;
@@ -190,15 +190,15 @@ void TransactionRecord::updateStatus(const CWalletTx &wtx)
 
     if (!CheckFinalTx(wtx))
     {
-        if (wtx.nLockTime < LOCKTIME_THRESHOLD)
+        if (wtx.tx->nLockTime < LOCKTIME_THRESHOLD)
         {
             status.status = TransactionStatus::OpenUntilBlock;
-            status.open_for = wtx.nLockTime - chainActive.Height();
+            status.open_for = wtx.tx->nLockTime - chainActive.Height();
         }
         else
         {
             status.status = TransactionStatus::OpenUntilDate;
-            status.open_for = wtx.nLockTime;
+            status.open_for = wtx.tx->nLockTime;
         }
     }
     // For generated transactions, determine maturity
diff --git a/src/qt/walletmodel.cpp b/src/qt/walletmodel.cpp
index ab6c4b92747c0..a78fc90d2c56e 100644
--- a/src/qt/walletmodel.cpp
+++ b/src/qt/walletmodel.cpp
@@ -67,7 +67,7 @@ CAmount WalletModel::getBalance(const CCoinControl *coinControl) const
         wallet->AvailableCoins(vCoins, true, coinControl);
         BOOST_FOREACH(const COutput& out, vCoins)
             if(out.fSpendable)
-                nBalance += out.tx->vout[out.i].nValue;
+                nBalance += out.tx->tx->vout[out.i].nValue;
 
         return nBalance;
     }
@@ -609,7 +609,7 @@ void WalletModel::listCoins(std::map<QString, std::vector<COutput> >& mapCoins)
         int nDepth = wallet->mapWallet[outpoint.hash].GetDepthInMainChain();
         if (nDepth < 0) continue;
         COutput out(&wallet->mapWallet[outpoint.hash], outpoint.n, nDepth, true, true);
-        if (outpoint.n < out.tx->vout.size() && wallet->IsMine(out.tx->vout[outpoint.n]) == ISMINE_SPENDABLE)
+        if (outpoint.n < out.tx->tx->vout.size() && wallet->IsMine(out.tx->tx->vout[outpoint.n]) == ISMINE_SPENDABLE)
             vCoins.push_back(out);
     }
 
@@ -617,14 +617,14 @@ void WalletModel::listCoins(std::map<QString, std::vector<COutput> >& mapCoins)
     {
         COutput cout = out;
 
-        while (wallet->IsChange(cout.tx->vout[cout.i]) && cout.tx->vin.size() > 0 && wallet->IsMine(cout.tx->vin[0]))
+        while (wallet->IsChange(cout.tx->tx->vout[cout.i]) && cout.tx->tx->vin.size() > 0 && wallet->IsMine(cout.tx->tx->vin[0]))
         {
-            if (!wallet->mapWallet.count(cout.tx->vin[0].prevout.hash)) break;
-            cout = COutput(&wallet->mapWallet[cout.tx->vin[0].prevout.hash], cout.tx->vin[0].prevout.n, 0, true, true);
+            if (!wallet->mapWallet.count(cout.tx->tx->vin[0].prevout.hash)) break;
+            cout = COutput(&wallet->mapWallet[cout.tx->tx->vin[0].prevout.hash], cout.tx->tx->vin[0].prevout.n, 0, true, true);
         }
 
         CTxDestination address;
-        if(!out.fSpendable || !ExtractDestination(cout.tx->vout[cout.i].scriptPubKey, address))
+        if(!out.fSpendable || !ExtractDestination(cout.tx->tx->vout[cout.i].scriptPubKey, address))
             continue;
         mapCoins[QString::fromStdString(CBitcoinAddress(address).ToString())].push_back(out);
     }
diff --git a/src/qt/walletmodeltransaction.cpp b/src/qt/walletmodeltransaction.cpp
index fdec6a1c863a0..f9a95bed4272e 100644
--- a/src/qt/walletmodeltransaction.cpp
+++ b/src/qt/walletmodeltransaction.cpp
@@ -64,7 +64,7 @@ void WalletModelTransaction::reassignAmounts(int nChangePosRet)
                 if (out.amount() <= 0) continue;
                 if (i == nChangePosRet)
                     i++;
-                subtotal += walletTransaction->vout[i].nValue;
+                subtotal += walletTransaction->tx->vout[i].nValue;
                 i++;
             }
             rcp.amount = subtotal;
@@ -73,7 +73,7 @@ void WalletModelTransaction::reassignAmounts(int nChangePosRet)
         {
             if (i == nChangePosRet)
                 i++;
-            rcp.amount = walletTransaction->vout[i].nValue;
+            rcp.amount = walletTransaction->tx->vout[i].nValue;
             i++;
         }
     }
diff --git a/src/wallet/rpcdump.cpp b/src/wallet/rpcdump.cpp
index 671b391c78bf2..28a905efa7c25 100644
--- a/src/wallet/rpcdump.cpp
+++ b/src/wallet/rpcdump.cpp
@@ -271,7 +271,7 @@ UniValue importprunedfunds(const JSONRPCRequest& request)
     if (!DecodeHexTx(tx, request.params[0].get_str()))
         throw JSONRPCError(RPC_DESERIALIZATION_ERROR, "TX decode failed");
     uint256 hashTx = tx.GetHash();
-    CWalletTx wtx(pwalletMain,tx);
+    CWalletTx wtx(pwalletMain, MakeTransactionRef(std::move(tx)));
 
     CDataStream ssMB(ParseHexV(request.params[1], "proof"), SER_NETWORK, PROTOCOL_VERSION);
     CMerkleBlock merkleBlock;
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index d0c13c41d1088..f31a28c4d233c 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -583,10 +583,10 @@ UniValue getreceivedbyaddress(const JSONRPCRequest& request)
     for (map<uint256, CWalletTx>::iterator it = pwalletMain->mapWallet.begin(); it != pwalletMain->mapWallet.end(); ++it)
     {
         const CWalletTx& wtx = (*it).second;
-        if (wtx.IsCoinBase() || !CheckFinalTx(wtx))
+        if (wtx.IsCoinBase() || !CheckFinalTx(*wtx.tx))
             continue;
 
-        BOOST_FOREACH(const CTxOut& txout, wtx.vout)
+        BOOST_FOREACH(const CTxOut& txout, wtx.tx->vout)
             if (txout.scriptPubKey == scriptPubKey)
                 if (wtx.GetDepthInMainChain() >= nMinDepth)
                     nAmount += txout.nValue;
@@ -637,10 +637,10 @@ UniValue getreceivedbyaccount(const JSONRPCRequest& request)
     for (map<uint256, CWalletTx>::iterator it = pwalletMain->mapWallet.begin(); it != pwalletMain->mapWallet.end(); ++it)
     {
         const CWalletTx& wtx = (*it).second;
-        if (wtx.IsCoinBase() || !CheckFinalTx(wtx))
+        if (wtx.IsCoinBase() || !CheckFinalTx(*wtx.tx))
             continue;
 
-        BOOST_FOREACH(const CTxOut& txout, wtx.vout)
+        BOOST_FOREACH(const CTxOut& txout, wtx.tx->vout)
         {
             CTxDestination address;
             if (ExtractDestination(txout.scriptPubKey, address) && IsMine(*pwalletMain, address) && setAddress.count(address))
@@ -1149,14 +1149,14 @@ UniValue ListReceived(const UniValue& params, bool fByAccounts)
     {
         const CWalletTx& wtx = (*it).second;
 
-        if (wtx.IsCoinBase() || !CheckFinalTx(wtx))
+        if (wtx.IsCoinBase() || !CheckFinalTx(*wtx.tx))
             continue;
 
         int nDepth = wtx.GetDepthInMainChain();
         if (nDepth < nMinDepth)
             continue;
 
-        BOOST_FOREACH(const CTxOut& txout, wtx.vout)
+        BOOST_FOREACH(const CTxOut& txout, wtx.tx->vout)
         {
             CTxDestination address;
             if (!ExtractDestination(txout.scriptPubKey, address))
@@ -1780,7 +1780,7 @@ UniValue gettransaction(const JSONRPCRequest& request)
     CAmount nCredit = wtx.GetCredit(filter);
     CAmount nDebit = wtx.GetDebit(filter);
     CAmount nNet = nCredit - nDebit;
-    CAmount nFee = (wtx.IsFromMe(filter) ? wtx.GetValueOut() - nDebit : 0);
+    CAmount nFee = (wtx.IsFromMe(filter) ? wtx.tx->GetValueOut() - nDebit : 0);
 
     entry.push_back(Pair("amount", ValueFromAmount(nNet - nFee)));
     if (wtx.IsFromMe(filter))
@@ -2420,7 +2420,7 @@ UniValue listunspent(const JSONRPCRequest& request)
             continue;
 
         CTxDestination address;
-        const CScript& scriptPubKey = out.tx->vout[out.i].scriptPubKey;
+        const CScript& scriptPubKey = out.tx->tx->vout[out.i].scriptPubKey;
         bool fValidAddress = ExtractDestination(scriptPubKey, address);
 
         if (setAddress.size() && (!fValidAddress || !setAddress.count(address)))
@@ -2445,7 +2445,7 @@ UniValue listunspent(const JSONRPCRequest& request)
         }
 
         entry.push_back(Pair("scriptPubKey", HexStr(scriptPubKey.begin(), scriptPubKey.end())));
-        entry.push_back(Pair("amount", ValueFromAmount(out.tx->vout[out.i].nValue)));
+        entry.push_back(Pair("amount", ValueFromAmount(out.tx->tx->vout[out.i].nValue)));
         entry.push_back(Pair("confirmations", out.nDepth));
         entry.push_back(Pair("spendable", out.fSpendable));
         entry.push_back(Pair("solvable", out.fSolvable));
diff --git a/src/wallet/test/accounting_tests.cpp b/src/wallet/test/accounting_tests.cpp
index a833be13d065a..eb14d176bd700 100644
--- a/src/wallet/test/accounting_tests.cpp
+++ b/src/wallet/test/accounting_tests.cpp
@@ -86,7 +86,7 @@ BOOST_AUTO_TEST_CASE(acc_orderupgrade)
     {
         CMutableTransaction tx(wtx);
         --tx.nLockTime;  // Just to change the hash :)
-        *static_cast<CTransaction*>(&wtx) = CTransaction(tx);
+        wtx.SetTx(MakeTransactionRef(std::move(tx)));
     }
     pwalletMain->AddToWallet(wtx);
     vpwtx.push_back(&pwalletMain->mapWallet[wtx.GetHash()]);
@@ -96,7 +96,7 @@ BOOST_AUTO_TEST_CASE(acc_orderupgrade)
     {
         CMutableTransaction tx(wtx);
         --tx.nLockTime;  // Just to change the hash :)
-        *static_cast<CTransaction*>(&wtx) = CTransaction(tx);
+        wtx.SetTx(MakeTransactionRef(std::move(tx)));
     }
     pwalletMain->AddToWallet(wtx);
     vpwtx.push_back(&pwalletMain->mapWallet[wtx.GetHash()]);
diff --git a/src/wallet/test/wallet_tests.cpp b/src/wallet/test/wallet_tests.cpp
index ecbbcb145da51..8085706a9958d 100644
--- a/src/wallet/test/wallet_tests.cpp
+++ b/src/wallet/test/wallet_tests.cpp
@@ -42,7 +42,7 @@ static void add_coin(const CAmount& nValue, int nAge = 6*24, bool fIsFromMe = fa
         // so stop vin being empty, and cache a non-zero Debit to fake out IsFromMe()
         tx.vin.resize(1);
     }
-    CWalletTx* wtx = new CWalletTx(&wallet, tx);
+    CWalletTx* wtx = new CWalletTx(&wallet, MakeTransactionRef(std::move(tx)));
     if (fIsFromMe)
     {
         wtx->fDebitCached = true;
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index 102c191d6ad10..638fca99177cb 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -75,7 +75,7 @@ struct CompareValueOnly
 
 std::string COutput::ToString() const
 {
-    return strprintf("COutput(%s, %d, %d) [%s]", tx->GetHash().ToString(), i, nDepth, FormatMoney(tx->vout[i].nValue));
+    return strprintf("COutput(%s, %d, %d) [%s]", tx->GetHash().ToString(), i, nDepth, FormatMoney(tx->tx->vout[i].nValue));
 }
 
 const CWalletTx* CWallet::GetWalletTx(const uint256& hash) const
@@ -400,7 +400,7 @@ set<uint256> CWallet::GetConflicts(const uint256& txid) const
 
     std::pair<TxSpends::const_iterator, TxSpends::const_iterator> range;
 
-    BOOST_FOREACH(const CTxIn& txin, wtx.vin)
+    BOOST_FOREACH(const CTxIn& txin, wtx.tx->vin)
     {
         if (mapTxSpends.count(txin.prevout) <= 1)
             continue;  // No conflict if zero or one spends
@@ -552,7 +552,7 @@ void CWallet::AddToSpends(const uint256& wtxid)
     if (thisTx.IsCoinBase()) // Coinbases don't spend anything!
         return;
 
-    BOOST_FOREACH(const CTxIn& txin, thisTx.vin)
+    BOOST_FOREACH(const CTxIn& txin, thisTx.tx->vin)
         AddToSpends(txin.prevout, wtxid);
 }
 
@@ -795,7 +795,7 @@ bool CWallet::GetAccountPubkey(CPubKey &pubKey, std::string strAccount, bool bFo
             for (map<uint256, CWalletTx>::iterator it = mapWallet.begin();
                  it != mapWallet.end() && account.vchPubKey.IsValid();
                  ++it)
-                BOOST_FOREACH(const CTxOut& txout, (*it).second.vout)
+                BOOST_FOREACH(const CTxOut& txout, (*it).second.tx->vout)
                     if (txout.scriptPubKey == scriptPubKey) {
                         bForceNew = true;
                         break;
@@ -954,7 +954,7 @@ bool CWallet::LoadToWallet(const CWalletTx& wtxIn)
     wtx.BindWallet(this);
     wtxOrdered.insert(make_pair(wtx.nOrderPos, TxPair(&wtx, (CAccountingEntry*)0)));
     AddToSpends(hash);
-    BOOST_FOREACH(const CTxIn& txin, wtx.vin) {
+    BOOST_FOREACH(const CTxIn& txin, wtx.tx->vin) {
         if (mapWallet.count(txin.prevout.hash)) {
             CWalletTx& prevtx = mapWallet[txin.prevout.hash];
             if (prevtx.nIndex == -1 && !prevtx.hashUnset()) {
@@ -993,7 +993,7 @@ bool CWallet::AddToWalletIfInvolvingMe(const CTransaction& tx, const CBlockIndex
         if (fExisted && !fUpdate) return false;
         if (fExisted || IsMine(tx) || IsFromMe(tx))
         {
-            CWalletTx wtx(this,tx);
+            CWalletTx wtx(this, MakeTransactionRef(tx));
 
             // Get merkle branch if transaction was found in a block
             if (posInBlock != -1)
@@ -1052,7 +1052,7 @@ bool CWallet::AbandonTransaction(const uint256& hashTx)
             }
             // If a transaction changes 'conflicted' state, that changes the balance
             // available of the outputs it spends. So force those to be recomputed
-            BOOST_FOREACH(const CTxIn& txin, wtx.vin)
+            BOOST_FOREACH(const CTxIn& txin, wtx.tx->vin)
             {
                 if (mapWallet.count(txin.prevout.hash))
                     mapWallet[txin.prevout.hash].MarkDirty();
@@ -1113,7 +1113,7 @@ void CWallet::MarkConflicted(const uint256& hashBlock, const uint256& hashTx)
             }
             // If a transaction changes 'conflicted' state, that changes the balance
             // available of the outputs it spends. So force those to be recomputed
-            BOOST_FOREACH(const CTxIn& txin, wtx.vin)
+            BOOST_FOREACH(const CTxIn& txin, wtx.tx->vin)
             {
                 if (mapWallet.count(txin.prevout.hash))
                     mapWallet[txin.prevout.hash].MarkDirty();
@@ -1148,8 +1148,8 @@ isminetype CWallet::IsMine(const CTxIn &txin) const
         if (mi != mapWallet.end())
         {
             const CWalletTx& prev = (*mi).second;
-            if (txin.prevout.n < prev.vout.size())
-                return IsMine(prev.vout[txin.prevout.n]);
+            if (txin.prevout.n < prev.tx->vout.size())
+                return IsMine(prev.tx->vout[txin.prevout.n]);
         }
     }
     return ISMINE_NO;
@@ -1163,9 +1163,9 @@ CAmount CWallet::GetDebit(const CTxIn &txin, const isminefilter& filter) const
         if (mi != mapWallet.end())
         {
             const CWalletTx& prev = (*mi).second;
-            if (txin.prevout.n < prev.vout.size())
-                if (IsMine(prev.vout[txin.prevout.n]) & filter)
-                    return prev.vout[txin.prevout.n].nValue;
+            if (txin.prevout.n < prev.tx->vout.size())
+                if (IsMine(prev.tx->vout[txin.prevout.n]) & filter)
+                    return prev.tx->vout[txin.prevout.n].nValue;
         }
     }
     return 0;
@@ -1380,14 +1380,14 @@ void CWalletTx::GetAmounts(list<COutputEntry>& listReceived,
     CAmount nDebit = GetDebit(filter);
     if (nDebit > 0) // debit>0 means we signed/sent this transaction
     {
-        CAmount nValueOut = GetValueOut();
+        CAmount nValueOut = tx->GetValueOut();
         nFee = nDebit - nValueOut;
     }
 
     // Sent/received.
-    for (unsigned int i = 0; i < vout.size(); ++i)
+    for (unsigned int i = 0; i < tx->vout.size(); ++i)
     {
-        const CTxOut& txout = vout[i];
+        const CTxOut& txout = tx->vout[i];
         isminetype fIsMine = pwallet->IsMine(txout);
         // Only need to handle txouts if AT LEAST one of these is true:
         //   1) they debit from us (sent)
@@ -1573,7 +1573,7 @@ set<uint256> CWalletTx::GetConflicts() const
 
 CAmount CWalletTx::GetDebit(const isminefilter& filter) const
 {
-    if (vin.empty())
+    if (tx->vin.empty())
         return 0;
 
     CAmount debit = 0;
@@ -1663,11 +1663,11 @@ CAmount CWalletTx::GetAvailableCredit(bool fUseCache) const
 
     CAmount nCredit = 0;
     uint256 hashTx = GetHash();
-    for (unsigned int i = 0; i < vout.size(); i++)
+    for (unsigned int i = 0; i < tx->vout.size(); i++)
     {
         if (!pwallet->IsSpent(hashTx, i))
         {
-            const CTxOut &txout = vout[i];
+            const CTxOut &txout = tx->vout[i];
             nCredit += pwallet->GetCredit(txout, ISMINE_SPENDABLE);
             if (!MoneyRange(nCredit))
                 throw std::runtime_error("CWalletTx::GetAvailableCredit() : value out of range");
@@ -1706,11 +1706,11 @@ CAmount CWalletTx::GetAvailableWatchOnlyCredit(const bool& fUseCache) const
         return nAvailableWatchCreditCached;
 
     CAmount nCredit = 0;
-    for (unsigned int i = 0; i < vout.size(); i++)
+    for (unsigned int i = 0; i < tx->vout.size(); i++)
     {
         if (!pwallet->IsSpent(GetHash(), i))
         {
-            const CTxOut &txout = vout[i];
+            const CTxOut &txout = tx->vout[i];
             nCredit += pwallet->GetCredit(txout, ISMINE_WATCH_ONLY);
             if (!MoneyRange(nCredit))
                 throw std::runtime_error("CWalletTx::GetAvailableCredit() : value out of range");
@@ -1758,23 +1758,23 @@ bool CWalletTx::IsTrusted() const
         return false;
 
     // Trusted if all inputs are from us and are in the mempool:
-    BOOST_FOREACH(const CTxIn& txin, vin)
+    BOOST_FOREACH(const CTxIn& txin, tx->vin)
     {
         // Transactions not sent by us: not trusted
         const CWalletTx* parent = pwallet->GetWalletTx(txin.prevout.hash);
         if (parent == NULL)
             return false;
-        const CTxOut& parentOut = parent->vout[txin.prevout.n];
+        const CTxOut& parentOut = parent->tx->vout[txin.prevout.n];
         if (pwallet->IsMine(parentOut) != ISMINE_SPENDABLE)
             return false;
     }
     return true;
 }
 
-bool CWalletTx::IsEquivalentTo(const CWalletTx& tx) const
+bool CWalletTx::IsEquivalentTo(const CWalletTx& _tx) const
 {
-        CMutableTransaction tx1 = *this;
-        CMutableTransaction tx2 = tx;
+        CMutableTransaction tx1 = *this->tx;
+        CMutableTransaction tx2 = *_tx.tx;
         for (unsigned int i = 0; i < tx1.vin.size(); i++) tx1.vin[i].scriptSig = CScript();
         for (unsigned int i = 0; i < tx2.vin.size(); i++) tx2.vin[i].scriptSig = CScript();
         return CTransaction(tx1) == CTransaction(tx2);
@@ -1957,10 +1957,10 @@ void CWallet::AvailableCoins(vector<COutput>& vCoins, bool fOnlyConfirmed, const
             if (nDepth == 0 && !pcoin->InMempool())
                 continue;
 
-            for (unsigned int i = 0; i < pcoin->vout.size(); i++) {
-                isminetype mine = IsMine(pcoin->vout[i]);
+            for (unsigned int i = 0; i < pcoin->tx->vout.size(); i++) {
+                isminetype mine = IsMine(pcoin->tx->vout[i]);
                 if (!(IsSpent(wtxid, i)) && mine != ISMINE_NO &&
-                    !IsLockedCoin((*it).first, i) && (pcoin->vout[i].nValue > 0 || fIncludeZeroValue) &&
+                    !IsLockedCoin((*it).first, i) && (pcoin->tx->vout[i].nValue > 0 || fIncludeZeroValue) &&
                     (!coinControl || !coinControl->HasSelected() || coinControl->fAllowOtherInputs || coinControl->IsSelected(COutPoint((*it).first, i))))
                         vCoins.push_back(COutput(pcoin, i, nDepth,
                                                  ((mine & ISMINE_SPENDABLE) != ISMINE_NO) ||
@@ -2043,7 +2043,7 @@ bool CWallet::SelectCoinsMinConf(const CAmount& nTargetValue, int nConfMine, int
             continue;
 
         int i = output.i;
-        CAmount n = pcoin->vout[i].nValue;
+        CAmount n = pcoin->tx->vout[i].nValue;
 
         pair<CAmount,pair<const CWalletTx*,unsigned int> > coin = make_pair(n,make_pair(pcoin, i));
 
@@ -2130,7 +2130,7 @@ bool CWallet::SelectCoins(const vector<COutput>& vAvailableCoins, const CAmount&
         {
             if (!out.fSpendable)
                  continue;
-            nValueRet += out.tx->vout[out.i].nValue;
+            nValueRet += out.tx->tx->vout[out.i].nValue;
             setCoinsRet.insert(make_pair(out.tx, out.i));
         }
         return (nValueRet >= nTargetValue);
@@ -2150,9 +2150,9 @@ bool CWallet::SelectCoins(const vector<COutput>& vAvailableCoins, const CAmount&
         {
             const CWalletTx* pcoin = &it->second;
             // Clearly invalid input, fail
-            if (pcoin->vout.size() <= outpoint.n)
+            if (pcoin->tx->vout.size() <= outpoint.n)
                 return false;
-            nValueFromPresetInputs += pcoin->vout[outpoint.n].nValue;
+            nValueFromPresetInputs += pcoin->tx->vout[outpoint.n].nValue;
             setPresetCoins.insert(make_pair(pcoin, outpoint.n));
         } else
             return false; // TODO: Allow non-wallet inputs
@@ -2208,10 +2208,10 @@ bool CWallet::FundTransaction(CMutableTransaction& tx, CAmount& nFeeRet, bool ov
         return false;
 
     if (nChangePosInOut != -1)
-        tx.vout.insert(tx.vout.begin() + nChangePosInOut, wtx.vout[nChangePosInOut]);
+        tx.vout.insert(tx.vout.begin() + nChangePosInOut, wtx.tx->vout[nChangePosInOut]);
 
     // Add new txins (keeping original txin scriptSig/order)
-    BOOST_FOREACH(const CTxIn& txin, wtx.vin)
+    BOOST_FOREACH(const CTxIn& txin, wtx.tx->vin)
     {
         if (!coinControl.IsSelected(txin.prevout))
         {
@@ -2351,7 +2351,7 @@ bool CWallet::CreateTransaction(const vector<CRecipient>& vecSend, CWalletTx& wt
                 }
                 BOOST_FOREACH(PAIRTYPE(const CWalletTx*, unsigned int) pcoin, setCoins)
                 {
-                    CAmount nCredit = pcoin.first->vout[pcoin.second].nValue;
+                    CAmount nCredit = pcoin.first->tx->vout[pcoin.second].nValue;
                     //The coin age after the next block (depth+1) is used instead of the current,
                     //reflecting an assumption the user would accept a bit more delay for
                     //a chance at a free transaction.
@@ -2466,10 +2466,10 @@ bool CWallet::CreateTransaction(const vector<CRecipient>& vecSend, CWalletTx& wt
                 BOOST_FOREACH(const PAIRTYPE(const CWalletTx*,unsigned int)& coin, setCoins)
                 {
                     bool signSuccess;
-                    const CScript& scriptPubKey = coin.first->vout[coin.second].scriptPubKey;
+                    const CScript& scriptPubKey = coin.first->tx->vout[coin.second].scriptPubKey;
                     SignatureData sigdata;
                     if (sign)
-                        signSuccess = ProduceSignature(TransactionSignatureCreator(this, &txNewConst, nIn, coin.first->vout[coin.second].nValue, SIGHASH_ALL), scriptPubKey, sigdata);
+                        signSuccess = ProduceSignature(TransactionSignatureCreator(this, &txNewConst, nIn, coin.first->tx->vout[coin.second].nValue, SIGHASH_ALL), scriptPubKey, sigdata);
                     else
                         signSuccess = ProduceSignature(DummySignatureCreator(this), scriptPubKey, sigdata);
 
@@ -2494,16 +2494,16 @@ bool CWallet::CreateTransaction(const vector<CRecipient>& vecSend, CWalletTx& wt
                 }
 
                 // Embed the constructed transaction data in wtxNew.
-                *static_cast<CTransaction*>(&wtxNew) = CTransaction(txNew);
+                wtxNew.SetTx(MakeTransactionRef(std::move(txNew)));
 
                 // Limit size
-                if (GetTransactionWeight(txNew) >= MAX_STANDARD_TX_WEIGHT)
+                if (GetTransactionWeight(wtxNew) >= MAX_STANDARD_TX_WEIGHT)
                 {
                     strFailReason = _("Transaction too large");
                     return false;
                 }
 
-                dPriority = wtxNew.ComputePriority(dPriority, nBytes);
+                dPriority = wtxNew.tx->ComputePriority(dPriority, nBytes);
 
                 // Allow to override the default confirmation target over the CoinControl instance
                 int currentConfirmationTarget = nTxConfirmTarget;
@@ -2555,7 +2555,7 @@ bool CWallet::CommitTransaction(CWalletTx& wtxNew, CReserveKey& reservekey, CCon
 {
     {
         LOCK2(cs_main, cs_wallet);
-        LogPrintf("CommitTransaction:\n%s", wtxNew.ToString());
+        LogPrintf("CommitTransaction:\n%s", wtxNew.tx->ToString());
         {
             // Take key pair from key pool so it won't be used again
             reservekey.KeepKey();
@@ -2565,7 +2565,7 @@ bool CWallet::CommitTransaction(CWalletTx& wtxNew, CReserveKey& reservekey, CCon
             AddToWallet(wtxNew);
 
             // Notify that old coins are spent
-            BOOST_FOREACH(const CTxIn& txin, wtxNew.vin)
+            BOOST_FOREACH(const CTxIn& txin, wtxNew.tx->vin)
             {
                 CWalletTx &coin = mapWallet[txin.prevout.hash];
                 coin.BindWallet(this);
@@ -2939,15 +2939,15 @@ std::map<CTxDestination, CAmount> CWallet::GetAddressBalances()
             if (nDepth < (pcoin->IsFromMe(ISMINE_ALL) ? 0 : 1))
                 continue;
 
-            for (unsigned int i = 0; i < pcoin->vout.size(); i++)
+            for (unsigned int i = 0; i < pcoin->tx->vout.size(); i++)
             {
                 CTxDestination addr;
-                if (!IsMine(pcoin->vout[i]))
+                if (!IsMine(pcoin->tx->vout[i]))
                     continue;
-                if(!ExtractDestination(pcoin->vout[i].scriptPubKey, addr))
+                if(!ExtractDestination(pcoin->tx->vout[i].scriptPubKey, addr))
                     continue;
 
-                CAmount n = IsSpent(walletEntry.first, i) ? 0 : pcoin->vout[i].nValue;
+                CAmount n = IsSpent(walletEntry.first, i) ? 0 : pcoin->tx->vout[i].nValue;
 
                 if (!balances.count(addr))
                     balances[addr] = 0;
@@ -2969,16 +2969,16 @@ set< set<CTxDestination> > CWallet::GetAddressGroupings()
     {
         CWalletTx *pcoin = &walletEntry.second;
 
-        if (pcoin->vin.size() > 0)
+        if (pcoin->tx->vin.size() > 0)
         {
             bool any_mine = false;
             // group all input addresses with each other
-            BOOST_FOREACH(CTxIn txin, pcoin->vin)
+            BOOST_FOREACH(CTxIn txin, pcoin->tx->vin)
             {
                 CTxDestination address;
                 if(!IsMine(txin)) /* If this input isn't mine, ignore it */
                     continue;
-                if(!ExtractDestination(mapWallet[txin.prevout.hash].vout[txin.prevout.n].scriptPubKey, address))
+                if(!ExtractDestination(mapWallet[txin.prevout.hash].tx->vout[txin.prevout.n].scriptPubKey, address))
                     continue;
                 grouping.insert(address);
                 any_mine = true;
@@ -2987,7 +2987,7 @@ set< set<CTxDestination> > CWallet::GetAddressGroupings()
             // group change with input addresses
             if (any_mine)
             {
-               BOOST_FOREACH(CTxOut txout, pcoin->vout)
+               BOOST_FOREACH(CTxOut txout, pcoin->tx->vout)
                    if (IsChange(txout))
                    {
                        CTxDestination txoutAddr;
@@ -3004,11 +3004,11 @@ set< set<CTxDestination> > CWallet::GetAddressGroupings()
         }
 
         // group lone addrs by themselves
-        for (unsigned int i = 0; i < pcoin->vout.size(); i++)
-            if (IsMine(pcoin->vout[i]))
+        for (unsigned int i = 0; i < pcoin->tx->vout.size(); i++)
+            if (IsMine(pcoin->tx->vout[i]))
             {
                 CTxDestination address;
-                if(!ExtractDestination(pcoin->vout[i].scriptPubKey, address))
+                if(!ExtractDestination(pcoin->tx->vout[i].scriptPubKey, address))
                     continue;
                 grouping.insert(address);
                 groupings.insert(grouping);
@@ -3275,7 +3275,7 @@ void CWallet::GetKeyBirthTimes(std::map<CKeyID, int64_t> &mapKeyBirth) const {
         if (blit != mapBlockIndex.end() && chainActive.Contains(blit->second)) {
             // ... which are already in a block
             int nHeight = blit->second->nHeight;
-            BOOST_FOREACH(const CTxOut &txout, wtx.vout) {
+            BOOST_FOREACH(const CTxOut &txout, wtx.tx->vout) {
                 // iterate over all their outputs
                 CAffectedKeysVisitor(*this, vAffected).Process(txout.scriptPubKey);
                 BOOST_FOREACH(const CKeyID &keyid, vAffected) {
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
index 409d817046424..f7103b6a809e1 100644
--- a/src/wallet/wallet.h
+++ b/src/wallet/wallet.h
@@ -161,13 +161,14 @@ struct COutputEntry
 };
 
 /** A transaction with a merkle branch linking it to the block chain. */
-class CMerkleTx : public CTransaction
+class CMerkleTx
 {
 private:
   /** Constant used in hashBlock to indicate tx has been abandoned */
     static const uint256 ABANDON_HASH;
 
 public:
+    CTransactionRef tx;
     uint256 hashBlock;
 
     /* An nIndex == -1 means that hashBlock (in nonzero) refers to the earliest
@@ -179,26 +180,37 @@ class CMerkleTx : public CTransaction
 
     CMerkleTx()
     {
+        SetTx(MakeTransactionRef());
         Init();
     }
 
-    CMerkleTx(const CTransaction& txIn) : CTransaction(txIn)
+    CMerkleTx(CTransactionRef arg)
     {
+        SetTx(std::move(arg));
         Init();
     }
 
+    /** Helper conversion operator to allow passing CMerkleTx where CTransaction is expected.
+     *  TODO: adapt callers and remove this operator. */
+    operator const CTransaction&() const { return *tx; }
+
     void Init()
     {
         hashBlock = uint256();
         nIndex = -1;
     }
 
+    void SetTx(CTransactionRef arg)
+    {
+        tx = std::move(arg);
+    }
+
     ADD_SERIALIZE_METHODS;
 
     template <typename Stream, typename Operation>
     inline void SerializationOp(Stream& s, Operation ser_action) {
         std::vector<uint256> vMerkleBranch; // For compatibility with older versions.
-        READWRITE(*(CTransaction*)this);
+        READWRITE(tx);
         READWRITE(hashBlock);
         READWRITE(vMerkleBranch);
         READWRITE(nIndex);
@@ -221,6 +233,9 @@ class CMerkleTx : public CTransaction
     bool hashUnset() const { return (hashBlock.IsNull() || hashBlock == ABANDON_HASH); }
     bool isAbandoned() const { return (hashBlock == ABANDON_HASH); }
     void setAbandoned() { hashBlock = ABANDON_HASH; }
+
+    const uint256& GetHash() const { return tx->GetHash(); }
+    bool IsCoinBase() const { return tx->IsCoinBase(); }
 };
 
 /** 
@@ -267,17 +282,7 @@ class CWalletTx : public CMerkleTx
         Init(NULL);
     }
 
-    CWalletTx(const CWallet* pwalletIn)
-    {
-        Init(pwalletIn);
-    }
-
-    CWalletTx(const CWallet* pwalletIn, const CMerkleTx& txIn) : CMerkleTx(txIn)
-    {
-        Init(pwalletIn);
-    }
-
-    CWalletTx(const CWallet* pwalletIn, const CTransaction& txIn) : CMerkleTx(txIn)
+    CWalletTx(const CWallet* pwalletIn, CTransactionRef arg) : CMerkleTx(std::move(arg))
     {
         Init(pwalletIn);
     }

From 42fd8dee302fec55ba0970e2f1378edc2797e4ff Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Wed, 30 Nov 2016 14:50:20 -0800
Subject: [PATCH 1304/1802] Make DecodeHexTx return a CMutableTransaction

---
 src/bitcoin-tx.cpp         |  6 ++----
 src/core_io.h              |  3 ++-
 src/core_read.cpp          |  2 +-
 src/rpc/rawtransaction.cpp | 11 ++++++-----
 src/wallet/rpcdump.cpp     |  4 ++--
 src/wallet/rpcwallet.cpp   |  9 ++++-----
 6 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/src/bitcoin-tx.cpp b/src/bitcoin-tx.cpp
index 346d8e180d39e..1ed1449f03e64 100644
--- a/src/bitcoin-tx.cpp
+++ b/src/bitcoin-tx.cpp
@@ -623,7 +623,7 @@ static int CommandLineRawTx(int argc, char* argv[])
             argv++;
         }
 
-        CTransaction txDecodeTmp;
+        CMutableTransaction tx;
         int startArg;
 
         if (!fCreateBlank) {
@@ -636,15 +636,13 @@ static int CommandLineRawTx(int argc, char* argv[])
             if (strHexTx == "-")                 // "-" implies standard input
                 strHexTx = readStdin();
 
-            if (!DecodeHexTx(txDecodeTmp, strHexTx, true))
+            if (!DecodeHexTx(tx, strHexTx, true))
                 throw std::runtime_error("invalid transaction encoding");
 
             startArg = 2;
         } else
             startArg = 1;
 
-        CMutableTransaction tx(txDecodeTmp);
-
         for (int i = startArg; i < argc; i++) {
             std::string arg = argv[i];
             std::string key, value;
diff --git a/src/core_io.h b/src/core_io.h
index 5aecbc44897a6..4344290bb880c 100644
--- a/src/core_io.h
+++ b/src/core_io.h
@@ -11,13 +11,14 @@
 class CBlock;
 class CScript;
 class CTransaction;
+class CMutableTransaction;
 class uint256;
 class UniValue;
 
 // core_read.cpp
 CScript ParseScript(const std::string& s);
 std::string ScriptToAsmStr(const CScript& script, const bool fAttemptSighashDecode = false);
-bool DecodeHexTx(CTransaction& tx, const std::string& strHexTx, bool fTryNoWitness = false);
+bool DecodeHexTx(CMutableTransaction& tx, const std::string& strHexTx, bool fTryNoWitness = false);
 bool DecodeHexBlk(CBlock&, const std::string& strHexBlk);
 uint256 ParseHashUV(const UniValue& v, const std::string& strName);
 uint256 ParseHashStr(const std::string&, const std::string& strName);
diff --git a/src/core_read.cpp b/src/core_read.cpp
index 7cfda6dd6d894..b6d0285459ed8 100644
--- a/src/core_read.cpp
+++ b/src/core_read.cpp
@@ -90,7 +90,7 @@ CScript ParseScript(const std::string& s)
     return result;
 }
 
-bool DecodeHexTx(CTransaction& tx, const std::string& strHexTx, bool fTryNoWitness)
+bool DecodeHexTx(CMutableTransaction& tx, const std::string& strHexTx, bool fTryNoWitness)
 {
     if (!IsHex(strHexTx))
         return false;
diff --git a/src/rpc/rawtransaction.cpp b/src/rpc/rawtransaction.cpp
index 673979886a9cb..48769a5335fc8 100644
--- a/src/rpc/rawtransaction.cpp
+++ b/src/rpc/rawtransaction.cpp
@@ -520,13 +520,13 @@ UniValue decoderawtransaction(const JSONRPCRequest& request)
     LOCK(cs_main);
     RPCTypeCheck(request.params, boost::assign::list_of(UniValue::VSTR));
 
-    CTransaction tx;
+    CMutableTransaction mtx;
 
-    if (!DecodeHexTx(tx, request.params[0].get_str(), true))
+    if (!DecodeHexTx(mtx, request.params[0].get_str(), true))
         throw JSONRPCError(RPC_DESERIALIZATION_ERROR, "TX decode failed");
 
     UniValue result(UniValue::VOBJ);
-    TxToJSON(tx, uint256(), result);
+    TxToJSON(CTransaction(std::move(mtx)), uint256(), result);
 
     return result;
 }
@@ -883,9 +883,10 @@ UniValue sendrawtransaction(const JSONRPCRequest& request)
     RPCTypeCheck(request.params, boost::assign::list_of(UniValue::VSTR)(UniValue::VBOOL));
 
     // parse hex string from parameter
-    CTransaction tx;
-    if (!DecodeHexTx(tx, request.params[0].get_str()))
+    CMutableTransaction mtx;
+    if (!DecodeHexTx(mtx, request.params[0].get_str()))
         throw JSONRPCError(RPC_DESERIALIZATION_ERROR, "TX decode failed");
+    CTransaction tx(std::move(mtx));
     uint256 hashTx = tx.GetHash();
 
     bool fLimitFree = false;
diff --git a/src/wallet/rpcdump.cpp b/src/wallet/rpcdump.cpp
index 28a905efa7c25..008a4ece19f6b 100644
--- a/src/wallet/rpcdump.cpp
+++ b/src/wallet/rpcdump.cpp
@@ -267,7 +267,7 @@ UniValue importprunedfunds(const JSONRPCRequest& request)
             "2. \"txoutproof\"     (string, required) The hex output from gettxoutproof that contains the transaction\n"
         );
 
-    CTransaction tx;
+    CMutableTransaction tx;
     if (!DecodeHexTx(tx, request.params[0].get_str()))
         throw JSONRPCError(RPC_DESERIALIZATION_ERROR, "TX decode failed");
     uint256 hashTx = tx.GetHash();
@@ -304,7 +304,7 @@ UniValue importprunedfunds(const JSONRPCRequest& request)
 
     LOCK2(cs_main, pwalletMain->cs_wallet);
 
-    if (pwalletMain->IsMine(tx)) {
+    if (pwalletMain->IsMine(wtx)) {
         pwalletMain->AddToWallet(wtx, false);
         return NullUniValue;
     }
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index f31a28c4d233c..9e32b6751dfd0 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -2557,17 +2557,16 @@ UniValue fundrawtransaction(const JSONRPCRequest& request)
     }
 
     // parse hex string from parameter
-    CTransaction origTx;
-    if (!DecodeHexTx(origTx, request.params[0].get_str(), true))
+    CMutableTransaction tx;
+    if (!DecodeHexTx(tx, request.params[0].get_str(), true))
         throw JSONRPCError(RPC_DESERIALIZATION_ERROR, "TX decode failed");
 
-    if (origTx.vout.size() == 0)
+    if (tx.vout.size() == 0)
         throw JSONRPCError(RPC_INVALID_PARAMETER, "TX must have at least one output");
 
-    if (changePosition != -1 && (changePosition < 0 || (unsigned int)changePosition > origTx.vout.size()))
+    if (changePosition != -1 && (changePosition < 0 || (unsigned int)changePosition > tx.vout.size()))
         throw JSONRPCError(RPC_INVALID_PARAMETER, "changePosition out of bounds");
 
-    CMutableTransaction tx(origTx);
     CAmount nFeeOut;
     string strFailReason;
 

From 81e3228fcb33e8ed32d8b9fbe917444ba080073a Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Fri, 11 Nov 2016 16:23:17 -0800
Subject: [PATCH 1305/1802] Make CTransaction actually immutable

---
 src/net_processing.cpp          |   3 +-
 src/primitives/transaction.cpp  |  27 ++----
 src/primitives/transaction.h    | 150 +++++++++++++++++---------------
 src/script/bitcoinconsensus.cpp |   3 +-
 src/test/bloom_tests.cpp        |   6 +-
 src/test/script_tests.cpp       |  12 +--
 src/test/serialize_tests.cpp    |   6 +-
 src/test/sighash_tests.cpp      |   6 +-
 src/test/transaction_tests.cpp  |  50 +++++------
 src/validation.cpp              |   8 +-
 10 files changed, 131 insertions(+), 140 deletions(-)

diff --git a/src/net_processing.cpp b/src/net_processing.cpp
index 747167264b772..b1283c236c3b2 100644
--- a/src/net_processing.cpp
+++ b/src/net_processing.cpp
@@ -1594,8 +1594,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
 
         deque<COutPoint> vWorkQueue;
         vector<uint256> vEraseQueue;
-        CTransaction tx;
-        vRecv >> tx;
+        CTransaction tx(deserialize, vRecv);
 
         CInv inv(MSG_TX, tx.GetHash());
         pfrom->AddInventoryKnown(inv);
diff --git a/src/primitives/transaction.cpp b/src/primitives/transaction.cpp
index 91f4d29488b16..11d7eace55737 100644
--- a/src/primitives/transaction.cpp
+++ b/src/primitives/transaction.cpp
@@ -62,9 +62,9 @@ uint256 CMutableTransaction::GetHash() const
     return SerializeHash(*this, SER_GETHASH, SERIALIZE_TRANSACTION_NO_WITNESS);
 }
 
-void CTransaction::UpdateHash() const
+uint256 CTransaction::ComputeHash() const
 {
-    *const_cast<uint256*>(&hash) = SerializeHash(*this, SER_GETHASH, SERIALIZE_TRANSACTION_NO_WITNESS);
+    return SerializeHash(*this, SER_GETHASH, SERIALIZE_TRANSACTION_NO_WITNESS);
 }
 
 uint256 CTransaction::GetWitnessHash() const
@@ -72,25 +72,10 @@ uint256 CTransaction::GetWitnessHash() const
     return SerializeHash(*this, SER_GETHASH, 0);
 }
 
-CTransaction::CTransaction() : nVersion(CTransaction::CURRENT_VERSION), vin(), vout(), nLockTime(0) { }
-
-CTransaction::CTransaction(const CMutableTransaction &tx) : nVersion(tx.nVersion), vin(tx.vin), vout(tx.vout), wit(tx.wit), nLockTime(tx.nLockTime) {
-    UpdateHash();
-}
-
-CTransaction::CTransaction(CMutableTransaction &&tx) : nVersion(tx.nVersion), vin(std::move(tx.vin)), vout(std::move(tx.vout)), wit(std::move(tx.wit)), nLockTime(tx.nLockTime) {
-    UpdateHash();
-}
-
-CTransaction& CTransaction::operator=(const CTransaction &tx) {
-    *const_cast<int*>(&nVersion) = tx.nVersion;
-    *const_cast<std::vector<CTxIn>*>(&vin) = tx.vin;
-    *const_cast<std::vector<CTxOut>*>(&vout) = tx.vout;
-    *const_cast<CTxWitness*>(&wit) = tx.wit;
-    *const_cast<unsigned int*>(&nLockTime) = tx.nLockTime;
-    *const_cast<uint256*>(&hash) = tx.hash;
-    return *this;
-}
+/* For backward compatibility, the hash is initialized to 0. TODO: remove the need for this default constructor entirely. */
+CTransaction::CTransaction() : nVersion(CTransaction::CURRENT_VERSION), vin(), vout(), nLockTime(0), hash() {}
+CTransaction::CTransaction(const CMutableTransaction &tx) : nVersion(tx.nVersion), vin(tx.vin), vout(tx.vout), wit(tx.wit), nLockTime(tx.nLockTime), hash(ComputeHash()) {}
+CTransaction::CTransaction(CMutableTransaction &&tx) : nVersion(tx.nVersion), vin(std::move(tx.vin)), vout(std::move(tx.vout)), wit(std::move(tx.wit)), nLockTime(tx.nLockTime), hash(ComputeHash()) {}
 
 CAmount CTransaction::GetValueOut() const
 {
diff --git a/src/primitives/transaction.h b/src/primitives/transaction.h
index 0fa85a15195a0..66fefafef5807 100644
--- a/src/primitives/transaction.h
+++ b/src/primitives/transaction.h
@@ -286,73 +286,81 @@ struct CMutableTransaction;
  *   - CTxWitness wit;
  * - uint32_t nLockTime
  */
-template<typename Stream, typename Operation, typename TxType>
-inline void SerializeTransaction(TxType& tx, Stream& s, Operation ser_action) {
+template<typename Stream, typename TxType>
+inline void UnserializeTransaction(TxType& tx, Stream& s) {
     const bool fAllowWitness = !(s.GetVersion() & SERIALIZE_TRANSACTION_NO_WITNESS);
 
-    READWRITE(*const_cast<int32_t*>(&tx.nVersion));
+    s >> tx.nVersion;
     unsigned char flags = 0;
-    if (ser_action.ForRead()) {
-        const_cast<std::vector<CTxIn>*>(&tx.vin)->clear();
-        const_cast<std::vector<CTxOut>*>(&tx.vout)->clear();
-        const_cast<CTxWitness*>(&tx.wit)->SetNull();
-        /* Try to read the vin. In case the dummy is there, this will be read as an empty vector. */
-        READWRITE(*const_cast<std::vector<CTxIn>*>(&tx.vin));
-        if (tx.vin.size() == 0 && fAllowWitness) {
-            /* We read a dummy or an empty vin. */
-            READWRITE(flags);
-            if (flags != 0) {
-                READWRITE(*const_cast<std::vector<CTxIn>*>(&tx.vin));
-                READWRITE(*const_cast<std::vector<CTxOut>*>(&tx.vout));
-            }
-        } else {
-            /* We read a non-empty vin. Assume a normal vout follows. */
-            READWRITE(*const_cast<std::vector<CTxOut>*>(&tx.vout));
-        }
-        if ((flags & 1) && fAllowWitness) {
-            /* The witness flag is present, and we support witnesses. */
-            flags ^= 1;
-            const_cast<CTxWitness*>(&tx.wit)->vtxinwit.resize(tx.vin.size());
-            READWRITE(tx.wit);
-        }
-        if (flags) {
-            /* Unknown flag in the serialization */
-            throw std::ios_base::failure("Unknown transaction optional data");
+    tx.vin.clear();
+    tx.vout.clear();
+    tx.wit.SetNull();
+    /* Try to read the vin. In case the dummy is there, this will be read as an empty vector. */
+    s >> tx.vin;
+    if (tx.vin.size() == 0 && fAllowWitness) {
+        /* We read a dummy or an empty vin. */
+        s >> flags;
+        if (flags != 0) {
+            s >> tx.vin;
+            s >> tx.vout;
         }
     } else {
-        // Consistency check
-        assert(tx.wit.vtxinwit.size() <= tx.vin.size());
-        if (fAllowWitness) {
-            /* Check whether witnesses need to be serialized. */
-            if (!tx.wit.IsNull()) {
-                flags |= 1;
-            }
-        }
-        if (flags) {
-            /* Use extended format in case witnesses are to be serialized. */
-            std::vector<CTxIn> vinDummy;
-            READWRITE(vinDummy);
-            READWRITE(flags);
+        /* We read a non-empty vin. Assume a normal vout follows. */
+        s >> tx.vout;
+    }
+    if ((flags & 1) && fAllowWitness) {
+        /* The witness flag is present, and we support witnesses. */
+        flags ^= 1;
+        tx.wit.vtxinwit.resize(tx.vin.size());
+        s >> tx.wit;
+    }
+    if (flags) {
+        /* Unknown flag in the serialization */
+        throw std::ios_base::failure("Unknown transaction optional data");
+    }
+    s >> tx.nLockTime;
+}
+
+template<typename Stream, typename TxType>
+inline void SerializeTransaction(const TxType& tx, Stream& s) {
+    const bool fAllowWitness = !(s.GetVersion() & SERIALIZE_TRANSACTION_NO_WITNESS);
+
+    s << tx.nVersion;
+    unsigned char flags = 0;
+    // Consistency check
+    assert(tx.wit.vtxinwit.size() <= tx.vin.size());
+    if (fAllowWitness) {
+        /* Check whether witnesses need to be serialized. */
+        if (!tx.wit.IsNull()) {
+            flags |= 1;
         }
-        READWRITE(*const_cast<std::vector<CTxIn>*>(&tx.vin));
-        READWRITE(*const_cast<std::vector<CTxOut>*>(&tx.vout));
-        if (flags & 1) {
-            const_cast<CTxWitness*>(&tx.wit)->vtxinwit.resize(tx.vin.size());
-            READWRITE(tx.wit);
+    }
+    if (flags) {
+        /* Use extended format in case witnesses are to be serialized. */
+        std::vector<CTxIn> vinDummy;
+        s << vinDummy;
+        s << flags;
+    }
+    s << tx.vin;
+    s << tx.vout;
+    if (flags & 1) {
+        for (size_t i = 0; i < tx.vin.size(); i++) {
+            if (i < tx.wit.vtxinwit.size()) {
+                s << tx.wit.vtxinwit[i];
+            } else {
+                s << CTxInWitness();
+            }
         }
     }
-    READWRITE(*const_cast<uint32_t*>(&tx.nLockTime));
+    s << tx.nLockTime;
 }
 
+
 /** The basic transaction that is broadcasted on the network and contained in
  * blocks.  A transaction can contain multiple inputs and outputs.
  */
 class CTransaction
 {
-private:
-    /** Memory only. */
-    const uint256 hash;
-
 public:
     // Default transaction version.
     static const int32_t CURRENT_VERSION=1;
@@ -374,6 +382,13 @@ class CTransaction
     CTxWitness wit; // Not const: can change without invalidating the txid cache
     const uint32_t nLockTime;
 
+private:
+    /** Memory only. */
+    const uint256 hash;
+
+    uint256 ComputeHash() const;
+
+public:
     /** Construct a CTransaction that qualifies as IsNull() */
     CTransaction();
 
@@ -381,18 +396,13 @@ class CTransaction
     CTransaction(const CMutableTransaction &tx);
     CTransaction(CMutableTransaction &&tx);
 
-    CTransaction& operator=(const CTransaction& tx);
-
-    ADD_SERIALIZE_METHODS;
-
-    template <typename Stream, typename Operation>
-    inline void SerializationOp(Stream& s, Operation ser_action) {
-        SerializeTransaction(*this, s, ser_action);
-        if (ser_action.ForRead()) {
-            UpdateHash();
-        }
+    template <typename Stream>
+    inline void Serialize(Stream& s) const {
+        SerializeTransaction(*this, s);
     }
 
+    /** This deserializing constructor is provided instead of an Unserialize method.
+     *  Unserialize is not possible, since it would require overwriting const fields. */
     template <typename Stream>
     CTransaction(deserialize_type, Stream& s) : CTransaction(CMutableTransaction(deserialize, s)) {}
 
@@ -417,7 +427,7 @@ class CTransaction
 
     // Compute modified tx size for priority calculation (optionally given tx size)
     unsigned int CalculateModifiedSize(unsigned int nTxSize=0) const;
-    
+
     /**
      * Get the total transaction size in bytes, including witness data.
      * "Total Size" defined in BIP141 and BIP144.
@@ -441,8 +451,6 @@ class CTransaction
     }
 
     std::string ToString() const;
-
-    void UpdateHash() const;
 };
 
 /** A mutable version of CTransaction. */
@@ -457,11 +465,15 @@ struct CMutableTransaction
     CMutableTransaction();
     CMutableTransaction(const CTransaction& tx);
 
-    ADD_SERIALIZE_METHODS;
+    template <typename Stream>
+    inline void Serialize(Stream& s) const {
+        SerializeTransaction(*this, s);
+    }
 
-    template <typename Stream, typename Operation>
-    inline void SerializationOp(Stream& s, Operation ser_action) {
-        SerializeTransaction(*this, s, ser_action);
+
+    template <typename Stream>
+    inline void Unserialize(Stream& s) {
+        UnserializeTransaction(*this, s);
     }
 
     template <typename Stream>
diff --git a/src/script/bitcoinconsensus.cpp b/src/script/bitcoinconsensus.cpp
index 069ac55bfba06..036d6ca7bf175 100644
--- a/src/script/bitcoinconsensus.cpp
+++ b/src/script/bitcoinconsensus.cpp
@@ -85,8 +85,7 @@ static int verify_script(const unsigned char *scriptPubKey, unsigned int scriptP
     }
     try {
         TxInputStream stream(SER_NETWORK, PROTOCOL_VERSION, txTo, txToLen);
-        CTransaction tx;
-        stream >> tx;
+        CTransaction tx(deserialize, stream);
         if (nIn >= tx.vin.size())
             return set_error(err, bitcoinconsensus_ERR_TX_INDEX);
         if (GetSerializeSize(tx, SER_NETWORK, PROTOCOL_VERSION) != txToLen)
diff --git a/src/test/bloom_tests.cpp b/src/test/bloom_tests.cpp
index ffa1fb6ad005a..b15ff9e44b12b 100644
--- a/src/test/bloom_tests.cpp
+++ b/src/test/bloom_tests.cpp
@@ -114,16 +114,14 @@ BOOST_AUTO_TEST_CASE(bloom_create_insert_key)
 BOOST_AUTO_TEST_CASE(bloom_match)
 {
     // Random real transaction (b4749f017444b051c44dfd2720e88f314ff94f3dd6d56d40ef65854fcd7fff6b)
-    CTransaction tx;
     CDataStream stream(ParseHex("01000000010b26e9b7735eb6aabdf358bab62f9816a21ba9ebdb719d5299e88607d722c190000000008b4830450220070aca44506c5cef3a16ed519d7c3c39f8aab192c4e1c90d065f37b8a4af6141022100a8e160b856c2d43d27d8fba71e5aef6405b8643ac4cb7cb3c462aced7f14711a0141046d11fee51b0e60666d5049a9101a72741df480b96ee26488a4d3466b95c9a40ac5eeef87e10a5cd336c19a84565f80fa6c547957b7700ff4dfbdefe76036c339ffffffff021bff3d11000000001976a91404943fdd508053c75000106d3bc6e2754dbcff1988ac2f15de00000000001976a914a266436d2965547608b9e15d9032a7b9d64fa43188ac00000000"), SER_DISK, CLIENT_VERSION);
-    stream >> tx;
+    CTransaction tx(deserialize, stream);
 
     // and one which spends it (e2769b09e784f32f62ef849763d4f45b98e07ba658647343b915ff832b110436)
     unsigned char ch[] = {0x01, 0x00, 0x00, 0x00, 0x01, 0x6b, 0xff, 0x7f, 0xcd, 0x4f, 0x85, 0x65, 0xef, 0x40, 0x6d, 0xd5, 0xd6, 0x3d, 0x4f, 0xf9, 0x4f, 0x31, 0x8f, 0xe8, 0x20, 0x27, 0xfd, 0x4d, 0xc4, 0x51, 0xb0, 0x44, 0x74, 0x01, 0x9f, 0x74, 0xb4, 0x00, 0x00, 0x00, 0x00, 0x8c, 0x49, 0x30, 0x46, 0x02, 0x21, 0x00, 0xda, 0x0d, 0xc6, 0xae, 0xce, 0xfe, 0x1e, 0x06, 0xef, 0xdf, 0x05, 0x77, 0x37, 0x57, 0xde, 0xb1, 0x68, 0x82, 0x09, 0x30, 0xe3, 0xb0, 0xd0, 0x3f, 0x46, 0xf5, 0xfc, 0xf1, 0x50, 0xbf, 0x99, 0x0c, 0x02, 0x21, 0x00, 0xd2, 0x5b, 0x5c, 0x87, 0x04, 0x00, 0x76, 0xe4, 0xf2, 0x53, 0xf8, 0x26, 0x2e, 0x76, 0x3e, 0x2d, 0xd5, 0x1e, 0x7f, 0xf0, 0xbe, 0x15, 0x77, 0x27, 0xc4, 0xbc, 0x42, 0x80, 0x7f, 0x17, 0xbd, 0x39, 0x01, 0x41, 0x04, 0xe6, 0xc2, 0x6e, 0xf6, 0x7d, 0xc6, 0x10, 0xd2, 0xcd, 0x19, 0x24, 0x84, 0x78, 0x9a, 0x6c, 0xf9, 0xae, 0xa9, 0x93, 0x0b, 0x94, 0x4b, 0x7e, 0x2d, 0xb5, 0x34, 0x2b, 0x9d, 0x9e, 0x5b, 0x9f, 0xf7, 0x9a, 0xff, 0x9a, 0x2e, 0xe1, 0x97, 0x8d, 0xd7, 0xfd, 0x01, 0xdf, 0xc5, 0x22, 0xee, 0x02, 0x28, 0x3d, 0x3b, 0x06, 0xa9, 0xd0, 0x3a, 0xcf, 0x80, 0x96, 0x96, 0x8d, 0x7d, 0xbb, 0x0f, 0x91, 0x78, 0xff, 0xff, 0xff, 0xff, 0x02, 0x8b, 0xa7, 0x94, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x19, 0x76, 0xa9, 0x14, 0xba, 0xde, 0xec, 0xfd, 0xef, 0x05, 0x07, 0x24, 0x7f, 0xc8, 0xf7, 0x42, 0x41, 0xd7, 0x3b, 0xc0, 0x39, 0x97, 0x2d, 0x7b, 0x88, 0xac, 0x40, 0x94, 0xa8, 0x02, 0x00, 0x00, 0x00, 0x00, 0x19, 0x76, 0xa9, 0x14, 0xc1, 0x09, 0x32, 0x48, 0x3f, 0xec, 0x93, 0xed, 0x51, 0xf5, 0xfe, 0x95, 0xe7, 0x25, 0x59, 0xf2, 0xcc, 0x70, 0x43, 0xf9, 0x88, 0xac, 0x00, 0x00, 0x00, 0x00, 0x00};
     vector<unsigned char> vch(ch, ch + sizeof(ch) -1);
     CDataStream spendStream(vch, SER_DISK, CLIENT_VERSION);
-    CTransaction spendingTx;
-    spendStream >> spendingTx;
+    CTransaction spendingTx(deserialize, spendStream);
 
     CBloomFilter filter(10, 0.000001, 0, BLOOM_UPDATE_ALL);
     filter.insert(uint256S("0xb4749f017444b051c44dfd2720e88f314ff94f3dd6d56d40ef65854fcd7fff6b"));
diff --git a/src/test/script_tests.cpp b/src/test/script_tests.cpp
index 3169afb13a419..eb324d5a6b781 100644
--- a/src/test/script_tests.cpp
+++ b/src/test/script_tests.cpp
@@ -276,7 +276,7 @@ class TestBuilder
     //! The Witness embedded script
     CScript witscript;
     CScriptWitness scriptWitness;
-    CTransaction creditTx;
+    CTransactionRef creditTx;
     CMutableTransaction spendTx;
     bool havePush;
     std::vector<unsigned char> push;
@@ -319,8 +319,8 @@ class TestBuilder
             redeemscript = scriptPubKey;
             scriptPubKey = CScript() << OP_HASH160 << ToByteVector(CScriptID(redeemscript)) << OP_EQUAL;
         }
-        creditTx = BuildCreditingTransaction(scriptPubKey, nValue);
-        spendTx = BuildSpendingTransaction(CScript(), CScriptWitness(), creditTx);
+        creditTx = MakeTransactionRef(BuildCreditingTransaction(scriptPubKey, nValue));
+        spendTx = BuildSpendingTransaction(CScript(), CScriptWitness(), *creditTx);
     }
 
     TestBuilder& ScriptError(ScriptError_t err)
@@ -421,7 +421,7 @@ class TestBuilder
     {
         TestBuilder copy = *this; // Make a copy so we can rollback the push.
         DoPush();
-        DoTest(creditTx.vout[0].scriptPubKey, spendTx.vin[0].scriptSig, scriptWitness, flags, comment, scriptError, nValue);
+        DoTest(creditTx->vout[0].scriptPubKey, spendTx.vin[0].scriptSig, scriptWitness, flags, comment, scriptError, nValue);
         *this = copy;
         return *this;
     }
@@ -447,7 +447,7 @@ class TestBuilder
             array.push_back(wit);
         }
         array.push_back(FormatScript(spendTx.vin[0].scriptSig));
-        array.push_back(FormatScript(creditTx.vout[0].scriptPubKey));
+        array.push_back(FormatScript(creditTx->vout[0].scriptPubKey));
         array.push_back(FormatScriptFlags(flags));
         array.push_back(FormatScriptError((ScriptError_t)scriptError));
         array.push_back(comment);
@@ -461,7 +461,7 @@ class TestBuilder
 
     const CScript& GetScriptPubKey()
     {
-        return creditTx.vout[0].scriptPubKey;
+        return creditTx->vout[0].scriptPubKey;
     }
 };
 
diff --git a/src/test/serialize_tests.cpp b/src/test/serialize_tests.cpp
index bbadf57957c94..1dc86eb11625a 100644
--- a/src/test/serialize_tests.cpp
+++ b/src/test/serialize_tests.cpp
@@ -21,10 +21,10 @@ class CSerializeMethodsTestSingle
     bool boolval;
     std::string stringval;
     const char* charstrval;
-    CTransaction txval;
+    CTransactionRef txval;
 public:
     CSerializeMethodsTestSingle() = default;
-    CSerializeMethodsTestSingle(int intvalin, bool boolvalin, std::string stringvalin, const char* charstrvalin, CTransaction txvalin) : intval(intvalin), boolval(boolvalin), stringval(std::move(stringvalin)), charstrval(charstrvalin), txval(txvalin){}
+    CSerializeMethodsTestSingle(int intvalin, bool boolvalin, std::string stringvalin, const char* charstrvalin, CTransaction txvalin) : intval(intvalin), boolval(boolvalin), stringval(std::move(stringvalin)), charstrval(charstrvalin), txval(MakeTransactionRef(txvalin)){}
     ADD_SERIALIZE_METHODS;
 
     template <typename Stream, typename Operation>
@@ -42,7 +42,7 @@ class CSerializeMethodsTestSingle
                 boolval == rhs.boolval && \
                 stringval == rhs.stringval && \
                 strcmp(charstrval, rhs.charstrval) == 0 && \
-                txval == rhs.txval;
+                *txval == *rhs.txval;
     }
 };
 
diff --git a/src/test/sighash_tests.cpp b/src/test/sighash_tests.cpp
index 38d58e7ab0181..a524f5b946104 100644
--- a/src/test/sighash_tests.cpp
+++ b/src/test/sighash_tests.cpp
@@ -184,7 +184,7 @@ BOOST_AUTO_TEST_CASE(sighash_from_data)
         std::string raw_tx, raw_script, sigHashHex;
         int nIn, nHashType;
         uint256 sh;
-        CTransaction tx;
+        CTransactionRef tx;
         CScript scriptCode = CScript();
 
         try {
@@ -199,7 +199,7 @@ BOOST_AUTO_TEST_CASE(sighash_from_data)
           stream >> tx;
 
           CValidationState state;
-          BOOST_CHECK_MESSAGE(CheckTransaction(tx, state), strTest);
+          BOOST_CHECK_MESSAGE(CheckTransaction(*tx, state), strTest);
           BOOST_CHECK(state.IsValid());
 
           std::vector<unsigned char> raw = ParseHex(raw_script);
@@ -209,7 +209,7 @@ BOOST_AUTO_TEST_CASE(sighash_from_data)
           continue;
         }
 
-        sh = SignatureHash(scriptCode, tx, nIn, nHashType, 0, SIGVERSION_BASE);
+        sh = SignatureHash(scriptCode, *tx, nIn, nHashType, 0, SIGVERSION_BASE);
         BOOST_CHECK_MESSAGE(sh.GetHex() == sigHashHex, strTest);
     }
 }
diff --git a/src/test/transaction_tests.cpp b/src/test/transaction_tests.cpp
index 7b4763669a871..ae5406ef7e742 100644
--- a/src/test/transaction_tests.cpp
+++ b/src/test/transaction_tests.cpp
@@ -150,8 +150,7 @@ BOOST_AUTO_TEST_CASE(tx_valid)
 
             string transaction = test[1].get_str();
             CDataStream stream(ParseHex(transaction), SER_NETWORK, PROTOCOL_VERSION);
-            CTransaction tx;
-            stream >> tx;
+            CTransaction tx(deserialize, stream);
 
             CValidationState state;
             BOOST_CHECK_MESSAGE(CheckTransaction(tx, state), strTest);
@@ -236,8 +235,7 @@ BOOST_AUTO_TEST_CASE(tx_invalid)
 
             string transaction = test[1].get_str();
             CDataStream stream(ParseHex(transaction), SER_NETWORK, PROTOCOL_VERSION );
-            CTransaction tx;
-            stream >> tx;
+            CTransaction tx(deserialize, stream);
 
             CValidationState state;
             fValid = CheckTransaction(tx, state) && state.IsValid();
@@ -346,7 +344,7 @@ BOOST_AUTO_TEST_CASE(test_Get)
     BOOST_CHECK_EQUAL(coins.GetValueIn(t1), (50+21+22)*CENT);
 }
 
-void CreateCreditAndSpend(const CKeyStore& keystore, const CScript& outscript, CTransaction& output, CMutableTransaction& input, bool success = true)
+void CreateCreditAndSpend(const CKeyStore& keystore, const CScript& outscript, CTransactionRef& output, CMutableTransaction& input, bool success = true)
 {
     CMutableTransaction outputm;
     outputm.nVersion = 1;
@@ -360,22 +358,22 @@ void CreateCreditAndSpend(const CKeyStore& keystore, const CScript& outscript, C
     CDataStream ssout(SER_NETWORK, PROTOCOL_VERSION);
     ssout << outputm;
     ssout >> output;
-    assert(output.vin.size() == 1);
-    assert(output.vin[0] == outputm.vin[0]);
-    assert(output.vout.size() == 1);
-    assert(output.vout[0] == outputm.vout[0]);
-    assert(output.wit.vtxinwit.size() == 0);
+    assert(output->vin.size() == 1);
+    assert(output->vin[0] == outputm.vin[0]);
+    assert(output->vout.size() == 1);
+    assert(output->vout[0] == outputm.vout[0]);
+    assert(output->wit.vtxinwit.size() == 0);
 
     CMutableTransaction inputm;
     inputm.nVersion = 1;
     inputm.vin.resize(1);
-    inputm.vin[0].prevout.hash = output.GetHash();
+    inputm.vin[0].prevout.hash = output->GetHash();
     inputm.vin[0].prevout.n = 0;
     inputm.wit.vtxinwit.resize(1);
     inputm.vout.resize(1);
     inputm.vout[0].nValue = 1;
     inputm.vout[0].scriptPubKey = CScript();
-    bool ret = SignSignature(keystore, output, inputm, 0, SIGHASH_ALL);
+    bool ret = SignSignature(keystore, *output, inputm, 0, SIGHASH_ALL);
     assert(ret == success);
     CDataStream ssin(SER_NETWORK, PROTOCOL_VERSION);
     ssin << inputm;
@@ -393,11 +391,11 @@ void CreateCreditAndSpend(const CKeyStore& keystore, const CScript& outscript, C
     }
 }
 
-void CheckWithFlag(const CTransaction& output, const CMutableTransaction& input, int flags, bool success)
+void CheckWithFlag(const CTransactionRef& output, const CMutableTransaction& input, int flags, bool success)
 {
     ScriptError error;
     CTransaction inputi(input);
-    bool ret = VerifyScript(inputi.vin[0].scriptSig, output.vout[0].scriptPubKey, inputi.wit.vtxinwit.size() > 0 ? &inputi.wit.vtxinwit[0].scriptWitness : NULL, flags, TransactionSignatureChecker(&inputi, 0, output.vout[0].nValue), &error);
+    bool ret = VerifyScript(inputi.vin[0].scriptSig, output->vout[0].scriptPubKey, inputi.wit.vtxinwit.size() > 0 ? &inputi.wit.vtxinwit[0].scriptWitness : NULL, flags, TransactionSignatureChecker(&inputi, 0, output->vout[0].nValue), &error);
     assert(ret == success);
 }
 
@@ -466,10 +464,10 @@ BOOST_AUTO_TEST_CASE(test_big_witness_transaction) {
         assert(hashSigned);
     }
 
-    CTransaction tx;
     CDataStream ssout(SER_NETWORK, PROTOCOL_VERSION);
-    WithOrVersion(&ssout, 0) << mtx;
-    WithOrVersion(&ssout, 0) >> tx;
+    auto vstream = WithOrVersion(&ssout, 0);
+    vstream << mtx;
+    CTransaction tx(deserialize, vstream);
 
     // check all inputs concurrently, with the cache
     PrecomputedTransactionData txdata(tx);
@@ -547,7 +545,7 @@ BOOST_AUTO_TEST_CASE(test_witness)
     keystore2.AddCScript(GetScriptForWitness(scriptMulti));
     keystore2.AddKeyPubKey(key3, pubkey3);
 
-    CTransaction output1, output2;
+    CTransactionRef output1, output2;
     CMutableTransaction input1, input2;
     SignatureData sigdata;
 
@@ -639,8 +637,8 @@ BOOST_AUTO_TEST_CASE(test_witness)
     CheckWithFlag(output1, input1, 0, false);
     CreateCreditAndSpend(keystore2, scriptMulti, output2, input2, false);
     CheckWithFlag(output2, input2, 0, false);
-    BOOST_CHECK(output1 == output2);
-    UpdateTransaction(input1, 0, CombineSignatures(output1.vout[0].scriptPubKey, MutableTransactionSignatureChecker(&input1, 0, output1.vout[0].nValue), DataFromTransaction(input1, 0), DataFromTransaction(input2, 0)));
+    BOOST_CHECK(*output1 == *output2);
+    UpdateTransaction(input1, 0, CombineSignatures(output1->vout[0].scriptPubKey, MutableTransactionSignatureChecker(&input1, 0, output1->vout[0].nValue), DataFromTransaction(input1, 0), DataFromTransaction(input2, 0)));
     CheckWithFlag(output1, input1, STANDARD_SCRIPT_VERIFY_FLAGS, true);
 
     // P2SH 2-of-2 multisig
@@ -650,8 +648,8 @@ BOOST_AUTO_TEST_CASE(test_witness)
     CreateCreditAndSpend(keystore2, GetScriptForDestination(CScriptID(scriptMulti)), output2, input2, false);
     CheckWithFlag(output2, input2, 0, true);
     CheckWithFlag(output2, input2, SCRIPT_VERIFY_P2SH, false);
-    BOOST_CHECK(output1 == output2);
-    UpdateTransaction(input1, 0, CombineSignatures(output1.vout[0].scriptPubKey, MutableTransactionSignatureChecker(&input1, 0, output1.vout[0].nValue), DataFromTransaction(input1, 0), DataFromTransaction(input2, 0)));
+    BOOST_CHECK(*output1 == *output2);
+    UpdateTransaction(input1, 0, CombineSignatures(output1->vout[0].scriptPubKey, MutableTransactionSignatureChecker(&input1, 0, output1->vout[0].nValue), DataFromTransaction(input1, 0), DataFromTransaction(input2, 0)));
     CheckWithFlag(output1, input1, SCRIPT_VERIFY_P2SH, true);
     CheckWithFlag(output1, input1, STANDARD_SCRIPT_VERIFY_FLAGS, true);
 
@@ -662,8 +660,8 @@ BOOST_AUTO_TEST_CASE(test_witness)
     CreateCreditAndSpend(keystore2, GetScriptForWitness(scriptMulti), output2, input2, false);
     CheckWithFlag(output2, input2, 0, true);
     CheckWithFlag(output2, input2, SCRIPT_VERIFY_P2SH | SCRIPT_VERIFY_WITNESS, false);
-    BOOST_CHECK(output1 == output2);
-    UpdateTransaction(input1, 0, CombineSignatures(output1.vout[0].scriptPubKey, MutableTransactionSignatureChecker(&input1, 0, output1.vout[0].nValue), DataFromTransaction(input1, 0), DataFromTransaction(input2, 0)));
+    BOOST_CHECK(*output1 == *output2);
+    UpdateTransaction(input1, 0, CombineSignatures(output1->vout[0].scriptPubKey, MutableTransactionSignatureChecker(&input1, 0, output1->vout[0].nValue), DataFromTransaction(input1, 0), DataFromTransaction(input2, 0)));
     CheckWithFlag(output1, input1, SCRIPT_VERIFY_P2SH | SCRIPT_VERIFY_WITNESS, true);
     CheckWithFlag(output1, input1, STANDARD_SCRIPT_VERIFY_FLAGS, true);
 
@@ -674,8 +672,8 @@ BOOST_AUTO_TEST_CASE(test_witness)
     CreateCreditAndSpend(keystore2, GetScriptForDestination(CScriptID(GetScriptForWitness(scriptMulti))), output2, input2, false);
     CheckWithFlag(output2, input2, SCRIPT_VERIFY_P2SH, true);
     CheckWithFlag(output2, input2, SCRIPT_VERIFY_P2SH | SCRIPT_VERIFY_WITNESS, false);
-    BOOST_CHECK(output1 == output2);
-    UpdateTransaction(input1, 0, CombineSignatures(output1.vout[0].scriptPubKey, MutableTransactionSignatureChecker(&input1, 0, output1.vout[0].nValue), DataFromTransaction(input1, 0), DataFromTransaction(input2, 0)));
+    BOOST_CHECK(*output1 == *output2);
+    UpdateTransaction(input1, 0, CombineSignatures(output1->vout[0].scriptPubKey, MutableTransactionSignatureChecker(&input1, 0, output1->vout[0].nValue), DataFromTransaction(input1, 0), DataFromTransaction(input2, 0)));
     CheckWithFlag(output1, input1, SCRIPT_VERIFY_P2SH | SCRIPT_VERIFY_WITNESS, true);
     CheckWithFlag(output1, input1, STANDARD_SCRIPT_VERIFY_FLAGS, true);
 }
diff --git a/src/validation.cpp b/src/validation.cpp
index fe34565131138..7eef14af2b748 100644
--- a/src/validation.cpp
+++ b/src/validation.cpp
@@ -2859,8 +2859,9 @@ std::vector<unsigned char> GenerateCoinbaseCommitment(CBlock& block, const CBloc
             out.scriptPubKey[5] = 0xed;
             memcpy(&out.scriptPubKey[6], witnessroot.begin(), 32);
             commitment = std::vector<unsigned char>(out.scriptPubKey.begin(), out.scriptPubKey.end());
-            const_cast<std::vector<CTxOut>*>(&block.vtx[0]->vout)->push_back(out);
-            block.vtx[0]->UpdateHash();
+            CMutableTransaction tx(*block.vtx[0]);
+            tx.vout.push_back(out);
+            block.vtx[0] = MakeTransactionRef(std::move(tx));
         }
     }
     UpdateUncommittedBlockStructures(block, pindexPrev, consensusParams);
@@ -4090,10 +4091,9 @@ bool LoadMempool(void)
         file >> num;
         double prioritydummy = 0;
         while (num--) {
-            CTransaction tx;
             int64_t nTime;
             int64_t nFeeDelta;
-            file >> tx;
+            CTransaction tx(deserialize, file);
             file >> nTime;
             file >> nFeeDelta;
 

From 9b9324ee49e3e9cd401cedb8cdfce9a4b7c040de Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Fri, 2 Dec 2016 18:33:15 -0800
Subject: [PATCH 1306/1802] Fix rounding privacy leak introduced in #9260

---
 src/net_processing.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/net_processing.cpp b/src/net_processing.cpp
index 747167264b772..7c87cc4c1d4c1 100644
--- a/src/net_processing.cpp
+++ b/src/net_processing.cpp
@@ -2995,7 +2995,8 @@ bool SendMessages(CNode* pto, CConnman& connman)
             CAmount currentFilter = mempool.GetMinFee(GetArg("-maxmempool", DEFAULT_MAX_MEMPOOL_SIZE) * 1000000).GetFeePerK();
             int64_t timeNow = GetTimeMicros();
             if (timeNow > pto->nextSendTimeFeeFilter) {
-                static FeeFilterRounder filterRounder(::minRelayTxFee);
+                static CFeeRate default_feerate(DEFAULT_MIN_RELAY_TX_FEE);
+                static FeeFilterRounder filterRounder(default_feerate);
                 CAmount filterToSend = filterRounder.round(currentFilter);
                 if (filterToSend != pto->lastSentFeeFilter) {
                     connman.PushMessage(pto, msgMaker.Make(NetMsgType::FEEFILTER, filterToSend));

From c63198f1c787d69052d6332c5e52118f58eacf56 Mon Sep 17 00:00:00 2001
From: Gregory Maxwell <greg@xiph.org>
Date: Tue, 29 Nov 2016 01:00:11 +0000
Subject: [PATCH 1307/1802] Make QT runawayException call GetWarnings instead
 of directly access strMiscWarning.

This is a first step in avoiding racy accesses to strMiscWarning.

The change required moving GetWarnings and related globals to util.
---
 src/qt/bitcoin.cpp |  6 +++---
 src/util.cpp       | 47 ++++++++++++++++++++++++++++++++++++++++++++++
 src/util.h         |  7 +++++++
 src/validation.cpp | 47 ++--------------------------------------------
 src/validation.h   |  1 -
 5 files changed, 59 insertions(+), 49 deletions(-)

diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp
index 4f48e21a22ec0..ba49830297559 100644
--- a/src/qt/bitcoin.cpp
+++ b/src/qt/bitcoin.cpp
@@ -260,7 +260,7 @@ BitcoinCore::BitcoinCore():
 void BitcoinCore::handleRunawayException(const std::exception *e)
 {
     PrintExceptionContinue(e, "Runaway exception");
-    Q_EMIT runawayException(QString::fromStdString(strMiscWarning));
+    Q_EMIT runawayException(QString::fromStdString(GetWarnings("gui")));
 }
 
 void BitcoinCore::initialize()
@@ -691,10 +691,10 @@ int main(int argc, char *argv[])
         app.exec();
     } catch (const std::exception& e) {
         PrintExceptionContinue(&e, "Runaway exception");
-        app.handleRunawayException(QString::fromStdString(strMiscWarning));
+        app.handleRunawayException(QString::fromStdString(GetWarnings("gui")));
     } catch (...) {
         PrintExceptionContinue(NULL, "Runaway exception");
-        app.handleRunawayException(QString::fromStdString(strMiscWarning));
+        app.handleRunawayException(QString::fromStdString(GetWarnings("gui")));
     }
     return app.getReturnValue();
 }
diff --git a/src/util.cpp b/src/util.cpp
index 014013d214110..a2e6b85d297d6 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -107,7 +107,11 @@ map<string, vector<string> > mapMultiArgs;
 bool fDebug = false;
 bool fPrintToConsole = false;
 bool fPrintToDebugLog = true;
+
 string strMiscWarning;
+bool fLargeWorkForkFound = false;
+bool fLargeWorkInvalidChainFound = false;
+
 bool fLogTimestamps = DEFAULT_LOGTIMESTAMPS;
 bool fLogTimeMicros = DEFAULT_LOGTIMEMICROS;
 bool fLogIPs = DEFAULT_LOGIPS;
@@ -808,3 +812,46 @@ std::string CopyrightHolders(const std::string& strPrefix)
     }
     return strCopyrightHolders;
 }
+
+std::string GetWarnings(const std::string& strFor)
+{
+    string strStatusBar;
+    string strRPC;
+    string strGUI;
+    const string uiAlertSeperator = "<hr />";
+
+    if (!CLIENT_VERSION_IS_RELEASE) {
+        strStatusBar = "This is a pre-release test build - use at your own risk - do not use for mining or merchant applications";
+        strGUI = _("This is a pre-release test build - use at your own risk - do not use for mining or merchant applications");
+    }
+
+    if (GetBoolArg("-testsafemode", DEFAULT_TESTSAFEMODE))
+        strStatusBar = strRPC = strGUI = "testsafemode enabled";
+
+    // Misc warnings like out of disk space and clock is wrong
+    if (strMiscWarning != "")
+    {
+        strStatusBar = strMiscWarning;
+        strGUI += (strGUI.empty() ? "" : uiAlertSeperator) + strMiscWarning;
+    }
+
+    if (fLargeWorkForkFound)
+    {
+        strStatusBar = strRPC = "Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.";
+        strGUI += (strGUI.empty() ? "" : uiAlertSeperator) + _("Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.");
+    }
+    else if (fLargeWorkInvalidChainFound)
+    {
+        strStatusBar = strRPC = "Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.";
+        strGUI += (strGUI.empty() ? "" : uiAlertSeperator) + _("Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.");
+    }
+
+    if (strFor == "gui")
+        return strGUI;
+    else if (strFor == "statusbar")
+        return strStatusBar;
+    else if (strFor == "rpc")
+        return strRPC;
+    assert(!"GetWarnings(): invalid parameter");
+    return "error";
+}
diff --git a/src/util.h b/src/util.h
index e8aa266f287bb..edc190e1e5257 100644
--- a/src/util.h
+++ b/src/util.h
@@ -46,7 +46,12 @@ extern std::map<std::string, std::vector<std::string> > mapMultiArgs;
 extern bool fDebug;
 extern bool fPrintToConsole;
 extern bool fPrintToDebugLog;
+
+static const bool DEFAULT_TESTSAFEMODE = false;
 extern std::string strMiscWarning;
+extern bool fLargeWorkForkFound;
+extern bool fLargeWorkInvalidChainFound;
+
 extern bool fLogTimestamps;
 extern bool fLogTimeMicros;
 extern bool fLogIPs;
@@ -224,4 +229,6 @@ template <typename Callable> void TraceThread(const char* name,  Callable func)
 
 std::string CopyrightHolders(const std::string& strPrefix);
 
+std::string GetWarnings(const std::string& strFor);
+
 #endif // BITCOIN_UTIL_H
diff --git a/src/validation.cpp b/src/validation.cpp
index 9cfb5221a62d8..a17ae041db325 100644
--- a/src/validation.cpp
+++ b/src/validation.cpp
@@ -1149,8 +1149,6 @@ bool IsInitialBlockDownload()
     return false;
 }
 
-bool fLargeWorkForkFound = false;
-bool fLargeWorkInvalidChainFound = false;
 CBlockIndex *pindexBestForkTip = NULL, *pindexBestForkBase = NULL;
 
 static void AlertNotify(const std::string& strMessage)
@@ -4005,51 +4003,10 @@ void static CheckBlockIndex(const Consensus::Params& consensusParams)
     assert(nNodes == forward.size());
 }
 
-std::string GetWarnings(const std::string& strFor)
+std::string CBlockFileInfo::ToString() const
 {
-    string strStatusBar;
-    string strRPC;
-    string strGUI;
-    const string uiAlertSeperator = "<hr />";
-
-    if (!CLIENT_VERSION_IS_RELEASE) {
-        strStatusBar = "This is a pre-release test build - use at your own risk - do not use for mining or merchant applications";
-        strGUI = _("This is a pre-release test build - use at your own risk - do not use for mining or merchant applications");
-    }
-
-    if (GetBoolArg("-testsafemode", DEFAULT_TESTSAFEMODE))
-        strStatusBar = strRPC = strGUI = "testsafemode enabled";
-
-    // Misc warnings like out of disk space and clock is wrong
-    if (strMiscWarning != "")
-    {
-        strStatusBar = strMiscWarning;
-        strGUI += (strGUI.empty() ? "" : uiAlertSeperator) + strMiscWarning;
-    }
-
-    if (fLargeWorkForkFound)
-    {
-        strStatusBar = strRPC = "Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.";
-        strGUI += (strGUI.empty() ? "" : uiAlertSeperator) + _("Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.");
-    }
-    else if (fLargeWorkInvalidChainFound)
-    {
-        strStatusBar = strRPC = "Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.";
-        strGUI += (strGUI.empty() ? "" : uiAlertSeperator) + _("Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.");
-    }
-
-    if (strFor == "gui")
-        return strGUI;
-    else if (strFor == "statusbar")
-        return strStatusBar;
-    else if (strFor == "rpc")
-        return strRPC;
-    assert(!"GetWarnings(): invalid parameter");
-    return "error";
+    return strprintf("CBlockFileInfo(blocks=%u, size=%u, heights=%u...%u, time=%s...%s)", nBlocks, nSize, nHeightFirst, nHeightLast, DateTimeStrFormat("%Y-%m-%d", nTimeFirst), DateTimeStrFormat("%Y-%m-%d", nTimeLast));
 }
- std::string CBlockFileInfo::ToString() const {
-     return strprintf("CBlockFileInfo(blocks=%u, size=%u, heights=%u...%u, time=%s...%s)", nBlocks, nSize, nHeightFirst, nHeightLast, DateTimeStrFormat("%Y-%m-%d", nTimeFirst), DateTimeStrFormat("%Y-%m-%d", nTimeLast));
- }
 
 ThresholdState VersionBitsTipState(const Consensus::Params& params, Consensus::DeploymentPos pos)
 {
diff --git a/src/validation.h b/src/validation.h
index a798cf37022e8..7049cd232f1f7 100644
--- a/src/validation.h
+++ b/src/validation.h
@@ -137,7 +137,6 @@ static const bool DEFAULT_CHECKPOINTS_ENABLED = true;
 static const bool DEFAULT_TXINDEX = false;
 static const unsigned int DEFAULT_BANSCORE_THRESHOLD = 100;
 
-static const bool DEFAULT_TESTSAFEMODE = false;
 /** Default for -mempoolreplacement */
 static const bool DEFAULT_ENABLE_REPLACEMENT = true;
 /** Default for using fee filter */

From e3ba0ef95636290a3bb597ddd25d13ea13b034aa Mon Sep 17 00:00:00 2001
From: Gregory Maxwell <greg@xiph.org>
Date: Tue, 29 Nov 2016 09:46:19 +0000
Subject: [PATCH 1308/1802] Eliminate data races for strMiscWarning and
 fLargeWork*Found.

This moves all access to these datastructures through accessor functions
 and protects them with a lock.
---
 src/timedata.cpp   |  4 ++--
 src/util.cpp       | 33 +++++++++++++++++++++++++++++++++
 src/util.h         |  8 +++++---
 src/validation.cpp | 24 +++++++++++++-----------
 4 files changed, 53 insertions(+), 16 deletions(-)

diff --git a/src/timedata.cpp b/src/timedata.cpp
index 25fc494121d4d..256c91016dbc9 100644
--- a/src/timedata.cpp
+++ b/src/timedata.cpp
@@ -103,8 +103,8 @@ void AddTimeData(const CNetAddr& ip, int64_t nOffsetSample)
                 if (!fMatch)
                 {
                     fDone = true;
-                    string strMessage = strprintf(_("Please check that your computer's date and time are correct! If your clock is wrong, %s will not work properly."), _(PACKAGE_NAME));
-                    strMiscWarning = strMessage;
+                    std::string strMessage = strprintf(_("Please check that your computer's date and time are correct! If your clock is wrong, %s will not work properly."), _(PACKAGE_NAME));
+                    SetMiscWarning(strMessage);
                     uiInterface.ThreadSafeMessageBox(strMessage, "", CClientUIInterface::MSG_WARNING);
                 }
             }
diff --git a/src/util.cpp b/src/util.cpp
index a2e6b85d297d6..92a5b34a3ff2a 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -108,6 +108,7 @@ bool fDebug = false;
 bool fPrintToConsole = false;
 bool fPrintToDebugLog = true;
 
+CCriticalSection cs_warnings;
 string strMiscWarning;
 bool fLargeWorkForkFound = false;
 bool fLargeWorkInvalidChainFound = false;
@@ -813,6 +814,36 @@ std::string CopyrightHolders(const std::string& strPrefix)
     return strCopyrightHolders;
 }
 
+void SetMiscWarning(const std::string& strWarning)
+{
+    LOCK(cs_warnings);
+    strMiscWarning = strWarning;
+}
+
+void SetfLargeWorkForkFound(bool flag)
+{
+    LOCK(cs_warnings);
+    fLargeWorkForkFound = flag;
+}
+
+bool GetfLargeWorkForkFound()
+{
+    LOCK(cs_warnings);
+    return fLargeWorkForkFound;
+}
+
+void SetfLargeWorkInvalidChainFound(bool flag)
+{
+    LOCK(cs_warnings);
+    fLargeWorkInvalidChainFound = flag;
+}
+
+bool GetfLargeWorkInvalidChainFound()
+{
+    LOCK(cs_warnings);
+    return fLargeWorkInvalidChainFound;
+}
+
 std::string GetWarnings(const std::string& strFor)
 {
     string strStatusBar;
@@ -820,6 +851,8 @@ std::string GetWarnings(const std::string& strFor)
     string strGUI;
     const string uiAlertSeperator = "<hr />";
 
+    LOCK(cs_warnings);
+
     if (!CLIENT_VERSION_IS_RELEASE) {
         strStatusBar = "This is a pre-release test build - use at your own risk - do not use for mining or merchant applications";
         strGUI = _("This is a pre-release test build - use at your own risk - do not use for mining or merchant applications");
diff --git a/src/util.h b/src/util.h
index edc190e1e5257..b34966fd80513 100644
--- a/src/util.h
+++ b/src/util.h
@@ -48,9 +48,6 @@ extern bool fPrintToConsole;
 extern bool fPrintToDebugLog;
 
 static const bool DEFAULT_TESTSAFEMODE = false;
-extern std::string strMiscWarning;
-extern bool fLargeWorkForkFound;
-extern bool fLargeWorkInvalidChainFound;
 
 extern bool fLogTimestamps;
 extern bool fLogTimeMicros;
@@ -229,6 +226,11 @@ template <typename Callable> void TraceThread(const char* name,  Callable func)
 
 std::string CopyrightHolders(const std::string& strPrefix);
 
+void SetMiscWarning(const std::string& strWarning);
+void SetfLargeWorkForkFound(bool flag);
+bool GetfLargeWorkForkFound();
+void SetfLargeWorkInvalidChainFound(bool flag);
+bool GetfLargeWorkInvalidChainFound();
 std::string GetWarnings(const std::string& strFor);
 
 #endif // BITCOIN_UTIL_H
diff --git a/src/validation.cpp b/src/validation.cpp
index a17ae041db325..fde52ea74def8 100644
--- a/src/validation.cpp
+++ b/src/validation.cpp
@@ -1183,7 +1183,7 @@ void CheckForkWarningConditions()
 
     if (pindexBestForkTip || (pindexBestInvalid && pindexBestInvalid->nChainWork > chainActive.Tip()->nChainWork + (GetBlockProof(*chainActive.Tip()) * 6)))
     {
-        if (!fLargeWorkForkFound && pindexBestForkBase)
+        if (!GetfLargeWorkForkFound() && pindexBestForkBase)
         {
             std::string warning = std::string("'Warning: Large-work fork detected, forking after block ") +
                 pindexBestForkBase->phashBlock->ToString() + std::string("'");
@@ -1194,18 +1194,18 @@ void CheckForkWarningConditions()
             LogPrintf("%s: Warning: Large valid fork found\n  forking the chain at height %d (%s)\n  lasting to height %d (%s).\nChain state database corruption likely.\n", __func__,
                    pindexBestForkBase->nHeight, pindexBestForkBase->phashBlock->ToString(),
                    pindexBestForkTip->nHeight, pindexBestForkTip->phashBlock->ToString());
-            fLargeWorkForkFound = true;
+            SetfLargeWorkForkFound(true);
         }
         else
         {
             LogPrintf("%s: Warning: Found invalid chain at least ~6 blocks longer than our best chain.\nChain state database corruption likely.\n", __func__);
-            fLargeWorkInvalidChainFound = true;
+            SetfLargeWorkInvalidChainFound(true);
         }
     }
     else
     {
-        fLargeWorkForkFound = false;
-        fLargeWorkInvalidChainFound = false;
+        SetfLargeWorkForkFound(false);
+        SetfLargeWorkInvalidChainFound(false);
     }
 }
 
@@ -1481,7 +1481,7 @@ bool UndoReadFromDisk(CBlockUndo& blockundo, const CDiskBlockPos& pos, const uin
 /** Abort with a message */
 bool AbortNode(const std::string& strMessage, const std::string& userMessage="")
 {
-    strMiscWarning = strMessage;
+    SetMiscWarning(strMessage);
     LogPrintf("*** %s\n", strMessage);
     uiInterface.ThreadSafeMessageBox(
         userMessage.empty() ? _("Error: A fatal internal error occurred, see debug.log for details") : userMessage,
@@ -2050,9 +2050,10 @@ void static UpdateTip(CBlockIndex *pindexNew, const CChainParams& chainParams) {
             ThresholdState state = checker.GetStateFor(pindex, chainParams.GetConsensus(), warningcache[bit]);
             if (state == THRESHOLD_ACTIVE || state == THRESHOLD_LOCKED_IN) {
                 if (state == THRESHOLD_ACTIVE) {
-                    strMiscWarning = strprintf(_("Warning: unknown new rules activated (versionbit %i)"), bit);
+                    std::string strWarning = strprintf(_("Warning: unknown new rules activated (versionbit %i)"), bit);
+                    SetMiscWarning(strWarning);
                     if (!fWarned) {
-                        AlertNotify(strMiscWarning);
+                        AlertNotify(strWarning);
                         fWarned = true;
                     }
                 } else {
@@ -2072,10 +2073,11 @@ void static UpdateTip(CBlockIndex *pindexNew, const CChainParams& chainParams) {
             warningMessages.push_back(strprintf("%d of last 100 blocks have unexpected version", nUpgraded));
         if (nUpgraded > 100/2)
         {
-            // strMiscWarning is read by GetWarnings(), called by Qt and the JSON-RPC code to warn the user:
-            strMiscWarning = _("Warning: Unknown block versions being mined! It's possible unknown rules are in effect");
+            std::string strWarning = _("Warning: Unknown block versions being mined! It's possible unknown rules are in effect");
+            // notify GetWarnings(), called by Qt and the JSON-RPC code to warn the user:
+            SetMiscWarning(strWarning);
             if (!fWarned) {
-                AlertNotify(strMiscWarning);
+                AlertNotify(strWarning);
                 fWarned = true;
             }
         }

From 749be013f5cba0bbb01f1f89df77106aea5a4cc1 Mon Sep 17 00:00:00 2001
From: Gregory Maxwell <greg@xiph.org>
Date: Wed, 30 Nov 2016 06:07:42 +0000
Subject: [PATCH 1309/1802] Move GetWarnings() into its own file.

---
 src/Makefile.am    |  2 ++
 src/init.cpp       |  1 +
 src/qt/bitcoin.cpp |  1 +
 src/timedata.cpp   |  1 +
 src/util.cpp       | 80 -----------------------------------------
 src/util.h         |  9 -----
 src/validation.cpp |  1 +
 src/warnings.cpp   | 89 ++++++++++++++++++++++++++++++++++++++++++++++
 src/warnings.h     | 21 +++++++++++
 9 files changed, 116 insertions(+), 89 deletions(-)
 create mode 100644 src/warnings.cpp
 create mode 100644 src/warnings.h

diff --git a/src/Makefile.am b/src/Makefile.am
index 8c12aee217576..89f2ed5e996c1 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -154,6 +154,7 @@ BITCOIN_CORE_H = \
   wallet/rpcwallet.h \
   wallet/wallet.h \
   wallet/walletdb.h \
+  warnings.h \
   zmq/zmqabstractnotifier.h \
   zmq/zmqconfig.h\
   zmq/zmqnotificationinterface.h \
@@ -305,6 +306,7 @@ libbitcoin_common_a_SOURCES = \
   scheduler.cpp \
   script/sign.cpp \
   script/standard.cpp \
+  warnings.cpp \
   $(BITCOIN_CORE_H)
 
 # util: shared between all executables.
diff --git a/src/init.cpp b/src/init.cpp
index ba5fe4152a8dc..33a30277b868f 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -41,6 +41,7 @@
 #ifdef ENABLE_WALLET
 #include "wallet/wallet.h"
 #endif
+#include "warnings.h"
 #include <stdint.h>
 #include <stdio.h>
 #include <memory>
diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp
index ba49830297559..cfd0955a749b8 100644
--- a/src/qt/bitcoin.cpp
+++ b/src/qt/bitcoin.cpp
@@ -30,6 +30,7 @@
 #include "scheduler.h"
 #include "ui_interface.h"
 #include "util.h"
+#include "warnings.h"
 
 #ifdef ENABLE_WALLET
 #include "wallet/wallet.h"
diff --git a/src/timedata.cpp b/src/timedata.cpp
index 256c91016dbc9..b3cbdcf883261 100644
--- a/src/timedata.cpp
+++ b/src/timedata.cpp
@@ -13,6 +13,7 @@
 #include "ui_interface.h"
 #include "util.h"
 #include "utilstrencodings.h"
+#include "warnings.h"
 
 #include <boost/foreach.hpp>
 
diff --git a/src/util.cpp b/src/util.cpp
index 92a5b34a3ff2a..76eab7ca5f5ee 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -108,11 +108,6 @@ bool fDebug = false;
 bool fPrintToConsole = false;
 bool fPrintToDebugLog = true;
 
-CCriticalSection cs_warnings;
-string strMiscWarning;
-bool fLargeWorkForkFound = false;
-bool fLargeWorkInvalidChainFound = false;
-
 bool fLogTimestamps = DEFAULT_LOGTIMESTAMPS;
 bool fLogTimeMicros = DEFAULT_LOGTIMEMICROS;
 bool fLogIPs = DEFAULT_LOGIPS;
@@ -813,78 +808,3 @@ std::string CopyrightHolders(const std::string& strPrefix)
     }
     return strCopyrightHolders;
 }
-
-void SetMiscWarning(const std::string& strWarning)
-{
-    LOCK(cs_warnings);
-    strMiscWarning = strWarning;
-}
-
-void SetfLargeWorkForkFound(bool flag)
-{
-    LOCK(cs_warnings);
-    fLargeWorkForkFound = flag;
-}
-
-bool GetfLargeWorkForkFound()
-{
-    LOCK(cs_warnings);
-    return fLargeWorkForkFound;
-}
-
-void SetfLargeWorkInvalidChainFound(bool flag)
-{
-    LOCK(cs_warnings);
-    fLargeWorkInvalidChainFound = flag;
-}
-
-bool GetfLargeWorkInvalidChainFound()
-{
-    LOCK(cs_warnings);
-    return fLargeWorkInvalidChainFound;
-}
-
-std::string GetWarnings(const std::string& strFor)
-{
-    string strStatusBar;
-    string strRPC;
-    string strGUI;
-    const string uiAlertSeperator = "<hr />";
-
-    LOCK(cs_warnings);
-
-    if (!CLIENT_VERSION_IS_RELEASE) {
-        strStatusBar = "This is a pre-release test build - use at your own risk - do not use for mining or merchant applications";
-        strGUI = _("This is a pre-release test build - use at your own risk - do not use for mining or merchant applications");
-    }
-
-    if (GetBoolArg("-testsafemode", DEFAULT_TESTSAFEMODE))
-        strStatusBar = strRPC = strGUI = "testsafemode enabled";
-
-    // Misc warnings like out of disk space and clock is wrong
-    if (strMiscWarning != "")
-    {
-        strStatusBar = strMiscWarning;
-        strGUI += (strGUI.empty() ? "" : uiAlertSeperator) + strMiscWarning;
-    }
-
-    if (fLargeWorkForkFound)
-    {
-        strStatusBar = strRPC = "Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.";
-        strGUI += (strGUI.empty() ? "" : uiAlertSeperator) + _("Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.");
-    }
-    else if (fLargeWorkInvalidChainFound)
-    {
-        strStatusBar = strRPC = "Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.";
-        strGUI += (strGUI.empty() ? "" : uiAlertSeperator) + _("Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.");
-    }
-
-    if (strFor == "gui")
-        return strGUI;
-    else if (strFor == "statusbar")
-        return strStatusBar;
-    else if (strFor == "rpc")
-        return strRPC;
-    assert(!"GetWarnings(): invalid parameter");
-    return "error";
-}
diff --git a/src/util.h b/src/util.h
index b34966fd80513..3ec38a7c7db2b 100644
--- a/src/util.h
+++ b/src/util.h
@@ -47,8 +47,6 @@ extern bool fDebug;
 extern bool fPrintToConsole;
 extern bool fPrintToDebugLog;
 
-static const bool DEFAULT_TESTSAFEMODE = false;
-
 extern bool fLogTimestamps;
 extern bool fLogTimeMicros;
 extern bool fLogIPs;
@@ -226,11 +224,4 @@ template <typename Callable> void TraceThread(const char* name,  Callable func)
 
 std::string CopyrightHolders(const std::string& strPrefix);
 
-void SetMiscWarning(const std::string& strWarning);
-void SetfLargeWorkForkFound(bool flag);
-bool GetfLargeWorkForkFound();
-void SetfLargeWorkInvalidChainFound(bool flag);
-bool GetfLargeWorkInvalidChainFound();
-std::string GetWarnings(const std::string& strFor);
-
 #endif // BITCOIN_UTIL_H
diff --git a/src/validation.cpp b/src/validation.cpp
index fde52ea74def8..55632ebdf22e7 100644
--- a/src/validation.cpp
+++ b/src/validation.cpp
@@ -34,6 +34,7 @@
 #include "utilstrencodings.h"
 #include "validationinterface.h"
 #include "versionbits.h"
+#include "warnings.h"
 
 #include <atomic>
 #include <sstream>
diff --git a/src/warnings.cpp b/src/warnings.cpp
new file mode 100644
index 0000000000000..2c1b1b0e12d8f
--- /dev/null
+++ b/src/warnings.cpp
@@ -0,0 +1,89 @@
+// Copyright (c) 2009-2010 Satoshi Nakamoto
+// Copyright (c) 2009-2016 The Bitcoin Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#include "sync.h"
+#include "clientversion.h"
+#include "util.h"
+#include "warnings.h"
+
+CCriticalSection cs_warnings;
+std::string strMiscWarning;
+bool fLargeWorkForkFound = false;
+bool fLargeWorkInvalidChainFound = false;
+
+void SetMiscWarning(const std::string& strWarning)
+{
+    LOCK(cs_warnings);
+    strMiscWarning = strWarning;
+}
+
+void SetfLargeWorkForkFound(bool flag)
+{
+    LOCK(cs_warnings);
+    fLargeWorkForkFound = flag;
+}
+
+bool GetfLargeWorkForkFound()
+{
+    LOCK(cs_warnings);
+    return fLargeWorkForkFound;
+}
+
+void SetfLargeWorkInvalidChainFound(bool flag)
+{
+    LOCK(cs_warnings);
+    fLargeWorkInvalidChainFound = flag;
+}
+
+bool GetfLargeWorkInvalidChainFound()
+{
+    LOCK(cs_warnings);
+    return fLargeWorkInvalidChainFound;
+}
+
+std::string GetWarnings(const std::string& strFor)
+{
+    std::string strStatusBar;
+    std::string strRPC;
+    std::string strGUI;
+    const std::string uiAlertSeperator = "<hr />";
+
+    LOCK(cs_warnings);
+
+    if (!CLIENT_VERSION_IS_RELEASE) {
+        strStatusBar = "This is a pre-release test build - use at your own risk - do not use for mining or merchant applications";
+        strGUI = _("This is a pre-release test build - use at your own risk - do not use for mining or merchant applications");
+    }
+
+    if (GetBoolArg("-testsafemode", DEFAULT_TESTSAFEMODE))
+        strStatusBar = strRPC = strGUI = "testsafemode enabled";
+
+    // Misc warnings like out of disk space and clock is wrong
+    if (strMiscWarning != "")
+    {
+        strStatusBar = strMiscWarning;
+        strGUI += (strGUI.empty() ? "" : uiAlertSeperator) + strMiscWarning;
+    }
+
+    if (fLargeWorkForkFound)
+    {
+        strStatusBar = strRPC = "Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.";
+        strGUI += (strGUI.empty() ? "" : uiAlertSeperator) + _("Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.");
+    }
+    else if (fLargeWorkInvalidChainFound)
+    {
+        strStatusBar = strRPC = "Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.";
+        strGUI += (strGUI.empty() ? "" : uiAlertSeperator) + _("Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.");
+    }
+
+    if (strFor == "gui")
+        return strGUI;
+    else if (strFor == "statusbar")
+        return strStatusBar;
+    else if (strFor == "rpc")
+        return strRPC;
+    assert(!"GetWarnings(): invalid parameter");
+    return "error";
+}
diff --git a/src/warnings.h b/src/warnings.h
new file mode 100644
index 0000000000000..a7aa6574264c1
--- /dev/null
+++ b/src/warnings.h
@@ -0,0 +1,21 @@
+// Copyright (c) 2009-2010 Satoshi Nakamoto
+// Copyright (c) 2009-2016 The Bitcoin Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#ifndef BITCOIN_WARNINGS_H
+#define BITCOIN_WARNINGS_H
+
+#include <stdlib.h>
+#include <string>
+
+void SetMiscWarning(const std::string& strWarning);
+void SetfLargeWorkForkFound(bool flag);
+bool GetfLargeWorkForkFound();
+void SetfLargeWorkInvalidChainFound(bool flag);
+bool GetfLargeWorkInvalidChainFound();
+std::string GetWarnings(const std::string& strFor);
+
+static const bool DEFAULT_TESTSAFEMODE = false;
+
+#endif //  BITCOIN_WARNINGS_H

From dfbe0d530f75ca3a9121ed1a391165c90f1068c4 Mon Sep 17 00:00:00 2001
From: Alex Morcos <morcos@chaincode.com>
Date: Thu, 1 Dec 2016 22:06:51 -0500
Subject: [PATCH 1310/1802] Add unstored orphans with rejected parents to
 recentRejects

---
 src/net_processing.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/net_processing.cpp b/src/net_processing.cpp
index 747167264b772..4a5ae0e69cbd5 100644
--- a/src/net_processing.cpp
+++ b/src/net_processing.cpp
@@ -1707,6 +1707,9 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
                     LogPrint("mempool", "mapOrphan overflow, removed %u tx\n", nEvicted);
             } else {
                 LogPrint("mempool", "not keeping orphan with rejected parents %s\n",tx.GetHash().ToString());
+                // We will continue to reject this tx since it has rejected
+                // parents so avoid re-requesting it from other peers.
+                recentRejects->insert(tx.GetHash());
             }
         } else {
             if (tx.wit.IsNull() && !state.CorruptionPossible()) {

From e2184ccc1da55d54917245dccfa9e30e87dfc6f2 Mon Sep 17 00:00:00 2001
From: Alex Morcos <morcos@chaincode.com>
Date: Sat, 3 Dec 2016 15:46:33 -0500
Subject: [PATCH 1311/1802] Reorder RPC tests for running time

---
 qa/pull-tester/rpc-tests.py | 55 +++++++++++++++++++++----------------
 1 file changed, 32 insertions(+), 23 deletions(-)

diff --git a/qa/pull-tester/rpc-tests.py b/qa/pull-tester/rpc-tests.py
index 58bd00fdfc2b5..736d416e517ec 100755
--- a/qa/pull-tester/rpc-tests.py
+++ b/qa/pull-tester/rpc-tests.py
@@ -100,78 +100,87 @@
 
 testScripts = [
     # longest test should go first, to favor running tests in parallel
-    'p2p-fullblocktest.py',
+    'wallet-hd.py',
     'walletbackup.py',
-    'bip68-112-113-p2p.py',
+    # vv Tests less than 5m vv
+    'p2p-fullblocktest.py',
+    'fundrawtransaction.py',
+    'p2p-compactblocks.py',
+    'segwit.py',
+    # vv Tests less than 2m vv
     'wallet.py',
     'wallet-accounts.py',
-    'wallet-hd.py',
+    'p2p-segwit.py',
     'wallet-dump.py',
     'listtransactions.py',
+    # vv Tests less than 60s vv
+    'sendheaders.py',
+    'zapwallettxes.py',
+    'importmulti.py',
+    'mempool_limit.py',
+    'merkle_blocks.py',
     'receivedby.py',
+    'abandonconflict.py',
+    'bip68-112-113-p2p.py',
+    'rawtransactions.py',
+    'reindex.py',
+    # vv Tests less than 30s vv
     'mempool_resurrect_test.py',
     'txn_doublespend.py --mineblock',
-    'p2p-segwit.py',
-    'segwit.py',
     'txn_clone.py',
     'getchaintips.py',
-    'rawtransactions.py',
     'rest.py',
     'mempool_spendcoinbase.py',
     'mempool_reorg.py',
-    'mempool_limit.py',
     'httpbasics.py',
     'multi_rpc.py',
-    'zapwallettxes.py',
     'proxy_test.py',
-    'merkle_blocks.py',
-    'fundrawtransaction.py',
     'signrawtransactions.py',
     'nodehandling.py',
-    'reindex.py',
     'decodescript.py',
     'blockchain.py',
     'disablewallet.py',
-    'sendheaders.py',
     'keypool.py',
     'p2p-mempool.py',
     'prioritise_transaction.py',
     'invalidblockrequest.py',
     'invalidtxrequest.py',
-    'abandonconflict.py',
     'p2p-versionbits-warning.py',
     'preciousblock.py',
     'importprunedfunds.py',
     'signmessages.py',
-    'p2p-compactblocks.py',
     'nulldummy.py',
-    'importmulti.py',
 ]
 if ENABLE_ZMQ:
     testScripts.append('zmq_test.py')
 
 testScriptsExt = [
+    'pruning.py',
+    # vv Tests less than 20m vv
+    'smartfees.py',
+    # vv Tests less than 5m vv
+    'maxuploadtarget.py',
+    'mempool_packages.py',
+    # vv Tests less than 2m vv
+    'bip68-sequence.py',
+    'getblocktemplate_longpoll.py',
+    # vv Tests less than 60s vv
     'bip9-softforks.py',
+    'p2p-feefilter.py',
+    'rpcbind_test.py',
+    # vv Tests less than 30s vv
     'bip65-cltv.py',
     'bip65-cltv-p2p.py',
-    'bip68-sequence.py',
     'bipdersig-p2p.py',
     'bipdersig.py',
-    'getblocktemplate_longpoll.py',
     'getblocktemplate_proposals.py',
     'txn_doublespend.py',
     'txn_clone.py --mineblock',
     'forknotify.py',
     'invalidateblock.py',
-    'rpcbind_test.py',
-    'smartfees.py',
     'maxblocksinflight.py',
     'p2p-acceptblock.py',
-    'mempool_packages.py',
-    'maxuploadtarget.py',
     'replace-by-fee.py',
-    'p2p-feefilter.py',
-    'pruning.py', # leave pruning last as it takes a REALLY long time
 ]
 
 

From 2a99522bbfea371da3059635387c5b6dfe4da979 Mon Sep 17 00:00:00 2001
From: Alex Morcos <morcos@chaincode.com>
Date: Sat, 3 Dec 2016 18:03:51 -0500
Subject: [PATCH 1312/1802] remove relaypriority from rpc tests

---
 qa/rpc-tests/mempool_packages.py | 4 ++--
 qa/rpc-tests/replace-by-fee.py   | 2 +-
 qa/rpc-tests/smartfees.py        | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/qa/rpc-tests/mempool_packages.py b/qa/rpc-tests/mempool_packages.py
index 45dc0e65c43c2..f605e7524f765 100755
--- a/qa/rpc-tests/mempool_packages.py
+++ b/qa/rpc-tests/mempool_packages.py
@@ -20,8 +20,8 @@ def __init__(self):
 
     def setup_network(self):
         self.nodes = []
-        self.nodes.append(start_node(0, self.options.tmpdir, ["-maxorphantx=1000", "-relaypriority=0", "-debug"]))
-        self.nodes.append(start_node(1, self.options.tmpdir, ["-maxorphantx=1000", "-relaypriority=0", "-limitancestorcount=5", "-debug"]))
+        self.nodes.append(start_node(0, self.options.tmpdir, ["-maxorphantx=1000", "-debug"]))
+        self.nodes.append(start_node(1, self.options.tmpdir, ["-maxorphantx=1000", "-limitancestorcount=5", "-debug"]))
         connect_nodes(self.nodes[0], 1)
         self.is_network_split = False
         self.sync_all()
diff --git a/qa/rpc-tests/replace-by-fee.py b/qa/rpc-tests/replace-by-fee.py
index 34c0f9d7957c7..8aba06c60c63f 100755
--- a/qa/rpc-tests/replace-by-fee.py
+++ b/qa/rpc-tests/replace-by-fee.py
@@ -76,7 +76,7 @@ def __init__(self):
     def setup_network(self):
         self.nodes = []
         self.nodes.append(start_node(0, self.options.tmpdir, ["-maxorphantx=1000", "-debug",
-                                                              "-relaypriority=0", "-whitelist=127.0.0.1",
+                                                              "-whitelist=127.0.0.1",
                                                               "-limitancestorcount=50",
                                                               "-limitancestorsize=101",
                                                               "-limitdescendantcount=200",
diff --git a/qa/rpc-tests/smartfees.py b/qa/rpc-tests/smartfees.py
index 74a74f679a85d..2c56f954a22c6 100755
--- a/qa/rpc-tests/smartfees.py
+++ b/qa/rpc-tests/smartfees.py
@@ -159,7 +159,7 @@ def setup_network(self):
         self.nodes = []
         # Use node0 to mine blocks for input splitting
         self.nodes.append(start_node(0, self.options.tmpdir, ["-maxorphantx=1000",
-                                                              "-relaypriority=0", "-whitelist=127.0.0.1"]))
+                                                              "-whitelist=127.0.0.1"]))
 
         print("This test is time consuming, please be patient")
         print("Splitting inputs to small size so we can generate low priority tx's")
@@ -197,12 +197,12 @@ def setup_network(self):
         # (17k is room enough for 110 or so transactions)
         self.nodes.append(start_node(1, self.options.tmpdir,
                                      ["-blockprioritysize=1500", "-blockmaxsize=17000",
-                                      "-maxorphantx=1000", "-relaypriority=0", "-debug=estimatefee"]))
+                                      "-maxorphantx=1000", "-debug=estimatefee"]))
         connect_nodes(self.nodes[1], 0)
 
         # Node2 is a stingy miner, that
         # produces too small blocks (room for only 55 or so transactions)
-        node2args = ["-blockprioritysize=0", "-blockmaxsize=8000", "-maxorphantx=1000", "-relaypriority=0"]
+        node2args = ["-blockprioritysize=0", "-blockmaxsize=8000", "-maxorphantx=1000"]
 
         self.nodes.append(start_node(2, self.options.tmpdir, node2args))
         connect_nodes(self.nodes[0], 2)

From 6fdd43b968f984ef92ca4576872dc65462ba7312 Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Tue, 25 Oct 2016 13:20:45 -0400
Subject: [PATCH 1313/1802] Add struct to track block-connect-time-generated
 info for callbacks

---
 src/validation.cpp | 33 +++++++++++++++++++--------------
 1 file changed, 19 insertions(+), 14 deletions(-)

diff --git a/src/validation.cpp b/src/validation.cpp
index 9cfb5221a62d8..e8fe8639fba6f 100644
--- a/src/validation.cpp
+++ b/src/validation.cpp
@@ -2152,11 +2152,20 @@ static int64_t nTimeFlush = 0;
 static int64_t nTimeChainState = 0;
 static int64_t nTimePostConnect = 0;
 
+/**
+ * Used to track conflicted transactions removed from mempool and transactions
+ * applied to the UTXO state as a part of a single ActivateBestChainStep call.
+ */
+struct ConnectTrace {
+    std::vector<CTransactionRef> txConflicted;
+    std::vector<std::tuple<CTransactionRef,CBlockIndex*,int>> txChanged;
+};
+
 /**
  * Connect a new block to chainActive. pblock is either NULL or a pointer to a CBlock
  * corresponding to pindexNew, to bypass loading it again from disk.
  */
-bool static ConnectTip(CValidationState& state, const CChainParams& chainparams, CBlockIndex* pindexNew, const CBlock* pblock, std::vector<CTransactionRef> &txConflicted, std::vector<std::tuple<CTransactionRef,CBlockIndex*,int>> &txChanged)
+bool static ConnectTip(CValidationState& state, const CChainParams& chainparams, CBlockIndex* pindexNew, const CBlock* pblock, ConnectTrace& connectTrace)
 {
     assert(pindexNew->pprev == chainActive.Tip());
     // Read block from disk.
@@ -2192,12 +2201,12 @@ bool static ConnectTip(CValidationState& state, const CChainParams& chainparams,
     int64_t nTime5 = GetTimeMicros(); nTimeChainState += nTime5 - nTime4;
     LogPrint("bench", "  - Writing chainstate: %.2fms [%.2fs]\n", (nTime5 - nTime4) * 0.001, nTimeChainState * 0.000001);
     // Remove conflicting transactions from the mempool.;
-    mempool.removeForBlock(pblock->vtx, pindexNew->nHeight, &txConflicted, !IsInitialBlockDownload());
+    mempool.removeForBlock(pblock->vtx, pindexNew->nHeight, &connectTrace.txConflicted, !IsInitialBlockDownload());
     // Update chainActive & related variables.
     UpdateTip(pindexNew, chainparams);
 
     for (unsigned int i=0; i < pblock->vtx.size(); i++)
-        txChanged.emplace_back(pblock->vtx[i], pindexNew, i);
+        connectTrace.txChanged.emplace_back(pblock->vtx[i], pindexNew, i);
 
     int64_t nTime6 = GetTimeMicros(); nTimePostConnect += nTime6 - nTime5; nTimeTotal += nTime6 - nTime1;
     LogPrint("bench", "  - Connect postprocess: %.2fms [%.2fs]\n", (nTime6 - nTime5) * 0.001, nTimePostConnect * 0.000001);
@@ -2279,7 +2288,7 @@ static void PruneBlockIndexCandidates() {
  * Try to make some progress towards making pindexMostWork the active block.
  * pblock is either NULL or a pointer to a CBlock corresponding to pindexMostWork.
  */
-static bool ActivateBestChainStep(CValidationState& state, const CChainParams& chainparams, CBlockIndex* pindexMostWork, const CBlock* pblock, bool& fInvalidFound, std::vector<CTransactionRef>& txConflicted, std::vector<std::tuple<CTransactionRef,CBlockIndex*,int>>& txChanged)
+static bool ActivateBestChainStep(CValidationState& state, const CChainParams& chainparams, CBlockIndex* pindexMostWork, const CBlock* pblock, bool& fInvalidFound, ConnectTrace& connectTrace)
 {
     AssertLockHeld(cs_main);
     const CBlockIndex *pindexOldTip = chainActive.Tip();
@@ -2312,7 +2321,7 @@ static bool ActivateBestChainStep(CValidationState& state, const CChainParams& c
 
         // Connect new blocks.
         BOOST_REVERSE_FOREACH(CBlockIndex *pindexConnect, vpindexToConnect) {
-            if (!ConnectTip(state, chainparams, pindexConnect, pindexConnect == pindexMostWork ? pblock : NULL, txConflicted, txChanged)) {
+            if (!ConnectTip(state, chainparams, pindexConnect, pindexConnect == pindexMostWork ? pblock : NULL, connectTrace)) {
                 if (state.IsInvalid()) {
                     // The block violates a consensus rule.
                     if (!state.CorruptionPossible())
@@ -2380,17 +2389,13 @@ static void NotifyHeaderTip() {
 bool ActivateBestChain(CValidationState &state, const CChainParams& chainparams, const CBlock *pblock) {
     CBlockIndex *pindexMostWork = NULL;
     CBlockIndex *pindexNewTip = NULL;
-    std::vector<std::tuple<CTransactionRef,CBlockIndex*,int>> txChanged;
-    if (pblock)
-        txChanged.reserve(pblock->vtx.size());
     do {
-        txChanged.clear();
         boost::this_thread::interruption_point();
         if (ShutdownRequested())
             break;
 
         const CBlockIndex *pindexFork;
-        std::vector<CTransactionRef> txConflicted;
+        ConnectTrace connectTrace;
         bool fInitialDownload;
         {
             LOCK(cs_main);
@@ -2404,7 +2409,7 @@ bool ActivateBestChain(CValidationState &state, const CChainParams& chainparams,
                 return true;
 
             bool fInvalidFound = false;
-            if (!ActivateBestChainStep(state, chainparams, pindexMostWork, pblock && pblock->GetHash() == pindexMostWork->GetBlockHash() ? pblock : NULL, fInvalidFound, txConflicted, txChanged))
+            if (!ActivateBestChainStep(state, chainparams, pindexMostWork, pblock && pblock->GetHash() == pindexMostWork->GetBlockHash() ? pblock : NULL, fInvalidFound, connectTrace))
                 return false;
 
             if (fInvalidFound) {
@@ -2421,13 +2426,13 @@ bool ActivateBestChain(CValidationState &state, const CChainParams& chainparams,
 
         // throw all transactions though the signal-interface
         // while _not_ holding the cs_main lock
-        for (const auto& tx : txConflicted)
+        for (const auto& tx : connectTrace.txConflicted)
         {
             GetMainSignals().SyncTransaction(*tx, pindexNewTip, CMainSignals::SYNC_TRANSACTION_NOT_IN_BLOCK);
         }
         // ... and about transactions that got confirmed:
-        for (unsigned int i = 0; i < txChanged.size(); i++)
-            GetMainSignals().SyncTransaction(*std::get<0>(txChanged[i]), std::get<1>(txChanged[i]), std::get<2>(txChanged[i]));
+        for (unsigned int i = 0; i < connectTrace.txChanged.size(); i++)
+            GetMainSignals().SyncTransaction(*std::get<0>(connectTrace.txChanged[i]), std::get<1>(connectTrace.txChanged[i]), std::get<2>(connectTrace.txChanged[i]));
 
         // Notify external listeners about the new tip.
         GetMainSignals().UpdatedBlockTip(pindexNewTip, pindexFork, fInitialDownload);

From fd9d89070a70a7333d8ffe944cc53f8fd4122548 Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Sat, 15 Oct 2016 12:12:50 -0400
Subject: [PATCH 1314/1802] Keep blocks as shared_ptrs, instead of copying txn
 in ConnectTip

---
 src/validation.cpp | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/src/validation.cpp b/src/validation.cpp
index e8fe8639fba6f..ffb4732666fba 100644
--- a/src/validation.cpp
+++ b/src/validation.cpp
@@ -2158,7 +2158,7 @@ static int64_t nTimePostConnect = 0;
  */
 struct ConnectTrace {
     std::vector<CTransactionRef> txConflicted;
-    std::vector<std::tuple<CTransactionRef,CBlockIndex*,int>> txChanged;
+    std::vector<std::pair<CBlockIndex*, std::shared_ptr<const CBlock> > > blocksConnected;
 };
 
 /**
@@ -2170,11 +2170,15 @@ bool static ConnectTip(CValidationState& state, const CChainParams& chainparams,
     assert(pindexNew->pprev == chainActive.Tip());
     // Read block from disk.
     int64_t nTime1 = GetTimeMicros();
-    CBlock block;
     if (!pblock) {
-        if (!ReadBlockFromDisk(block, pindexNew, chainparams.GetConsensus()))
+        std::shared_ptr<CBlock> pblockNew = std::make_shared<CBlock>();
+        connectTrace.blocksConnected.emplace_back(pindexNew, pblockNew);
+        if (!ReadBlockFromDisk(*pblockNew, pindexNew, chainparams.GetConsensus()))
             return AbortNode(state, "Failed to read block");
-        pblock = &block;
+        pblock = pblockNew.get();
+    } else {
+        //TODO: This copy is a major performance regression, but ProcessNewBlock callers need updated to fix this
+        connectTrace.blocksConnected.emplace_back(pindexNew, std::make_shared<const CBlock>(*pblock));
     }
     // Apply the block atomically to the chain state.
     int64_t nTime2 = GetTimeMicros(); nTimeReadFromDisk += nTime2 - nTime1;
@@ -2205,9 +2209,6 @@ bool static ConnectTip(CValidationState& state, const CChainParams& chainparams,
     // Update chainActive & related variables.
     UpdateTip(pindexNew, chainparams);
 
-    for (unsigned int i=0; i < pblock->vtx.size(); i++)
-        connectTrace.txChanged.emplace_back(pblock->vtx[i], pindexNew, i);
-
     int64_t nTime6 = GetTimeMicros(); nTimePostConnect += nTime6 - nTime5; nTimeTotal += nTime6 - nTime1;
     LogPrint("bench", "  - Connect postprocess: %.2fms [%.2fs]\n", (nTime6 - nTime5) * 0.001, nTimePostConnect * 0.000001);
     LogPrint("bench", "- Connect block: %.2fms [%.2fs]\n", (nTime6 - nTime1) * 0.001, nTimeTotal * 0.000001);
@@ -2329,6 +2330,8 @@ static bool ActivateBestChainStep(CValidationState& state, const CChainParams& c
                     state = CValidationState();
                     fInvalidFound = true;
                     fContinue = false;
+                    // If we didn't actually connect the block, don't notify listeners about it
+                    connectTrace.blocksConnected.pop_back();
                     break;
                 } else {
                     // A system error occurred (disk space, database error, ...).
@@ -2431,8 +2434,12 @@ bool ActivateBestChain(CValidationState &state, const CChainParams& chainparams,
             GetMainSignals().SyncTransaction(*tx, pindexNewTip, CMainSignals::SYNC_TRANSACTION_NOT_IN_BLOCK);
         }
         // ... and about transactions that got confirmed:
-        for (unsigned int i = 0; i < connectTrace.txChanged.size(); i++)
-            GetMainSignals().SyncTransaction(*std::get<0>(connectTrace.txChanged[i]), std::get<1>(connectTrace.txChanged[i]), std::get<2>(connectTrace.txChanged[i]));
+        for (const auto& pair : connectTrace.blocksConnected) {
+            assert(pair.second);
+            const CBlock& block = *(pair.second);
+            for (unsigned int i = 0; i < block.vtx.size(); i++)
+                GetMainSignals().SyncTransaction(*block.vtx[i], pair.first, i);
+        }
 
         // Notify external listeners about the new tip.
         GetMainSignals().UpdatedBlockTip(pindexNewTip, pindexFork, fInitialDownload);

From ae4db44d0341b7517d02bdc74d4b69d0cd2f6778 Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Tue, 25 Oct 2016 14:22:41 -0400
Subject: [PATCH 1315/1802] Create a shared_ptr for the block we're connecting
 in ActivateBCS

---
 src/validation.cpp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/validation.cpp b/src/validation.cpp
index ffb4732666fba..3a9ad4a28fe61 100644
--- a/src/validation.cpp
+++ b/src/validation.cpp
@@ -2165,7 +2165,7 @@ struct ConnectTrace {
  * Connect a new block to chainActive. pblock is either NULL or a pointer to a CBlock
  * corresponding to pindexNew, to bypass loading it again from disk.
  */
-bool static ConnectTip(CValidationState& state, const CChainParams& chainparams, CBlockIndex* pindexNew, const CBlock* pblock, ConnectTrace& connectTrace)
+bool static ConnectTip(CValidationState& state, const CChainParams& chainparams, CBlockIndex* pindexNew, const std::shared_ptr<const CBlock>& pblock, ConnectTrace& connectTrace)
 {
     assert(pindexNew->pprev == chainActive.Tip());
     // Read block from disk.
@@ -2175,19 +2175,18 @@ bool static ConnectTip(CValidationState& state, const CChainParams& chainparams,
         connectTrace.blocksConnected.emplace_back(pindexNew, pblockNew);
         if (!ReadBlockFromDisk(*pblockNew, pindexNew, chainparams.GetConsensus()))
             return AbortNode(state, "Failed to read block");
-        pblock = pblockNew.get();
     } else {
-        //TODO: This copy is a major performance regression, but ProcessNewBlock callers need updated to fix this
-        connectTrace.blocksConnected.emplace_back(pindexNew, std::make_shared<const CBlock>(*pblock));
+        connectTrace.blocksConnected.emplace_back(pindexNew, pblock);
     }
+    const CBlock& blockConnecting = *connectTrace.blocksConnected.back().second;
     // Apply the block atomically to the chain state.
     int64_t nTime2 = GetTimeMicros(); nTimeReadFromDisk += nTime2 - nTime1;
     int64_t nTime3;
     LogPrint("bench", "  - Load block from disk: %.2fms [%.2fs]\n", (nTime2 - nTime1) * 0.001, nTimeReadFromDisk * 0.000001);
     {
         CCoinsViewCache view(pcoinsTip);
-        bool rv = ConnectBlock(*pblock, state, pindexNew, view, chainparams);
-        GetMainSignals().BlockChecked(*pblock, state);
+        bool rv = ConnectBlock(blockConnecting, state, pindexNew, view, chainparams);
+        GetMainSignals().BlockChecked(blockConnecting, state);
         if (!rv) {
             if (state.IsInvalid())
                 InvalidBlockFound(pindexNew, state);
@@ -2205,7 +2204,7 @@ bool static ConnectTip(CValidationState& state, const CChainParams& chainparams,
     int64_t nTime5 = GetTimeMicros(); nTimeChainState += nTime5 - nTime4;
     LogPrint("bench", "  - Writing chainstate: %.2fms [%.2fs]\n", (nTime5 - nTime4) * 0.001, nTimeChainState * 0.000001);
     // Remove conflicting transactions from the mempool.;
-    mempool.removeForBlock(pblock->vtx, pindexNew->nHeight, &connectTrace.txConflicted, !IsInitialBlockDownload());
+    mempool.removeForBlock(blockConnecting.vtx, pindexNew->nHeight, &connectTrace.txConflicted, !IsInitialBlockDownload());
     // Update chainActive & related variables.
     UpdateTip(pindexNew, chainparams);
 
@@ -2322,7 +2321,8 @@ static bool ActivateBestChainStep(CValidationState& state, const CChainParams& c
 
         // Connect new blocks.
         BOOST_REVERSE_FOREACH(CBlockIndex *pindexConnect, vpindexToConnect) {
-            if (!ConnectTip(state, chainparams, pindexConnect, pindexConnect == pindexMostWork ? pblock : NULL, connectTrace)) {
+            //TODO: The pblock copy is a major performance regression, but callers need updated to fix this
+            if (!ConnectTip(state, chainparams, pindexConnect, (pblock && pindexConnect == pindexMostWork) ? std::make_shared<const CBlock>(*pblock) : std::shared_ptr<const CBlock>(), connectTrace)) {
                 if (state.IsInvalid()) {
                     // The block violates a consensus rule.
                     if (!state.CorruptionPossible())

From 2736c44c8edea5ce6a502a04269926fecda27301 Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Sat, 15 Oct 2016 14:01:31 -0400
Subject: [PATCH 1316/1802] Make the optional pblock in ActivateBestChain a
 shared_ptr

---
 src/rpc/blockchain.cpp |  4 ++--
 src/validation.cpp     | 17 +++++++++++------
 src/validation.h       |  2 +-
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp
index b9b68fc10f06f..e6d80f06a3c1d 100644
--- a/src/rpc/blockchain.cpp
+++ b/src/rpc/blockchain.cpp
@@ -1319,7 +1319,7 @@ UniValue invalidateblock(const JSONRPCRequest& request)
     }
 
     if (state.IsValid()) {
-        ActivateBestChain(state, Params(), NULL);
+        ActivateBestChain(state, Params());
     }
 
     if (!state.IsValid()) {
@@ -1357,7 +1357,7 @@ UniValue reconsiderblock(const JSONRPCRequest& request)
     }
 
     CValidationState state;
-    ActivateBestChain(state, Params(), NULL);
+    ActivateBestChain(state, Params());
 
     if (!state.IsValid()) {
         throw JSONRPCError(RPC_DATABASE_ERROR, state.GetRejectReason());
diff --git a/src/validation.cpp b/src/validation.cpp
index 3a9ad4a28fe61..bd66c5679bef7 100644
--- a/src/validation.cpp
+++ b/src/validation.cpp
@@ -2288,7 +2288,7 @@ static void PruneBlockIndexCandidates() {
  * Try to make some progress towards making pindexMostWork the active block.
  * pblock is either NULL or a pointer to a CBlock corresponding to pindexMostWork.
  */
-static bool ActivateBestChainStep(CValidationState& state, const CChainParams& chainparams, CBlockIndex* pindexMostWork, const CBlock* pblock, bool& fInvalidFound, ConnectTrace& connectTrace)
+static bool ActivateBestChainStep(CValidationState& state, const CChainParams& chainparams, CBlockIndex* pindexMostWork, const std::shared_ptr<const CBlock>& pblock, bool& fInvalidFound, ConnectTrace& connectTrace)
 {
     AssertLockHeld(cs_main);
     const CBlockIndex *pindexOldTip = chainActive.Tip();
@@ -2321,8 +2321,7 @@ static bool ActivateBestChainStep(CValidationState& state, const CChainParams& c
 
         // Connect new blocks.
         BOOST_REVERSE_FOREACH(CBlockIndex *pindexConnect, vpindexToConnect) {
-            //TODO: The pblock copy is a major performance regression, but callers need updated to fix this
-            if (!ConnectTip(state, chainparams, pindexConnect, (pblock && pindexConnect == pindexMostWork) ? std::make_shared<const CBlock>(*pblock) : std::shared_ptr<const CBlock>(), connectTrace)) {
+            if (!ConnectTip(state, chainparams, pindexConnect, pindexConnect == pindexMostWork ? pblock : std::shared_ptr<const CBlock>(), connectTrace)) {
                 if (state.IsInvalid()) {
                     // The block violates a consensus rule.
                     if (!state.CorruptionPossible())
@@ -2389,7 +2388,7 @@ static void NotifyHeaderTip() {
  * or an activated best chain. pblock is either NULL or a pointer to a block
  * that is already loaded (to avoid loading it again from disk).
  */
-bool ActivateBestChain(CValidationState &state, const CChainParams& chainparams, const CBlock *pblock) {
+bool ActivateBestChain(CValidationState &state, const CChainParams& chainparams, std::shared_ptr<const CBlock> pblock) {
     CBlockIndex *pindexMostWork = NULL;
     CBlockIndex *pindexNewTip = NULL;
     do {
@@ -2412,7 +2411,8 @@ bool ActivateBestChain(CValidationState &state, const CChainParams& chainparams,
                 return true;
 
             bool fInvalidFound = false;
-            if (!ActivateBestChainStep(state, chainparams, pindexMostWork, pblock && pblock->GetHash() == pindexMostWork->GetBlockHash() ? pblock : NULL, fInvalidFound, connectTrace))
+            std::shared_ptr<const CBlock> nullBlockPtr;
+            if (!ActivateBestChainStep(state, chainparams, pindexMostWork, pblock && pblock->GetHash() == pindexMostWork->GetBlockHash() ? pblock : nullBlockPtr, fInvalidFound, connectTrace))
                 return false;
 
             if (fInvalidFound) {
@@ -3142,8 +3142,13 @@ bool ProcessNewBlock(const CChainParams& chainparams, const CBlock* pblock, bool
 
     NotifyHeaderTip();
 
+    //TODO: This copy is a major performance regression, but callers need updated to fix this
+    std::shared_ptr<const CBlock> block_ptr;
+    if (pblock)
+        block_ptr.reset(new CBlock(*pblock));
+
     CValidationState state; // Only used to report errors, not invalidity - ignore it
-    if (!ActivateBestChain(state, chainparams, pblock))
+    if (!ActivateBestChain(state, chainparams, block_ptr))
         return error("%s: ActivateBestChain failed", __func__);
 
     return true;
diff --git a/src/validation.h b/src/validation.h
index a798cf37022e8..2d055d1900166 100644
--- a/src/validation.h
+++ b/src/validation.h
@@ -278,7 +278,7 @@ std::string GetWarnings(const std::string& strFor);
 /** Retrieve a transaction (from memory pool, or from disk, if possible) */
 bool GetTransaction(const uint256 &hash, CTransaction &tx, const Consensus::Params& params, uint256 &hashBlock, bool fAllowSlow = false);
 /** Find the best known block, and make it the tip of the block chain */
-bool ActivateBestChain(CValidationState& state, const CChainParams& chainparams, const CBlock* pblock = NULL);
+bool ActivateBestChain(CValidationState& state, const CChainParams& chainparams, std::shared_ptr<const CBlock> pblock = std::shared_ptr<const CBlock>());
 CAmount GetBlockSubsidy(int nHeight, const Consensus::Params& consensusParams);
 
 /**

From 2d6e5619afa2d43a37a0a38daf33f58965ddfa80 Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Sun, 4 Dec 2016 00:17:30 -0800
Subject: [PATCH 1317/1802] Switch pblock in ProcessNewBlock to a shared_ptr

This (finally) fixes a performance regression in
b3b3c2a5623d5c942d2b3565cc2d833c65105555
---
 src/net_processing.cpp    | 16 ++++++++--------
 src/rpc/mining.cpp        |  8 +++++---
 src/test/miner_tests.cpp  |  3 ++-
 src/test/test_bitcoin.cpp |  3 ++-
 src/validation.cpp        |  9 ++-------
 src/validation.h          |  2 +-
 6 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/src/net_processing.cpp b/src/net_processing.cpp
index 747167264b772..e81332d618e30 100644
--- a/src/net_processing.cpp
+++ b/src/net_processing.cpp
@@ -1895,7 +1895,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
         BlockTransactions resp;
         vRecv >> resp;
 
-        CBlock block;
+        std::shared_ptr<CBlock> pblock = std::make_shared<CBlock>();
         bool fBlockRead = false;
         {
             LOCK(cs_main);
@@ -1908,7 +1908,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
             }
 
             PartiallyDownloadedBlock& partialBlock = *it->second.second->partialBlock;
-            ReadStatus status = partialBlock.FillBlock(block, resp.txn);
+            ReadStatus status = partialBlock.FillBlock(*pblock, resp.txn);
             if (status == READ_STATUS_INVALID) {
                 MarkBlockAsReceived(resp.blockhash); // Reset in-flight state in case of whitelist
                 Misbehaving(pfrom->GetId(), 100);
@@ -1951,7 +1951,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
             bool fNewBlock = false;
             // Since we requested this block (it was in mapBlocksInFlight), force it to be processed,
             // even if it would not be a candidate for new tip (missing previous block, chain not long enough, etc)
-            ProcessNewBlock(chainparams, &block, true, NULL, &fNewBlock);
+            ProcessNewBlock(chainparams, pblock, true, NULL, &fNewBlock);
             if (fNewBlock)
                 pfrom->nLastBlockTime = GetTime();
         }
@@ -2112,17 +2112,17 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
 
     else if (strCommand == NetMsgType::BLOCK && !fImporting && !fReindex) // Ignore blocks received while importing
     {
-        CBlock block;
-        vRecv >> block;
+        std::shared_ptr<CBlock> pblock = std::make_shared<CBlock>();
+        vRecv >> *pblock;
 
-        LogPrint("net", "received block %s peer=%d\n", block.GetHash().ToString(), pfrom->id);
+        LogPrint("net", "received block %s peer=%d\n", pblock->GetHash().ToString(), pfrom->id);
 
         // Process all blocks from whitelisted peers, even if not requested,
         // unless we're still syncing with the network.
         // Such an unrequested block may still be processed, subject to the
         // conditions in AcceptBlock().
         bool forceProcessing = pfrom->fWhitelisted && !IsInitialBlockDownload();
-        const uint256 hash(block.GetHash());
+        const uint256 hash(pblock->GetHash());
         {
             LOCK(cs_main);
             // Also always process if we requested the block explicitly, as we may
@@ -2133,7 +2133,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
             mapBlockSource.emplace(hash, std::make_pair(pfrom->GetId(), true));
         }
         bool fNewBlock = false;
-        ProcessNewBlock(chainparams, &block, forceProcessing, NULL, &fNewBlock);
+        ProcessNewBlock(chainparams, pblock, forceProcessing, NULL, &fNewBlock);
         if (fNewBlock)
             pfrom->nLastBlockTime = GetTime();
     }
diff --git a/src/rpc/mining.cpp b/src/rpc/mining.cpp
index 61408b3b60222..cb22dec342e9b 100644
--- a/src/rpc/mining.cpp
+++ b/src/rpc/mining.cpp
@@ -131,7 +131,8 @@ UniValue generateBlocks(boost::shared_ptr<CReserveScript> coinbaseScript, int nG
         if (pblock->nNonce == nInnerLoopCount) {
             continue;
         }
-        if (!ProcessNewBlock(Params(), pblock, true, NULL, NULL))
+        std::shared_ptr<const CBlock> shared_pblock = std::make_shared<const CBlock>(*pblock);
+        if (!ProcessNewBlock(Params(), shared_pblock, true, NULL, NULL))
             throw JSONRPCError(RPC_INTERNAL_ERROR, "ProcessNewBlock, block not accepted");
         ++nHeight;
         blockHashes.push_back(pblock->GetHash().GetHex());
@@ -728,7 +729,8 @@ UniValue submitblock(const JSONRPCRequest& request)
             + HelpExampleRpc("submitblock", "\"mydata\"")
         );
 
-    CBlock block;
+    std::shared_ptr<CBlock> blockptr = std::make_shared<CBlock>();
+    CBlock& block = *blockptr;
     if (!DecodeHexBlk(block, request.params[0].get_str()))
         throw JSONRPCError(RPC_DESERIALIZATION_ERROR, "Block decode failed");
 
@@ -758,7 +760,7 @@ UniValue submitblock(const JSONRPCRequest& request)
 
     submitblock_StateCatcher sc(block.GetHash());
     RegisterValidationInterface(&sc);
-    bool fAccepted = ProcessNewBlock(Params(), &block, true, NULL, NULL);
+    bool fAccepted = ProcessNewBlock(Params(), blockptr, true, NULL, NULL);
     UnregisterValidationInterface(&sc);
     if (fBlockPresent)
     {
diff --git a/src/test/miner_tests.cpp b/src/test/miner_tests.cpp
index ca703841db63c..bc1bdd8874d9f 100644
--- a/src/test/miner_tests.cpp
+++ b/src/test/miner_tests.cpp
@@ -223,7 +223,8 @@ BOOST_AUTO_TEST_CASE(CreateNewBlock_validity)
             txFirst.push_back(pblock->vtx[0]);
         pblock->hashMerkleRoot = BlockMerkleRoot(*pblock);
         pblock->nNonce = blockinfo[i].nonce;
-        BOOST_CHECK(ProcessNewBlock(chainparams, pblock, true, NULL, NULL));
+        std::shared_ptr<const CBlock> shared_pblock = std::make_shared<const CBlock>(*pblock);
+        BOOST_CHECK(ProcessNewBlock(chainparams, shared_pblock, true, NULL, NULL));
         pblock->hashPrevBlock = pblock->GetHash();
     }
 
diff --git a/src/test/test_bitcoin.cpp b/src/test/test_bitcoin.cpp
index f979d01a37eab..139389117a593 100644
--- a/src/test/test_bitcoin.cpp
+++ b/src/test/test_bitcoin.cpp
@@ -127,7 +127,8 @@ TestChain100Setup::CreateAndProcessBlock(const std::vector<CMutableTransaction>&
 
     while (!CheckProofOfWork(block.GetHash(), block.nBits, chainparams.GetConsensus())) ++block.nNonce;
 
-    ProcessNewBlock(chainparams, &block, true, NULL, NULL);
+    std::shared_ptr<const CBlock> shared_pblock = std::make_shared<const CBlock>(block);
+    ProcessNewBlock(chainparams, shared_pblock, true, NULL, NULL);
 
     CBlock result = block;
     return result;
diff --git a/src/validation.cpp b/src/validation.cpp
index bd66c5679bef7..0983c1f7626f6 100644
--- a/src/validation.cpp
+++ b/src/validation.cpp
@@ -3123,7 +3123,7 @@ static bool AcceptBlock(const CBlock& block, CValidationState& state, const CCha
     return true;
 }
 
-bool ProcessNewBlock(const CChainParams& chainparams, const CBlock* pblock, bool fForceProcessing, const CDiskBlockPos* dbp, bool *fNewBlock)
+bool ProcessNewBlock(const CChainParams& chainparams, const std::shared_ptr<const CBlock> pblock, bool fForceProcessing, const CDiskBlockPos* dbp, bool *fNewBlock)
 {
     {
         LOCK(cs_main);
@@ -3142,13 +3142,8 @@ bool ProcessNewBlock(const CChainParams& chainparams, const CBlock* pblock, bool
 
     NotifyHeaderTip();
 
-    //TODO: This copy is a major performance regression, but callers need updated to fix this
-    std::shared_ptr<const CBlock> block_ptr;
-    if (pblock)
-        block_ptr.reset(new CBlock(*pblock));
-
     CValidationState state; // Only used to report errors, not invalidity - ignore it
-    if (!ActivateBestChain(state, chainparams, block_ptr))
+    if (!ActivateBestChain(state, chainparams, pblock))
         return error("%s: ActivateBestChain failed", __func__);
 
     return true;
diff --git a/src/validation.h b/src/validation.h
index 2d055d1900166..3a2b51bfec96e 100644
--- a/src/validation.h
+++ b/src/validation.h
@@ -233,7 +233,7 @@ static const uint64_t MIN_DISK_SPACE_FOR_BLOCK_FILES = 550 * 1024 * 1024;
  * @param[out]  fNewBlock A boolean which is set to indicate if the block was first received via this call
  * @return True if state.IsValid()
  */
-bool ProcessNewBlock(const CChainParams& chainparams, const CBlock* pblock, bool fForceProcessing, const CDiskBlockPos* dbp, bool* fNewBlock);
+bool ProcessNewBlock(const CChainParams& chainparams, const std::shared_ptr<const CBlock> pblock, bool fForceProcessing, const CDiskBlockPos* dbp, bool* fNewBlock);
 
 /**
  * Process incoming block headers.

From dd0df81ebdbf705f7ad386c7229bf1bbc3125f62 Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Tue, 29 Nov 2016 21:25:39 -0800
Subject: [PATCH 1318/1802] Document ConnectBlock connectTrace postconditions

---
 src/validation.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/validation.cpp b/src/validation.cpp
index 0983c1f7626f6..3bcbf33d66b6e 100644
--- a/src/validation.cpp
+++ b/src/validation.cpp
@@ -2164,6 +2164,10 @@ struct ConnectTrace {
 /**
  * Connect a new block to chainActive. pblock is either NULL or a pointer to a CBlock
  * corresponding to pindexNew, to bypass loading it again from disk.
+ *
+ * The block is always added to connectTrace (either after loading from disk or by copying
+ * pblock) - if that is not intended, care must be taken to remove the last entry in
+ * blocksConnected in case of failure.
  */
 bool static ConnectTip(CValidationState& state, const CChainParams& chainparams, CBlockIndex* pindexNew, const std::shared_ptr<const CBlock>& pblock, ConnectTrace& connectTrace)
 {

From a13fa4c80f792ffba8a77737754506aa849929af Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Sun, 4 Dec 2016 00:23:17 -0800
Subject: [PATCH 1319/1802] Remove unused CDiskBlockPos* argument from
 ProcessNewBlock

---
 src/net_processing.cpp    | 4 ++--
 src/rpc/mining.cpp        | 4 ++--
 src/test/miner_tests.cpp  | 2 +-
 src/test/test_bitcoin.cpp | 2 +-
 src/validation.cpp        | 4 ++--
 src/validation.h          | 3 +--
 6 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/net_processing.cpp b/src/net_processing.cpp
index e81332d618e30..5a7f6aa750d75 100644
--- a/src/net_processing.cpp
+++ b/src/net_processing.cpp
@@ -1951,7 +1951,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
             bool fNewBlock = false;
             // Since we requested this block (it was in mapBlocksInFlight), force it to be processed,
             // even if it would not be a candidate for new tip (missing previous block, chain not long enough, etc)
-            ProcessNewBlock(chainparams, pblock, true, NULL, &fNewBlock);
+            ProcessNewBlock(chainparams, pblock, true, &fNewBlock);
             if (fNewBlock)
                 pfrom->nLastBlockTime = GetTime();
         }
@@ -2133,7 +2133,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
             mapBlockSource.emplace(hash, std::make_pair(pfrom->GetId(), true));
         }
         bool fNewBlock = false;
-        ProcessNewBlock(chainparams, pblock, forceProcessing, NULL, &fNewBlock);
+        ProcessNewBlock(chainparams, pblock, forceProcessing, &fNewBlock);
         if (fNewBlock)
             pfrom->nLastBlockTime = GetTime();
     }
diff --git a/src/rpc/mining.cpp b/src/rpc/mining.cpp
index cb22dec342e9b..73797e2019812 100644
--- a/src/rpc/mining.cpp
+++ b/src/rpc/mining.cpp
@@ -132,7 +132,7 @@ UniValue generateBlocks(boost::shared_ptr<CReserveScript> coinbaseScript, int nG
             continue;
         }
         std::shared_ptr<const CBlock> shared_pblock = std::make_shared<const CBlock>(*pblock);
-        if (!ProcessNewBlock(Params(), shared_pblock, true, NULL, NULL))
+        if (!ProcessNewBlock(Params(), shared_pblock, true, NULL))
             throw JSONRPCError(RPC_INTERNAL_ERROR, "ProcessNewBlock, block not accepted");
         ++nHeight;
         blockHashes.push_back(pblock->GetHash().GetHex());
@@ -760,7 +760,7 @@ UniValue submitblock(const JSONRPCRequest& request)
 
     submitblock_StateCatcher sc(block.GetHash());
     RegisterValidationInterface(&sc);
-    bool fAccepted = ProcessNewBlock(Params(), blockptr, true, NULL, NULL);
+    bool fAccepted = ProcessNewBlock(Params(), blockptr, true, NULL);
     UnregisterValidationInterface(&sc);
     if (fBlockPresent)
     {
diff --git a/src/test/miner_tests.cpp b/src/test/miner_tests.cpp
index bc1bdd8874d9f..892e731a7a7bd 100644
--- a/src/test/miner_tests.cpp
+++ b/src/test/miner_tests.cpp
@@ -224,7 +224,7 @@ BOOST_AUTO_TEST_CASE(CreateNewBlock_validity)
         pblock->hashMerkleRoot = BlockMerkleRoot(*pblock);
         pblock->nNonce = blockinfo[i].nonce;
         std::shared_ptr<const CBlock> shared_pblock = std::make_shared<const CBlock>(*pblock);
-        BOOST_CHECK(ProcessNewBlock(chainparams, shared_pblock, true, NULL, NULL));
+        BOOST_CHECK(ProcessNewBlock(chainparams, shared_pblock, true, NULL));
         pblock->hashPrevBlock = pblock->GetHash();
     }
 
diff --git a/src/test/test_bitcoin.cpp b/src/test/test_bitcoin.cpp
index 139389117a593..dc459bed0d2c4 100644
--- a/src/test/test_bitcoin.cpp
+++ b/src/test/test_bitcoin.cpp
@@ -128,7 +128,7 @@ TestChain100Setup::CreateAndProcessBlock(const std::vector<CMutableTransaction>&
     while (!CheckProofOfWork(block.GetHash(), block.nBits, chainparams.GetConsensus())) ++block.nNonce;
 
     std::shared_ptr<const CBlock> shared_pblock = std::make_shared<const CBlock>(block);
-    ProcessNewBlock(chainparams, shared_pblock, true, NULL, NULL);
+    ProcessNewBlock(chainparams, shared_pblock, true, NULL);
 
     CBlock result = block;
     return result;
diff --git a/src/validation.cpp b/src/validation.cpp
index 3bcbf33d66b6e..46a8803c0c5ff 100644
--- a/src/validation.cpp
+++ b/src/validation.cpp
@@ -3127,7 +3127,7 @@ static bool AcceptBlock(const CBlock& block, CValidationState& state, const CCha
     return true;
 }
 
-bool ProcessNewBlock(const CChainParams& chainparams, const std::shared_ptr<const CBlock> pblock, bool fForceProcessing, const CDiskBlockPos* dbp, bool *fNewBlock)
+bool ProcessNewBlock(const CChainParams& chainparams, const std::shared_ptr<const CBlock> pblock, bool fForceProcessing, bool *fNewBlock)
 {
     {
         LOCK(cs_main);
@@ -3136,7 +3136,7 @@ bool ProcessNewBlock(const CChainParams& chainparams, const std::shared_ptr<cons
         CBlockIndex *pindex = NULL;
         if (fNewBlock) *fNewBlock = false;
         CValidationState state;
-        bool ret = AcceptBlock(*pblock, state, chainparams, &pindex, fForceProcessing, dbp, fNewBlock);
+        bool ret = AcceptBlock(*pblock, state, chainparams, &pindex, fForceProcessing, NULL, fNewBlock);
         CheckBlockIndex(chainparams.GetConsensus());
         if (!ret) {
             GetMainSignals().BlockChecked(*pblock, state);
diff --git a/src/validation.h b/src/validation.h
index 3a2b51bfec96e..c284c2fc188ad 100644
--- a/src/validation.h
+++ b/src/validation.h
@@ -229,11 +229,10 @@ static const uint64_t MIN_DISK_SPACE_FOR_BLOCK_FILES = 550 * 1024 * 1024;
  *
  * @param[in]   pblock  The block we want to process.
  * @param[in]   fForceProcessing Process this block even if unrequested; used for non-network block sources and whitelisted peers.
- * @param[out]  dbp     The already known disk position of pblock, or NULL if not yet stored.
  * @param[out]  fNewBlock A boolean which is set to indicate if the block was first received via this call
  * @return True if state.IsValid()
  */
-bool ProcessNewBlock(const CChainParams& chainparams, const std::shared_ptr<const CBlock> pblock, bool fForceProcessing, const CDiskBlockPos* dbp, bool* fNewBlock);
+bool ProcessNewBlock(const CChainParams& chainparams, const std::shared_ptr<const CBlock> pblock, bool fForceProcessing, bool* fNewBlock);
 
 /**
  * Process incoming block headers.

From fa2ecc48fb84f5d74807acb162b46ccece6f4caa Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Sun, 4 Dec 2016 16:16:11 +0100
Subject: [PATCH 1320/1802] [qa] pruning: Use cached utxo set to run faster

---
 qa/rpc-tests/mempool_limit.py          |  6 +++---
 qa/rpc-tests/prioritise_transaction.py |  2 +-
 qa/rpc-tests/pruning.py                | 15 +++++++++++----
 qa/rpc-tests/test_framework/util.py    | 14 +++++++++-----
 4 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/qa/rpc-tests/mempool_limit.py b/qa/rpc-tests/mempool_limit.py
index 4438c152df10a..154ae59c26a27 100755
--- a/qa/rpc-tests/mempool_limit.py
+++ b/qa/rpc-tests/mempool_limit.py
@@ -26,7 +26,7 @@ def __init__(self):
 
     def run_test(self):
         txids = []
-        utxos = create_confirmed_utxos(self.relayfee, self.nodes[0], 90)
+        utxos = create_confirmed_utxos(self.relayfee, self.nodes[0], 91)
 
         #create a mempool tx that will be evicted
         us0 = utxos.pop()
@@ -41,9 +41,9 @@ def run_test(self):
 
         relayfee = self.nodes[0].getnetworkinfo()['relayfee']
         base_fee = relayfee*100
-        for i in range (4):
+        for i in range (3):
             txids.append([])
-            txids[i] = create_lots_of_big_transactions(self.nodes[0], self.txouts, utxos[30*i:30*i+30], (i+1)*base_fee)
+            txids[i] = create_lots_of_big_transactions(self.nodes[0], self.txouts, utxos[30*i:30*i+30], 30, (i+1)*base_fee)
 
         # by now, the tx should be evicted, check confirmation state
         assert(txid not in self.nodes[0].getrawmempool())
diff --git a/qa/rpc-tests/prioritise_transaction.py b/qa/rpc-tests/prioritise_transaction.py
index 85afeab2e3eb6..b7459c80cbdfc 100755
--- a/qa/rpc-tests/prioritise_transaction.py
+++ b/qa/rpc-tests/prioritise_transaction.py
@@ -39,7 +39,7 @@ def run_test(self):
             txids.append([])
             start_range = i * range_size
             end_range = start_range + range_size
-            txids[i] = create_lots_of_big_transactions(self.nodes[0], self.txouts, utxos[start_range:end_range], (i+1)*base_fee)
+            txids[i] = create_lots_of_big_transactions(self.nodes[0], self.txouts, utxos[start_range:end_range], end_range - start_range, (i+1)*base_fee)
 
         # Make sure that the size of each group of transactions exceeds
         # MAX_BLOCK_BASE_SIZE -- otherwise the test needs to be revised to create
diff --git a/qa/rpc-tests/pruning.py b/qa/rpc-tests/pruning.py
index 6635b0dff2315..78b8938e4a9f6 100755
--- a/qa/rpc-tests/pruning.py
+++ b/qa/rpc-tests/pruning.py
@@ -13,6 +13,9 @@
 
 from test_framework.test_framework import BitcoinTestFramework
 from test_framework.util import *
+import time
+import os
+
 
 def calc_usage(blockdir):
     return sum(os.path.getsize(blockdir+f) for f in os.listdir(blockdir) if os.path.isfile(blockdir+f)) / (1024. * 1024.)
@@ -24,6 +27,10 @@ def __init__(self):
         self.setup_clean_chain = True
         self.num_nodes = 3
 
+        # Cache for utxos, as the listunspent may take a long time later in the test
+        self.utxo_cache_0 = []
+        self.utxo_cache_1 = []
+
     def setup_network(self):
         self.nodes = []
         self.is_network_split = False
@@ -48,7 +55,7 @@ def create_big_chain(self):
         self.nodes[0].generate(150)
         # Then mine enough full blocks to create more than 550MiB of data
         for i in range(645):
-            mine_large_block(self.nodes[0])
+            mine_large_block(self.nodes[0], self.utxo_cache_0)
 
         sync_blocks(self.nodes[0:3])
 
@@ -60,7 +67,7 @@ def test_height_min(self):
         print("Mining 25 more blocks should cause the first block file to be pruned")
         # Pruning doesn't run until we're allocating another chunk, 20 full blocks past the height cutoff will ensure this
         for i in range(25):
-            mine_large_block(self.nodes[0])
+            mine_large_block(self.nodes[0], self.utxo_cache_0)
 
         waitstart = time.time()
         while os.path.isfile(self.prunedir+"blk00000.dat"):
@@ -87,13 +94,13 @@ def create_chain_with_staleblocks(self):
             # Mine 24 blocks in node 1
             for i in range(24):
                 if j == 0:
-                    mine_large_block(self.nodes[1])
+                    mine_large_block(self.nodes[1], self.utxo_cache_1)
                 else:
                     self.nodes[1].generate(1) #tx's already in mempool from previous disconnects
 
             # Reorg back with 25 block chain from node 0
             for i in range(25):
-                mine_large_block(self.nodes[0])
+                mine_large_block(self.nodes[0], self.utxo_cache_0)
 
             # Create connections in the order so both nodes can see the reorg at the same time
             connect_nodes(self.nodes[1], 0)
diff --git a/qa/rpc-tests/test_framework/util.py b/qa/rpc-tests/test_framework/util.py
index 1d6c9aa2306ae..85898d9f32de1 100644
--- a/qa/rpc-tests/test_framework/util.py
+++ b/qa/rpc-tests/test_framework/util.py
@@ -654,10 +654,10 @@ def create_tx(node, coinbase, to_address, amount):
 
 # Create a spend of each passed-in utxo, splicing in "txouts" to each raw
 # transaction to make it large.  See gen_return_txouts() above.
-def create_lots_of_big_transactions(node, txouts, utxos, fee):
+def create_lots_of_big_transactions(node, txouts, utxos, num, fee):
     addr = node.getnewaddress()
     txids = []
-    for _ in range(len(utxos)):
+    for _ in range(num):
         t = utxos.pop()
         inputs=[{ "txid" : t["txid"], "vout" : t["vout"]}]
         outputs = {}
@@ -672,13 +672,17 @@ def create_lots_of_big_transactions(node, txouts, utxos, fee):
         txids.append(txid)
     return txids
 
-def mine_large_block(node):
+def mine_large_block(node, utxos=None):
     # generate a 66k transaction,
     # and 14 of them is close to the 1MB block limit
+    num = 14
     txouts = gen_return_txouts()
-    utxos = node.listunspent()[:14]
+    utxos = utxos if utxos is not None else []
+    if len(utxos) < num:
+        utxos.clear()
+        utxos.extend(node.listunspent())
     fee = 100 * node.getnetworkinfo()["relayfee"]
-    create_lots_of_big_transactions(node, txouts, utxos, fee=fee)
+    create_lots_of_big_transactions(node, txouts, utxos, num, fee=fee)
     node.generate(1)
 
 def get_bip9_status(node, key):

From 30b620c48aa53ebeb2108f1f511d889e34551ec0 Mon Sep 17 00:00:00 2001
From: Alex Morcos <morcos@chaincode.com>
Date: Sun, 4 Dec 2016 15:44:41 -0500
Subject: [PATCH 1321/1802] remove obsolete run-bitcoind-for-test.sh

---
 .gitignore                                 |  1 -
 configure.ac                               |  1 -
 qa/pull-tester/run-bitcoind-for-test.sh.in | 36 ----------------------
 3 files changed, 38 deletions(-)
 delete mode 100644 qa/pull-tester/run-bitcoind-for-test.sh.in

diff --git a/.gitignore b/.gitignore
index b9db7cbd39917..c765ffb607338 100644
--- a/.gitignore
+++ b/.gitignore
@@ -101,7 +101,6 @@ coverage_percent.txt
 linux-coverage-build
 linux-build
 win32-build
-qa/pull-tester/run-bitcoind-for-test.sh
 qa/pull-tester/tests_config.py
 qa/cache/*
 
diff --git a/configure.ac b/configure.ac
index 7357e4ec9fb97..ced258e02e4cf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1077,7 +1077,6 @@ AC_SUBST(ZMQ_LIBS)
 AC_SUBST(PROTOBUF_LIBS)
 AC_SUBST(QR_LIBS)
 AC_CONFIG_FILES([Makefile src/Makefile doc/man/Makefile share/setup.nsi share/qt/Info.plist src/test/buildenv.py])
-AC_CONFIG_FILES([qa/pull-tester/run-bitcoind-for-test.sh],[chmod +x qa/pull-tester/run-bitcoind-for-test.sh])
 AC_CONFIG_FILES([qa/pull-tester/tests_config.py],[chmod +x qa/pull-tester/tests_config.py])
 AC_CONFIG_FILES([contrib/devtools/split-debug.sh],[chmod +x contrib/devtools/split-debug.sh])
 AC_CONFIG_LINKS([qa/pull-tester/rpc-tests.py:qa/pull-tester/rpc-tests.py])
diff --git a/qa/pull-tester/run-bitcoind-for-test.sh.in b/qa/pull-tester/run-bitcoind-for-test.sh.in
deleted file mode 100644
index 14ae08e4e58f0..0000000000000
--- a/qa/pull-tester/run-bitcoind-for-test.sh.in
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-# Copyright (c) 2013-2014 The Bitcoin Core developers
-# Distributed under the MIT software license, see the accompanying
-# file COPYING or http://www.opensource.org/licenses/mit-license.php.
-#
-DATADIR="@abs_top_builddir@/.bitcoin"
-rm -rf "$DATADIR"
-mkdir -p "$DATADIR"/regtest
-touch "$DATADIR/regtest/debug.log"
-tail -q -n 1 -F "$DATADIR/regtest/debug.log" | grep -m 1 -q "Done loading" &
-WAITER=$!
-PORT=`expr 10000 + $$ % 55536`
-"@abs_top_builddir@/src/bitcoind@EXEEXT@" -connect=0.0.0.0 -datadir="$DATADIR" -rpcuser=user -rpcpassword=pass -listen -keypool=3 -debug -debug=net -logtimestamps -checkmempool=0 -relaypriority=0 -port=$PORT -whitelist=127.0.0.1 -regtest -rpcport=`expr $PORT + 1` &
-BITCOIND=$!
-
-#Install a watchdog.
-(sleep 10 && kill -0 $WAITER 2>/dev/null && kill -9 $BITCOIND $$)&
-wait $WAITER
-
-if [ -n "$TIMEOUT" ]; then
-  timeout "$TIMEOUT"s "$@" $PORT
-  RETURN=$?
-else
-  "$@" $PORT
-  RETURN=$?
-fi
-
-(sleep 15 && kill -0 $BITCOIND 2>/dev/null && kill -9 $BITCOIND $$)&
-kill $BITCOIND && wait $BITCOIND
-
-# timeout returns 124 on timeout, otherwise the return value of the child
-
-# If $RETURN is not 0, the test failed. Dump the tail of the debug log.
-if [ $RETURN -ne 0 ]; then tail -n 200 $DATADIR/regtest/debug.log; fi
-
-exit $RETURN

From fab1af31d43f0db58f590992d1cc5e302f1133f8 Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Mon, 5 Dec 2016 00:27:47 +0100
Subject: [PATCH 1322/1802] [qa] maxuploadtarget: Use cached utxo set

---
 qa/rpc-tests/maxuploadtarget.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/qa/rpc-tests/maxuploadtarget.py b/qa/rpc-tests/maxuploadtarget.py
index 83168a7ce7a4f..9340e899ebc7a 100755
--- a/qa/rpc-tests/maxuploadtarget.py
+++ b/qa/rpc-tests/maxuploadtarget.py
@@ -86,6 +86,9 @@ def __init__(self):
         self.setup_clean_chain = True
         self.num_nodes = 1
 
+        # Cache for utxos, as the listunspent may take a long time later in the test
+        self.utxo_cache = []
+
     def setup_network(self):
         # Start a node with maxuploadtarget of 200 MB (/24h)
         self.nodes = []
@@ -118,7 +121,7 @@ def run_test(self):
         # Test logic begins here
 
         # Now mine a big block
-        mine_large_block(self.nodes[0])
+        mine_large_block(self.nodes[0], self.utxo_cache)
 
         # Store the hash; we'll request this later
         big_old_block = self.nodes[0].getbestblockhash()
@@ -129,7 +132,7 @@ def run_test(self):
         self.nodes[0].setmocktime(int(time.time()) - 2*60*60*24)
 
         # Mine one more block, so that the prior block looks old
-        mine_large_block(self.nodes[0])
+        mine_large_block(self.nodes[0], self.utxo_cache)
 
         # We'll be requesting this new block too
         big_new_block = self.nodes[0].getbestblockhash()

From f6fb7acda4aefd01b8ef6cd77063bfc0c4f4ab36 Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Thu, 4 Aug 2016 02:49:16 +0200
Subject: [PATCH 1323/1802] Move CTxInWitness inside CTxIn

---
 src/bench/verify_script.cpp     |  5 +-
 src/bitcoin-tx.cpp              |  2 +-
 src/core_memusage.h             | 30 +++-------
 src/core_write.cpp              |  4 +-
 src/miner.cpp                   |  4 +-
 src/net_processing.cpp          |  4 +-
 src/policy/policy.cpp           |  8 +--
 src/primitives/transaction.cpp  | 10 ++--
 src/primitives/transaction.h    | 99 +++++++++++----------------------
 src/rpc/rawtransaction.cpp      | 11 ++--
 src/script/bitcoinconsensus.cpp |  3 +-
 src/script/script.h             |  2 +
 src/script/sign.cpp             |  9 +--
 src/test/script_tests.cpp       |  3 +-
 src/test/sigopcount_tests.cpp   | 32 ++++-------
 src/test/transaction_tests.cpp  | 17 ++----
 src/validation.cpp              | 23 ++++----
 src/wallet/wallet.cpp           |  6 +-
 18 files changed, 96 insertions(+), 176 deletions(-)

diff --git a/src/bench/verify_script.cpp b/src/bench/verify_script.cpp
index dc3940cdbdd99..4aca1c7eb3d4b 100644
--- a/src/bench/verify_script.cpp
+++ b/src/bench/verify_script.cpp
@@ -36,7 +36,6 @@ static CMutableTransaction BuildSpendingTransaction(const CScript& scriptSig, co
     txSpend.nLockTime = 0;
     txSpend.vin.resize(1);
     txSpend.vout.resize(1);
-    txSpend.wit.vtxinwit.resize(1);
     txSpend.vin[0].prevout.hash = txCredit.GetHash();
     txSpend.vin[0].prevout.n = 0;
     txSpend.vin[0].scriptSig = scriptSig;
@@ -68,7 +67,7 @@ static void VerifyScriptBench(benchmark::State& state)
     CScript witScriptPubkey = CScript() << OP_DUP << OP_HASH160 << ToByteVector(pubkeyHash) << OP_EQUALVERIFY << OP_CHECKSIG;
     CTransaction txCredit = BuildCreditingTransaction(scriptPubKey);
     CMutableTransaction txSpend = BuildSpendingTransaction(scriptSig, txCredit);
-    CScriptWitness& witness = txSpend.wit.vtxinwit[0].scriptWitness;
+    CScriptWitness& witness = txSpend.vin[0].scriptWitness;
     witness.stack.emplace_back();
     key.Sign(SignatureHash(witScriptPubkey, txSpend, 0, SIGHASH_ALL, txCredit.vout[0].nValue, SIGVERSION_WITNESS_V0), witness.stack.back(), 0);
     witness.stack.back().push_back(static_cast<unsigned char>(SIGHASH_ALL));
@@ -80,7 +79,7 @@ static void VerifyScriptBench(benchmark::State& state)
         bool success = VerifyScript(
             txSpend.vin[0].scriptSig,
             txCredit.vout[0].scriptPubKey,
-            &txSpend.wit.vtxinwit[0].scriptWitness,
+            &txSpend.vin[0].scriptWitness,
             flags,
             MutableTransactionSignatureChecker(&txSpend, 0, txCredit.vout[0].nValue),
             &err);
diff --git a/src/bitcoin-tx.cpp b/src/bitcoin-tx.cpp
index 1ed1449f03e64..816687a45d146 100644
--- a/src/bitcoin-tx.cpp
+++ b/src/bitcoin-tx.cpp
@@ -494,7 +494,7 @@ static void MutateTxSign(CMutableTransaction& tx, const std::string& flagStr)
             sigdata = CombineSignatures(prevPubKey, MutableTransactionSignatureChecker(&mergedTx, i, amount), sigdata, DataFromTransaction(txv, i));
         UpdateTransaction(mergedTx, i, sigdata);
 
-        if (!VerifyScript(txin.scriptSig, prevPubKey, mergedTx.wit.vtxinwit.size() > i ? &mergedTx.wit.vtxinwit[i].scriptWitness : NULL, STANDARD_SCRIPT_VERIFY_FLAGS, MutableTransactionSignatureChecker(&mergedTx, i, amount)))
+        if (!VerifyScript(txin.scriptSig, prevPubKey, &txin.scriptWitness, STANDARD_SCRIPT_VERIFY_FLAGS, MutableTransactionSignatureChecker(&mergedTx, i, amount)))
             fComplete = false;
     }
 
diff --git a/src/core_memusage.h b/src/core_memusage.h
index 0dcc24c40c822..80f6216ee216d 100644
--- a/src/core_memusage.h
+++ b/src/core_memusage.h
@@ -18,35 +18,19 @@ static inline size_t RecursiveDynamicUsage(const COutPoint& out) {
 }
 
 static inline size_t RecursiveDynamicUsage(const CTxIn& in) {
-    return RecursiveDynamicUsage(in.scriptSig) + RecursiveDynamicUsage(in.prevout);
-}
-
-static inline size_t RecursiveDynamicUsage(const CTxOut& out) {
-    return RecursiveDynamicUsage(out.scriptPubKey);
-}
-
-static inline size_t RecursiveDynamicUsage(const CScriptWitness& scriptWit) {
-    size_t mem = memusage::DynamicUsage(scriptWit.stack);
-    for (std::vector<std::vector<unsigned char> >::const_iterator it = scriptWit.stack.begin(); it != scriptWit.stack.end(); it++) {
-        mem += memusage::DynamicUsage(*it);
+    size_t mem = RecursiveDynamicUsage(in.scriptSig) + RecursiveDynamicUsage(in.prevout) + memusage::DynamicUsage(in.scriptWitness.stack);
+    for (std::vector<std::vector<unsigned char> >::const_iterator it = in.scriptWitness.stack.begin(); it != in.scriptWitness.stack.end(); it++) {
+         mem += memusage::DynamicUsage(*it);
     }
     return mem;
 }
 
-static inline size_t RecursiveDynamicUsage(const CTxInWitness& txinwit) {
-    return RecursiveDynamicUsage(txinwit.scriptWitness);
-}
-
-static inline size_t RecursiveDynamicUsage(const CTxWitness& txwit) {
-    size_t mem = memusage::DynamicUsage(txwit.vtxinwit);
-    for (std::vector<CTxInWitness>::const_iterator it = txwit.vtxinwit.begin(); it != txwit.vtxinwit.end(); it++) {
-        mem += RecursiveDynamicUsage(*it);
-    }
-    return mem;
+static inline size_t RecursiveDynamicUsage(const CTxOut& out) {
+    return RecursiveDynamicUsage(out.scriptPubKey);
 }
 
 static inline size_t RecursiveDynamicUsage(const CTransaction& tx) {
-    size_t mem = memusage::DynamicUsage(tx.vin) + memusage::DynamicUsage(tx.vout) + RecursiveDynamicUsage(tx.wit);
+    size_t mem = memusage::DynamicUsage(tx.vin) + memusage::DynamicUsage(tx.vout);
     for (std::vector<CTxIn>::const_iterator it = tx.vin.begin(); it != tx.vin.end(); it++) {
         mem += RecursiveDynamicUsage(*it);
     }
@@ -57,7 +41,7 @@ static inline size_t RecursiveDynamicUsage(const CTransaction& tx) {
 }
 
 static inline size_t RecursiveDynamicUsage(const CMutableTransaction& tx) {
-    size_t mem = memusage::DynamicUsage(tx.vin) + memusage::DynamicUsage(tx.vout) + RecursiveDynamicUsage(tx.wit);
+    size_t mem = memusage::DynamicUsage(tx.vin) + memusage::DynamicUsage(tx.vout);
     for (std::vector<CTxIn>::const_iterator it = tx.vin.begin(); it != tx.vin.end(); it++) {
         mem += RecursiveDynamicUsage(*it);
     }
diff --git a/src/core_write.cpp b/src/core_write.cpp
index ea01ddc10d81a..11257185976d7 100644
--- a/src/core_write.cpp
+++ b/src/core_write.cpp
@@ -168,9 +168,9 @@ void TxToUniv(const CTransaction& tx, const uint256& hashBlock, UniValue& entry)
             o.pushKV("asm", ScriptToAsmStr(txin.scriptSig, true));
             o.pushKV("hex", HexStr(txin.scriptSig.begin(), txin.scriptSig.end()));
             in.pushKV("scriptSig", o);
-            if (!tx.wit.IsNull() && i < tx.wit.vtxinwit.size() && !tx.wit.vtxinwit[i].IsNull()) {
+            if (!tx.vin[i].scriptWitness.IsNull()) {
                 UniValue txinwitness(UniValue::VARR);
-                for (const auto& item : tx.wit.vtxinwit[i].scriptWitness.stack) {
+                for (const auto& item : tx.vin[i].scriptWitness.stack) {
                     txinwitness.push_back(HexStr(item.begin(), item.end()));
                 }
                 in.pushKV("txinwitness", txinwitness);
diff --git a/src/miner.cpp b/src/miner.cpp
index e80e8a2656c70..b48b9cee49be5 100644
--- a/src/miner.cpp
+++ b/src/miner.cpp
@@ -245,7 +245,7 @@ bool BlockAssembler::TestPackageTransactions(const CTxMemPool::setEntries& packa
     BOOST_FOREACH (const CTxMemPool::txiter it, package) {
         if (!IsFinalTx(it->GetTx(), nHeight, nLockTimeCutoff))
             return false;
-        if (!fIncludeWitness && !it->GetTx().wit.IsNull())
+        if (!fIncludeWitness && it->GetTx().HasWitness())
             return false;
         if (fNeedSizeAccounting) {
             uint64_t nTxSize = ::GetSerializeSize(it->GetTx(), SER_NETWORK, PROTOCOL_VERSION);
@@ -554,7 +554,7 @@ void BlockAssembler::addPriorityTxs()
         }
 
         // cannot accept witness transactions into a non-witness block
-        if (!fIncludeWitness && !iter->GetTx().wit.IsNull())
+        if (!fIncludeWitness && iter->GetTx().HasWitness())
             continue;
 
         // If tx is dependent on other mempool txs which haven't yet been included
diff --git a/src/net_processing.cpp b/src/net_processing.cpp
index c37faf49f0cc2..3ff5ccc18f0d5 100644
--- a/src/net_processing.cpp
+++ b/src/net_processing.cpp
@@ -1666,7 +1666,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
                         // Probably non-standard or insufficient fee/priority
                         LogPrint("mempool", "   removed orphan tx %s\n", orphanHash.ToString());
                         vEraseQueue.push_back(orphanHash);
-                        if (orphanTx.wit.IsNull() && !stateDummy.CorruptionPossible()) {
+                        if (!orphanTx.HasWitness() && !stateDummy.CorruptionPossible()) {
                             // Do not use rejection cache for witness transactions or
                             // witness-stripped transactions, as they can have been malleated.
                             // See https://github.com/bitcoin/bitcoin/issues/8279 for details.
@@ -1708,7 +1708,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
                 LogPrint("mempool", "not keeping orphan with rejected parents %s\n",tx.GetHash().ToString());
             }
         } else {
-            if (tx.wit.IsNull() && !state.CorruptionPossible()) {
+            if (!tx.HasWitness() && !state.CorruptionPossible()) {
                 // Do not use rejection cache for witness transactions or
                 // witness-stripped transactions, as they can have been malleated.
                 // See https://github.com/bitcoin/bitcoin/issues/8279 for details.
diff --git a/src/policy/policy.cpp b/src/policy/policy.cpp
index 0c71a079fb0c9..d318a0997c0dc 100644
--- a/src/policy/policy.cpp
+++ b/src/policy/policy.cpp
@@ -163,7 +163,7 @@ bool IsWitnessStandard(const CTransaction& tx, const CCoinsViewCache& mapInputs)
     {
         // We don't care if witness for this input is empty, since it must not be bloated.
         // If the script is invalid without witness, it would be caught sooner or later during validation.
-        if (tx.wit.vtxinwit[i].IsNull())
+        if (tx.vin[i].scriptWitness.IsNull())
             continue;
 
         const CTxOut &prev = mapInputs.GetOutputFor(tx.vin[i]);
@@ -192,13 +192,13 @@ bool IsWitnessStandard(const CTransaction& tx, const CCoinsViewCache& mapInputs)
 
         // Check P2WSH standard limits
         if (witnessversion == 0 && witnessprogram.size() == 32) {
-            if (tx.wit.vtxinwit[i].scriptWitness.stack.back().size() > MAX_STANDARD_P2WSH_SCRIPT_SIZE)
+            if (tx.vin[i].scriptWitness.stack.back().size() > MAX_STANDARD_P2WSH_SCRIPT_SIZE)
                 return false;
-            size_t sizeWitnessStack = tx.wit.vtxinwit[i].scriptWitness.stack.size() - 1;
+            size_t sizeWitnessStack = tx.vin[i].scriptWitness.stack.size() - 1;
             if (sizeWitnessStack > MAX_STANDARD_P2WSH_STACK_ITEMS)
                 return false;
             for (unsigned int j = 0; j < sizeWitnessStack; j++) {
-                if (tx.wit.vtxinwit[i].scriptWitness.stack[j].size() > MAX_STANDARD_P2WSH_STACK_ITEM_SIZE)
+                if (tx.vin[i].scriptWitness.stack[j].size() > MAX_STANDARD_P2WSH_STACK_ITEM_SIZE)
                     return false;
             }
         }
diff --git a/src/primitives/transaction.cpp b/src/primitives/transaction.cpp
index 11d7eace55737..faf3637d74395 100644
--- a/src/primitives/transaction.cpp
+++ b/src/primitives/transaction.cpp
@@ -55,7 +55,7 @@ std::string CTxOut::ToString() const
 }
 
 CMutableTransaction::CMutableTransaction() : nVersion(CTransaction::CURRENT_VERSION), nLockTime(0) {}
-CMutableTransaction::CMutableTransaction(const CTransaction& tx) : nVersion(tx.nVersion), vin(tx.vin), vout(tx.vout), wit(tx.wit), nLockTime(tx.nLockTime) {}
+CMutableTransaction::CMutableTransaction(const CTransaction& tx) : nVersion(tx.nVersion), vin(tx.vin), vout(tx.vout), nLockTime(tx.nLockTime) {}
 
 uint256 CMutableTransaction::GetHash() const
 {
@@ -74,8 +74,8 @@ uint256 CTransaction::GetWitnessHash() const
 
 /* For backward compatibility, the hash is initialized to 0. TODO: remove the need for this default constructor entirely. */
 CTransaction::CTransaction() : nVersion(CTransaction::CURRENT_VERSION), vin(), vout(), nLockTime(0), hash() {}
-CTransaction::CTransaction(const CMutableTransaction &tx) : nVersion(tx.nVersion), vin(tx.vin), vout(tx.vout), wit(tx.wit), nLockTime(tx.nLockTime), hash(ComputeHash()) {}
-CTransaction::CTransaction(CMutableTransaction &&tx) : nVersion(tx.nVersion), vin(std::move(tx.vin)), vout(std::move(tx.vout)), wit(std::move(tx.wit)), nLockTime(tx.nLockTime), hash(ComputeHash()) {}
+CTransaction::CTransaction(const CMutableTransaction &tx) : nVersion(tx.nVersion), vin(tx.vin), vout(tx.vout), nLockTime(tx.nLockTime), hash(ComputeHash()) {}
+CTransaction::CTransaction(CMutableTransaction &&tx) : nVersion(tx.nVersion), vin(std::move(tx.vin)), vout(std::move(tx.vout)), nLockTime(tx.nLockTime), hash(ComputeHash()) {}
 
 CAmount CTransaction::GetValueOut() const
 {
@@ -131,8 +131,8 @@ std::string CTransaction::ToString() const
         nLockTime);
     for (unsigned int i = 0; i < vin.size(); i++)
         str += "    " + vin[i].ToString() + "\n";
-    for (unsigned int i = 0; i < wit.vtxinwit.size(); i++)
-        str += "    " + wit.vtxinwit[i].scriptWitness.ToString() + "\n";
+    for (unsigned int i = 0; i < vin.size(); i++)
+        str += "    " + vin[i].scriptWitness.ToString() + "\n";
     for (unsigned int i = 0; i < vout.size(); i++)
         str += "    " + vout[i].ToString() + "\n";
     return str;
diff --git a/src/primitives/transaction.h b/src/primitives/transaction.h
index 66fefafef5807..79393fa949277 100644
--- a/src/primitives/transaction.h
+++ b/src/primitives/transaction.h
@@ -65,6 +65,7 @@ class CTxIn
     COutPoint prevout;
     CScript scriptSig;
     uint32_t nSequence;
+    CScriptWitness scriptWitness; //! Only serialized through CTransaction
 
     /* Setting nSequence to this value for every input in a transaction
      * disables nLockTime. */
@@ -211,62 +212,6 @@ class CTxOut
     std::string ToString() const;
 };
 
-class CTxInWitness
-{
-public:
-    CScriptWitness scriptWitness;
-
-    ADD_SERIALIZE_METHODS;
-
-    template <typename Stream, typename Operation>
-    inline void SerializationOp(Stream& s, Operation ser_action)
-    {
-        READWRITE(scriptWitness.stack);
-    }
-
-    bool IsNull() const { return scriptWitness.IsNull(); }
-
-    CTxInWitness() { }
-};
-
-class CTxWitness
-{
-public:
-    /** In case vtxinwit is missing, all entries are treated as if they were empty CTxInWitnesses */
-    std::vector<CTxInWitness> vtxinwit;
-
-    ADD_SERIALIZE_METHODS;
-
-    bool IsEmpty() const { return vtxinwit.empty(); }
-
-    bool IsNull() const
-    {
-        for (size_t n = 0; n < vtxinwit.size(); n++) {
-            if (!vtxinwit[n].IsNull()) {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    void SetNull()
-    {
-        vtxinwit.clear();
-    }
-
-    template <typename Stream, typename Operation>
-    inline void SerializationOp(Stream& s, Operation ser_action)
-    {
-        for (size_t n = 0; n < vtxinwit.size(); n++) {
-            READWRITE(vtxinwit[n]);
-        }
-        if (IsNull()) {
-            /* It's illegal to encode a witness when all vtxinwit entries are empty. */
-            throw std::ios_base::failure("Superfluous witness record");
-        }
-    }
-};
-
 struct CMutableTransaction;
 
 /**
@@ -294,7 +239,6 @@ inline void UnserializeTransaction(TxType& tx, Stream& s) {
     unsigned char flags = 0;
     tx.vin.clear();
     tx.vout.clear();
-    tx.wit.SetNull();
     /* Try to read the vin. In case the dummy is there, this will be read as an empty vector. */
     s >> tx.vin;
     if (tx.vin.size() == 0 && fAllowWitness) {
@@ -311,8 +255,9 @@ inline void UnserializeTransaction(TxType& tx, Stream& s) {
     if ((flags & 1) && fAllowWitness) {
         /* The witness flag is present, and we support witnesses. */
         flags ^= 1;
-        tx.wit.vtxinwit.resize(tx.vin.size());
-        s >> tx.wit;
+        for (size_t i = 0; i < tx.vin.size(); i++) {
+            s >> tx.vin[i].scriptWitness.stack;
+        }
     }
     if (flags) {
         /* Unknown flag in the serialization */
@@ -328,10 +273,9 @@ inline void SerializeTransaction(const TxType& tx, Stream& s) {
     s << tx.nVersion;
     unsigned char flags = 0;
     // Consistency check
-    assert(tx.wit.vtxinwit.size() <= tx.vin.size());
     if (fAllowWitness) {
         /* Check whether witnesses need to be serialized. */
-        if (!tx.wit.IsNull()) {
+        if (tx.HasWitness()) {
             flags |= 1;
         }
     }
@@ -345,11 +289,7 @@ inline void SerializeTransaction(const TxType& tx, Stream& s) {
     s << tx.vout;
     if (flags & 1) {
         for (size_t i = 0; i < tx.vin.size(); i++) {
-            if (i < tx.wit.vtxinwit.size()) {
-                s << tx.wit.vtxinwit[i];
-            } else {
-                s << CTxInWitness();
-            }
+            s << tx.vin[i].scriptWitness.stack;
         }
     }
     s << tx.nLockTime;
@@ -379,7 +319,6 @@ class CTransaction
     const int32_t nVersion;
     const std::vector<CTxIn> vin;
     const std::vector<CTxOut> vout;
-    CTxWitness wit; // Not const: can change without invalidating the txid cache
     const uint32_t nLockTime;
 
 private:
@@ -451,6 +390,16 @@ class CTransaction
     }
 
     std::string ToString() const;
+
+    bool HasWitness() const
+    {
+        for (size_t i = 0; i < vin.size(); i++) {
+            if (!vin[i].scriptWitness.IsNull()) {
+                return true;
+            }
+        }
+        return false;
+    }
 };
 
 /** A mutable version of CTransaction. */
@@ -459,7 +408,6 @@ struct CMutableTransaction
     int32_t nVersion;
     std::vector<CTxIn> vin;
     std::vector<CTxOut> vout;
-    CTxWitness wit;
     uint32_t nLockTime;
 
     CMutableTransaction();
@@ -485,6 +433,21 @@ struct CMutableTransaction
      * fly, as opposed to GetHash() in CTransaction, which uses a cached result.
      */
     uint256 GetHash() const;
+
+    friend bool operator==(const CMutableTransaction& a, const CMutableTransaction& b)
+    {
+        return a.GetHash() == b.GetHash();
+    }
+
+    bool HasWitness() const
+    {
+        for (size_t i = 0; i < vin.size(); i++) {
+            if (!vin[i].scriptWitness.IsNull()) {
+                return true;
+            }
+        }
+        return false;
+    }
 };
 
 typedef std::shared_ptr<const CTransaction> CTransactionRef;
diff --git a/src/rpc/rawtransaction.cpp b/src/rpc/rawtransaction.cpp
index 48769a5335fc8..b13aa4de34f07 100644
--- a/src/rpc/rawtransaction.cpp
+++ b/src/rpc/rawtransaction.cpp
@@ -82,16 +82,13 @@ void TxToJSON(const CTransaction& tx, const uint256 hashBlock, UniValue& entry)
             o.push_back(Pair("hex", HexStr(txin.scriptSig.begin(), txin.scriptSig.end())));
             in.push_back(Pair("scriptSig", o));
         }
-        if (!tx.wit.IsNull()) {
-            if (!tx.wit.vtxinwit[i].IsNull()) {
+        if (tx.HasWitness()) {
                 UniValue txinwitness(UniValue::VARR);
-                for (unsigned int j = 0; j < tx.wit.vtxinwit[i].scriptWitness.stack.size(); j++) {
-                    std::vector<unsigned char> item = tx.wit.vtxinwit[i].scriptWitness.stack[j];
+                for (unsigned int j = 0; j < tx.vin[i].scriptWitness.stack.size(); j++) {
+                    std::vector<unsigned char> item = tx.vin[i].scriptWitness.stack[j];
                     txinwitness.push_back(HexStr(item.begin(), item.end()));
                 }
                 in.push_back(Pair("txinwitness", txinwitness));
-            }
-
         }
         in.push_back(Pair("sequence", (int64_t)txin.nSequence));
         vin.push_back(in);
@@ -840,7 +837,7 @@ UniValue signrawtransaction(const JSONRPCRequest& request)
         UpdateTransaction(mergedTx, i, sigdata);
 
         ScriptError serror = SCRIPT_ERR_OK;
-        if (!VerifyScript(txin.scriptSig, prevPubKey, mergedTx.wit.vtxinwit.size() > i ? &mergedTx.wit.vtxinwit[i].scriptWitness : NULL, STANDARD_SCRIPT_VERIFY_FLAGS, TransactionSignatureChecker(&txConst, i, amount), &serror)) {
+        if (!VerifyScript(txin.scriptSig, prevPubKey, &txin.scriptWitness, STANDARD_SCRIPT_VERIFY_FLAGS, TransactionSignatureChecker(&txConst, i, amount), &serror)) {
             TxInErrorToJSON(txin, vErrors, ScriptErrorString(serror));
         }
     }
diff --git a/src/script/bitcoinconsensus.cpp b/src/script/bitcoinconsensus.cpp
index 036d6ca7bf175..be7fa5d3b79b4 100644
--- a/src/script/bitcoinconsensus.cpp
+++ b/src/script/bitcoinconsensus.cpp
@@ -93,8 +93,9 @@ static int verify_script(const unsigned char *scriptPubKey, unsigned int scriptP
 
         // Regardless of the verification result, the tx did not error.
         set_error(err, bitcoinconsensus_ERR_OK);
+
         PrecomputedTransactionData txdata(tx);
-        return VerifyScript(tx.vin[nIn].scriptSig, CScript(scriptPubKey, scriptPubKey + scriptPubKeyLen), nIn < tx.wit.vtxinwit.size() ? &tx.wit.vtxinwit[nIn].scriptWitness : NULL, flags, TransactionSignatureChecker(&tx, nIn, amount, txdata), NULL);
+        return VerifyScript(tx.vin[nIn].scriptSig, CScript(scriptPubKey, scriptPubKey + scriptPubKeyLen), &tx.vin[nIn].scriptWitness, flags, TransactionSignatureChecker(&tx, nIn, amount, txdata), NULL);
     } catch (const std::exception&) {
         return set_error(err, bitcoinconsensus_ERR_TX_DESERIALIZE); // Error deserializing
     }
diff --git a/src/script/script.h b/src/script/script.h
index 278774d32e3ed..76419c1495f7d 100644
--- a/src/script/script.h
+++ b/src/script/script.h
@@ -656,6 +656,8 @@ struct CScriptWitness
 
     bool IsNull() const { return stack.empty(); }
 
+    void SetNull() { stack.clear(); stack.shrink_to_fit(); }
+
     std::string ToString() const;
 };
 
diff --git a/src/script/sign.cpp b/src/script/sign.cpp
index f552ad5bbad25..b008df259178d 100644
--- a/src/script/sign.cpp
+++ b/src/script/sign.cpp
@@ -194,9 +194,7 @@ SignatureData DataFromTransaction(const CMutableTransaction& tx, unsigned int nI
     SignatureData data;
     assert(tx.vin.size() > nIn);
     data.scriptSig = tx.vin[nIn].scriptSig;
-    if (tx.wit.vtxinwit.size() > nIn) {
-        data.scriptWitness = tx.wit.vtxinwit[nIn].scriptWitness;
-    }
+    data.scriptWitness = tx.vin[nIn].scriptWitness;
     return data;
 }
 
@@ -204,10 +202,7 @@ void UpdateTransaction(CMutableTransaction& tx, unsigned int nIn, const Signatur
 {
     assert(tx.vin.size() > nIn);
     tx.vin[nIn].scriptSig = data.scriptSig;
-    if (!data.scriptWitness.IsNull() || tx.wit.vtxinwit.size() > nIn) {
-        tx.wit.vtxinwit.resize(tx.vin.size());
-        tx.wit.vtxinwit[nIn].scriptWitness = data.scriptWitness;
-    }
+    tx.vin[nIn].scriptWitness = data.scriptWitness;
 }
 
 bool SignSignature(const CKeyStore &keystore, const CScript& fromPubKey, CMutableTransaction& txTo, unsigned int nIn, const CAmount& amount, int nHashType)
diff --git a/src/test/script_tests.cpp b/src/test/script_tests.cpp
index eb324d5a6b781..84498c5f1058c 100644
--- a/src/test/script_tests.cpp
+++ b/src/test/script_tests.cpp
@@ -145,8 +145,7 @@ CMutableTransaction BuildSpendingTransaction(const CScript& scriptSig, const CSc
     txSpend.nLockTime = 0;
     txSpend.vin.resize(1);
     txSpend.vout.resize(1);
-    txSpend.wit.vtxinwit.resize(1);
-    txSpend.wit.vtxinwit[0].scriptWitness = scriptWitness;
+    txSpend.vin[0].scriptWitness = scriptWitness;
     txSpend.vin[0].prevout.hash = txCredit.GetHash();
     txSpend.vin[0].prevout.n = 0;
     txSpend.vin[0].scriptSig = scriptSig;
diff --git a/src/test/sigopcount_tests.cpp b/src/test/sigopcount_tests.cpp
index 2e974cc612e2d..3488a0befc487 100644
--- a/src/test/sigopcount_tests.cpp
+++ b/src/test/sigopcount_tests.cpp
@@ -73,7 +73,7 @@ ScriptError VerifyWithFlag(const CTransaction& output, const CMutableTransaction
 {
     ScriptError error;
     CTransaction inputi(input);
-    bool ret = VerifyScript(inputi.vin[0].scriptSig, output.vout[0].scriptPubKey, inputi.wit.vtxinwit.size() > 0 ? &inputi.wit.vtxinwit[0].scriptWitness : NULL, flags, TransactionSignatureChecker(&inputi, 0, output.vout[0].nValue), &error);
+    bool ret = VerifyScript(inputi.vin[0].scriptSig, output.vout[0].scriptPubKey, &inputi.vin[0].scriptWitness, flags, TransactionSignatureChecker(&inputi, 0, output.vout[0].nValue), &error);
     BOOST_CHECK((ret == true) == (error == SCRIPT_ERR_OK));
 
     return error;
@@ -84,13 +84,12 @@ ScriptError VerifyWithFlag(const CTransaction& output, const CMutableTransaction
  * and witness such that spendingTx spends output zero of creationTx.
  * Also inserts creationTx's output into the coins view.
  */
-void BuildTxs(CMutableTransaction& spendingTx, CCoinsViewCache& coins, CMutableTransaction& creationTx, const CScript& scriptPubKey, const CScript& scriptSig, const CTxInWitness& witness)
+void BuildTxs(CMutableTransaction& spendingTx, CCoinsViewCache& coins, CMutableTransaction& creationTx, const CScript& scriptPubKey, const CScript& scriptSig, const CScriptWitness& witness)
 {
     creationTx.nVersion = 1;
     creationTx.vin.resize(1);
     creationTx.vin[0].prevout.SetNull();
     creationTx.vin[0].scriptSig = CScript();
-    creationTx.wit.vtxinwit.resize(1);
     creationTx.vout.resize(1);
     creationTx.vout[0].nValue = 1;
     creationTx.vout[0].scriptPubKey = scriptPubKey;
@@ -100,8 +99,7 @@ void BuildTxs(CMutableTransaction& spendingTx, CCoinsViewCache& coins, CMutableT
     spendingTx.vin[0].prevout.hash = creationTx.GetHash();
     spendingTx.vin[0].prevout.n = 0;
     spendingTx.vin[0].scriptSig = scriptSig;
-    spendingTx.wit.vtxinwit.resize(1);
-    spendingTx.wit.vtxinwit[0] = witness;
+    spendingTx.vin[0].scriptWitness = witness;
     spendingTx.vout.resize(1);
     spendingTx.vout[0].nValue = 1;
     spendingTx.vout[0].scriptPubKey = CScript();
@@ -133,7 +131,7 @@ BOOST_AUTO_TEST_CASE(GetTxSigOpCost)
         // Do not use a valid signature to avoid using wallet operations.
         CScript scriptSig = CScript() << OP_0 << OP_0;
 
-        BuildTxs(spendingTx, coins, creationTx, scriptPubKey, scriptSig, CTxInWitness());
+        BuildTxs(spendingTx, coins, creationTx, scriptPubKey, scriptSig, CScriptWitness());
         // Legacy counting only includes signature operations in scriptSigs and scriptPubKeys
         // of a transaction and does not take the actual executed sig operations into account.
         // spendingTx in itself does not contain a signature operation.
@@ -151,7 +149,7 @@ BOOST_AUTO_TEST_CASE(GetTxSigOpCost)
         CScript scriptPubKey = GetScriptForDestination(CScriptID(redeemScript));
         CScript scriptSig = CScript() << OP_0 << OP_0 << ToByteVector(redeemScript);
 
-        BuildTxs(spendingTx, coins, creationTx, scriptPubKey, scriptSig, CTxInWitness());
+        BuildTxs(spendingTx, coins, creationTx, scriptPubKey, scriptSig, CScriptWitness());
         assert(GetTransactionSigOpCost(CTransaction(spendingTx), coins, flags) == 2 * WITNESS_SCALE_FACTOR);
         assert(VerifyWithFlag(creationTx, spendingTx, flags) == SCRIPT_ERR_CHECKMULTISIGVERIFY);
     }
@@ -161,14 +159,12 @@ BOOST_AUTO_TEST_CASE(GetTxSigOpCost)
         CScript p2pk = CScript() << ToByteVector(pubkey) << OP_CHECKSIG;
         CScript scriptPubKey = GetScriptForWitness(p2pk);
         CScript scriptSig = CScript();
-        CTxInWitness witness;
         CScriptWitness scriptWitness;
         scriptWitness.stack.push_back(vector<unsigned char>(0));
         scriptWitness.stack.push_back(vector<unsigned char>(0));
-        witness.scriptWitness = scriptWitness;
 
 
-        BuildTxs(spendingTx, coins, creationTx, scriptPubKey, scriptSig, witness);
+        BuildTxs(spendingTx, coins, creationTx, scriptPubKey, scriptSig, scriptWitness);
         assert(GetTransactionSigOpCost(CTransaction(spendingTx), coins, flags) == 1);
         // No signature operations if we don't verify the witness.
         assert(GetTransactionSigOpCost(CTransaction(spendingTx), coins, flags & ~SCRIPT_VERIFY_WITNESS) == 0);
@@ -177,10 +173,10 @@ BOOST_AUTO_TEST_CASE(GetTxSigOpCost)
         // The sig op cost for witness version != 0 is zero.
         assert(scriptPubKey[0] == 0x00);
         scriptPubKey[0] = 0x51;
-        BuildTxs(spendingTx, coins, creationTx, scriptPubKey, scriptSig, witness);
+        BuildTxs(spendingTx, coins, creationTx, scriptPubKey, scriptSig, scriptWitness);
         assert(GetTransactionSigOpCost(CTransaction(spendingTx), coins, flags) == 0);
         scriptPubKey[0] = 0x00;
-        BuildTxs(spendingTx, coins, creationTx, scriptPubKey, scriptSig, witness);
+        BuildTxs(spendingTx, coins, creationTx, scriptPubKey, scriptSig, scriptWitness);
 
         // The witness of a coinbase transaction is not taken into account.
         spendingTx.vin[0].prevout.SetNull();
@@ -193,13 +189,11 @@ BOOST_AUTO_TEST_CASE(GetTxSigOpCost)
         CScript scriptSig = GetScriptForWitness(p2pk);
         CScript scriptPubKey = GetScriptForDestination(CScriptID(scriptSig));
         scriptSig = CScript() << ToByteVector(scriptSig);
-        CTxInWitness witness;
         CScriptWitness scriptWitness;
         scriptWitness.stack.push_back(vector<unsigned char>(0));
         scriptWitness.stack.push_back(vector<unsigned char>(0));
-        witness.scriptWitness = scriptWitness;
 
-        BuildTxs(spendingTx, coins, creationTx, scriptPubKey, scriptSig, witness);
+        BuildTxs(spendingTx, coins, creationTx, scriptPubKey, scriptSig, scriptWitness);
         assert(GetTransactionSigOpCost(CTransaction(spendingTx), coins, flags) == 1);
         assert(VerifyWithFlag(creationTx, spendingTx, flags) == SCRIPT_ERR_EQUALVERIFY);
     }
@@ -209,14 +203,12 @@ BOOST_AUTO_TEST_CASE(GetTxSigOpCost)
         CScript witnessScript = CScript() << 1 << ToByteVector(pubkey) << ToByteVector(pubkey) << 2 << OP_CHECKMULTISIGVERIFY;
         CScript scriptPubKey = GetScriptForWitness(witnessScript);
         CScript scriptSig = CScript();
-        CTxInWitness witness;
         CScriptWitness scriptWitness;
         scriptWitness.stack.push_back(vector<unsigned char>(0));
         scriptWitness.stack.push_back(vector<unsigned char>(0));
         scriptWitness.stack.push_back(vector<unsigned char>(witnessScript.begin(), witnessScript.end()));
-        witness.scriptWitness = scriptWitness;
 
-        BuildTxs(spendingTx, coins, creationTx, scriptPubKey, scriptSig, witness);
+        BuildTxs(spendingTx, coins, creationTx, scriptPubKey, scriptSig, scriptWitness);
         assert(GetTransactionSigOpCost(CTransaction(spendingTx), coins, flags) == 2);
         assert(GetTransactionSigOpCost(CTransaction(spendingTx), coins, flags & ~SCRIPT_VERIFY_WITNESS) == 0);
         assert(VerifyWithFlag(creationTx, spendingTx, flags) == SCRIPT_ERR_CHECKMULTISIGVERIFY);
@@ -228,14 +220,12 @@ BOOST_AUTO_TEST_CASE(GetTxSigOpCost)
         CScript redeemScript = GetScriptForWitness(witnessScript);
         CScript scriptPubKey = GetScriptForDestination(CScriptID(redeemScript));
         CScript scriptSig = CScript() << ToByteVector(redeemScript);
-        CTxInWitness witness;
         CScriptWitness scriptWitness;
         scriptWitness.stack.push_back(vector<unsigned char>(0));
         scriptWitness.stack.push_back(vector<unsigned char>(0));
         scriptWitness.stack.push_back(vector<unsigned char>(witnessScript.begin(), witnessScript.end()));
-        witness.scriptWitness = scriptWitness;
 
-        BuildTxs(spendingTx, coins, creationTx, scriptPubKey, scriptSig, witness);
+        BuildTxs(spendingTx, coins, creationTx, scriptPubKey, scriptSig, scriptWitness);
         assert(GetTransactionSigOpCost(CTransaction(spendingTx), coins, flags) == 2);
         assert(VerifyWithFlag(creationTx, spendingTx, flags) == SCRIPT_ERR_CHECKMULTISIGVERIFY);
     }
diff --git a/src/test/transaction_tests.cpp b/src/test/transaction_tests.cpp
index ae5406ef7e742..cd9294c7a9c76 100644
--- a/src/test/transaction_tests.cpp
+++ b/src/test/transaction_tests.cpp
@@ -170,7 +170,7 @@ BOOST_AUTO_TEST_CASE(tx_valid)
                     amount = mapprevOutValues[tx.vin[i].prevout];
                 }
                 unsigned int verify_flags = ParseScriptFlags(test[2].get_str());
-                const CScriptWitness *witness = (i < tx.wit.vtxinwit.size()) ? &tx.wit.vtxinwit[i].scriptWitness : NULL;
+                const CScriptWitness *witness = &tx.vin[i].scriptWitness;
                 BOOST_CHECK_MESSAGE(VerifyScript(tx.vin[i].scriptSig, mapprevOutScriptPubKeys[tx.vin[i].prevout],
                                                  witness, verify_flags, TransactionSignatureChecker(&tx, i, amount, txdata), &err),
                                     strTest);
@@ -254,7 +254,7 @@ BOOST_AUTO_TEST_CASE(tx_invalid)
                 if (mapprevOutValues.count(tx.vin[i].prevout)) {
                     amount = mapprevOutValues[tx.vin[i].prevout];
                 }
-                const CScriptWitness *witness = (i < tx.wit.vtxinwit.size()) ? &tx.wit.vtxinwit[i].scriptWitness : NULL;
+                const CScriptWitness *witness = &tx.vin[i].scriptWitness;
                 fValid = VerifyScript(tx.vin[i].scriptSig, mapprevOutScriptPubKeys[tx.vin[i].prevout],
                                       witness, verify_flags, TransactionSignatureChecker(&tx, i, amount, txdata), &err);
             }
@@ -351,7 +351,6 @@ void CreateCreditAndSpend(const CKeyStore& keystore, const CScript& outscript, C
     outputm.vin.resize(1);
     outputm.vin[0].prevout.SetNull();
     outputm.vin[0].scriptSig = CScript();
-    outputm.wit.vtxinwit.resize(1);
     outputm.vout.resize(1);
     outputm.vout[0].nValue = 1;
     outputm.vout[0].scriptPubKey = outscript;
@@ -362,14 +361,12 @@ void CreateCreditAndSpend(const CKeyStore& keystore, const CScript& outscript, C
     assert(output->vin[0] == outputm.vin[0]);
     assert(output->vout.size() == 1);
     assert(output->vout[0] == outputm.vout[0]);
-    assert(output->wit.vtxinwit.size() == 0);
 
     CMutableTransaction inputm;
     inputm.nVersion = 1;
     inputm.vin.resize(1);
     inputm.vin[0].prevout.hash = output->GetHash();
     inputm.vin[0].prevout.n = 0;
-    inputm.wit.vtxinwit.resize(1);
     inputm.vout.resize(1);
     inputm.vout[0].nValue = 1;
     inputm.vout[0].scriptPubKey = CScript();
@@ -382,20 +379,14 @@ void CreateCreditAndSpend(const CKeyStore& keystore, const CScript& outscript, C
     assert(input.vin[0] == inputm.vin[0]);
     assert(input.vout.size() == 1);
     assert(input.vout[0] == inputm.vout[0]);
-    if (inputm.wit.IsNull()) {
-        assert(input.wit.IsNull());
-    } else {
-        assert(!input.wit.IsNull());
-        assert(input.wit.vtxinwit.size() == 1);
-        assert(input.wit.vtxinwit[0].scriptWitness.stack == inputm.wit.vtxinwit[0].scriptWitness.stack);
-    }
+    assert(input.vin[0].scriptWitness.stack == inputm.vin[0].scriptWitness.stack);
 }
 
 void CheckWithFlag(const CTransactionRef& output, const CMutableTransaction& input, int flags, bool success)
 {
     ScriptError error;
     CTransaction inputi(input);
-    bool ret = VerifyScript(inputi.vin[0].scriptSig, output->vout[0].scriptPubKey, inputi.wit.vtxinwit.size() > 0 ? &inputi.wit.vtxinwit[0].scriptWitness : NULL, flags, TransactionSignatureChecker(&inputi, 0, output->vout[0].nValue), &error);
+    bool ret = VerifyScript(inputi.vin[0].scriptSig, output->vout[0].scriptPubKey, &inputi.vin[0].scriptWitness, flags, TransactionSignatureChecker(&inputi, 0, output->vout[0].nValue), &error);
     assert(ret == success);
 }
 
diff --git a/src/validation.cpp b/src/validation.cpp
index a541978c854de..9a080181134e9 100644
--- a/src/validation.cpp
+++ b/src/validation.cpp
@@ -446,7 +446,7 @@ int64_t GetTransactionSigOpCost(const CTransaction& tx, const CCoinsViewCache& i
     for (unsigned int i = 0; i < tx.vin.size(); i++)
     {
         const CTxOut &prevout = inputs.GetOutputFor(tx.vin[i]);
-        nSigOps += CountWitnessSigOps(tx.vin[i].scriptSig, prevout.scriptPubKey, i < tx.wit.vtxinwit.size() ? &tx.wit.vtxinwit[i].scriptWitness : NULL, flags);
+        nSigOps += CountWitnessSigOps(tx.vin[i].scriptSig, prevout.scriptPubKey, &tx.vin[i].scriptWitness, flags);
     }
     return nSigOps;
 }
@@ -550,7 +550,7 @@ bool AcceptToMemoryPoolWorker(CTxMemPool& pool, CValidationState& state, const C
 
     // Reject transactions with witness before segregated witness activates (override with -prematurewitness)
     bool witnessEnabled = IsWitnessEnabled(chainActive.Tip(), Params().GetConsensus());
-    if (!GetBoolArg("-prematurewitness",false) && !tx.wit.IsNull() && !witnessEnabled) {
+    if (!GetBoolArg("-prematurewitness",false) && tx.HasWitness() && !witnessEnabled) {
         return state.DoS(0, false, REJECT_NONSTANDARD, "no-witness-yet", true);
     }
 
@@ -672,7 +672,7 @@ bool AcceptToMemoryPoolWorker(CTxMemPool& pool, CValidationState& state, const C
             return state.Invalid(false, REJECT_NONSTANDARD, "bad-txns-nonstandard-inputs");
 
         // Check for non-standard witness in P2WSH
-        if (!tx.wit.IsNull() && fRequireStandard && !IsWitnessStandard(tx, view))
+        if (tx.HasWitness() && fRequireStandard && !IsWitnessStandard(tx, view))
             return state.DoS(0, false, REJECT_NONSTANDARD, "bad-witness-nonstandard", true);
 
         int64_t nSigOpsCost = GetTransactionSigOpCost(tx, view, STANDARD_SCRIPT_VERIFY_FLAGS);
@@ -912,7 +912,7 @@ bool AcceptToMemoryPoolWorker(CTxMemPool& pool, CValidationState& state, const C
             // SCRIPT_VERIFY_CLEANSTACK requires SCRIPT_VERIFY_WITNESS, so we
             // need to turn both off, and compare against just turning off CLEANSTACK
             // to see if the failure is specifically due to witness validation.
-            if (tx.wit.IsNull() && CheckInputs(tx, state, view, true, scriptVerifyFlags & ~(SCRIPT_VERIFY_WITNESS | SCRIPT_VERIFY_CLEANSTACK), true, txdata) &&
+            if (!tx.HasWitness() && CheckInputs(tx, state, view, true, scriptVerifyFlags & ~(SCRIPT_VERIFY_WITNESS | SCRIPT_VERIFY_CLEANSTACK), true, txdata) &&
                 !CheckInputs(tx, state, view, true, scriptVerifyFlags & ~SCRIPT_VERIFY_CLEANSTACK, true, txdata)) {
                 // Only the witness is missing, so the transaction itself may be fine.
                 state.SetCorruptionPossible();
@@ -1304,7 +1304,7 @@ void UpdateCoins(const CTransaction& tx, CCoinsViewCache& inputs, int nHeight)
 
 bool CScriptCheck::operator()() {
     const CScript &scriptSig = ptxTo->vin[nIn].scriptSig;
-    const CScriptWitness *witness = (nIn < ptxTo->wit.vtxinwit.size()) ? &ptxTo->wit.vtxinwit[nIn].scriptWitness : NULL;
+    const CScriptWitness *witness = &ptxTo->vin[nIn].scriptWitness;
     if (!VerifyScript(scriptSig, scriptPubKey, witness, nFlags, CachingTransactionSignatureChecker(ptxTo, nIn, amount, cacheStore, *txdata), &error)) {
         return false;
     }
@@ -2846,11 +2846,10 @@ void UpdateUncommittedBlockStructures(CBlock& block, const CBlockIndex* pindexPr
 {
     int commitpos = GetWitnessCommitmentIndex(block);
     static const std::vector<unsigned char> nonce(32, 0x00);
-    if (commitpos != -1 && IsWitnessEnabled(pindexPrev, consensusParams) && block.vtx[0]->wit.IsEmpty()) {
+    if (commitpos != -1 && IsWitnessEnabled(pindexPrev, consensusParams) && !block.vtx[0]->HasWitness()) {
         CMutableTransaction tx(*block.vtx[0]);
-        tx.wit.vtxinwit.resize(1);
-        tx.wit.vtxinwit[0].scriptWitness.stack.resize(1);
-        tx.wit.vtxinwit[0].scriptWitness.stack[0] = nonce;
+        tx.vin[0].scriptWitness.stack.resize(1);
+        tx.vin[0].scriptWitness.stack[0] = nonce;
         block.vtx[0] = MakeTransactionRef(std::move(tx));
     }
 }
@@ -2958,10 +2957,10 @@ bool ContextualCheckBlock(const CBlock& block, CValidationState& state, const Co
             // The malleation check is ignored; as the transaction tree itself
             // already does not permit it, it is impossible to trigger in the
             // witness tree.
-            if (block.vtx[0]->wit.vtxinwit.size() != 1 || block.vtx[0]->wit.vtxinwit[0].scriptWitness.stack.size() != 1 || block.vtx[0]->wit.vtxinwit[0].scriptWitness.stack[0].size() != 32) {
+            if (block.vtx[0]->vin[0].scriptWitness.stack.size() != 1 || block.vtx[0]->vin[0].scriptWitness.stack[0].size() != 32) {
                 return state.DoS(100, false, REJECT_INVALID, "bad-witness-nonce-size", true, strprintf("%s : invalid witness nonce size", __func__));
             }
-            CHash256().Write(hashWitness.begin(), 32).Write(&block.vtx[0]->wit.vtxinwit[0].scriptWitness.stack[0][0], 32).Finalize(hashWitness.begin());
+            CHash256().Write(hashWitness.begin(), 32).Write(&block.vtx[0]->vin[0].scriptWitness.stack[0][0], 32).Finalize(hashWitness.begin());
             if (memcmp(hashWitness.begin(), &block.vtx[0]->vout[commitpos].scriptPubKey[6], 32)) {
                 return state.DoS(100, false, REJECT_INVALID, "bad-witness-merkle-match", true, strprintf("%s : witness merkle commitment mismatch", __func__));
             }
@@ -2972,7 +2971,7 @@ bool ContextualCheckBlock(const CBlock& block, CValidationState& state, const Co
     // No witness data is allowed in blocks that don't commit to witness data, as this would otherwise leave room for spam
     if (!fHaveWitness) {
         for (size_t i = 0; i < block.vtx.size(); i++) {
-            if (!block.vtx[i]->wit.IsNull()) {
+            if (block.vtx[i]->HasWitness()) {
                 return state.DoS(100, false, REJECT_INVALID, "unexpected-witness", true, strprintf("%s : unexpected witness data found", __func__));
             }
         }
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index 638fca99177cb..2ef4802a1084e 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -2301,7 +2301,6 @@ bool CWallet::CreateTransaction(const vector<CRecipient>& vecSend, CWalletTx& wt
                 nChangePosInOut = nChangePosRequest;
                 txNew.vin.clear();
                 txNew.vout.clear();
-                txNew.wit.SetNull();
                 wtxNew.fFromMe = true;
                 bool fFirst = true;
 
@@ -2488,9 +2487,10 @@ bool CWallet::CreateTransaction(const vector<CRecipient>& vecSend, CWalletTx& wt
 
                 // Remove scriptSigs if we used dummy signatures for fee calculation
                 if (!sign) {
-                    BOOST_FOREACH (CTxIn& vin, txNew.vin)
+                    BOOST_FOREACH (CTxIn& vin, txNew.vin) {
                         vin.scriptSig = CScript();
-                    txNew.wit.SetNull();
+                        vin.scriptWitness.SetNull();
+                    }
                 }
 
                 // Embed the constructed transaction data in wtxNew.

From 2efc43874cedde7e022ac8f1051c7984331543fa Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Fri, 2 Dec 2016 19:24:23 -0800
Subject: [PATCH 1324/1802] Align struct COrphan definition

---
 src/net_processing.cpp | 1 +
 src/test/DoS_tests.cpp | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/net_processing.cpp b/src/net_processing.cpp
index 747167264b772..5a415cabbdc06 100644
--- a/src/net_processing.cpp
+++ b/src/net_processing.cpp
@@ -50,6 +50,7 @@ struct IteratorComparator
 };
 
 struct COrphanTx {
+    // When modifying, adapt the copy of this definition in tests/DoS_tests.
     CTransaction tx;
     NodeId fromPeer;
     int64_t nTimeExpire;
diff --git a/src/test/DoS_tests.cpp b/src/test/DoS_tests.cpp
index 1a818a5756989..a8c3c4ebb9c32 100644
--- a/src/test/DoS_tests.cpp
+++ b/src/test/DoS_tests.cpp
@@ -29,6 +29,7 @@ extern unsigned int LimitOrphanTxSize(unsigned int nMaxOrphans);
 struct COrphanTx {
     CTransaction tx;
     NodeId fromPeer;
+    int64_t nTimeExpire;
 };
 extern std::map<uint256, COrphanTx> mapOrphanTransactions;
 extern std::map<uint256, std::set<uint256> > mapOrphanTransactionsByPrev;

From c4b6fa8edfd81e49a51280e9cb45e7d4a06e672c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pavel=20Jan=C3=ADk?= <Pavel@Janik.cz>
Date: Mon, 5 Dec 2016 11:13:17 +0100
Subject: [PATCH 1325/1802] CMutableTransaction is defined as struct.

---
 src/core_io.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/core_io.h b/src/core_io.h
index 4344290bb880c..88425ed4fbd03 100644
--- a/src/core_io.h
+++ b/src/core_io.h
@@ -11,7 +11,7 @@
 class CBlock;
 class CScript;
 class CTransaction;
-class CMutableTransaction;
+struct CMutableTransaction;
 class uint256;
 class UniValue;
 

From bc7ff8db99dbc28f8b2d7a22f4650fa5349cb23b Mon Sep 17 00:00:00 2001
From: Gregory Sanders <gsanders87@gmail.com>
Date: Sun, 20 Nov 2016 09:54:51 -0500
Subject: [PATCH 1326/1802] Add option to return non-segwit serialization via
 rpc

---
 qa/rpc-tests/segwit.py     | 20 +++++++++++++++++---
 src/core_io.h              |  2 +-
 src/core_write.cpp         |  4 ++--
 src/init.cpp               |  4 ++++
 src/rpc/blockchain.cpp     |  2 +-
 src/rpc/rawtransaction.cpp |  2 +-
 src/rpc/server.cpp         |  8 ++++++++
 src/rpc/server.h           |  5 +++++
 src/wallet/rpcwallet.cpp   |  2 +-
 9 files changed, 40 insertions(+), 9 deletions(-)

diff --git a/qa/rpc-tests/segwit.py b/qa/rpc-tests/segwit.py
index 41a1b3b20fd00..7aa72cca34203 100755
--- a/qa/rpc-tests/segwit.py
+++ b/qa/rpc-tests/segwit.py
@@ -13,6 +13,7 @@
 from test_framework.address import script_to_p2sh, key_to_p2pkh
 from test_framework.script import CScript, OP_HASH160, OP_CHECKSIG, OP_0, hash160, OP_EQUAL, OP_DUP, OP_EQUALVERIFY, OP_1, OP_2, OP_CHECKMULTISIG
 from io import BytesIO
+from test_framework.mininode import FromHex
 
 NODE_0 = 0
 NODE_1 = 1
@@ -84,8 +85,8 @@ def __init__(self):
 
     def setup_network(self):
         self.nodes = []
-        self.nodes.append(start_node(0, self.options.tmpdir, ["-logtimemicros", "-debug", "-walletprematurewitness"]))
-        self.nodes.append(start_node(1, self.options.tmpdir, ["-logtimemicros", "-debug", "-blockversion=4", "-promiscuousmempoolflags=517", "-prematurewitness", "-walletprematurewitness"]))
+        self.nodes.append(start_node(0, self.options.tmpdir, ["-logtimemicros", "-debug", "-walletprematurewitness", "-rpcserialversion=0"]))
+        self.nodes.append(start_node(1, self.options.tmpdir, ["-logtimemicros", "-debug", "-blockversion=4", "-promiscuousmempoolflags=517", "-prematurewitness", "-walletprematurewitness", "-rpcserialversion=2"]))
         self.nodes.append(start_node(2, self.options.tmpdir, ["-logtimemicros", "-debug", "-blockversion=536870915", "-promiscuousmempoolflags=517", "-prematurewitness", "-walletprematurewitness"]))
         connect_nodes(self.nodes[1], 0)
         connect_nodes(self.nodes[2], 1)
@@ -211,7 +212,20 @@ def run_test(self):
         block = self.nodes[2].generate(1) #block 432 (first block with new rules; 432 = 144 * 3)
         sync_blocks(self.nodes)
         assert_equal(len(self.nodes[2].getrawmempool()), 0)
-        assert_equal(len(self.nodes[2].getblock(block[0])["tx"]), 5)
+        segwit_tx_list = self.nodes[2].getblock(block[0])["tx"]
+        assert_equal(len(segwit_tx_list), 5)
+
+        print("Verify block and transaction serialization rpcs return differing serializations depending on rpc serialization flag")
+        # Note: node1 has version 2, which is simply >0 and will catch future upgrades in tests
+        assert(self.nodes[2].getblock(block[0], False) !=  self.nodes[0].getblock(block[0], False))
+        assert(self.nodes[1].getblock(block[0], False) ==  self.nodes[2].getblock(block[0], False))
+        for i in range(len(segwit_tx_list)):
+            tx = FromHex(CTransaction(), self.nodes[2].gettransaction(segwit_tx_list[i])["hex"])
+            assert(self.nodes[2].getrawtransaction(segwit_tx_list[i]) != self.nodes[0].getrawtransaction(segwit_tx_list[i]))
+            assert(self.nodes[1].getrawtransaction(segwit_tx_list[i], 0) == self.nodes[2].getrawtransaction(segwit_tx_list[i]))
+            assert(self.nodes[0].getrawtransaction(segwit_tx_list[i]) != self.nodes[2].gettransaction(segwit_tx_list[i])["hex"])
+            assert(self.nodes[1].getrawtransaction(segwit_tx_list[i]) == self.nodes[2].gettransaction(segwit_tx_list[i])["hex"])
+            assert(self.nodes[0].getrawtransaction(segwit_tx_list[i]) == bytes_to_hex_str(tx.serialize_without_witness()))
 
         print("Verify witness txs without witness data are invalid after the fork")
         self.fail_mine(self.nodes[2], wit_ids[NODE_2][WIT_V0][2], False)
diff --git a/src/core_io.h b/src/core_io.h
index 88425ed4fbd03..7642bc6d6e57c 100644
--- a/src/core_io.h
+++ b/src/core_io.h
@@ -26,7 +26,7 @@ std::vector<unsigned char> ParseHexUV(const UniValue& v, const std::string& strN
 
 // core_write.cpp
 std::string FormatScript(const CScript& script);
-std::string EncodeHexTx(const CTransaction& tx);
+std::string EncodeHexTx(const CTransaction& tx, const int serializeFlags = 0);
 void ScriptPubKeyToUniv(const CScript& scriptPubKey, UniValue& out, bool fIncludeHex);
 void TxToUniv(const CTransaction& tx, const uint256& hashBlock, UniValue& entry);
 
diff --git a/src/core_write.cpp b/src/core_write.cpp
index ea01ddc10d81a..9f859ba9e12b1 100644
--- a/src/core_write.cpp
+++ b/src/core_write.cpp
@@ -116,9 +116,9 @@ string ScriptToAsmStr(const CScript& script, const bool fAttemptSighashDecode)
     return str;
 }
 
-string EncodeHexTx(const CTransaction& tx)
+string EncodeHexTx(const CTransaction& tx, const int serialFlags)
 {
-    CDataStream ssTx(SER_NETWORK, PROTOCOL_VERSION);
+    CDataStream ssTx(SER_NETWORK, PROTOCOL_VERSION | serialFlags);
     ssTx << tx;
     return HexStr(ssTx.begin(), ssTx.end());
 }
diff --git a/src/init.cpp b/src/init.cpp
index ba5fe4152a8dc..71971a76427b1 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -380,6 +380,7 @@ std::string HelpMessage(HelpMessageMode mode)
     strUsage += HelpMessageOpt("-port=<port>", strprintf(_("Listen for connections on <port> (default: %u or testnet: %u)"), Params(CBaseChainParams::MAIN).GetDefaultPort(), Params(CBaseChainParams::TESTNET).GetDefaultPort()));
     strUsage += HelpMessageOpt("-proxy=<ip:port>", _("Connect through SOCKS5 proxy"));
     strUsage += HelpMessageOpt("-proxyrandomize", strprintf(_("Randomize credentials for every proxy connection. This enables Tor stream isolation (default: %u)"), DEFAULT_PROXYRANDOMIZE));
+    strUsage += HelpMessageOpt("-rpcserialversion", strprintf(_("Sets the serialization of raw transaction or block hex returned in non-verbose mode, non-segwit(0) or segwit(>0) (default: %d)"), DEFAULT_RPC_SERIALIZE_VERSION));
     strUsage += HelpMessageOpt("-seednode=<ip>", _("Connect to a node to retrieve peer addresses, and disconnect"));
     strUsage += HelpMessageOpt("-timeout=<n>", strprintf(_("Specify connection timeout in milliseconds (minimum: 1, default: %d)"), DEFAULT_CONNECT_TIMEOUT));
     strUsage += HelpMessageOpt("-torcontrol=<ip>:<port>", strprintf(_("Tor control port to use if onion listening enabled (default: %s)"), DEFAULT_TOR_CONTROL));
@@ -984,6 +985,9 @@ bool AppInitParameterInteraction()
     if (GetBoolArg("-peerbloomfilters", DEFAULT_PEERBLOOMFILTERS))
         nLocalServices = ServiceFlags(nLocalServices | NODE_BLOOM);
 
+    if (GetArg("-rpcserialversion", DEFAULT_RPC_SERIALIZE_VERSION) < 0)
+        return InitError("rpcserialversion must be non-negative.");
+
     nMaxTipAge = GetArg("-maxtipage", DEFAULT_MAX_TIP_AGE);
 
     fEnableReplacement = GetBoolArg("-mempoolreplacement", DEFAULT_ENABLE_REPLACEMENT);
diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp
index e6d80f06a3c1d..1139c2aa5cbaf 100644
--- a/src/rpc/blockchain.cpp
+++ b/src/rpc/blockchain.cpp
@@ -751,7 +751,7 @@ UniValue getblock(const JSONRPCRequest& request)
 
     if (!fVerbose)
     {
-        CDataStream ssBlock(SER_NETWORK, PROTOCOL_VERSION);
+        CDataStream ssBlock(SER_NETWORK, PROTOCOL_VERSION | RPCSerializationFlags());
         ssBlock << block;
         std::string strHex = HexStr(ssBlock.begin(), ssBlock.end());
         return strHex;
diff --git a/src/rpc/rawtransaction.cpp b/src/rpc/rawtransaction.cpp
index 48769a5335fc8..1229a00c5fab4 100644
--- a/src/rpc/rawtransaction.cpp
+++ b/src/rpc/rawtransaction.cpp
@@ -223,7 +223,7 @@ UniValue getrawtransaction(const JSONRPCRequest& request)
     if (!GetTransaction(hash, tx, Params().GetConsensus(), hashBlock, true))
         throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "No information available about transaction");
 
-    string strHex = EncodeHexTx(*tx);
+    string strHex = EncodeHexTx(*tx, RPCSerializationFlags());
 
     if (!fVerbose)
         return strHex;
diff --git a/src/rpc/server.cpp b/src/rpc/server.cpp
index 164e0f00e2edb..212281939835c 100644
--- a/src/rpc/server.cpp
+++ b/src/rpc/server.cpp
@@ -497,4 +497,12 @@ void RPCRunLater(const std::string& name, boost::function<void(void)> func, int6
     deadlineTimers.emplace(name, std::unique_ptr<RPCTimerBase>(timerInterface->NewTimer(func, nSeconds*1000)));
 }
 
+int RPCSerializationFlags()
+{
+    int flag = 0;
+    if (GetArg("-rpcserialversion", DEFAULT_RPC_SERIALIZE_VERSION) == 0)
+        flag |= SERIALIZE_TRANSACTION_NO_WITNESS;
+    return flag;
+}
+
 CRPCTable tableRPC;
diff --git a/src/rpc/server.h b/src/rpc/server.h
index c59886222c276..4fac68a51ff18 100644
--- a/src/rpc/server.h
+++ b/src/rpc/server.h
@@ -19,6 +19,8 @@
 
 #include <univalue.h>
 
+static const unsigned int DEFAULT_RPC_SERIALIZE_VERSION = 1;
+
 class CRPCCommand;
 
 namespace RPCServer
@@ -198,4 +200,7 @@ void StopRPC();
 std::string JSONRPCExecBatch(const UniValue& vReq);
 void RPCNotifyBlockChange(bool ibd, const CBlockIndex *);
 
+// Retrieves any serialization flags requested in command line argument
+int RPCSerializationFlags();
+
 #endif // BITCOIN_RPCSERVER_H
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index d4e21b542d530..5a4fcc743cd24 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -1792,7 +1792,7 @@ UniValue gettransaction(const JSONRPCRequest& request)
     ListTransactions(wtx, "*", 0, false, details, filter);
     entry.push_back(Pair("details", details));
 
-    string strHex = EncodeHexTx(static_cast<CTransaction>(wtx));
+    string strHex = EncodeHexTx(static_cast<CTransaction>(wtx), RPCSerializationFlags());
     entry.push_back(Pair("hex", strHex));
 
     return entry;

From 412bab22b23036962509d2655b68cccd726b6ba4 Mon Sep 17 00:00:00 2001
From: instagibbs <gsanders87@gmail.com>
Date: Tue, 22 Nov 2016 15:47:07 -0500
Subject: [PATCH 1327/1802] Adapt ZMQ/rest serialization to take
 rpcserialversion arg

---
 src/rest.cpp                   | 4 ++--
 src/zmq/zmqpublishnotifier.cpp | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/rest.cpp b/src/rest.cpp
index 6379061f8f4bc..6b6b7401f6a3c 100644
--- a/src/rest.cpp
+++ b/src/rest.cpp
@@ -228,7 +228,7 @@ static bool rest_block(HTTPRequest* req,
             return RESTERR(req, HTTP_NOT_FOUND, hashStr + " not found");
     }
 
-    CDataStream ssBlock(SER_NETWORK, PROTOCOL_VERSION);
+    CDataStream ssBlock(SER_NETWORK, PROTOCOL_VERSION | RPCSerializationFlags());
     ssBlock << block;
 
     switch (rf) {
@@ -368,7 +368,7 @@ static bool rest_tx(HTTPRequest* req, const std::string& strURIPart)
     if (!GetTransaction(hash, tx, Params().GetConsensus(), hashBlock, true))
         return RESTERR(req, HTTP_NOT_FOUND, hashStr + " not found");
 
-    CDataStream ssTx(SER_NETWORK, PROTOCOL_VERSION);
+    CDataStream ssTx(SER_NETWORK, PROTOCOL_VERSION | RPCSerializationFlags());
     ssTx << tx;
 
     switch (rf) {
diff --git a/src/zmq/zmqpublishnotifier.cpp b/src/zmq/zmqpublishnotifier.cpp
index 99d42ab526f38..a11256dfd5b6b 100644
--- a/src/zmq/zmqpublishnotifier.cpp
+++ b/src/zmq/zmqpublishnotifier.cpp
@@ -7,6 +7,7 @@
 #include "zmqpublishnotifier.h"
 #include "validation.h"
 #include "util.h"
+#include "rpc/server.h"
 
 static std::multimap<std::string, CZMQAbstractPublishNotifier*> mapPublishNotifiers;
 
@@ -166,7 +167,7 @@ bool CZMQPublishRawBlockNotifier::NotifyBlock(const CBlockIndex *pindex)
     LogPrint("zmq", "zmq: Publish rawblock %s\n", pindex->GetBlockHash().GetHex());
 
     const Consensus::Params& consensusParams = Params().GetConsensus();
-    CDataStream ss(SER_NETWORK, PROTOCOL_VERSION);
+    CDataStream ss(SER_NETWORK, PROTOCOL_VERSION | RPCSerializationFlags());
     {
         LOCK(cs_main);
         CBlock block;
@@ -186,7 +187,7 @@ bool CZMQPublishRawTransactionNotifier::NotifyTransaction(const CTransaction &tr
 {
     uint256 hash = transaction.GetHash();
     LogPrint("zmq", "zmq: Publish rawtx %s\n", hash.GetHex());
-    CDataStream ss(SER_NETWORK, PROTOCOL_VERSION);
+    CDataStream ss(SER_NETWORK, PROTOCOL_VERSION | RPCSerializationFlags());
     ss << transaction;
     return SendMessage(MSG_RAWTX, &(*ss.begin()), ss.size());
 }

From 89a3723bdc5d563f036c1a579c3d3539cc8fc6e7 Mon Sep 17 00:00:00 2001
From: Jonas Schnelli <dev@jonasschnelli.ch>
Date: Mon, 5 Dec 2016 09:26:43 +0100
Subject: [PATCH 1328/1802] [Qt] Show ModalOverlay by pressing the progress
 bar, disabled show() in sync mode

---
 src/qt/bitcoingui.cpp   |  6 +++---
 src/qt/guiutil.cpp      |  7 ++++++-
 src/qt/guiutil.h        | 43 +++++++++++++++++++++++++++--------------
 src/qt/modaloverlay.cpp |  7 +++++++
 src/qt/modaloverlay.h   |  2 ++
 5 files changed, 46 insertions(+), 19 deletions(-)

diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp
index 54ed867de0ea3..651ff842930f0 100644
--- a/src/qt/bitcoingui.cpp
+++ b/src/qt/bitcoingui.cpp
@@ -46,7 +46,6 @@
 #include <QMenuBar>
 #include <QMessageBox>
 #include <QMimeData>
-#include <QProgressBar>
 #include <QProgressDialog>
 #include <QSettings>
 #include <QShortcut>
@@ -251,6 +250,7 @@ BitcoinGUI::BitcoinGUI(const PlatformStyle *_platformStyle, const NetworkStyle *
     if(enableWallet) {
         connect(walletFrame, SIGNAL(requestedSyncWarningInfo()), this, SLOT(showModalOverlay()));
         connect(labelBlocksIcon, SIGNAL(clicked(QPoint)), this, SLOT(showModalOverlay()));
+        connect(progressBar, SIGNAL(clicked(QPoint)), this, SLOT(showModalOverlay()));
     }
 #endif
 }
@@ -1138,8 +1138,8 @@ void BitcoinGUI::setTrayIconVisible(bool fHideTrayIcon)
 
 void BitcoinGUI::showModalOverlay()
 {
-    if (modalOverlay)
-        modalOverlay->showHide(false, true);
+    if (modalOverlay && (progressBar->isVisible() || modalOverlay->isLayerVisible()))
+        modalOverlay->toggleVisibility();
 }
 
 static bool ThreadSafeMessageBox(BitcoinGUI *gui, const std::string& message, const std::string& caption, unsigned int style)
diff --git a/src/qt/guiutil.cpp b/src/qt/guiutil.cpp
index 4806e41439180..3feb781db5e47 100644
--- a/src/qt/guiutil.cpp
+++ b/src/qt/guiutil.cpp
@@ -988,7 +988,12 @@ QString formateNiceTimeOffset(qint64 secs)
     return timeBehindText;
 }
 
-void ClickableLabel::mousePressEvent(QMouseEvent *event)
+void ClickableLabel::mouseReleaseEvent(QMouseEvent *event)
+{
+    Q_EMIT clicked(event->pos());
+}
+    
+void ClickableProgressBar::mouseReleaseEvent(QMouseEvent *event)
 {
     Q_EMIT clicked(event->pos());
 }
diff --git a/src/qt/guiutil.h b/src/qt/guiutil.h
index 9a17d24f07863..4ea2aa36e76eb 100644
--- a/src/qt/guiutil.h
+++ b/src/qt/guiutil.h
@@ -202,20 +202,6 @@ namespace GUIUtil
 
     QString formateNiceTimeOffset(qint64 secs);
 
-#if defined(Q_OS_MAC) && QT_VERSION >= 0x050000
-    // workaround for Qt OSX Bug:
-    // https://bugreports.qt-project.org/browse/QTBUG-15631
-    // QProgressBar uses around 10% CPU even when app is in background
-    class ProgressBar : public QProgressBar
-    {
-        bool event(QEvent *e) {
-            return (e->type() != QEvent::StyleAnimationUpdate) ? QProgressBar::event(e) : false;
-        }
-    };
-#else
-    typedef QProgressBar ProgressBar;
-#endif
-
     class ClickableLabel : public QLabel
     {
         Q_OBJECT
@@ -226,8 +212,35 @@ namespace GUIUtil
          */
         void clicked(const QPoint& point);
     protected:
-        void mousePressEvent(QMouseEvent *event);
+        void mouseReleaseEvent(QMouseEvent *event);
+    };
+    
+    class ClickableProgressBar : public QProgressBar
+    {
+        Q_OBJECT
+        
+    Q_SIGNALS:
+        /** Emitted when the progressbar is clicked. The relative mouse coordinates of the click are
+         * passed to the signal.
+         */
+        void clicked(const QPoint& point);
+    protected:
+        void mouseReleaseEvent(QMouseEvent *event);
+    };
+
+#if defined(Q_OS_MAC) && QT_VERSION >= 0x050000
+    // workaround for Qt OSX Bug:
+    // https://bugreports.qt-project.org/browse/QTBUG-15631
+    // QProgressBar uses around 10% CPU even when app is in background
+    class ProgressBar : public ClickableProgressBar
+    {
+        bool event(QEvent *e) {
+            return (e->type() != QEvent::StyleAnimationUpdate) ? QProgressBar::event(e) : false;
+        }
     };
+#else
+    typedef ClickableProgressBar ProgressBar;
+#endif
 
 } // namespace GUIUtil
 
diff --git a/src/qt/modaloverlay.cpp b/src/qt/modaloverlay.cpp
index 1a843a07ace81..3e8282e63dec7 100644
--- a/src/qt/modaloverlay.cpp
+++ b/src/qt/modaloverlay.cpp
@@ -137,6 +137,13 @@ void ModalOverlay::tipUpdate(int count, const QDateTime& blockDate, double nVeri
     }
 }
 
+void ModalOverlay::toggleVisibility()
+{
+    showHide(layerIsVisible, true);
+    if (!layerIsVisible)
+        userClosed = true;
+}
+
 void ModalOverlay::showHide(bool hide, bool userRequested)
 {
     if ( (layerIsVisible && !hide) || (!layerIsVisible && hide) || (!hide && userClosed && !userRequested))
diff --git a/src/qt/modaloverlay.h b/src/qt/modaloverlay.h
index 66c0aa78cfb95..70d37b87add81 100644
--- a/src/qt/modaloverlay.h
+++ b/src/qt/modaloverlay.h
@@ -25,9 +25,11 @@ public Q_SLOTS:
     void tipUpdate(int count, const QDateTime& blockDate, double nVerificationProgress);
     void setKnownBestHeight(int count, const QDateTime& blockDate);
 
+    void toggleVisibility();
     // will show or hide the modal layer
     void showHide(bool hide = false, bool userRequested = false);
     void closeClicked();
+    bool isLayerVisible() { return layerIsVisible; }
 
 protected:
     bool eventFilter(QObject * obj, QEvent * ev);

From bf663f8e93454fdc7c77e298586cefbb4488ee4c Mon Sep 17 00:00:00 2001
From: Alex Morcos <morcos@chaincode.com>
Date: Tue, 29 Nov 2016 17:15:12 -0500
Subject: [PATCH 1329/1802] remove external usage of mempool conflict tracking

---
 src/test/mempool_tests.cpp |  2 +-
 src/txmempool.cpp          |  4 ++--
 src/txmempool.h            |  2 +-
 src/validation.cpp         | 12 +++---------
 4 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/src/test/mempool_tests.cpp b/src/test/mempool_tests.cpp
index 1faf8b6aeb66b..2fb56e172f08a 100644
--- a/src/test/mempool_tests.cpp
+++ b/src/test/mempool_tests.cpp
@@ -412,7 +412,7 @@ BOOST_AUTO_TEST_CASE(MempoolAncestorIndexingTest)
     /* after tx6 is mined, tx7 should move up in the sort */
     std::vector<CTransactionRef> vtx;
     vtx.push_back(MakeTransactionRef(tx6));
-    pool.removeForBlock(vtx, 1, NULL, false);
+    pool.removeForBlock(vtx, 1);
 
     sortedOrder.erase(sortedOrder.begin()+1);
     sortedOrder.pop_back();
diff --git a/src/txmempool.cpp b/src/txmempool.cpp
index c035a84db5bb6..3bea0e4fbd6d2 100644
--- a/src/txmempool.cpp
+++ b/src/txmempool.cpp
@@ -597,7 +597,7 @@ void CTxMemPool::removeConflicts(const CTransaction &tx, std::vector<CTransactio
  * Called when a block is connected. Removes from mempool and updates the miner fee estimator.
  */
 void CTxMemPool::removeForBlock(const std::vector<CTransactionRef>& vtx, unsigned int nBlockHeight,
-                                std::vector<CTransactionRef>* conflicts, bool fCurrentEstimate)
+                                bool fCurrentEstimate)
 {
     LOCK(cs);
     std::vector<CTxMemPoolEntry> entries;
@@ -617,7 +617,7 @@ void CTxMemPool::removeForBlock(const std::vector<CTransactionRef>& vtx, unsigne
             stage.insert(it);
             RemoveStaged(stage, true);
         }
-        removeConflicts(*tx, conflicts);
+        removeConflicts(*tx);
         ClearPrioritisation(tx->GetHash());
     }
     // After the txs in the new block have been removed from the mempool, update policy estimates
diff --git a/src/txmempool.h b/src/txmempool.h
index 23fe5a7abead8..2f40981455eb2 100644
--- a/src/txmempool.h
+++ b/src/txmempool.h
@@ -531,7 +531,7 @@ class CTxMemPool
     void removeForReorg(const CCoinsViewCache *pcoins, unsigned int nMemPoolHeight, int flags);
     void removeConflicts(const CTransaction &tx, std::vector<CTransactionRef>* removed = NULL);
     void removeForBlock(const std::vector<CTransactionRef>& vtx, unsigned int nBlockHeight,
-                        std::vector<CTransactionRef>* conflicts = NULL, bool fCurrentEstimate = true);
+                        bool fCurrentEstimate = true);
     void clear();
     void _clear(); //lock free
     bool CompareDepthAndScore(const uint256& hasha, const uint256& hashb);
diff --git a/src/validation.cpp b/src/validation.cpp
index a541978c854de..a6377f03156ff 100644
--- a/src/validation.cpp
+++ b/src/validation.cpp
@@ -2153,11 +2153,10 @@ static int64_t nTimeChainState = 0;
 static int64_t nTimePostConnect = 0;
 
 /**
- * Used to track conflicted transactions removed from mempool and transactions
- * applied to the UTXO state as a part of a single ActivateBestChainStep call.
+ * Used to track blocks whose transactions were applied to the UTXO state as a
+ * part of a single ActivateBestChainStep call.
  */
 struct ConnectTrace {
-    std::vector<CTransactionRef> txConflicted;
     std::vector<std::pair<CBlockIndex*, std::shared_ptr<const CBlock> > > blocksConnected;
 };
 
@@ -2208,7 +2207,7 @@ bool static ConnectTip(CValidationState& state, const CChainParams& chainparams,
     int64_t nTime5 = GetTimeMicros(); nTimeChainState += nTime5 - nTime4;
     LogPrint("bench", "  - Writing chainstate: %.2fms [%.2fs]\n", (nTime5 - nTime4) * 0.001, nTimeChainState * 0.000001);
     // Remove conflicting transactions from the mempool.;
-    mempool.removeForBlock(blockConnecting.vtx, pindexNew->nHeight, &connectTrace.txConflicted, !IsInitialBlockDownload());
+    mempool.removeForBlock(blockConnecting.vtx, pindexNew->nHeight, !IsInitialBlockDownload());
     // Update chainActive & related variables.
     UpdateTip(pindexNew, chainparams);
 
@@ -2433,11 +2432,6 @@ bool ActivateBestChain(CValidationState &state, const CChainParams& chainparams,
 
         // throw all transactions though the signal-interface
         // while _not_ holding the cs_main lock
-        for (const auto& tx : connectTrace.txConflicted)
-        {
-            GetMainSignals().SyncTransaction(*tx, pindexNewTip, CMainSignals::SYNC_TRANSACTION_NOT_IN_BLOCK);
-        }
-        // ... and about transactions that got confirmed:
         for (const auto& pair : connectTrace.blocksConnected) {
             assert(pair.second);
             const CBlock& block = *(pair.second);

From a874ab5ccf7839edb445830f81591fa608d85fa6 Mon Sep 17 00:00:00 2001
From: Alex Morcos <morcos@chaincode.com>
Date: Tue, 29 Nov 2016 17:51:26 -0500
Subject: [PATCH 1330/1802] remove internal tracking of mempool conflicts for
 reporting to wallet

---
 src/test/blockencodings_tests.cpp |  6 ++---
 src/test/mempool_tests.cpp        | 40 ++++++++++++++++---------------
 src/txmempool.cpp                 | 11 +++------
 src/txmempool.h                   |  4 ++--
 4 files changed, 29 insertions(+), 32 deletions(-)

diff --git a/src/test/blockencodings_tests.cpp b/src/test/blockencodings_tests.cpp
index b013cda6d7a63..7478758f73f0b 100644
--- a/src/test/blockencodings_tests.cpp
+++ b/src/test/blockencodings_tests.cpp
@@ -80,9 +80,9 @@ BOOST_AUTO_TEST_CASE(SimpleRoundTripTest)
 
         BOOST_CHECK_EQUAL(pool.mapTx.find(block.vtx[2]->GetHash())->GetSharedTx().use_count(), SHARED_TX_OFFSET + 1);
 
-        std::vector<CTransactionRef> removed;
-        pool.removeRecursive(*block.vtx[2], &removed);
-        BOOST_CHECK_EQUAL(removed.size(), 1);
+        size_t poolSize = pool.size();
+        pool.removeRecursive(*block.vtx[2]);
+        BOOST_CHECK_EQUAL(pool.size(), poolSize - 1);
 
         CBlock block2;
         std::vector<CTransactionRef> vtx_missing;
diff --git a/src/test/mempool_tests.cpp b/src/test/mempool_tests.cpp
index 2fb56e172f08a..bdd6eaf5388c4 100644
--- a/src/test/mempool_tests.cpp
+++ b/src/test/mempool_tests.cpp
@@ -55,17 +55,17 @@ BOOST_AUTO_TEST_CASE(MempoolRemoveTest)
 
 
     CTxMemPool testPool(CFeeRate(0));
-    std::vector<CTransactionRef> removed;
 
     // Nothing in pool, remove should do nothing:
-    testPool.removeRecursive(txParent, &removed);
-    BOOST_CHECK_EQUAL(removed.size(), 0);
+    unsigned int poolSize = testPool.size();
+    testPool.removeRecursive(txParent);
+    BOOST_CHECK_EQUAL(testPool.size(), poolSize);
 
     // Just the parent:
     testPool.addUnchecked(txParent.GetHash(), entry.FromTx(txParent));
-    testPool.removeRecursive(txParent, &removed);
-    BOOST_CHECK_EQUAL(removed.size(), 1);
-    removed.clear();
+    poolSize = testPool.size();
+    testPool.removeRecursive(txParent);
+    BOOST_CHECK_EQUAL(testPool.size(), poolSize - 1);
     
     // Parent, children, grandchildren:
     testPool.addUnchecked(txParent.GetHash(), entry.FromTx(txParent));
@@ -75,19 +75,21 @@ BOOST_AUTO_TEST_CASE(MempoolRemoveTest)
         testPool.addUnchecked(txGrandChild[i].GetHash(), entry.FromTx(txGrandChild[i]));
     }
     // Remove Child[0], GrandChild[0] should be removed:
-    testPool.removeRecursive(txChild[0], &removed);
-    BOOST_CHECK_EQUAL(removed.size(), 2);
-    removed.clear();
+    poolSize = testPool.size();
+    testPool.removeRecursive(txChild[0]);
+    BOOST_CHECK_EQUAL(testPool.size(), poolSize - 2);
     // ... make sure grandchild and child are gone:
-    testPool.removeRecursive(txGrandChild[0], &removed);
-    BOOST_CHECK_EQUAL(removed.size(), 0);
-    testPool.removeRecursive(txChild[0], &removed);
-    BOOST_CHECK_EQUAL(removed.size(), 0);
+    poolSize = testPool.size();
+    testPool.removeRecursive(txGrandChild[0]);
+    BOOST_CHECK_EQUAL(testPool.size(), poolSize);
+    poolSize = testPool.size();
+    testPool.removeRecursive(txChild[0]);
+    BOOST_CHECK_EQUAL(testPool.size(), poolSize);
     // Remove parent, all children/grandchildren should go:
-    testPool.removeRecursive(txParent, &removed);
-    BOOST_CHECK_EQUAL(removed.size(), 5);
+    poolSize = testPool.size();
+    testPool.removeRecursive(txParent);
+    BOOST_CHECK_EQUAL(testPool.size(), poolSize - 5);
     BOOST_CHECK_EQUAL(testPool.size(), 0);
-    removed.clear();
 
     // Add children and grandchildren, but NOT the parent (simulate the parent being in a block)
     for (int i = 0; i < 3; i++)
@@ -97,10 +99,10 @@ BOOST_AUTO_TEST_CASE(MempoolRemoveTest)
     }
     // Now remove the parent, as might happen if a block-re-org occurs but the parent cannot be
     // put into the mempool (maybe because it is non-standard):
-    testPool.removeRecursive(txParent, &removed);
-    BOOST_CHECK_EQUAL(removed.size(), 6);
+    poolSize = testPool.size();
+    testPool.removeRecursive(txParent);
+    BOOST_CHECK_EQUAL(testPool.size(), poolSize - 6);
     BOOST_CHECK_EQUAL(testPool.size(), 0);
-    removed.clear();
 }
 
 template<typename name>
diff --git a/src/txmempool.cpp b/src/txmempool.cpp
index 3bea0e4fbd6d2..4334ebde6dd30 100644
--- a/src/txmempool.cpp
+++ b/src/txmempool.cpp
@@ -503,7 +503,7 @@ void CTxMemPool::CalculateDescendants(txiter entryit, setEntries &setDescendants
     }
 }
 
-void CTxMemPool::removeRecursive(const CTransaction &origTx, std::vector<CTransactionRef>* removed)
+void CTxMemPool::removeRecursive(const CTransaction &origTx)
 {
     // Remove transaction from memory pool
     {
@@ -530,11 +530,6 @@ void CTxMemPool::removeRecursive(const CTransaction &origTx, std::vector<CTransa
         BOOST_FOREACH(txiter it, txToRemove) {
             CalculateDescendants(it, setAllRemoves);
         }
-        if (removed) {
-            BOOST_FOREACH(txiter it, setAllRemoves) {
-                removed->emplace_back(it->GetSharedTx());
-            }
-        }
         RemoveStaged(setAllRemoves, false);
     }
 }
@@ -576,7 +571,7 @@ void CTxMemPool::removeForReorg(const CCoinsViewCache *pcoins, unsigned int nMem
     RemoveStaged(setAllRemoves, false);
 }
 
-void CTxMemPool::removeConflicts(const CTransaction &tx, std::vector<CTransactionRef>* removed)
+void CTxMemPool::removeConflicts(const CTransaction &tx)
 {
     // Remove transactions which depend on inputs of tx, recursively
     LOCK(cs);
@@ -586,7 +581,7 @@ void CTxMemPool::removeConflicts(const CTransaction &tx, std::vector<CTransactio
             const CTransaction &txConflict = *it->second;
             if (txConflict != tx)
             {
-                removeRecursive(txConflict, removed);
+                removeRecursive(txConflict);
                 ClearPrioritisation(txConflict.GetHash());
             }
         }
diff --git a/src/txmempool.h b/src/txmempool.h
index 2f40981455eb2..8a935391de21e 100644
--- a/src/txmempool.h
+++ b/src/txmempool.h
@@ -527,9 +527,9 @@ class CTxMemPool
     bool addUnchecked(const uint256& hash, const CTxMemPoolEntry &entry, bool fCurrentEstimate = true);
     bool addUnchecked(const uint256& hash, const CTxMemPoolEntry &entry, setEntries &setAncestors, bool fCurrentEstimate = true);
 
-    void removeRecursive(const CTransaction &tx, std::vector<CTransactionRef>* removed = NULL);
+    void removeRecursive(const CTransaction &tx);
     void removeForReorg(const CCoinsViewCache *pcoins, unsigned int nMemPoolHeight, int flags);
-    void removeConflicts(const CTransaction &tx, std::vector<CTransactionRef>* removed = NULL);
+    void removeConflicts(const CTransaction &tx);
     void removeForBlock(const std::vector<CTransactionRef>& vtx, unsigned int nBlockHeight,
                         bool fCurrentEstimate = true);
     void clear();

From 07df40babb0231b2e8a2f42341805b4bbcc4e284 Mon Sep 17 00:00:00 2001
From: Russell Yanofsky <russ@yanofsky.org>
Date: Mon, 5 Dec 2016 18:30:46 -0500
Subject: [PATCH 1331/1802] [test] Add CCoinsViewCache Access/Modify/Write
 tests

Add more comprehensive unit tests for CCoinsViewCache. Right now it is hard to
refactor caching code or fix bugs in the caching logic because you have to try
to mentally enumerate all the different states the cache might be in to make
sure a change doesn't cause unintended consequences. The new tests explicitly
enumerate relevant cache states, documenting and verifying the behavior in each
state, so it will be safer and easier to make changes to the caching code in
the future.
---
 src/test/coins_tests.cpp | 364 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 364 insertions(+)

diff --git a/src/test/coins_tests.cpp b/src/test/coins_tests.cpp
index 79dea00e46edb..f0e74a55d24aa 100644
--- a/src/test/coins_tests.cpp
+++ b/src/test/coins_tests.cpp
@@ -80,6 +80,8 @@ class CCoinsViewCacheTest : public CCoinsViewCache
         BOOST_CHECK_EQUAL(DynamicMemoryUsage(), ret);
     }
 
+    CCoinsMap& map() { return cacheCoins; }
+    size_t& usage() { return cachedCoinsUsage; }
 };
 
 }
@@ -415,4 +417,366 @@ BOOST_AUTO_TEST_CASE(ccoins_serialization)
     }
 }
 
+const static uint256 TXID;
+const static CAmount PRUNED = -1;
+const static CAmount ABSENT = -2;
+const static CAmount VALUE1 = 100;
+const static CAmount VALUE2 = 200;
+const static CAmount VALUE3 = 300;
+const static char DIRTY = CCoinsCacheEntry::DIRTY;
+const static char FRESH = CCoinsCacheEntry::FRESH;
+const static char NO_ENTRY = -1;
+
+const static auto FLAGS = {char(0), FRESH, DIRTY, char(DIRTY | FRESH)};
+const static auto CLEAN_FLAGS = {char(0), FRESH};
+const static auto DIRTY_FLAGS = {DIRTY, char(DIRTY | FRESH)};
+const static auto ABSENT_FLAGS = {NO_ENTRY};
+
+void SetCoinsValue(CAmount value, CCoins& coins)
+{
+    assert(value != ABSENT);
+    coins.Clear();
+    assert(coins.IsPruned());
+    if (value != PRUNED) {
+        coins.vout.emplace_back();
+        coins.vout.back().nValue = value;
+        assert(!coins.IsPruned());
+    }
+}
+
+size_t InsertCoinsMapEntry(CCoinsMap& map, CAmount value, char flags)
+{
+    if (value == ABSENT) {
+        assert(flags == NO_ENTRY);
+        return 0;
+    }
+    assert(flags != NO_ENTRY);
+    CCoinsCacheEntry entry;
+    entry.flags = flags;
+    SetCoinsValue(value, entry.coins);
+    auto inserted = map.emplace(TXID, std::move(entry));
+    assert(inserted.second);
+    return inserted.first->second.coins.DynamicMemoryUsage();
+}
+
+void GetCoinsMapEntry(const CCoinsMap& map, CAmount& value, char& flags)
+{
+    auto it = map.find(TXID);
+    if (it == map.end()) {
+        value = ABSENT;
+        flags = NO_ENTRY;
+    } else {
+        if (it->second.coins.IsPruned()) {
+            assert(it->second.coins.vout.size() == 0);
+            value = PRUNED;
+        } else {
+            assert(it->second.coins.vout.size() == 1);
+            value = it->second.coins.vout[0].nValue;
+        }
+        flags = it->second.flags;
+        assert(flags != NO_ENTRY);
+    }
+}
+
+void WriteCoinsViewEntry(CCoinsView& view, CAmount value, char flags)
+{
+    CCoinsMap map;
+    InsertCoinsMapEntry(map, value, flags);
+    view.BatchWrite(map, {});
+}
+
+class SingleEntryCacheTest
+{
+public:
+    SingleEntryCacheTest(CAmount base_value, CAmount cache_value, char cache_flags)
+    {
+        WriteCoinsViewEntry(base, base_value, base_value == ABSENT ? NO_ENTRY : DIRTY);
+        cache.usage() += InsertCoinsMapEntry(cache.map(), cache_value, cache_flags);
+    }
+
+    CCoinsView root;
+    CCoinsViewCacheTest base{&root};
+    CCoinsViewCacheTest cache{&base};
+};
+
+void CheckAccessCoins(CAmount base_value, CAmount cache_value, CAmount expected_value, char cache_flags, char expected_flags)
+{
+    SingleEntryCacheTest test(base_value, cache_value, cache_flags);
+    test.cache.AccessCoins(TXID);
+    test.cache.SelfTest();
+
+    CAmount result_value;
+    char result_flags;
+    GetCoinsMapEntry(test.cache.map(), result_value, result_flags);
+    BOOST_CHECK_EQUAL(result_value, expected_value);
+    BOOST_CHECK_EQUAL(result_flags, expected_flags);
+}
+
+BOOST_AUTO_TEST_CASE(ccoins_access)
+{
+    /* Check AccessCoin behavior, requesting a coin from a cache view layered on
+     * top of a base view, and checking the resulting entry in the cache after
+     * the access.
+     *
+     *               Base    Cache   Result  Cache        Result
+     *               Value   Value   Value   Flags        Flags
+     */
+    CheckAccessCoins(ABSENT, ABSENT, ABSENT, NO_ENTRY   , NO_ENTRY   );
+    CheckAccessCoins(ABSENT, PRUNED, PRUNED, 0          , 0          );
+    CheckAccessCoins(ABSENT, PRUNED, PRUNED, FRESH      , FRESH      );
+    CheckAccessCoins(ABSENT, PRUNED, PRUNED, DIRTY      , DIRTY      );
+    CheckAccessCoins(ABSENT, PRUNED, PRUNED, DIRTY|FRESH, DIRTY|FRESH);
+    CheckAccessCoins(ABSENT, VALUE2, VALUE2, 0          , 0          );
+    CheckAccessCoins(ABSENT, VALUE2, VALUE2, FRESH      , FRESH      );
+    CheckAccessCoins(ABSENT, VALUE2, VALUE2, DIRTY      , DIRTY      );
+    CheckAccessCoins(ABSENT, VALUE2, VALUE2, DIRTY|FRESH, DIRTY|FRESH);
+    CheckAccessCoins(PRUNED, ABSENT, PRUNED, NO_ENTRY   , FRESH      );
+    CheckAccessCoins(PRUNED, PRUNED, PRUNED, 0          , 0          );
+    CheckAccessCoins(PRUNED, PRUNED, PRUNED, FRESH      , FRESH      );
+    CheckAccessCoins(PRUNED, PRUNED, PRUNED, DIRTY      , DIRTY      );
+    CheckAccessCoins(PRUNED, PRUNED, PRUNED, DIRTY|FRESH, DIRTY|FRESH);
+    CheckAccessCoins(PRUNED, VALUE2, VALUE2, 0          , 0          );
+    CheckAccessCoins(PRUNED, VALUE2, VALUE2, FRESH      , FRESH      );
+    CheckAccessCoins(PRUNED, VALUE2, VALUE2, DIRTY      , DIRTY      );
+    CheckAccessCoins(PRUNED, VALUE2, VALUE2, DIRTY|FRESH, DIRTY|FRESH);
+    CheckAccessCoins(VALUE1, ABSENT, VALUE1, NO_ENTRY   , 0          );
+    CheckAccessCoins(VALUE1, PRUNED, PRUNED, 0          , 0          );
+    CheckAccessCoins(VALUE1, PRUNED, PRUNED, FRESH      , FRESH      );
+    CheckAccessCoins(VALUE1, PRUNED, PRUNED, DIRTY      , DIRTY      );
+    CheckAccessCoins(VALUE1, PRUNED, PRUNED, DIRTY|FRESH, DIRTY|FRESH);
+    CheckAccessCoins(VALUE1, VALUE2, VALUE2, 0          , 0          );
+    CheckAccessCoins(VALUE1, VALUE2, VALUE2, FRESH      , FRESH      );
+    CheckAccessCoins(VALUE1, VALUE2, VALUE2, DIRTY      , DIRTY      );
+    CheckAccessCoins(VALUE1, VALUE2, VALUE2, DIRTY|FRESH, DIRTY|FRESH);
+}
+
+void CheckModifyCoins(CAmount base_value, CAmount cache_value, CAmount modify_value, CAmount expected_value, char cache_flags, char expected_flags)
+{
+    SingleEntryCacheTest test(base_value, cache_value, cache_flags);
+    SetCoinsValue(modify_value, *test.cache.ModifyCoins(TXID));
+    test.cache.SelfTest();
+
+    CAmount result_value;
+    char result_flags;
+    GetCoinsMapEntry(test.cache.map(), result_value, result_flags);
+    BOOST_CHECK_EQUAL(result_value, expected_value);
+    BOOST_CHECK_EQUAL(result_flags, expected_flags);
+};
+
+BOOST_AUTO_TEST_CASE(ccoins_modify)
+{
+    /* Check ModifyCoin behavior, requesting a coin from a cache view layered on
+     * top of a base view, writing a modification to the coin, and then checking
+     * the resulting entry in the cache after the modification.
+     *
+     *               Base    Cache   Write   Result  Cache        Result
+     *               Value   Value   Value   Value   Flags        Flags
+     */
+    CheckModifyCoins(ABSENT, ABSENT, PRUNED, ABSENT, NO_ENTRY   , NO_ENTRY   );
+    CheckModifyCoins(ABSENT, ABSENT, VALUE3, VALUE3, NO_ENTRY   , DIRTY|FRESH);
+    CheckModifyCoins(ABSENT, PRUNED, PRUNED, PRUNED, 0          , DIRTY      );
+    CheckModifyCoins(ABSENT, PRUNED, PRUNED, ABSENT, FRESH      , NO_ENTRY   );
+    CheckModifyCoins(ABSENT, PRUNED, PRUNED, PRUNED, DIRTY      , DIRTY      );
+    CheckModifyCoins(ABSENT, PRUNED, PRUNED, ABSENT, DIRTY|FRESH, NO_ENTRY   );
+    CheckModifyCoins(ABSENT, PRUNED, VALUE3, VALUE3, 0          , DIRTY      );
+    CheckModifyCoins(ABSENT, PRUNED, VALUE3, VALUE3, FRESH      , DIRTY|FRESH);
+    CheckModifyCoins(ABSENT, PRUNED, VALUE3, VALUE3, DIRTY      , DIRTY      );
+    CheckModifyCoins(ABSENT, PRUNED, VALUE3, VALUE3, DIRTY|FRESH, DIRTY|FRESH);
+    CheckModifyCoins(ABSENT, VALUE2, PRUNED, PRUNED, 0          , DIRTY      );
+    CheckModifyCoins(ABSENT, VALUE2, PRUNED, ABSENT, FRESH      , NO_ENTRY   );
+    CheckModifyCoins(ABSENT, VALUE2, PRUNED, PRUNED, DIRTY      , DIRTY      );
+    CheckModifyCoins(ABSENT, VALUE2, PRUNED, ABSENT, DIRTY|FRESH, NO_ENTRY   );
+    CheckModifyCoins(ABSENT, VALUE2, VALUE3, VALUE3, 0          , DIRTY      );
+    CheckModifyCoins(ABSENT, VALUE2, VALUE3, VALUE3, FRESH      , DIRTY|FRESH);
+    CheckModifyCoins(ABSENT, VALUE2, VALUE3, VALUE3, DIRTY      , DIRTY      );
+    CheckModifyCoins(ABSENT, VALUE2, VALUE3, VALUE3, DIRTY|FRESH, DIRTY|FRESH);
+    CheckModifyCoins(PRUNED, ABSENT, PRUNED, ABSENT, NO_ENTRY   , NO_ENTRY   );
+    CheckModifyCoins(PRUNED, ABSENT, VALUE3, VALUE3, NO_ENTRY   , DIRTY|FRESH);
+    CheckModifyCoins(PRUNED, PRUNED, PRUNED, PRUNED, 0          , DIRTY      );
+    CheckModifyCoins(PRUNED, PRUNED, PRUNED, ABSENT, FRESH      , NO_ENTRY   );
+    CheckModifyCoins(PRUNED, PRUNED, PRUNED, PRUNED, DIRTY      , DIRTY      );
+    CheckModifyCoins(PRUNED, PRUNED, PRUNED, ABSENT, DIRTY|FRESH, NO_ENTRY   );
+    CheckModifyCoins(PRUNED, PRUNED, VALUE3, VALUE3, 0          , DIRTY      );
+    CheckModifyCoins(PRUNED, PRUNED, VALUE3, VALUE3, FRESH      , DIRTY|FRESH);
+    CheckModifyCoins(PRUNED, PRUNED, VALUE3, VALUE3, DIRTY      , DIRTY      );
+    CheckModifyCoins(PRUNED, PRUNED, VALUE3, VALUE3, DIRTY|FRESH, DIRTY|FRESH);
+    CheckModifyCoins(PRUNED, VALUE2, PRUNED, PRUNED, 0          , DIRTY      );
+    CheckModifyCoins(PRUNED, VALUE2, PRUNED, ABSENT, FRESH      , NO_ENTRY   );
+    CheckModifyCoins(PRUNED, VALUE2, PRUNED, PRUNED, DIRTY      , DIRTY      );
+    CheckModifyCoins(PRUNED, VALUE2, PRUNED, ABSENT, DIRTY|FRESH, NO_ENTRY   );
+    CheckModifyCoins(PRUNED, VALUE2, VALUE3, VALUE3, 0          , DIRTY      );
+    CheckModifyCoins(PRUNED, VALUE2, VALUE3, VALUE3, FRESH      , DIRTY|FRESH);
+    CheckModifyCoins(PRUNED, VALUE2, VALUE3, VALUE3, DIRTY      , DIRTY      );
+    CheckModifyCoins(PRUNED, VALUE2, VALUE3, VALUE3, DIRTY|FRESH, DIRTY|FRESH);
+    CheckModifyCoins(VALUE1, ABSENT, PRUNED, PRUNED, NO_ENTRY   , DIRTY      );
+    CheckModifyCoins(VALUE1, ABSENT, VALUE3, VALUE3, NO_ENTRY   , DIRTY      );
+    CheckModifyCoins(VALUE1, PRUNED, PRUNED, PRUNED, 0          , DIRTY      );
+    CheckModifyCoins(VALUE1, PRUNED, PRUNED, ABSENT, FRESH      , NO_ENTRY   );
+    CheckModifyCoins(VALUE1, PRUNED, PRUNED, PRUNED, DIRTY      , DIRTY      );
+    CheckModifyCoins(VALUE1, PRUNED, PRUNED, ABSENT, DIRTY|FRESH, NO_ENTRY   );
+    CheckModifyCoins(VALUE1, PRUNED, VALUE3, VALUE3, 0          , DIRTY      );
+    CheckModifyCoins(VALUE1, PRUNED, VALUE3, VALUE3, FRESH      , DIRTY|FRESH);
+    CheckModifyCoins(VALUE1, PRUNED, VALUE3, VALUE3, DIRTY      , DIRTY      );
+    CheckModifyCoins(VALUE1, PRUNED, VALUE3, VALUE3, DIRTY|FRESH, DIRTY|FRESH);
+    CheckModifyCoins(VALUE1, VALUE2, PRUNED, PRUNED, 0          , DIRTY      );
+    CheckModifyCoins(VALUE1, VALUE2, PRUNED, ABSENT, FRESH      , NO_ENTRY   );
+    CheckModifyCoins(VALUE1, VALUE2, PRUNED, PRUNED, DIRTY      , DIRTY      );
+    CheckModifyCoins(VALUE1, VALUE2, PRUNED, ABSENT, DIRTY|FRESH, NO_ENTRY   );
+    CheckModifyCoins(VALUE1, VALUE2, VALUE3, VALUE3, 0          , DIRTY      );
+    CheckModifyCoins(VALUE1, VALUE2, VALUE3, VALUE3, FRESH      , DIRTY|FRESH);
+    CheckModifyCoins(VALUE1, VALUE2, VALUE3, VALUE3, DIRTY      , DIRTY      );
+    CheckModifyCoins(VALUE1, VALUE2, VALUE3, VALUE3, DIRTY|FRESH, DIRTY|FRESH);
+}
+
+void CheckModifyNewCoinsBase(CAmount base_value, CAmount cache_value, CAmount modify_value, CAmount expected_value, char cache_flags, char expected_flags, bool coinbase)
+{
+    SingleEntryCacheTest test(base_value, cache_value, cache_flags);
+    SetCoinsValue(modify_value, *test.cache.ModifyNewCoins(TXID, coinbase));
+
+    CAmount result_value;
+    char result_flags;
+    GetCoinsMapEntry(test.cache.map(), result_value, result_flags);
+    BOOST_CHECK_EQUAL(result_value, expected_value);
+    BOOST_CHECK_EQUAL(result_flags, expected_flags);
+}
+
+// Simple wrapper for CheckModifyNewCoinsBase function above that loops through
+// different possible base_values, making sure each one gives the same results.
+// This wrapper lets the modify_new test below be shorter and less repetitive,
+// while still verifying that the CoinsViewCache::ModifyNewCoins implementation
+// ignores base values.
+template <typename... Args>
+void CheckModifyNewCoins(Args&&... args)
+{
+    for (CAmount base_value : {ABSENT, PRUNED, VALUE1})
+        CheckModifyNewCoinsBase(base_value, std::forward<Args>(args)...);
+}
+
+BOOST_AUTO_TEST_CASE(ccoins_modify_new)
+{
+    /* Check ModifyNewCoin behavior, requesting a new coin from a cache view,
+     * writing a modification to the coin, and then checking the resulting
+     * entry in the cache after the modification. Verify behavior with the
+     * with the ModifyNewCoin coinbase argument set to false, and to true.
+     *
+     *                  Cache   Write   Result  Cache        Result     Coinbase
+     *                  Value   Value   Value   Flags        Flags
+     */
+    CheckModifyNewCoins(ABSENT, PRUNED, ABSENT, NO_ENTRY   , NO_ENTRY   , false);
+    CheckModifyNewCoins(ABSENT, PRUNED, PRUNED, NO_ENTRY   , DIRTY      , true );
+    CheckModifyNewCoins(ABSENT, VALUE3, VALUE3, NO_ENTRY   , DIRTY|FRESH, false);
+    CheckModifyNewCoins(ABSENT, VALUE3, VALUE3, NO_ENTRY   , DIRTY      , true );
+    CheckModifyNewCoins(PRUNED, PRUNED, ABSENT, 0          , NO_ENTRY   , false);
+    CheckModifyNewCoins(PRUNED, PRUNED, PRUNED, 0          , DIRTY      , true );
+    CheckModifyNewCoins(PRUNED, PRUNED, ABSENT, FRESH      , NO_ENTRY   , false);
+    CheckModifyNewCoins(PRUNED, PRUNED, ABSENT, FRESH      , NO_ENTRY   , true );
+    CheckModifyNewCoins(PRUNED, PRUNED, ABSENT, DIRTY      , NO_ENTRY   , false);
+    CheckModifyNewCoins(PRUNED, PRUNED, PRUNED, DIRTY      , DIRTY      , true );
+    CheckModifyNewCoins(PRUNED, PRUNED, ABSENT, DIRTY|FRESH, NO_ENTRY   , false);
+    CheckModifyNewCoins(PRUNED, PRUNED, ABSENT, DIRTY|FRESH, NO_ENTRY   , true );
+    CheckModifyNewCoins(PRUNED, VALUE3, VALUE3, 0          , DIRTY|FRESH, false);
+    CheckModifyNewCoins(PRUNED, VALUE3, VALUE3, 0          , DIRTY      , true );
+    CheckModifyNewCoins(PRUNED, VALUE3, VALUE3, FRESH      , DIRTY|FRESH, false);
+    CheckModifyNewCoins(PRUNED, VALUE3, VALUE3, FRESH      , DIRTY|FRESH, true );
+    CheckModifyNewCoins(PRUNED, VALUE3, VALUE3, DIRTY      , DIRTY|FRESH, false);
+    CheckModifyNewCoins(PRUNED, VALUE3, VALUE3, DIRTY      , DIRTY      , true );
+    CheckModifyNewCoins(PRUNED, VALUE3, VALUE3, DIRTY|FRESH, DIRTY|FRESH, false);
+    CheckModifyNewCoins(PRUNED, VALUE3, VALUE3, DIRTY|FRESH, DIRTY|FRESH, true );
+    CheckModifyNewCoins(VALUE2, PRUNED, ABSENT, 0          , NO_ENTRY   , false);
+    CheckModifyNewCoins(VALUE2, PRUNED, PRUNED, 0          , DIRTY      , true );
+    CheckModifyNewCoins(VALUE2, PRUNED, ABSENT, FRESH      , NO_ENTRY   , false);
+    CheckModifyNewCoins(VALUE2, PRUNED, ABSENT, FRESH      , NO_ENTRY   , true );
+    CheckModifyNewCoins(VALUE2, PRUNED, ABSENT, DIRTY      , NO_ENTRY   , false);
+    CheckModifyNewCoins(VALUE2, PRUNED, PRUNED, DIRTY      , DIRTY      , true );
+    CheckModifyNewCoins(VALUE2, PRUNED, ABSENT, DIRTY|FRESH, NO_ENTRY   , false);
+    CheckModifyNewCoins(VALUE2, PRUNED, ABSENT, DIRTY|FRESH, NO_ENTRY   , true );
+    CheckModifyNewCoins(VALUE2, VALUE3, VALUE3, 0          , DIRTY|FRESH, false);
+    CheckModifyNewCoins(VALUE2, VALUE3, VALUE3, 0          , DIRTY      , true );
+    CheckModifyNewCoins(VALUE2, VALUE3, VALUE3, FRESH      , DIRTY|FRESH, false);
+    CheckModifyNewCoins(VALUE2, VALUE3, VALUE3, FRESH      , DIRTY|FRESH, true );
+    CheckModifyNewCoins(VALUE2, VALUE3, VALUE3, DIRTY      , DIRTY|FRESH, false);
+    CheckModifyNewCoins(VALUE2, VALUE3, VALUE3, DIRTY      , DIRTY      , true );
+    CheckModifyNewCoins(VALUE2, VALUE3, VALUE3, DIRTY|FRESH, DIRTY|FRESH, false);
+    CheckModifyNewCoins(VALUE2, VALUE3, VALUE3, DIRTY|FRESH, DIRTY|FRESH, true );
+}
+
+void CheckWriteCoins(CAmount parent_value, CAmount child_value, CAmount expected_value, char parent_flags, char child_flags, char expected_flags)
+{
+    SingleEntryCacheTest test(ABSENT, parent_value, parent_flags);
+    WriteCoinsViewEntry(test.cache, child_value, child_flags);
+    test.cache.SelfTest();
+
+    CAmount result_value;
+    char result_flags;
+    GetCoinsMapEntry(test.cache.map(), result_value, result_flags);
+    BOOST_CHECK_EQUAL(result_value, expected_value);
+    BOOST_CHECK_EQUAL(result_flags, expected_flags);
+}
+
+BOOST_AUTO_TEST_CASE(ccoins_write)
+{
+    /* Check BatchWrite behavior, flushing one entry from a child cache to a
+     * parent cache, and checking the resulting entry in the parent cache
+     * after the write.
+     *
+     *              Parent  Child   Result  Parent       Child        Result
+     *              Value   Value   Value   Flags        Flags        Flags
+     */
+    CheckWriteCoins(ABSENT, ABSENT, ABSENT, NO_ENTRY   , NO_ENTRY   , NO_ENTRY   );
+    CheckWriteCoins(ABSENT, PRUNED, PRUNED, NO_ENTRY   , DIRTY      , DIRTY      );
+    CheckWriteCoins(ABSENT, PRUNED, ABSENT, NO_ENTRY   , DIRTY|FRESH, NO_ENTRY   );
+    CheckWriteCoins(ABSENT, VALUE2, VALUE2, NO_ENTRY   , DIRTY      , DIRTY      );
+    CheckWriteCoins(ABSENT, VALUE2, VALUE2, NO_ENTRY   , DIRTY|FRESH, DIRTY|FRESH);
+    CheckWriteCoins(PRUNED, ABSENT, PRUNED, 0          , NO_ENTRY   , 0          );
+    CheckWriteCoins(PRUNED, ABSENT, PRUNED, FRESH      , NO_ENTRY   , FRESH      );
+    CheckWriteCoins(PRUNED, ABSENT, PRUNED, DIRTY      , NO_ENTRY   , DIRTY      );
+    CheckWriteCoins(PRUNED, ABSENT, PRUNED, DIRTY|FRESH, NO_ENTRY   , DIRTY|FRESH);
+    CheckWriteCoins(PRUNED, PRUNED, PRUNED, 0          , DIRTY      , DIRTY      );
+    CheckWriteCoins(PRUNED, PRUNED, PRUNED, 0          , DIRTY|FRESH, DIRTY      );
+    CheckWriteCoins(PRUNED, PRUNED, ABSENT, FRESH      , DIRTY      , NO_ENTRY   );
+    CheckWriteCoins(PRUNED, PRUNED, ABSENT, FRESH      , DIRTY|FRESH, NO_ENTRY   );
+    CheckWriteCoins(PRUNED, PRUNED, PRUNED, DIRTY      , DIRTY      , DIRTY      );
+    CheckWriteCoins(PRUNED, PRUNED, PRUNED, DIRTY      , DIRTY|FRESH, DIRTY      );
+    CheckWriteCoins(PRUNED, PRUNED, ABSENT, DIRTY|FRESH, DIRTY      , NO_ENTRY   );
+    CheckWriteCoins(PRUNED, PRUNED, ABSENT, DIRTY|FRESH, DIRTY|FRESH, NO_ENTRY   );
+    CheckWriteCoins(PRUNED, VALUE2, VALUE2, 0          , DIRTY      , DIRTY      );
+    CheckWriteCoins(PRUNED, VALUE2, VALUE2, 0          , DIRTY|FRESH, DIRTY      );
+    CheckWriteCoins(PRUNED, VALUE2, VALUE2, FRESH      , DIRTY      , DIRTY|FRESH);
+    CheckWriteCoins(PRUNED, VALUE2, VALUE2, FRESH      , DIRTY|FRESH, DIRTY|FRESH);
+    CheckWriteCoins(PRUNED, VALUE2, VALUE2, DIRTY      , DIRTY      , DIRTY      );
+    CheckWriteCoins(PRUNED, VALUE2, VALUE2, DIRTY      , DIRTY|FRESH, DIRTY      );
+    CheckWriteCoins(PRUNED, VALUE2, VALUE2, DIRTY|FRESH, DIRTY      , DIRTY|FRESH);
+    CheckWriteCoins(PRUNED, VALUE2, VALUE2, DIRTY|FRESH, DIRTY|FRESH, DIRTY|FRESH);
+    CheckWriteCoins(VALUE1, ABSENT, VALUE1, 0          , NO_ENTRY   , 0          );
+    CheckWriteCoins(VALUE1, ABSENT, VALUE1, FRESH      , NO_ENTRY   , FRESH      );
+    CheckWriteCoins(VALUE1, ABSENT, VALUE1, DIRTY      , NO_ENTRY   , DIRTY      );
+    CheckWriteCoins(VALUE1, ABSENT, VALUE1, DIRTY|FRESH, NO_ENTRY   , DIRTY|FRESH);
+    CheckWriteCoins(VALUE1, PRUNED, PRUNED, 0          , DIRTY      , DIRTY      );
+    CheckWriteCoins(VALUE1, PRUNED, PRUNED, 0          , DIRTY|FRESH, DIRTY      );
+    CheckWriteCoins(VALUE1, PRUNED, ABSENT, FRESH      , DIRTY      , NO_ENTRY   );
+    CheckWriteCoins(VALUE1, PRUNED, ABSENT, FRESH      , DIRTY|FRESH, NO_ENTRY   );
+    CheckWriteCoins(VALUE1, PRUNED, PRUNED, DIRTY      , DIRTY      , DIRTY      );
+    CheckWriteCoins(VALUE1, PRUNED, PRUNED, DIRTY      , DIRTY|FRESH, DIRTY      );
+    CheckWriteCoins(VALUE1, PRUNED, ABSENT, DIRTY|FRESH, DIRTY      , NO_ENTRY   );
+    CheckWriteCoins(VALUE1, PRUNED, ABSENT, DIRTY|FRESH, DIRTY|FRESH, NO_ENTRY   );
+    CheckWriteCoins(VALUE1, VALUE2, VALUE2, 0          , DIRTY      , DIRTY      );
+    CheckWriteCoins(VALUE1, VALUE2, VALUE2, 0          , DIRTY|FRESH, DIRTY      );
+    CheckWriteCoins(VALUE1, VALUE2, VALUE2, FRESH      , DIRTY      , DIRTY|FRESH);
+    CheckWriteCoins(VALUE1, VALUE2, VALUE2, FRESH      , DIRTY|FRESH, DIRTY|FRESH);
+    CheckWriteCoins(VALUE1, VALUE2, VALUE2, DIRTY      , DIRTY      , DIRTY      );
+    CheckWriteCoins(VALUE1, VALUE2, VALUE2, DIRTY      , DIRTY|FRESH, DIRTY      );
+    CheckWriteCoins(VALUE1, VALUE2, VALUE2, DIRTY|FRESH, DIRTY      , DIRTY|FRESH);
+    CheckWriteCoins(VALUE1, VALUE2, VALUE2, DIRTY|FRESH, DIRTY|FRESH, DIRTY|FRESH);
+
+    // The checks above omit cases where the child flags are not DIRTY, since
+    // they would be too repetitive (the parent cache is never updated in these
+    // cases). The loop below covers these cases and makes sure the parent cache
+    // is always left unchanged.
+    for (CAmount parent_value : {ABSENT, PRUNED, VALUE1})
+        for (CAmount child_value : {ABSENT, PRUNED, VALUE2})
+            for (char parent_flags : parent_value == ABSENT ? ABSENT_FLAGS : FLAGS)
+                for (char child_flags : child_value == ABSENT ? ABSENT_FLAGS : CLEAN_FLAGS)
+                    CheckWriteCoins(parent_value, child_value, parent_value, parent_flags, child_flags, parent_flags);
+}
+
 BOOST_AUTO_TEST_SUITE_END()

From 819ca3f18ebde1a4ff227ddfcc3a5d84a817773b Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Mon, 5 Dec 2016 23:04:50 -0800
Subject: [PATCH 1332/1802] Remove mapOrphanTransactionsByPrev from DoS_tests

This is another violation of the one definition rule, as the type
for mapOrphanTransactionsByPrev did not match the one in
net_processing.cpp anymore. As it now depends on a custom Iterator,
it seems too much hassle to correctly expose it to the tests.
Instead, this commit just removes the one test it was referenced in.
---
 src/test/DoS_tests.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/test/DoS_tests.cpp b/src/test/DoS_tests.cpp
index a8c3c4ebb9c32..131d667e0b346 100644
--- a/src/test/DoS_tests.cpp
+++ b/src/test/DoS_tests.cpp
@@ -32,7 +32,6 @@ struct COrphanTx {
     int64_t nTimeExpire;
 };
 extern std::map<uint256, COrphanTx> mapOrphanTransactions;
-extern std::map<uint256, std::set<uint256> > mapOrphanTransactionsByPrev;
 
 CService ip(uint32_t i)
 {
@@ -203,7 +202,6 @@ BOOST_AUTO_TEST_CASE(DoS_mapOrphans)
     BOOST_CHECK(mapOrphanTransactions.size() <= 10);
     LimitOrphanTxSize(0);
     BOOST_CHECK(mapOrphanTransactions.empty());
-    BOOST_CHECK(mapOrphanTransactionsByPrev.empty());
 }
 
 BOOST_AUTO_TEST_SUITE_END()

From 80d073c9bca4521d512ea14ff7919d4609647b6d Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Mon, 5 Dec 2016 23:26:32 -0800
Subject: [PATCH 1333/1802] Complain when unknown rpcserialversion is specified

---
 src/init.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/init.cpp b/src/init.cpp
index 71971a76427b1..b57a207e90e96 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -380,7 +380,7 @@ std::string HelpMessage(HelpMessageMode mode)
     strUsage += HelpMessageOpt("-port=<port>", strprintf(_("Listen for connections on <port> (default: %u or testnet: %u)"), Params(CBaseChainParams::MAIN).GetDefaultPort(), Params(CBaseChainParams::TESTNET).GetDefaultPort()));
     strUsage += HelpMessageOpt("-proxy=<ip:port>", _("Connect through SOCKS5 proxy"));
     strUsage += HelpMessageOpt("-proxyrandomize", strprintf(_("Randomize credentials for every proxy connection. This enables Tor stream isolation (default: %u)"), DEFAULT_PROXYRANDOMIZE));
-    strUsage += HelpMessageOpt("-rpcserialversion", strprintf(_("Sets the serialization of raw transaction or block hex returned in non-verbose mode, non-segwit(0) or segwit(>0) (default: %d)"), DEFAULT_RPC_SERIALIZE_VERSION));
+    strUsage += HelpMessageOpt("-rpcserialversion", strprintf(_("Sets the serialization of raw transaction or block hex returned in non-verbose mode, non-segwit(0) or segwit(1) (default: %d)"), DEFAULT_RPC_SERIALIZE_VERSION));
     strUsage += HelpMessageOpt("-seednode=<ip>", _("Connect to a node to retrieve peer addresses, and disconnect"));
     strUsage += HelpMessageOpt("-timeout=<n>", strprintf(_("Specify connection timeout in milliseconds (minimum: 1, default: %d)"), DEFAULT_CONNECT_TIMEOUT));
     strUsage += HelpMessageOpt("-torcontrol=<ip>:<port>", strprintf(_("Tor control port to use if onion listening enabled (default: %s)"), DEFAULT_TOR_CONTROL));
@@ -988,6 +988,9 @@ bool AppInitParameterInteraction()
     if (GetArg("-rpcserialversion", DEFAULT_RPC_SERIALIZE_VERSION) < 0)
         return InitError("rpcserialversion must be non-negative.");
 
+    if (GetArg("-rpcserialversion", DEFAULT_RPC_SERIALIZE_VERSION) > 1)
+        return InitError("unknown rpcserialversion requested.");
+
     nMaxTipAge = GetArg("-maxtipage", DEFAULT_MAX_TIP_AGE);
 
     fEnableReplacement = GetBoolArg("-mempoolreplacement", DEFAULT_ENABLE_REPLACEMENT);

From f692fce8a49e05e25f1c767aae1e50db419caebe Mon Sep 17 00:00:00 2001
From: Gregory Maxwell <greg@xiph.org>
Date: Tue, 6 Dec 2016 06:39:14 +0000
Subject: [PATCH 1334/1802] Make RelayWalletTransaction attempt to
 AcceptToMemoryPool.

This resolves an issue where a wallet transaction which failed to
 relay previously because it couldn't make it into the mempool
 will not try again until restart, even though mempool conditions
 may have changed.

Abandoned and known-conflicted transactions are skipped.

Some concern was expressed that there may be users with many
 unknown conflicts would waste a lot of CPU time trying to
 add them to their memory pools over and over again.  But I am
 doubtful these users exist in any number, if they do exist
 they have worse problems, and they can mitigate any performance
 issue this might have by abandoning the transactions in question.
---
 src/wallet/wallet.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index 638fca99177cb..43ffb7145792d 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -1542,9 +1542,11 @@ void CWallet::ReacceptWalletTransactions()
 bool CWalletTx::RelayWalletTransaction(CConnman* connman)
 {
     assert(pwallet->GetBroadcastTransactions());
-    if (!IsCoinBase())
+    if (!IsCoinBase() && !isAbandoned() && GetDepthInMainChain() == 0)
     {
-        if (GetDepthInMainChain() == 0 && !isAbandoned() && InMempool()) {
+        CValidationState state;
+        /* GetDepthInMainChain already catches known conflicts. */
+        if (InMempool() || AcceptToMemoryPool(maxTxFee, state)) {
             LogPrintf("Relaying wtx %s\n", GetHash().ToString());
             if (connman) {
                 CInv inv(MSG_TX, GetHash());

From c24a4f5981d47d55aa9e4eb40294832a4d38fb80 Mon Sep 17 00:00:00 2001
From: Jonas Schnelli <dev@jonasschnelli.ch>
Date: Tue, 6 Dec 2016 13:45:56 +0100
Subject: [PATCH 1335/1802] [Wallet] Bugfix: FRT: don't terminate when keypool
 is empty

---
 src/wallet/wallet.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index 638fca99177cb..00e97d3c7fe1c 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -2389,7 +2389,11 @@ bool CWallet::CreateTransaction(const vector<CRecipient>& vecSend, CWalletTx& wt
                         CPubKey vchPubKey;
                         bool ret;
                         ret = reservekey.GetReservedKey(vchPubKey);
-                        assert(ret); // should never fail, as we just unlocked
+                        if (!ret)
+                        {
+                            strFailReason = _("Keypool ran out, please call keypoolrefill first");
+                            return false;
+                        }
 
                         scriptChange = GetScriptForDestination(vchPubKey.GetID());
                     }

From 28f8ae8adfd4c2fcf5709d77aa77484fd77f3e2c Mon Sep 17 00:00:00 2001
From: Alex Morcos <morcos@chaincode.com>
Date: Tue, 6 Dec 2016 08:56:12 -0500
Subject: [PATCH 1336/1802] Fix missed change to WalletTx structure

---
 src/qt/walletmodel.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/qt/walletmodel.cpp b/src/qt/walletmodel.cpp
index a78fc90d2c56e..afc72fae6981a 100644
--- a/src/qt/walletmodel.cpp
+++ b/src/qt/walletmodel.cpp
@@ -335,9 +335,8 @@ WalletModel::SendCoinsReturn WalletModel::sendCoins(WalletModelTransaction &tran
         if(!wallet->CommitTransaction(*newTx, *keyChange, g_connman.get(), state))
             return SendCoinsReturn(TransactionCommitFailed, QString::fromStdString(state.GetRejectReason()));
 
-        CTransaction* t = (CTransaction*)newTx;
         CDataStream ssTx(SER_NETWORK, PROTOCOL_VERSION);
-        ssTx << *t;
+        ssTx << *newTx->tx;
         transaction_array.append(&(ssTx[0]), ssTx.size());
     }
 

From f36349e89814d25b12ec34ac5228462e8632e3ac Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Wed, 7 Dec 2016 05:55:16 +0100
Subject: [PATCH 1337/1802] qt: Remove on_toggleNetworkActiveButton_clicked
 from RPCConsole

There is no network toggle button (anymore?) in the RPC console.
Removes another warning (#9250).
---
 src/qt/rpcconsole.cpp | 5 -----
 src/qt/rpcconsole.h   | 2 --
 2 files changed, 7 deletions(-)

diff --git a/src/qt/rpcconsole.cpp b/src/qt/rpcconsole.cpp
index e87de158a2210..2538c7d4c6453 100644
--- a/src/qt/rpcconsole.cpp
+++ b/src/qt/rpcconsole.cpp
@@ -1089,8 +1089,3 @@ void RPCConsole::setTabFocus(enum TabTypes tabType)
 {
     ui->tabWidget->setCurrentIndex(tabType);
 }
-
-void RPCConsole::on_toggleNetworkActiveButton_clicked()
-{
-    clientModel->setNetworkActive(!clientModel->getNetworkActive());
-}
diff --git a/src/qt/rpcconsole.h b/src/qt/rpcconsole.h
index 344d5ecb98d15..ab8c3dc9142fd 100644
--- a/src/qt/rpcconsole.h
+++ b/src/qt/rpcconsole.h
@@ -62,8 +62,6 @@ class RPCConsole: public QWidget
 private Q_SLOTS:
     void on_lineEdit_returnPressed();
     void on_tabWidget_currentChanged(int index);
-    /** toggle network activity */
-    void on_toggleNetworkActiveButton_clicked();
     /** open the debug.log from the current datadir */
     void on_openDebugLogfileButton_clicked();
     /** change the time range of the network traffic graph */

From 1a6eacbf3b7e3d5941fec1154079bbc4678ce861 Mon Sep 17 00:00:00 2001
From: Jonas Schnelli <dev@jonasschnelli.ch>
Date: Wed, 7 Dec 2016 15:20:40 +0100
Subject: [PATCH 1338/1802] [QA] add fundrawtransaction test on a locked wallet
 with empty keypool

---
 qa/rpc-tests/fundrawtransaction.py | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/qa/rpc-tests/fundrawtransaction.py b/qa/rpc-tests/fundrawtransaction.py
index 8c45578fcfbdd..0dcca4cb570fd 100755
--- a/qa/rpc-tests/fundrawtransaction.py
+++ b/qa/rpc-tests/fundrawtransaction.py
@@ -484,6 +484,23 @@ def run_test(self):
         self.is_network_split=False
         self.sync_all()
 
+        # drain the keypool
+        self.nodes[1].getnewaddress()
+        inputs = []
+        outputs = {self.nodes[0].getnewaddress():1.1}
+        rawTx = self.nodes[1].createrawtransaction(inputs, outputs)
+        # fund a transaction that requires a new key for the change output
+        # creating the key must be impossible because the wallet is locked
+        try:
+            fundedTx = self.nodes[1].fundrawtransaction(rawTx)
+            raise AssertionError("Wallet unlocked without passphrase")
+        except JSONRPCException as e:
+            assert('Keypool ran out' in e.error['message'])
+
+        #refill the keypool
+        self.nodes[1].walletpassphrase("test", 100)
+        self.nodes[1].walletlock()
+
         try:
             self.nodes[1].sendtoaddress(self.nodes[0].getnewaddress(), 1.2)
             raise AssertionError("Wallet unlocked without passphrase")

From b919179cbbe45302de62b47020e09c1aeab19cd3 Mon Sep 17 00:00:00 2001
From: Alex Morcos <morcos@chaincode.com>
Date: Wed, 7 Dec 2016 09:58:20 -0500
Subject: [PATCH 1339/1802] remove no longer needed check for premature v2 txs

---
 src/validation.cpp | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/src/validation.cpp b/src/validation.cpp
index a541978c854de..c1efa8bc17f16 100644
--- a/src/validation.cpp
+++ b/src/validation.cpp
@@ -540,14 +540,6 @@ bool AcceptToMemoryPoolWorker(CTxMemPool& pool, CValidationState& state, const C
     if (tx.IsCoinBase())
         return state.DoS(100, false, REJECT_INVALID, "coinbase");
 
-    // Don't relay version 2 transactions until CSV is active, and we can be
-    // sure that such transactions will be mined (unless we're on
-    // -testnet/-regtest).
-    const CChainParams& chainparams = Params();
-    if (fRequireStandard && tx.nVersion >= 2 && VersionBitsTipState(chainparams.GetConsensus(), Consensus::DEPLOYMENT_CSV) != THRESHOLD_ACTIVE) {
-        return state.DoS(0, false, REJECT_NONSTANDARD, "premature-version2-tx");
-    }
-
     // Reject transactions with witness before segregated witness activates (override with -prematurewitness)
     bool witnessEnabled = IsWitnessEnabled(chainActive.Tip(), Params().GetConsensus());
     if (!GetBoolArg("-prematurewitness",false) && !tx.wit.IsNull() && !witnessEnabled) {

From fe41f5836552517da3d5cff2a970d6d0a6a8f06c Mon Sep 17 00:00:00 2001
From: Russell Yanofsky <russ@yanofsky.org>
Date: Wed, 7 Dec 2016 15:41:56 -0500
Subject: [PATCH 1340/1802] Remove undefined FetchCoins method declaration

---
 src/coins.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/coins.h b/src/coins.h
index d295b3c940d66..dd6ef6cc3a9a1 100644
--- a/src/coins.h
+++ b/src/coins.h
@@ -467,7 +467,6 @@ class CCoinsViewCache : public CCoinsViewBacked
     friend class CCoinsModifier;
 
 private:
-    CCoinsMap::iterator FetchCoins(const uint256 &txid);
     CCoinsMap::const_iterator FetchCoins(const uint256 &txid) const;
 
     /**

From d29505db22892548a5eca5567bf8acf4e950efea Mon Sep 17 00:00:00 2001
From: jonnynewbs <jonnynewbs@gmail.com>
Date: Thu, 15 Sep 2016 10:46:01 -0400
Subject: [PATCH 1341/1802] Fix transaction size comments. Size now refers to
 virtual size as defined in BIP141.

---
 src/rpc/blockchain.cpp | 10 +++++-----
 src/rpc/mining.cpp     |  6 ++++--
 src/txmempool.h        |  2 +-
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp
index 154107c0dcf33..a6f92ea202d87 100644
--- a/src/rpc/blockchain.cpp
+++ b/src/rpc/blockchain.cpp
@@ -331,7 +331,7 @@ UniValue getdifficulty(const JSONRPCRequest& request)
 
 std::string EntryDescriptionString()
 {
-    return "    \"size\" : n,             (numeric) transaction size in bytes\n"
+    return "    \"size\" : n,             (numeric) virtual transaction size as defined in BIP 141. This is different from actual serialized size for witness transactions as witness data is discounted.\n"
            "    \"fee\" : n,              (numeric) transaction fee in " + CURRENCY_UNIT + "\n"
            "    \"modifiedfee\" : n,      (numeric) transaction fee with fee deltas used for mining priority\n"
            "    \"time\" : n,             (numeric) local time transaction entered pool in seconds since 1 Jan 1970 GMT\n"
@@ -339,10 +339,10 @@ std::string EntryDescriptionString()
            "    \"startingpriority\" : n, (numeric) priority when transaction entered pool\n"
            "    \"currentpriority\" : n,  (numeric) transaction priority now\n"
            "    \"descendantcount\" : n,  (numeric) number of in-mempool descendant transactions (including this one)\n"
-           "    \"descendantsize\" : n,   (numeric) size of in-mempool descendants (including this one)\n"
+           "    \"descendantsize\" : n,   (numeric) virtual transaction size of in-mempool descendants (including this one)\n"
            "    \"descendantfees\" : n,   (numeric) modified fees (see above) of in-mempool descendants (including this one)\n"
            "    \"ancestorcount\" : n,    (numeric) number of in-mempool ancestor transactions (including this one)\n"
-           "    \"ancestorsize\" : n,     (numeric) size of in-mempool ancestors (including this one)\n"
+           "    \"ancestorsize\" : n,     (numeric) virtual transaction size of in-mempool ancestors (including this one)\n"
            "    \"ancestorfees\" : n,     (numeric) modified fees (see above) of in-mempool ancestors (including this one)\n"
            "    \"depends\" : [           (array) unconfirmed transactions used as inputs for this transaction\n"
            "        \"transactionid\",    (string) parent transaction id\n"
@@ -703,7 +703,7 @@ UniValue getblock(const JSONRPCRequest& request)
             "  \"confirmations\" : n,   (numeric) The number of confirmations, or -1 if the block is not on the main chain\n"
             "  \"size\" : n,            (numeric) The block size\n"
             "  \"strippedsize\" : n,    (numeric) The block size excluding witness data\n"
-            "  \"weight\" : n           (numeric) The block weight (BIP 141)\n"
+            "  \"weight\" : n           (numeric) The block weight as defined in BIP 141\n"
             "  \"height\" : n,          (numeric) The block height or index\n"
             "  \"version\" : n,         (numeric) The block version\n"
             "  \"versionHex\" : \"00000000\", (string) The block version formatted in hexadecimal\n"
@@ -1240,7 +1240,7 @@ UniValue getmempoolinfo(const JSONRPCRequest& request)
             "\nResult:\n"
             "{\n"
             "  \"size\": xxxxx,               (numeric) Current tx count\n"
-            "  \"bytes\": xxxxx,              (numeric) Sum of all tx sizes\n"
+            "  \"bytes\": xxxxx,              (numeric) Sum of all virtual transaction sizes as defined in BIP 141. Differs from actual serialized size because witness data is discounted\n"
             "  \"usage\": xxxxx,              (numeric) Total memory usage for the mempool\n"
             "  \"maxmempool\": xxxxx,         (numeric) Maximum memory usage for the mempool\n"
             "  \"mempoolminfee\": xxxxx       (numeric) Minimum fee for tx to be accepted\n"
diff --git a/src/rpc/mining.cpp b/src/rpc/mining.cpp
index 6b0e52a309376..724594c8d889c 100644
--- a/src/rpc/mining.cpp
+++ b/src/rpc/mining.cpp
@@ -775,7 +775,8 @@ UniValue estimatefee(const JSONRPCRequest& request)
         throw runtime_error(
             "estimatefee nblocks\n"
             "\nEstimates the approximate fee per kilobyte needed for a transaction to begin\n"
-            "confirmation within nblocks blocks.\n"
+            "confirmation within nblocks blocks. Uses virtual transaction size of transaction\n"
+            "as defined in BIP 141 (witness data is discounted).\n"
             "\nArguments:\n"
             "1. nblocks     (numeric)\n"
             "\nResult:\n"
@@ -835,7 +836,8 @@ UniValue estimatesmartfee(const JSONRPCRequest& request)
             "\nWARNING: This interface is unstable and may disappear or change!\n"
             "\nEstimates the approximate fee per kilobyte needed for a transaction to begin\n"
             "confirmation within nblocks blocks if possible and return the number of blocks\n"
-            "for which the estimate is valid.\n"
+            "for which the estimate is valid. Uses virtual transaction size as defined\n"
+            "in BIP 141 (witness data is discounted).\n"
             "\nArguments:\n"
             "1. nblocks     (numeric)\n"
             "\nResult:\n"
diff --git a/src/txmempool.h b/src/txmempool.h
index 29b59363a2eb4..ced74aa470387 100644
--- a/src/txmempool.h
+++ b/src/txmempool.h
@@ -421,7 +421,7 @@ class CTxMemPool
     unsigned int nTransactionsUpdated;
     CBlockPolicyEstimator* minerPolicyEstimator;
 
-    uint64_t totalTxSize;      //!< sum of all mempool tx' byte sizes
+    uint64_t totalTxSize;      //!< sum of all mempool tx's virtual sizes. Differs from serialized tx size since witness data is discounted. Defined in BIP 141.
     uint64_t cachedInnerUsage; //!< sum of dynamic memory usage of all the map elements (NOT the maps themselves)
 
     CFeeRate minReasonableRelayFee;

From b3a74100b86423c553ac327f3ea6fdbc2c50890a Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Thu, 8 Dec 2016 11:49:28 -0800
Subject: [PATCH 1342/1802] Return txid even if ATMP fails for new transaction

---
 src/wallet/wallet.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index 638fca99177cb..11ce06c99dad6 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -2580,11 +2580,11 @@ bool CWallet::CommitTransaction(CWalletTx& wtxNew, CReserveKey& reservekey, CCon
         {
             // Broadcast
             if (!wtxNew.AcceptToMemoryPool(maxTxFee, state)) {
-                // This must not fail. The transaction has already been signed and recorded.
-                LogPrintf("CommitTransaction(): Error: Transaction not valid, %s\n", state.GetRejectReason());
-                return false;
+                LogPrintf("CommitTransaction(): Transaction cannot be broadcast immediately, %s\n", state.GetRejectReason());
+                // TODO: if we expect the failure to be long term or permanent, instead delete wtx from the wallet and return failure.
+            } else {
+                wtxNew.RelayWalletTransaction(connman);
             }
-            wtxNew.RelayWalletTransaction(connman);
         }
     }
     return true;

From 1f0ca1ae1cb369001ecef4ffe32fcd7173dce0c5 Mon Sep 17 00:00:00 2001
From: BtcDrak <btcdrak@gmail.com>
Date: Fri, 26 Aug 2016 22:49:10 +0100
Subject: [PATCH 1343/1802] Bump default transaction version to 2

---
 src/primitives/transaction.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/primitives/transaction.h b/src/primitives/transaction.h
index 66fefafef5807..b594cab458249 100644
--- a/src/primitives/transaction.h
+++ b/src/primitives/transaction.h
@@ -363,7 +363,7 @@ class CTransaction
 {
 public:
     // Default transaction version.
-    static const int32_t CURRENT_VERSION=1;
+    static const int32_t CURRENT_VERSION=2;
 
     // Changing the default transaction version requires a two step process: first
     // adapting relay policy by bumping MAX_STANDARD_VERSION, and then later date

From c5d746ace7c7bc2884c9eefa6c4c0b2c4f89cfb5 Mon Sep 17 00:00:00 2001
From: Alex Morcos <morcos@chaincode.com>
Date: Tue, 6 Dec 2016 16:49:32 -0500
Subject: [PATCH 1344/1802] tiny test fix for mempool_tests

---
 src/test/mempool_tests.cpp | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/test/mempool_tests.cpp b/src/test/mempool_tests.cpp
index 1faf8b6aeb66b..d4c6b0f2be4fc 100644
--- a/src/test/mempool_tests.cpp
+++ b/src/test/mempool_tests.cpp
@@ -388,7 +388,12 @@ BOOST_AUTO_TEST_CASE(MempoolAncestorIndexingTest)
 
     pool.addUnchecked(tx6.GetHash(), entry.Fee(0LL).FromTx(tx6));
     BOOST_CHECK_EQUAL(pool.size(), 6);
-    sortedOrder.push_back(tx6.GetHash().ToString());
+    // Ties are broken by hash
+    if (tx3.GetHash() < tx6.GetHash())
+        sortedOrder.push_back(tx6.GetHash().ToString());
+    else
+        sortedOrder.insert(sortedOrder.end()-1,tx6.GetHash().ToString());
+
     CheckSort<ancestor_score>(pool, sortedOrder);
 
     CMutableTransaction tx7 = CMutableTransaction();
@@ -415,7 +420,11 @@ BOOST_AUTO_TEST_CASE(MempoolAncestorIndexingTest)
     pool.removeForBlock(vtx, 1, NULL, false);
 
     sortedOrder.erase(sortedOrder.begin()+1);
-    sortedOrder.pop_back();
+    // Ties are broken by hash
+    if (tx3.GetHash() < tx6.GetHash())
+        sortedOrder.pop_back();
+    else
+        sortedOrder.erase(sortedOrder.end()-2);
     sortedOrder.insert(sortedOrder.begin(), tx7.GetHash().ToString());
     CheckSort<ancestor_score>(pool, sortedOrder);
 }

From dab207e4e694c6980336f59817d6c9af83a46fa2 Mon Sep 17 00:00:00 2001
From: BtcDrak <btcdrak@gmail.com>
Date: Wed, 7 Dec 2016 20:22:07 +0000
Subject: [PATCH 1345/1802] Preserve tx version=1 for certain tests

Without this change, the tests would be affected by default
tx version increases.
---
 src/test/hash_tests.cpp              | 6 +++++-
 src/test/txvalidationcache_tests.cpp | 1 +
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/test/hash_tests.cpp b/src/test/hash_tests.cpp
index fa9624f13daf5..8be9c580c473b 100644
--- a/src/test/hash_tests.cpp
+++ b/src/test/hash_tests.cpp
@@ -124,7 +124,11 @@ BOOST_AUTO_TEST_CASE(siphash)
     }
 
     CHashWriter ss(SER_DISK, CLIENT_VERSION);
-    ss << CTransaction();
+    CMutableTransaction tx;
+    // Note these tests were originally written with tx.nVersion=1
+    // and the test would be affected by default tx version bumps if not fixed.
+    tx.nVersion = 1;
+    ss << tx;
     BOOST_CHECK_EQUAL(SipHashUint256(1, 2, ss.GetHash()), 0x79751e980c2a0a35ULL);
 }
 
diff --git a/src/test/txvalidationcache_tests.cpp b/src/test/txvalidationcache_tests.cpp
index 55b4d28fb24b0..9f58f004d50b0 100644
--- a/src/test/txvalidationcache_tests.cpp
+++ b/src/test/txvalidationcache_tests.cpp
@@ -39,6 +39,7 @@ BOOST_FIXTURE_TEST_CASE(tx_mempool_block_doublespend, TestChain100Setup)
     spends.resize(2);
     for (int i = 0; i < 2; i++)
     {
+        spends[i].nVersion = 1;
         spends[i].vin.resize(1);
         spends[i].vin[0].prevout.hash = coinbaseTxns[0].GetHash();
         spends[i].vin[0].prevout.n = 0;

From c5c92c46fbe1ebc9ab411ae06d5416ff91f9f340 Mon Sep 17 00:00:00 2001
From: BtcDrak <btcdrak@gmail.com>
Date: Fri, 26 Aug 2016 23:24:23 +0100
Subject: [PATCH 1346/1802] Update python tests for default tx version=2

---
 qa/rpc-tests/bip68-112-113-p2p.py             |  1 +
 qa/rpc-tests/mempool_reorg.py                 |  2 +-
 src/test/data/bitcoin-util-test.json          | 47 ++++++++++++-------
 src/test/data/{blanktx.hex => blanktxv1.hex}  |  0
 src/test/data/blanktxv2.hex                   |  1 +
 src/test/data/blanktxv2.json                  | 11 +++++
 src/test/data/txcreate1.hex                   |  2 +-
 src/test/data/txcreate1.json                  |  8 ++--
 src/test/data/txcreate2.hex                   |  2 +-
 src/test/data/txcreate2.json                  |  8 ++--
 src/test/data/txcreatedata1.hex               |  2 +-
 src/test/data/txcreatedata2.hex               |  2 +-
 src/test/data/txcreatedata2.json              |  8 ++--
 src/test/data/txcreatedata_seq0.hex           |  2 +-
 src/test/data/txcreatedata_seq0.json          |  8 ++--
 .../{txcreatesign.hex => txcreatesignv1.hex}  |  0
 src/test/data/txcreatesignv1.json             | 33 +++++++++++++
 src/test/data/txcreatesignv2.hex              |  1 +
 18 files changed, 98 insertions(+), 40 deletions(-)
 rename src/test/data/{blanktx.hex => blanktxv1.hex} (100%)
 create mode 100644 src/test/data/blanktxv2.hex
 create mode 100644 src/test/data/blanktxv2.json
 rename src/test/data/{txcreatesign.hex => txcreatesignv1.hex} (100%)
 create mode 100644 src/test/data/txcreatesignv1.json
 create mode 100644 src/test/data/txcreatesignv2.hex

diff --git a/qa/rpc-tests/bip68-112-113-p2p.py b/qa/rpc-tests/bip68-112-113-p2p.py
index 55b3e2a04a033..fc3efb1abf5c0 100755
--- a/qa/rpc-tests/bip68-112-113-p2p.py
+++ b/qa/rpc-tests/bip68-112-113-p2p.py
@@ -289,6 +289,7 @@ def get_tests(self):
         # BIP113 test transaction will be modified before each use to put in appropriate block time
         bip113tx_v1 = self.create_transaction(self.nodes[0], bip113input, self.nodeaddress, Decimal("49.98"))
         bip113tx_v1.vin[0].nSequence = 0xFFFFFFFE
+        bip113tx_v1.nVersion = 1
         bip113tx_v2 = self.create_transaction(self.nodes[0], bip113input, self.nodeaddress, Decimal("49.98"))
         bip113tx_v2.vin[0].nSequence = 0xFFFFFFFE
         bip113tx_v2.nVersion = 2
diff --git a/qa/rpc-tests/mempool_reorg.py b/qa/rpc-tests/mempool_reorg.py
index 301b094eb08ca..dd88aae4f220b 100755
--- a/qa/rpc-tests/mempool_reorg.py
+++ b/qa/rpc-tests/mempool_reorg.py
@@ -55,7 +55,7 @@ def run_test(self):
         # Create a block-height-locked transaction which will be invalid after reorg
         timelock_tx = self.nodes[0].createrawtransaction([{"txid": coinbase_txids[0], "vout": 0}], {node0_address: 49.99})
         # Set the time lock
-        timelock_tx = timelock_tx.replace("ffffffff", "11111111", 1)
+        timelock_tx = timelock_tx.replace("ffffffff", "11111191", 1)
         timelock_tx = timelock_tx[:-8] + hex(self.nodes[0].getblockcount() + 2)[2:] + "000000"
         timelock_tx = self.nodes[0].signrawtransaction(timelock_tx)["hex"]
         assert_raises(JSONRPCException, self.nodes[0].sendrawtransaction, timelock_tx)
diff --git a/src/test/data/bitcoin-util-test.json b/src/test/data/bitcoin-util-test.json
index 98be75919bc6d..ab1a1385a3b4a 100644
--- a/src/test/data/bitcoin-util-test.json
+++ b/src/test/data/bitcoin-util-test.json
@@ -1,24 +1,24 @@
 [
   { "exec": "./bitcoin-tx",
-    "args": ["-create"],
-    "output_cmp": "blanktx.hex",
-    "description": "Creates a blank transaction"
+    "args": ["-create", "nversion=1"],
+    "output_cmp": "blanktxv1.hex",
+    "description": "Creates a blank v1 transaction"
   },
   { "exec": "./bitcoin-tx",
     "args": ["-json","-create"],
-    "output_cmp": "blanktx.json",
+    "output_cmp": "blanktxv2.json",
     "description": "Creates a blank transaction (output in json)"
   },
   { "exec": "./bitcoin-tx",
     "args": ["-"],
-    "input": "blanktx.hex",
-    "output_cmp": "blanktx.hex",
+    "input": "blanktxv2.hex",
+    "output_cmp": "blanktxv2.hex",
     "description": "Creates a blank transaction when nothing is piped into bitcoin-tx"
   },
   { "exec": "./bitcoin-tx",
     "args": ["-json","-"],
-    "input": "blanktx.hex",
-    "output_cmp": "blanktx.json",
+    "input": "blanktxv2.hex",
+    "output_cmp": "blanktxv2.json",
     "description": "Creates a blank transaction when nothing is piped into bitcoin-tx (output in json)"
   },
   { "exec": "./bitcoin-tx",
@@ -103,37 +103,48 @@
     "description": "Creates a new transaction with a single empty output script (output in json)"
   },
   { "exec": "./bitcoin-tx",
-    "args": ["01000000000100000000000000000000000000"],
+    "args": ["02000000000100000000000000000000000000"],
     "output_cmp": "txcreate2.hex",
     "description": "Parses a transation with no inputs and a single output script"
   },
   { "exec": "./bitcoin-tx",
-    "args": ["-json", "01000000000100000000000000000000000000"],
+    "args": ["-json", "02000000000100000000000000000000000000"],
     "output_cmp": "txcreate2.json",
     "description": "Parses a transation with no inputs and a single output script (output in json)"
   },
   { "exec": "./bitcoin-tx",
     "args":
-    ["-create",
+    ["-create", "nversion=1",
      "in=4d49a71ec9da436f71ec4ee231d04f292a29cd316f598bb7068feccabdc59485:0",
      "set=privatekeys:[\"5HpHagT65TZzG1PH3CSu63k8DbpvD8s5ip4nEB3kEsreAnchuDf\"]",
      "set=prevtxs:[{\"txid\":\"4d49a71ec9da436f71ec4ee231d04f292a29cd316f598bb7068feccabdc59485\",\"vout\":0,\"scriptPubKey\":\"76a91491b24bf9f5288532960ac687abb035127b1d28a588ac\"}]",
      "sign=ALL",
      "outaddr=0.001:193P6LtvS4nCnkDvM9uXn1gsSRqh4aDAz7"],
-    "output_cmp": "txcreatesign.hex",
-    "description": "Creates a new transaction with a single input and a single output, and then signs the transaction"
+    "output_cmp": "txcreatesignv1.hex",
+    "description": "Creates a new v1 transaction with a single input and a single output, and then signs the transaction"
   },
   { "exec": "./bitcoin-tx",
     "args":
     ["-json",
-     "-create",
+     "-create", "nversion=1",
      "in=4d49a71ec9da436f71ec4ee231d04f292a29cd316f598bb7068feccabdc59485:0",
      "set=privatekeys:[\"5HpHagT65TZzG1PH3CSu63k8DbpvD8s5ip4nEB3kEsreAnchuDf\"]",
      "set=prevtxs:[{\"txid\":\"4d49a71ec9da436f71ec4ee231d04f292a29cd316f598bb7068feccabdc59485\",\"vout\":0,\"scriptPubKey\":\"76a91491b24bf9f5288532960ac687abb035127b1d28a588ac\"}]",
      "sign=ALL",
      "outaddr=0.001:193P6LtvS4nCnkDvM9uXn1gsSRqh4aDAz7"],
-    "output_cmp": "txcreatesign.json",
-    "description": "Creates a new transaction with a single input and a single output, and then signs the transaction (output in json)"
+    "output_cmp": "txcreatesignv1.json",
+    "description": "Creates a new v1 transaction with a single input and a single output, and then signs the transaction (output in json)"
+  },
+  { "exec": "./bitcoin-tx",
+    "args":
+    ["-create",
+      "in=4d49a71ec9da436f71ec4ee231d04f292a29cd316f598bb7068feccabdc59485:0",
+      "set=privatekeys:[\"5HpHagT65TZzG1PH3CSu63k8DbpvD8s5ip4nEB3kEsreAnchuDf\"]",
+      "set=prevtxs:[{\"txid\":\"4d49a71ec9da436f71ec4ee231d04f292a29cd316f598bb7068feccabdc59485\",\"vout\":0,\"scriptPubKey\":\"76a91491b24bf9f5288532960ac687abb035127b1d28a588ac\"}]",
+      "sign=ALL",
+      "outaddr=0.001:193P6LtvS4nCnkDvM9uXn1gsSRqh4aDAz7"],
+    "output_cmp": "txcreatesignv2.hex",
+    "description": "Creates a new transaction with a single input and a single output, and then signs the transaction"
   },
   { "exec": "./bitcoin-tx",
     "args":
@@ -163,12 +174,12 @@
   { "exec": "./bitcoin-tx",
     "args":
     ["-json",
-     "-create",
+     "-create", "nversion=1",
      "in=5897de6bd6027a475eadd57019d4e6872c396d0716c4875a5f1a6fcfdf385c1f:0",
      "outaddr=0.18:13tuJJDR2RgArmgfv6JScSdreahzgc4T6o",
      "outdata=4:54686973204f505f52455455524e207472616e73616374696f6e206f7574707574207761732063726561746564206279206d6f646966696564206372656174657261777472616e73616374696f6e2e"],
     "output_cmp": "txcreatedata1.json",
-    "description": "Creates a new transaction with one input, one address output and one data output (output in json)"
+    "description": "Creates a new v1 transaction with one input, one address output and one data output (output in json)"
   },
   { "exec": "./bitcoin-tx",
     "args":
diff --git a/src/test/data/blanktx.hex b/src/test/data/blanktxv1.hex
similarity index 100%
rename from src/test/data/blanktx.hex
rename to src/test/data/blanktxv1.hex
diff --git a/src/test/data/blanktxv2.hex b/src/test/data/blanktxv2.hex
new file mode 100644
index 0000000000000..22d830eda151e
--- /dev/null
+++ b/src/test/data/blanktxv2.hex
@@ -0,0 +1 @@
+02000000000000000000
diff --git a/src/test/data/blanktxv2.json b/src/test/data/blanktxv2.json
new file mode 100644
index 0000000000000..266919f445cca
--- /dev/null
+++ b/src/test/data/blanktxv2.json
@@ -0,0 +1,11 @@
+{
+    "txid": "4ebd325a4b394cff8c57e8317ccf5a8d0e2bdf1b8526f8aad6c8e43d8240621a",
+    "hash": "4ebd325a4b394cff8c57e8317ccf5a8d0e2bdf1b8526f8aad6c8e43d8240621a",
+    "version": 2,
+    "locktime": 0,
+    "vin": [
+    ],
+    "vout": [
+    ],
+    "hex": "02000000000000000000"
+}
diff --git a/src/test/data/txcreate1.hex b/src/test/data/txcreate1.hex
index e2981a51c987d..9ec6ee3531b7b 100644
--- a/src/test/data/txcreate1.hex
+++ b/src/test/data/txcreate1.hex
@@ -1 +1 @@
-01000000031f5c38dfcf6f1a5f5a87c416076d392c87e6d41970d5ad5e477a02d66bde97580000000000ffffffff7cca453133921c50d5025878f7f738d1df891fd359763331935784cf6b9c82bf1200000000fffffffffccd319e04a996c96cfc0bf4c07539aa90bd0b1a700ef72fae535d6504f9a6220100000000ffffffff0280a81201000000001976a9141fc11f39be1729bf973a7ab6a615ca4729d6457488ac0084d717000000001976a914f2d4db28cad6502226ee484ae24505c2885cb12d88ac00000000
+02000000031f5c38dfcf6f1a5f5a87c416076d392c87e6d41970d5ad5e477a02d66bde97580000000000ffffffff7cca453133921c50d5025878f7f738d1df891fd359763331935784cf6b9c82bf1200000000fffffffffccd319e04a996c96cfc0bf4c07539aa90bd0b1a700ef72fae535d6504f9a6220100000000ffffffff0280a81201000000001976a9141fc11f39be1729bf973a7ab6a615ca4729d6457488ac0084d717000000001976a914f2d4db28cad6502226ee484ae24505c2885cb12d88ac00000000
diff --git a/src/test/data/txcreate1.json b/src/test/data/txcreate1.json
index 567e8026a321c..f83e036f331e2 100644
--- a/src/test/data/txcreate1.json
+++ b/src/test/data/txcreate1.json
@@ -1,7 +1,7 @@
 {
-    "txid": "f70f0d6c71416ed538e37549f430ab3665fee2437a42f10238c1bd490e782231",
-    "hash": "f70f0d6c71416ed538e37549f430ab3665fee2437a42f10238c1bd490e782231",
-    "version": 1,
+    "txid": "fe7d174f42dce0cffa7a527e9bc8368956057619ec817648f6138b98f2533e8f",
+    "hash": "fe7d174f42dce0cffa7a527e9bc8368956057619ec817648f6138b98f2533e8f",
+    "version": 2,
     "locktime": 0,
     "vin": [
         {
@@ -60,5 +60,5 @@
             }
         }
     ],
-    "hex": "01000000031f5c38dfcf6f1a5f5a87c416076d392c87e6d41970d5ad5e477a02d66bde97580000000000ffffffff7cca453133921c50d5025878f7f738d1df891fd359763331935784cf6b9c82bf1200000000fffffffffccd319e04a996c96cfc0bf4c07539aa90bd0b1a700ef72fae535d6504f9a6220100000000ffffffff0280a81201000000001976a9141fc11f39be1729bf973a7ab6a615ca4729d6457488ac0084d717000000001976a914f2d4db28cad6502226ee484ae24505c2885cb12d88ac00000000"
+    "hex": "02000000031f5c38dfcf6f1a5f5a87c416076d392c87e6d41970d5ad5e477a02d66bde97580000000000ffffffff7cca453133921c50d5025878f7f738d1df891fd359763331935784cf6b9c82bf1200000000fffffffffccd319e04a996c96cfc0bf4c07539aa90bd0b1a700ef72fae535d6504f9a6220100000000ffffffff0280a81201000000001976a9141fc11f39be1729bf973a7ab6a615ca4729d6457488ac0084d717000000001976a914f2d4db28cad6502226ee484ae24505c2885cb12d88ac00000000"
 }
diff --git a/src/test/data/txcreate2.hex b/src/test/data/txcreate2.hex
index 5243c2d02e8b5..38bb7b104665a 100644
--- a/src/test/data/txcreate2.hex
+++ b/src/test/data/txcreate2.hex
@@ -1 +1 @@
-01000000000100000000000000000000000000
+02000000000100000000000000000000000000
diff --git a/src/test/data/txcreate2.json b/src/test/data/txcreate2.json
index a70c1d302a28d..fb5e177db73a5 100644
--- a/src/test/data/txcreate2.json
+++ b/src/test/data/txcreate2.json
@@ -1,7 +1,7 @@
 {
-    "txid": "cf90229625e9eb10f6be8156bf6aa5ec2eca19a42b1e05c11f3029b560a32e13",
-    "hash": "cf90229625e9eb10f6be8156bf6aa5ec2eca19a42b1e05c11f3029b560a32e13",
-    "version": 1,
+    "txid": "0481afb29931341d0d7861d8a2f6f26456fa042abf54a23e96440ed7946e0715",
+    "hash": "0481afb29931341d0d7861d8a2f6f26456fa042abf54a23e96440ed7946e0715",
+    "version": 2,
     "locktime": 0,
     "vin": [
     ],
@@ -16,5 +16,5 @@
             }
         }
     ],
-    "hex": "01000000000100000000000000000000000000"
+    "hex": "02000000000100000000000000000000000000"
 }
diff --git a/src/test/data/txcreatedata1.hex b/src/test/data/txcreatedata1.hex
index eccc7604e6f81..cefd1a05a62cd 100644
--- a/src/test/data/txcreatedata1.hex
+++ b/src/test/data/txcreatedata1.hex
@@ -1 +1 @@
-01000000011f5c38dfcf6f1a5f5a87c416076d392c87e6d41970d5ad5e477a02d66bde97580000000000ffffffff0280a81201000000001976a9141fc11f39be1729bf973a7ab6a615ca4729d6457488ac0084d71700000000526a4c4f54686973204f505f52455455524e207472616e73616374696f6e206f7574707574207761732063726561746564206279206d6f646966696564206372656174657261777472616e73616374696f6e2e00000000
+02000000011f5c38dfcf6f1a5f5a87c416076d392c87e6d41970d5ad5e477a02d66bde97580000000000ffffffff0280a81201000000001976a9141fc11f39be1729bf973a7ab6a615ca4729d6457488ac0084d71700000000526a4c4f54686973204f505f52455455524e207472616e73616374696f6e206f7574707574207761732063726561746564206279206d6f646966696564206372656174657261777472616e73616374696f6e2e00000000
diff --git a/src/test/data/txcreatedata2.hex b/src/test/data/txcreatedata2.hex
index 3c7644c297bf5..d69cf58ba14f1 100644
--- a/src/test/data/txcreatedata2.hex
+++ b/src/test/data/txcreatedata2.hex
@@ -1 +1 @@
-01000000011f5c38dfcf6f1a5f5a87c416076d392c87e6d41970d5ad5e477a02d66bde97580000000000ffffffff0280a81201000000001976a9141fc11f39be1729bf973a7ab6a615ca4729d6457488ac0000000000000000526a4c4f54686973204f505f52455455524e207472616e73616374696f6e206f7574707574207761732063726561746564206279206d6f646966696564206372656174657261777472616e73616374696f6e2e00000000
+02000000011f5c38dfcf6f1a5f5a87c416076d392c87e6d41970d5ad5e477a02d66bde97580000000000ffffffff0280a81201000000001976a9141fc11f39be1729bf973a7ab6a615ca4729d6457488ac0000000000000000526a4c4f54686973204f505f52455455524e207472616e73616374696f6e206f7574707574207761732063726561746564206279206d6f646966696564206372656174657261777472616e73616374696f6e2e00000000
diff --git a/src/test/data/txcreatedata2.json b/src/test/data/txcreatedata2.json
index 56dfe4a1b055a..3c6da40f904bc 100644
--- a/src/test/data/txcreatedata2.json
+++ b/src/test/data/txcreatedata2.json
@@ -1,7 +1,7 @@
 {
-    "txid": "4ed17118f5e932ba8c75c461787d171bc02a016d8557cb5bcf34cd416c27bb8b",
-    "hash": "4ed17118f5e932ba8c75c461787d171bc02a016d8557cb5bcf34cd416c27bb8b",
-    "version": 1,
+    "txid": "c14b007fa3a6c1e7765919c1d14c1cfc2b8642c3a5d3be4b1fa8c4ccfec98bb0",
+    "hash": "c14b007fa3a6c1e7765919c1d14c1cfc2b8642c3a5d3be4b1fa8c4ccfec98bb0",
+    "version": 2,
     "locktime": 0,
     "vin": [
         {
@@ -38,5 +38,5 @@
             }
         }
     ],
-    "hex": "01000000011f5c38dfcf6f1a5f5a87c416076d392c87e6d41970d5ad5e477a02d66bde97580000000000ffffffff0280a81201000000001976a9141fc11f39be1729bf973a7ab6a615ca4729d6457488ac0000000000000000526a4c4f54686973204f505f52455455524e207472616e73616374696f6e206f7574707574207761732063726561746564206279206d6f646966696564206372656174657261777472616e73616374696f6e2e00000000"
+    "hex": "02000000011f5c38dfcf6f1a5f5a87c416076d392c87e6d41970d5ad5e477a02d66bde97580000000000ffffffff0280a81201000000001976a9141fc11f39be1729bf973a7ab6a615ca4729d6457488ac0000000000000000526a4c4f54686973204f505f52455455524e207472616e73616374696f6e206f7574707574207761732063726561746564206279206d6f646966696564206372656174657261777472616e73616374696f6e2e00000000"
 }
diff --git a/src/test/data/txcreatedata_seq0.hex b/src/test/data/txcreatedata_seq0.hex
index db02b5e4a46a7..54b89d238116d 100644
--- a/src/test/data/txcreatedata_seq0.hex
+++ b/src/test/data/txcreatedata_seq0.hex
@@ -1 +1 @@
-01000000011f5c38dfcf6f1a5f5a87c416076d392c87e6d41970d5ad5e477a02d66bde97580000000000fdffffff0180a81201000000001976a9141fc11f39be1729bf973a7ab6a615ca4729d6457488ac00000000
+02000000011f5c38dfcf6f1a5f5a87c416076d392c87e6d41970d5ad5e477a02d66bde97580000000000fdffffff0180a81201000000001976a9141fc11f39be1729bf973a7ab6a615ca4729d6457488ac00000000
diff --git a/src/test/data/txcreatedata_seq0.json b/src/test/data/txcreatedata_seq0.json
index 9bc0ed4593609..d272a4c447b2f 100644
--- a/src/test/data/txcreatedata_seq0.json
+++ b/src/test/data/txcreatedata_seq0.json
@@ -1,7 +1,7 @@
 {
-    "txid": "71603ccb1cd76d73d76eb6cfd5f0b9df6d65d90d76860ee52cb461c4be7032e8",
-    "hash": "71603ccb1cd76d73d76eb6cfd5f0b9df6d65d90d76860ee52cb461c4be7032e8",
-    "version": 1,
+    "txid": "8df6ed527472542dd5e137c242a7c5a9f337ac34f7b257ae4af886aeaebb51b0",
+    "hash": "8df6ed527472542dd5e137c242a7c5a9f337ac34f7b257ae4af886aeaebb51b0",
+    "version": 2,
     "locktime": 0,
     "vin": [
         {
@@ -29,5 +29,5 @@
             }
         }
     ],
-    "hex": "01000000011f5c38dfcf6f1a5f5a87c416076d392c87e6d41970d5ad5e477a02d66bde97580000000000fdffffff0180a81201000000001976a9141fc11f39be1729bf973a7ab6a615ca4729d6457488ac00000000"
+    "hex": "02000000011f5c38dfcf6f1a5f5a87c416076d392c87e6d41970d5ad5e477a02d66bde97580000000000fdffffff0180a81201000000001976a9141fc11f39be1729bf973a7ab6a615ca4729d6457488ac00000000"
 }
diff --git a/src/test/data/txcreatesign.hex b/src/test/data/txcreatesignv1.hex
similarity index 100%
rename from src/test/data/txcreatesign.hex
rename to src/test/data/txcreatesignv1.hex
diff --git a/src/test/data/txcreatesignv1.json b/src/test/data/txcreatesignv1.json
new file mode 100644
index 0000000000000..ff39e71b40c0d
--- /dev/null
+++ b/src/test/data/txcreatesignv1.json
@@ -0,0 +1,33 @@
+{
+    "txid": "977e7cd286cb72cd470d539ba6cb48400f8f387d97451d45cdb8819437a303af",
+    "hash": "977e7cd286cb72cd470d539ba6cb48400f8f387d97451d45cdb8819437a303af",
+    "version": 1,
+    "locktime": 0,
+    "vin": [
+        {
+            "txid": "4d49a71ec9da436f71ec4ee231d04f292a29cd316f598bb7068feccabdc59485",
+            "vout": 0,
+            "scriptSig": {
+                "asm": "304502210096a75056c9e2cc62b7214777b3d2a592cfda7092520126d4ebfcd6d590c99bd8022051bb746359cf98c0603f3004477eac68701132380db8facba19c89dc5ab5c5e2[ALL] 0479be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8",
+                "hex": "48304502210096a75056c9e2cc62b7214777b3d2a592cfda7092520126d4ebfcd6d590c99bd8022051bb746359cf98c0603f3004477eac68701132380db8facba19c89dc5ab5c5e201410479be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8"
+            },
+            "sequence": 4294967295
+        }
+    ],
+    "vout": [
+        {
+            "value": 0.001,
+            "n": 0,
+            "scriptPubKey": {
+                "asm": "OP_DUP OP_HASH160 5834479edbbe0539b31ffd3a8f8ebadc2165ed01 OP_EQUALVERIFY OP_CHECKSIG",
+                "hex": "76a9145834479edbbe0539b31ffd3a8f8ebadc2165ed0188ac",
+                "reqSigs": 1,
+                "type": "pubkeyhash",
+                "addresses": [
+                    "193P6LtvS4nCnkDvM9uXn1gsSRqh4aDAz7"
+                ]
+            }
+        }
+    ],
+    "hex": "01000000018594c5bdcaec8f06b78b596f31cd292a294fd031e24eec716f43dac91ea7494d000000008b48304502210096a75056c9e2cc62b7214777b3d2a592cfda7092520126d4ebfcd6d590c99bd8022051bb746359cf98c0603f3004477eac68701132380db8facba19c89dc5ab5c5e201410479be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8ffffffff01a0860100000000001976a9145834479edbbe0539b31ffd3a8f8ebadc2165ed0188ac00000000"
+}
diff --git a/src/test/data/txcreatesignv2.hex b/src/test/data/txcreatesignv2.hex
new file mode 100644
index 0000000000000..ee425cd98c5d1
--- /dev/null
+++ b/src/test/data/txcreatesignv2.hex
@@ -0,0 +1 @@
+02000000018594c5bdcaec8f06b78b596f31cd292a294fd031e24eec716f43dac91ea7494d000000008a473044022079c7aa014177a2e973caf6df7c7b8f15399083b91eba370ea1e19c4caed9181e02205f8f8763505ce8e6cbdd2cd28fab3fd407a75003e7d0dc04e6bebb0a3c89e7cb01410479be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8ffffffff01a0860100000000001976a9145834479edbbe0539b31ffd3a8f8ebadc2165ed0188ac00000000

From eab8e1b1725f7458e3db6f0ea0bc04ec603d8e9b Mon Sep 17 00:00:00 2001
From: Alex Morcos <morcos@chaincode.com>
Date: Mon, 5 Dec 2016 21:46:08 -0500
Subject: [PATCH 1347/1802] fix a bug if the min fee is 0 for FeeFilterRounder

---
 src/policy/fees.cpp | 3 ++-
 src/policy/fees.h   | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/policy/fees.cpp b/src/policy/fees.cpp
index 9eb831bc17c42..9f01c24d2cc4e 100644
--- a/src/policy/fees.cpp
+++ b/src/policy/fees.cpp
@@ -299,6 +299,7 @@ void CBlockPolicyEstimator::removeTx(uint256 hash)
 CBlockPolicyEstimator::CBlockPolicyEstimator(const CFeeRate& _minRelayFee)
     : nBestSeenHeight(0)
 {
+    static_assert(MIN_FEERATE > 0, "Min feerate must be nonzero");
     minTrackedFee = _minRelayFee < CFeeRate(MIN_FEERATE) ? CFeeRate(MIN_FEERATE) : _minRelayFee;
     std::vector<double> vfeelist;
     for (double bucketBoundary = minTrackedFee.GetFeePerK(); bucketBoundary <= MAX_FEERATE; bucketBoundary *= FEE_SPACING) {
@@ -485,7 +486,7 @@ void CBlockPolicyEstimator::Read(CAutoFile& filein, int nFileVersion)
 
 FeeFilterRounder::FeeFilterRounder(const CFeeRate& minIncrementalFee)
 {
-    CAmount minFeeLimit = minIncrementalFee.GetFeePerK() / 2;
+    CAmount minFeeLimit = std::max(CAmount(1), minIncrementalFee.GetFeePerK() / 2);
     feeset.insert(0);
     for (double bucketBoundary = minFeeLimit; bucketBoundary <= MAX_FEERATE; bucketBoundary *= FEE_SPACING) {
         feeset.insert(bucketBoundary);
diff --git a/src/policy/fees.h b/src/policy/fees.h
index ea4c70e6167af..003f7a7f23de1 100644
--- a/src/policy/fees.h
+++ b/src/policy/fees.h
@@ -179,7 +179,7 @@ static const double MIN_SUCCESS_PCT = .95;
 static const double SUFFICIENT_FEETXS = 1;
 
 // Minimum and Maximum values for tracking feerates
-static const double MIN_FEERATE = 10;
+static constexpr double MIN_FEERATE = 10;
 static const double MAX_FEERATE = 1e7;
 static const double INF_FEERATE = MAX_MONEY;
 static const double INF_PRIORITY = 1e9 * MAX_MONEY;

From f8d43b8081eef080ebb4514d1493c0c8d81d27ab Mon Sep 17 00:00:00 2001
From: Alex Morcos <morcos@chaincode.com>
Date: Thu, 8 Dec 2016 09:15:01 -0500
Subject: [PATCH 1348/1802] Avoid rollingMinimumFeeRate never being able to
 decay below half

---
 src/txmempool.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/txmempool.cpp b/src/txmempool.cpp
index c035a84db5bb6..981f31f4868cd 100644
--- a/src/txmempool.cpp
+++ b/src/txmempool.cpp
@@ -1082,7 +1082,7 @@ CFeeRate CTxMemPool::GetMinFee(size_t sizelimit) const {
         rollingMinimumFeeRate = rollingMinimumFeeRate / pow(2.0, (time - lastRollingFeeUpdate) / halflife);
         lastRollingFeeUpdate = time;
 
-        if (rollingMinimumFeeRate < minReasonableRelayFee.GetFeePerK() / 2) {
+        if (rollingMinimumFeeRate < (double)minReasonableRelayFee.GetFeePerK() / 2) {
             rollingMinimumFeeRate = 0;
             return CFeeRate(0);
         }

From 8501bedd7508ac514385806e191aec21ee978891 Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Thu, 8 Dec 2016 17:09:07 -0800
Subject: [PATCH 1349/1802] Squashed 'src/crypto/ctaes/' changes from
 cd3c3ac..003a4ac

003a4ac Merge #5: fix typo
5254f14 [trivial] Fix typo
e7c0aab Merge #4: Fix some comments
d07cead Fix some comments

git-subtree-dir: src/crypto/ctaes
git-subtree-split: 003a4acfc273932ab8c2e276cde3b4f3541012dd
---
 ctaes.c | 8 ++++----
 test.c  | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ctaes.c b/ctaes.c
index 2389fc0bb254f..55962bf25263e 100644
--- a/ctaes.c
+++ b/ctaes.c
@@ -134,7 +134,7 @@ static void SubBytes(AES_state *s, int inv) {
         D = U7;
     }
 
-    /* Non-linear transformation (identical to the code in SubBytes) */
+    /* Non-linear transformation (shared between the forward and backward case) */
     M1 = T13 & T6;
     M6 = T3 & T16;
     M11 = T1 & T15;
@@ -469,9 +469,9 @@ static void AES_encrypt(const AES_state* rounds, int nrounds, unsigned char* cip
 
 static void AES_decrypt(const AES_state* rounds, int nrounds, unsigned char* plain16, const unsigned char* cipher16) {
     /* Most AES decryption implementations use the alternate scheme
-     * (the Equivalent Inverse Cipher), which looks more like encryption, but
-     * needs different round constants. We can't reuse any code here anyway, so
-     * don't bother. */
+     * (the Equivalent Inverse Cipher), which allows for more code reuse between
+     * the encryption and decryption code, but requires separate setup for both.
+     */
     AES_state s = {{0}};
     int round;
 
diff --git a/test.c b/test.c
index fce1696acdc2d..21439a16f136e 100644
--- a/test.c
+++ b/test.c
@@ -102,7 +102,7 @@ int main(void) {
         }
     }
     if (fail == 0) {
-        fprintf(stderr, "All tests succesful\n");
+        fprintf(stderr, "All tests successful\n");
     } else {
         fprintf(stderr, "%i tests failed\n", fail);
     }

From 8c1dbc5e9ddbafb77e60e8c4e6eb275a3a76ac12 Mon Sep 17 00:00:00 2001
From: Karl-Johan Alm <karljohan-alm@garage.co.jp>
Date: Fri, 9 Dec 2016 12:01:37 +0900
Subject: [PATCH 1350/1802] Refactor: Removed begin/end_ptr functions.

---
 src/bench/crypto_hash.cpp   | 10 +++++-----
 src/bench/verify_script.cpp |  2 +-
 src/netbase.cpp             |  6 +++---
 src/qt/guiutil.cpp          |  2 +-
 src/random.cpp              |  7 +++----
 src/script/interpreter.cpp  | 10 +++++-----
 src/serialize.h             | 36 ++++--------------------------------
 src/test/base58_tests.cpp   |  2 +-
 src/test/script_tests.cpp   |  6 +++---
 src/torcontrol.cpp          |  8 ++++----
 src/util.cpp                |  4 ++--
 11 files changed, 32 insertions(+), 61 deletions(-)

diff --git a/src/bench/crypto_hash.cpp b/src/bench/crypto_hash.cpp
index 168006154f8fe..737d3572ae9a2 100644
--- a/src/bench/crypto_hash.cpp
+++ b/src/bench/crypto_hash.cpp
@@ -22,7 +22,7 @@ static void RIPEMD160(benchmark::State& state)
     uint8_t hash[CRIPEMD160::OUTPUT_SIZE];
     std::vector<uint8_t> in(BUFFER_SIZE,0);
     while (state.KeepRunning())
-        CRIPEMD160().Write(begin_ptr(in), in.size()).Finalize(hash);
+        CRIPEMD160().Write(in.data(), in.size()).Finalize(hash);
 }
 
 static void SHA1(benchmark::State& state)
@@ -30,7 +30,7 @@ static void SHA1(benchmark::State& state)
     uint8_t hash[CSHA1::OUTPUT_SIZE];
     std::vector<uint8_t> in(BUFFER_SIZE,0);
     while (state.KeepRunning())
-        CSHA1().Write(begin_ptr(in), in.size()).Finalize(hash);
+        CSHA1().Write(in.data(), in.size()).Finalize(hash);
 }
 
 static void SHA256(benchmark::State& state)
@@ -38,7 +38,7 @@ static void SHA256(benchmark::State& state)
     uint8_t hash[CSHA256::OUTPUT_SIZE];
     std::vector<uint8_t> in(BUFFER_SIZE,0);
     while (state.KeepRunning())
-        CSHA256().Write(begin_ptr(in), in.size()).Finalize(hash);
+        CSHA256().Write(in.data(), in.size()).Finalize(hash);
 }
 
 static void SHA256_32b(benchmark::State& state)
@@ -46,7 +46,7 @@ static void SHA256_32b(benchmark::State& state)
     std::vector<uint8_t> in(32,0);
     while (state.KeepRunning()) {
         for (int i = 0; i < 1000000; i++) {
-            CSHA256().Write(begin_ptr(in), in.size()).Finalize(&in[0]);
+            CSHA256().Write(in.data(), in.size()).Finalize(&in[0]);
         }
     }
 }
@@ -56,7 +56,7 @@ static void SHA512(benchmark::State& state)
     uint8_t hash[CSHA512::OUTPUT_SIZE];
     std::vector<uint8_t> in(BUFFER_SIZE,0);
     while (state.KeepRunning())
-        CSHA512().Write(begin_ptr(in), in.size()).Finalize(hash);
+        CSHA512().Write(in.data(), in.size()).Finalize(hash);
 }
 
 static void SipHash_32b(benchmark::State& state)
diff --git a/src/bench/verify_script.cpp b/src/bench/verify_script.cpp
index dc3940cdbdd99..91b8c4447200d 100644
--- a/src/bench/verify_script.cpp
+++ b/src/bench/verify_script.cpp
@@ -91,7 +91,7 @@ static void VerifyScriptBench(benchmark::State& state)
         CDataStream stream(SER_NETWORK, PROTOCOL_VERSION);
         stream << txSpend;
         int csuccess = bitcoinconsensus_verify_script_with_amount(
-            begin_ptr(txCredit.vout[0].scriptPubKey),
+            txCredit.vout[0].scriptPubKey.data(),
             txCredit.vout[0].scriptPubKey.size(),
             txCredit.vout[0].nValue,
             (const unsigned char*)&stream[0], stream.size(), 0, flags, nullptr);
diff --git a/src/netbase.cpp b/src/netbase.cpp
index 9118584b80c44..da94fd4d13d8d 100644
--- a/src/netbase.cpp
+++ b/src/netbase.cpp
@@ -292,7 +292,7 @@ static bool Socks5(const std::string& strDest, int port, const ProxyCredentials
         vSocks5Init.push_back(0x01); // # METHODS
         vSocks5Init.push_back(0x00); // X'00' NO AUTHENTICATION REQUIRED
     }
-    ssize_t ret = send(hSocket, (const char*)begin_ptr(vSocks5Init), vSocks5Init.size(), MSG_NOSIGNAL);
+    ssize_t ret = send(hSocket, (const char*)vSocks5Init.data(), vSocks5Init.size(), MSG_NOSIGNAL);
     if (ret != (ssize_t)vSocks5Init.size()) {
         CloseSocket(hSocket);
         return error("Error sending to proxy");
@@ -317,7 +317,7 @@ static bool Socks5(const std::string& strDest, int port, const ProxyCredentials
         vAuth.insert(vAuth.end(), auth->username.begin(), auth->username.end());
         vAuth.push_back(auth->password.size());
         vAuth.insert(vAuth.end(), auth->password.begin(), auth->password.end());
-        ret = send(hSocket, (const char*)begin_ptr(vAuth), vAuth.size(), MSG_NOSIGNAL);
+        ret = send(hSocket, (const char*)vAuth.data(), vAuth.size(), MSG_NOSIGNAL);
         if (ret != (ssize_t)vAuth.size()) {
             CloseSocket(hSocket);
             return error("Error sending authentication to proxy");
@@ -347,7 +347,7 @@ static bool Socks5(const std::string& strDest, int port, const ProxyCredentials
     vSocks5.insert(vSocks5.end(), strDest.begin(), strDest.end());
     vSocks5.push_back((port >> 8) & 0xFF);
     vSocks5.push_back((port >> 0) & 0xFF);
-    ret = send(hSocket, (const char*)begin_ptr(vSocks5), vSocks5.size(), MSG_NOSIGNAL);
+    ret = send(hSocket, (const char*)vSocks5.data(), vSocks5.size(), MSG_NOSIGNAL);
     if (ret != (ssize_t)vSocks5.size()) {
         CloseSocket(hSocket);
         return error("Error sending to proxy");
diff --git a/src/qt/guiutil.cpp b/src/qt/guiutil.cpp
index 3feb781db5e47..8132e4fe0d0b0 100644
--- a/src/qt/guiutil.cpp
+++ b/src/qt/guiutil.cpp
@@ -117,7 +117,7 @@ static std::string DummyAddress(const CChainParams &params)
     std::vector<unsigned char> sourcedata = params.Base58Prefix(CChainParams::PUBKEY_ADDRESS);
     sourcedata.insert(sourcedata.end(), dummydata, dummydata + sizeof(dummydata));
     for(int i=0; i<256; ++i) { // Try every trailing byte
-        std::string s = EncodeBase58(begin_ptr(sourcedata), end_ptr(sourcedata));
+        std::string s = EncodeBase58(sourcedata.data(), sourcedata.data() + sourcedata.size());
         if (!CBitcoinAddress(s).IsValid())
             return s;
         sourcedata[sourcedata.size()-1] += 1;
diff --git a/src/random.cpp b/src/random.cpp
index aa027e49c437f..c2605b45bd15c 100644
--- a/src/random.cpp
+++ b/src/random.cpp
@@ -11,7 +11,6 @@
 #include "compat.h" // for Windows API
 #include <wincrypt.h>
 #endif
-#include "serialize.h"        // for begin_ptr(vec)
 #include "util.h"             // for LogPrint()
 #include "utilstrencodings.h" // for GetTime()
 
@@ -72,15 +71,15 @@ static void RandAddSeedPerfmon()
     const size_t nMaxSize = 10000000; // Bail out at more than 10MB of performance data
     while (true) {
         nSize = vData.size();
-        ret = RegQueryValueExA(HKEY_PERFORMANCE_DATA, "Global", NULL, NULL, begin_ptr(vData), &nSize);
+        ret = RegQueryValueExA(HKEY_PERFORMANCE_DATA, "Global", NULL, NULL, vData.data(), &nSize);
         if (ret != ERROR_MORE_DATA || vData.size() >= nMaxSize)
             break;
         vData.resize(std::max((vData.size() * 3) / 2, nMaxSize)); // Grow size of buffer exponentially
     }
     RegCloseKey(HKEY_PERFORMANCE_DATA);
     if (ret == ERROR_SUCCESS) {
-        RAND_add(begin_ptr(vData), nSize, nSize / 100.0);
-        memory_cleanse(begin_ptr(vData), nSize);
+        RAND_add(vData.data(), nSize, nSize / 100.0);
+        memory_cleanse(vData.data(), nSize);
         LogPrint("rand", "%s: %lu bytes\n", __func__, nSize);
     } else {
         static bool warned = false; // Warn only once
diff --git a/src/script/interpreter.cpp b/src/script/interpreter.cpp
index a6403f9363745..1410d0b73fb33 100644
--- a/src/script/interpreter.cpp
+++ b/src/script/interpreter.cpp
@@ -856,15 +856,15 @@ bool EvalScript(vector<vector<unsigned char> >& stack, const CScript& script, un
                     valtype& vch = stacktop(-1);
                     valtype vchHash((opcode == OP_RIPEMD160 || opcode == OP_SHA1 || opcode == OP_HASH160) ? 20 : 32);
                     if (opcode == OP_RIPEMD160)
-                        CRIPEMD160().Write(begin_ptr(vch), vch.size()).Finalize(begin_ptr(vchHash));
+                        CRIPEMD160().Write(vch.data(), vch.size()).Finalize(vchHash.data());
                     else if (opcode == OP_SHA1)
-                        CSHA1().Write(begin_ptr(vch), vch.size()).Finalize(begin_ptr(vchHash));
+                        CSHA1().Write(vch.data(), vch.size()).Finalize(vchHash.data());
                     else if (opcode == OP_SHA256)
-                        CSHA256().Write(begin_ptr(vch), vch.size()).Finalize(begin_ptr(vchHash));
+                        CSHA256().Write(vch.data(), vch.size()).Finalize(vchHash.data());
                     else if (opcode == OP_HASH160)
-                        CHash160().Write(begin_ptr(vch), vch.size()).Finalize(begin_ptr(vchHash));
+                        CHash160().Write(vch.data(), vch.size()).Finalize(vchHash.data());
                     else if (opcode == OP_HASH256)
-                        CHash256().Write(begin_ptr(vch), vch.size()).Finalize(begin_ptr(vchHash));
+                        CHash256().Write(vch.data(), vch.size()).Finalize(vchHash.data());
                     popstack(stack);
                     stack.push_back(vchHash);
                 }
diff --git a/src/serialize.h b/src/serialize.h
index e28ca548c0818..2be6f005e3955 100644
--- a/src/serialize.h
+++ b/src/serialize.h
@@ -59,34 +59,6 @@ inline T* NCONST_PTR(const T* val)
     return const_cast<T*>(val);
 }
 
-/**
- * Important: Do not use the following functions in new code, but use v.data()
- * and v.data() + v.size() respectively directly. They were once introduced to
- * have a compatible, safe way to get the begin and end pointer of a vector.
- * However with C++11 the language has built-in functionality for this and it's
- * more readable to just use that.
- */
-template <typename V>
-inline typename V::value_type* begin_ptr(V& v)
-{
-    return v.data();
-}
-template <typename V>
-inline const typename V::value_type* begin_ptr(const V& v)
-{
-    return v.data();
-}
-template <typename V>
-inline typename V::value_type* end_ptr(V& v)
-{
-    return v.data() + v.size();
-}
-template <typename V>
-inline const typename V::value_type* end_ptr(const V& v)
-{
-    return v.data() + v.size();
-}
-
 /*
  * Lowest-level serialization and conversion.
  * @note Sizes of these types are verified in the tests
@@ -390,14 +362,14 @@ class CFlatData
     template <class T, class TAl>
     explicit CFlatData(std::vector<T,TAl> &v)
     {
-        pbegin = (char*)begin_ptr(v);
-        pend = (char*)end_ptr(v);
+        pbegin = (char*)v.data();
+        pend = (char*)(v.data() + v.size());
     }
     template <unsigned int N, typename T, typename S, typename D>
     explicit CFlatData(prevector<N, T, S, D> &v)
     {
-        pbegin = (char*)begin_ptr(v);
-        pend = (char*)end_ptr(v);
+        pbegin = (char*)v.data();
+        pend = (char*)(v.data() + v.size());
     }
     char* begin() { return pbegin; }
     const char* begin() const { return pbegin; }
diff --git a/src/test/base58_tests.cpp b/src/test/base58_tests.cpp
index ac3ab4c83f99e..04a6506655ec5 100644
--- a/src/test/base58_tests.cpp
+++ b/src/test/base58_tests.cpp
@@ -39,7 +39,7 @@ BOOST_AUTO_TEST_CASE(base58_EncodeBase58)
         std::vector<unsigned char> sourcedata = ParseHex(test[0].get_str());
         std::string base58string = test[1].get_str();
         BOOST_CHECK_MESSAGE(
-                    EncodeBase58(begin_ptr(sourcedata), end_ptr(sourcedata)) == base58string,
+                    EncodeBase58(sourcedata.data(), sourcedata.data() + sourcedata.size()) == base58string,
                     strTest);
     }
 }
diff --git a/src/test/script_tests.cpp b/src/test/script_tests.cpp
index eb324d5a6b781..d7f3a3a6575ec 100644
--- a/src/test/script_tests.cpp
+++ b/src/test/script_tests.cpp
@@ -176,10 +176,10 @@ void DoTest(const CScript& scriptPubKey, const CScript& scriptSig, const CScript
     int libconsensus_flags = flags & bitcoinconsensus_SCRIPT_FLAGS_VERIFY_ALL;
     if (libconsensus_flags == flags) {
         if (flags & bitcoinconsensus_SCRIPT_FLAGS_VERIFY_WITNESS) {
-            BOOST_CHECK_MESSAGE(bitcoinconsensus_verify_script_with_amount(begin_ptr(scriptPubKey), scriptPubKey.size(), txCredit.vout[0].nValue, (const unsigned char*)&stream[0], stream.size(), 0, libconsensus_flags, NULL) == expect, message);
+            BOOST_CHECK_MESSAGE(bitcoinconsensus_verify_script_with_amount(scriptPubKey.data(), scriptPubKey.size(), txCredit.vout[0].nValue, (const unsigned char*)&stream[0], stream.size(), 0, libconsensus_flags, NULL) == expect, message);
         } else {
-            BOOST_CHECK_MESSAGE(bitcoinconsensus_verify_script_with_amount(begin_ptr(scriptPubKey), scriptPubKey.size(), 0, (const unsigned char*)&stream[0], stream.size(), 0, libconsensus_flags, NULL) == expect, message);
-            BOOST_CHECK_MESSAGE(bitcoinconsensus_verify_script(begin_ptr(scriptPubKey), scriptPubKey.size(), (const unsigned char*)&stream[0], stream.size(), 0, libconsensus_flags, NULL) == expect,message);
+            BOOST_CHECK_MESSAGE(bitcoinconsensus_verify_script_with_amount(scriptPubKey.data(), scriptPubKey.size(), 0, (const unsigned char*)&stream[0], stream.size(), 0, libconsensus_flags, NULL) == expect, message);
+            BOOST_CHECK_MESSAGE(bitcoinconsensus_verify_script(scriptPubKey.data(), scriptPubKey.size(), (const unsigned char*)&stream[0], stream.size(), 0, libconsensus_flags, NULL) == expect,message);
         }
     }
 #endif
diff --git a/src/torcontrol.cpp b/src/torcontrol.cpp
index ffb9993f90b8e..67a69363f021e 100644
--- a/src/torcontrol.cpp
+++ b/src/torcontrol.cpp
@@ -501,10 +501,10 @@ static std::vector<uint8_t> ComputeResponse(const std::string &key, const std::v
 {
     CHMAC_SHA256 computeHash((const uint8_t*)key.data(), key.size());
     std::vector<uint8_t> computedHash(CHMAC_SHA256::OUTPUT_SIZE, 0);
-    computeHash.Write(begin_ptr(cookie), cookie.size());
-    computeHash.Write(begin_ptr(clientNonce), clientNonce.size());
-    computeHash.Write(begin_ptr(serverNonce), serverNonce.size());
-    computeHash.Finalize(begin_ptr(computedHash));
+    computeHash.Write(cookie.data(), cookie.size());
+    computeHash.Write(clientNonce.data(), clientNonce.size());
+    computeHash.Write(serverNonce.data(), serverNonce.size());
+    computeHash.Finalize(computedHash.data());
     return computedHash;
 }
 
diff --git a/src/util.cpp b/src/util.cpp
index 014013d214110..60701e79491f3 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -704,13 +704,13 @@ void ShrinkDebugFile()
         // Restart the file with some of the end
         std::vector <char> vch(200000,0);
         fseek(file, -((long)vch.size()), SEEK_END);
-        int nBytes = fread(begin_ptr(vch), 1, vch.size(), file);
+        int nBytes = fread(vch.data(), 1, vch.size(), file);
         fclose(file);
 
         file = fopen(pathLog.string().c_str(), "w");
         if (file)
         {
-            fwrite(begin_ptr(vch), 1, nBytes, file);
+            fwrite(vch.data(), 1, nBytes, file);
             fclose(file);
         }
     }

From 9359f8ad3b7053062f22bb68605c57a3c4b62113 Mon Sep 17 00:00:00 2001
From: Alex Morcos <morcos@chaincode.com>
Date: Fri, 9 Dec 2016 11:42:23 -0500
Subject: [PATCH 1351/1802] Wallet needs to stay unlocked for whole test

---
 qa/rpc-tests/fundrawtransaction.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qa/rpc-tests/fundrawtransaction.py b/qa/rpc-tests/fundrawtransaction.py
index 8c45578fcfbdd..172b3ae720717 100755
--- a/qa/rpc-tests/fundrawtransaction.py
+++ b/qa/rpc-tests/fundrawtransaction.py
@@ -498,7 +498,7 @@ def run_test(self):
         fundedTx = self.nodes[1].fundrawtransaction(rawTx)
 
         #now we need to unlock
-        self.nodes[1].walletpassphrase("test", 100)
+        self.nodes[1].walletpassphrase("test", 600)
         signedTx = self.nodes[1].signrawtransaction(fundedTx['hex'])
         txId = self.nodes[1].sendrawtransaction(signedTx['hex'])
         self.nodes[1].generate(1)

From 06329393c7d5e119f56b56f5a056ac8dcbb42e67 Mon Sep 17 00:00:00 2001
From: Alex Morcos <morcos@chaincode.com>
Date: Fri, 9 Dec 2016 13:36:42 -0500
Subject: [PATCH 1352/1802] Flush wallet after abandontransaction

---
 src/wallet/wallet.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index 638fca99177cb..56e7b8e226b1a 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -1009,8 +1009,7 @@ bool CWallet::AbandonTransaction(const uint256& hashTx)
 {
     LOCK2(cs_main, cs_wallet);
 
-    // Do not flush the wallet here for performance reasons
-    CWalletDB walletdb(strWalletFile, "r+", false);
+    CWalletDB walletdb(strWalletFile, "r+");
 
     std::set<uint256> todo;
     std::set<uint256> done;

From 5f0e27f1a8495d9be43a953bd0371ccbce510105 Mon Sep 17 00:00:00 2001
From: Alex Morcos <morcos@chaincode.com>
Date: Fri, 9 Dec 2016 14:39:04 -0500
Subject: [PATCH 1353/1802] Increase mempool expiry time to 2 weeks

---
 src/validation.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/validation.h b/src/validation.h
index 28e81d21c6ce0..8a94f89dd3184 100644
--- a/src/validation.h
+++ b/src/validation.h
@@ -73,7 +73,7 @@ static const unsigned int DEFAULT_DESCENDANT_LIMIT = 25;
 /** Default for -limitdescendantsize, maximum kilobytes of in-mempool descendants */
 static const unsigned int DEFAULT_DESCENDANT_SIZE_LIMIT = 101;
 /** Default for -mempoolexpiry, expiration time for mempool transactions in hours */
-static const unsigned int DEFAULT_MEMPOOL_EXPIRY = 72;
+static const unsigned int DEFAULT_MEMPOOL_EXPIRY = 336;
 /** The maximum size of a blk?????.dat file (since 0.8) */
 static const unsigned int MAX_BLOCKFILE_SIZE = 0x8000000; // 128 MiB
 /** The pre-allocation chunk size for blk?????.dat files (since 0.8) */

From 01fea7a04834b7fd5eca6f3678f56fed13375d1d Mon Sep 17 00:00:00 2001
From: Alex Morcos <morcos@chaincode.com>
Date: Fri, 9 Dec 2016 15:25:46 -0500
Subject: [PATCH 1354/1802] If we don't allow free txs, always send a fee
 filter

---
 src/net_processing.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/net_processing.cpp b/src/net_processing.cpp
index 0137108cf0337..8520a1050cc7a 100644
--- a/src/net_processing.cpp
+++ b/src/net_processing.cpp
@@ -2993,6 +2993,9 @@ bool SendMessages(CNode* pto, CConnman& connman)
         if (pto->nVersion >= FEEFILTER_VERSION && GetBoolArg("-feefilter", DEFAULT_FEEFILTER) &&
             !(pto->fWhitelisted && GetBoolArg("-whitelistforcerelay", DEFAULT_WHITELISTFORCERELAY))) {
             CAmount currentFilter = mempool.GetMinFee(GetArg("-maxmempool", DEFAULT_MAX_MEMPOOL_SIZE) * 1000000).GetFeePerK();
+            // If we don't allow free transactions, then we always have a fee filter of at least minRelayTxFee
+            if (GetArg("-limitfreerelay", DEFAULT_LIMITFREERELAY) <= 0)
+                currentFilter = std::max(currentFilter, ::minRelayTxFee.GetFeePerK());
             int64_t timeNow = GetTimeMicros();
             if (timeNow > pto->nextSendTimeFeeFilter) {
                 static CFeeRate default_feerate(DEFAULT_MIN_RELAY_TX_FEE);

From faf4ca84e404fd15be2982415d5b6007bcac7a2f Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Sat, 10 Dec 2016 17:43:51 +0100
Subject: [PATCH 1355/1802] [wallet] Disable free transactions when relay is
 disabled

---
 src/wallet/wallet.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index 638fca99177cb..7acf2e3cc9832 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -3642,6 +3642,9 @@ bool CWallet::ParameterInteraction()
     fSendFreeTransactions = GetBoolArg("-sendfreetransactions", DEFAULT_SEND_FREE_TRANSACTIONS);
     fWalletRbf = GetBoolArg("-walletrbf", DEFAULT_WALLET_RBF);
 
+    if (fSendFreeTransactions && GetArg("-limitfreerelay", DEFAULT_LIMITFREERELAY) <= 0)
+        return InitError("Creation of free transactions with their relay disabled is not supported.");
+
     return true;
 }
 

From fa615d39b53a9309ef480c41ec073354c4371f40 Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Sun, 11 Dec 2016 14:12:47 +0100
Subject: [PATCH 1356/1802] [qa] Don't set unknown rpcserialversion

---
 qa/rpc-tests/segwit.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/qa/rpc-tests/segwit.py b/qa/rpc-tests/segwit.py
index 7aa72cca34203..be6fae5088963 100755
--- a/qa/rpc-tests/segwit.py
+++ b/qa/rpc-tests/segwit.py
@@ -86,7 +86,7 @@ def __init__(self):
     def setup_network(self):
         self.nodes = []
         self.nodes.append(start_node(0, self.options.tmpdir, ["-logtimemicros", "-debug", "-walletprematurewitness", "-rpcserialversion=0"]))
-        self.nodes.append(start_node(1, self.options.tmpdir, ["-logtimemicros", "-debug", "-blockversion=4", "-promiscuousmempoolflags=517", "-prematurewitness", "-walletprematurewitness", "-rpcserialversion=2"]))
+        self.nodes.append(start_node(1, self.options.tmpdir, ["-logtimemicros", "-debug", "-blockversion=4", "-promiscuousmempoolflags=517", "-prematurewitness", "-walletprematurewitness", "-rpcserialversion=1"]))
         self.nodes.append(start_node(2, self.options.tmpdir, ["-logtimemicros", "-debug", "-blockversion=536870915", "-promiscuousmempoolflags=517", "-prematurewitness", "-walletprematurewitness"]))
         connect_nodes(self.nodes[1], 0)
         connect_nodes(self.nodes[2], 1)
@@ -216,7 +216,6 @@ def run_test(self):
         assert_equal(len(segwit_tx_list), 5)
 
         print("Verify block and transaction serialization rpcs return differing serializations depending on rpc serialization flag")
-        # Note: node1 has version 2, which is simply >0 and will catch future upgrades in tests
         assert(self.nodes[2].getblock(block[0], False) !=  self.nodes[0].getblock(block[0], False))
         assert(self.nodes[1].getblock(block[0], False) ==  self.nodes[2].getblock(block[0], False))
         for i in range(len(segwit_tx_list)):

From bae1eef752dcecfd85fa482881e1dbe4d7e9f74c Mon Sep 17 00:00:00 2001
From: Gregory Maxwell <greg@xiph.org>
Date: Mon, 12 Dec 2016 08:10:27 +0000
Subject: [PATCH 1357/1802] Fix wallet/test/crypto_tests.cpp for OpenSSL 1.1
 API.

This avoids a compile failure on newly installed debian stretch systems.
---
 src/wallet/test/crypto_tests.cpp | 32 ++++++++++++++++++++------------
 1 file changed, 20 insertions(+), 12 deletions(-)

diff --git a/src/wallet/test/crypto_tests.cpp b/src/wallet/test/crypto_tests.cpp
index ce35c53c48737..c64c76244eb33 100644
--- a/src/wallet/test/crypto_tests.cpp
+++ b/src/wallet/test/crypto_tests.cpp
@@ -42,15 +42,19 @@ bool OldEncrypt(const CKeyingMaterial& vchPlaintext, std::vector<unsigned char>
     int nCLen = nLen + AES_BLOCK_SIZE, nFLen = 0;
     vchCiphertext = std::vector<unsigned char> (nCLen);
 
-    EVP_CIPHER_CTX ctx;
+    EVP_CIPHER_CTX *ctx = EVP_CIPHER_CTX_new();
+
+    if (!ctx) return false;
 
     bool fOk = true;
 
-    EVP_CIPHER_CTX_init(&ctx);
-    if (fOk) fOk = EVP_EncryptInit_ex(&ctx, EVP_aes_256_cbc(), NULL, chKey, chIV) != 0;
-    if (fOk) fOk = EVP_EncryptUpdate(&ctx, &vchCiphertext[0], &nCLen, &vchPlaintext[0], nLen) != 0;
-    if (fOk) fOk = EVP_EncryptFinal_ex(&ctx, (&vchCiphertext[0]) + nCLen, &nFLen) != 0;
-    EVP_CIPHER_CTX_cleanup(&ctx);
+    EVP_CIPHER_CTX_init(ctx);
+    if (fOk) fOk = EVP_EncryptInit_ex(ctx, EVP_aes_256_cbc(), NULL, chKey, chIV) != 0;
+    if (fOk) fOk = EVP_EncryptUpdate(ctx, &vchCiphertext[0], &nCLen, &vchPlaintext[0], nLen) != 0;
+    if (fOk) fOk = EVP_EncryptFinal_ex(ctx, (&vchCiphertext[0]) + nCLen, &nFLen) != 0;
+    EVP_CIPHER_CTX_cleanup(ctx);
+
+    EVP_CIPHER_CTX_free(ctx);
 
     if (!fOk) return false;
 
@@ -66,15 +70,19 @@ bool OldDecrypt(const std::vector<unsigned char>& vchCiphertext, CKeyingMaterial
 
     vchPlaintext = CKeyingMaterial(nPLen);
 
-    EVP_CIPHER_CTX ctx;
+    EVP_CIPHER_CTX *ctx = EVP_CIPHER_CTX_new();
+
+    if (!ctx) return false;
 
     bool fOk = true;
 
-    EVP_CIPHER_CTX_init(&ctx);
-    if (fOk) fOk = EVP_DecryptInit_ex(&ctx, EVP_aes_256_cbc(), NULL, chKey, chIV) != 0;
-    if (fOk) fOk = EVP_DecryptUpdate(&ctx, &vchPlaintext[0], &nPLen, &vchCiphertext[0], nLen) != 0;
-    if (fOk) fOk = EVP_DecryptFinal_ex(&ctx, (&vchPlaintext[0]) + nPLen, &nFLen) != 0;
-    EVP_CIPHER_CTX_cleanup(&ctx);
+    EVP_CIPHER_CTX_init(ctx);
+    if (fOk) fOk = EVP_DecryptInit_ex(ctx, EVP_aes_256_cbc(), NULL, chKey, chIV) != 0;
+    if (fOk) fOk = EVP_DecryptUpdate(ctx, &vchPlaintext[0], &nPLen, &vchCiphertext[0], nLen) != 0;
+    if (fOk) fOk = EVP_DecryptFinal_ex(ctx, (&vchPlaintext[0]) + nPLen, &nFLen) != 0;
+    EVP_CIPHER_CTX_cleanup(ctx);
+
+    EVP_CIPHER_CTX_free(ctx);
 
     if (!fOk) return false;
 

From ed6b377ae23d4ea812a18b43633a3a8692f0fc0a Mon Sep 17 00:00:00 2001
From: Jonas Schnelli <dev@jonasschnelli.ch>
Date: Mon, 12 Dec 2016 15:57:45 +0100
Subject: [PATCH 1358/1802] [Qt] Console: add security warning

---
 src/qt/rpcconsole.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/qt/rpcconsole.cpp b/src/qt/rpcconsole.cpp
index fef15a32c6bce..4ba2f2615f98c 100644
--- a/src/qt/rpcconsole.cpp
+++ b/src/qt/rpcconsole.cpp
@@ -650,13 +650,18 @@ void RPCConsole::clear(bool clearHistory)
                 "td.message { font-family: %1; font-size: %2; white-space:pre-wrap; } "
                 "td.cmd-request { color: #006060; } "
                 "td.cmd-error { color: red; } "
+                ".secwarning { color: red; }"
                 "b { color: #006060; } "
             ).arg(fixedFontInfo.family(), QString("%1pt").arg(consoleFontSize))
         );
 
     message(CMD_REPLY, (tr("Welcome to the %1 RPC console.").arg(tr(PACKAGE_NAME)) + "<br>" +
                         tr("Use up and down arrows to navigate history, and <b>Ctrl-L</b> to clear screen.") + "<br>" +
-                        tr("Type <b>help</b> for an overview of available commands.")), true);
+                        tr("Type <b>help</b> for an overview of available commands.")) +
+                        "<br><span class=\"secwarning\">" +
+                        tr("WARNING: Scammers have been active, telling users to type commands here, stealing their wallet contents. Do not use this console without fully understanding the ramification of a command.") +
+                        "</span>",
+                        true);
 }
 
 void RPCConsole::keyPressEvent(QKeyEvent *event)

From d8c0b9f525250565abd5d430a5150e62bf449384 Mon Sep 17 00:00:00 2001
From: Russell Yanofsky <russ@yanofsky.org>
Date: Mon, 12 Dec 2016 10:18:11 -0500
Subject: [PATCH 1359/1802] [qa] Add test for rescan feature of wallet key
 import RPCs

Covers importaddress, importpubkey, importprivkey, and importmulti RPCs.
---
 qa/pull-tester/rpc-tests.py   |   1 +
 qa/rpc-tests/import-rescan.py | 155 ++++++++++++++++++++++++++++++++++
 2 files changed, 156 insertions(+)
 create mode 100755 qa/rpc-tests/import-rescan.py

diff --git a/qa/pull-tester/rpc-tests.py b/qa/pull-tester/rpc-tests.py
index 736d416e517ec..be31cbbdd30d0 100755
--- a/qa/pull-tester/rpc-tests.py
+++ b/qa/pull-tester/rpc-tests.py
@@ -150,6 +150,7 @@
     'importprunedfunds.py',
     'signmessages.py',
     'nulldummy.py',
+    'import-rescan.py',
 ]
 if ENABLE_ZMQ:
     testScripts.append('zmq_test.py')
diff --git a/qa/rpc-tests/import-rescan.py b/qa/rpc-tests/import-rescan.py
new file mode 100755
index 0000000000000..e683df26db625
--- /dev/null
+++ b/qa/rpc-tests/import-rescan.py
@@ -0,0 +1,155 @@
+#!/usr/bin/env python3
+# Copyright (c) 2014-2016 The Bitcoin Core developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+from test_framework.test_framework import BitcoinTestFramework
+from test_framework.util import (start_nodes, connect_nodes, sync_blocks, assert_equal)
+from decimal import Decimal
+
+import collections
+import enum
+import itertools
+import functools
+
+Call = enum.Enum("Call", "single multi")
+Data = enum.Enum("Data", "address pub priv")
+ImportNode = collections.namedtuple("ImportNode", "rescan")
+
+
+def call_import_rpc(call, data, address, scriptPubKey, pubkey, key, label, node, rescan):
+    """Helper that calls a wallet import RPC on a bitcoin node."""
+    watchonly = data != Data.priv
+    if call == Call.single:
+        if data == Data.address:
+            response = node.importaddress(address, label, rescan)
+        elif data == Data.pub:
+            response = node.importpubkey(pubkey, label, rescan)
+        elif data == Data.priv:
+            response = node.importprivkey(key, label, rescan)
+        assert_equal(response, None)
+    elif call == Call.multi:
+        response = node.importmulti([{
+            "scriptPubKey": {
+                "address": address
+            },
+            "pubkeys": [pubkey] if data == Data.pub else [],
+            "keys": [key] if data == Data.priv else [],
+            "label": label,
+            "watchonly": watchonly
+        }], {"rescan": rescan})
+        assert_equal(response, [{"success": True}])
+    return watchonly
+
+
+# List of RPCs that import a wallet key or address in various ways.
+IMPORT_RPCS = [functools.partial(call_import_rpc, call, data) for call, data in itertools.product(Call, Data)]
+
+# List of bitcoind nodes that will import keys.
+IMPORT_NODES = [
+    ImportNode(rescan=True),
+    ImportNode(rescan=False),
+]
+
+
+class ImportRescanTest(BitcoinTestFramework):
+    def __init__(self):
+        super().__init__()
+        self.num_nodes = 1 + len(IMPORT_NODES)
+
+    def setup_network(self):
+        extra_args = [["-debug=1"] for _ in range(self.num_nodes)]
+        self.nodes = start_nodes(self.num_nodes, self.options.tmpdir, extra_args)
+        for i in range(1, self.num_nodes):
+            connect_nodes(self.nodes[i], 0)
+
+    def run_test(self):
+        # Create one transaction on node 0 with a unique amount and label for
+        # each possible type of wallet import RPC.
+        import_rpc_variants = []
+        for i, import_rpc in enumerate(IMPORT_RPCS):
+            label = "label{}".format(i)
+            addr = self.nodes[0].validateaddress(self.nodes[0].getnewaddress(label))
+            key = self.nodes[0].dumpprivkey(addr["address"])
+            amount = 24.9375 - i * .0625
+            txid = self.nodes[0].sendtoaddress(addr["address"], amount)
+            import_rpc = functools.partial(import_rpc, addr["address"], addr["scriptPubKey"], addr["pubkey"], key,
+                                           label)
+            import_rpc_variants.append((import_rpc, label, amount, txid, addr))
+
+        self.nodes[0].generate(1)
+        assert_equal(self.nodes[0].getrawmempool(), [])
+        sync_blocks(self.nodes)
+
+        # For each importing node and variation of wallet import RPC, invoke
+        # the RPC and check the results from getbalance and listtransactions.
+        for node, import_node in zip(self.nodes[1:], IMPORT_NODES):
+            for import_rpc, label, amount, txid, addr in import_rpc_variants:
+                watchonly = import_rpc(node, import_node.rescan)
+
+                balance = node.getbalance(label, 0, True)
+                if import_node.rescan:
+                    assert_equal(balance, amount)
+                else:
+                    assert_equal(balance, 0)
+
+                txs = node.listtransactions(label, 10000, 0, True)
+                if import_node.rescan:
+                    assert_equal(len(txs), 1)
+                    assert_equal(txs[0]["account"], label)
+                    assert_equal(txs[0]["address"], addr["address"])
+                    assert_equal(txs[0]["amount"], amount)
+                    assert_equal(txs[0]["category"], "receive")
+                    assert_equal(txs[0]["label"], label)
+                    assert_equal(txs[0]["txid"], txid)
+                    assert_equal(txs[0]["confirmations"], 1)
+                    assert_equal("trusted" not in txs[0], True)
+                    if watchonly:
+                        assert_equal(txs[0]["involvesWatchonly"], True)
+                    else:
+                        assert_equal("involvesWatchonly" not in txs[0], True)
+                else:
+                    assert_equal(len(txs), 0)
+
+        # Create spends for all the imported addresses.
+        spend_txids = []
+        fee = self.nodes[0].getnetworkinfo()["relayfee"]
+        for import_rpc, label, amount, txid, addr in import_rpc_variants:
+            raw_tx = self.nodes[0].getrawtransaction(txid)
+            decoded_tx = self.nodes[0].decoderawtransaction(raw_tx)
+            input_vout = next(out["n"] for out in decoded_tx["vout"]
+                              if out["scriptPubKey"]["addresses"] == [addr["address"]])
+            inputs = [{"txid": txid, "vout": input_vout}]
+            outputs = {self.nodes[0].getnewaddress(): Decimal(amount) - fee}
+            raw_spend_tx = self.nodes[0].createrawtransaction(inputs, outputs)
+            signed_spend_tx = self.nodes[0].signrawtransaction(raw_spend_tx)
+            spend_txid = self.nodes[0].sendrawtransaction(signed_spend_tx["hex"])
+            spend_txids.append(spend_txid)
+
+        self.nodes[0].generate(1)
+        assert_equal(self.nodes[0].getrawmempool(), [])
+        sync_blocks(self.nodes)
+
+        # Check the results from getbalance and listtransactions after the spends.
+        for node, import_node in zip(self.nodes[1:], IMPORT_NODES):
+            txs = node.listtransactions("*", 10000, 0, True)
+            for (import_rpc, label, amount, txid, addr), spend_txid in zip(import_rpc_variants, spend_txids):
+                balance = node.getbalance(label, 0, True)
+                spend_tx = [tx for tx in txs if tx["txid"] == spend_txid]
+                if import_node.rescan:
+                    assert_equal(balance, amount)
+                    assert_equal(len(spend_tx), 1)
+                    assert_equal(spend_tx[0]["account"], "")
+                    assert_equal(spend_tx[0]["amount"] + spend_tx[0]["fee"], -amount)
+                    assert_equal(spend_tx[0]["category"], "send")
+                    assert_equal("label" not in spend_tx[0], True)
+                    assert_equal(spend_tx[0]["confirmations"], 1)
+                    assert_equal("trusted" not in spend_tx[0], True)
+                    assert_equal("involvesWatchonly" not in txs[0], True)
+                else:
+                    assert_equal(balance, 0)
+                    assert_equal(spend_tx, [])
+
+
+if __name__ == "__main__":
+    ImportRescanTest().main()

From 7b49f22bdbdecca600c4744d020b3553fe427e61 Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Mon, 12 Dec 2016 11:08:47 -0800
Subject: [PATCH 1360/1802] Squashed 'src/secp256k1/' changes from
 7a49cac..8225239

8225239 Merge #433: Make the libcrypto detection fail the newer API.
12de863 Make the libcrypto detection fail the newer API.
2928420 Merge #427: Remove Schnorr from travis as well
8eecc4a Remove Schnorr from travis as well
a8abae7 Merge #310: Add exhaustive test for group functions on a low-order subgroup
b4ceedf Add exhaustive test for verification
83836a9 Add exhaustive tests for group arithmetic, signing, and ecmult on a small group
20b8877 Add exhaustive test for group functions on a low-order subgroup
80773a6 Merge #425: Remove Schnorr experiment
e06e878 Remove Schnorr experiment
04c8ef3 Merge #407: Modify parameter order of internal functions to match API parameter order
6e06696 Merge #411: Remove guarantees about memcmp-ability
40c8d7e Merge #421: Update scalar_4x64_impl.h
a922365 Merge #422: Restructure nonce clearing
3769783 Restructure nonce clearing
0f9e69d Restructure nonce clearing
9d67afa Update scalar_4x64_impl.h
7d15cd7 Merge #413: fix auto-enabled static precompuatation
00c5d2e fix auto-enabled static precompuatation
91219a1 Remove guarantees about memcmp-ability
353c1bf Fix secp256k1_ge_set_table_gej_var parameter order
541b783 Fix secp256k1_ge_set_all_gej_var parameter order
7d893f4 Fix secp256k1_fe_inv_all_var parameter order

git-subtree-dir: src/secp256k1
git-subtree-split: 8225239f490f79842a5a3b82ad6cc8aa11d5208e
---
 .gitignore                                    |   1 +
 .travis.yml                                   |   9 +-
 Makefile.am                                   |  18 +-
 build-aux/m4/bitcoin_secp.m4                  |   4 +
 configure.ac                                  |  30 +-
 include/secp256k1.h                           |  14 +-
 include/secp256k1_schnorr.h                   | 173 ---------
 src/ecdsa_impl.h                              |  18 +
 src/ecmult_const_impl.h                       |   2 +-
 src/ecmult_gen_impl.h                         |   2 +-
 src/ecmult_impl.h                             |  23 +-
 src/field.h                                   |   7 +-
 src/field_impl.h                              |   2 +-
 src/group.h                                   |   4 +-
 src/group_impl.h                              |  78 ++++-
 src/java/org/bitcoin/NativeSecp256k1.java     |  34 +-
 src/java/org/bitcoin/NativeSecp256k1Test.java |  21 --
 src/java/org_bitcoin_NativeSecp256k1.c        |  34 --
 src/java/org_bitcoin_NativeSecp256k1.h        |   8 -
 src/modules/recovery/main_impl.h              |   4 +-
 src/modules/schnorr/Makefile.am.include       |  10 -
 src/modules/schnorr/main_impl.h               | 164 ---------
 src/modules/schnorr/schnorr.h                 |  20 --
 src/modules/schnorr/schnorr_impl.h            | 207 -----------
 src/modules/schnorr/tests_impl.h              | 175 ----------
 src/scalar.h                                  |   4 +-
 src/scalar_4x64_impl.h                        |  26 +-
 src/scalar_impl.h                             |  39 ++-
 src/scalar_low.h                              |  15 +
 src/scalar_low_impl.h                         | 114 ++++++
 src/secp256k1.c                               |   4 +-
 src/tests.c                                   |  20 +-
 src/tests_exhaustive.c                        | 329 ++++++++++++++++++
 33 files changed, 676 insertions(+), 937 deletions(-)
 delete mode 100644 include/secp256k1_schnorr.h
 mode change 100644 => 100755 src/modules/recovery/main_impl.h
 delete mode 100644 src/modules/schnorr/Makefile.am.include
 delete mode 100644 src/modules/schnorr/main_impl.h
 delete mode 100644 src/modules/schnorr/schnorr.h
 delete mode 100644 src/modules/schnorr/schnorr_impl.h
 delete mode 100644 src/modules/schnorr/tests_impl.h
 create mode 100644 src/scalar_low.h
 create mode 100644 src/scalar_low_impl.h
 mode change 100644 => 100755 src/secp256k1.c
 create mode 100644 src/tests_exhaustive.c

diff --git a/.gitignore b/.gitignore
index efb277d347065..87fea161ba5ae 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,7 @@ bench_schnorr_verify
 bench_recover
 bench_internal
 tests
+exhaustive_tests
 gen_context
 *.exe
 *.so
diff --git a/.travis.yml b/.travis.yml
index 2c5c63adadcb1..24395292426d6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,7 +11,7 @@ cache:
   - src/java/guava/
 env:
   global:
-    - FIELD=auto  BIGNUM=auto  SCALAR=auto  ENDOMORPHISM=no  STATICPRECOMPUTATION=yes  ASM=no  BUILD=check  EXTRAFLAGS=  HOST=  ECDH=no  schnorr=no  RECOVERY=no  EXPERIMENTAL=no
+    - FIELD=auto  BIGNUM=auto  SCALAR=auto  ENDOMORPHISM=no  STATICPRECOMPUTATION=yes  ASM=no  BUILD=check  EXTRAFLAGS=  HOST=  ECDH=no  RECOVERY=no  EXPERIMENTAL=no
     - GUAVA_URL=https://search.maven.org/remotecontent?filepath=com/google/guava/guava/18.0/guava-18.0.jar GUAVA_JAR=src/java/guava/guava-18.0.jar
   matrix:
     - SCALAR=32bit    RECOVERY=yes
@@ -22,15 +22,14 @@ env:
     - FIELD=64bit     ENDOMORPHISM=yes  ECDH=yes EXPERIMENTAL=yes
     - FIELD=64bit                       ASM=x86_64
     - FIELD=64bit     ENDOMORPHISM=yes  ASM=x86_64
-    - FIELD=32bit     SCHNORR=yes EXPERIMENTAL=yes
     - FIELD=32bit     ENDOMORPHISM=yes
     - BIGNUM=no
-    - BIGNUM=no       ENDOMORPHISM=yes SCHNORR=yes  RECOVERY=yes EXPERIMENTAL=yes
+    - BIGNUM=no       ENDOMORPHISM=yes RECOVERY=yes EXPERIMENTAL=yes
     - BIGNUM=no       STATICPRECOMPUTATION=no
     - BUILD=distcheck
     - EXTRAFLAGS=CPPFLAGS=-DDETERMINISTIC
     - EXTRAFLAGS=CFLAGS=-O0
-    - BUILD=check-java ECDH=yes SCHNORR=yes EXPERIMENTAL=yes
+    - BUILD=check-java ECDH=yes EXPERIMENTAL=yes
 matrix:
   fast_finish: true
   include:
@@ -66,5 +65,5 @@ before_script: ./autogen.sh
 script:
  - if [ -n "$HOST" ]; then export USE_HOST="--host=$HOST"; fi
  - if [ "x$HOST" = "xi686-linux-gnu" ]; then export CC="$CC -m32"; fi
- - ./configure --enable-experimental=$EXPERIMENTAL --enable-endomorphism=$ENDOMORPHISM --with-field=$FIELD --with-bignum=$BIGNUM --with-scalar=$SCALAR --enable-ecmult-static-precomputation=$STATICPRECOMPUTATION --enable-module-ecdh=$ECDH --enable-module-schnorr=$SCHNORR --enable-module-recovery=$RECOVERY $EXTRAFLAGS $USE_HOST && make -j2 $BUILD
+ - ./configure --enable-experimental=$EXPERIMENTAL --enable-endomorphism=$ENDOMORPHISM --with-field=$FIELD --with-bignum=$BIGNUM --with-scalar=$SCALAR --enable-ecmult-static-precomputation=$STATICPRECOMPUTATION --enable-module-ecdh=$ECDH --enable-module-recovery=$RECOVERY $EXTRAFLAGS $USE_HOST && make -j2 $BUILD
 os: linux
diff --git a/Makefile.am b/Makefile.am
index 3d130bdcbd717..e5657f7f31307 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -12,9 +12,11 @@ noinst_HEADERS =
 noinst_HEADERS += src/scalar.h
 noinst_HEADERS += src/scalar_4x64.h
 noinst_HEADERS += src/scalar_8x32.h
+noinst_HEADERS += src/scalar_low.h
 noinst_HEADERS += src/scalar_impl.h
 noinst_HEADERS += src/scalar_4x64_impl.h
 noinst_HEADERS += src/scalar_8x32_impl.h
+noinst_HEADERS += src/scalar_low_impl.h
 noinst_HEADERS += src/group.h
 noinst_HEADERS += src/group_impl.h
 noinst_HEADERS += src/num_gmp.h
@@ -87,13 +89,23 @@ bench_internal_LDADD = $(SECP_LIBS) $(COMMON_LIB)
 bench_internal_CPPFLAGS = -DSECP256K1_BUILD $(SECP_INCLUDES)
 endif
 
+TESTS =
 if USE_TESTS
 noinst_PROGRAMS += tests
 tests_SOURCES = src/tests.c
 tests_CPPFLAGS = -DSECP256K1_BUILD -DVERIFY -I$(top_srcdir)/src -I$(top_srcdir)/include $(SECP_INCLUDES) $(SECP_TEST_INCLUDES)
 tests_LDADD = $(SECP_LIBS) $(SECP_TEST_LIBS) $(COMMON_LIB)
 tests_LDFLAGS = -static
-TESTS = tests
+TESTS += tests
+endif
+
+if USE_EXHAUSTIVE_TESTS
+noinst_PROGRAMS += exhaustive_tests
+exhaustive_tests_SOURCES = src/tests_exhaustive.c
+exhaustive_tests_CPPFLAGS = -DSECP256K1_BUILD -DVERIFY -I$(top_srcdir)/src $(SECP_INCLUDES)
+exhaustive_tests_LDADD = $(SECP_LIBS)
+exhaustive_tests_LDFLAGS = -static
+TESTS += exhaustive_tests
 endif
 
 JAVAROOT=src/java
@@ -154,10 +166,6 @@ if ENABLE_MODULE_ECDH
 include src/modules/ecdh/Makefile.am.include
 endif
 
-if ENABLE_MODULE_SCHNORR
-include src/modules/schnorr/Makefile.am.include
-endif
-
 if ENABLE_MODULE_RECOVERY
 include src/modules/recovery/Makefile.am.include
 endif
diff --git a/build-aux/m4/bitcoin_secp.m4 b/build-aux/m4/bitcoin_secp.m4
index b25d8adb92c7f..b74acb8c13882 100644
--- a/build-aux/m4/bitcoin_secp.m4
+++ b/build-aux/m4/bitcoin_secp.m4
@@ -46,6 +46,10 @@ if test x"$has_libcrypto" = x"yes" && test x"$has_openssl_ec" = x; then
     ECDSA_sign(0, NULL, 0, NULL, NULL, eckey);
     ECDSA_verify(0, NULL, 0, NULL, 0, eckey);
     EC_KEY_free(eckey);
+    ECDSA_SIG *sig_openssl;
+    sig_openssl = ECDSA_SIG_new();
+    (void)sig_openssl->r;
+    ECDSA_SIG_free(sig_openssl);
   ]])],[has_openssl_ec=yes],[has_openssl_ec=no])
   AC_MSG_RESULT([$has_openssl_ec])
 fi
diff --git a/configure.ac b/configure.ac
index 0743c36690c7a..ec50ffe3a251b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -104,6 +104,11 @@ AC_ARG_ENABLE(experimental,
     [use_experimental=$enableval],
     [use_experimental=no])
 
+AC_ARG_ENABLE(exhaustive_tests,
+    AS_HELP_STRING([--enable-exhaustive-tests],[compile exhaustive tests (default is yes)]),
+    [use_exhaustive_tests=$enableval],
+    [use_exhaustive_tests=yes])
+
 AC_ARG_ENABLE(endomorphism,
     AS_HELP_STRING([--enable-endomorphism],[enable endomorphism (default is no)]),
     [use_endomorphism=$enableval],
@@ -119,11 +124,6 @@ AC_ARG_ENABLE(module_ecdh,
     [enable_module_ecdh=$enableval],
     [enable_module_ecdh=no])
 
-AC_ARG_ENABLE(module_schnorr,
-    AS_HELP_STRING([--enable-module-schnorr],[enable Schnorr signature module (experimental)]),
-    [enable_module_schnorr=$enableval],
-    [enable_module_schnorr=no])
-
 AC_ARG_ENABLE(module_recovery,
     AS_HELP_STRING([--enable-module-recovery],[enable ECDSA pubkey recovery module (default is no)]),
     [enable_module_recovery=$enableval],
@@ -381,9 +381,6 @@ fi
 if test x"$use_jni" != x"no"; then
   AX_JNI_INCLUDE_DIR
   have_jni_dependencies=yes
-  if test x"$enable_module_schnorr" = x"no"; then
-    have_jni_dependencies=no
-  fi
   if test x"$enable_module_ecdh" = x"no"; then
     have_jni_dependencies=no
   fi
@@ -392,7 +389,7 @@ if test x"$use_jni" != x"no"; then
   fi
   if test "x$have_jni_dependencies" = "xno"; then
     if test x"$use_jni" = x"yes"; then
-      AC_MSG_ERROR([jni support explicitly requested but headers/dependencies were not found. Enable ECDH and Schnorr and try again.])
+      AC_MSG_ERROR([jni support explicitly requested but headers/dependencies were not found. Enable ECDH and try again.])
     fi
     AC_MSG_WARN([jni headers/dependencies not found. jni support disabled])
     use_jni=no
@@ -413,7 +410,7 @@ if test x"$use_endomorphism" = x"yes"; then
   AC_DEFINE(USE_ENDOMORPHISM, 1, [Define this symbol to use endomorphism optimization])
 fi
 
-if test x"$use_ecmult_static_precomputation" = x"yes"; then
+if test x"$set_precomp" = x"yes"; then
   AC_DEFINE(USE_ECMULT_STATIC_PRECOMPUTATION, 1, [Define this symbol to use a statically generated ecmult table])
 fi
 
@@ -421,10 +418,6 @@ if test x"$enable_module_ecdh" = x"yes"; then
   AC_DEFINE(ENABLE_MODULE_ECDH, 1, [Define this symbol to enable the ECDH module])
 fi
 
-if test x"$enable_module_schnorr" = x"yes"; then
-  AC_DEFINE(ENABLE_MODULE_SCHNORR, 1, [Define this symbol to enable the Schnorr signature module])
-fi
-
 if test x"$enable_module_recovery" = x"yes"; then
   AC_DEFINE(ENABLE_MODULE_RECOVERY, 1, [Define this symbol to enable the ECDSA pubkey recovery module])
 fi
@@ -442,7 +435,6 @@ AC_MSG_NOTICE([Using bignum implementation: $set_bignum])
 AC_MSG_NOTICE([Using scalar implementation: $set_scalar])
 AC_MSG_NOTICE([Using endomorphism optimizations: $use_endomorphism])
 AC_MSG_NOTICE([Building ECDH module: $enable_module_ecdh])
-AC_MSG_NOTICE([Building Schnorr signatures module: $enable_module_schnorr])
 AC_MSG_NOTICE([Building ECDSA pubkey recovery module: $enable_module_recovery])
 AC_MSG_NOTICE([Using jni: $use_jni])
 
@@ -451,12 +443,8 @@ if test x"$enable_experimental" = x"yes"; then
   AC_MSG_NOTICE([WARNING: experimental build])
   AC_MSG_NOTICE([Experimental features do not have stable APIs or properties, and may not be safe for production use.])
   AC_MSG_NOTICE([Building ECDH module: $enable_module_ecdh])
-  AC_MSG_NOTICE([Building Schnorr signatures module: $enable_module_schnorr])
   AC_MSG_NOTICE([******])
 else
-  if test x"$enable_module_schnorr" = x"yes"; then
-    AC_MSG_ERROR([Schnorr signature module is experimental. Use --enable-experimental to allow.])
-  fi
   if test x"$enable_module_ecdh" = x"yes"; then
     AC_MSG_ERROR([ECDH module is experimental. Use --enable-experimental to allow.])
   fi
@@ -473,10 +461,10 @@ AC_SUBST(SECP_LIBS)
 AC_SUBST(SECP_TEST_LIBS)
 AC_SUBST(SECP_TEST_INCLUDES)
 AM_CONDITIONAL([USE_TESTS], [test x"$use_tests" != x"no"])
+AM_CONDITIONAL([USE_EXHAUSTIVE_TESTS], [test x"$use_exhaustive_tests" != x"no"])
 AM_CONDITIONAL([USE_BENCHMARK], [test x"$use_benchmark" = x"yes"])
-AM_CONDITIONAL([USE_ECMULT_STATIC_PRECOMPUTATION], [test x"$use_ecmult_static_precomputation" = x"yes"])
+AM_CONDITIONAL([USE_ECMULT_STATIC_PRECOMPUTATION], [test x"$set_precomp" = x"yes"])
 AM_CONDITIONAL([ENABLE_MODULE_ECDH], [test x"$enable_module_ecdh" = x"yes"])
-AM_CONDITIONAL([ENABLE_MODULE_SCHNORR], [test x"$enable_module_schnorr" = x"yes"])
 AM_CONDITIONAL([ENABLE_MODULE_RECOVERY], [test x"$enable_module_recovery" = x"yes"])
 AM_CONDITIONAL([USE_JNI], [test x"$use_jni" == x"yes"])
 AM_CONDITIONAL([USE_EXTERNAL_ASM], [test x"$use_external_asm" = x"yes"])
diff --git a/include/secp256k1.h b/include/secp256k1.h
index 7145dbcc54a79..f268e309d0bf5 100644
--- a/include/secp256k1.h
+++ b/include/secp256k1.h
@@ -47,11 +47,8 @@ typedef struct secp256k1_context_struct secp256k1_context;
  *  The exact representation of data inside is implementation defined and not
  *  guaranteed to be portable between different platforms or versions. It is
  *  however guaranteed to be 64 bytes in size, and can be safely copied/moved.
- *  If you need to convert to a format suitable for storage or transmission, use
- *  secp256k1_ec_pubkey_serialize and secp256k1_ec_pubkey_parse.
- *
- *  Furthermore, it is guaranteed that identical public keys (ignoring
- *  compression) will have identical representation, so they can be memcmp'ed.
+ *  If you need to convert to a format suitable for storage, transmission, or
+ *  comparison, use secp256k1_ec_pubkey_serialize and secp256k1_ec_pubkey_parse.
  */
 typedef struct {
     unsigned char data[64];
@@ -62,12 +59,9 @@ typedef struct {
  *  The exact representation of data inside is implementation defined and not
  *  guaranteed to be portable between different platforms or versions. It is
  *  however guaranteed to be 64 bytes in size, and can be safely copied/moved.
- *  If you need to convert to a format suitable for storage or transmission, use
- *  the secp256k1_ecdsa_signature_serialize_* and
+ *  If you need to convert to a format suitable for storage, transmission, or
+ *  comparison, use the secp256k1_ecdsa_signature_serialize_* and
  *  secp256k1_ecdsa_signature_serialize_* functions.
- *
- *  Furthermore, it is guaranteed to identical signatures will have identical
- *  representation, so they can be memcmp'ed.
  */
 typedef struct {
     unsigned char data[64];
diff --git a/include/secp256k1_schnorr.h b/include/secp256k1_schnorr.h
deleted file mode 100644
index dc32fec1eac03..0000000000000
--- a/include/secp256k1_schnorr.h
+++ /dev/null
@@ -1,173 +0,0 @@
-#ifndef _SECP256K1_SCHNORR_
-# define _SECP256K1_SCHNORR_
-
-# include "secp256k1.h"
-
-# ifdef __cplusplus
-extern "C" {
-# endif
-
-/** Create a signature using a custom EC-Schnorr-SHA256 construction. It
- *  produces non-malleable 64-byte signatures which support public key recovery
- *  batch validation, and multiparty signing.
- *  Returns: 1: signature created
- *           0: the nonce generation function failed, or the private key was
- *              invalid.
- *  Args:    ctx:    pointer to a context object, initialized for signing
- *                   (cannot be NULL)
- *  Out:     sig64:  pointer to a 64-byte array where the signature will be
- *                   placed (cannot be NULL)
- *  In:      msg32:  the 32-byte message hash being signed (cannot be NULL)
- *           seckey: pointer to a 32-byte secret key (cannot be NULL)
- *           noncefp:pointer to a nonce generation function. If NULL,
- *                   secp256k1_nonce_function_default is used
- *           ndata:  pointer to arbitrary data used by the nonce generation
- *                   function (can be NULL)
- */
-SECP256K1_API int secp256k1_schnorr_sign(
-  const secp256k1_context* ctx,
-  unsigned char *sig64,
-  const unsigned char *msg32,
-  const unsigned char *seckey,
-  secp256k1_nonce_function noncefp,
-  const void *ndata
-) SECP256K1_ARG_NONNULL(1) SECP256K1_ARG_NONNULL(2) SECP256K1_ARG_NONNULL(3) SECP256K1_ARG_NONNULL(4);
-
-/** Verify a signature created by secp256k1_schnorr_sign.
- *  Returns: 1: correct signature
- *           0: incorrect signature
- *  Args:    ctx:       a secp256k1 context object, initialized for verification.
- *  In:      sig64:     the 64-byte signature being verified (cannot be NULL)
- *           msg32:     the 32-byte message hash being verified (cannot be NULL)
- *           pubkey:    the public key to verify with (cannot be NULL)
- */
-SECP256K1_API SECP256K1_WARN_UNUSED_RESULT int secp256k1_schnorr_verify(
-  const secp256k1_context* ctx,
-  const unsigned char *sig64,
-  const unsigned char *msg32,
-  const secp256k1_pubkey *pubkey
-) SECP256K1_ARG_NONNULL(1) SECP256K1_ARG_NONNULL(2) SECP256K1_ARG_NONNULL(3) SECP256K1_ARG_NONNULL(4);
-
-/** Recover an EC public key from a Schnorr signature created using
- *  secp256k1_schnorr_sign.
- *  Returns: 1: public key successfully recovered (which guarantees a correct
- *           signature).
- *           0: otherwise.
- *  Args:    ctx:        pointer to a context object, initialized for
- *                       verification (cannot be NULL)
- *  Out:     pubkey:     pointer to a pubkey to set to the recovered public key
- *                       (cannot be NULL).
- *  In:      sig64:      signature as 64 byte array (cannot be NULL)
- *           msg32:      the 32-byte message hash assumed to be signed (cannot
- *                       be NULL)
- */
-SECP256K1_API int secp256k1_schnorr_recover(
-  const secp256k1_context* ctx,
-  secp256k1_pubkey *pubkey,
-  const unsigned char *sig64,
-  const unsigned char *msg32
-) SECP256K1_ARG_NONNULL(1) SECP256K1_ARG_NONNULL(2) SECP256K1_ARG_NONNULL(3) SECP256K1_ARG_NONNULL(4);
-
-/** Generate a nonce pair deterministically for use with
- *  secp256k1_schnorr_partial_sign.
- *  Returns: 1: valid nonce pair was generated.
- *           0: otherwise (nonce generation function failed)
- *  Args:    ctx:         pointer to a context object, initialized for signing
- *                        (cannot be NULL)
- *  Out:     pubnonce:    public side of the nonce (cannot be NULL)
- *           privnonce32: private side of the nonce (32 byte) (cannot be NULL)
- *  In:      msg32:       the 32-byte message hash assumed to be signed (cannot
- *                        be NULL)
- *           sec32:       the 32-byte private key (cannot be NULL)
- *           noncefp:     pointer to a nonce generation function. If NULL,
- *                        secp256k1_nonce_function_default is used
- *           noncedata:   pointer to arbitrary data used by the nonce generation
- *                        function (can be NULL)
- *
- *  Do not use the output as a private/public key pair for signing/validation.
- */
-SECP256K1_API int secp256k1_schnorr_generate_nonce_pair(
-  const secp256k1_context* ctx,
-  secp256k1_pubkey *pubnonce,
-  unsigned char *privnonce32,
-  const unsigned char *msg32,
-  const unsigned char *sec32,
-  secp256k1_nonce_function noncefp,
-  const void* noncedata
-) SECP256K1_ARG_NONNULL(1) SECP256K1_ARG_NONNULL(2) SECP256K1_ARG_NONNULL(3);
-
-/** Produce a partial Schnorr signature, which can be combined using
- *  secp256k1_schnorr_partial_combine, to end up with a full signature that is
- *  verifiable using secp256k1_schnorr_verify.
- *  Returns: 1: signature created successfully.
- *           0: no valid signature exists with this combination of keys, nonces
- *              and message (chance around 1 in 2^128)
- *          -1: invalid private key, nonce, or public nonces.
- *  Args: ctx:             pointer to context object, initialized for signing (cannot
- *                         be NULL)
- *  Out:  sig64:           pointer to 64-byte array to put partial signature in
- *  In:   msg32:           pointer to 32-byte message to sign
- *        sec32:           pointer to 32-byte private key
- *        pubnonce_others: pointer to pubkey containing the sum of the other's
- *                         nonces (see secp256k1_ec_pubkey_combine)
- *        secnonce32:      pointer to 32-byte array containing our nonce
- *
- * The intended procedure for creating a multiparty signature is:
- * - Each signer S[i] with private key x[i] and public key Q[i] runs
- *   secp256k1_schnorr_generate_nonce_pair to produce a pair (k[i],R[i]) of
- *   private/public nonces.
- * - All signers communicate their public nonces to each other (revealing your
- *   private nonce can lead to discovery of your private key, so it should be
- *   considered secret).
- * - All signers combine all the public nonces they received (excluding their
- *   own) using secp256k1_ec_pubkey_combine to obtain an
- *   Rall[i] = sum(R[0..i-1,i+1..n]).
- * - All signers produce a partial signature using
- *   secp256k1_schnorr_partial_sign, passing in their own private key x[i],
- *   their own private nonce k[i], and the sum of the others' public nonces
- *   Rall[i].
- * - All signers communicate their partial signatures to each other.
- * - Someone combines all partial signatures using
- *   secp256k1_schnorr_partial_combine, to obtain a full signature.
- * - The resulting signature is validatable using secp256k1_schnorr_verify, with
- *   public key equal to the result of secp256k1_ec_pubkey_combine of the
- *   signers' public keys (sum(Q[0..n])).
- *
- *  Note that secp256k1_schnorr_partial_combine and secp256k1_ec_pubkey_combine
- *  function take their arguments in any order, and it is possible to
- *  pre-combine several inputs already with one call, and add more inputs later
- *  by calling the function again (they are commutative and associative).
- */
-SECP256K1_API SECP256K1_WARN_UNUSED_RESULT int secp256k1_schnorr_partial_sign(
-  const secp256k1_context* ctx,
-  unsigned char *sig64,
-  const unsigned char *msg32,
-  const unsigned char *sec32,
-  const secp256k1_pubkey *pubnonce_others,
-  const unsigned char *secnonce32
-) SECP256K1_ARG_NONNULL(1) SECP256K1_ARG_NONNULL(2) SECP256K1_ARG_NONNULL(3) SECP256K1_ARG_NONNULL(4) SECP256K1_ARG_NONNULL(5) SECP256K1_ARG_NONNULL(6);
-
-/** Combine multiple Schnorr partial signatures.
- * Returns: 1: the passed signatures were successfully combined.
- *          0: the resulting signature is not valid (chance of 1 in 2^256)
- *         -1: some inputs were invalid, or the signatures were not created
- *             using the same set of nonces
- * Args:   ctx:      pointer to a context object
- * Out:    sig64:    pointer to a 64-byte array to place the combined signature
- *                   (cannot be NULL)
- * In:     sig64sin: pointer to an array of n pointers to 64-byte input
- *                   signatures
- *         n:        the number of signatures to combine (at least 1)
- */
-SECP256K1_API SECP256K1_WARN_UNUSED_RESULT int secp256k1_schnorr_partial_combine(
-  const secp256k1_context* ctx,
-  unsigned char *sig64,
-  const unsigned char * const * sig64sin,
-  size_t n
-) SECP256K1_ARG_NONNULL(2) SECP256K1_ARG_NONNULL(3);
-
-# ifdef __cplusplus
-}
-# endif
-
-#endif
diff --git a/src/ecdsa_impl.h b/src/ecdsa_impl.h
index d110b4bb1dcf3..9a42e519bd580 100644
--- a/src/ecdsa_impl.h
+++ b/src/ecdsa_impl.h
@@ -203,7 +203,9 @@ static int secp256k1_ecdsa_sig_serialize(unsigned char *sig, size_t *size, const
 static int secp256k1_ecdsa_sig_verify(const secp256k1_ecmult_context *ctx, const secp256k1_scalar *sigr, const secp256k1_scalar *sigs, const secp256k1_ge *pubkey, const secp256k1_scalar *message) {
     unsigned char c[32];
     secp256k1_scalar sn, u1, u2;
+#if !defined(EXHAUSTIVE_TEST_ORDER)
     secp256k1_fe xr;
+#endif
     secp256k1_gej pubkeyj;
     secp256k1_gej pr;
 
@@ -219,6 +221,21 @@ static int secp256k1_ecdsa_sig_verify(const secp256k1_ecmult_context *ctx, const
     if (secp256k1_gej_is_infinity(&pr)) {
         return 0;
     }
+
+#if defined(EXHAUSTIVE_TEST_ORDER)
+{
+    secp256k1_scalar computed_r;
+    int overflow = 0;
+    secp256k1_ge pr_ge;
+    secp256k1_ge_set_gej(&pr_ge, &pr);
+    secp256k1_fe_normalize(&pr_ge.x);
+
+    secp256k1_fe_get_b32(c, &pr_ge.x);
+    secp256k1_scalar_set_b32(&computed_r, c, &overflow);
+    /* we fully expect overflow */
+    return secp256k1_scalar_eq(sigr, &computed_r);
+}
+#else
     secp256k1_scalar_get_b32(c, sigr);
     secp256k1_fe_set_b32(&xr, c);
 
@@ -252,6 +269,7 @@ static int secp256k1_ecdsa_sig_verify(const secp256k1_ecmult_context *ctx, const
         return 1;
     }
     return 0;
+#endif
 }
 
 static int secp256k1_ecdsa_sig_sign(const secp256k1_ecmult_gen_context *ctx, secp256k1_scalar *sigr, secp256k1_scalar *sigs, const secp256k1_scalar *seckey, const secp256k1_scalar *message, const secp256k1_scalar *nonce, int *recid) {
diff --git a/src/ecmult_const_impl.h b/src/ecmult_const_impl.h
index 7a6a25318c4cf..0db314c48e0cd 100644
--- a/src/ecmult_const_impl.h
+++ b/src/ecmult_const_impl.h
@@ -78,7 +78,7 @@ static int secp256k1_wnaf_const(int *wnaf, secp256k1_scalar s, int w) {
     /* Negative numbers will be negated to keep their bit representation below the maximum width */
     flip = secp256k1_scalar_is_high(&s);
     /* We add 1 to even numbers, 2 to odd ones, noting that negation flips parity */
-    bit = flip ^ (s.d[0] & 1);
+    bit = flip ^ !secp256k1_scalar_is_even(&s);
     /* We check for negative one, since adding 2 to it will cause an overflow */
     secp256k1_scalar_negate(&neg_s, &s);
     not_neg_one = !secp256k1_scalar_is_one(&neg_s);
diff --git a/src/ecmult_gen_impl.h b/src/ecmult_gen_impl.h
index b63c4d8662c70..35f25460773f3 100644
--- a/src/ecmult_gen_impl.h
+++ b/src/ecmult_gen_impl.h
@@ -77,7 +77,7 @@ static void secp256k1_ecmult_gen_context_build(secp256k1_ecmult_gen_context *ctx
                 secp256k1_gej_add_var(&numsbase, &numsbase, &nums_gej, NULL);
             }
         }
-        secp256k1_ge_set_all_gej_var(1024, prec, precj, cb);
+        secp256k1_ge_set_all_gej_var(prec, precj, 1024, cb);
     }
     for (j = 0; j < 64; j++) {
         for (i = 0; i < 16; i++) {
diff --git a/src/ecmult_impl.h b/src/ecmult_impl.h
index 81ae08e100b6b..4e40104ad43ce 100644
--- a/src/ecmult_impl.h
+++ b/src/ecmult_impl.h
@@ -7,15 +7,29 @@
 #ifndef _SECP256K1_ECMULT_IMPL_H_
 #define _SECP256K1_ECMULT_IMPL_H_
 
+#include <string.h>
+
 #include "group.h"
 #include "scalar.h"
 #include "ecmult.h"
 
-#include <string.h>
-
+#if defined(EXHAUSTIVE_TEST_ORDER)
+/* We need to lower these values for exhaustive tests because
+ * the tables cannot have infinities in them (this breaks the
+ * affine-isomorphism stuff which tracks z-ratios) */
+#  if EXHAUSTIVE_TEST_ORDER > 128
+#    define WINDOW_A 5
+#    define WINDOW_G 8
+#  elif EXHAUSTIVE_TEST_ORDER > 8
+#    define WINDOW_A 4
+#    define WINDOW_G 4
+#  else
+#    define WINDOW_A 2
+#    define WINDOW_G 2
+#  endif
+#else
 /* optimal for 128-bit and 256-bit exponents. */
 #define WINDOW_A 5
-
 /** larger numbers may result in slightly better performance, at the cost of
     exponentially larger precomputed tables. */
 #ifdef USE_ENDOMORPHISM
@@ -25,6 +39,7 @@
 /** One table for window size 16: 1.375 MiB. */
 #define WINDOW_G 16
 #endif
+#endif
 
 /** The number of entries a table with precomputed multiples needs to have. */
 #define ECMULT_TABLE_SIZE(w) (1 << ((w)-2))
@@ -103,7 +118,7 @@ static void secp256k1_ecmult_odd_multiples_table_storage_var(int n, secp256k1_ge
     /* Compute the odd multiples in Jacobian form. */
     secp256k1_ecmult_odd_multiples_table(n, prej, zr, a);
     /* Convert them in batch to affine coordinates. */
-    secp256k1_ge_set_table_gej_var(n, prea, prej, zr);
+    secp256k1_ge_set_table_gej_var(prea, prej, zr, n);
     /* Convert them to compact storage form. */
     for (i = 0; i < n; i++) {
         secp256k1_ge_to_storage(&pre[i], &prea[i]);
diff --git a/src/field.h b/src/field.h
index c5ba074244e6a..bbb1ee866cc42 100644
--- a/src/field.h
+++ b/src/field.h
@@ -30,6 +30,8 @@
 #error "Please select field implementation"
 #endif
 
+#include "util.h"
+
 /** Normalize a field element. */
 static void secp256k1_fe_normalize(secp256k1_fe *r);
 
@@ -50,6 +52,9 @@ static int secp256k1_fe_normalizes_to_zero_var(secp256k1_fe *r);
 /** Set a field element equal to a small integer. Resulting field element is normalized. */
 static void secp256k1_fe_set_int(secp256k1_fe *r, int a);
 
+/** Sets a field element equal to zero, initializing all fields. */
+static void secp256k1_fe_clear(secp256k1_fe *a);
+
 /** Verify whether a field element is zero. Requires the input to be normalized. */
 static int secp256k1_fe_is_zero(const secp256k1_fe *a);
 
@@ -110,7 +115,7 @@ static void secp256k1_fe_inv_var(secp256k1_fe *r, const secp256k1_fe *a);
 /** Calculate the (modular) inverses of a batch of field elements. Requires the inputs' magnitudes to be
  *  at most 8. The output magnitudes are 1 (but not guaranteed to be normalized). The inputs and
  *  outputs must not overlap in memory. */
-static void secp256k1_fe_inv_all_var(size_t len, secp256k1_fe *r, const secp256k1_fe *a);
+static void secp256k1_fe_inv_all_var(secp256k1_fe *r, const secp256k1_fe *a, size_t len);
 
 /** Convert a field element to the storage type. */
 static void secp256k1_fe_to_storage(secp256k1_fe_storage *r, const secp256k1_fe *a);
diff --git a/src/field_impl.h b/src/field_impl.h
index 52cd902eb3873..5127b279bc7f5 100644
--- a/src/field_impl.h
+++ b/src/field_impl.h
@@ -260,7 +260,7 @@ static void secp256k1_fe_inv_var(secp256k1_fe *r, const secp256k1_fe *a) {
 #endif
 }
 
-static void secp256k1_fe_inv_all_var(size_t len, secp256k1_fe *r, const secp256k1_fe *a) {
+static void secp256k1_fe_inv_all_var(secp256k1_fe *r, const secp256k1_fe *a, size_t len) {
     secp256k1_fe u;
     size_t i;
     if (len < 1) {
diff --git a/src/group.h b/src/group.h
index d5157167447a7..4957b248fe6a6 100644
--- a/src/group.h
+++ b/src/group.h
@@ -65,12 +65,12 @@ static void secp256k1_ge_neg(secp256k1_ge *r, const secp256k1_ge *a);
 static void secp256k1_ge_set_gej(secp256k1_ge *r, secp256k1_gej *a);
 
 /** Set a batch of group elements equal to the inputs given in jacobian coordinates */
-static void secp256k1_ge_set_all_gej_var(size_t len, secp256k1_ge *r, const secp256k1_gej *a, const secp256k1_callback *cb);
+static void secp256k1_ge_set_all_gej_var(secp256k1_ge *r, const secp256k1_gej *a, size_t len, const secp256k1_callback *cb);
 
 /** Set a batch of group elements equal to the inputs given in jacobian
  *  coordinates (with known z-ratios). zr must contain the known z-ratios such
  *  that mul(a[i].z, zr[i+1]) == a[i+1].z. zr[0] is ignored. */
-static void secp256k1_ge_set_table_gej_var(size_t len, secp256k1_ge *r, const secp256k1_gej *a, const secp256k1_fe *zr);
+static void secp256k1_ge_set_table_gej_var(secp256k1_ge *r, const secp256k1_gej *a, const secp256k1_fe *zr, size_t len);
 
 /** Bring a batch inputs given in jacobian coordinates (with known z-ratios) to
  *  the same global z "denominator". zr must contain the known z-ratios such
diff --git a/src/group_impl.h b/src/group_impl.h
index 3e9c4c410d413..2e192b62fd2ce 100644
--- a/src/group_impl.h
+++ b/src/group_impl.h
@@ -11,6 +11,53 @@
 #include "field.h"
 #include "group.h"
 
+/* These points can be generated in sage as follows:
+ *
+ * 0. Setup a worksheet with the following parameters.
+ *   b = 4  # whatever CURVE_B will be set to
+ *   F = FiniteField (0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFC2F)
+ *   C = EllipticCurve ([F (0), F (b)])
+ *
+ * 1. Determine all the small orders available to you. (If there are
+ *    no satisfactory ones, go back and change b.)
+ *   print C.order().factor(limit=1000)
+ *
+ * 2. Choose an order as one of the prime factors listed in the above step.
+ *    (You can also multiply some to get a composite order, though the
+ *    tests will crash trying to invert scalars during signing.) We take a
+ *    random point and scale it to drop its order to the desired value.
+ *    There is some probability this won't work; just try again.
+ *   order = 199
+ *   P = C.random_point()
+ *   P = (int(P.order()) / int(order)) * P
+ *   assert(P.order() == order)
+ *
+ * 3. Print the values. You'll need to use a vim macro or something to
+ *    split the hex output into 4-byte chunks.
+ *   print "%x %x" % P.xy()
+ */
+#if defined(EXHAUSTIVE_TEST_ORDER)
+#  if EXHAUSTIVE_TEST_ORDER == 199
+const secp256k1_ge secp256k1_ge_const_g = SECP256K1_GE_CONST(
+    0xFA7CC9A7, 0x0737F2DB, 0xA749DD39, 0x2B4FB069,
+    0x3B017A7D, 0xA808C2F1, 0xFB12940C, 0x9EA66C18,
+    0x78AC123A, 0x5ED8AEF3, 0x8732BC91, 0x1F3A2868,
+    0x48DF246C, 0x808DAE72, 0xCFE52572, 0x7F0501ED
+);
+
+const int CURVE_B = 4;
+#  elif EXHAUSTIVE_TEST_ORDER == 13
+const secp256k1_ge secp256k1_ge_const_g = SECP256K1_GE_CONST(
+    0xedc60018, 0xa51a786b, 0x2ea91f4d, 0x4c9416c0,
+    0x9de54c3b, 0xa1316554, 0x6cf4345c, 0x7277ef15,
+    0x54cb1b6b, 0xdc8c1273, 0x087844ea, 0x43f4603e,
+    0x0eaf9a43, 0xf6effe55, 0x939f806d, 0x37adf8ac
+);
+const int CURVE_B = 2;
+#  else
+#    error No known generator for the specified exhaustive test group order.
+#  endif
+#else
 /** Generator for secp256k1, value 'g' defined in
  *  "Standards for Efficient Cryptography" (SEC2) 2.7.1.
  */
@@ -21,8 +68,11 @@ static const secp256k1_ge secp256k1_ge_const_g = SECP256K1_GE_CONST(
     0xFD17B448UL, 0xA6855419UL, 0x9C47D08FUL, 0xFB10D4B8UL
 );
 
+const int CURVE_B = 7;
+#endif
+
 static void secp256k1_ge_set_gej_zinv(secp256k1_ge *r, const secp256k1_gej *a, const secp256k1_fe *zi) {
-    secp256k1_fe zi2; 
+    secp256k1_fe zi2;
     secp256k1_fe zi3;
     secp256k1_fe_sqr(&zi2, zi);
     secp256k1_fe_mul(&zi3, &zi2, zi);
@@ -76,7 +126,7 @@ static void secp256k1_ge_set_gej_var(secp256k1_ge *r, secp256k1_gej *a) {
     r->y = a->y;
 }
 
-static void secp256k1_ge_set_all_gej_var(size_t len, secp256k1_ge *r, const secp256k1_gej *a, const secp256k1_callback *cb) {
+static void secp256k1_ge_set_all_gej_var(secp256k1_ge *r, const secp256k1_gej *a, size_t len, const secp256k1_callback *cb) {
     secp256k1_fe *az;
     secp256k1_fe *azi;
     size_t i;
@@ -89,7 +139,7 @@ static void secp256k1_ge_set_all_gej_var(size_t len, secp256k1_ge *r, const secp
     }
 
     azi = (secp256k1_fe *)checked_malloc(cb, sizeof(secp256k1_fe) * count);
-    secp256k1_fe_inv_all_var(count, azi, az);
+    secp256k1_fe_inv_all_var(azi, az, count);
     free(az);
 
     count = 0;
@@ -102,7 +152,7 @@ static void secp256k1_ge_set_all_gej_var(size_t len, secp256k1_ge *r, const secp
     free(azi);
 }
 
-static void secp256k1_ge_set_table_gej_var(size_t len, secp256k1_ge *r, const secp256k1_gej *a, const secp256k1_fe *zr) {
+static void secp256k1_ge_set_table_gej_var(secp256k1_ge *r, const secp256k1_gej *a, const secp256k1_fe *zr, size_t len) {
     size_t i = len - 1;
     secp256k1_fe zi;
 
@@ -145,9 +195,15 @@ static void secp256k1_ge_globalz_set_table_gej(size_t len, secp256k1_ge *r, secp
 
 static void secp256k1_gej_set_infinity(secp256k1_gej *r) {
     r->infinity = 1;
-    secp256k1_fe_set_int(&r->x, 0);
-    secp256k1_fe_set_int(&r->y, 0);
-    secp256k1_fe_set_int(&r->z, 0);
+    secp256k1_fe_clear(&r->x);
+    secp256k1_fe_clear(&r->y);
+    secp256k1_fe_clear(&r->z);
+}
+
+static void secp256k1_ge_set_infinity(secp256k1_ge *r) {
+    r->infinity = 1;
+    secp256k1_fe_clear(&r->x);
+    secp256k1_fe_clear(&r->y);
 }
 
 static void secp256k1_gej_clear(secp256k1_gej *r) {
@@ -169,7 +225,7 @@ static int secp256k1_ge_set_xquad(secp256k1_ge *r, const secp256k1_fe *x) {
     secp256k1_fe_sqr(&x2, x);
     secp256k1_fe_mul(&x3, x, &x2);
     r->infinity = 0;
-    secp256k1_fe_set_int(&c, 7);
+    secp256k1_fe_set_int(&c, CURVE_B);
     secp256k1_fe_add(&c, &x3);
     return secp256k1_fe_sqrt(&r->y, &c);
 }
@@ -228,7 +284,7 @@ static int secp256k1_gej_is_valid_var(const secp256k1_gej *a) {
     secp256k1_fe_sqr(&x3, &a->x); secp256k1_fe_mul(&x3, &x3, &a->x);
     secp256k1_fe_sqr(&z2, &a->z);
     secp256k1_fe_sqr(&z6, &z2); secp256k1_fe_mul(&z6, &z6, &z2);
-    secp256k1_fe_mul_int(&z6, 7);
+    secp256k1_fe_mul_int(&z6, CURVE_B);
     secp256k1_fe_add(&x3, &z6);
     secp256k1_fe_normalize_weak(&x3);
     return secp256k1_fe_equal_var(&y2, &x3);
@@ -242,7 +298,7 @@ static int secp256k1_ge_is_valid_var(const secp256k1_ge *a) {
     /* y^2 = x^3 + 7 */
     secp256k1_fe_sqr(&y2, &a->y);
     secp256k1_fe_sqr(&x3, &a->x); secp256k1_fe_mul(&x3, &x3, &a->x);
-    secp256k1_fe_set_int(&c, 7);
+    secp256k1_fe_set_int(&c, CURVE_B);
     secp256k1_fe_add(&x3, &c);
     secp256k1_fe_normalize_weak(&x3);
     return secp256k1_fe_equal_var(&y2, &x3);
@@ -260,7 +316,7 @@ static void secp256k1_gej_double_var(secp256k1_gej *r, const secp256k1_gej *a, s
     /** For secp256k1, 2Q is infinity if and only if Q is infinity. This is because if 2Q = infinity,
      *  Q must equal -Q, or that Q.y == -(Q.y), or Q.y is 0. For a point on y^2 = x^3 + 7 to have
      *  y=0, x^3 must be -7 mod p. However, -7 has no cube root mod p.
-     *  
+     *
      *  Having said this, if this function receives a point on a sextic twist, e.g. by
      *  a fault attack, it is possible for y to be 0. This happens for y^2 = x^3 + 6,
      *  since -6 does have a cube root mod p. For this point, this function will not set
diff --git a/src/java/org/bitcoin/NativeSecp256k1.java b/src/java/org/bitcoin/NativeSecp256k1.java
index be67048fbed69..1c67802fba82e 100644
--- a/src/java/org/bitcoin/NativeSecp256k1.java
+++ b/src/java/org/bitcoin/NativeSecp256k1.java
@@ -32,7 +32,7 @@
  * <p>You can find an example library that can be used for this at https://github.com/bitcoin/secp256k1</p>
  *
  * <p>To build secp256k1 for use with bitcoinj, run
- * `./configure --enable-jni --enable-experimental --enable-module-schnorr --enable-module-ecdh`
+ * `./configure --enable-jni --enable-experimental --enable-module-ecdh`
  * and `make` then copy `.libs/libsecp256k1.so` to your system library path
  * or point the JVM to the folder containing it with -Djava.library.path
  * </p>
@@ -417,36 +417,6 @@ public static synchronized boolean randomize(byte[] seed) throws AssertFailExcep
         }
     }
 
-    public static byte[] schnorrSign(byte[] data, byte[] sec) throws AssertFailException {
-        Preconditions.checkArgument(data.length == 32 && sec.length <= 32);
-
-        ByteBuffer byteBuff = nativeECDSABuffer.get();
-        if (byteBuff == null) {
-            byteBuff = ByteBuffer.allocateDirect(32 + 32);
-            byteBuff.order(ByteOrder.nativeOrder());
-            nativeECDSABuffer.set(byteBuff);
-        }
-        byteBuff.rewind();
-        byteBuff.put(data);
-        byteBuff.put(sec);
-
-        byte[][] retByteArray;
-
-        r.lock();
-        try {
-          retByteArray = secp256k1_schnorr_sign(byteBuff, Secp256k1Context.getContext());
-        } finally {
-          r.unlock();
-        }
-
-        byte[] sigArr = retByteArray[0];
-        int retVal = new BigInteger(new byte[] { retByteArray[1][0] }).intValue();
-
-        assertEquals(sigArr.length, 64, "Got bad signature length.");
-
-        return retVal == 0 ? new byte[0] : sigArr;
-    }
-
     private static native long secp256k1_ctx_clone(long context);
 
     private static native int secp256k1_context_randomize(ByteBuffer byteBuff, long context);
@@ -471,8 +441,6 @@ public static byte[] schnorrSign(byte[] data, byte[] sec) throws AssertFailExcep
 
     private static native byte[][] secp256k1_ec_pubkey_parse(ByteBuffer byteBuff, long context, int inputLen);
 
-    private static native byte[][] secp256k1_schnorr_sign(ByteBuffer byteBuff, long context);
-
     private static native byte[][] secp256k1_ecdh(ByteBuffer byteBuff, long context, int inputLen);
 
 }
diff --git a/src/java/org/bitcoin/NativeSecp256k1Test.java b/src/java/org/bitcoin/NativeSecp256k1Test.java
index f18ce95810d13..c00d08899b9b0 100644
--- a/src/java/org/bitcoin/NativeSecp256k1Test.java
+++ b/src/java/org/bitcoin/NativeSecp256k1Test.java
@@ -167,22 +167,6 @@ public static void testRandomize() throws AssertFailException {
         assertEquals( result, true, "testRandomize");
     }
 
-    /**
-      * This tests signSchnorr() for a valid secretkey
-      */
-    public static void testSchnorrSign() throws AssertFailException{
-
-        byte[] data = BaseEncoding.base16().lowerCase().decode("CF80CD8AED482D5D1527D7DC72FCEFF84E6326592848447D2DC0B0E87DFC9A90".toLowerCase()); //sha256hash of "testing"
-        byte[] sec = BaseEncoding.base16().lowerCase().decode("67E56582298859DDAE725F972992A07C6C4FB9F62A8FFF58CE3CA926A1063530".toLowerCase());
-
-        byte[] resultArr = NativeSecp256k1.schnorrSign(data, sec);
-        String sigString = javax.xml.bind.DatatypeConverter.printHexBinary(resultArr);
-        assertEquals( sigString, "C5E929AA058B982048760422D3B563749B7D0E50C5EBD8CD2FFC23214BD6A2F1B072C13880997EBA847CF20F2F90FCE07C1CA33A890A4127095A351127F8D95F" , "testSchnorrSign");
-    }
-
-    /**
-      * This tests signSchnorr() for a valid secretkey
-      */
     public static void testCreateECDHSecret() throws AssertFailException{
 
         byte[] sec = BaseEncoding.base16().lowerCase().decode("67E56582298859DDAE725F972992A07C6C4FB9F62A8FFF58CE3CA926A1063530".toLowerCase());
@@ -216,11 +200,6 @@ public static void main(String[] args) throws AssertFailException{
         testSignPos();
         testSignNeg();
 
-        //Test Schnorr (partial support) //TODO
-        testSchnorrSign();
-        //testSchnorrVerify
-        //testSchnorrRecovery
-
         //Test privKeyTweakAdd() 1
         testPrivKeyTweakAdd_1();
 
diff --git a/src/java/org_bitcoin_NativeSecp256k1.c b/src/java/org_bitcoin_NativeSecp256k1.c
index dba9524dd4cc2..bcef7b32ce3e7 100644
--- a/src/java/org_bitcoin_NativeSecp256k1.c
+++ b/src/java/org_bitcoin_NativeSecp256k1.c
@@ -5,7 +5,6 @@
 #include "include/secp256k1.h"
 #include "include/secp256k1_ecdh.h"
 #include "include/secp256k1_recovery.h"
-#include "include/secp256k1_schnorr.h"
 
 
 SECP256K1_API jlong JNICALL Java_org_bitcoin_NativeSecp256k1_secp256k1_1ctx_1clone
@@ -333,39 +332,6 @@ SECP256K1_API jlong JNICALL Java_org_bitcoin_NativeSecp256k1_secp256k1_1ecdsa_1p
   return 0;
 }
 
-SECP256K1_API jobjectArray JNICALL Java_org_bitcoin_NativeSecp256k1_secp256k1_1schnorr_1sign
-  (JNIEnv* env, jclass classObject, jobject byteBufferObject, jlong ctx_l)
-{
-  secp256k1_context *ctx = (secp256k1_context*)(uintptr_t)ctx_l;
-  unsigned char* data = (unsigned char*) (*env)->GetDirectBufferAddress(env, byteBufferObject);
-  unsigned char* secKey = (unsigned char*) (data + 32);
-
-  jobjectArray retArray;
-  jbyteArray sigArray, intsByteArray;
-  unsigned char intsarray[1];
-  unsigned char sig[64];
-
-  int ret = secp256k1_schnorr_sign(ctx, sig, data, secKey, NULL, NULL);
-
-  intsarray[0] = ret;
-
-  retArray = (*env)->NewObjectArray(env, 2,
-    (*env)->FindClass(env, "[B"),
-    (*env)->NewByteArray(env, 1));
-
-  sigArray = (*env)->NewByteArray(env, 64);
-  (*env)->SetByteArrayRegion(env, sigArray, 0, 64, (jbyte*)sig);
-  (*env)->SetObjectArrayElement(env, retArray, 0, sigArray);
-
-  intsByteArray = (*env)->NewByteArray(env, 1);
-  (*env)->SetByteArrayRegion(env, intsByteArray, 0, 1, (jbyte*)intsarray);
-  (*env)->SetObjectArrayElement(env, retArray, 1, intsByteArray);
-
-  (void)classObject;
-
-  return retArray;
-}
-
 SECP256K1_API jobjectArray JNICALL Java_org_bitcoin_NativeSecp256k1_secp256k1_1ecdh
   (JNIEnv* env, jclass classObject, jobject byteBufferObject, jlong ctx_l, jint publen)
 {
diff --git a/src/java/org_bitcoin_NativeSecp256k1.h b/src/java/org_bitcoin_NativeSecp256k1.h
index 4125a1f5233be..fe613c9e9e77e 100644
--- a/src/java/org_bitcoin_NativeSecp256k1.h
+++ b/src/java/org_bitcoin_NativeSecp256k1.h
@@ -104,14 +104,6 @@ SECP256K1_API jobjectArray JNICALL Java_org_bitcoin_NativeSecp256k1_secp256k1_1e
 SECP256K1_API jobjectArray JNICALL Java_org_bitcoin_NativeSecp256k1_secp256k1_1ec_1pubkey_1parse
   (JNIEnv *, jclass, jobject, jlong, jint);
 
-/*
- * Class:     org_bitcoin_NativeSecp256k1
- * Method:    secp256k1_schnorr_sign
- * Signature: (Ljava/nio/ByteBuffer;JI)[[B
- */
-SECP256K1_API jobjectArray JNICALL Java_org_bitcoin_NativeSecp256k1_secp256k1_1schnorr_1sign
-  (JNIEnv* env, jclass classObject, jobject byteBufferObject, jlong ctx_l);
-
 /*
  * Class:     org_bitcoin_NativeSecp256k1
  * Method:    secp256k1_ecdh
diff --git a/src/modules/recovery/main_impl.h b/src/modules/recovery/main_impl.h
old mode 100644
new mode 100755
index ec42f4bb6cd88..86f2f0cb2b533
--- a/src/modules/recovery/main_impl.h
+++ b/src/modules/recovery/main_impl.h
@@ -138,16 +138,15 @@ int secp256k1_ecdsa_sign_recoverable(const secp256k1_context* ctx, secp256k1_ecd
     secp256k1_scalar_set_b32(&sec, seckey, &overflow);
     /* Fail if the secret key is invalid. */
     if (!overflow && !secp256k1_scalar_is_zero(&sec)) {
+        unsigned char nonce32[32];
         unsigned int count = 0;
         secp256k1_scalar_set_b32(&msg, msg32, NULL);
         while (1) {
-            unsigned char nonce32[32];
             ret = noncefp(nonce32, msg32, seckey, NULL, (void*)noncedata, count);
             if (!ret) {
                 break;
             }
             secp256k1_scalar_set_b32(&non, nonce32, &overflow);
-            memset(nonce32, 0, 32);
             if (!secp256k1_scalar_is_zero(&non) && !overflow) {
                 if (secp256k1_ecdsa_sig_sign(&ctx->ecmult_gen_ctx, &r, &s, &sec, &msg, &non, &recid)) {
                     break;
@@ -155,6 +154,7 @@ int secp256k1_ecdsa_sign_recoverable(const secp256k1_context* ctx, secp256k1_ecd
             }
             count++;
         }
+        memset(nonce32, 0, 32);
         secp256k1_scalar_clear(&msg);
         secp256k1_scalar_clear(&non);
         secp256k1_scalar_clear(&sec);
diff --git a/src/modules/schnorr/Makefile.am.include b/src/modules/schnorr/Makefile.am.include
deleted file mode 100644
index f1af8e83255fd..0000000000000
--- a/src/modules/schnorr/Makefile.am.include
+++ /dev/null
@@ -1,10 +0,0 @@
-include_HEADERS += include/secp256k1_schnorr.h
-noinst_HEADERS += src/modules/schnorr/main_impl.h
-noinst_HEADERS += src/modules/schnorr/schnorr.h
-noinst_HEADERS += src/modules/schnorr/schnorr_impl.h
-noinst_HEADERS += src/modules/schnorr/tests_impl.h
-if USE_BENCHMARK
-noinst_PROGRAMS += bench_schnorr_verify
-bench_schnorr_verify_SOURCES = src/bench_schnorr_verify.c
-bench_schnorr_verify_LDADD = libsecp256k1.la $(SECP_LIBS) $(COMMON_LIB)
-endif
diff --git a/src/modules/schnorr/main_impl.h b/src/modules/schnorr/main_impl.h
deleted file mode 100644
index fa176a1767f5f..0000000000000
--- a/src/modules/schnorr/main_impl.h
+++ /dev/null
@@ -1,164 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2014-2015 Pieter Wuille                              *
- * Distributed under the MIT software license, see the accompanying   *
- * file COPYING or http://www.opensource.org/licenses/mit-license.php.*
- **********************************************************************/
-
-#ifndef SECP256K1_MODULE_SCHNORR_MAIN
-#define SECP256K1_MODULE_SCHNORR_MAIN
-
-#include "include/secp256k1_schnorr.h"
-#include "modules/schnorr/schnorr_impl.h"
-
-static void secp256k1_schnorr_msghash_sha256(unsigned char *h32, const unsigned char *r32, const unsigned char *msg32) {
-    secp256k1_sha256_t sha;
-    secp256k1_sha256_initialize(&sha);
-    secp256k1_sha256_write(&sha, r32, 32);
-    secp256k1_sha256_write(&sha, msg32, 32);
-    secp256k1_sha256_finalize(&sha, h32);
-}
-
-static const unsigned char secp256k1_schnorr_algo16[17] = "Schnorr+SHA256  ";
-
-int secp256k1_schnorr_sign(const secp256k1_context* ctx, unsigned char *sig64, const unsigned char *msg32, const unsigned char *seckey, secp256k1_nonce_function noncefp, const void* noncedata) {
-    secp256k1_scalar sec, non;
-    int ret = 0;
-    int overflow = 0;
-    unsigned int count = 0;
-    VERIFY_CHECK(ctx != NULL);
-    ARG_CHECK(secp256k1_ecmult_gen_context_is_built(&ctx->ecmult_gen_ctx));
-    ARG_CHECK(msg32 != NULL);
-    ARG_CHECK(sig64 != NULL);
-    ARG_CHECK(seckey != NULL);
-    if (noncefp == NULL) {
-        noncefp = secp256k1_nonce_function_default;
-    }
-
-    secp256k1_scalar_set_b32(&sec, seckey, NULL);
-    while (1) {
-        unsigned char nonce32[32];
-        ret = noncefp(nonce32, msg32, seckey, secp256k1_schnorr_algo16, (void*)noncedata, count);
-        if (!ret) {
-            break;
-        }
-        secp256k1_scalar_set_b32(&non, nonce32, &overflow);
-        memset(nonce32, 0, 32);
-        if (!secp256k1_scalar_is_zero(&non) && !overflow) {
-            if (secp256k1_schnorr_sig_sign(&ctx->ecmult_gen_ctx, sig64, &sec, &non, NULL, secp256k1_schnorr_msghash_sha256, msg32)) {
-                break;
-            }
-        }
-        count++;
-    }
-    if (!ret) {
-        memset(sig64, 0, 64);
-    }
-    secp256k1_scalar_clear(&non);
-    secp256k1_scalar_clear(&sec);
-    return ret;
-}
-
-int secp256k1_schnorr_verify(const secp256k1_context* ctx, const unsigned char *sig64, const unsigned char *msg32, const secp256k1_pubkey *pubkey) {
-    secp256k1_ge q;
-    VERIFY_CHECK(ctx != NULL);
-    ARG_CHECK(secp256k1_ecmult_context_is_built(&ctx->ecmult_ctx));
-    ARG_CHECK(msg32 != NULL);
-    ARG_CHECK(sig64 != NULL);
-    ARG_CHECK(pubkey != NULL);
-
-    secp256k1_pubkey_load(ctx, &q, pubkey);
-    return secp256k1_schnorr_sig_verify(&ctx->ecmult_ctx, sig64, &q, secp256k1_schnorr_msghash_sha256, msg32);
-}
-
-int secp256k1_schnorr_recover(const secp256k1_context* ctx, secp256k1_pubkey *pubkey, const unsigned char *sig64, const unsigned char *msg32) {
-    secp256k1_ge q;
-
-    VERIFY_CHECK(ctx != NULL);
-    ARG_CHECK(secp256k1_ecmult_context_is_built(&ctx->ecmult_ctx));
-    ARG_CHECK(msg32 != NULL);
-    ARG_CHECK(sig64 != NULL);
-    ARG_CHECK(pubkey != NULL);
-
-    if (secp256k1_schnorr_sig_recover(&ctx->ecmult_ctx, sig64, &q, secp256k1_schnorr_msghash_sha256, msg32)) {
-        secp256k1_pubkey_save(pubkey, &q);
-        return 1;
-    } else {
-        memset(pubkey, 0, sizeof(*pubkey));
-        return 0;
-    }
-}
-
-int secp256k1_schnorr_generate_nonce_pair(const secp256k1_context* ctx, secp256k1_pubkey *pubnonce, unsigned char *privnonce32, const unsigned char *sec32, const unsigned char *msg32, secp256k1_nonce_function noncefp, const void* noncedata) {
-    int count = 0;
-    int ret = 1;
-    secp256k1_gej Qj;
-    secp256k1_ge Q;
-    secp256k1_scalar sec;
-
-    VERIFY_CHECK(ctx != NULL);
-    ARG_CHECK(secp256k1_ecmult_gen_context_is_built(&ctx->ecmult_gen_ctx));
-    ARG_CHECK(msg32 != NULL);
-    ARG_CHECK(sec32 != NULL);
-    ARG_CHECK(pubnonce != NULL);
-    ARG_CHECK(privnonce32 != NULL);
-
-    if (noncefp == NULL) {
-        noncefp = secp256k1_nonce_function_default;
-    }
-
-    do {
-        int overflow;
-        ret = noncefp(privnonce32, sec32, msg32, secp256k1_schnorr_algo16, (void*)noncedata, count++);
-        if (!ret) {
-            break;
-        }
-        secp256k1_scalar_set_b32(&sec, privnonce32, &overflow);
-        if (overflow || secp256k1_scalar_is_zero(&sec)) {
-            continue;
-        }
-        secp256k1_ecmult_gen(&ctx->ecmult_gen_ctx, &Qj, &sec);
-        secp256k1_ge_set_gej(&Q, &Qj);
-
-        secp256k1_pubkey_save(pubnonce, &Q);
-        break;
-    } while(1);
-
-    secp256k1_scalar_clear(&sec);
-    if (!ret) {
-        memset(pubnonce, 0, sizeof(*pubnonce));
-    }
-    return ret;
-}
-
-int secp256k1_schnorr_partial_sign(const secp256k1_context* ctx, unsigned char *sig64, const unsigned char *msg32, const unsigned char *sec32, const secp256k1_pubkey *pubnonce_others, const unsigned char *secnonce32) {
-    int overflow = 0;
-    secp256k1_scalar sec, non;
-    secp256k1_ge pubnon;
-    VERIFY_CHECK(ctx != NULL);
-    ARG_CHECK(secp256k1_ecmult_gen_context_is_built(&ctx->ecmult_gen_ctx));
-    ARG_CHECK(msg32 != NULL);
-    ARG_CHECK(sig64 != NULL);
-    ARG_CHECK(sec32 != NULL);
-    ARG_CHECK(secnonce32 != NULL);
-    ARG_CHECK(pubnonce_others != NULL);
-
-    secp256k1_scalar_set_b32(&sec, sec32, &overflow);
-    if (overflow || secp256k1_scalar_is_zero(&sec)) {
-        return -1;
-    }
-    secp256k1_scalar_set_b32(&non, secnonce32, &overflow);
-    if (overflow || secp256k1_scalar_is_zero(&non)) {
-        return -1;
-    }
-    secp256k1_pubkey_load(ctx, &pubnon, pubnonce_others);
-    return secp256k1_schnorr_sig_sign(&ctx->ecmult_gen_ctx, sig64, &sec, &non, &pubnon, secp256k1_schnorr_msghash_sha256, msg32);
-}
-
-int secp256k1_schnorr_partial_combine(const secp256k1_context* ctx, unsigned char *sig64, const unsigned char * const *sig64sin, size_t n) {
-    ARG_CHECK(sig64 != NULL);
-    ARG_CHECK(n >= 1);
-    ARG_CHECK(sig64sin != NULL);
-    return secp256k1_schnorr_sig_combine(sig64, n, sig64sin);
-}
-
-#endif
diff --git a/src/modules/schnorr/schnorr.h b/src/modules/schnorr/schnorr.h
deleted file mode 100644
index de18147bd52ac..0000000000000
--- a/src/modules/schnorr/schnorr.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/***********************************************************************
- * Copyright (c) 2014-2015 Pieter Wuille                               *
- * Distributed under the MIT software license, see the accompanying    *
- * file COPYING or http://www.opensource.org/licenses/mit-license.php. *
- ***********************************************************************/
-
-#ifndef _SECP256K1_MODULE_SCHNORR_H_
-#define _SECP256K1_MODULE_SCHNORR_H_
-
-#include "scalar.h"
-#include "group.h"
-
-typedef void (*secp256k1_schnorr_msghash)(unsigned char *h32, const unsigned char *r32, const unsigned char *msg32);
-
-static int secp256k1_schnorr_sig_sign(const secp256k1_ecmult_gen_context* ctx, unsigned char *sig64, const secp256k1_scalar *key, const secp256k1_scalar *nonce, const secp256k1_ge *pubnonce, secp256k1_schnorr_msghash hash, const unsigned char *msg32);
-static int secp256k1_schnorr_sig_verify(const secp256k1_ecmult_context* ctx, const unsigned char *sig64, const secp256k1_ge *pubkey, secp256k1_schnorr_msghash hash, const unsigned char *msg32);
-static int secp256k1_schnorr_sig_recover(const secp256k1_ecmult_context* ctx, const unsigned char *sig64, secp256k1_ge *pubkey, secp256k1_schnorr_msghash hash, const unsigned char *msg32);
-static int secp256k1_schnorr_sig_combine(unsigned char *sig64, size_t n, const unsigned char * const *sig64ins);
-
-#endif
diff --git a/src/modules/schnorr/schnorr_impl.h b/src/modules/schnorr/schnorr_impl.h
deleted file mode 100644
index e13ab6db7cca1..0000000000000
--- a/src/modules/schnorr/schnorr_impl.h
+++ /dev/null
@@ -1,207 +0,0 @@
-/***********************************************************************
- * Copyright (c) 2014-2015 Pieter Wuille                               *
- * Distributed under the MIT software license, see the accompanying    *
- * file COPYING or http://www.opensource.org/licenses/mit-license.php. *
- ***********************************************************************/
-
-#ifndef _SECP256K1_SCHNORR_IMPL_H_
-#define _SECP256K1_SCHNORR_IMPL_H_
-
-#include <string.h>
-
-#include "schnorr.h"
-#include "num.h"
-#include "field.h"
-#include "group.h"
-#include "ecmult.h"
-#include "ecmult_gen.h"
-
-/**
- * Custom Schnorr-based signature scheme. They support multiparty signing, public key
- * recovery and batch validation.
- *
- * Rationale for verifying R's y coordinate:
- * In order to support batch validation and public key recovery, the full R point must
- * be known to verifiers, rather than just its x coordinate. In order to not risk
- * being more strict in batch validation than normal validation, validators must be
- * required to reject signatures with incorrect y coordinate. This is only possible
- * by including a (relatively slow) field inverse, or a field square root. However,
- * batch validation offers potentially much higher benefits than this cost.
- *
- * Rationale for having an implicit y coordinate oddness:
- * If we commit to having the full R point known to verifiers, there are two mechanism.
- * Either include its oddness in the signature, or give it an implicit fixed value.
- * As the R y coordinate can be flipped by a simple negation of the nonce, we choose the
- * latter, as it comes with nearly zero impact on signing or validation performance, and
- * saves a byte in the signature.
- *
- * Signing:
- *   Inputs: 32-byte message m, 32-byte scalar key x (!=0), 32-byte scalar nonce k (!=0)
- *
- *   Compute point R = k * G. Reject nonce if R's y coordinate is odd (or negate nonce).
- *   Compute 32-byte r, the serialization of R's x coordinate.
- *   Compute scalar h = Hash(r || m). Reject nonce if h == 0 or h >= order.
- *   Compute scalar s = k - h * x.
- *   The signature is (r, s).
- *
- *
- * Verification:
- *   Inputs: 32-byte message m, public key point Q, signature: (32-byte r, scalar s)
- *
- *   Signature is invalid if s >= order.
- *   Signature is invalid if r >= p.
- *   Compute scalar h = Hash(r || m). Signature is invalid if h == 0 or h >= order.
- *   Option 1 (faster for single verification):
- *     Compute point R = h * Q + s * G. Signature is invalid if R is infinity or R's y coordinate is odd.
- *     Signature is valid if the serialization of R's x coordinate equals r.
- *   Option 2 (allows batch validation and pubkey recovery):
- *     Decompress x coordinate r into point R, with odd y coordinate. Fail if R is not on the curve.
- *     Signature is valid if R + h * Q + s * G == 0.
- */
-
-static int secp256k1_schnorr_sig_sign(const secp256k1_ecmult_gen_context* ctx, unsigned char *sig64, const secp256k1_scalar *key, const secp256k1_scalar *nonce, const secp256k1_ge *pubnonce, secp256k1_schnorr_msghash hash, const unsigned char *msg32) {
-    secp256k1_gej Rj;
-    secp256k1_ge Ra;
-    unsigned char h32[32];
-    secp256k1_scalar h, s;
-    int overflow;
-    secp256k1_scalar n;
-
-    if (secp256k1_scalar_is_zero(key) || secp256k1_scalar_is_zero(nonce)) {
-        return 0;
-    }
-    n = *nonce;
-
-    secp256k1_ecmult_gen(ctx, &Rj, &n);
-    if (pubnonce != NULL) {
-        secp256k1_gej_add_ge(&Rj, &Rj, pubnonce);
-    }
-    secp256k1_ge_set_gej(&Ra, &Rj);
-    secp256k1_fe_normalize(&Ra.y);
-    if (secp256k1_fe_is_odd(&Ra.y)) {
-        /* R's y coordinate is odd, which is not allowed (see rationale above).
-           Force it to be even by negating the nonce. Note that this even works
-           for multiparty signing, as the R point is known to all participants,
-           which can all decide to flip the sign in unison, resulting in the
-           overall R point to be negated too. */
-        secp256k1_scalar_negate(&n, &n);
-    }
-    secp256k1_fe_normalize(&Ra.x);
-    secp256k1_fe_get_b32(sig64, &Ra.x);
-    hash(h32, sig64, msg32);
-    overflow = 0;
-    secp256k1_scalar_set_b32(&h, h32, &overflow);
-    if (overflow || secp256k1_scalar_is_zero(&h)) {
-        secp256k1_scalar_clear(&n);
-        return 0;
-    }
-    secp256k1_scalar_mul(&s, &h, key);
-    secp256k1_scalar_negate(&s, &s);
-    secp256k1_scalar_add(&s, &s, &n);
-    secp256k1_scalar_clear(&n);
-    secp256k1_scalar_get_b32(sig64 + 32, &s);
-    return 1;
-}
-
-static int secp256k1_schnorr_sig_verify(const secp256k1_ecmult_context* ctx, const unsigned char *sig64, const secp256k1_ge *pubkey, secp256k1_schnorr_msghash hash, const unsigned char *msg32) {
-    secp256k1_gej Qj, Rj;
-    secp256k1_ge Ra;
-    secp256k1_fe Rx;
-    secp256k1_scalar h, s;
-    unsigned char hh[32];
-    int overflow;
-
-    if (secp256k1_ge_is_infinity(pubkey)) {
-        return 0;
-    }
-    hash(hh, sig64, msg32);
-    overflow = 0;
-    secp256k1_scalar_set_b32(&h, hh, &overflow);
-    if (overflow || secp256k1_scalar_is_zero(&h)) {
-        return 0;
-    }
-    overflow = 0;
-    secp256k1_scalar_set_b32(&s, sig64 + 32, &overflow);
-    if (overflow) {
-        return 0;
-    }
-    if (!secp256k1_fe_set_b32(&Rx, sig64)) {
-        return 0;
-    }
-    secp256k1_gej_set_ge(&Qj, pubkey);
-    secp256k1_ecmult(ctx, &Rj, &Qj, &h, &s);
-    if (secp256k1_gej_is_infinity(&Rj)) {
-        return 0;
-    }
-    secp256k1_ge_set_gej_var(&Ra, &Rj);
-    secp256k1_fe_normalize_var(&Ra.y);
-    if (secp256k1_fe_is_odd(&Ra.y)) {
-        return 0;
-    }
-    return secp256k1_fe_equal_var(&Rx, &Ra.x);
-}
-
-static int secp256k1_schnorr_sig_recover(const secp256k1_ecmult_context* ctx, const unsigned char *sig64, secp256k1_ge *pubkey, secp256k1_schnorr_msghash hash, const unsigned char *msg32) {
-    secp256k1_gej Qj, Rj;
-    secp256k1_ge Ra;
-    secp256k1_fe Rx;
-    secp256k1_scalar h, s;
-    unsigned char hh[32];
-    int overflow;
-
-    hash(hh, sig64, msg32);
-    overflow = 0;
-    secp256k1_scalar_set_b32(&h, hh, &overflow);
-    if (overflow || secp256k1_scalar_is_zero(&h)) {
-        return 0;
-    }
-    overflow = 0;
-    secp256k1_scalar_set_b32(&s, sig64 + 32, &overflow);
-    if (overflow) {
-        return 0;
-    }
-    if (!secp256k1_fe_set_b32(&Rx, sig64)) {
-        return 0;
-    }
-    if (!secp256k1_ge_set_xo_var(&Ra, &Rx, 0)) {
-        return 0;
-    }
-    secp256k1_gej_set_ge(&Rj, &Ra);
-    secp256k1_scalar_inverse_var(&h, &h);
-    secp256k1_scalar_negate(&s, &s);
-    secp256k1_scalar_mul(&s, &s, &h);
-    secp256k1_ecmult(ctx, &Qj, &Rj, &h, &s);
-    if (secp256k1_gej_is_infinity(&Qj)) {
-        return 0;
-    }
-    secp256k1_ge_set_gej(pubkey, &Qj);
-    return 1;
-}
-
-static int secp256k1_schnorr_sig_combine(unsigned char *sig64, size_t n, const unsigned char * const *sig64ins) {
-    secp256k1_scalar s = SECP256K1_SCALAR_CONST(0, 0, 0, 0, 0, 0, 0, 0);
-    size_t i;
-    for (i = 0; i < n; i++) {
-        secp256k1_scalar si;
-        int overflow;
-        secp256k1_scalar_set_b32(&si, sig64ins[i] + 32, &overflow);
-        if (overflow) {
-            return -1;
-        }
-        if (i) {
-            if (memcmp(sig64ins[i - 1], sig64ins[i], 32) != 0) {
-                return -1;
-            }
-        }
-        secp256k1_scalar_add(&s, &s, &si);
-    }
-    if (secp256k1_scalar_is_zero(&s)) {
-        return 0;
-    }
-    memcpy(sig64, sig64ins[0], 32);
-    secp256k1_scalar_get_b32(sig64 + 32, &s);
-    secp256k1_scalar_clear(&s);
-    return 1;
-}
-
-#endif
diff --git a/src/modules/schnorr/tests_impl.h b/src/modules/schnorr/tests_impl.h
deleted file mode 100644
index 5bd14a03e3c65..0000000000000
--- a/src/modules/schnorr/tests_impl.h
+++ /dev/null
@@ -1,175 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2014-2015 Pieter Wuille                              *
- * Distributed under the MIT software license, see the accompanying   *
- * file COPYING or http://www.opensource.org/licenses/mit-license.php.*
- **********************************************************************/
-
-#ifndef SECP256K1_MODULE_SCHNORR_TESTS
-#define SECP256K1_MODULE_SCHNORR_TESTS
-
-#include "include/secp256k1_schnorr.h"
-
-void test_schnorr_end_to_end(void) {
-    unsigned char privkey[32];
-    unsigned char message[32];
-    unsigned char schnorr_signature[64];
-    secp256k1_pubkey pubkey, recpubkey;
-
-    /* Generate a random key and message. */
-    {
-        secp256k1_scalar key;
-        random_scalar_order_test(&key);
-        secp256k1_scalar_get_b32(privkey, &key);
-        secp256k1_rand256_test(message);
-    }
-
-    /* Construct and verify corresponding public key. */
-    CHECK(secp256k1_ec_seckey_verify(ctx, privkey) == 1);
-    CHECK(secp256k1_ec_pubkey_create(ctx, &pubkey, privkey) == 1);
-
-    /* Schnorr sign. */
-    CHECK(secp256k1_schnorr_sign(ctx, schnorr_signature, message, privkey, NULL, NULL) == 1);
-    CHECK(secp256k1_schnorr_verify(ctx, schnorr_signature, message, &pubkey) == 1);
-    CHECK(secp256k1_schnorr_recover(ctx, &recpubkey, schnorr_signature, message) == 1);
-    CHECK(memcmp(&pubkey, &recpubkey, sizeof(pubkey)) == 0);
-    /* Destroy signature and verify again. */
-    schnorr_signature[secp256k1_rand_bits(6)] += 1 + secp256k1_rand_int(255);
-    CHECK(secp256k1_schnorr_verify(ctx, schnorr_signature, message, &pubkey) == 0);
-    CHECK(secp256k1_schnorr_recover(ctx, &recpubkey, schnorr_signature, message) != 1 ||
-          memcmp(&pubkey, &recpubkey, sizeof(pubkey)) != 0);
-}
-
-/** Horribly broken hash function. Do not use for anything but tests. */
-void test_schnorr_hash(unsigned char *h32, const unsigned char *r32, const unsigned char *msg32) {
-    int i;
-    for (i = 0; i < 32; i++) {
-        h32[i] = r32[i] ^ msg32[i];
-    }
-}
-
-void test_schnorr_sign_verify(void) {
-    unsigned char msg32[32];
-    unsigned char sig64[3][64];
-    secp256k1_gej pubkeyj[3];
-    secp256k1_ge pubkey[3];
-    secp256k1_scalar nonce[3], key[3];
-    int i = 0;
-    int k;
-
-    secp256k1_rand256_test(msg32);
-
-    for (k = 0; k < 3; k++) {
-        random_scalar_order_test(&key[k]);
-
-        do {
-            random_scalar_order_test(&nonce[k]);
-            if (secp256k1_schnorr_sig_sign(&ctx->ecmult_gen_ctx, sig64[k], &key[k], &nonce[k], NULL, &test_schnorr_hash, msg32)) {
-                break;
-            }
-        } while(1);
-
-        secp256k1_ecmult_gen(&ctx->ecmult_gen_ctx, &pubkeyj[k], &key[k]);
-        secp256k1_ge_set_gej_var(&pubkey[k], &pubkeyj[k]);
-        CHECK(secp256k1_schnorr_sig_verify(&ctx->ecmult_ctx, sig64[k], &pubkey[k], &test_schnorr_hash, msg32));
-
-        for (i = 0; i < 4; i++) {
-            int pos = secp256k1_rand_bits(6);
-            int mod = 1 + secp256k1_rand_int(255);
-            sig64[k][pos] ^= mod;
-            CHECK(secp256k1_schnorr_sig_verify(&ctx->ecmult_ctx, sig64[k], &pubkey[k], &test_schnorr_hash, msg32) == 0);
-            sig64[k][pos] ^= mod;
-        }
-    }
-}
-
-void test_schnorr_threshold(void) {
-    unsigned char msg[32];
-    unsigned char sec[5][32];
-    secp256k1_pubkey pub[5];
-    unsigned char nonce[5][32];
-    secp256k1_pubkey pubnonce[5];
-    unsigned char sig[5][64];
-    const unsigned char* sigs[5];
-    unsigned char allsig[64];
-    const secp256k1_pubkey* pubs[5];
-    secp256k1_pubkey allpub;
-    int n, i;
-    int damage;
-    int ret = 0;
-
-    damage = secp256k1_rand_bits(1) ? (1 + secp256k1_rand_int(4)) : 0;
-    secp256k1_rand256_test(msg);
-    n = 2 + secp256k1_rand_int(4);
-    for (i = 0; i < n; i++) {
-        do {
-            secp256k1_rand256_test(sec[i]);
-        } while (!secp256k1_ec_seckey_verify(ctx, sec[i]));
-        CHECK(secp256k1_ec_pubkey_create(ctx, &pub[i], sec[i]));
-        CHECK(secp256k1_schnorr_generate_nonce_pair(ctx, &pubnonce[i], nonce[i], msg, sec[i], NULL, NULL));
-        pubs[i] = &pub[i];
-    }
-    if (damage == 1) {
-        nonce[secp256k1_rand_int(n)][secp256k1_rand_int(32)] ^= 1 + secp256k1_rand_int(255);
-    } else if (damage == 2) {
-        sec[secp256k1_rand_int(n)][secp256k1_rand_int(32)] ^= 1 + secp256k1_rand_int(255);
-    }
-    for (i = 0; i < n; i++) {
-        secp256k1_pubkey allpubnonce;
-        const secp256k1_pubkey *pubnonces[4];
-        int j;
-        for (j = 0; j < i; j++) {
-            pubnonces[j] = &pubnonce[j];
-        }
-        for (j = i + 1; j < n; j++) {
-            pubnonces[j - 1] = &pubnonce[j];
-        }
-        CHECK(secp256k1_ec_pubkey_combine(ctx, &allpubnonce, pubnonces, n - 1));
-        ret |= (secp256k1_schnorr_partial_sign(ctx, sig[i], msg, sec[i], &allpubnonce, nonce[i]) != 1) * 1;
-        sigs[i] = sig[i];
-    }
-    if (damage == 3) {
-        sig[secp256k1_rand_int(n)][secp256k1_rand_bits(6)] ^= 1 + secp256k1_rand_int(255);
-    }
-    ret |= (secp256k1_ec_pubkey_combine(ctx, &allpub, pubs, n) != 1) * 2;
-    if ((ret & 1) == 0) {
-        ret |= (secp256k1_schnorr_partial_combine(ctx, allsig, sigs, n) != 1) * 4;
-    }
-    if (damage == 4) {
-        allsig[secp256k1_rand_int(32)] ^= 1 + secp256k1_rand_int(255);
-    }
-    if ((ret & 7) == 0) {
-        ret |= (secp256k1_schnorr_verify(ctx, allsig, msg, &allpub) != 1) * 8;
-    }
-    CHECK((ret == 0) == (damage == 0));
-}
-
-void test_schnorr_recovery(void) {
-    unsigned char msg32[32];
-    unsigned char sig64[64];
-    secp256k1_ge Q;
-
-    secp256k1_rand256_test(msg32);
-    secp256k1_rand256_test(sig64);
-    secp256k1_rand256_test(sig64 + 32);
-    if (secp256k1_schnorr_sig_recover(&ctx->ecmult_ctx, sig64, &Q, &test_schnorr_hash, msg32) == 1) {
-        CHECK(secp256k1_schnorr_sig_verify(&ctx->ecmult_ctx, sig64, &Q, &test_schnorr_hash, msg32) == 1);
-    }
-}
-
-void run_schnorr_tests(void) {
-    int i;
-    for (i = 0; i < 32*count; i++) {
-        test_schnorr_end_to_end();
-    }
-    for (i = 0; i < 32 * count; i++) {
-         test_schnorr_sign_verify();
-    }
-    for (i = 0; i < 16 * count; i++) {
-         test_schnorr_recovery();
-    }
-    for (i = 0; i < 10 * count; i++) {
-         test_schnorr_threshold();
-    }
-}
-
-#endif
diff --git a/src/scalar.h b/src/scalar.h
index b590ccd6dde6f..27e9d8375e8b0 100644
--- a/src/scalar.h
+++ b/src/scalar.h
@@ -13,7 +13,9 @@
 #include "libsecp256k1-config.h"
 #endif
 
-#if defined(USE_SCALAR_4X64)
+#if defined(EXHAUSTIVE_TEST_ORDER)
+#include "scalar_low.h"
+#elif defined(USE_SCALAR_4X64)
 #include "scalar_4x64.h"
 #elif defined(USE_SCALAR_8X32)
 #include "scalar_8x32.h"
diff --git a/src/scalar_4x64_impl.h b/src/scalar_4x64_impl.h
index aa2703dd23e8c..56e7bd82afd63 100644
--- a/src/scalar_4x64_impl.h
+++ b/src/scalar_4x64_impl.h
@@ -282,8 +282,8 @@ static void secp256k1_scalar_reduce_512(secp256k1_scalar *r, const uint64_t *l)
     "movq 56(%%rsi), %%r14\n"
     /* Initialize r8,r9,r10 */
     "movq 0(%%rsi), %%r8\n"
-    "movq $0, %%r9\n"
-    "movq $0, %%r10\n"
+    "xorq %%r9, %%r9\n"
+    "xorq %%r10, %%r10\n"
     /* (r8,r9) += n0 * c0 */
     "movq %8, %%rax\n"
     "mulq %%r11\n"
@@ -291,7 +291,7 @@ static void secp256k1_scalar_reduce_512(secp256k1_scalar *r, const uint64_t *l)
     "adcq %%rdx, %%r9\n"
     /* extract m0 */
     "movq %%r8, %q0\n"
-    "movq $0, %%r8\n"
+    "xorq %%r8, %%r8\n"
     /* (r9,r10) += l1 */
     "addq 8(%%rsi), %%r9\n"
     "adcq $0, %%r10\n"
@@ -309,7 +309,7 @@ static void secp256k1_scalar_reduce_512(secp256k1_scalar *r, const uint64_t *l)
     "adcq $0, %%r8\n"
     /* extract m1 */
     "movq %%r9, %q1\n"
-    "movq $0, %%r9\n"
+    "xorq %%r9, %%r9\n"
     /* (r10,r8,r9) += l2 */
     "addq 16(%%rsi), %%r10\n"
     "adcq $0, %%r8\n"
@@ -332,7 +332,7 @@ static void secp256k1_scalar_reduce_512(secp256k1_scalar *r, const uint64_t *l)
     "adcq $0, %%r9\n"
     /* extract m2 */
     "movq %%r10, %q2\n"
-    "movq $0, %%r10\n"
+    "xorq %%r10, %%r10\n"
     /* (r8,r9,r10) += l3 */
     "addq 24(%%rsi), %%r8\n"
     "adcq $0, %%r9\n"
@@ -355,7 +355,7 @@ static void secp256k1_scalar_reduce_512(secp256k1_scalar *r, const uint64_t *l)
     "adcq $0, %%r10\n"
     /* extract m3 */
     "movq %%r8, %q3\n"
-    "movq $0, %%r8\n"
+    "xorq %%r8, %%r8\n"
     /* (r9,r10,r8) += n3 * c1 */
     "movq %9, %%rax\n"
     "mulq %%r14\n"
@@ -387,8 +387,8 @@ static void secp256k1_scalar_reduce_512(secp256k1_scalar *r, const uint64_t *l)
     "movq %q11, %%r13\n"
     /* Initialize (r8,r9,r10) */
     "movq %q5, %%r8\n"
-    "movq $0, %%r9\n"
-    "movq $0, %%r10\n"
+    "xorq %%r9, %%r9\n"
+    "xorq %%r10, %%r10\n"
     /* (r8,r9) += m4 * c0 */
     "movq %12, %%rax\n"
     "mulq %%r11\n"
@@ -396,7 +396,7 @@ static void secp256k1_scalar_reduce_512(secp256k1_scalar *r, const uint64_t *l)
     "adcq %%rdx, %%r9\n"
     /* extract p0 */
     "movq %%r8, %q0\n"
-    "movq $0, %%r8\n"
+    "xorq %%r8, %%r8\n"
     /* (r9,r10) += m1 */
     "addq %q6, %%r9\n"
     "adcq $0, %%r10\n"
@@ -414,7 +414,7 @@ static void secp256k1_scalar_reduce_512(secp256k1_scalar *r, const uint64_t *l)
     "adcq $0, %%r8\n"
     /* extract p1 */
     "movq %%r9, %q1\n"
-    "movq $0, %%r9\n"
+    "xorq %%r9, %%r9\n"
     /* (r10,r8,r9) += m2 */
     "addq %q7, %%r10\n"
     "adcq $0, %%r8\n"
@@ -472,7 +472,7 @@ static void secp256k1_scalar_reduce_512(secp256k1_scalar *r, const uint64_t *l)
     "movq %%rax, 0(%q6)\n"
     /* Move to (r8,r9) */
     "movq %%rdx, %%r8\n"
-    "movq $0, %%r9\n"
+    "xorq %%r9, %%r9\n"
     /* (r8,r9) += p1 */
     "addq %q2, %%r8\n"
     "adcq $0, %%r9\n"
@@ -483,7 +483,7 @@ static void secp256k1_scalar_reduce_512(secp256k1_scalar *r, const uint64_t *l)
     "adcq %%rdx, %%r9\n"
     /* Extract r1 */
     "movq %%r8, 8(%q6)\n"
-    "movq $0, %%r8\n"
+    "xorq %%r8, %%r8\n"
     /* (r9,r8) += p4 */
     "addq %%r10, %%r9\n"
     "adcq $0, %%r8\n"
@@ -492,7 +492,7 @@ static void secp256k1_scalar_reduce_512(secp256k1_scalar *r, const uint64_t *l)
     "adcq $0, %%r8\n"
     /* Extract r2 */
     "movq %%r9, 16(%q6)\n"
-    "movq $0, %%r9\n"
+    "xorq %%r9, %%r9\n"
     /* (r8,r9) += p3 */
     "addq %q4, %%r8\n"
     "adcq $0, %%r9\n"
diff --git a/src/scalar_impl.h b/src/scalar_impl.h
index c5baf4df413e0..f5b2376407bd3 100644
--- a/src/scalar_impl.h
+++ b/src/scalar_impl.h
@@ -14,7 +14,9 @@
 #include "libsecp256k1-config.h"
 #endif
 
-#if defined(USE_SCALAR_4X64)
+#if defined(EXHAUSTIVE_TEST_ORDER)
+#include "scalar_low_impl.h"
+#elif defined(USE_SCALAR_4X64)
 #include "scalar_4x64_impl.h"
 #elif defined(USE_SCALAR_8X32)
 #include "scalar_8x32_impl.h"
@@ -31,17 +33,37 @@ static void secp256k1_scalar_get_num(secp256k1_num *r, const secp256k1_scalar *a
 
 /** secp256k1 curve order, see secp256k1_ecdsa_const_order_as_fe in ecdsa_impl.h */
 static void secp256k1_scalar_order_get_num(secp256k1_num *r) {
+#if defined(EXHAUSTIVE_TEST_ORDER)
+    static const unsigned char order[32] = {
+        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,EXHAUSTIVE_TEST_ORDER
+    };
+#else
     static const unsigned char order[32] = {
         0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
         0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFE,
         0xBA,0xAE,0xDC,0xE6,0xAF,0x48,0xA0,0x3B,
         0xBF,0xD2,0x5E,0x8C,0xD0,0x36,0x41,0x41
     };
+#endif
     secp256k1_num_set_bin(r, order, 32);
 }
 #endif
 
 static void secp256k1_scalar_inverse(secp256k1_scalar *r, const secp256k1_scalar *x) {
+#if defined(EXHAUSTIVE_TEST_ORDER)
+    int i;
+    *r = 0;
+    for (i = 0; i < EXHAUSTIVE_TEST_ORDER; i++)
+        if ((i * *x) % EXHAUSTIVE_TEST_ORDER == 1)
+            *r = i;
+    /* If this VERIFY_CHECK triggers we were given a noninvertible scalar (and thus
+     * have a composite group order; fix it in exhaustive_tests.c). */
+    VERIFY_CHECK(*r != 0);
+}
+#else
     secp256k1_scalar *t;
     int i;
     /* First compute x ^ (2^N - 1) for some values of N. */
@@ -233,9 +255,9 @@ static void secp256k1_scalar_inverse(secp256k1_scalar *r, const secp256k1_scalar
 }
 
 SECP256K1_INLINE static int secp256k1_scalar_is_even(const secp256k1_scalar *a) {
-    /* d[0] is present and is the lowest word for all representations */
     return !(a->d[0] & 1);
 }
+#endif
 
 static void secp256k1_scalar_inverse_var(secp256k1_scalar *r, const secp256k1_scalar *x) {
 #if defined(USE_SCALAR_INV_BUILTIN)
@@ -259,6 +281,18 @@ static void secp256k1_scalar_inverse_var(secp256k1_scalar *r, const secp256k1_sc
 }
 
 #ifdef USE_ENDOMORPHISM
+#if defined(EXHAUSTIVE_TEST_ORDER)
+/**
+ * Find k1 and k2 given k, such that k1 + k2 * lambda == k mod n; unlike in the
+ * full case we don't bother making k1 and k2 be small, we just want them to be
+ * nontrivial to get full test coverage for the exhaustive tests. We therefore
+ * (arbitrarily) set k2 = k + 5 and k1 = k - k2 * lambda.
+ */
+static void secp256k1_scalar_split_lambda(secp256k1_scalar *r1, secp256k1_scalar *r2, const secp256k1_scalar *a) {
+    *r2 = (*a + 5) % EXHAUSTIVE_TEST_ORDER;
+    *r1 = (*a + (EXHAUSTIVE_TEST_ORDER - *r2) * EXHAUSTIVE_TEST_LAMBDA) % EXHAUSTIVE_TEST_ORDER;
+}
+#else
 /**
  * The Secp256k1 curve has an endomorphism, where lambda * (x, y) = (beta * x, y), where
  * lambda is {0x53,0x63,0xad,0x4c,0xc0,0x5c,0x30,0xe0,0xa5,0x26,0x1c,0x02,0x88,0x12,0x64,0x5a,
@@ -331,5 +365,6 @@ static void secp256k1_scalar_split_lambda(secp256k1_scalar *r1, secp256k1_scalar
     secp256k1_scalar_add(r1, r1, a);
 }
 #endif
+#endif
 
 #endif
diff --git a/src/scalar_low.h b/src/scalar_low.h
new file mode 100644
index 0000000000000..5574c44c7aeb3
--- /dev/null
+++ b/src/scalar_low.h
@@ -0,0 +1,15 @@
+/**********************************************************************
+ * Copyright (c) 2015 Andrew Poelstra                                 *
+ * Distributed under the MIT software license, see the accompanying   *
+ * file COPYING or http://www.opensource.org/licenses/mit-license.php.*
+ **********************************************************************/
+
+#ifndef _SECP256K1_SCALAR_REPR_
+#define _SECP256K1_SCALAR_REPR_
+
+#include <stdint.h>
+
+/** A scalar modulo the group order of the secp256k1 curve. */
+typedef uint32_t secp256k1_scalar;
+
+#endif
diff --git a/src/scalar_low_impl.h b/src/scalar_low_impl.h
new file mode 100644
index 0000000000000..4f94441f492a8
--- /dev/null
+++ b/src/scalar_low_impl.h
@@ -0,0 +1,114 @@
+/**********************************************************************
+ * Copyright (c) 2015 Andrew Poelstra                                 *
+ * Distributed under the MIT software license, see the accompanying   *
+ * file COPYING or http://www.opensource.org/licenses/mit-license.php.*
+ **********************************************************************/
+
+#ifndef _SECP256K1_SCALAR_REPR_IMPL_H_
+#define _SECP256K1_SCALAR_REPR_IMPL_H_
+
+#include "scalar.h"
+
+#include <string.h>
+
+SECP256K1_INLINE static int secp256k1_scalar_is_even(const secp256k1_scalar *a) {
+    return !(*a & 1);
+}
+
+SECP256K1_INLINE static void secp256k1_scalar_clear(secp256k1_scalar *r) { *r = 0; }
+SECP256K1_INLINE static void secp256k1_scalar_set_int(secp256k1_scalar *r, unsigned int v) { *r = v; }
+
+SECP256K1_INLINE static unsigned int secp256k1_scalar_get_bits(const secp256k1_scalar *a, unsigned int offset, unsigned int count) {
+    if (offset < 32)
+        return ((*a >> offset) & ((((uint32_t)1) << count) - 1));
+    else
+        return 0;
+}
+
+SECP256K1_INLINE static unsigned int secp256k1_scalar_get_bits_var(const secp256k1_scalar *a, unsigned int offset, unsigned int count) {
+    return secp256k1_scalar_get_bits(a, offset, count);
+}
+
+SECP256K1_INLINE static int secp256k1_scalar_check_overflow(const secp256k1_scalar *a) { return *a >= EXHAUSTIVE_TEST_ORDER; }
+
+static int secp256k1_scalar_add(secp256k1_scalar *r, const secp256k1_scalar *a, const secp256k1_scalar *b) {
+    *r = (*a + *b) % EXHAUSTIVE_TEST_ORDER;
+    return *r < *b;
+}
+
+static void secp256k1_scalar_cadd_bit(secp256k1_scalar *r, unsigned int bit, int flag) {
+    if (flag && bit < 32)
+        *r += (1 << bit);
+#ifdef VERIFY
+    VERIFY_CHECK(secp256k1_scalar_check_overflow(r) == 0);
+#endif
+}
+
+static void secp256k1_scalar_set_b32(secp256k1_scalar *r, const unsigned char *b32, int *overflow) {
+    const int base = 0x100 % EXHAUSTIVE_TEST_ORDER;
+    int i;
+    *r = 0;
+    for (i = 0; i < 32; i++) {
+       *r = ((*r * base) + b32[i]) % EXHAUSTIVE_TEST_ORDER;
+    }
+    /* just deny overflow, it basically always happens */
+    if (overflow) *overflow = 0;
+}
+
+static void secp256k1_scalar_get_b32(unsigned char *bin, const secp256k1_scalar* a) {
+    memset(bin, 0, 32);
+    bin[28] = *a >> 24; bin[29] = *a >> 16; bin[30] = *a >> 8; bin[31] = *a;
+}
+
+SECP256K1_INLINE static int secp256k1_scalar_is_zero(const secp256k1_scalar *a) {
+    return *a == 0;
+}
+
+static void secp256k1_scalar_negate(secp256k1_scalar *r, const secp256k1_scalar *a) {
+    if (*a == 0) {
+        *r = 0;
+    } else {
+        *r = EXHAUSTIVE_TEST_ORDER - *a;
+    }
+}
+
+SECP256K1_INLINE static int secp256k1_scalar_is_one(const secp256k1_scalar *a) {
+    return *a == 1;
+}
+
+static int secp256k1_scalar_is_high(const secp256k1_scalar *a) {
+    return *a > EXHAUSTIVE_TEST_ORDER / 2;
+}
+
+static int secp256k1_scalar_cond_negate(secp256k1_scalar *r, int flag) {
+    if (flag) secp256k1_scalar_negate(r, r);
+    return flag ? -1 : 1;
+}
+
+static void secp256k1_scalar_mul(secp256k1_scalar *r, const secp256k1_scalar *a, const secp256k1_scalar *b) {
+    *r = (*a * *b) % EXHAUSTIVE_TEST_ORDER;
+}
+
+static int secp256k1_scalar_shr_int(secp256k1_scalar *r, int n) {
+    int ret;
+    VERIFY_CHECK(n > 0);
+    VERIFY_CHECK(n < 16);
+    ret = *r & ((1 << n) - 1);
+    *r >>= n;
+    return ret;
+}
+
+static void secp256k1_scalar_sqr(secp256k1_scalar *r, const secp256k1_scalar *a) {
+    *r = (*a * *a) % EXHAUSTIVE_TEST_ORDER;
+}
+
+static void secp256k1_scalar_split_128(secp256k1_scalar *r1, secp256k1_scalar *r2, const secp256k1_scalar *a) {
+    *r1 = *a;
+    *r2 = 0;
+}
+
+SECP256K1_INLINE static int secp256k1_scalar_eq(const secp256k1_scalar *a, const secp256k1_scalar *b) {
+    return *a == *b;
+}
+
+#endif
diff --git a/src/secp256k1.c b/src/secp256k1.c
old mode 100644
new mode 100755
index 7973d60c36a81..fb8b882faafd3
--- a/src/secp256k1.c
+++ b/src/secp256k1.c
@@ -359,16 +359,15 @@ int secp256k1_ecdsa_sign(const secp256k1_context* ctx, secp256k1_ecdsa_signature
     secp256k1_scalar_set_b32(&sec, seckey, &overflow);
     /* Fail if the secret key is invalid. */
     if (!overflow && !secp256k1_scalar_is_zero(&sec)) {
+        unsigned char nonce32[32];
         unsigned int count = 0;
         secp256k1_scalar_set_b32(&msg, msg32, NULL);
         while (1) {
-            unsigned char nonce32[32];
             ret = noncefp(nonce32, msg32, seckey, NULL, (void*)noncedata, count);
             if (!ret) {
                 break;
             }
             secp256k1_scalar_set_b32(&non, nonce32, &overflow);
-            memset(nonce32, 0, 32);
             if (!overflow && !secp256k1_scalar_is_zero(&non)) {
                 if (secp256k1_ecdsa_sig_sign(&ctx->ecmult_gen_ctx, &r, &s, &sec, &msg, &non, NULL)) {
                     break;
@@ -376,6 +375,7 @@ int secp256k1_ecdsa_sign(const secp256k1_context* ctx, secp256k1_ecdsa_signature
             }
             count++;
         }
+        memset(nonce32, 0, 32);
         secp256k1_scalar_clear(&msg);
         secp256k1_scalar_clear(&non);
         secp256k1_scalar_clear(&sec);
diff --git a/src/tests.c b/src/tests.c
index b32cb90813718..9ae7d30281306 100644
--- a/src/tests.c
+++ b/src/tests.c
@@ -520,7 +520,7 @@ void test_num_mod(void) {
     secp256k1_num order, n;
 
     /* check that 0 mod anything is 0 */
-    random_scalar_order_test(&s); 
+    random_scalar_order_test(&s);
     secp256k1_scalar_get_num(&order, &s);
     secp256k1_scalar_set_int(&s, 0);
     secp256k1_scalar_get_num(&n, &s);
@@ -535,7 +535,7 @@ void test_num_mod(void) {
     CHECK(secp256k1_num_is_zero(&n));
 
     /* check that increasing the number past 2^256 does not break this */
-    random_scalar_order_test(&s); 
+    random_scalar_order_test(&s);
     secp256k1_scalar_get_num(&n, &s);
     /* multiply by 2^8, which'll test this case with high probability */
     for (i = 0; i < 8; ++i) {
@@ -568,7 +568,7 @@ void test_num_jacobi(void) {
     /* we first need a scalar which is not a multiple of 5 */
     do {
         secp256k1_num fiven;
-        random_scalar_order_test(&sqr); 
+        random_scalar_order_test(&sqr);
         secp256k1_scalar_get_num(&fiven, &five);
         secp256k1_scalar_get_num(&n, &sqr);
         secp256k1_num_mod(&n, &fiven);
@@ -587,7 +587,7 @@ void test_num_jacobi(void) {
 
     /** test with secp group order as order */
     secp256k1_scalar_order_get_num(&order);
-    random_scalar_order_test(&sqr); 
+    random_scalar_order_test(&sqr);
     secp256k1_scalar_sqr(&sqr, &sqr);
     /* test residue */
     secp256k1_scalar_get_num(&n, &sqr);
@@ -1733,18 +1733,18 @@ void run_field_inv_all_var(void) {
     secp256k1_fe x[16], xi[16], xii[16];
     int i;
     /* Check it's safe to call for 0 elements */
-    secp256k1_fe_inv_all_var(0, xi, x);
+    secp256k1_fe_inv_all_var(xi, x, 0);
     for (i = 0; i < count; i++) {
         size_t j;
         size_t len = secp256k1_rand_int(15) + 1;
         for (j = 0; j < len; j++) {
             random_fe_non_zero(&x[j]);
         }
-        secp256k1_fe_inv_all_var(len, xi, x);
+        secp256k1_fe_inv_all_var(xi, x, len);
         for (j = 0; j < len; j++) {
             CHECK(check_fe_inverse(&x[j], &xi[j]));
         }
-        secp256k1_fe_inv_all_var(len, xii, xi);
+        secp256k1_fe_inv_all_var(xii, xi, len);
         for (j = 0; j < len; j++) {
             CHECK(check_fe_equal(&x[j], &xii[j]));
         }
@@ -1930,7 +1930,7 @@ void test_ge(void) {
                 zs[i] = gej[i].z;
             }
         }
-        secp256k1_fe_inv_all_var(4 * runs + 1, zinv, zs);
+        secp256k1_fe_inv_all_var(zinv, zs, 4 * runs + 1);
         free(zs);
     }
 
@@ -2050,8 +2050,8 @@ void test_ge(void) {
                 secp256k1_fe_mul(&zr[i + 1], &zinv[i], &gej[i + 1].z);
             }
         }
-        secp256k1_ge_set_table_gej_var(4 * runs + 1, ge_set_table, gej, zr);
-        secp256k1_ge_set_all_gej_var(4 * runs + 1, ge_set_all, gej, &ctx->error_callback);
+        secp256k1_ge_set_table_gej_var(ge_set_table, gej, zr, 4 * runs + 1);
+        secp256k1_ge_set_all_gej_var(ge_set_all, gej, 4 * runs + 1, &ctx->error_callback);
         for (i = 0; i < 4 * runs + 1; i++) {
             secp256k1_fe s;
             random_fe_non_zero(&s);
diff --git a/src/tests_exhaustive.c b/src/tests_exhaustive.c
new file mode 100644
index 0000000000000..bda6ee475c9c0
--- /dev/null
+++ b/src/tests_exhaustive.c
@@ -0,0 +1,329 @@
+/***********************************************************************
+ * Copyright (c) 2016 Andrew Poelstra                                 *
+ * Distributed under the MIT software license, see the accompanying   *
+ * file COPYING or http://www.opensource.org/licenses/mit-license.php.*
+ **********************************************************************/
+
+#if defined HAVE_CONFIG_H
+#include "libsecp256k1-config.h"
+#endif
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#include <time.h>
+
+#undef USE_ECMULT_STATIC_PRECOMPUTATION
+
+#ifndef EXHAUSTIVE_TEST_ORDER
+/* see group_impl.h for allowable values */
+#define EXHAUSTIVE_TEST_ORDER 13
+#define EXHAUSTIVE_TEST_LAMBDA 9   /* cube root of 1 mod 13 */
+#endif
+
+#include "include/secp256k1.h"
+#include "group.h"
+#include "secp256k1.c"
+#include "testrand_impl.h"
+
+/** stolen from tests.c */
+void ge_equals_ge(const secp256k1_ge *a, const secp256k1_ge *b) {
+    CHECK(a->infinity == b->infinity);
+    if (a->infinity) {
+        return;
+    }
+    CHECK(secp256k1_fe_equal_var(&a->x, &b->x));
+    CHECK(secp256k1_fe_equal_var(&a->y, &b->y));
+}
+
+void ge_equals_gej(const secp256k1_ge *a, const secp256k1_gej *b) {
+    secp256k1_fe z2s;
+    secp256k1_fe u1, u2, s1, s2;
+    CHECK(a->infinity == b->infinity);
+    if (a->infinity) {
+        return;
+    }
+    /* Check a.x * b.z^2 == b.x && a.y * b.z^3 == b.y, to avoid inverses. */
+    secp256k1_fe_sqr(&z2s, &b->z);
+    secp256k1_fe_mul(&u1, &a->x, &z2s);
+    u2 = b->x; secp256k1_fe_normalize_weak(&u2);
+    secp256k1_fe_mul(&s1, &a->y, &z2s); secp256k1_fe_mul(&s1, &s1, &b->z);
+    s2 = b->y; secp256k1_fe_normalize_weak(&s2);
+    CHECK(secp256k1_fe_equal_var(&u1, &u2));
+    CHECK(secp256k1_fe_equal_var(&s1, &s2));
+}
+
+void random_fe(secp256k1_fe *x) {
+    unsigned char bin[32];
+    do {
+        secp256k1_rand256(bin);
+        if (secp256k1_fe_set_b32(x, bin)) {
+            return;
+        }
+    } while(1);
+}
+/** END stolen from tests.c */
+
+int secp256k1_nonce_function_smallint(unsigned char *nonce32, const unsigned char *msg32,
+                                      const unsigned char *key32, const unsigned char *algo16,
+                                      void *data, unsigned int attempt) {
+    secp256k1_scalar s;
+    int *idata = data;
+    (void)msg32;
+    (void)key32;
+    (void)algo16;
+    /* Some nonces cannot be used because they'd cause s and/or r to be zero.
+     * The signing function has retry logic here that just re-calls the nonce
+     * function with an increased `attempt`. So if attempt > 0 this means we
+     * need to change the nonce to avoid an infinite loop. */
+    if (attempt > 0) {
+        (*idata)++;
+    }
+    secp256k1_scalar_set_int(&s, *idata);
+    secp256k1_scalar_get_b32(nonce32, &s);
+    return 1;
+}
+
+#ifdef USE_ENDOMORPHISM
+void test_exhaustive_endomorphism(const secp256k1_ge *group, int order) {
+    int i;
+    for (i = 0; i < order; i++) {
+        secp256k1_ge res;
+        secp256k1_ge_mul_lambda(&res, &group[i]);
+        ge_equals_ge(&group[i * EXHAUSTIVE_TEST_LAMBDA % EXHAUSTIVE_TEST_ORDER], &res);
+    }
+}
+#endif
+
+void test_exhaustive_addition(const secp256k1_ge *group, const secp256k1_gej *groupj, int order) {
+    int i, j;
+
+    /* Sanity-check (and check infinity functions) */
+    CHECK(secp256k1_ge_is_infinity(&group[0]));
+    CHECK(secp256k1_gej_is_infinity(&groupj[0]));
+    for (i = 1; i < order; i++) {
+        CHECK(!secp256k1_ge_is_infinity(&group[i]));
+        CHECK(!secp256k1_gej_is_infinity(&groupj[i]));
+    }
+
+    /* Check all addition formulae */
+    for (j = 0; j < order; j++) {
+        secp256k1_fe fe_inv;
+        secp256k1_fe_inv(&fe_inv, &groupj[j].z);
+        for (i = 0; i < order; i++) {
+            secp256k1_ge zless_gej;
+            secp256k1_gej tmp;
+            /* add_var */
+            secp256k1_gej_add_var(&tmp, &groupj[i], &groupj[j], NULL);
+            ge_equals_gej(&group[(i + j) % order], &tmp);
+            /* add_ge */
+            if (j > 0) {
+                secp256k1_gej_add_ge(&tmp, &groupj[i], &group[j]);
+                ge_equals_gej(&group[(i + j) % order], &tmp);
+            }
+            /* add_ge_var */
+            secp256k1_gej_add_ge_var(&tmp, &groupj[i], &group[j], NULL);
+            ge_equals_gej(&group[(i + j) % order], &tmp);
+            /* add_zinv_var */
+            zless_gej.infinity = groupj[j].infinity;
+            zless_gej.x = groupj[j].x;
+            zless_gej.y = groupj[j].y;
+            secp256k1_gej_add_zinv_var(&tmp, &groupj[i], &zless_gej, &fe_inv);
+            ge_equals_gej(&group[(i + j) % order], &tmp);
+        }
+    }
+
+    /* Check doubling */
+    for (i = 0; i < order; i++) {
+        secp256k1_gej tmp;
+        if (i > 0) {
+            secp256k1_gej_double_nonzero(&tmp, &groupj[i], NULL);
+            ge_equals_gej(&group[(2 * i) % order], &tmp);
+        }
+        secp256k1_gej_double_var(&tmp, &groupj[i], NULL);
+        ge_equals_gej(&group[(2 * i) % order], &tmp);
+    }
+
+    /* Check negation */
+    for (i = 1; i < order; i++) {
+        secp256k1_ge tmp;
+        secp256k1_gej tmpj;
+        secp256k1_ge_neg(&tmp, &group[i]);
+        ge_equals_ge(&group[order - i], &tmp);
+        secp256k1_gej_neg(&tmpj, &groupj[i]);
+        ge_equals_gej(&group[order - i], &tmpj);
+    }
+}
+
+void test_exhaustive_ecmult(const secp256k1_context *ctx, const secp256k1_ge *group, const secp256k1_gej *groupj, int order) {
+    int i, j, r_log;
+    for (r_log = 1; r_log < order; r_log++) {
+        for (j = 0; j < order; j++) {
+            for (i = 0; i < order; i++) {
+                secp256k1_gej tmp;
+                secp256k1_scalar na, ng;
+                secp256k1_scalar_set_int(&na, i);
+                secp256k1_scalar_set_int(&ng, j);
+
+                secp256k1_ecmult(&ctx->ecmult_ctx, &tmp, &groupj[r_log], &na, &ng);
+                ge_equals_gej(&group[(i * r_log + j) % order], &tmp);
+
+                if (i > 0) {
+                    secp256k1_ecmult_const(&tmp, &group[i], &ng);
+                    ge_equals_gej(&group[(i * j) % order], &tmp);
+                }
+            }
+        }
+    }
+}
+
+void r_from_k(secp256k1_scalar *r, const secp256k1_ge *group, int k) {
+    secp256k1_fe x;
+    unsigned char x_bin[32];
+    k %= EXHAUSTIVE_TEST_ORDER;
+    x = group[k].x;
+    secp256k1_fe_normalize(&x);
+    secp256k1_fe_get_b32(x_bin, &x);
+    secp256k1_scalar_set_b32(r, x_bin, NULL);
+}
+
+void test_exhaustive_verify(const secp256k1_context *ctx, const secp256k1_ge *group, int order) {
+    int s, r, msg, key;
+    for (s = 1; s < order; s++) {
+        for (r = 1; r < order; r++) {
+            for (msg = 1; msg < order; msg++) {
+                for (key = 1; key < order; key++) {
+                    secp256k1_ge nonconst_ge;
+                    secp256k1_ecdsa_signature sig;
+                    secp256k1_pubkey pk;
+                    secp256k1_scalar sk_s, msg_s, r_s, s_s;
+                    secp256k1_scalar s_times_k_s, msg_plus_r_times_sk_s;
+                    int k, should_verify;
+                    unsigned char msg32[32];
+
+                    secp256k1_scalar_set_int(&s_s, s);
+                    secp256k1_scalar_set_int(&r_s, r);
+                    secp256k1_scalar_set_int(&msg_s, msg);
+                    secp256k1_scalar_set_int(&sk_s, key);
+
+                    /* Verify by hand */
+                    /* Run through every k value that gives us this r and check that *one* works.
+                     * Note there could be none, there could be multiple, ECDSA is weird. */
+                    should_verify = 0;
+                    for (k = 0; k < order; k++) {
+                        secp256k1_scalar check_x_s;
+                        r_from_k(&check_x_s, group, k);
+                        if (r_s == check_x_s) {
+                            secp256k1_scalar_set_int(&s_times_k_s, k);
+                            secp256k1_scalar_mul(&s_times_k_s, &s_times_k_s, &s_s);
+                            secp256k1_scalar_mul(&msg_plus_r_times_sk_s, &r_s, &sk_s);
+                            secp256k1_scalar_add(&msg_plus_r_times_sk_s, &msg_plus_r_times_sk_s, &msg_s);
+                            should_verify |= secp256k1_scalar_eq(&s_times_k_s, &msg_plus_r_times_sk_s);
+                        }
+                    }
+                    /* nb we have a "high s" rule */
+                    should_verify &= !secp256k1_scalar_is_high(&s_s);
+
+                    /* Verify by calling verify */
+                    secp256k1_ecdsa_signature_save(&sig, &r_s, &s_s);
+                    memcpy(&nonconst_ge, &group[sk_s], sizeof(nonconst_ge));
+                    secp256k1_pubkey_save(&pk, &nonconst_ge);
+                    secp256k1_scalar_get_b32(msg32, &msg_s);
+                    CHECK(should_verify ==
+                          secp256k1_ecdsa_verify(ctx, &sig, msg32, &pk));
+                }
+            }
+        }
+    }
+}
+
+void test_exhaustive_sign(const secp256k1_context *ctx, const secp256k1_ge *group, int order) {
+    int i, j, k;
+
+    /* Loop */
+    for (i = 1; i < order; i++) {  /* message */
+        for (j = 1; j < order; j++) {  /* key */
+            for (k = 1; k < order; k++) {  /* nonce */
+                secp256k1_ecdsa_signature sig;
+                secp256k1_scalar sk, msg, r, s, expected_r;
+                unsigned char sk32[32], msg32[32];
+                secp256k1_scalar_set_int(&msg, i);
+                secp256k1_scalar_set_int(&sk, j);
+                secp256k1_scalar_get_b32(sk32, &sk);
+                secp256k1_scalar_get_b32(msg32, &msg);
+
+                secp256k1_ecdsa_sign(ctx, &sig, msg32, sk32, secp256k1_nonce_function_smallint, &k);
+
+                secp256k1_ecdsa_signature_load(ctx, &r, &s, &sig);
+                /* Note that we compute expected_r *after* signing -- this is important
+                 * because our nonce-computing function function might change k during
+                 * signing. */
+                r_from_k(&expected_r, group, k);
+                CHECK(r == expected_r);
+                CHECK((k * s) % order == (i + r * j) % order ||
+                      (k * (EXHAUSTIVE_TEST_ORDER - s)) % order == (i + r * j) % order);
+            }
+        }
+    }
+
+    /* We would like to verify zero-knowledge here by counting how often every
+     * possible (s, r) tuple appears, but because the group order is larger
+     * than the field order, when coercing the x-values to scalar values, some
+     * appear more often than others, so we are actually not zero-knowledge.
+     * (This effect also appears in the real code, but the difference is on the
+     * order of 1/2^128th the field order, so the deviation is not useful to a
+     * computationally bounded attacker.)
+     */
+}
+
+int main(void) {
+    int i;
+    secp256k1_gej groupj[EXHAUSTIVE_TEST_ORDER];
+    secp256k1_ge group[EXHAUSTIVE_TEST_ORDER];
+
+    /* Build context */
+    secp256k1_context *ctx = secp256k1_context_create(SECP256K1_CONTEXT_SIGN | SECP256K1_CONTEXT_VERIFY);
+
+    /* TODO set z = 1, then do num_tests runs with random z values */
+
+    /* Generate the entire group */
+    secp256k1_gej_set_infinity(&groupj[0]);
+    secp256k1_ge_set_gej(&group[0], &groupj[0]);
+    for (i = 1; i < EXHAUSTIVE_TEST_ORDER; i++) {
+        /* Set a different random z-value for each Jacobian point */
+        secp256k1_fe z;
+        random_fe(&z);
+
+        secp256k1_gej_add_ge(&groupj[i], &groupj[i - 1], &secp256k1_ge_const_g);
+        secp256k1_ge_set_gej(&group[i], &groupj[i]);
+        secp256k1_gej_rescale(&groupj[i], &z);
+
+        /* Verify against ecmult_gen */
+        {
+            secp256k1_scalar scalar_i;
+            secp256k1_gej generatedj;
+            secp256k1_ge generated;
+
+            secp256k1_scalar_set_int(&scalar_i, i);
+            secp256k1_ecmult_gen(&ctx->ecmult_gen_ctx, &generatedj, &scalar_i);
+            secp256k1_ge_set_gej(&generated, &generatedj);
+
+            CHECK(group[i].infinity == 0);
+            CHECK(generated.infinity == 0);
+            CHECK(secp256k1_fe_equal_var(&generated.x, &group[i].x));
+            CHECK(secp256k1_fe_equal_var(&generated.y, &group[i].y));
+        }
+    }
+
+    /* Run the tests */
+#ifdef USE_ENDOMORPHISM
+    test_exhaustive_endomorphism(group, EXHAUSTIVE_TEST_ORDER);
+#endif
+    test_exhaustive_addition(group, groupj, EXHAUSTIVE_TEST_ORDER);
+    test_exhaustive_ecmult(ctx, group, groupj, EXHAUSTIVE_TEST_ORDER);
+    test_exhaustive_sign(ctx, group, EXHAUSTIVE_TEST_ORDER);
+    test_exhaustive_verify(ctx, group, EXHAUSTIVE_TEST_ORDER);
+
+    return 0;
+}
+

From b05b1af10b9a5298bd90bea439f0fd6c636e0cfa Mon Sep 17 00:00:00 2001
From: Gregory Maxwell <greg@xiph.org>
Date: Mon, 12 Dec 2016 18:45:56 +0000
Subject: [PATCH 1361/1802] Fix qt/paymentrequestplus.cpp for OpenSSL 1.1 API.

This avoids a compile failure on newly installed debian stretch systems.
---
 src/qt/paymentrequestplus.cpp | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/src/qt/paymentrequestplus.cpp b/src/qt/paymentrequestplus.cpp
index 20e1f79ffa233..82be4d831f6cd 100644
--- a/src/qt/paymentrequestplus.cpp
+++ b/src/qt/paymentrequestplus.cpp
@@ -159,14 +159,24 @@ bool PaymentRequestPlus::getMerchant(X509_STORE* certStore, QString& merchant) c
         std::string data_to_verify;                     // Everything but the signature
         rcopy.SerializeToString(&data_to_verify);
 
-        EVP_MD_CTX ctx;
+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
+        EVP_MD_CTX *ctx = EVP_MD_CTX_new();
+        if (!ctx) throw SSLVerifyError("Error allocating OpenSSL context.");
+#else
+        EVP_MD_CTX _ctx;
+        EVP_MD_CTX *ctx;
+        ctx = &_ctx;
+#endif
         EVP_PKEY *pubkey = X509_get_pubkey(signing_cert);
-        EVP_MD_CTX_init(&ctx);
-        if (!EVP_VerifyInit_ex(&ctx, digestAlgorithm, NULL) ||
-            !EVP_VerifyUpdate(&ctx, data_to_verify.data(), data_to_verify.size()) ||
-            !EVP_VerifyFinal(&ctx, (const unsigned char*)paymentRequest.signature().data(), (unsigned int)paymentRequest.signature().size(), pubkey)) {
+        EVP_MD_CTX_init(ctx);
+        if (!EVP_VerifyInit_ex(ctx, digestAlgorithm, NULL) ||
+            !EVP_VerifyUpdate(ctx, data_to_verify.data(), data_to_verify.size()) ||
+            !EVP_VerifyFinal(ctx, (const unsigned char*)paymentRequest.signature().data(), (unsigned int)paymentRequest.signature().size(), pubkey)) {
             throw SSLVerifyError("Bad signature, invalid payment request.");
         }
+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
+        EVP_MD_CTX_free(ctx);
+#endif
 
         // OpenSSL API for getting human printable strings from certs is baroque.
         int textlen = X509_NAME_get_text_by_NID(certname, NID_commonName, NULL, 0);

From e49a252baee0787c4fdd6a9a0982f2228624dc2a Mon Sep 17 00:00:00 2001
From: Richard Kiss <him@richardkiss.com>
Date: Mon, 12 Dec 2016 12:36:40 -0500
Subject: [PATCH 1362/1802] Fix spelling.

---
 src/test/data/tx_valid.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test/data/tx_valid.json b/src/test/data/tx_valid.json
index 27acb2f16a0ab..a3f47fcee27c5 100644
--- a/src/test/data/tx_valid.json
+++ b/src/test/data/tx_valid.json
@@ -478,7 +478,7 @@
 ["1b2a9a426ba603ba357ce7773cb5805cb9c7c2b386d100d1fc9263513188e680", 0, "0x00 0x20 0xd9bbfbe56af7c4b7f960a70d7ea107156913d9e5a26b0a71429df5e097ca6537", 16777215]],
 "01000000000102e9b542c5176808107ff1df906f46bb1f2583b16112b95ee5380665ba7fcfc0010000000000ffffffff80e68831516392fcd100d186b3c2c7b95c80b53c77e77c35ba03a66b429a2a1b0000000000ffffffff0280969800000000001976a914de4b231626ef508c9a74a8517e6783c0546d6b2888ac80969800000000001976a9146648a8cd4531e1ec47f35916de8e259237294d1e88ac02483045022100f6a10b8604e6dc910194b79ccfc93e1bc0ec7c03453caaa8987f7d6c3413566002206216229ede9b4d6ec2d325be245c5b508ff0339bf1794078e20bfe0babc7ffe683270063ab68210392972e2eb617b2388771abe27235fd5ac44af8e61693261550447a4c3e39da98ac024730440220032521802a76ad7bf74d0e2c218b72cf0cbc867066e2e53db905ba37f130397e02207709e2188ed7f08f4c952d9d13986da504502b8c3be59617e043552f506c46ff83275163ab68210392972e2eb617b2388771abe27235fd5ac44af8e61693261550447a4c3e39da98ac00000000", "P2SH,WITNESS"],
 
-["BIP143 example: Same as the previous example with input-output paris swapped"],
+["BIP143 example: Same as the previous example with input-output pairs swapped"],
 [[["1b2a9a426ba603ba357ce7773cb5805cb9c7c2b386d100d1fc9263513188e680", 0, "0x00 0x20 0xd9bbfbe56af7c4b7f960a70d7ea107156913d9e5a26b0a71429df5e097ca6537", 16777215],
 ["01c0cf7fba650638e55eb91261b183251fbb466f90dff17f10086817c542b5e9", 0, "0x00 0x20 0xba468eea561b26301e4cf69fa34bde4ad60c81e70f059f045ca9a79931004a4d", 16777215]],
 "0100000000010280e68831516392fcd100d186b3c2c7b95c80b53c77e77c35ba03a66b429a2a1b0000000000ffffffffe9b542c5176808107ff1df906f46bb1f2583b16112b95ee5380665ba7fcfc0010000000000ffffffff0280969800000000001976a9146648a8cd4531e1ec47f35916de8e259237294d1e88ac80969800000000001976a914de4b231626ef508c9a74a8517e6783c0546d6b2888ac024730440220032521802a76ad7bf74d0e2c218b72cf0cbc867066e2e53db905ba37f130397e02207709e2188ed7f08f4c952d9d13986da504502b8c3be59617e043552f506c46ff83275163ab68210392972e2eb617b2388771abe27235fd5ac44af8e61693261550447a4c3e39da98ac02483045022100f6a10b8604e6dc910194b79ccfc93e1bc0ec7c03453caaa8987f7d6c3413566002206216229ede9b4d6ec2d325be245c5b508ff0339bf1794078e20bfe0babc7ffe683270063ab68210392972e2eb617b2388771abe27235fd5ac44af8e61693261550447a4c3e39da98ac00000000", "P2SH,WITNESS"],

From 89c8d2c12c4ac71f2454b8d4a04ad2dc5acd6b76 Mon Sep 17 00:00:00 2001
From: Jonas Schnelli <dev@jonasschnelli.ch>
Date: Mon, 12 Dec 2016 15:38:22 +0100
Subject: [PATCH 1363/1802] [Qt] Console: allow empty arguments

---
 src/qt/rpcconsole.cpp | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/qt/rpcconsole.cpp b/src/qt/rpcconsole.cpp
index fef15a32c6bce..2c5b5ee890ba4 100644
--- a/src/qt/rpcconsole.cpp
+++ b/src/qt/rpcconsole.cpp
@@ -137,6 +137,7 @@ bool RPCConsole::RPCExecuteCommandLine(std::string &strResult, const std::string
     enum CmdParseState
     {
         STATE_EATING_SPACES,
+        STATE_EATING_SPACES_IN_ARG,
         STATE_ARGUMENT,
         STATE_SINGLEQUOTED,
         STATE_DOUBLEQUOTED,
@@ -220,6 +221,7 @@ bool RPCConsole::RPCExecuteCommandLine(std::string &strResult, const std::string
                     break;
             }
             case STATE_ARGUMENT: // In or after argument
+            case STATE_EATING_SPACES_IN_ARG:
             case STATE_EATING_SPACES: // Handle runs of whitespace
                 switch(ch)
             {
@@ -231,13 +233,12 @@ bool RPCConsole::RPCExecuteCommandLine(std::string &strResult, const std::string
                     {
                         if (ch == '(' && stack.size() && stack.back().size() > 0)
                             stack.push_back(std::vector<std::string>());
-                        if (curarg.size())
-                        {
-                            // don't allow commands after executed commands on baselevel
-                            if (!stack.size())
-                                throw std::runtime_error("Invalid Syntax");
-                            stack.back().push_back(curarg);
-                        }
+
+                        // don't allow commands after executed commands on baselevel
+                        if (!stack.size())
+                            throw std::runtime_error("Invalid Syntax");
+
+                        stack.back().push_back(curarg);
                         curarg.clear();
                         state = STATE_EATING_SPACES;
                     }
@@ -256,13 +257,12 @@ bool RPCConsole::RPCExecuteCommandLine(std::string &strResult, const std::string
                     }
                     break;
                 case ' ': case ',': case '\t':
-                    if(state == STATE_ARGUMENT) // Space ends argument
+                    if(state == STATE_ARGUMENT || (state == STATE_EATING_SPACES_IN_ARG && ch == ',')) // Space ends argument
                     {
-                        if (curarg.size())
-                            stack.back().push_back(curarg);
+                        stack.back().push_back(curarg);
                         curarg.clear();
                     }
-                    state = STATE_EATING_SPACES;
+                    state = (ch == ',' ? STATE_EATING_SPACES_IN_ARG : STATE_EATING_SPACES);
                     break;
                 default: curarg += ch; state = STATE_ARGUMENT;
             }

From 6a32c0f69de1d9caf1af26e192efbb80f7534fdd Mon Sep 17 00:00:00 2001
From: Luke Dashjr <luke-jr+git@utopios.org>
Date: Mon, 12 Dec 2016 23:04:10 +0000
Subject: [PATCH 1364/1802] Qt/Test: Check handling of empty arguments in RPC
 debug console

---
 src/qt/test/rpcnestedtests.cpp | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/src/qt/test/rpcnestedtests.cpp b/src/qt/test/rpcnestedtests.cpp
index 69757f9a931ff..0aeef045501c9 100644
--- a/src/qt/test/rpcnestedtests.cpp
+++ b/src/qt/test/rpcnestedtests.cpp
@@ -18,6 +18,19 @@
 
 #include <boost/filesystem.hpp>
 
+static UniValue rpcNestedTest_rpc(const JSONRPCRequest& request)
+{
+    if (request.fHelp) {
+        return "help message";
+    }
+    return request.params.write(0, 0);
+}
+
+static const CRPCCommand vRPCCommands[] =
+{
+    { "test", "rpcNestedTest", &rpcNestedTest_rpc, true },
+};
+
 void RPCNestedTests::rpcNestedTests()
 {
     UniValue jsonRPCError;
@@ -26,6 +39,7 @@ void RPCNestedTests::rpcNestedTests()
     // could be moved to a more generic place when we add more tests on QT level
     const CChainParams& chainparams = Params();
     RegisterAllCoreRPCCommands(tableRPC);
+    tableRPC.appendCommand("rpcNestedTest", &vRPCCommands[0]);
     ClearDatadirCache();
     std::string path = QDir::tempPath().toStdString() + "/" + strprintf("test_bitcoin_qt_%lu_%i", (unsigned long)GetTime(), (int)(GetRand(100000)));
     QDir dir(QString::fromStdString(path));
@@ -85,6 +99,23 @@ void RPCNestedTests::rpcNestedTests()
     RPCConsole::RPCExecuteCommandLine(result, "getblock(getbestblockhash())[tx][0]");
     QVERIFY(result == "4a5e1e4baab89f3a32518a88c31bc87f618f76673e2cc77ab2127b7afdeda33b");
 
+    RPCConsole::RPCExecuteCommandLine(result, "rpcNestedTest");
+    QVERIFY(result == "[]");
+    RPCConsole::RPCExecuteCommandLine(result, "rpcNestedTest ''");
+    QVERIFY(result == "[\"\"]");
+    RPCConsole::RPCExecuteCommandLine(result, "rpcNestedTest \"\"");
+    QVERIFY(result == "[\"\"]");
+    RPCConsole::RPCExecuteCommandLine(result, "rpcNestedTest '' abc");
+    QVERIFY(result == "[\"\",\"abc\"]");
+    RPCConsole::RPCExecuteCommandLine(result, "rpcNestedTest abc '' abc");
+    QVERIFY(result == "[\"abc\",\"\",\"abc\"]");
+    RPCConsole::RPCExecuteCommandLine(result, "rpcNestedTest abc  abc");
+    QVERIFY(result == "[\"abc\",\"abc\"]");
+    RPCConsole::RPCExecuteCommandLine(result, "rpcNestedTest abc\t\tabc");
+    QVERIFY(result == "[\"abc\",\"abc\"]");
+    RPCConsole::RPCExecuteCommandLine(result, "rpcNestedTest abc,,abc");
+    QVERIFY(result == "[\"abc\",\"\",\"abc\"]");
+
     delete pcoinsTip;
     delete pcoinsdbview;
     delete pblocktree;

From 0b2294a980319cbffa8612ce993e0ecaa26fa509 Mon Sep 17 00:00:00 2001
From: Gregory Sanders <gsanders87@gmail.com>
Date: Fri, 2 Dec 2016 15:29:20 -0500
Subject: [PATCH 1365/1802] SelectCoinsMinConf: Prefer coins with fewer
 ancestors

---
 src/bench/coin_selection.cpp     |  2 +-
 src/txmempool.cpp                |  7 +++
 src/txmempool.h                  |  3 ++
 src/wallet/test/wallet_tests.cpp | 74 ++++++++++++++++----------------
 src/wallet/wallet.cpp            | 19 ++++++--
 src/wallet/wallet.h              |  4 +-
 6 files changed, 66 insertions(+), 43 deletions(-)

diff --git a/src/bench/coin_selection.cpp b/src/bench/coin_selection.cpp
index 7091ee3e11435..ce1ce511e38fb 100644
--- a/src/bench/coin_selection.cpp
+++ b/src/bench/coin_selection.cpp
@@ -52,7 +52,7 @@ static void CoinSelection(benchmark::State& state)
 
         set<pair<const CWalletTx*, unsigned int> > setCoinsRet;
         CAmount nValueRet;
-        bool success = wallet.SelectCoinsMinConf(1003 * COIN, 1, 6, vCoins, setCoinsRet, nValueRet);
+        bool success = wallet.SelectCoinsMinConf(1003 * COIN, 1, 6, 0, vCoins, setCoinsRet, nValueRet);
         assert(success);
         assert(nValueRet == 1003 * COIN);
         assert(setCoinsRet.size() == 2);
diff --git a/src/txmempool.cpp b/src/txmempool.cpp
index 417a88cbef013..f87713006a8a1 100644
--- a/src/txmempool.cpp
+++ b/src/txmempool.cpp
@@ -1142,3 +1142,10 @@ void CTxMemPool::TrimToSize(size_t sizelimit, std::vector<uint256>* pvNoSpendsRe
     if (maxFeeRateRemoved > CFeeRate(0))
         LogPrint("mempool", "Removed %u txn, rolling minimum fee bumped to %s\n", nTxnRemoved, maxFeeRateRemoved.ToString());
 }
+
+bool CTxMemPool::TransactionWithinChainLimit(const uint256& txid, size_t chainLimit) const {
+    LOCK(cs);
+    if (exists(txid) && std::max(mapTx.find(txid)->GetCountWithAncestors(), mapTx.find(txid)->GetCountWithDescendants()) >= chainLimit)
+        return false;
+    return true;
+}
diff --git a/src/txmempool.h b/src/txmempool.h
index 23fe5a7abead8..ef445abaab5e4 100644
--- a/src/txmempool.h
+++ b/src/txmempool.h
@@ -605,6 +605,9 @@ class CTxMemPool
     /** Expire all transaction (and their dependencies) in the mempool older than time. Return the number of removed transactions. */
     int Expire(int64_t time);
 
+    /** Returns false if the transaction is in the mempool and not within the chain limit specified. */
+    bool TransactionWithinChainLimit(const uint256& txid, size_t chainLimit) const;
+
     unsigned long size()
     {
         LOCK(cs);
diff --git a/src/wallet/test/wallet_tests.cpp b/src/wallet/test/wallet_tests.cpp
index ecbbcb145da51..ce42fad5ded70 100644
--- a/src/wallet/test/wallet_tests.cpp
+++ b/src/wallet/test/wallet_tests.cpp
@@ -78,24 +78,24 @@ BOOST_AUTO_TEST_CASE(coin_selection_tests)
         empty_wallet();
 
         // with an empty wallet we can't even pay one cent
-        BOOST_CHECK(!wallet.SelectCoinsMinConf( 1 * CENT, 1, 6, vCoins, setCoinsRet, nValueRet));
+        BOOST_CHECK(!wallet.SelectCoinsMinConf( 1 * CENT, 1, 6, 0, vCoins, setCoinsRet, nValueRet));
 
         add_coin(1*CENT, 4);        // add a new 1 cent coin
 
         // with a new 1 cent coin, we still can't find a mature 1 cent
-        BOOST_CHECK(!wallet.SelectCoinsMinConf( 1 * CENT, 1, 6, vCoins, setCoinsRet, nValueRet));
+        BOOST_CHECK(!wallet.SelectCoinsMinConf( 1 * CENT, 1, 6, 0, vCoins, setCoinsRet, nValueRet));
 
         // but we can find a new 1 cent
-        BOOST_CHECK( wallet.SelectCoinsMinConf( 1 * CENT, 1, 1, vCoins, setCoinsRet, nValueRet));
+        BOOST_CHECK( wallet.SelectCoinsMinConf( 1 * CENT, 1, 1, 0, vCoins, setCoinsRet, nValueRet));
         BOOST_CHECK_EQUAL(nValueRet, 1 * CENT);
 
         add_coin(2*CENT);           // add a mature 2 cent coin
 
         // we can't make 3 cents of mature coins
-        BOOST_CHECK(!wallet.SelectCoinsMinConf( 3 * CENT, 1, 6, vCoins, setCoinsRet, nValueRet));
+        BOOST_CHECK(!wallet.SelectCoinsMinConf( 3 * CENT, 1, 6, 0, vCoins, setCoinsRet, nValueRet));
 
         // we can make 3 cents of new  coins
-        BOOST_CHECK( wallet.SelectCoinsMinConf( 3 * CENT, 1, 1, vCoins, setCoinsRet, nValueRet));
+        BOOST_CHECK( wallet.SelectCoinsMinConf( 3 * CENT, 1, 1, 0, vCoins, setCoinsRet, nValueRet));
         BOOST_CHECK_EQUAL(nValueRet, 3 * CENT);
 
         add_coin(5*CENT);           // add a mature 5 cent coin,
@@ -105,33 +105,33 @@ BOOST_AUTO_TEST_CASE(coin_selection_tests)
         // now we have new: 1+10=11 (of which 10 was self-sent), and mature: 2+5+20=27.  total = 38
 
         // we can't make 38 cents only if we disallow new coins:
-        BOOST_CHECK(!wallet.SelectCoinsMinConf(38 * CENT, 1, 6, vCoins, setCoinsRet, nValueRet));
+        BOOST_CHECK(!wallet.SelectCoinsMinConf(38 * CENT, 1, 6, 0, vCoins, setCoinsRet, nValueRet));
         // we can't even make 37 cents if we don't allow new coins even if they're from us
-        BOOST_CHECK(!wallet.SelectCoinsMinConf(38 * CENT, 6, 6, vCoins, setCoinsRet, nValueRet));
+        BOOST_CHECK(!wallet.SelectCoinsMinConf(38 * CENT, 6, 6, 0, vCoins, setCoinsRet, nValueRet));
         // but we can make 37 cents if we accept new coins from ourself
-        BOOST_CHECK( wallet.SelectCoinsMinConf(37 * CENT, 1, 6, vCoins, setCoinsRet, nValueRet));
+        BOOST_CHECK( wallet.SelectCoinsMinConf(37 * CENT, 1, 6, 0, vCoins, setCoinsRet, nValueRet));
         BOOST_CHECK_EQUAL(nValueRet, 37 * CENT);
         // and we can make 38 cents if we accept all new coins
-        BOOST_CHECK( wallet.SelectCoinsMinConf(38 * CENT, 1, 1, vCoins, setCoinsRet, nValueRet));
+        BOOST_CHECK( wallet.SelectCoinsMinConf(38 * CENT, 1, 1, 0, vCoins, setCoinsRet, nValueRet));
         BOOST_CHECK_EQUAL(nValueRet, 38 * CENT);
 
         // try making 34 cents from 1,2,5,10,20 - we can't do it exactly
-        BOOST_CHECK( wallet.SelectCoinsMinConf(34 * CENT, 1, 1, vCoins, setCoinsRet, nValueRet));
+        BOOST_CHECK( wallet.SelectCoinsMinConf(34 * CENT, 1, 1, 0, vCoins, setCoinsRet, nValueRet));
         BOOST_CHECK_EQUAL(nValueRet, 35 * CENT);       // but 35 cents is closest
         BOOST_CHECK_EQUAL(setCoinsRet.size(), 3U);     // the best should be 20+10+5.  it's incredibly unlikely the 1 or 2 got included (but possible)
 
         // when we try making 7 cents, the smaller coins (1,2,5) are enough.  We should see just 2+5
-        BOOST_CHECK( wallet.SelectCoinsMinConf( 7 * CENT, 1, 1, vCoins, setCoinsRet, nValueRet));
+        BOOST_CHECK( wallet.SelectCoinsMinConf( 7 * CENT, 1, 1, 0, vCoins, setCoinsRet, nValueRet));
         BOOST_CHECK_EQUAL(nValueRet, 7 * CENT);
         BOOST_CHECK_EQUAL(setCoinsRet.size(), 2U);
 
         // when we try making 8 cents, the smaller coins (1,2,5) are exactly enough.
-        BOOST_CHECK( wallet.SelectCoinsMinConf( 8 * CENT, 1, 1, vCoins, setCoinsRet, nValueRet));
+        BOOST_CHECK( wallet.SelectCoinsMinConf( 8 * CENT, 1, 1, 0, vCoins, setCoinsRet, nValueRet));
         BOOST_CHECK(nValueRet == 8 * CENT);
         BOOST_CHECK_EQUAL(setCoinsRet.size(), 3U);
 
         // when we try making 9 cents, no subset of smaller coins is enough, and we get the next bigger coin (10)
-        BOOST_CHECK( wallet.SelectCoinsMinConf( 9 * CENT, 1, 1, vCoins, setCoinsRet, nValueRet));
+        BOOST_CHECK( wallet.SelectCoinsMinConf( 9 * CENT, 1, 1, 0, vCoins, setCoinsRet, nValueRet));
         BOOST_CHECK_EQUAL(nValueRet, 10 * CENT);
         BOOST_CHECK_EQUAL(setCoinsRet.size(), 1U);
 
@@ -145,30 +145,30 @@ BOOST_AUTO_TEST_CASE(coin_selection_tests)
         add_coin(30*CENT); // now we have 6+7+8+20+30 = 71 cents total
 
         // check that we have 71 and not 72
-        BOOST_CHECK( wallet.SelectCoinsMinConf(71 * CENT, 1, 1, vCoins, setCoinsRet, nValueRet));
-        BOOST_CHECK(!wallet.SelectCoinsMinConf(72 * CENT, 1, 1, vCoins, setCoinsRet, nValueRet));
+        BOOST_CHECK( wallet.SelectCoinsMinConf(71 * CENT, 1, 1, 0, vCoins, setCoinsRet, nValueRet));
+        BOOST_CHECK(!wallet.SelectCoinsMinConf(72 * CENT, 1, 1, 0, vCoins, setCoinsRet, nValueRet));
 
         // now try making 16 cents.  the best smaller coins can do is 6+7+8 = 21; not as good at the next biggest coin, 20
-        BOOST_CHECK( wallet.SelectCoinsMinConf(16 * CENT, 1, 1, vCoins, setCoinsRet, nValueRet));
+        BOOST_CHECK( wallet.SelectCoinsMinConf(16 * CENT, 1, 1, 0, vCoins, setCoinsRet, nValueRet));
         BOOST_CHECK_EQUAL(nValueRet, 20 * CENT); // we should get 20 in one coin
         BOOST_CHECK_EQUAL(setCoinsRet.size(), 1U);
 
         add_coin( 5*CENT); // now we have 5+6+7+8+20+30 = 75 cents total
 
         // now if we try making 16 cents again, the smaller coins can make 5+6+7 = 18 cents, better than the next biggest coin, 20
-        BOOST_CHECK( wallet.SelectCoinsMinConf(16 * CENT, 1, 1, vCoins, setCoinsRet, nValueRet));
+        BOOST_CHECK( wallet.SelectCoinsMinConf(16 * CENT, 1, 1, 0, vCoins, setCoinsRet, nValueRet));
         BOOST_CHECK_EQUAL(nValueRet, 18 * CENT); // we should get 18 in 3 coins
         BOOST_CHECK_EQUAL(setCoinsRet.size(), 3U);
 
         add_coin( 18*CENT); // now we have 5+6+7+8+18+20+30
 
         // and now if we try making 16 cents again, the smaller coins can make 5+6+7 = 18 cents, the same as the next biggest coin, 18
-        BOOST_CHECK( wallet.SelectCoinsMinConf(16 * CENT, 1, 1, vCoins, setCoinsRet, nValueRet));
+        BOOST_CHECK( wallet.SelectCoinsMinConf(16 * CENT, 1, 1, 0, vCoins, setCoinsRet, nValueRet));
         BOOST_CHECK_EQUAL(nValueRet, 18 * CENT);  // we should get 18 in 1 coin
         BOOST_CHECK_EQUAL(setCoinsRet.size(), 1U); // because in the event of a tie, the biggest coin wins
 
         // now try making 11 cents.  we should get 5+6
-        BOOST_CHECK( wallet.SelectCoinsMinConf(11 * CENT, 1, 1, vCoins, setCoinsRet, nValueRet));
+        BOOST_CHECK( wallet.SelectCoinsMinConf(11 * CENT, 1, 1, 0, vCoins, setCoinsRet, nValueRet));
         BOOST_CHECK_EQUAL(nValueRet, 11 * CENT);
         BOOST_CHECK_EQUAL(setCoinsRet.size(), 2U);
 
@@ -177,11 +177,11 @@ BOOST_AUTO_TEST_CASE(coin_selection_tests)
         add_coin( 2*COIN);
         add_coin( 3*COIN);
         add_coin( 4*COIN); // now we have 5+6+7+8+18+20+30+100+200+300+400 = 1094 cents
-        BOOST_CHECK( wallet.SelectCoinsMinConf(95 * CENT, 1, 1, vCoins, setCoinsRet, nValueRet));
+        BOOST_CHECK( wallet.SelectCoinsMinConf(95 * CENT, 1, 1, 0, vCoins, setCoinsRet, nValueRet));
         BOOST_CHECK_EQUAL(nValueRet, 1 * COIN);  // we should get 1 BTC in 1 coin
         BOOST_CHECK_EQUAL(setCoinsRet.size(), 1U);
 
-        BOOST_CHECK( wallet.SelectCoinsMinConf(195 * CENT, 1, 1, vCoins, setCoinsRet, nValueRet));
+        BOOST_CHECK( wallet.SelectCoinsMinConf(195 * CENT, 1, 1, 0, vCoins, setCoinsRet, nValueRet));
         BOOST_CHECK_EQUAL(nValueRet, 2 * COIN);  // we should get 2 BTC in 1 coin
         BOOST_CHECK_EQUAL(setCoinsRet.size(), 1U);
 
@@ -196,14 +196,14 @@ BOOST_AUTO_TEST_CASE(coin_selection_tests)
 
         // try making 1 * MIN_CHANGE from the 1.5 * MIN_CHANGE
         // we'll get change smaller than MIN_CHANGE whatever happens, so can expect MIN_CHANGE exactly
-        BOOST_CHECK( wallet.SelectCoinsMinConf(MIN_CHANGE, 1, 1, vCoins, setCoinsRet, nValueRet));
+        BOOST_CHECK( wallet.SelectCoinsMinConf(MIN_CHANGE, 1, 1, 0, vCoins, setCoinsRet, nValueRet));
         BOOST_CHECK_EQUAL(nValueRet, MIN_CHANGE);
 
         // but if we add a bigger coin, small change is avoided
         add_coin(1111*MIN_CHANGE);
 
         // try making 1 from 0.1 + 0.2 + 0.3 + 0.4 + 0.5 + 1111 = 1112.5
-        BOOST_CHECK( wallet.SelectCoinsMinConf(1 * MIN_CHANGE, 1, 1, vCoins, setCoinsRet, nValueRet));
+        BOOST_CHECK( wallet.SelectCoinsMinConf(1 * MIN_CHANGE, 1, 1, 0, vCoins, setCoinsRet, nValueRet));
         BOOST_CHECK_EQUAL(nValueRet, 1 * MIN_CHANGE); // we should get the exact amount
 
         // if we add more small coins:
@@ -211,7 +211,7 @@ BOOST_AUTO_TEST_CASE(coin_selection_tests)
         add_coin(MIN_CHANGE * 7 / 10);
 
         // and try again to make 1.0 * MIN_CHANGE
-        BOOST_CHECK( wallet.SelectCoinsMinConf(1 * MIN_CHANGE, 1, 1, vCoins, setCoinsRet, nValueRet));
+        BOOST_CHECK( wallet.SelectCoinsMinConf(1 * MIN_CHANGE, 1, 1, 0, vCoins, setCoinsRet, nValueRet));
         BOOST_CHECK_EQUAL(nValueRet, 1 * MIN_CHANGE); // we should get the exact amount
 
         // run the 'mtgox' test (see http://blockexplorer.com/tx/29a3efd3ef04f9153d47a990bd7b048a4b2d213daaa5fb8ed670fb85f13bdbcf)
@@ -220,7 +220,7 @@ BOOST_AUTO_TEST_CASE(coin_selection_tests)
         for (int j = 0; j < 20; j++)
             add_coin(50000 * COIN);
 
-        BOOST_CHECK( wallet.SelectCoinsMinConf(500000 * COIN, 1, 1, vCoins, setCoinsRet, nValueRet));
+        BOOST_CHECK( wallet.SelectCoinsMinConf(500000 * COIN, 1, 1, 0, vCoins, setCoinsRet, nValueRet));
         BOOST_CHECK_EQUAL(nValueRet, 500000 * COIN); // we should get the exact amount
         BOOST_CHECK_EQUAL(setCoinsRet.size(), 10U); // in ten coins
 
@@ -233,7 +233,7 @@ BOOST_AUTO_TEST_CASE(coin_selection_tests)
         add_coin(MIN_CHANGE * 6 / 10);
         add_coin(MIN_CHANGE * 7 / 10);
         add_coin(1111 * MIN_CHANGE);
-        BOOST_CHECK( wallet.SelectCoinsMinConf(1 * MIN_CHANGE, 1, 1, vCoins, setCoinsRet, nValueRet));
+        BOOST_CHECK( wallet.SelectCoinsMinConf(1 * MIN_CHANGE, 1, 1, 0, vCoins, setCoinsRet, nValueRet));
         BOOST_CHECK_EQUAL(nValueRet, 1111 * MIN_CHANGE); // we get the bigger coin
         BOOST_CHECK_EQUAL(setCoinsRet.size(), 1U);
 
@@ -243,7 +243,7 @@ BOOST_AUTO_TEST_CASE(coin_selection_tests)
         add_coin(MIN_CHANGE * 6 / 10);
         add_coin(MIN_CHANGE * 8 / 10);
         add_coin(1111 * MIN_CHANGE);
-        BOOST_CHECK( wallet.SelectCoinsMinConf(MIN_CHANGE, 1, 1, vCoins, setCoinsRet, nValueRet));
+        BOOST_CHECK( wallet.SelectCoinsMinConf(MIN_CHANGE, 1, 1, 0, vCoins, setCoinsRet, nValueRet));
         BOOST_CHECK_EQUAL(nValueRet, MIN_CHANGE);   // we should get the exact amount
         BOOST_CHECK_EQUAL(setCoinsRet.size(), 2U); // in two coins 0.4+0.6
 
@@ -254,12 +254,12 @@ BOOST_AUTO_TEST_CASE(coin_selection_tests)
         add_coin(MIN_CHANGE * 100);
 
         // trying to make 100.01 from these three coins
-        BOOST_CHECK(wallet.SelectCoinsMinConf(MIN_CHANGE * 10001 / 100, 1, 1, vCoins, setCoinsRet, nValueRet));
+        BOOST_CHECK(wallet.SelectCoinsMinConf(MIN_CHANGE * 10001 / 100, 1, 1, 0, vCoins, setCoinsRet, nValueRet));
         BOOST_CHECK_EQUAL(nValueRet, MIN_CHANGE * 10105 / 100); // we should get all coins
         BOOST_CHECK_EQUAL(setCoinsRet.size(), 3U);
 
         // but if we try to make 99.9, we should take the bigger of the two small coins to avoid small change
-        BOOST_CHECK(wallet.SelectCoinsMinConf(MIN_CHANGE * 9990 / 100, 1, 1, vCoins, setCoinsRet, nValueRet));
+        BOOST_CHECK(wallet.SelectCoinsMinConf(MIN_CHANGE * 9990 / 100, 1, 1, 0, vCoins, setCoinsRet, nValueRet));
         BOOST_CHECK_EQUAL(nValueRet, 101 * MIN_CHANGE);
         BOOST_CHECK_EQUAL(setCoinsRet.size(), 2U);
 
@@ -269,7 +269,7 @@ BOOST_AUTO_TEST_CASE(coin_selection_tests)
              // Create 676 inputs (=  (old MAX_STANDARD_TX_SIZE == 100000)  / 148 bytes per input)
              for (uint16_t j = 0; j < 676; j++)
                  add_coin(amt);
-             BOOST_CHECK(wallet.SelectCoinsMinConf(2000, 1, 1, vCoins, setCoinsRet, nValueRet));
+             BOOST_CHECK(wallet.SelectCoinsMinConf(2000, 1, 1, 0, vCoins, setCoinsRet, nValueRet));
              if (amt - 2000 < MIN_CHANGE) {
                  // needs more than one input:
                  uint16_t returnSize = std::ceil((2000.0 + MIN_CHANGE)/amt);
@@ -291,8 +291,8 @@ BOOST_AUTO_TEST_CASE(coin_selection_tests)
 
             // picking 50 from 100 coins doesn't depend on the shuffle,
             // but does depend on randomness in the stochastic approximation code
-            BOOST_CHECK(wallet.SelectCoinsMinConf(50 * COIN, 1, 6, vCoins, setCoinsRet , nValueRet));
-            BOOST_CHECK(wallet.SelectCoinsMinConf(50 * COIN, 1, 6, vCoins, setCoinsRet2, nValueRet));
+            BOOST_CHECK(wallet.SelectCoinsMinConf(50 * COIN, 1, 6, 0, vCoins, setCoinsRet , nValueRet));
+            BOOST_CHECK(wallet.SelectCoinsMinConf(50 * COIN, 1, 6, 0, vCoins, setCoinsRet2, nValueRet));
             BOOST_CHECK(!equal_sets(setCoinsRet, setCoinsRet2));
 
             int fails = 0;
@@ -300,8 +300,8 @@ BOOST_AUTO_TEST_CASE(coin_selection_tests)
             {
                 // selecting 1 from 100 identical coins depends on the shuffle; this test will fail 1% of the time
                 // run the test RANDOM_REPEATS times and only complain if all of them fail
-                BOOST_CHECK(wallet.SelectCoinsMinConf(COIN, 1, 6, vCoins, setCoinsRet , nValueRet));
-                BOOST_CHECK(wallet.SelectCoinsMinConf(COIN, 1, 6, vCoins, setCoinsRet2, nValueRet));
+                BOOST_CHECK(wallet.SelectCoinsMinConf(COIN, 1, 6, 0, vCoins, setCoinsRet , nValueRet));
+                BOOST_CHECK(wallet.SelectCoinsMinConf(COIN, 1, 6, 0, vCoins, setCoinsRet2, nValueRet));
                 if (equal_sets(setCoinsRet, setCoinsRet2))
                     fails++;
             }
@@ -321,8 +321,8 @@ BOOST_AUTO_TEST_CASE(coin_selection_tests)
             {
                 // selecting 1 from 100 identical coins depends on the shuffle; this test will fail 1% of the time
                 // run the test RANDOM_REPEATS times and only complain if all of them fail
-                BOOST_CHECK(wallet.SelectCoinsMinConf(90*CENT, 1, 6, vCoins, setCoinsRet , nValueRet));
-                BOOST_CHECK(wallet.SelectCoinsMinConf(90*CENT, 1, 6, vCoins, setCoinsRet2, nValueRet));
+                BOOST_CHECK(wallet.SelectCoinsMinConf(90*CENT, 1, 6, 0, vCoins, setCoinsRet , nValueRet));
+                BOOST_CHECK(wallet.SelectCoinsMinConf(90*CENT, 1, 6, 0, vCoins, setCoinsRet2, nValueRet));
                 if (equal_sets(setCoinsRet, setCoinsRet2))
                     fails++;
             }
@@ -346,7 +346,7 @@ BOOST_AUTO_TEST_CASE(ApproximateBestSubset)
         add_coin(1000 * COIN);
     add_coin(3 * COIN);
 
-    BOOST_CHECK(wallet.SelectCoinsMinConf(1003 * COIN, 1, 6, vCoins, setCoinsRet, nValueRet));
+    BOOST_CHECK(wallet.SelectCoinsMinConf(1003 * COIN, 1, 6, 0, vCoins, setCoinsRet, nValueRet));
     BOOST_CHECK_EQUAL(nValueRet, 1003 * COIN);
     BOOST_CHECK_EQUAL(setCoinsRet.size(), 2U);
 }
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index 39c4fc3f1bbcb..8b6f376e91d3d 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -2017,7 +2017,7 @@ static void ApproximateBestSubset(vector<pair<CAmount, pair<const CWalletTx*,uns
     }
 }
 
-bool CWallet::SelectCoinsMinConf(const CAmount& nTargetValue, int nConfMine, int nConfTheirs, vector<COutput> vCoins,
+bool CWallet::SelectCoinsMinConf(const CAmount& nTargetValue, const int nConfMine, const int nConfTheirs, const uint64_t nMaxAncestors, vector<COutput> vCoins,
                                  set<pair<const CWalletTx*,unsigned int> >& setCoinsRet, CAmount& nValueRet) const
 {
     setCoinsRet.clear();
@@ -2042,6 +2042,9 @@ bool CWallet::SelectCoinsMinConf(const CAmount& nTargetValue, int nConfMine, int
         if (output.nDepth < (pcoin->IsFromMe(ISMINE_ALL) ? nConfMine : nConfTheirs))
             continue;
 
+        if (!mempool.TransactionWithinChainLimit(pcoin->GetHash(), nMaxAncestors))
+            continue;
+
         int i = output.i;
         CAmount n = pcoin->vout[i].nValue;
 
@@ -2167,10 +2170,17 @@ bool CWallet::SelectCoins(const vector<COutput>& vAvailableCoins, const CAmount&
             ++it;
     }
 
+    size_t nMaxChainLength = std::min(GetArg("-limitancestorcount", DEFAULT_ANCESTOR_LIMIT), GetArg("-limitdescendantcount", DEFAULT_DESCENDANT_LIMIT));
+    bool fRejectLongChains = GetBoolArg("-walletrejectlongchains", DEFAULT_WALLET_REJECT_LONG_CHAINS);
+
     bool res = nTargetValue <= nValueFromPresetInputs ||
-        SelectCoinsMinConf(nTargetValue - nValueFromPresetInputs, 1, 6, vCoins, setCoinsRet, nValueRet) ||
-        SelectCoinsMinConf(nTargetValue - nValueFromPresetInputs, 1, 1, vCoins, setCoinsRet, nValueRet) ||
-        (bSpendZeroConfChange && SelectCoinsMinConf(nTargetValue - nValueFromPresetInputs, 0, 1, vCoins, setCoinsRet, nValueRet));
+        SelectCoinsMinConf(nTargetValue - nValueFromPresetInputs, 1, 6, 0, vCoins, setCoinsRet, nValueRet) ||
+        SelectCoinsMinConf(nTargetValue - nValueFromPresetInputs, 1, 1, 0, vCoins, setCoinsRet, nValueRet) ||
+        (bSpendZeroConfChange && SelectCoinsMinConf(nTargetValue - nValueFromPresetInputs, 0, 1, 2, vCoins, setCoinsRet, nValueRet)) ||
+        (bSpendZeroConfChange && SelectCoinsMinConf(nTargetValue - nValueFromPresetInputs, 0, 1, std::min((size_t)4, nMaxChainLength/3), vCoins, setCoinsRet, nValueRet)) ||
+        (bSpendZeroConfChange && SelectCoinsMinConf(nTargetValue - nValueFromPresetInputs, 0, 1, nMaxChainLength/2, vCoins, setCoinsRet, nValueRet)) ||
+        (bSpendZeroConfChange && SelectCoinsMinConf(nTargetValue - nValueFromPresetInputs, 0, 1, nMaxChainLength, vCoins, setCoinsRet, nValueRet)) ||
+        (bSpendZeroConfChange && !fRejectLongChains && SelectCoinsMinConf(nTargetValue - nValueFromPresetInputs, 0, 1, std::numeric_limits<uint64_t>::max(), vCoins, setCoinsRet, nValueRet));
 
     // because SelectCoinsMinConf clears the setCoinsRet, we now add the possible inputs to the coinset
     setCoinsRet.insert(setPresetCoins.begin(), setPresetCoins.end());
@@ -3369,6 +3379,7 @@ std::string CWallet::GetWalletHelpString(bool showDebug)
         strUsage += HelpMessageOpt("-dblogsize=<n>", strprintf("Flush wallet database activity from memory to disk log every <n> megabytes (default: %u)", DEFAULT_WALLET_DBLOGSIZE));
         strUsage += HelpMessageOpt("-flushwallet", strprintf("Run a thread to flush wallet periodically (default: %u)", DEFAULT_FLUSHWALLET));
         strUsage += HelpMessageOpt("-privdb", strprintf("Sets the DB_PRIVATE flag in the wallet db environment (default: %u)", DEFAULT_WALLET_PRIVDB));
+        strUsage += HelpMessageOpt("-walletrejectlongchains", strprintf(_("Wallet will not create transactions that violate mempool chain limits (default: %u"), DEFAULT_WALLET_REJECT_LONG_CHAINS));
     }
 
     return strUsage;
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
index 409d817046424..47441c7a5d8c6 100644
--- a/src/wallet/wallet.h
+++ b/src/wallet/wallet.h
@@ -53,6 +53,8 @@ static const CAmount MIN_CHANGE = CENT;
 static const bool DEFAULT_SPEND_ZEROCONF_CHANGE = true;
 //! Default for -sendfreetransactions
 static const bool DEFAULT_SEND_FREE_TRANSACTIONS = false;
+//! Default for -walletrejectlongchains
+static const bool DEFAULT_WALLET_REJECT_LONG_CHAINS = false;
 //! -txconfirmtarget default
 static const unsigned int DEFAULT_TX_CONFIRM_TARGET = 6;
 //! -walletrbf default
@@ -685,7 +687,7 @@ class CWallet : public CCryptoKeyStore, public CValidationInterface
      * completion the coin set and corresponding actual target value is
      * assembled
      */
-    bool SelectCoinsMinConf(const CAmount& nTargetValue, int nConfMine, int nConfTheirs, std::vector<COutput> vCoins, std::set<std::pair<const CWalletTx*,unsigned int> >& setCoinsRet, CAmount& nValueRet) const;
+    bool SelectCoinsMinConf(const CAmount& nTargetValue, int nConfMine, int nConfTheirs, uint64_t nMaxAncestors, std::vector<COutput> vCoins, std::set<std::pair<const CWalletTx*,unsigned int> >& setCoinsRet, CAmount& nValueRet) const;
 
     bool IsSpent(const uint256& hash, unsigned int n) const;
 

From 5882c099d9af6e8566d0bf46fb1da424a4373bf8 Mon Sep 17 00:00:00 2001
From: Gregory Sanders <gsanders87@gmail.com>
Date: Fri, 2 Dec 2016 15:45:43 -0500
Subject: [PATCH 1366/1802] CreateTransaction: Don't return success with
 too-many-ancestor txn

---
 src/wallet/wallet.cpp | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index 8b6f376e91d3d..f1d8020e7536c 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -2555,6 +2555,21 @@ bool CWallet::CreateTransaction(const vector<CRecipient>& vecSend, CWalletTx& wt
         }
     }
 
+    if (GetBoolArg("-walletrejectlongchains", DEFAULT_WALLET_REJECT_LONG_CHAINS)) {
+        // Lastly, ensure this tx will pass the mempool's chain limits
+        LockPoints lp;
+        CTxMemPoolEntry entry(txNew, 0, 0, 0, 0, false, 0, false, 0, lp);
+        CTxMemPool::setEntries setAncestors;
+        size_t nLimitAncestors = GetArg("-limitancestorcount", DEFAULT_ANCESTOR_LIMIT);
+        size_t nLimitAncestorSize = GetArg("-limitancestorsize", DEFAULT_ANCESTOR_SIZE_LIMIT)*1000;
+        size_t nLimitDescendants = GetArg("-limitdescendantcount", DEFAULT_DESCENDANT_LIMIT);
+        size_t nLimitDescendantSize = GetArg("-limitdescendantsize", DEFAULT_DESCENDANT_SIZE_LIMIT)*1000;
+        std::string errString;
+        if (!mempool.CalculateMemPoolAncestors(entry, setAncestors, nLimitAncestors, nLimitAncestorSize, nLimitDescendants, nLimitDescendantSize, errString)) {
+            strFailReason = _("Transaction has too long of a mempool chain");
+            return false;
+        }
+    }
     return true;
 }
 

From af9bedbff68b8aac64f2dbdf396409a541865188 Mon Sep 17 00:00:00 2001
From: Gregory Sanders <gsanders87@gmail.com>
Date: Fri, 2 Dec 2016 12:20:29 -0500
Subject: [PATCH 1367/1802] Test for fix of txn chaining in wallet

---
 qa/rpc-tests/wallet.py | 25 ++++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/qa/rpc-tests/wallet.py b/qa/rpc-tests/wallet.py
index 3c0dc0f4ea1bb..992fb8a2d64f7 100755
--- a/qa/rpc-tests/wallet.py
+++ b/qa/rpc-tests/wallet.py
@@ -330,10 +330,12 @@ def run_test (self):
             # disabled until issue is fixed: https://github.com/bitcoin/bitcoin/issues/7463
             # '-salvagewallet',
         ]
+        chainlimit = 6
         for m in maintenance:
             print("check " + m)
             stop_nodes(self.nodes)
-            self.nodes = start_nodes(3, self.options.tmpdir, [[m]] * 3)
+            # set lower ancestor limit for later
+            self.nodes = start_nodes(3, self.options.tmpdir, [[m, "-limitancestorcount="+str(chainlimit)]] * 3)
             while m == '-reindex' and [block_count] * 3 != [self.nodes[i].getblockcount() for i in range(3)]:
                 # reindex will leave rpc warm up "early"; Wait for it to finish
                 time.sleep(0.1)
@@ -346,5 +348,26 @@ def run_test (self):
         assert_equal(coinbase_tx_1["transactions"][0]["blockhash"], blocks[1])
         assert_equal(len(self.nodes[0].listsinceblock(blocks[1])["transactions"]), 0)
 
+        # ==Check that wallet prefers to use coins that don't exceed mempool limits =====
+
+        # Get all non-zero utxos together
+        chain_addrs = [self.nodes[0].getnewaddress(), self.nodes[0].getnewaddress()]
+        singletxid = self.nodes[0].sendtoaddress(chain_addrs[0], self.nodes[0].getbalance(), "", "", True)
+        self.nodes[0].generate(1)
+        node0_balance = self.nodes[0].getbalance()
+        # Split into two chains
+        rawtx = self.nodes[0].createrawtransaction([{"txid":singletxid, "vout":0}], {chain_addrs[0]:node0_balance/2-Decimal('0.01'), chain_addrs[1]:node0_balance/2-Decimal('0.01')})
+        signedtx = self.nodes[0].signrawtransaction(rawtx)
+        singletxid = self.nodes[0].sendrawtransaction(signedtx["hex"])
+        txids = [singletxid, singletxid]
+        self.nodes[0].generate(1)
+
+        # Make a long chain of unconfirmed payments without hitting mempool limit
+        txid_list = []
+        for i in range(chainlimit*2):
+            txid_list.append(self.nodes[0].sendtoaddress(chain_addrs[0], Decimal('0.0001')))
+        assert_equal(self.nodes[0].getmempoolinfo()['size'], chainlimit*2)
+        assert_equal(len(txid_list), chainlimit*2)
+
 if __name__ == '__main__':
     WalletTest().main()

From 453bda63dd90986501ee61426e4d768a400bd371 Mon Sep 17 00:00:00 2001
From: Chris Moore <dooglus@gmail.com>
Date: Tue, 13 Dec 2016 13:36:23 -0800
Subject: [PATCH 1368/1802] Add 'subtractFeeFromOutputs' option to
 'fundrawtransaction'.

---
 qa/rpc-tests/fundrawtransaction.py  | 70 +++++++++++++++++++++++++++++
 qa/rpc-tests/test_framework/util.py | 10 +++--
 src/wallet/rpcwallet.cpp            | 38 +++++++++++++---
 src/wallet/wallet.cpp               | 11 +++--
 src/wallet/wallet.h                 |  2 +-
 5 files changed, 117 insertions(+), 14 deletions(-)

diff --git a/qa/rpc-tests/fundrawtransaction.py b/qa/rpc-tests/fundrawtransaction.py
index 82e148c55a9fb..b97e9aecdf422 100755
--- a/qa/rpc-tests/fundrawtransaction.py
+++ b/qa/rpc-tests/fundrawtransaction.py
@@ -660,5 +660,75 @@ def run_test(self):
         assert_fee_amount(result2['fee'], count_bytes(result2['hex']), 2 * result_fee_rate)
         assert_fee_amount(result3['fee'], count_bytes(result3['hex']), 10 * result_fee_rate)
 
+        ######################################
+        # Test subtractFeeFromOutputs option #
+        ######################################
+
+        # Make sure there is exactly one input so coin selection can't skew the result
+        assert_equal(len(self.nodes[3].listunspent(1)), 1)
+
+        inputs = []
+        outputs = {self.nodes[2].getnewaddress(): 1}
+        rawtx = self.nodes[3].createrawtransaction(inputs, outputs)
+
+        result = [self.nodes[3].fundrawtransaction(rawtx), # uses min_relay_tx_fee (set by settxfee)
+                  self.nodes[3].fundrawtransaction(rawtx, {"subtractFeeFromOutputs": []}), # empty subtraction list
+                  self.nodes[3].fundrawtransaction(rawtx, {"subtractFeeFromOutputs": [0]}), # uses min_relay_tx_fee (set by settxfee)
+                  self.nodes[3].fundrawtransaction(rawtx, {"feeRate": 2*min_relay_tx_fee}),
+                  self.nodes[3].fundrawtransaction(rawtx, {"feeRate": 2*min_relay_tx_fee, "subtractFeeFromOutputs": [0]})]
+
+        dec_tx = [self.nodes[3].decoderawtransaction(tx['hex']) for tx in result]
+        output = [d['vout'][1 - r['changepos']]['value'] for d, r in zip(dec_tx, result)]
+        change = [d['vout'][r['changepos']]['value'] for d, r in zip(dec_tx, result)]
+
+        assert_equal(result[0]['fee'], result[1]['fee'], result[2]['fee'])
+        assert_equal(result[3]['fee'], result[4]['fee'])
+        assert_equal(change[0], change[1])
+        assert_equal(output[0], output[1])
+        assert_equal(output[0], output[2] + result[2]['fee'])
+        assert_equal(change[0] + result[0]['fee'], change[2])
+        assert_equal(output[3], output[4] + result[4]['fee'])
+        assert_equal(change[3] + result[3]['fee'], change[4])
+
+        inputs = []
+        outputs = {self.nodes[2].getnewaddress(): value for value in (1.0, 1.1, 1.2, 1.3)}
+        keys = list(outputs.keys())
+        rawtx = self.nodes[3].createrawtransaction(inputs, outputs)
+
+        result = [self.nodes[3].fundrawtransaction(rawtx),
+                  # split the fee between outputs 0, 2, and 3, but not output 1
+                  self.nodes[3].fundrawtransaction(rawtx, {"subtractFeeFromOutputs": [0, 2, 3]})]
+
+        dec_tx = [self.nodes[3].decoderawtransaction(result[0]['hex']),
+                  self.nodes[3].decoderawtransaction(result[1]['hex'])]
+
+        # Nested list of non-change output amounts for each transaction
+        output = [[out['value'] for i, out in enumerate(d['vout']) if i != r['changepos']]
+                  for d, r in zip(dec_tx, result)]
+
+        # List of differences in output amounts between normal and subtractFee transactions
+        share = [o0 - o1 for o0, o1 in zip(output[0], output[1])]
+
+        # output 1 is the same in both transactions
+        assert_equal(share[1], 0)
+
+        # the other 3 outputs are smaller as a result of subtractFeeFromOutputs
+        assert_greater_than(share[0], 0)
+        assert_greater_than(share[2], 0)
+        assert_greater_than(share[3], 0)
+
+        # outputs 2 and 3 take the same share of the fee
+        assert_equal(share[2], share[3])
+
+        # output 0 takes at least as much share of the fee, and no more than 2 satoshis more, than outputs 2 and 3
+        assert_greater_than_or_equal(share[0], share[2])
+        assert_greater_than_or_equal(share[2] + Decimal(2e-8), share[0])
+
+        # the fee is the same in both transactions
+        assert_equal(result[0]['fee'], result[1]['fee'])
+
+        # the total subtracted from the outputs is equal to the fee
+        assert_equal(share[0] + share[2] + share[3], result[0]['fee'])
+
 if __name__ == '__main__':
     RawTransactionsTest().main()
diff --git a/qa/rpc-tests/test_framework/util.py b/qa/rpc-tests/test_framework/util.py
index 85898d9f32de1..57f8218cf0432 100644
--- a/qa/rpc-tests/test_framework/util.py
+++ b/qa/rpc-tests/test_framework/util.py
@@ -524,14 +524,18 @@ def assert_fee_amount(fee, tx_size, fee_per_kB):
     if fee > (tx_size + 2) * fee_per_kB / 1000:
         raise AssertionError("Fee of %s BTC too high! (Should be %s BTC)"%(str(fee), str(target_fee)))
 
-def assert_equal(thing1, thing2):
-    if thing1 != thing2:
-        raise AssertionError("%s != %s"%(str(thing1),str(thing2)))
+def assert_equal(thing1, thing2, *args):
+    if thing1 != thing2 or any(thing1 != arg for arg in args):
+        raise AssertionError("not(%s)" % " == ".join(str(arg) for arg in (thing1, thing2) + args))
 
 def assert_greater_than(thing1, thing2):
     if thing1 <= thing2:
         raise AssertionError("%s <= %s"%(str(thing1),str(thing2)))
 
+def assert_greater_than_or_equal(thing1, thing2):
+    if thing1 < thing2:
+        raise AssertionError("%s < %s"%(str(thing1),str(thing2)))
+
 def assert_raises(exc, fun, *args, **kwds):
     assert_raises_message(exc, None, fun, *args, **kwds)
 
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index 5a4fcc743cd24..7d9d6ce4894cb 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -2464,7 +2464,8 @@ UniValue fundrawtransaction(const JSONRPCRequest& request)
         throw runtime_error(
                             "fundrawtransaction \"hexstring\" ( options )\n"
                             "\nAdd inputs to a transaction until it has enough in value to meet its out value.\n"
-                            "This will not modify existing inputs, and will add one change output to the outputs.\n"
+                            "This will not modify existing inputs, and will add at most one change output to the outputs.\n"
+                            "No existing outputs will be modified unless \"subtractFeeFromOutputs\" is specified.\n"
                             "Note that inputs which were signed may need to be resigned after completion since in/outputs have been added.\n"
                             "The inputs added will not be signed, use signrawtransaction for that.\n"
                             "Note that all existing inputs must have their previous output transaction be in the wallet.\n"
@@ -2476,11 +2477,17 @@ UniValue fundrawtransaction(const JSONRPCRequest& request)
                             "1. \"hexstring\"           (string, required) The hex string of the raw transaction\n"
                             "2. options               (object, optional)\n"
                             "   {\n"
-                            "     \"changeAddress\"     (string, optional, default pool address) The bitcoin address to receive the change\n"
-                            "     \"changePosition\"    (numeric, optional, default random) The index of the change output\n"
-                            "     \"includeWatching\"   (boolean, optional, default false) Also select inputs which are watch only\n"
-                            "     \"lockUnspents\"      (boolean, optional, default false) Lock selected unspent outputs\n"
-                            "     \"feeRate\"           (numeric, optional, default not set: makes wallet determine the fee) Set a specific feerate (" + CURRENCY_UNIT + " per KB)\n"
+                            "     \"changeAddress\"          (string, optional, default pool address) The bitcoin address to receive the change\n"
+                            "     \"changePosition\"         (numeric, optional, default random) The index of the change output\n"
+                            "     \"includeWatching\"        (boolean, optional, default false) Also select inputs which are watch only\n"
+                            "     \"lockUnspents\"           (boolean, optional, default false) Lock selected unspent outputs\n"
+                            "     \"feeRate\"                (numeric, optional, default not set: makes wallet determine the fee) Set a specific feerate (" + CURRENCY_UNIT + " per KB)\n"
+                            "     \"subtractFeeFromOutputs\" (array, optional) A json array of integers.\n"
+                            "                              The fee will be equally deducted from the amount of each specified output.\n"
+                            "                              The outputs are specified by their zero-based index, before any change output is added.\n"
+                            "                              Those recipients will receive less bitcoins than you enter in their corresponding amount field.\n"
+                            "                              If no outputs are specified here, the sender pays the fee.\n"
+                            "                                  [vout_index,...]\n"
                             "   }\n"
                             "                         for backward compatibility: passing in a true instead of an object will result in {\"includeWatching\":true}\n"
                             "\nResult:\n"
@@ -2509,6 +2516,8 @@ UniValue fundrawtransaction(const JSONRPCRequest& request)
     bool lockUnspents = false;
     CFeeRate feeRate = CFeeRate(0);
     bool overrideEstimatedFeerate = false;
+    UniValue subtractFeeFromOutputs;
+    set<int> setSubtractFeeFromOutputs;
 
     if (request.params.size() > 1) {
       if (request.params[1].type() == UniValue::VBOOL) {
@@ -2527,6 +2536,7 @@ UniValue fundrawtransaction(const JSONRPCRequest& request)
                 {"includeWatching", UniValueType(UniValue::VBOOL)},
                 {"lockUnspents", UniValueType(UniValue::VBOOL)},
                 {"feeRate", UniValueType()}, // will be checked below
+                {"subtractFeeFromOutputs", UniValueType(UniValue::VARR)},
             },
             true, true);
 
@@ -2553,6 +2563,9 @@ UniValue fundrawtransaction(const JSONRPCRequest& request)
             feeRate = CFeeRate(AmountFromValue(options["feeRate"]));
             overrideEstimatedFeerate = true;
         }
+
+        if (options.exists("subtractFeeFromOutputs"))
+            subtractFeeFromOutputs = options["subtractFeeFromOutputs"].get_array();
       }
     }
 
@@ -2567,10 +2580,21 @@ UniValue fundrawtransaction(const JSONRPCRequest& request)
     if (changePosition != -1 && (changePosition < 0 || (unsigned int)changePosition > tx.vout.size()))
         throw JSONRPCError(RPC_INVALID_PARAMETER, "changePosition out of bounds");
 
+    for (unsigned int idx = 0; idx < subtractFeeFromOutputs.size(); idx++) {
+        int pos = subtractFeeFromOutputs[idx].get_int();
+        if (setSubtractFeeFromOutputs.count(pos))
+            throw JSONRPCError(RPC_INVALID_PARAMETER, strprintf("Invalid parameter, duplicated position: %d", pos));
+        if (pos < 0)
+            throw JSONRPCError(RPC_INVALID_PARAMETER, strprintf("Invalid parameter, negative position: %d", pos));
+        if (pos >= int(tx.vout.size()))
+            throw JSONRPCError(RPC_INVALID_PARAMETER, strprintf("Invalid parameter, position too large: %d", pos));
+        setSubtractFeeFromOutputs.insert(pos);
+    }
+
     CAmount nFeeOut;
     string strFailReason;
 
-    if(!pwalletMain->FundTransaction(tx, nFeeOut, overrideEstimatedFeerate, feeRate, changePosition, strFailReason, includeWatching, lockUnspents, changeAddress))
+    if(!pwalletMain->FundTransaction(tx, nFeeOut, overrideEstimatedFeerate, feeRate, changePosition, strFailReason, includeWatching, lockUnspents, setSubtractFeeFromOutputs, changeAddress))
         throw JSONRPCError(RPC_INTERNAL_ERROR, strFailReason);
 
     UniValue result(UniValue::VOBJ);
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index 6269b4521bfa0..b243ee19bf6b0 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -2181,14 +2181,15 @@ bool CWallet::SelectCoins(const vector<COutput>& vAvailableCoins, const CAmount&
     return res;
 }
 
-bool CWallet::FundTransaction(CMutableTransaction& tx, CAmount& nFeeRet, bool overrideEstimatedFeeRate, const CFeeRate& specificFeeRate, int& nChangePosInOut, std::string& strFailReason, bool includeWatching, bool lockUnspents, const CTxDestination& destChange)
+bool CWallet::FundTransaction(CMutableTransaction& tx, CAmount& nFeeRet, bool overrideEstimatedFeeRate, const CFeeRate& specificFeeRate, int& nChangePosInOut, std::string& strFailReason, bool includeWatching, bool lockUnspents, const std::set<int>& setSubtractFeeFromOutputs, const CTxDestination& destChange)
 {
     vector<CRecipient> vecSend;
 
     // Turn the txout set into a CRecipient vector
-    BOOST_FOREACH(const CTxOut& txOut, tx.vout)
+    for (size_t idx = 0; idx < tx.vout.size(); idx++)
     {
-        CRecipient recipient = {txOut.scriptPubKey, txOut.nValue, false};
+        const CTxOut& txOut = tx.vout[idx];
+        CRecipient recipient = {txOut.scriptPubKey, txOut.nValue, setSubtractFeeFromOutputs.count(idx) == 1};
         vecSend.push_back(recipient);
     }
 
@@ -2210,6 +2211,10 @@ bool CWallet::FundTransaction(CMutableTransaction& tx, CAmount& nFeeRet, bool ov
     if (nChangePosInOut != -1)
         tx.vout.insert(tx.vout.begin() + nChangePosInOut, wtx.tx->vout[nChangePosInOut]);
 
+    // Copy output sizes from new transaction; they may have had the fee subtracted from them
+    for (unsigned int idx = 0; idx < tx.vout.size(); idx++)
+        tx.vout[idx].nValue = wtx.tx->vout[idx].nValue;
+
     // Add new txins (keeping original txin scriptSig/order)
     BOOST_FOREACH(const CTxIn& txin, wtx.tx->vin)
     {
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
index f7103b6a809e1..3a809174f36a7 100644
--- a/src/wallet/wallet.h
+++ b/src/wallet/wallet.h
@@ -772,7 +772,7 @@ class CWallet : public CCryptoKeyStore, public CValidationInterface
      * Insert additional inputs into the transaction by
      * calling CreateTransaction();
      */
-    bool FundTransaction(CMutableTransaction& tx, CAmount& nFeeRet, bool overrideEstimatedFeeRate, const CFeeRate& specificFeeRate, int& nChangePosInOut, std::string& strFailReason, bool includeWatching, bool lockUnspents, const CTxDestination& destChange = CNoDestination());
+    bool FundTransaction(CMutableTransaction& tx, CAmount& nFeeRet, bool overrideEstimatedFeeRate, const CFeeRate& specificFeeRate, int& nChangePosInOut, std::string& strFailReason, bool includeWatching, bool lockUnspents, const std::set<int>& setSubtractFeeFromOutputs, const CTxDestination& destChange = CNoDestination());
 
     /**
      * Create a new transaction paying the recipients with a set of coins

From da9cdd2c9cb58e3737b727c21f070f074b1247a7 Mon Sep 17 00:00:00 2001
From: Gregory Maxwell <greg@xiph.org>
Date: Wed, 14 Dec 2016 01:50:00 +0000
Subject: [PATCH 1369/1802] Do not run functions with necessary side-effects in
 assert()

---
 src/net_processing.cpp | 6 ++++--
 src/validation.cpp     | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/net_processing.cpp b/src/net_processing.cpp
index 0137108cf0337..cc07ef30b0e5d 100644
--- a/src/net_processing.cpp
+++ b/src/net_processing.cpp
@@ -1518,7 +1518,8 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
         }
 
         CBlock block;
-        assert(ReadBlockFromDisk(block, it->second, chainparams.GetConsensus()));
+        bool ret = ReadBlockFromDisk(block, it->second, chainparams.GetConsensus());
+        assert(ret);
 
         BlockTransactions resp(req);
         for (size_t i = 0; i < req.indexes.size(); i++) {
@@ -2730,7 +2731,8 @@ bool SendMessages(CNode* pto, CConnman& connman)
                             vHeaders.front().GetHash().ToString(), pto->id);
                     //TODO: Shouldn't need to reload block from disk, but requires refactor
                     CBlock block;
-                    assert(ReadBlockFromDisk(block, pBestIndex, consensusParams));
+                    bool ret = ReadBlockFromDisk(block, pBestIndex, consensusParams);
+                    assert(ret);
                     CBlockHeaderAndShortTxIDs cmpctblock(block, state.fWantsCmpctWitness);
                     int nSendFlags = state.fWantsCmpctWitness ? 0 : SERIALIZE_TRANSACTION_NO_WITNESS;
                     connman.PushMessage(pto, msgMaker.Make(nSendFlags, NetMsgType::CMPCTBLOCK, cmpctblock));
diff --git a/src/validation.cpp b/src/validation.cpp
index 7163b99a6784f..457455af47a56 100644
--- a/src/validation.cpp
+++ b/src/validation.cpp
@@ -2100,7 +2100,8 @@ bool static DisconnectTip(CValidationState& state, const CChainParams& chainpara
         CCoinsViewCache view(pcoinsTip);
         if (!DisconnectBlock(block, state, pindexDelete, view))
             return error("DisconnectTip(): DisconnectBlock %s failed", pindexDelete->GetBlockHash().ToString());
-        assert(view.Flush());
+        bool flushed = view.Flush();
+        assert(flushed);
     }
     LogPrint("bench", "- Disconnect block: %.2fms\n", (GetTimeMicros() - nStart) * 0.001);
     // Write the chain state to disk, if necessary.
@@ -2189,7 +2190,8 @@ bool static ConnectTip(CValidationState& state, const CChainParams& chainparams,
         }
         nTime3 = GetTimeMicros(); nTimeConnectTotal += nTime3 - nTime2;
         LogPrint("bench", "  - Connect total: %.2fms [%.2fs]\n", (nTime3 - nTime2) * 0.001, nTimeConnectTotal * 0.000001);
-        assert(view.Flush());
+        bool flushed = view.Flush();
+        assert(flushed);
     }
     int64_t nTime4 = GetTimeMicros(); nTimeFlush += nTime4 - nTime3;
     LogPrint("bench", "  - Flush: %.2fms [%.2fs]\n", (nTime4 - nTime3) * 0.001, nTimeFlush * 0.000001);

From 390bd14684a4f1a974014a31c71d44acd3d94d6a Mon Sep 17 00:00:00 2001
From: Jonas Schnelli <dev@jonasschnelli.ch>
Date: Wed, 14 Dec 2016 08:59:09 +0100
Subject: [PATCH 1370/1802] [Qt] Console: don't allow empty arguments when
 using the comma-syntax

---
 src/qt/rpcconsole.cpp          | 18 +++++++++++++++---
 src/qt/test/rpcnestedtests.cpp | 32 ++++++++++++++++++++------------
 2 files changed, 35 insertions(+), 15 deletions(-)

diff --git a/src/qt/rpcconsole.cpp b/src/qt/rpcconsole.cpp
index 2c5b5ee890ba4..dc6fa338af259 100644
--- a/src/qt/rpcconsole.cpp
+++ b/src/qt/rpcconsole.cpp
@@ -138,6 +138,7 @@ bool RPCConsole::RPCExecuteCommandLine(std::string &strResult, const std::string
     {
         STATE_EATING_SPACES,
         STATE_EATING_SPACES_IN_ARG,
+        STATE_EATING_SPACES_IN_BRACKETS,
         STATE_ARGUMENT,
         STATE_SINGLEQUOTED,
         STATE_DOUBLEQUOTED,
@@ -222,6 +223,7 @@ bool RPCConsole::RPCExecuteCommandLine(std::string &strResult, const std::string
             }
             case STATE_ARGUMENT: // In or after argument
             case STATE_EATING_SPACES_IN_ARG:
+            case STATE_EATING_SPACES_IN_BRACKETS:
             case STATE_EATING_SPACES: // Handle runs of whitespace
                 switch(ch)
             {
@@ -229,6 +231,8 @@ bool RPCConsole::RPCExecuteCommandLine(std::string &strResult, const std::string
                 case '\'': state = STATE_SINGLEQUOTED; break;
                 case '\\': state = STATE_ESCAPE_OUTER; break;
                 case '(': case ')': case '\n':
+                    if (state == STATE_EATING_SPACES_IN_ARG)
+                        throw std::runtime_error("Invalid Syntax");
                     if (state == STATE_ARGUMENT)
                     {
                         if (ch == '(' && stack.size() && stack.back().size() > 0)
@@ -240,7 +244,7 @@ bool RPCConsole::RPCExecuteCommandLine(std::string &strResult, const std::string
 
                         stack.back().push_back(curarg);
                         curarg.clear();
-                        state = STATE_EATING_SPACES;
+                        state = STATE_EATING_SPACES_IN_BRACKETS;
                     }
                     if ((ch == ')' || ch == '\n') && stack.size() > 0)
                     {
@@ -257,12 +261,20 @@ bool RPCConsole::RPCExecuteCommandLine(std::string &strResult, const std::string
                     }
                     break;
                 case ' ': case ',': case '\t':
-                    if(state == STATE_ARGUMENT || (state == STATE_EATING_SPACES_IN_ARG && ch == ',')) // Space ends argument
+                    if(state == STATE_EATING_SPACES_IN_ARG && curarg.empty() && ch == ',')
+                        throw std::runtime_error("Invalid Syntax");
+
+                    else if(state == STATE_ARGUMENT) // Space ends argument
                     {
                         stack.back().push_back(curarg);
                         curarg.clear();
                     }
-                    state = (ch == ',' ? STATE_EATING_SPACES_IN_ARG : STATE_EATING_SPACES);
+                    if ((state == STATE_EATING_SPACES_IN_BRACKETS || state == STATE_ARGUMENT) && ch == ',')
+                    {
+                        state = STATE_EATING_SPACES_IN_ARG;
+                        break;
+                    }
+                    state = STATE_EATING_SPACES;
                     break;
                 default: curarg += ch; state = STATE_ARGUMENT;
             }
diff --git a/src/qt/test/rpcnestedtests.cpp b/src/qt/test/rpcnestedtests.cpp
index 0aeef045501c9..26ac5e21147a4 100644
--- a/src/qt/test/rpcnestedtests.cpp
+++ b/src/qt/test/rpcnestedtests.cpp
@@ -15,6 +15,7 @@
 #include "util.h"
 
 #include <QDir>
+#include <QtGlobal>
 
 #include <boost/filesystem.hpp>
 
@@ -77,16 +78,6 @@ void RPCNestedTests::rpcNestedTests()
     RPCConsole::RPCExecuteCommandLine(result, "getblockchaininfo "); //whitespace at the end will be tolerated
     QVERIFY(result.substr(0,1) == "{");
 
-#if QT_VERSION >= 0x050300
-    // do the QVERIFY_EXCEPTION_THROWN checks only with Qt5.3 and higher (QVERIFY_EXCEPTION_THROWN was introduced in Qt5.3)
-    QVERIFY_EXCEPTION_THROWN(RPCConsole::RPCExecuteCommandLine(result, "getblockchaininfo() .\n"), std::runtime_error); //invalid syntax
-    QVERIFY_EXCEPTION_THROWN(RPCConsole::RPCExecuteCommandLine(result, "getblockchaininfo() getblockchaininfo()"), std::runtime_error); //invalid syntax
-    (RPCConsole::RPCExecuteCommandLine(result, "getblockchaininfo(")); //tolerate non closing brackets if we have no arguments
-    (RPCConsole::RPCExecuteCommandLine(result, "getblockchaininfo()()()")); //tolerate non command brackts
-    QVERIFY_EXCEPTION_THROWN(RPCConsole::RPCExecuteCommandLine(result, "getblockchaininfo(True)"), UniValue); //invalid argument
-    QVERIFY_EXCEPTION_THROWN(RPCConsole::RPCExecuteCommandLine(result, "a(getblockchaininfo(True))"), UniValue); //method not found
-#endif
-
     (RPCConsole::RPCExecuteCommandLine(result, "getblockchaininfo()[\"chain\"]")); //Quote path identifier are allowed, but look after a child contaning the quotes in the key
     QVERIFY(result == "null");
 
@@ -113,8 +104,25 @@ void RPCNestedTests::rpcNestedTests()
     QVERIFY(result == "[\"abc\",\"abc\"]");
     RPCConsole::RPCExecuteCommandLine(result, "rpcNestedTest abc\t\tabc");
     QVERIFY(result == "[\"abc\",\"abc\"]");
-    RPCConsole::RPCExecuteCommandLine(result, "rpcNestedTest abc,,abc");
-    QVERIFY(result == "[\"abc\",\"\",\"abc\"]");
+    RPCConsole::RPCExecuteCommandLine(result, "rpcNestedTest(abc )");
+    QVERIFY(result == "[\"abc\"]");
+    RPCConsole::RPCExecuteCommandLine(result, "rpcNestedTest( abc )");
+    QVERIFY(result == "[\"abc\"]");
+    RPCConsole::RPCExecuteCommandLine(result, "rpcNestedTest(   abc   ,   cba )");
+    QVERIFY(result == "[\"abc\",\"cba\"]");
+
+#if QT_VERSION >= 0x050300
+    // do the QVERIFY_EXCEPTION_THROWN checks only with Qt5.3 and higher (QVERIFY_EXCEPTION_THROWN was introduced in Qt5.3)
+    QVERIFY_EXCEPTION_THROWN(RPCConsole::RPCExecuteCommandLine(result, "getblockchaininfo() .\n"), std::runtime_error); //invalid syntax
+    QVERIFY_EXCEPTION_THROWN(RPCConsole::RPCExecuteCommandLine(result, "getblockchaininfo() getblockchaininfo()"), std::runtime_error); //invalid syntax
+    (RPCConsole::RPCExecuteCommandLine(result, "getblockchaininfo(")); //tolerate non closing brackets if we have no arguments
+    (RPCConsole::RPCExecuteCommandLine(result, "getblockchaininfo()()()")); //tolerate non command brackts
+    QVERIFY_EXCEPTION_THROWN(RPCConsole::RPCExecuteCommandLine(result, "getblockchaininfo(True)"), UniValue); //invalid argument
+    QVERIFY_EXCEPTION_THROWN(RPCConsole::RPCExecuteCommandLine(result, "a(getblockchaininfo(True))"), UniValue); //method not found
+    QVERIFY_EXCEPTION_THROWN(RPCConsole::RPCExecuteCommandLine(result, "rpcNestedTest abc,,abc"), std::runtime_error); //don't tollerate empty arguments when using ,
+    QVERIFY_EXCEPTION_THROWN(RPCConsole::RPCExecuteCommandLine(result, "rpcNestedTest(abc,,abc)"), std::runtime_error); //don't tollerate empty arguments when using ,
+    QVERIFY_EXCEPTION_THROWN(RPCConsole::RPCExecuteCommandLine(result, "rpcNestedTest(abc,,)"), std::runtime_error); //don't tollerate empty arguments when using ,
+#endif
 
     delete pcoinsTip;
     delete pcoinsdbview;

From ed5896976a5cb6d893babedec2bc88cb7a251033 Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Tue, 13 Dec 2016 23:53:39 -0800
Subject: [PATCH 1371/1802] Batch construct batches

Reuse the serialization buffers used for constructing the LevelDB
write batch. This avoids 2 allocations per utxo write.
---
 src/dbwrapper.h | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/dbwrapper.h b/src/dbwrapper.h
index 4a79bbd17dfec..08c72c25ddb71 100644
--- a/src/dbwrapper.h
+++ b/src/dbwrapper.h
@@ -53,38 +53,41 @@ class CDBBatch
     const CDBWrapper &parent;
     leveldb::WriteBatch batch;
 
+    CDataStream ssKey;
+    CDataStream ssValue;
+
 public:
     /**
      * @param[in] _parent   CDBWrapper that this batch is to be submitted to
      */
-    CDBBatch(const CDBWrapper &_parent) : parent(_parent) { };
+    CDBBatch(const CDBWrapper &_parent) : parent(_parent), ssKey(SER_DISK, CLIENT_VERSION), ssValue(SER_DISK, CLIENT_VERSION) { };
 
     template <typename K, typename V>
     void Write(const K& key, const V& value)
     {
-        CDataStream ssKey(SER_DISK, CLIENT_VERSION);
         ssKey.reserve(DBWRAPPER_PREALLOC_KEY_SIZE);
         ssKey << key;
         leveldb::Slice slKey(&ssKey[0], ssKey.size());
 
-        CDataStream ssValue(SER_DISK, CLIENT_VERSION);
         ssValue.reserve(DBWRAPPER_PREALLOC_VALUE_SIZE);
         ssValue << value;
         ssValue.Xor(dbwrapper_private::GetObfuscateKey(parent));
         leveldb::Slice slValue(&ssValue[0], ssValue.size());
 
         batch.Put(slKey, slValue);
+        ssKey.clear();
+        ssValue.clear();
     }
 
     template <typename K>
     void Erase(const K& key)
     {
-        CDataStream ssKey(SER_DISK, CLIENT_VERSION);
         ssKey.reserve(DBWRAPPER_PREALLOC_KEY_SIZE);
         ssKey << key;
         leveldb::Slice slKey(&ssKey[0], ssKey.size());
 
         batch.Delete(slKey);
+        ssKey.clear();
     }
 };
 

From c9e69fbf3915fe1187b4c2e77be5ae6b16121194 Mon Sep 17 00:00:00 2001
From: Jeremy Rubin <jeremy.l.rubin@gmail.com>
Date: Wed, 5 Oct 2016 16:58:47 -0400
Subject: [PATCH 1372/1802] Add CuckooCache implementation and replace the
 sigcache map_type with it

SQUASHME: Change cuckoocache to only work for powers of two, to avoid mod operator
SQUASHME: Update Documentation and simplify logarithm logic
SQUASHME: OSX Build Errors
SQUASHME: minor Feedback from sipa + bluematt
SQUASHME: DOCONLY: Clarify a few comments.
---
 src/cuckoocache.h         | 457 ++++++++++++++++++++++++++++++++++++++
 src/init.cpp              |   2 +
 src/script/sigcache.cpp   |  77 +++----
 src/script/sigcache.h     |   9 +-
 src/test/test_bitcoin.cpp |   2 +
 5 files changed, 506 insertions(+), 41 deletions(-)
 create mode 100644 src/cuckoocache.h

diff --git a/src/cuckoocache.h b/src/cuckoocache.h
new file mode 100644
index 0000000000000..efd6a820b5ce0
--- /dev/null
+++ b/src/cuckoocache.h
@@ -0,0 +1,457 @@
+// Copyright (c) 2016 Jeremy Rubin
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#ifndef _BITCOIN_CUCKOOCACHE_H_
+#define _BITCOIN_CUCKOOCACHE_H_
+
+#include <array>
+#include <algorithm>
+#include <atomic>
+#include <cstring>
+#include <cmath>
+#include <memory>
+#include <vector>
+
+
+/** namespace CuckooCache provides high performance cache primitives
+ *
+ * Summary:
+ *
+ * 1) bit_packed_atomic_flags is bit-packed atomic flags for garbage collection
+ *
+ * 2) cache is a cache which is performant in memory usage and lookup speed. It
+ * is lockfree for erase operations. Elements are lazily erased on the next
+ * insert.
+ */
+namespace CuckooCache
+{
+/** bit_packed_atomic_flags implements a container for garbage collection flags
+ * that is only thread unsafe on calls to setup. This class bit-packs collection
+ * flags for memory efficiency.
+ *
+ * All operations are std::memory_order_relaxed so external mechanisms must
+ * ensure that writes and reads are properly synchronized.
+ *
+ * On setup(n), all bits up to n are marked as collected.
+ *
+ * Under the hood, because it is an 8-bit type, it makes sense to use a multiple
+ * of 8 for setup, but it will be safe if that is not the case as well.
+ *
+ */
+class bit_packed_atomic_flags
+{
+    std::unique_ptr<std::atomic<uint8_t>[]> mem;
+
+public:
+    /** No default constructor as there must be some size */
+    bit_packed_atomic_flags() = delete;
+
+    /**
+     * bit_packed_atomic_flags constructor creates memory to sufficiently
+     * keep track of garbage collection information for size entries.
+     *
+     * @param size the number of elements to allocate space for
+     *
+     * @post bit_set, bit_unset, and bit_is_set function properly forall x. x <
+     * size
+     * @post All calls to bit_is_set (without subsequent bit_unset) will return
+     * true.
+     */
+    bit_packed_atomic_flags(uint32_t size)
+    {
+        // pad out the size if needed
+        size = (size + 7) / 8;
+        mem.reset(new std::atomic<uint8_t>[size]);
+        for (uint32_t i = 0; i < size; ++i)
+            mem[i].store(0xFF);
+    };
+
+    /** setup marks all entries and ensures that bit_packed_atomic_flags can store
+     * at least size entries
+     *
+     * @param b the number of elements to allocate space for
+     * @post bit_set, bit_unset, and bit_is_set function properly forall x. x <
+     * b
+     * @post All calls to bit_is_set (without subsequent bit_unset) will return
+     * true.
+     */
+    inline void setup(uint32_t b)
+    {
+        bit_packed_atomic_flags d(b);
+        std::swap(mem, d.mem);
+    }
+
+    /** bit_set sets an entry as discardable.
+     *
+     * @param s the index of the entry to bit_set.
+     * @post immediately subsequent call (assuming proper external memory
+     * ordering) to bit_is_set(s) == true.
+     *
+     */
+    inline void bit_set(uint32_t s)
+    {
+        mem[s >> 3].fetch_or(1 << (s & 7), std::memory_order_relaxed);
+    }
+
+    /**  bit_unset marks an entry as something that should not be overwritten
+     *
+     * @param s the index of the entry to bit_unset.
+     * @post immediately subsequent call (assuming proper external memory
+     * ordering) to bit_is_set(s) == false.
+     */
+    inline void bit_unset(uint32_t s)
+    {
+        mem[s >> 3].fetch_and(~(1 << (s & 7)), std::memory_order_relaxed);
+    }
+
+    /** bit_is_set queries the table for discardability at s
+     *
+     * @param s the index of the entry to read.
+     * @returns if the bit at index s was set.
+     * */
+    inline bool bit_is_set(uint32_t s) const
+    {
+        return (1 << (s & 7)) & mem[s >> 3].load(std::memory_order_relaxed);
+    }
+};
+
+/** cache implements a cache with properties similar to a cuckoo-set
+ *
+ *  The cache is able to hold up to (~(uint32_t)0) - 1 elements.
+ *
+ *  Read Operations:
+ *      - contains(*, false)
+ *
+ *  Read+Erase Operations:
+ *      - contains(*, true)
+ *
+ *  Erase Operations:
+ *      - allow_erase()
+ *
+ *  Write Operations:
+ *      - setup()
+ *      - setup_bytes()
+ *      - insert()
+ *      - please_keep()
+ *
+ *  Synchronization Free Operations:
+ *      - invalid()
+ *      - compute_hashes()
+ *
+ * User Must Guarantee:
+ *
+ * 1) Write Requires synchronized access (e.g., a lock)
+ * 2) Read Requires no concurrent Write, synchronized with the last insert.
+ * 3) Erase requires no concurrent Write, synchronized with last insert.
+ * 4) An Erase caller must release all memory before allowing a new Writer.
+ *
+ *
+ * Note on function names:
+ *   - The name "allow_erase" is used because the real discard happens later.
+ *   - The name "please_keep" is used because elements may be erased anyways on insert.
+ *
+ * @tparam Element should be a movable and copyable type
+ * @tparam Hash should be a function/callable which takes a template parameter
+ * hash_select and an Element and extracts a hash from it. Should return
+ * high-entropy hashes for `Hash h; h<0>(e) ... h<7>(e)`.
+ */
+template <typename Element, typename Hash>
+class cache
+{
+private:
+    /** table stores all the elements */
+    std::vector<Element> table;
+
+    /** size stores the total available slots in the hash table */
+    uint32_t size;
+
+    /** The bit_packed_atomic_flags array is marked mutable because we want
+     * garbage collection to be allowed to occur from const methods */
+    mutable bit_packed_atomic_flags collection_flags;
+
+    /** epoch_flags tracks how recently an element was inserted into
+     * the cache. true denotes recent, false denotes not-recent. See insert()
+     * method for full semantics.
+     */
+    mutable std::vector<bool> epoch_flags;
+
+    /** epoch_heuristic_counter is used to determine when a epoch might be aged
+     * & an expensive scan should be done.  epoch_heuristic_counter is
+     * decremented on insert and reset to the new number of inserts which would
+     * cause the epoch to reach epoch_size when it reaches zero.
+     */
+    uint32_t epoch_heuristic_counter;
+
+    /** epoch_size is set to be the number of elements supposed to be in a
+     * epoch. When the number of non-erased elements in a epoch
+     * exceeds epoch_size, a new epoch should be started and all
+     * current entries demoted. epoch_size is set to be 45% of size because
+     * we want to keep load around 90%, and we support 3 epochs at once --
+     * one "dead" which has been erased, one "dying" which has been marked to be
+     * erased next, and one "living" which new inserts add to.
+     */
+    uint32_t epoch_size;
+
+    /** hash_mask should be set to appropriately mask out a hash such that every
+     * masked hash is [0,size), eg, if floor(log2(size)) == 20, then hash_mask
+     * should be (1<<20)-1
+     */
+    uint32_t hash_mask;
+
+    /** depth_limit determines how many elements insert should try to replace.
+     * Should be set to log2(n)*/
+    uint8_t depth_limit;
+
+    /** hash_function is a const instance of the hash function. It cannot be
+     * static or initialized at call time as it may have internal state (such as
+     * a nonce).
+     * */
+    const Hash hash_function;
+
+    /** compute_hashes is convenience for not having to write out this
+     * expression everywhere we use the hash values of an Element.
+     *
+     * @param e the element whose hashes will be returned
+     * @returns std::array<uint32_t, 8> of deterministic hashes derived from e
+     */
+    inline std::array<uint32_t, 8> compute_hashes(const Element& e) const
+    {
+        return {{hash_function.template operator()<0>(e) & hash_mask,
+                 hash_function.template operator()<1>(e) & hash_mask,
+                 hash_function.template operator()<2>(e) & hash_mask,
+                 hash_function.template operator()<3>(e) & hash_mask,
+                 hash_function.template operator()<4>(e) & hash_mask,
+                 hash_function.template operator()<5>(e) & hash_mask,
+                 hash_function.template operator()<6>(e) & hash_mask,
+                 hash_function.template operator()<7>(e) & hash_mask}};
+    }
+
+    /* end
+     * @returns a constexpr index that can never be inserted to */
+    constexpr uint32_t invalid() const
+    {
+        return ~(uint32_t)0;
+    }
+
+    /** allow_erase marks the element at index n as discardable. Threadsafe
+     * without any concurrent insert.
+     * @param n the index to allow erasure of
+     */
+    inline void allow_erase(uint32_t n) const
+    {
+        collection_flags.bit_set(n);
+    }
+
+    /** please_keep marks the element at index n as an entry that should be kept.
+     * Threadsafe without any concurrent insert.
+     * @param n the index to prioritize keeping
+     */
+    inline void please_keep(uint32_t n) const
+    {
+        collection_flags.bit_unset(n);
+    }
+
+    /** epoch_check handles the changing of epochs for elements stored in the
+     * cache. epoch_check should be run before every insert.
+     *
+     * First, epoch_check decrements and checks the cheap heuristic, and then does
+     * a more expensive scan if the cheap heuristic runs out. If the expensive
+     * scan suceeds, the epochs are aged and old elements are allow_erased. The
+     * cheap heuristic is reset to retrigger after the worst case growth of the
+     * current epoch's elements would exceed the epoch_size.
+     */
+    void epoch_check()
+    {
+        if (epoch_heuristic_counter != 0) {
+            --epoch_heuristic_counter;
+            return;
+        }
+        // count the number of elements from the latest epoch which
+        // have not been erased.
+        uint32_t epoch_unused_count = 0;
+        for (uint32_t i = 0; i < size; ++i)
+            epoch_unused_count += epoch_flags[i] &&
+                                  !collection_flags.bit_is_set(i);
+        // If there are more non-deleted entries in the current epoch than the
+        // epoch size, then allow_erase on all elements in the old epoch (marked
+        // false) and move all elements in the current epoch to the old epoch
+        // but do not call allow_erase on their indices.
+        if (epoch_unused_count >= epoch_size) {
+            for (uint32_t i = 0; i < size; ++i)
+                if (epoch_flags[i])
+                    epoch_flags[i] = false;
+                else
+                    allow_erase(i);
+            epoch_heuristic_counter = epoch_size;
+        } else
+            // reset the epoch_heuristic_counter to next do a scan when worst
+            // case behavior (no intermittent erases) would exceed epoch size,
+            // with a reasonable minimum scan size.
+            // Ordinarily, we would have to sanity check std::min(epoch_size,
+            // epoch_unused_count), but we already know that `epoch_unused_count
+            // < epoch_size` in this branch
+            epoch_heuristic_counter = std::max(1u, std::max(epoch_size / 16,
+                        epoch_size - epoch_unused_count));
+    }
+
+public:
+    /** You must always construct a cache with some elements via a subsequent
+     * call to setup or setup_bytes, otherwise operations may segfault.
+     */
+    cache() : table(), size(), collection_flags(0), epoch_flags(),
+    epoch_heuristic_counter(), epoch_size(), depth_limit(0), hash_function()
+    {
+    }
+
+    /** setup initializes the container to store no more than new_size
+     * elements. setup rounds down to a power of two size.
+     *
+     * setup should only be called once.
+     *
+     * @param new_size the desired number of elements to store
+     * @returns the maximum number of elements storable
+     **/
+    uint32_t setup(uint32_t new_size)
+    {
+        // depth_limit must be at least one otherwise errors can occur.
+        depth_limit = static_cast<uint8_t>(std::log2(static_cast<float>(std::max((uint32_t)2, new_size))));
+        size = 1 << depth_limit;
+        hash_mask = size-1;
+        table.resize(size);
+        collection_flags.setup(size);
+        epoch_flags.resize(size);
+        // Set to 45% as described above
+        epoch_size = std::max((uint32_t)1, (45 * size) / 100);
+        // Initially set to wait for a whole epoch
+        epoch_heuristic_counter = epoch_size;
+        return size;
+    }
+
+    /** setup_bytes is a convenience function which accounts for internal memory
+     * usage when deciding how many elements to store. It isn't perfect because
+     * it doesn't account for any overhead (struct size, MallocUsage, collection
+     * and epoch flags). This was done to simplify selecting a power of two
+     * size. In the expected use case, an extra two bits per entry should be
+     * negligible compared to the size of the elements.
+     *
+     * @param bytes the approximate number of bytes to use for this data
+     * structure.
+     * @returns the maximum number of elements storable (see setup()
+     * documentation for more detail)
+     */
+    uint32_t setup_bytes(size_t bytes)
+    {
+        return setup(bytes/sizeof(Element));
+    }
+
+    /** insert loops at most depth_limit times trying to insert a hash
+     * at various locations in the table via a variant of the Cuckoo Algorithm
+     * with eight hash locations.
+     *
+     * It drops the last tried element if it runs out of depth before
+     * encountering an open slot.
+     *
+     * Thus
+     *
+     * insert(x);
+     * return contains(x, false);
+     *
+     * is not guaranteed to return true.
+     *
+     * @param e the element to insert
+     * @post one of the following: All previously inserted elements and e are
+     * now in the table, one previously inserted element is evicted from the
+     * table, the entry attempted to be inserted is evicted.
+     *
+     */
+    inline void insert(Element e)
+    {
+        epoch_check();
+        uint32_t last_loc = invalid();
+        bool last_epoch = true;
+        std::array<uint32_t, 8> locs = compute_hashes(e);
+        // Make sure we have not already inserted this element
+        // If we have, make sure that it does not get deleted
+        for (uint32_t loc : locs)
+            if (table[loc] == e) {
+                please_keep(loc);
+                epoch_flags[loc] = last_epoch;
+                return;
+            }
+        for (uint8_t depth = 0; depth < depth_limit; ++depth) {
+            // First try to insert to an empty slot, if one exists
+            for (uint32_t loc : locs) {
+                if (!collection_flags.bit_is_set(loc))
+                    continue;
+                table[loc] = std::move(e);
+                please_keep(loc);
+                epoch_flags[loc] = last_epoch;
+                return;
+            }
+            /** Swap with the element at the location that was
+            * not the last one looked at. Example:
+            *
+            * 1) On first iteration, last_loc == invalid(), find returns last, so
+            *    last_loc defaults to locs[0].
+            * 2) On further iterations, where last_loc == locs[k], last_loc will
+            *    go to locs[k+1 % 8], i.e., next of the 8 indicies wrapping around
+            *    to 0 if needed.
+            *
+            * This prevents moving the element we just put in.
+            *
+            * The swap is not a move -- we must switch onto the evicted element
+            * for the next iteration.
+            */
+            last_loc = locs[(1 + (std::find(locs.begin(), locs.end(), last_loc) - locs.begin())) & 7];
+            std::swap(table[last_loc], e);
+            // Can't std::swap a std::vector<bool>::reference and a bool&.
+            bool epoch = last_epoch;
+            last_epoch = epoch_flags[last_loc];
+            epoch_flags[last_loc] = epoch;
+
+            // Recompute the locs -- unfortunately happens one too many times!
+            locs = compute_hashes(e);
+        }
+    }
+
+    /* contains iterates through the hash locations for a given element
+     * and checks to see if it is present.
+     *
+     * contains does not check garbage collected state (in other words,
+     * garbage is only collected when the space is needed), so:
+     *
+     * insert(x);
+     * if (contains(x, true))
+     *     return contains(x, false);
+     * else
+     *     return true;
+     *
+     * executed on a single thread will always return true!
+     *
+     * This is a great property for re-org performance for example.
+     *
+     * contains returns a bool set true if the element was found.
+     *
+     * @param e the element to check
+     * @param erase
+     *
+     * @post if erase is true and the element is found, then the garbage collect
+     * flag is set
+     * @returns true if the element is found, false otherwise
+     */
+    inline bool contains(const Element& e, const bool erase) const
+    {
+        std::array<uint32_t, 8> locs = compute_hashes(e);
+        for (uint32_t loc : locs)
+            if (table[loc] == e) {
+                if (erase)
+                    allow_erase(loc);
+                return true;
+            }
+        return false;
+    }
+};
+} // namespace CuckooCache
+
+#endif
diff --git a/src/init.cpp b/src/init.cpp
index d3efc9f9787f1..1a500792a30eb 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -1070,6 +1070,8 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
     LogPrintf("Using config file %s\n", GetConfigFile(GetArg("-conf", BITCOIN_CONF_FILENAME)).string());
     LogPrintf("Using at most %i connections (%i file descriptors available)\n", nMaxConnections, nFD);
 
+    InitSignatureCache();
+
     LogPrintf("Using %u threads for script verification\n", nScriptCheckThreads);
     if (nScriptCheckThreads) {
         for (int i=0; i<nScriptCheckThreads-1; i++)
diff --git a/src/script/sigcache.cpp b/src/script/sigcache.cpp
index bdc0bfdc1c0f2..b78d7b607ff97 100644
--- a/src/script/sigcache.cpp
+++ b/src/script/sigcache.cpp
@@ -11,20 +11,29 @@
 #include "uint256.h"
 #include "util.h"
 
+#include "cuckoocache.h"
 #include <boost/thread.hpp>
-#include <boost/unordered_set.hpp>
 
 namespace {
 
 /**
  * We're hashing a nonce into the entries themselves, so we don't need extra
  * blinding in the set hash computation.
+ *
+ * This may exhibit platform endian dependent behavior but because these are
+ * nonced hashes (random) and this state is only ever used locally it is safe.
+ * All that matters is local consistency.
  */
-class CSignatureCacheHasher
+class SignatureCacheHasher
 {
 public:
-    size_t operator()(const uint256& key) const {
-        return key.GetCheapHash();
+    template <uint8_t hash_select>
+    uint32_t operator()(const uint256& key) const
+    {
+        static_assert(hash_select <8, "SignatureCacheHasher only has 8 hashes available.");
+        uint32_t u;
+        std::memcpy(&u, key.begin()+4*hash_select, 4);
+        return u;
     }
 };
 
@@ -38,11 +47,10 @@ class CSignatureCache
 private:
      //! Entries are SHA256(nonce || signature hash || public key || signature):
     uint256 nonce;
-    typedef boost::unordered_set<uint256, CSignatureCacheHasher> map_type;
+    typedef CuckooCache::cache<uint256, SignatureCacheHasher> map_type;
     map_type setValid;
     boost::shared_mutex cs_sigcache;
 
-
 public:
     CSignatureCache()
     {
@@ -56,58 +64,51 @@ class CSignatureCache
     }
 
     bool
-    Get(const uint256& entry)
+    Get(const uint256& entry, const bool erase)
     {
         boost::shared_lock<boost::shared_mutex> lock(cs_sigcache);
-        return setValid.count(entry);
+        return setValid.contains(entry, erase);
     }
 
-    void Erase(const uint256& entry)
+    void Set(uint256& entry)
     {
         boost::unique_lock<boost::shared_mutex> lock(cs_sigcache);
-        setValid.erase(entry);
+        setValid.insert(entry);
     }
-
-    void Set(const uint256& entry)
+    uint32_t setup_bytes(size_t n)
     {
-        size_t nMaxCacheSize = GetArg("-maxsigcachesize", DEFAULT_MAX_SIG_CACHE_SIZE) * ((size_t) 1 << 20);
-        if (nMaxCacheSize <= 0) return;
-
-        boost::unique_lock<boost::shared_mutex> lock(cs_sigcache);
-        while (memusage::DynamicUsage(setValid) > nMaxCacheSize)
-        {
-            map_type::size_type s = GetRand(setValid.bucket_count());
-            map_type::local_iterator it = setValid.begin(s);
-            if (it != setValid.end(s)) {
-                setValid.erase(*it);
-            }
-        }
-
-        setValid.insert(entry);
+        return setValid.setup_bytes(n);
     }
 };
 
+/* In previous versions of this code, signatureCache was a local static variable
+ * in CachingTransactionSignatureChecker::VerifySignature.  We initialize
+ * signatureCache outside of VerifySignature to avoid the atomic operation per
+ * call overhead associated with local static variables even though
+ * signatureCache could be made local to VerifySignature.
+*/
+static CSignatureCache signatureCache;
 }
 
-bool CachingTransactionSignatureChecker::VerifySignature(const std::vector<unsigned char>& vchSig, const CPubKey& pubkey, const uint256& sighash) const
+// To be called once in AppInit2/TestingSetup to initialize the signatureCache
+void InitSignatureCache()
 {
-    static CSignatureCache signatureCache;
+    size_t nMaxCacheSize = GetArg("-maxsigcachesize", DEFAULT_MAX_SIG_CACHE_SIZE) * ((size_t) 1 << 20);
+    if (nMaxCacheSize <= 0) return;
+    size_t nElems = signatureCache.setup_bytes(nMaxCacheSize);
+    LogPrintf("Using %zu MiB out of %zu requested for signature cache, able to store %zu elements\n",
+            (nElems*sizeof(uint256)) >>20, nMaxCacheSize>>20, nElems);
+}
 
+bool CachingTransactionSignatureChecker::VerifySignature(const std::vector<unsigned char>& vchSig, const CPubKey& pubkey, const uint256& sighash) const
+{
     uint256 entry;
     signatureCache.ComputeEntry(entry, sighash, vchSig, pubkey);
-
-    if (signatureCache.Get(entry)) {
-        if (!store) {
-            signatureCache.Erase(entry);
-        }
+    if (signatureCache.Get(entry, !store))
         return true;
-    }
-
     if (!TransactionSignatureChecker::VerifySignature(vchSig, pubkey, sighash))
         return false;
-
-    if (store) {
+    if (store)
         signatureCache.Set(entry);
-    }
     return true;
 }
diff --git a/src/script/sigcache.h b/src/script/sigcache.h
index 44551ec2bc435..5243fc0a42be7 100644
--- a/src/script/sigcache.h
+++ b/src/script/sigcache.h
@@ -10,9 +10,10 @@
 
 #include <vector>
 
-// DoS prevention: limit cache size to less than 40MB (over 500000
-// entries on 64-bit systems).
-static const unsigned int DEFAULT_MAX_SIG_CACHE_SIZE = 40;
+// DoS prevention: limit cache size to 32MB (over 1000000 entries on 64-bit
+// systems). Due to how we count cache size, actual memory usage is slightly
+// more (~32.25 MB)
+static const unsigned int DEFAULT_MAX_SIG_CACHE_SIZE = 32;
 
 class CPubKey;
 
@@ -27,4 +28,6 @@ class CachingTransactionSignatureChecker : public TransactionSignatureChecker
     bool VerifySignature(const std::vector<unsigned char>& vchSig, const CPubKey& vchPubKey, const uint256& sighash) const;
 };
 
+void InitSignatureCache();
+
 #endif // BITCOIN_SCRIPT_SIGCACHE_H
diff --git a/src/test/test_bitcoin.cpp b/src/test/test_bitcoin.cpp
index 98f4ed939ff18..b7a2a854d39f4 100644
--- a/src/test/test_bitcoin.cpp
+++ b/src/test/test_bitcoin.cpp
@@ -19,6 +19,7 @@
 #include "ui_interface.h"
 #include "rpc/server.h"
 #include "rpc/register.h"
+#include "script/sigcache.h"
 
 #include "test/testutil.h"
 
@@ -39,6 +40,7 @@ BasicTestingSetup::BasicTestingSetup(const std::string& chainName)
         ECC_Start();
         SetupEnvironment();
         SetupNetworking();
+        InitSignatureCache();
         fPrintToDebugLog = false; // don't want to write to debug.log file
         fCheckBlockIndex = true;
         SelectParams(chainName);

From 67dac4e1937b9835d2c09402d35e0050467fbc6d Mon Sep 17 00:00:00 2001
From: Jeremy Rubin <jeremy.l.rubin@gmail.com>
Date: Wed, 5 Oct 2016 16:59:18 -0400
Subject: [PATCH 1373/1802] Add unit tests for the CuckooCache

SQUASHME: Update Tests for other SQUASHMEs
---
 src/Makefile.test.include      |   1 +
 src/test/cuckoocache_tests.cpp | 394 +++++++++++++++++++++++++++++++++
 2 files changed, 395 insertions(+)
 create mode 100644 src/test/cuckoocache_tests.cpp

diff --git a/src/Makefile.test.include b/src/Makefile.test.include
index 5ce1bbb8963c1..8178fb7429007 100644
--- a/src/Makefile.test.include
+++ b/src/Makefile.test.include
@@ -54,6 +54,7 @@ BITCOIN_TESTS =\
   test/coins_tests.cpp \
   test/compress_tests.cpp \
   test/crypto_tests.cpp \
+  test/cuckoocache_tests.cpp \
   test/DoS_tests.cpp \
   test/getarg_tests.cpp \
   test/hash_tests.cpp \
diff --git a/src/test/cuckoocache_tests.cpp b/src/test/cuckoocache_tests.cpp
new file mode 100644
index 0000000000000..1bc50d5ea9002
--- /dev/null
+++ b/src/test/cuckoocache_tests.cpp
@@ -0,0 +1,394 @@
+// Copyright (c) 2012-2016 The Bitcoin Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+#include <boost/test/unit_test.hpp>
+#include "cuckoocache.h"
+#include "test/test_bitcoin.h"
+#include "random.h"
+#include <thread>
+#include <boost/thread.hpp>
+
+
+/** Test Suite for CuckooCache
+ *
+ *  1) All tests should have a deterministic result (using insecure rand
+ *  with deterministic seeds)
+ *  2) Some test methods are templated to allow for easier testing
+ *  against new versions / comparing
+ *  3) Results should be treated as a regression test, ie, did the behavior
+ *  change significantly from what was expected. This can be OK, depending on
+ *  the nature of the change, but requires updating the tests to reflect the new
+ *  expected behavior. For example improving the hit rate may cause some tests
+ *  using BOOST_CHECK_CLOSE to fail.
+ *
+ */
+FastRandomContext insecure_rand(true);
+
+BOOST_AUTO_TEST_SUITE(cuckoocache_tests);
+
+
+/** insecure_GetRandHash fills in a uint256 from insecure_rand
+ */
+void insecure_GetRandHash(uint256& t)
+{
+    uint32_t* ptr = (uint32_t*)t.begin();
+    for (uint8_t j = 0; j < 8; ++j)
+        *(ptr++) = insecure_rand.rand32();
+}
+
+/** Definition copied from /src/script/sigcache.cpp
+ */
+class uint256Hasher
+{
+public:
+    template <uint8_t hash_select>
+    uint32_t operator()(const uint256& key) const
+    {
+        static_assert(hash_select <8, "SignatureCacheHasher only has 8 hashes available.");
+        uint32_t u;
+        std::memcpy(&u, key.begin() + 4 * hash_select, 4);
+        return u;
+    }
+};
+
+
+/* Test that no values not inserted into the cache are read out of it.
+ *
+ * There are no repeats in the first 200000 insecure_GetRandHash calls
+ */
+BOOST_AUTO_TEST_CASE(test_cuckoocache_no_fakes)
+{
+    insecure_rand = FastRandomContext(true);
+    CuckooCache::cache<uint256, uint256Hasher> cc{};
+    cc.setup_bytes(32 << 20);
+    uint256 v;
+    for (int x = 0; x < 100000; ++x) {
+        insecure_GetRandHash(v);
+        cc.insert(v);
+    }
+    for (int x = 0; x < 100000; ++x) {
+        insecure_GetRandHash(v);
+        BOOST_CHECK(!cc.contains(v, false));
+    }
+};
+
+/** This helper returns the hit rate when megabytes*load worth of entries are
+ * inserted into a megabytes sized cache
+ */
+template <typename Cache>
+double test_cache(size_t megabytes, double load)
+{
+    insecure_rand = FastRandomContext(true);
+    std::vector<uint256> hashes;
+    Cache set{};
+    size_t bytes = megabytes * (1 << 20);
+    set.setup_bytes(bytes);
+    uint32_t n_insert = static_cast<uint32_t>(load * (bytes / sizeof(uint256)));
+    hashes.resize(n_insert);
+    for (uint32_t i = 0; i < n_insert; ++i) {
+        uint32_t* ptr = (uint32_t*)hashes[i].begin();
+        for (uint8_t j = 0; j < 8; ++j)
+            *(ptr++) = insecure_rand.rand32();
+    }
+    /** We make a copy of the hashes because future optimizations of the
+     * cuckoocache may overwrite the inserted element, so the test is
+     * "future proofed".
+     */
+    std::vector<uint256> hashes_insert_copy = hashes;
+    /** Do the insert */
+    for (uint256& h : hashes_insert_copy)
+        set.insert(h);
+    /** Count the hits */
+    uint32_t count = 0;
+    for (uint256& h : hashes)
+        count += set.contains(h, false);
+    double hit_rate = ((double)count) / ((double)n_insert);
+    return hit_rate;
+}
+
+/** The normalized hit rate for a given load.
+ *
+ * The semantics are a little confusing, so please see the below
+ * explanation.
+ *
+ * Examples:
+ *
+ * 1) at load 0.5, we expect a perfect hit rate, so we multiply by
+ * 1.0
+ * 2) at load 2.0, we expect to see half the entries, so a perfect hit rate
+ * would be 0.5. Therefore, if we see a hit rate of 0.4, 0.4*2.0 = 0.8 is the
+ * normalized hit rate.
+ *
+ * This is basically the right semantics, but has a bit of a glitch depending on
+ * how you measure around load 1.0 as after load 1.0 your normalized hit rate
+ * becomes effectively perfect, ignoring freshness.
+ */
+double normalize_hit_rate(double hits, double load)
+{
+    return hits * std::max(load, 1.0);
+}
+
+/** Check the hit rate on loads ranging from 0.1 to 2.0 */
+BOOST_AUTO_TEST_CASE(cuckoocache_hit_rate_ok)
+{
+    /** Arbitrarily selected Hit Rate threshold that happens to work for this test
+     * as a lower bound on performance.
+     */
+    double HitRateThresh = 0.98;
+    size_t megabytes = 32;
+    for (double load = 0.1; load < 2; load *= 2) {
+        double hits = test_cache<CuckooCache::cache<uint256, uint256Hasher>>(megabytes, load);
+        BOOST_CHECK(normalize_hit_rate(hits, load) > HitRateThresh);
+    }
+}
+
+
+/** This helper checks that erased elements are preferentially inserted onto and
+ * that the hit rate of "fresher" keys is reasonable*/
+template <typename Cache>
+void test_cache_erase(size_t megabytes)
+{
+    double load = 1;
+    insecure_rand = FastRandomContext(true);
+    std::vector<uint256> hashes;
+    Cache set{};
+    size_t bytes = megabytes * (1 << 20);
+    set.setup_bytes(bytes);
+    uint32_t n_insert = static_cast<uint32_t>(load * (bytes / sizeof(uint256)));
+    hashes.resize(n_insert);
+    for (uint32_t i = 0; i < n_insert; ++i) {
+        uint32_t* ptr = (uint32_t*)hashes[i].begin();
+        for (uint8_t j = 0; j < 8; ++j)
+            *(ptr++) = insecure_rand.rand32();
+    }
+    /** We make a copy of the hashes because future optimizations of the
+     * cuckoocache may overwrite the inserted element, so the test is
+     * "future proofed".
+     */
+    std::vector<uint256> hashes_insert_copy = hashes;
+
+    /** Insert the first half */
+    for (uint32_t i = 0; i < (n_insert / 2); ++i)
+        set.insert(hashes_insert_copy[i]);
+    /** Erase the first quarter */
+    for (uint32_t i = 0; i < (n_insert / 4); ++i)
+        set.contains(hashes[i], true);
+    /** Insert the second half */
+    for (uint32_t i = (n_insert / 2); i < n_insert; ++i)
+        set.insert(hashes_insert_copy[i]);
+
+    /** elements that we marked erased but that are still there */
+    size_t count_erased_but_contained = 0;
+    /** elements that we did not erase but are older */
+    size_t count_stale = 0;
+    /** elements that were most recently inserted */
+    size_t count_fresh = 0;
+
+    for (uint32_t i = 0; i < (n_insert / 4); ++i)
+        count_erased_but_contained += set.contains(hashes[i], false);
+    for (uint32_t i = (n_insert / 4); i < (n_insert / 2); ++i)
+        count_stale += set.contains(hashes[i], false);
+    for (uint32_t i = (n_insert / 2); i < n_insert; ++i)
+        count_fresh += set.contains(hashes[i], false);
+
+    double hit_rate_erased_but_contained = double(count_erased_but_contained) / (double(n_insert) / 4.0);
+    double hit_rate_stale = double(count_stale) / (double(n_insert) / 4.0);
+    double hit_rate_fresh = double(count_fresh) / (double(n_insert) / 2.0);
+
+    // Check that our hit_rate_fresh is perfect
+    BOOST_CHECK_EQUAL(hit_rate_fresh, 1.0);
+    // Check that we have a more than 2x better hit rate on stale elements than
+    // erased elements.
+    BOOST_CHECK(hit_rate_stale > 2 * hit_rate_erased_but_contained);
+}
+
+BOOST_AUTO_TEST_CASE(cuckoocache_erase_ok)
+{
+    size_t megabytes = 32;
+    test_cache_erase<CuckooCache::cache<uint256, uint256Hasher>>(megabytes);
+}
+
+template <typename Cache>
+void test_cache_erase_parallel(size_t megabytes)
+{
+    double load = 1;
+    insecure_rand = FastRandomContext(true);
+    std::vector<uint256> hashes;
+    Cache set{};
+    size_t bytes = megabytes * (1 << 20);
+    set.setup_bytes(bytes);
+    uint32_t n_insert = static_cast<uint32_t>(load * (bytes / sizeof(uint256)));
+    hashes.resize(n_insert);
+    for (uint32_t i = 0; i < n_insert; ++i) {
+        uint32_t* ptr = (uint32_t*)hashes[i].begin();
+        for (uint8_t j = 0; j < 8; ++j)
+            *(ptr++) = insecure_rand.rand32();
+    }
+    /** We make a copy of the hashes because future optimizations of the
+     * cuckoocache may overwrite the inserted element, so the test is
+     * "future proofed".
+     */
+    std::vector<uint256> hashes_insert_copy = hashes;
+    boost::shared_mutex mtx;
+
+    {
+        /** Grab lock to make sure we release inserts */
+        boost::unique_lock<boost::shared_mutex> l(mtx);
+        /** Insert the first half */
+        for (uint32_t i = 0; i < (n_insert / 2); ++i)
+            set.insert(hashes_insert_copy[i]);
+    }
+
+    /** Spin up 3 threads to run contains with erase.
+     */
+    std::vector<std::thread> threads;
+    /** Erase the first quarter */
+    for (uint32_t x = 0; x < 3; ++x)
+        /** Each thread is emplaced with x copy-by-value
+        */
+        threads.emplace_back([&, x] {
+            boost::shared_lock<boost::shared_mutex> l(mtx);
+            size_t ntodo = (n_insert/4)/3;
+            size_t start = ntodo*x;
+            size_t end = ntodo*(x+1);
+            for (uint32_t i = start; i < end; ++i)
+                set.contains(hashes[i], true);
+        });
+
+    /** Wait for all threads to finish
+     */
+    for (std::thread& t : threads)
+        t.join();
+    /** Grab lock to make sure we observe erases */
+    boost::unique_lock<boost::shared_mutex> l(mtx);
+    /** Insert the second half */
+    for (uint32_t i = (n_insert / 2); i < n_insert; ++i)
+        set.insert(hashes_insert_copy[i]);
+
+    /** elements that we marked erased but that are still there */
+    size_t count_erased_but_contained = 0;
+    /** elements that we did not erase but are older */
+    size_t count_stale = 0;
+    /** elements that were most recently inserted */
+    size_t count_fresh = 0;
+
+    for (uint32_t i = 0; i < (n_insert / 4); ++i)
+        count_erased_but_contained += set.contains(hashes[i], false);
+    for (uint32_t i = (n_insert / 4); i < (n_insert / 2); ++i)
+        count_stale += set.contains(hashes[i], false);
+    for (uint32_t i = (n_insert / 2); i < n_insert; ++i)
+        count_fresh += set.contains(hashes[i], false);
+
+    double hit_rate_erased_but_contained = double(count_erased_but_contained) / (double(n_insert) / 4.0);
+    double hit_rate_stale = double(count_stale) / (double(n_insert) / 4.0);
+    double hit_rate_fresh = double(count_fresh) / (double(n_insert) / 2.0);
+
+    // Check that our hit_rate_fresh is perfect
+    BOOST_CHECK_EQUAL(hit_rate_fresh, 1.0);
+    // Check that we have a more than 2x better hit rate on stale elements than
+    // erased elements.
+    BOOST_CHECK(hit_rate_stale > 2 * hit_rate_erased_but_contained);
+}
+BOOST_AUTO_TEST_CASE(cuckoocache_erase_parallel_ok)
+{
+    size_t megabytes = 32;
+    test_cache_erase_parallel<CuckooCache::cache<uint256, uint256Hasher>>(megabytes);
+}
+
+
+template <typename Cache>
+void test_cache_generations()
+{
+    // This test checks that for a simulation of network activity, the fresh hit
+    // rate is never below 99%, and the number of times that it is worse than
+    // 99.9% are less than 1% of the time.
+    double min_hit_rate = 0.99;
+    double tight_hit_rate = 0.999;
+    double max_rate_less_than_tight_hit_rate = 0.01;
+    // A cache that meets this specification is therefore shown to have a hit
+    // rate of at least tight_hit_rate * (1 - max_rate_less_than_tight_hit_rate) +
+    // min_hit_rate*max_rate_less_than_tight_hit_rate = 0.999*99%+0.99*1% == 99.89%
+    // hit rate with low variance.
+
+    // We use deterministic values, but this test has also passed on many
+    // iterations with non-deterministic values, so it isn't "overfit" to the
+    // specific entropy in FastRandomContext(true) and implementation of the
+    // cache.
+    insecure_rand = FastRandomContext(true);
+
+    // block_activity models a chunk of network activity. n_insert elements are
+    // adde to the cache. The first and last n/4 are stored for removal later
+    // and the middle n/2 are not stored. This models a network which uses half
+    // the signatures of recently (since the last block) added transactions
+    // immediately and never uses the other half.
+    struct block_activity {
+        std::vector<uint256> reads;
+        block_activity(uint32_t n_insert, Cache& c) : reads()
+        {
+            std::vector<uint256> inserts;
+            inserts.resize(n_insert);
+            reads.reserve(n_insert / 2);
+            for (uint32_t i = 0; i < n_insert; ++i) {
+                uint32_t* ptr = (uint32_t*)inserts[i].begin();
+                for (uint8_t j = 0; j < 8; ++j)
+                    *(ptr++) = insecure_rand.rand32();
+            }
+            for (uint32_t i = 0; i < n_insert / 4; ++i)
+                reads.push_back(inserts[i]);
+            for (uint32_t i = n_insert - (n_insert / 4); i < n_insert; ++i)
+                reads.push_back(inserts[i]);
+            for (auto h : inserts)
+                c.insert(h);
+        }
+    };
+
+    const uint32_t BLOCK_SIZE = 10000;
+    // We expect window size 60 to perform reasonably given that each epoch
+    // stores 45% of the cache size (~472k).
+    const uint32_t WINDOW_SIZE = 60;
+    const uint32_t POP_AMOUNT = (BLOCK_SIZE / WINDOW_SIZE) / 2;
+    const double load = 10;
+    const size_t megabytes = 32;
+    const size_t bytes = megabytes * (1 << 20);
+    const uint32_t n_insert = static_cast<uint32_t>(load * (bytes / sizeof(uint256)));
+
+    std::vector<block_activity> hashes;
+    Cache set{};
+    set.setup_bytes(bytes);
+    hashes.reserve(n_insert / BLOCK_SIZE);
+    std::deque<block_activity> last_few;
+    uint32_t out_of_tight_tolerance = 0;
+    uint32_t total = n_insert / BLOCK_SIZE;
+    // we use the deque last_few to model a sliding window of blocks. at each
+    // step, each of the last WINDOW_SIZE block_activities checks the cache for
+    // POP_AMOUNT of the hashes that they inserted, and marks these erased.
+    for (uint32_t i = 0; i < total; ++i) {
+        if (last_few.size() == WINDOW_SIZE)
+            last_few.pop_front();
+        last_few.emplace_back(BLOCK_SIZE, set);
+        uint32_t count = 0;
+        for (auto& act : last_few)
+            for (uint32_t k = 0; k < POP_AMOUNT; ++k) {
+                count += set.contains(act.reads.back(), true);
+                act.reads.pop_back();
+            }
+        // We use last_few.size() rather than WINDOW_SIZE for the correct
+        // behavior on the first WINDOW_SIZE iterations where the deque is not
+        // full yet.
+        double hit = (double(count)) / (last_few.size() * POP_AMOUNT);
+        // Loose Check that hit rate is above min_hit_rate
+        BOOST_CHECK(hit > min_hit_rate);
+        // Tighter check, count number of times we are less than tight_hit_rate
+        // (and implicityly, greater than min_hit_rate)
+        out_of_tight_tolerance += hit < tight_hit_rate;
+    }
+    // Check that being out of tolerance happens less than
+    // max_rate_less_than_tight_hit_rate of the time
+    BOOST_CHECK(double(out_of_tight_tolerance) / double(total) < max_rate_less_than_tight_hit_rate);
+}
+BOOST_AUTO_TEST_CASE(cuckoocache_generations)
+{
+    test_cache_generations<CuckooCache::cache<uint256, uint256Hasher>>();
+}
+
+BOOST_AUTO_TEST_SUITE_END();

From a4153e20eca3f3a7bec5f0b1f13d0ae07557416b Mon Sep 17 00:00:00 2001
From: Patrick Strateman <patrick.strateman@gmail.com>
Date: Fri, 22 Apr 2016 15:19:33 -0700
Subject: [PATCH 1374/1802] Simple fuzzing framework

---
 .gitignore                      |   1 +
 src/Makefile.am                 |   1 +
 src/Makefile.test.include       |  21 +++
 src/test/test_bitcoin_fuzzy.cpp | 256 ++++++++++++++++++++++++++++++++
 4 files changed, 279 insertions(+)
 create mode 100644 src/test/test_bitcoin_fuzzy.cpp

diff --git a/.gitignore b/.gitignore
index c765ffb607338..5dbce8aa7cc90 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,7 @@ src/bitcoind
 src/bitcoin-cli
 src/bitcoin-tx
 src/test/test_bitcoin
+src/test/test_bitcoin_fuzzy
 src/qt/test/test_bitcoin-qt
 
 # autoreconf
diff --git a/src/Makefile.am b/src/Makefile.am
index 8c12aee217576..389be6c0585c3 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -61,6 +61,7 @@ EXTRA_LIBRARIES += \
 lib_LTLIBRARIES = $(LIBBITCOINCONSENSUS)
 
 bin_PROGRAMS =
+noinst_PROGRAMS =
 TESTS =
 BENCHMARKS =
 
diff --git a/src/Makefile.test.include b/src/Makefile.test.include
index a14adc7876563..190c69be5f9f8 100644
--- a/src/Makefile.test.include
+++ b/src/Makefile.test.include
@@ -4,6 +4,7 @@
 
 TESTS += test/test_bitcoin
 bin_PROGRAMS += test/test_bitcoin
+noinst_PROGRAMS += test/test_bitcoin_fuzzy
 TEST_SRCDIR = test
 TEST_BINARY=test/test_bitcoin$(EXEEXT)
 
@@ -38,6 +39,7 @@ RAW_TEST_FILES =
 
 GENERATED_TEST_FILES = $(JSON_TEST_FILES:.json=.json.h) $(RAW_TEST_FILES:.raw=.raw.h)
 
+# test_bitcoin binary #
 BITCOIN_TESTS =\
   test/arith_uint256_tests.cpp \
   test/scriptnum10.h \
@@ -119,6 +121,25 @@ test_test_bitcoin_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) -s
 if ENABLE_ZMQ
 test_test_bitcoin_LDADD += $(ZMQ_LIBS)
 endif
+#
+
+# test_bitcoin_fuzzy binary #
+test_test_bitcoin_fuzzy_SOURCES = test/test_bitcoin_fuzzy.cpp
+test_test_bitcoin_fuzzy_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES)
+test_test_bitcoin_fuzzy_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
+test_test_bitcoin_fuzzy_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS)
+
+test_test_bitcoin_fuzzy_LDADD = \
+  $(LIBUNIVALUE) \
+  $(LIBBITCOIN_SERVER) \
+  $(LIBBITCOIN_COMMON) \
+  $(LIBBITCOIN_UTIL) \
+  $(LIBBITCOIN_CONSENSUS) \
+  $(LIBBITCOIN_CRYPTO) \
+  $(LIBSECP256K1)
+
+test_test_bitcoin_fuzzy_LDADD += $(BOOST_LIBS) $(CRYPTO_LIBS)
+#
 
 nodist_test_test_bitcoin_SOURCES = $(GENERATED_TEST_FILES)
 
diff --git a/src/test/test_bitcoin_fuzzy.cpp b/src/test/test_bitcoin_fuzzy.cpp
new file mode 100644
index 0000000000000..e1abde16f49aa
--- /dev/null
+++ b/src/test/test_bitcoin_fuzzy.cpp
@@ -0,0 +1,256 @@
+// Copyright (c) 2009-2015 The Bitcoin Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#if defined(HAVE_CONFIG_H)
+#include "config/bitcoin-config.h"
+#endif
+
+#include "consensus/merkle.h"
+#include "primitives/block.h"
+#include "script/script.h"
+#include "addrman.h"
+#include "chain.h"
+#include "coins.h"
+#include "compressor.h"
+#include "net.h"
+#include "protocol.h"
+#include "streams.h"
+#include "undo.h"
+#include "version.h"
+
+#include <stdint.h>
+#include <unistd.h>
+
+#include <algorithm>
+#include <vector>
+
+enum TEST_ID {
+    CBLOCK_DESERIALIZE=0,
+    CTRANSACTION_DESERIALIZE,
+    CBLOCKLOCATOR_DESERIALIZE,
+    CBLOCKMERKLEROOT,
+    CADDRMAN_DESERIALIZE,
+    CBLOCKHEADER_DESERIALIZE,
+    CBANENTRY_DESERIALIZE,
+    CTXUNDO_DESERIALIZE,
+    CBLOCKUNDO_DESERIALIZE,
+    CCOINS_DESERIALIZE,
+    CNETADDR_DESERIALIZE,
+    CSERVICE_DESERIALIZE,
+    CMESSAGEHEADER_DESERIALIZE,
+    CADDRESS_DESERIALIZE,
+    CINV_DESERIALIZE,
+    CBLOOMFILTER_DESERIALIZE,
+    CDISKBLOCKINDEX_DESERIALIZE,
+    CTXOUTCOMPRESSOR_DESERIALIZE,
+    TEST_ID_END
+};
+
+bool read_stdin(std::vector<char> &data) {
+    char buffer[1024];
+    ssize_t length=0;
+    while((length = read(STDIN_FILENO, buffer, 1024)) > 0) {
+        data.insert(data.end(), buffer, buffer+length);
+
+        if (data.size() > (1<<20)) return false;
+    }
+    return length==0;
+}
+
+int main(int argc, char **argv)
+{
+    std::vector<char> buffer;
+    if (!read_stdin(buffer)) return 0;
+
+    if (buffer.size() < sizeof(uint32_t)) return 0;
+
+    uint32_t test_id = 0xffffffff;
+    memcpy(&test_id, &buffer[0], sizeof(uint32_t));
+    buffer.erase(buffer.begin(), buffer.begin() + sizeof(uint32_t));
+
+    if (test_id >= TEST_ID_END) return 0;
+
+    CDataStream ds(buffer, SER_NETWORK, INIT_PROTO_VERSION);
+    try {
+        int nVersion;
+        ds >> nVersion;
+        ds.SetVersion(nVersion);
+    } catch (const std::ios_base::failure& e) {
+        return 0;
+    }
+
+    switch(test_id) {
+        case CBLOCK_DESERIALIZE:
+        {
+            try
+            {
+                CBlock block;
+                ds >> block;
+            } catch (const std::ios_base::failure& e) {return 0;}
+            break;
+        }
+        case CTRANSACTION_DESERIALIZE:
+        {
+            try
+            {
+                CTransaction tx(deserialize, ds);
+            } catch (const std::ios_base::failure& e) {return 0;}
+            break;
+        }
+        case CBLOCKLOCATOR_DESERIALIZE:
+        {
+            try
+            {
+                CBlockLocator bl;
+                ds >> bl;
+            } catch (const std::ios_base::failure& e) {return 0;}
+            break;
+        }
+        case CBLOCKMERKLEROOT:
+        {
+            try
+            {
+                CBlock block;
+                ds >> block;
+                bool mutated;
+                BlockMerkleRoot(block, &mutated);
+            } catch (const std::ios_base::failure& e) {return 0;}
+            break;
+        }
+        case CADDRMAN_DESERIALIZE:
+        {
+            try
+            {
+                CAddrMan am;
+                ds >> am;
+            } catch (const std::ios_base::failure& e) {return 0;}
+            break;
+        }
+        case CBLOCKHEADER_DESERIALIZE:
+        {
+            try
+            {
+                CBlockHeader bh;
+                ds >> bh;
+            } catch (const std::ios_base::failure& e) {return 0;}
+            break;
+        }
+        case CBANENTRY_DESERIALIZE:
+        {
+            try
+            {
+                CBanEntry be;
+                ds >> be;
+            } catch (const std::ios_base::failure& e) {return 0;}
+            break;
+        }
+        case CTXUNDO_DESERIALIZE:
+        {
+            try
+            {
+                CTxUndo tu;
+                ds >> tu;
+            } catch (const std::ios_base::failure& e) {return 0;}
+            break;
+        }
+        case CBLOCKUNDO_DESERIALIZE:
+        {
+            try
+            {
+                CBlockUndo bu;
+                ds >> bu;
+            } catch (const std::ios_base::failure& e) {return 0;}
+            break;
+        }
+        case CCOINS_DESERIALIZE:
+        {
+            try
+            {
+                CCoins block;
+                ds >> block;
+            } catch (const std::ios_base::failure& e) {return 0;}
+            break;
+        }
+        case CNETADDR_DESERIALIZE:
+        {
+            try
+            {
+                CNetAddr na;
+                ds >> na;
+            } catch (const std::ios_base::failure& e) {return 0;}
+            break;
+        }
+        case CSERVICE_DESERIALIZE:
+        {
+            try
+            {
+                CService s;
+                ds >> s;
+            } catch (const std::ios_base::failure& e) {return 0;}
+            break;
+        }
+        case CMESSAGEHEADER_DESERIALIZE:
+        {
+            CMessageHeader::MessageStartChars pchMessageStart = {0x00, 0x00, 0x00, 0x00};
+            try
+            {
+                CMessageHeader mh(pchMessageStart);
+                ds >> mh;
+                if (!mh.IsValid(pchMessageStart)) {return 0;}
+            } catch (const std::ios_base::failure& e) {return 0;}
+            break;
+        }
+        case CADDRESS_DESERIALIZE:
+        {
+            try
+            {
+                CAddress a;
+                ds >> a;
+            } catch (const std::ios_base::failure& e) {return 0;}
+            break;
+        }
+        case CINV_DESERIALIZE:
+        {
+            try
+            {
+                CInv i;
+                ds >> i;
+            } catch (const std::ios_base::failure& e) {return 0;}
+            break;
+        }
+        case CBLOOMFILTER_DESERIALIZE:
+        {
+            try
+            {
+                CBloomFilter bf;
+                ds >> bf;
+            } catch (const std::ios_base::failure& e) {return 0;}
+            break;
+        }
+        case CDISKBLOCKINDEX_DESERIALIZE:
+        {
+            try
+            {
+                CDiskBlockIndex dbi;
+                ds >> dbi;
+            } catch (const std::ios_base::failure& e) {return 0;}
+            break;
+        }
+        case CTXOUTCOMPRESSOR_DESERIALIZE:
+        {
+            CTxOut to;
+            try
+            {
+                ds >> to;
+            } catch (const std::ios_base::failure& e) {return 0;}
+
+            CTxOutCompressor toc(to);
+            break;
+        }
+        default:
+            return 0;
+    }
+    return 0;
+}
+

From 8b15434b59c6cd7368b4db680544cd77ed337bd3 Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Wed, 16 Nov 2016 12:25:18 +0100
Subject: [PATCH 1375/1802] doc: Add bare-bones documentation for fuzzing

---
 doc/README.md  |  1 +
 doc/fuzzing.md | 66 ++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 67 insertions(+)
 create mode 100644 doc/fuzzing.md

diff --git a/doc/README.md b/doc/README.md
index 8b9c0ea2625f0..36684e5401281 100644
--- a/doc/README.md
+++ b/doc/README.md
@@ -68,6 +68,7 @@ The Bitcoin repo's [root README](/README.md) contains relevant information on th
 ### Miscellaneous
 - [Assets Attribution](assets-attribution.md)
 - [Files](files.md)
+- [Fuzz-testing](fuzzing.md)
 - [Reduce Traffic](reduce-traffic.md)
 - [Tor Support](tor.md)
 - [Init Scripts (systemd/upstart/openrc)](init.md)
diff --git a/doc/fuzzing.md b/doc/fuzzing.md
new file mode 100644
index 0000000000000..bf3ad17861c4b
--- /dev/null
+++ b/doc/fuzzing.md
@@ -0,0 +1,66 @@
+Fuzz-testing Bitcoin Core
+==========================
+
+A special test harness `test_bitcoin_fuzzy` is provided to provide an easy
+entry point for fuzzers and the like. In this document we'll describe how to
+use it with AFL.
+
+Building AFL
+-------------
+
+It is recommended to always use the latest version of afl:
+```
+wget http://lcamtuf.coredump.cx/afl/releases/afl-latest.tgz
+tar -zxvf afl-latest.tgz
+cd afl-<version>
+make
+export AFLPATH=$PWD
+```
+
+Instrumentation
+----------------
+
+To build Bitcoin Core using AFL instrumentation (this assumes that the
+`AFLPATH` was set as above):
+```
+./configure --disable-ccache --disable-shared --enable-tests CC=${AFLPATH}/afl-gcc CXX=${AFLPATH}/afl-g++
+export AFL_HARDEN=1
+cd src/
+make test/test_bitcoin_fuzzy
+```
+We disable ccache because we don't want to pollute the ccache with instrumented
+objects, and similarly don't want to use non-instrumented cached objects linked
+in.
+
+Preparing fuzzing
+------------------
+
+AFL needs an input directory with examples, and an output directory where it
+will place examples that it found. These can be anywhere in the file system,
+we'll define environment variables to make it easy to reference them.
+
+```
+mkdir inputs
+AFLIN=$PWD/inputs
+mkdir outputs
+AFLOUT=$PWD/outputs
+```
+
+Example inputs are available from:
+
+- https://download.visucore.com/bitcoin/bitcoin_fuzzy_in.tar.xz
+- http://strateman.ninja/fuzzing.tar.xz
+
+Extract these (or other starting inputs) into the `inputs` directory before starting fuzzing.
+
+Fuzzing
+--------
+
+To start the actual fuzzing use:
+```
+$AFLPATH/afl-fuzz -i ${AFLIN} -o ${AFLOUT} -m52 -- test/test_bitcoin_fuzzy
+```
+
+You may have to change a few kernel parameters to test optimally - `afl-fuzz`
+will print an error and suggestion if so.
+

From af4c44ce59aa643b3e03eaa121ec075f524227a5 Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Thu, 15 Dec 2016 17:15:34 +0100
Subject: [PATCH 1376/1802] streams: Add data() method to CDataStream

Analogous to c++11 vector data().
---
 src/streams.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/streams.h b/src/streams.h
index b508784238de7..3755069982061 100644
--- a/src/streams.h
+++ b/src/streams.h
@@ -245,6 +245,8 @@ class CDataStream
     void clear()                                     { vch.clear(); nReadPos = 0; }
     iterator insert(iterator it, const char& x=char()) { return vch.insert(it, x); }
     void insert(iterator it, size_type n, const char& x) { vch.insert(it, n, x); }
+    value_type* data()                               { return vch.data() + nReadPos; }
+    const value_type* data() const                   { return vch.data() + nReadPos; }
 
     void insert(iterator it, std::vector<char>::const_iterator first, std::vector<char>::const_iterator last)
     {

From a2141e415aed26bab756220d8707b5fb33e6fef8 Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Thu, 15 Dec 2016 17:17:42 +0100
Subject: [PATCH 1377/1802] streams: Remove special cases for ancient MSVC

Quite sure that we haven't supported MSVC 6.0 for ages (MSC_VER 1300 is
>= MSVC++ 7.0) but with the C++11 switch we can be sure.
---
 src/streams.h | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/streams.h b/src/streams.h
index 3755069982061..4605068116d58 100644
--- a/src/streams.h
+++ b/src/streams.h
@@ -174,12 +174,10 @@ class CDataStream
         Init(nTypeIn, nVersionIn);
     }
 
-#if !defined(_MSC_VER) || _MSC_VER >= 1300
     CDataStream(const char* pbegin, const char* pend, int nTypeIn, int nVersionIn) : vch(pbegin, pend)
     {
         Init(nTypeIn, nVersionIn);
     }
-#endif
 
     CDataStream(const vector_type& vchIn, int nTypeIn, int nVersionIn) : vch(vchIn.begin(), vchIn.end())
     {
@@ -261,7 +259,6 @@ class CDataStream
             vch.insert(it, first, last);
     }
 
-#if !defined(_MSC_VER) || _MSC_VER >= 1300
     void insert(iterator it, const char* first, const char* last)
     {
         assert(last - first >= 0);
@@ -274,7 +271,6 @@ class CDataStream
         else
             vch.insert(it, first, last);
     }
-#endif
 
     iterator erase(iterator it)
     {

From adff950faeea95249df5f7536159701ea2202255 Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Thu, 15 Dec 2016 17:22:03 +0100
Subject: [PATCH 1378/1802] dbwrapper: Use new .data() method of CDataStream

---
 src/dbwrapper.h | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/dbwrapper.h b/src/dbwrapper.h
index 4a79bbd17dfec..c5e92e01f1801 100644
--- a/src/dbwrapper.h
+++ b/src/dbwrapper.h
@@ -65,13 +65,13 @@ class CDBBatch
         CDataStream ssKey(SER_DISK, CLIENT_VERSION);
         ssKey.reserve(DBWRAPPER_PREALLOC_KEY_SIZE);
         ssKey << key;
-        leveldb::Slice slKey(&ssKey[0], ssKey.size());
+        leveldb::Slice slKey(ssKey.data(), ssKey.size());
 
         CDataStream ssValue(SER_DISK, CLIENT_VERSION);
         ssValue.reserve(DBWRAPPER_PREALLOC_VALUE_SIZE);
         ssValue << value;
         ssValue.Xor(dbwrapper_private::GetObfuscateKey(parent));
-        leveldb::Slice slValue(&ssValue[0], ssValue.size());
+        leveldb::Slice slValue(ssValue.data(), ssValue.size());
 
         batch.Put(slKey, slValue);
     }
@@ -82,7 +82,7 @@ class CDBBatch
         CDataStream ssKey(SER_DISK, CLIENT_VERSION);
         ssKey.reserve(DBWRAPPER_PREALLOC_KEY_SIZE);
         ssKey << key;
-        leveldb::Slice slKey(&ssKey[0], ssKey.size());
+        leveldb::Slice slKey(ssKey.data(), ssKey.size());
 
         batch.Delete(slKey);
     }
@@ -112,7 +112,7 @@ class CDBIterator
         CDataStream ssKey(SER_DISK, CLIENT_VERSION);
         ssKey.reserve(DBWRAPPER_PREALLOC_KEY_SIZE);
         ssKey << key;
-        leveldb::Slice slKey(&ssKey[0], ssKey.size());
+        leveldb::Slice slKey(ssKey.data(), ssKey.size());
         piter->Seek(slKey);
     }
 
@@ -205,7 +205,7 @@ class CDBWrapper
         CDataStream ssKey(SER_DISK, CLIENT_VERSION);
         ssKey.reserve(DBWRAPPER_PREALLOC_KEY_SIZE);
         ssKey << key;
-        leveldb::Slice slKey(&ssKey[0], ssKey.size());
+        leveldb::Slice slKey(ssKey.data(), ssKey.size());
 
         std::string strValue;
         leveldb::Status status = pdb->Get(readoptions, slKey, &strValue);
@@ -239,7 +239,7 @@ class CDBWrapper
         CDataStream ssKey(SER_DISK, CLIENT_VERSION);
         ssKey.reserve(DBWRAPPER_PREALLOC_KEY_SIZE);
         ssKey << key;
-        leveldb::Slice slKey(&ssKey[0], ssKey.size());
+        leveldb::Slice slKey(ssKey.data(), ssKey.size());
 
         std::string strValue;
         leveldb::Status status = pdb->Get(readoptions, slKey, &strValue);

From e2300ff65e380bfe1454d0ea42a88abeeb6b8911 Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Thu, 15 Dec 2016 17:30:17 +0100
Subject: [PATCH 1379/1802] bench: Use CDataStream.data()

---
 src/bench/verify_script.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bench/verify_script.cpp b/src/bench/verify_script.cpp
index 91b8c4447200d..d5fdeb731920b 100644
--- a/src/bench/verify_script.cpp
+++ b/src/bench/verify_script.cpp
@@ -94,7 +94,7 @@ static void VerifyScriptBench(benchmark::State& state)
             txCredit.vout[0].scriptPubKey.data(),
             txCredit.vout[0].scriptPubKey.size(),
             txCredit.vout[0].nValue,
-            (const unsigned char*)&stream[0], stream.size(), 0, flags, nullptr);
+            (const unsigned char*)stream.data(), stream.size(), 0, flags, nullptr);
         assert(csuccess == 1);
 #endif
     }

From 5113474a91b8dcac4de0e4566b9babd5da281f29 Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Thu, 15 Dec 2016 17:34:59 +0100
Subject: [PATCH 1380/1802] wallet: Use CDataStream.data()

---
 src/wallet/db.cpp |  8 ++++----
 src/wallet/db.h   | 12 ++++++------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/wallet/db.cpp b/src/wallet/db.cpp
index a809c9ad64015..5ff3ea3cc8b61 100644
--- a/src/wallet/db.cpp
+++ b/src/wallet/db.cpp
@@ -397,15 +397,15 @@ bool CDB::Rewrite(const string& strFile, const char* pszSkip)
                                 break;
                             }
                             if (pszSkip &&
-                                strncmp(&ssKey[0], pszSkip, std::min(ssKey.size(), strlen(pszSkip))) == 0)
+                                strncmp(ssKey.data(), pszSkip, std::min(ssKey.size(), strlen(pszSkip))) == 0)
                                 continue;
-                            if (strncmp(&ssKey[0], "\x07version", 8) == 0) {
+                            if (strncmp(ssKey.data(), "\x07version", 8) == 0) {
                                 // Update version:
                                 ssValue.clear();
                                 ssValue << CLIENT_VERSION;
                             }
-                            Dbt datKey(&ssKey[0], ssKey.size());
-                            Dbt datValue(&ssValue[0], ssValue.size());
+                            Dbt datKey(ssKey.data(), ssKey.size());
+                            Dbt datValue(ssValue.data(), ssValue.size());
                             int ret2 = pdbCopy->put(NULL, &datKey, &datValue, DB_NOOVERWRITE);
                             if (ret2 > 0)
                                 fSuccess = false;
diff --git a/src/wallet/db.h b/src/wallet/db.h
index a0f673ecfc46f..049a2ca1a8273 100644
--- a/src/wallet/db.h
+++ b/src/wallet/db.h
@@ -122,7 +122,7 @@ class CDB
         CDataStream ssKey(SER_DISK, CLIENT_VERSION);
         ssKey.reserve(1000);
         ssKey << key;
-        Dbt datKey(&ssKey[0], ssKey.size());
+        Dbt datKey(ssKey.data(), ssKey.size());
 
         // Read
         Dbt datValue;
@@ -158,13 +158,13 @@ class CDB
         CDataStream ssKey(SER_DISK, CLIENT_VERSION);
         ssKey.reserve(1000);
         ssKey << key;
-        Dbt datKey(&ssKey[0], ssKey.size());
+        Dbt datKey(ssKey.data(), ssKey.size());
 
         // Value
         CDataStream ssValue(SER_DISK, CLIENT_VERSION);
         ssValue.reserve(10000);
         ssValue << value;
-        Dbt datValue(&ssValue[0], ssValue.size());
+        Dbt datValue(ssValue.data(), ssValue.size());
 
         // Write
         int ret = pdb->put(activeTxn, &datKey, &datValue, (fOverwrite ? 0 : DB_NOOVERWRITE));
@@ -187,7 +187,7 @@ class CDB
         CDataStream ssKey(SER_DISK, CLIENT_VERSION);
         ssKey.reserve(1000);
         ssKey << key;
-        Dbt datKey(&ssKey[0], ssKey.size());
+        Dbt datKey(ssKey.data(), ssKey.size());
 
         // Erase
         int ret = pdb->del(activeTxn, &datKey, 0);
@@ -207,7 +207,7 @@ class CDB
         CDataStream ssKey(SER_DISK, CLIENT_VERSION);
         ssKey.reserve(1000);
         ssKey << key;
-        Dbt datKey(&ssKey[0], ssKey.size());
+        Dbt datKey(ssKey.data(), ssKey.size());
 
         // Exists
         int ret = pdb->exists(activeTxn, &datKey, 0);
@@ -234,7 +234,7 @@ class CDB
         Dbt datKey;
         unsigned int fFlags = DB_NEXT;
         if (setRange) {
-            datKey.set_data(&ssKey[0]);
+            datKey.set_data(ssKey.data());
             datKey.set_size(ssKey.size());
             fFlags = DB_SET_RANGE;
         }

From 7017298eb2c72e262b865cd417d6844bcdd14a3f Mon Sep 17 00:00:00 2001
From: Suhas Daftuar <sdaftuar@gmail.com>
Date: Wed, 14 Dec 2016 14:42:04 -0500
Subject: [PATCH 1381/1802] Allow compactblock reconstruction when block is in
 flight

---
 src/net_processing.cpp | 45 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)

diff --git a/src/net_processing.cpp b/src/net_processing.cpp
index 74da788ca80cb..8a18c886e9a6b 100644
--- a/src/net_processing.cpp
+++ b/src/net_processing.cpp
@@ -1782,6 +1782,11 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
             }
         }
 
+        // Keep a CBlock for "optimistic" compactblock reconstructions (see
+        // below)
+        std::shared_ptr<CBlock> pblock = std::make_shared<CBlock>();
+        bool fBlockReconstructed = false;
+
         LOCK(cs_main);
         // If AcceptBlockHeader returned true, it set pindex
         assert(pindex);
@@ -1870,6 +1875,23 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
                     req.blockhash = pindex->GetBlockHash();
                     connman.PushMessage(pfrom, msgMaker.Make(NetMsgType::GETBLOCKTXN, req));
                 }
+            } else {
+                // This block is either already in flight from a different
+                // peer, or this peer has too many blocks outstanding to
+                // download from.
+                // Optimistically try to reconstruct anyway since we might be
+                // able to without any round trips.
+                PartiallyDownloadedBlock tempBlock(&mempool);
+                ReadStatus status = tempBlock.InitData(cmpctblock);
+                if (status != READ_STATUS_OK) {
+                    // TODO: don't ignore failures
+                    return true;
+                }
+                std::vector<CTransactionRef> dummy;
+                status = tempBlock.FillBlock(*pblock, dummy);
+                if (status == READ_STATUS_OK) {
+                    fBlockReconstructed = true;
+                }
             }
         } else {
             if (fAlreadyInFlight) {
@@ -1889,6 +1911,29 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
                 return ProcessMessage(pfrom, NetMsgType::HEADERS, vHeadersMsg, nTimeReceived, chainparams, connman);
             }
         }
+
+        if (fBlockReconstructed) {
+            // If we got here, we were able to optimistically reconstruct a
+            // block that is in flight from some other peer.
+            {
+                LOCK(cs_main);
+                mapBlockSource.emplace(pblock->GetHash(), std::make_pair(pfrom->GetId(), false));
+            }
+            bool fNewBlock = false;
+            ProcessNewBlock(chainparams, pblock, true, &fNewBlock);
+            if (fNewBlock)
+                pfrom->nLastBlockTime = GetTime();
+
+            LOCK(cs_main); // hold cs_main for CBlockIndex::IsValid()
+            if (pindex->IsValid(BLOCK_VALID_TRANSACTIONS)) {
+                // Clear download state for this block, which is in
+                // process from some other peer.  We do this after calling
+                // ProcessNewBlock so that a malleated cmpctblock announcement
+                // can't be used to interfere with block relay.
+                MarkBlockAsReceived(pblock->GetHash());
+            }
+        }
+
     }
 
     else if (strCommand == NetMsgType::BLOCKTXN && !fImporting && !fReindex) // Ignore blocks received while importing

From 813ede91e12dd777faee60f6286a9ed5bb72761a Mon Sep 17 00:00:00 2001
From: Suhas Daftuar <sdaftuar@gmail.com>
Date: Thu, 1 Dec 2016 12:59:10 -0500
Subject: [PATCH 1382/1802] [qa] Update compactblocks test for multi-peer
 reconstruction

---
 qa/rpc-tests/p2p-compactblocks.py | 52 +++++++++++++++++++++++++++++++
 1 file changed, 52 insertions(+)

diff --git a/qa/rpc-tests/p2p-compactblocks.py b/qa/rpc-tests/p2p-compactblocks.py
index ab4b809dedd63..fc1f16c6d2a05 100755
--- a/qa/rpc-tests/p2p-compactblocks.py
+++ b/qa/rpc-tests/p2p-compactblocks.py
@@ -764,6 +764,54 @@ def request_cb_announcements(self, peer, node, version):
         msg.announce = True
         peer.send_and_ping(msg)
 
+    def test_compactblock_reconstruction_multiple_peers(self, node, stalling_peer, delivery_peer):
+        assert(len(self.utxos))
+
+        def announce_cmpct_block(node, peer):
+            utxo = self.utxos.pop(0)
+            block = self.build_block_with_transactions(node, utxo, 5)
+
+            cmpct_block = HeaderAndShortIDs()
+            cmpct_block.initialize_from_block(block)
+            msg = msg_cmpctblock(cmpct_block.to_p2p())
+            peer.send_and_ping(msg)
+            with mininode_lock:
+                assert(peer.last_getblocktxn is not None)
+            return block, cmpct_block
+
+        block, cmpct_block = announce_cmpct_block(node, stalling_peer)
+
+        for tx in block.vtx[1:]:
+            delivery_peer.send_message(msg_tx(tx))
+        delivery_peer.sync_with_ping()
+        mempool = node.getrawmempool()
+        for tx in block.vtx[1:]:
+            assert(tx.hash in mempool)
+
+        delivery_peer.send_and_ping(msg_cmpctblock(cmpct_block.to_p2p()))
+        assert_equal(int(node.getbestblockhash(), 16), block.sha256)
+
+        self.utxos.append([block.vtx[-1].sha256, 0, block.vtx[-1].vout[0].nValue])
+
+        # Now test that delivering an invalid compact block won't break relay
+
+        block, cmpct_block = announce_cmpct_block(node, stalling_peer)
+        for tx in block.vtx[1:]:
+            delivery_peer.send_message(msg_tx(tx))
+        delivery_peer.sync_with_ping()
+
+        cmpct_block.prefilled_txn[0].tx.wit.vtxinwit = [ CTxInWitness() ]
+        cmpct_block.prefilled_txn[0].tx.wit.vtxinwit[0].scriptWitness.stack = [ser_uint256(0)]
+
+        cmpct_block.use_witness = True
+        delivery_peer.send_and_ping(msg_cmpctblock(cmpct_block.to_p2p()))
+        assert(int(node.getbestblockhash(), 16) != block.sha256)
+
+        msg = msg_blocktxn()
+        msg.block_transactions.blockhash = block.sha256
+        msg.block_transactions.transactions = block.vtx[1:]
+        stalling_peer.send_and_ping(msg)
+        assert_equal(int(node.getbestblockhash(), 16), block.sha256)
 
     def run_test(self):
         # Setup the p2p connections and start up the network thread.
@@ -848,6 +896,10 @@ def run_test(self):
         self.test_invalid_tx_in_compactblock(self.nodes[1], self.segwit_node, False)
         self.test_invalid_tx_in_compactblock(self.nodes[1], self.old_node, False)
 
+        print("\tTesting reconstructing compact blocks from all peers...")
+        self.test_compactblock_reconstruction_multiple_peers(self.nodes[1], self.segwit_node, self.old_node)
+        sync_blocks(self.nodes)
+
         # Advance to segwit activation
         print ("\nAdvancing to segwit activation\n")
         self.activate_segwit(self.nodes[1])

From 5dd626a6d34331d1712f49ed164b7aa47a2d7ea7 Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Thu, 15 Dec 2016 09:18:31 -0800
Subject: [PATCH 1383/1802] Make fuzzer actually test CTxOutCompressor

---
 src/test/test_bitcoin_fuzzy.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/test/test_bitcoin_fuzzy.cpp b/src/test/test_bitcoin_fuzzy.cpp
index e1abde16f49aa..584e6ed008f4e 100644
--- a/src/test/test_bitcoin_fuzzy.cpp
+++ b/src/test/test_bitcoin_fuzzy.cpp
@@ -240,12 +240,12 @@ int main(int argc, char **argv)
         case CTXOUTCOMPRESSOR_DESERIALIZE:
         {
             CTxOut to;
+            CTxOutCompressor toc(to);
             try
             {
-                ds >> to;
+                ds >> toc;
             } catch (const std::ios_base::failure& e) {return 0;}
 
-            CTxOutCompressor toc(to);
             break;
         }
         default:

From 39c77b00e3d61dfea1f45be5d3b77e5adea7b91a Mon Sep 17 00:00:00 2001
From: Russell Yanofsky <russ@yanofsky.org>
Date: Thu, 15 Dec 2016 15:14:02 -0500
Subject: [PATCH 1384/1802] Add documentation for CWalletTx::fFromMe member.

---
 src/wallet/wallet.h | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
index f7103b6a809e1..66c9a1ca47fdf 100644
--- a/src/wallet/wallet.h
+++ b/src/wallet/wallet.h
@@ -253,6 +253,11 @@ class CWalletTx : public CMerkleTx
     unsigned int fTimeReceivedIsTxTime;
     unsigned int nTimeReceived; //!< time received by this node
     unsigned int nTimeSmart;
+    /**
+     * From me flag is set to 1 for transactions that were created by the wallet
+     * on this bitcoin node, and set to 0 for transactions that were created
+     * externally and came in through the network or sendrawtransaction RPC.
+     */
     char fFromMe;
     std::string strFromAccount;
     int64_t nOrderPos; //!< position in ordered transaction list

From fa16b8fdbaecdce7db007c9f558e2b7e4027524f Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Fri, 16 Dec 2016 12:16:53 +0100
Subject: [PATCH 1385/1802] If we don't allow free txs, always send a fee
 filter (take 2)

---
 src/net_processing.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/net_processing.cpp b/src/net_processing.cpp
index ef2670f517b7c..a4e5ad2095cb8 100644
--- a/src/net_processing.cpp
+++ b/src/net_processing.cpp
@@ -2995,14 +2995,14 @@ bool SendMessages(CNode* pto, CConnman& connman)
         if (pto->nVersion >= FEEFILTER_VERSION && GetBoolArg("-feefilter", DEFAULT_FEEFILTER) &&
             !(pto->fWhitelisted && GetBoolArg("-whitelistforcerelay", DEFAULT_WHITELISTFORCERELAY))) {
             CAmount currentFilter = mempool.GetMinFee(GetArg("-maxmempool", DEFAULT_MAX_MEMPOOL_SIZE) * 1000000).GetFeePerK();
-            // If we don't allow free transactions, then we always have a fee filter of at least minRelayTxFee
-            if (GetArg("-limitfreerelay", DEFAULT_LIMITFREERELAY) <= 0)
-                currentFilter = std::max(currentFilter, ::minRelayTxFee.GetFeePerK());
             int64_t timeNow = GetTimeMicros();
             if (timeNow > pto->nextSendTimeFeeFilter) {
                 static CFeeRate default_feerate(DEFAULT_MIN_RELAY_TX_FEE);
                 static FeeFilterRounder filterRounder(default_feerate);
                 CAmount filterToSend = filterRounder.round(currentFilter);
+                // If we don't allow free transactions, then we always have a fee filter of at least minRelayTxFee
+                if (GetArg("-limitfreerelay", DEFAULT_LIMITFREERELAY) <= 0)
+                    filterToSend = std::max(filterToSend, ::minRelayTxFee.GetFeePerK());
                 if (filterToSend != pto->lastSentFeeFilter) {
                     connman.PushMessage(pto, msgMaker.Make(NetMsgType::FEEFILTER, filterToSend));
                     pto->lastSentFeeFilter = filterToSend;

From 815f4148b2eff6c64c764e910e79677d5a67adc7 Mon Sep 17 00:00:00 2001
From: Karl-Johan Alm <karljohan-alm@garage.co.jp>
Date: Fri, 16 Dec 2016 16:52:35 +0900
Subject: [PATCH 1386/1802] Uses built-in byte swap if available (Apple) and if
 bswap_XX is undefined.

Defers to pre-defined version if found (e.g. protobuf). For protobuf case, the definitions are identical and thus include order should not affect results.
---
 src/Makefile.qttest.include |  3 +++
 src/Makefile.test.include   |  1 +
 src/compat/byteswap.h       | 19 +++++++++++++++++++
 src/qt/test/compattests.cpp | 23 +++++++++++++++++++++++
 src/qt/test/compattests.h   | 19 +++++++++++++++++++
 src/qt/test/test_main.cpp   |  4 ++++
 src/test/bswap_tests.cpp    | 26 ++++++++++++++++++++++++++
 7 files changed, 95 insertions(+)
 create mode 100644 src/qt/test/compattests.cpp
 create mode 100644 src/qt/test/compattests.h
 create mode 100644 src/test/bswap_tests.cpp

diff --git a/src/Makefile.qttest.include b/src/Makefile.qttest.include
index cb310d5a1b157..039f8ac547acd 100644
--- a/src/Makefile.qttest.include
+++ b/src/Makefile.qttest.include
@@ -6,6 +6,7 @@ bin_PROGRAMS += qt/test/test_bitcoin-qt
 TESTS += qt/test/test_bitcoin-qt
 
 TEST_QT_MOC_CPP = \
+  qt/test/moc_compattests.cpp \
   qt/test/moc_rpcnestedtests.cpp \
   qt/test/moc_uritests.cpp
 
@@ -14,6 +15,7 @@ TEST_QT_MOC_CPP += qt/test/moc_paymentservertests.cpp
 endif
 
 TEST_QT_H = \
+  qt/test/compattests.h \
   qt/test/rpcnestedtests.h \
   qt/test/uritests.h \
   qt/test/paymentrequestdata.h \
@@ -23,6 +25,7 @@ qt_test_test_bitcoin_qt_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(BITCOIN_
   $(QT_INCLUDES) $(QT_TEST_INCLUDES) $(PROTOBUF_CFLAGS)
 
 qt_test_test_bitcoin_qt_SOURCES = \
+  qt/test/compattests.cpp \
   qt/test/rpcnestedtests.cpp \
   qt/test/test_main.cpp \
   qt/test/uritests.cpp \
diff --git a/src/Makefile.test.include b/src/Makefile.test.include
index c754eebf9a105..5969de087ed9e 100644
--- a/src/Makefile.test.include
+++ b/src/Makefile.test.include
@@ -52,6 +52,7 @@ BITCOIN_TESTS =\
   test/bip32_tests.cpp \
   test/blockencodings_tests.cpp \
   test/bloom_tests.cpp \
+  test/bswap_tests.cpp \
   test/coins_tests.cpp \
   test/compress_tests.cpp \
   test/crypto_tests.cpp \
diff --git a/src/compat/byteswap.h b/src/compat/byteswap.h
index 07ca535728ec3..56f4240e49d8d 100644
--- a/src/compat/byteswap.h
+++ b/src/compat/byteswap.h
@@ -15,6 +15,23 @@
 #include <byteswap.h>
 #endif
 
+#if defined(__APPLE__)
+
+#if !defined(bswap_16)
+
+// Mac OS X / Darwin features; we include a check for bswap_16 because if it is already defined, protobuf has
+// defined these macros for us already; if it isn't, we do it ourselves. In either case, we get the exact same
+// result regardless which path was taken
+#include <libkern/OSByteOrder.h>
+#define bswap_16(x) OSSwapInt16(x)
+#define bswap_32(x) OSSwapInt32(x)
+#define bswap_64(x) OSSwapInt64(x)
+
+#endif // !defined(bswap_16)
+
+#else
+// Non-Mac OS X / non-Darwin
+
 #if HAVE_DECL_BSWAP_16 == 0
 inline uint16_t bswap_16(uint16_t x)
 {
@@ -44,4 +61,6 @@ inline uint64_t bswap_64(uint64_t x)
 }
 #endif // HAVE_DECL_BSWAP64
 
+#endif // defined(__APPLE__)
+
 #endif // BITCOIN_COMPAT_BYTESWAP_H
diff --git a/src/qt/test/compattests.cpp b/src/qt/test/compattests.cpp
new file mode 100644
index 0000000000000..2a7284b5b2262
--- /dev/null
+++ b/src/qt/test/compattests.cpp
@@ -0,0 +1,23 @@
+// Copyright (c) 2016 The Bitcoin Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#include "paymentrequestplus.h" // this includes protobuf's port.h which defines its own bswap macos
+
+#include "compattests.h"
+
+#include "compat/byteswap.h"
+
+void CompatTests::bswapTests()
+{
+	// Sibling in bitcoin/src/test/bswap_tests.cpp
+	uint16_t u1 = 0x1234;
+	uint32_t u2 = 0x56789abc;
+	uint64_t u3 = 0xdef0123456789abc;
+	uint16_t e1 = 0x3412;
+	uint32_t e2 = 0xbc9a7856;
+	uint64_t e3 = 0xbc9a78563412f0de;
+	QVERIFY(bswap_16(u1) == e1);
+	QVERIFY(bswap_32(u2) == e2);
+	QVERIFY(bswap_64(u3) == e3);
+}
diff --git a/src/qt/test/compattests.h b/src/qt/test/compattests.h
new file mode 100644
index 0000000000000..35dede774344c
--- /dev/null
+++ b/src/qt/test/compattests.h
@@ -0,0 +1,19 @@
+// Copyright (c) 2009-2015 The Bitcoin Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#ifndef BITCOIN_QT_TEST_COMPATTESTS_H
+#define BITCOIN_QT_TEST_COMPATTESTS_H
+
+#include <QObject>
+#include <QTest>
+
+class CompatTests : public QObject
+{
+    Q_OBJECT
+
+private Q_SLOTS:
+    void bswapTests();
+};
+
+#endif // BITCOIN_QT_TEST_COMPATTESTS_H
diff --git a/src/qt/test/test_main.cpp b/src/qt/test/test_main.cpp
index dbaab54fb65b4..d44d711315d84 100644
--- a/src/qt/test/test_main.cpp
+++ b/src/qt/test/test_main.cpp
@@ -11,6 +11,7 @@
 #include "rpcnestedtests.h"
 #include "util.h"
 #include "uritests.h"
+#include "compattests.h"
 
 #ifdef ENABLE_WALLET
 #include "paymentservertests.h"
@@ -61,6 +62,9 @@ int main(int argc, char *argv[])
     RPCNestedTests test3;
     if (QTest::qExec(&test3) != 0)
         fInvalid = true;
+    CompatTests test4;
+    if (QTest::qExec(&test4) != 0)
+        fInvalid = true;
 
     ECC_Stop();
     return fInvalid;
diff --git a/src/test/bswap_tests.cpp b/src/test/bswap_tests.cpp
new file mode 100644
index 0000000000000..7b3134d327d9b
--- /dev/null
+++ b/src/test/bswap_tests.cpp
@@ -0,0 +1,26 @@
+// Copyright (c) 2016 The Bitcoin Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#include "compat/byteswap.h"
+#include "test/test_bitcoin.h"
+
+#include <boost/test/unit_test.hpp>
+
+BOOST_FIXTURE_TEST_SUITE(bswap_tests, BasicTestingSetup)
+
+BOOST_AUTO_TEST_CASE(bswap_tests)
+{
+	// Sibling in bitcoin/src/qt/test/compattests.cpp
+	uint16_t u1 = 0x1234;
+	uint32_t u2 = 0x56789abc;
+	uint64_t u3 = 0xdef0123456789abc;
+	uint16_t e1 = 0x3412;
+	uint32_t e2 = 0xbc9a7856;
+	uint64_t e3 = 0xbc9a78563412f0de;
+	BOOST_CHECK(bswap_16(u1) == e1);
+	BOOST_CHECK(bswap_32(u2) == e2);
+	BOOST_CHECK(bswap_64(u3) == e3);
+}
+
+BOOST_AUTO_TEST_SUITE_END()

From 23208ac81b718508a4f5d0fbb20029941c96049d Mon Sep 17 00:00:00 2001
From: BtcDrak <btcdrak@gmail.com>
Date: Mon, 19 Dec 2016 07:43:12 +0000
Subject: [PATCH 1387/1802] Remove unused test files and references

---
 src/Makefile.test.include       |  1 -
 src/test/data/txcreatesign.json | 33 ---------------------------------
 2 files changed, 34 deletions(-)
 delete mode 100644 src/test/data/txcreatesign.json

diff --git a/src/Makefile.test.include b/src/Makefile.test.include
index c754eebf9a105..50bd2341e45b5 100644
--- a/src/Makefile.test.include
+++ b/src/Makefile.test.include
@@ -13,7 +13,6 @@ EXTRA_DIST += \
 	test/bctest.py \
 	test/bitcoin-util-test.py \
 	test/data/bitcoin-util-test.json \
-	test/data/blanktx.hex \
 	test/data/tt-delin1-out.hex \
 	test/data/tt-delout1-out.hex \
 	test/data/tt-locktime317000-out.hex \
diff --git a/src/test/data/txcreatesign.json b/src/test/data/txcreatesign.json
deleted file mode 100644
index ff39e71b40c0d..0000000000000
--- a/src/test/data/txcreatesign.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-    "txid": "977e7cd286cb72cd470d539ba6cb48400f8f387d97451d45cdb8819437a303af",
-    "hash": "977e7cd286cb72cd470d539ba6cb48400f8f387d97451d45cdb8819437a303af",
-    "version": 1,
-    "locktime": 0,
-    "vin": [
-        {
-            "txid": "4d49a71ec9da436f71ec4ee231d04f292a29cd316f598bb7068feccabdc59485",
-            "vout": 0,
-            "scriptSig": {
-                "asm": "304502210096a75056c9e2cc62b7214777b3d2a592cfda7092520126d4ebfcd6d590c99bd8022051bb746359cf98c0603f3004477eac68701132380db8facba19c89dc5ab5c5e2[ALL] 0479be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8",
-                "hex": "48304502210096a75056c9e2cc62b7214777b3d2a592cfda7092520126d4ebfcd6d590c99bd8022051bb746359cf98c0603f3004477eac68701132380db8facba19c89dc5ab5c5e201410479be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8"
-            },
-            "sequence": 4294967295
-        }
-    ],
-    "vout": [
-        {
-            "value": 0.001,
-            "n": 0,
-            "scriptPubKey": {
-                "asm": "OP_DUP OP_HASH160 5834479edbbe0539b31ffd3a8f8ebadc2165ed01 OP_EQUALVERIFY OP_CHECKSIG",
-                "hex": "76a9145834479edbbe0539b31ffd3a8f8ebadc2165ed0188ac",
-                "reqSigs": 1,
-                "type": "pubkeyhash",
-                "addresses": [
-                    "193P6LtvS4nCnkDvM9uXn1gsSRqh4aDAz7"
-                ]
-            }
-        }
-    ],
-    "hex": "01000000018594c5bdcaec8f06b78b596f31cd292a294fd031e24eec716f43dac91ea7494d000000008b48304502210096a75056c9e2cc62b7214777b3d2a592cfda7092520126d4ebfcd6d590c99bd8022051bb746359cf98c0603f3004477eac68701132380db8facba19c89dc5ab5c5e201410479be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8ffffffff01a0860100000000001976a9145834479edbbe0539b31ffd3a8f8ebadc2165ed0188ac00000000"
-}

From cee16123f550f6baad0205f776831f39d026758b Mon Sep 17 00:00:00 2001
From: Gregory Sanders <gsanders87@gmail.com>
Date: Mon, 19 Dec 2016 09:35:23 -0500
Subject: [PATCH 1388/1802] reduce number of lookups in
 TransactionWithinChainLimit

---
 src/txmempool.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/txmempool.cpp b/src/txmempool.cpp
index f87713006a8a1..f11a36fd40977 100644
--- a/src/txmempool.cpp
+++ b/src/txmempool.cpp
@@ -1145,7 +1145,7 @@ void CTxMemPool::TrimToSize(size_t sizelimit, std::vector<uint256>* pvNoSpendsRe
 
 bool CTxMemPool::TransactionWithinChainLimit(const uint256& txid, size_t chainLimit) const {
     LOCK(cs);
-    if (exists(txid) && std::max(mapTx.find(txid)->GetCountWithAncestors(), mapTx.find(txid)->GetCountWithDescendants()) >= chainLimit)
-        return false;
-    return true;
+    auto it = mapTx.find(txid);
+    return it == mapTx.end() || (it->GetCountWithAncestors() < chainLimit &&
+       it->GetCountWithDescendants() < chainLimit);
 }

From e5534d2f0198e341c40e4ffa606fb65f3cd06863 Mon Sep 17 00:00:00 2001
From: Karl-Johan Alm <karljohan-alm@garage.co.jp>
Date: Tue, 20 Dec 2016 15:59:42 +0900
Subject: [PATCH 1389/1802] Added std::unique_ptr<> wrappers with deleters for
 libevent modules.

---
 src/Makefile.am      |  1 +
 src/support/events.h | 55 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 56 insertions(+)
 create mode 100644 src/support/events.h

diff --git a/src/Makefile.am b/src/Makefile.am
index c7124c3ef9b3c..ac75f250aed3f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -134,6 +134,7 @@ BITCOIN_CORE_H = \
   support/allocators/secure.h \
   support/allocators/zeroafterfree.h \
   support/cleanse.h \
+  support/events.h \
   support/lockedpool.h \
   sync.h \
   threadsafety.h \
diff --git a/src/support/events.h b/src/support/events.h
new file mode 100644
index 0000000000000..16378086fa6ee
--- /dev/null
+++ b/src/support/events.h
@@ -0,0 +1,55 @@
+// Copyright (c) 2016 The Bitcoin Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#ifndef BITCOIN_SUPPORT_EVENTS_H
+#define BITCOIN_SUPPORT_EVENTS_H
+
+#include <ios>
+
+#include <event2/event.h>
+#include <event2/http.h>
+
+#define MAKE_RAII(type) \
+/* deleter */\
+struct type##_deleter {\
+    void operator()(struct type* ob) {\
+        type##_free(ob);\
+    }\
+};\
+/* unique ptr typedef */\
+typedef std::unique_ptr<struct type, type##_deleter> raii_##type
+
+MAKE_RAII(event_base);
+MAKE_RAII(event);
+MAKE_RAII(evhttp);
+MAKE_RAII(evhttp_request);
+MAKE_RAII(evhttp_connection);
+
+raii_event_base obtain_event_base() {
+    auto result = raii_event_base(event_base_new());
+    if (!result.get())
+        throw std::runtime_error("cannot create event_base");
+    return result;
+}
+
+raii_event obtain_event(struct event_base* base, evutil_socket_t s, short events, event_callback_fn cb, void* arg) {
+    return raii_event(event_new(base, s, events, cb, arg));
+}
+
+raii_evhttp obtain_evhttp(struct event_base* base) {
+    return raii_evhttp(evhttp_new(base));
+}
+
+raii_evhttp_request obtain_evhttp_request(void(*cb)(struct evhttp_request *, void *), void *arg) {
+    return raii_evhttp_request(evhttp_request_new(cb, arg));
+}
+
+raii_evhttp_connection obtain_evhttp_connection_base(struct event_base* base, std::string host, uint16_t port) {
+    auto result = raii_evhttp_connection(evhttp_connection_base_new(base, NULL, host.c_str(), port));
+    if (!result.get())
+        throw std::runtime_error("create connection failed");
+    return result;
+}
+
+#endif // BITCOIN_SUPPORT_EVENTS_H

From 7f7f102b8d5024cc702e308f2ad86a4137d790f7 Mon Sep 17 00:00:00 2001
From: Karl-Johan Alm <karljohan-alm@garage.co.jp>
Date: Tue, 20 Dec 2016 20:46:11 +0900
Subject: [PATCH 1390/1802] Switched bitcoin-cli.cpp to use RAII unique
 pointers with deleters.

---
 src/bitcoin-cli.cpp | 32 ++++++++++++--------------------
 1 file changed, 12 insertions(+), 20 deletions(-)

diff --git a/src/bitcoin-cli.cpp b/src/bitcoin-cli.cpp
index 596cc8eada94a..2d11f45301fc2 100644
--- a/src/bitcoin-cli.cpp
+++ b/src/bitcoin-cli.cpp
@@ -17,10 +17,9 @@
 #include <boost/filesystem/operations.hpp>
 #include <stdio.h>
 
-#include <event2/event.h>
-#include <event2/http.h>
 #include <event2/buffer.h>
 #include <event2/keyvalq_struct.h>
+#include "support/events.h"
 
 #include <univalue.h>
 
@@ -190,23 +189,19 @@ UniValue CallRPC(const std::string& strMethod, const UniValue& params)
     std::string host = GetArg("-rpcconnect", DEFAULT_RPCCONNECT);
     int port = GetArg("-rpcport", BaseParams().RPCPort());
 
-    // Create event base
-    struct event_base *base = event_base_new(); // TODO RAII
-    if (!base)
-        throw std::runtime_error("cannot create event_base");
+    // Obtain event base
+    raii_event_base base = obtain_event_base();
 
     // Synchronously look up hostname
-    struct evhttp_connection *evcon = evhttp_connection_base_new(base, NULL, host.c_str(), port); // TODO RAII
-    if (evcon == NULL)
-        throw std::runtime_error("create connection failed");
-    evhttp_connection_set_timeout(evcon, GetArg("-rpcclienttimeout", DEFAULT_HTTP_CLIENT_TIMEOUT));
+    raii_evhttp_connection evcon = obtain_evhttp_connection_base(base.get(), host, port);
+    evhttp_connection_set_timeout(evcon.get(), GetArg("-rpcclienttimeout", DEFAULT_HTTP_CLIENT_TIMEOUT));
 
     HTTPReply response;
-    struct evhttp_request *req = evhttp_request_new(http_request_done, (void*)&response); // TODO RAII
+    raii_evhttp_request req = obtain_evhttp_request(http_request_done, (void*)&response);
     if (req == NULL)
         throw std::runtime_error("create http request failed");
 #if LIBEVENT_VERSION_NUMBER >= 0x02010300
-    evhttp_request_set_error_cb(req, http_error_cb);
+    evhttp_request_set_error_cb(req.get(), http_error_cb);
 #endif
 
     // Get credentials
@@ -223,7 +218,7 @@ UniValue CallRPC(const std::string& strMethod, const UniValue& params)
         strRPCUserColonPass = mapArgs["-rpcuser"] + ":" + mapArgs["-rpcpassword"];
     }
 
-    struct evkeyvalq *output_headers = evhttp_request_get_output_headers(req);
+    struct evkeyvalq* output_headers = evhttp_request_get_output_headers(req.get());
     assert(output_headers);
     evhttp_add_header(output_headers, "Host", host.c_str());
     evhttp_add_header(output_headers, "Connection", "close");
@@ -231,20 +226,17 @@ UniValue CallRPC(const std::string& strMethod, const UniValue& params)
 
     // Attach request data
     std::string strRequest = JSONRPCRequestObj(strMethod, params, 1).write() + "\n";
-    struct evbuffer * output_buffer = evhttp_request_get_output_buffer(req);
+    struct evbuffer* output_buffer = evhttp_request_get_output_buffer(req.get());
     assert(output_buffer);
     evbuffer_add(output_buffer, strRequest.data(), strRequest.size());
 
-    int r = evhttp_make_request(evcon, req, EVHTTP_REQ_POST, "/");
+    int r = evhttp_make_request(evcon.get(), req.get(), EVHTTP_REQ_POST, "/");
+    req.release(); // ownership moved to evcon in above call
     if (r != 0) {
-        evhttp_connection_free(evcon);
-        event_base_free(base);
         throw CConnectionFailed("send http request failed");
     }
 
-    event_base_dispatch(base);
-    evhttp_connection_free(evcon);
-    event_base_free(base);
+    event_base_dispatch(base.get());
 
     if (response.status == 0)
         throw CConnectionFailed(strprintf("couldn't connect to server: %s (code %d)\n(make sure server is running and you are connecting to the correct RPC port)", http_errorstring(response.error), response.error));

From 9cb66248dc7e1c782256d1f69ad67f9c63fb61f8 Mon Sep 17 00:00:00 2001
From: BtcDrak <btcdrak@gmail.com>
Date: Tue, 20 Dec 2016 19:49:02 +0000
Subject: [PATCH 1391/1802] Fix testfile reference

---
 src/Makefile.test.include | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Makefile.test.include b/src/Makefile.test.include
index 50bd2341e45b5..a9e2f29b888d0 100644
--- a/src/Makefile.test.include
+++ b/src/Makefile.test.include
@@ -21,7 +21,7 @@ EXTRA_DIST += \
 	test/data/txcreate2.hex \
 	test/data/txcreatedata1.hex \
 	test/data/txcreatedata2.hex \
-	test/data/txcreatesign.hex \
+	test/data/txcreatesignv1.hex \
 	test/data/txcreatedata_seq0.hex \
 	test/data/txcreatedata_seq1.hex
 

From fad632ed7a266bcd7a4f65bf253af9e4b5c70d2f Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Tue, 20 Dec 2016 22:54:27 +0100
Subject: [PATCH 1392/1802] travis: make distdir

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index d201cea732d66..6570e6571bc52 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -60,6 +60,7 @@ script:
     - mkdir build && cd build
     - ../configure $BITCOIN_CONFIG_ALL $BITCOIN_CONFIG || ( cat config.log && false)
     - make $MAKEJOBS $GOAL || ( echo "Build failure. Verbose build follows." && make $GOAL V=1 ; false )
+    - make distdir
     - export LD_LIBRARY_PATH=$TRAVIS_BUILD_DIR/depends/$HOST/lib
     - if [ "$RUN_TESTS" = "true" ]; then make $MAKEJOBS check VERBOSE=1; fi
     - if [ "$RUN_TESTS" = "true" ]; then qa/pull-tester/rpc-tests.py --coverage; fi

From fad896df19bb917c8121118c944aa9047f105b19 Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Tue, 20 Dec 2016 23:07:43 +0100
Subject: [PATCH 1393/1802] gitignore: Wipe line after java comp tool removal

---
 .gitignore | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 5dbce8aa7cc90..8ace3c7123219 100644
--- a/.gitignore
+++ b/.gitignore
@@ -56,7 +56,6 @@ src/qt/test/moc*.cpp
 *.o
 *.o-*
 *.patch
-.bitcoin
 *.a
 *.pb.cc
 *.pb.h

From fa89581860b303bbcff9590d096dcace8fd43503 Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Wed, 21 Dec 2016 01:39:59 +0100
Subject: [PATCH 1394/1802] build: Include cuckoocache header in Makefile

---
 src/Makefile.am | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Makefile.am b/src/Makefile.am
index c7124c3ef9b3c..89b90e6dff57d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -97,6 +97,7 @@ BITCOIN_CORE_H = \
   consensus/consensus.h \
   core_io.h \
   core_memusage.h \
+  cuckoocache.h \
   httprpc.h \
   httpserver.h \
   indirectmap.h \

From 280a5599ebccbb54fb650f5e3939b0878b2f667a Mon Sep 17 00:00:00 2001
From: Karl-Johan Alm <karljohan-alm@garage.co.jp>
Date: Wed, 21 Dec 2016 13:43:49 +0900
Subject: [PATCH 1395/1802] Added some simple tests for the RAII-style events.

---
 src/Makefile.test.include     |  3 +-
 src/support/events.h          |  1 +
 src/test/raii_event_tests.cpp | 88 +++++++++++++++++++++++++++++++++++
 3 files changed, 91 insertions(+), 1 deletion(-)
 create mode 100644 src/test/raii_event_tests.cpp

diff --git a/src/Makefile.test.include b/src/Makefile.test.include
index 5969de087ed9e..5d57daff4cac2 100644
--- a/src/Makefile.test.include
+++ b/src/Makefile.test.include
@@ -74,6 +74,7 @@ BITCOIN_TESTS =\
   test/policyestimator_tests.cpp \
   test/pow_tests.cpp \
   test/prevector_tests.cpp \
+  test/raii_event_tests.cpp \
   test/reverselock_tests.cpp \
   test/rpc_tests.cpp \
   test/sanity_tests.cpp \
@@ -111,7 +112,7 @@ endif
 test_test_bitcoin_SOURCES = $(BITCOIN_TESTS) $(JSON_TEST_FILES) $(RAW_TEST_FILES)
 test_test_bitcoin_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) -I$(builddir)/test/ $(TESTDEFS)
 test_test_bitcoin_LDADD = $(LIBBITCOIN_SERVER) $(LIBBITCOIN_CLI) $(LIBBITCOIN_COMMON) $(LIBBITCOIN_UTIL) $(LIBBITCOIN_CONSENSUS) $(LIBBITCOIN_CRYPTO) $(LIBUNIVALUE) $(LIBLEVELDB) $(LIBMEMENV) \
-  $(BOOST_LIBS) $(BOOST_UNIT_TEST_FRAMEWORK_LIB) $(LIBSECP256K1)
+  $(BOOST_LIBS) $(BOOST_UNIT_TEST_FRAMEWORK_LIB) $(LIBSECP256K1) $(EVENT_LIBS)
 test_test_bitcoin_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
 if ENABLE_WALLET
 test_test_bitcoin_LDADD += $(LIBBITCOIN_WALLET)
diff --git a/src/support/events.h b/src/support/events.h
index 16378086fa6ee..4f2f3cf9ef760 100644
--- a/src/support/events.h
+++ b/src/support/events.h
@@ -6,6 +6,7 @@
 #define BITCOIN_SUPPORT_EVENTS_H
 
 #include <ios>
+#include <memory>
 
 #include <event2/event.h>
 #include <event2/http.h>
diff --git a/src/test/raii_event_tests.cpp b/src/test/raii_event_tests.cpp
new file mode 100644
index 0000000000000..87d25c0e2c4bc
--- /dev/null
+++ b/src/test/raii_event_tests.cpp
@@ -0,0 +1,88 @@
+// Copyright (c) 2016 The Bitcoin Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#include <event2/event.h>
+#include <map>
+#include <stdlib.h>
+
+#include "support/events.h"
+
+#include "test/test_bitcoin.h"
+
+#include <vector>
+
+#include <boost/test/unit_test.hpp>
+
+static std::map<void*, short> tags;
+static std::map<void*, uint16_t> orders;
+static uint16_t tagSequence = 0;
+
+static void* tag_malloc(size_t sz) {
+    void* mem = malloc(sz);
+    if (!mem) return mem;
+    tags[mem]++;
+    orders[mem] = tagSequence++;
+    return mem;
+}
+
+static void tag_free(void* mem) {
+    tags[mem]--;
+    orders[mem] = tagSequence++;
+    free(mem);
+}
+
+BOOST_FIXTURE_TEST_SUITE(raii_event_tests, BasicTestingSetup)
+
+BOOST_AUTO_TEST_CASE(raii_event_creation)
+{
+    event_set_mem_functions(tag_malloc, realloc, tag_free);
+    
+    void* base_ptr = NULL;
+    {
+        auto base = obtain_event_base();
+        base_ptr = (void*)base.get();
+        BOOST_CHECK(tags[base_ptr] == 1);
+    }
+    BOOST_CHECK(tags[base_ptr] == 0);
+    
+    void* event_ptr = NULL;
+    {
+        auto base = obtain_event_base();
+        auto event = obtain_event(base.get(), -1, 0, NULL, NULL);
+
+        base_ptr = (void*)base.get();
+        event_ptr = (void*)event.get();
+
+        BOOST_CHECK(tags[base_ptr] == 1);
+        BOOST_CHECK(tags[event_ptr] == 1);
+    }
+    BOOST_CHECK(tags[base_ptr] == 0);
+    BOOST_CHECK(tags[event_ptr] == 0);
+    
+    event_set_mem_functions(malloc, realloc, free);
+}
+
+BOOST_AUTO_TEST_CASE(raii_event_order)
+{
+    event_set_mem_functions(tag_malloc, realloc, tag_free);
+    
+    void* base_ptr = NULL;
+    void* event_ptr = NULL;
+    {
+        auto base = obtain_event_base();
+        auto event = obtain_event(base.get(), -1, 0, NULL, NULL);
+
+        base_ptr = (void*)base.get();
+        event_ptr = (void*)event.get();
+
+        // base should have allocated before event
+        BOOST_CHECK(orders[base_ptr] < orders[event_ptr]);
+    }
+    // base should be freed after event
+    BOOST_CHECK(orders[base_ptr] > orders[event_ptr]);
+
+    event_set_mem_functions(malloc, realloc, free);
+}
+
+BOOST_AUTO_TEST_SUITE_END()

From 0513c707aa1e356bc4da609bf0263cc684b0d6e3 Mon Sep 17 00:00:00 2001
From: Gregory Sanders <gsanders87@gmail.com>
Date: Wed, 21 Dec 2016 08:45:59 -0500
Subject: [PATCH 1396/1802] Make rpcauth help message clearer, add example in
 example .conf

---
 contrib/debian/examples/bitcoin.conf | 23 ++++++++++++++++++++++-
 src/init.cpp                         |  2 +-
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/contrib/debian/examples/bitcoin.conf b/contrib/debian/examples/bitcoin.conf
index 2831c07292436..afbc7882e01a4 100644
--- a/contrib/debian/examples/bitcoin.conf
+++ b/contrib/debian/examples/bitcoin.conf
@@ -67,9 +67,30 @@
 # This option can be specified multiple times (default: bind to all interfaces)
 #rpcbind=<addr>
 
-# You must set rpcuser and rpcpassword to secure the JSON-RPC api
+# If no rpcpassword is set, rpc cookie auth is sought. The default `-rpccookiefile` name
+# is .cookie and found in the `-datadir` being used for bitcoind. This option is typically used
+# when the server and client are run as the same user.
+#
+# If not, you must set rpcuser and rpcpassword to secure the JSON-RPC api. The first
+# method(DEPRECATED) is to set this pair for the server and client:
 #rpcuser=Ulysseys
 #rpcpassword=YourSuperGreatPasswordNumber_DO_NOT_USE_THIS_OR_YOU_WILL_GET_ROBBED_385593
+#
+# The second method `rpcauth` can be added to server startup argument. It is set at intialization time
+# using the output from the script in share/rpcuser/rpcuser.py after providing a username:
+#
+# ./share/rpcuser/rpcuser.py alice
+# String to be appended to bitcoin.conf:
+# rpcauth=alice:f7efda5c189b999524f151318c0c86$d5b51b3beffbc02b724e5d095828e0bc8b2456e9ac8757ae3211a5d9b16a22ae
+# Your password:
+# DONT_USE_THIS_YOU_WILL_GET_ROBBED_8ak1gI25KFTvjovL3gAM967mies3E=
+#
+# On client-side, you add the normal user/password pair to send commands:
+#rpcuser=alice
+#rpcpassword=DONT_USE_THIS_YOU_WILL_GET_ROBBED_8ak1gI25KFTvjovL3gAM967mies3E=
+#
+# You can even add multiple entries of these to the server conf file, and client can use any of them:
+# rpcauth=bob:b2dd077cb54591a2f3139e69a897ac$4e71f08d48b4347cf8eff3815c0e25ae2e9a4340474079f55705f40574f4ec99
 
 # How many seconds bitcoin will wait for a complete RPC HTTP request.
 # after the HTTP connection is established. 
diff --git a/src/init.cpp b/src/init.cpp
index e642729a990ef..659b83e474fb4 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -484,7 +484,7 @@ std::string HelpMessage(HelpMessageMode mode)
     strUsage += HelpMessageOpt("-rpccookiefile=<loc>", _("Location of the auth cookie (default: data dir)"));
     strUsage += HelpMessageOpt("-rpcuser=<user>", _("Username for JSON-RPC connections"));
     strUsage += HelpMessageOpt("-rpcpassword=<pw>", _("Password for JSON-RPC connections"));
-    strUsage += HelpMessageOpt("-rpcauth=<userpw>", _("Username and hashed password for JSON-RPC connections. The field <userpw> comes in the format: <USERNAME>:<SALT>$<HASH>. A canonical python script is included in share/rpcuser. This option can be specified multiple times"));
+    strUsage += HelpMessageOpt("-rpcauth=<userpw>", _("Username and hashed password for JSON-RPC connections. The field <userpw> comes in the format: <USERNAME>:<SALT>$<HASH>. A canonical python script is included in share/rpcuser. The client then connects normally using the rpcuser=<USERNAME>/rpcpassword=<PASSWORD> pair of arguments. This option can be specified multiple times"));
     strUsage += HelpMessageOpt("-rpcport=<port>", strprintf(_("Listen for JSON-RPC connections on <port> (default: %u or testnet: %u)"), BaseParams(CBaseChainParams::MAIN).RPCPort(), BaseParams(CBaseChainParams::TESTNET).RPCPort()));
     strUsage += HelpMessageOpt("-rpcallowip=<ip>", _("Allow JSON-RPC connections from specified source. Valid for <ip> are a single IP (e.g. 1.2.3.4), a network/netmask (e.g. 1.2.3.4/255.255.255.0) or a network/CIDR (e.g. 1.2.3.4/24). This option can be specified multiple times"));
     strUsage += HelpMessageOpt("-rpcthreads=<n>", strprintf(_("Set the number of threads to service RPC calls (default: %d)"), DEFAULT_HTTP_THREADS));

From b3717326c1d7a92f452eb4ba72009c4fb98539d0 Mon Sep 17 00:00:00 2001
From: Douglas Roark <doug@bloq.com>
Date: Wed, 21 Dec 2016 13:40:14 -0800
Subject: [PATCH 1397/1802] Re-enable a blank v1 Tx JSON test

---
 src/test/data/bitcoin-util-test.json           | 11 ++++++++---
 src/test/data/{blanktx.json => blanktxv1.json} |  0
 2 files changed, 8 insertions(+), 3 deletions(-)
 rename src/test/data/{blanktx.json => blanktxv1.json} (100%)

diff --git a/src/test/data/bitcoin-util-test.json b/src/test/data/bitcoin-util-test.json
index ab1a1385a3b4a..d001b2056fe32 100644
--- a/src/test/data/bitcoin-util-test.json
+++ b/src/test/data/bitcoin-util-test.json
@@ -5,9 +5,9 @@
     "description": "Creates a blank v1 transaction"
   },
   { "exec": "./bitcoin-tx",
-    "args": ["-json","-create"],
-    "output_cmp": "blanktxv2.json",
-    "description": "Creates a blank transaction (output in json)"
+    "args": ["-json","-create", "nversion=1"],
+    "output_cmp": "blanktxv1.json",
+    "description": "Creates a blank v1 transaction (output in json)"
   },
   { "exec": "./bitcoin-tx",
     "args": ["-"],
@@ -15,6 +15,11 @@
     "output_cmp": "blanktxv2.hex",
     "description": "Creates a blank transaction when nothing is piped into bitcoin-tx"
   },
+  { "exec": "./bitcoin-tx",
+    "args": ["-json","-create"],
+    "output_cmp": "blanktxv2.json",
+    "description": "Creates a blank transaction (output in json)"
+  },
   { "exec": "./bitcoin-tx",
     "args": ["-json","-"],
     "input": "blanktxv2.hex",
diff --git a/src/test/data/blanktx.json b/src/test/data/blanktxv1.json
similarity index 100%
rename from src/test/data/blanktx.json
rename to src/test/data/blanktxv1.json

From d63ff6265b0c6ae30efcbb9120d4db419606198a Mon Sep 17 00:00:00 2001
From: Patrick Strateman <patrick.strateman@gmail.com>
Date: Sat, 26 Nov 2016 19:32:30 -0800
Subject: [PATCH 1398/1802] Make nWalletDBUpdated atomic to avoid a potential
 race.

---
 src/wallet/db.cpp       |  3 --
 src/wallet/db.h         |  2 --
 src/wallet/wallet.cpp   |  2 +-
 src/wallet/walletdb.cpp | 66 +++++++++++++++++++++++++----------------
 src/wallet/walletdb.h   |  3 +-
 5 files changed, 43 insertions(+), 33 deletions(-)

diff --git a/src/wallet/db.cpp b/src/wallet/db.cpp
index a809c9ad64015..4278e56c89991 100644
--- a/src/wallet/db.cpp
+++ b/src/wallet/db.cpp
@@ -24,9 +24,6 @@
 using namespace std;
 
 
-unsigned int nWalletDBUpdated;
-
-
 //
 // CDB
 //
diff --git a/src/wallet/db.h b/src/wallet/db.h
index a0f673ecfc46f..74e4a3ca1d236 100644
--- a/src/wallet/db.h
+++ b/src/wallet/db.h
@@ -23,8 +23,6 @@
 static const unsigned int DEFAULT_WALLET_DBLOGSIZE = 100;
 static const bool DEFAULT_WALLET_PRIVDB = true;
 
-extern unsigned int nWalletDBUpdated;
-
 class CDBEnv
 {
 private:
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index 39c4fc3f1bbcb..15001776f143a 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -3508,7 +3508,7 @@ bool CWallet::InitLoadWallet()
         walletInstance->ScanForWalletTransactions(pindexRescan, true);
         LogPrintf(" rescan      %15dms\n", GetTimeMillis() - nStart);
         walletInstance->SetBestChain(chainActive.GetLocator());
-        nWalletDBUpdated++;
+        CWalletDB::IncrementUpdateCounter();
 
         // Restore wallet transaction metadata after -zapwallettxes=1
         if (GetBoolArg("-zapwallettxes", false) && GetArg("-zapwallettxes", "1") != "2")
diff --git a/src/wallet/walletdb.cpp b/src/wallet/walletdb.cpp
index 43fd6a20adc81..e31c59b22c980 100644
--- a/src/wallet/walletdb.cpp
+++ b/src/wallet/walletdb.cpp
@@ -15,6 +15,8 @@
 #include "utiltime.h"
 #include "wallet/wallet.h"
 
+#include <atomic>
+
 #include <boost/version.hpp>
 #include <boost/filesystem.hpp>
 #include <boost/foreach.hpp>
@@ -24,13 +26,15 @@ using namespace std;
 
 static uint64_t nAccountingEntryNumber = 0;
 
+static std::atomic<unsigned int> nWalletDBUpdateCounter;
+
 //
 // CWalletDB
 //
 
 bool CWalletDB::WriteName(const string& strAddress, const string& strName)
 {
-    nWalletDBUpdated++;
+    nWalletDBUpdateCounter++;
     return Write(make_pair(string("name"), strAddress), strName);
 }
 
@@ -38,37 +42,37 @@ bool CWalletDB::EraseName(const string& strAddress)
 {
     // This should only be used for sending addresses, never for receiving addresses,
     // receiving addresses must always have an address book entry if they're not change return.
-    nWalletDBUpdated++;
+    nWalletDBUpdateCounter++;
     return Erase(make_pair(string("name"), strAddress));
 }
 
 bool CWalletDB::WritePurpose(const string& strAddress, const string& strPurpose)
 {
-    nWalletDBUpdated++;
+    nWalletDBUpdateCounter++;
     return Write(make_pair(string("purpose"), strAddress), strPurpose);
 }
 
 bool CWalletDB::ErasePurpose(const string& strPurpose)
 {
-    nWalletDBUpdated++;
+    nWalletDBUpdateCounter++;
     return Erase(make_pair(string("purpose"), strPurpose));
 }
 
 bool CWalletDB::WriteTx(const CWalletTx& wtx)
 {
-    nWalletDBUpdated++;
+    nWalletDBUpdateCounter++;
     return Write(std::make_pair(std::string("tx"), wtx.GetHash()), wtx);
 }
 
 bool CWalletDB::EraseTx(uint256 hash)
 {
-    nWalletDBUpdated++;
+    nWalletDBUpdateCounter++;
     return Erase(std::make_pair(std::string("tx"), hash));
 }
 
 bool CWalletDB::WriteKey(const CPubKey& vchPubKey, const CPrivKey& vchPrivKey, const CKeyMetadata& keyMeta)
 {
-    nWalletDBUpdated++;
+    nWalletDBUpdateCounter++;
 
     if (!Write(std::make_pair(std::string("keymeta"), vchPubKey),
                keyMeta, false))
@@ -88,7 +92,7 @@ bool CWalletDB::WriteCryptedKey(const CPubKey& vchPubKey,
                                 const CKeyMetadata &keyMeta)
 {
     const bool fEraseUnencryptedKey = true;
-    nWalletDBUpdated++;
+    nWalletDBUpdateCounter++;
 
     if (!Write(std::make_pair(std::string("keymeta"), vchPubKey),
             keyMeta))
@@ -106,31 +110,31 @@ bool CWalletDB::WriteCryptedKey(const CPubKey& vchPubKey,
 
 bool CWalletDB::WriteMasterKey(unsigned int nID, const CMasterKey& kMasterKey)
 {
-    nWalletDBUpdated++;
+    nWalletDBUpdateCounter++;
     return Write(std::make_pair(std::string("mkey"), nID), kMasterKey, true);
 }
 
 bool CWalletDB::WriteCScript(const uint160& hash, const CScript& redeemScript)
 {
-    nWalletDBUpdated++;
+    nWalletDBUpdateCounter++;
     return Write(std::make_pair(std::string("cscript"), hash), *(const CScriptBase*)(&redeemScript), false);
 }
 
 bool CWalletDB::WriteWatchOnly(const CScript &dest)
 {
-    nWalletDBUpdated++;
+    nWalletDBUpdateCounter++;
     return Write(std::make_pair(std::string("watchs"), *(const CScriptBase*)(&dest)), '1');
 }
 
 bool CWalletDB::EraseWatchOnly(const CScript &dest)
 {
-    nWalletDBUpdated++;
+    nWalletDBUpdateCounter++;
     return Erase(std::make_pair(std::string("watchs"), *(const CScriptBase*)(&dest)));
 }
 
 bool CWalletDB::WriteBestBlock(const CBlockLocator& locator)
 {
-    nWalletDBUpdated++;
+    nWalletDBUpdateCounter++;
     Write(std::string("bestblock"), CBlockLocator()); // Write empty block locator so versions that require a merkle branch automatically rescan
     return Write(std::string("bestblock_nomerkle"), locator);
 }
@@ -143,13 +147,13 @@ bool CWalletDB::ReadBestBlock(CBlockLocator& locator)
 
 bool CWalletDB::WriteOrderPosNext(int64_t nOrderPosNext)
 {
-    nWalletDBUpdated++;
+    nWalletDBUpdateCounter++;
     return Write(std::string("orderposnext"), nOrderPosNext);
 }
 
 bool CWalletDB::WriteDefaultKey(const CPubKey& vchPubKey)
 {
-    nWalletDBUpdated++;
+    nWalletDBUpdateCounter++;
     return Write(std::string("defaultkey"), vchPubKey);
 }
 
@@ -160,13 +164,13 @@ bool CWalletDB::ReadPool(int64_t nPool, CKeyPool& keypool)
 
 bool CWalletDB::WritePool(int64_t nPool, const CKeyPool& keypool)
 {
-    nWalletDBUpdated++;
+    nWalletDBUpdateCounter++;
     return Write(std::make_pair(std::string("pool"), nPool), keypool);
 }
 
 bool CWalletDB::ErasePool(int64_t nPool)
 {
-    nWalletDBUpdated++;
+    nWalletDBUpdateCounter++;
     return Erase(std::make_pair(std::string("pool"), nPool));
 }
 
@@ -780,20 +784,20 @@ void ThreadFlushWalletDB(const string& strFile)
     if (!GetBoolArg("-flushwallet", DEFAULT_FLUSHWALLET))
         return;
 
-    unsigned int nLastSeen = nWalletDBUpdated;
-    unsigned int nLastFlushed = nWalletDBUpdated;
+    unsigned int nLastSeen = CWalletDB::GetUpdateCounter();
+    unsigned int nLastFlushed = CWalletDB::GetUpdateCounter();
     int64_t nLastWalletUpdate = GetTime();
     while (true)
     {
         MilliSleep(500);
 
-        if (nLastSeen != nWalletDBUpdated)
+        if (nLastSeen != CWalletDB::GetUpdateCounter())
         {
-            nLastSeen = nWalletDBUpdated;
+            nLastSeen = CWalletDB::GetUpdateCounter();
             nLastWalletUpdate = GetTime();
         }
 
-        if (nLastFlushed != nWalletDBUpdated && GetTime() - nLastWalletUpdate >= 2)
+        if (nLastFlushed != CWalletDB::GetUpdateCounter() && GetTime() - nLastWalletUpdate >= 2)
         {
             TRY_LOCK(bitdb.cs_db,lockDb);
             if (lockDb)
@@ -814,7 +818,7 @@ void ThreadFlushWalletDB(const string& strFile)
                     if (_mi != bitdb.mapFileUseCount.end())
                     {
                         LogPrint("db", "Flushing %s\n", strFile);
-                        nLastFlushed = nWalletDBUpdated;
+                        nLastFlushed = CWalletDB::GetUpdateCounter();
                         int64_t nStart = GetTimeMillis();
 
                         // Flush wallet file so it's self contained
@@ -921,19 +925,29 @@ bool CWalletDB::Recover(CDBEnv& dbenv, const std::string& filename)
 
 bool CWalletDB::WriteDestData(const std::string &address, const std::string &key, const std::string &value)
 {
-    nWalletDBUpdated++;
+    nWalletDBUpdateCounter++;
     return Write(std::make_pair(std::string("destdata"), std::make_pair(address, key)), value);
 }
 
 bool CWalletDB::EraseDestData(const std::string &address, const std::string &key)
 {
-    nWalletDBUpdated++;
+    nWalletDBUpdateCounter++;
     return Erase(std::make_pair(std::string("destdata"), std::make_pair(address, key)));
 }
 
 
 bool CWalletDB::WriteHDChain(const CHDChain& chain)
 {
-    nWalletDBUpdated++;
+    nWalletDBUpdateCounter++;
     return Write(std::string("hdchain"), chain);
 }
+
+void CWalletDB::IncrementUpdateCounter()
+{
+    nWalletDBUpdateCounter++;
+}
+
+unsigned int CWalletDB::GetUpdateCounter()
+{
+    return nWalletDBUpdateCounter;
+}
diff --git a/src/wallet/walletdb.h b/src/wallet/walletdb.h
index eb25ac613dd33..d7036aabdd2cf 100644
--- a/src/wallet/walletdb.h
+++ b/src/wallet/walletdb.h
@@ -176,10 +176,11 @@ class CWalletDB : public CDB
     //! write the hdchain model (external chain child index counter)
     bool WriteHDChain(const CHDChain& chain);
 
+    static void IncrementUpdateCounter();
+    static unsigned int GetUpdateCounter();
 private:
     CWalletDB(const CWalletDB&);
     void operator=(const CWalletDB&);
-
 };
 
 void ThreadFlushWalletDB(const std::string& strFile);

From c44e4c467c30fe7790372bdea8941ba29fd3327e Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Thu, 10 Nov 2016 22:29:19 -0800
Subject: [PATCH 1399/1802] Make AcceptToMemoryPool take CTransactionRef

---
 src/bench/mempool_eviction.cpp       |  2 +-
 src/net_processing.cpp               |  8 +++++---
 src/rpc/rawtransaction.cpp           |  6 +++---
 src/test/test_bitcoin.cpp            |  2 +-
 src/test/txvalidationcache_tests.cpp |  2 +-
 src/txmempool.cpp                    | 10 +++++-----
 src/txmempool.h                      |  3 ++-
 src/validation.cpp                   | 16 +++++++++-------
 src/validation.h                     |  4 ++--
 src/wallet/wallet.cpp                |  4 ++--
 10 files changed, 31 insertions(+), 26 deletions(-)

diff --git a/src/bench/mempool_eviction.cpp b/src/bench/mempool_eviction.cpp
index 0ae69c75fcaeb..98ab2a35557d2 100644
--- a/src/bench/mempool_eviction.cpp
+++ b/src/bench/mempool_eviction.cpp
@@ -18,7 +18,7 @@ static void AddTx(const CTransaction& tx, const CAmount& nFee, CTxMemPool& pool)
     unsigned int sigOpCost = 4;
     LockPoints lp;
     pool.addUnchecked(tx.GetHash(), CTxMemPoolEntry(
-                                        tx, nFee, nTime, dPriority, nHeight, pool.HasNoInputsOf(tx),
+                                        MakeTransactionRef(tx), nFee, nTime, dPriority, nHeight, pool.HasNoInputsOf(tx),
                                         tx.GetValueOut(), spendsCoinbase, sigOpCost, lp));
 }
 
diff --git a/src/net_processing.cpp b/src/net_processing.cpp
index 87d367c2fbcb3..4c693eea04bea 100644
--- a/src/net_processing.cpp
+++ b/src/net_processing.cpp
@@ -1596,7 +1596,9 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
 
         deque<COutPoint> vWorkQueue;
         vector<uint256> vEraseQueue;
-        CTransaction tx(deserialize, vRecv);
+        CTransactionRef ptx;
+        vRecv >> ptx;
+        const CTransaction& tx = *ptx;
 
         CInv inv(MSG_TX, tx.GetHash());
         pfrom->AddInventoryKnown(inv);
@@ -1609,7 +1611,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
         pfrom->setAskFor.erase(inv.hash);
         mapAlreadyAskedFor.erase(inv.hash);
 
-        if (!AlreadyHave(inv) && AcceptToMemoryPool(mempool, state, tx, true, &fMissingInputs)) {
+        if (!AlreadyHave(inv) && AcceptToMemoryPool(mempool, state, ptx, true, &fMissingInputs)) {
             mempool.check(pcoinsTip);
             RelayTransaction(tx, connman);
             for (unsigned int i = 0; i < tx.vout.size(); i++) {
@@ -1646,7 +1648,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
 
                     if (setMisbehaving.count(fromPeer))
                         continue;
-                    if (AcceptToMemoryPool(mempool, stateDummy, orphanTx, true, &fMissingInputs2)) {
+                    if (AcceptToMemoryPool(mempool, stateDummy, MakeTransactionRef(orphanTx), true, &fMissingInputs2)) {
                         LogPrint("mempool", "   accepted orphan tx %s\n", orphanHash.ToString());
                         RelayTransaction(orphanTx, connman);
                         for (unsigned int i = 0; i < orphanTx.vout.size(); i++) {
diff --git a/src/rpc/rawtransaction.cpp b/src/rpc/rawtransaction.cpp
index 21af449466496..28f43fbec0b69 100644
--- a/src/rpc/rawtransaction.cpp
+++ b/src/rpc/rawtransaction.cpp
@@ -883,8 +883,8 @@ UniValue sendrawtransaction(const JSONRPCRequest& request)
     CMutableTransaction mtx;
     if (!DecodeHexTx(mtx, request.params[0].get_str()))
         throw JSONRPCError(RPC_DESERIALIZATION_ERROR, "TX decode failed");
-    CTransaction tx(std::move(mtx));
-    uint256 hashTx = tx.GetHash();
+    CTransactionRef tx(MakeTransactionRef(std::move(mtx)));
+    const uint256& hashTx = tx->GetHash();
 
     bool fLimitFree = false;
     CAmount nMaxRawTxFee = maxTxFee;
@@ -899,7 +899,7 @@ UniValue sendrawtransaction(const JSONRPCRequest& request)
         // push to local node and sync with wallets
         CValidationState state;
         bool fMissingInputs;
-        if (!AcceptToMemoryPool(mempool, state, tx, fLimitFree, &fMissingInputs, false, nMaxRawTxFee)) {
+        if (!AcceptToMemoryPool(mempool, state, std::move(tx), fLimitFree, &fMissingInputs, false, nMaxRawTxFee)) {
             if (state.IsInvalid()) {
                 throw JSONRPCError(RPC_TRANSACTION_REJECTED, strprintf("%i: %s", state.GetRejectCode(), state.GetRejectReason()));
             } else {
diff --git a/src/test/test_bitcoin.cpp b/src/test/test_bitcoin.cpp
index 2a5a78de02567..31551325b44b2 100644
--- a/src/test/test_bitcoin.cpp
+++ b/src/test/test_bitcoin.cpp
@@ -151,7 +151,7 @@ CTxMemPoolEntry TestMemPoolEntryHelper::FromTx(const CTransaction &txn, CTxMemPo
     // Hack to assume either its completely dependent on other mempool txs or not at all
     CAmount inChainValue = hasNoDependencies ? txn.GetValueOut() : 0;
 
-    return CTxMemPoolEntry(txn, nFee, nTime, dPriority, nHeight,
+    return CTxMemPoolEntry(MakeTransactionRef(txn), nFee, nTime, dPriority, nHeight,
                            hasNoDependencies, inChainValue, spendsCoinbase, sigOpCost, lp);
 }
 
diff --git a/src/test/txvalidationcache_tests.cpp b/src/test/txvalidationcache_tests.cpp
index 9f58f004d50b0..ac78fb1fd8ff9 100644
--- a/src/test/txvalidationcache_tests.cpp
+++ b/src/test/txvalidationcache_tests.cpp
@@ -23,7 +23,7 @@ ToMemPool(CMutableTransaction& tx)
     LOCK(cs_main);
 
     CValidationState state;
-    return AcceptToMemoryPool(mempool, state, tx, false, NULL, true, 0);
+    return AcceptToMemoryPool(mempool, state, MakeTransactionRef(tx), false, NULL, true, 0);
 }
 
 BOOST_FIXTURE_TEST_CASE(tx_mempool_block_doublespend, TestChain100Setup)
diff --git a/src/txmempool.cpp b/src/txmempool.cpp
index c3da69c3f001d..90a80661149ac 100644
--- a/src/txmempool.cpp
+++ b/src/txmempool.cpp
@@ -20,22 +20,22 @@
 
 using namespace std;
 
-CTxMemPoolEntry::CTxMemPoolEntry(const CTransaction& _tx, const CAmount& _nFee,
+CTxMemPoolEntry::CTxMemPoolEntry(const CTransactionRef& _tx, const CAmount& _nFee,
                                  int64_t _nTime, double _entryPriority, unsigned int _entryHeight,
                                  bool poolHasNoInputsOf, CAmount _inChainInputValue,
                                  bool _spendsCoinbase, int64_t _sigOpsCost, LockPoints lp):
-    tx(MakeTransactionRef(_tx)), nFee(_nFee), nTime(_nTime), entryPriority(_entryPriority), entryHeight(_entryHeight),
+    tx(_tx), nFee(_nFee), nTime(_nTime), entryPriority(_entryPriority), entryHeight(_entryHeight),
     hadNoDependencies(poolHasNoInputsOf), inChainInputValue(_inChainInputValue),
     spendsCoinbase(_spendsCoinbase), sigOpCost(_sigOpsCost), lockPoints(lp)
 {
-    nTxWeight = GetTransactionWeight(_tx);
-    nModSize = _tx.CalculateModifiedSize(GetTxSize());
+    nTxWeight = GetTransactionWeight(*tx);
+    nModSize = tx->CalculateModifiedSize(GetTxSize());
     nUsageSize = RecursiveDynamicUsage(*tx) + memusage::DynamicUsage(tx);
 
     nCountWithDescendants = 1;
     nSizeWithDescendants = GetTxSize();
     nModFeesWithDescendants = nFee;
-    CAmount nValueIn = _tx.GetValueOut()+nFee;
+    CAmount nValueIn = tx->GetValueOut()+nFee;
     assert(inChainInputValue <= nValueIn);
 
     feeDelta = 0;
diff --git a/src/txmempool.h b/src/txmempool.h
index 8a5787a8866b1..1c0fbf6052bbb 100644
--- a/src/txmempool.h
+++ b/src/txmempool.h
@@ -111,10 +111,11 @@ class CTxMemPoolEntry
     int64_t nSigOpCostWithAncestors;
 
 public:
-    CTxMemPoolEntry(const CTransaction& _tx, const CAmount& _nFee,
+    CTxMemPoolEntry(const CTransactionRef& _tx, const CAmount& _nFee,
                     int64_t _nTime, double _entryPriority, unsigned int _entryHeight,
                     bool poolHasNoInputsOf, CAmount _inChainInputValue, bool spendsCoinbase,
                     int64_t nSigOpsCost, LockPoints lp);
+
     CTxMemPoolEntry(const CTxMemPoolEntry& other);
 
     const CTransaction& GetTx() const { return *this->tx; }
diff --git a/src/validation.cpp b/src/validation.cpp
index bd60bbfdcdd5b..bc14c1d8c63ad 100644
--- a/src/validation.cpp
+++ b/src/validation.cpp
@@ -525,10 +525,11 @@ std::string FormatStateMessage(const CValidationState &state)
         state.GetRejectCode());
 }
 
-bool AcceptToMemoryPoolWorker(CTxMemPool& pool, CValidationState& state, const CTransaction& tx, bool fLimitFree,
+bool AcceptToMemoryPoolWorker(CTxMemPool& pool, CValidationState& state, const CTransactionRef& ptx, bool fLimitFree,
                               bool* pfMissingInputs, int64_t nAcceptTime, bool fOverrideMempoolLimit, const CAmount& nAbsurdFee,
                               std::vector<uint256>& vHashTxnToUncache)
 {
+    const CTransaction& tx = *ptx;
     const uint256 hash = tx.GetHash();
     AssertLockHeld(cs_main);
     if (pfMissingInputs)
@@ -691,7 +692,7 @@ bool AcceptToMemoryPoolWorker(CTxMemPool& pool, CValidationState& state, const C
             }
         }
 
-        CTxMemPoolEntry entry(tx, nFees, nAcceptTime, dPriority, chainActive.Height(), pool.HasNoInputsOf(tx), inChainInputValue, fSpendsCoinbase, nSigOpsCost, lp);
+        CTxMemPoolEntry entry(ptx, nFees, nAcceptTime, dPriority, chainActive.Height(), pool.HasNoInputsOf(tx), inChainInputValue, fSpendsCoinbase, nSigOpsCost, lp);
         unsigned int nSize = entry.GetTxSize();
 
         // Check that the transaction doesn't have an excessive number of
@@ -955,7 +956,7 @@ bool AcceptToMemoryPoolWorker(CTxMemPool& pool, CValidationState& state, const C
     return true;
 }
 
-bool AcceptToMemoryPoolWithTime(CTxMemPool& pool, CValidationState &state, const CTransaction &tx, bool fLimitFree,
+bool AcceptToMemoryPoolWithTime(CTxMemPool& pool, CValidationState &state, const CTransactionRef &tx, bool fLimitFree,
                         bool* pfMissingInputs, int64_t nAcceptTime, bool fOverrideMempoolLimit, const CAmount nAbsurdFee)
 {
     std::vector<uint256> vHashTxToUncache;
@@ -970,7 +971,7 @@ bool AcceptToMemoryPoolWithTime(CTxMemPool& pool, CValidationState &state, const
     return res;
 }
 
-bool AcceptToMemoryPool(CTxMemPool& pool, CValidationState &state, const CTransaction &tx, bool fLimitFree,
+bool AcceptToMemoryPool(CTxMemPool& pool, CValidationState &state, const CTransactionRef &tx, bool fLimitFree,
                         bool* pfMissingInputs, bool fOverrideMempoolLimit, const CAmount nAbsurdFee)
 {
     return AcceptToMemoryPoolWithTime(pool, state, tx, fLimitFree, pfMissingInputs, GetTime(), fOverrideMempoolLimit, nAbsurdFee);
@@ -2116,7 +2117,7 @@ bool static DisconnectTip(CValidationState& state, const CChainParams& chainpara
             const CTransaction& tx = *it;
             // ignore validation errors in resurrected transactions
             CValidationState stateDummy;
-            if (tx.IsCoinBase() || !AcceptToMemoryPool(mempool, stateDummy, tx, false, NULL, true)) {
+            if (tx.IsCoinBase() || !AcceptToMemoryPool(mempool, stateDummy, it, false, NULL, true)) {
                 mempool.removeRecursive(tx);
             } else if (mempool.exists(tx.GetHash())) {
                 vHashUpdate.push_back(tx.GetHash());
@@ -4054,15 +4055,16 @@ bool LoadMempool(void)
         file >> num;
         double prioritydummy = 0;
         while (num--) {
+            CTransactionRef tx;
             int64_t nTime;
             int64_t nFeeDelta;
-            CTransaction tx(deserialize, file);
+            file >> tx;
             file >> nTime;
             file >> nFeeDelta;
 
             CAmount amountdelta = nFeeDelta;
             if (amountdelta) {
-                mempool.PrioritiseTransaction(tx.GetHash(), tx.GetHash().ToString(), prioritydummy, amountdelta);
+                mempool.PrioritiseTransaction(tx->GetHash(), tx->GetHash().ToString(), prioritydummy, amountdelta);
             }
             CValidationState state;
             if (nTime + nExpiryTimeout > nNow) {
diff --git a/src/validation.h b/src/validation.h
index f0f54786c7084..ce3774f10ff1b 100644
--- a/src/validation.h
+++ b/src/validation.h
@@ -309,11 +309,11 @@ void FlushStateToDisk();
 void PruneAndFlush();
 
 /** (try to) add transaction to memory pool **/
-bool AcceptToMemoryPool(CTxMemPool& pool, CValidationState &state, const CTransaction &tx, bool fLimitFree,
+bool AcceptToMemoryPool(CTxMemPool& pool, CValidationState &state, const CTransactionRef &tx, bool fLimitFree,
                         bool* pfMissingInputs, bool fOverrideMempoolLimit=false, const CAmount nAbsurdFee=0);
 
 /** (try to) add transaction to memory pool with a specified acceptance time **/
-bool AcceptToMemoryPoolWithTime(CTxMemPool& pool, CValidationState &state, const CTransaction &tx, bool fLimitFree,
+bool AcceptToMemoryPoolWithTime(CTxMemPool& pool, CValidationState &state, const CTransactionRef &tx, bool fLimitFree,
                         bool* pfMissingInputs, int64_t nAcceptTime, bool fOverrideMempoolLimit=false, const CAmount nAbsurdFee=0);
 
 /** Convert CValidationState to a human-readable message for logging */
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index 1261aad3f250c..e918b6e1565cd 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -2563,7 +2563,7 @@ bool CWallet::CreateTransaction(const vector<CRecipient>& vecSend, CWalletTx& wt
     if (GetBoolArg("-walletrejectlongchains", DEFAULT_WALLET_REJECT_LONG_CHAINS)) {
         // Lastly, ensure this tx will pass the mempool's chain limits
         LockPoints lp;
-        CTxMemPoolEntry entry(txNew, 0, 0, 0, 0, false, 0, false, 0, lp);
+        CTxMemPoolEntry entry(wtxNew.tx, 0, 0, 0, 0, false, 0, false, 0, lp);
         CTxMemPool::setEntries setAncestors;
         size_t nLimitAncestors = GetArg("-limitancestorcount", DEFAULT_ANCESTOR_LIMIT);
         size_t nLimitAncestorSize = GetArg("-limitancestorsize", DEFAULT_ANCESTOR_SIZE_LIMIT)*1000;
@@ -3782,5 +3782,5 @@ int CMerkleTx::GetBlocksToMaturity() const
 
 bool CMerkleTx::AcceptToMemoryPool(const CAmount& nAbsurdFee, CValidationState& state)
 {
-    return ::AcceptToMemoryPool(mempool, state, *this, true, NULL, false, nAbsurdFee);
+    return ::AcceptToMemoryPool(mempool, state, tx, true, NULL, false, nAbsurdFee);
 }

From 62607d796cd93bfc5ce4ee5050c93cf0ca80ba91 Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Mon, 5 Dec 2016 00:15:33 -0800
Subject: [PATCH 1400/1802] Convert COrphanTx to keep a CTransactionRef

---
 src/net_processing.cpp | 25 +++++++++++++------------
 src/test/DoS_tests.cpp | 24 ++++++++++++------------
 2 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/src/net_processing.cpp b/src/net_processing.cpp
index 4c693eea04bea..10aaa77fff189 100644
--- a/src/net_processing.cpp
+++ b/src/net_processing.cpp
@@ -51,7 +51,7 @@ struct IteratorComparator
 
 struct COrphanTx {
     // When modifying, adapt the copy of this definition in tests/DoS_tests.
-    CTransaction tx;
+    CTransactionRef tx;
     NodeId fromPeer;
     int64_t nTimeExpire;
 };
@@ -586,9 +586,9 @@ void UnregisterNodeSignals(CNodeSignals& nodeSignals)
 // mapOrphanTransactions
 //
 
-bool AddOrphanTx(const CTransaction& tx, NodeId peer) EXCLUSIVE_LOCKS_REQUIRED(cs_main)
+bool AddOrphanTx(const CTransactionRef& tx, NodeId peer) EXCLUSIVE_LOCKS_REQUIRED(cs_main)
 {
-    uint256 hash = tx.GetHash();
+    const uint256& hash = tx->GetHash();
     if (mapOrphanTransactions.count(hash))
         return false;
 
@@ -599,7 +599,7 @@ bool AddOrphanTx(const CTransaction& tx, NodeId peer) EXCLUSIVE_LOCKS_REQUIRED(c
     // have been mined or received.
     // 100 orphans, each of which is at most 99,999 bytes big is
     // at most 10 megabytes of orphans and somewhat more byprev index (in the worst case):
-    unsigned int sz = GetTransactionWeight(tx);
+    unsigned int sz = GetTransactionWeight(*tx);
     if (sz >= MAX_STANDARD_TX_WEIGHT)
     {
         LogPrint("mempool", "ignoring large orphan tx (size: %u, hash: %s)\n", sz, hash.ToString());
@@ -608,7 +608,7 @@ bool AddOrphanTx(const CTransaction& tx, NodeId peer) EXCLUSIVE_LOCKS_REQUIRED(c
 
     auto ret = mapOrphanTransactions.emplace(hash, COrphanTx{tx, peer, GetTime() + ORPHAN_TX_EXPIRE_TIME});
     assert(ret.second);
-    BOOST_FOREACH(const CTxIn& txin, tx.vin) {
+    BOOST_FOREACH(const CTxIn& txin, tx->vin) {
         mapOrphanTransactionsByPrev[txin.prevout].insert(ret.first);
     }
 
@@ -622,7 +622,7 @@ int static EraseOrphanTx(uint256 hash) EXCLUSIVE_LOCKS_REQUIRED(cs_main)
     map<uint256, COrphanTx>::iterator it = mapOrphanTransactions.find(hash);
     if (it == mapOrphanTransactions.end())
         return 0;
-    BOOST_FOREACH(const CTxIn& txin, it->second.tx.vin)
+    BOOST_FOREACH(const CTxIn& txin, it->second.tx->vin)
     {
         auto itPrev = mapOrphanTransactionsByPrev.find(txin.prevout);
         if (itPrev == mapOrphanTransactionsByPrev.end())
@@ -644,7 +644,7 @@ void EraseOrphansFor(NodeId peer)
         map<uint256, COrphanTx>::iterator maybeErase = iter++; // increment to avoid iterator becoming invalid
         if (maybeErase->second.fromPeer == peer)
         {
-            nErased += EraseOrphanTx(maybeErase->second.tx.GetHash());
+            nErased += EraseOrphanTx(maybeErase->second.tx->GetHash());
         }
     }
     if (nErased > 0) LogPrint("mempool", "Erased %d orphan tx from peer %d\n", nErased, peer);
@@ -665,7 +665,7 @@ unsigned int LimitOrphanTxSize(unsigned int nMaxOrphans) EXCLUSIVE_LOCKS_REQUIRE
         {
             map<uint256, COrphanTx>::iterator maybeErase = iter++;
             if (maybeErase->second.nTimeExpire <= nNow) {
-                nErased += EraseOrphanTx(maybeErase->second.tx.GetHash());
+                nErased += EraseOrphanTx(maybeErase->second.tx->GetHash());
             } else {
                 nMinExpTime = std::min(maybeErase->second.nTimeExpire, nMinExpTime);
             }
@@ -736,7 +736,7 @@ void PeerLogicValidation::SyncTransaction(const CTransaction& tx, const CBlockIn
         auto itByPrev = mapOrphanTransactionsByPrev.find(tx.vin[j].prevout);
         if (itByPrev == mapOrphanTransactionsByPrev.end()) continue;
         for (auto mi = itByPrev->second.begin(); mi != itByPrev->second.end(); ++mi) {
-            const CTransaction& orphanTx = (*mi)->second.tx;
+            const CTransaction& orphanTx = *(*mi)->second.tx;
             const uint256& orphanHash = orphanTx.GetHash();
             vOrphanErase.push_back(orphanHash);
         }
@@ -1636,7 +1636,8 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
                      mi != itByPrev->second.end();
                      ++mi)
                 {
-                    const CTransaction& orphanTx = (*mi)->second.tx;
+                    const CTransactionRef& porphanTx = (*mi)->second.tx;
+                    const CTransaction& orphanTx = *porphanTx;
                     const uint256& orphanHash = orphanTx.GetHash();
                     NodeId fromPeer = (*mi)->second.fromPeer;
                     bool fMissingInputs2 = false;
@@ -1648,7 +1649,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
 
                     if (setMisbehaving.count(fromPeer))
                         continue;
-                    if (AcceptToMemoryPool(mempool, stateDummy, MakeTransactionRef(orphanTx), true, &fMissingInputs2)) {
+                    if (AcceptToMemoryPool(mempool, stateDummy, porphanTx, true, &fMissingInputs2)) {
                         LogPrint("mempool", "   accepted orphan tx %s\n", orphanHash.ToString());
                         RelayTransaction(orphanTx, connman);
                         for (unsigned int i = 0; i < orphanTx.vout.size(); i++) {
@@ -1701,7 +1702,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
                     pfrom->AddInventoryKnown(_inv);
                     if (!AlreadyHave(_inv)) pfrom->AskFor(_inv);
                 }
-                AddOrphanTx(tx, pfrom->GetId());
+                AddOrphanTx(ptx, pfrom->GetId());
 
                 // DoS prevention: do not allow mapOrphanTransactions to grow unbounded
                 unsigned int nMaxOrphanTx = (unsigned int)std::max((int64_t)0, GetArg("-maxorphantx", DEFAULT_MAX_ORPHAN_TRANSACTIONS));
diff --git a/src/test/DoS_tests.cpp b/src/test/DoS_tests.cpp
index 131d667e0b346..493a568b494f1 100644
--- a/src/test/DoS_tests.cpp
+++ b/src/test/DoS_tests.cpp
@@ -23,11 +23,11 @@
 #include <boost/test/unit_test.hpp>
 
 // Tests this internal-to-main.cpp method:
-extern bool AddOrphanTx(const CTransaction& tx, NodeId peer);
+extern bool AddOrphanTx(const CTransactionRef& tx, NodeId peer);
 extern void EraseOrphansFor(NodeId peer);
 extern unsigned int LimitOrphanTxSize(unsigned int nMaxOrphans);
 struct COrphanTx {
-    CTransaction tx;
+    CTransactionRef tx;
     NodeId fromPeer;
     int64_t nTimeExpire;
 };
@@ -115,7 +115,7 @@ BOOST_AUTO_TEST_CASE(DoS_bantime)
     BOOST_CHECK(!connman->IsBanned(addr));
 }
 
-CTransaction RandomOrphan()
+CTransactionRef RandomOrphan()
 {
     std::map<uint256, COrphanTx>::iterator it;
     it = mapOrphanTransactions.lower_bound(GetRandHash());
@@ -143,30 +143,30 @@ BOOST_AUTO_TEST_CASE(DoS_mapOrphans)
         tx.vout[0].nValue = 1*CENT;
         tx.vout[0].scriptPubKey = GetScriptForDestination(key.GetPubKey().GetID());
 
-        AddOrphanTx(tx, i);
+        AddOrphanTx(MakeTransactionRef(tx), i);
     }
 
     // ... and 50 that depend on other orphans:
     for (int i = 0; i < 50; i++)
     {
-        CTransaction txPrev = RandomOrphan();
+        CTransactionRef txPrev = RandomOrphan();
 
         CMutableTransaction tx;
         tx.vin.resize(1);
         tx.vin[0].prevout.n = 0;
-        tx.vin[0].prevout.hash = txPrev.GetHash();
+        tx.vin[0].prevout.hash = txPrev->GetHash();
         tx.vout.resize(1);
         tx.vout[0].nValue = 1*CENT;
         tx.vout[0].scriptPubKey = GetScriptForDestination(key.GetPubKey().GetID());
-        SignSignature(keystore, txPrev, tx, 0, SIGHASH_ALL);
+        SignSignature(keystore, *txPrev, tx, 0, SIGHASH_ALL);
 
-        AddOrphanTx(tx, i);
+        AddOrphanTx(MakeTransactionRef(tx), i);
     }
 
     // This really-big orphan should be ignored:
     for (int i = 0; i < 10; i++)
     {
-        CTransaction txPrev = RandomOrphan();
+        CTransactionRef txPrev = RandomOrphan();
 
         CMutableTransaction tx;
         tx.vout.resize(1);
@@ -176,15 +176,15 @@ BOOST_AUTO_TEST_CASE(DoS_mapOrphans)
         for (unsigned int j = 0; j < tx.vin.size(); j++)
         {
             tx.vin[j].prevout.n = j;
-            tx.vin[j].prevout.hash = txPrev.GetHash();
+            tx.vin[j].prevout.hash = txPrev->GetHash();
         }
-        SignSignature(keystore, txPrev, tx, 0, SIGHASH_ALL);
+        SignSignature(keystore, *txPrev, tx, 0, SIGHASH_ALL);
         // Re-use same signature for other inputs
         // (they don't have to be valid for this test)
         for (unsigned int j = 1; j < tx.vin.size(); j++)
             tx.vin[j].scriptSig = tx.vin[0].scriptSig;
 
-        BOOST_CHECK(!AddOrphanTx(tx, i));
+        BOOST_CHECK(!AddOrphanTx(MakeTransactionRef(tx), i));
     }
 
     // Test EraseOrphansFor:

From 6713f0f142d97b4608c95a3ea03b4b670fceab2b Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Fri, 11 Nov 2016 13:01:27 -0800
Subject: [PATCH 1401/1802] Make FillBlock consume txn_available to avoid
 shared_ptr copies

---
 src/blockencodings.cpp            | 14 +++++++---
 src/blockencodings.h              |  2 +-
 src/test/blockencodings_tests.cpp | 45 ++++++++++++++++++++-----------
 3 files changed, 40 insertions(+), 21 deletions(-)

diff --git a/src/blockencodings.cpp b/src/blockencodings.cpp
index 914af0c670f3e..72fe17bdc7ef8 100644
--- a/src/blockencodings.cpp
+++ b/src/blockencodings.cpp
@@ -142,8 +142,9 @@ bool PartiallyDownloadedBlock::IsTxAvailable(size_t index) const {
     return txn_available[index] ? true : false;
 }
 
-ReadStatus PartiallyDownloadedBlock::FillBlock(CBlock& block, const std::vector<CTransactionRef>& vtx_missing) const {
+ReadStatus PartiallyDownloadedBlock::FillBlock(CBlock& block, const std::vector<CTransactionRef>& vtx_missing) {
     assert(!header.IsNull());
+    uint256 hash = header.GetHash();
     block = header;
     block.vtx.resize(txn_available.size());
 
@@ -154,8 +155,13 @@ ReadStatus PartiallyDownloadedBlock::FillBlock(CBlock& block, const std::vector<
                 return READ_STATUS_INVALID;
             block.vtx[i] = vtx_missing[tx_missing_offset++];
         } else
-            block.vtx[i] = txn_available[i];
+            block.vtx[i] = std::move(txn_available[i]);
     }
+
+    // Make sure we can't call FillBlock again.
+    header.SetNull();
+    txn_available.clear();
+
     if (vtx_missing.size() != tx_missing_offset)
         return READ_STATUS_INVALID;
 
@@ -170,10 +176,10 @@ ReadStatus PartiallyDownloadedBlock::FillBlock(CBlock& block, const std::vector<
         return READ_STATUS_CHECKBLOCK_FAILED;
     }
 
-    LogPrint("cmpctblock", "Successfully reconstructed block %s with %lu txn prefilled, %lu txn from mempool and %lu txn requested\n", header.GetHash().ToString(), prefilled_count, mempool_count, vtx_missing.size());
+    LogPrint("cmpctblock", "Successfully reconstructed block %s with %lu txn prefilled, %lu txn from mempool and %lu txn requested\n", hash.ToString(), prefilled_count, mempool_count, vtx_missing.size());
     if (vtx_missing.size() < 5) {
         for (const auto& tx : vtx_missing)
-            LogPrint("cmpctblock", "Reconstructed block %s required tx %s\n", header.GetHash().ToString(), tx->GetHash().ToString());
+            LogPrint("cmpctblock", "Reconstructed block %s required tx %s\n", hash.ToString(), tx->GetHash().ToString());
     }
 
     return READ_STATUS_OK;
diff --git a/src/blockencodings.h b/src/blockencodings.h
index 27baf1f8f8263..809ccbf9363fa 100644
--- a/src/blockencodings.h
+++ b/src/blockencodings.h
@@ -202,7 +202,7 @@ class PartiallyDownloadedBlock {
 
     ReadStatus InitData(const CBlockHeaderAndShortTxIDs& cmpctblock);
     bool IsTxAvailable(size_t index) const;
-    ReadStatus FillBlock(CBlock& block, const std::vector<CTransactionRef>& vtx_missing) const;
+    ReadStatus FillBlock(CBlock& block, const std::vector<CTransactionRef>& vtx_missing);
 };
 
 #endif
diff --git a/src/test/blockencodings_tests.cpp b/src/test/blockencodings_tests.cpp
index 7478758f73f0b..90f273e731cb3 100644
--- a/src/test/blockencodings_tests.cpp
+++ b/src/test/blockencodings_tests.cpp
@@ -85,17 +85,23 @@ BOOST_AUTO_TEST_CASE(SimpleRoundTripTest)
         BOOST_CHECK_EQUAL(pool.size(), poolSize - 1);
 
         CBlock block2;
-        std::vector<CTransactionRef> vtx_missing;
-        BOOST_CHECK(partialBlock.FillBlock(block2, vtx_missing) == READ_STATUS_INVALID); // No transactions
+        {
+            PartiallyDownloadedBlock tmp = partialBlock;
+            BOOST_CHECK(partialBlock.FillBlock(block2, {}) == READ_STATUS_INVALID); // No transactions
+            partialBlock = tmp;
+        }
 
-        vtx_missing.push_back(block.vtx[2]); // Wrong transaction
-        partialBlock.FillBlock(block2, vtx_missing); // Current implementation doesn't check txn here, but don't require that
+        // Wrong transaction
+        {
+            PartiallyDownloadedBlock tmp = partialBlock;
+            partialBlock.FillBlock(block2, {block.vtx[2]}); // Current implementation doesn't check txn here, but don't require that
+            partialBlock = tmp;
+        }
         bool mutated;
         BOOST_CHECK(block.hashMerkleRoot != BlockMerkleRoot(block2, &mutated));
 
-        vtx_missing[0] = block.vtx[1];
         CBlock block3;
-        BOOST_CHECK(partialBlock.FillBlock(block3, vtx_missing) == READ_STATUS_OK);
+        BOOST_CHECK(partialBlock.FillBlock(block3, {block.vtx[1]}) == READ_STATUS_OK);
         BOOST_CHECK_EQUAL(block.GetHash().ToString(), block3.GetHash().ToString());
         BOOST_CHECK_EQUAL(block.hashMerkleRoot.ToString(), BlockMerkleRoot(block3, &mutated).ToString());
         BOOST_CHECK(!mutated);
@@ -181,17 +187,24 @@ BOOST_AUTO_TEST_CASE(NonCoinbasePreforwardRTTest)
         BOOST_CHECK_EQUAL(pool.mapTx.find(block.vtx[2]->GetHash())->GetSharedTx().use_count(), SHARED_TX_OFFSET + 1);
 
         CBlock block2;
-        std::vector<CTransactionRef> vtx_missing;
-        BOOST_CHECK(partialBlock.FillBlock(block2, vtx_missing) == READ_STATUS_INVALID); // No transactions
+        {
+            PartiallyDownloadedBlock tmp = partialBlock;
+            BOOST_CHECK(partialBlock.FillBlock(block2, {}) == READ_STATUS_INVALID); // No transactions
+            partialBlock = tmp;
+        }
 
-        vtx_missing.push_back(block.vtx[1]); // Wrong transaction
-        partialBlock.FillBlock(block2, vtx_missing); // Current implementation doesn't check txn here, but don't require that
+        // Wrong transaction
+        {
+            PartiallyDownloadedBlock tmp = partialBlock;
+            partialBlock.FillBlock(block2, {block.vtx[1]}); // Current implementation doesn't check txn here, but don't require that
+            partialBlock = tmp;
+        }
         bool mutated;
         BOOST_CHECK(block.hashMerkleRoot != BlockMerkleRoot(block2, &mutated));
 
-        vtx_missing[0] = block.vtx[0];
         CBlock block3;
-        BOOST_CHECK(partialBlock.FillBlock(block3, vtx_missing) == READ_STATUS_OK);
+        PartiallyDownloadedBlock partialBlockCopy = partialBlock;
+        BOOST_CHECK(partialBlock.FillBlock(block3, {block.vtx[0]}) == READ_STATUS_OK);
         BOOST_CHECK_EQUAL(block.GetHash().ToString(), block3.GetHash().ToString());
         BOOST_CHECK_EQUAL(block.hashMerkleRoot.ToString(), BlockMerkleRoot(block3, &mutated).ToString());
         BOOST_CHECK(!mutated);
@@ -200,7 +213,7 @@ BOOST_AUTO_TEST_CASE(NonCoinbasePreforwardRTTest)
         block.vtx.clear();
         block2.vtx.clear();
         block3.vtx.clear();
-        BOOST_CHECK_EQUAL(pool.mapTx.find(txhash)->GetSharedTx().use_count(), SHARED_TX_OFFSET + 1);
+        BOOST_CHECK_EQUAL(pool.mapTx.find(txhash)->GetSharedTx().use_count(), SHARED_TX_OFFSET + 1); // + 1 because of partialBlockCopy.
     }
     BOOST_CHECK_EQUAL(pool.mapTx.find(txhash)->GetSharedTx().use_count(), SHARED_TX_OFFSET + 0);
 }
@@ -240,8 +253,8 @@ BOOST_AUTO_TEST_CASE(SufficientPreforwardRTTest)
         BOOST_CHECK_EQUAL(pool.mapTx.find(block.vtx[1]->GetHash())->GetSharedTx().use_count(), SHARED_TX_OFFSET + 1);
 
         CBlock block2;
-        std::vector<CTransactionRef> vtx_missing;
-        BOOST_CHECK(partialBlock.FillBlock(block2, vtx_missing) == READ_STATUS_OK);
+        PartiallyDownloadedBlock partialBlockCopy = partialBlock;
+        BOOST_CHECK(partialBlock.FillBlock(block2, {}) == READ_STATUS_OK);
         BOOST_CHECK_EQUAL(block.GetHash().ToString(), block2.GetHash().ToString());
         bool mutated;
         BOOST_CHECK_EQUAL(block.hashMerkleRoot.ToString(), BlockMerkleRoot(block2, &mutated).ToString());
@@ -250,7 +263,7 @@ BOOST_AUTO_TEST_CASE(SufficientPreforwardRTTest)
         txhash = block.vtx[1]->GetHash();
         block.vtx.clear();
         block2.vtx.clear();
-        BOOST_CHECK_EQUAL(pool.mapTx.find(txhash)->GetSharedTx().use_count(), SHARED_TX_OFFSET + 1);
+        BOOST_CHECK_EQUAL(pool.mapTx.find(txhash)->GetSharedTx().use_count(), SHARED_TX_OFFSET + 1); // + 1 because of partialBlockCopy.
     }
     BOOST_CHECK_EQUAL(pool.mapTx.find(txhash)->GetSharedTx().use_count(), SHARED_TX_OFFSET + 0);
 }

From 91335ba389918966c94eeb7071b6c5a998bf1be8 Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Mon, 5 Dec 2016 20:38:20 -0800
Subject: [PATCH 1402/1802] Remove unused MakeTransactionRef overloads

---
 src/primitives/transaction.h | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/primitives/transaction.h b/src/primitives/transaction.h
index 4c4a238dd5130..8e5b42440830b 100644
--- a/src/primitives/transaction.h
+++ b/src/primitives/transaction.h
@@ -453,8 +453,6 @@ struct CMutableTransaction
 typedef std::shared_ptr<const CTransaction> CTransactionRef;
 static inline CTransactionRef MakeTransactionRef() { return std::make_shared<const CTransaction>(); }
 template <typename Tx> static inline CTransactionRef MakeTransactionRef(Tx&& txIn) { return std::make_shared<const CTransaction>(std::forward<Tx>(txIn)); }
-static inline CTransactionRef MakeTransactionRef(const CTransactionRef& txIn) { return txIn; }
-static inline CTransactionRef MakeTransactionRef(CTransactionRef&& txIn) { return std::move(txIn); }
 
 /** Compute the weight of a transaction, as defined by BIP 141 */
 int64_t GetTransactionWeight(const CTransaction &tx);

From 2ddfcfd2d67bc2bd8aa4682ceaba6a59614e54d1 Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Tue, 13 Dec 2016 19:36:46 -0800
Subject: [PATCH 1403/1802] Make CScript (and prevector) c++11 movable.

Such moves are used when reallocating vectors that contain them,
for example.
---
 src/prevector.h              |  9 +++++++++
 src/script/script.h          |  1 -
 src/test/prevector_tests.cpp | 21 ++++++++++++++++++++-
 3 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/src/prevector.h b/src/prevector.h
index 25bce522dc9b1..46af80d1e60da 100644
--- a/src/prevector.h
+++ b/src/prevector.h
@@ -248,6 +248,10 @@ class prevector {
         }
     }
 
+    prevector(prevector<N, T, Size, Diff>&& other) : _size(0) {
+        swap(other);
+    }
+
     prevector& operator=(const prevector<N, T, Size, Diff>& other) {
         if (&other == this) {
             return *this;
@@ -263,6 +267,11 @@ class prevector {
         return *this;
     }
 
+    prevector& operator=(prevector<N, T, Size, Diff>&& other) {
+        swap(other);
+        return *this;
+    }
+
     size_type size() const {
         return is_direct() ? _size : _size - N - 1;
     }
diff --git a/src/script/script.h b/src/script/script.h
index 76419c1495f7d..a2b9d1b7923cb 100644
--- a/src/script/script.h
+++ b/src/script/script.h
@@ -394,7 +394,6 @@ class CScript : public CScriptBase
     }
 public:
     CScript() { }
-    CScript(const CScript& b) : CScriptBase(b.begin(), b.end()) { }
     CScript(const_iterator pbegin, const_iterator pend) : CScriptBase(pbegin, pend) { }
     CScript(std::vector<unsigned char>::const_iterator pbegin, std::vector<unsigned char>::const_iterator pend) : CScriptBase(pbegin, pend) { }
     CScript(const unsigned char* pbegin, const unsigned char* pend) : CScriptBase(pbegin, pend) { }
diff --git a/src/test/prevector_tests.cpp b/src/test/prevector_tests.cpp
index 1e5de2021c9de..1352ea722a50b 100644
--- a/src/test/prevector_tests.cpp
+++ b/src/test/prevector_tests.cpp
@@ -169,6 +169,19 @@ class prevector_tester {
         pre_vector.swap(pre_vector_alt);
         test();
     }
+
+    void move() {
+        real_vector = std::move(real_vector_alt);
+        real_vector_alt.clear();
+        pre_vector = std::move(pre_vector_alt);
+        pre_vector_alt.clear();
+    }
+
+    void copy() {
+        real_vector = real_vector_alt;
+        pre_vector = pre_vector_alt;
+    }
+
     ~prevector_tester() {
         BOOST_CHECK_MESSAGE(passed, "insecure_rand_Rz: "
                 << rand_cache.Rz
@@ -240,9 +253,15 @@ BOOST_AUTO_TEST_CASE(PrevectorTestInt)
             if (((r >> 21) % 512) == 12) {
                 test.assign(insecure_rand() % 32, insecure_rand());
             }
-            if (((r >> 15) % 64) == 3) {
+            if (((r >> 15) % 8) == 3) {
                 test.swap();
             }
+            if (((r >> 15) % 16) == 8) {
+                test.copy();
+            }
+            if (((r >> 15) % 32) == 18) {
+                test.move();
+            }
         }
     }
 }

From afe5b3f553e1d67b78fee83a18b83c322471ed00 Mon Sep 17 00:00:00 2001
From: Anditto Heristyo <anditto.heristyo@gmail.com>
Date: Thu, 22 Dec 2016 13:26:03 +0900
Subject: [PATCH 1404/1802] Added missing colons in when running help command

---
 src/rpc/blockchain.cpp     | 18 +++++++++---------
 src/rpc/mining.cpp         |  8 ++++----
 src/rpc/rawtransaction.cpp |  2 +-
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp
index 1139c2aa5cbaf..9ebe48530f601 100644
--- a/src/rpc/blockchain.cpp
+++ b/src/rpc/blockchain.cpp
@@ -169,9 +169,9 @@ UniValue getbestblockhash(const JSONRPCRequest& request)
         throw runtime_error(
             "getbestblockhash\n"
             "\nReturns the hash of the best (tip) block in the longest blockchain.\n"
-            "\nResult\n"
+            "\nResult:\n"
             "\"hex\"      (string) the block hash hex encoded\n"
-            "\nExamples\n"
+            "\nExamples:\n"
             + HelpExampleCli("getbestblockhash", "")
             + HelpExampleRpc("getbestblockhash", "")
         );
@@ -204,7 +204,7 @@ UniValue waitfornewblock(const JSONRPCRequest& request)
             "  \"hash\" : {       (string) The blockhash\n"
             "  \"height\" : {     (int) Block height\n"
             "}\n"
-            "\nExamples\n"
+            "\nExamples:\n"
             + HelpExampleCli("waitfornewblock", "1000")
             + HelpExampleRpc("waitfornewblock", "1000")
         );
@@ -243,7 +243,7 @@ UniValue waitforblock(const JSONRPCRequest& request)
             "  \"hash\" : {       (string) The blockhash\n"
             "  \"height\" : {     (int) Block height\n"
             "}\n"
-            "\nExamples\n"
+            "\nExamples:\n"
             + HelpExampleCli("waitforblock", "\"0000000000079f8ef3d2c688c244eb7a4570b24c9ed7b4a8c619eb02596f8862\", 1000")
             + HelpExampleRpc("waitforblock", "\"0000000000079f8ef3d2c688c244eb7a4570b24c9ed7b4a8c619eb02596f8862\", 1000")
         );
@@ -286,7 +286,7 @@ UniValue waitforblockheight(const JSONRPCRequest& request)
             "  \"hash\" : {       (string) The blockhash\n"
             "  \"height\" : {     (int) Block height\n"
             "}\n"
-            "\nExamples\n"
+            "\nExamples:\n"
             + HelpExampleCli("waitforblockheight", "\"100\", 1000")
             + HelpExampleRpc("waitforblockheight", "\"100\", 1000")
         );
@@ -430,7 +430,7 @@ UniValue getrawmempool(const JSONRPCRequest& request)
             + EntryDescriptionString()
             + "  }, ...\n"
             "}\n"
-            "\nExamples\n"
+            "\nExamples:\n"
             + HelpExampleCli("getrawmempool", "true")
             + HelpExampleRpc("getrawmempool", "true")
         );
@@ -462,7 +462,7 @@ UniValue getmempoolancestors(const JSONRPCRequest& request)
             + EntryDescriptionString()
             + "  }, ...\n"
             "}\n"
-            "\nExamples\n"
+            "\nExamples:\n"
             + HelpExampleCli("getmempoolancestors", "\"mytxid\"")
             + HelpExampleRpc("getmempoolancestors", "\"mytxid\"")
             );
@@ -526,7 +526,7 @@ UniValue getmempooldescendants(const JSONRPCRequest& request)
             + EntryDescriptionString()
             + "  }, ...\n"
             "}\n"
-            "\nExamples\n"
+            "\nExamples:\n"
             + HelpExampleCli("getmempooldescendants", "\"mytxid\"")
             + HelpExampleRpc("getmempooldescendants", "\"mytxid\"")
             );
@@ -582,7 +582,7 @@ UniValue getmempoolentry(const JSONRPCRequest& request)
             "{                           (json object)\n"
             + EntryDescriptionString()
             + "}\n"
-            "\nExamples\n"
+            "\nExamples:\n"
             + HelpExampleCli("getmempoolentry", "\"mytxid\"")
             + HelpExampleRpc("getmempoolentry", "\"mytxid\"")
         );
diff --git a/src/rpc/mining.cpp b/src/rpc/mining.cpp
index 73797e2019812..5b44eeeaf93f7 100644
--- a/src/rpc/mining.cpp
+++ b/src/rpc/mining.cpp
@@ -155,7 +155,7 @@ UniValue generate(const JSONRPCRequest& request)
             "\nArguments:\n"
             "1. numblocks    (numeric, required) How many blocks are generated immediately.\n"
             "2. maxtries     (numeric, optional) How many iterations to try (default = 1000000).\n"
-            "\nResult\n"
+            "\nResult:\n"
             "[ blockhashes ]     (array) hashes of blocks generated\n"
             "\nExamples:\n"
             "\nGenerate 11 blocks\n"
@@ -192,7 +192,7 @@ UniValue generatetoaddress(const JSONRPCRequest& request)
             "1. numblocks    (numeric, required) How many blocks are generated immediately.\n"
             "2. address    (string, required) The address to send the newly generated bitcoin to.\n"
             "3. maxtries     (numeric, optional) How many iterations to try (default = 1000000).\n"
-            "\nResult\n"
+            "\nResult:\n"
             "[ blockhashes ]     (array) hashes of blocks generated\n"
             "\nExamples:\n"
             "\nGenerate 11 blocks to myaddress\n"
@@ -270,7 +270,7 @@ UniValue prioritisetransaction(const JSONRPCRequest& request)
             "3. fee delta      (numeric, required) The fee value (in satoshis) to add (or subtract, if negative).\n"
             "                  The fee is not actually paid, only the algorithm for selecting transactions into a block\n"
             "                  considers the transaction as it would have paid a higher (or lower) fee.\n"
-            "\nResult\n"
+            "\nResult:\n"
             "true              (boolean) Returns true\n"
             "\nExamples:\n"
             + HelpExampleCli("prioritisetransaction", "\"txid\" 0.0 10000")
@@ -717,7 +717,7 @@ UniValue submitblock(const JSONRPCRequest& request)
             "The 'jsonparametersobject' parameter is currently ignored.\n"
             "See https://en.bitcoin.it/wiki/BIP_0022 for full specification.\n"
 
-            "\nArguments\n"
+            "\nArguments:\n"
             "1. \"hexdata\"    (string, required) the hex-encoded block data to submit\n"
             "2. \"jsonparametersobject\"     (string, optional) object of optional parameters\n"
             "    {\n"
diff --git a/src/rpc/rawtransaction.cpp b/src/rpc/rawtransaction.cpp
index 21af449466496..8b24e7a1cd3e1 100644
--- a/src/rpc/rawtransaction.cpp
+++ b/src/rpc/rawtransaction.cpp
@@ -377,7 +377,7 @@ UniValue createrawtransaction(const JSONRPCRequest& request)
             "\nResult:\n"
             "\"transaction\"            (string) hex string of the transaction\n"
 
-            "\nExamples\n"
+            "\nExamples:\n"
             + HelpExampleCli("createrawtransaction", "\"[{\\\"txid\\\":\\\"myid\\\",\\\"vout\\\":0}]\" \"{\\\"address\\\":0.01}\"")
             + HelpExampleCli("createrawtransaction", "\"[{\\\"txid\\\":\\\"myid\\\",\\\"vout\\\":0}]\" \"{\\\"data\\\":\\\"00010203\\\"}\"")
             + HelpExampleRpc("createrawtransaction", "\"[{\\\"txid\\\":\\\"myid\\\",\\\"vout\\\":0}]\", \"{\\\"address\\\":0.01}\"")

From 3f67972654748a2f24e4aa95b6f3df5d4574ed55 Mon Sep 17 00:00:00 2001
From: accraze <accraze@gmail.com>
Date: Tue, 20 Dec 2016 17:39:49 -0800
Subject: [PATCH 1405/1802] updated listsinceblock rpc docs

fixes #8758
---
 src/wallet/rpcwallet.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index 5a4fcc743cd24..11d69ac194421 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -1650,6 +1650,7 @@ UniValue listsinceblock(const JSONRPCRequest& request)
             "    \"vout\" : n,               (numeric) the vout value\n"
             "    \"fee\": x.xxx,             (numeric) The amount of the fee in " + CURRENCY_UNIT + ". This is negative and only available for the 'send' category of transactions.\n"
             "    \"confirmations\": n,       (numeric) The number of confirmations for the transaction. Available for 'send' and 'receive' category of transactions.\n"
+            "                                          When it's < 0, it means the transaction conflicted that many blocks ago.\n"
             "    \"blockhash\": \"hashvalue\",     (string) The block hash containing the transaction. Available for 'send' and 'receive' category of transactions.\n"
             "    \"blockindex\": n,          (numeric) The index of the transaction in the block that includes it. Available for 'send' and 'receive' category of transactions.\n"
             "    \"blocktime\": xxx,         (numeric) The block time in seconds since epoch (1 Jan 1970 GMT).\n"

From ba3cecf5c436bf38efad045d46e0aa26210d2234 Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Wed, 21 Dec 2016 19:15:13 -0800
Subject: [PATCH 1406/1802] Share unused mempool memory with coincache

If the mempool is not completely full, treat the difference between
the maximum size and the actual usage as available for the coin cache.

This also changes the early flush trigger from (usage > 0.9 * space)
to (usage > 0.9 * space && usage > space - 100MB). This means we're not
permanently leaving 10% of the space unused when the space is large.
---
 src/init.cpp       |  3 ++-
 src/validation.cpp | 11 +++++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/init.cpp b/src/init.cpp
index e642729a990ef..0eb206ba8b738 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -1330,10 +1330,11 @@ bool AppInitMain(boost::thread_group& threadGroup, CScheduler& scheduler)
     nCoinDBCache = std::min(nCoinDBCache, nMaxCoinsDBCache << 20); // cap total coins db cache
     nTotalCache -= nCoinDBCache;
     nCoinCacheUsage = nTotalCache; // the rest goes to in-memory cache
+    int64_t nMempoolSizeMax = GetArg("-maxmempool", DEFAULT_MAX_MEMPOOL_SIZE) * 1000000;
     LogPrintf("Cache configuration:\n");
     LogPrintf("* Using %.1fMiB for block index database\n", nBlockTreeDBCache * (1.0 / 1024 / 1024));
     LogPrintf("* Using %.1fMiB for chain state database\n", nCoinDBCache * (1.0 / 1024 / 1024));
-    LogPrintf("* Using %.1fMiB for in-memory UTXO set\n", nCoinCacheUsage * (1.0 / 1024 / 1024));
+    LogPrintf("* Using %.1fMiB for in-memory UTXO set (plus up to %.1fMiB of unused mempool space)\n", nCoinCacheUsage * (1.0 / 1024 / 1024), nMempoolSizeMax * (1.0 / 1024 / 1024));
 
     bool fLoaded = false;
     while (!fLoaded) {
diff --git a/src/validation.cpp b/src/validation.cpp
index bd60bbfdcdd5b..0a935b6911acb 100644
--- a/src/validation.cpp
+++ b/src/validation.cpp
@@ -1916,6 +1916,7 @@ bool ConnectBlock(const CBlock& block, CValidationState& state, CBlockIndex* pin
  * or always and in all cases if we're in prune mode and are deleting files.
  */
 bool static FlushStateToDisk(CValidationState &state, FlushStateMode mode) {
+    int64_t nMempoolUsage = mempool.DynamicMemoryUsage();
     const CChainParams& chainparams = Params();
     LOCK2(cs_main, cs_LastBlockFile);
     static int64_t nLastWrite = 0;
@@ -1946,11 +1947,13 @@ bool static FlushStateToDisk(CValidationState &state, FlushStateMode mode) {
     if (nLastSetChain == 0) {
         nLastSetChain = nNow;
     }
-    size_t cacheSize = pcoinsTip->DynamicMemoryUsage();
-    // The cache is large and close to the limit, but we have time now (not in the middle of a block processing).
-    bool fCacheLarge = mode == FLUSH_STATE_PERIODIC && cacheSize * (10.0/9) > nCoinCacheUsage;
+    int64_t nMempoolSizeMax = GetArg("-maxmempool", DEFAULT_MAX_MEMPOOL_SIZE) * 1000000;
+    int64_t cacheSize = pcoinsTip->DynamicMemoryUsage();
+    int64_t nTotalSpace = nCoinCacheUsage + std::max<int64_t>(nMempoolSizeMax - nMempoolUsage, 0);
+    // The cache is large and we're within 10% and 100 MiB of the limit, but we have time now (not in the middle of a block processing).
+    bool fCacheLarge = mode == FLUSH_STATE_PERIODIC && cacheSize > std::max((9 * nTotalSpace) / 10, nTotalSpace - 100 * 1024 * 1024);
     // The cache is over the limit, we have to write now.
-    bool fCacheCritical = mode == FLUSH_STATE_IF_NEEDED && cacheSize > nCoinCacheUsage;
+    bool fCacheCritical = mode == FLUSH_STATE_IF_NEEDED && cacheSize > nTotalSpace;
     // It's been a while since we wrote the block index to disk. Do this frequently, so we don't need to redownload after a crash.
     bool fPeriodicWrite = mode == FLUSH_STATE_PERIODIC && nNow > nLastWrite + (int64_t)DATABASE_WRITE_INTERVAL * 1000000;
     // It's been very long since we flushed the cache. Do this infrequently, to optimize cache usage.

From 09aefb51776ad5e4652ce5122175f889b167eef5 Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Fri, 3 Jun 2016 16:36:26 -0400
Subject: [PATCH 1407/1802] build: Fix 'make deploy' for OSX

Native OSX uses system tools rather than 3rd party dependencies. rsvg-convert
is still required, though.
---
 Makefile.am                       | 9 ++++++++-
 configure.ac                      | 2 +-
 contrib/macdeploy/macdeployqtplus | 4 ++--
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 76eba519068f4..6a8c1b761bcf1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -111,9 +111,16 @@ osx_volname:
 	echo $(OSX_VOLNAME) >$@
 
 if BUILD_DARWIN
-$(OSX_DMG): $(OSX_APP_BUILT) $(OSX_PACKAGING)
+$(OSX_DMG): $(OSX_APP_BUILT) $(OSX_PACKAGING) $(OSX_BACKGROUND_IMAGE)
 	$(PYTHON) $(OSX_DEPLOY_SCRIPT) $(OSX_APP) -add-qt-tr $(OSX_QT_TRANSLATIONS) -translations-dir=$(QT_TRANSLATION_DIR) -dmg -fancy $(OSX_FANCY_PLIST) -verbose 2 -volname $(OSX_VOLNAME)
 
+$(OSX_BACKGROUND_IMAGE).png: contrib/macdeploy/$(OSX_BACKGROUND_SVG)
+	sed 's/PACKAGE_NAME/$(PACKAGE_NAME)/' < "$<" | $(RSVG_CONVERT) -f png -d 36 -p 36 -o $@
+$(OSX_BACKGROUND_IMAGE)@2x.png: contrib/macdeploy/$(OSX_BACKGROUND_SVG)
+	sed 's/PACKAGE_NAME/$(PACKAGE_NAME)/' < "$<" | $(RSVG_CONVERT) -f png -d 72 -p 72 -o $@
+$(OSX_BACKGROUND_IMAGE): $(OSX_BACKGROUND_IMAGE).png $(OSX_BACKGROUND_IMAGE)@2x.png
+	tiffutil -cathidpicheck $^ -out $@
+
 deploydir: $(OSX_DMG)
 else
 APP_DIST_DIR=$(top_builddir)/dist
diff --git a/configure.ac b/configure.ac
index ced258e02e4cf..e068f228748c8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -319,6 +319,7 @@ case $host in
          fi
        fi
 
+       AC_PATH_PROGS([RSVG_CONVERT], [rsvg-convert rsvg],rsvg-convert)
        AC_CHECK_PROG([BREW],brew, brew)
        if test x$BREW = xbrew; then
          dnl These Homebrew packages may be keg-only, meaning that they won't be found
@@ -352,7 +353,6 @@ case $host in
            AC_PATH_TOOL([INSTALLNAMETOOL], [install_name_tool], install_name_tool)
            AC_PATH_TOOL([OTOOL], [otool], otool)
            AC_PATH_PROGS([GENISOIMAGE], [genisoimage mkisofs],genisoimage)
-           AC_PATH_PROGS([RSVG_CONVERT], [rsvg-convert rsvg],rsvg-convert)
            AC_PATH_PROGS([IMAGEMAGICK_CONVERT], [convert],convert)
            AC_PATH_PROGS([TIFFCP], [tiffcp],tiffcp)
 
diff --git a/contrib/macdeploy/macdeployqtplus b/contrib/macdeploy/macdeployqtplus
index f8201e72c649d..6d43af421981f 100755
--- a/contrib/macdeploy/macdeployqtplus
+++ b/contrib/macdeploy/macdeployqtplus
@@ -791,7 +791,7 @@ if config.dmg is not None:
         except subprocess.CalledProcessError as e:
             sys.exit(e.returncode)
         
-        m = re.search("/Volumes/(.+$)", output)
+        m = re.search("/Volumes/(.+$)", output.decode())
         disk_root = m.group(0)
         disk_name = m.group(1)
         
@@ -868,7 +868,7 @@ if config.dmg is not None:
             print(s)
 
         p = subprocess.Popen(['osascript', '-'], stdin=subprocess.PIPE)
-        p.communicate(input=s)
+        p.communicate(input=s.encode('utf-8'))
         if p.returncode:
             print("Error running osascript.")
 

From b01667c77802f7eeda8b8c82d0c8358b601a9e16 Mon Sep 17 00:00:00 2001
From: Jonas Schnelli <dev@jonasschnelli.ch>
Date: Fri, 23 Dec 2016 09:52:08 +0100
Subject: [PATCH 1408/1802] Mention RSVG dependency when creating the disk
 image on OSX

---
 configure.ac     | 1 +
 doc/build-osx.md | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/configure.ac b/configure.ac
index e068f228748c8..74808cd337f5d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -353,6 +353,7 @@ case $host in
            AC_PATH_TOOL([INSTALLNAMETOOL], [install_name_tool], install_name_tool)
            AC_PATH_TOOL([OTOOL], [otool], otool)
            AC_PATH_PROGS([GENISOIMAGE], [genisoimage mkisofs],genisoimage)
+           AC_PATH_PROGS([RSVG_CONVERT], [rsvg-convert rsvg],rsvg-convert)
            AC_PATH_PROGS([IMAGEMAGICK_CONVERT], [convert],convert)
            AC_PATH_PROGS([TIFFCP], [tiffcp],tiffcp)
 
diff --git a/doc/build-osx.md b/doc/build-osx.md
index 63a7ee28ca931..5cdb3dab6fbb1 100644
--- a/doc/build-osx.md
+++ b/doc/build-osx.md
@@ -18,6 +18,10 @@ Dependencies
 
     brew install automake berkeley-db4 libtool boost --c++11 miniupnpc openssl pkg-config homebrew/versions/protobuf260 --c++11 qt5 libevent
 
+In case you want to build the disk image with `make deploy` (.dmg / optional), you need RSVG
+
+    brew install librsvg
+
 NOTE: Building with Qt4 is still supported, however, could result in a broken UI. Building with Qt5 is recommended.
 
 Build Bitcoin Core

From 9479f8dfcf0533366ba81d191b507a0326df66db Mon Sep 17 00:00:00 2001
From: Jonas Schnelli <dev@jonasschnelli.ch>
Date: Thu, 22 Dec 2016 20:11:26 +0100
Subject: [PATCH 1409/1802] Allow shutdown during LoadMempool, dump only when
 necessary

---
 src/init.cpp       | 5 ++++-
 src/validation.cpp | 2 ++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/init.cpp b/src/init.cpp
index e642729a990ef..e239e0d305107 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -130,6 +130,7 @@ static const char* FEE_ESTIMATES_FILENAME="fee_estimates.dat";
 //
 
 std::atomic<bool> fRequestShutdown(false);
+std::atomic<bool> fDumpMempoolLater(false);
 
 void StartShutdown()
 {
@@ -209,7 +210,8 @@ void Shutdown()
 
     StopTorControl();
     UnregisterNodeSignals(GetNodeSignals());
-    DumpMempool();
+    if (fDumpMempoolLater)
+        DumpMempool();
 
     if (fFeeEstimatesInitialized)
     {
@@ -667,6 +669,7 @@ void ThreadImport(std::vector<boost::filesystem::path> vImportFiles)
     }
     } // End scope of CImportingNow
     LoadMempool();
+    fDumpMempoolLater = !fRequestShutdown;
 }
 
 /** Sanity checks
diff --git a/src/validation.cpp b/src/validation.cpp
index bd60bbfdcdd5b..b36e90112188f 100644
--- a/src/validation.cpp
+++ b/src/validation.cpp
@@ -4076,6 +4076,8 @@ bool LoadMempool(void)
             } else {
                 ++skipped;
             }
+            if (ShutdownRequested())
+                return false;
         }
         std::map<uint256, CAmount> mapDeltas;
         file >> mapDeltas;

From 54f80263fc56bb5ebbcccd9d647ad4884659ea9b Mon Sep 17 00:00:00 2001
From: Jonas Schnelli <dev@jonasschnelli.ch>
Date: Fri, 23 Dec 2016 10:24:29 +0100
Subject: [PATCH 1410/1802] [CoinControl] Allow non-wallet owned change
 addresses

---
 src/qt/sendcoinsdialog.cpp | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/src/qt/sendcoinsdialog.cpp b/src/qt/sendcoinsdialog.cpp
index 13210a1adc4fb..40e51c7abccee 100644
--- a/src/qt/sendcoinsdialog.cpp
+++ b/src/qt/sendcoinsdialog.cpp
@@ -772,6 +772,19 @@ void SendCoinsDialog::coinControlChangeEdited(const QString& text)
             if (!model->havePrivKey(keyid)) // Unknown change address
             {
                 ui->labelCoinControlChangeLabel->setText(tr("Warning: Unknown change address"));
+
+                // confirmation dialog
+                QMessageBox::StandardButton btnRetVal = QMessageBox::question(this, tr("Confirm custom change address"), tr("The address you selected for change is not part of this wallet. Any or all funds in your wallet may be sent to this address. Are you sure?"),
+                    QMessageBox::Yes | QMessageBox::Cancel, QMessageBox::Cancel);
+
+                if(btnRetVal == QMessageBox::Yes)
+                    CoinControlDialog::coinControl->destChange = addr.Get();
+                else
+                {
+                    ui->lineEditCoinControlChange->setText("");
+                    ui->labelCoinControlChangeLabel->setStyleSheet("QLabel{color:black;}");
+                    ui->labelCoinControlChangeLabel->setText("");
+                }
             }
             else // Known change address
             {

From 407cdd6cb8db7baacf3c4d7bf9bae5fe38d7f098 Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Fri, 23 Dec 2016 14:22:46 -0800
Subject: [PATCH 1411/1802] Do not evaluate hidden LogPrint arguments

---
 src/util.h | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/util.h b/src/util.h
index 3ec38a7c7db2b..c9ead65a8bfb1 100644
--- a/src/util.h
+++ b/src/util.h
@@ -74,14 +74,15 @@ bool LogAcceptCategory(const char* category);
 /** Send a string to the log output */
 int LogPrintStr(const std::string &str);
 
-#define LogPrintf(...) LogPrint(NULL, __VA_ARGS__)
-
-template<typename... Args>
-static inline int LogPrint(const char* category, const char* fmt, const Args&... args)
-{
-    if(!LogAcceptCategory(category)) return 0;                            \
-    return LogPrintStr(tfm::format(fmt, args...));
-}
+#define LogPrint(category, ...) do { \
+    if (LogAcceptCategory((category))) { \
+        LogPrintStr(tfm::format(__VA_ARGS__)); \
+    } \
+} while(0)
+
+#define LogPrintf(...) do { \
+    LogPrintStr(tfm::format(__VA_ARGS__)); \
+} while(0)
 
 template<typename... Args>
 bool error(const char* fmt, const Args&... args)

From c8042a48f01aaf306e108683e40db4bfaf0bbcaa Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Tue, 29 Nov 2016 15:17:34 -0800
Subject: [PATCH 1412/1802] Remove arguments to ParseConfigFile

---
 src/bitcoin-cli.cpp |  2 +-
 src/bitcoind.cpp    |  2 +-
 src/qt/bitcoin.cpp  |  2 +-
 src/util.cpp        | 10 ++++------
 src/util.h          |  2 +-
 5 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/bitcoin-cli.cpp b/src/bitcoin-cli.cpp
index 596cc8eada94a..cee9ae31b5728 100644
--- a/src/bitcoin-cli.cpp
+++ b/src/bitcoin-cli.cpp
@@ -99,7 +99,7 @@ static int AppInitRPC(int argc, char* argv[])
         return EXIT_FAILURE;
     }
     try {
-        ReadConfigFile(GetArg("-conf", BITCOIN_CONF_FILENAME), mapArgs, mapMultiArgs);
+        ReadConfigFile(GetArg("-conf", BITCOIN_CONF_FILENAME));
     } catch (const std::exception& e) {
         fprintf(stderr,"Error reading configuration file: %s\n", e.what());
         return EXIT_FAILURE;
diff --git a/src/bitcoind.cpp b/src/bitcoind.cpp
index ba3ccac6156b0..3dd085628958d 100644
--- a/src/bitcoind.cpp
+++ b/src/bitcoind.cpp
@@ -104,7 +104,7 @@ bool AppInit(int argc, char* argv[])
         }
         try
         {
-            ReadConfigFile(GetArg("-conf", BITCOIN_CONF_FILENAME), mapArgs, mapMultiArgs);
+            ReadConfigFile(GetArg("-conf", BITCOIN_CONF_FILENAME));
         } catch (const std::exception& e) {
             fprintf(stderr,"Error reading configuration file: %s\n", e.what());
             return false;
diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp
index cfd0955a749b8..3ae54f3119c1e 100644
--- a/src/qt/bitcoin.cpp
+++ b/src/qt/bitcoin.cpp
@@ -608,7 +608,7 @@ int main(int argc, char *argv[])
         return EXIT_FAILURE;
     }
     try {
-        ReadConfigFile(GetArg("-conf", BITCOIN_CONF_FILENAME), mapArgs, mapMultiArgs);
+        ReadConfigFile(GetArg("-conf", BITCOIN_CONF_FILENAME));
     } catch (const std::exception& e) {
         QMessageBox::critical(0, QObject::tr(PACKAGE_NAME),
                               QObject::tr("Error: Cannot parse configuration file: %1. Only use key=value syntax.").arg(e.what()));
diff --git a/src/util.cpp b/src/util.cpp
index 977f8993ed27e..8b3e5f93f08c5 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -526,9 +526,7 @@ boost::filesystem::path GetConfigFile(const std::string& confPath)
     return pathConfigFile;
 }
 
-void ReadConfigFile(const std::string& confPath,
-                    map<string, string>& mapSettingsRet,
-                    map<string, vector<string> >& mapMultiSettingsRet)
+void ReadConfigFile(const std::string& confPath)
 {
     boost::filesystem::ifstream streamConfig(GetConfigFile(confPath));
     if (!streamConfig.good())
@@ -543,9 +541,9 @@ void ReadConfigFile(const std::string& confPath,
         string strKey = string("-") + it->string_key;
         string strValue = it->value[0];
         InterpretNegativeSetting(strKey, strValue);
-        if (mapSettingsRet.count(strKey) == 0)
-            mapSettingsRet[strKey] = strValue;
-        mapMultiSettingsRet[strKey].push_back(strValue);
+        if (mapArgs.count(strKey) == 0)
+            mapArgs[strKey] = strValue;
+        mapMultiArgs[strKey].push_back(strValue);
     }
     // If datadir is changed in .conf file:
     ClearDatadirCache();
diff --git a/src/util.h b/src/util.h
index 3ec38a7c7db2b..4fb09046bdf27 100644
--- a/src/util.h
+++ b/src/util.h
@@ -106,7 +106,7 @@ boost::filesystem::path GetConfigFile(const std::string& confPath);
 boost::filesystem::path GetPidFile();
 void CreatePidFile(const boost::filesystem::path &path, pid_t pid);
 #endif
-void ReadConfigFile(const std::string& confPath, std::map<std::string, std::string>& mapSettingsRet, std::map<std::string, std::vector<std::string> >& mapMultiSettingsRet);
+void ReadConfigFile(const std::string& confPath);
 #ifdef WIN32
 boost::filesystem::path GetSpecialFolderPath(int nFolder, bool fCreate = true);
 #endif

From 2b5f085ad11b4b354f48d77e66698fa386c8abbd Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Tue, 29 Nov 2016 16:50:49 -0800
Subject: [PATCH 1413/1802] Fix non-const mapMultiArgs[] access after init.

Swap mapMultiArgs for a const-reference to a _mapMultiArgs which is
only accessed in util.cpp
---
 src/httprpc.cpp         |  2 +-
 src/httpserver.cpp      |  6 ++---
 src/init.cpp            | 60 +++++++++++++++++++++++------------------
 src/net.cpp             |  9 ++++---
 src/test/util_tests.cpp |  2 +-
 src/util.cpp            | 18 ++++++++-----
 src/util.h              |  2 +-
 7 files changed, 56 insertions(+), 43 deletions(-)

diff --git a/src/httprpc.cpp b/src/httprpc.cpp
index e35acb6cd99ce..049a3f19a52ad 100644
--- a/src/httprpc.cpp
+++ b/src/httprpc.cpp
@@ -95,7 +95,7 @@ static bool multiUserAuthorized(std::string strUserPass)
 
     if (mapMultiArgs.count("-rpcauth") > 0) {
         //Search for multi-user login/pass "rpcauth" from config
-        BOOST_FOREACH(std::string strRPCAuth, mapMultiArgs["-rpcauth"])
+        BOOST_FOREACH(std::string strRPCAuth, mapMultiArgs.at("-rpcauth"))
         {
             std::vector<std::string> vFields;
             boost::split(vFields, strRPCAuth, boost::is_any_of(":$"));
diff --git a/src/httpserver.cpp b/src/httpserver.cpp
index b296b28503026..2d25168a1630b 100644
--- a/src/httpserver.cpp
+++ b/src/httpserver.cpp
@@ -204,7 +204,7 @@ static bool InitHTTPAllowList()
     rpc_allow_subnets.push_back(CSubNet(localv4, 8));      // always allow IPv4 local subnet
     rpc_allow_subnets.push_back(CSubNet(localv6));         // always allow IPv6 localhost
     if (mapMultiArgs.count("-rpcallowip")) {
-        const std::vector<std::string>& vAllow = mapMultiArgs["-rpcallowip"];
+        const std::vector<std::string>& vAllow = mapMultiArgs.at("-rpcallowip");
         for (std::string strAllow : vAllow) {
             CSubNet subnet;
             LookupSubNet(strAllow.c_str(), subnet);
@@ -328,8 +328,8 @@ static bool HTTPBindAddresses(struct evhttp* http)
         if (mapArgs.count("-rpcbind")) {
             LogPrintf("WARNING: option -rpcbind was ignored because -rpcallowip was not specified, refusing to allow everyone to connect\n");
         }
-    } else if (mapArgs.count("-rpcbind")) { // Specific bind address
-        const std::vector<std::string>& vbind = mapMultiArgs["-rpcbind"];
+    } else if (mapMultiArgs.count("-rpcbind")) { // Specific bind address
+        const std::vector<std::string>& vbind = mapMultiArgs.at("-rpcbind");
         for (std::vector<std::string>::const_iterator i = vbind.begin(); i != vbind.end(); ++i) {
             int port = defaultPort;
             std::string host;
diff --git a/src/init.cpp b/src/init.cpp
index e642729a990ef..ecfd33fb62696 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -717,7 +717,7 @@ void InitParameterInteraction()
             LogPrintf("%s: parameter interaction: -whitebind set -> setting -listen=1\n", __func__);
     }
 
-    if (mapArgs.count("-connect") && mapMultiArgs["-connect"].size() > 0) {
+    if (mapMultiArgs.count("-connect") && mapMultiArgs.at("-connect").size() > 0) {
         // when only connecting to trusted nodes, do not seed via DNS, or listen by default
         if (SoftSetBoolArg("-dnsseed", false))
             LogPrintf("%s: parameter interaction: -connect set -> setting -dnsseed=0\n", __func__);
@@ -880,11 +880,13 @@ bool AppInitParameterInteraction()
 
     // ********************************************************* Step 3: parameter-to-internal-flags
 
-    fDebug = !mapMultiArgs["-debug"].empty();
+    fDebug = mapMultiArgs.count("-debug");
     // Special-case: if -debug=0/-nodebug is set, turn off debugging messages
-    const vector<string>& categories = mapMultiArgs["-debug"];
-    if (GetBoolArg("-nodebug", false) || find(categories.begin(), categories.end(), string("0")) != categories.end())
-        fDebug = false;
+    if (fDebug) {
+        const vector<string>& categories = mapMultiArgs.at("-debug");
+        if (GetBoolArg("-nodebug", false) || find(categories.begin(), categories.end(), string("0")) != categories.end())
+            fDebug = false;
+    }
 
     // Check for -debugnet
     if (GetBoolArg("-debugnet", false))
@@ -1003,12 +1005,12 @@ bool AppInitParameterInteraction()
         fEnableReplacement = (std::find(vstrReplacementModes.begin(), vstrReplacementModes.end(), "fee") != vstrReplacementModes.end());
     }
 
-    if (!mapMultiArgs["-bip9params"].empty()) {
+    if (mapMultiArgs.count("-bip9params")) {
         // Allow overriding BIP9 parameters for testing
         if (!chainparams.MineBlocksOnDemand()) {
             return InitError("BIP9 parameters may only be overridden on regtest.");
         }
-        const vector<string>& deployments = mapMultiArgs["-bip9params"];
+        const vector<string>& deployments = mapMultiArgs.at("-bip9params");
         for (auto i : deployments) {
             std::vector<std::string> vDeploymentParams;
             boost::split(vDeploymentParams, i, boost::is_any_of(":"));
@@ -1154,11 +1156,13 @@ bool AppInitMain(boost::thread_group& threadGroup, CScheduler& scheduler)
 
     // sanitize comments per BIP-0014, format user agent and check total size
     std::vector<string> uacomments;
-    BOOST_FOREACH(string cmt, mapMultiArgs["-uacomment"])
-    {
-        if (cmt != SanitizeString(cmt, SAFE_CHARS_UA_COMMENT))
-            return InitError(strprintf(_("User Agent comment (%s) contains unsafe characters."), cmt));
-        uacomments.push_back(SanitizeString(cmt, SAFE_CHARS_UA_COMMENT));
+    if (mapMultiArgs.count("-uacomment")) {
+        BOOST_FOREACH(string cmt, mapMultiArgs.at("-uacomment"))
+        {
+            if (cmt != SanitizeString(cmt, SAFE_CHARS_UA_COMMENT))
+                return InitError(strprintf(_("User Agent comment (%s) contains unsafe characters."), cmt));
+            uacomments.push_back(cmt);
+        }
     }
     strSubVersion = FormatSubVersion(CLIENT_NAME, CLIENT_VERSION, uacomments);
     if (strSubVersion.size() > MAX_SUBVERSION_LENGTH) {
@@ -1166,9 +1170,9 @@ bool AppInitMain(boost::thread_group& threadGroup, CScheduler& scheduler)
             strSubVersion.size(), MAX_SUBVERSION_LENGTH));
     }
 
-    if (mapArgs.count("-onlynet")) {
+    if (mapMultiArgs.count("-onlynet")) {
         std::set<enum Network> nets;
-        BOOST_FOREACH(const std::string& snet, mapMultiArgs["-onlynet"]) {
+        BOOST_FOREACH(const std::string& snet, mapMultiArgs.at("-onlynet")) {
             enum Network net = ParseNetwork(snet);
             if (net == NET_UNROUTABLE)
                 return InitError(strprintf(_("Unknown network specified in -onlynet: '%s'"), snet));
@@ -1181,8 +1185,8 @@ bool AppInitMain(boost::thread_group& threadGroup, CScheduler& scheduler)
         }
     }
 
-    if (mapArgs.count("-whitelist")) {
-        BOOST_FOREACH(const std::string& net, mapMultiArgs["-whitelist"]) {
+    if (mapMultiArgs.count("-whitelist")) {
+        BOOST_FOREACH(const std::string& net, mapMultiArgs.at("-whitelist")) {
             CSubNet subnet;
             LookupSubNet(net.c_str(), subnet);
             if (!subnet.IsValid())
@@ -1234,14 +1238,16 @@ bool AppInitMain(boost::thread_group& threadGroup, CScheduler& scheduler)
 
     if (fListen) {
         bool fBound = false;
-        if (mapArgs.count("-bind") || mapArgs.count("-whitebind")) {
-            BOOST_FOREACH(const std::string& strBind, mapMultiArgs["-bind"]) {
+        if (mapMultiArgs.count("-bind")) {
+            BOOST_FOREACH(const std::string& strBind, mapMultiArgs.at("-bind")) {
                 CService addrBind;
                 if (!Lookup(strBind.c_str(), addrBind, GetListenPort(), false))
                     return InitError(ResolveErrMsg("bind", strBind));
                 fBound |= Bind(connman, addrBind, (BF_EXPLICIT | BF_REPORT_ERROR));
             }
-            BOOST_FOREACH(const std::string& strBind, mapMultiArgs["-whitebind"]) {
+        }
+        if (mapMultiArgs.count("-whitebind")) {
+            BOOST_FOREACH(const std::string& strBind, mapMultiArgs.at("-whitebind")) {
                 CService addrBind;
                 if (!Lookup(strBind.c_str(), addrBind, 0, false))
                     return InitError(ResolveErrMsg("whitebind", strBind));
@@ -1250,7 +1256,7 @@ bool AppInitMain(boost::thread_group& threadGroup, CScheduler& scheduler)
                 fBound |= Bind(connman, addrBind, (BF_EXPLICIT | BF_REPORT_ERROR | BF_WHITELIST));
             }
         }
-        else {
+        if (!mapMultiArgs.count("-bind") && !mapMultiArgs.count("-whitebind")) {
             struct in_addr inaddr_any;
             inaddr_any.s_addr = INADDR_ANY;
             fBound |= Bind(connman, CService(in6addr_any, GetListenPort()), BF_NONE);
@@ -1260,8 +1266,8 @@ bool AppInitMain(boost::thread_group& threadGroup, CScheduler& scheduler)
             return InitError(_("Failed to listen on any port. Use -listen=0 if you want this."));
     }
 
-    if (mapArgs.count("-externalip")) {
-        BOOST_FOREACH(const std::string& strAddr, mapMultiArgs["-externalip"]) {
+    if (mapMultiArgs.count("-externalip")) {
+        BOOST_FOREACH(const std::string& strAddr, mapMultiArgs.at("-externalip")) {
             CService addrLocal;
             if (Lookup(strAddr.c_str(), addrLocal, GetListenPort(), fNameLookup) && addrLocal.IsValid())
                 AddLocal(addrLocal, LOCAL_MANUAL);
@@ -1270,8 +1276,10 @@ bool AppInitMain(boost::thread_group& threadGroup, CScheduler& scheduler)
         }
     }
 
-    BOOST_FOREACH(const std::string& strDest, mapMultiArgs["-seednode"])
-        connman.AddOneShot(strDest);
+    if (mapMultiArgs.count("-seednode")) {
+        BOOST_FOREACH(const std::string& strDest, mapMultiArgs.at("-seednode"))
+            connman.AddOneShot(strDest);
+    }
 
 #if ENABLE_ZMQ
     pzmqNotificationInterface = CZMQNotificationInterface::CreateWithArguments(mapArgs);
@@ -1519,9 +1527,9 @@ bool AppInitMain(boost::thread_group& threadGroup, CScheduler& scheduler)
         uiInterface.NotifyBlockTip.connect(BlockNotifyCallback);
 
     std::vector<boost::filesystem::path> vImportFiles;
-    if (mapArgs.count("-loadblock"))
+    if (mapMultiArgs.count("-loadblock"))
     {
-        BOOST_FOREACH(const std::string& strFile, mapMultiArgs["-loadblock"])
+        BOOST_FOREACH(const std::string& strFile, mapMultiArgs.at("-loadblock"))
             vImportFiles.push_back(strFile);
     }
 
diff --git a/src/net.cpp b/src/net.cpp
index 27b200b3f07e5..3ac96235480d1 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -1569,12 +1569,12 @@ void CConnman::ProcessOneShot()
 void CConnman::ThreadOpenConnections()
 {
     // Connect to specific addresses
-    if (mapArgs.count("-connect") && mapMultiArgs["-connect"].size() > 0)
+    if (mapMultiArgs.count("-connect") && mapMultiArgs.at("-connect").size() > 0)
     {
         for (int64_t nLoop = 0;; nLoop++)
         {
             ProcessOneShot();
-            BOOST_FOREACH(const std::string& strAddr, mapMultiArgs["-connect"])
+            BOOST_FOREACH(const std::string& strAddr, mapMultiArgs.at("-connect"))
             {
                 CAddress addr(CService(), NODE_NONE);
                 OpenNetworkConnection(addr, false, NULL, strAddr.c_str());
@@ -1765,7 +1765,8 @@ void CConnman::ThreadOpenAddedConnections()
 {
     {
         LOCK(cs_vAddedNodes);
-        vAddedNodes = mapMultiArgs["-addnode"];
+        if (mapMultiArgs.count("-addnode"))
+            vAddedNodes = mapMultiArgs.at("-addnode");
     }
 
     for (unsigned int i = 0; true; i++)
@@ -2157,7 +2158,7 @@ bool CConnman::Start(boost::thread_group& threadGroup, CScheduler& scheduler, st
     threadGroup.create_thread(boost::bind(&TraceThread<boost::function<void()> >, "addcon", boost::function<void()>(boost::bind(&CConnman::ThreadOpenAddedConnections, this))));
 
     // Initiate outbound connections unless connect=0
-    if (!mapArgs.count("-connect") || mapMultiArgs["-connect"].size() != 1 || mapMultiArgs["-connect"][0] != "0")
+    if (!mapMultiArgs.count("-connect") || mapMultiArgs.at("-connect").size() != 1 || mapMultiArgs.at("-connect")[0] != "0")
         threadGroup.create_thread(boost::bind(&TraceThread<boost::function<void()> >, "opencon", boost::function<void()>(boost::bind(&CConnman::ThreadOpenConnections, this))));
 
     // Process messages
diff --git a/src/test/util_tests.cpp b/src/test/util_tests.cpp
index bad72ffc0fc5f..493d58641cb07 100644
--- a/src/test/util_tests.cpp
+++ b/src/test/util_tests.cpp
@@ -121,7 +121,7 @@ BOOST_AUTO_TEST_CASE(util_ParseParameters)
                 && !mapMultiArgs.count("f") && !mapMultiArgs.count("-d"));
 
     BOOST_CHECK(mapArgs["-a"] == "" && mapArgs["-ccc"] == "multiple");
-    BOOST_CHECK(mapMultiArgs["-ccc"].size() == 2);
+    BOOST_CHECK(mapMultiArgs.at("-ccc").size() == 2);
 }
 
 BOOST_AUTO_TEST_CASE(util_GetArg)
diff --git a/src/util.cpp b/src/util.cpp
index 8b3e5f93f08c5..6625ac9325626 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -103,7 +103,8 @@ const char * const BITCOIN_CONF_FILENAME = "bitcoin.conf";
 const char * const BITCOIN_PID_FILENAME = "bitcoind.pid";
 
 map<string, string> mapArgs;
-map<string, vector<string> > mapMultiArgs;
+static map<string, vector<string> > _mapMultiArgs;
+const map<string, vector<string> >& mapMultiArgs = _mapMultiArgs;
 bool fDebug = false;
 bool fPrintToConsole = false;
 bool fPrintToDebugLog = true;
@@ -238,9 +239,12 @@ bool LogAcceptCategory(const char* category)
         static boost::thread_specific_ptr<set<string> > ptrCategory;
         if (ptrCategory.get() == NULL)
         {
-            const vector<string>& categories = mapMultiArgs["-debug"];
-            ptrCategory.reset(new set<string>(categories.begin(), categories.end()));
-            // thread_specific_ptr automatically deletes the set when the thread ends.
+            if (mapMultiArgs.count("-debug")) {
+                const vector<string>& categories = mapMultiArgs.at("-debug");
+                ptrCategory.reset(new set<string>(categories.begin(), categories.end()));
+                // thread_specific_ptr automatically deletes the set when the thread ends.
+            } else
+                ptrCategory.reset(new set<string>());
         }
         const set<string>& setCategories = *ptrCategory.get();
 
@@ -343,7 +347,7 @@ static void InterpretNegativeSetting(std::string& strKey, std::string& strValue)
 void ParseParameters(int argc, const char* const argv[])
 {
     mapArgs.clear();
-    mapMultiArgs.clear();
+    _mapMultiArgs.clear();
 
     for (int i = 1; i < argc; i++)
     {
@@ -371,7 +375,7 @@ void ParseParameters(int argc, const char* const argv[])
         InterpretNegativeSetting(str, strValue);
 
         mapArgs[str] = strValue;
-        mapMultiArgs[str].push_back(strValue);
+        _mapMultiArgs[str].push_back(strValue);
     }
 }
 
@@ -543,7 +547,7 @@ void ReadConfigFile(const std::string& confPath)
         InterpretNegativeSetting(strKey, strValue);
         if (mapArgs.count(strKey) == 0)
             mapArgs[strKey] = strValue;
-        mapMultiArgs[strKey].push_back(strValue);
+        _mapMultiArgs[strKey].push_back(strValue);
     }
     // If datadir is changed in .conf file:
     ClearDatadirCache();
diff --git a/src/util.h b/src/util.h
index 4fb09046bdf27..5d1d80d2df2e9 100644
--- a/src/util.h
+++ b/src/util.h
@@ -42,7 +42,7 @@ class CTranslationInterface
 };
 
 extern std::map<std::string, std::string> mapArgs;
-extern std::map<std::string, std::vector<std::string> > mapMultiArgs;
+extern const std::map<std::string, std::vector<std::string> >& mapMultiArgs;
 extern bool fDebug;
 extern bool fPrintToConsole;
 extern bool fPrintToDebugLog;

From 0cf86a6678413aa03e765a7133f048df4001ff4c Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Tue, 29 Nov 2016 17:51:30 -0800
Subject: [PATCH 1414/1802] Introduce (and use) an IsArgSet accessor method

---
 src/bitcoin-cli.cpp     |  4 ++--
 src/bitcoin-tx.cpp      |  2 +-
 src/bitcoind.cpp        |  4 ++--
 src/httpserver.cpp      |  4 ++--
 src/init.cpp            | 20 ++++++++++----------
 src/miner.cpp           |  4 ++--
 src/net_processing.cpp  |  2 +-
 src/qt/bitcoin.cpp      |  6 +++---
 src/test/util_tests.cpp |  4 ++--
 src/util.cpp            |  7 ++++++-
 src/util.h              |  8 ++++++++
 src/wallet/wallet.cpp   | 10 +++++-----
 12 files changed, 44 insertions(+), 31 deletions(-)

diff --git a/src/bitcoin-cli.cpp b/src/bitcoin-cli.cpp
index cee9ae31b5728..a4360dcd139a5 100644
--- a/src/bitcoin-cli.cpp
+++ b/src/bitcoin-cli.cpp
@@ -76,9 +76,9 @@ static int AppInitRPC(int argc, char* argv[])
     // Parameters
     //
     ParseParameters(argc, argv);
-    if (argc<2 || mapArgs.count("-?") || mapArgs.count("-h") || mapArgs.count("-help") || mapArgs.count("-version")) {
+    if (argc<2 || IsArgSet("-?") || IsArgSet("-h") || IsArgSet("-help") || IsArgSet("-version")) {
         std::string strUsage = strprintf(_("%s RPC client version"), _(PACKAGE_NAME)) + " " + FormatFullVersion() + "\n";
-        if (!mapArgs.count("-version")) {
+        if (!IsArgSet("-version")) {
             strUsage += "\n" + _("Usage:") + "\n" +
                   "  bitcoin-cli [options] <command> [params]  " + strprintf(_("Send command to %s"), _(PACKAGE_NAME)) + "\n" +
                   "  bitcoin-cli [options] help                " + _("List commands") + "\n" +
diff --git a/src/bitcoin-tx.cpp b/src/bitcoin-tx.cpp
index 816687a45d146..d46f330453058 100644
--- a/src/bitcoin-tx.cpp
+++ b/src/bitcoin-tx.cpp
@@ -51,7 +51,7 @@ static int AppInitRawTx(int argc, char* argv[])
 
     fCreateBlank = GetBoolArg("-create", false);
 
-    if (argc<2 || mapArgs.count("-?") || mapArgs.count("-h") || mapArgs.count("-help"))
+    if (argc<2 || IsArgSet("-?") || IsArgSet("-h") || IsArgSet("-help"))
     {
         // First part of help message is specific to this utility
         std::string strUsage = strprintf(_("%s bitcoin-tx utility version"), _(PACKAGE_NAME)) + " " + FormatFullVersion() + "\n\n" +
diff --git a/src/bitcoind.cpp b/src/bitcoind.cpp
index 3dd085628958d..ee27f412209c1 100644
--- a/src/bitcoind.cpp
+++ b/src/bitcoind.cpp
@@ -75,11 +75,11 @@ bool AppInit(int argc, char* argv[])
     ParseParameters(argc, argv);
 
     // Process help and version before taking care about datadir
-    if (mapArgs.count("-?") || mapArgs.count("-h") ||  mapArgs.count("-help") || mapArgs.count("-version"))
+    if (IsArgSet("-?") || IsArgSet("-h") ||  IsArgSet("-help") || IsArgSet("-version"))
     {
         std::string strUsage = strprintf(_("%s Daemon"), _(PACKAGE_NAME)) + " " + _("version") + " " + FormatFullVersion() + "\n";
 
-        if (mapArgs.count("-version"))
+        if (IsArgSet("-version"))
         {
             strUsage += FormatParagraph(LicenseInfo());
         }
diff --git a/src/httpserver.cpp b/src/httpserver.cpp
index 2d25168a1630b..2573900746f37 100644
--- a/src/httpserver.cpp
+++ b/src/httpserver.cpp
@@ -322,10 +322,10 @@ static bool HTTPBindAddresses(struct evhttp* http)
     std::vector<std::pair<std::string, uint16_t> > endpoints;
 
     // Determine what addresses to bind to
-    if (!mapArgs.count("-rpcallowip")) { // Default to loopback if not allowing external IPs
+    if (!IsArgSet("-rpcallowip")) { // Default to loopback if not allowing external IPs
         endpoints.push_back(std::make_pair("::1", defaultPort));
         endpoints.push_back(std::make_pair("127.0.0.1", defaultPort));
-        if (mapArgs.count("-rpcbind")) {
+        if (IsArgSet("-rpcbind")) {
             LogPrintf("WARNING: option -rpcbind was ignored because -rpcallowip was not specified, refusing to allow everyone to connect\n");
         }
     } else if (mapMultiArgs.count("-rpcbind")) { // Specific bind address
diff --git a/src/init.cpp b/src/init.cpp
index ecfd33fb62696..778d66fba840a 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -708,11 +708,11 @@ void InitParameterInteraction()
 {
     // when specifying an explicit binding address, you want to listen on it
     // even when -connect or -proxy is specified
-    if (mapArgs.count("-bind")) {
+    if (IsArgSet("-bind")) {
         if (SoftSetBoolArg("-listen", true))
             LogPrintf("%s: parameter interaction: -bind set -> setting -listen=1\n", __func__);
     }
-    if (mapArgs.count("-whitebind")) {
+    if (IsArgSet("-whitebind")) {
         if (SoftSetBoolArg("-listen", true))
             LogPrintf("%s: parameter interaction: -whitebind set -> setting -listen=1\n", __func__);
     }
@@ -725,7 +725,7 @@ void InitParameterInteraction()
             LogPrintf("%s: parameter interaction: -connect set -> setting -listen=0\n", __func__);
     }
 
-    if (mapArgs.count("-proxy")) {
+    if (IsArgSet("-proxy")) {
         // to protect privacy, do not listen by default if a default proxy server is specified
         if (SoftSetBoolArg("-listen", false))
             LogPrintf("%s: parameter interaction: -proxy set -> setting -listen=0\n", __func__);
@@ -748,7 +748,7 @@ void InitParameterInteraction()
             LogPrintf("%s: parameter interaction: -listen=0 -> setting -listenonion=0\n", __func__);
     }
 
-    if (mapArgs.count("-externalip")) {
+    if (IsArgSet("-externalip")) {
         // if an explicit public IP is specified, do not try to find others
         if (SoftSetBoolArg("-discover", false))
             LogPrintf("%s: parameter interaction: -externalip set -> setting -discover=0\n", __func__);
@@ -892,7 +892,7 @@ bool AppInitParameterInteraction()
     if (GetBoolArg("-debugnet", false))
         InitWarning(_("Unsupported argument -debugnet ignored, use -debug=net."));
     // Check for -socks - as this is a privacy risk to continue, exit here
-    if (mapArgs.count("-socks"))
+    if (IsArgSet("-socks"))
         return InitError(_("Unsupported argument -socks found. Setting SOCKS version isn't possible anymore, only SOCKS5 proxies are supported."));
     // Check for -tor - as this is a privacy risk to continue, exit here
     if (GetBoolArg("-tor", false))
@@ -904,7 +904,7 @@ bool AppInitParameterInteraction()
     if (GetBoolArg("-whitelistalwaysrelay", false))
         InitWarning(_("Unsupported argument -whitelistalwaysrelay ignored, use -whitelistrelay and/or -whitelistforcerelay."));
 
-    if (mapArgs.count("-blockminsize"))
+    if (IsArgSet("-blockminsize"))
         InitWarning("Unsupported argument -blockminsize ignored.");
 
     // Checkmempool and checkblockindex default to true in regtest mode
@@ -959,7 +959,7 @@ bool AppInitParameterInteraction()
     // a transaction spammer can cheaply fill blocks using
     // 1-satoshi-fee transactions. It should be set above the real
     // cost to you of processing a transaction.
-    if (mapArgs.count("-minrelaytxfee"))
+    if (IsArgSet("-minrelaytxfee"))
     {
         CAmount n = 0;
         if (!ParseMoney(mapArgs["-minrelaytxfee"], n) || 0 == n)
@@ -997,7 +997,7 @@ bool AppInitParameterInteraction()
     nMaxTipAge = GetArg("-maxtipage", DEFAULT_MAX_TIP_AGE);
 
     fEnableReplacement = GetBoolArg("-mempoolreplacement", DEFAULT_ENABLE_REPLACEMENT);
-    if ((!fEnableReplacement) && mapArgs.count("-mempoolreplacement")) {
+    if ((!fEnableReplacement) && IsArgSet("-mempoolreplacement")) {
         // Minimal effort at forwards compatibility
         std::string strReplacementModeList = GetArg("-mempoolreplacement", "");  // default is impossible
         std::vector<std::string> vstrReplacementModes;
@@ -1291,7 +1291,7 @@ bool AppInitMain(boost::thread_group& threadGroup, CScheduler& scheduler)
     uint64_t nMaxOutboundLimit = 0; //unlimited unless -maxuploadtarget is set
     uint64_t nMaxOutboundTimeframe = MAX_UPLOAD_TIMEFRAME;
 
-    if (mapArgs.count("-maxuploadtarget")) {
+    if (IsArgSet("-maxuploadtarget")) {
         nMaxOutboundLimit = GetArg("-maxuploadtarget", DEFAULT_MAX_UPLOAD_TARGET)*1024*1024;
     }
 
@@ -1523,7 +1523,7 @@ bool AppInitMain(boost::thread_group& threadGroup, CScheduler& scheduler)
         fHaveGenesis = true;
     }
 
-    if (mapArgs.count("-blocknotify"))
+    if (IsArgSet("-blocknotify"))
         uiInterface.NotifyBlockTip.connect(BlockNotifyCallback);
 
     std::vector<boost::filesystem::path> vImportFiles;
diff --git a/src/miner.cpp b/src/miner.cpp
index b48b9cee49be5..55231730fa138 100644
--- a/src/miner.cpp
+++ b/src/miner.cpp
@@ -84,12 +84,12 @@ BlockAssembler::BlockAssembler(const CChainParams& _chainparams)
     nBlockMaxWeight = DEFAULT_BLOCK_MAX_WEIGHT;
     nBlockMaxSize = DEFAULT_BLOCK_MAX_SIZE;
     bool fWeightSet = false;
-    if (mapArgs.count("-blockmaxweight")) {
+    if (IsArgSet("-blockmaxweight")) {
         nBlockMaxWeight = GetArg("-blockmaxweight", DEFAULT_BLOCK_MAX_WEIGHT);
         nBlockMaxSize = MAX_BLOCK_SERIALIZED_SIZE;
         fWeightSet = true;
     }
-    if (mapArgs.count("-blockmaxsize")) {
+    if (IsArgSet("-blockmaxsize")) {
         nBlockMaxSize = GetArg("-blockmaxsize", DEFAULT_BLOCK_MAX_SIZE);
         if (!fWeightSet) {
             nBlockMaxWeight = nBlockMaxSize * WITNESS_SCALE_FACTOR;
diff --git a/src/net_processing.cpp b/src/net_processing.cpp
index 87d367c2fbcb3..98872200ddf5c 100644
--- a/src/net_processing.cpp
+++ b/src/net_processing.cpp
@@ -1060,7 +1060,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
     unsigned int nMaxSendBufferSize = connman.GetSendBufferSize();
 
     LogPrint("net", "received: %s (%u bytes) peer=%d\n", SanitizeString(strCommand), vRecv.size(), pfrom->id);
-    if (mapArgs.count("-dropmessagestest") && GetRand(atoi(mapArgs["-dropmessagestest"])) == 0)
+    if (IsArgSet("-dropmessagestest") && GetRand(atoi(mapArgs["-dropmessagestest"])) == 0)
     {
         LogPrintf("dropmessagestest DROPPING RECV MESSAGE\n");
         return true;
diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp
index 3ae54f3119c1e..9d80a38008353 100644
--- a/src/qt/bitcoin.cpp
+++ b/src/qt/bitcoin.cpp
@@ -587,9 +587,9 @@ int main(int argc, char *argv[])
 
     // Show help message immediately after parsing command-line options (for "-lang") and setting locale,
     // but before showing splash screen.
-    if (mapArgs.count("-?") || mapArgs.count("-h") || mapArgs.count("-help") || mapArgs.count("-version"))
+    if (IsArgSet("-?") || IsArgSet("-h") || IsArgSet("-help") || IsArgSet("-version"))
     {
-        HelpMessageDialog help(NULL, mapArgs.count("-version"));
+        HelpMessageDialog help(NULL, IsArgSet("-version"));
         help.showOrPrint();
         return EXIT_SUCCESS;
     }
@@ -672,7 +672,7 @@ int main(int argc, char *argv[])
     // Allow parameter interaction before we create the options model
     app.parameterSetup();
     // Load GUI settings from QSettings
-    app.createOptionsModel(mapArgs.count("-resetguisettings") != 0);
+    app.createOptionsModel(IsArgSet("-resetguisettings"));
 
     // Subscribe to global signals from core
     uiInterface.InitMessage.connect(InitMessage);
diff --git a/src/test/util_tests.cpp b/src/test/util_tests.cpp
index 493d58641cb07..6ce065b377171 100644
--- a/src/test/util_tests.cpp
+++ b/src/test/util_tests.cpp
@@ -115,8 +115,8 @@ BOOST_AUTO_TEST_CASE(util_ParseParameters)
     // -a, -b and -ccc end up in map, -d ignored because it is after
     // a non-option argument (non-GNU option parsing)
     BOOST_CHECK(mapArgs.size() == 3 && mapMultiArgs.size() == 3);
-    BOOST_CHECK(mapArgs.count("-a") && mapArgs.count("-b") && mapArgs.count("-ccc")
-                && !mapArgs.count("f") && !mapArgs.count("-d"));
+    BOOST_CHECK(IsArgSet("-a") && IsArgSet("-b") && IsArgSet("-ccc")
+                && !IsArgSet("f") && !IsArgSet("-d"));
     BOOST_CHECK(mapMultiArgs.count("-a") && mapMultiArgs.count("-b") && mapMultiArgs.count("-ccc")
                 && !mapMultiArgs.count("f") && !mapMultiArgs.count("-d"));
 
diff --git a/src/util.cpp b/src/util.cpp
index 6625ac9325626..cef3e97c28c1c 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -379,6 +379,11 @@ void ParseParameters(int argc, const char* const argv[])
     }
 }
 
+bool IsArgSet(const std::string& strArg)
+{
+    return mapArgs.count(strArg);
+}
+
 std::string GetArg(const std::string& strArg, const std::string& strDefault)
 {
     if (mapArgs.count(strArg))
@@ -498,7 +503,7 @@ const boost::filesystem::path &GetDataDir(bool fNetSpecific)
     if (!path.empty())
         return path;
 
-    if (mapArgs.count("-datadir")) {
+    if (IsArgSet("-datadir")) {
         path = fs::system_complete(mapArgs["-datadir"]);
         if (!fs::is_directory(path)) {
             path = "";
diff --git a/src/util.h b/src/util.h
index 5d1d80d2df2e9..aff4c3271f7b5 100644
--- a/src/util.h
+++ b/src/util.h
@@ -123,6 +123,14 @@ inline bool IsSwitchChar(char c)
 #endif
 }
 
+/**
+ * Return true if the given argument has been manually set
+ *
+ * @param strArg Argument to get (e.g. "-foo")
+ * @return true if the argument has been set
+ */
+bool IsArgSet(const std::string& strArg);
+
 /**
  * Return string argument or default value
  *
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index 1261aad3f250c..51423f88e8238 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -3494,7 +3494,7 @@ bool CWallet::InitLoadWallet()
 
         walletInstance->SetBestChain(chainActive.GetLocator());
     }
-    else if (mapArgs.count("-usehd")) {
+    else if (IsArgSet("-usehd")) {
         bool useHD = GetBoolArg("-usehd", DEFAULT_USE_HD_WALLET);
         if (walletInstance->IsHDEnabled() && !useHD)
             return InitError(strprintf(_("Error loading %s: You can't disable HD on a already existing HD wallet"), walletFile));
@@ -3618,7 +3618,7 @@ bool CWallet::ParameterInteraction()
         InitWarning(AmountHighWarn("-minrelaytxfee") + " " +
                     _("The wallet will avoid paying less than the minimum relay fee."));
 
-    if (mapArgs.count("-mintxfee"))
+    if (IsArgSet("-mintxfee"))
     {
         CAmount n = 0;
         if (!ParseMoney(mapArgs["-mintxfee"], n) || 0 == n)
@@ -3628,7 +3628,7 @@ bool CWallet::ParameterInteraction()
                         _("This is the minimum transaction fee you pay on every transaction."));
         CWallet::minTxFee = CFeeRate(n);
     }
-    if (mapArgs.count("-fallbackfee"))
+    if (IsArgSet("-fallbackfee"))
     {
         CAmount nFeePerK = 0;
         if (!ParseMoney(mapArgs["-fallbackfee"], nFeePerK))
@@ -3638,7 +3638,7 @@ bool CWallet::ParameterInteraction()
                         _("This is the transaction fee you may pay when fee estimates are not available."));
         CWallet::fallbackFee = CFeeRate(nFeePerK);
     }
-    if (mapArgs.count("-paytxfee"))
+    if (IsArgSet("-paytxfee"))
     {
         CAmount nFeePerK = 0;
         if (!ParseMoney(mapArgs["-paytxfee"], nFeePerK))
@@ -3654,7 +3654,7 @@ bool CWallet::ParameterInteraction()
                                        mapArgs["-paytxfee"], ::minRelayTxFee.ToString()));
         }
     }
-    if (mapArgs.count("-maxtxfee"))
+    if (IsArgSet("-maxtxfee"))
     {
         CAmount nMaxFee = 0;
         if (!ParseMoney(mapArgs["-maxtxfee"], nMaxFee))

From 71fde5563b5d05a63e3ad08a3c32a9e5ffb952f7 Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Tue, 29 Nov 2016 18:43:29 -0800
Subject: [PATCH 1415/1802] Get rid of mapArgs direct access in ZMQ
 construction

---
 src/init.cpp                         | 2 +-
 src/zmq/zmqnotificationinterface.cpp | 8 ++++----
 src/zmq/zmqnotificationinterface.h   | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/init.cpp b/src/init.cpp
index 778d66fba840a..76ef08da39c98 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -1282,7 +1282,7 @@ bool AppInitMain(boost::thread_group& threadGroup, CScheduler& scheduler)
     }
 
 #if ENABLE_ZMQ
-    pzmqNotificationInterface = CZMQNotificationInterface::CreateWithArguments(mapArgs);
+    pzmqNotificationInterface = CZMQNotificationInterface::Create();
 
     if (pzmqNotificationInterface) {
         RegisterValidationInterface(pzmqNotificationInterface);
diff --git a/src/zmq/zmqnotificationinterface.cpp b/src/zmq/zmqnotificationinterface.cpp
index a7e20a8356192..2f5efcb4db429 100644
--- a/src/zmq/zmqnotificationinterface.cpp
+++ b/src/zmq/zmqnotificationinterface.cpp
@@ -29,7 +29,7 @@ CZMQNotificationInterface::~CZMQNotificationInterface()
     }
 }
 
-CZMQNotificationInterface* CZMQNotificationInterface::CreateWithArguments(const std::map<std::string, std::string> &args)
+CZMQNotificationInterface* CZMQNotificationInterface::Create()
 {
     CZMQNotificationInterface* notificationInterface = NULL;
     std::map<std::string, CZMQNotifierFactory> factories;
@@ -42,11 +42,11 @@ CZMQNotificationInterface* CZMQNotificationInterface::CreateWithArguments(const
 
     for (std::map<std::string, CZMQNotifierFactory>::const_iterator i=factories.begin(); i!=factories.end(); ++i)
     {
-        std::map<std::string, std::string>::const_iterator j = args.find("-zmq" + i->first);
-        if (j!=args.end())
+        std::string arg("-zmq" + i->first);
+        if (IsArgSet(arg))
         {
             CZMQNotifierFactory factory = i->second;
-            std::string address = j->second;
+            std::string address = GetArg(arg, "");
             CZMQAbstractNotifier *notifier = factory();
             notifier->SetType(i->first);
             notifier->SetAddress(address);
diff --git a/src/zmq/zmqnotificationinterface.h b/src/zmq/zmqnotificationinterface.h
index 037470ec17f9f..585554ccd255e 100644
--- a/src/zmq/zmqnotificationinterface.h
+++ b/src/zmq/zmqnotificationinterface.h
@@ -17,7 +17,7 @@ class CZMQNotificationInterface : public CValidationInterface
 public:
     virtual ~CZMQNotificationInterface();
 
-    static CZMQNotificationInterface* CreateWithArguments(const std::map<std::string, std::string> &args);
+    static CZMQNotificationInterface* Create();
 
 protected:
     bool Initialize();

From 4cd373aea8d20356727f7d65e0bc818beb6523dc Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Tue, 29 Nov 2016 18:45:24 -0800
Subject: [PATCH 1416/1802] Un-expose mapArgs from utils.h

---
 src/bitcoin-cli.cpp            |  6 +++---
 src/bitcoind.cpp               |  2 +-
 src/httprpc.cpp                |  4 ++--
 src/init.cpp                   |  4 ++--
 src/net_processing.cpp         |  2 +-
 src/qt/bitcoin.cpp             |  2 +-
 src/qt/optionsmodel.cpp        |  4 ++--
 src/qt/test/rpcnestedtests.cpp |  2 ++
 src/test/DoS_tests.cpp         |  1 +
 src/test/test_bitcoin.cpp      |  2 ++
 src/test/util_tests.cpp        |  2 ++
 src/util.cpp                   |  2 +-
 src/util.h                     |  1 -
 src/wallet/wallet.cpp          | 20 ++++++++++----------
 14 files changed, 30 insertions(+), 24 deletions(-)

diff --git a/src/bitcoin-cli.cpp b/src/bitcoin-cli.cpp
index a4360dcd139a5..29d3cf67473e9 100644
--- a/src/bitcoin-cli.cpp
+++ b/src/bitcoin-cli.cpp
@@ -95,7 +95,7 @@ static int AppInitRPC(int argc, char* argv[])
         return EXIT_SUCCESS;
     }
     if (!boost::filesystem::is_directory(GetDataDir(false))) {
-        fprintf(stderr, "Error: Specified data directory \"%s\" does not exist.\n", mapArgs["-datadir"].c_str());
+        fprintf(stderr, "Error: Specified data directory \"%s\" does not exist.\n", GetArg("-datadir", "").c_str());
         return EXIT_FAILURE;
     }
     try {
@@ -211,7 +211,7 @@ UniValue CallRPC(const std::string& strMethod, const UniValue& params)
 
     // Get credentials
     std::string strRPCUserColonPass;
-    if (mapArgs["-rpcpassword"] == "") {
+    if (GetArg("-rpcpassword", "") == "") {
         // Try fall back to cookie-based authentication if no password is provided
         if (!GetAuthCookie(&strRPCUserColonPass)) {
             throw std::runtime_error(strprintf(
@@ -220,7 +220,7 @@ UniValue CallRPC(const std::string& strMethod, const UniValue& params)
 
         }
     } else {
-        strRPCUserColonPass = mapArgs["-rpcuser"] + ":" + mapArgs["-rpcpassword"];
+        strRPCUserColonPass = GetArg("-rpcuser", "") + ":" + GetArg("-rpcpassword", "");
     }
 
     struct evkeyvalq *output_headers = evhttp_request_get_output_headers(req);
diff --git a/src/bitcoind.cpp b/src/bitcoind.cpp
index ee27f412209c1..98551ee85032e 100644
--- a/src/bitcoind.cpp
+++ b/src/bitcoind.cpp
@@ -99,7 +99,7 @@ bool AppInit(int argc, char* argv[])
     {
         if (!boost::filesystem::is_directory(GetDataDir(false)))
         {
-            fprintf(stderr, "Error: Specified data directory \"%s\" does not exist.\n", mapArgs["-datadir"].c_str());
+            fprintf(stderr, "Error: Specified data directory \"%s\" does not exist.\n", GetArg("-datadir", "").c_str());
             return false;
         }
         try
diff --git a/src/httprpc.cpp b/src/httprpc.cpp
index 049a3f19a52ad..970ce2db73b7e 100644
--- a/src/httprpc.cpp
+++ b/src/httprpc.cpp
@@ -215,7 +215,7 @@ static bool HTTPReq_JSONRPC(HTTPRequest* req, const std::string &)
 
 static bool InitRPCAuthentication()
 {
-    if (mapArgs["-rpcpassword"] == "")
+    if (GetArg("-rpcpassword", "") == "")
     {
         LogPrintf("No rpcpassword set - using random cookie authentication\n");
         if (!GenerateAuthCookie(&strRPCUserColonPass)) {
@@ -226,7 +226,7 @@ static bool InitRPCAuthentication()
         }
     } else {
         LogPrintf("Config options rpcuser and rpcpassword will soon be deprecated. Locally-run instances may remove rpcuser to use cookie-based auth, or may be replaced with rpcauth. Please see share/rpcuser for rpcauth auth generation.\n");
-        strRPCUserColonPass = mapArgs["-rpcuser"] + ":" + mapArgs["-rpcpassword"];
+        strRPCUserColonPass = GetArg("-rpcuser", "") + ":" + GetArg("-rpcpassword", "");
     }
     return true;
 }
diff --git a/src/init.cpp b/src/init.cpp
index 76ef08da39c98..7d2bcb57b1b16 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -962,8 +962,8 @@ bool AppInitParameterInteraction()
     if (IsArgSet("-minrelaytxfee"))
     {
         CAmount n = 0;
-        if (!ParseMoney(mapArgs["-minrelaytxfee"], n) || 0 == n)
-            return InitError(AmountErrMsg("minrelaytxfee", mapArgs["-minrelaytxfee"]));
+        if (!ParseMoney(GetArg("-minrelaytxfee", ""), n) || 0 == n)
+            return InitError(AmountErrMsg("minrelaytxfee", GetArg("-minrelaytxfee", "")));
         // High fee check is done afterward in CWallet::ParameterInteraction()
         ::minRelayTxFee = CFeeRate(n);
     }
diff --git a/src/net_processing.cpp b/src/net_processing.cpp
index 98872200ddf5c..6282849ed1867 100644
--- a/src/net_processing.cpp
+++ b/src/net_processing.cpp
@@ -1060,7 +1060,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
     unsigned int nMaxSendBufferSize = connman.GetSendBufferSize();
 
     LogPrint("net", "received: %s (%u bytes) peer=%d\n", SanitizeString(strCommand), vRecv.size(), pfrom->id);
-    if (IsArgSet("-dropmessagestest") && GetRand(atoi(mapArgs["-dropmessagestest"])) == 0)
+    if (IsArgSet("-dropmessagestest") && GetRand(GetArg("-dropmessagestest", 0)) == 0)
     {
         LogPrintf("dropmessagestest DROPPING RECV MESSAGE\n");
         return true;
diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp
index 9d80a38008353..36d803ce07afb 100644
--- a/src/qt/bitcoin.cpp
+++ b/src/qt/bitcoin.cpp
@@ -604,7 +604,7 @@ int main(int argc, char *argv[])
     if (!boost::filesystem::is_directory(GetDataDir(false)))
     {
         QMessageBox::critical(0, QObject::tr(PACKAGE_NAME),
-                              QObject::tr("Error: Specified data directory \"%1\" does not exist.").arg(QString::fromStdString(mapArgs["-datadir"])));
+                              QObject::tr("Error: Specified data directory \"%1\" does not exist.").arg(QString::fromStdString(GetArg("-datadir", ""))));
         return EXIT_FAILURE;
     }
     try {
diff --git a/src/qt/optionsmodel.cpp b/src/qt/optionsmodel.cpp
index d48c4d91e78b7..ce3a040109e15 100644
--- a/src/qt/optionsmodel.cpp
+++ b/src/qt/optionsmodel.cpp
@@ -36,7 +36,7 @@ OptionsModel::OptionsModel(QObject *parent, bool resetSettings) :
 
 void OptionsModel::addOverriddenOption(const std::string &option)
 {
-    strOverriddenByCommandLine += QString::fromStdString(option) + "=" + QString::fromStdString(mapArgs[option]) + " ";
+    strOverriddenByCommandLine += QString::fromStdString(option) + "=" + QString::fromStdString(GetArg(option, "")) + " ";
 }
 
 // Writes all missing QSettings with their default values
@@ -464,4 +464,4 @@ void OptionsModel::checkAndMigrate()
 
         settings.setValue(strSettingsVersionKey, CLIENT_VERSION);
     }
-}
\ No newline at end of file
+}
diff --git a/src/qt/test/rpcnestedtests.cpp b/src/qt/test/rpcnestedtests.cpp
index 26ac5e21147a4..972dad72d04a2 100644
--- a/src/qt/test/rpcnestedtests.cpp
+++ b/src/qt/test/rpcnestedtests.cpp
@@ -19,6 +19,8 @@
 
 #include <boost/filesystem.hpp>
 
+extern std::map<std::string, std::string> mapArgs;
+
 static UniValue rpcNestedTest_rpc(const JSONRPCRequest& request)
 {
     if (request.fHelp) {
diff --git a/src/test/DoS_tests.cpp b/src/test/DoS_tests.cpp
index 131d667e0b346..dafb096e80752 100644
--- a/src/test/DoS_tests.cpp
+++ b/src/test/DoS_tests.cpp
@@ -32,6 +32,7 @@ struct COrphanTx {
     int64_t nTimeExpire;
 };
 extern std::map<uint256, COrphanTx> mapOrphanTransactions;
+extern std::map<std::string, std::string> mapArgs;
 
 CService ip(uint32_t i)
 {
diff --git a/src/test/test_bitcoin.cpp b/src/test/test_bitcoin.cpp
index 2a5a78de02567..b62b317105668 100644
--- a/src/test/test_bitcoin.cpp
+++ b/src/test/test_bitcoin.cpp
@@ -33,6 +33,8 @@
 std::unique_ptr<CConnman> g_connman;
 FastRandomContext insecure_rand_ctx(true);
 
+extern std::map<std::string, std::string> mapArgs;
+
 extern bool fPrintToConsole;
 extern void noui_connect();
 
diff --git a/src/test/util_tests.cpp b/src/test/util_tests.cpp
index 6ce065b377171..b2f601613fbd4 100644
--- a/src/test/util_tests.cpp
+++ b/src/test/util_tests.cpp
@@ -19,6 +19,8 @@
 
 using namespace std;
 
+extern map<string, string> mapArgs;
+
 BOOST_FIXTURE_TEST_SUITE(util_tests, BasicTestingSetup)
 
 BOOST_AUTO_TEST_CASE(util_criticalsection)
diff --git a/src/util.cpp b/src/util.cpp
index cef3e97c28c1c..0a5a899997279 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -504,7 +504,7 @@ const boost::filesystem::path &GetDataDir(bool fNetSpecific)
         return path;
 
     if (IsArgSet("-datadir")) {
-        path = fs::system_complete(mapArgs["-datadir"]);
+        path = fs::system_complete(GetArg("-datadir", ""));
         if (!fs::is_directory(path)) {
             path = "";
             return path;
diff --git a/src/util.h b/src/util.h
index aff4c3271f7b5..88f8bb1beb83a 100644
--- a/src/util.h
+++ b/src/util.h
@@ -41,7 +41,6 @@ class CTranslationInterface
     boost::signals2::signal<std::string (const char* psz)> Translate;
 };
 
-extern std::map<std::string, std::string> mapArgs;
 extern const std::map<std::string, std::vector<std::string> >& mapMultiArgs;
 extern bool fDebug;
 extern bool fPrintToConsole;
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index 51423f88e8238..543cfd685e7f5 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -3621,8 +3621,8 @@ bool CWallet::ParameterInteraction()
     if (IsArgSet("-mintxfee"))
     {
         CAmount n = 0;
-        if (!ParseMoney(mapArgs["-mintxfee"], n) || 0 == n)
-            return InitError(AmountErrMsg("mintxfee", mapArgs["-mintxfee"]));
+        if (!ParseMoney(GetArg("-mintxfee", ""), n) || 0 == n)
+            return InitError(AmountErrMsg("mintxfee", GetArg("-mintxfee", "")));
         if (n > HIGH_TX_FEE_PER_KB)
             InitWarning(AmountHighWarn("-mintxfee") + " " +
                         _("This is the minimum transaction fee you pay on every transaction."));
@@ -3631,8 +3631,8 @@ bool CWallet::ParameterInteraction()
     if (IsArgSet("-fallbackfee"))
     {
         CAmount nFeePerK = 0;
-        if (!ParseMoney(mapArgs["-fallbackfee"], nFeePerK))
-            return InitError(strprintf(_("Invalid amount for -fallbackfee=<amount>: '%s'"), mapArgs["-fallbackfee"]));
+        if (!ParseMoney(GetArg("-fallbackfee", ""), nFeePerK))
+            return InitError(strprintf(_("Invalid amount for -fallbackfee=<amount>: '%s'"), GetArg("-fallbackfee", "")));
         if (nFeePerK > HIGH_TX_FEE_PER_KB)
             InitWarning(AmountHighWarn("-fallbackfee") + " " +
                         _("This is the transaction fee you may pay when fee estimates are not available."));
@@ -3641,8 +3641,8 @@ bool CWallet::ParameterInteraction()
     if (IsArgSet("-paytxfee"))
     {
         CAmount nFeePerK = 0;
-        if (!ParseMoney(mapArgs["-paytxfee"], nFeePerK))
-            return InitError(AmountErrMsg("paytxfee", mapArgs["-paytxfee"]));
+        if (!ParseMoney(GetArg("-paytxfee", ""), nFeePerK))
+            return InitError(AmountErrMsg("paytxfee", GetArg("-paytxfee", "")));
         if (nFeePerK > HIGH_TX_FEE_PER_KB)
             InitWarning(AmountHighWarn("-paytxfee") + " " +
                         _("This is the transaction fee you will pay if you send a transaction."));
@@ -3651,21 +3651,21 @@ bool CWallet::ParameterInteraction()
         if (payTxFee < ::minRelayTxFee)
         {
             return InitError(strprintf(_("Invalid amount for -paytxfee=<amount>: '%s' (must be at least %s)"),
-                                       mapArgs["-paytxfee"], ::minRelayTxFee.ToString()));
+                                       GetArg("-paytxfee", ""), ::minRelayTxFee.ToString()));
         }
     }
     if (IsArgSet("-maxtxfee"))
     {
         CAmount nMaxFee = 0;
-        if (!ParseMoney(mapArgs["-maxtxfee"], nMaxFee))
-            return InitError(AmountErrMsg("maxtxfee", mapArgs["-maxtxfee"]));
+        if (!ParseMoney(GetArg("-maxtxfee", ""), nMaxFee))
+            return InitError(AmountErrMsg("maxtxfee", GetArg("-maxtxfee", "")));
         if (nMaxFee > HIGH_MAX_TX_FEE)
             InitWarning(_("-maxtxfee is set very high! Fees this large could be paid on a single transaction."));
         maxTxFee = nMaxFee;
         if (CFeeRate(maxTxFee, 1000) < ::minRelayTxFee)
         {
             return InitError(strprintf(_("Invalid amount for -maxtxfee=<amount>: '%s' (must be at least the minrelay fee of %s to prevent stuck transactions)"),
-                                       mapArgs["-maxtxfee"], ::minRelayTxFee.ToString()));
+                                       GetArg("-maxtxfee", ""), ::minRelayTxFee.ToString()));
         }
     }
     nTxConfirmTarget = GetArg("-txconfirmtarget", DEFAULT_TX_CONFIRM_TARGET);

From 4e048142a5e45d622355dad92ade192ad4769ca3 Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Tue, 29 Nov 2016 18:52:44 -0800
Subject: [PATCH 1417/1802] Lock mapArgs/mapMultiArgs access in util

---
 src/util.cpp | 34 +++++++++++++++++++++++-----------
 1 file changed, 23 insertions(+), 11 deletions(-)

diff --git a/src/util.cpp b/src/util.cpp
index 0a5a899997279..e3697183da713 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -102,6 +102,7 @@ using namespace std;
 const char * const BITCOIN_CONF_FILENAME = "bitcoin.conf";
 const char * const BITCOIN_PID_FILENAME = "bitcoind.pid";
 
+CCriticalSection cs_args;
 map<string, string> mapArgs;
 static map<string, vector<string> > _mapMultiArgs;
 const map<string, vector<string> >& mapMultiArgs = _mapMultiArgs;
@@ -346,6 +347,7 @@ static void InterpretNegativeSetting(std::string& strKey, std::string& strValue)
 
 void ParseParameters(int argc, const char* const argv[])
 {
+    LOCK(cs_args);
     mapArgs.clear();
     _mapMultiArgs.clear();
 
@@ -381,11 +383,13 @@ void ParseParameters(int argc, const char* const argv[])
 
 bool IsArgSet(const std::string& strArg)
 {
+    LOCK(cs_args);
     return mapArgs.count(strArg);
 }
 
 std::string GetArg(const std::string& strArg, const std::string& strDefault)
 {
+    LOCK(cs_args);
     if (mapArgs.count(strArg))
         return mapArgs[strArg];
     return strDefault;
@@ -393,6 +397,7 @@ std::string GetArg(const std::string& strArg, const std::string& strDefault)
 
 int64_t GetArg(const std::string& strArg, int64_t nDefault)
 {
+    LOCK(cs_args);
     if (mapArgs.count(strArg))
         return atoi64(mapArgs[strArg]);
     return nDefault;
@@ -400,6 +405,7 @@ int64_t GetArg(const std::string& strArg, int64_t nDefault)
 
 bool GetBoolArg(const std::string& strArg, bool fDefault)
 {
+    LOCK(cs_args);
     if (mapArgs.count(strArg))
         return InterpretBool(mapArgs[strArg]);
     return fDefault;
@@ -407,6 +413,7 @@ bool GetBoolArg(const std::string& strArg, bool fDefault)
 
 bool SoftSetArg(const std::string& strArg, const std::string& strValue)
 {
+    LOCK(cs_args);
     if (mapArgs.count(strArg))
         return false;
     mapArgs[strArg] = strValue;
@@ -522,6 +529,8 @@ const boost::filesystem::path &GetDataDir(bool fNetSpecific)
 
 void ClearDatadirCache()
 {
+    LOCK(csPathCached);
+
     pathCached = boost::filesystem::path();
     pathCachedNetSpecific = boost::filesystem::path();
 }
@@ -541,18 +550,21 @@ void ReadConfigFile(const std::string& confPath)
     if (!streamConfig.good())
         return; // No bitcoin.conf file is OK
 
-    set<string> setOptions;
-    setOptions.insert("*");
-
-    for (boost::program_options::detail::config_file_iterator it(streamConfig, setOptions), end; it != end; ++it)
     {
-        // Don't overwrite existing settings so command line settings override bitcoin.conf
-        string strKey = string("-") + it->string_key;
-        string strValue = it->value[0];
-        InterpretNegativeSetting(strKey, strValue);
-        if (mapArgs.count(strKey) == 0)
-            mapArgs[strKey] = strValue;
-        _mapMultiArgs[strKey].push_back(strValue);
+        LOCK(cs_args);
+        set<string> setOptions;
+        setOptions.insert("*");
+
+        for (boost::program_options::detail::config_file_iterator it(streamConfig, setOptions), end; it != end; ++it)
+        {
+            // Don't overwrite existing settings so command line settings override bitcoin.conf
+            string strKey = string("-") + it->string_key;
+            string strValue = it->value[0];
+            InterpretNegativeSetting(strKey, strValue);
+            if (mapArgs.count(strKey) == 0)
+                mapArgs[strKey] = strValue;
+            _mapMultiArgs[strKey].push_back(strValue);
+        }
     }
     // If datadir is changed in .conf file:
     ClearDatadirCache();

From 680b0c0138243c1e48c09a891a926b778388b587 Mon Sep 17 00:00:00 2001
From: Suhas Daftuar <sdaftuar@chaincode.com>
Date: Tue, 22 Nov 2016 17:36:16 -0500
Subject: [PATCH 1418/1802] Release cs_main before calling ProcessNewBlock
 (cmpctblock handling)

---
 src/net_processing.cpp | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/net_processing.cpp b/src/net_processing.cpp
index 87d367c2fbcb3..8a2c35cf3f137 100644
--- a/src/net_processing.cpp
+++ b/src/net_processing.cpp
@@ -1782,11 +1782,19 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
             }
         }
 
+        // When we succeed in decoding a block's txids from a cmpctblock
+        // message we typically jump to the BLOCKTXN handling code, with a
+        // dummy (empty) BLOCKTXN message, to re-use the logic there in
+        // completing processing of the putative block (without cs_main).
+        bool fProcessBLOCKTXN = false;
+        CDataStream blockTxnMsg(SER_NETWORK, PROTOCOL_VERSION);
+
         // Keep a CBlock for "optimistic" compactblock reconstructions (see
         // below)
         std::shared_ptr<CBlock> pblock = std::make_shared<CBlock>();
         bool fBlockReconstructed = false;
 
+        {
         LOCK(cs_main);
         // If AcceptBlockHeader returned true, it set pindex
         assert(pindex);
@@ -1868,9 +1876,8 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
                     // Dirty hack to jump to BLOCKTXN code (TODO: move message handling into their own functions)
                     BlockTransactions txn;
                     txn.blockhash = cmpctblock.header.GetHash();
-                    CDataStream blockTxnMsg(SER_NETWORK, PROTOCOL_VERSION);
                     blockTxnMsg << txn;
-                    return ProcessMessage(pfrom, NetMsgType::BLOCKTXN, blockTxnMsg, nTimeReceived, chainparams, connman);
+                    fProcessBLOCKTXN = true;
                 } else {
                     req.blockhash = pindex->GetBlockHash();
                     connman.PushMessage(pfrom, msgMaker.Make(NetMsgType::GETBLOCKTXN, req));
@@ -1911,6 +1918,10 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
                 return ProcessMessage(pfrom, NetMsgType::HEADERS, vHeadersMsg, nTimeReceived, chainparams, connman);
             }
         }
+        } // cs_main
+
+        if (fProcessBLOCKTXN)
+            return ProcessMessage(pfrom, NetMsgType::BLOCKTXN, blockTxnMsg, nTimeReceived, chainparams, connman);
 
         if (fBlockReconstructed) {
             // If we got here, we were able to optimistically reconstruct a

From bd02bddb938fa7ddf4e5dc7c3ce2a787feba848a Mon Sep 17 00:00:00 2001
From: Suhas Daftuar <sdaftuar@gmail.com>
Date: Thu, 1 Dec 2016 10:27:12 -0500
Subject: [PATCH 1419/1802] Release cs_main before processing cmpctblock as
 header

---
 src/net_processing.cpp | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/net_processing.cpp b/src/net_processing.cpp
index 8a2c35cf3f137..166786333680b 100644
--- a/src/net_processing.cpp
+++ b/src/net_processing.cpp
@@ -1789,6 +1789,11 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
         bool fProcessBLOCKTXN = false;
         CDataStream blockTxnMsg(SER_NETWORK, PROTOCOL_VERSION);
 
+        // If we end up treating this as a plain headers message, call that as well
+        // without cs_main.
+        bool fRevertToHeaderProcessing = false;
+        CDataStream vHeadersMsg(SER_NETWORK, PROTOCOL_VERSION);
+
         // Keep a CBlock for "optimistic" compactblock reconstructions (see
         // below)
         std::shared_ptr<CBlock> pblock = std::make_shared<CBlock>();
@@ -1913,9 +1918,8 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
                 // Dirty hack to process as if it were just a headers message (TODO: move message handling into their own functions)
                 std::vector<CBlock> headers;
                 headers.push_back(cmpctblock.header);
-                CDataStream vHeadersMsg(SER_NETWORK, PROTOCOL_VERSION);
                 vHeadersMsg << headers;
-                return ProcessMessage(pfrom, NetMsgType::HEADERS, vHeadersMsg, nTimeReceived, chainparams, connman);
+                fRevertToHeaderProcessing = true;
             }
         }
         } // cs_main
@@ -1923,6 +1927,9 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
         if (fProcessBLOCKTXN)
             return ProcessMessage(pfrom, NetMsgType::BLOCKTXN, blockTxnMsg, nTimeReceived, chainparams, connman);
 
+        if (fRevertToHeaderProcessing)
+            return ProcessMessage(pfrom, NetMsgType::HEADERS, vHeadersMsg, nTimeReceived, chainparams, connman);
+
         if (fBlockReconstructed) {
             // If we got here, we were able to optimistically reconstruct a
             // block that is in flight from some other peer.

From 35356b40ef449e725cf09ecb86809598a8f48d7f Mon Sep 17 00:00:00 2001
From: Russell Yanofsky <russ@yanofsky.org>
Date: Tue, 27 Dec 2016 07:35:39 -0500
Subject: [PATCH 1420/1802] Remove unused variable in test, fixing warning.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Pointed out by Pavel Janík <Pavel@Janik.cz> in
https://github.com/bitcoin/bitcoin/pull/9308.
---
 src/test/coins_tests.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/test/coins_tests.cpp b/src/test/coins_tests.cpp
index f0e74a55d24aa..09fe0bf158881 100644
--- a/src/test/coins_tests.cpp
+++ b/src/test/coins_tests.cpp
@@ -429,7 +429,6 @@ const static char NO_ENTRY = -1;
 
 const static auto FLAGS = {char(0), FRESH, DIRTY, char(DIRTY | FRESH)};
 const static auto CLEAN_FLAGS = {char(0), FRESH};
-const static auto DIRTY_FLAGS = {DIRTY, char(DIRTY | FRESH)};
 const static auto ABSENT_FLAGS = {NO_ENTRY};
 
 void SetCoinsValue(CAmount value, CCoins& coins)

From c2f61bebb190258753714b29ab2041e80651cec9 Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Sat, 24 Dec 2016 11:28:44 -0500
Subject: [PATCH 1421/1802] Add a ForceSetArg method for testing

---
 src/qt/test/rpcnestedtests.cpp | 4 +---
 src/test/DoS_tests.cpp         | 6 +++---
 src/test/test_bitcoin.cpp      | 4 +---
 src/util.cpp                   | 8 ++++++++
 src/util.h                     | 3 +++
 5 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/src/qt/test/rpcnestedtests.cpp b/src/qt/test/rpcnestedtests.cpp
index 972dad72d04a2..fb044489d727b 100644
--- a/src/qt/test/rpcnestedtests.cpp
+++ b/src/qt/test/rpcnestedtests.cpp
@@ -19,8 +19,6 @@
 
 #include <boost/filesystem.hpp>
 
-extern std::map<std::string, std::string> mapArgs;
-
 static UniValue rpcNestedTest_rpc(const JSONRPCRequest& request)
 {
     if (request.fHelp) {
@@ -47,7 +45,7 @@ void RPCNestedTests::rpcNestedTests()
     std::string path = QDir::tempPath().toStdString() + "/" + strprintf("test_bitcoin_qt_%lu_%i", (unsigned long)GetTime(), (int)(GetRand(100000)));
     QDir dir(QString::fromStdString(path));
     dir.mkpath(".");
-    mapArgs["-datadir"] = path;
+    ForceSetArg("-datadir", path);
     //mempool.setSanityCheck(1.0);
     pblocktree = new CBlockTreeDB(1 << 20, true);
     pcoinsdbview = new CCoinsViewDB(1 << 23, true);
diff --git a/src/test/DoS_tests.cpp b/src/test/DoS_tests.cpp
index dafb096e80752..d90dcaeb0211e 100644
--- a/src/test/DoS_tests.cpp
+++ b/src/test/DoS_tests.cpp
@@ -12,6 +12,7 @@
 #include "script/sign.h"
 #include "serialize.h"
 #include "util.h"
+#include "validation.h"
 
 #include "test/test_bitcoin.h"
 
@@ -32,7 +33,6 @@ struct COrphanTx {
     int64_t nTimeExpire;
 };
 extern std::map<uint256, COrphanTx> mapOrphanTransactions;
-extern std::map<std::string, std::string> mapArgs;
 
 CService ip(uint32_t i)
 {
@@ -75,7 +75,7 @@ BOOST_AUTO_TEST_CASE(DoS_banning)
 BOOST_AUTO_TEST_CASE(DoS_banscore)
 {
     connman->ClearBanned();
-    mapArgs["-banscore"] = "111"; // because 11 is my favorite number
+    ForceSetArg("-banscore", "111"); // because 11 is my favorite number
     CAddress addr1(ip(0xa0b0c001), NODE_NONE);
     CNode dummyNode1(id++, NODE_NETWORK, 0, INVALID_SOCKET, addr1, 3, 1, "", true);
     dummyNode1.SetSendVersion(PROTOCOL_VERSION);
@@ -90,7 +90,7 @@ BOOST_AUTO_TEST_CASE(DoS_banscore)
     Misbehaving(dummyNode1.GetId(), 1);
     SendMessages(&dummyNode1, *connman);
     BOOST_CHECK(connman->IsBanned(addr1));
-    mapArgs.erase("-banscore");
+    ForceSetArg("-banscore", std::to_string(DEFAULT_BANSCORE_THRESHOLD));
 }
 
 BOOST_AUTO_TEST_CASE(DoS_bantime)
diff --git a/src/test/test_bitcoin.cpp b/src/test/test_bitcoin.cpp
index b62b317105668..5c4ef5eb8c70e 100644
--- a/src/test/test_bitcoin.cpp
+++ b/src/test/test_bitcoin.cpp
@@ -33,8 +33,6 @@
 std::unique_ptr<CConnman> g_connman;
 FastRandomContext insecure_rand_ctx(true);
 
-extern std::map<std::string, std::string> mapArgs;
-
 extern bool fPrintToConsole;
 extern void noui_connect();
 
@@ -66,7 +64,7 @@ TestingSetup::TestingSetup(const std::string& chainName) : BasicTestingSetup(cha
         ClearDatadirCache();
         pathTemp = GetTempPath() / strprintf("test_bitcoin_%lu_%i", (unsigned long)GetTime(), (int)(GetRand(100000)));
         boost::filesystem::create_directories(pathTemp);
-        mapArgs["-datadir"] = pathTemp.string();
+        ForceSetArg("-datadir", pathTemp.string());
         mempool.setSanityCheck(1.0);
         pblocktree = new CBlockTreeDB(1 << 20, true);
         pcoinsdbview = new CCoinsViewDB(1 << 23, true);
diff --git a/src/util.cpp b/src/util.cpp
index e3697183da713..793b8f2dd1c93 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -428,6 +428,14 @@ bool SoftSetBoolArg(const std::string& strArg, bool fValue)
         return SoftSetArg(strArg, std::string("0"));
 }
 
+void ForceSetArg(const std::string& strArg, const std::string& strValue)
+{
+    LOCK(cs_args);
+    mapArgs[strArg] = strValue;
+}
+
+
+
 static const int screenWidth = 79;
 static const int optIndent = 2;
 static const int msgIndent = 7;
diff --git a/src/util.h b/src/util.h
index 88f8bb1beb83a..f030dbbb26e8d 100644
--- a/src/util.h
+++ b/src/util.h
@@ -175,6 +175,9 @@ bool SoftSetArg(const std::string& strArg, const std::string& strValue);
  */
 bool SoftSetBoolArg(const std::string& strArg, bool fValue);
 
+// Forces a arg setting, used only in testing
+void ForceSetArg(const std::string& strArg, const std::string& strValue);
+
 /**
  * Format a string to be used as group of options in help messages
  *

From fa558be2c19d3636d303a0c01045f22624dcbc8a Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Fri, 23 Dec 2016 15:07:12 +0100
Subject: [PATCH 1422/1802] test: Include tx data in EXTRA_DIST

---
 src/Makefile.test.include | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/src/Makefile.test.include b/src/Makefile.test.include
index 7a5bb07b6c500..c1971213a495b 100644
--- a/src/Makefile.test.include
+++ b/src/Makefile.test.include
@@ -13,6 +13,20 @@ EXTRA_DIST += \
 	test/bctest.py \
 	test/bitcoin-util-test.py \
 	test/data/bitcoin-util-test.json \
+	test/data/blanktxv1.json \
+	test/data/blanktxv2.json \
+	test/data/tt-delin1-out.json \
+	test/data/tt-delout1-out.json \
+	test/data/tt-locktime317000-out.json \
+	test/data/txcreate1.json \
+	test/data/txcreate2.json \
+	test/data/txcreatedata1.json \
+	test/data/txcreatedata2.json \
+	test/data/txcreatedata_seq0.json \
+	test/data/txcreatedata_seq1.json \
+	test/data/txcreatesignv1.json \
+	test/data/blanktxv1.hex \
+	test/data/blanktxv2.hex \
 	test/data/tt-delin1-out.hex \
 	test/data/tt-delout1-out.hex \
 	test/data/tt-locktime317000-out.hex \
@@ -22,6 +36,7 @@ EXTRA_DIST += \
 	test/data/txcreatedata1.hex \
 	test/data/txcreatedata2.hex \
 	test/data/txcreatesignv1.hex \
+	test/data/txcreatesignv2.hex \
 	test/data/txcreatedata_seq0.hex \
 	test/data/txcreatedata_seq1.hex
 

From e2b5c98cefc45a1404d4ec3230860f2e1c5df0c9 Mon Sep 17 00:00:00 2001
From: Douglas Roark <doug@bloq.com>
Date: Sat, 24 Dec 2016 12:27:39 -0800
Subject: [PATCH 1423/1802] Fix linker error when configured with --enable-lcov

---
 configure.ac | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/configure.ac b/configure.ac
index ced258e02e4cf..9d2817db43e0b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -414,6 +414,8 @@ if test x$use_lcov = xyes; then
     AC_MSG_ERROR("lcov testing requested but genhtml not found")
   fi
   LCOV="$LCOV --gcov-tool=$GCOV"
+  AX_CHECK_LINK_FLAG([[--coverage]], [LDFLAGS="$LDFLAGS --coverage"],
+    [AC_MSG_ERROR("lcov testing requested but --coverage linker flag does not work")])
   AX_CHECK_COMPILE_FLAG([--coverage],[CXXFLAGS="$CXXFLAGS --coverage"],
     [AC_MSG_ERROR("lcov testing requested but --coverage flag does not work")])
 fi

From fc95daa97f324f6a8b3643a3d3c5e8f909d46c35 Mon Sep 17 00:00:00 2001
From: Jonas Schnelli <jonas.schnelli@include7.ch>
Date: Fri, 13 Mar 2015 21:51:27 +0100
Subject: [PATCH 1424/1802] Qt/RPCConsole: Save current command entry when
 browsing history

Shell-like, but doesn't store changed history commands until executing it.
---
 src/qt/rpcconsole.cpp | 10 ++++++++++
 src/qt/rpcconsole.h   |  1 +
 2 files changed, 11 insertions(+)

diff --git a/src/qt/rpcconsole.cpp b/src/qt/rpcconsole.cpp
index cfe197de2a6f8..5610e8b6ca029 100644
--- a/src/qt/rpcconsole.cpp
+++ b/src/qt/rpcconsole.cpp
@@ -751,6 +751,8 @@ void RPCConsole::on_lineEdit_returnPressed()
 
     if(!cmd.isEmpty())
     {
+        cmdBeforeBrowsing = QString();
+
         message(CMD_REQUEST, cmd);
         Q_EMIT cmdRequest(cmd);
         // Remove command, if already in history
@@ -769,6 +771,11 @@ void RPCConsole::on_lineEdit_returnPressed()
 
 void RPCConsole::browseHistory(int offset)
 {
+    // store current text when start browsing through the history
+    if (historyPtr == history.size()) {
+        cmdBeforeBrowsing = ui->lineEdit->text();
+    }
+
     historyPtr += offset;
     if(historyPtr < 0)
         historyPtr = 0;
@@ -777,6 +784,9 @@ void RPCConsole::browseHistory(int offset)
     QString cmd;
     if(historyPtr < history.size())
         cmd = history.at(historyPtr);
+    else if (!cmdBeforeBrowsing.isNull()) {
+        cmd = cmdBeforeBrowsing;
+    }
     ui->lineEdit->setText(cmd);
 }
 
diff --git a/src/qt/rpcconsole.h b/src/qt/rpcconsole.h
index ab8c3dc9142fd..e1698711dae06 100644
--- a/src/qt/rpcconsole.h
+++ b/src/qt/rpcconsole.h
@@ -140,6 +140,7 @@ public Q_SLOTS:
     ClientModel *clientModel;
     QStringList history;
     int historyPtr;
+    QString cmdBeforeBrowsing;
     QList<NodeId> cachedNodeids;
     const PlatformStyle *platformStyle;
     RPCTimerInterface *rpcTimerInterface;

From 9044908636f0072d001d9a029053a384127b002b Mon Sep 17 00:00:00 2001
From: Jonas Schnelli <jonas.schnelli@include7.ch>
Date: Fri, 13 Mar 2015 21:51:27 +0100
Subject: [PATCH 1425/1802] Qt/RPCConsole: Don't store commands with
 potentially sensitive information in the history

Filters importprivkey, signrawtransaction, walletpassphrase, walletpassphrasechange, and encryptwallet
---
 src/qt/rpcconsole.cpp | 37 ++++++++++++++++++++++++++++---------
 src/qt/rpcconsole.h   |  1 +
 2 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/src/qt/rpcconsole.cpp b/src/qt/rpcconsole.cpp
index 5610e8b6ca029..562c9509da79c 100644
--- a/src/qt/rpcconsole.cpp
+++ b/src/qt/rpcconsole.cpp
@@ -63,6 +63,14 @@ const struct {
     {NULL, NULL}
 };
 
+// don't add private key handling cmd's to the history
+const QStringList RPCConsole::historyFilter = QStringList()
+    << "importprivkey"
+    << "signrawtransaction"
+    << "walletpassphrase"
+    << "walletpassphrasechange"
+    << "encryptwallet";
+
 /* Object for executing console RPC commands in a separate thread.
 */
 class RPCExecutor : public QObject
@@ -755,15 +763,26 @@ void RPCConsole::on_lineEdit_returnPressed()
 
         message(CMD_REQUEST, cmd);
         Q_EMIT cmdRequest(cmd);
-        // Remove command, if already in history
-        history.removeOne(cmd);
-        // Append command to history
-        history.append(cmd);
-        // Enforce maximum history size
-        while(history.size() > CONSOLE_HISTORY)
-            history.removeFirst();
-        // Set pointer to end of history
-        historyPtr = history.size();
+
+        bool storeHistory = true;
+        Q_FOREACH(QString unallowedCmd, historyFilter)
+        {
+            if (cmd.trimmed().startsWith(unallowedCmd))
+                storeHistory = false; break;
+        }
+
+        if (storeHistory)
+        {
+            // Remove command, if already in history
+            history.removeOne(cmd);
+            // Append command to history
+            history.append(cmd);
+            // Enforce maximum history size
+            while(history.size() > CONSOLE_HISTORY)
+                history.removeFirst();
+            // Set pointer to end of history
+            historyPtr = history.size();
+        }
         // Scroll console view to end
         scrollToEnd();
     }
diff --git a/src/qt/rpcconsole.h b/src/qt/rpcconsole.h
index e1698711dae06..4841ea825edf7 100644
--- a/src/qt/rpcconsole.h
+++ b/src/qt/rpcconsole.h
@@ -140,6 +140,7 @@ public Q_SLOTS:
     ClientModel *clientModel;
     QStringList history;
     int historyPtr;
+    const static QStringList historyFilter;
     QString cmdBeforeBrowsing;
     QList<NodeId> cachedNodeids;
     const PlatformStyle *platformStyle;

From de8980df9d3a1fc0b257139cef10a0e6ba29a8bd Mon Sep 17 00:00:00 2001
From: Luke Dashjr <luke-jr+git@utopios.org>
Date: Tue, 4 Oct 2016 04:11:01 +0000
Subject: [PATCH 1426/1802] Bugfix: Do not add sensitive information to history
 for real

Original code was missing braces, and short-circuited before checking everything after importprivkey
---
 src/qt/rpcconsole.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/qt/rpcconsole.cpp b/src/qt/rpcconsole.cpp
index 562c9509da79c..8aa3d10eb5ae0 100644
--- a/src/qt/rpcconsole.cpp
+++ b/src/qt/rpcconsole.cpp
@@ -768,7 +768,10 @@ void RPCConsole::on_lineEdit_returnPressed()
         Q_FOREACH(QString unallowedCmd, historyFilter)
         {
             if (cmd.trimmed().startsWith(unallowedCmd))
-                storeHistory = false; break;
+            {
+                storeHistory = false;
+                break;
+            }
         }
 
         if (storeHistory)

From afde12f265bbc4742b329c6adecc853cb68a7155 Mon Sep 17 00:00:00 2001
From: Luke Dashjr <luke-jr+git@utopios.org>
Date: Tue, 4 Oct 2016 04:17:27 +0000
Subject: [PATCH 1427/1802] Qt/RPCConsole: Refactor
 command_may_contain_sensitive_data function out of
 RPCConsole::on_lineEdit_returnPressed

---
 src/qt/rpcconsole.cpp | 26 ++++++++++++++++----------
 src/qt/rpcconsole.h   |  1 -
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/src/qt/rpcconsole.cpp b/src/qt/rpcconsole.cpp
index 8aa3d10eb5ae0..23a4a250782ce 100644
--- a/src/qt/rpcconsole.cpp
+++ b/src/qt/rpcconsole.cpp
@@ -63,14 +63,28 @@ const struct {
     {NULL, NULL}
 };
 
+namespace {
+
 // don't add private key handling cmd's to the history
-const QStringList RPCConsole::historyFilter = QStringList()
+const QStringList historyFilter = QStringList()
     << "importprivkey"
     << "signrawtransaction"
     << "walletpassphrase"
     << "walletpassphrasechange"
     << "encryptwallet";
 
+bool command_may_contain_sensitive_data(const QString cmd)
+{
+    Q_FOREACH(QString unallowedCmd, historyFilter) {
+        if (cmd.trimmed().startsWith(unallowedCmd)) {
+            return true;
+        }
+    }
+    return false;
+}
+
+}
+
 /* Object for executing console RPC commands in a separate thread.
 */
 class RPCExecutor : public QObject
@@ -764,15 +778,7 @@ void RPCConsole::on_lineEdit_returnPressed()
         message(CMD_REQUEST, cmd);
         Q_EMIT cmdRequest(cmd);
 
-        bool storeHistory = true;
-        Q_FOREACH(QString unallowedCmd, historyFilter)
-        {
-            if (cmd.trimmed().startsWith(unallowedCmd))
-            {
-                storeHistory = false;
-                break;
-            }
-        }
+        bool storeHistory = !command_may_contain_sensitive_data(cmd);
 
         if (storeHistory)
         {
diff --git a/src/qt/rpcconsole.h b/src/qt/rpcconsole.h
index 4841ea825edf7..e1698711dae06 100644
--- a/src/qt/rpcconsole.h
+++ b/src/qt/rpcconsole.h
@@ -140,7 +140,6 @@ public Q_SLOTS:
     ClientModel *clientModel;
     QStringList history;
     int historyPtr;
-    const static QStringList historyFilter;
     QString cmdBeforeBrowsing;
     QList<NodeId> cachedNodeids;
     const PlatformStyle *platformStyle;

From d80a00660f5b26ee16c60b941c2bbbd2d49e711f Mon Sep 17 00:00:00 2001
From: Luke Dashjr <luke-jr+git@utopios.org>
Date: Tue, 4 Oct 2016 14:07:50 +0000
Subject: [PATCH 1428/1802] Qt/RPCConsole: Add signmessagewithprivkey to list
 of commands filtered from history

---
 src/qt/rpcconsole.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/qt/rpcconsole.cpp b/src/qt/rpcconsole.cpp
index 23a4a250782ce..c979fdf87b60e 100644
--- a/src/qt/rpcconsole.cpp
+++ b/src/qt/rpcconsole.cpp
@@ -68,6 +68,7 @@ namespace {
 // don't add private key handling cmd's to the history
 const QStringList historyFilter = QStringList()
     << "importprivkey"
+    << "signmessagewithprivkey"
     << "signrawtransaction"
     << "walletpassphrase"
     << "walletpassphrasechange"

From 1755c04576eb42467ba16af9f2658e12b707b7d0 Mon Sep 17 00:00:00 2001
From: Luke Dashjr <luke-jr+git@utopios.org>
Date: Tue, 4 Oct 2016 15:43:10 +0000
Subject: [PATCH 1429/1802] Qt/RPCConsole: Truncate filtered commands to just
 the command name, rather than skip it entirely in history

---
 src/qt/rpcconsole.cpp | 30 ++++++++++++++----------------
 1 file changed, 14 insertions(+), 16 deletions(-)

diff --git a/src/qt/rpcconsole.cpp b/src/qt/rpcconsole.cpp
index c979fdf87b60e..c53ae53c6409e 100644
--- a/src/qt/rpcconsole.cpp
+++ b/src/qt/rpcconsole.cpp
@@ -74,14 +74,14 @@ const QStringList historyFilter = QStringList()
     << "walletpassphrasechange"
     << "encryptwallet";
 
-bool command_may_contain_sensitive_data(const QString cmd)
+QString command_filter_sensitive_data(const QString cmd)
 {
     Q_FOREACH(QString unallowedCmd, historyFilter) {
         if (cmd.trimmed().startsWith(unallowedCmd)) {
-            return true;
+            return unallowedCmd;
         }
     }
-    return false;
+    return cmd;
 }
 
 }
@@ -779,20 +779,18 @@ void RPCConsole::on_lineEdit_returnPressed()
         message(CMD_REQUEST, cmd);
         Q_EMIT cmdRequest(cmd);
 
-        bool storeHistory = !command_may_contain_sensitive_data(cmd);
+        cmd = command_filter_sensitive_data(cmd);
+
+        // Remove command, if already in history
+        history.removeOne(cmd);
+        // Append command to history
+        history.append(cmd);
+        // Enforce maximum history size
+        while(history.size() > CONSOLE_HISTORY)
+            history.removeFirst();
+        // Set pointer to end of history
+        historyPtr = history.size();
 
-        if (storeHistory)
-        {
-            // Remove command, if already in history
-            history.removeOne(cmd);
-            // Append command to history
-            history.append(cmd);
-            // Enforce maximum history size
-            while(history.size() > CONSOLE_HISTORY)
-                history.removeFirst();
-            // Set pointer to end of history
-            historyPtr = history.size();
-        }
         // Scroll console view to end
         scrollToEnd();
     }

From e2d9213c32e51fe197756709e24c6694f28bf842 Mon Sep 17 00:00:00 2001
From: Luke Dashjr <luke-jr+git@utopios.org>
Date: Wed, 16 Nov 2016 10:56:32 +0000
Subject: [PATCH 1430/1802] Qt/RPCConsole: Make it possible to parse a command
 without executing it

---
 src/qt/rpcconsole.cpp | 24 +++++++++++++-----------
 src/qt/rpcconsole.h   |  5 ++++-
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/src/qt/rpcconsole.cpp b/src/qt/rpcconsole.cpp
index c53ae53c6409e..f45383341608e 100644
--- a/src/qt/rpcconsole.cpp
+++ b/src/qt/rpcconsole.cpp
@@ -136,10 +136,10 @@ class QtRPCTimerInterface: public RPCTimerInterface
 #include "rpcconsole.moc"
 
 /**
- * Split shell command line into a list of arguments and execute the command(s).
+ * Split shell command line into a list of arguments and optionally execute the command(s).
  * Aims to emulate \c bash and friends.
  *
- * - Command nesting is possible with brackets [example: validateaddress(getnewaddress())]
+ * - Command nesting is possible with parenthesis; for example: validateaddress(getnewaddress())
  * - Arguments are delimited with whitespace or comma
  * - Extra whitespace at the beginning and end and between arguments will be ignored
  * - Text can be "double" or 'single' quoted
@@ -150,9 +150,10 @@ class QtRPCTimerInterface: public RPCTimerInterface
  *
  * @param[out]   result      stringified Result from the executed command(chain)
  * @param[in]    strCommand  Command line to split
+ * @param[in]    fExecute    set true if you want the command to be executed
  */
 
-bool RPCConsole::RPCExecuteCommandLine(std::string &strResult, const std::string &strCommand)
+bool RPCConsole::RPCParseCommandLine(std::string &strResult, const std::string &strCommand, const bool fExecute)
 {
     std::vector< std::vector<std::string> > stack;
     stack.push_back(std::vector<std::string>());
@@ -196,7 +197,7 @@ bool RPCConsole::RPCExecuteCommandLine(std::string &strResult, const std::string
                                 curarg += ch;
                                 break;
                             }
-                            if (curarg.size())
+                            if (curarg.size() && fExecute)
                             {
                                 // if we have a value query, query arrays with index and objects with a string key
                                 UniValue subelement;
@@ -271,13 +272,14 @@ bool RPCConsole::RPCExecuteCommandLine(std::string &strResult, const std::string
                     }
                     if ((ch == ')' || ch == '\n') && stack.size() > 0)
                     {
-                        std::string strPrint;
-                        // Convert argument list to JSON objects in method-dependent way,
-                        // and pass it along with the method name to the dispatcher.
-                        JSONRPCRequest req;
-                        req.params = RPCConvertValues(stack.back()[0], std::vector<std::string>(stack.back().begin() + 1, stack.back().end()));
-                        req.strMethod = stack.back()[0];
-                        lastResult = tableRPC.execute(req);
+                        if (fExecute) {
+                            // Convert argument list to JSON objects in method-dependent way,
+                            // and pass it along with the method name to the dispatcher.
+                            JSONRPCRequest req;
+                            req.params = RPCConvertValues(stack.back()[0], std::vector<std::string>(stack.back().begin() + 1, stack.back().end()));
+                            req.strMethod = stack.back()[0];
+                            lastResult = tableRPC.execute(req);
+                        }
 
                         state = STATE_COMMAND_EXECUTED;
                         curarg.clear();
diff --git a/src/qt/rpcconsole.h b/src/qt/rpcconsole.h
index e1698711dae06..9567341ae2603 100644
--- a/src/qt/rpcconsole.h
+++ b/src/qt/rpcconsole.h
@@ -36,7 +36,10 @@ class RPCConsole: public QWidget
     explicit RPCConsole(const PlatformStyle *platformStyle, QWidget *parent);
     ~RPCConsole();
 
-    static bool RPCExecuteCommandLine(std::string &strResult, const std::string &strCommand);
+    static bool RPCParseCommandLine(std::string &strResult, const std::string &strCommand, bool fExecute);
+    static bool RPCExecuteCommandLine(std::string &strResult, const std::string &strCommand) {
+        return RPCParseCommandLine(strResult, strCommand, true);
+    }
 
     void setClientModel(ClientModel *model);
 

From 629cd423644b1f6d180eb5eeb3fb8a204881db97 Mon Sep 17 00:00:00 2001
From: Luke Dashjr <luke-jr+git@utopios.org>
Date: Wed, 16 Nov 2016 11:36:21 +0000
Subject: [PATCH 1431/1802] Qt/RPCConsole: Teach RPCParseCommandLine how to
 filter out arguments to sensitive commands

---
 src/qt/rpcconsole.cpp | 32 ++++++++++++++++++++++++++++++--
 src/qt/rpcconsole.h   |  6 +++---
 2 files changed, 33 insertions(+), 5 deletions(-)

diff --git a/src/qt/rpcconsole.cpp b/src/qt/rpcconsole.cpp
index f45383341608e..63a23dc496372 100644
--- a/src/qt/rpcconsole.cpp
+++ b/src/qt/rpcconsole.cpp
@@ -151,9 +151,10 @@ class QtRPCTimerInterface: public RPCTimerInterface
  * @param[out]   result      stringified Result from the executed command(chain)
  * @param[in]    strCommand  Command line to split
  * @param[in]    fExecute    set true if you want the command to be executed
+ * @param[out]   pstrFilteredOut  Command line, filtered to remove any sensitive data
  */
 
-bool RPCConsole::RPCParseCommandLine(std::string &strResult, const std::string &strCommand, const bool fExecute)
+bool RPCConsole::RPCParseCommandLine(std::string &strResult, const std::string &strCommand, const bool fExecute, std::string * const pstrFilteredOut)
 {
     std::vector< std::vector<std::string> > stack;
     stack.push_back(std::vector<std::string>());
@@ -173,12 +174,16 @@ bool RPCConsole::RPCParseCommandLine(std::string &strResult, const std::string &
     } state = STATE_EATING_SPACES;
     std::string curarg;
     UniValue lastResult;
+    unsigned nDepthInsideSensitive = 0;
+    size_t filter_begin_pos = 0;
+    std::vector<std::pair<size_t, size_t>> filter_ranges;
 
     std::string strCommandTerminated = strCommand;
     if (strCommandTerminated.back() != '\n')
         strCommandTerminated += "\n";
-    for(char ch: strCommandTerminated)
+    for (size_t chpos = 0; chpos < strCommandTerminated.size(); ++chpos)
     {
+        char ch = strCommandTerminated[chpos];
         switch(state)
         {
             case STATE_COMMAND_EXECUTED_INNER:
@@ -222,6 +227,13 @@ bool RPCConsole::RPCParseCommandLine(std::string &strResult, const std::string &
                         breakParsing = false;
 
                         // pop the stack and return the result to the current command arguments
+                        if (nDepthInsideSensitive) {
+                            if (!--nDepthInsideSensitive) {
+                                assert(filter_begin_pos);
+                                filter_ranges.push_back(std::make_pair(filter_begin_pos, chpos));
+                                filter_begin_pos = 0;
+                            }
+                        }
                         stack.pop_back();
 
                         // don't stringify the json in case of a string to avoid doublequotes
@@ -260,7 +272,12 @@ bool RPCConsole::RPCParseCommandLine(std::string &strResult, const std::string &
                     if (state == STATE_ARGUMENT)
                     {
                         if (ch == '(' && stack.size() && stack.back().size() > 0)
+                        {
+                            if (nDepthInsideSensitive) {
+                                ++nDepthInsideSensitive;
+                            }
                             stack.push_back(std::vector<std::string>());
+                        }
 
                         // don't allow commands after executed commands on baselevel
                         if (!stack.size())
@@ -291,6 +308,11 @@ bool RPCConsole::RPCParseCommandLine(std::string &strResult, const std::string &
 
                     else if(state == STATE_ARGUMENT) // Space ends argument
                     {
+                        // This is the only place where the method name should get pushed (as the first stack item)
+                        if ((!nDepthInsideSensitive) && historyFilter.contains(QString::fromStdString(curarg), Qt::CaseInsensitive)) {
+                            nDepthInsideSensitive = 1;
+                            filter_begin_pos = chpos;
+                        }
                         stack.back().push_back(curarg);
                         curarg.clear();
                     }
@@ -328,6 +350,12 @@ bool RPCConsole::RPCParseCommandLine(std::string &strResult, const std::string &
                 break;
         }
     }
+    if (pstrFilteredOut) {
+        *pstrFilteredOut = strCommand;
+        for (auto i = filter_ranges.rbegin(); i != filter_ranges.rend(); ++i) {
+            pstrFilteredOut->replace(i->first, i->second - i->first, "...");
+        }
+    }
     switch(state) // final state
     {
         case STATE_COMMAND_EXECUTED:
diff --git a/src/qt/rpcconsole.h b/src/qt/rpcconsole.h
index 9567341ae2603..dfc1cc26d6776 100644
--- a/src/qt/rpcconsole.h
+++ b/src/qt/rpcconsole.h
@@ -36,9 +36,9 @@ class RPCConsole: public QWidget
     explicit RPCConsole(const PlatformStyle *platformStyle, QWidget *parent);
     ~RPCConsole();
 
-    static bool RPCParseCommandLine(std::string &strResult, const std::string &strCommand, bool fExecute);
-    static bool RPCExecuteCommandLine(std::string &strResult, const std::string &strCommand) {
-        return RPCParseCommandLine(strResult, strCommand, true);
+    static bool RPCParseCommandLine(std::string &strResult, const std::string &strCommand, bool fExecute, std::string * const pstrFilteredOut = NULL);
+    static bool RPCExecuteCommandLine(std::string &strResult, const std::string &strCommand, std::string * const pstrFilteredOut = NULL) {
+        return RPCParseCommandLine(strResult, strCommand, true, pstrFilteredOut);
     }
 
     void setClientModel(ClientModel *model);

From a79598ddf4bf35b934ed3513900f2a9fae0bff45 Mon Sep 17 00:00:00 2001
From: Luke Dashjr <luke-jr+git@utopios.org>
Date: Wed, 16 Nov 2016 12:31:44 +0000
Subject: [PATCH 1432/1802] Qt/Test: Make sure filtering sensitive data works
 correctly in nested commands

---
 src/qt/test/rpcnestedtests.cpp | 28 ++++++++++++++++++++++++++--
 1 file changed, 26 insertions(+), 2 deletions(-)

diff --git a/src/qt/test/rpcnestedtests.cpp b/src/qt/test/rpcnestedtests.cpp
index fb044489d727b..fbec5722b6c22 100644
--- a/src/qt/test/rpcnestedtests.cpp
+++ b/src/qt/test/rpcnestedtests.cpp
@@ -61,8 +61,10 @@ void RPCNestedTests::rpcNestedTests()
 
     std::string result;
     std::string result2;
-    RPCConsole::RPCExecuteCommandLine(result, "getblockchaininfo()[chain]"); //simple result filtering with path
+    std::string filtered;
+    RPCConsole::RPCExecuteCommandLine(result, "getblockchaininfo()[chain]", &filtered); //simple result filtering with path
     QVERIFY(result=="main");
+    QVERIFY(filtered == "getblockchaininfo()[chain]");
 
     RPCConsole::RPCExecuteCommandLine(result, "getblock(getbestblockhash())"); //simple 2 level nesting
     RPCConsole::RPCExecuteCommandLine(result, "getblock(getblock(getbestblockhash())[hash], true)");
@@ -87,8 +89,30 @@ void RPCNestedTests::rpcNestedTests()
     (RPCConsole::RPCExecuteCommandLine(result2, "createrawtransaction( [],  {} , 0   )")); //whitespace between parametres is allowed
     QVERIFY(result == result2);
 
-    RPCConsole::RPCExecuteCommandLine(result, "getblock(getbestblockhash())[tx][0]");
+    RPCConsole::RPCExecuteCommandLine(result, "getblock(getbestblockhash())[tx][0]", &filtered);
     QVERIFY(result == "4a5e1e4baab89f3a32518a88c31bc87f618f76673e2cc77ab2127b7afdeda33b");
+    QVERIFY(filtered == "getblock(getbestblockhash())[tx][0]");
+
+    RPCConsole::RPCParseCommandLine(result, "importprivkey", false, &filtered);
+    QVERIFY(filtered == "importprivkey(…)");
+    RPCConsole::RPCParseCommandLine(result, "signmessagewithprivkey abc", false, &filtered);
+    QVERIFY(filtered == "signmessagewithprivkey(…)");
+    RPCConsole::RPCParseCommandLine(result, "signmessagewithprivkey abc,def", false, &filtered);
+    QVERIFY(filtered == "signmessagewithprivkey(…)");
+    RPCConsole::RPCParseCommandLine(result, "signrawtransaction(abc)", false, &filtered);
+    QVERIFY(filtered == "signrawtransaction(…)");
+    RPCConsole::RPCParseCommandLine(result, "walletpassphrase(help())", false, &filtered);
+    QVERIFY(filtered == "walletpassphrase(…)");
+    RPCConsole::RPCParseCommandLine(result, "walletpassphrasechange(help(walletpassphrasechange(abc)))", false, &filtered);
+    QVERIFY(filtered == "walletpassphrasechange(…)");
+    RPCConsole::RPCParseCommandLine(result, "help(encryptwallet(abc, def))", false, &filtered);
+    QVERIFY(filtered == "help(encryptwallet(…))");
+    RPCConsole::RPCParseCommandLine(result, "help(importprivkey())", false, &filtered);
+    QVERIFY(filtered == "help(importprivkey(…))");
+    RPCConsole::RPCParseCommandLine(result, "help(importprivkey(help()))", false, &filtered);
+    QVERIFY(filtered == "help(importprivkey(…))");
+    RPCConsole::RPCParseCommandLine(result, "help(importprivkey(abc), walletpassphrase(def))", false, &filtered);
+    QVERIFY(filtered == "help(importprivkey(…), walletpassphrase(…))");
 
     RPCConsole::RPCExecuteCommandLine(result, "rpcNestedTest");
     QVERIFY(result == "[]");

From ff77faf480cfaf8098cfa04af6cc17a75c19ba49 Mon Sep 17 00:00:00 2001
From: Luke Dashjr <luke-jr+git@utopios.org>
Date: Wed, 16 Nov 2016 12:32:15 +0000
Subject: [PATCH 1433/1802] Qt/RPCConsole: Use RPCParseCommandLine to perform
 command filtering

---
 src/qt/rpcconsole.cpp | 77 ++++++++++++++++++++++++++-----------------
 1 file changed, 46 insertions(+), 31 deletions(-)

diff --git a/src/qt/rpcconsole.cpp b/src/qt/rpcconsole.cpp
index 63a23dc496372..5cba588d0c6f1 100644
--- a/src/qt/rpcconsole.cpp
+++ b/src/qt/rpcconsole.cpp
@@ -31,6 +31,7 @@
 
 #include <QKeyEvent>
 #include <QMenu>
+#include <QMessageBox>
 #include <QScrollBar>
 #include <QSettings>
 #include <QSignalMapper>
@@ -74,16 +75,6 @@ const QStringList historyFilter = QStringList()
     << "walletpassphrasechange"
     << "encryptwallet";
 
-QString command_filter_sensitive_data(const QString cmd)
-{
-    Q_FOREACH(QString unallowedCmd, historyFilter) {
-        if (cmd.trimmed().startsWith(unallowedCmd)) {
-            return unallowedCmd;
-        }
-    }
-    return cmd;
-}
-
 }
 
 /* Object for executing console RPC commands in a separate thread.
@@ -175,13 +166,32 @@ bool RPCConsole::RPCParseCommandLine(std::string &strResult, const std::string &
     std::string curarg;
     UniValue lastResult;
     unsigned nDepthInsideSensitive = 0;
-    size_t filter_begin_pos = 0;
+    size_t filter_begin_pos = 0, chpos;
     std::vector<std::pair<size_t, size_t>> filter_ranges;
 
+    auto add_to_current_stack = [&](const std::string& curarg) {
+        if (stack.back().empty() && (!nDepthInsideSensitive) && historyFilter.contains(QString::fromStdString(curarg), Qt::CaseInsensitive)) {
+            nDepthInsideSensitive = 1;
+            filter_begin_pos = chpos;
+        }
+        stack.back().push_back(curarg);
+    };
+
+    auto close_out_params = [&]() {
+        if (nDepthInsideSensitive) {
+            if (!--nDepthInsideSensitive) {
+                assert(filter_begin_pos);
+                filter_ranges.push_back(std::make_pair(filter_begin_pos, chpos));
+                filter_begin_pos = 0;
+            }
+        }
+        stack.pop_back();
+    };
+
     std::string strCommandTerminated = strCommand;
     if (strCommandTerminated.back() != '\n')
         strCommandTerminated += "\n";
-    for (size_t chpos = 0; chpos < strCommandTerminated.size(); ++chpos)
+    for (chpos = 0; chpos < strCommandTerminated.size(); ++chpos)
     {
         char ch = strCommandTerminated[chpos];
         switch(state)
@@ -227,14 +237,7 @@ bool RPCConsole::RPCParseCommandLine(std::string &strResult, const std::string &
                         breakParsing = false;
 
                         // pop the stack and return the result to the current command arguments
-                        if (nDepthInsideSensitive) {
-                            if (!--nDepthInsideSensitive) {
-                                assert(filter_begin_pos);
-                                filter_ranges.push_back(std::make_pair(filter_begin_pos, chpos));
-                                filter_begin_pos = 0;
-                            }
-                        }
-                        stack.pop_back();
+                        close_out_params();
 
                         // don't stringify the json in case of a string to avoid doublequotes
                         if (lastResult.isStr())
@@ -246,7 +249,7 @@ bool RPCConsole::RPCParseCommandLine(std::string &strResult, const std::string &
                         if (curarg.size())
                         {
                             if (stack.size())
-                                stack.back().push_back(curarg);
+                                add_to_current_stack(curarg);
                             else
                                 strResult = curarg;
                         }
@@ -283,7 +286,7 @@ bool RPCConsole::RPCParseCommandLine(std::string &strResult, const std::string &
                         if (!stack.size())
                             throw std::runtime_error("Invalid Syntax");
 
-                        stack.back().push_back(curarg);
+                        add_to_current_stack(curarg);
                         curarg.clear();
                         state = STATE_EATING_SPACES_IN_BRACKETS;
                     }
@@ -308,12 +311,7 @@ bool RPCConsole::RPCParseCommandLine(std::string &strResult, const std::string &
 
                     else if(state == STATE_ARGUMENT) // Space ends argument
                     {
-                        // This is the only place where the method name should get pushed (as the first stack item)
-                        if ((!nDepthInsideSensitive) && historyFilter.contains(QString::fromStdString(curarg), Qt::CaseInsensitive)) {
-                            nDepthInsideSensitive = 1;
-                            filter_begin_pos = chpos;
-                        }
-                        stack.back().push_back(curarg);
+                        add_to_current_stack(curarg);
                         curarg.clear();
                     }
                     if ((state == STATE_EATING_SPACES_IN_BRACKETS || state == STATE_ARGUMENT) && ch == ',')
@@ -351,9 +349,13 @@ bool RPCConsole::RPCParseCommandLine(std::string &strResult, const std::string &
         }
     }
     if (pstrFilteredOut) {
+        if (STATE_COMMAND_EXECUTED == state) {
+            assert(!stack.empty());
+            close_out_params();
+        }
         *pstrFilteredOut = strCommand;
         for (auto i = filter_ranges.rbegin(); i != filter_ranges.rend(); ++i) {
-            pstrFilteredOut->replace(i->first, i->second - i->first, "...");
+            pstrFilteredOut->replace(i->first, i->second - i->first, "(…)");
         }
     }
     switch(state) // final state
@@ -800,16 +802,29 @@ void RPCConsole::setMempoolSize(long numberOfTxs, size_t dynUsage)
 void RPCConsole::on_lineEdit_returnPressed()
 {
     QString cmd = ui->lineEdit->text();
-    ui->lineEdit->clear();
 
     if(!cmd.isEmpty())
     {
+        std::string strFilteredCmd;
+        try {
+            std::string dummy;
+            if (!RPCParseCommandLine(dummy, cmd.toStdString(), false, &strFilteredCmd)) {
+                // Failed to parse command, so we cannot even filter it for the history
+                throw std::runtime_error("Invalid command line");
+            }
+        } catch (const std::exception& e) {
+            QMessageBox::critical(this, "Error", QString("Error: ") + QString::fromStdString(e.what()));
+            return;
+        }
+
+        ui->lineEdit->clear();
+
         cmdBeforeBrowsing = QString();
 
         message(CMD_REQUEST, cmd);
         Q_EMIT cmdRequest(cmd);
 
-        cmd = command_filter_sensitive_data(cmd);
+        cmd = QString::fromStdString(strFilteredCmd);
 
         // Remove command, if already in history
         history.removeOne(cmd);

From 8562792095a78fdef2dacc3c5e32c41206df4c87 Mon Sep 17 00:00:00 2001
From: Luke Dashjr <luke-jr+git@utopios.org>
Date: Tue, 22 Nov 2016 23:37:23 +0000
Subject: [PATCH 1434/1802] GUI/RPCConsole: Include importmulti in history
 sensitive-command filter

---
 src/qt/rpcconsole.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/qt/rpcconsole.cpp b/src/qt/rpcconsole.cpp
index 5cba588d0c6f1..38fe659c331cb 100644
--- a/src/qt/rpcconsole.cpp
+++ b/src/qt/rpcconsole.cpp
@@ -69,6 +69,7 @@ namespace {
 // don't add private key handling cmd's to the history
 const QStringList historyFilter = QStringList()
     << "importprivkey"
+    << "importmulti"
     << "signmessagewithprivkey"
     << "signrawtransaction"
     << "walletpassphrase"

From 1814b089fbf6eca03b1f026e2033d4a6ccc6305f Mon Sep 17 00:00:00 2001
From: Stanislas Marion <stanislas.marion@gmail.com>
Date: Fri, 30 Sep 2016 15:29:45 -0400
Subject: [PATCH 1435/1802] add p2sh and segwit options to bitcoin-tx outscript
 command

---
 src/bitcoin-tx.cpp | 26 ++++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/src/bitcoin-tx.cpp b/src/bitcoin-tx.cpp
index d46f330453058..f9bb9f77de639 100644
--- a/src/bitcoin-tx.cpp
+++ b/src/bitcoin-tx.cpp
@@ -79,7 +79,9 @@ static int AppInitRawTx(int argc, char* argv[])
         strUsage += HelpMessageOpt("nversion=N", _("Set TX version to N"));
         strUsage += HelpMessageOpt("outaddr=VALUE:ADDRESS", _("Add address-based output to TX"));
         strUsage += HelpMessageOpt("outdata=[VALUE:]DATA", _("Add data-based output to TX"));
-        strUsage += HelpMessageOpt("outscript=VALUE:SCRIPT", _("Add raw script output to TX"));
+        strUsage += HelpMessageOpt("outscript=VALUE:SCRIPT(:\"SEGWIT\")(:\"P2SH\")", _("Add raw script output to TX") + ". " +
+            _("Optionally add the \"SEGWIT\" flag to produce a segwit output") + ". " +
+            _("Optionally add the \"P2SH\" flag to wrap the script in a P2SH output."));
         strUsage += HelpMessageOpt("sign=SIGHASH-FLAGS", _("Add zero or more signatures to transaction") + ". " +
             _("This command requires JSON registers:") +
             _("prevtxs=JSON object") + ", " +
@@ -280,22 +282,30 @@ static void MutateTxAddOutData(CMutableTransaction& tx, const std::string& strIn
 
 static void MutateTxAddOutScript(CMutableTransaction& tx, const std::string& strInput)
 {
-    // separate VALUE:SCRIPT in string
-    size_t pos = strInput.find(':');
-    if ((pos == std::string::npos) ||
-        (pos == 0))
-        throw std::runtime_error("TX output missing separator");
+    // separate VALUE:SCRIPT(:SEGWIT)(:P2SH)
+    std::vector<std::string> vStrInput;
+    boost::split(vStrInput, strInput, boost::is_any_of(":"));
+    if (vStrInput.size() < 2)
+        throw srd::runtime_error("TX output missing separator");
 
     // extract and validate VALUE
-    std::string strValue = strInput.substr(0, pos);
+    std::string strValue = vStrInput[0];
     CAmount value;
     if (!ParseMoney(strValue, value))
         throw std::runtime_error("invalid TX output value");
 
     // extract and validate script
-    std::string strScript = strInput.substr(pos + 1, std::string::npos);
+    std::string strScript = vStrInput[1];
     CScript scriptPubKey = ParseScript(strScript); // throws on err
 
+    if (std::find(vStrInput.begin(), vStrInput.end(), "SEGWIT") != vStrInput.end()) {
+      scriptPubKey = GetScriptForWitness(scriptPubKey);
+    }
+    if (std::find(vStrInput.begin(), vStrInput.end(), "P2SH") != vStrInput.end()) {
+      CBitcoinAddress addr(scriptPubKey);
+      scriptPubKey = GetScriptForDestination(addr.Get());
+    }
+
     // construct TxOut, append to transaction output list
     CTxOut txout(value, scriptPubKey);
     tx.vout.push_back(txout);

From 61a153443ef87d0cf187d2203f0d5ef88e52e7ed Mon Sep 17 00:00:00 2001
From: jnewbery <john@johnnewbery.com>
Date: Tue, 4 Oct 2016 14:21:25 -0400
Subject: [PATCH 1436/1802] Add all transaction output types to bitcoin-tx.

This commit enhances bitcoin-tx so all remaining standard TXO types can be created:

- Pay to Pub Key
- Multi-sig
  - bare multi-sig
  - multi-sig in Pay To Script Hash
  - multi-sig in Pay to Witness Script Hash
  - multi-sig in Pay to Witness Script Hash, wrapped in P2SH
- Pay to Witness Pub Key Hash
  - Pay to Witness Pub Key Hash, wrapped in P2SH
- Pay to Witness Script Hash
  - Pay to Witness Script Hash, wrapped in P2SH
---
 src/bitcoin-tx.cpp | 197 ++++++++++++++++++++++++++++++++++++---------
 1 file changed, 160 insertions(+), 37 deletions(-)

diff --git a/src/bitcoin-tx.cpp b/src/bitcoin-tx.cpp
index f9bb9f77de639..68517decccaf2 100644
--- a/src/bitcoin-tx.cpp
+++ b/src/bitcoin-tx.cpp
@@ -78,10 +78,16 @@ static int AppInitRawTx(int argc, char* argv[])
         strUsage += HelpMessageOpt("locktime=N", _("Set TX lock time to N"));
         strUsage += HelpMessageOpt("nversion=N", _("Set TX version to N"));
         strUsage += HelpMessageOpt("outaddr=VALUE:ADDRESS", _("Add address-based output to TX"));
+        strUsage += HelpMessageOpt("outpubkey=VALUE:PUBKEY[:FLAGS]", _("Add pay-to-pubkey output to TX") + ". " +
+            _("Optionally add the \"W\" flag to produce a pay-to-witness-pubkey-hash output") + ". " +
+            _("Optionally add the \"S\" flag to wrap the output in a pay-to-script-hash."));
         strUsage += HelpMessageOpt("outdata=[VALUE:]DATA", _("Add data-based output to TX"));
-        strUsage += HelpMessageOpt("outscript=VALUE:SCRIPT(:\"SEGWIT\")(:\"P2SH\")", _("Add raw script output to TX") + ". " +
-            _("Optionally add the \"SEGWIT\" flag to produce a segwit output") + ". " +
-            _("Optionally add the \"P2SH\" flag to wrap the script in a P2SH output."));
+        strUsage += HelpMessageOpt("outscript=VALUE:SCRIPT[:FLAGS]", _("Add raw script output to TX") + ". " +
+            _("Optionally add the \"W\" flag to produce a pay-to-witness-script-hash output") + ". " +
+            _("Optionally add the \"S\" flag to wrap the output in a pay-to-script-hash."));
+        strUsage += HelpMessageOpt("outmultisig=VALUE:REQUIRED:PUBKEYS:PUBKEY1:PUBKEY2:....[:FLAGS]", _("Add Pay To n-of-m Multi-sig output to TX. n = REQUIRED, m = PUBKEYS") + ". " +
+            _("Optionally add the \"W\" flag to produce a pay-to-witness-script-hash output") + ". " +
+            _("Optionally add the \"S\" flag to wrap the output in a pay-to-script-hash."));
         strUsage += HelpMessageOpt("sign=SIGHASH-FLAGS", _("Add zero or more signatures to transaction") + ". " +
             _("This command requires JSON registers:") +
             _("prevtxs=JSON object") + ", " +
@@ -170,6 +176,14 @@ static void RegisterLoad(const std::string& strInput)
     RegisterSetJson(key, valStr);
 }
 
+static CAmount ExtractAndValidateValue(const std::string& strValue)
+{
+    CAmount value;
+    if (!ParseMoney(strValue, value))
+        throw std::runtime_error("invalid TX output value");
+    return value;
+}
+
 static void MutateTxVersion(CMutableTransaction& tx, const std::string& cmdVal)
 {
     int64_t newVersion = atoi64(cmdVal);
@@ -224,25 +238,18 @@ static void MutateTxAddInput(CMutableTransaction& tx, const std::string& strInpu
 
 static void MutateTxAddOutAddr(CMutableTransaction& tx, const std::string& strInput)
 {
-    // separate VALUE:ADDRESS in string
-    size_t pos = strInput.find(':');
-    if ((pos == std::string::npos) ||
-        (pos == 0) ||
-        (pos == (strInput.size() - 1)))
-        throw std::runtime_error("TX output missing separator");
+    // Separate into VALUE:ADDRESS
+    std::vector<std::string> vStrInputParts;
+    boost::split(vStrInputParts, strInput, boost::is_any_of(":"));
 
-    // extract and validate VALUE
-    std::string strValue = strInput.substr(0, pos);
-    CAmount value;
-    if (!ParseMoney(strValue, value))
-        throw std::runtime_error("invalid TX output value");
+    // Extract and validate VALUE
+    CAmount value = ExtractAndValidateValue(vStrInputParts[0]);
 
     // extract and validate ADDRESS
-    std::string strAddr = strInput.substr(pos + 1, std::string::npos);
+    std::string strAddr = vStrInputParts[1];
     CBitcoinAddress addr(strAddr);
     if (!addr.IsValid())
         throw std::runtime_error("invalid TX output address");
-
     // build standard output script via GetScriptForDestination()
     CScript scriptPubKey = GetScriptForDestination(addr.Get());
 
@@ -251,6 +258,114 @@ static void MutateTxAddOutAddr(CMutableTransaction& tx, const std::string& strIn
     tx.vout.push_back(txout);
 }
 
+static void MutateTxAddOutPubKey(CMutableTransaction& tx, const std::string& strInput)
+{
+    // Separate into VALUE:PUBKEY[:FLAGS]
+    std::vector<std::string> vStrInputParts;
+    boost::split(vStrInputParts, strInput, boost::is_any_of(":"));
+
+    // Extract and validate VALUE
+    CAmount value = ExtractAndValidateValue(vStrInputParts[0]);
+
+    // Extract and validate PUBKEY
+    CPubKey pubkey(ParseHex(vStrInputParts[1]));
+    if (!pubkey.IsFullyValid())
+        throw std::runtime_error("invalid TX output pubkey");
+    CScript scriptPubKey = GetScriptForRawPubKey(pubkey);
+    CBitcoinAddress addr(scriptPubKey);
+
+    // Extract and validate FLAGS
+    bool bSegWit = false;
+    bool bScriptHash = false;
+    if (vStrInputParts.size() == 3) {
+        std::string flags = vStrInputParts[2];
+        bSegWit = (flags.find("W") != std::string::npos);
+        bScriptHash = (flags.find("S") != std::string::npos);
+    }
+
+    if (bSegWit) {
+        // Call GetScriptForWitness() to build a P2WSH scriptPubKey
+        scriptPubKey = GetScriptForWitness(scriptPubKey);
+    }
+    if (bScriptHash) {
+        // Get the address for the redeem script, then call
+        // GetScriptForDestination() to construct a P2SH scriptPubKey.
+        CBitcoinAddress redeemScriptAddr(scriptPubKey);
+        scriptPubKey = GetScriptForDestination(redeemScriptAddr.Get());
+    }
+
+    // construct TxOut, append to transaction output list
+    CTxOut txout(value, scriptPubKey);
+    tx.vout.push_back(txout);
+}
+
+static void MutateTxAddOutMultiSig(CMutableTransaction& tx, const std::string& strInput)
+{
+    // Separate into VALUE:REQUIRED:NUMKEYS:PUBKEY1:PUBKEY2:....[:FLAGS]
+    std::vector<std::string> vStrInputParts;
+    boost::split(vStrInputParts, strInput, boost::is_any_of(":"));
+
+    // Check that there are enough parameters
+    if (vStrInputParts.size()<3)
+        throw std::runtime_error("Not enough multisig parameters");
+
+    // Extract and validate VALUE
+    CAmount value = ExtractAndValidateValue(vStrInputParts[0]);
+
+    // Extract REQUIRED
+    uint32_t required = stoul(vStrInputParts[1]);
+
+    // Extract NUMKEYS
+    uint32_t numkeys = stoul(vStrInputParts[2]);
+
+    // Validate there are the correct number of pubkeys
+    if (vStrInputParts.size() < numkeys + 3)
+        throw std::runtime_error("incorrect number of multisig pubkeys");
+
+    if (required < 1 || required > 20 || numkeys < 1 || numkeys > 20 || numkeys < required)
+        throw std::runtime_error("multisig parameter mismatch. Required " \
+                            + std::to_string(required) + " of " + std::to_string(numkeys) + "signatures.");
+
+    // extract and validate PUBKEYs
+    std::vector<CPubKey> pubkeys;
+    for(int pos = 1; pos <= int(numkeys); pos++) {
+        CPubKey pubkey(ParseHex(vStrInputParts[pos + 2]));
+        if (!pubkey.IsFullyValid())
+            throw std::runtime_error("invalid TX output pubkey");
+        pubkeys.push_back(pubkey);
+    }
+
+    // Extract FLAGS
+    bool bSegWit = false;
+    bool bScriptHash = false;
+    if (vStrInputParts.size() == numkeys + 4) {
+        std::string flags = vStrInputParts.back();
+        bSegWit = (flags.find("W") != std::string::npos);
+        bScriptHash = (flags.find("S") != std::string::npos);
+    }
+    else if (vStrInputParts.size() > numkeys + 4) {
+        // Validate that there were no more parameters passed
+        throw std::runtime_error("Too many parameters");
+    }
+
+    CScript scriptPubKey = GetScriptForMultisig(required, pubkeys);
+
+    if (bSegWit) {
+        // Call GetScriptForWitness() to build a P2WSH scriptPubKey
+        scriptPubKey = GetScriptForWitness(scriptPubKey);
+    }
+    if (bScriptHash) {
+        // Get the address for the redeem script, then call
+        // GetScriptForDestination() to construct a P2SH scriptPubKey.
+        CBitcoinAddress addr(scriptPubKey);
+        scriptPubKey = GetScriptForDestination(addr.Get());
+    }
+
+    // construct TxOut, append to transaction output list
+    CTxOut txout(value, scriptPubKey);
+    tx.vout.push_back(txout);
+}
+
 static void MutateTxAddOutData(CMutableTransaction& tx, const std::string& strInput)
 {
     CAmount value = 0;
@@ -262,10 +377,8 @@ static void MutateTxAddOutData(CMutableTransaction& tx, const std::string& strIn
         throw std::runtime_error("TX output value not specified");
 
     if (pos != std::string::npos) {
-        // extract and validate VALUE
-        std::string strValue = strInput.substr(0, pos);
-        if (!ParseMoney(strValue, value))
-            throw std::runtime_error("invalid TX output value");
+        // Extract and validate VALUE
+        value = ExtractAndValidateValue(strInput.substr(0, pos));
     }
 
     // extract and validate DATA
@@ -282,26 +395,32 @@ static void MutateTxAddOutData(CMutableTransaction& tx, const std::string& strIn
 
 static void MutateTxAddOutScript(CMutableTransaction& tx, const std::string& strInput)
 {
-    // separate VALUE:SCRIPT(:SEGWIT)(:P2SH)
-    std::vector<std::string> vStrInput;
-    boost::split(vStrInput, strInput, boost::is_any_of(":"));
-    if (vStrInput.size() < 2)
-        throw srd::runtime_error("TX output missing separator");
-
-    // extract and validate VALUE
-    std::string strValue = vStrInput[0];
-    CAmount value;
-    if (!ParseMoney(strValue, value))
-        throw std::runtime_error("invalid TX output value");
+    // separate VALUE:SCRIPT[:FLAGS]
+    std::vector<std::string> vStrInputParts;
+    boost::split(vStrInputParts, strInput, boost::is_any_of(":"));
+    if (vStrInputParts.size() < 2)
+        throw std::runtime_error("TX output missing separator");
+
+    // Extract and validate VALUE
+    CAmount value = ExtractAndValidateValue(vStrInputParts[0]);
 
     // extract and validate script
-    std::string strScript = vStrInput[1];
-    CScript scriptPubKey = ParseScript(strScript); // throws on err
+    std::string strScript = vStrInputParts[1];
+    CScript scriptPubKey = ParseScript(strScript);
+
+    // Extract FLAGS
+    bool bSegWit = false;
+    bool bScriptHash = false;
+    if (vStrInputParts.size() == 3) {
+        std::string flags = vStrInputParts.back();
+        bSegWit = (flags.find("W") != std::string::npos);
+        bScriptHash = (flags.find("S") != std::string::npos);
+    }
 
-    if (std::find(vStrInput.begin(), vStrInput.end(), "SEGWIT") != vStrInput.end()) {
+    if (bSegWit) {
       scriptPubKey = GetScriptForWitness(scriptPubKey);
     }
-    if (std::find(vStrInput.begin(), vStrInput.end(), "P2SH") != vStrInput.end()) {
+    if (bScriptHash) {
       CBitcoinAddress addr(scriptPubKey);
       scriptPubKey = GetScriptForDestination(addr.Get());
     }
@@ -548,10 +667,14 @@ static void MutateTx(CMutableTransaction& tx, const std::string& command,
         MutateTxDelOutput(tx, commandVal);
     else if (command == "outaddr")
         MutateTxAddOutAddr(tx, commandVal);
-    else if (command == "outdata")
-        MutateTxAddOutData(tx, commandVal);
+    else if (command == "outpubkey")
+        MutateTxAddOutPubKey(tx, commandVal);
+    else if (command == "outmultisig")
+        MutateTxAddOutMultiSig(tx, commandVal);
     else if (command == "outscript")
         MutateTxAddOutScript(tx, commandVal);
+    else if (command == "outdata")
+        MutateTxAddOutData(tx, commandVal);
 
     else if (command == "sign") {
         if (!ecc) { ecc.reset(new Secp256k1Init()); }

From b7e144bb731857106cae7c7d2d49d2ccc03b7ef1 Mon Sep 17 00:00:00 2001
From: jnewbery <john@johnnewbery.com>
Date: Tue, 4 Oct 2016 15:40:41 -0400
Subject: [PATCH 1437/1802] Add test cases to test new bitcoin-tx functionality

This commit add testcases to test the following functions in bitcoin-tx:

- add a pay to non-standard script output
- add a P2SH output
- add a P2WSH output
- add a P2WSH wrapped in a P2SH output
- add a pay to pub key output
- add a P2WPKH output
- add a P2WPKH wrapped in a P2SH output
- add a bare multisig output
- add a multisig in P2SH output
- add a multisig in a P2WSH output
- add a multisig in a P2WSH wrapped in as P2SH output
---
 src/test/data/bitcoin-util-test.json  | 116 ++++++++++++++++++++++++++
 src/test/data/txcreatemultisig1.hex   |   1 +
 src/test/data/txcreatemultisig1.json  |  26 ++++++
 src/test/data/txcreatemultisig2.hex   |   1 +
 src/test/data/txcreatemultisig2.json  |  24 ++++++
 src/test/data/txcreatemultisig3.hex   |   1 +
 src/test/data/txcreatemultisig3.json  |  20 +++++
 src/test/data/txcreatemultisig4.hex   |   1 +
 src/test/data/txcreatemultisig4.json  |  24 ++++++
 src/test/data/txcreateoutpubkey1.hex  |   1 +
 src/test/data/txcreateoutpubkey1.json |  24 ++++++
 src/test/data/txcreateoutpubkey2.hex  |   1 +
 src/test/data/txcreateoutpubkey2.json |  20 +++++
 src/test/data/txcreateoutpubkey3.hex  |   1 +
 src/test/data/txcreateoutpubkey3.json |  24 ++++++
 src/test/data/txcreatescript1.hex     |   1 +
 src/test/data/txcreatescript1.json    |  20 +++++
 src/test/data/txcreatescript2.hex     |   1 +
 src/test/data/txcreatescript2.json    |  24 ++++++
 src/test/data/txcreatescript3.hex     |   1 +
 src/test/data/txcreatescript3.json    |  20 +++++
 src/test/data/txcreatescript4.hex     |   1 +
 src/test/data/txcreatescript4.json    |  24 ++++++
 23 files changed, 377 insertions(+)
 create mode 100644 src/test/data/txcreatemultisig1.hex
 create mode 100644 src/test/data/txcreatemultisig1.json
 create mode 100644 src/test/data/txcreatemultisig2.hex
 create mode 100644 src/test/data/txcreatemultisig2.json
 create mode 100644 src/test/data/txcreatemultisig3.hex
 create mode 100644 src/test/data/txcreatemultisig3.json
 create mode 100644 src/test/data/txcreatemultisig4.hex
 create mode 100644 src/test/data/txcreatemultisig4.json
 create mode 100644 src/test/data/txcreateoutpubkey1.hex
 create mode 100644 src/test/data/txcreateoutpubkey1.json
 create mode 100644 src/test/data/txcreateoutpubkey2.hex
 create mode 100644 src/test/data/txcreateoutpubkey2.json
 create mode 100644 src/test/data/txcreateoutpubkey3.hex
 create mode 100644 src/test/data/txcreateoutpubkey3.json
 create mode 100644 src/test/data/txcreatescript1.hex
 create mode 100644 src/test/data/txcreatescript1.json
 create mode 100644 src/test/data/txcreatescript2.hex
 create mode 100644 src/test/data/txcreatescript2.json
 create mode 100644 src/test/data/txcreatescript3.hex
 create mode 100644 src/test/data/txcreatescript3.json
 create mode 100644 src/test/data/txcreatescript4.hex
 create mode 100644 src/test/data/txcreatescript4.json

diff --git a/src/test/data/bitcoin-util-test.json b/src/test/data/bitcoin-util-test.json
index d001b2056fe32..387c0f352cb9e 100644
--- a/src/test/data/bitcoin-util-test.json
+++ b/src/test/data/bitcoin-util-test.json
@@ -117,6 +117,46 @@
     "output_cmp": "txcreate2.json",
     "description": "Parses a transation with no inputs and a single output script (output in json)"
   },
+  { "exec": "./bitcoin-tx",
+    "args": ["-create", "outscript=0:OP_DROP"],
+    "output_cmp": "txcreatescript1.hex",
+    "description": "Create a new transaction with a single output script (OP_DROP)"
+  },
+  { "exec": "./bitcoin-tx",
+    "args": ["-json", "-create", "outscript=0:OP_DROP"],
+    "output_cmp": "txcreatescript1.json",
+    "description": "Create a new transaction with a single output script (OP_DROP) (output as json)"
+  },
+  { "exec": "./bitcoin-tx",
+    "args": ["-create", "outscript=0:OP_DROP:S"],
+    "output_cmp": "txcreatescript2.hex",
+    "description": "Create a new transaction with a single output script (OP_DROP) in a P2SH"
+  },
+  { "exec": "./bitcoin-tx",
+    "args": ["-json", "-create", "outscript=0:OP_DROP:S"],
+    "output_cmp": "txcreatescript2.json",
+    "description": "Create a new transaction with a single output script (OP_DROP) in a P2SH (output as json)"
+  },
+  { "exec": "./bitcoin-tx",
+    "args": ["-create", "outscript=0:OP_DROP:W"],
+    "output_cmp": "txcreatescript3.hex",
+    "description": "Create a new transaction with a single output script (OP_DROP) in a P2WSH"
+  },
+  { "exec": "./bitcoin-tx",
+    "args": ["-json", "-create", "outscript=0:OP_DROP:W"],
+    "output_cmp": "txcreatescript3.json",
+    "description": "Create a new transaction with a single output script (OP_DROP) in a P2WSH (output as json)"
+  },
+  { "exec": "./bitcoin-tx",
+    "args": ["-create", "outscript=0:OP_DROP:WS"],
+    "output_cmp": "txcreatescript4.hex",
+    "description": "Create a new transaction with a single output script (OP_DROP) in a P2WSH, wrapped in a P2SH"
+  },
+  { "exec": "./bitcoin-tx",
+    "args": ["-json", "-create", "outscript=0:OP_DROP:WS"],
+    "output_cmp": "txcreatescript4.json",
+    "description": "Create a new transaction with a single output script (OP_DROP) in a P2SH, wrapped in a P2SH (output as json)"
+  },
   { "exec": "./bitcoin-tx",
     "args":
     ["-create", "nversion=1",
@@ -151,6 +191,42 @@
     "output_cmp": "txcreatesignv2.hex",
     "description": "Creates a new transaction with a single input and a single output, and then signs the transaction"
   },
+  { "exec": "./bitcoin-tx",
+    "args":
+    ["-create", "outpubkey=0:02a5613bd857b7048924264d1e70e08fb2a7e6527d32b7ab1bb993ac59964ff397"],
+    "output_cmp": "txcreateoutpubkey1.hex",
+    "description": "Creates a new transaction with a single pay-to-pubkey output"
+  },
+  { "exec": "./bitcoin-tx",
+    "args":
+    ["-json", "-create", "outpubkey=0:02a5613bd857b7048924264d1e70e08fb2a7e6527d32b7ab1bb993ac59964ff397"],
+    "output_cmp": "txcreateoutpubkey1.json",
+    "description": "Creates a new transaction with a single pay-to-pubkey output (output as json)"
+  },
+  { "exec": "./bitcoin-tx",
+    "args":
+    ["-create", "outpubkey=0:02a5613bd857b7048924264d1e70e08fb2a7e6527d32b7ab1bb993ac59964ff397:W"],
+    "output_cmp": "txcreateoutpubkey2.hex",
+    "description": "Creates a new transaction with a single pay-to-witness-pubkey output"
+  },
+  { "exec": "./bitcoin-tx",
+    "args":
+    ["-json", "-create", "outpubkey=0:02a5613bd857b7048924264d1e70e08fb2a7e6527d32b7ab1bb993ac59964ff397:W"],
+    "output_cmp": "txcreateoutpubkey2.json",
+    "description": "Creates a new transaction with a single pay-to-witness-pubkey output (output as json)"
+  },
+  { "exec": "./bitcoin-tx",
+    "args":
+    ["-create", "outpubkey=0:02a5613bd857b7048924264d1e70e08fb2a7e6527d32b7ab1bb993ac59964ff397:WS"],
+    "output_cmp": "txcreateoutpubkey3.hex",
+    "description": "Creates a new transaction with a single pay-to-witness-pubkey, wrapped in P2SH output"
+  },
+  { "exec": "./bitcoin-tx",
+    "args":
+    ["-json", "-create", "outpubkey=0:02a5613bd857b7048924264d1e70e08fb2a7e6527d32b7ab1bb993ac59964ff397:WS"],
+    "output_cmp": "txcreateoutpubkey3.json",
+    "description": "Creates a new transaction with a single pay-to-pub-key output, wrapped in P2SH (output as json)"
+  },
   { "exec": "./bitcoin-tx",
     "args":
     ["-create",
@@ -236,5 +312,45 @@
      "in=5897de6bd6027a475eadd57019d4e6872c396d0716c4875a5f1a6fcfdf385c1f:0:1"],
     "output_cmp": "txcreatedata_seq1.json",
     "description": "Adds a new input with sequence number to a transaction (output in json)"
+  },
+  { "exec": "./bitcoin-tx",
+    "args": ["-create", "outmultisig=1:2:3:02a5613bd857b7048924264d1e70e08fb2a7e6527d32b7ab1bb993ac59964ff397:021ac43c7ff740014c3b33737ede99c967e4764553d1b2b83db77c83b8715fa72d:02df2089105c77f266fa11a9d33f05c735234075f2e8780824c6b709415f9fb485"],
+    "output_cmp": "txcreatemultisig1.hex",
+    "description": "Creates a new transaction with a single 2-of-3 multisig output"
+  },
+  { "exec": "./bitcoin-tx",
+    "args": ["-json", "-create", "outmultisig=1:2:3:02a5613bd857b7048924264d1e70e08fb2a7e6527d32b7ab1bb993ac59964ff397:021ac43c7ff740014c3b33737ede99c967e4764553d1b2b83db77c83b8715fa72d:02df2089105c77f266fa11a9d33f05c735234075f2e8780824c6b709415f9fb485"],
+    "output_cmp": "txcreatemultisig1.json",
+    "description": "Creates a new transaction with a single 2-of-3 multisig output (output in json)"
+  },
+  { "exec": "./bitcoin-tx",
+    "args": ["-create", "outmultisig=1:2:3:02a5613bd857b7048924264d1e70e08fb2a7e6527d32b7ab1bb993ac59964ff397:021ac43c7ff740014c3b33737ede99c967e4764553d1b2b83db77c83b8715fa72d:02df2089105c77f266fa11a9d33f05c735234075f2e8780824c6b709415f9fb485:S"],
+    "output_cmp": "txcreatemultisig2.hex",
+    "description": "Creates a new transaction with a single 2-of-3 multisig in a P2SH output"
+  },
+  { "exec": "./bitcoin-tx",
+    "args": ["-json", "-create", "outmultisig=1:2:3:02a5613bd857b7048924264d1e70e08fb2a7e6527d32b7ab1bb993ac59964ff397:021ac43c7ff740014c3b33737ede99c967e4764553d1b2b83db77c83b8715fa72d:02df2089105c77f266fa11a9d33f05c735234075f2e8780824c6b709415f9fb485:S"],
+    "output_cmp": "txcreatemultisig2.json",
+    "description": "Creates a new transaction with a single 2-of-3 multisig in a P2SH output (output in json)"
+  },
+  { "exec": "./bitcoin-tx",
+    "args": ["-create", "outmultisig=1:2:3:02a5613bd857b7048924264d1e70e08fb2a7e6527d32b7ab1bb993ac59964ff397:021ac43c7ff740014c3b33737ede99c967e4764553d1b2b83db77c83b8715fa72d:02df2089105c77f266fa11a9d33f05c735234075f2e8780824c6b709415f9fb485:W"],
+    "output_cmp": "txcreatemultisig3.hex",
+    "description": "Creates a new transaction with a single 2-of-3 multisig in a P2WSH output"
+  },
+  { "exec": "./bitcoin-tx",
+    "args": ["-json", "-create", "outmultisig=1:2:3:02a5613bd857b7048924264d1e70e08fb2a7e6527d32b7ab1bb993ac59964ff397:021ac43c7ff740014c3b33737ede99c967e4764553d1b2b83db77c83b8715fa72d:02df2089105c77f266fa11a9d33f05c735234075f2e8780824c6b709415f9fb485:W"],
+    "output_cmp": "txcreatemultisig3.json",
+    "description": "Creates a new transaction with a single 2-of-3 multisig in a P2WSH output (output in json)"
+  },
+  { "exec": "./bitcoin-tx",
+    "args": ["-create", "outmultisig=1:2:3:02a5613bd857b7048924264d1e70e08fb2a7e6527d32b7ab1bb993ac59964ff397:021ac43c7ff740014c3b33737ede99c967e4764553d1b2b83db77c83b8715fa72d:02df2089105c77f266fa11a9d33f05c735234075f2e8780824c6b709415f9fb485:WS"],
+    "output_cmp": "txcreatemultisig4.hex",
+    "description": "Creates a new transaction with a single 2-of-3 multisig in a P2WSH output, wrapped in P2SH"
+  },
+  { "exec": "./bitcoin-tx",
+    "args": ["-json", "-create", "outmultisig=1:2:3:02a5613bd857b7048924264d1e70e08fb2a7e6527d32b7ab1bb993ac59964ff397:021ac43c7ff740014c3b33737ede99c967e4764553d1b2b83db77c83b8715fa72d:02df2089105c77f266fa11a9d33f05c735234075f2e8780824c6b709415f9fb485:WS"],
+    "output_cmp": "txcreatemultisig4.json",
+    "description": "Creates a new transaction with a single 2-of-3 multisig in a P2WSH output, wrapped in P2SH (output in json)"
   }
 ]
diff --git a/src/test/data/txcreatemultisig1.hex b/src/test/data/txcreatemultisig1.hex
new file mode 100644
index 0000000000000..9c00004d383d2
--- /dev/null
+++ b/src/test/data/txcreatemultisig1.hex
@@ -0,0 +1 @@
+01000000000100e1f5050000000069522102a5613bd857b7048924264d1e70e08fb2a7e6527d32b7ab1bb993ac59964ff39721021ac43c7ff740014c3b33737ede99c967e4764553d1b2b83db77c83b8715fa72d2102df2089105c77f266fa11a9d33f05c735234075f2e8780824c6b709415f9fb48553ae00000000
diff --git a/src/test/data/txcreatemultisig1.json b/src/test/data/txcreatemultisig1.json
new file mode 100644
index 0000000000000..f6ce43c202c76
--- /dev/null
+++ b/src/test/data/txcreatemultisig1.json
@@ -0,0 +1,26 @@
+{
+    "txid": "0d1d4edfc217d9db3ab6a9298f26a52eae3c52f55a6cb8ccbc14f7c727572894",
+    "hash": "0d1d4edfc217d9db3ab6a9298f26a52eae3c52f55a6cb8ccbc14f7c727572894",
+    "version": 1,
+    "locktime": 0,
+    "vin": [
+    ],
+    "vout": [
+        {
+            "value": 1.00,
+            "n": 0,
+            "scriptPubKey": {
+                "asm": "2 02a5613bd857b7048924264d1e70e08fb2a7e6527d32b7ab1bb993ac59964ff397 021ac43c7ff740014c3b33737ede99c967e4764553d1b2b83db77c83b8715fa72d 02df2089105c77f266fa11a9d33f05c735234075f2e8780824c6b709415f9fb485 3 OP_CHECKMULTISIG",
+                "hex": "522102a5613bd857b7048924264d1e70e08fb2a7e6527d32b7ab1bb993ac59964ff39721021ac43c7ff740014c3b33737ede99c967e4764553d1b2b83db77c83b8715fa72d2102df2089105c77f266fa11a9d33f05c735234075f2e8780824c6b709415f9fb48553ae",
+                "reqSigs": 2,
+                "type": "multisig",
+                "addresses": [
+                    "1FoG2386FG2tAJS9acMuiDsKy67aGg9MKz", 
+                    "1FXtz9KU8JNmQDyHdiEm5HDiALuP3zdHvV", 
+                    "14LuavcBbXZYJ6Tsz3cAUQj9SuQoL2xCQX"
+                ]
+            }
+        }
+    ],
+    "hex": "01000000000100e1f5050000000069522102a5613bd857b7048924264d1e70e08fb2a7e6527d32b7ab1bb993ac59964ff39721021ac43c7ff740014c3b33737ede99c967e4764553d1b2b83db77c83b8715fa72d2102df2089105c77f266fa11a9d33f05c735234075f2e8780824c6b709415f9fb48553ae00000000"
+}
diff --git a/src/test/data/txcreatemultisig2.hex b/src/test/data/txcreatemultisig2.hex
new file mode 100644
index 0000000000000..07835c54d3e16
--- /dev/null
+++ b/src/test/data/txcreatemultisig2.hex
@@ -0,0 +1 @@
+01000000000100e1f5050000000017a9141c6fbaf46d64221e80cbae182c33ddf81b9294ac8700000000
diff --git a/src/test/data/txcreatemultisig2.json b/src/test/data/txcreatemultisig2.json
new file mode 100644
index 0000000000000..e09d22060f44e
--- /dev/null
+++ b/src/test/data/txcreatemultisig2.json
@@ -0,0 +1,24 @@
+{
+    "txid": "0d861f278a3b7bce7cb5a88d71e6e6a903336f95ad5a2c29b295b63835b6eee3",
+    "hash": "0d861f278a3b7bce7cb5a88d71e6e6a903336f95ad5a2c29b295b63835b6eee3",
+    "version": 1,
+    "locktime": 0,
+    "vin": [
+    ],
+    "vout": [
+        {
+            "value": 1.00,
+            "n": 0,
+            "scriptPubKey": {
+                "asm": "OP_HASH160 1c6fbaf46d64221e80cbae182c33ddf81b9294ac OP_EQUAL",
+                "hex": "a9141c6fbaf46d64221e80cbae182c33ddf81b9294ac87",
+                "reqSigs": 1,
+                "type": "scripthash",
+                "addresses": [
+                    "34HNh57oBCRKkxNyjTuWAJkTbuGh6jg2Ms"
+                ]
+            }
+        }
+    ],
+    "hex": "01000000000100e1f5050000000017a9141c6fbaf46d64221e80cbae182c33ddf81b9294ac8700000000"
+}
diff --git a/src/test/data/txcreatemultisig3.hex b/src/test/data/txcreatemultisig3.hex
new file mode 100644
index 0000000000000..8d34f28f87717
--- /dev/null
+++ b/src/test/data/txcreatemultisig3.hex
@@ -0,0 +1 @@
+01000000000100e1f50500000000220020e15a86a23178f433d514dbbce042e87d72662b8b5edcacfd2e37ab7a2d135f0500000000
diff --git a/src/test/data/txcreatemultisig3.json b/src/test/data/txcreatemultisig3.json
new file mode 100644
index 0000000000000..88e32bd310e55
--- /dev/null
+++ b/src/test/data/txcreatemultisig3.json
@@ -0,0 +1,20 @@
+{
+    "txid": "ccc552220b46a3b5140048b03395987ce4f0fa1ddf8c635bba1fa44e0f8c1d7f",
+    "hash": "ccc552220b46a3b5140048b03395987ce4f0fa1ddf8c635bba1fa44e0f8c1d7f",
+    "version": 1,
+    "locktime": 0,
+    "vin": [
+    ],
+    "vout": [
+        {
+            "value": 1.00,
+            "n": 0,
+            "scriptPubKey": {
+                "asm": "0 e15a86a23178f433d514dbbce042e87d72662b8b5edcacfd2e37ab7a2d135f05",
+                "hex": "0020e15a86a23178f433d514dbbce042e87d72662b8b5edcacfd2e37ab7a2d135f05",
+                "type": "witness_v0_scripthash"
+            }
+        }
+    ],
+    "hex": "01000000000100e1f50500000000220020e15a86a23178f433d514dbbce042e87d72662b8b5edcacfd2e37ab7a2d135f0500000000"
+}
diff --git a/src/test/data/txcreatemultisig4.hex b/src/test/data/txcreatemultisig4.hex
new file mode 100644
index 0000000000000..7da54366c7e2b
--- /dev/null
+++ b/src/test/data/txcreatemultisig4.hex
@@ -0,0 +1 @@
+01000000000100e1f5050000000017a9146edf12858999f0dae74f9c692e6694ee3621b2ac8700000000
diff --git a/src/test/data/txcreatemultisig4.json b/src/test/data/txcreatemultisig4.json
new file mode 100644
index 0000000000000..fc69c7269c815
--- /dev/null
+++ b/src/test/data/txcreatemultisig4.json
@@ -0,0 +1,24 @@
+{
+    "txid": "5e8b1cc73234e208d4b7ca9075f136b908c34101be7a048df4ba9ac758b61567",
+    "hash": "5e8b1cc73234e208d4b7ca9075f136b908c34101be7a048df4ba9ac758b61567",
+    "version": 1,
+    "locktime": 0,
+    "vin": [
+    ],
+    "vout": [
+        {
+            "value": 1.00,
+            "n": 0,
+            "scriptPubKey": {
+                "asm": "OP_HASH160 6edf12858999f0dae74f9c692e6694ee3621b2ac OP_EQUAL",
+                "hex": "a9146edf12858999f0dae74f9c692e6694ee3621b2ac87",
+                "reqSigs": 1,
+                "type": "scripthash",
+                "addresses": [
+                    "3BoFUz1StqcNcgUTZE5cC1eFhuYFzj3fGH"
+                ]
+            }
+        }
+    ],
+    "hex": "01000000000100e1f5050000000017a9146edf12858999f0dae74f9c692e6694ee3621b2ac8700000000"
+}
diff --git a/src/test/data/txcreateoutpubkey1.hex b/src/test/data/txcreateoutpubkey1.hex
new file mode 100644
index 0000000000000..4a08244b2fc05
--- /dev/null
+++ b/src/test/data/txcreateoutpubkey1.hex
@@ -0,0 +1 @@
+0100000000010000000000000000232102a5613bd857b7048924264d1e70e08fb2a7e6527d32b7ab1bb993ac59964ff397ac00000000
diff --git a/src/test/data/txcreateoutpubkey1.json b/src/test/data/txcreateoutpubkey1.json
new file mode 100644
index 0000000000000..6019fa2dcd8be
--- /dev/null
+++ b/src/test/data/txcreateoutpubkey1.json
@@ -0,0 +1,24 @@
+{
+    "txid": "f42b38ac12e3fafc96ba1a9ba70cbfe326744aef75df5fb9db5d6e2855ca415f",
+    "hash": "f42b38ac12e3fafc96ba1a9ba70cbfe326744aef75df5fb9db5d6e2855ca415f",
+    "version": 1,
+    "locktime": 0,
+    "vin": [
+    ],
+    "vout": [
+        {
+            "value": 0.00,
+            "n": 0,
+            "scriptPubKey": {
+                "asm": "02a5613bd857b7048924264d1e70e08fb2a7e6527d32b7ab1bb993ac59964ff397 OP_CHECKSIG",
+                "hex": "2102a5613bd857b7048924264d1e70e08fb2a7e6527d32b7ab1bb993ac59964ff397ac",
+                "reqSigs": 1,
+                "type": "pubkey",
+                "addresses": [
+                    "1FoG2386FG2tAJS9acMuiDsKy67aGg9MKz"
+                ]
+            }
+        }
+    ],
+    "hex": "0100000000010000000000000000232102a5613bd857b7048924264d1e70e08fb2a7e6527d32b7ab1bb993ac59964ff397ac00000000"
+}
diff --git a/src/test/data/txcreateoutpubkey2.hex b/src/test/data/txcreateoutpubkey2.hex
new file mode 100644
index 0000000000000..8283c722ab84c
--- /dev/null
+++ b/src/test/data/txcreateoutpubkey2.hex
@@ -0,0 +1 @@
+0100000000010000000000000000160014a2516e770582864a6a56ed21a102044e388c62e300000000
diff --git a/src/test/data/txcreateoutpubkey2.json b/src/test/data/txcreateoutpubkey2.json
new file mode 100644
index 0000000000000..6fc3d57527335
--- /dev/null
+++ b/src/test/data/txcreateoutpubkey2.json
@@ -0,0 +1,20 @@
+{
+    "txid": "70f2a088cde460e677415fa1fb71895e90c231e6ed38ed203a35b6f848e9cc73",
+    "hash": "70f2a088cde460e677415fa1fb71895e90c231e6ed38ed203a35b6f848e9cc73",
+    "version": 1,
+    "locktime": 0,
+    "vin": [
+    ],
+    "vout": [
+        {
+            "value": 0.00,
+            "n": 0,
+            "scriptPubKey": {
+                "asm": "0 a2516e770582864a6a56ed21a102044e388c62e3",
+                "hex": "0014a2516e770582864a6a56ed21a102044e388c62e3",
+                "type": "witness_v0_keyhash"
+            }
+        }
+    ],
+    "hex": "0100000000010000000000000000160014a2516e770582864a6a56ed21a102044e388c62e300000000"
+}
diff --git a/src/test/data/txcreateoutpubkey3.hex b/src/test/data/txcreateoutpubkey3.hex
new file mode 100644
index 0000000000000..84adff4d89c59
--- /dev/null
+++ b/src/test/data/txcreateoutpubkey3.hex
@@ -0,0 +1 @@
+010000000001000000000000000017a914a5ab14c9804d0d8bf02f1aea4e82780733ad0a838700000000
diff --git a/src/test/data/txcreateoutpubkey3.json b/src/test/data/txcreateoutpubkey3.json
new file mode 100644
index 0000000000000..a1a25fc8348f5
--- /dev/null
+++ b/src/test/data/txcreateoutpubkey3.json
@@ -0,0 +1,24 @@
+{
+    "txid": "bfc7e898ee9f6a9652d7b8cca147e2da134502e2ada0f279ed634fc8cf833f8c",
+    "hash": "bfc7e898ee9f6a9652d7b8cca147e2da134502e2ada0f279ed634fc8cf833f8c",
+    "version": 1,
+    "locktime": 0,
+    "vin": [
+    ],
+    "vout": [
+        {
+            "value": 0.00,
+            "n": 0,
+            "scriptPubKey": {
+                "asm": "OP_HASH160 a5ab14c9804d0d8bf02f1aea4e82780733ad0a83 OP_EQUAL",
+                "hex": "a914a5ab14c9804d0d8bf02f1aea4e82780733ad0a8387",
+                "reqSigs": 1,
+                "type": "scripthash",
+                "addresses": [
+                    "3GnzN8FqgvYGYdhj8NW6UNxxVv3Uj1ApQn"
+                ]
+            }
+        }
+    ],
+    "hex": "010000000001000000000000000017a914a5ab14c9804d0d8bf02f1aea4e82780733ad0a838700000000"
+}
diff --git a/src/test/data/txcreatescript1.hex b/src/test/data/txcreatescript1.hex
new file mode 100644
index 0000000000000..0adce270fbec0
--- /dev/null
+++ b/src/test/data/txcreatescript1.hex
@@ -0,0 +1 @@
+0100000000010000000000000000017500000000
diff --git a/src/test/data/txcreatescript1.json b/src/test/data/txcreatescript1.json
new file mode 100644
index 0000000000000..8ffecba41136b
--- /dev/null
+++ b/src/test/data/txcreatescript1.json
@@ -0,0 +1,20 @@
+{
+    "txid": "f0851b68202f736b792649cfc960259c2374badcb644ab20cac726b5f72f61c9",
+    "hash": "f0851b68202f736b792649cfc960259c2374badcb644ab20cac726b5f72f61c9",
+    "version": 1,
+    "locktime": 0,
+    "vin": [
+    ],
+    "vout": [
+        {
+            "value": 0.00,
+            "n": 0,
+            "scriptPubKey": {
+                "asm": "OP_DROP",
+                "hex": "75",
+                "type": "nonstandard"
+            }
+        }
+    ],
+    "hex": "0100000000010000000000000000017500000000"
+}
diff --git a/src/test/data/txcreatescript2.hex b/src/test/data/txcreatescript2.hex
new file mode 100644
index 0000000000000..5afe8786e39cb
--- /dev/null
+++ b/src/test/data/txcreatescript2.hex
@@ -0,0 +1 @@
+010000000001000000000000000017a91471ed53322d470bb96657deb786b94f97dd46fb158700000000
diff --git a/src/test/data/txcreatescript2.json b/src/test/data/txcreatescript2.json
new file mode 100644
index 0000000000000..41eb69f1afbb3
--- /dev/null
+++ b/src/test/data/txcreatescript2.json
@@ -0,0 +1,24 @@
+{
+    "txid": "6e07a7cc075e0703f32ee8c4e5373fe654bfbc315148fda364e1be286ff290d0",
+    "hash": "6e07a7cc075e0703f32ee8c4e5373fe654bfbc315148fda364e1be286ff290d0",
+    "version": 1,
+    "locktime": 0,
+    "vin": [
+    ],
+    "vout": [
+        {
+            "value": 0.00,
+            "n": 0,
+            "scriptPubKey": {
+                "asm": "OP_HASH160 71ed53322d470bb96657deb786b94f97dd46fb15 OP_EQUAL",
+                "hex": "a91471ed53322d470bb96657deb786b94f97dd46fb1587",
+                "reqSigs": 1,
+                "type": "scripthash",
+                "addresses": [
+                    "3C5QarEGh9feKbDJ3QbMf2YNjnMoiPDhNp"
+                ]
+            }
+        }
+    ],
+    "hex": "010000000001000000000000000017a91471ed53322d470bb96657deb786b94f97dd46fb158700000000"
+}
diff --git a/src/test/data/txcreatescript3.hex b/src/test/data/txcreatescript3.hex
new file mode 100644
index 0000000000000..8a2b973bf0a89
--- /dev/null
+++ b/src/test/data/txcreatescript3.hex
@@ -0,0 +1 @@
+01000000000100000000000000002200200bfe935e70c321c7ca3afc75ce0d0ca2f98b5422e008bb31c00c6d7f1f1c0ad600000000
diff --git a/src/test/data/txcreatescript3.json b/src/test/data/txcreatescript3.json
new file mode 100644
index 0000000000000..90e7e27f9ffab
--- /dev/null
+++ b/src/test/data/txcreatescript3.json
@@ -0,0 +1,20 @@
+{
+    "txid": "8a234037b088e987c877030efc83374a07441c321bf9dc6dd2f206bc26507df8",
+    "hash": "8a234037b088e987c877030efc83374a07441c321bf9dc6dd2f206bc26507df8",
+    "version": 1,
+    "locktime": 0,
+    "vin": [
+    ],
+    "vout": [
+        {
+            "value": 0.00,
+            "n": 0,
+            "scriptPubKey": {
+                "asm": "0 0bfe935e70c321c7ca3afc75ce0d0ca2f98b5422e008bb31c00c6d7f1f1c0ad6",
+                "hex": "00200bfe935e70c321c7ca3afc75ce0d0ca2f98b5422e008bb31c00c6d7f1f1c0ad6",
+                "type": "witness_v0_scripthash"
+            }
+        }
+    ],
+    "hex": "01000000000100000000000000002200200bfe935e70c321c7ca3afc75ce0d0ca2f98b5422e008bb31c00c6d7f1f1c0ad600000000"
+}
diff --git a/src/test/data/txcreatescript4.hex b/src/test/data/txcreatescript4.hex
new file mode 100644
index 0000000000000..b4cfe58f42d46
--- /dev/null
+++ b/src/test/data/txcreatescript4.hex
@@ -0,0 +1 @@
+010000000001000000000000000017a9146a2c482f4985f57e702f325816c90e3723ca81ae8700000000
diff --git a/src/test/data/txcreatescript4.json b/src/test/data/txcreatescript4.json
new file mode 100644
index 0000000000000..11783751a4923
--- /dev/null
+++ b/src/test/data/txcreatescript4.json
@@ -0,0 +1,24 @@
+{
+    "txid": "24225cf5e9391100d6b218134b9f03383ca4c880a1f634ac12990cf28b66adbc",
+    "hash": "24225cf5e9391100d6b218134b9f03383ca4c880a1f634ac12990cf28b66adbc",
+    "version": 1,
+    "locktime": 0,
+    "vin": [
+    ],
+    "vout": [
+        {
+            "value": 0.00,
+            "n": 0,
+            "scriptPubKey": {
+                "asm": "OP_HASH160 6a2c482f4985f57e702f325816c90e3723ca81ae OP_EQUAL",
+                "hex": "a9146a2c482f4985f57e702f325816c90e3723ca81ae87",
+                "reqSigs": 1,
+                "type": "scripthash",
+                "addresses": [
+                    "3BNQbeFeJJGMAyDxPwWPuqxPMrjsFLjk3f"
+                ]
+            }
+        }
+    ],
+    "hex": "010000000001000000000000000017a9146a2c482f4985f57e702f325816c90e3723ca81ae8700000000"
+}

From b705a04b917e4199cfa01b0b17d0df7591713d5b Mon Sep 17 00:00:00 2001
From: Douglas Roark <doug@bloq.com>
Date: Mon, 26 Dec 2016 15:59:17 -0800
Subject: [PATCH 1438/1802] Update the Windows build notes

- Clarify the Windows Subsystem For Linux section.
- Clarify the build requirements.
---
 doc/build-windows.md | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/doc/build-windows.md b/doc/build-windows.md
index b6a047b9c380b..9549a4b9da048 100644
--- a/doc/build-windows.md
+++ b/doc/build-windows.md
@@ -16,11 +16,13 @@ Compiling with Windows Subsystem For Linux
 
 With Windows 10, Microsoft has released a new feature named the [Windows
 Subsystem for Linux](https://msdn.microsoft.com/commandline/wsl/about). This
-feature allows you to run a bash shell directly on Windows in an Ubuntu based
+feature allows you to run a bash shell directly on Windows in an Ubuntu-based
 environment. Within this environment you can cross compile for Windows without
-the need for a separate Linux VM or Server.
+the need for a separate Linux VM or server.
 
-This feature is not supported in versions of Windows prior to Windows 10 or on Windows Server SKUs.
+This feature is not supported in versions of Windows prior to Windows 10 or on
+Windows Server SKUs. In addition, it is available [only for 64-bit versions of
+Windows](https://msdn.microsoft.com/en-us/commandline/wsl/install_guide).
 
 To get the bash shell, you must first activate the feature in Windows.
 
@@ -38,7 +40,9 @@ To get the bash shell, you must first activate the feature in Windows.
   * Accept the license
   * Create a new UNIX user account (this is a separate account from your Windows account)
 
-After the bash shell is active, you can follow the instructions below for Windows 64-bit Cross-compilation.
+After the bash shell is active, you can follow the instructions below, starting
+with the "Cross-compilation" section. Compiling the 64-bit version is
+recommended but it is possible to compile the 32-bit version.
 
 Cross-compilation
 -------------------
@@ -64,7 +68,7 @@ To build executables for Windows 64-bit, install the following dependencies:
 Then build using:
 
     cd depends
-    make HOST=x86_64-w64-mingw32 -j4
+    make HOST=x86_64-w64-mingw32
     cd ..
     ./autogen.sh # not required when building from tarball
     CONFIG_SITE=$PWD/depends/x86_64-w64-mingw32/share/config.site ./configure --prefix=/
@@ -79,7 +83,7 @@ To build executables for Windows 32-bit, install the following dependencies:
 Then build using:
 
     cd depends
-    make HOST=i686-w64-mingw32 -j4
+    make HOST=i686-w64-mingw32
     cd ..
     ./autogen.sh # not required when building from tarball
     CONFIG_SITE=$PWD/depends/i686-w64-mingw32/share/config.site ./configure --prefix=/
@@ -98,4 +102,3 @@ as they appear in the release `.zip` archive. This can be done in the following
 way. This will install to `c:\workspace\bitcoin`, for example:
 
     make install DESTDIR=/mnt/c/workspace/bitcoin
-

From 9e351c9586ef35366fb0427104e6495e51cb3e6a Mon Sep 17 00:00:00 2001
From: Jonas Schnelli <dev@jonasschnelli.ch>
Date: Fri, 30 Dec 2016 10:35:43 +0100
Subject: [PATCH 1439/1802] SetMerkleBranch: remove unused code, remove cs_main
 lock requirement

---
 src/wallet/wallet.cpp | 10 +---------
 src/wallet/wallet.h   |  2 +-
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index 543cfd685e7f5..e1c4090971409 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -3736,21 +3736,13 @@ CWalletKey::CWalletKey(int64_t nExpires)
     nTimeExpires = nExpires;
 }
 
-int CMerkleTx::SetMerkleBranch(const CBlockIndex* pindex, int posInBlock)
+void CMerkleTx::SetMerkleBranch(const CBlockIndex* pindex, int posInBlock)
 {
-    AssertLockHeld(cs_main);
-
     // Update the tx's hashBlock
     hashBlock = pindex->GetBlockHash();
 
     // set the position of the transaction in the block
     nIndex = posInBlock;
-
-    // Is the tx in a block that's in the main chain
-    if (!chainActive.Contains(pindex))
-        return 0;
-
-    return chainActive.Height() - pindex->nHeight + 1;
 }
 
 int CMerkleTx::GetDepthInMainChain(const CBlockIndex* &pindexRet) const
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
index 72c1239cc44d8..a97a5e5a7ea21 100644
--- a/src/wallet/wallet.h
+++ b/src/wallet/wallet.h
@@ -218,7 +218,7 @@ class CMerkleTx
         READWRITE(nIndex);
     }
 
-    int SetMerkleBranch(const CBlockIndex* pIndex, int posInBlock);
+    void SetMerkleBranch(const CBlockIndex* pIndex, int posInBlock);
 
     /**
      * Return depth of transaction in blockchain:

From 2fb98f6661887f125837653c8f5577dbd6c124c0 Mon Sep 17 00:00:00 2001
From: Don Patterson <d_j_p_3@djp3.net>
Date: Thu, 22 Dec 2016 08:02:15 -0800
Subject: [PATCH 1440/1802] Fix bug in dmg builder so that it actually reads in
 the configuration file

---
 contrib/macdeploy/macdeployqtplus | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contrib/macdeploy/macdeployqtplus b/contrib/macdeploy/macdeployqtplus
index 6d43af421981f..73d4f159d868f 100755
--- a/contrib/macdeploy/macdeployqtplus
+++ b/contrib/macdeploy/macdeployqtplus
@@ -852,7 +852,7 @@ if config.dmg is not None:
             "items_positions" : "\n                   ".join(items_positions)
             }
         if "window_bounds" in fancy:
-            params["window.bounds"] = ",".join([str(p) for p in fancy["window_bounds"]])
+            params["window_bounds"] = ",".join([str(p) for p in fancy["window_bounds"]])
         if "icon_size" in fancy:
             params["icon_size"] = str(fancy["icon_size"])
         if bg_path is not None:

From d4781ac6c26399d316a2b25f656d9a4c0990c419 Mon Sep 17 00:00:00 2001
From: Gregory Sanders <gsanders87@gmail.com>
Date: Mon, 19 Dec 2016 20:50:47 -0500
Subject: [PATCH 1441/1802] Set peers as HB peers upon full block validation

---
 src/net_processing.cpp | 55 +++++++++++++++++++++---------------------
 1 file changed, 28 insertions(+), 27 deletions(-)

diff --git a/src/net_processing.cpp b/src/net_processing.cpp
index 87d367c2fbcb3..42c46b738448b 100644
--- a/src/net_processing.cpp
+++ b/src/net_processing.cpp
@@ -395,33 +395,38 @@ void UpdateBlockAvailability(NodeId nodeid, const uint256 &hash) {
     }
 }
 
-void MaybeSetPeerAsAnnouncingHeaderAndIDs(const CNodeState* nodestate, CNode* pfrom, CConnman& connman) {
-    if (!nodestate->fSupportsDesiredCmpctVersion) {
+void MaybeSetPeerAsAnnouncingHeaderAndIDs(NodeId nodeid, CConnman& connman) {
+    AssertLockHeld(cs_main);
+    CNodeState* nodestate = State(nodeid);
+    if (!nodestate || !nodestate->fSupportsDesiredCmpctVersion) {
         // Never ask from peers who can't provide witnesses.
         return;
     }
     if (nodestate->fProvidesHeaderAndIDs) {
         for (std::list<NodeId>::iterator it = lNodesAnnouncingHeaderAndIDs.begin(); it != lNodesAnnouncingHeaderAndIDs.end(); it++) {
-            if (*it == pfrom->GetId()) {
+            if (*it == nodeid) {
                 lNodesAnnouncingHeaderAndIDs.erase(it);
-                lNodesAnnouncingHeaderAndIDs.push_back(pfrom->GetId());
+                lNodesAnnouncingHeaderAndIDs.push_back(nodeid);
                 return;
             }
         }
-        bool fAnnounceUsingCMPCTBLOCK = false;
-        uint64_t nCMPCTBLOCKVersion = (pfrom->GetLocalServices() & NODE_WITNESS) ? 2 : 1;
-        if (lNodesAnnouncingHeaderAndIDs.size() >= 3) {
-            // As per BIP152, we only get 3 of our peers to announce
-            // blocks using compact encodings.
-            connman.ForNode(lNodesAnnouncingHeaderAndIDs.front(), [&connman, fAnnounceUsingCMPCTBLOCK, nCMPCTBLOCKVersion](CNode* pnodeStop){
-                connman.PushMessage(pnodeStop, CNetMsgMaker(pnodeStop->GetSendVersion()).Make(NetMsgType::SENDCMPCT, fAnnounceUsingCMPCTBLOCK, nCMPCTBLOCKVersion));
-                return true;
-            });
-            lNodesAnnouncingHeaderAndIDs.pop_front();
-        }
-        fAnnounceUsingCMPCTBLOCK = true;
-        connman.PushMessage(pfrom, CNetMsgMaker(pfrom->GetSendVersion()).Make(NetMsgType::SENDCMPCT, fAnnounceUsingCMPCTBLOCK, nCMPCTBLOCKVersion));
-        lNodesAnnouncingHeaderAndIDs.push_back(pfrom->GetId());
+        connman.ForNode(nodeid, [&connman](CNode* pfrom){
+            bool fAnnounceUsingCMPCTBLOCK = false;
+            uint64_t nCMPCTBLOCKVersion = (pfrom->GetLocalServices() & NODE_WITNESS) ? 2 : 1;
+            if (lNodesAnnouncingHeaderAndIDs.size() >= 3) {
+                // As per BIP152, we only get 3 of our peers to announce
+                // blocks using compact encodings.
+                connman.ForNode(lNodesAnnouncingHeaderAndIDs.front(), [&connman, fAnnounceUsingCMPCTBLOCK, nCMPCTBLOCKVersion](CNode* pnodeStop){
+                    connman.PushMessage(pnodeStop, CNetMsgMaker(pnodeStop->GetSendVersion()).Make(NetMsgType::SENDCMPCT, fAnnounceUsingCMPCTBLOCK, nCMPCTBLOCKVersion));
+                    return true;
+                });
+                lNodesAnnouncingHeaderAndIDs.pop_front();
+            }
+            fAnnounceUsingCMPCTBLOCK = true;
+            connman.PushMessage(pfrom, CNetMsgMaker(pfrom->GetSendVersion()).Make(NetMsgType::SENDCMPCT, fAnnounceUsingCMPCTBLOCK, nCMPCTBLOCKVersion));
+            lNodesAnnouncingHeaderAndIDs.push_back(pfrom->GetId());
+            return true;
+        });
     }
 }
 
@@ -798,6 +803,11 @@ void PeerLogicValidation::BlockChecked(const CBlock& block, const CValidationSta
                 Misbehaving(it->second.first, nDoS);
         }
     }
+    else if (state.IsValid() && !IsInitialBlockDownload() && mapBlocksInFlight.count(hash) == mapBlocksInFlight.size()) {
+        if (it != mapBlockSource.end()) {
+            MaybeSetPeerAsAnnouncingHeaderAndIDs(it->second.first, *connman);
+        }
+    }
     if (it != mapBlockSource.end())
         mapBlockSource.erase(it);
 }
@@ -1853,12 +1863,6 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
                     return true;
                 }
 
-                if (!fAlreadyInFlight && mapBlocksInFlight.size() == 1 && pindex->pprev->IsValid(BLOCK_VALID_CHAIN)) {
-                    // We seem to be rather well-synced, so it appears pfrom was the first to provide us
-                    // with this block! Let's get them to announce using compact blocks in the future.
-                    MaybeSetPeerAsAnnouncingHeaderAndIDs(nodestate, pfrom, connman);
-                }
-
                 BlockTransactionsRequest req;
                 for (size_t i = 0; i < cmpctblock.BlockTxCount(); i++) {
                     if (!partialBlock.IsTxAvailable(i))
@@ -2143,9 +2147,6 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
                 }
                 if (vGetData.size() > 0) {
                     if (nodestate->fSupportsDesiredCmpctVersion && vGetData.size() == 1 && mapBlocksInFlight.size() == 1 && pindexLast->pprev->IsValid(BLOCK_VALID_CHAIN)) {
-                        // We seem to be rather well-synced, so it appears pfrom was the first to provide us
-                        // with this block! Let's get them to announce using compact blocks in the future.
-                        MaybeSetPeerAsAnnouncingHeaderAndIDs(nodestate, pfrom, connman);
                         // In any case, we want to download using a compact block, not a regular one
                         vGetData[0] = CInv(MSG_CMPCT_BLOCK, vGetData[0].hash);
                     }

From 27765b6403cece54320374b37afb01a0cfe571c3 Mon Sep 17 00:00:00 2001
From: isle2983 <isle2983@yahoo.com>
Date: Sat, 31 Dec 2016 11:01:21 -0700
Subject: [PATCH 1442/1802] Increment MIT Licence copyright header year on
 files modified in 2016

Edited via:

$ contrib/devtools/copyright_header.py update .
---
 contrib/devtools/check-doc.py              | 2 +-
 contrib/devtools/optimize-pngs.py          | 2 +-
 contrib/linearize/linearize-data.py        | 2 +-
 contrib/linearize/linearize-hashes.py      | 2 +-
 contrib/macdeploy/custom_dsstore.py        | 2 +-
 contrib/seeds/makeseeds.py                 | 2 +-
 contrib/testgen/base58.py                  | 2 +-
 contrib/testgen/gen_base58_test_vectors.py | 2 +-
 qa/rpc-tests/bip68-112-113-p2p.py          | 2 +-
 qa/rpc-tests/bip9-softforks.py             | 2 +-
 qa/rpc-tests/preciousblock.py              | 2 +-
 share/rpcuser/rpcuser.py                   | 2 +-
 src/addrdb.cpp                             | 2 +-
 src/addrdb.h                               | 2 +-
 src/addrman.cpp                            | 2 +-
 src/addrman.h                              | 2 +-
 src/amount.cpp                             | 2 +-
 src/amount.h                               | 2 +-
 src/arith_uint256.cpp                      | 2 +-
 src/arith_uint256.h                        | 2 +-
 src/base58.cpp                             | 2 +-
 src/bench/Examples.cpp                     | 2 +-
 src/bench/bench.cpp                        | 2 +-
 src/bench/bench.h                          | 2 +-
 src/bench/bench_bitcoin.cpp                | 2 +-
 src/bench/coin_selection.cpp               | 2 +-
 src/bench/mempool_eviction.cpp             | 2 +-
 src/bitcoin-cli.cpp                        | 2 +-
 src/bitcoin-tx.cpp                         | 2 +-
 src/bitcoind.cpp                           | 2 +-
 src/bloom.cpp                              | 2 +-
 src/bloom.h                                | 2 +-
 src/chain.cpp                              | 2 +-
 src/chain.h                                | 2 +-
 src/chainparams.cpp                        | 2 +-
 src/chainparams.h                          | 2 +-
 src/checkpoints.cpp                        | 2 +-
 src/checkpoints.h                          | 2 +-
 src/clientversion.cpp                      | 2 +-
 src/clientversion.h                        | 2 +-
 src/coins.cpp                              | 2 +-
 src/coins.h                                | 2 +-
 src/compat.h                               | 2 +-
 src/compat/byteswap.h                      | 2 +-
 src/compat/endian.h                        | 2 +-
 src/compressor.h                           | 2 +-
 src/consensus/consensus.h                  | 2 +-
 src/consensus/merkle.cpp                   | 2 +-
 src/consensus/params.h                     | 2 +-
 src/consensus/validation.h                 | 2 +-
 src/core_io.h                              | 2 +-
 src/core_memusage.h                        | 2 +-
 src/core_read.cpp                          | 2 +-
 src/core_write.cpp                         | 2 +-
 src/crypto/aes.h                           | 2 +-
 src/crypto/ripemd160.h                     | 2 +-
 src/crypto/sha1.h                          | 2 +-
 src/crypto/sha256.h                        | 2 +-
 src/crypto/sha512.h                        | 2 +-
 src/dbwrapper.cpp                          | 2 +-
 src/dbwrapper.h                            | 2 +-
 src/hash.cpp                               | 2 +-
 src/hash.h                                 | 2 +-
 src/httprpc.cpp                            | 2 +-
 src/httpserver.cpp                         | 2 +-
 src/httpserver.h                           | 2 +-
 src/init.cpp                               | 2 +-
 src/init.h                                 | 2 +-
 src/key.cpp                                | 2 +-
 src/key.h                                  | 2 +-
 src/keystore.cpp                           | 2 +-
 src/limitedmap.h                           | 2 +-
 src/memusage.h                             | 2 +-
 src/merkleblock.cpp                        | 2 +-
 src/merkleblock.h                          | 2 +-
 src/miner.cpp                              | 2 +-
 src/miner.h                                | 2 +-
 src/net.cpp                                | 2 +-
 src/net.h                                  | 2 +-
 src/net_processing.h                       | 2 +-
 src/netaddress.cpp                         | 2 +-
 src/netaddress.h                           | 2 +-
 src/netbase.cpp                            | 2 +-
 src/netbase.h                              | 2 +-
 src/noui.cpp                               | 2 +-
 src/policy/fees.cpp                        | 2 +-
 src/policy/fees.h                          | 2 +-
 src/pow.cpp                                | 2 +-
 src/pow.h                                  | 2 +-
 src/prevector.h                            | 2 +-
 src/primitives/block.cpp                   | 2 +-
 src/primitives/block.h                     | 2 +-
 src/primitives/transaction.cpp             | 2 +-
 src/primitives/transaction.h               | 2 +-
 src/protocol.cpp                           | 2 +-
 src/protocol.h                             | 2 +-
 src/pubkey.cpp                             | 2 +-
 src/pubkey.h                               | 2 +-
 src/qt/addressbookpage.cpp                 | 2 +-
 src/qt/addresstablemodel.cpp               | 2 +-
 src/qt/askpassphrasedialog.cpp             | 2 +-
 src/qt/bantablemodel.cpp                   | 2 +-
 src/qt/bantablemodel.h                     | 2 +-
 src/qt/bitcoin.cpp                         | 2 +-
 src/qt/bitcoingui.cpp                      | 2 +-
 src/qt/bitcoingui.h                        | 2 +-
 src/qt/bitcoinunits.cpp                    | 2 +-
 src/qt/bitcoinunits.h                      | 2 +-
 src/qt/clientmodel.cpp                     | 2 +-
 src/qt/clientmodel.h                       | 2 +-
 src/qt/coincontroldialog.cpp               | 2 +-
 src/qt/coincontroldialog.h                 | 2 +-
 src/qt/csvmodelwriter.cpp                  | 2 +-
 src/qt/editaddressdialog.cpp               | 2 +-
 src/qt/guiconstants.h                      | 2 +-
 src/qt/guiutil.cpp                         | 2 +-
 src/qt/guiutil.h                           | 2 +-
 src/qt/intro.cpp                           | 2 +-
 src/qt/intro.h                             | 2 +-
 src/qt/networkstyle.cpp                    | 2 +-
 src/qt/notificator.cpp                     | 2 +-
 src/qt/optionsdialog.cpp                   | 2 +-
 src/qt/optionsdialog.h                     | 2 +-
 src/qt/optionsmodel.cpp                    | 2 +-
 src/qt/optionsmodel.h                      | 2 +-
 src/qt/overviewpage.cpp                    | 2 +-
 src/qt/overviewpage.h                      | 2 +-
 src/qt/paymentrequestplus.cpp              | 2 +-
 src/qt/paymentrequestplus.h                | 2 +-
 src/qt/paymentserver.cpp                   | 2 +-
 src/qt/paymentserver.h                     | 2 +-
 src/qt/peertablemodel.cpp                  | 2 +-
 src/qt/peertablemodel.h                    | 2 +-
 src/qt/platformstyle.cpp                   | 2 +-
 src/qt/qvalidatedlineedit.cpp              | 2 +-
 src/qt/qvaluecombobox.cpp                  | 2 +-
 src/qt/receivecoinsdialog.cpp              | 2 +-
 src/qt/receivecoinsdialog.h                | 2 +-
 src/qt/receiverequestdialog.cpp            | 2 +-
 src/qt/receiverequestdialog.h              | 2 +-
 src/qt/recentrequeststablemodel.cpp        | 2 +-
 src/qt/recentrequeststablemodel.h          | 2 +-
 src/qt/rpcconsole.cpp                      | 2 +-
 src/qt/rpcconsole.h                        | 2 +-
 src/qt/sendcoinsdialog.cpp                 | 2 +-
 src/qt/sendcoinsdialog.h                   | 2 +-
 src/qt/sendcoinsentry.cpp                  | 2 +-
 src/qt/signverifymessagedialog.cpp         | 2 +-
 src/qt/splashscreen.cpp                    | 2 +-
 src/qt/splashscreen.h                      | 2 +-
 src/qt/test/compattests.h                  | 2 +-
 src/qt/transactiondesc.cpp                 | 2 +-
 src/qt/transactiondescdialog.cpp           | 2 +-
 src/qt/transactionfilterproxy.cpp          | 2 +-
 src/qt/transactionrecord.cpp               | 2 +-
 src/qt/transactionrecord.h                 | 2 +-
 src/qt/transactiontablemodel.cpp           | 2 +-
 src/qt/transactiontablemodel.h             | 2 +-
 src/qt/transactionview.cpp                 | 2 +-
 src/qt/transactionview.h                   | 2 +-
 src/qt/utilitydialog.cpp                   | 2 +-
 src/qt/utilitydialog.h                     | 2 +-
 src/qt/walletframe.cpp                     | 2 +-
 src/qt/walletframe.h                       | 2 +-
 src/qt/walletmodel.cpp                     | 2 +-
 src/qt/walletmodel.h                       | 2 +-
 src/qt/walletmodeltransaction.cpp          | 2 +-
 src/qt/walletview.cpp                      | 2 +-
 src/qt/walletview.h                        | 2 +-
 src/qt/winshutdownmonitor.cpp              | 2 +-
 src/random.cpp                             | 2 +-
 src/random.h                               | 2 +-
 src/rest.cpp                               | 2 +-
 src/reverselock.h                          | 2 +-
 src/rpc/blockchain.cpp                     | 2 +-
 src/rpc/client.cpp                         | 2 +-
 src/rpc/client.h                           | 2 +-
 src/rpc/mining.cpp                         | 2 +-
 src/rpc/misc.cpp                           | 2 +-
 src/rpc/net.cpp                            | 2 +-
 src/rpc/protocol.cpp                       | 2 +-
 src/rpc/protocol.h                         | 2 +-
 src/rpc/rawtransaction.cpp                 | 2 +-
 src/rpc/server.cpp                         | 2 +-
 src/rpc/server.h                           | 2 +-
 src/scheduler.cpp                          | 2 +-
 src/script/bitcoinconsensus.cpp            | 2 +-
 src/script/interpreter.cpp                 | 2 +-
 src/script/ismine.cpp                      | 2 +-
 src/script/ismine.h                        | 2 +-
 src/script/script.cpp                      | 2 +-
 src/script/script.h                        | 2 +-
 src/script/script_error.cpp                | 2 +-
 src/script/script_error.h                  | 2 +-
 src/script/sigcache.cpp                    | 2 +-
 src/script/sigcache.h                      | 2 +-
 src/script/sign.h                          | 2 +-
 src/script/standard.cpp                    | 2 +-
 src/script/standard.h                      | 2 +-
 src/serialize.h                            | 2 +-
 src/streams.h                              | 2 +-
 src/support/allocators/secure.h            | 2 +-
 src/sync.cpp                               | 2 +-
 src/sync.h                                 | 2 +-
 src/test/DoS_tests.cpp                     | 2 +-
 src/test/addrman_tests.cpp                 | 2 +-
 src/test/allocator_tests.cpp               | 2 +-
 src/test/arith_uint256_tests.cpp           | 2 +-
 src/test/base58_tests.cpp                  | 2 +-
 src/test/blockencodings_tests.cpp          | 2 +-
 src/test/bloom_tests.cpp                   | 2 +-
 src/test/coins_tests.cpp                   | 2 +-
 src/test/crypto_tests.cpp                  | 2 +-
 src/test/dbwrapper_tests.cpp               | 2 +-
 src/test/hash_tests.cpp                    | 2 +-
 src/test/limitedmap_tests.cpp              | 2 +-
 src/test/main_tests.cpp                    | 2 +-
 src/test/mempool_tests.cpp                 | 2 +-
 src/test/merkle_tests.cpp                  | 2 +-
 src/test/miner_tests.cpp                   | 2 +-
 src/test/multisig_tests.cpp                | 2 +-
 src/test/netbase_tests.cpp                 | 2 +-
 src/test/pmt_tests.cpp                     | 2 +-
 src/test/policyestimator_tests.cpp         | 2 +-
 src/test/prevector_tests.cpp               | 2 +-
 src/test/reverselock_tests.cpp             | 2 +-
 src/test/rpc_tests.cpp                     | 2 +-
 src/test/scheduler_tests.cpp               | 2 +-
 src/test/script_P2SH_tests.cpp             | 2 +-
 src/test/script_tests.cpp                  | 2 +-
 src/test/serialize_tests.cpp               | 2 +-
 src/test/sighash_tests.cpp                 | 2 +-
 src/test/sigopcount_tests.cpp              | 2 +-
 src/test/skiplist_tests.cpp                | 2 +-
 src/test/streams_tests.cpp                 | 2 +-
 src/test/test_bitcoin.cpp                  | 2 +-
 src/test/test_bitcoin.h                    | 2 +-
 src/test/test_bitcoin_fuzzy.cpp            | 2 +-
 src/test/test_random.h                     | 2 +-
 src/test/txvalidationcache_tests.cpp       | 2 +-
 src/test/uint256_tests.cpp                 | 2 +-
 src/test/univalue_tests.cpp                | 2 +-
 src/test/util_tests.cpp                    | 2 +-
 src/timedata.cpp                           | 2 +-
 src/timedata.h                             | 2 +-
 src/torcontrol.cpp                         | 2 +-
 src/txdb.cpp                               | 2 +-
 src/txdb.h                                 | 2 +-
 src/txmempool.cpp                          | 2 +-
 src/txmempool.h                            | 2 +-
 src/ui_interface.h                         | 2 +-
 src/uint256.cpp                            | 2 +-
 src/uint256.h                              | 2 +-
 src/undo.h                                 | 2 +-
 src/util.cpp                               | 2 +-
 src/util.h                                 | 2 +-
 src/utilstrencodings.cpp                   | 2 +-
 src/utilstrencodings.h                     | 2 +-
 src/utiltime.cpp                           | 2 +-
 src/validation.h                           | 2 +-
 src/validationinterface.cpp                | 2 +-
 src/validationinterface.h                  | 2 +-
 src/version.h                              | 2 +-
 src/wallet/coincontrol.h                   | 2 +-
 src/wallet/crypter.cpp                     | 2 +-
 src/wallet/crypter.h                       | 2 +-
 src/wallet/db.cpp                          | 2 +-
 src/wallet/db.h                            | 2 +-
 src/wallet/rpcdump.cpp                     | 2 +-
 src/wallet/test/accounting_tests.cpp       | 2 +-
 src/wallet/test/crypto_tests.cpp           | 2 +-
 src/wallet/test/wallet_tests.cpp           | 2 +-
 src/wallet/wallet.cpp                      | 2 +-
 src/wallet/wallet.h                        | 2 +-
 src/wallet/walletdb.cpp                    | 2 +-
 src/wallet/walletdb.h                      | 2 +-
 src/zmq/zmqnotificationinterface.cpp       | 2 +-
 src/zmq/zmqnotificationinterface.h         | 2 +-
 src/zmq/zmqpublishnotifier.cpp             | 2 +-
 src/zmq/zmqpublishnotifier.h               | 2 +-
 280 files changed, 280 insertions(+), 280 deletions(-)

diff --git a/contrib/devtools/check-doc.py b/contrib/devtools/check-doc.py
index 9ea0131ac3aa4..249214e9318de 100755
--- a/contrib/devtools/check-doc.py
+++ b/contrib/devtools/check-doc.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Copyright (c) 2015 The Bitcoin Core developers
+# Copyright (c) 2015-2016 The Bitcoin Core developers
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/contrib/devtools/optimize-pngs.py b/contrib/devtools/optimize-pngs.py
index b7b8dc00820d2..0f653e010b95c 100755
--- a/contrib/devtools/optimize-pngs.py
+++ b/contrib/devtools/optimize-pngs.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Copyright (c) 2014-2015 The Bitcoin Core developers
+# Copyright (c) 2014-2016 The Bitcoin Core developers
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 '''
diff --git a/contrib/linearize/linearize-data.py b/contrib/linearize/linearize-data.py
index 8badb4b318b01..d0417748fc072 100755
--- a/contrib/linearize/linearize-data.py
+++ b/contrib/linearize/linearize-data.py
@@ -2,7 +2,7 @@
 #
 # linearize-data.py: Construct a linear, no-fork version of the chain.
 #
-# Copyright (c) 2013-2014 The Bitcoin Core developers
+# Copyright (c) 2013-2016 The Bitcoin Core developers
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 #
diff --git a/contrib/linearize/linearize-hashes.py b/contrib/linearize/linearize-hashes.py
index cb40c664fafde..ba8d6f8a044c8 100755
--- a/contrib/linearize/linearize-hashes.py
+++ b/contrib/linearize/linearize-hashes.py
@@ -2,7 +2,7 @@
 #
 # linearize-hashes.py:  List blocks in a linear, no-fork version of the chain.
 #
-# Copyright (c) 2013-2014 The Bitcoin Core developers
+# Copyright (c) 2013-2016 The Bitcoin Core developers
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 #
diff --git a/contrib/macdeploy/custom_dsstore.py b/contrib/macdeploy/custom_dsstore.py
index 03e2325fc0c3c..e6ecabace1a42 100755
--- a/contrib/macdeploy/custom_dsstore.py
+++ b/contrib/macdeploy/custom_dsstore.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Copyright (c) 2013-2015 The Bitcoin Core developers
+# Copyright (c) 2013-2016 The Bitcoin Core developers
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 from __future__ import division,print_function,unicode_literals
diff --git a/contrib/seeds/makeseeds.py b/contrib/seeds/makeseeds.py
index 041f224f40ebe..95498d20e2765 100755
--- a/contrib/seeds/makeseeds.py
+++ b/contrib/seeds/makeseeds.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Copyright (c) 2013-2015 The Bitcoin Core developers
+# Copyright (c) 2013-2016 The Bitcoin Core developers
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 #
diff --git a/contrib/testgen/base58.py b/contrib/testgen/base58.py
index 72b288b2dc9f3..bb0aeaff05b26 100644
--- a/contrib/testgen/base58.py
+++ b/contrib/testgen/base58.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2012 The Bitcoin Core developers
+# Copyright (c) 2012-2016 The Bitcoin Core developers
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 '''
diff --git a/contrib/testgen/gen_base58_test_vectors.py b/contrib/testgen/gen_base58_test_vectors.py
index 8518774db3d15..7e475b7a36a4f 100755
--- a/contrib/testgen/gen_base58_test_vectors.py
+++ b/contrib/testgen/gen_base58_test_vectors.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Copyright (c) 2012 The Bitcoin Core developers
+# Copyright (c) 2012-2016 The Bitcoin Core developers
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 '''
diff --git a/qa/rpc-tests/bip68-112-113-p2p.py b/qa/rpc-tests/bip68-112-113-p2p.py
index fc3efb1abf5c0..c96b746c9d298 100755
--- a/qa/rpc-tests/bip68-112-113-p2p.py
+++ b/qa/rpc-tests/bip68-112-113-p2p.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-# Copyright (c) 2015 The Bitcoin Core developers
+# Copyright (c) 2015-2016 The Bitcoin Core developers
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/qa/rpc-tests/bip9-softforks.py b/qa/rpc-tests/bip9-softforks.py
index c42ed44c259a3..69a10cc8b403f 100755
--- a/qa/rpc-tests/bip9-softforks.py
+++ b/qa/rpc-tests/bip9-softforks.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-# Copyright (c) 2015 The Bitcoin Core developers
+# Copyright (c) 2015-2016 The Bitcoin Core developers
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/qa/rpc-tests/preciousblock.py b/qa/rpc-tests/preciousblock.py
index 3cefa51c0a7f0..f43160e19a725 100755
--- a/qa/rpc-tests/preciousblock.py
+++ b/qa/rpc-tests/preciousblock.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-# Copyright (c) 2015 The Bitcoin Core developers
+# Copyright (c) 2015-2016 The Bitcoin Core developers
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/share/rpcuser/rpcuser.py b/share/rpcuser/rpcuser.py
index f806a810e08c9..63c69e308af24 100755
--- a/share/rpcuser/rpcuser.py
+++ b/share/rpcuser/rpcuser.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python2 
-# Copyright (c) 2015 The Bitcoin Core developers
+# Copyright (c) 2015-2016 The Bitcoin Core developers
 # Distributed under the MIT software license, see the accompanying 
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/addrdb.cpp b/src/addrdb.cpp
index 23715bbea466a..224d3921ccbbd 100644
--- a/src/addrdb.cpp
+++ b/src/addrdb.cpp
@@ -1,5 +1,5 @@
 // Copyright (c) 2009-2010 Satoshi Nakamoto
-// Copyright (c) 2009-2015 The Bitcoin Core developers
+// Copyright (c) 2009-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/addrdb.h b/src/addrdb.h
index 339943ca5af31..ab985b10cb20a 100644
--- a/src/addrdb.h
+++ b/src/addrdb.h
@@ -1,5 +1,5 @@
 // Copyright (c) 2009-2010 Satoshi Nakamoto
-// Copyright (c) 2009-2015 The Bitcoin Core developers
+// Copyright (c) 2009-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/addrman.cpp b/src/addrman.cpp
index 20165232122be..662e931d252b5 100644
--- a/src/addrman.cpp
+++ b/src/addrman.cpp
@@ -1,5 +1,5 @@
 // Copyright (c) 2012 Pieter Wuille
-// Copyright (c) 2012-2015 The Bitcoin Core developers
+// Copyright (c) 2012-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/addrman.h b/src/addrman.h
index 76e7b210f7c34..6e5f946bf282e 100644
--- a/src/addrman.h
+++ b/src/addrman.h
@@ -1,5 +1,5 @@
 // Copyright (c) 2012 Pieter Wuille
-// Copyright (c) 2012-2015 The Bitcoin Core developers
+// Copyright (c) 2012-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/amount.cpp b/src/amount.cpp
index 7b8618de332a6..a5f6bc3cd91bc 100644
--- a/src/amount.cpp
+++ b/src/amount.cpp
@@ -1,5 +1,5 @@
 // Copyright (c) 2009-2010 Satoshi Nakamoto
-// Copyright (c) 2009-2015 The Bitcoin Core developers
+// Copyright (c) 2009-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/amount.h b/src/amount.h
index ba0c86040f18c..93060f7193f45 100644
--- a/src/amount.h
+++ b/src/amount.h
@@ -1,5 +1,5 @@
 // Copyright (c) 2009-2010 Satoshi Nakamoto
-// Copyright (c) 2009-2015 The Bitcoin Core developers
+// Copyright (c) 2009-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/arith_uint256.cpp b/src/arith_uint256.cpp
index a58ad01b5af5b..f9f2d19e68159 100644
--- a/src/arith_uint256.cpp
+++ b/src/arith_uint256.cpp
@@ -1,5 +1,5 @@
 // Copyright (c) 2009-2010 Satoshi Nakamoto
-// Copyright (c) 2009-2014 The Bitcoin Core developers
+// Copyright (c) 2009-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/arith_uint256.h b/src/arith_uint256.h
index 5cc52f6e72af0..0f6b3d4fba856 100644
--- a/src/arith_uint256.h
+++ b/src/arith_uint256.h
@@ -1,5 +1,5 @@
 // Copyright (c) 2009-2010 Satoshi Nakamoto
-// Copyright (c) 2009-2015 The Bitcoin Core developers
+// Copyright (c) 2009-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/base58.cpp b/src/base58.cpp
index f7768b5a647fb..e2f475bb7feb6 100644
--- a/src/base58.cpp
+++ b/src/base58.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2015 The Bitcoin Core developers
+// Copyright (c) 2014-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/bench/Examples.cpp b/src/bench/Examples.cpp
index 9f35a1ea04b1c..314947d48c3f0 100644
--- a/src/bench/Examples.cpp
+++ b/src/bench/Examples.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2015 The Bitcoin Core developers
+// Copyright (c) 2015-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/bench/bench.cpp b/src/bench/bench.cpp
index af3d152c9a4ce..aa9dfef5774ba 100644
--- a/src/bench/bench.cpp
+++ b/src/bench/bench.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2015 The Bitcoin Core developers
+// Copyright (c) 2015-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/bench/bench.h b/src/bench/bench.h
index caf73e949b4f7..80dad6a8ef587 100644
--- a/src/bench/bench.h
+++ b/src/bench/bench.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2015 The Bitcoin Core developers
+// Copyright (c) 2015-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/bench/bench_bitcoin.cpp b/src/bench/bench_bitcoin.cpp
index bd768180c6d86..61a0b31aedd84 100644
--- a/src/bench/bench_bitcoin.cpp
+++ b/src/bench/bench_bitcoin.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2015 The Bitcoin Core developers
+// Copyright (c) 2015-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/bench/coin_selection.cpp b/src/bench/coin_selection.cpp
index cacead4a5948e..c961151f53c3b 100644
--- a/src/bench/coin_selection.cpp
+++ b/src/bench/coin_selection.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2015 The Bitcoin Core developers
+// Copyright (c) 2012-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/bench/mempool_eviction.cpp b/src/bench/mempool_eviction.cpp
index 0ae69c75fcaeb..8dc073554187d 100644
--- a/src/bench/mempool_eviction.cpp
+++ b/src/bench/mempool_eviction.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2011-2015 The Bitcoin Core developers
+// Copyright (c) 2011-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/bitcoin-cli.cpp b/src/bitcoin-cli.cpp
index 29d3cf67473e9..776fe65925650 100644
--- a/src/bitcoin-cli.cpp
+++ b/src/bitcoin-cli.cpp
@@ -1,5 +1,5 @@
 // Copyright (c) 2009-2010 Satoshi Nakamoto
-// Copyright (c) 2009-2015 The Bitcoin Core developers
+// Copyright (c) 2009-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/bitcoin-tx.cpp b/src/bitcoin-tx.cpp
index d46f330453058..24a53b65a0c54 100644
--- a/src/bitcoin-tx.cpp
+++ b/src/bitcoin-tx.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2009-2015 The Bitcoin Core developers
+// Copyright (c) 2009-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/bitcoind.cpp b/src/bitcoind.cpp
index 98551ee85032e..9bab3a2026dd1 100644
--- a/src/bitcoind.cpp
+++ b/src/bitcoind.cpp
@@ -1,5 +1,5 @@
 // Copyright (c) 2009-2010 Satoshi Nakamoto
-// Copyright (c) 2009-2015 The Bitcoin Core developers
+// Copyright (c) 2009-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/bloom.cpp b/src/bloom.cpp
index d00befc61ca68..520e10cdc8296 100644
--- a/src/bloom.cpp
+++ b/src/bloom.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2015 The Bitcoin Core developers
+// Copyright (c) 2012-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/bloom.h b/src/bloom.h
index d3a017371f30a..5ad727c330c7a 100644
--- a/src/bloom.h
+++ b/src/bloom.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2015 The Bitcoin Core developers
+// Copyright (c) 2012-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/chain.cpp b/src/chain.cpp
index 1e611906d146f..3cd7b33920446 100644
--- a/src/chain.cpp
+++ b/src/chain.cpp
@@ -1,5 +1,5 @@
 // Copyright (c) 2009-2010 Satoshi Nakamoto
-// Copyright (c) 2009-2014 The Bitcoin Core developers
+// Copyright (c) 2009-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/chain.h b/src/chain.h
index 0aac5de5c2297..989a71958ca15 100644
--- a/src/chain.h
+++ b/src/chain.h
@@ -1,5 +1,5 @@
 // Copyright (c) 2009-2010 Satoshi Nakamoto
-// Copyright (c) 2009-2015 The Bitcoin Core developers
+// Copyright (c) 2009-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/chainparams.cpp b/src/chainparams.cpp
index 3b3c0a5d3e2b0..1e294da9f4be8 100644
--- a/src/chainparams.cpp
+++ b/src/chainparams.cpp
@@ -1,5 +1,5 @@
 // Copyright (c) 2010 Satoshi Nakamoto
-// Copyright (c) 2009-2015 The Bitcoin Core developers
+// Copyright (c) 2009-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/chainparams.h b/src/chainparams.h
index 633fbd51203f1..381bac12f97de 100644
--- a/src/chainparams.h
+++ b/src/chainparams.h
@@ -1,5 +1,5 @@
 // Copyright (c) 2009-2010 Satoshi Nakamoto
-// Copyright (c) 2009-2015 The Bitcoin Core developers
+// Copyright (c) 2009-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/checkpoints.cpp b/src/checkpoints.cpp
index a487fb1dc4678..9a20747049a94 100644
--- a/src/checkpoints.cpp
+++ b/src/checkpoints.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2009-2015 The Bitcoin Core developers
+// Copyright (c) 2009-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/checkpoints.h b/src/checkpoints.h
index 04346f35ffa7c..f826de2319367 100644
--- a/src/checkpoints.h
+++ b/src/checkpoints.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2009-2015 The Bitcoin Core developers
+// Copyright (c) 2009-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/clientversion.cpp b/src/clientversion.cpp
index bfe9e16f80ee7..d2344ded09fe4 100644
--- a/src/clientversion.cpp
+++ b/src/clientversion.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2014 The Bitcoin Core developers
+// Copyright (c) 2012-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/clientversion.h b/src/clientversion.h
index 53ad460346466..0cd7e517eedb9 100644
--- a/src/clientversion.h
+++ b/src/clientversion.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2009-2015 The Bitcoin Core developers
+// Copyright (c) 2009-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/coins.cpp b/src/coins.cpp
index 8ff652b474bc8..04b3a6f23de29 100644
--- a/src/coins.cpp
+++ b/src/coins.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2015 The Bitcoin Core developers
+// Copyright (c) 2012-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/coins.h b/src/coins.h
index dd6ef6cc3a9a1..b1a2c08845321 100644
--- a/src/coins.h
+++ b/src/coins.h
@@ -1,5 +1,5 @@
 // Copyright (c) 2009-2010 Satoshi Nakamoto
-// Copyright (c) 2009-2015 The Bitcoin Core developers
+// Copyright (c) 2009-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/compat.h b/src/compat.h
index 2578d6d3445c4..28aa77eea22cc 100644
--- a/src/compat.h
+++ b/src/compat.h
@@ -1,5 +1,5 @@
 // Copyright (c) 2009-2010 Satoshi Nakamoto
-// Copyright (c) 2009-2015 The Bitcoin Core developers
+// Copyright (c) 2009-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/compat/byteswap.h b/src/compat/byteswap.h
index 56f4240e49d8d..3c5a5c0837981 100644
--- a/src/compat/byteswap.h
+++ b/src/compat/byteswap.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2014 The Bitcoin Core developers
+// Copyright (c) 2014-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/compat/endian.h b/src/compat/endian.h
index f7c1f9318a20b..79d6b2fdbb297 100644
--- a/src/compat/endian.h
+++ b/src/compat/endian.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2015 The Bitcoin Core developers
+// Copyright (c) 2014-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/compressor.h b/src/compressor.h
index 961365d2618a4..015911484a196 100644
--- a/src/compressor.h
+++ b/src/compressor.h
@@ -1,5 +1,5 @@
 // Copyright (c) 2009-2010 Satoshi Nakamoto
-// Copyright (c) 2009-2014 The Bitcoin Core developers
+// Copyright (c) 2009-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/consensus/consensus.h b/src/consensus/consensus.h
index 690856586604e..351911a3a47b7 100644
--- a/src/consensus/consensus.h
+++ b/src/consensus/consensus.h
@@ -1,5 +1,5 @@
 // Copyright (c) 2009-2010 Satoshi Nakamoto
-// Copyright (c) 2009-2015 The Bitcoin Core developers
+// Copyright (c) 2009-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/consensus/merkle.cpp b/src/consensus/merkle.cpp
index 6fa96ddf45fb1..1ce5a9d87eb05 100644
--- a/src/consensus/merkle.cpp
+++ b/src/consensus/merkle.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2015 The Bitcoin Core developers
+// Copyright (c) 2015-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/consensus/params.h b/src/consensus/params.h
index 20efc68ade8ec..edf445e1c7cfa 100644
--- a/src/consensus/params.h
+++ b/src/consensus/params.h
@@ -1,5 +1,5 @@
 // Copyright (c) 2009-2010 Satoshi Nakamoto
-// Copyright (c) 2009-2015 The Bitcoin Core developers
+// Copyright (c) 2009-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/consensus/validation.h b/src/consensus/validation.h
index 3e24294a64208..5a7d7f11a9bda 100644
--- a/src/consensus/validation.h
+++ b/src/consensus/validation.h
@@ -1,5 +1,5 @@
 // Copyright (c) 2009-2010 Satoshi Nakamoto
-// Copyright (c) 2009-2015 The Bitcoin Core developers
+// Copyright (c) 2009-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/core_io.h b/src/core_io.h
index 7642bc6d6e57c..2d63be5fc4fe0 100644
--- a/src/core_io.h
+++ b/src/core_io.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2009-2015 The Bitcoin Core developers
+// Copyright (c) 2009-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/core_memusage.h b/src/core_memusage.h
index 80f6216ee216d..5e101820758aa 100644
--- a/src/core_memusage.h
+++ b/src/core_memusage.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2015 The Bitcoin Core developers
+// Copyright (c) 2015-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/core_read.cpp b/src/core_read.cpp
index b6d0285459ed8..85bb62c1761dd 100644
--- a/src/core_read.cpp
+++ b/src/core_read.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2009-2015 The Bitcoin Core developers
+// Copyright (c) 2009-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/core_write.cpp b/src/core_write.cpp
index 9eed2270d50ce..ee8a897ca435d 100644
--- a/src/core_write.cpp
+++ b/src/core_write.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2009-2015 The Bitcoin Core developers
+// Copyright (c) 2009-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/crypto/aes.h b/src/crypto/aes.h
index 8cae357c1287e..e9f1b52e714e8 100644
--- a/src/crypto/aes.h
+++ b/src/crypto/aes.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2015 The Bitcoin Core developers
+// Copyright (c) 2015-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 //
diff --git a/src/crypto/ripemd160.h b/src/crypto/ripemd160.h
index bd41f02508404..38ea375c1fc17 100644
--- a/src/crypto/ripemd160.h
+++ b/src/crypto/ripemd160.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2014 The Bitcoin Core developers
+// Copyright (c) 2014-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/crypto/sha1.h b/src/crypto/sha1.h
index 8fb20810be66a..8b4568ee1223c 100644
--- a/src/crypto/sha1.h
+++ b/src/crypto/sha1.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2014 The Bitcoin Core developers
+// Copyright (c) 2014-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/crypto/sha256.h b/src/crypto/sha256.h
index 5b15b6a233b16..127e62a228fbc 100644
--- a/src/crypto/sha256.h
+++ b/src/crypto/sha256.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2014 The Bitcoin Core developers
+// Copyright (c) 2014-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/crypto/sha512.h b/src/crypto/sha512.h
index 614681fae2f11..cd1023bc85055 100644
--- a/src/crypto/sha512.h
+++ b/src/crypto/sha512.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2014 The Bitcoin Core developers
+// Copyright (c) 2014-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/dbwrapper.cpp b/src/dbwrapper.cpp
index 4fa06135d286f..94ebedeb72afd 100644
--- a/src/dbwrapper.cpp
+++ b/src/dbwrapper.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2015 The Bitcoin Core developers
+// Copyright (c) 2012-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/dbwrapper.h b/src/dbwrapper.h
index 08c72c25ddb71..787e2608db945 100644
--- a/src/dbwrapper.h
+++ b/src/dbwrapper.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2015 The Bitcoin Core developers
+// Copyright (c) 2012-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/hash.cpp b/src/hash.cpp
index 20a83342db4c9..a399ca9252a5f 100644
--- a/src/hash.cpp
+++ b/src/hash.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2013-2015 The Bitcoin Core developers
+// Copyright (c) 2013-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/hash.h b/src/hash.h
index 94e7f5ea6ccb8..3b86fcc033c1c 100644
--- a/src/hash.h
+++ b/src/hash.h
@@ -1,5 +1,5 @@
 // Copyright (c) 2009-2010 Satoshi Nakamoto
-// Copyright (c) 2009-2015 The Bitcoin Core developers
+// Copyright (c) 2009-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/httprpc.cpp b/src/httprpc.cpp
index 970ce2db73b7e..742ff2b8fb6a3 100644
--- a/src/httprpc.cpp
+++ b/src/httprpc.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2015 The Bitcoin Core developers
+// Copyright (c) 2015-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/httpserver.cpp b/src/httpserver.cpp
index 2573900746f37..1692b43f28afe 100644
--- a/src/httpserver.cpp
+++ b/src/httpserver.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2015 The Bitcoin Core developers
+// Copyright (c) 2015-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/httpserver.h b/src/httpserver.h
index 49d67f4b88427..b55b253beac1b 100644
--- a/src/httpserver.h
+++ b/src/httpserver.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2015 The Bitcoin Core developers
+// Copyright (c) 2015-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/init.cpp b/src/init.cpp
index 7d2bcb57b1b16..52a115b8c808d 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -1,5 +1,5 @@
 // Copyright (c) 2009-2010 Satoshi Nakamoto
-// Copyright (c) 2009-2015 The Bitcoin Core developers
+// Copyright (c) 2009-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/init.h b/src/init.h
index 1b87e0ec52013..8222794374781 100644
--- a/src/init.h
+++ b/src/init.h
@@ -1,5 +1,5 @@
 // Copyright (c) 2009-2010 Satoshi Nakamoto
-// Copyright (c) 2009-2015 The Bitcoin Core developers
+// Copyright (c) 2009-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/key.cpp b/src/key.cpp
index b3ea98fb92e6d..b4f0dc82027f8 100644
--- a/src/key.cpp
+++ b/src/key.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2009-2015 The Bitcoin Core developers
+// Copyright (c) 2009-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/key.h b/src/key.h
index ff5252b7a0fd9..37c74e8732d4d 100644
--- a/src/key.h
+++ b/src/key.h
@@ -1,5 +1,5 @@
 // Copyright (c) 2009-2010 Satoshi Nakamoto
-// Copyright (c) 2009-2015 The Bitcoin Core developers
+// Copyright (c) 2009-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/keystore.cpp b/src/keystore.cpp
index d568a7435098a..b17567e99b72e 100644
--- a/src/keystore.cpp
+++ b/src/keystore.cpp
@@ -1,5 +1,5 @@
 // Copyright (c) 2009-2010 Satoshi Nakamoto
-// Copyright (c) 2009-2015 The Bitcoin Core developers
+// Copyright (c) 2009-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/limitedmap.h b/src/limitedmap.h
index 7841d7f4a4abe..e9dcb6defdb1f 100644
--- a/src/limitedmap.h
+++ b/src/limitedmap.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2015 The Bitcoin Core developers
+// Copyright (c) 2012-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/memusage.h b/src/memusage.h
index 2e3c5a9b92de7..81e8702954fde 100644
--- a/src/memusage.h
+++ b/src/memusage.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2015 The Bitcoin Core developers
+// Copyright (c) 2015-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/merkleblock.cpp b/src/merkleblock.cpp
index 882717ac56b0e..86c8172a31df9 100644
--- a/src/merkleblock.cpp
+++ b/src/merkleblock.cpp
@@ -1,5 +1,5 @@
 // Copyright (c) 2009-2010 Satoshi Nakamoto
-// Copyright (c) 2009-2015 The Bitcoin Core developers
+// Copyright (c) 2009-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/merkleblock.h b/src/merkleblock.h
index 17c33194a95b1..73cbf670ee9c8 100644
--- a/src/merkleblock.h
+++ b/src/merkleblock.h
@@ -1,5 +1,5 @@
 // Copyright (c) 2009-2010 Satoshi Nakamoto
-// Copyright (c) 2009-2015 The Bitcoin Core developers
+// Copyright (c) 2009-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/miner.cpp b/src/miner.cpp
index 55231730fa138..856e9edc14638 100644
--- a/src/miner.cpp
+++ b/src/miner.cpp
@@ -1,5 +1,5 @@
 // Copyright (c) 2009-2010 Satoshi Nakamoto
-// Copyright (c) 2009-2015 The Bitcoin Core developers
+// Copyright (c) 2009-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/miner.h b/src/miner.h
index bad443b82ad37..3dd9bf4cabe92 100644
--- a/src/miner.h
+++ b/src/miner.h
@@ -1,5 +1,5 @@
 // Copyright (c) 2009-2010 Satoshi Nakamoto
-// Copyright (c) 2009-2015 The Bitcoin Core developers
+// Copyright (c) 2009-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/net.cpp b/src/net.cpp
index 3ac96235480d1..52fd725392ef8 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -1,5 +1,5 @@
 // Copyright (c) 2009-2010 Satoshi Nakamoto
-// Copyright (c) 2009-2015 The Bitcoin Core developers
+// Copyright (c) 2009-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/net.h b/src/net.h
index a7c0ecf324270..1d07864383a7f 100644
--- a/src/net.h
+++ b/src/net.h
@@ -1,5 +1,5 @@
 // Copyright (c) 2009-2010 Satoshi Nakamoto
-// Copyright (c) 2009-2015 The Bitcoin Core developers
+// Copyright (c) 2009-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/net_processing.h b/src/net_processing.h
index 130433cc7c005..dc250ebab6c9e 100644
--- a/src/net_processing.h
+++ b/src/net_processing.h
@@ -1,5 +1,5 @@
 // Copyright (c) 2009-2010 Satoshi Nakamoto
-// Copyright (c) 2009-2015 The Bitcoin Core developers
+// Copyright (c) 2009-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/netaddress.cpp b/src/netaddress.cpp
index db5cc3bc20a0e..ab07270f3f908 100644
--- a/src/netaddress.cpp
+++ b/src/netaddress.cpp
@@ -1,5 +1,5 @@
 // Copyright (c) 2009-2010 Satoshi Nakamoto
-// Copyright (c) 2009-2015 The Bitcoin Core developers
+// Copyright (c) 2009-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/netaddress.h b/src/netaddress.h
index 9dffaa57e7a6a..bc430dd82335e 100644
--- a/src/netaddress.h
+++ b/src/netaddress.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2009-2015 The Bitcoin Core developers
+// Copyright (c) 2009-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/netbase.cpp b/src/netbase.cpp
index da94fd4d13d8d..21aa645de90bc 100644
--- a/src/netbase.cpp
+++ b/src/netbase.cpp
@@ -1,5 +1,5 @@
 // Copyright (c) 2009-2010 Satoshi Nakamoto
-// Copyright (c) 2009-2015 The Bitcoin Core developers
+// Copyright (c) 2009-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/netbase.h b/src/netbase.h
index eb39d16578ed4..0337d0d54bb18 100644
--- a/src/netbase.h
+++ b/src/netbase.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2009-2015 The Bitcoin Core developers
+// Copyright (c) 2009-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/noui.cpp b/src/noui.cpp
index 0d9207c11a319..4bfb75fa2977a 100644
--- a/src/noui.cpp
+++ b/src/noui.cpp
@@ -1,5 +1,5 @@
 // Copyright (c) 2010 Satoshi Nakamoto
-// Copyright (c) 2009-2014 The Bitcoin Core developers
+// Copyright (c) 2009-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/policy/fees.cpp b/src/policy/fees.cpp
index 9eb831bc17c42..0f2e3c100d908 100644
--- a/src/policy/fees.cpp
+++ b/src/policy/fees.cpp
@@ -1,5 +1,5 @@
 // Copyright (c) 2009-2010 Satoshi Nakamoto
-// Copyright (c) 2009-2015 The Bitcoin Core developers
+// Copyright (c) 2009-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/policy/fees.h b/src/policy/fees.h
index ea4c70e6167af..73f8e081a4063 100644
--- a/src/policy/fees.h
+++ b/src/policy/fees.h
@@ -1,5 +1,5 @@
 // Copyright (c) 2009-2010 Satoshi Nakamoto
-// Copyright (c) 2009-2015 The Bitcoin Core developers
+// Copyright (c) 2009-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 #ifndef BITCOIN_POLICYESTIMATOR_H
diff --git a/src/pow.cpp b/src/pow.cpp
index 1db3b692932fe..e57fd866f8a62 100644
--- a/src/pow.cpp
+++ b/src/pow.cpp
@@ -1,5 +1,5 @@
 // Copyright (c) 2009-2010 Satoshi Nakamoto
-// Copyright (c) 2009-2015 The Bitcoin Core developers
+// Copyright (c) 2009-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/pow.h b/src/pow.h
index 23e9c1c3512dc..e203f492a19d8 100644
--- a/src/pow.h
+++ b/src/pow.h
@@ -1,5 +1,5 @@
 // Copyright (c) 2009-2010 Satoshi Nakamoto
-// Copyright (c) 2009-2015 The Bitcoin Core developers
+// Copyright (c) 2009-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/prevector.h b/src/prevector.h
index 46af80d1e60da..6b2f578f5c869 100644
--- a/src/prevector.h
+++ b/src/prevector.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2015 The Bitcoin Core developers
+// Copyright (c) 2015-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/primitives/block.cpp b/src/primitives/block.cpp
index 95bd2211f91d7..9a979094ccb16 100644
--- a/src/primitives/block.cpp
+++ b/src/primitives/block.cpp
@@ -1,5 +1,5 @@
 // Copyright (c) 2009-2010 Satoshi Nakamoto
-// Copyright (c) 2009-2015 The Bitcoin Core developers
+// Copyright (c) 2009-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/primitives/block.h b/src/primitives/block.h
index b037fc839c9d9..4c6eb20ad5e3f 100644
--- a/src/primitives/block.h
+++ b/src/primitives/block.h
@@ -1,5 +1,5 @@
 // Copyright (c) 2009-2010 Satoshi Nakamoto
-// Copyright (c) 2009-2015 The Bitcoin Core developers
+// Copyright (c) 2009-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/primitives/transaction.cpp b/src/primitives/transaction.cpp
index faf3637d74395..790bc71d14b78 100644
--- a/src/primitives/transaction.cpp
+++ b/src/primitives/transaction.cpp
@@ -1,5 +1,5 @@
 // Copyright (c) 2009-2010 Satoshi Nakamoto
-// Copyright (c) 2009-2015 The Bitcoin Core developers
+// Copyright (c) 2009-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/primitives/transaction.h b/src/primitives/transaction.h
index 4c4a238dd5130..be3d7989a18be 100644
--- a/src/primitives/transaction.h
+++ b/src/primitives/transaction.h
@@ -1,5 +1,5 @@
 // Copyright (c) 2009-2010 Satoshi Nakamoto
-// Copyright (c) 2009-2015 The Bitcoin Core developers
+// Copyright (c) 2009-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/protocol.cpp b/src/protocol.cpp
index 87d6e06848c1c..28d1d0eeb4fad 100644
--- a/src/protocol.cpp
+++ b/src/protocol.cpp
@@ -1,5 +1,5 @@
 // Copyright (c) 2009-2010 Satoshi Nakamoto
-// Copyright (c) 2009-2015 The Bitcoin Core developers
+// Copyright (c) 2009-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/protocol.h b/src/protocol.h
index dea409c5b77fb..eba39ab1e50ce 100644
--- a/src/protocol.h
+++ b/src/protocol.h
@@ -1,5 +1,5 @@
 // Copyright (c) 2009-2010 Satoshi Nakamoto
-// Copyright (c) 2009-2015 The Bitcoin Core developers
+// Copyright (c) 2009-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/pubkey.cpp b/src/pubkey.cpp
index 91a657593a4a6..e57fa238cb83b 100644
--- a/src/pubkey.cpp
+++ b/src/pubkey.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2009-2015 The Bitcoin Core developers
+// Copyright (c) 2009-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/pubkey.h b/src/pubkey.h
index 9499862210ae5..dbf0e23f2076e 100644
--- a/src/pubkey.h
+++ b/src/pubkey.h
@@ -1,5 +1,5 @@
 // Copyright (c) 2009-2010 Satoshi Nakamoto
-// Copyright (c) 2009-2015 The Bitcoin Core developers
+// Copyright (c) 2009-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/qt/addressbookpage.cpp b/src/qt/addressbookpage.cpp
index 6076837fde843..b1253a9f1704c 100644
--- a/src/qt/addressbookpage.cpp
+++ b/src/qt/addressbookpage.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2011-2015 The Bitcoin Core developers
+// Copyright (c) 2011-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/qt/addresstablemodel.cpp b/src/qt/addresstablemodel.cpp
index 830c9cdf19bb7..93120de1eae6e 100644
--- a/src/qt/addresstablemodel.cpp
+++ b/src/qt/addresstablemodel.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2011-2015 The Bitcoin Core developers
+// Copyright (c) 2011-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/qt/askpassphrasedialog.cpp b/src/qt/askpassphrasedialog.cpp
index 129ea1efa4f04..e9f5c77a5b0b4 100644
--- a/src/qt/askpassphrasedialog.cpp
+++ b/src/qt/askpassphrasedialog.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2011-2015 The Bitcoin Core developers
+// Copyright (c) 2011-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/qt/bantablemodel.cpp b/src/qt/bantablemodel.cpp
index fe53d89ba9343..00a915dd8db7e 100644
--- a/src/qt/bantablemodel.cpp
+++ b/src/qt/bantablemodel.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2011-2015 The Bitcoin Core developers
+// Copyright (c) 2011-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/qt/bantablemodel.h b/src/qt/bantablemodel.h
index 3c03d05c05177..062cfdc931553 100644
--- a/src/qt/bantablemodel.h
+++ b/src/qt/bantablemodel.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011-2015 The Bitcoin Core developers
+// Copyright (c) 2011-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp
index 36d803ce07afb..16b5893753f20 100644
--- a/src/qt/bitcoin.cpp
+++ b/src/qt/bitcoin.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2011-2015 The Bitcoin Core developers
+// Copyright (c) 2011-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp
index 651ff842930f0..9d5ff31fb4f57 100644
--- a/src/qt/bitcoingui.cpp
+++ b/src/qt/bitcoingui.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2011-2015 The Bitcoin Core developers
+// Copyright (c) 2011-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/qt/bitcoingui.h b/src/qt/bitcoingui.h
index 59540bfe6baa7..c8b6ce5474a46 100644
--- a/src/qt/bitcoingui.h
+++ b/src/qt/bitcoingui.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011-2015 The Bitcoin Core developers
+// Copyright (c) 2011-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/qt/bitcoinunits.cpp b/src/qt/bitcoinunits.cpp
index 649005789714f..4da414a4e37fb 100644
--- a/src/qt/bitcoinunits.cpp
+++ b/src/qt/bitcoinunits.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2011-2015 The Bitcoin Core developers
+// Copyright (c) 2011-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/qt/bitcoinunits.h b/src/qt/bitcoinunits.h
index fda067b0b83ba..6ef37de380b4e 100644
--- a/src/qt/bitcoinunits.h
+++ b/src/qt/bitcoinunits.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011-2015 The Bitcoin Core developers
+// Copyright (c) 2011-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/qt/clientmodel.cpp b/src/qt/clientmodel.cpp
index e63a9cc7b8b10..20a04dc8a8931 100644
--- a/src/qt/clientmodel.cpp
+++ b/src/qt/clientmodel.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2011-2015 The Bitcoin Core developers
+// Copyright (c) 2011-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/qt/clientmodel.h b/src/qt/clientmodel.h
index a641401425498..c01c1a84cfa3c 100644
--- a/src/qt/clientmodel.h
+++ b/src/qt/clientmodel.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011-2015 The Bitcoin Core developers
+// Copyright (c) 2011-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/qt/coincontroldialog.cpp b/src/qt/coincontroldialog.cpp
index 4d34bf95e9d18..a0c2813477850 100644
--- a/src/qt/coincontroldialog.cpp
+++ b/src/qt/coincontroldialog.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2011-2015 The Bitcoin Core developers
+// Copyright (c) 2011-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/qt/coincontroldialog.h b/src/qt/coincontroldialog.h
index 7c2269b1eb673..0b8162f8580e1 100644
--- a/src/qt/coincontroldialog.h
+++ b/src/qt/coincontroldialog.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011-2015 The Bitcoin Core developers
+// Copyright (c) 2011-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/qt/csvmodelwriter.cpp b/src/qt/csvmodelwriter.cpp
index f424e6cd98243..df59927782d94 100644
--- a/src/qt/csvmodelwriter.cpp
+++ b/src/qt/csvmodelwriter.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2011-2014 The Bitcoin Core developers
+// Copyright (c) 2011-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/qt/editaddressdialog.cpp b/src/qt/editaddressdialog.cpp
index a9ffe016fd91d..bb03c12f2d551 100644
--- a/src/qt/editaddressdialog.cpp
+++ b/src/qt/editaddressdialog.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2011-2014 The Bitcoin Core developers
+// Copyright (c) 2011-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/qt/guiconstants.h b/src/qt/guiconstants.h
index bab9923d20d49..1d21d8c766eae 100644
--- a/src/qt/guiconstants.h
+++ b/src/qt/guiconstants.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011-2015 The Bitcoin Core developers
+// Copyright (c) 2011-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/qt/guiutil.cpp b/src/qt/guiutil.cpp
index 8132e4fe0d0b0..10c5d9a8da3dd 100644
--- a/src/qt/guiutil.cpp
+++ b/src/qt/guiutil.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2011-2015 The Bitcoin Core developers
+// Copyright (c) 2011-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/qt/guiutil.h b/src/qt/guiutil.h
index 4ea2aa36e76eb..b2c9338b5679a 100644
--- a/src/qt/guiutil.h
+++ b/src/qt/guiutil.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011-2015 The Bitcoin Core developers
+// Copyright (c) 2011-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/qt/intro.cpp b/src/qt/intro.cpp
index 5a336b105ec7b..e0678f45fc3be 100644
--- a/src/qt/intro.cpp
+++ b/src/qt/intro.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2011-2015 The Bitcoin Core developers
+// Copyright (c) 2011-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/qt/intro.h b/src/qt/intro.h
index ee768a7ad8d1d..5b428b379c494 100644
--- a/src/qt/intro.h
+++ b/src/qt/intro.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011-2015 The Bitcoin Core developers
+// Copyright (c) 2011-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/qt/networkstyle.cpp b/src/qt/networkstyle.cpp
index acbfee08684d1..93092501c9d68 100644
--- a/src/qt/networkstyle.cpp
+++ b/src/qt/networkstyle.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2015 The Bitcoin Core developers
+// Copyright (c) 2014-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/qt/notificator.cpp b/src/qt/notificator.cpp
index 8277e20c909ba..8718929c6a89c 100644
--- a/src/qt/notificator.cpp
+++ b/src/qt/notificator.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2011-2014 The Bitcoin Core developers
+// Copyright (c) 2011-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/qt/optionsdialog.cpp b/src/qt/optionsdialog.cpp
index 2d5e9ff686dcb..89f633aa73b8f 100644
--- a/src/qt/optionsdialog.cpp
+++ b/src/qt/optionsdialog.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2011-2015 The Bitcoin Core developers
+// Copyright (c) 2011-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/qt/optionsdialog.h b/src/qt/optionsdialog.h
index 41b56d1386257..d98c1dc19364c 100644
--- a/src/qt/optionsdialog.h
+++ b/src/qt/optionsdialog.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011-2015 The Bitcoin Core developers
+// Copyright (c) 2011-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/qt/optionsmodel.cpp b/src/qt/optionsmodel.cpp
index ce3a040109e15..d6e740ee9c10b 100644
--- a/src/qt/optionsmodel.cpp
+++ b/src/qt/optionsmodel.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2011-2015 The Bitcoin Core developers
+// Copyright (c) 2011-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/qt/optionsmodel.h b/src/qt/optionsmodel.h
index d2e1fb23a3dd0..78529fbdcc921 100644
--- a/src/qt/optionsmodel.h
+++ b/src/qt/optionsmodel.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011-2015 The Bitcoin Core developers
+// Copyright (c) 2011-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/qt/overviewpage.cpp b/src/qt/overviewpage.cpp
index ea1bb2fc94b4a..ba344f4dbf8ed 100644
--- a/src/qt/overviewpage.cpp
+++ b/src/qt/overviewpage.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2011-2015 The Bitcoin Core developers
+// Copyright (c) 2011-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/qt/overviewpage.h b/src/qt/overviewpage.h
index ffe0de328c603..d76b651ce6394 100644
--- a/src/qt/overviewpage.h
+++ b/src/qt/overviewpage.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011-2015 The Bitcoin Core developers
+// Copyright (c) 2011-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/qt/paymentrequestplus.cpp b/src/qt/paymentrequestplus.cpp
index 82be4d831f6cd..5101e4e0ee474 100644
--- a/src/qt/paymentrequestplus.cpp
+++ b/src/qt/paymentrequestplus.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2011-2015 The Bitcoin Core developers
+// Copyright (c) 2011-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/qt/paymentrequestplus.h b/src/qt/paymentrequestplus.h
index a8bfcd2ac401f..ee1a37d83cdeb 100644
--- a/src/qt/paymentrequestplus.h
+++ b/src/qt/paymentrequestplus.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011-2015 The Bitcoin Core developers
+// Copyright (c) 2011-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/qt/paymentserver.cpp b/src/qt/paymentserver.cpp
index d5f0156d6cc73..6b2871424d71d 100644
--- a/src/qt/paymentserver.cpp
+++ b/src/qt/paymentserver.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2011-2015 The Bitcoin Core developers
+// Copyright (c) 2011-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/qt/paymentserver.h b/src/qt/paymentserver.h
index 7202e7dada7b9..37ee522d54398 100644
--- a/src/qt/paymentserver.h
+++ b/src/qt/paymentserver.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011-2015 The Bitcoin Core developers
+// Copyright (c) 2011-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/qt/peertablemodel.cpp b/src/qt/peertablemodel.cpp
index dd4bd5539640d..974a71ddca64b 100644
--- a/src/qt/peertablemodel.cpp
+++ b/src/qt/peertablemodel.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2011-2015 The Bitcoin Core developers
+// Copyright (c) 2011-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/qt/peertablemodel.h b/src/qt/peertablemodel.h
index 3e4f0a68c460d..cc47b67ec9b07 100644
--- a/src/qt/peertablemodel.h
+++ b/src/qt/peertablemodel.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011-2015 The Bitcoin Core developers
+// Copyright (c) 2011-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/qt/platformstyle.cpp b/src/qt/platformstyle.cpp
index e4438cc43d83c..90bd619c0410f 100644
--- a/src/qt/platformstyle.cpp
+++ b/src/qt/platformstyle.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2015 The Bitcoin Core developers
+// Copyright (c) 2015-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/qt/qvalidatedlineedit.cpp b/src/qt/qvalidatedlineedit.cpp
index 492b96ff09b61..179ecdc8b3835 100644
--- a/src/qt/qvalidatedlineedit.cpp
+++ b/src/qt/qvalidatedlineedit.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2011-2015 The Bitcoin Core developers
+// Copyright (c) 2011-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/qt/qvaluecombobox.cpp b/src/qt/qvaluecombobox.cpp
index 2f2478783c02c..a3b9b994ec2b1 100644
--- a/src/qt/qvaluecombobox.cpp
+++ b/src/qt/qvaluecombobox.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2011-2015 The Bitcoin Core developers
+// Copyright (c) 2011-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/qt/receivecoinsdialog.cpp b/src/qt/receivecoinsdialog.cpp
index dd83547a91731..e98f4d3347448 100644
--- a/src/qt/receivecoinsdialog.cpp
+++ b/src/qt/receivecoinsdialog.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2011-2015 The Bitcoin Core developers
+// Copyright (c) 2011-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/qt/receivecoinsdialog.h b/src/qt/receivecoinsdialog.h
index d137f1616e796..1d0491c0d5b55 100644
--- a/src/qt/receivecoinsdialog.h
+++ b/src/qt/receivecoinsdialog.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011-2015 The Bitcoin Core developers
+// Copyright (c) 2011-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/qt/receiverequestdialog.cpp b/src/qt/receiverequestdialog.cpp
index f896461735ce5..3752fa4b66b2b 100644
--- a/src/qt/receiverequestdialog.cpp
+++ b/src/qt/receiverequestdialog.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2011-2015 The Bitcoin Core developers
+// Copyright (c) 2011-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/qt/receiverequestdialog.h b/src/qt/receiverequestdialog.h
index 676745a858f6c..1a9b1652371b0 100644
--- a/src/qt/receiverequestdialog.h
+++ b/src/qt/receiverequestdialog.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011-2015 The Bitcoin Core developers
+// Copyright (c) 2011-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/qt/recentrequeststablemodel.cpp b/src/qt/recentrequeststablemodel.cpp
index 35d37bb22bb08..dac3979290788 100644
--- a/src/qt/recentrequeststablemodel.cpp
+++ b/src/qt/recentrequeststablemodel.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2011-2015 The Bitcoin Core developers
+// Copyright (c) 2011-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/qt/recentrequeststablemodel.h b/src/qt/recentrequeststablemodel.h
index 8ee2c9cbac309..0c02968f928fe 100644
--- a/src/qt/recentrequeststablemodel.h
+++ b/src/qt/recentrequeststablemodel.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011-2015 The Bitcoin Core developers
+// Copyright (c) 2011-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/qt/rpcconsole.cpp b/src/qt/rpcconsole.cpp
index cfe197de2a6f8..480c68cbf1fad 100644
--- a/src/qt/rpcconsole.cpp
+++ b/src/qt/rpcconsole.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2011-2015 The Bitcoin Core developers
+// Copyright (c) 2011-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/qt/rpcconsole.h b/src/qt/rpcconsole.h
index ab8c3dc9142fd..693d2f238e1bf 100644
--- a/src/qt/rpcconsole.h
+++ b/src/qt/rpcconsole.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011-2015 The Bitcoin Core developers
+// Copyright (c) 2011-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/qt/sendcoinsdialog.cpp b/src/qt/sendcoinsdialog.cpp
index 13210a1adc4fb..cb8978fc81e29 100644
--- a/src/qt/sendcoinsdialog.cpp
+++ b/src/qt/sendcoinsdialog.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2011-2015 The Bitcoin Core developers
+// Copyright (c) 2011-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/qt/sendcoinsdialog.h b/src/qt/sendcoinsdialog.h
index b0df495a98699..a402edc9610d9 100644
--- a/src/qt/sendcoinsdialog.h
+++ b/src/qt/sendcoinsdialog.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011-2015 The Bitcoin Core developers
+// Copyright (c) 2011-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/qt/sendcoinsentry.cpp b/src/qt/sendcoinsentry.cpp
index 7eb1eb7e3a128..bb0f47b21c0f4 100644
--- a/src/qt/sendcoinsentry.cpp
+++ b/src/qt/sendcoinsentry.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2011-2015 The Bitcoin Core developers
+// Copyright (c) 2011-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/qt/signverifymessagedialog.cpp b/src/qt/signverifymessagedialog.cpp
index e28a6b47af570..0950ed02342d3 100644
--- a/src/qt/signverifymessagedialog.cpp
+++ b/src/qt/signverifymessagedialog.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2011-2015 The Bitcoin Core developers
+// Copyright (c) 2011-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/qt/splashscreen.cpp b/src/qt/splashscreen.cpp
index 1b6e28e93e67a..f4377247e156b 100644
--- a/src/qt/splashscreen.cpp
+++ b/src/qt/splashscreen.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2011-2015 The Bitcoin Core developers
+// Copyright (c) 2011-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/qt/splashscreen.h b/src/qt/splashscreen.h
index d1727b66c9276..95a65cc53c69e 100644
--- a/src/qt/splashscreen.h
+++ b/src/qt/splashscreen.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011-2015 The Bitcoin Core developers
+// Copyright (c) 2011-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/qt/test/compattests.h b/src/qt/test/compattests.h
index 35dede774344c..1af97696b2fea 100644
--- a/src/qt/test/compattests.h
+++ b/src/qt/test/compattests.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2009-2015 The Bitcoin Core developers
+// Copyright (c) 2009-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/qt/transactiondesc.cpp b/src/qt/transactiondesc.cpp
index e7d03a6119ea4..7e16cc9dd4130 100644
--- a/src/qt/transactiondesc.cpp
+++ b/src/qt/transactiondesc.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2011-2015 The Bitcoin Core developers
+// Copyright (c) 2011-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/qt/transactiondescdialog.cpp b/src/qt/transactiondescdialog.cpp
index 65adcc4f023e3..65f163deb20d6 100644
--- a/src/qt/transactiondescdialog.cpp
+++ b/src/qt/transactiondescdialog.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2011-2014 The Bitcoin Core developers
+// Copyright (c) 2011-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/qt/transactionfilterproxy.cpp b/src/qt/transactionfilterproxy.cpp
index e21b89b935483..44e4ef8238419 100644
--- a/src/qt/transactionfilterproxy.cpp
+++ b/src/qt/transactionfilterproxy.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2011-2014 The Bitcoin Core developers
+// Copyright (c) 2011-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/qt/transactionrecord.cpp b/src/qt/transactionrecord.cpp
index a1d14223176cb..cbdedbf68be11 100644
--- a/src/qt/transactionrecord.cpp
+++ b/src/qt/transactionrecord.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2011-2015 The Bitcoin Core developers
+// Copyright (c) 2011-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/qt/transactionrecord.h b/src/qt/transactionrecord.h
index 8eff302affe11..5aabbbffa8cb4 100644
--- a/src/qt/transactionrecord.h
+++ b/src/qt/transactionrecord.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011-2014 The Bitcoin Core developers
+// Copyright (c) 2011-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/qt/transactiontablemodel.cpp b/src/qt/transactiontablemodel.cpp
index da0742aa6a314..61466c8ed1d61 100644
--- a/src/qt/transactiontablemodel.cpp
+++ b/src/qt/transactiontablemodel.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2011-2015 The Bitcoin Core developers
+// Copyright (c) 2011-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/qt/transactiontablemodel.h b/src/qt/transactiontablemodel.h
index 6932646e1e506..80aeb64c41d1e 100644
--- a/src/qt/transactiontablemodel.h
+++ b/src/qt/transactiontablemodel.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011-2015 The Bitcoin Core developers
+// Copyright (c) 2011-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/qt/transactionview.cpp b/src/qt/transactionview.cpp
index f5cbde6238d7f..30f4db945060e 100644
--- a/src/qt/transactionview.cpp
+++ b/src/qt/transactionview.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2011-2015 The Bitcoin Core developers
+// Copyright (c) 2011-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/qt/transactionview.h b/src/qt/transactionview.h
index e9b9d5b6bc9e2..595701cdd9c8b 100644
--- a/src/qt/transactionview.h
+++ b/src/qt/transactionview.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011-2015 The Bitcoin Core developers
+// Copyright (c) 2011-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/qt/utilitydialog.cpp b/src/qt/utilitydialog.cpp
index 4ec022881c1a7..70efe279907da 100644
--- a/src/qt/utilitydialog.cpp
+++ b/src/qt/utilitydialog.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2011-2015 The Bitcoin Core developers
+// Copyright (c) 2011-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/qt/utilitydialog.h b/src/qt/utilitydialog.h
index b930429578c43..1b6781c5fc285 100644
--- a/src/qt/utilitydialog.h
+++ b/src/qt/utilitydialog.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011-2015 The Bitcoin Core developers
+// Copyright (c) 2011-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/qt/walletframe.cpp b/src/qt/walletframe.cpp
index 69dcc9abb1685..f3183320f01d1 100644
--- a/src/qt/walletframe.cpp
+++ b/src/qt/walletframe.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2011-2015 The Bitcoin Core developers
+// Copyright (c) 2011-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/qt/walletframe.h b/src/qt/walletframe.h
index 7bc6412910393..42ce69fea150b 100644
--- a/src/qt/walletframe.h
+++ b/src/qt/walletframe.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011-2015 The Bitcoin Core developers
+// Copyright (c) 2011-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/qt/walletmodel.cpp b/src/qt/walletmodel.cpp
index afc72fae6981a..0a5a7c3e9f9d7 100644
--- a/src/qt/walletmodel.cpp
+++ b/src/qt/walletmodel.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2011-2015 The Bitcoin Core developers
+// Copyright (c) 2011-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/qt/walletmodel.h b/src/qt/walletmodel.h
index eedf6e8cea712..cd7585635fb62 100644
--- a/src/qt/walletmodel.h
+++ b/src/qt/walletmodel.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011-2015 The Bitcoin Core developers
+// Copyright (c) 2011-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/qt/walletmodeltransaction.cpp b/src/qt/walletmodeltransaction.cpp
index f9a95bed4272e..b4445c8166a89 100644
--- a/src/qt/walletmodeltransaction.cpp
+++ b/src/qt/walletmodeltransaction.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2011-2015 The Bitcoin Core developers
+// Copyright (c) 2011-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/qt/walletview.cpp b/src/qt/walletview.cpp
index a9518413c2a42..4a18c0bd4d54d 100644
--- a/src/qt/walletview.cpp
+++ b/src/qt/walletview.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2011-2015 The Bitcoin Core developers
+// Copyright (c) 2011-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/qt/walletview.h b/src/qt/walletview.h
index aaa6aacbf0747..c1f8422f0c1b5 100644
--- a/src/qt/walletview.h
+++ b/src/qt/walletview.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011-2015 The Bitcoin Core developers
+// Copyright (c) 2011-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/qt/winshutdownmonitor.cpp b/src/qt/winshutdownmonitor.cpp
index a11da50588262..d6f40c38b87e1 100644
--- a/src/qt/winshutdownmonitor.cpp
+++ b/src/qt/winshutdownmonitor.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2014 The Bitcoin Core developers
+// Copyright (c) 2014-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/random.cpp b/src/random.cpp
index c2605b45bd15c..6634019bea8b8 100644
--- a/src/random.cpp
+++ b/src/random.cpp
@@ -1,5 +1,5 @@
 // Copyright (c) 2009-2010 Satoshi Nakamoto
-// Copyright (c) 2009-2015 The Bitcoin Core developers
+// Copyright (c) 2009-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/random.h b/src/random.h
index e97d2d1fb0b54..664f030eba268 100644
--- a/src/random.h
+++ b/src/random.h
@@ -1,5 +1,5 @@
 // Copyright (c) 2009-2010 Satoshi Nakamoto
-// Copyright (c) 2009-2014 The Bitcoin Core developers
+// Copyright (c) 2009-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/rest.cpp b/src/rest.cpp
index 6b6b7401f6a3c..8a7c985e72873 100644
--- a/src/rest.cpp
+++ b/src/rest.cpp
@@ -1,5 +1,5 @@
 // Copyright (c) 2009-2010 Satoshi Nakamoto
-// Copyright (c) 2009-2015 The Bitcoin Core developers
+// Copyright (c) 2009-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/reverselock.h b/src/reverselock.h
index 1fd8de5d80747..9d9cc9fd77c8f 100644
--- a/src/reverselock.h
+++ b/src/reverselock.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2015 The Bitcoin Core developers
+// Copyright (c) 2015-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp
index 9ebe48530f601..a127f10b8be30 100644
--- a/src/rpc/blockchain.cpp
+++ b/src/rpc/blockchain.cpp
@@ -1,5 +1,5 @@
 // Copyright (c) 2010 Satoshi Nakamoto
-// Copyright (c) 2009-2015 The Bitcoin Core developers
+// Copyright (c) 2009-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/rpc/client.cpp b/src/rpc/client.cpp
index 03992a278d273..e094524bcb8e9 100644
--- a/src/rpc/client.cpp
+++ b/src/rpc/client.cpp
@@ -1,5 +1,5 @@
 // Copyright (c) 2010 Satoshi Nakamoto
-// Copyright (c) 2009-2015 The Bitcoin Core developers
+// Copyright (c) 2009-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/rpc/client.h b/src/rpc/client.h
index ae015860b6714..cb7c12b129cb1 100644
--- a/src/rpc/client.h
+++ b/src/rpc/client.h
@@ -1,5 +1,5 @@
 // Copyright (c) 2010 Satoshi Nakamoto
-// Copyright (c) 2009-2015 The Bitcoin Core developers
+// Copyright (c) 2009-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/rpc/mining.cpp b/src/rpc/mining.cpp
index 5b44eeeaf93f7..fa79d20734ae1 100644
--- a/src/rpc/mining.cpp
+++ b/src/rpc/mining.cpp
@@ -1,5 +1,5 @@
 // Copyright (c) 2010 Satoshi Nakamoto
-// Copyright (c) 2009-2015 The Bitcoin Core developers
+// Copyright (c) 2009-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/rpc/misc.cpp b/src/rpc/misc.cpp
index 2aaee7f3f5326..f7c4ecc20c70b 100644
--- a/src/rpc/misc.cpp
+++ b/src/rpc/misc.cpp
@@ -1,5 +1,5 @@
 // Copyright (c) 2010 Satoshi Nakamoto
-// Copyright (c) 2009-2015 The Bitcoin Core developers
+// Copyright (c) 2009-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/rpc/net.cpp b/src/rpc/net.cpp
index 53c0f993dc28c..632514fc85a17 100644
--- a/src/rpc/net.cpp
+++ b/src/rpc/net.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2009-2015 The Bitcoin Core developers
+// Copyright (c) 2009-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/rpc/protocol.cpp b/src/rpc/protocol.cpp
index ec186f4fc5888..dc710d939f566 100644
--- a/src/rpc/protocol.cpp
+++ b/src/rpc/protocol.cpp
@@ -1,5 +1,5 @@
 // Copyright (c) 2010 Satoshi Nakamoto
-// Copyright (c) 2009-2015 The Bitcoin Core developers
+// Copyright (c) 2009-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/rpc/protocol.h b/src/rpc/protocol.h
index c74fa0070fc6d..47e56e712b24c 100644
--- a/src/rpc/protocol.h
+++ b/src/rpc/protocol.h
@@ -1,5 +1,5 @@
 // Copyright (c) 2010 Satoshi Nakamoto
-// Copyright (c) 2009-2015 The Bitcoin Core developers
+// Copyright (c) 2009-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/rpc/rawtransaction.cpp b/src/rpc/rawtransaction.cpp
index 8b24e7a1cd3e1..b99e5986ff802 100644
--- a/src/rpc/rawtransaction.cpp
+++ b/src/rpc/rawtransaction.cpp
@@ -1,5 +1,5 @@
 // Copyright (c) 2010 Satoshi Nakamoto
-// Copyright (c) 2009-2015 The Bitcoin Core developers
+// Copyright (c) 2009-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/rpc/server.cpp b/src/rpc/server.cpp
index 212281939835c..8a223d8aa83be 100644
--- a/src/rpc/server.cpp
+++ b/src/rpc/server.cpp
@@ -1,5 +1,5 @@
 // Copyright (c) 2010 Satoshi Nakamoto
-// Copyright (c) 2009-2015 The Bitcoin Core developers
+// Copyright (c) 2009-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/rpc/server.h b/src/rpc/server.h
index 4fac68a51ff18..f3cdf3c602505 100644
--- a/src/rpc/server.h
+++ b/src/rpc/server.h
@@ -1,5 +1,5 @@
 // Copyright (c) 2010 Satoshi Nakamoto
-// Copyright (c) 2009-2015 The Bitcoin Core developers
+// Copyright (c) 2009-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/scheduler.cpp b/src/scheduler.cpp
index 27c03f154cb98..b01170074dc22 100644
--- a/src/scheduler.cpp
+++ b/src/scheduler.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2015 The Bitcoin Core developers
+// Copyright (c) 2015-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/script/bitcoinconsensus.cpp b/src/script/bitcoinconsensus.cpp
index be7fa5d3b79b4..c4ab441e2caf9 100644
--- a/src/script/bitcoinconsensus.cpp
+++ b/src/script/bitcoinconsensus.cpp
@@ -1,5 +1,5 @@
 // Copyright (c) 2009-2010 Satoshi Nakamoto
-// Copyright (c) 2009-2015 The Bitcoin Core developers
+// Copyright (c) 2009-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/script/interpreter.cpp b/src/script/interpreter.cpp
index 1410d0b73fb33..f9b7835882833 100644
--- a/src/script/interpreter.cpp
+++ b/src/script/interpreter.cpp
@@ -1,5 +1,5 @@
 // Copyright (c) 2009-2010 Satoshi Nakamoto
-// Copyright (c) 2009-2015 The Bitcoin Core developers
+// Copyright (c) 2009-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/script/ismine.cpp b/src/script/ismine.cpp
index 7467d23b2d3a2..608a8de8f57ee 100644
--- a/src/script/ismine.cpp
+++ b/src/script/ismine.cpp
@@ -1,5 +1,5 @@
 // Copyright (c) 2009-2010 Satoshi Nakamoto
-// Copyright (c) 2009-2015 The Bitcoin Core developers
+// Copyright (c) 2009-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/script/ismine.h b/src/script/ismine.h
index ec7a620e330cb..1aa5937b34749 100644
--- a/src/script/ismine.h
+++ b/src/script/ismine.h
@@ -1,5 +1,5 @@
 // Copyright (c) 2009-2010 Satoshi Nakamoto
-// Copyright (c) 2009-2015 The Bitcoin Core developers
+// Copyright (c) 2009-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/script/script.cpp b/src/script/script.cpp
index ddf6775569421..828ce1a056f1b 100644
--- a/src/script/script.cpp
+++ b/src/script/script.cpp
@@ -1,5 +1,5 @@
 // Copyright (c) 2009-2010 Satoshi Nakamoto
-// Copyright (c) 2009-2015 The Bitcoin Core developers
+// Copyright (c) 2009-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/script/script.h b/src/script/script.h
index a2b9d1b7923cb..654dff4625ddc 100644
--- a/src/script/script.h
+++ b/src/script/script.h
@@ -1,5 +1,5 @@
 // Copyright (c) 2009-2010 Satoshi Nakamoto
-// Copyright (c) 2009-2015 The Bitcoin Core developers
+// Copyright (c) 2009-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/script/script_error.cpp b/src/script/script_error.cpp
index 2c5359fe8afdb..c9d13c92a83f7 100644
--- a/src/script/script_error.cpp
+++ b/src/script/script_error.cpp
@@ -1,5 +1,5 @@
 // Copyright (c) 2009-2010 Satoshi Nakamoto
-// Copyright (c) 2009-2014 The Bitcoin Core developers
+// Copyright (c) 2009-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/script/script_error.h b/src/script/script_error.h
index 430836991b2cf..3200e94707d2d 100644
--- a/src/script/script_error.h
+++ b/src/script/script_error.h
@@ -1,5 +1,5 @@
 // Copyright (c) 2009-2010 Satoshi Nakamoto
-// Copyright (c) 2009-2014 The Bitcoin Core developers
+// Copyright (c) 2009-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/script/sigcache.cpp b/src/script/sigcache.cpp
index b78d7b607ff97..09bedc54605d4 100644
--- a/src/script/sigcache.cpp
+++ b/src/script/sigcache.cpp
@@ -1,5 +1,5 @@
 // Copyright (c) 2009-2010 Satoshi Nakamoto
-// Copyright (c) 2009-2015 The Bitcoin Core developers
+// Copyright (c) 2009-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/script/sigcache.h b/src/script/sigcache.h
index 5243fc0a42be7..c123a9ba0f2ed 100644
--- a/src/script/sigcache.h
+++ b/src/script/sigcache.h
@@ -1,5 +1,5 @@
 // Copyright (c) 2009-2010 Satoshi Nakamoto
-// Copyright (c) 2009-2015 The Bitcoin Core developers
+// Copyright (c) 2009-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/script/sign.h b/src/script/sign.h
index f9aa6fca27119..1cfc53c6c1bcf 100644
--- a/src/script/sign.h
+++ b/src/script/sign.h
@@ -1,5 +1,5 @@
 // Copyright (c) 2009-2010 Satoshi Nakamoto
-// Copyright (c) 2009-2015 The Bitcoin Core developers
+// Copyright (c) 2009-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/script/standard.cpp b/src/script/standard.cpp
index bb178f49fe9f2..4b9bec9aa18a4 100644
--- a/src/script/standard.cpp
+++ b/src/script/standard.cpp
@@ -1,5 +1,5 @@
 // Copyright (c) 2009-2010 Satoshi Nakamoto
-// Copyright (c) 2009-2015 The Bitcoin Core developers
+// Copyright (c) 2009-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/script/standard.h b/src/script/standard.h
index 72aaea0b7bebe..097e0c3748c34 100644
--- a/src/script/standard.h
+++ b/src/script/standard.h
@@ -1,5 +1,5 @@
 // Copyright (c) 2009-2010 Satoshi Nakamoto
-// Copyright (c) 2009-2015 The Bitcoin Core developers
+// Copyright (c) 2009-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/serialize.h b/src/serialize.h
index 2be6f005e3955..e4d72d2348f17 100644
--- a/src/serialize.h
+++ b/src/serialize.h
@@ -1,5 +1,5 @@
 // Copyright (c) 2009-2010 Satoshi Nakamoto
-// Copyright (c) 2009-2015 The Bitcoin Core developers
+// Copyright (c) 2009-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/streams.h b/src/streams.h
index b508784238de7..471602227aa51 100644
--- a/src/streams.h
+++ b/src/streams.h
@@ -1,5 +1,5 @@
 // Copyright (c) 2009-2010 Satoshi Nakamoto
-// Copyright (c) 2009-2015 The Bitcoin Core developers
+// Copyright (c) 2009-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/support/allocators/secure.h b/src/support/allocators/secure.h
index 67064314ef1fb..9daba86ef3bb8 100644
--- a/src/support/allocators/secure.h
+++ b/src/support/allocators/secure.h
@@ -1,5 +1,5 @@
 // Copyright (c) 2009-2010 Satoshi Nakamoto
-// Copyright (c) 2009-2015 The Bitcoin Core developers
+// Copyright (c) 2009-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/sync.cpp b/src/sync.cpp
index 641ed2c8ca036..a18d0f14858b4 100644
--- a/src/sync.cpp
+++ b/src/sync.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2011-2015 The Bitcoin Core developers
+// Copyright (c) 2011-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/sync.h b/src/sync.h
index 77339107494eb..680d6030442c7 100644
--- a/src/sync.h
+++ b/src/sync.h
@@ -1,5 +1,5 @@
 // Copyright (c) 2009-2010 Satoshi Nakamoto
-// Copyright (c) 2009-2015 The Bitcoin Core developers
+// Copyright (c) 2009-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/test/DoS_tests.cpp b/src/test/DoS_tests.cpp
index d90dcaeb0211e..c7c3646b03fd6 100644
--- a/src/test/DoS_tests.cpp
+++ b/src/test/DoS_tests.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2011-2015 The Bitcoin Core developers
+// Copyright (c) 2011-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/test/addrman_tests.cpp b/src/test/addrman_tests.cpp
index adff09f754880..078c5bbf2d306 100644
--- a/src/test/addrman_tests.cpp
+++ b/src/test/addrman_tests.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2015 The Bitcoin Core developers
+// Copyright (c) 2012-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 #include "addrman.h"
diff --git a/src/test/allocator_tests.cpp b/src/test/allocator_tests.cpp
index 77e9df5d828be..3f15a0dec151a 100644
--- a/src/test/allocator_tests.cpp
+++ b/src/test/allocator_tests.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2015 The Bitcoin Core developers
+// Copyright (c) 2012-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/test/arith_uint256_tests.cpp b/src/test/arith_uint256_tests.cpp
index b19d2faea014c..45ae7d4636fca 100644
--- a/src/test/arith_uint256_tests.cpp
+++ b/src/test/arith_uint256_tests.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2011-2015 The Bitcoin Core developers
+// Copyright (c) 2011-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/test/base58_tests.cpp b/src/test/base58_tests.cpp
index 04a6506655ec5..6cd998990b5bf 100644
--- a/src/test/base58_tests.cpp
+++ b/src/test/base58_tests.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2011-2015 The Bitcoin Core developers
+// Copyright (c) 2011-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/test/blockencodings_tests.cpp b/src/test/blockencodings_tests.cpp
index 7478758f73f0b..d37d2b8e7780b 100644
--- a/src/test/blockencodings_tests.cpp
+++ b/src/test/blockencodings_tests.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2011-2015 The Bitcoin Core developers
+// Copyright (c) 2011-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/test/bloom_tests.cpp b/src/test/bloom_tests.cpp
index b15ff9e44b12b..a67b2923789a7 100644
--- a/src/test/bloom_tests.cpp
+++ b/src/test/bloom_tests.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2015 The Bitcoin Core developers
+// Copyright (c) 2012-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/test/coins_tests.cpp b/src/test/coins_tests.cpp
index 09fe0bf158881..2f8857953ca97 100644
--- a/src/test/coins_tests.cpp
+++ b/src/test/coins_tests.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2015 The Bitcoin Core developers
+// Copyright (c) 2014-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/test/crypto_tests.cpp b/src/test/crypto_tests.cpp
index 7dcd548edfc0c..4d17417179798 100644
--- a/src/test/crypto_tests.cpp
+++ b/src/test/crypto_tests.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2015 The Bitcoin Core developers
+// Copyright (c) 2014-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/test/dbwrapper_tests.cpp b/src/test/dbwrapper_tests.cpp
index 2d791ee18d5a8..a0e1ed0505149 100644
--- a/src/test/dbwrapper_tests.cpp
+++ b/src/test/dbwrapper_tests.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2015 The Bitcoin Core developers
+// Copyright (c) 2012-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/test/hash_tests.cpp b/src/test/hash_tests.cpp
index 8be9c580c473b..b265cf93b7ca7 100644
--- a/src/test/hash_tests.cpp
+++ b/src/test/hash_tests.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2013-2015 The Bitcoin Core developers
+// Copyright (c) 2013-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/test/limitedmap_tests.cpp b/src/test/limitedmap_tests.cpp
index e3531486aa333..55b9be5b00411 100644
--- a/src/test/limitedmap_tests.cpp
+++ b/src/test/limitedmap_tests.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2015 The Bitcoin Core developers
+// Copyright (c) 2012-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/test/main_tests.cpp b/src/test/main_tests.cpp
index 697fbf792c689..d52104b4cc862 100644
--- a/src/test/main_tests.cpp
+++ b/src/test/main_tests.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2015 The Bitcoin Core developers
+// Copyright (c) 2014-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/test/mempool_tests.cpp b/src/test/mempool_tests.cpp
index 84871600b2965..37f0de354ee24 100644
--- a/src/test/mempool_tests.cpp
+++ b/src/test/mempool_tests.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2011-2015 The Bitcoin Core developers
+// Copyright (c) 2011-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/test/merkle_tests.cpp b/src/test/merkle_tests.cpp
index 55e6852a159be..af02d67f742ea 100644
--- a/src/test/merkle_tests.cpp
+++ b/src/test/merkle_tests.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2015 The Bitcoin Core developers
+// Copyright (c) 2015-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/test/miner_tests.cpp b/src/test/miner_tests.cpp
index 892e731a7a7bd..2f74f57d00724 100644
--- a/src/test/miner_tests.cpp
+++ b/src/test/miner_tests.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2011-2015 The Bitcoin Core developers
+// Copyright (c) 2011-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/test/multisig_tests.cpp b/src/test/multisig_tests.cpp
index 581b0cee1ec87..e949bf762029c 100644
--- a/src/test/multisig_tests.cpp
+++ b/src/test/multisig_tests.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2011-2014 The Bitcoin Core developers
+// Copyright (c) 2011-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/test/netbase_tests.cpp b/src/test/netbase_tests.cpp
index 18ad5dc90bf4e..b0ad93e6f27e4 100644
--- a/src/test/netbase_tests.cpp
+++ b/src/test/netbase_tests.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2015 The Bitcoin Core developers
+// Copyright (c) 2012-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/test/pmt_tests.cpp b/src/test/pmt_tests.cpp
index e6b689bc6ca9e..da05385c80c7c 100644
--- a/src/test/pmt_tests.cpp
+++ b/src/test/pmt_tests.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2015 The Bitcoin Core developers
+// Copyright (c) 2012-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/test/policyestimator_tests.cpp b/src/test/policyestimator_tests.cpp
index c57feaec909a5..0c060801bc52c 100644
--- a/src/test/policyestimator_tests.cpp
+++ b/src/test/policyestimator_tests.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2011-2015 The Bitcoin Core developers
+// Copyright (c) 2011-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/test/prevector_tests.cpp b/src/test/prevector_tests.cpp
index 1352ea722a50b..bd8a7819a4cd7 100644
--- a/src/test/prevector_tests.cpp
+++ b/src/test/prevector_tests.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2015 The Bitcoin Core developers
+// Copyright (c) 2015-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/test/reverselock_tests.cpp b/src/test/reverselock_tests.cpp
index 8bdff97000f90..00dc47e13edfe 100644
--- a/src/test/reverselock_tests.cpp
+++ b/src/test/reverselock_tests.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2015 The Bitcoin Core developers
+// Copyright (c) 2015-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/test/rpc_tests.cpp b/src/test/rpc_tests.cpp
index a359598ddcf0e..36a29867ba28c 100644
--- a/src/test/rpc_tests.cpp
+++ b/src/test/rpc_tests.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2015 The Bitcoin Core developers
+// Copyright (c) 2012-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/test/scheduler_tests.cpp b/src/test/scheduler_tests.cpp
index 891ecf501567f..e1b0ab925872b 100644
--- a/src/test/scheduler_tests.cpp
+++ b/src/test/scheduler_tests.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2015 The Bitcoin Core developers
+// Copyright (c) 2012-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/test/script_P2SH_tests.cpp b/src/test/script_P2SH_tests.cpp
index 789cc70d7f363..85da90c75d0a7 100644
--- a/src/test/script_P2SH_tests.cpp
+++ b/src/test/script_P2SH_tests.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2015 The Bitcoin Core developers
+// Copyright (c) 2012-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/test/script_tests.cpp b/src/test/script_tests.cpp
index 47335ade87a0d..deb2919f1410b 100644
--- a/src/test/script_tests.cpp
+++ b/src/test/script_tests.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2011-2015 The Bitcoin Core developers
+// Copyright (c) 2011-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/test/serialize_tests.cpp b/src/test/serialize_tests.cpp
index 1dc86eb11625a..5c192a1f417a4 100644
--- a/src/test/serialize_tests.cpp
+++ b/src/test/serialize_tests.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2015 The Bitcoin Core developers
+// Copyright (c) 2012-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/test/sighash_tests.cpp b/src/test/sighash_tests.cpp
index a524f5b946104..5279cb243bafc 100644
--- a/src/test/sighash_tests.cpp
+++ b/src/test/sighash_tests.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2013-2015 The Bitcoin Core developers
+// Copyright (c) 2013-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/test/sigopcount_tests.cpp b/src/test/sigopcount_tests.cpp
index 3488a0befc487..edafb76c433fd 100644
--- a/src/test/sigopcount_tests.cpp
+++ b/src/test/sigopcount_tests.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2015 The Bitcoin Core developers
+// Copyright (c) 2012-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/test/skiplist_tests.cpp b/src/test/skiplist_tests.cpp
index d6835df71f792..5b4ef3fe7df6e 100644
--- a/src/test/skiplist_tests.cpp
+++ b/src/test/skiplist_tests.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2015 The Bitcoin Core developers
+// Copyright (c) 2014-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/test/streams_tests.cpp b/src/test/streams_tests.cpp
index 8b715ce93eefd..31bcebe919ceb 100644
--- a/src/test/streams_tests.cpp
+++ b/src/test/streams_tests.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2015 The Bitcoin Core developers
+// Copyright (c) 2012-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/test/test_bitcoin.cpp b/src/test/test_bitcoin.cpp
index 5c4ef5eb8c70e..d17b4469c61be 100644
--- a/src/test/test_bitcoin.cpp
+++ b/src/test/test_bitcoin.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2011-2015 The Bitcoin Core developers
+// Copyright (c) 2011-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/test/test_bitcoin.h b/src/test/test_bitcoin.h
index 3dea20445d82a..0fe77437e423a 100644
--- a/src/test/test_bitcoin.h
+++ b/src/test/test_bitcoin.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2015 The Bitcoin Core developers
+// Copyright (c) 2015-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/test/test_bitcoin_fuzzy.cpp b/src/test/test_bitcoin_fuzzy.cpp
index 584e6ed008f4e..376d8e428a7b8 100644
--- a/src/test/test_bitcoin_fuzzy.cpp
+++ b/src/test/test_bitcoin_fuzzy.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2009-2015 The Bitcoin Core developers
+// Copyright (c) 2009-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/test/test_random.h b/src/test/test_random.h
index e61b92b7bce94..4a1637ac72491 100644
--- a/src/test/test_random.h
+++ b/src/test/test_random.h
@@ -1,5 +1,5 @@
 // Copyright (c) 2009-2010 Satoshi Nakamoto
-// Copyright (c) 2009-2014 The Bitcoin Core developers
+// Copyright (c) 2009-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/test/txvalidationcache_tests.cpp b/src/test/txvalidationcache_tests.cpp
index 9f58f004d50b0..7c8e0a47a0029 100644
--- a/src/test/txvalidationcache_tests.cpp
+++ b/src/test/txvalidationcache_tests.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2011-2015 The Bitcoin Core developers
+// Copyright (c) 2011-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/test/uint256_tests.cpp b/src/test/uint256_tests.cpp
index 2732948060a79..70d83a2e54061 100644
--- a/src/test/uint256_tests.cpp
+++ b/src/test/uint256_tests.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2011-2015 The Bitcoin Core developers
+// Copyright (c) 2011-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 #include "arith_uint256.h"
diff --git a/src/test/univalue_tests.cpp b/src/test/univalue_tests.cpp
index 7f794fcbe9fc9..05876aae04077 100644
--- a/src/test/univalue_tests.cpp
+++ b/src/test/univalue_tests.cpp
@@ -1,5 +1,5 @@
 // Copyright (c) 2014 BitPay Inc.
-// Copyright (c) 2014-2015 The Bitcoin Core developers
+// Copyright (c) 2014-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/test/util_tests.cpp b/src/test/util_tests.cpp
index b2f601613fbd4..fc42748d34edf 100644
--- a/src/test/util_tests.cpp
+++ b/src/test/util_tests.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2011-2015 The Bitcoin Core developers
+// Copyright (c) 2011-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/timedata.cpp b/src/timedata.cpp
index b3cbdcf883261..c72252e6d8a7e 100644
--- a/src/timedata.cpp
+++ b/src/timedata.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2015 The Bitcoin Core developers
+// Copyright (c) 2014-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/timedata.h b/src/timedata.h
index 9f2499c85c442..4a2eab34873f8 100644
--- a/src/timedata.h
+++ b/src/timedata.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2014 The Bitcoin Core developers
+// Copyright (c) 2014-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/torcontrol.cpp b/src/torcontrol.cpp
index 67a69363f021e..5571b7de4457d 100644
--- a/src/torcontrol.cpp
+++ b/src/torcontrol.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2015 The Bitcoin Core developers
+// Copyright (c) 2015-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/txdb.cpp b/src/txdb.cpp
index 4f11c7b95172e..c223abd590ece 100644
--- a/src/txdb.cpp
+++ b/src/txdb.cpp
@@ -1,5 +1,5 @@
 // Copyright (c) 2009-2010 Satoshi Nakamoto
-// Copyright (c) 2009-2015 The Bitcoin Core developers
+// Copyright (c) 2009-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/txdb.h b/src/txdb.h
index 687c686775b03..7f5cf2b583fdf 100644
--- a/src/txdb.h
+++ b/src/txdb.h
@@ -1,5 +1,5 @@
 // Copyright (c) 2009-2010 Satoshi Nakamoto
-// Copyright (c) 2009-2015 The Bitcoin Core developers
+// Copyright (c) 2009-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/txmempool.cpp b/src/txmempool.cpp
index c3da69c3f001d..fa9798a3ecb39 100644
--- a/src/txmempool.cpp
+++ b/src/txmempool.cpp
@@ -1,5 +1,5 @@
 // Copyright (c) 2009-2010 Satoshi Nakamoto
-// Copyright (c) 2009-2015 The Bitcoin Core developers
+// Copyright (c) 2009-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/txmempool.h b/src/txmempool.h
index 8a5787a8866b1..c0a486ea1eed2 100644
--- a/src/txmempool.h
+++ b/src/txmempool.h
@@ -1,5 +1,5 @@
 // Copyright (c) 2009-2010 Satoshi Nakamoto
-// Copyright (c) 2009-2015 The Bitcoin Core developers
+// Copyright (c) 2009-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/ui_interface.h b/src/ui_interface.h
index 15b9614f63957..065d23fbb4579 100644
--- a/src/ui_interface.h
+++ b/src/ui_interface.h
@@ -1,5 +1,5 @@
 // Copyright (c) 2010 Satoshi Nakamoto
-// Copyright (c) 2012-2015 The Bitcoin Core developers
+// Copyright (c) 2012-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/uint256.cpp b/src/uint256.cpp
index f22ddcd1effce..bd3d017085315 100644
--- a/src/uint256.cpp
+++ b/src/uint256.cpp
@@ -1,5 +1,5 @@
 // Copyright (c) 2009-2010 Satoshi Nakamoto
-// Copyright (c) 2009-2015 The Bitcoin Core developers
+// Copyright (c) 2009-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/uint256.h b/src/uint256.h
index 86e7c0b6c64a7..a92ce07f11181 100644
--- a/src/uint256.h
+++ b/src/uint256.h
@@ -1,5 +1,5 @@
 // Copyright (c) 2009-2010 Satoshi Nakamoto
-// Copyright (c) 2009-2015 The Bitcoin Core developers
+// Copyright (c) 2009-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/undo.h b/src/undo.h
index a5d276e7f33ed..a94e31f5ccafb 100644
--- a/src/undo.h
+++ b/src/undo.h
@@ -1,5 +1,5 @@
 // Copyright (c) 2009-2010 Satoshi Nakamoto
-// Copyright (c) 2009-2014 The Bitcoin Core developers
+// Copyright (c) 2009-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/util.cpp b/src/util.cpp
index 793b8f2dd1c93..08ee6b8b87f20 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -1,5 +1,5 @@
 // Copyright (c) 2009-2010 Satoshi Nakamoto
-// Copyright (c) 2009-2015 The Bitcoin Core developers
+// Copyright (c) 2009-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/util.h b/src/util.h
index f030dbbb26e8d..97d2723bc4021 100644
--- a/src/util.h
+++ b/src/util.h
@@ -1,5 +1,5 @@
 // Copyright (c) 2009-2010 Satoshi Nakamoto
-// Copyright (c) 2009-2015 The Bitcoin Core developers
+// Copyright (c) 2009-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/utilstrencodings.cpp b/src/utilstrencodings.cpp
index 5ffdb3be15cf4..025040c43a41f 100644
--- a/src/utilstrencodings.cpp
+++ b/src/utilstrencodings.cpp
@@ -1,5 +1,5 @@
 // Copyright (c) 2009-2010 Satoshi Nakamoto
-// Copyright (c) 2009-2015 The Bitcoin Core developers
+// Copyright (c) 2009-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/utilstrencodings.h b/src/utilstrencodings.h
index 5744f78c6e631..cb6f014fc2597 100644
--- a/src/utilstrencodings.h
+++ b/src/utilstrencodings.h
@@ -1,5 +1,5 @@
 // Copyright (c) 2009-2010 Satoshi Nakamoto
-// Copyright (c) 2009-2015 The Bitcoin Core developers
+// Copyright (c) 2009-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/utiltime.cpp b/src/utiltime.cpp
index 51d545ef8a7bd..7c5ee77265196 100644
--- a/src/utiltime.cpp
+++ b/src/utiltime.cpp
@@ -1,5 +1,5 @@
 // Copyright (c) 2009-2010 Satoshi Nakamoto
-// Copyright (c) 2009-2015 The Bitcoin Core developers
+// Copyright (c) 2009-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/validation.h b/src/validation.h
index f0f54786c7084..8907caf07e5d3 100644
--- a/src/validation.h
+++ b/src/validation.h
@@ -1,5 +1,5 @@
 // Copyright (c) 2009-2010 Satoshi Nakamoto
-// Copyright (c) 2009-2015 The Bitcoin Core developers
+// Copyright (c) 2009-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/validationinterface.cpp b/src/validationinterface.cpp
index 085c336ccf6a9..215c342deaed5 100644
--- a/src/validationinterface.cpp
+++ b/src/validationinterface.cpp
@@ -1,5 +1,5 @@
 // Copyright (c) 2009-2010 Satoshi Nakamoto
-// Copyright (c) 2009-2014 The Bitcoin Core developers
+// Copyright (c) 2009-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/validationinterface.h b/src/validationinterface.h
index a29859999bfab..717026389cd89 100644
--- a/src/validationinterface.h
+++ b/src/validationinterface.h
@@ -1,5 +1,5 @@
 // Copyright (c) 2009-2010 Satoshi Nakamoto
-// Copyright (c) 2009-2015 The Bitcoin Core developers
+// Copyright (c) 2009-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/version.h b/src/version.h
index 87fb1a3a75b08..0f69b2f02b4bc 100644
--- a/src/version.h
+++ b/src/version.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2014 The Bitcoin Core developers
+// Copyright (c) 2012-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/wallet/coincontrol.h b/src/wallet/coincontrol.h
index 08d23688ff079..eaf4ff8062cd5 100644
--- a/src/wallet/coincontrol.h
+++ b/src/wallet/coincontrol.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011-2015 The Bitcoin Core developers
+// Copyright (c) 2011-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/wallet/crypter.cpp b/src/wallet/crypter.cpp
index 31ee060677104..fc318c161250d 100644
--- a/src/wallet/crypter.cpp
+++ b/src/wallet/crypter.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2009-2015 The Bitcoin Core developers
+// Copyright (c) 2009-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/wallet/crypter.h b/src/wallet/crypter.h
index e89c15b5d4a4f..275e435f73b87 100644
--- a/src/wallet/crypter.h
+++ b/src/wallet/crypter.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2009-2015 The Bitcoin Core developers
+// Copyright (c) 2009-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/wallet/db.cpp b/src/wallet/db.cpp
index a809c9ad64015..4ae5e802364a6 100644
--- a/src/wallet/db.cpp
+++ b/src/wallet/db.cpp
@@ -1,5 +1,5 @@
 // Copyright (c) 2009-2010 Satoshi Nakamoto
-// Copyright (c) 2009-2015 The Bitcoin Core developers
+// Copyright (c) 2009-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/wallet/db.h b/src/wallet/db.h
index a0f673ecfc46f..b78f0f092acad 100644
--- a/src/wallet/db.h
+++ b/src/wallet/db.h
@@ -1,5 +1,5 @@
 // Copyright (c) 2009-2010 Satoshi Nakamoto
-// Copyright (c) 2009-2015 The Bitcoin Core developers
+// Copyright (c) 2009-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/wallet/rpcdump.cpp b/src/wallet/rpcdump.cpp
index 008a4ece19f6b..34443a82504aa 100644
--- a/src/wallet/rpcdump.cpp
+++ b/src/wallet/rpcdump.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2009-2015 The Bitcoin Core developers
+// Copyright (c) 2009-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/wallet/test/accounting_tests.cpp b/src/wallet/test/accounting_tests.cpp
index eb14d176bd700..1fe633f2e5d1c 100644
--- a/src/wallet/test/accounting_tests.cpp
+++ b/src/wallet/test/accounting_tests.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2015 The Bitcoin Core developers
+// Copyright (c) 2012-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/wallet/test/crypto_tests.cpp b/src/wallet/test/crypto_tests.cpp
index c64c76244eb33..0d012dacade30 100644
--- a/src/wallet/test/crypto_tests.cpp
+++ b/src/wallet/test/crypto_tests.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2014 The Bitcoin Core developers
+// Copyright (c) 2014-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/wallet/test/wallet_tests.cpp b/src/wallet/test/wallet_tests.cpp
index 9465d88067214..c7ce6fd24352f 100644
--- a/src/wallet/test/wallet_tests.cpp
+++ b/src/wallet/test/wallet_tests.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2015 The Bitcoin Core developers
+// Copyright (c) 2012-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index 543cfd685e7f5..dda2144cdbe27 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -1,5 +1,5 @@
 // Copyright (c) 2009-2010 Satoshi Nakamoto
-// Copyright (c) 2009-2015 The Bitcoin Core developers
+// Copyright (c) 2009-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
index 72c1239cc44d8..a8c723ffdcde6 100644
--- a/src/wallet/wallet.h
+++ b/src/wallet/wallet.h
@@ -1,5 +1,5 @@
 // Copyright (c) 2009-2010 Satoshi Nakamoto
-// Copyright (c) 2009-2015 The Bitcoin Core developers
+// Copyright (c) 2009-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/wallet/walletdb.cpp b/src/wallet/walletdb.cpp
index 0395e4a072ed5..28c99e8482d87 100644
--- a/src/wallet/walletdb.cpp
+++ b/src/wallet/walletdb.cpp
@@ -1,5 +1,5 @@
 // Copyright (c) 2009-2010 Satoshi Nakamoto
-// Copyright (c) 2009-2015 The Bitcoin Core developers
+// Copyright (c) 2009-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/wallet/walletdb.h b/src/wallet/walletdb.h
index eb25ac613dd33..afc0f1e50472f 100644
--- a/src/wallet/walletdb.h
+++ b/src/wallet/walletdb.h
@@ -1,5 +1,5 @@
 // Copyright (c) 2009-2010 Satoshi Nakamoto
-// Copyright (c) 2009-2015 The Bitcoin Core developers
+// Copyright (c) 2009-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/zmq/zmqnotificationinterface.cpp b/src/zmq/zmqnotificationinterface.cpp
index 2f5efcb4db429..431d8c9ac952d 100644
--- a/src/zmq/zmqnotificationinterface.cpp
+++ b/src/zmq/zmqnotificationinterface.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2015 The Bitcoin Core developers
+// Copyright (c) 2015-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/zmq/zmqnotificationinterface.h b/src/zmq/zmqnotificationinterface.h
index 585554ccd255e..beabb78da6d3d 100644
--- a/src/zmq/zmqnotificationinterface.h
+++ b/src/zmq/zmqnotificationinterface.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2015 The Bitcoin Core developers
+// Copyright (c) 2015-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/zmq/zmqpublishnotifier.cpp b/src/zmq/zmqpublishnotifier.cpp
index a11256dfd5b6b..caca1248a1ad9 100644
--- a/src/zmq/zmqpublishnotifier.cpp
+++ b/src/zmq/zmqpublishnotifier.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2015 The Bitcoin Core developers
+// Copyright (c) 2015-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/zmq/zmqpublishnotifier.h b/src/zmq/zmqpublishnotifier.h
index 751ded39572d7..bcbecf1bde13b 100644
--- a/src/zmq/zmqpublishnotifier.h
+++ b/src/zmq/zmqpublishnotifier.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2015 The Bitcoin Core developers
+// Copyright (c) 2015-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 

From 1d2d67692c74a5539f3736754d84f0aa6a702c56 Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Mon, 2 Jan 2017 09:35:19 +0100
Subject: [PATCH 1443/1802] qt: Set transifex slug to 0.14

Also perform update of source translations.
---
 .tx/config                  |    2 +-
 src/qt/bitcoinstrings.cpp   |   61 +-
 src/qt/locale/bitcoin_en.ts | 2341 +++++++++++++++++++++++++++++------
 3 files changed, 2027 insertions(+), 377 deletions(-)

diff --git a/.tx/config b/.tx/config
index 3ce2ae71d0adb..c4eb6d831f31a 100644
--- a/.tx/config
+++ b/.tx/config
@@ -1,7 +1,7 @@
 [main]
 host = https://www.transifex.com
 
-[bitcoin.qt-translation-013x]
+[bitcoin.qt-translation-014x]
 file_filter = src/qt/locale/bitcoin_<lang>.ts
 source_file = src/qt/locale/bitcoin_en.ts
 source_lang = en
diff --git a/src/qt/bitcoinstrings.cpp b/src/qt/bitcoinstrings.cpp
index bca5b72827f31..baca95a0bcfc2 100644
--- a/src/qt/bitcoinstrings.cpp
+++ b/src/qt/bitcoinstrings.cpp
@@ -15,18 +15,15 @@ QT_TRANSLATE_NOOP("bitcoin-core", ""
 "(1 = keep tx meta data e.g. account owner and payment request information, 2 "
 "= drop tx meta data)"),
 QT_TRANSLATE_NOOP("bitcoin-core", ""
-"-fallbackfee is set very high! This is the transaction fee you may pay when "
-"fee estimates are not available."),
-QT_TRANSLATE_NOOP("bitcoin-core", ""
 "-maxtxfee is set very high! Fees this large could be paid on a single "
 "transaction."),
 QT_TRANSLATE_NOOP("bitcoin-core", ""
-"-paytxfee is set very high! This is the transaction fee you will pay if you "
-"send a transaction."),
-QT_TRANSLATE_NOOP("bitcoin-core", ""
 "A fee rate (in %s/kB) that will be used when fee estimation has insufficient "
 "data (default: %s)"),
 QT_TRANSLATE_NOOP("bitcoin-core", ""
+"Accept connections from outside (default: 1 if no -proxy or -connect/-"
+"noconnect)"),
+QT_TRANSLATE_NOOP("bitcoin-core", ""
 "Accept relayed transactions received from whitelisted peers even when not "
 "relaying transactions (default: %d)"),
 QT_TRANSLATE_NOOP("bitcoin-core", ""
@@ -46,6 +43,9 @@ QT_TRANSLATE_NOOP("bitcoin-core", ""
 QT_TRANSLATE_NOOP("bitcoin-core", ""
 "Cannot obtain a lock on data directory %s. %s is probably already running."),
 QT_TRANSLATE_NOOP("bitcoin-core", ""
+"Connect only to the specified node(s); -noconnect or -connect=0 alone to "
+"disable automatic connections"),
+QT_TRANSLATE_NOOP("bitcoin-core", ""
 "Create new files with system default permissions, instead of umask 077 (only "
 "effective with disabled wallet functionality)"),
 QT_TRANSLATE_NOOP("bitcoin-core", ""
@@ -55,11 +55,13 @@ QT_TRANSLATE_NOOP("bitcoin-core", ""
 "Discover own IP addresses (default: 1 when listening and no -externalip or -"
 "proxy)"),
 QT_TRANSLATE_NOOP("bitcoin-core", ""
-"Distributed under the MIT software license, see the accompanying file "
-"COPYING or <http://www.opensource.org/licenses/mit-license.php>."),
+"Distributed under the MIT software license, see the accompanying file %s or "
+"%s"),
 QT_TRANSLATE_NOOP("bitcoin-core", ""
 "Do not keep transactions in the mempool longer than <n> hours (default: %u)"),
 QT_TRANSLATE_NOOP("bitcoin-core", ""
+"Equivalent bytes per sigop in transactions for relay and mining (default: %u)"),
+QT_TRANSLATE_NOOP("bitcoin-core", ""
 "Error loading %s: You can't enable HD on a already existing non-HD wallet"),
 QT_TRANSLATE_NOOP("bitcoin-core", ""
 "Error reading %s! All keys read correctly, but transaction data or address "
@@ -82,8 +84,8 @@ QT_TRANSLATE_NOOP("bitcoin-core", ""
 "Fees (in %s/kB) smaller than this are considered zero fee for transaction "
 "creation (default: %s)"),
 QT_TRANSLATE_NOOP("bitcoin-core", ""
-"Force relay of transactions from whitelisted peers even they violate local "
-"relay policy (default: %d)"),
+"Force relay of transactions from whitelisted peers even if they violate "
+"local relay policy (default: %d)"),
 QT_TRANSLATE_NOOP("bitcoin-core", ""
 "How thorough the block verification of -checkblocks is (0-4, default: %u)"),
 QT_TRANSLATE_NOOP("bitcoin-core", ""
@@ -125,7 +127,7 @@ QT_TRANSLATE_NOOP("bitcoin-core", ""
 "reindex (download the whole blockchain again in case of pruned node)"),
 QT_TRANSLATE_NOOP("bitcoin-core", ""
 "Query for peer addresses via DNS lookup, if low on addresses (default: 1 "
-"unless -connect)"),
+"unless -connect/-noconnect)"),
 QT_TRANSLATE_NOOP("bitcoin-core", ""
 "Randomize credentials for every proxy connection. This enables Tor stream "
 "isolation (default: %u)"),
@@ -143,6 +145,9 @@ QT_TRANSLATE_NOOP("bitcoin-core", ""
 "Set the number of script verification threads (%u to %d, 0 = auto, <0 = "
 "leave that many cores free, default: %d)"),
 QT_TRANSLATE_NOOP("bitcoin-core", ""
+"Sets the serialization of raw transaction or block hex returned in non-"
+"verbose mode, non-segwit(0) or segwit(1) (default: %d)"),
+QT_TRANSLATE_NOOP("bitcoin-core", ""
 "Support filtering of blocks and transaction with bloom filters (default: %u)"),
 QT_TRANSLATE_NOOP("bitcoin-core", ""
 "The block database contains a block which appears to be from the future. "
@@ -152,12 +157,11 @@ QT_TRANSLATE_NOOP("bitcoin-core", ""
 QT_TRANSLATE_NOOP("bitcoin-core", ""
 "The transaction amount is too small to send after the fee has been deducted"),
 QT_TRANSLATE_NOOP("bitcoin-core", ""
-"This is a pre-release test build - use at your own risk - do not use for "
-"mining or merchant applications"),
+"This is the transaction fee you may pay when fee estimates are not available."),
 QT_TRANSLATE_NOOP("bitcoin-core", ""
 "This product includes software developed by the OpenSSL Project for use in "
-"the OpenSSL Toolkit <https://www.openssl.org/> and cryptographic software "
-"written by Eric Young and UPnP software written by Thomas Bernard."),
+"the OpenSSL Toolkit %s and cryptographic software written by Eric Young and "
+"UPnP software written by Thomas Bernard."),
 QT_TRANSLATE_NOOP("bitcoin-core", ""
 "Total length of network version string (%i) exceeds maximum length (%i). "
 "Reduce the number or size of uacomments."),
@@ -186,8 +190,8 @@ QT_TRANSLATE_NOOP("bitcoin-core", ""
 "comes in the format: <USERNAME>:<SALT>$<HASH>. A canonical python script is "
 "included in share/rpcuser. This option can be specified multiple times"),
 QT_TRANSLATE_NOOP("bitcoin-core", ""
-"Warning: The network does not appear to fully agree! Some miners appear to "
-"be experiencing issues."),
+"Wallet will not create transactions that violate mempool chain limits "
+"(default: %u"),
 QT_TRANSLATE_NOOP("bitcoin-core", ""
 "Warning: Unknown block versions being mined! It's possible unknown rules are "
 "in effect"),
@@ -196,11 +200,8 @@ QT_TRANSLATE_NOOP("bitcoin-core", ""
 "if your balance or transactions are incorrect you should restore from a "
 "backup."),
 QT_TRANSLATE_NOOP("bitcoin-core", ""
-"Warning: We do not appear to fully agree with our peers! You may need to "
-"upgrade, or other nodes may need to upgrade."),
-QT_TRANSLATE_NOOP("bitcoin-core", ""
-"Whitelist peers connecting from the given netmask or IP address. Can be "
-"specified multiple times."),
+"Whitelist peers connecting from the given IP address (e.g. 1.2.3.4) or CIDR "
+"notated network (e.g. 1.2.3.0/24). Can be specified multiple times."),
 QT_TRANSLATE_NOOP("bitcoin-core", ""
 "Whitelisted peers cannot be DoS banned and their transactions are always "
 "relayed, even if they are already in the mempool, useful e.g. for a gateway"),
@@ -210,12 +211,12 @@ QT_TRANSLATE_NOOP("bitcoin-core", ""
 QT_TRANSLATE_NOOP("bitcoin-core", ""
 "You need to rebuild the database using -reindex-chainstate to change -txindex"),
 QT_TRANSLATE_NOOP("bitcoin-core", "%s corrupt, salvage failed"),
+QT_TRANSLATE_NOOP("bitcoin-core", "%s is set very high!"),
 QT_TRANSLATE_NOOP("bitcoin-core", "(default: %s)"),
 QT_TRANSLATE_NOOP("bitcoin-core", "(default: %u)"),
 QT_TRANSLATE_NOOP("bitcoin-core", "-maxmempool must be at least %d MB"),
 QT_TRANSLATE_NOOP("bitcoin-core", "<category> can be:"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Accept command line and JSON-RPC commands"),
-QT_TRANSLATE_NOOP("bitcoin-core", "Accept connections from outside (default: 1 if no -proxy or -connect)"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Accept public REST requests (default: %u)"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Add a node to connect to and attempt to keep the connection open"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Allow DNS lookups for -addnode, -seednode and -connect"),
@@ -228,7 +229,6 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Cannot downgrade wallet"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Cannot resolve -%s address: '%s'"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Cannot write default address"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Change index out of range"),
-QT_TRANSLATE_NOOP("bitcoin-core", "Connect only to the specified node(s)"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Connect through SOCKS5 proxy"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Connect to a node to retrieve peer addresses, and disconnect"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Connection options:"),
@@ -273,6 +273,7 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Invalid amount for -paytxfee=<amount>: '%s' (
 QT_TRANSLATE_NOOP("bitcoin-core", "Invalid netmask specified in -whitelist: '%s'"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Keep at most <n> unconnectable transactions in memory (default: %u)"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Keep the transaction memory pool below <n> megabytes (default: %u)"),
+QT_TRANSLATE_NOOP("bitcoin-core", "Keypool ran out, please call keypoolrefill first"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Listen for JSON-RPC connections on <port> (default: %u or testnet: %u)"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Listen for connections on <port> (default: %u or testnet: %u)"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Loading addresses..."),
@@ -284,7 +285,6 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Maintain at most <n> connections to peers (de
 QT_TRANSLATE_NOOP("bitcoin-core", "Make the wallet broadcast transactions"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Maximum per-connection receive buffer, <n>*1000 bytes (default: %u)"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Maximum per-connection send buffer, <n>*1000 bytes (default: %u)"),
-QT_TRANSLATE_NOOP("bitcoin-core", "Minimum bytes per sigop in transactions we relay and mine (default: %u)"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Need to specify a port with -whitebind: '%s'"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Node relay options:"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Not enough file descriptors available."),
@@ -309,9 +309,10 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Rewinding blocks..."),
 QT_TRANSLATE_NOOP("bitcoin-core", "Run in the background as a daemon and accept commands"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Send trace/debug info to console instead of debug.log file"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Send transactions as zero-fee transactions if possible (default: %u)"),
+QT_TRANSLATE_NOOP("bitcoin-core", "Send transactions with full-RBF opt-in enabled (default: %u)"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Set database cache size in megabytes (%d to %d, default: %d)"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Set key pool size to <n> (default: %u)"),
-QT_TRANSLATE_NOOP("bitcoin-core", "Set maximum BIP141 block cost (default: %d)"),
+QT_TRANSLATE_NOOP("bitcoin-core", "Set maximum BIP141 block weight (default: %d)"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Set maximum block size in bytes (default: %d)"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Set the number of threads to service RPC calls (default: %d)"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Show all debugging options (usage: --help -help-debug)"),
@@ -324,14 +325,20 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Specify pid file (default: %s)"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Specify wallet file (within data directory)"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Specify your own public address"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Spend unconfirmed change when sending transactions (default: %u)"),
+QT_TRANSLATE_NOOP("bitcoin-core", "Starting network threads..."),
 QT_TRANSLATE_NOOP("bitcoin-core", "The source code is available from %s."),
 QT_TRANSLATE_NOOP("bitcoin-core", "The transaction amount is too small to pay the fee"),
+QT_TRANSLATE_NOOP("bitcoin-core", "The wallet will avoid paying less than the minimum relay fee."),
 QT_TRANSLATE_NOOP("bitcoin-core", "This is experimental software."),
+QT_TRANSLATE_NOOP("bitcoin-core", "This is the minimum transaction fee you pay on every transaction."),
+QT_TRANSLATE_NOOP("bitcoin-core", "This is the transaction fee you will pay if you send a transaction."),
 QT_TRANSLATE_NOOP("bitcoin-core", "Threshold for disconnecting misbehaving peers (default: %u)"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Tor control port password (default: empty)"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Tor control port to use if onion listening enabled (default: %s)"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Transaction amount too small"),
-QT_TRANSLATE_NOOP("bitcoin-core", "Transaction amounts must be positive"),
+QT_TRANSLATE_NOOP("bitcoin-core", "Transaction amounts must not be negative"),
+QT_TRANSLATE_NOOP("bitcoin-core", "Transaction has too long of a mempool chain"),
+QT_TRANSLATE_NOOP("bitcoin-core", "Transaction must have at least one recipient"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Transaction too large for fee policy"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Transaction too large"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Unable to bind to %s on this computer (bind returned error %s)"),
diff --git a/src/qt/locale/bitcoin_en.ts b/src/qt/locale/bitcoin_en.ts
index 79c3e87b2b10a..2d0cccb894268 100644
--- a/src/qt/locale/bitcoin_en.ts
+++ b/src/qt/locale/bitcoin_en.ts
@@ -53,6 +53,94 @@
         <source>&amp;Delete</source>
         <translation>&amp;Delete</translation>
     </message>
+    <message>
+        <location filename="../addressbookpage.cpp" line="+50"/>
+        <source>Choose the address to send coins to</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Choose the address to receive coins with</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>C&amp;hoose</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Sending addresses</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Receiving addresses</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>&amp;Copy Address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Copy &amp;Label</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&amp;Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+193"/>
+        <source>Export Address List</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Comma separated file (*.csv)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>Exporting Failed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>There was an error trying to save the address list to %1. Please try again.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>AddressTableModel</name>
+    <message>
+        <location filename="../addresstablemodel.cpp" line="+170"/>
+        <source>Label</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+36"/>
+        <source>(no label)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>AskPassphraseDialog</name>
@@ -76,11 +164,129 @@
         <source>Repeat new passphrase</source>
         <translation>Repeat new passphrase</translation>
     </message>
+    <message>
+        <location filename="../askpassphrasedialog.cpp" line="+46"/>
+        <source>Enter the new passphrase to the wallet.&lt;br/&gt;Please use a passphrase of &lt;b&gt;ten or more random characters&lt;/b&gt;, or &lt;b&gt;eight or more words&lt;/b&gt;.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Encrypt wallet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>This operation needs your wallet passphrase to unlock the wallet.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Unlock wallet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>This operation needs your wallet passphrase to decrypt the wallet.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Decrypt wallet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Change passphrase</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Enter the old passphrase and new passphrase to the wallet.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+44"/>
+        <source>Confirm wallet encryption</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Warning: If you encrypt your wallet and lose your passphrase, you will &lt;b&gt;LOSE ALL OF YOUR BITCOINS&lt;/b&gt;!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Are you sure you wish to encrypt your wallet?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <location line="+58"/>
+        <source>Wallet encrypted</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-56"/>
+        <source>%1 will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <location line="+7"/>
+        <location line="+42"/>
+        <location line="+6"/>
+        <source>Wallet encryption failed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-54"/>
+        <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location line="+48"/>
+        <source>The supplied passphrases do not match.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-37"/>
+        <source>Wallet unlock failed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location line="+11"/>
+        <location line="+19"/>
+        <source>The passphrase entered for the wallet decryption was incorrect.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-20"/>
+        <source>Wallet decryption failed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Wallet passphrase was successfully changed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+47"/>
+        <location line="+24"/>
+        <source>Warning: The Caps Lock key is on!</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>BanTableModel</name>
     <message>
-        <location filename="../bantablemodel.cpp" line="+88"/>
+        <location filename="../bantablemodel.cpp" line="+89"/>
         <source>IP/Netmask</source>
         <translation type="unfinished"></translation>
     </message>
@@ -93,27 +299,27 @@
 <context>
     <name>BitcoinGUI</name>
     <message>
-        <location filename="../bitcoingui.cpp" line="+341"/>
+        <location filename="../bitcoingui.cpp" line="+356"/>
         <source>Sign &amp;message...</source>
         <translation>Sign &amp;message...</translation>
     </message>
     <message>
-        <location line="+377"/>
+        <location line="+417"/>
         <source>Synchronizing with network...</source>
         <translation>Synchronizing with network...</translation>
     </message>
     <message>
-        <location line="-455"/>
+        <location line="-495"/>
         <source>&amp;Overview</source>
         <translation>&amp;Overview</translation>
     </message>
     <message>
-        <location line="-130"/>
+        <location line="-143"/>
         <source>Node</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+131"/>
+        <location line="+144"/>
         <source>Show general overview of wallet</source>
         <translation>Show general overview of wallet</translation>
     </message>
@@ -198,12 +404,27 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+372"/>
+        <location line="+357"/>
+        <source>Click to disable network activity.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Network activity disabled.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Click to enable network activity again.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+53"/>
         <source>Reindexing blocks on disk...</source>
         <translation>Reindexing blocks on disk...</translation>
     </message>
     <message>
-        <location line="-457"/>
+        <location line="-497"/>
         <source>Send coins to a Bitcoin address</source>
         <translation>Send coins to a Bitcoin address</translation>
     </message>
@@ -233,17 +454,17 @@
         <translation>&amp;Verify message...</translation>
     </message>
     <message>
-        <location line="+481"/>
+        <location line="+504"/>
         <source>Bitcoin</source>
         <translation>Bitcoin</translation>
     </message>
     <message>
-        <location line="-693"/>
+        <location line="-729"/>
         <source>Wallet</source>
         <translation>Wallet</translation>
     </message>
     <message>
-        <location line="+139"/>
+        <location line="+152"/>
         <source>&amp;Send</source>
         <translation>&amp;Send</translation>
     </message>
@@ -323,7 +544,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
-        <location line="+341"/>
+        <location line="+354"/>
         <source>%n active connection(s) to Bitcoin network</source>
         <translation>
             <numerusform>%n active connection to Bitcoin network</numerusform>
@@ -331,7 +552,7 @@
         </translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+49"/>
         <source>Indexing blocks on disk...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -353,51 +574,13 @@
             <numerusform>Processed %n blocks of transaction history.</numerusform>
         </translation>
     </message>
-    <message numerus="yes">
-        <location line="+26"/>
-        <source>%n hour(s)</source>
-        <translation>
-            <numerusform>%n hour</numerusform>
-            <numerusform>%n hours</numerusform>
-        </translation>
-    </message>
-    <message numerus="yes">
-        <location line="+4"/>
-        <source>%n day(s)</source>
-        <translation>
-            <numerusform>%n day</numerusform>
-            <numerusform>%n days</numerusform>
-        </translation>
-    </message>
-    <message numerus="yes">
-        <location line="+4"/>
-        <location line="+6"/>
-        <source>%n week(s)</source>
-        <translation>
-            <numerusform>%n week</numerusform>
-            <numerusform>%n weeks</numerusform>
-        </translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>%1 and %2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message numerus="yes">
-        <location line="+0"/>
-        <source>%n year(s)</source>
-        <translation type="unfinished">
-            <numerusform>%n year</numerusform>
-            <numerusform>%n years</numerusform>
-        </translation>
-    </message>
     <message>
-        <location line="+4"/>
+        <location line="+24"/>
         <source>%1 behind</source>
         <translation>%1 behind</translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+24"/>
         <source>Last received block was generated %1 ago.</source>
         <translation>Last received block was generated %1 ago.</translation>
     </message>
@@ -422,27 +605,27 @@
         <translation>Information</translation>
     </message>
     <message>
-        <location line="-95"/>
+        <location line="-78"/>
         <source>Up to date</source>
         <translation>Up to date</translation>
     </message>
     <message>
-        <location line="-388"/>
+        <location line="-428"/>
         <source>Show the %1 help message to get a list with possible Bitcoin command-line options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+188"/>
+        <location line="+197"/>
         <source>%1 client</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+244"/>
+        <location line="+255"/>
         <source>Catching up...</source>
         <translation>Catching up...</translation>
     </message>
     <message>
-        <location line="+137"/>
+        <location line="+145"/>
         <source>Date: %1
 </source>
         <translation type="unfinished"></translation>
@@ -482,7 +665,17 @@
         <translation>Incoming transaction</translation>
     </message>
     <message>
-        <location line="+62"/>
+        <location line="+52"/>
+        <source>HD key generation is &lt;b&gt;enabled&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>HD key generation is &lt;b&gt;disabled&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
         <source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;unlocked&lt;/b&gt;</source>
         <translation>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;unlocked&lt;/b&gt;</translation>
     </message>
@@ -515,22 +708,17 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+29"/>
-        <source>Priority:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+45"/>
+        <location line="+80"/>
         <source>Fee:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="-48"/>
         <source>Dust:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+48"/>
+        <location line="+93"/>
         <source>After Fee:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -585,31 +773,128 @@
         <translation type="unfinished">Confirmed</translation>
     </message>
     <message>
-        <location line="+5"/>
-        <source>Priority</source>
+        <location filename="../coincontroldialog.cpp" line="+54"/>
+        <source>Copy address</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>EditAddressDialog</name>
     <message>
-        <location filename="../forms/editaddressdialog.ui" line="+14"/>
-        <source>Edit Address</source>
-        <translation>Edit Address</translation>
+        <location line="+1"/>
+        <source>Copy label</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
-        <source>&amp;Label</source>
-        <translation>&amp;Label</translation>
+        <location line="+1"/>
+        <location line="+26"/>
+        <source>Copy amount</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
-        <source>The label associated with this address list entry</source>
+        <location line="-25"/>
+        <source>Copy transaction ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
-        <source>The address associated with this address list entry. This can only be modified for sending addresses.</source>
+        <location line="+1"/>
+        <source>Lock unspent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Unlock unspent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>Copy quantity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Copy fee</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Copy after fee</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Copy bytes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Copy dust</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Copy change</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+325"/>
+        <source>(%1 locked)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+183"/>
+        <source>yes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>no</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>This label turns red if any recipient receives an amount smaller than the current dust threshold.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Can vary +/- %1 satoshi(s) per input.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+42"/>
+        <location line="+52"/>
+        <source>(no label)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-7"/>
+        <source>change from %1 (%2)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>(change)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>EditAddressDialog</name>
+    <message>
+        <location filename="../forms/editaddressdialog.ui" line="+14"/>
+        <source>Edit Address</source>
+        <translation>Edit Address</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>&amp;Label</source>
+        <translation>&amp;Label</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>The label associated with this address list entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>The address associated with this address list entry. This can only be modified for sending addresses.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -617,6 +902,46 @@
         <source>&amp;Address</source>
         <translation>&amp;Address</translation>
     </message>
+    <message>
+        <location filename="../editaddressdialog.cpp" line="+28"/>
+        <source>New receiving address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>New sending address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Edit receiving address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Edit sending address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+71"/>
+        <source>The entered address &quot;%1&quot; is not a valid Bitcoin address.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>The entered address &quot;%1&quot; is already in the address book.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Could not unlock wallet.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>New key generation failed.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>FreespaceChecker</name>
@@ -753,7 +1078,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+26"/>
         <source>Error</source>
         <translation>Error</translation>
     </message>
@@ -774,6 +1099,77 @@
         </translation>
     </message>
 </context>
+<context>
+    <name>ModalOverlay</name>
+    <message>
+        <location filename="../forms/modaloverlay.ui" line="+14"/>
+        <source>Form</source>
+        <translation type="unfinished">Form</translation>
+    </message>
+    <message>
+        <location line="+119"/>
+        <source>Recent transactions may not yet be visible, and therefore your wallet&apos;s balance might be incorrect. This information will be correct once your wallet has finished synchronizing with the bitcoin network, as detailed below.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Attempting to spend bitcoins that are affected by not-yet-displayed transactions will not be accepted by the network.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+63"/>
+        <source>Number of blocks left</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location line="+26"/>
+        <location filename="../modaloverlay.cpp" line="+136"/>
+        <source>Unknown...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-13"/>
+        <source>Last block time</source>
+        <translation type="unfinished">Last block time</translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <source>Progress</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>~</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+25"/>
+        <source>Progress increase per hour</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location line="+20"/>
+        <source>calculating...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-7"/>
+        <source>Estimated time left until synced</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+37"/>
+        <source>Hide</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../modaloverlay.cpp" line="-1"/>
+        <source>Unknown. Syncing Headers (%1)...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>OpenURIDialog</name>
     <message>
@@ -796,6 +1192,11 @@
         <source>Select payment request file</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../openuridialog.cpp" line="+47"/>
+        <source>Select payment request file to open</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OptionsDialog</name>
@@ -1106,7 +1507,7 @@
         <translation>Form</translation>
     </message>
     <message>
-        <location line="+59"/>
+        <location line="+62"/>
         <location line="+386"/>
         <source>The displayed information may be out of date. Your wallet automatically synchronizes with the Bitcoin network after a connection is established, but this process has not completed yet.</source>
         <translation>The displayed information may be out of date. Your wallet automatically synchronizes with the Bitcoin network after a connection is established, but this process has not completed yet.</translation>
@@ -1193,111 +1594,320 @@
     </message>
 </context>
 <context>
-    <name>PeerTableModel</name>
+    <name>PaymentServer</name>
     <message>
-        <location filename="../peertablemodel.cpp" line="+117"/>
-        <source>User Agent</source>
+        <location filename="../paymentserver.cpp" line="+328"/>
+        <location line="+216"/>
+        <location line="+42"/>
+        <location line="+113"/>
+        <location line="+14"/>
+        <location line="+18"/>
+        <source>Payment request error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+0"/>
-        <source>Node/Service</source>
+        <location line="-402"/>
+        <source>Cannot start bitcoin: click-to-pay handler</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+0"/>
-        <source>Ping Time</source>
+        <location line="+103"/>
+        <location line="+14"/>
+        <location line="+7"/>
+        <source>URI handling</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>QObject</name>
     <message>
-        <location filename="../bitcoinunits.cpp" line="+176"/>
-        <source>Amount</source>
-        <translation type="unfinished">Amount</translation>
+        <location line="-20"/>
+        <source>Payment request fetch URL is invalid: %1</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../guiutil.cpp" line="+135"/>
-        <source>Enter a Bitcoin address (e.g. %1)</source>
+        <location line="+13"/>
+        <source>Invalid payment address %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+764"/>
-        <source>%1 d</source>
+        <location line="+8"/>
+        <source>URI cannot be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>%1 h</source>
+        <location line="+13"/>
+        <source>Payment request file handling</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>%1 m</source>
+        <location line="+1"/>
+        <source>Payment request file cannot be read! This can be caused by an invalid payment request file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
-        <location line="+47"/>
-        <source>%1 s</source>
+        <location line="+61"/>
+        <location line="+9"/>
+        <location line="+31"/>
+        <location line="+10"/>
+        <location line="+17"/>
+        <location line="+88"/>
+        <source>Payment request rejected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-10"/>
-        <source>None</source>
+        <location line="-155"/>
+        <source>Payment request network doesn&apos;t match client network.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
-        <source>N/A</source>
-        <translation type="unfinished">N/A</translation>
+        <location line="+9"/>
+        <source>Payment request expired.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+0"/>
-        <source>%1 ms</source>
+        <location line="+6"/>
+        <source>Payment request is not initialized.</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>RPCConsole</name>
     <message>
-        <location filename="../forms/debugwindow.ui" line="+56"/>
         <location line="+26"/>
-        <location line="+26"/>
-        <location line="+23"/>
-        <location line="+26"/>
-        <location line="+36"/>
-        <location line="+23"/>
-        <location line="+36"/>
-        <location line="+23"/>
-        <location line="+36"/>
-        <location line="+23"/>
-        <location line="+663"/>
-        <location line="+23"/>
-        <location line="+23"/>
-        <location line="+23"/>
-        <location line="+23"/>
-        <location line="+23"/>
-        <location line="+23"/>
-        <location line="+23"/>
-        <location line="+23"/>
-        <location line="+23"/>
-        <location line="+23"/>
-        <location line="+23"/>
-        <location line="+23"/>
-        <location line="+23"/>
-        <location line="+23"/>
-        <location line="+26"/>
-        <location line="+23"/>
-        <source>N/A</source>
-        <translation>N/A</translation>
+        <source>Unverified payment requests to custom payment scripts are unsupported.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1322"/>
-        <source>Client version</source>
-        <translation>Client version</translation>
-    </message>
+        <location line="+9"/>
+        <location line="+17"/>
+        <source>Invalid payment request.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-10"/>
+        <source>Requested payment amount of %1 is too small (considered dust).</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+55"/>
+        <source>Refund from %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+44"/>
+        <source>Payment request %1 is too large (%2 bytes, allowed %3 bytes).</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Error communicating with %1: %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Payment request cannot be parsed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>Bad response from server %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>Network request error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Payment acknowledged</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PeerTableModel</name>
+    <message>
+        <location filename="../peertablemodel.cpp" line="+117"/>
+        <source>User Agent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Node/Service</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>NodeId</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Ping</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <location filename="../bitcoinunits.cpp" line="+176"/>
+        <source>Amount</source>
+        <translation type="unfinished">Amount</translation>
+    </message>
+    <message>
+        <location filename="../guiutil.cpp" line="+136"/>
+        <source>Enter a Bitcoin address (e.g. %1)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+759"/>
+        <source>%1 d</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>%1 h</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>%1 m</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location line="+50"/>
+        <source>%1 s</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-10"/>
+        <source>None</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>N/A</source>
+        <translation type="unfinished">N/A</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>%1 ms</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message numerus="yes">
+        <location line="+18"/>
+        <source>%n seconds(s)</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
+        <location line="+4"/>
+        <source>%n minutes(s)</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
+        <location line="+4"/>
+        <source>%n hour(s)</source>
+        <translation type="unfinished">
+            <numerusform>%n hour</numerusform>
+            <numerusform>%n hours</numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
+        <location line="+4"/>
+        <source>%n day(s)</source>
+        <translation type="unfinished">
+            <numerusform>%n day</numerusform>
+            <numerusform>%n days</numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
+        <location line="+4"/>
+        <location line="+6"/>
+        <source>%n week(s)</source>
+        <translation type="unfinished">
+            <numerusform>%n week</numerusform>
+            <numerusform>%n weeks</numerusform>
+        </translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>%1 and %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message numerus="yes">
+        <location line="+0"/>
+        <source>%n year(s)</source>
+        <translation type="unfinished">
+            <numerusform>%n year</numerusform>
+            <numerusform>%n years</numerusform>
+        </translation>
+    </message>
+</context>
+<context>
+    <name>QRImageWidget</name>
+    <message>
+        <location filename="../receiverequestdialog.cpp" line="+36"/>
+        <source>&amp;Save Image...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>&amp;Copy Image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+32"/>
+        <source>Save QR Code</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>PNG Image (*.png)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>RPCConsole</name>
+    <message>
+        <location filename="../forms/debugwindow.ui" line="+56"/>
+        <location line="+26"/>
+        <location line="+26"/>
+        <location line="+23"/>
+        <location line="+26"/>
+        <location line="+36"/>
+        <location line="+23"/>
+        <location line="+36"/>
+        <location line="+23"/>
+        <location line="+36"/>
+        <location line="+23"/>
+        <location line="+663"/>
+        <location line="+23"/>
+        <location line="+23"/>
+        <location line="+23"/>
+        <location line="+23"/>
+        <location line="+23"/>
+        <location line="+23"/>
+        <location line="+23"/>
+        <location line="+23"/>
+        <location line="+23"/>
+        <location line="+23"/>
+        <location line="+23"/>
+        <location line="+23"/>
+        <location line="+23"/>
+        <location line="+23"/>
+        <location line="+26"/>
+        <location line="+23"/>
+        <location line="+23"/>
+        <source>N/A</source>
+        <translation>N/A</translation>
+    </message>
+    <message>
+        <location line="-1345"/>
+        <source>Client version</source>
+        <translation>Client version</translation>
+    </message>
     <message>
         <location line="-22"/>
         <source>&amp;Information</source>
@@ -1392,8 +2002,8 @@
     </message>
     <message>
         <location line="+60"/>
-        <location filename="../rpcconsole.cpp" line="+295"/>
-        <location line="+634"/>
+        <location filename="../rpcconsole.cpp" line="+400"/>
+        <location line="+692"/>
         <source>Select a peer to view detailed information.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1488,13 +2098,18 @@
         <source>Ping Wait</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+23"/>
+        <source>Min Ping</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location line="+23"/>
         <source>Time Offset</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1093"/>
+        <location line="-1116"/>
         <source>Last block time</source>
         <translation>Last block time</translation>
     </message>
@@ -1524,7 +2139,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rpcconsole.cpp" line="-342"/>
+        <location filename="../rpcconsole.cpp" line="-386"/>
         <source>In:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1544,45 +2159,45 @@
         <translation>Clear console</translation>
     </message>
     <message>
-        <location filename="../rpcconsole.cpp" line="-203"/>
-        <source>&amp;Disconnect Node</source>
+        <location filename="../rpcconsole.cpp" line="-214"/>
+        <source>1 &amp;hour</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <location line="+1"/>
-        <location line="+1"/>
-        <location line="+1"/>
-        <source>Ban Node for</source>
+        <source>1 &amp;day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-3"/>
-        <source>1 &amp;hour</source>
+        <location line="+1"/>
+        <source>1 &amp;week</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>1 &amp;day</source>
+        <source>1 &amp;year</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>1 &amp;week</source>
+        <location line="-4"/>
+        <source>&amp;Disconnect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>1 &amp;year</source>
+        <location line="+1"/>
+        <location line="+1"/>
+        <location line="+1"/>
+        <source>Ban for</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+46"/>
-        <source>&amp;Unban Node</source>
+        <location line="+48"/>
+        <source>&amp;Unban</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+117"/>
+        <location line="+126"/>
         <source>Welcome to the %1 RPC console.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1597,7 +2212,17 @@
         <translation>Type &lt;b&gt;help&lt;/b&gt; for an overview of available commands.</translation>
     </message>
     <message>
-        <location line="+146"/>
+        <location line="+2"/>
+        <source>WARNING: Scammers have been active, telling users to type commands here, stealing their wallet contents. Do not use this console without fully understanding the ramification of a command.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+36"/>
+        <source>Network activity disabled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+123"/>
         <source>%1 B</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1617,7 +2242,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+88"/>
+        <location line="+99"/>
         <source>(node id: %1)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1633,7 +2258,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+10"/>
         <source>Inbound</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1749,16 +2374,36 @@
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>ReceiveRequestDialog</name>
     <message>
-        <location filename="../forms/receiverequestdialog.ui" line="+29"/>
-        <source>QR Code</source>
+        <location filename="../receivecoinsdialog.cpp" line="+47"/>
+        <source>Copy URI</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+1"/>
+        <source>Copy label</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Copy message</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Copy amount</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ReceiveRequestDialog</name>
+    <message>
+        <location filename="../forms/receiverequestdialog.ui" line="+29"/>
+        <source>QR Code</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+46"/>
         <source>Copy &amp;URI</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1772,11 +2417,95 @@
         <source>&amp;Save Image...</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../receiverequestdialog.cpp" line="+65"/>
+        <source>Request payment to %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Payment information</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>URI</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Amount</source>
+        <translation type="unfinished">Amount</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Label</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Message</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Resulting URI too long, try to reduce the text for label / message.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Error encoding URI into QR Code.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>RecentRequestsTableModel</name>
+    <message>
+        <location filename="../recentrequeststablemodel.cpp" line="+29"/>
+        <source>Date</source>
+        <translation type="unfinished">Date</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Label</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Message</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+40"/>
+        <source>(no label)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>(no message)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>(no amount requested)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+42"/>
+        <source>Requested</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SendCoinsDialog</name>
     <message>
         <location filename="../forms/sendcoinsdialog.ui" line="+14"/>
+        <location filename="../sendcoinsdialog.cpp" line="+553"/>
         <source>Send Coins</source>
         <translation>Send Coins</translation>
     </message>
@@ -1816,17 +2545,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
-        <source>Priority:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+48"/>
+        <location line="+80"/>
         <source>Fee:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+80"/>
+        <location line="+51"/>
         <source>After Fee:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1908,17 +2632,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+29"/>
-        <source>Confirmation time:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+60"/>
+        <location line="+89"/>
         <source>normal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+40"/>
         <source>fast</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1938,12 +2657,22 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-805"/>
+        <location line="-876"/>
         <source>Dust:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+808"/>
+        <location line="+691"/>
+        <source>Confirmation time target:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+80"/>
+        <source>(count)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+108"/>
         <source>Clear &amp;All</source>
         <translation>Clear &amp;All</translation>
     </message>
@@ -1962,6 +2691,155 @@
         <source>S&amp;end</source>
         <translation>S&amp;end</translation>
     </message>
+    <message>
+        <location filename="../sendcoinsdialog.cpp" line="-486"/>
+        <source>Copy quantity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Copy amount</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Copy fee</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Copy after fee</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Copy bytes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Copy dust</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Copy change</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+205"/>
+        <location line="+5"/>
+        <location line="+5"/>
+        <location line="+4"/>
+        <source>%1 to %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Are you sure you want to send?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>added as transaction fee</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <source>Total Amount %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>or</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Confirm send coins</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+191"/>
+        <source>The recipient address is not valid. Please recheck.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>The amount to pay must be larger than 0.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>The amount exceeds your balance.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>The total exceeds your balance when the %1 transaction fee is included.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Duplicate address found: addresses should only be used once each.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Transaction creation failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>The transaction was rejected with the following reason: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>A fee higher than %1 is considered an absurdly high fee.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Payment request expired.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message numerus="yes">
+        <location line="+67"/>
+        <source>%n block(s)</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
+    <message>
+        <location line="+28"/>
+        <source>Pay only the required fee of %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message numerus="yes">
+        <location line="+25"/>
+        <source>Estimated to begin confirmation within %n block(s).</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
+    <message>
+        <location line="+102"/>
+        <source>Warning: Invalid Bitcoin address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Warning: Unknown change address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>(no label)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SendCoinsEntry</name>
@@ -2066,6 +2944,20 @@
         <source>Memo:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../sendcoinsentry.cpp" line="+37"/>
+        <source>Enter a label for this address to add it to your address book</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SendConfirmationDialog</name>
+    <message>
+        <location filename="../sendcoinsdialog.cpp" line="+95"/>
+        <location line="+5"/>
+        <source>Yes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ShutdownWindow</name>
@@ -2190,36 +3082,752 @@
         <source>Reset all verify message fields</source>
         <translation>Reset all verify message fields</translation>
     </message>
-</context>
-<context>
-    <name>SplashScreen</name>
     <message>
-        <location filename="../networkstyle.cpp" line="+19"/>
-        <source>[testnet]</source>
-        <translation>[testnet]</translation>
+        <location filename="../signverifymessagedialog.cpp" line="+41"/>
+        <source>Click &quot;Sign Message&quot; to generate signature</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+83"/>
+        <location line="+80"/>
+        <source>The entered address is invalid.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-80"/>
+        <location line="+8"/>
+        <location line="+72"/>
+        <location line="+8"/>
+        <source>Please check the address and try again.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-80"/>
+        <location line="+80"/>
+        <source>The entered address does not refer to a key.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-72"/>
+        <source>Wallet unlock was cancelled.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Private key for the entered address is not available.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>Message signing failed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Message signed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+58"/>
+        <source>The signature could not be decoded.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <location line="+13"/>
+        <source>Please check the signature and try again.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>The signature did not match the message digest.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Message verification failed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Message verified.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SplashScreen</name>
+    <message>
+        <location filename="../networkstyle.cpp" line="+19"/>
+        <source>[testnet]</source>
+        <translation>[testnet]</translation>
+    </message>
+</context>
+<context>
+    <name>TrafficGraphWidget</name>
+    <message>
+        <location filename="../trafficgraphwidget.cpp" line="+79"/>
+        <source>KB/s</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>TransactionDesc</name>
+    <message numerus="yes">
+        <location filename="../transactiondesc.cpp" line="+30"/>
+        <source>Open for %n more block(s)</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Open until %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>conflicted with a transaction with %1 confirmations</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>%1/offline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>0/unconfirmed, %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>in memory pool</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>not in memory pool</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>abandoned</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>%1/unconfirmed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>%1 confirmations</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>, has not been successfully broadcast yet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message numerus="yes">
+        <location line="+2"/>
+        <source>, broadcast through %n node(s)</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Date</source>
+        <translation type="unfinished">Date</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Source</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Generated</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <location line="+13"/>
+        <location line="+72"/>
+        <source>From</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-72"/>
+        <source>unknown</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location line="+20"/>
+        <location line="+69"/>
+        <source>To</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-87"/>
+        <source>own address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <location line="+69"/>
+        <source>watch-only</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-67"/>
+        <source>label</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+34"/>
+        <location line="+12"/>
+        <location line="+53"/>
+        <location line="+26"/>
+        <location line="+55"/>
+        <source>Credit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message numerus="yes">
+        <location line="-144"/>
+        <source>matures in %n more block(s)</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>not accepted</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+59"/>
+        <location line="+25"/>
+        <location line="+55"/>
+        <source>Debit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-70"/>
+        <source>Total debit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Total credit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Transaction fee</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>Net amount</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <location line="+11"/>
+        <source>Message</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-9"/>
+        <source>Comment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Transaction ID</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Transaction total size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Output index</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <source>Merchant</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Generated coins must mature %1 blocks before they can be spent. When you generated this block, it was broadcast to the network to be added to the block chain. If it fails to get into the chain, its state will change to &quot;not accepted&quot; and it won&apos;t be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Debug information</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Transaction</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Inputs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>Amount</source>
+        <translation type="unfinished">Amount</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location line="+1"/>
+        <source>true</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-1"/>
+        <location line="+1"/>
+        <source>false</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>TransactionDescDialog</name>
+    <message>
+        <location filename="../forms/transactiondescdialog.ui" line="+20"/>
+        <source>This pane shows a detailed description of the transaction</source>
+        <translation>This pane shows a detailed description of the transaction</translation>
+    </message>
+    <message>
+        <location filename="../transactiondescdialog.cpp" line="+17"/>
+        <source>Details for %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>TransactionTableModel</name>
+    <message>
+        <location filename="../transactiontablemodel.cpp" line="+246"/>
+        <source>Date</source>
+        <translation type="unfinished">Date</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Label</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message numerus="yes">
+        <location line="+58"/>
+        <source>Open for %n more block(s)</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Open until %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Offline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Unconfirmed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Abandoned</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Confirming (%1 of %2 recommended confirmations)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Confirmed (%1 confirmations)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Conflicted</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Immature (%1 confirmations, will be available after %2)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>This block was not received by any other nodes and will probably not be accepted!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Generated but not accepted</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+39"/>
+        <source>Received with</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Received from</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Sent to</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Payment to yourself</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Mined</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+28"/>
+        <source>watch-only</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <source>(n/a)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+213"/>
+        <source>(no label)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+39"/>
+        <source>Transaction status. Hover over this field to show number of confirmations.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Date and time that the transaction was received.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Type of transaction.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Whether or not a watch-only address is involved in this transaction.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>User-defined intent/purpose of the transaction.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Amount removed from or added to balance.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>TransactionView</name>
+    <message>
+        <location filename="../transactionview.cpp" line="+69"/>
+        <location line="+16"/>
+        <source>All</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-15"/>
+        <source>Today</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>This week</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>This month</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Last month</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>This year</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Range...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Received with</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Sent to</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>To yourself</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Mined</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Other</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Enter address or label to search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Min amount</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+36"/>
+        <source>Abandon transaction</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Copy address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Copy label</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Copy amount</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Copy transaction ID</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Copy raw transaction</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Copy full transaction details</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit label</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Show transaction details</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+186"/>
+        <source>Export Transaction History</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Comma separated file (*.csv)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Confirmed</source>
+        <translation type="unfinished">Confirmed</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Watch-only</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Date</source>
+        <translation type="unfinished">Date</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Label</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>ID</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Exporting Failed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>There was an error trying to save the transaction history to %1.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Exporting Successful</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>The transaction history was successfully saved to %1.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+147"/>
+        <source>Range:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>to</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>UnitDisplayStatusBarControl</name>
+    <message>
+        <location filename="../bitcoingui.cpp" line="+129"/>
+        <source>Unit to show amounts in. Click to select another unit.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>WalletFrame</name>
+    <message>
+        <location filename="../walletframe.cpp" line="+27"/>
+        <source>No wallet has been loaded.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>WalletModel</name>
+    <message>
+        <location filename="../walletmodel.cpp" line="+291"/>
+        <source>Send Coins</source>
+        <translation type="unfinished">Send Coins</translation>
+    </message>
+</context>
+<context>
+    <name>WalletView</name>
+    <message>
+        <location filename="../walletview.cpp" line="+46"/>
+        <source>&amp;Export</source>
+        <translation type="unfinished">&amp;Export</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Export the data in the current tab to a file</source>
+        <translation type="unfinished">Export the data in the current tab to a file</translation>
+    </message>
+    <message>
+        <location line="+201"/>
+        <source>Backup Wallet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Wallet Data (*.dat)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Backup Failed</source>
+        <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>TrafficGraphWidget</name>
     <message>
-        <location filename="../trafficgraphwidget.cpp" line="+79"/>
-        <source>KB/s</source>
+        <location line="+0"/>
+        <source>There was an error trying to save the wallet data to %1.</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>TransactionDescDialog</name>
     <message>
-        <location filename="../forms/transactiondescdialog.ui" line="+20"/>
-        <source>This pane shows a detailed description of the transaction</source>
-        <translation>This pane shows a detailed description of the transaction</translation>
+        <location line="+4"/>
+        <source>Backup Successful</source>
+        <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>UnitDisplayStatusBarControl</name>
     <message>
-        <location filename="../bitcoingui.cpp" line="+116"/>
-        <source>Unit to show amounts in. Click to select another unit.</source>
+        <location line="+0"/>
+        <source>The wallet data was successfully saved to %1.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -2231,27 +3839,42 @@
         <translation>Options:</translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+31"/>
         <source>Specify data directory</source>
         <translation>Specify data directory</translation>
     </message>
     <message>
-        <location line="-89"/>
+        <location line="-90"/>
         <source>Connect to a node to retrieve peer addresses, and disconnect</source>
         <translation>Connect to a node to retrieve peer addresses, and disconnect</translation>
     </message>
     <message>
-        <location line="+92"/>
+        <location line="+93"/>
         <source>Specify your own public address</source>
         <translation>Specify your own public address</translation>
     </message>
     <message>
-        <location line="-108"/>
+        <location line="-107"/>
         <source>Accept command line and JSON-RPC commands</source>
         <translation>Accept command line and JSON-RPC commands</translation>
     </message>
     <message>
-        <location line="-128"/>
+        <location line="-196"/>
+        <source>Accept connections from outside (default: 1 if no -proxy or -connect/-noconnect)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>Connect only to the specified node(s); -noconnect or -connect=0 alone to disable automatic connections</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>Distributed under the MIT software license, see the accompanying file %s or %s</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+34"/>
         <source>If &lt;category&gt; is not supplied or if &lt;category&gt; = 1, output all debugging information.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2276,7 +3899,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+119"/>
+        <location line="+117"/>
         <source>Error: A fatal internal error occurred, see debug.log for details</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2296,17 +3919,12 @@
         <translation>Run in the background as a daemon and accept commands</translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+37"/>
         <source>Unable to start HTTP server. See debug log for details.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-121"/>
-        <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
-        <translation>Accept connections from outside (default: 1 if no -proxy or -connect)</translation>
-    </message>
-    <message>
-        <location line="-206"/>
+        <location line="-334"/>
         <source>Bitcoin Core</source>
         <translation type="unfinished">Bitcoin Core</translation>
     </message>
@@ -2316,17 +3934,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
-        <source>-fallbackfee is set very high! This is the transaction fee you may pay when fee estimates are not available.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+9"/>
+        <location line="+7"/>
         <source>A fee rate (in %s/kB) that will be used when fee estimation has insufficient data (default: %s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="+6"/>
         <source>Accept relayed transactions received from whitelisted peers even when not relaying transactions (default: %d)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2341,17 +3954,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+8"/>
         <source>Delete all wallet transactions and only recover those parts of the blockchain through -rescan on startup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
-        <source>Distributed under the MIT software license, see the accompanying file COPYING or &lt;http://www.opensource.org/licenses/mit-license.php&gt;.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
+        <location line="+13"/>
         <source>Error loading %s: You can&apos;t enable HD on a already existing non-HD wallet</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2366,12 +3974,7 @@
         <translation>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</translation>
     </message>
     <message>
-        <location line="+12"/>
-        <source>Force relay of transactions from whitelisted peers even they violate local relay policy (default: %d)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+17"/>
+        <location line="+29"/>
         <source>Maximum allowed median peer time offset adjustment. Local perspective of time may be influenced by peers forward or backward by this amount. (default: %u seconds)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2396,17 +3999,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+8"/>
         <source>The block database contains a block which appears to be from the future. This may be due to your computer&apos;s date and time being set incorrectly. Only rebuild the block database if you are sure that your computer&apos;s date and time are correct</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
-        <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
-        <translation>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</translation>
-    </message>
-    <message>
-        <location line="+13"/>
+        <location line="+19"/>
         <source>Unable to rewind the database to a pre-fork state. You will need to redownload the blockchain</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2416,22 +4014,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+12"/>
-        <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source>
-        <translation>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source>
-        <translation>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Whitelist peers connecting from the given netmask or IP address. Can be specified multiple times.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+9"/>
+        <location line="+31"/>
         <source>You need to rebuild the database using -reindex-chainstate to change -txindex</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2441,7 +4024,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="+4"/>
         <source>-maxmempool must be at least %d MB</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2451,7 +4034,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+6"/>
         <source>Append comment to the user agent string</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2475,11 +4058,6 @@
         <source>Change index out of range</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+1"/>
-        <source>Connect only to the specified node(s)</source>
-        <translation>Connect only to the specified node(s)</translation>
-    </message>
     <message>
         <location line="+3"/>
         <source>Connection options:</source>
@@ -2621,7 +4199,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+5"/>
         <source>Loading banlist...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2631,12 +4209,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
-        <source>Minimum bytes per sigop in transactions we relay and mine (default: %u)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <location line="+7"/>
         <source>Not enough file descriptors available.</source>
         <translation>Not enough file descriptors available.</translation>
     </message>
@@ -2681,7 +4254,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+5"/>
         <source>Set database cache size in megabytes (%d to %d, default: %d)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2696,12 +4269,12 @@
         <translation>Specify wallet file (within data directory)</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="+4"/>
         <source>The source code is available from %s.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
+        <location line="+16"/>
         <source>Unable to bind to %s on this computer. %s is probably already running.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2761,7 +4334,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-321"/>
+        <location line="-331"/>
         <source>Allow JSON-RPC connections from specified source. Valid for &lt;ip&gt; are a single IP (e.g. 1.2.3.4), a network/netmask (e.g. 1.2.3.4/255.255.255.0) or a network/CIDR (e.g. 1.2.3.4/24). This option can be specified multiple times</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2776,7 +4349,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+9"/>
         <source>Create new files with system default permissions, instead of umask 077 (only effective with disabled wallet functionality)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2786,7 +4359,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location line="+15"/>
         <source>Error: Listening for incoming connections failed (listen returned error %s)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2816,12 +4389,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+21"/>
-        <source>Query for peer addresses via DNS lookup, if low on addresses (default: 1 unless -connect)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <location line="+24"/>
         <source>Randomize credentials for every proxy connection. This enables Tor stream isolation (default: %u)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2831,22 +4399,17 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="+15"/>
         <source>The transaction amount is too small to send after the fee has been deducted</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
-        <source>This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit &lt;https://www.openssl.org/&gt; and cryptographic software written by Eric Young and UPnP software written by Thomas Bernard.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+21"/>
+        <location line="+25"/>
         <source>Use hierarchical deterministic key generation (HD) after BIP32. Only has effect during wallet creation/first start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+23"/>
         <source>Whitelisted peers cannot be DoS banned and their transactions are always relayed, even if they are already in the mempool, useful e.g. for a gateway</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2856,12 +4419,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+8"/>
         <source>(default: %u)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+4"/>
         <source>Accept public REST requests (default: %u)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2871,7 +4434,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+6"/>
         <source>Connect through SOCKS5 proxy</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2941,12 +4504,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Set maximum BIP141 block cost (default: %d)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <location line="+7"/>
         <source>Show all debugging options (usage: --help -help-debug)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2961,17 +4519,17 @@
         <translation>Signing transaction failed</translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+10"/>
         <source>The transaction amount is too small to pay the fee</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+2"/>
         <source>This is experimental software.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+4"/>
         <source>Tor control port password (default: empty)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2986,12 +4544,7 @@
         <translation>Transaction amount too small</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Transaction amounts must be positive</source>
-        <translation>Transaction amounts must be positive</translation>
-    </message>
-    <message>
-        <location line="+1"/>
+        <location line="+4"/>
         <source>Transaction too large for fee policy</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3041,17 +4594,17 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-65"/>
+        <location line="-72"/>
         <source>Password for JSON-RPC connections</source>
         <translation>Password for JSON-RPC connections</translation>
     </message>
     <message>
-        <location line="-218"/>
+        <location line="-216"/>
         <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
         <translation>Execute command when the best block changes (%s in cmd is replaced by block hash)</translation>
     </message>
     <message>
-        <location line="+146"/>
+        <location line="+145"/>
         <source>Allow DNS lookups for -addnode, -seednode and -connect</source>
         <translation>Allow DNS lookups for -addnode, -seednode and -connect</translation>
     </message>
@@ -3061,23 +4614,23 @@
         <translation>Loading addresses...</translation>
     </message>
     <message>
-        <location line="-264"/>
+        <location line="-265"/>
         <source>(1 = keep tx meta data e.g. account owner and payment request information, 2 = drop tx meta data)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+3"/>
         <source>-maxtxfee is set very high! Fees this large could be paid on a single transaction.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>-paytxfee is set very high! This is the transaction fee you will pay if you send a transaction.</source>
+        <location line="+43"/>
+        <source>Do not keep transactions in the mempool longer than &lt;n&gt; hours (default: %u)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+37"/>
-        <source>Do not keep transactions in the mempool longer than &lt;n&gt; hours (default: %u)</source>
+        <location line="+2"/>
+        <source>Equivalent bytes per sigop in transactions for relay and mining (default: %u)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -3086,7 +4639,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+3"/>
+        <source>Force relay of transactions from whitelisted peers even if they violate local relay policy (default: %d)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
         <source>How thorough the block verification of -checkblocks is (0-4, default: %u)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3106,12 +4664,32 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+13"/>
+        <source>Query for peer addresses via DNS lookup, if low on addresses (default: 1 unless -connect/-noconnect)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Sets the serialization of raw transaction or block hex returned in non-verbose mode, non-segwit(0) or segwit(1) (default: %d)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
         <source>Support filtering of blocks and transaction with bloom filters (default: %u)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location line="+9"/>
+        <source>This is the transaction fee you may pay when fee estimates are not available.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit %s and cryptographic software written by Eric Young and UPnP software written by Thomas Bernard.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
         <source>Total length of network version string (%i) exceeds maximum length (%i). Reduce the number or size of uacomments.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3141,7 +4719,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+4"/>
+        <source>Wallet will not create transactions that violate mempool chain limits (default: %u</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
         <source>Warning: Unknown block versions being mined! It&apos;s possible unknown rules are in effect</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3151,17 +4734,27 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+4"/>
+        <source>Whitelist peers connecting from the given IP address (e.g. 1.2.3.4) or CIDR notated network (e.g. 1.2.3.0/24). Can be specified multiple times.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>%s is set very high!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
         <source>(default: %s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+8"/>
         <source>Always query for peer addresses via DNS lookup (default: %u)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+38"/>
+        <location line="+37"/>
         <source>How many blocks to check at startup (default: %u, 0 = all)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3177,6 +4770,11 @@
     </message>
     <message>
         <location line="+7"/>
+        <source>Keypool ran out, please call keypoolrefill first</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
         <source>Listen for JSON-RPC connections on &lt;port&gt; (default: %u or testnet: %u)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3206,7 +4804,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="+7"/>
         <source>Prepend debug output with timestamp (default: %u)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3221,12 +4819,22 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="+7"/>
+        <source>Send transactions with full-RBF opt-in enabled (default: %u)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>Set key pool size to &lt;n&gt; (default: %u)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="+1"/>
+        <source>Set maximum BIP141 block weight (default: %d)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>Set the number of threads to service RPC calls (default: %d)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3251,22 +4859,57 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+1"/>
+        <source>Starting network threads...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>The wallet will avoid paying less than the minimum relay fee.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>This is the minimum transaction fee you pay on every transaction.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>This is the transaction fee you will pay if you send a transaction.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
         <source>Threshold for disconnecting misbehaving peers (default: %u)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="+4"/>
+        <source>Transaction amounts must not be negative</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Transaction has too long of a mempool chain</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Transaction must have at least one recipient</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
         <source>Unknown network specified in -onlynet: &apos;%s&apos;</source>
         <translation>Unknown network specified in -onlynet: &apos;%s&apos;</translation>
     </message>
     <message>
-        <location line="-73"/>
+        <location line="-80"/>
         <source>Insufficient funds</source>
         <translation>Insufficient funds</translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location line="+14"/>
         <source>Loading block index...</source>
         <translation>Loading block index...</translation>
     </message>
@@ -3291,7 +4934,7 @@
         <translation>Cannot write default address</translation>
     </message>
     <message>
-        <location line="+78"/>
+        <location line="+77"/>
         <source>Rescanning...</source>
         <translation>Rescanning...</translation>
     </message>

From 73f41190b91dce9c125b1828b18f7625e0200145 Mon Sep 17 00:00:00 2001
From: Karl-Johan Alm <karljohan-alm@garage.co.jp>
Date: Mon, 5 Dec 2016 16:03:53 +0900
Subject: [PATCH 1444/1802] Refactoring: Removed using namespace <xxx> from
 bench/ and test/ source files.

---
 src/bench/bench.cpp            |  14 ++--
 src/bench/coin_selection.cpp   |   8 +-
 src/test/addrman_tests.cpp     |  12 ++-
 src/test/bloom_tests.cpp       |  56 +++++++------
 src/test/dbwrapper_tests.cpp   |  34 ++++----
 src/test/hash_tests.cpp        |   2 -
 src/test/key_tests.cpp         |  24 +++---
 src/test/multisig_tests.cpp    |  22 +++---
 src/test/net_tests.cpp         |   4 +-
 src/test/netbase_tests.cpp     |   8 +-
 src/test/pmt_tests.cpp         |   2 -
 src/test/pow_tests.cpp         |   2 -
 src/test/rpc_tests.cpp         | 138 ++++++++++++++++-----------------
 src/test/script_P2SH_tests.cpp |  16 ++--
 src/test/script_tests.cpp      |  40 +++++-----
 src/test/serialize_tests.cpp   |   5 +-
 src/test/sigopcount_tests.cpp  |  22 +++---
 src/test/streams_tests.cpp     |   3 +-
 src/test/timedata_tests.cpp    |   2 -
 src/test/transaction_tests.cpp |  80 ++++++++++---------
 src/test/univalue_tests.cpp    |  37 ++++-----
 src/test/util_tests.cpp        |   4 +-
 22 files changed, 245 insertions(+), 290 deletions(-)

diff --git a/src/bench/bench.cpp b/src/bench/bench.cpp
index af3d152c9a4ce..8f9432e11c90e 100644
--- a/src/bench/bench.cpp
+++ b/src/bench/bench.cpp
@@ -9,9 +9,7 @@
 #include <iomanip>
 #include <sys/time.h>
 
-using namespace benchmark;
-
-std::map<std::string, BenchFunction> BenchRunner::benchmarks;
+std::map<std::string, benchmark::BenchFunction> benchmark::BenchRunner::benchmarks;
 
 static double gettimedouble(void) {
     struct timeval tv;
@@ -19,29 +17,29 @@ static double gettimedouble(void) {
     return tv.tv_usec * 0.000001 + tv.tv_sec;
 }
 
-BenchRunner::BenchRunner(std::string name, BenchFunction func)
+benchmark::BenchRunner::BenchRunner(std::string name, benchmark::BenchFunction func)
 {
     benchmarks.insert(std::make_pair(name, func));
 }
 
 void
-BenchRunner::RunAll(double elapsedTimeForOne)
+benchmark::BenchRunner::RunAll(double elapsedTimeForOne)
 {
     perf_init();
     std::cout << "#Benchmark" << "," << "count" << "," << "min" << "," << "max" << "," << "average" << ","
               << "min_cycles" << "," << "max_cycles" << "," << "average_cycles" << "\n";
 
-    for (std::map<std::string,BenchFunction>::iterator it = benchmarks.begin();
+    for (std::map<std::string,benchmark::BenchFunction>::iterator it = benchmarks.begin();
          it != benchmarks.end(); ++it) {
 
         State state(it->first, elapsedTimeForOne);
-        BenchFunction& func = it->second;
+        benchmark::BenchFunction& func = it->second;
         func(state);
     }
     perf_fini();
 }
 
-bool State::KeepRunning()
+bool benchmark::State::KeepRunning()
 {
     if (count & countMask) {
       ++count;
diff --git a/src/bench/coin_selection.cpp b/src/bench/coin_selection.cpp
index cacead4a5948e..9db6492e51dc4 100644
--- a/src/bench/coin_selection.cpp
+++ b/src/bench/coin_selection.cpp
@@ -8,9 +8,7 @@
 #include <boost/foreach.hpp>
 #include <set>
 
-using namespace std;
-
-static void addCoin(const CAmount& nValue, const CWallet& wallet, vector<COutput>& vCoins)
+static void addCoin(const CAmount& nValue, const CWallet& wallet, std::vector<COutput>& vCoins)
 {
     int nInput = 0;
 
@@ -36,7 +34,7 @@ static void addCoin(const CAmount& nValue, const CWallet& wallet, vector<COutput
 static void CoinSelection(benchmark::State& state)
 {
     const CWallet wallet;
-    vector<COutput> vCoins;
+    std::vector<COutput> vCoins;
     LOCK(wallet.cs_wallet);
 
     while (state.KeepRunning()) {
@@ -50,7 +48,7 @@ static void CoinSelection(benchmark::State& state)
             addCoin(1000 * COIN, wallet, vCoins);
         addCoin(3 * COIN, wallet, vCoins);
 
-        set<pair<const CWalletTx*, unsigned int> > setCoinsRet;
+        std::set<std::pair<const CWalletTx*, unsigned int> > setCoinsRet;
         CAmount nValueRet;
         bool success = wallet.SelectCoinsMinConf(1003 * COIN, 1, 6, 0, vCoins, setCoinsRet, nValueRet);
         assert(success);
diff --git a/src/test/addrman_tests.cpp b/src/test/addrman_tests.cpp
index adff09f754880..1e284609abf8b 100644
--- a/src/test/addrman_tests.cpp
+++ b/src/test/addrman_tests.cpp
@@ -10,8 +10,6 @@
 #include "netbase.h"
 #include "random.h"
 
-using namespace std;
-
 class CAddrManTest : public CAddrMan
 {
     uint64_t state;
@@ -365,7 +363,7 @@ BOOST_AUTO_TEST_CASE(addrman_getaddr)
     // Test 22: Sanity check, GetAddr should never return anything if addrman
     //  is empty.
     BOOST_CHECK(addrman.size() == 0);
-    vector<CAddress> vAddr1 = addrman.GetAddr();
+    std::vector<CAddress> vAddr1 = addrman.GetAddr();
     BOOST_CHECK(vAddr1.size() == 0);
 
     CAddress addr1 = CAddress(ResolveService("250.250.2.1", 8333), NODE_NONE);
@@ -401,7 +399,7 @@ BOOST_AUTO_TEST_CASE(addrman_getaddr)
         int octet1 = i % 256;
         int octet2 = (i / 256) % 256;
         int octet3 = (i / (256 * 2)) % 256;
-        string strAddr = boost::to_string(octet1) + "." + boost::to_string(octet2) + "." + boost::to_string(octet3) + ".23";
+        std::string strAddr = boost::to_string(octet1) + "." + boost::to_string(octet2) + "." + boost::to_string(octet3) + ".23";
         CAddress addr = CAddress(ResolveService(strAddr), NODE_NONE);
         
         // Ensure that for all addrs in addrman, isTerrible == false.
@@ -410,7 +408,7 @@ BOOST_AUTO_TEST_CASE(addrman_getaddr)
         if (i % 8 == 0)
             addrman.Good(addr);
     }
-    vector<CAddress> vAddr = addrman.GetAddr();
+    std::vector<CAddress> vAddr = addrman.GetAddr();
 
     size_t percent23 = (addrman.size() * 23) / 100;
     BOOST_CHECK(vAddr.size() == percent23);
@@ -452,7 +450,7 @@ BOOST_AUTO_TEST_CASE(caddrinfo_get_tried_bucket)
     BOOST_CHECK(info1.GetKey() != info2.GetKey());
     BOOST_CHECK(info1.GetTriedBucket(nKey1) != info2.GetTriedBucket(nKey1));
 
-    set<int> buckets;
+    std::set<int> buckets;
     for (int i = 0; i < 255; i++) {
         CAddrInfo infoi = CAddrInfo(
             CAddress(ResolveService("250.1.1." + boost::to_string(i)), NODE_NONE),
@@ -505,7 +503,7 @@ BOOST_AUTO_TEST_CASE(caddrinfo_get_new_bucket)
     BOOST_CHECK(info1.GetKey() != info2.GetKey());
     BOOST_CHECK(info1.GetNewBucket(nKey1) == info2.GetNewBucket(nKey1));
 
-    set<int> buckets;
+    std::set<int> buckets;
     for (int i = 0; i < 255; i++) {
         CAddrInfo infoi = CAddrInfo(
             CAddress(ResolveService("250.1.1." + boost::to_string(i)), NODE_NONE),
diff --git a/src/test/bloom_tests.cpp b/src/test/bloom_tests.cpp
index b15ff9e44b12b..3956c32e55d2a 100644
--- a/src/test/bloom_tests.cpp
+++ b/src/test/bloom_tests.cpp
@@ -21,8 +21,6 @@
 #include <boost/test/unit_test.hpp>
 #include <boost/tuple/tuple.hpp>
 
-using namespace std;
-
 BOOST_FIXTURE_TEST_SUITE(bloom_tests, BasicTestingSetup)
 
 BOOST_AUTO_TEST_CASE(bloom_create_insert_serialize)
@@ -43,8 +41,8 @@ BOOST_AUTO_TEST_CASE(bloom_create_insert_serialize)
     CDataStream stream(SER_NETWORK, PROTOCOL_VERSION);
     stream << filter;
 
-    vector<unsigned char> vch = ParseHex("03614e9b050000000000000001");
-    vector<char> expected(vch.size());
+    std::vector<unsigned char> vch = ParseHex("03614e9b050000000000000001");
+    std::vector<char> expected(vch.size());
 
     for (unsigned int i = 0; i < vch.size(); i++)
         expected[i] = (char)vch[i];
@@ -75,8 +73,8 @@ BOOST_AUTO_TEST_CASE(bloom_create_insert_serialize_with_tweak)
     CDataStream stream(SER_NETWORK, PROTOCOL_VERSION);
     stream << filter;
 
-    vector<unsigned char> vch = ParseHex("03ce4299050000000100008001");
-    vector<char> expected(vch.size());
+    std::vector<unsigned char> vch = ParseHex("03ce4299050000000100008001");
+    std::vector<char> expected(vch.size());
 
     for (unsigned int i = 0; i < vch.size(); i++)
         expected[i] = (char)vch[i];
@@ -86,24 +84,24 @@ BOOST_AUTO_TEST_CASE(bloom_create_insert_serialize_with_tweak)
 
 BOOST_AUTO_TEST_CASE(bloom_create_insert_key)
 {
-    string strSecret = string("5Kg1gnAjaLfKiwhhPpGS3QfRg2m6awQvaj98JCZBZQ5SuS2F15C");
+    std::string strSecret = std::string("5Kg1gnAjaLfKiwhhPpGS3QfRg2m6awQvaj98JCZBZQ5SuS2F15C");
     CBitcoinSecret vchSecret;
     BOOST_CHECK(vchSecret.SetString(strSecret));
 
     CKey key = vchSecret.GetKey();
     CPubKey pubkey = key.GetPubKey();
-    vector<unsigned char> vchPubKey(pubkey.begin(), pubkey.end());
+    std::vector<unsigned char> vchPubKey(pubkey.begin(), pubkey.end());
 
     CBloomFilter filter(2, 0.001, 0, BLOOM_UPDATE_ALL);
     filter.insert(vchPubKey);
     uint160 hash = pubkey.GetID();
-    filter.insert(vector<unsigned char>(hash.begin(), hash.end()));
+    filter.insert(std::vector<unsigned char>(hash.begin(), hash.end()));
 
     CDataStream stream(SER_NETWORK, PROTOCOL_VERSION);
     stream << filter;
 
-    vector<unsigned char> vch = ParseHex("038fc16b080000000000000001");
-    vector<char> expected(vch.size());
+    std::vector<unsigned char> vch = ParseHex("038fc16b080000000000000001");
+    std::vector<char> expected(vch.size());
 
     for (unsigned int i = 0; i < vch.size(); i++)
         expected[i] = (char)vch[i];
@@ -119,7 +117,7 @@ BOOST_AUTO_TEST_CASE(bloom_match)
 
     // and one which spends it (e2769b09e784f32f62ef849763d4f45b98e07ba658647343b915ff832b110436)
     unsigned char ch[] = {0x01, 0x00, 0x00, 0x00, 0x01, 0x6b, 0xff, 0x7f, 0xcd, 0x4f, 0x85, 0x65, 0xef, 0x40, 0x6d, 0xd5, 0xd6, 0x3d, 0x4f, 0xf9, 0x4f, 0x31, 0x8f, 0xe8, 0x20, 0x27, 0xfd, 0x4d, 0xc4, 0x51, 0xb0, 0x44, 0x74, 0x01, 0x9f, 0x74, 0xb4, 0x00, 0x00, 0x00, 0x00, 0x8c, 0x49, 0x30, 0x46, 0x02, 0x21, 0x00, 0xda, 0x0d, 0xc6, 0xae, 0xce, 0xfe, 0x1e, 0x06, 0xef, 0xdf, 0x05, 0x77, 0x37, 0x57, 0xde, 0xb1, 0x68, 0x82, 0x09, 0x30, 0xe3, 0xb0, 0xd0, 0x3f, 0x46, 0xf5, 0xfc, 0xf1, 0x50, 0xbf, 0x99, 0x0c, 0x02, 0x21, 0x00, 0xd2, 0x5b, 0x5c, 0x87, 0x04, 0x00, 0x76, 0xe4, 0xf2, 0x53, 0xf8, 0x26, 0x2e, 0x76, 0x3e, 0x2d, 0xd5, 0x1e, 0x7f, 0xf0, 0xbe, 0x15, 0x77, 0x27, 0xc4, 0xbc, 0x42, 0x80, 0x7f, 0x17, 0xbd, 0x39, 0x01, 0x41, 0x04, 0xe6, 0xc2, 0x6e, 0xf6, 0x7d, 0xc6, 0x10, 0xd2, 0xcd, 0x19, 0x24, 0x84, 0x78, 0x9a, 0x6c, 0xf9, 0xae, 0xa9, 0x93, 0x0b, 0x94, 0x4b, 0x7e, 0x2d, 0xb5, 0x34, 0x2b, 0x9d, 0x9e, 0x5b, 0x9f, 0xf7, 0x9a, 0xff, 0x9a, 0x2e, 0xe1, 0x97, 0x8d, 0xd7, 0xfd, 0x01, 0xdf, 0xc5, 0x22, 0xee, 0x02, 0x28, 0x3d, 0x3b, 0x06, 0xa9, 0xd0, 0x3a, 0xcf, 0x80, 0x96, 0x96, 0x8d, 0x7d, 0xbb, 0x0f, 0x91, 0x78, 0xff, 0xff, 0xff, 0xff, 0x02, 0x8b, 0xa7, 0x94, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x19, 0x76, 0xa9, 0x14, 0xba, 0xde, 0xec, 0xfd, 0xef, 0x05, 0x07, 0x24, 0x7f, 0xc8, 0xf7, 0x42, 0x41, 0xd7, 0x3b, 0xc0, 0x39, 0x97, 0x2d, 0x7b, 0x88, 0xac, 0x40, 0x94, 0xa8, 0x02, 0x00, 0x00, 0x00, 0x00, 0x19, 0x76, 0xa9, 0x14, 0xc1, 0x09, 0x32, 0x48, 0x3f, 0xec, 0x93, 0xed, 0x51, 0xf5, 0xfe, 0x95, 0xe7, 0x25, 0x59, 0xf2, 0xcc, 0x70, 0x43, 0xf9, 0x88, 0xac, 0x00, 0x00, 0x00, 0x00, 0x00};
-    vector<unsigned char> vch(ch, ch + sizeof(ch) -1);
+    std::vector<unsigned char> vch(ch, ch + sizeof(ch) -1);
     CDataStream spendStream(vch, SER_DISK, CLIENT_VERSION);
     CTransaction spendingTx(deserialize, spendStream);
 
@@ -156,7 +154,7 @@ BOOST_AUTO_TEST_CASE(bloom_match)
     filter = CBloomFilter(10, 0.000001, 0, BLOOM_UPDATE_ALL);
     COutPoint prevOutPoint(uint256S("0x90c122d70786e899529d71dbeba91ba216982fb6ba58f3bdaab65e73b7e9260b"), 0);
     {
-        vector<unsigned char> data(32 + sizeof(unsigned int));
+        std::vector<unsigned char> data(32 + sizeof(unsigned int));
         memcpy(&data[0], prevOutPoint.hash.begin(), 32);
         memcpy(&data[32], &prevOutPoint.n, sizeof(unsigned int));
         filter.insert(data);
@@ -196,13 +194,13 @@ BOOST_AUTO_TEST_CASE(merkle_block_1)
     BOOST_CHECK(merkleBlock.header.GetHash() == block.GetHash());
 
     BOOST_CHECK(merkleBlock.vMatchedTxn.size() == 1);
-    pair<unsigned int, uint256> pair = merkleBlock.vMatchedTxn[0];
+    std::pair<unsigned int, uint256> pair = merkleBlock.vMatchedTxn[0];
 
     BOOST_CHECK(merkleBlock.vMatchedTxn[0].second == uint256S("0x74d681e0e03bafa802c8aa084379aa98d9fcd632ddc2ed9782b586ec87451f20"));
     BOOST_CHECK(merkleBlock.vMatchedTxn[0].first == 8);
 
-    vector<uint256> vMatched;
-    vector<unsigned int> vIndex;
+    std::vector<uint256> vMatched;
+    std::vector<unsigned int> vIndex;
     BOOST_CHECK(merkleBlock.txn.ExtractMatches(vMatched, vIndex) == block.hashMerkleRoot);
     BOOST_CHECK(vMatched.size() == merkleBlock.vMatchedTxn.size());
     for (unsigned int i = 0; i < vMatched.size(); i++)
@@ -242,13 +240,13 @@ BOOST_AUTO_TEST_CASE(merkle_block_2)
     BOOST_CHECK(merkleBlock.header.GetHash() == block.GetHash());
 
     BOOST_CHECK(merkleBlock.vMatchedTxn.size() == 1);
-    pair<unsigned int, uint256> pair = merkleBlock.vMatchedTxn[0];
+    std::pair<unsigned int, uint256> pair = merkleBlock.vMatchedTxn[0];
 
     BOOST_CHECK(merkleBlock.vMatchedTxn[0].second == uint256S("0xe980fe9f792d014e73b95203dc1335c5f9ce19ac537a419e6df5b47aecb93b70"));
     BOOST_CHECK(merkleBlock.vMatchedTxn[0].first == 0);
 
-    vector<uint256> vMatched;
-    vector<unsigned int> vIndex;
+    std::vector<uint256> vMatched;
+    std::vector<unsigned int> vIndex;
     BOOST_CHECK(merkleBlock.txn.ExtractMatches(vMatched, vIndex) == block.hashMerkleRoot);
     BOOST_CHECK(vMatched.size() == merkleBlock.vMatchedTxn.size());
     for (unsigned int i = 0; i < vMatched.size(); i++)
@@ -297,13 +295,13 @@ BOOST_AUTO_TEST_CASE(merkle_block_2_with_update_none)
     BOOST_CHECK(merkleBlock.header.GetHash() == block.GetHash());
 
     BOOST_CHECK(merkleBlock.vMatchedTxn.size() == 1);
-    pair<unsigned int, uint256> pair = merkleBlock.vMatchedTxn[0];
+    std::pair<unsigned int, uint256> pair = merkleBlock.vMatchedTxn[0];
 
     BOOST_CHECK(merkleBlock.vMatchedTxn[0].second == uint256S("0xe980fe9f792d014e73b95203dc1335c5f9ce19ac537a419e6df5b47aecb93b70"));
     BOOST_CHECK(merkleBlock.vMatchedTxn[0].first == 0);
 
-    vector<uint256> vMatched;
-    vector<unsigned int> vIndex;
+    std::vector<uint256> vMatched;
+    std::vector<unsigned int> vIndex;
     BOOST_CHECK(merkleBlock.txn.ExtractMatches(vMatched, vIndex) == block.hashMerkleRoot);
     BOOST_CHECK(vMatched.size() == merkleBlock.vMatchedTxn.size());
     for (unsigned int i = 0; i < vMatched.size(); i++)
@@ -353,8 +351,8 @@ BOOST_AUTO_TEST_CASE(merkle_block_3_and_serialize)
     BOOST_CHECK(merkleBlock.vMatchedTxn[0].second == uint256S("0x63194f18be0af63f2c6bc9dc0f777cbefed3d9415c4af83f3ee3a3d669c00cb5"));
     BOOST_CHECK(merkleBlock.vMatchedTxn[0].first == 0);
 
-    vector<uint256> vMatched;
-    vector<unsigned int> vIndex;
+    std::vector<uint256> vMatched;
+    std::vector<unsigned int> vIndex;
     BOOST_CHECK(merkleBlock.txn.ExtractMatches(vMatched, vIndex) == block.hashMerkleRoot);
     BOOST_CHECK(vMatched.size() == merkleBlock.vMatchedTxn.size());
     for (unsigned int i = 0; i < vMatched.size(); i++)
@@ -363,8 +361,8 @@ BOOST_AUTO_TEST_CASE(merkle_block_3_and_serialize)
     CDataStream merkleStream(SER_NETWORK, PROTOCOL_VERSION);
     merkleStream << merkleBlock;
 
-    vector<unsigned char> vch = ParseHex("0100000079cda856b143d9db2c1caff01d1aecc8630d30625d10e8b4b8b0000000000000b50cc069d6a3e33e3ff84a5c41d9d3febe7c770fdcc96b2c3ff60abe184f196367291b4d4c86041b8fa45d630100000001b50cc069d6a3e33e3ff84a5c41d9d3febe7c770fdcc96b2c3ff60abe184f19630101");
-    vector<char> expected(vch.size());
+    std::vector<unsigned char> vch = ParseHex("0100000079cda856b143d9db2c1caff01d1aecc8630d30625d10e8b4b8b0000000000000b50cc069d6a3e33e3ff84a5c41d9d3febe7c770fdcc96b2c3ff60abe184f196367291b4d4c86041b8fa45d630100000001b50cc069d6a3e33e3ff84a5c41d9d3febe7c770fdcc96b2c3ff60abe184f19630101");
+    std::vector<char> expected(vch.size());
 
     for (unsigned int i = 0; i < vch.size(); i++)
         expected[i] = (char)vch[i];
@@ -388,13 +386,13 @@ BOOST_AUTO_TEST_CASE(merkle_block_4)
     BOOST_CHECK(merkleBlock.header.GetHash() == block.GetHash());
 
     BOOST_CHECK(merkleBlock.vMatchedTxn.size() == 1);
-    pair<unsigned int, uint256> pair = merkleBlock.vMatchedTxn[0];
+    std::pair<unsigned int, uint256> pair = merkleBlock.vMatchedTxn[0];
 
     BOOST_CHECK(merkleBlock.vMatchedTxn[0].second == uint256S("0x0a2a92f0bda4727d0a13eaddf4dd9ac6b5c61a1429e6b2b818f19b15df0ac154"));
     BOOST_CHECK(merkleBlock.vMatchedTxn[0].first == 6);
 
-    vector<uint256> vMatched;
-    vector<unsigned int> vIndex;
+    std::vector<uint256> vMatched;
+    std::vector<unsigned int> vIndex;
     BOOST_CHECK(merkleBlock.txn.ExtractMatches(vMatched, vIndex) == block.hashMerkleRoot);
     BOOST_CHECK(vMatched.size() == merkleBlock.vMatchedTxn.size());
     for (unsigned int i = 0; i < vMatched.size(); i++)
diff --git a/src/test/dbwrapper_tests.cpp b/src/test/dbwrapper_tests.cpp
index 2d791ee18d5a8..6751b9d5a0875 100644
--- a/src/test/dbwrapper_tests.cpp
+++ b/src/test/dbwrapper_tests.cpp
@@ -10,13 +10,9 @@
 #include <boost/assign/std/vector.hpp> // for 'operator+=()'
 #include <boost/assert.hpp>
 #include <boost/test/unit_test.hpp>
-                    
-using namespace std;
-using namespace boost::assign; // bring 'operator+=()' into scope
-using namespace boost::filesystem;
-         
+
 // Test if a string consists entirely of null characters
-bool is_null_key(const vector<unsigned char>& key) {
+bool is_null_key(const std::vector<unsigned char>& key) {
     bool isnull = true;
 
     for (unsigned int i = 0; i < key.size(); i++)
@@ -32,7 +28,7 @@ BOOST_AUTO_TEST_CASE(dbwrapper)
     // Perform tests both obfuscated and non-obfuscated.
     for (int i = 0; i < 2; i++) {
         bool obfuscate = (bool)i;
-        path ph = temp_directory_path() / unique_path();
+        boost::filesystem::path ph = boost::filesystem::temp_directory_path() / boost::filesystem::unique_path();
         CDBWrapper dbw(ph, (1 << 20), true, false, obfuscate);
         char key = 'k';
         uint256 in = GetRandHash();
@@ -53,7 +49,7 @@ BOOST_AUTO_TEST_CASE(dbwrapper_batch)
     // Perform tests both obfuscated and non-obfuscated.
     for (int i = 0; i < 2; i++) {
         bool obfuscate = (bool)i;
-        path ph = temp_directory_path() / unique_path();
+        boost::filesystem::path ph = boost::filesystem::temp_directory_path() / boost::filesystem::unique_path();
         CDBWrapper dbw(ph, (1 << 20), true, false, obfuscate);
 
         char key = 'i';
@@ -90,7 +86,7 @@ BOOST_AUTO_TEST_CASE(dbwrapper_iterator)
     // Perform tests both obfuscated and non-obfuscated.
     for (int i = 0; i < 2; i++) {
         bool obfuscate = (bool)i;
-        path ph = temp_directory_path() / unique_path();
+        boost::filesystem::path ph = boost::filesystem::temp_directory_path() / boost::filesystem::unique_path();
         CDBWrapper dbw(ph, (1 << 20), true, false, obfuscate);
 
         // The two keys are intentionally chosen for ordering
@@ -129,8 +125,8 @@ BOOST_AUTO_TEST_CASE(dbwrapper_iterator)
 // Test that we do not obfuscation if there is existing data.
 BOOST_AUTO_TEST_CASE(existing_data_no_obfuscate)
 {
-    // We're going to share this path between two wrappers
-    path ph = temp_directory_path() / unique_path();
+    // We're going to share this boost::filesystem::path between two wrappers
+    boost::filesystem::path ph = boost::filesystem::temp_directory_path() / boost::filesystem::unique_path();
     create_directories(ph);
 
     // Set up a non-obfuscated wrapper to write some initial data.
@@ -170,8 +166,8 @@ BOOST_AUTO_TEST_CASE(existing_data_no_obfuscate)
 // Ensure that we start obfuscating during a reindex.
 BOOST_AUTO_TEST_CASE(existing_data_reindex)
 {
-    // We're going to share this path between two wrappers
-    path ph = temp_directory_path() / unique_path();
+    // We're going to share this boost::filesystem::path between two wrappers
+    boost::filesystem::path ph = boost::filesystem::temp_directory_path() / boost::filesystem::unique_path();
     create_directories(ph);
 
     // Set up a non-obfuscated wrapper to write some initial data.
@@ -206,7 +202,7 @@ BOOST_AUTO_TEST_CASE(existing_data_reindex)
 
 BOOST_AUTO_TEST_CASE(iterator_ordering)
 {
-    path ph = temp_directory_path() / unique_path();
+    boost::filesystem::path ph = boost::filesystem::temp_directory_path() / boost::filesystem::unique_path();
     CDBWrapper dbw(ph, (1 << 20), true, false, false);
     for (int x=0x00; x<256; ++x) {
         uint8_t key = x;
@@ -241,11 +237,11 @@ BOOST_AUTO_TEST_CASE(iterator_ordering)
 struct StringContentsSerializer {
     // Used to make two serialized objects the same while letting them have a different lengths
     // This is a terrible idea
-    string str;
+    std::string str;
     StringContentsSerializer() {}
-    StringContentsSerializer(const string& inp) : str(inp) {}
+    StringContentsSerializer(const std::string& inp) : str(inp) {}
 
-    StringContentsSerializer& operator+=(const string& s) {
+    StringContentsSerializer& operator+=(const std::string& s) {
         str += s;
         return *this;
     }
@@ -277,7 +273,7 @@ BOOST_AUTO_TEST_CASE(iterator_string_ordering)
 {
     char buf[10];
 
-    path ph = temp_directory_path() / unique_path();
+    boost::filesystem::path ph = boost::filesystem::temp_directory_path() / boost::filesystem::unique_path();
     CDBWrapper dbw(ph, (1 << 20), true, false, false);
     for (int x=0x00; x<10; ++x) {
         for (int y = 0; y < 10; y++) {
@@ -303,7 +299,7 @@ BOOST_AUTO_TEST_CASE(iterator_string_ordering)
         for (int x=seek_start; x<10; ++x) {
             for (int y = 0; y < 10; y++) {
                 sprintf(buf, "%d", x);
-                string exp_key(buf);
+                std::string exp_key(buf);
                 for (int z = 0; z < y; z++)
                     exp_key += exp_key;
                 StringContentsSerializer key;
diff --git a/src/test/hash_tests.cpp b/src/test/hash_tests.cpp
index 8be9c580c473b..763107fb122e5 100644
--- a/src/test/hash_tests.cpp
+++ b/src/test/hash_tests.cpp
@@ -10,8 +10,6 @@
 
 #include <boost/test/unit_test.hpp>
 
-using namespace std;
-
 BOOST_FIXTURE_TEST_SUITE(hash_tests, BasicTestingSetup)
 
 BOOST_AUTO_TEST_CASE(murmurhash3)
diff --git a/src/test/key_tests.cpp b/src/test/key_tests.cpp
index 4978c9513030a..40a7fdf11d053 100644
--- a/src/test/key_tests.cpp
+++ b/src/test/key_tests.cpp
@@ -16,19 +16,17 @@
 
 #include <boost/test/unit_test.hpp>
 
-using namespace std;
-
-static const string strSecret1     ("5HxWvvfubhXpYYpS3tJkw6fq9jE9j18THftkZjHHfmFiWtmAbrj");
-static const string strSecret2     ("5KC4ejrDjv152FGwP386VD1i2NYc5KkfSMyv1nGy1VGDxGHqVY3");
-static const string strSecret1C    ("Kwr371tjA9u2rFSMZjTNun2PXXP3WPZu2afRHTcta6KxEUdm1vEw");
-static const string strSecret2C    ("L3Hq7a8FEQwJkW1M2GNKDW28546Vp5miewcCzSqUD9kCAXrJdS3g");
+static const std::string strSecret1     ("5HxWvvfubhXpYYpS3tJkw6fq9jE9j18THftkZjHHfmFiWtmAbrj");
+static const std::string strSecret2     ("5KC4ejrDjv152FGwP386VD1i2NYc5KkfSMyv1nGy1VGDxGHqVY3");
+static const std::string strSecret1C    ("Kwr371tjA9u2rFSMZjTNun2PXXP3WPZu2afRHTcta6KxEUdm1vEw");
+static const std::string strSecret2C    ("L3Hq7a8FEQwJkW1M2GNKDW28546Vp5miewcCzSqUD9kCAXrJdS3g");
 static const CBitcoinAddress addr1 ("1QFqqMUD55ZV3PJEJZtaKCsQmjLT6JkjvJ");
 static const CBitcoinAddress addr2 ("1F5y5E5FMc5YzdJtB9hLaUe43GDxEKXENJ");
 static const CBitcoinAddress addr1C("1NoJrossxPBKfCHuJXT4HadJrXRE9Fxiqs");
 static const CBitcoinAddress addr2C("1CRj2HyM1CXWzHAXLQtiGLyggNT9WQqsDs");
 
 
-static const string strAddressBad("1HV9Lc3sNHZxwj4Zk6fB38tEmBryq2cBiF");
+static const std::string strAddressBad("1HV9Lc3sNHZxwj4Zk6fB38tEmBryq2cBiF");
 
 
 #ifdef KEY_TESTS_DUMPINFO
@@ -37,7 +35,7 @@ void dumpKeyInfo(uint256 privkey)
     CKey key;
     key.resize(32);
     memcpy(&secret[0], &privkey, 32);
-    vector<unsigned char> sec;
+    std::vector<unsigned char> sec;
     sec.resize(32);
     memcpy(&sec[0], &secret[0], 32);
     printf("  * secret (hex): %s\n", HexStr(sec).c_str());
@@ -51,7 +49,7 @@ void dumpKeyInfo(uint256 privkey)
         printf("    * secret (base58): %s\n", bsecret.ToString().c_str());
         CKey key;
         key.SetSecret(secret, fCompressed);
-        vector<unsigned char> vchPubKey = key.GetPubKey();
+        std::vector<unsigned char> vchPubKey = key.GetPubKey();
         printf("    * pubkey (hex): %s\n", HexStr(vchPubKey).c_str());
         printf("    * address (base58): %s\n", CBitcoinAddress(vchPubKey).ToString().c_str());
     }
@@ -111,12 +109,12 @@ BOOST_AUTO_TEST_CASE(key_test1)
 
     for (int n=0; n<16; n++)
     {
-        string strMsg = strprintf("Very secret message %i: 11", n);
+        std::string strMsg = strprintf("Very secret message %i: 11", n);
         uint256 hashMsg = Hash(strMsg.begin(), strMsg.end());
 
         // normal signatures
 
-        vector<unsigned char> sign1, sign2, sign1C, sign2C;
+        std::vector<unsigned char> sign1, sign2, sign1C, sign2C;
 
         BOOST_CHECK(key1.Sign (hashMsg, sign1));
         BOOST_CHECK(key2.Sign (hashMsg, sign2));
@@ -145,7 +143,7 @@ BOOST_AUTO_TEST_CASE(key_test1)
 
         // compact signatures (with key recovery)
 
-        vector<unsigned char> csign1, csign2, csign1C, csign2C;
+        std::vector<unsigned char> csign1, csign2, csign1C, csign2C;
 
         BOOST_CHECK(key1.SignCompact (hashMsg, csign1));
         BOOST_CHECK(key2.SignCompact (hashMsg, csign2));
@@ -168,7 +166,7 @@ BOOST_AUTO_TEST_CASE(key_test1)
     // test deterministic signing
 
     std::vector<unsigned char> detsig, detsigc;
-    string strMsg = "Very deterministic message";
+    std::string strMsg = "Very deterministic message";
     uint256 hashMsg = Hash(strMsg.begin(), strMsg.end());
     BOOST_CHECK(key1.Sign(hashMsg, detsig));
     BOOST_CHECK(key1C.Sign(hashMsg, detsigc));
diff --git a/src/test/multisig_tests.cpp b/src/test/multisig_tests.cpp
index 581b0cee1ec87..34d7fc9d11d77 100644
--- a/src/test/multisig_tests.cpp
+++ b/src/test/multisig_tests.cpp
@@ -17,14 +17,12 @@
 #include <boost/foreach.hpp>
 #include <boost/test/unit_test.hpp>
 
-using namespace std;
-
-typedef vector<unsigned char> valtype;
+typedef std::vector<unsigned char> valtype;
 
 BOOST_FIXTURE_TEST_SUITE(multisig_tests, BasicTestingSetup)
 
 CScript
-sign_multisig(CScript scriptPubKey, vector<CKey> keys, CTransaction transaction, int whichIn)
+sign_multisig(CScript scriptPubKey, std::vector<CKey> keys, CTransaction transaction, int whichIn)
 {
     uint256 hash = SignatureHash(scriptPubKey, transaction, whichIn, SIGHASH_ALL, 0, SIGVERSION_BASE);
 
@@ -32,7 +30,7 @@ sign_multisig(CScript scriptPubKey, vector<CKey> keys, CTransaction transaction,
     result << OP_0; // CHECKMULTISIG bug workaround
     BOOST_FOREACH(const CKey &key, keys)
     {
-        vector<unsigned char> vchSig;
+        std::vector<unsigned char> vchSig;
         BOOST_CHECK(key.Sign(hash, vchSig));
         vchSig.push_back((unsigned char)SIGHASH_ALL);
         result << vchSig;
@@ -75,7 +73,7 @@ BOOST_AUTO_TEST_CASE(multisig_verify)
         txTo[i].vout[0].nValue = 1;
     }
 
-    vector<CKey> keys;
+    std::vector<CKey> keys;
     CScript s;
 
     // Test a AND b:
@@ -200,7 +198,7 @@ BOOST_AUTO_TEST_CASE(multisig_Solver1)
     partialkeystore.AddKey(key[0]);
 
     {
-        vector<valtype> solutions;
+        std::vector<valtype> solutions;
         txnouttype whichType;
         CScript s;
         s << ToByteVector(key[0].GetPubKey()) << OP_CHECKSIG;
@@ -213,7 +211,7 @@ BOOST_AUTO_TEST_CASE(multisig_Solver1)
         BOOST_CHECK(!IsMine(emptykeystore, s));
     }
     {
-        vector<valtype> solutions;
+        std::vector<valtype> solutions;
         txnouttype whichType;
         CScript s;
         s << OP_DUP << OP_HASH160 << ToByteVector(key[0].GetPubKey().GetID()) << OP_EQUALVERIFY << OP_CHECKSIG;
@@ -226,7 +224,7 @@ BOOST_AUTO_TEST_CASE(multisig_Solver1)
         BOOST_CHECK(!IsMine(emptykeystore, s));
     }
     {
-        vector<valtype> solutions;
+        std::vector<valtype> solutions;
         txnouttype whichType;
         CScript s;
         s << OP_2 << ToByteVector(key[0].GetPubKey()) << ToByteVector(key[1].GetPubKey()) << OP_2 << OP_CHECKMULTISIG;
@@ -239,13 +237,13 @@ BOOST_AUTO_TEST_CASE(multisig_Solver1)
         BOOST_CHECK(!IsMine(partialkeystore, s));
     }
     {
-        vector<valtype> solutions;
+        std::vector<valtype> solutions;
         txnouttype whichType;
         CScript s;
         s << OP_1 << ToByteVector(key[0].GetPubKey()) << ToByteVector(key[1].GetPubKey()) << OP_2 << OP_CHECKMULTISIG;
         BOOST_CHECK(Solver(s, whichType, solutions));
         BOOST_CHECK_EQUAL(solutions.size(), 4U);
-        vector<CTxDestination> addrs;
+        std::vector<CTxDestination> addrs;
         int nRequired;
         BOOST_CHECK(ExtractDestinations(s, whichType, addrs, nRequired));
         BOOST_CHECK(addrs[0] == keyaddr[0]);
@@ -256,7 +254,7 @@ BOOST_AUTO_TEST_CASE(multisig_Solver1)
         BOOST_CHECK(!IsMine(partialkeystore, s));
     }
     {
-        vector<valtype> solutions;
+        std::vector<valtype> solutions;
         txnouttype whichType;
         CScript s;
         s << OP_2 << ToByteVector(key[0].GetPubKey()) << ToByteVector(key[1].GetPubKey()) << ToByteVector(key[2].GetPubKey()) << OP_3 << OP_CHECKMULTISIG;
diff --git a/src/test/net_tests.cpp b/src/test/net_tests.cpp
index 87cb38daac3d2..0bd7869f32fc4 100644
--- a/src/test/net_tests.cpp
+++ b/src/test/net_tests.cpp
@@ -12,8 +12,6 @@
 #include "netbase.h"
 #include "chainparams.h"
 
-using namespace std;
-
 class CAddrManSerializationMock : public CAddrMan
 {
 public:
@@ -68,7 +66,7 @@ CDataStream AddrmanToStream(CAddrManSerializationMock& _addrman)
     ssPeersIn << FLATDATA(Params().MessageStart());
     ssPeersIn << _addrman;
     std::string str = ssPeersIn.str();
-    vector<unsigned char> vchData(str.begin(), str.end());
+    std::vector<unsigned char> vchData(str.begin(), str.end());
     return CDataStream(vchData, SER_DISK, CLIENT_VERSION);
 }
 
diff --git a/src/test/netbase_tests.cpp b/src/test/netbase_tests.cpp
index 18ad5dc90bf4e..b4dff75a0912f 100644
--- a/src/test/netbase_tests.cpp
+++ b/src/test/netbase_tests.cpp
@@ -10,8 +10,6 @@
 #include <boost/assign/list_of.hpp>
 #include <boost/test/unit_test.hpp>
 
-using namespace std;
-
 BOOST_FIXTURE_TEST_SUITE(netbase_tests, BasicTestingSetup)
 
 static CNetAddr ResolveIP(const char* ip)
@@ -64,9 +62,9 @@ BOOST_AUTO_TEST_CASE(netbase_properties)
 
 }
 
-bool static TestSplitHost(string test, string host, int port)
+bool static TestSplitHost(std::string test, std::string host, int port)
 {
-    string hostOut;
+    std::string hostOut;
     int portOut = -1;
     SplitHostPort(test, portOut, hostOut);
     return hostOut == host && port == portOut;
@@ -91,7 +89,7 @@ BOOST_AUTO_TEST_CASE(netbase_splithost)
     BOOST_CHECK(TestSplitHost("", "", -1));
 }
 
-bool static TestParse(string src, string canon)
+bool static TestParse(std::string src, std::string canon)
 {
     CService addr(LookupNumeric(src.c_str(), 65535));
     return canon == addr.ToString();
diff --git a/src/test/pmt_tests.cpp b/src/test/pmt_tests.cpp
index e6b689bc6ca9e..c5796277b012d 100644
--- a/src/test/pmt_tests.cpp
+++ b/src/test/pmt_tests.cpp
@@ -17,8 +17,6 @@
 #include <boost/assign/list_of.hpp>
 #include <boost/test/unit_test.hpp>
 
-using namespace std;
-
 class CPartialMerkleTreeTester : public CPartialMerkleTree
 {
 public:
diff --git a/src/test/pow_tests.cpp b/src/test/pow_tests.cpp
index b6eb39bc3868e..4ca6f1caf0a25 100644
--- a/src/test/pow_tests.cpp
+++ b/src/test/pow_tests.cpp
@@ -11,8 +11,6 @@
 
 #include <boost/test/unit_test.hpp>
 
-using namespace std;
-
 BOOST_FIXTURE_TEST_SUITE(pow_tests, BasicTestingSetup)
 
 /* Test calculation of next difficulty target with no constraints applying */
diff --git a/src/test/rpc_tests.cpp b/src/test/rpc_tests.cpp
index a359598ddcf0e..fd86ba5d80de5 100644
--- a/src/test/rpc_tests.cpp
+++ b/src/test/rpc_tests.cpp
@@ -16,13 +16,11 @@
 
 #include <univalue.h>
 
-using namespace std;
-
-UniValue CallRPC(string args)
+UniValue CallRPC(std::string args)
 {
-    vector<string> vArgs;
+    std::vector<std::string> vArgs;
     boost::split(vArgs, args, boost::is_any_of(" \t"));
-    string strMethod = vArgs[0];
+    std::string strMethod = vArgs[0];
     vArgs.erase(vArgs.begin());
     JSONRPCRequest request;
     request.strMethod = strMethod;
@@ -35,7 +33,7 @@ UniValue CallRPC(string args)
         return result;
     }
     catch (const UniValue& objError) {
-        throw runtime_error(find_value(objError, "message").get_str());
+        throw std::runtime_error(find_value(objError, "message").get_str());
     }
 }
 
@@ -47,41 +45,41 @@ BOOST_AUTO_TEST_CASE(rpc_rawparams)
     // Test raw transaction API argument handling
     UniValue r;
 
-    BOOST_CHECK_THROW(CallRPC("getrawtransaction"), runtime_error);
-    BOOST_CHECK_THROW(CallRPC("getrawtransaction not_hex"), runtime_error);
-    BOOST_CHECK_THROW(CallRPC("getrawtransaction a3b807410df0b60fcb9736768df5823938b2f838694939ba45f3c0a1bff150ed not_int"), runtime_error);
+    BOOST_CHECK_THROW(CallRPC("getrawtransaction"), std::runtime_error);
+    BOOST_CHECK_THROW(CallRPC("getrawtransaction not_hex"), std::runtime_error);
+    BOOST_CHECK_THROW(CallRPC("getrawtransaction a3b807410df0b60fcb9736768df5823938b2f838694939ba45f3c0a1bff150ed not_int"), std::runtime_error);
 
-    BOOST_CHECK_THROW(CallRPC("createrawtransaction"), runtime_error);
-    BOOST_CHECK_THROW(CallRPC("createrawtransaction null null"), runtime_error);
-    BOOST_CHECK_THROW(CallRPC("createrawtransaction not_array"), runtime_error);
-    BOOST_CHECK_THROW(CallRPC("createrawtransaction [] []"), runtime_error);
-    BOOST_CHECK_THROW(CallRPC("createrawtransaction {} {}"), runtime_error);
+    BOOST_CHECK_THROW(CallRPC("createrawtransaction"), std::runtime_error);
+    BOOST_CHECK_THROW(CallRPC("createrawtransaction null null"), std::runtime_error);
+    BOOST_CHECK_THROW(CallRPC("createrawtransaction not_array"), std::runtime_error);
+    BOOST_CHECK_THROW(CallRPC("createrawtransaction [] []"), std::runtime_error);
+    BOOST_CHECK_THROW(CallRPC("createrawtransaction {} {}"), std::runtime_error);
     BOOST_CHECK_NO_THROW(CallRPC("createrawtransaction [] {}"));
-    BOOST_CHECK_THROW(CallRPC("createrawtransaction [] {} extra"), runtime_error);
+    BOOST_CHECK_THROW(CallRPC("createrawtransaction [] {} extra"), std::runtime_error);
 
-    BOOST_CHECK_THROW(CallRPC("decoderawtransaction"), runtime_error);
-    BOOST_CHECK_THROW(CallRPC("decoderawtransaction null"), runtime_error);
-    BOOST_CHECK_THROW(CallRPC("decoderawtransaction DEADBEEF"), runtime_error);
-    string rawtx = "0100000001a15d57094aa7a21a28cb20b59aab8fc7d1149a3bdbcddba9c622e4f5f6a99ece010000006c493046022100f93bb0e7d8db7bd46e40132d1f8242026e045f03a0efe71bbb8e3f475e970d790221009337cd7f1f929f00cc6ff01f03729b069a7c21b59b1736ddfee5db5946c5da8c0121033b9b137ee87d5a812d6f506efdd37f0affa7ffc310711c06c7f3e097c9447c52ffffffff0100e1f505000000001976a9140389035a9225b3839e2bbf32d826a1e222031fd888ac00000000";
-    BOOST_CHECK_NO_THROW(r = CallRPC(string("decoderawtransaction ")+rawtx));
+    BOOST_CHECK_THROW(CallRPC("decoderawtransaction"), std::runtime_error);
+    BOOST_CHECK_THROW(CallRPC("decoderawtransaction null"), std::runtime_error);
+    BOOST_CHECK_THROW(CallRPC("decoderawtransaction DEADBEEF"), std::runtime_error);
+    std::string rawtx = "0100000001a15d57094aa7a21a28cb20b59aab8fc7d1149a3bdbcddba9c622e4f5f6a99ece010000006c493046022100f93bb0e7d8db7bd46e40132d1f8242026e045f03a0efe71bbb8e3f475e970d790221009337cd7f1f929f00cc6ff01f03729b069a7c21b59b1736ddfee5db5946c5da8c0121033b9b137ee87d5a812d6f506efdd37f0affa7ffc310711c06c7f3e097c9447c52ffffffff0100e1f505000000001976a9140389035a9225b3839e2bbf32d826a1e222031fd888ac00000000";
+    BOOST_CHECK_NO_THROW(r = CallRPC(std::string("decoderawtransaction ")+rawtx));
     BOOST_CHECK_EQUAL(find_value(r.get_obj(), "size").get_int(), 193);
     BOOST_CHECK_EQUAL(find_value(r.get_obj(), "version").get_int(), 1);
     BOOST_CHECK_EQUAL(find_value(r.get_obj(), "locktime").get_int(), 0);
-    BOOST_CHECK_THROW(r = CallRPC(string("decoderawtransaction ")+rawtx+" extra"), runtime_error);
+    BOOST_CHECK_THROW(r = CallRPC(std::string("decoderawtransaction ")+rawtx+" extra"), std::runtime_error);
 
-    BOOST_CHECK_THROW(CallRPC("signrawtransaction"), runtime_error);
-    BOOST_CHECK_THROW(CallRPC("signrawtransaction null"), runtime_error);
-    BOOST_CHECK_THROW(CallRPC("signrawtransaction ff00"), runtime_error);
-    BOOST_CHECK_NO_THROW(CallRPC(string("signrawtransaction ")+rawtx));
-    BOOST_CHECK_NO_THROW(CallRPC(string("signrawtransaction ")+rawtx+" null null NONE|ANYONECANPAY"));
-    BOOST_CHECK_NO_THROW(CallRPC(string("signrawtransaction ")+rawtx+" [] [] NONE|ANYONECANPAY"));
-    BOOST_CHECK_THROW(CallRPC(string("signrawtransaction ")+rawtx+" null null badenum"), runtime_error);
+    BOOST_CHECK_THROW(CallRPC("signrawtransaction"), std::runtime_error);
+    BOOST_CHECK_THROW(CallRPC("signrawtransaction null"), std::runtime_error);
+    BOOST_CHECK_THROW(CallRPC("signrawtransaction ff00"), std::runtime_error);
+    BOOST_CHECK_NO_THROW(CallRPC(std::string("signrawtransaction ")+rawtx));
+    BOOST_CHECK_NO_THROW(CallRPC(std::string("signrawtransaction ")+rawtx+" null null NONE|ANYONECANPAY"));
+    BOOST_CHECK_NO_THROW(CallRPC(std::string("signrawtransaction ")+rawtx+" [] [] NONE|ANYONECANPAY"));
+    BOOST_CHECK_THROW(CallRPC(std::string("signrawtransaction ")+rawtx+" null null badenum"), std::runtime_error);
 
     // Only check failure cases for sendrawtransaction, there's no network to send to...
-    BOOST_CHECK_THROW(CallRPC("sendrawtransaction"), runtime_error);
-    BOOST_CHECK_THROW(CallRPC("sendrawtransaction null"), runtime_error);
-    BOOST_CHECK_THROW(CallRPC("sendrawtransaction DEADBEEF"), runtime_error);
-    BOOST_CHECK_THROW(CallRPC(string("sendrawtransaction ")+rawtx+" extra"), runtime_error);
+    BOOST_CHECK_THROW(CallRPC("sendrawtransaction"), std::runtime_error);
+    BOOST_CHECK_THROW(CallRPC("sendrawtransaction null"), std::runtime_error);
+    BOOST_CHECK_THROW(CallRPC("sendrawtransaction DEADBEEF"), std::runtime_error);
+    BOOST_CHECK_THROW(CallRPC(std::string("sendrawtransaction ")+rawtx+" extra"), std::runtime_error);
 }
 
 BOOST_AUTO_TEST_CASE(rpc_togglenetwork)
@@ -110,18 +108,18 @@ BOOST_AUTO_TEST_CASE(rpc_rawsign)
 {
     UniValue r;
     // input is a 1-of-2 multisig (so is output):
-    string prevout =
+    std::string prevout =
       "[{\"txid\":\"b4cc287e58f87cdae59417329f710f3ecd75a4ee1d2872b7248f50977c8493f3\","
       "\"vout\":1,\"scriptPubKey\":\"a914b10c9df5f7edf436c697f02f1efdba4cf399615187\","
       "\"redeemScript\":\"512103debedc17b3df2badbcdd86d5feb4562b86fe182e5998abd8bcd4f122c6155b1b21027e940bb73ab8732bfdf7f9216ecefca5b94d6df834e77e108f68e66f126044c052ae\"}]";
-    r = CallRPC(string("createrawtransaction ")+prevout+" "+
+    r = CallRPC(std::string("createrawtransaction ")+prevout+" "+
       "{\"3HqAe9LtNBjnsfM4CyYaWTnvCaUYT7v4oZ\":11}");
-    string notsigned = r.get_str();
-    string privkey1 = "\"KzsXybp9jX64P5ekX1KUxRQ79Jht9uzW7LorgwE65i5rWACL6LQe\"";
-    string privkey2 = "\"Kyhdf5LuKTRx4ge69ybABsiUAWjVRK4XGxAKk2FQLp2HjGMy87Z4\"";
-    r = CallRPC(string("signrawtransaction ")+notsigned+" "+prevout+" "+"[]");
+    std::string notsigned = r.get_str();
+    std::string privkey1 = "\"KzsXybp9jX64P5ekX1KUxRQ79Jht9uzW7LorgwE65i5rWACL6LQe\"";
+    std::string privkey2 = "\"Kyhdf5LuKTRx4ge69ybABsiUAWjVRK4XGxAKk2FQLp2HjGMy87Z4\"";
+    r = CallRPC(std::string("signrawtransaction ")+notsigned+" "+prevout+" "+"[]");
     BOOST_CHECK(find_value(r.get_obj(), "complete").get_bool() == false);
-    r = CallRPC(string("signrawtransaction ")+notsigned+" "+prevout+" "+"["+privkey1+","+privkey2+"]");
+    r = CallRPC(std::string("signrawtransaction ")+notsigned+" "+prevout+" "+"["+privkey1+","+privkey2+"]");
     BOOST_CHECK(find_value(r.get_obj(), "complete").get_bool() == true);
 }
 
@@ -133,11 +131,11 @@ BOOST_AUTO_TEST_CASE(rpc_createraw_op_return)
     BOOST_CHECK_NO_THROW(CallRPC("createrawtransaction [{\"txid\":\"a3b807410df0b60fcb9736768df5823938b2f838694939ba45f3c0a1bff150ed\",\"vout\":0}] {\"data\":\"68656c6c6f776f726c64\",\"data\":\"68656c6c6f776f726c64\"}"));
 
     // Key not "data" (bad address)
-    BOOST_CHECK_THROW(CallRPC("createrawtransaction [{\"txid\":\"a3b807410df0b60fcb9736768df5823938b2f838694939ba45f3c0a1bff150ed\",\"vout\":0}] {\"somedata\":\"68656c6c6f776f726c64\"}"), runtime_error);
+    BOOST_CHECK_THROW(CallRPC("createrawtransaction [{\"txid\":\"a3b807410df0b60fcb9736768df5823938b2f838694939ba45f3c0a1bff150ed\",\"vout\":0}] {\"somedata\":\"68656c6c6f776f726c64\"}"), std::runtime_error);
 
     // Bad hex encoding of data output
-    BOOST_CHECK_THROW(CallRPC("createrawtransaction [{\"txid\":\"a3b807410df0b60fcb9736768df5823938b2f838694939ba45f3c0a1bff150ed\",\"vout\":0}] {\"data\":\"12345\"}"), runtime_error);
-    BOOST_CHECK_THROW(CallRPC("createrawtransaction [{\"txid\":\"a3b807410df0b60fcb9736768df5823938b2f838694939ba45f3c0a1bff150ed\",\"vout\":0}] {\"data\":\"12345g\"}"), runtime_error);
+    BOOST_CHECK_THROW(CallRPC("createrawtransaction [{\"txid\":\"a3b807410df0b60fcb9736768df5823938b2f838694939ba45f3c0a1bff150ed\",\"vout\":0}] {\"data\":\"12345\"}"), std::runtime_error);
+    BOOST_CHECK_THROW(CallRPC("createrawtransaction [{\"txid\":\"a3b807410df0b60fcb9736768df5823938b2f838694939ba45f3c0a1bff150ed\",\"vout\":0}] {\"data\":\"12345g\"}"), std::runtime_error);
 
     // Data 81 bytes long
     BOOST_CHECK_NO_THROW(CallRPC("createrawtransaction [{\"txid\":\"a3b807410df0b60fcb9736768df5823938b2f838694939ba45f3c0a1bff150ed\",\"vout\":0}] {\"data\":\"010203040506070809101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081\"}"));
@@ -241,23 +239,23 @@ BOOST_AUTO_TEST_CASE(json_parse_errors)
 
 BOOST_AUTO_TEST_CASE(rpc_ban)
 {
-    BOOST_CHECK_NO_THROW(CallRPC(string("clearbanned")));
-    
+    BOOST_CHECK_NO_THROW(CallRPC(std::string("clearbanned")));
+
     UniValue r;
-    BOOST_CHECK_NO_THROW(r = CallRPC(string("setban 127.0.0.0 add")));
-    BOOST_CHECK_THROW(r = CallRPC(string("setban 127.0.0.0:8334")), runtime_error); //portnumber for setban not allowed
-    BOOST_CHECK_NO_THROW(r = CallRPC(string("listbanned")));
+    BOOST_CHECK_NO_THROW(r = CallRPC(std::string("setban 127.0.0.0 add")));
+    BOOST_CHECK_THROW(r = CallRPC(std::string("setban 127.0.0.0:8334")), std::runtime_error); //portnumber for setban not allowed
+    BOOST_CHECK_NO_THROW(r = CallRPC(std::string("listbanned")));
     UniValue ar = r.get_array();
     UniValue o1 = ar[0].get_obj();
     UniValue adr = find_value(o1, "address");
     BOOST_CHECK_EQUAL(adr.get_str(), "127.0.0.0/32");
-    BOOST_CHECK_NO_THROW(CallRPC(string("setban 127.0.0.0 remove")));
-    BOOST_CHECK_NO_THROW(r = CallRPC(string("listbanned")));
+    BOOST_CHECK_NO_THROW(CallRPC(std::string("setban 127.0.0.0 remove")));
+    BOOST_CHECK_NO_THROW(r = CallRPC(std::string("listbanned")));
     ar = r.get_array();
     BOOST_CHECK_EQUAL(ar.size(), 0);
 
-    BOOST_CHECK_NO_THROW(r = CallRPC(string("setban 127.0.0.0/24 add 1607731200 true")));
-    BOOST_CHECK_NO_THROW(r = CallRPC(string("listbanned")));
+    BOOST_CHECK_NO_THROW(r = CallRPC(std::string("setban 127.0.0.0/24 add 1607731200 true")));
+    BOOST_CHECK_NO_THROW(r = CallRPC(std::string("listbanned")));
     ar = r.get_array();
     o1 = ar[0].get_obj();
     adr = find_value(o1, "address");
@@ -265,10 +263,10 @@ BOOST_AUTO_TEST_CASE(rpc_ban)
     BOOST_CHECK_EQUAL(adr.get_str(), "127.0.0.0/24");
     BOOST_CHECK_EQUAL(banned_until.get_int64(), 1607731200); // absolute time check
 
-    BOOST_CHECK_NO_THROW(CallRPC(string("clearbanned")));
+    BOOST_CHECK_NO_THROW(CallRPC(std::string("clearbanned")));
 
-    BOOST_CHECK_NO_THROW(r = CallRPC(string("setban 127.0.0.0/24 add 200")));
-    BOOST_CHECK_NO_THROW(r = CallRPC(string("listbanned")));
+    BOOST_CHECK_NO_THROW(r = CallRPC(std::string("setban 127.0.0.0/24 add 200")));
+    BOOST_CHECK_NO_THROW(r = CallRPC(std::string("listbanned")));
     ar = r.get_array();
     o1 = ar[0].get_obj();
     adr = find_value(o1, "address");
@@ -279,43 +277,43 @@ BOOST_AUTO_TEST_CASE(rpc_ban)
     BOOST_CHECK(banned_until.get_int64()-now <= 200);
 
     // must throw an exception because 127.0.0.1 is in already banned suubnet range
-    BOOST_CHECK_THROW(r = CallRPC(string("setban 127.0.0.1 add")), runtime_error);
+    BOOST_CHECK_THROW(r = CallRPC(std::string("setban 127.0.0.1 add")), std::runtime_error);
 
-    BOOST_CHECK_NO_THROW(CallRPC(string("setban 127.0.0.0/24 remove")));
-    BOOST_CHECK_NO_THROW(r = CallRPC(string("listbanned")));
+    BOOST_CHECK_NO_THROW(CallRPC(std::string("setban 127.0.0.0/24 remove")));
+    BOOST_CHECK_NO_THROW(r = CallRPC(std::string("listbanned")));
     ar = r.get_array();
     BOOST_CHECK_EQUAL(ar.size(), 0);
 
-    BOOST_CHECK_NO_THROW(r = CallRPC(string("setban 127.0.0.0/255.255.0.0 add")));
-    BOOST_CHECK_THROW(r = CallRPC(string("setban 127.0.1.1 add")), runtime_error);
+    BOOST_CHECK_NO_THROW(r = CallRPC(std::string("setban 127.0.0.0/255.255.0.0 add")));
+    BOOST_CHECK_THROW(r = CallRPC(std::string("setban 127.0.1.1 add")), std::runtime_error);
 
-    BOOST_CHECK_NO_THROW(CallRPC(string("clearbanned")));
-    BOOST_CHECK_NO_THROW(r = CallRPC(string("listbanned")));
+    BOOST_CHECK_NO_THROW(CallRPC(std::string("clearbanned")));
+    BOOST_CHECK_NO_THROW(r = CallRPC(std::string("listbanned")));
     ar = r.get_array();
     BOOST_CHECK_EQUAL(ar.size(), 0);
 
 
-    BOOST_CHECK_THROW(r = CallRPC(string("setban test add")), runtime_error); //invalid IP
+    BOOST_CHECK_THROW(r = CallRPC(std::string("setban test add")), std::runtime_error); //invalid IP
 
     //IPv6 tests
-    BOOST_CHECK_NO_THROW(r = CallRPC(string("setban FE80:0000:0000:0000:0202:B3FF:FE1E:8329 add")));
-    BOOST_CHECK_NO_THROW(r = CallRPC(string("listbanned")));
+    BOOST_CHECK_NO_THROW(r = CallRPC(std::string("setban FE80:0000:0000:0000:0202:B3FF:FE1E:8329 add")));
+    BOOST_CHECK_NO_THROW(r = CallRPC(std::string("listbanned")));
     ar = r.get_array();
     o1 = ar[0].get_obj();
     adr = find_value(o1, "address");
     BOOST_CHECK_EQUAL(adr.get_str(), "fe80::202:b3ff:fe1e:8329/128");
 
-    BOOST_CHECK_NO_THROW(CallRPC(string("clearbanned")));
-    BOOST_CHECK_NO_THROW(r = CallRPC(string("setban 2001:db8::/ffff:fffc:0:0:0:0:0:0 add")));
-    BOOST_CHECK_NO_THROW(r = CallRPC(string("listbanned")));
+    BOOST_CHECK_NO_THROW(CallRPC(std::string("clearbanned")));
+    BOOST_CHECK_NO_THROW(r = CallRPC(std::string("setban 2001:db8::/ffff:fffc:0:0:0:0:0:0 add")));
+    BOOST_CHECK_NO_THROW(r = CallRPC(std::string("listbanned")));
     ar = r.get_array();
     o1 = ar[0].get_obj();
     adr = find_value(o1, "address");
     BOOST_CHECK_EQUAL(adr.get_str(), "2001:db8::/30");
 
-    BOOST_CHECK_NO_THROW(CallRPC(string("clearbanned")));
-    BOOST_CHECK_NO_THROW(r = CallRPC(string("setban 2001:4d48:ac57:400:cacf:e9ff:fe1d:9c63/128 add")));
-    BOOST_CHECK_NO_THROW(r = CallRPC(string("listbanned")));
+    BOOST_CHECK_NO_THROW(CallRPC(std::string("clearbanned")));
+    BOOST_CHECK_NO_THROW(r = CallRPC(std::string("setban 2001:4d48:ac57:400:cacf:e9ff:fe1d:9c63/128 add")));
+    BOOST_CHECK_NO_THROW(r = CallRPC(std::string("listbanned")));
     ar = r.get_array();
     o1 = ar[0].get_obj();
     adr = find_value(o1, "address");
diff --git a/src/test/script_P2SH_tests.cpp b/src/test/script_P2SH_tests.cpp
index 789cc70d7f363..ce8071e4e9e4e 100644
--- a/src/test/script_P2SH_tests.cpp
+++ b/src/test/script_P2SH_tests.cpp
@@ -17,8 +17,6 @@
 
 #include <boost/test/unit_test.hpp>
 
-using namespace std;
-
 // Helpers:
 static std::vector<unsigned char>
 Serialize(const CScript& s)
@@ -80,7 +78,7 @@ BOOST_AUTO_TEST_CASE(sign)
     }
 
     CMutableTransaction txFrom;  // Funding transaction:
-    string reason;
+    std::string reason;
     txFrom.vout.resize(8);
     for (int i = 0; i < 4; i++)
     {
@@ -178,7 +176,7 @@ BOOST_AUTO_TEST_CASE(set)
     }
 
     CMutableTransaction txFrom;  // Funding transaction:
-    string reason;
+    std::string reason;
     txFrom.vout.resize(4);
     for (int i = 0; i < 4; i++)
     {
@@ -263,7 +261,7 @@ BOOST_AUTO_TEST_CASE(AreInputsStandard)
     CCoinsViewCache coins(&coinsDummy);
     CBasicKeyStore keystore;
     CKey key[6];
-    vector<CPubKey> keys;
+    std::vector<CPubKey> keys;
     for (int i = 0; i < 6; i++)
     {
         key[i].MakeNewKey(true);
@@ -335,8 +333,8 @@ BOOST_AUTO_TEST_CASE(AreInputsStandard)
     // SignSignature doesn't know how to sign these. We're
     // not testing validating signatures, so just create
     // dummy signatures that DO include the correct P2SH scripts:
-    txTo.vin[3].scriptSig << OP_11 << OP_11 << vector<unsigned char>(oneAndTwo.begin(), oneAndTwo.end());
-    txTo.vin[4].scriptSig << vector<unsigned char>(fifteenSigops.begin(), fifteenSigops.end());
+    txTo.vin[3].scriptSig << OP_11 << OP_11 << std::vector<unsigned char>(oneAndTwo.begin(), oneAndTwo.end());
+    txTo.vin[4].scriptSig << std::vector<unsigned char>(fifteenSigops.begin(), fifteenSigops.end());
 
     BOOST_CHECK(::AreInputsStandard(txTo, coins));
     // 22 P2SH sigops for all inputs (1 for vin[0], 6 for vin[3], 15 for vin[4]
@@ -349,7 +347,7 @@ BOOST_AUTO_TEST_CASE(AreInputsStandard)
     txToNonStd1.vin.resize(1);
     txToNonStd1.vin[0].prevout.n = 5;
     txToNonStd1.vin[0].prevout.hash = txFrom.GetHash();
-    txToNonStd1.vin[0].scriptSig << vector<unsigned char>(sixteenSigops.begin(), sixteenSigops.end());
+    txToNonStd1.vin[0].scriptSig << std::vector<unsigned char>(sixteenSigops.begin(), sixteenSigops.end());
 
     BOOST_CHECK(!::AreInputsStandard(txToNonStd1, coins));
     BOOST_CHECK_EQUAL(GetP2SHSigOpCount(txToNonStd1, coins), 16U);
@@ -361,7 +359,7 @@ BOOST_AUTO_TEST_CASE(AreInputsStandard)
     txToNonStd2.vin.resize(1);
     txToNonStd2.vin[0].prevout.n = 6;
     txToNonStd2.vin[0].prevout.hash = txFrom.GetHash();
-    txToNonStd2.vin[0].scriptSig << vector<unsigned char>(twentySigops.begin(), twentySigops.end());
+    txToNonStd2.vin[0].scriptSig << std::vector<unsigned char>(twentySigops.begin(), twentySigops.end());
 
     BOOST_CHECK(!::AreInputsStandard(txToNonStd2, coins));
     BOOST_CHECK_EQUAL(GetP2SHSigOpCount(txToNonStd2, coins), 20U);
diff --git a/src/test/script_tests.cpp b/src/test/script_tests.cpp
index 47335ade87a0d..02af8af081827 100644
--- a/src/test/script_tests.cpp
+++ b/src/test/script_tests.cpp
@@ -29,15 +29,13 @@
 
 #include <univalue.h>
 
-using namespace std;
-
 // Uncomment if you want to output updated JSON tests.
 // #define UPDATE_JSON_TESTS
 
 static const unsigned int flags = SCRIPT_VERIFY_P2SH | SCRIPT_VERIFY_STRICTENC;
 
-unsigned int ParseScriptFlags(string strFlags);
-string FormatScriptFlags(unsigned int flags);
+unsigned int ParseScriptFlags(std::string strFlags);
+std::string FormatScriptFlags(unsigned int flags);
 
 UniValue
 read_json(const std::string& jsondata)
@@ -800,7 +798,7 @@ BOOST_AUTO_TEST_CASE(script_build)
         CScript witscript = CScript() << ToByteVector(keys.pubkey0);
         uint256 hash;
         CSHA256().Write(&witscript[0], witscript.size()).Finalize(hash.begin());
-        vector<unsigned char> hashBytes = ToByteVector(hash);
+        std::vector<unsigned char> hashBytes = ToByteVector(hash);
         hashBytes.pop_back();
         tests.push_back(TestBuilder(CScript() << OP_0 << hashBytes,
                                     "P2WPKH with wrong witness program length", SCRIPT_VERIFY_WITNESS | SCRIPT_VERIFY_P2SH, false
@@ -965,7 +963,7 @@ BOOST_AUTO_TEST_CASE(script_json_test)
 
     for (unsigned int idx = 0; idx < tests.size(); idx++) {
         UniValue test = tests[idx];
-        string strTest = test.write();
+        std::string strTest = test.write();
         CScriptWitness witness;
         CAmount nValue = 0;
         unsigned int pos = 0;
@@ -984,9 +982,9 @@ BOOST_AUTO_TEST_CASE(script_json_test)
             }
             continue;
         }
-        string scriptSigString = test[pos++].get_str();
+        std::string scriptSigString = test[pos++].get_str();
         CScript scriptSig = ParseScript(scriptSigString);
-        string scriptPubKeyString = test[pos++].get_str();
+        std::string scriptPubKeyString = test[pos++].get_str();
         CScript scriptPubKey = ParseScript(scriptPubKeyString);
         unsigned int scriptflags = ParseScriptFlags(test[pos++].get_str());
         int scriptError = ParseScriptError(test[pos++].get_str());
@@ -1005,21 +1003,21 @@ BOOST_AUTO_TEST_CASE(script_PushData)
     static const unsigned char pushdata4[] = { OP_PUSHDATA4, 1, 0, 0, 0, 0x5a };
 
     ScriptError err;
-    vector<vector<unsigned char> > directStack;
+    std::vector<std::vector<unsigned char> > directStack;
     BOOST_CHECK(EvalScript(directStack, CScript(&direct[0], &direct[sizeof(direct)]), SCRIPT_VERIFY_P2SH, BaseSignatureChecker(), SIGVERSION_BASE, &err));
     BOOST_CHECK_MESSAGE(err == SCRIPT_ERR_OK, ScriptErrorString(err));
 
-    vector<vector<unsigned char> > pushdata1Stack;
+    std::vector<std::vector<unsigned char> > pushdata1Stack;
     BOOST_CHECK(EvalScript(pushdata1Stack, CScript(&pushdata1[0], &pushdata1[sizeof(pushdata1)]), SCRIPT_VERIFY_P2SH, BaseSignatureChecker(), SIGVERSION_BASE, &err));
     BOOST_CHECK(pushdata1Stack == directStack);
     BOOST_CHECK_MESSAGE(err == SCRIPT_ERR_OK, ScriptErrorString(err));
 
-    vector<vector<unsigned char> > pushdata2Stack;
+    std::vector<std::vector<unsigned char> > pushdata2Stack;
     BOOST_CHECK(EvalScript(pushdata2Stack, CScript(&pushdata2[0], &pushdata2[sizeof(pushdata2)]), SCRIPT_VERIFY_P2SH, BaseSignatureChecker(), SIGVERSION_BASE, &err));
     BOOST_CHECK(pushdata2Stack == directStack);
     BOOST_CHECK_MESSAGE(err == SCRIPT_ERR_OK, ScriptErrorString(err));
 
-    vector<vector<unsigned char> > pushdata4Stack;
+    std::vector<std::vector<unsigned char> > pushdata4Stack;
     BOOST_CHECK(EvalScript(pushdata4Stack, CScript(&pushdata4[0], &pushdata4[sizeof(pushdata4)]), SCRIPT_VERIFY_P2SH, BaseSignatureChecker(), SIGVERSION_BASE, &err));
     BOOST_CHECK(pushdata4Stack == directStack);
     BOOST_CHECK_MESSAGE(err == SCRIPT_ERR_OK, ScriptErrorString(err));
@@ -1042,7 +1040,7 @@ sign_multisig(CScript scriptPubKey, std::vector<CKey> keys, CTransaction transac
     result << OP_0;
     BOOST_FOREACH(const CKey &key, keys)
     {
-        vector<unsigned char> vchSig;
+        std::vector<unsigned char> vchSig;
         BOOST_CHECK(key.Sign(hash, vchSig));
         vchSig.push_back((unsigned char)SIGHASH_ALL);
         result << vchSig;
@@ -1161,8 +1159,8 @@ BOOST_AUTO_TEST_CASE(script_combineSigs)
     // Test the CombineSignatures function
     CAmount amount = 0;
     CBasicKeyStore keystore;
-    vector<CKey> keys;
-    vector<CPubKey> pubkeys;
+    std::vector<CKey> keys;
+    std::vector<CPubKey> pubkeys;
     for (int i = 0; i < 3; i++)
     {
         CKey key;
@@ -1223,15 +1221,15 @@ BOOST_AUTO_TEST_CASE(script_combineSigs)
     BOOST_CHECK(combined.scriptSig == scriptSig);
 
     // A couple of partially-signed versions:
-    vector<unsigned char> sig1;
+    std::vector<unsigned char> sig1;
     uint256 hash1 = SignatureHash(scriptPubKey, txTo, 0, SIGHASH_ALL, 0, SIGVERSION_BASE);
     BOOST_CHECK(keys[0].Sign(hash1, sig1));
     sig1.push_back(SIGHASH_ALL);
-    vector<unsigned char> sig2;
+    std::vector<unsigned char> sig2;
     uint256 hash2 = SignatureHash(scriptPubKey, txTo, 0, SIGHASH_NONE, 0, SIGVERSION_BASE);
     BOOST_CHECK(keys[1].Sign(hash2, sig2));
     sig2.push_back(SIGHASH_NONE);
-    vector<unsigned char> sig3;
+    std::vector<unsigned char> sig3;
     uint256 hash3 = SignatureHash(scriptPubKey, txTo, 0, SIGHASH_SINGLE, 0, SIGVERSION_BASE);
     BOOST_CHECK(keys[2].Sign(hash3, sig3));
     sig3.push_back(SIGHASH_SINGLE);
@@ -1305,9 +1303,9 @@ BOOST_AUTO_TEST_CASE(script_GetScriptAsm)
     BOOST_CHECK_EQUAL("OP_CHECKLOCKTIMEVERIFY", ScriptToAsmStr(CScript() << OP_NOP2));
     BOOST_CHECK_EQUAL("OP_CHECKLOCKTIMEVERIFY", ScriptToAsmStr(CScript() << OP_CHECKLOCKTIMEVERIFY));
 
-    string derSig("304502207fa7a6d1e0ee81132a269ad84e68d695483745cde8b541e3bf630749894e342a022100c1f7ab20e13e22fb95281a870f3dcf38d782e53023ee313d741ad0cfbc0c5090");
-    string pubKey("03b0da749730dc9b4b1f4a14d6902877a92541f5368778853d9c4a0cb7802dcfb2");
-    vector<unsigned char> vchPubKey = ToByteVector(ParseHex(pubKey));
+    std::string derSig("304502207fa7a6d1e0ee81132a269ad84e68d695483745cde8b541e3bf630749894e342a022100c1f7ab20e13e22fb95281a870f3dcf38d782e53023ee313d741ad0cfbc0c5090");
+    std::string pubKey("03b0da749730dc9b4b1f4a14d6902877a92541f5368778853d9c4a0cb7802dcfb2");
+    std::vector<unsigned char> vchPubKey = ToByteVector(ParseHex(pubKey));
 
     BOOST_CHECK_EQUAL(derSig + "00 " + pubKey, ScriptToAsmStr(CScript() << ToByteVector(ParseHex(derSig + "00")) << vchPubKey, true));
     BOOST_CHECK_EQUAL(derSig + "80 " + pubKey, ScriptToAsmStr(CScript() << ToByteVector(ParseHex(derSig + "80")) << vchPubKey, true));
diff --git a/src/test/serialize_tests.cpp b/src/test/serialize_tests.cpp
index 1dc86eb11625a..447428a836af4 100644
--- a/src/test/serialize_tests.cpp
+++ b/src/test/serialize_tests.cpp
@@ -10,7 +10,6 @@
 #include <stdint.h>
 
 #include <boost/test/unit_test.hpp>
-using namespace std;
 
 BOOST_FIXTURE_TEST_SUITE(serialize_tests, BasicTestingSetup)
 
@@ -227,7 +226,7 @@ BOOST_AUTO_TEST_CASE(varints_bitpatterns)
 BOOST_AUTO_TEST_CASE(compactsize)
 {
     CDataStream ss(SER_DISK, 0);
-    vector<char>::size_type i, j;
+    std::vector<char>::size_type i, j;
 
     for (i = 1; i <= MAX_SIZE; i *= 2)
     {
@@ -260,7 +259,7 @@ BOOST_AUTO_TEST_CASE(noncanonical)
     // Write some non-canonical CompactSize encodings, and
     // make sure an exception is thrown when read back.
     CDataStream ss(SER_DISK, 0);
-    vector<char>::size_type n;
+    std::vector<char>::size_type n;
 
     // zero encoded with three bytes:
     ss.write("\xfd\x00\x00", 3);
diff --git a/src/test/sigopcount_tests.cpp b/src/test/sigopcount_tests.cpp
index 3488a0befc487..a34459fc836e8 100644
--- a/src/test/sigopcount_tests.cpp
+++ b/src/test/sigopcount_tests.cpp
@@ -15,8 +15,6 @@
 #include <boost/foreach.hpp>
 #include <boost/test/unit_test.hpp>
 
-using namespace std;
-
 // Helpers:
 static std::vector<unsigned char>
 Serialize(const CScript& s)
@@ -160,8 +158,8 @@ BOOST_AUTO_TEST_CASE(GetTxSigOpCost)
         CScript scriptPubKey = GetScriptForWitness(p2pk);
         CScript scriptSig = CScript();
         CScriptWitness scriptWitness;
-        scriptWitness.stack.push_back(vector<unsigned char>(0));
-        scriptWitness.stack.push_back(vector<unsigned char>(0));
+        scriptWitness.stack.push_back(std::vector<unsigned char>(0));
+        scriptWitness.stack.push_back(std::vector<unsigned char>(0));
 
 
         BuildTxs(spendingTx, coins, creationTx, scriptPubKey, scriptSig, scriptWitness);
@@ -190,8 +188,8 @@ BOOST_AUTO_TEST_CASE(GetTxSigOpCost)
         CScript scriptPubKey = GetScriptForDestination(CScriptID(scriptSig));
         scriptSig = CScript() << ToByteVector(scriptSig);
         CScriptWitness scriptWitness;
-        scriptWitness.stack.push_back(vector<unsigned char>(0));
-        scriptWitness.stack.push_back(vector<unsigned char>(0));
+        scriptWitness.stack.push_back(std::vector<unsigned char>(0));
+        scriptWitness.stack.push_back(std::vector<unsigned char>(0));
 
         BuildTxs(spendingTx, coins, creationTx, scriptPubKey, scriptSig, scriptWitness);
         assert(GetTransactionSigOpCost(CTransaction(spendingTx), coins, flags) == 1);
@@ -204,9 +202,9 @@ BOOST_AUTO_TEST_CASE(GetTxSigOpCost)
         CScript scriptPubKey = GetScriptForWitness(witnessScript);
         CScript scriptSig = CScript();
         CScriptWitness scriptWitness;
-        scriptWitness.stack.push_back(vector<unsigned char>(0));
-        scriptWitness.stack.push_back(vector<unsigned char>(0));
-        scriptWitness.stack.push_back(vector<unsigned char>(witnessScript.begin(), witnessScript.end()));
+        scriptWitness.stack.push_back(std::vector<unsigned char>(0));
+        scriptWitness.stack.push_back(std::vector<unsigned char>(0));
+        scriptWitness.stack.push_back(std::vector<unsigned char>(witnessScript.begin(), witnessScript.end()));
 
         BuildTxs(spendingTx, coins, creationTx, scriptPubKey, scriptSig, scriptWitness);
         assert(GetTransactionSigOpCost(CTransaction(spendingTx), coins, flags) == 2);
@@ -221,9 +219,9 @@ BOOST_AUTO_TEST_CASE(GetTxSigOpCost)
         CScript scriptPubKey = GetScriptForDestination(CScriptID(redeemScript));
         CScript scriptSig = CScript() << ToByteVector(redeemScript);
         CScriptWitness scriptWitness;
-        scriptWitness.stack.push_back(vector<unsigned char>(0));
-        scriptWitness.stack.push_back(vector<unsigned char>(0));
-        scriptWitness.stack.push_back(vector<unsigned char>(witnessScript.begin(), witnessScript.end()));
+        scriptWitness.stack.push_back(std::vector<unsigned char>(0));
+        scriptWitness.stack.push_back(std::vector<unsigned char>(0));
+        scriptWitness.stack.push_back(std::vector<unsigned char>(witnessScript.begin(), witnessScript.end()));
 
         BuildTxs(spendingTx, coins, creationTx, scriptPubKey, scriptSig, scriptWitness);
         assert(GetTransactionSigOpCost(CTransaction(spendingTx), coins, flags) == 2);
diff --git a/src/test/streams_tests.cpp b/src/test/streams_tests.cpp
index 8b715ce93eefd..cafed7616f5ed 100644
--- a/src/test/streams_tests.cpp
+++ b/src/test/streams_tests.cpp
@@ -9,8 +9,7 @@
 #include <boost/assign/std/vector.hpp> // for 'operator+=()'
 #include <boost/assert.hpp>
 #include <boost/test/unit_test.hpp>
-                    
-using namespace std;
+
 using namespace boost::assign; // bring 'operator+=()' into scope
 
 BOOST_FIXTURE_TEST_SUITE(streams_tests, BasicTestingSetup)
diff --git a/src/test/timedata_tests.cpp b/src/test/timedata_tests.cpp
index 1224ff84547d4..34863fd9d06fd 100644
--- a/src/test/timedata_tests.cpp
+++ b/src/test/timedata_tests.cpp
@@ -7,8 +7,6 @@
 
 #include <boost/test/unit_test.hpp>
 
-using namespace std;
-
 BOOST_FIXTURE_TEST_SUITE(timedata_tests, BasicTestingSetup)
 
 BOOST_AUTO_TEST_CASE(util_MedianFilter)
diff --git a/src/test/transaction_tests.cpp b/src/test/transaction_tests.cpp
index cd9294c7a9c76..8c9aaef02fc7f 100644
--- a/src/test/transaction_tests.cpp
+++ b/src/test/transaction_tests.cpp
@@ -32,42 +32,40 @@
 
 #include <univalue.h>
 
-using namespace std;
-
-typedef vector<unsigned char> valtype;
+typedef std::vector<unsigned char> valtype;
 
 // In script_tests.cpp
 extern UniValue read_json(const std::string& jsondata);
 
-static std::map<string, unsigned int> mapFlagNames = boost::assign::map_list_of
-    (string("NONE"), (unsigned int)SCRIPT_VERIFY_NONE)
-    (string("P2SH"), (unsigned int)SCRIPT_VERIFY_P2SH)
-    (string("STRICTENC"), (unsigned int)SCRIPT_VERIFY_STRICTENC)
-    (string("DERSIG"), (unsigned int)SCRIPT_VERIFY_DERSIG)
-    (string("LOW_S"), (unsigned int)SCRIPT_VERIFY_LOW_S)
-    (string("SIGPUSHONLY"), (unsigned int)SCRIPT_VERIFY_SIGPUSHONLY)
-    (string("MINIMALDATA"), (unsigned int)SCRIPT_VERIFY_MINIMALDATA)
-    (string("NULLDUMMY"), (unsigned int)SCRIPT_VERIFY_NULLDUMMY)
-    (string("DISCOURAGE_UPGRADABLE_NOPS"), (unsigned int)SCRIPT_VERIFY_DISCOURAGE_UPGRADABLE_NOPS)
-    (string("CLEANSTACK"), (unsigned int)SCRIPT_VERIFY_CLEANSTACK)
-    (string("MINIMALIF"), (unsigned int)SCRIPT_VERIFY_MINIMALIF)
-    (string("NULLFAIL"), (unsigned int)SCRIPT_VERIFY_NULLFAIL)
-    (string("CHECKLOCKTIMEVERIFY"), (unsigned int)SCRIPT_VERIFY_CHECKLOCKTIMEVERIFY)
-    (string("CHECKSEQUENCEVERIFY"), (unsigned int)SCRIPT_VERIFY_CHECKSEQUENCEVERIFY)
-    (string("WITNESS"), (unsigned int)SCRIPT_VERIFY_WITNESS)
-    (string("DISCOURAGE_UPGRADABLE_WITNESS_PROGRAM"), (unsigned int)SCRIPT_VERIFY_DISCOURAGE_UPGRADABLE_WITNESS_PROGRAM)
-    (string("WITNESS_PUBKEYTYPE"), (unsigned int)SCRIPT_VERIFY_WITNESS_PUBKEYTYPE);
-
-unsigned int ParseScriptFlags(string strFlags)
+static std::map<std::string, unsigned int> mapFlagNames = boost::assign::map_list_of
+    (std::string("NONE"), (unsigned int)SCRIPT_VERIFY_NONE)
+    (std::string("P2SH"), (unsigned int)SCRIPT_VERIFY_P2SH)
+    (std::string("STRICTENC"), (unsigned int)SCRIPT_VERIFY_STRICTENC)
+    (std::string("DERSIG"), (unsigned int)SCRIPT_VERIFY_DERSIG)
+    (std::string("LOW_S"), (unsigned int)SCRIPT_VERIFY_LOW_S)
+    (std::string("SIGPUSHONLY"), (unsigned int)SCRIPT_VERIFY_SIGPUSHONLY)
+    (std::string("MINIMALDATA"), (unsigned int)SCRIPT_VERIFY_MINIMALDATA)
+    (std::string("NULLDUMMY"), (unsigned int)SCRIPT_VERIFY_NULLDUMMY)
+    (std::string("DISCOURAGE_UPGRADABLE_NOPS"), (unsigned int)SCRIPT_VERIFY_DISCOURAGE_UPGRADABLE_NOPS)
+    (std::string("CLEANSTACK"), (unsigned int)SCRIPT_VERIFY_CLEANSTACK)
+    (std::string("MINIMALIF"), (unsigned int)SCRIPT_VERIFY_MINIMALIF)
+    (std::string("NULLFAIL"), (unsigned int)SCRIPT_VERIFY_NULLFAIL)
+    (std::string("CHECKLOCKTIMEVERIFY"), (unsigned int)SCRIPT_VERIFY_CHECKLOCKTIMEVERIFY)
+    (std::string("CHECKSEQUENCEVERIFY"), (unsigned int)SCRIPT_VERIFY_CHECKSEQUENCEVERIFY)
+    (std::string("WITNESS"), (unsigned int)SCRIPT_VERIFY_WITNESS)
+    (std::string("DISCOURAGE_UPGRADABLE_WITNESS_PROGRAM"), (unsigned int)SCRIPT_VERIFY_DISCOURAGE_UPGRADABLE_WITNESS_PROGRAM)
+    (std::string("WITNESS_PUBKEYTYPE"), (unsigned int)SCRIPT_VERIFY_WITNESS_PUBKEYTYPE);
+
+unsigned int ParseScriptFlags(std::string strFlags)
 {
     if (strFlags.empty()) {
         return 0;
     }
     unsigned int flags = 0;
-    vector<string> words;
+    std::vector<std::string> words;
     boost::algorithm::split(words, strFlags, boost::algorithm::is_any_of(","));
 
-    BOOST_FOREACH(string word, words)
+    BOOST_FOREACH(std::string word, words)
     {
         if (!mapFlagNames.count(word))
             BOOST_ERROR("Bad test: unknown verification flag '" << word << "'");
@@ -77,13 +75,13 @@ unsigned int ParseScriptFlags(string strFlags)
     return flags;
 }
 
-string FormatScriptFlags(unsigned int flags)
+std::string FormatScriptFlags(unsigned int flags)
 {
     if (flags == 0) {
         return "";
     }
-    string ret;
-    std::map<string, unsigned int>::const_iterator it = mapFlagNames.begin();
+    std::string ret;
+    std::map<std::string, unsigned int>::const_iterator it = mapFlagNames.begin();
     while (it != mapFlagNames.end()) {
         if (flags & it->second) {
             ret += it->first + ",";
@@ -109,7 +107,7 @@ BOOST_AUTO_TEST_CASE(tx_valid)
     ScriptError err;
     for (unsigned int idx = 0; idx < tests.size(); idx++) {
         UniValue test = tests[idx];
-        string strTest = test.write();
+        std::string strTest = test.write();
         if (test[0].isArray())
         {
             if (test.size() != 3 || !test[1].isStr() || !test[2].isStr())
@@ -118,8 +116,8 @@ BOOST_AUTO_TEST_CASE(tx_valid)
                 continue;
             }
 
-            map<COutPoint, CScript> mapprevOutScriptPubKeys;
-            map<COutPoint, int64_t> mapprevOutValues;
+            std::map<COutPoint, CScript> mapprevOutScriptPubKeys;
+            std::map<COutPoint, int64_t> mapprevOutValues;
             UniValue inputs = test[0].get_array();
             bool fValid = true;
 	    for (unsigned int inpIdx = 0; inpIdx < inputs.size(); inpIdx++) {
@@ -148,7 +146,7 @@ BOOST_AUTO_TEST_CASE(tx_valid)
                 continue;
             }
 
-            string transaction = test[1].get_str();
+            std::string transaction = test[1].get_str();
             CDataStream stream(ParseHex(transaction), SER_NETWORK, PROTOCOL_VERSION);
             CTransaction tx(deserialize, stream);
 
@@ -194,7 +192,7 @@ BOOST_AUTO_TEST_CASE(tx_invalid)
     ScriptError err;
     for (unsigned int idx = 0; idx < tests.size(); idx++) {
         UniValue test = tests[idx];
-        string strTest = test.write();
+        std::string strTest = test.write();
         if (test[0].isArray())
         {
             if (test.size() != 3 || !test[1].isStr() || !test[2].isStr())
@@ -203,8 +201,8 @@ BOOST_AUTO_TEST_CASE(tx_invalid)
                 continue;
             }
 
-            map<COutPoint, CScript> mapprevOutScriptPubKeys;
-            map<COutPoint, int64_t> mapprevOutValues;
+            std::map<COutPoint, CScript> mapprevOutScriptPubKeys;
+            std::map<COutPoint, int64_t> mapprevOutValues;
             UniValue inputs = test[0].get_array();
             bool fValid = true;
 	    for (unsigned int inpIdx = 0; inpIdx < inputs.size(); inpIdx++) {
@@ -233,7 +231,7 @@ BOOST_AUTO_TEST_CASE(tx_invalid)
                 continue;
             }
 
-            string transaction = test[1].get_str();
+            std::string transaction = test[1].get_str();
             CDataStream stream(ParseHex(transaction), SER_NETWORK, PROTOCOL_VERSION );
             CTransaction tx(deserialize, stream);
 
@@ -268,7 +266,7 @@ BOOST_AUTO_TEST_CASE(basic_transaction_tests)
 {
     // Random real transaction (e2769b09e784f32f62ef849763d4f45b98e07ba658647343b915ff832b110436)
     unsigned char ch[] = {0x01, 0x00, 0x00, 0x00, 0x01, 0x6b, 0xff, 0x7f, 0xcd, 0x4f, 0x85, 0x65, 0xef, 0x40, 0x6d, 0xd5, 0xd6, 0x3d, 0x4f, 0xf9, 0x4f, 0x31, 0x8f, 0xe8, 0x20, 0x27, 0xfd, 0x4d, 0xc4, 0x51, 0xb0, 0x44, 0x74, 0x01, 0x9f, 0x74, 0xb4, 0x00, 0x00, 0x00, 0x00, 0x8c, 0x49, 0x30, 0x46, 0x02, 0x21, 0x00, 0xda, 0x0d, 0xc6, 0xae, 0xce, 0xfe, 0x1e, 0x06, 0xef, 0xdf, 0x05, 0x77, 0x37, 0x57, 0xde, 0xb1, 0x68, 0x82, 0x09, 0x30, 0xe3, 0xb0, 0xd0, 0x3f, 0x46, 0xf5, 0xfc, 0xf1, 0x50, 0xbf, 0x99, 0x0c, 0x02, 0x21, 0x00, 0xd2, 0x5b, 0x5c, 0x87, 0x04, 0x00, 0x76, 0xe4, 0xf2, 0x53, 0xf8, 0x26, 0x2e, 0x76, 0x3e, 0x2d, 0xd5, 0x1e, 0x7f, 0xf0, 0xbe, 0x15, 0x77, 0x27, 0xc4, 0xbc, 0x42, 0x80, 0x7f, 0x17, 0xbd, 0x39, 0x01, 0x41, 0x04, 0xe6, 0xc2, 0x6e, 0xf6, 0x7d, 0xc6, 0x10, 0xd2, 0xcd, 0x19, 0x24, 0x84, 0x78, 0x9a, 0x6c, 0xf9, 0xae, 0xa9, 0x93, 0x0b, 0x94, 0x4b, 0x7e, 0x2d, 0xb5, 0x34, 0x2b, 0x9d, 0x9e, 0x5b, 0x9f, 0xf7, 0x9a, 0xff, 0x9a, 0x2e, 0xe1, 0x97, 0x8d, 0xd7, 0xfd, 0x01, 0xdf, 0xc5, 0x22, 0xee, 0x02, 0x28, 0x3d, 0x3b, 0x06, 0xa9, 0xd0, 0x3a, 0xcf, 0x80, 0x96, 0x96, 0x8d, 0x7d, 0xbb, 0x0f, 0x91, 0x78, 0xff, 0xff, 0xff, 0xff, 0x02, 0x8b, 0xa7, 0x94, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x19, 0x76, 0xa9, 0x14, 0xba, 0xde, 0xec, 0xfd, 0xef, 0x05, 0x07, 0x24, 0x7f, 0xc8, 0xf7, 0x42, 0x41, 0xd7, 0x3b, 0xc0, 0x39, 0x97, 0x2d, 0x7b, 0x88, 0xac, 0x40, 0x94, 0xa8, 0x02, 0x00, 0x00, 0x00, 0x00, 0x19, 0x76, 0xa9, 0x14, 0xc1, 0x09, 0x32, 0x48, 0x3f, 0xec, 0x93, 0xed, 0x51, 0xf5, 0xfe, 0x95, 0xe7, 0x25, 0x59, 0xf2, 0xcc, 0x70, 0x43, 0xf9, 0x88, 0xac, 0x00, 0x00, 0x00, 0x00, 0x00};
-    vector<unsigned char> vch(ch, ch + sizeof(ch) -1);
+    std::vector<unsigned char> vch(ch, ch + sizeof(ch) -1);
     CDataStream stream(vch, SER_DISK, CLIENT_VERSION);
     CMutableTransaction tx;
     stream >> tx;
@@ -390,7 +388,7 @@ void CheckWithFlag(const CTransactionRef& output, const CMutableTransaction& inp
     assert(ret == success);
 }
 
-static CScript PushAll(const vector<valtype>& values)
+static CScript PushAll(const std::vector<valtype>& values)
 {
     CScript result;
     BOOST_FOREACH(const valtype& v, values) {
@@ -407,7 +405,7 @@ static CScript PushAll(const vector<valtype>& values)
 
 void ReplaceRedeemScript(CScript& script, const CScript& redeemScript)
 {
-    vector<valtype> stack;
+    std::vector<valtype> stack;
     EvalScript(stack, script, SCRIPT_VERIFY_STRICTENC, BaseSignatureChecker(), SIGVERSION_BASE);
     assert(stack.size() > 0);
     stack.back() = std::vector<unsigned char>(redeemScript.begin(), redeemScript.end());
@@ -425,7 +423,7 @@ BOOST_AUTO_TEST_CASE(test_big_witness_transaction) {
     CKeyID hash = key.GetPubKey().GetID();
     CScript scriptPubKey = CScript() << OP_0 << std::vector<unsigned char>(hash.begin(), hash.end());
 
-    vector<int> sigHashes;
+    std::vector<int> sigHashes;
     sigHashes.push_back(SIGHASH_NONE | SIGHASH_ANYONECANPAY);
     sigHashes.push_back(SIGHASH_SINGLE | SIGHASH_ANYONECANPAY);
     sigHashes.push_back(SIGHASH_ALL | SIGHASH_ANYONECANPAY);
@@ -688,7 +686,7 @@ BOOST_AUTO_TEST_CASE(test_IsStandard)
     key.MakeNewKey(true);
     t.vout[0].scriptPubKey = GetScriptForDestination(key.GetPubKey().GetID());
 
-    string reason;
+    std::string reason;
     BOOST_CHECK(IsStandardTx(t, reason));
 
     // Check dust with default relay fee:
diff --git a/src/test/univalue_tests.cpp b/src/test/univalue_tests.cpp
index 7f794fcbe9fc9..2c20b14ea0d85 100644
--- a/src/test/univalue_tests.cpp
+++ b/src/test/univalue_tests.cpp
@@ -12,8 +12,6 @@
 
 #include <boost/test/unit_test.hpp>
 
-using namespace std;
-
 BOOST_FIXTURE_TEST_SUITE(univalue_tests, BasicTestingSetup)
 
 BOOST_AUTO_TEST_CASE(univalue_constructor)
@@ -53,7 +51,7 @@ BOOST_AUTO_TEST_CASE(univalue_constructor)
     BOOST_CHECK(v7.isNum());
     BOOST_CHECK_EQUAL(v7.getValStr(), "-7.21");
 
-    string vs("yawn");
+    std::string vs("yawn");
     UniValue v8(vs);
     BOOST_CHECK(v8.isStr());
     BOOST_CHECK_EQUAL(v8.getValStr(), "yawn");
@@ -69,41 +67,41 @@ BOOST_AUTO_TEST_CASE(univalue_typecheck)
     UniValue v1;
     BOOST_CHECK(v1.setNumStr("1"));
     BOOST_CHECK(v1.isNum());
-    BOOST_CHECK_THROW(v1.get_bool(), runtime_error);
+    BOOST_CHECK_THROW(v1.get_bool(), std::runtime_error);
 
     UniValue v2;
     BOOST_CHECK(v2.setBool(true));
     BOOST_CHECK_EQUAL(v2.get_bool(), true);
-    BOOST_CHECK_THROW(v2.get_int(), runtime_error);
+    BOOST_CHECK_THROW(v2.get_int(), std::runtime_error);
 
     UniValue v3;
     BOOST_CHECK(v3.setNumStr("32482348723847471234"));
-    BOOST_CHECK_THROW(v3.get_int64(), runtime_error);
+    BOOST_CHECK_THROW(v3.get_int64(), std::runtime_error);
     BOOST_CHECK(v3.setNumStr("1000"));
     BOOST_CHECK_EQUAL(v3.get_int64(), 1000);
 
     UniValue v4;
     BOOST_CHECK(v4.setNumStr("2147483648"));
     BOOST_CHECK_EQUAL(v4.get_int64(), 2147483648);
-    BOOST_CHECK_THROW(v4.get_int(), runtime_error);
+    BOOST_CHECK_THROW(v4.get_int(), std::runtime_error);
     BOOST_CHECK(v4.setNumStr("1000"));
     BOOST_CHECK_EQUAL(v4.get_int(), 1000);
-    BOOST_CHECK_THROW(v4.get_str(), runtime_error);
+    BOOST_CHECK_THROW(v4.get_str(), std::runtime_error);
     BOOST_CHECK_EQUAL(v4.get_real(), 1000);
-    BOOST_CHECK_THROW(v4.get_array(), runtime_error);
-    BOOST_CHECK_THROW(v4.getKeys(), runtime_error);
-    BOOST_CHECK_THROW(v4.getValues(), runtime_error);
-    BOOST_CHECK_THROW(v4.get_obj(), runtime_error);
+    BOOST_CHECK_THROW(v4.get_array(), std::runtime_error);
+    BOOST_CHECK_THROW(v4.getKeys(), std::runtime_error);
+    BOOST_CHECK_THROW(v4.getValues(), std::runtime_error);
+    BOOST_CHECK_THROW(v4.get_obj(), std::runtime_error);
 
     UniValue v5;
     BOOST_CHECK(v5.read("[true, 10]"));
     BOOST_CHECK_NO_THROW(v5.get_array());
     std::vector<UniValue> vals = v5.getValues();
-    BOOST_CHECK_THROW(vals[0].get_int(), runtime_error);
+    BOOST_CHECK_THROW(vals[0].get_int(), std::runtime_error);
     BOOST_CHECK_EQUAL(vals[0].get_bool(), true);
 
     BOOST_CHECK_EQUAL(vals[1].get_int(), 10);
-    BOOST_CHECK_THROW(vals[1].get_bool(), runtime_error);
+    BOOST_CHECK_THROW(vals[1].get_bool(), std::runtime_error);
 }
 
 BOOST_AUTO_TEST_CASE(univalue_set)
@@ -172,13 +170,13 @@ BOOST_AUTO_TEST_CASE(univalue_array)
     UniValue v((int64_t)1023LL);
     BOOST_CHECK(arr.push_back(v));
 
-    string vStr("zippy");
+    std::string vStr("zippy");
     BOOST_CHECK(arr.push_back(vStr));
 
     const char *s = "pippy";
     BOOST_CHECK(arr.push_back(s));
 
-    vector<UniValue> vec;
+    std::vector<UniValue> vec;
     v.setStr("boing");
     vec.push_back(v);
 
@@ -206,7 +204,7 @@ BOOST_AUTO_TEST_CASE(univalue_array)
 BOOST_AUTO_TEST_CASE(univalue_object)
 {
     UniValue obj(UniValue::VOBJ);
-    string strKey, strVal;
+    std::string strKey, strVal;
     UniValue v;
 
     strKey = "age";
@@ -266,7 +264,7 @@ BOOST_AUTO_TEST_CASE(univalue_object)
 
     BOOST_CHECK(!obj.exists("nyuknyuknyuk"));
 
-    map<string, UniValue::VType> objTypes;
+    std::map<std::string, UniValue::VType> objTypes;
     objTypes["age"] = UniValue::VNUM;
     objTypes["first"] = UniValue::VSTR;
     objTypes["last"] = UniValue::VSTR;
@@ -294,7 +292,7 @@ BOOST_AUTO_TEST_CASE(univalue_readwrite)
     UniValue v;
     BOOST_CHECK(v.read(json1));
 
-    string strJson1(json1);
+    std::string strJson1(json1);
     BOOST_CHECK(v.read(strJson1));
 
     BOOST_CHECK(v.isArray());
@@ -333,4 +331,3 @@ BOOST_AUTO_TEST_CASE(univalue_readwrite)
 }
 
 BOOST_AUTO_TEST_SUITE_END()
-
diff --git a/src/test/util_tests.cpp b/src/test/util_tests.cpp
index b2f601613fbd4..d14b6c8e7e342 100644
--- a/src/test/util_tests.cpp
+++ b/src/test/util_tests.cpp
@@ -17,9 +17,7 @@
 
 #include <boost/test/unit_test.hpp>
 
-using namespace std;
-
-extern map<string, string> mapArgs;
+extern std::map<std::string, std::string> mapArgs;
 
 BOOST_FIXTURE_TEST_SUITE(util_tests, BasicTestingSetup)
 

From 03e1d6ce349cc83b92140fec7d0c5f88893c0a9c Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Tue, 3 Jan 2017 11:52:13 +0100
Subject: [PATCH 1445/1802] doc: Add historical release notes for 0.13.2

---
 doc/release-notes/release-notes-0.13.2.md | 178 ++++++++++++++++++++++
 1 file changed, 178 insertions(+)
 create mode 100644 doc/release-notes/release-notes-0.13.2.md

diff --git a/doc/release-notes/release-notes-0.13.2.md b/doc/release-notes/release-notes-0.13.2.md
new file mode 100644
index 0000000000000..45fff5c8bbdc1
--- /dev/null
+++ b/doc/release-notes/release-notes-0.13.2.md
@@ -0,0 +1,178 @@
+Bitcoin Core version 0.13.2 is now available from:
+
+  <https://bitcoin.org/bin/bitcoin-core-0.13.2/>
+
+This is a new minor version release, including various bugfixes and
+performance improvements, as well as updated translations.
+
+Please report bugs using the issue tracker at github:
+
+  <https://github.com/bitcoin/bitcoin/issues>
+
+To receive security and update notifications, please subscribe to:
+
+  <https://bitcoincore.org/en/list/announcements/join/>
+
+Compatibility
+==============
+
+Microsoft ended support for Windows XP on [April 8th, 2014](https://www.microsoft.com/en-us/WindowsForBusiness/end-of-xp-support),
+an OS initially released in 2001. This means that not even critical security
+updates will be released anymore. Without security updates, using a bitcoin
+wallet on a XP machine is irresponsible at least.
+
+In addition to that, with 0.12.x there have been varied reports of Bitcoin Core
+randomly crashing on Windows XP. It is [not clear](https://github.com/bitcoin/bitcoin/issues/7681#issuecomment-217439891)
+what the source of these crashes is, but it is likely that upstream
+libraries such as Qt are no longer being tested on XP.
+
+We do not have time nor resources to provide support for an OS that is
+end-of-life. From 0.13.0 on, Windows XP is no longer supported. Users are
+suggested to upgrade to a newer version of Windows, or install an alternative OS
+that is supported.
+
+No attempt is made to prevent installing or running the software on Windows XP,
+you can still do so at your own risk, but do not expect it to work: do not
+report issues about Windows XP to the issue tracker.
+
+From 0.13.1 onwards OS X 10.7 is no longer supported. 0.13.0 was intended to work on 10.7+, 
+but severe issues with the libc++ version on 10.7.x keep it from running reliably. 
+0.13.1 now requires 10.8+, and will communicate that to 10.7 users, rather than crashing unexpectedly.
+
+Notable changes
+===============
+
+Change to wallet handling of mempool rejection
+-----------------------------------------------
+
+When a newly created transaction failed to enter the mempool due to
+the limits on chains of unconfirmed transactions the sending RPC
+calls would return an error.  The transaction would still be queued
+in the wallet and, once some of the parent transactions were
+confirmed, broadcast after the software was restarted.
+
+This behavior has been changed to return success and to reattempt
+mempool insertion at the same time transaction rebroadcast is
+attempted, avoiding a need for a restart.
+
+Transactions in the wallet which cannot be accepted into the mempool
+can be abandoned with the previously existing abandontransaction RPC
+(or in the GUI via a context menu on the transaction).
+
+
+0.13.2 Change log
+=================
+
+Detailed release notes follow. This overview includes changes that affect
+behavior, not code moves, refactors and string updates. For convenience in locating
+the code changes and accompanying discussion, both the pull request and
+git merge commit are mentioned.
+
+### Consensus
+- #9293 `e591c10` [0.13 Backport #9053] IBD using chainwork instead of height and not using header timestamp (gmaxwell)
+- #9053 `5b93eee` IBD using chainwork instead of height and not using header timestamps (gmaxwell)
+
+### RPC and other APIs
+- #8845 `1d048b9` Don't return the address of a P2SH of a P2SH (jnewbery)
+- #9041 `87fbced` keypoololdest denote Unix epoch, not GMT (s-matthew-english)
+- #9122 `f82c81b` fix getnettotals RPC description about timemillis (visvirial)
+- #9042 `5bcb05d` [rpc] ParseHash: Fail when length is not 64 (MarcoFalke)
+- #9194 `f26dab7` Add option to return non-segwit serialization via rpc (instagibbs)
+- #9347 `b711390` [0.13.2] wallet/rpc backports (MarcoFalke)
+- #9292 `c365556` Complain when unknown rpcserialversion is specified (sipa)
+- #9322 `49a612f` [qa] Don't set unknown rpcserialversion (MarcoFalke)
+
+### Block and transaction handling
+- #8357 `ce0d817` [mempool] Fix relaypriority calculation error (maiiz)
+- #9267 `0a4aa87` [0.13 backport #9239] Disable fee estimates for a confirm target of 1 block (morcos)
+- #9196 `0c09d9f` Send tip change notification from invalidateblock (ryanofsky)
+
+### P2P protocol and network code
+- #8995 `9ef3875` Add missing cs_main lock to ::GETBLOCKTXN processing (TheBlueMatt)
+- #9234 `94531b5` torcontrol: Explicitly request RSA1024 private key (laanwj)
+- #8637 `2cad5db` Compact Block Tweaks (rebase of #8235) (sipa)
+- #9058 `286e548` Fixes for p2p-compactblocks.py test timeouts on travis (#8842) (ryanofsky)
+- #8865 `4c71fc4` Decouple peer-processing-logic from block-connection-logic (TheBlueMatt)
+- #9117 `6fe3981` net: don't send feefilter messages before the version handshake is complete (theuni)
+- #9188 `ca1fd75` Make orphan parent fetching ask for witnesses (gmaxwell)
+- #9052 `3a3bcbf` Use RelevantServices instead of node_network in AttemptToEvict (gmaxwell)
+- #9048 `9460771` [0.13 backport #9026] Fix handling of invalid compact blocks (sdaftuar)
+- #9357 `03b6f62` [0.13 backport #9352] Attempt reconstruction from all compact block announcements (sdaftuar)
+- #9189 `b96a8f7` Always add default_witness_commitment with GBT client support (sipa)
+- #9253 `28d0f22` Fix calculation of number of bound sockets to use (TheBlueMatt)
+- #9199 `da5a16b` Always drop the least preferred HB peer when adding a new one (gmaxwell)
+
+### Build system
+- #9169 `d1b4da9` build: fix qt5.7 build under macOS (theuni)
+- #9326 `a0f7ece` Update for OpenSSL 1.1 API (gmaxwell)
+- #9224 `396c405` Prevent FD_SETSIZE error building on OpenBSD (ivdsangen)
+
+### GUI
+- #8972 `6f86b53` Make warnings label selectable (jonasschnelli) (MarcoFalke)
+- #9185 `6d70a73` Fix coincontrol sort issue (jonasschnelli)
+- #9094 `5f3a12c` Use correct conversion function for boost::path datadir (laanwj)
+- #8908 `4a974b2` Update bitcoin-qt.desktop (s-matthew-english)
+- #9190 `dc46b10` Plug many memory leaks (laanwj)
+
+### Wallet
+- #9290 `35174a0` Make RelayWalletTransaction attempt to AcceptToMemoryPool (gmaxwell)
+- #9295 `43bcfca` Bugfix: Fundrawtransaction: don't terminate when keypool is empty (jonasschnelli)
+- #9302 `f5d606e` Return txid even if ATMP fails for new transaction (sipa)
+- #9262 `fe39f26` Prefer coins that have fewer ancestors, sanity check txn before ATMP (instagibbs)
+
+### Tests and QA
+- #9159 `eca9b46` Wait for specific block announcement in p2p-compactblocks (ryanofsky)
+- #9186 `dccdc3a` Fix use-after-free in scheduler tests (laanwj)
+- #9168 `3107280` Add assert_raises_message to check specific error message (mrbandrews)
+- #9191 `29435db` 0.13.2 Backports (MarcoFalke)
+- #9077 `1d4c884` Increase wallet-dump RPC timeout (ryanofsky)
+- #9098 `ecd7db5` Handle zombies and cluttered tmpdirs (MarcoFalke)
+- #8927 `387ec9d` Add script tests for FindAndDelete in pre-segwit and segwit scripts (jl2012)
+- #9200 `eebc699` bench: Fix subtle counting issue when rescaling iteration count (laanwj)
+
+### Miscellaneous
+- #8838 `094848b` Calculate size and weight of block correctly in CreateNewBlock() (jnewbery)
+- #8920 `40169dc` Set minimum required Boost to 1.47.0 (fanquake)
+- #9251 `a710a43` Improvement of documentation of command line parameter 'whitelist' (wodry)
+- #8932 `106da69` Allow bitcoin-tx to create v2 transactions (btcdrak)
+- #8929 `12428b4` add software-properties-common (sigwo)
+- #9120 `08d1c90` bug: Missed one "return false" in recent refactoring in #9067 (UdjinM6)
+- #9067 `f85ee01` Fix exit codes (UdjinM6)
+- #9340 `fb987b3` [0.13] Update secp256k1 subtree (MarcoFalke)
+- #9229 `b172377` Remove calls to getaddrinfo_a (TheBlueMatt)
+
+Credits
+=======
+
+Thanks to everyone who directly contributed to this release:
+
+- Alex Morcos
+- BtcDrak
+- Cory Fields
+- fanquake
+- Gregory Maxwell
+- Gregory Sanders
+- instagibbs
+- Ivo van der Sangen
+- jnewbery
+- Johnson Lau
+- Jonas Schnelli
+- Luke Dashjr
+- maiiz
+- MarcoFalke
+- Masahiko Hyuga
+- Matt Corallo
+- matthias
+- mrbandrews
+- Pavel Janík
+- Pieter Wuille
+- randy-waterhouse
+- Russell Yanofsky
+- S. Matthew English
+- Steven
+- Suhas Daftuar
+- UdjinM6
+- Wladimir J. van der Laan
+- wodry
+
+As well as everyone that helped translating on [Transifex](https://www.transifex.com/projects/p/bitcoin/).

From a9d6151802a7b804bd527be04fa91a1d0269168e Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Tue, 3 Jan 2017 15:01:46 +0100
Subject: [PATCH 1446/1802] qt,wallet: Fix a few typos in messages

As reported by [yahoe.001](https://www.transifex.com/user/profile/yahoe.001/).
---
 src/qt/bitcoinstrings.cpp | 2 +-
 src/qt/guiutil.cpp        | 4 ++--
 src/wallet/wallet.cpp     | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/qt/bitcoinstrings.cpp b/src/qt/bitcoinstrings.cpp
index baca95a0bcfc2..acd81a6b2a8a9 100644
--- a/src/qt/bitcoinstrings.cpp
+++ b/src/qt/bitcoinstrings.cpp
@@ -191,7 +191,7 @@ QT_TRANSLATE_NOOP("bitcoin-core", ""
 "included in share/rpcuser. This option can be specified multiple times"),
 QT_TRANSLATE_NOOP("bitcoin-core", ""
 "Wallet will not create transactions that violate mempool chain limits "
-"(default: %u"),
+"(default: %u)"),
 QT_TRANSLATE_NOOP("bitcoin-core", ""
 "Warning: Unknown block versions being mined! It's possible unknown rules are "
 "in effect"),
diff --git a/src/qt/guiutil.cpp b/src/qt/guiutil.cpp
index 8132e4fe0d0b0..94b1b8abed29a 100644
--- a/src/qt/guiutil.cpp
+++ b/src/qt/guiutil.cpp
@@ -961,11 +961,11 @@ QString formateNiceTimeOffset(qint64 secs)
     const int YEAR_IN_SECONDS = 31556952; // Average length of year in Gregorian calendar
     if(secs < 60)
     {
-        timeBehindText = QObject::tr("%n seconds(s)","",secs);
+        timeBehindText = QObject::tr("%n second(s)","",secs);
     }
     else if(secs < 2*HOUR_IN_SECONDS)
     {
-        timeBehindText = QObject::tr("%n minutes(s)","",secs/60);
+        timeBehindText = QObject::tr("%n minute(s)","",secs/60);
     }
     else if(secs < 2*DAY_IN_SECONDS)
     {
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index e1c4090971409..fef0f9e58095f 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -3399,7 +3399,7 @@ std::string CWallet::GetWalletHelpString(bool showDebug)
         strUsage += HelpMessageOpt("-dblogsize=<n>", strprintf("Flush wallet database activity from memory to disk log every <n> megabytes (default: %u)", DEFAULT_WALLET_DBLOGSIZE));
         strUsage += HelpMessageOpt("-flushwallet", strprintf("Run a thread to flush wallet periodically (default: %u)", DEFAULT_FLUSHWALLET));
         strUsage += HelpMessageOpt("-privdb", strprintf("Sets the DB_PRIVATE flag in the wallet db environment (default: %u)", DEFAULT_WALLET_PRIVDB));
-        strUsage += HelpMessageOpt("-walletrejectlongchains", strprintf(_("Wallet will not create transactions that violate mempool chain limits (default: %u"), DEFAULT_WALLET_REJECT_LONG_CHAINS));
+        strUsage += HelpMessageOpt("-walletrejectlongchains", strprintf(_("Wallet will not create transactions that violate mempool chain limits (default: %u)"), DEFAULT_WALLET_REJECT_LONG_CHAINS));
     }
 
     return strUsage;

From d45b21e2b35001c5fd1c1245c1ac4a883d8cbfc8 Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Tue, 3 Jan 2017 15:03:37 +0100
Subject: [PATCH 1447/1802] qt: Fill in English numerusforms

minute/minutes block/blocks and so forth.
---
 src/qt/locale/bitcoin_en.ts | 78 ++++++++++++++++++-------------------
 1 file changed, 39 insertions(+), 39 deletions(-)

diff --git a/src/qt/locale/bitcoin_en.ts b/src/qt/locale/bitcoin_en.ts
index 2d0cccb894268..83dbeffd4d0a1 100644
--- a/src/qt/locale/bitcoin_en.ts
+++ b/src/qt/locale/bitcoin_en.ts
@@ -1085,17 +1085,17 @@
     <message numerus="yes">
         <location line="+9"/>
         <source>%n GB of free space available</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
+        <translation>
+            <numerusform>%n GB of free space available</numerusform>
+            <numerusform>%n GB of free space available</numerusform>
         </translation>
     </message>
     <message numerus="yes">
         <location line="+3"/>
         <source>(of %n GB needed)</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
+        <translation>
+            <numerusform>(of %n GB needed)</numerusform>
+            <numerusform>(of %n GB needed)</numerusform>
         </translation>
     </message>
 </context>
@@ -1792,18 +1792,18 @@
     </message>
     <message numerus="yes">
         <location line="+18"/>
-        <source>%n seconds(s)</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
+        <source>%n second(s)</source>
+        <translation>
+            <numerusform>%n second</numerusform>
+            <numerusform>%n seconds</numerusform>
         </translation>
     </message>
     <message numerus="yes">
         <location line="+4"/>
-        <source>%n minutes(s)</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
+        <source>%n minute(s)</source>
+        <translation>
+            <numerusform>%n minute</numerusform>
+            <numerusform>%n minutes</numerusform>
         </translation>
     </message>
     <message numerus="yes">
@@ -2807,9 +2807,9 @@
     <message numerus="yes">
         <location line="+67"/>
         <source>%n block(s)</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
+        <translation>
+            <numerusform>%n block</numerusform>
+            <numerusform>%n blocks</numerusform>
         </translation>
     </message>
     <message>
@@ -2820,9 +2820,9 @@
     <message numerus="yes">
         <location line="+25"/>
         <source>Estimated to begin confirmation within %n block(s).</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
+        <translation>
+            <numerusform>Estimated to begin confirmation within %n block.</numerusform>
+            <numerusform>Estimated to begin confirmation within %n blocks.</numerusform>
         </translation>
     </message>
     <message>
@@ -3175,9 +3175,9 @@
     <message numerus="yes">
         <location filename="../transactiondesc.cpp" line="+30"/>
         <source>Open for %n more block(s)</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
+        <translation>
+            <numerusform>Open for %n more block</numerusform>
+            <numerusform>Open for %n more blocks</numerusform>
         </translation>
     </message>
     <message>
@@ -3238,9 +3238,9 @@
     <message numerus="yes">
         <location line="+2"/>
         <source>, broadcast through %n node(s)</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
+        <translation>
+            <numerusform>, broadcast through %n node</numerusform>
+            <numerusform>, broadcast through %n nodes</numerusform>
         </translation>
     </message>
     <message>
@@ -3305,9 +3305,9 @@
     <message numerus="yes">
         <location line="-144"/>
         <source>matures in %n more block(s)</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
+        <translation>
+            <numerusform>matures in %n more block</numerusform>
+            <numerusform>matures in %n more blocks</numerusform>
         </translation>
     </message>
     <message>
@@ -3444,9 +3444,9 @@
     <message numerus="yes">
         <location line="+58"/>
         <source>Open for %n more block(s)</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
+        <translation>
+            <numerusform>Open for %n more block</numerusform>
+            <numerusform>Open for %n more blocks</numerusform>
         </translation>
     </message>
     <message>
@@ -4014,7 +4014,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+12"/>
+        <source>Wallet will not create transactions that violate mempool chain limits (default: %u)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
         <source>You need to rebuild the database using -reindex-chainstate to change -txindex</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4719,12 +4724,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
-        <source>Wallet will not create transactions that violate mempool chain limits (default: %u</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <location line="+7"/>
         <source>Warning: Unknown block versions being mined! It&apos;s possible unknown rules are in effect</source>
         <translation type="unfinished"></translation>
     </message>

From fab6c5f46b64aa9d651acee69b1c4c10b1a93256 Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Tue, 3 Jan 2017 16:54:31 +0100
Subject: [PATCH 1448/1802] [qt] Do not translate `~`

---
 src/qt/forms/modaloverlay.ui | 2 +-
 src/qt/locale/bitcoin_en.ts  | 7 +------
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/qt/forms/modaloverlay.ui b/src/qt/forms/modaloverlay.ui
index a37672ad536bf..65a7a6c77eeea 100644
--- a/src/qt/forms/modaloverlay.ui
+++ b/src/qt/forms/modaloverlay.ui
@@ -267,7 +267,7 @@ QLabel { color: rgb(40,40,40);  }</string>
              <item>
               <widget class="QLabel" name="percentageProgress">
                <property name="text">
-                <string>~</string>
+                <string notr="true">~</string>
                </property>
               </widget>
              </item>
diff --git a/src/qt/locale/bitcoin_en.ts b/src/qt/locale/bitcoin_en.ts
index 83dbeffd4d0a1..984b33ffd2556 100644
--- a/src/qt/locale/bitcoin_en.ts
+++ b/src/qt/locale/bitcoin_en.ts
@@ -1139,12 +1139,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
-        <source>~</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+25"/>
+        <location line="+34"/>
         <source>Progress increase per hour</source>
         <translation type="unfinished"></translation>
     </message>

From 7325b1556684158461c9c0df056c9d071444b54e Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Tue, 27 Dec 2016 17:11:57 -0500
Subject: [PATCH 1449/1802] net: a few small cleanups before replacing boost
 threads

- Drop the interruption point directly after the pnode allocation. This would
    be leaky if hit.
- Rearrange thread creation so that the socket handler comes first
---
 src/net.cpp | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/net.cpp b/src/net.cpp
index 3ac96235480d1..9c58577f104cd 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -1806,7 +1806,6 @@ bool CConnman::OpenNetworkConnection(const CAddress& addrConnect, bool fCountFai
         return false;
 
     CNode* pnode = ConnectNode(addrConnect, pszDest, fCountFailure);
-    boost::this_thread::interruption_point();
 
     if (!pnode)
         return false;
@@ -2146,14 +2145,14 @@ bool CConnman::Start(boost::thread_group& threadGroup, CScheduler& scheduler, st
     // Start threads
     //
 
+    // Send and receive from sockets, accept connections
+    threadGroup.create_thread(boost::bind(&TraceThread<boost::function<void()> >, "net", boost::function<void()>(boost::bind(&CConnman::ThreadSocketHandler, this))));
+
     if (!GetBoolArg("-dnsseed", true))
         LogPrintf("DNS seeding disabled\n");
     else
         threadGroup.create_thread(boost::bind(&TraceThread<boost::function<void()> >, "dnsseed", boost::function<void()>(boost::bind(&CConnman::ThreadDNSAddressSeed, this))));
 
-    // Send and receive from sockets, accept connections
-    threadGroup.create_thread(boost::bind(&TraceThread<boost::function<void()> >, "net", boost::function<void()>(boost::bind(&CConnman::ThreadSocketHandler, this))));
-
     // Initiate outbound connections from -addnode
     threadGroup.create_thread(boost::bind(&TraceThread<boost::function<void()> >, "addcon", boost::function<void()>(boost::bind(&CConnman::ThreadOpenAddedConnections, this))));
 

From 799df9115f262fbc25c2c2737ccd8a4e1b20e5b0 Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Tue, 27 Dec 2016 17:12:15 -0500
Subject: [PATCH 1450/1802] net: add CThreadInterrupt and InterruptibleSleep

---
 src/Makefile.am         |  2 ++
 src/threadinterrupt.cpp | 41 +++++++++++++++++++++++++++++++++++++++++
 src/threadinterrupt.h   | 34 ++++++++++++++++++++++++++++++++++
 3 files changed, 77 insertions(+)
 create mode 100644 src/threadinterrupt.cpp
 create mode 100644 src/threadinterrupt.h

diff --git a/src/Makefile.am b/src/Makefile.am
index 89b90e6dff57d..3428d4613d6f8 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -138,6 +138,7 @@ BITCOIN_CORE_H = \
   support/lockedpool.h \
   sync.h \
   threadsafety.h \
+  threadinterrupt.h \
   timedata.h \
   torcontrol.h \
   txdb.h \
@@ -327,6 +328,7 @@ libbitcoin_util_a_SOURCES = \
   rpc/protocol.cpp \
   support/cleanse.cpp \
   sync.cpp \
+  threadinterrupt.cpp \
   util.cpp \
   utilmoneystr.cpp \
   utilstrencodings.cpp \
diff --git a/src/threadinterrupt.cpp b/src/threadinterrupt.cpp
new file mode 100644
index 0000000000000..9d691079edbac
--- /dev/null
+++ b/src/threadinterrupt.cpp
@@ -0,0 +1,41 @@
+// Copyright (c) 2009-2010 Satoshi Nakamoto
+// Copyright (c) 2009-2016 The Bitcoin Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#include "threadinterrupt.h"
+
+CThreadInterrupt::operator bool() const
+{
+    return flag.load(std::memory_order_acquire);
+}
+
+void CThreadInterrupt::reset()
+{
+    flag.store(false, std::memory_order_release);
+}
+
+void CThreadInterrupt::operator()()
+{
+    {
+        std::unique_lock<std::mutex> lock(mut);
+        flag.store(true, std::memory_order_release);
+    }
+    cond.notify_all();
+}
+
+bool CThreadInterrupt::sleep_for(std::chrono::milliseconds rel_time)
+{
+    std::unique_lock<std::mutex> lock(mut);
+    return !cond.wait_for(lock, rel_time, [this]() { return flag.load(std::memory_order_acquire); });
+}
+
+bool CThreadInterrupt::sleep_for(std::chrono::seconds rel_time)
+{
+    return sleep_for(std::chrono::duration_cast<std::chrono::milliseconds>(rel_time));
+}
+
+bool CThreadInterrupt::sleep_for(std::chrono::minutes rel_time)
+{
+    return sleep_for(std::chrono::duration_cast<std::chrono::milliseconds>(rel_time));
+}
diff --git a/src/threadinterrupt.h b/src/threadinterrupt.h
new file mode 100644
index 0000000000000..54e31028089f2
--- /dev/null
+++ b/src/threadinterrupt.h
@@ -0,0 +1,34 @@
+// Copyright (c) 2016 The Bitcoin Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#ifndef BITCOIN_THREADINTERRUPT_H
+#define BITCOIN_THREADINTERRUPT_H
+
+#include <atomic>
+#include <chrono>
+#include <condition_variable>
+#include <mutex>
+
+/*
+    A helper class for interruptible sleeps. Calling operator() will interrupt
+    any current sleep, and after that point operator bool() will return true
+    until reset.
+*/
+class CThreadInterrupt
+{
+public:
+    explicit operator bool() const;
+    void operator()();
+    void reset();
+    bool sleep_for(std::chrono::milliseconds rel_time);
+    bool sleep_for(std::chrono::seconds rel_time);
+    bool sleep_for(std::chrono::minutes rel_time);
+
+private:
+    std::condition_variable cond;
+    std::mutex mut;
+    std::atomic<bool> flag;
+};
+
+#endif //BITCOIN_THREADINTERRUPT_H

From 0985052319263bd7ca9744af3504682b3ea8e21a Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Tue, 27 Dec 2016 17:12:44 -0500
Subject: [PATCH 1451/1802] net: make net interruptible

Also now that net threads are interruptible, switch them to use std
threads/binds/mutexes/condvars.
---
 src/init.cpp |   4 +-
 src/net.cpp  | 105 ++++++++++++++++++++++++++++++++++-----------------
 src/net.h    |  19 +++++++++-
 3 files changed, 91 insertions(+), 37 deletions(-)

diff --git a/src/init.cpp b/src/init.cpp
index 7d2bcb57b1b16..7a493cc1959ab 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -176,6 +176,8 @@ void Interrupt(boost::thread_group& threadGroup)
     InterruptRPC();
     InterruptREST();
     InterruptTorControl();
+    if (g_connman)
+        g_connman->Interrupt();
     threadGroup.interrupt_all();
 }
 
@@ -1572,7 +1574,7 @@ bool AppInitMain(boost::thread_group& threadGroup, CScheduler& scheduler)
     connOptions.nMaxOutboundTimeframe = nMaxOutboundTimeframe;
     connOptions.nMaxOutboundLimit = nMaxOutboundLimit;
 
-    if(!connman.Start(threadGroup, scheduler, strNodeError, connOptions))
+    if (!connman.Start(scheduler, strNodeError, connOptions))
         return InitError(strNodeError);
 
     // ********************************************************* Step 12: finished
diff --git a/src/net.cpp b/src/net.cpp
index 9c58577f104cd..a66679cd85bad 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -1042,7 +1042,7 @@ void CConnman::AcceptConnection(const ListenSocket& hListenSocket) {
 void CConnman::ThreadSocketHandler()
 {
     unsigned int nPrevNodeCount = 0;
-    while (true)
+    while (!interruptNet)
     {
         //
         // Disconnect nodes
@@ -1180,7 +1180,8 @@ void CConnman::ThreadSocketHandler()
 
         int nSelect = select(have_fds ? hSocketMax + 1 : 0,
                              &fdsetRecv, &fdsetSend, &fdsetError, &timeout);
-        boost::this_thread::interruption_point();
+        if (interruptNet)
+            return;
 
         if (nSelect == SOCKET_ERROR)
         {
@@ -1193,7 +1194,8 @@ void CConnman::ThreadSocketHandler()
             }
             FD_ZERO(&fdsetSend);
             FD_ZERO(&fdsetError);
-            MilliSleep(timeout.tv_usec/1000);
+            if (!interruptNet.sleep_for(std::chrono::milliseconds(timeout.tv_usec/1000)))
+                return;
         }
 
         //
@@ -1219,7 +1221,8 @@ void CConnman::ThreadSocketHandler()
         }
         BOOST_FOREACH(CNode* pnode, vNodesCopy)
         {
-            boost::this_thread::interruption_point();
+            if (interruptNet)
+                return;
 
             //
             // Receive
@@ -1241,7 +1244,7 @@ void CConnman::ThreadSocketHandler()
                             if (!pnode->ReceiveMsgBytes(pchBuf, nBytes, notify))
                                 pnode->CloseSocketDisconnect();
                             if(notify)
-                                messageHandlerCondition.notify_one();
+                                condMsgProc.notify_one();
                             pnode->nLastRecv = GetTime();
                             pnode->nRecvBytes += nBytes;
                             RecordBytesRecv(nBytes);
@@ -1469,7 +1472,8 @@ void CConnman::ThreadDNSAddressSeed()
     //  less influence on the network topology, and reduces traffic to the seeds.
     if ((addrman.size() > 0) &&
         (!GetBoolArg("-forcednsseed", DEFAULT_FORCEDNSSEED))) {
-        MilliSleep(11 * 1000);
+        if (!interruptNet.sleep_for(std::chrono::seconds(11)))
+            return;
 
         LOCK(cs_vNodes);
         int nRelevant = 0;
@@ -1580,10 +1584,12 @@ void CConnman::ThreadOpenConnections()
                 OpenNetworkConnection(addr, false, NULL, strAddr.c_str());
                 for (int i = 0; i < 10 && i < nLoop; i++)
                 {
-                    MilliSleep(500);
+                    if (!interruptNet.sleep_for(std::chrono::milliseconds(500)))
+                        return;
                 }
             }
-            MilliSleep(500);
+            if (!interruptNet.sleep_for(std::chrono::milliseconds(500)))
+                return;
         }
     }
 
@@ -1592,14 +1598,16 @@ void CConnman::ThreadOpenConnections()
 
     // Minimum time before next feeler connection (in microseconds).
     int64_t nNextFeeler = PoissonNextSend(nStart*1000*1000, FEELER_INTERVAL);
-    while (true)
+    while (!interruptNet)
     {
         ProcessOneShot();
 
-        MilliSleep(500);
+        if (!interruptNet.sleep_for(std::chrono::milliseconds(500)))
+            return;
 
         CSemaphoreGrant grant(*semOutbound);
-        boost::this_thread::interruption_point();
+        if (interruptNet)
+            return;
 
         // Add seed nodes if DNS seeds are all down (an infrastructure attack?).
         if (addrman.size() == 0 && (GetTime() - nStart > 60)) {
@@ -1657,7 +1665,7 @@ void CConnman::ThreadOpenConnections()
 
         int64_t nANow = GetAdjustedTime();
         int nTries = 0;
-        while (true)
+        while (!interruptNet)
         {
             CAddrInfo addr = addrman.Select(fFeeler);
 
@@ -1700,7 +1708,8 @@ void CConnman::ThreadOpenConnections()
             if (fFeeler) {
                 // Add small amount of random noise before connection to avoid synchronization.
                 int randsleep = GetRandInt(FEELER_SLEEP_WINDOW * 1000);
-                MilliSleep(randsleep);
+                if (!interruptNet.sleep_for(std::chrono::milliseconds(randsleep)))
+                    return;
                 LogPrint("net", "Making feeler connection to %s\n", addrConnect.ToString());
             }
 
@@ -1779,11 +1788,12 @@ void CConnman::ThreadOpenAddedConnections()
                 // OpenNetworkConnection can detect existing connections to that IP/port.
                 CService service(LookupNumeric(info.strAddedNode.c_str(), Params().GetDefaultPort()));
                 OpenNetworkConnection(CAddress(service, NODE_NONE), false, &grant, info.strAddedNode.c_str(), false);
-                MilliSleep(500);
+                if (!interruptNet.sleep_for(std::chrono::milliseconds(500)))
+                    return;
             }
         }
-
-        MilliSleep(120000); // Retry every 2 minutes
+        if (!interruptNet.sleep_for(std::chrono::minutes(2)))
+            return;
     }
 }
 
@@ -1793,7 +1803,9 @@ bool CConnman::OpenNetworkConnection(const CAddress& addrConnect, bool fCountFai
     //
     // Initiate outbound network connection
     //
-    boost::this_thread::interruption_point();
+    if (interruptNet) {
+        return false;
+    }
     if (!fNetworkActive) {
         return false;
     }
@@ -1819,13 +1831,9 @@ bool CConnman::OpenNetworkConnection(const CAddress& addrConnect, bool fCountFai
     return true;
 }
 
-
 void CConnman::ThreadMessageHandler()
 {
-    boost::mutex condition_mutex;
-    boost::unique_lock<boost::mutex> lock(condition_mutex);
-
-    while (true)
+    while (!flagInterruptMsgProc)
     {
         std::vector<CNode*> vNodesCopy;
         {
@@ -1860,7 +1868,8 @@ void CConnman::ThreadMessageHandler()
                     }
                 }
             }
-            boost::this_thread::interruption_point();
+            if (flagInterruptMsgProc)
+                return;
 
             // Send messages
             {
@@ -1868,7 +1877,8 @@ void CConnman::ThreadMessageHandler()
                 if (lockSend)
                     GetNodeSignals().SendMessages(pnode, *this);
             }
-            boost::this_thread::interruption_point();
+            if (flagInterruptMsgProc)
+                return;
         }
 
         {
@@ -1877,8 +1887,10 @@ void CConnman::ThreadMessageHandler()
                 pnode->Release();
         }
 
-        if (fSleep)
-            messageHandlerCondition.timed_wait(lock, boost::posix_time::microsec_clock::universal_time() + boost::posix_time::milliseconds(100));
+        if (fSleep) {
+            std::unique_lock<std::mutex> lock(mutexMsgProc);
+            condMsgProc.wait_until(lock, std::chrono::steady_clock::now() + std::chrono::milliseconds(100));
+        }
     }
 }
 
@@ -2070,6 +2082,7 @@ CConnman::CConnman(uint64_t nSeed0In, uint64_t nSeed1In) : nSeed0(nSeed0In), nSe
     nMaxOutbound = 0;
     nBestHeight = 0;
     clientInterface = NULL;
+    flagInterruptMsgProc = false;
 }
 
 NodeId CConnman::GetNewNodeId()
@@ -2077,7 +2090,7 @@ NodeId CConnman::GetNewNodeId()
     return nLastNodeId.fetch_add(1, std::memory_order_relaxed);
 }
 
-bool CConnman::Start(boost::thread_group& threadGroup, CScheduler& scheduler, std::string& strNodeError, Options connOptions)
+bool CConnman::Start(CScheduler& scheduler, std::string& strNodeError, Options connOptions)
 {
     nTotalBytesRecv = 0;
     nTotalBytesSent = 0;
@@ -2144,24 +2157,26 @@ bool CConnman::Start(boost::thread_group& threadGroup, CScheduler& scheduler, st
     //
     // Start threads
     //
+    interruptNet.reset();
+    flagInterruptMsgProc = false;
 
     // Send and receive from sockets, accept connections
-    threadGroup.create_thread(boost::bind(&TraceThread<boost::function<void()> >, "net", boost::function<void()>(boost::bind(&CConnman::ThreadSocketHandler, this))));
+    threadSocketHandler = std::thread(&TraceThread<std::function<void()> >, "net", std::function<void()>(std::bind(&CConnman::ThreadSocketHandler, this)));
 
     if (!GetBoolArg("-dnsseed", true))
         LogPrintf("DNS seeding disabled\n");
     else
-        threadGroup.create_thread(boost::bind(&TraceThread<boost::function<void()> >, "dnsseed", boost::function<void()>(boost::bind(&CConnman::ThreadDNSAddressSeed, this))));
+        threadDNSAddressSeed = std::thread(&TraceThread<std::function<void()> >, "dnsseed", std::function<void()>(std::bind(&CConnman::ThreadDNSAddressSeed, this)));
 
     // Initiate outbound connections from -addnode
-    threadGroup.create_thread(boost::bind(&TraceThread<boost::function<void()> >, "addcon", boost::function<void()>(boost::bind(&CConnman::ThreadOpenAddedConnections, this))));
+    threadOpenAddedConnections = std::thread(&TraceThread<std::function<void()> >, "addcon", std::function<void()>(std::bind(&CConnman::ThreadOpenAddedConnections, this)));
 
     // Initiate outbound connections unless connect=0
     if (!mapMultiArgs.count("-connect") || mapMultiArgs.at("-connect").size() != 1 || mapMultiArgs.at("-connect")[0] != "0")
-        threadGroup.create_thread(boost::bind(&TraceThread<boost::function<void()> >, "opencon", boost::function<void()>(boost::bind(&CConnman::ThreadOpenConnections, this))));
+        threadOpenConnections = std::thread(&TraceThread<std::function<void()> >, "opencon", std::function<void()>(std::bind(&CConnman::ThreadOpenConnections, this)));
 
     // Process messages
-    threadGroup.create_thread(boost::bind(&TraceThread<boost::function<void()> >, "msghand", boost::function<void()>(boost::bind(&CConnman::ThreadMessageHandler, this))));
+    threadMessageHandler = std::thread(&TraceThread<std::function<void()> >, "msghand", std::function<void()>(std::bind(&CConnman::ThreadMessageHandler, this)));
 
     // Dump network addresses
     scheduler.scheduleEvery(boost::bind(&CConnman::DumpData, this), DUMP_ADDRESSES_INTERVAL);
@@ -2184,12 +2199,33 @@ class CNetCleanup
 }
 instance_of_cnetcleanup;
 
-void CConnman::Stop()
+void CConnman::Interrupt()
 {
-    LogPrintf("%s\n",__func__);
+    {
+        std::lock_guard<std::mutex> lock(mutexMsgProc);
+        flagInterruptMsgProc = true;
+    }
+    condMsgProc.notify_all();
+
+    interruptNet();
+
     if (semOutbound)
         for (int i=0; i<(nMaxOutbound + nMaxFeeler); i++)
             semOutbound->post();
+}
+
+void CConnman::Stop()
+{
+    if (threadMessageHandler.joinable())
+        threadMessageHandler.join();
+    if (threadOpenConnections.joinable())
+        threadOpenConnections.join();
+    if (threadOpenAddedConnections.joinable())
+        threadOpenAddedConnections.join();
+    if (threadDNSAddressSeed.joinable())
+        threadDNSAddressSeed.join();
+    if (threadSocketHandler.joinable())
+        threadSocketHandler.join();
 
     if (fAddressesInitialized)
     {
@@ -2232,6 +2268,7 @@ void CConnman::DeleteNode(CNode* pnode)
 
 CConnman::~CConnman()
 {
+    Interrupt();
     Stop();
 }
 
diff --git a/src/net.h b/src/net.h
index a7c0ecf324270..b26f28326577c 100644
--- a/src/net.h
+++ b/src/net.h
@@ -19,11 +19,14 @@
 #include "streams.h"
 #include "sync.h"
 #include "uint256.h"
+#include "threadinterrupt.h"
 
 #include <atomic>
 #include <deque>
 #include <stdint.h>
+#include <thread>
 #include <memory>
+#include <condition_variable>
 
 #ifndef WIN32
 #include <arpa/inet.h>
@@ -142,8 +145,9 @@ class CConnman
     };
     CConnman(uint64_t seed0, uint64_t seed1);
     ~CConnman();
-    bool Start(boost::thread_group& threadGroup, CScheduler& scheduler, std::string& strNodeError, Options options);
+    bool Start(CScheduler& scheduler, std::string& strNodeError, Options options);
     void Stop();
+    void Interrupt();
     bool BindListenPort(const CService &bindAddr, std::string& strError, bool fWhitelisted = false);
     bool GetNetworkActive() const { return fNetworkActive; };
     void SetNetworkActive(bool active);
@@ -402,7 +406,6 @@ class CConnman
     std::list<CNode*> vNodesDisconnected;
     mutable CCriticalSection cs_vNodes;
     std::atomic<NodeId> nLastNodeId;
-    boost::condition_variable messageHandlerCondition;
 
     /** Services this instance offers */
     ServiceFlags nLocalServices;
@@ -419,6 +422,18 @@ class CConnman
 
     /** SipHasher seeds for deterministic randomness */
     const uint64_t nSeed0, nSeed1;
+
+    std::condition_variable condMsgProc;
+    std::mutex mutexMsgProc;
+    std::atomic<bool> flagInterruptMsgProc;
+
+    CThreadInterrupt interruptNet;
+
+    std::thread threadDNSAddressSeed;
+    std::thread threadSocketHandler;
+    std::thread threadOpenAddedConnections;
+    std::thread threadOpenConnections;
+    std::thread threadMessageHandler;
 };
 extern std::unique_ptr<CConnman> g_connman;
 void Discover(boost::thread_group& threadGroup);

From d3d7056d2a562301b3770c4ede1dfc8ffb00cf4b Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Tue, 27 Dec 2016 17:13:04 -0500
Subject: [PATCH 1452/1802] net: make net processing interruptible

---
 src/net.cpp            |  4 ++--
 src/net.h              |  4 ++--
 src/net_processing.cpp | 33 +++++++++++++++++++--------------
 src/net_processing.h   |  5 +++--
 src/test/DoS_tests.cpp | 20 +++++++++++++-------
 5 files changed, 39 insertions(+), 27 deletions(-)

diff --git a/src/net.cpp b/src/net.cpp
index a66679cd85bad..bbfada4301f4d 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -1856,7 +1856,7 @@ void CConnman::ThreadMessageHandler()
                 TRY_LOCK(pnode->cs_vRecvMsg, lockRecv);
                 if (lockRecv)
                 {
-                    if (!GetNodeSignals().ProcessMessages(pnode, *this))
+                    if (!GetNodeSignals().ProcessMessages(pnode, *this, flagInterruptMsgProc))
                         pnode->CloseSocketDisconnect();
 
                     if (pnode->nSendSize < GetSendBufferSize())
@@ -1875,7 +1875,7 @@ void CConnman::ThreadMessageHandler()
             {
                 TRY_LOCK(pnode->cs_vSend, lockSend);
                 if (lockSend)
-                    GetNodeSignals().SendMessages(pnode, *this);
+                    GetNodeSignals().SendMessages(pnode, *this, flagInterruptMsgProc);
             }
             if (flagInterruptMsgProc)
                 return;
diff --git a/src/net.h b/src/net.h
index b26f28326577c..89c08da8695a9 100644
--- a/src/net.h
+++ b/src/net.h
@@ -460,8 +460,8 @@ struct CombinerAll
 // Signals for message handling
 struct CNodeSignals
 {
-    boost::signals2::signal<bool (CNode*, CConnman&), CombinerAll> ProcessMessages;
-    boost::signals2::signal<bool (CNode*, CConnman&), CombinerAll> SendMessages;
+    boost::signals2::signal<bool (CNode*, CConnman&, std::atomic<bool>&), CombinerAll> ProcessMessages;
+    boost::signals2::signal<bool (CNode*, CConnman&, std::atomic<bool>&), CombinerAll> SendMessages;
     boost::signals2::signal<void (CNode*, CConnman&)> InitializeNode;
     boost::signals2::signal<void (NodeId, bool&)> FinalizeNode;
 };
diff --git a/src/net_processing.cpp b/src/net_processing.cpp
index 380decbcb7a63..f3a04080d14d4 100644
--- a/src/net_processing.cpp
+++ b/src/net_processing.cpp
@@ -886,7 +886,7 @@ static void RelayAddress(const CAddress& addr, bool fReachable, CConnman& connma
     connman.ForEachNodeThen(std::move(sortfunc), std::move(pushfunc));
 }
 
-void static ProcessGetData(CNode* pfrom, const Consensus::Params& consensusParams, CConnman& connman)
+void static ProcessGetData(CNode* pfrom, const Consensus::Params& consensusParams, CConnman& connman, std::atomic<bool>& interruptMsgProc)
 {
     std::deque<CInv>::iterator it = pfrom->vRecvGetData.begin();
     unsigned int nMaxSendBufferSize = connman.GetSendBufferSize();
@@ -901,7 +901,9 @@ void static ProcessGetData(CNode* pfrom, const Consensus::Params& consensusParam
 
         const CInv &inv = *it;
         {
-            boost::this_thread::interruption_point();
+            if (interruptMsgProc)
+                return;
+
             it++;
 
             if (inv.type == MSG_BLOCK || inv.type == MSG_FILTERED_BLOCK || inv.type == MSG_CMPCT_BLOCK || inv.type == MSG_WITNESS_BLOCK)
@@ -1055,7 +1057,7 @@ uint32_t GetFetchFlags(CNode* pfrom, CBlockIndex* pprev, const Consensus::Params
     return nFetchFlags;
 }
 
-bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv, int64_t nTimeReceived, const CChainParams& chainparams, CConnman& connman)
+bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv, int64_t nTimeReceived, const CChainParams& chainparams, CConnman& connman, std::atomic<bool>& interruptMsgProc)
 {
     unsigned int nMaxSendBufferSize = connman.GetSendBufferSize();
 
@@ -1295,7 +1297,8 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
         int64_t nSince = nNow - 10 * 60;
         BOOST_FOREACH(CAddress& addr, vAddr)
         {
-            boost::this_thread::interruption_point();
+            if (interruptMsgProc)
+                return true;
 
             if ((addr.nServices & REQUIRED_SERVICES) != REQUIRED_SERVICES)
                 continue;
@@ -1377,7 +1380,8 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
         {
             CInv &inv = vInv[nInv];
 
-            boost::this_thread::interruption_point();
+            if (interruptMsgProc)
+                return true;
 
             bool fAlreadyHave = AlreadyHave(inv);
             LogPrint("net", "got inv: %s  %s peer=%d\n", inv.ToString(), fAlreadyHave ? "have" : "new", pfrom->id);
@@ -1439,7 +1443,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
             LogPrint("net", "received getdata for: %s peer=%d\n", vInv[0].ToString(), pfrom->id);
 
         pfrom->vRecvGetData.insert(pfrom->vRecvGetData.end(), vInv.begin(), vInv.end());
-        ProcessGetData(pfrom, chainparams.GetConsensus(), connman);
+        ProcessGetData(pfrom, chainparams.GetConsensus(), connman, interruptMsgProc);
     }
 
 
@@ -1513,7 +1517,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
             inv.type = State(pfrom->GetId())->fWantsCmpctWitness ? MSG_WITNESS_BLOCK : MSG_BLOCK;
             inv.hash = req.blockhash;
             pfrom->vRecvGetData.push_back(inv);
-            ProcessGetData(pfrom, chainparams.GetConsensus(), connman);
+            ProcessGetData(pfrom, chainparams.GetConsensus(), connman, interruptMsgProc);
             return true;
         }
 
@@ -1925,10 +1929,10 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
         } // cs_main
 
         if (fProcessBLOCKTXN)
-            return ProcessMessage(pfrom, NetMsgType::BLOCKTXN, blockTxnMsg, nTimeReceived, chainparams, connman);
+            return ProcessMessage(pfrom, NetMsgType::BLOCKTXN, blockTxnMsg, nTimeReceived, chainparams, connman, interruptMsgProc);
 
         if (fRevertToHeaderProcessing)
-            return ProcessMessage(pfrom, NetMsgType::HEADERS, vHeadersMsg, nTimeReceived, chainparams, connman);
+            return ProcessMessage(pfrom, NetMsgType::HEADERS, vHeadersMsg, nTimeReceived, chainparams, connman, interruptMsgProc);
 
         if (fBlockReconstructed) {
             // If we got here, we were able to optimistically reconstruct a
@@ -2441,7 +2445,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
 }
 
 // requires LOCK(cs_vRecvMsg)
-bool ProcessMessages(CNode* pfrom, CConnman& connman)
+bool ProcessMessages(CNode* pfrom, CConnman& connman, std::atomic<bool>& interruptMsgProc)
 {
     const CChainParams& chainparams = Params();
     unsigned int nMaxSendBufferSize = connman.GetSendBufferSize();
@@ -2459,7 +2463,7 @@ bool ProcessMessages(CNode* pfrom, CConnman& connman)
     bool fOk = true;
 
     if (!pfrom->vRecvGetData.empty())
-        ProcessGetData(pfrom, chainparams.GetConsensus(), connman);
+        ProcessGetData(pfrom, chainparams.GetConsensus(), connman, interruptMsgProc);
 
     // this maintains the order of responses
     if (!pfrom->vRecvGetData.empty()) return fOk;
@@ -2520,8 +2524,9 @@ bool ProcessMessages(CNode* pfrom, CConnman& connman)
         bool fRet = false;
         try
         {
-            fRet = ProcessMessage(pfrom, strCommand, vRecv, msg.nTime, chainparams, connman);
-            boost::this_thread::interruption_point();
+            fRet = ProcessMessage(pfrom, strCommand, vRecv, msg.nTime, chainparams, connman, interruptMsgProc);
+            if (interruptMsgProc)
+                return true;
         }
         catch (const std::ios_base::failure& e)
         {
@@ -2585,7 +2590,7 @@ class CompareInvMempoolOrder
     }
 };
 
-bool SendMessages(CNode* pto, CConnman& connman)
+bool SendMessages(CNode* pto, CConnman& connman, std::atomic<bool>& interruptMsgProc)
 {
     const Consensus::Params& consensusParams = Params().GetConsensus();
     {
diff --git a/src/net_processing.h b/src/net_processing.h
index 130433cc7c005..9e76cad505694 100644
--- a/src/net_processing.h
+++ b/src/net_processing.h
@@ -39,13 +39,14 @@ bool GetNodeStateStats(NodeId nodeid, CNodeStateStats &stats);
 void Misbehaving(NodeId nodeid, int howmuch);
 
 /** Process protocol messages received from a given node */
-bool ProcessMessages(CNode* pfrom, CConnman& connman);
+bool ProcessMessages(CNode* pfrom, CConnman& connman, std::atomic<bool>& interrupt);
 /**
  * Send queued protocol messages to be sent to a give node.
  *
  * @param[in]   pto             The node which we are sending messages to.
  * @param[in]   connman         The connection manager for that node.
+ * @param[in]   interrupt       Interrupt condition for processing threads
  */
-bool SendMessages(CNode* pto, CConnman& connman);
+bool SendMessages(CNode* pto, CConnman& connman, std::atomic<bool>& interrupt);
 
 #endif // BITCOIN_NET_PROCESSING_H
diff --git a/src/test/DoS_tests.cpp b/src/test/DoS_tests.cpp
index d90dcaeb0211e..35edf60a2b21d 100644
--- a/src/test/DoS_tests.cpp
+++ b/src/test/DoS_tests.cpp
@@ -47,6 +47,8 @@ BOOST_FIXTURE_TEST_SUITE(DoS_tests, TestingSetup)
 
 BOOST_AUTO_TEST_CASE(DoS_banning)
 {
+    std::atomic<bool> interruptDummy(false);
+
     connman->ClearBanned();
     CAddress addr1(ip(0xa0b0c001), NODE_NONE);
     CNode dummyNode1(id++, NODE_NETWORK, 0, INVALID_SOCKET, addr1, 0, 0, "", true);
@@ -54,7 +56,7 @@ BOOST_AUTO_TEST_CASE(DoS_banning)
     GetNodeSignals().InitializeNode(&dummyNode1, *connman);
     dummyNode1.nVersion = 1;
     Misbehaving(dummyNode1.GetId(), 100); // Should get banned
-    SendMessages(&dummyNode1, *connman);
+    SendMessages(&dummyNode1, *connman, interruptDummy);
     BOOST_CHECK(connman->IsBanned(addr1));
     BOOST_CHECK(!connman->IsBanned(ip(0xa0b0c001|0x0000ff00))); // Different IP, not banned
 
@@ -64,16 +66,18 @@ BOOST_AUTO_TEST_CASE(DoS_banning)
     GetNodeSignals().InitializeNode(&dummyNode2, *connman);
     dummyNode2.nVersion = 1;
     Misbehaving(dummyNode2.GetId(), 50);
-    SendMessages(&dummyNode2, *connman);
+    SendMessages(&dummyNode2, *connman, interruptDummy);
     BOOST_CHECK(!connman->IsBanned(addr2)); // 2 not banned yet...
     BOOST_CHECK(connman->IsBanned(addr1));  // ... but 1 still should be
     Misbehaving(dummyNode2.GetId(), 50);
-    SendMessages(&dummyNode2, *connman);
+    SendMessages(&dummyNode2, *connman, interruptDummy);
     BOOST_CHECK(connman->IsBanned(addr2));
 }
 
 BOOST_AUTO_TEST_CASE(DoS_banscore)
 {
+    std::atomic<bool> interruptDummy(false);
+
     connman->ClearBanned();
     ForceSetArg("-banscore", "111"); // because 11 is my favorite number
     CAddress addr1(ip(0xa0b0c001), NODE_NONE);
@@ -82,19 +86,21 @@ BOOST_AUTO_TEST_CASE(DoS_banscore)
     GetNodeSignals().InitializeNode(&dummyNode1, *connman);
     dummyNode1.nVersion = 1;
     Misbehaving(dummyNode1.GetId(), 100);
-    SendMessages(&dummyNode1, *connman);
+    SendMessages(&dummyNode1, *connman, interruptDummy);
     BOOST_CHECK(!connman->IsBanned(addr1));
     Misbehaving(dummyNode1.GetId(), 10);
-    SendMessages(&dummyNode1, *connman);
+    SendMessages(&dummyNode1, *connman, interruptDummy);
     BOOST_CHECK(!connman->IsBanned(addr1));
     Misbehaving(dummyNode1.GetId(), 1);
-    SendMessages(&dummyNode1, *connman);
+    SendMessages(&dummyNode1, *connman, interruptDummy);
     BOOST_CHECK(connman->IsBanned(addr1));
     ForceSetArg("-banscore", std::to_string(DEFAULT_BANSCORE_THRESHOLD));
 }
 
 BOOST_AUTO_TEST_CASE(DoS_bantime)
 {
+    std::atomic<bool> interruptDummy(false);
+
     connman->ClearBanned();
     int64_t nStartTime = GetTime();
     SetMockTime(nStartTime); // Overrides future calls to GetTime()
@@ -106,7 +112,7 @@ BOOST_AUTO_TEST_CASE(DoS_bantime)
     dummyNode.nVersion = 1;
 
     Misbehaving(dummyNode.GetId(), 100);
-    SendMessages(&dummyNode, *connman);
+    SendMessages(&dummyNode, *connman, interruptDummy);
     BOOST_CHECK(connman->IsBanned(addr));
 
     SetMockTime(nStartTime+60*60);

From 5cb0fcee8137d6de8d2b9525aa45fd11ab2231c8 Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Tue, 27 Dec 2016 17:13:19 -0500
Subject: [PATCH 1453/1802] net: remove thread_interrupted catch

This is now a std::thread, so there's no hope of catching a boost interruption
point.
---
 src/net_processing.cpp | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/net_processing.cpp b/src/net_processing.cpp
index f3a04080d14d4..e0c12d853056f 100644
--- a/src/net_processing.cpp
+++ b/src/net_processing.cpp
@@ -2551,9 +2551,6 @@ bool ProcessMessages(CNode* pfrom, CConnman& connman, std::atomic<bool>& interru
                 PrintExceptionContinue(&e, "ProcessMessages()");
             }
         }
-        catch (const boost::thread_interrupted&) {
-            throw;
-        }
         catch (const std::exception& e) {
             PrintExceptionContinue(&e, "ProcessMessages()");
         } catch (...) {

From 8b3159ef0a912da67c545a3d24f4558f8df866e4 Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Tue, 27 Dec 2016 17:13:31 -0500
Subject: [PATCH 1454/1802] net: make proxy receives interruptible

---
 src/net.cpp     |  2 ++
 src/netbase.cpp | 12 ++++++++++--
 src/netbase.h   |  1 +
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/net.cpp b/src/net.cpp
index bbfada4301f4d..7e16e2382fa79 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -2157,6 +2157,7 @@ bool CConnman::Start(CScheduler& scheduler, std::string& strNodeError, Options c
     //
     // Start threads
     //
+    InterruptSocks5(false);
     interruptNet.reset();
     flagInterruptMsgProc = false;
 
@@ -2208,6 +2209,7 @@ void CConnman::Interrupt()
     condMsgProc.notify_all();
 
     interruptNet();
+    InterruptSocks5(true);
 
     if (semOutbound)
         for (int i=0; i<(nMaxOutbound + nMaxFeeler); i++)
diff --git a/src/netbase.cpp b/src/netbase.cpp
index da94fd4d13d8d..87c7abd7c1f2a 100644
--- a/src/netbase.cpp
+++ b/src/netbase.cpp
@@ -19,6 +19,7 @@
 #ifdef HAVE_GETADDRINFO_A
 #include <netdb.h>
 #endif
+#include <atomic>
 
 #ifndef WIN32
 #if HAVE_INET_PTON
@@ -44,6 +45,7 @@ bool fNameLookup = DEFAULT_NAME_LOOKUP;
 
 // Need ample time for negotiation for very slow proxies such as Tor (milliseconds)
 static const int SOCKS5_RECV_TIMEOUT = 20 * 1000;
+static std::atomic<bool> interruptSocks5Recv(false);
 
 enum Network ParseNetwork(std::string net) {
     boost::to_lower(net);
@@ -206,7 +208,7 @@ struct timeval MillisToTimeval(int64_t nTimeout)
 /**
  * Read bytes from socket. This will either read the full number of bytes requested
  * or return False on error or timeout.
- * This function can be interrupted by boost thread interrupt.
+ * This function can be interrupted by calling InterruptSocks5()
  *
  * @param data Buffer to receive into
  * @param len  Length of data to receive
@@ -246,7 +248,8 @@ bool static InterruptibleRecv(char* data, size_t len, int timeout, SOCKET& hSock
                 return false;
             }
         }
-        boost::this_thread::interruption_point();
+        if (interruptSocks5Recv)
+            return false;
         curTime = GetTimeMillis();
     }
     return len == 0;
@@ -715,3 +718,8 @@ bool SetSocketNonBlocking(SOCKET& hSocket, bool fNonBlocking)
 
     return true;
 }
+
+void InterruptSocks5(bool interrupt)
+{
+    interruptSocks5Recv = interrupt;
+}
diff --git a/src/netbase.h b/src/netbase.h
index eb39d16578ed4..9ff8102bd7dc3 100644
--- a/src/netbase.h
+++ b/src/netbase.h
@@ -63,5 +63,6 @@ bool SetSocketNonBlocking(SOCKET& hSocket, bool fNonBlocking);
  * Convert milliseconds to a struct timeval for e.g. select.
  */
 struct timeval MillisToTimeval(int64_t nTimeout);
+void InterruptSocks5(bool interrupt);
 
 #endif // BITCOIN_NETBASE_H

From 67ee4ec9015592c8447955356adfcbb1bf473e32 Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Tue, 27 Dec 2016 17:13:51 -0500
Subject: [PATCH 1455/1802] net: misc header cleanups

---
 src/net.cpp     | 2 --
 src/netbase.cpp | 7 -------
 2 files changed, 9 deletions(-)

diff --git a/src/net.cpp b/src/net.cpp
index 7e16e2382fa79..66c8539154528 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -35,8 +35,6 @@
 #include <miniupnpc/upnperrors.h>
 #endif
 
-#include <boost/filesystem.hpp>
-#include <boost/thread.hpp>
 
 #include <math.h>
 
diff --git a/src/netbase.cpp b/src/netbase.cpp
index 87c7abd7c1f2a..afa3c3b13ee28 100644
--- a/src/netbase.cpp
+++ b/src/netbase.cpp
@@ -16,21 +16,14 @@
 #include "util.h"
 #include "utilstrencodings.h"
 
-#ifdef HAVE_GETADDRINFO_A
-#include <netdb.h>
-#endif
 #include <atomic>
 
 #ifndef WIN32
-#if HAVE_INET_PTON
-#include <arpa/inet.h>
-#endif
 #include <fcntl.h>
 #endif
 
 #include <boost/algorithm/string/case_conv.hpp> // for to_lower()
 #include <boost/algorithm/string/predicate.hpp> // for startswith() and endswith()
-#include <boost/thread.hpp>
 
 #if !defined(HAVE_MSG_NOSIGNAL) && !defined(MSG_NOSIGNAL)
 #define MSG_NOSIGNAL 0

From 35ee63c565f4e459648bb32ee7308630c09741fe Mon Sep 17 00:00:00 2001
From: fanquake <fanquake@gmail.com>
Date: Wed, 4 Jan 2017 17:08:04 +0800
Subject: [PATCH 1456/1802] [Doc] Install Protobuf v3 on OS X

---
 doc/build-osx.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/build-osx.md b/doc/build-osx.md
index 5cdb3dab6fbb1..a15bcd012c601 100644
--- a/doc/build-osx.md
+++ b/doc/build-osx.md
@@ -16,7 +16,7 @@ Then install [Homebrew](http://brew.sh).
 Dependencies
 ----------------------
 
-    brew install automake berkeley-db4 libtool boost --c++11 miniupnpc openssl pkg-config homebrew/versions/protobuf260 --c++11 qt5 libevent
+    brew install automake berkeley-db4 libtool boost --c++11 miniupnpc openssl pkg-config protobuf --c++11 qt5 libevent
 
 In case you want to build the disk image with `make deploy` (.dmg / optional), you need RSVG
 

From 05a55a639b6cd01b06be285db53edccdaf2ca189 Mon Sep 17 00:00:00 2001
From: Karl-Johan Alm <karljohan-alm@garage.co.jp>
Date: Wed, 4 Jan 2017 18:16:47 +0900
Subject: [PATCH 1457/1802] Added EVENT_CFLAGS to test makefile to explicitly
 include libevent headers.

---
 src/Makefile.test.include | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Makefile.test.include b/src/Makefile.test.include
index 5d57daff4cac2..c55c3ab46583c 100644
--- a/src/Makefile.test.include
+++ b/src/Makefile.test.include
@@ -110,7 +110,7 @@ BITCOIN_TESTS += \
 endif
 
 test_test_bitcoin_SOURCES = $(BITCOIN_TESTS) $(JSON_TEST_FILES) $(RAW_TEST_FILES)
-test_test_bitcoin_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) -I$(builddir)/test/ $(TESTDEFS)
+test_test_bitcoin_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) -I$(builddir)/test/ $(TESTDEFS) $(EVENT_CFLAGS)
 test_test_bitcoin_LDADD = $(LIBBITCOIN_SERVER) $(LIBBITCOIN_CLI) $(LIBBITCOIN_COMMON) $(LIBBITCOIN_UTIL) $(LIBBITCOIN_CONSENSUS) $(LIBBITCOIN_CRYPTO) $(LIBUNIVALUE) $(LIBLEVELDB) $(LIBMEMENV) \
   $(BOOST_LIBS) $(BOOST_UNIT_TEST_FRAMEWORK_LIB) $(LIBSECP256K1) $(EVENT_LIBS)
 test_test_bitcoin_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)

From fae26e8dfc083679d33c57bf5166b83b6783b00a Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Mon, 2 Jan 2017 12:17:50 +0100
Subject: [PATCH 1458/1802] [qt] Add more sources to translate

---
 src/Makefile.qt.include | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Makefile.qt.include b/src/Makefile.qt.include
index 48abb9b4a2a70..64ba78665a469 100644
--- a/src/Makefile.qt.include
+++ b/src/Makefile.qt.include
@@ -414,11 +414,11 @@ QT_QM=$(QT_TS:.ts=.qm)
 
 SECONDARY: $(QT_QM)
 
-$(srcdir)/qt/bitcoinstrings.cpp: $(libbitcoin_server_a_SOURCES) $(libbitcoin_wallet_a_SOURCES)
+$(srcdir)/qt/bitcoinstrings.cpp: $(libbitcoin_server_a_SOURCES) $(libbitcoin_wallet_a_SOURCES) $(libbitcoin_common_a_SOURCES) $(libbitcoin_zmq_a_SOURCES) $(libbitcoin_consensus_a_SOURCES) $(libbitcoin_util_a_SOURCES)
 	@test -n $(XGETTEXT) || echo "xgettext is required for updating translations"
 	$(AM_V_GEN) cd $(srcdir); XGETTEXT=$(XGETTEXT) PACKAGE_NAME="$(PACKAGE_NAME)" COPYRIGHT_HOLDERS="$(COPYRIGHT_HOLDERS)" COPYRIGHT_HOLDERS_SUBSTITUTION="$(COPYRIGHT_HOLDERS_SUBSTITUTION)" $(PYTHON) ../share/qt/extract_strings_qt.py $^
 
-translate: $(srcdir)/qt/bitcoinstrings.cpp $(QT_FORMS_UI) $(QT_FORMS_UI) $(BITCOIN_QT_BASE_CPP) $(BITCOIN_QT_WINDOWS_CPP) $(BITCOIN_QT_WALLET_CPP) $(BITCOIN_QT_H) $(BITCOIN_MM)
+translate: $(srcdir)/qt/bitcoinstrings.cpp $(QT_FORMS_UI) $(QT_FORMS_UI) $(BITCOIN_QT_BASE_CPP) qt/bitcoin.cpp $(BITCOIN_QT_WINDOWS_CPP) $(BITCOIN_QT_WALLET_CPP) $(BITCOIN_QT_H) $(BITCOIN_MM)
 	@test -n $(LUPDATE) || echo "lupdate is required for updating translations"
 	$(AM_V_GEN) QT_SELECT=$(QT_SELECT) $(LUPDATE) $^ -locations relative -no-obsolete -ts $(srcdir)/qt/locale/bitcoin_en.ts
 

From facf3e76086133f5013a7b174bbb0fccb8d670f5 Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Wed, 4 Jan 2017 12:16:28 +0100
Subject: [PATCH 1459/1802] [qt] `make translate`

---
 src/qt/bitcoinstrings.cpp   |  11 ++++
 src/qt/locale/bitcoin_en.ts | 103 +++++++++++++++++++++++++++---------
 2 files changed, 89 insertions(+), 25 deletions(-)

diff --git a/src/qt/bitcoinstrings.cpp b/src/qt/bitcoinstrings.cpp
index acd81a6b2a8a9..ace085382b240 100644
--- a/src/qt/bitcoinstrings.cpp
+++ b/src/qt/bitcoinstrings.cpp
@@ -157,6 +157,9 @@ QT_TRANSLATE_NOOP("bitcoin-core", ""
 QT_TRANSLATE_NOOP("bitcoin-core", ""
 "The transaction amount is too small to send after the fee has been deducted"),
 QT_TRANSLATE_NOOP("bitcoin-core", ""
+"This is a pre-release test build - use at your own risk - do not use for "
+"mining or merchant applications"),
+QT_TRANSLATE_NOOP("bitcoin-core", ""
 "This is the transaction fee you may pay when fee estimates are not available."),
 QT_TRANSLATE_NOOP("bitcoin-core", ""
 "This product includes software developed by the OpenSSL Project for use in "
@@ -193,6 +196,9 @@ QT_TRANSLATE_NOOP("bitcoin-core", ""
 "Wallet will not create transactions that violate mempool chain limits "
 "(default: %u)"),
 QT_TRANSLATE_NOOP("bitcoin-core", ""
+"Warning: The network does not appear to fully agree! Some miners appear to "
+"be experiencing issues."),
+QT_TRANSLATE_NOOP("bitcoin-core", ""
 "Warning: Unknown block versions being mined! It's possible unknown rules are "
 "in effect"),
 QT_TRANSLATE_NOOP("bitcoin-core", ""
@@ -200,6 +206,9 @@ QT_TRANSLATE_NOOP("bitcoin-core", ""
 "if your balance or transactions are incorrect you should restore from a "
 "backup."),
 QT_TRANSLATE_NOOP("bitcoin-core", ""
+"Warning: We do not appear to fully agree with our peers! You may need to "
+"upgrade, or other nodes may need to upgrade."),
+QT_TRANSLATE_NOOP("bitcoin-core", ""
 "Whitelist peers connecting from the given IP address (e.g. 1.2.3.4) or CIDR "
 "notated network (e.g. 1.2.3.0/24). Can be specified multiple times."),
 QT_TRANSLATE_NOOP("bitcoin-core", ""
@@ -228,6 +237,7 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Block creation options:"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Cannot downgrade wallet"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Cannot resolve -%s address: '%s'"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Cannot write default address"),
+QT_TRANSLATE_NOOP("bitcoin-core", "Chain selection options:"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Change index out of range"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Connect through SOCKS5 proxy"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Connect to a node to retrieve peer addresses, and disconnect"),
@@ -350,6 +360,7 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Unsupported argument -debugnet ignored, use -
 QT_TRANSLATE_NOOP("bitcoin-core", "Unsupported argument -tor found, use -onion."),
 QT_TRANSLATE_NOOP("bitcoin-core", "Upgrade wallet to latest format on startup"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Use UPnP to map the listening port (default: %u)"),
+QT_TRANSLATE_NOOP("bitcoin-core", "Use the test chain"),
 QT_TRANSLATE_NOOP("bitcoin-core", "User Agent comment (%s) contains unsafe characters."),
 QT_TRANSLATE_NOOP("bitcoin-core", "Username for JSON-RPC connections"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Verifying blocks..."),
diff --git a/src/qt/locale/bitcoin_en.ts b/src/qt/locale/bitcoin_en.ts
index 984b33ffd2556..b9d8944ae7e5d 100644
--- a/src/qt/locale/bitcoin_en.ts
+++ b/src/qt/locale/bitcoin_en.ts
@@ -684,6 +684,11 @@
         <source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;locked&lt;/b&gt;</source>
         <translation>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;locked&lt;/b&gt;</translation>
     </message>
+    <message>
+        <location filename="../bitcoin.cpp" line="+516"/>
+        <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>CoinControlDialog</name>
@@ -1839,6 +1844,29 @@
             <numerusform>%n years</numerusform>
         </translation>
     </message>
+    <message>
+        <location filename="../bitcoin.cpp" line="+172"/>
+        <source>%1 didn&apos;t yet exit safely...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QObject::QObject</name>
+    <message>
+        <location line="-81"/>
+        <source>Error: Specified data directory &quot;%1&quot; does not exist.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Error: Cannot parse configuration file: %1. Only use key=value syntax.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Error: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QRImageWidget</name>
@@ -3829,7 +3857,7 @@
 <context>
     <name>bitcoin-core</name>
     <message>
-        <location filename="../bitcoinstrings.cpp" line="+292"/>
+        <location filename="../bitcoinstrings.cpp" line="+302"/>
         <source>Options:</source>
         <translation>Options:</translation>
     </message>
@@ -3849,12 +3877,12 @@
         <translation>Specify your own public address</translation>
     </message>
     <message>
-        <location line="-107"/>
+        <location line="-108"/>
         <source>Accept command line and JSON-RPC commands</source>
         <translation>Accept command line and JSON-RPC commands</translation>
     </message>
     <message>
-        <location line="-196"/>
+        <location line="-205"/>
         <source>Accept connections from outside (default: 1 if no -proxy or -connect/-noconnect)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3894,7 +3922,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+117"/>
+        <location line="+127"/>
         <source>Error: A fatal internal error occurred, see debug.log for details</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3919,7 +3947,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-334"/>
+        <location line="-344"/>
         <source>Bitcoin Core</source>
         <translation type="unfinished">Bitcoin Core</translation>
     </message>
@@ -3999,7 +4027,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+7"/>
+        <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+15"/>
         <source>Unable to rewind the database to a pre-fork state. You will need to redownload the blockchain</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4014,7 +4047,17 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+3"/>
+        <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+12"/>
         <source>You need to rebuild the database using -reindex-chainstate to change -txindex</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4055,6 +4098,11 @@
     </message>
     <message>
         <location line="+2"/>
+        <source>Chain selection options:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
         <source>Change index out of range</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4298,6 +4346,11 @@
         <source>Use UPnP to map the listening port (default: %u)</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+1"/>
+        <source>Use the test chain</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location line="+1"/>
         <source>User Agent comment (%s) contains unsafe characters.</source>
@@ -4334,7 +4387,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-331"/>
+        <location line="-342"/>
         <source>Allow JSON-RPC connections from specified source. Valid for &lt;ip&gt; are a single IP (e.g. 1.2.3.4), a network/netmask (e.g. 1.2.3.4/255.255.255.0) or a network/CIDR (e.g. 1.2.3.4/24). This option can be specified multiple times</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4404,12 +4457,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+25"/>
+        <location line="+28"/>
         <source>Use hierarchical deterministic key generation (HD) after BIP32. Only has effect during wallet creation/first start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+29"/>
         <source>Whitelisted peers cannot be DoS banned and their transactions are always relayed, even if they are already in the mempool, useful e.g. for a gateway</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4434,7 +4487,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+7"/>
         <source>Connect through SOCKS5 proxy</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4564,7 +4617,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="+4"/>
         <source>Username for JSON-RPC connections</source>
         <translation>Username for JSON-RPC connections</translation>
     </message>
@@ -4594,27 +4647,27 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-72"/>
+        <location line="-73"/>
         <source>Password for JSON-RPC connections</source>
         <translation>Password for JSON-RPC connections</translation>
     </message>
     <message>
-        <location line="-216"/>
+        <location line="-226"/>
         <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
         <translation>Execute command when the best block changes (%s in cmd is replaced by block hash)</translation>
     </message>
     <message>
-        <location line="+145"/>
+        <location line="+154"/>
         <source>Allow DNS lookups for -addnode, -seednode and -connect</source>
         <translation>Allow DNS lookups for -addnode, -seednode and -connect</translation>
     </message>
     <message>
-        <location line="+57"/>
+        <location line="+58"/>
         <source>Loading addresses...</source>
         <translation>Loading addresses...</translation>
     </message>
     <message>
-        <location line="-265"/>
+        <location line="-275"/>
         <source>(1 = keep tx meta data e.g. account owner and payment request information, 2 = drop tx meta data)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4679,7 +4732,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+12"/>
         <source>This is the transaction fee you may pay when fee estimates are not available.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4719,7 +4772,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+10"/>
         <source>Warning: Unknown block versions being mined! It&apos;s possible unknown rules are in effect</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4729,7 +4782,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+7"/>
         <source>Whitelist peers connecting from the given IP address (e.g. 1.2.3.4) or CIDR notated network (e.g. 1.2.3.0/24). Can be specified multiple times.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4749,7 +4802,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+38"/>
         <source>How many blocks to check at startup (default: %u, 0 = all)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4909,17 +4962,17 @@
         <translation>Loading block index...</translation>
     </message>
     <message>
-        <location line="-60"/>
+        <location line="-61"/>
         <source>Add a node to connect to and attempt to keep the connection open</source>
         <translation>Add a node to connect to and attempt to keep the connection open</translation>
     </message>
     <message>
-        <location line="+61"/>
+        <location line="+62"/>
         <source>Loading wallet...</source>
         <translation>Loading wallet...</translation>
     </message>
     <message>
-        <location line="-54"/>
+        <location line="-55"/>
         <source>Cannot downgrade wallet</source>
         <translation>Cannot downgrade wallet</translation>
     </message>
@@ -4929,7 +4982,7 @@
         <translation>Cannot write default address</translation>
     </message>
     <message>
-        <location line="+77"/>
+        <location line="+78"/>
         <source>Rescanning...</source>
         <translation>Rescanning...</translation>
     </message>

From 388ea19bf2a631f3796713026fad8eaa71b8ac40 Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Wed, 4 Jan 2017 14:28:33 +0100
Subject: [PATCH 1460/1802] qt: Set (count) placeholder in sendcoinsdialog to
 notranslate

---
 src/qt/forms/sendcoinsdialog.ui |  2 +-
 src/qt/locale/bitcoin_en.ts     | 15 +++++----------
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/src/qt/forms/sendcoinsdialog.ui b/src/qt/forms/sendcoinsdialog.ui
index 0a8afa2e76e49..ca8ecffafea0c 100644
--- a/src/qt/forms/sendcoinsdialog.ui
+++ b/src/qt/forms/sendcoinsdialog.ui
@@ -1111,7 +1111,7 @@
                      <item>
                       <widget class="QLabel" name="confirmationTargetLabel">
                        <property name="text">
-                        <string>(count)</string>
+                        <string notr="true">(count)</string>
                        </property>
                       </widget>
                      </item>
diff --git a/src/qt/locale/bitcoin_en.ts b/src/qt/locale/bitcoin_en.ts
index 984b33ffd2556..e2b5a0b0ebafd 100644
--- a/src/qt/locale/bitcoin_en.ts
+++ b/src/qt/locale/bitcoin_en.ts
@@ -1997,8 +1997,8 @@
     </message>
     <message>
         <location line="+60"/>
-        <location filename="../rpcconsole.cpp" line="+400"/>
-        <location line="+692"/>
+        <location filename="../rpcconsole.cpp" line="+456"/>
+        <location line="+719"/>
         <source>Select a peer to view detailed information.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2134,7 +2134,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rpcconsole.cpp" line="-386"/>
+        <location filename="../rpcconsole.cpp" line="-413"/>
         <source>In:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2217,7 +2217,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+123"/>
+        <location line="+150"/>
         <source>%1 B</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2662,12 +2662,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+80"/>
-        <source>(count)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+108"/>
+        <location line="+188"/>
         <source>Clear &amp;All</source>
         <translation>Clear &amp;All</translation>
     </message>

From 8217bd1d4cb9415dd507739b9040714677f9e8e8 Mon Sep 17 00:00:00 2001
From: fanquake <fanquake@gmail.com>
Date: Wed, 4 Jan 2017 22:00:26 +0800
Subject: [PATCH 1461/1802] [depends] libevent 2.1.7rc

---
 depends/packages/libevent.mk                  | 12 +++++------
 .../patches/libevent/libevent-2-fixes.patch   | 18 ----------------
 depends/patches/libevent/reuseaddr.patch      | 21 -------------------
 3 files changed, 5 insertions(+), 46 deletions(-)
 delete mode 100644 depends/patches/libevent/libevent-2-fixes.patch
 delete mode 100644 depends/patches/libevent/reuseaddr.patch

diff --git a/depends/packages/libevent.mk b/depends/packages/libevent.mk
index 4b02b2eff9eb4..70f345e71dfbb 100644
--- a/depends/packages/libevent.mk
+++ b/depends/packages/libevent.mk
@@ -1,13 +1,11 @@
 package=libevent
-$(package)_version=2.0.22
-$(package)_download_path=https://github.com/libevent/libevent/releases/download/release-2.0.22-stable
-$(package)_file_name=$(package)-$($(package)_version)-stable.tar.gz
-$(package)_sha256_hash=71c2c49f0adadacfdbe6332a372c38cf9c8b7895bb73dabeaa53cdcc1d4e1fa3
-$(package)_patches=reuseaddr.patch libevent-2-fixes.patch
+$(package)_version=2.1.7
+$(package)_download_path=https://github.com/libevent/libevent/archive/
+$(package)_file_name=release-$($(package)_version)-rc.tar.gz
+$(package)_sha256_hash=548362d202e22fe24d4c3fad38287b4f6d683e6c21503341373b89785fa6f991
 
 define $(package)_preprocess_cmds
-  patch -p1 < $($(package)_patch_dir)/reuseaddr.patch && \
-  patch -p1 < $($(package)_patch_dir)/libevent-2-fixes.patch
+  ./autogen.sh
 endef
 
 define $(package)_set_vars
diff --git a/depends/patches/libevent/libevent-2-fixes.patch b/depends/patches/libevent/libevent-2-fixes.patch
deleted file mode 100644
index 79fec8a48851c..0000000000000
--- a/depends/patches/libevent/libevent-2-fixes.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/util-internal.h	2013-11-01 12:18:57.000000000 -0600
-+++ b/util-internal.h	2015-07-20 20:19:43.199560900 -0500
-@@ -299,8 +299,13 @@ HANDLE evutil_load_windows_system_librar
- 
- #if defined(__STDC__) && defined(__STDC_VERSION__)
- #if (__STDC_VERSION__ >= 199901L)
--#define EV_SIZE_FMT "%zu"
--#define EV_SSIZE_FMT "%zd"
-+ #if defined(_MSC_VER) || defined(__MINGW32__) || defined(__MINGW64__)
-+  #define EV_SIZE_FMT "%Iu"
-+  #define EV_SSIZE_FMT "%Id"
-+ #else
-+  #define EV_SIZE_FMT "%zu"
-+  #define EV_SSIZE_FMT "%zd"
-+ #endif
- #define EV_SIZE_ARG(x) (x)
- #define EV_SSIZE_ARG(x) (x)
- #endif
diff --git a/depends/patches/libevent/reuseaddr.patch b/depends/patches/libevent/reuseaddr.patch
deleted file mode 100644
index 58695c11f5d97..0000000000000
--- a/depends/patches/libevent/reuseaddr.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- old/evutil.c   2015-08-28 19:26:23.488765923 -0400
-+++ new/evutil.c   2015-08-28 19:27:41.392767019 -0400
-@@ -321,15 +321,16 @@
- int
- evutil_make_listen_socket_reuseable(evutil_socket_t sock)
- {
--#ifndef WIN32
- 	int one = 1;
-+#ifndef WIN32
- 	/* REUSEADDR on Unix means, "don't hang on to this address after the
- 	 * listener is closed."  On Windows, though, it means "don't keep other
- 	 * processes from binding to this address while we're using it. */
- 	return setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, (void*) &one,
- 	    (ev_socklen_t)sizeof(one));
- #else
--	return 0;
-+	return setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, (const char*) &one,
-+		(ev_socklen_t)sizeof(one));
- #endif
- }
- 

From 53ad9a133a53feb35e31698720cec69c14f56dc1 Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Sat, 31 Dec 2016 02:05:05 -0500
Subject: [PATCH 1462/1802] net: fix typo causing the wrong receive buffer size

Surprisingly this hasn't been causing me any issues while testing, probably
because it requires lots of large blocks to be flying around.

Send/Recv corks need tests!
---
 src/net.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/net.cpp b/src/net.cpp
index bf2beb7740e00..e7c7cf011c19e 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -2102,7 +2102,7 @@ bool CConnman::Start(CScheduler& scheduler, std::string& strNodeError, Options c
     nMaxFeeler = connOptions.nMaxFeeler;
 
     nSendBufferMaxSize = connOptions.nSendBufferMaxSize;
-    nReceiveFloodSize = connOptions.nSendBufferMaxSize;
+    nReceiveFloodSize = connOptions.nReceiveFloodSize;
 
     nMaxOutboundLimit = connOptions.nMaxOutboundLimit;
     nMaxOutboundTimeframe = connOptions.nMaxOutboundTimeframe;

From e5bcd9c84fd3107321ff6dbdef067ba03f2b43cb Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Sat, 31 Dec 2016 02:05:07 -0500
Subject: [PATCH 1463/1802] net: make vRecvMsg a list so that we can use
 splice()

---
 src/net.cpp            | 2 +-
 src/net.h              | 2 +-
 src/net_processing.cpp | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/net.cpp b/src/net.cpp
index e7c7cf011c19e..3478d04a7ef22 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -1859,7 +1859,7 @@ void CConnman::ThreadMessageHandler()
 
                     if (pnode->nSendSize < GetSendBufferSize())
                     {
-                        if (!pnode->vRecvGetData.empty() || (!pnode->vRecvMsg.empty() && pnode->vRecvMsg[0].complete()))
+                        if (!pnode->vRecvGetData.empty() || (!pnode->vRecvMsg.empty() && pnode->vRecvMsg.front().complete()))
                         {
                             fSleep = false;
                         }
diff --git a/src/net.h b/src/net.h
index 6ca402f71d416..f346b07357a1d 100644
--- a/src/net.h
+++ b/src/net.h
@@ -605,7 +605,7 @@ class CNode
     CCriticalSection cs_vSend;
 
     std::deque<CInv> vRecvGetData;
-    std::deque<CNetMessage> vRecvMsg;
+    std::list<CNetMessage> vRecvMsg;
     CCriticalSection cs_vRecvMsg;
     uint64_t nRecvBytes;
     int nRecvVersion;
diff --git a/src/net_processing.cpp b/src/net_processing.cpp
index ccfbb77fcd4eb..f53a4b26364c8 100644
--- a/src/net_processing.cpp
+++ b/src/net_processing.cpp
@@ -2471,7 +2471,7 @@ bool ProcessMessages(CNode* pfrom, CConnman& connman, std::atomic<bool>& interru
     // this maintains the order of responses
     if (!pfrom->vRecvGetData.empty()) return fOk;
 
-    std::deque<CNetMessage>::iterator it = pfrom->vRecvMsg.begin();
+    auto it = pfrom->vRecvMsg.begin();
     while (!pfrom->fDisconnect && it != pfrom->vRecvMsg.end()) {
         // Don't bother if send buffer is too full to respond anyway
         if (pfrom->nSendSize >= nMaxSendBufferSize)

From 5b4a8ac6d6b4d8e17b448f2b4927025fb352f7af Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Sat, 31 Dec 2016 02:05:09 -0500
Subject: [PATCH 1464/1802] net: make GetReceiveFloodSize public

This will be needed so that the message processor can cork incoming messages
---
 src/net.h | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/net.h b/src/net.h
index f346b07357a1d..a11165c7e37ff 100644
--- a/src/net.h
+++ b/src/net.h
@@ -324,6 +324,7 @@ class CConnman
     /** Get a unique deterministic randomizer. */
     CSipHasher GetDeterministicRandomizer(uint64_t id);
 
+    unsigned int GetReceiveFloodSize() const;
 private:
     struct ListenSocket {
         SOCKET socket;
@@ -365,8 +366,6 @@ class CConnman
     void DumpData();
     void DumpBanlist();
 
-    unsigned int GetReceiveFloodSize() const;
-
     // Network stats
     void RecordBytesRecv(uint64_t bytes);
     void RecordBytesSent(uint64_t bytes);

From f6315e07f9383f3f43e37ada0d6a835810d610b9 Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Sat, 31 Dec 2016 02:05:11 -0500
Subject: [PATCH 1465/1802] net: only disconnect if fDisconnect has been set

These conditions are problematic to check without locking, and we shouldn't be
relying on the refcount to disconnect.
---
 src/net.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/net.cpp b/src/net.cpp
index 3478d04a7ef22..65f1c62ad6f4c 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -1051,8 +1051,7 @@ void CConnman::ThreadSocketHandler()
             std::vector<CNode*> vNodesCopy = vNodes;
             BOOST_FOREACH(CNode* pnode, vNodesCopy)
             {
-                if (pnode->fDisconnect ||
-                    (pnode->GetRefCount() <= 0 && pnode->vRecvMsg.empty() && pnode->nSendSize == 0))
+                if (pnode->fDisconnect)
                 {
                     // remove from vNodes
                     vNodes.erase(remove(vNodes.begin(), vNodes.end(), pnode), vNodes.end());

From 60425870d78cf2bef1fce926ad53f51166c6a3f0 Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Sat, 31 Dec 2016 02:05:13 -0500
Subject: [PATCH 1466/1802] net: wait until the node is destroyed to delete its
 recv buffer

when vRecvMsg becomes a private buffer, it won't make sense to allow other
threads to mess with it anymore.
---
 src/net.cpp | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/net.cpp b/src/net.cpp
index 65f1c62ad6f4c..9ce7475bc52e5 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -437,11 +437,6 @@ void CNode::CloseSocketDisconnect()
         LogPrint("net", "disconnecting peer=%d\n", id);
         CloseSocket(hSocket);
     }
-
-    // in case this fails, we'll empty the recv buffer when the CNode is deleted
-    TRY_LOCK(cs_vRecvMsg, lockRecv);
-    if (lockRecv)
-        vRecvMsg.clear();
 }
 
 void CConnman::ClearBanned()

From 0e973d970a2114c11f4a95f09721d977da7f0a94 Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Wed, 4 Jan 2017 09:32:29 -0500
Subject: [PATCH 1467/1802] net: remove redundant max sendbuffer size check

This is left-over from before there was proper accounting. Hitting 2x the
sendbuffer size should not be possible.
---
 src/net_processing.cpp | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/src/net_processing.cpp b/src/net_processing.cpp
index f53a4b26364c8..3d38995c50419 100644
--- a/src/net_processing.cpp
+++ b/src/net_processing.cpp
@@ -1059,8 +1059,6 @@ uint32_t GetFetchFlags(CNode* pfrom, CBlockIndex* pprev, const Consensus::Params
 
 bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv, int64_t nTimeReceived, const CChainParams& chainparams, CConnman& connman, std::atomic<bool>& interruptMsgProc)
 {
-    unsigned int nMaxSendBufferSize = connman.GetSendBufferSize();
-
     LogPrint("net", "received: %s (%u bytes) peer=%d\n", SanitizeString(strCommand), vRecv.size(), pfrom->id);
     if (IsArgSet("-dropmessagestest") && GetRand(GetArg("-dropmessagestest", 0)) == 0)
     {
@@ -1413,11 +1411,6 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
 
             // Track requests for our stuff
             GetMainSignals().Inventory(inv.hash);
-
-            if (pfrom->nSendSize > (nMaxSendBufferSize * 2)) {
-                Misbehaving(pfrom->GetId(), 50);
-                return error("send buffer size() = %u", pfrom->nSendSize);
-            }
         }
 
         if (!vToFetch.empty())

From 56212e20acf1534d443cb910c9bf3a30f84d0f02 Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Sat, 31 Dec 2016 02:05:15 -0500
Subject: [PATCH 1468/1802] net: set message deserialization version when it's
 actually time to deserialize

We'll soon no longer have access to vRecvMsg, and this is more intuitive anyway.
---
 src/net.cpp            | 2 +-
 src/net.h              | 9 +++++----
 src/net_processing.cpp | 1 +
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/net.cpp b/src/net.cpp
index 9ce7475bc52e5..6d9971a0f1536 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -653,7 +653,7 @@ bool CNode::ReceiveMsgBytes(const char *pch, unsigned int nBytes, bool& complete
         // get current incomplete message, or create a new one
         if (vRecvMsg.empty() ||
             vRecvMsg.back().complete())
-            vRecvMsg.push_back(CNetMessage(Params().MessageStart(), SER_NETWORK, nRecvVersion));
+            vRecvMsg.push_back(CNetMessage(Params().MessageStart(), SER_NETWORK, INIT_PROTO_VERSION));
 
         CNetMessage& msg = vRecvMsg.back();
 
diff --git a/src/net.h b/src/net.h
index a11165c7e37ff..6c12171bf2879 100644
--- a/src/net.h
+++ b/src/net.h
@@ -607,7 +607,7 @@ class CNode
     std::list<CNetMessage> vRecvMsg;
     CCriticalSection cs_vRecvMsg;
     uint64_t nRecvBytes;
-    int nRecvVersion;
+    std::atomic<int> nRecvVersion;
 
     int64_t nLastSend;
     int64_t nLastRecv;
@@ -747,12 +747,13 @@ class CNode
     // requires LOCK(cs_vRecvMsg)
     bool ReceiveMsgBytes(const char *pch, unsigned int nBytes, bool& complete);
 
-    // requires LOCK(cs_vRecvMsg)
     void SetRecvVersion(int nVersionIn)
     {
         nRecvVersion = nVersionIn;
-        BOOST_FOREACH(CNetMessage &msg, vRecvMsg)
-            msg.SetVersion(nVersionIn);
+    }
+    int GetRecvVersion()
+    {
+        return nRecvVersion;
     }
     void SetSendVersion(int nVersionIn)
     {
diff --git a/src/net_processing.cpp b/src/net_processing.cpp
index 3d38995c50419..556975d142572 100644
--- a/src/net_processing.cpp
+++ b/src/net_processing.cpp
@@ -2485,6 +2485,7 @@ bool ProcessMessages(CNode* pfrom, CConnman& connman, std::atomic<bool>& interru
         // at this point, any failure means we can delete the current message
         it++;
 
+        msg.SetVersion(pfrom->GetRecvVersion());
         // Scan for message start
         if (memcmp(msg.hdr.pchMessageStart, chainparams.MessageStart(), CMessageHeader::MESSAGE_START_SIZE) != 0) {
             LogPrintf("PROCESSMESSAGE: INVALID MESSAGESTART %s peer=%d\n", SanitizeString(msg.hdr.GetCommand()), pfrom->id);

From b50cd7a67e71051db59199a4185e7c82b669c659 Mon Sep 17 00:00:00 2001
From: Alex Morcos <morcos@chaincode.com>
Date: Mon, 7 Nov 2016 15:30:41 -0500
Subject: [PATCH 1469/1802] Fix dangerous condition in ModifyNewCoins.

We were marking coins FRESH before being sure they were not overwriting dirty undo data. This condition was never reached in existing code because undo data was always flushed before UpdateCoins was called with new transactions, but could have been exposed in an otherwise safe refactor.
Clarify in the comments the assumptions made in ModifyNewCoins.
Add ability to undo transactions to UpdateCoins unit test.
Thanks to Russ Yanofsky for suggestion on how to make logic clearer and fixing up the ccoins_modify_new test cases.
---
 src/coins.cpp            |  37 ++++++--
 src/coins.h              |   5 +
 src/test/coins_tests.cpp | 199 ++++++++++++++++++++++++++++-----------
 src/validation.cpp       |   2 +-
 4 files changed, 181 insertions(+), 62 deletions(-)

diff --git a/src/coins.cpp b/src/coins.cpp
index 8ff652b474bc8..fe474fdda28f9 100644
--- a/src/coins.cpp
+++ b/src/coins.cpp
@@ -117,17 +117,37 @@ CCoinsModifier CCoinsViewCache::ModifyCoins(const uint256 &txid) {
     return CCoinsModifier(*this, ret.first, cachedCoinUsage);
 }
 
-// ModifyNewCoins has to know whether the new outputs its creating are for a
-// coinbase or not.  If they are for a coinbase, it can not mark them as fresh.
-// This is to ensure that the historical duplicate coinbases before BIP30 was
-// in effect will still be properly overwritten when spent.
+/* ModifyNewCoins allows for faster coin modification when creating the new
+ * outputs from a transaction.  It assumes that BIP 30 (no duplicate txids)
+ * applies and has already been tested for (or the test is not required due to
+ * BIP 34, height in coinbase).  If we can assume BIP 30 then we know that any
+ * non-coinbase transaction we are adding to the UTXO must not already exist in
+ * the utxo unless it is fully spent.  Thus we can check only if it exists DIRTY
+ * at the current level of the cache, in which case it is not safe to mark it
+ * FRESH (b/c then its spentness still needs to flushed).  If it's not dirty and
+ * doesn't exist or is pruned in the current cache, we know it either doesn't
+ * exist or is pruned in parent caches, which is the definition of FRESH.  The
+ * exception to this is the two historical violations of BIP 30 in the chain,
+ * both of which were coinbases.  We do not mark these fresh so we we can ensure
+ * that they will still be properly overwritten when spent.
+ */
 CCoinsModifier CCoinsViewCache::ModifyNewCoins(const uint256 &txid, bool coinbase) {
     assert(!hasModifier);
     std::pair<CCoinsMap::iterator, bool> ret = cacheCoins.insert(std::make_pair(txid, CCoinsCacheEntry()));
-    ret.first->second.coins.Clear();
     if (!coinbase) {
-        ret.first->second.flags = CCoinsCacheEntry::FRESH;
+        // New coins must not already exist.
+        if (!ret.first->second.coins.IsPruned())
+            throw std::logic_error("ModifyNewCoins should not find pre-existing coins on a non-coinbase unless they are pruned!");
+
+        if (!(ret.first->second.flags & CCoinsCacheEntry::DIRTY)) {
+            // If the coin is known to be pruned (have no unspent outputs) in
+            // the current view and the cache entry is not dirty, we know the
+            // coin also must be pruned in the parent view as well, so it is safe
+            // to mark this fresh.
+            ret.first->second.flags |= CCoinsCacheEntry::FRESH;
+        }
     }
+    ret.first->second.coins.Clear();
     ret.first->second.flags |= CCoinsCacheEntry::DIRTY;
     return CCoinsModifier(*this, ret.first, 0);
 }
@@ -200,6 +220,11 @@ bool CCoinsViewCache::BatchWrite(CCoinsMap &mapCoins, const uint256 &hashBlockIn
                     itUs->second.coins.swap(it->second.coins);
                     cachedCoinsUsage += itUs->second.coins.DynamicMemoryUsage();
                     itUs->second.flags |= CCoinsCacheEntry::DIRTY;
+                    // NOTE: It is possible the child has a FRESH flag here in
+                    // the event the entry we found in the parent is pruned. But
+                    // we must not copy that FRESH flag to the parent as that
+                    // pruned state likely still needs to be communicated to the
+                    // grandparent.
                 }
             }
         }
diff --git a/src/coins.h b/src/coins.h
index dd6ef6cc3a9a1..624460635631e 100644
--- a/src/coins.h
+++ b/src/coins.h
@@ -269,6 +269,11 @@ struct CCoinsCacheEntry
     enum Flags {
         DIRTY = (1 << 0), // This cache entry is potentially different from the version in the parent view.
         FRESH = (1 << 1), // The parent view does not have this entry (or it is pruned).
+        /* Note that FRESH is a performance optimization with which we can
+         * erase coins that are fully spent if we know we do not need to
+         * flush the changes to the parent cache.  It is always safe to
+         * not mark FRESH if that condition is not guaranteed.
+         */
     };
 
     CCoinsCacheEntry() : coins(), flags(0) {}
diff --git a/src/test/coins_tests.cpp b/src/test/coins_tests.cpp
index 09fe0bf158881..94a11d17683aa 100644
--- a/src/test/coins_tests.cpp
+++ b/src/test/coins_tests.cpp
@@ -5,6 +5,7 @@
 #include "coins.h"
 #include "script/standard.h"
 #include "uint256.h"
+#include "undo.h"
 #include "utilstrencodings.h"
 #include "test/test_bitcoin.h"
 #include "test/test_random.h"
@@ -16,6 +17,9 @@
 
 #include <boost/test/unit_test.hpp>
 
+bool ApplyTxInUndo(const CTxInUndo& undo, CCoinsViewCache& view, const COutPoint& out);
+void UpdateCoins(const CTransaction& tx, CCoinsViewCache& inputs, CTxUndo &txundo, int nHeight);
+
 namespace
 {
 class CCoinsViewTest : public CCoinsView
@@ -213,6 +217,22 @@ BOOST_AUTO_TEST_CASE(coins_cache_simulation_test)
     BOOST_CHECK(missed_an_entry);
 }
 
+typedef std::tuple<CTransaction,CTxUndo,CCoins> TxData;
+// Store of all necessary tx and undo data for next test
+std::map<uint256, TxData> alltxs;
+
+TxData &FindRandomFrom(const std::set<uint256> &txidset) {
+    assert(txidset.size());
+    std::set<uint256>::iterator txIt = txidset.lower_bound(GetRandHash());
+    if (txIt == txidset.end()) {
+        txIt = txidset.begin();
+    }
+    std::map<uint256, TxData>::iterator txdit = alltxs.find(*txIt);
+    assert(txdit != alltxs.end());
+    return txdit->second;
+}
+
+
 // This test is similar to the previous test
 // except the emphasis is on testing the functionality of UpdateCoins
 // random txs are created and UpdateCoins is used to update the cache stack
@@ -229,77 +249,139 @@ BOOST_AUTO_TEST_CASE(updatecoins_simulation_test)
     std::vector<CCoinsViewCacheTest*> stack; // A stack of CCoinsViewCaches on top.
     stack.push_back(new CCoinsViewCacheTest(&base)); // Start with one cache.
 
-    // Track the txids we've used and whether they have been spent or not
-    std::map<uint256, CAmount> coinbaseids;
-    std::set<uint256> alltxids;
+    // Track the txids we've used in various sets
+    std::set<uint256> coinbaseids;
+    std::set<uint256> disconnectedids;
     std::set<uint256> duplicateids;
+    std::set<uint256> utxoset;
 
     for (unsigned int i = 0; i < NUM_SIMULATION_ITERATIONS; i++) {
-        {
+        uint32_t randiter = insecure_rand();
+
+        // 19/20 txs add a new transaction
+        if (randiter % 20 < 19) {
             CMutableTransaction tx;
             tx.vin.resize(1);
             tx.vout.resize(1);
             tx.vout[0].nValue = i; //Keep txs unique unless intended to duplicate
             unsigned int height = insecure_rand();
+            CCoins oldcoins;
 
-            // 1/10 times create a coinbase
-            if (insecure_rand() % 10 == 0 || coinbaseids.size() < 10) {
-                // 1/100 times create a duplicate coinbase
+            // 2/20 times create a new coinbase
+            if (randiter % 20 < 2 || coinbaseids.size() < 10) {
+                // 1/10 of those times create a duplicate coinbase
                 if (insecure_rand() % 10 == 0 && coinbaseids.size()) {
-                    std::map<uint256, CAmount>::iterator coinbaseIt = coinbaseids.lower_bound(GetRandHash());
-                    if (coinbaseIt == coinbaseids.end()) {
-                        coinbaseIt = coinbaseids.begin();
-                    }
-                    //Use same random value to have same hash and be a true duplicate
-                    tx.vout[0].nValue = coinbaseIt->second;
-                    assert(tx.GetHash() == coinbaseIt->first);
-                    duplicateids.insert(coinbaseIt->first);
+                    TxData &txd = FindRandomFrom(coinbaseids);
+                    // Reuse the exact same coinbase
+                    tx = std::get<0>(txd);
+                    // shouldn't be available for reconnection if its been duplicated
+                    disconnectedids.erase(tx.GetHash());
+
+                    duplicateids.insert(tx.GetHash());
                 }
                 else {
-                    coinbaseids[tx.GetHash()] = tx.vout[0].nValue;
+                    coinbaseids.insert(tx.GetHash());
                 }
                 assert(CTransaction(tx).IsCoinBase());
             }
-            // 9/10 times create a regular tx
+
+            // 17/20 times reconnect previous or add a regular tx
             else {
+
                 uint256 prevouthash;
-                // equally likely to spend coinbase or non coinbase
-                std::set<uint256>::iterator txIt = alltxids.lower_bound(GetRandHash());
-                if (txIt == alltxids.end()) {
-                    txIt = alltxids.begin();
+                // 1/20 times reconnect a previously disconnected tx
+                if (randiter % 20 == 2 && disconnectedids.size()) {
+                    TxData &txd = FindRandomFrom(disconnectedids);
+                    tx = std::get<0>(txd);
+                    prevouthash = tx.vin[0].prevout.hash;
+                    if (!CTransaction(tx).IsCoinBase() && !utxoset.count(prevouthash)) {
+                        disconnectedids.erase(tx.GetHash());
+                        continue;
+                    }
+
+                    // If this tx is already IN the UTXO, then it must be a coinbase, and it must be a duplicate
+                    if (utxoset.count(tx.GetHash())) {
+                        assert(CTransaction(tx).IsCoinBase());
+                        assert(duplicateids.count(tx.GetHash()));
+                    }
+                    disconnectedids.erase(tx.GetHash());
                 }
-                prevouthash = *txIt;
 
-                // Construct the tx to spend the coins of prevouthash
-                tx.vin[0].prevout.hash = prevouthash;
-                tx.vin[0].prevout.n = 0;
+                // 16/20 times create a regular tx
+                else {
+                    TxData &txd = FindRandomFrom(utxoset);
+                    prevouthash = std::get<0>(txd).GetHash();
 
+                    // Construct the tx to spend the coins of prevouthash
+                    tx.vin[0].prevout.hash = prevouthash;
+                    tx.vin[0].prevout.n = 0;
+                    assert(!CTransaction(tx).IsCoinBase());
+                }
+                // In this simple test coins only have two states, spent or unspent, save the unspent state to restore
+                oldcoins = result[prevouthash];
                 // Update the expected result of prevouthash to know these coins are spent
-                CCoins& oldcoins = result[prevouthash];
-                oldcoins.Clear();
+                result[prevouthash].Clear();
 
-                // It is of particular importance here that once we spend a coinbase tx hash
-                // it is no longer available to be duplicated (or spent again)
-                // BIP 34 in conjunction with enforcing BIP 30 (at least until BIP 34 was active)
-                // results in the fact that no coinbases were duplicated after they were already spent
-                alltxids.erase(prevouthash);
-                coinbaseids.erase(prevouthash);
+                utxoset.erase(prevouthash);
 
                 // The test is designed to ensure spending a duplicate coinbase will work properly
                 // if that ever happens and not resurrect the previously overwritten coinbase
                 if (duplicateids.count(prevouthash))
                     spent_a_duplicate_coinbase = true;
 
-                assert(!CTransaction(tx).IsCoinBase());
             }
-            // Track this tx to possibly spend later
-            alltxids.insert(tx.GetHash());
-
             // Update the expected result to know about the new output coins
-            CCoins &coins = result[tx.GetHash()];
-            coins.FromTx(tx, height);
+            result[tx.GetHash()].FromTx(tx, height);
+
+            // Call UpdateCoins on the top cache
+            CTxUndo undo;
+            UpdateCoins(tx, *(stack.back()), undo, height);
 
-            UpdateCoins(tx, *(stack.back()), height);
+            // Update the utxo set for future spends
+            utxoset.insert(tx.GetHash());
+
+            // Track this tx and undo info to use later
+            alltxs.insert(std::make_pair(tx.GetHash(),std::make_tuple(tx,undo,oldcoins)));
+        }
+
+        //1/20 times undo a previous transaction
+        else if (utxoset.size()) {
+            TxData &txd = FindRandomFrom(utxoset);
+
+            CTransaction &tx = std::get<0>(txd);
+            CTxUndo &undo = std::get<1>(txd);
+            CCoins &origcoins = std::get<2>(txd);
+
+            uint256 undohash = tx.GetHash();
+
+            // Update the expected result
+            // Remove new outputs
+            result[undohash].Clear();
+            // If not coinbase restore prevout
+            if (!tx.IsCoinBase()) {
+                result[tx.vin[0].prevout.hash] = origcoins;
+            }
+
+            // Disconnect the tx from the current UTXO
+            // See code in DisconnectBlock
+            // remove outputs
+            {
+                CCoinsModifier outs = stack.back()->ModifyCoins(undohash);
+                outs->Clear();
+            }
+            // restore inputs
+            if (!tx.IsCoinBase()) {
+                const COutPoint &out = tx.vin[0].prevout;
+                const CTxInUndo &undoin = undo.vprevout[0];
+                ApplyTxInUndo(undoin, *(stack.back()), out);
+            }
+            // Store as a candidate for reconnection
+            disconnectedids.insert(undohash);
+
+            // Update the utxoset
+            utxoset.erase(undohash);
+            if (!tx.IsCoinBase())
+                utxoset.insert(tx.vin[0].prevout.hash);
         }
 
         // Once every 1000 iterations and at the end, verify the full cache.
@@ -308,9 +390,9 @@ BOOST_AUTO_TEST_CASE(updatecoins_simulation_test)
                 const CCoins* coins = stack.back()->AccessCoins(it->first);
                 if (coins) {
                     BOOST_CHECK(*coins == it->second);
-                 } else {
+                } else {
                     BOOST_CHECK(it->second.IsPruned());
-                 }
+                }
             }
         }
 
@@ -334,7 +416,7 @@ BOOST_AUTO_TEST_CASE(updatecoins_simulation_test)
                     tip = stack.back();
                 }
                 stack.push_back(new CCoinsViewCacheTest(tip));
-           }
+            }
         }
     }
 
@@ -420,6 +502,7 @@ BOOST_AUTO_TEST_CASE(ccoins_serialization)
 const static uint256 TXID;
 const static CAmount PRUNED = -1;
 const static CAmount ABSENT = -2;
+const static CAmount FAIL = -3;
 const static CAmount VALUE1 = 100;
 const static CAmount VALUE2 = 200;
 const static CAmount VALUE3 = 300;
@@ -630,11 +713,17 @@ BOOST_AUTO_TEST_CASE(ccoins_modify)
 void CheckModifyNewCoinsBase(CAmount base_value, CAmount cache_value, CAmount modify_value, CAmount expected_value, char cache_flags, char expected_flags, bool coinbase)
 {
     SingleEntryCacheTest test(base_value, cache_value, cache_flags);
-    SetCoinsValue(modify_value, *test.cache.ModifyNewCoins(TXID, coinbase));
 
     CAmount result_value;
     char result_flags;
-    GetCoinsMapEntry(test.cache.map(), result_value, result_flags);
+    try {
+        SetCoinsValue(modify_value, *test.cache.ModifyNewCoins(TXID, coinbase));
+        GetCoinsMapEntry(test.cache.map(), result_value, result_flags);
+    } catch (std::logic_error& e) {
+        result_value = FAIL;
+        result_flags = NO_ENTRY;
+    }
+
     BOOST_CHECK_EQUAL(result_value, expected_value);
     BOOST_CHECK_EQUAL(result_flags, expected_flags);
 }
@@ -669,7 +758,7 @@ BOOST_AUTO_TEST_CASE(ccoins_modify_new)
     CheckModifyNewCoins(PRUNED, PRUNED, PRUNED, 0          , DIRTY      , true );
     CheckModifyNewCoins(PRUNED, PRUNED, ABSENT, FRESH      , NO_ENTRY   , false);
     CheckModifyNewCoins(PRUNED, PRUNED, ABSENT, FRESH      , NO_ENTRY   , true );
-    CheckModifyNewCoins(PRUNED, PRUNED, ABSENT, DIRTY      , NO_ENTRY   , false);
+    CheckModifyNewCoins(PRUNED, PRUNED, PRUNED, DIRTY      , DIRTY      , false);
     CheckModifyNewCoins(PRUNED, PRUNED, PRUNED, DIRTY      , DIRTY      , true );
     CheckModifyNewCoins(PRUNED, PRUNED, ABSENT, DIRTY|FRESH, NO_ENTRY   , false);
     CheckModifyNewCoins(PRUNED, PRUNED, ABSENT, DIRTY|FRESH, NO_ENTRY   , true );
@@ -677,25 +766,25 @@ BOOST_AUTO_TEST_CASE(ccoins_modify_new)
     CheckModifyNewCoins(PRUNED, VALUE3, VALUE3, 0          , DIRTY      , true );
     CheckModifyNewCoins(PRUNED, VALUE3, VALUE3, FRESH      , DIRTY|FRESH, false);
     CheckModifyNewCoins(PRUNED, VALUE3, VALUE3, FRESH      , DIRTY|FRESH, true );
-    CheckModifyNewCoins(PRUNED, VALUE3, VALUE3, DIRTY      , DIRTY|FRESH, false);
+    CheckModifyNewCoins(PRUNED, VALUE3, VALUE3, DIRTY      , DIRTY      , false);
     CheckModifyNewCoins(PRUNED, VALUE3, VALUE3, DIRTY      , DIRTY      , true );
     CheckModifyNewCoins(PRUNED, VALUE3, VALUE3, DIRTY|FRESH, DIRTY|FRESH, false);
     CheckModifyNewCoins(PRUNED, VALUE3, VALUE3, DIRTY|FRESH, DIRTY|FRESH, true );
-    CheckModifyNewCoins(VALUE2, PRUNED, ABSENT, 0          , NO_ENTRY   , false);
+    CheckModifyNewCoins(VALUE2, PRUNED, FAIL  , 0          , NO_ENTRY   , false);
     CheckModifyNewCoins(VALUE2, PRUNED, PRUNED, 0          , DIRTY      , true );
-    CheckModifyNewCoins(VALUE2, PRUNED, ABSENT, FRESH      , NO_ENTRY   , false);
+    CheckModifyNewCoins(VALUE2, PRUNED, FAIL  , FRESH      , NO_ENTRY   , false);
     CheckModifyNewCoins(VALUE2, PRUNED, ABSENT, FRESH      , NO_ENTRY   , true );
-    CheckModifyNewCoins(VALUE2, PRUNED, ABSENT, DIRTY      , NO_ENTRY   , false);
+    CheckModifyNewCoins(VALUE2, PRUNED, FAIL  , DIRTY      , NO_ENTRY   , false);
     CheckModifyNewCoins(VALUE2, PRUNED, PRUNED, DIRTY      , DIRTY      , true );
-    CheckModifyNewCoins(VALUE2, PRUNED, ABSENT, DIRTY|FRESH, NO_ENTRY   , false);
+    CheckModifyNewCoins(VALUE2, PRUNED, FAIL  , DIRTY|FRESH, NO_ENTRY   , false);
     CheckModifyNewCoins(VALUE2, PRUNED, ABSENT, DIRTY|FRESH, NO_ENTRY   , true );
-    CheckModifyNewCoins(VALUE2, VALUE3, VALUE3, 0          , DIRTY|FRESH, false);
+    CheckModifyNewCoins(VALUE2, VALUE3, FAIL  , 0          , NO_ENTRY   , false);
     CheckModifyNewCoins(VALUE2, VALUE3, VALUE3, 0          , DIRTY      , true );
-    CheckModifyNewCoins(VALUE2, VALUE3, VALUE3, FRESH      , DIRTY|FRESH, false);
+    CheckModifyNewCoins(VALUE2, VALUE3, FAIL  , FRESH      , NO_ENTRY   , false);
     CheckModifyNewCoins(VALUE2, VALUE3, VALUE3, FRESH      , DIRTY|FRESH, true );
-    CheckModifyNewCoins(VALUE2, VALUE3, VALUE3, DIRTY      , DIRTY|FRESH, false);
+    CheckModifyNewCoins(VALUE2, VALUE3, FAIL  , DIRTY      , NO_ENTRY   , false);
     CheckModifyNewCoins(VALUE2, VALUE3, VALUE3, DIRTY      , DIRTY      , true );
-    CheckModifyNewCoins(VALUE2, VALUE3, VALUE3, DIRTY|FRESH, DIRTY|FRESH, false);
+    CheckModifyNewCoins(VALUE2, VALUE3, FAIL  , DIRTY|FRESH, NO_ENTRY   , false);
     CheckModifyNewCoins(VALUE2, VALUE3, VALUE3, DIRTY|FRESH, DIRTY|FRESH, true );
 }
 
diff --git a/src/validation.cpp b/src/validation.cpp
index bd60bbfdcdd5b..744c228bb76b5 100644
--- a/src/validation.cpp
+++ b/src/validation.cpp
@@ -1498,7 +1498,7 @@ bool AbortNode(CValidationState& state, const std::string& strMessage, const std
  * @param out The out point that corresponds to the tx input.
  * @return True on success.
  */
-static bool ApplyTxInUndo(const CTxInUndo& undo, CCoinsViewCache& view, const COutPoint& out)
+bool ApplyTxInUndo(const CTxInUndo& undo, CCoinsViewCache& view, const COutPoint& out)
 {
     bool fClean = true;
 

From ce370c1811d25af629a28b56db4e8da6f899bdcf Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Wed, 4 Jan 2017 08:38:40 -0800
Subject: [PATCH 1470/1802] Mark the minconf parameter to move as ignored

---
 src/wallet/rpcwallet.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index 11d69ac194421..936140cf441fa 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -757,7 +757,7 @@ UniValue movecmd(const JSONRPCRequest& request)
             "1. \"fromaccount\"   (string, required) The name of the account to move funds from. May be the default account using \"\".\n"
             "2. \"toaccount\"     (string, required) The name of the account to move funds to. May be the default account using \"\".\n"
             "3. amount            (numeric) Quantity of " + CURRENCY_UNIT + " to move between accounts.\n"
-            "4. minconf           (numeric, optional, default=1) Only use funds with at least this many confirmations.\n"
+            "4. (dummy)           (numeric, optional) Ignored. Remains for backward compatibility.\n"
             "5. \"comment\"       (string, optional) An optional comment, stored in the wallet only.\n"
             "\nResult:\n"
             "true|false           (boolean) true if successful.\n"

From 4df44794c9f71d47648e858385d37eae6d0a9db3 Mon Sep 17 00:00:00 2001
From: Alex Morcos <morcos@chaincode.com>
Date: Thu, 10 Nov 2016 14:16:42 -0500
Subject: [PATCH 1471/1802] Remove extraneous LogPrint from fee estimation

Once priority estimation was removed, not all transactions in the mempool are tracked in the fee estimation mempool tracking.  So there is no error if a transaction is not found for removal.
---
 src/policy/fees.cpp | 17 +++++++----------
 src/policy/fees.h   |  2 +-
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/src/policy/fees.cpp b/src/policy/fees.cpp
index a1b785e3e7456..52d0e5c5e5eb0 100644
--- a/src/policy/fees.cpp
+++ b/src/policy/fees.cpp
@@ -281,19 +281,16 @@ void TxConfirmStats::removeTx(unsigned int entryHeight, unsigned int nBestSeenHe
     }
 }
 
-void CBlockPolicyEstimator::removeTx(uint256 hash)
+bool CBlockPolicyEstimator::removeTx(uint256 hash)
 {
     std::map<uint256, TxStatsInfo>::iterator pos = mapMemPoolTxs.find(hash);
-    if (pos == mapMemPoolTxs.end()) {
-        LogPrint("estimatefee", "Blockpolicy error mempool tx %s not found for removeTx\n",
-                 hash.ToString().c_str());
-        return;
+    if (pos != mapMemPoolTxs.end()) {
+        feeStats.removeTx(pos->second.blockHeight, nBestSeenHeight, pos->second.bucketIndex);
+        mapMemPoolTxs.erase(hash);
+        return true;
+    } else {
+        return false;
     }
-    unsigned int entryHeight = pos->second.blockHeight;
-    unsigned int bucketIndex = pos->second.bucketIndex;
-
-    feeStats.removeTx(entryHeight, nBestSeenHeight, bucketIndex);
-    mapMemPoolTxs.erase(hash);
 }
 
 CBlockPolicyEstimator::CBlockPolicyEstimator(const CFeeRate& _minRelayFee)
diff --git a/src/policy/fees.h b/src/policy/fees.h
index 1f10cfb237304..c88ba5b3cc14e 100644
--- a/src/policy/fees.h
+++ b/src/policy/fees.h
@@ -212,7 +212,7 @@ class CBlockPolicyEstimator
     void processTransaction(const CTxMemPoolEntry& entry, bool fCurrentEstimate);
 
     /** Remove a transaction from the mempool tracking stats*/
-    void removeTx(uint256 hash);
+    bool removeTx(uint256 hash);
 
     /** Return a feerate estimate */
     CFeeRate estimateFee(int confTarget);

From 60ac00de854981333656d17c9b2ea2efd1efc436 Mon Sep 17 00:00:00 2001
From: Alex Morcos <morcos@chaincode.com>
Date: Fri, 11 Nov 2016 11:17:59 -0500
Subject: [PATCH 1472/1802] Don't track transactions at all during IBD.

This was an oversight, where blocks and mempool tracking were ignored during IBD, but transactions that arrived during IBD but were included in blocks after IBD were not ignored.
---
 src/validation.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/validation.cpp b/src/validation.cpp
index bc14c1d8c63ad..2783a313f7ef7 100644
--- a/src/validation.cpp
+++ b/src/validation.cpp
@@ -692,7 +692,9 @@ bool AcceptToMemoryPoolWorker(CTxMemPool& pool, CValidationState& state, const C
             }
         }
 
-        CTxMemPoolEntry entry(ptx, nFees, nAcceptTime, dPriority, chainActive.Height(), pool.HasNoInputsOf(tx), inChainInputValue, fSpendsCoinbase, nSigOpsCost, lp);
+        CTxMemPoolEntry entry(ptx, nFees, nAcceptTime, dPriority, chainActive.Height(),
+                              !IsInitialBlockDownload() && pool.HasNoInputsOf(tx),
+                              inChainInputValue, fSpendsCoinbase, nSigOpsCost, lp);
         unsigned int nSize = entry.GetTxSize();
 
         // Check that the transaction doesn't have an excessive number of

From 84f7ab08d2e8e83a584d72fdf44f68b34baf8165 Mon Sep 17 00:00:00 2001
From: Alex Morcos <morcos@chaincode.com>
Date: Fri, 11 Nov 2016 11:57:51 -0500
Subject: [PATCH 1473/1802] Remove member variable hadNoDependencies from
 CTxMemPoolEntry

Fee estimation can just check its own mapMemPoolTxs to determine the same information.  Note that now fee estimation for block processing must happen before those transactions are removed, but this shoudl be a speedup.
---
 src/bench/mempool_eviction.cpp |  2 +-
 src/policy/fees.cpp            | 21 ++++++++-------------
 src/test/mempool_tests.cpp     |  2 --
 src/test/test_bitcoin.cpp      |  5 ++---
 src/test/test_bitcoin.h        |  4 +---
 src/txmempool.cpp              |  8 ++++----
 src/txmempool.h                |  4 +---
 src/validation.cpp             |  3 +--
 src/wallet/wallet.cpp          |  2 +-
 9 files changed, 19 insertions(+), 32 deletions(-)

diff --git a/src/bench/mempool_eviction.cpp b/src/bench/mempool_eviction.cpp
index d04c036841dce..5790d51a824b8 100644
--- a/src/bench/mempool_eviction.cpp
+++ b/src/bench/mempool_eviction.cpp
@@ -18,7 +18,7 @@ static void AddTx(const CTransaction& tx, const CAmount& nFee, CTxMemPool& pool)
     unsigned int sigOpCost = 4;
     LockPoints lp;
     pool.addUnchecked(tx.GetHash(), CTxMemPoolEntry(
-                                        MakeTransactionRef(tx), nFee, nTime, dPriority, nHeight, pool.HasNoInputsOf(tx),
+                                        MakeTransactionRef(tx), nFee, nTime, dPriority, nHeight,
                                         tx.GetValueOut(), spendsCoinbase, sigOpCost, lp));
 }
 
diff --git a/src/policy/fees.cpp b/src/policy/fees.cpp
index 52d0e5c5e5eb0..ac2d7edaec07c 100644
--- a/src/policy/fees.cpp
+++ b/src/policy/fees.cpp
@@ -327,13 +327,6 @@ void CBlockPolicyEstimator::processTransaction(const CTxMemPoolEntry& entry, boo
     if (!fCurrentEstimate)
         return;
 
-    if (!entry.WasClearAtEntry()) {
-        // This transaction depends on other transactions in the mempool to
-        // be included in a block before it will be able to be included, so
-        // we shouldn't include it in our calculations
-        return;
-    }
-
     // Feerates are stored and reported as BTC-per-kb:
     CFeeRate feeRate(entry.GetFee(), entry.GetTxSize());
 
@@ -343,10 +336,8 @@ void CBlockPolicyEstimator::processTransaction(const CTxMemPoolEntry& entry, boo
 
 void CBlockPolicyEstimator::processBlockTx(unsigned int nBlockHeight, const CTxMemPoolEntry& entry)
 {
-    if (!entry.WasClearAtEntry()) {
-        // This transaction depended on other transactions in the mempool to
-        // be included in a block before it was able to be included, so
-        // we shouldn't include it in our calculations
+    if (!removeTx(entry.GetTx().GetHash())) {
+        // This transaction wasn't being tracked for fee estimation
         return;
     }
 
@@ -378,14 +369,18 @@ void CBlockPolicyEstimator::processBlock(unsigned int nBlockHeight,
         // transaction fees."
         return;
     }
-    nBestSeenHeight = nBlockHeight;
 
     // Only want to be updating estimates when our blockchain is synced,
     // otherwise we'll miscalculate how many blocks its taking to get included.
     if (!fCurrentEstimate)
         return;
 
-    // Clear the current block state
+    // Must update nBestSeenHeight in sync with ClearCurrent so that
+    // calls to removeTx (via processBlockTx) correctly calculate age
+    // of unconfirmed txs to remove from tracking.
+    nBestSeenHeight = nBlockHeight;
+
+    // Clear the current block state and update unconfirmed circular buffer
     feeStats.ClearCurrent(nBlockHeight);
 
     // Repopulate the current block states
diff --git a/src/test/mempool_tests.cpp b/src/test/mempool_tests.cpp
index 37f0de354ee24..91f549fe48b2f 100644
--- a/src/test/mempool_tests.cpp
+++ b/src/test/mempool_tests.cpp
@@ -120,7 +120,6 @@ BOOST_AUTO_TEST_CASE(MempoolIndexingTest)
 {
     CTxMemPool pool(CFeeRate(0));
     TestMemPoolEntryHelper entry;
-    entry.hadNoDependencies = true;
 
     /* 3rd highest fee */
     CMutableTransaction tx1 = CMutableTransaction();
@@ -323,7 +322,6 @@ BOOST_AUTO_TEST_CASE(MempoolAncestorIndexingTest)
 {
     CTxMemPool pool(CFeeRate(0));
     TestMemPoolEntryHelper entry;
-    entry.hadNoDependencies = true;
 
     /* 3rd highest fee */
     CMutableTransaction tx1 = CMutableTransaction();
diff --git a/src/test/test_bitcoin.cpp b/src/test/test_bitcoin.cpp
index 672cd1142802e..f0eaab2217cd2 100644
--- a/src/test/test_bitcoin.cpp
+++ b/src/test/test_bitcoin.cpp
@@ -147,12 +147,11 @@ CTxMemPoolEntry TestMemPoolEntryHelper::FromTx(const CMutableTransaction &tx, CT
 }
 
 CTxMemPoolEntry TestMemPoolEntryHelper::FromTx(const CTransaction &txn, CTxMemPool *pool) {
-    bool hasNoDependencies = pool ? pool->HasNoInputsOf(txn) : hadNoDependencies;
     // Hack to assume either its completely dependent on other mempool txs or not at all
-    CAmount inChainValue = hasNoDependencies ? txn.GetValueOut() : 0;
+    CAmount inChainValue = pool && pool->HasNoInputsOf(txn) ? txn.GetValueOut() : 0;
 
     return CTxMemPoolEntry(MakeTransactionRef(txn), nFee, nTime, dPriority, nHeight,
-                           hasNoDependencies, inChainValue, spendsCoinbase, sigOpCost, lp);
+                           inChainValue, spendsCoinbase, sigOpCost, lp);
 }
 
 void Shutdown(void* parg)
diff --git a/src/test/test_bitcoin.h b/src/test/test_bitcoin.h
index 0fe77437e423a..5ef6fa764f583 100644
--- a/src/test/test_bitcoin.h
+++ b/src/test/test_bitcoin.h
@@ -70,14 +70,13 @@ struct TestMemPoolEntryHelper
     int64_t nTime;
     double dPriority;
     unsigned int nHeight;
-    bool hadNoDependencies;
     bool spendsCoinbase;
     unsigned int sigOpCost;
     LockPoints lp;
 
     TestMemPoolEntryHelper() :
         nFee(0), nTime(0), dPriority(0.0), nHeight(1),
-        hadNoDependencies(false), spendsCoinbase(false), sigOpCost(4) { }
+        spendsCoinbase(false), sigOpCost(4) { }
     
     CTxMemPoolEntry FromTx(const CMutableTransaction &tx, CTxMemPool *pool = NULL);
     CTxMemPoolEntry FromTx(const CTransaction &tx, CTxMemPool *pool = NULL);
@@ -87,7 +86,6 @@ struct TestMemPoolEntryHelper
     TestMemPoolEntryHelper &Time(int64_t _time) { nTime = _time; return *this; }
     TestMemPoolEntryHelper &Priority(double _priority) { dPriority = _priority; return *this; }
     TestMemPoolEntryHelper &Height(unsigned int _height) { nHeight = _height; return *this; }
-    TestMemPoolEntryHelper &HadNoDependencies(bool _hnd) { hadNoDependencies = _hnd; return *this; }
     TestMemPoolEntryHelper &SpendsCoinbase(bool _flag) { spendsCoinbase = _flag; return *this; }
     TestMemPoolEntryHelper &SigOpsCost(unsigned int _sigopsCost) { sigOpCost = _sigopsCost; return *this; }
 };
diff --git a/src/txmempool.cpp b/src/txmempool.cpp
index 4ccbcadefc345..57300bb51d7bd 100644
--- a/src/txmempool.cpp
+++ b/src/txmempool.cpp
@@ -22,10 +22,10 @@ using namespace std;
 
 CTxMemPoolEntry::CTxMemPoolEntry(const CTransactionRef& _tx, const CAmount& _nFee,
                                  int64_t _nTime, double _entryPriority, unsigned int _entryHeight,
-                                 bool poolHasNoInputsOf, CAmount _inChainInputValue,
+                                 CAmount _inChainInputValue,
                                  bool _spendsCoinbase, int64_t _sigOpsCost, LockPoints lp):
     tx(_tx), nFee(_nFee), nTime(_nTime), entryPriority(_entryPriority), entryHeight(_entryHeight),
-    hadNoDependencies(poolHasNoInputsOf), inChainInputValue(_inChainInputValue),
+    inChainInputValue(_inChainInputValue),
     spendsCoinbase(_spendsCoinbase), sigOpCost(_sigOpsCost), lockPoints(lp)
 {
     nTxWeight = GetTransactionWeight(*tx);
@@ -604,6 +604,8 @@ void CTxMemPool::removeForBlock(const std::vector<CTransactionRef>& vtx, unsigne
         if (i != mapTx.end())
             entries.push_back(*i);
     }
+    // Before the txs in the new block have been removed from the mempool, update policy estimates
+    minerPolicyEstimator->processBlock(nBlockHeight, entries, fCurrentEstimate);
     for (const auto& tx : vtx)
     {
         txiter it = mapTx.find(tx->GetHash());
@@ -615,8 +617,6 @@ void CTxMemPool::removeForBlock(const std::vector<CTransactionRef>& vtx, unsigne
         removeConflicts(*tx);
         ClearPrioritisation(tx->GetHash());
     }
-    // After the txs in the new block have been removed from the mempool, update policy estimates
-    minerPolicyEstimator->processBlock(nBlockHeight, entries, fCurrentEstimate);
     lastRollingFeeUpdate = GetTime();
     blockSinceLastRollingFeeBump = true;
 }
diff --git a/src/txmempool.h b/src/txmempool.h
index 7c68053f26f2a..5c8cf7af1b884 100644
--- a/src/txmempool.h
+++ b/src/txmempool.h
@@ -88,7 +88,6 @@ class CTxMemPoolEntry
     int64_t nTime;             //!< Local time when entering the mempool
     double entryPriority;      //!< Priority when entering the mempool
     unsigned int entryHeight;  //!< Chain height when entering the mempool
-    bool hadNoDependencies;    //!< Not dependent on any other txs when it entered the mempool
     CAmount inChainInputValue; //!< Sum of all txin values that are already in blockchain
     bool spendsCoinbase;       //!< keep track of transactions that spend a coinbase
     int64_t sigOpCost;         //!< Total sigop cost
@@ -113,7 +112,7 @@ class CTxMemPoolEntry
 public:
     CTxMemPoolEntry(const CTransactionRef& _tx, const CAmount& _nFee,
                     int64_t _nTime, double _entryPriority, unsigned int _entryHeight,
-                    bool poolHasNoInputsOf, CAmount _inChainInputValue, bool spendsCoinbase,
+                    CAmount _inChainInputValue, bool spendsCoinbase,
                     int64_t nSigOpsCost, LockPoints lp);
 
     CTxMemPoolEntry(const CTxMemPoolEntry& other);
@@ -130,7 +129,6 @@ class CTxMemPoolEntry
     size_t GetTxWeight() const { return nTxWeight; }
     int64_t GetTime() const { return nTime; }
     unsigned int GetHeight() const { return entryHeight; }
-    bool WasClearAtEntry() const { return hadNoDependencies; }
     int64_t GetSigOpCost() const { return sigOpCost; }
     int64_t GetModifiedFee() const { return nFee + feeDelta; }
     size_t DynamicMemoryUsage() const { return nUsageSize; }
diff --git a/src/validation.cpp b/src/validation.cpp
index 2783a313f7ef7..a68763e489519 100644
--- a/src/validation.cpp
+++ b/src/validation.cpp
@@ -693,7 +693,6 @@ bool AcceptToMemoryPoolWorker(CTxMemPool& pool, CValidationState& state, const C
         }
 
         CTxMemPoolEntry entry(ptx, nFees, nAcceptTime, dPriority, chainActive.Height(),
-                              !IsInitialBlockDownload() && pool.HasNoInputsOf(tx),
                               inChainInputValue, fSpendsCoinbase, nSigOpsCost, lp);
         unsigned int nSize = entry.GetTxSize();
 
@@ -943,7 +942,7 @@ bool AcceptToMemoryPoolWorker(CTxMemPool& pool, CValidationState& state, const C
         pool.RemoveStaged(allConflicting, false);
 
         // Store transaction in memory
-        pool.addUnchecked(hash, entry, setAncestors, !IsInitialBlockDownload());
+        pool.addUnchecked(hash, entry, setAncestors, !IsInitialBlockDownload() && pool.HasNoInputsOf(tx));
 
         // trim mempool and check if tx was trimmed
         if (!fOverrideMempoolLimit) {
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index 96768325603b2..0b13c2ba74784 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -2563,7 +2563,7 @@ bool CWallet::CreateTransaction(const vector<CRecipient>& vecSend, CWalletTx& wt
     if (GetBoolArg("-walletrejectlongchains", DEFAULT_WALLET_REJECT_LONG_CHAINS)) {
         // Lastly, ensure this tx will pass the mempool's chain limits
         LockPoints lp;
-        CTxMemPoolEntry entry(wtxNew.tx, 0, 0, 0, 0, false, 0, false, 0, lp);
+        CTxMemPoolEntry entry(wtxNew.tx, 0, 0, 0, 0, 0, false, 0, lp);
         CTxMemPool::setEntries setAncestors;
         size_t nLimitAncestors = GetArg("-limitancestorcount", DEFAULT_ANCESTOR_LIMIT);
         size_t nLimitAncestorSize = GetArg("-limitancestorsize", DEFAULT_ANCESTOR_SIZE_LIMIT)*1000;

From 6f06b268c1f383affb2cf397f325d48d25bc8880 Mon Sep 17 00:00:00 2001
From: Alex Morcos <morcos@chaincode.com>
Date: Fri, 11 Nov 2016 12:48:01 -0500
Subject: [PATCH 1474/1802] rename bool to validFeeEstimate

---
 src/policy/fees.cpp | 4 ++--
 src/policy/fees.h   | 2 +-
 src/txmempool.cpp   | 8 ++++----
 src/txmempool.h     | 4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/policy/fees.cpp b/src/policy/fees.cpp
index ac2d7edaec07c..6b4567d195df2 100644
--- a/src/policy/fees.cpp
+++ b/src/policy/fees.cpp
@@ -306,7 +306,7 @@ CBlockPolicyEstimator::CBlockPolicyEstimator(const CFeeRate& _minRelayFee)
     feeStats.Initialize(vfeelist, MAX_BLOCK_CONFIRMS, DEFAULT_DECAY);
 }
 
-void CBlockPolicyEstimator::processTransaction(const CTxMemPoolEntry& entry, bool fCurrentEstimate)
+void CBlockPolicyEstimator::processTransaction(const CTxMemPoolEntry& entry, bool validFeeEstimate)
 {
     unsigned int txHeight = entry.GetHeight();
     uint256 hash = entry.GetTx().GetHash();
@@ -324,7 +324,7 @@ void CBlockPolicyEstimator::processTransaction(const CTxMemPoolEntry& entry, boo
 
     // Only want to be updating estimates when our blockchain is synced,
     // otherwise we'll miscalculate how many blocks its taking to get included.
-    if (!fCurrentEstimate)
+    if (!validFeeEstimate)
         return;
 
     // Feerates are stored and reported as BTC-per-kb:
diff --git a/src/policy/fees.h b/src/policy/fees.h
index c88ba5b3cc14e..e062cd87bb148 100644
--- a/src/policy/fees.h
+++ b/src/policy/fees.h
@@ -209,7 +209,7 @@ class CBlockPolicyEstimator
     void processBlockTx(unsigned int nBlockHeight, const CTxMemPoolEntry& entry);
 
     /** Process a transaction accepted to the mempool*/
-    void processTransaction(const CTxMemPoolEntry& entry, bool fCurrentEstimate);
+    void processTransaction(const CTxMemPoolEntry& entry, bool validFeeEstimate);
 
     /** Remove a transaction from the mempool tracking stats*/
     bool removeTx(uint256 hash);
diff --git a/src/txmempool.cpp b/src/txmempool.cpp
index 57300bb51d7bd..53f3e0e19924a 100644
--- a/src/txmempool.cpp
+++ b/src/txmempool.cpp
@@ -392,7 +392,7 @@ void CTxMemPool::AddTransactionsUpdated(unsigned int n)
     nTransactionsUpdated += n;
 }
 
-bool CTxMemPool::addUnchecked(const uint256& hash, const CTxMemPoolEntry &entry, setEntries &setAncestors, bool fCurrentEstimate)
+bool CTxMemPool::addUnchecked(const uint256& hash, const CTxMemPoolEntry &entry, setEntries &setAncestors, bool validFeeEstimate)
 {
     // Add to memory pool without checking anything.
     // Used by main.cpp AcceptToMemoryPool(), which DOES do
@@ -442,7 +442,7 @@ bool CTxMemPool::addUnchecked(const uint256& hash, const CTxMemPoolEntry &entry,
 
     nTransactionsUpdated++;
     totalTxSize += entry.GetTxSize();
-    minerPolicyEstimator->processTransaction(entry, fCurrentEstimate);
+    minerPolicyEstimator->processTransaction(entry, validFeeEstimate);
 
     vTxHashes.emplace_back(tx.GetWitnessHash(), newit);
     newit->vTxHashesIdx = vTxHashes.size() - 1;
@@ -1015,14 +1015,14 @@ int CTxMemPool::Expire(int64_t time) {
     return stage.size();
 }
 
-bool CTxMemPool::addUnchecked(const uint256&hash, const CTxMemPoolEntry &entry, bool fCurrentEstimate)
+bool CTxMemPool::addUnchecked(const uint256&hash, const CTxMemPoolEntry &entry, bool validFeeEstimate)
 {
     LOCK(cs);
     setEntries setAncestors;
     uint64_t nNoLimit = std::numeric_limits<uint64_t>::max();
     std::string dummy;
     CalculateMemPoolAncestors(entry, setAncestors, nNoLimit, nNoLimit, nNoLimit, nNoLimit, dummy);
-    return addUnchecked(hash, entry, setAncestors, fCurrentEstimate);
+    return addUnchecked(hash, entry, setAncestors, validFeeEstimate);
 }
 
 void CTxMemPool::UpdateChild(txiter entry, txiter child, bool add)
diff --git a/src/txmempool.h b/src/txmempool.h
index 5c8cf7af1b884..16125bd73b432 100644
--- a/src/txmempool.h
+++ b/src/txmempool.h
@@ -523,8 +523,8 @@ class CTxMemPool
     // to track size/count of descendant transactions.  First version of
     // addUnchecked can be used to have it call CalculateMemPoolAncestors(), and
     // then invoke the second version.
-    bool addUnchecked(const uint256& hash, const CTxMemPoolEntry &entry, bool fCurrentEstimate = true);
-    bool addUnchecked(const uint256& hash, const CTxMemPoolEntry &entry, setEntries &setAncestors, bool fCurrentEstimate = true);
+    bool addUnchecked(const uint256& hash, const CTxMemPoolEntry &entry, bool validFeeEstimate = true);
+    bool addUnchecked(const uint256& hash, const CTxMemPoolEntry &entry, setEntries &setAncestors, bool validFeeEstimate = true);
 
     void removeRecursive(const CTransaction &tx);
     void removeForReorg(const CCoinsViewCache *pcoins, unsigned int nMemPoolHeight, int flags);

From d825838e6472f73c491f93506cb003472f071602 Mon Sep 17 00:00:00 2001
From: Alex Morcos <morcos@chaincode.com>
Date: Fri, 11 Nov 2016 13:14:45 -0500
Subject: [PATCH 1475/1802] Always update fee estimates on new blocks.

All decisions about whether the transactions are valid data points are made at the time the transaction arrives. Updating on blocks all the time will now cause stale fee estimates to decay quickly when we restart a node.
---
 src/policy/fees.cpp | 7 +------
 src/policy/fees.h   | 2 +-
 src/txmempool.cpp   | 5 ++---
 src/txmempool.h     | 3 +--
 src/validation.cpp  | 2 +-
 5 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/src/policy/fees.cpp b/src/policy/fees.cpp
index 6b4567d195df2..eb9fdc77d3184 100644
--- a/src/policy/fees.cpp
+++ b/src/policy/fees.cpp
@@ -359,7 +359,7 @@ void CBlockPolicyEstimator::processBlockTx(unsigned int nBlockHeight, const CTxM
 }
 
 void CBlockPolicyEstimator::processBlock(unsigned int nBlockHeight,
-                                         std::vector<CTxMemPoolEntry>& entries, bool fCurrentEstimate)
+                                         std::vector<CTxMemPoolEntry>& entries)
 {
     if (nBlockHeight <= nBestSeenHeight) {
         // Ignore side chains and re-orgs; assuming they are random
@@ -370,11 +370,6 @@ void CBlockPolicyEstimator::processBlock(unsigned int nBlockHeight,
         return;
     }
 
-    // Only want to be updating estimates when our blockchain is synced,
-    // otherwise we'll miscalculate how many blocks its taking to get included.
-    if (!fCurrentEstimate)
-        return;
-
     // Must update nBestSeenHeight in sync with ClearCurrent so that
     // calls to removeTx (via processBlockTx) correctly calculate age
     // of unconfirmed txs to remove from tracking.
diff --git a/src/policy/fees.h b/src/policy/fees.h
index e062cd87bb148..a61ae181308ff 100644
--- a/src/policy/fees.h
+++ b/src/policy/fees.h
@@ -203,7 +203,7 @@ class CBlockPolicyEstimator
 
     /** Process all the transactions that have been included in a block */
     void processBlock(unsigned int nBlockHeight,
-                      std::vector<CTxMemPoolEntry>& entries, bool fCurrentEstimate);
+                      std::vector<CTxMemPoolEntry>& entries);
 
     /** Process a transaction confirmed in a block*/
     void processBlockTx(unsigned int nBlockHeight, const CTxMemPoolEntry& entry);
diff --git a/src/txmempool.cpp b/src/txmempool.cpp
index 53f3e0e19924a..e97099eb28772 100644
--- a/src/txmempool.cpp
+++ b/src/txmempool.cpp
@@ -591,8 +591,7 @@ void CTxMemPool::removeConflicts(const CTransaction &tx)
 /**
  * Called when a block is connected. Removes from mempool and updates the miner fee estimator.
  */
-void CTxMemPool::removeForBlock(const std::vector<CTransactionRef>& vtx, unsigned int nBlockHeight,
-                                bool fCurrentEstimate)
+void CTxMemPool::removeForBlock(const std::vector<CTransactionRef>& vtx, unsigned int nBlockHeight)
 {
     LOCK(cs);
     std::vector<CTxMemPoolEntry> entries;
@@ -605,7 +604,7 @@ void CTxMemPool::removeForBlock(const std::vector<CTransactionRef>& vtx, unsigne
             entries.push_back(*i);
     }
     // Before the txs in the new block have been removed from the mempool, update policy estimates
-    minerPolicyEstimator->processBlock(nBlockHeight, entries, fCurrentEstimate);
+    minerPolicyEstimator->processBlock(nBlockHeight, entries);
     for (const auto& tx : vtx)
     {
         txiter it = mapTx.find(tx->GetHash());
diff --git a/src/txmempool.h b/src/txmempool.h
index 16125bd73b432..b4f52e64737c5 100644
--- a/src/txmempool.h
+++ b/src/txmempool.h
@@ -529,8 +529,7 @@ class CTxMemPool
     void removeRecursive(const CTransaction &tx);
     void removeForReorg(const CCoinsViewCache *pcoins, unsigned int nMemPoolHeight, int flags);
     void removeConflicts(const CTransaction &tx);
-    void removeForBlock(const std::vector<CTransactionRef>& vtx, unsigned int nBlockHeight,
-                        bool fCurrentEstimate = true);
+    void removeForBlock(const std::vector<CTransactionRef>& vtx, unsigned int nBlockHeight);
     void clear();
     void _clear(); //lock free
     bool CompareDepthAndScore(const uint256& hasha, const uint256& hashb);
diff --git a/src/validation.cpp b/src/validation.cpp
index a68763e489519..fb6a902bc9d2e 100644
--- a/src/validation.cpp
+++ b/src/validation.cpp
@@ -2204,7 +2204,7 @@ bool static ConnectTip(CValidationState& state, const CChainParams& chainparams,
     int64_t nTime5 = GetTimeMicros(); nTimeChainState += nTime5 - nTime4;
     LogPrint("bench", "  - Writing chainstate: %.2fms [%.2fs]\n", (nTime5 - nTime4) * 0.001, nTimeChainState * 0.000001);
     // Remove conflicting transactions from the mempool.;
-    mempool.removeForBlock(blockConnecting.vtx, pindexNew->nHeight, !IsInitialBlockDownload());
+    mempool.removeForBlock(blockConnecting.vtx, pindexNew->nHeight);
     // Update chainActive & related variables.
     UpdateTip(pindexNew, chainparams);
 

From ebafdcabb10a89b491cdb8430bc43b0220d436df Mon Sep 17 00:00:00 2001
From: Alex Morcos <morcos@chaincode.com>
Date: Fri, 11 Nov 2016 14:16:42 -0500
Subject: [PATCH 1476/1802] Pass pointers to existing CTxMemPoolEntries to fee
 estimation

---
 src/policy/fees.cpp | 10 +++++-----
 src/policy/fees.h   |  4 ++--
 src/txmempool.cpp   |  4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/policy/fees.cpp b/src/policy/fees.cpp
index eb9fdc77d3184..cb83bcf716cd8 100644
--- a/src/policy/fees.cpp
+++ b/src/policy/fees.cpp
@@ -334,9 +334,9 @@ void CBlockPolicyEstimator::processTransaction(const CTxMemPoolEntry& entry, boo
     mapMemPoolTxs[hash].bucketIndex = feeStats.NewTx(txHeight, (double)feeRate.GetFeePerK());
 }
 
-void CBlockPolicyEstimator::processBlockTx(unsigned int nBlockHeight, const CTxMemPoolEntry& entry)
+void CBlockPolicyEstimator::processBlockTx(unsigned int nBlockHeight, const CTxMemPoolEntry* entry)
 {
-    if (!removeTx(entry.GetTx().GetHash())) {
+    if (!removeTx(entry->GetTx().GetHash())) {
         // This transaction wasn't being tracked for fee estimation
         return;
     }
@@ -344,7 +344,7 @@ void CBlockPolicyEstimator::processBlockTx(unsigned int nBlockHeight, const CTxM
     // How many blocks did it take for miners to include this transaction?
     // blocksToConfirm is 1-based, so a transaction included in the earliest
     // possible block has confirmation count of 1
-    int blocksToConfirm = nBlockHeight - entry.GetHeight();
+    int blocksToConfirm = nBlockHeight - entry->GetHeight();
     if (blocksToConfirm <= 0) {
         // This can't happen because we don't process transactions from a block with a height
         // lower than our greatest seen height
@@ -353,13 +353,13 @@ void CBlockPolicyEstimator::processBlockTx(unsigned int nBlockHeight, const CTxM
     }
 
     // Feerates are stored and reported as BTC-per-kb:
-    CFeeRate feeRate(entry.GetFee(), entry.GetTxSize());
+    CFeeRate feeRate(entry->GetFee(), entry->GetTxSize());
 
     feeStats.Record(blocksToConfirm, (double)feeRate.GetFeePerK());
 }
 
 void CBlockPolicyEstimator::processBlock(unsigned int nBlockHeight,
-                                         std::vector<CTxMemPoolEntry>& entries)
+                                         std::vector<const CTxMemPoolEntry*>& entries)
 {
     if (nBlockHeight <= nBestSeenHeight) {
         // Ignore side chains and re-orgs; assuming they are random
diff --git a/src/policy/fees.h b/src/policy/fees.h
index a61ae181308ff..e1684ebcb941f 100644
--- a/src/policy/fees.h
+++ b/src/policy/fees.h
@@ -203,10 +203,10 @@ class CBlockPolicyEstimator
 
     /** Process all the transactions that have been included in a block */
     void processBlock(unsigned int nBlockHeight,
-                      std::vector<CTxMemPoolEntry>& entries);
+                      std::vector<const CTxMemPoolEntry*>& entries);
 
     /** Process a transaction confirmed in a block*/
-    void processBlockTx(unsigned int nBlockHeight, const CTxMemPoolEntry& entry);
+    void processBlockTx(unsigned int nBlockHeight, const CTxMemPoolEntry* entry);
 
     /** Process a transaction accepted to the mempool*/
     void processTransaction(const CTxMemPoolEntry& entry, bool validFeeEstimate);
diff --git a/src/txmempool.cpp b/src/txmempool.cpp
index e97099eb28772..4f4540a1fc7f7 100644
--- a/src/txmempool.cpp
+++ b/src/txmempool.cpp
@@ -594,14 +594,14 @@ void CTxMemPool::removeConflicts(const CTransaction &tx)
 void CTxMemPool::removeForBlock(const std::vector<CTransactionRef>& vtx, unsigned int nBlockHeight)
 {
     LOCK(cs);
-    std::vector<CTxMemPoolEntry> entries;
+    std::vector<const CTxMemPoolEntry*> entries;
     for (const auto& tx : vtx)
     {
         uint256 hash = tx->GetHash();
 
         indexed_transaction_set::iterator i = mapTx.find(hash);
         if (i != mapTx.end())
-            entries.push_back(*i);
+            entries.push_back(&*i);
     }
     // Before the txs in the new block have been removed from the mempool, update policy estimates
     minerPolicyEstimator->processBlock(nBlockHeight, entries);

From dc008c462f6df84dd444c9646f7ca64ee1c8c841 Mon Sep 17 00:00:00 2001
From: Alex Morcos <morcos@chaincode.com>
Date: Fri, 11 Nov 2016 13:29:13 -0500
Subject: [PATCH 1477/1802] Add IsCurrentForFeeEstimatation

Make a more conservative notion of whether the node is caught up to the rest of the network and only count transactions as fee estimation data points if the node is caught up.
---
 src/validation.cpp | 19 ++++++++++++++++++-
 src/validation.h   |  2 ++
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/src/validation.cpp b/src/validation.cpp
index fb6a902bc9d2e..264fdd83d682f 100644
--- a/src/validation.cpp
+++ b/src/validation.cpp
@@ -525,6 +525,18 @@ std::string FormatStateMessage(const CValidationState &state)
         state.GetRejectCode());
 }
 
+static bool IsCurrentForFeeEstimation()
+{
+    AssertLockHeld(cs_main);
+    if (IsInitialBlockDownload())
+        return false;
+    if (chainActive.Tip()->GetBlockTime() < (GetTime() - MAX_FEE_ESTIMATION_TIP_AGE))
+        return false;
+    if (chainActive.Height() < pindexBestHeader->nHeight - 1)
+        return false;
+    return true;
+}
+
 bool AcceptToMemoryPoolWorker(CTxMemPool& pool, CValidationState& state, const CTransactionRef& ptx, bool fLimitFree,
                               bool* pfMissingInputs, int64_t nAcceptTime, bool fOverrideMempoolLimit, const CAmount& nAbsurdFee,
                               std::vector<uint256>& vHashTxnToUncache)
@@ -941,8 +953,13 @@ bool AcceptToMemoryPoolWorker(CTxMemPool& pool, CValidationState& state, const C
         }
         pool.RemoveStaged(allConflicting, false);
 
+        // This transaction should only count for fee estimation if
+        // the node is not behind and it is not dependent on any other
+        // transactions in the mempool
+        bool validForFeeEstimation = IsCurrentForFeeEstimation() && pool.HasNoInputsOf(tx);
+
         // Store transaction in memory
-        pool.addUnchecked(hash, entry, setAncestors, !IsInitialBlockDownload() && pool.HasNoInputsOf(tx));
+        pool.addUnchecked(hash, entry, setAncestors, validForFeeEstimation);
 
         // trim mempool and check if tx was trimmed
         if (!fOverrideMempoolLimit) {
diff --git a/src/validation.h b/src/validation.h
index 981f659633b98..0f421d59e7232 100644
--- a/src/validation.h
+++ b/src/validation.h
@@ -130,6 +130,8 @@ static const int64_t BLOCK_DOWNLOAD_TIMEOUT_PER_PEER = 500000;
 static const unsigned int DEFAULT_LIMITFREERELAY = 0;
 static const bool DEFAULT_RELAYPRIORITY = true;
 static const int64_t DEFAULT_MAX_TIP_AGE = 24 * 60 * 60;
+/** Maximum age of our tip for us to be considered current for fee estimation */
+static const int64_t MAX_FEE_ESTIMATION_TIP_AGE = 3 * 60 * 60;
 
 /** Default for -permitbaremultisig */
 static const bool DEFAULT_PERMIT_BAREMULTISIG = true;

From 5fe0f47aa7d4cd4ed58ad37e6e4035f5c0625a23 Mon Sep 17 00:00:00 2001
From: Alex Morcos <morcos@chaincode.com>
Date: Fri, 11 Nov 2016 13:40:27 -0500
Subject: [PATCH 1478/1802] Add extra logging to processBlock in fee
 estimation.

---
 src/policy/fees.cpp | 28 +++++++++++++++++++---------
 src/policy/fees.h   |  5 ++++-
 2 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/src/policy/fees.cpp b/src/policy/fees.cpp
index cb83bcf716cd8..ec1dd492cbd10 100644
--- a/src/policy/fees.cpp
+++ b/src/policy/fees.cpp
@@ -294,7 +294,7 @@ bool CBlockPolicyEstimator::removeTx(uint256 hash)
 }
 
 CBlockPolicyEstimator::CBlockPolicyEstimator(const CFeeRate& _minRelayFee)
-    : nBestSeenHeight(0)
+    : nBestSeenHeight(0), trackedTxs(0), untrackedTxs(0)
 {
     static_assert(MIN_FEERATE > 0, "Min feerate must be nonzero");
     minTrackedFee = _minRelayFee < CFeeRate(MIN_FEERATE) ? CFeeRate(MIN_FEERATE) : _minRelayFee;
@@ -324,8 +324,11 @@ void CBlockPolicyEstimator::processTransaction(const CTxMemPoolEntry& entry, boo
 
     // Only want to be updating estimates when our blockchain is synced,
     // otherwise we'll miscalculate how many blocks its taking to get included.
-    if (!validFeeEstimate)
+    if (!validFeeEstimate) {
+        untrackedTxs++;
         return;
+    }
+    trackedTxs++;
 
     // Feerates are stored and reported as BTC-per-kb:
     CFeeRate feeRate(entry.GetFee(), entry.GetTxSize());
@@ -334,11 +337,11 @@ void CBlockPolicyEstimator::processTransaction(const CTxMemPoolEntry& entry, boo
     mapMemPoolTxs[hash].bucketIndex = feeStats.NewTx(txHeight, (double)feeRate.GetFeePerK());
 }
 
-void CBlockPolicyEstimator::processBlockTx(unsigned int nBlockHeight, const CTxMemPoolEntry* entry)
+bool CBlockPolicyEstimator::processBlockTx(unsigned int nBlockHeight, const CTxMemPoolEntry* entry)
 {
     if (!removeTx(entry->GetTx().GetHash())) {
         // This transaction wasn't being tracked for fee estimation
-        return;
+        return false;
     }
 
     // How many blocks did it take for miners to include this transaction?
@@ -349,13 +352,14 @@ void CBlockPolicyEstimator::processBlockTx(unsigned int nBlockHeight, const CTxM
         // This can't happen because we don't process transactions from a block with a height
         // lower than our greatest seen height
         LogPrint("estimatefee", "Blockpolicy error Transaction had negative blocksToConfirm\n");
-        return;
+        return false;
     }
 
     // Feerates are stored and reported as BTC-per-kb:
     CFeeRate feeRate(entry->GetFee(), entry->GetTxSize());
 
     feeStats.Record(blocksToConfirm, (double)feeRate.GetFeePerK());
+    return true;
 }
 
 void CBlockPolicyEstimator::processBlock(unsigned int nBlockHeight,
@@ -378,15 +382,21 @@ void CBlockPolicyEstimator::processBlock(unsigned int nBlockHeight,
     // Clear the current block state and update unconfirmed circular buffer
     feeStats.ClearCurrent(nBlockHeight);
 
+    unsigned int countedTxs = 0;
     // Repopulate the current block states
-    for (unsigned int i = 0; i < entries.size(); i++)
-        processBlockTx(nBlockHeight, entries[i]);
+    for (unsigned int i = 0; i < entries.size(); i++) {
+        if (processBlockTx(nBlockHeight, entries[i]))
+            countedTxs++;
+    }
 
     // Update all exponential averages with the current block state
     feeStats.UpdateMovingAverages();
 
-    LogPrint("estimatefee", "Blockpolicy after updating estimates for %u confirmed entries, new mempool map size %u\n",
-             entries.size(), mapMemPoolTxs.size());
+    LogPrint("estimatefee", "Blockpolicy after updating estimates for %u of %u txs in block, since last block %u of %u tracked, new mempool map size %u\n",
+             countedTxs, entries.size(), trackedTxs, trackedTxs + untrackedTxs, mapMemPoolTxs.size());
+
+    trackedTxs = 0;
+    untrackedTxs = 0;
 }
 
 CFeeRate CBlockPolicyEstimator::estimateFee(int confTarget)
diff --git a/src/policy/fees.h b/src/policy/fees.h
index e1684ebcb941f..064466afe40d3 100644
--- a/src/policy/fees.h
+++ b/src/policy/fees.h
@@ -206,7 +206,7 @@ class CBlockPolicyEstimator
                       std::vector<const CTxMemPoolEntry*>& entries);
 
     /** Process a transaction confirmed in a block*/
-    void processBlockTx(unsigned int nBlockHeight, const CTxMemPoolEntry* entry);
+    bool processBlockTx(unsigned int nBlockHeight, const CTxMemPoolEntry* entry);
 
     /** Process a transaction accepted to the mempool*/
     void processTransaction(const CTxMemPoolEntry& entry, bool validFeeEstimate);
@@ -258,6 +258,9 @@ class CBlockPolicyEstimator
 
     /** Classes to track historical data on transaction confirmations */
     TxConfirmStats feeStats;
+
+    unsigned int trackedTxs;
+    unsigned int untrackedTxs;
 };
 
 class FeeFilterRounder

From 78ae62d2646c5e6db410f324046d0c3b15e0ad0a Mon Sep 17 00:00:00 2001
From: Alex Morcos <morcos@chaincode.com>
Date: Tue, 29 Nov 2016 13:55:26 -0500
Subject: [PATCH 1479/1802] Add clarifying comments to fee estimation

---
 src/policy/fees.cpp | 5 +++++
 src/validation.h    | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/policy/fees.cpp b/src/policy/fees.cpp
index ec1dd492cbd10..f1c93a4978825 100644
--- a/src/policy/fees.cpp
+++ b/src/policy/fees.cpp
@@ -281,6 +281,11 @@ void TxConfirmStats::removeTx(unsigned int entryHeight, unsigned int nBestSeenHe
     }
 }
 
+// This function is called from CTxMemPool::removeUnchecked to ensure
+// txs removed from the mempool for any reason are no longer
+// tracked. Txs that were part of a block have already been removed in
+// processBlockTx to ensure they are never double tracked, but it is
+// of no harm to try to remove them again.
 bool CBlockPolicyEstimator::removeTx(uint256 hash)
 {
     std::map<uint256, TxStatsInfo>::iterator pos = mapMemPoolTxs.find(hash);
diff --git a/src/validation.h b/src/validation.h
index 0f421d59e7232..b41fa8aad8855 100644
--- a/src/validation.h
+++ b/src/validation.h
@@ -130,7 +130,7 @@ static const int64_t BLOCK_DOWNLOAD_TIMEOUT_PER_PEER = 500000;
 static const unsigned int DEFAULT_LIMITFREERELAY = 0;
 static const bool DEFAULT_RELAYPRIORITY = true;
 static const int64_t DEFAULT_MAX_TIP_AGE = 24 * 60 * 60;
-/** Maximum age of our tip for us to be considered current for fee estimation */
+/** Maximum age of our tip in seconds for us to be considered current for fee estimation */
 static const int64_t MAX_FEE_ESTIMATION_TIP_AGE = 3 * 60 * 60;
 
 /** Default for -permitbaremultisig */

From 44b64b933dec10f5ffcd7f34e7bf5e4ed97f671e Mon Sep 17 00:00:00 2001
From: Alex Morcos <morcos@chaincode.com>
Date: Tue, 29 Nov 2016 15:40:03 -0500
Subject: [PATCH 1480/1802] Fix edge case with stale fee estimates

---
 src/policy/fees.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/policy/fees.cpp b/src/policy/fees.cpp
index f1c93a4978825..5407aefb45257 100644
--- a/src/policy/fees.cpp
+++ b/src/policy/fees.cpp
@@ -321,9 +321,11 @@ void CBlockPolicyEstimator::processTransaction(const CTxMemPoolEntry& entry, boo
 	return;
     }
 
-    if (txHeight < nBestSeenHeight) {
+    if (txHeight != nBestSeenHeight) {
         // Ignore side chains and re-orgs; assuming they are random they don't
         // affect the estimate.  We'll potentially double count transactions in 1-block reorgs.
+        // Ignore txs if BlockPolicyEstimator is not in sync with chainActive.Tip().
+        // It will be synced next time a block is processed.
         return;
     }
 

From daec955fd68bd0da036a5b446b54ffb01108adcd Mon Sep 17 00:00:00 2001
From: Alex Morcos <morcos@chaincode.com>
Date: Tue, 13 Dec 2016 11:51:51 -0500
Subject: [PATCH 1481/1802] Introduce -blockmintxfee

---
 src/init.cpp        | 10 ++++++++++
 src/miner.cpp       | 10 ++++++++--
 src/miner.h         |  1 +
 src/policy/policy.h |  2 ++
 4 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/src/init.cpp b/src/init.cpp
index f0334a08e3619..b0c045da15244 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -476,6 +476,7 @@ std::string HelpMessage(HelpMessageMode mode)
     strUsage += HelpMessageOpt("-blockmaxweight=<n>", strprintf(_("Set maximum BIP141 block weight (default: %d)"), DEFAULT_BLOCK_MAX_WEIGHT));
     strUsage += HelpMessageOpt("-blockmaxsize=<n>", strprintf(_("Set maximum block size in bytes (default: %d)"), DEFAULT_BLOCK_MAX_SIZE));
     strUsage += HelpMessageOpt("-blockprioritysize=<n>", strprintf(_("Set maximum size of high-priority/low-fee transactions in bytes (default: %d)"), DEFAULT_BLOCK_PRIORITY_SIZE));
+    strUsage += HelpMessageOpt("-blockmintxfee=<amt>", strprintf(_("Set lowest fee rate (in %s/kB) for transactions to be included in block creation. (default: %s)"), CURRENCY_UNIT, FormatMoney(DEFAULT_BLOCK_MIN_TX_FEE)));
     if (showDebug)
         strUsage += HelpMessageOpt("-blockversion=<n>", "Override block version to test forking scenarios");
 
@@ -970,6 +971,15 @@ bool AppInitParameterInteraction()
         ::minRelayTxFee = CFeeRate(n);
     }
 
+    // Sanity check argument for min fee for including tx in block
+    // TODO: Harmonize which arguments need sanity checking and where that happens
+    if (IsArgSet("-blockmintxfee"))
+    {
+        CAmount n = 0;
+        if (!ParseMoney(GetArg("-blockmintxfee", ""), n))
+            return InitError(AmountErrMsg("blockmintxfee", GetArg("-blockmintxfee", "")));
+    }
+
     fRequireStandard = !GetBoolArg("-acceptnonstdtxn", !chainparams.RequireStandard());
     if (chainparams.RequireStandard() && !fRequireStandard)
         return InitError(strprintf("acceptnonstdtxn is not currently supported for %s chain", chainparams.NetworkIDString()));
diff --git a/src/miner.cpp b/src/miner.cpp
index 856e9edc14638..acded94168913 100644
--- a/src/miner.cpp
+++ b/src/miner.cpp
@@ -95,12 +95,18 @@ BlockAssembler::BlockAssembler(const CChainParams& _chainparams)
             nBlockMaxWeight = nBlockMaxSize * WITNESS_SCALE_FACTOR;
         }
     }
+    if (IsArgSet("-blockmintxfee")) {
+        CAmount n = 0;
+        ParseMoney(GetArg("-blockmintxfee", ""), n);
+        blockMinFeeRate = CFeeRate(n);
+    } else {
+        blockMinFeeRate = CFeeRate(DEFAULT_BLOCK_MIN_TX_FEE);
+    }
 
     // Limit weight to between 4K and MAX_BLOCK_WEIGHT-4K for sanity:
     nBlockMaxWeight = std::max((unsigned int)4000, std::min((unsigned int)(MAX_BLOCK_WEIGHT-4000), nBlockMaxWeight));
     // Limit size to between 1K and MAX_BLOCK_SERIALIZED_SIZE-1K for sanity:
     nBlockMaxSize = std::max((unsigned int)1000, std::min((unsigned int)(MAX_BLOCK_SERIALIZED_SIZE-1000), nBlockMaxSize));
-
     // Whether we need to account for byte usage (in addition to weight usage)
     fNeedSizeAccounting = (nBlockMaxSize < MAX_BLOCK_SERIALIZED_SIZE-1000);
 }
@@ -460,7 +466,7 @@ void BlockAssembler::addPackageTxs()
             packageSigOpsCost = modit->nSigOpCostWithAncestors;
         }
 
-        if (packageFees < ::minRelayTxFee.GetFee(packageSize)) {
+        if (packageFees < blockMinFeeRate.GetFee(packageSize)) {
             // Everything else we might consider has a lower fee rate
             return;
         }
diff --git a/src/miner.h b/src/miner.h
index 3dd9bf4cabe92..3ba92b16b8e03 100644
--- a/src/miner.h
+++ b/src/miner.h
@@ -143,6 +143,7 @@ class BlockAssembler
     bool fIncludeWitness;
     unsigned int nBlockMaxWeight, nBlockMaxSize;
     bool fNeedSizeAccounting;
+    CFeeRate blockMinFeeRate;
 
     // Information on the current status of the block
     uint64_t nBlockWeight;
diff --git a/src/policy/policy.h b/src/policy/policy.h
index 764ee278061ba..5c6a7b1865bb8 100644
--- a/src/policy/policy.h
+++ b/src/policy/policy.h
@@ -20,6 +20,8 @@ static const unsigned int DEFAULT_BLOCK_MAX_SIZE = 750000;
 static const unsigned int DEFAULT_BLOCK_PRIORITY_SIZE = 0;
 /** Default for -blockmaxweight, which controls the range of block weights the mining code will create **/
 static const unsigned int DEFAULT_BLOCK_MAX_WEIGHT = 3000000;
+/** Default for -blockmintxfee, which sets the minimum feerate for a transaction in blocks created by mining code **/
+static const unsigned int DEFAULT_BLOCK_MIN_TX_FEE = 1000;
 /** The maximum weight for transactions we're willing to relay/mine */
 static const unsigned int MAX_STANDARD_TX_WEIGHT = 400000;
 /** Maximum number of signature check operations in an IsStandard() P2SH script */

From ffeb1956cb4eec7be205c994d5cd89bb98283e9e Mon Sep 17 00:00:00 2001
From: Alex Morcos <morcos@chaincode.com>
Date: Tue, 20 Dec 2016 21:54:31 -0500
Subject: [PATCH 1482/1802] add test for -walletrejectlongchains

---
 qa/rpc-tests/wallet.py | 33 ++++++++++++++++++++++++++++++++-
 1 file changed, 32 insertions(+), 1 deletion(-)

diff --git a/qa/rpc-tests/wallet.py b/qa/rpc-tests/wallet.py
index 992fb8a2d64f7..f325ecb4a3a72 100755
--- a/qa/rpc-tests/wallet.py
+++ b/qa/rpc-tests/wallet.py
@@ -363,11 +363,42 @@ def run_test (self):
         self.nodes[0].generate(1)
 
         # Make a long chain of unconfirmed payments without hitting mempool limit
+        # Each tx we make leaves only one output of change on a chain 1 longer
+        # Since the amount to send is always much less than the outputs, we only ever need one output
+        # So we should be able to generate exactly chainlimit txs for each original output
+        sending_addr = self.nodes[1].getnewaddress()
         txid_list = []
         for i in range(chainlimit*2):
-            txid_list.append(self.nodes[0].sendtoaddress(chain_addrs[0], Decimal('0.0001')))
+            txid_list.append(self.nodes[0].sendtoaddress(sending_addr, Decimal('0.0001')))
         assert_equal(self.nodes[0].getmempoolinfo()['size'], chainlimit*2)
         assert_equal(len(txid_list), chainlimit*2)
 
+        # Without walletrejectlongchains, we will still generate a txid
+        # The tx will be stored in the wallet but not accepted to the mempool
+        extra_txid = self.nodes[0].sendtoaddress(sending_addr, Decimal('0.0001'))
+        assert(extra_txid not in self.nodes[0].getrawmempool())
+        assert(extra_txid in [tx["txid"] for tx in self.nodes[0].listtransactions()])
+        self.nodes[0].abandontransaction(extra_txid)
+        total_txs = len(self.nodes[0].listtransactions("*",99999))
+
+        # Try with walletrejectlongchains
+        # Double chain limit but require combining inputs, so we pass SelectCoinsMinConf
+        stop_node(self.nodes[0],0)
+        self.nodes[0] = start_node(0, self.options.tmpdir, ["-walletrejectlongchains", "-limitancestorcount="+str(2*chainlimit)])
+
+        # wait for loadmempool
+        timeout = 10
+        while (timeout > 0 and len(self.nodes[0].getrawmempool()) < chainlimit*2):
+            time.sleep(0.5)
+            timeout -= 0.5
+        assert_equal(len(self.nodes[0].getrawmempool()), chainlimit*2)
+
+        node0_balance = self.nodes[0].getbalance()
+        # With walletrejectlongchains we will not create the tx and store it in our wallet.
+        assert_raises_message(JSONRPCException, "mempool chain", self.nodes[0].sendtoaddress, sending_addr, node0_balance - Decimal('0.01'))
+
+        # Verify nothing new in wallet
+        assert_equal(total_txs, len(self.nodes[0].listtransactions("*",99999)))
+
 if __name__ == '__main__':
     WalletTest().main()

From 0388afe69dd85ca9549727ee105ba7017169b464 Mon Sep 17 00:00:00 2001
From: Luke Dashjr <luke-jr+git@utopios.org>
Date: Wed, 4 Jan 2017 17:07:42 +0000
Subject: [PATCH 1483/1802] Let autoconf detect presence of EVP_MD_CTX_new

Fixes LibreSSL compatibility
---
 configure.ac                  | 7 +++++++
 src/qt/paymentrequestplus.cpp | 4 ++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index ced258e02e4cf..02af0d638d2a5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -832,6 +832,13 @@ else
   fi
 fi
 
+save_CXXFLAGS="${CXXFLAGS}"
+CXXFLAGS="${CXXFLAGS} ${CRYPTO_CFLAGS} ${SSL_CFLAGS}"
+AC_CHECK_DECLS([EVP_MD_CTX_new],,,[AC_INCLUDES_DEFAULT
+#include <openssl/x509_vfy.h>
+])
+CXXFLAGS="${save_CXXFLAGS}"
+
 dnl univalue check
 
 need_bundled_univalue=yes
diff --git a/src/qt/paymentrequestplus.cpp b/src/qt/paymentrequestplus.cpp
index 82be4d831f6cd..0d4907bcadf1f 100644
--- a/src/qt/paymentrequestplus.cpp
+++ b/src/qt/paymentrequestplus.cpp
@@ -159,7 +159,7 @@ bool PaymentRequestPlus::getMerchant(X509_STORE* certStore, QString& merchant) c
         std::string data_to_verify;                     // Everything but the signature
         rcopy.SerializeToString(&data_to_verify);
 
-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
+#if HAVE_DECL_EVP_MD_CTX_NEW
         EVP_MD_CTX *ctx = EVP_MD_CTX_new();
         if (!ctx) throw SSLVerifyError("Error allocating OpenSSL context.");
 #else
@@ -174,7 +174,7 @@ bool PaymentRequestPlus::getMerchant(X509_STORE* certStore, QString& merchant) c
             !EVP_VerifyFinal(ctx, (const unsigned char*)paymentRequest.signature().data(), (unsigned int)paymentRequest.signature().size(), pubkey)) {
             throw SSLVerifyError("Bad signature, invalid payment request.");
         }
-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
+#if HAVE_DECL_EVP_MD_CTX_NEW
         EVP_MD_CTX_free(ctx);
 #endif
 

From dd44ea39bb6e1e2a244630909647ea7fbb052941 Mon Sep 17 00:00:00 2001
From: Russell Yanofsky <russ@yanofsky.org>
Date: Fri, 9 Dec 2016 12:28:22 -0500
Subject: [PATCH 1484/1802] Check FRESH validity in CCoinsViewCache::BatchWrite

---
 src/coins.cpp            |  7 +++++++
 src/test/coins_tests.cpp | 28 +++++++++++++++++-----------
 2 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/src/coins.cpp b/src/coins.cpp
index 68f32a9da4497..4d0e4bc0ad377 100644
--- a/src/coins.cpp
+++ b/src/coins.cpp
@@ -207,6 +207,13 @@ bool CCoinsViewCache::BatchWrite(CCoinsMap &mapCoins, const uint256 &hashBlockIn
                         entry.flags |= CCoinsCacheEntry::FRESH;
                 }
             } else {
+                // Assert that the child cache entry was not marked FRESH if the
+                // parent cache entry has unspent outputs. If this ever happens,
+                // it means the FRESH flag was misapplied and there is a logic
+                // error in the calling code.
+                if ((it->second.flags & CCoinsCacheEntry::FRESH) && !itUs->second.coins.IsPruned())
+                    throw std::logic_error("FRESH flag misapplied to cache entry for base transaction with spendable outputs");
+
                 // Found the entry in the parent cache
                 if ((itUs->second.flags & CCoinsCacheEntry::FRESH) && it->second.coins.IsPruned()) {
                     // The grandparent does not have an entry, and the child is
diff --git a/src/test/coins_tests.cpp b/src/test/coins_tests.cpp
index 70b958c296fc2..b25c7ccc51c0d 100644
--- a/src/test/coins_tests.cpp
+++ b/src/test/coins_tests.cpp
@@ -791,12 +791,18 @@ BOOST_AUTO_TEST_CASE(ccoins_modify_new)
 void CheckWriteCoins(CAmount parent_value, CAmount child_value, CAmount expected_value, char parent_flags, char child_flags, char expected_flags)
 {
     SingleEntryCacheTest test(ABSENT, parent_value, parent_flags);
-    WriteCoinsViewEntry(test.cache, child_value, child_flags);
-    test.cache.SelfTest();
 
     CAmount result_value;
     char result_flags;
-    GetCoinsMapEntry(test.cache.map(), result_value, result_flags);
+    try {
+        WriteCoinsViewEntry(test.cache, child_value, child_flags);
+        test.cache.SelfTest();
+        GetCoinsMapEntry(test.cache.map(), result_value, result_flags);
+    } catch (std::logic_error& e) {
+        result_value = FAIL;
+        result_flags = NO_ENTRY;
+    }
+
     BOOST_CHECK_EQUAL(result_value, expected_value);
     BOOST_CHECK_EQUAL(result_flags, expected_flags);
 }
@@ -840,21 +846,21 @@ BOOST_AUTO_TEST_CASE(ccoins_write)
     CheckWriteCoins(VALUE1, ABSENT, VALUE1, DIRTY      , NO_ENTRY   , DIRTY      );
     CheckWriteCoins(VALUE1, ABSENT, VALUE1, DIRTY|FRESH, NO_ENTRY   , DIRTY|FRESH);
     CheckWriteCoins(VALUE1, PRUNED, PRUNED, 0          , DIRTY      , DIRTY      );
-    CheckWriteCoins(VALUE1, PRUNED, PRUNED, 0          , DIRTY|FRESH, DIRTY      );
+    CheckWriteCoins(VALUE1, PRUNED, FAIL  , 0          , DIRTY|FRESH, NO_ENTRY   );
     CheckWriteCoins(VALUE1, PRUNED, ABSENT, FRESH      , DIRTY      , NO_ENTRY   );
-    CheckWriteCoins(VALUE1, PRUNED, ABSENT, FRESH      , DIRTY|FRESH, NO_ENTRY   );
+    CheckWriteCoins(VALUE1, PRUNED, FAIL  , FRESH      , DIRTY|FRESH, NO_ENTRY   );
     CheckWriteCoins(VALUE1, PRUNED, PRUNED, DIRTY      , DIRTY      , DIRTY      );
-    CheckWriteCoins(VALUE1, PRUNED, PRUNED, DIRTY      , DIRTY|FRESH, DIRTY      );
+    CheckWriteCoins(VALUE1, PRUNED, FAIL  , DIRTY      , DIRTY|FRESH, NO_ENTRY   );
     CheckWriteCoins(VALUE1, PRUNED, ABSENT, DIRTY|FRESH, DIRTY      , NO_ENTRY   );
-    CheckWriteCoins(VALUE1, PRUNED, ABSENT, DIRTY|FRESH, DIRTY|FRESH, NO_ENTRY   );
+    CheckWriteCoins(VALUE1, PRUNED, FAIL  , DIRTY|FRESH, DIRTY|FRESH, NO_ENTRY   );
     CheckWriteCoins(VALUE1, VALUE2, VALUE2, 0          , DIRTY      , DIRTY      );
-    CheckWriteCoins(VALUE1, VALUE2, VALUE2, 0          , DIRTY|FRESH, DIRTY      );
+    CheckWriteCoins(VALUE1, VALUE2, FAIL  , 0          , DIRTY|FRESH, NO_ENTRY   );
     CheckWriteCoins(VALUE1, VALUE2, VALUE2, FRESH      , DIRTY      , DIRTY|FRESH);
-    CheckWriteCoins(VALUE1, VALUE2, VALUE2, FRESH      , DIRTY|FRESH, DIRTY|FRESH);
+    CheckWriteCoins(VALUE1, VALUE2, FAIL  , FRESH      , DIRTY|FRESH, NO_ENTRY   );
     CheckWriteCoins(VALUE1, VALUE2, VALUE2, DIRTY      , DIRTY      , DIRTY      );
-    CheckWriteCoins(VALUE1, VALUE2, VALUE2, DIRTY      , DIRTY|FRESH, DIRTY      );
+    CheckWriteCoins(VALUE1, VALUE2, FAIL  , DIRTY      , DIRTY|FRESH, NO_ENTRY   );
     CheckWriteCoins(VALUE1, VALUE2, VALUE2, DIRTY|FRESH, DIRTY      , DIRTY|FRESH);
-    CheckWriteCoins(VALUE1, VALUE2, VALUE2, DIRTY|FRESH, DIRTY|FRESH, DIRTY|FRESH);
+    CheckWriteCoins(VALUE1, VALUE2, FAIL  , DIRTY|FRESH, DIRTY|FRESH, NO_ENTRY   );
 
     // The checks above omit cases where the child flags are not DIRTY, since
     // they would be too repetitive (the parent cache is never updated in these

From 80175472d1a9687da704c5180bda173596271b12 Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Sun, 18 Dec 2016 23:03:16 -0800
Subject: [PATCH 1485/1802] Make CBlockIndex*es in net_processing const

---
 src/net_processing.cpp | 48 +++++++++++++++++++++---------------------
 src/validation.cpp     |  6 ++++--
 src/validation.h       |  2 +-
 3 files changed, 29 insertions(+), 27 deletions(-)

diff --git a/src/net_processing.cpp b/src/net_processing.cpp
index ccfbb77fcd4eb..4374b5be3e4de 100644
--- a/src/net_processing.cpp
+++ b/src/net_processing.cpp
@@ -101,7 +101,7 @@ namespace {
     /** Blocks that are in flight, and that are in the queue to be downloaded. Protected by cs_main. */
     struct QueuedBlock {
         uint256 hash;
-        CBlockIndex* pindex;                                     //!< Optional.
+        const CBlockIndex* pindex;                               //!< Optional.
         bool fValidatedHeaders;                                  //!< Whether this block has validated headers at the time of request.
         std::unique_ptr<PartiallyDownloadedBlock> partialBlock;  //!< Optional, used for CMPCTBLOCK downloads
     };
@@ -156,13 +156,13 @@ struct CNodeState {
     //! List of asynchronously-determined block rejections to notify this peer about.
     std::vector<CBlockReject> rejects;
     //! The best known block we know this peer has announced.
-    CBlockIndex *pindexBestKnownBlock;
+    const CBlockIndex *pindexBestKnownBlock;
     //! The hash of the last unknown block this peer has announced.
     uint256 hashLastUnknownBlock;
     //! The last full block we both have.
-    CBlockIndex *pindexLastCommonBlock;
+    const CBlockIndex *pindexLastCommonBlock;
     //! The best header we have sent our peer.
-    CBlockIndex *pindexBestHeaderSent;
+    const CBlockIndex *pindexBestHeaderSent;
     //! Length of current-streak of unconnecting headers announcements
     int nUnconnectingHeaders;
     //! Whether we've started headers synchronization with this peer.
@@ -331,7 +331,7 @@ bool MarkBlockAsReceived(const uint256& hash) {
 // Requires cs_main.
 // returns false, still setting pit, if the block was already in flight from the same peer
 // pit will only be valid as long as the same cs_main lock is being held
-bool MarkBlockAsInFlight(NodeId nodeid, const uint256& hash, const Consensus::Params& consensusParams, CBlockIndex *pindex = NULL, list<QueuedBlock>::iterator **pit = NULL) {
+bool MarkBlockAsInFlight(NodeId nodeid, const uint256& hash, const Consensus::Params& consensusParams, const CBlockIndex *pindex = NULL, list<QueuedBlock>::iterator **pit = NULL) {
     CNodeState *state = State(nodeid);
     assert(state != NULL);
 
@@ -432,7 +432,7 @@ bool CanDirectFetch(const Consensus::Params &consensusParams)
 }
 
 // Requires cs_main
-bool PeerHasHeader(CNodeState *state, CBlockIndex *pindex)
+bool PeerHasHeader(CNodeState *state, const CBlockIndex *pindex)
 {
     if (state->pindexBestKnownBlock && pindex == state->pindexBestKnownBlock->GetAncestor(pindex->nHeight))
         return true;
@@ -443,7 +443,7 @@ bool PeerHasHeader(CNodeState *state, CBlockIndex *pindex)
 
 /** Find the last common ancestor two blocks have.
  *  Both pa and pb must be non-NULL. */
-CBlockIndex* LastCommonAncestor(CBlockIndex* pa, CBlockIndex* pb) {
+const CBlockIndex* LastCommonAncestor(const CBlockIndex* pa, const CBlockIndex* pb) {
     if (pa->nHeight > pb->nHeight) {
         pa = pa->GetAncestor(pb->nHeight);
     } else if (pb->nHeight > pa->nHeight) {
@@ -462,7 +462,7 @@ CBlockIndex* LastCommonAncestor(CBlockIndex* pa, CBlockIndex* pb) {
 
 /** Update pindexLastCommonBlock and add not-in-flight missing successors to vBlocks, until it has
  *  at most count entries. */
-void FindNextBlocksToDownload(NodeId nodeid, unsigned int count, std::vector<CBlockIndex*>& vBlocks, NodeId& nodeStaller, const Consensus::Params& consensusParams) {
+void FindNextBlocksToDownload(NodeId nodeid, unsigned int count, std::vector<const CBlockIndex*>& vBlocks, NodeId& nodeStaller, const Consensus::Params& consensusParams) {
     if (count == 0)
         return;
 
@@ -490,8 +490,8 @@ void FindNextBlocksToDownload(NodeId nodeid, unsigned int count, std::vector<CBl
     if (state->pindexLastCommonBlock == state->pindexBestKnownBlock)
         return;
 
-    std::vector<CBlockIndex*> vToFetch;
-    CBlockIndex *pindexWalk = state->pindexLastCommonBlock;
+    std::vector<const CBlockIndex*> vToFetch;
+    const CBlockIndex *pindexWalk = state->pindexLastCommonBlock;
     // Never fetch further than the best block we know the peer has, or more than BLOCK_DOWNLOAD_WINDOW + 1 beyond the last
     // linked block we have in common with this peer. The +1 is so we can detect stalling, namely if we would be able to
     // download that next block if the window were 1 larger.
@@ -514,7 +514,7 @@ void FindNextBlocksToDownload(NodeId nodeid, unsigned int count, std::vector<CBl
         // are not yet downloaded and not in flight to vBlocks. In the mean time, update
         // pindexLastCommonBlock as long as all ancestors are already downloaded, or if it's
         // already part of our chain (and therefore don't need it even if pruned).
-        BOOST_FOREACH(CBlockIndex* pindex, vToFetch) {
+        BOOST_FOREACH(const CBlockIndex* pindex, vToFetch) {
             if (!pindex->IsValid(BLOCK_VALID_TREE)) {
                 // We consider the chain that this peer is on invalid.
                 return;
@@ -1049,7 +1049,7 @@ void static ProcessGetData(CNode* pfrom, const Consensus::Params& consensusParam
     }
 }
 
-uint32_t GetFetchFlags(CNode* pfrom, CBlockIndex* pprev, const Consensus::Params& chainparams) {
+uint32_t GetFetchFlags(CNode* pfrom, const CBlockIndex* pprev, const Consensus::Params& chainparams) {
     uint32_t nFetchFlags = 0;
     if ((pfrom->GetLocalServices() & NODE_WITNESS) && State(pfrom->GetId())->fHaveWitness) {
         nFetchFlags |= MSG_WITNESS_FLAG;
@@ -1456,7 +1456,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
         LOCK(cs_main);
 
         // Find the last block the caller has in the main chain
-        CBlockIndex* pindex = FindForkInGlobalIndex(chainActive, locator);
+        const CBlockIndex* pindex = FindForkInGlobalIndex(chainActive, locator);
 
         // Send the rest of the chain
         if (pindex)
@@ -1552,7 +1552,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
         }
 
         CNodeState *nodestate = State(pfrom->GetId());
-        CBlockIndex* pindex = NULL;
+        const CBlockIndex* pindex = NULL;
         if (locator.IsNull())
         {
             // If locator is null, return the hashStop block
@@ -1775,7 +1775,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
         }
         }
 
-        CBlockIndex *pindex = NULL;
+        const CBlockIndex *pindex = NULL;
         CValidationState state;
         if (!ProcessNewBlockHeaders({cmpctblock.header}, state, chainparams, &pindex)) {
             int nDoS;
@@ -2051,7 +2051,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
             return true;
         }
 
-        CBlockIndex *pindexLast = NULL;
+        const CBlockIndex *pindexLast = NULL;
         {
         LOCK(cs_main);
         CNodeState *nodestate = State(pfrom->GetId());
@@ -2128,8 +2128,8 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
         // If this set of headers is valid and ends in a block with at least as
         // much work as our tip, download as much as possible.
         if (fCanDirectFetch && pindexLast->IsValid(BLOCK_VALID_TREE) && chainActive.Tip()->nChainWork <= pindexLast->nChainWork) {
-            vector<CBlockIndex *> vToFetch;
-            CBlockIndex *pindexWalk = pindexLast;
+            vector<const CBlockIndex *> vToFetch;
+            const CBlockIndex *pindexWalk = pindexLast;
             // Calculate all the blocks we'd need to switch to pindexLast, up to a limit.
             while (pindexWalk && !chainActive.Contains(pindexWalk) && vToFetch.size() <= MAX_BLOCKS_IN_TRANSIT_PER_PEER) {
                 if (!(pindexWalk->nStatus & BLOCK_HAVE_DATA) &&
@@ -2151,7 +2151,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
             } else {
                 vector<CInv> vGetData;
                 // Download as much as possible, from earliest to latest.
-                BOOST_REVERSE_FOREACH(CBlockIndex *pindex, vToFetch) {
+                BOOST_REVERSE_FOREACH(const CBlockIndex *pindex, vToFetch) {
                     if (nodestate->nBlocksInFlight >= MAX_BLOCKS_IN_TRANSIT_PER_PEER) {
                         // Can't download any more from this peer
                         break;
@@ -2740,7 +2740,7 @@ bool SendMessages(CNode* pto, CConnman& connman, std::atomic<bool>& interruptMsg
             bool fRevertToInv = ((!state.fPreferHeaders &&
                                  (!state.fPreferHeaderAndIDs || pto->vBlockHashesToAnnounce.size() > 1)) ||
                                 pto->vBlockHashesToAnnounce.size() > MAX_BLOCKS_TO_ANNOUNCE);
-            CBlockIndex *pBestIndex = NULL; // last header queued for delivery
+            const CBlockIndex *pBestIndex = NULL; // last header queued for delivery
             ProcessBlockAvailability(pto->id); // ensure pindexBestKnownBlock is up-to-date
 
             if (!fRevertToInv) {
@@ -2751,7 +2751,7 @@ bool SendMessages(CNode* pto, CConnman& connman, std::atomic<bool>& interruptMsg
                 BOOST_FOREACH(const uint256 &hash, pto->vBlockHashesToAnnounce) {
                     BlockMap::iterator mi = mapBlockIndex.find(hash);
                     assert(mi != mapBlockIndex.end());
-                    CBlockIndex *pindex = mi->second;
+                    const CBlockIndex *pindex = mi->second;
                     if (chainActive[pindex->nHeight] != pindex) {
                         // Bail out if we reorged away from this block
                         fRevertToInv = true;
@@ -2828,7 +2828,7 @@ bool SendMessages(CNode* pto, CConnman& connman, std::atomic<bool>& interruptMsg
                     const uint256 &hashToAnnounce = pto->vBlockHashesToAnnounce.back();
                     BlockMap::iterator mi = mapBlockIndex.find(hashToAnnounce);
                     assert(mi != mapBlockIndex.end());
-                    CBlockIndex *pindex = mi->second;
+                    const CBlockIndex *pindex = mi->second;
 
                     // Warn if we're announcing a block that is not on the main chain.
                     // This should be very rare and could be optimized out.
@@ -3013,10 +3013,10 @@ bool SendMessages(CNode* pto, CConnman& connman, std::atomic<bool>& interruptMsg
         //
         vector<CInv> vGetData;
         if (!pto->fClient && (fFetch || !IsInitialBlockDownload()) && state.nBlocksInFlight < MAX_BLOCKS_IN_TRANSIT_PER_PEER) {
-            vector<CBlockIndex*> vToDownload;
+            vector<const CBlockIndex*> vToDownload;
             NodeId staller = -1;
             FindNextBlocksToDownload(pto->GetId(), MAX_BLOCKS_IN_TRANSIT_PER_PEER - state.nBlocksInFlight, vToDownload, staller, consensusParams);
-            BOOST_FOREACH(CBlockIndex *pindex, vToDownload) {
+            BOOST_FOREACH(const CBlockIndex *pindex, vToDownload) {
                 uint32_t nFetchFlags = GetFetchFlags(pto, pindex->pprev, consensusParams);
                 vGetData.push_back(CInv(MSG_BLOCK | nFetchFlags, pindex->GetBlockHash()));
                 MarkBlockAsInFlight(pto->GetId(), pindex->GetBlockHash(), consensusParams, pindex);
diff --git a/src/validation.cpp b/src/validation.cpp
index ca1e5a713c43d..a6466334a1ce5 100644
--- a/src/validation.cpp
+++ b/src/validation.cpp
@@ -3030,12 +3030,14 @@ static bool AcceptBlockHeader(const CBlockHeader& block, CValidationState& state
 }
 
 // Exposed wrapper for AcceptBlockHeader
-bool ProcessNewBlockHeaders(const std::vector<CBlockHeader>& headers, CValidationState& state, const CChainParams& chainparams, CBlockIndex** ppindex)
+bool ProcessNewBlockHeaders(const std::vector<CBlockHeader>& headers, CValidationState& state, const CChainParams& chainparams, const CBlockIndex** ppindex)
 {
     {
         LOCK(cs_main);
         for (const CBlockHeader& header : headers) {
-            if (!AcceptBlockHeader(header, state, chainparams, ppindex)) {
+            // cast away the ppindex-returns-const CBlockIndex - we're just assigning it to a CBlockIndex*
+            // that we own and is updated non-const anyway
+            if (!AcceptBlockHeader(header, state, chainparams, const_cast<CBlockIndex**>(ppindex))) {
                 return false;
             }
         }
diff --git a/src/validation.h b/src/validation.h
index 981f659633b98..be49b0e65b796 100644
--- a/src/validation.h
+++ b/src/validation.h
@@ -243,7 +243,7 @@ bool ProcessNewBlock(const CChainParams& chainparams, const std::shared_ptr<cons
  * @param[in]  chainparams The params for the chain we want to connect to
  * @param[out] ppindex If set, the pointer will be set to point to the last new block index object for the given headers
  */
-bool ProcessNewBlockHeaders(const std::vector<CBlockHeader>& block, CValidationState& state, const CChainParams& chainparams, CBlockIndex** ppindex=NULL);
+bool ProcessNewBlockHeaders(const std::vector<CBlockHeader>& block, CValidationState& state, const CChainParams& chainparams, const CBlockIndex** ppindex=NULL);
 
 /** Check whether enough disk space is available for an incoming block */
 bool CheckDiskSpace(uint64_t nAdditionalBytes = 0);

From 9a0b2f4c5b5cbdf37c68710ab8af877bd322d99c Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Wed, 4 Jan 2017 01:28:28 +0100
Subject: [PATCH 1486/1802] [qa] Make compact blocks test construction using
 fetch methods

---
 qa/rpc-tests/p2p-compactblocks.py | 26 +++++++++++++++++++-------
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/qa/rpc-tests/p2p-compactblocks.py b/qa/rpc-tests/p2p-compactblocks.py
index fc1f16c6d2a05..9151ecf5de36b 100755
--- a/qa/rpc-tests/p2p-compactblocks.py
+++ b/qa/rpc-tests/p2p-compactblocks.py
@@ -310,6 +310,9 @@ def test_compactblock_construction(self, node, test_node, version, use_witness_a
         tip = int(node.getbestblockhash(), 16)
         assert(test_node.wait_for_block_announcement(tip))
 
+        # Make sure we will receive a fast-announce compact block
+        self.request_cb_announcements(test_node, node, version)
+
         # Now mine a block, and look at the resulting compact block.
         test_node.clear_block_announcement()
         block_hash = int(node.generate(1)[0], 16)
@@ -319,27 +322,36 @@ def test_compactblock_construction(self, node, test_node, version, use_witness_a
         [tx.calc_sha256() for tx in block.vtx]
         block.rehash()
 
-        # Don't care which type of announcement came back for this test; just
-        # request the compact block if we didn't get one yet.
+        # Wait until the block was announced (via compact blocks)
         wait_until(test_node.received_block_announcement, timeout=30)
         assert(test_node.received_block_announcement())
 
+        # Now fetch and check the compact block
+        header_and_shortids = None
+        with mininode_lock:
+            assert(test_node.last_cmpctblock is not None)
+            # Convert the on-the-wire representation to absolute indexes
+            header_and_shortids = HeaderAndShortIDs(test_node.last_cmpctblock.header_and_shortids)
+        self.check_compactblock_construction_from_block(version, header_and_shortids, block_hash, block)
+
+        # Now fetch the compact block using a normal non-announce getdata
         with mininode_lock:
-            if test_node.last_cmpctblock is None:
-                test_node.clear_block_announcement()
-                inv = CInv(4, block_hash)  # 4 == "CompactBlock"
-                test_node.send_message(msg_getdata([inv]))
+            test_node.clear_block_announcement()
+            inv = CInv(4, block_hash)  # 4 == "CompactBlock"
+            test_node.send_message(msg_getdata([inv]))
 
         wait_until(test_node.received_block_announcement, timeout=30)
         assert(test_node.received_block_announcement())
 
-        # Now we should have the compactblock
+        # Now fetch and check the compact block
         header_and_shortids = None
         with mininode_lock:
             assert(test_node.last_cmpctblock is not None)
             # Convert the on-the-wire representation to absolute indexes
             header_and_shortids = HeaderAndShortIDs(test_node.last_cmpctblock.header_and_shortids)
+        self.check_compactblock_construction_from_block(version, header_and_shortids, block_hash, block)
 
+    def check_compactblock_construction_from_block(self, version, header_and_shortids, block_hash, block):
         # Check that we got the right block!
         header_and_shortids.header.calc_sha256()
         assert_equal(header_and_shortids.header.sha256, block_hash)

From 8baaba653ef67097eb3d3a4b4d25f907111830b1 Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Mon, 19 Dec 2016 00:47:08 -0800
Subject: [PATCH 1487/1802] [qa] Avoid race in preciousblock test.

If node 0 is sufficiently fast to announce its block to node 1,
node 1 might already have the block by the time the
node_sync_via_rpc loop gets around to node 1, resulting in the
submitblock result "duplicate-inconclusive" as node 1 has the block,
but prefers an alternate chain.
---
 qa/rpc-tests/preciousblock.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qa/rpc-tests/preciousblock.py b/qa/rpc-tests/preciousblock.py
index f43160e19a725..a806294648410 100755
--- a/qa/rpc-tests/preciousblock.py
+++ b/qa/rpc-tests/preciousblock.py
@@ -102,7 +102,7 @@ def run_test(self):
         assert_equal(self.nodes[2].getblockcount(), 6)
         hashL = self.nodes[2].getbestblockhash()
         print("Connect nodes and check no reorg occurs")
-        node_sync_via_rpc(self.nodes[0:3])
+        node_sync_via_rpc(self.nodes[1:3])
         connect_nodes_bi(self.nodes,1,2)
         connect_nodes_bi(self.nodes,0,2)
         assert_equal(self.nodes[0].getbestblockhash(), hashH)

From 180586fd44c3154af846e18850c83d0ac1296787 Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Sun, 18 Dec 2016 23:24:11 -0800
Subject: [PATCH 1488/1802] Call AcceptBlock with the block's shared_ptr
 instead of CBlock&

---
 src/validation.cpp | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/validation.cpp b/src/validation.cpp
index a6466334a1ce5..d6bd789647613 100644
--- a/src/validation.cpp
+++ b/src/validation.cpp
@@ -3047,8 +3047,10 @@ bool ProcessNewBlockHeaders(const std::vector<CBlockHeader>& headers, CValidatio
 }
 
 /** Store block on disk. If dbp is non-NULL, the file is known to already reside on disk */
-static bool AcceptBlock(const CBlock& block, CValidationState& state, const CChainParams& chainparams, CBlockIndex** ppindex, bool fRequested, const CDiskBlockPos* dbp, bool* fNewBlock)
+static bool AcceptBlock(const std::shared_ptr<const CBlock>& pblock, CValidationState& state, const CChainParams& chainparams, CBlockIndex** ppindex, bool fRequested, const CDiskBlockPos* dbp, bool* fNewBlock)
 {
+    const CBlock& block = *pblock;
+
     if (fNewBlock) *fNewBlock = false;
     AssertLockHeld(cs_main);
 
@@ -3128,7 +3130,7 @@ bool ProcessNewBlock(const CChainParams& chainparams, const std::shared_ptr<cons
         CBlockIndex *pindex = NULL;
         if (fNewBlock) *fNewBlock = false;
         CValidationState state;
-        bool ret = AcceptBlock(*pblock, state, chainparams, &pindex, fForceProcessing, NULL, fNewBlock);
+        bool ret = AcceptBlock(pblock, state, chainparams, &pindex, fForceProcessing, NULL, fNewBlock);
         CheckBlockIndex(chainparams.GetConsensus());
         if (!ret) {
             GetMainSignals().BlockChecked(*pblock, state);
@@ -3755,7 +3757,8 @@ bool LoadExternalBlockFile(const CChainParams& chainparams, FILE* fileIn, CDiskB
                     dbp->nPos = nBlockPos;
                 blkdat.SetLimit(nBlockPos + nSize);
                 blkdat.SetPos(nBlockPos);
-                CBlock block;
+                std::shared_ptr<CBlock> pblock = std::make_shared<CBlock>();
+                CBlock& block = *pblock;
                 blkdat >> block;
                 nRewind = blkdat.GetPos();
 
@@ -3773,7 +3776,7 @@ bool LoadExternalBlockFile(const CChainParams& chainparams, FILE* fileIn, CDiskB
                 if (mapBlockIndex.count(hash) == 0 || (mapBlockIndex[hash]->nStatus & BLOCK_HAVE_DATA) == 0) {
                     LOCK(cs_main);
                     CValidationState state;
-                    if (AcceptBlock(block, state, chainparams, NULL, true, dbp, NULL))
+                    if (AcceptBlock(pblock, state, chainparams, NULL, true, dbp, NULL))
                         nLoaded++;
                     if (state.IsError())
                         break;
@@ -3800,16 +3803,17 @@ bool LoadExternalBlockFile(const CChainParams& chainparams, FILE* fileIn, CDiskB
                     std::pair<std::multimap<uint256, CDiskBlockPos>::iterator, std::multimap<uint256, CDiskBlockPos>::iterator> range = mapBlocksUnknownParent.equal_range(head);
                     while (range.first != range.second) {
                         std::multimap<uint256, CDiskBlockPos>::iterator it = range.first;
-                        if (ReadBlockFromDisk(block, it->second, chainparams.GetConsensus()))
+                        std::shared_ptr<CBlock> pblockrecursive = std::make_shared<CBlock>();
+                        if (ReadBlockFromDisk(*pblockrecursive, it->second, chainparams.GetConsensus()))
                         {
-                            LogPrint("reindex", "%s: Processing out of order child %s of %s\n", __func__, block.GetHash().ToString(),
+                            LogPrint("reindex", "%s: Processing out of order child %s of %s\n", __func__, pblockrecursive->GetHash().ToString(),
                                     head.ToString());
                             LOCK(cs_main);
                             CValidationState dummy;
-                            if (AcceptBlock(block, dummy, chainparams, NULL, true, &it->second, NULL))
+                            if (AcceptBlock(pblockrecursive, dummy, chainparams, NULL, true, &it->second, NULL))
                             {
                                 nLoaded++;
-                                queue.push_back(block.GetHash());
+                                queue.push_back(pblockrecursive->GetHash());
                             }
                         }
                         range.first++;

From a4bac66cca62a5514579a15d198f3baa80683172 Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Wed, 4 Jan 2017 07:09:02 -0800
Subject: [PATCH 1489/1802] [MOVEONLY] Move progress estimation out of
 checkpoints

---
 src/checkpoints.cpp    | 40 --------------------------------------
 src/checkpoints.h      |  2 --
 src/qt/clientmodel.cpp |  2 +-
 src/rpc/blockchain.cpp |  2 +-
 src/validation.cpp     | 44 ++++++++++++++++++++++++++++++++++++++++--
 src/validation.h       |  4 ++++
 src/wallet/wallet.cpp  |  8 ++++----
 7 files changed, 52 insertions(+), 50 deletions(-)

diff --git a/src/checkpoints.cpp b/src/checkpoints.cpp
index 9a20747049a94..13b58765301df 100644
--- a/src/checkpoints.cpp
+++ b/src/checkpoints.cpp
@@ -15,46 +15,6 @@
 
 namespace Checkpoints {
 
-    /**
-     * How many times slower we expect checking transactions after the last
-     * checkpoint to be (from checking signatures, which is skipped up to the
-     * last checkpoint). This number is a compromise, as it can't be accurate
-     * for every system. When reindexing from a fast disk with a slow CPU, it
-     * can be up to 20, while when downloading from a slow network with a
-     * fast multicore CPU, it won't be much higher than 1.
-     */
-    static const double SIGCHECK_VERIFICATION_FACTOR = 5.0;
-
-    //! Guess how far we are in the verification process at the given block index
-    double GuessVerificationProgress(const CCheckpointData& data, CBlockIndex *pindex, bool fSigchecks) {
-        if (pindex==NULL)
-            return 0.0;
-
-        int64_t nNow = time(NULL);
-
-        double fSigcheckVerificationFactor = fSigchecks ? SIGCHECK_VERIFICATION_FACTOR : 1.0;
-        double fWorkBefore = 0.0; // Amount of work done before pindex
-        double fWorkAfter = 0.0;  // Amount of work left after pindex (estimated)
-        // Work is defined as: 1.0 per transaction before the last checkpoint, and
-        // fSigcheckVerificationFactor per transaction after.
-
-        if (pindex->nChainTx <= data.nTransactionsLastCheckpoint) {
-            double nCheapBefore = pindex->nChainTx;
-            double nCheapAfter = data.nTransactionsLastCheckpoint - pindex->nChainTx;
-            double nExpensiveAfter = (nNow - data.nTimeLastCheckpoint)/86400.0*data.fTransactionsPerDay;
-            fWorkBefore = nCheapBefore;
-            fWorkAfter = nCheapAfter + nExpensiveAfter*fSigcheckVerificationFactor;
-        } else {
-            double nCheapBefore = data.nTransactionsLastCheckpoint;
-            double nExpensiveBefore = pindex->nChainTx - data.nTransactionsLastCheckpoint;
-            double nExpensiveAfter = (nNow - pindex->GetBlockTime())/86400.0*data.fTransactionsPerDay;
-            fWorkBefore = nCheapBefore + nExpensiveBefore*fSigcheckVerificationFactor;
-            fWorkAfter = nExpensiveAfter*fSigcheckVerificationFactor;
-        }
-
-        return fWorkBefore / (fWorkBefore + fWorkAfter);
-    }
-
     CBlockIndex* GetLastCheckpoint(const CCheckpointData& data)
     {
         const MapCheckpoints& checkpoints = data.mapCheckpoints;
diff --git a/src/checkpoints.h b/src/checkpoints.h
index f826de2319367..7449d1063babd 100644
--- a/src/checkpoints.h
+++ b/src/checkpoints.h
@@ -22,8 +22,6 @@ namespace Checkpoints
 //! Returns last CBlockIndex* in mapBlockIndex that is a checkpoint
 CBlockIndex* GetLastCheckpoint(const CCheckpointData& data);
 
-double GuessVerificationProgress(const CCheckpointData& data, CBlockIndex* pindex, bool fSigchecks = true);
-
 } //namespace Checkpoints
 
 #endif // BITCOIN_CHECKPOINTS_H
diff --git a/src/qt/clientmodel.cpp b/src/qt/clientmodel.cpp
index 20a04dc8a8931..aefcc47255b60 100644
--- a/src/qt/clientmodel.cpp
+++ b/src/qt/clientmodel.cpp
@@ -130,7 +130,7 @@ double ClientModel::getVerificationProgress(const CBlockIndex *tipIn) const
         LOCK(cs_main);
         tip = chainActive.Tip();
     }
-    return Checkpoints::GuessVerificationProgress(Params().Checkpoints(), tip);
+    return GuessVerificationProgress(Params().Checkpoints(), tip);
 }
 
 void ClientModel::updateTimer()
diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp
index a127f10b8be30..a3954d81fcb72 100644
--- a/src/rpc/blockchain.cpp
+++ b/src/rpc/blockchain.cpp
@@ -1073,7 +1073,7 @@ UniValue getblockchaininfo(const JSONRPCRequest& request)
     obj.push_back(Pair("bestblockhash",         chainActive.Tip()->GetBlockHash().GetHex()));
     obj.push_back(Pair("difficulty",            (double)GetDifficulty()));
     obj.push_back(Pair("mediantime",            (int64_t)chainActive.Tip()->GetMedianTimePast()));
-    obj.push_back(Pair("verificationprogress",  Checkpoints::GuessVerificationProgress(Params().Checkpoints(), chainActive.Tip())));
+    obj.push_back(Pair("verificationprogress",  GuessVerificationProgress(Params().Checkpoints(), chainActive.Tip())));
     obj.push_back(Pair("chainwork",             chainActive.Tip()->nChainWork.GetHex()));
     obj.push_back(Pair("pruned",                fPruneMode));
 
diff --git a/src/validation.cpp b/src/validation.cpp
index ca1e5a713c43d..ea43d4f17190d 100644
--- a/src/validation.cpp
+++ b/src/validation.cpp
@@ -2080,7 +2080,7 @@ void static UpdateTip(CBlockIndex *pindexNew, const CChainParams& chainParams) {
       chainActive.Tip()->GetBlockHash().ToString(), chainActive.Height(), chainActive.Tip()->nVersion,
       log(chainActive.Tip()->nChainWork.getdouble())/log(2.0), (unsigned long)chainActive.Tip()->nChainTx,
       DateTimeStrFormat("%Y-%m-%d %H:%M:%S", chainActive.Tip()->GetBlockTime()),
-      Checkpoints::GuessVerificationProgress(chainParams.Checkpoints(), chainActive.Tip()), pcoinsTip->DynamicMemoryUsage() * (1.0 / (1<<20)), pcoinsTip->GetCacheSize());
+      GuessVerificationProgress(chainParams.Checkpoints(), chainActive.Tip()), pcoinsTip->DynamicMemoryUsage() * (1.0 / (1<<20)), pcoinsTip->GetCacheSize());
     if (!warningMessages.empty())
         LogPrintf(" warning='%s'", boost::algorithm::join(warningMessages, ", "));
     LogPrintf("\n");
@@ -3445,7 +3445,7 @@ bool static LoadBlockIndexDB(const CChainParams& chainparams)
     LogPrintf("%s: hashBestChain=%s height=%d date=%s progress=%f\n", __func__,
         chainActive.Tip()->GetBlockHash().ToString(), chainActive.Height(),
         DateTimeStrFormat("%Y-%m-%d %H:%M:%S", chainActive.Tip()->GetBlockTime()),
-        Checkpoints::GuessVerificationProgress(chainparams.Checkpoints(), chainActive.Tip()));
+        GuessVerificationProgress(chainparams.Checkpoints(), chainActive.Tip()));
 
     return true;
 }
@@ -4141,6 +4141,46 @@ void DumpMempool(void)
     }
 }
 
+/**
+ * How many times slower we expect checking transactions after the last
+ * checkpoint to be (from checking signatures, which is skipped up to the
+ * last checkpoint). This number is a compromise, as it can't be accurate
+ * for every system. When reindexing from a fast disk with a slow CPU, it
+ * can be up to 20, while when downloading from a slow network with a
+ * fast multicore CPU, it won't be much higher than 1.
+ */
+static const double SIGCHECK_VERIFICATION_FACTOR = 5.0;
+
+//! Guess how far we are in the verification process at the given block index
+double GuessVerificationProgress(const CCheckpointData& data, CBlockIndex *pindex, bool fSigchecks) {
+    if (pindex==NULL)
+        return 0.0;
+
+    int64_t nNow = time(NULL);
+
+    double fSigcheckVerificationFactor = fSigchecks ? SIGCHECK_VERIFICATION_FACTOR : 1.0;
+    double fWorkBefore = 0.0; // Amount of work done before pindex
+    double fWorkAfter = 0.0;  // Amount of work left after pindex (estimated)
+    // Work is defined as: 1.0 per transaction before the last checkpoint, and
+    // fSigcheckVerificationFactor per transaction after.
+
+    if (pindex->nChainTx <= data.nTransactionsLastCheckpoint) {
+        double nCheapBefore = pindex->nChainTx;
+        double nCheapAfter = data.nTransactionsLastCheckpoint - pindex->nChainTx;
+        double nExpensiveAfter = (nNow - data.nTimeLastCheckpoint)/86400.0*data.fTransactionsPerDay;
+        fWorkBefore = nCheapBefore;
+        fWorkAfter = nCheapAfter + nExpensiveAfter*fSigcheckVerificationFactor;
+    } else {
+        double nCheapBefore = data.nTransactionsLastCheckpoint;
+        double nExpensiveBefore = pindex->nChainTx - data.nTransactionsLastCheckpoint;
+        double nExpensiveAfter = (nNow - pindex->GetBlockTime())/86400.0*data.fTransactionsPerDay;
+        fWorkBefore = nCheapBefore + nExpensiveBefore*fSigcheckVerificationFactor;
+        fWorkAfter = nExpensiveAfter*fSigcheckVerificationFactor;
+    }
+
+    return fWorkBefore / (fWorkBefore + fWorkAfter);
+}
+
 class CMainCleanup
 {
 public:
diff --git a/src/validation.h b/src/validation.h
index 981f659633b98..0288e9163e6c9 100644
--- a/src/validation.h
+++ b/src/validation.h
@@ -42,6 +42,7 @@ class CScriptCheck;
 class CTxMemPool;
 class CValidationInterface;
 class CValidationState;
+class CCheckpointData;
 
 struct PrecomputedTransactionData;
 struct LockPoints;
@@ -279,6 +280,9 @@ bool GetTransaction(const uint256 &hash, CTransactionRef &tx, const Consensus::P
 bool ActivateBestChain(CValidationState& state, const CChainParams& chainparams, std::shared_ptr<const CBlock> pblock = std::shared_ptr<const CBlock>());
 CAmount GetBlockSubsidy(int nHeight, const Consensus::Params& consensusParams);
 
+/** Guess verification progress (as a fraction between 0.0=genesis and 1.0=current tip). */
+double GuessVerificationProgress(const CCheckpointData& data, CBlockIndex* pindex, bool fSigchecks = true);
+
 /**
  * Prune block and undo files (blk???.dat and undo???.dat) so that the disk space used is less than a user-defined target.
  * The user sets the target (in MB) on the command line or in config file.  This will be run on startup and whenever new
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index 96768325603b2..50eab61739a55 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -1479,12 +1479,12 @@ int CWallet::ScanForWalletTransactions(CBlockIndex* pindexStart, bool fUpdate)
             pindex = chainActive.Next(pindex);
 
         ShowProgress(_("Rescanning..."), 0); // show rescan progress in GUI as dialog or on splashscreen, if -rescan on startup
-        double dProgressStart = Checkpoints::GuessVerificationProgress(chainParams.Checkpoints(), pindex, false);
-        double dProgressTip = Checkpoints::GuessVerificationProgress(chainParams.Checkpoints(), chainActive.Tip(), false);
+        double dProgressStart = GuessVerificationProgress(chainParams.Checkpoints(), pindex, false);
+        double dProgressTip = GuessVerificationProgress(chainParams.Checkpoints(), chainActive.Tip(), false);
         while (pindex)
         {
             if (pindex->nHeight % 100 == 0 && dProgressTip - dProgressStart > 0.0)
-                ShowProgress(_("Rescanning..."), std::max(1, std::min(99, (int)((Checkpoints::GuessVerificationProgress(chainParams.Checkpoints(), pindex, false) - dProgressStart) / (dProgressTip - dProgressStart) * 100))));
+                ShowProgress(_("Rescanning..."), std::max(1, std::min(99, (int)((GuessVerificationProgress(chainParams.Checkpoints(), pindex, false) - dProgressStart) / (dProgressTip - dProgressStart) * 100))));
 
             CBlock block;
             ReadBlockFromDisk(block, pindex, Params().GetConsensus());
@@ -1497,7 +1497,7 @@ int CWallet::ScanForWalletTransactions(CBlockIndex* pindexStart, bool fUpdate)
             pindex = chainActive.Next(pindex);
             if (GetTime() >= nNow + 60) {
                 nNow = GetTime();
-                LogPrintf("Still rescanning. At block %d. Progress=%f\n", pindex->nHeight, Checkpoints::GuessVerificationProgress(chainParams.Checkpoints(), pindex));
+                LogPrintf("Still rescanning. At block %d. Progress=%f\n", pindex->nHeight, GuessVerificationProgress(chainParams.Checkpoints(), pindex));
             }
         }
         ShowProgress(_("Rescanning..."), 100); // hide progress dialog in GUI

From 3641141c8f9bdc68fcc0792ce8842a8e33ea7320 Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Wed, 4 Jan 2017 07:31:56 -0800
Subject: [PATCH 1490/1802] Move tx estimation data out of CCheckPointData

---
 src/chainparams.cpp    | 14 ++++++++++++--
 src/chainparams.h      |  5 +++++
 src/qt/clientmodel.cpp |  2 +-
 src/rpc/blockchain.cpp |  2 +-
 src/validation.cpp     |  6 +++---
 src/validation.h       |  4 ++--
 src/wallet/wallet.cpp  |  8 ++++----
 7 files changed, 28 insertions(+), 13 deletions(-)

diff --git a/src/chainparams.cpp b/src/chainparams.cpp
index 1e294da9f4be8..06196de362529 100644
--- a/src/chainparams.cpp
+++ b/src/chainparams.cpp
@@ -151,7 +151,10 @@ class CMainParams : public CChainParams {
             (225430, uint256S("0x00000000000001c108384350f74090433e7fcf79a606b8e797f065b130575932"))
             (250000, uint256S("0x000000000000003887df1f29024b06fc2200b55f8af8f35453d7be294df2d214"))
             (279000, uint256S("0x0000000000000001ae8c72a0b0c301f67e3afca10e819efa9041e458e9bd7e40"))
-            (295000, uint256S("0x00000000000000004d9b4ef50f0f9d686fd69db2e03af35a100370c64632a983")),
+            (295000, uint256S("0x00000000000000004d9b4ef50f0f9d686fd69db2e03af35a100370c64632a983"))
+        };
+
+        chainTxData = ChainTxData{
             1397080064, // * UNIX timestamp of last checkpoint block
             36544669,   // * total number of transactions between genesis and last checkpoint
                         //   (the tx=... number in the SetBestChain debug.log lines)
@@ -234,6 +237,9 @@ class CTestNetParams : public CChainParams {
         checkpointData = (CCheckpointData) {
             boost::assign::map_list_of
             ( 546, uint256S("000000002a936ca763904c3c35fce2f3556c559c0214345d31b1bcebf76acb70")),
+        };
+
+        chainTxData = ChainTxData{
             1337966069,
             1488,
             300
@@ -297,11 +303,15 @@ class CRegTestParams : public CChainParams {
 
         checkpointData = (CCheckpointData){
             boost::assign::map_list_of
-            ( 0, uint256S("0f9188f13cb7b2c71f2a335e3a4fc328bf5beb436012afca590b1a11466e2206")),
+            ( 0, uint256S("0f9188f13cb7b2c71f2a335e3a4fc328bf5beb436012afca590b1a11466e2206"))
+        };
+
+        chainTxData = ChainTxData{
             0,
             0,
             0
         };
+
         base58Prefixes[PUBKEY_ADDRESS] = std::vector<unsigned char>(1,111);
         base58Prefixes[SCRIPT_ADDRESS] = std::vector<unsigned char>(1,196);
         base58Prefixes[SECRET_KEY] =     std::vector<unsigned char>(1,239);
diff --git a/src/chainparams.h b/src/chainparams.h
index 381bac12f97de..8dbde9fc241eb 100644
--- a/src/chainparams.h
+++ b/src/chainparams.h
@@ -28,6 +28,9 @@ typedef std::map<int, uint256> MapCheckpoints;
 
 struct CCheckpointData {
     MapCheckpoints mapCheckpoints;
+};
+
+struct ChainTxData {
     int64_t nTimeLastCheckpoint;
     int64_t nTransactionsLastCheckpoint;
     double fTransactionsPerDay;
@@ -73,6 +76,7 @@ class CChainParams
     const std::vector<unsigned char>& Base58Prefix(Base58Type type) const { return base58Prefixes[type]; }
     const std::vector<SeedSpec6>& FixedSeeds() const { return vFixedSeeds; }
     const CCheckpointData& Checkpoints() const { return checkpointData; }
+    const ChainTxData& TxData() const { return chainTxData; }
 protected:
     CChainParams() {}
 
@@ -90,6 +94,7 @@ class CChainParams
     bool fRequireStandard;
     bool fMineBlocksOnDemand;
     CCheckpointData checkpointData;
+    ChainTxData chainTxData;
 };
 
 /**
diff --git a/src/qt/clientmodel.cpp b/src/qt/clientmodel.cpp
index aefcc47255b60..bb10e49422068 100644
--- a/src/qt/clientmodel.cpp
+++ b/src/qt/clientmodel.cpp
@@ -130,7 +130,7 @@ double ClientModel::getVerificationProgress(const CBlockIndex *tipIn) const
         LOCK(cs_main);
         tip = chainActive.Tip();
     }
-    return GuessVerificationProgress(Params().Checkpoints(), tip);
+    return GuessVerificationProgress(Params().TxData(), tip);
 }
 
 void ClientModel::updateTimer()
diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp
index a3954d81fcb72..09671ea20e4f6 100644
--- a/src/rpc/blockchain.cpp
+++ b/src/rpc/blockchain.cpp
@@ -1073,7 +1073,7 @@ UniValue getblockchaininfo(const JSONRPCRequest& request)
     obj.push_back(Pair("bestblockhash",         chainActive.Tip()->GetBlockHash().GetHex()));
     obj.push_back(Pair("difficulty",            (double)GetDifficulty()));
     obj.push_back(Pair("mediantime",            (int64_t)chainActive.Tip()->GetMedianTimePast()));
-    obj.push_back(Pair("verificationprogress",  GuessVerificationProgress(Params().Checkpoints(), chainActive.Tip())));
+    obj.push_back(Pair("verificationprogress",  GuessVerificationProgress(Params().TxData(), chainActive.Tip())));
     obj.push_back(Pair("chainwork",             chainActive.Tip()->nChainWork.GetHex()));
     obj.push_back(Pair("pruned",                fPruneMode));
 
diff --git a/src/validation.cpp b/src/validation.cpp
index ea43d4f17190d..14d5dbe45261f 100644
--- a/src/validation.cpp
+++ b/src/validation.cpp
@@ -2080,7 +2080,7 @@ void static UpdateTip(CBlockIndex *pindexNew, const CChainParams& chainParams) {
       chainActive.Tip()->GetBlockHash().ToString(), chainActive.Height(), chainActive.Tip()->nVersion,
       log(chainActive.Tip()->nChainWork.getdouble())/log(2.0), (unsigned long)chainActive.Tip()->nChainTx,
       DateTimeStrFormat("%Y-%m-%d %H:%M:%S", chainActive.Tip()->GetBlockTime()),
-      GuessVerificationProgress(chainParams.Checkpoints(), chainActive.Tip()), pcoinsTip->DynamicMemoryUsage() * (1.0 / (1<<20)), pcoinsTip->GetCacheSize());
+      GuessVerificationProgress(chainParams.TxData(), chainActive.Tip()), pcoinsTip->DynamicMemoryUsage() * (1.0 / (1<<20)), pcoinsTip->GetCacheSize());
     if (!warningMessages.empty())
         LogPrintf(" warning='%s'", boost::algorithm::join(warningMessages, ", "));
     LogPrintf("\n");
@@ -3445,7 +3445,7 @@ bool static LoadBlockIndexDB(const CChainParams& chainparams)
     LogPrintf("%s: hashBestChain=%s height=%d date=%s progress=%f\n", __func__,
         chainActive.Tip()->GetBlockHash().ToString(), chainActive.Height(),
         DateTimeStrFormat("%Y-%m-%d %H:%M:%S", chainActive.Tip()->GetBlockTime()),
-        GuessVerificationProgress(chainparams.Checkpoints(), chainActive.Tip()));
+        GuessVerificationProgress(chainparams.TxData(), chainActive.Tip()));
 
     return true;
 }
@@ -4152,7 +4152,7 @@ void DumpMempool(void)
 static const double SIGCHECK_VERIFICATION_FACTOR = 5.0;
 
 //! Guess how far we are in the verification process at the given block index
-double GuessVerificationProgress(const CCheckpointData& data, CBlockIndex *pindex, bool fSigchecks) {
+double GuessVerificationProgress(const ChainTxData& data, CBlockIndex *pindex, bool fSigchecks) {
     if (pindex==NULL)
         return 0.0;
 
diff --git a/src/validation.h b/src/validation.h
index 0288e9163e6c9..7bde123bfe5e5 100644
--- a/src/validation.h
+++ b/src/validation.h
@@ -42,7 +42,7 @@ class CScriptCheck;
 class CTxMemPool;
 class CValidationInterface;
 class CValidationState;
-class CCheckpointData;
+struct ChainTxData;
 
 struct PrecomputedTransactionData;
 struct LockPoints;
@@ -281,7 +281,7 @@ bool ActivateBestChain(CValidationState& state, const CChainParams& chainparams,
 CAmount GetBlockSubsidy(int nHeight, const Consensus::Params& consensusParams);
 
 /** Guess verification progress (as a fraction between 0.0=genesis and 1.0=current tip). */
-double GuessVerificationProgress(const CCheckpointData& data, CBlockIndex* pindex, bool fSigchecks = true);
+double GuessVerificationProgress(const ChainTxData& data, CBlockIndex* pindex, bool fSigchecks = true);
 
 /**
  * Prune block and undo files (blk???.dat and undo???.dat) so that the disk space used is less than a user-defined target.
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index 50eab61739a55..7101a1a3bee57 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -1479,12 +1479,12 @@ int CWallet::ScanForWalletTransactions(CBlockIndex* pindexStart, bool fUpdate)
             pindex = chainActive.Next(pindex);
 
         ShowProgress(_("Rescanning..."), 0); // show rescan progress in GUI as dialog or on splashscreen, if -rescan on startup
-        double dProgressStart = GuessVerificationProgress(chainParams.Checkpoints(), pindex, false);
-        double dProgressTip = GuessVerificationProgress(chainParams.Checkpoints(), chainActive.Tip(), false);
+        double dProgressStart = GuessVerificationProgress(chainParams.TxData(), pindex, false);
+        double dProgressTip = GuessVerificationProgress(chainParams.TxData(), chainActive.Tip(), false);
         while (pindex)
         {
             if (pindex->nHeight % 100 == 0 && dProgressTip - dProgressStart > 0.0)
-                ShowProgress(_("Rescanning..."), std::max(1, std::min(99, (int)((GuessVerificationProgress(chainParams.Checkpoints(), pindex, false) - dProgressStart) / (dProgressTip - dProgressStart) * 100))));
+                ShowProgress(_("Rescanning..."), std::max(1, std::min(99, (int)((GuessVerificationProgress(chainParams.TxData(), pindex, false) - dProgressStart) / (dProgressTip - dProgressStart) * 100))));
 
             CBlock block;
             ReadBlockFromDisk(block, pindex, Params().GetConsensus());
@@ -1497,7 +1497,7 @@ int CWallet::ScanForWalletTransactions(CBlockIndex* pindexStart, bool fUpdate)
             pindex = chainActive.Next(pindex);
             if (GetTime() >= nNow + 60) {
                 nNow = GetTime();
-                LogPrintf("Still rescanning. At block %d. Progress=%f\n", pindex->nHeight, GuessVerificationProgress(chainParams.Checkpoints(), pindex));
+                LogPrintf("Still rescanning. At block %d. Progress=%f\n", pindex->nHeight, GuessVerificationProgress(chainParams.TxData(), pindex));
             }
         }
         ShowProgress(_("Rescanning..."), 100); // hide progress dialog in GUI

From 6dd81169fc33f0c9720afe0b9b52ed4539e59580 Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Wed, 4 Jan 2017 13:09:20 -0800
Subject: [PATCH 1491/1802] Remove SIGCHECK_VERIFICATION_FACTOR

---
 src/validation.cpp    | 34 ++++++----------------------------
 src/validation.h      |  2 +-
 src/wallet/wallet.cpp |  6 +++---
 3 files changed, 10 insertions(+), 32 deletions(-)

diff --git a/src/validation.cpp b/src/validation.cpp
index 14d5dbe45261f..0ff9a00254bed 100644
--- a/src/validation.cpp
+++ b/src/validation.cpp
@@ -4141,44 +4141,22 @@ void DumpMempool(void)
     }
 }
 
-/**
- * How many times slower we expect checking transactions after the last
- * checkpoint to be (from checking signatures, which is skipped up to the
- * last checkpoint). This number is a compromise, as it can't be accurate
- * for every system. When reindexing from a fast disk with a slow CPU, it
- * can be up to 20, while when downloading from a slow network with a
- * fast multicore CPU, it won't be much higher than 1.
- */
-static const double SIGCHECK_VERIFICATION_FACTOR = 5.0;
-
 //! Guess how far we are in the verification process at the given block index
-double GuessVerificationProgress(const ChainTxData& data, CBlockIndex *pindex, bool fSigchecks) {
-    if (pindex==NULL)
+double GuessVerificationProgress(const ChainTxData& data, CBlockIndex *pindex) {
+    if (pindex == NULL)
         return 0.0;
 
     int64_t nNow = time(NULL);
 
-    double fSigcheckVerificationFactor = fSigchecks ? SIGCHECK_VERIFICATION_FACTOR : 1.0;
-    double fWorkBefore = 0.0; // Amount of work done before pindex
-    double fWorkAfter = 0.0;  // Amount of work left after pindex (estimated)
-    // Work is defined as: 1.0 per transaction before the last checkpoint, and
-    // fSigcheckVerificationFactor per transaction after.
+    double fTxTotal;
 
     if (pindex->nChainTx <= data.nTransactionsLastCheckpoint) {
-        double nCheapBefore = pindex->nChainTx;
-        double nCheapAfter = data.nTransactionsLastCheckpoint - pindex->nChainTx;
-        double nExpensiveAfter = (nNow - data.nTimeLastCheckpoint)/86400.0*data.fTransactionsPerDay;
-        fWorkBefore = nCheapBefore;
-        fWorkAfter = nCheapAfter + nExpensiveAfter*fSigcheckVerificationFactor;
+        fTxTotal = data.nTransactionsLastCheckpoint + (nNow - data.nTimeLastCheckpoint) / 86400.0 * data.fTransactionsPerDay;
     } else {
-        double nCheapBefore = data.nTransactionsLastCheckpoint;
-        double nExpensiveBefore = pindex->nChainTx - data.nTransactionsLastCheckpoint;
-        double nExpensiveAfter = (nNow - pindex->GetBlockTime())/86400.0*data.fTransactionsPerDay;
-        fWorkBefore = nCheapBefore + nExpensiveBefore*fSigcheckVerificationFactor;
-        fWorkAfter = nExpensiveAfter*fSigcheckVerificationFactor;
+        fTxTotal = pindex->nChainTx + (nNow - pindex->GetBlockTime()) / 86400.0 * data.fTransactionsPerDay;
     }
 
-    return fWorkBefore / (fWorkBefore + fWorkAfter);
+    return pindex->nChainTx / fTxTotal;
 }
 
 class CMainCleanup
diff --git a/src/validation.h b/src/validation.h
index 7bde123bfe5e5..ebfff66ea1796 100644
--- a/src/validation.h
+++ b/src/validation.h
@@ -281,7 +281,7 @@ bool ActivateBestChain(CValidationState& state, const CChainParams& chainparams,
 CAmount GetBlockSubsidy(int nHeight, const Consensus::Params& consensusParams);
 
 /** Guess verification progress (as a fraction between 0.0=genesis and 1.0=current tip). */
-double GuessVerificationProgress(const ChainTxData& data, CBlockIndex* pindex, bool fSigchecks = true);
+double GuessVerificationProgress(const ChainTxData& data, CBlockIndex* pindex);
 
 /**
  * Prune block and undo files (blk???.dat and undo???.dat) so that the disk space used is less than a user-defined target.
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index 7101a1a3bee57..686efe7c4377f 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -1479,12 +1479,12 @@ int CWallet::ScanForWalletTransactions(CBlockIndex* pindexStart, bool fUpdate)
             pindex = chainActive.Next(pindex);
 
         ShowProgress(_("Rescanning..."), 0); // show rescan progress in GUI as dialog or on splashscreen, if -rescan on startup
-        double dProgressStart = GuessVerificationProgress(chainParams.TxData(), pindex, false);
-        double dProgressTip = GuessVerificationProgress(chainParams.TxData(), chainActive.Tip(), false);
+        double dProgressStart = GuessVerificationProgress(chainParams.TxData(), pindex);
+        double dProgressTip = GuessVerificationProgress(chainParams.TxData(), chainActive.Tip());
         while (pindex)
         {
             if (pindex->nHeight % 100 == 0 && dProgressTip - dProgressStart > 0.0)
-                ShowProgress(_("Rescanning..."), std::max(1, std::min(99, (int)((GuessVerificationProgress(chainParams.TxData(), pindex, false) - dProgressStart) / (dProgressTip - dProgressStart) * 100))));
+                ShowProgress(_("Rescanning..."), std::max(1, std::min(99, (int)((GuessVerificationProgress(chainParams.TxData(), pindex) - dProgressStart) / (dProgressTip - dProgressStart) * 100))));
 
             CBlock block;
             ReadBlockFromDisk(block, pindex, Params().GetConsensus());

From d5aa19813c32eff02d4b65ac9a4131f3eed04825 Mon Sep 17 00:00:00 2001
From: Doug <joroark@vt.edu>
Date: Tue, 20 Dec 2016 19:25:24 -0800
Subject: [PATCH 1492/1802] Allow linearization scripts to support hash byte
 reversal

Currently, the linearization scripts require input hashes to be in one endian form. Add support for byte reversal.
---
 contrib/linearize/README.md             | 40 +++++++++++++++----------
 contrib/linearize/example-linearize.cfg |  4 ++-
 contrib/linearize/linearize-data.py     | 19 ++++++++++--
 contrib/linearize/linearize-hashes.py   | 14 ++++++++-
 4 files changed, 58 insertions(+), 19 deletions(-)

diff --git a/contrib/linearize/README.md b/contrib/linearize/README.md
index 06f278f3b3c71..07597481e0604 100644
--- a/contrib/linearize/README.md
+++ b/contrib/linearize/README.md
@@ -1,33 +1,43 @@
 # Linearize
-Construct a linear, no-fork, best version of the blockchain.
+Construct a linear, no-fork, best version of the Bitcoin blockchain.
 
 ## Step 1: Download hash list
 
     $ ./linearize-hashes.py linearize.cfg > hashlist.txt
 
 Required configuration file settings for linearize-hashes:
-* RPC: rpcuser, rpcpassword
+* RPC: `rpcuser`, `rpcpassword`
 
 Optional config file setting for linearize-hashes:
-* RPC: host, port
-* Block chain: min_height, max_height
+* RPC: `host`, `port`  (Default: `127.0.0.1:8332`)
+* Blockchain: `min_height`, `max_height`
+* `rev_hash_bytes`: If true, the written block hash list will be
+byte-reversed. (In other words, the hash returned by getblockhash will have its
+bytes reversed.) False by default. Intended for generation of
+standalone hash lists but safe to use with linearize-data.py, which will output
+the same data no matter which byte format is chosen.
 
 ## Step 2: Copy local block data
 
     $ ./linearize-data.py linearize.cfg
 
 Required configuration file settings:
-* "input": bitcoind blocks/ directory containing blkNNNNN.dat
-* "hashlist": text file containing list of block hashes, linearized-hashes.py
-output.
-* "output_file": bootstrap.dat
+* `output_file`: The file that will contain the final blockchain.
       or
-* "output": output directory for linearized blocks/blkNNNNN.dat output
+* `output`: Output directory for linearized blocks/blkNNNNN.dat output.
 
 Optional config file setting for linearize-data:
-* "netmagic": network magic number
-* "max_out_sz": maximum output file size (default `1000*1000*1000`)
-* "split_timestamp": Split files when a new month is first seen, in addition to
-reaching a maximum file size.
-* "file_timestamp": Set each file's last-modified time to that of the
-most recent block in that file.
+* `file_timestamp`: Set each file's last-modified time to that of the most
+recent block in that file.
+* `genesis`: The hash of the genesis block in the blockchain.
+* `input: bitcoind blocks/ directory containing blkNNNNN.dat
+* `hashlist`: text file containing list of block hashes created by
+linearize-hashes.py.
+* `max_out_sz`: Maximum size for files created by the `output_file` option.
+(Default: `1000*1000*1000 bytes`)
+* `netmagic`: Network magic number.
+* `rev_hash_bytes`: If true, the block hash list written by linearize-hashes.py
+will be byte-reversed when read by linearize-data.py. See the linearize-hashes
+entry for more information.
+* `split_timestamp`: Split blockchain files when a new month is first seen, in
+addition to reaching a maximum file size (`max_out_sz`).
diff --git a/contrib/linearize/example-linearize.cfg b/contrib/linearize/example-linearize.cfg
index 38da02e66c1e7..cccdd792131ae 100644
--- a/contrib/linearize/example-linearize.cfg
+++ b/contrib/linearize/example-linearize.cfg
@@ -23,7 +23,9 @@ input=/home/example/.bitcoin/blocks
 
 output_file=/home/example/Downloads/bootstrap.dat
 hashlist=hashlist.txt
-split_year=1
 
 # Maxmimum size in bytes of out-of-order blocks cache in memory
 out_of_order_cache_sz = 100000000
+
+# Do we want the reverse the hash bytes coming from getblockhash?
+rev_hash_bytes = False
diff --git a/contrib/linearize/linearize-data.py b/contrib/linearize/linearize-data.py
index d0417748fc072..adea35dbd5588 100755
--- a/contrib/linearize/linearize-data.py
+++ b/contrib/linearize/linearize-data.py
@@ -23,6 +23,12 @@
 
 settings = {}
 
+##### Switch endian-ness #####
+def hex_switchEndian(s):
+	""" Switches the endianness of a hex string (in pairs of hex chars) """
+	pairList = [s[i]+s[i+1] for i in range(0,len(s),2)]
+	return ''.join(pairList[::-1])
+
 def uint32(x):
 	return x & 0xffffffffL
 
@@ -69,17 +75,21 @@ def get_blk_dt(blk_hdr):
 	dt_ym = datetime.datetime(dt.year, dt.month, 1)
 	return (dt_ym, nTime)
 
+# When getting the list of block hashes, undo any byte reversals.
 def get_block_hashes(settings):
 	blkindex = []
 	f = open(settings['hashlist'], "r")
 	for line in f:
 		line = line.rstrip()
+		if settings['rev_hash_bytes'] == 'true':
+			line = hex_switchEndian(line)
 		blkindex.append(line)
 
 	print("Read " + str(len(blkindex)) + " hashes")
 
 	return blkindex
 
+# The block map shouldn't give or receive byte-reversed hashes.
 def mkblockmap(blkindex):
 	blkmap = {}
 	for height,hash in enumerate(blkindex):
@@ -265,6 +275,12 @@ def run(self):
 		settings[m.group(1)] = m.group(2)
 	f.close()
 
+	# Force hash byte format setting to be lowercase to make comparisons easier.
+	# Also place upfront in case any settings need to know about it.
+	if 'rev_hash_bytes' not in settings:
+		settings['rev_hash_bytes'] = 'false'
+	settings['rev_hash_bytes'] = settings['rev_hash_bytes'].lower()
+
 	if 'netmagic' not in settings:
 		settings['netmagic'] = 'f9beb4d9'
 	if 'genesis' not in settings:
@@ -295,9 +311,8 @@ def run(self):
 	blkindex = get_block_hashes(settings)
 	blkmap = mkblockmap(blkindex)
 
+	# Block hash map won't be byte-reversed. Neither should the genesis hash.
 	if not settings['genesis'] in blkmap:
 		print("Genesis block not found in hashlist")
 	else:
 		BlockDataCopier(settings, blkindex, blkmap).run()
-
-
diff --git a/contrib/linearize/linearize-hashes.py b/contrib/linearize/linearize-hashes.py
index ba8d6f8a044c8..9efdf13255030 100755
--- a/contrib/linearize/linearize-hashes.py
+++ b/contrib/linearize/linearize-hashes.py
@@ -17,6 +17,12 @@
 
 settings = {}
 
+##### Switch endian-ness #####
+def hex_switchEndian(s):
+	""" Switches the endianness of a hex string (in pairs of hex chars) """
+	pairList = [s[i]+s[i+1] for i in range(0,len(s),2)]
+	return ''.join(pairList[::-1])
+
 class BitcoinRPC:
 	def __init__(self, host, port, username, password):
 		authpair = "%s:%s" % (username, password)
@@ -70,6 +76,8 @@ def get_block_hashes(settings, max_blocks_per_call=10000):
 				print('JSON-RPC: error at height', height+x, ': ', resp_obj['error'], file=sys.stderr)
 				exit(1)
 			assert(resp_obj['id'] == x) # assume replies are in-sequence
+			if settings['rev_hash_bytes'] == 'true':
+				resp_obj['result'] = hex_switchEndian(resp_obj['result'])
 			print(resp_obj['result'])
 
 		height += num_blocks
@@ -101,6 +109,8 @@ def get_block_hashes(settings, max_blocks_per_call=10000):
 		settings['min_height'] = 0
 	if 'max_height' not in settings:
 		settings['max_height'] = 313000
+	if 'rev_hash_bytes' not in settings:
+		settings['rev_hash_bytes'] = 'false'
 	if 'rpcuser' not in settings or 'rpcpassword' not in settings:
 		print("Missing username and/or password in cfg file", file=stderr)
 		sys.exit(1)
@@ -109,5 +119,7 @@ def get_block_hashes(settings, max_blocks_per_call=10000):
 	settings['min_height'] = int(settings['min_height'])
 	settings['max_height'] = int(settings['max_height'])
 
-	get_block_hashes(settings)
+	# Force hash byte format setting to be lowercase to make comparisons easier.
+	settings['rev_hash_bytes'] = settings['rev_hash_bytes'].lower()
 
+	get_block_hashes(settings)

From 3c8f63ba7c7be62d462727f4d67633e1064f0f79 Mon Sep 17 00:00:00 2001
From: Doug <joroark@vt.edu>
Date: Tue, 20 Dec 2016 19:27:01 -0800
Subject: [PATCH 1493/1802] Make linearize scripts Python 3-compatible.

---
 contrib/linearize/README.md           | 13 +++++++----
 contrib/linearize/linearize-data.py   | 28 +++++++++++++----------
 contrib/linearize/linearize-hashes.py | 32 ++++++++++++++++++---------
 3 files changed, 47 insertions(+), 26 deletions(-)

diff --git a/contrib/linearize/README.md b/contrib/linearize/README.md
index 07597481e0604..adc9a559cc34d 100644
--- a/contrib/linearize/README.md
+++ b/contrib/linearize/README.md
@@ -1,5 +1,6 @@
 # Linearize
-Construct a linear, no-fork, best version of the Bitcoin blockchain.
+Construct a linear, no-fork, best version of the Bitcoin blockchain. The scripts
+run using Python 3 but are compatible with Python 2.
 
 ## Step 1: Download hash list
 
@@ -9,7 +10,8 @@ Required configuration file settings for linearize-hashes:
 * RPC: `rpcuser`, `rpcpassword`
 
 Optional config file setting for linearize-hashes:
-* RPC: `host`, `port`  (Default: `127.0.0.1:8332`)
+* RPC: `host`  (Default: `127.0.0.1`)
+* RPC: `port`  (Default: `8332`)
 * Blockchain: `min_height`, `max_height`
 * `rev_hash_bytes`: If true, the written block hash list will be
 byte-reversed. (In other words, the hash returned by getblockhash will have its
@@ -17,6 +19,9 @@ bytes reversed.) False by default. Intended for generation of
 standalone hash lists but safe to use with linearize-data.py, which will output
 the same data no matter which byte format is chosen.
 
+The `linearize-hashes` script requires a connection, local or remote, to a
+JSON-RPC server. Running `bitcoind` or `bitcoin-qt -server` will be sufficient.
+
 ## Step 2: Copy local block data
 
     $ ./linearize-data.py linearize.cfg
@@ -24,13 +29,13 @@ the same data no matter which byte format is chosen.
 Required configuration file settings:
 * `output_file`: The file that will contain the final blockchain.
       or
-* `output`: Output directory for linearized blocks/blkNNNNN.dat output.
+* `output`: Output directory for linearized `blocks/blkNNNNN.dat` output.
 
 Optional config file setting for linearize-data:
 * `file_timestamp`: Set each file's last-modified time to that of the most
 recent block in that file.
 * `genesis`: The hash of the genesis block in the blockchain.
-* `input: bitcoind blocks/ directory containing blkNNNNN.dat
+* `input`: bitcoind blocks/ directory containing blkNNNNN.dat
 * `hashlist`: text file containing list of block hashes created by
 linearize-hashes.py.
 * `max_out_sz`: Maximum size for files created by the `output_file` option.
diff --git a/contrib/linearize/linearize-data.py b/contrib/linearize/linearize-data.py
index adea35dbd5588..043bf2e814fc1 100755
--- a/contrib/linearize/linearize-data.py
+++ b/contrib/linearize/linearize-data.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # linearize-data.py: Construct a linear, no-fork version of the chain.
 #
@@ -8,29 +8,33 @@
 #
 
 from __future__ import print_function, division
+try: # Python 3
+    import http.client as httplib
+except ImportError: # Python 2
+    import httplib
 import json
 import struct
 import re
 import os
 import os.path
 import base64
-import httplib
 import sys
 import hashlib
 import datetime
 import time
 from collections import namedtuple
+from binascii import hexlify, unhexlify
 
 settings = {}
 
 ##### Switch endian-ness #####
 def hex_switchEndian(s):
 	""" Switches the endianness of a hex string (in pairs of hex chars) """
-	pairList = [s[i]+s[i+1] for i in range(0,len(s),2)]
-	return ''.join(pairList[::-1])
+	pairList = [s[i:i+2].encode() for i in range(0, len(s), 2)]
+	return b''.join(pairList[::-1]).decode()
 
 def uint32(x):
-	return x & 0xffffffffL
+	return x & 0xffffffff
 
 def bytereverse(x):
 	return uint32(( ((x) << 24) | (((x) << 8) & 0x00ff0000) |
@@ -41,14 +45,14 @@ def bufreverse(in_buf):
 	for i in range(0, len(in_buf), 4):
 		word = struct.unpack('@I', in_buf[i:i+4])[0]
 		out_words.append(struct.pack('@I', bytereverse(word)))
-	return ''.join(out_words)
+	return b''.join(out_words)
 
 def wordreverse(in_buf):
 	out_words = []
 	for i in range(0, len(in_buf), 4):
 		out_words.append(in_buf[i:i+4])
 	out_words.reverse()
-	return ''.join(out_words)
+	return b''.join(out_words)
 
 def calc_hdr_hash(blk_hdr):
 	hash1 = hashlib.sha256()
@@ -65,7 +69,7 @@ def calc_hash_str(blk_hdr):
 	hash = calc_hdr_hash(blk_hdr)
 	hash = bufreverse(hash)
 	hash = wordreverse(hash)
-	hash_str = hash.encode('hex')
+	hash_str = hexlify(hash).decode('utf-8')
 	return hash_str
 
 def get_blk_dt(blk_hdr):
@@ -217,7 +221,7 @@ def run(self):
 
 			inMagic = inhdr[:4]
 			if (inMagic != self.settings['netmagic']):
-				print("Invalid magic: " + inMagic.encode('hex'))
+				print("Invalid magic: " + hexlify(inMagic).decode('utf-8'))
 				return
 			inLenLE = inhdr[4:]
 			su = struct.unpack("<I", inLenLE)
@@ -294,14 +298,14 @@ def run(self):
 	if 'split_timestamp' not in settings:
 		settings['split_timestamp'] = 0
 	if 'max_out_sz' not in settings:
-		settings['max_out_sz'] = 1000L * 1000 * 1000
+		settings['max_out_sz'] = 1000 * 1000 * 1000
 	if 'out_of_order_cache_sz' not in settings:
 		settings['out_of_order_cache_sz'] = 100 * 1000 * 1000
 
-	settings['max_out_sz'] = long(settings['max_out_sz'])
+	settings['max_out_sz'] = int(settings['max_out_sz'])
 	settings['split_timestamp'] = int(settings['split_timestamp'])
 	settings['file_timestamp'] = int(settings['file_timestamp'])
-	settings['netmagic'] = settings['netmagic'].decode('hex')
+	settings['netmagic'] = unhexlify(settings['netmagic'].encode('utf-8'))
 	settings['out_of_order_cache_sz'] = int(settings['out_of_order_cache_sz'])
 
 	if 'output_file' not in settings and 'output' not in settings:
diff --git a/contrib/linearize/linearize-hashes.py b/contrib/linearize/linearize-hashes.py
index 9efdf13255030..f749da5396649 100755
--- a/contrib/linearize/linearize-hashes.py
+++ b/contrib/linearize/linearize-hashes.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # linearize-hashes.py:  List blocks in a linear, no-fork version of the chain.
 #
@@ -8,11 +8,14 @@
 #
 
 from __future__ import print_function
+try: # Python 3
+    import http.client as httplib
+except ImportError: # Python 2
+    import httplib
 import json
 import struct
 import re
 import base64
-import httplib
 import sys
 
 settings = {}
@@ -20,26 +23,32 @@
 ##### Switch endian-ness #####
 def hex_switchEndian(s):
 	""" Switches the endianness of a hex string (in pairs of hex chars) """
-	pairList = [s[i]+s[i+1] for i in range(0,len(s),2)]
-	return ''.join(pairList[::-1])
+	pairList = [s[i:i+2].encode() for i in range(0, len(s), 2)]
+	return b''.join(pairList[::-1]).decode()
 
 class BitcoinRPC:
 	def __init__(self, host, port, username, password):
 		authpair = "%s:%s" % (username, password)
-		self.authhdr = "Basic %s" % (base64.b64encode(authpair))
-		self.conn = httplib.HTTPConnection(host, port, False, 30)
+		authpair = authpair.encode('utf-8')
+		self.authhdr = b"Basic " + base64.b64encode(authpair)
+		self.conn = httplib.HTTPConnection(host, port=port, timeout=30)
 
 	def execute(self, obj):
-		self.conn.request('POST', '/', json.dumps(obj),
-			{ 'Authorization' : self.authhdr,
-			  'Content-type' : 'application/json' })
+		try:
+			self.conn.request('POST', '/', json.dumps(obj),
+				{ 'Authorization' : self.authhdr,
+				  'Content-type' : 'application/json' })
+		except ConnectionRefusedError:
+			print('RPC connection refused. Check RPC settings and the server status.',
+			      file=sys.stderr)
+			return None
 
 		resp = self.conn.getresponse()
 		if resp is None:
 			print("JSON-RPC: no response", file=sys.stderr)
 			return None
 
-		body = resp.read()
+		body = resp.read().decode('utf-8')
 		resp_obj = json.loads(body)
 		return resp_obj
 
@@ -70,6 +79,9 @@ def get_block_hashes(settings, max_blocks_per_call=10000):
 			batch.append(rpc.build_request(x, 'getblockhash', [height + x]))
 
 		reply = rpc.execute(batch)
+		if reply is None:
+			print('Cannot continue. Program will halt.')
+			return None
 
 		for x,resp_obj in enumerate(reply):
 			if rpc.response_is_error(resp_obj):

From 5865d41f889d326b51fb0b68be9a41c46d6cad83 Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Sun, 25 Sep 2016 20:29:26 +0200
Subject: [PATCH 1494/1802] authproxy: Add support for RPC named arguments

---
 qa/rpc-tests/test_framework/authproxy.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/qa/rpc-tests/test_framework/authproxy.py b/qa/rpc-tests/test_framework/authproxy.py
index 9bee1962e203e..09ed611299235 100644
--- a/qa/rpc-tests/test_framework/authproxy.py
+++ b/qa/rpc-tests/test_framework/authproxy.py
@@ -138,14 +138,16 @@ def _request(self, method, path, postdata):
             self.__conn.request(method, path, postdata, headers)
             return self._get_response()
 
-    def __call__(self, *args):
+    def __call__(self, *args, **argsn):
         AuthServiceProxy.__id_count += 1
 
         log.debug("-%s-> %s %s"%(AuthServiceProxy.__id_count, self._service_name,
                                  json.dumps(args, default=EncodeDecimal, ensure_ascii=self.ensure_ascii)))
+        if args and argsn:
+            raise ValueError('Cannot handle both named and positional arguments')
         postdata = json.dumps({'version': '1.1',
                                'method': self._service_name,
-                               'params': args,
+                               'params': args or argsn,
                                'id': AuthServiceProxy.__id_count}, default=EncodeDecimal, ensure_ascii=self.ensure_ascii)
         response = self._request('POST', self.__url.path, postdata.encode('utf-8'))
         if response['error'] is not None:

From 6f1c76ae14c884c919db9ed720c7776aa0748244 Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Sun, 25 Sep 2016 20:42:49 +0200
Subject: [PATCH 1495/1802] rpc: Support named arguments

The [JSON-RPC specification](http://www.jsonrpc.org/specification) allows passing parameters as an Array, for by-position
arguments, or an Object, for by-name arguments.

This implements by-name arguments, but preserves full backwards compatibility. API using by-name arguments are
easier to extend, and easier to use (no need to guess which argument goes where).

Named are mapped to positions by a per-call structure, provided through the RPC command table.

Missing arguments will be replaced by null, except if at the end, then the argument is left out completely.

Currently calls fail (though not crash) on intermediate nulls, but this should be improved on a per-call basis later.
---
 src/rpc/server.cpp | 65 +++++++++++++++++++++++++++++++++++++++-------
 src/rpc/server.h   |  1 +
 2 files changed, 57 insertions(+), 9 deletions(-)

diff --git a/src/rpc/server.cpp b/src/rpc/server.cpp
index 8a223d8aa83be..1b94e100718de 100644
--- a/src/rpc/server.cpp
+++ b/src/rpc/server.cpp
@@ -26,6 +26,7 @@
 #include <boost/algorithm/string/case_conv.hpp> // for to_upper()
 
 #include <memory> // for unique_ptr
+#include <unordered_map>
 
 using namespace RPCServer;
 using namespace std;
@@ -268,11 +269,11 @@ UniValue stop(const JSONRPCRequest& jsonRequest)
  * Call Table
  */
 static const CRPCCommand vRPCCommands[] =
-{ //  category              name                      actor (function)         okSafeMode
-  //  --------------------- ------------------------  -----------------------  ----------
+{ //  category              name                      actor (function)         okSafe argNames
+  //  --------------------- ------------------------  -----------------------  ------ ----------
     /* Overall control/query calls */
-    { "control",            "help",                   &help,                   true  },
-    { "control",            "stop",                   &stop,                   true  },
+    { "control",            "help",                   &help,                   true,  {"command"}  },
+    { "control",            "stop",                   &stop,                   true,  {}  },
 };
 
 CRPCTable::CRPCTable()
@@ -379,12 +380,12 @@ void JSONRPCRequest::parse(const UniValue& valRequest)
 
     // Parse params
     UniValue valParams = find_value(request, "params");
-    if (valParams.isArray())
-        params = valParams.get_array();
+    if (valParams.isArray() || valParams.isObject())
+        params = valParams;
     else if (valParams.isNull())
         params = UniValue(UniValue::VARR);
     else
-        throw JSONRPCError(RPC_INVALID_REQUEST, "Params must be an array");
+        throw JSONRPCError(RPC_INVALID_REQUEST, "Params must be an array or object");
 }
 
 static UniValue JSONRPCExecOne(const UniValue& req)
@@ -420,6 +421,48 @@ std::string JSONRPCExecBatch(const UniValue& vReq)
     return ret.write() + "\n";
 }
 
+/**
+ * Process named arguments into a vector of positional arguments, based on the
+ * passed-in specification for the RPC call's arguments.
+ */
+static inline JSONRPCRequest transformNamedArguments(const JSONRPCRequest& in, const std::vector<std::string>& argNames)
+{
+    JSONRPCRequest out = in;
+    out.params = UniValue(UniValue::VARR);
+    // Build a map of parameters, and remove ones that have been processed, so that we can throw a focused error if
+    // there is an unknown one.
+    const std::vector<std::string>& keys = in.params.getKeys();
+    const std::vector<UniValue>& values = in.params.getValues();
+    std::unordered_map<std::string, const UniValue*> argsIn;
+    for (size_t i=0; i<keys.size(); ++i) {
+        argsIn[keys[i]] = &values[i];
+    }
+    // Process expected parameters.
+    int hole = 0;
+    for (const std::string &argName: argNames) {
+        auto fr = argsIn.find(argName);
+        if (fr != argsIn.end()) {
+            for (int i = 0; i < hole; ++i) {
+                // Fill hole between specified parameters with JSON nulls,
+                // but not at the end (for backwards compatibility with calls
+                // that act based on number of specified parameters).
+                out.params.push_back(UniValue());
+            }
+            hole = 0;
+            out.params.push_back(*fr->second);
+            argsIn.erase(fr);
+        } else {
+            hole += 1;
+        }
+    }
+    // If there are still arguments in the argsIn map, this is an error.
+    if (!argsIn.empty()) {
+        throw JSONRPCError(RPC_INVALID_PARAMETER, "Unknown named parameter " + argsIn.begin()->first);
+    }
+    // Return request with named arguments transformed to positional arguments
+    return out;
+}
+
 UniValue CRPCTable::execute(const JSONRPCRequest &request) const
 {
     // Return immediately if in warmup
@@ -438,8 +481,12 @@ UniValue CRPCTable::execute(const JSONRPCRequest &request) const
 
     try
     {
-        // Execute
-        return pcmd->actor(request);
+        // Execute, convert arguments to array if necessary
+        if (request.params.isObject()) {
+            return pcmd->actor(transformNamedArguments(request, pcmd->argNames));
+        } else {
+            return pcmd->actor(request);
+        }
     }
     catch (const std::exception& e)
     {
diff --git a/src/rpc/server.h b/src/rpc/server.h
index f3cdf3c602505..fed3d8c90f98e 100644
--- a/src/rpc/server.h
+++ b/src/rpc/server.h
@@ -136,6 +136,7 @@ class CRPCCommand
     std::string name;
     rpcfn_type actor;
     bool okSafeMode;
+    std::vector<std::string> argNames;
 };
 
 /**

From 495eb44a4f8461c799d2b1ad70e54d087a0b3098 Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Sun, 25 Sep 2016 20:44:06 +0200
Subject: [PATCH 1496/1802] rpc: Named arguments for blockchain calls

---
 src/rpc/blockchain.cpp | 62 +++++++++++++++++++++---------------------
 1 file changed, 31 insertions(+), 31 deletions(-)

diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp
index a127f10b8be30..e38636aa7b09a 100644
--- a/src/rpc/blockchain.cpp
+++ b/src/rpc/blockchain.cpp
@@ -232,11 +232,11 @@ UniValue waitforblock(const JSONRPCRequest& request)
 {
     if (request.fHelp || request.params.size() < 1 || request.params.size() > 2)
         throw runtime_error(
-            "waitforblock <blockhash> (timeout)\n"
+            "waitforblock <hash> (timeout)\n"
             "\nWaits for a specific new block and returns useful info about it.\n"
             "\nReturns the current block on timeout or exit.\n"
             "\nArguments:\n"
-            "1. blockhash to wait for (string)\n"
+            "1. hash (string) Block hash to wait for.\n"
             "2. timeout (int, optional, default=0) Time in milliseconds to wait for a response. 0 indicates no timeout.\n"
             "\nResult:\n"
             "{                           (json object)\n"
@@ -858,12 +858,12 @@ UniValue gettxout(const JSONRPCRequest& request)
 {
     if (request.fHelp || request.params.size() < 2 || request.params.size() > 3)
         throw runtime_error(
-            "gettxout \"txid\" n ( includemempool )\n"
+            "gettxout \"txid\" n ( include_mempool )\n"
             "\nReturns details about an unspent transaction output.\n"
             "\nArguments:\n"
             "1. \"txid\"       (string, required) The transaction id\n"
             "2. n              (numeric, required) vout number\n"
-            "3. includemempool  (boolean, optional) Whether to include the mempool\n"
+            "3. include_mempool  (boolean, optional) Whether to include the mempool\n"
             "\nResult:\n"
             "{\n"
             "  \"bestblock\" : \"hash\",    (string) the block hash\n"
@@ -940,11 +940,11 @@ UniValue verifychain(const JSONRPCRequest& request)
     int nCheckDepth = GetArg("-checkblocks", DEFAULT_CHECKBLOCKS);
     if (request.fHelp || request.params.size() > 2)
         throw runtime_error(
-            "verifychain ( checklevel numblocks )\n"
+            "verifychain ( checklevel nblocks )\n"
             "\nVerifies blockchain database.\n"
             "\nArguments:\n"
             "1. checklevel   (numeric, optional, 0-4, default=" + strprintf("%d", nCheckLevel) + ") How thorough the block verification is.\n"
-            "2. numblocks    (numeric, optional, default=" + strprintf("%d", nCheckDepth) + ", 0=all) The number of blocks to check.\n"
+            "2. nblocks      (numeric, optional, default=" + strprintf("%d", nCheckDepth) + ", 0=all) The number of blocks to check.\n"
             "\nResult:\n"
             "true|false       (boolean) Verified or not\n"
             "\nExamples:\n"
@@ -1367,33 +1367,33 @@ UniValue reconsiderblock(const JSONRPCRequest& request)
 }
 
 static const CRPCCommand commands[] =
-{ //  category              name                      actor (function)         okSafeMode
-  //  --------------------- ------------------------  -----------------------  ----------
-    { "blockchain",         "getblockchaininfo",      &getblockchaininfo,      true  },
-    { "blockchain",         "getbestblockhash",       &getbestblockhash,       true  },
-    { "blockchain",         "getblockcount",          &getblockcount,          true  },
-    { "blockchain",         "getblock",               &getblock,               true  },
-    { "blockchain",         "getblockhash",           &getblockhash,           true  },
-    { "blockchain",         "getblockheader",         &getblockheader,         true  },
-    { "blockchain",         "getchaintips",           &getchaintips,           true  },
-    { "blockchain",         "getdifficulty",          &getdifficulty,          true  },
-    { "blockchain",         "getmempoolancestors",    &getmempoolancestors,    true  },
-    { "blockchain",         "getmempooldescendants",  &getmempooldescendants,  true  },
-    { "blockchain",         "getmempoolentry",        &getmempoolentry,        true  },
-    { "blockchain",         "getmempoolinfo",         &getmempoolinfo,         true  },
-    { "blockchain",         "getrawmempool",          &getrawmempool,          true  },
-    { "blockchain",         "gettxout",               &gettxout,               true  },
-    { "blockchain",         "gettxoutsetinfo",        &gettxoutsetinfo,        true  },
-    { "blockchain",         "verifychain",            &verifychain,            true  },
-
-    { "blockchain",         "preciousblock",          &preciousblock,          true  },
+{ //  category              name                      actor (function)         okSafe argNames
+  //  --------------------- ------------------------  -----------------------  ------ ----------
+    { "blockchain",         "getblockchaininfo",      &getblockchaininfo,      true,  {} },
+    { "blockchain",         "getbestblockhash",       &getbestblockhash,       true,  {} },
+    { "blockchain",         "getblockcount",          &getblockcount,          true,  {} },
+    { "blockchain",         "getblock",               &getblock,               true,  {"hash","verbose"} },
+    { "blockchain",         "getblockhash",           &getblockhash,           true,  {"index"} },
+    { "blockchain",         "getblockheader",         &getblockheader,         true,  {"hash","verbose"} },
+    { "blockchain",         "getchaintips",           &getchaintips,           true,  {} },
+    { "blockchain",         "getdifficulty",          &getdifficulty,          true,  {} },
+    { "blockchain",         "getmempoolancestors",    &getmempoolancestors,    true,  {"txid","verbose"} },
+    { "blockchain",         "getmempooldescendants",  &getmempooldescendants,  true,  {"txid","verbose"} },
+    { "blockchain",         "getmempoolentry",        &getmempoolentry,        true,  {"txid"} },
+    { "blockchain",         "getmempoolinfo",         &getmempoolinfo,         true,  {} },
+    { "blockchain",         "getrawmempool",          &getrawmempool,          true,  {"verbose"} },
+    { "blockchain",         "gettxout",               &gettxout,               true,  {"txid","n","include_mempool"} },
+    { "blockchain",         "gettxoutsetinfo",        &gettxoutsetinfo,        true,  {} },
+    { "blockchain",         "verifychain",            &verifychain,            true,  {"checklevel","nblocks"} },
+
+    { "blockchain",         "preciousblock",          &preciousblock,          true,  {"hash"} },
 
     /* Not shown in help */
-    { "hidden",             "invalidateblock",        &invalidateblock,        true  },
-    { "hidden",             "reconsiderblock",        &reconsiderblock,        true  },
-    { "hidden",             "waitfornewblock",        &waitfornewblock,        true  },
-    { "hidden",             "waitforblock",           &waitforblock,           true  },
-    { "hidden",             "waitforblockheight",     &waitforblockheight,     true  },
+    { "hidden",             "invalidateblock",        &invalidateblock,        true,  {"hash"} },
+    { "hidden",             "reconsiderblock",        &reconsiderblock,        true,  {"hash"} },
+    { "hidden",             "waitfornewblock",        &waitfornewblock,        true,  {"timeout"} },
+    { "hidden",             "waitforblock",           &waitforblock,           true,  {"hash","timeout"} },
+    { "hidden",             "waitforblockheight",     &waitforblockheight,     true,  {"height","timeout"} },
 };
 
 void RegisterBlockchainRPCCommands(CRPCTable &t)

From 286ec08cb0e5611bb062bc45d4b86df6d6ea801f Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Sun, 25 Sep 2016 20:55:24 +0200
Subject: [PATCH 1497/1802] rpc: Add 'echo' call for testing

This hidden call simply returns what is passed in.
---
 src/rpc/misc.cpp | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/rpc/misc.cpp b/src/rpc/misc.cpp
index f7c4ecc20c70b..13befb108915a 100644
--- a/src/rpc/misc.cpp
+++ b/src/rpc/misc.cpp
@@ -492,6 +492,17 @@ UniValue getmemoryinfo(const JSONRPCRequest& request)
     return obj;
 }
 
+UniValue echo(const JSONRPCRequest& request)
+{
+    if (request.fHelp)
+        throw runtime_error(
+            "echo \"message\" ...\n"
+            "\nSimply echo back the input arguments\n"
+        );
+
+    return request.params;
+}
+
 static const CRPCCommand commands[] =
 { //  category              name                      actor (function)         okSafeMode
   //  --------------------- ------------------------  -----------------------  ----------
@@ -504,6 +515,7 @@ static const CRPCCommand commands[] =
 
     /* Not shown in help */
     { "hidden",             "setmocktime",            &setmocktime,            true  },
+    { "hidden",             "echo",                   &echo,                   true, {"arg0","arg1","arg2","arg3","arg4","arg5","arg6","arg7","arg8","arg9"}},
 };
 
 void RegisterMiscRPCCommands(CRPCTable &t)

From fba1a6150c1f7f9e3b407faefba4ccc710fe075e Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Sun, 25 Sep 2016 20:58:30 +0200
Subject: [PATCH 1498/1802] rpc: Named arguments for misc calls

---
 src/rpc/misc.cpp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/rpc/misc.cpp b/src/rpc/misc.cpp
index 13befb108915a..4029e5e67cfd2 100644
--- a/src/rpc/misc.cpp
+++ b/src/rpc/misc.cpp
@@ -506,16 +506,16 @@ UniValue echo(const JSONRPCRequest& request)
 static const CRPCCommand commands[] =
 { //  category              name                      actor (function)         okSafeMode
   //  --------------------- ------------------------  -----------------------  ----------
-    { "control",            "getinfo",                &getinfo,                true  }, /* uses wallet if enabled */
-    { "control",            "getmemoryinfo",          &getmemoryinfo,          true  },
-    { "util",               "validateaddress",        &validateaddress,        true  }, /* uses wallet if enabled */
-    { "util",               "createmultisig",         &createmultisig,         true  },
-    { "util",               "verifymessage",          &verifymessage,          true  },
-    { "util",               "signmessagewithprivkey", &signmessagewithprivkey, true  },
+    { "control",            "getinfo",                &getinfo,                true,  {} }, /* uses wallet if enabled */
+    { "control",            "getmemoryinfo",          &getmemoryinfo,          true,  {} },
+    { "util",               "validateaddress",        &validateaddress,        true,  {"bitcoinaddress"} }, /* uses wallet if enabled */
+    { "util",               "createmultisig",         &createmultisig,         true,  {"nrequired","keys"} },
+    { "util",               "verifymessage",          &verifymessage,          true,  {"bitcoinaddress","signature","message"} },
+    { "util",               "signmessagewithprivkey", &signmessagewithprivkey, true,  {"privkey","message"} },
 
     /* Not shown in help */
-    { "hidden",             "setmocktime",            &setmocktime,            true  },
-    { "hidden",             "echo",                   &echo,                   true, {"arg0","arg1","arg2","arg3","arg4","arg5","arg6","arg7","arg8","arg9"}},
+    { "hidden",             "setmocktime",            &setmocktime,            true,  {"timestamp"}},
+    { "hidden",             "echo",                   &echo,                   true,  {"arg0","arg1","arg2","arg3","arg4","arg5","arg6","arg7","arg8","arg9"}},
 };
 
 void RegisterMiscRPCCommands(CRPCTable &t)

From 2ca9dcd5b934bb85088415e44b967e2b93c00227 Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Sun, 25 Sep 2016 21:09:13 +0200
Subject: [PATCH 1499/1802] test: Add test for RPC named arguments

Add RPC testcase for RPC named arguments.
---
 qa/pull-tester/rpc-tests.py         |  1 +
 qa/rpc-tests/rpcnamedargs.py        | 52 +++++++++++++++++++++++++++++
 qa/rpc-tests/test_framework/util.py | 12 +++++++
 3 files changed, 65 insertions(+)
 create mode 100755 qa/rpc-tests/rpcnamedargs.py

diff --git a/qa/pull-tester/rpc-tests.py b/qa/pull-tester/rpc-tests.py
index be31cbbdd30d0..83b6bdfe48793 100755
--- a/qa/pull-tester/rpc-tests.py
+++ b/qa/pull-tester/rpc-tests.py
@@ -151,6 +151,7 @@
     'signmessages.py',
     'nulldummy.py',
     'import-rescan.py',
+    'rpcnamedargs.py',
 ]
 if ENABLE_ZMQ:
     testScripts.append('zmq_test.py')
diff --git a/qa/rpc-tests/rpcnamedargs.py b/qa/rpc-tests/rpcnamedargs.py
new file mode 100755
index 0000000000000..b526b1f51a89a
--- /dev/null
+++ b/qa/rpc-tests/rpcnamedargs.py
@@ -0,0 +1,52 @@
+#!/usr/bin/env python3
+# Copyright (c) 2016 The Bitcoin Core developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+from decimal import Decimal
+
+from test_framework.test_framework import BitcoinTestFramework
+from test_framework.authproxy import JSONRPCException
+from test_framework.util import (
+    assert_equal,
+    assert_raises_jsonrpc,
+    assert_is_hex_string,
+    assert_is_hash_string,
+    start_nodes,
+    connect_nodes_bi,
+)
+
+
+class NamedArgumentTest(BitcoinTestFramework):
+    """
+    Test named arguments on RPC calls.
+    """
+
+    def __init__(self):
+        super().__init__()
+        self.setup_clean_chain = False
+        self.num_nodes = 1
+
+    def setup_network(self, split=False):
+        self.nodes = start_nodes(self.num_nodes, self.options.tmpdir)
+        self.is_network_split = False
+        self.sync_all()
+
+    def run_test(self):
+        node = self.nodes[0]
+        h = node.help(command='getinfo')
+        assert(h.startswith('getinfo\n'))
+
+        assert_raises_jsonrpc(-8, node.help, random='getinfo')
+
+        h = node.getblockhash(index=0)
+        node.getblock(hash=h)
+
+        assert_equal(node.echo(), [])
+        assert_equal(node.echo(arg0=0,arg9=9), [0] + [None]*8 + [9])
+        assert_equal(node.echo(arg1=1), [None, 1])
+        assert_equal(node.echo(arg9=None), [None]*10)
+        assert_equal(node.echo(arg0=0,arg3=3,arg9=9), [0] + [None]*2 + [3] + [None]*5 + [9])
+
+if __name__ == '__main__':
+    NamedArgumentTest().main()
diff --git a/qa/rpc-tests/test_framework/util.py b/qa/rpc-tests/test_framework/util.py
index 85898d9f32de1..c29033595d63b 100644
--- a/qa/rpc-tests/test_framework/util.py
+++ b/qa/rpc-tests/test_framework/util.py
@@ -546,6 +546,18 @@ def assert_raises_message(exc, message, fun, *args, **kwds):
     else:
         raise AssertionError("No exception raised")
 
+def assert_raises_jsonrpc(code, fun, *args, **kwds):
+    '''Check for specific JSONRPC exception code'''
+    try:
+        fun(*args, **kwds)
+    except JSONRPCException as e:
+        if e.error["code"] != code:
+            raise AssertionError("Unexpected JSONRPC error code %i" % e.error["code"])
+    except Exception as e:
+        raise AssertionError("Unexpected exception raised: "+type(e).__name__)
+    else:
+        raise AssertionError("No exception raised")
+
 def assert_is_hex_string(string):
     try:
         int(string, 16)

From b8ebc595bbd18e9239f132fb90b5513ae4759ebc Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Mon, 21 Nov 2016 13:55:35 +0100
Subject: [PATCH 1500/1802] rpc: Named arguments for net calls

Also add a more descriptive message for `setnetworkactive`.
---
 src/rpc/net.cpp | 32 +++++++++++++++++---------------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/src/rpc/net.cpp b/src/rpc/net.cpp
index 632514fc85a17..8e64ace9f2d21 100644
--- a/src/rpc/net.cpp
+++ b/src/rpc/net.cpp
@@ -468,10 +468,10 @@ UniValue setban(const JSONRPCRequest& request)
     if (request.fHelp || request.params.size() < 2 ||
         (strCommand != "add" && strCommand != "remove"))
         throw runtime_error(
-                            "setban \"ip(/netmask)\" \"add|remove\" (bantime) (absolute)\n"
+                            "setban \"subnet\" \"add|remove\" (bantime) (absolute)\n"
                             "\nAttempts add or remove a IP/Subnet from the banned list.\n"
                             "\nArguments:\n"
-                            "1. \"ip(/netmask)\" (string, required) The IP/Subnet (see getpeerinfo for nodes ip) with a optional netmask (default is /32 = single ip)\n"
+                            "1. \"subnet\" (string, required) The IP/Subnet (see getpeerinfo for nodes ip) with a optional netmask (default is /32 = single ip)\n"
                             "2. \"command\"      (string, required) 'add' to add a IP/Subnet to the list, 'remove' to remove a IP/Subnet from the list\n"
                             "3. \"bantime\"      (numeric, optional) time in seconds how long (or until when if [absolute] is set) the ip is banned (0 or empty means using the default time of 24h which can also be overwritten by the -bantime startup argument)\n"
                             "4. \"absolute\"     (boolean, optional) If set, the bantime must be a absolute timestamp in seconds since epoch (Jan 1 1970 GMT)\n"
@@ -580,7 +580,9 @@ UniValue setnetworkactive(const JSONRPCRequest& request)
     if (request.fHelp || request.params.size() != 1) {
         throw runtime_error(
             "setnetworkactive true|false\n"
-            "Disable/enable all p2p network activity."
+            "\nDisable/enable all p2p network activity.\n"
+            "\nArguments:\n"
+            "1. \"state\"        (boolean, required) true to enable networking, false to disable\n"
         );
     }
 
@@ -596,18 +598,18 @@ UniValue setnetworkactive(const JSONRPCRequest& request)
 static const CRPCCommand commands[] =
 { //  category              name                      actor (function)         okSafeMode
   //  --------------------- ------------------------  -----------------------  ----------
-    { "network",            "getconnectioncount",     &getconnectioncount,     true  },
-    { "network",            "ping",                   &ping,                   true  },
-    { "network",            "getpeerinfo",            &getpeerinfo,            true  },
-    { "network",            "addnode",                &addnode,                true  },
-    { "network",            "disconnectnode",         &disconnectnode,         true  },
-    { "network",            "getaddednodeinfo",       &getaddednodeinfo,       true  },
-    { "network",            "getnettotals",           &getnettotals,           true  },
-    { "network",            "getnetworkinfo",         &getnetworkinfo,         true  },
-    { "network",            "setban",                 &setban,                 true  },
-    { "network",            "listbanned",             &listbanned,             true  },
-    { "network",            "clearbanned",            &clearbanned,            true  },
-    { "network",            "setnetworkactive",       &setnetworkactive,       true, },
+    { "network",            "getconnectioncount",     &getconnectioncount,     true,  {} },
+    { "network",            "ping",                   &ping,                   true,  {} },
+    { "network",            "getpeerinfo",            &getpeerinfo,            true,  {} },
+    { "network",            "addnode",                &addnode,                true,  {"node","command"} },
+    { "network",            "disconnectnode",         &disconnectnode,         true,  {"node"} },
+    { "network",            "getaddednodeinfo",       &getaddednodeinfo,       true,  {"node"} },
+    { "network",            "getnettotals",           &getnettotals,           true,  {} },
+    { "network",            "getnetworkinfo",         &getnetworkinfo,         true,  {} },
+    { "network",            "setban",                 &setban,                 true,  {"subnet", "command", "bantime", "absolute"} },
+    { "network",            "listbanned",             &listbanned,             true,  {} },
+    { "network",            "clearbanned",            &clearbanned,            true,  {} },
+    { "network",            "setnetworkactive",       &setnetworkactive,       true,  {"state"} },
 };
 
 void RegisterNetRPCCommands(CRPCTable &t)

From 78b684f2ac9a81026239417bc6d3b76ec9a410c7 Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Mon, 21 Nov 2016 14:03:09 +0100
Subject: [PATCH 1501/1802] rpc: Named arguments for mining calls

---
 src/rpc/mining.cpp | 44 ++++++++++++++++++++++----------------------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/src/rpc/mining.cpp b/src/rpc/mining.cpp
index fa79d20734ae1..3143916c88882 100644
--- a/src/rpc/mining.cpp
+++ b/src/rpc/mining.cpp
@@ -78,12 +78,12 @@ UniValue getnetworkhashps(const JSONRPCRequest& request)
 {
     if (request.fHelp || request.params.size() > 2)
         throw runtime_error(
-            "getnetworkhashps ( blocks height )\n"
+            "getnetworkhashps ( nblocks height )\n"
             "\nReturns the estimated network hashes per second based on the last n blocks.\n"
             "Pass in [blocks] to override # of blocks, -1 specifies since last difficulty change.\n"
             "Pass in [height] to estimate the network speed at the time when a certain block was found.\n"
             "\nArguments:\n"
-            "1. blocks     (numeric, optional, default=120) The number of blocks, or -1 for blocks since last difficulty change.\n"
+            "1. nblocks     (numeric, optional, default=120) The number of blocks, or -1 for blocks since last difficulty change.\n"
             "2. height     (numeric, optional, default=-1) To estimate at the time of the given height.\n"
             "\nResult:\n"
             "x             (numeric) Hashes per second estimated\n"
@@ -150,10 +150,10 @@ UniValue generate(const JSONRPCRequest& request)
 {
     if (request.fHelp || request.params.size() < 1 || request.params.size() > 2)
         throw runtime_error(
-            "generate numblocks ( maxtries )\n"
-            "\nMine up to numblocks blocks immediately (before the RPC call returns)\n"
+            "generate nblocks ( maxtries )\n"
+            "\nMine up to nblocks blocks immediately (before the RPC call returns)\n"
             "\nArguments:\n"
-            "1. numblocks    (numeric, required) How many blocks are generated immediately.\n"
+            "1. nblocks    (numeric, required) How many blocks are generated immediately.\n"
             "2. maxtries     (numeric, optional) How many iterations to try (default = 1000000).\n"
             "\nResult:\n"
             "[ blockhashes ]     (array) hashes of blocks generated\n"
@@ -186,10 +186,10 @@ UniValue generatetoaddress(const JSONRPCRequest& request)
 {
     if (request.fHelp || request.params.size() < 2 || request.params.size() > 3)
         throw runtime_error(
-            "generatetoaddress numblocks address (maxtries)\n"
+            "generatetoaddress nblocks address (maxtries)\n"
             "\nMine blocks immediately to a specified address (before the RPC call returns)\n"
             "\nArguments:\n"
-            "1. numblocks    (numeric, required) How many blocks are generated immediately.\n"
+            "1. nblocks    (numeric, required) How many blocks are generated immediately.\n"
             "2. address    (string, required) The address to send the newly generated bitcoin to.\n"
             "3. maxtries     (numeric, optional) How many iterations to try (default = 1000000).\n"
             "\nResult:\n"
@@ -329,7 +329,7 @@ UniValue getblocktemplate(const JSONRPCRequest& request)
             "    https://github.com/bitcoin/bips/blob/master/bip-0145.mediawiki\n"
 
             "\nArguments:\n"
-            "1. TemplateRequest          (json object, optional) A json object in the following spec\n"
+            "1. template_request         (json object, optional) A json object in the following spec\n"
             "     {\n"
             "       \"mode\":\"template\"    (string, optional) This must be set to \"template\", \"proposal\" (see BIP 23), or omitted\n"
             "       \"capabilities\":[     (array, optional) A list of strings\n"
@@ -719,7 +719,7 @@ UniValue submitblock(const JSONRPCRequest& request)
 
             "\nArguments:\n"
             "1. \"hexdata\"    (string, required) the hex-encoded block data to submit\n"
-            "2. \"jsonparametersobject\"     (string, optional) object of optional parameters\n"
+            "2. \"parameters\"     (string, optional) object of optional parameters\n"
             "    {\n"
             "      \"workid\" : \"id\"    (string, optional) if the server provided a workid, it MUST be included with submissions\n"
             "    }\n"
@@ -908,19 +908,19 @@ UniValue estimatesmartpriority(const JSONRPCRequest& request)
 static const CRPCCommand commands[] =
 { //  category              name                      actor (function)         okSafeMode
   //  --------------------- ------------------------  -----------------------  ----------
-    { "mining",             "getnetworkhashps",       &getnetworkhashps,       true  },
-    { "mining",             "getmininginfo",          &getmininginfo,          true  },
-    { "mining",             "prioritisetransaction",  &prioritisetransaction,  true  },
-    { "mining",             "getblocktemplate",       &getblocktemplate,       true  },
-    { "mining",             "submitblock",            &submitblock,            true  },
-
-    { "generating",         "generate",               &generate,               true  },
-    { "generating",         "generatetoaddress",      &generatetoaddress,      true  },
-
-    { "util",               "estimatefee",            &estimatefee,            true  },
-    { "util",               "estimatepriority",       &estimatepriority,       true  },
-    { "util",               "estimatesmartfee",       &estimatesmartfee,       true  },
-    { "util",               "estimatesmartpriority",  &estimatesmartpriority,  true  },
+    { "mining",             "getnetworkhashps",       &getnetworkhashps,       true,  {"nblocks","height"} },
+    { "mining",             "getmininginfo",          &getmininginfo,          true,  {} },
+    { "mining",             "prioritisetransaction",  &prioritisetransaction,  true,  {"txid","priority_delta","fee_delta"} },
+    { "mining",             "getblocktemplate",       &getblocktemplate,       true,  {"template_request"} },
+    { "mining",             "submitblock",            &submitblock,            true,  {"hexdata","parameters"} },
+
+    { "generating",         "generate",               &generate,               true,  {"nblocks","maxtries"} },
+    { "generating",         "generatetoaddress",      &generatetoaddress,      true,  {"nblocks","address","maxtries"} },
+
+    { "util",               "estimatefee",            &estimatefee,            true,  {"nblocks"} },
+    { "util",               "estimatepriority",       &estimatepriority,       true,  {"nblocks"} },
+    { "util",               "estimatesmartfee",       &estimatesmartfee,       true,  {"nblocks"} },
+    { "util",               "estimatesmartpriority",  &estimatesmartpriority,  true,  {"nblocks"} },
 };
 
 void RegisterMiningRPCCommands(CRPCTable &t)

From 37a166f1465c91be3e700c0175f34dd0c3698df8 Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Mon, 21 Nov 2016 14:32:36 +0100
Subject: [PATCH 1502/1802] rpc: Named arguments for wallet calls

---
 src/wallet/rpcdump.cpp   |   8 +--
 src/wallet/rpcwallet.cpp | 142 +++++++++++++++++++--------------------
 2 files changed, 75 insertions(+), 75 deletions(-)

diff --git a/src/wallet/rpcdump.cpp b/src/wallet/rpcdump.cpp
index 34443a82504aa..228064c983e48 100644
--- a/src/wallet/rpcdump.cpp
+++ b/src/wallet/rpcdump.cpp
@@ -82,7 +82,7 @@ UniValue importprivkey(const JSONRPCRequest& request)
     
     if (request.fHelp || request.params.size() < 1 || request.params.size() > 3)
         throw runtime_error(
-            "importprivkey \"bitcoinprivkey\" ( \"label\" rescan )\n"
+            "importprivkey \"bitcoinprivkey\" ( \"label\" ) ( rescan )\n"
             "\nAdds a private key (as returned by dumpprivkey) to your wallet.\n"
             "\nArguments:\n"
             "1. \"bitcoinprivkey\"   (string, required) The private key (see dumpprivkey)\n"
@@ -963,10 +963,10 @@ UniValue importmulti(const JSONRPCRequest& mainRequest)
     // clang-format off
     if (mainRequest.fHelp || mainRequest.params.size() < 1 || mainRequest.params.size() > 2)
         throw runtime_error(
-            "importmulti '[<json import requests>]' '<json options>' \n\n"
+            "importmulti \"requests\" \"options\"\n\n"
             "Import addresses/scripts (with private or public keys, redeem script (P2SH)), rescanning all addresses in one-shot-only (rescan can be disabled via options).\n\n"
             "Arguments:\n"
-            "1. request array     (array, required) Data to be imported\n"
+            "1. requests     (array, required) Data to be imported\n"
             "  [     (array of json objects)\n"
             "    {\n"
             "      \"scriptPubKey\": \"<script>\" | { \"address\":\"<address>\" }, (string / json, required) Type of scriptPubKey (string for script, json for address)\n"
@@ -980,7 +980,7 @@ UniValue importmulti(const JSONRPCRequest& mainRequest)
             "    }\n"
             "  ,...\n"
             "  ]\n"
-            "2. json options                 (json, optional)\n"
+            "2. options                 (json, optional)\n"
             "  {\n"
             "     \"rescan\": <false>,         (boolean, optional, default: true) Stating if should rescan the blockchain after all imports\n"
             "  }\n"
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index 936140cf441fa..120f6401b16f9 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -380,7 +380,7 @@ UniValue sendtoaddress(const JSONRPCRequest& request)
 
     if (request.fHelp || request.params.size() < 2 || request.params.size() > 5)
         throw runtime_error(
-            "sendtoaddress \"bitcoinaddress\" amount ( \"comment\" \"comment-to\" subtractfeefromamount )\n"
+            "sendtoaddress \"bitcoinaddress\" amount ( \"comment\" \"comment_to\" subtractfeefromamount )\n"
             "\nSend an amount to a given address.\n"
             + HelpRequiringPassphrase() +
             "\nArguments:\n"
@@ -388,7 +388,7 @@ UniValue sendtoaddress(const JSONRPCRequest& request)
             "2. \"amount\"      (numeric or string, required) The amount in " + CURRENCY_UNIT + " to send. eg 0.1\n"
             "3. \"comment\"     (string, optional) A comment used to store what the transaction is for. \n"
             "                             This is not part of the transaction, just kept in your wallet.\n"
-            "4. \"comment-to\"  (string, optional) A comment to store the name of the person or organization \n"
+            "4. \"comment_to\"  (string, optional) A comment to store the name of the person or organization \n"
             "                             to which you're sending the transaction. This is not part of the \n"
             "                             transaction, just kept in your wallet.\n"
             "5. subtractfeefromamount  (boolean, optional, default=false) The fee will be deducted from the amount being sent.\n"
@@ -660,7 +660,7 @@ UniValue getbalance(const JSONRPCRequest& request)
 
     if (request.fHelp || request.params.size() > 3)
         throw runtime_error(
-            "getbalance ( \"account\" minconf includeWatchonly )\n"
+            "getbalance ( \"account\" minconf include_watchonly )\n"
             "\nIf account is not specified, returns the server's total available balance.\n"
             "If account is specified (DEPRECATED), returns the balance in the account.\n"
             "Note that the account \"\" is not the same as leaving the parameter out.\n"
@@ -668,7 +668,7 @@ UniValue getbalance(const JSONRPCRequest& request)
             "\nArguments:\n"
             "1. \"account\"      (string, optional) DEPRECATED. The selected account, or \"*\" for entire wallet. It may be the default account using \"\".\n"
             "2. minconf          (numeric, optional, default=1) Only include transactions confirmed at least this many times.\n"
-            "3. includeWatchonly (bool, optional, default=false) Also include balance in watchonly addresses (see 'importaddress')\n"
+            "3. include_watchonly (bool, optional, default=false) Also include balance in watchonly addresses (see 'importaddress')\n"
             "\nResult:\n"
             "amount              (numeric) The total amount in " + CURRENCY_UNIT + " received for this account.\n"
             "\nExamples:\n"
@@ -798,7 +798,7 @@ UniValue sendfrom(const JSONRPCRequest& request)
 
     if (request.fHelp || request.params.size() < 3 || request.params.size() > 6)
         throw runtime_error(
-            "sendfrom \"fromaccount\" \"tobitcoinaddress\" amount ( minconf \"comment\" \"comment-to\" )\n"
+            "sendfrom \"fromaccount\" \"tobitcoinaddress\" amount ( minconf \"comment\" \"comment_to\" )\n"
             "\nDEPRECATED (use sendtoaddress). Sent an amount from an account to a bitcoin address."
             + HelpRequiringPassphrase() + "\n"
             "\nArguments:\n"
@@ -808,7 +808,7 @@ UniValue sendfrom(const JSONRPCRequest& request)
             "4. minconf               (numeric, optional, default=1) Only use funds with at least this many confirmations.\n"
             "5. \"comment\"           (string, optional) A comment used to store what the transaction is for. \n"
             "                                     This is not part of the transaction, just kept in your wallet.\n"
-            "6. \"comment-to\"        (string, optional) An optional comment to store the name of the person or organization \n"
+            "6. \"comment_to\"        (string, optional) An optional comment to store the name of the person or organization \n"
             "                                     to which you're sending the transaction. This is not part of the transaction, \n"
             "                                     it is just kept in your wallet.\n"
             "\nResult:\n"
@@ -874,7 +874,7 @@ UniValue sendmany(const JSONRPCRequest& request)
             "    }\n"
             "3. minconf                 (numeric, optional, default=1) Only use the balance confirmed at least this many times.\n"
             "4. \"comment\"             (string, optional) A comment\n"
-            "5. subtractfeefromamount   (string, optional) A json array with addresses.\n"
+            "5. subtractfeefrom         (array, optional) A json array with addresses.\n"
             "                           The fee will be equally deducted from the amount of each selected address.\n"
             "                           Those recipients will receive less bitcoins than you enter in their corresponding amount field.\n"
             "                           If no addresses are specified here, the sender pays the fee.\n"
@@ -989,7 +989,7 @@ UniValue addmultisigaddress(const JSONRPCRequest& request)
 
             "\nArguments:\n"
             "1. nrequired        (numeric, required) The number of required signatures out of the n keys or addresses.\n"
-            "2. \"keysobject\"   (string, required) A json array of bitcoin addresses or hex-encoded public keys\n"
+            "2. \"keys\"         (string, required) A json array of bitcoin addresses or hex-encoded public keys\n"
             "     [\n"
             "       \"address\"  (string) bitcoin address or hex-encoded public key\n"
             "       ...,\n"
@@ -1253,12 +1253,12 @@ UniValue listreceivedbyaddress(const JSONRPCRequest& request)
 
     if (request.fHelp || request.params.size() > 3)
         throw runtime_error(
-            "listreceivedbyaddress ( minconf includeempty includeWatchonly)\n"
+            "listreceivedbyaddress ( minconf include_empty include_watchonly)\n"
             "\nList balances by receiving address.\n"
             "\nArguments:\n"
             "1. minconf       (numeric, optional, default=1) The minimum number of confirmations before payments are included.\n"
-            "2. includeempty  (bool, optional, default=false) Whether to include addresses that haven't received any payments.\n"
-            "3. includeWatchonly (bool, optional, default=false) Whether to include watchonly addresses (see 'importaddress').\n"
+            "2. include_empty  (bool, optional, default=false) Whether to include addresses that haven't received any payments.\n"
+            "3. include_watchonly (bool, optional, default=false) Whether to include watchonly addresses (see 'importaddress').\n"
 
             "\nResult:\n"
             "[\n"
@@ -1291,12 +1291,12 @@ UniValue listreceivedbyaccount(const JSONRPCRequest& request)
 
     if (request.fHelp || request.params.size() > 3)
         throw runtime_error(
-            "listreceivedbyaccount ( minconf includeempty includeWatchonly)\n"
+            "listreceivedbyaccount ( minconf include_empty include_watchonly)\n"
             "\nDEPRECATED. List balances by account.\n"
             "\nArguments:\n"
             "1. minconf      (numeric, optional, default=1) The minimum number of confirmations before payments are included.\n"
-            "2. includeempty (bool, optional, default=false) Whether to include accounts that haven't received any payments.\n"
-            "3. includeWatchonly (bool, optional, default=false) Whether to include watchonly addresses (see 'importaddress').\n"
+            "2. include_empty (bool, optional, default=false) Whether to include accounts that haven't received any payments.\n"
+            "3. include_watchonly (bool, optional, default=false) Whether to include watchonly addresses (see 'importaddress').\n"
 
             "\nResult:\n"
             "[\n"
@@ -1427,13 +1427,13 @@ UniValue listtransactions(const JSONRPCRequest& request)
 
     if (request.fHelp || request.params.size() > 4)
         throw runtime_error(
-            "listtransactions ( \"account\" count from includeWatchonly)\n"
+            "listtransactions ( \"account\" count from include_watchonly)\n"
             "\nReturns up to 'count' most recent transactions skipping the first 'from' transactions for account 'account'.\n"
             "\nArguments:\n"
             "1. \"account\"    (string, optional) DEPRECATED. The account name. Should be \"*\".\n"
             "2. count          (numeric, optional, default=10) The number of transactions to return\n"
             "3. from           (numeric, optional, default=0) The number of transactions to skip\n"
-            "4. includeWatchonly (bool, optional, default=false) Include transactions to watchonly addresses (see 'importaddress')\n"
+            "4. include_watchonly (bool, optional, default=false) Include transactions to watchonly addresses (see 'importaddress')\n"
             "\nResult:\n"
             "[\n"
             "  {\n"
@@ -1554,11 +1554,11 @@ UniValue listaccounts(const JSONRPCRequest& request)
 
     if (request.fHelp || request.params.size() > 2)
         throw runtime_error(
-            "listaccounts ( minconf includeWatchonly)\n"
+            "listaccounts ( minconf include_watchonly)\n"
             "\nDEPRECATED. Returns Object that has account names as keys, account balances as values.\n"
             "\nArguments:\n"
             "1. minconf          (numeric, optional, default=1) Only include transactions with at least this many confirmations\n"
-            "2. includeWatchonly (bool, optional, default=false) Include balances in watchonly addresses (see 'importaddress')\n"
+            "2. include_watchonly (bool, optional, default=false) Include balances in watchonly addresses (see 'importaddress')\n"
             "\nResult:\n"
             "{                      (json object where keys are account names, and values are numeric balances\n"
             "  \"account\": x.xxx,  (numeric) The property name is the account name, and the value is the total balance for the account.\n"
@@ -1633,12 +1633,12 @@ UniValue listsinceblock(const JSONRPCRequest& request)
 
     if (request.fHelp)
         throw runtime_error(
-            "listsinceblock ( \"blockhash\" target-confirmations includeWatchonly)\n"
+            "listsinceblock ( \"blockhash\" target_confirmations include_watchonly)\n"
             "\nGet all transactions in blocks since block [blockhash], or all transactions if omitted\n"
             "\nArguments:\n"
             "1. \"blockhash\"   (string, optional) The block hash to list transactions since\n"
-            "2. target-confirmations:    (numeric, optional) The confirmations required, must be 1 or more\n"
-            "3. includeWatchonly:        (bool, optional, default=false) Include transactions to watchonly addresses (see 'importaddress')"
+            "2. target_confirmations:   (numeric, optional) The confirmations required, must be 1 or more\n"
+            "3. include_watchonly:       (bool, optional, default=false) Include transactions to watchonly addresses (see 'importaddress')"
             "\nResult:\n"
             "{\n"
             "  \"transactions\": [\n"
@@ -1726,11 +1726,11 @@ UniValue gettransaction(const JSONRPCRequest& request)
 
     if (request.fHelp || request.params.size() < 1 || request.params.size() > 2)
         throw runtime_error(
-            "gettransaction \"txid\" ( includeWatchonly )\n"
+            "gettransaction \"txid\" ( include_watchonly )\n"
             "\nGet detailed information about in-wallet transaction <txid>\n"
             "\nArguments:\n"
             "1. \"txid\"    (string, required) The transaction id\n"
-            "2. \"includeWatchonly\"    (bool, optional, default=false) Whether to include watchonly addresses in balance calculation and details[]\n"
+            "2. \"include_watchonly\"   (bool, optional, default=false) Whether to include watchonly addresses in balance calculation and details[]\n"
             "\nResult:\n"
             "{\n"
             "  \"amount\" : x.xxx,        (numeric) The transaction amount in " + CURRENCY_UNIT + "\n"
@@ -2352,7 +2352,7 @@ UniValue listunspent(const JSONRPCRequest& request)
 
     if (request.fHelp || request.params.size() > 3)
         throw runtime_error(
-            "listunspent ( minconf maxconf  [\"address\",...] )\n"
+            "listunspent ( minconf maxconf  [\"addresses\",...] )\n"
             "\nReturns array of unspent transaction outputs\n"
             "with between minconf and maxconf (inclusive) confirmations.\n"
             "Optionally filter to only include txouts paid to specified addresses.\n"
@@ -2595,53 +2595,53 @@ extern UniValue importmulti(const JSONRPCRequest& request);
 static const CRPCCommand commands[] =
 { //  category              name                        actor (function)           okSafeMode
     //  --------------------- ------------------------    -----------------------    ----------
-    { "rawtransactions",    "fundrawtransaction",       &fundrawtransaction,       false },
-    { "hidden",             "resendwallettransactions", &resendwallettransactions, true  },
-    { "wallet",             "abandontransaction",       &abandontransaction,       false },
-    { "wallet",             "addmultisigaddress",       &addmultisigaddress,       true  },
-    { "wallet",             "addwitnessaddress",        &addwitnessaddress,        true  },
-    { "wallet",             "backupwallet",             &backupwallet,             true  },
-    { "wallet",             "dumpprivkey",              &dumpprivkey,              true  },
-    { "wallet",             "dumpwallet",               &dumpwallet,               true  },
-    { "wallet",             "encryptwallet",            &encryptwallet,            true  },
-    { "wallet",             "getaccountaddress",        &getaccountaddress,        true  },
-    { "wallet",             "getaccount",               &getaccount,               true  },
-    { "wallet",             "getaddressesbyaccount",    &getaddressesbyaccount,    true  },
-    { "wallet",             "getbalance",               &getbalance,               false },
-    { "wallet",             "getnewaddress",            &getnewaddress,            true  },
-    { "wallet",             "getrawchangeaddress",      &getrawchangeaddress,      true  },
-    { "wallet",             "getreceivedbyaccount",     &getreceivedbyaccount,     false },
-    { "wallet",             "getreceivedbyaddress",     &getreceivedbyaddress,     false },
-    { "wallet",             "gettransaction",           &gettransaction,           false },
-    { "wallet",             "getunconfirmedbalance",    &getunconfirmedbalance,    false },
-    { "wallet",             "getwalletinfo",            &getwalletinfo,            false },
-    { "wallet",             "importmulti",              &importmulti,              true  },
-    { "wallet",             "importprivkey",            &importprivkey,            true  },
-    { "wallet",             "importwallet",             &importwallet,             true  },
-    { "wallet",             "importaddress",            &importaddress,            true  },
-    { "wallet",             "importprunedfunds",        &importprunedfunds,        true  },
-    { "wallet",             "importpubkey",             &importpubkey,             true  },
-    { "wallet",             "keypoolrefill",            &keypoolrefill,            true  },
-    { "wallet",             "listaccounts",             &listaccounts,             false },
-    { "wallet",             "listaddressgroupings",     &listaddressgroupings,     false },
-    { "wallet",             "listlockunspent",          &listlockunspent,          false },
-    { "wallet",             "listreceivedbyaccount",    &listreceivedbyaccount,    false },
-    { "wallet",             "listreceivedbyaddress",    &listreceivedbyaddress,    false },
-    { "wallet",             "listsinceblock",           &listsinceblock,           false },
-    { "wallet",             "listtransactions",         &listtransactions,         false },
-    { "wallet",             "listunspent",              &listunspent,              false },
-    { "wallet",             "lockunspent",              &lockunspent,              true  },
-    { "wallet",             "move",                     &movecmd,                  false },
-    { "wallet",             "sendfrom",                 &sendfrom,                 false },
-    { "wallet",             "sendmany",                 &sendmany,                 false },
-    { "wallet",             "sendtoaddress",            &sendtoaddress,            false },
-    { "wallet",             "setaccount",               &setaccount,               true  },
-    { "wallet",             "settxfee",                 &settxfee,                 true  },
-    { "wallet",             "signmessage",              &signmessage,              true  },
-    { "wallet",             "walletlock",               &walletlock,               true  },
-    { "wallet",             "walletpassphrasechange",   &walletpassphrasechange,   true  },
-    { "wallet",             "walletpassphrase",         &walletpassphrase,         true  },
-    { "wallet",             "removeprunedfunds",        &removeprunedfunds,        true  },
+    { "rawtransactions",    "fundrawtransaction",       &fundrawtransaction,       false,  {"hexstring","options"} },
+    { "hidden",             "resendwallettransactions", &resendwallettransactions, true,   {} },
+    { "wallet",             "abandontransaction",       &abandontransaction,       false,  {"txid"} },
+    { "wallet",             "addmultisigaddress",       &addmultisigaddress,       true,   {"nrequired","keys","account"} },
+    { "wallet",             "addwitnessaddress",        &addwitnessaddress,        true,   {"address"} },
+    { "wallet",             "backupwallet",             &backupwallet,             true,   {"destination"} },
+    { "wallet",             "dumpprivkey",              &dumpprivkey,              true,   {"bitcoinaddress"}  },
+    { "wallet",             "dumpwallet",               &dumpwallet,               true,   {"filename"} },
+    { "wallet",             "encryptwallet",            &encryptwallet,            true,   {"passphrase"} },
+    { "wallet",             "getaccountaddress",        &getaccountaddress,        true,   {"account"} },
+    { "wallet",             "getaccount",               &getaccount,               true,   {"bitcoinaddress"} },
+    { "wallet",             "getaddressesbyaccount",    &getaddressesbyaccount,    true,   {"account"} },
+    { "wallet",             "getbalance",               &getbalance,               false,  {"account","minconf","include_watchonly"} },
+    { "wallet",             "getnewaddress",            &getnewaddress,            true,   {"account"} },
+    { "wallet",             "getrawchangeaddress",      &getrawchangeaddress,      true,   {} },
+    { "wallet",             "getreceivedbyaccount",     &getreceivedbyaccount,     false,  {"account","minconf"} },
+    { "wallet",             "getreceivedbyaddress",     &getreceivedbyaddress,     false,  {"bitcoinaddress","minconf"} },
+    { "wallet",             "gettransaction",           &gettransaction,           false,  {"txid","include_watchonly"} },
+    { "wallet",             "getunconfirmedbalance",    &getunconfirmedbalance,    false,  {} },
+    { "wallet",             "getwalletinfo",            &getwalletinfo,            false,  {} },
+    { "wallet",             "importmulti",              &importmulti,              true,   {"requests","options"} },
+    { "wallet",             "importprivkey",            &importprivkey,            true,   {"bitcoinprivkey","label","rescan"} },
+    { "wallet",             "importwallet",             &importwallet,             true,   {"filename"} },
+    { "wallet",             "importaddress",            &importaddress,            true,   {"address","label","rescan","p2sh"} },
+    { "wallet",             "importprunedfunds",        &importprunedfunds,        true,   {"rawtransaction","txoutproof"} },
+    { "wallet",             "importpubkey",             &importpubkey,             true,   {"pubkey","label","rescan"} },
+    { "wallet",             "keypoolrefill",            &keypoolrefill,            true,   {"newsize"} },
+    { "wallet",             "listaccounts",             &listaccounts,             false,  {"minconf","include_watchonly"} },
+    { "wallet",             "listaddressgroupings",     &listaddressgroupings,     false,  {} },
+    { "wallet",             "listlockunspent",          &listlockunspent,          false,  {} },
+    { "wallet",             "listreceivedbyaccount",    &listreceivedbyaccount,    false,  {"minconf","include_empty","include_watchonly"} },
+    { "wallet",             "listreceivedbyaddress",    &listreceivedbyaddress,    false,  {"minconf","include_empty","include_watchonly"} },
+    { "wallet",             "listsinceblock",           &listsinceblock,           false,  {"blockhash","target_confirmations","include_watchonly"} },
+    { "wallet",             "listtransactions",         &listtransactions,         false,  {"account","count","from","include_watchonly"} },
+    { "wallet",             "listunspent",              &listunspent,              false,  {"minconf","maxconf","addresses"} },
+    { "wallet",             "lockunspent",              &lockunspent,              true,   {"unlock","transactions"} },
+    { "wallet",             "move",                     &movecmd,                  false,  {"fromaccount","toaccount","amount","minconf","comment"} },
+    { "wallet",             "sendfrom",                 &sendfrom,                 false,  {"fromaccount","tobitcoinaddress","amount","minconf","comment","comment_to"} },
+    { "wallet",             "sendmany",                 &sendmany,                 false,  {"fromaccount","amounts","minconf","comment","subtractfeefrom"} },
+    { "wallet",             "sendtoaddress",            &sendtoaddress,            false,  {"bitcoinaddress","amount","comment","comment_to","subtractfeefromamount"} },
+    { "wallet",             "setaccount",               &setaccount,               true,   {"bitcoinaddress","account"} },
+    { "wallet",             "settxfee",                 &settxfee,                 true,   {"amount"} },
+    { "wallet",             "signmessage",              &signmessage,              true,   {"bitcoinaddress","message"} },
+    { "wallet",             "walletlock",               &walletlock,               true,   {} },
+    { "wallet",             "walletpassphrasechange",   &walletpassphrasechange,   true,   {"oldpassphrase","newpassphrase"} },
+    { "wallet",             "walletpassphrase",         &walletpassphrase,         true,   {"passphrase","timeout"} },
+    { "wallet",             "removeprunedfunds",        &removeprunedfunds,        true,   {"txid"} },
 };
 
 void RegisterWalletRPCCommands(CRPCTable &t)

From 8d713f761b6ce5ab3cca3986b0888c8c78c6ebcc Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Mon, 21 Nov 2016 14:47:36 +0100
Subject: [PATCH 1503/1802] rpc: Named arguments for rawtransaction calls

---
 src/rpc/rawtransaction.cpp | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/rpc/rawtransaction.cpp b/src/rpc/rawtransaction.cpp
index 276ebfda260d4..a35fd276188d3 100644
--- a/src/rpc/rawtransaction.cpp
+++ b/src/rpc/rawtransaction.cpp
@@ -532,7 +532,7 @@ UniValue decodescript(const JSONRPCRequest& request)
 {
     if (request.fHelp || request.params.size() != 1)
         throw runtime_error(
-            "decodescript \"hex\"\n"
+            "decodescript \"hexstring\"\n"
             "\nDecode a hex-encoded script.\n"
             "\nArguments:\n"
             "1. \"hex\"     (string) the hex encoded script\n"
@@ -616,7 +616,7 @@ UniValue signrawtransaction(const JSONRPCRequest& request)
             "       }\n"
             "       ,...\n"
             "    ]\n"
-            "3. \"privatekeys\"     (string, optional) A json array of base58-encoded private keys for signing\n"
+            "3. \"privkeys\"     (string, optional) A json array of base58-encoded private keys for signing\n"
             "    [                  (json array of strings, or 'null' if none provided)\n"
             "      \"privatekey\"   (string) private key in base58-encoding\n"
             "      ,...\n"
@@ -926,15 +926,15 @@ UniValue sendrawtransaction(const JSONRPCRequest& request)
 static const CRPCCommand commands[] =
 { //  category              name                      actor (function)         okSafeMode
   //  --------------------- ------------------------  -----------------------  ----------
-    { "rawtransactions",    "getrawtransaction",      &getrawtransaction,      true  },
-    { "rawtransactions",    "createrawtransaction",   &createrawtransaction,   true  },
-    { "rawtransactions",    "decoderawtransaction",   &decoderawtransaction,   true  },
-    { "rawtransactions",    "decodescript",           &decodescript,           true  },
-    { "rawtransactions",    "sendrawtransaction",     &sendrawtransaction,     false },
-    { "rawtransactions",    "signrawtransaction",     &signrawtransaction,     false }, /* uses wallet if enabled */
-
-    { "blockchain",         "gettxoutproof",          &gettxoutproof,          true  },
-    { "blockchain",         "verifytxoutproof",       &verifytxoutproof,       true  },
+    { "rawtransactions",    "getrawtransaction",      &getrawtransaction,      true,  {"txid","verbose"} },
+    { "rawtransactions",    "createrawtransaction",   &createrawtransaction,   true,  {"transactions","outputs","locktime"} },
+    { "rawtransactions",    "decoderawtransaction",   &decoderawtransaction,   true,  {"hexstring"} },
+    { "rawtransactions",    "decodescript",           &decodescript,           true,  {"hexstring"} },
+    { "rawtransactions",    "sendrawtransaction",     &sendrawtransaction,     false, {"hexstring","allowhighfees"} },
+    { "rawtransactions",    "signrawtransaction",     &signrawtransaction,     false, {"hexstring","prevtxs","privkeys","sighashtype"} }, /* uses wallet if enabled */
+
+    { "blockchain",         "gettxoutproof",          &gettxoutproof,          true,  {"txids", "blockhash"} },
+    { "blockchain",         "verifytxoutproof",       &verifytxoutproof,       true,  {"proof"} },
 };
 
 void RegisterRawTransactionRPCCommands(CRPCTable &t)

From 9adb4e1a59d54788e204895aaff5d6cbefd1b97a Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Mon, 21 Nov 2016 14:39:58 +0100
Subject: [PATCH 1504/1802] rpc: Argument name consistency

The meaning is clear from the context, and we're inconsistent here.
Also save typing when using named arguments.

- `bitcoinaddress` -> `address`
- `bitcoinprivkey` -> `privkey`
- `bitcoinpubkey` -> `pubkey`
---
 src/rpc/blockchain.cpp     |  2 +-
 src/rpc/misc.cpp           | 14 ++++-----
 src/rpc/rawtransaction.cpp |  2 +-
 src/wallet/rpcdump.cpp     |  6 ++--
 src/wallet/rpcwallet.cpp   | 60 +++++++++++++++++++-------------------
 5 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp
index e38636aa7b09a..77eb4190abf19 100644
--- a/src/rpc/blockchain.cpp
+++ b/src/rpc/blockchain.cpp
@@ -875,7 +875,7 @@ UniValue gettxout(const JSONRPCRequest& request)
             "     \"reqSigs\" : n,          (numeric) Number of required signatures\n"
             "     \"type\" : \"pubkeyhash\", (string) The type, eg pubkeyhash\n"
             "     \"addresses\" : [          (array of string) array of bitcoin addresses\n"
-            "        \"bitcoinaddress\"     (string) bitcoin address\n"
+            "        \"address\"     (string) bitcoin address\n"
             "        ,...\n"
             "     ]\n"
             "  },\n"
diff --git a/src/rpc/misc.cpp b/src/rpc/misc.cpp
index 4029e5e67cfd2..e95f4223668d5 100644
--- a/src/rpc/misc.cpp
+++ b/src/rpc/misc.cpp
@@ -152,14 +152,14 @@ UniValue validateaddress(const JSONRPCRequest& request)
 {
     if (request.fHelp || request.params.size() != 1)
         throw runtime_error(
-            "validateaddress \"bitcoinaddress\"\n"
+            "validateaddress \"address\"\n"
             "\nReturn information about the given bitcoin address.\n"
             "\nArguments:\n"
-            "1. \"bitcoinaddress\"     (string, required) The bitcoin address to validate\n"
+            "1. \"address\"     (string, required) The bitcoin address to validate\n"
             "\nResult:\n"
             "{\n"
             "  \"isvalid\" : true|false,       (boolean) If the address is valid or not. If not, this is the only property returned.\n"
-            "  \"address\" : \"bitcoinaddress\", (string) The bitcoin address validated\n"
+            "  \"address\" : \"address\", (string) The bitcoin address validated\n"
             "  \"scriptPubKey\" : \"hex\",       (string) The hex encoded scriptPubKey generated by the address\n"
             "  \"ismine\" : true|false,        (boolean) If the address is yours or not\n"
             "  \"iswatchonly\" : true|false,   (boolean) If the address is watchonly\n"
@@ -325,10 +325,10 @@ UniValue verifymessage(const JSONRPCRequest& request)
 {
     if (request.fHelp || request.params.size() != 3)
         throw runtime_error(
-            "verifymessage \"bitcoinaddress\" \"signature\" \"message\"\n"
+            "verifymessage \"address\" \"signature\" \"message\"\n"
             "\nVerify a signed message\n"
             "\nArguments:\n"
-            "1. \"bitcoinaddress\"  (string, required) The bitcoin address to use for the signature.\n"
+            "1. \"address\"  (string, required) The bitcoin address to use for the signature.\n"
             "2. \"signature\"       (string, required) The signature provided by the signer in base 64 encoding (see signmessage).\n"
             "3. \"message\"         (string, required) The message that was signed.\n"
             "\nResult:\n"
@@ -508,9 +508,9 @@ static const CRPCCommand commands[] =
   //  --------------------- ------------------------  -----------------------  ----------
     { "control",            "getinfo",                &getinfo,                true,  {} }, /* uses wallet if enabled */
     { "control",            "getmemoryinfo",          &getmemoryinfo,          true,  {} },
-    { "util",               "validateaddress",        &validateaddress,        true,  {"bitcoinaddress"} }, /* uses wallet if enabled */
+    { "util",               "validateaddress",        &validateaddress,        true,  {"address"} }, /* uses wallet if enabled */
     { "util",               "createmultisig",         &createmultisig,         true,  {"nrequired","keys"} },
-    { "util",               "verifymessage",          &verifymessage,          true,  {"bitcoinaddress","signature","message"} },
+    { "util",               "verifymessage",          &verifymessage,          true,  {"address","signature","message"} },
     { "util",               "signmessagewithprivkey", &signmessagewithprivkey, true,  {"privkey","message"} },
 
     /* Not shown in help */
diff --git a/src/rpc/rawtransaction.cpp b/src/rpc/rawtransaction.cpp
index a35fd276188d3..78b0a00b8b1a2 100644
--- a/src/rpc/rawtransaction.cpp
+++ b/src/rpc/rawtransaction.cpp
@@ -174,7 +174,7 @@ UniValue getrawtransaction(const JSONRPCRequest& request)
             "         \"reqSigs\" : n,            (numeric) The required sigs\n"
             "         \"type\" : \"pubkeyhash\",  (string) The type, eg 'pubkeyhash'\n"
             "         \"addresses\" : [           (json array of string)\n"
-            "           \"bitcoinaddress\"        (string) bitcoin address\n"
+            "           \"address\"        (string) bitcoin address\n"
             "           ,...\n"
             "         ]\n"
             "       }\n"
diff --git a/src/wallet/rpcdump.cpp b/src/wallet/rpcdump.cpp
index 228064c983e48..a1912a78ec3b3 100644
--- a/src/wallet/rpcdump.cpp
+++ b/src/wallet/rpcdump.cpp
@@ -520,11 +520,11 @@ UniValue dumpprivkey(const JSONRPCRequest& request)
     
     if (request.fHelp || request.params.size() != 1)
         throw runtime_error(
-            "dumpprivkey \"bitcoinaddress\"\n"
-            "\nReveals the private key corresponding to 'bitcoinaddress'.\n"
+            "dumpprivkey \"address\"\n"
+            "\nReveals the private key corresponding to 'address'.\n"
             "Then the importprivkey can be used with this output\n"
             "\nArguments:\n"
-            "1. \"bitcoinaddress\"   (string, required) The bitcoin address for the private key\n"
+            "1. \"address\"   (string, required) The bitcoin address for the private key\n"
             "\nResult:\n"
             "\"key\"                (string) The private key\n"
             "\nExamples:\n"
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index 120f6401b16f9..2379403d40c1b 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -116,7 +116,7 @@ UniValue getnewaddress(const JSONRPCRequest& request)
             "\nArguments:\n"
             "1. \"account\"        (string, optional) DEPRECATED. The account name for the address to be linked to. If not provided, the default account \"\" is used. It can also be set to the empty string \"\" to represent the default account. The account does not need to exist, it will be created if there is no account by the given name.\n"
             "\nResult:\n"
-            "\"bitcoinaddress\"    (string) The new bitcoin address\n"
+            "\"address\"    (string) The new bitcoin address\n"
             "\nExamples:\n"
             + HelpExampleCli("getnewaddress", "")
             + HelpExampleRpc("getnewaddress", "")
@@ -166,7 +166,7 @@ UniValue getaccountaddress(const JSONRPCRequest& request)
             "\nArguments:\n"
             "1. \"account\"       (string, required) The account name for the address. It can also be set to the empty string \"\" to represent the default account. The account does not need to exist, it will be created and a new address created  if there is no account by the given name.\n"
             "\nResult:\n"
-            "\"bitcoinaddress\"   (string) The account bitcoin address\n"
+            "\"address\"   (string) The account bitcoin address\n"
             "\nExamples:\n"
             + HelpExampleCli("getaccountaddress", "")
             + HelpExampleCli("getaccountaddress", "\"\"")
@@ -228,10 +228,10 @@ UniValue setaccount(const JSONRPCRequest& request)
 
     if (request.fHelp || request.params.size() < 1 || request.params.size() > 2)
         throw runtime_error(
-            "setaccount \"bitcoinaddress\" \"account\"\n"
+            "setaccount \"address\" \"account\"\n"
             "\nDEPRECATED. Sets the account associated with the given address.\n"
             "\nArguments:\n"
-            "1. \"bitcoinaddress\"  (string, required) The bitcoin address to be associated with an account.\n"
+            "1. \"address\"  (string, required) The bitcoin address to be associated with an account.\n"
             "2. \"account\"         (string, required) The account to assign the address to.\n"
             "\nExamples:\n"
             + HelpExampleCli("setaccount", "\"1D1ZrZNe3JUo7ZycKEYQQiQAWd9y54F4XZ\" \"tabby\"")
@@ -274,10 +274,10 @@ UniValue getaccount(const JSONRPCRequest& request)
 
     if (request.fHelp || request.params.size() != 1)
         throw runtime_error(
-            "getaccount \"bitcoinaddress\"\n"
+            "getaccount \"address\"\n"
             "\nDEPRECATED. Returns the account associated with the given address.\n"
             "\nArguments:\n"
-            "1. \"bitcoinaddress\"  (string, required) The bitcoin address for account lookup.\n"
+            "1. \"address\"  (string, required) The bitcoin address for account lookup.\n"
             "\nResult:\n"
             "\"accountname\"        (string) the account address\n"
             "\nExamples:\n"
@@ -312,7 +312,7 @@ UniValue getaddressesbyaccount(const JSONRPCRequest& request)
             "1. \"account\"  (string, required) The account name.\n"
             "\nResult:\n"
             "[                     (json array of string)\n"
-            "  \"bitcoinaddress\"  (string) a bitcoin address associated with the given account\n"
+            "  \"address\"  (string) a bitcoin address associated with the given account\n"
             "  ,...\n"
             "]\n"
             "\nExamples:\n"
@@ -380,11 +380,11 @@ UniValue sendtoaddress(const JSONRPCRequest& request)
 
     if (request.fHelp || request.params.size() < 2 || request.params.size() > 5)
         throw runtime_error(
-            "sendtoaddress \"bitcoinaddress\" amount ( \"comment\" \"comment_to\" subtractfeefromamount )\n"
+            "sendtoaddress \"address\" amount ( \"comment\" \"comment_to\" subtractfeefromamount )\n"
             "\nSend an amount to a given address.\n"
             + HelpRequiringPassphrase() +
             "\nArguments:\n"
-            "1. \"bitcoinaddress\"  (string, required) The bitcoin address to send to.\n"
+            "1. \"address\"  (string, required) The bitcoin address to send to.\n"
             "2. \"amount\"      (numeric or string, required) The amount in " + CURRENCY_UNIT + " to send. eg 0.1\n"
             "3. \"comment\"     (string, optional) A comment used to store what the transaction is for. \n"
             "                             This is not part of the transaction, just kept in your wallet.\n"
@@ -446,7 +446,7 @@ UniValue listaddressgroupings(const JSONRPCRequest& request)
             "[\n"
             "  [\n"
             "    [\n"
-            "      \"bitcoinaddress\",     (string) The bitcoin address\n"
+            "      \"address\",     (string) The bitcoin address\n"
             "      amount,                 (numeric) The amount in " + CURRENCY_UNIT + "\n"
             "      \"account\"             (string, optional) The account (DEPRECATED)\n"
             "    ]\n"
@@ -489,11 +489,11 @@ UniValue signmessage(const JSONRPCRequest& request)
 
     if (request.fHelp || request.params.size() != 2)
         throw runtime_error(
-            "signmessage \"bitcoinaddress\" \"message\"\n"
+            "signmessage \"address\" \"message\"\n"
             "\nSign a message with the private key of an address"
             + HelpRequiringPassphrase() + "\n"
             "\nArguments:\n"
-            "1. \"bitcoinaddress\"  (string, required) The bitcoin address to use for the private key.\n"
+            "1. \"address\"  (string, required) The bitcoin address to use for the private key.\n"
             "2. \"message\"         (string, required) The message to create a signature of.\n"
             "\nResult:\n"
             "\"signature\"          (string) The signature of the message encoded in base 64\n"
@@ -545,10 +545,10 @@ UniValue getreceivedbyaddress(const JSONRPCRequest& request)
 
     if (request.fHelp || request.params.size() < 1 || request.params.size() > 2)
         throw runtime_error(
-            "getreceivedbyaddress \"bitcoinaddress\" ( minconf )\n"
-            "\nReturns the total amount received by the given bitcoinaddress in transactions with at least minconf confirmations.\n"
+            "getreceivedbyaddress \"address\" ( minconf )\n"
+            "\nReturns the total amount received by the given address in transactions with at least minconf confirmations.\n"
             "\nArguments:\n"
-            "1. \"bitcoinaddress\"  (string, required) The bitcoin address for transactions.\n"
+            "1. \"address\"  (string, required) The bitcoin address for transactions.\n"
             "2. minconf             (numeric, optional, default=1) Only include transactions confirmed at least this many times.\n"
             "\nResult:\n"
             "amount   (numeric) The total amount in " + CURRENCY_UNIT + " received at this address.\n"
@@ -798,12 +798,12 @@ UniValue sendfrom(const JSONRPCRequest& request)
 
     if (request.fHelp || request.params.size() < 3 || request.params.size() > 6)
         throw runtime_error(
-            "sendfrom \"fromaccount\" \"tobitcoinaddress\" amount ( minconf \"comment\" \"comment_to\" )\n"
+            "sendfrom \"fromaccount\" \"toaddress\" amount ( minconf \"comment\" \"comment_to\" )\n"
             "\nDEPRECATED (use sendtoaddress). Sent an amount from an account to a bitcoin address."
             + HelpRequiringPassphrase() + "\n"
             "\nArguments:\n"
             "1. \"fromaccount\"       (string, required) The name of the account to send funds from. May be the default account using \"\".\n"
-            "2. \"tobitcoinaddress\"  (string, required) The bitcoin address to send funds to.\n"
+            "2. \"toaddress\"  (string, required) The bitcoin address to send funds to.\n"
             "3. amount                (numeric or string, required) The amount in " + CURRENCY_UNIT + " (transaction fee is added on top).\n"
             "4. minconf               (numeric, optional, default=1) Only use funds with at least this many confirmations.\n"
             "5. \"comment\"           (string, optional) A comment used to store what the transaction is for. \n"
@@ -997,7 +997,7 @@ UniValue addmultisigaddress(const JSONRPCRequest& request)
             "3. \"account\"      (string, optional) DEPRECATED. An account to assign the addresses to.\n"
 
             "\nResult:\n"
-            "\"bitcoinaddress\"  (string) A bitcoin address associated with the keys.\n"
+            "\"address\"  (string) A bitcoin address associated with the keys.\n"
 
             "\nExamples:\n"
             "\nAdd a multisig address from 2 addresses\n"
@@ -1439,7 +1439,7 @@ UniValue listtransactions(const JSONRPCRequest& request)
             "  {\n"
             "    \"account\":\"accountname\",       (string) DEPRECATED. The account name associated with the transaction. \n"
             "                                                It will be \"\" for the default account.\n"
-            "    \"address\":\"bitcoinaddress\",    (string) The bitcoin address of the transaction. Not present for \n"
+            "    \"address\":\"address\",    (string) The bitcoin address of the transaction. Not present for \n"
             "                                                move transactions (category = move).\n"
             "    \"category\":\"send|receive|move\", (string) The transaction category. 'move' is a local (off blockchain)\n"
             "                                                transaction between accounts, and not associated with an address,\n"
@@ -1643,7 +1643,7 @@ UniValue listsinceblock(const JSONRPCRequest& request)
             "{\n"
             "  \"transactions\": [\n"
             "    \"account\":\"accountname\",       (string) DEPRECATED. The account name associated with the transaction. Will be \"\" for the default account.\n"
-            "    \"address\":\"bitcoinaddress\",    (string) The bitcoin address of the transaction. Not present for move transactions (category = move).\n"
+            "    \"address\":\"address\",    (string) The bitcoin address of the transaction. Not present for move transactions (category = move).\n"
             "    \"category\":\"send|receive\",     (string) The transaction category. 'send' has negative amounts, 'receive' has positive amounts.\n"
             "    \"amount\": x.xxx,          (numeric) The amount in " + CURRENCY_UNIT + ". This is negative for the 'send' category, and for the 'move' category for moves \n"
             "                                          outbound. It is positive for the 'receive' category, and for the 'move' category for inbound funds.\n"
@@ -1746,7 +1746,7 @@ UniValue gettransaction(const JSONRPCRequest& request)
             "  \"details\" : [\n"
             "    {\n"
             "      \"account\" : \"accountname\",  (string) DEPRECATED. The account name involved in the transaction, can be \"\" for the default account.\n"
-            "      \"address\" : \"bitcoinaddress\",   (string) The bitcoin address involved in the transaction\n"
+            "      \"address\" : \"address\",   (string) The bitcoin address involved in the transaction\n"
             "      \"category\" : \"send|receive\",    (string) The category, either 'send' or 'receive'\n"
             "      \"amount\" : x.xxx,                 (numeric) The amount in " + CURRENCY_UNIT + "\n"
             "      \"label\" : \"label\",              (string) A comment for the address/transaction, if any\n"
@@ -2071,7 +2071,7 @@ UniValue encryptwallet(const JSONRPCRequest& request)
             "\nNow set the passphrase to use the wallet, such as for signing or sending bitcoin\n"
             + HelpExampleCli("walletpassphrase", "\"my pass phrase\"") +
             "\nNow we can so something like sign\n"
-            + HelpExampleCli("signmessage", "\"bitcoinaddress\" \"test message\"") +
+            + HelpExampleCli("signmessage", "\"address\" \"test message\"") +
             "\nNow lock the wallet again by removing the passphrase\n"
             + HelpExampleCli("walletlock", "") +
             "\nAs a json rpc call\n"
@@ -2601,22 +2601,22 @@ static const CRPCCommand commands[] =
     { "wallet",             "addmultisigaddress",       &addmultisigaddress,       true,   {"nrequired","keys","account"} },
     { "wallet",             "addwitnessaddress",        &addwitnessaddress,        true,   {"address"} },
     { "wallet",             "backupwallet",             &backupwallet,             true,   {"destination"} },
-    { "wallet",             "dumpprivkey",              &dumpprivkey,              true,   {"bitcoinaddress"}  },
+    { "wallet",             "dumpprivkey",              &dumpprivkey,              true,   {"address"}  },
     { "wallet",             "dumpwallet",               &dumpwallet,               true,   {"filename"} },
     { "wallet",             "encryptwallet",            &encryptwallet,            true,   {"passphrase"} },
     { "wallet",             "getaccountaddress",        &getaccountaddress,        true,   {"account"} },
-    { "wallet",             "getaccount",               &getaccount,               true,   {"bitcoinaddress"} },
+    { "wallet",             "getaccount",               &getaccount,               true,   {"address"} },
     { "wallet",             "getaddressesbyaccount",    &getaddressesbyaccount,    true,   {"account"} },
     { "wallet",             "getbalance",               &getbalance,               false,  {"account","minconf","include_watchonly"} },
     { "wallet",             "getnewaddress",            &getnewaddress,            true,   {"account"} },
     { "wallet",             "getrawchangeaddress",      &getrawchangeaddress,      true,   {} },
     { "wallet",             "getreceivedbyaccount",     &getreceivedbyaccount,     false,  {"account","minconf"} },
-    { "wallet",             "getreceivedbyaddress",     &getreceivedbyaddress,     false,  {"bitcoinaddress","minconf"} },
+    { "wallet",             "getreceivedbyaddress",     &getreceivedbyaddress,     false,  {"address","minconf"} },
     { "wallet",             "gettransaction",           &gettransaction,           false,  {"txid","include_watchonly"} },
     { "wallet",             "getunconfirmedbalance",    &getunconfirmedbalance,    false,  {} },
     { "wallet",             "getwalletinfo",            &getwalletinfo,            false,  {} },
     { "wallet",             "importmulti",              &importmulti,              true,   {"requests","options"} },
-    { "wallet",             "importprivkey",            &importprivkey,            true,   {"bitcoinprivkey","label","rescan"} },
+    { "wallet",             "importprivkey",            &importprivkey,            true,   {"privkey","label","rescan"} },
     { "wallet",             "importwallet",             &importwallet,             true,   {"filename"} },
     { "wallet",             "importaddress",            &importaddress,            true,   {"address","label","rescan","p2sh"} },
     { "wallet",             "importprunedfunds",        &importprunedfunds,        true,   {"rawtransaction","txoutproof"} },
@@ -2632,12 +2632,12 @@ static const CRPCCommand commands[] =
     { "wallet",             "listunspent",              &listunspent,              false,  {"minconf","maxconf","addresses"} },
     { "wallet",             "lockunspent",              &lockunspent,              true,   {"unlock","transactions"} },
     { "wallet",             "move",                     &movecmd,                  false,  {"fromaccount","toaccount","amount","minconf","comment"} },
-    { "wallet",             "sendfrom",                 &sendfrom,                 false,  {"fromaccount","tobitcoinaddress","amount","minconf","comment","comment_to"} },
+    { "wallet",             "sendfrom",                 &sendfrom,                 false,  {"fromaccount","toaddress","amount","minconf","comment","comment_to"} },
     { "wallet",             "sendmany",                 &sendmany,                 false,  {"fromaccount","amounts","minconf","comment","subtractfeefrom"} },
-    { "wallet",             "sendtoaddress",            &sendtoaddress,            false,  {"bitcoinaddress","amount","comment","comment_to","subtractfeefromamount"} },
-    { "wallet",             "setaccount",               &setaccount,               true,   {"bitcoinaddress","account"} },
+    { "wallet",             "sendtoaddress",            &sendtoaddress,            false,  {"address","amount","comment","comment_to","subtractfeefromamount"} },
+    { "wallet",             "setaccount",               &setaccount,               true,   {"address","account"} },
     { "wallet",             "settxfee",                 &settxfee,                 true,   {"amount"} },
-    { "wallet",             "signmessage",              &signmessage,              true,   {"bitcoinaddress","message"} },
+    { "wallet",             "signmessage",              &signmessage,              true,   {"address","message"} },
     { "wallet",             "walletlock",               &walletlock,               true,   {} },
     { "wallet",             "walletpassphrasechange",   &walletpassphrasechange,   true,   {"oldpassphrase","newpassphrase"} },
     { "wallet",             "walletpassphrase",         &walletpassphrase,         true,   {"passphrase","timeout"} },

From 325e400f9ba89c6f5501c6cedd4dee979a3912b2 Mon Sep 17 00:00:00 2001
From: Jonas Schnelli <dev@jonasschnelli.ch>
Date: Thu, 5 Jan 2017 12:40:10 +0100
Subject: [PATCH 1505/1802] [Qt] Do proper shutdown

---
 src/qt/bitcoin.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp
index cfd0955a749b8..66bc5dced6731 100644
--- a/src/qt/bitcoin.cpp
+++ b/src/qt/bitcoin.cpp
@@ -444,6 +444,8 @@ void BitcoinApplication::requestShutdown()
     delete clientModel;
     clientModel = 0;
 
+    StartShutdown();
+
     // Request shutdown from core thread
     Q_EMIT requestedShutdown();
 }

From 69872195773870de8ee6521c9f555d60395a5ad9 Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Sun, 18 Dec 2016 23:26:20 -0800
Subject: [PATCH 1506/1802] Add a CValidationInterface::NewPoWValidBlock
 callback

---
 src/validation.cpp          | 5 +++++
 src/validationinterface.cpp | 3 +++
 src/validationinterface.h   | 6 ++++++
 3 files changed, 14 insertions(+)

diff --git a/src/validation.cpp b/src/validation.cpp
index d6bd789647613..20d75d957f37a 100644
--- a/src/validation.cpp
+++ b/src/validation.cpp
@@ -3096,6 +3096,11 @@ static bool AcceptBlock(const std::shared_ptr<const CBlock>& pblock, CValidation
         return error("%s: %s", __func__, FormatStateMessage(state));
     }
 
+    // Header is valid/has work, merkle tree and segwit merkle tree are good...RELAY NOW
+    // (but if it does not build on our best tip, let the SendMessages loop relay it)
+    if (!IsInitialBlockDownload() && chainActive.Tip() == pindex->pprev)
+        GetMainSignals().NewPoWValidBlock(pindex, pblock);
+
     int nHeight = pindex->nHeight;
 
     // Write block to history file
diff --git a/src/validationinterface.cpp b/src/validationinterface.cpp
index 215c342deaed5..d4121a28bc72c 100644
--- a/src/validationinterface.cpp
+++ b/src/validationinterface.cpp
@@ -22,6 +22,7 @@ void RegisterValidationInterface(CValidationInterface* pwalletIn) {
     g_signals.BlockChecked.connect(boost::bind(&CValidationInterface::BlockChecked, pwalletIn, _1, _2));
     g_signals.ScriptForMining.connect(boost::bind(&CValidationInterface::GetScriptForMining, pwalletIn, _1));
     g_signals.BlockFound.connect(boost::bind(&CValidationInterface::ResetRequestCount, pwalletIn, _1));
+    g_signals.NewPoWValidBlock.connect(boost::bind(&CValidationInterface::NewPoWValidBlock, pwalletIn, _1, _2));
 }
 
 void UnregisterValidationInterface(CValidationInterface* pwalletIn) {
@@ -34,6 +35,7 @@ void UnregisterValidationInterface(CValidationInterface* pwalletIn) {
     g_signals.UpdatedTransaction.disconnect(boost::bind(&CValidationInterface::UpdatedTransaction, pwalletIn, _1));
     g_signals.SyncTransaction.disconnect(boost::bind(&CValidationInterface::SyncTransaction, pwalletIn, _1, _2, _3));
     g_signals.UpdatedBlockTip.disconnect(boost::bind(&CValidationInterface::UpdatedBlockTip, pwalletIn, _1, _2, _3));
+    g_signals.NewPoWValidBlock.disconnect(boost::bind(&CValidationInterface::NewPoWValidBlock, pwalletIn, _1, _2));
 }
 
 void UnregisterAllValidationInterfaces() {
@@ -46,4 +48,5 @@ void UnregisterAllValidationInterfaces() {
     g_signals.UpdatedTransaction.disconnect_all_slots();
     g_signals.SyncTransaction.disconnect_all_slots();
     g_signals.UpdatedBlockTip.disconnect_all_slots();
+    g_signals.NewPoWValidBlock.disconnect_all_slots();
 }
diff --git a/src/validationinterface.h b/src/validationinterface.h
index 717026389cd89..594072719c6f2 100644
--- a/src/validationinterface.h
+++ b/src/validationinterface.h
@@ -8,6 +8,7 @@
 
 #include <boost/signals2/signal.hpp>
 #include <boost/shared_ptr.hpp>
+#include <memory>
 
 class CBlock;
 class CBlockIndex;
@@ -40,6 +41,7 @@ class CValidationInterface {
     virtual void BlockChecked(const CBlock&, const CValidationState&) {}
     virtual void GetScriptForMining(boost::shared_ptr<CReserveScript>&) {};
     virtual void ResetRequestCount(const uint256 &hash) {};
+    virtual void NewPoWValidBlock(const CBlockIndex *pindex, const std::shared_ptr<const CBlock>& block) {};
     friend void ::RegisterValidationInterface(CValidationInterface*);
     friend void ::UnregisterValidationInterface(CValidationInterface*);
     friend void ::UnregisterAllValidationInterfaces();
@@ -66,6 +68,10 @@ struct CMainSignals {
     boost::signals2::signal<void (boost::shared_ptr<CReserveScript>&)> ScriptForMining;
     /** Notifies listeners that a block has been successfully mined */
     boost::signals2::signal<void (const uint256 &)> BlockFound;
+    /**
+     * Notifies listeners that a block which builds directly on our current tip
+     * has been received and connected to the headers tree, though not validated yet */
+    boost::signals2::signal<void (const CBlockIndex *, const std::shared_ptr<const CBlock>&)> NewPoWValidBlock;
 };
 
 CMainSignals& GetMainSignals();

From c80209214208621b84da10895427e1e5f381d1b8 Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Thu, 5 Jan 2017 10:31:39 -0500
Subject: [PATCH 1507/1802] Relay compact block messages prior to full block
 connection

---
 src/net_processing.cpp | 33 +++++++++++++++++++++++++++++++++
 src/net_processing.h   |  1 +
 2 files changed, 34 insertions(+)

diff --git a/src/net_processing.cpp b/src/net_processing.cpp
index 4374b5be3e4de..15bdef86fa02c 100644
--- a/src/net_processing.cpp
+++ b/src/net_processing.cpp
@@ -752,6 +752,39 @@ void PeerLogicValidation::SyncTransaction(const CTransaction& tx, const CBlockIn
     }
 }
 
+void PeerLogicValidation::NewPoWValidBlock(const CBlockIndex *pindex, const std::shared_ptr<const CBlock>& pblock) {
+    CBlockHeaderAndShortTxIDs cmpctblock(*pblock, true);
+    CNetMsgMaker msgMaker(PROTOCOL_VERSION);
+
+    LOCK(cs_main);
+
+    static int nHighestFastAnnounce = 0;
+    if (pindex->nHeight <= nHighestFastAnnounce)
+        return;
+    nHighestFastAnnounce = pindex->nHeight;
+
+    bool fWitnessEnabled = IsWitnessEnabled(pindex->pprev, Params().GetConsensus());
+    uint256 hashBlock(pblock->GetHash());
+
+    connman->ForEachNode([this, &cmpctblock, pindex, &msgMaker, fWitnessEnabled, &hashBlock](CNode* pnode) {
+        // TODO: Avoid the repeated-serialization here
+        if (pnode->nVersion < INVALID_CB_NO_BAN_VERSION || pnode->fDisconnect)
+            return;
+        ProcessBlockAvailability(pnode->GetId());
+        CNodeState &state = *State(pnode->GetId());
+        // If the peer has, or we announced to them the previous block already,
+        // but we don't think they have this one, go ahead and announce it
+        if (state.fPreferHeaderAndIDs && (!fWitnessEnabled || state.fWantsCmpctWitness) &&
+                !PeerHasHeader(&state, pindex) && PeerHasHeader(&state, pindex->pprev)) {
+
+            LogPrint("net", "%s sending header-and-ids %s to peer %d\n", "PeerLogicValidation::NewPoWValidBlock",
+                    hashBlock.ToString(), pnode->id);
+            connman->PushMessage(pnode, msgMaker.Make(NetMsgType::CMPCTBLOCK, cmpctblock));
+            state.pindexBestHeaderSent = pindex;
+        }
+    });
+}
+
 void PeerLogicValidation::UpdatedBlockTip(const CBlockIndex *pindexNew, const CBlockIndex *pindexFork, bool fInitialDownload) {
     const int nNewHeight = pindexNew->nHeight;
     connman->SetBestHeight(nNewHeight);
diff --git a/src/net_processing.h b/src/net_processing.h
index 230d805bd4730..9d0d7944856ff 100644
--- a/src/net_processing.h
+++ b/src/net_processing.h
@@ -24,6 +24,7 @@ class PeerLogicValidation : public CValidationInterface {
     virtual void SyncTransaction(const CTransaction& tx, const CBlockIndex* pindex, int nPosInBlock);
     virtual void UpdatedBlockTip(const CBlockIndex *pindexNew, const CBlockIndex *pindexFork, bool fInitialDownload);
     virtual void BlockChecked(const CBlock& block, const CValidationState& state);
+    virtual void NewPoWValidBlock(const CBlockIndex *pindex, const std::shared_ptr<const CBlock>& pblock);
 };
 
 struct CNodeStateStats {

From 9eaec08dd236a9e73c7993d25274ec913c999c63 Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Wed, 14 Dec 2016 16:28:22 -0800
Subject: [PATCH 1508/1802] Cache most-recently-announced block's shared_ptr

---
 src/net_processing.cpp | 51 +++++++++++++++++++++++++++++++++---------
 1 file changed, 40 insertions(+), 11 deletions(-)

diff --git a/src/net_processing.cpp b/src/net_processing.cpp
index 15bdef86fa02c..5de103d4efeab 100644
--- a/src/net_processing.cpp
+++ b/src/net_processing.cpp
@@ -752,6 +752,10 @@ void PeerLogicValidation::SyncTransaction(const CTransaction& tx, const CBlockIn
     }
 }
 
+static CCriticalSection cs_most_recent_block;
+static std::shared_ptr<const CBlock> most_recent_block;
+static uint256 most_recent_block_hash;
+
 void PeerLogicValidation::NewPoWValidBlock(const CBlockIndex *pindex, const std::shared_ptr<const CBlock>& pblock) {
     CBlockHeaderAndShortTxIDs cmpctblock(*pblock, true);
     CNetMsgMaker msgMaker(PROTOCOL_VERSION);
@@ -766,6 +770,12 @@ void PeerLogicValidation::NewPoWValidBlock(const CBlockIndex *pindex, const std:
     bool fWitnessEnabled = IsWitnessEnabled(pindex->pprev, Params().GetConsensus());
     uint256 hashBlock(pblock->GetHash());
 
+    {
+        LOCK(cs_most_recent_block);
+        most_recent_block_hash = hashBlock;
+        most_recent_block = pblock;
+    }
+
     connman->ForEachNode([this, &cmpctblock, pindex, &msgMaker, fWitnessEnabled, &hashBlock](CNode* pnode) {
         // TODO: Avoid the repeated-serialization here
         if (pnode->nVersion < INVALID_CB_NO_BAN_VERSION || pnode->fDisconnect)
@@ -1090,6 +1100,23 @@ uint32_t GetFetchFlags(CNode* pfrom, const CBlockIndex* pprev, const Consensus::
     return nFetchFlags;
 }
 
+inline void static SendBlockTransactions(const CBlock& block, const BlockTransactionsRequest& req, CNode* pfrom, CConnman& connman) {
+    BlockTransactions resp(req);
+    for (size_t i = 0; i < req.indexes.size(); i++) {
+        if (req.indexes[i] >= block.vtx.size()) {
+            LOCK(cs_main);
+            Misbehaving(pfrom->GetId(), 100);
+            LogPrintf("Peer %d sent us a getblocktxn with out-of-bounds tx indices", pfrom->id);
+            return;
+        }
+        resp.txn[i] = block.vtx[req.indexes[i]];
+    }
+    LOCK(cs_main);
+    CNetMsgMaker msgMaker(pfrom->GetSendVersion());
+    int nSendFlags = State(pfrom->GetId())->fWantsCmpctWitness ? 0 : SERIALIZE_TRANSACTION_NO_WITNESS;
+    connman.PushMessage(pfrom, msgMaker.Make(nSendFlags, NetMsgType::BLOCKTXN, resp));
+}
+
 bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv, int64_t nTimeReceived, const CChainParams& chainparams, CConnman& connman, std::atomic<bool>& interruptMsgProc)
 {
     unsigned int nMaxSendBufferSize = connman.GetSendBufferSize();
@@ -1529,6 +1556,18 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
         BlockTransactionsRequest req;
         vRecv >> req;
 
+        std::shared_ptr<const CBlock> recent_block;
+        {
+            LOCK(cs_most_recent_block);
+            if (most_recent_block_hash == req.blockhash)
+                recent_block = most_recent_block;
+            // Unlock cs_most_recent_block to avoid cs_main lock inversion
+        }
+        if (recent_block) {
+            SendBlockTransactions(*recent_block, req, pfrom, connman);
+            return true;
+        }
+
         LOCK(cs_main);
 
         BlockMap::iterator it = mapBlockIndex.find(req.blockhash);
@@ -1558,17 +1597,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
         bool ret = ReadBlockFromDisk(block, it->second, chainparams.GetConsensus());
         assert(ret);
 
-        BlockTransactions resp(req);
-        for (size_t i = 0; i < req.indexes.size(); i++) {
-            if (req.indexes[i] >= block.vtx.size()) {
-                Misbehaving(pfrom->GetId(), 100);
-                LogPrintf("Peer %d sent us a getblocktxn with out-of-bounds tx indices", pfrom->id);
-                return true;
-            }
-            resp.txn[i] = block.vtx[req.indexes[i]];
-        }
-        int nSendFlags = State(pfrom->GetId())->fWantsCmpctWitness ? 0 : SERIALIZE_TRANSACTION_NO_WITNESS;
-        connman.PushMessage(pfrom, msgMaker.Make(nSendFlags, NetMsgType::BLOCKTXN, resp));
+        SendBlockTransactions(block, req, pfrom, connman);
     }
 
 

From 5749a853b9f46cc58d51aae8b5d4dcbd110a20ca Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Thu, 22 Dec 2016 15:29:06 -0800
Subject: [PATCH 1509/1802] Cache most-recently-connected compact block

---
 src/net_processing.cpp | 31 ++++++++++++++++++++++---------
 1 file changed, 22 insertions(+), 9 deletions(-)

diff --git a/src/net_processing.cpp b/src/net_processing.cpp
index 5de103d4efeab..669be6e89b197 100644
--- a/src/net_processing.cpp
+++ b/src/net_processing.cpp
@@ -754,10 +754,11 @@ void PeerLogicValidation::SyncTransaction(const CTransaction& tx, const CBlockIn
 
 static CCriticalSection cs_most_recent_block;
 static std::shared_ptr<const CBlock> most_recent_block;
+static std::shared_ptr<CBlockHeaderAndShortTxIDs> most_recent_compact_block;
 static uint256 most_recent_block_hash;
 
 void PeerLogicValidation::NewPoWValidBlock(const CBlockIndex *pindex, const std::shared_ptr<const CBlock>& pblock) {
-    CBlockHeaderAndShortTxIDs cmpctblock(*pblock, true);
+    std::shared_ptr<CBlockHeaderAndShortTxIDs> pcmpctblock = std::make_shared<CBlockHeaderAndShortTxIDs> (*pblock, true);
     CNetMsgMaker msgMaker(PROTOCOL_VERSION);
 
     LOCK(cs_main);
@@ -774,9 +775,10 @@ void PeerLogicValidation::NewPoWValidBlock(const CBlockIndex *pindex, const std:
         LOCK(cs_most_recent_block);
         most_recent_block_hash = hashBlock;
         most_recent_block = pblock;
+        most_recent_compact_block = pcmpctblock;
     }
 
-    connman->ForEachNode([this, &cmpctblock, pindex, &msgMaker, fWitnessEnabled, &hashBlock](CNode* pnode) {
+    connman->ForEachNode([this, &pcmpctblock, pindex, &msgMaker, fWitnessEnabled, &hashBlock](CNode* pnode) {
         // TODO: Avoid the repeated-serialization here
         if (pnode->nVersion < INVALID_CB_NO_BAN_VERSION || pnode->fDisconnect)
             return;
@@ -789,7 +791,7 @@ void PeerLogicValidation::NewPoWValidBlock(const CBlockIndex *pindex, const std:
 
             LogPrint("net", "%s sending header-and-ids %s to peer %d\n", "PeerLogicValidation::NewPoWValidBlock",
                     hashBlock.ToString(), pnode->id);
-            connman->PushMessage(pnode, msgMaker.Make(NetMsgType::CMPCTBLOCK, cmpctblock));
+            connman->PushMessage(pnode, msgMaker.Make(NetMsgType::CMPCTBLOCK, *pcmpctblock));
             state.pindexBestHeaderSent = pindex;
         }
     });
@@ -2859,13 +2861,24 @@ bool SendMessages(CNode* pto, CConnman& connman, std::atomic<bool>& interruptMsg
                     // probably means we're doing an initial-ish-sync or they're slow
                     LogPrint("net", "%s sending header-and-ids %s to peer %d\n", __func__,
                             vHeaders.front().GetHash().ToString(), pto->id);
-                    //TODO: Shouldn't need to reload block from disk, but requires refactor
-                    CBlock block;
-                    bool ret = ReadBlockFromDisk(block, pBestIndex, consensusParams);
-                    assert(ret);
-                    CBlockHeaderAndShortTxIDs cmpctblock(block, state.fWantsCmpctWitness);
+
                     int nSendFlags = state.fWantsCmpctWitness ? 0 : SERIALIZE_TRANSACTION_NO_WITNESS;
-                    connman.PushMessage(pto, msgMaker.Make(nSendFlags, NetMsgType::CMPCTBLOCK, cmpctblock));
+
+                    LOCK(cs_most_recent_block);
+                    if (most_recent_block_hash == pBestIndex->GetBlockHash()) {
+                        if (state.fWantsCmpctWitness)
+                            connman.PushMessage(pto, msgMaker.Make(nSendFlags, NetMsgType::CMPCTBLOCK, *most_recent_compact_block));
+                        else {
+                            CBlockHeaderAndShortTxIDs cmpctblock(*most_recent_block, state.fWantsCmpctWitness);
+                            connman.PushMessage(pto, msgMaker.Make(nSendFlags, NetMsgType::CMPCTBLOCK, cmpctblock));
+                        }
+                    } else {
+                        CBlock block;
+                        bool ret = ReadBlockFromDisk(block, pBestIndex, consensusParams);
+                        assert(ret);
+                        CBlockHeaderAndShortTxIDs cmpctblock(block, state.fWantsCmpctWitness);
+                        connman.PushMessage(pto, msgMaker.Make(nSendFlags, NetMsgType::CMPCTBLOCK, cmpctblock));
+                    }
                     state.pindexBestHeaderSent = pBestIndex;
                 } else if (state.fPreferHeaders) {
                     if (vHeaders.size() > 1) {

From 9eb67f50008970d09a8253475d591cdad872692e Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Sat, 31 Dec 2016 18:16:08 +0100
Subject: [PATCH 1510/1802] Ensure we meet the BIP 152 old-relay-types response
 requirements

In order to do this, we must call ActivateBestChain prior to
responding getdata requests for blocks which we announced using
compact blocks.

For getheaders responses we dont need code changes, but do note
that we must reset the bestHeaderSent so that the SendMessages call
re-announces the header in question.

While we could do something smarter for getblocks, calling
ActivateBestChain is simple and more obviously correct, instead of
doing something more similar to getheaders.

See-also the BIP clarifications at
https://github.com/bitcoin/bips/pull/486
---
 src/net_processing.cpp | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/src/net_processing.cpp b/src/net_processing.cpp
index 669be6e89b197..fdb70d6578cf4 100644
--- a/src/net_processing.cpp
+++ b/src/net_processing.cpp
@@ -957,6 +957,16 @@ void static ProcessGetData(CNode* pfrom, const Consensus::Params& consensusParam
                 BlockMap::iterator mi = mapBlockIndex.find(inv.hash);
                 if (mi != mapBlockIndex.end())
                 {
+                    if (mi->second->nChainTx && !mi->second->IsValid(BLOCK_VALID_SCRIPTS) &&
+                            mi->second->IsValid(BLOCK_VALID_TREE)) {
+                        // If we have the block and all of its parents, but have not yet validated it,
+                        // we might be in the middle of connecting it (ie in the unlock of cs_main
+                        // before ActivateBestChain but after AcceptBlock).
+                        // In this case, we need to run ActivateBestChain prior to checking the relay
+                        // conditions below.
+                        CValidationState dummy;
+                        ActivateBestChain(dummy, Params());
+                    }
                     if (chainActive.Contains(mi->second)) {
                         send = true;
                     } else {
@@ -1517,6 +1527,18 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
 
         LOCK(cs_main);
 
+        // We might have announced the currently-being-connected tip using a
+        // compact block, which resulted in the peer sending a getblocks
+        // request, which we would otherwise respond to without the new block.
+        // To avoid this situation we simply verify that we are on our best
+        // known chain now. This is super overkill, but we handle it better
+        // for getheaders requests, and there are no known nodes which support
+        // compact blocks but still use getblocks to request blocks.
+        {
+            CValidationState dummy;
+            ActivateBestChain(dummy, Params());
+        }
+
         // Find the last block the caller has in the main chain
         const CBlockIndex* pindex = FindForkInGlobalIndex(chainActive, locator);
 
@@ -1647,6 +1669,14 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
         // if our peer has chainActive.Tip() (and thus we are sending an empty
         // headers message). In both cases it's safe to update
         // pindexBestHeaderSent to be our tip.
+        //
+        // It is important that we simply reset the BestHeaderSent value here,
+        // and not max(BestHeaderSent, newHeaderSent). We might have announced
+        // the currently-being-connected tip using a compact block, which
+        // resulted in the peer sending a headers request, which we respond to
+        // without the new block. By resetting the BestHeaderSent, we ensure we
+        // will re-announce the new block via headers (or compact blocks again)
+        // in the SendMessages logic.
         nodestate->pindexBestHeaderSent = pindex ? pindex : chainActive.Tip();
         connman.PushMessage(pfrom, msgMaker.Make(NetMsgType::HEADERS, vHeaders));
     }

From b3d7b1cbe7afdc6a63bbcbe938e8639deedb04a1 Mon Sep 17 00:00:00 2001
From: Gregory Maxwell <greg@xiph.org>
Date: Wed, 4 Jan 2017 08:51:14 +0000
Subject: [PATCH 1511/1802] Wallet: Do not perform ECDSA in the fee calculation
 inner loop.

Performing signing in the inner loop has terrible performance
 when many passes through are needed to complete the selection.

Signing before the algorithm is complete also gets in the way
 of correctly setting the fee (e.g. preventing over-payment when
 the fee required goes down on the final selection.)

Use of the dummy might overpay on the signatures by a couple bytes
 in uncommon cases where the signatures' DER encoding is smaller
 than the dummy: Who cares?
---
 src/wallet/wallet.cpp | 77 ++++++++++++++++++++++++++-----------------
 1 file changed, 46 insertions(+), 31 deletions(-)

diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index c25e8be13c297..185c4590cd3bc 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -2245,7 +2245,7 @@ bool CWallet::CreateTransaction(const vector<CRecipient>& vecSend, CWalletTx& wt
     CAmount nValue = 0;
     int nChangePosRequest = nChangePosInOut;
     unsigned int nSubtractFeeFromAmount = 0;
-    BOOST_FOREACH (const CRecipient& recipient, vecSend)
+    for (const auto& recipient : vecSend)
     {
         if (nValue < 0 || recipient.nAmount < 0)
         {
@@ -2300,6 +2300,7 @@ bool CWallet::CreateTransaction(const vector<CRecipient>& vecSend, CWalletTx& wt
     assert(txNew.nLockTime < LOCKTIME_THRESHOLD);
 
     {
+        set<pair<const CWalletTx*,unsigned int> > setCoins;
         LOCK2(cs_main, cs_wallet);
         {
             std::vector<COutput> vAvailableCoins;
@@ -2320,7 +2321,7 @@ bool CWallet::CreateTransaction(const vector<CRecipient>& vecSend, CWalletTx& wt
                     nValueToSelect += nFeeRet;
                 double dPriority = 0;
                 // vouts to the payees
-                BOOST_FOREACH (const CRecipient& recipient, vecSend)
+                for (const auto& recipient : vecSend)
                 {
                     CTxOut txout(recipient.nAmount, recipient.scriptPubKey);
 
@@ -2352,14 +2353,14 @@ bool CWallet::CreateTransaction(const vector<CRecipient>& vecSend, CWalletTx& wt
                 }
 
                 // Choose coins to use
-                set<pair<const CWalletTx*,unsigned int> > setCoins;
                 CAmount nValueIn = 0;
+                setCoins.clear();
                 if (!SelectCoins(vAvailableCoins, nValueToSelect, setCoins, nValueIn, coinControl))
                 {
                     strFailReason = _("Insufficient funds");
                     return false;
                 }
-                BOOST_FOREACH(PAIRTYPE(const CWalletTx*, unsigned int) pcoin, setCoins)
+                for (const auto& pcoin : setCoins)
                 {
                     CAmount nCredit = pcoin.first->tx->vout[pcoin.second].nValue;
                     //The coin age after the next block (depth+1) is used instead of the current,
@@ -2470,24 +2471,18 @@ bool CWallet::CreateTransaction(const vector<CRecipient>& vecSend, CWalletTx& wt
                 // to avoid conflicting with other possible uses of nSequence,
                 // and in the spirit of "smallest posible change from prior
                 // behavior."
-                BOOST_FOREACH(const PAIRTYPE(const CWalletTx*,unsigned int)& coin, setCoins)
+                for (const auto& coin : setCoins)
                     txNew.vin.push_back(CTxIn(coin.first->GetHash(),coin.second,CScript(),
                                               std::numeric_limits<unsigned int>::max() - (fWalletRbf ? 2 : 1)));
 
-                // Sign
+                // Fill in dummy signatures for fee calculation.
                 int nIn = 0;
-                CTransaction txNewConst(txNew);
-                BOOST_FOREACH(const PAIRTYPE(const CWalletTx*,unsigned int)& coin, setCoins)
+                for (const auto& coin : setCoins)
                 {
-                    bool signSuccess;
                     const CScript& scriptPubKey = coin.first->tx->vout[coin.second].scriptPubKey;
                     SignatureData sigdata;
-                    if (sign)
-                        signSuccess = ProduceSignature(TransactionSignatureCreator(this, &txNewConst, nIn, coin.first->tx->vout[coin.second].nValue, SIGHASH_ALL), scriptPubKey, sigdata);
-                    else
-                        signSuccess = ProduceSignature(DummySignatureCreator(this), scriptPubKey, sigdata);
 
-                    if (!signSuccess)
+                    if (!ProduceSignature(DummySignatureCreator(this), scriptPubKey, sigdata))
                     {
                         strFailReason = _("Signing transaction failed");
                         return false;
@@ -2500,26 +2495,15 @@ bool CWallet::CreateTransaction(const vector<CRecipient>& vecSend, CWalletTx& wt
 
                 unsigned int nBytes = GetVirtualTransactionSize(txNew);
 
-                // Remove scriptSigs if we used dummy signatures for fee calculation
-                if (!sign) {
-                    BOOST_FOREACH (CTxIn& vin, txNew.vin) {
-                        vin.scriptSig = CScript();
-                        vin.scriptWitness.SetNull();
-                    }
-                }
-
-                // Embed the constructed transaction data in wtxNew.
-                wtxNew.SetTx(MakeTransactionRef(std::move(txNew)));
+                CTransaction txNewConst(txNew);
+                dPriority = txNewConst.ComputePriority(dPriority, nBytes);
 
-                // Limit size
-                if (GetTransactionWeight(wtxNew) >= MAX_STANDARD_TX_WEIGHT)
-                {
-                    strFailReason = _("Transaction too large");
-                    return false;
+                // Remove scriptSigs to eliminate the fee calculation dummy signatures
+                for (auto& vin : txNew.vin) {
+                    vin.scriptSig = CScript();
+                    vin.scriptWitness.SetNull();
                 }
 
-                dPriority = wtxNew.tx->ComputePriority(dPriority, nBytes);
-
                 // Allow to override the default confirmation target over the CoinControl instance
                 int currentConfirmationTarget = nTxConfirmTarget;
                 if (coinControl && coinControl->nConfirmTarget > 0)
@@ -2558,6 +2542,37 @@ bool CWallet::CreateTransaction(const vector<CRecipient>& vecSend, CWalletTx& wt
                 continue;
             }
         }
+
+        if (sign)
+        {
+            CTransaction txNewConst(txNew);
+            int nIn = 0;
+            for (const auto& coin : setCoins)
+            {
+                const CScript& scriptPubKey = coin.first->tx->vout[coin.second].scriptPubKey;
+                SignatureData sigdata;
+
+                if (!ProduceSignature(TransactionSignatureCreator(this, &txNewConst, nIn, coin.first->tx->vout[coin.second].nValue, SIGHASH_ALL), scriptPubKey, sigdata))
+                {
+                    strFailReason = _("Signing transaction failed");
+                    return false;
+                } else {
+                    UpdateTransaction(txNew, nIn, sigdata);
+                }
+
+                nIn++;
+            }
+        }
+
+        // Embed the constructed transaction data in wtxNew.
+        wtxNew.SetTx(MakeTransactionRef(std::move(txNew)));
+
+        // Limit size
+        if (GetTransactionWeight(wtxNew) >= MAX_STANDARD_TX_WEIGHT)
+        {
+            strFailReason = _("Transaction too large");
+            return false;
+        }
     }
 
     if (GetBoolArg("-walletrejectlongchains", DEFAULT_WALLET_REJECT_LONG_CHAINS)) {

From 50bd12ce0c49e574a5baf1a8df3a667810c6ad1e Mon Sep 17 00:00:00 2001
From: Gregory Maxwell <greg@xiph.org>
Date: Sun, 11 Dec 2016 04:39:26 +0000
Subject: [PATCH 1512/1802] Break addnode out from the outbound connection
 limits.

Previously addnodes were in competition with outbound connections
 for access to the eight outbound slots.

One result of this is that frequently a node with several addnode
 configured peers would end up connected to none of them, because
 while the addnode loop was in its two minute sleep the automatic
 connection logic would fill any free slots with random peers.
 This is particularly unwelcome to users trying to maintain links
 to specific nodes for fast block relay or purposes.

Another result is that a group of nine or more nodes which are
 have addnode configured towards each other can become partitioned
 from the public network.

This commit introduces a new limit of eight connections just for
 addnode peers which is not subject to any of the other connection
 limitations (including maxconnections).

The choice of eight is sufficient so that under no condition would
 a user find themselves connected to fewer addnoded peers than
 previously.  It is also low enough that users who are confused
 about the significance of more connections and have gotten too
 copy-and-paste happy will not consume more than twice the slot
 usage of a typical user.

Any additional load on the network resulting from this will likely
 be offset by a reduction in users applying even more wasteful
 workaround for the prior behavior.

The retry delays are reduced to avoid nodes sitting around without
 their added peers up, but are still sufficient to prevent overly
 aggressive repeated connections.  The reduced delays also make
 the system much more responsive to the addnode RPC.

Ban-disconnects are also exempted for peers added via addnode since
 the outbound addnode logic ignores bans.  Previously it would ban
 an addnode then immediately reconnect to it.

A minor change was also made to CSemaphoreGrant so that it is
 possible to re-acquire via an object whos grant was moved.
---
 src/init.cpp           |  9 +++++----
 src/net.cpp            | 37 +++++++++++++++++++++++++++++++------
 src/net.h              | 11 +++++++++--
 src/net_processing.cpp |  2 ++
 src/rpc/net.cpp        |  1 +
 src/sync.h             |  1 -
 6 files changed, 48 insertions(+), 13 deletions(-)

diff --git a/src/init.cpp b/src/init.cpp
index f0334a08e3619..aeca75c38fc2a 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -871,11 +871,11 @@ bool AppInitParameterInteraction()
     nMaxConnections = std::max(nUserMaxConnections, 0);
 
     // Trim requested connection counts, to fit into system limitations
-    nMaxConnections = std::max(std::min(nMaxConnections, (int)(FD_SETSIZE - nBind - MIN_CORE_FILEDESCRIPTORS)), 0);
-    nFD = RaiseFileDescriptorLimit(nMaxConnections + MIN_CORE_FILEDESCRIPTORS);
+    nMaxConnections = std::max(std::min(nMaxConnections, (int)(FD_SETSIZE - nBind - MIN_CORE_FILEDESCRIPTORS - MAX_ADDNODE_CONNECTIONS)), 0);
+    nFD = RaiseFileDescriptorLimit(nMaxConnections + MIN_CORE_FILEDESCRIPTORS + MAX_ADDNODE_CONNECTIONS);
     if (nFD < MIN_CORE_FILEDESCRIPTORS)
         return InitError(_("Not enough file descriptors available."));
-    nMaxConnections = std::min(nFD - MIN_CORE_FILEDESCRIPTORS, nMaxConnections);
+    nMaxConnections = std::min(nFD - MIN_CORE_FILEDESCRIPTORS - MAX_ADDNODE_CONNECTIONS, nMaxConnections);
 
     if (nMaxConnections < nUserMaxConnections)
         InitWarning(strprintf(_("Reducing -maxconnections from %d to %d, because of system limitations."), nUserMaxConnections, nMaxConnections));
@@ -1109,7 +1109,7 @@ bool AppInitMain(boost::thread_group& threadGroup, CScheduler& scheduler)
     LogPrintf("Default data directory %s\n", GetDefaultDataDir().string());
     LogPrintf("Using data directory %s\n", GetDataDir().string());
     LogPrintf("Using config file %s\n", GetConfigFile(GetArg("-conf", BITCOIN_CONF_FILENAME)).string());
-    LogPrintf("Using at most %i connections (%i file descriptors available)\n", nMaxConnections, nFD);
+    LogPrintf("Using at most %i automatic connections (%i file descriptors available)\n", nMaxConnections, nFD);
 
     InitSignatureCache();
 
@@ -1565,6 +1565,7 @@ bool AppInitMain(boost::thread_group& threadGroup, CScheduler& scheduler)
     connOptions.nRelevantServices = nRelevantServices;
     connOptions.nMaxConnections = nMaxConnections;
     connOptions.nMaxOutbound = std::min(MAX_OUTBOUND_CONNECTIONS, connOptions.nMaxConnections);
+    connOptions.nMaxAddnode = MAX_ADDNODE_CONNECTIONS;
     connOptions.nMaxFeeler = 1;
     connOptions.nBestHeight = chainActive.Height();
     connOptions.uiInterface = &uiInterface;
diff --git a/src/net.cpp b/src/net.cpp
index bf2beb7740e00..6640cc00164e6 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -621,6 +621,7 @@ void CNode::copyStats(CNodeStats &stats)
     X(nVersion);
     X(cleanSubVer);
     X(fInbound);
+    X(fAddnode);
     X(nStartingHeight);
     X(nSendBytes);
     X(mapSendBytesPerMsgCmd);
@@ -1631,7 +1632,7 @@ void CConnman::ThreadOpenConnections()
         {
             LOCK(cs_vNodes);
             BOOST_FOREACH(CNode* pnode, vNodes) {
-                if (!pnode->fInbound) {
+                if (!pnode->fInbound && !pnode->fAddnode) {
                     setConnected.insert(pnode->addr.GetGroup());
                     nOutbound++;
                 }
@@ -1776,27 +1777,35 @@ void CConnman::ThreadOpenAddedConnections()
             vAddedNodes = mapMultiArgs.at("-addnode");
     }
 
-    for (unsigned int i = 0; true; i++)
+    while (true)
     {
+        CSemaphoreGrant grant(*semAddnode);
         std::vector<AddedNodeInfo> vInfo = GetAddedNodeInfo();
+        bool tried = false;
         for (const AddedNodeInfo& info : vInfo) {
             if (!info.fConnected) {
-                CSemaphoreGrant grant(*semOutbound);
+                if (!grant.TryAcquire()) {
+                    // If we've used up our semaphore and need a new one, lets not wait here since while we are waiting
+                    // the addednodeinfo state might change.
+                    break;
+                }
                 // If strAddedNode is an IP/port, decode it immediately, so
                 // OpenNetworkConnection can detect existing connections to that IP/port.
+                tried = true;
                 CService service(LookupNumeric(info.strAddedNode.c_str(), Params().GetDefaultPort()));
-                OpenNetworkConnection(CAddress(service, NODE_NONE), false, &grant, info.strAddedNode.c_str(), false);
+                OpenNetworkConnection(CAddress(service, NODE_NONE), false, &grant, info.strAddedNode.c_str(), false, false, true);
                 if (!interruptNet.sleep_for(std::chrono::milliseconds(500)))
                     return;
             }
         }
-        if (!interruptNet.sleep_for(std::chrono::minutes(2)))
+        // Retry every 60 seconds if a connection was attempted, otherwise two seconds
+        if (!interruptNet.sleep_for(std::chrono::seconds(tried ? 60 : 2)));
             return;
     }
 }
 
 // if successful, this moves the passed grant to the constructed node
-bool CConnman::OpenNetworkConnection(const CAddress& addrConnect, bool fCountFailure, CSemaphoreGrant *grantOutbound, const char *pszDest, bool fOneShot, bool fFeeler)
+bool CConnman::OpenNetworkConnection(const CAddress& addrConnect, bool fCountFailure, CSemaphoreGrant *grantOutbound, const char *pszDest, bool fOneShot, bool fFeeler, bool fAddnode)
 {
     //
     // Initiate outbound network connection
@@ -1825,6 +1834,8 @@ bool CConnman::OpenNetworkConnection(const CAddress& addrConnect, bool fCountFai
         pnode->fOneShot = true;
     if (fFeeler)
         pnode->fFeeler = true;
+    if (fAddnode)
+        pnode->fAddnode = true;
 
     return true;
 }
@@ -2076,8 +2087,10 @@ CConnman::CConnman(uint64_t nSeed0In, uint64_t nSeed1In) : nSeed0(nSeed0In), nSe
     nSendBufferMaxSize = 0;
     nReceiveFloodSize = 0;
     semOutbound = NULL;
+    semAddnode = NULL;
     nMaxConnections = 0;
     nMaxOutbound = 0;
+    nMaxAddnode = 0;
     nBestHeight = 0;
     clientInterface = NULL;
     flagInterruptMsgProc = false;
@@ -2099,6 +2112,7 @@ bool CConnman::Start(CScheduler& scheduler, std::string& strNodeError, Options c
     nLocalServices = connOptions.nLocalServices;
     nMaxConnections = connOptions.nMaxConnections;
     nMaxOutbound = std::min((connOptions.nMaxOutbound), nMaxConnections);
+    nMaxAddnode = connOptions.nMaxAddnode;
     nMaxFeeler = connOptions.nMaxFeeler;
 
     nSendBufferMaxSize = connOptions.nSendBufferMaxSize;
@@ -2151,6 +2165,10 @@ bool CConnman::Start(CScheduler& scheduler, std::string& strNodeError, Options c
         // initialize semaphore
         semOutbound = new CSemaphore(std::min((nMaxOutbound + nMaxFeeler), nMaxConnections));
     }
+    if (semAddnode == NULL) {
+        // initialize semaphore
+        semAddnode = new CSemaphore(nMaxAddnode);
+    }
 
     //
     // Start threads
@@ -2227,6 +2245,10 @@ void CConnman::Stop()
     if (threadSocketHandler.joinable())
         threadSocketHandler.join();
 
+    if (semAddnode)
+        for (int i=0; i<nMaxAddnode; i++)
+            semOutbound->post();
+
     if (fAddressesInitialized)
     {
         DumpData();
@@ -2254,6 +2276,8 @@ void CConnman::Stop()
     vhListenSocket.clear();
     delete semOutbound;
     semOutbound = NULL;
+    delete semAddnode;
+    semAddnode = NULL;
 }
 
 void CConnman::DeleteNode(CNode* pnode)
@@ -2554,6 +2578,7 @@ CNode::CNode(NodeId idIn, ServiceFlags nLocalServicesIn, int nMyStartingHeightIn
     strSubVer = "";
     fWhitelisted = false;
     fOneShot = false;
+    fAddnode = false;
     fClient = false; // set by version message
     fFeeler = false;
     fSuccessfullyConnected = false;
diff --git a/src/net.h b/src/net.h
index 6ca402f71d416..97b27dcdf497d 100644
--- a/src/net.h
+++ b/src/net.h
@@ -58,8 +58,10 @@ static const unsigned int MAX_ADDR_TO_SEND = 1000;
 static const unsigned int MAX_PROTOCOL_MESSAGE_LENGTH = 4 * 1000 * 1000;
 /** Maximum length of strSubVer in `version` message */
 static const unsigned int MAX_SUBVERSION_LENGTH = 256;
-/** Maximum number of outgoing nodes */
+/** Maximum number of automatic outgoing nodes */
 static const int MAX_OUTBOUND_CONNECTIONS = 8;
+/** Maximum number of addnode outgoing nodes */
+static const int MAX_ADDNODE_CONNECTIONS = 8;
 /** -listen default */
 static const bool DEFAULT_LISTEN = true;
 /** -upnp default */
@@ -135,6 +137,7 @@ class CConnman
         ServiceFlags nRelevantServices = NODE_NONE;
         int nMaxConnections = 0;
         int nMaxOutbound = 0;
+        int nMaxAddnode = 0;
         int nMaxFeeler = 0;
         int nBestHeight = 0;
         CClientUIInterface* uiInterface = nullptr;
@@ -151,7 +154,7 @@ class CConnman
     bool BindListenPort(const CService &bindAddr, std::string& strError, bool fWhitelisted = false);
     bool GetNetworkActive() const { return fNetworkActive; };
     void SetNetworkActive(bool active);
-    bool OpenNetworkConnection(const CAddress& addrConnect, bool fCountFailure, CSemaphoreGrant *grantOutbound = NULL, const char *strDest = NULL, bool fOneShot = false, bool fFeeler = false);
+    bool OpenNetworkConnection(const CAddress& addrConnect, bool fCountFailure, CSemaphoreGrant *grantOutbound = NULL, const char *strDest = NULL, bool fOneShot = false, bool fFeeler = false, bool fAddnode = false);
     bool CheckIncomingNonce(uint64_t nonce);
 
     bool ForNode(NodeId id, std::function<bool(CNode* pnode)> func);
@@ -414,8 +417,10 @@ class CConnman
     ServiceFlags nRelevantServices;
 
     CSemaphore *semOutbound;
+    CSemaphore *semAddnode;
     int nMaxConnections;
     int nMaxOutbound;
+    int nMaxAddnode;
     int nMaxFeeler;
     std::atomic<int> nBestHeight;
     CClientUIInterface* clientInterface;
@@ -529,6 +534,7 @@ class CNodeStats
     int nVersion;
     std::string cleanSubVer;
     bool fInbound;
+    bool fAddnode;
     int nStartingHeight;
     uint64_t nSendBytes;
     mapMsgCmdSize mapSendBytesPerMsgCmd;
@@ -626,6 +632,7 @@ class CNode
     bool fWhitelisted; // This peer can bypass DoS banning.
     bool fFeeler; // If true this node is being used as a short lived feeler.
     bool fOneShot;
+    bool fAddnode;
     bool fClient;
     const bool fInbound;
     bool fSuccessfullyConnected;
diff --git a/src/net_processing.cpp b/src/net_processing.cpp
index ccfbb77fcd4eb..3a956e89e7cd3 100644
--- a/src/net_processing.cpp
+++ b/src/net_processing.cpp
@@ -2644,6 +2644,8 @@ bool SendMessages(CNode* pto, CConnman& connman, std::atomic<bool>& interruptMsg
             state.fShouldBan = false;
             if (pto->fWhitelisted)
                 LogPrintf("Warning: not punishing whitelisted peer %s!\n", pto->addr.ToString());
+            else if (pto->fAddnode)
+                LogPrintf("Warning: not punishing addnoded peer %s!\n", pto->addr.ToString());
             else {
                 pto->fDisconnect = true;
                 if (pto->addr.IsLocal())
diff --git a/src/rpc/net.cpp b/src/rpc/net.cpp
index 632514fc85a17..fe59579593192 100644
--- a/src/rpc/net.cpp
+++ b/src/rpc/net.cpp
@@ -152,6 +152,7 @@ UniValue getpeerinfo(const JSONRPCRequest& request)
         // their ver message.
         obj.push_back(Pair("subver", stats.cleanSubVer));
         obj.push_back(Pair("inbound", stats.fInbound));
+        obj.push_back(Pair("addnode", stats.fAddnode));
         obj.push_back(Pair("startingheight", stats.nStartingHeight));
         if (fStateStats) {
             obj.push_back(Pair("banscore", statestats.nMisbehavior));
diff --git a/src/sync.h b/src/sync.h
index 680d6030442c7..3b29050e0e126 100644
--- a/src/sync.h
+++ b/src/sync.h
@@ -264,7 +264,6 @@ class CSemaphoreGrant
         grant.Release();
         grant.sem = sem;
         grant.fHaveGrant = fHaveGrant;
-        sem = NULL;
         fHaveGrant = false;
     }
 

From 90f13e18228fde2e62de1c7d9b4b7e12a703bf03 Mon Sep 17 00:00:00 2001
From: Gregory Maxwell <greg@xiph.org>
Date: Sun, 11 Dec 2016 04:59:55 +0000
Subject: [PATCH 1513/1802] Add release notes for addnode changes.

---
 doc/release-notes.md | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/doc/release-notes.md b/doc/release-notes.md
index fe7f69d1f890b..7d0d689684575 100644
--- a/doc/release-notes.md
+++ b/doc/release-notes.md
@@ -62,6 +62,16 @@ Removal of Priority Estimation
   major version. To prepare for this, the default for the rate limit of priority
   transactions (`-limitfreerelay`) has been set to `0` kB/minute.
 
+P2P connection management
+--------------------------
+
+- Peers manually added through the addnode option or addnode RPC now have their own
+  limit of eight connections which does not compete with other inbound or outbound
+  connection usage and is not subject to the maxconnections limitation.
+
+- New connections to manually added peers are much faster.
+
+
 0.14.0 Change log
 =================
 

From 032ba3f0665432bd15ff76ee01cde245ad29e3e6 Mon Sep 17 00:00:00 2001
From: Gregory Maxwell <greg@xiph.org>
Date: Sun, 11 Dec 2016 20:26:06 +0000
Subject: [PATCH 1514/1802] RPC help documentation for addnode peerinfo.

Also adds a comment about the netgroup exclusion behavior.
---
 src/net.cpp     | 5 +++++
 src/rpc/net.cpp | 1 +
 2 files changed, 6 insertions(+)

diff --git a/src/net.cpp b/src/net.cpp
index 6640cc00164e6..0f0a7bf8dcd0c 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -1633,6 +1633,11 @@ void CConnman::ThreadOpenConnections()
             LOCK(cs_vNodes);
             BOOST_FOREACH(CNode* pnode, vNodes) {
                 if (!pnode->fInbound && !pnode->fAddnode) {
+                    // Netgroups for inbound and addnode peers are not excluded because our goal here
+                    // is to not use multiple of our limited outbound slots on a single netgroup
+                    // but inbound and addnode peers do not use our outbound slots.  Inbound peers
+                    // also have the added issue that they're attacker controlled and could be used
+                    // to prevent us from connecting to particular hosts if we used them here.
                     setConnected.insert(pnode->addr.GetGroup());
                     nOutbound++;
                 }
diff --git a/src/rpc/net.cpp b/src/rpc/net.cpp
index fe59579593192..2af00c1de925b 100644
--- a/src/rpc/net.cpp
+++ b/src/rpc/net.cpp
@@ -92,6 +92,7 @@ UniValue getpeerinfo(const JSONRPCRequest& request)
             "    \"version\": v,              (numeric) The peer version, such as 7001\n"
             "    \"subver\": \"/Satoshi:0.8.5/\",  (string) The string version\n"
             "    \"inbound\": true|false,     (boolean) Inbound (true) or Outbound (false)\n"
+            "    \"addnode\": true|false,     (boolean) Whether connection was due to addnode and is using an addnode slot\n"
             "    \"startingheight\": n,       (numeric) The starting height (block) of the peer\n"
             "    \"banscore\": n,             (numeric) The ban score\n"
             "    \"synced_headers\": n,       (numeric) The last header we have in common with this peer\n"

From c1ae4fcf7d5d85c182e36ff6f7a529f8a84aa372 Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Thu, 5 Jan 2017 15:15:40 -0500
Subject: [PATCH 1515/1802] Avoid holding cs_most_recent_block while calling
 ReadBlockFromDisk

---
 src/net_processing.cpp | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/net_processing.cpp b/src/net_processing.cpp
index fdb70d6578cf4..440696ae55daa 100644
--- a/src/net_processing.cpp
+++ b/src/net_processing.cpp
@@ -2894,15 +2894,20 @@ bool SendMessages(CNode* pto, CConnman& connman, std::atomic<bool>& interruptMsg
 
                     int nSendFlags = state.fWantsCmpctWitness ? 0 : SERIALIZE_TRANSACTION_NO_WITNESS;
 
-                    LOCK(cs_most_recent_block);
-                    if (most_recent_block_hash == pBestIndex->GetBlockHash()) {
-                        if (state.fWantsCmpctWitness)
-                            connman.PushMessage(pto, msgMaker.Make(nSendFlags, NetMsgType::CMPCTBLOCK, *most_recent_compact_block));
-                        else {
-                            CBlockHeaderAndShortTxIDs cmpctblock(*most_recent_block, state.fWantsCmpctWitness);
-                            connman.PushMessage(pto, msgMaker.Make(nSendFlags, NetMsgType::CMPCTBLOCK, cmpctblock));
+                    bool fGotBlockFromCache = false;
+                    {
+                        LOCK(cs_most_recent_block);
+                        if (most_recent_block_hash == pBestIndex->GetBlockHash()) {
+                            if (state.fWantsCmpctWitness)
+                                connman.PushMessage(pto, msgMaker.Make(nSendFlags, NetMsgType::CMPCTBLOCK, *most_recent_compact_block));
+                            else {
+                                CBlockHeaderAndShortTxIDs cmpctblock(*most_recent_block, state.fWantsCmpctWitness);
+                                connman.PushMessage(pto, msgMaker.Make(nSendFlags, NetMsgType::CMPCTBLOCK, cmpctblock));
+                            }
+                            fGotBlockFromCache = true;
                         }
-                    } else {
+                    }
+                    if (!fGotBlockFromCache) {
                         CBlock block;
                         bool ret = ReadBlockFromDisk(block, pBestIndex, consensusParams);
                         assert(ret);

From 42f5ce40931402aaa395ef2959deb64e9a9fff02 Mon Sep 17 00:00:00 2001
From: Alex Morcos <morcos@chaincode.com>
Date: Thu, 5 Jan 2017 09:10:08 -0500
Subject: [PATCH 1516/1802] Try to reduce change output to make needed fee in
 CreateTransaction

Once we've picked coins and dummy-signed the transaction to calculate fee, if we don't have sufficient fee, then try to meet the fee by reducing change before resorting to picking new coins.
---
 src/wallet/wallet.cpp | 12 ++++++++++++
 src/wallet/wallet.h   |  4 +++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index ff7a03bc55dad..bdf6d3c7a6a4b 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -2537,6 +2537,18 @@ bool CWallet::CreateTransaction(const vector<CRecipient>& vecSend, CWalletTx& wt
                 if (nFeeRet >= nFeeNeeded)
                     break; // Done, enough fee included.
 
+                // Try to reduce change to include necessary fee
+                if (nChangePosInOut != -1 && nSubtractFeeFromAmount == 0) {
+                    CAmount additionalFeeNeeded = nFeeNeeded - nFeeRet;
+                    vector<CTxOut>::iterator change_position = txNew.vout.begin()+nChangePosInOut;
+                    // Only reduce change if remaining amount is still a large enough output.
+                    if (change_position->nValue >= MIN_FINAL_CHANGE + additionalFeeNeeded) {
+                        change_position->nValue -= additionalFeeNeeded;
+                        nFeeRet += additionalFeeNeeded;
+                        break; // Done, able to increase fee from change
+                    }
+                }
+
                 // Include more fee and try again.
                 nFeeRet = nFeeNeeded;
                 continue;
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
index 1d1f84ebb9883..b9fa6bb24b391 100644
--- a/src/wallet/wallet.h
+++ b/src/wallet/wallet.h
@@ -48,8 +48,10 @@ static const CAmount DEFAULT_TRANSACTION_FEE = 0;
 static const CAmount DEFAULT_FALLBACK_FEE = 20000;
 //! -mintxfee default
 static const CAmount DEFAULT_TRANSACTION_MINFEE = 1000;
-//! minimum change amount
+//! target minimum change amount
 static const CAmount MIN_CHANGE = CENT;
+//! final minimum change amount after paying for fees
+static const CAmount MIN_FINAL_CHANGE = MIN_CHANGE/2;
 //! Default for -spendzeroconfchange
 static const bool DEFAULT_SPEND_ZEROCONF_CHANGE = true;
 //! Default for -sendfreetransactions

From 20449ef09edf8f4f51a3e531d947dd89973c2a31 Mon Sep 17 00:00:00 2001
From: Alex Morcos <morcos@chaincode.com>
Date: Thu, 5 Jan 2017 09:12:48 -0500
Subject: [PATCH 1517/1802] Don't overpay fee if we have selected new coins
 that result in a smaller transaction.

On repeated calls to SelectCoins we try to meet the fee necessary for the last transaction, the new fee required might be smaller, so increase our change by the difference if we can.
---
 src/wallet/wallet.cpp | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index bdf6d3c7a6a4b..2775f4def3d0a 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -2534,8 +2534,25 @@ bool CWallet::CreateTransaction(const vector<CRecipient>& vecSend, CWalletTx& wt
                     return false;
                 }
 
-                if (nFeeRet >= nFeeNeeded)
+                if (nFeeRet >= nFeeNeeded) {
+                    // Reduce fee to only the needed amount if we have change
+                    // output to increase.  This prevents potential overpayment
+                    // in fees if the coins selected to meet nFeeNeeded result
+                    // in a transaction that requires less fee than the prior
+                    // iteration.
+                    // TODO: The case where nSubtractFeeFromAmount > 0 remains
+                    // to be addressed because it requires returning the fee to
+                    // the payees and not the change output.
+                    // TODO: The case where there is no change output remains
+                    // to be addressed so we avoid creating too small an output.
+                    if (nFeeRet > nFeeNeeded && nChangePosInOut != -1 && nSubtractFeeFromAmount == 0) {
+                        CAmount extraFeePaid = nFeeRet - nFeeNeeded;
+                        vector<CTxOut>::iterator change_position = txNew.vout.begin()+nChangePosInOut;
+                        change_position->nValue += extraFeePaid;
+                        nFeeRet -= extraFeePaid;
+                    }
                     break; // Done, enough fee included.
+                }
 
                 // Try to reduce change to include necessary fee
                 if (nChangePosInOut != -1 && nSubtractFeeFromAmount == 0) {

From cc0589639cd0c9c417daff917f2fe7c516e59e03 Mon Sep 17 00:00:00 2001
From: Douglas Roark <doug@bloq.com>
Date: Sat, 7 Jan 2017 09:49:14 -0800
Subject: [PATCH 1518/1802] Remove stray semicolon (Fix empty body warning)

Empty body introduced by commit #9319 should not be empty.
---
 src/net.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/net.cpp b/src/net.cpp
index 0f0a7bf8dcd0c..37e7dfed4caa2 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -1804,7 +1804,7 @@ void CConnman::ThreadOpenAddedConnections()
             }
         }
         // Retry every 60 seconds if a connection was attempted, otherwise two seconds
-        if (!interruptNet.sleep_for(std::chrono::seconds(tried ? 60 : 2)));
+        if (!interruptNet.sleep_for(std::chrono::seconds(tried ? 60 : 2)))
             return;
     }
 }

From e6111b2398ca21f0e38333236abb0be7fa48c95f Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Sat, 7 Jan 2017 16:19:34 -0500
Subject: [PATCH 1519/1802] Make peer id logging consistent ("peer=%d" instead
 of "peer %d")

---
 src/net_processing.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/net_processing.cpp b/src/net_processing.cpp
index 440696ae55daa..77aede511de1b 100644
--- a/src/net_processing.cpp
+++ b/src/net_processing.cpp
@@ -647,7 +647,7 @@ void EraseOrphansFor(NodeId peer)
             nErased += EraseOrphanTx(maybeErase->second.tx->GetHash());
         }
     }
-    if (nErased > 0) LogPrint("mempool", "Erased %d orphan tx from peer %d\n", nErased, peer);
+    if (nErased > 0) LogPrint("mempool", "Erased %d orphan tx from peer=%d\n", nErased, peer);
 }
 
 
@@ -789,7 +789,7 @@ void PeerLogicValidation::NewPoWValidBlock(const CBlockIndex *pindex, const std:
         if (state.fPreferHeaderAndIDs && (!fWitnessEnabled || state.fWantsCmpctWitness) &&
                 !PeerHasHeader(&state, pindex) && PeerHasHeader(&state, pindex->pprev)) {
 
-            LogPrint("net", "%s sending header-and-ids %s to peer %d\n", "PeerLogicValidation::NewPoWValidBlock",
+            LogPrint("net", "%s sending header-and-ids %s to peer=%d\n", "PeerLogicValidation::NewPoWValidBlock",
                     hashBlock.ToString(), pnode->id);
             connman->PushMessage(pnode, msgMaker.Make(NetMsgType::CMPCTBLOCK, *pcmpctblock));
             state.pindexBestHeaderSent = pindex;
@@ -2889,7 +2889,7 @@ bool SendMessages(CNode* pto, CConnman& connman, std::atomic<bool>& interruptMsg
                 if (vHeaders.size() == 1 && state.fPreferHeaderAndIDs) {
                     // We only send up to 1 block as header-and-ids, as otherwise
                     // probably means we're doing an initial-ish-sync or they're slow
-                    LogPrint("net", "%s sending header-and-ids %s to peer %d\n", __func__,
+                    LogPrint("net", "%s sending header-and-ids %s to peer=%d\n", __func__,
                             vHeaders.front().GetHash().ToString(), pto->id);
 
                     int nSendFlags = state.fWantsCmpctWitness ? 0 : SERIALIZE_TRANSACTION_NO_WITNESS;

From 7df5e382e5d5f37fc21e894eb285cc3e9c80dd83 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pavel=20Jan=C3=ADk?= <Pavel@Janik.cz>
Date: Mon, 9 Jan 2017 19:31:19 +0100
Subject: [PATCH 1520/1802] Rename lambda argument name to prevent shadowing.

---
 src/qt/rpcconsole.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/qt/rpcconsole.cpp b/src/qt/rpcconsole.cpp
index d84d6185d58f7..87d73b5f089ff 100644
--- a/src/qt/rpcconsole.cpp
+++ b/src/qt/rpcconsole.cpp
@@ -170,12 +170,12 @@ bool RPCConsole::RPCParseCommandLine(std::string &strResult, const std::string &
     size_t filter_begin_pos = 0, chpos;
     std::vector<std::pair<size_t, size_t>> filter_ranges;
 
-    auto add_to_current_stack = [&](const std::string& curarg) {
-        if (stack.back().empty() && (!nDepthInsideSensitive) && historyFilter.contains(QString::fromStdString(curarg), Qt::CaseInsensitive)) {
+    auto add_to_current_stack = [&](const std::string& strArg) {
+        if (stack.back().empty() && (!nDepthInsideSensitive) && historyFilter.contains(QString::fromStdString(strArg), Qt::CaseInsensitive)) {
             nDepthInsideSensitive = 1;
             filter_begin_pos = chpos;
         }
-        stack.back().push_back(curarg);
+        stack.back().push_back(strArg);
     };
 
     auto close_out_params = [&]() {

From 9f03110f3256e81173c65c2ed1810efaa74fbc5b Mon Sep 17 00:00:00 2001
From: Jeremy Rubin <jeremy.l.rubin@gmail.com>
Date: Sat, 7 Jan 2017 16:34:50 -0500
Subject: [PATCH 1521/1802] Add Basic CheckQueue Benchmark

---
 src/Makefile.bench.include |  1 +
 src/bench/checkqueue.cpp   | 94 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 95 insertions(+)
 create mode 100644 src/bench/checkqueue.cpp

diff --git a/src/Makefile.bench.include b/src/Makefile.bench.include
index e58bd9dfbf807..8c699c2f8c5c4 100644
--- a/src/Makefile.bench.include
+++ b/src/Makefile.bench.include
@@ -15,6 +15,7 @@ bench_bench_bitcoin_SOURCES = \
   bench/bench.cpp \
   bench/bench.h \
   bench/checkblock.cpp \
+  bench/checkqueue.cpp \
   bench/Examples.cpp \
   bench/rollingbloom.cpp \
   bench/crypto_hash.cpp \
diff --git a/src/bench/checkqueue.cpp b/src/bench/checkqueue.cpp
new file mode 100644
index 0000000000000..280d24a5eff65
--- /dev/null
+++ b/src/bench/checkqueue.cpp
@@ -0,0 +1,94 @@
+// Copyright (c) 2015 The Bitcoin Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#include "bench.h"
+#include "util.h"
+#include "validation.h"
+#include "checkqueue.h"
+#include "prevector.h"
+#include <vector>
+#include <boost/thread/thread.hpp>
+#include "random.h"
+
+
+// This Benchmark tests the CheckQueue with the lightest
+// weight Checks, so it should make any lock contention
+// particularly visible
+static void CCheckQueueSpeed(benchmark::State& state)
+{
+    struct FakeJobNoWork {
+        bool operator()()
+        {
+            return true;
+        }
+        void swap(FakeJobNoWork& x){};
+    };
+    CCheckQueue<FakeJobNoWork> queue {128};
+    boost::thread_group tg;
+    for (auto x = 0; x < std::max(2, GetNumCores()); ++x) {
+       tg.create_thread([&]{queue.Thread();});
+    }
+    while (state.KeepRunning()) {
+        CCheckQueueControl<FakeJobNoWork> control(&queue);
+        // We can make vChecks out of the loop because calling Add doesn't
+        // change the size of the vector.
+        std::vector<FakeJobNoWork> vChecks;
+        vChecks.resize(30);
+
+        // We call Add a number of times to simulate the behavior of adding
+        // a block of transactions at once.
+        for (size_t j = 0; j < 101; ++j) {
+            control.Add(vChecks);
+        }
+        // control waits for completion by RAII, but
+        // it is done explicitly here for clarity
+        control.Wait();
+    }
+    tg.interrupt_all();
+    tg.join_all();
+}
+
+// This Benchmark tests the CheckQueue with a slightly realistic workload,
+// where checks all contain a prevector that is indirect 50% of the time
+// and there is a little bit of work done between calls to Add.
+static void CCheckQueueSpeedPrevectorJob(benchmark::State& state)
+{
+    struct PrevectorJob {
+        prevector<28, uint8_t> p;
+        PrevectorJob(){
+        }
+        PrevectorJob(FastRandomContext& insecure_rand){
+            p.resize(insecure_rand.rand32() % 56);
+        }
+        bool operator()()
+        {
+            return true;
+        }
+        void swap(PrevectorJob& x){p.swap(x.p);};
+    };
+    CCheckQueue<PrevectorJob> queue {128};
+    boost::thread_group tg;
+    for (auto x = 0; x < std::max(2, GetNumCores()); ++x) {
+       tg.create_thread([&]{queue.Thread();});
+    }
+    while (state.KeepRunning()) {
+        // Make insecure_rand here so that each iteration is identical.
+        FastRandomContext insecure_rand(true);
+        CCheckQueueControl<PrevectorJob> control(&queue);
+        for (size_t j = 0; j < 101; ++j) {
+            std::vector<PrevectorJob> vChecks;
+            vChecks.reserve(30);
+            for (auto x = 0; x < 30; ++x)
+                vChecks.emplace_back(insecure_rand);
+            control.Add(vChecks);
+        }
+        // control waits for completion by RAII, but
+        // it is done explicitly here for clarity
+        control.Wait();
+    }
+    tg.interrupt_all();
+    tg.join_all();
+}
+BENCHMARK(CCheckQueueSpeed);
+BENCHMARK(CCheckQueueSpeedPrevectorJob);

From c73554042886fb63fb48edf29cf827951edde341 Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Mon, 9 Jan 2017 14:11:15 -0500
Subject: [PATCH 1522/1802] Move ORPHAN constants from validation.h to
 net_processing.h

---
 src/net_processing.h | 7 +++++++
 src/validation.h     | 6 ------
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/net_processing.h b/src/net_processing.h
index 230d805bd4730..92ea21df724cc 100644
--- a/src/net_processing.h
+++ b/src/net_processing.h
@@ -9,6 +9,13 @@
 #include "net.h"
 #include "validationinterface.h"
 
+/** Default for -maxorphantx, maximum number of orphan transactions kept in memory */
+static const unsigned int DEFAULT_MAX_ORPHAN_TRANSACTIONS = 100;
+/** Expiration time for orphan transactions in seconds */
+static const int64_t ORPHAN_TX_EXPIRE_TIME = 20 * 60;
+/** Minimum time between orphan transactions expire time checks in seconds */
+static const int64_t ORPHAN_TX_EXPIRE_INTERVAL = 5 * 60;
+
 /** Register with a network node to receive its signals */
 void RegisterNodeSignals(CNodeSignals& nodeSignals);
 /** Unregister a network node */
diff --git a/src/validation.h b/src/validation.h
index 631602a7017b8..7848c787aacd9 100644
--- a/src/validation.h
+++ b/src/validation.h
@@ -58,12 +58,6 @@ static const CAmount DEFAULT_TRANSACTION_MAXFEE = 0.1 * COIN;
 static const CAmount HIGH_TX_FEE_PER_KB = 0.01 * COIN;
 //! -maxtxfee will warn if called with a higher fee than this amount (in satoshis)
 static const CAmount HIGH_MAX_TX_FEE = 100 * HIGH_TX_FEE_PER_KB;
-/** Default for -maxorphantx, maximum number of orphan transactions kept in memory */
-static const unsigned int DEFAULT_MAX_ORPHAN_TRANSACTIONS = 100;
-/** Expiration time for orphan transactions in seconds */
-static const int64_t ORPHAN_TX_EXPIRE_TIME = 20 * 60;
-/** Minimum time between orphan transactions expire time checks in seconds */
-static const int64_t ORPHAN_TX_EXPIRE_INTERVAL = 5 * 60;
 /** Default for -limitancestorcount, max number of in-mempool ancestors */
 static const unsigned int DEFAULT_ANCESTOR_LIMIT = 25;
 /** Default for -limitancestorsize, maximum kilobytes of tx + all in-mempool ancestors */

From edded808fc4eee94c178e1779b90d1c87a08c23a Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Sun, 4 Dec 2016 18:53:26 -0800
Subject: [PATCH 1523/1802] Make ATMP optionally return the CTransactionRefs it
 replaced

---
 src/rpc/rawtransaction.cpp           |  2 +-
 src/test/txvalidationcache_tests.cpp |  2 +-
 src/validation.cpp                   | 18 +++++++++++-------
 src/validation.h                     |  9 ++++++---
 src/wallet/wallet.cpp                |  2 +-
 5 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/src/rpc/rawtransaction.cpp b/src/rpc/rawtransaction.cpp
index 276ebfda260d4..e01879adb4109 100644
--- a/src/rpc/rawtransaction.cpp
+++ b/src/rpc/rawtransaction.cpp
@@ -899,7 +899,7 @@ UniValue sendrawtransaction(const JSONRPCRequest& request)
         // push to local node and sync with wallets
         CValidationState state;
         bool fMissingInputs;
-        if (!AcceptToMemoryPool(mempool, state, std::move(tx), fLimitFree, &fMissingInputs, false, nMaxRawTxFee)) {
+        if (!AcceptToMemoryPool(mempool, state, std::move(tx), fLimitFree, &fMissingInputs, NULL, false, nMaxRawTxFee)) {
             if (state.IsInvalid()) {
                 throw JSONRPCError(RPC_TRANSACTION_REJECTED, strprintf("%i: %s", state.GetRejectCode(), state.GetRejectReason()));
             } else {
diff --git a/src/test/txvalidationcache_tests.cpp b/src/test/txvalidationcache_tests.cpp
index acccaee98c3d7..c5367208baaef 100644
--- a/src/test/txvalidationcache_tests.cpp
+++ b/src/test/txvalidationcache_tests.cpp
@@ -23,7 +23,7 @@ ToMemPool(CMutableTransaction& tx)
     LOCK(cs_main);
 
     CValidationState state;
-    return AcceptToMemoryPool(mempool, state, MakeTransactionRef(tx), false, NULL, true, 0);
+    return AcceptToMemoryPool(mempool, state, MakeTransactionRef(tx), false, NULL, NULL, true, 0);
 }
 
 BOOST_FIXTURE_TEST_CASE(tx_mempool_block_doublespend, TestChain100Setup)
diff --git a/src/validation.cpp b/src/validation.cpp
index 37a4186e0a848..ff1d9b0dc10dd 100644
--- a/src/validation.cpp
+++ b/src/validation.cpp
@@ -538,8 +538,8 @@ static bool IsCurrentForFeeEstimation()
 }
 
 bool AcceptToMemoryPoolWorker(CTxMemPool& pool, CValidationState& state, const CTransactionRef& ptx, bool fLimitFree,
-                              bool* pfMissingInputs, int64_t nAcceptTime, bool fOverrideMempoolLimit, const CAmount& nAbsurdFee,
-                              std::vector<uint256>& vHashTxnToUncache)
+                              bool* pfMissingInputs, int64_t nAcceptTime, std::list<CTransactionRef>* plTxnReplaced,
+                              bool fOverrideMempoolLimit, const CAmount& nAbsurdFee, std::vector<uint256>& vHashTxnToUncache)
 {
     const CTransaction& tx = *ptx;
     const uint256 hash = tx.GetHash();
@@ -950,6 +950,8 @@ bool AcceptToMemoryPoolWorker(CTxMemPool& pool, CValidationState& state, const C
                     hash.ToString(),
                     FormatMoney(nModifiedFees - nConflictingFees),
                     (int)nSize - (int)nConflictingSize);
+            if (plTxnReplaced)
+                plTxnReplaced->push_back(it->GetSharedTx());
         }
         pool.RemoveStaged(allConflicting, false);
 
@@ -975,10 +977,11 @@ bool AcceptToMemoryPoolWorker(CTxMemPool& pool, CValidationState& state, const C
 }
 
 bool AcceptToMemoryPoolWithTime(CTxMemPool& pool, CValidationState &state, const CTransactionRef &tx, bool fLimitFree,
-                        bool* pfMissingInputs, int64_t nAcceptTime, bool fOverrideMempoolLimit, const CAmount nAbsurdFee)
+                        bool* pfMissingInputs, int64_t nAcceptTime, std::list<CTransactionRef>* plTxnReplaced,
+                        bool fOverrideMempoolLimit, const CAmount nAbsurdFee)
 {
     std::vector<uint256> vHashTxToUncache;
-    bool res = AcceptToMemoryPoolWorker(pool, state, tx, fLimitFree, pfMissingInputs, nAcceptTime, fOverrideMempoolLimit, nAbsurdFee, vHashTxToUncache);
+    bool res = AcceptToMemoryPoolWorker(pool, state, tx, fLimitFree, pfMissingInputs, nAcceptTime, plTxnReplaced, fOverrideMempoolLimit, nAbsurdFee, vHashTxToUncache);
     if (!res) {
         BOOST_FOREACH(const uint256& hashTx, vHashTxToUncache)
             pcoinsTip->Uncache(hashTx);
@@ -990,9 +993,10 @@ bool AcceptToMemoryPoolWithTime(CTxMemPool& pool, CValidationState &state, const
 }
 
 bool AcceptToMemoryPool(CTxMemPool& pool, CValidationState &state, const CTransactionRef &tx, bool fLimitFree,
-                        bool* pfMissingInputs, bool fOverrideMempoolLimit, const CAmount nAbsurdFee)
+                        bool* pfMissingInputs, std::list<CTransactionRef>* plTxnReplaced,
+                        bool fOverrideMempoolLimit, const CAmount nAbsurdFee)
 {
-    return AcceptToMemoryPoolWithTime(pool, state, tx, fLimitFree, pfMissingInputs, GetTime(), fOverrideMempoolLimit, nAbsurdFee);
+    return AcceptToMemoryPoolWithTime(pool, state, tx, fLimitFree, pfMissingInputs, GetTime(), plTxnReplaced, fOverrideMempoolLimit, nAbsurdFee);
 }
 
 /** Return transaction in txOut, and if it was found inside a block, its hash is placed in hashBlock */
@@ -2138,7 +2142,7 @@ bool static DisconnectTip(CValidationState& state, const CChainParams& chainpara
             const CTransaction& tx = *it;
             // ignore validation errors in resurrected transactions
             CValidationState stateDummy;
-            if (tx.IsCoinBase() || !AcceptToMemoryPool(mempool, stateDummy, it, false, NULL, true)) {
+            if (tx.IsCoinBase() || !AcceptToMemoryPool(mempool, stateDummy, it, false, NULL, NULL, true)) {
                 mempool.removeRecursive(tx);
             } else if (mempool.exists(tx.GetHash())) {
                 vHashUpdate.push_back(tx.GetHash());
diff --git a/src/validation.h b/src/validation.h
index 7848c787aacd9..0c79ed30b7bf0 100644
--- a/src/validation.h
+++ b/src/validation.h
@@ -304,13 +304,16 @@ void FlushStateToDisk();
 /** Prune block files and flush state to disk. */
 void PruneAndFlush();
 
-/** (try to) add transaction to memory pool **/
+/** (try to) add transaction to memory pool
+ * plTxnReplaced will be appended to with all transactions replaced from mempool **/
 bool AcceptToMemoryPool(CTxMemPool& pool, CValidationState &state, const CTransactionRef &tx, bool fLimitFree,
-                        bool* pfMissingInputs, bool fOverrideMempoolLimit=false, const CAmount nAbsurdFee=0);
+                        bool* pfMissingInputs, std::list<CTransactionRef>* plTxnReplaced = NULL,
+                        bool fOverrideMempoolLimit=false, const CAmount nAbsurdFee=0);
 
 /** (try to) add transaction to memory pool with a specified acceptance time **/
 bool AcceptToMemoryPoolWithTime(CTxMemPool& pool, CValidationState &state, const CTransactionRef &tx, bool fLimitFree,
-                        bool* pfMissingInputs, int64_t nAcceptTime, bool fOverrideMempoolLimit=false, const CAmount nAbsurdFee=0);
+                        bool* pfMissingInputs, int64_t nAcceptTime, std::list<CTransactionRef>* plTxnReplaced = NULL,
+                        bool fOverrideMempoolLimit=false, const CAmount nAbsurdFee=0);
 
 /** Convert CValidationState to a human-readable message for logging */
 std::string FormatStateMessage(const CValidationState &state);
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index 2775f4def3d0a..a199591ad12d4 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -3847,5 +3847,5 @@ int CMerkleTx::GetBlocksToMaturity() const
 
 bool CMerkleTx::AcceptToMemoryPool(const CAmount& nAbsurdFee, CValidationState& state)
 {
-    return ::AcceptToMemoryPool(mempool, state, tx, true, NULL, false, nAbsurdFee);
+    return ::AcceptToMemoryPool(mempool, state, tx, true, NULL, NULL, false, nAbsurdFee);
 }

From 0c50909347c4def009e22da224339bc82e171e42 Mon Sep 17 00:00:00 2001
From: John Newbery <john@johnnewbery.com>
Date: Mon, 9 Jan 2017 16:42:45 -0500
Subject: [PATCH 1524/1802] testcases: explicitly specify transaction version 1

---
 src/test/data/bitcoin-util-test.json | 44 ++++++++++++++--------------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/src/test/data/bitcoin-util-test.json b/src/test/data/bitcoin-util-test.json
index 387c0f352cb9e..a80ab519015c2 100644
--- a/src/test/data/bitcoin-util-test.json
+++ b/src/test/data/bitcoin-util-test.json
@@ -118,42 +118,42 @@
     "description": "Parses a transation with no inputs and a single output script (output in json)"
   },
   { "exec": "./bitcoin-tx",
-    "args": ["-create", "outscript=0:OP_DROP"],
+    "args": ["-create", "outscript=0:OP_DROP", "nversion=1"],
     "output_cmp": "txcreatescript1.hex",
     "description": "Create a new transaction with a single output script (OP_DROP)"
   },
   { "exec": "./bitcoin-tx",
-    "args": ["-json", "-create", "outscript=0:OP_DROP"],
+    "args": ["-json", "-create", "outscript=0:OP_DROP", "nversion=1"],
     "output_cmp": "txcreatescript1.json",
     "description": "Create a new transaction with a single output script (OP_DROP) (output as json)"
   },
   { "exec": "./bitcoin-tx",
-    "args": ["-create", "outscript=0:OP_DROP:S"],
+    "args": ["-create", "outscript=0:OP_DROP:S", "nversion=1"],
     "output_cmp": "txcreatescript2.hex",
     "description": "Create a new transaction with a single output script (OP_DROP) in a P2SH"
   },
   { "exec": "./bitcoin-tx",
-    "args": ["-json", "-create", "outscript=0:OP_DROP:S"],
+    "args": ["-json", "-create", "outscript=0:OP_DROP:S", "nversion=1"],
     "output_cmp": "txcreatescript2.json",
     "description": "Create a new transaction with a single output script (OP_DROP) in a P2SH (output as json)"
   },
   { "exec": "./bitcoin-tx",
-    "args": ["-create", "outscript=0:OP_DROP:W"],
+    "args": ["-create", "outscript=0:OP_DROP:W", "nversion=1"],
     "output_cmp": "txcreatescript3.hex",
     "description": "Create a new transaction with a single output script (OP_DROP) in a P2WSH"
   },
   { "exec": "./bitcoin-tx",
-    "args": ["-json", "-create", "outscript=0:OP_DROP:W"],
+    "args": ["-json", "-create", "outscript=0:OP_DROP:W", "nversion=1"],
     "output_cmp": "txcreatescript3.json",
     "description": "Create a new transaction with a single output script (OP_DROP) in a P2WSH (output as json)"
   },
   { "exec": "./bitcoin-tx",
-    "args": ["-create", "outscript=0:OP_DROP:WS"],
+    "args": ["-create", "outscript=0:OP_DROP:WS", "nversion=1"],
     "output_cmp": "txcreatescript4.hex",
     "description": "Create a new transaction with a single output script (OP_DROP) in a P2WSH, wrapped in a P2SH"
   },
   { "exec": "./bitcoin-tx",
-    "args": ["-json", "-create", "outscript=0:OP_DROP:WS"],
+    "args": ["-json", "-create", "outscript=0:OP_DROP:WS", "nversion=1"],
     "output_cmp": "txcreatescript4.json",
     "description": "Create a new transaction with a single output script (OP_DROP) in a P2SH, wrapped in a P2SH (output as json)"
   },
@@ -193,37 +193,37 @@
   },
   { "exec": "./bitcoin-tx",
     "args":
-    ["-create", "outpubkey=0:02a5613bd857b7048924264d1e70e08fb2a7e6527d32b7ab1bb993ac59964ff397"],
+    ["-create", "outpubkey=0:02a5613bd857b7048924264d1e70e08fb2a7e6527d32b7ab1bb993ac59964ff397", "nversion=1"],
     "output_cmp": "txcreateoutpubkey1.hex",
     "description": "Creates a new transaction with a single pay-to-pubkey output"
   },
   { "exec": "./bitcoin-tx",
     "args":
-    ["-json", "-create", "outpubkey=0:02a5613bd857b7048924264d1e70e08fb2a7e6527d32b7ab1bb993ac59964ff397"],
+    ["-json", "-create", "outpubkey=0:02a5613bd857b7048924264d1e70e08fb2a7e6527d32b7ab1bb993ac59964ff397", "nversion=1"],
     "output_cmp": "txcreateoutpubkey1.json",
     "description": "Creates a new transaction with a single pay-to-pubkey output (output as json)"
   },
   { "exec": "./bitcoin-tx",
     "args":
-    ["-create", "outpubkey=0:02a5613bd857b7048924264d1e70e08fb2a7e6527d32b7ab1bb993ac59964ff397:W"],
+    ["-create", "outpubkey=0:02a5613bd857b7048924264d1e70e08fb2a7e6527d32b7ab1bb993ac59964ff397:W", "nversion=1"],
     "output_cmp": "txcreateoutpubkey2.hex",
     "description": "Creates a new transaction with a single pay-to-witness-pubkey output"
   },
   { "exec": "./bitcoin-tx",
     "args":
-    ["-json", "-create", "outpubkey=0:02a5613bd857b7048924264d1e70e08fb2a7e6527d32b7ab1bb993ac59964ff397:W"],
+    ["-json", "-create", "outpubkey=0:02a5613bd857b7048924264d1e70e08fb2a7e6527d32b7ab1bb993ac59964ff397:W", "nversion=1"],
     "output_cmp": "txcreateoutpubkey2.json",
     "description": "Creates a new transaction with a single pay-to-witness-pubkey output (output as json)"
   },
   { "exec": "./bitcoin-tx",
     "args":
-    ["-create", "outpubkey=0:02a5613bd857b7048924264d1e70e08fb2a7e6527d32b7ab1bb993ac59964ff397:WS"],
+    ["-create", "outpubkey=0:02a5613bd857b7048924264d1e70e08fb2a7e6527d32b7ab1bb993ac59964ff397:WS", "nversion=1"],
     "output_cmp": "txcreateoutpubkey3.hex",
     "description": "Creates a new transaction with a single pay-to-witness-pubkey, wrapped in P2SH output"
   },
   { "exec": "./bitcoin-tx",
     "args":
-    ["-json", "-create", "outpubkey=0:02a5613bd857b7048924264d1e70e08fb2a7e6527d32b7ab1bb993ac59964ff397:WS"],
+    ["-json", "-create", "outpubkey=0:02a5613bd857b7048924264d1e70e08fb2a7e6527d32b7ab1bb993ac59964ff397:WS", "nversion=1"],
     "output_cmp": "txcreateoutpubkey3.json",
     "description": "Creates a new transaction with a single pay-to-pub-key output, wrapped in P2SH (output as json)"
   },
@@ -314,42 +314,42 @@
     "description": "Adds a new input with sequence number to a transaction (output in json)"
   },
   { "exec": "./bitcoin-tx",
-    "args": ["-create", "outmultisig=1:2:3:02a5613bd857b7048924264d1e70e08fb2a7e6527d32b7ab1bb993ac59964ff397:021ac43c7ff740014c3b33737ede99c967e4764553d1b2b83db77c83b8715fa72d:02df2089105c77f266fa11a9d33f05c735234075f2e8780824c6b709415f9fb485"],
+    "args": ["-create", "outmultisig=1:2:3:02a5613bd857b7048924264d1e70e08fb2a7e6527d32b7ab1bb993ac59964ff397:021ac43c7ff740014c3b33737ede99c967e4764553d1b2b83db77c83b8715fa72d:02df2089105c77f266fa11a9d33f05c735234075f2e8780824c6b709415f9fb485", "nversion=1"],
     "output_cmp": "txcreatemultisig1.hex",
     "description": "Creates a new transaction with a single 2-of-3 multisig output"
   },
   { "exec": "./bitcoin-tx",
-    "args": ["-json", "-create", "outmultisig=1:2:3:02a5613bd857b7048924264d1e70e08fb2a7e6527d32b7ab1bb993ac59964ff397:021ac43c7ff740014c3b33737ede99c967e4764553d1b2b83db77c83b8715fa72d:02df2089105c77f266fa11a9d33f05c735234075f2e8780824c6b709415f9fb485"],
+    "args": ["-json", "-create", "outmultisig=1:2:3:02a5613bd857b7048924264d1e70e08fb2a7e6527d32b7ab1bb993ac59964ff397:021ac43c7ff740014c3b33737ede99c967e4764553d1b2b83db77c83b8715fa72d:02df2089105c77f266fa11a9d33f05c735234075f2e8780824c6b709415f9fb485", "nversion=1"],
     "output_cmp": "txcreatemultisig1.json",
     "description": "Creates a new transaction with a single 2-of-3 multisig output (output in json)"
   },
   { "exec": "./bitcoin-tx",
-    "args": ["-create", "outmultisig=1:2:3:02a5613bd857b7048924264d1e70e08fb2a7e6527d32b7ab1bb993ac59964ff397:021ac43c7ff740014c3b33737ede99c967e4764553d1b2b83db77c83b8715fa72d:02df2089105c77f266fa11a9d33f05c735234075f2e8780824c6b709415f9fb485:S"],
+    "args": ["-create", "outmultisig=1:2:3:02a5613bd857b7048924264d1e70e08fb2a7e6527d32b7ab1bb993ac59964ff397:021ac43c7ff740014c3b33737ede99c967e4764553d1b2b83db77c83b8715fa72d:02df2089105c77f266fa11a9d33f05c735234075f2e8780824c6b709415f9fb485:S", "nversion=1"],
     "output_cmp": "txcreatemultisig2.hex",
     "description": "Creates a new transaction with a single 2-of-3 multisig in a P2SH output"
   },
   { "exec": "./bitcoin-tx",
-    "args": ["-json", "-create", "outmultisig=1:2:3:02a5613bd857b7048924264d1e70e08fb2a7e6527d32b7ab1bb993ac59964ff397:021ac43c7ff740014c3b33737ede99c967e4764553d1b2b83db77c83b8715fa72d:02df2089105c77f266fa11a9d33f05c735234075f2e8780824c6b709415f9fb485:S"],
+    "args": ["-json", "-create", "outmultisig=1:2:3:02a5613bd857b7048924264d1e70e08fb2a7e6527d32b7ab1bb993ac59964ff397:021ac43c7ff740014c3b33737ede99c967e4764553d1b2b83db77c83b8715fa72d:02df2089105c77f266fa11a9d33f05c735234075f2e8780824c6b709415f9fb485:S", "nversion=1"],
     "output_cmp": "txcreatemultisig2.json",
     "description": "Creates a new transaction with a single 2-of-3 multisig in a P2SH output (output in json)"
   },
   { "exec": "./bitcoin-tx",
-    "args": ["-create", "outmultisig=1:2:3:02a5613bd857b7048924264d1e70e08fb2a7e6527d32b7ab1bb993ac59964ff397:021ac43c7ff740014c3b33737ede99c967e4764553d1b2b83db77c83b8715fa72d:02df2089105c77f266fa11a9d33f05c735234075f2e8780824c6b709415f9fb485:W"],
+    "args": ["-create", "outmultisig=1:2:3:02a5613bd857b7048924264d1e70e08fb2a7e6527d32b7ab1bb993ac59964ff397:021ac43c7ff740014c3b33737ede99c967e4764553d1b2b83db77c83b8715fa72d:02df2089105c77f266fa11a9d33f05c735234075f2e8780824c6b709415f9fb485:W", "nversion=1"],
     "output_cmp": "txcreatemultisig3.hex",
     "description": "Creates a new transaction with a single 2-of-3 multisig in a P2WSH output"
   },
   { "exec": "./bitcoin-tx",
-    "args": ["-json", "-create", "outmultisig=1:2:3:02a5613bd857b7048924264d1e70e08fb2a7e6527d32b7ab1bb993ac59964ff397:021ac43c7ff740014c3b33737ede99c967e4764553d1b2b83db77c83b8715fa72d:02df2089105c77f266fa11a9d33f05c735234075f2e8780824c6b709415f9fb485:W"],
+    "args": ["-json", "-create", "outmultisig=1:2:3:02a5613bd857b7048924264d1e70e08fb2a7e6527d32b7ab1bb993ac59964ff397:021ac43c7ff740014c3b33737ede99c967e4764553d1b2b83db77c83b8715fa72d:02df2089105c77f266fa11a9d33f05c735234075f2e8780824c6b709415f9fb485:W", "nversion=1"],
     "output_cmp": "txcreatemultisig3.json",
     "description": "Creates a new transaction with a single 2-of-3 multisig in a P2WSH output (output in json)"
   },
   { "exec": "./bitcoin-tx",
-    "args": ["-create", "outmultisig=1:2:3:02a5613bd857b7048924264d1e70e08fb2a7e6527d32b7ab1bb993ac59964ff397:021ac43c7ff740014c3b33737ede99c967e4764553d1b2b83db77c83b8715fa72d:02df2089105c77f266fa11a9d33f05c735234075f2e8780824c6b709415f9fb485:WS"],
+    "args": ["-create", "outmultisig=1:2:3:02a5613bd857b7048924264d1e70e08fb2a7e6527d32b7ab1bb993ac59964ff397:021ac43c7ff740014c3b33737ede99c967e4764553d1b2b83db77c83b8715fa72d:02df2089105c77f266fa11a9d33f05c735234075f2e8780824c6b709415f9fb485:WS", "nversion=1"],
     "output_cmp": "txcreatemultisig4.hex",
     "description": "Creates a new transaction with a single 2-of-3 multisig in a P2WSH output, wrapped in P2SH"
   },
   { "exec": "./bitcoin-tx",
-    "args": ["-json", "-create", "outmultisig=1:2:3:02a5613bd857b7048924264d1e70e08fb2a7e6527d32b7ab1bb993ac59964ff397:021ac43c7ff740014c3b33737ede99c967e4764553d1b2b83db77c83b8715fa72d:02df2089105c77f266fa11a9d33f05c735234075f2e8780824c6b709415f9fb485:WS"],
+    "args": ["-json", "-create", "outmultisig=1:2:3:02a5613bd857b7048924264d1e70e08fb2a7e6527d32b7ab1bb993ac59964ff397:021ac43c7ff740014c3b33737ede99c967e4764553d1b2b83db77c83b8715fa72d:02df2089105c77f266fa11a9d33f05c735234075f2e8780824c6b709415f9fb485:WS", "nversion=1"],
     "output_cmp": "txcreatemultisig4.json",
     "description": "Creates a new transaction with a single 2-of-3 multisig in a P2WSH output, wrapped in P2SH (output in json)"
   }

From 481f289765fab47ff2e0bd7dfb968f2bd92fd608 Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Tue, 22 Nov 2016 14:56:29 +0100
Subject: [PATCH 1525/1802] rpc: Named argument support for bitcoin-cli

Usage e.g.:

    $ src/bitcoin-cli -testnet -named echo arg0="dfdf"
    [
    "dfdf"
    ]

Argument conversion also works, for arguments thus flagged in the table in
`src/rpc/client.cpp`.

    $ src/bitcoin-cli -testnet -named echojson arg0="[1,2,3]"
    [
      [
        1,
        2,
        3
      ]
    ]

Unknown parameter (detected server-side):

    $ src/bitcoin-cli -testnet -named getinfo arg0="dfdf"
    error code: -8
    error message:
    Unknown named parameter arg0
---
 src/bitcoin-cli.cpp |  12 ++-
 src/rpc/client.cpp  | 225 ++++++++++++++++++++++++++------------------
 src/rpc/client.h    |   5 +
 src/rpc/misc.cpp    |   7 +-
 4 files changed, 156 insertions(+), 93 deletions(-)

diff --git a/src/bitcoin-cli.cpp b/src/bitcoin-cli.cpp
index e9b530114c50b..1c330cf5ea9ba 100644
--- a/src/bitcoin-cli.cpp
+++ b/src/bitcoin-cli.cpp
@@ -25,6 +25,7 @@
 
 static const char DEFAULT_RPCCONNECT[] = "127.0.0.1";
 static const int DEFAULT_HTTP_CLIENT_TIMEOUT=900;
+static const bool DEFAULT_NAMED=false;
 static const int CONTINUE_EXECUTION=-1;
 
 std::string HelpMessageCli()
@@ -35,6 +36,7 @@ std::string HelpMessageCli()
     strUsage += HelpMessageOpt("-conf=<file>", strprintf(_("Specify configuration file (default: %s)"), BITCOIN_CONF_FILENAME));
     strUsage += HelpMessageOpt("-datadir=<dir>", _("Specify data directory"));
     AppendParamsHelpMessages(strUsage);
+    strUsage += HelpMessageOpt("-named", strprintf(_("Pass named instead of positional arguments (default: %s)"), DEFAULT_NAMED));
     strUsage += HelpMessageOpt("-rpcconnect=<ip>", strprintf(_("Send commands to node running on <ip> (default: %s)"), DEFAULT_RPCCONNECT));
     strUsage += HelpMessageOpt("-rpcport=<port>", strprintf(_("Connect to JSON-RPC on <port> (default: %u or testnet: %u)"), BaseParams(CBaseChainParams::MAIN).RPCPort(), BaseParams(CBaseChainParams::TESTNET).RPCPort()));
     strUsage += HelpMessageOpt("-rpcwait", _("Wait for RPC server to start"));
@@ -80,6 +82,7 @@ static int AppInitRPC(int argc, char* argv[])
         if (!IsArgSet("-version")) {
             strUsage += "\n" + _("Usage:") + "\n" +
                   "  bitcoin-cli [options] <command> [params]  " + strprintf(_("Send command to %s"), _(PACKAGE_NAME)) + "\n" +
+                  "  bitcoin-cli [options] -named <command> [name=value] ... " + strprintf(_("Send command to %s (with named arguments)"), _(PACKAGE_NAME)) + "\n" +
                   "  bitcoin-cli [options] help                " + _("List commands") + "\n" +
                   "  bitcoin-cli [options] help <command>      " + _("Get help for a command") + "\n";
 
@@ -278,7 +281,14 @@ int CommandLineRPC(int argc, char *argv[])
         if (args.size() < 1)
             throw std::runtime_error("too few parameters (need at least command)");
         std::string strMethod = args[0];
-        UniValue params = RPCConvertValues(strMethod, std::vector<std::string>(args.begin()+1, args.end()));
+        args.erase(args.begin()); // Remove trailing method name from arguments vector
+
+        UniValue params;
+        if(GetBoolArg("-named", DEFAULT_NAMED)) {
+            params = RPCConvertNamedValues(strMethod, args);
+        } else {
+            params = RPCConvertValues(strMethod, args);
+        }
 
         // Execute and handle connection failures with -rpcwait
         const bool fWait = GetBoolArg("-rpcwait", false);
diff --git a/src/rpc/client.cpp b/src/rpc/client.cpp
index e094524bcb8e9..17d1de6761ce8 100644
--- a/src/rpc/client.cpp
+++ b/src/rpc/client.cpp
@@ -20,104 +20,120 @@ class CRPCConvertParam
 public:
     std::string methodName; //!< method whose params want conversion
     int paramIdx;           //!< 0-based idx of param to convert
+    std::string paramName;  //!< parameter name
 };
 
+/**
+ * Specifiy a (method, idx, name) here if the argument is a non-string RPC
+ * argument and needs to be converted from JSON.
+ *
+ * @note Parameter indexes start from 0.
+ */
 static const CRPCConvertParam vRPCConvertParams[] =
 {
-    { "stop", 0 },
-    { "setmocktime", 0 },
-    { "generate", 0 },
-    { "generate", 1 },
-    { "generatetoaddress", 0 },
-    { "generatetoaddress", 2 },
-    { "getnetworkhashps", 0 },
-    { "getnetworkhashps", 1 },
-    { "sendtoaddress", 1 },
-    { "sendtoaddress", 4 },
-    { "settxfee", 0 },
-    { "getreceivedbyaddress", 1 },
-    { "getreceivedbyaccount", 1 },
-    { "listreceivedbyaddress", 0 },
-    { "listreceivedbyaddress", 1 },
-    { "listreceivedbyaddress", 2 },
-    { "listreceivedbyaccount", 0 },
-    { "listreceivedbyaccount", 1 },
-    { "listreceivedbyaccount", 2 },
-    { "getbalance", 1 },
-    { "getbalance", 2 },
-    { "getblockhash", 0 },
-    { "waitforblockheight", 0 },
-    { "waitforblockheight", 1 },
-    { "waitforblock", 1 },
-    { "waitforblock", 2 },
-    { "waitfornewblock", 0 },
-    { "waitfornewblock", 1 },
-    { "move", 2 },
-    { "move", 3 },
-    { "sendfrom", 2 },
-    { "sendfrom", 3 },
-    { "listtransactions", 1 },
-    { "listtransactions", 2 },
-    { "listtransactions", 3 },
-    { "listaccounts", 0 },
-    { "listaccounts", 1 },
-    { "walletpassphrase", 1 },
-    { "getblocktemplate", 0 },
-    { "listsinceblock", 1 },
-    { "listsinceblock", 2 },
-    { "sendmany", 1 },
-    { "sendmany", 2 },
-    { "sendmany", 4 },
-    { "addmultisigaddress", 0 },
-    { "addmultisigaddress", 1 },
-    { "createmultisig", 0 },
-    { "createmultisig", 1 },
-    { "listunspent", 0 },
-    { "listunspent", 1 },
-    { "listunspent", 2 },
-    { "getblock", 1 },
-    { "getblockheader", 1 },
-    { "gettransaction", 1 },
-    { "getrawtransaction", 1 },
-    { "createrawtransaction", 0 },
-    { "createrawtransaction", 1 },
-    { "createrawtransaction", 2 },
-    { "signrawtransaction", 1 },
-    { "signrawtransaction", 2 },
-    { "sendrawtransaction", 1 },
-    { "fundrawtransaction", 1 },
-    { "gettxout", 1 },
-    { "gettxout", 2 },
-    { "gettxoutproof", 0 },
-    { "lockunspent", 0 },
-    { "lockunspent", 1 },
-    { "importprivkey", 2 },
-    { "importaddress", 2 },
-    { "importaddress", 3 },
-    { "importpubkey", 2 },
-    { "importmulti", 0 },
-    { "importmulti", 1 },
-    { "verifychain", 0 },
-    { "verifychain", 1 },
-    { "keypoolrefill", 0 },
-    { "getrawmempool", 0 },
-    { "estimatefee", 0 },
-    { "estimatepriority", 0 },
-    { "estimatesmartfee", 0 },
-    { "estimatesmartpriority", 0 },
-    { "prioritisetransaction", 1 },
-    { "prioritisetransaction", 2 },
-    { "setban", 2 },
-    { "setban", 3 },
-    { "setnetworkactive", 0 },
-    { "getmempoolancestors", 1 },
-    { "getmempooldescendants", 1 },
+    { "setmocktime", 0, "timestamp" },
+    { "generate", 0, "nblocks" },
+    { "generate", 1, "maxtries" },
+    { "generatetoaddress", 0, "nblocks" },
+    { "generatetoaddress", 2, "maxtries" },
+    { "getnetworkhashps", 0, "nblocks" },
+    { "getnetworkhashps", 1, "height" },
+    { "sendtoaddress", 1, "amount" },
+    { "sendtoaddress", 4, "subtractfeefromamount" },
+    { "settxfee", 0, "amount" },
+    { "getreceivedbyaddress", 1, "minconf" },
+    { "getreceivedbyaccount", 1, "minconf" },
+    { "listreceivedbyaddress", 0, "minconf" },
+    { "listreceivedbyaddress", 1, "include_empty" },
+    { "listreceivedbyaddress", 2, "include_watchonly" },
+    { "listreceivedbyaccount", 0, "minconf" },
+    { "listreceivedbyaccount", 1, "include_empty" },
+    { "listreceivedbyaccount", 2, "include_watchonly" },
+    { "getbalance", 1, "minconf" },
+    { "getbalance", 2, "include_watchonly" },
+    { "getblockhash", 0, "index" },
+    { "waitforblockheight", 0, "height" },
+    { "waitforblockheight", 1, "timeout" },
+    { "waitforblock", 1, "timeout" },
+    { "waitfornewblock", 0, "timeout" },
+    { "move", 2, "amount" },
+    { "move", 3, "minconf" },
+    { "sendfrom", 2, "amount" },
+    { "sendfrom", 3, "minconf" },
+    { "listtransactions", 1, "count" },
+    { "listtransactions", 2, "from" },
+    { "listtransactions", 3, "include_watchonly" },
+    { "listaccounts", 0, "minconf" },
+    { "listaccounts", 1, "include_watchonly" },
+    { "walletpassphrase", 1, "timeout" },
+    { "getblocktemplate", 0, "template_request" },
+    { "listsinceblock", 1, "target_confirmations" },
+    { "listsinceblock", 2, "include_watchonly" },
+    { "sendmany", 1, "amounts" },
+    { "sendmany", 2, "minconf" },
+    { "sendmany", 4, "subtractfeefrom" },
+    { "addmultisigaddress", 0, "nrequired" },
+    { "addmultisigaddress", 1, "keys" },
+    { "createmultisig", 0, "nrequired" },
+    { "createmultisig", 1, "keys" },
+    { "listunspent", 0, "minconf" },
+    { "listunspent", 1, "maxconf" },
+    { "listunspent", 2, "addresses" },
+    { "getblock", 1, "verbose" },
+    { "getblockheader", 1, "verbose" },
+    { "gettransaction", 1, "include_watchonly" },
+    { "getrawtransaction", 1, "verbose" },
+    { "createrawtransaction", 0, "transactions" },
+    { "createrawtransaction", 1, "outputs" },
+    { "createrawtransaction", 2, "locktime" },
+    { "signrawtransaction", 1, "prevtxs" },
+    { "signrawtransaction", 2, "privkeys" },
+    { "sendrawtransaction", 1, "allowhighfees" },
+    { "fundrawtransaction", 1, "options" },
+    { "gettxout", 1, "n" },
+    { "gettxout", 2, "include_mempool" },
+    { "gettxoutproof", 0, "txids" },
+    { "lockunspent", 0, "unlock" },
+    { "lockunspent", 1, "transactions" },
+    { "importprivkey", 2, "rescan" },
+    { "importaddress", 2, "rescan" },
+    { "importaddress", 3, "p2sh" },
+    { "importpubkey", 2, "rescan" },
+    { "importmulti", 0, "requests" },
+    { "importmulti", 1, "options" },
+    { "verifychain", 0, "checklevel" },
+    { "verifychain", 1, "nblocks" },
+    { "keypoolrefill", 0, "newsize" },
+    { "getrawmempool", 0, "verbose" },
+    { "estimatefee", 0, "nblocks" },
+    { "estimatepriority", 0, "nblocks" },
+    { "estimatesmartfee", 0, "nblocks" },
+    { "estimatesmartpriority", 0, "nblocks" },
+    { "prioritisetransaction", 1, "priority_delta" },
+    { "prioritisetransaction", 2, "fee_delta" },
+    { "setban", 2, "bantime" },
+    { "setban", 3, "absolute" },
+    { "setnetworkactive", 0, "state" },
+    { "getmempoolancestors", 1, "verbose" },
+    { "getmempooldescendants", 1, "verbose" },
+    // Echo with conversion (For testing only)
+    { "echojson", 0, "arg0" },
+    { "echojson", 1, "arg1" },
+    { "echojson", 2, "arg2" },
+    { "echojson", 3, "arg3" },
+    { "echojson", 4, "arg4" },
+    { "echojson", 5, "arg5" },
+    { "echojson", 6, "arg6" },
+    { "echojson", 7, "arg7" },
+    { "echojson", 8, "arg8" },
+    { "echojson", 9, "arg9" },
 };
 
 class CRPCConvertTable
 {
 private:
-    std::set<std::pair<std::string, int> > members;
+    std::set<std::pair<std::string, int>> members;
+    std::set<std::pair<std::string, std::string>> membersByName;
 
 public:
     CRPCConvertTable();
@@ -125,6 +141,9 @@ class CRPCConvertTable
     bool convert(const std::string& method, int idx) {
         return (members.count(std::make_pair(method, idx)) > 0);
     }
+    bool convert(const std::string& method, const std::string& name) {
+        return (membersByName.count(std::make_pair(method, name)) > 0);
+    }
 };
 
 CRPCConvertTable::CRPCConvertTable()
@@ -135,6 +154,8 @@ CRPCConvertTable::CRPCConvertTable()
     for (unsigned int i = 0; i < n_elem; i++) {
         members.insert(std::make_pair(vRPCConvertParams[i].methodName,
                                       vRPCConvertParams[i].paramIdx));
+        membersByName.insert(std::make_pair(vRPCConvertParams[i].methodName,
+                                            vRPCConvertParams[i].paramName));
     }
 }
 
@@ -152,7 +173,6 @@ UniValue ParseNonRFCJSONValue(const std::string& strVal)
     return jVal[0];
 }
 
-/** Convert strings to command-specific RPC representation */
 UniValue RPCConvertValues(const std::string &strMethod, const std::vector<std::string> &strParams)
 {
     UniValue params(UniValue::VARR);
@@ -171,3 +191,28 @@ UniValue RPCConvertValues(const std::string &strMethod, const std::vector<std::s
 
     return params;
 }
+
+UniValue RPCConvertNamedValues(const std::string &strMethod, const std::vector<std::string> &strParams)
+{
+    UniValue params(UniValue::VOBJ);
+
+    for (const std::string &s: strParams) {
+        size_t pos = s.find("=");
+        if (pos == std::string::npos) {
+            throw(std::runtime_error("No '=' in named argument '"+s+"', this needs to be present for every argument (even if it is empty)"));
+        }
+
+        std::string name = s.substr(0, pos);
+        std::string value = s.substr(pos+1);
+
+        if (!rpcCvtTable.convert(strMethod, name)) {
+            // insert string value directly
+            params.pushKV(name, value);
+        } else {
+            // parse string as JSON, insert bool/number/object/etc. value
+            params.pushKV(name, ParseNonRFCJSONValue(value));
+        }
+    }
+
+    return params;
+}
diff --git a/src/rpc/client.h b/src/rpc/client.h
index cb7c12b129cb1..e7cf035d8f396 100644
--- a/src/rpc/client.h
+++ b/src/rpc/client.h
@@ -8,7 +8,12 @@
 
 #include <univalue.h>
 
+/** Convert positional arguments to command-specific RPC representation */
 UniValue RPCConvertValues(const std::string& strMethod, const std::vector<std::string>& strParams);
+
+/** Convert named arguments to command-specific RPC representation */
+UniValue RPCConvertNamedValues(const std::string& strMethod, const std::vector<std::string>& strParams);
+
 /** Non-RFC4627 JSON parser, accepts internal values (such as numbers, true, false, null)
  * as well as objects and arrays.
  */
diff --git a/src/rpc/misc.cpp b/src/rpc/misc.cpp
index e95f4223668d5..01e4dee55b0f9 100644
--- a/src/rpc/misc.cpp
+++ b/src/rpc/misc.cpp
@@ -496,8 +496,10 @@ UniValue echo(const JSONRPCRequest& request)
 {
     if (request.fHelp)
         throw runtime_error(
-            "echo \"message\" ...\n"
-            "\nSimply echo back the input arguments\n"
+            "echo|echojson \"message\" ...\n"
+            "\nSimply echo back the input arguments. This command is for testing.\n"
+            "\nThe difference between echo and echojson is that echojson has argument conversion enabled in the client-side table in"
+            "bitcoin-cli and the GUI. There is no server-side difference."
         );
 
     return request.params;
@@ -516,6 +518,7 @@ static const CRPCCommand commands[] =
     /* Not shown in help */
     { "hidden",             "setmocktime",            &setmocktime,            true,  {"timestamp"}},
     { "hidden",             "echo",                   &echo,                   true,  {"arg0","arg1","arg2","arg3","arg4","arg5","arg6","arg7","arg8","arg9"}},
+    { "hidden",             "echojson",               &echo,                  true,  {"arg0","arg1","arg2","arg3","arg4","arg5","arg6","arg7","arg8","arg9"}},
 };
 
 void RegisterMiscRPCCommands(CRPCTable &t)

From 4e7e2e16e4530be31bfc696a08bd3d1265e6f235 Mon Sep 17 00:00:00 2001
From: John Newbery <john@johnnewbery.com>
Date: Fri, 9 Dec 2016 17:06:42 +0000
Subject: [PATCH 1526/1802] Update RPC argument names

---
 qa/rpc-tests/rpcnamedargs.py |  4 +--
 src/rpc/blockchain.cpp       | 58 ++++++++++++++++-----------------
 src/rpc/client.cpp           |  4 +--
 src/rpc/mining.cpp           | 22 ++++++-------
 src/rpc/misc.cpp             |  2 +-
 src/rpc/net.cpp              |  2 +-
 src/rpc/rawtransaction.cpp   | 26 +++++++--------
 src/wallet/rpcwallet.cpp     | 62 ++++++++++++++++++------------------
 8 files changed, 90 insertions(+), 90 deletions(-)

diff --git a/qa/rpc-tests/rpcnamedargs.py b/qa/rpc-tests/rpcnamedargs.py
index b526b1f51a89a..0484204668edd 100755
--- a/qa/rpc-tests/rpcnamedargs.py
+++ b/qa/rpc-tests/rpcnamedargs.py
@@ -39,8 +39,8 @@ def run_test(self):
 
         assert_raises_jsonrpc(-8, node.help, random='getinfo')
 
-        h = node.getblockhash(index=0)
-        node.getblock(hash=h)
+        h = node.getblockhash(height=0)
+        node.getblock(blockhash=h)
 
         assert_equal(node.echo(), [])
         assert_equal(node.echo(arg0=0,arg9=9), [0] + [None]*8 + [9])
diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp
index 77eb4190abf19..5b529d7f2c767 100644
--- a/src/rpc/blockchain.cpp
+++ b/src/rpc/blockchain.cpp
@@ -232,12 +232,12 @@ UniValue waitforblock(const JSONRPCRequest& request)
 {
     if (request.fHelp || request.params.size() < 1 || request.params.size() > 2)
         throw runtime_error(
-            "waitforblock <hash> (timeout)\n"
+            "waitforblock <blockhash> (timeout)\n"
             "\nWaits for a specific new block and returns useful info about it.\n"
             "\nReturns the current block on timeout or exit.\n"
             "\nArguments:\n"
-            "1. hash (string) Block hash to wait for.\n"
-            "2. timeout (int, optional, default=0) Time in milliseconds to wait for a response. 0 indicates no timeout.\n"
+            "1. \"blockhash\" (required, string) Block hash to wait for.\n"
+            "2. timeout       (int, optional, default=0) Time in milliseconds to wait for a response. 0 indicates no timeout.\n"
             "\nResult:\n"
             "{                           (json object)\n"
             "  \"hash\" : {       (string) The blockhash\n"
@@ -274,12 +274,12 @@ UniValue waitforblockheight(const JSONRPCRequest& request)
 {
     if (request.fHelp || request.params.size() < 1 || request.params.size() > 2)
         throw runtime_error(
-            "waitforblockheight <blockheight> (timeout)\n"
+            "waitforblockheight <height> (timeout)\n"
             "\nWaits for (at least) block height and returns the height and hash\n"
             "of the current tip.\n"
             "\nReturns the current block on timeout or exit.\n"
             "\nArguments:\n"
-            "1. block height to wait for (int)\n"
+            "1. height  (required, int) Block height to wait for (int)\n"
             "2. timeout (int, optional, default=0) Time in milliseconds to wait for a response. 0 indicates no timeout.\n"
             "\nResult:\n"
             "{                           (json object)\n"
@@ -418,7 +418,7 @@ UniValue getrawmempool(const JSONRPCRequest& request)
             "getrawmempool ( verbose )\n"
             "\nReturns all transaction ids in memory pool as a json array of string transaction ids.\n"
             "\nArguments:\n"
-            "1. verbose           (boolean, optional, default=false) true for a json object, false for array of transaction ids\n"
+            "1. verbose (boolean, optional, default=false) True for a json object, false for array of transaction ids\n"
             "\nResult: (for verbose = false):\n"
             "[                     (json array of string)\n"
             "  \"transactionid\"     (string) The transaction id\n"
@@ -449,8 +449,8 @@ UniValue getmempoolancestors(const JSONRPCRequest& request)
             "getmempoolancestors txid (verbose)\n"
             "\nIf txid is in the mempool, returns all in-mempool ancestors.\n"
             "\nArguments:\n"
-            "1. \"txid\"                   (string, required) The transaction id (must be in mempool)\n"
-            "2. verbose                  (boolean, optional, default=false) true for a json object, false for array of transaction ids\n"
+            "1. \"txid\"                 (string, required) The transaction id (must be in mempool)\n"
+            "2. verbose                  (boolean, optional, default=false) True for a json object, false for array of transaction ids\n"
             "\nResult (for verbose=false):\n"
             "[                       (json array of strings)\n"
             "  \"transactionid\"           (string) The transaction id of an in-mempool ancestor transaction\n"
@@ -513,8 +513,8 @@ UniValue getmempooldescendants(const JSONRPCRequest& request)
             "getmempooldescendants txid (verbose)\n"
             "\nIf txid is in the mempool, returns all in-mempool descendants.\n"
             "\nArguments:\n"
-            "1. \"txid\"                   (string, required) The transaction id (must be in mempool)\n"
-            "2. verbose                  (boolean, optional, default=false) true for a json object, false for array of transaction ids\n"
+            "1. \"txid\"                 (string, required) The transaction id (must be in mempool)\n"
+            "2. verbose                  (boolean, optional, default=false) True for a json object, false for array of transaction ids\n"
             "\nResult (for verbose=false):\n"
             "[                       (json array of strings)\n"
             "  \"transactionid\"           (string) The transaction id of an in-mempool descendant transaction\n"
@@ -607,10 +607,10 @@ UniValue getblockhash(const JSONRPCRequest& request)
 {
     if (request.fHelp || request.params.size() != 1)
         throw runtime_error(
-            "getblockhash index\n"
-            "\nReturns hash of block in best-block-chain at index provided.\n"
+            "getblockhash height\n"
+            "\nReturns hash of block in best-block-chain at height provided.\n"
             "\nArguments:\n"
-            "1. index         (numeric, required) The block index\n"
+            "1. height         (numeric, required) The height index\n"
             "\nResult:\n"
             "\"hash\"         (string) The block hash\n"
             "\nExamples:\n"
@@ -691,12 +691,12 @@ UniValue getblock(const JSONRPCRequest& request)
 {
     if (request.fHelp || request.params.size() < 1 || request.params.size() > 2)
         throw runtime_error(
-            "getblock \"hash\" ( verbose )\n"
+            "getblock \"blockhash\" ( verbose )\n"
             "\nIf verbose is false, returns a string that is serialized, hex-encoded data for block 'hash'.\n"
             "If verbose is true, returns an Object with information about block <hash>.\n"
             "\nArguments:\n"
-            "1. \"hash\"          (string, required) The block hash\n"
-            "2. verbose           (boolean, optional, default=true) true for a json object, false for the hex encoded data\n"
+            "1. \"blockhash\"          (string, required) The block hash\n"
+            "2. verbose                (boolean, optional, default=true) true for a json object, false for the hex encoded data\n"
             "\nResult (for verbose = true):\n"
             "{\n"
             "  \"hash\" : \"hash\",     (string) the block hash (same as provided)\n"
@@ -1257,12 +1257,12 @@ UniValue preciousblock(const JSONRPCRequest& request)
 {
     if (request.fHelp || request.params.size() != 1)
         throw runtime_error(
-            "preciousblock \"hash\"\n"
+            "preciousblock \"blockhash\"\n"
             "\nTreats a block as if it were received before others with the same work.\n"
             "\nA later preciousblock call can override the effect of an earlier one.\n"
             "\nThe effects of preciousblock are not retained across restarts.\n"
             "\nArguments:\n"
-            "1. hash   (string, required) the hash of the block to mark as precious\n"
+            "1. \"blockhash\"   (string, required) the hash of the block to mark as precious\n"
             "\nResult:\n"
             "\nExamples:\n"
             + HelpExampleCli("preciousblock", "\"blockhash\"")
@@ -1295,10 +1295,10 @@ UniValue invalidateblock(const JSONRPCRequest& request)
 {
     if (request.fHelp || request.params.size() != 1)
         throw runtime_error(
-            "invalidateblock \"hash\"\n"
+            "invalidateblock \"blockhash\"\n"
             "\nPermanently marks a block as invalid, as if it violated a consensus rule.\n"
             "\nArguments:\n"
-            "1. hash   (string, required) the hash of the block to mark as invalid\n"
+            "1. \"blockhash\"   (string, required) the hash of the block to mark as invalid\n"
             "\nResult:\n"
             "\nExamples:\n"
             + HelpExampleCli("invalidateblock", "\"blockhash\"")
@@ -1333,11 +1333,11 @@ UniValue reconsiderblock(const JSONRPCRequest& request)
 {
     if (request.fHelp || request.params.size() != 1)
         throw runtime_error(
-            "reconsiderblock \"hash\"\n"
+            "reconsiderblock \"blockhash\"\n"
             "\nRemoves invalidity status of a block and its descendants, reconsider them for activation.\n"
             "This can be used to undo the effects of invalidateblock.\n"
             "\nArguments:\n"
-            "1. hash   (string, required) the hash of the block to reconsider\n"
+            "1. \"blockhash\"   (string, required) the hash of the block to reconsider\n"
             "\nResult:\n"
             "\nExamples:\n"
             + HelpExampleCli("reconsiderblock", "\"blockhash\"")
@@ -1372,9 +1372,9 @@ static const CRPCCommand commands[] =
     { "blockchain",         "getblockchaininfo",      &getblockchaininfo,      true,  {} },
     { "blockchain",         "getbestblockhash",       &getbestblockhash,       true,  {} },
     { "blockchain",         "getblockcount",          &getblockcount,          true,  {} },
-    { "blockchain",         "getblock",               &getblock,               true,  {"hash","verbose"} },
-    { "blockchain",         "getblockhash",           &getblockhash,           true,  {"index"} },
-    { "blockchain",         "getblockheader",         &getblockheader,         true,  {"hash","verbose"} },
+    { "blockchain",         "getblock",               &getblock,               true,  {"blockhash","verbose"} },
+    { "blockchain",         "getblockhash",           &getblockhash,           true,  {"height"} },
+    { "blockchain",         "getblockheader",         &getblockheader,         true,  {"blockhash","verbose"} },
     { "blockchain",         "getchaintips",           &getchaintips,           true,  {} },
     { "blockchain",         "getdifficulty",          &getdifficulty,          true,  {} },
     { "blockchain",         "getmempoolancestors",    &getmempoolancestors,    true,  {"txid","verbose"} },
@@ -1386,13 +1386,13 @@ static const CRPCCommand commands[] =
     { "blockchain",         "gettxoutsetinfo",        &gettxoutsetinfo,        true,  {} },
     { "blockchain",         "verifychain",            &verifychain,            true,  {"checklevel","nblocks"} },
 
-    { "blockchain",         "preciousblock",          &preciousblock,          true,  {"hash"} },
+    { "blockchain",         "preciousblock",          &preciousblock,          true,  {"blockhash"} },
 
     /* Not shown in help */
-    { "hidden",             "invalidateblock",        &invalidateblock,        true,  {"hash"} },
-    { "hidden",             "reconsiderblock",        &reconsiderblock,        true,  {"hash"} },
+    { "hidden",             "invalidateblock",        &invalidateblock,        true,  {"blockhash"} },
+    { "hidden",             "reconsiderblock",        &reconsiderblock,        true,  {"blockhash"} },
     { "hidden",             "waitfornewblock",        &waitfornewblock,        true,  {"timeout"} },
-    { "hidden",             "waitforblock",           &waitforblock,           true,  {"hash","timeout"} },
+    { "hidden",             "waitforblock",           &waitforblock,           true,  {"blockhash","timeout"} },
     { "hidden",             "waitforblockheight",     &waitforblockheight,     true,  {"height","timeout"} },
 };
 
diff --git a/src/rpc/client.cpp b/src/rpc/client.cpp
index 17d1de6761ce8..422d005f0ceb9 100644
--- a/src/rpc/client.cpp
+++ b/src/rpc/client.cpp
@@ -51,7 +51,7 @@ static const CRPCConvertParam vRPCConvertParams[] =
     { "listreceivedbyaccount", 2, "include_watchonly" },
     { "getbalance", 1, "minconf" },
     { "getbalance", 2, "include_watchonly" },
-    { "getblockhash", 0, "index" },
+    { "getblockhash", 0, "height" },
     { "waitforblockheight", 0, "height" },
     { "waitforblockheight", 1, "timeout" },
     { "waitforblock", 1, "timeout" },
@@ -61,7 +61,7 @@ static const CRPCConvertParam vRPCConvertParams[] =
     { "sendfrom", 2, "amount" },
     { "sendfrom", 3, "minconf" },
     { "listtransactions", 1, "count" },
-    { "listtransactions", 2, "from" },
+    { "listtransactions", 2, "skip" },
     { "listtransactions", 3, "include_watchonly" },
     { "listaccounts", 0, "minconf" },
     { "listaccounts", 1, "include_watchonly" },
diff --git a/src/rpc/mining.cpp b/src/rpc/mining.cpp
index 3143916c88882..91aa7497b3525 100644
--- a/src/rpc/mining.cpp
+++ b/src/rpc/mining.cpp
@@ -84,7 +84,7 @@ UniValue getnetworkhashps(const JSONRPCRequest& request)
             "Pass in [height] to estimate the network speed at the time when a certain block was found.\n"
             "\nArguments:\n"
             "1. nblocks     (numeric, optional, default=120) The number of blocks, or -1 for blocks since last difficulty change.\n"
-            "2. height     (numeric, optional, default=-1) To estimate at the time of the given height.\n"
+            "2. height      (numeric, optional, default=-1) To estimate at the time of the given height.\n"
             "\nResult:\n"
             "x             (numeric) Hashes per second estimated\n"
             "\nExamples:\n"
@@ -153,7 +153,7 @@ UniValue generate(const JSONRPCRequest& request)
             "generate nblocks ( maxtries )\n"
             "\nMine up to nblocks blocks immediately (before the RPC call returns)\n"
             "\nArguments:\n"
-            "1. nblocks    (numeric, required) How many blocks are generated immediately.\n"
+            "1. nblocks      (numeric, required) How many blocks are generated immediately.\n"
             "2. maxtries     (numeric, optional) How many iterations to try (default = 1000000).\n"
             "\nResult:\n"
             "[ blockhashes ]     (array) hashes of blocks generated\n"
@@ -189,8 +189,8 @@ UniValue generatetoaddress(const JSONRPCRequest& request)
             "generatetoaddress nblocks address (maxtries)\n"
             "\nMine blocks immediately to a specified address (before the RPC call returns)\n"
             "\nArguments:\n"
-            "1. nblocks    (numeric, required) How many blocks are generated immediately.\n"
-            "2. address    (string, required) The address to send the newly generated bitcoin to.\n"
+            "1. nblocks      (numeric, required) How many blocks are generated immediately.\n"
+            "2. address      (string, required) The address to send the newly generated bitcoin to.\n"
             "3. maxtries     (numeric, optional) How many iterations to try (default = 1000000).\n"
             "\nResult:\n"
             "[ blockhashes ]     (array) hashes of blocks generated\n"
@@ -264,10 +264,10 @@ UniValue prioritisetransaction(const JSONRPCRequest& request)
             "Accepts the transaction into mined blocks at a higher (or lower) priority\n"
             "\nArguments:\n"
             "1. \"txid\"       (string, required) The transaction id.\n"
-            "2. priority delta (numeric, required) The priority to add or subtract.\n"
+            "2. priority_delta (numeric, required) The priority to add or subtract.\n"
             "                  The transaction selection algorithm considers the tx as it would have a higher priority.\n"
             "                  (priority of a transaction is calculated: coinage * value_in_satoshis / txsize) \n"
-            "3. fee delta      (numeric, required) The fee value (in satoshis) to add (or subtract, if negative).\n"
+            "3. fee_delta      (numeric, required) The fee value (in satoshis) to add (or subtract, if negative).\n"
             "                  The fee is not actually paid, only the algorithm for selecting transactions into a block\n"
             "                  considers the transaction as it would have paid a higher (or lower) fee.\n"
             "\nResult:\n"
@@ -717,8 +717,8 @@ UniValue submitblock(const JSONRPCRequest& request)
             "The 'jsonparametersobject' parameter is currently ignored.\n"
             "See https://en.bitcoin.it/wiki/BIP_0022 for full specification.\n"
 
-            "\nArguments:\n"
-            "1. \"hexdata\"    (string, required) the hex-encoded block data to submit\n"
+            "\nArguments\n"
+            "1. \"hexdata\"        (string, required) the hex-encoded block data to submit\n"
             "2. \"parameters\"     (string, optional) object of optional parameters\n"
             "    {\n"
             "      \"workid\" : \"id\"    (string, optional) if the server provided a workid, it MUST be included with submissions\n"
@@ -781,7 +781,7 @@ UniValue estimatefee(const JSONRPCRequest& request)
             "\nEstimates the approximate fee per kilobyte needed for a transaction to begin\n"
             "confirmation within nblocks blocks.\n"
             "\nArguments:\n"
-            "1. nblocks     (numeric)\n"
+            "1. nblocks     (numeric, required)\n"
             "\nResult:\n"
             "n              (numeric) estimated fee-per-kilobyte\n"
             "\n"
@@ -814,7 +814,7 @@ UniValue estimatepriority(const JSONRPCRequest& request)
             "\nDEPRECATED. Estimates the approximate priority a zero-fee transaction needs to begin\n"
             "confirmation within nblocks blocks.\n"
             "\nArguments:\n"
-            "1. nblocks     (numeric)\n"
+            "1. nblocks     (numeric, required)\n"
             "\nResult:\n"
             "n              (numeric) estimated priority\n"
             "\n"
@@ -879,7 +879,7 @@ UniValue estimatesmartpriority(const JSONRPCRequest& request)
             "confirmation within nblocks blocks if possible and return the number of blocks\n"
             "for which the estimate is valid.\n"
             "\nArguments:\n"
-            "1. nblocks     (numeric)\n"
+            "1. nblocks     (numeric, required)\n"
             "\nResult:\n"
             "{\n"
             "  \"priority\" : x.x,    (numeric) estimated priority\n"
diff --git a/src/rpc/misc.cpp b/src/rpc/misc.cpp
index 01e4dee55b0f9..54d8c3e035916 100644
--- a/src/rpc/misc.cpp
+++ b/src/rpc/misc.cpp
@@ -328,7 +328,7 @@ UniValue verifymessage(const JSONRPCRequest& request)
             "verifymessage \"address\" \"signature\" \"message\"\n"
             "\nVerify a signed message\n"
             "\nArguments:\n"
-            "1. \"address\"  (string, required) The bitcoin address to use for the signature.\n"
+            "1. \"address\"         (string, required) The bitcoin address to use for the signature.\n"
             "2. \"signature\"       (string, required) The signature provided by the signer in base 64 encoding (see signmessage).\n"
             "3. \"message\"         (string, required) The message that was signed.\n"
             "\nResult:\n"
diff --git a/src/rpc/net.cpp b/src/rpc/net.cpp
index 8e64ace9f2d21..9d89bb2ab61ed 100644
--- a/src/rpc/net.cpp
+++ b/src/rpc/net.cpp
@@ -471,7 +471,7 @@ UniValue setban(const JSONRPCRequest& request)
                             "setban \"subnet\" \"add|remove\" (bantime) (absolute)\n"
                             "\nAttempts add or remove a IP/Subnet from the banned list.\n"
                             "\nArguments:\n"
-                            "1. \"subnet\" (string, required) The IP/Subnet (see getpeerinfo for nodes ip) with a optional netmask (default is /32 = single ip)\n"
+                            "1. \"subnet\"       (string, required) The IP/Subnet (see getpeerinfo for nodes ip) with a optional netmask (default is /32 = single ip)\n"
                             "2. \"command\"      (string, required) 'add' to add a IP/Subnet to the list, 'remove' to remove a IP/Subnet from the list\n"
                             "3. \"bantime\"      (numeric, optional) time in seconds how long (or until when if [absolute] is set) the ip is banned (0 or empty means using the default time of 24h which can also be overwritten by the -bantime startup argument)\n"
                             "4. \"absolute\"     (boolean, optional) If set, the bantime must be a absolute timestamp in seconds since epoch (Jan 1 1970 GMT)\n"
diff --git a/src/rpc/rawtransaction.cpp b/src/rpc/rawtransaction.cpp
index 78b0a00b8b1a2..4996eb2a69130 100644
--- a/src/rpc/rawtransaction.cpp
+++ b/src/rpc/rawtransaction.cpp
@@ -248,7 +248,7 @@ UniValue gettxoutproof(const JSONRPCRequest& request)
             "      \"txid\"     (string) A transaction hash\n"
             "      ,...\n"
             "    ]\n"
-            "2. \"block hash\"  (string, optional) If specified, looks for txid in the block with this hash\n"
+            "2. \"blockhash\"   (string, optional) If specified, looks for txid in the block with this hash\n"
             "\nResult:\n"
             "\"data\"           (string) A string that is a serialized, hex-encoded data for the proof.\n"
         );
@@ -358,24 +358,24 @@ UniValue createrawtransaction(const JSONRPCRequest& request)
             "it is not stored in the wallet or transmitted to the network.\n"
 
             "\nArguments:\n"
-            "1. \"transactions\"        (string, required) A json array of json objects\n"
+            "1. \"inputs\"                (string, required) A json array of json objects\n"
             "     [\n"
             "       {\n"
             "         \"txid\":\"id\",    (string, required) The transaction id\n"
-            "         \"vout\":n        (numeric, required) The output number\n"
-            "         \"sequence\":n    (numeric, optional) The sequence number\n"
-            "       }\n"
+            "         \"vout\":n,         (numeric, required) The output number\n"
+            "         \"sequence\":n      (numeric, optional) The sequence number\n"
+            "       } \n"
             "       ,...\n"
             "     ]\n"
-            "2. \"outputs\"             (string, required) a json object with outputs\n"
+            "2. \"outputs\"               (string, required) a json object with outputs\n"
             "    {\n"
-            "      \"address\": x.xxx   (numeric or string, required) The key is the bitcoin address, the numeric value (can be string) is the " + CURRENCY_UNIT + " amount\n"
-            "      \"data\": \"hex\",     (string, required) The key is \"data\", the value is hex encoded data\n"
-            "      ...\n"
+            "      \"address\": x.xxx,    (numeric or string, required) The key is the bitcoin address, the numeric value (can be string) is the " + CURRENCY_UNIT + " amount\n"
+            "      \"data\": \"hex\"      (string, required) The key is \"data\", the value is hex encoded data\n"
+            "      ,...\n"
             "    }\n"
-            "3. locktime                (numeric, optional, default=0) Raw locktime. Non-0 value also locktime-activates inputs\n"
+            "3. locktime                  (numeric, optional, default=0) Raw locktime. Non-0 value also locktime-activates inputs\n"
             "\nResult:\n"
-            "\"transaction\"            (string) hex string of the transaction\n"
+            "\"transaction\"              (string) hex string of the transaction\n"
 
             "\nExamples:\n"
             + HelpExampleCli("createrawtransaction", "\"[{\\\"txid\\\":\\\"myid\\\",\\\"vout\\\":0}]\" \"{\\\"address\\\":0.01}\"")
@@ -467,7 +467,7 @@ UniValue decoderawtransaction(const JSONRPCRequest& request)
             "\nReturn a JSON object representing the serialized, hex-encoded transaction.\n"
 
             "\nArguments:\n"
-            "1. \"hex\"      (string, required) The transaction hex string\n"
+            "1. \"hexstring\"      (string, required) The transaction hex string\n"
 
             "\nResult:\n"
             "{\n"
@@ -535,7 +535,7 @@ UniValue decodescript(const JSONRPCRequest& request)
             "decodescript \"hexstring\"\n"
             "\nDecode a hex-encoded script.\n"
             "\nArguments:\n"
-            "1. \"hex\"     (string) the hex encoded script\n"
+            "1. \"hexstring\"     (string) the hex encoded script\n"
             "\nResult:\n"
             "{\n"
             "  \"asm\":\"asm\",   (string) Script public key\n"
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index 2379403d40c1b..4dda480216bdd 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -166,7 +166,7 @@ UniValue getaccountaddress(const JSONRPCRequest& request)
             "\nArguments:\n"
             "1. \"account\"       (string, required) The account name for the address. It can also be set to the empty string \"\" to represent the default account. The account does not need to exist, it will be created and a new address created  if there is no account by the given name.\n"
             "\nResult:\n"
-            "\"address\"   (string) The account bitcoin address\n"
+            "\"address\"          (string) The account bitcoin address\n"
             "\nExamples:\n"
             + HelpExampleCli("getaccountaddress", "")
             + HelpExampleCli("getaccountaddress", "\"\"")
@@ -231,7 +231,7 @@ UniValue setaccount(const JSONRPCRequest& request)
             "setaccount \"address\" \"account\"\n"
             "\nDEPRECATED. Sets the account associated with the given address.\n"
             "\nArguments:\n"
-            "1. \"address\"  (string, required) The bitcoin address to be associated with an account.\n"
+            "1. \"address\"         (string, required) The bitcoin address to be associated with an account.\n"
             "2. \"account\"         (string, required) The account to assign the address to.\n"
             "\nExamples:\n"
             + HelpExampleCli("setaccount", "\"1D1ZrZNe3JUo7ZycKEYQQiQAWd9y54F4XZ\" \"tabby\"")
@@ -277,7 +277,7 @@ UniValue getaccount(const JSONRPCRequest& request)
             "getaccount \"address\"\n"
             "\nDEPRECATED. Returns the account associated with the given address.\n"
             "\nArguments:\n"
-            "1. \"address\"  (string, required) The bitcoin address for account lookup.\n"
+            "1. \"address\"         (string, required) The bitcoin address for account lookup.\n"
             "\nResult:\n"
             "\"accountname\"        (string) the account address\n"
             "\nExamples:\n"
@@ -309,10 +309,10 @@ UniValue getaddressesbyaccount(const JSONRPCRequest& request)
             "getaddressesbyaccount \"account\"\n"
             "\nDEPRECATED. Returns the list of addresses for the given account.\n"
             "\nArguments:\n"
-            "1. \"account\"  (string, required) The account name.\n"
+            "1. \"account\"        (string, required) The account name.\n"
             "\nResult:\n"
             "[                     (json array of string)\n"
-            "  \"address\"  (string) a bitcoin address associated with the given account\n"
+            "  \"address\"         (string) a bitcoin address associated with the given account\n"
             "  ,...\n"
             "]\n"
             "\nExamples:\n"
@@ -384,17 +384,17 @@ UniValue sendtoaddress(const JSONRPCRequest& request)
             "\nSend an amount to a given address.\n"
             + HelpRequiringPassphrase() +
             "\nArguments:\n"
-            "1. \"address\"  (string, required) The bitcoin address to send to.\n"
-            "2. \"amount\"      (numeric or string, required) The amount in " + CURRENCY_UNIT + " to send. eg 0.1\n"
-            "3. \"comment\"     (string, optional) A comment used to store what the transaction is for. \n"
+            "1. \"address\"            (string, required) The bitcoin address to send to.\n"
+            "2. \"amount\"             (numeric or string, required) The amount in " + CURRENCY_UNIT + " to send. eg 0.1\n"
+            "3. \"comment\"            (string, optional) A comment used to store what the transaction is for. \n"
             "                             This is not part of the transaction, just kept in your wallet.\n"
-            "4. \"comment_to\"  (string, optional) A comment to store the name of the person or organization \n"
+            "4. \"comment_to\"         (string, optional) A comment to store the name of the person or organization \n"
             "                             to which you're sending the transaction. This is not part of the \n"
             "                             transaction, just kept in your wallet.\n"
             "5. subtractfeefromamount  (boolean, optional, default=false) The fee will be deducted from the amount being sent.\n"
             "                             The recipient will receive less bitcoins than you enter in the amount field.\n"
             "\nResult:\n"
-            "\"transactionid\"  (string) The transaction id.\n"
+            "\"txid\"                  (string) The transaction id.\n"
             "\nExamples:\n"
             + HelpExampleCli("sendtoaddress", "\"1M72Sfpbz1BPpXFHz9m3CdqATR44Jvaydd\" 0.1")
             + HelpExampleCli("sendtoaddress", "\"1M72Sfpbz1BPpXFHz9m3CdqATR44Jvaydd\" 0.1 \"donation\" \"seans outpost\"")
@@ -493,7 +493,7 @@ UniValue signmessage(const JSONRPCRequest& request)
             "\nSign a message with the private key of an address"
             + HelpRequiringPassphrase() + "\n"
             "\nArguments:\n"
-            "1. \"address\"  (string, required) The bitcoin address to use for the private key.\n"
+            "1. \"address\"         (string, required) The bitcoin address to use for the private key.\n"
             "2. \"message\"         (string, required) The message to create a signature of.\n"
             "\nResult:\n"
             "\"signature\"          (string) The signature of the message encoded in base 64\n"
@@ -548,7 +548,7 @@ UniValue getreceivedbyaddress(const JSONRPCRequest& request)
             "getreceivedbyaddress \"address\" ( minconf )\n"
             "\nReturns the total amount received by the given address in transactions with at least minconf confirmations.\n"
             "\nArguments:\n"
-            "1. \"address\"  (string, required) The bitcoin address for transactions.\n"
+            "1. \"address\"         (string, required) The bitcoin address for transactions.\n"
             "2. minconf             (numeric, optional, default=1) Only include transactions confirmed at least this many times.\n"
             "\nResult:\n"
             "amount   (numeric) The total amount in " + CURRENCY_UNIT + " received at this address.\n"
@@ -803,7 +803,7 @@ UniValue sendfrom(const JSONRPCRequest& request)
             + HelpRequiringPassphrase() + "\n"
             "\nArguments:\n"
             "1. \"fromaccount\"       (string, required) The name of the account to send funds from. May be the default account using \"\".\n"
-            "2. \"toaddress\"  (string, required) The bitcoin address to send funds to.\n"
+            "2. \"toaddress\"         (string, required) The bitcoin address to send funds to.\n"
             "3. amount                (numeric or string, required) The amount in " + CURRENCY_UNIT + " (transaction fee is added on top).\n"
             "4. minconf               (numeric, optional, default=1) Only use funds with at least this many confirmations.\n"
             "5. \"comment\"           (string, optional) A comment used to store what the transaction is for. \n"
@@ -812,7 +812,7 @@ UniValue sendfrom(const JSONRPCRequest& request)
             "                                     to which you're sending the transaction. This is not part of the transaction, \n"
             "                                     it is just kept in your wallet.\n"
             "\nResult:\n"
-            "\"transactionid\"        (string) The transaction id.\n"
+            "\"txid\"                 (string) The transaction id.\n"
             "\nExamples:\n"
             "\nSend 0.01 " + CURRENCY_UNIT + " from the default account to the address, must have at least 1 confirmation\n"
             + HelpExampleCli("sendfrom", "\"\" \"1M72Sfpbz1BPpXFHz9m3CdqATR44Jvaydd\" 0.01") +
@@ -879,11 +879,11 @@ UniValue sendmany(const JSONRPCRequest& request)
             "                           Those recipients will receive less bitcoins than you enter in their corresponding amount field.\n"
             "                           If no addresses are specified here, the sender pays the fee.\n"
             "    [\n"
-            "      \"address\"            (string) Subtract fee from this address\n"
+            "      \"address\"          (string) Subtract fee from this address\n"
             "      ,...\n"
             "    ]\n"
             "\nResult:\n"
-            "\"transactionid\"          (string) The transaction id for the send. Only 1 transaction is created regardless of \n"
+            "\"txid\"                   (string) The transaction id for the send. Only 1 transaction is created regardless of \n"
             "                                    the number of addresses.\n"
             "\nExamples:\n"
             "\nSend two amounts to two different addresses:\n"
@@ -997,7 +997,7 @@ UniValue addmultisigaddress(const JSONRPCRequest& request)
             "3. \"account\"      (string, optional) DEPRECATED. An account to assign the addresses to.\n"
 
             "\nResult:\n"
-            "\"address\"  (string) A bitcoin address associated with the keys.\n"
+            "\"address\"         (string) A bitcoin address associated with the keys.\n"
 
             "\nExamples:\n"
             "\nAdd a multisig address from 2 addresses\n"
@@ -1256,8 +1256,8 @@ UniValue listreceivedbyaddress(const JSONRPCRequest& request)
             "listreceivedbyaddress ( minconf include_empty include_watchonly)\n"
             "\nList balances by receiving address.\n"
             "\nArguments:\n"
-            "1. minconf       (numeric, optional, default=1) The minimum number of confirmations before payments are included.\n"
-            "2. include_empty  (bool, optional, default=false) Whether to include addresses that haven't received any payments.\n"
+            "1. minconf           (numeric, optional, default=1) The minimum number of confirmations before payments are included.\n"
+            "2. include_empty     (bool, optional, default=false) Whether to include addresses that haven't received any payments.\n"
             "3. include_watchonly (bool, optional, default=false) Whether to include watchonly addresses (see 'importaddress').\n"
 
             "\nResult:\n"
@@ -1294,8 +1294,8 @@ UniValue listreceivedbyaccount(const JSONRPCRequest& request)
             "listreceivedbyaccount ( minconf include_empty include_watchonly)\n"
             "\nDEPRECATED. List balances by account.\n"
             "\nArguments:\n"
-            "1. minconf      (numeric, optional, default=1) The minimum number of confirmations before payments are included.\n"
-            "2. include_empty (bool, optional, default=false) Whether to include accounts that haven't received any payments.\n"
+            "1. minconf           (numeric, optional, default=1) The minimum number of confirmations before payments are included.\n"
+            "2. include_empty     (bool, optional, default=false) Whether to include accounts that haven't received any payments.\n"
             "3. include_watchonly (bool, optional, default=false) Whether to include watchonly addresses (see 'importaddress').\n"
 
             "\nResult:\n"
@@ -1427,12 +1427,12 @@ UniValue listtransactions(const JSONRPCRequest& request)
 
     if (request.fHelp || request.params.size() > 4)
         throw runtime_error(
-            "listtransactions ( \"account\" count from include_watchonly)\n"
+            "listtransactions ( \"account\" count skip include_watchonly)\n"
             "\nReturns up to 'count' most recent transactions skipping the first 'from' transactions for account 'account'.\n"
             "\nArguments:\n"
             "1. \"account\"    (string, optional) DEPRECATED. The account name. Should be \"*\".\n"
             "2. count          (numeric, optional, default=10) The number of transactions to return\n"
-            "3. from           (numeric, optional, default=0) The number of transactions to skip\n"
+            "3. skip           (numeric, optional, default=0) The number of transactions to skip\n"
             "4. include_watchonly (bool, optional, default=false) Include transactions to watchonly addresses (see 'importaddress')\n"
             "\nResult:\n"
             "[\n"
@@ -1557,8 +1557,8 @@ UniValue listaccounts(const JSONRPCRequest& request)
             "listaccounts ( minconf include_watchonly)\n"
             "\nDEPRECATED. Returns Object that has account names as keys, account balances as values.\n"
             "\nArguments:\n"
-            "1. minconf          (numeric, optional, default=1) Only include transactions with at least this many confirmations\n"
-            "2. include_watchonly (bool, optional, default=false) Include balances in watchonly addresses (see 'importaddress')\n"
+            "1. minconf             (numeric, optional, default=1) Only include transactions with at least this many confirmations\n"
+            "2. include_watchonly   (bool, optional, default=false) Include balances in watchonly addresses (see 'importaddress')\n"
             "\nResult:\n"
             "{                      (json object where keys are account names, and values are numeric balances\n"
             "  \"account\": x.xxx,  (numeric) The property name is the account name, and the value is the total balance for the account.\n"
@@ -1636,8 +1636,8 @@ UniValue listsinceblock(const JSONRPCRequest& request)
             "listsinceblock ( \"blockhash\" target_confirmations include_watchonly)\n"
             "\nGet all transactions in blocks since block [blockhash], or all transactions if omitted\n"
             "\nArguments:\n"
-            "1. \"blockhash\"   (string, optional) The block hash to list transactions since\n"
-            "2. target_confirmations:   (numeric, optional) The confirmations required, must be 1 or more\n"
+            "1. \"blockhash\"            (string, optional) The block hash to list transactions since\n"
+            "2. target_confirmations:    (numeric, optional) The confirmations required, must be 1 or more\n"
             "3. include_watchonly:       (bool, optional, default=false) Include transactions to watchonly addresses (see 'importaddress')"
             "\nResult:\n"
             "{\n"
@@ -1729,8 +1729,8 @@ UniValue gettransaction(const JSONRPCRequest& request)
             "gettransaction \"txid\" ( include_watchonly )\n"
             "\nGet detailed information about in-wallet transaction <txid>\n"
             "\nArguments:\n"
-            "1. \"txid\"    (string, required) The transaction id\n"
-            "2. \"include_watchonly\"   (bool, optional, default=false) Whether to include watchonly addresses in balance calculation and details[]\n"
+            "1. \"txid\"                  (string, required) The transaction id\n"
+            "2. \"include_watchonly\"     (bool, optional, default=false) Whether to include watchonly addresses in balance calculation and details[]\n"
             "\nResult:\n"
             "{\n"
             "  \"amount\" : x.xxx,        (numeric) The transaction amount in " + CURRENCY_UNIT + "\n"
@@ -2475,7 +2475,7 @@ UniValue fundrawtransaction(const JSONRPCRequest& request)
                             "Only pay-to-pubkey, multisig, and P2SH versions thereof are currently supported for watch-only\n"
                             "\nArguments:\n"
                             "1. \"hexstring\"           (string, required) The hex string of the raw transaction\n"
-                            "2. options               (object, optional)\n"
+                            "2. options                 (object, optional)\n"
                             "   {\n"
                             "     \"changeAddress\"     (string, optional, default pool address) The bitcoin address to receive the change\n"
                             "     \"changePosition\"    (numeric, optional, default random) The index of the change output\n"
@@ -2628,7 +2628,7 @@ static const CRPCCommand commands[] =
     { "wallet",             "listreceivedbyaccount",    &listreceivedbyaccount,    false,  {"minconf","include_empty","include_watchonly"} },
     { "wallet",             "listreceivedbyaddress",    &listreceivedbyaddress,    false,  {"minconf","include_empty","include_watchonly"} },
     { "wallet",             "listsinceblock",           &listsinceblock,           false,  {"blockhash","target_confirmations","include_watchonly"} },
-    { "wallet",             "listtransactions",         &listtransactions,         false,  {"account","count","from","include_watchonly"} },
+    { "wallet",             "listtransactions",         &listtransactions,         false,  {"account","count","skip","include_watchonly"} },
     { "wallet",             "listunspent",              &listunspent,              false,  {"minconf","maxconf","addresses"} },
     { "wallet",             "lockunspent",              &lockunspent,              true,   {"unlock","transactions"} },
     { "wallet",             "move",                     &movecmd,                  false,  {"fromaccount","toaccount","amount","minconf","comment"} },

From 68eb56203be17066af4e37837703490af4d4f40c Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Tue, 10 Jan 2017 11:51:20 +0000
Subject: [PATCH 1527/1802] qt: periodic translations update

---
 src/Makefile.qt.include              |    5 +-
 src/qt/bitcoin_locale.qrc            |    5 +-
 src/qt/bitcoinstrings.cpp            |    4 +-
 src/qt/locale/bitcoin_af.ts          |  697 ++++-
 src/qt/locale/bitcoin_af_ZA.ts       |  409 ++-
 src/qt/locale/bitcoin_ar.ts          |  883 ++++++-
 src/qt/locale/bitcoin_be_BY.ts       |  659 ++++-
 src/qt/locale/bitcoin_bg.ts          | 1055 +++++++-
 src/qt/locale/bitcoin_bg_BG.ts       |  195 +-
 src/qt/locale/bitcoin_ca.ts          | 1439 +++++++++--
 src/qt/locale/bitcoin_ca@valencia.ts | 1215 ++++++++-
 src/qt/locale/bitcoin_ca_ES.ts       | 1483 +++++++++--
 src/qt/locale/bitcoin_cs.ts          | 2033 +++++++++++++--
 src/qt/locale/bitcoin_cs_CZ.ts       |  300 ---
 src/qt/locale/bitcoin_cy.ts          |   75 +-
 src/qt/locale/bitcoin_da.ts          | 1845 +++++++++++--
 src/qt/locale/bitcoin_de.ts          | 1787 +++++++++++--
 src/qt/locale/bitcoin_el.ts          |   45 +-
 src/qt/locale/bitcoin_el_GR.ts       |  123 +-
 src/qt/locale/bitcoin_en.ts          |   46 +-
 src/qt/locale/bitcoin_en_GB.ts       |  303 ++-
 src/qt/locale/bitcoin_eo.ts          |  131 +-
 src/qt/locale/bitcoin_es.ts          | 1733 ++++++++++---
 src/qt/locale/bitcoin_es_AR.ts       |   43 +-
 src/qt/locale/bitcoin_es_CL.ts       |   84 +-
 src/qt/locale/bitcoin_es_CO.ts       |   47 +-
 src/qt/locale/bitcoin_es_DO.ts       |  107 +-
 src/qt/locale/bitcoin_es_ES.ts       | 3580 +++++++++++++++++++++++++-
 src/qt/locale/bitcoin_es_MX.ts       |   71 +-
 src/qt/locale/bitcoin_es_UY.ts       |   65 +-
 src/qt/locale/bitcoin_es_VE.ts       |   87 +-
 src/qt/locale/bitcoin_et.ts          |  883 ++++++-
 src/qt/locale/bitcoin_et_EE.ts       |  747 ++++++
 src/qt/locale/bitcoin_eu_ES.ts       |  481 +++-
 src/qt/locale/bitcoin_fa.ts          |  467 +++-
 src/qt/locale/bitcoin_fa_IR.ts       |   61 +-
 src/qt/locale/bitcoin_fi.ts          |  385 ++-
 src/qt/locale/bitcoin_fr.ts          | 2009 ++++++++++++---
 src/qt/locale/bitcoin_fr_CA.ts       |   45 +-
 src/qt/locale/bitcoin_fr_FR.ts       |  123 +-
 src/qt/locale/bitcoin_gl.ts          |  105 +-
 src/qt/locale/bitcoin_he.ts          |  235 +-
 src/qt/locale/bitcoin_hi_IN.ts       |   53 +-
 src/qt/locale/bitcoin_hr.ts          |  133 +-
 src/qt/locale/bitcoin_hu.ts          |  167 +-
 src/qt/locale/bitcoin_id_ID.ts       |  139 +-
 src/qt/locale/bitcoin_it.ts          |  587 ++++-
 src/qt/locale/bitcoin_it_IT.ts       |   49 +-
 src/qt/locale/bitcoin_ja.ts          | 1785 +++++++++++--
 src/qt/locale/bitcoin_ka.ts          |  115 +-
 src/qt/locale/bitcoin_kk_KZ.ts       |   83 +-
 src/qt/locale/bitcoin_ko_KR.ts       |  877 ++++++-
 src/qt/locale/bitcoin_ku_IQ.ts       |  149 +-
 src/qt/locale/bitcoin_ky.ts          |  105 +-
 src/qt/locale/bitcoin_la.ts          |   77 +-
 src/qt/locale/bitcoin_lt.ts          |   77 +-
 src/qt/locale/bitcoin_lv_LV.ts       |   99 +-
 src/qt/locale/bitcoin_mk_MK.ts       |   87 +-
 src/qt/locale/bitcoin_mn.ts          |   57 +-
 src/qt/locale/bitcoin_ms_MY.ts       |   48 +-
 src/qt/locale/bitcoin_nb.ts          |  231 +-
 src/qt/locale/bitcoin_ne.ts          |  555 ++++
 src/qt/locale/bitcoin_nl.ts          | 1301 +++++++++-
 src/qt/locale/bitcoin_pam.ts         |   69 +-
 src/qt/locale/bitcoin_pl.ts          |  709 ++++-
 src/qt/locale/bitcoin_pt_BR.ts       | 1849 +++++++++++--
 src/qt/locale/bitcoin_pt_PT.ts       |  215 +-
 src/qt/locale/bitcoin_ro.ts          |  641 ++++-
 src/qt/locale/bitcoin_ro_RO.ts       |  175 +-
 src/qt/locale/bitcoin_ru.ts          | 1797 +++++++++++--
 src/qt/locale/bitcoin_ru_RU.ts       |   61 +-
 src/qt/locale/bitcoin_sk.ts          |  397 ++-
 src/qt/locale/bitcoin_sl_SI.ts       |  201 +-
 src/qt/locale/bitcoin_sq.ts          |  395 ++-
 src/qt/locale/bitcoin_sr.ts          |   67 +-
 src/qt/locale/bitcoin_sr@latin.ts    |  257 +-
 src/qt/locale/bitcoin_sv.ts          |  432 +++-
 src/qt/locale/bitcoin_ta.ts          |  109 +-
 src/qt/locale/bitcoin_th_TH.ts       |   95 +-
 src/qt/locale/bitcoin_tr.ts          |  365 ++-
 src/qt/locale/bitcoin_tr_TR.ts       |   43 +-
 src/qt/locale/bitcoin_uk.ts          |  183 +-
 src/qt/locale/bitcoin_ur_PK.ts       |   45 +-
 src/qt/locale/bitcoin_uz@Cyrl.ts     |  115 +-
 src/qt/locale/bitcoin_vi.ts          |   43 +-
 src/qt/locale/bitcoin_vi_VN.ts       |  623 ++++-
 src/qt/locale/bitcoin_zh.ts          |   71 +-
 src/qt/locale/bitcoin_zh_CN.ts       | 1883 ++++++++++++--
 src/qt/locale/bitcoin_zh_HK.ts       |   43 +-
 src/qt/locale/bitcoin_zh_TW.ts       | 1865 +++++++++++---
 90 files changed, 39196 insertions(+), 6421 deletions(-)
 delete mode 100644 src/qt/locale/bitcoin_cs_CZ.ts
 create mode 100644 src/qt/locale/bitcoin_et_EE.ts
 create mode 100644 src/qt/locale/bitcoin_ne.ts

diff --git a/src/Makefile.qt.include b/src/Makefile.qt.include
index 64ba78665a469..7ae42e83b1374 100644
--- a/src/Makefile.qt.include
+++ b/src/Makefile.qt.include
@@ -11,12 +11,11 @@ QT_TS = \
   qt/locale/bitcoin_af_ZA.ts \
   qt/locale/bitcoin_ar.ts \
   qt/locale/bitcoin_be_BY.ts \
-  qt/locale/bitcoin_bg.ts \
   qt/locale/bitcoin_bg_BG.ts \
+  qt/locale/bitcoin_bg.ts \
   qt/locale/bitcoin_ca_ES.ts \
   qt/locale/bitcoin_ca.ts \
   qt/locale/bitcoin_ca@valencia.ts \
-  qt/locale/bitcoin_cs_CZ.ts \
   qt/locale/bitcoin_cs.ts \
   qt/locale/bitcoin_cy.ts \
   qt/locale/bitcoin_da.ts \
@@ -35,6 +34,7 @@ QT_TS = \
   qt/locale/bitcoin_es.ts \
   qt/locale/bitcoin_es_UY.ts \
   qt/locale/bitcoin_es_VE.ts \
+  qt/locale/bitcoin_et_EE.ts \
   qt/locale/bitcoin_et.ts \
   qt/locale/bitcoin_eu_ES.ts \
   qt/locale/bitcoin_fa_IR.ts \
@@ -64,6 +64,7 @@ QT_TS = \
   qt/locale/bitcoin_mn.ts \
   qt/locale/bitcoin_ms_MY.ts \
   qt/locale/bitcoin_nb.ts \
+  qt/locale/bitcoin_ne.ts \
   qt/locale/bitcoin_nl.ts \
   qt/locale/bitcoin_pam.ts \
   qt/locale/bitcoin_pl.ts \
diff --git a/src/qt/bitcoin_locale.qrc b/src/qt/bitcoin_locale.qrc
index 8dd07c3d41777..f195b23d818f0 100644
--- a/src/qt/bitcoin_locale.qrc
+++ b/src/qt/bitcoin_locale.qrc
@@ -4,12 +4,11 @@
         <file alias="af_ZA">locale/bitcoin_af_ZA.qm</file>
         <file alias="ar">locale/bitcoin_ar.qm</file>
         <file alias="be_BY">locale/bitcoin_be_BY.qm</file>
-        <file alias="bg">locale/bitcoin_bg.qm</file>
         <file alias="bg_BG">locale/bitcoin_bg_BG.qm</file>
+        <file alias="bg">locale/bitcoin_bg.qm</file>
         <file alias="ca_ES">locale/bitcoin_ca_ES.qm</file>
         <file alias="ca">locale/bitcoin_ca.qm</file>
         <file alias="ca@valencia">locale/bitcoin_ca@valencia.qm</file>
-        <file alias="cs_CZ">locale/bitcoin_cs_CZ.qm</file>
         <file alias="cs">locale/bitcoin_cs.qm</file>
         <file alias="cy">locale/bitcoin_cy.qm</file>
         <file alias="da">locale/bitcoin_da.qm</file>
@@ -28,6 +27,7 @@
         <file alias="es">locale/bitcoin_es.qm</file>
         <file alias="es_UY">locale/bitcoin_es_UY.qm</file>
         <file alias="es_VE">locale/bitcoin_es_VE.qm</file>
+        <file alias="et_EE">locale/bitcoin_et_EE.qm</file>
         <file alias="et">locale/bitcoin_et.qm</file>
         <file alias="eu_ES">locale/bitcoin_eu_ES.qm</file>
         <file alias="fa_IR">locale/bitcoin_fa_IR.qm</file>
@@ -57,6 +57,7 @@
         <file alias="mn">locale/bitcoin_mn.qm</file>
         <file alias="ms_MY">locale/bitcoin_ms_MY.qm</file>
         <file alias="nb">locale/bitcoin_nb.qm</file>
+        <file alias="ne">locale/bitcoin_ne.qm</file>
         <file alias="nl">locale/bitcoin_nl.qm</file>
         <file alias="pam">locale/bitcoin_pam.qm</file>
         <file alias="pl">locale/bitcoin_pl.qm</file>
diff --git a/src/qt/bitcoinstrings.cpp b/src/qt/bitcoinstrings.cpp
index ace085382b240..348e7378ab449 100644
--- a/src/qt/bitcoinstrings.cpp
+++ b/src/qt/bitcoinstrings.cpp
@@ -191,7 +191,9 @@ QT_TRANSLATE_NOOP("bitcoin-core", ""
 QT_TRANSLATE_NOOP("bitcoin-core", ""
 "Username and hashed password for JSON-RPC connections. The field <userpw> "
 "comes in the format: <USERNAME>:<SALT>$<HASH>. A canonical python script is "
-"included in share/rpcuser. This option can be specified multiple times"),
+"included in share/rpcuser. The client then connects normally using the "
+"rpcuser=<USERNAME>/rpcpassword=<PASSWORD> pair of arguments. This option can "
+"be specified multiple times"),
 QT_TRANSLATE_NOOP("bitcoin-core", ""
 "Wallet will not create transactions that violate mempool chain limits "
 "(default: %u)"),
diff --git a/src/qt/locale/bitcoin_af.ts b/src/qt/locale/bitcoin_af.ts
index 97ada8dd5c63a..8cbf5aadc5138 100644
--- a/src/qt/locale/bitcoin_af.ts
+++ b/src/qt/locale/bitcoin_af.ts
@@ -21,6 +21,10 @@
         <source>&amp;Copy</source>
         <translation>&amp;Dupliseer</translation>
     </message>
+    <message>
+        <source>C&amp;lose</source>
+        <translation>S&amp;luit</translation>
+    </message>
     <message>
         <source>Delete the currently selected address from the list</source>
         <translation>Verwyder die adres wat u gekies het van die lys</translation>
@@ -37,6 +41,73 @@
         <source>&amp;Delete</source>
         <translation>&amp;Vee uit</translation>
     </message>
+    <message>
+        <source>Choose the address to send coins to</source>
+        <translation>Kies die adres waarheen u munte wil stuur</translation>
+    </message>
+    <message>
+        <source>Choose the address to receive coins with</source>
+        <translation>Kies die adres wat die munte moet ontvang</translation>
+    </message>
+    <message>
+        <source>C&amp;hoose</source>
+        <translation>K&amp;ies</translation>
+    </message>
+    <message>
+        <source>Sending addresses</source>
+        <translation>Stuurders adresse</translation>
+    </message>
+    <message>
+        <source>Receiving addresses</source>
+        <translation>Ontvanger adresse</translation>
+    </message>
+    <message>
+        <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source>
+        <translation>Hierdie is die adresse vanwaar u Bitcoin betalings stuur. U moet altyd die bedrag en die adres van die ontvanger nagaan voordat u enige munte stuur.</translation>
+    </message>
+    <message>
+        <source>These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source>
+        <translation>Hierdie is die adresse waar u Bitcoins sal ontvang. Ons beveel aan dat u 'n nuwe adres kies vir elke transaksie</translation>
+    </message>
+    <message>
+        <source>&amp;Copy Address</source>
+        <translation>&amp;Dupliseer Adres</translation>
+    </message>
+    <message>
+        <source>&amp;Edit</source>
+        <translation>&amp;Verander</translation>
+    </message>
+    <message>
+        <source>Export Address List</source>
+        <translation>Voer adreslys uit</translation>
+    </message>
+    <message>
+        <source>Comma separated file (*.csv)</source>
+        <translation>Comma separated file (*.csv)</translation>
+    </message>
+    <message>
+        <source>Exporting Failed</source>
+        <translation>Uitvoer was onsuksesvol</translation>
+    </message>
+    <message>
+        <source>There was an error trying to save the address list to %1. Please try again.</source>
+        <translation>Die adreslys kon nie in %1  gestoor word nie.  Probeer asseblief weer.</translation>
+    </message>
+</context>
+<context>
+    <name>AddressTableModel</name>
+    <message>
+        <source>Label</source>
+        <translation>Merk</translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation>Adres</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(geen etiket)</translation>
+    </message>
 </context>
 <context>
     <name>AskPassphraseDialog</name>
@@ -56,6 +127,82 @@
         <source>Repeat new passphrase</source>
         <translation>Herhaal nuwe wagwoord</translation>
     </message>
+    <message>
+        <source>Enter the new passphrase to the wallet.&lt;br/&gt;Please use a passphrase of &lt;b&gt;ten or more random characters&lt;/b&gt;, or &lt;b&gt;eight or more words&lt;/b&gt;.</source>
+        <translation>Tik die nuwe wagwoord vir u beursie.&lt;br/&gt;Gerbuik asseblief 'n wagwoord met &lt;b&gt;tien of meer lukrake karakters&lt;/b&gt;, of &lt;b&gt;agt of meer woorde&lt;/b&gt;.</translation>
+    </message>
+    <message>
+        <source>Encrypt wallet</source>
+        <translation>Kodifiseer beursie</translation>
+    </message>
+    <message>
+        <source>This operation needs your wallet passphrase to unlock the wallet.</source>
+        <translation>U het u beursie se wagwoord nodig om toegang tot u beursie te verkry.</translation>
+    </message>
+    <message>
+        <source>Unlock wallet</source>
+        <translation>Sluit beursie oop</translation>
+    </message>
+    <message>
+        <source>This operation needs your wallet passphrase to decrypt the wallet.</source>
+        <translation>U het u beursie se wagwoord nodig om u beursie se kode te ontsyfer.</translation>
+    </message>
+    <message>
+        <source>Decrypt wallet</source>
+        <translation>Ontsleutel beursie</translation>
+    </message>
+    <message>
+        <source>Change passphrase</source>
+        <translation>Verander wagwoord</translation>
+    </message>
+    <message>
+        <source>Enter the old passphrase and new passphrase to the wallet.</source>
+        <translation>Tik die ou en die nuwe wagwoorde vir die beursie.</translation>
+    </message>
+    <message>
+        <source>Confirm wallet encryption</source>
+        <translation>Bevestig dat die beursie gekodifiseer is</translation>
+    </message>
+    <message>
+        <source>Warning: If you encrypt your wallet and lose your passphrase, you will &lt;b&gt;LOSE ALL OF YOUR BITCOINS&lt;/b&gt;!</source>
+        <translation>Waarskuwing: Indien u die beursie kodifiseer en u vergeet u wagwoord &lt;b&gt;VERLOOR U AL U BITCOINS&lt;/b&gt;!</translation>
+    </message>
+    <message>
+        <source>Are you sure you wish to encrypt your wallet?</source>
+        <translation>Is u seker dat u die beursie wil kodifiseer?</translation>
+    </message>
+    <message>
+        <source>Wallet encrypted</source>
+        <translation>Beursie gekodifiseer</translation>
+    </message>
+    <message>
+        <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source>
+        <translation>BELANGRIK:  Alle vorige kopieë en rugsteun-weergawes wat u tevore van die gemaak het, moet vervang word met die jongste weergawe van u nuutste gekodifiseerde beursie.  Alle vorige weergawes en rugsteun-kopieë van u beursie sal nutteloos raak die oomblik wat u die nuut-gekodifiseerde beursie begin gebruik.</translation>
+    </message>
+    <message>
+        <source>Wallet encryption failed</source>
+        <translation>Kodifikasie was onsuksesvol</translation>
+    </message>
+    <message>
+        <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
+        <translation>Weens 'n interne fout het kodifikasie het nie geslaag nie.  U beursie is nie gekodifiseer nie</translation>
+    </message>
+    <message>
+        <source>The supplied passphrases do not match.</source>
+        <translation>Die wagwoorde stem nie ooreen nie.</translation>
+    </message>
+    <message>
+        <source>Wallet unlock failed</source>
+        <translation>Die beursie is nie oopgesluit nie</translation>
+    </message>
+    <message>
+        <source>The passphrase entered for the wallet decryption was incorrect.</source>
+        <translation>U het die verkeerde wagwoord ingetik.</translation>
+    </message>
+    <message>
+        <source>Warning: The Caps Lock key is on!</source>
+        <translation>WAARSKUWING:  Outomatiese Kapitalisering is aktief op u sleutelbord!</translation>
+    </message>
 </context>
 <context>
     <name>BanTableModel</name>
@@ -86,14 +233,42 @@
         <source>&amp;Transactions</source>
         <translation>&amp;Transaksies</translation>
     </message>
+    <message>
+        <source>Browse transaction history</source>
+        <translation>Blaai deur transaksiegeskiedenis</translation>
+    </message>
+    <message>
+        <source>E&amp;xit</source>
+        <translation>&amp;Sluit</translation>
+    </message>
     <message>
         <source>Quit application</source>
         <translation>Stop en verlaat die applikasie</translation>
     </message>
+    <message>
+        <source>&amp;About %1</source>
+        <translation>&amp;Oor %1</translation>
+    </message>
+    <message>
+        <source>Show information about %1</source>
+        <translation>Wys inligting oor %1</translation>
+    </message>
+    <message>
+        <source>About &amp;Qt</source>
+        <translation>Oor &amp;Qt</translation>
+    </message>
+    <message>
+        <source>Show information about Qt</source>
+        <translation>Wys inligting oor Qt</translation>
+    </message>
     <message>
         <source>&amp;Options...</source>
         <translation>&amp;Opsies</translation>
     </message>
+    <message>
+        <source>Modify configuration options for %1</source>
+        <translation>Verander konfigurasie-opsies vir %1</translation>
+    </message>
     <message>
         <source>&amp;Encrypt Wallet...</source>
         <translation>&amp;Kodifiseer Beursie</translation>
@@ -150,6 +325,10 @@
         <source>&amp;Receive</source>
         <translation>&amp;Ontvang</translation>
     </message>
+    <message>
+        <source>&amp;Show / Hide</source>
+        <translation>&amp;Wys / Versteek</translation>
+    </message>
     <message>
         <source>Show or hide the main Window</source>
         <translation>Wys of versteek die hoofbladsy</translation>
@@ -166,10 +345,18 @@
         <source>Verify messages to ensure they were signed with specified Bitcoin addresses</source>
         <translation>Verifieër boodskappe om seker te maak dat dit met die gespesifiseerde Bitcoin adresse</translation>
     </message>
+    <message>
+        <source>&amp;File</source>
+        <translation>&amp;Leër</translation>
+    </message>
     <message>
         <source>&amp;Help</source>
         <translation>&amp;Help</translation>
     </message>
+    <message>
+        <source>Tabs toolbar</source>
+        <translation>Orebalk</translation>
+    </message>
     <message>
         <source>Request payments (generates QR codes and bitcoin: URIs)</source>
         <translation>Versoek betalings (genereer QR-kodes en bitcoin: URI's)</translation>
@@ -186,52 +373,458 @@
         <source>Open a bitcoin: URI or payment request</source>
         <translation>Skep 'n bitcoin: URI of betalingsversoek</translation>
     </message>
+    <message>
+        <source>Indexing blocks on disk...</source>
+        <translation>Blokke op skyf word geïndekseer...</translation>
+    </message>
+    <message>
+        <source>Processing blocks on disk...</source>
+        <translation>Blokke op skyf word geprosesseer...</translation>
+    </message>
+    <message>
+        <source>No block source available...</source>
+        <translation>Geen blokbron beskikbaar...</translation>
+    </message>
+    <message>
+        <source>%1 behind</source>
+        <translation>%1 agter</translation>
+    </message>
+    <message>
+        <source>Last received block was generated %1 ago.</source>
+        <translation>Laaste ontvange blok is %1 gelede gegenereer.</translation>
+    </message>
+    <message>
+        <source>Transactions after this will not yet be visible.</source>
+        <translation>Transaksies hierna sal nog nie sigbaar wees nie.</translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation>Fout</translation>
+    </message>
+    <message>
+        <source>Warning</source>
+        <translation>Waarskuwing</translation>
+    </message>
+    <message>
+        <source>Information</source>
+        <translation>Inligting</translation>
+    </message>
+    <message>
+        <source>Up to date</source>
+        <translation>Op datum</translation>
+    </message>
+    <message>
+        <source>Catching up...</source>
+        <translation>Word op datum gebring...</translation>
+    </message>
+    <message>
+        <source>Date: %1
+</source>
+        <translation>Datum: %1
+</translation>
+    </message>
+    <message>
+        <source>Address: %1
+</source>
+        <translation>Adres: %1
+</translation>
+    </message>
+    <message>
+        <source>Sent transaction</source>
+        <translation>Gestuurde transaksie</translation>
+    </message>
+    <message>
+        <source>Incoming transaction</source>
+        <translation>Inkomende transaksie</translation>
+    </message>
     </context>
 <context>
     <name>CoinControlDialog</name>
+    <message>
+        <source>Bytes:</source>
+        <translation>Grepe:</translation>
+    </message>
+    <message>
+        <source>Fee:</source>
+        <translation>Fooi:</translation>
+    </message>
+    <message>
+        <source>Dust:</source>
+        <translation>Stof:</translation>
+    </message>
+    <message>
+        <source>After Fee:</source>
+        <translation>Na Fooi:</translation>
+    </message>
+    <message>
+        <source>(un)select all</source>
+        <translation>(de)selekteer alle</translation>
+    </message>
+    <message>
+        <source>List mode</source>
+        <translation>Lysmodus</translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation>Datum</translation>
+    </message>
+    <message>
+        <source>Confirmations</source>
+        <translation>Bevestigings</translation>
+    </message>
+    <message>
+        <source>Confirmed</source>
+        <translation>Bevestig</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(geen etiket)</translation>
+    </message>
     </context>
 <context>
     <name>EditAddressDialog</name>
+    <message>
+        <source>Edit Address</source>
+        <translation>Wysig Adres</translation>
+    </message>
     </context>
 <context>
     <name>FreespaceChecker</name>
+    <message>
+        <source>name</source>
+        <translation>naam</translation>
+    </message>
     </context>
 <context>
     <name>HelpMessageDialog</name>
-    </context>
+    <message>
+        <source>version</source>
+        <translation>weergawe</translation>
+    </message>
+    <message>
+        <source>About %1</source>
+        <translation>Ongeveer %1</translation>
+    </message>
+    <message>
+        <source>UI Options:</source>
+        <translation>Gebruikerkoppelvlakopsies:</translation>
+    </message>
+    <message>
+        <source>Start minimized</source>
+        <translation>Begin geminimeer</translation>
+    </message>
+    <message>
+        <source>Reset all settings changed in the GUI</source>
+        <translation>Alle instellings wat in die grafiese gebruikerkoppelvlak gewysig is, terugstel</translation>
+    </message>
+</context>
 <context>
     <name>Intro</name>
+    <message>
+        <source>Welcome</source>
+        <translation>Welkom</translation>
+    </message>
+    <message>
+        <source>Welcome to %1.</source>
+        <translation>Welkom by %1.</translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation>Fout</translation>
+    </message>
+    </context>
+<context>
+    <name>ModalOverlay</name>
+    <message>
+        <source>Hide</source>
+        <translation>Versteek</translation>
+    </message>
     </context>
 <context>
     <name>OpenURIDialog</name>
     </context>
 <context>
     <name>OptionsDialog</name>
+    <message>
+        <source>Options</source>
+        <translation>Opsies</translation>
+    </message>
+    <message>
+        <source>MB</source>
+        <translation>MG</translation>
+    </message>
+    <message>
+        <source>Accept connections from outside</source>
+        <translation>Verbindings van buite toelaat</translation>
+    </message>
+    <message>
+        <source>Allow incoming connections</source>
+        <translation>Inkomende verbindings toelaat</translation>
+    </message>
+    <message>
+        <source>Reset all client options to default.</source>
+        <translation>Alle kliëntopsies na verstek terugstel.</translation>
+    </message>
+    <message>
+        <source>Expert</source>
+        <translation>Kenner</translation>
+    </message>
+    <message>
+        <source>IPv6</source>
+        <translation>IPv6</translation>
+    </message>
+    <message>
+        <source>Tor</source>
+        <translation>Tor</translation>
+    </message>
+    <message>
+        <source>default</source>
+        <translation>verstek</translation>
+    </message>
+    <message>
+        <source>none</source>
+        <translation>geen</translation>
+    </message>
+    <message>
+        <source>Confirm options reset</source>
+        <translation>Bevestig terugstel van opsies</translation>
+    </message>
+    <message>
+        <source>Client restart required to activate changes.</source>
+        <translation>Kliënt moet herbegin word om veranderinge te aktiveer.</translation>
+    </message>
     </context>
 <context>
     <name>OverviewPage</name>
+    <message>
+        <source>Available:</source>
+        <translation>Beskikbaar:</translation>
+    </message>
+    <message>
+        <source>Pending:</source>
+        <translation>Hangend:</translation>
+    </message>
+    <message>
+        <source>Immature:</source>
+        <translation>Onvolwasse:</translation>
+    </message>
+    <message>
+        <source>Balances</source>
+        <translation>Balanse</translation>
+    </message>
+    <message>
+        <source>Total:</source>
+        <translation>Totaal:</translation>
+    </message>
+    <message>
+        <source>Your current total balance</source>
+        <translation>U huidige totale balans</translation>
+    </message>
+    <message>
+        <source>Spendable:</source>
+        <translation>Besteebaar:</translation>
+    </message>
+    <message>
+        <source>Recent transactions</source>
+        <translation>Onlangse transaksies</translation>
+    </message>
+    </context>
+<context>
+    <name>PaymentServer</name>
     </context>
 <context>
     <name>PeerTableModel</name>
+    <message>
+        <source>User Agent</source>
+        <translation>Gebruikeragent</translation>
+    </message>
     </context>
 <context>
     <name>QObject</name>
+    <message>
+        <source>%1 d</source>
+        <translation>%1 d</translation>
+    </message>
+    <message>
+        <source>%1 h</source>
+        <translation>%1 u</translation>
+    </message>
+    <message>
+        <source>%1 m</source>
+        <translation>%1 m</translation>
+    </message>
+    <message>
+        <source>%1 s</source>
+        <translation>%1 s</translation>
+    </message>
+    <message>
+        <source>None</source>
+        <translation>Geen</translation>
+    </message>
+    <message>
+        <source>N/A</source>
+        <translation>n.v.t.</translation>
+    </message>
+    <message>
+        <source>%1 ms</source>
+        <translation>%1 ms</translation>
+    </message>
+    <message>
+        <source>%1 and %2</source>
+        <translation>%1 en %2</translation>
+    </message>
+    </context>
+<context>
+    <name>QObject::QObject</name>
+    </context>
+<context>
+    <name>QRImageWidget</name>
     </context>
 <context>
     <name>RPCConsole</name>
+    <message>
+        <source>N/A</source>
+        <translation>n.v.t.</translation>
+    </message>
+    <message>
+        <source>Client version</source>
+        <translation>Kliëntweergawe</translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>Algemeen</translation>
+    </message>
+    <message>
+        <source>Network</source>
+        <translation>Netwerk</translation>
+    </message>
+    <message>
+        <source>Name</source>
+        <translation>Naam</translation>
+    </message>
+    <message>
+        <source>Number of connections</source>
+        <translation>Aantal verbindings</translation>
+    </message>
+    <message>
+        <source>Block chain</source>
+        <translation>Blokketting</translation>
+    </message>
+    <message>
+        <source>Current number of blocks</source>
+        <translation>Huidige aantal blokke</translation>
+    </message>
+    <message>
+        <source>Received</source>
+        <translation>Ontvang</translation>
+    </message>
+    <message>
+        <source>Sent</source>
+        <translation>Gestuur</translation>
+    </message>
+    <message>
+        <source>Banned peers</source>
+        <translation>Verbanne porture</translation>
+    </message>
+    <message>
+        <source>Whitelisted</source>
+        <translation>Gewitlys</translation>
+    </message>
+    <message>
+        <source>Direction</source>
+        <translation>Rigting</translation>
+    </message>
+    <message>
+        <source>Version</source>
+        <translation>Weergawe</translation>
+    </message>
+    <message>
+        <source>User Agent</source>
+        <translation>Gebruikeragent</translation>
+    </message>
     </context>
 <context>
     <name>ReceiveCoinsDialog</name>
     </context>
 <context>
     <name>ReceiveRequestDialog</name>
+    <message>
+        <source>Address</source>
+        <translation>Adres</translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation>Merk</translation>
+    </message>
     </context>
 <context>
-    <name>SendCoinsDialog</name>
+    <name>RecentRequestsTableModel</name>
+    <message>
+        <source>Date</source>
+        <translation>Datum</translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation>Merk</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(geen etiket)</translation>
+    </message>
     </context>
+<context>
+    <name>SendCoinsDialog</name>
+    <message>
+        <source>Bytes:</source>
+        <translation>Grepe:</translation>
+    </message>
+    <message>
+        <source>Fee:</source>
+        <translation>Fooi:</translation>
+    </message>
+    <message>
+        <source>After Fee:</source>
+        <translation>Na Fooi:</translation>
+    </message>
+    <message>
+        <source>Transaction Fee:</source>
+        <translation>Transaksiefooi:</translation>
+    </message>
+    <message>
+        <source>Choose...</source>
+        <translation>Kies...</translation>
+    </message>
+    <message>
+        <source>per kilobyte</source>
+        <translation>per kilogreep</translation>
+    </message>
+    <message>
+        <source>Hide</source>
+        <translation>Versteek</translation>
+    </message>
+    <message>
+        <source>total at least</source>
+        <translation>totaal ten minste</translation>
+    </message>
+    <message>
+        <source>Dust:</source>
+        <translation>Stof:</translation>
+    </message>
+    <message>
+        <source>Balance:</source>
+        <translation>Balans:</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(geen etiket)</translation>
+    </message>
+</context>
 <context>
     <name>SendCoinsEntry</name>
     </context>
+<context>
+    <name>SendConfirmationDialog</name>
+    </context>
 <context>
     <name>ShutdownWindow</name>
     </context>
@@ -244,21 +837,119 @@
 <context>
     <name>TrafficGraphWidget</name>
     </context>
+<context>
+    <name>TransactionDesc</name>
+    <message>
+        <source>Date</source>
+        <translation>Datum</translation>
+    </message>
+    </context>
 <context>
     <name>TransactionDescDialog</name>
     </context>
+<context>
+    <name>TransactionTableModel</name>
+    <message>
+        <source>Date</source>
+        <translation>Datum</translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation>Merk</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(geen etiket)</translation>
+    </message>
+    </context>
+<context>
+    <name>TransactionView</name>
+    <message>
+        <source>Comma separated file (*.csv)</source>
+        <translation>Comma separated file (*.csv)</translation>
+    </message>
+    <message>
+        <source>Confirmed</source>
+        <translation>Bevestig</translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation>Datum</translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation>Merk</translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation>Adres</translation>
+    </message>
+    <message>
+        <source>Exporting Failed</source>
+        <translation>Uitvoer was onsuksesvol</translation>
+    </message>
+    </context>
 <context>
     <name>UnitDisplayStatusBarControl</name>
     </context>
+<context>
+    <name>WalletFrame</name>
+    </context>
+<context>
+    <name>WalletModel</name>
+    </context>
+<context>
+    <name>WalletView</name>
+    <message>
+        <source>&amp;Export</source>
+        <translation>&amp;Voer uit</translation>
+    </message>
+    <message>
+        <source>Export the data in the current tab to a file</source>
+        <translation>Voer die inligting op hierdie bladsy uit na 'n leer</translation>
+    </message>
+    </context>
 <context>
     <name>bitcoin-core</name>
     <message>
         <source>Bitcoin Core</source>
         <translation>Bitcoin Kern</translation>
     </message>
+    <message>
+        <source>Information</source>
+        <translation>Inligting</translation>
+    </message>
+    <message>
+        <source>Warning</source>
+        <translation>Waarskuwing</translation>
+    </message>
     <message>
         <source>Do not keep transactions in the mempool longer than &lt;n&gt; hours (default: %u)</source>
         <translation>Moenie transaksies vir langer as &lt;n&gt; ure in die geheuepoel hou nie (verstek: %u)</translation>
     </message>
-    </context>
+    <message>
+        <source>Insufficient funds</source>
+        <translation>Onvoldoende fondse</translation>
+    </message>
+    <message>
+        <source>Loading block index...</source>
+        <translation>Blokindeks word gelaai...</translation>
+    </message>
+    <message>
+        <source>Loading wallet...</source>
+        <translation>Beursie word gelaai...</translation>
+    </message>
+    <message>
+        <source>Rescanning...</source>
+        <translation>Word herskandeer...</translation>
+    </message>
+    <message>
+        <source>Done loading</source>
+        <translation>Klaar met laai</translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation>Fout</translation>
+    </message>
+</context>
 </TS>
\ No newline at end of file
diff --git a/src/qt/locale/bitcoin_af_ZA.ts b/src/qt/locale/bitcoin_af_ZA.ts
index e553fc775936f..1db5008384f9d 100644
--- a/src/qt/locale/bitcoin_af_ZA.ts
+++ b/src/qt/locale/bitcoin_af_ZA.ts
@@ -13,6 +13,21 @@
         <source>&amp;Delete</source>
         <translation>&amp;Verwyder</translation>
     </message>
+    </context>
+<context>
+    <name>AddressTableModel</name>
+    <message>
+        <source>Label</source>
+        <translation>Etiket</translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation>Adres</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(geen etiket)</translation>
+    </message>
 </context>
 <context>
     <name>AskPassphraseDialog</name>
@@ -32,7 +47,71 @@
         <source>Repeat new passphrase</source>
         <translation>Herhaal nuwe wagfrase</translation>
     </message>
-</context>
+    <message>
+        <source>Encrypt wallet</source>
+        <translation>Enkripteer beursie</translation>
+    </message>
+    <message>
+        <source>This operation needs your wallet passphrase to unlock the wallet.</source>
+        <translation>Hierdie operasie benodig 'n wagwoord om die beursie oop te sluit.</translation>
+    </message>
+    <message>
+        <source>Unlock wallet</source>
+        <translation>Sluit beursie oop</translation>
+    </message>
+    <message>
+        <source>This operation needs your wallet passphrase to decrypt the wallet.</source>
+        <translation>Hierdie operasie benodig 'n wagwoord om die beursie oop te sluit.</translation>
+    </message>
+    <message>
+        <source>Decrypt wallet</source>
+        <translation>Sluit beursie oop</translation>
+    </message>
+    <message>
+        <source>Change passphrase</source>
+        <translation>Verander wagfrase</translation>
+    </message>
+    <message>
+        <source>Enter the old passphrase and new passphrase to the wallet.</source>
+        <translation>Tik in die ou wagfrase en die nuwe wagfrase vir die beursie.</translation>
+    </message>
+    <message>
+        <source>Confirm wallet encryption</source>
+        <translation>Bevestig beursie enkripsie.</translation>
+    </message>
+    <message>
+        <source>Wallet encrypted</source>
+        <translation>Die beursie is nou bewaak</translation>
+    </message>
+    <message>
+        <source>Wallet encryption failed</source>
+        <translation>Die beursie kon nie bewaak word nie</translation>
+    </message>
+    <message>
+        <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
+        <translation>Beursie bewaaking het misluk as gevolg van 'n interne fout. Die beursie is nie bewaak nie!</translation>
+    </message>
+    <message>
+        <source>The supplied passphrases do not match.</source>
+        <translation>Die wagfrase stem nie ooreen nie</translation>
+    </message>
+    <message>
+        <source>Wallet unlock failed</source>
+        <translation>Beursie oopsluiting het misluk</translation>
+    </message>
+    <message>
+        <source>The passphrase entered for the wallet decryption was incorrect.</source>
+        <translation>Die wagfrase wat ingetik was om die beursie oop te sluit, was verkeerd.</translation>
+    </message>
+    <message>
+        <source>Wallet decryption failed</source>
+        <translation>Beursie dekripsie het misluk</translation>
+    </message>
+    <message>
+        <source>Wallet passphrase was successfully changed.</source>
+        <translation>Die beursie se wagfrase verandering was suksesvol.</translation>
+    </message>
+    </context>
 <context>
     <name>BanTableModel</name>
     </context>
@@ -129,6 +208,18 @@
         <source>Date</source>
         <translation>Datum</translation>
     </message>
+    <message>
+        <source>Copy address</source>
+        <translation>Maak kopie van adres</translation>
+    </message>
+    <message>
+        <source>Copy amount</source>
+        <translation>Kopieer bedrag</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(geen etiket)</translation>
+    </message>
     </context>
 <context>
     <name>EditAddressDialog</name>
@@ -140,7 +231,27 @@
         <source>&amp;Address</source>
         <translation>&amp;Adres</translation>
     </message>
-</context>
+    <message>
+        <source>New receiving address</source>
+        <translation>Nuwe ontvangende adres</translation>
+    </message>
+    <message>
+        <source>New sending address</source>
+        <translation>Nuwe stuurende adres</translation>
+    </message>
+    <message>
+        <source>Edit receiving address</source>
+        <translation>Wysig ontvangende adres</translation>
+    </message>
+    <message>
+        <source>Edit sending address</source>
+        <translation>Wysig stuurende adres</translation>
+    </message>
+    <message>
+        <source>Could not unlock wallet.</source>
+        <translation>Kon nie die beursie oopsluit nie.</translation>
+    </message>
+    </context>
 <context>
     <name>FreespaceChecker</name>
     </context>
@@ -158,6 +269,13 @@
         <translation>Fout</translation>
     </message>
     </context>
+<context>
+    <name>ModalOverlay</name>
+    <message>
+        <source>Form</source>
+        <translation>Vorm</translation>
+    </message>
+    </context>
 <context>
     <name>OpenURIDialog</name>
     </context>
@@ -179,6 +297,9 @@
         <translation>Vorm</translation>
     </message>
     </context>
+<context>
+    <name>PaymentServer</name>
+    </context>
 <context>
     <name>PeerTableModel</name>
     </context>
@@ -189,6 +310,12 @@
         <translation>Bedrag</translation>
     </message>
     </context>
+<context>
+    <name>QObject::QObject</name>
+    </context>
+<context>
+    <name>QRImageWidget</name>
+    </context>
 <context>
     <name>RPCConsole</name>
     <message>
@@ -206,9 +333,48 @@
         <source>&amp;Message:</source>
         <translation>&amp;Boodskap:</translation>
     </message>
-    </context>
+    <message>
+        <source>Copy amount</source>
+        <translation>Kopieer bedrag</translation>
+    </message>
+</context>
 <context>
     <name>ReceiveRequestDialog</name>
+    <message>
+        <source>Address</source>
+        <translation>Adres</translation>
+    </message>
+    <message>
+        <source>Amount</source>
+        <translation>Bedrag</translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation>Etiket</translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation>Boodskap</translation>
+    </message>
+    </context>
+<context>
+    <name>RecentRequestsTableModel</name>
+    <message>
+        <source>Date</source>
+        <translation>Datum</translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation>Etiket</translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation>Boodskap</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(geen etiket)</translation>
+    </message>
     </context>
 <context>
     <name>SendCoinsDialog</name>
@@ -240,6 +406,14 @@
         <source>S&amp;end</source>
         <translation>S&amp;tuur</translation>
     </message>
+    <message>
+        <source>Copy amount</source>
+        <translation>Kopieer bedrag</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(geen etiket)</translation>
+    </message>
 </context>
 <context>
     <name>SendCoinsEntry</name>
@@ -252,6 +426,9 @@
         <translation>Boodskap:</translation>
     </message>
     </context>
+<context>
+    <name>SendConfirmationDialog</name>
+    </context>
 <context>
     <name>ShutdownWindow</name>
     </context>
@@ -276,12 +453,238 @@
 <context>
     <name>TrafficGraphWidget</name>
     </context>
+<context>
+    <name>TransactionDesc</name>
+    <message>
+        <source>Date</source>
+        <translation>Datum</translation>
+    </message>
+    <message>
+        <source>From</source>
+        <translation>Van</translation>
+    </message>
+    <message>
+        <source>unknown</source>
+        <translation>onbekend</translation>
+    </message>
+    <message>
+        <source>To</source>
+        <translation>Na</translation>
+    </message>
+    <message>
+        <source>own address</source>
+        <translation>eie adres</translation>
+    </message>
+    <message>
+        <source>label</source>
+        <translation>etiket</translation>
+    </message>
+    <message>
+        <source>Credit</source>
+        <translation>Krediet</translation>
+    </message>
+    <message>
+        <source>not accepted</source>
+        <translation>nie aanvaar nie</translation>
+    </message>
+    <message>
+        <source>Debit</source>
+        <translation>Debiet</translation>
+    </message>
+    <message>
+        <source>Transaction fee</source>
+        <translation>Transaksie fooi</translation>
+    </message>
+    <message>
+        <source>Net amount</source>
+        <translation>Netto bedrag</translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation>Boodskap</translation>
+    </message>
+    <message>
+        <source>Transaction ID</source>
+        <translation>Transaksie ID</translation>
+    </message>
+    <message>
+        <source>Transaction</source>
+        <translation>Transaksie</translation>
+    </message>
+    <message>
+        <source>Amount</source>
+        <translation>Bedrag</translation>
+    </message>
+    <message>
+        <source>true</source>
+        <translation>waar</translation>
+    </message>
+    <message>
+        <source>false</source>
+        <translation>onwaar</translation>
+    </message>
+</context>
 <context>
     <name>TransactionDescDialog</name>
     </context>
+<context>
+    <name>TransactionTableModel</name>
+    <message>
+        <source>Date</source>
+        <translation>Datum</translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation>Tipe</translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation>Etiket</translation>
+    </message>
+    <message>
+        <source>Received with</source>
+        <translation>Ontvang met</translation>
+    </message>
+    <message>
+        <source>Received from</source>
+        <translation>Ontvang van</translation>
+    </message>
+    <message>
+        <source>Sent to</source>
+        <translation>Gestuur na</translation>
+    </message>
+    <message>
+        <source>Payment to yourself</source>
+        <translation>Betalings Aan/na jouself</translation>
+    </message>
+    <message>
+        <source>Mined</source>
+        <translation>Gemyn</translation>
+    </message>
+    <message>
+        <source>(n/a)</source>
+        <translation>(n.v.t)</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(geen etiket)</translation>
+    </message>
+    <message>
+        <source>Date and time that the transaction was received.</source>
+        <translation>Datum en tyd wat die transaksie ontvang was.</translation>
+    </message>
+    <message>
+        <source>Type of transaction.</source>
+        <translation>Tipe transaksie.</translation>
+    </message>
+    </context>
+<context>
+    <name>TransactionView</name>
+    <message>
+        <source>All</source>
+        <translation>Alles</translation>
+    </message>
+    <message>
+        <source>Today</source>
+        <translation>Vandag</translation>
+    </message>
+    <message>
+        <source>This week</source>
+        <translation>Hierdie week</translation>
+    </message>
+    <message>
+        <source>This month</source>
+        <translation>Hierdie maand</translation>
+    </message>
+    <message>
+        <source>Last month</source>
+        <translation>Verlede maand</translation>
+    </message>
+    <message>
+        <source>This year</source>
+        <translation>Hierdie jaar</translation>
+    </message>
+    <message>
+        <source>Range...</source>
+        <translation>Reeks...</translation>
+    </message>
+    <message>
+        <source>Received with</source>
+        <translation>Ontvang met</translation>
+    </message>
+    <message>
+        <source>Sent to</source>
+        <translation>Gestuur na</translation>
+    </message>
+    <message>
+        <source>To yourself</source>
+        <translation>Aan/na jouself</translation>
+    </message>
+    <message>
+        <source>Mined</source>
+        <translation>Gemyn</translation>
+    </message>
+    <message>
+        <source>Other</source>
+        <translation>Ander</translation>
+    </message>
+    <message>
+        <source>Min amount</source>
+        <translation>Min bedrag</translation>
+    </message>
+    <message>
+        <source>Copy address</source>
+        <translation>Maak kopie van adres</translation>
+    </message>
+    <message>
+        <source>Copy amount</source>
+        <translation>Kopieer bedrag</translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation>Datum</translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation>Tipe</translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation>Etiket</translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation>Adres</translation>
+    </message>
+    <message>
+        <source>ID</source>
+        <translation>ID</translation>
+    </message>
+    <message>
+        <source>Range:</source>
+        <translation>Reeks:</translation>
+    </message>
+    <message>
+        <source>to</source>
+        <translation>aan</translation>
+    </message>
+</context>
 <context>
     <name>UnitDisplayStatusBarControl</name>
     </context>
+<context>
+    <name>WalletFrame</name>
+    </context>
+<context>
+    <name>WalletModel</name>
+    <message>
+        <source>Send Coins</source>
+        <translation>Stuur Munstukke</translation>
+    </message>
+</context>
+<context>
+    <name>WalletView</name>
+    </context>
 <context>
     <name>bitcoin-core</name>
     <message>
diff --git a/src/qt/locale/bitcoin_ar.ts b/src/qt/locale/bitcoin_ar.ts
index af62207df2bde..15c5158f217b0 100644
--- a/src/qt/locale/bitcoin_ar.ts
+++ b/src/qt/locale/bitcoin_ar.ts
@@ -23,7 +23,7 @@
     </message>
     <message>
         <source>C&amp;lose</source>
-        <translation>&amp;اغلاق</translation>
+        <translation>ا&amp;غلاق</translation>
     </message>
     <message>
         <source>Delete the currently selected address from the list</source>
@@ -41,6 +41,77 @@
         <source>&amp;Delete</source>
         <translation>&amp;أمسح</translation>
     </message>
+    <message>
+        <source>Choose the address to send coins to</source>
+        <translation>اختر العنوان الذي سترسل له العملات</translation>
+    </message>
+    <message>
+        <source>Choose the address to receive coins with</source>
+        <translation>اختر العنوان الذي تستقبل عليه العملات</translation>
+    </message>
+    <message>
+        <source>C&amp;hoose</source>
+        <translation>&amp;اختر</translation>
+    </message>
+    <message>
+        <source>Sending addresses</source>
+        <translation>ارسال العناوين</translation>
+    </message>
+    <message>
+        <source>Receiving addresses</source>
+        <translation>استقبال العناوين</translation>
+    </message>
+    <message>
+        <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source>
+        <translation>هذه هي عناوين Bitcion التابعة لك من أجل إرسال الدفعات. تحقق دائما من المبلغ و عنوان المرسل المستقبل قبل إرسال العملات</translation>
+    </message>
+    <message>
+        <source>These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source>
+        <translation>هذه هي عناوين Bitcion التابعة لك من أجل إستقبال الدفعات. ينصح استخدام عنوان جديد من أجل كل صفقة</translation>
+    </message>
+    <message>
+        <source>&amp;Copy Address</source>
+        <translation>انسخ العنوان</translation>
+    </message>
+    <message>
+        <source>Copy &amp;Label</source>
+        <translation>نسخ &amp;الوصف</translation>
+    </message>
+    <message>
+        <source>&amp;Edit</source>
+        <translation>تعديل</translation>
+    </message>
+    <message>
+        <source>Export Address List</source>
+        <translation>تصدير قائمة العناوين</translation>
+    </message>
+    <message>
+        <source>Comma separated file (*.csv)</source>
+        <translation>ملف مفصول بفواصل (*.csv)</translation>
+    </message>
+    <message>
+        <source>Exporting Failed</source>
+        <translation>فشل التصدير</translation>
+    </message>
+    <message>
+        <source>There was an error trying to save the address list to %1. Please try again.</source>
+        <translation>لقد حدث خطأ أثناء  حفظ قائمة العناوين إلى %1. يرجى المحاولة مرة أخرى.</translation>
+    </message>
+</context>
+<context>
+    <name>AddressTableModel</name>
+    <message>
+        <source>Label</source>
+        <translation>وصف</translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation>عنوان</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(لا وصف)</translation>
+    </message>
 </context>
 <context>
     <name>AskPassphraseDialog</name>
@@ -60,6 +131,90 @@
         <source>Repeat new passphrase</source>
         <translation>ادخل كلمة المرور الجديدة مرة أخرى</translation>
     </message>
+    <message>
+        <source>Enter the new passphrase to the wallet.&lt;br/&gt;Please use a passphrase of &lt;b&gt;ten or more random characters&lt;/b&gt;, or &lt;b&gt;eight or more words&lt;/b&gt;.</source>
+        <translation>أدخل عبارة مرور جديدة إلى المحفظة. الرجاء استخدام عبارة مرور تتكون من10 حروف عشوائية على الاقل, أو أكثر من 7 كلمات</translation>
+    </message>
+    <message>
+        <source>Encrypt wallet</source>
+        <translation>تشفير المحفظة</translation>
+    </message>
+    <message>
+        <source>This operation needs your wallet passphrase to unlock the wallet.</source>
+        <translation>هذه العملية تحتاج كلمة مرور محفظتك لفتحها</translation>
+    </message>
+    <message>
+        <source>Unlock wallet</source>
+        <translation>إفتح المحفظة</translation>
+    </message>
+    <message>
+        <source>This operation needs your wallet passphrase to decrypt the wallet.</source>
+        <translation>هذه العملية تحتاج كلمة مرور محفظتك لفك تشفيرها </translation>
+    </message>
+    <message>
+        <source>Decrypt wallet</source>
+        <translation>فك تشفير المحفظة</translation>
+    </message>
+    <message>
+        <source>Change passphrase</source>
+        <translation>تغيير كلمة المرور</translation>
+    </message>
+    <message>
+        <source>Enter the old passphrase and new passphrase to the wallet.</source>
+        <translation>أدخل كلمة المرور القديمة والجديدة للمحفظة.</translation>
+    </message>
+    <message>
+        <source>Confirm wallet encryption</source>
+        <translation>تأكيد تشفير المحفظة</translation>
+    </message>
+    <message>
+        <source>Warning: If you encrypt your wallet and lose your passphrase, you will &lt;b&gt;LOSE ALL OF YOUR BITCOINS&lt;/b&gt;!</source>
+        <translation>تحذير: إذا قمت بتشفير محفظتك وفقدت كلمة المرور الخاص بك, ستفقد كل عملات BITCOINS الخاصة بك.</translation>
+    </message>
+    <message>
+        <source>Are you sure you wish to encrypt your wallet?</source>
+        <translation>هل أنت متأكد من رغبتك في تشفير محفظتك ؟</translation>
+    </message>
+    <message>
+        <source>Wallet encrypted</source>
+        <translation>محفظة مشفرة</translation>
+    </message>
+    <message>
+        <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source>
+        <translation>هام: أي نسخة إحتياطية سابقة  قمت بها لمحفظتك يجب استبدالها  بأخرى حديثة، مشفرة. لأسباب أمنية، النسخ الاحتياطية السابقة لملفات المحفظة الغير مشفرة تصبح عديمة الفائدة مع بداية استخدام المحفظة المشفرة الجديدة.</translation>
+    </message>
+    <message>
+        <source>Wallet encryption failed</source>
+        <translation>فشل تشفير المحفظة</translation>
+    </message>
+    <message>
+        <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
+        <translation>فشل تشفير المحفظة بسبب خطأ داخلي. لم يتم تشفير محفظتك.</translation>
+    </message>
+    <message>
+        <source>The supplied passphrases do not match.</source>
+        <translation>كلمتي المرور ليستا متطابقتان</translation>
+    </message>
+    <message>
+        <source>Wallet unlock failed</source>
+        <translation>فشل فتح المحفظة</translation>
+    </message>
+    <message>
+        <source>The passphrase entered for the wallet decryption was incorrect.</source>
+        <translation>كلمة المرور التي تم إدخالها لفك تشفير المحفظة غير صحيحة.</translation>
+    </message>
+    <message>
+        <source>Wallet decryption failed</source>
+        <translation>فشل   فك التشفير المحفظة</translation>
+    </message>
+    <message>
+        <source>Wallet passphrase was successfully changed.</source>
+        <translation>لقد تم تغير عبارة مرور المحفظة بنجاح</translation>
+    </message>
+    <message>
+        <source>Warning: The Caps Lock key is on!</source>
+        <translation>تحذير: مفتاح الحروف الكبيرة مفعل</translation>
+    </message>
 </context>
 <context>
     <name>BanTableModel</name>
@@ -110,6 +265,10 @@
         <source>Quit application</source>
         <translation>الخروج من التطبيق</translation>
     </message>
+    <message>
+        <source>&amp;About %1</source>
+        <translation>حوالي %1</translation>
+    </message>
     <message>
         <source>Show information about %1</source>
         <translation>أظهر المعلومات حولة %1</translation>
@@ -126,6 +285,10 @@
         <source>&amp;Options...</source>
         <translation>&amp;خيارات ...</translation>
     </message>
+    <message>
+        <source>Modify configuration options for %1</source>
+        <translation>تغيير خيارات الإعداد لأساس ل%1</translation>
+    </message>
     <message>
         <source>&amp;Encrypt Wallet...</source>
         <translation>&amp;تشفير المحفظة</translation>
@@ -262,17 +425,9 @@
         <source>No block source available...</source>
         <translation>لا يوجد أي مصدر الكتلة</translation>
     </message>
-    <message numerus="yes">
-        <source>Processed %n block(s) of transaction history.</source>
-        <translation><numerusform>لم يتم معالجة أي كتلة سجل المعاملات</numerusform><numerusform>تم معالجة كتلة واحدة سجل المعاملات</numerusform><numerusform>تم معالجة كتلتين سجل المعاملات</numerusform><numerusform>تم معالجة %n كتل سجل المعاملات</numerusform><numerusform>تم معالجة %n كتلة سجل المعاملات</numerusform><numerusform>تم معالجة %n كتلة سجل المعاملات</numerusform></translation>
-    </message>
-    <message numerus="yes">
-        <source>%n hour(s)</source>
-        <translation><numerusform>0 ساعة</numerusform><numerusform>%n ساعة</numerusform><numerusform>%n ساعتين</numerusform><numerusform>%n ساعات</numerusform><numerusform>%n ساعة</numerusform><numerusform>%n ساعات</numerusform></translation>
-    </message>
     <message>
-        <source>%1 and %2</source>
-        <translation>%1 و %2</translation>
+        <source>%1 behind</source>
+        <translation>خلف %1</translation>
     </message>
     <message>
         <source>Last received block was generated %1 ago.</source>
@@ -298,6 +453,14 @@
         <source>Up to date</source>
         <translation>محدث</translation>
     </message>
+    <message>
+        <source>Show the %1 help message to get a list with possible Bitcoin command-line options</source>
+        <translation>بين اشارة المساعدة %1 للحصول على قائمة من خيارات اوامر البت كوين المحتملة </translation>
+    </message>
+    <message>
+        <source>%1 client</source>
+        <translation>الزبون %1</translation>
+    </message>
     <message>
         <source>Catching up...</source>
         <translation>اللحاق بالركب ...</translation>
@@ -308,12 +471,30 @@
         <translation>التاريخ %1
 
 
+</translation>
+    </message>
+    <message>
+        <source>Amount: %1
+</source>
+        <translation>الكمية %1
+</translation>
+    </message>
+    <message>
+        <source>Type: %1
+</source>
+        <translation>نوع %1
 </translation>
     </message>
     <message>
         <source>Label: %1
 </source>
         <translation>علامه: %1
+</translation>
+    </message>
+    <message>
+        <source>Address: %1
+</source>
+        <translation>عنوان %1
 </translation>
     </message>
     <message>
@@ -332,7 +513,7 @@
         <source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;locked&lt;/b&gt;</source>
         <translation>المحفظة &lt;b&gt;مشفرة&lt;/b&gt; و &lt;b&gt;مقفلة&lt;/b&gt; حاليا</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>CoinControlDialog</name>
     <message>
@@ -351,10 +532,6 @@
         <source>Amount:</source>
         <translation>القيمة :</translation>
     </message>
-    <message>
-        <source>Priority:</source>
-        <translation>افضلية :</translation>
-    </message>
     <message>
         <source>Fee:</source>
         <translation>رسوم :</translation>
@@ -408,8 +585,52 @@
         <translation>تأكيد</translation>
     </message>
     <message>
-        <source>Priority</source>
-        <translation>أفضلية</translation>
+        <source>Copy address</source>
+        <translation>  انسخ عنوان</translation>
+    </message>
+    <message>
+        <source>Copy label</source>
+        <translation> انسخ التسمية</translation>
+    </message>
+    <message>
+        <source>Copy amount</source>
+        <translation>نسخ الكمية</translation>
+    </message>
+    <message>
+        <source>Copy transaction ID</source>
+        <translation>نسخ رقم العملية</translation>
+    </message>
+    <message>
+        <source>Copy quantity</source>
+        <translation>نسخ الكمية </translation>
+    </message>
+    <message>
+        <source>Copy fee</source>
+        <translation>نسخ الرسوم</translation>
+    </message>
+    <message>
+        <source>Copy after fee</source>
+        <translation>نسخ بعد الرسوم</translation>
+    </message>
+    <message>
+        <source>Copy change</source>
+        <translation>نسخ التعديل</translation>
+    </message>
+    <message>
+        <source>yes</source>
+        <translation>نعم</translation>
+    </message>
+    <message>
+        <source>no</source>
+        <translation>لا</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(لا وصف)</translation>
+    </message>
+    <message>
+        <source>(change)</source>
+        <translation>(تغير)</translation>
     </message>
 </context>
 <context>
@@ -434,6 +655,38 @@
         <source>&amp;Address</source>
         <translation>&amp;العنوان</translation>
     </message>
+    <message>
+        <source>New receiving address</source>
+        <translation>عنوان أستلام جديد</translation>
+    </message>
+    <message>
+        <source>New sending address</source>
+        <translation>عنوان إرسال جديد</translation>
+    </message>
+    <message>
+        <source>Edit receiving address</source>
+        <translation>تعديل عنوان الأستلام</translation>
+    </message>
+    <message>
+        <source>Edit sending address</source>
+        <translation>تعديل عنوان الارسال</translation>
+    </message>
+    <message>
+        <source>The entered address "%1" is not a valid Bitcoin address.</source>
+        <translation>العنوان المدخل "%1" ليس عنوان بيت كوين صحيح.</translation>
+    </message>
+    <message>
+        <source>The entered address "%1" is already in the address book.</source>
+        <translation>هدا العنوان "%1" موجود مسبقا في دفتر العناوين</translation>
+    </message>
+    <message>
+        <source>Could not unlock wallet.</source>
+        <translation> يمكن فتح المحفظة.</translation>
+    </message>
+    <message>
+        <source>New key generation failed.</source>
+        <translation>فشل توليد مفتاح جديد.</translation>
+    </message>
 </context>
 <context>
     <name>FreespaceChecker</name>
@@ -464,6 +717,10 @@
         <source>version</source>
         <translation>النسخة</translation>
     </message>
+    <message>
+        <source>About %1</source>
+        <translation>حوالي %1</translation>
+    </message>
     <message>
         <source>Command-line options</source>
         <translation>خيارات سطر الأوامر</translation>
@@ -511,6 +768,14 @@
         <source>Welcome</source>
         <translation>أهلا</translation>
     </message>
+    <message>
+        <source>Welcome to %1.</source>
+        <translation> اهلا بكم في %1</translation>
+    </message>
+    <message>
+        <source>As this is the first time the program is launched, you can choose where %1 will store its data.</source>
+        <translation>بما انه هذه اول مرة لانطلاق هذا البرنامج, فيمكنك ان تختار اين سيخزن %1 بياناته</translation>
+    </message>
     <message>
         <source>Use the default data directory</source>
         <translation>استخدام دليل البانات الافتراضي</translation>
@@ -519,11 +784,26 @@
         <source>Use a custom data directory:</source>
         <translation>استخدام دليل بيانات مخصص:</translation>
     </message>
+    <message>
+        <source>Error: Specified data directory "%1" cannot be created.</source>
+        <translation>خطأ: لا يمكن تكوين دليل بيانات مخصص ل %1</translation>
+    </message>
     <message>
         <source>Error</source>
         <translation>خطأ</translation>
     </message>
     </context>
+<context>
+    <name>ModalOverlay</name>
+    <message>
+        <source>Form</source>
+        <translation>نمودج</translation>
+    </message>
+    <message>
+        <source>Hide</source>
+        <translation>إخفاء</translation>
+    </message>
+    </context>
 <context>
     <name>OpenURIDialog</name>
     <message>
@@ -538,6 +818,10 @@
         <source>Select payment request file</source>
         <translation>حدد ملف طلب الدفع</translation>
     </message>
+    <message>
+        <source>Select payment request file to open</source>
+        <translation>حدد ملف طلب الدفع لفتحه</translation>
+    </message>
 </context>
 <context>
     <name>OptionsDialog</name>
@@ -661,6 +945,13 @@
         <translation>رصيدك الكلي الحالي</translation>
     </message>
     </context>
+<context>
+    <name>PaymentServer</name>
+    <message>
+        <source>Bad response from server %1</source>
+        <translation>استجابة سيئة من الملقم %1</translation>
+    </message>
+    </context>
 <context>
     <name>PeerTableModel</name>
     </context>
@@ -668,7 +959,7 @@
     <name>QObject</name>
     <message>
         <source>Amount</source>
-        <translation>المبلغ</translation>
+        <translation>مبلغ</translation>
     </message>
     <message>
         <source>%1 h</source>
@@ -682,7 +973,33 @@
         <source>N/A</source>
         <translation>غير معروف</translation>
     </message>
+    <message>
+        <source>%1 and %2</source>
+        <translation>%1 و %2</translation>
+    </message>
+    </context>
+<context>
+    <name>QObject::QObject</name>
     </context>
+<context>
+    <name>QRImageWidget</name>
+    <message>
+        <source>&amp;Save Image...</source>
+        <translation>&amp;حفظ الصورة</translation>
+    </message>
+    <message>
+        <source>&amp;Copy Image</source>
+        <translation>&amp;نسخ الصورة</translation>
+    </message>
+    <message>
+        <source>Save QR Code</source>
+        <translation>حفظ رمز الاستجابة السريعة QR</translation>
+    </message>
+    <message>
+        <source>PNG Image (*.png)</source>
+        <translation>صورة PNG (*.png)</translation>
+    </message>
+</context>
 <context>
     <name>RPCConsole</name>
     <message>
@@ -868,6 +1185,18 @@
         <source>Remove</source>
         <translation>ازل</translation>
     </message>
+    <message>
+        <source>Copy label</source>
+        <translation> انسخ التسمية</translation>
+    </message>
+    <message>
+        <source>Copy message</source>
+        <translation>انسخ الرسالة</translation>
+    </message>
+    <message>
+        <source>Copy amount</source>
+        <translation>نسخ الكمية</translation>
+    </message>
 </context>
 <context>
     <name>ReceiveRequestDialog</name>
@@ -887,7 +1216,54 @@
         <source>&amp;Save Image...</source>
         <translation>&amp;حفظ الصورة</translation>
     </message>
-</context>
+    <message>
+        <source>Payment information</source>
+        <translation>معلومات الدفع</translation>
+    </message>
+    <message>
+        <source>URI</source>
+        <translation> URI</translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation>عنوان</translation>
+    </message>
+    <message>
+        <source>Amount</source>
+        <translation>مبلغ</translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation>وصف</translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation>رسالة </translation>
+    </message>
+    </context>
+<context>
+    <name>RecentRequestsTableModel</name>
+    <message>
+        <source>Date</source>
+        <translation>تاريخ</translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation>وصف</translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation>رسالة </translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(لا وصف)</translation>
+    </message>
+    <message>
+        <source>(no message)</source>
+        <translation>( لا رسائل )</translation>
+    </message>
+    </context>
 <context>
     <name>SendCoinsDialog</name>
     <message>
@@ -914,10 +1290,6 @@
         <source>Amount:</source>
         <translation>القيمة :</translation>
     </message>
-    <message>
-        <source>Priority:</source>
-        <translation>افضلية :</translation>
-    </message>
     <message>
         <source>Fee:</source>
         <translation>رسوم :</translation>
@@ -960,7 +1332,7 @@
     </message>
     <message>
         <source>Dust:</source>
-        <translation>غبار</translation>
+        <translation>غبار:</translation>
     </message>
     <message>
         <source>Clear &amp;All</source>
@@ -978,6 +1350,54 @@
         <source>S&amp;end</source>
         <translation>&amp;ارسال</translation>
     </message>
+    <message>
+        <source>Copy quantity</source>
+        <translation>نسخ الكمية </translation>
+    </message>
+    <message>
+        <source>Copy amount</source>
+        <translation>نسخ الكمية</translation>
+    </message>
+    <message>
+        <source>Copy fee</source>
+        <translation>نسخ الرسوم</translation>
+    </message>
+    <message>
+        <source>Copy after fee</source>
+        <translation>نسخ بعد الرسوم</translation>
+    </message>
+    <message>
+        <source>Copy change</source>
+        <translation>نسخ التعديل</translation>
+    </message>
+    <message>
+        <source>%1 to %2</source>
+        <translation>%1 الى %2</translation>
+    </message>
+    <message>
+        <source>or</source>
+        <translation>أو</translation>
+    </message>
+    <message>
+        <source>Confirm send coins</source>
+        <translation>تأكيد الإرسال Coins</translation>
+    </message>
+    <message>
+        <source>The amount to pay must be larger than 0.</source>
+        <translation>المبلغ المدفوع يجب ان يكون اكبر من 0</translation>
+    </message>
+    <message>
+        <source>The amount exceeds your balance.</source>
+        <translation>القيمة تتجاوز رصيدك</translation>
+    </message>
+    <message>
+        <source>The total exceeds your balance when the %1 transaction fee is included.</source>
+        <translation>المجموع يتجاوز رصيدك عندما يتم اضافة %1 رسوم العملية</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(لا وصف)</translation>
+    </message>
 </context>
 <context>
     <name>SendCoinsEntry</name>
@@ -1029,7 +1449,18 @@
         <source>Pay To:</source>
         <translation>ادفع &amp;الى :</translation>
     </message>
-    </context>
+    <message>
+        <source>Enter a label for this address to add it to your address book</source>
+        <translation>إدخال تسمية لهذا العنوان لإضافته إلى دفتر العناوين الخاص بك</translation>
+    </message>
+</context>
+<context>
+    <name>SendConfirmationDialog</name>
+    <message>
+        <source>Yes</source>
+        <translation>نعم</translation>
+    </message>
+</context>
 <context>
     <name>ShutdownWindow</name>
     <message>
@@ -1087,7 +1518,51 @@
         <source>Verify &amp;Message</source>
         <translation>تحقق &amp;الرسالة</translation>
     </message>
-    </context>
+    <message>
+        <source>Click "Sign Message" to generate signature</source>
+        <translation>اضغط  "توقيع الرسالة" لتوليد التوقيع</translation>
+    </message>
+    <message>
+        <source>The entered address is invalid.</source>
+        <translation>العنوان المدخل غير صالح</translation>
+    </message>
+    <message>
+        <source>Please check the address and try again.</source>
+        <translation>الرجاء التأكد من العنوان والمحاولة مرة اخرى</translation>
+    </message>
+    <message>
+        <source>The entered address does not refer to a key.</source>
+        <translation>العنوان المدخل لا يشير الى مفتاح</translation>
+    </message>
+    <message>
+        <source>Wallet unlock was cancelled.</source>
+        <translation>تم الغاء عملية فتح المحفظة</translation>
+    </message>
+    <message>
+        <source>Private key for the entered address is not available.</source>
+        <translation>المفتاح الخاص للعنوان المدخل غير موجود.</translation>
+    </message>
+    <message>
+        <source>Message signing failed.</source>
+        <translation>فشل توقيع الرسالة.</translation>
+    </message>
+    <message>
+        <source>Message signed.</source>
+        <translation>الرسالة موقعة.</translation>
+    </message>
+    <message>
+        <source>Please check the signature and try again.</source>
+        <translation>فضلا تاكد من التوقيع وحاول مرة اخرى</translation>
+    </message>
+    <message>
+        <source>Message verification failed.</source>
+        <translation>فشلت عملية التأكد من الرسالة.</translation>
+    </message>
+    <message>
+        <source>Message verified.</source>
+        <translation>تم تأكيد الرسالة.</translation>
+    </message>
+</context>
 <context>
     <name>SplashScreen</name>
     <message>
@@ -1098,16 +1573,358 @@
 <context>
     <name>TrafficGraphWidget</name>
     </context>
+<context>
+    <name>TransactionDesc</name>
+    <message>
+        <source>Open until %1</source>
+        <translation>مفتوح حتى %1</translation>
+    </message>
+    <message>
+        <source>%1/offline</source>
+        <translation>%1 غير متواجد</translation>
+    </message>
+    <message>
+        <source>%1/unconfirmed</source>
+        <translation>غير مؤكدة/%1</translation>
+    </message>
+    <message>
+        <source>%1 confirmations</source>
+        <translation>تأكيد %1</translation>
+    </message>
+    <message>
+        <source>Status</source>
+        <translation>الحالة.</translation>
+    </message>
+    <message>
+        <source>, has not been successfully broadcast yet</source>
+        <translation>,  لم يتم حتى الآن البث بنجاح</translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation>تاريخ</translation>
+    </message>
+    <message>
+        <source>Source</source>
+        <translation>المصدر</translation>
+    </message>
+    <message>
+        <source>Generated</source>
+        <translation>تم اصداره.</translation>
+    </message>
+    <message>
+        <source>From</source>
+        <translation>من</translation>
+    </message>
+    <message>
+        <source>unknown</source>
+        <translation>غير معروف</translation>
+    </message>
+    <message>
+        <source>To</source>
+        <translation>الى</translation>
+    </message>
+    <message>
+        <source>own address</source>
+        <translation>عنوانه</translation>
+    </message>
+    <message>
+        <source>label</source>
+        <translation>علامة</translation>
+    </message>
+    <message>
+        <source>not accepted</source>
+        <translation>غير مقبولة</translation>
+    </message>
+    <message>
+        <source>Debit</source>
+        <translation>دين</translation>
+    </message>
+    <message>
+        <source>Transaction fee</source>
+        <translation>رسوم المعاملة</translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation>رسالة </translation>
+    </message>
+    <message>
+        <source>Comment</source>
+        <translation>تعليق</translation>
+    </message>
+    <message>
+        <source>Transaction ID</source>
+        <translation>رقم المعاملة</translation>
+    </message>
+    <message>
+        <source>Merchant</source>
+        <translation>تاجر</translation>
+    </message>
+    <message>
+        <source>Transaction</source>
+        <translation>معاملة</translation>
+    </message>
+    <message>
+        <source>Amount</source>
+        <translation>مبلغ</translation>
+    </message>
+    <message>
+        <source>true</source>
+        <translation>صحيح</translation>
+    </message>
+    <message>
+        <source>false</source>
+        <translation>خاطئ</translation>
+    </message>
+</context>
 <context>
     <name>TransactionDescDialog</name>
     <message>
         <source>This pane shows a detailed description of the transaction</source>
         <translation>يبين هذا الجزء وصفا مفصلا لهده المعاملة</translation>
     </message>
+    </context>
+<context>
+    <name>TransactionTableModel</name>
+    <message>
+        <source>Date</source>
+        <translation>تاريخ</translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation>النوع</translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation>وصف</translation>
+    </message>
+    <message>
+        <source>Open until %1</source>
+        <translation>مفتوح حتى %1</translation>
+    </message>
+    <message>
+        <source>Offline</source>
+        <translation>غير متصل</translation>
+    </message>
+    <message>
+        <source>Conflicted</source>
+        <translation>يتعارض</translation>
+    </message>
+    <message>
+        <source>This block was not received by any other nodes and will probably not be accepted!</source>
+        <translation>لم يتم تلقى هذه الكتلة (Block) من قبل أي العقد الأخرى وربما لن تكون مقبولة!</translation>
+    </message>
+    <message>
+        <source>Generated but not accepted</source>
+        <translation>ولدت ولكن لم تقبل</translation>
+    </message>
+    <message>
+        <source>Received with</source>
+        <translation>استقبل مع</translation>
+    </message>
+    <message>
+        <source>Received from</source>
+        <translation>استقبل من</translation>
+    </message>
+    <message>
+        <source>Sent to</source>
+        <translation>أرسل إلى</translation>
+    </message>
+    <message>
+        <source>Payment to yourself</source>
+        <translation>دفع لنفسك</translation>
+    </message>
+    <message>
+        <source>Mined</source>
+        <translation>Mined</translation>
+    </message>
+    <message>
+        <source>(n/a)</source>
+        <translation>غير متوفر</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(لا وصف)</translation>
+    </message>
+    <message>
+        <source>Transaction status. Hover over this field to show number of confirmations.</source>
+        <translation>حالة المعاملة. تحوم حول هذا الحقل لعرض عدد  التأكيدات.</translation>
+    </message>
+    <message>
+        <source>Date and time that the transaction was received.</source>
+        <translation>التاريخ والوقت الذي تم فيه تلقي المعاملة.</translation>
+    </message>
+    <message>
+        <source>Type of transaction.</source>
+        <translation>نوع المعاملات</translation>
+    </message>
+    <message>
+        <source>Amount removed from or added to balance.</source>
+        <translation>المبلغ الذي أزيل أو أضيف الى الرصيد</translation>
+    </message>
+</context>
+<context>
+    <name>TransactionView</name>
+    <message>
+        <source>All</source>
+        <translation>الكل</translation>
+    </message>
+    <message>
+        <source>Today</source>
+        <translation>اليوم</translation>
+    </message>
+    <message>
+        <source>This week</source>
+        <translation>هدا الاسبوع</translation>
+    </message>
+    <message>
+        <source>This month</source>
+        <translation>هدا الشهر</translation>
+    </message>
+    <message>
+        <source>Last month</source>
+        <translation>الشهر الماضي</translation>
+    </message>
+    <message>
+        <source>This year</source>
+        <translation>هدا العام</translation>
+    </message>
+    <message>
+        <source>Range...</source>
+        <translation>المدى...</translation>
+    </message>
+    <message>
+        <source>Received with</source>
+        <translation>استقبل مع</translation>
+    </message>
+    <message>
+        <source>Sent to</source>
+        <translation>أرسل إلى</translation>
+    </message>
+    <message>
+        <source>To yourself</source>
+        <translation>إليك</translation>
+    </message>
+    <message>
+        <source>Mined</source>
+        <translation>Mined</translation>
+    </message>
+    <message>
+        <source>Other</source>
+        <translation>اخرى</translation>
+    </message>
+    <message>
+        <source>Enter address or label to search</source>
+        <translation>ادخل عنوان أووصف للبحث</translation>
+    </message>
+    <message>
+        <source>Min amount</source>
+        <translation>الحد الأدنى</translation>
+    </message>
+    <message>
+        <source>Copy address</source>
+        <translation>  انسخ عنوان</translation>
+    </message>
+    <message>
+        <source>Copy label</source>
+        <translation> انسخ التسمية</translation>
+    </message>
+    <message>
+        <source>Copy amount</source>
+        <translation>نسخ الكمية</translation>
+    </message>
+    <message>
+        <source>Copy transaction ID</source>
+        <translation>نسخ رقم العملية</translation>
+    </message>
+    <message>
+        <source>Edit label</source>
+        <translation>عدل الوصف</translation>
+    </message>
+    <message>
+        <source>Show transaction details</source>
+        <translation>عرض تفاصيل المعاملة</translation>
+    </message>
+    <message>
+        <source>Comma separated file (*.csv)</source>
+        <translation>ملف مفصول بفواصل (*.csv)</translation>
+    </message>
+    <message>
+        <source>Confirmed</source>
+        <translation>تأكيد</translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation>تاريخ</translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation>النوع</translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation>وصف</translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation>عنوان</translation>
+    </message>
+    <message>
+        <source>ID</source>
+        <translation>العنوان</translation>
+    </message>
+    <message>
+        <source>Exporting Failed</source>
+        <translation>فشل التصدير</translation>
+    </message>
+    <message>
+        <source>Exporting Successful</source>
+        <translation>نجح التصدير</translation>
+    </message>
+    <message>
+        <source>Range:</source>
+        <translation>المدى:</translation>
+    </message>
+    <message>
+        <source>to</source>
+        <translation>الى</translation>
+    </message>
 </context>
 <context>
     <name>UnitDisplayStatusBarControl</name>
     </context>
+<context>
+    <name>WalletFrame</name>
+    </context>
+<context>
+    <name>WalletModel</name>
+    <message>
+        <source>Send Coins</source>
+        <translation>إرسال Coins</translation>
+    </message>
+</context>
+<context>
+    <name>WalletView</name>
+    <message>
+        <source>&amp;Export</source>
+        <translation>&amp;تصدير</translation>
+    </message>
+    <message>
+        <source>Export the data in the current tab to a file</source>
+        <translation>تحميل البيانات في علامة التبويب الحالية إلى ملف.</translation>
+    </message>
+    <message>
+        <source>Backup Wallet</source>
+        <translation>نسخ احتياط للمحفظة</translation>
+    </message>
+    <message>
+        <source>Backup Failed</source>
+        <translation>فشل النسخ الاحتياطي</translation>
+    </message>
+    <message>
+        <source>Backup Successful</source>
+        <translation>نجاح  النسخ الاحتياطي</translation>
+    </message>
+    </context>
 <context>
     <name>bitcoin-core</name>
     <message>
@@ -1118,14 +1935,14 @@
         <source>Specify data directory</source>
         <translation>حدد مجلد المعلومات</translation>
     </message>
-    <message>
-        <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
-        <translation>قبول الاتصالات من خارج</translation>
-    </message>
     <message>
         <source>Bitcoin Core</source>
         <translation>جوهر البيت كوين</translation>
     </message>
+    <message>
+        <source>The %s developers</source>
+        <translation>%s المبرمجون</translation>
+    </message>
     <message>
         <source>Error: Disk space is low!</source>
         <translation>تحذير: مساحة القرص منخفضة</translation>
@@ -1158,10 +1975,6 @@
         <source>Transaction amount too small</source>
         <translation>قيمة العملية صغيره جدا</translation>
     </message>
-    <message>
-        <source>Transaction amounts must be positive</source>
-        <translation>يجب ان يكون قيمة العملية بالموجب</translation>
-    </message>
     <message>
         <source>Transaction too large</source>
         <translation>المعاملة طويلة جدا</translation>
diff --git a/src/qt/locale/bitcoin_be_BY.ts b/src/qt/locale/bitcoin_be_BY.ts
index 5894148fe0342..d2c52f2c167d8 100644
--- a/src/qt/locale/bitcoin_be_BY.ts
+++ b/src/qt/locale/bitcoin_be_BY.ts
@@ -41,6 +41,77 @@
         <source>&amp;Delete</source>
         <translation>Выдаліць</translation>
     </message>
+    <message>
+        <source>Choose the address to send coins to</source>
+        <translation>Выбраць адрас, куды выслаць сродкі</translation>
+    </message>
+    <message>
+        <source>Choose the address to receive coins with</source>
+        <translation>Выбраць адрас, на які атрымаць сродкі</translation>
+    </message>
+    <message>
+        <source>C&amp;hoose</source>
+        <translation>Выбраць</translation>
+    </message>
+    <message>
+        <source>Sending addresses</source>
+        <translation>адрасы Адпраўкі</translation>
+    </message>
+    <message>
+        <source>Receiving addresses</source>
+        <translation>адрасы Прымання</translation>
+    </message>
+    <message>
+        <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source>
+        <translation>Тут знаходзяцца Біткойн-адрасы для высылання плацяжоў. Заўсёды спраўджвайце колькасць і адрас прызначэння перад здзяйсненнем транзакцыі.</translation>
+    </message>
+    <message>
+        <source>These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source>
+        <translation>Тут знаходзяцца Біткойн-адрасы для прымання плацяжоў. Пажадана выкарыстоўваць новы адрас для кожнай транзакцыі.</translation>
+    </message>
+    <message>
+        <source>&amp;Copy Address</source>
+        <translation>Капіяваць адрас</translation>
+    </message>
+    <message>
+        <source>Copy &amp;Label</source>
+        <translation>Капіяваць Метку</translation>
+    </message>
+    <message>
+        <source>&amp;Edit</source>
+        <translation>Рэдагаваць</translation>
+    </message>
+    <message>
+        <source>Export Address List</source>
+        <translation>Экспартаваць Спіс Адрасоў</translation>
+    </message>
+    <message>
+        <source>Comma separated file (*.csv)</source>
+        <translation>Коскамі падзелены файл (*.csv)</translation>
+    </message>
+    <message>
+        <source>Exporting Failed</source>
+        <translation>Экспартаванне няўдалае</translation>
+    </message>
+    <message>
+        <source>There was an error trying to save the address list to %1. Please try again.</source>
+        <translation>Адбылася памылка падчас спробы захаваць адрас у %1. Паспрабуйце зноў.</translation>
+    </message>
+</context>
+<context>
+    <name>AddressTableModel</name>
+    <message>
+        <source>Label</source>
+        <translation>Метка</translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation>Адрас</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>непазначаны</translation>
+    </message>
 </context>
 <context>
     <name>AskPassphraseDialog</name>
@@ -60,6 +131,90 @@
         <source>Repeat new passphrase</source>
         <translation>Паўтарыце новую кодавую фразу</translation>
     </message>
+    <message>
+        <source>Enter the new passphrase to the wallet.&lt;br/&gt;Please use a passphrase of &lt;b&gt;ten or more random characters&lt;/b&gt;, or &lt;b&gt;eight or more words&lt;/b&gt;.</source>
+        <translation>Увядзіце новы пароль для гаманца.&lt;br/&gt;Парольная фраза павинна складацца&lt;b&gt; не меньш чым з дзесяці сімвалаў&lt;/b&gt;, ці &lt;b&gt;больш чым з васьмі слоў&lt;/b&gt;.</translation>
+    </message>
+    <message>
+        <source>Encrypt wallet</source>
+        <translation>Зашыфраваць гаманец.</translation>
+    </message>
+    <message>
+        <source>This operation needs your wallet passphrase to unlock the wallet.</source>
+        <translation>Гэтая аперацыя патрабуе кодавую фразу, каб рзблакаваць гаманец.</translation>
+    </message>
+    <message>
+        <source>Unlock wallet</source>
+        <translation>Разблакаваць гаманец</translation>
+    </message>
+    <message>
+        <source>This operation needs your wallet passphrase to decrypt the wallet.</source>
+        <translation>Гэтая аперацыя патрабуе пароль каб расшыфраваць гаманец.</translation>
+    </message>
+    <message>
+        <source>Decrypt wallet</source>
+        <translation>Рачшыфраваць гаманец</translation>
+    </message>
+    <message>
+        <source>Change passphrase</source>
+        <translation>Змяніць пароль</translation>
+    </message>
+    <message>
+        <source>Enter the old passphrase and new passphrase to the wallet.</source>
+        <translation>Увядзіце стары пароль і новы пароль для гаманца.</translation>
+    </message>
+    <message>
+        <source>Confirm wallet encryption</source>
+        <translation>Пацвердзіце шыфраванне гаманца</translation>
+    </message>
+    <message>
+        <source>Warning: If you encrypt your wallet and lose your passphrase, you will &lt;b&gt;LOSE ALL OF YOUR BITCOINS&lt;/b&gt;!</source>
+        <translation>Увага: калі вы зашыфруеце свой гаманец і страціце парольную фразу, то &lt;b&gt;СТРАЦІЦЕ ЎСЕ СВАЕ БІТКОЙНЫ&lt;/b&gt;!</translation>
+    </message>
+    <message>
+        <source>Are you sure you wish to encrypt your wallet?</source>
+        <translation>Ці ўпэўненыя вы, што жадаеце зашыфраваць свой гаманец?</translation>
+    </message>
+    <message>
+        <source>Wallet encrypted</source>
+        <translation>Гаманец зашыфраваны</translation>
+    </message>
+    <message>
+        <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source>
+        <translation>ВАЖНА: Усе папярэднія копіі гаманца варта замяніць новым зашыфраваным файлам. У мэтах бяспекі папярэднія копіі незашыфраванага файла-гаманца стануць неўжывальнымі, калі вы станеце карыстацца новым зашыфраваным гаманцом.</translation>
+    </message>
+    <message>
+        <source>Wallet encryption failed</source>
+        <translation>Шыфраванне гаманца няўдалае</translation>
+    </message>
+    <message>
+        <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
+        <translation>Шыфраванне гаманца не адбылося з-за ўнутранай памылкі. Гаманец незашыфраваны.</translation>
+    </message>
+    <message>
+        <source>The supplied passphrases do not match.</source>
+        <translation>Уведдзеныя паролі не супадаюць</translation>
+    </message>
+    <message>
+        <source>Wallet unlock failed</source>
+        <translation>Разблакаванне гаманца няўдалае</translation>
+    </message>
+    <message>
+        <source>The passphrase entered for the wallet decryption was incorrect.</source>
+        <translation>Уведзены пароль  для расшыфравання гаманца памылковы</translation>
+    </message>
+    <message>
+        <source>Wallet decryption failed</source>
+        <translation>Расшыфраванне гаманца няўдалае</translation>
+    </message>
+    <message>
+        <source>Wallet passphrase was successfully changed.</source>
+        <translation>Парольная фраза гаманца паспяхова зменена.</translation>
+    </message>
+    <message>
+        <source>Warning: The Caps Lock key is on!</source>
+        <translation>Увага: Caps Lock уключаны!</translation>
+    </message>
 </context>
 <context>
     <name>BanTableModel</name>
@@ -234,38 +389,10 @@
         <source>&amp;Command-line options</source>
         <translation>Опцыі каманднага радка</translation>
     </message>
-    <message numerus="yes">
-        <source>%n active connection(s) to Bitcoin network</source>
-        <translation><numerusform>%n актыўнае злучэнне з сецівам Bitcoin</numerusform><numerusform>%n актыўных злучэнняў з сецівам Bitcoin</numerusform><numerusform>%n актыўных злучэнняў з сецівам Bitcoin</numerusform><numerusform>%n актыўных злучэнняў з сецівам Bitcoin</numerusform></translation>
-    </message>
     <message>
         <source>No block source available...</source>
         <translation>Крыніца блокаў недасяжная...</translation>
     </message>
-    <message numerus="yes">
-        <source>Processed %n block(s) of transaction history.</source>
-        <translation><numerusform>Апрацаваны %n блок гісторыі транзакцый.</numerusform><numerusform>Апрацавана %n блокі гісторыі транзакцый.</numerusform><numerusform>Апрацавана %n блокаў гісторыі транзакцый.</numerusform><numerusform>Апрацавана %n блокаў гісторыі транзакцый.</numerusform></translation>
-    </message>
-    <message numerus="yes">
-        <source>%n hour(s)</source>
-        <translation><numerusform>%n гадзіна</numerusform><numerusform>%n гадзіны</numerusform><numerusform>%n гадзін</numerusform><numerusform>%n гадзін</numerusform></translation>
-    </message>
-    <message numerus="yes">
-        <source>%n day(s)</source>
-        <translation><numerusform>%n дзень</numerusform><numerusform>%n дні</numerusform><numerusform>%n дзён</numerusform><numerusform>%n дзён</numerusform></translation>
-    </message>
-    <message numerus="yes">
-        <source>%n week(s)</source>
-        <translation><numerusform>%n тыдзень</numerusform><numerusform>%n тыдні</numerusform><numerusform>%n тыдняў</numerusform><numerusform>%n тыдняў</numerusform></translation>
-    </message>
-    <message>
-        <source>%1 and %2</source>
-        <translation>%1 і %2</translation>
-    </message>
-    <message numerus="yes">
-        <source>%n year(s)</source>
-        <translation><numerusform>%n год</numerusform><numerusform>%n гады</numerusform><numerusform>%n гадоў</numerusform><numerusform>%n гадоў</numerusform></translation>
-    </message>
     <message>
         <source>%1 behind</source>
         <translation>%1 таму</translation>
@@ -344,7 +471,7 @@
         <source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;locked&lt;/b&gt;</source>
         <translation>Гаманец &lt;b&gt;зашыфраваны&lt;/b&gt; і зараз &lt;b&gt;заблакаваны&lt;/b&gt;</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>CoinControlDialog</name>
     <message>
@@ -359,10 +486,6 @@
         <source>Amount:</source>
         <translation>Колькасць:</translation>
     </message>
-    <message>
-        <source>Priority:</source>
-        <translation>Прыярытэт:</translation>
-    </message>
     <message>
         <source>Fee:</source>
         <translation>Камісія:</translation>
@@ -412,10 +535,62 @@
         <translation>Пацверджана</translation>
     </message>
     <message>
-        <source>Priority</source>
-        <translation>Прыярытэт</translation>
+        <source>Copy address</source>
+        <translation>Капіяваць адрас</translation>
     </message>
-</context>
+    <message>
+        <source>Copy label</source>
+        <translation>Капіяваць пазнаку</translation>
+    </message>
+    <message>
+        <source>Copy amount</source>
+        <translation>Капіяваць колькасць</translation>
+    </message>
+    <message>
+        <source>Copy transaction ID</source>
+        <translation>Капіяваць ID транзакцыі</translation>
+    </message>
+    <message>
+        <source>Lock unspent</source>
+        <translation>Замкнуць непатрачанае</translation>
+    </message>
+    <message>
+        <source>Unlock unspent</source>
+        <translation>Адамкнуць непатрачанае</translation>
+    </message>
+    <message>
+        <source>Copy quantity</source>
+        <translation>Капіяваць колькасць</translation>
+    </message>
+    <message>
+        <source>Copy fee</source>
+        <translation>Капіяваць камісію</translation>
+    </message>
+    <message>
+        <source>Copy after fee</source>
+        <translation>Капіяваць з выняткам камісіі</translation>
+    </message>
+    <message>
+        <source>Copy bytes</source>
+        <translation>Капіяваць байты</translation>
+    </message>
+    <message>
+        <source>Copy dust</source>
+        <translation>Капіяваць пыл</translation>
+    </message>
+    <message>
+        <source>yes</source>
+        <translation>так</translation>
+    </message>
+    <message>
+        <source>no</source>
+        <translation>не</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>непазначаны</translation>
+    </message>
+    </context>
 <context>
     <name>EditAddressDialog</name>
     <message>
@@ -430,6 +605,34 @@
         <source>&amp;Address</source>
         <translation>Адрас</translation>
     </message>
+    <message>
+        <source>New receiving address</source>
+        <translation>Новы адрас для атрымання</translation>
+    </message>
+    <message>
+        <source>New sending address</source>
+        <translation>Новы адрас для дасылання</translation>
+    </message>
+    <message>
+        <source>Edit receiving address</source>
+        <translation>Рэдагаваць адрас прымання</translation>
+    </message>
+    <message>
+        <source>Edit sending address</source>
+        <translation>Рэдагаваць адрас дасылання</translation>
+    </message>
+    <message>
+        <source>The entered address "%1" is already in the address book.</source>
+        <translation>Уведзены адрас "%1" ужо ў кніге адрасоў</translation>
+    </message>
+    <message>
+        <source>Could not unlock wallet.</source>
+        <translation>Немагчыма разблакаваць гаманец</translation>
+    </message>
+    <message>
+        <source>New key generation failed.</source>
+        <translation>Генерацыя новага ключа няўдалая</translation>
+    </message>
 </context>
 <context>
     <name>FreespaceChecker</name>
@@ -464,6 +667,10 @@
         <source>command-line options</source>
         <translation>опцыі каманднага радка</translation>
     </message>
+    <message>
+        <source>Start minimized</source>
+        <translation>Стартаваць ммінімізаванай</translation>
+    </message>
     </context>
 <context>
     <name>Intro</name>
@@ -475,15 +682,14 @@
         <source>Error</source>
         <translation>Памылка</translation>
     </message>
-    <message numerus="yes">
-        <source>%n GB of free space available</source>
-        <translation><numerusform>%n Гб вольнага месца даступна</numerusform><numerusform>%n Гб вольнага месца даступна</numerusform><numerusform>%n Гб вольнага месца даступна</numerusform><numerusform>%n Гб вольнага месца даступна</numerusform></translation>
-    </message>
-    <message numerus="yes">
-        <source>(of %n GB needed)</source>
-        <translation><numerusform>(з %n Гб патрэбна)</numerusform><numerusform>(з %n Гб патрэбна)</numerusform><numerusform>(з %n Гб патрэбна)</numerusform><numerusform>(з %n Гб патрэбна)</numerusform></translation>
+    </context>
+<context>
+    <name>ModalOverlay</name>
+    <message>
+        <source>Form</source>
+        <translation>Форма</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>OpenURIDialog</name>
     <message>
@@ -513,6 +719,9 @@
         <translation>Форма</translation>
     </message>
     </context>
+<context>
+    <name>PaymentServer</name>
+    </context>
 <context>
     <name>PeerTableModel</name>
     </context>
@@ -522,6 +731,16 @@
         <source>Amount</source>
         <translation>Колькасць</translation>
     </message>
+    <message>
+        <source>%1 and %2</source>
+        <translation>%1 і %2</translation>
+    </message>
+    </context>
+<context>
+    <name>QObject::QObject</name>
+    </context>
+<context>
+    <name>QRImageWidget</name>
     </context>
 <context>
     <name>RPCConsole</name>
@@ -544,13 +763,56 @@
         <source>&amp;Label:</source>
         <translation>Метка:</translation>
     </message>
-    </context>
+    <message>
+        <source>Copy label</source>
+        <translation>Капіяваць пазнаку</translation>
+    </message>
+    <message>
+        <source>Copy amount</source>
+        <translation>Капіяваць колькасць</translation>
+    </message>
+</context>
 <context>
     <name>ReceiveRequestDialog</name>
     <message>
         <source>Copy &amp;Address</source>
         <translation>Капіяваць адрас</translation>
     </message>
+    <message>
+        <source>Address</source>
+        <translation>Адрас</translation>
+    </message>
+    <message>
+        <source>Amount</source>
+        <translation>Колькасць</translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation>Метка</translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation>Паведамленне</translation>
+    </message>
+    </context>
+<context>
+    <name>RecentRequestsTableModel</name>
+    <message>
+        <source>Date</source>
+        <translation>Дата</translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation>Метка</translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation>Паведамленне</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>непазначаны</translation>
+    </message>
     </context>
 <context>
     <name>SendCoinsDialog</name>
@@ -574,10 +836,6 @@
         <source>Amount:</source>
         <translation>Колькасць:</translation>
     </message>
-    <message>
-        <source>Priority:</source>
-        <translation>Прыярытэт:</translation>
-    </message>
     <message>
         <source>Fee:</source>
         <translation>Камісія:</translation>
@@ -602,7 +860,43 @@
         <source>Confirm the send action</source>
         <translation>Пацвердзіць дасыланне</translation>
     </message>
-    </context>
+    <message>
+        <source>Copy quantity</source>
+        <translation>Капіяваць колькасць</translation>
+    </message>
+    <message>
+        <source>Copy amount</source>
+        <translation>Капіяваць колькасць</translation>
+    </message>
+    <message>
+        <source>Copy fee</source>
+        <translation>Капіяваць камісію</translation>
+    </message>
+    <message>
+        <source>Copy after fee</source>
+        <translation>Капіяваць з выняткам камісіі</translation>
+    </message>
+    <message>
+        <source>Copy bytes</source>
+        <translation>Капіяваць байты</translation>
+    </message>
+    <message>
+        <source>Copy dust</source>
+        <translation>Капіяваць пыл</translation>
+    </message>
+    <message>
+        <source>Confirm send coins</source>
+        <translation>Пацвердзіць дасыланне манет</translation>
+    </message>
+    <message>
+        <source>The amount to pay must be larger than 0.</source>
+        <translation>Велічыня плацяжу мае быць больш за 0.</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>непазначаны</translation>
+    </message>
+</context>
 <context>
     <name>SendCoinsEntry</name>
     <message>
@@ -641,7 +935,14 @@
         <source>Memo:</source>
         <translation>Памятка:</translation>
     </message>
+    <message>
+        <source>Enter a label for this address to add it to your address book</source>
+        <translation>Увядзіце пазнаку гэтаму адрасу, каб дадаць яго ў адрасную кнігу</translation>
+    </message>
 </context>
+<context>
+    <name>SendConfirmationDialog</name>
+    </context>
 <context>
     <name>ShutdownWindow</name>
     </context>
@@ -674,16 +975,274 @@
         <translation>Кб/с</translation>
     </message>
 </context>
+<context>
+    <name>TransactionDesc</name>
+    <message>
+        <source>%1/offline</source>
+        <translation>%1/offline</translation>
+    </message>
+    <message>
+        <source>%1/unconfirmed</source>
+        <translation>%1/непацверджана</translation>
+    </message>
+    <message>
+        <source>%1 confirmations</source>
+        <translation>%1 пацверджанняў</translation>
+    </message>
+    <message>
+        <source>Status</source>
+        <translation>Статус</translation>
+    </message>
+    <message>
+        <source>, has not been successfully broadcast yet</source>
+        <translation>, пакуль не было паспяхова транслявана</translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation>Дата</translation>
+    </message>
+    <message>
+        <source>unknown</source>
+        <translation>невядома</translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation>Паведамленне</translation>
+    </message>
+    <message>
+        <source>Comment</source>
+        <translation>Каментар</translation>
+    </message>
+    <message>
+        <source>Transaction ID</source>
+        <translation>ID</translation>
+    </message>
+    <message>
+        <source>Amount</source>
+        <translation>Колькасць</translation>
+    </message>
+    </context>
 <context>
     <name>TransactionDescDialog</name>
     <message>
         <source>This pane shows a detailed description of the transaction</source>
         <translation>Гэтая панэль паказвае дэтальнае апісанне транзакцыі</translation>
     </message>
+    </context>
+<context>
+    <name>TransactionTableModel</name>
+    <message>
+        <source>Date</source>
+        <translation>Дата</translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation>Тып</translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation>Метка</translation>
+    </message>
+    <message>
+        <source>Confirmed (%1 confirmations)</source>
+        <translation>Пацверджана (%1 пацверджанняў)</translation>
+    </message>
+    <message>
+        <source>This block was not received by any other nodes and will probably not be accepted!</source>
+        <translation>Гэты блок не быў прыняты іншымі вузламі і магчыма не будзе ўхвалены!</translation>
+    </message>
+    <message>
+        <source>Generated but not accepted</source>
+        <translation>Згенеравана, але не прынята</translation>
+    </message>
+    <message>
+        <source>Received with</source>
+        <translation>Прынята з</translation>
+    </message>
+    <message>
+        <source>Received from</source>
+        <translation>Прынята ад</translation>
+    </message>
+    <message>
+        <source>Sent to</source>
+        <translation>Даслана да</translation>
+    </message>
+    <message>
+        <source>Payment to yourself</source>
+        <translation>Плацёж самому сабе</translation>
+    </message>
+    <message>
+        <source>Mined</source>
+        <translation>Здабыта</translation>
+    </message>
+    <message>
+        <source>(n/a)</source>
+        <translation>(n/a)</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>непазначаны</translation>
+    </message>
+    <message>
+        <source>Transaction status. Hover over this field to show number of confirmations.</source>
+        <translation>Статус транзакцыі. Навядзіце курсар на гэтае поле, каб паказаць колькасць пацверджанняў.</translation>
+    </message>
+    <message>
+        <source>Date and time that the transaction was received.</source>
+        <translation>Дата і час, калі транзакцыя была прынята.</translation>
+    </message>
+    <message>
+        <source>Type of transaction.</source>
+        <translation>Тып транзакцыі</translation>
+    </message>
+    <message>
+        <source>Amount removed from or added to balance.</source>
+        <translation>Колькасць аднятая ці даданая да балансу.</translation>
+    </message>
+</context>
+<context>
+    <name>TransactionView</name>
+    <message>
+        <source>All</source>
+        <translation>Усё</translation>
+    </message>
+    <message>
+        <source>Today</source>
+        <translation>Сёння</translation>
+    </message>
+    <message>
+        <source>This week</source>
+        <translation>Гэты тыдзень</translation>
+    </message>
+    <message>
+        <source>This month</source>
+        <translation>Гэты месяц</translation>
+    </message>
+    <message>
+        <source>Last month</source>
+        <translation>Мінулы месяц</translation>
+    </message>
+    <message>
+        <source>This year</source>
+        <translation>Гэты год</translation>
+    </message>
+    <message>
+        <source>Range...</source>
+        <translation>Прамежак...</translation>
+    </message>
+    <message>
+        <source>Received with</source>
+        <translation>Прынята з</translation>
+    </message>
+    <message>
+        <source>Sent to</source>
+        <translation>Даслана да</translation>
+    </message>
+    <message>
+        <source>To yourself</source>
+        <translation>Да сябе</translation>
+    </message>
+    <message>
+        <source>Mined</source>
+        <translation>Здабыта</translation>
+    </message>
+    <message>
+        <source>Other</source>
+        <translation>Іншыя</translation>
+    </message>
+    <message>
+        <source>Enter address or label to search</source>
+        <translation>Увядзіце адрас ці пазнаку для пошуку</translation>
+    </message>
+    <message>
+        <source>Min amount</source>
+        <translation>Мін. колькасць</translation>
+    </message>
+    <message>
+        <source>Copy address</source>
+        <translation>Капіяваць адрас</translation>
+    </message>
+    <message>
+        <source>Copy label</source>
+        <translation>Капіяваць пазнаку</translation>
+    </message>
+    <message>
+        <source>Copy amount</source>
+        <translation>Капіяваць колькасць</translation>
+    </message>
+    <message>
+        <source>Copy transaction ID</source>
+        <translation>Капіяваць ID транзакцыі</translation>
+    </message>
+    <message>
+        <source>Edit label</source>
+        <translation>Рэдагаваць пазнаку</translation>
+    </message>
+    <message>
+        <source>Comma separated file (*.csv)</source>
+        <translation>Коскамі падзелены файл (*.csv)</translation>
+    </message>
+    <message>
+        <source>Confirmed</source>
+        <translation>Пацверджана</translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation>Дата</translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation>Тып</translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation>Метка</translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation>Адрас</translation>
+    </message>
+    <message>
+        <source>ID</source>
+        <translation>ID</translation>
+    </message>
+    <message>
+        <source>Exporting Failed</source>
+        <translation>Экспартаванне няўдалае</translation>
+    </message>
+    <message>
+        <source>Range:</source>
+        <translation>Прамежак:</translation>
+    </message>
+    <message>
+        <source>to</source>
+        <translation>да</translation>
+    </message>
 </context>
 <context>
     <name>UnitDisplayStatusBarControl</name>
     </context>
+<context>
+    <name>WalletFrame</name>
+    </context>
+<context>
+    <name>WalletModel</name>
+    <message>
+        <source>Send Coins</source>
+        <translation>Даслаць Манеты</translation>
+    </message>
+</context>
+<context>
+    <name>WalletView</name>
+    <message>
+        <source>&amp;Export</source>
+        <translation>Экспарт</translation>
+    </message>
+    <message>
+        <source>Export the data in the current tab to a file</source>
+        <translation>Экспартаваць гэтыя звесткі у файл</translation>
+    </message>
+    </context>
 <context>
     <name>bitcoin-core</name>
     <message>
diff --git a/src/qt/locale/bitcoin_bg.ts b/src/qt/locale/bitcoin_bg.ts
index acb60cf41c5aa..5a0fd2aec2302 100644
--- a/src/qt/locale/bitcoin_bg.ts
+++ b/src/qt/locale/bitcoin_bg.ts
@@ -41,6 +41,77 @@
         <source>&amp;Delete</source>
         <translation>&amp;Изтриване</translation>
     </message>
+    <message>
+        <source>Choose the address to send coins to</source>
+        <translation>Изберете адрес, на който да се изпращат монети</translation>
+    </message>
+    <message>
+        <source>Choose the address to receive coins with</source>
+        <translation>Изберете адрес, на който ще получавате монети</translation>
+    </message>
+    <message>
+        <source>C&amp;hoose</source>
+        <translation>Избери</translation>
+    </message>
+    <message>
+        <source>Sending addresses</source>
+        <translation>Адреси за изпращане</translation>
+    </message>
+    <message>
+        <source>Receiving addresses</source>
+        <translation>Адреси за получаване</translation>
+    </message>
+    <message>
+        <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source>
+        <translation>Това са адресите на получателите на плащания. Винаги проверявайте размера на сумата и адреса на получателя, преди да изпратите монети.</translation>
+    </message>
+    <message>
+        <source>These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source>
+        <translation>Това са Вашите Биткойн адреси,благодарение на които ще получавате плащания.Препоръчително е да използвате нови адреси за получаване на всяка транзакция.</translation>
+    </message>
+    <message>
+        <source>&amp;Copy Address</source>
+        <translation>&amp;Копирай адрес</translation>
+    </message>
+    <message>
+        <source>Copy &amp;Label</source>
+        <translation>Копирай &amp;име</translation>
+    </message>
+    <message>
+        <source>&amp;Edit</source>
+        <translation>&amp;Редактирай</translation>
+    </message>
+    <message>
+        <source>Export Address List</source>
+        <translation>Изнасяне на списъка с адреси</translation>
+    </message>
+    <message>
+        <source>Comma separated file (*.csv)</source>
+        <translation>CSV файл (*.csv)</translation>
+    </message>
+    <message>
+        <source>Exporting Failed</source>
+        <translation>Грешка при изнасянето</translation>
+    </message>
+    <message>
+        <source>There was an error trying to save the address list to %1. Please try again.</source>
+        <translation>Възникна грешка при опита за запазване на списъка с адреси в %1.Моля опитайте отново.</translation>
+    </message>
+</context>
+<context>
+    <name>AddressTableModel</name>
+    <message>
+        <source>Label</source>
+        <translation>Име</translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation>Адрес</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(без име)</translation>
+    </message>
 </context>
 <context>
     <name>AskPassphraseDialog</name>
@@ -60,6 +131,90 @@
         <source>Repeat new passphrase</source>
         <translation>Въведете новата парола повторно</translation>
     </message>
+    <message>
+        <source>Enter the new passphrase to the wallet.&lt;br/&gt;Please use a passphrase of &lt;b&gt;ten or more random characters&lt;/b&gt;, or &lt;b&gt;eight or more words&lt;/b&gt;.</source>
+        <translation>Въведете новата парола към портфейла.&lt;br/&gt;Моля ползвайте парола съставена от &lt;b&gt;десет или повече произволни символа&lt;/b&gt;, или &lt;b&gt;осем или повече думи&lt;/b&gt;.</translation>
+    </message>
+    <message>
+        <source>Encrypt wallet</source>
+        <translation>Шифриране на портфейла</translation>
+    </message>
+    <message>
+        <source>This operation needs your wallet passphrase to unlock the wallet.</source>
+        <translation>Тази операция изисква Вашата парола за отключване на портфейла.</translation>
+    </message>
+    <message>
+        <source>Unlock wallet</source>
+        <translation>Отключване на портфейла</translation>
+    </message>
+    <message>
+        <source>This operation needs your wallet passphrase to decrypt the wallet.</source>
+        <translation>Тази операция изисква Вашата парола за дешифриране на портфейла.</translation>
+    </message>
+    <message>
+        <source>Decrypt wallet</source>
+        <translation>Дешифриране на портфейла</translation>
+    </message>
+    <message>
+        <source>Change passphrase</source>
+        <translation>Смяна на паролата</translation>
+    </message>
+    <message>
+        <source>Enter the old passphrase and new passphrase to the wallet.</source>
+        <translation>Въведете старата парола и новата прола към портфейла.</translation>
+    </message>
+    <message>
+        <source>Confirm wallet encryption</source>
+        <translation>Потвърдете на шифрирането на портфейла</translation>
+    </message>
+    <message>
+        <source>Warning: If you encrypt your wallet and lose your passphrase, you will &lt;b&gt;LOSE ALL OF YOUR BITCOINS&lt;/b&gt;!</source>
+        <translation>ВНИМАНИЕ: Ако шифрирате вашият портфейл и изгубите паролата си, &lt;b&gt;ЩЕ ИЗГУБИТЕ ВСИЧКИТЕ СИ БИТКОИНИ&lt;/b&gt;!</translation>
+    </message>
+    <message>
+        <source>Are you sure you wish to encrypt your wallet?</source>
+        <translation>Наистина ли желаете да шифрирате портфейла си?</translation>
+    </message>
+    <message>
+        <source>Wallet encrypted</source>
+        <translation>Портфейлът е шифриран</translation>
+    </message>
+    <message>
+        <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source>
+        <translation>ВАЖНО: Всички стари запазвания, които сте направили на Вашият портфейл трябва да замените с запазване на новополучения, шифриран портфейл. От съображения за сигурност, предишните запазвания на нешифрирани портфейли ще станат неизползваеми веднага, щом започнете да използвате новият, шифриран портфейл.</translation>
+    </message>
+    <message>
+        <source>Wallet encryption failed</source>
+        <translation>Шифрирането беше неуспешно</translation>
+    </message>
+    <message>
+        <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
+        <translation>Шифрирането на портфейла беше неуспешно, поради софтуерен проблем. Портфейлът не е шифриран.</translation>
+    </message>
+    <message>
+        <source>The supplied passphrases do not match.</source>
+        <translation>Паролите не съвпадат</translation>
+    </message>
+    <message>
+        <source>Wallet unlock failed</source>
+        <translation>Неуспешно отключване на портфейла</translation>
+    </message>
+    <message>
+        <source>The passphrase entered for the wallet decryption was incorrect.</source>
+        <translation>Паролата въведена за дешифриране на портфейла е грешна.</translation>
+    </message>
+    <message>
+        <source>Wallet decryption failed</source>
+        <translation>Дешифрирането на портфейла беше неуспешно</translation>
+    </message>
+    <message>
+        <source>Wallet passphrase was successfully changed.</source>
+        <translation>Паролата на портфейла беше променена успешно.</translation>
+    </message>
+    <message>
+        <source>Warning: The Caps Lock key is on!</source>
+        <translation>Внимание: Caps Lock (главни букви) е включен.</translation>
+    </message>
 </context>
 <context>
     <name>BanTableModel</name>
@@ -258,10 +413,6 @@
         <source>&amp;Command-line options</source>
         <translation>&amp;Налични команди</translation>
     </message>
-    <message numerus="yes">
-        <source>%n active connection(s) to Bitcoin network</source>
-        <translation><numerusform>%n активна връзка към Биткойн мрежата</numerusform><numerusform>%n активни връзки към Биткойн мрежата</numerusform></translation>
-    </message>
     <message>
         <source>Indexing blocks on disk...</source>
         <translation>Индексиране на блокове на диска...</translation>
@@ -274,30 +425,6 @@
         <source>No block source available...</source>
         <translation>Липсва източник на блоковете...</translation>
     </message>
-    <message numerus="yes">
-        <source>Processed %n block(s) of transaction history.</source>
-        <translation><numerusform>Преработен %n блок от историята с транзакции.</numerusform><numerusform>Преработени %n блокове от историята с транзакции.</numerusform></translation>
-    </message>
-    <message numerus="yes">
-        <source>%n hour(s)</source>
-        <translation><numerusform>%n час</numerusform><numerusform>%n часа</numerusform></translation>
-    </message>
-    <message numerus="yes">
-        <source>%n day(s)</source>
-        <translation><numerusform>%n ден</numerusform><numerusform>%n дни</numerusform></translation>
-    </message>
-    <message numerus="yes">
-        <source>%n week(s)</source>
-        <translation><numerusform>%n седмица</numerusform><numerusform>%n седмици</numerusform></translation>
-    </message>
-    <message>
-        <source>%1 and %2</source>
-        <translation>%1 и %2</translation>
-    </message>
-    <message numerus="yes">
-        <source>%n year(s)</source>
-        <translation><numerusform>%n година</numerusform><numerusform>%n години</numerusform></translation>
-    </message>
     <message>
         <source>%1 behind</source>
         <translation>%1 зад</translation>
@@ -384,7 +511,7 @@
         <source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;locked&lt;/b&gt;</source>
         <translation>Портфейлът е &lt;b&gt;криптиран&lt;/b&gt; и &lt;b&gt;заключен&lt;/b&gt;</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>CoinControlDialog</name>
     <message>
@@ -403,10 +530,6 @@
         <source>Amount:</source>
         <translation>Сума:</translation>
     </message>
-    <message>
-        <source>Priority:</source>
-        <translation>Приоритет:</translation>
-    </message>
     <message>
         <source>Fee:</source>
         <translation>Такса:</translation>
@@ -460,8 +583,76 @@
         <translation>Потвърдени</translation>
     </message>
     <message>
-        <source>Priority</source>
-        <translation>Приоритет</translation>
+        <source>Copy address</source>
+        <translation>Копирай адрес</translation>
+    </message>
+    <message>
+        <source>Copy label</source>
+        <translation>Копирай име</translation>
+    </message>
+    <message>
+        <source>Copy amount</source>
+        <translation>Копирай сума</translation>
+    </message>
+    <message>
+        <source>Copy transaction ID</source>
+        <translation>Копирай транзакция с ID</translation>
+    </message>
+    <message>
+        <source>Lock unspent</source>
+        <translation>Заключване на неизхарченото</translation>
+    </message>
+    <message>
+        <source>Unlock unspent</source>
+        <translation>Отключване на неизхарченото</translation>
+    </message>
+    <message>
+        <source>Copy quantity</source>
+        <translation>Копиране на количеството</translation>
+    </message>
+    <message>
+        <source>Copy fee</source>
+        <translation>Копиране на данък добавена стойност</translation>
+    </message>
+    <message>
+        <source>Copy after fee</source>
+        <translation>Копиране след прилагане на данък добавена стойност</translation>
+    </message>
+    <message>
+        <source>Copy bytes</source>
+        <translation>Копиране на байтовете</translation>
+    </message>
+    <message>
+        <source>Copy dust</source>
+        <translation>Копирай прахта:</translation>
+    </message>
+    <message>
+        <source>Copy change</source>
+        <translation>Копирай рестото</translation>
+    </message>
+    <message>
+        <source>(%1 locked)</source>
+        <translation>(%1 заключен)</translation>
+    </message>
+    <message>
+        <source>yes</source>
+        <translation>да</translation>
+    </message>
+    <message>
+        <source>no</source>
+        <translation>не</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(без име)</translation>
+    </message>
+    <message>
+        <source>change from %1 (%2)</source>
+        <translation>ресто от %1 (%2)</translation>
+    </message>
+    <message>
+        <source>(change)</source>
+        <translation>(промени)</translation>
     </message>
 </context>
 <context>
@@ -486,6 +677,38 @@
         <source>&amp;Address</source>
         <translation>&amp;Адрес</translation>
     </message>
+    <message>
+        <source>New receiving address</source>
+        <translation>Нов адрес за получаване</translation>
+    </message>
+    <message>
+        <source>New sending address</source>
+        <translation>Нов адрес за изпращане</translation>
+    </message>
+    <message>
+        <source>Edit receiving address</source>
+        <translation>Редактиране на адрес за получаване</translation>
+    </message>
+    <message>
+        <source>Edit sending address</source>
+        <translation>Редактиране на адрес за изпращане</translation>
+    </message>
+    <message>
+        <source>The entered address "%1" is not a valid Bitcoin address.</source>
+        <translation>"%1" не е валиден Биткоин адрес.</translation>
+    </message>
+    <message>
+        <source>The entered address "%1" is already in the address book.</source>
+        <translation>Вече има адрес "%1" в списъка с адреси.</translation>
+    </message>
+    <message>
+        <source>Could not unlock wallet.</source>
+        <translation>Отключването на портфейла беше неуспешно.</translation>
+    </message>
+    <message>
+        <source>New key generation failed.</source>
+        <translation>Създаването на ключ беше неуспешно.</translation>
+    </message>
 </context>
 <context>
     <name>FreespaceChecker</name>
@@ -587,15 +810,22 @@
         <source>Error</source>
         <translation>Грешка</translation>
     </message>
-    <message numerus="yes">
-        <source>%n GB of free space available</source>
-        <translation><numerusform>%n GB свободно пространство на разположение</numerusform><numerusform>%n GB свободно пространство на разположение</numerusform></translation>
+    </context>
+<context>
+    <name>ModalOverlay</name>
+    <message>
+        <source>Form</source>
+        <translation>Формуляр</translation>
+    </message>
+    <message>
+        <source>Last block time</source>
+        <translation>Време на последния блок</translation>
     </message>
-    <message numerus="yes">
-        <source>(of %n GB needed)</source>
-        <translation><numerusform>(%n GB е нужен)</numerusform><numerusform>(%n GB са нужни)</numerusform></translation>
+    <message>
+        <source>Hide</source>
+        <translation>Скрий</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>OpenURIDialog</name>
     <message>
@@ -830,16 +1060,79 @@
     </message>
     </context>
 <context>
-    <name>PeerTableModel</name>
+    <name>PaymentServer</name>
     <message>
-        <source>User Agent</source>
-        <translation>Клиент на потребителя</translation>
+        <source>Payment request error</source>
+        <translation>Възникна грешка по време назаявката за плащане</translation>
     </message>
     <message>
-        <source>Ping Time</source>
-        <translation>Време за отговор</translation>
+        <source>Cannot start bitcoin: click-to-pay handler</source>
+        <translation>Биткойн не можe да се стартира: click-to-pay handler</translation>
+    </message>
+    <message>
+        <source>URI handling</source>
+        <translation>Справяне с URI</translation>
+    </message>
+    <message>
+        <source>Invalid payment address %1</source>
+        <translation>Невалиден адрес на плащане %1</translation>
+    </message>
+    <message>
+        <source>Payment request file handling</source>
+        <translation>Файл за справяне със заявки</translation>
+    </message>
+    <message>
+        <source>Payment request rejected</source>
+        <translation>Заявката за плащане беше отхвърлена</translation>
+    </message>
+    <message>
+        <source>Payment request network doesn't match client network.</source>
+        <translation>Мрежата от която се извършва заявката за плащане не съвпада с мрежата на клиента.</translation>
+    </message>
+    <message>
+        <source>Payment request expired.</source>
+        <translation>Заявката за плащане е изтекла.</translation>
+    </message>
+    <message>
+        <source>Invalid payment request.</source>
+        <translation>Невалидна заявка за плащане.</translation>
+    </message>
+    <message>
+        <source>Requested payment amount of %1 is too small (considered dust).</source>
+        <translation>Заявената сума за плащане: %1 е твърде малка (счита се за отпадък)</translation>
+    </message>
+    <message>
+        <source>Refund from %1</source>
+        <translation>Възстановяване на сума от %1</translation>
+    </message>
+    <message>
+        <source>Payment request %1 is too large (%2 bytes, allowed %3 bytes).</source>
+        <translation>Заявката за плащане %1 е твърде голям (%2 байта, позволени %3 байта).</translation>
+    </message>
+    <message>
+        <source>Error communicating with %1: %2</source>
+        <translation>Грешка при комуникацията с %1: %2</translation>
+    </message>
+    <message>
+        <source>Bad response from server %1</source>
+        <translation>Възникна проблем при свързването със сървър %1</translation>
+    </message>
+    <message>
+        <source>Network request error</source>
+        <translation>Грешка в мрежата по време на заявката</translation>
+    </message>
+    <message>
+        <source>Payment acknowledged</source>
+        <translation>Плащането е прието</translation>
     </message>
 </context>
+<context>
+    <name>PeerTableModel</name>
+    <message>
+        <source>User Agent</source>
+        <translation>Клиент на потребителя</translation>
+    </message>
+    </context>
 <context>
     <name>QObject</name>
     <message>
@@ -878,6 +1171,32 @@
         <source>%1 ms</source>
         <translation>%1 милисекунда</translation>
     </message>
+    <message>
+        <source>%1 and %2</source>
+        <translation>%1 и %2</translation>
+    </message>
+    </context>
+<context>
+    <name>QObject::QObject</name>
+    </context>
+<context>
+    <name>QRImageWidget</name>
+    <message>
+        <source>&amp;Save Image...</source>
+        <translation>&amp;Запиши изображение...</translation>
+    </message>
+    <message>
+        <source>&amp;Copy Image</source>
+        <translation>&amp;Копирай изображение</translation>
+    </message>
+    <message>
+        <source>Save QR Code</source>
+        <translation>Запази QR Код</translation>
+    </message>
+    <message>
+        <source>PNG Image (*.png)</source>
+        <translation>PNG Изображение (*.png)</translation>
+    </message>
 </context>
 <context>
     <name>RPCConsole</name>
@@ -1112,6 +1431,18 @@
         <source>Remove</source>
         <translation>Премахване</translation>
     </message>
+    <message>
+        <source>Copy label</source>
+        <translation>Копирай име</translation>
+    </message>
+    <message>
+        <source>Copy message</source>
+        <translation>Копиране на съобщението</translation>
+    </message>
+    <message>
+        <source>Copy amount</source>
+        <translation>Копирай сума</translation>
+    </message>
 </context>
 <context>
     <name>ReceiveRequestDialog</name>
@@ -1131,7 +1462,58 @@
         <source>&amp;Save Image...</source>
         <translation>&amp;Запиши изображение...</translation>
     </message>
+    <message>
+        <source>Request payment to %1</source>
+        <translation>Изискване на плащане от %1</translation>
+    </message>
+    <message>
+        <source>Payment information</source>
+        <translation>Данни за плащането</translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation>Адрес</translation>
+    </message>
+    <message>
+        <source>Amount</source>
+        <translation>Сума</translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation>Име</translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation>Съобщение</translation>
+    </message>
+    <message>
+        <source>Error encoding URI into QR Code.</source>
+        <translation>Грешка при създаването на QR Code от URI.</translation>
+    </message>
 </context>
+<context>
+    <name>RecentRequestsTableModel</name>
+    <message>
+        <source>Date</source>
+        <translation>Дата</translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation>Име</translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation>Съобщение</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(без име)</translation>
+    </message>
+    <message>
+        <source>(no message)</source>
+        <translation>(без съобщение)</translation>
+    </message>
+    </context>
 <context>
     <name>SendCoinsDialog</name>
     <message>
@@ -1162,10 +1544,6 @@
         <source>Amount:</source>
         <translation>Сума:</translation>
     </message>
-    <message>
-        <source>Priority:</source>
-        <translation>Приоритет:</translation>
-    </message>
     <message>
         <source>Fee:</source>
         <translation>Такса:</translation>
@@ -1210,10 +1588,6 @@
         <source>Custom:</source>
         <translation>По избор:</translation>
     </message>
-    <message>
-        <source>Confirmation time:</source>
-        <translation>Време за потвърждение:</translation>
-    </message>
     <message>
         <source>normal</source>
         <translation>нормален</translation>
@@ -1254,6 +1628,82 @@
         <source>S&amp;end</source>
         <translation>И&amp;зпрати</translation>
     </message>
+    <message>
+        <source>Copy quantity</source>
+        <translation>Копиране на количеството</translation>
+    </message>
+    <message>
+        <source>Copy amount</source>
+        <translation>Копирай сума</translation>
+    </message>
+    <message>
+        <source>Copy fee</source>
+        <translation>Копиране на данък добавена стойност</translation>
+    </message>
+    <message>
+        <source>Copy after fee</source>
+        <translation>Копиране след прилагане на данък добавена стойност</translation>
+    </message>
+    <message>
+        <source>Copy bytes</source>
+        <translation>Копиране на байтовете</translation>
+    </message>
+    <message>
+        <source>Copy dust</source>
+        <translation>Копирай прахта:</translation>
+    </message>
+    <message>
+        <source>Copy change</source>
+        <translation>Копирай рестото</translation>
+    </message>
+    <message>
+        <source>Are you sure you want to send?</source>
+        <translation>Наистина ли искате да изпратите?</translation>
+    </message>
+    <message>
+        <source>added as transaction fee</source>
+        <translation>добавено като такса за транзакция</translation>
+    </message>
+    <message>
+        <source>or</source>
+        <translation>или</translation>
+    </message>
+    <message>
+        <source>Confirm send coins</source>
+        <translation>Потвърждаване</translation>
+    </message>
+    <message>
+        <source>The amount to pay must be larger than 0.</source>
+        <translation>Сумата трябва да е по-голяма от 0.</translation>
+    </message>
+    <message>
+        <source>The amount exceeds your balance.</source>
+        <translation>Сумата надвишава текущия баланс</translation>
+    </message>
+    <message>
+        <source>The total exceeds your balance when the %1 transaction fee is included.</source>
+        <translation>Сумата при добавяне на данък добавена стойност по %1 транзакцията надвишава сумата по вашата сметка.</translation>
+    </message>
+    <message>
+        <source>Transaction creation failed!</source>
+        <translation>Грешка при създаването на транзакция!</translation>
+    </message>
+    <message>
+        <source>Payment request expired.</source>
+        <translation>Заявката за плащане е изтекла.</translation>
+    </message>
+    <message>
+        <source>Warning: Invalid Bitcoin address</source>
+        <translation>Внимание: Невалиден Биткойн адрес</translation>
+    </message>
+    <message>
+        <source>Warning: Unknown change address</source>
+        <translation>Внимание:Неизвестен адрес за промяна</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(без име)</translation>
+    </message>
 </context>
 <context>
     <name>SendCoinsEntry</name>
@@ -1305,6 +1755,17 @@
         <source>Memo:</source>
         <translation>Бележка:</translation>
     </message>
+    <message>
+        <source>Enter a label for this address to add it to your address book</source>
+        <translation>Въведете име за този адрес, за да го добавите в списъка с адреси</translation>
+    </message>
+</context>
+<context>
+    <name>SendConfirmationDialog</name>
+    <message>
+        <source>Yes</source>
+        <translation>Да</translation>
+    </message>
 </context>
 <context>
     <name>ShutdownWindow</name>
@@ -1375,7 +1836,59 @@
         <source>Verify &amp;Message</source>
         <translation>Потвърди &amp;съобщението</translation>
     </message>
-    </context>
+    <message>
+        <source>Click "Sign Message" to generate signature</source>
+        <translation>Натиснете "Подписване на съобщение" за да създадете подпис</translation>
+    </message>
+    <message>
+        <source>The entered address is invalid.</source>
+        <translation>Въведеният адрес е невалиден.</translation>
+    </message>
+    <message>
+        <source>Please check the address and try again.</source>
+        <translation>Моля проверете адреса и опитайте отново.</translation>
+    </message>
+    <message>
+        <source>The entered address does not refer to a key.</source>
+        <translation>Въведеният адрес не може да се съпостави с валиден ключ.</translation>
+    </message>
+    <message>
+        <source>Wallet unlock was cancelled.</source>
+        <translation>Отключването на портфейла беше отменено.</translation>
+    </message>
+    <message>
+        <source>Private key for the entered address is not available.</source>
+        <translation>Не е наличен частен ключ за въведеният адрес.</translation>
+    </message>
+    <message>
+        <source>Message signing failed.</source>
+        <translation>Подписването на съобщение беше неуспешно.</translation>
+    </message>
+    <message>
+        <source>Message signed.</source>
+        <translation>Съобщението е подписано.</translation>
+    </message>
+    <message>
+        <source>The signature could not be decoded.</source>
+        <translation>Подписът не може да бъде декодиран.</translation>
+    </message>
+    <message>
+        <source>Please check the signature and try again.</source>
+        <translation>Проверете подписа и опитайте отново.</translation>
+    </message>
+    <message>
+        <source>The signature did not match the message digest.</source>
+        <translation>Подписът не отговаря на комбинацията от съобщение и адрес.</translation>
+    </message>
+    <message>
+        <source>Message verification failed.</source>
+        <translation>Проверката на съобщението беше неуспешна.</translation>
+    </message>
+    <message>
+        <source>Message verified.</source>
+        <translation>Съобщението е потвърдено.</translation>
+    </message>
+</context>
 <context>
     <name>SplashScreen</name>
     <message>
@@ -1390,16 +1903,434 @@
         <translation>Килобайта в секунда</translation>
     </message>
 </context>
+<context>
+    <name>TransactionDesc</name>
+    <message>
+        <source>Open until %1</source>
+        <translation>Подлежи на промяна до %1</translation>
+    </message>
+    <message>
+        <source>%1/offline</source>
+        <translation>%1/офлайн</translation>
+    </message>
+    <message>
+        <source>%1/unconfirmed</source>
+        <translation>%1/непотвърдени</translation>
+    </message>
+    <message>
+        <source>%1 confirmations</source>
+        <translation>включена в %1 блока</translation>
+    </message>
+    <message>
+        <source>Status</source>
+        <translation>Статус</translation>
+    </message>
+    <message>
+        <source>, has not been successfully broadcast yet</source>
+        <translation>, все още не е изпратено</translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation>Дата</translation>
+    </message>
+    <message>
+        <source>Source</source>
+        <translation>Източник</translation>
+    </message>
+    <message>
+        <source>Generated</source>
+        <translation>Издадени</translation>
+    </message>
+    <message>
+        <source>From</source>
+        <translation>От</translation>
+    </message>
+    <message>
+        <source>unknown</source>
+        <translation>неизвестен</translation>
+    </message>
+    <message>
+        <source>To</source>
+        <translation>За</translation>
+    </message>
+    <message>
+        <source>own address</source>
+        <translation>собствен адрес</translation>
+    </message>
+    <message>
+        <source>watch-only</source>
+        <translation>само гледане</translation>
+    </message>
+    <message>
+        <source>label</source>
+        <translation>име</translation>
+    </message>
+    <message>
+        <source>Credit</source>
+        <translation>Кредит</translation>
+    </message>
+    <message>
+        <source>not accepted</source>
+        <translation>не е приет</translation>
+    </message>
+    <message>
+        <source>Debit</source>
+        <translation>Дебит</translation>
+    </message>
+    <message>
+        <source>Total debit</source>
+        <translation>Общ дълг</translation>
+    </message>
+    <message>
+        <source>Total credit</source>
+        <translation>Общ дълг</translation>
+    </message>
+    <message>
+        <source>Transaction fee</source>
+        <translation>Такса</translation>
+    </message>
+    <message>
+        <source>Net amount</source>
+        <translation>Нетна сума</translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation>Съобщение</translation>
+    </message>
+    <message>
+        <source>Comment</source>
+        <translation>Коментар</translation>
+    </message>
+    <message>
+        <source>Transaction ID</source>
+        <translation>ID</translation>
+    </message>
+    <message>
+        <source>Merchant</source>
+        <translation>Търговец</translation>
+    </message>
+    <message>
+        <source>Generated coins must mature %1 blocks before they can be spent. When you generated this block, it was broadcast to the network to be added to the block chain. If it fails to get into the chain, its state will change to "not accepted" and it won't be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source>
+        <translation>Генерираните монети трябва да отлежат %1 блока преди да могат да бъдат похарчени. Когато генерираш блока, той се разпространява в мрежата, за да се добави в блок-веригата. Ако не успее да се добави във веригата, неговия статус  ще се стане "неприет" и няма да може да се похарчи. Това е възможно да се случи случайно, ако друг възел генерира блок няколко секунди след твоя.</translation>
+    </message>
+    <message>
+        <source>Debug information</source>
+        <translation>Информация за грешките</translation>
+    </message>
+    <message>
+        <source>Transaction</source>
+        <translation>Транзакция</translation>
+    </message>
+    <message>
+        <source>Amount</source>
+        <translation>Сума</translation>
+    </message>
+    <message>
+        <source>true</source>
+        <translation>true</translation>
+    </message>
+    <message>
+        <source>false</source>
+        <translation>false</translation>
+    </message>
+</context>
 <context>
     <name>TransactionDescDialog</name>
     <message>
         <source>This pane shows a detailed description of the transaction</source>
         <translation>Описание на транзакцията</translation>
     </message>
+    </context>
+<context>
+    <name>TransactionTableModel</name>
+    <message>
+        <source>Date</source>
+        <translation>Дата</translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation>Тип</translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation>Име</translation>
+    </message>
+    <message>
+        <source>Open until %1</source>
+        <translation>Подлежи на промяна до %1</translation>
+    </message>
+    <message>
+        <source>Offline</source>
+        <translation>Извън линия</translation>
+    </message>
+    <message>
+        <source>Unconfirmed</source>
+        <translation>Непотвърдено</translation>
+    </message>
+    <message>
+        <source>Confirming (%1 of %2 recommended confirmations)</source>
+        <translation>Потвърждаване (%1 от %2 препоръчвани потвърждения)</translation>
+    </message>
+    <message>
+        <source>Confirmed (%1 confirmations)</source>
+        <translation>Потвърдени (%1 потвърждения)</translation>
+    </message>
+    <message>
+        <source>Conflicted</source>
+        <translation>Конфликтно</translation>
+    </message>
+    <message>
+        <source>Immature (%1 confirmations, will be available after %2)</source>
+        <translation>Неплатим (%1 потвърждения, ще бъде платим след %2)</translation>
+    </message>
+    <message>
+        <source>This block was not received by any other nodes and will probably not be accepted!</source>
+        <translation>Блокът не е получен от останалите участници и най-вероятно няма да бъде одобрен.</translation>
+    </message>
+    <message>
+        <source>Generated but not accepted</source>
+        <translation>Генерирана, но отхвърлена от мрежата</translation>
+    </message>
+    <message>
+        <source>Received with</source>
+        <translation>Получени</translation>
+    </message>
+    <message>
+        <source>Received from</source>
+        <translation>Получен от</translation>
+    </message>
+    <message>
+        <source>Sent to</source>
+        <translation>Изпратени на</translation>
+    </message>
+    <message>
+        <source>Payment to yourself</source>
+        <translation>Плащане към себе си</translation>
+    </message>
+    <message>
+        <source>Mined</source>
+        <translation>Емитирани</translation>
+    </message>
+    <message>
+        <source>watch-only</source>
+        <translation>само гледане</translation>
+    </message>
+    <message>
+        <source>(n/a)</source>
+        <translation>(n/a)</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(без име)</translation>
+    </message>
+    <message>
+        <source>Transaction status. Hover over this field to show number of confirmations.</source>
+        <translation>Състояние на транзакцията. Задръжте върху това поле за брой потвърждения.</translation>
+    </message>
+    <message>
+        <source>Date and time that the transaction was received.</source>
+        <translation>Дата и час на получаване на транзакцията.</translation>
+    </message>
+    <message>
+        <source>Type of transaction.</source>
+        <translation>Вид транзакция.</translation>
+    </message>
+    <message>
+        <source>Amount removed from or added to balance.</source>
+        <translation>Сума извадена или добавена към баланса.</translation>
+    </message>
+</context>
+<context>
+    <name>TransactionView</name>
+    <message>
+        <source>All</source>
+        <translation>Всички</translation>
+    </message>
+    <message>
+        <source>Today</source>
+        <translation>Днес</translation>
+    </message>
+    <message>
+        <source>This week</source>
+        <translation>Тази седмица</translation>
+    </message>
+    <message>
+        <source>This month</source>
+        <translation>Този месец</translation>
+    </message>
+    <message>
+        <source>Last month</source>
+        <translation>Предния месец</translation>
+    </message>
+    <message>
+        <source>This year</source>
+        <translation>Тази година</translation>
+    </message>
+    <message>
+        <source>Range...</source>
+        <translation>От - до...</translation>
+    </message>
+    <message>
+        <source>Received with</source>
+        <translation>Получени</translation>
+    </message>
+    <message>
+        <source>Sent to</source>
+        <translation>Изпратени на</translation>
+    </message>
+    <message>
+        <source>To yourself</source>
+        <translation>Собствени</translation>
+    </message>
+    <message>
+        <source>Mined</source>
+        <translation>Емитирани</translation>
+    </message>
+    <message>
+        <source>Other</source>
+        <translation>Други</translation>
+    </message>
+    <message>
+        <source>Enter address or label to search</source>
+        <translation>Търсене по адрес или име</translation>
+    </message>
+    <message>
+        <source>Min amount</source>
+        <translation>Минимална сума</translation>
+    </message>
+    <message>
+        <source>Copy address</source>
+        <translation>Копирай адрес</translation>
+    </message>
+    <message>
+        <source>Copy label</source>
+        <translation>Копирай име</translation>
+    </message>
+    <message>
+        <source>Copy amount</source>
+        <translation>Копирай сума</translation>
+    </message>
+    <message>
+        <source>Copy transaction ID</source>
+        <translation>Копирай транзакция с ID</translation>
+    </message>
+    <message>
+        <source>Edit label</source>
+        <translation>Редактирай име</translation>
+    </message>
+    <message>
+        <source>Show transaction details</source>
+        <translation>Подробности за транзакцията</translation>
+    </message>
+    <message>
+        <source>Export Transaction History</source>
+        <translation>Изнасяне историята на транзакциите</translation>
+    </message>
+    <message>
+        <source>Comma separated file (*.csv)</source>
+        <translation>CSV файл (*.csv)</translation>
+    </message>
+    <message>
+        <source>Confirmed</source>
+        <translation>Потвърдени</translation>
+    </message>
+    <message>
+        <source>Watch-only</source>
+        <translation>само гледане</translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation>Дата</translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation>Тип</translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation>Име</translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation>Адрес</translation>
+    </message>
+    <message>
+        <source>ID</source>
+        <translation>ИД</translation>
+    </message>
+    <message>
+        <source>Exporting Failed</source>
+        <translation>Грешка при изнасянето</translation>
+    </message>
+    <message>
+        <source>Exporting Successful</source>
+        <translation>Изнасянето е успешна</translation>
+    </message>
+    <message>
+        <source>The transaction history was successfully saved to %1.</source>
+        <translation>Историята с транзакциите беше успешно запазена в %1.</translation>
+    </message>
+    <message>
+        <source>Range:</source>
+        <translation>От:</translation>
+    </message>
+    <message>
+        <source>to</source>
+        <translation>до</translation>
+    </message>
 </context>
 <context>
     <name>UnitDisplayStatusBarControl</name>
     </context>
+<context>
+    <name>WalletFrame</name>
+    <message>
+        <source>No wallet has been loaded.</source>
+        <translation>Няма зареден портфейл.</translation>
+    </message>
+</context>
+<context>
+    <name>WalletModel</name>
+    <message>
+        <source>Send Coins</source>
+        <translation>Изпращане</translation>
+    </message>
+</context>
+<context>
+    <name>WalletView</name>
+    <message>
+        <source>&amp;Export</source>
+        <translation>Изнеси</translation>
+    </message>
+    <message>
+        <source>Export the data in the current tab to a file</source>
+        <translation>Запишете данните от текущия раздел във файл</translation>
+    </message>
+    <message>
+        <source>Backup Wallet</source>
+        <translation>Запазване на портфейла</translation>
+    </message>
+    <message>
+        <source>Wallet Data (*.dat)</source>
+        <translation>Информация за портфейла (*.dat)</translation>
+    </message>
+    <message>
+        <source>Backup Failed</source>
+        <translation>Неуспешно запазване на портфейла</translation>
+    </message>
+    <message>
+        <source>There was an error trying to save the wallet data to %1.</source>
+        <translation>Възникна грешка при запазването на информацията за портфейла в %1.</translation>
+    </message>
+    <message>
+        <source>Backup Successful</source>
+        <translation>Успешно запазване на портфейла</translation>
+    </message>
+    <message>
+        <source>The wallet data was successfully saved to %1.</source>
+        <translation>Информацията за портфейла беше успешно запазена в %1.</translation>
+    </message>
+</context>
 <context>
     <name>bitcoin-core</name>
     <message>
@@ -1418,18 +2349,10 @@
         <source>Specify your own public address</source>
         <translation>Въведете Ваш публичен адрес</translation>
     </message>
-    <message>
-        <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
-        <translation>Приемайте връзки отвън.(по подразбиране:1 в противен случай -proxy или -connect)</translation>
-    </message>
     <message>
         <source>Bitcoin Core</source>
         <translation>Биткойн ядро</translation>
     </message>
-    <message>
-        <source>Whitelist peers connecting from the given netmask or IP address. Can be specified multiple times.</source>
-        <translation>Сложете в бял списък пиъри,свързващи се от дадената интернет маска или айпи адрес.Може да бъде заложено неколкократно.</translation>
-    </message>
     <message>
         <source>&lt;category&gt; can be:</source>
         <translation>&lt;category&gt; може да бъде:</translation>
@@ -1490,10 +2413,6 @@
         <source>Transaction amount too small</source>
         <translation>Сумата на транзакцията е твърде малка</translation>
     </message>
-    <message>
-        <source>Transaction amounts must be positive</source>
-        <translation>Сумите на транзакциите трябва да са положителни</translation>
-    </message>
     <message>
         <source>Transaction too large</source>
         <translation>Транзакцията е твърде голяма</translation>
diff --git a/src/qt/locale/bitcoin_bg_BG.ts b/src/qt/locale/bitcoin_bg_BG.ts
index 4bddb5ff4a8ae..d982da4dd8642 100644
--- a/src/qt/locale/bitcoin_bg_BG.ts
+++ b/src/qt/locale/bitcoin_bg_BG.ts
@@ -41,6 +41,77 @@
         <source>&amp;Delete</source>
         <translation>Изтрий</translation>
     </message>
+    <message>
+        <source>Choose the address to send coins to</source>
+        <translation>Избери адреса на който да пратиш монети</translation>
+    </message>
+    <message>
+        <source>Choose the address to receive coins with</source>
+        <translation>Избери адреса на който да получиш монети</translation>
+    </message>
+    <message>
+        <source>C&amp;hoose</source>
+        <translation>Избери</translation>
+    </message>
+    <message>
+        <source>Sending addresses</source>
+        <translation>Адрес за пращане</translation>
+    </message>
+    <message>
+        <source>Receiving addresses</source>
+        <translation>Адрес за получаване</translation>
+    </message>
+    <message>
+        <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source>
+        <translation>Тези са вашите Биткойн адреси за изпращане на монети. Винаги проверявайте количеството и получаващия адрес преди изпращане. </translation>
+    </message>
+    <message>
+        <source>These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source>
+        <translation>Това са вашите Биткойн адреси за получаване на монети. Препоръчително е да ползвате нов адрес на всяка транзакция.</translation>
+    </message>
+    <message>
+        <source>&amp;Copy Address</source>
+        <translation>Копирай адрес</translation>
+    </message>
+    <message>
+        <source>Copy &amp;Label</source>
+        <translation>Копирай етикет</translation>
+    </message>
+    <message>
+        <source>&amp;Edit</source>
+        <translation>Редактирай</translation>
+    </message>
+    <message>
+        <source>Export Address List</source>
+        <translation>Изнеси лист с адреси</translation>
+    </message>
+    <message>
+        <source>Comma separated file (*.csv)</source>
+        <translation>Comma separated file (*.csv)</translation>
+    </message>
+    <message>
+        <source>Exporting Failed</source>
+        <translation>Изнасянето се провали</translation>
+    </message>
+    <message>
+        <source>There was an error trying to save the address list to %1. Please try again.</source>
+        <translation>Получи се грешка при запазването на листа с адреси към %1. Моля опитайте пак.</translation>
+    </message>
+</context>
+<context>
+    <name>AddressTableModel</name>
+    <message>
+        <source>Label</source>
+        <translation>Етикет</translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation>Адрес</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(без етикет)</translation>
+    </message>
 </context>
 <context>
     <name>AskPassphraseDialog</name>
@@ -60,7 +131,35 @@
         <source>Repeat new passphrase</source>
         <translation>Повтори парола</translation>
     </message>
-</context>
+    <message>
+        <source>Encrypt wallet</source>
+        <translation>Криптирай портфейл</translation>
+    </message>
+    <message>
+        <source>This operation needs your wallet passphrase to unlock the wallet.</source>
+        <translation>Тази операция изисква вашата парола на портфейла за отключването на портфейла.</translation>
+    </message>
+    <message>
+        <source>Unlock wallet</source>
+        <translation>Отключи портфейла</translation>
+    </message>
+    <message>
+        <source>This operation needs your wallet passphrase to decrypt the wallet.</source>
+        <translation>Тази операция изисква вашата парола на портфейла за декриптирането на портфейла.</translation>
+    </message>
+    <message>
+        <source>Decrypt wallet</source>
+        <translation>Декриптирай портфейл</translation>
+    </message>
+    <message>
+        <source>Change passphrase</source>
+        <translation>Промени парола</translation>
+    </message>
+    <message>
+        <source>Confirm wallet encryption</source>
+        <translation>Потвърди криптирането на порфейла</translation>
+    </message>
+    </context>
 <context>
     <name>BanTableModel</name>
     <message>
@@ -165,6 +264,10 @@
     </context>
 <context>
     <name>CoinControlDialog</name>
+    <message>
+        <source>(no label)</source>
+        <translation>(без етикет)</translation>
+    </message>
     </context>
 <context>
     <name>EditAddressDialog</name>
@@ -178,6 +281,9 @@
 <context>
     <name>Intro</name>
     </context>
+<context>
+    <name>ModalOverlay</name>
+    </context>
 <context>
     <name>OpenURIDialog</name>
     </context>
@@ -187,12 +293,21 @@
 <context>
     <name>OverviewPage</name>
     </context>
+<context>
+    <name>PaymentServer</name>
+    </context>
 <context>
     <name>PeerTableModel</name>
     </context>
 <context>
     <name>QObject</name>
     </context>
+<context>
+    <name>QObject::QObject</name>
+    </context>
+<context>
+    <name>QRImageWidget</name>
+    </context>
 <context>
     <name>RPCConsole</name>
     </context>
@@ -201,13 +316,39 @@
     </context>
 <context>
     <name>ReceiveRequestDialog</name>
+    <message>
+        <source>Address</source>
+        <translation>Адрес</translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation>Етикет</translation>
+    </message>
     </context>
 <context>
-    <name>SendCoinsDialog</name>
+    <name>RecentRequestsTableModel</name>
+    <message>
+        <source>Label</source>
+        <translation>Етикет</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(без етикет)</translation>
+    </message>
     </context>
+<context>
+    <name>SendCoinsDialog</name>
+    <message>
+        <source>(no label)</source>
+        <translation>(без етикет)</translation>
+    </message>
+</context>
 <context>
     <name>SendCoinsEntry</name>
     </context>
+<context>
+    <name>SendConfirmationDialog</name>
+    </context>
 <context>
     <name>ShutdownWindow</name>
     </context>
@@ -220,12 +361,62 @@
 <context>
     <name>TrafficGraphWidget</name>
     </context>
+<context>
+    <name>TransactionDesc</name>
+    </context>
 <context>
     <name>TransactionDescDialog</name>
     </context>
+<context>
+    <name>TransactionTableModel</name>
+    <message>
+        <source>Label</source>
+        <translation>Етикет</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(без етикет)</translation>
+    </message>
+    </context>
+<context>
+    <name>TransactionView</name>
+    <message>
+        <source>Comma separated file (*.csv)</source>
+        <translation>Comma separated file (*.csv)</translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation>Етикет</translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation>Адрес</translation>
+    </message>
+    <message>
+        <source>Exporting Failed</source>
+        <translation>Изнасянето се провали</translation>
+    </message>
+    </context>
 <context>
     <name>UnitDisplayStatusBarControl</name>
     </context>
+<context>
+    <name>WalletFrame</name>
+    </context>
+<context>
+    <name>WalletModel</name>
+    </context>
+<context>
+    <name>WalletView</name>
+    <message>
+        <source>&amp;Export</source>
+        <translation>Изнеси</translation>
+    </message>
+    <message>
+        <source>Export the data in the current tab to a file</source>
+        <translation>Изнеси данните в избрания раздел към файл</translation>
+    </message>
+    </context>
 <context>
     <name>bitcoin-core</name>
     <message>
diff --git a/src/qt/locale/bitcoin_ca.ts b/src/qt/locale/bitcoin_ca.ts
index ed259c4d08de9..c09d857632794 100644
--- a/src/qt/locale/bitcoin_ca.ts
+++ b/src/qt/locale/bitcoin_ca.ts
@@ -41,6 +41,77 @@
         <source>&amp;Delete</source>
         <translation>&amp;Elimina</translation>
     </message>
+    <message>
+        <source>Choose the address to send coins to</source>
+        <translation>Trieu l'adreça on enviar les monedes</translation>
+    </message>
+    <message>
+        <source>Choose the address to receive coins with</source>
+        <translation>Trieu l'adreça on rebre les monedes</translation>
+    </message>
+    <message>
+        <source>C&amp;hoose</source>
+        <translation>&amp;Tria</translation>
+    </message>
+    <message>
+        <source>Sending addresses</source>
+        <translation>Adreces d'enviament</translation>
+    </message>
+    <message>
+        <source>Receiving addresses</source>
+        <translation>Adreces de recepció</translation>
+    </message>
+    <message>
+        <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source>
+        <translation>Aquestes són les vostres adreces de Bitcoin per enviar els pagaments. Sempre reviseu l'import i l'adreça del destinatari abans de transferir monedes.</translation>
+    </message>
+    <message>
+        <source>These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source>
+        <translation>Aquestes són les vostres adreces Bitcoin per rebre pagaments. Es recomana utilitzar una adreça nova de recepció per a cada transacció.</translation>
+    </message>
+    <message>
+        <source>&amp;Copy Address</source>
+        <translation>&amp;Copia l'adreça</translation>
+    </message>
+    <message>
+        <source>Copy &amp;Label</source>
+        <translation>Copia l'eti&amp;queta</translation>
+    </message>
+    <message>
+        <source>&amp;Edit</source>
+        <translation>&amp;Edita</translation>
+    </message>
+    <message>
+        <source>Export Address List</source>
+        <translation>Exporta la llista d'adreces</translation>
+    </message>
+    <message>
+        <source>Comma separated file (*.csv)</source>
+        <translation>Fitxer separat per comes (*.csv)</translation>
+    </message>
+    <message>
+        <source>Exporting Failed</source>
+        <translation>L'exportació ha fallat</translation>
+    </message>
+    <message>
+        <source>There was an error trying to save the address list to %1. Please try again.</source>
+        <translation>S'ha produït un error en desar la llista d'adreces a %1. Torneu-ho a provar.</translation>
+    </message>
+</context>
+<context>
+    <name>AddressTableModel</name>
+    <message>
+        <source>Label</source>
+        <translation>Etiqueta</translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation>Adreça</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(sense etiqueta)</translation>
+    </message>
 </context>
 <context>
     <name>AskPassphraseDialog</name>
@@ -60,6 +131,94 @@
         <source>Repeat new passphrase</source>
         <translation>Repetiu la nova contrasenya</translation>
     </message>
+    <message>
+        <source>Enter the new passphrase to the wallet.&lt;br/&gt;Please use a passphrase of &lt;b&gt;ten or more random characters&lt;/b&gt;, or &lt;b&gt;eight or more words&lt;/b&gt;.</source>
+        <translation>Introduïu la contrasenya nova al moneder.&lt;br/&gt;Utilitzeu una contrasenya de &lt;b&gt;deu o més caràcters aleatoris&lt;/b&gt;, o &lt;b&gt;vuit o més paraules&lt;/b&gt;.</translation>
+    </message>
+    <message>
+        <source>Encrypt wallet</source>
+        <translation>Encripta el moneder</translation>
+    </message>
+    <message>
+        <source>This operation needs your wallet passphrase to unlock the wallet.</source>
+        <translation>Aquesta operació requereix la contrasenya del moneder per a desbloquejar-lo.</translation>
+    </message>
+    <message>
+        <source>Unlock wallet</source>
+        <translation>Desbloqueja el moneder</translation>
+    </message>
+    <message>
+        <source>This operation needs your wallet passphrase to decrypt the wallet.</source>
+        <translation>Aquesta operació requereix la contrasenya del moneder per desencriptar-lo.</translation>
+    </message>
+    <message>
+        <source>Decrypt wallet</source>
+        <translation>Desencripta el moneder</translation>
+    </message>
+    <message>
+        <source>Change passphrase</source>
+        <translation>Canvia la contrasenya</translation>
+    </message>
+    <message>
+        <source>Enter the old passphrase and new passphrase to the wallet.</source>
+        <translation>Introduïu la contrasenya antiga i la contrasenya nova al moneder.</translation>
+    </message>
+    <message>
+        <source>Confirm wallet encryption</source>
+        <translation>Confirma l'encriptació del moneder</translation>
+    </message>
+    <message>
+        <source>Warning: If you encrypt your wallet and lose your passphrase, you will &lt;b&gt;LOSE ALL OF YOUR BITCOINS&lt;/b&gt;!</source>
+        <translation>Avís: si encripteu el vostre moneder i perdeu la contrasenya, &lt;b&gt;PERDREU TOTS ELS VOSTRES BITCOINS&lt;/b&gt;!</translation>
+    </message>
+    <message>
+        <source>Are you sure you wish to encrypt your wallet?</source>
+        <translation>Esteu segur que voleu encriptar el vostre moneder?</translation>
+    </message>
+    <message>
+        <source>Wallet encrypted</source>
+        <translation>Moneder encriptat</translation>
+    </message>
+    <message>
+        <source>%1 will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source>
+        <translation>Ara es tancarà el %1 per finalitzar el procés d'encriptació. Recordeu que encriptar el vostre moneder no garanteix que les vostres bitcoins no puguin ser robades per programari maliciós que infecti l'ordinador.</translation>
+    </message>
+    <message>
+        <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source>
+        <translation>IMPORTANT: Tota copia de seguretat que hàgiu realitzat hauria de ser reemplaçada pel, recentment generat, fitxer encriptat del moneder. Per motius de seguretat, les còpies de seguretat anteriors del fitxer de moneder no encriptat esdevindran inusables tan aviat com començar a utilitzar el nou moneder encriptat.</translation>
+    </message>
+    <message>
+        <source>Wallet encryption failed</source>
+        <translation>L'encriptació del moneder ha fallat</translation>
+    </message>
+    <message>
+        <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
+        <translation>L'encriptació del moneder ha fallat per un error intern. El moneder no ha estat encriptat.</translation>
+    </message>
+    <message>
+        <source>The supplied passphrases do not match.</source>
+        <translation>Les contrasenyes introduïdes no coincideixen.</translation>
+    </message>
+    <message>
+        <source>Wallet unlock failed</source>
+        <translation>El desbloqueig del moneder ha fallat</translation>
+    </message>
+    <message>
+        <source>The passphrase entered for the wallet decryption was incorrect.</source>
+        <translation>La contrasenya introduïda per a desencriptar el moneder és incorrecta.</translation>
+    </message>
+    <message>
+        <source>Wallet decryption failed</source>
+        <translation>La desencriptació del moneder ha fallat</translation>
+    </message>
+    <message>
+        <source>Wallet passphrase was successfully changed.</source>
+        <translation>La contrasenya del moneder ha estat modificada correctament.</translation>
+    </message>
+    <message>
+        <source>Warning: The Caps Lock key is on!</source>
+        <translation>Avís: Les lletres majúscules estan activades!</translation>
+    </message>
 </context>
 <context>
     <name>BanTableModel</name>
@@ -110,6 +269,14 @@
         <source>Quit application</source>
         <translation>Surt de l'aplicació</translation>
     </message>
+    <message>
+        <source>&amp;About %1</source>
+        <translation>Qu&amp;ant al %1</translation>
+    </message>
+    <message>
+        <source>Show information about %1</source>
+        <translation>Mosta informació sobre el %1</translation>
+    </message>
     <message>
         <source>About &amp;Qt</source>
         <translation>Quant a &amp;Qt</translation>
@@ -122,6 +289,10 @@
         <source>&amp;Options...</source>
         <translation>&amp;Opcions...</translation>
     </message>
+    <message>
+        <source>Modify configuration options for %1</source>
+        <translation>Modifica les opcions de configuració de %1</translation>
+    </message>
     <message>
         <source>&amp;Encrypt Wallet...</source>
         <translation>&amp;Encripta el moneder...</translation>
@@ -140,12 +311,24 @@
     </message>
     <message>
         <source>&amp;Receiving addresses...</source>
-        <translation>Adreces de &amp;recepció</translation>
+        <translation>Adreces de &amp;recepció...</translation>
     </message>
     <message>
         <source>Open &amp;URI...</source>
         <translation>Obre un &amp;URI...</translation>
     </message>
+    <message>
+        <source>Click to disable network activity.</source>
+        <translation>Feu clic per inhabilitar l'activitat de la xarxa.</translation>
+    </message>
+    <message>
+        <source>Network activity disabled.</source>
+        <translation>S'ha inhabilitat l'activitat de la xarxa.</translation>
+    </message>
+    <message>
+        <source>Click to enable network activity again.</source>
+        <translation>Feu clic per tornar a habilitar l'activitat de la xarxa.</translation>
+    </message>
     <message>
         <source>Reindexing blocks on disk...</source>
         <translation>S'estan reindexant els blocs al disc...</translation>
@@ -251,32 +434,20 @@
         <translation><numerusform>%n connexió activa a la xarxa Bitcoin</numerusform><numerusform>%n connexions actives a la xarxa Bitcoin</numerusform></translation>
     </message>
     <message>
-        <source>No block source available...</source>
-        <translation>No hi ha cap font de bloc disponible...</translation>
-    </message>
-    <message numerus="yes">
-        <source>Processed %n block(s) of transaction history.</source>
-        <translation><numerusform>S'han processat %n bloc de l'historial de transacció.</numerusform><numerusform>S'han processat %n blocs de l'historial de transacció.</numerusform></translation>
-    </message>
-    <message numerus="yes">
-        <source>%n hour(s)</source>
-        <translation><numerusform>%n hora</numerusform><numerusform>%n hores</numerusform></translation>
-    </message>
-    <message numerus="yes">
-        <source>%n day(s)</source>
-        <translation><numerusform>%n dia</numerusform><numerusform>%n dies</numerusform></translation>
+        <source>Indexing blocks on disk...</source>
+        <translation>S'estan indexant els blocs al disc...</translation>
     </message>
-    <message numerus="yes">
-        <source>%n week(s)</source>
-        <translation><numerusform>%n setmana</numerusform><numerusform>%n setmanes</numerusform></translation>
+    <message>
+        <source>Processing blocks on disk...</source>
+        <translation>S'estan processant els blocs al disc...</translation>
     </message>
     <message>
-        <source>%1 and %2</source>
-        <translation>%1 i %2</translation>
+        <source>No block source available...</source>
+        <translation>No hi ha cap font de bloc disponible...</translation>
     </message>
     <message numerus="yes">
-        <source>%n year(s)</source>
-        <translation><numerusform>%n any</numerusform><numerusform>%n anys</numerusform></translation>
+        <source>Processed %n block(s) of transaction history.</source>
+        <translation><numerusform>S'ha processat %n bloc de l'historial de transacció.</numerusform><numerusform>S'han processat %n blocs de l'historial de transacció.</numerusform></translation>
     </message>
     <message>
         <source>%1 behind</source>
@@ -306,6 +477,14 @@
         <source>Up to date</source>
         <translation>Al dia</translation>
     </message>
+    <message>
+        <source>Show the %1 help message to get a list with possible Bitcoin command-line options</source>
+        <translation>Mostra el missatge d'ajuda del %1 per obtenir una llista amb les possibles opcions de línia d'ordres de Bitcoin</translation>
+    </message>
+    <message>
+        <source>%1 client</source>
+        <translation>Client de %1</translation>
+    </message>
     <message>
         <source>Catching up...</source>
         <translation>S'està posant al dia ...</translation>
@@ -348,6 +527,14 @@
         <source>Incoming transaction</source>
         <translation>Transacció entrant</translation>
     </message>
+    <message>
+        <source>HD key generation is &lt;b&gt;enabled&lt;/b&gt;</source>
+        <translation>La generació de la clau HD és &lt;b&gt;habilitada&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <source>HD key generation is &lt;b&gt;disabled&lt;/b&gt;</source>
+        <translation>La generació de la clau HD és &lt;b&gt;inhabilitada&lt;/b&gt;</translation>
+    </message>
     <message>
         <source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;unlocked&lt;/b&gt;</source>
         <translation>El moneder està &lt;b&gt;encriptat&lt;/b&gt; i actualment &lt;b&gt;desbloquejat&lt;/b&gt;</translation>
@@ -356,6 +543,10 @@
         <source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;locked&lt;/b&gt;</source>
         <translation>El moneder està &lt;b&gt;encriptat&lt;/b&gt; i actualment &lt;b&gt;bloquejat&lt;/b&gt;</translation>
     </message>
+    <message>
+        <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source>
+        <translation>S'ha produït un error fatal. Bitcoin no pot continuar amb seguretat i finalitzarà.</translation>
+    </message>
 </context>
 <context>
     <name>CoinControlDialog</name>
@@ -375,13 +566,9 @@
         <source>Amount:</source>
         <translation>Import:</translation>
     </message>
-    <message>
-        <source>Priority:</source>
-        <translation>Prioritat:</translation>
-    </message>
     <message>
         <source>Fee:</source>
-        <translation>Comissió</translation>
+        <translation>Comissió:</translation>
     </message>
     <message>
         <source>Dust:</source>
@@ -432,8 +619,84 @@
         <translation>Confirmat</translation>
     </message>
     <message>
-        <source>Priority</source>
-        <translation>Prioritat</translation>
+        <source>Copy address</source>
+        <translation>Copia l'adreça</translation>
+    </message>
+    <message>
+        <source>Copy label</source>
+        <translation>Copia l'etiqueta</translation>
+    </message>
+    <message>
+        <source>Copy amount</source>
+        <translation>Copia l'import</translation>
+    </message>
+    <message>
+        <source>Copy transaction ID</source>
+        <translation>Copia l'ID de transacció</translation>
+    </message>
+    <message>
+        <source>Lock unspent</source>
+        <translation>Bloqueja sense gastar</translation>
+    </message>
+    <message>
+        <source>Unlock unspent</source>
+        <translation>Desbloqueja sense gastar</translation>
+    </message>
+    <message>
+        <source>Copy quantity</source>
+        <translation>Copia la quantitat</translation>
+    </message>
+    <message>
+        <source>Copy fee</source>
+        <translation>Copia la comissió</translation>
+    </message>
+    <message>
+        <source>Copy after fee</source>
+        <translation>Copia la comissió posterior</translation>
+    </message>
+    <message>
+        <source>Copy bytes</source>
+        <translation>Copia els bytes</translation>
+    </message>
+    <message>
+        <source>Copy dust</source>
+        <translation>Copia el polsim</translation>
+    </message>
+    <message>
+        <source>Copy change</source>
+        <translation>Copia el canvi</translation>
+    </message>
+    <message>
+        <source>(%1 locked)</source>
+        <translation>(%1 bloquejada)</translation>
+    </message>
+    <message>
+        <source>yes</source>
+        <translation>sí</translation>
+    </message>
+    <message>
+        <source>no</source>
+        <translation>no</translation>
+    </message>
+    <message>
+        <source>This label turns red if any recipient receives an amount smaller than the current dust threshold.</source>
+        <translation>Aquesta etiqueta es torna vermella si cap recipient rep un import inferior al llindar de polsim actual.</translation>
+    </message>
+    <message>
+        <source>Can vary +/- %1 satoshi(s) per input.</source>
+        <translation>Pot variar en +/- %1 satoshi(s) per entrada.</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(sense etiqueta)</translation>
+    </message>
+    <message>
+        <source>change from %1 (%2)</source>
+        <translation>canvia de %1 (%2)</translation>
+    </message>
+    <message>
+        <source>(change)</source>
+        <translation>(canvia)</translation>
     </message>
 </context>
 <context>
@@ -458,6 +721,38 @@
         <source>&amp;Address</source>
         <translation>&amp;Adreça</translation>
     </message>
+    <message>
+        <source>New receiving address</source>
+        <translation>Nova adreça de recepció</translation>
+    </message>
+    <message>
+        <source>New sending address</source>
+        <translation>Nova adreça d'enviament</translation>
+    </message>
+    <message>
+        <source>Edit receiving address</source>
+        <translation>Edita l'adreça de recepció</translation>
+    </message>
+    <message>
+        <source>Edit sending address</source>
+        <translation>Edita l'adreça d'enviament</translation>
+    </message>
+    <message>
+        <source>The entered address "%1" is not a valid Bitcoin address.</source>
+        <translation>L'adreça introduïda «%1» no és una adreça de Bitcoin vàlida.</translation>
+    </message>
+    <message>
+        <source>The entered address "%1" is already in the address book.</source>
+        <translation>L'adreça introduïda «%1» ja és present a la llibreta d'adreces.</translation>
+    </message>
+    <message>
+        <source>Could not unlock wallet.</source>
+        <translation>No s'ha pogut desbloquejar el moneder.</translation>
+    </message>
+    <message>
+        <source>New key generation failed.</source>
+        <translation>Ha fallat la generació d'una clau nova.</translation>
+    </message>
 </context>
 <context>
     <name>FreespaceChecker</name>
@@ -492,6 +787,10 @@
         <source>(%1-bit)</source>
         <translation>(%1-bit)</translation>
     </message>
+    <message>
+        <source>About %1</source>
+        <translation>Quant al %1</translation>
+    </message>
     <message>
         <source>Command-line options</source>
         <translation>Opcions de línia d'ordres</translation>
@@ -528,12 +827,28 @@
         <source>Show splash screen on startup (default: %u)</source>
         <translation>Mostra la pantalla de benvinguda a l'inici (per defecte: %u)</translation>
     </message>
-    </context>
+    <message>
+        <source>Reset all settings changed in the GUI</source>
+        <translation>Reinicialitza tots els canvis de configuració fets des de la interfície gràfica</translation>
+    </message>
+</context>
 <context>
     <name>Intro</name>
     <message>
         <source>Welcome</source>
-        <translation>Us donem la benviguda</translation>
+        <translation>Us donem la benvinguda</translation>
+    </message>
+    <message>
+        <source>Welcome to %1.</source>
+        <translation>Us donem la benvinguda a %1.</translation>
+    </message>
+    <message>
+        <source>As this is the first time the program is launched, you can choose where %1 will store its data.</source>
+        <translation>Com és la primera vegada que s'executa el programa, podeu triar on %1 emmagatzemarà les dades.</translation>
+    </message>
+    <message>
+        <source>%1 will download and store a copy of the Bitcoin block chain. At least %2GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source>
+        <translation>%1 baixarà i emmagatzemarà una còpia de la cadena de blocs de Bitcoin. Com a mínim %2GB de dades s'emmagatzemaran en aquest directori, i augmentarà al llarg del temps. El moneder també s'emmagatzemarà en aquest directori.</translation>
     </message>
     <message>
         <source>Use the default data directory</source>
@@ -560,6 +875,37 @@
         <translation><numerusform>(de %n GB necessari)</numerusform><numerusform>(de %n GB necessaris)</numerusform></translation>
     </message>
 </context>
+<context>
+    <name>ModalOverlay</name>
+    <message>
+        <source>Form</source>
+        <translation>Formulari</translation>
+    </message>
+    <message>
+        <source>Last block time</source>
+        <translation>Últim temps de bloc</translation>
+    </message>
+    <message>
+        <source>Progress</source>
+        <translation>Progrés</translation>
+    </message>
+    <message>
+        <source>calculating...</source>
+        <translation>s'està calculant...</translation>
+    </message>
+    <message>
+        <source>Estimated time left until synced</source>
+        <translation>Temps estimat restant fins sincronitzat</translation>
+    </message>
+    <message>
+        <source>Hide</source>
+        <translation>Amaga</translation>
+    </message>
+    <message>
+        <source>Unknown. Syncing Headers (%1)...</source>
+        <translation>Desconegut. Sincronització de les capçaleres (%1)...</translation>
+    </message>
+</context>
 <context>
     <name>OpenURIDialog</name>
     <message>
@@ -578,6 +924,10 @@
         <source>Select payment request file</source>
         <translation>Selecciona un fitxer de sol·licitud de pagament</translation>
     </message>
+    <message>
+        <source>Select payment request file to open</source>
+        <translation>Seleccioneu el fitxer de sol·licitud de pagament per obrir</translation>
+    </message>
 </context>
 <context>
     <name>OptionsDialog</name>
@@ -589,6 +939,14 @@
         <source>&amp;Main</source>
         <translation>&amp;Principal</translation>
     </message>
+    <message>
+        <source>Automatically start %1 after logging in to the system.</source>
+        <translation>Inicieu %1 automàticament després d'entrar en el sistema.</translation>
+    </message>
+    <message>
+        <source>&amp;Start %1 on system login</source>
+        <translation>&amp;Inicia %1 en l'entrada al sistema</translation>
+    </message>
     <message>
         <source>Size of &amp;database cache</source>
         <translation>Mida de la memòria cau de la base de &amp;dades</translation>
@@ -725,6 +1083,14 @@
         <source>&amp;Window</source>
         <translation>&amp;Finestra</translation>
     </message>
+    <message>
+        <source>&amp;Hide the icon from the system tray.</source>
+        <translation>Ama&amp;ga la icona de la safata del sistema.</translation>
+    </message>
+    <message>
+        <source>Hide tray icon</source>
+        <translation>Amaga la icona de la safata</translation>
+    </message>
     <message>
         <source>Show only a tray icon after minimizing the window.</source>
         <translation>Mostra només la icona de la barra en minimitzar la finestra.</translation>
@@ -745,6 +1111,10 @@
         <source>User Interface &amp;language:</source>
         <translation>&amp;Llengua de la interfície d'usuari:</translation>
     </message>
+    <message>
+        <source>The user interface language can be set here. This setting will take effect after restarting %1.</source>
+        <translation>Aquí es pot definir la llengua de la interfície d'usuari. Aquest paràmetre tindrà efecte en reiniciar el %1.</translation>
+    </message>
     <message>
         <source>&amp;Unit to show amounts in:</source>
         <translation>&amp;Unitats per mostrar els imports en:</translation>
@@ -870,68 +1240,181 @@
     </message>
 </context>
 <context>
-    <name>PeerTableModel</name>
+    <name>PaymentServer</name>
     <message>
-        <source>User Agent</source>
-        <translation>Agent d'usuari</translation>
+        <source>Payment request error</source>
+        <translation>Error de la sol·licitud de pagament</translation>
     </message>
     <message>
-        <source>Node/Service</source>
-        <translation>Node/Servei</translation>
+        <source>Cannot start bitcoin: click-to-pay handler</source>
+        <translation>No es pot iniciar bitcoin: controlador click-to-pay</translation>
     </message>
     <message>
-        <source>Ping Time</source>
-        <translation>Temps de ping</translation>
+        <source>URI handling</source>
+        <translation>Gestió d'URI</translation>
     </message>
-</context>
-<context>
-    <name>QObject</name>
     <message>
-        <source>Amount</source>
-        <translation>Import</translation>
+        <source>Payment request fetch URL is invalid: %1</source>
+        <translation>L'URL de recuperació de la sol·licitud de pagament no és vàlida: %1</translation>
     </message>
     <message>
-        <source>Enter a Bitcoin address (e.g. %1)</source>
-        <translation>Introduïu una adreça de Bitcoin (p. ex. %1)</translation>
+        <source>Invalid payment address %1</source>
+        <translation>Adreça de pagament no vàlida %1</translation>
     </message>
     <message>
-        <source>%1 d</source>
-        <translation>%1 d</translation>
+        <source>URI cannot be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source>
+        <translation>L'URI no pot ser analitzat! Això pot ser a causa d'una adreça de Bitcoin no vàlida o per paràmetres URI amb mal format.</translation>
     </message>
     <message>
-        <source>%1 h</source>
-        <translation>%1 h</translation>
+        <source>Payment request file handling</source>
+        <translation>Gestió de fitxers de les sol·licituds de pagament</translation>
     </message>
     <message>
-        <source>%1 m</source>
-        <translation>%1 m</translation>
+        <source>Payment request file cannot be read! This can be caused by an invalid payment request file.</source>
+        <translation>No es pot llegir el fitxer de la sol·licitud de pagament. Això pot ser causat per un fitxer de sol·licitud de pagament no vàlid.</translation>
     </message>
     <message>
-        <source>%1 s</source>
-        <translation>%1 s</translation>
+        <source>Payment request rejected</source>
+        <translation>La sol·licitud de pagament s'ha rebutjat</translation>
     </message>
     <message>
-        <source>None</source>
-        <translation>Cap</translation>
+        <source>Payment request network doesn't match client network.</source>
+        <translation>La xarxa de la sol·licitud de pagament no coincideix amb la xarxa del client.</translation>
     </message>
     <message>
-        <source>N/A</source>
-        <translation>N/A</translation>
+        <source>Payment request expired.</source>
+        <translation>La sol·licitud de pagament ha vençut.</translation>
     </message>
     <message>
-        <source>%1 ms</source>
-        <translation>%1 ms</translation>
+        <source>Payment request is not initialized.</source>
+        <translation>La sol·licitud de pagament no està inicialitzada.</translation>
     </message>
-</context>
-<context>
-    <name>RPCConsole</name>
     <message>
-        <source>N/A</source>
-        <translation>N/A</translation>
+        <source>Unverified payment requests to custom payment scripts are unsupported.</source>
+        <translation>No s'accepten sol·licituds de pagament no verificades a scripts de pagament personalitzats.</translation>
     </message>
     <message>
-        <source>Client version</source>
-        <translation>Versió del client</translation>
+        <source>Invalid payment request.</source>
+        <translation>Sol·licitud de pagament no vàlida.</translation>
+    </message>
+    <message>
+        <source>Requested payment amount of %1 is too small (considered dust).</source>
+        <translation>L'import de pagament sol·licitat %1 és massa petit (es considera polsim).</translation>
+    </message>
+    <message>
+        <source>Refund from %1</source>
+        <translation>Reemborsament de %1</translation>
+    </message>
+    <message>
+        <source>Payment request %1 is too large (%2 bytes, allowed %3 bytes).</source>
+        <translation>La sol·licitud de pagament %1 és massa gran (%2 bytes, permès %3 bytes).</translation>
+    </message>
+    <message>
+        <source>Error communicating with %1: %2</source>
+        <translation>Error en comunicar amb %1: %2</translation>
+    </message>
+    <message>
+        <source>Payment request cannot be parsed!</source>
+        <translation>No es pot analitzar la sol·licitud de pagament!</translation>
+    </message>
+    <message>
+        <source>Bad response from server %1</source>
+        <translation>Mala resposta del servidor %1</translation>
+    </message>
+    <message>
+        <source>Network request error</source>
+        <translation>Error en la sol·licitud de xarxa</translation>
+    </message>
+    <message>
+        <source>Payment acknowledged</source>
+        <translation>Pagament reconegut</translation>
+    </message>
+</context>
+<context>
+    <name>PeerTableModel</name>
+    <message>
+        <source>User Agent</source>
+        <translation>Agent d'usuari</translation>
+    </message>
+    <message>
+        <source>Node/Service</source>
+        <translation>Node/Servei</translation>
+    </message>
+    </context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Amount</source>
+        <translation>Import</translation>
+    </message>
+    <message>
+        <source>Enter a Bitcoin address (e.g. %1)</source>
+        <translation>Introduïu una adreça de Bitcoin (p. ex. %1)</translation>
+    </message>
+    <message>
+        <source>%1 d</source>
+        <translation>%1 d</translation>
+    </message>
+    <message>
+        <source>%1 h</source>
+        <translation>%1 h</translation>
+    </message>
+    <message>
+        <source>%1 m</source>
+        <translation>%1 m</translation>
+    </message>
+    <message>
+        <source>%1 s</source>
+        <translation>%1 s</translation>
+    </message>
+    <message>
+        <source>None</source>
+        <translation>Cap</translation>
+    </message>
+    <message>
+        <source>N/A</source>
+        <translation>N/A</translation>
+    </message>
+    <message>
+        <source>%1 ms</source>
+        <translation>%1 ms</translation>
+    </message>
+    <message>
+        <source>%1 and %2</source>
+        <translation>%1 i %2</translation>
+    </message>
+    </context>
+<context>
+    <name>QObject::QObject</name>
+    </context>
+<context>
+    <name>QRImageWidget</name>
+    <message>
+        <source>&amp;Save Image...</source>
+        <translation>De&amp;sa la imatge...</translation>
+    </message>
+    <message>
+        <source>&amp;Copy Image</source>
+        <translation>&amp;Copia la imatge</translation>
+    </message>
+    <message>
+        <source>Save QR Code</source>
+        <translation>Desa el codi QR</translation>
+    </message>
+    <message>
+        <source>PNG Image (*.png)</source>
+        <translation>Imatge PNG (*.png)</translation>
+    </message>
+</context>
+<context>
+    <name>RPCConsole</name>
+    <message>
+        <source>N/A</source>
+        <translation>N/A</translation>
+    </message>
+    <message>
+        <source>Client version</source>
+        <translation>Versió del client</translation>
     </message>
     <message>
         <source>&amp;Information</source>
@@ -949,6 +1432,10 @@
         <source>Using BerkeleyDB version</source>
         <translation>Utilitzant BerkeleyDB versió</translation>
     </message>
+    <message>
+        <source>Datadir</source>
+        <translation>Datadir</translation>
+    </message>
     <message>
         <source>Startup time</source>
         <translation>&amp;Temps d'inici</translation>
@@ -1109,14 +1596,6 @@
         <source>Clear console</source>
         <translation>Neteja la consola</translation>
     </message>
-    <message>
-        <source>&amp;Disconnect Node</source>
-        <translation>&amp;Desconnecta el node</translation>
-    </message>
-    <message>
-        <source>Ban Node for</source>
-        <translation>Bandeja el node durant</translation>
-    </message>
     <message>
         <source>1 &amp;hour</source>
         <translation>1 &amp;hora</translation>
@@ -1133,10 +1612,6 @@
         <source>1 &amp;year</source>
         <translation>1 &amp;any</translation>
     </message>
-    <message>
-        <source>&amp;Unban Node</source>
-        <translation>&amp;Desbandeja el node</translation>
-    </message>
     <message>
         <source>Use up and down arrows to navigate history, and &lt;b&gt;Ctrl-L&lt;/b&gt; to clear screen.</source>
         <translation>Utilitza les fletxes d'amunt i avall per navegar per l'historial, i &lt;b&gt;Ctrl-L&lt;\b&gt; per netejar la pantalla.</translation>
@@ -1264,6 +1739,18 @@
         <source>Remove</source>
         <translation>Esborra</translation>
     </message>
+    <message>
+        <source>Copy label</source>
+        <translation>Copia l'etiqueta</translation>
+    </message>
+    <message>
+        <source>Copy message</source>
+        <translation>Copia el missatge</translation>
+    </message>
+    <message>
+        <source>Copy amount</source>
+        <translation>Copia l'import</translation>
+    </message>
 </context>
 <context>
     <name>ReceiveRequestDialog</name>
@@ -1283,6 +1770,73 @@
         <source>&amp;Save Image...</source>
         <translation>De&amp;sa la imatge...</translation>
     </message>
+    <message>
+        <source>Request payment to %1</source>
+        <translation>Sol·licita un pagament a %1</translation>
+    </message>
+    <message>
+        <source>Payment information</source>
+        <translation>Informació de pagament</translation>
+    </message>
+    <message>
+        <source>URI</source>
+        <translation>URI</translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation>Adreça</translation>
+    </message>
+    <message>
+        <source>Amount</source>
+        <translation>Import</translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation>Etiqueta</translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation>Missatge</translation>
+    </message>
+    <message>
+        <source>Resulting URI too long, try to reduce the text for label / message.</source>
+        <translation>URI resultant massa llarga, intenta reduir el text per a la etiqueta / missatge</translation>
+    </message>
+    <message>
+        <source>Error encoding URI into QR Code.</source>
+        <translation>Error en codificar l'URI en un codi QR.</translation>
+    </message>
+</context>
+<context>
+    <name>RecentRequestsTableModel</name>
+    <message>
+        <source>Date</source>
+        <translation>Data</translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation>Etiqueta</translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation>Missatge</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(sense etiqueta)</translation>
+    </message>
+    <message>
+        <source>(no message)</source>
+        <translation>(sense missatge)</translation>
+    </message>
+    <message>
+        <source>(no amount requested)</source>
+        <translation>(no s'ha sol·licitat import)</translation>
+    </message>
+    <message>
+        <source>Requested</source>
+        <translation>Sol·licitat</translation>
+    </message>
 </context>
 <context>
     <name>SendCoinsDialog</name>
@@ -1318,10 +1872,6 @@
         <source>Amount:</source>
         <translation>Import:</translation>
     </message>
-    <message>
-        <source>Priority:</source>
-        <translation>Prioritat:</translation>
-    </message>
     <message>
         <source>Fee:</source>
         <translation>Comissió:</translation>
@@ -1390,10 +1940,6 @@
         <source>(Smart fee not initialized yet. This usually takes a few blocks...)</source>
         <translation>(No s'ha inicialitzat encara la comissió intel·ligent. Normalment pren uns pocs blocs...)</translation>
     </message>
-    <message>
-        <source>Confirmation time:</source>
-        <translation>Temps de confirmació:</translation>
-    </message>
     <message>
         <source>normal</source>
         <translation>normal</translation>
@@ -1412,7 +1958,7 @@
     </message>
     <message>
         <source>Clear all fields of the form.</source>
-        <translation>Netejar tots els camps del formulari.</translation>
+        <translation>Esborra tots els camps del formuari.</translation>
     </message>
     <message>
         <source>Dust:</source>
@@ -1434,6 +1980,106 @@
         <source>S&amp;end</source>
         <translation>E&amp;nvia</translation>
     </message>
+    <message>
+        <source>Copy quantity</source>
+        <translation>Copia la quantitat</translation>
+    </message>
+    <message>
+        <source>Copy amount</source>
+        <translation>Copia l'import</translation>
+    </message>
+    <message>
+        <source>Copy fee</source>
+        <translation>Copia la comissió</translation>
+    </message>
+    <message>
+        <source>Copy after fee</source>
+        <translation>Copia la comissió posterior</translation>
+    </message>
+    <message>
+        <source>Copy bytes</source>
+        <translation>Copia els bytes</translation>
+    </message>
+    <message>
+        <source>Copy dust</source>
+        <translation>Copia el polsim</translation>
+    </message>
+    <message>
+        <source>Copy change</source>
+        <translation>Copia el canvi</translation>
+    </message>
+    <message>
+        <source>%1 to %2</source>
+        <translation>%1 a %2</translation>
+    </message>
+    <message>
+        <source>Are you sure you want to send?</source>
+        <translation>Esteu segur que ho voleu enviar?</translation>
+    </message>
+    <message>
+        <source>added as transaction fee</source>
+        <translation>S'ha afegit una taxa de transacció</translation>
+    </message>
+    <message>
+        <source>Total Amount %1</source>
+        <translation>Import total %1</translation>
+    </message>
+    <message>
+        <source>or</source>
+        <translation>o</translation>
+    </message>
+    <message>
+        <source>Confirm send coins</source>
+        <translation>Confirma l'enviament de monedes</translation>
+    </message>
+    <message>
+        <source>The recipient address is not valid. Please recheck.</source>
+        <translation>L'adreça del destinatari no és vàlida. Torneu-la a comprovar.</translation>
+    </message>
+    <message>
+        <source>The amount to pay must be larger than 0.</source>
+        <translation>L'import a pagar ha de ser major que 0.</translation>
+    </message>
+    <message>
+        <source>The amount exceeds your balance.</source>
+        <translation>L'import supera el vostre balanç.</translation>
+    </message>
+    <message>
+        <source>The total exceeds your balance when the %1 transaction fee is included.</source>
+        <translation>El total excedeix el vostre balanç quan s'afegeix la comissió a la transacció %1.</translation>
+    </message>
+    <message>
+        <source>Duplicate address found: addresses should only be used once each.</source>
+        <translation>S'ha trobat una adreça duplicada: les adreces només s'haurien d'utilitzar una vegada cada una.</translation>
+    </message>
+    <message>
+        <source>Transaction creation failed!</source>
+        <translation>La creació de la transacció ha fallat!</translation>
+    </message>
+    <message>
+        <source>A fee higher than %1 is considered an absurdly high fee.</source>
+        <translation>Una comissió superior a %1 es considera una comissió absurdament alta.</translation>
+    </message>
+    <message>
+        <source>Payment request expired.</source>
+        <translation>La sol·licitud de pagament ha vençut.</translation>
+    </message>
+    <message>
+        <source>Pay only the required fee of %1</source>
+        <translation>Paga només la comissió necessària de %1</translation>
+    </message>
+    <message>
+        <source>Warning: Invalid Bitcoin address</source>
+        <translation>Avís: adreça Bitcoin no vàlida</translation>
+    </message>
+    <message>
+        <source>Warning: Unknown change address</source>
+        <translation>Avís: adreça de canvi desconeguda</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(sense etiqueta)</translation>
+    </message>
 </context>
 <context>
     <name>SendCoinsEntry</name>
@@ -1451,7 +2097,7 @@
     </message>
     <message>
         <source>Choose previously used address</source>
-        <translation>Escull una adreça feta servir anteriorment</translation>
+        <translation>Tria les adreces fetes servir amb anterioritat</translation>
     </message>
     <message>
         <source>This is a normal payment.</source>
@@ -1513,6 +2159,17 @@
         <source>Memo:</source>
         <translation>Memo:</translation>
     </message>
+    <message>
+        <source>Enter a label for this address to add it to your address book</source>
+        <translation>Introduïu una etiqueta per a aquesta adreça per afegir-la a la llibreta d'adreces</translation>
+    </message>
+</context>
+<context>
+    <name>SendConfirmationDialog</name>
+    <message>
+        <source>Yes</source>
+        <translation>Sí</translation>
+    </message>
 </context>
 <context>
     <name>ShutdownWindow</name>
@@ -1545,11 +2202,11 @@
     </message>
     <message>
         <source>Alt+A</source>
-        <translation>Alt+A</translation>
+        <translation>Alta+A</translation>
     </message>
     <message>
         <source>Paste address from clipboard</source>
-        <translation>Enganxa l'adreça del porta-retalls</translation>
+        <translation>Enganxar adreça del porta-retalls</translation>
     </message>
     <message>
         <source>Alt+P</source>
@@ -1607,6 +2264,58 @@
         <source>Reset all verify message fields</source>
         <translation>Neteja tots els camps de verificació de missatge</translation>
     </message>
+    <message>
+        <source>Click "Sign Message" to generate signature</source>
+        <translation>Feu clic a «Signa el missatge» per a generar una signatura</translation>
+    </message>
+    <message>
+        <source>The entered address is invalid.</source>
+        <translation>L'adreça introduïda no és vàlida.</translation>
+    </message>
+    <message>
+        <source>Please check the address and try again.</source>
+        <translation>Comproveu l'adreça i torneu-ho a provar.</translation>
+    </message>
+    <message>
+        <source>The entered address does not refer to a key.</source>
+        <translation>L'adreça introduïda no referencia a cap clau.</translation>
+    </message>
+    <message>
+        <source>Wallet unlock was cancelled.</source>
+        <translation>El desbloqueig del moneder ha estat cancelat.</translation>
+    </message>
+    <message>
+        <source>Private key for the entered address is not available.</source>
+        <translation>La clau privada per a la adreça introduïda no està disponible.</translation>
+    </message>
+    <message>
+        <source>Message signing failed.</source>
+        <translation>La signatura del missatge ha fallat.</translation>
+    </message>
+    <message>
+        <source>Message signed.</source>
+        <translation>Missatge signat.</translation>
+    </message>
+    <message>
+        <source>The signature could not be decoded.</source>
+        <translation>La signatura no s'ha pogut descodificar.</translation>
+    </message>
+    <message>
+        <source>Please check the signature and try again.</source>
+        <translation>Comproveu la signatura i torneu-ho a provar.</translation>
+    </message>
+    <message>
+        <source>The signature did not match the message digest.</source>
+        <translation>La signatura no coincideix amb el resum del missatge.</translation>
+    </message>
+    <message>
+        <source>Message verification failed.</source>
+        <translation>Ha fallat la verificació del missatge.</translation>
+    </message>
+    <message>
+        <source>Message verified.</source>
+        <translation>Missatge verificat.</translation>
+    </message>
 </context>
 <context>
     <name>SplashScreen</name>
@@ -1623,32 +2332,474 @@
     </message>
 </context>
 <context>
-    <name>TransactionDescDialog</name>
+    <name>TransactionDesc</name>
     <message>
-        <source>This pane shows a detailed description of the transaction</source>
-        <translation>Aquest panell mostra una descripció detallada de la transacció</translation>
+        <source>Open until %1</source>
+        <translation>Obert fins %1</translation>
     </message>
-</context>
-<context>
-    <name>UnitDisplayStatusBarControl</name>
     <message>
-        <source>Unit to show amounts in. Click to select another unit.</source>
-        <translation>Unitat en què mostrar els imports. Feu clic per seleccionar una altra unitat.</translation>
+        <source>%1/offline</source>
+        <translation>%1/fora de línia</translation>
     </message>
-</context>
-<context>
-    <name>bitcoin-core</name>
     <message>
-        <source>Options:</source>
-        <translation>Opcions:</translation>
+        <source>%1/unconfirmed</source>
+        <translation>%1/sense confirmar</translation>
     </message>
     <message>
-        <source>Specify data directory</source>
-        <translation>Especifica el directori de dades</translation>
+        <source>%1 confirmations</source>
+        <translation>%1 confirmacions</translation>
     </message>
     <message>
-        <source>Connect to a node to retrieve peer addresses, and disconnect</source>
-        <translation>Connecta al node per obtenir les adreces de les connexions, i desconnecta</translation>
+        <source>Status</source>
+        <translation>Estat</translation>
+    </message>
+    <message>
+        <source>, has not been successfully broadcast yet</source>
+        <translation>, encara no ha estat emès correctement</translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation>Data</translation>
+    </message>
+    <message>
+        <source>Source</source>
+        <translation>Font</translation>
+    </message>
+    <message>
+        <source>Generated</source>
+        <translation>Generada</translation>
+    </message>
+    <message>
+        <source>From</source>
+        <translation>De</translation>
+    </message>
+    <message>
+        <source>unknown</source>
+        <translation>desconegut</translation>
+    </message>
+    <message>
+        <source>To</source>
+        <translation>A</translation>
+    </message>
+    <message>
+        <source>own address</source>
+        <translation>adreça pròpia</translation>
+    </message>
+    <message>
+        <source>watch-only</source>
+        <translation>només lectura</translation>
+    </message>
+    <message>
+        <source>label</source>
+        <translation>etiqueta</translation>
+    </message>
+    <message>
+        <source>Credit</source>
+        <translation>Crèdit</translation>
+    </message>
+    <message>
+        <source>not accepted</source>
+        <translation>no acceptat</translation>
+    </message>
+    <message>
+        <source>Debit</source>
+        <translation>Dèbit</translation>
+    </message>
+    <message>
+        <source>Total debit</source>
+        <translation>Dèbit total</translation>
+    </message>
+    <message>
+        <source>Total credit</source>
+        <translation>Crèdit total</translation>
+    </message>
+    <message>
+        <source>Transaction fee</source>
+        <translation>Comissió de transacció</translation>
+    </message>
+    <message>
+        <source>Net amount</source>
+        <translation>Import net</translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation>Missatge</translation>
+    </message>
+    <message>
+        <source>Comment</source>
+        <translation>Comentari</translation>
+    </message>
+    <message>
+        <source>Transaction ID</source>
+        <translation>ID de la transacció</translation>
+    </message>
+    <message>
+        <source>Merchant</source>
+        <translation>Mercader</translation>
+    </message>
+    <message>
+        <source>Generated coins must mature %1 blocks before they can be spent. When you generated this block, it was broadcast to the network to be added to the block chain. If it fails to get into the chain, its state will change to "not accepted" and it won't be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source>
+        <translation>Les monedes generades han de madurar %1 blocs abans de poder ser gastades. Quan genereu aquest bloc, es farà saber a la xarxa per tal d'afegir-lo a la cadena de blocs. Si no pot fer-se lloc a la cadena, el seu estat canviarà a «no acceptat» i no es podrà gastar. Això pot passar ocasionalment si un altre node genera un bloc en un marge de segons respecte al vostre.</translation>
+    </message>
+    <message>
+        <source>Debug information</source>
+        <translation>Informació de depuració</translation>
+    </message>
+    <message>
+        <source>Transaction</source>
+        <translation>Transacció</translation>
+    </message>
+    <message>
+        <source>Inputs</source>
+        <translation>Entrades</translation>
+    </message>
+    <message>
+        <source>Amount</source>
+        <translation>Import</translation>
+    </message>
+    <message>
+        <source>true</source>
+        <translation>cert</translation>
+    </message>
+    <message>
+        <source>false</source>
+        <translation>fals</translation>
+    </message>
+</context>
+<context>
+    <name>TransactionDescDialog</name>
+    <message>
+        <source>This pane shows a detailed description of the transaction</source>
+        <translation>Aquest panell mostra una descripció detallada de la transacció</translation>
+    </message>
+    </context>
+<context>
+    <name>TransactionTableModel</name>
+    <message>
+        <source>Date</source>
+        <translation>Data</translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation>Tipus</translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation>Etiqueta</translation>
+    </message>
+    <message>
+        <source>Open until %1</source>
+        <translation>Obert fins %1</translation>
+    </message>
+    <message>
+        <source>Offline</source>
+        <translation>Fora de línia</translation>
+    </message>
+    <message>
+        <source>Unconfirmed</source>
+        <translation>Sense confirmar</translation>
+    </message>
+    <message>
+        <source>Abandoned</source>
+        <translation>Abandonada</translation>
+    </message>
+    <message>
+        <source>Confirming (%1 of %2 recommended confirmations)</source>
+        <translation>Confirmant (%1 de %2 confirmacions recomanades)</translation>
+    </message>
+    <message>
+        <source>Confirmed (%1 confirmations)</source>
+        <translation>Confirmat (%1 confirmacions)</translation>
+    </message>
+    <message>
+        <source>Conflicted</source>
+        <translation>En conflicte</translation>
+    </message>
+    <message>
+        <source>Immature (%1 confirmations, will be available after %2)</source>
+        <translation>Immadur (%1 confirmacions, serà disponible després de %2)</translation>
+    </message>
+    <message>
+        <source>This block was not received by any other nodes and will probably not be accepted!</source>
+        <translation>Aquest bloc no ha estat rebut per cap altre node i probablement no serà acceptat!</translation>
+    </message>
+    <message>
+        <source>Generated but not accepted</source>
+        <translation>Generat però no acceptat</translation>
+    </message>
+    <message>
+        <source>Received with</source>
+        <translation>Rebuda amb</translation>
+    </message>
+    <message>
+        <source>Received from</source>
+        <translation>Rebuda de</translation>
+    </message>
+    <message>
+        <source>Sent to</source>
+        <translation>Enviada a</translation>
+    </message>
+    <message>
+        <source>Payment to yourself</source>
+        <translation>Pagament a un mateix</translation>
+    </message>
+    <message>
+        <source>Mined</source>
+        <translation>Minada</translation>
+    </message>
+    <message>
+        <source>watch-only</source>
+        <translation>només lectura</translation>
+    </message>
+    <message>
+        <source>(n/a)</source>
+        <translation>(n/a)</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(sense etiqueta)</translation>
+    </message>
+    <message>
+        <source>Transaction status. Hover over this field to show number of confirmations.</source>
+        <translation>Estat de la transacció. Desplaceu-vos sobre aquest camp per mostrar el nombre de confirmacions.</translation>
+    </message>
+    <message>
+        <source>Date and time that the transaction was received.</source>
+        <translation>Data i hora en que la transacció va ser rebuda.</translation>
+    </message>
+    <message>
+        <source>Type of transaction.</source>
+        <translation>Tipus de transacció.</translation>
+    </message>
+    <message>
+        <source>Whether or not a watch-only address is involved in this transaction.</source>
+        <translation>Si està implicada o no una adreça només de lectura en la transacció.</translation>
+    </message>
+    <message>
+        <source>User-defined intent/purpose of the transaction.</source>
+        <translation>Intenció/propòsit de la transacció definida per l'usuari.</translation>
+    </message>
+    <message>
+        <source>Amount removed from or added to balance.</source>
+        <translation>Import extret o afegit del balanç.</translation>
+    </message>
+</context>
+<context>
+    <name>TransactionView</name>
+    <message>
+        <source>All</source>
+        <translation>Tot</translation>
+    </message>
+    <message>
+        <source>Today</source>
+        <translation>Avui</translation>
+    </message>
+    <message>
+        <source>This week</source>
+        <translation>Aquesta setmana</translation>
+    </message>
+    <message>
+        <source>This month</source>
+        <translation>Aquest mes</translation>
+    </message>
+    <message>
+        <source>Last month</source>
+        <translation>El mes passat</translation>
+    </message>
+    <message>
+        <source>This year</source>
+        <translation>Enguany</translation>
+    </message>
+    <message>
+        <source>Range...</source>
+        <translation>Rang...</translation>
+    </message>
+    <message>
+        <source>Received with</source>
+        <translation>Rebuda amb</translation>
+    </message>
+    <message>
+        <source>Sent to</source>
+        <translation>Enviada a</translation>
+    </message>
+    <message>
+        <source>To yourself</source>
+        <translation>A un mateix</translation>
+    </message>
+    <message>
+        <source>Mined</source>
+        <translation>Minada</translation>
+    </message>
+    <message>
+        <source>Other</source>
+        <translation>Altres</translation>
+    </message>
+    <message>
+        <source>Enter address or label to search</source>
+        <translation>Introduïu una adreça o una etiqueta per cercar</translation>
+    </message>
+    <message>
+        <source>Min amount</source>
+        <translation>Import mínim</translation>
+    </message>
+    <message>
+        <source>Copy address</source>
+        <translation>Copia l'adreça</translation>
+    </message>
+    <message>
+        <source>Copy label</source>
+        <translation>Copia l'etiqueta</translation>
+    </message>
+    <message>
+        <source>Copy amount</source>
+        <translation>Copia l'import</translation>
+    </message>
+    <message>
+        <source>Copy transaction ID</source>
+        <translation>Copia l'ID de transacció</translation>
+    </message>
+    <message>
+        <source>Copy raw transaction</source>
+        <translation>Copia la transacció crua</translation>
+    </message>
+    <message>
+        <source>Edit label</source>
+        <translation>Editar etiqueta</translation>
+    </message>
+    <message>
+        <source>Show transaction details</source>
+        <translation>Mostra detalls de la transacció</translation>
+    </message>
+    <message>
+        <source>Export Transaction History</source>
+        <translation>Exporta l'historial de transacció</translation>
+    </message>
+    <message>
+        <source>Comma separated file (*.csv)</source>
+        <translation>Fitxer separat per comes (*.csv)</translation>
+    </message>
+    <message>
+        <source>Confirmed</source>
+        <translation>Confirmat</translation>
+    </message>
+    <message>
+        <source>Watch-only</source>
+        <translation>Només de lectura</translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation>Data</translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation>Tipus</translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation>Etiqueta</translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation>Adreça</translation>
+    </message>
+    <message>
+        <source>ID</source>
+        <translation>ID</translation>
+    </message>
+    <message>
+        <source>Exporting Failed</source>
+        <translation>L'exportació ha fallat</translation>
+    </message>
+    <message>
+        <source>There was an error trying to save the transaction history to %1.</source>
+        <translation>S'ha produït un error en provar de desar l'historial de transacció a %1.</translation>
+    </message>
+    <message>
+        <source>Exporting Successful</source>
+        <translation>Exportació amb èxit</translation>
+    </message>
+    <message>
+        <source>The transaction history was successfully saved to %1.</source>
+        <translation>L'historial de transaccions s'ha desat correctament a %1.</translation>
+    </message>
+    <message>
+        <source>Range:</source>
+        <translation>Rang:</translation>
+    </message>
+    <message>
+        <source>to</source>
+        <translation>a</translation>
+    </message>
+</context>
+<context>
+    <name>UnitDisplayStatusBarControl</name>
+    <message>
+        <source>Unit to show amounts in. Click to select another unit.</source>
+        <translation>Unitat en què mostrar els imports. Feu clic per seleccionar una altra unitat.</translation>
+    </message>
+</context>
+<context>
+    <name>WalletFrame</name>
+    <message>
+        <source>No wallet has been loaded.</source>
+        <translation>No s'ha carregat cap moneder.</translation>
+    </message>
+</context>
+<context>
+    <name>WalletModel</name>
+    <message>
+        <source>Send Coins</source>
+        <translation>Envia monedes</translation>
+    </message>
+</context>
+<context>
+    <name>WalletView</name>
+    <message>
+        <source>&amp;Export</source>
+        <translation>&amp;Exporta</translation>
+    </message>
+    <message>
+        <source>Export the data in the current tab to a file</source>
+        <translation>Exporta les dades de la pestanya actual a un fitxer</translation>
+    </message>
+    <message>
+        <source>Backup Wallet</source>
+        <translation>Còpia de seguretat del moneder</translation>
+    </message>
+    <message>
+        <source>Wallet Data (*.dat)</source>
+        <translation>Dades del moneder (*.dat)</translation>
+    </message>
+    <message>
+        <source>Backup Failed</source>
+        <translation>Ha fallat la còpia de seguretat</translation>
+    </message>
+    <message>
+        <source>There was an error trying to save the wallet data to %1.</source>
+        <translation>S'ha produït un error en provar de desar les dades del moneder a %1.</translation>
+    </message>
+    <message>
+        <source>Backup Successful</source>
+        <translation>La còpia de seguretat s'ha realitzat correctament</translation>
+    </message>
+    <message>
+        <source>The wallet data was successfully saved to %1.</source>
+        <translation>S'han desat les dades del moneder correctament a %1.</translation>
+    </message>
+</context>
+<context>
+    <name>bitcoin-core</name>
+    <message>
+        <source>Options:</source>
+        <translation>Opcions:</translation>
+    </message>
+    <message>
+        <source>Specify data directory</source>
+        <translation>Especifica el directori de dades</translation>
+    </message>
+    <message>
+        <source>Connect to a node to retrieve peer addresses, and disconnect</source>
+        <translation>Connecta al node per obtenir les adreces de les connexions, i desconnecta</translation>
     </message>
     <message>
         <source>Specify your own public address</source>
@@ -1698,18 +2849,10 @@
         <source>Unable to start HTTP server. See debug log for details.</source>
         <translation>No s'ha pogut iniciar el servidor HTTP. Vegeu debug.log per a més detalls.</translation>
     </message>
-    <message>
-        <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
-        <translation>Accepta connexions de fora (per defecte: 1 si no -proxy o -connect)</translation>
-    </message>
     <message>
         <source>Bitcoin Core</source>
         <translation>Bitcoin Core</translation>
     </message>
-    <message>
-        <source>-fallbackfee is set very high! This is the transaction fee you may pay when fee estimates are not available.</source>
-        <translation>-fallbackfee és molt elevat. Aquesta és la comissió de transacció que podeu pagar quan les estimacions de comissions no estan disponibles.</translation>
-    </message>
     <message>
         <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source>
         <translation>Vincula a una adreça específica i sempre escolta-hi. Utilitza la notació [host]:port per IPv6</translation>
@@ -1718,10 +2861,6 @@
         <source>Delete all wallet transactions and only recover those parts of the blockchain through -rescan on startup</source>
         <translation>Elimina totes les transaccions del moneder i només recupera aquelles de la cadena de blocs a través de -rescan a l'inici</translation>
     </message>
-    <message>
-        <source>Distributed under the MIT software license, see the accompanying file COPYING or &lt;http://www.opensource.org/licenses/mit-license.php&gt;.</source>
-        <translation>Distribuït sota llicència de programari MIT. Vegeu el fitxer acompanyant COPYING o &lt;http://www.opensource.org/licenses/mit-license.php&gt;.</translation>
-    </message>
     <message>
         <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source>
         <translation>Executa una ordre quan una transacció del moneder canviï (%s en cmd es canvia per TxID)</translation>
@@ -1730,22 +2869,6 @@
         <source>Set the number of script verification threads (%u to %d, 0 = auto, &lt;0 = leave that many cores free, default: %d)</source>
         <translation>Defineix el nombre de fils de verificació d'scripts (%u a %d, 0 = auto, &lt;0 = deixa tants nuclis lliures, per defecte: %d)</translation>
     </message>
-    <message>
-        <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
-        <translation>Aquesta és una versió de pre-llançament - utilitza-la sota la teva responsabilitat - No usar per a minería o aplicacions de compra-venda</translation>
-    </message>
-    <message>
-        <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source>
-        <translation>Avís: la xarxa no sembla que hi estigui plenament d'acord. Alguns miners sembla que estan experimentant problemes.</translation>
-    </message>
-    <message>
-        <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source>
-        <translation>Avís: sembla que no estem plenament d'acord amb els nostres iguals! Podria caler que actualitzar l'aplicació, o potser que ho facin altres nodes.</translation>
-    </message>
-    <message>
-        <source>Whitelist peers connecting from the given netmask or IP address. Can be specified multiple times.</source>
-        <translation>Afegeix a la llista blanca els iguals que es connecten de la màscara de xarxa o adreça IP donada. Es pot especificar moltes vegades.</translation>
-    </message>
     <message>
         <source>&lt;category&gt; can be:</source>
         <translation>&lt;category&gt; pot ser:</translation>
@@ -1754,10 +2877,6 @@
         <source>Block creation options:</source>
         <translation>Opcions de la creació de blocs:</translation>
     </message>
-    <message>
-        <source>Connect only to the specified node(s)</source>
-        <translation>Connecta només al(s) node(s) especificats</translation>
-    </message>
     <message>
         <source>Connection options:</source>
         <translation>Opcions de connexió:</translation>
@@ -1846,6 +2965,10 @@
         <source>Use UPnP to map the listening port (default: %u)</source>
         <translation>Utilitza UPnP per a mapejar el port d'escolta (per defecte: %u)</translation>
     </message>
+    <message>
+        <source>Use the test chain</source>
+        <translation>Utilitza la cadena de proves</translation>
+    </message>
     <message>
         <source>Verifying blocks...</source>
         <translation>S'estan verificant els blocs...</translation>
@@ -1858,6 +2981,14 @@
         <source>Wallet %s resides outside data directory %s</source>
         <translation>El moneder %s resideix fora del directori de dades %s</translation>
     </message>
+    <message>
+        <source>Wallet debugging/testing options:</source>
+        <translation>Opcions de depuració/proves del moneder:</translation>
+    </message>
+    <message>
+        <source>Wallet needed to be rewritten: restart %s to complete</source>
+        <translation>Cal reescriure el moneder: reinicieu %s per a completar-ho</translation>
+    </message>
     <message>
         <source>Wallet options:</source>
         <translation>Opcions de moneder:</translation>
@@ -1902,10 +3033,6 @@
         <source>Maximum size of data in data carrier transactions we relay and mine (default: %u)</source>
         <translation>Mida màxima de les dades en les transaccions de l'operador en què confiem i en les meves (per defecte: %u)</translation>
     </message>
-    <message>
-        <source>Query for peer addresses via DNS lookup, if low on addresses (default: 1 unless -connect)</source>
-        <translation>Consulta a adreces d'iguals a través de DNS, si es troba baix en adreces (per defecte: 1 a menys que -connect)</translation>
-    </message>
     <message>
         <source>Randomize credentials for every proxy connection. This enables Tor stream isolation (default: %u)</source>
         <translation>Genera a l'atzar credencials per a cada connexió proxy. Això habilita l'aïllament del flux de Tor (per defecte: %u)</translation>
@@ -1918,10 +3045,6 @@
         <source>The transaction amount is too small to send after the fee has been deducted</source>
         <translation>L'import de la transacció és massa petit per enviar-la després que se'n dedueixi la comissió</translation>
     </message>
-    <message>
-        <source>This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit &lt;https://www.openssl.org/&gt; and cryptographic software written by Eric Young and UPnP software written by Thomas Bernard.</source>
-        <translation>Aquest producte inclou programari desenvolupat pel projecte OpenSSL per a ús a l'OpenSSL Toolkit &lt;https://www.openssl.org/&gt; i programari criptogràfic escrit per Eric Young i programari UPnP escrit per Thomas Bernard.</translation>
-    </message>
     <message>
         <source>Whitelisted peers cannot be DoS banned and their transactions are always relayed, even if they are already in the mempool, useful e.g. for a gateway</source>
         <translation>Els iguals en la llista blanca no poden ser bandejats per DoS i es transmetran sempre llurs transaccions, fins i tot si ja són a la mempool. Això és útil, p. ex., per a una passarel·la</translation>
@@ -1948,7 +3071,7 @@
     </message>
     <message>
         <source>Information</source>
-        <translation>&amp;Informació</translation>
+        <translation>Informació</translation>
     </message>
     <message>
         <source>Invalid amount for -paytxfee=&lt;amount&gt;: '%s' (must be at least %s)</source>
@@ -2006,10 +3129,6 @@
         <source>Transaction amount too small</source>
         <translation>Import de la transacció massa petit</translation>
     </message>
-    <message>
-        <source>Transaction amounts must be positive</source>
-        <translation>Els imports de les transaccions han de ser positius</translation>
-    </message>
     <message>
         <source>Transaction too large for fee policy</source>
         <translation>Transacció massa gran per a la política de comissions</translation>
@@ -2134,10 +3253,6 @@
         <source>Set key pool size to &lt;n&gt; (default: %u)</source>
         <translation>Defineix la mida clau disponible a &lt;n&gt; (per defecte: %u)</translation>
     </message>
-    <message>
-        <source>Set minimum block size in bytes (default: %u)</source>
-        <translation>Defineix la mida de bloc mínima en bytes (per defecte: %u)</translation>
-    </message>
     <message>
         <source>Set the number of threads to service RPC calls (default: %d)</source>
         <translation>Defineix el nombre de fils a crides de servei RPC (per defecte: %d)</translation>
@@ -2158,10 +3273,22 @@
         <source>Spend unconfirmed change when sending transactions (default: %u)</source>
         <translation>Gasta el canvi no confirmat en enviar les transaccions (per defecte: %u)</translation>
     </message>
+    <message>
+        <source>Starting network threads...</source>
+        <translation>S'estan iniciant els fils de la xarxa...</translation>
+    </message>
     <message>
         <source>Threshold for disconnecting misbehaving peers (default: %u)</source>
         <translation>Llindar per a desconnectar els iguals de comportament qüestionable (per defecte: %u)</translation>
     </message>
+    <message>
+        <source>Transaction amounts must not be negative</source>
+        <translation>Els imports de la transacció no han de ser negatius</translation>
+    </message>
+    <message>
+        <source>Transaction must have at least one recipient</source>
+        <translation>La transacció ha de tenir com a mínim un destinatari</translation>
+    </message>
     <message>
         <source>Unknown network specified in -onlynet: '%s'</source>
         <translation>Xarxa desconeguda especificada a -onlynet: '%s'</translation>
diff --git a/src/qt/locale/bitcoin_ca@valencia.ts b/src/qt/locale/bitcoin_ca@valencia.ts
index df0f750a61352..c4748c0afa82e 100644
--- a/src/qt/locale/bitcoin_ca@valencia.ts
+++ b/src/qt/locale/bitcoin_ca@valencia.ts
@@ -41,6 +41,77 @@
         <source>&amp;Delete</source>
         <translation>&amp;Elimina</translation>
     </message>
+    <message>
+        <source>Choose the address to send coins to</source>
+        <translation>Trieu una adreça on voleu enviar monedes</translation>
+    </message>
+    <message>
+        <source>Choose the address to receive coins with</source>
+        <translation>Trieu l'adreça on voleu rebre monedes</translation>
+    </message>
+    <message>
+        <source>C&amp;hoose</source>
+        <translation>T&amp;ria</translation>
+    </message>
+    <message>
+        <source>Sending addresses</source>
+        <translation>S'estan enviant les adreces</translation>
+    </message>
+    <message>
+        <source>Receiving addresses</source>
+        <translation>S'estan rebent les adreces</translation>
+    </message>
+    <message>
+        <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source>
+        <translation>Estes són les vostres adreces de Bitcoin per enviar els pagaments. Sempre reviseu l'import i l'adreça del destinatari abans de transferir monedes.</translation>
+    </message>
+    <message>
+        <source>These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source>
+        <translation>Estes són les vostres adreces Bitcoin per rebre pagaments. Es recomana utilitzar una adreça nova de recepció per a cada transacció.</translation>
+    </message>
+    <message>
+        <source>&amp;Copy Address</source>
+        <translation>&amp;Copia l'adreça</translation>
+    </message>
+    <message>
+        <source>Copy &amp;Label</source>
+        <translation>Copia l'&amp;etiqueta</translation>
+    </message>
+    <message>
+        <source>&amp;Edit</source>
+        <translation>&amp;Edita</translation>
+    </message>
+    <message>
+        <source>Export Address List</source>
+        <translation>Exporta la llista d'adreces</translation>
+    </message>
+    <message>
+        <source>Comma separated file (*.csv)</source>
+        <translation>Fitxer de separació amb comes (*.csv)</translation>
+    </message>
+    <message>
+        <source>Exporting Failed</source>
+        <translation>L'exportació ha fallat</translation>
+    </message>
+    <message>
+        <source>There was an error trying to save the address list to %1. Please try again.</source>
+        <translation>S'ha produït un error en guardar la llista d'adreces a %1. Torneu-ho a provar.</translation>
+    </message>
+</context>
+<context>
+    <name>AddressTableModel</name>
+    <message>
+        <source>Label</source>
+        <translation>Etiqueta</translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation>Adreça</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(sense etiqueta)</translation>
+    </message>
 </context>
 <context>
     <name>AskPassphraseDialog</name>
@@ -60,6 +131,90 @@
         <source>Repeat new passphrase</source>
         <translation>Repetiu la nova contrasenya</translation>
     </message>
+    <message>
+        <source>Enter the new passphrase to the wallet.&lt;br/&gt;Please use a passphrase of &lt;b&gt;ten or more random characters&lt;/b&gt;, or &lt;b&gt;eight or more words&lt;/b&gt;.</source>
+        <translation>Introduïu la contrasenya nova al moneder.&lt;br/&gt;Utilitzeu una contrasenya de &lt;b&gt;deu o més caràcters aleatoris&lt;/b&gt;, o &lt;b&gt;vuit o més paraules&lt;/b&gt;.</translation>
+    </message>
+    <message>
+        <source>Encrypt wallet</source>
+        <translation>Encripta el moneder</translation>
+    </message>
+    <message>
+        <source>This operation needs your wallet passphrase to unlock the wallet.</source>
+        <translation>Esta operació requereix la contrasenya del moneder per a desbloquejar-lo.</translation>
+    </message>
+    <message>
+        <source>Unlock wallet</source>
+        <translation>Desbloqueja el moneder</translation>
+    </message>
+    <message>
+        <source>This operation needs your wallet passphrase to decrypt the wallet.</source>
+        <translation>Esta operació requereix la contrasenya del moneder per desencriptar-lo.</translation>
+    </message>
+    <message>
+        <source>Decrypt wallet</source>
+        <translation>Desencripta el moneder</translation>
+    </message>
+    <message>
+        <source>Change passphrase</source>
+        <translation>Canvia la contrasenya</translation>
+    </message>
+    <message>
+        <source>Enter the old passphrase and new passphrase to the wallet.</source>
+        <translation>Introduïu la contrasenya antiga i la contrasenya nova al moneder.</translation>
+    </message>
+    <message>
+        <source>Confirm wallet encryption</source>
+        <translation>Confirma l'encriptació del moneder</translation>
+    </message>
+    <message>
+        <source>Warning: If you encrypt your wallet and lose your passphrase, you will &lt;b&gt;LOSE ALL OF YOUR BITCOINS&lt;/b&gt;!</source>
+        <translation>Avís: si encripteu el vostre moneder i perdeu la contrasenya, &lt;b&gt;PERDREU TOTS ELS VOSTRES BITCOINS&lt;/b&gt;!</translation>
+    </message>
+    <message>
+        <source>Are you sure you wish to encrypt your wallet?</source>
+        <translation>Esteu segur que voleu encriptar el vostre moneder?</translation>
+    </message>
+    <message>
+        <source>Wallet encrypted</source>
+        <translation>Moneder encriptat</translation>
+    </message>
+    <message>
+        <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source>
+        <translation>IMPORTANT: Tota copia de seguretat que hàgeu realitzat hauria de ser reemplaçada pel, recentment generat, fitxer encriptat del moneder.</translation>
+    </message>
+    <message>
+        <source>Wallet encryption failed</source>
+        <translation>L'encriptació del moneder ha fallat</translation>
+    </message>
+    <message>
+        <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
+        <translation>L'encriptació del moneder ha fallat per un error intern. El moneder no ha estat encriptat.</translation>
+    </message>
+    <message>
+        <source>The supplied passphrases do not match.</source>
+        <translation>La contrasenya introduïda no coincideix.</translation>
+    </message>
+    <message>
+        <source>Wallet unlock failed</source>
+        <translation>El desbloqueig del moneder ha fallat</translation>
+    </message>
+    <message>
+        <source>The passphrase entered for the wallet decryption was incorrect.</source>
+        <translation>La contrasenya introduïda per a desencriptar el moneder és incorrecta.</translation>
+    </message>
+    <message>
+        <source>Wallet decryption failed</source>
+        <translation>La desencriptació del moneder ha fallat</translation>
+    </message>
+    <message>
+        <source>Wallet passphrase was successfully changed.</source>
+        <translation>La contrasenya del moneder ha estat modificada correctament.</translation>
+    </message>
+    <message>
+        <source>Warning: The Caps Lock key is on!</source>
+        <translation>Avís: Les lletres majúscules estan activades!</translation>
+    </message>
 </context>
 <context>
     <name>BanTableModel</name>
@@ -238,38 +393,10 @@
         <source>&amp;Command-line options</source>
         <translation>Opcions de la &amp;línia d'ordes</translation>
     </message>
-    <message numerus="yes">
-        <source>%n active connection(s) to Bitcoin network</source>
-        <translation><numerusform>%n connexió activa a la xarxa Bitcoin</numerusform><numerusform>%n connexions actives a la xarxa Bitcoin</numerusform></translation>
-    </message>
     <message>
         <source>No block source available...</source>
         <translation>No hi ha cap font de bloc disponible...</translation>
     </message>
-    <message numerus="yes">
-        <source>Processed %n block(s) of transaction history.</source>
-        <translation><numerusform>Proccessats %n bloc de l'historial de transaccions.</numerusform><numerusform>Proccessats %n blocs de l'historial de transaccions.</numerusform></translation>
-    </message>
-    <message numerus="yes">
-        <source>%n hour(s)</source>
-        <translation><numerusform>%n hora</numerusform><numerusform>%n hores</numerusform></translation>
-    </message>
-    <message numerus="yes">
-        <source>%n day(s)</source>
-        <translation><numerusform>%n dia</numerusform><numerusform>%n dies</numerusform></translation>
-    </message>
-    <message numerus="yes">
-        <source>%n week(s)</source>
-        <translation><numerusform>%n setmana</numerusform><numerusform>%n setmanes</numerusform></translation>
-    </message>
-    <message>
-        <source>%1 and %2</source>
-        <translation>%1 i %2</translation>
-    </message>
-    <message numerus="yes">
-        <source>%n year(s)</source>
-        <translation><numerusform>%n any</numerusform><numerusform>%n anys</numerusform></translation>
-    </message>
     <message>
         <source>%1 behind</source>
         <translation>%1 darrere</translation>
@@ -348,7 +475,7 @@
         <source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;locked&lt;/b&gt;</source>
         <translation>El moneder està &lt;b&gt;encriptat&lt;/b&gt; i actualment &lt;b&gt;bloquejat&lt;/b&gt;</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>CoinControlDialog</name>
     <message>
@@ -367,10 +494,6 @@
         <source>Amount:</source>
         <translation>Import:</translation>
     </message>
-    <message>
-        <source>Priority:</source>
-        <translation>Prioritat:</translation>
-    </message>
     <message>
         <source>Fee:</source>
         <translation>Comissió</translation>
@@ -424,8 +547,80 @@
         <translation>Confirmat</translation>
     </message>
     <message>
-        <source>Priority</source>
-        <translation>Prioritat</translation>
+        <source>Copy address</source>
+        <translation>Copiar adreça </translation>
+    </message>
+    <message>
+        <source>Copy label</source>
+        <translation>Copiar etiqueta</translation>
+    </message>
+    <message>
+        <source>Copy amount</source>
+        <translation>Copia l'import</translation>
+    </message>
+    <message>
+        <source>Copy transaction ID</source>
+        <translation>Copiar ID de transacció</translation>
+    </message>
+    <message>
+        <source>Lock unspent</source>
+        <translation>Bloqueja sense gastar</translation>
+    </message>
+    <message>
+        <source>Unlock unspent</source>
+        <translation>Desbloqueja sense gastar</translation>
+    </message>
+    <message>
+        <source>Copy quantity</source>
+        <translation>Copia la quantitat</translation>
+    </message>
+    <message>
+        <source>Copy fee</source>
+        <translation>Copia la comissió</translation>
+    </message>
+    <message>
+        <source>Copy after fee</source>
+        <translation>Copia la comissió posterior</translation>
+    </message>
+    <message>
+        <source>Copy bytes</source>
+        <translation>Copia els bytes</translation>
+    </message>
+    <message>
+        <source>Copy dust</source>
+        <translation>Copia el polsim</translation>
+    </message>
+    <message>
+        <source>Copy change</source>
+        <translation>Copia el canvi</translation>
+    </message>
+    <message>
+        <source>(%1 locked)</source>
+        <translation>(%1 bloquejada)</translation>
+    </message>
+    <message>
+        <source>yes</source>
+        <translation>sí</translation>
+    </message>
+    <message>
+        <source>no</source>
+        <translation>no</translation>
+    </message>
+    <message>
+        <source>Can vary +/- %1 satoshi(s) per input.</source>
+        <translation>Pot variar +/- %1 satoshi(s) per entrada.</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(sense etiqueta)</translation>
+    </message>
+    <message>
+        <source>change from %1 (%2)</source>
+        <translation>canvia de %1 (%2)</translation>
+    </message>
+    <message>
+        <source>(change)</source>
+        <translation>(canvia)</translation>
     </message>
 </context>
 <context>
@@ -450,6 +645,38 @@
         <source>&amp;Address</source>
         <translation>&amp;Adreça</translation>
     </message>
+    <message>
+        <source>New receiving address</source>
+        <translation>Nova adreça de recepció.</translation>
+    </message>
+    <message>
+        <source>New sending address</source>
+        <translation>Nova adreça d'enviament</translation>
+    </message>
+    <message>
+        <source>Edit receiving address</source>
+        <translation>Edita les adreces de recepció</translation>
+    </message>
+    <message>
+        <source>Edit sending address</source>
+        <translation>Edita les adreces d'enviament</translation>
+    </message>
+    <message>
+        <source>The entered address "%1" is not a valid Bitcoin address.</source>
+        <translation>L'adreça introduïda «%1» no és una adreça de Bitcoin vàlida.</translation>
+    </message>
+    <message>
+        <source>The entered address "%1" is already in the address book.</source>
+        <translation>L'adreça introduïda «%1» ja és present a la llibreta d'adreces.</translation>
+    </message>
+    <message>
+        <source>Could not unlock wallet.</source>
+        <translation>No s'ha pogut desbloquejar el moneder.</translation>
+    </message>
+    <message>
+        <source>New key generation failed.</source>
+        <translation>Ha fallat la generació d'una nova clau.</translation>
+    </message>
 </context>
 <context>
     <name>FreespaceChecker</name>
@@ -496,6 +723,22 @@
         <source>command-line options</source>
         <translation>Opcions de la línia d'ordes</translation>
     </message>
+    <message>
+        <source>UI Options:</source>
+        <translation>Opcions d'interfície:</translation>
+    </message>
+    <message>
+        <source>Set language, for example "de_DE" (default: system locale)</source>
+        <translation>Defineix un idioma, per exemple «de_DE» (per defecte: preferències locals de sistema)</translation>
+    </message>
+    <message>
+        <source>Start minimized</source>
+        <translation>Inicia minimitzat</translation>
+    </message>
+    <message>
+        <source>Set SSL root certificates for payment request (default: -system-)</source>
+        <translation>Defineix certificats arrel SSL per a la sol·licitud de pagament (per defecte: -sistema-)</translation>
+    </message>
     </context>
 <context>
     <name>Intro</name>
@@ -519,15 +762,22 @@
         <source>Error</source>
         <translation>Error</translation>
     </message>
-    <message numerus="yes">
-        <source>%n GB of free space available</source>
-        <translation><numerusform>%n GB d'espai lliure disponible</numerusform><numerusform>%n GB d'espai lliure disponible</numerusform></translation>
+    </context>
+<context>
+    <name>ModalOverlay</name>
+    <message>
+        <source>Form</source>
+        <translation>Formulari</translation>
+    </message>
+    <message>
+        <source>Last block time</source>
+        <translation>Últim temps de bloc</translation>
     </message>
-    <message numerus="yes">
-        <source>(of %n GB needed)</source>
-        <translation><numerusform>(de %n GB necessari)</numerusform><numerusform>(de %n GB necessaris)</numerusform></translation>
+    <message>
+        <source>Hide</source>
+        <translation>Amaga</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>OpenURIDialog</name>
     <message>
@@ -546,6 +796,10 @@
         <source>Select payment request file</source>
         <translation>Selecciona un fitxer de sol·licitud de pagament</translation>
     </message>
+    <message>
+        <source>Select payment request file to open</source>
+        <translation>Selecciona el fitxer de sol·licitud de pagament per obrir</translation>
+    </message>
 </context>
 <context>
     <name>OptionsDialog</name>
@@ -813,6 +1067,97 @@
         <translation>Balanç total actual en adreces de només lectura</translation>
     </message>
 </context>
+<context>
+    <name>PaymentServer</name>
+    <message>
+        <source>Payment request error</source>
+        <translation>Error en la sol·licitud de pagament</translation>
+    </message>
+    <message>
+        <source>Cannot start bitcoin: click-to-pay handler</source>
+        <translation>No es pot iniciar bitcoin: gestor clica-per-pagar</translation>
+    </message>
+    <message>
+        <source>URI handling</source>
+        <translation>Gestió d'URI</translation>
+    </message>
+    <message>
+        <source>Payment request fetch URL is invalid: %1</source>
+        <translation>L'URL de recuperació de la sol·licitud de pagament no és vàlida: %1</translation>
+    </message>
+    <message>
+        <source>Invalid payment address %1</source>
+        <translation>Adreça de pagament no vàlida %1</translation>
+    </message>
+    <message>
+        <source>URI cannot be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source>
+        <translation>L'URI no pot ser analitzat! Això pot ser a causa d'una adreça de Bitcoin no vàlida o per paràmetres URI amb mal format.</translation>
+    </message>
+    <message>
+        <source>Payment request file handling</source>
+        <translation>Gestió de fitxers de les sol·licituds de pagament</translation>
+    </message>
+    <message>
+        <source>Payment request file cannot be read! This can be caused by an invalid payment request file.</source>
+        <translation>No es pot llegir el fitxer de la sol·licitud de pagament. Això pot ser causat per un fitxer de sol·licitud de pagament no vàlid.</translation>
+    </message>
+    <message>
+        <source>Payment request rejected</source>
+        <translation>La sol·licitud de pagament s'ha rebutjat</translation>
+    </message>
+    <message>
+        <source>Payment request network doesn't match client network.</source>
+        <translation>La xarxa de la sol·licitud de pagament no coincideix amb la xarxa del client.</translation>
+    </message>
+    <message>
+        <source>Payment request expired.</source>
+        <translation>La sol·licitud de pagament ha vençut.</translation>
+    </message>
+    <message>
+        <source>Payment request is not initialized.</source>
+        <translation>La sol·licitud de pagament no està inicialitzada.</translation>
+    </message>
+    <message>
+        <source>Unverified payment requests to custom payment scripts are unsupported.</source>
+        <translation>No s'accepten sol·licituds de pagament no verificades a scripts de pagament personalitzats.</translation>
+    </message>
+    <message>
+        <source>Invalid payment request.</source>
+        <translation>Sol·licitud de pagament no vàlida.</translation>
+    </message>
+    <message>
+        <source>Requested payment amount of %1 is too small (considered dust).</source>
+        <translation>L'import de pagament sol·licitat %1 és massa petit (es considera polsim).</translation>
+    </message>
+    <message>
+        <source>Refund from %1</source>
+        <translation>Reemborsament de %1</translation>
+    </message>
+    <message>
+        <source>Payment request %1 is too large (%2 bytes, allowed %3 bytes).</source>
+        <translation>La sol·licitud de pagament %1 és massa gran (%2 bytes, permés %3 bytes).</translation>
+    </message>
+    <message>
+        <source>Error communicating with %1: %2</source>
+        <translation>Error en comunicar amb %1: %2</translation>
+    </message>
+    <message>
+        <source>Payment request cannot be parsed!</source>
+        <translation>No es pot analitzar la sol·licitud de pagament!</translation>
+    </message>
+    <message>
+        <source>Bad response from server %1</source>
+        <translation>Mala resposta del servidor %1</translation>
+    </message>
+    <message>
+        <source>Network request error</source>
+        <translation>Error en la sol·licitud de xarxa</translation>
+    </message>
+    <message>
+        <source>Payment acknowledged</source>
+        <translation>Pagament reconegut</translation>
+    </message>
+</context>
 <context>
     <name>PeerTableModel</name>
     <message>
@@ -823,11 +1168,7 @@
         <source>Node/Service</source>
         <translation>Node/Servei</translation>
     </message>
-    <message>
-        <source>Ping Time</source>
-        <translation>Temps de ping</translation>
-    </message>
-</context>
+    </context>
 <context>
     <name>QObject</name>
     <message>
@@ -866,6 +1207,32 @@
         <source>%1 ms</source>
         <translation>%1 ms</translation>
     </message>
+    <message>
+        <source>%1 and %2</source>
+        <translation>%1 i %2</translation>
+    </message>
+    </context>
+<context>
+    <name>QObject::QObject</name>
+    </context>
+<context>
+    <name>QRImageWidget</name>
+    <message>
+        <source>&amp;Save Image...</source>
+        <translation>&amp;Guarda la imatge...</translation>
+    </message>
+    <message>
+        <source>&amp;Copy Image</source>
+        <translation>&amp;Copia la imatge</translation>
+    </message>
+    <message>
+        <source>Save QR Code</source>
+        <translation>Guarda el codi QR</translation>
+    </message>
+    <message>
+        <source>PNG Image (*.png)</source>
+        <translation>Imatge PNG (*.png)</translation>
+    </message>
 </context>
 <context>
     <name>RPCConsole</name>
@@ -1106,7 +1473,7 @@
     </message>
     <message>
         <source>Clear all fields of the form.</source>
-        <translation>Esborra tots els camps del formuari.</translation>
+        <translation>Netejar tots els camps del formulari.</translation>
     </message>
     <message>
         <source>Clear</source>
@@ -1136,6 +1503,18 @@
         <source>Remove</source>
         <translation>Esborra</translation>
     </message>
+    <message>
+        <source>Copy label</source>
+        <translation>Copiar etiqueta</translation>
+    </message>
+    <message>
+        <source>Copy message</source>
+        <translation>Copia el missatge</translation>
+    </message>
+    <message>
+        <source>Copy amount</source>
+        <translation>Copia l'import</translation>
+    </message>
 </context>
 <context>
     <name>ReceiveRequestDialog</name>
@@ -1155,24 +1534,83 @@
         <source>&amp;Save Image...</source>
         <translation>&amp;Guarda la imatge...</translation>
     </message>
-</context>
-<context>
-    <name>SendCoinsDialog</name>
     <message>
-        <source>Send Coins</source>
-        <translation>Envia monedes</translation>
+        <source>Request payment to %1</source>
+        <translation>Sol·licita un pagament a %1</translation>
     </message>
     <message>
-        <source>Coin Control Features</source>
-        <translation>Característiques de control de les monedes</translation>
+        <source>Payment information</source>
+        <translation>Informació de pagament</translation>
     </message>
     <message>
-        <source>Inputs...</source>
-        <translation>Entrades...</translation>
+        <source>URI</source>
+        <translation>URI</translation>
     </message>
     <message>
-        <source>automatically selected</source>
-        <translation>seleccionat automàticament</translation>
+        <source>Address</source>
+        <translation>Adreça</translation>
+    </message>
+    <message>
+        <source>Amount</source>
+        <translation>Import</translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation>Etiqueta</translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation>Missatge</translation>
+    </message>
+    <message>
+        <source>Resulting URI too long, try to reduce the text for label / message.</source>
+        <translation>URI resultant massa llarga, intenta reduir el text per a la etiqueta / missatge</translation>
+    </message>
+    <message>
+        <source>Error encoding URI into QR Code.</source>
+        <translation>Error en codificar l'URI en un codi QR.</translation>
+    </message>
+</context>
+<context>
+    <name>RecentRequestsTableModel</name>
+    <message>
+        <source>Date</source>
+        <translation>Data</translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation>Etiqueta</translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation>Missatge</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(sense etiqueta)</translation>
+    </message>
+    <message>
+        <source>(no message)</source>
+        <translation>(sense missatge)</translation>
+    </message>
+    </context>
+<context>
+    <name>SendCoinsDialog</name>
+    <message>
+        <source>Send Coins</source>
+        <translation>Envia monedes</translation>
+    </message>
+    <message>
+        <source>Coin Control Features</source>
+        <translation>Característiques de control de les monedes</translation>
+    </message>
+    <message>
+        <source>Inputs...</source>
+        <translation>Entrades...</translation>
+    </message>
+    <message>
+        <source>automatically selected</source>
+        <translation>seleccionat automàticament</translation>
     </message>
     <message>
         <source>Insufficient funds!</source>
@@ -1190,13 +1628,9 @@
         <source>Amount:</source>
         <translation>Import:</translation>
     </message>
-    <message>
-        <source>Priority:</source>
-        <translation>Prioritat:</translation>
-    </message>
     <message>
         <source>Fee:</source>
-        <translation>Comissió:</translation>
+        <translation>Comissió</translation>
     </message>
     <message>
         <source>After Fee:</source>
@@ -1262,10 +1696,6 @@
         <source>(Smart fee not initialized yet. This usually takes a few blocks...)</source>
         <translation>(No s'ha inicialitzat encara la comissió intel·ligent. Normalment pren uns pocs blocs...)</translation>
     </message>
-    <message>
-        <source>Confirmation time:</source>
-        <translation>Temps de confirmació:</translation>
-    </message>
     <message>
         <source>normal</source>
         <translation>normal</translation>
@@ -1306,6 +1736,98 @@
         <source>S&amp;end</source>
         <translation>E&amp;nvia</translation>
     </message>
+    <message>
+        <source>Copy quantity</source>
+        <translation>Copia la quantitat</translation>
+    </message>
+    <message>
+        <source>Copy amount</source>
+        <translation>Copia l'import</translation>
+    </message>
+    <message>
+        <source>Copy fee</source>
+        <translation>Copia la comissió</translation>
+    </message>
+    <message>
+        <source>Copy after fee</source>
+        <translation>Copia la comissió posterior</translation>
+    </message>
+    <message>
+        <source>Copy bytes</source>
+        <translation>Copia els bytes</translation>
+    </message>
+    <message>
+        <source>Copy dust</source>
+        <translation>Copia el polsim</translation>
+    </message>
+    <message>
+        <source>Copy change</source>
+        <translation>Copia el canvi</translation>
+    </message>
+    <message>
+        <source>%1 to %2</source>
+        <translation>%1 a %2</translation>
+    </message>
+    <message>
+        <source>Are you sure you want to send?</source>
+        <translation>Esteu segur que ho voleu enviar?</translation>
+    </message>
+    <message>
+        <source>added as transaction fee</source>
+        <translation>S'ha afegit una taxa de transacció</translation>
+    </message>
+    <message>
+        <source>or</source>
+        <translation>o</translation>
+    </message>
+    <message>
+        <source>Confirm send coins</source>
+        <translation>Confirma l'enviament de monedes</translation>
+    </message>
+    <message>
+        <source>The recipient address is not valid. Please recheck.</source>
+        <translation>L'adreça de destinatari no és vàlida. Torneu-la a comprovar.</translation>
+    </message>
+    <message>
+        <source>The amount to pay must be larger than 0.</source>
+        <translation>L'import a pagar ha de ser major que 0.</translation>
+    </message>
+    <message>
+        <source>The amount exceeds your balance.</source>
+        <translation>L'import supera el vostre balanç.</translation>
+    </message>
+    <message>
+        <source>The total exceeds your balance when the %1 transaction fee is included.</source>
+        <translation>El total excedeix el teu balanç quan s'afig la comissió a la transacció %1.</translation>
+    </message>
+    <message>
+        <source>Duplicate address found: addresses should only be used once each.</source>
+        <translation>S'ha trobat una adreça duplicada: cal utilitzar les adreces només un cop cada vegada.</translation>
+    </message>
+    <message>
+        <source>Transaction creation failed!</source>
+        <translation>Ha fallat la creació de la transacció!</translation>
+    </message>
+    <message>
+        <source>A fee higher than %1 is considered an absurdly high fee.</source>
+        <translation>Una comissió superior a %1 es considera una comissió absurdament alta.</translation>
+    </message>
+    <message>
+        <source>Payment request expired.</source>
+        <translation>La sol·licitud de pagament ha vençut.</translation>
+    </message>
+    <message>
+        <source>Warning: Invalid Bitcoin address</source>
+        <translation>Avís: adreça Bitcoin no vàlida</translation>
+    </message>
+    <message>
+        <source>Warning: Unknown change address</source>
+        <translation>Avís: adreça de canvi desconeguda</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(sense etiqueta)</translation>
+    </message>
 </context>
 <context>
     <name>SendCoinsEntry</name>
@@ -1323,7 +1845,7 @@
     </message>
     <message>
         <source>Choose previously used address</source>
-        <translation>Trieu una adreça feta servir anteriorment</translation>
+        <translation>Tria les adreces fetes servir amb anterioritat</translation>
     </message>
     <message>
         <source>This is a normal payment.</source>
@@ -1335,11 +1857,11 @@
     </message>
     <message>
         <source>Alt+A</source>
-        <translation>Alta+A</translation>
+        <translation>Alt+A</translation>
     </message>
     <message>
         <source>Paste address from clipboard</source>
-        <translation>Apegar adreça del porta-retalls</translation>
+        <translation>Apega l'adreça del porta-retalls</translation>
     </message>
     <message>
         <source>Alt+P</source>
@@ -1385,6 +1907,17 @@
         <source>Memo:</source>
         <translation>Memo:</translation>
     </message>
+    <message>
+        <source>Enter a label for this address to add it to your address book</source>
+        <translation>Introduïu una etiqueta per a esta adreça per afegir-la a la llibreta d'adreces</translation>
+    </message>
+</context>
+<context>
+    <name>SendConfirmationDialog</name>
+    <message>
+        <source>Yes</source>
+        <translation>Sí</translation>
+    </message>
 </context>
 <context>
     <name>ShutdownWindow</name>
@@ -1479,6 +2012,58 @@
         <source>Reset all verify message fields</source>
         <translation>Neteja tots els camps de verificació de missatge</translation>
     </message>
+    <message>
+        <source>Click "Sign Message" to generate signature</source>
+        <translation>Feu clic a «Signa el missatge» per a generar una signatura</translation>
+    </message>
+    <message>
+        <source>The entered address is invalid.</source>
+        <translation>L'adreça introduïda no és vàlida.</translation>
+    </message>
+    <message>
+        <source>Please check the address and try again.</source>
+        <translation>Comproveu l'adreça i torneu-ho a provar.</translation>
+    </message>
+    <message>
+        <source>The entered address does not refer to a key.</source>
+        <translation>L'adreça introduïda no referencia a cap clau.</translation>
+    </message>
+    <message>
+        <source>Wallet unlock was cancelled.</source>
+        <translation>El desbloqueig del moneder ha estat cancelat.</translation>
+    </message>
+    <message>
+        <source>Private key for the entered address is not available.</source>
+        <translation>La clau privada per a la adreça introduïda no està disponible.</translation>
+    </message>
+    <message>
+        <source>Message signing failed.</source>
+        <translation>La signatura del missatge ha fallat.</translation>
+    </message>
+    <message>
+        <source>Message signed.</source>
+        <translation>Missatge signat.</translation>
+    </message>
+    <message>
+        <source>The signature could not be decoded.</source>
+        <translation>La signatura no s'ha pogut descodificar.</translation>
+    </message>
+    <message>
+        <source>Please check the signature and try again.</source>
+        <translation>Comproveu la signatura i torneu-ho a provar.</translation>
+    </message>
+    <message>
+        <source>The signature did not match the message digest.</source>
+        <translation>La signatura no coincideix amb el resum del missatge.</translation>
+    </message>
+    <message>
+        <source>Message verification failed.</source>
+        <translation>Ha fallat la verificació del missatge.</translation>
+    </message>
+    <message>
+        <source>Message verified.</source>
+        <translation>Missatge verificat.</translation>
+    </message>
 </context>
 <context>
     <name>SplashScreen</name>
@@ -1494,12 +2079,397 @@
         <translation>KB/s</translation>
     </message>
 </context>
+<context>
+    <name>TransactionDesc</name>
+    <message>
+        <source>Open until %1</source>
+        <translation>Obert fins %1</translation>
+    </message>
+    <message>
+        <source>%1/offline</source>
+        <translation>%1/fora de línia</translation>
+    </message>
+    <message>
+        <source>%1/unconfirmed</source>
+        <translation>%1/sense confirmar</translation>
+    </message>
+    <message>
+        <source>%1 confirmations</source>
+        <translation>%1 confirmacions</translation>
+    </message>
+    <message>
+        <source>Status</source>
+        <translation>Estat</translation>
+    </message>
+    <message>
+        <source>, has not been successfully broadcast yet</source>
+        <translation>, encara no ha estat emés correctement</translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation>Data</translation>
+    </message>
+    <message>
+        <source>Source</source>
+        <translation>Font</translation>
+    </message>
+    <message>
+        <source>Generated</source>
+        <translation>Generat</translation>
+    </message>
+    <message>
+        <source>From</source>
+        <translation>Des de</translation>
+    </message>
+    <message>
+        <source>unknown</source>
+        <translation>desconegut</translation>
+    </message>
+    <message>
+        <source>To</source>
+        <translation>A</translation>
+    </message>
+    <message>
+        <source>own address</source>
+        <translation>Adreça pròpia</translation>
+    </message>
+    <message>
+        <source>watch-only</source>
+        <translation>només lectura</translation>
+    </message>
+    <message>
+        <source>label</source>
+        <translation>etiqueta</translation>
+    </message>
+    <message>
+        <source>Credit</source>
+        <translation>Crèdit</translation>
+    </message>
+    <message>
+        <source>not accepted</source>
+        <translation>no acceptat</translation>
+    </message>
+    <message>
+        <source>Debit</source>
+        <translation>Dèbit</translation>
+    </message>
+    <message>
+        <source>Total debit</source>
+        <translation>Dèbit total</translation>
+    </message>
+    <message>
+        <source>Total credit</source>
+        <translation>Crèdit total</translation>
+    </message>
+    <message>
+        <source>Transaction fee</source>
+        <translation>Comissió de transacció</translation>
+    </message>
+    <message>
+        <source>Net amount</source>
+        <translation>Import net</translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation>Missatge</translation>
+    </message>
+    <message>
+        <source>Comment</source>
+        <translation>Comentar</translation>
+    </message>
+    <message>
+        <source>Transaction ID</source>
+        <translation>ID de transacció</translation>
+    </message>
+    <message>
+        <source>Merchant</source>
+        <translation>Mercader</translation>
+    </message>
+    <message>
+        <source>Generated coins must mature %1 blocks before they can be spent. When you generated this block, it was broadcast to the network to be added to the block chain. If it fails to get into the chain, its state will change to "not accepted" and it won't be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source>
+        <translation>Les monedes generades han de madurar %1 blocs abans de poder ser gastades. Quan genereu este bloc, es farà saber a la xarxa per tal d'afegir-lo a la cadena de blocs. Si no pot fer-se lloc a la cadena, el seu estat canviarà a «no acceptat» i no es podrà gastar. Això pot passar ocasionalment si un altre node genera un bloc en un marge de segons respecte al vostre.</translation>
+    </message>
+    <message>
+        <source>Debug information</source>
+        <translation>Informació de depuració</translation>
+    </message>
+    <message>
+        <source>Transaction</source>
+        <translation>Transacció</translation>
+    </message>
+    <message>
+        <source>Inputs</source>
+        <translation>Entrades</translation>
+    </message>
+    <message>
+        <source>Amount</source>
+        <translation>Import</translation>
+    </message>
+    <message>
+        <source>true</source>
+        <translation>cert</translation>
+    </message>
+    <message>
+        <source>false</source>
+        <translation>fals</translation>
+    </message>
+</context>
 <context>
     <name>TransactionDescDialog</name>
     <message>
         <source>This pane shows a detailed description of the transaction</source>
         <translation>Este panell mostra una descripció detallada de la transacció</translation>
     </message>
+    </context>
+<context>
+    <name>TransactionTableModel</name>
+    <message>
+        <source>Date</source>
+        <translation>Data</translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation>Tipus</translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation>Etiqueta</translation>
+    </message>
+    <message>
+        <source>Open until %1</source>
+        <translation>Obert fins %1</translation>
+    </message>
+    <message>
+        <source>Offline</source>
+        <translation>Fora de línia</translation>
+    </message>
+    <message>
+        <source>Unconfirmed</source>
+        <translation>Sense confirmar</translation>
+    </message>
+    <message>
+        <source>Confirming (%1 of %2 recommended confirmations)</source>
+        <translation>Confirmant (%1 de %2 confirmacions recomanades)</translation>
+    </message>
+    <message>
+        <source>Confirmed (%1 confirmations)</source>
+        <translation>Confirmat (%1 confirmacions)</translation>
+    </message>
+    <message>
+        <source>Conflicted</source>
+        <translation>En conflicte</translation>
+    </message>
+    <message>
+        <source>Immature (%1 confirmations, will be available after %2)</source>
+        <translation>Immadur (%1 confirmacions, serà disponible després de %2)</translation>
+    </message>
+    <message>
+        <source>This block was not received by any other nodes and will probably not be accepted!</source>
+        <translation>Este bloc no ha estat rebut per cap altre node i probablement no serà acceptat!</translation>
+    </message>
+    <message>
+        <source>Generated but not accepted</source>
+        <translation>Generat però no acceptat</translation>
+    </message>
+    <message>
+        <source>Received with</source>
+        <translation>Rebut amb</translation>
+    </message>
+    <message>
+        <source>Received from</source>
+        <translation>Rebut de</translation>
+    </message>
+    <message>
+        <source>Sent to</source>
+        <translation>Enviat a</translation>
+    </message>
+    <message>
+        <source>Payment to yourself</source>
+        <translation>Pagament a un mateix</translation>
+    </message>
+    <message>
+        <source>Mined</source>
+        <translation>Minat</translation>
+    </message>
+    <message>
+        <source>watch-only</source>
+        <translation>només lectura</translation>
+    </message>
+    <message>
+        <source>(n/a)</source>
+        <translation>(n/a)</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(sense etiqueta)</translation>
+    </message>
+    <message>
+        <source>Transaction status. Hover over this field to show number of confirmations.</source>
+        <translation>Estat de la transacció. Desplaceu-vos sobre este camp per mostrar el nombre de confirmacions.</translation>
+    </message>
+    <message>
+        <source>Date and time that the transaction was received.</source>
+        <translation>Data i hora en que la transacció va ser rebuda.</translation>
+    </message>
+    <message>
+        <source>Type of transaction.</source>
+        <translation>Tipus de transacció.</translation>
+    </message>
+    <message>
+        <source>Whether or not a watch-only address is involved in this transaction.</source>
+        <translation>Si està implicada o no una adreça només de lectura en la transacció.</translation>
+    </message>
+    <message>
+        <source>User-defined intent/purpose of the transaction.</source>
+        <translation>Intenció/propòsit de la transacció definida per l'usuari.</translation>
+    </message>
+    <message>
+        <source>Amount removed from or added to balance.</source>
+        <translation>Import extret o afegit del balanç.</translation>
+    </message>
+</context>
+<context>
+    <name>TransactionView</name>
+    <message>
+        <source>All</source>
+        <translation>Tot</translation>
+    </message>
+    <message>
+        <source>Today</source>
+        <translation>Hui</translation>
+    </message>
+    <message>
+        <source>This week</source>
+        <translation>Esta setmana</translation>
+    </message>
+    <message>
+        <source>This month</source>
+        <translation>Este mes</translation>
+    </message>
+    <message>
+        <source>Last month</source>
+        <translation>El mes passat</translation>
+    </message>
+    <message>
+        <source>This year</source>
+        <translation>Enguany</translation>
+    </message>
+    <message>
+        <source>Range...</source>
+        <translation>Rang...</translation>
+    </message>
+    <message>
+        <source>Received with</source>
+        <translation>Rebut amb</translation>
+    </message>
+    <message>
+        <source>Sent to</source>
+        <translation>Enviat a</translation>
+    </message>
+    <message>
+        <source>To yourself</source>
+        <translation>A un mateix</translation>
+    </message>
+    <message>
+        <source>Mined</source>
+        <translation>Minat</translation>
+    </message>
+    <message>
+        <source>Other</source>
+        <translation>Altres</translation>
+    </message>
+    <message>
+        <source>Enter address or label to search</source>
+        <translation>Introduïu una adreça o una etiqueta per cercar</translation>
+    </message>
+    <message>
+        <source>Min amount</source>
+        <translation>Import mínim</translation>
+    </message>
+    <message>
+        <source>Copy address</source>
+        <translation>Copiar adreça </translation>
+    </message>
+    <message>
+        <source>Copy label</source>
+        <translation>Copiar etiqueta</translation>
+    </message>
+    <message>
+        <source>Copy amount</source>
+        <translation>Copia l'import</translation>
+    </message>
+    <message>
+        <source>Copy transaction ID</source>
+        <translation>Copiar ID de transacció</translation>
+    </message>
+    <message>
+        <source>Edit label</source>
+        <translation>Editar etiqueta</translation>
+    </message>
+    <message>
+        <source>Show transaction details</source>
+        <translation>Mostra detalls de la transacció</translation>
+    </message>
+    <message>
+        <source>Export Transaction History</source>
+        <translation>Exporta l'historial de transacció</translation>
+    </message>
+    <message>
+        <source>Comma separated file (*.csv)</source>
+        <translation>Fitxer de separació amb comes (*.csv)</translation>
+    </message>
+    <message>
+        <source>Confirmed</source>
+        <translation>Confirmat</translation>
+    </message>
+    <message>
+        <source>Watch-only</source>
+        <translation>Només de lectura</translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation>Data</translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation>Tipus</translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation>Etiqueta</translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation>Adreça</translation>
+    </message>
+    <message>
+        <source>ID</source>
+        <translation>ID</translation>
+    </message>
+    <message>
+        <source>Exporting Failed</source>
+        <translation>L'exportació ha fallat</translation>
+    </message>
+    <message>
+        <source>There was an error trying to save the transaction history to %1.</source>
+        <translation>S'ha produït un error en provar de guardar l'historial de transacció a %1.</translation>
+    </message>
+    <message>
+        <source>Exporting Successful</source>
+        <translation>Exportació amb èxit</translation>
+    </message>
+    <message>
+        <source>The transaction history was successfully saved to %1.</source>
+        <translation>L'historial de transaccions s'ha guardat correctament a %1.</translation>
+    </message>
+    <message>
+        <source>Range:</source>
+        <translation>Rang:</translation>
+    </message>
+    <message>
+        <source>to</source>
+        <translation>a</translation>
+    </message>
 </context>
 <context>
     <name>UnitDisplayStatusBarControl</name>
@@ -1508,6 +2478,55 @@
         <translation>Unitat en què mostrar els imports. Feu clic per seleccionar una altra unitat.</translation>
     </message>
 </context>
+<context>
+    <name>WalletFrame</name>
+    <message>
+        <source>No wallet has been loaded.</source>
+        <translation>No s'ha carregat cap moneder.</translation>
+    </message>
+</context>
+<context>
+    <name>WalletModel</name>
+    <message>
+        <source>Send Coins</source>
+        <translation>Envia monedes</translation>
+    </message>
+</context>
+<context>
+    <name>WalletView</name>
+    <message>
+        <source>&amp;Export</source>
+        <translation>&amp;Exporta</translation>
+    </message>
+    <message>
+        <source>Export the data in the current tab to a file</source>
+        <translation>Exporta les dades de la pestanya actual a un fitxer</translation>
+    </message>
+    <message>
+        <source>Backup Wallet</source>
+        <translation>Còpia de seguretat del moneder</translation>
+    </message>
+    <message>
+        <source>Wallet Data (*.dat)</source>
+        <translation>Dades del moneder (*.dat)</translation>
+    </message>
+    <message>
+        <source>Backup Failed</source>
+        <translation>Ha fallat la còpia de seguretat</translation>
+    </message>
+    <message>
+        <source>There was an error trying to save the wallet data to %1.</source>
+        <translation>S'ha produït un error en provar de guardar les dades del moneder a %1.</translation>
+    </message>
+    <message>
+        <source>Backup Successful</source>
+        <translation>La còpia de seguretat s'ha realitzat correctament</translation>
+    </message>
+    <message>
+        <source>The wallet data was successfully saved to %1.</source>
+        <translation>S'han guardat les dades del moneder correctament a %1.</translation>
+    </message>
+</context>
 <context>
     <name>bitcoin-core</name>
     <message>
@@ -1531,12 +2550,16 @@
         <translation>Accepta la línia d'ordes i ordes JSON-RPC </translation>
     </message>
     <message>
-        <source>Run in the background as a daemon and accept commands</source>
-        <translation>Executa en segon pla com a programa dimoni i accepta ordes</translation>
+        <source>Error: A fatal internal error occurred, see debug.log for details</source>
+        <translation>Error: s'ha produït un error intern fatal. Vegeu debug.log per a més detalls</translation>
     </message>
     <message>
-        <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
-        <translation>Accepta connexions de fora (per defecte: 1 si no -proxy o -connect)</translation>
+        <source>Pruning blockstore...</source>
+        <translation>S'està podant l'emmagatzemament de blocs...</translation>
+    </message>
+    <message>
+        <source>Run in the background as a daemon and accept commands</source>
+        <translation>Executa en segon pla com a programa dimoni i accepta ordes</translation>
     </message>
     <message>
         <source>Bitcoin Core</source>
@@ -1550,10 +2573,6 @@
         <source>Delete all wallet transactions and only recover those parts of the blockchain through -rescan on startup</source>
         <translation>Elimina totes les transaccions del moneder i només recupera aquelles de la cadena de blocs a través de -rescan a l'inici</translation>
     </message>
-    <message>
-        <source>Distributed under the MIT software license, see the accompanying file COPYING or &lt;http://www.opensource.org/licenses/mit-license.php&gt;.</source>
-        <translation>Distribuït sota llicència de programari MIT. Vegeu el fitxer acompanyant COPYING o &lt;http://www.opensource.org/licenses/mit-license.php&gt;.</translation>
-    </message>
     <message>
         <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source>
         <translation>Executa una orde quan una transacció del moneder canvie (%s en cmd es canvia per TxID)</translation>
@@ -1562,22 +2581,6 @@
         <source>Set the number of script verification threads (%u to %d, 0 = auto, &lt;0 = leave that many cores free, default: %d)</source>
         <translation>Defineix el nombre de fils de verificació d'scripts (%u a %d, 0 = auto, &lt;0 = deixa tants nuclis lliures, per defecte: %d)</translation>
     </message>
-    <message>
-        <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
-        <translation>Esta és una versió de pre-llançament - utilitza-la sota la teva responsabilitat - No usar per a minería o aplicacions de compra-venda</translation>
-    </message>
-    <message>
-        <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source>
-        <translation>Avís: la xarxa no pareix que hi estiga plenament d'acord. Alguns miners pareix que estan experimentant problemes.</translation>
-    </message>
-    <message>
-        <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source>
-        <translation>Avís: pareix que no estem plenament d'acord amb els nostres iguals! Podria caldre que actualitzar l'aplicació, o potser que ho facen altres nodes.</translation>
-    </message>
-    <message>
-        <source>Whitelist peers connecting from the given netmask or IP address. Can be specified multiple times.</source>
-        <translation>Afig a la llista blanca els iguals que es connecten de la màscara de xarxa o adreça IP donada. Es pot especificar moltes vegades.</translation>
-    </message>
     <message>
         <source>&lt;category&gt; can be:</source>
         <translation>&lt;category&gt; pot ser:</translation>
@@ -1586,10 +2589,6 @@
         <source>Block creation options:</source>
         <translation>Opcions de la creació de blocs:</translation>
     </message>
-    <message>
-        <source>Connect only to the specified node(s)</source>
-        <translation>Connecta només al(s) node(s) especificats</translation>
-    </message>
     <message>
         <source>Connection options:</source>
         <translation>Opcions de connexió:</translation>
@@ -1734,10 +2733,6 @@
         <source>Maximum size of data in data carrier transactions we relay and mine (default: %u)</source>
         <translation>Mida màxima de les dades en les transaccions de l'operador en què confiem i en les meues (per defecte: %u)</translation>
     </message>
-    <message>
-        <source>Query for peer addresses via DNS lookup, if low on addresses (default: 1 unless -connect)</source>
-        <translation>Consulta a adreces d'iguals a través de DNS, si es troba baix en adreces (per defecte: 1 a menys que -connect)</translation>
-    </message>
     <message>
         <source>Randomize credentials for every proxy connection. This enables Tor stream isolation (default: %u)</source>
         <translation>Genera a l'atzar credencials per a cada connexió proxy. Això habilita l'aïllament del flux de Tor (per defecte: %u)</translation>
@@ -1750,10 +2745,6 @@
         <source>The transaction amount is too small to send after the fee has been deducted</source>
         <translation>L'import de la transacció és massa petit per enviar-la després que se'n deduïsca la comissió</translation>
     </message>
-    <message>
-        <source>This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit &lt;https://www.openssl.org/&gt; and cryptographic software written by Eric Young and UPnP software written by Thomas Bernard.</source>
-        <translation>Este producte inclou programari desenvolupat pel projecte OpenSSL per a ús a l'OpenSSL Toolkit &lt;https://www.openssl.org/&gt; i programari criptogràfic escrit per Eric Young i programari UPnP escrit per Thomas Bernard.</translation>
-    </message>
     <message>
         <source>Whitelisted peers cannot be DoS banned and their transactions are always relayed, even if they are already in the mempool, useful e.g. for a gateway</source>
         <translation>Els iguals en la llista blanca no poden ser bandejats per DoS i es transmetran sempre llurs transaccions, fins i tot si ja són a la mempool. Això és útil, p. ex., per a una passarel·la</translation>
@@ -1780,7 +2771,7 @@
     </message>
     <message>
         <source>Information</source>
-        <translation>&amp;Informació</translation>
+        <translation>Informació</translation>
     </message>
     <message>
         <source>Invalid amount for -paytxfee=&lt;amount&gt;: '%s' (must be at least %s)</source>
@@ -1838,10 +2829,6 @@
         <source>Transaction amount too small</source>
         <translation>Import de la transacció massa petit</translation>
     </message>
-    <message>
-        <source>Transaction amounts must be positive</source>
-        <translation>Els imports de les transaccions han de ser positius</translation>
-    </message>
     <message>
         <source>Transaction too large for fee policy</source>
         <translation>Transacció massa gran per a la política de comissions</translation>
@@ -1966,10 +2953,6 @@
         <source>Set key pool size to &lt;n&gt; (default: %u)</source>
         <translation>Defineix la mida clau disponible a &lt;n&gt; (per defecte: %u)</translation>
     </message>
-    <message>
-        <source>Set minimum block size in bytes (default: %u)</source>
-        <translation>Defineix la mida de bloc mínima en bytes (per defecte: %u)</translation>
-    </message>
     <message>
         <source>Set the number of threads to service RPC calls (default: %d)</source>
         <translation>Defineix el nombre de fils a crides de servei RPC (per defecte: %d)</translation>
diff --git a/src/qt/locale/bitcoin_ca_ES.ts b/src/qt/locale/bitcoin_ca_ES.ts
index f985a6928d938..838190b10e489 100644
--- a/src/qt/locale/bitcoin_ca_ES.ts
+++ b/src/qt/locale/bitcoin_ca_ES.ts
@@ -41,6 +41,77 @@
         <source>&amp;Delete</source>
         <translation>&amp;Elimina</translation>
     </message>
+    <message>
+        <source>Choose the address to send coins to</source>
+        <translation>Trieu l'adreça on enviar les monedes</translation>
+    </message>
+    <message>
+        <source>Choose the address to receive coins with</source>
+        <translation>Trieu l'adreça on rebre les monedes</translation>
+    </message>
+    <message>
+        <source>C&amp;hoose</source>
+        <translation>&amp;Tria</translation>
+    </message>
+    <message>
+        <source>Sending addresses</source>
+        <translation>Adreces d'enviament</translation>
+    </message>
+    <message>
+        <source>Receiving addresses</source>
+        <translation>Adreces de recepció</translation>
+    </message>
+    <message>
+        <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source>
+        <translation>Aquestes són les vostres adreces de Bitcoin per enviar els pagaments. Sempre reviseu l'import i l'adreça del destinatari abans de transferir monedes.</translation>
+    </message>
+    <message>
+        <source>These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source>
+        <translation>Aquestes són les vostres adreces Bitcoin per rebre pagaments. Es recomana utilitzar una adreça nova de recepció per a cada transacció.</translation>
+    </message>
+    <message>
+        <source>&amp;Copy Address</source>
+        <translation>&amp;Copia l'adreça</translation>
+    </message>
+    <message>
+        <source>Copy &amp;Label</source>
+        <translation>Copia l'eti&amp;queta</translation>
+    </message>
+    <message>
+        <source>&amp;Edit</source>
+        <translation>&amp;Edita</translation>
+    </message>
+    <message>
+        <source>Export Address List</source>
+        <translation>Exporta la llista d'adreces</translation>
+    </message>
+    <message>
+        <source>Comma separated file (*.csv)</source>
+        <translation>Fitxer separat per comes (*.csv)</translation>
+    </message>
+    <message>
+        <source>Exporting Failed</source>
+        <translation>L'exportació ha fallat</translation>
+    </message>
+    <message>
+        <source>There was an error trying to save the address list to %1. Please try again.</source>
+        <translation>S'ha produït un error en desar la llista d'adreces a %1. Torneu-ho a provar.</translation>
+    </message>
+</context>
+<context>
+    <name>AddressTableModel</name>
+    <message>
+        <source>Label</source>
+        <translation>Etiqueta</translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation>Adreça</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(sense etiqueta)</translation>
+    </message>
 </context>
 <context>
     <name>AskPassphraseDialog</name>
@@ -60,6 +131,94 @@
         <source>Repeat new passphrase</source>
         <translation>Repetiu la nova contrasenya</translation>
     </message>
+    <message>
+        <source>Enter the new passphrase to the wallet.&lt;br/&gt;Please use a passphrase of &lt;b&gt;ten or more random characters&lt;/b&gt;, or &lt;b&gt;eight or more words&lt;/b&gt;.</source>
+        <translation>Introduïu la contrasenya nova al moneder.&lt;br/&gt;Utilitzeu una contrasenya de &lt;b&gt;deu o més caràcters aleatoris&lt;/b&gt;, o &lt;b&gt;vuit o més paraules&lt;/b&gt;.</translation>
+    </message>
+    <message>
+        <source>Encrypt wallet</source>
+        <translation>Encripta el moneder</translation>
+    </message>
+    <message>
+        <source>This operation needs your wallet passphrase to unlock the wallet.</source>
+        <translation>Aquesta operació requereix la contrasenya del moneder per a desbloquejar-lo.</translation>
+    </message>
+    <message>
+        <source>Unlock wallet</source>
+        <translation>Desbloqueja el moneder</translation>
+    </message>
+    <message>
+        <source>This operation needs your wallet passphrase to decrypt the wallet.</source>
+        <translation>Aquesta operació requereix la contrasenya del moneder per desencriptar-lo.</translation>
+    </message>
+    <message>
+        <source>Decrypt wallet</source>
+        <translation>Desencripta el moneder</translation>
+    </message>
+    <message>
+        <source>Change passphrase</source>
+        <translation>Canvia la contrasenya</translation>
+    </message>
+    <message>
+        <source>Enter the old passphrase and new passphrase to the wallet.</source>
+        <translation>Introduïu la contrasenya antiga i la contrasenya nova al moneder.</translation>
+    </message>
+    <message>
+        <source>Confirm wallet encryption</source>
+        <translation>Confirma l'encriptació del moneder</translation>
+    </message>
+    <message>
+        <source>Warning: If you encrypt your wallet and lose your passphrase, you will &lt;b&gt;LOSE ALL OF YOUR BITCOINS&lt;/b&gt;!</source>
+        <translation>Avís: si encripteu el vostre moneder i perdeu la contrasenya, &lt;b&gt;PERDREU TOTS ELS VOSTRES BITCOINS&lt;/b&gt;!</translation>
+    </message>
+    <message>
+        <source>Are you sure you wish to encrypt your wallet?</source>
+        <translation>Esteu segur que voleu encriptar el vostre moneder?</translation>
+    </message>
+    <message>
+        <source>Wallet encrypted</source>
+        <translation>Moneder encriptat</translation>
+    </message>
+    <message>
+        <source>%1 will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source>
+        <translation>Ara es tancarà el %1 per finalitzar el procés d'encriptació. Recordeu que encriptar el vostre moneder no garanteix que les vostres bitcoins no puguin ser robades per programari maliciós que infecti l'ordinador.</translation>
+    </message>
+    <message>
+        <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source>
+        <translation>IMPORTANT: Tota copia de seguretat que hàgiu realitzat hauria de ser reemplaçada pel, recentment generat, fitxer encriptat del moneder. Per motius de seguretat, les còpies de seguretat anteriors del fitxer de moneder no encriptat esdevindran inusables tan aviat com començar a utilitzar el nou moneder encriptat.</translation>
+    </message>
+    <message>
+        <source>Wallet encryption failed</source>
+        <translation>L'encriptació del moneder ha fallat</translation>
+    </message>
+    <message>
+        <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
+        <translation>L'encriptació del moneder ha fallat per un error intern. El moneder no ha estat encriptat.</translation>
+    </message>
+    <message>
+        <source>The supplied passphrases do not match.</source>
+        <translation>Les contrasenyes introduïdes no coincideixen.</translation>
+    </message>
+    <message>
+        <source>Wallet unlock failed</source>
+        <translation>El desbloqueig del moneder ha fallat</translation>
+    </message>
+    <message>
+        <source>The passphrase entered for the wallet decryption was incorrect.</source>
+        <translation>La contrasenya introduïda per a desencriptar el moneder és incorrecta.</translation>
+    </message>
+    <message>
+        <source>Wallet decryption failed</source>
+        <translation>La desencriptació del moneder ha fallat</translation>
+    </message>
+    <message>
+        <source>Wallet passphrase was successfully changed.</source>
+        <translation>La contrasenya del moneder ha estat modificada correctament.</translation>
+    </message>
+    <message>
+        <source>Warning: The Caps Lock key is on!</source>
+        <translation>Avís: Les lletres majúscules estan activades!</translation>
+    </message>
 </context>
 <context>
     <name>BanTableModel</name>
@@ -110,6 +269,14 @@
         <source>Quit application</source>
         <translation>Surt de l'aplicació</translation>
     </message>
+    <message>
+        <source>&amp;About %1</source>
+        <translation>Qu&amp;ant al %1</translation>
+    </message>
+    <message>
+        <source>Show information about %1</source>
+        <translation>Mosta informació sobre el %1</translation>
+    </message>
     <message>
         <source>About &amp;Qt</source>
         <translation>Quant a &amp;Qt</translation>
@@ -122,6 +289,10 @@
         <source>&amp;Options...</source>
         <translation>&amp;Opcions...</translation>
     </message>
+    <message>
+        <source>Modify configuration options for %1</source>
+        <translation>Modifica les opcions de configuració de %1</translation>
+    </message>
     <message>
         <source>&amp;Encrypt Wallet...</source>
         <translation>&amp;Encripta el moneder...</translation>
@@ -140,12 +311,24 @@
     </message>
     <message>
         <source>&amp;Receiving addresses...</source>
-        <translation>Adreces de &amp;recepció</translation>
+        <translation>Adreces de &amp;recepció...</translation>
     </message>
     <message>
         <source>Open &amp;URI...</source>
         <translation>Obre un &amp;URI...</translation>
     </message>
+    <message>
+        <source>Click to disable network activity.</source>
+        <translation>Feu clic per inhabilitar l'activitat de la xarxa.</translation>
+    </message>
+    <message>
+        <source>Network activity disabled.</source>
+        <translation>S'ha inhabilitat l'activitat de la xarxa.</translation>
+    </message>
+    <message>
+        <source>Click to enable network activity again.</source>
+        <translation>Feu clic per tornar a habilitar l'activitat de la xarxa.</translation>
+    </message>
     <message>
         <source>Reindexing blocks on disk...</source>
         <translation>S'estan reindexant els blocs al disc...</translation>
@@ -251,32 +434,20 @@
         <translation><numerusform>%n connexió activa a la xarxa Bitcoin</numerusform><numerusform>%n connexions actives a la xarxa Bitcoin</numerusform></translation>
     </message>
     <message>
-        <source>No block source available...</source>
-        <translation>No hi ha cap font de bloc disponible...</translation>
-    </message>
-    <message numerus="yes">
-        <source>Processed %n block(s) of transaction history.</source>
-        <translation><numerusform>S'han processat %n bloc de l'historial de transacció.</numerusform><numerusform>S'han processat %n blocs de l'historial de transacció.</numerusform></translation>
-    </message>
-    <message numerus="yes">
-        <source>%n hour(s)</source>
-        <translation><numerusform>%n hora</numerusform><numerusform>%n hores</numerusform></translation>
-    </message>
-    <message numerus="yes">
-        <source>%n day(s)</source>
-        <translation><numerusform>%n dia</numerusform><numerusform>%n dies</numerusform></translation>
+        <source>Indexing blocks on disk...</source>
+        <translation>S'estan indexant els blocs al disc...</translation>
     </message>
-    <message numerus="yes">
-        <source>%n week(s)</source>
-        <translation><numerusform>%n setmana</numerusform><numerusform>%n setmanes</numerusform></translation>
+    <message>
+        <source>Processing blocks on disk...</source>
+        <translation>S'estan processant els blocs al disc...</translation>
     </message>
     <message>
-        <source>%1 and %2</source>
-        <translation>%1 i %2</translation>
+        <source>No block source available...</source>
+        <translation>No hi ha cap font de bloc disponible...</translation>
     </message>
     <message numerus="yes">
-        <source>%n year(s)</source>
-        <translation><numerusform>%n any</numerusform><numerusform>%n anys</numerusform></translation>
+        <source>Processed %n block(s) of transaction history.</source>
+        <translation><numerusform>S'ha processat %n bloc de l'historial de transacció.</numerusform><numerusform>S'han processat %n blocs de l'historial de transacció.</numerusform></translation>
     </message>
     <message>
         <source>%1 behind</source>
@@ -300,12 +471,20 @@
     </message>
     <message>
         <source>Information</source>
-        <translation>Informació</translation>
+        <translation>&amp;Informació</translation>
     </message>
     <message>
         <source>Up to date</source>
         <translation>Al dia</translation>
     </message>
+    <message>
+        <source>Show the %1 help message to get a list with possible Bitcoin command-line options</source>
+        <translation>Mostra el missatge d'ajuda del %1 per obtenir una llista amb les possibles opcions de línia d'ordres de Bitcoin</translation>
+    </message>
+    <message>
+        <source>%1 client</source>
+        <translation>Client de %1</translation>
+    </message>
     <message>
         <source>Catching up...</source>
         <translation>S'està posant al dia ...</translation>
@@ -348,6 +527,14 @@
         <source>Incoming transaction</source>
         <translation>Transacció entrant</translation>
     </message>
+    <message>
+        <source>HD key generation is &lt;b&gt;enabled&lt;/b&gt;</source>
+        <translation>La generació de la clau HD és &lt;b&gt;habilitada&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <source>HD key generation is &lt;b&gt;disabled&lt;/b&gt;</source>
+        <translation>La generació de la clau HD és &lt;b&gt;inhabilitada&lt;/b&gt;</translation>
+    </message>
     <message>
         <source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;unlocked&lt;/b&gt;</source>
         <translation>El moneder està &lt;b&gt;encriptat&lt;/b&gt; i actualment &lt;b&gt;desbloquejat&lt;/b&gt;</translation>
@@ -356,6 +543,10 @@
         <source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;locked&lt;/b&gt;</source>
         <translation>El moneder està &lt;b&gt;encriptat&lt;/b&gt; i actualment &lt;b&gt;bloquejat&lt;/b&gt;</translation>
     </message>
+    <message>
+        <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source>
+        <translation>S'ha produït un error fatal. Bitcoin no pot continuar amb seguretat i finalitzarà.</translation>
+    </message>
 </context>
 <context>
     <name>CoinControlDialog</name>
@@ -375,13 +566,9 @@
         <source>Amount:</source>
         <translation>Import:</translation>
     </message>
-    <message>
-        <source>Priority:</source>
-        <translation>Prioritat:</translation>
-    </message>
     <message>
         <source>Fee:</source>
-        <translation>Comissió</translation>
+        <translation>Comissió:</translation>
     </message>
     <message>
         <source>Dust:</source>
@@ -432,8 +619,84 @@
         <translation>Confirmat</translation>
     </message>
     <message>
-        <source>Priority</source>
-        <translation>Prioritat</translation>
+        <source>Copy address</source>
+        <translation>Copia l'adreça</translation>
+    </message>
+    <message>
+        <source>Copy label</source>
+        <translation>Copia l'etiqueta</translation>
+    </message>
+    <message>
+        <source>Copy amount</source>
+        <translation>Copia l'import</translation>
+    </message>
+    <message>
+        <source>Copy transaction ID</source>
+        <translation>Copia l'ID de transacció</translation>
+    </message>
+    <message>
+        <source>Lock unspent</source>
+        <translation>Bloqueja sense gastar</translation>
+    </message>
+    <message>
+        <source>Unlock unspent</source>
+        <translation>Desbloqueja sense gastar</translation>
+    </message>
+    <message>
+        <source>Copy quantity</source>
+        <translation>Copia la quantitat</translation>
+    </message>
+    <message>
+        <source>Copy fee</source>
+        <translation>Copia la comissió</translation>
+    </message>
+    <message>
+        <source>Copy after fee</source>
+        <translation>Copia la comissió posterior</translation>
+    </message>
+    <message>
+        <source>Copy bytes</source>
+        <translation>Copia els bytes</translation>
+    </message>
+    <message>
+        <source>Copy dust</source>
+        <translation>Copia el polsim</translation>
+    </message>
+    <message>
+        <source>Copy change</source>
+        <translation>Copia el canvi</translation>
+    </message>
+    <message>
+        <source>(%1 locked)</source>
+        <translation>(%1 bloquejada)</translation>
+    </message>
+    <message>
+        <source>yes</source>
+        <translation>sí</translation>
+    </message>
+    <message>
+        <source>no</source>
+        <translation>no</translation>
+    </message>
+    <message>
+        <source>This label turns red if any recipient receives an amount smaller than the current dust threshold.</source>
+        <translation>Aquesta etiqueta es torna vermella si cap recipient rep un import inferior al llindar de polsim actual.</translation>
+    </message>
+    <message>
+        <source>Can vary +/- %1 satoshi(s) per input.</source>
+        <translation>Pot variar en +/- %1 satoshi(s) per entrada.</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(sense etiqueta)</translation>
+    </message>
+    <message>
+        <source>change from %1 (%2)</source>
+        <translation>canvia de %1 (%2)</translation>
+    </message>
+    <message>
+        <source>(change)</source>
+        <translation>(canvia)</translation>
     </message>
 </context>
 <context>
@@ -458,6 +721,38 @@
         <source>&amp;Address</source>
         <translation>&amp;Adreça</translation>
     </message>
+    <message>
+        <source>New receiving address</source>
+        <translation>Nova adreça de recepció</translation>
+    </message>
+    <message>
+        <source>New sending address</source>
+        <translation>Nova adreça d'enviament</translation>
+    </message>
+    <message>
+        <source>Edit receiving address</source>
+        <translation>Edita l'adreça de recepció</translation>
+    </message>
+    <message>
+        <source>Edit sending address</source>
+        <translation>Edita l'adreça d'enviament</translation>
+    </message>
+    <message>
+        <source>The entered address "%1" is not a valid Bitcoin address.</source>
+        <translation>L'adreça introduïda «%1» no és una adreça de Bitcoin vàlida.</translation>
+    </message>
+    <message>
+        <source>The entered address "%1" is already in the address book.</source>
+        <translation>L'adreça introduïda «%1» ja és present a la llibreta d'adreces.</translation>
+    </message>
+    <message>
+        <source>Could not unlock wallet.</source>
+        <translation>No s'ha pogut desbloquejar el moneder.</translation>
+    </message>
+    <message>
+        <source>New key generation failed.</source>
+        <translation>Ha fallat la generació d'una clau nova.</translation>
+    </message>
 </context>
 <context>
     <name>FreespaceChecker</name>
@@ -492,6 +787,10 @@
         <source>(%1-bit)</source>
         <translation>(%1-bit)</translation>
     </message>
+    <message>
+        <source>About %1</source>
+        <translation>Quant al %1</translation>
+    </message>
     <message>
         <source>Command-line options</source>
         <translation>Opcions de línia d'ordres</translation>
@@ -528,12 +827,28 @@
         <source>Show splash screen on startup (default: %u)</source>
         <translation>Mostra la pantalla de benvinguda a l'inici (per defecte: %u)</translation>
     </message>
-    </context>
+    <message>
+        <source>Reset all settings changed in the GUI</source>
+        <translation>Reinicialitza tots els canvis de configuració fets des de la interfície gràfica</translation>
+    </message>
+</context>
 <context>
     <name>Intro</name>
     <message>
         <source>Welcome</source>
-        <translation>Us donem la benviguda</translation>
+        <translation>Us donem la benvinguda</translation>
+    </message>
+    <message>
+        <source>Welcome to %1.</source>
+        <translation>Us donem la benvinguda a %1.</translation>
+    </message>
+    <message>
+        <source>As this is the first time the program is launched, you can choose where %1 will store its data.</source>
+        <translation>Com és la primera vegada que s'executa el programa, podeu triar on %1 emmagatzemarà les dades.</translation>
+    </message>
+    <message>
+        <source>%1 will download and store a copy of the Bitcoin block chain. At least %2GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source>
+        <translation>%1 baixarà i emmagatzemarà una còpia de la cadena de blocs de Bitcoin. Com a mínim %2GB de dades s'emmagatzemaran en aquest directori, i augmentarà al llarg del temps. El moneder també s'emmagatzemarà en aquest directori.</translation>
     </message>
     <message>
         <source>Use the default data directory</source>
@@ -560,6 +875,37 @@
         <translation><numerusform>(de %n GB necessari)</numerusform><numerusform>(de %n GB necessaris)</numerusform></translation>
     </message>
 </context>
+<context>
+    <name>ModalOverlay</name>
+    <message>
+        <source>Form</source>
+        <translation>Formulari</translation>
+    </message>
+    <message>
+        <source>Last block time</source>
+        <translation>Últim temps de bloc</translation>
+    </message>
+    <message>
+        <source>Progress</source>
+        <translation>Progrés</translation>
+    </message>
+    <message>
+        <source>calculating...</source>
+        <translation>s'està calculant...</translation>
+    </message>
+    <message>
+        <source>Estimated time left until synced</source>
+        <translation>Temps estimat restant fins sincronitzat</translation>
+    </message>
+    <message>
+        <source>Hide</source>
+        <translation>Amaga</translation>
+    </message>
+    <message>
+        <source>Unknown. Syncing Headers (%1)...</source>
+        <translation>Desconegut. Sincronització de les capçaleres (%1)...</translation>
+    </message>
+</context>
 <context>
     <name>OpenURIDialog</name>
     <message>
@@ -578,6 +924,10 @@
         <source>Select payment request file</source>
         <translation>Selecciona un fitxer de sol·licitud de pagament</translation>
     </message>
+    <message>
+        <source>Select payment request file to open</source>
+        <translation>Seleccioneu el fitxer de sol·licitud de pagament per obrir</translation>
+    </message>
 </context>
 <context>
     <name>OptionsDialog</name>
@@ -589,6 +939,14 @@
         <source>&amp;Main</source>
         <translation>&amp;Principal</translation>
     </message>
+    <message>
+        <source>Automatically start %1 after logging in to the system.</source>
+        <translation>Inicieu %1 automàticament després d'entrar en el sistema.</translation>
+    </message>
+    <message>
+        <source>&amp;Start %1 on system login</source>
+        <translation>&amp;Inicia %1 en l'entrada al sistema</translation>
+    </message>
     <message>
         <source>Size of &amp;database cache</source>
         <translation>Mida de la memòria cau de la base de &amp;dades</translation>
@@ -725,6 +1083,14 @@
         <source>&amp;Window</source>
         <translation>&amp;Finestra</translation>
     </message>
+    <message>
+        <source>&amp;Hide the icon from the system tray.</source>
+        <translation>Ama&amp;ga la icona de la safata del sistema.</translation>
+    </message>
+    <message>
+        <source>Hide tray icon</source>
+        <translation>Amaga la icona de la safata</translation>
+    </message>
     <message>
         <source>Show only a tray icon after minimizing the window.</source>
         <translation>Mostra només la icona de la barra en minimitzar la finestra.</translation>
@@ -745,6 +1111,10 @@
         <source>User Interface &amp;language:</source>
         <translation>&amp;Llengua de la interfície d'usuari:</translation>
     </message>
+    <message>
+        <source>The user interface language can be set here. This setting will take effect after restarting %1.</source>
+        <translation>Aquí es pot definir la llengua de la interfície d'usuari. Aquest paràmetre tindrà efecte en reiniciar el %1.</translation>
+    </message>
     <message>
         <source>&amp;Unit to show amounts in:</source>
         <translation>&amp;Unitats per mostrar els imports en:</translation>
@@ -870,67 +1240,180 @@
     </message>
 </context>
 <context>
-    <name>PeerTableModel</name>
+    <name>PaymentServer</name>
     <message>
-        <source>User Agent</source>
-        <translation>Agent d'usuari</translation>
+        <source>Payment request error</source>
+        <translation>Error de la sol·licitud de pagament</translation>
     </message>
     <message>
-        <source>Node/Service</source>
-        <translation>Node/Servei</translation>
+        <source>Cannot start bitcoin: click-to-pay handler</source>
+        <translation>No es pot iniciar bitcoin: controlador click-to-pay</translation>
     </message>
     <message>
-        <source>Ping Time</source>
-        <translation>Temps de ping</translation>
+        <source>URI handling</source>
+        <translation>Gestió d'URI</translation>
     </message>
-</context>
-<context>
-    <name>QObject</name>
     <message>
-        <source>Amount</source>
-        <translation>Import</translation>
+        <source>Payment request fetch URL is invalid: %1</source>
+        <translation>L'URL de recuperació de la sol·licitud de pagament no és vàlida: %1</translation>
     </message>
     <message>
-        <source>Enter a Bitcoin address (e.g. %1)</source>
-        <translation>Introduïu una adreça de Bitcoin (p. ex. %1)</translation>
+        <source>Invalid payment address %1</source>
+        <translation>Adreça de pagament no vàlida %1</translation>
     </message>
     <message>
-        <source>%1 d</source>
-        <translation>%1 d</translation>
+        <source>URI cannot be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source>
+        <translation>L'URI no pot ser analitzat! Això pot ser a causa d'una adreça de Bitcoin no vàlida o per paràmetres URI amb mal format.</translation>
     </message>
     <message>
-        <source>%1 h</source>
-        <translation>%1 h</translation>
+        <source>Payment request file handling</source>
+        <translation>Gestió de fitxers de les sol·licituds de pagament</translation>
     </message>
     <message>
-        <source>%1 m</source>
-        <translation>%1 m</translation>
+        <source>Payment request file cannot be read! This can be caused by an invalid payment request file.</source>
+        <translation>No es pot llegir el fitxer de la sol·licitud de pagament. Això pot ser causat per un fitxer de sol·licitud de pagament no vàlid.</translation>
     </message>
     <message>
-        <source>%1 s</source>
-        <translation>%1 s</translation>
+        <source>Payment request rejected</source>
+        <translation>La sol·licitud de pagament s'ha rebutjat</translation>
     </message>
     <message>
-        <source>None</source>
-        <translation>Cap</translation>
+        <source>Payment request network doesn't match client network.</source>
+        <translation>La xarxa de la sol·licitud de pagament no coincideix amb la xarxa del client.</translation>
     </message>
     <message>
-        <source>N/A</source>
-        <translation>N/A</translation>
+        <source>Payment request expired.</source>
+        <translation>La sol·licitud de pagament ha vençut.</translation>
     </message>
     <message>
-        <source>%1 ms</source>
-        <translation>%1 ms</translation>
+        <source>Payment request is not initialized.</source>
+        <translation>La sol·licitud de pagament no està inicialitzada.</translation>
     </message>
-</context>
-<context>
-    <name>RPCConsole</name>
     <message>
-        <source>N/A</source>
-        <translation>N/A</translation>
+        <source>Unverified payment requests to custom payment scripts are unsupported.</source>
+        <translation>No s'accepten sol·licituds de pagament no verificades a scripts de pagament personalitzats.</translation>
     </message>
     <message>
-        <source>Client version</source>
+        <source>Invalid payment request.</source>
+        <translation>Sol·licitud de pagament no vàlida.</translation>
+    </message>
+    <message>
+        <source>Requested payment amount of %1 is too small (considered dust).</source>
+        <translation>L'import de pagament sol·licitat %1 és massa petit (es considera polsim).</translation>
+    </message>
+    <message>
+        <source>Refund from %1</source>
+        <translation>Reemborsament de %1</translation>
+    </message>
+    <message>
+        <source>Payment request %1 is too large (%2 bytes, allowed %3 bytes).</source>
+        <translation>La sol·licitud de pagament %1 és massa gran (%2 bytes, permès %3 bytes).</translation>
+    </message>
+    <message>
+        <source>Error communicating with %1: %2</source>
+        <translation>Error en comunicar amb %1: %2</translation>
+    </message>
+    <message>
+        <source>Payment request cannot be parsed!</source>
+        <translation>No es pot analitzar la sol·licitud de pagament!</translation>
+    </message>
+    <message>
+        <source>Bad response from server %1</source>
+        <translation>Mala resposta del servidor %1</translation>
+    </message>
+    <message>
+        <source>Network request error</source>
+        <translation>Error en la sol·licitud de xarxa</translation>
+    </message>
+    <message>
+        <source>Payment acknowledged</source>
+        <translation>Pagament reconegut</translation>
+    </message>
+</context>
+<context>
+    <name>PeerTableModel</name>
+    <message>
+        <source>User Agent</source>
+        <translation>Agent d'usuari</translation>
+    </message>
+    <message>
+        <source>Node/Service</source>
+        <translation>Node/Servei</translation>
+    </message>
+    </context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Amount</source>
+        <translation>Import</translation>
+    </message>
+    <message>
+        <source>Enter a Bitcoin address (e.g. %1)</source>
+        <translation>Introduïu una adreça de Bitcoin (p. ex. %1)</translation>
+    </message>
+    <message>
+        <source>%1 d</source>
+        <translation>%1 d</translation>
+    </message>
+    <message>
+        <source>%1 h</source>
+        <translation>%1 h</translation>
+    </message>
+    <message>
+        <source>%1 m</source>
+        <translation>%1 m</translation>
+    </message>
+    <message>
+        <source>%1 s</source>
+        <translation>%1 s</translation>
+    </message>
+    <message>
+        <source>None</source>
+        <translation>Cap</translation>
+    </message>
+    <message>
+        <source>N/A</source>
+        <translation>N/A</translation>
+    </message>
+    <message>
+        <source>%1 ms</source>
+        <translation>%1 ms</translation>
+    </message>
+    <message>
+        <source>%1 and %2</source>
+        <translation>%1 i %2</translation>
+    </message>
+    </context>
+<context>
+    <name>QObject::QObject</name>
+    </context>
+<context>
+    <name>QRImageWidget</name>
+    <message>
+        <source>&amp;Save Image...</source>
+        <translation>De&amp;sa la imatge...</translation>
+    </message>
+    <message>
+        <source>&amp;Copy Image</source>
+        <translation>&amp;Copia la imatge</translation>
+    </message>
+    <message>
+        <source>Save QR Code</source>
+        <translation>Desa el codi QR</translation>
+    </message>
+    <message>
+        <source>PNG Image (*.png)</source>
+        <translation>Imatge PNG (*.png)</translation>
+    </message>
+</context>
+<context>
+    <name>RPCConsole</name>
+    <message>
+        <source>N/A</source>
+        <translation>N/A</translation>
+    </message>
+    <message>
+        <source>Client version</source>
         <translation>Versió del client</translation>
     </message>
     <message>
@@ -949,6 +1432,10 @@
         <source>Using BerkeleyDB version</source>
         <translation>Utilitzant BerkeleyDB versió</translation>
     </message>
+    <message>
+        <source>Datadir</source>
+        <translation>Datadir</translation>
+    </message>
     <message>
         <source>Startup time</source>
         <translation>&amp;Temps d'inici</translation>
@@ -1109,14 +1596,6 @@
         <source>Clear console</source>
         <translation>Neteja la consola</translation>
     </message>
-    <message>
-        <source>&amp;Disconnect Node</source>
-        <translation>&amp;Desconnecta el node</translation>
-    </message>
-    <message>
-        <source>Ban Node for</source>
-        <translation>Bandeja el node durant</translation>
-    </message>
     <message>
         <source>1 &amp;hour</source>
         <translation>1 &amp;hora</translation>
@@ -1133,10 +1612,6 @@
         <source>1 &amp;year</source>
         <translation>1 &amp;any</translation>
     </message>
-    <message>
-        <source>&amp;Unban Node</source>
-        <translation>&amp;Desbandeja el node</translation>
-    </message>
     <message>
         <source>Use up and down arrows to navigate history, and &lt;b&gt;Ctrl-L&lt;/b&gt; to clear screen.</source>
         <translation>Utilitza les fletxes d'amunt i avall per navegar per l'historial, i &lt;b&gt;Ctrl-L&lt;\b&gt; per netejar la pantalla.</translation>
@@ -1264,6 +1739,18 @@
         <source>Remove</source>
         <translation>Esborra</translation>
     </message>
+    <message>
+        <source>Copy label</source>
+        <translation>Copia l'etiqueta</translation>
+    </message>
+    <message>
+        <source>Copy message</source>
+        <translation>Copia el missatge</translation>
+    </message>
+    <message>
+        <source>Copy amount</source>
+        <translation>Copia l'import</translation>
+    </message>
 </context>
 <context>
     <name>ReceiveRequestDialog</name>
@@ -1283,6 +1770,73 @@
         <source>&amp;Save Image...</source>
         <translation>De&amp;sa la imatge...</translation>
     </message>
+    <message>
+        <source>Request payment to %1</source>
+        <translation>Sol·licita un pagament a %1</translation>
+    </message>
+    <message>
+        <source>Payment information</source>
+        <translation>Informació de pagament</translation>
+    </message>
+    <message>
+        <source>URI</source>
+        <translation>URI</translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation>Adreça</translation>
+    </message>
+    <message>
+        <source>Amount</source>
+        <translation>Import</translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation>Etiqueta</translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation>Missatge</translation>
+    </message>
+    <message>
+        <source>Resulting URI too long, try to reduce the text for label / message.</source>
+        <translation>URI resultant massa llarga, intenta reduir el text per a la etiqueta / missatge</translation>
+    </message>
+    <message>
+        <source>Error encoding URI into QR Code.</source>
+        <translation>Error en codificar l'URI en un codi QR.</translation>
+    </message>
+</context>
+<context>
+    <name>RecentRequestsTableModel</name>
+    <message>
+        <source>Date</source>
+        <translation>Data</translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation>Etiqueta</translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation>Missatge</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(sense etiqueta)</translation>
+    </message>
+    <message>
+        <source>(no message)</source>
+        <translation>(sense missatge)</translation>
+    </message>
+    <message>
+        <source>(no amount requested)</source>
+        <translation>(no s'ha sol·licitat import)</translation>
+    </message>
+    <message>
+        <source>Requested</source>
+        <translation>Sol·licitat</translation>
+    </message>
 </context>
 <context>
     <name>SendCoinsDialog</name>
@@ -1318,10 +1872,6 @@
         <source>Amount:</source>
         <translation>Import:</translation>
     </message>
-    <message>
-        <source>Priority:</source>
-        <translation>Prioritat:</translation>
-    </message>
     <message>
         <source>Fee:</source>
         <translation>Comissió:</translation>
@@ -1390,10 +1940,6 @@
         <source>(Smart fee not initialized yet. This usually takes a few blocks...)</source>
         <translation>(No s'ha inicialitzat encara la comissió intel·ligent. Normalment pren uns pocs blocs...)</translation>
     </message>
-    <message>
-        <source>Confirmation time:</source>
-        <translation>Temps de confirmació:</translation>
-    </message>
     <message>
         <source>normal</source>
         <translation>normal</translation>
@@ -1412,7 +1958,7 @@
     </message>
     <message>
         <source>Clear all fields of the form.</source>
-        <translation>Netejar tots els camps del formulari.</translation>
+        <translation>Esborra tots els camps del formuari.</translation>
     </message>
     <message>
         <source>Dust:</source>
@@ -1434,6 +1980,106 @@
         <source>S&amp;end</source>
         <translation>E&amp;nvia</translation>
     </message>
+    <message>
+        <source>Copy quantity</source>
+        <translation>Copia la quantitat</translation>
+    </message>
+    <message>
+        <source>Copy amount</source>
+        <translation>Copia l'import</translation>
+    </message>
+    <message>
+        <source>Copy fee</source>
+        <translation>Copia la comissió</translation>
+    </message>
+    <message>
+        <source>Copy after fee</source>
+        <translation>Copia la comissió posterior</translation>
+    </message>
+    <message>
+        <source>Copy bytes</source>
+        <translation>Copia els bytes</translation>
+    </message>
+    <message>
+        <source>Copy dust</source>
+        <translation>Copia el polsim</translation>
+    </message>
+    <message>
+        <source>Copy change</source>
+        <translation>Copia el canvi</translation>
+    </message>
+    <message>
+        <source>%1 to %2</source>
+        <translation>%1 a %2</translation>
+    </message>
+    <message>
+        <source>Are you sure you want to send?</source>
+        <translation>Esteu segur que ho voleu enviar?</translation>
+    </message>
+    <message>
+        <source>added as transaction fee</source>
+        <translation>S'ha afegit una taxa de transacció</translation>
+    </message>
+    <message>
+        <source>Total Amount %1</source>
+        <translation>Import total %1</translation>
+    </message>
+    <message>
+        <source>or</source>
+        <translation>o</translation>
+    </message>
+    <message>
+        <source>Confirm send coins</source>
+        <translation>Confirma l'enviament de monedes</translation>
+    </message>
+    <message>
+        <source>The recipient address is not valid. Please recheck.</source>
+        <translation>L'adreça del destinatari no és vàlida. Torneu-la a comprovar.</translation>
+    </message>
+    <message>
+        <source>The amount to pay must be larger than 0.</source>
+        <translation>L'import a pagar ha de ser major que 0.</translation>
+    </message>
+    <message>
+        <source>The amount exceeds your balance.</source>
+        <translation>L'import supera el vostre balanç.</translation>
+    </message>
+    <message>
+        <source>The total exceeds your balance when the %1 transaction fee is included.</source>
+        <translation>El total excedeix el vostre balanç quan s'afegeix la comissió a la transacció %1.</translation>
+    </message>
+    <message>
+        <source>Duplicate address found: addresses should only be used once each.</source>
+        <translation>S'ha trobat una adreça duplicada: les adreces només s'haurien d'utilitzar una vegada cada una.</translation>
+    </message>
+    <message>
+        <source>Transaction creation failed!</source>
+        <translation>La creació de la transacció ha fallat!</translation>
+    </message>
+    <message>
+        <source>A fee higher than %1 is considered an absurdly high fee.</source>
+        <translation>Una comissió superior a %1 es considera una comissió absurdament alta.</translation>
+    </message>
+    <message>
+        <source>Payment request expired.</source>
+        <translation>La sol·licitud de pagament ha vençut.</translation>
+    </message>
+    <message>
+        <source>Pay only the required fee of %1</source>
+        <translation>Paga només la comissió necessària de %1</translation>
+    </message>
+    <message>
+        <source>Warning: Invalid Bitcoin address</source>
+        <translation>Avís: adreça Bitcoin no vàlida</translation>
+    </message>
+    <message>
+        <source>Warning: Unknown change address</source>
+        <translation>Avís: adreça de canvi desconeguda</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(sense etiqueta)</translation>
+    </message>
 </context>
 <context>
     <name>SendCoinsEntry</name>
@@ -1513,6 +2159,17 @@
         <source>Memo:</source>
         <translation>Memo:</translation>
     </message>
+    <message>
+        <source>Enter a label for this address to add it to your address book</source>
+        <translation>Introduïu una etiqueta per a aquesta adreça per afegir-la a la llibreta d'adreces</translation>
+    </message>
+</context>
+<context>
+    <name>SendConfirmationDialog</name>
+    <message>
+        <source>Yes</source>
+        <translation>Sí</translation>
+    </message>
 </context>
 <context>
     <name>ShutdownWindow</name>
@@ -1541,15 +2198,15 @@
     </message>
     <message>
         <source>Choose previously used address</source>
-        <translation>Tria les adreces fetes servir amb anterioritat</translation>
+        <translation>Escull una adreça feta servir anteriorment</translation>
     </message>
     <message>
         <source>Alt+A</source>
-        <translation>Alt+A</translation>
+        <translation>Alta+A</translation>
     </message>
     <message>
         <source>Paste address from clipboard</source>
-        <translation>Enganxa l'adreça del porta-retalls</translation>
+        <translation>Enganxar adreça del porta-retalls</translation>
     </message>
     <message>
         <source>Alt+P</source>
@@ -1607,72 +2264,566 @@
         <source>Reset all verify message fields</source>
         <translation>Neteja tots els camps de verificació de missatge</translation>
     </message>
-</context>
-<context>
-    <name>SplashScreen</name>
     <message>
-        <source>[testnet]</source>
-        <translation>[testnet]</translation>
+        <source>Click "Sign Message" to generate signature</source>
+        <translation>Feu clic a «Signa el missatge» per a generar una signatura</translation>
     </message>
-</context>
-<context>
-    <name>TrafficGraphWidget</name>
     <message>
-        <source>KB/s</source>
-        <translation>KB/s</translation>
+        <source>The entered address is invalid.</source>
+        <translation>L'adreça introduïda no és vàlida.</translation>
     </message>
-</context>
-<context>
-    <name>TransactionDescDialog</name>
     <message>
-        <source>This pane shows a detailed description of the transaction</source>
-        <translation>Aquest panell mostra una descripció detallada de la transacció</translation>
+        <source>Please check the address and try again.</source>
+        <translation>Comproveu l'adreça i torneu-ho a provar.</translation>
     </message>
-</context>
-<context>
-    <name>UnitDisplayStatusBarControl</name>
     <message>
-        <source>Unit to show amounts in. Click to select another unit.</source>
-        <translation>Unitat en què mostrar els imports. Feu clic per seleccionar una altra unitat.</translation>
+        <source>The entered address does not refer to a key.</source>
+        <translation>L'adreça introduïda no referencia a cap clau.</translation>
     </message>
-</context>
-<context>
-    <name>bitcoin-core</name>
     <message>
-        <source>Options:</source>
-        <translation>Opcions:</translation>
+        <source>Wallet unlock was cancelled.</source>
+        <translation>El desbloqueig del moneder ha estat cancelat.</translation>
     </message>
     <message>
-        <source>Specify data directory</source>
-        <translation>Especifica el directori de dades</translation>
+        <source>Private key for the entered address is not available.</source>
+        <translation>La clau privada per a la adreça introduïda no està disponible.</translation>
     </message>
     <message>
-        <source>Connect to a node to retrieve peer addresses, and disconnect</source>
-        <translation>Connecta al node per obtenir les adreces de les connexions, i desconnecta</translation>
+        <source>Message signing failed.</source>
+        <translation>La signatura del missatge ha fallat.</translation>
     </message>
     <message>
-        <source>Specify your own public address</source>
-        <translation>Especifiqueu la vostra adreça pública</translation>
+        <source>Message signed.</source>
+        <translation>Missatge signat.</translation>
     </message>
     <message>
-        <source>Accept command line and JSON-RPC commands</source>
-        <translation>Accepta la línia d'ordres i ordres JSON-RPC </translation>
+        <source>The signature could not be decoded.</source>
+        <translation>La signatura no s'ha pogut descodificar.</translation>
     </message>
     <message>
-        <source>If &lt;category&gt; is not supplied or if &lt;category&gt; = 1, output all debugging information.</source>
-        <translation>Si no es proporciona &lt;category&gt; o si &lt;category&gt; = 1, treu a la sortida tota la informació de depuració.</translation>
+        <source>Please check the signature and try again.</source>
+        <translation>Comproveu la signatura i torneu-ho a provar.</translation>
     </message>
     <message>
-        <source>Prune configured below the minimum of %d MiB.  Please use a higher number.</source>
-        <translation>Poda configurada per sota el mínim de %d MiB. Utilitzeu un nombre superior.</translation>
+        <source>The signature did not match the message digest.</source>
+        <translation>La signatura no coincideix amb el resum del missatge.</translation>
     </message>
     <message>
-        <source>Prune: last wallet synchronisation goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of pruned node)</source>
-        <translation>Poda: la darrera sincronització del moneder va més enllà de les dades podades. Cal que activeu -reindex (baixeu tota la cadena de blocs de nou en cas de node podat)</translation>
+        <source>Message verification failed.</source>
+        <translation>Ha fallat la verificació del missatge.</translation>
     </message>
     <message>
-        <source>Reduce storage requirements by pruning (deleting) old blocks. This mode is incompatible with -txindex and -rescan. Warning: Reverting this setting requires re-downloading the entire blockchain. (default: 0 = disable pruning blocks, &gt;%u = target size in MiB to use for block files)</source>
-        <translation>Reduïu els requisits d'emmagatzematge podant (suprimint) els blocs antics. Aquest mode és incompatible amb -txindex i -rescan. Avís: la reversió d'aquest paràmetre implica haver de tornar a baixar la cadena de blocs sencera. (per defecte: 0 = inhabilita la poda de blocs, &gt;%u = mida objectiu en MiB per utilitzar en els fitxers de blocs)</translation>
+        <source>Message verified.</source>
+        <translation>Missatge verificat.</translation>
+    </message>
+</context>
+<context>
+    <name>SplashScreen</name>
+    <message>
+        <source>[testnet]</source>
+        <translation>[testnet]</translation>
+    </message>
+</context>
+<context>
+    <name>TrafficGraphWidget</name>
+    <message>
+        <source>KB/s</source>
+        <translation>KB/s</translation>
+    </message>
+</context>
+<context>
+    <name>TransactionDesc</name>
+    <message>
+        <source>Open until %1</source>
+        <translation>Obert fins %1</translation>
+    </message>
+    <message>
+        <source>%1/offline</source>
+        <translation>%1/fora de línia</translation>
+    </message>
+    <message>
+        <source>%1/unconfirmed</source>
+        <translation>%1/sense confirmar</translation>
+    </message>
+    <message>
+        <source>%1 confirmations</source>
+        <translation>%1 confirmacions</translation>
+    </message>
+    <message>
+        <source>Status</source>
+        <translation>Estat</translation>
+    </message>
+    <message>
+        <source>, has not been successfully broadcast yet</source>
+        <translation>, encara no ha estat emès correctement</translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation>Data</translation>
+    </message>
+    <message>
+        <source>Source</source>
+        <translation>Font</translation>
+    </message>
+    <message>
+        <source>Generated</source>
+        <translation>Generada</translation>
+    </message>
+    <message>
+        <source>From</source>
+        <translation>De</translation>
+    </message>
+    <message>
+        <source>unknown</source>
+        <translation>desconegut</translation>
+    </message>
+    <message>
+        <source>To</source>
+        <translation>A</translation>
+    </message>
+    <message>
+        <source>own address</source>
+        <translation>adreça pròpia</translation>
+    </message>
+    <message>
+        <source>watch-only</source>
+        <translation>només lectura</translation>
+    </message>
+    <message>
+        <source>label</source>
+        <translation>etiqueta</translation>
+    </message>
+    <message>
+        <source>Credit</source>
+        <translation>Crèdit</translation>
+    </message>
+    <message>
+        <source>not accepted</source>
+        <translation>no acceptat</translation>
+    </message>
+    <message>
+        <source>Debit</source>
+        <translation>Dèbit</translation>
+    </message>
+    <message>
+        <source>Total debit</source>
+        <translation>Dèbit total</translation>
+    </message>
+    <message>
+        <source>Total credit</source>
+        <translation>Crèdit total</translation>
+    </message>
+    <message>
+        <source>Transaction fee</source>
+        <translation>Comissió de transacció</translation>
+    </message>
+    <message>
+        <source>Net amount</source>
+        <translation>Import net</translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation>Missatge</translation>
+    </message>
+    <message>
+        <source>Comment</source>
+        <translation>Comentari</translation>
+    </message>
+    <message>
+        <source>Transaction ID</source>
+        <translation>ID de la transacció</translation>
+    </message>
+    <message>
+        <source>Merchant</source>
+        <translation>Mercader</translation>
+    </message>
+    <message>
+        <source>Generated coins must mature %1 blocks before they can be spent. When you generated this block, it was broadcast to the network to be added to the block chain. If it fails to get into the chain, its state will change to "not accepted" and it won't be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source>
+        <translation>Les monedes generades han de madurar %1 blocs abans de poder ser gastades. Quan genereu aquest bloc, es farà saber a la xarxa per tal d'afegir-lo a la cadena de blocs. Si no pot fer-se lloc a la cadena, el seu estat canviarà a «no acceptat» i no es podrà gastar. Això pot passar ocasionalment si un altre node genera un bloc en un marge de segons respecte al vostre.</translation>
+    </message>
+    <message>
+        <source>Debug information</source>
+        <translation>Informació de depuració</translation>
+    </message>
+    <message>
+        <source>Transaction</source>
+        <translation>Transacció</translation>
+    </message>
+    <message>
+        <source>Inputs</source>
+        <translation>Entrades</translation>
+    </message>
+    <message>
+        <source>Amount</source>
+        <translation>Import</translation>
+    </message>
+    <message>
+        <source>true</source>
+        <translation>cert</translation>
+    </message>
+    <message>
+        <source>false</source>
+        <translation>fals</translation>
+    </message>
+</context>
+<context>
+    <name>TransactionDescDialog</name>
+    <message>
+        <source>This pane shows a detailed description of the transaction</source>
+        <translation>Aquest panell mostra una descripció detallada de la transacció</translation>
+    </message>
+    </context>
+<context>
+    <name>TransactionTableModel</name>
+    <message>
+        <source>Date</source>
+        <translation>Data</translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation>Tipus</translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation>Etiqueta</translation>
+    </message>
+    <message>
+        <source>Open until %1</source>
+        <translation>Obert fins %1</translation>
+    </message>
+    <message>
+        <source>Offline</source>
+        <translation>Fora de línia</translation>
+    </message>
+    <message>
+        <source>Unconfirmed</source>
+        <translation>Sense confirmar</translation>
+    </message>
+    <message>
+        <source>Abandoned</source>
+        <translation>Abandonada</translation>
+    </message>
+    <message>
+        <source>Confirming (%1 of %2 recommended confirmations)</source>
+        <translation>Confirmant (%1 de %2 confirmacions recomanades)</translation>
+    </message>
+    <message>
+        <source>Confirmed (%1 confirmations)</source>
+        <translation>Confirmat (%1 confirmacions)</translation>
+    </message>
+    <message>
+        <source>Conflicted</source>
+        <translation>En conflicte</translation>
+    </message>
+    <message>
+        <source>Immature (%1 confirmations, will be available after %2)</source>
+        <translation>Immadur (%1 confirmacions, serà disponible després de %2)</translation>
+    </message>
+    <message>
+        <source>This block was not received by any other nodes and will probably not be accepted!</source>
+        <translation>Aquest bloc no ha estat rebut per cap altre node i probablement no serà acceptat!</translation>
+    </message>
+    <message>
+        <source>Generated but not accepted</source>
+        <translation>Generat però no acceptat</translation>
+    </message>
+    <message>
+        <source>Received with</source>
+        <translation>Rebuda amb</translation>
+    </message>
+    <message>
+        <source>Received from</source>
+        <translation>Rebuda de</translation>
+    </message>
+    <message>
+        <source>Sent to</source>
+        <translation>Enviada a</translation>
+    </message>
+    <message>
+        <source>Payment to yourself</source>
+        <translation>Pagament a un mateix</translation>
+    </message>
+    <message>
+        <source>Mined</source>
+        <translation>Minada</translation>
+    </message>
+    <message>
+        <source>watch-only</source>
+        <translation>només lectura</translation>
+    </message>
+    <message>
+        <source>(n/a)</source>
+        <translation>(n/a)</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(sense etiqueta)</translation>
+    </message>
+    <message>
+        <source>Transaction status. Hover over this field to show number of confirmations.</source>
+        <translation>Estat de la transacció. Desplaceu-vos sobre aquest camp per mostrar el nombre de confirmacions.</translation>
+    </message>
+    <message>
+        <source>Date and time that the transaction was received.</source>
+        <translation>Data i hora en que la transacció va ser rebuda.</translation>
+    </message>
+    <message>
+        <source>Type of transaction.</source>
+        <translation>Tipus de transacció.</translation>
+    </message>
+    <message>
+        <source>Whether or not a watch-only address is involved in this transaction.</source>
+        <translation>Si està implicada o no una adreça només de lectura en la transacció.</translation>
+    </message>
+    <message>
+        <source>User-defined intent/purpose of the transaction.</source>
+        <translation>Intenció/propòsit de la transacció definida per l'usuari.</translation>
+    </message>
+    <message>
+        <source>Amount removed from or added to balance.</source>
+        <translation>Import extret o afegit del balanç.</translation>
+    </message>
+</context>
+<context>
+    <name>TransactionView</name>
+    <message>
+        <source>All</source>
+        <translation>Tot</translation>
+    </message>
+    <message>
+        <source>Today</source>
+        <translation>Avui</translation>
+    </message>
+    <message>
+        <source>This week</source>
+        <translation>Aquesta setmana</translation>
+    </message>
+    <message>
+        <source>This month</source>
+        <translation>Aquest mes</translation>
+    </message>
+    <message>
+        <source>Last month</source>
+        <translation>El mes passat</translation>
+    </message>
+    <message>
+        <source>This year</source>
+        <translation>Enguany</translation>
+    </message>
+    <message>
+        <source>Range...</source>
+        <translation>Rang...</translation>
+    </message>
+    <message>
+        <source>Received with</source>
+        <translation>Rebuda amb</translation>
+    </message>
+    <message>
+        <source>Sent to</source>
+        <translation>Enviada a</translation>
+    </message>
+    <message>
+        <source>To yourself</source>
+        <translation>A un mateix</translation>
+    </message>
+    <message>
+        <source>Mined</source>
+        <translation>Minada</translation>
+    </message>
+    <message>
+        <source>Other</source>
+        <translation>Altres</translation>
+    </message>
+    <message>
+        <source>Enter address or label to search</source>
+        <translation>Introduïu una adreça o una etiqueta per cercar</translation>
+    </message>
+    <message>
+        <source>Min amount</source>
+        <translation>Import mínim</translation>
+    </message>
+    <message>
+        <source>Copy address</source>
+        <translation>Copia l'adreça</translation>
+    </message>
+    <message>
+        <source>Copy label</source>
+        <translation>Copia l'etiqueta</translation>
+    </message>
+    <message>
+        <source>Copy amount</source>
+        <translation>Copia l'import</translation>
+    </message>
+    <message>
+        <source>Copy transaction ID</source>
+        <translation>Copia l'ID de transacció</translation>
+    </message>
+    <message>
+        <source>Copy raw transaction</source>
+        <translation>Copia la transacció crua</translation>
+    </message>
+    <message>
+        <source>Edit label</source>
+        <translation>Editar etiqueta</translation>
+    </message>
+    <message>
+        <source>Show transaction details</source>
+        <translation>Mostra detalls de la transacció</translation>
+    </message>
+    <message>
+        <source>Export Transaction History</source>
+        <translation>Exporta l'historial de transacció</translation>
+    </message>
+    <message>
+        <source>Comma separated file (*.csv)</source>
+        <translation>Fitxer separat per comes (*.csv)</translation>
+    </message>
+    <message>
+        <source>Confirmed</source>
+        <translation>Confirmat</translation>
+    </message>
+    <message>
+        <source>Watch-only</source>
+        <translation>Només de lectura</translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation>Data</translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation>Tipus</translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation>Etiqueta</translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation>Adreça</translation>
+    </message>
+    <message>
+        <source>ID</source>
+        <translation>ID</translation>
+    </message>
+    <message>
+        <source>Exporting Failed</source>
+        <translation>L'exportació ha fallat</translation>
+    </message>
+    <message>
+        <source>There was an error trying to save the transaction history to %1.</source>
+        <translation>S'ha produït un error en provar de desar l'historial de transacció a %1.</translation>
+    </message>
+    <message>
+        <source>Exporting Successful</source>
+        <translation>Exportació amb èxit</translation>
+    </message>
+    <message>
+        <source>The transaction history was successfully saved to %1.</source>
+        <translation>L'historial de transaccions s'ha desat correctament a %1.</translation>
+    </message>
+    <message>
+        <source>Range:</source>
+        <translation>Rang:</translation>
+    </message>
+    <message>
+        <source>to</source>
+        <translation>a</translation>
+    </message>
+</context>
+<context>
+    <name>UnitDisplayStatusBarControl</name>
+    <message>
+        <source>Unit to show amounts in. Click to select another unit.</source>
+        <translation>Unitat en què mostrar els imports. Feu clic per seleccionar una altra unitat.</translation>
+    </message>
+</context>
+<context>
+    <name>WalletFrame</name>
+    <message>
+        <source>No wallet has been loaded.</source>
+        <translation>No s'ha carregat cap moneder.</translation>
+    </message>
+</context>
+<context>
+    <name>WalletModel</name>
+    <message>
+        <source>Send Coins</source>
+        <translation>Envia monedes</translation>
+    </message>
+</context>
+<context>
+    <name>WalletView</name>
+    <message>
+        <source>&amp;Export</source>
+        <translation>&amp;Exporta</translation>
+    </message>
+    <message>
+        <source>Export the data in the current tab to a file</source>
+        <translation>Exporta les dades de la pestanya actual a un fitxer</translation>
+    </message>
+    <message>
+        <source>Backup Wallet</source>
+        <translation>Còpia de seguretat del moneder</translation>
+    </message>
+    <message>
+        <source>Wallet Data (*.dat)</source>
+        <translation>Dades del moneder (*.dat)</translation>
+    </message>
+    <message>
+        <source>Backup Failed</source>
+        <translation>Ha fallat la còpia de seguretat</translation>
+    </message>
+    <message>
+        <source>There was an error trying to save the wallet data to %1.</source>
+        <translation>S'ha produït un error en provar de desar les dades del moneder a %1.</translation>
+    </message>
+    <message>
+        <source>Backup Successful</source>
+        <translation>La còpia de seguretat s'ha realitzat correctament</translation>
+    </message>
+    <message>
+        <source>The wallet data was successfully saved to %1.</source>
+        <translation>S'han desat les dades del moneder correctament a %1.</translation>
+    </message>
+</context>
+<context>
+    <name>bitcoin-core</name>
+    <message>
+        <source>Options:</source>
+        <translation>Opcions:</translation>
+    </message>
+    <message>
+        <source>Specify data directory</source>
+        <translation>Especifica el directori de dades</translation>
+    </message>
+    <message>
+        <source>Connect to a node to retrieve peer addresses, and disconnect</source>
+        <translation>Connecta al node per obtenir les adreces de les connexions, i desconnecta</translation>
+    </message>
+    <message>
+        <source>Specify your own public address</source>
+        <translation>Especifiqueu la vostra adreça pública</translation>
+    </message>
+    <message>
+        <source>Accept command line and JSON-RPC commands</source>
+        <translation>Accepta la línia d'ordres i ordres JSON-RPC </translation>
+    </message>
+    <message>
+        <source>If &lt;category&gt; is not supplied or if &lt;category&gt; = 1, output all debugging information.</source>
+        <translation>Si no es proporciona &lt;category&gt; o si &lt;category&gt; = 1, treu a la sortida tota la informació de depuració.</translation>
+    </message>
+    <message>
+        <source>Prune configured below the minimum of %d MiB.  Please use a higher number.</source>
+        <translation>Poda configurada per sota el mínim de %d MiB. Utilitzeu un nombre superior.</translation>
+    </message>
+    <message>
+        <source>Prune: last wallet synchronisation goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of pruned node)</source>
+        <translation>Poda: la darrera sincronització del moneder va més enllà de les dades podades. Cal que activeu -reindex (baixeu tota la cadena de blocs de nou en cas de node podat)</translation>
+    </message>
+    <message>
+        <source>Reduce storage requirements by pruning (deleting) old blocks. This mode is incompatible with -txindex and -rescan. Warning: Reverting this setting requires re-downloading the entire blockchain. (default: 0 = disable pruning blocks, &gt;%u = target size in MiB to use for block files)</source>
+        <translation>Reduïu els requisits d'emmagatzematge podant (suprimint) els blocs antics. Aquest mode és incompatible amb -txindex i -rescan. Avís: la reversió d'aquest paràmetre implica haver de tornar a baixar la cadena de blocs sencera. (per defecte: 0 = inhabilita la poda de blocs, &gt;%u = mida objectiu en MiB per utilitzar en els fitxers de blocs)</translation>
     </message>
     <message>
         <source>Rescans are not possible in pruned mode. You will need to use -reindex which will download the whole blockchain again.</source>
@@ -1698,13 +2849,9 @@
         <source>Unable to start HTTP server. See debug log for details.</source>
         <translation>No s'ha pogut iniciar el servidor HTTP. Vegeu debug.log per a més detalls.</translation>
     </message>
-    <message>
-        <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
-        <translation>Accepta connexions de fora (per defecte: 1 si no -proxy o -connect)</translation>
-    </message>
     <message>
         <source>Bitcoin Core</source>
-        <translation>Nucli de Bitcoin</translation>
+        <translation>Bitcoin Core</translation>
     </message>
     <message>
         <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source>
@@ -1714,10 +2861,6 @@
         <source>Delete all wallet transactions and only recover those parts of the blockchain through -rescan on startup</source>
         <translation>Elimina totes les transaccions del moneder i només recupera aquelles de la cadena de blocs a través de -rescan a l'inici</translation>
     </message>
-    <message>
-        <source>Distributed under the MIT software license, see the accompanying file COPYING or &lt;http://www.opensource.org/licenses/mit-license.php&gt;.</source>
-        <translation>Distribuït sota llicència de programari MIT. Vegeu el fitxer acompanyant COPYING o &lt;http://www.opensource.org/licenses/mit-license.php&gt;.</translation>
-    </message>
     <message>
         <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source>
         <translation>Executa una ordre quan una transacció del moneder canviï (%s en cmd es canvia per TxID)</translation>
@@ -1726,22 +2869,6 @@
         <source>Set the number of script verification threads (%u to %d, 0 = auto, &lt;0 = leave that many cores free, default: %d)</source>
         <translation>Defineix el nombre de fils de verificació d'scripts (%u a %d, 0 = auto, &lt;0 = deixa tants nuclis lliures, per defecte: %d)</translation>
     </message>
-    <message>
-        <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
-        <translation>Aquesta és una versió de pre-llançament - utilitza-la sota la teva responsabilitat - No usar per a minería o aplicacions de compra-venda</translation>
-    </message>
-    <message>
-        <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source>
-        <translation>Avís: la xarxa no sembla que hi estigui plenament d'acord. Alguns miners sembla que estan experimentant problemes.</translation>
-    </message>
-    <message>
-        <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source>
-        <translation>Avís: sembla que no estem plenament d'acord amb els nostres iguals! Podria caler que actualitzar l'aplicació, o potser que ho facin altres nodes.</translation>
-    </message>
-    <message>
-        <source>Whitelist peers connecting from the given netmask or IP address. Can be specified multiple times.</source>
-        <translation>Afegeix a la llista blanca els iguals que es connecten de la màscara de xarxa o adreça IP donada. Es pot especificar moltes vegades.</translation>
-    </message>
     <message>
         <source>&lt;category&gt; can be:</source>
         <translation>&lt;category&gt; pot ser:</translation>
@@ -1750,10 +2877,6 @@
         <source>Block creation options:</source>
         <translation>Opcions de la creació de blocs:</translation>
     </message>
-    <message>
-        <source>Connect only to the specified node(s)</source>
-        <translation>Connecta només al(s) node(s) especificats</translation>
-    </message>
     <message>
         <source>Connection options:</source>
         <translation>Opcions de connexió:</translation>
@@ -1842,6 +2965,10 @@
         <source>Use UPnP to map the listening port (default: %u)</source>
         <translation>Utilitza UPnP per a mapejar el port d'escolta (per defecte: %u)</translation>
     </message>
+    <message>
+        <source>Use the test chain</source>
+        <translation>Utilitza la cadena de proves</translation>
+    </message>
     <message>
         <source>Verifying blocks...</source>
         <translation>S'estan verificant els blocs...</translation>
@@ -1854,6 +2981,14 @@
         <source>Wallet %s resides outside data directory %s</source>
         <translation>El moneder %s resideix fora del directori de dades %s</translation>
     </message>
+    <message>
+        <source>Wallet debugging/testing options:</source>
+        <translation>Opcions de depuració/proves del moneder:</translation>
+    </message>
+    <message>
+        <source>Wallet needed to be rewritten: restart %s to complete</source>
+        <translation>Cal reescriure el moneder: reinicieu %s per a completar-ho</translation>
+    </message>
     <message>
         <source>Wallet options:</source>
         <translation>Opcions de moneder:</translation>
@@ -1898,10 +3033,6 @@
         <source>Maximum size of data in data carrier transactions we relay and mine (default: %u)</source>
         <translation>Mida màxima de les dades en les transaccions de l'operador en què confiem i en les meves (per defecte: %u)</translation>
     </message>
-    <message>
-        <source>Query for peer addresses via DNS lookup, if low on addresses (default: 1 unless -connect)</source>
-        <translation>Consulta a adreces d'iguals a través de DNS, si es troba baix en adreces (per defecte: 1 a menys que -connect)</translation>
-    </message>
     <message>
         <source>Randomize credentials for every proxy connection. This enables Tor stream isolation (default: %u)</source>
         <translation>Genera a l'atzar credencials per a cada connexió proxy. Això habilita l'aïllament del flux de Tor (per defecte: %u)</translation>
@@ -1914,10 +3045,6 @@
         <source>The transaction amount is too small to send after the fee has been deducted</source>
         <translation>L'import de la transacció és massa petit per enviar-la després que se'n dedueixi la comissió</translation>
     </message>
-    <message>
-        <source>This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit &lt;https://www.openssl.org/&gt; and cryptographic software written by Eric Young and UPnP software written by Thomas Bernard.</source>
-        <translation>Aquest producte inclou programari desenvolupat pel projecte OpenSSL per a ús a l'OpenSSL Toolkit &lt;https://www.openssl.org/&gt; i programari criptogràfic escrit per Eric Young i programari UPnP escrit per Thomas Bernard.</translation>
-    </message>
     <message>
         <source>Whitelisted peers cannot be DoS banned and their transactions are always relayed, even if they are already in the mempool, useful e.g. for a gateway</source>
         <translation>Els iguals en la llista blanca no poden ser bandejats per DoS i es transmetran sempre llurs transaccions, fins i tot si ja són a la mempool. Això és útil, p. ex., per a una passarel·la</translation>
@@ -2002,10 +3129,6 @@
         <source>Transaction amount too small</source>
         <translation>Import de la transacció massa petit</translation>
     </message>
-    <message>
-        <source>Transaction amounts must be positive</source>
-        <translation>Els imports de les transaccions han de ser positius</translation>
-    </message>
     <message>
         <source>Transaction too large for fee policy</source>
         <translation>Transacció massa gran per a la política de comissions</translation>
@@ -2130,10 +3253,6 @@
         <source>Set key pool size to &lt;n&gt; (default: %u)</source>
         <translation>Defineix la mida clau disponible a &lt;n&gt; (per defecte: %u)</translation>
     </message>
-    <message>
-        <source>Set minimum block size in bytes (default: %u)</source>
-        <translation>Defineix la mida de bloc mínima en bytes (per defecte: %u)</translation>
-    </message>
     <message>
         <source>Set the number of threads to service RPC calls (default: %d)</source>
         <translation>Defineix el nombre de fils a crides de servei RPC (per defecte: %d)</translation>
@@ -2154,10 +3273,22 @@
         <source>Spend unconfirmed change when sending transactions (default: %u)</source>
         <translation>Gasta el canvi no confirmat en enviar les transaccions (per defecte: %u)</translation>
     </message>
+    <message>
+        <source>Starting network threads...</source>
+        <translation>S'estan iniciant els fils de la xarxa...</translation>
+    </message>
     <message>
         <source>Threshold for disconnecting misbehaving peers (default: %u)</source>
         <translation>Llindar per a desconnectar els iguals de comportament qüestionable (per defecte: %u)</translation>
     </message>
+    <message>
+        <source>Transaction amounts must not be negative</source>
+        <translation>Els imports de la transacció no han de ser negatius</translation>
+    </message>
+    <message>
+        <source>Transaction must have at least one recipient</source>
+        <translation>La transacció ha de tenir com a mínim un destinatari</translation>
+    </message>
     <message>
         <source>Unknown network specified in -onlynet: '%s'</source>
         <translation>Xarxa desconeguda especificada a -onlynet: '%s'</translation>
diff --git a/src/qt/locale/bitcoin_cs.ts b/src/qt/locale/bitcoin_cs.ts
index 2dfa295ce078f..e0f4a18994c22 100644
--- a/src/qt/locale/bitcoin_cs.ts
+++ b/src/qt/locale/bitcoin_cs.ts
@@ -15,7 +15,7 @@
     </message>
     <message>
         <source>Copy the currently selected address to the system clipboard</source>
-        <translation>Zkopíruj aktuálně vybranou adresu do systémové schránky</translation>
+        <translation>Zkopíruj tuto adresu do systémové schránky</translation>
     </message>
     <message>
         <source>&amp;Copy</source>
@@ -27,7 +27,7 @@
     </message>
     <message>
         <source>Delete the currently selected address from the list</source>
-        <translation>Smaž zvolenou adresu ze seznamu</translation>
+        <translation>Smaž tuto adresu ze seznamu</translation>
     </message>
     <message>
         <source>Export the data in the current tab to a file</source>
@@ -41,6 +41,77 @@
         <source>&amp;Delete</source>
         <translation>S&amp;maž</translation>
     </message>
+    <message>
+        <source>Choose the address to send coins to</source>
+        <translation>Zvol adresu, na kterou pošleš mince</translation>
+    </message>
+    <message>
+        <source>Choose the address to receive coins with</source>
+        <translation>Zvol adres na příjem mincí</translation>
+    </message>
+    <message>
+        <source>C&amp;hoose</source>
+        <translation>&amp;Zvol</translation>
+    </message>
+    <message>
+        <source>Sending addresses</source>
+        <translation>Odesílací adresy</translation>
+    </message>
+    <message>
+        <source>Receiving addresses</source>
+        <translation>Přijímací adresy</translation>
+    </message>
+    <message>
+        <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source>
+        <translation>Tohle jsou tvé bitcoinové adresy pro posílání plateb. Před odesláním mincí si vždy zkontroluj částku a cílovou adresu.</translation>
+    </message>
+    <message>
+        <source>These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source>
+        <translation>Tohle jsou tvé bitcoinové adresy pro příjem plateb. Nezapomeň si pro každou transakci vždy vygenerovat novou adresu.</translation>
+    </message>
+    <message>
+        <source>&amp;Copy Address</source>
+        <translation>&amp;Kopíruj adresu</translation>
+    </message>
+    <message>
+        <source>Copy &amp;Label</source>
+        <translation>Kopíruj &amp;označení</translation>
+    </message>
+    <message>
+        <source>&amp;Edit</source>
+        <translation>&amp;Uprav</translation>
+    </message>
+    <message>
+        <source>Export Address List</source>
+        <translation>Export seznamu adres</translation>
+    </message>
+    <message>
+        <source>Comma separated file (*.csv)</source>
+        <translation>Formát CSV (*.csv)</translation>
+    </message>
+    <message>
+        <source>Exporting Failed</source>
+        <translation>Exportování selhalo</translation>
+    </message>
+    <message>
+        <source>There was an error trying to save the address list to %1. Please try again.</source>
+        <translation>Při ukládání seznamu adres do %1 se přihodila nějaká chyba. Zkus to prosím znovu.</translation>
+    </message>
+</context>
+<context>
+    <name>AddressTableModel</name>
+    <message>
+        <source>Label</source>
+        <translation>Označení</translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation>Adresa</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(bez označení)</translation>
+    </message>
 </context>
 <context>
     <name>AskPassphraseDialog</name>
@@ -60,10 +131,106 @@
         <source>Repeat new passphrase</source>
         <translation>Totéž heslo ještě jednou</translation>
     </message>
+    <message>
+        <source>Enter the new passphrase to the wallet.&lt;br/&gt;Please use a passphrase of &lt;b&gt;ten or more random characters&lt;/b&gt;, or &lt;b&gt;eight or more words&lt;/b&gt;.</source>
+        <translation>Zadej nové heslo k peněžence.&lt;br/&gt;Použij &lt;b&gt;alespoň deset náhodných znaků&lt;/b&gt; nebo &lt;b&gt;alespoň osm slov&lt;/b&gt;.</translation>
+    </message>
+    <message>
+        <source>Encrypt wallet</source>
+        <translation>Zašifruj peněženku</translation>
+    </message>
+    <message>
+        <source>This operation needs your wallet passphrase to unlock the wallet.</source>
+        <translation>K provedení této operace musíš zadat heslo k peněžence, aby se mohla odemknout.</translation>
+    </message>
+    <message>
+        <source>Unlock wallet</source>
+        <translation>Odemkni peněženku</translation>
+    </message>
+    <message>
+        <source>This operation needs your wallet passphrase to decrypt the wallet.</source>
+        <translation>K provedení této operace musíš zadat heslo k peněžence, aby se mohla dešifrovat.</translation>
+    </message>
+    <message>
+        <source>Decrypt wallet</source>
+        <translation>Dešifruj peněženku</translation>
+    </message>
+    <message>
+        <source>Change passphrase</source>
+        <translation>Změň heslo</translation>
+    </message>
+    <message>
+        <source>Enter the old passphrase and new passphrase to the wallet.</source>
+        <translation>Zadej staré a nové heslo k peněžence.</translation>
+    </message>
+    <message>
+        <source>Confirm wallet encryption</source>
+        <translation>Potvrď zašifrování peněženky</translation>
+    </message>
+    <message>
+        <source>Warning: If you encrypt your wallet and lose your passphrase, you will &lt;b&gt;LOSE ALL OF YOUR BITCOINS&lt;/b&gt;!</source>
+        <translation>Upozornění: Pokud si zašifruješ peněženku a ztratíš či zapomeneš heslo, &lt;b&gt;PŘIJDEŠ O VŠECHNY BITCOINY&lt;/b&gt;!</translation>
+    </message>
+    <message>
+        <source>Are you sure you wish to encrypt your wallet?</source>
+        <translation>Jsi si jistý, že chceš peněženku zašifrovat?</translation>
+    </message>
+    <message>
+        <source>Wallet encrypted</source>
+        <translation>Peněženka je zašifrována</translation>
+    </message>
+    <message>
+        <source>%1 will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source>
+        <translation>%1 se teď ukončí, aby dokončil zašifrování. Pamatuj však, že pouhé zašifrování peněženky nemůže zabránit krádeži tvých bitcoinů malwarem, kterým se může počítač nakazit.</translation>
+    </message>
+    <message>
+        <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source>
+        <translation>DŮLEŽITÉ: Všechny předchozí zálohy peněženky by měly být nahrazeny nově vygenerovanou, zašifrovanou peněženkou. Z bezpečnostních důvodů budou předchozí zálohy nešifrované peněženky nepoužitelné, jakmile začneš používat novou zašifrovanou peněženku.</translation>
+    </message>
+    <message>
+        <source>Wallet encryption failed</source>
+        <translation>Zašifrování peněženky selhalo</translation>
+    </message>
+    <message>
+        <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
+        <translation>Zašifrování peněženky selhalo kvůli vnitřní chybě. Tvá peněženka tedy nebyla zašifrována.</translation>
+    </message>
+    <message>
+        <source>The supplied passphrases do not match.</source>
+        <translation>Zadaná hesla nejsou shodná.</translation>
+    </message>
+    <message>
+        <source>Wallet unlock failed</source>
+        <translation>Nepodařilo se odemknout peněženku</translation>
+    </message>
+    <message>
+        <source>The passphrase entered for the wallet decryption was incorrect.</source>
+        <translation>Nezadal jsi správné heslo pro dešifrování peněženky.</translation>
+    </message>
+    <message>
+        <source>Wallet decryption failed</source>
+        <translation>Nepodařilo se dešifrovat peněženku</translation>
+    </message>
+    <message>
+        <source>Wallet passphrase was successfully changed.</source>
+        <translation>Heslo k peněžence bylo v pořádku změněno.</translation>
+    </message>
+    <message>
+        <source>Warning: The Caps Lock key is on!</source>
+        <translation>Upozornění: Caps Lock je zapnutý!</translation>
+    </message>
 </context>
 <context>
     <name>BanTableModel</name>
-    </context>
+    <message>
+        <source>IP/Netmask</source>
+        <translation>IP/Maska</translation>
+    </message>
+    <message>
+        <source>Banned Until</source>
+        <translation>Blokován do</translation>
+    </message>
+</context>
 <context>
     <name>BitcoinGUI</name>
     <message>
@@ -102,6 +269,14 @@
         <source>Quit application</source>
         <translation>Ukonči aplikaci</translation>
     </message>
+    <message>
+        <source>&amp;About %1</source>
+        <translation>O &amp;%1</translation>
+    </message>
+    <message>
+        <source>Show information about %1</source>
+        <translation>Zobraz informace o %1</translation>
+    </message>
     <message>
         <source>About &amp;Qt</source>
         <translation>O &amp;Qt</translation>
@@ -114,6 +289,10 @@
         <source>&amp;Options...</source>
         <translation>&amp;Možnosti...</translation>
     </message>
+    <message>
+        <source>Modify configuration options for %1</source>
+        <translation>Uprav nastavení %1</translation>
+    </message>
     <message>
         <source>&amp;Encrypt Wallet...</source>
         <translation>Zaši&amp;fruj peněženku...</translation>
@@ -138,13 +317,25 @@
         <source>Open &amp;URI...</source>
         <translation>Načíst &amp;URI...</translation>
     </message>
+    <message>
+        <source>Click to disable network activity.</source>
+        <translation>Kliknutím zařízneš spojení se sítí.</translation>
+    </message>
+    <message>
+        <source>Network activity disabled.</source>
+        <translation>Síť je vypnutá.</translation>
+    </message>
+    <message>
+        <source>Click to enable network activity again.</source>
+        <translation>Kliknutím opět umožníš spojení do sítě.</translation>
+    </message>
     <message>
         <source>Reindexing blocks on disk...</source>
         <translation>Vytvářím nový index bloků na disku...</translation>
     </message>
     <message>
         <source>Send coins to a Bitcoin address</source>
-        <translation>Pošli mince na Bitcoinovou adresu</translation>
+        <translation>Pošli mince na bitcoinovou adresu</translation>
     </message>
     <message>
         <source>Backup wallet to another location</source>
@@ -196,11 +387,11 @@
     </message>
     <message>
         <source>Sign messages with your Bitcoin addresses to prove you own them</source>
-        <translation>Podepiš zprávy svými Bitcoinovými adresami, čímž prokážeš, že jsi jejich vlastníkem</translation>
+        <translation>Podepiš zprávy svými bitcoinovými adresami, čímž prokážeš, že jsi jejich vlastníkem</translation>
     </message>
     <message>
         <source>Verify messages to ensure they were signed with specified Bitcoin addresses</source>
-        <translation>Ověř zprávy, aby ses ujistil, že byly podepsány danými Bitcoinovými adresami</translation>
+        <translation>Ověř zprávy, aby ses ujistil, že byly podepsány danými bitcoinovými adresami</translation>
     </message>
     <message>
         <source>&amp;File</source>
@@ -240,7 +431,15 @@
     </message>
     <message numerus="yes">
         <source>%n active connection(s) to Bitcoin network</source>
-        <translation><numerusform>%n aktivní spojení do Bitcoinové sítě</numerusform><numerusform>%n aktivní spojení do Bitcoinové sítě</numerusform><numerusform>%n aktivních spojení do Bitcoinové sítě</numerusform></translation>
+        <translation><numerusform>%n aktivní spojení do bitcoinové sítě</numerusform><numerusform>%n aktivní spojení do bitcoinové sítě</numerusform><numerusform>%n aktivních spojení do bitcoinové sítě</numerusform></translation>
+    </message>
+    <message>
+        <source>Indexing blocks on disk...</source>
+        <translation>Vytvářím index bloků na disku...</translation>
+    </message>
+    <message>
+        <source>Processing blocks on disk...</source>
+        <translation>Zpracovávám bloky na disku...</translation>
     </message>
     <message>
         <source>No block source available...</source>
@@ -250,29 +449,9 @@
         <source>Processed %n block(s) of transaction history.</source>
         <translation><numerusform>Zpracován %n blok transakční historie.</numerusform><numerusform>Zpracovány %n bloky transakční historie.</numerusform><numerusform>Zpracováno %n bloků transakční historie.</numerusform></translation>
     </message>
-    <message numerus="yes">
-        <source>%n hour(s)</source>
-        <translation><numerusform>%n hodinu</numerusform><numerusform>%n hodiny</numerusform><numerusform>%n hodin</numerusform></translation>
-    </message>
-    <message numerus="yes">
-        <source>%n day(s)</source>
-        <translation><numerusform>%n den</numerusform><numerusform>%n dny</numerusform><numerusform>%n dnů</numerusform></translation>
-    </message>
-    <message numerus="yes">
-        <source>%n week(s)</source>
-        <translation><numerusform>%n týden</numerusform><numerusform>%n týdny</numerusform><numerusform>%n týdnů</numerusform></translation>
-    </message>
-    <message>
-        <source>%1 and %2</source>
-        <translation>%1 a %2</translation>
-    </message>
-    <message numerus="yes">
-        <source>%n year(s)</source>
-        <translation><numerusform>%n rok</numerusform><numerusform>%n roky</numerusform><numerusform>%n roků</numerusform></translation>
-    </message>
     <message>
         <source>%1 behind</source>
-        <translation>Stahuji ještě bloky transakcí za poslední %1</translation>
+        <translation>Stahuji ještě %1 bloků transakcí</translation>
     </message>
     <message>
         <source>Last received block was generated %1 ago.</source>
@@ -280,7 +459,7 @@
     </message>
     <message>
         <source>Transactions after this will not yet be visible.</source>
-        <translation>Novější transakce zatím nejsou vidět.</translation>
+        <translation>Následné transakce ještě nebudou vidět.</translation>
     </message>
     <message>
         <source>Error</source>
@@ -298,6 +477,14 @@
         <source>Up to date</source>
         <translation>Aktuální</translation>
     </message>
+    <message>
+        <source>Show the %1 help message to get a list with possible Bitcoin command-line options</source>
+        <translation>Seznam argumentů Bitcoinu pro příkazovou řádku získáš v nápovědě %1</translation>
+    </message>
+    <message>
+        <source>%1 client</source>
+        <translation>%1 klient</translation>
+    </message>
     <message>
         <source>Catching up...</source>
         <translation>Stahuji...</translation>
@@ -340,6 +527,14 @@
         <source>Incoming transaction</source>
         <translation>Příchozí transakce</translation>
     </message>
+    <message>
+        <source>HD key generation is &lt;b&gt;enabled&lt;/b&gt;</source>
+        <translation>HD generování klíčů je &lt;b&gt;zapnuté&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <source>HD key generation is &lt;b&gt;disabled&lt;/b&gt;</source>
+        <translation>HD generování klíčů je &lt;b&gt;vypnuté&lt;/b&gt;</translation>
+    </message>
     <message>
         <source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;unlocked&lt;/b&gt;</source>
         <translation>Peněženka je &lt;b&gt;zašifrovaná&lt;/b&gt; a momentálně &lt;b&gt;odemčená&lt;/b&gt;</translation>
@@ -348,6 +543,10 @@
         <source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;locked&lt;/b&gt;</source>
         <translation>Peněženka je &lt;b&gt;zašifrovaná&lt;/b&gt; a momentálně &lt;b&gt;zamčená&lt;/b&gt;</translation>
     </message>
+    <message>
+        <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source>
+        <translation>Stala se fatální chyba. Bitcoin nemůže bezpečně pokračovat v činnosti, a proto skončí.</translation>
+    </message>
 </context>
 <context>
     <name>CoinControlDialog</name>
@@ -367,10 +566,6 @@
         <source>Amount:</source>
         <translation>Částka:</translation>
     </message>
-    <message>
-        <source>Priority:</source>
-        <translation>Priorita:</translation>
-    </message>
     <message>
         <source>Fee:</source>
         <translation>Poplatek:</translation>
@@ -424,8 +619,84 @@
         <translation>Potvrzeno</translation>
     </message>
     <message>
-        <source>Priority</source>
-        <translation>Priorita</translation>
+        <source>Copy address</source>
+        <translation>Kopíruj adresu</translation>
+    </message>
+    <message>
+        <source>Copy label</source>
+        <translation>Kopíruj její označení</translation>
+    </message>
+    <message>
+        <source>Copy amount</source>
+        <translation>Kopíruj částku</translation>
+    </message>
+    <message>
+        <source>Copy transaction ID</source>
+        <translation>Kopíruj ID transakce</translation>
+    </message>
+    <message>
+        <source>Lock unspent</source>
+        <translation>Zamkni neutracené</translation>
+    </message>
+    <message>
+        <source>Unlock unspent</source>
+        <translation>Odemkni k utracení</translation>
+    </message>
+    <message>
+        <source>Copy quantity</source>
+        <translation>Kopíruj počet</translation>
+    </message>
+    <message>
+        <source>Copy fee</source>
+        <translation>Kopíruj poplatek</translation>
+    </message>
+    <message>
+        <source>Copy after fee</source>
+        <translation>Kopíruj čistou částku</translation>
+    </message>
+    <message>
+        <source>Copy bytes</source>
+        <translation>Kopíruj bajty</translation>
+    </message>
+    <message>
+        <source>Copy dust</source>
+        <translation>Kopíruj prach</translation>
+    </message>
+    <message>
+        <source>Copy change</source>
+        <translation>Kopíruj drobné</translation>
+    </message>
+    <message>
+        <source>(%1 locked)</source>
+        <translation>(%1 zamčeno)</translation>
+    </message>
+    <message>
+        <source>yes</source>
+        <translation>ano</translation>
+    </message>
+    <message>
+        <source>no</source>
+        <translation>ne</translation>
+    </message>
+    <message>
+        <source>This label turns red if any recipient receives an amount smaller than the current dust threshold.</source>
+        <translation>Popisek zčervená, pokud má některý příjemce obdržet částku menší, než je aktuální práh pro prach.</translation>
+    </message>
+    <message>
+        <source>Can vary +/- %1 satoshi(s) per input.</source>
+        <translation>Může se lišit o +/– %1 satoshi na každý vstup.</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(bez označení)</translation>
+    </message>
+    <message>
+        <source>change from %1 (%2)</source>
+        <translation>drobné z %1 (%2)</translation>
+    </message>
+    <message>
+        <source>(change)</source>
+        <translation>(drobné)</translation>
     </message>
 </context>
 <context>
@@ -450,6 +721,38 @@
         <source>&amp;Address</source>
         <translation>&amp;Adresa</translation>
     </message>
+    <message>
+        <source>New receiving address</source>
+        <translation>Nová přijímací adresa</translation>
+    </message>
+    <message>
+        <source>New sending address</source>
+        <translation>Nová odesílací adresa</translation>
+    </message>
+    <message>
+        <source>Edit receiving address</source>
+        <translation>Uprav přijímací adresu</translation>
+    </message>
+    <message>
+        <source>Edit sending address</source>
+        <translation>Uprav odesílací adresu</translation>
+    </message>
+    <message>
+        <source>The entered address "%1" is not a valid Bitcoin address.</source>
+        <translation>Zadaná adresa „%1“ není platná bitcoinová adresa.</translation>
+    </message>
+    <message>
+        <source>The entered address "%1" is already in the address book.</source>
+        <translation>Zadaná adresa „%1“ už v adresáři je.</translation>
+    </message>
+    <message>
+        <source>Could not unlock wallet.</source>
+        <translation>Nemohu odemknout peněženku.</translation>
+    </message>
+    <message>
+        <source>New key generation failed.</source>
+        <translation>Nepodařilo se mi vygenerovat nový klíč.</translation>
+    </message>
 </context>
 <context>
     <name>FreespaceChecker</name>
@@ -484,6 +787,10 @@
         <source>(%1-bit)</source>
         <translation>(%1-bit)</translation>
     </message>
+    <message>
+        <source>About %1</source>
+        <translation>O %1</translation>
+    </message>
     <message>
         <source>Command-line options</source>
         <translation>Argumenty příkazové řádky</translation>
@@ -520,13 +827,29 @@
         <source>Show splash screen on startup (default: %u)</source>
         <translation>Zobrazit startovací obrazovku (výchozí: %u)</translation>
     </message>
-    </context>
+    <message>
+        <source>Reset all settings changed in the GUI</source>
+        <translation>Vrátit všechny volby měněné v GUI na výchozí hodnoty</translation>
+    </message>
+</context>
 <context>
     <name>Intro</name>
     <message>
         <source>Welcome</source>
         <translation>Vítej</translation>
     </message>
+    <message>
+        <source>Welcome to %1.</source>
+        <translation>Vítej v %1.</translation>
+    </message>
+    <message>
+        <source>As this is the first time the program is launched, you can choose where %1 will store its data.</source>
+        <translation>Tohle je poprvé, co spouštíš %1, takže si můžeš zvolit, kam bude ukládat svá data.</translation>
+    </message>
+    <message>
+        <source>%1 will download and store a copy of the Bitcoin block chain. At least %2GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source>
+        <translation>%1 bude stahovat kopii řetězce bloků. Proto bude potřeba do tohoto adresáře uložit nejméně %2 GB dat – toto číslo bude navíc v průběhu času růst. Tvá peněženka bude rovněž uložena v tomto adresáři.</translation>
+    </message>
     <message>
         <source>Use the default data directory</source>
         <translation>Použij výchozí adresář pro data</translation>
@@ -552,6 +875,57 @@
         <translation><numerusform>(z potřebného %n GB)</numerusform><numerusform>(z potřebných %n GB)</numerusform><numerusform>(z potřebných %n GB)</numerusform></translation>
     </message>
 </context>
+<context>
+    <name>ModalOverlay</name>
+    <message>
+        <source>Form</source>
+        <translation>Formulář</translation>
+    </message>
+    <message>
+        <source>Recent transactions may not yet be visible, and therefore your wallet's balance might be incorrect. This information will be correct once your wallet has finished synchronizing with the bitcoin network, as detailed below.</source>
+        <translation>Nedávné transakce ještě nemusí být vidět, takže stav tvého účtu nemusí být platný. Jakmile se však tvá peněženka dosynchronizuje s bitcoinovou sítí (viz informace níže), tak už bude stav správně.</translation>
+    </message>
+    <message>
+        <source>Attempting to spend bitcoins that are affected by not-yet-displayed transactions will not be accepted by the network.</source>
+        <translation>Utrácení bitcoinů, které už utratily zatím nezobrazené transakce, nebude bitcoinovou sítí umožněno.</translation>
+    </message>
+    <message>
+        <source>Number of blocks left</source>
+        <translation>Zbývající počet bloků</translation>
+    </message>
+    <message>
+        <source>Unknown...</source>
+        <translation>neznámý…</translation>
+    </message>
+    <message>
+        <source>Last block time</source>
+        <translation>Čas posledního bloku</translation>
+    </message>
+    <message>
+        <source>Progress</source>
+        <translation>Stav</translation>
+    </message>
+    <message>
+        <source>Progress increase per hour</source>
+        <translation>Postup za hodinu</translation>
+    </message>
+    <message>
+        <source>calculating...</source>
+        <translation>propočítávám…</translation>
+    </message>
+    <message>
+        <source>Estimated time left until synced</source>
+        <translation>Odhadovaný zbývající čas</translation>
+    </message>
+    <message>
+        <source>Hide</source>
+        <translation>Skryj</translation>
+    </message>
+    <message>
+        <source>Unknown. Syncing Headers (%1)...</source>
+        <translation>Neznámý. Synchronizuji záhlaví bloků (%1)…</translation>
+    </message>
+</context>
 <context>
     <name>OpenURIDialog</name>
     <message>
@@ -570,6 +944,10 @@
         <source>Select payment request file</source>
         <translation>Vyber soubor platebního požadavku</translation>
     </message>
+    <message>
+        <source>Select payment request file to open</source>
+        <translation>Vyber soubor platebního požadavku k načtení</translation>
+    </message>
 </context>
 <context>
     <name>OptionsDialog</name>
@@ -581,6 +959,14 @@
         <source>&amp;Main</source>
         <translation>&amp;Hlavní</translation>
     </message>
+    <message>
+        <source>Automatically start %1 after logging in to the system.</source>
+        <translation>Automaticky spustí %1 po přihlášení do systému.</translation>
+    </message>
+    <message>
+        <source>&amp;Start %1 on system login</source>
+        <translation>S&amp;pustit %1 po přihlášení do systému</translation>
+    </message>
     <message>
         <source>Size of &amp;database cache</source>
         <translation>Velikost &amp;databázové cache</translation>
@@ -619,7 +1005,7 @@
     </message>
     <message>
         <source>Active command-line options that override above options:</source>
-        <translation>Aktivní argumenty z příkazové řádky, které mají přednost před nastavením výše:</translation>
+        <translation>Aktivní argumenty z příkazové řádky, které přetloukly tato nastavení:</translation>
     </message>
     <message>
         <source>Reset all client options to default.</source>
@@ -667,7 +1053,7 @@
     </message>
     <message>
         <source>Connect to the Bitcoin network through a SOCKS5 proxy.</source>
-        <translation>Připojí se do Bitcoinové sítě přes SOCKS5 proxy.</translation>
+        <translation>Připojí se do bitcoinové sítě přes SOCKS5 proxy.</translation>
     </message>
     <message>
         <source>&amp;Connect through SOCKS5 proxy (default proxy):</source>
@@ -687,7 +1073,7 @@
     </message>
     <message>
         <source>Used for reaching peers via:</source>
-        <translation>Použije se k připojování k protějškům přes:</translation>
+        <translation>Použije se k připojování k protějskům přes:</translation>
     </message>
     <message>
         <source>Shows, if the supplied default SOCKS5 proxy is used to reach peers via this network type.</source>
@@ -707,7 +1093,7 @@
     </message>
     <message>
         <source>Connect to the Bitcoin network through a separate SOCKS5 proxy for Tor hidden services.</source>
-        <translation>Připojí se do Bitcoinové sítě přes SOCKS5 proxy vyhrazenou pro skryté služby v Tor síti.</translation>
+        <translation>Připojí se do bitcoinové sítě přes SOCKS5 proxy vyhrazenou pro skryté služby v Tor síti.</translation>
     </message>
     <message>
         <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services:</source>
@@ -717,6 +1103,14 @@
         <source>&amp;Window</source>
         <translation>O&amp;kno</translation>
     </message>
+    <message>
+        <source>&amp;Hide the icon from the system tray.</source>
+        <translation>Skryje ikonu, která se zobrazuje v panelu.</translation>
+    </message>
+    <message>
+        <source>Hide tray icon</source>
+        <translation>Skrýt &amp;ikonu z panelu</translation>
+    </message>
     <message>
         <source>Show only a tray icon after minimizing the window.</source>
         <translation>Po minimalizaci okna zobrazí pouze ikonu v panelu.</translation>
@@ -737,6 +1131,10 @@
         <source>User Interface &amp;language:</source>
         <translation>&amp;Jazyk uživatelského rozhraní:</translation>
     </message>
+    <message>
+        <source>The user interface language can be set here. This setting will take effect after restarting %1.</source>
+        <translation>Tady lze nastavit jazyk uživatelského rozhraní. Nastavení se projeví až po restartování %1.</translation>
+    </message>
     <message>
         <source>&amp;Unit to show amounts in:</source>
         <translation>Je&amp;dnotka pro částky:</translation>
@@ -751,7 +1149,7 @@
     </message>
     <message>
         <source>&amp;OK</source>
-        <translation>&amp;Použít</translation>
+        <translation>&amp;Budiž</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
@@ -779,7 +1177,7 @@
     </message>
     <message>
         <source>This change would require a client restart.</source>
-        <translation>Tato změna vyžaduje restart aplikace.</translation>
+        <translation>Tahle změna bude chtít restartovat klienta.</translation>
     </message>
     <message>
         <source>The supplied proxy address is invalid.</source>
@@ -794,7 +1192,7 @@
     </message>
     <message>
         <source>The displayed information may be out of date. Your wallet automatically synchronizes with the Bitcoin network after a connection is established, but this process has not completed yet.</source>
-        <translation>Zobrazené informace nemusí být aktuální. Tvá peněženka se automaticky sesynchronizuje s Bitcoinovou sítí, jakmile se s ní spojí. Zatím ale ještě není synchronizace dokončena.</translation>
+        <translation>Zobrazené informace nemusí být aktuální. Tvá peněženka se automaticky sesynchronizuje s bitcoinovou sítí, jakmile se s ní spojí. Zatím ale ještě není synchronizace dokončena.</translation>
     </message>
     <message>
         <source>Watch-only:</source>
@@ -826,7 +1224,7 @@
     </message>
     <message>
         <source>Balances</source>
-        <translation>Stav účtů</translation>
+        <translation>Stavy účtů</translation>
     </message>
     <message>
         <source>Total:</source>
@@ -862,32 +1260,127 @@
     </message>
 </context>
 <context>
-    <name>PeerTableModel</name>
+    <name>PaymentServer</name>
     <message>
-        <source>User Agent</source>
-        <translation>Typ klienta</translation>
+        <source>Payment request error</source>
+        <translation>Chyba platebního požadavku</translation>
     </message>
     <message>
-        <source>Node/Service</source>
-        <translation>Uzel/Služba</translation>
+        <source>Cannot start bitcoin: click-to-pay handler</source>
+        <translation>Nemůžu spustit bitcoin: obsluha click-to-pay</translation>
     </message>
     <message>
-        <source>Ping Time</source>
-        <translation>Odezva</translation>
+        <source>URI handling</source>
+        <translation>Zpracování URI</translation>
     </message>
-</context>
-<context>
-    <name>QObject</name>
     <message>
-        <source>Amount</source>
-        <translation>Částka</translation>
+        <source>Payment request fetch URL is invalid: %1</source>
+        <translation>Zdrojová URL platebního požadavku není platná: %1</translation>
     </message>
     <message>
-        <source>Enter a Bitcoin address (e.g. %1)</source>
-        <translation>Zadej Bitcoinovou adresu (např. %1)</translation>
+        <source>Invalid payment address %1</source>
+        <translation>Neplatná platební adresa %1</translation>
     </message>
     <message>
-        <source>%1 d</source>
+        <source>URI cannot be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source>
+        <translation>Nepodařilo se analyzovat URI! Důvodem může být neplatná bitcoinová adresa nebo poškozené parametry URI.</translation>
+    </message>
+    <message>
+        <source>Payment request file handling</source>
+        <translation>Zpracování souboru platebního požadavku</translation>
+    </message>
+    <message>
+        <source>Payment request file cannot be read! This can be caused by an invalid payment request file.</source>
+        <translation>Soubor platebního požadavku nejde přečíst nebo zpracovat! Příčinou může být špatný soubor platebního požadavku.</translation>
+    </message>
+    <message>
+        <source>Payment request rejected</source>
+        <translation>Platební požadavek byl odmítnut</translation>
+    </message>
+    <message>
+        <source>Payment request network doesn't match client network.</source>
+        <translation>Síť platebního požadavku neodpovídá síti klienta.</translation>
+    </message>
+    <message>
+        <source>Payment request expired.</source>
+        <translation>Platební požadavek vypršel.</translation>
+    </message>
+    <message>
+        <source>Payment request is not initialized.</source>
+        <translation>Platební požadavek není zahájený.</translation>
+    </message>
+    <message>
+        <source>Unverified payment requests to custom payment scripts are unsupported.</source>
+        <translation>Neověřené platební požadavky k uživatelským platebním skriptům nejsou podporované.</translation>
+    </message>
+    <message>
+        <source>Invalid payment request.</source>
+        <translation>Neplatný platební požadavek.</translation>
+    </message>
+    <message>
+        <source>Requested payment amount of %1 is too small (considered dust).</source>
+        <translation>Požadovaná platební částka %1 je příliš malá (je považována za prach).</translation>
+    </message>
+    <message>
+        <source>Refund from %1</source>
+        <translation>Vrácení peněz od %1</translation>
+    </message>
+    <message>
+        <source>Payment request %1 is too large (%2 bytes, allowed %3 bytes).</source>
+        <translation>Platební požadavek %1 je moc velký (%2 bajtů, povoleno %3 bajtů).</translation>
+    </message>
+    <message>
+        <source>Error communicating with %1: %2</source>
+        <translation>Chyba při komunikaci s %1: %2</translation>
+    </message>
+    <message>
+        <source>Payment request cannot be parsed!</source>
+        <translation>Platební požadavek je nečitelný!</translation>
+    </message>
+    <message>
+        <source>Bad response from server %1</source>
+        <translation>Chybná odpověď ze serveru %1</translation>
+    </message>
+    <message>
+        <source>Network request error</source>
+        <translation>Chyba síťového požadavku</translation>
+    </message>
+    <message>
+        <source>Payment acknowledged</source>
+        <translation>Platba potvrzena</translation>
+    </message>
+</context>
+<context>
+    <name>PeerTableModel</name>
+    <message>
+        <source>User Agent</source>
+        <translation>Typ klienta</translation>
+    </message>
+    <message>
+        <source>Node/Service</source>
+        <translation>Uzel/Služba</translation>
+    </message>
+    <message>
+        <source>NodeId</source>
+        <translation>Id uzlu</translation>
+    </message>
+    <message>
+        <source>Ping</source>
+        <translation>Odezva</translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Amount</source>
+        <translation>Částka</translation>
+    </message>
+    <message>
+        <source>Enter a Bitcoin address (e.g. %1)</source>
+        <translation>Zadej bitcoinovou adresu (např. %1)</translation>
+    </message>
+    <message>
+        <source>%1 d</source>
         <translation>%1 d</translation>
     </message>
     <message>
@@ -914,12 +1407,78 @@
         <source>%1 ms</source>
         <translation>%1 ms</translation>
     </message>
+    <message numerus="yes">
+        <source>%n second(s)</source>
+        <translation><numerusform>%n vteřinu</numerusform><numerusform>%n vteřiny</numerusform><numerusform>%n vteřin</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%n minute(s)</source>
+        <translation><numerusform>%n minutu</numerusform><numerusform>%n minuty</numerusform><numerusform>%n minut</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%n hour(s)</source>
+        <translation><numerusform>%n hodinu</numerusform><numerusform>%n hodiny</numerusform><numerusform>%n hodin</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%n day(s)</source>
+        <translation><numerusform>%n den</numerusform><numerusform>%n dny</numerusform><numerusform>%n dnů</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%n week(s)</source>
+        <translation><numerusform>%n týden</numerusform><numerusform>%n týdny</numerusform><numerusform>%n týdnů</numerusform></translation>
+    </message>
+    <message>
+        <source>%1 and %2</source>
+        <translation>%1 a %2</translation>
+    </message>
+    <message numerus="yes">
+        <source>%n year(s)</source>
+        <translation><numerusform>%n rok</numerusform><numerusform>%n roky</numerusform><numerusform>%n roků</numerusform></translation>
+    </message>
+    <message>
+        <source>%1 didn't yet exit safely...</source>
+        <translation>%1 ještě bezpečně neskončil…</translation>
+    </message>
+</context>
+<context>
+    <name>QObject::QObject</name>
+    <message>
+        <source>Error: Specified data directory "%1" does not exist.</source>
+        <translation>Chyba: Zadaný adresář pro data „%1“ neexistuje.</translation>
+    </message>
+    <message>
+        <source>Error: Cannot parse configuration file: %1. Only use key=value syntax.</source>
+        <translation>Chyba: Nemohu zpracovat konfigurační soubor: %1. Používej pouze syntaxi klíč=hodnota.</translation>
+    </message>
+    <message>
+        <source>Error: %1</source>
+        <translation>Chyba: %1</translation>
+    </message>
+</context>
+<context>
+    <name>QRImageWidget</name>
+    <message>
+        <source>&amp;Save Image...</source>
+        <translation>&amp;Ulož obrázek...</translation>
+    </message>
+    <message>
+        <source>&amp;Copy Image</source>
+        <translation>&amp;Kopíruj obrázek</translation>
+    </message>
+    <message>
+        <source>Save QR Code</source>
+        <translation>Ulož QR kód</translation>
+    </message>
+    <message>
+        <source>PNG Image (*.png)</source>
+        <translation>PNG obrázek (*.png)</translation>
+    </message>
 </context>
 <context>
     <name>RPCConsole</name>
     <message>
         <source>N/A</source>
-        <translation>N/A</translation>
+        <translation>nedostupná informace</translation>
     </message>
     <message>
         <source>Client version</source>
@@ -941,6 +1500,10 @@
         <source>Using BerkeleyDB version</source>
         <translation>Používaná verze BerkeleyDB</translation>
     </message>
+    <message>
+        <source>Datadir</source>
+        <translation>Adresář s daty</translation>
+    </message>
     <message>
         <source>Startup time</source>
         <translation>Čas spuštění</translation>
@@ -965,9 +1528,17 @@
         <source>Current number of blocks</source>
         <translation>Aktuální počet bloků</translation>
     </message>
+    <message>
+        <source>Memory Pool</source>
+        <translation>Transakční zásobník</translation>
+    </message>
+    <message>
+        <source>Current number of transactions</source>
+        <translation>Aktuální množství transakcí</translation>
+    </message>
     <message>
         <source>Memory usage</source>
-        <translation>Využití paměti</translation>
+        <translation>Obsazenost paměti</translation>
     </message>
     <message>
         <source>Received</source>
@@ -981,10 +1552,18 @@
         <source>&amp;Peers</source>
         <translation>&amp;Protějšky</translation>
     </message>
+    <message>
+        <source>Banned peers</source>
+        <translation>Protějšky pod klatbou (blokované)</translation>
+    </message>
     <message>
         <source>Select a peer to view detailed information.</source>
         <translation>Vyber protějšek a uvidíš jeho detailní informace.</translation>
     </message>
+    <message>
+        <source>Whitelisted</source>
+        <translation>Vždy vítán</translation>
+    </message>
     <message>
         <source>Direction</source>
         <translation>Směr</translation>
@@ -993,10 +1572,34 @@
         <source>Version</source>
         <translation>Verze</translation>
     </message>
+    <message>
+        <source>Starting Block</source>
+        <translation>Počáteční blok</translation>
+    </message>
+    <message>
+        <source>Synced Headers</source>
+        <translation>Aktuálně hlaviček</translation>
+    </message>
+    <message>
+        <source>Synced Blocks</source>
+        <translation>Aktuálně bloků</translation>
+    </message>
     <message>
         <source>User Agent</source>
         <translation>Typ klienta</translation>
     </message>
+    <message>
+        <source>Open the %1 debug log file from the current data directory. This can take a few seconds for large log files.</source>
+        <translation>Otevři soubor s ladicími záznamy %1 z aktuálního datového adresáře. U velkých žurnálů to může pár vteřin zabrat.</translation>
+    </message>
+    <message>
+        <source>Decrease font size</source>
+        <translation>Zmenšit písmo</translation>
+    </message>
+    <message>
+        <source>Increase font size</source>
+        <translation>Zvětšit písmo</translation>
+    </message>
     <message>
         <source>Services</source>
         <translation>Služby</translation>
@@ -1021,6 +1624,18 @@
         <source>Ping Time</source>
         <translation>Odezva</translation>
     </message>
+    <message>
+        <source>The duration of a currently outstanding ping.</source>
+        <translation>Jak dlouho už čekám na pong.</translation>
+    </message>
+    <message>
+        <source>Ping Wait</source>
+        <translation>Doba čekání na odezvu</translation>
+    </message>
+    <message>
+        <source>Min Ping</source>
+        <translation>Nejrychlejší odezva</translation>
+    </message>
     <message>
         <source>Time Offset</source>
         <translation>Časový posun</translation>
@@ -1065,14 +1680,6 @@
         <source>Clear console</source>
         <translation>Vyčistit konzoli</translation>
     </message>
-    <message>
-        <source>&amp;Disconnect Node</source>
-        <translation>&amp;Odpojit uzel</translation>
-    </message>
-    <message>
-        <source>Ban Node for</source>
-        <translation>Uvalit na uzel klatbu na</translation>
-    </message>
     <message>
         <source>1 &amp;hour</source>
         <translation>1 &amp;hodinu</translation>
@@ -1090,8 +1697,20 @@
         <translation>1 &amp;rok</translation>
     </message>
     <message>
-        <source>&amp;Unban Node</source>
-        <translation>&amp;Zbavit uzel klatby</translation>
+        <source>&amp;Disconnect</source>
+        <translation>&amp;Odpoj</translation>
+    </message>
+    <message>
+        <source>Ban for</source>
+        <translation>Uval klatbu na</translation>
+    </message>
+    <message>
+        <source>&amp;Unban</source>
+        <translation>&amp;Odblokuj</translation>
+    </message>
+    <message>
+        <source>Welcome to the %1 RPC console.</source>
+        <translation>Vítej v RPC konzoli %1.</translation>
     </message>
     <message>
         <source>Use up and down arrows to navigate history, and &lt;b&gt;Ctrl-L&lt;/b&gt; to clear screen.</source>
@@ -1101,6 +1720,14 @@
         <source>Type &lt;b&gt;help&lt;/b&gt; for an overview of available commands.</source>
         <translation>Napsáním &lt;b&gt;help&lt;/b&gt; si vypíšeš přehled dostupných příkazů.</translation>
     </message>
+    <message>
+        <source>WARNING: Scammers have been active, telling users to type commands here, stealing their wallet contents. Do not use this console without fully understanding the ramification of a command.</source>
+        <translation>UPOZORNĚNÍ: Podvodníci jsou aktivní a říkají uživatelům, aby sem zadávali příkazy, kterými jim pak ale vykradou jejich peněženky. Nepoužívej tuhle konzoli, pokud úplně neznáš důsledky jednotlivých příkazů.</translation>
+    </message>
+    <message>
+        <source>Network activity disabled</source>
+        <translation>Síť je vypnutá</translation>
+    </message>
     <message>
         <source>%1 B</source>
         <translation>%1 B</translation>
@@ -1174,7 +1801,7 @@
     </message>
     <message>
         <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source>
-        <translation>Volitelná zpráva, která se připojí k platebnímu požadavku a která se zobrazí, když se požadavek otevře. Poznámka: tahle zpráva se neposílá s platbou po Bitcoinové síti.</translation>
+        <translation>Volitelná zpráva, která se připojí k platebnímu požadavku a která se zobrazí, když se požadavek otevře. Poznámka: tahle zpráva se neposílá s platbou po bitcoinové síti.</translation>
     </message>
     <message>
         <source>An optional label to associate with the new receiving address.</source>
@@ -1220,6 +1847,22 @@
         <source>Remove</source>
         <translation>Smazat</translation>
     </message>
+    <message>
+        <source>Copy URI</source>
+        <translation>Kopíruj URI</translation>
+    </message>
+    <message>
+        <source>Copy label</source>
+        <translation>Kopíruj její označení</translation>
+    </message>
+    <message>
+        <source>Copy message</source>
+        <translation>Kopíruj zprávu</translation>
+    </message>
+    <message>
+        <source>Copy amount</source>
+        <translation>Kopíruj částku</translation>
+    </message>
 </context>
 <context>
     <name>ReceiveRequestDialog</name>
@@ -1239,6 +1882,73 @@
         <source>&amp;Save Image...</source>
         <translation>&amp;Ulož obrázek...</translation>
     </message>
+    <message>
+        <source>Request payment to %1</source>
+        <translation>Platební požadavek: %1</translation>
+    </message>
+    <message>
+        <source>Payment information</source>
+        <translation>Informace o platbě</translation>
+    </message>
+    <message>
+        <source>URI</source>
+        <translation>URI</translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation>Adresa</translation>
+    </message>
+    <message>
+        <source>Amount</source>
+        <translation>Částka</translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation>Označení</translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation>Zpráva</translation>
+    </message>
+    <message>
+        <source>Resulting URI too long, try to reduce the text for label / message.</source>
+        <translation>Výsledná URI je příliš dlouhá, zkus zkrátit text označení/zprávy.</translation>
+    </message>
+    <message>
+        <source>Error encoding URI into QR Code.</source>
+        <translation>Chyba při kódování URI do QR kódu.</translation>
+    </message>
+</context>
+<context>
+    <name>RecentRequestsTableModel</name>
+    <message>
+        <source>Date</source>
+        <translation>Datum</translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation>Označení</translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation>Zpráva</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(bez označení)</translation>
+    </message>
+    <message>
+        <source>(no message)</source>
+        <translation>(bez zprávy)</translation>
+    </message>
+    <message>
+        <source>(no amount requested)</source>
+        <translation>(bez požadované částky)</translation>
+    </message>
+    <message>
+        <source>Requested</source>
+        <translation>Požádáno</translation>
+    </message>
 </context>
 <context>
     <name>SendCoinsDialog</name>
@@ -1274,10 +1984,6 @@
         <source>Amount:</source>
         <translation>Částka:</translation>
     </message>
-    <message>
-        <source>Priority:</source>
-        <translation>Priorita:</translation>
-    </message>
     <message>
         <source>Fee:</source>
         <translation>Poplatek:</translation>
@@ -1346,10 +2052,6 @@
         <source>(Smart fee not initialized yet. This usually takes a few blocks...)</source>
         <translation>(Inteligentní poplatek ještě není inicializovaný. Obvykle mu to tak pár bloků trvá...)</translation>
     </message>
-    <message>
-        <source>Confirmation time:</source>
-        <translation>Rychlost potvrzení:</translation>
-    </message>
     <message>
         <source>normal</source>
         <translation>normální</translation>
@@ -1374,6 +2076,10 @@
         <source>Dust:</source>
         <translation>Prach:</translation>
     </message>
+    <message>
+        <source>Confirmation time target:</source>
+        <translation>Časové cílování potvrzení:</translation>
+    </message>
     <message>
         <source>Clear &amp;All</source>
         <translation>Všechno s&amp;maž</translation>
@@ -1387,209 +2093,886 @@
         <translation>Potvrď odeslání</translation>
     </message>
     <message>
-        <source>S&amp;end</source>
-        <translation>Pošl&amp;i</translation>
+        <source>S&amp;end</source>
+        <translation>Pošl&amp;i</translation>
+    </message>
+    <message>
+        <source>Copy quantity</source>
+        <translation>Kopíruj počet</translation>
+    </message>
+    <message>
+        <source>Copy amount</source>
+        <translation>Kopíruj částku</translation>
+    </message>
+    <message>
+        <source>Copy fee</source>
+        <translation>Kopíruj poplatek</translation>
+    </message>
+    <message>
+        <source>Copy after fee</source>
+        <translation>Kopíruj čistou částku</translation>
+    </message>
+    <message>
+        <source>Copy bytes</source>
+        <translation>Kopíruj bajty</translation>
+    </message>
+    <message>
+        <source>Copy dust</source>
+        <translation>Kopíruj prach</translation>
+    </message>
+    <message>
+        <source>Copy change</source>
+        <translation>Kopíruj drobné</translation>
+    </message>
+    <message>
+        <source>%1 to %2</source>
+        <translation>%1 pro %2</translation>
+    </message>
+    <message>
+        <source>Are you sure you want to send?</source>
+        <translation>Jsi si jistý, že to chceš poslat?</translation>
+    </message>
+    <message>
+        <source>added as transaction fee</source>
+        <translation>přidán jako transakční poplatek</translation>
+    </message>
+    <message>
+        <source>Total Amount %1</source>
+        <translation>Celková částka %1</translation>
+    </message>
+    <message>
+        <source>or</source>
+        <translation>nebo</translation>
+    </message>
+    <message>
+        <source>Confirm send coins</source>
+        <translation>Potvrď odeslání mincí</translation>
+    </message>
+    <message>
+        <source>The recipient address is not valid. Please recheck.</source>
+        <translation>Adresa příjemce je neplatná – překontroluj ji prosím.</translation>
+    </message>
+    <message>
+        <source>The amount to pay must be larger than 0.</source>
+        <translation>Odesílaná částka musí být větší než 0.</translation>
+    </message>
+    <message>
+        <source>The amount exceeds your balance.</source>
+        <translation>Částka překračuje stav účtu.</translation>
+    </message>
+    <message>
+        <source>The total exceeds your balance when the %1 transaction fee is included.</source>
+        <translation>Celková částka při připočítání poplatku %1 překročí stav účtu.</translation>
+    </message>
+    <message>
+        <source>Duplicate address found: addresses should only be used once each.</source>
+        <translation>Zaznamenána duplicitní adresa: každá adresa by ale měla být použita vždy jen jednou.</translation>
+    </message>
+    <message>
+        <source>Transaction creation failed!</source>
+        <translation>Vytvoření transakce selhalo!</translation>
+    </message>
+    <message>
+        <source>The transaction was rejected with the following reason: %1</source>
+        <translation>Transakce byla zamítnuta s tímto odůvodněním: %1</translation>
+    </message>
+    <message>
+        <source>A fee higher than %1 is considered an absurdly high fee.</source>
+        <translation>Poplatek vyšší než %1 je považován za absurdně vysoký.</translation>
+    </message>
+    <message>
+        <source>Payment request expired.</source>
+        <translation>Platební požadavek vypršel.</translation>
+    </message>
+    <message numerus="yes">
+        <source>%n block(s)</source>
+        <translation><numerusform>%n blok</numerusform><numerusform>%n bloky</numerusform><numerusform>%n bloků</numerusform></translation>
+    </message>
+    <message>
+        <source>Pay only the required fee of %1</source>
+        <translation>Zaplatit pouze vyžadovaný poplatek %1</translation>
+    </message>
+    <message numerus="yes">
+        <source>Estimated to begin confirmation within %n block(s).</source>
+        <translation><numerusform>Potvrzování by podle odhadu mělo začít během %n bloku.</numerusform><numerusform>Potvrzování by podle odhadu mělo začít během %n bloků.</numerusform><numerusform>Potvrzování by podle odhadu mělo začít během %n bloků.</numerusform></translation>
+    </message>
+    <message>
+        <source>Warning: Invalid Bitcoin address</source>
+        <translation>Upozornění: Neplatná bitcoinová adresa</translation>
+    </message>
+    <message>
+        <source>Warning: Unknown change address</source>
+        <translation>Upozornění: Neznámá adresa pro drobné</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(bez označení)</translation>
+    </message>
+</context>
+<context>
+    <name>SendCoinsEntry</name>
+    <message>
+        <source>A&amp;mount:</source>
+        <translation>Čás&amp;tka:</translation>
+    </message>
+    <message>
+        <source>Pay &amp;To:</source>
+        <translation>&amp;Komu:</translation>
+    </message>
+    <message>
+        <source>&amp;Label:</source>
+        <translation>O&amp;značení:</translation>
+    </message>
+    <message>
+        <source>Choose previously used address</source>
+        <translation>Vyber již použitou adresu</translation>
+    </message>
+    <message>
+        <source>This is a normal payment.</source>
+        <translation>Tohle je normální platba.</translation>
+    </message>
+    <message>
+        <source>The Bitcoin address to send the payment to</source>
+        <translation>Bitcoinová adresa příjemce</translation>
+    </message>
+    <message>
+        <source>Alt+A</source>
+        <translation>Alt+A</translation>
+    </message>
+    <message>
+        <source>Paste address from clipboard</source>
+        <translation>Vlož adresu ze schránky</translation>
+    </message>
+    <message>
+        <source>Alt+P</source>
+        <translation>Alt+P</translation>
+    </message>
+    <message>
+        <source>Remove this entry</source>
+        <translation>Smaž tento záznam</translation>
+    </message>
+    <message>
+        <source>The fee will be deducted from the amount being sent. The recipient will receive less bitcoins than you enter in the amount field. If multiple recipients are selected, the fee is split equally.</source>
+        <translation>Poplatek se odečte od posílané částky. Příjemce tak dostane méně bitcoinů, než zadáš do pole Částka. Pokud vybereš více příjemců, tak se poplatek rovnoměrně rozloží.</translation>
+    </message>
+    <message>
+        <source>S&amp;ubtract fee from amount</source>
+        <translation>Od&amp;ečíst poplatek od částky</translation>
+    </message>
+    <message>
+        <source>Message:</source>
+        <translation>Zpráva:</translation>
+    </message>
+    <message>
+        <source>This is an unauthenticated payment request.</source>
+        <translation>Tohle je neověřený platební požadavek.</translation>
+    </message>
+    <message>
+        <source>This is an authenticated payment request.</source>
+        <translation>Tohle je ověřený platební požadavek.</translation>
+    </message>
+    <message>
+        <source>Enter a label for this address to add it to the list of used addresses</source>
+        <translation>Zadej označení této adresy; obojí se ti pak uloží do adresáře</translation>
+    </message>
+    <message>
+        <source>A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
+        <translation>Zpráva, která byla připojena k bitcoin: URI a která se ti pro přehled uloží k transakci. Poznámka: Tahle zpráva se neposílá s platbou po bitcoinové síti.</translation>
+    </message>
+    <message>
+        <source>Pay To:</source>
+        <translation>Komu:</translation>
+    </message>
+    <message>
+        <source>Memo:</source>
+        <translation>Poznámka:</translation>
+    </message>
+    <message>
+        <source>Enter a label for this address to add it to your address book</source>
+        <translation>Zadej označení této adresy; obojí se ti pak uloží do adresáře</translation>
+    </message>
+</context>
+<context>
+    <name>SendConfirmationDialog</name>
+    <message>
+        <source>Yes</source>
+        <translation>Ano</translation>
+    </message>
+</context>
+<context>
+    <name>ShutdownWindow</name>
+    <message>
+        <source>%1 is shutting down...</source>
+        <translation>%1 se ukončuje...</translation>
+    </message>
+    <message>
+        <source>Do not shut down the computer until this window disappears.</source>
+        <translation>Nevypínej počítač, dokud toto okno nezmizí.</translation>
+    </message>
+</context>
+<context>
+    <name>SignVerifyMessageDialog</name>
+    <message>
+        <source>Signatures - Sign / Verify a Message</source>
+        <translation>Podpisy - podepsat/ověřit zprávu</translation>
+    </message>
+    <message>
+        <source>&amp;Sign Message</source>
+        <translation>&amp;Podepiš zprávu</translation>
+    </message>
+    <message>
+        <source>You can sign messages/agreements with your addresses to prove you can receive bitcoins sent to them. Be careful not to sign anything vague or random, as phishing attacks may try to trick you into signing your identity over to them. Only sign fully-detailed statements you agree to.</source>
+        <translation>Podepsáním zprávy/smlouvy svými adresami můžeš prokázat, že jsi na ně schopen přijmout bitcoiny. Buď opatrný a nepodepisuj nic vágního nebo náhodného; například při phishingových útocích můžeš být lákán, abys něco takového podepsal. Podepisuj pouze naprosto úplná a detailní prohlášení, se kterými souhlasíš.</translation>
+    </message>
+    <message>
+        <source>The Bitcoin address to sign the message with</source>
+        <translation>Bitcoinová adresa, kterou se zpráva podepíše</translation>
+    </message>
+    <message>
+        <source>Choose previously used address</source>
+        <translation>Vyber již použitou adresu</translation>
+    </message>
+    <message>
+        <source>Alt+A</source>
+        <translation>Alt+A</translation>
+    </message>
+    <message>
+        <source>Paste address from clipboard</source>
+        <translation>Vlož adresu ze schránky</translation>
+    </message>
+    <message>
+        <source>Alt+P</source>
+        <translation>Alt+P</translation>
+    </message>
+    <message>
+        <source>Enter the message you want to sign here</source>
+        <translation>Sem vepiš zprávu, kterou chceš podepsat</translation>
+    </message>
+    <message>
+        <source>Signature</source>
+        <translation>Podpis</translation>
+    </message>
+    <message>
+        <source>Copy the current signature to the system clipboard</source>
+        <translation>Zkopíruj tento podpis do schránky</translation>
+    </message>
+    <message>
+        <source>Sign the message to prove you own this Bitcoin address</source>
+        <translation>Podepiš zprávu, čímž prokážeš, že jsi vlastníkem této bitcoinové adresy</translation>
+    </message>
+    <message>
+        <source>Sign &amp;Message</source>
+        <translation>Po&amp;depiš zprávu</translation>
+    </message>
+    <message>
+        <source>Reset all sign message fields</source>
+        <translation>Vymaž všechna pole formuláře pro podepsání zrávy</translation>
+    </message>
+    <message>
+        <source>Clear &amp;All</source>
+        <translation>Všechno &amp;smaž</translation>
+    </message>
+    <message>
+        <source>&amp;Verify Message</source>
+        <translation>&amp;Ověř zprávu</translation>
+    </message>
+    <message>
+        <source>Enter the receiver's address, message (ensure you copy line breaks, spaces, tabs, etc. exactly) and signature below to verify the message. Be careful not to read more into the signature than what is in the signed message itself, to avoid being tricked by a man-in-the-middle attack. Note that this only proves the signing party receives with the address, it cannot prove sendership of any transaction!</source>
+        <translation>K ověření podpisu zprávy zadej adresu příjemce, zprávu (ověř si, že správně kopíruješ zalomení řádků, mezery, tabulátory apod.) a podpis. Dávej pozor na to, abys nezkopíroval do podpisu víc, než co je v samotné podepsané zprávě, abys nebyl napálen man-in-the-middle útokem. Poznamenejme však, že takto lze pouze prokázat, že podepisující je schopný na dané adrese přijmout platbu, ale není možnéprokázat, že odeslal jakoukoli transakci!</translation>
+    </message>
+    <message>
+        <source>The Bitcoin address the message was signed with</source>
+        <translation>Bitcoinová adresa, kterou je zpráva podepsána</translation>
+    </message>
+    <message>
+        <source>Verify the message to ensure it was signed with the specified Bitcoin address</source>
+        <translation>Ověř zprávu, aby ses ujistil, že byla podepsána danou bitcoinovou adresou</translation>
+    </message>
+    <message>
+        <source>Verify &amp;Message</source>
+        <translation>O&amp;věř zprávu</translation>
+    </message>
+    <message>
+        <source>Reset all verify message fields</source>
+        <translation>Vymaž všechna pole formuláře pro ověření zrávy</translation>
+    </message>
+    <message>
+        <source>Click "Sign Message" to generate signature</source>
+        <translation>Kliknutím na „Podepiš zprávu“ vygeneruješ podpis</translation>
+    </message>
+    <message>
+        <source>The entered address is invalid.</source>
+        <translation>Zadaná adresa je neplatná.</translation>
+    </message>
+    <message>
+        <source>Please check the address and try again.</source>
+        <translation>Zkontroluj ji prosím a zkus to pak znovu.</translation>
+    </message>
+    <message>
+        <source>The entered address does not refer to a key.</source>
+        <translation>Zadaná adresa nepasuje ke klíči.</translation>
+    </message>
+    <message>
+        <source>Wallet unlock was cancelled.</source>
+        <translation>Odemčení peněženky bylo zrušeno.</translation>
+    </message>
+    <message>
+        <source>Private key for the entered address is not available.</source>
+        <translation>Soukromý klíč pro zadanou adresu není dostupný.</translation>
+    </message>
+    <message>
+        <source>Message signing failed.</source>
+        <translation>Nepodařilo se podepsat zprávu.</translation>
+    </message>
+    <message>
+        <source>Message signed.</source>
+        <translation>Zpráva podepsána.</translation>
+    </message>
+    <message>
+        <source>The signature could not be decoded.</source>
+        <translation>Podpis nejde dekódovat.</translation>
+    </message>
+    <message>
+        <source>Please check the signature and try again.</source>
+        <translation>Zkontroluj ho prosím a zkus to pak znovu.</translation>
+    </message>
+    <message>
+        <source>The signature did not match the message digest.</source>
+        <translation>Podpis se neshoduje s hašem zprávy.</translation>
+    </message>
+    <message>
+        <source>Message verification failed.</source>
+        <translation>Nepodařilo se ověřit zprávu.</translation>
+    </message>
+    <message>
+        <source>Message verified.</source>
+        <translation>Zpráva ověřena.</translation>
+    </message>
+</context>
+<context>
+    <name>SplashScreen</name>
+    <message>
+        <source>[testnet]</source>
+        <translation>[testnet]</translation>
+    </message>
+</context>
+<context>
+    <name>TrafficGraphWidget</name>
+    <message>
+        <source>KB/s</source>
+        <translation>kB/s</translation>
+    </message>
+</context>
+<context>
+    <name>TransactionDesc</name>
+    <message numerus="yes">
+        <source>Open for %n more block(s)</source>
+        <translation><numerusform>Otevřeno pro %n další blok</numerusform><numerusform>Otevřeno pro %n další bloky</numerusform><numerusform>Otevřeno pro %n dalších bloků</numerusform></translation>
+    </message>
+    <message>
+        <source>Open until %1</source>
+        <translation>Otřevřeno dokud %1</translation>
+    </message>
+    <message>
+        <source>conflicted with a transaction with %1 confirmations</source>
+        <translation>koliduje s transakcí o %1 konfirmacích</translation>
+    </message>
+    <message>
+        <source>%1/offline</source>
+        <translation>%1/offline</translation>
+    </message>
+    <message>
+        <source>0/unconfirmed, %1</source>
+        <translation>0/nepotvrzeno, %1</translation>
+    </message>
+    <message>
+        <source>in memory pool</source>
+        <translation>v transakčním zásobníku</translation>
+    </message>
+    <message>
+        <source>not in memory pool</source>
+        <translation>není ani v transakčním zásobníku</translation>
+    </message>
+    <message>
+        <source>abandoned</source>
+        <translation>zanechaná</translation>
+    </message>
+    <message>
+        <source>%1/unconfirmed</source>
+        <translation>%1/nepotvrzeno</translation>
+    </message>
+    <message>
+        <source>%1 confirmations</source>
+        <translation>%1 potvrzení</translation>
+    </message>
+    <message>
+        <source>Status</source>
+        <translation>Stav</translation>
+    </message>
+    <message>
+        <source>, has not been successfully broadcast yet</source>
+        <translation>, ještě nebylo rozesláno</translation>
+    </message>
+    <message numerus="yes">
+        <source>, broadcast through %n node(s)</source>
+        <translation><numerusform>, rozesláno přes %n uzel</numerusform><numerusform>, rozesláno přes %n uzly</numerusform><numerusform>, rozesláno přes %n uzlů</numerusform></translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation>Datum</translation>
+    </message>
+    <message>
+        <source>Source</source>
+        <translation>Zdroj</translation>
+    </message>
+    <message>
+        <source>Generated</source>
+        <translation>Vygenerováno</translation>
+    </message>
+    <message>
+        <source>From</source>
+        <translation>Od</translation>
+    </message>
+    <message>
+        <source>unknown</source>
+        <translation>neznámo</translation>
+    </message>
+    <message>
+        <source>To</source>
+        <translation>Pro</translation>
+    </message>
+    <message>
+        <source>own address</source>
+        <translation>vlastní adresa</translation>
+    </message>
+    <message>
+        <source>watch-only</source>
+        <translation>sledovaná</translation>
+    </message>
+    <message>
+        <source>label</source>
+        <translation>označení</translation>
+    </message>
+    <message>
+        <source>Credit</source>
+        <translation>Příjem</translation>
+    </message>
+    <message numerus="yes">
+        <source>matures in %n more block(s)</source>
+        <translation><numerusform>dozraje po %n bloku</numerusform><numerusform>dozraje po %n blocích</numerusform><numerusform>dozraje po %n blocích</numerusform></translation>
+    </message>
+    <message>
+        <source>not accepted</source>
+        <translation>neakceptováno</translation>
+    </message>
+    <message>
+        <source>Debit</source>
+        <translation>Výdaj</translation>
+    </message>
+    <message>
+        <source>Total debit</source>
+        <translation>Celkové výdaje</translation>
+    </message>
+    <message>
+        <source>Total credit</source>
+        <translation>Celkové příjmy</translation>
+    </message>
+    <message>
+        <source>Transaction fee</source>
+        <translation>Transakční poplatek</translation>
+    </message>
+    <message>
+        <source>Net amount</source>
+        <translation>Čistá částka</translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation>Zpráva</translation>
+    </message>
+    <message>
+        <source>Comment</source>
+        <translation>Komentář</translation>
+    </message>
+    <message>
+        <source>Transaction ID</source>
+        <translation>ID transakce</translation>
+    </message>
+    <message>
+        <source>Transaction total size</source>
+        <translation>Celková velikost transakce</translation>
+    </message>
+    <message>
+        <source>Output index</source>
+        <translation>Pořadí výstupu</translation>
+    </message>
+    <message>
+        <source>Merchant</source>
+        <translation>Obchodník</translation>
+    </message>
+    <message>
+        <source>Generated coins must mature %1 blocks before they can be spent. When you generated this block, it was broadcast to the network to be added to the block chain. If it fails to get into the chain, its state will change to "not accepted" and it won't be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source>
+        <translation>Vygenerované mince musí čekat %1 bloků, než mohou být utraceny. Když jsi vygeneroval tenhle blok, tak byl rozposlán do sítě, aby byl přidán do řetězce bloků. Pokud se mu nepodaří dostat se do řetězce, změní se na „neakceptovaný“ a nepůjde utratit. To se občas může stát, pokud jiný uzel vygeneruje blok zhruba ve stejném okamžiku jako ty.</translation>
+    </message>
+    <message>
+        <source>Debug information</source>
+        <translation>Ladicí informace</translation>
+    </message>
+    <message>
+        <source>Transaction</source>
+        <translation>Transakce</translation>
+    </message>
+    <message>
+        <source>Inputs</source>
+        <translation>Vstupy</translation>
+    </message>
+    <message>
+        <source>Amount</source>
+        <translation>Částka</translation>
+    </message>
+    <message>
+        <source>true</source>
+        <translation>true</translation>
+    </message>
+    <message>
+        <source>false</source>
+        <translation>false</translation>
+    </message>
+</context>
+<context>
+    <name>TransactionDescDialog</name>
+    <message>
+        <source>This pane shows a detailed description of the transaction</source>
+        <translation>Toto okno zobrazuje detailní popis transakce</translation>
+    </message>
+    <message>
+        <source>Details for %1</source>
+        <translation>Podrobnosti o %1</translation>
+    </message>
+</context>
+<context>
+    <name>TransactionTableModel</name>
+    <message>
+        <source>Date</source>
+        <translation>Datum</translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation>Typ</translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation>Označení</translation>
+    </message>
+    <message numerus="yes">
+        <source>Open for %n more block(s)</source>
+        <translation><numerusform>Otevřeno pro %n další blok</numerusform><numerusform>Otevřeno pro %n další bloky</numerusform><numerusform>Otevřeno pro %n dalších bloků</numerusform></translation>
+    </message>
+    <message>
+        <source>Open until %1</source>
+        <translation>Otřevřeno dokud %1</translation>
+    </message>
+    <message>
+        <source>Offline</source>
+        <translation>Offline</translation>
+    </message>
+    <message>
+        <source>Unconfirmed</source>
+        <translation>Nepotvrzeno</translation>
+    </message>
+    <message>
+        <source>Abandoned</source>
+        <translation>Zanechaná</translation>
+    </message>
+    <message>
+        <source>Confirming (%1 of %2 recommended confirmations)</source>
+        <translation>Potvrzuje se (%1 z %2 doporučených potvrzení)</translation>
+    </message>
+    <message>
+        <source>Confirmed (%1 confirmations)</source>
+        <translation>Potvrzeno (%1 potvrzení)</translation>
+    </message>
+    <message>
+        <source>Conflicted</source>
+        <translation>V kolizi</translation>
+    </message>
+    <message>
+        <source>Immature (%1 confirmations, will be available after %2)</source>
+        <translation>Nedozráno (%1 potvrzení, dozraje při %2 potvrzeních)</translation>
+    </message>
+    <message>
+        <source>This block was not received by any other nodes and will probably not be accepted!</source>
+        <translation>Tento blok nedostal žádný jiný uzel a pravděpodobně nebude akceptován!</translation>
+    </message>
+    <message>
+        <source>Generated but not accepted</source>
+        <translation>Vygenerováno, ale neakceptováno</translation>
+    </message>
+    <message>
+        <source>Received with</source>
+        <translation>Přijato do</translation>
+    </message>
+    <message>
+        <source>Received from</source>
+        <translation>Přijato od</translation>
+    </message>
+    <message>
+        <source>Sent to</source>
+        <translation>Posláno na</translation>
+    </message>
+    <message>
+        <source>Payment to yourself</source>
+        <translation>Platba sama sobě</translation>
+    </message>
+    <message>
+        <source>Mined</source>
+        <translation>Vytěženo</translation>
+    </message>
+    <message>
+        <source>watch-only</source>
+        <translation>sledovací</translation>
+    </message>
+    <message>
+        <source>(n/a)</source>
+        <translation>(n/a)</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(bez označení)</translation>
+    </message>
+    <message>
+        <source>Transaction status. Hover over this field to show number of confirmations.</source>
+        <translation>Stav transakce. Najetím myši na toto políčko si zobrazíš počet potvrzení.</translation>
+    </message>
+    <message>
+        <source>Date and time that the transaction was received.</source>
+        <translation>Datum a čas přijetí transakce.</translation>
+    </message>
+    <message>
+        <source>Type of transaction.</source>
+        <translation>Druh transakce.</translation>
     </message>
-</context>
-<context>
-    <name>SendCoinsEntry</name>
     <message>
-        <source>A&amp;mount:</source>
-        <translation>Čás&amp;tka:</translation>
+        <source>Whether or not a watch-only address is involved in this transaction.</source>
+        <translation>Zda tato transakce zahrnuje i některou sledovanou adresu.</translation>
     </message>
     <message>
-        <source>Pay &amp;To:</source>
-        <translation>&amp;Komu:</translation>
+        <source>User-defined intent/purpose of the transaction.</source>
+        <translation>Uživatelsky určený účel transakce.</translation>
     </message>
     <message>
-        <source>&amp;Label:</source>
-        <translation>O&amp;značení:</translation>
+        <source>Amount removed from or added to balance.</source>
+        <translation>Částka odečtená z nebo přičtená k účtu.</translation>
     </message>
+</context>
+<context>
+    <name>TransactionView</name>
     <message>
-        <source>Choose previously used address</source>
-        <translation>Vyber již použitou adresu</translation>
+        <source>All</source>
+        <translation>Vše</translation>
     </message>
     <message>
-        <source>This is a normal payment.</source>
-        <translation>Tohle je normální platba.</translation>
+        <source>Today</source>
+        <translation>Dnes</translation>
     </message>
     <message>
-        <source>The Bitcoin address to send the payment to</source>
-        <translation>Bitcoinová adresa příjemce</translation>
+        <source>This week</source>
+        <translation>Tento týden</translation>
     </message>
     <message>
-        <source>Alt+A</source>
-        <translation>Alt+A</translation>
+        <source>This month</source>
+        <translation>Tento měsíc</translation>
     </message>
     <message>
-        <source>Paste address from clipboard</source>
-        <translation>Vlož adresu ze schránky</translation>
+        <source>Last month</source>
+        <translation>Minulý měsíc</translation>
     </message>
     <message>
-        <source>Alt+P</source>
-        <translation>Alt+P</translation>
+        <source>This year</source>
+        <translation>Letos</translation>
     </message>
     <message>
-        <source>Remove this entry</source>
-        <translation>Smaž tento záznam</translation>
+        <source>Range...</source>
+        <translation>Rozsah...</translation>
     </message>
     <message>
-        <source>The fee will be deducted from the amount being sent. The recipient will receive less bitcoins than you enter in the amount field. If multiple recipients are selected, the fee is split equally.</source>
-        <translation>Poplatek se odečte od posílané částky. Příjemce tak dostane méně bitcoinů, než zadáš do pole Částka. Pokud vybereš více příjemců, tak se poplatek rovnoměrně rozloží.</translation>
+        <source>Received with</source>
+        <translation>Přijato</translation>
     </message>
     <message>
-        <source>S&amp;ubtract fee from amount</source>
-        <translation>Od&amp;ečíst poplatek od částky</translation>
+        <source>Sent to</source>
+        <translation>Posláno</translation>
     </message>
     <message>
-        <source>Message:</source>
-        <translation>Zpráva:</translation>
+        <source>To yourself</source>
+        <translation>Sám sobě</translation>
     </message>
     <message>
-        <source>This is an unauthenticated payment request.</source>
-        <translation>Tohle je neověřený platební požadavek.</translation>
+        <source>Mined</source>
+        <translation>Vytěženo</translation>
     </message>
     <message>
-        <source>This is an authenticated payment request.</source>
-        <translation>Tohle je ověřený platební požadavek.</translation>
+        <source>Other</source>
+        <translation>Ostatní</translation>
     </message>
     <message>
-        <source>Enter a label for this address to add it to the list of used addresses</source>
-        <translation>Zadej označení této adresy; obojí se ti pak uloží do adresáře</translation>
+        <source>Enter address or label to search</source>
+        <translation>Zadej adresu nebo označení pro její vyhledání</translation>
     </message>
     <message>
-        <source>A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
-        <translation>Zpráva, která byla připojena k bitcoin: URI a která se ti pro přehled uloží k transakci. Poznámka: Tahle zpráva se neposílá s platbou po Bitcoinové síti.</translation>
+        <source>Min amount</source>
+        <translation>Minimální částka</translation>
     </message>
     <message>
-        <source>Pay To:</source>
-        <translation>Komu:</translation>
+        <source>Abandon transaction</source>
+        <translation>Zapomenout transakci</translation>
     </message>
     <message>
-        <source>Memo:</source>
-        <translation>Poznámka:</translation>
+        <source>Copy address</source>
+        <translation>Kopíruj adresu</translation>
     </message>
-</context>
-<context>
-    <name>ShutdownWindow</name>
     <message>
-        <source>Do not shut down the computer until this window disappears.</source>
-        <translation>Nevypínej počítač, dokud toto okno nezmizí.</translation>
+        <source>Copy label</source>
+        <translation>Kopíruj její označení</translation>
     </message>
-</context>
-<context>
-    <name>SignVerifyMessageDialog</name>
     <message>
-        <source>Signatures - Sign / Verify a Message</source>
-        <translation>Podpisy - podepsat/ověřit zprávu</translation>
+        <source>Copy amount</source>
+        <translation>Kopíruj částku</translation>
     </message>
     <message>
-        <source>&amp;Sign Message</source>
-        <translation>&amp;Podepiš zprávu</translation>
+        <source>Copy transaction ID</source>
+        <translation>Kopíruj ID transakce</translation>
     </message>
     <message>
-        <source>You can sign messages/agreements with your addresses to prove you can receive bitcoins sent to them. Be careful not to sign anything vague or random, as phishing attacks may try to trick you into signing your identity over to them. Only sign fully-detailed statements you agree to.</source>
-        <translation>Podepsáním zprávy/smlouvy svými adresami můžeš prokázat, že jsi na ně schopen přijmout bitcoiny. Buď opatrný a nepodepisuj nic vágního nebo náhodného; například při phishingových útocích můžeš být lákán, abys něco takového podepsal. Podepisuj pouze naprosto úplná a detailní prohlášení, se kterými souhlasíš.</translation>
+        <source>Copy raw transaction</source>
+        <translation>Kopíruj surovou transakci</translation>
     </message>
     <message>
-        <source>The Bitcoin address to sign the message with</source>
-        <translation>Bitcoinová adresa, kterou se zpráva podepíše</translation>
+        <source>Copy full transaction details</source>
+        <translation>Kopíruj kompletní podrobnosti o transakci</translation>
     </message>
     <message>
-        <source>Choose previously used address</source>
-        <translation>Vyber již použitou adresu</translation>
+        <source>Edit label</source>
+        <translation>Uprav označení</translation>
     </message>
     <message>
-        <source>Alt+A</source>
-        <translation>Alt+A</translation>
+        <source>Show transaction details</source>
+        <translation>Zobraz detaily transakce</translation>
     </message>
     <message>
-        <source>Paste address from clipboard</source>
-        <translation>Vlož adresu ze schránky</translation>
+        <source>Export Transaction History</source>
+        <translation>Exportuj transakční historii</translation>
     </message>
     <message>
-        <source>Alt+P</source>
-        <translation>Alt+P</translation>
+        <source>Comma separated file (*.csv)</source>
+        <translation>Formát CSV (*.csv)</translation>
     </message>
     <message>
-        <source>Enter the message you want to sign here</source>
-        <translation>Sem vepiš zprávu, kterou chceš podepsat</translation>
+        <source>Confirmed</source>
+        <translation>Potvrzeno</translation>
     </message>
     <message>
-        <source>Signature</source>
-        <translation>Podpis</translation>
+        <source>Watch-only</source>
+        <translation>Sledovaná</translation>
     </message>
     <message>
-        <source>Copy the current signature to the system clipboard</source>
-        <translation>Zkopíruj tento podpis do schránky</translation>
+        <source>Date</source>
+        <translation>Datum</translation>
     </message>
     <message>
-        <source>Sign the message to prove you own this Bitcoin address</source>
-        <translation>Podepiš zprávu, čímž prokážeš, že jsi vlastníkem této Bitcoinové adresy</translation>
+        <source>Type</source>
+        <translation>Typ</translation>
     </message>
     <message>
-        <source>Sign &amp;Message</source>
-        <translation>Po&amp;depiš zprávu</translation>
+        <source>Label</source>
+        <translation>Označení</translation>
     </message>
     <message>
-        <source>Reset all sign message fields</source>
-        <translation>Vymaž všechna pole formuláře pro podepsání zrávy</translation>
+        <source>Address</source>
+        <translation>Adresa</translation>
     </message>
     <message>
-        <source>Clear &amp;All</source>
-        <translation>Všechno &amp;smaž</translation>
+        <source>ID</source>
+        <translation>ID</translation>
     </message>
     <message>
-        <source>&amp;Verify Message</source>
-        <translation>&amp;Ověř zprávu</translation>
+        <source>Exporting Failed</source>
+        <translation>Exportování selhalo</translation>
     </message>
     <message>
-        <source>Enter the receiver's address, message (ensure you copy line breaks, spaces, tabs, etc. exactly) and signature below to verify the message. Be careful not to read more into the signature than what is in the signed message itself, to avoid being tricked by a man-in-the-middle attack. Note that this only proves the signing party receives with the address, it cannot prove sendership of any transaction!</source>
-        <translation>K ověření podpisu zprávy zadej adresu příjemce, zprávu (ověř si, že správně kopíruješ zalomení řádků, mezery, tabulátory apod.) a podpis. Dávej pozor na to, abys nezkopíroval do podpisu víc, než co je v samotné podepsané zprávě, abys nebyl napálen man-in-the-middle útokem. Poznamenejme však, že takto lze pouze prokázat, že podepisující je schopný na dané adrese přijmout platbu, ale není možnéprokázat, že odeslal jakoukoli transakci!</translation>
+        <source>There was an error trying to save the transaction history to %1.</source>
+        <translation>Při ukládání transakční historie do %1 se přihodila nějaká chyba.</translation>
     </message>
     <message>
-        <source>The Bitcoin address the message was signed with</source>
-        <translation>Bitcoinová adresa, kterou je zpráva podepsána</translation>
+        <source>Exporting Successful</source>
+        <translation>Úspěšně vyexportováno</translation>
     </message>
     <message>
-        <source>Verify the message to ensure it was signed with the specified Bitcoin address</source>
-        <translation>Ověř zprávu, aby ses ujistil, že byla podepsána danou Bitcoinovou adresou</translation>
+        <source>The transaction history was successfully saved to %1.</source>
+        <translation>Transakční historie byla v pořádku uložena do %1.</translation>
     </message>
     <message>
-        <source>Verify &amp;Message</source>
-        <translation>O&amp;věř zprávu</translation>
+        <source>Range:</source>
+        <translation>Rozsah:</translation>
     </message>
     <message>
-        <source>Reset all verify message fields</source>
-        <translation>Vymaž všechna pole formuláře pro ověření zrávy</translation>
+        <source>to</source>
+        <translation>až</translation>
     </message>
 </context>
 <context>
-    <name>SplashScreen</name>
+    <name>UnitDisplayStatusBarControl</name>
     <message>
-        <source>[testnet]</source>
-        <translation>[testnet]</translation>
+        <source>Unit to show amounts in. Click to select another unit.</source>
+        <translation>Jednotka pro částky. Klikni pro výběr nějaké jiné.</translation>
     </message>
 </context>
 <context>
-    <name>TrafficGraphWidget</name>
+    <name>WalletFrame</name>
     <message>
-        <source>KB/s</source>
-        <translation>kB/s</translation>
+        <source>No wallet has been loaded.</source>
+        <translation>Žádná peněženka se nenačetla.</translation>
     </message>
 </context>
 <context>
-    <name>TransactionDescDialog</name>
+    <name>WalletModel</name>
     <message>
-        <source>This pane shows a detailed description of the transaction</source>
-        <translation>Toto okno zobrazuje detailní popis transakce</translation>
+        <source>Send Coins</source>
+        <translation>Pošli mince</translation>
     </message>
 </context>
 <context>
-    <name>UnitDisplayStatusBarControl</name>
+    <name>WalletView</name>
     <message>
-        <source>Unit to show amounts in. Click to select another unit.</source>
-        <translation>Jednotka pro částky. Klikni pro výběr nějaké jiné.</translation>
+        <source>&amp;Export</source>
+        <translation>&amp;Export</translation>
+    </message>
+    <message>
+        <source>Export the data in the current tab to a file</source>
+        <translation>Exportuj data z tohoto panelu do souboru</translation>
+    </message>
+    <message>
+        <source>Backup Wallet</source>
+        <translation>Záloha peněženky</translation>
+    </message>
+    <message>
+        <source>Wallet Data (*.dat)</source>
+        <translation>Data peněženky (*.dat)</translation>
+    </message>
+    <message>
+        <source>Backup Failed</source>
+        <translation>Zálohování selhalo</translation>
+    </message>
+    <message>
+        <source>There was an error trying to save the wallet data to %1.</source>
+        <translation>Při ukládání peněženky do %1 se přihodila nějaká chyba.</translation>
+    </message>
+    <message>
+        <source>Backup Successful</source>
+        <translation>Úspěšně zazálohováno</translation>
+    </message>
+    <message>
+        <source>The wallet data was successfully saved to %1.</source>
+        <translation>Data z peněženky byla v pořádku uložena do %1.</translation>
     </message>
 </context>
 <context>
@@ -1614,6 +2997,18 @@
         <source>Accept command line and JSON-RPC commands</source>
         <translation>Akceptovat příkazy z příkazové řádky a přes JSON-RPC</translation>
     </message>
+    <message>
+        <source>Accept connections from outside (default: 1 if no -proxy or -connect/-noconnect)</source>
+        <translation>Přijímat spojení zvenčí (výchozí: 1, pokud není zadáno -proxy nebo -connect/-noconnect)</translation>
+    </message>
+    <message>
+        <source>Connect only to the specified node(s); -noconnect or -connect=0 alone to disable automatic connections</source>
+        <translation>Připojovat se pouze k určeným uzlům; samotné -noconnect nebo -connect=0 zakáží automatické připojování</translation>
+    </message>
+    <message>
+        <source>Distributed under the MIT software license, see the accompanying file %s or %s</source>
+        <translation>Šířen pod softwarovou licencí MIT, viz přiložený soubor %s nebo %s</translation>
+    </message>
     <message>
         <source>If &lt;category&gt; is not supplied or if &lt;category&gt; = 1, output all debugging information.</source>
         <translation>Pokud není &lt;category&gt; zadána nebo je &lt;category&gt; = 1, bude tisknout veškeré ladicí informace.</translation>
@@ -1654,17 +3049,13 @@
         <source>Unable to start HTTP server. See debug log for details.</source>
         <translation>Nemohu spustit HTTP server. Detaily viz v debug.log.</translation>
     </message>
-    <message>
-        <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
-        <translation>Přijímat spojení zvenčí (výchozí: 1, pokud není zadáno -proxy nebo -connect)</translation>
-    </message>
     <message>
         <source>Bitcoin Core</source>
         <translation>Bitcoin Core</translation>
     </message>
     <message>
-        <source>-fallbackfee is set very high! This is the transaction fee you may pay when fee estimates are not available.</source>
-        <translation>-fallbackfee je nastaveno velmi vysoko! Toto je transakční poplatek, který bys platil, pokud nebude k dispozici odhad poplatků.</translation>
+        <source>The %s developers</source>
+        <translation>Vývojáři %s</translation>
     </message>
     <message>
         <source>A fee rate (in %s/kB) that will be used when fee estimation has insufficient data (default: %s)</source>
@@ -1678,21 +3069,41 @@
         <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source>
         <translation>Poslouchat na zadané adrese. Pro zápis IPv6 adresy použij notaci [adresa]:port</translation>
     </message>
+    <message>
+        <source>Cannot obtain a lock on data directory %s. %s is probably already running.</source>
+        <translation>Nedaří se mi získat zámek na datový adresář %s. %s pravděpodobně už jednou běží.</translation>
+    </message>
     <message>
         <source>Delete all wallet transactions and only recover those parts of the blockchain through -rescan on startup</source>
         <translation>Smazat všechny transakce peněženky a při startu obnovit pouze relevantní části řetězce bloků pomocí -rescan</translation>
     </message>
     <message>
-        <source>Distributed under the MIT software license, see the accompanying file COPYING or &lt;http://www.opensource.org/licenses/mit-license.php&gt;.</source>
-        <translation>Šířen pod softwarovou licencí MIT, viz přiložený soubor COPYING nebo &lt;http://www.opensource.org/licenses/mit-license.php&gt;.</translation>
+        <source>Error loading %s: You can't enable HD on a already existing non-HD wallet</source>
+        <translation>Chyba při načítání %s: nemůžeš zapnout HD u existující ne-HD peněženky</translation>
+    </message>
+    <message>
+        <source>Error reading %s! All keys read correctly, but transaction data or address book entries might be missing or incorrect.</source>
+        <translation>Nastala chyba při čtení souboru %s! Všechny klíče se přečetly správně, ale data o transakcích nebo záznamy v adresáři mohou chybět či být nesprávné.</translation>
     </message>
     <message>
         <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source>
         <translation>Spustit příkaz, když se objeví transakce týkající se peněženky (%s se v příkazu nahradí za TxID)</translation>
     </message>
     <message>
-        <source>Force relay of transactions from whitelisted peers even they violate local relay policy (default: %d)</source>
-        <translation>Vynutit přeposílání transakcí od vždy vítaných protějšků (tj. těch na bílé listině), i když porušují místní zásady pro přeposílání (výchozí: %d)</translation>
+        <source>Maximum allowed median peer time offset adjustment. Local perspective of time may be influenced by peers forward or backward by this amount. (default: %u seconds)</source>
+        <translation>Maximální povolené seřizování času mediánem časů protějšků. Místní vnímání času může být ovlivněno protějšky, a to dopředu nebo dozadu až o toto množství. (výchozí: %u vteřin)</translation>
+    </message>
+    <message>
+        <source>Maximum total fees (in %s) to use in a single wallet transaction or raw transaction; setting this too low may abort large transactions (default: %s)</source>
+        <translation>Horní hranice pro celkový poplatek (v %s) za jednu transakci z peněženky nebo jednu surovou transakci; příliš nízká hodnota může zmařit velké transakce (výchozí: %s)</translation>
+    </message>
+    <message>
+        <source>Please check that your computer's date and time are correct! If your clock is wrong, %s will not work properly.</source>
+        <translation>Zkontroluj, že máš v počítači správně nastavený datum a čas! Pokud jsou nastaveny špatně, %s nebude fungovat správně.</translation>
+    </message>
+    <message>
+        <source>Please contribute if you find %s useful. Visit %s for further information about the software.</source>
+        <translation>Prosíme, zapoj se nebo přispěj, pokud ti %s přijde užitečný. Více informací o programu je na %s.</translation>
     </message>
     <message>
         <source>Set the number of script verification threads (%u to %d, 0 = auto, &lt;0 = leave that many cores free, default: %d)</source>
@@ -1706,10 +3117,18 @@
         <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
         <translation>Tohle je testovací verze – používej ji jen na vlastní riziko, ale rozhodně ji nepoužívej k těžbě nebo pro obchodní aplikace</translation>
     </message>
+    <message>
+        <source>Unable to rewind the database to a pre-fork state. You will need to redownload the blockchain</source>
+        <translation>Nedaří se mi vrátit databázi do stavu před štěpem. Budeš muset znovu stáhnout celý řetězec bloků</translation>
+    </message>
     <message>
         <source>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</source>
         <translation>Použít UPnP k namapování naslouchacího portu (výchozí: 1, pokud naslouchá a nepoužívá -proxy)</translation>
     </message>
+    <message>
+        <source>Wallet will not create transactions that violate mempool chain limits (default: %u)</source>
+        <translation>Peněženka nebude vytvářet transakce, které by porušovaly limity transakčního zásobníku na řetězce (výchozí: %u)</translation>
+    </message>
     <message>
         <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source>
         <translation>Upozornění: Síť podle všeho není v konzistentním stavu. Někteří těžaři jsou zřejmě v potížích.</translation>
@@ -1719,8 +3138,12 @@
         <translation>Upozornění: Nesouhlasím zcela se svými protějšky! Možná potřebuji aktualizovat nebo ostatní uzly potřebují aktualizovat.</translation>
     </message>
     <message>
-        <source>Whitelist peers connecting from the given netmask or IP address. Can be specified multiple times.</source>
-        <translation>Vždy vítat protějšky připojující se z dané podsítě či IP adresy. Lze zadat i vícekrát.</translation>
+        <source>You need to rebuild the database using -reindex-chainstate to change -txindex</source>
+        <translation>Je třeba přestavět databázi použitím -reindex-chainstate, aby bylo možné změnit -txindex</translation>
+    </message>
+    <message>
+        <source>%s corrupt, salvage failed</source>
+        <translation>%s je poškozen, jeho záchrana se nezdařila</translation>
     </message>
     <message>
         <source>-maxmempool must be at least %d MB</source>
@@ -1734,18 +3157,34 @@
         <source>Append comment to the user agent string</source>
         <translation>Připojit komentář k typu klienta</translation>
     </message>
+    <message>
+        <source>Attempt to recover private keys from a corrupt wallet on startup</source>
+        <translation>Pokusit se při startu zachránit soukromé klíče z poškozeného souboru s klíči</translation>
+    </message>
     <message>
         <source>Block creation options:</source>
         <translation>Možnosti vytváření bloku:</translation>
     </message>
     <message>
-        <source>Connect only to the specified node(s)</source>
-        <translation>Připojit se pouze k zadanému uzlu (příp. zadaným uzlům)</translation>
+        <source>Cannot resolve -%s address: '%s'</source>
+        <translation>Nemohu přeložit -%s adresu: '%s'</translation>
+    </message>
+    <message>
+        <source>Chain selection options:</source>
+        <translation>Možnosti výběru řetězce:</translation>
+    </message>
+    <message>
+        <source>Change index out of range</source>
+        <translation>Index drobných je mimo platný rozsah</translation>
     </message>
     <message>
         <source>Connection options:</source>
         <translation>Možnosti připojení:</translation>
     </message>
+    <message>
+        <source>Copyright (C) %i-%i</source>
+        <translation>Copyright (C) %i–%i</translation>
+    </message>
     <message>
         <source>Corrupted block database detected</source>
         <translation>Bylo zjištěno poškození databáze bloků</translation>
@@ -1762,6 +3201,26 @@
         <source>Do you want to rebuild the block database now?</source>
         <translation>Chceš přestavět databázi bloků hned teď?</translation>
     </message>
+    <message>
+        <source>Enable publish hash block in &lt;address&gt;</source>
+        <translation>Zapnout oznamování hashů bloků na adrese &lt;address&gt;</translation>
+    </message>
+    <message>
+        <source>Enable publish hash transaction in &lt;address&gt;</source>
+        <translation>Zapnout oznamování hashů transakcí na adrese &lt;address&gt;</translation>
+    </message>
+    <message>
+        <source>Enable publish raw block in &lt;address&gt;</source>
+        <translation>Zapnout oznamování surových bloků na adrese &lt;address&gt;</translation>
+    </message>
+    <message>
+        <source>Enable publish raw transaction in &lt;address&gt;</source>
+        <translation>Zapnout oznamování surových transakcí na adrese &lt;address&gt;</translation>
+    </message>
+    <message>
+        <source>Enable transaction replacement in the memory pool (default: %u)</source>
+        <translation>Povolit výměnu transakcí v transakčním zásobníku (výchozí: %u)</translation>
+    </message>
     <message>
         <source>Error initializing block database</source>
         <translation>Chyba při zakládání databáze bloků</translation>
@@ -1770,6 +3229,22 @@
         <source>Error initializing wallet database environment %s!</source>
         <translation>Chyba při vytváření databázového prostředí %s pro peněženku!</translation>
     </message>
+    <message>
+        <source>Error loading %s</source>
+        <translation>Chyba při načítání %s</translation>
+    </message>
+    <message>
+        <source>Error loading %s: Wallet corrupted</source>
+        <translation>Chyba při načítání %s: peněženka je poškozená</translation>
+    </message>
+    <message>
+        <source>Error loading %s: Wallet requires newer version of %s</source>
+        <translation>Chyba při načítání %s: peněženka vyžaduje novější verzi %s</translation>
+    </message>
+    <message>
+        <source>Error loading %s: You can't disable HD on a already existing HD wallet</source>
+        <translation>Chyba při načítání %s: nemůžeš vypnout HD u existující HD peněženky</translation>
+    </message>
     <message>
         <source>Error loading block database</source>
         <translation>Chyba při načítání databáze bloků</translation>
@@ -1794,10 +3269,18 @@
         <source>Incorrect or no genesis block found. Wrong datadir for network?</source>
         <translation>Nemám žádný nebo jen špatný genesis blok. Není špatně nastavený datadir?</translation>
     </message>
+    <message>
+        <source>Initialization sanity check failed. %s is shutting down.</source>
+        <translation>Selhala úvodní zevrubná prověrka. %s se ukončuje.</translation>
+    </message>
     <message>
         <source>Invalid -onion address: '%s'</source>
         <translation>Neplatná -onion adresa: '%s'</translation>
     </message>
+    <message>
+        <source>Invalid amount for -%s=&lt;amount&gt;: '%s'</source>
+        <translation>Neplatná částka pro -%s=&lt;částka&gt;: '%s'</translation>
+    </message>
     <message>
         <source>Invalid amount for -fallbackfee=&lt;amount&gt;: '%s'</source>
         <translation>Neplatná částka pro -fallbackfee=&lt;částka&gt;: '%s'</translation>
@@ -1807,12 +3290,12 @@
         <translation>Udržovat zasobník transakcí menší než &lt;n&gt; megabajtů (výchozí: %u)</translation>
     </message>
     <message>
-        <source>Location of the auth cookie (default: data dir)</source>
-        <translation>Místo pro autentizační cookie (výchozí: adresář pro data)</translation>
+        <source>Loading banlist...</source>
+        <translation>Načítám seznam klateb...</translation>
     </message>
     <message>
-        <source>Minimum bytes per sigop in transactions we relay and mine (default: %u)</source>
-        <translation>Minimální počet bajtů na každý sigop v transakcích, které přeposíláme a těžíme (výchozí: %u)</translation>
+        <source>Location of the auth cookie (default: data dir)</source>
+        <translation>Místo pro autentizační cookie (výchozí: adresář pro data)</translation>
     </message>
     <message>
         <source>Not enough file descriptors available.</source>
@@ -1822,6 +3305,10 @@
         <source>Only connect to nodes in network &lt;net&gt; (ipv4, ipv6 or onion)</source>
         <translation>Připojovat se pouze k uzlům v &lt;net&gt; síti (ipv4, ipv6 nebo onion)</translation>
     </message>
+    <message>
+        <source>Print this help message and exit</source>
+        <translation>Vypsat tuto nápovědu a skončit</translation>
+    </message>
     <message>
         <source>Print version and exit</source>
         <translation>Vypsat verzi a skončit</translation>
@@ -1834,6 +3321,18 @@
         <source>Prune mode is incompatible with -txindex.</source>
         <translation>Prořezávací režim není kompatibilní s -txindex.</translation>
     </message>
+    <message>
+        <source>Rebuild chain state and block index from the blk*.dat files on disk</source>
+        <translation>Při startu znovu vytvořit index řetězce bloků z aktuálních blk*.dat souborů</translation>
+    </message>
+    <message>
+        <source>Rebuild chain state from the currently indexed blocks</source>
+        <translation>Znovu vytvořit stav řetězce bloků z aktuálně indexovaných bloků</translation>
+    </message>
+    <message>
+        <source>Rewinding blocks...</source>
+        <translation>Vracím bloky…</translation>
+    </message>
     <message>
         <source>Set database cache size in megabytes (%d to %d, default: %d)</source>
         <translation>Nastavit velikost databázové vyrovnávací paměti v megabajtech (%d až %d, výchozí: %d)</translation>
@@ -1846,6 +3345,14 @@
         <source>Specify wallet file (within data directory)</source>
         <translation>Udej název souboru s peněženkou (v rámci datového adresáře)</translation>
     </message>
+    <message>
+        <source>The source code is available from %s.</source>
+        <translation>Zdrojový kód je dostupný na %s.</translation>
+    </message>
+    <message>
+        <source>Unable to bind to %s on this computer. %s is probably already running.</source>
+        <translation>Nedaří se mi připojit na %s na tomhle počítači. %s už pravděpodobně jednou běží.</translation>
+    </message>
     <message>
         <source>Unsupported argument -benchmark ignored, use -debug=bench.</source>
         <translation>Nepodporovaný argument -benchmark se ignoruje, použij -debug=bench.</translation>
@@ -1862,22 +3369,34 @@
         <source>Use UPnP to map the listening port (default: %u)</source>
         <translation>Použít UPnP k namapování naslouchacího portu (výchozí: %u)</translation>
     </message>
+    <message>
+        <source>Use the test chain</source>
+        <translation>Použít testovací řetězec</translation>
+    </message>
     <message>
         <source>User Agent comment (%s) contains unsafe characters.</source>
         <translation>Komentář u typu klienta (%s) obsahuje riskantní znaky.</translation>
     </message>
     <message>
         <source>Verifying blocks...</source>
-        <translation>Ověřuji bloky...</translation>
+        <translation>Ověřuji bloky…</translation>
     </message>
     <message>
         <source>Verifying wallet...</source>
-        <translation>Kontroluji peněženku...</translation>
+        <translation>Kontroluji peněženku…</translation>
     </message>
     <message>
         <source>Wallet %s resides outside data directory %s</source>
         <translation>Peněženka %s se nachází mimo datový adresář %s</translation>
     </message>
+    <message>
+        <source>Wallet debugging/testing options:</source>
+        <translation>Možnosti ladění/testování peněženky:</translation>
+    </message>
+    <message>
+        <source>Wallet needed to be rewritten: restart %s to complete</source>
+        <translation>Soubor s peněženkou potřeboval přepsat: restartuj %s, aby se operace dokončila</translation>
+    </message>
     <message>
         <source>Wallet options:</source>
         <translation>Možnosti peněženky:</translation>
@@ -1926,10 +3445,6 @@
         <source>Maximum size of data in data carrier transactions we relay and mine (default: %u)</source>
         <translation>Maximální velikost dat v transakcích nesoucích data, se kterou jsme ochotni je ještě přeposílat a těžit (výchozí: %u)</translation>
     </message>
-    <message>
-        <source>Query for peer addresses via DNS lookup, if low on addresses (default: 1 unless -connect)</source>
-        <translation>Při nedostatku adres získat další protějšky z DNS (výchozí: 1, pokud není použito -connect)</translation>
-    </message>
     <message>
         <source>Randomize credentials for every proxy connection. This enables Tor stream isolation (default: %u)</source>
         <translation>Použít náhodné údaje pro každé proxy spojení. To umožní izolovat nesouvisející datové toky v Toru (výchozí: %u)</translation>
@@ -1943,8 +3458,8 @@
         <translation>Částka v transakci po odečtení poplatku je příliš malá na odeslání</translation>
     </message>
     <message>
-        <source>This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit &lt;https://www.openssl.org/&gt; and cryptographic software written by Eric Young and UPnP software written by Thomas Bernard.</source>
-        <translation>Tento produkt zahrnuje programy vyvinuté OpenSSL Projektem pro použití v OpenSSL Toolkitu &lt;https://www.openssl.org/&gt; a kryptografický program od Erika Younga a program UPnP od Thomase Bernarda.</translation>
+        <source>Use hierarchical deterministic key generation (HD) after BIP32. Only has effect during wallet creation/first start</source>
+        <translation>Použít hierarchické deterministické generování klíčů (HD) podle BIP32. Má vliv pouze během vytváření peněženky/prvního startu</translation>
     </message>
     <message>
         <source>Whitelisted peers cannot be DoS banned and their transactions are always relayed, even if they are already in the mempool, useful e.g. for a gateway</source>
@@ -2054,10 +3569,6 @@
         <source>Transaction amount too small</source>
         <translation>Částka v transakci je příliš malá</translation>
     </message>
-    <message>
-        <source>Transaction amounts must be positive</source>
-        <translation>Částky v transakci musí být kladné</translation>
-    </message>
     <message>
         <source>Transaction too large for fee policy</source>
         <translation>Transakce je na poplatkovou politiku příliš velká</translation>
@@ -2082,6 +3593,10 @@
         <source>Warning</source>
         <translation>Upozornění</translation>
     </message>
+    <message>
+        <source>Warning: unknown new rules activated (versionbit %i)</source>
+        <translation>Upozornění: aktivována neznámá nová pravidla (verzový bit %i)</translation>
+    </message>
     <message>
         <source>Whether to operate in a blocks only mode (default: %u)</source>
         <translation>Zda fungovat v čistě blokovém režimu (výchozí: %u)</translation>
@@ -2092,7 +3607,7 @@
     </message>
     <message>
         <source>ZeroMQ notification options:</source>
-        <translation>Možnosti ZeroMQ oznámení:</translation>
+        <translation>Možnosti ZeroMQ oznamování:</translation>
     </message>
     <message>
         <source>Password for JSON-RPC connections</source>
@@ -2118,18 +3633,22 @@
         <source>-maxtxfee is set very high! Fees this large could be paid on a single transaction.</source>
         <translation>-maxtxfee je nastaveno velmi vysoko! Takto vysoký poplatek může být zaplacen v jednotlivé transakci.</translation>
     </message>
-    <message>
-        <source>-paytxfee is set very high! This is the transaction fee you will pay if you send a transaction.</source>
-        <translation>-paytxfee je nastaveno velmi vysoko! Toto je transakční poplatek, který zaplatíš za každou poslanou transakci.</translation>
-    </message>
     <message>
         <source>Do not keep transactions in the mempool longer than &lt;n&gt; hours (default: %u)</source>
         <translation>Nedržet transakce v zásobníku déle než &lt;n&gt; hodin (výchozí: %u)</translation>
     </message>
+    <message>
+        <source>Equivalent bytes per sigop in transactions for relay and mining (default: %u)</source>
+        <translation>Ekvivalent bajtů za každý sigop v transakcích – pro účely přeposílání a těžení (výchozí: %u)</translation>
+    </message>
     <message>
         <source>Fees (in %s/kB) smaller than this are considered zero fee for transaction creation (default: %s)</source>
         <translation>Poplatky (v %s/kB) menší než tato hodnota jsou považovány za nulové pro účely vytváření transakcí (výchozí: %s)</translation>
     </message>
+    <message>
+        <source>Force relay of transactions from whitelisted peers even if they violate local relay policy (default: %d)</source>
+        <translation>Vynutit přeposílání transakcí od vždy vítaných protějšků (tj. těch na bílé listině), i když porušují místní zásady pro přeposílání (výchozí: %d)</translation>
+    </message>
     <message>
         <source>How thorough the block verification of -checkblocks is (0-4, default: %u)</source>
         <translation>Jak moc důkladná má být verifikace bloků -checkblocks (0-4, výchozí: %u)</translation>
@@ -2146,10 +3665,26 @@
         <source>Output debugging information (default: %u, supplying &lt;category&gt; is optional)</source>
         <translation>Tisknout ladicí informace (výchozí: %u, zadání &lt;category&gt; je volitelné)</translation>
     </message>
+    <message>
+        <source>Query for peer addresses via DNS lookup, if low on addresses (default: 1 unless -connect/-noconnect)</source>
+        <translation>Při nedostatku adres získat další protějšky z DNS (výchozí: 1, pokud není použito -connect/-noconnect)</translation>
+    </message>
+    <message>
+        <source>Sets the serialization of raw transaction or block hex returned in non-verbose mode, non-segwit(0) or segwit(1) (default: %d)</source>
+        <translation>Nastaví serializaci surových transakcí nebo bloků, jak jsou vraceny v méně povídavém módu: ne-segwit (0) nebo segwit (1) (výchozí: %d)</translation>
+    </message>
     <message>
         <source>Support filtering of blocks and transaction with bloom filters (default: %u)</source>
         <translation>Umožnit filtrování bloků a transakcí pomocí Bloomova filtru (výchozí: %u)</translation>
     </message>
+    <message>
+        <source>This is the transaction fee you may pay when fee estimates are not available.</source>
+        <translation>Toto je transakční poplatek, který se platí, pokud náhodou není k dispozici odhad poplatků.</translation>
+    </message>
+    <message>
+        <source>This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit %s and cryptographic software written by Eric Young and UPnP software written by Thomas Bernard.</source>
+        <translation>Tento produkt zahrnuje programy vyvinuté OpenSSL Projektem pro použití v OpenSSL Toolkitu %s a kryptografický program od Erika Younga a program UPnP od Thomase Bernarda.</translation>
+    </message>
     <message>
         <source>Total length of network version string (%i) exceeds maximum length (%i). Reduce the number or size of uacomments.</source>
         <translation>Celková délka síťového identifikačního řetězce (%i) překročila svůj horní limit (%i). Omez počet nebo velikost voleb uacomment.</translation>
@@ -2174,6 +3709,22 @@
         <source>Username and hashed password for JSON-RPC connections. The field &lt;userpw&gt; comes in the format: &lt;USERNAME&gt;:&lt;SALT&gt;$&lt;HASH&gt;. A canonical python script is included in share/rpcuser. This option can be specified multiple times</source>
         <translation>Uživatelské jméno a zahašované heslo pro JSON-RPC spojení. Pole &lt;userpw&gt; má formát: &lt;UŽIVATELSKÉ_JMÉNO&gt;:&lt;SŮL&gt;$&lt;HAŠ&gt;. Pomocný pythonní skript je přiložen v share/rpcuser. Tuto volbu lze použít i vícekrát</translation>
     </message>
+    <message>
+        <source>Warning: Unknown block versions being mined! It's possible unknown rules are in effect</source>
+        <translation>Upozornění: Síť těží neznámé verze bloků! Je možné, že jsou v platnosti neznámá pravidla</translation>
+    </message>
+    <message>
+        <source>Warning: Wallet file corrupt, data salvaged! Original %s saved as %s in %s; if your balance or transactions are incorrect you should restore from a backup.</source>
+        <translation>Upozornění: soubor s peněženkou je poškozený, data jsou však zachráněna! Původní soubor %s je uložený jako %s v %s. Pokud nejsou stav tvého účtu nebo transakce v pořádku, zřejmě bys měl obnovit zálohu.</translation>
+    </message>
+    <message>
+        <source>Whitelist peers connecting from the given IP address (e.g. 1.2.3.4) or CIDR notated network (e.g. 1.2.3.0/24). Can be specified multiple times.</source>
+        <translation>Vždy vítat protějšky připojující se z dané IP adresy (např. 1.2.3.4) či podsítě (CIDR zápis, např. 1.2.3.0/24). Lze zadat i vícekrát.</translation>
+    </message>
+    <message>
+        <source>%s is set very high!</source>
+        <translation>%s je nastaveno velmi vysoko!</translation>
+    </message>
     <message>
         <source>(default: %s)</source>
         <translation>(výchozí: %s)</translation>
@@ -2194,6 +3745,10 @@
         <source>Invalid -proxy address: '%s'</source>
         <translation>Neplatná -proxy adresa: '%s'</translation>
     </message>
+    <message>
+        <source>Keypool ran out, please call keypoolrefill first</source>
+        <translation>Vyčerpal se zásobník klíčů, zavolej prvně, prosím, keypoolrefill</translation>
+    </message>
     <message>
         <source>Listen for JSON-RPC connections on &lt;port&gt; (default: %u or testnet: %u)</source>
         <translation>Čekat na JSON-RPC spojení na &lt;portu&gt; (výchozí: %u nebo testnet: %u)</translation>
@@ -2230,13 +3785,17 @@
         <source>Relay non-P2SH multisig (default: %u)</source>
         <translation>Přeposílat ne-P2SH multisig (výchozí: %u)</translation>
     </message>
+    <message>
+        <source>Send transactions with full-RBF opt-in enabled (default: %u)</source>
+        <translation>Posílat transakce se zapnutým plným RBF (= replace-by-fee) (výchozí: %u)</translation>
+    </message>
     <message>
         <source>Set key pool size to &lt;n&gt; (default: %u)</source>
         <translation>Nastavit zásobník klíčů na velikost &lt;n&gt; (výchozí: %u)</translation>
     </message>
     <message>
-        <source>Set minimum block size in bytes (default: %u)</source>
-        <translation>Nastavit minimální velikost bloku v bajtech (výchozí: %u)</translation>
+        <source>Set maximum BIP141 block weight (default: %d)</source>
+        <translation>Nastavit maximální váhu bloku pro BIP141 (výchozí: %d)</translation>
     </message>
     <message>
         <source>Set the number of threads to service RPC calls (default: %d)</source>
@@ -2254,10 +3813,38 @@
         <source>Spend unconfirmed change when sending transactions (default: %u)</source>
         <translation>Utrácet i ještě nepotvrzené drobné při posílání transakcí (výchozí: %u)</translation>
     </message>
+    <message>
+        <source>Starting network threads...</source>
+        <translation>Spouštím síťová vlákna…</translation>
+    </message>
+    <message>
+        <source>The wallet will avoid paying less than the minimum relay fee.</source>
+        <translation>Peněženka zaručí přiložení poplatku alespoň ve výši minima pro přenos transakce.</translation>
+    </message>
+    <message>
+        <source>This is the minimum transaction fee you pay on every transaction.</source>
+        <translation>Toto je minimální poplatek, který zaplatíš za každou transakci.</translation>
+    </message>
+    <message>
+        <source>This is the transaction fee you will pay if you send a transaction.</source>
+        <translation>Toto je poplatek, který zaplatíš za každou poslanou transakci.</translation>
+    </message>
     <message>
         <source>Threshold for disconnecting misbehaving peers (default: %u)</source>
         <translation>Práh pro odpojování zlobivých protějšků (výchozí: %u)</translation>
     </message>
+    <message>
+        <source>Transaction amounts must not be negative</source>
+        <translation>Částky v transakci nemohou být záporné</translation>
+    </message>
+    <message>
+        <source>Transaction has too long of a mempool chain</source>
+        <translation>Transakce má v transakčním zásobníku příliš dlouhý řetězec</translation>
+    </message>
+    <message>
+        <source>Transaction must have at least one recipient</source>
+        <translation>Transakce musí mít alespoň jednoho příjemce</translation>
+    </message>
     <message>
         <source>Unknown network specified in -onlynet: '%s'</source>
         <translation>V -onlynet byla uvedena neznámá síť: '%s'</translation>
@@ -2288,7 +3875,7 @@
     </message>
     <message>
         <source>Rescanning...</source>
-        <translation>Přeskenovávám...</translation>
+        <translation>Přeskenovávám…</translation>
     </message>
     <message>
         <source>Done loading</source>
diff --git a/src/qt/locale/bitcoin_cs_CZ.ts b/src/qt/locale/bitcoin_cs_CZ.ts
deleted file mode 100644
index 70aa981f5036d..0000000000000
--- a/src/qt/locale/bitcoin_cs_CZ.ts
+++ /dev/null
@@ -1,300 +0,0 @@
-<TS language="cs_CZ" version="2.1">
-<context>
-    <name>AddressBookPage</name>
-    <message>
-        <source>Right-click to edit address or label</source>
-        <translation>Pravým klikem editujte adresu nebo popisek</translation>
-    </message>
-    <message>
-        <source>Create a new address</source>
-        <translation>Vytvořit novou adresu</translation>
-    </message>
-    <message>
-        <source>Copy the currently selected address to the system clipboard</source>
-        <translation>Kopírovat aktuálně vybrané adresy do schránky</translation>
-    </message>
-    <message>
-        <source>Delete the currently selected address from the list</source>
-        <translation>Odstraní aktuálně vybrané adresy ze seznamu</translation>
-    </message>
-    <message>
-        <source>Export the data in the current tab to a file</source>
-        <translation>Exportovat aktuální pohled do souboru</translation>
-    </message>
-    <message>
-        <source>&amp;Export</source>
-        <translation>&amp;Exportovat</translation>
-    </message>
-    <message>
-        <source>&amp;Delete</source>
-        <translation>&amp;Odstranit</translation>
-    </message>
-</context>
-<context>
-    <name>AskPassphraseDialog</name>
-    <message>
-        <source>Enter passphrase</source>
-        <translation>Zadej heslo</translation>
-    </message>
-    <message>
-        <source>New passphrase</source>
-        <translation>Nové heslo</translation>
-    </message>
-    <message>
-        <source>Repeat new passphrase</source>
-        <translation>Zopakujte nové heslo</translation>
-    </message>
-</context>
-<context>
-    <name>BanTableModel</name>
-    </context>
-<context>
-    <name>BitcoinGUI</name>
-    <message>
-        <source>Synchronizing with network...</source>
-        <translation>Synchronizuji se sítí...</translation>
-    </message>
-    <message>
-        <source>&amp;Overview</source>
-        <translation>&amp;Přehled</translation>
-    </message>
-    <message>
-        <source>Show general overview of wallet</source>
-        <translation>Zobrazit základní přehled o peněžence</translation>
-    </message>
-    <message>
-        <source>&amp;Transactions</source>
-        <translation>&amp;Transakce</translation>
-    </message>
-    <message>
-        <source>Browse transaction history</source>
-        <translation>Procházení historií transakcí</translation>
-    </message>
-    <message>
-        <source>Quit application</source>
-        <translation>Ukončit aplikaci</translation>
-    </message>
-    <message>
-        <source>&amp;Options...</source>
-        <translation>&amp;Možnosti...</translation>
-    </message>
-    <message>
-        <source>Change the passphrase used for wallet encryption</source>
-        <translation>Změnit heslo k šifrování peněženky</translation>
-    </message>
-    <message>
-        <source>Bitcoin</source>
-        <translation>Bitcoin</translation>
-    </message>
-    <message>
-        <source>&amp;File</source>
-        <translation>&amp;Soubor</translation>
-    </message>
-    <message>
-        <source>&amp;Settings</source>
-        <translation>&amp;Nastavení</translation>
-    </message>
-    <message>
-        <source>&amp;Help</source>
-        <translation>Nápo&amp;věda</translation>
-    </message>
-    <message>
-        <source>Tabs toolbar</source>
-        <translation>Panely</translation>
-    </message>
-    <message>
-        <source>Up to date</source>
-        <translation>Aktuální</translation>
-    </message>
-    <message>
-        <source>Catching up...</source>
-        <translation>Zachytávám...</translation>
-    </message>
-    <message>
-        <source>Sent transaction</source>
-        <translation>Odeslané transakce</translation>
-    </message>
-    <message>
-        <source>Incoming transaction</source>
-        <translation>Příchozí transakce</translation>
-    </message>
-    <message>
-        <source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;unlocked&lt;/b&gt;</source>
-        <translation>Peněženka je &lt;b&gt;zašifrována&lt;/b&gt; a momentálně &lt;b&gt;odemčená&lt;/b&gt;</translation>
-    </message>
-    <message>
-        <source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;locked&lt;/b&gt;</source>
-        <translation>Peněženka je &lt;b&gt;zašifrována&lt;/b&gt; a momentálně &lt;b&gt;uzamčená&lt;/b&gt;</translation>
-    </message>
-</context>
-<context>
-    <name>CoinControlDialog</name>
-    <message>
-        <source>Amount:</source>
-        <translation>Množství:</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation>Množství</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation>Datum</translation>
-    </message>
-    <message>
-        <source>Confirmed</source>
-        <translation>Potvrzeno</translation>
-    </message>
-    </context>
-<context>
-    <name>EditAddressDialog</name>
-    <message>
-        <source>Edit Address</source>
-        <translation>Upravit adresu</translation>
-    </message>
-    <message>
-        <source>&amp;Label</source>
-        <translation>&amp;Popisek</translation>
-    </message>
-    <message>
-        <source>&amp;Address</source>
-        <translation>&amp;Adresa</translation>
-    </message>
-</context>
-<context>
-    <name>FreespaceChecker</name>
-    </context>
-<context>
-    <name>HelpMessageDialog</name>
-    <message>
-        <source>Usage:</source>
-        <translation>Použití:</translation>
-    </message>
-    </context>
-<context>
-    <name>Intro</name>
-    </context>
-<context>
-    <name>OpenURIDialog</name>
-    </context>
-<context>
-    <name>OptionsDialog</name>
-    <message>
-        <source>Options</source>
-        <translation>Možnosti</translation>
-    </message>
-    <message>
-        <source>Map port using &amp;UPnP</source>
-        <translation>Mapovat port pomocí &amp;UPnP</translation>
-    </message>
-    <message>
-        <source>&amp;Minimize to the tray instead of the taskbar</source>
-        <translation>&amp;Minimalizovat do systémové lišty (tray) namísto do hlavního panelu</translation>
-    </message>
-    <message>
-        <source>M&amp;inimize on close</source>
-        <translation>M&amp;inimalizovat při zavření</translation>
-    </message>
-    </context>
-<context>
-    <name>OverviewPage</name>
-    </context>
-<context>
-    <name>PeerTableModel</name>
-    </context>
-<context>
-    <name>QObject</name>
-    <message>
-        <source>Amount</source>
-        <translation>Množství</translation>
-    </message>
-    </context>
-<context>
-    <name>RPCConsole</name>
-    <message>
-        <source>Name</source>
-        <translation>Jméno</translation>
-    </message>
-    </context>
-<context>
-    <name>ReceiveCoinsDialog</name>
-    <message>
-        <source>&amp;Label:</source>
-        <translation>&amp;Popisek:</translation>
-    </message>
-    <message>
-        <source>&amp;Message:</source>
-        <translation>Zpráva:</translation>
-    </message>
-    </context>
-<context>
-    <name>ReceiveRequestDialog</name>
-    </context>
-<context>
-    <name>SendCoinsDialog</name>
-    <message>
-        <source>Amount:</source>
-        <translation>Množství:</translation>
-    </message>
-    <message>
-        <source>Balance:</source>
-        <translation>Zůstatek:</translation>
-    </message>
-    </context>
-<context>
-    <name>SendCoinsEntry</name>
-    <message>
-        <source>&amp;Label:</source>
-        <translation>&amp;Popisek:</translation>
-    </message>
-    <message>
-        <source>Message:</source>
-        <translation>Zpráva:</translation>
-    </message>
-    </context>
-<context>
-    <name>ShutdownWindow</name>
-    </context>
-<context>
-    <name>SignVerifyMessageDialog</name>
-    </context>
-<context>
-    <name>SplashScreen</name>
-    <message>
-        <source>[testnet]</source>
-        <translation>[testnet]</translation>
-    </message>
-</context>
-<context>
-    <name>TrafficGraphWidget</name>
-    </context>
-<context>
-    <name>TransactionDescDialog</name>
-    <message>
-        <source>This pane shows a detailed description of the transaction</source>
-        <translation>Toto podokno zobrazuje detailní popis transakce</translation>
-    </message>
-</context>
-<context>
-    <name>UnitDisplayStatusBarControl</name>
-    </context>
-<context>
-    <name>bitcoin-core</name>
-    <message>
-        <source>Options:</source>
-        <translation>Možnosti:</translation>
-    </message>
-    <message>
-        <source>Loading addresses...</source>
-        <translation>Načítání adres...</translation>
-    </message>
-    <message>
-        <source>Loading wallet...</source>
-        <translation>Načítání peněženky...</translation>
-    </message>
-    <message>
-        <source>Done loading</source>
-        <translation>Načítání dokončeno</translation>
-    </message>
-    </context>
-</TS>
\ No newline at end of file
diff --git a/src/qt/locale/bitcoin_cy.ts b/src/qt/locale/bitcoin_cy.ts
index 38bc45775bc1a..9f2d87b6061f8 100644
--- a/src/qt/locale/bitcoin_cy.ts
+++ b/src/qt/locale/bitcoin_cy.ts
@@ -29,7 +29,10 @@
         <source>&amp;Delete</source>
         <translation>&amp;Dileu</translation>
     </message>
-</context>
+    </context>
+<context>
+    <name>AddressTableModel</name>
+    </context>
 <context>
     <name>AskPassphraseDialog</name>
     <message>
@@ -44,7 +47,7 @@
         <source>Repeat new passphrase</source>
         <translation>Ailadroddwch gyfrinymadrodd newydd</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>BanTableModel</name>
     </context>
@@ -146,26 +149,6 @@
         <source>Tabs toolbar</source>
         <translation>Bar offer tabiau</translation>
     </message>
-    <message numerus="yes">
-        <source>%n hour(s)</source>
-        <translation><numerusform>%n awr</numerusform><numerusform>%n awr</numerusform><numerusform>%n awr</numerusform><numerusform>%n awr</numerusform></translation>
-    </message>
-    <message numerus="yes">
-        <source>%n day(s)</source>
-        <translation><numerusform>%n dydd</numerusform><numerusform>%n dydd</numerusform><numerusform>%n dydd</numerusform><numerusform>%n dydd</numerusform></translation>
-    </message>
-    <message numerus="yes">
-        <source>%n week(s)</source>
-        <translation><numerusform>%n wythnos</numerusform><numerusform>%n wythnos</numerusform><numerusform>%n wythnos</numerusform><numerusform>%n wythnos</numerusform></translation>
-    </message>
-    <message>
-        <source>%1 and %2</source>
-        <translation>%1 a %2</translation>
-    </message>
-    <message numerus="yes">
-        <source>%n year(s)</source>
-        <translation><numerusform>%n blwydd</numerusform><numerusform>%n blwydd</numerusform><numerusform>%n blwydd</numerusform><numerusform>%n blwydd</numerusform></translation>
-    </message>
     <message>
         <source>Error</source>
         <translation>Gwall</translation>
@@ -226,7 +209,7 @@
         <source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;locked&lt;/b&gt;</source>
         <translation>Mae'r waled &lt;b&gt;wedi'i amgryptio&lt;/b&gt; ac &lt;b&gt;ar glo&lt;/b&gt; ar hyn o bryd</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>CoinControlDialog</name>
     <message>
@@ -252,7 +235,7 @@
         <source>&amp;Address</source>
         <translation>&amp;Cyfeiriad</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>FreespaceChecker</name>
     <message>
@@ -278,6 +261,13 @@
         <translation>Gwall</translation>
     </message>
     </context>
+<context>
+    <name>ModalOverlay</name>
+    <message>
+        <source>Form</source>
+        <translation>Ffurflen</translation>
+    </message>
+    </context>
 <context>
     <name>OpenURIDialog</name>
     <message>
@@ -331,11 +321,24 @@
         <translation>Ffurflen</translation>
     </message>
     </context>
+<context>
+    <name>PaymentServer</name>
+    </context>
 <context>
     <name>PeerTableModel</name>
     </context>
 <context>
     <name>QObject</name>
+    <message>
+        <source>%1 and %2</source>
+        <translation>%1 a %2</translation>
+    </message>
+    </context>
+<context>
+    <name>QObject::QObject</name>
+    </context>
+<context>
+    <name>QRImageWidget</name>
     </context>
 <context>
     <name>RPCConsole</name>
@@ -366,6 +369,9 @@
         <translation>&amp;Cyfeiriad Copi</translation>
     </message>
     </context>
+<context>
+    <name>RecentRequestsTableModel</name>
+    </context>
 <context>
     <name>SendCoinsDialog</name>
     <message>
@@ -416,6 +422,9 @@
         <translation>Neges:</translation>
     </message>
     </context>
+<context>
+    <name>SendConfirmationDialog</name>
+    </context>
 <context>
     <name>ShutdownWindow</name>
     </context>
@@ -444,12 +453,30 @@
 <context>
     <name>TrafficGraphWidget</name>
     </context>
+<context>
+    <name>TransactionDesc</name>
+    </context>
 <context>
     <name>TransactionDescDialog</name>
     </context>
+<context>
+    <name>TransactionTableModel</name>
+    </context>
+<context>
+    <name>TransactionView</name>
+    </context>
 <context>
     <name>UnitDisplayStatusBarControl</name>
     </context>
+<context>
+    <name>WalletFrame</name>
+    </context>
+<context>
+    <name>WalletModel</name>
+    </context>
+<context>
+    <name>WalletView</name>
+    </context>
 <context>
     <name>bitcoin-core</name>
     <message>
diff --git a/src/qt/locale/bitcoin_da.ts b/src/qt/locale/bitcoin_da.ts
index d298c81bd453d..9fc52efe57c53 100644
--- a/src/qt/locale/bitcoin_da.ts
+++ b/src/qt/locale/bitcoin_da.ts
@@ -41,6 +41,77 @@
         <source>&amp;Delete</source>
         <translation>&amp;Slet</translation>
     </message>
+    <message>
+        <source>Choose the address to send coins to</source>
+        <translation>Vælg adresse at sende bitcoins til</translation>
+    </message>
+    <message>
+        <source>Choose the address to receive coins with</source>
+        <translation>Vælg adresse at modtage bitcoins med</translation>
+    </message>
+    <message>
+        <source>C&amp;hoose</source>
+        <translation>&amp;Vælg</translation>
+    </message>
+    <message>
+        <source>Sending addresses</source>
+        <translation>Afsendelsesadresser</translation>
+    </message>
+    <message>
+        <source>Receiving addresses</source>
+        <translation>Modtagelsesadresser</translation>
+    </message>
+    <message>
+        <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source>
+        <translation>Disse er dine Bitcoin-adresser til afsendelse af betalinger. Tjek altid beløb og modtagelsesadresse, inden du sender bitcoins.</translation>
+    </message>
+    <message>
+        <source>These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source>
+        <translation>Dette er dine Bitcoin-adresser til modtagelse af betalinger. Det anbefales at bruge en ny modtagelsesadresse for hver transaktion.</translation>
+    </message>
+    <message>
+        <source>&amp;Copy Address</source>
+        <translation>&amp;Kopiér adresse</translation>
+    </message>
+    <message>
+        <source>Copy &amp;Label</source>
+        <translation>Kopiér &amp;mærkat</translation>
+    </message>
+    <message>
+        <source>&amp;Edit</source>
+        <translation>&amp;Redigér</translation>
+    </message>
+    <message>
+        <source>Export Address List</source>
+        <translation>Eksportér adresseliste</translation>
+    </message>
+    <message>
+        <source>Comma separated file (*.csv)</source>
+        <translation>Kommasepareret fil (*.csv)</translation>
+    </message>
+    <message>
+        <source>Exporting Failed</source>
+        <translation>Eksport mislykkedes</translation>
+    </message>
+    <message>
+        <source>There was an error trying to save the address list to %1. Please try again.</source>
+        <translation>Der opstod en fejl under gemning af adresselisten til %1. Prøv venligst igen.</translation>
+    </message>
+</context>
+<context>
+    <name>AddressTableModel</name>
+    <message>
+        <source>Label</source>
+        <translation>Mærkat</translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation>Adresse</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(ingen mærkat)</translation>
+    </message>
 </context>
 <context>
     <name>AskPassphraseDialog</name>
@@ -60,6 +131,94 @@
         <source>Repeat new passphrase</source>
         <translation>Gentag ny adgangskode</translation>
     </message>
+    <message>
+        <source>Enter the new passphrase to the wallet.&lt;br/&gt;Please use a passphrase of &lt;b&gt;ten or more random characters&lt;/b&gt;, or &lt;b&gt;eight or more words&lt;/b&gt;.</source>
+        <translation>Indtast det nye kodeord til tegnebogen.&lt;br/&gt;Brug venligst et kodeord på &lt;b&gt;ti eller flere tilfældige tegn&lt;/b&gt; eller &lt;b&gt;otte eller flere ord&lt;/b&gt;.</translation>
+    </message>
+    <message>
+        <source>Encrypt wallet</source>
+        <translation>Kryptér tegnebog</translation>
+    </message>
+    <message>
+        <source>This operation needs your wallet passphrase to unlock the wallet.</source>
+        <translation>Denne funktion har brug for din tegnebogs adgangskode for at låse tegnebogen op.</translation>
+    </message>
+    <message>
+        <source>Unlock wallet</source>
+        <translation>Lås tegnebog op</translation>
+    </message>
+    <message>
+        <source>This operation needs your wallet passphrase to decrypt the wallet.</source>
+        <translation>Denne funktion har brug for din tegnebogs adgangskode for at dekryptere tegnebogen.</translation>
+    </message>
+    <message>
+        <source>Decrypt wallet</source>
+        <translation>Dekryptér tegnebog</translation>
+    </message>
+    <message>
+        <source>Change passphrase</source>
+        <translation>Skift adgangskode</translation>
+    </message>
+    <message>
+        <source>Enter the old passphrase and new passphrase to the wallet.</source>
+        <translation>Indtast den gamle adgangskode og en ny adgangskode til tegnebogen.</translation>
+    </message>
+    <message>
+        <source>Confirm wallet encryption</source>
+        <translation>Bekræft tegnebogskryptering</translation>
+    </message>
+    <message>
+        <source>Warning: If you encrypt your wallet and lose your passphrase, you will &lt;b&gt;LOSE ALL OF YOUR BITCOINS&lt;/b&gt;!</source>
+        <translation>Advarsel: Hvis du krypterer din tegnebog og mister din adgangskode, vil du &lt;b&gt;MISTE ALLE DINE BITCOINS&lt;/b&gt;!</translation>
+    </message>
+    <message>
+        <source>Are you sure you wish to encrypt your wallet?</source>
+        <translation>Er du sikker på, at du ønsker at kryptere din tegnebog?</translation>
+    </message>
+    <message>
+        <source>Wallet encrypted</source>
+        <translation>Tegnebog krypteret</translation>
+    </message>
+    <message>
+        <source>%1 will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source>
+        <translation>%1 vil nu lukke for at færdiggøre krypteringsprocessen. Husk at kryptering af din tegnebog kan ikke beskytte dine bitcoin fuldt ud mod at blive stjålet af eventuel malware, der måtte have inficeret din computer.</translation>
+    </message>
+    <message>
+        <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source>
+        <translation>VIGTIGT: Enhver tidligere sikkerhedskopi, som du har lavet af tegnebogsfilen, bør blive erstattet af den nyligt genererede, krypterede tegnebogsfil. Af sikkerhedsmæssige årsager vil tidligere sikkerhedskopier af den ikke-krypterede tegnebogsfil blive ubrugelige i det øjeblik, du starter med at anvende den nye, krypterede tegnebog.</translation>
+    </message>
+    <message>
+        <source>Wallet encryption failed</source>
+        <translation>Tegnebogskryptering mislykkedes</translation>
+    </message>
+    <message>
+        <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
+        <translation>Tegnebogskryptering mislykkedes på grund af en intern fejl. Din tegnebog blev ikke krypteret.</translation>
+    </message>
+    <message>
+        <source>The supplied passphrases do not match.</source>
+        <translation>De angivne adgangskoder stemmer ikke overens.</translation>
+    </message>
+    <message>
+        <source>Wallet unlock failed</source>
+        <translation>Tegnebogsoplåsning mislykkedes</translation>
+    </message>
+    <message>
+        <source>The passphrase entered for the wallet decryption was incorrect.</source>
+        <translation>Den angivne adgangskode for tegnebogsdekrypteringen er forkert.</translation>
+    </message>
+    <message>
+        <source>Wallet decryption failed</source>
+        <translation>Tegnebogsdekryptering mislykkedes</translation>
+    </message>
+    <message>
+        <source>Wallet passphrase was successfully changed.</source>
+        <translation>Tegnebogens adgangskode blev ændret.</translation>
+    </message>
+    <message>
+        <source>Warning: The Caps Lock key is on!</source>
+        <translation>Advarsel: Caps Lock-tasten er aktiveret!</translation>
+    </message>
 </context>
 <context>
     <name>BanTableModel</name>
@@ -76,7 +235,7 @@
     <name>BitcoinGUI</name>
     <message>
         <source>Sign &amp;message...</source>
-        <translation>Underskriv &amp;besked…</translation>
+        <translation>Signér &amp;besked…</translation>
     </message>
     <message>
         <source>Synchronizing with network...</source>
@@ -158,6 +317,18 @@
         <source>Open &amp;URI...</source>
         <translation>&amp;Åbn URI…</translation>
     </message>
+    <message>
+        <source>Click to disable network activity.</source>
+        <translation>Klik for at deaktivere netværksaktivitet.</translation>
+    </message>
+    <message>
+        <source>Network activity disabled.</source>
+        <translation>Netværksaktivitet deaktiveret.</translation>
+    </message>
+    <message>
+        <source>Click to enable network activity again.</source>
+        <translation>Klik for a aktivere netværksaktivitet igen.</translation>
+    </message>
     <message>
         <source>Reindexing blocks on disk...</source>
         <translation>Genindekserer blokke på disken…</translation>
@@ -216,11 +387,11 @@
     </message>
     <message>
         <source>Sign messages with your Bitcoin addresses to prove you own them</source>
-        <translation>Underskriv beskeder med dine Bitcoin-adresser for at bevise, at de tilhører dig</translation>
+        <translation>Signér beskeder med dine Bitcoin-adresser for at bevise, at de tilhører dig</translation>
     </message>
     <message>
         <source>Verify messages to ensure they were signed with specified Bitcoin addresses</source>
-        <translation>Verificér beskeder for at sikre, at de er underskrevet med de angivne Bitcoin-adresser</translation>
+        <translation>Verificér beskeder for at sikre, at de er signeret med de angivne Bitcoin-adresser</translation>
     </message>
     <message>
         <source>&amp;File</source>
@@ -240,7 +411,7 @@
     </message>
     <message>
         <source>Request payments (generates QR codes and bitcoin: URIs)</source>
-        <translation>Anmod om betalinger (genererer QR-koder og "bitcoin:"-URI'er)</translation>
+        <translation>Anmod om betalinger (genererer QR-koder og “bitcoin:”-URI'er)</translation>
     </message>
     <message>
         <source>Show the list of used sending addresses and labels</source>
@@ -252,7 +423,7 @@
     </message>
     <message>
         <source>Open a bitcoin: URI or payment request</source>
-        <translation>Åbn en "bitcoin:"-URI eller betalingsanmodning</translation>
+        <translation>Åbn en “bitcoin:”-URI eller betalingsanmodning</translation>
     </message>
     <message>
         <source>&amp;Command-line options</source>
@@ -278,26 +449,6 @@
         <source>Processed %n block(s) of transaction history.</source>
         <translation><numerusform>Bearbejdede %n blok med transaktionshistorik.</numerusform><numerusform>Bearbejdede %n blokke med transaktionshistorik.</numerusform></translation>
     </message>
-    <message numerus="yes">
-        <source>%n hour(s)</source>
-        <translation><numerusform>%n time</numerusform><numerusform>%n timer</numerusform></translation>
-    </message>
-    <message numerus="yes">
-        <source>%n day(s)</source>
-        <translation><numerusform>%n dag</numerusform><numerusform>%n dage</numerusform></translation>
-    </message>
-    <message numerus="yes">
-        <source>%n week(s)</source>
-        <translation><numerusform>%n uge</numerusform><numerusform>%n uger</numerusform></translation>
-    </message>
-    <message>
-        <source>%1 and %2</source>
-        <translation>%1 og %2</translation>
-    </message>
-    <message numerus="yes">
-        <source>%n year(s)</source>
-        <translation><numerusform>%n år</numerusform><numerusform>%n år</numerusform></translation>
-    </message>
     <message>
         <source>%1 behind</source>
         <translation>%1 bagud</translation>
@@ -376,6 +527,14 @@
         <source>Incoming transaction</source>
         <translation>Indgående transaktion</translation>
     </message>
+    <message>
+        <source>HD key generation is &lt;b&gt;enabled&lt;/b&gt;</source>
+        <translation>Generering af HD-nøgler er &lt;b&gt;aktiveret&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <source>HD key generation is &lt;b&gt;disabled&lt;/b&gt;</source>
+        <translation>Generering af HD-nøgler er &lt;b&gt;deaktiveret&lt;/b&gt;</translation>
+    </message>
     <message>
         <source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;unlocked&lt;/b&gt;</source>
         <translation>Tegnebog er &lt;b&gt;krypteret&lt;/b&gt; og i øjeblikket &lt;b&gt;ulåst&lt;/b&gt;</translation>
@@ -384,6 +543,10 @@
         <source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;locked&lt;/b&gt;</source>
         <translation>Tegnebog er &lt;b&gt;krypteret&lt;/b&gt; og i øjeblikket &lt;b&gt;låst&lt;/b&gt;</translation>
     </message>
+    <message>
+        <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source>
+        <translation>Der opstod en fatal fejl. Bitcoin kan ikke længere fortsætte sikkert og vil afslutte.</translation>
+    </message>
 </context>
 <context>
     <name>CoinControlDialog</name>
@@ -403,10 +566,6 @@
         <source>Amount:</source>
         <translation>Beløb:</translation>
     </message>
-    <message>
-        <source>Priority:</source>
-        <translation>Prioritet:</translation>
-    </message>
     <message>
         <source>Fee:</source>
         <translation>Gebyr:</translation>
@@ -460,8 +619,84 @@
         <translation>Bekræftet</translation>
     </message>
     <message>
-        <source>Priority</source>
-        <translation>Prioritet</translation>
+        <source>Copy address</source>
+        <translation>Kopiér adresse</translation>
+    </message>
+    <message>
+        <source>Copy label</source>
+        <translation>Kopiér mærkat</translation>
+    </message>
+    <message>
+        <source>Copy amount</source>
+        <translation>Kopiér beløb</translation>
+    </message>
+    <message>
+        <source>Copy transaction ID</source>
+        <translation>Kopiér transaktions-ID</translation>
+    </message>
+    <message>
+        <source>Lock unspent</source>
+        <translation>Fastlås ubrugte</translation>
+    </message>
+    <message>
+        <source>Unlock unspent</source>
+        <translation>Lås ubrugte op</translation>
+    </message>
+    <message>
+        <source>Copy quantity</source>
+        <translation>Kopiér mængde</translation>
+    </message>
+    <message>
+        <source>Copy fee</source>
+        <translation>Kopiér gebyr</translation>
+    </message>
+    <message>
+        <source>Copy after fee</source>
+        <translation>Kopiér eftergebyr</translation>
+    </message>
+    <message>
+        <source>Copy bytes</source>
+        <translation>Kopiér byte</translation>
+    </message>
+    <message>
+        <source>Copy dust</source>
+        <translation>Kopiér støv</translation>
+    </message>
+    <message>
+        <source>Copy change</source>
+        <translation>Kopiér byttepenge</translation>
+    </message>
+    <message>
+        <source>(%1 locked)</source>
+        <translation>(%1 fastlåst)</translation>
+    </message>
+    <message>
+        <source>yes</source>
+        <translation>ja</translation>
+    </message>
+    <message>
+        <source>no</source>
+        <translation>nej</translation>
+    </message>
+    <message>
+        <source>This label turns red if any recipient receives an amount smaller than the current dust threshold.</source>
+        <translation>Denne mærkat bliver rød, hvis en eller flere modtagere modtager et beløb, der er mindre end den aktuelle støvgrænse.</translation>
+    </message>
+    <message>
+        <source>Can vary +/- %1 satoshi(s) per input.</source>
+        <translation>Kan variere med ±%1 satoshi per input.</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(ingen mærkat)</translation>
+    </message>
+    <message>
+        <source>change from %1 (%2)</source>
+        <translation>byttepenge fra %1 (%2)</translation>
+    </message>
+    <message>
+        <source>(change)</source>
+        <translation>(byttepange)</translation>
     </message>
 </context>
 <context>
@@ -486,6 +721,38 @@
         <source>&amp;Address</source>
         <translation>&amp;Adresse</translation>
     </message>
+    <message>
+        <source>New receiving address</source>
+        <translation>Ny modtagelsesadresse</translation>
+    </message>
+    <message>
+        <source>New sending address</source>
+        <translation>Ny afsendelsesadresse</translation>
+    </message>
+    <message>
+        <source>Edit receiving address</source>
+        <translation>Redigér modtagelsesadresse</translation>
+    </message>
+    <message>
+        <source>Edit sending address</source>
+        <translation>Redigér afsendelsesadresse</translation>
+    </message>
+    <message>
+        <source>The entered address "%1" is not a valid Bitcoin address.</source>
+        <translation>Den indtastede adresse “%1” er ikke en gyldig Bitcoin-adresse.</translation>
+    </message>
+    <message>
+        <source>The entered address "%1" is already in the address book.</source>
+        <translation>Den indtastede adresse “%1” er allerede i adressebogen.</translation>
+    </message>
+    <message>
+        <source>Could not unlock wallet.</source>
+        <translation>Kunne ikke låse tegnebog op.</translation>
+    </message>
+    <message>
+        <source>New key generation failed.</source>
+        <translation>Ny nøglegenerering mislykkedes.</translation>
+    </message>
 </context>
 <context>
     <name>FreespaceChecker</name>
@@ -546,7 +813,7 @@
     </message>
     <message>
         <source>Set language, for example "de_DE" (default: system locale)</source>
-        <translation>Vælg sprog; fx "da_DK" (standard: systemsprog)</translation>
+        <translation>Vælg sprog; fx “da_DK” (standard: systemsprog)</translation>
     </message>
     <message>
         <source>Start minimized</source>
@@ -593,7 +860,7 @@
     </message>
     <message>
         <source>Error: Specified data directory "%1" cannot be created.</source>
-        <translation>Fejl: Angivet datamappe "%1" kan ikke oprettes.</translation>
+        <translation>Fejl: Angivet datamappe “%1” kan ikke oprettes.</translation>
     </message>
     <message>
         <source>Error</source>
@@ -605,7 +872,58 @@
     </message>
     <message numerus="yes">
         <source>(of %n GB needed)</source>
-        <translation><numerusform>(ud af %n GB behøvet)</numerusform><numerusform>(ud af %n GB behøvet)</numerusform></translation>
+        <translation><numerusform>(ud af %n GB nødvendig)</numerusform><numerusform>(ud af %n GB nødvendig)</numerusform></translation>
+    </message>
+</context>
+<context>
+    <name>ModalOverlay</name>
+    <message>
+        <source>Form</source>
+        <translation>Formular</translation>
+    </message>
+    <message>
+        <source>Recent transactions may not yet be visible, and therefore your wallet's balance might be incorrect. This information will be correct once your wallet has finished synchronizing with the bitcoin network, as detailed below.</source>
+        <translation>Nylige transaktioner er måske ikke synlige endnu, og derfor kan din tegnebogs saldo være ukorrekt. Denne information vil være korrekt, når din tegnebog er færdig med at synkronisere med bitcoin-netværket, som detaljerne herunder viser.</translation>
+    </message>
+    <message>
+        <source>Attempting to spend bitcoins that are affected by not-yet-displayed transactions will not be accepted by the network.</source>
+        <translation>Forsøg på at bruge bitcoin, som er indeholdt i endnu-ikke-viste transaktioner, accepteres ikke af netværket.</translation>
+    </message>
+    <message>
+        <source>Number of blocks left</source>
+        <translation>Antal blokke tilbage</translation>
+    </message>
+    <message>
+        <source>Unknown...</source>
+        <translation>Ukendt…</translation>
+    </message>
+    <message>
+        <source>Last block time</source>
+        <translation>Tidsstempel for seneste blok</translation>
+    </message>
+    <message>
+        <source>Progress</source>
+        <translation>Fremgang</translation>
+    </message>
+    <message>
+        <source>Progress increase per hour</source>
+        <translation>Øgning af fremgang pr. time</translation>
+    </message>
+    <message>
+        <source>calculating...</source>
+        <translation>beregner…</translation>
+    </message>
+    <message>
+        <source>Estimated time left until synced</source>
+        <translation>Estimeret tid tilbage af synkronisering</translation>
+    </message>
+    <message>
+        <source>Hide</source>
+        <translation>Skjul</translation>
+    </message>
+    <message>
+        <source>Unknown. Syncing Headers (%1)...</source>
+        <translation>Ukendt. Synkroniserer hoveder (%1)…</translation>
     </message>
 </context>
 <context>
@@ -626,6 +944,10 @@
         <source>Select payment request file</source>
         <translation>Vælg fil for betalingsanmodning</translation>
     </message>
+    <message>
+        <source>Select payment request file to open</source>
+        <translation>Vælg fil for betalingsanmodning til åbning</translation>
+    </message>
 </context>
 <context>
     <name>OptionsDialog</name>
@@ -715,7 +1037,7 @@
     </message>
     <message>
         <source>If you disable the spending of unconfirmed change, the change from a transaction cannot be used until that transaction has at least one confirmation. This also affects how your balance is computed.</source>
-        <translation>Hvis du slår brug af ubekræftede byttepenge fra, kan byttepengene fra en transaktion ikke bruges, før pågældende transaktion har mindst én bekræftelse. Dette påvirker også måden hvorpå din saldo beregnes.</translation>
+        <translation>Hvis du deaktiverer brug af ubekræftede byttepenge, kan byttepengene fra en transaktion ikke bruges, før pågældende transaktion har mindst én bekræftelse. Dette påvirker også måden hvorpå din saldo beregnes.</translation>
     </message>
     <message>
         <source>&amp;Spend unconfirmed change</source>
@@ -937,6 +1259,97 @@
         <translation>Nuværende totalsaldo på kigge-adresser</translation>
     </message>
 </context>
+<context>
+    <name>PaymentServer</name>
+    <message>
+        <source>Payment request error</source>
+        <translation>Fejl i betalingsanmodning</translation>
+    </message>
+    <message>
+        <source>Cannot start bitcoin: click-to-pay handler</source>
+        <translation>Kan ikke starte bitcoin: click-to-pay-håndtering</translation>
+    </message>
+    <message>
+        <source>URI handling</source>
+        <translation>URI-håndtering</translation>
+    </message>
+    <message>
+        <source>Payment request fetch URL is invalid: %1</source>
+        <translation>Hentnings-URL for betalingsanmodning er ugyldig: %1</translation>
+    </message>
+    <message>
+        <source>Invalid payment address %1</source>
+        <translation>Ugyldig betalingsadresse %1</translation>
+    </message>
+    <message>
+        <source>URI cannot be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source>
+        <translation>URI kan ikke tolkes! Dette kan skyldes en ugyldig Bitcoin-adresse eller forkert udformede URL-parametre.</translation>
+    </message>
+    <message>
+        <source>Payment request file handling</source>
+        <translation>Filhåndtering for betalingsanmodninger</translation>
+    </message>
+    <message>
+        <source>Payment request file cannot be read! This can be caused by an invalid payment request file.</source>
+        <translation>Fil for betalingsanmodning kan ikke læses! Dette kan skyldes en ugyldig fil for betalingsanmodning.</translation>
+    </message>
+    <message>
+        <source>Payment request rejected</source>
+        <translation>Betalingsanmodning afvist</translation>
+    </message>
+    <message>
+        <source>Payment request network doesn't match client network.</source>
+        <translation>Netværk for betalingsanmodning stemmer ikke overens med klientens netværk.</translation>
+    </message>
+    <message>
+        <source>Payment request expired.</source>
+        <translation>Betalingsanmodning er udløbet.</translation>
+    </message>
+    <message>
+        <source>Payment request is not initialized.</source>
+        <translation>Betalingsanmodning er ikke klargjort.</translation>
+    </message>
+    <message>
+        <source>Unverified payment requests to custom payment scripts are unsupported.</source>
+        <translation>Ikke-verificerede betalingsanmodninger for tilpassede betalings-scripts understøttes ikke.</translation>
+    </message>
+    <message>
+        <source>Invalid payment request.</source>
+        <translation>Ugyldig betalingsanmodning.</translation>
+    </message>
+    <message>
+        <source>Requested payment amount of %1 is too small (considered dust).</source>
+        <translation>Anmodet betalingsbeløb på %1 er for lille (regnes som støv).</translation>
+    </message>
+    <message>
+        <source>Refund from %1</source>
+        <translation>Tilbagebetaling fra %1</translation>
+    </message>
+    <message>
+        <source>Payment request %1 is too large (%2 bytes, allowed %3 bytes).</source>
+        <translation>Betalingsanmodning %1 er for stor (%2 byte; %3 byte tilladt).</translation>
+    </message>
+    <message>
+        <source>Error communicating with %1: %2</source>
+        <translation>Fejl under kommunikation med %1: %2</translation>
+    </message>
+    <message>
+        <source>Payment request cannot be parsed!</source>
+        <translation>Betalingsanmodning kan ikke tolkes!</translation>
+    </message>
+    <message>
+        <source>Bad response from server %1</source>
+        <translation>Fejlagtigt svar fra server %1</translation>
+    </message>
+    <message>
+        <source>Network request error</source>
+        <translation>Fejl i netværksforespørgsel</translation>
+    </message>
+    <message>
+        <source>Payment acknowledged</source>
+        <translation>Betaling anerkendt</translation>
+    </message>
+</context>
 <context>
     <name>PeerTableModel</name>
     <message>
@@ -948,8 +1361,12 @@
         <translation>Knude/tjeneste</translation>
     </message>
     <message>
-        <source>Ping Time</source>
-        <translation>Ping-tid</translation>
+        <source>NodeId</source>
+        <translation>Knude-id</translation>
+    </message>
+    <message>
+        <source>Ping</source>
+        <translation>Ping</translation>
     </message>
 </context>
 <context>
@@ -990,10 +1407,76 @@
         <source>%1 ms</source>
         <translation>%1 ms</translation>
     </message>
-</context>
-<context>
-    <name>RPCConsole</name>
-    <message>
+    <message numerus="yes">
+        <source>%n second(s)</source>
+        <translation><numerusform>%n sekund</numerusform><numerusform>%n sekunder</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%n minute(s)</source>
+        <translation><numerusform>%n minut</numerusform><numerusform>%n minutter</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%n hour(s)</source>
+        <translation><numerusform>%n time</numerusform><numerusform>%n timer</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%n day(s)</source>
+        <translation><numerusform>%n dag</numerusform><numerusform>%n dage</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%n week(s)</source>
+        <translation><numerusform>%n uge</numerusform><numerusform>%n uger</numerusform></translation>
+    </message>
+    <message>
+        <source>%1 and %2</source>
+        <translation>%1 og %2</translation>
+    </message>
+    <message numerus="yes">
+        <source>%n year(s)</source>
+        <translation><numerusform>%n år</numerusform><numerusform>%n år</numerusform></translation>
+    </message>
+    <message>
+        <source>%1 didn't yet exit safely...</source>
+        <translation>%1 har endnu ikke afsluttet på sikker vis…</translation>
+    </message>
+</context>
+<context>
+    <name>QObject::QObject</name>
+    <message>
+        <source>Error: Specified data directory "%1" does not exist.</source>
+        <translation>Fejl: Angivet datamappe “%1” eksisterer ikke.</translation>
+    </message>
+    <message>
+        <source>Error: Cannot parse configuration file: %1. Only use key=value syntax.</source>
+        <translation>Fejl: Kan ikke fortolke konfigurationsfil: %1. Brug kun syntaksen nøgle=værdi.</translation>
+    </message>
+    <message>
+        <source>Error: %1</source>
+        <translation>Fejl: %1</translation>
+    </message>
+</context>
+<context>
+    <name>QRImageWidget</name>
+    <message>
+        <source>&amp;Save Image...</source>
+        <translation>Gem billede…</translation>
+    </message>
+    <message>
+        <source>&amp;Copy Image</source>
+        <translation>&amp;Kopiér foto</translation>
+    </message>
+    <message>
+        <source>Save QR Code</source>
+        <translation>Gem QR-kode</translation>
+    </message>
+    <message>
+        <source>PNG Image (*.png)</source>
+        <translation>PNG-billede (*.png)</translation>
+    </message>
+</context>
+<context>
+    <name>RPCConsole</name>
+    <message>
         <source>N/A</source>
         <translation>N/A</translation>
     </message>
@@ -1149,6 +1632,10 @@
         <source>Ping Wait</source>
         <translation>Ping-ventetid</translation>
     </message>
+    <message>
+        <source>Min Ping</source>
+        <translation>Minimum ping</translation>
+    </message>
     <message>
         <source>Time Offset</source>
         <translation>Tidsforskydning</translation>
@@ -1193,14 +1680,6 @@
         <source>Clear console</source>
         <translation>Ryd konsol</translation>
     </message>
-    <message>
-        <source>&amp;Disconnect Node</source>
-        <translation>&amp;Afbryd forbindelse til knude</translation>
-    </message>
-    <message>
-        <source>Ban Node for</source>
-        <translation>Bandlys knude i</translation>
-    </message>
     <message>
         <source>1 &amp;hour</source>
         <translation>1 &amp;time</translation>
@@ -1218,8 +1697,16 @@
         <translation>1 &amp;år</translation>
     </message>
     <message>
-        <source>&amp;Unban Node</source>
-        <translation>&amp;Fjern bandlysning af knude</translation>
+        <source>&amp;Disconnect</source>
+        <translation>&amp;Afbryd forbindelse</translation>
+    </message>
+    <message>
+        <source>Ban for</source>
+        <translation>Bandlys i</translation>
+    </message>
+    <message>
+        <source>&amp;Unban</source>
+        <translation>&amp;Fjern bandlysning</translation>
     </message>
     <message>
         <source>Welcome to the %1 RPC console.</source>
@@ -1233,6 +1720,14 @@
         <source>Type &lt;b&gt;help&lt;/b&gt; for an overview of available commands.</source>
         <translation>Tast &lt;b&gt;help&lt;/b&gt; for en oversigt over de tilgængelige kommandoer.</translation>
     </message>
+    <message>
+        <source>WARNING: Scammers have been active, telling users to type commands here, stealing their wallet contents. Do not use this console without fully understanding the ramification of a command.</source>
+        <translation>ADVARSEL: Svindlere har tidligere forsøgt at få folk til at indtaste kommandoer her og derved stjæle indholdet af deres tegnebog. Brug ikke denne konsol uden fuldt ud at forstå følgerne for en kommando.</translation>
+    </message>
+    <message>
+        <source>Network activity disabled</source>
+        <translation>Netværksaktivitet deaktiveret</translation>
+    </message>
     <message>
         <source>%1 B</source>
         <translation>%1 B</translation>
@@ -1352,6 +1847,22 @@
         <source>Remove</source>
         <translation>Fjern</translation>
     </message>
+    <message>
+        <source>Copy URI</source>
+        <translation>Kopiér URI</translation>
+    </message>
+    <message>
+        <source>Copy label</source>
+        <translation>Kopiér mærkat</translation>
+    </message>
+    <message>
+        <source>Copy message</source>
+        <translation>Kopiér besked</translation>
+    </message>
+    <message>
+        <source>Copy amount</source>
+        <translation>Kopiér beløb</translation>
+    </message>
 </context>
 <context>
     <name>ReceiveRequestDialog</name>
@@ -1371,6 +1882,73 @@
         <source>&amp;Save Image...</source>
         <translation>&amp;Gem billede…</translation>
     </message>
+    <message>
+        <source>Request payment to %1</source>
+        <translation>Anmod om betaling til %1</translation>
+    </message>
+    <message>
+        <source>Payment information</source>
+        <translation>Betalingsinformation</translation>
+    </message>
+    <message>
+        <source>URI</source>
+        <translation>URI</translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation>Adresse</translation>
+    </message>
+    <message>
+        <source>Amount</source>
+        <translation>Beløb</translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation>Mærkat</translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation>Besked</translation>
+    </message>
+    <message>
+        <source>Resulting URI too long, try to reduce the text for label / message.</source>
+        <translation>Resulterende URI var for lang; prøv at forkorte teksten til mærkaten/beskeden.</translation>
+    </message>
+    <message>
+        <source>Error encoding URI into QR Code.</source>
+        <translation>Fejl ved kodning fra URI til QR-kode.</translation>
+    </message>
+</context>
+<context>
+    <name>RecentRequestsTableModel</name>
+    <message>
+        <source>Date</source>
+        <translation>Dato</translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation>Mærkat</translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation>Besked</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(ingen mærkat)</translation>
+    </message>
+    <message>
+        <source>(no message)</source>
+        <translation>(ingen besked)</translation>
+    </message>
+    <message>
+        <source>(no amount requested)</source>
+        <translation>(intet anmodet beløb)</translation>
+    </message>
+    <message>
+        <source>Requested</source>
+        <translation>Anmodet</translation>
+    </message>
 </context>
 <context>
     <name>SendCoinsDialog</name>
@@ -1406,10 +1984,6 @@
         <source>Amount:</source>
         <translation>Beløb:</translation>
     </message>
-    <message>
-        <source>Priority:</source>
-        <translation>Prioritet:</translation>
-    </message>
     <message>
         <source>Fee:</source>
         <translation>Gebyr:</translation>
@@ -1419,313 +1993,986 @@
         <translation>Efter gebyr:</translation>
     </message>
     <message>
-        <source>Change:</source>
-        <translation>Byttepenge:</translation>
+        <source>Change:</source>
+        <translation>Byttepenge:</translation>
+    </message>
+    <message>
+        <source>If this is activated, but the change address is empty or invalid, change will be sent to a newly generated address.</source>
+        <translation>Hvis dette aktiveres, men byttepengeadressen er tom eller ugyldig, vil byttepenge blive sendt til en nygenereret adresse.</translation>
+    </message>
+    <message>
+        <source>Custom change address</source>
+        <translation>Tilpasset byttepengeadresse</translation>
+    </message>
+    <message>
+        <source>Transaction Fee:</source>
+        <translation>Transaktionsgebyr:</translation>
+    </message>
+    <message>
+        <source>Choose...</source>
+        <translation>Vælg…</translation>
+    </message>
+    <message>
+        <source>collapse fee-settings</source>
+        <translation>sammenfold gebyropsætning</translation>
+    </message>
+    <message>
+        <source>per kilobyte</source>
+        <translation>pr. kilobyte</translation>
+    </message>
+    <message>
+        <source>If the custom fee is set to 1000 satoshis and the transaction is only 250 bytes, then "per kilobyte" only pays 250 satoshis in fee, while "total at least" pays 1000 satoshis. For transactions bigger than a kilobyte both pay by kilobyte.</source>
+        <translation>Hvis det brugertilpassede gebyr er sat til 1000 satoshis, og transaktionen kun fylder 250 byte, betaler “pr. kilobyte” kun 250 satoshis i gebyr, mens “total mindst” betaler 1000 satoshis. For transaktioner større end en kilobyte betaler begge pr. kilobyte.</translation>
+    </message>
+    <message>
+        <source>Hide</source>
+        <translation>Skjul</translation>
+    </message>
+    <message>
+        <source>total at least</source>
+        <translation>total mindst</translation>
+    </message>
+    <message>
+        <source>Paying only the minimum fee is just fine as long as there is less transaction volume than space in the blocks. But be aware that this can end up in a never confirming transaction once there is more demand for bitcoin transactions than the network can process.</source>
+        <translation>Det er helt fint kun at betale det minimale gebyr, så længe den totale transaktionsvolumen er mindre end den plads, der er tilgængelig i blokkene. Men vær opmærksom på, at dette kan ende ud i transaktioner, der aldrig bliver bekræftet, når der bliver større forespørgsel efter bitcoin-transaktioner, end hvad netværket kan bearbejde.</translation>
+    </message>
+    <message>
+        <source>(read the tooltip)</source>
+        <translation>(læs værktøjstippet)</translation>
+    </message>
+    <message>
+        <source>Recommended:</source>
+        <translation>Anbefalet:</translation>
+    </message>
+    <message>
+        <source>Custom:</source>
+        <translation>Brugertilpasset:</translation>
+    </message>
+    <message>
+        <source>(Smart fee not initialized yet. This usually takes a few blocks...)</source>
+        <translation>(Smart-gebyr er ikke initialiseret endnu. Dette tager typisk nogle få blokke…)</translation>
+    </message>
+    <message>
+        <source>normal</source>
+        <translation>normal</translation>
+    </message>
+    <message>
+        <source>fast</source>
+        <translation>hurtig</translation>
+    </message>
+    <message>
+        <source>Send to multiple recipients at once</source>
+        <translation>Send til flere modtagere på en gang</translation>
+    </message>
+    <message>
+        <source>Add &amp;Recipient</source>
+        <translation>Tilføj &amp;modtager</translation>
+    </message>
+    <message>
+        <source>Clear all fields of the form.</source>
+        <translation>Ryd alle felter af formen.</translation>
+    </message>
+    <message>
+        <source>Dust:</source>
+        <translation>Støv:</translation>
+    </message>
+    <message>
+        <source>Confirmation time target:</source>
+        <translation>Mål for bekræftelsestid:</translation>
+    </message>
+    <message>
+        <source>Clear &amp;All</source>
+        <translation>Ryd &amp;alle</translation>
+    </message>
+    <message>
+        <source>Balance:</source>
+        <translation>Saldo:</translation>
+    </message>
+    <message>
+        <source>Confirm the send action</source>
+        <translation>Bekræft afsendelsen</translation>
+    </message>
+    <message>
+        <source>S&amp;end</source>
+        <translation>&amp;Afsend</translation>
+    </message>
+    <message>
+        <source>Copy quantity</source>
+        <translation>Kopiér mængde</translation>
+    </message>
+    <message>
+        <source>Copy amount</source>
+        <translation>Kopiér beløb</translation>
+    </message>
+    <message>
+        <source>Copy fee</source>
+        <translation>Kopiér gebyr</translation>
+    </message>
+    <message>
+        <source>Copy after fee</source>
+        <translation>Kopiér eftergebyr</translation>
+    </message>
+    <message>
+        <source>Copy bytes</source>
+        <translation>Kopiér byte</translation>
+    </message>
+    <message>
+        <source>Copy dust</source>
+        <translation>Kopiér støv</translation>
+    </message>
+    <message>
+        <source>Copy change</source>
+        <translation>Kopiér byttepenge</translation>
+    </message>
+    <message>
+        <source>%1 to %2</source>
+        <translation>%1 til %2</translation>
+    </message>
+    <message>
+        <source>Are you sure you want to send?</source>
+        <translation>Er du sikker på, at du vil sende?</translation>
+    </message>
+    <message>
+        <source>added as transaction fee</source>
+        <translation>tilføjet som transaktionsgebyr</translation>
+    </message>
+    <message>
+        <source>Total Amount %1</source>
+        <translation>Beløb i alt %1</translation>
+    </message>
+    <message>
+        <source>or</source>
+        <translation>eller</translation>
+    </message>
+    <message>
+        <source>Confirm send coins</source>
+        <translation>Bekræft afsendelse af bitcoins</translation>
+    </message>
+    <message>
+        <source>The recipient address is not valid. Please recheck.</source>
+        <translation>Modtageradressen er ikke gyldig. Tjek venligst igen.</translation>
+    </message>
+    <message>
+        <source>The amount to pay must be larger than 0.</source>
+        <translation>Beløbet til betaling skal være større end 0.</translation>
+    </message>
+    <message>
+        <source>The amount exceeds your balance.</source>
+        <translation>Beløbet overstiger din saldo.</translation>
+    </message>
+    <message>
+        <source>The total exceeds your balance when the %1 transaction fee is included.</source>
+        <translation>Totalen overstiger din saldo, når transaktionsgebyret på %1 er inkluderet.</translation>
+    </message>
+    <message>
+        <source>Duplicate address found: addresses should only be used once each.</source>
+        <translation>Adressegenganger fundet. Adresser bør kun bruges én gang hver.</translation>
+    </message>
+    <message>
+        <source>Transaction creation failed!</source>
+        <translation>Oprettelse af transaktion mislykkedes!</translation>
+    </message>
+    <message>
+        <source>The transaction was rejected with the following reason: %1</source>
+        <translation>Transaktionen blev afvist med følgende begrundelse: %1</translation>
+    </message>
+    <message>
+        <source>A fee higher than %1 is considered an absurdly high fee.</source>
+        <translation>Et gebyr højere end %1 opfattes som et absurd højt gebyr.</translation>
+    </message>
+    <message>
+        <source>Payment request expired.</source>
+        <translation>Betalingsanmodning er udløbet.</translation>
+    </message>
+    <message numerus="yes">
+        <source>%n block(s)</source>
+        <translation><numerusform>%n blok</numerusform><numerusform>%n blokke</numerusform></translation>
+    </message>
+    <message>
+        <source>Pay only the required fee of %1</source>
+        <translation>Betal kun det påkrævede gebyr på %1</translation>
+    </message>
+    <message numerus="yes">
+        <source>Estimated to begin confirmation within %n block(s).</source>
+        <translation><numerusform>Bekræftelse estimeret til at begynde om %n blok.</numerusform><numerusform>Bekræftelse estimeret til at begynde om %n blokke.</numerusform></translation>
+    </message>
+    <message>
+        <source>Warning: Invalid Bitcoin address</source>
+        <translation>Advarsel: Ugyldig Bitcoin-adresse</translation>
+    </message>
+    <message>
+        <source>Warning: Unknown change address</source>
+        <translation>Advarsel: Ukendt byttepengeadresse</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(ingen mærkat)</translation>
+    </message>
+</context>
+<context>
+    <name>SendCoinsEntry</name>
+    <message>
+        <source>A&amp;mount:</source>
+        <translation>&amp;Beløb:</translation>
+    </message>
+    <message>
+        <source>Pay &amp;To:</source>
+        <translation>Betal &amp;til:</translation>
+    </message>
+    <message>
+        <source>&amp;Label:</source>
+        <translation>&amp;Mærkat:</translation>
+    </message>
+    <message>
+        <source>Choose previously used address</source>
+        <translation>Vælg tidligere brugt adresse</translation>
+    </message>
+    <message>
+        <source>This is a normal payment.</source>
+        <translation>Dette er en normal betaling.</translation>
+    </message>
+    <message>
+        <source>The Bitcoin address to send the payment to</source>
+        <translation>Bitcoin-adresse, som betalingen skal sendes til</translation>
+    </message>
+    <message>
+        <source>Alt+A</source>
+        <translation>Alt+A</translation>
+    </message>
+    <message>
+        <source>Paste address from clipboard</source>
+        <translation>Indsæt adresse fra udklipsholderen</translation>
+    </message>
+    <message>
+        <source>Alt+P</source>
+        <translation>Alt+P</translation>
+    </message>
+    <message>
+        <source>Remove this entry</source>
+        <translation>Fjern denne indgang</translation>
+    </message>
+    <message>
+        <source>The fee will be deducted from the amount being sent. The recipient will receive less bitcoins than you enter in the amount field. If multiple recipients are selected, the fee is split equally.</source>
+        <translation>Gebyret vil blive trukket fra det sendte beløb. Modtageren vil modtage færre bitcoin, end du indtaster i beløbfeltet. Hvis flere modtagere vælges, vil gebyret deles ligeligt.</translation>
+    </message>
+    <message>
+        <source>S&amp;ubtract fee from amount</source>
+        <translation>&amp;Træk gebyr fra beløb</translation>
+    </message>
+    <message>
+        <source>Message:</source>
+        <translation>Besked:</translation>
+    </message>
+    <message>
+        <source>This is an unauthenticated payment request.</source>
+        <translation>Dette er en uautentificeret betalingsanmodning.</translation>
+    </message>
+    <message>
+        <source>This is an authenticated payment request.</source>
+        <translation>Dette er en autentificeret betalingsanmodning.</translation>
+    </message>
+    <message>
+        <source>Enter a label for this address to add it to the list of used addresses</source>
+        <translation>Indtast et mærkat for denne adresse for at føje den til listen over brugte adresser</translation>
+    </message>
+    <message>
+        <source>A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
+        <translation>En besked, som blev føjet til “bitcon:”-URI'en, som vil gemmes med transaktionen til din reference. Bemærk: Denne besked vil ikke blive sendt over Bitcoin-netværket.</translation>
+    </message>
+    <message>
+        <source>Pay To:</source>
+        <translation>Betal til:</translation>
+    </message>
+    <message>
+        <source>Memo:</source>
+        <translation>Memo:</translation>
+    </message>
+    <message>
+        <source>Enter a label for this address to add it to your address book</source>
+        <translation>Indtast en mærkat for denne adresse for at føje den til din adressebog</translation>
+    </message>
+</context>
+<context>
+    <name>SendConfirmationDialog</name>
+    <message>
+        <source>Yes</source>
+        <translation>Ja</translation>
+    </message>
+</context>
+<context>
+    <name>ShutdownWindow</name>
+    <message>
+        <source>%1 is shutting down...</source>
+        <translation>%1 lukker ned…</translation>
+    </message>
+    <message>
+        <source>Do not shut down the computer until this window disappears.</source>
+        <translation>Luk ikke computeren ned, før dette vindue forsvinder.</translation>
+    </message>
+</context>
+<context>
+    <name>SignVerifyMessageDialog</name>
+    <message>
+        <source>Signatures - Sign / Verify a Message</source>
+        <translation>Signaturer – Underskriv/verificér en besked</translation>
+    </message>
+    <message>
+        <source>&amp;Sign Message</source>
+        <translation>&amp;Singér besked</translation>
+    </message>
+    <message>
+        <source>You can sign messages/agreements with your addresses to prove you can receive bitcoins sent to them. Be careful not to sign anything vague or random, as phishing attacks may try to trick you into signing your identity over to them. Only sign fully-detailed statements you agree to.</source>
+        <translation>Du kan signere beskeder/aftaler med dine adresser for at bevise, at du kan modtage bitcoin, der bliver sendt til adresserne. Vær forsigtig med ikke at signere noget vagt eller tilfældigt, da eventuelle phishing-angreb kan snyde dig til at overlade din identitet til dem. Signér kun fuldt ud detaljerede udsagn, som du er enig i.</translation>
+    </message>
+    <message>
+        <source>The Bitcoin address to sign the message with</source>
+        <translation>Bitcoin-adresse, som beskeden skal signeres med</translation>
+    </message>
+    <message>
+        <source>Choose previously used address</source>
+        <translation>Vælg tidligere brugt adresse</translation>
+    </message>
+    <message>
+        <source>Alt+A</source>
+        <translation>Alt+A</translation>
+    </message>
+    <message>
+        <source>Paste address from clipboard</source>
+        <translation>Indsæt adresse fra udklipsholderen</translation>
+    </message>
+    <message>
+        <source>Alt+P</source>
+        <translation>Alt+P</translation>
+    </message>
+    <message>
+        <source>Enter the message you want to sign here</source>
+        <translation>Indtast her beskeden, du ønsker at signere</translation>
+    </message>
+    <message>
+        <source>Signature</source>
+        <translation>Signatur</translation>
+    </message>
+    <message>
+        <source>Copy the current signature to the system clipboard</source>
+        <translation>Kopiér den nuværende signatur til systemets udklipsholder</translation>
+    </message>
+    <message>
+        <source>Sign the message to prove you own this Bitcoin address</source>
+        <translation>Signér denne besked for at bevise, at Bitcoin-adressen tilhører dig</translation>
+    </message>
+    <message>
+        <source>Sign &amp;Message</source>
+        <translation>Signér &amp;besked</translation>
+    </message>
+    <message>
+        <source>Reset all sign message fields</source>
+        <translation>Nulstil alle “signér besked”-felter</translation>
+    </message>
+    <message>
+        <source>Clear &amp;All</source>
+        <translation>Ryd &amp;alle</translation>
+    </message>
+    <message>
+        <source>&amp;Verify Message</source>
+        <translation>&amp;Verificér besked</translation>
+    </message>
+    <message>
+        <source>Enter the receiver's address, message (ensure you copy line breaks, spaces, tabs, etc. exactly) and signature below to verify the message. Be careful not to read more into the signature than what is in the signed message itself, to avoid being tricked by a man-in-the-middle attack. Note that this only proves the signing party receives with the address, it cannot prove sendership of any transaction!</source>
+        <translation>Indtast modtagerens adresse, besked (vær sikker på at kopiere linjeskift, mellemrum, tabuleringer, etc. præcist) og signatur herunder for at verificere beskeden. Vær forsigtig med ikke at læse noget ud fra signaturen, som ikke står i selve beskeden, for at undgå at blive snydt af et eventuelt man-in-the-middle-angreb. Bemærk, at dette kun beviser, at den signerende person kan modtage med adressen; det kan ikke bevise hvem der har sendt en given transaktion!</translation>
+    </message>
+    <message>
+        <source>The Bitcoin address the message was signed with</source>
+        <translation>Bitcoin-adressen, som beskeden blev signeret med</translation>
+    </message>
+    <message>
+        <source>Verify the message to ensure it was signed with the specified Bitcoin address</source>
+        <translation>Verificér beskeden for at sikre, at den er signeret med den angivne Bitcoin-adresse</translation>
+    </message>
+    <message>
+        <source>Verify &amp;Message</source>
+        <translation>Verificér &amp;besked</translation>
+    </message>
+    <message>
+        <source>Reset all verify message fields</source>
+        <translation>Nulstil alle “verificér besked”-felter</translation>
+    </message>
+    <message>
+        <source>Click "Sign Message" to generate signature</source>
+        <translation>Klik “Signér besked” for at generere underskriften</translation>
+    </message>
+    <message>
+        <source>The entered address is invalid.</source>
+        <translation>Den indtastede adresse er ugyldig.</translation>
+    </message>
+    <message>
+        <source>Please check the address and try again.</source>
+        <translation>Tjek venligst adressen og forsøg igen.</translation>
+    </message>
+    <message>
+        <source>The entered address does not refer to a key.</source>
+        <translation>Den indtastede adresse henviser ikke til en nøgle.</translation>
+    </message>
+    <message>
+        <source>Wallet unlock was cancelled.</source>
+        <translation>Tegnebogsoplåsning annulleret.</translation>
+    </message>
+    <message>
+        <source>Private key for the entered address is not available.</source>
+        <translation>Den private nøgle for den indtastede adresse er ikke tilgængelig.</translation>
+    </message>
+    <message>
+        <source>Message signing failed.</source>
+        <translation>Signering af besked mislykkedes.</translation>
+    </message>
+    <message>
+        <source>Message signed.</source>
+        <translation>Besked signeret.</translation>
+    </message>
+    <message>
+        <source>The signature could not be decoded.</source>
+        <translation>Signaturen kunne ikke afkodes.</translation>
+    </message>
+    <message>
+        <source>Please check the signature and try again.</source>
+        <translation>Tjek venligst signaturen og forsøg igen.</translation>
+    </message>
+    <message>
+        <source>The signature did not match the message digest.</source>
+        <translation>Signaturen passer ikke overens med beskedens indhold.</translation>
+    </message>
+    <message>
+        <source>Message verification failed.</source>
+        <translation>Verificering af besked mislykkedes.</translation>
+    </message>
+    <message>
+        <source>Message verified.</source>
+        <translation>Besked verificeret.</translation>
+    </message>
+</context>
+<context>
+    <name>SplashScreen</name>
+    <message>
+        <source>[testnet]</source>
+        <translation>[testnetværk]</translation>
+    </message>
+</context>
+<context>
+    <name>TrafficGraphWidget</name>
+    <message>
+        <source>KB/s</source>
+        <translation>KB/s</translation>
+    </message>
+</context>
+<context>
+    <name>TransactionDesc</name>
+    <message numerus="yes">
+        <source>Open for %n more block(s)</source>
+        <translation><numerusform>Åben i %n yderligere blok</numerusform><numerusform>Åben i %n yderligere blokke</numerusform></translation>
+    </message>
+    <message>
+        <source>Open until %1</source>
+        <translation>Åben indtil %1</translation>
+    </message>
+    <message>
+        <source>conflicted with a transaction with %1 confirmations</source>
+        <translation>i konflikt med en transaktion, der har %1 bekræftelser</translation>
+    </message>
+    <message>
+        <source>%1/offline</source>
+        <translation>%1/offline</translation>
+    </message>
+    <message>
+        <source>0/unconfirmed, %1</source>
+        <translation>0/ubekræftet, %1</translation>
+    </message>
+    <message>
+        <source>in memory pool</source>
+        <translation>i hukommelsespulje</translation>
+    </message>
+    <message>
+        <source>not in memory pool</source>
+        <translation>ikke i hukommelsespulje</translation>
+    </message>
+    <message>
+        <source>abandoned</source>
+        <translation>opgivet</translation>
+    </message>
+    <message>
+        <source>%1/unconfirmed</source>
+        <translation>%1/ubekræftet</translation>
+    </message>
+    <message>
+        <source>%1 confirmations</source>
+        <translation>%1 bekræftelser</translation>
+    </message>
+    <message>
+        <source>Status</source>
+        <translation>Status</translation>
+    </message>
+    <message>
+        <source>, has not been successfully broadcast yet</source>
+        <translation>, er ikke blevet transmitteret endnu</translation>
+    </message>
+    <message numerus="yes">
+        <source>, broadcast through %n node(s)</source>
+        <translation><numerusform>, transmitteret igennem %n knude</numerusform><numerusform>, transmitteret igennem %n knuder</numerusform></translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation>Dato</translation>
+    </message>
+    <message>
+        <source>Source</source>
+        <translation>Kilde</translation>
+    </message>
+    <message>
+        <source>Generated</source>
+        <translation>Genereret</translation>
+    </message>
+    <message>
+        <source>From</source>
+        <translation>Fra</translation>
+    </message>
+    <message>
+        <source>unknown</source>
+        <translation>ukendt</translation>
+    </message>
+    <message>
+        <source>To</source>
+        <translation>Til</translation>
+    </message>
+    <message>
+        <source>own address</source>
+        <translation>egen adresse</translation>
+    </message>
+    <message>
+        <source>watch-only</source>
+        <translation>kigge</translation>
+    </message>
+    <message>
+        <source>label</source>
+        <translation>mærkat</translation>
+    </message>
+    <message>
+        <source>Credit</source>
+        <translation>Kredit</translation>
+    </message>
+    <message numerus="yes">
+        <source>matures in %n more block(s)</source>
+        <translation><numerusform>modner om %n blok</numerusform><numerusform>modner om %n blokke</numerusform></translation>
+    </message>
+    <message>
+        <source>not accepted</source>
+        <translation>ikke accepteret</translation>
+    </message>
+    <message>
+        <source>Debit</source>
+        <translation>Debet</translation>
+    </message>
+    <message>
+        <source>Total debit</source>
+        <translation>Total debet</translation>
+    </message>
+    <message>
+        <source>Total credit</source>
+        <translation>Total kredit</translation>
+    </message>
+    <message>
+        <source>Transaction fee</source>
+        <translation>Transaktionsgebyr</translation>
+    </message>
+    <message>
+        <source>Net amount</source>
+        <translation>Nettobeløb</translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation>Besked</translation>
+    </message>
+    <message>
+        <source>Comment</source>
+        <translation>Kommentar</translation>
+    </message>
+    <message>
+        <source>Transaction ID</source>
+        <translation>Transaktions-ID</translation>
+    </message>
+    <message>
+        <source>Transaction total size</source>
+        <translation>Totalstørrelse af transaktion</translation>
+    </message>
+    <message>
+        <source>Output index</source>
+        <translation>Outputindeks</translation>
+    </message>
+    <message>
+        <source>Merchant</source>
+        <translation>Forretningsdrivende</translation>
+    </message>
+    <message>
+        <source>Generated coins must mature %1 blocks before they can be spent. When you generated this block, it was broadcast to the network to be added to the block chain. If it fails to get into the chain, its state will change to "not accepted" and it won't be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source>
+        <translation>Minede bitcoins skal modne %1 blokke, før de kan bruges. Da du genererede denne blok, blev den transmitteret til netværket for at blive føjet til blokkæden. Hvis det ikke lykkes at få den i kæden, vil dens tilstand ændres til “ikke accepteret”, og den vil ikke kunne bruges. Dette kan ske nu og da, hvis en anden knude udvinder en blok inden for nogle få sekunder fra din.</translation>
+    </message>
+    <message>
+        <source>Debug information</source>
+        <translation>Fejlsøgningsinformation</translation>
+    </message>
+    <message>
+        <source>Transaction</source>
+        <translation>Transaktion</translation>
+    </message>
+    <message>
+        <source>Inputs</source>
+        <translation>Input</translation>
+    </message>
+    <message>
+        <source>Amount</source>
+        <translation>Beløb</translation>
+    </message>
+    <message>
+        <source>true</source>
+        <translation>sand</translation>
+    </message>
+    <message>
+        <source>false</source>
+        <translation>falsk</translation>
     </message>
+</context>
+<context>
+    <name>TransactionDescDialog</name>
     <message>
-        <source>If this is activated, but the change address is empty or invalid, change will be sent to a newly generated address.</source>
-        <translation>Hvis dette aktiveres, men byttepengeadressen er tom eller ugyldig, vil byttepenge blive sendt til en nygenereret adresse.</translation>
+        <source>This pane shows a detailed description of the transaction</source>
+        <translation>Denne rude viser en detaljeret beskrivelse af transaktionen</translation>
     </message>
     <message>
-        <source>Custom change address</source>
-        <translation>Tilpasset byttepengeadresse</translation>
+        <source>Details for %1</source>
+        <translation>Detaljer for %1</translation>
     </message>
+</context>
+<context>
+    <name>TransactionTableModel</name>
     <message>
-        <source>Transaction Fee:</source>
-        <translation>Transaktionsgebyr:</translation>
+        <source>Date</source>
+        <translation>Dato</translation>
     </message>
     <message>
-        <source>Choose...</source>
-        <translation>Vælg…</translation>
+        <source>Type</source>
+        <translation>Type</translation>
     </message>
     <message>
-        <source>collapse fee-settings</source>
-        <translation>sammenfold gebyropsætning</translation>
+        <source>Label</source>
+        <translation>Mærkat</translation>
+    </message>
+    <message numerus="yes">
+        <source>Open for %n more block(s)</source>
+        <translation><numerusform>Åben i %n yderligere blok</numerusform><numerusform>Åben i %n yderligere blokke</numerusform></translation>
     </message>
     <message>
-        <source>per kilobyte</source>
-        <translation>pr. kilobyte</translation>
+        <source>Open until %1</source>
+        <translation>Åben indtil %1</translation>
     </message>
     <message>
-        <source>If the custom fee is set to 1000 satoshis and the transaction is only 250 bytes, then "per kilobyte" only pays 250 satoshis in fee, while "total at least" pays 1000 satoshis. For transactions bigger than a kilobyte both pay by kilobyte.</source>
-        <translation>Hvis det brugertilpassede gebyr er sat til 1000 satoshis, og transaktionen kun fylder 250 byte, betaler "pr. kilobyte" kun 250 satoshis i gebyr, mens "total mindst" betaler 1000 satoshis. For transaktioner større end en kilobyte betaler begge pr. kilobyte.</translation>
+        <source>Offline</source>
+        <translation>Offline</translation>
     </message>
     <message>
-        <source>Hide</source>
-        <translation>Skjul</translation>
+        <source>Unconfirmed</source>
+        <translation>Ubekræftet</translation>
     </message>
     <message>
-        <source>total at least</source>
-        <translation>total mindst</translation>
+        <source>Abandoned</source>
+        <translation>Opgivet</translation>
     </message>
     <message>
-        <source>Paying only the minimum fee is just fine as long as there is less transaction volume than space in the blocks. But be aware that this can end up in a never confirming transaction once there is more demand for bitcoin transactions than the network can process.</source>
-        <translation>Det er helt fint kun at betale det minimale gebyr, så længe den totale transaktionsvolumen er mindre end den plads, der er tilgængelig i blokkene. Men vær opmærksom på, at dette kan ende ud i transaktioner, der aldrig bliver bekræftet, når der bliver større forespørgsel efter bitcoin-transaktioner, end hvad netværket kan bearbejde.</translation>
+        <source>Confirming (%1 of %2 recommended confirmations)</source>
+        <translation>Bekræfter (%1 af %2 anbefalede bekræftelser)</translation>
     </message>
     <message>
-        <source>(read the tooltip)</source>
-        <translation>(læs værktøjstippet)</translation>
+        <source>Confirmed (%1 confirmations)</source>
+        <translation>Bekræftet (%1 bekræftelser)</translation>
     </message>
     <message>
-        <source>Recommended:</source>
-        <translation>Anbefalet:</translation>
+        <source>Conflicted</source>
+        <translation>Konflikt</translation>
     </message>
     <message>
-        <source>Custom:</source>
-        <translation>Brugertilpasset:</translation>
+        <source>Immature (%1 confirmations, will be available after %2)</source>
+        <translation>Umoden (%1 bekræftelser; vil være tilgængelig efter %2)</translation>
     </message>
     <message>
-        <source>(Smart fee not initialized yet. This usually takes a few blocks...)</source>
-        <translation>(Smart-gebyr er ikke initialiseret endnu. Dette tager typisk nogle få blokke…)</translation>
+        <source>This block was not received by any other nodes and will probably not be accepted!</source>
+        <translation>Denne blok blev ikke modtaget af nogen andre knuder og vil formentlig ikke blive accepteret!</translation>
     </message>
     <message>
-        <source>Confirmation time:</source>
-        <translation>Bekræftelsestid:</translation>
+        <source>Generated but not accepted</source>
+        <translation>Genereret, men ikke accepteret</translation>
     </message>
     <message>
-        <source>normal</source>
-        <translation>normal</translation>
+        <source>Received with</source>
+        <translation>Modtaget med</translation>
     </message>
     <message>
-        <source>fast</source>
-        <translation>hurtig</translation>
+        <source>Received from</source>
+        <translation>Modtaget fra</translation>
     </message>
     <message>
-        <source>Send to multiple recipients at once</source>
-        <translation>Send til flere modtagere på en gang</translation>
+        <source>Sent to</source>
+        <translation>Sendt til</translation>
     </message>
     <message>
-        <source>Add &amp;Recipient</source>
-        <translation>Tilføj &amp;modtager</translation>
+        <source>Payment to yourself</source>
+        <translation>Betaling til dig selv</translation>
     </message>
     <message>
-        <source>Clear all fields of the form.</source>
-        <translation>Ryd alle felter af formen.</translation>
+        <source>Mined</source>
+        <translation>Minet</translation>
     </message>
     <message>
-        <source>Dust:</source>
-        <translation>Støv:</translation>
+        <source>watch-only</source>
+        <translation>kigge</translation>
     </message>
     <message>
-        <source>Clear &amp;All</source>
-        <translation>Ryd &amp;alle</translation>
+        <source>(n/a)</source>
+        <translation>(n/a)</translation>
     </message>
     <message>
-        <source>Balance:</source>
-        <translation>Saldo:</translation>
+        <source>(no label)</source>
+        <translation>(ingen mærkat)</translation>
     </message>
     <message>
-        <source>Confirm the send action</source>
-        <translation>Bekræft afsendelsen</translation>
+        <source>Transaction status. Hover over this field to show number of confirmations.</source>
+        <translation>Transaktionsstatus. Hold musen over dette felt for at vise antallet af bekræftelser.</translation>
     </message>
     <message>
-        <source>S&amp;end</source>
-        <translation>&amp;Afsend</translation>
+        <source>Date and time that the transaction was received.</source>
+        <translation>Dato og klokkeslæt for modtagelse af transaktionen.</translation>
     </message>
-</context>
-<context>
-    <name>SendCoinsEntry</name>
     <message>
-        <source>A&amp;mount:</source>
-        <translation>&amp;Beløb:</translation>
+        <source>Type of transaction.</source>
+        <translation>Transaktionstype.</translation>
     </message>
     <message>
-        <source>Pay &amp;To:</source>
-        <translation>Betal &amp;til:</translation>
+        <source>Whether or not a watch-only address is involved in this transaction.</source>
+        <translation>Afgør hvorvidt en kigge-adresse er involveret i denne transaktion.</translation>
     </message>
     <message>
-        <source>&amp;Label:</source>
-        <translation>&amp;Mærkat:</translation>
+        <source>User-defined intent/purpose of the transaction.</source>
+        <translation>Brugerdefineret hensigt/formål med transaktionen.</translation>
     </message>
     <message>
-        <source>Choose previously used address</source>
-        <translation>Vælg tidligere brugt adresse</translation>
+        <source>Amount removed from or added to balance.</source>
+        <translation>Beløb trukket fra eller tilføjet balance.</translation>
     </message>
+</context>
+<context>
+    <name>TransactionView</name>
     <message>
-        <source>This is a normal payment.</source>
-        <translation>Dette er en normal betaling.</translation>
+        <source>All</source>
+        <translation>Alle</translation>
     </message>
     <message>
-        <source>The Bitcoin address to send the payment to</source>
-        <translation>Bitcoin-adresse, som betalingen skal sendes til</translation>
+        <source>Today</source>
+        <translation>I dag</translation>
     </message>
     <message>
-        <source>Alt+A</source>
-        <translation>Alt+A</translation>
+        <source>This week</source>
+        <translation>Denne uge</translation>
     </message>
     <message>
-        <source>Paste address from clipboard</source>
-        <translation>Indsæt adresse fra udklipsholderen</translation>
+        <source>This month</source>
+        <translation>Denne måned</translation>
     </message>
     <message>
-        <source>Alt+P</source>
-        <translation>Alt+P</translation>
+        <source>Last month</source>
+        <translation>Sidste måned</translation>
     </message>
     <message>
-        <source>Remove this entry</source>
-        <translation>Fjern denne indgang</translation>
+        <source>This year</source>
+        <translation>I år</translation>
     </message>
     <message>
-        <source>The fee will be deducted from the amount being sent. The recipient will receive less bitcoins than you enter in the amount field. If multiple recipients are selected, the fee is split equally.</source>
-        <translation>Gebyret vil blive trukket fra det sendte beløb. Modtageren vil modtage færre bitcoin, end du indtaster i beløbfeltet. Hvis flere modtagere vælges, vil gebyret deles ligeligt.</translation>
+        <source>Range...</source>
+        <translation>Interval…</translation>
     </message>
     <message>
-        <source>S&amp;ubtract fee from amount</source>
-        <translation>&amp;Træk gebyr fra beløb</translation>
+        <source>Received with</source>
+        <translation>Modtaget med</translation>
     </message>
     <message>
-        <source>Message:</source>
-        <translation>Besked:</translation>
+        <source>Sent to</source>
+        <translation>Sendt til</translation>
     </message>
     <message>
-        <source>This is an unauthenticated payment request.</source>
-        <translation>Dette er en uautentificeret betalingsanmodning.</translation>
+        <source>To yourself</source>
+        <translation>Til dig selv</translation>
     </message>
     <message>
-        <source>This is an authenticated payment request.</source>
-        <translation>Dette er en autentificeret betalingsanmodning.</translation>
+        <source>Mined</source>
+        <translation>Minet</translation>
     </message>
     <message>
-        <source>Enter a label for this address to add it to the list of used addresses</source>
-        <translation>Indtast et mærkat for denne adresse for at føje den til listen over brugte adresser</translation>
+        <source>Other</source>
+        <translation>Andet</translation>
     </message>
     <message>
-        <source>A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
-        <translation>En besked, som blev føjet til "bitcon:"-URI'en, som vil gemmes med transaktionen til din reference. Bemærk: Denne besked vil ikke blive sendt over Bitcoin-netværket.</translation>
+        <source>Enter address or label to search</source>
+        <translation>Indtast adresse eller mærkat for at søge</translation>
     </message>
     <message>
-        <source>Pay To:</source>
-        <translation>Betal til:</translation>
+        <source>Min amount</source>
+        <translation>Minimumsbeløb</translation>
     </message>
     <message>
-        <source>Memo:</source>
-        <translation>Memo:</translation>
+        <source>Abandon transaction</source>
+        <translation>Opgiv transaktion</translation>
     </message>
-</context>
-<context>
-    <name>ShutdownWindow</name>
     <message>
-        <source>%1 is shutting down...</source>
-        <translation>%1 lukker ned…</translation>
+        <source>Copy address</source>
+        <translation>Kopiér adresse</translation>
     </message>
     <message>
-        <source>Do not shut down the computer until this window disappears.</source>
-        <translation>Luk ikke computeren ned, før dette vindue forsvinder.</translation>
+        <source>Copy label</source>
+        <translation>Kopiér mærkat</translation>
     </message>
-</context>
-<context>
-    <name>SignVerifyMessageDialog</name>
     <message>
-        <source>Signatures - Sign / Verify a Message</source>
-        <translation>Signature - Underskriv/verificér en besked</translation>
+        <source>Copy amount</source>
+        <translation>Kopiér beløb</translation>
     </message>
     <message>
-        <source>&amp;Sign Message</source>
-        <translation>&amp;Underskriv besked</translation>
+        <source>Copy transaction ID</source>
+        <translation>Kopiér transaktions-ID</translation>
     </message>
     <message>
-        <source>You can sign messages/agreements with your addresses to prove you can receive bitcoins sent to them. Be careful not to sign anything vague or random, as phishing attacks may try to trick you into signing your identity over to them. Only sign fully-detailed statements you agree to.</source>
-        <translation>Du kan signere beskeder/aftaler med dine adresser for at bevise, at du kan modtage bitcoin, der bliver sendt til adresserne. Vær forsigtig med ikke at signere noget vagt eller tilfældigt, da eventuelle phishing-angreb kan snyde dig til at overlade din identitet til dem. Signér kun fuldt ud detaljerede udsagn, som du er enig i.</translation>
+        <source>Copy raw transaction</source>
+        <translation>Kopiér rå transaktion</translation>
     </message>
     <message>
-        <source>The Bitcoin address to sign the message with</source>
-        <translation>Bitcoin-adresse, som beskeden skal signeres med</translation>
+        <source>Copy full transaction details</source>
+        <translation>Kopiér komplette transaktionsdetaljer</translation>
     </message>
     <message>
-        <source>Choose previously used address</source>
-        <translation>Vælg tidligere brugt adresse</translation>
+        <source>Edit label</source>
+        <translation>Redigér mærkat</translation>
     </message>
     <message>
-        <source>Alt+A</source>
-        <translation>Alt+A</translation>
+        <source>Show transaction details</source>
+        <translation>Vis transaktionsdetaljer</translation>
     </message>
     <message>
-        <source>Paste address from clipboard</source>
-        <translation>Indsæt adresse fra udklipsholderen</translation>
+        <source>Export Transaction History</source>
+        <translation>Eksportér transaktionshistorik</translation>
     </message>
     <message>
-        <source>Alt+P</source>
-        <translation>Alt+P</translation>
+        <source>Comma separated file (*.csv)</source>
+        <translation>Kommasepareret fil (*.csv)</translation>
     </message>
     <message>
-        <source>Enter the message you want to sign here</source>
-        <translation>Indtast her beskeden, du ønsker at underskrive</translation>
+        <source>Confirmed</source>
+        <translation>Bekræftet</translation>
     </message>
     <message>
-        <source>Signature</source>
-        <translation>Underskrift</translation>
+        <source>Watch-only</source>
+        <translation>Kigge</translation>
     </message>
     <message>
-        <source>Copy the current signature to the system clipboard</source>
-        <translation>Kopiér den nuværende underskrift til systemets udklipsholder</translation>
+        <source>Date</source>
+        <translation>Dato</translation>
     </message>
     <message>
-        <source>Sign the message to prove you own this Bitcoin address</source>
-        <translation>Underskriv denne besked for at bevise, at Bitcoin-adressen tilhører dig</translation>
+        <source>Type</source>
+        <translation>Type</translation>
     </message>
     <message>
-        <source>Sign &amp;Message</source>
-        <translation>Underskriv &amp;besked</translation>
+        <source>Label</source>
+        <translation>Mærkat</translation>
     </message>
     <message>
-        <source>Reset all sign message fields</source>
-        <translation>Nulstil alle "underskriv besked"-felter</translation>
+        <source>Address</source>
+        <translation>Adresse</translation>
     </message>
     <message>
-        <source>Clear &amp;All</source>
-        <translation>Ryd &amp;alle</translation>
+        <source>ID</source>
+        <translation>ID</translation>
     </message>
     <message>
-        <source>&amp;Verify Message</source>
-        <translation>&amp;Verificér besked</translation>
+        <source>Exporting Failed</source>
+        <translation>Eksport mislykkedes</translation>
     </message>
     <message>
-        <source>Enter the receiver's address, message (ensure you copy line breaks, spaces, tabs, etc. exactly) and signature below to verify the message. Be careful not to read more into the signature than what is in the signed message itself, to avoid being tricked by a man-in-the-middle attack. Note that this only proves the signing party receives with the address, it cannot prove sendership of any transaction!</source>
-        <translation>Indtast modtagerens adresse, besked (vær sikker på at kopiere linjeskift, mellemrum, tabuleringer, etc. præcist) og signatur herunder for at verificere beskeden. Vær forsigtig med ikke at læse noget ud fra signaturen, som ikke står i selve beskeden, for at undgå at blive snydt af et eventuelt man-in-the-middle-angreb. Bemærk, at dette kun beviser, at den signerende person kan modtage med adressen; det kan ikke bevise hvem der har sendt en given transaktion!</translation>
+        <source>There was an error trying to save the transaction history to %1.</source>
+        <translation>En fejl opstod under gemning af transaktionshistorik til %1.</translation>
     </message>
     <message>
-        <source>The Bitcoin address the message was signed with</source>
-        <translation>Bitcoin-adressen, som beskeden blev signeret med</translation>
+        <source>Exporting Successful</source>
+        <translation>Eksport problemfri</translation>
     </message>
     <message>
-        <source>Verify the message to ensure it was signed with the specified Bitcoin address</source>
-        <translation>Verificér beskeden for at sikre, at den er underskrevet med den angivne Bitcoin-adresse</translation>
+        <source>The transaction history was successfully saved to %1.</source>
+        <translation>Transaktionshistorikken blev gemt til %1.</translation>
     </message>
     <message>
-        <source>Verify &amp;Message</source>
-        <translation>Verificér &amp;besked</translation>
+        <source>Range:</source>
+        <translation>Interval:</translation>
     </message>
     <message>
-        <source>Reset all verify message fields</source>
-        <translation>Nulstil alle "verificér besked"-felter</translation>
+        <source>to</source>
+        <translation>til</translation>
     </message>
 </context>
 <context>
-    <name>SplashScreen</name>
+    <name>UnitDisplayStatusBarControl</name>
     <message>
-        <source>[testnet]</source>
-        <translation>[testnetværk]</translation>
+        <source>Unit to show amounts in. Click to select another unit.</source>
+        <translation>Enhed, som beløb vises i. Klik for at vælge en anden enhed.</translation>
     </message>
 </context>
 <context>
-    <name>TrafficGraphWidget</name>
+    <name>WalletFrame</name>
     <message>
-        <source>KB/s</source>
-        <translation>KB/s</translation>
+        <source>No wallet has been loaded.</source>
+        <translation>Ingen tegnebog er indlæst.</translation>
     </message>
 </context>
 <context>
-    <name>TransactionDescDialog</name>
+    <name>WalletModel</name>
     <message>
-        <source>This pane shows a detailed description of the transaction</source>
-        <translation>Denne rude viser en detaljeret beskrivelse af transaktionen</translation>
+        <source>Send Coins</source>
+        <translation>Send bitcoins</translation>
     </message>
 </context>
 <context>
-    <name>UnitDisplayStatusBarControl</name>
+    <name>WalletView</name>
     <message>
-        <source>Unit to show amounts in. Click to select another unit.</source>
-        <translation>Enhed, som beløb vises i. Klik for at vælge en anden enhed.</translation>
+        <source>&amp;Export</source>
+        <translation>&amp;Eksportér</translation>
+    </message>
+    <message>
+        <source>Export the data in the current tab to a file</source>
+        <translation>Eksportér den aktuelle visning til en fil</translation>
+    </message>
+    <message>
+        <source>Backup Wallet</source>
+        <translation>Sikkerhedskopiér tegnebog</translation>
+    </message>
+    <message>
+        <source>Wallet Data (*.dat)</source>
+        <translation>Tegnebogsdata (*.dat)</translation>
+    </message>
+    <message>
+        <source>Backup Failed</source>
+        <translation>Sikkerhedskopiering mislykkedes</translation>
+    </message>
+    <message>
+        <source>There was an error trying to save the wallet data to %1.</source>
+        <translation>Der skete en fejl under gemning af tegnebogsdata til %1.</translation>
+    </message>
+    <message>
+        <source>Backup Successful</source>
+        <translation>Sikkerhedskopiering problemfri</translation>
+    </message>
+    <message>
+        <source>The wallet data was successfully saved to %1.</source>
+        <translation>Tegnebogsdata blev gemt til %1.</translation>
     </message>
 </context>
 <context>
@@ -1750,6 +2997,18 @@
         <source>Accept command line and JSON-RPC commands</source>
         <translation>Acceptér kommandolinje- og JSON-RPC-kommandoer</translation>
     </message>
+    <message>
+        <source>Accept connections from outside (default: 1 if no -proxy or -connect/-noconnect)</source>
+        <translation>Acceptér forbindelser udefra (standard: 1 hvis ingen -proxy eller -connect/-noconnect)</translation>
+    </message>
+    <message>
+        <source>Connect only to the specified node(s); -noconnect or -connect=0 alone to disable automatic connections</source>
+        <translation>Forbind kun til de specificerede knuder; -noconnect eller -connect=0 alene for at deaktivere automatiske forbindelser</translation>
+    </message>
+    <message>
+        <source>Distributed under the MIT software license, see the accompanying file %s or %s</source>
+        <translation>Distribueret under MIT-softwarelicensen; se den vedlagte fil %s eller %s</translation>
+    </message>
     <message>
         <source>If &lt;category&gt; is not supplied or if &lt;category&gt; = 1, output all debugging information.</source>
         <translation>Hvis &lt;category&gt; ikke angives eller hvis &lt;category&gt; = 1, udskriv al fejlretningsinformation.</translation>
@@ -1764,7 +3023,7 @@
     </message>
     <message>
         <source>Reduce storage requirements by pruning (deleting) old blocks. This mode is incompatible with -txindex and -rescan. Warning: Reverting this setting requires re-downloading the entire blockchain. (default: 0 = disable pruning blocks, &gt;%u = target size in MiB to use for block files)</source>
-        <translation>Reducér lagringskravene ved at beskære (slette) gamle blokke. Denne tilstand er ikke kompatibel med -txindex og -rescan. Advarsel: Fortrydelse af denne indstilling kræver gendownload af hele blokkæden. (standard: 0 = slå beskæring af blokke fra, &gt;%u = målstørrelse i MiB der skal bruges på blokfiler)</translation>
+        <translation>Reducér lagringskravene ved at beskære (slette) gamle blokke. Denne tilstand er ikke kompatibel med -txindex og -rescan. Advarsel: Fortrydelse af denne indstilling kræver gendownload af hele blokkæden. (standard: 0 = deaktivér beskæring af blokke, &gt;%u = målstørrelse i MiB der skal bruges på blokfiler)</translation>
     </message>
     <message>
         <source>Rescans are not possible in pruned mode. You will need to use -reindex which will download the whole blockchain again.</source>
@@ -1790,10 +3049,6 @@
         <source>Unable to start HTTP server. See debug log for details.</source>
         <translation>Kunne ikke starte HTTP-server. Se fejlretningslog for detaljer.</translation>
     </message>
-    <message>
-        <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
-        <translation>Acceptér forbindelser udefra (standard: 1 hvis hverken -proxy eller -connect)</translation>
-    </message>
     <message>
         <source>Bitcoin Core</source>
         <translation>Bitcoin Core</translation>
@@ -1802,10 +3057,6 @@
         <source>The %s developers</source>
         <translation>Udviklerne af %s</translation>
     </message>
-    <message>
-        <source>-fallbackfee is set very high! This is the transaction fee you may pay when fee estimates are not available.</source>
-        <translation>-fallbackfee er sat meget højt! Dette er transaktionsgebyret, du eventuelt betaler, hvis gebyrestimater ikke er tilgængelige.</translation>
-    </message>
     <message>
         <source>A fee rate (in %s/kB) that will be used when fee estimation has insufficient data (default: %s)</source>
         <translation>En gebyrsats (i %s/kB), som vil blive brugt, hvis gebyrestimering har utilstrækkelig data (standard: %s)</translation>
@@ -1826,10 +3077,6 @@
         <source>Delete all wallet transactions and only recover those parts of the blockchain through -rescan on startup</source>
         <translation>Slet alle transaktioner i tegnebogen og genskab kun disse dele af blokkæden gennem -rescan under opstart</translation>
     </message>
-    <message>
-        <source>Distributed under the MIT software license, see the accompanying file COPYING or &lt;http://www.opensource.org/licenses/mit-license.php&gt;.</source>
-        <translation>Distribueret under MIT-softwarelicensen; se den vedlagte fil COPYING eller &lt;http://www.opensource.org/licenses/mit-license.php&gt;.</translation>
-    </message>
     <message>
         <source>Error loading %s: You can't enable HD on a already existing non-HD wallet</source>
         <translation>Fejl under indlæsning af %s: Du kan ikke aktivere HD på en allerede eksisterende ikke-HD-tegnebog</translation>
@@ -1842,10 +3089,6 @@
         <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source>
         <translation>Udfør kommando, når en transaktion i tegnebogen ændres (%s i kommandoen erstattes med TxID)</translation>
     </message>
-    <message>
-        <source>Force relay of transactions from whitelisted peers even they violate local relay policy (default: %d)</source>
-        <translation>Gennemtving videresendelse af transaktioner fra hvidlistede knuder, selv om de overtræder lokal videresendelsespolitik (standard: %d)</translation>
-    </message>
     <message>
         <source>Maximum allowed median peer time offset adjustment. Local perspective of time may be influenced by peers forward or backward by this amount. (default: %u seconds)</source>
         <translation>Justering af maksimalt tilladt gennemsnitlig afvigelse fra peer-tid. Den lokale opfattelse af tid kan blive påvirket frem eller tilbage af peers med denne mængde tid. (standard: %u sekunder)</translation>
@@ -1872,7 +3115,7 @@
     </message>
     <message>
         <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
-        <translation>Dette er en foreløbig testudgivelse - brug på eget ansvar - brug ikke til udvinding eller handelsprogrammer</translation>
+        <translation>Dette er en foreløbig testudgivelse – brug på eget ansvar – brug ikke til mining eller handelsprogrammer</translation>
     </message>
     <message>
         <source>Unable to rewind the database to a pre-fork state. You will need to redownload the blockchain</source>
@@ -1882,6 +3125,10 @@
         <source>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</source>
         <translation>Brug UPnP for at konfigurere den lyttende port (standard: 1 under lytning og ingen -proxy)</translation>
     </message>
+    <message>
+        <source>Wallet will not create transactions that violate mempool chain limits (default: %u)</source>
+        <translation>Tegnebogen vil ikke oprette transaktioner, som overtræder begrænsningen for hukommelsespuljekæden (standard: %u)</translation>
+    </message>
     <message>
         <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source>
         <translation>Advarsel: Netværket ser ikke ud til at være fuldt ud enige! Enkelte minere ser ud til at opleve problemer.</translation>
@@ -1890,10 +3137,6 @@
         <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source>
         <translation>Advarsel: Vi ser ikke ud til at være fuldt ud enige med andre knuder! Du kan være nødt til at opgradere, eller andre knuder kan være nødt til at opgradere.</translation>
     </message>
-    <message>
-        <source>Whitelist peers connecting from the given netmask or IP address. Can be specified multiple times.</source>
-        <translation>Sæt andre knuder, der forbinder fra den angivne netmaske eller IP, på hvidliste. Kan angives flere gange.</translation>
-    </message>
     <message>
         <source>You need to rebuild the database using -reindex-chainstate to change -txindex</source>
         <translation>Du er nødt til at genopbygge databasen ved hjælp af -reindex-chainstate for at ændre -txindex</translation>
@@ -1924,15 +3167,15 @@
     </message>
     <message>
         <source>Cannot resolve -%s address: '%s'</source>
-        <translation>Kan ikke finde -%s-adressen: "%s"</translation>
+        <translation>Kan ikke finde -%s-adressen: “%s”</translation>
     </message>
     <message>
-        <source>Change index out of range</source>
-        <translation>Ændr indeks uden for interval</translation>
+        <source>Chain selection options:</source>
+        <translation>Indstillinger for kædevalg:</translation>
     </message>
     <message>
-        <source>Connect only to the specified node(s)</source>
-        <translation>Tilslut kun til de(n) angivne knude(r)</translation>
+        <source>Change index out of range</source>
+        <translation>Ændr indeks uden for interval</translation>
     </message>
     <message>
         <source>Connection options:</source>
@@ -1952,7 +3195,7 @@
     </message>
     <message>
         <source>Do not load the wallet and disable wallet RPC calls</source>
-        <translation>Indlæs ikke tegnebogen og slå tegnebogs-RPC-kald fra</translation>
+        <translation>Indlæs ikke tegnebogen og deaktivér tegnebogs-RPC-kald</translation>
     </message>
     <message>
         <source>Do you want to rebuild the block database now?</source>
@@ -2032,15 +3275,15 @@
     </message>
     <message>
         <source>Invalid -onion address: '%s'</source>
-        <translation>Ugyldig -onion adresse: "%s"</translation>
+        <translation>Ugyldig -onion adresse: “%s”</translation>
     </message>
     <message>
         <source>Invalid amount for -%s=&lt;amount&gt;: '%s'</source>
-        <translation>Ugyldigt beløb for -%s=&lt;beløb&gt;: "%s"</translation>
+        <translation>Ugyldigt beløb for -%s=&lt;beløb&gt;: “%s”</translation>
     </message>
     <message>
         <source>Invalid amount for -fallbackfee=&lt;amount&gt;: '%s'</source>
-        <translation>Ugyldigt beløb for -fallbackfee=&lt;beløb&gt;: "%s"</translation>
+        <translation>Ugyldigt beløb for -fallbackfee=&lt;beløb&gt;: “%s”</translation>
     </message>
     <message>
         <source>Keep the transaction memory pool below &lt;n&gt; megabytes (default: %u)</source>
@@ -2054,10 +3297,6 @@
         <source>Location of the auth cookie (default: data dir)</source>
         <translation>Placering for autentificerings-cookie (standard: datamappe)</translation>
     </message>
-    <message>
-        <source>Minimum bytes per sigop in transactions we relay and mine (default: %u)</source>
-        <translation>Minimum bytes pr. sigop i transaktioner, vi videresender og miner (standard: %u)</translation>
-    </message>
     <message>
         <source>Not enough file descriptors available.</source>
         <translation>For få tilgængelige fildeskriptorer.</translation>
@@ -2098,10 +3337,6 @@
         <source>Set database cache size in megabytes (%d to %d, default: %d)</source>
         <translation>Sæt cache-størrelse for database i megabytes (%d til %d; standard: %d)</translation>
     </message>
-    <message>
-        <source>Set maximum block cost (default: %d)</source>
-        <translation>Sæt maksimal blokudgift (standard: %d)</translation>
-    </message>
     <message>
         <source>Set maximum block size in bytes (default: %d)</source>
         <translation>Sæt maksimum blokstørrelse i byte (standard: %d)</translation>
@@ -2134,6 +3369,10 @@
         <source>Use UPnP to map the listening port (default: %u)</source>
         <translation>Brug UPnP til at konfigurere den lyttende port (standard: %u)</translation>
     </message>
+    <message>
+        <source>Use the test chain</source>
+        <translation>Brug testkæden</translation>
+    </message>
     <message>
         <source>User Agent comment (%s) contains unsafe characters.</source>
         <translation>Brugeragent-kommentar (%s) indeholder usikre tegn.</translation>
@@ -2176,7 +3415,7 @@
     </message>
     <message>
         <source>Create new files with system default permissions, instead of umask 077 (only effective with disabled wallet functionality)</source>
-        <translation>Opret nye filer med systemstandard for rettigheder i stedet for umask 077 (kun virksomt med tegnebogsfunktionalitet slået fra)</translation>
+        <translation>Opret nye filer med systemstandard for rettigheder i stedet for umask 077 (kun virksomt med tegnebogsfunktionalitet deaktiveret)</translation>
     </message>
     <message>
         <source>Discover own IP addresses (default: 1 when listening and no -externalip or -proxy)</source>
@@ -2200,16 +3439,12 @@
     </message>
     <message>
         <source>Invalid amount for -maxtxfee=&lt;amount&gt;: '%s' (must be at least the minrelay fee of %s to prevent stuck transactions)</source>
-        <translation>Ugyldigt beløb for -maxtxfee=&lt;beløb&gt;: "%s" (skal være på mindst minrelay-gebyret på %s for at undgå hængende transaktioner)</translation>
+        <translation>Ugyldigt beløb for -maxtxfee=&lt;beløb&gt;: “%s” (skal være på mindst minrelay-gebyret på %s for at undgå hængende transaktioner)</translation>
     </message>
     <message>
         <source>Maximum size of data in data carrier transactions we relay and mine (default: %u)</source>
         <translation>Maksimal størrelse på data i transaktioner til dataoverførsel, som vi videresender og miner (standard: %u)</translation>
     </message>
-    <message>
-        <source>Query for peer addresses via DNS lookup, if low on addresses (default: 1 unless -connect)</source>
-        <translation>Forespørgsel</translation>
-    </message>
     <message>
         <source>Randomize credentials for every proxy connection. This enables Tor stream isolation (default: %u)</source>
         <translation>Brug tilfældige akkreditiver for hver proxy-forbindelse. Dette aktiverer strømisolation med Tor (standard: %u)</translation>
@@ -2222,10 +3457,6 @@
         <source>The transaction amount is too small to send after the fee has been deducted</source>
         <translation>Transaktionsbeløbet er for lille til at sende, når gebyret er trukket fra</translation>
     </message>
-    <message>
-        <source>This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit &lt;https://www.openssl.org/&gt; and cryptographic software written by Eric Young and UPnP software written by Thomas Bernard.</source>
-        <translation>Dette produkt indeholder software, der er udviklet af OpenSSL-projektet for brug i OpenSSL-værktøjskassen &lt;https://www.openssl.org/&gt;, samt kryptografisk software, der er skrevet af Eric Young, samt UPnP-software, der er skrevet af Thomas Bernard.</translation>
-    </message>
     <message>
         <source>Use hierarchical deterministic key generation (HD) after BIP32. Only has effect during wallet creation/first start</source>
         <translation>Brug hierarkisk deterministisk nøglegenerering (HD) efter BIP32. Har kun effekt ved generering af ny tegnebog og under første opstart</translation>
@@ -2268,11 +3499,11 @@
     </message>
     <message>
         <source>Invalid amount for -paytxfee=&lt;amount&gt;: '%s' (must be at least %s)</source>
-        <translation>Ugyldigt beløb for -paytxfee=&lt;beløb&gt;: "%s" (skal være mindst %s)</translation>
+        <translation>Ugyldigt beløb for -paytxfee=&lt;beløb&gt;: “%s” (skal være mindst %s)</translation>
     </message>
     <message>
         <source>Invalid netmask specified in -whitelist: '%s'</source>
-        <translation>Ugyldig netmaske angivet i -whitelist: "%s"</translation>
+        <translation>Ugyldig netmaske angivet i -whitelist: “%s”</translation>
     </message>
     <message>
         <source>Keep at most &lt;n&gt; unconnectable transactions in memory (default: %u)</source>
@@ -2280,7 +3511,7 @@
     </message>
     <message>
         <source>Need to specify a port with -whitebind: '%s'</source>
-        <translation>Nødt til at angive en port med -whitebinde: "%s"</translation>
+        <translation>Nødt til at angive en port med -whitebinde: “%s”</translation>
     </message>
     <message>
         <source>Node relay options:</source>
@@ -2316,7 +3547,7 @@
     </message>
     <message>
         <source>Signing transaction failed</source>
-        <translation>Underskrift af transaktion mislykkedes</translation>
+        <translation>Signering af transaktion mislykkedes</translation>
     </message>
     <message>
         <source>The transaction amount is too small to pay the fee</source>
@@ -2338,10 +3569,6 @@
         <source>Transaction amount too small</source>
         <translation>Transaktionsbeløb er for lavt</translation>
     </message>
-    <message>
-        <source>Transaction amounts must be positive</source>
-        <translation>Transaktionsbeløb skal være positive</translation>
-    </message>
     <message>
         <source>Transaction too large for fee policy</source>
         <translation>Transaktion for stor til gebyrretningslinjer</translation>
@@ -2406,18 +3633,22 @@
         <source>-maxtxfee is set very high! Fees this large could be paid on a single transaction.</source>
         <translation>-maxtxfee er sat meget højt! Gebyrer så store risikeres betalt på en enkelt transaktion.</translation>
     </message>
-    <message>
-        <source>-paytxfee is set very high! This is the transaction fee you will pay if you send a transaction.</source>
-        <translation>-paytxfee er sat meget højt! Dette er transaktionsgebyret, som du betaler, hvis du sender en transaktion.</translation>
-    </message>
     <message>
         <source>Do not keep transactions in the mempool longer than &lt;n&gt; hours (default: %u)</source>
         <translation>Behold ikke transaktioner i hukommelsespuljen i mere end &lt;n&gt; timer (default: %u)</translation>
     </message>
+    <message>
+        <source>Equivalent bytes per sigop in transactions for relay and mining (default: %u)</source>
+        <translation>Tilsvarende bytes pr. sigop i transaktioner, som videresendes og mines (standard: %u)</translation>
+    </message>
     <message>
         <source>Fees (in %s/kB) smaller than this are considered zero fee for transaction creation (default: %s)</source>
         <translation>Gebyrer (i %s/kB) mindre end dette opfattes som intet gebyr under oprettelse af transaktioner (standard: %s)</translation>
     </message>
+    <message>
+        <source>Force relay of transactions from whitelisted peers even if they violate local relay policy (default: %d)</source>
+        <translation>Gennemtving videresendelse af transaktioner fra hvidlistede knuder, selv om de overtræder lokal videresendelsespolitik (standard: %d)</translation>
+    </message>
     <message>
         <source>How thorough the block verification of -checkblocks is (0-4, default: %u)</source>
         <translation>Hvor gennemarbejdet blokverificeringen for -checkblocks er (0-4; standard: %u)</translation>
@@ -2434,10 +3665,26 @@
         <source>Output debugging information (default: %u, supplying &lt;category&gt; is optional)</source>
         <translation>Udskriv fejlsøgningsinformation (standard: %u, angivelse af &lt;kategori&gt; er valgfri)</translation>
     </message>
+    <message>
+        <source>Query for peer addresses via DNS lookup, if low on addresses (default: 1 unless -connect/-noconnect)</source>
+        <translation>Forespørg knudeadresser via DNS-opslag hvis antallet af adresser er lavt (standard: 1 med mindre -connect/-noconnect)</translation>
+    </message>
+    <message>
+        <source>Sets the serialization of raw transaction or block hex returned in non-verbose mode, non-segwit(0) or segwit(1) (default: %d)</source>
+        <translation>Indstiller serialiseringen af rå transaktioner eller blok-hex returneret i ikke-verbose tilstand, non-segwit(0) eller sigwit(1) (standard: %d)</translation>
+    </message>
     <message>
         <source>Support filtering of blocks and transaction with bloom filters (default: %u)</source>
         <translation>Understøt filtrering af blokke og transaktioner med Bloom-filtre (standard: %u)</translation>
     </message>
+    <message>
+        <source>This is the transaction fee you may pay when fee estimates are not available.</source>
+        <translation>Dette er transaktionsgebyret, du kan betale, når gebyrestimeringer ikke er tilgængelige.</translation>
+    </message>
+    <message>
+        <source>This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit %s and cryptographic software written by Eric Young and UPnP software written by Thomas Bernard.</source>
+        <translation>Dette produkt indeholder software, der er udviklet af OpenSSL-projektet for brug i OpenSSL-værktøjskassen %s, samt kryptografisk software, der er skrevet af Eric Young, samt UPnP-software, der er skrevet af Thomas Bernard.</translation>
+    </message>
     <message>
         <source>Total length of network version string (%i) exceeds maximum length (%i). Reduce the number or size of uacomments.</source>
         <translation>Den totale længde på netværksversionsstrengen (%i) overstiger maksimallængden (%i). Reducér antaller af eller størrelsen på uacomments.</translation>
@@ -2470,6 +3717,14 @@
         <source>Warning: Wallet file corrupt, data salvaged! Original %s saved as %s in %s; if your balance or transactions are incorrect you should restore from a backup.</source>
         <translation>Advarsel: Tegnebogsfil ødelagt, data reddet! Oprindelig %s gemt som %s i %s; hvis din saldo eller dine transaktioner er forkert, bør du genskabe fra en sikkerhedskopi.</translation>
     </message>
+    <message>
+        <source>Whitelist peers connecting from the given IP address (e.g. 1.2.3.4) or CIDR notated network (e.g. 1.2.3.0/24). Can be specified multiple times.</source>
+        <translation>Sæt knuder på hvidliste, som forbinder fra den givne IP-adresse (fx 1.2.3.4) eller CIDR-noteret netværk (fx 1.2.3.0/24). Kan angives flere gange.</translation>
+    </message>
+    <message>
+        <source>%s is set very high!</source>
+        <translation>%s er meget højt sat!</translation>
+    </message>
     <message>
         <source>(default: %s)</source>
         <translation>(standard: %s)</translation>
@@ -2488,7 +3743,11 @@
     </message>
     <message>
         <source>Invalid -proxy address: '%s'</source>
-        <translation>Ugyldig -proxy adresse: "%s"</translation>
+        <translation>Ugyldig -proxy adresse: “%s”</translation>
+    </message>
+    <message>
+        <source>Keypool ran out, please call keypoolrefill first</source>
+        <translation>Nøglepulje løb tør; kald venligst keypoolrefill først</translation>
     </message>
     <message>
         <source>Listen for JSON-RPC connections on &lt;port&gt; (default: %u or testnet: %u)</source>
@@ -2526,14 +3785,18 @@
         <source>Relay non-P2SH multisig (default: %u)</source>
         <translation>Videresend ikke-P2SH multisig (standard: %u)</translation>
     </message>
+    <message>
+        <source>Send transactions with full-RBF opt-in enabled (default: %u)</source>
+        <translation>Send transaktioner med fuld-RBF opt-in aktiveret (standard: %u)</translation>
+    </message>
     <message>
         <source>Set key pool size to &lt;n&gt; (default: %u)</source>
         <translation>Sæt nøglepuljestørrelse til &lt;n&gt; (standard: %u)
 </translation>
     </message>
     <message>
-        <source>Set minimum block size in bytes (default: %u)</source>
-        <translation>Angiv minimumsblokstørrelse i byte (standard: %u)</translation>
+        <source>Set maximum BIP141 block weight (default: %d)</source>
+        <translation>Sæt maksimal BIP141-blokvægt (standard: %d)</translation>
     </message>
     <message>
         <source>Set the number of threads to service RPC calls (default: %d)</source>
@@ -2555,13 +3818,41 @@
         <source>Spend unconfirmed change when sending transactions (default: %u)</source>
         <translation>Brug ubekræftede byttepenge under afsendelse af transaktioner (standard: %u)</translation>
     </message>
+    <message>
+        <source>Starting network threads...</source>
+        <translation>Starter netværkstråde…</translation>
+    </message>
+    <message>
+        <source>The wallet will avoid paying less than the minimum relay fee.</source>
+        <translation>Tegnebogen vil undgå at betale mindre end minimum-videresendelsesgebyret.</translation>
+    </message>
+    <message>
+        <source>This is the minimum transaction fee you pay on every transaction.</source>
+        <translation>Dette er det transaktionsgebyr, du minimum betaler for hver transaktion.</translation>
+    </message>
+    <message>
+        <source>This is the transaction fee you will pay if you send a transaction.</source>
+        <translation>Dette er transaktionsgebyret, som betaler, når du sender en transaktion.</translation>
+    </message>
     <message>
         <source>Threshold for disconnecting misbehaving peers (default: %u)</source>
         <translation>Grænse for afbrydelse af forbindelse til knuder, der opfører sig upassende (standard: %u)</translation>
     </message>
+    <message>
+        <source>Transaction amounts must not be negative</source>
+        <translation>Transaktionsbeløb må ikke være negative</translation>
+    </message>
+    <message>
+        <source>Transaction has too long of a mempool chain</source>
+        <translation>Transaktionen har en for lang hukommelsespuljekæde</translation>
+    </message>
+    <message>
+        <source>Transaction must have at least one recipient</source>
+        <translation>Transaktionen skal have mindst én modtager</translation>
+    </message>
     <message>
         <source>Unknown network specified in -onlynet: '%s'</source>
-        <translation>Ukendt netværk anført i -onlynet: "%s"</translation>
+        <translation>Ukendt netværk anført i -onlynet: “%s”</translation>
     </message>
     <message>
         <source>Insufficient funds</source>
diff --git a/src/qt/locale/bitcoin_de.ts b/src/qt/locale/bitcoin_de.ts
index 2708324d172e1..25d3f45163edd 100644
--- a/src/qt/locale/bitcoin_de.ts
+++ b/src/qt/locale/bitcoin_de.ts
@@ -41,6 +41,77 @@
         <source>&amp;Delete</source>
         <translation>&amp;Löschen</translation>
     </message>
+    <message>
+        <source>Choose the address to send coins to</source>
+        <translation>Wählen Sie die Adresse aus, an die Sie Bitcoins überweisen möchten</translation>
+    </message>
+    <message>
+        <source>Choose the address to receive coins with</source>
+        <translation>Wählen Sie die Adresse aus, über die Sie Bitcoins empfangen wollen</translation>
+    </message>
+    <message>
+        <source>C&amp;hoose</source>
+        <translation>&amp;Auswählen</translation>
+    </message>
+    <message>
+        <source>Sending addresses</source>
+        <translation>Zahlungsadressen</translation>
+    </message>
+    <message>
+        <source>Receiving addresses</source>
+        <translation>Empfangsadressen</translation>
+    </message>
+    <message>
+        <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source>
+        <translation>Dies sind ihre Bitcoin-Adressen zum Tätigen von Überweisungen. Bitte prüfen Sie den Betrag und die Empfangsadresse, bevor Sie Bitcoins überweisen.</translation>
+    </message>
+    <message>
+        <source>These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source>
+        <translation>Dies sind Ihre Bitcoin-Adressen zum Empfangen von Zahlungen. Es wird empfohlen, für jede Transaktion eine neue Empfangsadresse zu verwenden.</translation>
+    </message>
+    <message>
+        <source>&amp;Copy Address</source>
+        <translation>Adresse &amp;kopieren</translation>
+    </message>
+    <message>
+        <source>Copy &amp;Label</source>
+        <translation>&amp;Bezeichnung kopieren</translation>
+    </message>
+    <message>
+        <source>&amp;Edit</source>
+        <translation>&amp;Editieren</translation>
+    </message>
+    <message>
+        <source>Export Address List</source>
+        <translation>Addressliste exportieren</translation>
+    </message>
+    <message>
+        <source>Comma separated file (*.csv)</source>
+        <translation>Kommagetrennte-Datei (*.csv)</translation>
+    </message>
+    <message>
+        <source>Exporting Failed</source>
+        <translation>Exportieren fehlgeschlagen</translation>
+    </message>
+    <message>
+        <source>There was an error trying to save the address list to %1. Please try again.</source>
+        <translation>Beim Speichern der Adressliste nach %1 ist ein Fehler aufgetreten. Bitte versuchen Sie es erneut.</translation>
+    </message>
+</context>
+<context>
+    <name>AddressTableModel</name>
+    <message>
+        <source>Label</source>
+        <translation>Bezeichnung</translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation>Adresse</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(keine Bezeichnung)</translation>
+    </message>
 </context>
 <context>
     <name>AskPassphraseDialog</name>
@@ -60,6 +131,94 @@
         <source>Repeat new passphrase</source>
         <translation>Neue Passphrase bestätigen</translation>
     </message>
+    <message>
+        <source>Enter the new passphrase to the wallet.&lt;br/&gt;Please use a passphrase of &lt;b&gt;ten or more random characters&lt;/b&gt;, or &lt;b&gt;eight or more words&lt;/b&gt;.</source>
+        <translation>Geben Sie die neue Passphrase für die Wallet ein.&lt;br&gt;Bitte benutzen Sie eine Passphrase bestehend aus &lt;b&gt;zehn oder mehr zufälligen Zeichen&lt;/b&gt; oder &lt;b&gt;acht oder mehr Wörtern&lt;/b&gt;.</translation>
+    </message>
+    <message>
+        <source>Encrypt wallet</source>
+        <translation>Wallet verschlüsseln</translation>
+    </message>
+    <message>
+        <source>This operation needs your wallet passphrase to unlock the wallet.</source>
+        <translation>Dieser Vorgang benötigt ihre Passphrase, um die Wallet zu entsperren.</translation>
+    </message>
+    <message>
+        <source>Unlock wallet</source>
+        <translation>Wallet entsperren</translation>
+    </message>
+    <message>
+        <source>This operation needs your wallet passphrase to decrypt the wallet.</source>
+        <translation>Dieser Vorgang benötigt Ihre Passphrase, um die Wallet zu entschlüsseln.</translation>
+    </message>
+    <message>
+        <source>Decrypt wallet</source>
+        <translation>Wallet entschlüsseln</translation>
+    </message>
+    <message>
+        <source>Change passphrase</source>
+        <translation>Passphrase ändern</translation>
+    </message>
+    <message>
+        <source>Enter the old passphrase and new passphrase to the wallet.</source>
+        <translation>Geben Sie die alte und neue Wallet-Passphrase ein.</translation>
+    </message>
+    <message>
+        <source>Confirm wallet encryption</source>
+        <translation>Wallet-Verschlüsselung bestätigen</translation>
+    </message>
+    <message>
+        <source>Warning: If you encrypt your wallet and lose your passphrase, you will &lt;b&gt;LOSE ALL OF YOUR BITCOINS&lt;/b&gt;!</source>
+        <translation>Warnung: Wenn Sie Ihre Wallet verschlüsseln und Ihre Passphrase verlieren, werden Sie &lt;b&gt;alle Ihre Bitcoins verlieren&lt;/b&gt;!</translation>
+    </message>
+    <message>
+        <source>Are you sure you wish to encrypt your wallet?</source>
+        <translation>Sind Sie sich sicher, dass Sie Ihre Wallet verschlüsseln möchten?</translation>
+    </message>
+    <message>
+        <source>Wallet encrypted</source>
+        <translation>Wallet verschlüsselt</translation>
+    </message>
+    <message>
+        <source>%1 will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source>
+        <translation>%1 wird jetzt beendet, um den Verschlüsselungsprozess abzuschließen. Bitte beachten Sie, dass die Wallet-Verschlüsselung nicht vollständig vor Diebstahl Ihrer Bitcoins durch Schadprogramme schützt, die Ihren Computer befällt.</translation>
+    </message>
+    <message>
+        <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source>
+        <translation>WICHTIG: Alle vorherigen Wallet-Sicherungen sollten durch die neu erzeugte, verschlüsselte Wallet ersetzt werden. Aus Sicherheitsgründen werden vorherige Sicherungen der unverschlüsselten Wallet nutzlos, sobald Sie die neue, verschlüsselte Wallet verwenden.</translation>
+    </message>
+    <message>
+        <source>Wallet encryption failed</source>
+        <translation>Wallet-Verschlüsselung fehlgeschlagen</translation>
+    </message>
+    <message>
+        <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
+        <translation>Die Wallet-Verschlüsselung ist aufgrund eines internen Fehlers fehlgeschlagen. Ihre Wallet wurde nicht verschlüsselt.</translation>
+    </message>
+    <message>
+        <source>The supplied passphrases do not match.</source>
+        <translation>Die eingegebenen Passphrasen stimmen nicht überein.</translation>
+    </message>
+    <message>
+        <source>Wallet unlock failed</source>
+        <translation>Wallet-Entsperrung fehlgeschlagen</translation>
+    </message>
+    <message>
+        <source>The passphrase entered for the wallet decryption was incorrect.</source>
+        <translation>Die eingegebene Passphrase zur Wallet-Entschlüsselung war nicht korrekt.</translation>
+    </message>
+    <message>
+        <source>Wallet decryption failed</source>
+        <translation>Wallet-Entschlüsselung fehlgeschlagen</translation>
+    </message>
+    <message>
+        <source>Wallet passphrase was successfully changed.</source>
+        <translation>Die Wallet-Passphrase wurde erfolgreich geändert.</translation>
+    </message>
+    <message>
+        <source>Warning: The Caps Lock key is on!</source>
+        <translation>Warnung: Die Feststelltaste ist aktiviert!</translation>
+    </message>
 </context>
 <context>
     <name>BanTableModel</name>
@@ -112,7 +271,7 @@
     </message>
     <message>
         <source>&amp;About %1</source>
-        <translation>&amp;Über %1</translation>
+        <translation>Über %1</translation>
     </message>
     <message>
         <source>Show information about %1</source>
@@ -158,6 +317,18 @@
         <source>Open &amp;URI...</source>
         <translation>&amp;URI öffnen...</translation>
     </message>
+    <message>
+        <source>Click to disable network activity.</source>
+        <translation>Klicken zum Deaktivieren der Netzwerkaktivität.</translation>
+    </message>
+    <message>
+        <source>Network activity disabled.</source>
+        <translation>Netzwerkaktivität deaktiviert.</translation>
+    </message>
+    <message>
+        <source>Click to enable network activity again.</source>
+        <translation>Klicken zum Aktivieren der Netzwerkaktivität.</translation>
+    </message>
     <message>
         <source>Reindexing blocks on disk...</source>
         <translation>Reindiziere Blöcke auf Datenträger...</translation>
@@ -278,26 +449,6 @@
         <source>Processed %n block(s) of transaction history.</source>
         <translation><numerusform>%n Block des Transaktionsverlaufs verarbeitet.</numerusform><numerusform>%n Blöcke des Transaktionsverlaufs verarbeitet.</numerusform></translation>
     </message>
-    <message numerus="yes">
-        <source>%n hour(s)</source>
-        <translation><numerusform>%n Stunde</numerusform><numerusform>%n Stunden</numerusform></translation>
-    </message>
-    <message numerus="yes">
-        <source>%n day(s)</source>
-        <translation><numerusform>%n Tag</numerusform><numerusform>%n Tage</numerusform></translation>
-    </message>
-    <message numerus="yes">
-        <source>%n week(s)</source>
-        <translation><numerusform>%n Woche</numerusform><numerusform>%n Wochen</numerusform></translation>
-    </message>
-    <message>
-        <source>%1 and %2</source>
-        <translation>%1 und %2</translation>
-    </message>
-    <message numerus="yes">
-        <source>%n year(s)</source>
-        <translation><numerusform>%n Jahr</numerusform><numerusform>%n Jahre</numerusform></translation>
-    </message>
     <message>
         <source>%1 behind</source>
         <translation>%1 im Rückstand</translation>
@@ -376,6 +527,14 @@
         <source>Incoming transaction</source>
         <translation>Eingehende Transaktion</translation>
     </message>
+    <message>
+        <source>HD key generation is &lt;b&gt;enabled&lt;/b&gt;</source>
+        <translation>HD Schlüssel Generierung ist &lt;b&gt;aktiviert&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <source>HD key generation is &lt;b&gt;disabled&lt;/b&gt;</source>
+        <translation>HD Schlüssel Generierung ist &lt;b&gt;deaktiviert&lt;/b&gt;</translation>
+    </message>
     <message>
         <source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;unlocked&lt;/b&gt;</source>
         <translation>Wallet ist &lt;b&gt;verschlüsselt&lt;/b&gt; und aktuell &lt;b&gt;entsperrt&lt;/b&gt;</translation>
@@ -384,6 +543,10 @@
         <source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;locked&lt;/b&gt;</source>
         <translation>Wallet ist &lt;b&gt;verschlüsselt&lt;/b&gt; und aktuell &lt;b&gt;gesperrt&lt;/b&gt;</translation>
     </message>
+    <message>
+        <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source>
+        <translation>Ein schwerer Fehler ist aufgetreten. Bitcoin kann nicht stabil weiter ausgeführt werden und wird beendet.</translation>
+    </message>
 </context>
 <context>
     <name>CoinControlDialog</name>
@@ -403,10 +566,6 @@
         <source>Amount:</source>
         <translation>Betrag:</translation>
     </message>
-    <message>
-        <source>Priority:</source>
-        <translation>Priorität:</translation>
-    </message>
     <message>
         <source>Fee:</source>
         <translation>Gebühr:</translation>
@@ -460,8 +619,84 @@
         <translation>Bestätigt</translation>
     </message>
     <message>
-        <source>Priority</source>
-        <translation>Priorität</translation>
+        <source>Copy address</source>
+        <translation>Adresse kopieren</translation>
+    </message>
+    <message>
+        <source>Copy label</source>
+        <translation>Bezeichnung kopieren</translation>
+    </message>
+    <message>
+        <source>Copy amount</source>
+        <translation>Betrag kopieren</translation>
+    </message>
+    <message>
+        <source>Copy transaction ID</source>
+        <translation>Transaktionskennung kopieren</translation>
+    </message>
+    <message>
+        <source>Lock unspent</source>
+        <translation>Nicht ausgegebenen Betrag sperren</translation>
+    </message>
+    <message>
+        <source>Unlock unspent</source>
+        <translation>Nicht ausgegebenen Betrag entsperren</translation>
+    </message>
+    <message>
+        <source>Copy quantity</source>
+        <translation>Anzahl kopieren</translation>
+    </message>
+    <message>
+        <source>Copy fee</source>
+        <translation>Gebühr kopieren</translation>
+    </message>
+    <message>
+        <source>Copy after fee</source>
+        <translation>Abzüglich Gebühr kopieren</translation>
+    </message>
+    <message>
+        <source>Copy bytes</source>
+        <translation>Byte kopieren</translation>
+    </message>
+    <message>
+        <source>Copy dust</source>
+        <translation>"Staub" kopieren</translation>
+    </message>
+    <message>
+        <source>Copy change</source>
+        <translation>Wechselgeld kopieren</translation>
+    </message>
+    <message>
+        <source>(%1 locked)</source>
+        <translation>(%1 gesperrt)</translation>
+    </message>
+    <message>
+        <source>yes</source>
+        <translation>ja</translation>
+    </message>
+    <message>
+        <source>no</source>
+        <translation>nein</translation>
+    </message>
+    <message>
+        <source>This label turns red if any recipient receives an amount smaller than the current dust threshold.</source>
+        <translation>Diese Bezeichnung wird rot, wenn irgendein Empfänger einen Betrag kleiner als die derzeitige "Staubgrenze" erhält.</translation>
+    </message>
+    <message>
+        <source>Can vary +/- %1 satoshi(s) per input.</source>
+        <translation>Kann pro Eingabe um +/- %1 Satoshi(s) abweichen.</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(keine Bezeichnung)</translation>
+    </message>
+    <message>
+        <source>change from %1 (%2)</source>
+        <translation>Wechselgeld von %1 (%2)</translation>
+    </message>
+    <message>
+        <source>(change)</source>
+        <translation>(Wechselgeld)</translation>
     </message>
 </context>
 <context>
@@ -486,6 +721,38 @@
         <source>&amp;Address</source>
         <translation>&amp;Adresse</translation>
     </message>
+    <message>
+        <source>New receiving address</source>
+        <translation>Neue Empfangsadresse</translation>
+    </message>
+    <message>
+        <source>New sending address</source>
+        <translation>Neue Zahlungsadresse</translation>
+    </message>
+    <message>
+        <source>Edit receiving address</source>
+        <translation>Empfangsadresse bearbeiten</translation>
+    </message>
+    <message>
+        <source>Edit sending address</source>
+        <translation>Zahlungsadresse bearbeiten</translation>
+    </message>
+    <message>
+        <source>The entered address "%1" is not a valid Bitcoin address.</source>
+        <translation>Die eingegebene Adresse "%1" ist keine gültige Bitcoin-Adresse.</translation>
+    </message>
+    <message>
+        <source>The entered address "%1" is already in the address book.</source>
+        <translation>Die eingegebene Adresse "%1" befindet sich bereits im Adressbuch.</translation>
+    </message>
+    <message>
+        <source>Could not unlock wallet.</source>
+        <translation>Wallet konnte nicht entsperrt werden.</translation>
+    </message>
+    <message>
+        <source>New key generation failed.</source>
+        <translation>Erzeugung eines neuen Schlüssels fehlgeschlagen.</translation>
+    </message>
 </context>
 <context>
     <name>FreespaceChecker</name>
@@ -608,6 +875,49 @@
         <translation><numerusform>(von benötigtem %n GB)</numerusform><numerusform>(von benötigten %n GB)</numerusform></translation>
     </message>
 </context>
+<context>
+    <name>ModalOverlay</name>
+    <message>
+        <source>Form</source>
+        <translation>Formular</translation>
+    </message>
+    <message>
+        <source>Number of blocks left</source>
+        <translation>Anzahl verbleibender Blöcke</translation>
+    </message>
+    <message>
+        <source>Unknown...</source>
+        <translation>Unbekannt...</translation>
+    </message>
+    <message>
+        <source>Last block time</source>
+        <translation>Letzte Blockzeit</translation>
+    </message>
+    <message>
+        <source>Progress</source>
+        <translation>Fortschritt</translation>
+    </message>
+    <message>
+        <source>Progress increase per hour</source>
+        <translation>Fortschritt pro Stunde</translation>
+    </message>
+    <message>
+        <source>calculating...</source>
+        <translation>berechne...</translation>
+    </message>
+    <message>
+        <source>Estimated time left until synced</source>
+        <translation>Abschätzung der verbleibenden Zeit bis synchronisiert</translation>
+    </message>
+    <message>
+        <source>Hide</source>
+        <translation>Ausblenden</translation>
+    </message>
+    <message>
+        <source>Unknown. Syncing Headers (%1)...</source>
+        <translation>Unbekannt. Synchronisiere Headers (%1)...</translation>
+    </message>
+</context>
 <context>
     <name>OpenURIDialog</name>
     <message>
@@ -626,6 +936,10 @@
         <source>Select payment request file</source>
         <translation>Zahlungsanforderungsdatei auswählen</translation>
     </message>
+    <message>
+        <source>Select payment request file to open</source>
+        <translation>Zu öffnende Zahlungsanforderungsdatei auswählen</translation>
+    </message>
 </context>
 <context>
     <name>OptionsDialog</name>
@@ -809,6 +1123,10 @@
         <source>User Interface &amp;language:</source>
         <translation>&amp;Sprache der Benutzeroberfläche:</translation>
     </message>
+    <message>
+        <source>The user interface language can be set here. This setting will take effect after restarting %1.</source>
+        <translation>Die Benutzeroberflächensprache kann hier festgelegt werden. Diese Einstellung wird nach einem Neustart von %1 wirksam werden.</translation>
+    </message>
     <message>
         <source>&amp;Unit to show amounts in:</source>
         <translation>&amp;Einheit der Beträge:</translation>
@@ -933,6 +1251,97 @@
         <translation>Aktueller Gesamtbetrag in beobachteten Adressen aus obigen Kategorien</translation>
     </message>
 </context>
+<context>
+    <name>PaymentServer</name>
+    <message>
+        <source>Payment request error</source>
+        <translation>fehlerhafte Zahlungsanforderung</translation>
+    </message>
+    <message>
+        <source>Cannot start bitcoin: click-to-pay handler</source>
+        <translation>Kann Bitcoin nicht starten: Klicken-zum-Bezahlen-Handler</translation>
+    </message>
+    <message>
+        <source>URI handling</source>
+        <translation>URI-Verarbeitung</translation>
+    </message>
+    <message>
+        <source>Payment request fetch URL is invalid: %1</source>
+        <translation>Abruf-URL der Zahlungsanforderung ist ungültig: %1</translation>
+    </message>
+    <message>
+        <source>Invalid payment address %1</source>
+        <translation>Ungültige Zahlungsadresse %1</translation>
+    </message>
+    <message>
+        <source>URI cannot be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source>
+        <translation>URI kann nicht analysiert werden! Dies kann durch eine ungültige Bitcoin-Adresse oder fehlerhafte URI-Parameter verursacht werden.</translation>
+    </message>
+    <message>
+        <source>Payment request file handling</source>
+        <translation>Zahlungsanforderungsdatei-Verarbeitung</translation>
+    </message>
+    <message>
+        <source>Payment request file cannot be read! This can be caused by an invalid payment request file.</source>
+        <translation>Zahlungsanforderungsdatei kann nicht gelesen werden! Dies kann durch eine ungültige Zahlungsanforderungsdatei verursacht werden.</translation>
+    </message>
+    <message>
+        <source>Payment request rejected</source>
+        <translation>Zahlungsanforderung abgelehnt</translation>
+    </message>
+    <message>
+        <source>Payment request network doesn't match client network.</source>
+        <translation>Netzwerk der Zahlungsanforderung stimmt nicht mit dem Client-Netzwerk überein.</translation>
+    </message>
+    <message>
+        <source>Payment request expired.</source>
+        <translation>Zahlungsanforderung abgelaufen.</translation>
+    </message>
+    <message>
+        <source>Payment request is not initialized.</source>
+        <translation>Zahlungsanforderung ist nicht initialisiert.</translation>
+    </message>
+    <message>
+        <source>Unverified payment requests to custom payment scripts are unsupported.</source>
+        <translation>Unverifizierte Zahlungsanforderungen an benutzerdefinierte Zahlungsskripte werden nicht unterstützt.</translation>
+    </message>
+    <message>
+        <source>Invalid payment request.</source>
+        <translation>Ungültige Zahlungsanforderung.</translation>
+    </message>
+    <message>
+        <source>Requested payment amount of %1 is too small (considered dust).</source>
+        <translation>Angeforderter Zahlungsbetrag in Höhe von %1 ist zu niedrig und wurde als "Staub" eingestuft.</translation>
+    </message>
+    <message>
+        <source>Refund from %1</source>
+        <translation>Rücküberweisung von %1</translation>
+    </message>
+    <message>
+        <source>Payment request %1 is too large (%2 bytes, allowed %3 bytes).</source>
+        <translation>Zahlungsanforderung %1 ist zu groß (%2 Byte, erlaubt sind %3 Byte).</translation>
+    </message>
+    <message>
+        <source>Error communicating with %1: %2</source>
+        <translation>Kommunikationsfehler mit %1: %2</translation>
+    </message>
+    <message>
+        <source>Payment request cannot be parsed!</source>
+        <translation>Zahlungsanforderung kann nicht verarbeitet werden!</translation>
+    </message>
+    <message>
+        <source>Bad response from server %1</source>
+        <translation>Fehlerhafte Antwort vom Server: %1</translation>
+    </message>
+    <message>
+        <source>Network request error</source>
+        <translation>fehlerhafte Netzwerkanfrage</translation>
+    </message>
+    <message>
+        <source>Payment acknowledged</source>
+        <translation>Zahlung bestätigt</translation>
+    </message>
+</context>
 <context>
     <name>PeerTableModel</name>
     <message>
@@ -944,8 +1353,12 @@
         <translation>Knoten/Dienst</translation>
     </message>
     <message>
-        <source>Ping Time</source>
-        <translation>Pingzeit</translation>
+        <source>NodeId</source>
+        <translation>Knoten Identität</translation>
+    </message>
+    <message>
+        <source>Ping</source>
+        <translation>Ping</translation>
     </message>
 </context>
 <context>
@@ -986,12 +1399,74 @@
         <source>%1 ms</source>
         <translation>%1 ms</translation>
     </message>
-</context>
-<context>
-    <name>RPCConsole</name>
-    <message>
-        <source>N/A</source>
-        <translation>k.A.</translation>
+    <message numerus="yes">
+        <source>%n second(s)</source>
+        <translation><numerusform>%n Sekunde</numerusform><numerusform>%n Sekunde(n)</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%n minute(s)</source>
+        <translation><numerusform>%n Minute</numerusform><numerusform>%n Minute(n)</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%n hour(s)</source>
+        <translation><numerusform>%n Stunde</numerusform><numerusform>%n Stunden</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%n day(s)</source>
+        <translation><numerusform>%n Tag</numerusform><numerusform>%n Tage</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%n week(s)</source>
+        <translation><numerusform>%n Woche</numerusform><numerusform>%n Wochen</numerusform></translation>
+    </message>
+    <message>
+        <source>%1 and %2</source>
+        <translation>%1 und %2</translation>
+    </message>
+    <message>
+        <source>%1 didn't yet exit safely...</source>
+        <translation>%1 wurde noch nicht sicher beendet...</translation>
+    </message>
+</context>
+<context>
+    <name>QObject::QObject</name>
+    <message>
+        <source>Error: Specified data directory "%1" does not exist.</source>
+        <translation>Fehler: Angegebenes Datenverzeichnis "%1" existiert nicht.</translation>
+    </message>
+    <message>
+        <source>Error: Cannot parse configuration file: %1. Only use key=value syntax.</source>
+        <translation>Fehler: Konfigurationsdatei kann nicht analysiert werden: %1. Bitte nur "Schlüssel=Wert"-Syntax verwenden.</translation>
+    </message>
+    <message>
+        <source>Error: %1</source>
+        <translation>Fehler: %1</translation>
+    </message>
+</context>
+<context>
+    <name>QRImageWidget</name>
+    <message>
+        <source>&amp;Save Image...</source>
+        <translation>Grafik &amp;speichern...</translation>
+    </message>
+    <message>
+        <source>&amp;Copy Image</source>
+        <translation>Grafik &amp;kopieren</translation>
+    </message>
+    <message>
+        <source>Save QR Code</source>
+        <translation>QR-Code speichern</translation>
+    </message>
+    <message>
+        <source>PNG Image (*.png)</source>
+        <translation>PNG-Grafik (*.png)</translation>
+    </message>
+</context>
+<context>
+    <name>RPCConsole</name>
+    <message>
+        <source>N/A</source>
+        <translation>k.A.</translation>
     </message>
     <message>
         <source>Client version</source>
@@ -1145,6 +1620,10 @@
         <source>Ping Wait</source>
         <translation>Ping Wartezeit</translation>
     </message>
+    <message>
+        <source>Min Ping</source>
+        <translation>Minimaler Ping</translation>
+    </message>
     <message>
         <source>Time Offset</source>
         <translation>Zeitversatz</translation>
@@ -1189,14 +1668,6 @@
         <source>Clear console</source>
         <translation>Konsole zurücksetzen</translation>
     </message>
-    <message>
-        <source>&amp;Disconnect Node</source>
-        <translation>Knoten &amp;trennen</translation>
-    </message>
-    <message>
-        <source>Ban Node for</source>
-        <translation>Knoten gebannt für</translation>
-    </message>
     <message>
         <source>1 &amp;hour</source>
         <translation>1 &amp;Stunde</translation>
@@ -1214,7 +1685,15 @@
         <translation>1 &amp;Jahr</translation>
     </message>
     <message>
-        <source>&amp;Unban Node</source>
+        <source>&amp;Disconnect</source>
+        <translation>&amp;Trennen</translation>
+    </message>
+    <message>
+        <source>Ban for</source>
+        <translation>Banne für</translation>
+    </message>
+    <message>
+        <source>&amp;Unban</source>
         <translation>&amp;Node entsperren</translation>
     </message>
     <message>
@@ -1229,6 +1708,14 @@
         <source>Type &lt;b&gt;help&lt;/b&gt; for an overview of available commands.</source>
         <translation>Bitte &lt;b&gt;help&lt;/b&gt; eingeben, um eine Übersicht verfügbarer Befehle zu erhalten.</translation>
     </message>
+    <message>
+        <source>WARNING: Scammers have been active, telling users to type commands here, stealing their wallet contents. Do not use this console without fully understanding the ramification of a command.</source>
+        <translation>WARNUNG: Betrüger versuchen aktiv Nutzer dazu zu bringen Kommandos hier auszuführen um die Wallet Inhalte zu stehlen. Diese Konsole sollte nicht benutzt werden ausser man kennt die möglichen Folgen des Kommandos.</translation>
+    </message>
+    <message>
+        <source>Network activity disabled</source>
+        <translation>Netzwerkaktivität deaktiviert</translation>
+    </message>
     <message>
         <source>%1 B</source>
         <translation>%1 B</translation>
@@ -1348,6 +1835,22 @@
         <source>Remove</source>
         <translation>Entfernen</translation>
     </message>
+    <message>
+        <source>Copy URI</source>
+        <translation>&amp;URI kopieren</translation>
+    </message>
+    <message>
+        <source>Copy label</source>
+        <translation>Bezeichnung kopieren</translation>
+    </message>
+    <message>
+        <source>Copy message</source>
+        <translation>Nachricht kopieren</translation>
+    </message>
+    <message>
+        <source>Copy amount</source>
+        <translation>Betrag kopieren</translation>
+    </message>
 </context>
 <context>
     <name>ReceiveRequestDialog</name>
@@ -1367,6 +1870,73 @@
         <source>&amp;Save Image...</source>
         <translation>Grafik &amp;speichern...</translation>
     </message>
+    <message>
+        <source>Request payment to %1</source>
+        <translation>Zahlung anfordern an %1</translation>
+    </message>
+    <message>
+        <source>Payment information</source>
+        <translation>Zahlungsinformationen</translation>
+    </message>
+    <message>
+        <source>URI</source>
+        <translation>URI</translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation>Adresse</translation>
+    </message>
+    <message>
+        <source>Amount</source>
+        <translation>Betrag</translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation>Bezeichnung</translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation>Nachricht</translation>
+    </message>
+    <message>
+        <source>Resulting URI too long, try to reduce the text for label / message.</source>
+        <translation>Resultierende URI ist zu lang, bitte den Text für Bezeichnung/Nachricht kürzen.</translation>
+    </message>
+    <message>
+        <source>Error encoding URI into QR Code.</source>
+        <translation>Beim Enkodieren der URI in den QR-Code ist ein Fehler aufgetreten.</translation>
+    </message>
+</context>
+<context>
+    <name>RecentRequestsTableModel</name>
+    <message>
+        <source>Date</source>
+        <translation>Datum</translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation>Bezeichnung</translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation>Nachricht</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(keine Bezeichnung)</translation>
+    </message>
+    <message>
+        <source>(no message)</source>
+        <translation>(keine Nachricht)</translation>
+    </message>
+    <message>
+        <source>(no amount requested)</source>
+        <translation>(kein Betrag angefordert)</translation>
+    </message>
+    <message>
+        <source>Requested</source>
+        <translation>Angefordert</translation>
+    </message>
 </context>
 <context>
     <name>SendCoinsDialog</name>
@@ -1402,10 +1972,6 @@
         <source>Amount:</source>
         <translation>Betrag:</translation>
     </message>
-    <message>
-        <source>Priority:</source>
-        <translation>Priorität:</translation>
-    </message>
     <message>
         <source>Fee:</source>
         <translation>Gebühr:</translation>
@@ -1423,305 +1989,974 @@
         <translation>Wenn dies aktivert, und die Wechselgeld-Adresse leer oder ungültig ist, wird das Wechselgeld einer neu erzeugten Adresse gutgeschrieben.</translation>
     </message>
     <message>
-        <source>Custom change address</source>
-        <translation>Benutzerdefinierte Wechselgeld-Adresse</translation>
+        <source>Custom change address</source>
+        <translation>Benutzerdefinierte Wechselgeld-Adresse</translation>
+    </message>
+    <message>
+        <source>Transaction Fee:</source>
+        <translation>Transaktionsgebühr:</translation>
+    </message>
+    <message>
+        <source>Choose...</source>
+        <translation>Auswählen...</translation>
+    </message>
+    <message>
+        <source>collapse fee-settings</source>
+        <translation>Transaktionsgebühreneinstellungen ausblenden</translation>
+    </message>
+    <message>
+        <source>per kilobyte</source>
+        <translation>pro Kilobyte</translation>
+    </message>
+    <message>
+        <source>If the custom fee is set to 1000 satoshis and the transaction is only 250 bytes, then "per kilobyte" only pays 250 satoshis in fee, while "total at least" pays 1000 satoshis. For transactions bigger than a kilobyte both pay by kilobyte.</source>
+        <translation>Wenn die benutzerdefinierte Gebühr 1000 Satoshis beträgt und die Transaktion nur 250 Byte groß ist, wird bei Auswahl von "pro Kilobyte" eine Gebühr in Höhe von 250 Satoshis, bei Auswahl von "Mindestbetrag" eine Gebühr in Höhe von 1000 Satoshis bezahlt. Bei Transaktionen die Größer als ein Kilobyte sind, werden bei beiden Optionen die Gebühren pro Kilobyte bezahlt.</translation>
+    </message>
+    <message>
+        <source>Hide</source>
+        <translation>Ausblenden</translation>
+    </message>
+    <message>
+        <source>total at least</source>
+        <translation>Mindestbetrag</translation>
+    </message>
+    <message>
+        <source>Paying only the minimum fee is just fine as long as there is less transaction volume than space in the blocks. But be aware that this can end up in a never confirming transaction once there is more demand for bitcoin transactions than the network can process.</source>
+        <translation>Nur die minimale Gebühr zu bezahlen ist so lange in Ordnung, wie weniger Transaktionsvolumen als Platz in den Blöcken vorhanden ist. Aber Vorsicht, diese Option kann dazu führen, dass Transaktionen nicht bestätigt werden, wenn mehr Bedarf an Bitcoin-Transaktionen besteht als das Netzwerk verarbeiten kann.</translation>
+    </message>
+    <message>
+        <source>(read the tooltip)</source>
+        <translation>(den Hinweistext lesen)</translation>
+    </message>
+    <message>
+        <source>Recommended:</source>
+        <translation>Empfehlungen:</translation>
+    </message>
+    <message>
+        <source>Custom:</source>
+        <translation>Benutzerdefiniert:</translation>
+    </message>
+    <message>
+        <source>(Smart fee not initialized yet. This usually takes a few blocks...)</source>
+        <translation>(Intelligente Gebührenlogik ist noch nicht verfügbar. Normalerweise dauert dies einige Blöcke lang...)</translation>
+    </message>
+    <message>
+        <source>normal</source>
+        <translation>normal</translation>
+    </message>
+    <message>
+        <source>fast</source>
+        <translation>schnell</translation>
+    </message>
+    <message>
+        <source>Send to multiple recipients at once</source>
+        <translation>An mehrere Empfänger auf einmal überweisen</translation>
+    </message>
+    <message>
+        <source>Add &amp;Recipient</source>
+        <translation>Empfänger &amp;hinzufügen</translation>
+    </message>
+    <message>
+        <source>Clear all fields of the form.</source>
+        <translation>Alle Formularfelder zurücksetzen.</translation>
+    </message>
+    <message>
+        <source>Dust:</source>
+        <translation>"Dust":</translation>
+    </message>
+    <message>
+        <source>Confirmation time target:</source>
+        <translation>Gewünschte Bestätigungszeit:</translation>
+    </message>
+    <message>
+        <source>Clear &amp;All</source>
+        <translation>&amp;Zurücksetzen</translation>
+    </message>
+    <message>
+        <source>Balance:</source>
+        <translation>Kontostand:</translation>
+    </message>
+    <message>
+        <source>Confirm the send action</source>
+        <translation>Überweisung bestätigen</translation>
+    </message>
+    <message>
+        <source>S&amp;end</source>
+        <translation>&amp;Überweisen</translation>
+    </message>
+    <message>
+        <source>Copy quantity</source>
+        <translation>Anzahl kopieren</translation>
+    </message>
+    <message>
+        <source>Copy amount</source>
+        <translation>Betrag kopieren</translation>
+    </message>
+    <message>
+        <source>Copy fee</source>
+        <translation>Gebühr kopieren</translation>
+    </message>
+    <message>
+        <source>Copy after fee</source>
+        <translation>Abzüglich Gebühr kopieren</translation>
+    </message>
+    <message>
+        <source>Copy bytes</source>
+        <translation>Byte kopieren</translation>
+    </message>
+    <message>
+        <source>Copy dust</source>
+        <translation>"Staub" kopieren</translation>
+    </message>
+    <message>
+        <source>Copy change</source>
+        <translation>Wechselgeld kopieren</translation>
+    </message>
+    <message>
+        <source>%1 to %2</source>
+        <translation>%1 an %2</translation>
+    </message>
+    <message>
+        <source>Are you sure you want to send?</source>
+        <translation>Wollen Sie die Überweisung ausführen?</translation>
+    </message>
+    <message>
+        <source>added as transaction fee</source>
+        <translation>als Transaktionsgebühr hinzugefügt</translation>
+    </message>
+    <message>
+        <source>Total Amount %1</source>
+        <translation>Gesamtbetrag %1</translation>
+    </message>
+    <message>
+        <source>or</source>
+        <translation>oder</translation>
+    </message>
+    <message>
+        <source>Confirm send coins</source>
+        <translation>Überweisung bestätigen</translation>
+    </message>
+    <message>
+        <source>The recipient address is not valid. Please recheck.</source>
+        <translation>Die Zahlungsadresse ist ungültig, bitte nochmals überprüfen.</translation>
+    </message>
+    <message>
+        <source>The amount to pay must be larger than 0.</source>
+        <translation>Der zu zahlende Betrag muss größer als 0 sein.</translation>
+    </message>
+    <message>
+        <source>The amount exceeds your balance.</source>
+        <translation>Der angegebene Betrag übersteigt Ihren Kontostand.</translation>
+    </message>
+    <message>
+        <source>The total exceeds your balance when the %1 transaction fee is included.</source>
+        <translation>Der angegebene Betrag übersteigt aufgrund der Transaktionsgebühr in Höhe von %1 Ihren Kontostand.</translation>
+    </message>
+    <message>
+        <source>Duplicate address found: addresses should only be used once each.</source>
+        <translation>Doppelte Adresse entdeckt: Adressen dürfen jeweils nur einmal vorkommen.</translation>
+    </message>
+    <message>
+        <source>Transaction creation failed!</source>
+        <translation>Transaktionserstellung fehlgeschlagen!</translation>
+    </message>
+    <message>
+        <source>The transaction was rejected with the following reason: %1</source>
+        <translation>Die Transaktion wurde aus folgendem Grund abgelehnt: %1</translation>
+    </message>
+    <message>
+        <source>A fee higher than %1 is considered an absurdly high fee.</source>
+        <translation>Eine höhere Gebühr als %1 wird als unsinnig hohe Gebühr angesehen.</translation>
+    </message>
+    <message>
+        <source>Payment request expired.</source>
+        <translation>Zahlungsanforderung abgelaufen.</translation>
+    </message>
+    <message numerus="yes">
+        <source>%n block(s)</source>
+        <translation><numerusform>%n Block</numerusform><numerusform>%n Blöcke</numerusform></translation>
+    </message>
+    <message>
+        <source>Pay only the required fee of %1</source>
+        <translation>Nur die notwendige Gebühr in Höhe von %1 zahlen</translation>
+    </message>
+    <message numerus="yes">
+        <source>Estimated to begin confirmation within %n block(s).</source>
+        <translation><numerusform>Voraussichtlicher Beginn der Bestätigung innerhalb von %n Block.</numerusform><numerusform>Voraussichtlicher Beginn der Bestätigung innerhalb von %n Blöcken.</numerusform></translation>
+    </message>
+    <message>
+        <source>Warning: Invalid Bitcoin address</source>
+        <translation>Warnung: Ungültige Bitcoin-Adresse</translation>
+    </message>
+    <message>
+        <source>Warning: Unknown change address</source>
+        <translation>Warnung: Unbekannte Wechselgeld-Adresse</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(keine Bezeichnung)</translation>
+    </message>
+</context>
+<context>
+    <name>SendCoinsEntry</name>
+    <message>
+        <source>A&amp;mount:</source>
+        <translation>Betra&amp;g:</translation>
+    </message>
+    <message>
+        <source>Pay &amp;To:</source>
+        <translation>E&amp;mpfänger:</translation>
+    </message>
+    <message>
+        <source>&amp;Label:</source>
+        <translation>&amp;Bezeichnung:</translation>
+    </message>
+    <message>
+        <source>Choose previously used address</source>
+        <translation>Bereits verwendete Adresse auswählen</translation>
+    </message>
+    <message>
+        <source>This is a normal payment.</source>
+        <translation>Dies ist eine normale Überweisung.</translation>
+    </message>
+    <message>
+        <source>The Bitcoin address to send the payment to</source>
+        <translation>Die Zahlungsadresse der Überweisung</translation>
+    </message>
+    <message>
+        <source>Alt+A</source>
+        <translation>Alt+A</translation>
+    </message>
+    <message>
+        <source>Paste address from clipboard</source>
+        <translation>Adresse aus der Zwischenablage einfügen</translation>
+    </message>
+    <message>
+        <source>Alt+P</source>
+        <translation>Alt+P</translation>
+    </message>
+    <message>
+        <source>Remove this entry</source>
+        <translation>Diesen Eintrag entfernen</translation>
+    </message>
+    <message>
+        <source>The fee will be deducted from the amount being sent. The recipient will receive less bitcoins than you enter in the amount field. If multiple recipients are selected, the fee is split equally.</source>
+        <translation>Die Gebühr wird vom zu überweisenden Betrag abgezogen. Der Empfänger wird also weniger Bitcoins erhalten, als Sie im Betrags-Feld eingegeben haben. Falls mehrere Empfänger ausgewählt wurden, wird die Gebühr gleichmäßig verteilt.</translation>
+    </message>
+    <message>
+        <source>S&amp;ubtract fee from amount</source>
+        <translation>Gebühr vom Betrag ab&amp;ziehen</translation>
+    </message>
+    <message>
+        <source>Message:</source>
+        <translation>Nachricht:</translation>
+    </message>
+    <message>
+        <source>This is an unauthenticated payment request.</source>
+        <translation>Dies ist keine beglaubigte Zahlungsanforderung.</translation>
+    </message>
+    <message>
+        <source>This is an authenticated payment request.</source>
+        <translation>Dies ist eine beglaubigte Zahlungsanforderung.</translation>
+    </message>
+    <message>
+        <source>Enter a label for this address to add it to the list of used addresses</source>
+        <translation>Adressbezeichnung eingeben, die dann zusammen mit der Adresse der Liste bereits verwendeter Adressen hinzugefügt wird.</translation>
+    </message>
+    <message>
+        <source>A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
+        <translation>Eine an die "bitcoin:"-URI angefügte Nachricht, die zusammen mit der Transaktion gespeichert wird. Hinweis: Diese Nachricht wird nicht über das Bitcoin-Netzwerk gesendet.</translation>
+    </message>
+    <message>
+        <source>Pay To:</source>
+        <translation>Empfänger:</translation>
+    </message>
+    <message>
+        <source>Memo:</source>
+        <translation>Memo:</translation>
+    </message>
+    <message>
+        <source>Enter a label for this address to add it to your address book</source>
+        <translation>Geben Sie eine Bezeichnung für diese Adresse ein, um sie zu Ihrem Adressbuch hinzuzufügen</translation>
+    </message>
+</context>
+<context>
+    <name>SendConfirmationDialog</name>
+    <message>
+        <source>Yes</source>
+        <translation>Ja</translation>
+    </message>
+</context>
+<context>
+    <name>ShutdownWindow</name>
+    <message>
+        <source>%1 is shutting down...</source>
+        <translation>%1 wird beendet...</translation>
+    </message>
+    <message>
+        <source>Do not shut down the computer until this window disappears.</source>
+        <translation>Fahren Sie den Computer nicht herunter, bevor dieses Fenster verschwindet.</translation>
+    </message>
+</context>
+<context>
+    <name>SignVerifyMessageDialog</name>
+    <message>
+        <source>Signatures - Sign / Verify a Message</source>
+        <translation>Signaturen - eine Nachricht signieren / verifizieren</translation>
+    </message>
+    <message>
+        <source>&amp;Sign Message</source>
+        <translation>Nachricht &amp;signieren</translation>
+    </message>
+    <message>
+        <source>You can sign messages/agreements with your addresses to prove you can receive bitcoins sent to them. Be careful not to sign anything vague or random, as phishing attacks may try to trick you into signing your identity over to them. Only sign fully-detailed statements you agree to.</source>
+        <translation>Sie können Nachrichten/Vereinbarungen mit Hilfe Ihrer Adressen signieren, um zu beweisen, dass Sie Bitcoins empfangen können, die an diese Adressen überwiesen werden. Seien Sie vorsichtig und signieren Sie nichts Vages oder Willkürliches, um Ihre Indentität vor Phishingangriffen zu schützen. Signieren Sie nur vollständig-detaillierte Aussagen, mit denen Sie auch einverstanden sind.</translation>
+    </message>
+    <message>
+        <source>The Bitcoin address to sign the message with</source>
+        <translation>Die Bitcoin-Adresse mit der die Nachricht signiert wird</translation>
+    </message>
+    <message>
+        <source>Choose previously used address</source>
+        <translation>Bereits verwendete Adresse auswählen</translation>
+    </message>
+    <message>
+        <source>Alt+A</source>
+        <translation>Alt+A</translation>
+    </message>
+    <message>
+        <source>Paste address from clipboard</source>
+        <translation>Adresse aus der Zwischenablage einfügen</translation>
+    </message>
+    <message>
+        <source>Alt+P</source>
+        <translation>Alt+P</translation>
+    </message>
+    <message>
+        <source>Enter the message you want to sign here</source>
+        <translation>Zu signierende Nachricht hier eingeben</translation>
+    </message>
+    <message>
+        <source>Signature</source>
+        <translation>Signatur</translation>
+    </message>
+    <message>
+        <source>Copy the current signature to the system clipboard</source>
+        <translation>Aktuelle Signatur in die Zwischenablage kopieren</translation>
+    </message>
+    <message>
+        <source>Sign the message to prove you own this Bitcoin address</source>
+        <translation>Die Nachricht signieren, um den Besitz dieser Bitcoin-Adresse zu beweisen</translation>
+    </message>
+    <message>
+        <source>Sign &amp;Message</source>
+        <translation>&amp;Nachricht signieren</translation>
+    </message>
+    <message>
+        <source>Reset all sign message fields</source>
+        <translation>Alle "Nachricht signieren"-Felder zurücksetzen</translation>
+    </message>
+    <message>
+        <source>Clear &amp;All</source>
+        <translation>&amp;Zurücksetzen</translation>
+    </message>
+    <message>
+        <source>&amp;Verify Message</source>
+        <translation>Nachricht &amp;verifizieren</translation>
+    </message>
+    <message>
+        <source>Enter the receiver's address, message (ensure you copy line breaks, spaces, tabs, etc. exactly) and signature below to verify the message. Be careful not to read more into the signature than what is in the signed message itself, to avoid being tricked by a man-in-the-middle attack. Note that this only proves the signing party receives with the address, it cannot prove sendership of any transaction!</source>
+        <translation>Geben Sie die Zahlungsadresse des Empfängers, Nachricht (achten Sie darauf Zeilenumbrüche, Leerzeichen, Tabulatoren usw. exakt zu kopieren) und Signatur unten ein, um die Nachricht zu verifizieren. Vorsicht, interpretieren Sie nicht mehr in die Signatur hinein, als in der signierten Nachricht selber enthalten ist, um nicht von einem Man-in-the-middle-Angriff hinters Licht geführt zu werden. Beachten Sie dass dies nur beweißt, dass die signierende Partei über diese Adresse Überweisungen empfangen kann.</translation>
+    </message>
+    <message>
+        <source>The Bitcoin address the message was signed with</source>
+        <translation>Die Bitcoin-Adresse mit der die Nachricht signiert wurde</translation>
+    </message>
+    <message>
+        <source>Verify the message to ensure it was signed with the specified Bitcoin address</source>
+        <translation>Die Nachricht verifizieren, um sicherzustellen, dass diese mit der angegebenen Bitcoin-Adresse signiert wurde</translation>
+    </message>
+    <message>
+        <source>Verify &amp;Message</source>
+        <translation>&amp;Nachricht verifizieren</translation>
+    </message>
+    <message>
+        <source>Reset all verify message fields</source>
+        <translation>Alle "Nachricht verifizieren"-Felder zurücksetzen</translation>
+    </message>
+    <message>
+        <source>Click "Sign Message" to generate signature</source>
+        <translation>Auf "Nachricht signieren" klicken, um die Signatur zu erzeugen</translation>
+    </message>
+    <message>
+        <source>The entered address is invalid.</source>
+        <translation>Die eingegebene Adresse ist ungültig.</translation>
+    </message>
+    <message>
+        <source>Please check the address and try again.</source>
+        <translation>Bitte überprüfen Sie die Adresse und versuchen Sie es erneut.</translation>
+    </message>
+    <message>
+        <source>The entered address does not refer to a key.</source>
+        <translation>Die eingegebene Adresse verweist nicht auf einen Schlüssel.</translation>
+    </message>
+    <message>
+        <source>Wallet unlock was cancelled.</source>
+        <translation>Wallet-Entsperrung wurde abgebrochen.</translation>
+    </message>
+    <message>
+        <source>Private key for the entered address is not available.</source>
+        <translation>Privater Schlüssel zur eingegebenen Adresse ist nicht verfügbar.</translation>
+    </message>
+    <message>
+        <source>Message signing failed.</source>
+        <translation>Signierung der Nachricht fehlgeschlagen.</translation>
+    </message>
+    <message>
+        <source>Message signed.</source>
+        <translation>Nachricht signiert.</translation>
+    </message>
+    <message>
+        <source>The signature could not be decoded.</source>
+        <translation>Die Signatur konnte nicht dekodiert werden.</translation>
+    </message>
+    <message>
+        <source>Please check the signature and try again.</source>
+        <translation>Bitte überprüfen Sie die Signatur und versuchen Sie es erneut.</translation>
+    </message>
+    <message>
+        <source>The signature did not match the message digest.</source>
+        <translation>Die Signatur entspricht nicht dem "Message Digest".</translation>
+    </message>
+    <message>
+        <source>Message verification failed.</source>
+        <translation>Verifikation der Nachricht fehlgeschlagen.</translation>
+    </message>
+    <message>
+        <source>Message verified.</source>
+        <translation>Nachricht verifiziert.</translation>
+    </message>
+</context>
+<context>
+    <name>SplashScreen</name>
+    <message>
+        <source>[testnet]</source>
+        <translation>[Testnetz]</translation>
+    </message>
+</context>
+<context>
+    <name>TrafficGraphWidget</name>
+    <message>
+        <source>KB/s</source>
+        <translation>KB/s</translation>
+    </message>
+</context>
+<context>
+    <name>TransactionDesc</name>
+    <message numerus="yes">
+        <source>Open for %n more block(s)</source>
+        <translation><numerusform>Offen für %n weiteren Block</numerusform><numerusform>Offen für %n weitere Blöcke</numerusform></translation>
+    </message>
+    <message>
+        <source>Open until %1</source>
+        <translation>Offen bis %1</translation>
+    </message>
+    <message>
+        <source>conflicted with a transaction with %1 confirmations</source>
+        <translation>steht im Konflikt mit einer Transaktion mit %1 Bestätigungen</translation>
+    </message>
+    <message>
+        <source>%1/offline</source>
+        <translation>%1/offline</translation>
+    </message>
+    <message>
+        <source>0/unconfirmed, %1</source>
+        <translation>%1/unbestätigt</translation>
+    </message>
+    <message>
+        <source>in memory pool</source>
+        <translation>im Speicherpool</translation>
+    </message>
+    <message>
+        <source>not in memory pool</source>
+        <translation>nicht im Speicherpool</translation>
+    </message>
+    <message>
+        <source>abandoned</source>
+        <translation>eingestellt</translation>
+    </message>
+    <message>
+        <source>%1/unconfirmed</source>
+        <translation>%1/unbestätigt</translation>
+    </message>
+    <message>
+        <source>%1 confirmations</source>
+        <translation>%1 Bestätigungen</translation>
+    </message>
+    <message>
+        <source>Status</source>
+        <translation>Status</translation>
+    </message>
+    <message>
+        <source>, has not been successfully broadcast yet</source>
+        <translation>, wurde noch nicht erfolgreich übertragen</translation>
+    </message>
+    <message numerus="yes">
+        <source>, broadcast through %n node(s)</source>
+        <translation><numerusform>, über %n Knoten übertragen</numerusform><numerusform>, über %n Knoten übertragen</numerusform></translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation>Datum</translation>
+    </message>
+    <message>
+        <source>Source</source>
+        <translation>Quelle</translation>
+    </message>
+    <message>
+        <source>Generated</source>
+        <translation>Erzeugt</translation>
+    </message>
+    <message>
+        <source>From</source>
+        <translation>Von</translation>
+    </message>
+    <message>
+        <source>unknown</source>
+        <translation>unbekannt</translation>
+    </message>
+    <message>
+        <source>To</source>
+        <translation>An</translation>
+    </message>
+    <message>
+        <source>own address</source>
+        <translation>eigene Adresse</translation>
+    </message>
+    <message>
+        <source>watch-only</source>
+        <translation>beobachtet</translation>
+    </message>
+    <message>
+        <source>label</source>
+        <translation>Bezeichnung</translation>
+    </message>
+    <message>
+        <source>Credit</source>
+        <translation>Gutschrift</translation>
+    </message>
+    <message numerus="yes">
+        <source>matures in %n more block(s)</source>
+        <translation><numerusform>reift noch %n weiteren Block</numerusform><numerusform>reift noch %n weitere Blöcke</numerusform></translation>
+    </message>
+    <message>
+        <source>not accepted</source>
+        <translation>nicht angenommen</translation>
+    </message>
+    <message>
+        <source>Debit</source>
+        <translation>Belastung</translation>
+    </message>
+    <message>
+        <source>Total debit</source>
+        <translation>Gesamtbelastung</translation>
+    </message>
+    <message>
+        <source>Total credit</source>
+        <translation>Gesamtgutschrift</translation>
+    </message>
+    <message>
+        <source>Transaction fee</source>
+        <translation>Transaktionsgebühr</translation>
+    </message>
+    <message>
+        <source>Net amount</source>
+        <translation>Nettobetrag</translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation>Nachricht</translation>
+    </message>
+    <message>
+        <source>Comment</source>
+        <translation>Kommentar</translation>
+    </message>
+    <message>
+        <source>Transaction ID</source>
+        <translation>Transaktionskennung</translation>
+    </message>
+    <message>
+        <source>Transaction total size</source>
+        <translation>Gesamte Transaktionsgröße</translation>
+    </message>
+    <message>
+        <source>Merchant</source>
+        <translation>Händler</translation>
+    </message>
+    <message>
+        <source>Generated coins must mature %1 blocks before they can be spent. When you generated this block, it was broadcast to the network to be added to the block chain. If it fails to get into the chain, its state will change to "not accepted" and it won't be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source>
+        <translation>Erzeugte Bitcoins müssen %1 Blöcke lang reifen, bevor sie ausgegeben werden können. Als Sie diesen Block erzeugten, wurde er an das Netzwerk übertragen, um ihn der Blockkette hinzuzufügen. Falls dies fehlschlägt wird der Status in "nicht angenommen" geändert und Sie werden keine Bitcoins gutgeschrieben bekommen. Das kann gelegentlich passieren, wenn ein anderer Knoten einen Block fast zeitgleich erzeugt.</translation>
+    </message>
+    <message>
+        <source>Debug information</source>
+        <translation>Debuginformationen</translation>
+    </message>
+    <message>
+        <source>Transaction</source>
+        <translation>Transaktion</translation>
+    </message>
+    <message>
+        <source>Inputs</source>
+        <translation>Eingaben</translation>
+    </message>
+    <message>
+        <source>Amount</source>
+        <translation>Betrag</translation>
+    </message>
+    <message>
+        <source>true</source>
+        <translation>wahr</translation>
+    </message>
+    <message>
+        <source>false</source>
+        <translation>falsch</translation>
+    </message>
+</context>
+<context>
+    <name>TransactionDescDialog</name>
+    <message>
+        <source>This pane shows a detailed description of the transaction</source>
+        <translation>Dieser Bereich zeigt eine detaillierte Beschreibung der Transaktion an</translation>
+    </message>
+    <message>
+        <source>Details for %1</source>
+        <translation>Details für %1</translation>
     </message>
+</context>
+<context>
+    <name>TransactionTableModel</name>
     <message>
-        <source>Transaction Fee:</source>
-        <translation>Transaktionsgebühr:</translation>
+        <source>Date</source>
+        <translation>Datum</translation>
     </message>
     <message>
-        <source>Choose...</source>
-        <translation>Auswählen...</translation>
+        <source>Type</source>
+        <translation>Typ</translation>
     </message>
     <message>
-        <source>collapse fee-settings</source>
-        <translation>Transaktionsgebühreneinstellungen ausblenden</translation>
+        <source>Label</source>
+        <translation>Bezeichnung</translation>
+    </message>
+    <message numerus="yes">
+        <source>Open for %n more block(s)</source>
+        <translation><numerusform>Offen für %n weiteren Block</numerusform><numerusform>Offen für %n weitere Blöcke</numerusform></translation>
     </message>
     <message>
-        <source>per kilobyte</source>
-        <translation>pro Kilobyte</translation>
+        <source>Open until %1</source>
+        <translation>Offen bis %1</translation>
     </message>
     <message>
-        <source>If the custom fee is set to 1000 satoshis and the transaction is only 250 bytes, then "per kilobyte" only pays 250 satoshis in fee, while "total at least" pays 1000 satoshis. For transactions bigger than a kilobyte both pay by kilobyte.</source>
-        <translation>Wenn die benutzerdefinierte Gebühr 1000 Satoshis beträgt und die Transaktion nur 250 Byte groß ist, wird bei Auswahl von "pro Kilobyte" eine Gebühr in Höhe von 250 Satoshis, bei Auswahl von "Mindestbetrag" eine Gebühr in Höhe von 1000 Satoshis bezahlt. Bei Transaktionen die Größer als ein Kilobyte sind, werden bei beiden Optionen die Gebühren pro Kilobyte bezahlt.</translation>
+        <source>Offline</source>
+        <translation>Offline</translation>
     </message>
     <message>
-        <source>Hide</source>
-        <translation>Ausblenden</translation>
+        <source>Unconfirmed</source>
+        <translation>Unbestätigt</translation>
     </message>
     <message>
-        <source>total at least</source>
-        <translation>Mindestbetrag</translation>
+        <source>Abandoned</source>
+        <translation>Eingestellt</translation>
     </message>
     <message>
-        <source>Paying only the minimum fee is just fine as long as there is less transaction volume than space in the blocks. But be aware that this can end up in a never confirming transaction once there is more demand for bitcoin transactions than the network can process.</source>
-        <translation>Nur die minimale Gebühr zu bezahlen ist so lange in Ordnung, wie weniger Transaktionsvolumen als Platz in den Blöcken vorhanden ist. Aber Vorsicht, diese Option kann dazu führen, dass Transaktionen nicht bestätigt werden, wenn mehr Bedarf an Bitcoin-Transaktionen besteht als das Netzwerk verarbeiten kann.</translation>
+        <source>Confirming (%1 of %2 recommended confirmations)</source>
+        <translation>Wird bestätigt (%1 von %2 empfohlenen Bestätigungen)</translation>
     </message>
     <message>
-        <source>(read the tooltip)</source>
-        <translation>(den Hinweistext lesen)</translation>
+        <source>Confirmed (%1 confirmations)</source>
+        <translation>Bestätigt (%1 Bestätigungen)</translation>
     </message>
     <message>
-        <source>Recommended:</source>
-        <translation>Empfehlungen:</translation>
+        <source>Conflicted</source>
+        <translation>in Konflikt stehend</translation>
     </message>
     <message>
-        <source>Custom:</source>
-        <translation>Benutzerdefiniert:</translation>
+        <source>Immature (%1 confirmations, will be available after %2)</source>
+        <translation>Unreif (%1 Bestätigungen, wird verfügbar sein nach %2)</translation>
     </message>
     <message>
-        <source>(Smart fee not initialized yet. This usually takes a few blocks...)</source>
-        <translation>(Intelligente Gebührenlogik ist noch nicht verfügbar. Normalerweise dauert dies einige Blöcke lang...)</translation>
+        <source>This block was not received by any other nodes and will probably not be accepted!</source>
+        <translation>Dieser Block wurde vom Netzwerk nicht angenommen und wird wahrscheinlich nicht bestätigt werden!</translation>
     </message>
     <message>
-        <source>Confirmation time:</source>
-        <translation>Bestätigungszeit:</translation>
+        <source>Generated but not accepted</source>
+        <translation>Generiert, aber nicht akzeptiert</translation>
     </message>
     <message>
-        <source>normal</source>
-        <translation>normal</translation>
+        <source>Received with</source>
+        <translation>Empfangen über</translation>
     </message>
     <message>
-        <source>fast</source>
-        <translation>schnell</translation>
+        <source>Received from</source>
+        <translation>Empfangen von</translation>
     </message>
     <message>
-        <source>Send to multiple recipients at once</source>
-        <translation>An mehrere Empfänger auf einmal überweisen</translation>
+        <source>Sent to</source>
+        <translation>Überwiesen an</translation>
     </message>
     <message>
-        <source>Add &amp;Recipient</source>
-        <translation>Empfänger &amp;hinzufügen</translation>
+        <source>Payment to yourself</source>
+        <translation>Eigenüberweisung</translation>
     </message>
     <message>
-        <source>Clear all fields of the form.</source>
-        <translation>Alle Formularfelder zurücksetzen.</translation>
+        <source>Mined</source>
+        <translation>Erarbeitet</translation>
     </message>
     <message>
-        <source>Dust:</source>
-        <translation>"Dust":</translation>
+        <source>watch-only</source>
+        <translation>beobachtet</translation>
     </message>
     <message>
-        <source>Clear &amp;All</source>
-        <translation>&amp;Zurücksetzen</translation>
+        <source>(n/a)</source>
+        <translation>(k.A.)</translation>
     </message>
     <message>
-        <source>Balance:</source>
-        <translation>Kontostand:</translation>
+        <source>(no label)</source>
+        <translation>(keine Bezeichnung)</translation>
     </message>
     <message>
-        <source>Confirm the send action</source>
-        <translation>Überweisung bestätigen</translation>
+        <source>Transaction status. Hover over this field to show number of confirmations.</source>
+        <translation>Transaktionsstatus. Fahren Sie mit der Maus über dieses Feld, um die Anzahl der Bestätigungen zu sehen.</translation>
     </message>
     <message>
-        <source>S&amp;end</source>
-        <translation>&amp;Überweisen</translation>
+        <source>Date and time that the transaction was received.</source>
+        <translation>Datum und Zeit als die Transaktion empfangen wurde.</translation>
     </message>
-</context>
-<context>
-    <name>SendCoinsEntry</name>
     <message>
-        <source>A&amp;mount:</source>
-        <translation>Betra&amp;g:</translation>
+        <source>Type of transaction.</source>
+        <translation>Art der Transaktion</translation>
     </message>
     <message>
-        <source>Pay &amp;To:</source>
-        <translation>E&amp;mpfänger:</translation>
+        <source>Whether or not a watch-only address is involved in this transaction.</source>
+        <translation>Zeigt an, ob eine beobachtete Adresse in diese Transaktion involviert ist.</translation>
     </message>
     <message>
-        <source>&amp;Label:</source>
-        <translation>&amp;Bezeichnung:</translation>
+        <source>User-defined intent/purpose of the transaction.</source>
+        <translation>Benutzerdefinierte Absicht bzw. Verwendungszweck der Transaktion</translation>
     </message>
     <message>
-        <source>Choose previously used address</source>
-        <translation>Bereits verwendete Adresse auswählen</translation>
+        <source>Amount removed from or added to balance.</source>
+        <translation>Der Betrag, der dem Kontostand abgezogen oder hinzugefügt wurde.</translation>
     </message>
+</context>
+<context>
+    <name>TransactionView</name>
     <message>
-        <source>This is a normal payment.</source>
-        <translation>Dies ist eine normale Überweisung.</translation>
+        <source>All</source>
+        <translation>Alle</translation>
     </message>
     <message>
-        <source>The Bitcoin address to send the payment to</source>
-        <translation>Die Zahlungsadresse der Überweisung</translation>
+        <source>Today</source>
+        <translation>Heute</translation>
     </message>
     <message>
-        <source>Alt+A</source>
-        <translation>Alt+A</translation>
+        <source>This week</source>
+        <translation>Diese Woche</translation>
     </message>
     <message>
-        <source>Paste address from clipboard</source>
-        <translation>Adresse aus der Zwischenablage einfügen</translation>
+        <source>This month</source>
+        <translation>Diesen Monat</translation>
     </message>
     <message>
-        <source>Alt+P</source>
-        <translation>Alt+P</translation>
+        <source>Last month</source>
+        <translation>Letzten Monat</translation>
     </message>
     <message>
-        <source>Remove this entry</source>
-        <translation>Diesen Eintrag entfernen</translation>
+        <source>This year</source>
+        <translation>Dieses Jahr</translation>
     </message>
     <message>
-        <source>The fee will be deducted from the amount being sent. The recipient will receive less bitcoins than you enter in the amount field. If multiple recipients are selected, the fee is split equally.</source>
-        <translation>Die Gebühr wird vom zu überweisenden Betrag abgezogen. Der Empfänger wird also weniger Bitcoins erhalten, als Sie im Betrags-Feld eingegeben haben. Falls mehrere Empfänger ausgewählt wurden, wird die Gebühr gleichmäßig verteilt.</translation>
+        <source>Range...</source>
+        <translation>Zeitraum...</translation>
     </message>
     <message>
-        <source>S&amp;ubtract fee from amount</source>
-        <translation>Gebühr vom Betrag ab&amp;ziehen</translation>
+        <source>Received with</source>
+        <translation>Empfangen über</translation>
     </message>
     <message>
-        <source>Message:</source>
-        <translation>Nachricht:</translation>
+        <source>Sent to</source>
+        <translation>Überwiesen an</translation>
     </message>
     <message>
-        <source>This is an unauthenticated payment request.</source>
-        <translation>Dies ist keine beglaubigte Zahlungsanforderung.</translation>
+        <source>To yourself</source>
+        <translation>Eigenüberweisung</translation>
     </message>
     <message>
-        <source>This is an authenticated payment request.</source>
-        <translation>Dies ist eine beglaubigte Zahlungsanforderung.</translation>
+        <source>Mined</source>
+        <translation>Erarbeitet</translation>
     </message>
     <message>
-        <source>Enter a label for this address to add it to the list of used addresses</source>
-        <translation>Adressbezeichnung eingeben, die dann zusammen mit der Adresse der Liste bereits verwendeter Adressen hinzugefügt wird.</translation>
+        <source>Other</source>
+        <translation>Andere</translation>
     </message>
     <message>
-        <source>A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
-        <translation>Eine an die "bitcoin:"-URI angefügte Nachricht, die zusammen mit der Transaktion gespeichert wird. Hinweis: Diese Nachricht wird nicht über das Bitcoin-Netzwerk gesendet.</translation>
+        <source>Enter address or label to search</source>
+        <translation>Zu suchende Adresse oder Bezeichnung eingeben</translation>
     </message>
     <message>
-        <source>Pay To:</source>
-        <translation>Empfänger:</translation>
+        <source>Min amount</source>
+        <translation>Mindestbetrag</translation>
     </message>
     <message>
-        <source>Memo:</source>
-        <translation>Memo:</translation>
+        <source>Abandon transaction</source>
+        <translation>Transaktion einstellen</translation>
     </message>
-</context>
-<context>
-    <name>ShutdownWindow</name>
     <message>
-        <source>%1 is shutting down...</source>
-        <translation>%1 wird beendet...</translation>
+        <source>Copy address</source>
+        <translation>Adresse kopieren</translation>
     </message>
     <message>
-        <source>Do not shut down the computer until this window disappears.</source>
-        <translation>Fahren Sie den Computer nicht herunter, bevor dieses Fenster verschwindet.</translation>
+        <source>Copy label</source>
+        <translation>Bezeichnung kopieren</translation>
     </message>
-</context>
-<context>
-    <name>SignVerifyMessageDialog</name>
     <message>
-        <source>Signatures - Sign / Verify a Message</source>
-        <translation>Signaturen - eine Nachricht signieren / verifizieren</translation>
+        <source>Copy amount</source>
+        <translation>Betrag kopieren</translation>
     </message>
     <message>
-        <source>&amp;Sign Message</source>
-        <translation>Nachricht &amp;signieren</translation>
+        <source>Copy transaction ID</source>
+        <translation>Transaktionskennung kopieren</translation>
     </message>
     <message>
-        <source>You can sign messages/agreements with your addresses to prove you can receive bitcoins sent to them. Be careful not to sign anything vague or random, as phishing attacks may try to trick you into signing your identity over to them. Only sign fully-detailed statements you agree to.</source>
-        <translation>Sie können Nachrichten/Vereinbarungen mit Hilfe Ihrer Adressen signieren, um zu beweisen, dass Sie Bitcoins empfangen können, die an diese Adressen überwiesen werden. Seien Sie vorsichtig und signieren Sie nichts Vages oder Willkürliches, um Ihre Indentität vor Phishingangriffen zu schützen. Signieren Sie nur vollständig-detaillierte Aussagen, mit denen Sie auch einverstanden sind.</translation>
+        <source>Copy raw transaction</source>
+        <translation>Rohe Transaktion kopieren</translation>
     </message>
     <message>
-        <source>The Bitcoin address to sign the message with</source>
-        <translation>Die Bitcoin-Adresse mit der die Nachricht signiert wird</translation>
+        <source>Copy full transaction details</source>
+        <translation>Vollständige Transaktionsdetails kopieren</translation>
     </message>
     <message>
-        <source>Choose previously used address</source>
-        <translation>Bereits verwendete Adresse auswählen</translation>
+        <source>Edit label</source>
+        <translation>Bezeichnung bearbeiten</translation>
     </message>
     <message>
-        <source>Alt+A</source>
-        <translation>Alt+A</translation>
+        <source>Show transaction details</source>
+        <translation>Transaktionsdetails anzeigen</translation>
     </message>
     <message>
-        <source>Paste address from clipboard</source>
-        <translation>Adresse aus der Zwischenablage einfügen</translation>
+        <source>Export Transaction History</source>
+        <translation>Transaktionsverlauf exportieren</translation>
     </message>
     <message>
-        <source>Alt+P</source>
-        <translation>Alt+P</translation>
+        <source>Comma separated file (*.csv)</source>
+        <translation>Kommagetrennte-Datei (*.csv)</translation>
     </message>
     <message>
-        <source>Enter the message you want to sign here</source>
-        <translation>Zu signierende Nachricht hier eingeben</translation>
+        <source>Confirmed</source>
+        <translation>Bestätigt</translation>
     </message>
     <message>
-        <source>Signature</source>
-        <translation>Signatur</translation>
+        <source>Watch-only</source>
+        <translation>Nur beobachten</translation>
     </message>
     <message>
-        <source>Copy the current signature to the system clipboard</source>
-        <translation>Aktuelle Signatur in die Zwischenablage kopieren</translation>
+        <source>Date</source>
+        <translation>Datum</translation>
     </message>
     <message>
-        <source>Sign the message to prove you own this Bitcoin address</source>
-        <translation>Die Nachricht signieren, um den Besitz dieser Bitcoin-Adresse zu beweisen</translation>
+        <source>Type</source>
+        <translation>Typ</translation>
     </message>
     <message>
-        <source>Sign &amp;Message</source>
-        <translation>&amp;Nachricht signieren</translation>
+        <source>Label</source>
+        <translation>Bezeichnung</translation>
     </message>
     <message>
-        <source>Reset all sign message fields</source>
-        <translation>Alle "Nachricht signieren"-Felder zurücksetzen</translation>
+        <source>Address</source>
+        <translation>Adresse</translation>
     </message>
     <message>
-        <source>Clear &amp;All</source>
-        <translation>&amp;Zurücksetzen</translation>
+        <source>ID</source>
+        <translation>ID</translation>
     </message>
     <message>
-        <source>&amp;Verify Message</source>
-        <translation>Nachricht &amp;verifizieren</translation>
+        <source>Exporting Failed</source>
+        <translation>Exportieren fehlgeschlagen</translation>
     </message>
     <message>
-        <source>Enter the receiver's address, message (ensure you copy line breaks, spaces, tabs, etc. exactly) and signature below to verify the message. Be careful not to read more into the signature than what is in the signed message itself, to avoid being tricked by a man-in-the-middle attack. Note that this only proves the signing party receives with the address, it cannot prove sendership of any transaction!</source>
-        <translation>Geben Sie die Zahlungsadresse des Empfängers, Nachricht (achten Sie darauf Zeilenumbrüche, Leerzeichen, Tabulatoren usw. exakt zu kopieren) und Signatur unten ein, um die Nachricht zu verifizieren. Vorsicht, interpretieren Sie nicht mehr in die Signatur hinein, als in der signierten Nachricht selber enthalten ist, um nicht von einem Man-in-the-middle-Angriff hinters Licht geführt zu werden. Beachten Sie dass dies nur beweißt, dass die signierende Partei über diese Adresse Überweisungen empfangen kann.</translation>
+        <source>There was an error trying to save the transaction history to %1.</source>
+        <translation>Beim Speichern des Transaktionsverlaufs nach %1 ist ein Fehler aufgetreten.</translation>
     </message>
     <message>
-        <source>The Bitcoin address the message was signed with</source>
-        <translation>Die Bitcoin-Adresse mit der die Nachricht signiert wurde</translation>
+        <source>Exporting Successful</source>
+        <translation>Exportieren erfolgreich</translation>
     </message>
     <message>
-        <source>Verify the message to ensure it was signed with the specified Bitcoin address</source>
-        <translation>Die Nachricht verifizieren, um sicherzustellen, dass diese mit der angegebenen Bitcoin-Adresse signiert wurde</translation>
+        <source>The transaction history was successfully saved to %1.</source>
+        <translation>Speichern des Transaktionsverlaufs nach %1 war erfolgreich.</translation>
     </message>
     <message>
-        <source>Verify &amp;Message</source>
-        <translation>&amp;Nachricht verifizieren</translation>
+        <source>Range:</source>
+        <translation>Zeitraum:</translation>
     </message>
     <message>
-        <source>Reset all verify message fields</source>
-        <translation>Alle "Nachricht verifizieren"-Felder zurücksetzen</translation>
+        <source>to</source>
+        <translation>bis</translation>
     </message>
 </context>
 <context>
-    <name>SplashScreen</name>
+    <name>UnitDisplayStatusBarControl</name>
     <message>
-        <source>[testnet]</source>
-        <translation>[Testnetz]</translation>
+        <source>Unit to show amounts in. Click to select another unit.</source>
+        <translation>Die Einheit in der Beträge angezeigt werden. Klicken, um eine andere Einheit auszuwählen.</translation>
     </message>
 </context>
 <context>
-    <name>TrafficGraphWidget</name>
+    <name>WalletFrame</name>
     <message>
-        <source>KB/s</source>
-        <translation>KB/s</translation>
+        <source>No wallet has been loaded.</source>
+        <translation>Es wurde keine Wallet geladen.</translation>
     </message>
 </context>
 <context>
-    <name>TransactionDescDialog</name>
+    <name>WalletModel</name>
     <message>
-        <source>This pane shows a detailed description of the transaction</source>
-        <translation>Dieser Bereich zeigt eine detaillierte Beschreibung der Transaktion an</translation>
+        <source>Send Coins</source>
+        <translation>Bitcoins überweisen</translation>
     </message>
 </context>
 <context>
-    <name>UnitDisplayStatusBarControl</name>
+    <name>WalletView</name>
     <message>
-        <source>Unit to show amounts in. Click to select another unit.</source>
-        <translation>Die Einheit in der Beträge angezeigt werden. Klicken, um eine andere Einheit auszuwählen.</translation>
+        <source>&amp;Export</source>
+        <translation>E&amp;xportieren</translation>
+    </message>
+    <message>
+        <source>Export the data in the current tab to a file</source>
+        <translation>Daten der aktuellen Ansicht in eine Datei exportieren</translation>
+    </message>
+    <message>
+        <source>Backup Wallet</source>
+        <translation>Wallet sichern</translation>
+    </message>
+    <message>
+        <source>Wallet Data (*.dat)</source>
+        <translation>Wallet-Daten (*.dat)</translation>
+    </message>
+    <message>
+        <source>Backup Failed</source>
+        <translation>Sicherung fehlgeschlagen</translation>
+    </message>
+    <message>
+        <source>There was an error trying to save the wallet data to %1.</source>
+        <translation>Beim Speichern der Wallet-Daten nach %1 ist ein Fehler aufgetreten.</translation>
+    </message>
+    <message>
+        <source>Backup Successful</source>
+        <translation>Sicherung erfolgreich</translation>
+    </message>
+    <message>
+        <source>The wallet data was successfully saved to %1.</source>
+        <translation>Speichern der Wallet-Daten nach %1 war erfolgreich.</translation>
     </message>
 </context>
 <context>
@@ -1746,6 +2981,14 @@
         <source>Accept command line and JSON-RPC commands</source>
         <translation>Kommandozeilen- und JSON-RPC-Befehle annehmen</translation>
     </message>
+    <message>
+        <source>Accept connections from outside (default: 1 if no -proxy or -connect/-noconnect)</source>
+        <translation>Eingehende Verbindungen annehmen (Standard: 1, wenn nicht -proxy oder -connect/-noconnect)</translation>
+    </message>
+    <message>
+        <source>Distributed under the MIT software license, see the accompanying file %s or %s</source>
+        <translation>Veröffentlicht unter der MIT-Softwarelizenz, siehe beiligende Datei %s oder %s.</translation>
+    </message>
     <message>
         <source>If &lt;category&gt; is not supplied or if &lt;category&gt; = 1, output all debugging information.</source>
         <translation>Wenn &lt;category&gt; nicht angegeben wird oder &lt;category&gt;=1, jegliche Debugginginformationen ausgeben.</translation>
@@ -1754,10 +2997,18 @@
         <source>Prune configured below the minimum of %d MiB.  Please use a higher number.</source>
         <translation>Kürzungsmodus wurde kleiner als das Minimum in Höhe von %d MiB konfiguriert. Bitte verwenden Sie einen größeren Wert.</translation>
     </message>
+    <message>
+        <source>Prune: last wallet synchronisation goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of pruned node)</source>
+        <translation>Prune (Kürzung): Die letzte Syncronisation der Wallet liegt vor gekürzten (gelöschten) Blöcken. Es ist ein -reindex (download der gesamten Blockkette) notwendig.</translation>
+    </message>
     <message>
         <source>Reduce storage requirements by pruning (deleting) old blocks. This mode is incompatible with -txindex and -rescan. Warning: Reverting this setting requires re-downloading the entire blockchain. (default: 0 = disable pruning blocks, &gt;%u = target size in MiB to use for block files)</source>
         <translation>Speicherplatzanforderung durch kürzen (löschen) alter Blöcke reduzieren. Dieser Modus ist nicht mit -txindex und -rescan kompatibel. Warnung: Die Umkehr dieser Einstellung erfordert das erneute Herunterladen der gesamten Blockkette. (Standard: 0 = deaktiviert das Kürzen von Blöcken, &gt;%u = Zielgröße in MiB, die für Blockdateien verwendet werden darf)</translation>
     </message>
+    <message>
+        <source>Rescans are not possible in pruned mode. You will need to use -reindex which will download the whole blockchain again.</source>
+        <translation>Rescans sind im pruned mode nicht möglich. Ein -reindex ist notwendig, welcher die gesmate Blockkette erneut herunterlädt.</translation>
+    </message>
     <message>
         <source>Error: A fatal internal error occurred, see debug.log for details</source>
         <translation>Fehler: Ein schwerer interner Fehler ist aufgetreten, siehe debug.log für Details.</translation>
@@ -1778,22 +3029,22 @@
         <source>Unable to start HTTP server. See debug log for details.</source>
         <translation>Kann HTTP Server nicht starten. Siehe debug log für Details.</translation>
     </message>
-    <message>
-        <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
-        <translation>Eingehende Verbindungen annehmen (Standard: 1, wenn nicht -proxy oder -connect)</translation>
-    </message>
     <message>
         <source>Bitcoin Core</source>
         <translation>Bitcoin Core</translation>
     </message>
     <message>
-        <source>-fallbackfee is set very high! This is the transaction fee you may pay when fee estimates are not available.</source>
-        <translation>-fallbackfee ist sehr hoch eingestellt! Das ist die Transaktionsgebühr, welche du zahlen müsstest, wenn die Gebührenschätzungen nicht verfügbar sind.</translation>
+        <source>The %s developers</source>
+        <translation>Die %s-Entwickler</translation>
     </message>
     <message>
         <source>A fee rate (in %s/kB) that will be used when fee estimation has insufficient data (default: %s)</source>
         <translation>Eine Transaktionsgebühr (in %s/kB) wird genutzt, wenn für die Gebührenschützung zu wenig Daten vorliegen (Standardwert: %s)</translation>
     </message>
+    <message>
+        <source>Accept relayed transactions received from whitelisted peers even when not relaying transactions (default: %d)</source>
+        <translation>Geben Sie immer die Transaktionen, die Sie von freigegebenen Peers erhalten haben, weiter (Voreinstellung: %d)</translation>
+    </message>
     <message>
         <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source>
         <translation>An die angegebene Adresse binden und immer abhören. Für IPv6 "[Host]:Port"-Notation verwenden</translation>
@@ -1807,16 +3058,20 @@
         <translation>Alle Wallet-Transaktionen löschen und nur diese Teilbereiche der Blockkette durch -rescan beim Starten wiederherstellen</translation>
     </message>
     <message>
-        <source>Distributed under the MIT software license, see the accompanying file COPYING or &lt;http://www.opensource.org/licenses/mit-license.php&gt;.</source>
-        <translation>Veröffentlicht unter der MIT-Softwarelizenz, siehe beiligende Datei COPYING oder &lt;http://www.opensource.org/licenses/mit-license.php&gt;.</translation>
+        <source>Error reading %s! All keys read correctly, but transaction data or address book entries might be missing or incorrect.</source>
+        <translation>Lesen von %s fehlgeschlagen! Alle Schlüssel wurden korrekt gelesen, Transaktionsdaten bzw. Adressbucheinträge fehlen aber möglicherweise oder sind inkorrekt.</translation>
     </message>
     <message>
         <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source>
         <translation>Befehl ausführen wenn sich eine Wallet-Transaktion verändert (%s im Befehl wird durch die Transaktions-ID ersetzt)</translation>
     </message>
     <message>
-        <source>Force relay of transactions from whitelisted peers even they violate local relay policy (default: %d)</source>
-        <translation>Leite Transaktionen von Peers auf der Positivliste auf jeden Fall weiter, auch wenn sie die lokale Weiterleitungsregeln verletzen (Standardeinstellung: %d)</translation>
+        <source>Maximum allowed median peer time offset adjustment. Local perspective of time may be influenced by peers forward or backward by this amount. (default: %u seconds)</source>
+        <translation>Maximum allowed median peer time offset adjustment. Local perspective of time may be influenced by peers forward or backward by this amount. (default: %u seconds)</translation>
+    </message>
+    <message>
+        <source>Maximum total fees (in %s) to use in a single wallet transaction or raw transaction; setting this too low may abort large transactions (default: %s)</source>
+        <translation>Maximale Gesamtgebühr (in %s) in einer Börsentransaktion; wird dies zu niedrig gesetzten können große Transaktionen abgebrochen werden (Standard: %s)</translation>
     </message>
     <message>
         <source>Please check that your computer's date and time are correct! If your clock is wrong, %s will not work properly.</source>
@@ -1838,6 +3093,10 @@
         <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
         <translation>Dies ist eine Vorab-Testversion - Verwendung auf eigene Gefahr - nicht für Mining- oder Handelsanwendungen nutzen!</translation>
     </message>
+    <message>
+        <source>Unable to rewind the database to a pre-fork state. You will need to redownload the blockchain</source>
+        <translation>Sie müssen die Datenbank mit Hilfe von -reindex neu aufbauen, um zum ungekürzten Modus zurückzukehren. Dies erfordert, dass die gesamte Blockkette erneut heruntergeladen wird.</translation>
+    </message>
     <message>
         <source>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</source>
         <translation>UPnP verwenden, um eine Portweiterleitung einzurichten (Standard: 1, wenn abgehört wird und -proxy nicht gesetzt ist)</translation>
@@ -1850,10 +3109,6 @@
         <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source>
         <translation>Warnung: Wir scheinen nicht vollständig mit unseren Gegenstellen übereinzustimmen! Sie oder die anderen Knoten müssen unter Umständen Ihre Client-Software aktualisieren.</translation>
     </message>
-    <message>
-        <source>Whitelist peers connecting from the given netmask or IP address. Can be specified multiple times.</source>
-        <translation>Gegenstellen die sich von der angegebenen Netzmaske oder IP-Adresse aus verbinden immer zulassen. Kann mehrmals angegeben werden.</translation>
-    </message>
     <message>
         <source>You need to rebuild the database using -reindex-chainstate to change -txindex</source>
         <translation>Sie müssen die Datenbank mit Hilfe von -reindex-chainstate neu aufbauen, um -txindex zu verändern</translation>
@@ -1887,8 +3142,8 @@
         <translation>Kann Adresse in -%s nicht auflösen: '%s'</translation>
     </message>
     <message>
-        <source>Connect only to the specified node(s)</source>
-        <translation>Mit nur dem oder den angegebenen Knoten verbinden</translation>
+        <source>Change index out of range</source>
+        <translation>Position des Wechselgelds außerhalb des Bereichs</translation>
     </message>
     <message>
         <source>Connection options:</source>
@@ -1930,6 +3185,10 @@
         <source>Enable publish raw transaction in &lt;address&gt;</source>
         <translation>Aktiviere das Veröffentlichen der Roh-Transaktion in &lt;address&gt;</translation>
     </message>
+    <message>
+        <source>Enable transaction replacement in the memory pool (default: %u)</source>
+        <translation>Maximal &lt;n&gt; nicht-verbindbare Transaktionen im Speicher halten (Standard: %u)</translation>
+    </message>
     <message>
         <source>Error initializing block database</source>
         <translation>Fehler beim Initialisieren der Blockdatenbank</translation>
@@ -1974,6 +3233,10 @@
         <source>Incorrect or no genesis block found. Wrong datadir for network?</source>
         <translation>Fehlerhafter oder kein Genesis-Block gefunden. Falsches Datenverzeichnis für das Netzwerk?</translation>
     </message>
+    <message>
+        <source>Initialization sanity check failed. %s is shutting down.</source>
+        <translation>Initialisierungsplausibilitätsprüfung fehlgeschlagen. %s wird beendet.</translation>
+    </message>
     <message>
         <source>Invalid -onion address: '%s'</source>
         <translation>Ungültige "-onion"-Adresse: '%s'</translation>
@@ -2022,6 +3285,18 @@
         <source>Prune mode is incompatible with -txindex.</source>
         <translation>Kürzungsmodus ist nicht mit -txindex kompatibel.</translation>
     </message>
+    <message>
+        <source>Rebuild chain state and block index from the blk*.dat files on disk</source>
+        <translation>Blockkettenindex aus aktuellen Dateien blk000??.dat beim Starten wiederaufbauen</translation>
+    </message>
+    <message>
+        <source>Rebuild chain state from the currently indexed blocks</source>
+        <translation>Blockkettenindex aus aktuellen Dateien blk000??.dat wiederaufbauen</translation>
+    </message>
+    <message>
+        <source>Rewinding blocks...</source>
+        <translation>Verifiziere Blöcke...</translation>
+    </message>
     <message>
         <source>Set database cache size in megabytes (%d to %d, default: %d)</source>
         <translation>Größe des Datenbankcaches in Megabyte festlegen (%d bis %d, Standard: %d)</translation>
@@ -2058,6 +3333,10 @@
         <source>Use UPnP to map the listening port (default: %u)</source>
         <translation>UPnP verwenden, um eine Portweiterleitung einzurichten (Standard: %u)</translation>
     </message>
+    <message>
+        <source>Use the test chain</source>
+        <translation>Die Testchain verwenden</translation>
+    </message>
     <message>
         <source>User Agent comment (%s) contains unsafe characters.</source>
         <translation>Der User Agent Kommentar  (%s) enthält unsichere Zeichen.</translation>
@@ -2074,6 +3353,14 @@
         <source>Wallet %s resides outside data directory %s</source>
         <translation>Wallet %s liegt außerhalb des Datenverzeichnisses %s</translation>
     </message>
+    <message>
+        <source>Wallet debugging/testing options:</source>
+        <translation>Wallet Debugging-/Testoptionen:</translation>
+    </message>
+    <message>
+        <source>Wallet needed to be rewritten: restart %s to complete</source>
+        <translation>Wallet musste neu geschrieben werden: starten Sie %s zur Fertigstellung neu</translation>
+    </message>
     <message>
         <source>Wallet options:</source>
         <translation>Wallet-Optionen:</translation>
@@ -2122,10 +3409,6 @@
         <source>Maximum size of data in data carrier transactions we relay and mine (default: %u)</source>
         <translation>Maximale Datengröße in "Data Carrier"-Transaktionen die weitergeleitet und erarbeitet werden (Standard: %u)</translation>
     </message>
-    <message>
-        <source>Query for peer addresses via DNS lookup, if low on addresses (default: 1 unless -connect)</source>
-        <translation>Adressen von Gegenstellen via DNS-Namensauflösung finden, falls zu wenige Adressen verfügbar sind (Standard: 1, außer bei -connect)</translation>
-    </message>
     <message>
         <source>Randomize credentials for every proxy connection. This enables Tor stream isolation (default: %u)</source>
         <translation>Zufällige Anmeldedaten für jede Proxyverbindung verwenden. Dies aktiviert Tor-Datenflussisolation (Standard: %u)</translation>
@@ -2139,8 +3422,8 @@
         <translation>Der Transaktionsbetrag ist zum senden zu niedrig, nachdem die Gebühr abgezogen wurde.</translation>
     </message>
     <message>
-        <source>This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit &lt;https://www.openssl.org/&gt; and cryptographic software written by Eric Young and UPnP software written by Thomas Bernard.</source>
-        <translation>Dieses Produkt enthält Software, die vom OpenSSL-Projekt zur Verwendung im OpenSSL-Toolkit &lt;https://www.openssl.org/&gt; entwickelt wird, sowie von Eric Young geschriebene kryptographische Software und von Thomas Bernard geschriebene UPnP-Software.</translation>
+        <source>Use hierarchical deterministic key generation (HD) after BIP32. Only has effect during wallet creation/first start</source>
+        <translation>Use hierarchical deterministic key generation (HD) after BIP32. Only has effect during wallet creation/first start</translation>
     </message>
     <message>
         <source>Whitelisted peers cannot be DoS banned and their transactions are always relayed, even if they are already in the mempool, useful e.g. for a gateway</source>
@@ -2250,10 +3533,6 @@
         <source>Transaction amount too small</source>
         <translation>Transaktionsbetrag zu niedrig</translation>
     </message>
-    <message>
-        <source>Transaction amounts must be positive</source>
-        <translation>Transaktionsbeträge müssen positiv sein</translation>
-    </message>
     <message>
         <source>Transaction too large for fee policy</source>
         <translation>Transaktion ist für die Gebührenrichtlinie zu groß</translation>
@@ -2318,18 +3597,22 @@
         <source>-maxtxfee is set very high! Fees this large could be paid on a single transaction.</source>
         <translation>-maxtxfee ist auf einen sehr hohen Wert festgelegt! Gebühren dieser Höhe könnten für eine einzelne Transaktion bezahlt werden.</translation>
     </message>
-    <message>
-        <source>-paytxfee is set very high! This is the transaction fee you will pay if you send a transaction.</source>
-        <translation>-paytxfee ist auf einen sehr hohen Wert festgelegt! Dies ist die Gebühr die beim Senden einer Transaktion fällig wird.</translation>
-    </message>
     <message>
         <source>Do not keep transactions in the mempool longer than &lt;n&gt; hours (default: %u)</source>
         <translation>Die Transaktion nicht länger im Speicherpool behalten als &lt;n&gt; Stunden (Standard: %u)</translation>
     </message>
+    <message>
+        <source>Equivalent bytes per sigop in transactions for relay and mining (default: %u)</source>
+        <translation>Maximale Datengröße in "Data Carrier"-Transaktionen die weitergeleitet und erarbeitet werden (Standard: %u)</translation>
+    </message>
     <message>
         <source>Fees (in %s/kB) smaller than this are considered zero fee for transaction creation (default: %s)</source>
         <translation>Niedrigere Gebühren (in %s/Kb) als diese werden bei der Transaktionserstellung als gebührenfrei angesehen (Standard: %s)</translation>
     </message>
+    <message>
+        <source>Force relay of transactions from whitelisted peers even if they violate local relay policy (default: %d)</source>
+        <translation>Leite Transaktionen von Peers auf der Positivliste auf jeden Fall weiter, auch wenn sie die lokale Weiterleitungsregeln verletzen (Standardeinstellung: %d)</translation>
+    </message>
     <message>
         <source>How thorough the block verification of -checkblocks is (0-4, default: %u)</source>
         <translation>Legt fest, wie gründlich die Blockverifikation von -checkblocks ist (0-4, Standard: %u)</translation>
@@ -2346,6 +3629,18 @@
         <source>Output debugging information (default: %u, supplying &lt;category&gt; is optional)</source>
         <translation>Debugginginformationen ausgeben (Standard: %u, &lt;category&gt; anzugeben ist optional)</translation>
     </message>
+    <message>
+        <source>Query for peer addresses via DNS lookup, if low on addresses (default: 1 unless -connect/-noconnect)</source>
+        <translation>Adressen von Gegenstellen via DNS-Namensauflösung finden, falls zu wenige Adressen verfügbar sind (Standard: 1, außer bei -connect/-noconnect)</translation>
+    </message>
+    <message>
+        <source>Support filtering of blocks and transaction with bloom filters (default: %u)</source>
+        <translation>Unterstütze Blöcke und Transaktionen mit  Bloomfiltern zu filtern (default: %u)</translation>
+    </message>
+    <message>
+        <source>This is the transaction fee you may pay when fee estimates are not available.</source>
+        <translation>Das ist die Transaktionsgebühr, welche du zahlen müsstest, wenn die Gebührenschätzungen nicht verfügbar sind.</translation>
+    </message>
     <message>
         <source>Total length of network version string (%i) exceeds maximum length (%i). Reduce the number or size of uacomments.</source>
         <translation>Gesamtlänge des Netzwerkversionstrings (%i) erreicht die maximale Länge (%i). Reduzieren Sie die Nummer oder die Größe von uacomments.</translation>
@@ -2368,12 +3663,20 @@
     </message>
     <message>
         <source>Username and hashed password for JSON-RPC connections. The field &lt;userpw&gt; comes in the format: &lt;USERNAME&gt;:&lt;SALT&gt;$&lt;HASH&gt;. A canonical python script is included in share/rpcuser. This option can be specified multiple times</source>
-        <translation>Benutzername und gehashtes Passwort für JSON-RPC Verbindungen. Das Feld &lt;userpw&gt; kommt im Format: &lt;USERNAME&gt;:&lt;SALT&gt;$&lt;HASH&gt;. Ein kanonisches Pythonskript ist in share/rpcuser inbegriffen. Diese Option kann mehrere Male spezifiziert werden</translation>
+        <translation>Benutzername und gehashtes Passwort für JSON-RPC Verbindungen. Das Feld &lt;userpw&gt; kommt im Format: &lt;USERNAME&gt;:&lt;SALT&gt;$&lt;HASH&gt;. Ein entsprechendes Pythonskript ist in share/rpcuser inbegriffen. Diese Option kann mehrere Male spezifiziert werden</translation>
     </message>
     <message>
         <source>Warning: Unknown block versions being mined! It's possible unknown rules are in effect</source>
         <translation>Warnung: Unbekannte Blockversion wird durch Mining erzeugt! Es ist möglich, dass unbekannte Regeln in Kraft sind.</translation>
     </message>
+    <message>
+        <source>Whitelist peers connecting from the given IP address (e.g. 1.2.3.4) or CIDR notated network (e.g. 1.2.3.0/24). Can be specified multiple times.</source>
+        <translation>Gegenstellen die sich von der angegebenen IP-Adresse (e.g. 1.2.3.4) oder CIDR Notation (eg. 1.2.3.0/24) aus verbinden immer zulassen. Kann mehrmals angegeben werden.</translation>
+    </message>
+    <message>
+        <source>%s is set very high!</source>
+        <translation>%s wurde sehr hoch Eingestellt!</translation>
+    </message>
     <message>
         <source>(default: %s)</source>
         <translation>(Standard: %s)</translation>
@@ -2430,13 +3733,17 @@
         <source>Relay non-P2SH multisig (default: %u)</source>
         <translation>Nicht-"P2SH-Multisig" weiterleiten (Standard: %u)</translation>
     </message>
+    <message>
+        <source>Send transactions with full-RBF opt-in enabled (default: %u)</source>
+        <translation>Wähle alle zu sendenden Transaktionen als full-RBF (Standard: %u)</translation>
+    </message>
     <message>
         <source>Set key pool size to &lt;n&gt; (default: %u)</source>
         <translation>Größe des Schlüsselpools festlegen auf &lt;n&gt; (Standard: %u)</translation>
     </message>
     <message>
-        <source>Set minimum block size in bytes (default: %u)</source>
-        <translation>Minimale Blockgröße in Byte festlegen (Standard: %u)</translation>
+        <source>Set maximum BIP141 block weight (default: %d)</source>
+        <translation>Maximales BIP141 Blockgewicht festlegen (Standard: %d)</translation>
     </message>
     <message>
         <source>Set the number of threads to service RPC calls (default: %d)</source>
@@ -2458,10 +3765,22 @@
         <source>Spend unconfirmed change when sending transactions (default: %u)</source>
         <translation>Unbestätigtes Wechselgeld darf beim Senden von Transaktionen ausgegeben werden (Standard: %u)</translation>
     </message>
+    <message>
+        <source>This is the minimum transaction fee you pay on every transaction.</source>
+        <translation>Dies ist die minimale Gebühr die beim Senden einer Transaktion fällig wird.</translation>
+    </message>
+    <message>
+        <source>This is the transaction fee you will pay if you send a transaction.</source>
+        <translation>Dies ist die Gebühr die beim Senden einer Transaktion fällig wird.</translation>
+    </message>
     <message>
         <source>Threshold for disconnecting misbehaving peers (default: %u)</source>
         <translation>Schwellenwert, um Verbindungen zu sich nicht konform verhaltenden Gegenstellen zu beenden (Standard: %u)</translation>
     </message>
+    <message>
+        <source>Transaction amounts must not be negative</source>
+        <translation>Transaktionsbeträge dürfen nicht negativ sein.</translation>
+    </message>
     <message>
         <source>Unknown network specified in -onlynet: '%s'</source>
         <translation>Unbekannter Netztyp in -onlynet angegeben: '%s'</translation>
diff --git a/src/qt/locale/bitcoin_el.ts b/src/qt/locale/bitcoin_el.ts
index de76a110cfc4a..61e5a1cec8279 100644
--- a/src/qt/locale/bitcoin_el.ts
+++ b/src/qt/locale/bitcoin_el.ts
@@ -6,6 +6,9 @@
         <translation>Δημιουργία νέου λογαριασμού</translation>
     </message>
     </context>
+<context>
+    <name>AddressTableModel</name>
+    </context>
 <context>
     <name>AskPassphraseDialog</name>
     <message>
@@ -20,7 +23,7 @@
         <source>Repeat new passphrase</source>
         <translation>Επαναλάβετε νέο συνθηματικό</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>BanTableModel</name>
     </context>
@@ -56,7 +59,7 @@
         <source>&amp;Address</source>
         <translation>Διεύθυνση</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>FreespaceChecker</name>
     </context>
@@ -78,6 +81,9 @@
         <translation>Σφάλμα</translation>
     </message>
     </context>
+<context>
+    <name>ModalOverlay</name>
+    </context>
 <context>
     <name>OpenURIDialog</name>
     </context>
@@ -91,12 +97,21 @@
 <context>
     <name>OverviewPage</name>
     </context>
+<context>
+    <name>PaymentServer</name>
+    </context>
 <context>
     <name>PeerTableModel</name>
     </context>
 <context>
     <name>QObject</name>
     </context>
+<context>
+    <name>QObject::QObject</name>
+    </context>
+<context>
+    <name>QRImageWidget</name>
+    </context>
 <context>
     <name>RPCConsole</name>
     <message>
@@ -110,10 +125,13 @@
         <source>Remove</source>
         <translation>Αφαίρεση</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>ReceiveRequestDialog</name>
     </context>
+<context>
+    <name>RecentRequestsTableModel</name>
+    </context>
 <context>
     <name>SendCoinsDialog</name>
     <message>
@@ -132,6 +150,9 @@
         <translation>Μήνυμα:</translation>
     </message>
     </context>
+<context>
+    <name>SendConfirmationDialog</name>
+    </context>
 <context>
     <name>ShutdownWindow</name>
     </context>
@@ -144,12 +165,30 @@
 <context>
     <name>TrafficGraphWidget</name>
     </context>
+<context>
+    <name>TransactionDesc</name>
+    </context>
 <context>
     <name>TransactionDescDialog</name>
     </context>
+<context>
+    <name>TransactionTableModel</name>
+    </context>
+<context>
+    <name>TransactionView</name>
+    </context>
 <context>
     <name>UnitDisplayStatusBarControl</name>
     </context>
+<context>
+    <name>WalletFrame</name>
+    </context>
+<context>
+    <name>WalletModel</name>
+    </context>
+<context>
+    <name>WalletView</name>
+    </context>
 <context>
     <name>bitcoin-core</name>
     <message>
diff --git a/src/qt/locale/bitcoin_el_GR.ts b/src/qt/locale/bitcoin_el_GR.ts
index 2814e4f6e7a0e..b1caab06b134e 100644
--- a/src/qt/locale/bitcoin_el_GR.ts
+++ b/src/qt/locale/bitcoin_el_GR.ts
@@ -41,7 +41,10 @@
         <source>&amp;Delete</source>
         <translation>&amp;Διαγραφή</translation>
     </message>
-</context>
+    </context>
+<context>
+    <name>AddressTableModel</name>
+    </context>
 <context>
     <name>AskPassphraseDialog</name>
     <message>
@@ -60,7 +63,7 @@
         <source>Repeat new passphrase</source>
         <translation>Επανέλαβε τον νέο κωδικό πρόσβασης</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>BanTableModel</name>
     </context>
@@ -246,10 +249,6 @@
         <source>No block source available...</source>
         <translation>Η πηγή του μπλοκ δεν ειναι διαθέσιμη... </translation>
     </message>
-    <message>
-        <source>%1 and %2</source>
-        <translation>%1 και %2</translation>
-    </message>
     <message>
         <source>%1 behind</source>
         <translation>%1 πίσω</translation>
@@ -328,7 +327,7 @@
         <source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;locked&lt;/b&gt;</source>
         <translation>Το πορτοφόλι είναι &lt;b&gt;κρυπτογραφημένο&lt;/b&gt; και &lt;b&gt;κλειδωμένο&lt;/b&gt;</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>CoinControlDialog</name>
     <message>
@@ -347,10 +346,6 @@
         <source>Amount:</source>
         <translation>Ποσό:</translation>
     </message>
-    <message>
-        <source>Priority:</source>
-        <translation>Προτεραιότητα:</translation>
-    </message>
     <message>
         <source>Fee:</source>
         <translation>Ταρίφα</translation>
@@ -403,11 +398,7 @@
         <source>Confirmed</source>
         <translation>Επικυρωμένες</translation>
     </message>
-    <message>
-        <source>Priority</source>
-        <translation>Προτεραιότητα</translation>
-    </message>
-</context>
+    </context>
 <context>
     <name>EditAddressDialog</name>
     <message>
@@ -430,7 +421,7 @@
         <source>&amp;Address</source>
         <translation>&amp;Διεύθυνση</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>FreespaceChecker</name>
     <message>
@@ -508,6 +499,21 @@
         <translation><numerusform>(από το %n GB που απαιτείται)</numerusform><numerusform>(από τα %n GB που απαιτούνται)</numerusform></translation>
     </message>
 </context>
+<context>
+    <name>ModalOverlay</name>
+    <message>
+        <source>Form</source>
+        <translation>Φόρμα</translation>
+    </message>
+    <message>
+        <source>Last block time</source>
+        <translation>Χρόνος τελευταίου μπλοκ</translation>
+    </message>
+    <message>
+        <source>Hide</source>
+        <translation>Απόκρυψη</translation>
+    </message>
+    </context>
 <context>
     <name>OpenURIDialog</name>
     <message>
@@ -526,7 +532,7 @@
         <source>Select payment request file</source>
         <translation>Επιλέξτε πληρωμή αρχείου αίτησης</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>OptionsDialog</name>
     <message>
@@ -786,13 +792,12 @@
         <translation>Το τρέχον συνολικό υπόλοιπο σε διευθύνσεις παρακολούθησης μόνο</translation>
     </message>
 </context>
+<context>
+    <name>PaymentServer</name>
+    </context>
 <context>
     <name>PeerTableModel</name>
-    <message>
-        <source>Ping Time</source>
-        <translation>Χρόνος καθυστέρησης</translation>
-    </message>
-</context>
+    </context>
 <context>
     <name>QObject</name>
     <message>
@@ -831,7 +836,17 @@
         <source>%1 ms</source>
         <translation>%1 ms</translation>
     </message>
-</context>
+    <message>
+        <source>%1 and %2</source>
+        <translation>%1 και %2</translation>
+    </message>
+    </context>
+<context>
+    <name>QObject::QObject</name>
+    </context>
+<context>
+    <name>QRImageWidget</name>
+    </context>
 <context>
     <name>RPCConsole</name>
     <message>
@@ -1053,7 +1068,7 @@
         <source>Remove</source>
         <translation>Αφαίρεση</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>ReceiveRequestDialog</name>
     <message>
@@ -1072,7 +1087,10 @@
         <source>&amp;Save Image...</source>
         <translation>&amp;Αποθήκευση εικόνας...</translation>
     </message>
-</context>
+    </context>
+<context>
+    <name>RecentRequestsTableModel</name>
+    </context>
 <context>
     <name>SendCoinsDialog</name>
     <message>
@@ -1107,10 +1125,6 @@
         <source>Amount:</source>
         <translation>Ποσό:</translation>
     </message>
-    <message>
-        <source>Priority:</source>
-        <translation>Προτεραιότητα:</translation>
-    </message>
     <message>
         <source>Fee:</source>
         <translation>Ταρίφα</translation>
@@ -1159,10 +1173,6 @@
         <source>Custom:</source>
         <translation>Προσαρμογή:</translation>
     </message>
-    <message>
-        <source>Confirmation time:</source>
-        <translation>Χρόνος επικύρωσης:</translation>
-    </message>
     <message>
         <source>normal</source>
         <translation>κανονικό</translation>
@@ -1203,7 +1213,7 @@
         <source>S&amp;end</source>
         <translation>Αποστολη</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>SendCoinsEntry</name>
     <message>
@@ -1262,7 +1272,10 @@
         <source>Memo:</source>
         <translation>Σημείωση:</translation>
     </message>
-</context>
+    </context>
+<context>
+    <name>SendConfirmationDialog</name>
+    </context>
 <context>
     <name>ShutdownWindow</name>
     <message>
@@ -1348,7 +1361,7 @@
         <source>Reset all verify message fields</source>
         <translation>Επαναφορά όλων επαλήθευμενων πεδίων μήνυματος </translation>
     </message>
-</context>
+    </context>
 <context>
     <name>SplashScreen</name>
     <message>
@@ -1363,13 +1376,22 @@
         <translation>KB/s</translation>
     </message>
 </context>
+<context>
+    <name>TransactionDesc</name>
+    </context>
 <context>
     <name>TransactionDescDialog</name>
     <message>
         <source>This pane shows a detailed description of the transaction</source>
         <translation>Αυτό το παράθυρο δείχνει μια λεπτομερή περιγραφή της συναλλαγής</translation>
     </message>
-</context>
+    </context>
+<context>
+    <name>TransactionTableModel</name>
+    </context>
+<context>
+    <name>TransactionView</name>
+    </context>
 <context>
     <name>UnitDisplayStatusBarControl</name>
     <message>
@@ -1377,6 +1399,15 @@
         <translation>Μονάδα μέτρησης προβολής ποσών. Κάντε κλικ για επιλογή άλλης μονάδας.</translation>
     </message>
 </context>
+<context>
+    <name>WalletFrame</name>
+    </context>
+<context>
+    <name>WalletModel</name>
+    </context>
+<context>
+    <name>WalletView</name>
+    </context>
 <context>
     <name>bitcoin-core</name>
     <message>
@@ -1403,10 +1434,6 @@
         <source>Run in the background as a daemon and accept commands</source>
         <translation>Εκτέλεση στο παρασκήνιο κι αποδοχή εντολών</translation>
     </message>
-    <message>
-        <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
-        <translation>Να δέχεσαι συνδέσεις από έξω(προεπιλογή:1)</translation>
-    </message>
     <message>
         <source>Bitcoin Core</source>
         <translation>Bitcoin Core</translation>
@@ -1419,18 +1446,10 @@
         <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source>
         <translation>Εκτέλεσε την εντολή όταν το καλύτερο μπλοκ αλλάξει(%s στην εντολή αντικαθίσταται από το hash του μπλοκ)</translation>
     </message>
-    <message>
-        <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
-        <translation>Αυτό είναι ένα προ-τεστ κυκλοφορίας - χρησιμοποιήστε το με δική σας ευθύνη - δεν χρησιμοποιείτε για εξόρυξη ή για αλλες εφαρμογές</translation>
-    </message>
     <message>
         <source>Block creation options:</source>
         <translation>Αποκλεισμός επιλογων δημιουργίας: </translation>
     </message>
-    <message>
-        <source>Connect only to the specified node(s)</source>
-        <translation>Σύνδεση μόνο με ορισμένους κόμβους</translation>
-    </message>
     <message>
         <source>Connection options:</source>
         <translation>Επιλογές σύνδεσης:</translation>
@@ -1551,10 +1570,6 @@
         <source>Transaction amount too small</source>
         <translation>Το ποσό της συναλλαγής είναι πολύ μικρο </translation>
     </message>
-    <message>
-        <source>Transaction amounts must be positive</source>
-        <translation>Τα ποσά των συναλλαγών πρέπει να είναι θετικα</translation>
-    </message>
     <message>
         <source>Transaction too large</source>
         <translation>Η συναλλαγή ειναι πολύ μεγάλη </translation>
diff --git a/src/qt/locale/bitcoin_en.ts b/src/qt/locale/bitcoin_en.ts
index 78eaf51002527..02a6888998f3c 100644
--- a/src/qt/locale/bitcoin_en.ts
+++ b/src/qt/locale/bitcoin_en.ts
@@ -685,7 +685,7 @@
         <translation>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;locked&lt;/b&gt;</translation>
     </message>
     <message>
-        <location filename="../bitcoin.cpp" line="+516"/>
+        <location filename="../bitcoin.cpp" line="+518"/>
         <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2854,7 +2854,17 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
+        <location line="+3"/>
+        <source>Confirm custom change address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>The address you selected for change is not part of this wallet. Any or all funds in your wallet may be sent to this address. Are you sure?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
         <source>(no label)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3852,7 +3862,7 @@
 <context>
     <name>bitcoin-core</name>
     <message>
-        <location filename="../bitcoinstrings.cpp" line="+302"/>
+        <location filename="../bitcoinstrings.cpp" line="+304"/>
         <source>Options:</source>
         <translation>Options:</translation>
     </message>
@@ -3877,7 +3887,7 @@
         <translation>Accept command line and JSON-RPC commands</translation>
     </message>
     <message>
-        <location line="-205"/>
+        <location line="-207"/>
         <source>Accept connections from outside (default: 1 if no -proxy or -connect/-noconnect)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3917,7 +3927,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+127"/>
+        <location line="+129"/>
         <source>Error: A fatal internal error occurred, see debug.log for details</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3942,7 +3952,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-344"/>
+        <location line="-346"/>
         <source>Bitcoin Core</source>
         <translation type="unfinished">Bitcoin Core</translation>
     </message>
@@ -4037,7 +4047,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="+8"/>
+        <source>Username and hashed password for JSON-RPC connections. The field &lt;userpw&gt; comes in the format: &lt;USERNAME&gt;:&lt;SALT&gt;$&lt;HASH&gt;. A canonical python script is included in share/rpcuser. The client then connects normally using the rpcuser=&lt;USERNAME&gt;/rpcpassword=&lt;PASSWORD&gt; pair of arguments. This option can be specified multiple times</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
         <source>Wallet will not create transactions that violate mempool chain limits (default: %u)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4382,7 +4397,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-342"/>
+        <location line="-344"/>
         <source>Allow JSON-RPC connections from specified source. Valid for &lt;ip&gt; are a single IP (e.g. 1.2.3.4), a network/netmask (e.g. 1.2.3.4/255.255.255.0) or a network/CIDR (e.g. 1.2.3.4/24). This option can be specified multiple times</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4457,7 +4472,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+31"/>
         <source>Whitelisted peers cannot be DoS banned and their transactions are always relayed, even if they are already in the mempool, useful e.g. for a gateway</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4647,12 +4662,12 @@
         <translation>Password for JSON-RPC connections</translation>
     </message>
     <message>
-        <location line="-226"/>
+        <location line="-228"/>
         <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
         <translation>Execute command when the best block changes (%s in cmd is replaced by block hash)</translation>
     </message>
     <message>
-        <location line="+154"/>
+        <location line="+156"/>
         <source>Allow DNS lookups for -addnode, -seednode and -connect</source>
         <translation>Allow DNS lookups for -addnode, -seednode and -connect</translation>
     </message>
@@ -4662,7 +4677,7 @@
         <translation>Loading addresses...</translation>
     </message>
     <message>
-        <location line="-275"/>
+        <location line="-277"/>
         <source>(1 = keep tx meta data e.g. account owner and payment request information, 2 = drop tx meta data)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4762,12 +4777,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Username and hashed password for JSON-RPC connections. The field &lt;userpw&gt; comes in the format: &lt;USERNAME&gt;:&lt;SALT&gt;$&lt;HASH&gt;. A canonical python script is included in share/rpcuser. This option can be specified multiple times</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
+        <location line="+15"/>
         <source>Warning: Unknown block versions being mined! It&apos;s possible unknown rules are in effect</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/src/qt/locale/bitcoin_en_GB.ts b/src/qt/locale/bitcoin_en_GB.ts
index 1893aaca09b22..e2944030c74c2 100644
--- a/src/qt/locale/bitcoin_en_GB.ts
+++ b/src/qt/locale/bitcoin_en_GB.ts
@@ -41,6 +41,65 @@
         <source>&amp;Delete</source>
         <translation>&amp;Delete</translation>
     </message>
+    <message>
+        <source>Choose the address to send coins to</source>
+        <translation>Choose the address to send coins to</translation>
+    </message>
+    <message>
+        <source>Choose the address to receive coins with</source>
+        <translation>Choose the address to receive coins with</translation>
+    </message>
+    <message>
+        <source>C&amp;hoose</source>
+        <translation>C&amp;hoose</translation>
+    </message>
+    <message>
+        <source>Sending addresses</source>
+        <translation>Sending addresses</translation>
+    </message>
+    <message>
+        <source>Receiving addresses</source>
+        <translation>Receiving addresses</translation>
+    </message>
+    <message>
+        <source>&amp;Copy Address</source>
+        <translation>&amp;Copy Address</translation>
+    </message>
+    <message>
+        <source>Copy &amp;Label</source>
+        <translation>Copy &amp;Label</translation>
+    </message>
+    <message>
+        <source>&amp;Edit</source>
+        <translation>&amp;Edit</translation>
+    </message>
+    <message>
+        <source>Export Address List</source>
+        <translation>Export Address List</translation>
+    </message>
+    <message>
+        <source>Comma separated file (*.csv)</source>
+        <translation>Comma separated file (*.csv)</translation>
+    </message>
+    <message>
+        <source>Exporting Failed</source>
+        <translation>Exporting Failed</translation>
+    </message>
+    </context>
+<context>
+    <name>AddressTableModel</name>
+    <message>
+        <source>Label</source>
+        <translation>Label</translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation>Address</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(no label)</translation>
+    </message>
 </context>
 <context>
     <name>AskPassphraseDialog</name>
@@ -60,7 +119,11 @@
         <source>Repeat new passphrase</source>
         <translation>Repeat new passphrase</translation>
     </message>
-</context>
+    <message>
+        <source>Encrypt wallet</source>
+        <translation>Encrypt wallet</translation>
+    </message>
+    </context>
 <context>
     <name>BanTableModel</name>
     <message>
@@ -278,26 +341,6 @@
         <source>Processed %n block(s) of transaction history.</source>
         <translation><numerusform>Processed %n block of transaction history.</numerusform><numerusform>Processed %n blocks of transaction history.</numerusform></translation>
     </message>
-    <message numerus="yes">
-        <source>%n hour(s)</source>
-        <translation><numerusform>%n hour</numerusform><numerusform>%n hours</numerusform></translation>
-    </message>
-    <message numerus="yes">
-        <source>%n day(s)</source>
-        <translation><numerusform>%n day</numerusform><numerusform>%n days</numerusform></translation>
-    </message>
-    <message numerus="yes">
-        <source>%n week(s)</source>
-        <translation><numerusform>%n week</numerusform><numerusform>%n weeks</numerusform></translation>
-    </message>
-    <message>
-        <source>%1 and %2</source>
-        <translation>%1 and %2</translation>
-    </message>
-    <message numerus="yes">
-        <source>%n year(s)</source>
-        <translation><numerusform>%n year</numerusform><numerusform>%n years</numerusform></translation>
-    </message>
     <message>
         <source>%1 behind</source>
         <translation>%1 behind</translation>
@@ -384,7 +427,7 @@
         <source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;locked&lt;/b&gt;</source>
         <translation>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;locked&lt;/b&gt;</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>CoinControlDialog</name>
     <message>
@@ -403,10 +446,6 @@
         <source>Amount:</source>
         <translation>Amount:</translation>
     </message>
-    <message>
-        <source>Priority:</source>
-        <translation>Priority:</translation>
-    </message>
     <message>
         <source>Fee:</source>
         <translation>Fee:</translation>
@@ -460,10 +499,10 @@
         <translation>Confirmed</translation>
     </message>
     <message>
-        <source>Priority</source>
-        <translation>Priority</translation>
+        <source>(no label)</source>
+        <translation>(no label)</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>EditAddressDialog</name>
     <message>
@@ -486,7 +525,7 @@
         <source>&amp;Address</source>
         <translation>&amp;Address</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>FreespaceChecker</name>
     <message>
@@ -608,6 +647,21 @@
         <translation><numerusform>(of %n GB needed)</numerusform><numerusform>(of %n GB needed)</numerusform></translation>
     </message>
 </context>
+<context>
+    <name>ModalOverlay</name>
+    <message>
+        <source>Form</source>
+        <translation>Form</translation>
+    </message>
+    <message>
+        <source>Last block time</source>
+        <translation>Last block time</translation>
+    </message>
+    <message>
+        <source>Hide</source>
+        <translation>Hide</translation>
+    </message>
+    </context>
 <context>
     <name>OpenURIDialog</name>
     <message>
@@ -626,7 +680,7 @@
         <source>Select payment request file</source>
         <translation>Select payment request file</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>OptionsDialog</name>
     <message>
@@ -937,6 +991,9 @@
         <translation>Current total balance in watch-only addresses</translation>
     </message>
 </context>
+<context>
+    <name>PaymentServer</name>
+    </context>
 <context>
     <name>PeerTableModel</name>
     <message>
@@ -947,11 +1004,7 @@
         <source>Node/Service</source>
         <translation>Node/Service</translation>
     </message>
-    <message>
-        <source>Ping Time</source>
-        <translation>Ping Time</translation>
-    </message>
-</context>
+    </context>
 <context>
     <name>QObject</name>
     <message>
@@ -990,7 +1043,17 @@
         <source>%1 ms</source>
         <translation>%1 ms</translation>
     </message>
-</context>
+    <message>
+        <source>%1 and %2</source>
+        <translation>%1 and %2</translation>
+    </message>
+    </context>
+<context>
+    <name>QObject::QObject</name>
+    </context>
+<context>
+    <name>QRImageWidget</name>
+    </context>
 <context>
     <name>RPCConsole</name>
     <message>
@@ -1193,14 +1256,6 @@
         <source>Clear console</source>
         <translation>Clear console</translation>
     </message>
-    <message>
-        <source>&amp;Disconnect Node</source>
-        <translation>&amp;Disconnect Node</translation>
-    </message>
-    <message>
-        <source>Ban Node for</source>
-        <translation>Ban Node for</translation>
-    </message>
     <message>
         <source>1 &amp;hour</source>
         <translation>1 &amp;hour</translation>
@@ -1217,10 +1272,6 @@
         <source>1 &amp;year</source>
         <translation>1 &amp;year</translation>
     </message>
-    <message>
-        <source>&amp;Unban Node</source>
-        <translation>&amp;Unban Node</translation>
-    </message>
     <message>
         <source>Welcome to the %1 RPC console.</source>
         <translation>Welcome to the %1 RPC console.</translation>
@@ -1352,7 +1403,7 @@
         <source>Remove</source>
         <translation>Remove</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>ReceiveRequestDialog</name>
     <message>
@@ -1371,7 +1422,26 @@
         <source>&amp;Save Image...</source>
         <translation>&amp;Save Image...</translation>
     </message>
-</context>
+    <message>
+        <source>Address</source>
+        <translation>Address</translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation>Label</translation>
+    </message>
+    </context>
+<context>
+    <name>RecentRequestsTableModel</name>
+    <message>
+        <source>Label</source>
+        <translation>Label</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(no label)</translation>
+    </message>
+    </context>
 <context>
     <name>SendCoinsDialog</name>
     <message>
@@ -1406,10 +1476,6 @@
         <source>Amount:</source>
         <translation>Amount:</translation>
     </message>
-    <message>
-        <source>Priority:</source>
-        <translation>Priority:</translation>
-    </message>
     <message>
         <source>Fee:</source>
         <translation>Fee:</translation>
@@ -1478,10 +1544,6 @@
         <source>(Smart fee not initialized yet. This usually takes a few blocks...)</source>
         <translation>(Smart fee not initialised yet. This usually takes a few blocks...)</translation>
     </message>
-    <message>
-        <source>Confirmation time:</source>
-        <translation>Confirmation time:</translation>
-    </message>
     <message>
         <source>normal</source>
         <translation>normal</translation>
@@ -1522,6 +1584,10 @@
         <source>S&amp;end</source>
         <translation>S&amp;end</translation>
     </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(no label)</translation>
+    </message>
 </context>
 <context>
     <name>SendCoinsEntry</name>
@@ -1601,7 +1667,10 @@
         <source>Memo:</source>
         <translation>Memo:</translation>
     </message>
-</context>
+    </context>
+<context>
+    <name>SendConfirmationDialog</name>
+    </context>
 <context>
     <name>ShutdownWindow</name>
     <message>
@@ -1699,7 +1768,7 @@
         <source>Reset all verify message fields</source>
         <translation>Reset all verify message fields</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>SplashScreen</name>
     <message>
@@ -1714,13 +1783,46 @@
         <translation>KB/s</translation>
     </message>
 </context>
+<context>
+    <name>TransactionDesc</name>
+    </context>
 <context>
     <name>TransactionDescDialog</name>
     <message>
         <source>This pane shows a detailed description of the transaction</source>
         <translation>This pane shows a detailed description of the transaction</translation>
     </message>
-</context>
+    </context>
+<context>
+    <name>TransactionTableModel</name>
+    <message>
+        <source>Label</source>
+        <translation>Label</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(no label)</translation>
+    </message>
+    </context>
+<context>
+    <name>TransactionView</name>
+    <message>
+        <source>Comma separated file (*.csv)</source>
+        <translation>Comma separated file (*.csv)</translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation>Label</translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation>Address</translation>
+    </message>
+    <message>
+        <source>Exporting Failed</source>
+        <translation>Exporting Failed</translation>
+    </message>
+    </context>
 <context>
     <name>UnitDisplayStatusBarControl</name>
     <message>
@@ -1728,6 +1830,15 @@
         <translation>Unit to show amounts in. Click to select another unit.</translation>
     </message>
 </context>
+<context>
+    <name>WalletFrame</name>
+    </context>
+<context>
+    <name>WalletModel</name>
+    </context>
+<context>
+    <name>WalletView</name>
+    </context>
 <context>
     <name>bitcoin-core</name>
     <message>
@@ -1790,10 +1901,6 @@
         <source>Unable to start HTTP server. See debug log for details.</source>
         <translation>Unable to start HTTP server. See debug log for details.</translation>
     </message>
-    <message>
-        <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
-        <translation>Accept connections from outside (default: 1 if no -proxy or -connect)</translation>
-    </message>
     <message>
         <source>Bitcoin Core</source>
         <translation>Bitcoin Core</translation>
@@ -1802,10 +1909,6 @@
         <source>The %s developers</source>
         <translation>The %s developers</translation>
     </message>
-    <message>
-        <source>-fallbackfee is set very high! This is the transaction fee you may pay when fee estimates are not available.</source>
-        <translation>-fallbackfee is set very high! This is the transaction fee you may pay when fee estimates are not available.</translation>
-    </message>
     <message>
         <source>A fee rate (in %s/kB) that will be used when fee estimation has insufficient data (default: %s)</source>
         <translation>A fee rate (in %s/kB) that will be used when fee estimation has insufficient data (default: %s)</translation>
@@ -1826,10 +1929,6 @@
         <source>Delete all wallet transactions and only recover those parts of the blockchain through -rescan on startup</source>
         <translation>Delete all wallet transactions and only recover those parts of the blockchain through -rescan on startup</translation>
     </message>
-    <message>
-        <source>Distributed under the MIT software license, see the accompanying file COPYING or &lt;http://www.opensource.org/licenses/mit-license.php&gt;.</source>
-        <translation>Distributed under the MIT software license, see the accompanying file COPYING or &lt;http://www.opensource.org/licenses/mit-license.php&gt;.</translation>
-    </message>
     <message>
         <source>Error loading %s: You can't enable HD on a already existing non-HD wallet</source>
         <translation>Error loading %s: You can't enable HD on a already existing non-HD wallet</translation>
@@ -1842,10 +1941,6 @@
         <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source>
         <translation>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</translation>
     </message>
-    <message>
-        <source>Force relay of transactions from whitelisted peers even they violate local relay policy (default: %d)</source>
-        <translation>Force relay of transactions from whitelisted peers even they violate local relay policy (default: %d)</translation>
-    </message>
     <message>
         <source>Maximum allowed median peer time offset adjustment. Local perspective of time may be influenced by peers forward or backward by this amount. (default: %u seconds)</source>
         <translation>Maximum allowed median peer time offset adjustment. Local perspective of time may be influenced by peers forward or backward by this amount. (default: %u seconds)</translation>
@@ -1870,10 +1965,6 @@
         <source>The block database contains a block which appears to be from the future. This may be due to your computer's date and time being set incorrectly. Only rebuild the block database if you are sure that your computer's date and time are correct</source>
         <translation>The block database contains a block which appears to be from the future. This may be due to your computer's date and time being set incorrectly. Only rebuild the block database if you are sure that your computer's date and time are correct</translation>
     </message>
-    <message>
-        <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
-        <translation>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</translation>
-    </message>
     <message>
         <source>Unable to rewind the database to a pre-fork state. You will need to redownload the blockchain</source>
         <translation>Unable to rewind the database to a pre-fork state. You will need to re-download the blockchain</translation>
@@ -1882,18 +1973,6 @@
         <source>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</source>
         <translation>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</translation>
     </message>
-    <message>
-        <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source>
-        <translation>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</translation>
-    </message>
-    <message>
-        <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source>
-        <translation>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</translation>
-    </message>
-    <message>
-        <source>Whitelist peers connecting from the given netmask or IP address. Can be specified multiple times.</source>
-        <translation>Whitelist peers connecting from the given netmask or IP address. Can be specified multiple times.</translation>
-    </message>
     <message>
         <source>You need to rebuild the database using -reindex-chainstate to change -txindex</source>
         <translation>You need to rebuild the database using -reindex-chainstate to change -txindex</translation>
@@ -1930,10 +2009,6 @@
         <source>Change index out of range</source>
         <translation>Change index out of range</translation>
     </message>
-    <message>
-        <source>Connect only to the specified node(s)</source>
-        <translation>Connect only to the specified node(s)</translation>
-    </message>
     <message>
         <source>Connection options:</source>
         <translation>Connection options:</translation>
@@ -2054,10 +2129,6 @@
         <source>Location of the auth cookie (default: data dir)</source>
         <translation>Location of the auth cookie (default: data dir)</translation>
     </message>
-    <message>
-        <source>Minimum bytes per sigop in transactions we relay and mine (default: %u)</source>
-        <translation>Minimum bytes per sigop in transactions we relay and mine (default: %u)</translation>
-    </message>
     <message>
         <source>Not enough file descriptors available.</source>
         <translation>Not enough file descriptors available.</translation>
@@ -2098,10 +2169,6 @@
         <source>Set database cache size in megabytes (%d to %d, default: %d)</source>
         <translation>Set database cache size in megabytes (%d to %d, default: %d)</translation>
     </message>
-    <message>
-        <source>Set maximum block cost (default: %d)</source>
-        <translation>Set maximum block cost (default: %d)</translation>
-    </message>
     <message>
         <source>Set maximum block size in bytes (default: %d)</source>
         <translation>Set maximum block size in bytes (default: %d)</translation>
@@ -2206,10 +2273,6 @@
         <source>Maximum size of data in data carrier transactions we relay and mine (default: %u)</source>
         <translation>Maximum size of data in data carrier transactions we relay and mine (default: %u)</translation>
     </message>
-    <message>
-        <source>Query for peer addresses via DNS lookup, if low on addresses (default: 1 unless -connect)</source>
-        <translation>Query for peer addresses via DNS lookup, if low on addresses (default: 1 unless -connect)</translation>
-    </message>
     <message>
         <source>Randomize credentials for every proxy connection. This enables Tor stream isolation (default: %u)</source>
         <translation>Randomise credentials for every proxy connection. This enables Tor stream isolation (default: %u)</translation>
@@ -2222,10 +2285,6 @@
         <source>The transaction amount is too small to send after the fee has been deducted</source>
         <translation>The transaction amount is too small to send after the fee has been deducted</translation>
     </message>
-    <message>
-        <source>This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit &lt;https://www.openssl.org/&gt; and cryptographic software written by Eric Young and UPnP software written by Thomas Bernard.</source>
-        <translation>This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit &lt;https://www.openssl.org/&gt; and cryptographic software written by Eric Young and UPnP software written by Thomas Bernard.</translation>
-    </message>
     <message>
         <source>Use hierarchical deterministic key generation (HD) after BIP32. Only has effect during wallet creation/first start</source>
         <translation>Use hierarchical deterministic key generation (HD) after BIP32. Only has effect during wallet creation/first start</translation>
@@ -2338,10 +2397,6 @@
         <source>Transaction amount too small</source>
         <translation>Transaction amount too small</translation>
     </message>
-    <message>
-        <source>Transaction amounts must be positive</source>
-        <translation>Transaction amounts must be positive</translation>
-    </message>
     <message>
         <source>Transaction too large for fee policy</source>
         <translation>Transaction too large for fee policy</translation>
@@ -2406,14 +2461,14 @@
         <source>-maxtxfee is set very high! Fees this large could be paid on a single transaction.</source>
         <translation>-maxtxfee is set very high! Fees this large could be paid on a single transaction.</translation>
     </message>
-    <message>
-        <source>-paytxfee is set very high! This is the transaction fee you will pay if you send a transaction.</source>
-        <translation>-paytxfee is set very high! This is the transaction fee you will pay if you send a transaction.</translation>
-    </message>
     <message>
         <source>Do not keep transactions in the mempool longer than &lt;n&gt; hours (default: %u)</source>
         <translation>Do not keep transactions in the mempool longer than &lt;n&gt; hours (default: %u)</translation>
     </message>
+    <message>
+        <source>Equivalent bytes per sigop in transactions for relay and mining (default: %u)</source>
+        <translation>Equivalent bytes per sigop in transactions for relay and mining (default: %u)</translation>
+    </message>
     <message>
         <source>Fees (in %s/kB) smaller than this are considered zero fee for transaction creation (default: %s)</source>
         <translation>Fees (in %s/kB) smaller than this are considered zero fee for transaction creation (default: %s)</translation>
@@ -2531,8 +2586,8 @@
         <translation>Set key pool size to &lt;n&gt; (default: %u)</translation>
     </message>
     <message>
-        <source>Set minimum block size in bytes (default: %u)</source>
-        <translation>Set minimum block size in bytes (default: %u)</translation>
+        <source>Set maximum BIP141 block weight (default: %d)</source>
+        <translation>Set maximum BIP141 block weight (default: %d)</translation>
     </message>
     <message>
         <source>Set the number of threads to service RPC calls (default: %d)</source>
diff --git a/src/qt/locale/bitcoin_eo.ts b/src/qt/locale/bitcoin_eo.ts
index 4471aeb72e6e7..2337c2bd2981d 100644
--- a/src/qt/locale/bitcoin_eo.ts
+++ b/src/qt/locale/bitcoin_eo.ts
@@ -41,7 +41,10 @@
         <source>&amp;Delete</source>
         <translation>&amp;Forigi</translation>
     </message>
-</context>
+    </context>
+<context>
+    <name>AddressTableModel</name>
+    </context>
 <context>
     <name>AskPassphraseDialog</name>
     <message>
@@ -60,7 +63,7 @@
         <source>Repeat new passphrase</source>
         <translation>Ripetu la novan pasfrazon</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>BanTableModel</name>
     </context>
@@ -242,26 +245,6 @@
         <source>No block source available...</source>
         <translation>Neniu fonto de blokoj trovebla...</translation>
     </message>
-    <message numerus="yes">
-        <source>%n hour(s)</source>
-        <translation><numerusform>%n horo</numerusform><numerusform>%n horoj</numerusform></translation>
-    </message>
-    <message numerus="yes">
-        <source>%n day(s)</source>
-        <translation><numerusform>%n tago</numerusform><numerusform>%n tagoj</numerusform></translation>
-    </message>
-    <message numerus="yes">
-        <source>%n week(s)</source>
-        <translation><numerusform>%n semajno</numerusform><numerusform>%n semajnoj</numerusform></translation>
-    </message>
-    <message>
-        <source>%1 and %2</source>
-        <translation>%1 kaj %2</translation>
-    </message>
-    <message numerus="yes">
-        <source>%n year(s)</source>
-        <translation><numerusform>%n jaro</numerusform><numerusform>%n jaroj</numerusform></translation>
-    </message>
     <message>
         <source>%1 behind</source>
         <translation>mankas %1</translation>
@@ -340,7 +323,7 @@
         <source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;locked&lt;/b&gt;</source>
         <translation>Monujo estas &lt;b&gt;ĉifrita&lt;/b&gt; kaj aktuale &lt;b&gt;ŝlosita&lt;/b&gt;</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>CoinControlDialog</name>
     <message>
@@ -355,10 +338,6 @@
         <source>Amount:</source>
         <translation>Sumo:</translation>
     </message>
-    <message>
-        <source>Priority:</source>
-        <translation>Prioritato:</translation>
-    </message>
     <message>
         <source>Fee:</source>
         <translation>Krompago:</translation>
@@ -411,11 +390,7 @@
         <source>Confirmed</source>
         <translation>Konfirmita</translation>
     </message>
-    <message>
-        <source>Priority</source>
-        <translation>Prioritato</translation>
-    </message>
-</context>
+    </context>
 <context>
     <name>EditAddressDialog</name>
     <message>
@@ -438,7 +413,7 @@
         <source>&amp;Address</source>
         <translation>&amp;Adreso</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>FreespaceChecker</name>
     <message>
@@ -508,6 +483,17 @@
         <translation><numerusform>%n gigabajto de libera loko disponeble</numerusform><numerusform>%n gigabajtoj de libera loko disponebla.</numerusform></translation>
     </message>
     </context>
+<context>
+    <name>ModalOverlay</name>
+    <message>
+        <source>Form</source>
+        <translation>Formularo</translation>
+    </message>
+    <message>
+        <source>Last block time</source>
+        <translation>Horo de la lasta bloko</translation>
+    </message>
+    </context>
 <context>
     <name>OpenURIDialog</name>
     <message>
@@ -526,7 +512,7 @@
         <source>Select payment request file</source>
         <translation>Elektu la dosieron de la pagpeto</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>OptionsDialog</name>
     <message>
@@ -709,6 +695,9 @@
         <translation>Lastaj transakcioj</translation>
     </message>
     </context>
+<context>
+    <name>PaymentServer</name>
+    </context>
 <context>
     <name>PeerTableModel</name>
     <message>
@@ -738,6 +727,16 @@
         <source>N/A</source>
         <translation>neaplikebla</translation>
     </message>
+    <message>
+        <source>%1 and %2</source>
+        <translation>%1 kaj %2</translation>
+    </message>
+    </context>
+<context>
+    <name>QObject::QObject</name>
+    </context>
+<context>
+    <name>QRImageWidget</name>
     </context>
 <context>
     <name>RPCConsole</name>
@@ -920,7 +919,7 @@
         <source>Remove</source>
         <translation>Forigi</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>ReceiveRequestDialog</name>
     <message>
@@ -939,7 +938,10 @@
         <source>&amp;Save Image...</source>
         <translation>&amp;Konservi Bildon...</translation>
     </message>
-</context>
+    </context>
+<context>
+    <name>RecentRequestsTableModel</name>
+    </context>
 <context>
     <name>SendCoinsDialog</name>
     <message>
@@ -970,10 +972,6 @@
         <source>Amount:</source>
         <translation>Sumo:</translation>
     </message>
-    <message>
-        <source>Priority:</source>
-        <translation>Prioritato:</translation>
-    </message>
     <message>
         <source>Fee:</source>
         <translation>Krompago:</translation>
@@ -1022,7 +1020,7 @@
         <source>S&amp;end</source>
         <translation>Ŝendi</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>SendCoinsEntry</name>
     <message>
@@ -1077,7 +1075,10 @@
         <source>Memo:</source>
         <translation>Memorando:</translation>
     </message>
-</context>
+    </context>
+<context>
+    <name>SendConfirmationDialog</name>
+    </context>
 <context>
     <name>ShutdownWindow</name>
     <message>
@@ -1155,7 +1156,7 @@
         <source>Reset all verify message fields</source>
         <translation>Reagordigi ĉiujn prikontrolajn kampojn</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>SplashScreen</name>
     <message>
@@ -1170,16 +1171,34 @@
         <translation>KB/s</translation>
     </message>
 </context>
+<context>
+    <name>TransactionDesc</name>
+    </context>
 <context>
     <name>TransactionDescDialog</name>
     <message>
         <source>This pane shows a detailed description of the transaction</source>
         <translation>Tiu ĉi panelo montras detalan priskribon de la transakcio</translation>
     </message>
-</context>
+    </context>
+<context>
+    <name>TransactionTableModel</name>
+    </context>
+<context>
+    <name>TransactionView</name>
+    </context>
 <context>
     <name>UnitDisplayStatusBarControl</name>
     </context>
+<context>
+    <name>WalletFrame</name>
+    </context>
+<context>
+    <name>WalletModel</name>
+    </context>
+<context>
+    <name>WalletView</name>
+    </context>
 <context>
     <name>bitcoin-core</name>
     <message>
@@ -1206,10 +1225,6 @@
         <source>Run in the background as a daemon and accept commands</source>
         <translation>Ruli fone kiel demono kaj akcepti komandojn</translation>
     </message>
-    <message>
-        <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
-        <translation>Akcepti konektojn el ekstere (defaŭlte: 1 se ne estas -proxy nek -connect)</translation>
-    </message>
     <message>
         <source>Bitcoin Core</source>
         <translation>Kerno de Bitmono</translation>
@@ -1222,18 +1237,6 @@
         <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source>
         <translation>Plenumi komandon kiam monuja transakcio ŝanĝiĝas (%s en cmd anstataŭiĝas per TxID)</translation>
     </message>
-    <message>
-        <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
-        <translation>Tiu ĉi estas antaŭeldona testa versio - uzu laŭ via propra risko - ne uzu por minado aŭ por aplikaĵoj por vendistoj</translation>
-    </message>
-    <message>
-        <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source>
-        <translation>Averto: La reto ne tute konsentas! Kelkaj minantoj ŝajne spertas problemojn aktuale.</translation>
-    </message>
-    <message>
-        <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source>
-        <translation>Averto: ŝajne ni ne tute konsentas kun niaj samtavolanoj! Eble vi devas ĝisdatigi vian klienton, aŭ eble aliaj nodoj faru same.</translation>
-    </message>
     <message>
         <source>&lt;category&gt; can be:</source>
         <translation>&lt;category&gt; povas esti:</translation>
@@ -1242,10 +1245,6 @@
         <source>Block creation options:</source>
         <translation>Blok-kreaj agordaĵoj:</translation>
     </message>
-    <message>
-        <source>Connect only to the specified node(s)</source>
-        <translation>Konekti nur al specifita(j) nodo(j)</translation>
-    </message>
     <message>
         <source>Corrupted block database detected</source>
         <translation>Difektita blokdatumbazo trovita</translation>
@@ -1338,10 +1337,6 @@
         <source>Transaction amount too small</source>
         <translation>Transakcia sumo tro malgranda</translation>
     </message>
-    <message>
-        <source>Transaction amounts must be positive</source>
-        <translation>Transakcia sumo devas esti pozitiva</translation>
-    </message>
     <message>
         <source>Transaction too large</source>
         <translation>Transakcio estas tro granda</translation>
diff --git a/src/qt/locale/bitcoin_es.ts b/src/qt/locale/bitcoin_es.ts
index c67016637b516..435ea110cfa27 100644
--- a/src/qt/locale/bitcoin_es.ts
+++ b/src/qt/locale/bitcoin_es.ts
@@ -41,6 +41,77 @@
         <source>&amp;Delete</source>
         <translation>&amp;Eliminar</translation>
     </message>
+    <message>
+        <source>Choose the address to send coins to</source>
+        <translation>Seleccione la dirección a la que enviar monedas</translation>
+    </message>
+    <message>
+        <source>Choose the address to receive coins with</source>
+        <translation>Seleccione la dirección de la que recibir monedas</translation>
+    </message>
+    <message>
+        <source>C&amp;hoose</source>
+        <translation>E&amp;scoger</translation>
+    </message>
+    <message>
+        <source>Sending addresses</source>
+        <translation>Direcciones de envío</translation>
+    </message>
+    <message>
+        <source>Receiving addresses</source>
+        <translation>Direcciones de recepción</translation>
+    </message>
+    <message>
+        <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source>
+        <translation>Estas son sus direcciones Bitcoin para enviar pagos. Verifique siempre la cantidad y la dirección de recepción antes de enviar bitcoins.</translation>
+    </message>
+    <message>
+        <source>These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source>
+        <translation>Estas son sus direcciones Bitcoin para recibir pagos. Se recomienda utilizar una nueva dirección de recepción para cada transacción</translation>
+    </message>
+    <message>
+        <source>&amp;Copy Address</source>
+        <translation>&amp;Copiar Dirección</translation>
+    </message>
+    <message>
+        <source>Copy &amp;Label</source>
+        <translation>Copiar &amp;Etiqueta</translation>
+    </message>
+    <message>
+        <source>&amp;Edit</source>
+        <translation>&amp;Editar</translation>
+    </message>
+    <message>
+        <source>Export Address List</source>
+        <translation>Exportar lista de direcciones</translation>
+    </message>
+    <message>
+        <source>Comma separated file (*.csv)</source>
+        <translation>Archivo separado de coma (*.csv)</translation>
+    </message>
+    <message>
+        <source>Exporting Failed</source>
+        <translation>Falló la exportación</translation>
+    </message>
+    <message>
+        <source>There was an error trying to save the address list to %1. Please try again.</source>
+        <translation>Había un error intentando guardar la lista de direcciones en %1. Por favor inténtelo de nuevo.</translation>
+    </message>
+</context>
+<context>
+    <name>AddressTableModel</name>
+    <message>
+        <source>Label</source>
+        <translation>Etiqueta</translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation>Dirección</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(sin etiqueta)</translation>
+    </message>
 </context>
 <context>
     <name>AskPassphraseDialog</name>
@@ -60,6 +131,94 @@
         <source>Repeat new passphrase</source>
         <translation>Repita la nueva contraseña</translation>
     </message>
+    <message>
+        <source>Enter the new passphrase to the wallet.&lt;br/&gt;Please use a passphrase of &lt;b&gt;ten or more random characters&lt;/b&gt;, or &lt;b&gt;eight or more words&lt;/b&gt;.</source>
+        <translation>Introduzca la nueva contraseña del monedero. &lt;br/&gt;Por favor utilice una contraseña de &lt;b&gt;diez o más carácteres aleatorios&lt;/b&gt;, o &lt;b&gt;ocho o más palabras&lt;/b&gt;.</translation>
+    </message>
+    <message>
+        <source>Encrypt wallet</source>
+        <translation>Cifrar monedero</translation>
+    </message>
+    <message>
+        <source>This operation needs your wallet passphrase to unlock the wallet.</source>
+        <translation>Esta operación necesita su contraseña de monedero para desbloquear el monedero.</translation>
+    </message>
+    <message>
+        <source>Unlock wallet</source>
+        <translation>Desbloquear monedero</translation>
+    </message>
+    <message>
+        <source>This operation needs your wallet passphrase to decrypt the wallet.</source>
+        <translation>Esta operación necesita su contraseña para descifrar el monedero.</translation>
+    </message>
+    <message>
+        <source>Decrypt wallet</source>
+        <translation>Descifrar monedero</translation>
+    </message>
+    <message>
+        <source>Change passphrase</source>
+        <translation>Cambiar contraseña</translation>
+    </message>
+    <message>
+        <source>Enter the old passphrase and new passphrase to the wallet.</source>
+        <translation>Introduzca la contraseña antigua y la nueva para el monedero.</translation>
+    </message>
+    <message>
+        <source>Confirm wallet encryption</source>
+        <translation>Confirmar cifrado del monedero</translation>
+    </message>
+    <message>
+        <source>Warning: If you encrypt your wallet and lose your passphrase, you will &lt;b&gt;LOSE ALL OF YOUR BITCOINS&lt;/b&gt;!</source>
+        <translation>Advertencia: Si cifra su monedero y pierde su contraseña&lt;b&gt;¡PERDERÁ TODOS SUS BITCOINS!&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <source>Are you sure you wish to encrypt your wallet?</source>
+        <translation>¿Seguro que desea cifrar su monedero?</translation>
+    </message>
+    <message>
+        <source>Wallet encrypted</source>
+        <translation>Monedero cifrado</translation>
+    </message>
+    <message>
+        <source>%1 will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source>
+        <translation>%1 se cerrará ahora para terminar el proceso de cifrado. Recuerde que cifrar su monedero no puede proteger completamente su monedero de ser robado por malware que infecte su ordenador.</translation>
+    </message>
+    <message>
+        <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source>
+        <translation>IMPORTANTE: Cualquier copia de seguridad anterior que haya hecho en su archivo de monedero debería ser reemplazada con el archivo de monedero cifrado generado recientemente. Por razones de seguridad, las copias de seguridad anteriores del archivo de monedero descifrado serán inútiles en cuanto empiece a utilizar el nuevo monedero cifrado.</translation>
+    </message>
+    <message>
+        <source>Wallet encryption failed</source>
+        <translation>Fracasó el cifrado del monedero</translation>
+    </message>
+    <message>
+        <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
+        <translation>Falló el cifrado del monedero debido a un error interno. Su monedero no fue cifrado.</translation>
+    </message>
+    <message>
+        <source>The supplied passphrases do not match.</source>
+        <translation>La contraseña introducida no coincide.</translation>
+    </message>
+    <message>
+        <source>Wallet unlock failed</source>
+        <translation>Fracasó el desbloqueo del monedero</translation>
+    </message>
+    <message>
+        <source>The passphrase entered for the wallet decryption was incorrect.</source>
+        <translation>La contraseña introducida para el cifrado del monedero es incorrecta.</translation>
+    </message>
+    <message>
+        <source>Wallet decryption failed</source>
+        <translation>Fracasó el cifrado del monedero</translation>
+    </message>
+    <message>
+        <source>Wallet passphrase was successfully changed.</source>
+        <translation>La contraseña del monedero se ha cambiado con éxito.</translation>
+    </message>
+    <message>
+        <source>Warning: The Caps Lock key is on!</source>
+        <translation>Alerta: ¡La clave de bloqueo Caps está activa!</translation>
+    </message>
 </context>
 <context>
     <name>BanTableModel</name>
@@ -158,6 +317,18 @@
         <source>Open &amp;URI...</source>
         <translation>Abrir &amp;URI...</translation>
     </message>
+    <message>
+        <source>Click to disable network activity.</source>
+        <translation>Pulsar para deshabilitar la actividad de red.</translation>
+    </message>
+    <message>
+        <source>Network activity disabled.</source>
+        <translation>Actividad de red deshabilitada.</translation>
+    </message>
+    <message>
+        <source>Click to enable network activity again.</source>
+        <translation>Pulsar para volver a habilitar la actividad de red.</translation>
+    </message>
     <message>
         <source>Reindexing blocks on disk...</source>
         <translation>Reindexando bloques en disco...</translation>
@@ -272,32 +443,12 @@
     </message>
     <message>
         <source>No block source available...</source>
-        <translation>Ninguna fuente de bloques disponible ...</translation>
+        <translation>Ninguna fuente de bloques disponible...</translation>
     </message>
     <message numerus="yes">
         <source>Processed %n block(s) of transaction history.</source>
         <translation><numerusform>%n bloque procesado del historial de transacciones.</numerusform><numerusform>%n bloques procesados del historial de transacciones.</numerusform></translation>
     </message>
-    <message numerus="yes">
-        <source>%n hour(s)</source>
-        <translation><numerusform>%n hora</numerusform><numerusform>%n horas</numerusform></translation>
-    </message>
-    <message numerus="yes">
-        <source>%n day(s)</source>
-        <translation><numerusform>%n día</numerusform><numerusform>%n días</numerusform></translation>
-    </message>
-    <message numerus="yes">
-        <source>%n week(s)</source>
-        <translation><numerusform>%n semana</numerusform><numerusform>%n semanas</numerusform></translation>
-    </message>
-    <message>
-        <source>%1 and %2</source>
-        <translation>%1 y %2</translation>
-    </message>
-    <message numerus="yes">
-        <source>%n year(s)</source>
-        <translation><numerusform>%n año</numerusform><numerusform>%n años</numerusform></translation>
-    </message>
     <message>
         <source>%1 behind</source>
         <translation>%1 atrás</translation>
@@ -376,6 +527,14 @@
         <source>Incoming transaction</source>
         <translation>Transacción entrante</translation>
     </message>
+    <message>
+        <source>HD key generation is &lt;b&gt;enabled&lt;/b&gt;</source>
+        <translation>La generación de clave HD está &lt;b&gt;habilitada&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <source>HD key generation is &lt;b&gt;disabled&lt;/b&gt;</source>
+        <translation>La generación de clave HD está &lt;b&gt;deshabilitada&lt;/b&gt;</translation>
+    </message>
     <message>
         <source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;unlocked&lt;/b&gt;</source>
         <translation>El monedero está &lt;b&gt;cifrado&lt;/b&gt; y actualmente &lt;b&gt;desbloqueado&lt;/b&gt;</translation>
@@ -384,6 +543,10 @@
         <source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;locked&lt;/b&gt;</source>
         <translation>El monedero está &lt;b&gt;cifrado&lt;/b&gt; y actualmente &lt;b&gt;bloqueado&lt;/b&gt;</translation>
     </message>
+    <message>
+        <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source>
+        <translation>Ha ocurrido un error fatal. Bitcoin no puede seguir seguro y se cerrará.</translation>
+    </message>
 </context>
 <context>
     <name>CoinControlDialog</name>
@@ -403,10 +566,6 @@
         <source>Amount:</source>
         <translation>Cuantía:</translation>
     </message>
-    <message>
-        <source>Priority:</source>
-        <translation>Prioridad:</translation>
-    </message>
     <message>
         <source>Fee:</source>
         <translation>Tasa:</translation>
@@ -460,8 +619,84 @@
         <translation>Confirmado</translation>
     </message>
     <message>
-        <source>Priority</source>
-        <translation>Prioridad</translation>
+        <source>Copy address</source>
+        <translation>Copiar ubicación</translation>
+    </message>
+    <message>
+        <source>Copy label</source>
+        <translation>Copiar etiqueta</translation>
+    </message>
+    <message>
+        <source>Copy amount</source>
+        <translation>Copiar cantidad</translation>
+    </message>
+    <message>
+        <source>Copy transaction ID</source>
+        <translation>Copiar ID de transacción</translation>
+    </message>
+    <message>
+        <source>Lock unspent</source>
+        <translation>Bloquear lo no gastado</translation>
+    </message>
+    <message>
+        <source>Unlock unspent</source>
+        <translation>Desbloquear lo no gastado</translation>
+    </message>
+    <message>
+        <source>Copy quantity</source>
+        <translation>Copiar cantidad</translation>
+    </message>
+    <message>
+        <source>Copy fee</source>
+        <translation>Copiar comisión</translation>
+    </message>
+    <message>
+        <source>Copy after fee</source>
+        <translation>Copiar después de couta</translation>
+    </message>
+    <message>
+        <source>Copy bytes</source>
+        <translation>Copiar bytes</translation>
+    </message>
+    <message>
+        <source>Copy dust</source>
+        <translation>Copiar polvo</translation>
+    </message>
+    <message>
+        <source>Copy change</source>
+        <translation>Copiar cambio</translation>
+    </message>
+    <message>
+        <source>(%1 locked)</source>
+        <translation>(%1 bloqueado)</translation>
+    </message>
+    <message>
+        <source>yes</source>
+        <translation>sí</translation>
+    </message>
+    <message>
+        <source>no</source>
+        <translation>no</translation>
+    </message>
+    <message>
+        <source>This label turns red if any recipient receives an amount smaller than the current dust threshold.</source>
+        <translation>Esta etiqueta se vuelve roja si algún destinatario recibe una cantidad inferior a la actual puerta polvorienta.</translation>
+    </message>
+    <message>
+        <source>Can vary +/- %1 satoshi(s) per input.</source>
+        <translation>Puede variar +/- %1 satoshi(s) por entrada.</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(sin etiqueta)</translation>
+    </message>
+    <message>
+        <source>change from %1 (%2)</source>
+        <translation>cambia desde %1 (%2)</translation>
+    </message>
+    <message>
+        <source>(change)</source>
+        <translation>(cambio)</translation>
     </message>
 </context>
 <context>
@@ -486,6 +721,38 @@
         <source>&amp;Address</source>
         <translation>&amp;Dirección</translation>
     </message>
+    <message>
+        <source>New receiving address</source>
+        <translation>Nueva dirección de recivimiento</translation>
+    </message>
+    <message>
+        <source>New sending address</source>
+        <translation>Nueva dirección de envío</translation>
+    </message>
+    <message>
+        <source>Edit receiving address</source>
+        <translation>Editar dirección de recivimiento</translation>
+    </message>
+    <message>
+        <source>Edit sending address</source>
+        <translation>Editar dirección de envío</translation>
+    </message>
+    <message>
+        <source>The entered address "%1" is not a valid Bitcoin address.</source>
+        <translation>La dirección introducida "%1" no es una dirección Bitcoin válida.</translation>
+    </message>
+    <message>
+        <source>The entered address "%1" is already in the address book.</source>
+        <translation>La dirección introducida "%1" está ya en la agenda.</translation>
+    </message>
+    <message>
+        <source>Could not unlock wallet.</source>
+        <translation>Podría no desbloquear el monedero.</translation>
+    </message>
+    <message>
+        <source>New key generation failed.</source>
+        <translation>Falló la generación de la nueva clave.</translation>
+    </message>
 </context>
 <context>
     <name>FreespaceChecker</name>
@@ -499,7 +766,7 @@
     </message>
     <message>
         <source>Directory already exists. Add %1 if you intend to create a new directory here.</source>
-        <translation>El directorio ya existe. Añada %1 si pretende crear aquí un directorio nuevo.</translation>
+        <translation>El directorio ya existe. Añada %1 si pretende crear un directorio nuevo.</translation>
     </message>
     <message>
         <source>Path already exists, and is not a directory.</source>
@@ -556,6 +823,10 @@
         <source>Set SSL root certificates for payment request (default: -system-)</source>
         <translation>Establecer los certificados raíz SSL para solicitudes de pago (predeterminado: -system-)</translation>
     </message>
+    <message>
+        <source>Show splash screen on startup (default: %u)</source>
+        <translation>Mostrar pantalla de bienvenida en el inicio (predeterminado: %u)</translation>
+    </message>
     <message>
         <source>Reset all settings changed in the GUI</source>
         <translation>Reiniciar todos los ajustes modificados en el GUI</translation>
@@ -573,7 +844,7 @@
     </message>
     <message>
         <source>As this is the first time the program is launched, you can choose where %1 will store its data.</source>
-        <translation>Al ser la primera vez que se ejecuta el programa, puede elegir donde %1 almacenara sus datos</translation>
+        <translation>Al ser la primera vez que se ejecuta el programa, puede elegir donde %1 almacenará sus datos.</translation>
     </message>
     <message>
         <source>%1 will download and store a copy of the Bitcoin block chain. At least %2GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source>
@@ -604,6 +875,57 @@
         <translation><numerusform>(de %n GB necesitados)</numerusform><numerusform>(de %n GB requeridos)</numerusform></translation>
     </message>
 </context>
+<context>
+    <name>ModalOverlay</name>
+    <message>
+        <source>Form</source>
+        <translation>Formulario</translation>
+    </message>
+    <message>
+        <source>Recent transactions may not yet be visible, and therefore your wallet's balance might be incorrect. This information will be correct once your wallet has finished synchronizing with the bitcoin network, as detailed below.</source>
+        <translation>Las transacciones recientes aún no pueden ser visibles, y por lo tanto el saldo de su monedero podría ser incorrecto. Esta información será correcta cuando su monedero haya terminado de sincronizarse con la red de bitcoin, como se detalla abajo.</translation>
+    </message>
+    <message>
+        <source>Attempting to spend bitcoins that are affected by not-yet-displayed transactions will not be accepted by the network.</source>
+        <translation>La red no aceptará el intentar gastar bitcoins que están afectados por transacciones aún no mostradas.</translation>
+    </message>
+    <message>
+        <source>Number of blocks left</source>
+        <translation>Número de bloques dejados</translation>
+    </message>
+    <message>
+        <source>Unknown...</source>
+        <translation>Desconocido...</translation>
+    </message>
+    <message>
+        <source>Last block time</source>
+        <translation>Hora del último bloque</translation>
+    </message>
+    <message>
+        <source>Progress</source>
+        <translation>Progreso</translation>
+    </message>
+    <message>
+        <source>Progress increase per hour</source>
+        <translation>Avance del progreso por hora</translation>
+    </message>
+    <message>
+        <source>calculating...</source>
+        <translation>calculando...</translation>
+    </message>
+    <message>
+        <source>Estimated time left until synced</source>
+        <translation>Tiempo estimado restante hasta la sincronización</translation>
+    </message>
+    <message>
+        <source>Hide</source>
+        <translation>Ocultar</translation>
+    </message>
+    <message>
+        <source>Unknown. Syncing Headers (%1)...</source>
+        <translation>Desconocido. Sincronizando cabeceras (%1)...</translation>
+    </message>
+</context>
 <context>
     <name>OpenURIDialog</name>
     <message>
@@ -622,6 +944,10 @@
         <source>Select payment request file</source>
         <translation>Seleccionar archivo de sulicitud de pago</translation>
     </message>
+    <message>
+        <source>Select payment request file to open</source>
+        <translation>Seleccionar el archivo de solicitud de pago para abrir</translation>
+    </message>
 </context>
 <context>
     <name>OptionsDialog</name>
@@ -643,7 +969,7 @@
     </message>
     <message>
         <source>Size of &amp;database cache</source>
-        <translation>Tamaño de cache de la &amp;base de datos</translation>
+        <translation>Tamaño del cache de la &amp;base de datos</translation>
     </message>
     <message>
         <source>MB</source>
@@ -707,7 +1033,7 @@
     </message>
     <message>
         <source>Enable coin &amp;control features</source>
-        <translation>Habilitar funcionalidad de &amp;coin control</translation>
+        <translation>Habilitar funcionalidad de &amp;Coin Control</translation>
     </message>
     <message>
         <source>If you disable the spending of unconfirmed change, the change from a transaction cannot be used until that transaction has at least one confirmation. This also affects how your balance is computed.</source>
@@ -811,7 +1137,7 @@
     </message>
     <message>
         <source>&amp;Unit to show amounts in:</source>
-        <translation>Mostrar las cantidades en la &amp;unidad:</translation>
+        <translation>&amp;Unidad en la cual mostrar las cantidades:</translation>
     </message>
     <message>
         <source>Choose the default subdivision unit to show in the interface and when sending coins.</source>
@@ -835,7 +1161,7 @@
     </message>
     <message>
         <source>none</source>
-        <translation>ninguna</translation>
+        <translation>Ninguna</translation>
     </message>
     <message>
         <source>Confirm options reset</source>
@@ -933,6 +1259,97 @@
         <translation>Saldo total en las direcciones watch-only</translation>
     </message>
 </context>
+<context>
+    <name>PaymentServer</name>
+    <message>
+        <source>Payment request error</source>
+        <translation>Fallo en la solicitud de pago</translation>
+    </message>
+    <message>
+        <source>Cannot start bitcoin: click-to-pay handler</source>
+        <translation>No se puede iniciar bitcoin: encargado click-para-pagar</translation>
+    </message>
+    <message>
+        <source>URI handling</source>
+        <translation>Manejo de URI</translation>
+    </message>
+    <message>
+        <source>Payment request fetch URL is invalid: %1</source>
+        <translation>La búsqueda de solicitud de pago URL es válida: %1</translation>
+    </message>
+    <message>
+        <source>Invalid payment address %1</source>
+        <translation>Dirección de pago inválida %1</translation>
+    </message>
+    <message>
+        <source>URI cannot be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source>
+        <translation>URI no puede ser analizado! Esto puede ser causado por una dirección Bitcoin inválida o parametros URI mal formados.</translation>
+    </message>
+    <message>
+        <source>Payment request file handling</source>
+        <translation>Manejo del archivo de solicitud de pago</translation>
+    </message>
+    <message>
+        <source>Payment request file cannot be read! This can be caused by an invalid payment request file.</source>
+        <translation>¡El archivo de solicitud de pago no puede ser leído! Esto puede ser causado por un archivo de solicitud de pago inválido.</translation>
+    </message>
+    <message>
+        <source>Payment request rejected</source>
+        <translation>Solicitud de pago rechazada</translation>
+    </message>
+    <message>
+        <source>Payment request network doesn't match client network.</source>
+        <translation>La red de solicitud de pago no cimbina la red cliente.</translation>
+    </message>
+    <message>
+        <source>Payment request expired.</source>
+        <translation>Solicitud de pago caducada.</translation>
+    </message>
+    <message>
+        <source>Payment request is not initialized.</source>
+        <translation>La solicitud de pago no se ha iniciado.</translation>
+    </message>
+    <message>
+        <source>Unverified payment requests to custom payment scripts are unsupported.</source>
+        <translation>Solicitudes de pago sin verificar a scripts de pago habitual no se soportan.</translation>
+    </message>
+    <message>
+        <source>Invalid payment request.</source>
+        <translation>Solicitud de pago inválida.</translation>
+    </message>
+    <message>
+        <source>Requested payment amount of %1 is too small (considered dust).</source>
+        <translation>Cantidad de pago solicitada de %1 es demasiado pequeña (considerado polvo).</translation>
+    </message>
+    <message>
+        <source>Refund from %1</source>
+        <translation>Reembolsar desde %1</translation>
+    </message>
+    <message>
+        <source>Payment request %1 is too large (%2 bytes, allowed %3 bytes).</source>
+        <translation>Solicitud de pago de %1 es demasiado grande (%2 bytes, permitidos %3 bytes).</translation>
+    </message>
+    <message>
+        <source>Error communicating with %1: %2</source>
+        <translation>Fallo al comunicar con %1: %2</translation>
+    </message>
+    <message>
+        <source>Payment request cannot be parsed!</source>
+        <translation>¡La solicitud de pago no puede ser analizada!</translation>
+    </message>
+    <message>
+        <source>Bad response from server %1</source>
+        <translation>Mala respuesta desde el servidor %1</translation>
+    </message>
+    <message>
+        <source>Network request error</source>
+        <translation>Fallo de solicitud de red</translation>
+    </message>
+    <message>
+        <source>Payment acknowledged</source>
+        <translation>Pago declarado</translation>
+    </message>
+</context>
 <context>
     <name>PeerTableModel</name>
     <message>
@@ -943,11 +1360,7 @@
         <source>Node/Service</source>
         <translation>Nodo/Servicio</translation>
     </message>
-    <message>
-        <source>Ping Time</source>
-        <translation>Ping</translation>
-    </message>
-</context>
+    </context>
 <context>
     <name>QObject</name>
     <message>
@@ -986,14 +1399,40 @@
         <source>%1 ms</source>
         <translation>%1 ms</translation>
     </message>
-</context>
-<context>
-    <name>RPCConsole</name>
     <message>
-        <source>N/A</source>
-        <translation>N/D</translation>
+        <source>%1 and %2</source>
+        <translation>%1 y %2</translation>
     </message>
-    <message>
+    </context>
+<context>
+    <name>QObject::QObject</name>
+    </context>
+<context>
+    <name>QRImageWidget</name>
+    <message>
+        <source>&amp;Save Image...</source>
+        <translation>&amp;Guardar imagen...</translation>
+    </message>
+    <message>
+        <source>&amp;Copy Image</source>
+        <translation>&amp;Copiar imagen</translation>
+    </message>
+    <message>
+        <source>Save QR Code</source>
+        <translation>Guardar código QR</translation>
+    </message>
+    <message>
+        <source>PNG Image (*.png)</source>
+        <translation>Imagen PNG (*.png)</translation>
+    </message>
+</context>
+<context>
+    <name>RPCConsole</name>
+    <message>
+        <source>N/A</source>
+        <translation>N/D</translation>
+    </message>
+    <message>
         <source>Client version</source>
         <translation>Versión del cliente</translation>
     </message>
@@ -1189,14 +1628,6 @@
         <source>Clear console</source>
         <translation>Borrar consola</translation>
     </message>
-    <message>
-        <source>&amp;Disconnect Node</source>
-        <translation>Nodo &amp;Desconectado</translation>
-    </message>
-    <message>
-        <source>Ban Node for</source>
-        <translation>Prohibir Nodo para</translation>
-    </message>
     <message>
         <source>1 &amp;hour</source>
         <translation>1 &amp;hora</translation>
@@ -1213,10 +1644,6 @@
         <source>1 &amp;year</source>
         <translation>1 &amp;año</translation>
     </message>
-    <message>
-        <source>&amp;Unban Node</source>
-        <translation>&amp;Desbanear Nodo</translation>
-    </message>
     <message>
         <source>Welcome to the %1 RPC console.</source>
         <translation>Bienvenido a la consola RPC %1.</translation>
@@ -1348,6 +1775,18 @@
         <source>Remove</source>
         <translation>Eliminar</translation>
     </message>
+    <message>
+        <source>Copy label</source>
+        <translation>Copiar capa</translation>
+    </message>
+    <message>
+        <source>Copy message</source>
+        <translation>Copiar imagen</translation>
+    </message>
+    <message>
+        <source>Copy amount</source>
+        <translation>Copiar cantidad</translation>
+    </message>
 </context>
 <context>
     <name>ReceiveRequestDialog</name>
@@ -1367,361 +1806,1061 @@
         <source>&amp;Save Image...</source>
         <translation>Guardar Imagen...</translation>
     </message>
-</context>
-<context>
-    <name>SendCoinsDialog</name>
     <message>
-        <source>Send Coins</source>
-        <translation>Enviar bitcoins</translation>
+        <source>Request payment to %1</source>
+        <translation>Solicitar pago a %1</translation>
+    </message>
+    <message>
+        <source>Payment information</source>
+        <translation>Información de pago</translation>
+    </message>
+    <message>
+        <source>URI</source>
+        <translation>URI</translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation>Dirección</translation>
+    </message>
+    <message>
+        <source>Amount</source>
+        <translation>Cantidad</translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation>Etiqueta</translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation>Mensaje</translation>
+    </message>
+    <message>
+        <source>Resulting URI too long, try to reduce the text for label / message.</source>
+        <translation>URI resultante demasiado grande, trate de reducir el texto de etiqueta / mensaje.</translation>
+    </message>
+    <message>
+        <source>Error encoding URI into QR Code.</source>
+        <translation>Fallo al codificar URI en código QR.</translation>
+    </message>
+</context>
+<context>
+    <name>RecentRequestsTableModel</name>
+    <message>
+        <source>Date</source>
+        <translation>Fecha</translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation>Etiqueta</translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation>Mensaje</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(sin etiqueta)</translation>
+    </message>
+    <message>
+        <source>(no message)</source>
+        <translation>(no hay mensaje)</translation>
+    </message>
+    <message>
+        <source>(no amount requested)</source>
+        <translation>(no hay solicitud de cantidad)</translation>
+    </message>
+    <message>
+        <source>Requested</source>
+        <translation>Solicitado</translation>
+    </message>
+</context>
+<context>
+    <name>SendCoinsDialog</name>
+    <message>
+        <source>Send Coins</source>
+        <translation>Enviar bitcoins</translation>
+    </message>
+    <message>
+        <source>Coin Control Features</source>
+        <translation>Características de Coin Control</translation>
+    </message>
+    <message>
+        <source>Inputs...</source>
+        <translation>Entradas...</translation>
+    </message>
+    <message>
+        <source>automatically selected</source>
+        <translation>Seleccionado automáticamente</translation>
+    </message>
+    <message>
+        <source>Insufficient funds!</source>
+        <translation>Fondos insuficientes!</translation>
+    </message>
+    <message>
+        <source>Quantity:</source>
+        <translation>Cantidad:</translation>
+    </message>
+    <message>
+        <source>Bytes:</source>
+        <translation>Bytes:</translation>
+    </message>
+    <message>
+        <source>Amount:</source>
+        <translation>Cuantía:</translation>
+    </message>
+    <message>
+        <source>Fee:</source>
+        <translation>Tasa:</translation>
+    </message>
+    <message>
+        <source>After Fee:</source>
+        <translation>Después de tasas:</translation>
+    </message>
+    <message>
+        <source>Change:</source>
+        <translation>Cambio:</translation>
+    </message>
+    <message>
+        <source>If this is activated, but the change address is empty or invalid, change will be sent to a newly generated address.</source>
+        <translation>Si se marca esta opción pero la dirección de cambio está vacía o es inválida, el cambio se enviará a una nueva dirección recién generada.</translation>
+    </message>
+    <message>
+        <source>Custom change address</source>
+        <translation>Dirección propia</translation>
+    </message>
+    <message>
+        <source>Transaction Fee:</source>
+        <translation>Comisión de Transacción:</translation>
+    </message>
+    <message>
+        <source>Choose...</source>
+        <translation>Elija...</translation>
+    </message>
+    <message>
+        <source>collapse fee-settings</source>
+        <translation>Colapsar ajustes de comisión.</translation>
+    </message>
+    <message>
+        <source>per kilobyte</source>
+        <translation>por kilobyte</translation>
+    </message>
+    <message>
+        <source>If the custom fee is set to 1000 satoshis and the transaction is only 250 bytes, then "per kilobyte" only pays 250 satoshis in fee, while "total at least" pays 1000 satoshis. For transactions bigger than a kilobyte both pay by kilobyte.</source>
+        <translation>Si la comisión se establece en 1000 satoshis y la transacción está a sólo 250 bytes, entonces "por kilobyte" sólo paga 250 satoshis de cuota, mientras que "el mínimo total" pagaría 1.000 satoshis. Para las transacciones más grandes que un kilobyte ambos pagan por kilobyte</translation>
+    </message>
+    <message>
+        <source>Hide</source>
+        <translation>Ocultar</translation>
+    </message>
+    <message>
+        <source>total at least</source>
+        <translation>total por lo menos</translation>
+    </message>
+    <message>
+        <source>Paying only the minimum fee is just fine as long as there is less transaction volume than space in the blocks. But be aware that this can end up in a never confirming transaction once there is more demand for bitcoin transactions than the network can process.</source>
+        <translation>Pagar solamente la comisión mínima es correcto, siempre y cuando haya menos volumen de transacciones que el espacio en los bloques. Pero tenga en cuenta que esto puede terminar en una transacción nunca confirmada, una vez que haya más demanda para transacciones Bitcoin que la red pueda procesar.</translation>
+    </message>
+    <message>
+        <source>(read the tooltip)</source>
+        <translation>(leer la sugerencia)</translation>
+    </message>
+    <message>
+        <source>Recommended:</source>
+        <translation>Recomendada:</translation>
+    </message>
+    <message>
+        <source>Custom:</source>
+        <translation>Personalizada:</translation>
+    </message>
+    <message>
+        <source>(Smart fee not initialized yet. This usually takes a few blocks...)</source>
+        <translation>(Aún no se ha inicializado la Comisión Inteligente. Esto generalmente tarda pocos bloques...)</translation>
+    </message>
+    <message>
+        <source>normal</source>
+        <translation>normal</translation>
+    </message>
+    <message>
+        <source>fast</source>
+        <translation>rápido</translation>
+    </message>
+    <message>
+        <source>Send to multiple recipients at once</source>
+        <translation>Enviar a múltiples destinatarios de una vez</translation>
+    </message>
+    <message>
+        <source>Add &amp;Recipient</source>
+        <translation>Añadir &amp;destinatario</translation>
+    </message>
+    <message>
+        <source>Clear all fields of the form.</source>
+        <translation>Vaciar todos los campos del formulario</translation>
+    </message>
+    <message>
+        <source>Dust:</source>
+        <translation>Polvo:</translation>
+    </message>
+    <message>
+        <source>Clear &amp;All</source>
+        <translation>Vaciar &amp;todo</translation>
+    </message>
+    <message>
+        <source>Balance:</source>
+        <translation>Saldo:</translation>
+    </message>
+    <message>
+        <source>Confirm the send action</source>
+        <translation>Confirmar el envío</translation>
+    </message>
+    <message>
+        <source>S&amp;end</source>
+        <translation>&amp;Enviar</translation>
+    </message>
+    <message>
+        <source>Copy quantity</source>
+        <translation>Copiar cantidad</translation>
+    </message>
+    <message>
+        <source>Copy amount</source>
+        <translation>Copiar cantidad</translation>
+    </message>
+    <message>
+        <source>Copy fee</source>
+        <translation>Copiar comisión</translation>
+    </message>
+    <message>
+        <source>Copy after fee</source>
+        <translation>Copiar después de couta</translation>
+    </message>
+    <message>
+        <source>Copy bytes</source>
+        <translation>Copiar bytes</translation>
+    </message>
+    <message>
+        <source>Copy dust</source>
+        <translation>Copiar polvo</translation>
+    </message>
+    <message>
+        <source>Copy change</source>
+        <translation>Copiar cambio</translation>
+    </message>
+    <message>
+        <source>%1 to %2</source>
+        <translation>%1 a %2</translation>
+    </message>
+    <message>
+        <source>Are you sure you want to send?</source>
+        <translation>¿Seguro que quiere enviar?</translation>
+    </message>
+    <message>
+        <source>added as transaction fee</source>
+        <translation>añadido como comisión de transacción</translation>
+    </message>
+    <message>
+        <source>Total Amount %1</source>
+        <translation>Cantidad total %1</translation>
+    </message>
+    <message>
+        <source>or</source>
+        <translation>o</translation>
+    </message>
+    <message>
+        <source>Confirm send coins</source>
+        <translation>Confirmar enviar monedas</translation>
+    </message>
+    <message>
+        <source>The recipient address is not valid. Please recheck.</source>
+        <translation>La dirección de destinatario no es válida. Por favor revísela.</translation>
+    </message>
+    <message>
+        <source>The amount to pay must be larger than 0.</source>
+        <translation>La cantidad a pagar debe de ser mayor que 0.</translation>
+    </message>
+    <message>
+        <source>The amount exceeds your balance.</source>
+        <translation>La cantidad excede su saldo.</translation>
+    </message>
+    <message>
+        <source>The total exceeds your balance when the %1 transaction fee is included.</source>
+        <translation>El total excede su saldo cuando la comisión de transacción de %1 es incluida.</translation>
+    </message>
+    <message>
+        <source>Duplicate address found: addresses should only be used once each.</source>
+        <translation>Dirección duplicada encontrada: la dirección sólo debería ser utilizada una vez por cada uso.</translation>
+    </message>
+    <message>
+        <source>Transaction creation failed!</source>
+        <translation>¡Falló la creación de transacción!</translation>
+    </message>
+    <message>
+        <source>A fee higher than %1 is considered an absurdly high fee.</source>
+        <translation>Una comisión mayor que %1 se considera una cuota irracionalmente alta.</translation>
+    </message>
+    <message>
+        <source>Payment request expired.</source>
+        <translation>Solicitud de pago caducada.</translation>
+    </message>
+    <message>
+        <source>Pay only the required fee of %1</source>
+        <translation>Pagar únicamente la comisión solicitada de %1</translation>
+    </message>
+    <message>
+        <source>Warning: Invalid Bitcoin address</source>
+        <translation>Alerta: dirección Bitcoin inválida</translation>
+    </message>
+    <message>
+        <source>Warning: Unknown change address</source>
+        <translation>Alerta: dirección cambiada desconocida</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(sin etiqueta)</translation>
+    </message>
+</context>
+<context>
+    <name>SendCoinsEntry</name>
+    <message>
+        <source>A&amp;mount:</source>
+        <translation>Ca&amp;ntidad:</translation>
+    </message>
+    <message>
+        <source>Pay &amp;To:</source>
+        <translation>&amp;Pagar a:</translation>
+    </message>
+    <message>
+        <source>&amp;Label:</source>
+        <translation>&amp;Etiqueta:</translation>
+    </message>
+    <message>
+        <source>Choose previously used address</source>
+        <translation>Escoger direcciones previamente usadas</translation>
+    </message>
+    <message>
+        <source>This is a normal payment.</source>
+        <translation>Esto es un pago ordinario.</translation>
+    </message>
+    <message>
+        <source>The Bitcoin address to send the payment to</source>
+        <translation>Dirección Bitcoin a la que enviar el pago</translation>
+    </message>
+    <message>
+        <source>Alt+A</source>
+        <translation>Alt+A</translation>
+    </message>
+    <message>
+        <source>Paste address from clipboard</source>
+        <translation>Pegar dirección desde portapapeles</translation>
+    </message>
+    <message>
+        <source>Alt+P</source>
+        <translation>Alt+P</translation>
+    </message>
+    <message>
+        <source>Remove this entry</source>
+        <translation>Eliminar esta transacción</translation>
+    </message>
+    <message>
+        <source>The fee will be deducted from the amount being sent. The recipient will receive less bitcoins than you enter in the amount field. If multiple recipients are selected, the fee is split equally.</source>
+        <translation>La comisión será deducida de la cantidad que sea mandada. El destinatario recibirá menos bitcoins de la cantidad introducida en el campo Cantidad. Si hay varios destinatarios, la comisión será distribuida a partes iguales.</translation>
+    </message>
+    <message>
+        <source>S&amp;ubtract fee from amount</source>
+        <translation>Restar comisiones de la cantidad.</translation>
+    </message>
+    <message>
+        <source>Message:</source>
+        <translation>Mensaje:</translation>
+    </message>
+    <message>
+        <source>This is an unauthenticated payment request.</source>
+        <translation>Esta es una petición de pago no autentificada.</translation>
+    </message>
+    <message>
+        <source>This is an authenticated payment request.</source>
+        <translation>Esta es una petición de pago autentificada.</translation>
+    </message>
+    <message>
+        <source>Enter a label for this address to add it to the list of used addresses</source>
+        <translation>Introduce una etiqueta para esta dirección para añadirla a la lista de direcciones utilizadas</translation>
+    </message>
+    <message>
+        <source>A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
+        <translation>Un mensaje que se adjuntó a la bitcoin: URL que será almacenada con la transacción para su referencia. Nota: Este mensaje no se envía a través de la red Bitcoin.</translation>
+    </message>
+    <message>
+        <source>Pay To:</source>
+        <translation>Paga a:</translation>
+    </message>
+    <message>
+        <source>Memo:</source>
+        <translation>Memo:</translation>
+    </message>
+    <message>
+        <source>Enter a label for this address to add it to your address book</source>
+        <translation>Introduzca una etiqueta para esta dirección para añadirla a su lista de direcciones.</translation>
+    </message>
+</context>
+<context>
+    <name>SendConfirmationDialog</name>
+    <message>
+        <source>Yes</source>
+        <translation>Sí</translation>
+    </message>
+</context>
+<context>
+    <name>ShutdownWindow</name>
+    <message>
+        <source>%1 is shutting down...</source>
+        <translation>%1 se esta cerrando...</translation>
+    </message>
+    <message>
+        <source>Do not shut down the computer until this window disappears.</source>
+        <translation>No apague el equipo hasta que desaparezca esta ventana.</translation>
+    </message>
+</context>
+<context>
+    <name>SignVerifyMessageDialog</name>
+    <message>
+        <source>Signatures - Sign / Verify a Message</source>
+        <translation>Firmas - Firmar / verificar un mensaje</translation>
+    </message>
+    <message>
+        <source>&amp;Sign Message</source>
+        <translation>&amp;Firmar mensaje</translation>
+    </message>
+    <message>
+        <source>You can sign messages/agreements with your addresses to prove you can receive bitcoins sent to them. Be careful not to sign anything vague or random, as phishing attacks may try to trick you into signing your identity over to them. Only sign fully-detailed statements you agree to.</source>
+        <translation>Puede firmar los mensajes con sus direcciones para demostrar que las posee. Tenga cuidado de no firmar cualquier cosa de manera vaga o aleatoria, pues los ataques de phishing pueden tratar de engañarle firmando su identidad a través de ellos. Sólo firme declaraciones totalmente detalladas con las que usted esté de acuerdo.</translation>
+    </message>
+    <message>
+        <source>The Bitcoin address to sign the message with</source>
+        <translation>Dirección Bitcoin con la que firmar el mensaje</translation>
+    </message>
+    <message>
+        <source>Choose previously used address</source>
+        <translation>Escoger dirección previamente usada</translation>
+    </message>
+    <message>
+        <source>Alt+A</source>
+        <translation>Alt+A</translation>
+    </message>
+    <message>
+        <source>Paste address from clipboard</source>
+        <translation>Pegar dirección desde portapapeles</translation>
+    </message>
+    <message>
+        <source>Alt+P</source>
+        <translation>Alt+P</translation>
+    </message>
+    <message>
+        <source>Enter the message you want to sign here</source>
+        <translation>Introduzca el mensaje que desea firmar aquí</translation>
+    </message>
+    <message>
+        <source>Signature</source>
+        <translation>Firma</translation>
+    </message>
+    <message>
+        <source>Copy the current signature to the system clipboard</source>
+        <translation>Copiar la firma actual al portapapeles del sistema</translation>
+    </message>
+    <message>
+        <source>Sign the message to prove you own this Bitcoin address</source>
+        <translation>Firmar el mensaje para demostrar que se posee esta dirección Bitcoin</translation>
+    </message>
+    <message>
+        <source>Sign &amp;Message</source>
+        <translation>Firmar &amp;mensaje</translation>
+    </message>
+    <message>
+        <source>Reset all sign message fields</source>
+        <translation>Vaciar todos los campos de la firma de mensaje</translation>
+    </message>
+    <message>
+        <source>Clear &amp;All</source>
+        <translation>Vaciar &amp;todo</translation>
+    </message>
+    <message>
+        <source>&amp;Verify Message</source>
+        <translation>&amp;Verificar mensaje</translation>
+    </message>
+    <message>
+        <source>Enter the receiver's address, message (ensure you copy line breaks, spaces, tabs, etc. exactly) and signature below to verify the message. Be careful not to read more into the signature than what is in the signed message itself, to avoid being tricked by a man-in-the-middle attack. Note that this only proves the signing party receives with the address, it cannot prove sendership of any transaction!</source>
+        <translation>Introduzca la dirección para la firma, el mensaje (asegurándose de copiar tal cual los saltos de línea, espacios, tabulaciones, etc.) y la firma a continuación para verificar el mensaje. Tenga cuidado de no asumir más información de lo que dice el propio mensaje firmado para evitar fraudes basados en ataques de tipo man-in-the-middle. </translation>
+    </message>
+    <message>
+        <source>The Bitcoin address the message was signed with</source>
+        <translation>La dirección Bitcoin con la que se firmó el mensaje</translation>
+    </message>
+    <message>
+        <source>Verify the message to ensure it was signed with the specified Bitcoin address</source>
+        <translation>Verificar el mensaje para comprobar que fue firmado con la dirección Bitcoin indicada</translation>
+    </message>
+    <message>
+        <source>Verify &amp;Message</source>
+        <translation>Verificar &amp;mensaje</translation>
+    </message>
+    <message>
+        <source>Reset all verify message fields</source>
+        <translation>Vaciar todos los campos de la verificación de mensaje</translation>
+    </message>
+    <message>
+        <source>Click "Sign Message" to generate signature</source>
+        <translation>Click en "Fírmar mensaje" para generar una firma</translation>
+    </message>
+    <message>
+        <source>The entered address is invalid.</source>
+        <translation>La dirección introducida no es válida.</translation>
+    </message>
+    <message>
+        <source>Please check the address and try again.</source>
+        <translation>Por favor revise la dirección e inténtelo de nuevo.</translation>
+    </message>
+    <message>
+        <source>The entered address does not refer to a key.</source>
+        <translation>La dirección introducida no remite a una clave.</translation>
+    </message>
+    <message>
+        <source>Wallet unlock was cancelled.</source>
+        <translation>El desbloqueo del monedero fue cancelado.</translation>
+    </message>
+    <message>
+        <source>Private key for the entered address is not available.</source>
+        <translation>La clave privada de la dirección introducida no está disponible.</translation>
+    </message>
+    <message>
+        <source>Message signing failed.</source>
+        <translation>Falló la firma del mensaje.</translation>
+    </message>
+    <message>
+        <source>Message signed.</source>
+        <translation>Mensaje firmado.</translation>
+    </message>
+    <message>
+        <source>The signature could not be decoded.</source>
+        <translation>La firma no pudo descodificarse.</translation>
+    </message>
+    <message>
+        <source>Please check the signature and try again.</source>
+        <translation>Por favor compruebe la firma y pruebe de nuevo.</translation>
+    </message>
+    <message>
+        <source>The signature did not match the message digest.</source>
+        <translation>La firma no se combinó con el mensaje.</translation>
+    </message>
+    <message>
+        <source>Message verification failed.</source>
+        <translation>Falló la verificación del mensaje.</translation>
+    </message>
+    <message>
+        <source>Message verified.</source>
+        <translation>Mensaje verificado.</translation>
+    </message>
+</context>
+<context>
+    <name>SplashScreen</name>
+    <message>
+        <source>[testnet]</source>
+        <translation>[testnet]</translation>
+    </message>
+</context>
+<context>
+    <name>TrafficGraphWidget</name>
+    <message>
+        <source>KB/s</source>
+        <translation>KB/s</translation>
+    </message>
+</context>
+<context>
+    <name>TransactionDesc</name>
+    <message>
+        <source>Open until %1</source>
+        <translation>Abierto hasta %1</translation>
+    </message>
+    <message>
+        <source>conflicted with a transaction with %1 confirmations</source>
+        <translation>Hay un conflicto con la traducción de las confirmaciones %1</translation>
+    </message>
+    <message>
+        <source>%1/offline</source>
+        <translation>%1/sin conexión</translation>
+    </message>
+    <message>
+        <source>0/unconfirmed, %1</source>
+        <translation>0/no confirmado, %1</translation>
+    </message>
+    <message>
+        <source>in memory pool</source>
+        <translation>en el equipo de memoria</translation>
+    </message>
+    <message>
+        <source>not in memory pool</source>
+        <translation>no en el equipo de memoria</translation>
+    </message>
+    <message>
+        <source>abandoned</source>
+        <translation>abandonado</translation>
+    </message>
+    <message>
+        <source>%1/unconfirmed</source>
+        <translation>%1/no confirmado</translation>
+    </message>
+    <message>
+        <source>%1 confirmations</source>
+        <translation>confirmaciones %1</translation>
+    </message>
+    <message>
+        <source>Status</source>
+        <translation>Estado</translation>
+    </message>
+    <message>
+        <source>, has not been successfully broadcast yet</source>
+        <translation>, no ha sido emitido con éxito aún</translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation>Fecha</translation>
+    </message>
+    <message>
+        <source>Source</source>
+        <translation>Fuente</translation>
+    </message>
+    <message>
+        <source>Generated</source>
+        <translation>Generado</translation>
+    </message>
+    <message>
+        <source>From</source>
+        <translation>Desde</translation>
+    </message>
+    <message>
+        <source>unknown</source>
+        <translation>desconocido</translation>
+    </message>
+    <message>
+        <source>To</source>
+        <translation>Para</translation>
+    </message>
+    <message>
+        <source>own address</source>
+        <translation>dirección propia</translation>
+    </message>
+    <message>
+        <source>watch-only</source>
+        <translation>de observación</translation>
+    </message>
+    <message>
+        <source>label</source>
+        <translation>etiqueta</translation>
+    </message>
+    <message>
+        <source>Credit</source>
+        <translation>Credito</translation>
+    </message>
+    <message>
+        <source>not accepted</source>
+        <translation>no aceptada</translation>
+    </message>
+    <message>
+        <source>Debit</source>
+        <translation>Enviado</translation>
+    </message>
+    <message>
+        <source>Total debit</source>
+        <translation>Total enviado</translation>
+    </message>
+    <message>
+        <source>Total credit</source>
+        <translation>Total recibido</translation>
+    </message>
+    <message>
+        <source>Transaction fee</source>
+        <translation>Comisión de transacción</translation>
+    </message>
+    <message>
+        <source>Net amount</source>
+        <translation>Cantidad neta</translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation>Mensaje</translation>
     </message>
     <message>
-        <source>Coin Control Features</source>
-        <translation>Características de Coin Control</translation>
+        <source>Comment</source>
+        <translation>Comentario</translation>
     </message>
     <message>
-        <source>Inputs...</source>
-        <translation>Entradas...</translation>
+        <source>Transaction ID</source>
+        <translation>Identificador de transacción (ID)</translation>
     </message>
     <message>
-        <source>automatically selected</source>
-        <translation>Seleccionado automáticamente</translation>
+        <source>Output index</source>
+        <translation>Indice de salida</translation>
     </message>
     <message>
-        <source>Insufficient funds!</source>
-        <translation>Fondos insuficientes!</translation>
+        <source>Merchant</source>
+        <translation>Vendedor</translation>
     </message>
     <message>
-        <source>Quantity:</source>
-        <translation>Cantidad:</translation>
+        <source>Generated coins must mature %1 blocks before they can be spent. When you generated this block, it was broadcast to the network to be added to the block chain. If it fails to get into the chain, its state will change to "not accepted" and it won't be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source>
+        <translation>Los bitcoins generados deben madurar %1 bloques antes de que puedan gastarse. Cuando generó este bloque, se transmitió a la red para que se añadiera a la cadena de bloques. Si no consigue entrar en la cadena, su estado cambiará a "no aceptado" y ya no se podrá gastar. Esto puede ocurrir ocasionalmente si otro nodo genera un bloque a pocos segundos del suyo.</translation>
     </message>
     <message>
-        <source>Bytes:</source>
-        <translation>Bytes:</translation>
+        <source>Debug information</source>
+        <translation>Información de depuración</translation>
     </message>
     <message>
-        <source>Amount:</source>
-        <translation>Cuantía:</translation>
+        <source>Transaction</source>
+        <translation>Transacción</translation>
     </message>
     <message>
-        <source>Priority:</source>
-        <translation>Prioridad:</translation>
+        <source>Inputs</source>
+        <translation>entradas</translation>
     </message>
     <message>
-        <source>Fee:</source>
-        <translation>Tasa:</translation>
+        <source>Amount</source>
+        <translation>Cantidad</translation>
     </message>
     <message>
-        <source>After Fee:</source>
-        <translation>Después de tasas:</translation>
+        <source>true</source>
+        <translation>verdadero</translation>
     </message>
     <message>
-        <source>Change:</source>
-        <translation>Cambio:</translation>
+        <source>false</source>
+        <translation>falso</translation>
     </message>
+</context>
+<context>
+    <name>TransactionDescDialog</name>
     <message>
-        <source>If this is activated, but the change address is empty or invalid, change will be sent to a newly generated address.</source>
-        <translation>Si se marca esta opción pero la dirección de cambio está vacía o es inválida, el cambio se enviará a una nueva dirección recién generada.</translation>
+        <source>This pane shows a detailed description of the transaction</source>
+        <translation>Esta ventana muestra información detallada sobre la transacción</translation>
     </message>
     <message>
-        <source>Custom change address</source>
-        <translation>Dirección propia</translation>
+        <source>Details for %1</source>
+        <translation>Detalles para %1</translation>
     </message>
+</context>
+<context>
+    <name>TransactionTableModel</name>
     <message>
-        <source>Transaction Fee:</source>
-        <translation>Comisión de Transacción:</translation>
+        <source>Date</source>
+        <translation>Fecha</translation>
     </message>
     <message>
-        <source>Choose...</source>
-        <translation>Elija...</translation>
+        <source>Type</source>
+        <translation>Tipo</translation>
     </message>
     <message>
-        <source>collapse fee-settings</source>
-        <translation>Colapsar ajustes de cuota</translation>
+        <source>Label</source>
+        <translation>Etiqueta</translation>
     </message>
     <message>
-        <source>per kilobyte</source>
-        <translation>por kilobyte</translation>
+        <source>Open until %1</source>
+        <translation>Abierto hasta %1</translation>
     </message>
     <message>
-        <source>If the custom fee is set to 1000 satoshis and the transaction is only 250 bytes, then "per kilobyte" only pays 250 satoshis in fee, while "total at least" pays 1000 satoshis. For transactions bigger than a kilobyte both pay by kilobyte.</source>
-        <translation>Si la tarifa de aduana se establece en 1000 satoshis y la transacción está a sólo 250 bytes, entonces "por kilobyte" sólo paga 250 satoshis de cuota, mientras que "el mínimo total" pagaría 1.000 satoshis. Para las transacciones más grandes que un kilobyte ambos pagan por kilobyte</translation>
+        <source>Offline</source>
+        <translation>Sin conexion</translation>
     </message>
     <message>
-        <source>Hide</source>
-        <translation>Ocultar</translation>
+        <source>Unconfirmed</source>
+        <translation>Sin confirmar</translation>
     </message>
     <message>
-        <source>total at least</source>
-        <translation>total por lo menos</translation>
+        <source>Abandoned</source>
+        <translation>Abandonado</translation>
     </message>
     <message>
-        <source>Paying only the minimum fee is just fine as long as there is less transaction volume than space in the blocks. But be aware that this can end up in a never confirming transaction once there is more demand for bitcoin transactions than the network can process.</source>
-        <translation>Pagando solamente la cuota mínima es correcto, siempre y cuando haya menos volumen de transacciones que el espacio en los bloques. Pero tenga en cuenta que esto puede terminar en una transacción nunca confirmada, una vez que haya más demanda para transacciones Bitcoin que la red pueda procesar.</translation>
+        <source>Confirming (%1 of %2 recommended confirmations)</source>
+        <translation>Confirmando (%1 de %2 confirmaciones recomendadas)</translation>
     </message>
     <message>
-        <source>(read the tooltip)</source>
-        <translation>(leer la sugerencia)</translation>
+        <source>Confirmed (%1 confirmations)</source>
+        <translation>Confirmado (%1 confirmaciones)</translation>
     </message>
     <message>
-        <source>Recommended:</source>
-        <translation>Recomendado:</translation>
+        <source>Conflicted</source>
+        <translation>En conflicto</translation>
     </message>
     <message>
-        <source>Custom:</source>
-        <translation>Personalizado:</translation>
+        <source>Immature (%1 confirmations, will be available after %2)</source>
+        <translation>No disponible (%1 confirmaciones. Estarán disponibles al cabo de %2)</translation>
     </message>
     <message>
-        <source>(Smart fee not initialized yet. This usually takes a few blocks...)</source>
-        <translation>(Tarifa inteligente no inicializado aún. Esto generalmente lleva a pocos bloques...)</translation>
+        <source>This block was not received by any other nodes and will probably not be accepted!</source>
+        <translation>Este bloque no ha sido recibido por otros nodos y probablemente no sea aceptado!</translation>
     </message>
     <message>
-        <source>Confirmation time:</source>
-        <translation>Tiempo de confirmación:</translation>
+        <source>Generated but not accepted</source>
+        <translation>Generado pero no aceptado</translation>
     </message>
     <message>
-        <source>normal</source>
-        <translation>normal</translation>
+        <source>Received with</source>
+        <translation>Recibido con</translation>
     </message>
     <message>
-        <source>fast</source>
-        <translation>rápido</translation>
+        <source>Received from</source>
+        <translation>Recibidos de</translation>
     </message>
     <message>
-        <source>Send to multiple recipients at once</source>
-        <translation>Enviar a múltiples destinatarios de una vez</translation>
+        <source>Sent to</source>
+        <translation>Enviado a</translation>
     </message>
     <message>
-        <source>Add &amp;Recipient</source>
-        <translation>Añadir &amp;destinatario</translation>
+        <source>Payment to yourself</source>
+        <translation>Pago proprio</translation>
     </message>
     <message>
-        <source>Clear all fields of the form.</source>
-        <translation>Vaciar todos los campos del formulario</translation>
+        <source>Mined</source>
+        <translation>Minado</translation>
     </message>
     <message>
-        <source>Dust:</source>
-        <translation>Polvo:</translation>
+        <source>watch-only</source>
+        <translation>de observación</translation>
     </message>
     <message>
-        <source>Clear &amp;All</source>
-        <translation>Vaciar &amp;todo</translation>
+        <source>(n/a)</source>
+        <translation>(nd)</translation>
     </message>
     <message>
-        <source>Balance:</source>
-        <translation>Saldo:</translation>
+        <source>(no label)</source>
+        <translation>(sin etiqueta)</translation>
     </message>
     <message>
-        <source>Confirm the send action</source>
-        <translation>Confirmar el envío</translation>
+        <source>Transaction status. Hover over this field to show number of confirmations.</source>
+        <translation>Estado de transacción. Pasa el ratón sobre este campo para ver el número de confirmaciones.</translation>
     </message>
     <message>
-        <source>S&amp;end</source>
-        <translation>&amp;Enviar</translation>
+        <source>Date and time that the transaction was received.</source>
+        <translation>Fecha y hora en que se recibió la transacción.</translation>
     </message>
-</context>
-<context>
-    <name>SendCoinsEntry</name>
     <message>
-        <source>A&amp;mount:</source>
-        <translation>Ca&amp;ntidad:</translation>
+        <source>Type of transaction.</source>
+        <translation>Tipo de transacción.</translation>
     </message>
     <message>
-        <source>Pay &amp;To:</source>
-        <translation>&amp;Pagar a:</translation>
+        <source>Whether or not a watch-only address is involved in this transaction.</source>
+        <translation>Si una dirección watch-only está involucrada en esta transacción o no.</translation>
     </message>
     <message>
-        <source>&amp;Label:</source>
-        <translation>&amp;Etiqueta:</translation>
+        <source>User-defined intent/purpose of the transaction.</source>
+        <translation>Descripción de la transacción definido por el usuario.</translation>
     </message>
     <message>
-        <source>Choose previously used address</source>
-        <translation>Escoger direcciones previamente usadas</translation>
+        <source>Amount removed from or added to balance.</source>
+        <translation>Cantidad retirada o añadida al saldo.</translation>
     </message>
+</context>
+<context>
+    <name>TransactionView</name>
     <message>
-        <source>This is a normal payment.</source>
-        <translation>Esto es un pago ordinario.</translation>
+        <source>All</source>
+        <translation>Todo</translation>
     </message>
     <message>
-        <source>The Bitcoin address to send the payment to</source>
-        <translation>Dirección Bitcoin a la que enviar el pago</translation>
+        <source>Today</source>
+        <translation>Hoy</translation>
     </message>
     <message>
-        <source>Alt+A</source>
-        <translation>Alt+A</translation>
+        <source>This week</source>
+        <translation>Esta semana</translation>
     </message>
     <message>
-        <source>Paste address from clipboard</source>
-        <translation>Pegar dirección desde portapapeles</translation>
+        <source>This month</source>
+        <translation>Este mes</translation>
     </message>
     <message>
-        <source>Alt+P</source>
-        <translation>Alt+P</translation>
+        <source>Last month</source>
+        <translation>Mes pasado</translation>
     </message>
     <message>
-        <source>Remove this entry</source>
-        <translation>Eliminar esta transacción</translation>
+        <source>This year</source>
+        <translation>Este año</translation>
     </message>
     <message>
-        <source>The fee will be deducted from the amount being sent. The recipient will receive less bitcoins than you enter in the amount field. If multiple recipients are selected, the fee is split equally.</source>
-        <translation>La cuota será deducida de la cantidad que sea mandada. El destinatario recibirá menos bitcoins de los que entres en el  </translation>
+        <source>Range...</source>
+        <translation>Rango...</translation>
     </message>
     <message>
-        <source>S&amp;ubtract fee from amount</source>
-        <translation>Restar comisiones a la cantidad</translation>
+        <source>Received with</source>
+        <translation>Recibido con</translation>
     </message>
     <message>
-        <source>Message:</source>
-        <translation>Mensaje:</translation>
+        <source>Sent to</source>
+        <translation>Enviado a</translation>
     </message>
     <message>
-        <source>This is an unauthenticated payment request.</source>
-        <translation>Esta es una petición de pago no autentificada.</translation>
+        <source>To yourself</source>
+        <translation>A usted mismo</translation>
     </message>
     <message>
-        <source>This is an authenticated payment request.</source>
-        <translation>Esta es una petición de pago autentificada.</translation>
+        <source>Mined</source>
+        <translation>Minado</translation>
     </message>
     <message>
-        <source>Enter a label for this address to add it to the list of used addresses</source>
-        <translation>Introduce una etiqueta para esta dirección para añadirla a la lista de direcciones utilizadas</translation>
+        <source>Other</source>
+        <translation>Otra</translation>
     </message>
     <message>
-        <source>A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
-        <translation>Un mensaje que se adjuntó a la bitcoin: URL que será almacenada con la transacción para su referencia. Nota: Este mensaje no se envía a través de la red Bitcoin.</translation>
+        <source>Enter address or label to search</source>
+        <translation>Introduzca una dirección o etiqueta que buscar</translation>
     </message>
     <message>
-        <source>Pay To:</source>
-        <translation>Paga a:</translation>
+        <source>Min amount</source>
+        <translation>Cantidad mínima</translation>
     </message>
     <message>
-        <source>Memo:</source>
-        <translation>Memo:</translation>
+        <source>Abandon transaction</source>
+        <translation>Transacción abandonada</translation>
     </message>
-</context>
-<context>
-    <name>ShutdownWindow</name>
     <message>
-        <source>%1 is shutting down...</source>
-        <translation>%1 se esta cerrando...</translation>
+        <source>Copy address</source>
+        <translation>Copiar ubicación</translation>
     </message>
     <message>
-        <source>Do not shut down the computer until this window disappears.</source>
-        <translation>No apague el equipo hasta que desaparezca esta ventana.</translation>
+        <source>Copy label</source>
+        <translation>Copiar capa</translation>
     </message>
-</context>
-<context>
-    <name>SignVerifyMessageDialog</name>
     <message>
-        <source>Signatures - Sign / Verify a Message</source>
-        <translation>Firmas - Firmar / verificar un mensaje</translation>
+        <source>Copy amount</source>
+        <translation>Copiar cantidad</translation>
     </message>
     <message>
-        <source>&amp;Sign Message</source>
-        <translation>&amp;Firmar mensaje</translation>
+        <source>Copy transaction ID</source>
+        <translation>Copiar ID de transacción</translation>
     </message>
     <message>
-        <source>You can sign messages/agreements with your addresses to prove you can receive bitcoins sent to them. Be careful not to sign anything vague or random, as phishing attacks may try to trick you into signing your identity over to them. Only sign fully-detailed statements you agree to.</source>
-        <translation>Puede firmar los mensajes con sus direcciones para demostrar que las posee. Tenga cuidado de no firmar cualquier cosa de manera vaga o aleatoria, pues los ataques de phishing pueden tratar de engañarle firmando su identidad a través de ellos. Sólo firme declaraciones totalmente detalladas con las que usted esté de acuerdo.</translation>
+        <source>Copy raw transaction</source>
+        <translation>Copiar transacción raw</translation>
     </message>
     <message>
-        <source>The Bitcoin address to sign the message with</source>
-        <translation>Dirección Bitcoin con la que firmar el mensaje</translation>
+        <source>Copy full transaction details</source>
+        <translation>Copiar todos los detalles de la transacción</translation>
     </message>
     <message>
-        <source>Choose previously used address</source>
-        <translation>Escoger dirección previamente usada</translation>
+        <source>Edit label</source>
+        <translation>Editar etiqueta</translation>
     </message>
     <message>
-        <source>Alt+A</source>
-        <translation>Alt+A</translation>
+        <source>Show transaction details</source>
+        <translation>Mostrar detalles de la transacción</translation>
     </message>
     <message>
-        <source>Paste address from clipboard</source>
-        <translation>Pegar dirección desde portapapeles</translation>
+        <source>Export Transaction History</source>
+        <translation>Exportar historial de transacciones</translation>
     </message>
     <message>
-        <source>Alt+P</source>
-        <translation>Alt+P</translation>
+        <source>Comma separated file (*.csv)</source>
+        <translation>Archivo separado de coma (*.csv)</translation>
     </message>
     <message>
-        <source>Enter the message you want to sign here</source>
-        <translation>Introduzca el mensaje que desea firmar aquí</translation>
+        <source>Confirmed</source>
+        <translation>Confirmado</translation>
     </message>
     <message>
-        <source>Signature</source>
-        <translation>Firma</translation>
+        <source>Watch-only</source>
+        <translation>De observación</translation>
     </message>
     <message>
-        <source>Copy the current signature to the system clipboard</source>
-        <translation>Copiar la firma actual al portapapeles del sistema</translation>
+        <source>Date</source>
+        <translation>Fecha</translation>
     </message>
     <message>
-        <source>Sign the message to prove you own this Bitcoin address</source>
-        <translation>Firmar el mensaje para demostrar que se posee esta dirección Bitcoin</translation>
+        <source>Type</source>
+        <translation>Tipo</translation>
     </message>
     <message>
-        <source>Sign &amp;Message</source>
-        <translation>Firmar &amp;mensaje</translation>
+        <source>Label</source>
+        <translation>Etiqueta</translation>
     </message>
     <message>
-        <source>Reset all sign message fields</source>
-        <translation>Vaciar todos los campos de la firma de mensaje</translation>
+        <source>Address</source>
+        <translation>Dirección</translation>
     </message>
     <message>
-        <source>Clear &amp;All</source>
-        <translation>Vaciar &amp;todo</translation>
+        <source>ID</source>
+        <translation>ID</translation>
     </message>
     <message>
-        <source>&amp;Verify Message</source>
-        <translation>&amp;Verificar mensaje</translation>
+        <source>Exporting Failed</source>
+        <translation>Falló la exportación</translation>
     </message>
     <message>
-        <source>Enter the receiver's address, message (ensure you copy line breaks, spaces, tabs, etc. exactly) and signature below to verify the message. Be careful not to read more into the signature than what is in the signed message itself, to avoid being tricked by a man-in-the-middle attack. Note that this only proves the signing party receives with the address, it cannot prove sendership of any transaction!</source>
-        <translation>Introduzca la dirección para la firma, el mensaje (asegurándose de copiar tal cual los saltos de línea, espacios, tabulaciones, etc.) y la firma a continuación para verificar el mensaje. Tenga cuidado de no asumir más información de lo que dice el propio mensaje firmado para evitar fraudes basados en ataques de tipo man-in-the-middle. </translation>
+        <source>There was an error trying to save the transaction history to %1.</source>
+        <translation>Ha habido un error al intentar guardar la transacción con %1.</translation>
     </message>
     <message>
-        <source>The Bitcoin address the message was signed with</source>
-        <translation>La dirección Bitcoin con la que se firmó el mensaje</translation>
+        <source>Exporting Successful</source>
+        <translation>Exportación finalizada</translation>
     </message>
     <message>
-        <source>Verify the message to ensure it was signed with the specified Bitcoin address</source>
-        <translation>Verificar el mensaje para comprobar que fue firmado con la dirección Bitcoin indicada</translation>
+        <source>The transaction history was successfully saved to %1.</source>
+        <translation>La transacción ha sido guardada en %1.</translation>
     </message>
     <message>
-        <source>Verify &amp;Message</source>
-        <translation>Verificar &amp;mensaje</translation>
+        <source>Range:</source>
+        <translation>Rango:</translation>
     </message>
     <message>
-        <source>Reset all verify message fields</source>
-        <translation>Vaciar todos los campos de la verificación de mensaje</translation>
+        <source>to</source>
+        <translation>para</translation>
     </message>
 </context>
 <context>
-    <name>SplashScreen</name>
+    <name>UnitDisplayStatusBarControl</name>
     <message>
-        <source>[testnet]</source>
-        <translation>[testnet]</translation>
+        <source>Unit to show amounts in. Click to select another unit.</source>
+        <translation>Unidad en la que se muestran las cantidades. Haga clic para seleccionar otra unidad.</translation>
     </message>
 </context>
 <context>
-    <name>TrafficGraphWidget</name>
+    <name>WalletFrame</name>
     <message>
-        <source>KB/s</source>
-        <translation>KB/s</translation>
+        <source>No wallet has been loaded.</source>
+        <translation>No se ha cargado ningún monedero</translation>
     </message>
 </context>
 <context>
-    <name>TransactionDescDialog</name>
+    <name>WalletModel</name>
     <message>
-        <source>This pane shows a detailed description of the transaction</source>
-        <translation>Esta ventana muestra información detallada sobre la transacción</translation>
+        <source>Send Coins</source>
+        <translation>Enviar</translation>
     </message>
 </context>
 <context>
-    <name>UnitDisplayStatusBarControl</name>
+    <name>WalletView</name>
     <message>
-        <source>Unit to show amounts in. Click to select another unit.</source>
-        <translation>Unidad en la que se muestran las cantidades. Haga clic para seleccionar otra unidad.</translation>
+        <source>&amp;Export</source>
+        <translation>&amp;Exportar</translation>
+    </message>
+    <message>
+        <source>Export the data in the current tab to a file</source>
+        <translation>Exportar a un archivo los datos de esta pestaña</translation>
+    </message>
+    <message>
+        <source>Backup Wallet</source>
+        <translation>Copia de seguridad del monedero</translation>
+    </message>
+    <message>
+        <source>Wallet Data (*.dat)</source>
+        <translation>Datos de monedero (*.dat)</translation>
+    </message>
+    <message>
+        <source>Backup Failed</source>
+        <translation>La copia de seguridad ha fallado</translation>
+    </message>
+    <message>
+        <source>There was an error trying to save the wallet data to %1.</source>
+        <translation>Ha habido un error al intentar guardar los datos del monedero en %1.</translation>
+    </message>
+    <message>
+        <source>Backup Successful</source>
+        <translation>Se ha completado con éxito la copia de respaldo</translation>
+    </message>
+    <message>
+        <source>The wallet data was successfully saved to %1.</source>
+        <translation>Los datos del monedero se han guardado con éxito en %1.</translation>
     </message>
 </context>
 <context>
@@ -1758,7 +2897,7 @@
     </message>
     <message>
         <source>Prune: last wallet synchronisation goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of pruned node)</source>
-        <translation>Poda:  la ultima sincronizacion de la cartera sobrepasa los datos podados. Necesitas reindexar con -reindex (o descargar la cadena de bloques de nuevo en el caso de un nodo podado)</translation>
+        <translation>Poda: la ultima sincronizacion del monedero sobrepasa los datos podados. Necesitas reindexar con -reindex (o descargar la cadena de bloques de nuevo en el caso de un nodo podado)</translation>
     </message>
     <message>
         <source>Reduce storage requirements by pruning (deleting) old blocks. This mode is incompatible with -txindex and -rescan. Warning: Reverting this setting requires re-downloading the entire blockchain. (default: 0 = disable pruning blocks, &gt;%u = target size in MiB to use for block files)</source>
@@ -1789,21 +2928,13 @@
         <source>Unable to start HTTP server. See debug log for details.</source>
         <translation>No se ha podido comenzar el servidor HTTP. Ver debug log para detalles.</translation>
     </message>
-    <message>
-        <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
-        <translation>Aceptar conexiones desde el exterior (predeterminado: 1 si no -proxy o -connect)</translation>
-    </message>
     <message>
         <source>Bitcoin Core</source>
         <translation>Bitcoin Core</translation>
     </message>
     <message>
         <source>The %s developers</source>
-        <translation>Los %s desarrolladores</translation>
-    </message>
-    <message>
-        <source>-fallbackfee is set very high! This is the transaction fee you may pay when fee estimates are not available.</source>
-        <translation>-fallbackfee tiene un ajuste muy alto! Esta es la comisión de transacción que pagarás cuando las estimaciones de comisiones no estén disponibles.</translation>
+        <translation>Los desarrolladores de %s</translation>
     </message>
     <message>
         <source>A fee rate (in %s/kB) that will be used when fee estimation has insufficient data (default: %s)</source>
@@ -1825,10 +2956,6 @@
         <source>Delete all wallet transactions and only recover those parts of the blockchain through -rescan on startup</source>
         <translation>Borrar todas las transacciones del monedero y sólo recuperar aquellas partes de la cadena de bloques por medio de -rescan on startup.</translation>
     </message>
-    <message>
-        <source>Distributed under the MIT software license, see the accompanying file COPYING or &lt;http://www.opensource.org/licenses/mit-license.php&gt;.</source>
-        <translation>Distribuido bajo la licencia de software MIT, vea la copia del archivo adjunto o &lt;http://www.opensource.org/licenses/mit-license.php&gt;.</translation>
-    </message>
     <message>
         <source>Error loading %s: You can't enable HD on a already existing non-HD wallet</source>
         <translation>Error cargando %s: No puede habilitar HD en un monedero existente que no es HD</translation>
@@ -1841,17 +2968,13 @@
         <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source>
         <translation>Ejecutar comando cuando una transacción del monedero cambia (%s en cmd se remplazará por TxID)</translation>
     </message>
-    <message>
-        <source>Force relay of transactions from whitelisted peers even they violate local relay policy (default: %d)</source>
-        <translation>Fuerza la retransmisión de transacciones desde nodos en la lista blanca incluso si violan la política de retransmisiones local (predeterminado: %d)</translation>
-    </message>
     <message>
         <source>Maximum allowed median peer time offset adjustment. Local perspective of time may be influenced by peers forward or backward by this amount. (default: %u seconds)</source>
         <translation>Ajuste máximo permitido del tiempo offset medio de pares. La perspectiva local de tiempo se verá influenciada por los pares anteriores y posteriores a esta cantidad. (Por defecto: %u segundos)</translation>
     </message>
     <message>
         <source>Maximum total fees (in %s) to use in a single wallet transaction or raw transaction; setting this too low may abort large transactions (default: %s)</source>
-        <translation>Máximas comisiones totales (en %s) para utilizar en una sola transacción de la cartera; establecer esto demasiado bajo puede abortar grandes transacciones (predeterminado: %s)</translation>
+        <translation>Máximas comisiones totales (en %s) para utilizar en una sola transacción del monedero; establecer esto demasiado bajo puede abortar grandes transacciones (predeterminado: %s)</translation>
     </message>
     <message>
         <source>Please check that your computer's date and time are correct! If your clock is wrong, %s will not work properly.</source>
@@ -1869,10 +2992,6 @@
         <source>The block database contains a block which appears to be from the future. This may be due to your computer's date and time being set incorrectly. Only rebuild the block database if you are sure that your computer's date and time are correct</source>
         <translation>La base de datos de bloques contiene un bloque que parece ser del futuro. Esto puede ser porque la fecha y hora de tu ordenador están mal ajustados. Reconstruye la base de datos de bloques solo si estas seguro de que la fecha y hora de tu ordenador estan ajustados correctamente.</translation>
     </message>
-    <message>
-        <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
-        <translation>Esta es una versión de pre-prueba - utilícela bajo su propio riesgo. No la utilice para usos comerciales o de minería.</translation>
-    </message>
     <message>
         <source>Unable to rewind the database to a pre-fork state. You will need to redownload the blockchain</source>
         <translation>No es posible reconstruir la base de datos a un estado anterior. Debe descargar de nuevo la cadena de bloques.</translation>
@@ -1881,18 +3000,6 @@
         <source>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</source>
         <translation>Utiliza UPnP para asignar el puerto de escucha (predeterminado: 1 cuando esta escuchando sin -proxy)</translation>
     </message>
-    <message>
-        <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source>
-        <translation>Atención: ¡Parece que la red no está totalmente de acuerdo! Algunos mineros están presentando inconvenientes.</translation>
-    </message>
-    <message>
-        <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source>
-        <translation>Atención: ¡Parece que no estamos completamente de acuerdo con nuestros pares! Podría necesitar una actualización, u otros nodos podrían necesitarla.</translation>
-    </message>
-    <message>
-        <source>Whitelist peers connecting from the given netmask or IP address. Can be specified multiple times.</source>
-        <translation>Poner en lista blanca a los equipos que se conecten desde la máscara de subred o dirección IP especificada. Se puede especificar múltiples veces.</translation>
-    </message>
     <message>
         <source>You need to rebuild the database using -reindex-chainstate to change -txindex</source>
         <translation>Necesita reconstruir la base de datos usando -reindex-chainstate para cambiar -txindex</translation>
@@ -1929,10 +3036,6 @@
         <source>Change index out of range</source>
         <translation>Cambio de indice fuera de rango</translation>
     </message>
-    <message>
-        <source>Connect only to the specified node(s)</source>
-        <translation>Conectar sólo a los nodos (o nodo) especificados</translation>
-    </message>
     <message>
         <source>Connection options:</source>
         <translation>Opciones de conexión:</translation>
@@ -2053,10 +3156,6 @@
         <source>Location of the auth cookie (default: data dir)</source>
         <translation>Ubicación de la cookie de autenticación (default: data dir)</translation>
     </message>
-    <message>
-        <source>Minimum bytes per sigop in transactions we relay and mine (default: %u)</source>
-        <translation>Mínimo de bytes por sigop en transacciones que retransmitimos y minamos (predeterminado: %u)</translation>
-    </message>
     <message>
         <source>Not enough file descriptors available.</source>
         <translation>No hay suficientes descriptores de archivo disponibles. </translation>
@@ -2095,11 +3194,7 @@
     </message>
     <message>
         <source>Set database cache size in megabytes (%d to %d, default: %d)</source>
-        <translation>Asignar tamaño de cache en megabytes (entre %d y %d; predeterminado: %d)</translation>
-    </message>
-    <message>
-        <source>Set maximum block cost (default: %d)</source>
-        <translation>Establecer tamaño máximo de bloque (por defecto: %d)</translation>
+        <translation>Asignar tamaño del cache en megabytes (entre %d y %d; predeterminado: %d)</translation>
     </message>
     <message>
         <source>Set maximum block size in bytes (default: %d)</source>
@@ -2199,16 +3294,12 @@
     </message>
     <message>
         <source>Invalid amount for -maxtxfee=&lt;amount&gt;: '%s' (must be at least the minrelay fee of %s to prevent stuck transactions)</source>
-        <translation>Cantidad no válida para -maxtxfee=&lt;amount&gt;: '%s' (debe ser por lo menos la cuota de comisión mínima de %s para prevenir transacciones atascadas)</translation>
+        <translation>Cantidad no válida para -maxtxfee=&lt;amount&gt;: '%s' (debe ser por lo menos la comisión mínima de %s para prevenir transacciones atascadas)</translation>
     </message>
     <message>
         <source>Maximum size of data in data carrier transactions we relay and mine (default: %u)</source>
         <translation>El tamaño máximo de los datos en las operaciones de transporte de datos que transmitimos y el mio (default: %u)</translation>
     </message>
-    <message>
-        <source>Query for peer addresses via DNS lookup, if low on addresses (default: 1 unless -connect)</source>
-        <translation>Consulta de direcciones pares mediante búsqueda de DNS, si bajo en direcciones (por defecto: 1 a menos que - conectar)</translation>
-    </message>
     <message>
         <source>Randomize credentials for every proxy connection. This enables Tor stream isolation (default: %u)</source>
         <translation>Aleatorizar las credenciales para cada conexión proxy. Esto habilita la Tor stream isolation (por defecto: %u)</translation>
@@ -2221,10 +3312,6 @@
         <source>The transaction amount is too small to send after the fee has been deducted</source>
         <translation>Monto de transacción muy pequeña luego de la deducción por comisión</translation>
     </message>
-    <message>
-        <source>This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit &lt;https://www.openssl.org/&gt; and cryptographic software written by Eric Young and UPnP software written by Thomas Bernard.</source>
-        <translation>Este producto incluye software desarrollado por el OpenSSL Project para su uso en OpenSSL Toolkit &lt;https://www.openssl.org/&gt;, software de cifrado escrito por Eric Young y software UPnP escrito por Thomas Bernard.</translation>
-    </message>
     <message>
         <source>Use hierarchical deterministic key generation (HD) after BIP32. Only has effect during wallet creation/first start</source>
         <translation>Usar tras BIP32 la generación de llave determinística jerárquica (HD) . Solo tiene efecto durante el primer inicio/generación del monedero</translation>
@@ -2295,7 +3382,7 @@
     </message>
     <message>
         <source>Rescan the block chain for missing wallet transactions on startup</source>
-        <translation>Rescanea la cadena de bloques para transacciones perdidas de la cartera</translation>
+        <translation>Rescanea la cadena de bloques para buscar transacciones perdidas del monedero</translation>
     </message>
     <message>
         <source>Send trace/debug info to console instead of debug.log file</source>
@@ -2337,17 +3424,13 @@
         <source>Transaction amount too small</source>
         <translation>Cantidad de la transacción demasiado pequeña</translation>
     </message>
-    <message>
-        <source>Transaction amounts must be positive</source>
-        <translation>Las cantidades en las transacciones deben ser positivas</translation>
-    </message>
     <message>
         <source>Transaction too large for fee policy</source>
         <translation>Operación demasiado grande para la política de tasas</translation>
     </message>
     <message>
         <source>Transaction too large</source>
-        <translation>Transacción demasiado grande</translation>
+        <translation>Transacción demasiado grande, intenta dividirla en varias.</translation>
     </message>
     <message>
         <source>Unable to bind to %s on this computer (bind returned error %s)</source>
@@ -2355,7 +3438,7 @@
     </message>
     <message>
         <source>Upgrade wallet to latest format on startup</source>
-        <translation>Actualizar el monedero al último formato</translation>
+        <translation>Actualizar el monedero al último formato al inicio</translation>
     </message>
     <message>
         <source>Username for JSON-RPC connections</source>
@@ -2401,24 +3484,28 @@
     </message>
     <message>
         <source>(1 = keep tx meta data e.g. account owner and payment request information, 2 = drop tx meta data)</source>
-        <translation>(1 = keep tx meta data e.g. account owner and payment request information, 2 = drop tx meta data)</translation>
+        <translation>(1 = mantener los meta datos de transacción, por ejemplo: propietario e información de pago, 2 = omitir los metadatos)</translation>
     </message>
     <message>
         <source>-maxtxfee is set very high! Fees this large could be paid on a single transaction.</source>
-        <translation>-maxtxfee tiene un ajuste muy elevado! Las comisiones así de grandes podrían ser pagadas en una única transaccion.</translation>
-    </message>
-    <message>
-        <source>-paytxfee is set very high! This is the transaction fee you will pay if you send a transaction.</source>
-        <translation>-paytxfee tiene un ajuste muy elevado! Esta es la comisión de transacción que pagaras si envías una transaccion.</translation>
+        <translation>-maxtxfee tiene un ajuste muy elevado! Comisiones muy grandes podrían ser pagadas en una única transaccion.</translation>
     </message>
     <message>
         <source>Do not keep transactions in the mempool longer than &lt;n&gt; hours (default: %u)</source>
         <translation>No mantener transacciones en la memoria mas de &lt;n&gt; horas (predeterminado: %u)</translation>
     </message>
+    <message>
+        <source>Equivalent bytes per sigop in transactions for relay and mining (default: %u)</source>
+        <translation>Bytes equivalentes por sigop en transacciones para retrasmisión y minado (predeterminado: %u)</translation>
+    </message>
     <message>
         <source>Fees (in %s/kB) smaller than this are considered zero fee for transaction creation (default: %s)</source>
         <translation>Las comisiones (en %s/kB) menores que esto son consideradas de cero comision para la creacion de transacciones (predeterminado: %s)</translation>
     </message>
+    <message>
+        <source>Force relay of transactions from whitelisted peers even if they violate local relay policy (default: %d)</source>
+        <translation>Fuerza la retransmisión de transacciones desde nodos en la lista blanca incluso si violan la política de retransmisiones local (predeterminado: %d)</translation>
+    </message>
     <message>
         <source>How thorough the block verification of -checkblocks is (0-4, default: %u)</source>
         <translation>Nivel de rigor en la verificación de bloques de -checkblocks (0-4; predeterminado: %u)</translation>
@@ -2435,9 +3522,21 @@
         <source>Output debugging information (default: %u, supplying &lt;category&gt; is optional)</source>
         <translation>Mostrar depuración (por defecto: %u, proporcionar &lt;category&gt; es opcional)</translation>
     </message>
+    <message>
+        <source>Support filtering of blocks and transaction with bloom filters (default: %u)</source>
+        <translation>Admite filtrado de bloques, y transacciones con filtros Bloom. Reduce la carga de red. ( por defecto :%u)</translation>
+    </message>
+    <message>
+        <source>Total length of network version string (%i) exceeds maximum length (%i). Reduce the number or size of uacomments.</source>
+        <translation>La longitud total de la cadena de versión de red ( %i ) supera la longitud máxima ( %i ) . Reducir el número o tamaño de uacomments .</translation>
+    </message>
+    <message>
+        <source>Tries to keep outbound traffic under the given target (in MiB per 24h), 0 = no limit (default: %d)</source>
+        <translation>Intenta de mantener el Tráfico de salida , bajo el Objetivo Determinado (en MiB por 24h) , 0 =  sin limite (Por Defecto :%d )</translation>
+    </message>
     <message>
         <source>Unsupported argument -socks found. Setting SOCKS version isn't possible anymore, only SOCKS5 proxies are supported.</source>
-        <translation>Error: Unsupported argumento -socks encontrados. SOCKS versión ajuste ya no es posible, sólo SOCKS5 proxies son compatibles.</translation>
+        <translation>Error:  argumento -socks encontrado. El ajuste de la versión SOCKS ya no es posible, sólo proxies SOCKS5 son compatibles.</translation>
     </message>
     <message>
         <source>Unsupported argument -whitelistalwaysrelay ignored, use -whitelistrelay and/or -whitelistforcerelay.</source>
@@ -2459,6 +3558,10 @@
         <source>Warning: Wallet file corrupt, data salvaged! Original %s saved as %s in %s; if your balance or transactions are incorrect you should restore from a backup.</source>
         <translation>Aviso: fichero de monedero corrupto, datos recuperados! Original %s guardado como %s en %s; si su balance de transacciones es incorrecto, debe restaurar desde una copia de seguridad.</translation>
     </message>
+    <message>
+        <source>Whitelist peers connecting from the given IP address (e.g. 1.2.3.4) or CIDR notated network (e.g. 1.2.3.0/24). Can be specified multiple times.</source>
+        <translation>Los pares de listas blancas que se conectan desde la dirección IP dada (por ejemplo, 1.2.3.4) o la red marcada CIDR (por ejemplo, 1.2.3.0/24). Se puede especificar varias veces.</translation>
+    </message>
     <message>
         <source>(default: %s)</source>
         <translation>(predeterminado: %s)</translation>
@@ -2520,8 +3623,8 @@
         <translation>Ajustar el número de claves en reserva &lt;n&gt; (predeterminado: %u)</translation>
     </message>
     <message>
-        <source>Set minimum block size in bytes (default: %u)</source>
-        <translation>Establecer tamaño mínimo de bloque en bytes (por defecto: %u)</translation>
+        <source>Set maximum BIP141 block weight (default: %d)</source>
+        <translation>Establecer peso máximo bloque BIP141  (predeterminado: %d)</translation>
     </message>
     <message>
         <source>Set the number of threads to service RPC calls (default: %d)</source>
@@ -2541,7 +3644,11 @@
     </message>
     <message>
         <source>Spend unconfirmed change when sending transactions (default: %u)</source>
-        <translation>Gastar cambio no confirmado al enviar transacciones (predeterminado: %u)</translation>
+        <translation>Usar cambio aún no confirmado al enviar transacciones (predeterminado: %u)</translation>
+    </message>
+    <message>
+        <source>Starting network threads...</source>
+        <translation>Iniciando funciones de red...</translation>
     </message>
     <message>
         <source>Threshold for disconnecting misbehaving peers (default: %u)</source>
@@ -2569,7 +3676,7 @@
     </message>
     <message>
         <source>Cannot downgrade wallet</source>
-        <translation>No se puede rebajar el monedero</translation>
+        <translation>No se puede cambiar a una versión mas antigua el monedero</translation>
     </message>
     <message>
         <source>Cannot write default address</source>
diff --git a/src/qt/locale/bitcoin_es_AR.ts b/src/qt/locale/bitcoin_es_AR.ts
index 40ebaf88560ad..6a418e645bd5a 100644
--- a/src/qt/locale/bitcoin_es_AR.ts
+++ b/src/qt/locale/bitcoin_es_AR.ts
@@ -41,7 +41,10 @@
         <source>&amp;Delete</source>
         <translation>&amp;Borrar</translation>
     </message>
-</context>
+    </context>
+<context>
+    <name>AddressTableModel</name>
+    </context>
 <context>
     <name>AskPassphraseDialog</name>
     <message>
@@ -60,7 +63,7 @@
         <source>Repeat new passphrase</source>
         <translation>Repetí la nueva Frase de Contraseña</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>BanTableModel</name>
     </context>
@@ -82,6 +85,9 @@
 <context>
     <name>Intro</name>
     </context>
+<context>
+    <name>ModalOverlay</name>
+    </context>
 <context>
     <name>OpenURIDialog</name>
     </context>
@@ -91,12 +97,21 @@
 <context>
     <name>OverviewPage</name>
     </context>
+<context>
+    <name>PaymentServer</name>
+    </context>
 <context>
     <name>PeerTableModel</name>
     </context>
 <context>
     <name>QObject</name>
     </context>
+<context>
+    <name>QObject::QObject</name>
+    </context>
+<context>
+    <name>QRImageWidget</name>
+    </context>
 <context>
     <name>RPCConsole</name>
     </context>
@@ -106,12 +121,18 @@
 <context>
     <name>ReceiveRequestDialog</name>
     </context>
+<context>
+    <name>RecentRequestsTableModel</name>
+    </context>
 <context>
     <name>SendCoinsDialog</name>
     </context>
 <context>
     <name>SendCoinsEntry</name>
     </context>
+<context>
+    <name>SendConfirmationDialog</name>
+    </context>
 <context>
     <name>ShutdownWindow</name>
     </context>
@@ -124,12 +145,30 @@
 <context>
     <name>TrafficGraphWidget</name>
     </context>
+<context>
+    <name>TransactionDesc</name>
+    </context>
 <context>
     <name>TransactionDescDialog</name>
     </context>
+<context>
+    <name>TransactionTableModel</name>
+    </context>
+<context>
+    <name>TransactionView</name>
+    </context>
 <context>
     <name>UnitDisplayStatusBarControl</name>
     </context>
+<context>
+    <name>WalletFrame</name>
+    </context>
+<context>
+    <name>WalletModel</name>
+    </context>
+<context>
+    <name>WalletView</name>
+    </context>
 <context>
     <name>bitcoin-core</name>
     </context>
diff --git a/src/qt/locale/bitcoin_es_CL.ts b/src/qt/locale/bitcoin_es_CL.ts
index 188641d6e7ace..ac01c4219b351 100644
--- a/src/qt/locale/bitcoin_es_CL.ts
+++ b/src/qt/locale/bitcoin_es_CL.ts
@@ -41,7 +41,10 @@
         <source>&amp;Delete</source>
         <translation>&amp;Borrar</translation>
     </message>
-</context>
+    </context>
+<context>
+    <name>AddressTableModel</name>
+    </context>
 <context>
     <name>AskPassphraseDialog</name>
     <message>
@@ -56,7 +59,7 @@
         <source>Repeat new passphrase</source>
         <translation>Repite nueva contraseña</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>BanTableModel</name>
     </context>
@@ -206,10 +209,6 @@
         <source>Request payments (generates QR codes and bitcoin: URIs)</source>
         <translation>Pide pagos (genera codigos QR and bitcoin: URls)</translation>
     </message>
-    <message>
-        <source>%1 and %2</source>
-        <translation>%1 y %2</translation>
-    </message>
     <message>
         <source>Error</source>
         <translation>Error</translation>
@@ -246,17 +245,13 @@
         <source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;locked&lt;/b&gt;</source>
         <translation>La billetera esta &lt;b&gt;codificada&lt;/b&gt; y actualmente &lt;b&gt;bloqueda&lt;/b&gt;</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>CoinControlDialog</name>
     <message>
         <source>Amount:</source>
         <translation>Cantidad:</translation>
     </message>
-    <message>
-        <source>Priority:</source>
-        <translation>prioridad:</translation>
-    </message>
     <message>
         <source>Fee:</source>
         <translation>comisión:
@@ -278,11 +273,7 @@
         <source>Confirmed</source>
         <translation>Confirmado</translation>
     </message>
-    <message>
-        <source>Priority</source>
-        <translation>prioridad</translation>
-    </message>
-</context>
+    </context>
 <context>
     <name>EditAddressDialog</name>
     <message>
@@ -297,7 +288,7 @@
         <source>&amp;Address</source>
         <translation>&amp;Dirección</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>FreespaceChecker</name>
     <message>
@@ -331,6 +322,13 @@
         <translation>Error</translation>
     </message>
     </context>
+<context>
+    <name>ModalOverlay</name>
+    <message>
+        <source>Form</source>
+        <translation>Formulario</translation>
+    </message>
+    </context>
 <context>
     <name>OpenURIDialog</name>
     <message>
@@ -441,6 +439,9 @@
         <translation>Total:</translation>
     </message>
     </context>
+<context>
+    <name>PaymentServer</name>
+    </context>
 <context>
     <name>PeerTableModel</name>
     </context>
@@ -454,6 +455,16 @@
         <source>N/A</source>
         <translation>N/A</translation>
     </message>
+    <message>
+        <source>%1 and %2</source>
+        <translation>%1 y %2</translation>
+    </message>
+    </context>
+<context>
+    <name>QObject::QObject</name>
+    </context>
+<context>
+    <name>QRImageWidget</name>
     </context>
 <context>
     <name>RPCConsole</name>
@@ -548,7 +559,10 @@
         <source>&amp;Save Image...</source>
         <translation>Guardar imagen...</translation>
     </message>
-</context>
+    </context>
+<context>
+    <name>RecentRequestsTableModel</name>
+    </context>
 <context>
     <name>SendCoinsDialog</name>
     <message>
@@ -563,10 +577,6 @@
         <source>Amount:</source>
         <translation>Cantidad:</translation>
     </message>
-    <message>
-        <source>Priority:</source>
-        <translation>prioridad:</translation>
-    </message>
     <message>
         <source>Fee:</source>
         <translation>comisión:
@@ -608,7 +618,7 @@
         <source>S&amp;end</source>
         <translation>&amp;Envía</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>SendCoinsEntry</name>
     <message>
@@ -644,6 +654,9 @@
         <translation>Pagar a:</translation>
     </message>
     </context>
+<context>
+    <name>SendConfirmationDialog</name>
+    </context>
 <context>
     <name>ShutdownWindow</name>
     </context>
@@ -708,16 +721,34 @@
         <translation>KB/s</translation>
     </message>
 </context>
+<context>
+    <name>TransactionDesc</name>
+    </context>
 <context>
     <name>TransactionDescDialog</name>
     <message>
         <source>This pane shows a detailed description of the transaction</source>
         <translation>Esta ventana muestra información detallada sobre la transacción</translation>
     </message>
-</context>
+    </context>
+<context>
+    <name>TransactionTableModel</name>
+    </context>
+<context>
+    <name>TransactionView</name>
+    </context>
 <context>
     <name>UnitDisplayStatusBarControl</name>
     </context>
+<context>
+    <name>WalletFrame</name>
+    </context>
+<context>
+    <name>WalletModel</name>
+    </context>
+<context>
+    <name>WalletView</name>
+    </context>
 <context>
     <name>bitcoin-core</name>
     <message>
@@ -744,11 +775,6 @@
         <source>Bitcoin Core</source>
         <translation>bitcoin core</translation>
     </message>
-    <message>
-        <source>Connect only to the specified node(s)</source>
-        <translation>Conecta solo al nodo especificado
-</translation>
-    </message>
     <message>
         <source>Error loading block database</source>
         <translation>Error cargando blkindex.dat</translation>
diff --git a/src/qt/locale/bitcoin_es_CO.ts b/src/qt/locale/bitcoin_es_CO.ts
index df189190f602b..f993f886053ad 100644
--- a/src/qt/locale/bitcoin_es_CO.ts
+++ b/src/qt/locale/bitcoin_es_CO.ts
@@ -37,7 +37,10 @@
         <source>&amp;Delete</source>
         <translation>&amp;Borrar</translation>
     </message>
-</context>
+    </context>
+<context>
+    <name>AddressTableModel</name>
+    </context>
 <context>
     <name>AskPassphraseDialog</name>
     <message>
@@ -56,7 +59,7 @@
         <source>Repeat new passphrase</source>
         <translation>Repetir nueva contraseña</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>BanTableModel</name>
     </context>
@@ -197,11 +200,18 @@
     </context>
 <context>
     <name>Intro</name>
+    <message>
+        <source>Welcome</source>
+        <translation>bienvenido</translation>
+    </message>
     <message>
         <source>Error</source>
         <translation>Error</translation>
     </message>
     </context>
+<context>
+    <name>ModalOverlay</name>
+    </context>
 <context>
     <name>OpenURIDialog</name>
     </context>
@@ -211,12 +221,21 @@
 <context>
     <name>OverviewPage</name>
     </context>
+<context>
+    <name>PaymentServer</name>
+    </context>
 <context>
     <name>PeerTableModel</name>
     </context>
 <context>
     <name>QObject</name>
     </context>
+<context>
+    <name>QObject::QObject</name>
+    </context>
+<context>
+    <name>QRImageWidget</name>
+    </context>
 <context>
     <name>RPCConsole</name>
     </context>
@@ -226,12 +245,18 @@
 <context>
     <name>ReceiveRequestDialog</name>
     </context>
+<context>
+    <name>RecentRequestsTableModel</name>
+    </context>
 <context>
     <name>SendCoinsDialog</name>
     </context>
 <context>
     <name>SendCoinsEntry</name>
     </context>
+<context>
+    <name>SendConfirmationDialog</name>
+    </context>
 <context>
     <name>ShutdownWindow</name>
     </context>
@@ -244,12 +269,30 @@
 <context>
     <name>TrafficGraphWidget</name>
     </context>
+<context>
+    <name>TransactionDesc</name>
+    </context>
 <context>
     <name>TransactionDescDialog</name>
     </context>
+<context>
+    <name>TransactionTableModel</name>
+    </context>
+<context>
+    <name>TransactionView</name>
+    </context>
 <context>
     <name>UnitDisplayStatusBarControl</name>
     </context>
+<context>
+    <name>WalletFrame</name>
+    </context>
+<context>
+    <name>WalletModel</name>
+    </context>
+<context>
+    <name>WalletView</name>
+    </context>
 <context>
     <name>bitcoin-core</name>
     <message>
diff --git a/src/qt/locale/bitcoin_es_DO.ts b/src/qt/locale/bitcoin_es_DO.ts
index ba963d2b8042f..eb6583083b029 100644
--- a/src/qt/locale/bitcoin_es_DO.ts
+++ b/src/qt/locale/bitcoin_es_DO.ts
@@ -37,7 +37,10 @@
         <source>&amp;Delete</source>
         <translation>&amp;Eliminar</translation>
     </message>
-</context>
+    </context>
+<context>
+    <name>AddressTableModel</name>
+    </context>
 <context>
     <name>AskPassphraseDialog</name>
     <message>
@@ -56,7 +59,7 @@
         <source>Repeat new passphrase</source>
         <translation>Repita la nueva contraseña</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>BanTableModel</name>
     </context>
@@ -286,7 +289,7 @@
         <source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;locked&lt;/b&gt;</source>
         <translation>El monedero está &lt;b&gt;cifrado&lt;/b&gt; y actualmente &lt;b&gt;bloqueado&lt;/b&gt;</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>CoinControlDialog</name>
     <message>
@@ -301,10 +304,6 @@
         <source>Amount:</source>
         <translation>Cuantía:</translation>
     </message>
-    <message>
-        <source>Priority:</source>
-        <translation>Prioridad:</translation>
-    </message>
     <message>
         <source>Fee:</source>
         <translation>Tasa:</translation>
@@ -345,11 +344,7 @@
         <source>Confirmed</source>
         <translation>Confirmado</translation>
     </message>
-    <message>
-        <source>Priority</source>
-        <translation>Prioridad</translation>
-    </message>
-</context>
+    </context>
 <context>
     <name>EditAddressDialog</name>
     <message>
@@ -372,7 +367,7 @@
         <source>&amp;Address</source>
         <translation>&amp;Dirección</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>FreespaceChecker</name>
     <message>
@@ -434,6 +429,17 @@
         <translation>Error</translation>
     </message>
     </context>
+<context>
+    <name>ModalOverlay</name>
+    <message>
+        <source>Form</source>
+        <translation>Desde</translation>
+    </message>
+    <message>
+        <source>Last block time</source>
+        <translation>Hora del último bloque</translation>
+    </message>
+    </context>
 <context>
     <name>OpenURIDialog</name>
     <message>
@@ -452,7 +458,7 @@
         <source>Select payment request file</source>
         <translation>Seleccione archivo de sulicitud de pago</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>OptionsDialog</name>
     <message>
@@ -615,6 +621,9 @@
         <translation>Su balance actual total</translation>
     </message>
     </context>
+<context>
+    <name>PaymentServer</name>
+    </context>
 <context>
     <name>PeerTableModel</name>
     </context>
@@ -637,6 +646,12 @@
         <translation>N/D</translation>
     </message>
     </context>
+<context>
+    <name>QObject::QObject</name>
+    </context>
+<context>
+    <name>QRImageWidget</name>
+    </context>
 <context>
     <name>RPCConsole</name>
     <message>
@@ -798,7 +813,7 @@
         <source>Remove</source>
         <translation>Eliminar</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>ReceiveRequestDialog</name>
     <message>
@@ -817,7 +832,10 @@
         <source>&amp;Save Image...</source>
         <translation>Guardar Imagen...</translation>
     </message>
-</context>
+    </context>
+<context>
+    <name>RecentRequestsTableModel</name>
+    </context>
 <context>
     <name>SendCoinsDialog</name>
     <message>
@@ -852,10 +870,6 @@
         <source>Amount:</source>
         <translation>Cuantía:</translation>
     </message>
-    <message>
-        <source>Priority:</source>
-        <translation>Prioridad:</translation>
-    </message>
     <message>
         <source>Fee:</source>
         <translation>Tasa:</translation>
@@ -908,7 +922,7 @@
         <source>S&amp;end</source>
         <translation>&amp;Enviar</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>SendCoinsEntry</name>
     <message>
@@ -963,7 +977,10 @@
         <source>Memo:</source>
         <translation>Memo:</translation>
     </message>
-</context>
+    </context>
+<context>
+    <name>SendConfirmationDialog</name>
+    </context>
 <context>
     <name>ShutdownWindow</name>
     </context>
@@ -1037,7 +1054,7 @@
         <source>Reset all verify message fields</source>
         <translation>Limpiar todos los campos de la verificación de mensaje</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>SplashScreen</name>
     <message>
@@ -1052,16 +1069,34 @@
         <translation>KB/s</translation>
     </message>
 </context>
+<context>
+    <name>TransactionDesc</name>
+    </context>
 <context>
     <name>TransactionDescDialog</name>
     <message>
         <source>This pane shows a detailed description of the transaction</source>
         <translation>Esta ventana muestra información detallada sobre la transacción</translation>
     </message>
-</context>
+    </context>
+<context>
+    <name>TransactionTableModel</name>
+    </context>
+<context>
+    <name>TransactionView</name>
+    </context>
 <context>
     <name>UnitDisplayStatusBarControl</name>
     </context>
+<context>
+    <name>WalletFrame</name>
+    </context>
+<context>
+    <name>WalletModel</name>
+    </context>
+<context>
+    <name>WalletView</name>
+    </context>
 <context>
     <name>bitcoin-core</name>
     <message>
@@ -1091,10 +1126,6 @@
         <translation>Ejecutar en segundo plano como daemon y aceptar comandos
 </translation>
     </message>
-    <message>
-        <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
-        <translation>Aceptar conexiones desde el exterior (predeterminado: 1 si no -proxy o -connect)</translation>
-    </message>
     <message>
         <source>Bitcoin Core</source>
         <translation>Núcleo de Bitcoin</translation>
@@ -1107,18 +1138,6 @@
         <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source>
         <translation>Ejecutar comando cuando una transacción del monedero cambia (%s en cmd se remplazará por TxID)</translation>
     </message>
-    <message>
-        <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
-        <translation>Esta es una versión de pre-prueba - utilícela bajo su propio riesgo. No la utilice para usos comerciales o de minería.</translation>
-    </message>
-    <message>
-        <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source>
-        <translation>Atención: ¡Parece que la red no está totalmente de acuerdo! Algunos mineros están presentando inconvenientes.</translation>
-    </message>
-    <message>
-        <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source>
-        <translation>Atención: ¡Parece que no estamos completamente de acuerdo con nuestros pares! Podría necesitar una actualización, u otros nodos podrían necesitarla.</translation>
-    </message>
     <message>
         <source>&lt;category&gt; can be:</source>
         <translation>&lt;category&gt; puede ser:</translation>
@@ -1127,10 +1146,6 @@
         <source>Block creation options:</source>
         <translation>Opciones de creación de bloques:</translation>
     </message>
-    <message>
-        <source>Connect only to the specified node(s)</source>
-        <translation>Conectar sólo a los nodos (o nodo) especificados</translation>
-    </message>
     <message>
         <source>Corrupted block database detected</source>
         <translation>Corrupción de base de datos de bloques detectada.</translation>
@@ -1231,10 +1246,6 @@
         <source>Transaction amount too small</source>
         <translation>Monto de la transacción muy pequeño</translation>
     </message>
-    <message>
-        <source>Transaction amounts must be positive</source>
-        <translation>Montos de transacciones deben ser positivos</translation>
-    </message>
     <message>
         <source>Transaction too large</source>
         <translation>Transacción demasiado grande</translation>
diff --git a/src/qt/locale/bitcoin_es_ES.ts b/src/qt/locale/bitcoin_es_ES.ts
index c66a477cc2994..5ac57a5c25fe9 100644
--- a/src/qt/locale/bitcoin_es_ES.ts
+++ b/src/qt/locale/bitcoin_es_ES.ts
@@ -3,11 +3,11 @@
     <name>AddressBookPage</name>
     <message>
         <source>Right-click to edit address or label</source>
-        <translation>Haz clic derecho para editar la dirección o la etiqueta</translation>
+        <translation>Haz clic derecho para editar la dirección o etiqueta</translation>
     </message>
     <message>
         <source>Create a new address</source>
-        <translation>Crea una nueva direccióon</translation>
+        <translation>Crear una nueva dirección</translation>
     </message>
     <message>
         <source>&amp;New</source>
@@ -15,7 +15,7 @@
     </message>
     <message>
         <source>Copy the currently selected address to the system clipboard</source>
-        <translation>Copia la direccón seleccionada al portapapeles del sistema</translation>
+        <translation>Copiar la dirección seleccionada al portapapeles del sistema</translation>
     </message>
     <message>
         <source>&amp;Copy</source>
@@ -27,11 +27,11 @@
     </message>
     <message>
         <source>Delete the currently selected address from the list</source>
-        <translation>Elimina la dirección seleccionada de la lista</translation>
+        <translation>Eliminar la dirección seleccionada de la lista</translation>
     </message>
     <message>
         <source>Export the data in the current tab to a file</source>
-        <translation>Exporta los datos de la pestaña actual a un archivo</translation>
+        <translation>Exportar los datos en la ficha actual a un archivo</translation>
     </message>
     <message>
         <source>&amp;Export</source>
@@ -41,16 +41,87 @@
         <source>&amp;Delete</source>
         <translation>&amp;Eliminar</translation>
     </message>
+    <message>
+        <source>Choose the address to send coins to</source>
+        <translation>Seleccione la dirección a la que enviar monedas</translation>
+    </message>
+    <message>
+        <source>Choose the address to receive coins with</source>
+        <translation>Seleccione la dirección de la que recibir monedas</translation>
+    </message>
+    <message>
+        <source>C&amp;hoose</source>
+        <translation>E&amp;scoger</translation>
+    </message>
+    <message>
+        <source>Sending addresses</source>
+        <translation>Enviando direcciones</translation>
+    </message>
+    <message>
+        <source>Receiving addresses</source>
+        <translation>Recibiendo direcciones</translation>
+    </message>
+    <message>
+        <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source>
+        <translation>Estas son sus direcciones Bitcoin para enviar pagos. Verifique siempre la cantidad y la dirección de recibimiento antes de enviar monedas.</translation>
+    </message>
+    <message>
+        <source>These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source>
+        <translation>Estas son sus direcciones Bitcoin para recibir pagos. Se recomienda utilizar una nueva dirección de recibimiento para cada transacción</translation>
+    </message>
+    <message>
+        <source>&amp;Copy Address</source>
+        <translation>&amp;Copiar Dirección</translation>
+    </message>
+    <message>
+        <source>Copy &amp;Label</source>
+        <translation>Copiar &amp;Etiqueta</translation>
+    </message>
+    <message>
+        <source>&amp;Edit</source>
+        <translation>&amp;Editar</translation>
+    </message>
+    <message>
+        <source>Export Address List</source>
+        <translation>Exportar lista de direcciones</translation>
+    </message>
+    <message>
+        <source>Comma separated file (*.csv)</source>
+        <translation>Archivo separado de coma (*.csv)</translation>
+    </message>
+    <message>
+        <source>Exporting Failed</source>
+        <translation>Falló la exportación</translation>
+    </message>
+    <message>
+        <source>There was an error trying to save the address list to %1. Please try again.</source>
+        <translation>Había un error intentando guardar la lista de direcciones en %1. Por favor inténtelo de nuevo.</translation>
+    </message>
+</context>
+<context>
+    <name>AddressTableModel</name>
+    <message>
+        <source>Label</source>
+        <translation>Etiqueta</translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation>Dirección</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(sin etiqueta)</translation>
+    </message>
 </context>
 <context>
     <name>AskPassphraseDialog</name>
     <message>
         <source>Passphrase Dialog</source>
-        <translation>Dialogo de Contraseña</translation>
+        <translation>Diálogo de contraseña</translation>
     </message>
     <message>
         <source>Enter passphrase</source>
-        <translation>Introduzca la contraseña</translation>
+        <translation>Introducir contraseña</translation>
     </message>
     <message>
         <source>New passphrase</source>
@@ -58,12 +129,108 @@
     </message>
     <message>
         <source>Repeat new passphrase</source>
-        <translation>Repite la nueva contraseña</translation>
+        <translation>Repita la nueva contraseña</translation>
+    </message>
+    <message>
+        <source>Enter the new passphrase to the wallet.&lt;br/&gt;Please use a passphrase of &lt;b&gt;ten or more random characters&lt;/b&gt;, or &lt;b&gt;eight or more words&lt;/b&gt;.</source>
+        <translation>Introduzca la nueva frase clave del monedero. &lt;br/&gt;Por favor utilice una frase clave de &lt;b&gt;diez o más carácteres aleatorios&lt;/b&gt;, o &lt;b&gt;ocho o más palabras&lt;/b&gt;.</translation>
+    </message>
+    <message>
+        <source>Encrypt wallet</source>
+        <translation>Monedero encriptado</translation>
+    </message>
+    <message>
+        <source>This operation needs your wallet passphrase to unlock the wallet.</source>
+        <translation>Esta operación necesita su frase clave de monedero para desbloquear el monedero.</translation>
+    </message>
+    <message>
+        <source>Unlock wallet</source>
+        <translation>Desbloquear monedero</translation>
+    </message>
+    <message>
+        <source>This operation needs your wallet passphrase to decrypt the wallet.</source>
+        <translation>Esta operación necesita su frase clave de cartera para desencriptar el monedero.</translation>
+    </message>
+    <message>
+        <source>Decrypt wallet</source>
+        <translation>Desencriptar monedero</translation>
+    </message>
+    <message>
+        <source>Change passphrase</source>
+        <translation>Cambiar frase clave</translation>
+    </message>
+    <message>
+        <source>Enter the old passphrase and new passphrase to the wallet.</source>
+        <translation>Introduzca la vieja frase clave y la nueva flase clave para el monedero.</translation>
+    </message>
+    <message>
+        <source>Confirm wallet encryption</source>
+        <translation>Confirmar encriptación del monedero</translation>
+    </message>
+    <message>
+        <source>Warning: If you encrypt your wallet and lose your passphrase, you will &lt;b&gt;LOSE ALL OF YOUR BITCOINS&lt;/b&gt;!</source>
+        <translation>Advertencia: Si encripta su monedero y pierde su frase clave &lt;b&gt;PERDERÁ TODOS SUS BITCOINS&lt;/b&gt;!</translation>
+    </message>
+    <message>
+        <source>Are you sure you wish to encrypt your wallet?</source>
+        <translation>¿Seguro que desea encriptar su monedero?</translation>
+    </message>
+    <message>
+        <source>Wallet encrypted</source>
+        <translation>Monedero encriptado</translation>
+    </message>
+    <message>
+        <source>%1 will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source>
+        <translation>%1 se cerrará ahora para terminar el proceso de encriptación. Recuerde que encriptar su monedero no puede proteger completamente su monedero de ser robado por malware que infecte su ordenador.</translation>
+    </message>
+    <message>
+        <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source>
+        <translation>IMPORTANTE: Cualquier copia de seguridad anterior que haya hecho en su archivo de monedero debería ser reemplazada con el archivo de monedero encriptado generado recientemente. Por razones de seguridad, las copias de seguridad anteriores del archivo de monedero desencriptado serán inútiles en cuanto empiece a utilizar el nuevo monedero encriptado.</translation>
+    </message>
+    <message>
+        <source>Wallet encryption failed</source>
+        <translation>Fracasó la encriptación de monedero</translation>
+    </message>
+    <message>
+        <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
+        <translation>Falló la encriptación del monedero debido a un error interno. Su monedero no fue encriptado.</translation>
+    </message>
+    <message>
+        <source>The supplied passphrases do not match.</source>
+        <translation>La frase clave introducida no coincide.</translation>
+    </message>
+    <message>
+        <source>Wallet unlock failed</source>
+        <translation>Fracasó el desbloqueo del monedero</translation>
+    </message>
+    <message>
+        <source>The passphrase entered for the wallet decryption was incorrect.</source>
+        <translation>La frase clave introducida para la encriptación del monedero es incorrecta.</translation>
+    </message>
+    <message>
+        <source>Wallet decryption failed</source>
+        <translation>Fracasó la encriptación del monedero</translation>
+    </message>
+    <message>
+        <source>Wallet passphrase was successfully changed.</source>
+        <translation>La frase clave del monedero se ha cambiado con éxito.</translation>
+    </message>
+    <message>
+        <source>Warning: The Caps Lock key is on!</source>
+        <translation>Alerta: ¡La clave de bloqueo Caps está activa!</translation>
     </message>
 </context>
 <context>
     <name>BanTableModel</name>
-    </context>
+    <message>
+        <source>IP/Netmask</source>
+        <translation>IP/Máscara</translation>
+    </message>
+    <message>
+        <source>Banned Until</source>
+        <translation>Bloqueado Hasta</translation>
+    </message>
+</context>
 <context>
     <name>BitcoinGUI</name>
     <message>
@@ -72,7 +239,7 @@
     </message>
     <message>
         <source>Synchronizing with network...</source>
-        <translation>Sincronizando con la red...</translation>
+        <translation>Sincronizando con la red…</translation>
     </message>
     <message>
         <source>&amp;Overview</source>
@@ -84,7 +251,7 @@
     </message>
     <message>
         <source>Show general overview of wallet</source>
-        <translation>Mostrar vista general de la cartera</translation>
+        <translation>Mostrar vista general del monedero</translation>
     </message>
     <message>
         <source>&amp;Transactions</source>
@@ -92,7 +259,7 @@
     </message>
     <message>
         <source>Browse transaction history</source>
-        <translation>Navegar historial de transacciones</translation>
+        <translation>Examinar el historial de transacciones</translation>
     </message>
     <message>
         <source>E&amp;xit</source>
@@ -102,37 +269,49 @@
         <source>Quit application</source>
         <translation>Salir de la aplicación</translation>
     </message>
+    <message>
+        <source>&amp;About %1</source>
+        <translation>&amp;Acerca de %1</translation>
+    </message>
+    <message>
+        <source>Show information about %1</source>
+        <translation>Mostrar información acerca de %1</translation>
+    </message>
     <message>
         <source>About &amp;Qt</source>
         <translation>Acerca de &amp;Qt</translation>
     </message>
     <message>
         <source>Show information about Qt</source>
-        <translation>Muestra información acerca de Qt</translation>
+        <translation>Mostrar información acerca de Qt</translation>
     </message>
     <message>
         <source>&amp;Options...</source>
         <translation>&amp;Opciones...</translation>
     </message>
+    <message>
+        <source>Modify configuration options for %1</source>
+        <translation>Modificar las opciones de configuración para %1</translation>
+    </message>
     <message>
         <source>&amp;Encrypt Wallet...</source>
-        <translation>&amp;Encriptar Cartera...</translation>
+        <translation>&amp;Cifrar monedero…</translation>
     </message>
     <message>
         <source>&amp;Backup Wallet...</source>
-        <translation>&amp;Hacer copia de seguridad de la cartera...</translation>
+        <translation>&amp;Guardar copia del monedero...</translation>
     </message>
     <message>
         <source>&amp;Change Passphrase...</source>
-        <translation>&amp;Cambiar contraseña...</translation>
+        <translation>&amp;Cambiar la contraseña…</translation>
     </message>
     <message>
         <source>&amp;Sending addresses...</source>
-        <translation>&amp;Enviando direcciones...</translation>
+        <translation>Direcciones de &amp;envío...</translation>
     </message>
     <message>
         <source>&amp;Receiving addresses...</source>
-        <translation>&amp;Recibiendo direcciones..</translation>
+        <translation>Direcciones de &amp;recepción...</translation>
     </message>
     <message>
         <source>Open &amp;URI...</source>
@@ -140,93 +319,3312 @@
     </message>
     <message>
         <source>Reindexing blocks on disk...</source>
-        <translation>Reindexando bloques en el disco...</translation>
+        <translation>Reindexando bloques en disco...</translation>
     </message>
     <message>
         <source>Send coins to a Bitcoin address</source>
-        <translation>Envia monedas a una dirección Bitcoin</translation>
+        <translation>Enviar bitcoins a una dirección Bitcoin</translation>
     </message>
     <message>
         <source>Backup wallet to another location</source>
-        <translation>Crea una copia de seguridad de tu cartera en otra ubicación</translation>
+        <translation>Copia de seguridad del monedero en otra ubicación</translation>
+    </message>
+    <message>
+        <source>Change the passphrase used for wallet encryption</source>
+        <translation>Cambiar la contraseña utilizada para el cifrado del monedero</translation>
+    </message>
+    <message>
+        <source>&amp;Debug window</source>
+        <translation>&amp;Ventana de depuración</translation>
+    </message>
+    <message>
+        <source>Open debugging and diagnostic console</source>
+        <translation>Abrir la consola de depuración y diagnóstico</translation>
+    </message>
+    <message>
+        <source>&amp;Verify message...</source>
+        <translation>&amp;Verificar mensaje...</translation>
+    </message>
+    <message>
+        <source>Bitcoin</source>
+        <translation>Bitcoin</translation>
+    </message>
+    <message>
+        <source>Wallet</source>
+        <translation>Monedero</translation>
+    </message>
+    <message>
+        <source>&amp;Send</source>
+        <translation>&amp;Enviar</translation>
+    </message>
+    <message>
+        <source>&amp;Receive</source>
+        <translation>&amp;Recibir</translation>
+    </message>
+    <message>
+        <source>&amp;Show / Hide</source>
+        <translation>&amp;Mostrar / Ocultar</translation>
+    </message>
+    <message>
+        <source>Show or hide the main Window</source>
+        <translation>Mostrar u ocultar la ventana principal</translation>
+    </message>
+    <message>
+        <source>Encrypt the private keys that belong to your wallet</source>
+        <translation>Cifrar las claves privadas de su monedero</translation>
+    </message>
+    <message>
+        <source>Sign messages with your Bitcoin addresses to prove you own them</source>
+        <translation>Firmar mensajes con sus direcciones Bitcoin para demostrar la propiedad</translation>
+    </message>
+    <message>
+        <source>Verify messages to ensure they were signed with specified Bitcoin addresses</source>
+        <translation>Verificar mensajes comprobando que están firmados con direcciones Bitcoin concretas</translation>
+    </message>
+    <message>
+        <source>&amp;File</source>
+        <translation>&amp;Archivo</translation>
+    </message>
+    <message>
+        <source>&amp;Settings</source>
+        <translation>&amp;Configuración</translation>
+    </message>
+    <message>
+        <source>&amp;Help</source>
+        <translation>&amp;Ayuda</translation>
+    </message>
+    <message>
+        <source>Tabs toolbar</source>
+        <translation>Barra de pestañas</translation>
+    </message>
+    <message>
+        <source>Request payments (generates QR codes and bitcoin: URIs)</source>
+        <translation>Solicitar pagos (generando códigos QR e identificadores URI "bitcoin:")</translation>
+    </message>
+    <message>
+        <source>Show the list of used sending addresses and labels</source>
+        <translation>Mostrar la lista de direcciones de envío y etiquetas</translation>
+    </message>
+    <message>
+        <source>Show the list of used receiving addresses and labels</source>
+        <translation>Muestra la lista de direcciones de recepción y etiquetas</translation>
+    </message>
+    <message>
+        <source>Open a bitcoin: URI or payment request</source>
+        <translation>Abrir un identificador URI "bitcoin:" o una petición de pago</translation>
+    </message>
+    <message>
+        <source>&amp;Command-line options</source>
+        <translation>&amp;Opciones de consola de comandos</translation>
+    </message>
+    <message numerus="yes">
+        <source>%n active connection(s) to Bitcoin network</source>
+        <translation><numerusform>%n conexión activa hacia la red Bitcoin</numerusform><numerusform>%n conexiones activas hacia la red Bitcoin</numerusform></translation>
+    </message>
+    <message>
+        <source>Indexing blocks on disk...</source>
+        <translation>Indexando bloques en disco...</translation>
+    </message>
+    <message>
+        <source>Processing blocks on disk...</source>
+        <translation>Procesando bloques en disco...</translation>
+    </message>
+    <message>
+        <source>No block source available...</source>
+        <translation>Ninguna fuente de bloques disponible ...</translation>
+    </message>
+    <message numerus="yes">
+        <source>Processed %n block(s) of transaction history.</source>
+        <translation><numerusform>%n bloque procesado del historial de transacciones.</numerusform><numerusform>%n bloques procesados del historial de transacciones.</numerusform></translation>
+    </message>
+    <message>
+        <source>%1 behind</source>
+        <translation>%1 atrás</translation>
+    </message>
+    <message>
+        <source>Last received block was generated %1 ago.</source>
+        <translation>El último bloque recibido fue generado hace %1.</translation>
+    </message>
+    <message>
+        <source>Transactions after this will not yet be visible.</source>
+        <translation>Las transacciones posteriores aún no están visibles.</translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation>Error</translation>
+    </message>
+    <message>
+        <source>Warning</source>
+        <translation>Aviso</translation>
+    </message>
+    <message>
+        <source>Information</source>
+        <translation>Información</translation>
+    </message>
+    <message>
+        <source>Up to date</source>
+        <translation>Actualizado</translation>
+    </message>
+    <message>
+        <source>Show the %1 help message to get a list with possible Bitcoin command-line options</source>
+        <translation>Mostrar el mensaje de ayuda %1 para obtener una lista de los posibles comandos de linea de comandos de Bitcoin</translation>
+    </message>
+    <message>
+        <source>%1 client</source>
+        <translation>%1 cliente</translation>
+    </message>
+    <message>
+        <source>Catching up...</source>
+        <translation>Actualizando...</translation>
+    </message>
+    <message>
+        <source>Date: %1
+</source>
+        <translation>Fecha: %1
+</translation>
+    </message>
+    <message>
+        <source>Amount: %1
+</source>
+        <translation>Amount: %1
+</translation>
+    </message>
+    <message>
+        <source>Type: %1
+</source>
+        <translation>Tipo: %1
+</translation>
+    </message>
+    <message>
+        <source>Label: %1
+</source>
+        <translation>Etiqueta: %1
+</translation>
+    </message>
+    <message>
+        <source>Address: %1
+</source>
+        <translation>Dirección: %1
+</translation>
+    </message>
+    <message>
+        <source>Sent transaction</source>
+        <translation>Transacción enviada</translation>
+    </message>
+    <message>
+        <source>Incoming transaction</source>
+        <translation>Transacción entrante</translation>
+    </message>
+    <message>
+        <source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;unlocked&lt;/b&gt;</source>
+        <translation>El monedero está &lt;b&gt;cifrado&lt;/b&gt; y actualmente &lt;b&gt;desbloqueado&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;locked&lt;/b&gt;</source>
+        <translation>El monedero está &lt;b&gt;cifrado&lt;/b&gt; y actualmente &lt;b&gt;bloqueado&lt;/b&gt;</translation>
     </message>
     </context>
 <context>
     <name>CoinControlDialog</name>
-    </context>
-<context>
-    <name>EditAddressDialog</name>
     <message>
-        <source>&amp;Label</source>
-        <translation>Etiqueta</translation>
+        <source>Coin Selection</source>
+        <translation>Selección de la moneda</translation>
     </message>
     <message>
-        <source>&amp;Address</source>
-        <translation>Dirección</translation>
+        <source>Quantity:</source>
+        <translation>Cantidad:</translation>
     </message>
-</context>
-<context>
-    <name>FreespaceChecker</name>
-    </context>
-<context>
-    <name>HelpMessageDialog</name>
-    </context>
-<context>
-    <name>Intro</name>
-    </context>
-<context>
-    <name>OpenURIDialog</name>
-    </context>
-<context>
-    <name>OptionsDialog</name>
-    </context>
-<context>
-    <name>OverviewPage</name>
-    </context>
-<context>
-    <name>PeerTableModel</name>
-    </context>
-<context>
-    <name>QObject</name>
-    </context>
-<context>
-    <name>RPCConsole</name>
-    </context>
-<context>
-    <name>ReceiveCoinsDialog</name>
-    </context>
-<context>
-    <name>ReceiveRequestDialog</name>
     <message>
-        <source>Copy &amp;Address</source>
-        <translation>&amp;Copiar Direccón</translation>
+        <source>Bytes:</source>
+        <translation>Bytes:</translation>
     </message>
-    </context>
-<context>
-    <name>SendCoinsDialog</name>
-    </context>
-<context>
-    <name>SendCoinsEntry</name>
-    </context>
-<context>
-    <name>ShutdownWindow</name>
-    </context>
-<context>
-    <name>SignVerifyMessageDialog</name>
-    </context>
-<context>
-    <name>SplashScreen</name>
-    </context>
-<context>
-    <name>TrafficGraphWidget</name>
-    </context>
-<context>
-    <name>TransactionDescDialog</name>
-    </context>
-<context>
-    <name>UnitDisplayStatusBarControl</name>
-    </context>
-<context>
-    <name>bitcoin-core</name>
-    </context>
+    <message>
+        <source>Amount:</source>
+        <translation>Cuantía:</translation>
+    </message>
+    <message>
+        <source>Fee:</source>
+        <translation>Tasa:</translation>
+    </message>
+    <message>
+        <source>Dust:</source>
+        <translation>Polvo:</translation>
+    </message>
+    <message>
+        <source>After Fee:</source>
+        <translation>Después de aplicar la comisión:</translation>
+    </message>
+    <message>
+        <source>Change:</source>
+        <translation>Cambio:</translation>
+    </message>
+    <message>
+        <source>(un)select all</source>
+        <translation>(des)marcar todos</translation>
+    </message>
+    <message>
+        <source>Tree mode</source>
+        <translation>Modo árbol</translation>
+    </message>
+    <message>
+        <source>List mode</source>
+        <translation>Modo lista</translation>
+    </message>
+    <message>
+        <source>Amount</source>
+        <translation>Cantidad</translation>
+    </message>
+    <message>
+        <source>Received with label</source>
+        <translation>Recibido con etiqueta</translation>
+    </message>
+    <message>
+        <source>Received with address</source>
+        <translation>Recibido con dirección</translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation>Fecha</translation>
+    </message>
+    <message>
+        <source>Confirmations</source>
+        <translation>Confirmaciones</translation>
+    </message>
+    <message>
+        <source>Confirmed</source>
+        <translation>Confirmado</translation>
+    </message>
+    <message>
+        <source>Copy address</source>
+        <translation>Copiar ubicación</translation>
+    </message>
+    <message>
+        <source>Copy label</source>
+        <translation>Copiar etiqueta</translation>
+    </message>
+    <message>
+        <source>Copy amount</source>
+        <translation>Copiar cantidad</translation>
+    </message>
+    <message>
+        <source>Copy transaction ID</source>
+        <translation>Copiar ID de transacción</translation>
+    </message>
+    <message>
+        <source>Lock unspent</source>
+        <translation>Bloquear lo no gastado</translation>
+    </message>
+    <message>
+        <source>Unlock unspent</source>
+        <translation>Desbloquear lo no gastado</translation>
+    </message>
+    <message>
+        <source>Copy quantity</source>
+        <translation>Copiar cantidad</translation>
+    </message>
+    <message>
+        <source>Copy fee</source>
+        <translation>Copiar cuota</translation>
+    </message>
+    <message>
+        <source>Copy after fee</source>
+        <translation>Copiar después de couta</translation>
+    </message>
+    <message>
+        <source>Copy bytes</source>
+        <translation>Copiar bytes</translation>
+    </message>
+    <message>
+        <source>Copy dust</source>
+        <translation>Copiar polvo</translation>
+    </message>
+    <message>
+        <source>Copy change</source>
+        <translation>Copiar cambio</translation>
+    </message>
+    <message>
+        <source>(%1 locked)</source>
+        <translation>(%1 bloqueado)</translation>
+    </message>
+    <message>
+        <source>yes</source>
+        <translation>sí</translation>
+    </message>
+    <message>
+        <source>no</source>
+        <translation>no</translation>
+    </message>
+    <message>
+        <source>This label turns red if any recipient receives an amount smaller than the current dust threshold.</source>
+        <translation>Esta etiqueta se vuelve roja si algún destinatario recibe una cantidad inferior a la actual puerta polvorienta.</translation>
+    </message>
+    <message>
+        <source>Can vary +/- %1 satoshi(s) per input.</source>
+        <translation>Puede variar +/- %1 satoshi(s) por entrada.</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(sin etiqueta)</translation>
+    </message>
+    <message>
+        <source>change from %1 (%2)</source>
+        <translation>cambia desde %1 (%2)</translation>
+    </message>
+    <message>
+        <source>(change)</source>
+        <translation>(cambio)</translation>
+    </message>
+</context>
+<context>
+    <name>EditAddressDialog</name>
+    <message>
+        <source>Edit Address</source>
+        <translation>Editar Dirección</translation>
+    </message>
+    <message>
+        <source>&amp;Label</source>
+        <translation>&amp;Etiqueta</translation>
+    </message>
+    <message>
+        <source>The label associated with this address list entry</source>
+        <translation>La etiqueta asociada con esta entrada de la lista de direcciones</translation>
+    </message>
+    <message>
+        <source>The address associated with this address list entry. This can only be modified for sending addresses.</source>
+        <translation>La dirección asociada con esta entrada de la lista de direcciones. Solo puede ser modificada para direcciones de envío.</translation>
+    </message>
+    <message>
+        <source>&amp;Address</source>
+        <translation>&amp;Dirección</translation>
+    </message>
+    <message>
+        <source>New receiving address</source>
+        <translation>Nueva dirección de recivimiento</translation>
+    </message>
+    <message>
+        <source>New sending address</source>
+        <translation>Nueva dirección de envío</translation>
+    </message>
+    <message>
+        <source>Edit receiving address</source>
+        <translation>Editar dirección de recivimiento</translation>
+    </message>
+    <message>
+        <source>Edit sending address</source>
+        <translation>Editar dirección de envío</translation>
+    </message>
+    <message>
+        <source>The entered address "%1" is not a valid Bitcoin address.</source>
+        <translation>La dirección introducida "%1" no es una dirección Bitcoin válida.</translation>
+    </message>
+    <message>
+        <source>The entered address "%1" is already in the address book.</source>
+        <translation>La dirección introducida "%1" está ya en la agenda.</translation>
+    </message>
+    <message>
+        <source>Could not unlock wallet.</source>
+        <translation>Podría no desbloquear el monedero.</translation>
+    </message>
+    <message>
+        <source>New key generation failed.</source>
+        <translation>Falló la generación de la nueva clave.</translation>
+    </message>
+</context>
+<context>
+    <name>FreespaceChecker</name>
+    <message>
+        <source>A new data directory will be created.</source>
+        <translation>Se creará un nuevo directorio de datos.</translation>
+    </message>
+    <message>
+        <source>name</source>
+        <translation>nombre</translation>
+    </message>
+    <message>
+        <source>Directory already exists. Add %1 if you intend to create a new directory here.</source>
+        <translation>El directorio ya existe. Añada %1 si pretende crear aquí un directorio nuevo.</translation>
+    </message>
+    <message>
+        <source>Path already exists, and is not a directory.</source>
+        <translation>La ruta ya existe y no es un directorio.</translation>
+    </message>
+    <message>
+        <source>Cannot create data directory here.</source>
+        <translation>No se puede crear un directorio de datos aquí.</translation>
+    </message>
+</context>
+<context>
+    <name>HelpMessageDialog</name>
+    <message>
+        <source>version</source>
+        <translation>versión</translation>
+    </message>
+    <message>
+        <source>(%1-bit)</source>
+        <translation>(%1-bit)</translation>
+    </message>
+    <message>
+        <source>About %1</source>
+        <translation>Acerda de %1</translation>
+    </message>
+    <message>
+        <source>Command-line options</source>
+        <translation>Opciones de la línea de órdenes</translation>
+    </message>
+    <message>
+        <source>Usage:</source>
+        <translation>Uso:</translation>
+    </message>
+    <message>
+        <source>command-line options</source>
+        <translation>opciones de la consola de comandos</translation>
+    </message>
+    <message>
+        <source>UI Options:</source>
+        <translation>Opciones de interfaz de usuario:</translation>
+    </message>
+    <message>
+        <source>Choose data directory on startup (default: %u)</source>
+        <translation>Elegir directorio de datos al iniciar (predeterminado: %u)</translation>
+    </message>
+    <message>
+        <source>Set language, for example "de_DE" (default: system locale)</source>
+        <translation>Establecer el idioma, por ejemplo, "es_ES" (predeterminado: configuración regional del sistema)</translation>
+    </message>
+    <message>
+        <source>Start minimized</source>
+        <translation>Arrancar minimizado</translation>
+    </message>
+    <message>
+        <source>Set SSL root certificates for payment request (default: -system-)</source>
+        <translation>Establecer los certificados raíz SSL para solicitudes de pago (predeterminado: -system-)</translation>
+    </message>
+    <message>
+        <source>Show splash screen on startup (default: %u)</source>
+        <translation>Mostrar pantalla de bienvenida en el inicio (predeterminado: %u)</translation>
+    </message>
+    <message>
+        <source>Reset all settings changed in the GUI</source>
+        <translation>Reiniciar todos los ajustes modificados en el GUI</translation>
+    </message>
+</context>
+<context>
+    <name>Intro</name>
+    <message>
+        <source>Welcome</source>
+        <translation>Bienvenido</translation>
+    </message>
+    <message>
+        <source>Welcome to %1.</source>
+        <translation>Bienvenido a %1</translation>
+    </message>
+    <message>
+        <source>As this is the first time the program is launched, you can choose where %1 will store its data.</source>
+        <translation>Al ser la primera vez que se ejecuta el programa, puede elegir donde %1 almacenara sus datos</translation>
+    </message>
+    <message>
+        <source>%1 will download and store a copy of the Bitcoin block chain. At least %2GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source>
+        <translation>%1 va a descargar y almacenar una copia de la cadena de bloques de Bitcoin. Al menos %2GB de datos seran almacenados en este directorio, que ira creciendo con el tiempo. El monedero se guardara tambien en ese directorio. </translation>
+    </message>
+    <message>
+        <source>Use the default data directory</source>
+        <translation>Utilizar el directorio de datos predeterminado</translation>
+    </message>
+    <message>
+        <source>Use a custom data directory:</source>
+        <translation>Utilizar un directorio de datos personalizado:</translation>
+    </message>
+    <message>
+        <source>Error: Specified data directory "%1" cannot be created.</source>
+        <translation>Error: no ha podido crearse el directorio de datos especificado "%1".</translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation>Error</translation>
+    </message>
+    <message numerus="yes">
+        <source>%n GB of free space available</source>
+        <translation><numerusform>%n GB de espacio libre</numerusform><numerusform>%n GB de espacio disponible</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>(of %n GB needed)</source>
+        <translation><numerusform>(de %n GB necesitados)</numerusform><numerusform>(de %n GB requeridos)</numerusform></translation>
+    </message>
+</context>
+<context>
+    <name>ModalOverlay</name>
+    <message>
+        <source>Form</source>
+        <translation>Formulario</translation>
+    </message>
+    <message>
+        <source>Last block time</source>
+        <translation>Hora del último bloque</translation>
+    </message>
+    <message>
+        <source>Hide</source>
+        <translation>Ocultar</translation>
+    </message>
+    </context>
+<context>
+    <name>OpenURIDialog</name>
+    <message>
+        <source>Open URI</source>
+        <translation>Abrir URI...</translation>
+    </message>
+    <message>
+        <source>Open payment request from URI or file</source>
+        <translation>Abrir solicitud de pago a partir de un identificador URI o de un archivo</translation>
+    </message>
+    <message>
+        <source>URI:</source>
+        <translation>URI:</translation>
+    </message>
+    <message>
+        <source>Select payment request file</source>
+        <translation>Seleccionar archivo de sulicitud de pago</translation>
+    </message>
+    <message>
+        <source>Select payment request file to open</source>
+        <translation>Seleccionar el archivo de solicitud de pago para abrir</translation>
+    </message>
+</context>
+<context>
+    <name>OptionsDialog</name>
+    <message>
+        <source>Options</source>
+        <translation>Opciones</translation>
+    </message>
+    <message>
+        <source>&amp;Main</source>
+        <translation>&amp;Principal</translation>
+    </message>
+    <message>
+        <source>Automatically start %1 after logging in to the system.</source>
+        <translation>Iniciar automaticamente  %1 al encender el sistema.</translation>
+    </message>
+    <message>
+        <source>&amp;Start %1 on system login</source>
+        <translation>&amp;Iniciar %1 al iniciar el sistema</translation>
+    </message>
+    <message>
+        <source>Size of &amp;database cache</source>
+        <translation>Tamaño de cache de la &amp;base de datos</translation>
+    </message>
+    <message>
+        <source>MB</source>
+        <translation>MB</translation>
+    </message>
+    <message>
+        <source>Number of script &amp;verification threads</source>
+        <translation>Número de hilos de &amp;verificación de scripts</translation>
+    </message>
+    <message>
+        <source>Accept connections from outside</source>
+        <translation>Aceptar conexiones desde el exterior</translation>
+    </message>
+    <message>
+        <source>Allow incoming connections</source>
+        <translation>Aceptar conexiones entrantes</translation>
+    </message>
+    <message>
+        <source>IP address of the proxy (e.g. IPv4: 127.0.0.1 / IPv6: ::1)</source>
+        <translation>Dirección IP del proxy (p. ej. IPv4: 127.0.0.1 / IPv6: ::1)</translation>
+    </message>
+    <message>
+        <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Exit in the menu.</source>
+        <translation>Minimizar en lugar de salir de la aplicación cuando la ventana está cerrada. Cuando se activa esta opción, la aplicación sólo se cerrará después de seleccionar Salir en el menú.</translation>
+    </message>
+    <message>
+        <source>Third party URLs (e.g. a block explorer) that appear in the transactions tab as context menu items. %s in the URL is replaced by transaction hash. Multiple URLs are separated by vertical bar |.</source>
+        <translation>Identificadores URL de terceros (por ejemplo, un explorador de bloques) que aparecen en la pestaña de transacciones como elementos del menú contextual. El %s en la URL es reemplazado por el valor hash de la transacción. Se pueden separar URL múltiples por una barra vertical |.</translation>
+    </message>
+    <message>
+        <source>Third party transaction URLs</source>
+        <translation>Identificadores URL de transacciones de terceros</translation>
+    </message>
+    <message>
+        <source>Active command-line options that override above options:</source>
+        <translation>Opciones activas de consola de comandos que tienen preferencia sobre las opciones anteriores:</translation>
+    </message>
+    <message>
+        <source>Reset all client options to default.</source>
+        <translation>Restablecer todas las opciones predeterminadas del cliente.</translation>
+    </message>
+    <message>
+        <source>&amp;Reset Options</source>
+        <translation>&amp;Restablecer opciones</translation>
+    </message>
+    <message>
+        <source>&amp;Network</source>
+        <translation>&amp;Red</translation>
+    </message>
+    <message>
+        <source>(0 = auto, &lt;0 = leave that many cores free)</source>
+        <translation>(0 = automático, &lt;0 = dejar libres ese número de núcleos)</translation>
+    </message>
+    <message>
+        <source>W&amp;allet</source>
+        <translation>&amp;Monedero</translation>
+    </message>
+    <message>
+        <source>Expert</source>
+        <translation>Experto</translation>
+    </message>
+    <message>
+        <source>Enable coin &amp;control features</source>
+        <translation>Habilitar funcionalidad de &amp;coin control</translation>
+    </message>
+    <message>
+        <source>If you disable the spending of unconfirmed change, the change from a transaction cannot be used until that transaction has at least one confirmation. This also affects how your balance is computed.</source>
+        <translation>Si desactiva el gasto del cambio no confirmado, no se podrá usar el cambio de una transacción hasta que se alcance al menos una confirmación. Esto afecta también a cómo se calcula su saldo.</translation>
+    </message>
+    <message>
+        <source>&amp;Spend unconfirmed change</source>
+        <translation>&amp;Gastar cambio no confirmado</translation>
+    </message>
+    <message>
+        <source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source>
+        <translation>Abrir automáticamente el puerto del cliente Bitcoin en el router. Esta opción solo funciona si el router admite UPnP y está activado.</translation>
+    </message>
+    <message>
+        <source>Map port using &amp;UPnP</source>
+        <translation>Mapear el puerto mediante &amp;UPnP</translation>
+    </message>
+    <message>
+        <source>Connect to the Bitcoin network through a SOCKS5 proxy.</source>
+        <translation>Conectarse a la red Bitcoin a través de un proxy SOCKS5.</translation>
+    </message>
+    <message>
+        <source>&amp;Connect through SOCKS5 proxy (default proxy):</source>
+        <translation>&amp;Conectarse a través de proxy SOCKS5 (proxy predeterminado):</translation>
+    </message>
+    <message>
+        <source>Proxy &amp;IP:</source>
+        <translation>Dirección &amp;IP del proxy:</translation>
+    </message>
+    <message>
+        <source>&amp;Port:</source>
+        <translation>&amp;Puerto:</translation>
+    </message>
+    <message>
+        <source>Port of the proxy (e.g. 9050)</source>
+        <translation>Puerto del servidor proxy (ej. 9050)</translation>
+    </message>
+    <message>
+        <source>Used for reaching peers via:</source>
+        <translation>Usado para alcanzar compañeros via:</translation>
+    </message>
+    <message>
+        <source>Shows, if the supplied default SOCKS5 proxy is used to reach peers via this network type.</source>
+        <translation>Muestra si el proxy SOCKS5 predeterminado es utilizado para llegar a los pares a traves de este tipo de red.</translation>
+    </message>
+    <message>
+        <source>IPv4</source>
+        <translation>IPv4</translation>
+    </message>
+    <message>
+        <source>IPv6</source>
+        <translation>IPv6</translation>
+    </message>
+    <message>
+        <source>Tor</source>
+        <translation>Tor</translation>
+    </message>
+    <message>
+        <source>Connect to the Bitcoin network through a separate SOCKS5 proxy for Tor hidden services.</source>
+        <translation>Conectar a la red Bitcoin mediante un proxy SOCKS5 por separado para los servicios ocultos de Tor.</translation>
+    </message>
+    <message>
+        <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services:</source>
+        <translation>Usar distintos proxys SOCKS5 para comunicarse vía Tor de forma anónima:</translation>
+    </message>
+    <message>
+        <source>&amp;Window</source>
+        <translation>&amp;Ventana</translation>
+    </message>
+    <message>
+        <source>&amp;Hide the icon from the system tray.</source>
+        <translation>&amp;Ocultar el icono de la barra de tareas</translation>
+    </message>
+    <message>
+        <source>Hide tray icon</source>
+        <translation>Ocultar barra de tareas</translation>
+    </message>
+    <message>
+        <source>Show only a tray icon after minimizing the window.</source>
+        <translation>Minimizar la ventana a la bandeja de iconos del sistema.</translation>
+    </message>
+    <message>
+        <source>&amp;Minimize to the tray instead of the taskbar</source>
+        <translation>&amp;Minimizar a la bandeja en vez de a la barra de tareas</translation>
+    </message>
+    <message>
+        <source>M&amp;inimize on close</source>
+        <translation>M&amp;inimizar al cerrar</translation>
+    </message>
+    <message>
+        <source>&amp;Display</source>
+        <translation>&amp;Interfaz</translation>
+    </message>
+    <message>
+        <source>User Interface &amp;language:</source>
+        <translation>I&amp;dioma de la interfaz de usuario</translation>
+    </message>
+    <message>
+        <source>The user interface language can be set here. This setting will take effect after restarting %1.</source>
+        <translation>El idioma de la interfaz de usuario puede establecerse aquí. Esta configuración tendrá efecto tras reiniciar %1.</translation>
+    </message>
+    <message>
+        <source>&amp;Unit to show amounts in:</source>
+        <translation>Mostrar las cantidades en la &amp;unidad:</translation>
+    </message>
+    <message>
+        <source>Choose the default subdivision unit to show in the interface and when sending coins.</source>
+        <translation>Elegir la subdivisión predeterminada para mostrar cantidades en la interfaz y cuando se envían bitcoins.</translation>
+    </message>
+    <message>
+        <source>Whether to show coin control features or not.</source>
+        <translation>Mostrar o no funcionalidad de Coin Control</translation>
+    </message>
+    <message>
+        <source>&amp;OK</source>
+        <translation>&amp;Aceptar</translation>
+    </message>
+    <message>
+        <source>&amp;Cancel</source>
+        <translation>&amp;Cancelar</translation>
+    </message>
+    <message>
+        <source>default</source>
+        <translation>predeterminado</translation>
+    </message>
+    <message>
+        <source>none</source>
+        <translation>ninguna</translation>
+    </message>
+    <message>
+        <source>Confirm options reset</source>
+        <translation>Confirme el restablecimiento de las opciones</translation>
+    </message>
+    <message>
+        <source>Client restart required to activate changes.</source>
+        <translation>Se necesita reiniciar el cliente para activar los cambios.</translation>
+    </message>
+    <message>
+        <source>Client will be shut down. Do you want to proceed?</source>
+        <translation>El cliente se cerrará. ¿Desea continuar?</translation>
+    </message>
+    <message>
+        <source>This change would require a client restart.</source>
+        <translation>Este cambio exige el reinicio del cliente.</translation>
+    </message>
+    <message>
+        <source>The supplied proxy address is invalid.</source>
+        <translation>La dirección proxy indicada es inválida.</translation>
+    </message>
+</context>
+<context>
+    <name>OverviewPage</name>
+    <message>
+        <source>Form</source>
+        <translation>Formulario</translation>
+    </message>
+    <message>
+        <source>The displayed information may be out of date. Your wallet automatically synchronizes with the Bitcoin network after a connection is established, but this process has not completed yet.</source>
+        <translation>La información mostrada puede estar desactualizada. Su monedero se sincroniza automáticamente con la red Bitcoin después de que se haya establecido una conexión, pero este proceso aún no se ha completado.</translation>
+    </message>
+    <message>
+        <source>Watch-only:</source>
+        <translation>De observación:</translation>
+    </message>
+    <message>
+        <source>Available:</source>
+        <translation>Disponible:</translation>
+    </message>
+    <message>
+        <source>Your current spendable balance</source>
+        <translation>Su saldo disponible actual</translation>
+    </message>
+    <message>
+        <source>Pending:</source>
+        <translation>Pendiente:</translation>
+    </message>
+    <message>
+        <source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source>
+        <translation>Total de transacciones pendientes de confirmar y que aún no contribuye al saldo disponible</translation>
+    </message>
+    <message>
+        <source>Immature:</source>
+        <translation>No madurado:</translation>
+    </message>
+    <message>
+        <source>Mined balance that has not yet matured</source>
+        <translation>Saldo recién minado que aún no ha madurado.</translation>
+    </message>
+    <message>
+        <source>Balances</source>
+        <translation>Saldos</translation>
+    </message>
+    <message>
+        <source>Total:</source>
+        <translation>Total:</translation>
+    </message>
+    <message>
+        <source>Your current total balance</source>
+        <translation>Su saldo actual total</translation>
+    </message>
+    <message>
+        <source>Your current balance in watch-only addresses</source>
+        <translation>Su saldo actual en direcciones watch-only</translation>
+    </message>
+    <message>
+        <source>Spendable:</source>
+        <translation>Gastable:</translation>
+    </message>
+    <message>
+        <source>Recent transactions</source>
+        <translation>Transacciones recientes</translation>
+    </message>
+    <message>
+        <source>Unconfirmed transactions to watch-only addresses</source>
+        <translation>Transacciones sin confirmar en direcciones watch-only</translation>
+    </message>
+    <message>
+        <source>Mined balance in watch-only addresses that has not yet matured</source>
+        <translation>Saldo minado en direcciones watch-only que aún no ha madurado</translation>
+    </message>
+    <message>
+        <source>Current total balance in watch-only addresses</source>
+        <translation>Saldo total en las direcciones watch-only</translation>
+    </message>
+</context>
+<context>
+    <name>PaymentServer</name>
+    <message>
+        <source>Payment request error</source>
+        <translation>Fallo en la solicitud de pago</translation>
+    </message>
+    <message>
+        <source>Cannot start bitcoin: click-to-pay handler</source>
+        <translation>No se puede iniciar bitcoin: encargado click-para-pagar</translation>
+    </message>
+    <message>
+        <source>URI handling</source>
+        <translation>Manejo de URI</translation>
+    </message>
+    <message>
+        <source>Payment request fetch URL is invalid: %1</source>
+        <translation>La búsqueda de solicitud de pago URL es válida: %1</translation>
+    </message>
+    <message>
+        <source>Invalid payment address %1</source>
+        <translation>Dirección de pago inválida %1</translation>
+    </message>
+    <message>
+        <source>URI cannot be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source>
+        <translation>URI no puede ser analizado! Esto puede ser causado por una dirección Bitcoin inválida o parametros URI mal formados.</translation>
+    </message>
+    <message>
+        <source>Payment request file handling</source>
+        <translation>Manejo del archivo de solicitud de pago</translation>
+    </message>
+    <message>
+        <source>Payment request file cannot be read! This can be caused by an invalid payment request file.</source>
+        <translation>¡El archivo de solicitud de pago no puede ser leído! Esto puede ser causado por un archivo de solicitud de pago inválido.</translation>
+    </message>
+    <message>
+        <source>Payment request rejected</source>
+        <translation>Solicitud de pago rechazada</translation>
+    </message>
+    <message>
+        <source>Payment request network doesn't match client network.</source>
+        <translation>La red de solicitud de pago no cimbina la red cliente.</translation>
+    </message>
+    <message>
+        <source>Payment request expired.</source>
+        <translation>Solicitud de pago caducada.</translation>
+    </message>
+    <message>
+        <source>Payment request is not initialized.</source>
+        <translation>La solicitud de pago no se ha iniciado.</translation>
+    </message>
+    <message>
+        <source>Unverified payment requests to custom payment scripts are unsupported.</source>
+        <translation>Solicitudes de pago sin verificar a scripts de pago habitual no se soportan.</translation>
+    </message>
+    <message>
+        <source>Invalid payment request.</source>
+        <translation>Solicitud de pago inválida.</translation>
+    </message>
+    <message>
+        <source>Requested payment amount of %1 is too small (considered dust).</source>
+        <translation>Cantidad de pago solicitada de %1 es demasiado pequeña (considerado polvo).</translation>
+    </message>
+    <message>
+        <source>Refund from %1</source>
+        <translation>Reembolsar desde %1</translation>
+    </message>
+    <message>
+        <source>Payment request %1 is too large (%2 bytes, allowed %3 bytes).</source>
+        <translation>Solicitud de pago de %1 es demasiado grande (%2 bytes, permitidos %3 bytes).</translation>
+    </message>
+    <message>
+        <source>Error communicating with %1: %2</source>
+        <translation>Fallo al comunicar con %1: %2</translation>
+    </message>
+    <message>
+        <source>Payment request cannot be parsed!</source>
+        <translation>¡La solicitud de pago no puede ser analizada!</translation>
+    </message>
+    <message>
+        <source>Bad response from server %1</source>
+        <translation>Mala respuesta desde el servidor %1</translation>
+    </message>
+    <message>
+        <source>Network request error</source>
+        <translation>Fallo de solicitud de red</translation>
+    </message>
+    <message>
+        <source>Payment acknowledged</source>
+        <translation>Pago declarado</translation>
+    </message>
+</context>
+<context>
+    <name>PeerTableModel</name>
+    <message>
+        <source>User Agent</source>
+        <translation>User Agent</translation>
+    </message>
+    <message>
+        <source>Node/Service</source>
+        <translation>Nodo/Servicio</translation>
+    </message>
+    </context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Amount</source>
+        <translation>Cantidad</translation>
+    </message>
+    <message>
+        <source>Enter a Bitcoin address (e.g. %1)</source>
+        <translation>Introducir una dirección Bitcoin (p. ej. %1)</translation>
+    </message>
+    <message>
+        <source>%1 d</source>
+        <translation>%1 d</translation>
+    </message>
+    <message>
+        <source>%1 h</source>
+        <translation>%1 h</translation>
+    </message>
+    <message>
+        <source>%1 m</source>
+        <translation>%1 m</translation>
+    </message>
+    <message>
+        <source>%1 s</source>
+        <translation>%1 s</translation>
+    </message>
+    <message>
+        <source>None</source>
+        <translation>Ninguno</translation>
+    </message>
+    <message>
+        <source>N/A</source>
+        <translation>N/D</translation>
+    </message>
+    <message>
+        <source>%1 ms</source>
+        <translation>%1 ms</translation>
+    </message>
+    <message>
+        <source>%1 and %2</source>
+        <translation>%1 y %2</translation>
+    </message>
+    </context>
+<context>
+    <name>QObject::QObject</name>
+    </context>
+<context>
+    <name>QRImageWidget</name>
+    <message>
+        <source>&amp;Save Image...</source>
+        <translation>&amp;Guardar imagen...</translation>
+    </message>
+    <message>
+        <source>&amp;Copy Image</source>
+        <translation>&amp;Copiar imagen</translation>
+    </message>
+    <message>
+        <source>Save QR Code</source>
+        <translation>Guardar código QR</translation>
+    </message>
+    <message>
+        <source>PNG Image (*.png)</source>
+        <translation>Imagen PNG (*.png)</translation>
+    </message>
+</context>
+<context>
+    <name>RPCConsole</name>
+    <message>
+        <source>N/A</source>
+        <translation>N/D</translation>
+    </message>
+    <message>
+        <source>Client version</source>
+        <translation>Versión del cliente</translation>
+    </message>
+    <message>
+        <source>&amp;Information</source>
+        <translation>&amp;Información</translation>
+    </message>
+    <message>
+        <source>Debug window</source>
+        <translation>Ventana de depuración</translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>General</translation>
+    </message>
+    <message>
+        <source>Using BerkeleyDB version</source>
+        <translation>Utilizando la versión de BerkeleyDB</translation>
+    </message>
+    <message>
+        <source>Datadir</source>
+        <translation>Datadir</translation>
+    </message>
+    <message>
+        <source>Startup time</source>
+        <translation>Hora de inicio</translation>
+    </message>
+    <message>
+        <source>Network</source>
+        <translation>Red</translation>
+    </message>
+    <message>
+        <source>Name</source>
+        <translation>Nombre</translation>
+    </message>
+    <message>
+        <source>Number of connections</source>
+        <translation>Número de conexiones</translation>
+    </message>
+    <message>
+        <source>Block chain</source>
+        <translation>Cadena de bloques</translation>
+    </message>
+    <message>
+        <source>Current number of blocks</source>
+        <translation>Número actual de bloques</translation>
+    </message>
+    <message>
+        <source>Memory Pool</source>
+        <translation>Piscina de Memoria</translation>
+    </message>
+    <message>
+        <source>Current number of transactions</source>
+        <translation>Número actual de transacciones</translation>
+    </message>
+    <message>
+        <source>Memory usage</source>
+        <translation>Uso de memoria</translation>
+    </message>
+    <message>
+        <source>Received</source>
+        <translation>Recibido</translation>
+    </message>
+    <message>
+        <source>Sent</source>
+        <translation>Enviado</translation>
+    </message>
+    <message>
+        <source>&amp;Peers</source>
+        <translation>&amp;Pares</translation>
+    </message>
+    <message>
+        <source>Banned peers</source>
+        <translation>Peers Bloqueados</translation>
+    </message>
+    <message>
+        <source>Select a peer to view detailed information.</source>
+        <translation>Seleccionar un par para ver su información detallada.</translation>
+    </message>
+    <message>
+        <source>Whitelisted</source>
+        <translation>En la lista blanca</translation>
+    </message>
+    <message>
+        <source>Direction</source>
+        <translation>Dirección</translation>
+    </message>
+    <message>
+        <source>Version</source>
+        <translation>Versión</translation>
+    </message>
+    <message>
+        <source>Starting Block</source>
+        <translation>Importando bloques...</translation>
+    </message>
+    <message>
+        <source>Synced Headers</source>
+        <translation>Sincronizar Cabeceras</translation>
+    </message>
+    <message>
+        <source>Synced Blocks</source>
+        <translation>Bloques Sincronizados</translation>
+    </message>
+    <message>
+        <source>User Agent</source>
+        <translation>User Agent</translation>
+    </message>
+    <message>
+        <source>Open the %1 debug log file from the current data directory. This can take a few seconds for large log files.</source>
+        <translation>Abrir el archivo de depuración %1 desde el directorio de datos actual. Puede tardar unos segundos para ficheros de gran tamaño.</translation>
+    </message>
+    <message>
+        <source>Decrease font size</source>
+        <translation>Disminuir tamaño de letra</translation>
+    </message>
+    <message>
+        <source>Increase font size</source>
+        <translation>Aumentar tamaño de letra</translation>
+    </message>
+    <message>
+        <source>Services</source>
+        <translation>Servicios</translation>
+    </message>
+    <message>
+        <source>Ban Score</source>
+        <translation>Puntuación de bloqueo</translation>
+    </message>
+    <message>
+        <source>Connection Time</source>
+        <translation>Duración de la conexión</translation>
+    </message>
+    <message>
+        <source>Last Send</source>
+        <translation>Ultimo envío</translation>
+    </message>
+    <message>
+        <source>Last Receive</source>
+        <translation>Ultima recepción</translation>
+    </message>
+    <message>
+        <source>Ping Time</source>
+        <translation>Ping</translation>
+    </message>
+    <message>
+        <source>The duration of a currently outstanding ping.</source>
+        <translation>La duración de un ping actualmente en proceso.</translation>
+    </message>
+    <message>
+        <source>Ping Wait</source>
+        <translation>Espera de Ping</translation>
+    </message>
+    <message>
+        <source>Time Offset</source>
+        <translation>Desplazamiento de tiempo</translation>
+    </message>
+    <message>
+        <source>Last block time</source>
+        <translation>Hora del último bloque</translation>
+    </message>
+    <message>
+        <source>&amp;Open</source>
+        <translation>&amp;Abrir</translation>
+    </message>
+    <message>
+        <source>&amp;Console</source>
+        <translation>&amp;Consola</translation>
+    </message>
+    <message>
+        <source>&amp;Network Traffic</source>
+        <translation>&amp;Tráfico de Red</translation>
+    </message>
+    <message>
+        <source>&amp;Clear</source>
+        <translation>&amp;Vaciar</translation>
+    </message>
+    <message>
+        <source>Totals</source>
+        <translation>Total:</translation>
+    </message>
+    <message>
+        <source>In:</source>
+        <translation>Entrante:</translation>
+    </message>
+    <message>
+        <source>Out:</source>
+        <translation>Saliente:</translation>
+    </message>
+    <message>
+        <source>Debug log file</source>
+        <translation>Archivo de registro de depuración</translation>
+    </message>
+    <message>
+        <source>Clear console</source>
+        <translation>Borrar consola</translation>
+    </message>
+    <message>
+        <source>1 &amp;hour</source>
+        <translation>1 &amp;hora</translation>
+    </message>
+    <message>
+        <source>1 &amp;day</source>
+        <translation>1 &amp;día</translation>
+    </message>
+    <message>
+        <source>1 &amp;week</source>
+        <translation>1 &amp;semana</translation>
+    </message>
+    <message>
+        <source>1 &amp;year</source>
+        <translation>1 &amp;año</translation>
+    </message>
+    <message>
+        <source>Welcome to the %1 RPC console.</source>
+        <translation>Bienvenido a la consola RPC %1.</translation>
+    </message>
+    <message>
+        <source>Use up and down arrows to navigate history, and &lt;b&gt;Ctrl-L&lt;/b&gt; to clear screen.</source>
+        <translation>Use las flechas arriba y abajo para navegar por el historial y &lt;b&gt;Control+L&lt;/b&gt; para vaciar la pantalla.</translation>
+    </message>
+    <message>
+        <source>Type &lt;b&gt;help&lt;/b&gt; for an overview of available commands.</source>
+        <translation>Escriba &lt;b&gt;help&lt;/b&gt; para ver un resumen de los comandos disponibles.</translation>
+    </message>
+    <message>
+        <source>%1 B</source>
+        <translation>%1 B</translation>
+    </message>
+    <message>
+        <source>%1 KB</source>
+        <translation>%1 KB</translation>
+    </message>
+    <message>
+        <source>%1 MB</source>
+        <translation>%1 MB</translation>
+    </message>
+    <message>
+        <source>%1 GB</source>
+        <translation>%1 GB</translation>
+    </message>
+    <message>
+        <source>(node id: %1)</source>
+        <translation>(nodo: %1)</translation>
+    </message>
+    <message>
+        <source>via %1</source>
+        <translation>via %1</translation>
+    </message>
+    <message>
+        <source>never</source>
+        <translation>nunca</translation>
+    </message>
+    <message>
+        <source>Inbound</source>
+        <translation>Entrante</translation>
+    </message>
+    <message>
+        <source>Outbound</source>
+        <translation>Saliente</translation>
+    </message>
+    <message>
+        <source>Yes</source>
+        <translation>Sí</translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation>No</translation>
+    </message>
+    <message>
+        <source>Unknown</source>
+        <translation>Desconocido</translation>
+    </message>
+</context>
+<context>
+    <name>ReceiveCoinsDialog</name>
+    <message>
+        <source>&amp;Amount:</source>
+        <translation>Cantidad</translation>
+    </message>
+    <message>
+        <source>&amp;Label:</source>
+        <translation>&amp;Etiqueta:</translation>
+    </message>
+    <message>
+        <source>&amp;Message:</source>
+        <translation>Mensaje:</translation>
+    </message>
+    <message>
+        <source>Reuse one of the previously used receiving addresses. Reusing addresses has security and privacy issues. Do not use this unless re-generating a payment request made before.</source>
+        <translation>Reutilizar una de las direcciones previamente usadas para recibir. Reutilizar direcciones tiene problemas de seguridad y privacidad. No lo uses a menos que antes regeneres una solicitud de pago.</translation>
+    </message>
+    <message>
+        <source>R&amp;euse an existing receiving address (not recommended)</source>
+        <translation>R&amp;eutilizar una dirección existente para recibir (no recomendado)</translation>
+    </message>
+    <message>
+        <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source>
+        <translation>Un mensaje opcional para adjuntar a la solicitud de pago, que se muestra cuando se abre la solicitud. Nota: El mensaje no se enviará con el pago por la red Bitcoin.</translation>
+    </message>
+    <message>
+        <source>An optional label to associate with the new receiving address.</source>
+        <translation>Etiqueta opcional para asociar con la nueva dirección de recepción.</translation>
+    </message>
+    <message>
+        <source>Use this form to request payments. All fields are &lt;b&gt;optional&lt;/b&gt;.</source>
+        <translation>Utilice este formulario para solicitar pagos. Todos los campos son &lt;b&gt;opcionales&lt;/b&gt;.</translation>
+    </message>
+    <message>
+        <source>An optional amount to request. Leave this empty or zero to not request a specific amount.</source>
+        <translation>Para solicitar una cantidad opcional. Deje este vacío o cero para no solicitar una cantidad específica.</translation>
+    </message>
+    <message>
+        <source>Clear all fields of the form.</source>
+        <translation>Vaciar todos los campos del formulario.</translation>
+    </message>
+    <message>
+        <source>Clear</source>
+        <translation>Vaciar</translation>
+    </message>
+    <message>
+        <source>Requested payments history</source>
+        <translation>Historial de pagos solicitados</translation>
+    </message>
+    <message>
+        <source>&amp;Request payment</source>
+        <translation>&amp;Solicitar pago</translation>
+    </message>
+    <message>
+        <source>Show the selected request (does the same as double clicking an entry)</source>
+        <translation>Muestra la petición seleccionada (También doble clic)</translation>
+    </message>
+    <message>
+        <source>Show</source>
+        <translation>Mostrar</translation>
+    </message>
+    <message>
+        <source>Remove the selected entries from the list</source>
+        <translation>Borrar de la lista las direcciónes actualmente seleccionadas</translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation>Eliminar</translation>
+    </message>
+    <message>
+        <source>Copy label</source>
+        <translation>Copiar capa</translation>
+    </message>
+    <message>
+        <source>Copy message</source>
+        <translation>Copiar imagen</translation>
+    </message>
+    <message>
+        <source>Copy amount</source>
+        <translation>Copiar cantidad</translation>
+    </message>
+</context>
+<context>
+    <name>ReceiveRequestDialog</name>
+    <message>
+        <source>QR Code</source>
+        <translation>Código QR</translation>
+    </message>
+    <message>
+        <source>Copy &amp;URI</source>
+        <translation>Copiar &amp;URI</translation>
+    </message>
+    <message>
+        <source>Copy &amp;Address</source>
+        <translation>Copiar &amp;Dirección</translation>
+    </message>
+    <message>
+        <source>&amp;Save Image...</source>
+        <translation>Guardar Imagen...</translation>
+    </message>
+    <message>
+        <source>Request payment to %1</source>
+        <translation>Solicitar pago a %1</translation>
+    </message>
+    <message>
+        <source>Payment information</source>
+        <translation>Información de pago</translation>
+    </message>
+    <message>
+        <source>URI</source>
+        <translation>URI</translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation>Dirección</translation>
+    </message>
+    <message>
+        <source>Amount</source>
+        <translation>Cantidad</translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation>Etiqueta</translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation>Mensaje</translation>
+    </message>
+    <message>
+        <source>Resulting URI too long, try to reduce the text for label / message.</source>
+        <translation>URI resultante demasiado grande, trate de reducir el texto de etiqueta / mensaje.</translation>
+    </message>
+    <message>
+        <source>Error encoding URI into QR Code.</source>
+        <translation>Fallo al codificar URI en código QR.</translation>
+    </message>
+</context>
+<context>
+    <name>RecentRequestsTableModel</name>
+    <message>
+        <source>Date</source>
+        <translation>Fecha</translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation>Etiqueta</translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation>Mensaje</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(sin etiqueta)</translation>
+    </message>
+    <message>
+        <source>(no message)</source>
+        <translation>(no hay mensaje)</translation>
+    </message>
+    <message>
+        <source>(no amount requested)</source>
+        <translation>(no hay solicitud de cantidad)</translation>
+    </message>
+    <message>
+        <source>Requested</source>
+        <translation>Solicitado</translation>
+    </message>
+</context>
+<context>
+    <name>SendCoinsDialog</name>
+    <message>
+        <source>Send Coins</source>
+        <translation>Enviar bitcoins</translation>
+    </message>
+    <message>
+        <source>Coin Control Features</source>
+        <translation>Características de Coin Control</translation>
+    </message>
+    <message>
+        <source>Inputs...</source>
+        <translation>Entradas...</translation>
+    </message>
+    <message>
+        <source>automatically selected</source>
+        <translation>Seleccionado automáticamente</translation>
+    </message>
+    <message>
+        <source>Insufficient funds!</source>
+        <translation>Fondos insuficientes!</translation>
+    </message>
+    <message>
+        <source>Quantity:</source>
+        <translation>Cantidad:</translation>
+    </message>
+    <message>
+        <source>Bytes:</source>
+        <translation>Bytes:</translation>
+    </message>
+    <message>
+        <source>Amount:</source>
+        <translation>Cuantía:</translation>
+    </message>
+    <message>
+        <source>Fee:</source>
+        <translation>Tasa:</translation>
+    </message>
+    <message>
+        <source>After Fee:</source>
+        <translation>Después de tasas:</translation>
+    </message>
+    <message>
+        <source>Change:</source>
+        <translation>Cambio:</translation>
+    </message>
+    <message>
+        <source>If this is activated, but the change address is empty or invalid, change will be sent to a newly generated address.</source>
+        <translation>Si se marca esta opción pero la dirección de cambio está vacía o es inválida, el cambio se enviará a una nueva dirección recién generada.</translation>
+    </message>
+    <message>
+        <source>Custom change address</source>
+        <translation>Dirección propia</translation>
+    </message>
+    <message>
+        <source>Transaction Fee:</source>
+        <translation>Comisión de Transacción:</translation>
+    </message>
+    <message>
+        <source>Choose...</source>
+        <translation>Elija...</translation>
+    </message>
+    <message>
+        <source>collapse fee-settings</source>
+        <translation>Colapsar ajustes de cuota</translation>
+    </message>
+    <message>
+        <source>per kilobyte</source>
+        <translation>por kilobyte</translation>
+    </message>
+    <message>
+        <source>If the custom fee is set to 1000 satoshis and the transaction is only 250 bytes, then "per kilobyte" only pays 250 satoshis in fee, while "total at least" pays 1000 satoshis. For transactions bigger than a kilobyte both pay by kilobyte.</source>
+        <translation>Si la tarifa de aduana se establece en 1000 satoshis y la transacción está a sólo 250 bytes, entonces "por kilobyte" sólo paga 250 satoshis de cuota, mientras que "el mínimo total" pagaría 1.000 satoshis. Para las transacciones más grandes que un kilobyte ambos pagan por kilobyte</translation>
+    </message>
+    <message>
+        <source>Hide</source>
+        <translation>Ocultar</translation>
+    </message>
+    <message>
+        <source>total at least</source>
+        <translation>total por lo menos</translation>
+    </message>
+    <message>
+        <source>Paying only the minimum fee is just fine as long as there is less transaction volume than space in the blocks. But be aware that this can end up in a never confirming transaction once there is more demand for bitcoin transactions than the network can process.</source>
+        <translation>Pagando solamente la cuota mínima es correcto, siempre y cuando haya menos volumen de transacciones que el espacio en los bloques. Pero tenga en cuenta que esto puede terminar en una transacción nunca confirmada, una vez que haya más demanda para transacciones Bitcoin que la red pueda procesar.</translation>
+    </message>
+    <message>
+        <source>(read the tooltip)</source>
+        <translation>(leer la sugerencia)</translation>
+    </message>
+    <message>
+        <source>Recommended:</source>
+        <translation>Recomendado:</translation>
+    </message>
+    <message>
+        <source>Custom:</source>
+        <translation>Personalizado:</translation>
+    </message>
+    <message>
+        <source>(Smart fee not initialized yet. This usually takes a few blocks...)</source>
+        <translation>(Tarifa inteligente no inicializado aún. Esto generalmente lleva a pocos bloques...)</translation>
+    </message>
+    <message>
+        <source>normal</source>
+        <translation>normal</translation>
+    </message>
+    <message>
+        <source>fast</source>
+        <translation>rápido</translation>
+    </message>
+    <message>
+        <source>Send to multiple recipients at once</source>
+        <translation>Enviar a múltiples destinatarios de una vez</translation>
+    </message>
+    <message>
+        <source>Add &amp;Recipient</source>
+        <translation>Añadir &amp;destinatario</translation>
+    </message>
+    <message>
+        <source>Clear all fields of the form.</source>
+        <translation>Vaciar todos los campos del formulario</translation>
+    </message>
+    <message>
+        <source>Dust:</source>
+        <translation>Polvo:</translation>
+    </message>
+    <message>
+        <source>Clear &amp;All</source>
+        <translation>Vaciar &amp;todo</translation>
+    </message>
+    <message>
+        <source>Balance:</source>
+        <translation>Saldo:</translation>
+    </message>
+    <message>
+        <source>Confirm the send action</source>
+        <translation>Confirmar el envío</translation>
+    </message>
+    <message>
+        <source>S&amp;end</source>
+        <translation>&amp;Enviar</translation>
+    </message>
+    <message>
+        <source>Copy quantity</source>
+        <translation>Copiar cantidad</translation>
+    </message>
+    <message>
+        <source>Copy amount</source>
+        <translation>Copiar cantidad</translation>
+    </message>
+    <message>
+        <source>Copy fee</source>
+        <translation>Copiar cuota</translation>
+    </message>
+    <message>
+        <source>Copy after fee</source>
+        <translation>Copiar después de couta</translation>
+    </message>
+    <message>
+        <source>Copy bytes</source>
+        <translation>Copiar bytes</translation>
+    </message>
+    <message>
+        <source>Copy dust</source>
+        <translation>Copiar polvo</translation>
+    </message>
+    <message>
+        <source>Copy change</source>
+        <translation>Copiar cambio</translation>
+    </message>
+    <message>
+        <source>%1 to %2</source>
+        <translation>%1 a %2</translation>
+    </message>
+    <message>
+        <source>Are you sure you want to send?</source>
+        <translation>¿Seguro que quiere enviar?</translation>
+    </message>
+    <message>
+        <source>added as transaction fee</source>
+        <translation>añadido como transacción de cuota</translation>
+    </message>
+    <message>
+        <source>Total Amount %1</source>
+        <translation>Cantidad total %1</translation>
+    </message>
+    <message>
+        <source>or</source>
+        <translation>o</translation>
+    </message>
+    <message>
+        <source>Confirm send coins</source>
+        <translation>Confirmar enviar monedas</translation>
+    </message>
+    <message>
+        <source>The recipient address is not valid. Please recheck.</source>
+        <translation>La dirección de destinatario no es válida. Por favor revísela.</translation>
+    </message>
+    <message>
+        <source>The amount to pay must be larger than 0.</source>
+        <translation>La cantidad a pagar debe de ser mayor que 0.</translation>
+    </message>
+    <message>
+        <source>The amount exceeds your balance.</source>
+        <translation>La cantidad excede su saldo.</translation>
+    </message>
+    <message>
+        <source>The total exceeds your balance when the %1 transaction fee is included.</source>
+        <translation>El total excede su saldo cuando la cuota de transacción de %1 es incluida.</translation>
+    </message>
+    <message>
+        <source>Duplicate address found: addresses should only be used once each.</source>
+        <translation>Dirección duplicada encontrada: la dirección sólo debería ser utilizada una vez por cada uso.</translation>
+    </message>
+    <message>
+        <source>Transaction creation failed!</source>
+        <translation>¡Falló la creación de transacción!</translation>
+    </message>
+    <message>
+        <source>A fee higher than %1 is considered an absurdly high fee.</source>
+        <translation>Una couta mayor que %1 se considera una cuota irracionalmente alta.</translation>
+    </message>
+    <message>
+        <source>Payment request expired.</source>
+        <translation>Solicitud de pago caducada.</translation>
+    </message>
+    <message>
+        <source>Pay only the required fee of %1</source>
+        <translation>Pagar únicamente la cuota solicitada de %1</translation>
+    </message>
+    <message>
+        <source>Warning: Invalid Bitcoin address</source>
+        <translation>Alerta: dirección Bitcoin inválida</translation>
+    </message>
+    <message>
+        <source>Warning: Unknown change address</source>
+        <translation>Alerta: dirección cambiada desconocida</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(sin etiqueta)</translation>
+    </message>
+</context>
+<context>
+    <name>SendCoinsEntry</name>
+    <message>
+        <source>A&amp;mount:</source>
+        <translation>Ca&amp;ntidad:</translation>
+    </message>
+    <message>
+        <source>Pay &amp;To:</source>
+        <translation>&amp;Pagar a:</translation>
+    </message>
+    <message>
+        <source>&amp;Label:</source>
+        <translation>&amp;Etiqueta:</translation>
+    </message>
+    <message>
+        <source>Choose previously used address</source>
+        <translation>Escoger direcciones previamente usadas</translation>
+    </message>
+    <message>
+        <source>This is a normal payment.</source>
+        <translation>Esto es un pago ordinario.</translation>
+    </message>
+    <message>
+        <source>The Bitcoin address to send the payment to</source>
+        <translation>Dirección Bitcoin a la que enviar el pago</translation>
+    </message>
+    <message>
+        <source>Alt+A</source>
+        <translation>Alt+A</translation>
+    </message>
+    <message>
+        <source>Paste address from clipboard</source>
+        <translation>Pegar dirección desde portapapeles</translation>
+    </message>
+    <message>
+        <source>Alt+P</source>
+        <translation>Alt+P</translation>
+    </message>
+    <message>
+        <source>Remove this entry</source>
+        <translation>Eliminar esta transacción</translation>
+    </message>
+    <message>
+        <source>The fee will be deducted from the amount being sent. The recipient will receive less bitcoins than you enter in the amount field. If multiple recipients are selected, the fee is split equally.</source>
+        <translation>La cuota será deducida de la cantidad que sea mandada. El destinatario recibirá menos bitcoins de los que entres en el  </translation>
+    </message>
+    <message>
+        <source>S&amp;ubtract fee from amount</source>
+        <translation>Restar comisiones a la cantidad</translation>
+    </message>
+    <message>
+        <source>Message:</source>
+        <translation>Mensaje:</translation>
+    </message>
+    <message>
+        <source>This is an unauthenticated payment request.</source>
+        <translation>Esta es una petición de pago no autentificada.</translation>
+    </message>
+    <message>
+        <source>This is an authenticated payment request.</source>
+        <translation>Esta es una petición de pago autentificada.</translation>
+    </message>
+    <message>
+        <source>Enter a label for this address to add it to the list of used addresses</source>
+        <translation>Introduce una etiqueta para esta dirección para añadirla a la lista de direcciones utilizadas</translation>
+    </message>
+    <message>
+        <source>A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
+        <translation>Un mensaje que se adjuntó a la bitcoin: URL que será almacenada con la transacción para su referencia. Nota: Este mensaje no se envía a través de la red Bitcoin.</translation>
+    </message>
+    <message>
+        <source>Pay To:</source>
+        <translation>Paga a:</translation>
+    </message>
+    <message>
+        <source>Memo:</source>
+        <translation>Memo:</translation>
+    </message>
+    <message>
+        <source>Enter a label for this address to add it to your address book</source>
+        <translation>Introduzca una etiqueta para esta dirección para añadirla a su  agenda</translation>
+    </message>
+</context>
+<context>
+    <name>SendConfirmationDialog</name>
+    <message>
+        <source>Yes</source>
+        <translation>Sí</translation>
+    </message>
+</context>
+<context>
+    <name>ShutdownWindow</name>
+    <message>
+        <source>%1 is shutting down...</source>
+        <translation>%1 se esta cerrando...</translation>
+    </message>
+    <message>
+        <source>Do not shut down the computer until this window disappears.</source>
+        <translation>No apague el equipo hasta que desaparezca esta ventana.</translation>
+    </message>
+</context>
+<context>
+    <name>SignVerifyMessageDialog</name>
+    <message>
+        <source>Signatures - Sign / Verify a Message</source>
+        <translation>Firmas - Firmar / verificar un mensaje</translation>
+    </message>
+    <message>
+        <source>&amp;Sign Message</source>
+        <translation>&amp;Firmar mensaje</translation>
+    </message>
+    <message>
+        <source>You can sign messages/agreements with your addresses to prove you can receive bitcoins sent to them. Be careful not to sign anything vague or random, as phishing attacks may try to trick you into signing your identity over to them. Only sign fully-detailed statements you agree to.</source>
+        <translation>Puede firmar los mensajes con sus direcciones para demostrar que las posee. Tenga cuidado de no firmar cualquier cosa de manera vaga o aleatoria, pues los ataques de phishing pueden tratar de engañarle firmando su identidad a través de ellos. Sólo firme declaraciones totalmente detalladas con las que usted esté de acuerdo.</translation>
+    </message>
+    <message>
+        <source>The Bitcoin address to sign the message with</source>
+        <translation>Dirección Bitcoin con la que firmar el mensaje</translation>
+    </message>
+    <message>
+        <source>Choose previously used address</source>
+        <translation>Escoger dirección previamente usada</translation>
+    </message>
+    <message>
+        <source>Alt+A</source>
+        <translation>Alt+A</translation>
+    </message>
+    <message>
+        <source>Paste address from clipboard</source>
+        <translation>Pegar dirección desde portapapeles</translation>
+    </message>
+    <message>
+        <source>Alt+P</source>
+        <translation>Alt+P</translation>
+    </message>
+    <message>
+        <source>Enter the message you want to sign here</source>
+        <translation>Introduzca el mensaje que desea firmar aquí</translation>
+    </message>
+    <message>
+        <source>Signature</source>
+        <translation>Firma</translation>
+    </message>
+    <message>
+        <source>Copy the current signature to the system clipboard</source>
+        <translation>Copiar la firma actual al portapapeles del sistema</translation>
+    </message>
+    <message>
+        <source>Sign the message to prove you own this Bitcoin address</source>
+        <translation>Firmar el mensaje para demostrar que se posee esta dirección Bitcoin</translation>
+    </message>
+    <message>
+        <source>Sign &amp;Message</source>
+        <translation>Firmar &amp;mensaje</translation>
+    </message>
+    <message>
+        <source>Reset all sign message fields</source>
+        <translation>Vaciar todos los campos de la firma de mensaje</translation>
+    </message>
+    <message>
+        <source>Clear &amp;All</source>
+        <translation>Vaciar &amp;todo</translation>
+    </message>
+    <message>
+        <source>&amp;Verify Message</source>
+        <translation>&amp;Verificar mensaje</translation>
+    </message>
+    <message>
+        <source>Enter the receiver's address, message (ensure you copy line breaks, spaces, tabs, etc. exactly) and signature below to verify the message. Be careful not to read more into the signature than what is in the signed message itself, to avoid being tricked by a man-in-the-middle attack. Note that this only proves the signing party receives with the address, it cannot prove sendership of any transaction!</source>
+        <translation>Introduzca la dirección para la firma, el mensaje (asegurándose de copiar tal cual los saltos de línea, espacios, tabulaciones, etc.) y la firma a continuación para verificar el mensaje. Tenga cuidado de no asumir más información de lo que dice el propio mensaje firmado para evitar fraudes basados en ataques de tipo man-in-the-middle. </translation>
+    </message>
+    <message>
+        <source>The Bitcoin address the message was signed with</source>
+        <translation>La dirección Bitcoin con la que se firmó el mensaje</translation>
+    </message>
+    <message>
+        <source>Verify the message to ensure it was signed with the specified Bitcoin address</source>
+        <translation>Verificar el mensaje para comprobar que fue firmado con la dirección Bitcoin indicada</translation>
+    </message>
+    <message>
+        <source>Verify &amp;Message</source>
+        <translation>Verificar &amp;mensaje</translation>
+    </message>
+    <message>
+        <source>Reset all verify message fields</source>
+        <translation>Vaciar todos los campos de la verificación de mensaje</translation>
+    </message>
+    <message>
+        <source>Click "Sign Message" to generate signature</source>
+        <translation>Click en "Fírmar mensaje" para generar una firma</translation>
+    </message>
+    <message>
+        <source>The entered address is invalid.</source>
+        <translation>La dirección introducida no es válida.</translation>
+    </message>
+    <message>
+        <source>Please check the address and try again.</source>
+        <translation>Por favor revise la dirección e inténtelo de nuevo.</translation>
+    </message>
+    <message>
+        <source>The entered address does not refer to a key.</source>
+        <translation>La dirección introducida no remite a una clave.</translation>
+    </message>
+    <message>
+        <source>Wallet unlock was cancelled.</source>
+        <translation>El desbloqueo del monedero fue cancelado.</translation>
+    </message>
+    <message>
+        <source>Private key for the entered address is not available.</source>
+        <translation>La clave privada de la dirección introducida no está disponible.</translation>
+    </message>
+    <message>
+        <source>Message signing failed.</source>
+        <translation>Falló la firma del mensaje.</translation>
+    </message>
+    <message>
+        <source>Message signed.</source>
+        <translation>Mensaje firmado.</translation>
+    </message>
+    <message>
+        <source>The signature could not be decoded.</source>
+        <translation>La firma no pudo descodificarse.</translation>
+    </message>
+    <message>
+        <source>Please check the signature and try again.</source>
+        <translation>Por favor compruebe la firma y pruebe de nuevo.</translation>
+    </message>
+    <message>
+        <source>The signature did not match the message digest.</source>
+        <translation>La firma no se combinó con el mensaje.</translation>
+    </message>
+    <message>
+        <source>Message verification failed.</source>
+        <translation>Falló la verificación del mensaje.</translation>
+    </message>
+    <message>
+        <source>Message verified.</source>
+        <translation>Mensaje verificado.</translation>
+    </message>
+</context>
+<context>
+    <name>SplashScreen</name>
+    <message>
+        <source>[testnet]</source>
+        <translation>[testnet]</translation>
+    </message>
+</context>
+<context>
+    <name>TrafficGraphWidget</name>
+    <message>
+        <source>KB/s</source>
+        <translation>KB/s</translation>
+    </message>
+</context>
+<context>
+    <name>TransactionDesc</name>
+    <message>
+        <source>Open until %1</source>
+        <translation>Abierto hasta %1</translation>
+    </message>
+    <message>
+        <source>conflicted with a transaction with %1 confirmations</source>
+        <translation>Hay un conflicto con la traducción de las confirmaciones %1</translation>
+    </message>
+    <message>
+        <source>%1/offline</source>
+        <translation>%1/sin conexión</translation>
+    </message>
+    <message>
+        <source>0/unconfirmed, %1</source>
+        <translation>0/no confirmado, %1</translation>
+    </message>
+    <message>
+        <source>in memory pool</source>
+        <translation>en el equipo de memoria</translation>
+    </message>
+    <message>
+        <source>not in memory pool</source>
+        <translation>no en el equipo de memoria</translation>
+    </message>
+    <message>
+        <source>abandoned</source>
+        <translation>abandonado</translation>
+    </message>
+    <message>
+        <source>%1/unconfirmed</source>
+        <translation>%1/no confirmado</translation>
+    </message>
+    <message>
+        <source>%1 confirmations</source>
+        <translation>confirmaciones %1</translation>
+    </message>
+    <message>
+        <source>Status</source>
+        <translation>Estado</translation>
+    </message>
+    <message>
+        <source>, has not been successfully broadcast yet</source>
+        <translation>, no ha sido emitido con éxito aún</translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation>Fecha</translation>
+    </message>
+    <message>
+        <source>Source</source>
+        <translation>Fuente</translation>
+    </message>
+    <message>
+        <source>Generated</source>
+        <translation>Generado</translation>
+    </message>
+    <message>
+        <source>From</source>
+        <translation>Desde</translation>
+    </message>
+    <message>
+        <source>unknown</source>
+        <translation>desconocido</translation>
+    </message>
+    <message>
+        <source>To</source>
+        <translation>Para</translation>
+    </message>
+    <message>
+        <source>own address</source>
+        <translation>dirección propia</translation>
+    </message>
+    <message>
+        <source>watch-only</source>
+        <translation>de observación</translation>
+    </message>
+    <message>
+        <source>label</source>
+        <translation>etiqueta</translation>
+    </message>
+    <message>
+        <source>Credit</source>
+        <translation>Credito</translation>
+    </message>
+    <message>
+        <source>not accepted</source>
+        <translation>no aceptada</translation>
+    </message>
+    <message>
+        <source>Debit</source>
+        <translation>Enviado</translation>
+    </message>
+    <message>
+        <source>Total debit</source>
+        <translation>Total enviado</translation>
+    </message>
+    <message>
+        <source>Total credit</source>
+        <translation>Total recibido</translation>
+    </message>
+    <message>
+        <source>Transaction fee</source>
+        <translation>Comisión de transacción</translation>
+    </message>
+    <message>
+        <source>Net amount</source>
+        <translation>Cantidad neta</translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation>Mensaje</translation>
+    </message>
+    <message>
+        <source>Comment</source>
+        <translation>Comentario</translation>
+    </message>
+    <message>
+        <source>Transaction ID</source>
+        <translation>Identificador de transacción (ID)</translation>
+    </message>
+    <message>
+        <source>Output index</source>
+        <translation>Indice de salida</translation>
+    </message>
+    <message>
+        <source>Merchant</source>
+        <translation>Vendedor</translation>
+    </message>
+    <message>
+        <source>Generated coins must mature %1 blocks before they can be spent. When you generated this block, it was broadcast to the network to be added to the block chain. If it fails to get into the chain, its state will change to "not accepted" and it won't be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source>
+        <translation>Los bitcoins generados deben madurar %1 bloques antes de que puedan gastarse. Cuando generó este bloque, se transmitió a la red para que se añadiera a la cadena de bloques. Si no consigue entrar en la cadena, su estado cambiará a "no aceptado" y ya no se podrá gastar. Esto puede ocurrir ocasionalmente si otro nodo genera un bloque a pocos segundos del suyo.</translation>
+    </message>
+    <message>
+        <source>Debug information</source>
+        <translation>Información de depuración</translation>
+    </message>
+    <message>
+        <source>Transaction</source>
+        <translation>Transacción</translation>
+    </message>
+    <message>
+        <source>Inputs</source>
+        <translation>entradas</translation>
+    </message>
+    <message>
+        <source>Amount</source>
+        <translation>Cantidad</translation>
+    </message>
+    <message>
+        <source>true</source>
+        <translation>verdadero</translation>
+    </message>
+    <message>
+        <source>false</source>
+        <translation>falso</translation>
+    </message>
+</context>
+<context>
+    <name>TransactionDescDialog</name>
+    <message>
+        <source>This pane shows a detailed description of the transaction</source>
+        <translation>Esta ventana muestra información detallada sobre la transacción</translation>
+    </message>
+    <message>
+        <source>Details for %1</source>
+        <translation>Detalles para %1</translation>
+    </message>
+</context>
+<context>
+    <name>TransactionTableModel</name>
+    <message>
+        <source>Date</source>
+        <translation>Fecha</translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation>Tipo</translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation>Etiqueta</translation>
+    </message>
+    <message>
+        <source>Open until %1</source>
+        <translation>Abierto hasta %1</translation>
+    </message>
+    <message>
+        <source>Offline</source>
+        <translation>Sin conexion</translation>
+    </message>
+    <message>
+        <source>Unconfirmed</source>
+        <translation>Sin confirmar</translation>
+    </message>
+    <message>
+        <source>Abandoned</source>
+        <translation>Abandonado</translation>
+    </message>
+    <message>
+        <source>Confirming (%1 of %2 recommended confirmations)</source>
+        <translation>Confirmando (%1 de %2 confirmaciones recomendadas)</translation>
+    </message>
+    <message>
+        <source>Confirmed (%1 confirmations)</source>
+        <translation>Confirmado (%1 confirmaciones)</translation>
+    </message>
+    <message>
+        <source>Conflicted</source>
+        <translation>En conflicto</translation>
+    </message>
+    <message>
+        <source>Immature (%1 confirmations, will be available after %2)</source>
+        <translation>No disponible (%1 confirmaciones. Estarán disponibles al cabo de %2)</translation>
+    </message>
+    <message>
+        <source>This block was not received by any other nodes and will probably not be accepted!</source>
+        <translation>Este bloque no ha sido recibido por otros nodos y probablemente no sea aceptado!</translation>
+    </message>
+    <message>
+        <source>Generated but not accepted</source>
+        <translation>Generado pero no aceptado</translation>
+    </message>
+    <message>
+        <source>Received with</source>
+        <translation>Recibido con</translation>
+    </message>
+    <message>
+        <source>Received from</source>
+        <translation>Recibidos de</translation>
+    </message>
+    <message>
+        <source>Sent to</source>
+        <translation>Enviado a</translation>
+    </message>
+    <message>
+        <source>Payment to yourself</source>
+        <translation>Pago proprio</translation>
+    </message>
+    <message>
+        <source>Mined</source>
+        <translation>Minado</translation>
+    </message>
+    <message>
+        <source>watch-only</source>
+        <translation>de observación</translation>
+    </message>
+    <message>
+        <source>(n/a)</source>
+        <translation>(nd)</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(sin etiqueta)</translation>
+    </message>
+    <message>
+        <source>Transaction status. Hover over this field to show number of confirmations.</source>
+        <translation>Estado de transacción. Pasa el ratón sobre este campo para ver el número de confirmaciones.</translation>
+    </message>
+    <message>
+        <source>Date and time that the transaction was received.</source>
+        <translation>Fecha y hora en que se recibió la transacción.</translation>
+    </message>
+    <message>
+        <source>Type of transaction.</source>
+        <translation>Tipo de transacción.</translation>
+    </message>
+    <message>
+        <source>Whether or not a watch-only address is involved in this transaction.</source>
+        <translation>Si una dirección watch-only está involucrada en esta transacción o no.</translation>
+    </message>
+    <message>
+        <source>User-defined intent/purpose of the transaction.</source>
+        <translation>Descripción de la transacción definido por el usuario.</translation>
+    </message>
+    <message>
+        <source>Amount removed from or added to balance.</source>
+        <translation>Cantidad retirada o añadida al saldo.</translation>
+    </message>
+</context>
+<context>
+    <name>TransactionView</name>
+    <message>
+        <source>All</source>
+        <translation>Todo</translation>
+    </message>
+    <message>
+        <source>Today</source>
+        <translation>Hoy</translation>
+    </message>
+    <message>
+        <source>This week</source>
+        <translation>Esta semana</translation>
+    </message>
+    <message>
+        <source>This month</source>
+        <translation>Este mes</translation>
+    </message>
+    <message>
+        <source>Last month</source>
+        <translation>Mes pasado</translation>
+    </message>
+    <message>
+        <source>This year</source>
+        <translation>Este año</translation>
+    </message>
+    <message>
+        <source>Range...</source>
+        <translation>Rango...</translation>
+    </message>
+    <message>
+        <source>Received with</source>
+        <translation>Recibido con</translation>
+    </message>
+    <message>
+        <source>Sent to</source>
+        <translation>Enviado a</translation>
+    </message>
+    <message>
+        <source>To yourself</source>
+        <translation>A usted mismo</translation>
+    </message>
+    <message>
+        <source>Mined</source>
+        <translation>Minado</translation>
+    </message>
+    <message>
+        <source>Other</source>
+        <translation>Otra</translation>
+    </message>
+    <message>
+        <source>Enter address or label to search</source>
+        <translation>Introduzca una dirección o etiqueta que buscar</translation>
+    </message>
+    <message>
+        <source>Min amount</source>
+        <translation>Cantidad mínima</translation>
+    </message>
+    <message>
+        <source>Abandon transaction</source>
+        <translation>Transacción abandonada</translation>
+    </message>
+    <message>
+        <source>Copy address</source>
+        <translation>Copiar ubicación</translation>
+    </message>
+    <message>
+        <source>Copy label</source>
+        <translation>Copiar capa</translation>
+    </message>
+    <message>
+        <source>Copy amount</source>
+        <translation>Copiar cantidad</translation>
+    </message>
+    <message>
+        <source>Copy transaction ID</source>
+        <translation>Copiar ID de transacción</translation>
+    </message>
+    <message>
+        <source>Copy raw transaction</source>
+        <translation>Copiar transacción raw</translation>
+    </message>
+    <message>
+        <source>Copy full transaction details</source>
+        <translation>Copiar todos los detalles de la transacción</translation>
+    </message>
+    <message>
+        <source>Edit label</source>
+        <translation>Editar etiqueta</translation>
+    </message>
+    <message>
+        <source>Show transaction details</source>
+        <translation>Mostrar detalles de la transacción</translation>
+    </message>
+    <message>
+        <source>Export Transaction History</source>
+        <translation>Exportar historial de transacciones</translation>
+    </message>
+    <message>
+        <source>Comma separated file (*.csv)</source>
+        <translation>Archivo separado de coma (*.csv)</translation>
+    </message>
+    <message>
+        <source>Confirmed</source>
+        <translation>Confirmado</translation>
+    </message>
+    <message>
+        <source>Watch-only</source>
+        <translation>De observación</translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation>Fecha</translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation>Tipo</translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation>Etiqueta</translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation>Dirección</translation>
+    </message>
+    <message>
+        <source>ID</source>
+        <translation>ID</translation>
+    </message>
+    <message>
+        <source>Exporting Failed</source>
+        <translation>Falló la exportación</translation>
+    </message>
+    <message>
+        <source>There was an error trying to save the transaction history to %1.</source>
+        <translation>Ha habido un error al intentar guardar la transacción con %1.</translation>
+    </message>
+    <message>
+        <source>Exporting Successful</source>
+        <translation>Exportación finalizada</translation>
+    </message>
+    <message>
+        <source>The transaction history was successfully saved to %1.</source>
+        <translation>La transacción ha sido guardada en %1.</translation>
+    </message>
+    <message>
+        <source>Range:</source>
+        <translation>Rango:</translation>
+    </message>
+    <message>
+        <source>to</source>
+        <translation>para</translation>
+    </message>
+</context>
+<context>
+    <name>UnitDisplayStatusBarControl</name>
+    <message>
+        <source>Unit to show amounts in. Click to select another unit.</source>
+        <translation>Unidad en la que se muestran las cantidades. Haga clic para seleccionar otra unidad.</translation>
+    </message>
+</context>
+<context>
+    <name>WalletFrame</name>
+    <message>
+        <source>No wallet has been loaded.</source>
+        <translation>No se ha cargado ningún monedero</translation>
+    </message>
+</context>
+<context>
+    <name>WalletModel</name>
+    <message>
+        <source>Send Coins</source>
+        <translation>Enviar</translation>
+    </message>
+</context>
+<context>
+    <name>WalletView</name>
+    <message>
+        <source>&amp;Export</source>
+        <translation>&amp;Exportar</translation>
+    </message>
+    <message>
+        <source>Export the data in the current tab to a file</source>
+        <translation>Exportar a un archivo los datos de esta pestaña</translation>
+    </message>
+    <message>
+        <source>Backup Wallet</source>
+        <translation>Copia de seguridad del monedero</translation>
+    </message>
+    <message>
+        <source>Wallet Data (*.dat)</source>
+        <translation>Datos de monedero (*.dat)</translation>
+    </message>
+    <message>
+        <source>Backup Failed</source>
+        <translation>La copia de seguridad ha fallado</translation>
+    </message>
+    <message>
+        <source>There was an error trying to save the wallet data to %1.</source>
+        <translation>Ha habido un error al intentar guardar los datos del monedero en %1.</translation>
+    </message>
+    <message>
+        <source>Backup Successful</source>
+        <translation>Se ha completado con éxito la copia de respaldo</translation>
+    </message>
+    <message>
+        <source>The wallet data was successfully saved to %1.</source>
+        <translation>Los datos del monedero se han guardado con éxito en %1.</translation>
+    </message>
+</context>
+<context>
+    <name>bitcoin-core</name>
+    <message>
+        <source>Options:</source>
+        <translation>Opciones:
+</translation>
+    </message>
+    <message>
+        <source>Specify data directory</source>
+        <translation>Especificar directorio para los datos</translation>
+    </message>
+    <message>
+        <source>Connect to a node to retrieve peer addresses, and disconnect</source>
+        <translation>Conectar a un nodo para obtener direcciones de pares y desconectar</translation>
+    </message>
+    <message>
+        <source>Specify your own public address</source>
+        <translation>Especifique su propia dirección pública</translation>
+    </message>
+    <message>
+        <source>Accept command line and JSON-RPC commands</source>
+        <translation>Aceptar comandos consola y JSON-RPC
+</translation>
+    </message>
+    <message>
+        <source>If &lt;category&gt; is not supplied or if &lt;category&gt; = 1, output all debugging information.</source>
+        <translation>Si &lt;category&gt; no es proporcionado o si &lt;category&gt; =1, muestra toda la información de depuración.</translation>
+    </message>
+    <message>
+        <source>Prune configured below the minimum of %d MiB.  Please use a higher number.</source>
+        <translation>La Poda se ha configurado por debajo del minimo de %d MiB. Por favor utiliza un valor mas alto.</translation>
+    </message>
+    <message>
+        <source>Prune: last wallet synchronisation goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of pruned node)</source>
+        <translation>Poda:  la ultima sincronizacion de la cartera sobrepasa los datos podados. Necesitas reindexar con -reindex (o descargar la cadena de bloques de nuevo en el caso de un nodo podado)</translation>
+    </message>
+    <message>
+        <source>Reduce storage requirements by pruning (deleting) old blocks. This mode is incompatible with -txindex and -rescan. Warning: Reverting this setting requires re-downloading the entire blockchain. (default: 0 = disable pruning blocks, &gt;%u = target size in MiB to use for block files)</source>
+        <translation>Reduce los requisitos de almacenaje podando (eliminando) los bloques viejos. Este modo es incompatible con -txindex y -rescan. Advertencia: Revertir este ajuste requiere volver a descargar la cadena de bloques al completo. (predeterminado: 0 = deshabilitar la poda de bloques, &gt;%u = objetivo de tamaño en MiB para usar para los archivos de bloques)</translation>
+    </message>
+    <message>
+        <source>Rescans are not possible in pruned mode. You will need to use -reindex which will download the whole blockchain again.</source>
+        <translation>Nos es posible re-escanear en modo podado.Necesitas utilizar -reindex el cual descargara la cadena de bloques al completo de nuevo.</translation>
+    </message>
+    <message>
+        <source>Error: A fatal internal error occurred, see debug.log for details</source>
+        <translation>Un error interno fatal ocurrió, ver debug.log para detalles</translation>
+    </message>
+    <message>
+        <source>Fee (in %s/kB) to add to transactions you send (default: %s)</source>
+        <translation>Comisión (en %s/KB) para agregar a las transacciones que envíe (por defecto: %s)</translation>
+    </message>
+    <message>
+        <source>Pruning blockstore...</source>
+        <translation>Poda blockstore ...</translation>
+    </message>
+    <message>
+        <source>Run in the background as a daemon and accept commands</source>
+        <translation>Ejecutar en segundo plano como daemon y aceptar comandos
+</translation>
+    </message>
+    <message>
+        <source>Unable to start HTTP server. See debug log for details.</source>
+        <translation>No se ha podido comenzar el servidor HTTP. Ver debug log para detalles.</translation>
+    </message>
+    <message>
+        <source>Bitcoin Core</source>
+        <translation>Bitcoin Core</translation>
+    </message>
+    <message>
+        <source>The %s developers</source>
+        <translation>Los %s desarrolladores</translation>
+    </message>
+    <message>
+        <source>A fee rate (in %s/kB) that will be used when fee estimation has insufficient data (default: %s)</source>
+        <translation>Una comision (en %s/kB) que sera usada cuando las estimacion de comision no disponga de suficientes datos (predeterminado: %s)</translation>
+    </message>
+    <message>
+        <source>Accept relayed transactions received from whitelisted peers even when not relaying transactions (default: %d)</source>
+        <translation>Aceptar transacciones retransmitidas recibidas desde nodos en la lista blanca incluso cuando no estés retransmitiendo transacciones (predeterminado: %d)</translation>
+    </message>
+    <message>
+        <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source>
+        <translation>Vincular a la dirección dada y escuchar siempre en ella. Utilice la notación [host]:port para IPv6</translation>
+    </message>
+    <message>
+        <source>Cannot obtain a lock on data directory %s. %s is probably already running.</source>
+        <translation>No se puede bloquear el directorio %s. %s ya se está ejecutando.</translation>
+    </message>
+    <message>
+        <source>Delete all wallet transactions and only recover those parts of the blockchain through -rescan on startup</source>
+        <translation>Borrar todas las transacciones del monedero y sólo recuperar aquellas partes de la cadena de bloques por medio de -rescan on startup.</translation>
+    </message>
+    <message>
+        <source>Error loading %s: You can't enable HD on a already existing non-HD wallet</source>
+        <translation>Error cargando %s: No puede habilitar HD en un monedero existente que no es HD</translation>
+    </message>
+    <message>
+        <source>Error reading %s! All keys read correctly, but transaction data or address book entries might be missing or incorrect.</source>
+        <translation>Error leyendo %s!. Todas las claves se han leido correctamente, pero los datos de transacciones o la libreta de direcciones pueden faltar o ser incorrectos.</translation>
+    </message>
+    <message>
+        <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source>
+        <translation>Ejecutar comando cuando una transacción del monedero cambia (%s en cmd se remplazará por TxID)</translation>
+    </message>
+    <message>
+        <source>Maximum allowed median peer time offset adjustment. Local perspective of time may be influenced by peers forward or backward by this amount. (default: %u seconds)</source>
+        <translation>Ajuste máximo permitido del tiempo offset medio de pares. La perspectiva local de tiempo se verá influenciada por los pares anteriores y posteriores a esta cantidad. (Por defecto: %u segundos)</translation>
+    </message>
+    <message>
+        <source>Maximum total fees (in %s) to use in a single wallet transaction or raw transaction; setting this too low may abort large transactions (default: %s)</source>
+        <translation>Máximas comisiones totales (en %s) para utilizar en una sola transacción de la cartera; establecer esto demasiado bajo puede abortar grandes transacciones (predeterminado: %s)</translation>
+    </message>
+    <message>
+        <source>Please check that your computer's date and time are correct! If your clock is wrong, %s will not work properly.</source>
+        <translation>Por favor, compruebe si la fecha y hora en su computadora son correctas! Si su reloj esta mal, %s no trabajara correctamente. </translation>
+    </message>
+    <message>
+        <source>Please contribute if you find %s useful. Visit %s for further information about the software.</source>
+        <translation>Contribuya si encuentra %s de utilidad. Visite %s para mas información acerca del programa.</translation>
+    </message>
+    <message>
+        <source>Set the number of script verification threads (%u to %d, 0 = auto, &lt;0 = leave that many cores free, default: %d)</source>
+        <translation>Establecer el número de hilos (threads) de verificación de scripts (entre %u y %d, 0 = automático, &lt;0 = dejar libres ese número de núcleos; predeterminado: %d)</translation>
+    </message>
+    <message>
+        <source>The block database contains a block which appears to be from the future. This may be due to your computer's date and time being set incorrectly. Only rebuild the block database if you are sure that your computer's date and time are correct</source>
+        <translation>La base de datos de bloques contiene un bloque que parece ser del futuro. Esto puede ser porque la fecha y hora de tu ordenador están mal ajustados. Reconstruye la base de datos de bloques solo si estas seguro de que la fecha y hora de tu ordenador estan ajustados correctamente.</translation>
+    </message>
+    <message>
+        <source>Unable to rewind the database to a pre-fork state. You will need to redownload the blockchain</source>
+        <translation>No es posible reconstruir la base de datos a un estado anterior. Debe descargar de nuevo la cadena de bloques.</translation>
+    </message>
+    <message>
+        <source>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</source>
+        <translation>Utiliza UPnP para asignar el puerto de escucha (predeterminado: 1 cuando esta escuchando sin -proxy)</translation>
+    </message>
+    <message>
+        <source>You need to rebuild the database using -reindex-chainstate to change -txindex</source>
+        <translation>Necesita reconstruir la base de datos usando -reindex-chainstate para cambiar -txindex</translation>
+    </message>
+    <message>
+        <source>%s corrupt, salvage failed</source>
+        <translation>%s corrupto. Fracasó la recuperacion</translation>
+    </message>
+    <message>
+        <source>-maxmempool must be at least %d MB</source>
+        <translation>-maxmempool debe ser por lo menos de %d MB</translation>
+    </message>
+    <message>
+        <source>&lt;category&gt; can be:</source>
+        <translation>&lt;category&gt; puede ser:</translation>
+    </message>
+    <message>
+        <source>Append comment to the user agent string</source>
+        <translation>Adjunta un comentario a la linea de agente de usuario</translation>
+    </message>
+    <message>
+        <source>Attempt to recover private keys from a corrupt wallet on startup</source>
+        <translation>Intento de recuperar claves privadas de un monedero corrupto en arranque</translation>
+    </message>
+    <message>
+        <source>Block creation options:</source>
+        <translation>Opciones de creación de bloques:</translation>
+    </message>
+    <message>
+        <source>Cannot resolve -%s address: '%s'</source>
+        <translation>No se puede resolver -%s direccion: '%s'</translation>
+    </message>
+    <message>
+        <source>Change index out of range</source>
+        <translation>Cambio de indice fuera de rango</translation>
+    </message>
+    <message>
+        <source>Connection options:</source>
+        <translation>Opciones de conexión:</translation>
+    </message>
+    <message>
+        <source>Copyright (C) %i-%i</source>
+        <translation>Copyright (C) %i-%i</translation>
+    </message>
+    <message>
+        <source>Corrupted block database detected</source>
+        <translation>Corrupción de base de datos de bloques detectada.</translation>
+    </message>
+    <message>
+        <source>Debugging/Testing options:</source>
+        <translation>Opciones de depuración/pruebas:</translation>
+    </message>
+    <message>
+        <source>Do not load the wallet and disable wallet RPC calls</source>
+        <translation>No cargar el monedero y desactivar las llamadas RPC del monedero</translation>
+    </message>
+    <message>
+        <source>Do you want to rebuild the block database now?</source>
+        <translation>¿Quieres reconstruir la base de datos de bloques ahora?</translation>
+    </message>
+    <message>
+        <source>Enable publish hash block in &lt;address&gt;</source>
+        <translation>Activar publicar bloque .hash en &lt;.Address&gt;</translation>
+    </message>
+    <message>
+        <source>Enable publish hash transaction in &lt;address&gt;</source>
+        <translation>Activar publicar transacción .hash en &lt;.Address&gt;</translation>
+    </message>
+    <message>
+        <source>Enable publish raw block in &lt;address&gt;</source>
+        <translation>Habilita la publicacion de bloques en bruto en &lt;direccion&gt;</translation>
+    </message>
+    <message>
+        <source>Enable publish raw transaction in &lt;address&gt;</source>
+        <translation>Habilitar publicar transacción en rama en &lt;dirección&gt;</translation>
+    </message>
+    <message>
+        <source>Enable transaction replacement in the memory pool (default: %u)</source>
+        <translation>Habilita el reemplazamiento de transacciones en la piscina de memoria (predeterminado: %u)</translation>
+    </message>
+    <message>
+        <source>Error initializing block database</source>
+        <translation>Error al inicializar la base de datos de bloques</translation>
+    </message>
+    <message>
+        <source>Error initializing wallet database environment %s!</source>
+        <translation>Error al inicializar el entorno de la base de datos del monedero  %s</translation>
+    </message>
+    <message>
+        <source>Error loading %s</source>
+        <translation>Error cargando %s</translation>
+    </message>
+    <message>
+        <source>Error loading %s: Wallet corrupted</source>
+        <translation>Error cargando %s: Monedero dañado</translation>
+    </message>
+    <message>
+        <source>Error loading %s: Wallet requires newer version of %s</source>
+        <translation>Error cargando %s: Monedero requiere un versión mas reciente de %s</translation>
+    </message>
+    <message>
+        <source>Error loading %s: You can't disable HD on a already existing HD wallet</source>
+        <translation>Error cargando %s: No puede deshabilitar HD en un monedero existente que ya es HD</translation>
+    </message>
+    <message>
+        <source>Error loading block database</source>
+        <translation>Error cargando base de datos de bloques</translation>
+    </message>
+    <message>
+        <source>Error opening block database</source>
+        <translation>Error al abrir base de datos de bloques.</translation>
+    </message>
+    <message>
+        <source>Error: Disk space is low!</source>
+        <translation>Error: ¡Espacio en disco bajo!</translation>
+    </message>
+    <message>
+        <source>Failed to listen on any port. Use -listen=0 if you want this.</source>
+        <translation>Ha fallado la escucha en todos los puertos. Use -listen=0 si desea esto.</translation>
+    </message>
+    <message>
+        <source>Importing...</source>
+        <translation>Importando...</translation>
+    </message>
+    <message>
+        <source>Incorrect or no genesis block found. Wrong datadir for network?</source>
+        <translation>Incorrecto o bloque de génesis no encontrado. Datadir equivocada para la red?</translation>
+    </message>
+    <message>
+        <source>Initialization sanity check failed. %s is shutting down.</source>
+        <translation>La inicialización de la verificación de validez falló. Se está apagando %s.</translation>
+    </message>
+    <message>
+        <source>Invalid -onion address: '%s'</source>
+        <translation>Dirección -onion inválida: '%s'</translation>
+    </message>
+    <message>
+        <source>Invalid amount for -%s=&lt;amount&gt;: '%s'</source>
+        <translation>Cantidad no valida para -%s=&lt;amount&gt;: '%s'</translation>
+    </message>
+    <message>
+        <source>Invalid amount for -fallbackfee=&lt;amount&gt;: '%s'</source>
+        <translation>Cantidad inválida para -fallbackfee=&lt;amount&gt;: '%s'</translation>
+    </message>
+    <message>
+        <source>Keep the transaction memory pool below &lt;n&gt; megabytes (default: %u)</source>
+        <translation>Mantener la memoria de transacciones por debajo de &lt;n&gt; megabytes (predeterminado: %u)</translation>
+    </message>
+    <message>
+        <source>Loading banlist...</source>
+        <translation>Cargando banlist...</translation>
+    </message>
+    <message>
+        <source>Location of the auth cookie (default: data dir)</source>
+        <translation>Ubicación de la cookie de autenticación (default: data dir)</translation>
+    </message>
+    <message>
+        <source>Not enough file descriptors available.</source>
+        <translation>No hay suficientes descriptores de archivo disponibles. </translation>
+    </message>
+    <message>
+        <source>Only connect to nodes in network &lt;net&gt; (ipv4, ipv6 or onion)</source>
+        <translation>Sólo conectar a nodos en redes &lt;net&gt; (ipv4, ipv6 o onion)</translation>
+    </message>
+    <message>
+        <source>Print this help message and exit</source>
+        <translation>Imprimir este mensaje de ayuda y salir</translation>
+    </message>
+    <message>
+        <source>Print version and exit</source>
+        <translation>Imprimir versión y salir</translation>
+    </message>
+    <message>
+        <source>Prune cannot be configured with a negative value.</source>
+        <translation>Pode no se puede configurar con un valor negativo.</translation>
+    </message>
+    <message>
+        <source>Prune mode is incompatible with -txindex.</source>
+        <translation>El modo recorte es incompatible con -txindex.</translation>
+    </message>
+    <message>
+        <source>Rebuild chain state and block index from the blk*.dat files on disk</source>
+        <translation>Reconstruir el estado de la cadena e indice de bloques a partir de los ficheros blk*.dat en disco</translation>
+    </message>
+    <message>
+        <source>Rebuild chain state from the currently indexed blocks</source>
+        <translation>Reconstruir el estado de la cadena a partir de los bloques indexados</translation>
+    </message>
+    <message>
+        <source>Rewinding blocks...</source>
+        <translation>Verificando bloques...</translation>
+    </message>
+    <message>
+        <source>Set database cache size in megabytes (%d to %d, default: %d)</source>
+        <translation>Asignar tamaño de cache en megabytes (entre %d y %d; predeterminado: %d)</translation>
+    </message>
+    <message>
+        <source>Set maximum block size in bytes (default: %d)</source>
+        <translation>Establecer tamaño máximo de bloque en bytes (predeterminado: %d)</translation>
+    </message>
+    <message>
+        <source>Specify wallet file (within data directory)</source>
+        <translation>Especificar archivo de monedero (dentro del directorio de datos)</translation>
+    </message>
+    <message>
+        <source>The source code is available from %s.</source>
+        <translation>El código fuente esta disponible desde %s.</translation>
+    </message>
+    <message>
+        <source>Unable to bind to %s on this computer. %s is probably already running.</source>
+        <translation>No se ha podido conectar con %s en este equipo. %s es posible que este todavia en ejecución.</translation>
+    </message>
+    <message>
+        <source>Unsupported argument -benchmark ignored, use -debug=bench.</source>
+        <translation>El argumento -benchmark no es soportado y ha sido ignorado, utiliza -debug=bench</translation>
+    </message>
+    <message>
+        <source>Unsupported argument -debugnet ignored, use -debug=net.</source>
+        <translation>Parámetros no compatibles -debugnet ignorados , use -debug = red.</translation>
+    </message>
+    <message>
+        <source>Unsupported argument -tor found, use -onion.</source>
+        <translation>Parámetros no compatibles -tor encontrados, use -onion .</translation>
+    </message>
+    <message>
+        <source>Use UPnP to map the listening port (default: %u)</source>
+        <translation>Usar UPnP para asignar el puerto de escucha (predeterminado:: %u)</translation>
+    </message>
+    <message>
+        <source>User Agent comment (%s) contains unsafe characters.</source>
+        <translation>El comentario del Agente de Usuario (%s) contiene caracteres inseguros.</translation>
+    </message>
+    <message>
+        <source>Verifying blocks...</source>
+        <translation>Verificando bloques...</translation>
+    </message>
+    <message>
+        <source>Verifying wallet...</source>
+        <translation>Verificando monedero...</translation>
+    </message>
+    <message>
+        <source>Wallet %s resides outside data directory %s</source>
+        <translation>El monedero %s se encuentra fuera del directorio de datos %s</translation>
+    </message>
+    <message>
+        <source>Wallet debugging/testing options:</source>
+        <translation>Opciones de depuración/pruebas de monedero:</translation>
+    </message>
+    <message>
+        <source>Wallet needed to be rewritten: restart %s to complete</source>
+        <translation>Es necesario reescribir el monedero: reiniciar %s para completar</translation>
+    </message>
+    <message>
+        <source>Wallet options:</source>
+        <translation>Opciones de monedero:</translation>
+    </message>
+    <message>
+        <source>Allow JSON-RPC connections from specified source. Valid for &lt;ip&gt; are a single IP (e.g. 1.2.3.4), a network/netmask (e.g. 1.2.3.4/255.255.255.0) or a network/CIDR (e.g. 1.2.3.4/24). This option can be specified multiple times</source>
+        <translation>Permitir conexiones JSON-RPC de origen especificado. Válido para son una sola IP (por ejemplo 1.2.3.4), una red/máscara de red (por ejemplo 1.2.3.4/255.255.255.0) o una red/CIDR (e.g. 1.2.3.4/24). Esta opción se puede especificar varias veces</translation>
+    </message>
+    <message>
+        <source>Bind to given address and whitelist peers connecting to it. Use [host]:port notation for IPv6</source>
+        <translation>Ligar a las direcciones especificadas y poner en lista blanca a los equipos conectados a ellas. Usar la notación para IPv6 [host]:puerto.</translation>
+    </message>
+    <message>
+        <source>Bind to given address to listen for JSON-RPC connections. Use [host]:port notation for IPv6. This option can be specified multiple times (default: bind to all interfaces)</source>
+        <translation>Ligar a las direcciones especificadas para escuchar por conexiones JSON-RPC. Usar la notación para IPv6 [host]:puerto. Esta opción se puede especificar múltiples veces (por defecto: ligar a todas las interfaces)</translation>
+    </message>
+    <message>
+        <source>Create new files with system default permissions, instead of umask 077 (only effective with disabled wallet functionality)</source>
+        <translation>Crear nuevos archivos con permisos por defecto del sistema, en lugar de umask 077 (sólo efectivo con la funcionalidad de monedero desactivada)</translation>
+    </message>
+    <message>
+        <source>Discover own IP addresses (default: 1 when listening and no -externalip or -proxy)</source>
+        <translation>Descubra direcciones IP propias (por defecto: 1 cuando se escucha y nadie -externalip o -proxy)</translation>
+    </message>
+    <message>
+        <source>Error: Listening for incoming connections failed (listen returned error %s)</source>
+        <translation>Error: la escucha para conexiones entrantes falló (la escucha regresó el error %s)</translation>
+    </message>
+    <message>
+        <source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source>
+        <translation>Ejecutar un comando cuando se reciba una alerta importante o cuando veamos un fork demasiado largo (%s en cmd se reemplazará por el mensaje)</translation>
+    </message>
+    <message>
+        <source>Fees (in %s/kB) smaller than this are considered zero fee for relaying, mining and transaction creation (default: %s)</source>
+        <translation>Las comisiones (en %s/kB) mas pequeñas que esto se consideran como cero comisión para la retransmisión, minería y creación de la transacción (predeterminado: %s)</translation>
+    </message>
+    <message>
+        <source>If paytxfee is not set, include enough fee so transactions begin confirmation on average within n blocks (default: %u)</source>
+        <translation>Si el pago de comisión no está establecido, incluir la cuota suficiente para que las transacciones comiencen la confirmación en una media de n bloques ( por defecto :%u)</translation>
+    </message>
+    <message>
+        <source>Invalid amount for -maxtxfee=&lt;amount&gt;: '%s' (must be at least the minrelay fee of %s to prevent stuck transactions)</source>
+        <translation>Cantidad no válida para -maxtxfee=&lt;amount&gt;: '%s' (debe ser por lo menos la cuota de comisión mínima de %s para prevenir transacciones atascadas)</translation>
+    </message>
+    <message>
+        <source>Maximum size of data in data carrier transactions we relay and mine (default: %u)</source>
+        <translation>El tamaño máximo de los datos en las operaciones de transporte de datos que transmitimos y el mio (default: %u)</translation>
+    </message>
+    <message>
+        <source>Randomize credentials for every proxy connection. This enables Tor stream isolation (default: %u)</source>
+        <translation>Aleatorizar las credenciales para cada conexión proxy. Esto habilita la Tor stream isolation (por defecto: %u)</translation>
+    </message>
+    <message>
+        <source>Set maximum size of high-priority/low-fee transactions in bytes (default: %d)</source>
+        <translation>Establecer tamaño máximo de las transacciones de alta prioridad/baja comisión en bytes (predeterminado: %d)</translation>
+    </message>
+    <message>
+        <source>The transaction amount is too small to send after the fee has been deducted</source>
+        <translation>Monto de transacción muy pequeña luego de la deducción por comisión</translation>
+    </message>
+    <message>
+        <source>Use hierarchical deterministic key generation (HD) after BIP32. Only has effect during wallet creation/first start</source>
+        <translation>Usar tras BIP32 la generación de llave determinística jerárquica (HD) . Solo tiene efecto durante el primer inicio/generación del monedero</translation>
+    </message>
+    <message>
+        <source>Whitelisted peers cannot be DoS banned and their transactions are always relayed, even if they are already in the mempool, useful e.g. for a gateway</source>
+        <translation>A los equipos en lista blanca no se les pueden prohibir los ataques DoS y sus transacciones siempre son retransmitidas, incluso si ya están en el mempool, es útil por ejemplo para un gateway.</translation>
+    </message>
+    <message>
+        <source>You need to rebuild the database using -reindex to go back to unpruned mode.  This will redownload the entire blockchain</source>
+        <translation>Necesitas reconstruir la base de datos utilizando -reindex para volver al modo sin recorte. Esto volverá a descargar toda la cadena de bloques</translation>
+    </message>
+    <message>
+        <source>(default: %u)</source>
+        <translation>(por defecto: %u)</translation>
+    </message>
+    <message>
+        <source>Accept public REST requests (default: %u)</source>
+        <translation>Aceptar solicitudes públicas en FERIADOS (por defecto: %u)</translation>
+    </message>
+    <message>
+        <source>Automatically create Tor hidden service (default: %d)</source>
+        <translation>Automáticamente crea el servicio Tor oculto (por defecto: %d)</translation>
+    </message>
+    <message>
+        <source>Connect through SOCKS5 proxy</source>
+        <translation>Conectar usando SOCKS5 proxy</translation>
+    </message>
+    <message>
+        <source>Error reading from database, shutting down.</source>
+        <translation>Error al leer la base de datos, cerrando.</translation>
+    </message>
+    <message>
+        <source>Imports blocks from external blk000??.dat file on startup</source>
+        <translation>Importa los bloques desde un archivo externo blk000?.dat</translation>
+    </message>
+    <message>
+        <source>Information</source>
+        <translation>Información</translation>
+    </message>
+    <message>
+        <source>Invalid amount for -paytxfee=&lt;amount&gt;: '%s' (must be at least %s)</source>
+        <translation>Cantidad inválida para -paytxfee=&lt;amount&gt;: '%s' (debe ser por lo menos %s)</translation>
+    </message>
+    <message>
+        <source>Invalid netmask specified in -whitelist: '%s'</source>
+        <translation>Máscara de red inválida especificada en -whitelist: '%s'</translation>
+    </message>
+    <message>
+        <source>Keep at most &lt;n&gt; unconnectable transactions in memory (default: %u)</source>
+        <translation>Mantener como máximo &lt;n&gt; transacciones no conectables en memoria (por defecto: %u)</translation>
+    </message>
+    <message>
+        <source>Need to specify a port with -whitebind: '%s'</source>
+        <translation>Necesita especificar un puerto con -whitebind: '%s'</translation>
+    </message>
+    <message>
+        <source>Node relay options:</source>
+        <translation>Opciones de nodos de retransmisión:</translation>
+    </message>
+    <message>
+        <source>RPC server options:</source>
+        <translation>Opciones de servidor RPC:</translation>
+    </message>
+    <message>
+        <source>Reducing -maxconnections from %d to %d, because of system limitations.</source>
+        <translation>Reduciendo -maxconnections de %d a %d, debido a limitaciones del sistema.</translation>
+    </message>
+    <message>
+        <source>Rescan the block chain for missing wallet transactions on startup</source>
+        <translation>Rescanea la cadena de bloques para transacciones perdidas de la cartera</translation>
+    </message>
+    <message>
+        <source>Send trace/debug info to console instead of debug.log file</source>
+        <translation>Enviar información de trazas/depuración a la consola en lugar de al archivo debug.log</translation>
+    </message>
+    <message>
+        <source>Send transactions as zero-fee transactions if possible (default: %u)</source>
+        <translation>Mandar transacciones como comisión-cero si es posible (por defecto: %u)</translation>
+    </message>
+    <message>
+        <source>Show all debugging options (usage: --help -help-debug)</source>
+        <translation>Muestra todas las opciones de depuración (uso: --help -help-debug)</translation>
+    </message>
+    <message>
+        <source>Shrink debug.log file on client startup (default: 1 when no -debug)</source>
+        <translation>Reducir el archivo debug.log al iniciar el cliente (predeterminado: 1 sin -debug)</translation>
+    </message>
+    <message>
+        <source>Signing transaction failed</source>
+        <translation>Transacción falló</translation>
+    </message>
+    <message>
+        <source>The transaction amount is too small to pay the fee</source>
+        <translation>Cantidad de la transacción demasiado pequeña para pagar la comisión</translation>
+    </message>
+    <message>
+        <source>This is experimental software.</source>
+        <translation>Este software es experimental.</translation>
+    </message>
+    <message>
+        <source>Tor control port password (default: empty)</source>
+        <translation>Contraseña del puerto de control de Tor (predeterminado: vacio)</translation>
+    </message>
+    <message>
+        <source>Tor control port to use if onion listening enabled (default: %s)</source>
+        <translation>Puerto de control de Tor a utilizar si la escucha de onion esta activada (predeterminado: %s)</translation>
+    </message>
+    <message>
+        <source>Transaction amount too small</source>
+        <translation>Cantidad de la transacción demasiado pequeña</translation>
+    </message>
+    <message>
+        <source>Transaction too large for fee policy</source>
+        <translation>Operación demasiado grande para la política de tasas</translation>
+    </message>
+    <message>
+        <source>Transaction too large</source>
+        <translation>Transacción demasiado grande, intenta dividirla en varias.</translation>
+    </message>
+    <message>
+        <source>Unable to bind to %s on this computer (bind returned error %s)</source>
+        <translation>No es posible conectar con %s en este sistema (bind ha dado el error %s)</translation>
+    </message>
+    <message>
+        <source>Upgrade wallet to latest format on startup</source>
+        <translation>Actualizar el monedero al último formato al inicio</translation>
+    </message>
+    <message>
+        <source>Username for JSON-RPC connections</source>
+        <translation>Nombre de usuario para las conexiones JSON-RPC
+</translation>
+    </message>
+    <message>
+        <source>Warning</source>
+        <translation>Aviso</translation>
+    </message>
+    <message>
+        <source>Warning: unknown new rules activated (versionbit %i)</source>
+        <translation>Advertencia: nuevas reglas desconocidas activadas (versionbit %i)</translation>
+    </message>
+    <message>
+        <source>Whether to operate in a blocks only mode (default: %u)</source>
+        <translation>Si se debe o no operar en un modo de solo bloques (predeterminado: %u)</translation>
+    </message>
+    <message>
+        <source>Zapping all transactions from wallet...</source>
+        <translation>Eliminando todas las transacciones del monedero...</translation>
+    </message>
+    <message>
+        <source>ZeroMQ notification options:</source>
+        <translation>Opciones de notificación ZeroQM:</translation>
+    </message>
+    <message>
+        <source>Password for JSON-RPC connections</source>
+        <translation>Contraseña para las conexiones JSON-RPC
+</translation>
+    </message>
+    <message>
+        <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
+        <translation>Ejecutar un comando cuando cambia el mejor bloque (%s en cmd se sustituye por el hash de bloque)</translation>
+    </message>
+    <message>
+        <source>Allow DNS lookups for -addnode, -seednode and -connect</source>
+        <translation>Permitir búsquedas DNS para -addnode, -seednode y -connect</translation>
+    </message>
+    <message>
+        <source>Loading addresses...</source>
+        <translation>Cargando direcciones...</translation>
+    </message>
+    <message>
+        <source>(1 = keep tx meta data e.g. account owner and payment request information, 2 = drop tx meta data)</source>
+        <translation>(1 = mantener los meta datos de transacción, por ejemplo: propietario e información de pago, 2 = omitir los metadatos)</translation>
+    </message>
+    <message>
+        <source>-maxtxfee is set very high! Fees this large could be paid on a single transaction.</source>
+        <translation>-maxtxfee tiene un ajuste muy elevado! Comisiones muy grandes podrían ser pagadas en una única transaccion.</translation>
+    </message>
+    <message>
+        <source>Do not keep transactions in the mempool longer than &lt;n&gt; hours (default: %u)</source>
+        <translation>No mantener transacciones en la memoria mas de &lt;n&gt; horas (predeterminado: %u)</translation>
+    </message>
+    <message>
+        <source>Equivalent bytes per sigop in transactions for relay and mining (default: %u)</source>
+        <translation>Bytes equivalentes por sigop en transacciones para retrasmisión y minado (predeterminado: %u)</translation>
+    </message>
+    <message>
+        <source>Fees (in %s/kB) smaller than this are considered zero fee for transaction creation (default: %s)</source>
+        <translation>Las comisiones (en %s/kB) menores que esto son consideradas de cero comision para la creacion de transacciones (predeterminado: %s)</translation>
+    </message>
+    <message>
+        <source>Force relay of transactions from whitelisted peers even if they violate local relay policy (default: %d)</source>
+        <translation>Fuerza la retransmisión de transacciones desde nodos en la lista blanca incluso si violan la política de retransmisiones local (predeterminado: %d)</translation>
+    </message>
+    <message>
+        <source>How thorough the block verification of -checkblocks is (0-4, default: %u)</source>
+        <translation>Nivel de rigor en la verificación de bloques de -checkblocks (0-4; predeterminado: %u)</translation>
+    </message>
+    <message>
+        <source>Maintain a full transaction index, used by the getrawtransaction rpc call (default: %u)</source>
+        <translation>Mantener el índice completo de transacciones, usado por la llamada rpc de getrawtransaction  (por defecto: %u)</translation>
+    </message>
+    <message>
+        <source>Number of seconds to keep misbehaving peers from reconnecting (default: %u)</source>
+        <translation>Número de segundos en que se evita la reconexión de pares con mal comportamiento (predeterminado: %u)</translation>
+    </message>
+    <message>
+        <source>Output debugging information (default: %u, supplying &lt;category&gt; is optional)</source>
+        <translation>Mostrar depuración (por defecto: %u, proporcionar &lt;category&gt; es opcional)</translation>
+    </message>
+    <message>
+        <source>Support filtering of blocks and transaction with bloom filters (default: %u)</source>
+        <translation>Admite filtrado de bloques, y transacciones con filtros Bloom. Reduce la carga de red. ( por defecto :%u)</translation>
+    </message>
+    <message>
+        <source>Total length of network version string (%i) exceeds maximum length (%i). Reduce the number or size of uacomments.</source>
+        <translation>La longitud total de la cadena de versión de red ( %i ) supera la longitud máxima ( %i ) . Reducir el número o tamaño de uacomments .</translation>
+    </message>
+    <message>
+        <source>Unsupported argument -socks found. Setting SOCKS version isn't possible anymore, only SOCKS5 proxies are supported.</source>
+        <translation>Error:  argumento -socks encontrado. El ajuste de la versión SOCKS ya no es posible, sólo proxies SOCKS5 son compatibles.</translation>
+    </message>
+    <message>
+        <source>Unsupported argument -whitelistalwaysrelay ignored, use -whitelistrelay and/or -whitelistforcerelay.</source>
+        <translation>El argumento no soportado -whitelistalwaysrelay ha sido ignorado, utiliza -whitelistrelay  y/o -whitelistforcerelay.</translation>
+    </message>
+    <message>
+        <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: %s)</source>
+        <translation>Usar distintos proxys SOCKS5 para comunicarse vía Tor de forma anónima (Por defecto: %s)</translation>
+    </message>
+    <message>
+        <source>Username and hashed password for JSON-RPC connections. The field &lt;userpw&gt; comes in the format: &lt;USERNAME&gt;:&lt;SALT&gt;$&lt;HASH&gt;. A canonical python script is included in share/rpcuser. This option can be specified multiple times</source>
+        <translation>Nombre de usuario y hash de la contraseña para las conexiones JSON-RPC. El campo &lt;userpw&gt; tiene el formato: &lt;USERNAME&gt;:&lt;SALT&gt;$&lt;HASH&gt;. Se incluye un script python convencional en share/rpcuser. Esta opción puede ser especificada multiples veces</translation>
+    </message>
+    <message>
+        <source>Warning: Unknown block versions being mined! It's possible unknown rules are in effect</source>
+        <translation>Advertencia: Se están minando versiones de bloques desconocidas! Es posible que normas desconocidas estén activas</translation>
+    </message>
+    <message>
+        <source>Warning: Wallet file corrupt, data salvaged! Original %s saved as %s in %s; if your balance or transactions are incorrect you should restore from a backup.</source>
+        <translation>Aviso: fichero de monedero corrupto, datos recuperados! Original %s guardado como %s en %s; si su balance de transacciones es incorrecto, debe restaurar desde una copia de seguridad.</translation>
+    </message>
+    <message>
+        <source>(default: %s)</source>
+        <translation>(predeterminado: %s)</translation>
+    </message>
+    <message>
+        <source>Always query for peer addresses via DNS lookup (default: %u)</source>
+        <translation>Siempre consultar direcciones de otros equipos por medio de DNS lookup (por defecto: %u)</translation>
+    </message>
+    <message>
+        <source>How many blocks to check at startup (default: %u, 0 = all)</source>
+        <translation>Cuántos bloques comprobar al iniciar (predeterminado: %u, 0 = todos)</translation>
+    </message>
+    <message>
+        <source>Include IP addresses in debug output (default: %u)</source>
+        <translation>Incluir direcciones IP en la salida de depuración (por defecto: %u)</translation>
+    </message>
+    <message>
+        <source>Invalid -proxy address: '%s'</source>
+        <translation>Dirección -proxy inválida: '%s'</translation>
+    </message>
+    <message>
+        <source>Listen for JSON-RPC connections on &lt;port&gt; (default: %u or testnet: %u)</source>
+        <translation>Escuchar conexiones JSON-RPC en &lt;puerto&gt; (predeterminado: %u o testnet: %u)</translation>
+    </message>
+    <message>
+        <source>Listen for connections on &lt;port&gt; (default: %u or testnet: %u)</source>
+        <translation>Escuchar conexiones en &lt;puerto&gt; (predeterminado: %u o testnet: %u)</translation>
+    </message>
+    <message>
+        <source>Maintain at most &lt;n&gt; connections to peers (default: %u)</source>
+        <translation>Mantener como máximo &lt;n&gt; conexiones a pares (predeterminado: %u)</translation>
+    </message>
+    <message>
+        <source>Make the wallet broadcast transactions</source>
+        <translation>Realiza las operaciones de difusión del monedero</translation>
+    </message>
+    <message>
+        <source>Maximum per-connection receive buffer, &lt;n&gt;*1000 bytes (default: %u)</source>
+        <translation>Búfer de recepción máximo por conexión, &lt;n&gt;*1000 bytes (por defecto: %u)</translation>
+    </message>
+    <message>
+        <source>Maximum per-connection send buffer, &lt;n&gt;*1000 bytes (default: %u)</source>
+        <translation>Búfer de recepción máximo por conexión, , &lt;n&gt;*1000 bytes (por defecto: %u)</translation>
+    </message>
+    <message>
+        <source>Prepend debug output with timestamp (default: %u)</source>
+        <translation>Anteponer marca temporal a la información de depuración (por defecto: %u)</translation>
+    </message>
+    <message>
+        <source>Relay and mine data carrier transactions (default: %u)</source>
+        <translation>Retransmitir y minar transacciones de transporte de datos (por defecto: %u)</translation>
+    </message>
+    <message>
+        <source>Relay non-P2SH multisig (default: %u)</source>
+        <translation>Relay non-P2SH multisig (default: %u)</translation>
+    </message>
+    <message>
+        <source>Set key pool size to &lt;n&gt; (default: %u)</source>
+        <translation>Ajustar el número de claves en reserva &lt;n&gt; (predeterminado: %u)</translation>
+    </message>
+    <message>
+        <source>Set maximum BIP141 block weight (default: %d)</source>
+        <translation>Establecer peso máximo bloque BIP141  (predeterminado: %d)</translation>
+    </message>
+    <message>
+        <source>Set the number of threads to service RPC calls (default: %d)</source>
+        <translation>Establecer el número de procesos para llamadas del servicio RPC (por defecto: %d)</translation>
+    </message>
+    <message>
+        <source>Specify configuration file (default: %s)</source>
+        <translation>Especificar archivo de configuración (por defecto: %s)</translation>
+    </message>
+    <message>
+        <source>Specify connection timeout in milliseconds (minimum: 1, default: %d)</source>
+        <translation>Especificar tiempo de espera de la conexión (mínimo: 1, por defecto: %d)</translation>
+    </message>
+    <message>
+        <source>Specify pid file (default: %s)</source>
+        <translation>Especificar archivo pid (predeterminado: %s)</translation>
+    </message>
+    <message>
+        <source>Spend unconfirmed change when sending transactions (default: %u)</source>
+        <translation>Usar cambio aún no confirmado al enviar transacciones (predeterminado: %u)</translation>
+    </message>
+    <message>
+        <source>Starting network threads...</source>
+        <translation>Iniciando funciones de red...</translation>
+    </message>
+    <message>
+        <source>Threshold for disconnecting misbehaving peers (default: %u)</source>
+        <translation>Umbral para la desconexión de pares con mal comportamiento (predeterminado: %u)</translation>
+    </message>
+    <message>
+        <source>Unknown network specified in -onlynet: '%s'</source>
+        <translation>La red especificada en -onlynet '%s' es desconocida</translation>
+    </message>
+    <message>
+        <source>Insufficient funds</source>
+        <translation>Fondos insuficientes</translation>
+    </message>
+    <message>
+        <source>Loading block index...</source>
+        <translation>Cargando el índice de bloques...</translation>
+    </message>
+    <message>
+        <source>Add a node to connect to and attempt to keep the connection open</source>
+        <translation>Añadir un nodo al que conectarse y tratar de mantener la conexión abierta</translation>
+    </message>
+    <message>
+        <source>Loading wallet...</source>
+        <translation>Cargando monedero...</translation>
+    </message>
+    <message>
+        <source>Cannot downgrade wallet</source>
+        <translation>No se puede cambiar a una versión mas antigua el monedero</translation>
+    </message>
+    <message>
+        <source>Cannot write default address</source>
+        <translation>No se puede escribir la dirección predeterminada</translation>
+    </message>
+    <message>
+        <source>Rescanning...</source>
+        <translation>Reexplorando...</translation>
+    </message>
+    <message>
+        <source>Done loading</source>
+        <translation>Se terminó de cargar</translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation>Error</translation>
+    </message>
+</context>
 </TS>
\ No newline at end of file
diff --git a/src/qt/locale/bitcoin_es_MX.ts b/src/qt/locale/bitcoin_es_MX.ts
index 0a6ea1e1dd112..bf8f0ceb88fd0 100644
--- a/src/qt/locale/bitcoin_es_MX.ts
+++ b/src/qt/locale/bitcoin_es_MX.ts
@@ -41,7 +41,10 @@
         <source>&amp;Delete</source>
         <translation>&amp;Borrar</translation>
     </message>
-</context>
+    </context>
+<context>
+    <name>AddressTableModel</name>
+    </context>
 <context>
     <name>AskPassphraseDialog</name>
     <message>
@@ -60,7 +63,7 @@
         <source>Repeat new passphrase</source>
         <translation>Repita la nueva contraseña</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>BanTableModel</name>
     <message>
@@ -246,7 +249,7 @@
         <source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;locked&lt;/b&gt;</source>
         <translation>La cartera esta &lt;b&gt;encriptada&lt;/b&gt; y &lt;b&gt;bloqueada&lt;/b&gt; actualmente </translation>
     </message>
-</context>
+    </context>
 <context>
     <name>CoinControlDialog</name>
     <message>
@@ -261,10 +264,6 @@
         <source>Amount:</source>
         <translation>Monto:</translation>
     </message>
-    <message>
-        <source>Priority:</source>
-        <translation>Prioridad:</translation>
-    </message>
     <message>
         <source>Fee:</source>
         <translation>Cuota:</translation>
@@ -289,11 +288,7 @@
         <source>Confirmed</source>
         <translation>Confirmado </translation>
     </message>
-    <message>
-        <source>Priority</source>
-        <translation>Prioridad</translation>
-    </message>
-</context>
+    </context>
 <context>
     <name>EditAddressDialog</name>
     <message>
@@ -308,7 +303,7 @@
         <source>&amp;Address</source>
         <translation>&amp;Dirección</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>FreespaceChecker</name>
     <message>
@@ -346,6 +341,13 @@
         <translation>Error</translation>
     </message>
     </context>
+<context>
+    <name>ModalOverlay</name>
+    <message>
+        <source>Form</source>
+        <translation>Formulario</translation>
+    </message>
+    </context>
 <context>
     <name>OpenURIDialog</name>
     </context>
@@ -375,6 +377,9 @@
         <translation>Formulario</translation>
     </message>
     </context>
+<context>
+    <name>PaymentServer</name>
+    </context>
 <context>
     <name>PeerTableModel</name>
     </context>
@@ -385,6 +390,12 @@
         <translation>Monto</translation>
     </message>
     </context>
+<context>
+    <name>QObject::QObject</name>
+    </context>
+<context>
+    <name>QRImageWidget</name>
+    </context>
 <context>
     <name>RPCConsole</name>
     <message>
@@ -426,6 +437,9 @@
         <translation>&amp;Copiar dirección</translation>
     </message>
     </context>
+<context>
+    <name>RecentRequestsTableModel</name>
+    </context>
 <context>
     <name>SendCoinsDialog</name>
     <message>
@@ -444,10 +458,6 @@
         <source>Amount:</source>
         <translation>Monto:</translation>
     </message>
-    <message>
-        <source>Priority:</source>
-        <translation>Prioridad:</translation>
-    </message>
     <message>
         <source>Fee:</source>
         <translation>Cuota:</translation>
@@ -520,6 +530,9 @@
         <translation>Pago para:</translation>
     </message>
     </context>
+<context>
+    <name>SendConfirmationDialog</name>
+    </context>
 <context>
     <name>ShutdownWindow</name>
     <message>
@@ -552,16 +565,38 @@
 <context>
     <name>TrafficGraphWidget</name>
     </context>
+<context>
+    <name>TransactionDesc</name>
+    </context>
 <context>
     <name>TransactionDescDialog</name>
     <message>
         <source>This pane shows a detailed description of the transaction</source>
         <translation>Este panel muestras una descripción detallada de la transacción</translation>
     </message>
-</context>
+    </context>
+<context>
+    <name>TransactionTableModel</name>
+    </context>
+<context>
+    <name>TransactionView</name>
+    </context>
 <context>
     <name>UnitDisplayStatusBarControl</name>
     </context>
+<context>
+    <name>WalletFrame</name>
+    </context>
+<context>
+    <name>WalletModel</name>
+    <message>
+        <source>Send Coins</source>
+        <translation>Enviar monedas</translation>
+    </message>
+</context>
+<context>
+    <name>WalletView</name>
+    </context>
 <context>
     <name>bitcoin-core</name>
     <message>
diff --git a/src/qt/locale/bitcoin_es_UY.ts b/src/qt/locale/bitcoin_es_UY.ts
index c565a63cd885f..61bf9ad7ed37c 100644
--- a/src/qt/locale/bitcoin_es_UY.ts
+++ b/src/qt/locale/bitcoin_es_UY.ts
@@ -33,7 +33,10 @@
         <source>&amp;Delete</source>
         <translation>&amp;Borrar</translation>
     </message>
-</context>
+    </context>
+<context>
+    <name>AddressTableModel</name>
+    </context>
 <context>
     <name>AskPassphraseDialog</name>
     <message>
@@ -48,7 +51,7 @@
         <source>Repeat new passphrase</source>
         <translation>Repetir nueva contraseña</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>BanTableModel</name>
     </context>
@@ -189,7 +192,7 @@
         <source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;locked&lt;/b&gt;</source>
         <translation>El Monedero esta &lt;b&gt;cifrado&lt;/b&gt; y actualmente &lt;b&gt;bloqueado&lt;/b&gt;</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>CoinControlDialog</name>
     <message>
@@ -204,10 +207,6 @@
         <source>Amount:</source>
         <translation>AMonto:</translation>
     </message>
-    <message>
-        <source>Priority:</source>
-        <translation>Prioridad:</translation>
-    </message>
     <message>
         <source>Change:</source>
         <translation>Cambio:</translation>
@@ -220,11 +219,7 @@
         <source>Confirmed</source>
         <translation>Confirmado</translation>
     </message>
-    <message>
-        <source>Priority</source>
-        <translation>Prioridad</translation>
-    </message>
-</context>
+    </context>
 <context>
     <name>EditAddressDialog</name>
     <message>
@@ -239,7 +234,7 @@
         <source>&amp;Address</source>
         <translation>&amp;Direccion </translation>
     </message>
-</context>
+    </context>
 <context>
     <name>FreespaceChecker</name>
     </context>
@@ -253,6 +248,13 @@
         <translation>Error</translation>
     </message>
     </context>
+<context>
+    <name>ModalOverlay</name>
+    <message>
+        <source>Form</source>
+        <translation>Formulario</translation>
+    </message>
+    </context>
 <context>
     <name>OpenURIDialog</name>
     </context>
@@ -274,12 +276,21 @@
         <translation>Formulario</translation>
     </message>
     </context>
+<context>
+    <name>PaymentServer</name>
+    </context>
 <context>
     <name>PeerTableModel</name>
     </context>
 <context>
     <name>QObject</name>
     </context>
+<context>
+    <name>QObject::QObject</name>
+    </context>
+<context>
+    <name>QRImageWidget</name>
+    </context>
 <context>
     <name>RPCConsole</name>
     <message>
@@ -301,6 +312,9 @@
         <translation>Copiar Dirección</translation>
     </message>
     </context>
+<context>
+    <name>RecentRequestsTableModel</name>
+    </context>
 <context>
     <name>SendCoinsDialog</name>
     <message>
@@ -319,10 +333,6 @@
         <source>Amount:</source>
         <translation>AMonto:</translation>
     </message>
-    <message>
-        <source>Priority:</source>
-        <translation>Prioridad:</translation>
-    </message>
     <message>
         <source>Change:</source>
         <translation>Cambio:</translation>
@@ -371,6 +381,9 @@
         <translation>Pagar A:</translation>
     </message>
     </context>
+<context>
+    <name>SendConfirmationDialog</name>
+    </context>
 <context>
     <name>ShutdownWindow</name>
     </context>
@@ -399,12 +412,30 @@
 <context>
     <name>TrafficGraphWidget</name>
     </context>
+<context>
+    <name>TransactionDesc</name>
+    </context>
 <context>
     <name>TransactionDescDialog</name>
     </context>
+<context>
+    <name>TransactionTableModel</name>
+    </context>
+<context>
+    <name>TransactionView</name>
+    </context>
 <context>
     <name>UnitDisplayStatusBarControl</name>
     </context>
+<context>
+    <name>WalletFrame</name>
+    </context>
+<context>
+    <name>WalletModel</name>
+    </context>
+<context>
+    <name>WalletView</name>
+    </context>
 <context>
     <name>bitcoin-core</name>
     <message>
diff --git a/src/qt/locale/bitcoin_es_VE.ts b/src/qt/locale/bitcoin_es_VE.ts
index 432adc57eeaa0..f465b949a27d7 100644
--- a/src/qt/locale/bitcoin_es_VE.ts
+++ b/src/qt/locale/bitcoin_es_VE.ts
@@ -41,7 +41,10 @@
         <source>&amp;Delete</source>
         <translation>&amp;Borrar</translation>
     </message>
-</context>
+    </context>
+<context>
+    <name>AddressTableModel</name>
+    </context>
 <context>
     <name>AskPassphraseDialog</name>
     <message>
@@ -60,7 +63,7 @@
         <source>Repeat new passphrase</source>
         <translation>Repetir nueva frase de contraseña</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>BanTableModel</name>
     </context>
@@ -174,10 +177,6 @@
         <source>&amp;Command-line options</source>
         <translation>Opciones de línea de comandos</translation>
     </message>
-    <message>
-        <source>%1 and %2</source>
-        <translation>%1 y %2</translation>
-    </message>
     <message>
         <source>%1 behind</source>
         <translation>%1 detrás</translation>
@@ -226,7 +225,7 @@
         <source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;locked&lt;/b&gt;</source>
         <translation>La billetera está encriptada y bloqueada recientemente</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>CoinControlDialog</name>
     <message>
@@ -245,10 +244,6 @@
         <source>Amount:</source>
         <translation>Monto:</translation>
     </message>
-    <message>
-        <source>Priority:</source>
-        <translation>Prioridad:</translation>
-    </message>
     <message>
         <source>Fee:</source>
         <translation>Comisión:</translation>
@@ -297,11 +292,7 @@
         <source>Confirmed</source>
         <translation>Confirmado</translation>
     </message>
-    <message>
-        <source>Priority</source>
-        <translation>Prioridad</translation>
-    </message>
-</context>
+    </context>
 <context>
     <name>EditAddressDialog</name>
     <message>
@@ -324,7 +315,7 @@
         <source>&amp;Address</source>
         <translation>&amp;Dirección</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>FreespaceChecker</name>
     <message>
@@ -390,6 +381,9 @@
         <translation>Error</translation>
     </message>
     </context>
+<context>
+    <name>ModalOverlay</name>
+    </context>
 <context>
     <name>OpenURIDialog</name>
     <message>
@@ -408,7 +402,7 @@
         <source>Select payment request file</source>
         <translation>Seleccionar archivo de solicitud de pago</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>OptionsDialog</name>
     <message>
@@ -447,6 +441,9 @@
         <translation>Pendiente:</translation>
     </message>
     </context>
+<context>
+    <name>PaymentServer</name>
+    </context>
 <context>
     <name>PeerTableModel</name>
     </context>
@@ -456,6 +453,16 @@
         <source>Amount</source>
         <translation>Monto</translation>
     </message>
+    <message>
+        <source>%1 and %2</source>
+        <translation>%1 y %2</translation>
+    </message>
+    </context>
+<context>
+    <name>QObject::QObject</name>
+    </context>
+<context>
+    <name>QRImageWidget</name>
     </context>
 <context>
     <name>RPCConsole</name>
@@ -494,6 +501,9 @@
         <translation>&amp;Copiar Dirección</translation>
     </message>
     </context>
+<context>
+    <name>RecentRequestsTableModel</name>
+    </context>
 <context>
     <name>SendCoinsDialog</name>
     <message>
@@ -508,10 +518,6 @@
         <source>Amount:</source>
         <translation>Monto:</translation>
     </message>
-    <message>
-        <source>Priority:</source>
-        <translation>Prioridad:</translation>
-    </message>
     <message>
         <source>Fee:</source>
         <translation>Comisión:</translation>
@@ -536,6 +542,9 @@
         <translation>&amp;Etiqueta:</translation>
     </message>
     </context>
+<context>
+    <name>SendConfirmationDialog</name>
+    </context>
 <context>
     <name>ShutdownWindow</name>
     </context>
@@ -548,12 +557,30 @@
 <context>
     <name>TrafficGraphWidget</name>
     </context>
+<context>
+    <name>TransactionDesc</name>
+    </context>
 <context>
     <name>TransactionDescDialog</name>
     </context>
+<context>
+    <name>TransactionTableModel</name>
+    </context>
+<context>
+    <name>TransactionView</name>
+    </context>
 <context>
     <name>UnitDisplayStatusBarControl</name>
     </context>
+<context>
+    <name>WalletFrame</name>
+    </context>
+<context>
+    <name>WalletModel</name>
+    </context>
+<context>
+    <name>WalletView</name>
+    </context>
 <context>
     <name>bitcoin-core</name>
     <message>
@@ -592,10 +619,6 @@
         <source>Delete all wallet transactions and only recover those parts of the blockchain through -rescan on startup</source>
         <translation>Borrar todas las transacciones de la billetera y solo recuperar aquellas partes de la cadena de bloques a través de -rescan en el inicio del sistema.</translation>
     </message>
-    <message>
-        <source>Distributed under the MIT software license, see the accompanying file COPYING or &lt;http://www.opensource.org/licenses/mit-license.php&gt;.</source>
-        <translation>Distribuido bajo la licensia de software MIT, ver el archivo adjunto COPYING o &lt;http://www.opensource.org/licenses/mit-license.php&gt;.</translation>
-    </message>
     <message>
         <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source>
         <translation>Ejecutar comando cuando una transacción de la billetera cambia (%s en cmd es reemplazado por TxID)</translation>
@@ -604,18 +627,6 @@
         <source>Set the number of script verification threads (%u to %d, 0 = auto, &lt;0 = leave that many cores free, default: %d)</source>
         <translation>Fija el número de verificación de hilos de script (%u a %d, 0 = auto, &lt;0 = leave that many cores free, default: %d)</translation>
     </message>
-    <message>
-        <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
-        <translation>Esta es una compilación de prueba pre-lanzamiento - use bajo su propio riesgo - no utilizar para aplicaciones de minería o mercantes</translation>
-    </message>
-    <message>
-        <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source>
-        <translation>Aviso: ¡La red no parece estar totalmente de acuerdo! Algunos mineros parecen estar teniendo inconvenientes.</translation>
-    </message>
-    <message>
-        <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source>
-        <translation>Aviso: ¡No parecen estar totalmente de acuerdo con nuestros compañeros! Puede que tengas que actualizar, u otros nodos tengan que actualizarce.</translation>
-    </message>
     <message>
         <source>Information</source>
         <translation>Información</translation>
diff --git a/src/qt/locale/bitcoin_et.ts b/src/qt/locale/bitcoin_et.ts
index 0d659fd71951b..0512b9f117d98 100644
--- a/src/qt/locale/bitcoin_et.ts
+++ b/src/qt/locale/bitcoin_et.ts
@@ -1,6 +1,10 @@
 <TS language="et" version="2.1">
 <context>
     <name>AddressBookPage</name>
+    <message>
+        <source>Right-click to edit address or label</source>
+        <translation>Paremkliki aadressi või sildi muutmiseks</translation>
+    </message>
     <message>
         <source>Create a new address</source>
         <translation>Loo uus aadress</translation>
@@ -37,6 +41,77 @@
         <source>&amp;Delete</source>
         <translation>&amp;Kustuta</translation>
     </message>
+    <message>
+        <source>Choose the address to send coins to</source>
+        <translation>Vali aadress millele mündid saata</translation>
+    </message>
+    <message>
+        <source>Choose the address to receive coins with</source>
+        <translation>Vali aadress müntide vastuvõtmiseks</translation>
+    </message>
+    <message>
+        <source>C&amp;hoose</source>
+        <translation>V&amp;ali</translation>
+    </message>
+    <message>
+        <source>Sending addresses</source>
+        <translation>Saatvad aadressid</translation>
+    </message>
+    <message>
+        <source>Receiving addresses</source>
+        <translation>Vastuvõtvad aadressid</translation>
+    </message>
+    <message>
+        <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source>
+        <translation>Need on sinu Bitcoin aadressid maksete saatmiseks. Ennem müntide saatmist kontrolli alati summat ja makse saaja aadressi.</translation>
+    </message>
+    <message>
+        <source>These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source>
+        <translation>Need on sinu Bitcoin aadressid sisenevate maksete vastu võtmiseks. Soovitav on iga tehingu tarbeks kasutada uut aadressi.</translation>
+    </message>
+    <message>
+        <source>&amp;Copy Address</source>
+        <translation>&amp;Kopeeri Aadress</translation>
+    </message>
+    <message>
+        <source>Copy &amp;Label</source>
+        <translation>Kopeeri &amp;Silt</translation>
+    </message>
+    <message>
+        <source>&amp;Edit</source>
+        <translation>&amp;Muuda</translation>
+    </message>
+    <message>
+        <source>Export Address List</source>
+        <translation>Ekspordi Aadresside Nimekiri</translation>
+    </message>
+    <message>
+        <source>Comma separated file (*.csv)</source>
+        <translation>Komadega eraldatud väärtuste fail (*.csv)</translation>
+    </message>
+    <message>
+        <source>Exporting Failed</source>
+        <translation>Eksport ebaõnnestus.</translation>
+    </message>
+    <message>
+        <source>There was an error trying to save the address list to %1. Please try again.</source>
+        <translation>Tõrge aadressi nimekirja salvestamisel %1. Palun proovi uuesti.</translation>
+    </message>
+</context>
+<context>
+    <name>AddressTableModel</name>
+    <message>
+        <source>Label</source>
+        <translation>Märge</translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation>Aadress</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(märge puudub)</translation>
+    </message>
 </context>
 <context>
     <name>AskPassphraseDialog</name>
@@ -56,6 +131,86 @@
         <source>Repeat new passphrase</source>
         <translation>Korda salafraasi</translation>
     </message>
+    <message>
+        <source>Enter the new passphrase to the wallet.&lt;br/&gt;Please use a passphrase of &lt;b&gt;ten or more random characters&lt;/b&gt;, or &lt;b&gt;eight or more words&lt;/b&gt;.</source>
+        <translation>Sisesta uus salafraas rahakotti.&lt;br/&gt;Kasuta salafraasi millles on&lt;b&gt;kümme või rohkem juhuslikku sümbolit&lt;b&gt;,või&lt;b&gt;kaheksa või rohkem sõna&lt;b/&gt;.</translation>
+    </message>
+    <message>
+        <source>Encrypt wallet</source>
+        <translation>Krüpteeri rahakott</translation>
+    </message>
+    <message>
+        <source>This operation needs your wallet passphrase to unlock the wallet.</source>
+        <translation>Antud operatsioon vajab rahakoti lahtilukustamiseks salafraasi.</translation>
+    </message>
+    <message>
+        <source>Unlock wallet</source>
+        <translation>Ava rahakoti lukk</translation>
+    </message>
+    <message>
+        <source>This operation needs your wallet passphrase to decrypt the wallet.</source>
+        <translation>Antud operatsioon vajab rahakoti dekrüpteerimiseks salafraasi.</translation>
+    </message>
+    <message>
+        <source>Decrypt wallet</source>
+        <translation>Dekrüpteeri rahakott</translation>
+    </message>
+    <message>
+        <source>Change passphrase</source>
+        <translation>Vaheta salafraasi</translation>
+    </message>
+    <message>
+        <source>Enter the old passphrase and new passphrase to the wallet.</source>
+        <translation>Sisesta vana salafraas ja uus salafraas rahakotti.</translation>
+    </message>
+    <message>
+        <source>Confirm wallet encryption</source>
+        <translation>Kinnita rahakoti krüpteerimine.</translation>
+    </message>
+    <message>
+        <source>Warning: If you encrypt your wallet and lose your passphrase, you will &lt;b&gt;LOSE ALL OF YOUR BITCOINS&lt;/b&gt;!</source>
+        <translation>Hoiatus:Kui sa krüpteerid oma rahakoti ja kaotad salafraasi, siis sa&lt;b&gt;KAOTAD OMA BITCOINID&lt;/b&gt;!</translation>
+    </message>
+    <message>
+        <source>Are you sure you wish to encrypt your wallet?</source>
+        <translation>Kas oled kindel, et soovid rahakoti krüpteerida?</translation>
+    </message>
+    <message>
+        <source>Wallet encrypted</source>
+        <translation>Rahakott krüpteeritud</translation>
+    </message>
+    <message>
+        <source>Wallet encryption failed</source>
+        <translation>Rahakoti krüpteerimine ebaõnnestus</translation>
+    </message>
+    <message>
+        <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
+        <translation>Rahakoti krüpteerimine ebaõnnestus sisemise tõrke tõttu. Sinu rahakott ei ole krüpteeritud.</translation>
+    </message>
+    <message>
+        <source>The supplied passphrases do not match.</source>
+        <translation>Sisestatud salafraasid ei kattu.</translation>
+    </message>
+    <message>
+        <source>Wallet unlock failed</source>
+        <translation>Rahakoti lahtilukustamine ebaõnnestus</translation>
+    </message>
+    <message>
+        <source>The passphrase entered for the wallet decryption was incorrect.</source>
+        <translation>Rahakoti dekrüpteerimiseks sisestatud salafraas ei ole õige.</translation>
+    </message>
+    <message>
+        <source>Wallet decryption failed</source>
+        <translation>Rahakoti dekrüpteerimine ebaõnnestus</translation>
+    </message>
+    <message>
+        <source>Wallet passphrase was successfully changed.</source>
+        <translation>Rahakoti salafraas on edukalt vahetatud.</translation>
+    </message>
+    <message>
+        <source>Warning: The Caps Lock key is on!</source>
+        <translation>Hoiatus:Klaviatuuri suurtähelukk on peal.</translation>
+    </message>
 </context>
 <context>
     <name>BanTableModel</name>
@@ -94,6 +249,10 @@
         <source>Quit application</source>
         <translation>Väljumine</translation>
     </message>
+    <message>
+        <source>&amp;About %1</source>
+        <translation>&amp;Teave %1</translation>
+    </message>
     <message>
         <source>About &amp;Qt</source>
         <translation>Teave &amp;Qt kohta</translation>
@@ -140,7 +299,7 @@
     </message>
     <message>
         <source>&amp;Debug window</source>
-        <translation>&amp;Debugimise aken</translation>
+        <translation>&amp;Silumise aken</translation>
     </message>
     <message>
         <source>Open debugging and diagnostic console</source>
@@ -164,7 +323,7 @@
     </message>
     <message>
         <source>&amp;Receive</source>
-        <translation>&amp;Saama</translation>
+        <translation>&amp;Võta vastu</translation>
     </message>
     <message>
         <source>&amp;Show / Hide</source>
@@ -202,29 +361,37 @@
         <source>Tabs toolbar</source>
         <translation>Vahelehe tööriistariba</translation>
     </message>
+    <message>
+        <source>Request payments (generates QR codes and bitcoin: URIs)</source>
+        <translation>Loo maksepäring (genereerib QR koodid ja bitcoini: URId)</translation>
+    </message>
+    <message>
+        <source>Open a bitcoin: URI or payment request</source>
+        <translation>Ava bitcoini: URI või maksepäring</translation>
+    </message>
     <message>
         <source>&amp;Command-line options</source>
         <translation>Käsurea valikud</translation>
     </message>
     <message numerus="yes">
-        <source>%n hour(s)</source>
-        <translation><numerusform>%n tund</numerusform><numerusform>%n tundi</numerusform></translation>
+        <source>%n active connection(s) to Bitcoin network</source>
+        <translation><numerusform>%n aktiivne ühendus Bitcoini võrku</numerusform><numerusform>%n aktiivset ühendust Bitcoini võrku</numerusform></translation>
     </message>
-    <message numerus="yes">
-        <source>%n day(s)</source>
-        <translation><numerusform>%n päev</numerusform><numerusform>%n päeva</numerusform></translation>
+    <message>
+        <source>Indexing blocks on disk...</source>
+        <translation>Kõvakettal olevate plokkide indekseerimine...</translation>
     </message>
-    <message numerus="yes">
-        <source>%n week(s)</source>
-        <translation><numerusform>%n nädal</numerusform><numerusform>%n nädalat</numerusform></translation>
+    <message>
+        <source>Processing blocks on disk...</source>
+        <translation>Kõvakettal olevate plokkide töötlemine...</translation>
     </message>
     <message>
-        <source>%1 and %2</source>
-        <translation>%1 ja %2</translation>
+        <source>No block source available...</source>
+        <translation>Plokkide allikas pole saadaval...</translation>
     </message>
     <message numerus="yes">
-        <source>%n year(s)</source>
-        <translation><numerusform>%n aasta</numerusform><numerusform>%n aastat</numerusform></translation>
+        <source>Processed %n block(s) of transaction history.</source>
+        <translation><numerusform>Töödeldud %n plokk transaktsioonide ajaloost.</numerusform><numerusform>Töödeldud %n plokki transaktsioonide ajaloost.</numerusform></translation>
     </message>
     <message>
         <source>%1 behind</source>
@@ -254,9 +421,13 @@
         <source>Up to date</source>
         <translation>Ajakohane</translation>
     </message>
+    <message>
+        <source>%1 client</source>
+        <translation>%1 klient</translation>
+    </message>
     <message>
         <source>Catching up...</source>
-        <translation>Jõuan...</translation>
+        <translation>Jõuan järgi...</translation>
     </message>
     <message>
         <source>Date: %1
@@ -304,13 +475,17 @@
         <source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;locked&lt;/b&gt;</source>
         <translation>Rahakott on &lt;b&gt;krüpteeritud&lt;/b&gt; ning hetkel &lt;b&gt;suletud&lt;/b&gt;</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>CoinControlDialog</name>
     <message>
         <source>Quantity:</source>
         <translation>Kogus:</translation>
     </message>
+    <message>
+        <source>Bytes:</source>
+        <translation>Baiti:</translation>
+    </message>
     <message>
         <source>Amount:</source>
         <translation>Summa:</translation>
@@ -319,19 +494,107 @@
         <source>Fee:</source>
         <translation>Tasu:</translation>
     </message>
+    <message>
+        <source>Dust:</source>
+        <translation>Puru:</translation>
+    </message>
+    <message>
+        <source>After Fee:</source>
+        <translation>Peale tehingutasu:</translation>
+    </message>
+    <message>
+        <source>Change:</source>
+        <translation>Vahetusraha:</translation>
+    </message>
+    <message>
+        <source>Tree mode</source>
+        <translation>Puu režiim</translation>
+    </message>
+    <message>
+        <source>List mode</source>
+        <translation>Loetelu režiim</translation>
+    </message>
     <message>
         <source>Amount</source>
         <translation>Kogus</translation>
     </message>
+    <message>
+        <source>Received with label</source>
+        <translation>Vastuvõetud märgisega</translation>
+    </message>
+    <message>
+        <source>Received with address</source>
+        <translation>Vastuvõetud aadressiga</translation>
+    </message>
     <message>
         <source>Date</source>
         <translation>Kuupäev</translation>
     </message>
+    <message>
+        <source>Confirmations</source>
+        <translation>Kinnitused</translation>
+    </message>
     <message>
         <source>Confirmed</source>
         <translation>Kinnitatud</translation>
     </message>
-    </context>
+    <message>
+        <source>Copy address</source>
+        <translation>Kopeeri aadress</translation>
+    </message>
+    <message>
+        <source>Copy label</source>
+        <translation>Kopeeri märgis</translation>
+    </message>
+    <message>
+        <source>Copy amount</source>
+        <translation>Kopeeri summa</translation>
+    </message>
+    <message>
+        <source>Copy transaction ID</source>
+        <translation>Kopeeri tehingu ID</translation>
+    </message>
+    <message>
+        <source>Copy quantity</source>
+        <translation>Kopeeri kogus</translation>
+    </message>
+    <message>
+        <source>Copy fee</source>
+        <translation>Kopeeri tehingutasu</translation>
+    </message>
+    <message>
+        <source>Copy bytes</source>
+        <translation>Kopeeri baidid</translation>
+    </message>
+    <message>
+        <source>Copy dust</source>
+        <translation>Kopeeri puru</translation>
+    </message>
+    <message>
+        <source>Copy change</source>
+        <translation>Kopeeri vahetusraha</translation>
+    </message>
+    <message>
+        <source>(%1 locked)</source>
+        <translation>(%1 lukustatud)</translation>
+    </message>
+    <message>
+        <source>yes</source>
+        <translation>jah</translation>
+    </message>
+    <message>
+        <source>no</source>
+        <translation>ei</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(märgis puudub)</translation>
+    </message>
+    <message>
+        <source>(change)</source>
+        <translation>(vahetusraha)</translation>
+    </message>
+</context>
 <context>
     <name>EditAddressDialog</name>
     <message>
@@ -346,6 +609,38 @@
         <source>&amp;Address</source>
         <translation>&amp;Aadress</translation>
     </message>
+    <message>
+        <source>New receiving address</source>
+        <translation>Uus vastu võttev aadress</translation>
+    </message>
+    <message>
+        <source>New sending address</source>
+        <translation>Uus saatev aadress</translation>
+    </message>
+    <message>
+        <source>Edit receiving address</source>
+        <translation>Muuda vastuvõtvat aadressi</translation>
+    </message>
+    <message>
+        <source>Edit sending address</source>
+        <translation>Muuda saatvat aadressi</translation>
+    </message>
+    <message>
+        <source>The entered address "%1" is not a valid Bitcoin address.</source>
+        <translation>Sisestatud aadress "%1" ei ole korrektne Bitcoin aadress.</translation>
+    </message>
+    <message>
+        <source>The entered address "%1" is already in the address book.</source>
+        <translation>Sisestatud aadress "%1" on juba aadressi raamatus.</translation>
+    </message>
+    <message>
+        <source>Could not unlock wallet.</source>
+        <translation>Rahakoti lahtilukustamine ebaõnnestus.</translation>
+    </message>
+    <message>
+        <source>New key generation failed.</source>
+        <translation>Uue võtme genereerimine ebaõnnestus.</translation>
+    </message>
 </context>
 <context>
     <name>FreespaceChecker</name>
@@ -372,6 +667,14 @@
         <source>command-line options</source>
         <translation>käsurea valikud</translation>
     </message>
+    <message>
+        <source>UI Options:</source>
+        <translation>Kasutajaliidese Suvandid:</translation>
+    </message>
+    <message>
+        <source>Show splash screen on startup (default: %u)</source>
+        <translation>Käivitamisel kuva laadimisekraani (vaikimisi %u)</translation>
+    </message>
     </context>
 <context>
     <name>Intro</name>
@@ -384,6 +687,21 @@
         <translation>Tõrge</translation>
     </message>
     </context>
+<context>
+    <name>ModalOverlay</name>
+    <message>
+        <source>Form</source>
+        <translation>Vorm</translation>
+    </message>
+    <message>
+        <source>Last block time</source>
+        <translation>Viimane ploki aeg</translation>
+    </message>
+    <message>
+        <source>Hide</source>
+        <translation>Peida</translation>
+    </message>
+    </context>
 <context>
     <name>OpenURIDialog</name>
     <message>
@@ -394,7 +712,15 @@
         <source>URI:</source>
         <translation>URI:</translation>
     </message>
-    </context>
+    <message>
+        <source>Select payment request file</source>
+        <translation>Vali maksepäringu fail</translation>
+    </message>
+    <message>
+        <source>Select payment request file to open</source>
+        <translation>Vali maksepäringu fail mida avada</translation>
+    </message>
+</context>
 <context>
     <name>OptionsDialog</name>
     <message>
@@ -449,6 +775,18 @@
         <source>Port of the proxy (e.g. 9050)</source>
         <translation>Proxi port (nt 9050)</translation>
     </message>
+    <message>
+        <source>IPv4</source>
+        <translation>IPv4</translation>
+    </message>
+    <message>
+        <source>IPv6</source>
+        <translation>IPv6</translation>
+    </message>
+    <message>
+        <source>Tor</source>
+        <translation>Tor</translation>
+    </message>
     <message>
         <source>&amp;Window</source>
         <translation>&amp;Aken</translation>
@@ -493,6 +831,10 @@
         <source>default</source>
         <translation>vaikeväärtus</translation>
     </message>
+    <message>
+        <source>none</source>
+        <translation>puudub</translation>
+    </message>
     <message>
         <source>Confirm options reset</source>
         <translation>Kinnita valikute algseadistamine</translation>
@@ -512,6 +854,10 @@
         <source>The displayed information may be out of date. Your wallet automatically synchronizes with the Bitcoin network after a connection is established, but this process has not completed yet.</source>
         <translation>Kuvatav info ei pruugi olla ajakohane. Ühenduse loomisel süngitakse sinu rahakott automaatselt Bitconi võrgustikuga, kuid see toiming on hetkel lõpetamata.</translation>
     </message>
+    <message>
+        <source>Pending:</source>
+        <translation>Ootel:</translation>
+    </message>
     <message>
         <source>Immature:</source>
         <translation>Ebaküps:</translation>
@@ -520,11 +866,34 @@
         <source>Mined balance that has not yet matured</source>
         <translation>Mitte aegunud mine'itud jääk</translation>
     </message>
+    <message>
+        <source>Total:</source>
+        <translation>Kokku:</translation>
+    </message>
     <message>
         <source>Recent transactions</source>
         <translation>Hiljutised tehingud</translation>
     </message>
     </context>
+<context>
+    <name>PaymentServer</name>
+    <message>
+        <source>Payment request error</source>
+        <translation>Maksepäringu tõrge</translation>
+    </message>
+    <message>
+        <source>Payment request rejected</source>
+        <translation>Maksepäring tagasi lükatud</translation>
+    </message>
+    <message>
+        <source>Payment request expired.</source>
+        <translation>Maksepäring aegunud.</translation>
+    </message>
+    <message>
+        <source>Unverified payment requests to custom payment scripts are unsupported.</source>
+        <translation>Kinnitamata maksepäringud kohandatud makse scriptidele ei ole toetatud.</translation>
+    </message>
+    </context>
 <context>
     <name>PeerTableModel</name>
     </context>
@@ -538,6 +907,20 @@
         <source>N/A</source>
         <translation>N/A</translation>
     </message>
+    <message>
+        <source>%1 and %2</source>
+        <translation>%1 ja %2</translation>
+    </message>
+    </context>
+<context>
+    <name>QObject::QObject</name>
+    </context>
+<context>
+    <name>QRImageWidget</name>
+    <message>
+        <source>Save QR Code</source>
+        <translation>Salvesta QR Kood</translation>
+    </message>
     </context>
 <context>
     <name>RPCConsole</name>
@@ -561,6 +944,10 @@
         <source>General</source>
         <translation>Üldine</translation>
     </message>
+    <message>
+        <source>Using BerkeleyDB version</source>
+        <translation>Kasutab BerkeleyDB versiooni</translation>
+    </message>
     <message>
         <source>Startup time</source>
         <translation>Käivitamise hetk</translation>
@@ -585,6 +972,10 @@
         <source>Current number of blocks</source>
         <translation>Plokkide hetkearv</translation>
     </message>
+    <message>
+        <source>Memory usage</source>
+        <translation>Mälu kasutus</translation>
+    </message>
     <message>
         <source>Received</source>
         <translation>Vastuvõetud</translation>
@@ -601,6 +992,14 @@
         <source>Version</source>
         <translation>Versioon</translation>
     </message>
+    <message>
+        <source>Synced Headers</source>
+        <translation>Sünkroniseeritud Päised</translation>
+    </message>
+    <message>
+        <source>Synced Blocks</source>
+        <translation>Sünkroniseeritud Plokid</translation>
+    </message>
     <message>
         <source>Services</source>
         <translation>Teenused</translation>
@@ -619,7 +1018,7 @@
     </message>
     <message>
         <source>Debug log file</source>
-        <translation>Debugimise logifail</translation>
+        <translation>Silumise logifail</translation>
     </message>
     <message>
         <source>Clear console</source>
@@ -649,7 +1048,27 @@
         <source>%1 GB</source>
         <translation>%1 GB</translation>
     </message>
-    </context>
+    <message>
+        <source>Inbound</source>
+        <translation>Sisenev</translation>
+    </message>
+    <message>
+        <source>Outbound</source>
+        <translation>Väljuv</translation>
+    </message>
+    <message>
+        <source>Yes</source>
+        <translation>Jah</translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation>Ei</translation>
+    </message>
+    <message>
+        <source>Unknown</source>
+        <translation>Teadmata</translation>
+    </message>
+</context>
 <context>
     <name>ReceiveCoinsDialog</name>
     <message>
@@ -664,6 +1083,10 @@
         <source>&amp;Message:</source>
         <translation>&amp;Sõnum:</translation>
     </message>
+    <message>
+        <source>Clear all fields of the form.</source>
+        <translation>Puhasta kõik vormi väljad.</translation>
+    </message>
     <message>
         <source>Show</source>
         <translation>Näita</translation>
@@ -672,13 +1095,76 @@
         <source>Remove</source>
         <translation>Eemalda</translation>
     </message>
+    <message>
+        <source>Copy label</source>
+        <translation>Kopeeri märgis</translation>
+    </message>
+    <message>
+        <source>Copy message</source>
+        <translation>Kopeeri sõnum</translation>
+    </message>
+    <message>
+        <source>Copy amount</source>
+        <translation>Kopeeri summa</translation>
+    </message>
 </context>
 <context>
     <name>ReceiveRequestDialog</name>
+    <message>
+        <source>QR Code</source>
+        <translation>QR Kood</translation>
+    </message>
     <message>
         <source>Copy &amp;Address</source>
         <translation>&amp;Kopeeri Aadress</translation>
     </message>
+    <message>
+        <source>Payment information</source>
+        <translation>Makse Informatsioon</translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation>Aadress</translation>
+    </message>
+    <message>
+        <source>Amount</source>
+        <translation>Summa</translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation>Silt</translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation>Sõnum</translation>
+    </message>
+    <message>
+        <source>Resulting URI too long, try to reduce the text for label / message.</source>
+        <translation>URI liiga pikk, proovi vähendada märke / sõnumi pikkust.</translation>
+    </message>
+    </context>
+<context>
+    <name>RecentRequestsTableModel</name>
+    <message>
+        <source>Date</source>
+        <translation>Kuupäev</translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation>Silt</translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation>Sõnum</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(märge puudub)</translation>
+    </message>
+    <message>
+        <source>(no message)</source>
+        <translation>(sõnum puudub)</translation>
+    </message>
     </context>
 <context>
     <name>SendCoinsDialog</name>
@@ -686,6 +1172,14 @@
         <source>Send Coins</source>
         <translation>Müntide saatmine</translation>
     </message>
+    <message>
+        <source>Inputs...</source>
+        <translation>Sisendid...</translation>
+    </message>
+    <message>
+        <source>automatically selected</source>
+        <translation>automaatselt valitud</translation>
+    </message>
     <message>
         <source>Insufficient funds!</source>
         <translation>Liiga suur summa</translation>
@@ -694,6 +1188,10 @@
         <source>Quantity:</source>
         <translation>Kogus:</translation>
     </message>
+    <message>
+        <source>Bytes:</source>
+        <translation>Baiti:</translation>
+    </message>
     <message>
         <source>Amount:</source>
         <translation>Summa:</translation>
@@ -702,6 +1200,14 @@
         <source>Fee:</source>
         <translation>Tasu:</translation>
     </message>
+    <message>
+        <source>After Fee:</source>
+        <translation>Peale tehingutasu:</translation>
+    </message>
+    <message>
+        <source>Change:</source>
+        <translation>Vahetusraha:</translation>
+    </message>
     <message>
         <source>Transaction Fee:</source>
         <translation>Tehingu tasu:</translation>
@@ -710,6 +1216,10 @@
         <source>Choose...</source>
         <translation>Vali...</translation>
     </message>
+    <message>
+        <source>per kilobyte</source>
+        <translation>kilobaidi kohta</translation>
+    </message>
     <message>
         <source>Hide</source>
         <translation>Peida</translation>
@@ -734,6 +1244,14 @@
         <source>Add &amp;Recipient</source>
         <translation>Lisa &amp;Saaja</translation>
     </message>
+    <message>
+        <source>Clear all fields of the form.</source>
+        <translation>Puhasta kõik vormi väljad.</translation>
+    </message>
+    <message>
+        <source>Dust:</source>
+        <translation>Puru:</translation>
+    </message>
     <message>
         <source>Clear &amp;All</source>
         <translation>Puhasta &amp;Kõik</translation>
@@ -750,6 +1268,58 @@
         <source>S&amp;end</source>
         <translation>S&amp;aada</translation>
     </message>
+    <message>
+        <source>Copy quantity</source>
+        <translation>Kopeeri kogus</translation>
+    </message>
+    <message>
+        <source>Copy amount</source>
+        <translation>Kopeeri summa</translation>
+    </message>
+    <message>
+        <source>Copy fee</source>
+        <translation>Kopeeri tehingutasu</translation>
+    </message>
+    <message>
+        <source>Copy bytes</source>
+        <translation>Kopeeri baidid</translation>
+    </message>
+    <message>
+        <source>Copy dust</source>
+        <translation>Kopeeri puru</translation>
+    </message>
+    <message>
+        <source>Copy change</source>
+        <translation>Kopeeri vahetusraha</translation>
+    </message>
+    <message>
+        <source>Are you sure you want to send?</source>
+        <translation>Oled kindel, et soovid saata?</translation>
+    </message>
+    <message>
+        <source>added as transaction fee</source>
+        <translation>lisatud kui tehingutasu</translation>
+    </message>
+    <message>
+        <source>or</source>
+        <translation>või</translation>
+    </message>
+    <message>
+        <source>The recipient address is not valid. Please recheck.</source>
+        <translation>Saaja aadress ei ole korrektne. Palun kontrolli üle.</translation>
+    </message>
+    <message>
+        <source>Payment request expired.</source>
+        <translation>Maksepäring aegunud.</translation>
+    </message>
+    <message>
+        <source>Warning: Invalid Bitcoin address</source>
+        <translation>Hoiatus: Ebakorrektne Bitcoin aadress</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(märgis puudub)</translation>
+    </message>
 </context>
 <context>
     <name>SendCoinsEntry</name>
@@ -765,6 +1335,10 @@
         <source>&amp;Label:</source>
         <translation>&amp;Märgis</translation>
     </message>
+    <message>
+        <source>Choose previously used address</source>
+        <translation>Vali eelnevalt kasutatud aadress</translation>
+    </message>
     <message>
         <source>Alt+A</source>
         <translation>Alt+A</translation>
@@ -777,6 +1351,10 @@
         <source>Alt+P</source>
         <translation>Alt+P</translation>
     </message>
+    <message>
+        <source>S&amp;ubtract fee from amount</source>
+        <translation>L&amp;ahuta tehingutasu summast</translation>
+    </message>
     <message>
         <source>Message:</source>
         <translation>Sõnum:</translation>
@@ -786,9 +1364,24 @@
         <translation>Maksa :</translation>
     </message>
     </context>
+<context>
+    <name>SendConfirmationDialog</name>
+    <message>
+        <source>Yes</source>
+        <translation>Jah</translation>
+    </message>
+</context>
 <context>
     <name>ShutdownWindow</name>
-    </context>
+    <message>
+        <source>%1 is shutting down...</source>
+        <translation>%1 lülitub välja...</translation>
+    </message>
+    <message>
+        <source>Do not shut down the computer until this window disappears.</source>
+        <translation>Ära lülita arvutit välja ennem kui see aken on kadunud.</translation>
+    </message>
+</context>
 <context>
     <name>SignVerifyMessageDialog</name>
     <message>
@@ -799,6 +1392,14 @@
         <source>&amp;Sign Message</source>
         <translation>&amp;Allkirjastamise teade</translation>
     </message>
+    <message>
+        <source>The Bitcoin address to sign the message with</source>
+        <translation>Bitcoin aadress millega sõnum allkirjastada</translation>
+    </message>
+    <message>
+        <source>Choose previously used address</source>
+        <translation>Vali eelnevalt kasutatud aadress</translation>
+    </message>
     <message>
         <source>Alt+A</source>
         <translation>Alt+A</translation>
@@ -843,6 +1444,10 @@
         <source>&amp;Verify Message</source>
         <translation>&amp;Kinnita Sõnum</translation>
     </message>
+    <message>
+        <source>The Bitcoin address the message was signed with</source>
+        <translation>Bitcoin aadress millega sõnum on allkirjastatud</translation>
+    </message>
     <message>
         <source>Verify the message to ensure it was signed with the specified Bitcoin address</source>
         <translation>Kinnita sõnum tõestamaks selle allkirjastatust määratud Bitcoini aadressiga.</translation>
@@ -855,6 +1460,54 @@
         <source>Reset all verify message fields</source>
         <translation>Tühjenda kõik sõnumi kinnitamise väljad</translation>
     </message>
+    <message>
+        <source>Click "Sign Message" to generate signature</source>
+        <translation>Allkirja loomiseks vajuta "Allkirjasta Sõnum"</translation>
+    </message>
+    <message>
+        <source>The entered address is invalid.</source>
+        <translation>Sisestatud aadress ei ole korrektne</translation>
+    </message>
+    <message>
+        <source>Please check the address and try again.</source>
+        <translation>Palun kontrolli aadressi ja proovi uuesti.</translation>
+    </message>
+    <message>
+        <source>Wallet unlock was cancelled.</source>
+        <translation>Rahakoti lahtilukustamine on katkestatud.</translation>
+    </message>
+    <message>
+        <source>Private key for the entered address is not available.</source>
+        <translation>Sisestatud aadressi privaatvõti pole saadaval.</translation>
+    </message>
+    <message>
+        <source>Message signing failed.</source>
+        <translation>Sõnumi allkirjastamine ebaõnnestus.</translation>
+    </message>
+    <message>
+        <source>Message signed.</source>
+        <translation>Sõnum allkirjastatud</translation>
+    </message>
+    <message>
+        <source>The signature could not be decoded.</source>
+        <translation>Allkirja polnud võimalik dekodeerida.</translation>
+    </message>
+    <message>
+        <source>Please check the signature and try again.</source>
+        <translation>Palun kontrolli allkirja ja proovi uuesti.</translation>
+    </message>
+    <message>
+        <source>The signature did not match the message digest.</source>
+        <translation>Allkiri ei vastanud sõnumi krüptoräsile.</translation>
+    </message>
+    <message>
+        <source>Message verification failed.</source>
+        <translation>Sõnumi verifitseerimine ebaõnnestus.</translation>
+    </message>
+    <message>
+        <source>Message verified.</source>
+        <translation>Sõnum verifitseeritud.</translation>
+    </message>
 </context>
 <context>
     <name>SplashScreen</name>
@@ -870,16 +1523,190 @@
         <translation>KB/s</translation>
     </message>
 </context>
+<context>
+    <name>TransactionDesc</name>
+    <message>
+        <source>%1/unconfirmed</source>
+        <translation>%1/kinnitamata</translation>
+    </message>
+    <message>
+        <source>%1 confirmations</source>
+        <translation>%1 kinnitust</translation>
+    </message>
+    <message>
+        <source>Status</source>
+        <translation>Olek</translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation>Kuupäev</translation>
+    </message>
+    <message>
+        <source>Generated</source>
+        <translation>Genereeritud</translation>
+    </message>
+    <message>
+        <source>label</source>
+        <translation>märgis</translation>
+    </message>
+    <message>
+        <source>not accepted</source>
+        <translation>pole vastu võetud</translation>
+    </message>
+    <message>
+        <source>Transaction fee</source>
+        <translation>Tehingutasu</translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation>Sõnum</translation>
+    </message>
+    <message>
+        <source>Comment</source>
+        <translation>Kommentaar</translation>
+    </message>
+    <message>
+        <source>Merchant</source>
+        <translation>Kaupleja</translation>
+    </message>
+    <message>
+        <source>Inputs</source>
+        <translation>Sisendid</translation>
+    </message>
+    <message>
+        <source>Amount</source>
+        <translation>Summa</translation>
+    </message>
+    <message>
+        <source>true</source>
+        <translation>tõene</translation>
+    </message>
+    <message>
+        <source>false</source>
+        <translation>väär</translation>
+    </message>
+</context>
 <context>
     <name>TransactionDescDialog</name>
     <message>
         <source>This pane shows a detailed description of the transaction</source>
         <translation>Paan kuvab tehingu detailid</translation>
     </message>
-</context>
+    </context>
+<context>
+    <name>TransactionTableModel</name>
+    <message>
+        <source>Date</source>
+        <translation>Kuupäev</translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation>Tüüp</translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation>Silt</translation>
+    </message>
+    <message>
+        <source>Unconfirmed</source>
+        <translation>Kinnitamata</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(silt puudub)</translation>
+    </message>
+    </context>
+<context>
+    <name>TransactionView</name>
+    <message>
+        <source>All</source>
+        <translation>Kõik</translation>
+    </message>
+    <message>
+        <source>Today</source>
+        <translation>Täna</translation>
+    </message>
+    <message>
+        <source>This week</source>
+        <translation>Käesolev nädal</translation>
+    </message>
+    <message>
+        <source>This month</source>
+        <translation>Käesolev kuu</translation>
+    </message>
+    <message>
+        <source>Last month</source>
+        <translation>Eelmine kuu</translation>
+    </message>
+    <message>
+        <source>This year</source>
+        <translation>Käesolev aasta</translation>
+    </message>
+    <message>
+        <source>Range...</source>
+        <translation>Vahemik...</translation>
+    </message>
+    <message>
+        <source>Min amount</source>
+        <translation>Minimaalne summa</translation>
+    </message>
+    <message>
+        <source>Copy address</source>
+        <translation>Kopeeri aadress</translation>
+    </message>
+    <message>
+        <source>Copy label</source>
+        <translation>Kopeeri märgis</translation>
+    </message>
+    <message>
+        <source>Copy amount</source>
+        <translation>Kopeeri summa</translation>
+    </message>
+    <message>
+        <source>Copy transaction ID</source>
+        <translation>Kopeeri tehingu ID</translation>
+    </message>
+    <message>
+        <source>Comma separated file (*.csv)</source>
+        <translation>Komadega eraldatud väärtuste fail (*.csv)</translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation>Kuupäev</translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation>Tüüp</translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation>Silt</translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation>Aadress</translation>
+    </message>
+    <message>
+        <source>ID</source>
+        <translation>ID</translation>
+    </message>
+    <message>
+        <source>Exporting Failed</source>
+        <translation>Eksport ebaõnnestus.</translation>
+    </message>
+    </context>
 <context>
     <name>UnitDisplayStatusBarControl</name>
     </context>
+<context>
+    <name>WalletFrame</name>
+    </context>
+<context>
+    <name>WalletModel</name>
+    </context>
+<context>
+    <name>WalletView</name>
+    </context>
 <context>
     <name>bitcoin-core</name>
     <message>
@@ -906,10 +1733,6 @@
         <source>Run in the background as a daemon and accept commands</source>
         <translation>Tööta taustal ning aktsepteeri käsklusi</translation>
     </message>
-    <message>
-        <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
-        <translation>Luba välisühendusi (vaikeväärtus: 1 kui puudub -proxy või -connect)</translation>
-    </message>
     <message>
         <source>Bitcoin Core</source>
         <translation>Bitcoini tuumik</translation>
@@ -922,18 +1745,10 @@
         <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source>
         <translation>Käivita käsklus, kui rahakoti tehing muutub (%s cmd's muudetakse TxID'ks)</translation>
     </message>
-    <message>
-        <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
-        <translation>See on test-versioon - kasutamine omal riisikol - ära kasuta mining'uks ega kaupmeeste programmides</translation>
-    </message>
     <message>
         <source>Block creation options:</source>
         <translation>Blokeeri loomise valikud:</translation>
     </message>
-    <message>
-        <source>Connect only to the specified node(s)</source>
-        <translation>Ühendu ainult määratud node'i(de)ga</translation>
-    </message>
     <message>
         <source>Corrupted block database detected</source>
         <translation>Tuvastati vigane bloki andmebaas</translation>
diff --git a/src/qt/locale/bitcoin_et_EE.ts b/src/qt/locale/bitcoin_et_EE.ts
new file mode 100644
index 0000000000000..d96ffa42f5bd1
--- /dev/null
+++ b/src/qt/locale/bitcoin_et_EE.ts
@@ -0,0 +1,747 @@
+<TS language="et_EE" version="2.1">
+<context>
+    <name>AddressBookPage</name>
+    <message>
+        <source>Create a new address</source>
+        <translation>Loo uus aadress</translation>
+    </message>
+    <message>
+        <source>&amp;New</source>
+        <translation>&amp;Uus</translation>
+    </message>
+    <message>
+        <source>&amp;Copy</source>
+        <translation>&amp;Kopeeri</translation>
+    </message>
+    <message>
+        <source>Delete the currently selected address from the list</source>
+        <translation>Kustuta valitud aadress nimekirjast</translation>
+    </message>
+    <message>
+        <source>&amp;Delete</source>
+        <translation>&amp;Kustuta</translation>
+    </message>
+    <message>
+        <source>&amp;Edit</source>
+        <translation>&amp;Muuda</translation>
+    </message>
+    </context>
+<context>
+    <name>AddressTableModel</name>
+    <message>
+        <source>Label</source>
+        <translation>Silt</translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation>Aadress</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(silt puudub)</translation>
+    </message>
+</context>
+<context>
+    <name>AskPassphraseDialog</name>
+    <message>
+        <source>Enter passphrase</source>
+        <translation>Sisesta parool</translation>
+    </message>
+    <message>
+        <source>New passphrase</source>
+        <translation>Uus parool</translation>
+    </message>
+    <message>
+        <source>Repeat new passphrase</source>
+        <translation>Korda uut parooli</translation>
+    </message>
+    <message>
+        <source>Encrypt wallet</source>
+        <translation>Krüpteeri rahakott</translation>
+    </message>
+    <message>
+        <source>Decrypt wallet</source>
+        <translation>Dekrüpteeri rahakott</translation>
+    </message>
+    <message>
+        <source>Change passphrase</source>
+        <translation>Muuda parooli</translation>
+    </message>
+    <message>
+        <source>Are you sure you wish to encrypt your wallet?</source>
+        <translation>Kas oled kindel, et soovid rahakoti krüpteerida?</translation>
+    </message>
+    <message>
+        <source>Wallet encrypted</source>
+        <translation>Rahakott krüpteeritud</translation>
+    </message>
+    <message>
+        <source>Wallet encryption failed</source>
+        <translation>Rahakoti krüpteerimine ebaõnnestus</translation>
+    </message>
+    <message>
+        <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
+        <translation>Rahakoti krüpteerimine ebaõnnestus sisemise vea tõttu. Sinu rahakotti ei krüpteeritud.</translation>
+    </message>
+    <message>
+        <source>The supplied passphrases do not match.</source>
+        <translation>Sisestatud paroolid ei kattu.</translation>
+    </message>
+    <message>
+        <source>Wallet decryption failed</source>
+        <translation>Rahakoti dekrüpteerimine ebaõnnestus</translation>
+    </message>
+    <message>
+        <source>Wallet passphrase was successfully changed.</source>
+        <translation>Rahakoti parooli vahetus õnnestus.</translation>
+    </message>
+    </context>
+<context>
+    <name>BanTableModel</name>
+    </context>
+<context>
+    <name>BitcoinGUI</name>
+    <message>
+        <source>Synchronizing with network...</source>
+        <translation>Võrguga sünkroniseerimine...</translation>
+    </message>
+    <message>
+        <source>&amp;Overview</source>
+        <translation>&amp;Ülevaade</translation>
+    </message>
+    <message>
+        <source>Open &amp;URI...</source>
+        <translation>Ava &amp;URI...</translation>
+    </message>
+    <message>
+        <source>Reindexing blocks on disk...</source>
+        <translation>Kõvakettal olevate plokkide reindekseerimine...</translation>
+    </message>
+    <message>
+        <source>Bitcoin</source>
+        <translation>Bitcoin</translation>
+    </message>
+    <message>
+        <source>Wallet</source>
+        <translation>Rahakott</translation>
+    </message>
+    <message>
+        <source>&amp;File</source>
+        <translation>&amp;Fail</translation>
+    </message>
+    <message>
+        <source>&amp;Help</source>
+        <translation>&amp;Abi</translation>
+    </message>
+    <message>
+        <source>%1 behind</source>
+        <translation>%1 ajast maas</translation>
+    </message>
+    <message>
+        <source>Transactions after this will not yet be visible.</source>
+        <translation>Hilisemad transaktsioonid ei ole veel nähtavad.</translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation>Viga</translation>
+    </message>
+    <message>
+        <source>Warning</source>
+        <translation>Hoiatus</translation>
+    </message>
+    <message>
+        <source>Information</source>
+        <translation>Informatsioon</translation>
+    </message>
+    </context>
+<context>
+    <name>CoinControlDialog</name>
+    <message>
+        <source>Amount:</source>
+        <translation>Kogus</translation>
+    </message>
+    <message>
+        <source>Amount</source>
+        <translation>Kogus</translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation>Kuupäev</translation>
+    </message>
+    <message>
+        <source>Confirmations</source>
+        <translation>Kinnitused</translation>
+    </message>
+    <message>
+        <source>Confirmed</source>
+        <translation>Kinnitatud</translation>
+    </message>
+    <message>
+        <source>Copy address</source>
+        <translation>Kopeeri aadress</translation>
+    </message>
+    <message>
+        <source>Copy amount</source>
+        <translation>Kopeeri kogus</translation>
+    </message>
+    <message>
+        <source>Copy transaction ID</source>
+        <translation>Kopeeri transaktsiooni ID</translation>
+    </message>
+    <message>
+        <source>yes</source>
+        <translation>jah</translation>
+    </message>
+    <message>
+        <source>no</source>
+        <translation>ei</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(silt puudub)</translation>
+    </message>
+    </context>
+<context>
+    <name>EditAddressDialog</name>
+    <message>
+        <source>New key generation failed.</source>
+        <translation>Uue võtme genereerimine ebaõnnestus.</translation>
+    </message>
+</context>
+<context>
+    <name>FreespaceChecker</name>
+    <message>
+        <source>name</source>
+        <translation>nimi</translation>
+    </message>
+    </context>
+<context>
+    <name>HelpMessageDialog</name>
+    <message>
+        <source>version</source>
+        <translation>versioon</translation>
+    </message>
+    <message>
+        <source>Command-line options</source>
+        <translation>Käsurea valikud</translation>
+    </message>
+    <message>
+        <source>Usage:</source>
+        <translation>Kasutus:</translation>
+    </message>
+    <message>
+        <source>command-line options</source>
+        <translation>käsurea valikud</translation>
+    </message>
+    </context>
+<context>
+    <name>Intro</name>
+    <message>
+        <source>Welcome</source>
+        <translation>Tere tulemast</translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation>Viga</translation>
+    </message>
+    </context>
+<context>
+    <name>ModalOverlay</name>
+    </context>
+<context>
+    <name>OpenURIDialog</name>
+    </context>
+<context>
+    <name>OptionsDialog</name>
+    <message>
+        <source>Options</source>
+        <translation>Valikud</translation>
+    </message>
+    <message>
+        <source>MB</source>
+        <translation>MB</translation>
+    </message>
+    <message>
+        <source>&amp;Network</source>
+        <translation>&amp;Võrk</translation>
+    </message>
+    <message>
+        <source>IPv4</source>
+        <translation>IPv4</translation>
+    </message>
+    <message>
+        <source>IPv6</source>
+        <translation>IPv6</translation>
+    </message>
+    <message>
+        <source>Tor</source>
+        <translation>Tor</translation>
+    </message>
+    <message>
+        <source>&amp;OK</source>
+        <translation>&amp;OK</translation>
+    </message>
+    </context>
+<context>
+    <name>OverviewPage</name>
+    <message>
+        <source>Pending:</source>
+        <translation>Ootel:</translation>
+    </message>
+    <message>
+        <source>Total:</source>
+        <translation>Kokku:</translation>
+    </message>
+    <message>
+        <source>Recent transactions</source>
+        <translation>Hiljutised transaktsioonid</translation>
+    </message>
+    </context>
+<context>
+    <name>PaymentServer</name>
+    </context>
+<context>
+    <name>PeerTableModel</name>
+    </context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Amount</source>
+        <translation>Kogus</translation>
+    </message>
+    </context>
+<context>
+    <name>QObject::QObject</name>
+    </context>
+<context>
+    <name>QRImageWidget</name>
+    <message>
+        <source>&amp;Save Image...</source>
+        <translation>&amp;Salvesta Pilt...</translation>
+    </message>
+    <message>
+        <source>&amp;Copy Image</source>
+        <translation>&amp;Kopeeri Pilt</translation>
+    </message>
+    <message>
+        <source>Save QR Code</source>
+        <translation>Salvesta QR Kood</translation>
+    </message>
+    </context>
+<context>
+    <name>RPCConsole</name>
+    <message>
+        <source>&amp;Information</source>
+        <translation>&amp;Informatsioon</translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>Üldine</translation>
+    </message>
+    <message>
+        <source>Network</source>
+        <translation>Võrk</translation>
+    </message>
+    <message>
+        <source>Name</source>
+        <translation>Nimi</translation>
+    </message>
+    <message>
+        <source>Number of connections</source>
+        <translation>Ühenduste arv</translation>
+    </message>
+    <message>
+        <source>Block chain</source>
+        <translation>Blokiahel</translation>
+    </message>
+    <message>
+        <source>Memory usage</source>
+        <translation>Mälu kasutus</translation>
+    </message>
+    <message>
+        <source>Received</source>
+        <translation>Vastu võetud</translation>
+    </message>
+    <message>
+        <source>Sent</source>
+        <translation>Saadetud</translation>
+    </message>
+    <message>
+        <source>Direction</source>
+        <translation>Suund</translation>
+    </message>
+    <message>
+        <source>Version</source>
+        <translation>Versioon</translation>
+    </message>
+    <message>
+        <source>Services</source>
+        <translation>Teenused</translation>
+    </message>
+    <message>
+        <source>Ping Time</source>
+        <translation>Pingi Aeg</translation>
+    </message>
+    <message>
+        <source>&amp;Network Traffic</source>
+        <translation>&amp;Võrgu Liiklus</translation>
+    </message>
+    <message>
+        <source>Clear console</source>
+        <translation>Puhasta konsool</translation>
+    </message>
+    <message>
+        <source>never</source>
+        <translation>mitte kunagi</translation>
+    </message>
+    <message>
+        <source>Inbound</source>
+        <translation>Sisenev</translation>
+    </message>
+    <message>
+        <source>Outbound</source>
+        <translation>Väljuv</translation>
+    </message>
+    <message>
+        <source>Yes</source>
+        <translation>Jah</translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation>Ei</translation>
+    </message>
+    </context>
+<context>
+    <name>ReceiveCoinsDialog</name>
+    <message>
+        <source>&amp;Amount:</source>
+        <translation>&amp;Kogus:</translation>
+    </message>
+    <message>
+        <source>&amp;Message:</source>
+        <translation>&amp;Sõnum:</translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation>Eemalda</translation>
+    </message>
+    <message>
+        <source>Copy message</source>
+        <translation>Kopeeri sõnum</translation>
+    </message>
+    <message>
+        <source>Copy amount</source>
+        <translation>Kopeeri kogus</translation>
+    </message>
+</context>
+<context>
+    <name>ReceiveRequestDialog</name>
+    <message>
+        <source>QR Code</source>
+        <translation>QR Kood</translation>
+    </message>
+    <message>
+        <source>&amp;Save Image...</source>
+        <translation>&amp;Salvesta Pilt...</translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation>Aadress</translation>
+    </message>
+    <message>
+        <source>Amount</source>
+        <translation>Kogus</translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation>Silt</translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation>Sõnum</translation>
+    </message>
+    </context>
+<context>
+    <name>RecentRequestsTableModel</name>
+    <message>
+        <source>Date</source>
+        <translation>Kuupäev</translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation>Silt</translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation>Sõnum</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(silt puudub)</translation>
+    </message>
+    </context>
+<context>
+    <name>SendCoinsDialog</name>
+    <message>
+        <source>Amount:</source>
+        <translation>Kogus</translation>
+    </message>
+    <message>
+        <source>Choose...</source>
+        <translation>Vali...</translation>
+    </message>
+    <message>
+        <source>normal</source>
+        <translation>normaalne</translation>
+    </message>
+    <message>
+        <source>fast</source>
+        <translation>kiire</translation>
+    </message>
+    <message>
+        <source>Copy amount</source>
+        <translation>Kopeeri kogus</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(silt puudub)</translation>
+    </message>
+</context>
+<context>
+    <name>SendCoinsEntry</name>
+    <message>
+        <source>Alt+A</source>
+        <translation>Alt+A</translation>
+    </message>
+    <message>
+        <source>Alt+P</source>
+        <translation>Alt+P</translation>
+    </message>
+    </context>
+<context>
+    <name>SendConfirmationDialog</name>
+    <message>
+        <source>Yes</source>
+        <translation>Jah</translation>
+    </message>
+</context>
+<context>
+    <name>ShutdownWindow</name>
+    </context>
+<context>
+    <name>SignVerifyMessageDialog</name>
+    <message>
+        <source>Alt+A</source>
+        <translation>Alt+A</translation>
+    </message>
+    <message>
+        <source>Alt+P</source>
+        <translation>Alt+P</translation>
+    </message>
+    <message>
+        <source>Signature</source>
+        <translation>Allkiri</translation>
+    </message>
+    <message>
+        <source>Please check the address and try again.</source>
+        <translation>Palun kontrolli aadressi ja proovi uuesti.</translation>
+    </message>
+    <message>
+        <source>Message signed.</source>
+        <translation>Sõnum allkirjastatud.</translation>
+    </message>
+    <message>
+        <source>The signature could not be decoded.</source>
+        <translation>Allkirja ei õnnestunud dekodeerida.</translation>
+    </message>
+    <message>
+        <source>Please check the signature and try again.</source>
+        <translation>Palun kontrolli allkirja ja proovi uuesti.</translation>
+    </message>
+    <message>
+        <source>Message verification failed.</source>
+        <translation>Sõnumi verifitseerimine ebaõnnestus.</translation>
+    </message>
+    <message>
+        <source>Message verified.</source>
+        <translation>Sõnum verifitseeritud.</translation>
+    </message>
+</context>
+<context>
+    <name>SplashScreen</name>
+    <message>
+        <source>[testnet]</source>
+        <translation>[test võrk]</translation>
+    </message>
+</context>
+<context>
+    <name>TrafficGraphWidget</name>
+    <message>
+        <source>KB/s</source>
+        <translation>KB/s</translation>
+    </message>
+</context>
+<context>
+    <name>TransactionDesc</name>
+    <message>
+        <source>Status</source>
+        <translation>Olek</translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation>Kuupäev</translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation>Sõnum</translation>
+    </message>
+    <message>
+        <source>Comment</source>
+        <translation>Kommentaar</translation>
+    </message>
+    <message>
+        <source>Transaction ID</source>
+        <translation>Transaktsiooni ID</translation>
+    </message>
+    <message>
+        <source>Amount</source>
+        <translation>Kogus</translation>
+    </message>
+    </context>
+<context>
+    <name>TransactionDescDialog</name>
+    </context>
+<context>
+    <name>TransactionTableModel</name>
+    <message>
+        <source>Date</source>
+        <translation>Kuupäev</translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation>Tüüp</translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation>Silt</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(silt puudub)</translation>
+    </message>
+    </context>
+<context>
+    <name>TransactionView</name>
+    <message>
+        <source>All</source>
+        <translation>Kõik</translation>
+    </message>
+    <message>
+        <source>Today</source>
+        <translation>Täna</translation>
+    </message>
+    <message>
+        <source>This month</source>
+        <translation>Käimasolev kuu</translation>
+    </message>
+    <message>
+        <source>Last month</source>
+        <translation>Eelmine kuu</translation>
+    </message>
+    <message>
+        <source>This year</source>
+        <translation>Käimasolev aasta</translation>
+    </message>
+    <message>
+        <source>Range...</source>
+        <translation>Vahemik...</translation>
+    </message>
+    <message>
+        <source>Copy address</source>
+        <translation>Kopeeri aadress</translation>
+    </message>
+    <message>
+        <source>Copy amount</source>
+        <translation>Kopeeri summa</translation>
+    </message>
+    <message>
+        <source>Copy transaction ID</source>
+        <translation>Kopeeri transaktsiooni ID</translation>
+    </message>
+    <message>
+        <source>Confirmed</source>
+        <translation>Kinnitatud</translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation>Kuupäev</translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation>Tüüp</translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation>Silt</translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation>Aadress</translation>
+    </message>
+    <message>
+        <source>ID</source>
+        <translation>ID</translation>
+    </message>
+    <message>
+        <source>Range:</source>
+        <translation>Vahemik:</translation>
+    </message>
+    </context>
+<context>
+    <name>UnitDisplayStatusBarControl</name>
+    </context>
+<context>
+    <name>WalletFrame</name>
+    </context>
+<context>
+    <name>WalletModel</name>
+    </context>
+<context>
+    <name>WalletView</name>
+    <message>
+        <source>Backup Wallet</source>
+        <translation>Varunda Rahakott</translation>
+    </message>
+    <message>
+        <source>Wallet Data (*.dat)</source>
+        <translation>Rahakoti Andmed (*.dat)</translation>
+    </message>
+    <message>
+        <source>Backup Failed</source>
+        <translation>Varundamine Ebaõnnestus</translation>
+    </message>
+    </context>
+<context>
+    <name>bitcoin-core</name>
+    <message>
+        <source>Options:</source>
+        <translation>Valikud:</translation>
+    </message>
+    <message>
+        <source>Bitcoin Core</source>
+        <translation>Bitcoin Core</translation>
+    </message>
+    <message>
+        <source>Information</source>
+        <translation>Informatsioon</translation>
+    </message>
+    <message>
+        <source>Warning</source>
+        <translation>Hoiatus</translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation>Viga</translation>
+    </message>
+</context>
+</TS>
\ No newline at end of file
diff --git a/src/qt/locale/bitcoin_eu_ES.ts b/src/qt/locale/bitcoin_eu_ES.ts
index cbe246f443814..f7912f0785787 100644
--- a/src/qt/locale/bitcoin_eu_ES.ts
+++ b/src/qt/locale/bitcoin_eu_ES.ts
@@ -41,6 +41,77 @@
         <source>&amp;Delete</source>
         <translation>&amp;Ezabatu</translation>
     </message>
+    <message>
+        <source>Choose the address to send coins to</source>
+        <translation>Aukeratu helbidea txanponak bidaltzeko</translation>
+    </message>
+    <message>
+        <source>Choose the address to receive coins with</source>
+        <translation>Aukeratu helbidea txanponak jasotzeko</translation>
+    </message>
+    <message>
+        <source>C&amp;hoose</source>
+        <translation>&amp;Aukeratu</translation>
+    </message>
+    <message>
+        <source>Sending addresses</source>
+        <translation>Helbideak bidaltzen</translation>
+    </message>
+    <message>
+        <source>Receiving addresses</source>
+        <translation>Helbideak jasotzen</translation>
+    </message>
+    <message>
+        <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source>
+        <translation>Hauek dira zure Bitcoin helbideak dirua bidaltzeko. Beti egiaztatu diru-kantitatea eta jasotzeko helbidea bidali baino lehen.</translation>
+    </message>
+    <message>
+        <source>These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source>
+        <translation>Hauek dira zure Bitcoin helbideak dirua jasotzeko. Gomendagarria da erabiltzea jasotzeko helbide berri bat operazio bakoitzeko.</translation>
+    </message>
+    <message>
+        <source>&amp;Copy Address</source>
+        <translation>&amp;Kopiatu helbidea</translation>
+    </message>
+    <message>
+        <source>Copy &amp;Label</source>
+        <translation>Kopiatu &amp;Etiketa</translation>
+    </message>
+    <message>
+        <source>&amp;Edit</source>
+        <translation>&amp;Editatu</translation>
+    </message>
+    <message>
+        <source>Export Address List</source>
+        <translation>Esportatu helbide lista</translation>
+    </message>
+    <message>
+        <source>Comma separated file (*.csv)</source>
+        <translation>Komaz bereizitako artxiboa (*.csv)</translation>
+    </message>
+    <message>
+        <source>Exporting Failed</source>
+        <translation>Esportatua okerra</translation>
+    </message>
+    <message>
+        <source>There was an error trying to save the address list to %1. Please try again.</source>
+        <translation>Errakuntza bat egon da gordetzen %1 helbide listan. Mesedez, saiatu berriro.</translation>
+    </message>
+</context>
+<context>
+    <name>AddressTableModel</name>
+    <message>
+        <source>Label</source>
+        <translation>Etiketa</translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation>Helbidea</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(etiketarik ez)</translation>
+    </message>
 </context>
 <context>
     <name>AskPassphraseDialog</name>
@@ -60,7 +131,75 @@
         <source>Repeat new passphrase</source>
         <translation>Errepikatu pasahitz berria</translation>
     </message>
-</context>
+    <message>
+        <source>Encrypt wallet</source>
+        <translation>Enkriptatu zorroa</translation>
+    </message>
+    <message>
+        <source>This operation needs your wallet passphrase to unlock the wallet.</source>
+        <translation>Eragiketa honek zorroaren pasahitza behar du zorroa desblokeatzeko.</translation>
+    </message>
+    <message>
+        <source>Unlock wallet</source>
+        <translation>Desblokeatu zorroa</translation>
+    </message>
+    <message>
+        <source>This operation needs your wallet passphrase to decrypt the wallet.</source>
+        <translation>Eragiketa honek zure zorroaren pasahitza behar du, zorroa desenkriptatzeko.</translation>
+    </message>
+    <message>
+        <source>Decrypt wallet</source>
+        <translation>Desenkriptatu zorroa</translation>
+    </message>
+    <message>
+        <source>Change passphrase</source>
+        <translation>Aldatu pasahitza</translation>
+    </message>
+    <message>
+        <source>Confirm wallet encryption</source>
+        <translation>Berretsi zorroaren enkriptazioa</translation>
+    </message>
+    <message>
+        <source>Warning: If you encrypt your wallet and lose your passphrase, you will &lt;b&gt;LOSE ALL OF YOUR BITCOINS&lt;/b&gt;!</source>
+        <translation>Abisua: Zuk enkriptatzen baduzu zure diruzorroa eta zure pasahitza galtzen baduzu, &lt;b&gt;BITCOIN GUZTIAK GALDUKO DITUZU&lt;/b&gt;!</translation>
+    </message>
+    <message>
+        <source>Are you sure you wish to encrypt your wallet?</source>
+        <translation>Seguru zaude nahi duzula zure diruzorroa enkriptatu?</translation>
+    </message>
+    <message>
+        <source>Wallet encrypted</source>
+        <translation>Zorroa enkriptatuta</translation>
+    </message>
+    <message>
+        <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source>
+        <translation>GARRANTZITSUA: Aurreko seguritate-kopiak ordeztuko dire berriekin, enkriptatutak. Segurtasun arrazoigaitik, aurreko kopiak ezin dira erabili hasiko zarenean zure diruzorro enkriptatu berriarekin.</translation>
+    </message>
+    <message>
+        <source>Wallet encryption failed</source>
+        <translation>Zorroaren enkriptazioak huts egin du</translation>
+    </message>
+    <message>
+        <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
+        <translation>Zorroaren enkriptazioak huts egin du barne-errore baten ondorioz. Zure zorroa ez da enkriptatu.</translation>
+    </message>
+    <message>
+        <source>The supplied passphrases do not match.</source>
+        <translation>Eman dituzun pasahitzak ez datoz bat.</translation>
+    </message>
+    <message>
+        <source>Wallet unlock failed</source>
+        <translation>Zorroaren desblokeoak huts egin du</translation>
+    </message>
+    <message>
+        <source>The passphrase entered for the wallet decryption was incorrect.</source>
+        <translation>Zorroa desenkriptatzeko sartutako pasahitza okerra da.</translation>
+    </message>
+    <message>
+        <source>Wallet decryption failed</source>
+        <translation>Zorroaren desenkriptazioak huts egin du</translation>
+    </message>
+    </context>
 <context>
     <name>BanTableModel</name>
     </context>
@@ -154,7 +293,7 @@
         <source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;locked&lt;/b&gt;</source>
         <translation>Zorroa &lt;b&gt;enkriptatuta&lt;/b&gt; eta &lt;b&gt;blokeatuta&lt;/b&gt; dago une honetan</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>CoinControlDialog</name>
     <message>
@@ -169,6 +308,18 @@
         <source>Date</source>
         <translation>Data</translation>
     </message>
+    <message>
+        <source>Copy address</source>
+        <translation>Kopiatu helbidea</translation>
+    </message>
+    <message>
+        <source>Copy label</source>
+        <translation>Kopiatu etiketa</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(etiketarik ez)</translation>
+    </message>
     </context>
 <context>
     <name>EditAddressDialog</name>
@@ -184,6 +335,34 @@
         <source>&amp;Address</source>
         <translation>&amp;Helbidea</translation>
     </message>
+    <message>
+        <source>New receiving address</source>
+        <translation>Jasotzeko helbide berria</translation>
+    </message>
+    <message>
+        <source>New sending address</source>
+        <translation>Bidaltzeko helbide berria</translation>
+    </message>
+    <message>
+        <source>Edit receiving address</source>
+        <translation>Editatu jasotzeko helbidea</translation>
+    </message>
+    <message>
+        <source>Edit sending address</source>
+        <translation>Editatu bidaltzeko helbidea</translation>
+    </message>
+    <message>
+        <source>The entered address "%1" is already in the address book.</source>
+        <translation>Sartu berri den helbidea, "%1", helbide-liburuan dago jadanik.</translation>
+    </message>
+    <message>
+        <source>Could not unlock wallet.</source>
+        <translation>Ezin desblokeatu zorroa.</translation>
+    </message>
+    <message>
+        <source>New key generation failed.</source>
+        <translation>Gako berriaren sorrerak huts egin du.</translation>
+    </message>
 </context>
 <context>
     <name>FreespaceChecker</name>
@@ -194,6 +373,13 @@
 <context>
     <name>Intro</name>
     </context>
+<context>
+    <name>ModalOverlay</name>
+    <message>
+        <source>Form</source>
+        <translation>Inprimakia</translation>
+    </message>
+    </context>
 <context>
     <name>OpenURIDialog</name>
     </context>
@@ -211,6 +397,9 @@
         <translation>Inprimakia</translation>
     </message>
     </context>
+<context>
+    <name>PaymentServer</name>
+    </context>
 <context>
     <name>PeerTableModel</name>
     </context>
@@ -221,6 +410,12 @@
         <translation>Kopurua</translation>
     </message>
     </context>
+<context>
+    <name>QObject::QObject</name>
+    </context>
+<context>
+    <name>QRImageWidget</name>
+    </context>
 <context>
     <name>RPCConsole</name>
     </context>
@@ -238,6 +433,10 @@
         <source>&amp;Message:</source>
         <translation>Mezua</translation>
     </message>
+    <message>
+        <source>Copy label</source>
+        <translation>Kopiatu etiketa</translation>
+    </message>
     </context>
 <context>
     <name>ReceiveRequestDialog</name>
@@ -245,6 +444,41 @@
         <source>Copy &amp;Address</source>
         <translation>&amp;Kopiatu helbidea</translation>
     </message>
+    <message>
+        <source>Address</source>
+        <translation>Helbidea</translation>
+    </message>
+    <message>
+        <source>Amount</source>
+        <translation>Kopurua</translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation>Etiketa</translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation>Mezua</translation>
+    </message>
+    </context>
+<context>
+    <name>RecentRequestsTableModel</name>
+    <message>
+        <source>Date</source>
+        <translation>Data</translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation>Etiketa</translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation>Mezua</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(etiketarik ez)</translation>
+    </message>
     </context>
 <context>
     <name>SendCoinsDialog</name>
@@ -268,7 +502,19 @@
         <source>Confirm the send action</source>
         <translation>Berretsi bidaltzeko ekintza</translation>
     </message>
-    </context>
+    <message>
+        <source>Confirm send coins</source>
+        <translation>Berretsi txanponak bidaltzea</translation>
+    </message>
+    <message>
+        <source>The amount to pay must be larger than 0.</source>
+        <translation>Ordaintzeko kopurua 0 baino handiagoa izan behar du.</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(etiketarik ez)</translation>
+    </message>
+</context>
 <context>
     <name>SendCoinsEntry</name>
     <message>
@@ -303,6 +549,13 @@
         <source>Pay To:</source>
         <translation>Ordaindu honi:</translation>
     </message>
+    <message>
+        <source>Enter a label for this address to add it to your address book</source>
+        <translation>Sartu etiketa bat helbide honetarako, eta gehitu zure helbide-liburuan</translation>
+    </message>
+</context>
+<context>
+    <name>SendConfirmationDialog</name>
     </context>
 <context>
     <name>ShutdownWindow</name>
@@ -332,16 +585,238 @@
 <context>
     <name>TrafficGraphWidget</name>
     </context>
+<context>
+    <name>TransactionDesc</name>
+    <message>
+        <source>Open until %1</source>
+        <translation>Zabalik %1 arte</translation>
+    </message>
+    <message>
+        <source>%1/unconfirmed</source>
+        <translation>%1/konfirmatu gabe</translation>
+    </message>
+    <message>
+        <source>%1 confirmations</source>
+        <translation>%1 konfirmazioak</translation>
+    </message>
+    <message>
+        <source>, has not been successfully broadcast yet</source>
+        <translation>, ez da arrakastaz emititu oraindik</translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation>Data</translation>
+    </message>
+    <message>
+        <source>unknown</source>
+        <translation>ezezaguna</translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation>Mezua</translation>
+    </message>
+    <message>
+        <source>Transaction</source>
+        <translation>Transakzioaren</translation>
+    </message>
+    <message>
+        <source>Amount</source>
+        <translation>Kopurua</translation>
+    </message>
+    </context>
 <context>
     <name>TransactionDescDialog</name>
     <message>
         <source>This pane shows a detailed description of the transaction</source>
         <translation>Panel honek transakzioaren deskribapen xehea erakusten du</translation>
     </message>
+    </context>
+<context>
+    <name>TransactionTableModel</name>
+    <message>
+        <source>Date</source>
+        <translation>Data</translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation>Mota</translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation>Etiketa</translation>
+    </message>
+    <message>
+        <source>Open until %1</source>
+        <translation>Zabalik %1 arte</translation>
+    </message>
+    <message>
+        <source>Confirmed (%1 confirmations)</source>
+        <translation>Konfirmatuta (%1 konfirmazio)</translation>
+    </message>
+    <message>
+        <source>This block was not received by any other nodes and will probably not be accepted!</source>
+        <translation>Bloke hau ez du beste inongo nodorik jaso, eta seguruenik ez da onartuko!</translation>
+    </message>
+    <message>
+        <source>Generated but not accepted</source>
+        <translation>Sortua, baina ez onartua</translation>
+    </message>
+    <message>
+        <source>Received with</source>
+        <translation>Jasota honekin: </translation>
+    </message>
+    <message>
+        <source>Sent to</source>
+        <translation>Hona bidalia: </translation>
+    </message>
+    <message>
+        <source>Payment to yourself</source>
+        <translation>Ordainketa zeure buruari</translation>
+    </message>
+    <message>
+        <source>Mined</source>
+        <translation>Bildua</translation>
+    </message>
+    <message>
+        <source>(n/a)</source>
+        <translation>(n/a)</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(etiketarik ez)</translation>
+    </message>
+    <message>
+        <source>Transaction status. Hover over this field to show number of confirmations.</source>
+        <translation>Transakzioaren egoera. Pasatu sagua gainetik konfirmazio kopurua ikusteko.</translation>
+    </message>
+    <message>
+        <source>Date and time that the transaction was received.</source>
+        <translation>Transakzioa jasotako data eta ordua.</translation>
+    </message>
+    <message>
+        <source>Type of transaction.</source>
+        <translation>Transakzio mota.</translation>
+    </message>
+    <message>
+        <source>Amount removed from or added to balance.</source>
+        <translation>Saldoan kendu edo gehitutako kopurua.</translation>
+    </message>
 </context>
+<context>
+    <name>TransactionView</name>
+    <message>
+        <source>All</source>
+        <translation>Denak</translation>
+    </message>
+    <message>
+        <source>Today</source>
+        <translation>Gaur</translation>
+    </message>
+    <message>
+        <source>This week</source>
+        <translation>Aste honetan</translation>
+    </message>
+    <message>
+        <source>This month</source>
+        <translation>Hil honetan</translation>
+    </message>
+    <message>
+        <source>Last month</source>
+        <translation>Azken hilean</translation>
+    </message>
+    <message>
+        <source>This year</source>
+        <translation>Aurten</translation>
+    </message>
+    <message>
+        <source>Range...</source>
+        <translation>Muga...</translation>
+    </message>
+    <message>
+        <source>Received with</source>
+        <translation>Jasota honekin: </translation>
+    </message>
+    <message>
+        <source>Sent to</source>
+        <translation>Hona bidalia: </translation>
+    </message>
+    <message>
+        <source>To yourself</source>
+        <translation>Zeure buruari</translation>
+    </message>
+    <message>
+        <source>Mined</source>
+        <translation>Bildua</translation>
+    </message>
+    <message>
+        <source>Other</source>
+        <translation>Beste</translation>
+    </message>
+    <message>
+        <source>Enter address or label to search</source>
+        <translation>Sartu bilatzeko helbide edo etiketa</translation>
+    </message>
+    <message>
+        <source>Min amount</source>
+        <translation>Kopuru minimoa</translation>
+    </message>
+    <message>
+        <source>Copy address</source>
+        <translation>Kopiatu helbidea</translation>
+    </message>
+    <message>
+        <source>Copy label</source>
+        <translation>Kopiatu etiketa</translation>
+    </message>
+    <message>
+        <source>Comma separated file (*.csv)</source>
+        <translation>Komaz bereizitako artxiboa (*.csv)</translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation>Data</translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation>Mota</translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation>Etiketa</translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation>Helbidea</translation>
+    </message>
+    <message>
+        <source>Exporting Failed</source>
+        <translation>Esportatua okerra</translation>
+    </message>
+    </context>
 <context>
     <name>UnitDisplayStatusBarControl</name>
     </context>
+<context>
+    <name>WalletFrame</name>
+    </context>
+<context>
+    <name>WalletModel</name>
+    <message>
+        <source>Send Coins</source>
+        <translation>Bidali txanponak</translation>
+    </message>
+</context>
+<context>
+    <name>WalletView</name>
+    <message>
+        <source>&amp;Export</source>
+        <translation>&amp;Esportatu</translation>
+    </message>
+    <message>
+        <source>Export the data in the current tab to a file</source>
+        <translation>Esportatu datuak uneko fitxategian</translation>
+    </message>
+    </context>
 <context>
     <name>bitcoin-core</name>
     <message>
diff --git a/src/qt/locale/bitcoin_fa.ts b/src/qt/locale/bitcoin_fa.ts
index 98543ded461bb..c1061822ca99f 100644
--- a/src/qt/locale/bitcoin_fa.ts
+++ b/src/qt/locale/bitcoin_fa.ts
@@ -41,6 +41,49 @@
         <source>&amp;Delete</source>
         <translation>&amp;حذف</translation>
     </message>
+    <message>
+        <source>Choose the address to send coins to</source>
+        <translation>آدرس مورد نظر برای ارسال کوین ها را انتخاب کنید</translation>
+    </message>
+    <message>
+        <source>Choose the address to receive coins with</source>
+        <translation>آدرس موردنظر برای دریافت کوین ها را انتخاب کنید.</translation>
+    </message>
+    <message>
+        <source>C&amp;hoose</source>
+        <translation>انتخاب</translation>
+    </message>
+    <message>
+        <source>Sending addresses</source>
+        <translation>آدرس های فرستنده</translation>
+    </message>
+    <message>
+        <source>Receiving addresses</source>
+        <translation>آدرس های گیرنده</translation>
+    </message>
+    <message>
+        <source>Copy &amp;Label</source>
+        <translation>کپی و برچسب‌&amp;گذاری</translation>
+    </message>
+    <message>
+        <source>&amp;Edit</source>
+        <translation>&amp;ویرایش</translation>
+    </message>
+    </context>
+<context>
+    <name>AddressTableModel</name>
+    <message>
+        <source>Label</source>
+        <translation>برچسب</translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation>آدرس</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(بدون برچسب)</translation>
+    </message>
 </context>
 <context>
     <name>AskPassphraseDialog</name>
@@ -60,6 +103,54 @@
         <source>Repeat new passphrase</source>
         <translation>تکرار گذرواژهٔ جدید</translation>
     </message>
+    <message>
+        <source>Encrypt wallet</source>
+        <translation>رمزنگاری کیف پول</translation>
+    </message>
+    <message>
+        <source>Unlock wallet</source>
+        <translation>باز کردن قفل کیف پول</translation>
+    </message>
+    <message>
+        <source>Decrypt wallet</source>
+        <translation>رمزگشایی کیف پول</translation>
+    </message>
+    <message>
+        <source>Confirm wallet encryption</source>
+        <translation>تأیید رمزنگاری کیف پول</translation>
+    </message>
+    <message>
+        <source>Are you sure you wish to encrypt your wallet?</source>
+        <translation>آیا مطمئن هستید که می‌خواهید کیف پول خود را رمزنگاری کنید؟</translation>
+    </message>
+    <message>
+        <source>Wallet encrypted</source>
+        <translation>کیف پول رمزنگاری شد</translation>
+    </message>
+    <message>
+        <source>Wallet encryption failed</source>
+        <translation>رمزنگاری کیف پول با شکست مواجه شد</translation>
+    </message>
+    <message>
+        <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
+        <translation>رمزنگاری کیف پول بنا به یک خطای داخلی با شکست مواجه شد. کیف پول شما رمزنگاری نشد.</translation>
+    </message>
+    <message>
+        <source>Wallet unlock failed</source>
+        <translation>بازگشایی قفل کیف‌پول با شکست مواجه شد</translation>
+    </message>
+    <message>
+        <source>Wallet decryption failed</source>
+        <translation>رمزگشایی کیف پول با شکست مواجه شد</translation>
+    </message>
+    <message>
+        <source>Wallet passphrase was successfully changed.</source>
+        <translation>گذرواژهٔ کیف پول با موفقیت عوض شد.</translation>
+    </message>
+    <message>
+        <source>Warning: The Caps Lock key is on!</source>
+        <translation>هشدار: کلید Caps Lock روشن است!</translation>
+    </message>
 </context>
 <context>
     <name>BanTableModel</name>
@@ -130,6 +221,10 @@
         <source>&amp;Options...</source>
         <translation>&amp;تنظیمات...</translation>
     </message>
+    <message>
+        <source>Modify configuration options for %1</source>
+        <translation>تغییر تنظیمات %1</translation>
+    </message>
     <message>
         <source>&amp;Encrypt Wallet...</source>
         <translation>&amp;رمزنگاری کیف پول...</translation>
@@ -234,6 +329,10 @@
         <source>Tabs toolbar</source>
         <translation>نوارابزار برگه‌ها</translation>
     </message>
+    <message>
+        <source>Request payments (generates QR codes and bitcoin: URIs)</source>
+        <translation>درخواست پرداخت ( تولید کد کیوار و ادرس بیت کوین)</translation>
+    </message>
     <message>
         <source>Show the list of used sending addresses and labels</source>
         <translation>نمایش لیست آدرس های ارسال و لیبل ها</translation>
@@ -242,6 +341,10 @@
         <source>Show the list of used receiving addresses and labels</source>
         <translation>نمایش لیست آدرس های دریافت و لیبل ها</translation>
     </message>
+    <message>
+        <source>Open a bitcoin: URI or payment request</source>
+        <translation>بازکردن یک بیت کوین: آدرس یا درخواست پرداخت</translation>
+    </message>
     <message>
         <source>&amp;Command-line options</source>
         <translation>گزینه‌های خط‌فرمان</translation>
@@ -251,28 +354,16 @@
         <translation><numerusform>%n ارتباط فعال با شبکهٔ بیت‌کوین</numerusform></translation>
     </message>
     <message>
-        <source>No block source available...</source>
-        <translation>منبعی برای دریافت بلاک در دسترس نیست...</translation>
-    </message>
-    <message numerus="yes">
-        <source>%n hour(s)</source>
-        <translation><numerusform>%n ساعت</numerusform></translation>
-    </message>
-    <message numerus="yes">
-        <source>%n day(s)</source>
-        <translation><numerusform>%n روز</numerusform></translation>
-    </message>
-    <message numerus="yes">
-        <source>%n week(s)</source>
-        <translation><numerusform>%n هفته</numerusform></translation>
+        <source>Processing blocks on disk...</source>
+        <translation>پردازش بلوک‌ها روی دیسک...</translation>
     </message>
     <message>
-        <source>%1 and %2</source>
-        <translation>%1 و %2</translation>
+        <source>No block source available...</source>
+        <translation>منبعی برای دریافت بلاک در دسترس نیست...</translation>
     </message>
     <message numerus="yes">
-        <source>%n year(s)</source>
-        <translation><numerusform>%n سال</numerusform></translation>
+        <source>Processed %n block(s) of transaction history.</source>
+        <translation><numerusform>پردازش %n  بلاک از تاریخچه ی تراکنش ها </numerusform></translation>
     </message>
     <message>
         <source>%1 behind</source>
@@ -352,7 +443,7 @@
         <source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;locked&lt;/b&gt;</source>
         <translation>کیف پول &lt;b&gt;رمزنگاری شده&lt;/b&gt; است و هم‌اکنون &lt;b&gt;قفل&lt;/b&gt; است</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>CoinControlDialog</name>
     <message>
@@ -371,10 +462,6 @@
         <source>Amount:</source>
         <translation>مبلغ:</translation>
     </message>
-    <message>
-        <source>Priority:</source>
-        <translation>اولویت:</translation>
-    </message>
     <message>
         <source>Fee:</source>
         <translation>هزینه:</translation>
@@ -424,8 +511,48 @@
         <translation>تأیید شده</translation>
     </message>
     <message>
-        <source>Priority</source>
-        <translation>اولویت</translation>
+        <source>Copy label</source>
+        <translation>کپی برچسب</translation>
+    </message>
+    <message>
+        <source>Copy amount</source>
+        <translation>کپی مقدار</translation>
+    </message>
+    <message>
+        <source>Copy transaction ID</source>
+        <translation>کپی شناسهٔ تراکنش</translation>
+    </message>
+    <message>
+        <source>Lock unspent</source>
+        <translation>قفل کردن خرج نشده ها</translation>
+    </message>
+    <message>
+        <source>Unlock unspent</source>
+        <translation>بازکردن قفل خرج نشده ها</translation>
+    </message>
+    <message>
+        <source>Copy quantity</source>
+        <translation>کپی تعداد</translation>
+    </message>
+    <message>
+        <source>(%1 locked)</source>
+        <translation>(%1 قفل شده)</translation>
+    </message>
+    <message>
+        <source>yes</source>
+        <translation>بله</translation>
+    </message>
+    <message>
+        <source>no</source>
+        <translation>خیر</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(بدون برچسب)</translation>
+    </message>
+    <message>
+        <source>(change)</source>
+        <translation>(تغییر)</translation>
     </message>
 </context>
 <context>
@@ -442,7 +569,35 @@
         <source>&amp;Address</source>
         <translation>&amp;نشانی</translation>
     </message>
-</context>
+    <message>
+        <source>New receiving address</source>
+        <translation>نشانی گیرنده جدید</translation>
+    </message>
+    <message>
+        <source>New sending address</source>
+        <translation>نشانی فرستنده جدید</translation>
+    </message>
+    <message>
+        <source>Edit receiving address</source>
+        <translation>ویرایش آدرس گیرنده</translation>
+    </message>
+    <message>
+        <source>Edit sending address</source>
+        <translation>ویرایش آدرس قرستنده</translation>
+    </message>
+    <message>
+        <source>The entered address "%1" is not a valid Bitcoin address.</source>
+        <translation>نشانی وارد شده "%1" یک نشانی معتبر بیت‌کوین نیست.</translation>
+    </message>
+    <message>
+        <source>The entered address "%1" is already in the address book.</source>
+        <translation>نشانی وارد شده «%1» در حال حاضر در دفترچه وجود دارد.</translation>
+    </message>
+    <message>
+        <source>Could not unlock wallet.</source>
+        <translation>نمی‌توان کیف پول را رمزگشایی کرد.</translation>
+    </message>
+    </context>
 <context>
     <name>FreespaceChecker</name>
     <message>
@@ -472,6 +627,10 @@
         <source>version</source>
         <translation>نسخه</translation>
     </message>
+    <message>
+        <source>(%1-bit)</source>
+        <translation>(%1-بیت)</translation>
+    </message>
     <message>
         <source>About %1</source>
         <translation>درباره %1</translation>
@@ -488,6 +647,26 @@
         <source>command-line options</source>
         <translation>گزینه‌های خط فرمان</translation>
     </message>
+    <message>
+        <source>UI Options:</source>
+        <translation>گزینه‌های رابط کاربری:</translation>
+    </message>
+    <message>
+        <source>Set language, for example "de_DE" (default: system locale)</source>
+        <translation>زبان را تنظیم کنید؛ برای مثال «de_DE» (پیشفرض: زبان سیستم)</translation>
+    </message>
+    <message>
+        <source>Start minimized</source>
+        <translation>شروع برنامه به صورت کوچک‌شده</translation>
+    </message>
+    <message>
+        <source>Set SSL root certificates for payment request (default: -system-)</source>
+        <translation>تنظیم گواهی ریشه SSl برای درخواست پرداخت (پیشفرض: -system-)</translation>
+    </message>
+    <message>
+        <source>Show splash screen on startup (default: %u)</source>
+        <translation>نمایش پنجرهٔ خوشامدگویی در ابتدای اجرای برنامه (پیش‌فرض: %u)</translation>
+    </message>
     </context>
 <context>
     <name>Intro</name>
@@ -516,12 +695,39 @@
         <translation><numerusform>%n گیگابایت فضا موجود است</numerusform></translation>
     </message>
     </context>
+<context>
+    <name>ModalOverlay</name>
+    <message>
+        <source>Form</source>
+        <translation>فرم</translation>
+    </message>
+    <message>
+        <source>Last block time</source>
+        <translation>زمان آخرین بلوک</translation>
+    </message>
+    <message>
+        <source>Hide</source>
+        <translation>پنهان کردن</translation>
+    </message>
+    </context>
 <context>
     <name>OpenURIDialog</name>
     <message>
         <source>Open URI</source>
         <translation>بازکردن آدرس</translation>
     </message>
+    <message>
+        <source>Open payment request from URI or file</source>
+        <translation>بازکردن درخواست پرداخت از آدرس یا فایل</translation>
+    </message>
+    <message>
+        <source>URI:</source>
+        <translation>آدرس اینترنتی:</translation>
+    </message>
+    <message>
+        <source>Select payment request file</source>
+        <translation>انتخاب فایل درخواست پرداخت</translation>
+    </message>
     </context>
 <context>
     <name>OptionsDialog</name>
@@ -533,6 +739,14 @@
         <source>&amp;Main</source>
         <translation>&amp;عمومی</translation>
     </message>
+    <message>
+        <source>Automatically start %1 after logging in to the system.</source>
+        <translation>اجرای خودکار %1 بعد زمان ورود به سیستم.</translation>
+    </message>
+    <message>
+        <source>MB</source>
+        <translation>مگابایت</translation>
+    </message>
     <message>
         <source>Accept connections from outside</source>
         <translation>پذیرش اتصالات از بیرون</translation>
@@ -672,6 +886,10 @@
         <source>Your current spendable balance</source>
         <translation>تراز علی‌الحساب شما</translation>
     </message>
+    <message>
+        <source>Pending:</source>
+        <translation>در انتظار:</translation>
+    </message>
     <message>
         <source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source>
         <translation>مجموع تراکنش‌هایی که هنوز تأیید نشده‌اند؛ و هنوز روی تراز علی‌الحساب اعمال نشده‌اند</translation>
@@ -705,19 +923,22 @@
         <translation>تراکنش های اخیر</translation>
     </message>
     </context>
+<context>
+    <name>PaymentServer</name>
+    </context>
 <context>
     <name>PeerTableModel</name>
-    <message>
-        <source>Ping Time</source>
-        <translation>زمان پینگ</translation>
-    </message>
-</context>
+    </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Amount</source>
         <translation>مبلغ</translation>
     </message>
+    <message>
+        <source>Enter a Bitcoin address (e.g. %1)</source>
+        <translation>یک آدرس بیت‌کوین وارد کنید (مثلاً %1)</translation>
+    </message>
     <message>
         <source>%1 d</source>
         <translation>%1 روز</translation>
@@ -746,7 +967,17 @@
         <source>%1 ms</source>
         <translation>%1 میلیونم ثانیه</translation>
     </message>
-</context>
+    <message>
+        <source>%1 and %2</source>
+        <translation>%1 و %2</translation>
+    </message>
+    </context>
+<context>
+    <name>QObject::QObject</name>
+    </context>
+<context>
+    <name>QRImageWidget</name>
+    </context>
 <context>
     <name>RPCConsole</name>
     <message>
@@ -793,6 +1024,10 @@
         <source>Current number of blocks</source>
         <translation>تعداد فعلی بلوک‌ها</translation>
     </message>
+    <message>
+        <source>Memory Pool</source>
+        <translation>استخر حافظه</translation>
+    </message>
     <message>
         <source>Memory usage</source>
         <translation>مصرف حافظه</translation>
@@ -813,6 +1048,14 @@
         <source>Services</source>
         <translation>سرویس ها</translation>
     </message>
+    <message>
+        <source>Connection Time</source>
+        <translation>مدت اتصال</translation>
+    </message>
+    <message>
+        <source>Last Send</source>
+        <translation>ارسال شده آخرین بار</translation>
+    </message>
     <message>
         <source>Last Receive</source>
         <translation>آخرین دریافتی</translation>
@@ -908,6 +1151,14 @@
         <source>&amp;Message:</source>
         <translation>پیام:</translation>
     </message>
+    <message>
+        <source>Use this form to request payments. All fields are &lt;b&gt;optional&lt;/b&gt;.</source>
+        <translation>برای درخواست پرداخت از این فرم استفاده کنید.تمام قسمت ها &lt;b&gt;اختیاری&lt;b&gt; هستند.</translation>
+    </message>
+    <message>
+        <source>Clear all fields of the form.</source>
+        <translation>تمام قسمت های فرم را خالی کن.</translation>
+    </message>
     <message>
         <source>Clear</source>
         <translation>پاک‌کردن</translation>
@@ -916,10 +1167,22 @@
         <source>Show</source>
         <translation>نمایش</translation>
     </message>
+    <message>
+        <source>Remove the selected entries from the list</source>
+        <translation>حذف ورودی های انتخاب‌شده از لیست</translation>
+    </message>
     <message>
         <source>Remove</source>
         <translation>حذف کردن</translation>
     </message>
+    <message>
+        <source>Copy label</source>
+        <translation>کپی برچسب</translation>
+    </message>
+    <message>
+        <source>Copy amount</source>
+        <translation>کپی مقدار</translation>
+    </message>
 </context>
 <context>
     <name>ReceiveRequestDialog</name>
@@ -935,13 +1198,40 @@
         <source>&amp;Save Image...</source>
         <translation>&amp;ذخیره عکس...</translation>
     </message>
-</context>
+    <message>
+        <source>Address</source>
+        <translation>آدرس</translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation>برچسب</translation>
+    </message>
+    </context>
+<context>
+    <name>RecentRequestsTableModel</name>
+    <message>
+        <source>Label</source>
+        <translation>برچسب</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(بدون برچسب)</translation>
+    </message>
+    </context>
 <context>
     <name>SendCoinsDialog</name>
     <message>
         <source>Send Coins</source>
         <translation>ارسال سکه</translation>
     </message>
+    <message>
+        <source>Inputs...</source>
+        <translation>ورودی‌ها...</translation>
+    </message>
+    <message>
+        <source>automatically selected</source>
+        <translation>به طور خودکار انتخاب شدند</translation>
+    </message>
     <message>
         <source>Insufficient funds!</source>
         <translation>بود جه نا کافی </translation>
@@ -958,10 +1248,6 @@
         <source>Amount:</source>
         <translation>مبلغ:</translation>
     </message>
-    <message>
-        <source>Priority:</source>
-        <translation>اولویت:</translation>
-    </message>
     <message>
         <source>Fee:</source>
         <translation>هزینه:</translation>
@@ -978,10 +1264,22 @@
         <source>Transaction Fee:</source>
         <translation>هزینهٔ تراکنش:</translation>
     </message>
+    <message>
+        <source>Choose...</source>
+        <translation>انتخاب...</translation>
+    </message>
+    <message>
+        <source>per kilobyte</source>
+        <translation>در هر کیلوبایت</translation>
+    </message>
     <message>
         <source>Hide</source>
         <translation>پنهان کردن</translation>
     </message>
+    <message>
+        <source>total at least</source>
+        <translation>در مجموع حداقل</translation>
+    </message>
     <message>
         <source>Recommended:</source>
         <translation>توصیه شده:</translation>
@@ -990,10 +1288,6 @@
         <source>Custom:</source>
         <translation>سفارشی:</translation>
     </message>
-    <message>
-        <source>Confirmation time:</source>
-        <translation>روز تایید:</translation>
-    </message>
     <message>
         <source>normal</source>
         <translation>نرمال</translation>
@@ -1010,6 +1304,10 @@
         <source>Add &amp;Recipient</source>
         <translation>&amp;دریافت‌کنندهٔ جدید</translation>
     </message>
+    <message>
+        <source>Clear all fields of the form.</source>
+        <translation>تمام قسمت های فرم را خالی کن.</translation>
+    </message>
     <message>
         <source>Clear &amp;All</source>
         <translation>پاکسازی &amp;همه</translation>
@@ -1026,6 +1324,18 @@
         <source>S&amp;end</source>
         <translation>&amp;ارسال</translation>
     </message>
+    <message>
+        <source>Copy quantity</source>
+        <translation>کپی تعداد</translation>
+    </message>
+    <message>
+        <source>Copy amount</source>
+        <translation>کپی مقدار</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(بدون برچسب)</translation>
+    </message>
 </context>
 <context>
     <name>SendCoinsEntry</name>
@@ -1081,7 +1391,10 @@
         <source>Memo:</source>
         <translation>یادداشت:</translation>
     </message>
-</context>
+    </context>
+<context>
+    <name>SendConfirmationDialog</name>
+    </context>
 <context>
     <name>ShutdownWindow</name>
     <message>
@@ -1167,7 +1480,7 @@
         <source>Reset all verify message fields</source>
         <translation>بازنشانی تمام فیلدهای پیام</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>SplashScreen</name>
     <message>
@@ -1182,16 +1495,62 @@
         <translation>کیلوبایت</translation>
     </message>
 </context>
+<context>
+    <name>TransactionDesc</name>
+    </context>
 <context>
     <name>TransactionDescDialog</name>
     <message>
         <source>This pane shows a detailed description of the transaction</source>
         <translation>این پانل شامل توصیف کاملی از جزئیات تراکنش است</translation>
     </message>
-</context>
+    </context>
+<context>
+    <name>TransactionTableModel</name>
+    <message>
+        <source>Label</source>
+        <translation>برچسب</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(بدون برچسب)</translation>
+    </message>
+    </context>
+<context>
+    <name>TransactionView</name>
+    <message>
+        <source>Copy label</source>
+        <translation>کپی برچسب</translation>
+    </message>
+    <message>
+        <source>Copy amount</source>
+        <translation>کپی مقدار</translation>
+    </message>
+    <message>
+        <source>Copy transaction ID</source>
+        <translation>کپی شناسهٔ تراکنش</translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation>برچسب</translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation>آدرس</translation>
+    </message>
+    </context>
 <context>
     <name>UnitDisplayStatusBarControl</name>
     </context>
+<context>
+    <name>WalletFrame</name>
+    </context>
+<context>
+    <name>WalletModel</name>
+    </context>
+<context>
+    <name>WalletView</name>
+    </context>
 <context>
     <name>bitcoin-core</name>
     <message>
@@ -1218,10 +1577,6 @@
         <source>Run in the background as a daemon and accept commands</source>
         <translation>اجرا در پشت زمینه به‌صورت یک سرویس و پذیرش دستورات</translation>
     </message>
-    <message>
-        <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
-        <translation>پذیرش اتصالات از بیرون (پیش فرض:1 بدون پراکسی یا اتصال)</translation>
-    </message>
     <message>
         <source>Bitcoin Core</source>
         <translation> هسته Bitcoin </translation>
@@ -1234,18 +1589,10 @@
         <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source>
         <translation>هنگامی که یک تراکنش در کیف پولی رخ می دهد، دستور را اجرا کن(%s در دستورات بوسیله ی TxID جایگزین می شود)</translation>
     </message>
-    <message>
-        <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
-        <translation>این یک نسخه ی آزمایشی است - با مسئولیت خودتان از آن استفاده کنید -  آن را در معدن و بازرگانی بکار نگیرید.</translation>
-    </message>
     <message>
         <source>Block creation options:</source>
         <translation>بستن گزینه ایجاد</translation>
     </message>
-    <message>
-        <source>Connect only to the specified node(s)</source>
-        <translation>تنها در گره (های) مشخص شده متصل شوید</translation>
-    </message>
     <message>
         <source>Connection options:</source>
         <translation>گزینه‌های اتصال:</translation>
@@ -1334,10 +1681,6 @@
         <source>Transaction amount too small</source>
         <translation>مقدار تراکنش بسیار کم است</translation>
     </message>
-    <message>
-        <source>Transaction amounts must be positive</source>
-        <translation>مقادیر تراکنش باید مثبت باشد</translation>
-    </message>
     <message>
         <source>Transaction too large</source>
         <translation>تراکنش بسیار بزرگ است</translation>
@@ -1370,6 +1713,10 @@
         <source>Loading addresses...</source>
         <translation>بار گیری آدرس ها</translation>
     </message>
+    <message>
+        <source>(default: %s)</source>
+        <translation>(پیش‌فرض %s)</translation>
+    </message>
     <message>
         <source>Invalid -proxy address: '%s'</source>
         <translation>آدرس پراکسی اشتباه %s</translation>
diff --git a/src/qt/locale/bitcoin_fa_IR.ts b/src/qt/locale/bitcoin_fa_IR.ts
index 8faa3ce659266..1e829aff9eb0c 100644
--- a/src/qt/locale/bitcoin_fa_IR.ts
+++ b/src/qt/locale/bitcoin_fa_IR.ts
@@ -37,7 +37,10 @@
         <source>&amp;Delete</source>
         <translation>حذف</translation>
     </message>
-</context>
+    </context>
+<context>
+    <name>AddressTableModel</name>
+    </context>
 <context>
     <name>AskPassphraseDialog</name>
     <message>
@@ -56,7 +59,7 @@
         <source>Repeat new passphrase</source>
         <translation>رمز/پَس فرِیز را دوباره وارد کنید</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>BanTableModel</name>
     </context>
@@ -190,7 +193,7 @@
         <source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;locked&lt;/b&gt;</source>
         <translation>wallet رمزگذاری شد و در حال حاضر قفل است</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>CoinControlDialog</name>
     <message>
@@ -224,7 +227,7 @@
         <source>&amp;Address</source>
         <translation>حساب&amp;</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>FreespaceChecker</name>
     </context>
@@ -246,6 +249,13 @@
         <translation>خطا</translation>
     </message>
     </context>
+<context>
+    <name>ModalOverlay</name>
+    <message>
+        <source>Form</source>
+        <translation>فرم</translation>
+    </message>
+    </context>
 <context>
     <name>OpenURIDialog</name>
     </context>
@@ -287,6 +297,9 @@
         <translation>اطلاعات نمایش داده شده ممکن است روزآمد نباشد. wallet شما به صورت خودکار بعد از برقراری اتصال با شبکه bitcoin به روز می شود اما این فرایند هنوز تکمیل نشده است.</translation>
     </message>
     </context>
+<context>
+    <name>PaymentServer</name>
+    </context>
 <context>
     <name>PeerTableModel</name>
     </context>
@@ -297,6 +310,12 @@
         <translation>میزان</translation>
     </message>
     </context>
+<context>
+    <name>QObject::QObject</name>
+    </context>
+<context>
+    <name>QRImageWidget</name>
+    </context>
 <context>
     <name>RPCConsole</name>
     <message>
@@ -342,6 +361,9 @@
         <translation>کپی آدرس</translation>
     </message>
     </context>
+<context>
+    <name>RecentRequestsTableModel</name>
+    </context>
 <context>
     <name>SendCoinsDialog</name>
     <message>
@@ -372,7 +394,7 @@
         <source>S&amp;end</source>
         <translation>و ارسال</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>SendCoinsEntry</name>
     <message>
@@ -411,7 +433,10 @@
         <source>Memo:</source>
         <translation>یادداشت:</translation>
     </message>
-</context>
+    </context>
+<context>
+    <name>SendConfirmationDialog</name>
+    </context>
 <context>
     <name>ShutdownWindow</name>
     <message>
@@ -452,16 +477,34 @@
 <context>
     <name>TrafficGraphWidget</name>
     </context>
+<context>
+    <name>TransactionDesc</name>
+    </context>
 <context>
     <name>TransactionDescDialog</name>
     <message>
         <source>This pane shows a detailed description of the transaction</source>
         <translation>این بخش جزئیات تراکنش را نشان می دهد</translation>
     </message>
-</context>
+    </context>
+<context>
+    <name>TransactionTableModel</name>
+    </context>
+<context>
+    <name>TransactionView</name>
+    </context>
 <context>
     <name>UnitDisplayStatusBarControl</name>
     </context>
+<context>
+    <name>WalletFrame</name>
+    </context>
+<context>
+    <name>WalletModel</name>
+    </context>
+<context>
+    <name>WalletView</name>
+    </context>
 <context>
     <name>bitcoin-core</name>
     <message>
@@ -512,10 +555,6 @@
         <source>Loading addresses...</source>
         <translation>لود شدن آدرسها..</translation>
     </message>
-    <message>
-        <source>Set minimum block size in bytes (default: %u)</source>
-        <translation>تنظیم کمینه اندازه بلاک بر حسب بایت (پیش فرض: %u)</translation>
-    </message>
     <message>
         <source>Set the number of threads to service RPC calls (default: %d)</source>
         <translation>تنظیم تعداد ریسمان ها برای سرویس دهی فراخوانی های RPC (پیش فرض: %d)</translation>
diff --git a/src/qt/locale/bitcoin_fi.ts b/src/qt/locale/bitcoin_fi.ts
index b7b3115e251eb..db643e73d23c6 100644
--- a/src/qt/locale/bitcoin_fi.ts
+++ b/src/qt/locale/bitcoin_fi.ts
@@ -41,7 +41,10 @@
         <source>&amp;Delete</source>
         <translation>&amp;Poista</translation>
     </message>
-</context>
+    </context>
+<context>
+    <name>AddressTableModel</name>
+    </context>
 <context>
     <name>AskPassphraseDialog</name>
     <message>
@@ -60,7 +63,7 @@
         <source>Repeat new passphrase</source>
         <translation>Toista uusi tunnuslause</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>BanTableModel</name>
     <message>
@@ -114,6 +117,10 @@
         <source>&amp;About %1</source>
         <translation>&amp;Tietoja %1</translation>
     </message>
+    <message>
+        <source>Show information about %1</source>
+        <translation>Näytä tietoa aiheesta %1</translation>
+    </message>
     <message>
         <source>About &amp;Qt</source>
         <translation>Tietoja &amp;Qt</translation>
@@ -126,6 +133,10 @@
         <source>&amp;Options...</source>
         <translation>&amp;Asetukset...</translation>
     </message>
+    <message>
+        <source>Modify configuration options for %1</source>
+        <translation>Muuta kohteen %1 kokoonpanoasetuksia</translation>
+    </message>
     <message>
         <source>&amp;Encrypt Wallet...</source>
         <translation>&amp;Salaa lompakko...</translation>
@@ -254,6 +265,14 @@
         <source>%n active connection(s) to Bitcoin network</source>
         <translation><numerusform>%n aktiivinen yhteys Bitcoin-verkkoon</numerusform><numerusform>%n aktiivista yhteyttä Bitcoin-verkkoon</numerusform></translation>
     </message>
+    <message>
+        <source>Indexing blocks on disk...</source>
+        <translation>Ladataan lohkoindeksiä...</translation>
+    </message>
+    <message>
+        <source>Processing blocks on disk...</source>
+        <translation>Käsitellään lohkoja levyllä...</translation>
+    </message>
     <message>
         <source>No block source available...</source>
         <translation>Lohkojen lähdettä ei saatavilla...</translation>
@@ -262,26 +281,6 @@
         <source>Processed %n block(s) of transaction history.</source>
         <translation><numerusform>Prosessoitu %n lohko rahansiirtohistoriasta.</numerusform><numerusform>Prosessoitu %n lohkoa rahansiirtohistoriasta.</numerusform></translation>
     </message>
-    <message numerus="yes">
-        <source>%n hour(s)</source>
-        <translation><numerusform>%n tunti</numerusform><numerusform>%n tuntia</numerusform></translation>
-    </message>
-    <message numerus="yes">
-        <source>%n day(s)</source>
-        <translation><numerusform>%n päivä</numerusform><numerusform>%n päivää</numerusform></translation>
-    </message>
-    <message numerus="yes">
-        <source>%n week(s)</source>
-        <translation><numerusform>%n viikko</numerusform><numerusform>%n viikkoa</numerusform></translation>
-    </message>
-    <message>
-        <source>%1 and %2</source>
-        <translation>%1 ja %2</translation>
-    </message>
-    <message numerus="yes">
-        <source>%n year(s)</source>
-        <translation><numerusform>%n vuosi</numerusform><numerusform>%n vuotta</numerusform></translation>
-    </message>
     <message>
         <source>%1 behind</source>
         <translation>%1 jäljessä</translation>
@@ -310,6 +309,14 @@
         <source>Up to date</source>
         <translation>Rahansiirtohistoria on ajan tasalla</translation>
     </message>
+    <message>
+        <source>Show the %1 help message to get a list with possible Bitcoin command-line options</source>
+        <translation>Näytä %1 ohjeet saadaksesi listan mahdollisista Bitcoinin komentorivivalinnoista</translation>
+    </message>
+    <message>
+        <source>%1 client</source>
+        <translation>%1-asiakas</translation>
+    </message>
     <message>
         <source>Catching up...</source>
         <translation>Saavutetaan verkkoa...</translation>
@@ -360,7 +367,7 @@
         <source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;locked&lt;/b&gt;</source>
         <translation>Lompakko on &lt;b&gt;salattu&lt;/b&gt; ja tällä hetkellä &lt;b&gt;lukittuna&lt;/b&gt;</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>CoinControlDialog</name>
     <message>
@@ -379,10 +386,6 @@
         <source>Amount:</source>
         <translation>Määrä:</translation>
     </message>
-    <message>
-        <source>Priority:</source>
-        <translation>Prioriteetti:</translation>
-    </message>
     <message>
         <source>Fee:</source>
         <translation>Palkkio:</translation>
@@ -435,11 +438,7 @@
         <source>Confirmed</source>
         <translation>Vahvistettu</translation>
     </message>
-    <message>
-        <source>Priority</source>
-        <translation>Prioriteetti</translation>
-    </message>
-</context>
+    </context>
 <context>
     <name>EditAddressDialog</name>
     <message>
@@ -462,7 +461,7 @@
         <source>&amp;Address</source>
         <translation>&amp;Osoite</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>FreespaceChecker</name>
     <message>
@@ -496,6 +495,10 @@
         <source>(%1-bit)</source>
         <translation>(%1-bit)</translation>
     </message>
+    <message>
+        <source>About %1</source>
+        <translation>Tietoja %1</translation>
+    </message>
     <message>
         <source>Command-line options</source>
         <translation>Komentorivi parametrit</translation>
@@ -532,13 +535,29 @@
         <source>Show splash screen on startup (default: %u)</source>
         <translation>Näytä aloitusruutu käynnistyksen yhteydessä (oletus: %u)</translation>
     </message>
-    </context>
+    <message>
+        <source>Reset all settings changed in the GUI</source>
+        <translation>Nollaa kaikki graafisen käyttöliittymän kautta tehdyt muutokset</translation>
+    </message>
+</context>
 <context>
     <name>Intro</name>
     <message>
         <source>Welcome</source>
         <translation>Tervetuloa</translation>
     </message>
+    <message>
+        <source>Welcome to %1.</source>
+        <translation>Tervetuloa %1 pariin.</translation>
+    </message>
+    <message>
+        <source>As this is the first time the program is launched, you can choose where %1 will store its data.</source>
+        <translation>Tämä on ensimmäinen kerta, kun %1 on käynnistetty, joten voit valita data-hakemiston paikan.</translation>
+    </message>
+    <message>
+        <source>%1 will download and store a copy of the Bitcoin block chain. At least %2GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source>
+        <translation>%1 lataa ja tallentaa kopion Bitcoinin lohkoketjusta. Vähintään %2Gt dataa tullaan tallentamaan tähän hakemistoon, ja tarve kasvaa ajan myötä. Lompakko tullaan myös tallentamaan tähän hakemistoon.</translation>
+    </message>
     <message>
         <source>Use the default data directory</source>
         <translation>Käytä oletuskansiota</translation>
@@ -564,6 +583,21 @@
         <translation><numerusform>(%n Gt tarvittavasta tilasta)</numerusform><numerusform>(%n Gt tarvittavasta tilasta)</numerusform></translation>
     </message>
 </context>
+<context>
+    <name>ModalOverlay</name>
+    <message>
+        <source>Form</source>
+        <translation>Lomake</translation>
+    </message>
+    <message>
+        <source>Last block time</source>
+        <translation>Viimeisimmän lohkon aika</translation>
+    </message>
+    <message>
+        <source>Hide</source>
+        <translation>Piilota</translation>
+    </message>
+    </context>
 <context>
     <name>OpenURIDialog</name>
     <message>
@@ -582,7 +616,7 @@
         <source>Select payment request file</source>
         <translation>Valitse maksupyynnön tiedosto</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>OptionsDialog</name>
     <message>
@@ -593,6 +627,14 @@
         <source>&amp;Main</source>
         <translation>&amp;Yleiset</translation>
     </message>
+    <message>
+        <source>Automatically start %1 after logging in to the system.</source>
+        <translation>Käynnistä %1 automaattisesti järjestelmään kirjautumisen jälkeen.</translation>
+    </message>
+    <message>
+        <source>&amp;Start %1 on system login</source>
+        <translation>&amp;Käynnistä %1 järjestelmään kirjautuessa</translation>
+    </message>
     <message>
         <source>Size of &amp;database cache</source>
         <translation>&amp;Tietokannan välimuistin koko</translation>
@@ -749,6 +791,10 @@
         <source>User Interface &amp;language:</source>
         <translation>&amp;Käyttöliittymän kieli</translation>
     </message>
+    <message>
+        <source>The user interface language can be set here. This setting will take effect after restarting %1.</source>
+        <translation>Tässä voit määritellä käyttöliittymän kielen. Muutokset astuvat voimaan seuraavan kerran, kun %1 käynnistetään.</translation>
+    </message>
     <message>
         <source>&amp;Unit to show amounts in:</source>
         <translation>Yksikkö jona bitcoin-määrät näytetään</translation>
@@ -873,6 +919,9 @@
         <translation>Nykyinen tase seurantaosoitetteissa</translation>
     </message>
 </context>
+<context>
+    <name>PaymentServer</name>
+    </context>
 <context>
     <name>PeerTableModel</name>
     <message>
@@ -883,11 +932,7 @@
         <source>Node/Service</source>
         <translation>Noodi/Palvelu</translation>
     </message>
-    <message>
-        <source>Ping Time</source>
-        <translation>Vasteaika</translation>
-    </message>
-</context>
+    </context>
 <context>
     <name>QObject</name>
     <message>
@@ -926,7 +971,17 @@
         <source>%1 ms</source>
         <translation>%1 ms</translation>
     </message>
-</context>
+    <message>
+        <source>%1 and %2</source>
+        <translation>%1 ja %2</translation>
+    </message>
+    </context>
+<context>
+    <name>QObject::QObject</name>
+    </context>
+<context>
+    <name>QRImageWidget</name>
+    </context>
 <context>
     <name>RPCConsole</name>
     <message>
@@ -953,6 +1008,10 @@
         <source>Using BerkeleyDB version</source>
         <translation>Käyttää BerkeleyDB-versiota</translation>
     </message>
+    <message>
+        <source>Datadir</source>
+        <translation>Data-hakemisto</translation>
+    </message>
     <message>
         <source>Startup time</source>
         <translation>Käynnistysaika</translation>
@@ -1037,6 +1096,18 @@
         <source>User Agent</source>
         <translation>Käyttöliittymä</translation>
     </message>
+    <message>
+        <source>Open the %1 debug log file from the current data directory. This can take a few seconds for large log files.</source>
+        <translation>Avaa %1 -debug-loki tämänhetkisestä data-hakemistosta. Tämä voi viedä muutaman sekunnin suurille lokitiedostoille.</translation>
+    </message>
+    <message>
+        <source>Decrease font size</source>
+        <translation>Pienennä fontin kokoa</translation>
+    </message>
+    <message>
+        <source>Increase font size</source>
+        <translation>Suurenna fontin kokoa</translation>
+    </message>
     <message>
         <source>Services</source>
         <translation>Palvelut</translation>
@@ -1113,14 +1184,6 @@
         <source>Clear console</source>
         <translation>Tyhjennä konsoli</translation>
     </message>
-    <message>
-        <source>&amp;Disconnect Node</source>
-        <translation>&amp;Katkaise yhteys solmukohtaan</translation>
-    </message>
-    <message>
-        <source>Ban Node for</source>
-        <translation>Estä solmukohta</translation>
-    </message>
     <message>
         <source>1 &amp;hour</source>
         <translation>1 &amp;tunti</translation>
@@ -1137,10 +1200,6 @@
         <source>1 &amp;year</source>
         <translation>1 &amp;vuosi</translation>
     </message>
-    <message>
-        <source>&amp;Unban Node</source>
-        <translation>&amp;Poista solmukohdan esto</translation>
-    </message>
     <message>
         <source>Use up and down arrows to navigate history, and &lt;b&gt;Ctrl-L&lt;/b&gt; to clear screen.</source>
         <translation>Ylös- ja alas-nuolet selaavat historiaa ja &lt;b&gt;Ctrl-L&lt;/b&gt; tyhjentää ruudun.</translation>
@@ -1268,7 +1327,7 @@
         <source>Remove</source>
         <translation>Poista</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>ReceiveRequestDialog</name>
     <message>
@@ -1287,7 +1346,14 @@
         <source>&amp;Save Image...</source>
         <translation>&amp;Tallenna kuva</translation>
     </message>
-</context>
+    </context>
+<context>
+    <name>RecentRequestsTableModel</name>
+    <message>
+        <source>Date</source>
+        <translation>Aika</translation>
+    </message>
+    </context>
 <context>
     <name>SendCoinsDialog</name>
     <message>
@@ -1322,10 +1388,6 @@
         <source>Amount:</source>
         <translation>Määrä:</translation>
     </message>
-    <message>
-        <source>Priority:</source>
-        <translation>Prioriteetti:</translation>
-    </message>
     <message>
         <source>Fee:</source>
         <translation>Palkkio:</translation>
@@ -1386,10 +1448,6 @@
         <source>(Smart fee not initialized yet. This usually takes a few blocks...)</source>
         <translation>(Älykästä rahansiirtokulua ei ole vielä alustettu. Tähän kuluu yleensä aikaa muutaman lohkon verran...)</translation>
     </message>
-    <message>
-        <source>Confirmation time:</source>
-        <translation>Vahvistusaika:</translation>
-    </message>
     <message>
         <source>normal</source>
         <translation>normaali</translation>
@@ -1430,7 +1488,7 @@
         <source>S&amp;end</source>
         <translation>&amp;Lähetä</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>SendCoinsEntry</name>
     <message>
@@ -1473,6 +1531,10 @@
         <source>Remove this entry</source>
         <translation>Poista tämä alkio</translation>
     </message>
+    <message>
+        <source>The fee will be deducted from the amount being sent. The recipient will receive less bitcoins than you enter in the amount field. If multiple recipients are selected, the fee is split equally.</source>
+        <translation>Kulu vähennetään lähetettävästä määrästä. Saaja vastaanottaa vähemmän bitcoineja kuin merkitset Määrä-kenttään. Jos saajia on monia, kulu jaetaan tasan.</translation>
+    </message>
     <message>
         <source>S&amp;ubtract fee from amount</source>
         <translation>V&amp;ähennä maksukulu määrästä</translation>
@@ -1505,9 +1567,16 @@
         <source>Memo:</source>
         <translation>Muistio:</translation>
     </message>
-</context>
+    </context>
+<context>
+    <name>SendConfirmationDialog</name>
+    </context>
 <context>
     <name>ShutdownWindow</name>
+    <message>
+        <source>%1 is shutting down...</source>
+        <translation>%1 sulkeutuu...</translation>
+    </message>
     <message>
         <source>Do not shut down the computer until this window disappears.</source>
         <translation>Älä sammuta tietokonetta ennenkuin tämä ikkuna katoaa.</translation>
@@ -1591,7 +1660,7 @@
         <source>Reset all verify message fields</source>
         <translation>Tyhjennä kaikki varmista-viesti-kentät</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>SplashScreen</name>
     <message>
@@ -1606,13 +1675,34 @@
         <translation>KB/s</translation>
     </message>
 </context>
+<context>
+    <name>TransactionDesc</name>
+    <message>
+        <source>Date</source>
+        <translation>Aika</translation>
+    </message>
+    </context>
 <context>
     <name>TransactionDescDialog</name>
     <message>
         <source>This pane shows a detailed description of the transaction</source>
         <translation>Tämä ruutu näyttää yksityiskohtaisen tiedon rahansiirrosta</translation>
     </message>
-</context>
+    </context>
+<context>
+    <name>TransactionTableModel</name>
+    <message>
+        <source>Date</source>
+        <translation>Aika</translation>
+    </message>
+    </context>
+<context>
+    <name>TransactionView</name>
+    <message>
+        <source>Date</source>
+        <translation>Aika</translation>
+    </message>
+    </context>
 <context>
     <name>UnitDisplayStatusBarControl</name>
     <message>
@@ -1620,6 +1710,19 @@
         <translation>Yksikkö jossa määrät näytetään. Klikkaa valitaksesi toisen yksikön.</translation>
     </message>
 </context>
+<context>
+    <name>WalletFrame</name>
+    </context>
+<context>
+    <name>WalletModel</name>
+    </context>
+<context>
+    <name>WalletView</name>
+    <message>
+        <source>&amp;Export</source>
+        <translation>&amp;Vie</translation>
+    </message>
+    </context>
 <context>
     <name>bitcoin-core</name>
     <message>
@@ -1682,49 +1785,53 @@
         <source>Unable to start HTTP server. See debug log for details.</source>
         <translation>HTTP-palvelinta ei voitu käynnistää. Katso debug-lokista lisätietoja.</translation>
     </message>
-    <message>
-        <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
-        <translation>Hyväksy yhteyksiä ulkopuolelta (vakioasetus: 1 jos -proxy tai -connect ei määritelty)</translation>
-    </message>
     <message>
         <source>Bitcoin Core</source>
         <translation>Bitcoin-ydin</translation>
     </message>
     <message>
-        <source>-fallbackfee is set very high! This is the transaction fee you may pay when fee estimates are not available.</source>
-        <translation>-fallbackfee on asetettu erittäin suureksi! Tämä on rahansiirtokulu jonka voit maksaa kun arvioitu rahansirtokulu ei ole saatavilla.</translation>
+        <source>The %s developers</source>
+        <translation>%s kehittäjät</translation>
     </message>
     <message>
         <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source>
         <translation>Kytkeydy annettuun osoitteeseen ja pidä linja aina auki. Käytä [host]:portin merkintätapaa IPv6:lle.</translation>
     </message>
+    <message>
+        <source>Cannot obtain a lock on data directory %s. %s is probably already running.</source>
+        <translation>Ei voida lukita data-hakemistoa %s. %s on luultavasti jo käynnissä.</translation>
+    </message>
     <message>
         <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source>
         <translation>Suorita käsky kun lompakossa rahansiirto muuttuu (%s cmd on vaihdettu TxID kanssa)</translation>
     </message>
+    <message>
+        <source>Please check that your computer's date and time are correct! If your clock is wrong, %s will not work properly.</source>
+        <translation>Tarkistathan että tietokoneesi päivämäärä ja kellonaika ovat oikeassa! Jos kellosi on väärässä, %s ei toimi oikein.</translation>
+    </message>
+    <message>
+        <source>Please contribute if you find %s useful. Visit %s for further information about the software.</source>
+        <translation>Ole hyvä ja avusta, jos %s on mielestäsi hyödyllinen. Vieraile %s saadaksesi lisää tietoa ohjelmistosta.</translation>
+    </message>
     <message>
         <source>Set the number of script verification threads (%u to %d, 0 = auto, &lt;0 = leave that many cores free, default: %d)</source>
         <translation>Aseta script varmistuksen threadien lukumäärä (%u - %d, 0= auto, &lt;0 = jätä näin monta ydintä vapaaksi, oletus: %d)</translation>
     </message>
     <message>
-        <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
-        <translation>Tämä on esi-julkaistu testiversio - Käytä omalla riskillä - Ei saa käytää louhimiseen tai kauppasovelluksiin.</translation>
+        <source>The block database contains a block which appears to be from the future. This may be due to your computer's date and time being set incorrectly. Only rebuild the block database if you are sure that your computer's date and time are correct</source>
+        <translation>Lohkotietokanta sisältää lohkon, joka vaikuttaa olevan tulevaisuudesta. Tämä saattaa johtua tietokoneesi virheellisesti asetetuista aika-asetuksista. Rakenna lohkotietokanta uudelleen vain jos olet varma, että tietokoneesi päivämäärä ja aika ovat oikein.</translation>
     </message>
     <message>
         <source>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</source>
         <translation>Käytä UPnP:ta kuuntelevan portin kartoitukseen (oletus: 1 kun kuunnellaan ja -proxy ei käytössä)</translation>
     </message>
     <message>
-        <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source>
-        <translation>Varoitus: Tietoverkko ei ole sovussa! Luohijat näyttävät kokevan virhetilanteita.</translation>
-    </message>
-    <message>
-        <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source>
-        <translation>Varoitus: Olemme vertaisverkon kanssa ristiriidassa! Sinun tulee päivittää tai toisten solmujen tulee päivitää.</translation>
+        <source>You need to rebuild the database using -reindex-chainstate to change -txindex</source>
+        <translation>Sinun tulee uudelleenrakentaa tietokanta käyttäen -reindex-chainstate vaihtaaksesi -txindex</translation>
     </message>
     <message>
-        <source>Whitelist peers connecting from the given netmask or IP address. Can be specified multiple times.</source>
-        <translation>Salli vertaisten yhdistää annetusta verkkomaskista tai IP-osoitteesta. Voidaan määrittää useampia kertoja.</translation>
+        <source>%s corrupt, salvage failed</source>
+        <translation>%s korruptoitunut, korjaaminen epäonnistui</translation>
     </message>
     <message>
         <source>-maxmempool must be at least %d MB</source>
@@ -1734,18 +1841,26 @@
         <source>&lt;category&gt; can be:</source>
         <translation>&lt;category&gt; voi olla:</translation>
     </message>
+    <message>
+        <source>Attempt to recover private keys from a corrupt wallet on startup</source>
+        <translation>Yritä palauttaa yksityiset avaimet korruptoituneesta lompakosta käynnistyksen yhteydessä</translation>
+    </message>
     <message>
         <source>Block creation options:</source>
         <translation>Lohkon luonnin asetukset:</translation>
     </message>
     <message>
-        <source>Connect only to the specified node(s)</source>
-        <translation>Yhidstä ainoastaan määrättyihin noodeihin</translation>
+        <source>Cannot resolve -%s address: '%s'</source>
+        <translation>-%s -osoitteen '%s' selvittäminen epäonnistui</translation>
     </message>
     <message>
         <source>Connection options:</source>
         <translation>Yhteyden valinnat:</translation>
     </message>
+    <message>
+        <source>Copyright (C) %i-%i</source>
+        <translation>Tekijänoikeus (C) %i-%i</translation>
+    </message>
     <message>
         <source>Corrupted block database detected</source>
         <translation>Vioittunut lohkotietokanta havaittu</translation>
@@ -1774,6 +1889,18 @@
         <source>Error initializing wallet database environment %s!</source>
         <translation>Virhe alustaessa lompakon tietokantaympäristöä %s!</translation>
     </message>
+    <message>
+        <source>Error loading %s</source>
+        <translation>Virhe ladattaessa %s</translation>
+    </message>
+    <message>
+        <source>Error loading %s: Wallet corrupted</source>
+        <translation>Virhe ladattaessa %s: Lompakko vioittunut</translation>
+    </message>
+    <message>
+        <source>Error loading %s: Wallet requires newer version of %s</source>
+        <translation>Virhe ladattaessa %s: Tarvitset uudemman %s -version</translation>
+    </message>
     <message>
         <source>Error loading block database</source>
         <translation>Virhe avattaessa lohkoketjua</translation>
@@ -1802,6 +1929,22 @@
         <source>Invalid -onion address: '%s'</source>
         <translation>Virheellinen -onion osoite: '%s'</translation>
     </message>
+    <message>
+        <source>Invalid amount for -%s=&lt;amount&gt;: '%s'</source>
+        <translation>Virheellinen määrä -%s=&lt;amount&gt;: '%s'</translation>
+    </message>
+    <message>
+        <source>Invalid amount for -fallbackfee=&lt;amount&gt;: '%s'</source>
+        <translation>Virheellinen määrä -fallbackfee=&lt;amount&gt;: '%s'</translation>
+    </message>
+    <message>
+        <source>Loading banlist...</source>
+        <translation>Ladataan kieltolistaa...</translation>
+    </message>
+    <message>
+        <source>Location of the auth cookie (default: data dir)</source>
+        <translation>Todennusevästeen sijainti (oletus: datahakemisto)</translation>
+    </message>
     <message>
         <source>Not enough file descriptors available.</source>
         <translation>Ei tarpeeksi tiedostomerkintöjä vapaana.</translation>
@@ -1810,6 +1953,14 @@
         <source>Only connect to nodes in network &lt;net&gt; (ipv4, ipv6 or onion)</source>
         <translation>Yhdistä vain solmukohtiin &lt;net&gt;-verkossa (ipv4, ipv6 tai onion)</translation>
     </message>
+    <message>
+        <source>Print this help message and exit</source>
+        <translation>Näytä tämä ohjeviesti ja poistu</translation>
+    </message>
+    <message>
+        <source>Print version and exit</source>
+        <translation>Näytä versio ja poistu.</translation>
+    </message>
     <message>
         <source>Prune mode is incompatible with -txindex.</source>
         <translation>Karsittu tila ei ole yhteensopiva -txindex:n kanssa.</translation>
@@ -1826,6 +1977,22 @@
         <source>Specify wallet file (within data directory)</source>
         <translation>Aseta lompakkotiedosto (data-hakemiston sisällä)</translation>
     </message>
+    <message>
+        <source>The source code is available from %s.</source>
+        <translation>Lähdekoodi löytyy %s.</translation>
+    </message>
+    <message>
+        <source>Unsupported argument -benchmark ignored, use -debug=bench.</source>
+        <translation>Argumenttia -benchmark ei tueta, käytä -debug=bench.</translation>
+    </message>
+    <message>
+        <source>Unsupported argument -debugnet ignored, use -debug=net.</source>
+        <translation>Argumenttia -debugnet ei tueta, käytä -debug=net.</translation>
+    </message>
+    <message>
+        <source>Unsupported argument -tor found, use -onion.</source>
+        <translation>Argumenttia -tor ei tueta, käytä -onion.</translation>
+    </message>
     <message>
         <source>Use UPnP to map the listening port (default: %u)</source>
         <translation>Käytä UPnP:ta kuuntelevan portin kartoittamiseen (oletus: %u)</translation>
@@ -1842,6 +2009,10 @@
         <source>Wallet %s resides outside data directory %s</source>
         <translation>Lompakko %s sijaitsee data-hakemiston ulkopuolella %s</translation>
     </message>
+    <message>
+        <source>Wallet needed to be rewritten: restart %s to complete</source>
+        <translation>Lompakko tarvitsee uudelleenkirjoittaa: käynnistä %s uudelleen</translation>
+    </message>
     <message>
         <source>Wallet options:</source>
         <translation>Lompakon valinnat:</translation>
@@ -1854,6 +2025,10 @@
         <source>Discover own IP addresses (default: 1 when listening and no -externalip or -proxy)</source>
         <translation>Paljasta omat IP-osoitteet (oletus: 1 kun kuunnellaan ja -externalip tai -proxy ei ole käytössä)</translation>
     </message>
+    <message>
+        <source>Error: Listening for incoming connections failed (listen returned error %s)</source>
+        <translation>Virhe: Saapuvien yhteyksien kuuntelu epäonnistui (kuuntelu palautti virheen %s)</translation>
+    </message>
     <message>
         <source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source>
         <translation>Aja komento kun olennainen hälytys vastaanotetaan tai nähdään todella pitkä haara (%s komennossa korvataan viestillä)</translation>
@@ -1862,6 +2037,10 @@
         <source>Set maximum size of high-priority/low-fee transactions in bytes (default: %d)</source>
         <translation>Aseta maksimikoko korkea prioriteetti/pieni palkkio rahansiirtoihin tavuissa (oletus: %d)</translation>
     </message>
+    <message>
+        <source>The transaction amount is too small to send after the fee has been deducted</source>
+        <translation>Siirtomäärä on liian pieni lähetettäväksi kulun vähentämisen jälkeen.</translation>
+    </message>
     <message>
         <source>(default: %u)</source>
         <translation>(oletus: %u)</translation>
@@ -1870,6 +2049,10 @@
         <source>Accept public REST requests (default: %u)</source>
         <translation>Hyväksy julkisia REST-pyyntöjä (oletus: %u)</translation>
     </message>
+    <message>
+        <source>Automatically create Tor hidden service (default: %d)</source>
+        <translation>Luo Tor-salattu palvelu automaattisesti (oletus: %d)</translation>
+    </message>
     <message>
         <source>Connect through SOCKS5 proxy</source>
         <translation>Yhdistä SOCKS5 proxin kautta</translation>
@@ -1878,14 +2061,30 @@
         <source>Error reading from database, shutting down.</source>
         <translation>Virheitä tietokantaa luettaessa, ohjelma pysäytetään.</translation>
     </message>
+    <message>
+        <source>Imports blocks from external blk000??.dat file on startup</source>
+        <translation>Tuo lohkot ulkoisesta blk000??.dat -tiedostosta käynnistettäessä</translation>
+    </message>
     <message>
         <source>Information</source>
         <translation>Tietoa</translation>
     </message>
+    <message>
+        <source>Invalid amount for -paytxfee=&lt;amount&gt;: '%s' (must be at least %s)</source>
+        <translation>Kelvoton määrä argumentille -paytxfee=&lt;amount&gt;: '%s' (pitää olla vähintään %s)</translation>
+    </message>
+    <message>
+        <source>Invalid netmask specified in -whitelist: '%s'</source>
+        <translation>Kelvoton verkkopeite määritelty argumentissa -whitelist: '%s'</translation>
+    </message>
     <message>
         <source>Keep at most &lt;n&gt; unconnectable transactions in memory (default: %u)</source>
         <translation>Pidä enimmillään &lt;n&gt; yhdistämiskelvotonta rahansiirtoa muistissa (oletus: %u)</translation>
     </message>
+    <message>
+        <source>Need to specify a port with -whitebind: '%s'</source>
+        <translation>Pitää määritellä portti argumentilla -whitebind: '%s'</translation>
+    </message>
     <message>
         <source>Node relay options:</source>
         <translation>Välityssolmukohdan asetukset:</translation>
@@ -1934,10 +2133,6 @@
         <source>Transaction amount too small</source>
         <translation>Siirtosumma liian pieni</translation>
     </message>
-    <message>
-        <source>Transaction amounts must be positive</source>
-        <translation>Siirtosumman tulee olla positiivinen</translation>
-    </message>
     <message>
         <source>Transaction too large for fee policy</source>
         <translation>Rahansiirto on liian suuri maksukulukäytännölle</translation>
@@ -1990,10 +2185,6 @@
         <source>-maxtxfee is set very high! Fees this large could be paid on a single transaction.</source>
         <translation>-maxtxfee on asetettu erittäin suureksi! Tämänkokoisia kuluja saatetaan maksaa yhdessä rahansiirrossa.</translation>
     </message>
-    <message>
-        <source>-paytxfee is set very high! This is the transaction fee you will pay if you send a transaction.</source>
-        <translation>-paytxfee on asetettu erittäin suureksi! Tämä on rahansiirtokulu, jonka maksat, mikäli lähetät rahansiirron.</translation>
-    </message>
     <message>
         <source>Do not keep transactions in the mempool longer than &lt;n&gt; hours (default: %u)</source>
         <translation>Älä pidä rahansiirtoja muistivarannoissa kauemmin kuin &lt;n&gt; tuntia (oletus: %u)</translation>
@@ -2002,6 +2193,10 @@
         <source>How thorough the block verification of -checkblocks is (0-4, default: %u)</source>
         <translation>Kuinka läpikäyvä lohkojen -checkblocks -todennus on (0-4, oletus: %u)</translation>
     </message>
+    <message>
+        <source>Output debugging information (default: %u, supplying &lt;category&gt; is optional)</source>
+        <translation>Tulosta debuggaustieto (oletus: %u, annettu &lt;category&gt; valinnainen)</translation>
+    </message>
     <message>
         <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: %s)</source>
         <translation>Käytä erillistä SOCKS5-proxyä tavoittaaksesi vertaisia Tor-piilopalveluiden kautta (oletus: %s)</translation>
@@ -2067,8 +2262,8 @@
         <translation>Aseta avainaltaan kooksi &lt;n&gt; (oletus: %u)</translation>
     </message>
     <message>
-        <source>Set minimum block size in bytes (default: %u)</source>
-        <translation>Aseta pienin mahdollinen lohkokoko tavuina (oletus: %u)</translation>
+        <source>Set maximum BIP141 block weight (default: %d)</source>
+        <translation>Aseta suurin BIP141-lohkopaino (oletus: %d)</translation>
     </message>
     <message>
         <source>Set the number of threads to service RPC calls (default: %d)</source>
diff --git a/src/qt/locale/bitcoin_fr.ts b/src/qt/locale/bitcoin_fr.ts
index 0b538d76642ed..bdcfed9584c15 100644
--- a/src/qt/locale/bitcoin_fr.ts
+++ b/src/qt/locale/bitcoin_fr.ts
@@ -41,6 +41,77 @@
         <source>&amp;Delete</source>
         <translation>&amp;Supprimer</translation>
     </message>
+    <message>
+        <source>Choose the address to send coins to</source>
+        <translation>Choisir l'adresse à laquelle envoyer des pièces</translation>
+    </message>
+    <message>
+        <source>Choose the address to receive coins with</source>
+        <translation>Choisir l'adresse avec laquelle recevoir des pîèces</translation>
+    </message>
+    <message>
+        <source>C&amp;hoose</source>
+        <translation>C&amp;hoisir</translation>
+    </message>
+    <message>
+        <source>Sending addresses</source>
+        <translation>Adresses d'envoi</translation>
+    </message>
+    <message>
+        <source>Receiving addresses</source>
+        <translation>Adresses de réception</translation>
+    </message>
+    <message>
+        <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source>
+        <translation>Voici vos adresses Bitcoin pour envoyer des paiements. Vérifiez toujours le montant et l'adresse du destinataire avant d'envoyer des pièces.</translation>
+    </message>
+    <message>
+        <source>These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source>
+        <translation>Voici vos adresses Bitcoin pour recevoir des paiements. Il est recommandé d'utiliser une nouvelle adresse de réception pour chaque transaction.</translation>
+    </message>
+    <message>
+        <source>&amp;Copy Address</source>
+        <translation>&amp;Copier l'adresse</translation>
+    </message>
+    <message>
+        <source>Copy &amp;Label</source>
+        <translation>Copier l'é&amp;tiquette</translation>
+    </message>
+    <message>
+        <source>&amp;Edit</source>
+        <translation>&amp;Modifier</translation>
+    </message>
+    <message>
+        <source>Export Address List</source>
+        <translation>Exporter la liste d'adresses</translation>
+    </message>
+    <message>
+        <source>Comma separated file (*.csv)</source>
+        <translation>Valeurs séparées par des virgules (*.csv)</translation>
+    </message>
+    <message>
+        <source>Exporting Failed</source>
+        <translation>Échec d'exportation</translation>
+    </message>
+    <message>
+        <source>There was an error trying to save the address list to %1. Please try again.</source>
+        <translation>Une erreur est survenue lors de l'enregistrement de la liste d'adresses vers %1. Veuillez ressayer plus tard.</translation>
+    </message>
+</context>
+<context>
+    <name>AddressTableModel</name>
+    <message>
+        <source>Label</source>
+        <translation>Étiquette</translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation>Adresse</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(aucune étiquette)</translation>
+    </message>
 </context>
 <context>
     <name>AskPassphraseDialog</name>
@@ -60,6 +131,94 @@
         <source>Repeat new passphrase</source>
         <translation>Répéter la phrase de passe</translation>
     </message>
+    <message>
+        <source>Enter the new passphrase to the wallet.&lt;br/&gt;Please use a passphrase of &lt;b&gt;ten or more random characters&lt;/b&gt;, or &lt;b&gt;eight or more words&lt;/b&gt;.</source>
+        <translation>Saisissez la nouvelle phrase de passe du porte-monnaie.&lt;br/&gt;Veuillez utiliser une phrase de passe composée de &lt;b&gt;dix caractères aléatoires ou plus&lt;/b&gt;, ou de &lt;b&gt;huit mots ou plus&lt;/b&gt;.</translation>
+    </message>
+    <message>
+        <source>Encrypt wallet</source>
+        <translation>Chiffrer le porte-monnaie</translation>
+    </message>
+    <message>
+        <source>This operation needs your wallet passphrase to unlock the wallet.</source>
+        <translation>Cette opération nécessite votre phrase de passe pour déverrouiller le porte-monnaie.</translation>
+    </message>
+    <message>
+        <source>Unlock wallet</source>
+        <translation>Déverrouiller le porte-monnaie</translation>
+    </message>
+    <message>
+        <source>This operation needs your wallet passphrase to decrypt the wallet.</source>
+        <translation>Cette opération nécessite votre phrase de passe pour déchiffrer le porte-monnaie.</translation>
+    </message>
+    <message>
+        <source>Decrypt wallet</source>
+        <translation>Déchiffrer le porte-monnaie</translation>
+    </message>
+    <message>
+        <source>Change passphrase</source>
+        <translation>Changer la phrase de passe</translation>
+    </message>
+    <message>
+        <source>Enter the old passphrase and new passphrase to the wallet.</source>
+        <translation>Saisir l'ancienne puis la nouvelle phrase de passe du porte-monnaie.</translation>
+    </message>
+    <message>
+        <source>Confirm wallet encryption</source>
+        <translation>Confirmer le chiffrement du porte-monnaie</translation>
+    </message>
+    <message>
+        <source>Warning: If you encrypt your wallet and lose your passphrase, you will &lt;b&gt;LOSE ALL OF YOUR BITCOINS&lt;/b&gt;!</source>
+        <translation>Avertissement : si vous chiffrez votre porte-monnaie et perdez votre phrase de passe, vous &lt;b&gt;PERDREZ TOUS VOS BITCOINS&lt;/b&gt; !</translation>
+    </message>
+    <message>
+        <source>Are you sure you wish to encrypt your wallet?</source>
+        <translation>Voulez-vous vraiment chiffrer votre porte-monnaie ?</translation>
+    </message>
+    <message>
+        <source>Wallet encrypted</source>
+        <translation>Le porte-monnaie est chiffré</translation>
+    </message>
+    <message>
+        <source>%1 will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source>
+        <translation>%1 va maintenant se fermer pour terminer le processus de chiffrement. Souvenez-vous que le chiffrement de votre porte-monnaie ne peut pas protéger entièrement vos bitcoins contre le vol par des logiciels malveillants qui infecteraient votre ordinateur.</translation>
+    </message>
+    <message>
+        <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source>
+        <translation>IMPORTANT : toutes les sauvegardes précédentes du fichier de votre porte-monnaie devraient être remplacées par le fichier du porte-monnaie chiffré nouvellement généré. Pour des raisons de sécurité, les sauvegardes précédentes de votre fichier de porte-monnaie non chiffré deviendront inutilisables dès que vous commencerez à utiliser le nouveau porte-monnaie chiffré.</translation>
+    </message>
+    <message>
+        <source>Wallet encryption failed</source>
+        <translation>Échec de chiffrement du porte-monnaie</translation>
+    </message>
+    <message>
+        <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
+        <translation>Le chiffrement du porte-monnaie a échoué en raison d'une erreur interne. Votre porte-monnaie n'a pas été chiffré.</translation>
+    </message>
+    <message>
+        <source>The supplied passphrases do not match.</source>
+        <translation>Les phrases de passe saisies ne correspondent pas.</translation>
+    </message>
+    <message>
+        <source>Wallet unlock failed</source>
+        <translation>Échec de déverrouillage du porte-monnaie</translation>
+    </message>
+    <message>
+        <source>The passphrase entered for the wallet decryption was incorrect.</source>
+        <translation>La phrase de passe saisie pour déchiffrer le porte-monnaie était erronée.</translation>
+    </message>
+    <message>
+        <source>Wallet decryption failed</source>
+        <translation>Échec de déchiffrement du porte-monnaie</translation>
+    </message>
+    <message>
+        <source>Wallet passphrase was successfully changed.</source>
+        <translation>La phrase de passe du porte-monnaie a été modifiée avec succès.</translation>
+    </message>
+    <message>
+        <source>Warning: The Caps Lock key is on!</source>
+        <translation>Avertissement : la touche Verr. Maj. est activée !</translation>
+    </message>
 </context>
 <context>
     <name>BanTableModel</name>
@@ -76,11 +235,11 @@
     <name>BitcoinGUI</name>
     <message>
         <source>Sign &amp;message...</source>
-        <translation>&amp;Signer le message...</translation>
+        <translation>Signer un &amp;message...</translation>
     </message>
     <message>
         <source>Synchronizing with network...</source>
-        <translation>Synchronisation avec le réseau en cours…</translation>
+        <translation>Synchronisation avec le réseau…</translation>
     </message>
     <message>
         <source>&amp;Overview</source>
@@ -100,7 +259,7 @@
     </message>
     <message>
         <source>Browse transaction history</source>
-        <translation>Parcourir l'historique des transactions</translation>
+        <translation>Parcourir l'historique transactionnel</translation>
     </message>
     <message>
         <source>E&amp;xit</source>
@@ -156,7 +315,19 @@
     </message>
     <message>
         <source>Open &amp;URI...</source>
-        <translation>Ouvrir un &amp;URI...</translation>
+        <translation>Ouvrir une &amp;URI...</translation>
+    </message>
+    <message>
+        <source>Click to disable network activity.</source>
+        <translation>Cliquer pour désactiver l'activité réseau.</translation>
+    </message>
+    <message>
+        <source>Network activity disabled.</source>
+        <translation>L'activité réseau est désactivée.</translation>
+    </message>
+    <message>
+        <source>Click to enable network activity again.</source>
+        <translation>Cliquer pour réactiver l'activité réseau.</translation>
     </message>
     <message>
         <source>Reindexing blocks on disk...</source>
@@ -204,15 +375,15 @@
     </message>
     <message>
         <source>&amp;Show / Hide</source>
-        <translation>&amp;Afficher / Cacher</translation>
+        <translation>&amp;Afficher / cacher</translation>
     </message>
     <message>
         <source>Show or hide the main Window</source>
-        <translation>Afficher ou masquer la fenêtre principale</translation>
+        <translation>Afficher ou cacher la fenêtre principale</translation>
     </message>
     <message>
         <source>Encrypt the private keys that belong to your wallet</source>
-        <translation>Chiffrer les clefs privées de votre porte-monnaie</translation>
+        <translation>Chiffrer les clés privées qui appartiennent à votre porte-monnaie</translation>
     </message>
     <message>
         <source>Sign messages with your Bitcoin addresses to prove you own them</source>
@@ -220,7 +391,7 @@
     </message>
     <message>
         <source>Verify messages to ensure they were signed with specified Bitcoin addresses</source>
-        <translation>Vérifier les messages pour vous assurer qu'ils ont été signés avec les adresses Bitcoin spécifiées</translation>
+        <translation>Vérifier les messages pour s'assurer qu'ils ont été signés avec les adresses Bitcoin spécifiées</translation>
     </message>
     <message>
         <source>&amp;File</source>
@@ -228,7 +399,7 @@
     </message>
     <message>
         <source>&amp;Settings</source>
-        <translation>&amp;Réglages</translation>
+        <translation>&amp;Paramètres</translation>
     </message>
     <message>
         <source>&amp;Help</source>
@@ -240,7 +411,7 @@
     </message>
     <message>
         <source>Request payments (generates QR codes and bitcoin: URIs)</source>
-        <translation>Demander des paiements (génère des codes QR et des URIs bitcoin:)</translation>
+        <translation>Demander des paiements (génère des codes QR et des URI bitcoin:)</translation>
     </message>
     <message>
         <source>Show the list of used sending addresses and labels</source>
@@ -252,7 +423,7 @@
     </message>
     <message>
         <source>Open a bitcoin: URI or payment request</source>
-        <translation>Ouvrir un URI bitcoin: ou une demande de paiement</translation>
+        <translation>Ouvrir une URI bitcoin: ou une demande de paiement</translation>
     </message>
     <message>
         <source>&amp;Command-line options</source>
@@ -278,29 +449,9 @@
         <source>Processed %n block(s) of transaction history.</source>
         <translation><numerusform>%n bloc d'historique transactionnel a été traité</numerusform><numerusform>%n blocs d'historique transactionnel ont été traités</numerusform></translation>
     </message>
-    <message numerus="yes">
-        <source>%n hour(s)</source>
-        <translation><numerusform>%n heure</numerusform><numerusform>%n heures</numerusform></translation>
-    </message>
-    <message numerus="yes">
-        <source>%n day(s)</source>
-        <translation><numerusform>%n jour</numerusform><numerusform>%n jours</numerusform></translation>
-    </message>
-    <message numerus="yes">
-        <source>%n week(s)</source>
-        <translation><numerusform>%n semaine</numerusform><numerusform>%n semaines</numerusform></translation>
-    </message>
-    <message>
-        <source>%1 and %2</source>
-        <translation>%1 et %2</translation>
-    </message>
-    <message numerus="yes">
-        <source>%n year(s)</source>
-        <translation><numerusform>%n an</numerusform><numerusform>%n ans</numerusform></translation>
-    </message>
     <message>
         <source>%1 behind</source>
-        <translation>%1 en retard</translation>
+        <translation>en retard de %1</translation>
     </message>
     <message>
         <source>Last received block was generated %1 ago.</source>
@@ -308,7 +459,7 @@
     </message>
     <message>
         <source>Transactions after this will not yet be visible.</source>
-        <translation>Les transactions après ceci ne sont pas encore visibles.</translation>
+        <translation>Les transactions suivantes ne seront pas déjà visibles.</translation>
     </message>
     <message>
         <source>Error</source>
@@ -336,7 +487,7 @@
     </message>
     <message>
         <source>Catching up...</source>
-        <translation>Rattrapage en cours…</translation>
+        <translation>Rattrapage…</translation>
     </message>
     <message>
         <source>Date: %1
@@ -376,6 +527,14 @@
         <source>Incoming transaction</source>
         <translation>Transaction entrante</translation>
     </message>
+    <message>
+        <source>HD key generation is &lt;b&gt;enabled&lt;/b&gt;</source>
+        <translation>La génération de clé HD est &lt;b&gt;activée&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <source>HD key generation is &lt;b&gt;disabled&lt;/b&gt;</source>
+        <translation>La génération de clé HD est &lt;b&gt;désactivée&lt;/b&gt;</translation>
+    </message>
     <message>
         <source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;unlocked&lt;/b&gt;</source>
         <translation>Le porte-monnaie est &lt;b&gt;chiffré&lt;/b&gt; et est actuellement &lt;b&gt;déverrouillé&lt;/b&gt;</translation>
@@ -384,6 +543,10 @@
         <source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;locked&lt;/b&gt;</source>
         <translation>Le porte-monnaie est &lt;b&gt;chiffré&lt;/b&gt; et actuellement &lt;b&gt;verrouillé&lt;/b&gt;</translation>
     </message>
+    <message>
+        <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source>
+        <translation>Une erreur fatale est survenue. Bitcoin ne peut plus continuer en toute sécurité et va s'arrêter.</translation>
+    </message>
 </context>
 <context>
     <name>CoinControlDialog</name>
@@ -403,10 +566,6 @@
         <source>Amount:</source>
         <translation>Montant :</translation>
     </message>
-    <message>
-        <source>Priority:</source>
-        <translation>Priorité :</translation>
-    </message>
     <message>
         <source>Fee:</source>
         <translation>Frais :</translation>
@@ -425,7 +584,7 @@
     </message>
     <message>
         <source>(un)select all</source>
-        <translation>Tout (dé)sélectionner</translation>
+        <translation>Tout (des)sélectionner</translation>
     </message>
     <message>
         <source>Tree mode</source>
@@ -460,8 +619,84 @@
         <translation>Confirmée</translation>
     </message>
     <message>
-        <source>Priority</source>
-        <translation>Priorité</translation>
+        <source>Copy address</source>
+        <translation>Copier l’adresse</translation>
+    </message>
+    <message>
+        <source>Copy label</source>
+        <translation>Copier l’étiquette</translation>
+    </message>
+    <message>
+        <source>Copy amount</source>
+        <translation>Copier le montant</translation>
+    </message>
+    <message>
+        <source>Copy transaction ID</source>
+        <translation>Copier l'ID de la transaction</translation>
+    </message>
+    <message>
+        <source>Lock unspent</source>
+        <translation>Verrouiller les transactions non dépensées</translation>
+    </message>
+    <message>
+        <source>Unlock unspent</source>
+        <translation>Déverrouiller les transactions non dépensées</translation>
+    </message>
+    <message>
+        <source>Copy quantity</source>
+        <translation>Copier la quantité</translation>
+    </message>
+    <message>
+        <source>Copy fee</source>
+        <translation>Copier les frais</translation>
+    </message>
+    <message>
+        <source>Copy after fee</source>
+        <translation>Copier après les frais</translation>
+    </message>
+    <message>
+        <source>Copy bytes</source>
+        <translation>Copier les octets</translation>
+    </message>
+    <message>
+        <source>Copy dust</source>
+        <translation>Copier la poussière</translation>
+    </message>
+    <message>
+        <source>Copy change</source>
+        <translation>Copier la monnaie</translation>
+    </message>
+    <message>
+        <source>(%1 locked)</source>
+        <translation>(%1 verrouillée)</translation>
+    </message>
+    <message>
+        <source>yes</source>
+        <translation>oui</translation>
+    </message>
+    <message>
+        <source>no</source>
+        <translation>non</translation>
+    </message>
+    <message>
+        <source>This label turns red if any recipient receives an amount smaller than the current dust threshold.</source>
+        <translation>Cette étiquette devient rouge si un destinataire reçoit un montant inférieur au seuil actuel de poussière.</translation>
+    </message>
+    <message>
+        <source>Can vary +/- %1 satoshi(s) per input.</source>
+        <translation>Peut varier +/- %1 satoshi(s) par entrée.</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(aucune étiquette)</translation>
+    </message>
+    <message>
+        <source>change from %1 (%2)</source>
+        <translation>monnaie de %1 (%2)</translation>
+    </message>
+    <message>
+        <source>(change)</source>
+        <translation>(monnaie)</translation>
     </message>
 </context>
 <context>
@@ -472,7 +707,7 @@
     </message>
     <message>
         <source>&amp;Label</source>
-        <translation>&amp;Étiquette</translation>
+        <translation>É&amp;tiquette</translation>
     </message>
     <message>
         <source>The label associated with this address list entry</source>
@@ -480,12 +715,44 @@
     </message>
     <message>
         <source>The address associated with this address list entry. This can only be modified for sending addresses.</source>
-        <translation>L'adresse associée à cette entrée de la liste d'adresses. Ceci ne peut être modifié que pour les adresses d'envoi.</translation>
+        <translation>L'adresse associée à cette entrée de la liste d'adresses. Cela ne peut être modifié que pour les adresses d'envoi.</translation>
     </message>
     <message>
         <source>&amp;Address</source>
         <translation>&amp;Adresse</translation>
     </message>
+    <message>
+        <source>New receiving address</source>
+        <translation>Nouvelle adresse de réception</translation>
+    </message>
+    <message>
+        <source>New sending address</source>
+        <translation>Nouvelle adresse d’envoi</translation>
+    </message>
+    <message>
+        <source>Edit receiving address</source>
+        <translation>Modifier l’adresse de réception</translation>
+    </message>
+    <message>
+        <source>Edit sending address</source>
+        <translation>Modifier l’adresse d'envoi</translation>
+    </message>
+    <message>
+        <source>The entered address "%1" is not a valid Bitcoin address.</source>
+        <translation>L'adresse saisie « %1 » n'est pas une adresse Bitcoin valide.</translation>
+    </message>
+    <message>
+        <source>The entered address "%1" is already in the address book.</source>
+        <translation>L’adresse saisie « %1 » est déjà présente dans le carnet d'adresses.</translation>
+    </message>
+    <message>
+        <source>Could not unlock wallet.</source>
+        <translation>Impossible de déverrouiller le porte-monnaie.</translation>
+    </message>
+    <message>
+        <source>New key generation failed.</source>
+        <translation>Échec de génération de la nouvelle clé.</translation>
+    </message>
 </context>
 <context>
     <name>FreespaceChecker</name>
@@ -499,7 +766,7 @@
     </message>
     <message>
         <source>Directory already exists. Add %1 if you intend to create a new directory here.</source>
-        <translation>Le répertoire existe déjà. Ajoutez %1 si vous voulez créer un nouveau répertoire ici.</translation>
+        <translation>Le répertoire existe déjà. Ajouter %1 si vous comptez créer un nouveau répertoire ici.</translation>
     </message>
     <message>
         <source>Path already exists, and is not a directory.</source>
@@ -605,18 +872,69 @@
     </message>
     <message numerus="yes">
         <source>(of %n GB needed)</source>
-        <translation><numerusform>(sur %n Go nécessaire)</numerusform><numerusform>(sur %n Go nécessaires)</numerusform></translation>
+        <translation><numerusform>(sur %n Go requis)</numerusform><numerusform>(sur %n Go requis)</numerusform></translation>
+    </message>
+</context>
+<context>
+    <name>ModalOverlay</name>
+    <message>
+        <source>Form</source>
+        <translation>Formulaire</translation>
+    </message>
+    <message>
+        <source>Recent transactions may not yet be visible, and therefore your wallet's balance might be incorrect. This information will be correct once your wallet has finished synchronizing with the bitcoin network, as detailed below.</source>
+        <translation>Les transactions récentes ne sont peut-être pas encore visibles, et par conséquent, le solde de votre porte-monnaie est peut-être erroné. Cette information sera juste une fois que votre porte-monnaie aura fini de se synchroniser avec le réseau Bitcoin, tel que décrit ci-dessous. </translation>
+    </message>
+    <message>
+        <source>Attempting to spend bitcoins that are affected by not-yet-displayed transactions will not be accepted by the network.</source>
+        <translation>Toute tentative de dépense de bitcoins affectés par des transactions qui ne sont pas encore affichées ne sera pas acceptée par le réseau.</translation>
+    </message>
+    <message>
+        <source>Number of blocks left</source>
+        <translation>Nombre de blocs restants</translation>
+    </message>
+    <message>
+        <source>Unknown...</source>
+        <translation>Inconnu...</translation>
+    </message>
+    <message>
+        <source>Last block time</source>
+        <translation>Horodatage du dernier bloc</translation>
+    </message>
+    <message>
+        <source>Progress</source>
+        <translation>Progression</translation>
+    </message>
+    <message>
+        <source>Progress increase per hour</source>
+        <translation>Avancement de la progression par heure</translation>
+    </message>
+    <message>
+        <source>calculating...</source>
+        <translation>calcul en cours...</translation>
+    </message>
+    <message>
+        <source>Estimated time left until synced</source>
+        <translation>Temps estimé avant la fin de la synchronisation</translation>
+    </message>
+    <message>
+        <source>Hide</source>
+        <translation>Cacher</translation>
+    </message>
+    <message>
+        <source>Unknown. Syncing Headers (%1)...</source>
+        <translation>Inconnu. Synchronisation des en-têtes (%1)...</translation>
     </message>
 </context>
 <context>
     <name>OpenURIDialog</name>
     <message>
         <source>Open URI</source>
-        <translation>Ouvrir un URI</translation>
+        <translation>Ouvrir une URI</translation>
     </message>
     <message>
         <source>Open payment request from URI or file</source>
-        <translation>Ouvrir une demande de paiement à partir d'un URI ou d'un fichier</translation>
+        <translation>Ouvrir une demande de paiement à partir d'une URI ou d'un fichier</translation>
     </message>
     <message>
         <source>URI:</source>
@@ -626,6 +944,10 @@
         <source>Select payment request file</source>
         <translation>Choisir le fichier de demande de paiement</translation>
     </message>
+    <message>
+        <source>Select payment request file to open</source>
+        <translation>Choisir le fichier de demande de paiement à ouvrir</translation>
+    </message>
 </context>
 <context>
     <name>OptionsDialog</name>
@@ -635,7 +957,7 @@
     </message>
     <message>
         <source>&amp;Main</source>
-        <translation>Réglages &amp;principaux</translation>
+        <translation>&amp;Principaux</translation>
     </message>
     <message>
         <source>Automatically start %1 after logging in to the system.</source>
@@ -655,7 +977,7 @@
     </message>
     <message>
         <source>Number of script &amp;verification threads</source>
-        <translation>Nombre d'exétrons de &amp;vérification de script</translation>
+        <translation>Nombre de fils de &amp;vérification de script</translation>
     </message>
     <message>
         <source>Accept connections from outside</source>
@@ -667,7 +989,7 @@
     </message>
     <message>
         <source>IP address of the proxy (e.g. IPv4: 127.0.0.1 / IPv6: ::1)</source>
-        <translation>Adresse IP du mandataire (par ex. IPv4 : 127.0.0.1 / IPv6 : ::1)</translation>
+        <translation>Adresse IP du mandataire (p. ex. IPv4 : 127.0.0.1 / IPv6 : ::1)</translation>
     </message>
     <message>
         <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Exit in the menu.</source>
@@ -675,7 +997,7 @@
     </message>
     <message>
         <source>Third party URLs (e.g. a block explorer) that appear in the transactions tab as context menu items. %s in the URL is replaced by transaction hash. Multiple URLs are separated by vertical bar |.</source>
-        <translation>URL de tiers (par ex. un explorateur de blocs) apparaissant dans l'onglet des transactions comme éléments du menu contextuel. %s dans l'URL est remplacé par le hachage de la transaction. Les URL multiples sont séparées par une barre verticale |.</translation>
+        <translation>URL de tiers (p. ex. un explorateur de blocs) apparaissant dans l'onglet des transactions comme éléments du menu contextuel. %s dans l'URL est remplacé par le hachage de la transaction. Les URL multiples sont séparées par une barre verticale |.</translation>
     </message>
     <message>
         <source>Third party transaction URLs</source>
@@ -691,7 +1013,7 @@
     </message>
     <message>
         <source>&amp;Reset Options</source>
-        <translation>&amp;Réinitialisation des options</translation>
+        <translation>&amp;Réinitialiser les options</translation>
     </message>
     <message>
         <source>&amp;Network</source>
@@ -711,11 +1033,11 @@
     </message>
     <message>
         <source>Enable coin &amp;control features</source>
-        <translation>Activer les fonctions de &amp;contrôle des pièces </translation>
+        <translation>Activer les fonctions de &amp;contrôle des pièces</translation>
     </message>
     <message>
         <source>If you disable the spending of unconfirmed change, the change from a transaction cannot be used until that transaction has at least one confirmation. This also affects how your balance is computed.</source>
-        <translation>Si vous désactivé la dépense de la monnaie non confirmée, la monnaie d'une transaction ne peut pas être utilisée tant que cette transaction n'a pas reçu au moins une confirmation. Ceci affecte aussi comment votre solde est calculé.</translation>
+        <translation>Si vous désactivé la dépense de la monnaie non confirmée, la monnaie d'une transaction ne peut pas être utilisée tant que cette transaction n'a pas reçu au moins une confirmation. Celai affecte aussi le calcul de votre solde.</translation>
     </message>
     <message>
         <source>&amp;Spend unconfirmed change</source>
@@ -723,7 +1045,7 @@
     </message>
     <message>
         <source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source>
-        <translation>Ouvrir le port du client Bitcoin automatiquement sur le routeur. Ceci ne fonctionne que si votre routeur supporte l'UPnP et si la fonctionnalité est activée.</translation>
+        <translation>Ouvrir automatiquement le port du client Bitcoin sur le routeur. Cela ne fonctionne que si votre routeur prend en charge l'UPnP et si la fonction est activée.</translation>
     </message>
     <message>
         <source>Map port using &amp;UPnP</source>
@@ -739,7 +1061,7 @@
     </message>
     <message>
         <source>Proxy &amp;IP:</source>
-        <translation>&amp;IP du serveur mandataire :</translation>
+        <translation>&amp;IP du mandataire :</translation>
     </message>
     <message>
         <source>&amp;Port:</source>
@@ -747,7 +1069,7 @@
     </message>
     <message>
         <source>Port of the proxy (e.g. 9050)</source>
-        <translation>Port du serveur mandataire (par ex. 9050)</translation>
+        <translation>Port du mandataire (p. ex. 9050)</translation>
     </message>
     <message>
         <source>Used for reaching peers via:</source>
@@ -791,11 +1113,11 @@
     </message>
     <message>
         <source>Show only a tray icon after minimizing the window.</source>
-        <translation>Afficher uniquement une icône système après minimisation.</translation>
+        <translation>N'afficher qu'une icône dans la zone de notification après minimisation.</translation>
     </message>
     <message>
         <source>&amp;Minimize to the tray instead of the taskbar</source>
-        <translation>&amp;Minimiser dans la barre système au lieu de la barre des tâches</translation>
+        <translation>&amp;Minimiser dans la zone de notification au lieu de la barre des tâches</translation>
     </message>
     <message>
         <source>M&amp;inimize on close</source>
@@ -819,7 +1141,7 @@
     </message>
     <message>
         <source>Choose the default subdivision unit to show in the interface and when sending coins.</source>
-        <translation>Choisissez la sous-unité par défaut pour l'affichage dans l'interface et lors de l'envoi de pièces.</translation>
+        <translation>Choisir la sous-unité par défaut d'affichage dans l'interface et lors d'envoi de pièces.</translation>
     </message>
     <message>
         <source>Whether to show coin control features or not.</source>
@@ -847,7 +1169,7 @@
     </message>
     <message>
         <source>Client restart required to activate changes.</source>
-        <translation>Le redémarrage du client est nécessaire pour activer les changements.</translation>
+        <translation>Le redémarrage du client est exigé pour activer les changements.</translation>
     </message>
     <message>
         <source>Client will be shut down. Do you want to proceed?</source>
@@ -882,7 +1204,7 @@
     </message>
     <message>
         <source>Your current spendable balance</source>
-        <translation>Votre solde actuel pouvant être dépensé</translation>
+        <translation>Votre solde actuel disponible</translation>
     </message>
     <message>
         <source>Pending:</source>
@@ -890,7 +1212,7 @@
     </message>
     <message>
         <source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source>
-        <translation>Total des transactions qui doivent encore être confirmées et qu'il n'est pas encore possible de dépenser</translation>
+        <translation>Total des transactions qui doivent encore être confirmées et qui ne sont pas prises en compte dans le solde disponible</translation>
     </message>
     <message>
         <source>Immature:</source>
@@ -937,6 +1259,97 @@
         <translation>Solde total actuel dans des adresses juste-regarder</translation>
     </message>
 </context>
+<context>
+    <name>PaymentServer</name>
+    <message>
+        <source>Payment request error</source>
+        <translation>Erreur de demande de paiement</translation>
+    </message>
+    <message>
+        <source>Cannot start bitcoin: click-to-pay handler</source>
+        <translation>Impossible de démarrer le gestionnaire de cliquer-pour-payer bitcoin:</translation>
+    </message>
+    <message>
+        <source>URI handling</source>
+        <translation>Gestion des URI</translation>
+    </message>
+    <message>
+        <source>Payment request fetch URL is invalid: %1</source>
+        <translation>L'URL de récupération de la demande de paiement est invalide : %1</translation>
+    </message>
+    <message>
+        <source>Invalid payment address %1</source>
+        <translation>Adresse de paiement invalide %1</translation>
+    </message>
+    <message>
+        <source>URI cannot be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source>
+        <translation>L'URI ne peut pas être analysée ! Cela peut être causé par une adresse Bitcoin invalide ou par des paramètres d'URI mal formés.</translation>
+    </message>
+    <message>
+        <source>Payment request file handling</source>
+        <translation>Gestion des fichiers de demande de paiement</translation>
+    </message>
+    <message>
+        <source>Payment request file cannot be read! This can be caused by an invalid payment request file.</source>
+        <translation>Le fichier de demande de paiement ne peut pas être lu ! Cela peut être causé par un fichier de demande de paiement invalide.</translation>
+    </message>
+    <message>
+        <source>Payment request rejected</source>
+        <translation>Demande de paiement rejetée</translation>
+    </message>
+    <message>
+        <source>Payment request network doesn't match client network.</source>
+        <translation>Le réseau de la demande de paiement ne correspond pas au réseau du client.</translation>
+    </message>
+    <message>
+        <source>Payment request expired.</source>
+        <translation>La demande de paiement a expiré</translation>
+    </message>
+    <message>
+        <source>Payment request is not initialized.</source>
+        <translation>La demande de paiement n'est pas initialisée.</translation>
+    </message>
+    <message>
+        <source>Unverified payment requests to custom payment scripts are unsupported.</source>
+        <translation>Les demandes de paiements non vérifiées vers des scripts de paiement personnalisés ne sont pas prises en charge.</translation>
+    </message>
+    <message>
+        <source>Invalid payment request.</source>
+        <translation>Demande de paiement invalide.</translation>
+    </message>
+    <message>
+        <source>Requested payment amount of %1 is too small (considered dust).</source>
+        <translation>Le paiement demandé d'un montant de %1 est trop faible (considéré comme de la poussière).</translation>
+    </message>
+    <message>
+        <source>Refund from %1</source>
+        <translation>Remboursement de %1</translation>
+    </message>
+    <message>
+        <source>Payment request %1 is too large (%2 bytes, allowed %3 bytes).</source>
+        <translation>La demande de paiement %1 est trop grande (%2 octets, %3 octets permis).</translation>
+    </message>
+    <message>
+        <source>Error communicating with %1: %2</source>
+        <translation>Erreur de communication avec %1 : %2</translation>
+    </message>
+    <message>
+        <source>Payment request cannot be parsed!</source>
+        <translation>La demande de paiement ne peut pas être analysée !</translation>
+    </message>
+    <message>
+        <source>Bad response from server %1</source>
+        <translation>Mauvaise réponse du serveur %1</translation>
+    </message>
+    <message>
+        <source>Network request error</source>
+        <translation>Erreur de demande réseau</translation>
+    </message>
+    <message>
+        <source>Payment acknowledged</source>
+        <translation>Le paiement a été confirmé</translation>
+    </message>
+</context>
 <context>
     <name>PeerTableModel</name>
     <message>
@@ -948,8 +1361,12 @@
         <translation>Nœud/service</translation>
     </message>
     <message>
-        <source>Ping Time</source>
-        <translation>Temps de ping</translation>
+        <source>NodeId</source>
+        <translation>NodeId</translation>
+    </message>
+    <message>
+        <source>Ping</source>
+        <translation>Ping</translation>
     </message>
 </context>
 <context>
@@ -990,10 +1407,76 @@
         <source>%1 ms</source>
         <translation>%1 ms</translation>
     </message>
-</context>
-<context>
-    <name>RPCConsole</name>
-    <message>
+    <message numerus="yes">
+        <source>%n second(s)</source>
+        <translation><numerusform>%n seconde</numerusform><numerusform>%n secondes</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%n minute(s)</source>
+        <translation><numerusform>%n minute</numerusform><numerusform>%n minutes</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%n hour(s)</source>
+        <translation><numerusform>%n heure</numerusform><numerusform>%n heures</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%n day(s)</source>
+        <translation><numerusform>%n jour</numerusform><numerusform>%n jours</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%n week(s)</source>
+        <translation><numerusform>%n semaine</numerusform><numerusform>%n semaines</numerusform></translation>
+    </message>
+    <message>
+        <source>%1 and %2</source>
+        <translation>%1 et %2</translation>
+    </message>
+    <message numerus="yes">
+        <source>%n year(s)</source>
+        <translation><numerusform>%n an</numerusform><numerusform>%n ans</numerusform></translation>
+    </message>
+    <message>
+        <source>%1 didn't yet exit safely...</source>
+        <translation>%1 ne s'est pas encore arrêté en toute sécurité...</translation>
+    </message>
+</context>
+<context>
+    <name>QObject::QObject</name>
+    <message>
+        <source>Error: Specified data directory "%1" does not exist.</source>
+        <translation>Erreur : le répertoire de données indiqué « %1 » n'existe pas.</translation>
+    </message>
+    <message>
+        <source>Error: Cannot parse configuration file: %1. Only use key=value syntax.</source>
+        <translation>Erreur : impossible d'analyser le fichier de configuration : %1. N’utiliser que la syntaxe clef=valeur.</translation>
+    </message>
+    <message>
+        <source>Error: %1</source>
+        <translation>Erreur : %1</translation>
+    </message>
+</context>
+<context>
+    <name>QRImageWidget</name>
+    <message>
+        <source>&amp;Save Image...</source>
+        <translation>&amp;Enregistrer l'image...</translation>
+    </message>
+    <message>
+        <source>&amp;Copy Image</source>
+        <translation>&amp;Copier l'image</translation>
+    </message>
+    <message>
+        <source>Save QR Code</source>
+        <translation>Enregistrer le code QR</translation>
+    </message>
+    <message>
+        <source>PNG Image (*.png)</source>
+        <translation>Image PNG (*.png)</translation>
+    </message>
+</context>
+<context>
+    <name>RPCConsole</name>
+    <message>
         <source>N/A</source>
         <translation>N.D.</translation>
     </message>
@@ -1107,7 +1590,7 @@
     </message>
     <message>
         <source>Open the %1 debug log file from the current data directory. This can take a few seconds for large log files.</source>
-        <translation>Ouvrir le journal de débogage de %1 depuis le répertoire de données actuel. Ceci peut prendre quelques secondes pour les journaux de grande taille.</translation>
+        <translation>Ouvrir le fichier journal de débogage de %1 à partir du répertoire de données actuel. Cela peut prendre quelques secondes pour les fichiers journaux de grande taille.</translation>
     </message>
     <message>
         <source>Decrease font size</source>
@@ -1143,12 +1626,16 @@
     </message>
     <message>
         <source>The duration of a currently outstanding ping.</source>
-        <translation>La durée d'un ping actuellement en cours.</translation>
+        <translation>La durée d'un ping en cours.</translation>
     </message>
     <message>
         <source>Ping Wait</source>
         <translation>Attente du ping</translation>
     </message>
+    <message>
+        <source>Min Ping</source>
+        <translation>Ping min.</translation>
+    </message>
     <message>
         <source>Time Offset</source>
         <translation>Décalage temporel</translation>
@@ -1171,7 +1658,7 @@
     </message>
     <message>
         <source>&amp;Clear</source>
-        <translation>&amp;Nettoyer</translation>
+        <translation>&amp;Effacer</translation>
     </message>
     <message>
         <source>Totals</source>
@@ -1187,19 +1674,11 @@
     </message>
     <message>
         <source>Debug log file</source>
-        <translation>Journal de débogage</translation>
+        <translation>Fichier journal de débogage</translation>
     </message>
     <message>
         <source>Clear console</source>
-        <translation>Nettoyer la console</translation>
-    </message>
-    <message>
-        <source>&amp;Disconnect Node</source>
-        <translation>&amp;Déconnecter le nœud</translation>
-    </message>
-    <message>
-        <source>Ban Node for</source>
-        <translation>Bannir le nœud pendant</translation>
+        <translation>Effacer la console</translation>
     </message>
     <message>
         <source>1 &amp;hour</source>
@@ -1218,8 +1697,16 @@
         <translation>1 &amp;an</translation>
     </message>
     <message>
-        <source>&amp;Unban Node</source>
-        <translation>&amp;Réhabiliter le nœud</translation>
+        <source>&amp;Disconnect</source>
+        <translation>&amp;Déconnecter</translation>
+    </message>
+    <message>
+        <source>Ban for</source>
+        <translation>Bannir pendant</translation>
+    </message>
+    <message>
+        <source>&amp;Unban</source>
+        <translation>&amp;Réhabiliter</translation>
     </message>
     <message>
         <source>Welcome to the %1 RPC console.</source>
@@ -1227,12 +1714,20 @@
     </message>
     <message>
         <source>Use up and down arrows to navigate history, and &lt;b&gt;Ctrl-L&lt;/b&gt; to clear screen.</source>
-        <translation>Utiliser les touches de curseur pour naviguer dans l'historique et &lt;b&gt;Ctrl-L&lt;/b&gt; pour effacer l'écran.</translation>
+        <translation>Utiliser les touches de déplacement pour naviguer dans l'historique et &lt;b&gt;Ctrl-L&lt;/b&gt; pour effacer l'écran.</translation>
     </message>
     <message>
         <source>Type &lt;b&gt;help&lt;/b&gt; for an overview of available commands.</source>
         <translation>Taper &lt;b&gt;help&lt;/b&gt; pour afficher une vue générale des commandes proposées.</translation>
     </message>
+    <message>
+        <source>WARNING: Scammers have been active, telling users to type commands here, stealing their wallet contents. Do not use this console without fully understanding the ramification of a command.</source>
+        <translation>AVERTISSEMENT : des fraudeurs sont réputés être à l'oeuvre, demandant aux utilisateurs de taper des commandes ici, et dérobant le contenu de leurs porte-monnaie. Ne pas utiliser cette console sans une compréhension parfaite des conséquences d'une commande.</translation>
+    </message>
+    <message>
+        <source>Network activity disabled</source>
+        <translation>L'activité réseau est désactivée.</translation>
+    </message>
     <message>
         <source>%1 B</source>
         <translation>%1 o</translation>
@@ -1298,7 +1793,7 @@
     </message>
     <message>
         <source>Reuse one of the previously used receiving addresses. Reusing addresses has security and privacy issues. Do not use this unless re-generating a payment request made before.</source>
-        <translation>Réutilise une adresse de réception précédemment utilisée. Réutiliser une adresse pose des problèmes de sécurité et de vie privée. N'utilisez pas cette option sauf si vous générez à nouveau une demande de paiement déjà faite.</translation>
+        <translation>Réutiliser une adresse de réception utilisée précédemment. Réutiliser une adresse comporte des problèmes de sécurité et de confidentialité. À ne pas utiliser, sauf pour générer une demande de paiement faite au préalable.</translation>
     </message>
     <message>
         <source>R&amp;euse an existing receiving address (not recommended)</source>
@@ -1306,19 +1801,19 @@
     </message>
     <message>
         <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source>
-        <translation>Un message optionnel à joindre à la demande de paiement qui sera affiché à l'ouverture de celle-ci. Note : le message ne sera pas envoyé avec le paiement par le réseau Bitcoin.</translation>
+        <translation>Un message facultatif à joindre à la demande de paiement et qui sera affiché à l'ouverture de celle-ci. Note : le message ne sera pas envoyé avec le paiement par le réseau Bitcoin.</translation>
     </message>
     <message>
         <source>An optional label to associate with the new receiving address.</source>
-        <translation>Un étiquette optionnelle à associer à la nouvelle adresse de réception</translation>
+        <translation>Un étiquette facultative à associer à la nouvelle adresse de réception.</translation>
     </message>
     <message>
         <source>Use this form to request payments. All fields are &lt;b&gt;optional&lt;/b&gt;.</source>
-        <translation>Utiliser ce formulaire pour demander des paiements. Tous les champs sont  &lt;b&gt;optionnels&lt;/b&gt;.</translation>
+        <translation>Utiliser ce formulaire pour demander des paiements. Tous les champs sont  &lt;b&gt;facultatifs&lt;/b&gt;.</translation>
     </message>
     <message>
         <source>An optional amount to request. Leave this empty or zero to not request a specific amount.</source>
-        <translation>Un montant optionnel à demander. Laisser ceci vide ou à zéro pour ne pas demander de montant spécifique.</translation>
+        <translation>Un montant facultatif à demander. Ne rien saisir ou un zéro pour ne pas demander de montant spécifique.</translation>
     </message>
     <message>
         <source>Clear all fields of the form.</source>
@@ -1334,11 +1829,11 @@
     </message>
     <message>
         <source>&amp;Request payment</source>
-        <translation>&amp;Demande de paiement</translation>
+        <translation>&amp;Demander un paiement</translation>
     </message>
     <message>
         <source>Show the selected request (does the same as double clicking an entry)</source>
-        <translation>Afficher la demande choisie (identique à un double-clic sur une entrée)</translation>
+        <translation>Afficher la demande choisie (comme double-cliquer sur une entrée)</translation>
     </message>
     <message>
         <source>Show</source>
@@ -1346,11 +1841,27 @@
     </message>
     <message>
         <source>Remove the selected entries from the list</source>
-        <translation>Enlever les entrées sélectionnées de la liste</translation>
+        <translation>Retirer les entrées sélectionnées de la liste</translation>
     </message>
     <message>
         <source>Remove</source>
-        <translation>Enlever</translation>
+        <translation>Retirer</translation>
+    </message>
+    <message>
+        <source>Copy URI</source>
+        <translation>Copier l'URI</translation>
+    </message>
+    <message>
+        <source>Copy label</source>
+        <translation>Copier l’étiquette</translation>
+    </message>
+    <message>
+        <source>Copy message</source>
+        <translation>Copier le message</translation>
+    </message>
+    <message>
+        <source>Copy amount</source>
+        <translation>Copier le montant</translation>
     </message>
 </context>
 <context>
@@ -1369,7 +1880,74 @@
     </message>
     <message>
         <source>&amp;Save Image...</source>
-        <translation>&amp;Sauvegarder l'image...</translation>
+        <translation>&amp;Enregistrer l'image...</translation>
+    </message>
+    <message>
+        <source>Request payment to %1</source>
+        <translation>Demande de paiement à %1</translation>
+    </message>
+    <message>
+        <source>Payment information</source>
+        <translation>Informations de paiement</translation>
+    </message>
+    <message>
+        <source>URI</source>
+        <translation>URI</translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation>Adresse</translation>
+    </message>
+    <message>
+        <source>Amount</source>
+        <translation>Montant</translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation>Étiquette</translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation>Message</translation>
+    </message>
+    <message>
+        <source>Resulting URI too long, try to reduce the text for label / message.</source>
+        <translation>L'URI résultante est trop longue. Essayez de réduire le texte de l'étiquette ou du message.</translation>
+    </message>
+    <message>
+        <source>Error encoding URI into QR Code.</source>
+        <translation>Erreur d'encodage de l'URI en code QR.</translation>
+    </message>
+</context>
+<context>
+    <name>RecentRequestsTableModel</name>
+    <message>
+        <source>Date</source>
+        <translation>Date</translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation>Étiquette</translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation>Message</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(aucune étiquette)</translation>
+    </message>
+    <message>
+        <source>(no message)</source>
+        <translation>(aucun message)</translation>
+    </message>
+    <message>
+        <source>(no amount requested)</source>
+        <translation>(aucun montant demandé)</translation>
+    </message>
+    <message>
+        <source>Requested</source>
+        <translation>Demandée</translation>
     </message>
 </context>
 <context>
@@ -1406,10 +1984,6 @@
         <source>Amount:</source>
         <translation>Montant :</translation>
     </message>
-    <message>
-        <source>Priority:</source>
-        <translation>Priorité :</translation>
-    </message>
     <message>
         <source>Fee:</source>
         <translation>Frais :</translation>
@@ -1419,313 +1993,986 @@
         <translation>Après les frais :</translation>
     </message>
     <message>
-        <source>Change:</source>
-        <translation>Monnaie :</translation>
+        <source>Change:</source>
+        <translation>Monnaie :</translation>
+    </message>
+    <message>
+        <source>If this is activated, but the change address is empty or invalid, change will be sent to a newly generated address.</source>
+        <translation>Si cette option est activée, et l'adresse de monnaie rendue est vide ou invalide, la monnaie sera envoyée vers une adresse nouvellement générée.</translation>
+    </message>
+    <message>
+        <source>Custom change address</source>
+        <translation>Adresse personnalisée de monnaie rendue</translation>
+    </message>
+    <message>
+        <source>Transaction Fee:</source>
+        <translation>Frais de transaction :</translation>
+    </message>
+    <message>
+        <source>Choose...</source>
+        <translation>Choisir...</translation>
+    </message>
+    <message>
+        <source>collapse fee-settings</source>
+        <translation>réduire les paramètres des frais</translation>
+    </message>
+    <message>
+        <source>per kilobyte</source>
+        <translation>par kilo-octet</translation>
+    </message>
+    <message>
+        <source>If the custom fee is set to 1000 satoshis and the transaction is only 250 bytes, then "per kilobyte" only pays 250 satoshis in fee, while "total at least" pays 1000 satoshis. For transactions bigger than a kilobyte both pay by kilobyte.</source>
+        <translation>Si les frais personnalisés sont définis à 1 000 satoshis et que la transaction est seulement de 250 octets, donc le « par kilo-octet » ne paiera que 250 satoshis de frais, alors que le « total au moins » paiera 1 000 satoshis. Pour des transactions supérieures à un kilo-octet, les deux paieront par kilo-octets.</translation>
+    </message>
+    <message>
+        <source>Hide</source>
+        <translation>Cacher</translation>
+    </message>
+    <message>
+        <source>total at least</source>
+        <translation>total au moins</translation>
+    </message>
+    <message>
+        <source>Paying only the minimum fee is just fine as long as there is less transaction volume than space in the blocks. But be aware that this can end up in a never confirming transaction once there is more demand for bitcoin transactions than the network can process.</source>
+        <translation>Il est correct de payer les frais minimum tant que le volume transactionnel est inférieur à l'espace dans les blocs. Mais soyez conscient que cela pourrait résulter en une transaction n'étant jamais confirmée une fois qu'il y aura plus de transactions que le réseau ne pourra en traiter.</translation>
+    </message>
+    <message>
+        <source>(read the tooltip)</source>
+        <translation>(lire l'infobulle)</translation>
+    </message>
+    <message>
+        <source>Recommended:</source>
+        <translation>Recommandés :</translation>
+    </message>
+    <message>
+        <source>Custom:</source>
+        <translation>Personnalisés : </translation>
+    </message>
+    <message>
+        <source>(Smart fee not initialized yet. This usually takes a few blocks...)</source>
+        <translation>(Les frais intelligents ne sont pas encore initialisés. Cela prend habituellement quelques blocs...)</translation>
+    </message>
+    <message>
+        <source>normal</source>
+        <translation>normal</translation>
+    </message>
+    <message>
+        <source>fast</source>
+        <translation>rapide</translation>
+    </message>
+    <message>
+        <source>Send to multiple recipients at once</source>
+        <translation>Envoyer à plusieurs destinataires à la fois</translation>
+    </message>
+    <message>
+        <source>Add &amp;Recipient</source>
+        <translation>Ajouter un &amp;destinataire</translation>
+    </message>
+    <message>
+        <source>Clear all fields of the form.</source>
+        <translation>Effacer tous les champs du formulaire.</translation>
+    </message>
+    <message>
+        <source>Dust:</source>
+        <translation>Poussière :</translation>
+    </message>
+    <message>
+        <source>Confirmation time target:</source>
+        <translation>Estimation du délai de confirmation :</translation>
+    </message>
+    <message>
+        <source>Clear &amp;All</source>
+        <translation>&amp;Tout effacer</translation>
+    </message>
+    <message>
+        <source>Balance:</source>
+        <translation>Solde :</translation>
+    </message>
+    <message>
+        <source>Confirm the send action</source>
+        <translation>Confirmer l’action d'envoi</translation>
+    </message>
+    <message>
+        <source>S&amp;end</source>
+        <translation>E&amp;nvoyer</translation>
+    </message>
+    <message>
+        <source>Copy quantity</source>
+        <translation>Copier la quantité</translation>
+    </message>
+    <message>
+        <source>Copy amount</source>
+        <translation>Copier le montant</translation>
+    </message>
+    <message>
+        <source>Copy fee</source>
+        <translation>Copier les frais</translation>
+    </message>
+    <message>
+        <source>Copy after fee</source>
+        <translation>Copier après les frais</translation>
+    </message>
+    <message>
+        <source>Copy bytes</source>
+        <translation>Copier les octets</translation>
+    </message>
+    <message>
+        <source>Copy dust</source>
+        <translation>Copier la poussière</translation>
+    </message>
+    <message>
+        <source>Copy change</source>
+        <translation>Copier la monnaie</translation>
+    </message>
+    <message>
+        <source>%1 to %2</source>
+        <translation>%1 à %2</translation>
+    </message>
+    <message>
+        <source>Are you sure you want to send?</source>
+        <translation>Voulez-vous vraiment envoyer ?</translation>
+    </message>
+    <message>
+        <source>added as transaction fee</source>
+        <translation>ajoutés comme frais de transaction</translation>
+    </message>
+    <message>
+        <source>Total Amount %1</source>
+        <translation>Montant total %1</translation>
+    </message>
+    <message>
+        <source>or</source>
+        <translation>ou</translation>
+    </message>
+    <message>
+        <source>Confirm send coins</source>
+        <translation>Confirmer l’envoi de pièces</translation>
+    </message>
+    <message>
+        <source>The recipient address is not valid. Please recheck.</source>
+        <translation>L'adresse du destinataire est invalide. Veuillez la revérifier.</translation>
+    </message>
+    <message>
+        <source>The amount to pay must be larger than 0.</source>
+        <translation>Le montant à payer doit être supérieur à 0.</translation>
+    </message>
+    <message>
+        <source>The amount exceeds your balance.</source>
+        <translation>Le montant dépasse votre solde.</translation>
+    </message>
+    <message>
+        <source>The total exceeds your balance when the %1 transaction fee is included.</source>
+        <translation>Le montant dépasse votre solde lorsque les frais de transaction de %1 sont inclus.</translation>
+    </message>
+    <message>
+        <source>Duplicate address found: addresses should only be used once each.</source>
+        <translation>Adresse identique trouvée : chaque adresse ne devrait être utilisée qu'une fois.</translation>
+    </message>
+    <message>
+        <source>Transaction creation failed!</source>
+        <translation>Échec de création de la transaction !</translation>
+    </message>
+    <message>
+        <source>The transaction was rejected with the following reason: %1</source>
+        <translation>La transaction a été rejetée pour la raison suivante: %1</translation>
+    </message>
+    <message>
+        <source>A fee higher than %1 is considered an absurdly high fee.</source>
+        <translation>Des frais supérieurs à %1 sont considérés comme ridiculement élevés.</translation>
+    </message>
+    <message>
+        <source>Payment request expired.</source>
+        <translation>La demande de paiement a expiré</translation>
+    </message>
+    <message numerus="yes">
+        <source>%n block(s)</source>
+        <translation><numerusform>%n bloc</numerusform><numerusform>%n blocs</numerusform></translation>
+    </message>
+    <message>
+        <source>Pay only the required fee of %1</source>
+        <translation>Payer seulement les frais exigés de %1</translation>
+    </message>
+    <message numerus="yes">
+        <source>Estimated to begin confirmation within %n block(s).</source>
+        <translation><numerusform>Il est estimé que la confirmation commencera dans %n bloc.</numerusform><numerusform>Il est estimé que la confirmation commencera dans %n blocs.</numerusform></translation>
+    </message>
+    <message>
+        <source>Warning: Invalid Bitcoin address</source>
+        <translation>Avertissement : adresse Bitcoin invalide</translation>
+    </message>
+    <message>
+        <source>Warning: Unknown change address</source>
+        <translation>Avertissement : adresse de monnaie rendue inconnue</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(aucune étiquette)</translation>
+    </message>
+</context>
+<context>
+    <name>SendCoinsEntry</name>
+    <message>
+        <source>A&amp;mount:</source>
+        <translation>&amp;Montant :</translation>
+    </message>
+    <message>
+        <source>Pay &amp;To:</source>
+        <translation>&amp;Payer à :</translation>
+    </message>
+    <message>
+        <source>&amp;Label:</source>
+        <translation>É&amp;tiquette :</translation>
+    </message>
+    <message>
+        <source>Choose previously used address</source>
+        <translation>Choisir une adresse déjà utilisée</translation>
+    </message>
+    <message>
+        <source>This is a normal payment.</source>
+        <translation>Ceci est un paiement normal.</translation>
+    </message>
+    <message>
+        <source>The Bitcoin address to send the payment to</source>
+        <translation>L'adresse Bitcoin à laquelle envoyer le paiement</translation>
+    </message>
+    <message>
+        <source>Alt+A</source>
+        <translation>Alt+A</translation>
+    </message>
+    <message>
+        <source>Paste address from clipboard</source>
+        <translation>Coller l'adresse du presse-papiers</translation>
+    </message>
+    <message>
+        <source>Alt+P</source>
+        <translation>Alt+P</translation>
+    </message>
+    <message>
+        <source>Remove this entry</source>
+        <translation>Retirer cette entrée</translation>
+    </message>
+    <message>
+        <source>The fee will be deducted from the amount being sent. The recipient will receive less bitcoins than you enter in the amount field. If multiple recipients are selected, the fee is split equally.</source>
+        <translation>Les frais seront déduits du montant envoyé. Le destinataire recevra moins de bitcoins que le montant saisi dans le champ de montant. Si plusieurs destinataires sont sélectionnés, les frais seront partagés également..</translation>
+    </message>
+    <message>
+        <source>S&amp;ubtract fee from amount</source>
+        <translation>S&amp;oustraire les frais du montant</translation>
+    </message>
+    <message>
+        <source>Message:</source>
+        <translation>Message :</translation>
+    </message>
+    <message>
+        <source>This is an unauthenticated payment request.</source>
+        <translation>Cette demande de paiement n'est pas authentifiée.</translation>
+    </message>
+    <message>
+        <source>This is an authenticated payment request.</source>
+        <translation>Cette demande de paiement est authentifiée.</translation>
+    </message>
+    <message>
+        <source>Enter a label for this address to add it to the list of used addresses</source>
+        <translation>Saisir une étiquette pour cette adresse afin de l'ajouter à la liste d'adresses utilisées</translation>
+    </message>
+    <message>
+        <source>A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
+        <translation>Un message qui était joint à l'URI bitcoin: et qui sera stocké avec la transaction pour référence. Note : ce message ne sera pas envoyé par le réseau Bitcoin.</translation>
+    </message>
+    <message>
+        <source>Pay To:</source>
+        <translation>Payer à :</translation>
+    </message>
+    <message>
+        <source>Memo:</source>
+        <translation>Mémo :</translation>
+    </message>
+    <message>
+        <source>Enter a label for this address to add it to your address book</source>
+        <translation>Saisir une étiquette pour cette adresse afin de l’ajouter à votre carnet d’adresses</translation>
+    </message>
+</context>
+<context>
+    <name>SendConfirmationDialog</name>
+    <message>
+        <source>Yes</source>
+        <translation>Oui</translation>
+    </message>
+</context>
+<context>
+    <name>ShutdownWindow</name>
+    <message>
+        <source>%1 is shutting down...</source>
+        <translation>Arrêt de %1...</translation>
+    </message>
+    <message>
+        <source>Do not shut down the computer until this window disappears.</source>
+        <translation>Ne pas fermer l'ordinateur jusqu'à la disparition de cette fenêtre.</translation>
+    </message>
+</context>
+<context>
+    <name>SignVerifyMessageDialog</name>
+    <message>
+        <source>Signatures - Sign / Verify a Message</source>
+        <translation>Signatures - Signer / vérifier un message</translation>
+    </message>
+    <message>
+        <source>&amp;Sign Message</source>
+        <translation>&amp;Signer un message</translation>
+    </message>
+    <message>
+        <source>You can sign messages/agreements with your addresses to prove you can receive bitcoins sent to them. Be careful not to sign anything vague or random, as phishing attacks may try to trick you into signing your identity over to them. Only sign fully-detailed statements you agree to.</source>
+        <translation>Vous pouvez signer des messages ou des accords avec vos adresses pour prouver que vous pouvez recevoir des bitcoins à ces dernières. Faites attention de ne rien signer de vague ou au hasard, car des attaques d'hameçonnage pourraient essayer de vous faire signer avec votre identité afin de l'usurper. Ne signez que des déclarations entièrement détaillées et avec lesquelles vous êtes d'accord.</translation>
+    </message>
+    <message>
+        <source>The Bitcoin address to sign the message with</source>
+        <translation>L'adresse Bitcoin avec laquelle signer le message</translation>
+    </message>
+    <message>
+        <source>Choose previously used address</source>
+        <translation>Choisir une adresse déjà utilisée</translation>
+    </message>
+    <message>
+        <source>Alt+A</source>
+        <translation>Alt+A</translation>
+    </message>
+    <message>
+        <source>Paste address from clipboard</source>
+        <translation>Coller une adresse du presse-papiers</translation>
+    </message>
+    <message>
+        <source>Alt+P</source>
+        <translation>Alt+P</translation>
+    </message>
+    <message>
+        <source>Enter the message you want to sign here</source>
+        <translation>Saisir ici le message que vous désirez signer</translation>
+    </message>
+    <message>
+        <source>Signature</source>
+        <translation>Signature</translation>
+    </message>
+    <message>
+        <source>Copy the current signature to the system clipboard</source>
+        <translation>Copier la signature actuelle dans le presse-papiers</translation>
+    </message>
+    <message>
+        <source>Sign the message to prove you own this Bitcoin address</source>
+        <translation>Signer le message afin de prouver que vous détenez cette adresse Bitcoin</translation>
+    </message>
+    <message>
+        <source>Sign &amp;Message</source>
+        <translation>Signer le &amp;message</translation>
+    </message>
+    <message>
+        <source>Reset all sign message fields</source>
+        <translation>Réinitialiser tous les champs de signature de message</translation>
+    </message>
+    <message>
+        <source>Clear &amp;All</source>
+        <translation>&amp;Tout effacer</translation>
+    </message>
+    <message>
+        <source>&amp;Verify Message</source>
+        <translation>&amp;Vérifier un message</translation>
+    </message>
+    <message>
+        <source>Enter the receiver's address, message (ensure you copy line breaks, spaces, tabs, etc. exactly) and signature below to verify the message. Be careful not to read more into the signature than what is in the signed message itself, to avoid being tricked by a man-in-the-middle attack. Note that this only proves the signing party receives with the address, it cannot prove sendership of any transaction!</source>
+        <translation>Saisir ci-dessous l'adresse du destinataire, le message (s'assurer de copier fidèlement les retours à la ligne, les espaces, les tabulations, etc.) et la signature pour vérifier le message. Faire attention à ne pas déduire davantage de la signature que ce qui est contenu dans le message signé même, pour éviter d'être trompé par une attaque d'homme du milieu. Prendre en compte que cela ne fait que prouver que le signataire reçoit l'adresse et ne peut pas prouver la provenance d'une transaction !</translation>
+    </message>
+    <message>
+        <source>The Bitcoin address the message was signed with</source>
+        <translation>L'adresse Bitcoin avec laquelle le message a été signé</translation>
+    </message>
+    <message>
+        <source>Verify the message to ensure it was signed with the specified Bitcoin address</source>
+        <translation>Vérifier le message pour s'assurer qu'il a été signé avec l'adresse Bitcoin spécifiée</translation>
+    </message>
+    <message>
+        <source>Verify &amp;Message</source>
+        <translation>Vérifier le &amp;message</translation>
+    </message>
+    <message>
+        <source>Reset all verify message fields</source>
+        <translation>Réinitialiser tous les champs de vérification de message</translation>
+    </message>
+    <message>
+        <source>Click "Sign Message" to generate signature</source>
+        <translation>Cliquez sur « Signer le message » pour générer la signature</translation>
+    </message>
+    <message>
+        <source>The entered address is invalid.</source>
+        <translation>L'adresse saisie est invalide.</translation>
+    </message>
+    <message>
+        <source>Please check the address and try again.</source>
+        <translation>Veuillez vérifier l'adresse et ressayer.</translation>
+    </message>
+    <message>
+        <source>The entered address does not refer to a key.</source>
+        <translation>L'adresse saisie ne fait pas référence à une clé.</translation>
+    </message>
+    <message>
+        <source>Wallet unlock was cancelled.</source>
+        <translation>Le déverrouillage du porte-monnaie a été annulé.</translation>
+    </message>
+    <message>
+        <source>Private key for the entered address is not available.</source>
+        <translation>La clé privée n'est pas disponible pour l'adresse saisie.</translation>
+    </message>
+    <message>
+        <source>Message signing failed.</source>
+        <translation>Échec de signature du message.</translation>
+    </message>
+    <message>
+        <source>Message signed.</source>
+        <translation>Le message a été signé.</translation>
+    </message>
+    <message>
+        <source>The signature could not be decoded.</source>
+        <translation>La signature n'a pu être décodée.</translation>
+    </message>
+    <message>
+        <source>Please check the signature and try again.</source>
+        <translation>Veuillez vérifier la signature et ressayer.</translation>
+    </message>
+    <message>
+        <source>The signature did not match the message digest.</source>
+        <translation>La signature ne correspond pas au condensé du message.</translation>
+    </message>
+    <message>
+        <source>Message verification failed.</source>
+        <translation>Échec de vérification du message.</translation>
+    </message>
+    <message>
+        <source>Message verified.</source>
+        <translation>Le message a été vérifié.</translation>
+    </message>
+</context>
+<context>
+    <name>SplashScreen</name>
+    <message>
+        <source>[testnet]</source>
+        <translation>[testnet]</translation>
+    </message>
+</context>
+<context>
+    <name>TrafficGraphWidget</name>
+    <message>
+        <source>KB/s</source>
+        <translation>Ko/s</translation>
+    </message>
+</context>
+<context>
+    <name>TransactionDesc</name>
+    <message numerus="yes">
+        <source>Open for %n more block(s)</source>
+        <translation><numerusform>Ouvert pendant encore %n bloc</numerusform><numerusform>Ouvert pendant encore %n blocs</numerusform></translation>
+    </message>
+    <message>
+        <source>Open until %1</source>
+        <translation>Ouvert jusqu'à %1</translation>
+    </message>
+    <message>
+        <source>conflicted with a transaction with %1 confirmations</source>
+        <translation>est en conflit avec une transaction ayant %1 confirmations</translation>
+    </message>
+    <message>
+        <source>%1/offline</source>
+        <translation>%1/hors ligne</translation>
+    </message>
+    <message>
+        <source>0/unconfirmed, %1</source>
+        <translation>0/non confirmées, %1</translation>
+    </message>
+    <message>
+        <source>in memory pool</source>
+        <translation>dans la réserve de mémoire</translation>
+    </message>
+    <message>
+        <source>not in memory pool</source>
+        <translation>pas dans la réserve de mémoire</translation>
+    </message>
+    <message>
+        <source>abandoned</source>
+        <translation>abandonnée</translation>
+    </message>
+    <message>
+        <source>%1/unconfirmed</source>
+        <translation>%1/non confirmée</translation>
+    </message>
+    <message>
+        <source>%1 confirmations</source>
+        <translation>%1 confirmations</translation>
+    </message>
+    <message>
+        <source>Status</source>
+        <translation>État</translation>
+    </message>
+    <message>
+        <source>, has not been successfully broadcast yet</source>
+        <translation>, n’a pas encore été diffusée avec succès</translation>
+    </message>
+    <message numerus="yes">
+        <source>, broadcast through %n node(s)</source>
+        <translation><numerusform>, diffusée par %n nœud</numerusform><numerusform>, diffusée par %n nœuds</numerusform></translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation>Date</translation>
+    </message>
+    <message>
+        <source>Source</source>
+        <translation>Source</translation>
+    </message>
+    <message>
+        <source>Generated</source>
+        <translation>Générée</translation>
+    </message>
+    <message>
+        <source>From</source>
+        <translation>De</translation>
+    </message>
+    <message>
+        <source>unknown</source>
+        <translation>inconnue</translation>
+    </message>
+    <message>
+        <source>To</source>
+        <translation>À</translation>
+    </message>
+    <message>
+        <source>own address</source>
+        <translation>votre adresse</translation>
+    </message>
+    <message>
+        <source>watch-only</source>
+        <translation>juste-regarder</translation>
+    </message>
+    <message>
+        <source>label</source>
+        <translation>étiquette</translation>
+    </message>
+    <message>
+        <source>Credit</source>
+        <translation>Crédit</translation>
+    </message>
+    <message numerus="yes">
+        <source>matures in %n more block(s)</source>
+        <translation><numerusform>arrivera à maturité dans %n bloc</numerusform><numerusform>arrivera à maturité dans %n blocs</numerusform></translation>
+    </message>
+    <message>
+        <source>not accepted</source>
+        <translation>refusée</translation>
+    </message>
+    <message>
+        <source>Debit</source>
+        <translation>Débit</translation>
+    </message>
+    <message>
+        <source>Total debit</source>
+        <translation>Débit total</translation>
+    </message>
+    <message>
+        <source>Total credit</source>
+        <translation>Crédit total</translation>
+    </message>
+    <message>
+        <source>Transaction fee</source>
+        <translation>Frais de transaction</translation>
+    </message>
+    <message>
+        <source>Net amount</source>
+        <translation>Montant net</translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation>Message</translation>
+    </message>
+    <message>
+        <source>Comment</source>
+        <translation>Commentaire</translation>
+    </message>
+    <message>
+        <source>Transaction ID</source>
+        <translation>ID de la transaction</translation>
+    </message>
+    <message>
+        <source>Transaction total size</source>
+        <translation>Taille totale de la transaction</translation>
+    </message>
+    <message>
+        <source>Output index</source>
+        <translation>Index de sorties</translation>
+    </message>
+    <message>
+        <source>Merchant</source>
+        <translation>Marchand</translation>
+    </message>
+    <message>
+        <source>Generated coins must mature %1 blocks before they can be spent. When you generated this block, it was broadcast to the network to be added to the block chain. If it fails to get into the chain, its state will change to "not accepted" and it won't be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source>
+        <translation>Les pièces générées doivent mûrir pendant %1 blocs avant de pouvoir être dépensées. Lorsque ce bloc a été généré, il a été diffusé sur le réseau pour être ajouté à la chaîne de blocs. Si son intégration à la chaîne échoue, son état sera modifié en « refusée » et il ne sera pas possible de le dépenser. Cela peut arriver occasionnellement si un autre nœud génère un bloc à quelques secondes du vôtre.</translation>
+    </message>
+    <message>
+        <source>Debug information</source>
+        <translation>Informations de débogage</translation>
+    </message>
+    <message>
+        <source>Transaction</source>
+        <translation>Transaction</translation>
+    </message>
+    <message>
+        <source>Inputs</source>
+        <translation>Entrées</translation>
+    </message>
+    <message>
+        <source>Amount</source>
+        <translation>Montant</translation>
+    </message>
+    <message>
+        <source>true</source>
+        <translation>vrai</translation>
+    </message>
+    <message>
+        <source>false</source>
+        <translation>faux</translation>
+    </message>
+</context>
+<context>
+    <name>TransactionDescDialog</name>
+    <message>
+        <source>This pane shows a detailed description of the transaction</source>
+        <translation>Ce panneau affiche une description détaillée de la transaction</translation>
     </message>
     <message>
-        <source>If this is activated, but the change address is empty or invalid, change will be sent to a newly generated address.</source>
-        <translation>Si ceci est actif mais l'adresse de monnaie rendue est vide ou invalide, la monnaie sera envoyée vers une adresse nouvellement générée.</translation>
+        <source>Details for %1</source>
+        <translation>Détails de %1</translation>
     </message>
+</context>
+<context>
+    <name>TransactionTableModel</name>
     <message>
-        <source>Custom change address</source>
-        <translation>Adresse personnalisée de monnaie rendue</translation>
+        <source>Date</source>
+        <translation>Date</translation>
     </message>
     <message>
-        <source>Transaction Fee:</source>
-        <translation>Frais de transaction :</translation>
+        <source>Type</source>
+        <translation>Type</translation>
     </message>
     <message>
-        <source>Choose...</source>
-        <translation>Choisir...</translation>
+        <source>Label</source>
+        <translation>Étiquette</translation>
     </message>
-    <message>
-        <source>collapse fee-settings</source>
-        <translation>réduire les paramètres des frais</translation>
+    <message numerus="yes">
+        <source>Open for %n more block(s)</source>
+        <translation><numerusform>Ouvert pendant encore %n bloc</numerusform><numerusform>Ouvert pendant encore %n blocs</numerusform></translation>
     </message>
     <message>
-        <source>per kilobyte</source>
-        <translation>par kilo-octet</translation>
+        <source>Open until %1</source>
+        <translation>Ouvert jusqu'à %1</translation>
     </message>
     <message>
-        <source>If the custom fee is set to 1000 satoshis and the transaction is only 250 bytes, then "per kilobyte" only pays 250 satoshis in fee, while "total at least" pays 1000 satoshis. For transactions bigger than a kilobyte both pay by kilobyte.</source>
-        <translation>Si les frais personnalisés sont définis à 1 000 satoshis et que la transaction est seulement de 250 octets, donc le « par kilo-octet » ne paiera que 250 satoshis de frais, alors que le « total au moins » paiera 1 000 satoshis. Pour des transactions supérieures à un kilo-octet, les deux paieront par kilo-octets.</translation>
+        <source>Offline</source>
+        <translation>Hors ligne</translation>
     </message>
     <message>
-        <source>Hide</source>
-        <translation>Cacher</translation>
+        <source>Unconfirmed</source>
+        <translation>Non confirmée</translation>
     </message>
     <message>
-        <source>total at least</source>
-        <translation>total au moins</translation>
+        <source>Abandoned</source>
+        <translation>Abandonnée</translation>
     </message>
     <message>
-        <source>Paying only the minimum fee is just fine as long as there is less transaction volume than space in the blocks. But be aware that this can end up in a never confirming transaction once there is more demand for bitcoin transactions than the network can process.</source>
-        <translation>Il est correct de payer les frais minimum tant que le volume transactionnel est inférieur à l'espace dans les blocs. Mais soyez conscient que ceci pourrait résulter en une transaction n'étant jamais confirmée une fois qu'il y aura plus de transactions que le réseau ne pourra en traiter.</translation>
+        <source>Confirming (%1 of %2 recommended confirmations)</source>
+        <translation>Confirmation (%1 sur %2 confirmations recommandées)</translation>
     </message>
     <message>
-        <source>(read the tooltip)</source>
-        <translation>(lire l'infobulle)</translation>
+        <source>Confirmed (%1 confirmations)</source>
+        <translation>Confirmée (%1 confirmations)</translation>
     </message>
     <message>
-        <source>Recommended:</source>
-        <translation>Recommandés :</translation>
+        <source>Conflicted</source>
+        <translation>En conflit</translation>
     </message>
     <message>
-        <source>Custom:</source>
-        <translation>Personnalisés : </translation>
+        <source>Immature (%1 confirmations, will be available after %2)</source>
+        <translation>Immature (%1 confirmations, sera disponible après %2)</translation>
     </message>
     <message>
-        <source>(Smart fee not initialized yet. This usually takes a few blocks...)</source>
-        <translation>(Les frais intelligents ne sont pas encore initialisés. Ceci prend habituellement quelques blocs...)</translation>
+        <source>This block was not received by any other nodes and will probably not be accepted!</source>
+        <translation>Ce bloc n’a été reçu par aucun autre nœud et ne sera probablement pas accepté !</translation>
     </message>
     <message>
-        <source>Confirmation time:</source>
-        <translation>Temps de confirmation :</translation>
+        <source>Generated but not accepted</source>
+        <translation>Générée mais refusée</translation>
     </message>
     <message>
-        <source>normal</source>
-        <translation>normal</translation>
+        <source>Received with</source>
+        <translation>Reçue avec</translation>
     </message>
     <message>
-        <source>fast</source>
-        <translation>rapide</translation>
+        <source>Received from</source>
+        <translation>Reçue de</translation>
     </message>
     <message>
-        <source>Send to multiple recipients at once</source>
-        <translation>Envoyer à plusieurs destinataires à la fois</translation>
+        <source>Sent to</source>
+        <translation>Envoyée à</translation>
     </message>
     <message>
-        <source>Add &amp;Recipient</source>
-        <translation>Ajouter un &amp;destinataire</translation>
+        <source>Payment to yourself</source>
+        <translation>Paiement à vous-même</translation>
     </message>
     <message>
-        <source>Clear all fields of the form.</source>
-        <translation>Effacer tous les champs du formulaire.</translation>
+        <source>Mined</source>
+        <translation>Miné</translation>
     </message>
     <message>
-        <source>Dust:</source>
-        <translation>Poussière :</translation>
+        <source>watch-only</source>
+        <translation>juste-regarder</translation>
     </message>
     <message>
-        <source>Clear &amp;All</source>
-        <translation>&amp;Tout nettoyer</translation>
+        <source>(n/a)</source>
+        <translation>(n.d)</translation>
     </message>
     <message>
-        <source>Balance:</source>
-        <translation>Solde :</translation>
+        <source>(no label)</source>
+        <translation>(aucune étiquette)</translation>
     </message>
     <message>
-        <source>Confirm the send action</source>
-        <translation>Confirmer l’action d'envoi</translation>
+        <source>Transaction status. Hover over this field to show number of confirmations.</source>
+        <translation>État de la transaction. Survoler ce champ avec la souris pour afficher le nombre de confirmations.</translation>
     </message>
     <message>
-        <source>S&amp;end</source>
-        <translation>E&amp;nvoyer</translation>
+        <source>Date and time that the transaction was received.</source>
+        <translation>Date et heure de réception de la transaction.</translation>
     </message>
-</context>
-<context>
-    <name>SendCoinsEntry</name>
     <message>
-        <source>A&amp;mount:</source>
-        <translation>&amp;Montant :</translation>
+        <source>Type of transaction.</source>
+        <translation>Type de transaction.</translation>
     </message>
     <message>
-        <source>Pay &amp;To:</source>
-        <translation>&amp;Payer à :</translation>
+        <source>Whether or not a watch-only address is involved in this transaction.</source>
+        <translation>Une adresse juste-regarder est-elle ou non impliquée dans cette transaction.</translation>
     </message>
     <message>
-        <source>&amp;Label:</source>
-        <translation>É&amp;tiquette :</translation>
+        <source>User-defined intent/purpose of the transaction.</source>
+        <translation>Intention/but de la transaction défini par l'utilisateur.</translation>
     </message>
     <message>
-        <source>Choose previously used address</source>
-        <translation>Choisir une adresse déjà utilisée</translation>
+        <source>Amount removed from or added to balance.</source>
+        <translation>Le montant a été ajouté ou soustrait du solde.</translation>
     </message>
+</context>
+<context>
+    <name>TransactionView</name>
     <message>
-        <source>This is a normal payment.</source>
-        <translation>Ceci est un paiement normal.</translation>
+        <source>All</source>
+        <translation>Toutes</translation>
     </message>
     <message>
-        <source>The Bitcoin address to send the payment to</source>
-        <translation>L'adresse Bitcoin à laquelle envoyer le paiement</translation>
+        <source>Today</source>
+        <translation>Aujourd’hui</translation>
     </message>
     <message>
-        <source>Alt+A</source>
-        <translation>Alt+A</translation>
+        <source>This week</source>
+        <translation>Cette semaine</translation>
     </message>
     <message>
-        <source>Paste address from clipboard</source>
-        <translation>Coller l'adresse depuis le presse-papiers</translation>
+        <source>This month</source>
+        <translation>Ce mois</translation>
     </message>
     <message>
-        <source>Alt+P</source>
-        <translation>Alt+P</translation>
+        <source>Last month</source>
+        <translation>Le mois dernier</translation>
     </message>
     <message>
-        <source>Remove this entry</source>
-        <translation>Enlever cette entrée</translation>
+        <source>This year</source>
+        <translation>Cette année</translation>
     </message>
     <message>
-        <source>The fee will be deducted from the amount being sent. The recipient will receive less bitcoins than you enter in the amount field. If multiple recipients are selected, the fee is split equally.</source>
-        <translation>Les frais seront déduits du montant envoyé. Le destinataire recevra moins de bitcoins que le montant saisi dans le champ de montant. Si plusieurs destinataires sont sélectionnés, les frais seront partagés également..</translation>
+        <source>Range...</source>
+        <translation>Plage…</translation>
     </message>
     <message>
-        <source>S&amp;ubtract fee from amount</source>
-        <translation>S&amp;oustraire les frais du montant</translation>
+        <source>Received with</source>
+        <translation>Reçue avec</translation>
     </message>
     <message>
-        <source>Message:</source>
-        <translation>Message :</translation>
+        <source>Sent to</source>
+        <translation>Envoyée à</translation>
     </message>
     <message>
-        <source>This is an unauthenticated payment request.</source>
-        <translation>Cette demande de paiement n'est pas authentifiée.</translation>
+        <source>To yourself</source>
+        <translation>À vous-même</translation>
     </message>
     <message>
-        <source>This is an authenticated payment request.</source>
-        <translation>Cette demande de paiement est authentifiée.</translation>
+        <source>Mined</source>
+        <translation>Miné </translation>
     </message>
     <message>
-        <source>Enter a label for this address to add it to the list of used addresses</source>
-        <translation>Saisir une étiquette pour cette adresse afin de l'ajouter à la liste d'adresses utilisées</translation>
+        <source>Other</source>
+        <translation>Autres </translation>
     </message>
     <message>
-        <source>A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
-        <translation>Un message qui était joint à l'URI Bitcoin et qui sera stocké avec la transaction pour référence. Note : ce message ne sera pas envoyé par le réseau Bitcoin.</translation>
+        <source>Enter address or label to search</source>
+        <translation>Saisir une adresse ou une étiquette à rechercher</translation>
     </message>
     <message>
-        <source>Pay To:</source>
-        <translation>Payer à :</translation>
+        <source>Min amount</source>
+        <translation>Montant min.</translation>
     </message>
     <message>
-        <source>Memo:</source>
-        <translation>Mémo :</translation>
+        <source>Abandon transaction</source>
+        <translation>Abandonner la transaction</translation>
     </message>
-</context>
-<context>
-    <name>ShutdownWindow</name>
     <message>
-        <source>%1 is shutting down...</source>
-        <translation>Arrêt de %1...</translation>
+        <source>Copy address</source>
+        <translation>Copier l’adresse</translation>
     </message>
     <message>
-        <source>Do not shut down the computer until this window disappears.</source>
-        <translation>Ne pas fermer l'ordinateur jusqu'à la disparition de cette fenêtre.</translation>
+        <source>Copy label</source>
+        <translation>Copier l’étiquette </translation>
     </message>
-</context>
-<context>
-    <name>SignVerifyMessageDialog</name>
     <message>
-        <source>Signatures - Sign / Verify a Message</source>
-        <translation>Signatures - Signer / Vérifier un message</translation>
+        <source>Copy amount</source>
+        <translation>Copier le montant </translation>
     </message>
     <message>
-        <source>&amp;Sign Message</source>
-        <translation>&amp;Signer un message</translation>
+        <source>Copy transaction ID</source>
+        <translation>Copier l'ID de la transaction</translation>
     </message>
     <message>
-        <source>You can sign messages/agreements with your addresses to prove you can receive bitcoins sent to them. Be careful not to sign anything vague or random, as phishing attacks may try to trick you into signing your identity over to them. Only sign fully-detailed statements you agree to.</source>
-        <translation>Vous pouvez signer des messages/accords avec vos adresses pour prouver que vous pouvez recevoir des bitcoins à ces dernières. Faites attention de ne rien signer de vague ou au hasard, car des attaques d'hameçonnage pourraient essayer de vous faire signer avec votre identité afin de l'usurper. Ne signez que des déclarations entièrement détaillées et avec lesquelles vous êtes d'accord.</translation>
+        <source>Copy raw transaction</source>
+        <translation>Copier la transaction brute</translation>
     </message>
     <message>
-        <source>The Bitcoin address to sign the message with</source>
-        <translation>L'adresse Bitcoin avec laquelle signer le message</translation>
+        <source>Copy full transaction details</source>
+        <translation>Copier tous les détails de la transaction</translation>
     </message>
     <message>
-        <source>Choose previously used address</source>
-        <translation>Choisir une adresse précédemment utilisée</translation>
+        <source>Edit label</source>
+        <translation>Modifier l’étiquette </translation>
     </message>
     <message>
-        <source>Alt+A</source>
-        <translation>Alt+A</translation>
+        <source>Show transaction details</source>
+        <translation>Afficher les détails de la transaction</translation>
     </message>
     <message>
-        <source>Paste address from clipboard</source>
-        <translation>Coller une adresse depuis le presse-papiers</translation>
+        <source>Export Transaction History</source>
+        <translation>Exporter l'historique transactionnel</translation>
     </message>
     <message>
-        <source>Alt+P</source>
-        <translation>Alt+P</translation>
+        <source>Comma separated file (*.csv)</source>
+        <translation>Valeurs séparées par des virgules (*.csv)</translation>
     </message>
     <message>
-        <source>Enter the message you want to sign here</source>
-        <translation>Saisir ici le message que vous désirez signer</translation>
+        <source>Confirmed</source>
+        <translation>Confirmée</translation>
     </message>
     <message>
-        <source>Signature</source>
-        <translation>Signature</translation>
+        <source>Watch-only</source>
+        <translation>Juste-regarder</translation>
     </message>
     <message>
-        <source>Copy the current signature to the system clipboard</source>
-        <translation>Copier la signature actuelle dans le presse-papiers</translation>
+        <source>Date</source>
+        <translation>Date </translation>
     </message>
     <message>
-        <source>Sign the message to prove you own this Bitcoin address</source>
-        <translation>Signer le message pour prouver que vous détenez cette adresse Bitcoin</translation>
+        <source>Type</source>
+        <translation>Type </translation>
     </message>
     <message>
-        <source>Sign &amp;Message</source>
-        <translation>Signer le &amp;message</translation>
+        <source>Label</source>
+        <translation>Étiquette</translation>
     </message>
     <message>
-        <source>Reset all sign message fields</source>
-        <translation>Réinitialiser tous les champs de signature de message</translation>
+        <source>Address</source>
+        <translation>Adresse</translation>
     </message>
     <message>
-        <source>Clear &amp;All</source>
-        <translation>&amp;Tout nettoyer</translation>
+        <source>ID</source>
+        <translation>ID </translation>
     </message>
     <message>
-        <source>&amp;Verify Message</source>
-        <translation>&amp;Vérifier un message</translation>
+        <source>Exporting Failed</source>
+        <translation>Échec d'exportation</translation>
     </message>
     <message>
-        <source>Enter the receiver's address, message (ensure you copy line breaks, spaces, tabs, etc. exactly) and signature below to verify the message. Be careful not to read more into the signature than what is in the signed message itself, to avoid being tricked by a man-in-the-middle attack. Note that this only proves the signing party receives with the address, it cannot prove sendership of any transaction!</source>
-        <translation>Saisissez ci-dessous l'adresse de destinataire, le message (assurez-vous de copier exactement les retours à la ligne, les espaces, les tabulations, etc.) et la signature pour vérifier le message. Faites attention à ne pas déduire davantage de la signature que ce qui est contenu dans le message signé même, pour éviter d'être trompé par une attaque d'homme du milieu. Notez que ceci ne fait que prouver que le signataire reçoit l'adresse et ne peut pas prouver la provenance d'une transaction.</translation>
+        <source>There was an error trying to save the transaction history to %1.</source>
+        <translation>Une erreur est survenue lors de l'enregistrement de l'historique transactionnel vers %1.</translation>
     </message>
     <message>
-        <source>The Bitcoin address the message was signed with</source>
-        <translation>L'adresse Bitcoin avec laquelle le message a été signé</translation>
+        <source>Exporting Successful</source>
+        <translation>L'exportation est réussie</translation>
     </message>
     <message>
-        <source>Verify the message to ensure it was signed with the specified Bitcoin address</source>
-        <translation>Vérifier le message pour vous assurer qu'il a bien été signé par l'adresse Bitcoin spécifiée</translation>
+        <source>The transaction history was successfully saved to %1.</source>
+        <translation>L'historique transactionnel a été enregistré avec succès vers %1.</translation>
     </message>
     <message>
-        <source>Verify &amp;Message</source>
-        <translation>Vérifier le &amp;message</translation>
+        <source>Range:</source>
+        <translation>Plage :</translation>
     </message>
     <message>
-        <source>Reset all verify message fields</source>
-        <translation>Réinitialiser tous les champs de vérification de message</translation>
+        <source>to</source>
+        <translation>à </translation>
     </message>
 </context>
 <context>
-    <name>SplashScreen</name>
+    <name>UnitDisplayStatusBarControl</name>
     <message>
-        <source>[testnet]</source>
-        <translation>[testnet]</translation>
+        <source>Unit to show amounts in. Click to select another unit.</source>
+        <translation>Unité d'affichage des montants. Cliquer pour choisir une autre unité.</translation>
     </message>
 </context>
 <context>
-    <name>TrafficGraphWidget</name>
+    <name>WalletFrame</name>
     <message>
-        <source>KB/s</source>
-        <translation>Ko/s</translation>
+        <source>No wallet has been loaded.</source>
+        <translation>Aucun porte-monnaie n'a été chargé.</translation>
     </message>
 </context>
 <context>
-    <name>TransactionDescDialog</name>
+    <name>WalletModel</name>
     <message>
-        <source>This pane shows a detailed description of the transaction</source>
-        <translation>Ce panneau affiche une description détaillée de la transaction</translation>
+        <source>Send Coins</source>
+        <translation>Envoyer des pièces</translation>
     </message>
 </context>
 <context>
-    <name>UnitDisplayStatusBarControl</name>
+    <name>WalletView</name>
     <message>
-        <source>Unit to show amounts in. Click to select another unit.</source>
-        <translation>Unité d'affichage des montants. Cliquer pour choisir une autre unité.</translation>
+        <source>&amp;Export</source>
+        <translation>&amp;Exporter</translation>
+    </message>
+    <message>
+        <source>Export the data in the current tab to a file</source>
+        <translation>Exporter les données de l'onglet actuel vers un fichier</translation>
+    </message>
+    <message>
+        <source>Backup Wallet</source>
+        <translation>Sauvegarder le porte-monnaie</translation>
+    </message>
+    <message>
+        <source>Wallet Data (*.dat)</source>
+        <translation>Données du porte-monnaie (*.dat)</translation>
+    </message>
+    <message>
+        <source>Backup Failed</source>
+        <translation>Échec de la sauvegarde</translation>
+    </message>
+    <message>
+        <source>There was an error trying to save the wallet data to %1.</source>
+        <translation>Une erreur est survenue lors de l'enregistrement des données du porte-monnaie vers %1.</translation>
+    </message>
+    <message>
+        <source>Backup Successful</source>
+        <translation>La sauvegarde est réussie</translation>
+    </message>
+    <message>
+        <source>The wallet data was successfully saved to %1.</source>
+        <translation>Les données du porte-monnaie ont été enregistrées avec succès vers %1</translation>
     </message>
 </context>
 <context>
@@ -1748,7 +2995,19 @@
     </message>
     <message>
         <source>Accept command line and JSON-RPC commands</source>
-        <translation>Accepter les commandes de JSON-RPC et de la ligne de commande</translation>
+        <translation>Accepter les commandes JSON-RPC et en ligne de commande</translation>
+    </message>
+    <message>
+        <source>Accept connections from outside (default: 1 if no -proxy or -connect/-noconnect)</source>
+        <translation>Accepter des connexions de l'extérieur (par défaut : 1 si aucun -proxy ou -connect/-noconnect)</translation>
+    </message>
+    <message>
+        <source>Connect only to the specified node(s); -noconnect or -connect=0 alone to disable automatic connections</source>
+        <translation>Se connecter seulement aux nœuds précisés ; -noconnect ou -connect=0 seul pour désactiver les connexions automatiques</translation>
+    </message>
+    <message>
+        <source>Distributed under the MIT software license, see the accompanying file %s or %s</source>
+        <translation>Distribué sous la licence MIT d'utilisation d'un logiciel. Consulter le fichier joint %s ou %s</translation>
     </message>
     <message>
         <source>If &lt;category&gt; is not supplied or if &lt;category&gt; = 1, output all debugging information.</source>
@@ -1790,17 +3049,13 @@
         <source>Unable to start HTTP server. See debug log for details.</source>
         <translation>Impossible de démarrer le serveur HTTP. Voir le journal de débogage pour plus de détails.</translation>
     </message>
-    <message>
-        <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
-        <translation>Accepter les connexions entrantes (par défaut : 1 si aucun -proxy ou -connect )</translation>
-    </message>
     <message>
         <source>Bitcoin Core</source>
         <translation>Bitcoin Core</translation>
     </message>
     <message>
-        <source>-fallbackfee is set very high! This is the transaction fee you may pay when fee estimates are not available.</source>
-        <translation>La valeur -fallbackfee est très élevée ! Elle représente les frais de transaction que vous pourriez acquitter si aucune estimation de frais n'est proposée.</translation>
+        <source>The %s developers</source>
+        <translation>Les développeurs de %s</translation>
     </message>
     <message>
         <source>A fee rate (in %s/kB) that will be used when fee estimation has insufficient data (default: %s)</source>
@@ -1812,20 +3067,24 @@
     </message>
     <message>
         <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source>
-        <translation>Se lier à l'adresse donnée et toujours l'écouter. Utilisez la notation [host]:port pour l'IPv6</translation>
+        <translation>Se lier à l'adresse donnée et toujours l'écouter. Utiliser la notation [host]:port pour l'IPv6</translation>
     </message>
     <message>
-        <source>Delete all wallet transactions and only recover those parts of the blockchain through -rescan on startup</source>
-        <translation>Supprimer toutes les transactions du porte-monnaie et ne récupérer que ces parties de la chaîne de blocs avec -rescan au démarrage</translation>
+        <source>Cannot obtain a lock on data directory %s. %s is probably already running.</source>
+        <translation>Impossible d’obtenir un verrou sur le répertoire de données %s. %s fonctionne probablement déjà.</translation>
     </message>
     <message>
-        <source>Distributed under the MIT software license, see the accompanying file COPYING or &lt;http://www.opensource.org/licenses/mit-license.php&gt;.</source>
-        <translation>Distribué sous la licence MIT d'utilisation d'un logiciel. Consultez le fichier joint COPYING ou &lt;http://www.opensource.org/licenses/mit-license.php&gt;.</translation>
+        <source>Delete all wallet transactions and only recover those parts of the blockchain through -rescan on startup</source>
+        <translation>Supprimer toutes les transactions du porte-monnaie et ne récupérer que ces parties de la chaîne de blocs avec -rescan au démarrage</translation>
     </message>
     <message>
         <source>Error loading %s: You can't enable HD on a already existing non-HD wallet</source>
         <translation>Erreur de chargement de %s : vous ne pouvez pas activer HD sur un porte-monnaie non HD existant</translation>
     </message>
+    <message>
+        <source>Error reading %s! All keys read correctly, but transaction data or address book entries might be missing or incorrect.</source>
+        <translation>Erreur de lecture de %s ! Toutes les clés ont été lues correctement, mais les données transactionnelles ou les entrées du carnet d'adresses sont peut-être manquantes ou incorrectes.</translation>
+    </message>
     <message>
         <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source>
         <translation>Exécuter la commande lorsqu'une transaction de porte-monnaie change (%s dans la commande est remplacée par TxID)</translation>
@@ -1838,13 +3097,17 @@
         <source>Maximum total fees (in %s) to use in a single wallet transaction or raw transaction; setting this too low may abort large transactions (default: %s)</source>
         <translation>Frais totaux maximaux (en %s) à utiliser en une seule transaction de porte-monnaie ou transaction brute ; les définir trop bas pourrait interrompre les grosses transactions (par défaut : %s)</translation>
     </message>
+    <message>
+        <source>Please check that your computer's date and time are correct! If your clock is wrong, %s will not work properly.</source>
+        <translation>Veuillez vérifier que l'heure et la date de votre ordinateur sont justes ! Si votre horloge n'est pas à l'heure, %s ne fonctionnera pas correctement.</translation>
+    </message>
     <message>
         <source>Please contribute if you find %s useful. Visit %s for further information about the software.</source>
         <translation>Si vous trouvez %s utile, vous pouvez y contribuer. Vous trouverez davantage d'informations à propos du logiciel sur %s.</translation>
     </message>
     <message>
         <source>Set the number of script verification threads (%u to %d, 0 = auto, &lt;0 = leave that many cores free, default: %d)</source>
-        <translation>Définir le nombre d'exétrons de vérification des scripts (%u à %d, 0 = auto, &lt; 0 = laisser ce nombre de cœurs inutilisés, par défaut : %d)</translation>
+        <translation>Définir le nombre de fils de vérification des scripts (%u à %d, 0 = auto, &lt; 0 = laisser ce nombre de cœurs inutilisés, par défaut : %d)</translation>
     </message>
     <message>
         <source>The block database contains a block which appears to be from the future. This may be due to your computer's date and time being set incorrectly. Only rebuild the block database if you are sure that your computer's date and time are correct</source>
@@ -1852,7 +3115,7 @@
     </message>
     <message>
         <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
-        <translation>Ceci est une pré-version de test - l'utiliser à vos risques et périls - ne pas l'utiliser pour miner ou pour des applications marchandes</translation>
+        <translation>Ceci est une préversion de test - son utilisation est entièrement à vos risques - ne pas l'utiliser pour miner ou pour des applications marchandes</translation>
     </message>
     <message>
         <source>Unable to rewind the database to a pre-fork state. You will need to redownload the blockchain</source>
@@ -1860,19 +3123,19 @@
     </message>
     <message>
         <source>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</source>
-        <translation>Utiliser l'UPnP pour mapper le port d'écoute (par défaut : 1 lors de l'écoute et pas de mandataire -proxy)</translation>
+        <translation>Utiliser l'UPnP pour mapper le port d'écoute (par défaut : 1 en écoute et sans -proxy)</translation>
     </message>
     <message>
-        <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source>
-        <translation>Avertissement : le réseau ne semble pas totalement d'accord ! Quelques mineurs semblent éprouver des difficultés.</translation>
+        <source>Wallet will not create transactions that violate mempool chain limits (default: %u)</source>
+        <translation>Un porte-monnaie ne créera aucune transaction qui enfreint les limites de chaîne de la réserve de mémoire (par défaut : %u)</translation>
     </message>
     <message>
-        <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source>
-        <translation>Avertissement : nous ne semblons pas être en accord complet avec nos pairs ! Vous pourriez avoir besoin d'effectuer une mise à niveau, ou d'autres nœuds du réseau pourraient avoir besoin d'effectuer une mise à niveau.</translation>
+        <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source>
+        <translation>Avertissement : le réseau ne semble pas totalement d'accord ! Certains mineurs semblent éprouver des problèmes.</translation>
     </message>
     <message>
-        <source>Whitelist peers connecting from the given netmask or IP address. Can be specified multiple times.</source>
-        <translation>Pairs de la liste blanche se connectant à partir du masque réseau ou de l'IP donné. Peut être spécifié plusieurs fois.</translation>
+        <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source>
+        <translation>Avertissement : nous ne semblons pas être en accord complet avec nos pairs ! Une mise à niveau pourrait être nécessaire pour vous ou pour d'autres nœuds du réseau.</translation>
     </message>
     <message>
         <source>You need to rebuild the database using -reindex-chainstate to change -txindex</source>
@@ -1896,23 +3159,23 @@
     </message>
     <message>
         <source>Attempt to recover private keys from a corrupt wallet on startup</source>
-        <translation>Tenter de récupérer les clefs privées d'un porte-monnaie corrompu lors du démarrage</translation>
+        <translation>Tenter de récupérer les clés privées d'un porte-monnaie corrompu lors du démarrage</translation>
     </message>
     <message>
         <source>Block creation options:</source>
-        <translation>Options de création de bloc :</translation>
+        <translation>Options de création de blocs :</translation>
     </message>
     <message>
         <source>Cannot resolve -%s address: '%s'</source>
         <translation>Impossible de résoudre l'adresse -%s : « %s »</translation>
     </message>
     <message>
-        <source>Change index out of range</source>
-        <translation>L'index de changement est hors échelle</translation>
+        <source>Chain selection options:</source>
+        <translation>Options de sélection de la chaîne :</translation>
     </message>
     <message>
-        <source>Connect only to the specified node(s)</source>
-        <translation>Ne se connecter qu'au(x) nœud(s) spécifié(s)</translation>
+        <source>Change index out of range</source>
+        <translation>L'index de changement est hors échelle</translation>
     </message>
     <message>
         <source>Connection options:</source>
@@ -1924,7 +3187,7 @@
     </message>
     <message>
         <source>Corrupted block database detected</source>
-        <translation>Base corrompue de données des blocs détectée</translation>
+        <translation>Une base de données de blocs corrompue a été détectée</translation>
     </message>
     <message>
         <source>Debugging/Testing options:</source>
@@ -1936,7 +3199,7 @@
     </message>
     <message>
         <source>Do you want to rebuild the block database now?</source>
-        <translation>Voulez-vous reconstruire la base de données des blocs maintenant ?</translation>
+        <translation>Voulez-vous reconstruire la base de données de blocs maintenant ?</translation>
     </message>
     <message>
         <source>Enable publish hash block in &lt;address&gt;</source>
@@ -1954,25 +3217,29 @@
         <source>Enable publish raw transaction in &lt;address&gt;</source>
         <translation>Activer la publication de la transaction brute dans &lt;address&gt;</translation>
     </message>
+    <message>
+        <source>Enable transaction replacement in the memory pool (default: %u)</source>
+        <translation>Activer le remplacement de transactions dans la réserve de mémoire (par défaut : %u)</translation>
+    </message>
     <message>
         <source>Error initializing block database</source>
-        <translation>Erreur lors de l'initialisation de la base de données des blocs</translation>
+        <translation>Erreur d'initialisation de la base de données de blocs</translation>
     </message>
     <message>
         <source>Error initializing wallet database environment %s!</source>
-        <translation>Erreur lors de l'initialisation de l'environnement de la base de données du porte-monnaie %s !</translation>
+        <translation>Erreur d'initialisation de l'environnement de la base de données du porte-monnaie %s !</translation>
     </message>
     <message>
         <source>Error loading %s</source>
-        <translation>Erreur lors du chargement de %s</translation>
+        <translation>Erreur de chargement de %s</translation>
     </message>
     <message>
         <source>Error loading %s: Wallet corrupted</source>
-        <translation>Erreur lors du chargement de %s : porte-monnaie corrompu</translation>
+        <translation>Erreur de chargement de %s : porte-monnaie corrompu</translation>
     </message>
     <message>
         <source>Error loading %s: Wallet requires newer version of %s</source>
-        <translation>Erreur lors du chargement de %s : le porte-monnaie exige une version plus récente de %s</translation>
+        <translation>Erreur de chargement de %s : le porte-monnaie exige une version plus récente de %s</translation>
     </message>
     <message>
         <source>Error loading %s: You can't disable HD on a already existing HD wallet</source>
@@ -1980,11 +3247,11 @@
     </message>
     <message>
         <source>Error loading block database</source>
-        <translation>Erreur du chargement de la base de données des blocs</translation>
+        <translation>Erreur de chargement de la base de données de blocs</translation>
     </message>
     <message>
         <source>Error opening block database</source>
-        <translation>Erreur lors de l'ouverture de la base de données des blocs</translation>
+        <translation>Erreur d'ouverture de la base de données de blocs</translation>
     </message>
     <message>
         <source>Error: Disk space is low!</source>
@@ -1992,7 +3259,7 @@
     </message>
     <message>
         <source>Failed to listen on any port. Use -listen=0 if you want this.</source>
-        <translation>Échec de l'écoute sur un port quelconque. Utilisez -listen=0 si vous voulez ceci.</translation>
+        <translation>Échec d'écoute sur un port quelconque. Utiliser -listen=0 si vous le voulez.</translation>
     </message>
     <message>
         <source>Importing...</source>
@@ -2000,7 +3267,11 @@
     </message>
     <message>
         <source>Incorrect or no genesis block found. Wrong datadir for network?</source>
-        <translation>Bloc de genèse incorrect ou introuvable. Mauvais répertoire de données pour le réseau ?</translation>
+        <translation>Bloc de genèse incorrect ou introuvable. Mauvais datadir pour le réseau ?</translation>
+    </message>
+    <message>
+        <source>Initialization sanity check failed. %s is shutting down.</source>
+        <translation>L'initialisation du test de cohérence a échoué. %s est en cours de fermeture. </translation>
     </message>
     <message>
         <source>Invalid -onion address: '%s'</source>
@@ -2026,10 +3297,6 @@
         <source>Location of the auth cookie (default: data dir)</source>
         <translation>Emplacement du fichier témoin auth (par défaut : data dir)</translation>
     </message>
-    <message>
-        <source>Minimum bytes per sigop in transactions we relay and mine (default: %u)</source>
-        <translation>Octets minimaux par sigop dans les transactions que nous relayons et minons (par défaut : %u)</translation>
-    </message>
     <message>
         <source>Not enough file descriptors available.</source>
         <translation>Pas assez de descripteurs de fichiers proposés.</translation>
@@ -2068,11 +3335,7 @@
     </message>
     <message>
         <source>Set database cache size in megabytes (%d to %d, default: %d)</source>
-        <translation>Définir la taille du cache de la base de données en mégaoctets (%d to %d, default: %d)</translation>
-    </message>
-    <message>
-        <source>Set maximum block cost (default: %d)</source>
-        <translation>Définir le coût maximal de bloc (par défaut : %d)</translation>
+        <translation>Définir la taille du cache de la base de données en mégaoctets (%d à %d, default: %d)</translation>
     </message>
     <message>
         <source>Set maximum block size in bytes (default: %d)</source>
@@ -2086,6 +3349,10 @@
         <source>The source code is available from %s.</source>
         <translation>Le code source est disponible sur %s.</translation>
     </message>
+    <message>
+        <source>Unable to bind to %s on this computer. %s is probably already running.</source>
+        <translation>Impossible de se lier à %s sur cet ordinateur. %s fonctionne probablement déjà.</translation>
+    </message>
     <message>
         <source>Unsupported argument -benchmark ignored, use -debug=bench.</source>
         <translation>Argument non pris en charge -benchmark ignoré, utiliser -debug=bench.</translation>
@@ -2102,17 +3369,21 @@
         <source>Use UPnP to map the listening port (default: %u)</source>
         <translation>Utiliser l'UPnP pour mapper le port d'écoute (par défaut : %u)</translation>
     </message>
+    <message>
+        <source>Use the test chain</source>
+        <translation>Utiliser la chaîne de test</translation>
+    </message>
     <message>
         <source>User Agent comment (%s) contains unsafe characters.</source>
         <translation>Le commentaire d'agent utilisateur (%s) contient des caractères dangereux.</translation>
     </message>
     <message>
         <source>Verifying blocks...</source>
-        <translation>Vérification des blocs en cours...</translation>
+        <translation>Vérification des blocs... </translation>
     </message>
     <message>
         <source>Verifying wallet...</source>
-        <translation>Vérification du porte-monnaie en cours...</translation>
+        <translation>Vérification du porte-monnaie...</translation>
     </message>
     <message>
         <source>Wallet %s resides outside data directory %s</source>
@@ -2122,6 +3393,10 @@
         <source>Wallet debugging/testing options:</source>
         <translation>Options de débogage/de test du porte-monnaie :</translation>
     </message>
+    <message>
+        <source>Wallet needed to be rewritten: restart %s to complete</source>
+        <translation>Le porte-monnaie devait être réécrit : redémarrer %s pour terminer l'opération.</translation>
+    </message>
     <message>
         <source>Wallet options:</source>
         <translation>Options du porte-monnaie :</translation>
@@ -2152,7 +3427,7 @@
     </message>
     <message>
         <source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source>
-        <translation>Exécuter une commande lorsqu'une alerte pertinente est reçue ou si nous voyons une bifurcation vraiment étendue (%s dans la commande est remplacé par le message)</translation>
+        <translation>Exécuter une commande lorsqu'une alerte pertinente est reçue, ou si nous voyons une bifurcation vraiment étendue (%s dans la commande est remplacé par le message)</translation>
     </message>
     <message>
         <source>Fees (in %s/kB) smaller than this are considered zero fee for relaying, mining and transaction creation (default: %s)</source>
@@ -2170,29 +3445,21 @@
         <source>Maximum size of data in data carrier transactions we relay and mine (default: %u)</source>
         <translation>Quantité maximale de données dans les transactions du porteur de données que nous relayons et minons (par défaut : %u)</translation>
     </message>
-    <message>
-        <source>Query for peer addresses via DNS lookup, if low on addresses (default: 1 unless -connect)</source>
-        <translation>Demander les adresses des pairs par recherche DNS si l'on manque d'adresses (par défaut : 1 sauf si -connect)</translation>
-    </message>
     <message>
         <source>Randomize credentials for every proxy connection. This enables Tor stream isolation (default: %u)</source>
-        <translation>Aléer les authentifiants pour chaque connexion mandataire. Ceci active l'isolement de flux de Tor (par défaut : %u) </translation>
+        <translation>Aléer les authentifiants pour chaque connexion mandataire. Cela active l'isolement de flux de Tor (par défaut : %u) </translation>
     </message>
     <message>
         <source>Set maximum size of high-priority/low-fee transactions in bytes (default: %d)</source>
-        <translation>Définir la taille maximale en octets des transactions prioritaires/à frais modiques (par défaut : %d)</translation>
+        <translation>Définir la taille maximale en octets des transactions à priorité élevée et frais modiques (par défaut : %d)</translation>
     </message>
     <message>
         <source>The transaction amount is too small to send after the fee has been deducted</source>
         <translation>Le montant de la transaction est trop bas pour être envoyé une fois que les frais ont été déduits</translation>
     </message>
-    <message>
-        <source>This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit &lt;https://www.openssl.org/&gt; and cryptographic software written by Eric Young and UPnP software written by Thomas Bernard.</source>
-        <translation>Ce produit comprend des logiciels développés par le projet OpenSSL pour être utilisés dans la boîte à outils OpenSSL &lt;https://www.openssl.org/&gt; et un logiciel cryptographique écrit par Eric Young, ainsi qu'un logiciel UPnP écrit par Thomas Bernard.</translation>
-    </message>
     <message>
         <source>Use hierarchical deterministic key generation (HD) after BIP32. Only has effect during wallet creation/first start</source>
-        <translation>Utiliser une génération de clef hiérarchique déterministe (HD) après BIP32. N'a d'effet que lors de la création/premier lancement du porte-monnaie</translation>
+        <translation>Utiliser une génération de clé hiérarchique déterministe (HD) après BIP32. N'a d'effet que lors de la création ou du lancement intitial du porte-monnaie</translation>
     </message>
     <message>
         <source>Whitelisted peers cannot be DoS banned and their transactions are always relayed, even if they are already in the mempool, useful e.g. for a gateway</source>
@@ -2200,7 +3467,7 @@
     </message>
     <message>
         <source>You need to rebuild the database using -reindex to go back to unpruned mode.  This will redownload the entire blockchain</source>
-        <translation>Vous devez reconstruire la base de données en utilisant -reindex afin de revenir au mode sans élagage. Ceci retéléchargera complètement la chaîne de blocs.</translation>
+        <translation>Vous devez reconstruire la base de données en utilisant -reindex afin de revenir au mode sans élagage. Cela retéléchargera complètement la chaîne de blocs.</translation>
     </message>
     <message>
         <source>(default: %u)</source>
@@ -2224,7 +3491,7 @@
     </message>
     <message>
         <source>Imports blocks from external blk000??.dat file on startup</source>
-        <translation>Importe des blocs depuis un fichier blk000??.dat externe lors du démarrage</translation>
+        <translation>Importe des blocs à partir d'un fichier blk000??.dat externe lors du démarrage</translation>
     </message>
     <message>
         <source>Information</source>
@@ -2264,7 +3531,7 @@
     </message>
     <message>
         <source>Send trace/debug info to console instead of debug.log file</source>
-        <translation>Envoyer les informations de débogage/trace à la console au lieu du fichier debug.log</translation>
+        <translation>Envoyer les infos de débogage/trace à la console au lieu du fichier debug.log</translation>
     </message>
     <message>
         <source>Send transactions as zero-fee transactions if possible (default: %u)</source>
@@ -2276,11 +3543,11 @@
     </message>
     <message>
         <source>Shrink debug.log file on client startup (default: 1 when no -debug)</source>
-        <translation>Réduire le fichier debug.log lors du démarrage du client (par défaut : 1 lorsque -debug n'est pas présent)</translation>
+        <translation>Réduire le fichier debug.log lors du démarrage du client (par défaut : 1 sans -debug)</translation>
     </message>
     <message>
         <source>Signing transaction failed</source>
-        <translation>La signature de la transaction a échoué</translation>
+        <translation>Échec de signature de la transaction</translation>
     </message>
     <message>
         <source>The transaction amount is too small to pay the fee</source>
@@ -2300,11 +3567,7 @@
     </message>
     <message>
         <source>Transaction amount too small</source>
-        <translation>Montant de la transaction trop bas</translation>
-    </message>
-    <message>
-        <source>Transaction amounts must be positive</source>
-        <translation>Les montants de transaction doivent être positifs</translation>
+        <translation>Le montant de la transaction est trop bas</translation>
     </message>
     <message>
         <source>Transaction too large for fee policy</source>
@@ -2312,7 +3575,7 @@
     </message>
     <message>
         <source>Transaction too large</source>
-        <translation>Transaction trop volumineuse</translation>
+        <translation>La transaction est trop grosse</translation>
     </message>
     <message>
         <source>Unable to bind to %s on this computer (bind returned error %s)</source>
@@ -2364,24 +3627,28 @@
     </message>
     <message>
         <source>(1 = keep tx meta data e.g. account owner and payment request information, 2 = drop tx meta data)</source>
-        <translation>(1 = conserver les métadonnées de transmission, par ex. les informations du propriétaire du compte et de la demande de paiement, 2 = abandonner les métadonnées de transmission)</translation>
+        <translation>(1 = conserver les métadonnées de transmission, p. ex. les informations du propriétaire du compte et de demande de paiement, 2 = abandonner les métadonnées de transmission)</translation>
     </message>
     <message>
         <source>-maxtxfee is set very high! Fees this large could be paid on a single transaction.</source>
-        <translation>-maxtxfee est défini très haut ! Des frais aussi élevés pourraient être payés en une seule transaction.</translation>
-    </message>
-    <message>
-        <source>-paytxfee is set very high! This is the transaction fee you will pay if you send a transaction.</source>
-        <translation>-paytxfee est réglé sur un montant très élevé ! Il s'agit des frais de transaction que vous payerez si vous envoyez une transaction.</translation>
+        <translation>La valeur -maxtxfee est très élevée ! Des frais aussi élevés pourraient être payés en une seule transaction.</translation>
     </message>
     <message>
         <source>Do not keep transactions in the mempool longer than &lt;n&gt; hours (default: %u)</source>
         <translation>Ne pas conserver de transactions dans la réserve de mémoire plus de &lt;n&gt; heures (par défaut : %u)</translation>
     </message>
+    <message>
+        <source>Equivalent bytes per sigop in transactions for relay and mining (default: %u)</source>
+        <translation>Octets équivalents par sigop dans les transactions pour relayer et miner (par défaut : %u)</translation>
+    </message>
     <message>
         <source>Fees (in %s/kB) smaller than this are considered zero fee for transaction creation (default: %s)</source>
         <translation>Les frais (en %s/Ko) inférieurs à ce seuil sont considérés comme étant nuls pour la création de transactions (par défaut : %s)</translation>
     </message>
+    <message>
+        <source>Force relay of transactions from whitelisted peers even if they violate local relay policy (default: %d)</source>
+        <translation>Forcer le relais de transactions des pairs de la liste blanche même s'ils transgressent la politique locale de relais (par défaut : %d)</translation>
+    </message>
     <message>
         <source>How thorough the block verification of -checkblocks is (0-4, default: %u)</source>
         <translation>Degré de profondeur de la vérification des blocs -checkblocks (0-4, par défaut : %u)</translation>
@@ -2396,12 +3663,28 @@
     </message>
     <message>
         <source>Output debugging information (default: %u, supplying &lt;category&gt; is optional)</source>
-        <translation>Extraire les informations de débogage (par défaut : %u, fournir &lt;category&gt; est optionnel)</translation>
+        <translation>Extraire les informations de débogage (par défaut : %u, fournir &lt;category&gt; est facultatif)</translation>
+    </message>
+    <message>
+        <source>Query for peer addresses via DNS lookup, if low on addresses (default: 1 unless -connect/-noconnect)</source>
+        <translation>Requête d'adresses de paires par recherche DNS, si il y a peu d'adresses (par défaut : 1 sauf si -connect/-noconnect)</translation>
+    </message>
+    <message>
+        <source>Sets the serialization of raw transaction or block hex returned in non-verbose mode, non-segwit(0) or segwit(1) (default: %d)</source>
+        <translation>Définit la sérialisation de la transaction brute ou les données hexa de bloc retournées en mode non-verbose, non-segwit(0) ou segwit(1) (par défaut : %d)</translation>
     </message>
     <message>
         <source>Support filtering of blocks and transaction with bloom filters (default: %u)</source>
         <translation>Prendre en charge le filtrage des blocs et des transactions avec les filtres bloom (par défaut : %u)</translation>
     </message>
+    <message>
+        <source>This is the transaction fee you may pay when fee estimates are not available.</source>
+        <translation>Il s'agit des frais de transaction que vous pourriez payer si aucune estimation de frais n'est proposée.</translation>
+    </message>
+    <message>
+        <source>This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit %s and cryptographic software written by Eric Young and UPnP software written by Thomas Bernard.</source>
+        <translation>Ce produit comprend des logiciels développés par le Projet OpenSSL pour être utilisés dans la boîte à outils OpenSSL %s, et un logiciel cryptographique écrit par Eric Young, ainsi qu'un logiciel UPnP écrit par Thomas Bernard.</translation>
+    </message>
     <message>
         <source>Total length of network version string (%i) exceeds maximum length (%i). Reduce the number or size of uacomments.</source>
         <translation>La taille totale de la chaîne de version de réseau (%i) dépasse la longueur maximale (%i). Réduire le nombre ou la taille des commentaires uacomments.</translation>
@@ -2434,6 +3717,14 @@
         <source>Warning: Wallet file corrupt, data salvaged! Original %s saved as %s in %s; if your balance or transactions are incorrect you should restore from a backup.</source>
         <translation>Avertissement : le fichier du porte-monnaie est corrompu, les données ont été récupérées ! Le fichier %s original a été enregistré en tant que %s dans %s ; si votre solde ou vos transactions sont incorrects, vous devriez restaurer une sauvegarde.</translation>
     </message>
+    <message>
+        <source>Whitelist peers connecting from the given IP address (e.g. 1.2.3.4) or CIDR notated network (e.g. 1.2.3.0/24). Can be specified multiple times.</source>
+        <translation>Pairs de la liste blanche se connectant à partir de l'adresse IP donnée (p. ex. 1.2.3.4) ou du réseau noté CIDR (p. ex. 1.2.3.0/24). Peut être spécifié plusieurs fois.</translation>
+    </message>
+    <message>
+        <source>%s is set very high!</source>
+        <translation>La valeur %s est très élevée !</translation>
+    </message>
     <message>
         <source>(default: %s)</source>
         <translation>(par défaut : %s)</translation>
@@ -2454,6 +3745,10 @@
         <source>Invalid -proxy address: '%s'</source>
         <translation>Adresse -proxy invalide : « %s »</translation>
     </message>
+    <message>
+        <source>Keypool ran out, please call keypoolrefill first</source>
+        <translation>La réserve de clés est épuisée, veuillez d'abord appeler « keypoolrefill »</translation>
+    </message>
     <message>
         <source>Listen for JSON-RPC connections on &lt;port&gt; (default: %u or testnet: %u)</source>
         <translation>Écouter les connexions JSON-RPC sur &lt;port&gt; (par défaut : %u ou tesnet : %u)</translation>
@@ -2490,17 +3785,21 @@
         <source>Relay non-P2SH multisig (default: %u)</source>
         <translation>Relayer les multisignatures non-P2SH (par défaut : %u)</translation>
     </message>
+    <message>
+        <source>Send transactions with full-RBF opt-in enabled (default: %u)</source>
+        <translation>Envoyer des transactions avec « RBF opt-in » complet activé (par défaut : %u)</translation>
+    </message>
     <message>
         <source>Set key pool size to &lt;n&gt; (default: %u)</source>
-        <translation>Définir la taille de la réserve de clefs à &lt;n&gt; (par défaut : %u)</translation>
+        <translation>Définir la taille de la réserve de clés à &lt;n&gt; (par défaut : %u)</translation>
     </message>
     <message>
-        <source>Set minimum block size in bytes (default: %u)</source>
-        <translation>Définir la taille de bloc minimale en octets (par défaut : %u)</translation>
+        <source>Set maximum BIP141 block weight (default: %d)</source>
+        <translation>Définir le poids maximal de bloc BIP141 (par défaut : %d)</translation>
     </message>
     <message>
         <source>Set the number of threads to service RPC calls (default: %d)</source>
-        <translation>Définir le nombre d'exétrons pour desservir les appels RPC (par défaut : %d)</translation>
+        <translation>Définir le nombre de fils pour les appels RPC (par défaut : %d)</translation>
     </message>
     <message>
         <source>Specify configuration file (default: %s)</source>
@@ -2518,13 +3817,41 @@
         <source>Spend unconfirmed change when sending transactions (default: %u)</source>
         <translation>Dépenser la monnaie non confirmée lors de l'envoi de transactions (par défaut : %u)</translation>
     </message>
+    <message>
+        <source>Starting network threads...</source>
+        <translation>Démarrage des processus réseau...</translation>
+    </message>
+    <message>
+        <source>The wallet will avoid paying less than the minimum relay fee.</source>
+        <translation>Le porte-monnaie évitera de payer moins que les frais minimaux de relais. </translation>
+    </message>
+    <message>
+        <source>This is the minimum transaction fee you pay on every transaction.</source>
+        <translation>Il s'agit des frais minimaux que vous payez pour chaque transaction. </translation>
+    </message>
+    <message>
+        <source>This is the transaction fee you will pay if you send a transaction.</source>
+        <translation>Il s'agit des frais minimaux que vous payez si vous envoyez une transaction.</translation>
+    </message>
     <message>
         <source>Threshold for disconnecting misbehaving peers (default: %u)</source>
         <translation>Seuil de déconnexion des pairs présentant un mauvais comportement (par défaut : %u)</translation>
     </message>
+    <message>
+        <source>Transaction amounts must not be negative</source>
+        <translation>Les montants transactionnels ne doivent pas être négatifs</translation>
+    </message>
+    <message>
+        <source>Transaction has too long of a mempool chain</source>
+        <translation>La chaîne de la réserve de mémoire de la transaction est trop longue</translation>
+    </message>
+    <message>
+        <source>Transaction must have at least one recipient</source>
+        <translation>La transaction doit comporter au moins un destinataire</translation>
+    </message>
     <message>
         <source>Unknown network specified in -onlynet: '%s'</source>
-        <translation>Réseau inconnu spécifié sur -onlynet : « %s »</translation>
+        <translation>Réseau inconnu spécifié dans -onlynet : « %s »</translation>
     </message>
     <message>
         <source>Insufficient funds</source>
diff --git a/src/qt/locale/bitcoin_fr_CA.ts b/src/qt/locale/bitcoin_fr_CA.ts
index fca1e62883dbd..02701cbf1ddd5 100644
--- a/src/qt/locale/bitcoin_fr_CA.ts
+++ b/src/qt/locale/bitcoin_fr_CA.ts
@@ -13,7 +13,10 @@
         <source>&amp;Delete</source>
         <translation>&amp;Supprimer</translation>
     </message>
-</context>
+    </context>
+<context>
+    <name>AddressTableModel</name>
+    </context>
 <context>
     <name>AskPassphraseDialog</name>
     <message>
@@ -28,7 +31,7 @@
         <source>Repeat new passphrase</source>
         <translation>Répéter Mot de Passe</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>BanTableModel</name>
     </context>
@@ -52,7 +55,7 @@
         <source>&amp;Address</source>
         <translation>Addresse</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>FreespaceChecker</name>
     </context>
@@ -66,6 +69,9 @@
         <translation>Bienvenue </translation>
     </message>
     </context>
+<context>
+    <name>ModalOverlay</name>
+    </context>
 <context>
     <name>OpenURIDialog</name>
     </context>
@@ -75,12 +81,21 @@
 <context>
     <name>OverviewPage</name>
     </context>
+<context>
+    <name>PaymentServer</name>
+    </context>
 <context>
     <name>PeerTableModel</name>
     </context>
 <context>
     <name>QObject</name>
     </context>
+<context>
+    <name>QObject::QObject</name>
+    </context>
+<context>
+    <name>QRImageWidget</name>
+    </context>
 <context>
     <name>RPCConsole</name>
     </context>
@@ -90,12 +105,18 @@
 <context>
     <name>ReceiveRequestDialog</name>
     </context>
+<context>
+    <name>RecentRequestsTableModel</name>
+    </context>
 <context>
     <name>SendCoinsDialog</name>
     </context>
 <context>
     <name>SendCoinsEntry</name>
     </context>
+<context>
+    <name>SendConfirmationDialog</name>
+    </context>
 <context>
     <name>ShutdownWindow</name>
     </context>
@@ -108,12 +129,30 @@
 <context>
     <name>TrafficGraphWidget</name>
     </context>
+<context>
+    <name>TransactionDesc</name>
+    </context>
 <context>
     <name>TransactionDescDialog</name>
     </context>
+<context>
+    <name>TransactionTableModel</name>
+    </context>
+<context>
+    <name>TransactionView</name>
+    </context>
 <context>
     <name>UnitDisplayStatusBarControl</name>
     </context>
+<context>
+    <name>WalletFrame</name>
+    </context>
+<context>
+    <name>WalletModel</name>
+    </context>
+<context>
+    <name>WalletView</name>
+    </context>
 <context>
     <name>bitcoin-core</name>
     </context>
diff --git a/src/qt/locale/bitcoin_fr_FR.ts b/src/qt/locale/bitcoin_fr_FR.ts
index a6f6ac4fd100a..d53baed462338 100644
--- a/src/qt/locale/bitcoin_fr_FR.ts
+++ b/src/qt/locale/bitcoin_fr_FR.ts
@@ -41,7 +41,10 @@
         <source>&amp;Delete</source>
         <translation>&amp;Supprimer</translation>
     </message>
-</context>
+    </context>
+<context>
+    <name>AddressTableModel</name>
+    </context>
 <context>
     <name>AskPassphraseDialog</name>
     <message>
@@ -60,7 +63,7 @@
         <source>Repeat new passphrase</source>
         <translation>Répétez la phrase de passe</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>BanTableModel</name>
     <message>
@@ -262,26 +265,6 @@
         <source>No block source available...</source>
         <translation>Aucun bloc source disponible</translation>
     </message>
-    <message numerus="yes">
-        <source>%n hour(s)</source>
-        <translation><numerusform>%n heure</numerusform><numerusform>%n heures</numerusform></translation>
-    </message>
-    <message numerus="yes">
-        <source>%n day(s)</source>
-        <translation><numerusform>%n jour</numerusform><numerusform>%n jours</numerusform></translation>
-    </message>
-    <message numerus="yes">
-        <source>%n week(s)</source>
-        <translation><numerusform>%n semaine</numerusform><numerusform>%n semaines</numerusform></translation>
-    </message>
-    <message>
-        <source>%1 and %2</source>
-        <translation>%1 et %2</translation>
-    </message>
-    <message numerus="yes">
-        <source>%n year(s)</source>
-        <translation><numerusform>%n an</numerusform><numerusform>%n années</numerusform></translation>
-    </message>
     <message>
         <source>%1 behind</source>
         <translation>en retard de %1</translation>
@@ -364,7 +347,7 @@
         <source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;locked&lt;/b&gt;</source>
         <translation>Le porte-monnaie est &lt;b&gt;chiffré&lt;/b&gt; et est actuellement &lt;b&gt;verrouillé&lt;/b&gt;</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>CoinControlDialog</name>
     <message>
@@ -383,10 +366,6 @@
         <source>Amount:</source>
         <translation>Montant :</translation>
     </message>
-    <message>
-        <source>Priority:</source>
-        <translation>Priorité:</translation>
-    </message>
     <message>
         <source>Fee:</source>
         <translation>Frais:</translation>
@@ -439,11 +418,7 @@
         <source>Confirmed</source>
         <translation>Confirmée</translation>
     </message>
-    <message>
-        <source>Priority</source>
-        <translation>Priorité</translation>
-    </message>
-</context>
+    </context>
 <context>
     <name>EditAddressDialog</name>
     <message>
@@ -458,7 +433,7 @@
         <source>&amp;Address</source>
         <translation>&amp;Adresse</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>FreespaceChecker</name>
     <message>
@@ -548,6 +523,17 @@
         <translation><numerusform>(%n GB nécessaire)</numerusform><numerusform>(%n GB nécessaire)</numerusform></translation>
     </message>
 </context>
+<context>
+    <name>ModalOverlay</name>
+    <message>
+        <source>Form</source>
+        <translation>Formulaire</translation>
+    </message>
+    <message>
+        <source>Hide</source>
+        <translation>Cacher</translation>
+    </message>
+    </context>
 <context>
     <name>OpenURIDialog</name>
     <message>
@@ -566,7 +552,7 @@
         <source>Select payment request file</source>
         <translation>Sélectionner un fichier de demande de paiement</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>OptionsDialog</name>
     <message>
@@ -753,6 +739,9 @@
         <translation>Transactions récentes </translation>
     </message>
     </context>
+<context>
+    <name>PaymentServer</name>
+    </context>
 <context>
     <name>PeerTableModel</name>
     <message>
@@ -763,11 +752,7 @@
         <source>Node/Service</source>
         <translation>Nœud/Service </translation>
     </message>
-    <message>
-        <source>Ping Time</source>
-        <translation>Temps du ping</translation>
-    </message>
-</context>
+    </context>
 <context>
     <name>QObject</name>
     <message>
@@ -806,7 +791,17 @@
         <source>%1 ms</source>
         <translation>%1 ms</translation>
     </message>
-</context>
+    <message>
+        <source>%1 and %2</source>
+        <translation>%1 et %2</translation>
+    </message>
+    </context>
+<context>
+    <name>QObject::QObject</name>
+    </context>
+<context>
+    <name>QRImageWidget</name>
+    </context>
 <context>
     <name>RPCConsole</name>
     <message>
@@ -1064,7 +1059,7 @@
         <source>Remove</source>
         <translation>Retirer</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>ReceiveRequestDialog</name>
     <message>
@@ -1083,7 +1078,10 @@
         <source>&amp;Save Image...</source>
         <translation>&amp;Sauvegarder image</translation>
     </message>
-</context>
+    </context>
+<context>
+    <name>RecentRequestsTableModel</name>
+    </context>
 <context>
     <name>SendCoinsDialog</name>
     <message>
@@ -1114,10 +1112,6 @@
         <source>Amount:</source>
         <translation>Montant :</translation>
     </message>
-    <message>
-        <source>Priority:</source>
-        <translation>Priorité:</translation>
-    </message>
     <message>
         <source>Fee:</source>
         <translation>Frais:</translation>
@@ -1154,10 +1148,6 @@
         <source>Recommended:</source>
         <translation>Recommandé: </translation>
     </message>
-    <message>
-        <source>Confirmation time:</source>
-        <translation>Temps de confirmation:</translation>
-    </message>
     <message>
         <source>normal</source>
         <translation>normal</translation>
@@ -1190,6 +1180,10 @@
         <source>Confirm the send action</source>
         <translation>Confirmer l'action d'envoi</translation>
     </message>
+    <message>
+        <source>S&amp;end</source>
+        <translation>E&amp;voyer</translation>
+    </message>
     </context>
 <context>
     <name>SendCoinsEntry</name>
@@ -1241,7 +1235,10 @@
         <source>Memo:</source>
         <translation>Memo:</translation>
     </message>
-</context>
+    </context>
+<context>
+    <name>SendConfirmationDialog</name>
+    </context>
 <context>
     <name>ShutdownWindow</name>
     </context>
@@ -1310,16 +1307,34 @@
         <translation>KO/s</translation>
     </message>
 </context>
+<context>
+    <name>TransactionDesc</name>
+    </context>
 <context>
     <name>TransactionDescDialog</name>
     <message>
         <source>This pane shows a detailed description of the transaction</source>
         <translation>Ce panneau affiche une description détaillée de la transaction</translation>
     </message>
-</context>
+    </context>
+<context>
+    <name>TransactionTableModel</name>
+    </context>
+<context>
+    <name>TransactionView</name>
+    </context>
 <context>
     <name>UnitDisplayStatusBarControl</name>
     </context>
+<context>
+    <name>WalletFrame</name>
+    </context>
+<context>
+    <name>WalletModel</name>
+    </context>
+<context>
+    <name>WalletView</name>
+    </context>
 <context>
     <name>bitcoin-core</name>
     <message>
@@ -1419,10 +1434,6 @@ Importation ...</translation>
         <source>Transaction amount too small</source>
         <translation>Montant de la transaction trop bas</translation>
     </message>
-    <message>
-        <source>Transaction amounts must be positive</source>
-        <translation>Les montants de la transaction doivent être positif</translation>
-    </message>
     <message>
         <source>Transaction too large for fee policy</source>
         <translation>Montant de la transaction trop élevé pour la politique de frais</translation>
diff --git a/src/qt/locale/bitcoin_gl.ts b/src/qt/locale/bitcoin_gl.ts
index 9aa7b5509646e..5d31c632ac9d2 100644
--- a/src/qt/locale/bitcoin_gl.ts
+++ b/src/qt/locale/bitcoin_gl.ts
@@ -37,7 +37,10 @@
         <source>&amp;Delete</source>
         <translation>&amp;Borrar</translation>
     </message>
-</context>
+    </context>
+<context>
+    <name>AddressTableModel</name>
+    </context>
 <context>
     <name>AskPassphraseDialog</name>
     <message>
@@ -56,7 +59,7 @@
         <source>Repeat new passphrase</source>
         <translation>Repite novo contrasinal</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>BanTableModel</name>
     </context>
@@ -274,7 +277,7 @@
         <source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;locked&lt;/b&gt;</source>
         <translation>O moedeiro está &lt;b&gt;encriptado&lt;/b&gt; e actualmente &lt;b&gt;bloqueado&lt;/b&gt;</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>CoinControlDialog</name>
     <message>
@@ -289,10 +292,6 @@
         <source>Amount:</source>
         <translation>Importe:</translation>
     </message>
-    <message>
-        <source>Priority:</source>
-        <translation>Prioridade:</translation>
-    </message>
     <message>
         <source>Fee:</source>
         <translation>Pago:</translation>
@@ -329,11 +328,7 @@
         <source>Confirmed</source>
         <translation>Confirmado</translation>
     </message>
-    <message>
-        <source>Priority</source>
-        <translation>Prioridade</translation>
-    </message>
-</context>
+    </context>
 <context>
     <name>EditAddressDialog</name>
     <message>
@@ -356,7 +351,7 @@
         <source>&amp;Address</source>
         <translation>&amp;Dirección</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>FreespaceChecker</name>
     <message>
@@ -418,6 +413,17 @@
         <translation>Erro</translation>
     </message>
     </context>
+<context>
+    <name>ModalOverlay</name>
+    <message>
+        <source>Form</source>
+        <translation>Formulario</translation>
+    </message>
+    <message>
+        <source>Last block time</source>
+        <translation>Hora do último bloque</translation>
+    </message>
+    </context>
 <context>
     <name>OpenURIDialog</name>
     <message>
@@ -436,7 +442,7 @@
         <source>Select payment request file</source>
         <translation>Seleccionar ficheiro de solicitude de pago</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>OptionsDialog</name>
     <message>
@@ -571,6 +577,9 @@
         <translation>O teu balance actual total</translation>
     </message>
     </context>
+<context>
+    <name>PaymentServer</name>
+    </context>
 <context>
     <name>PeerTableModel</name>
     </context>
@@ -593,6 +602,12 @@
         <translation>N/A</translation>
     </message>
     </context>
+<context>
+    <name>QObject::QObject</name>
+    </context>
+<context>
+    <name>QRImageWidget</name>
+    </context>
 <context>
     <name>RPCConsole</name>
     <message>
@@ -749,7 +764,10 @@
         <source>&amp;Save Image...</source>
         <translation>&amp;Gardar Imaxe...</translation>
     </message>
-</context>
+    </context>
+<context>
+    <name>RecentRequestsTableModel</name>
+    </context>
 <context>
     <name>SendCoinsDialog</name>
     <message>
@@ -772,10 +790,6 @@
         <source>Amount:</source>
         <translation>Importe:</translation>
     </message>
-    <message>
-        <source>Priority:</source>
-        <translation>Prioridade:</translation>
-    </message>
     <message>
         <source>Fee:</source>
         <translation>Pago:</translation>
@@ -816,7 +830,7 @@
         <source>S&amp;end</source>
         <translation>&amp;Enviar</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>SendCoinsEntry</name>
     <message>
@@ -871,7 +885,10 @@
         <source>Memo:</source>
         <translation>Memo:</translation>
     </message>
-</context>
+    </context>
+<context>
+    <name>SendConfirmationDialog</name>
+    </context>
 <context>
     <name>ShutdownWindow</name>
     </context>
@@ -945,7 +962,7 @@
         <source>Reset all verify message fields</source>
         <translation>Restaurar todos os campos de verificación de mensaxe</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>SplashScreen</name>
     <message>
@@ -960,16 +977,34 @@
         <translation>KB/s</translation>
     </message>
 </context>
+<context>
+    <name>TransactionDesc</name>
+    </context>
 <context>
     <name>TransactionDescDialog</name>
     <message>
         <source>This pane shows a detailed description of the transaction</source>
         <translation>Este panel amosa unha descripción detallada da transacción</translation>
     </message>
-</context>
+    </context>
+<context>
+    <name>TransactionTableModel</name>
+    </context>
+<context>
+    <name>TransactionView</name>
+    </context>
 <context>
     <name>UnitDisplayStatusBarControl</name>
     </context>
+<context>
+    <name>WalletFrame</name>
+    </context>
+<context>
+    <name>WalletModel</name>
+    </context>
+<context>
+    <name>WalletView</name>
+    </context>
 <context>
     <name>bitcoin-core</name>
     <message>
@@ -996,10 +1031,6 @@
         <source>Run in the background as a daemon and accept commands</source>
         <translation>Executar no fondo como un demo e aceptar comandos</translation>
     </message>
-    <message>
-        <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
-        <translation>Aceptar conexións de fóra (por defecto: 1 se non -proxy ou -connect)</translation>
-    </message>
     <message>
         <source>Bitcoin Core</source>
         <translation>Core de Bitcoin</translation>
@@ -1012,18 +1043,6 @@
         <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source>
         <translation>Executar comando cando unha transacción do moedeiro cambia (%s no comando é substituído por TxID)</translation>
     </message>
-    <message>
-        <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
-        <translation>Esta é unha build de test pre-lanzamento - emprégaa baixo o teu propio risco - non empregar para minado ou aplicacións de comerciantes</translation>
-    </message>
-    <message>
-        <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source>
-        <translation>Precaución: A rede non parece estar totalmente de acordo! Algúns mineitos parecen estar experimentando problemas.</translation>
-    </message>
-    <message>
-        <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source>
-        <translation>Precaución: Non parece que esteamos totalmente de acordo cos nosos pares! Pode que precises actualizar, ou outros nodos poden precisar actualizarse.</translation>
-    </message>
     <message>
         <source>&lt;category&gt; can be:</source>
         <translation>&lt;categoría&gt; pode ser:</translation>
@@ -1032,10 +1051,6 @@
         <source>Block creation options:</source>
         <translation>Opcións de creación de bloque:</translation>
     </message>
-    <message>
-        <source>Connect only to the specified node(s)</source>
-        <translation>Conectar so ao(s) nodo(s) especificado(s)</translation>
-    </message>
     <message>
         <source>Corrupted block database detected</source>
         <translation>Detectada base de datos de bloques corrupta.</translation>
@@ -1120,10 +1135,6 @@
         <source>Transaction amount too small</source>
         <translation>A cantidade da transacción é demasiado pequena</translation>
     </message>
-    <message>
-        <source>Transaction amounts must be positive</source>
-        <translation>As cantidades da transacción deben ser positivas</translation>
-    </message>
     <message>
         <source>Transaction too large</source>
         <translation>A transacción é demasiado grande</translation>
diff --git a/src/qt/locale/bitcoin_he.ts b/src/qt/locale/bitcoin_he.ts
index 4a293c1c3f227..9293b794ad342 100644
--- a/src/qt/locale/bitcoin_he.ts
+++ b/src/qt/locale/bitcoin_he.ts
@@ -41,6 +41,69 @@
         <source>&amp;Delete</source>
         <translation>מ&amp;חיקה</translation>
     </message>
+    <message>
+        <source>Choose the address to send coins to</source>
+        <translation>בחר את הכתובת אליה תרצה לשלוח את המטבעות</translation>
+    </message>
+    <message>
+        <source>Choose the address to receive coins with</source>
+        <translation>בחר את הכתובת בה תקבל את המטבעות</translation>
+    </message>
+    <message>
+        <source>C&amp;hoose</source>
+        <translation>בחר</translation>
+    </message>
+    <message>
+        <source>Sending addresses</source>
+        <translation>כתובת לשליחה</translation>
+    </message>
+    <message>
+        <source>Receiving addresses</source>
+        <translation>מקבל כתובות</translation>
+    </message>
+    <message>
+        <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source>
+        <translation>אלה הם כתובות הביטקוין שלך לשליחת תשלומים. חשוב לבדוק את הכמות של הכתובות המקבלות לפני שליחת מטבעות</translation>
+    </message>
+    <message>
+        <source>These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source>
+        <translation>אלה הן כתובות הביטקוין שלך לקבלת תשלומים. מומלץ להשתמש בכתובת חדשה לכל העברה.</translation>
+    </message>
+    <message>
+        <source>&amp;Copy Address</source>
+        <translation>&amp;העתק כתובת</translation>
+    </message>
+    <message>
+        <source>Copy &amp;Label</source>
+        <translation>העתק &amp;תוית</translation>
+    </message>
+    <message>
+        <source>&amp;Edit</source>
+        <translation>&amp;ערוך</translation>
+    </message>
+    <message>
+        <source>Exporting Failed</source>
+        <translation>יצוא נכשל</translation>
+    </message>
+    <message>
+        <source>There was an error trying to save the address list to %1. Please try again.</source>
+        <translation>אירעה שגיאה בעת הניסיון לשמור את רשימת הכתובת אל %1. נא לנסות שוב.</translation>
+    </message>
+</context>
+<context>
+    <name>AddressTableModel</name>
+    <message>
+        <source>Label</source>
+        <translation>תוית</translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation>כתובת</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(ללא תוית)</translation>
+    </message>
 </context>
 <context>
     <name>AskPassphraseDialog</name>
@@ -60,7 +123,7 @@
         <source>Repeat new passphrase</source>
         <translation>נא לחזור על מילת הצופן החדשה</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>BanTableModel</name>
     <message>
@@ -258,10 +321,6 @@
         <source>No block source available...</source>
         <translation>אין מקור מקטעים זמין…</translation>
     </message>
-    <message>
-        <source>%1 and %2</source>
-        <translation>%1 ו%2</translation>
-    </message>
     <message>
         <source>%1 behind</source>
         <translation>%1 מאחור</translation>
@@ -310,7 +369,7 @@
         <source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;locked&lt;/b&gt;</source>
         <translation>הארנק &lt;b&gt;מוצפן&lt;/b&gt; ו&lt;b&gt;נעול&lt;/b&gt; כרגע</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>CoinControlDialog</name>
     <message>
@@ -329,10 +388,6 @@
         <source>Amount:</source>
         <translation>סכום:</translation>
     </message>
-    <message>
-        <source>Priority:</source>
-        <translation>עדיפות:</translation>
-    </message>
     <message>
         <source>Fee:</source>
         <translation>עמלה:</translation>
@@ -386,10 +441,10 @@
         <translation>מאושר</translation>
     </message>
     <message>
-        <source>Priority</source>
-        <translation>עדיפות</translation>
+        <source>(no label)</source>
+        <translation>(ללא תוית)</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>EditAddressDialog</name>
     <message>
@@ -412,7 +467,7 @@
         <source>&amp;Address</source>
         <translation>&amp;כתובת</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>FreespaceChecker</name>
     <message>
@@ -466,6 +521,10 @@
         <source>Start minimized</source>
         <translation>התחל ממוזער</translation>
     </message>
+    <message>
+        <source>Show splash screen on startup (default: %u)</source>
+        <translation>הצג מסך פתיחה בעת הפעלה (ברירת מחדל: %u)</translation>
+    </message>
     <message>
         <source>Reset all settings changed in the GUI</source>
         <translation>איפוס כל שינויי הגדרות התצוגה</translation>
@@ -498,6 +557,21 @@
         <translation>שגיאה</translation>
     </message>
     </context>
+<context>
+    <name>ModalOverlay</name>
+    <message>
+        <source>Form</source>
+        <translation>טופס</translation>
+    </message>
+    <message>
+        <source>Last block time</source>
+        <translation>זמן המקטע האחרון</translation>
+    </message>
+    <message>
+        <source>Hide</source>
+        <translation>הסתר</translation>
+    </message>
+    </context>
 <context>
     <name>OpenURIDialog</name>
     <message>
@@ -516,7 +590,7 @@
         <source>Select payment request file</source>
         <translation>בחירת קובץ בקשת תשלום</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>OptionsDialog</name>
     <message>
@@ -775,17 +849,16 @@
         <translation>המאזן הכולל הנוכחי בכתובות לצפייה בלבד</translation>
     </message>
 </context>
+<context>
+    <name>PaymentServer</name>
+    </context>
 <context>
     <name>PeerTableModel</name>
     <message>
         <source>User Agent</source>
         <translation>סוכן משתמש</translation>
     </message>
-    <message>
-        <source>Ping Time</source>
-        <translation>זמן המענה</translation>
-    </message>
-</context>
+    </context>
 <context>
     <name>QObject</name>
     <message>
@@ -824,7 +897,17 @@
         <source>%1 ms</source>
         <translation>%1 מילישניות</translation>
     </message>
-</context>
+    <message>
+        <source>%1 and %2</source>
+        <translation>%1 ו%2</translation>
+    </message>
+    </context>
+<context>
+    <name>QObject::QObject</name>
+    </context>
+<context>
+    <name>QRImageWidget</name>
+    </context>
 <context>
     <name>RPCConsole</name>
     <message>
@@ -1012,8 +1095,8 @@
         <translation>ניקוי מסוף הבקרה</translation>
     </message>
     <message>
-        <source>Ban Node for</source>
-        <translation>חסום משתמש ל</translation>
+        <source>1 &amp;hour</source>
+        <translation>1 שעה</translation>
     </message>
     <message>
         <source>1 &amp;day</source>
@@ -1150,7 +1233,7 @@
         <source>Remove</source>
         <translation>הסרה</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>ReceiveRequestDialog</name>
     <message>
@@ -1169,7 +1252,26 @@
         <source>&amp;Save Image...</source>
         <translation>&amp;שמירת תמונה…</translation>
     </message>
-</context>
+    <message>
+        <source>Address</source>
+        <translation>כתובת</translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation>תוית</translation>
+    </message>
+    </context>
+<context>
+    <name>RecentRequestsTableModel</name>
+    <message>
+        <source>Label</source>
+        <translation>תוית</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(ללא תוית)</translation>
+    </message>
+    </context>
 <context>
     <name>SendCoinsDialog</name>
     <message>
@@ -1204,10 +1306,6 @@
         <source>Amount:</source>
         <translation>סכום:</translation>
     </message>
-    <message>
-        <source>Priority:</source>
-        <translation>עדיפות:</translation>
-    </message>
     <message>
         <source>Fee:</source>
         <translation>עמלה:</translation>
@@ -1256,10 +1354,6 @@
         <source>Custom:</source>
         <translation>מותאם אישית:</translation>
     </message>
-    <message>
-        <source>Confirmation time:</source>
-        <translation>זמן האישור:</translation>
-    </message>
     <message>
         <source>normal</source>
         <translation>רגיל</translation>
@@ -1300,6 +1394,10 @@
         <source>S&amp;end</source>
         <translation>&amp;שליחה</translation>
     </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(ללא תוית)</translation>
+    </message>
 </context>
 <context>
     <name>SendCoinsEntry</name>
@@ -1367,7 +1465,10 @@
         <source>Memo:</source>
         <translation>תזכורת:</translation>
     </message>
-</context>
+    </context>
+<context>
+    <name>SendConfirmationDialog</name>
+    </context>
 <context>
     <name>ShutdownWindow</name>
     <message>
@@ -1453,7 +1554,7 @@
         <source>Reset all verify message fields</source>
         <translation>איפוס כל שדות אימות ההודעה</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>SplashScreen</name>
     <message>
@@ -1468,13 +1569,42 @@
         <translation>ק״ב/ש׳</translation>
     </message>
 </context>
+<context>
+    <name>TransactionDesc</name>
+    </context>
 <context>
     <name>TransactionDescDialog</name>
     <message>
         <source>This pane shows a detailed description of the transaction</source>
         <translation>חלונית זו מציגה תיאור מפורט של ההעברה</translation>
     </message>
-</context>
+    </context>
+<context>
+    <name>TransactionTableModel</name>
+    <message>
+        <source>Label</source>
+        <translation>תוית</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(ללא תוית)</translation>
+    </message>
+    </context>
+<context>
+    <name>TransactionView</name>
+    <message>
+        <source>Label</source>
+        <translation>תוית</translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation>כתובת</translation>
+    </message>
+    <message>
+        <source>Exporting Failed</source>
+        <translation>יצוא נכשל</translation>
+    </message>
+    </context>
 <context>
     <name>UnitDisplayStatusBarControl</name>
     <message>
@@ -1482,6 +1612,15 @@
         <translation>יחידת המידה להצגת הסכומים. יש ללחוץ כדי לבחור ביחידת מידה אחרת.</translation>
     </message>
 </context>
+<context>
+    <name>WalletFrame</name>
+    </context>
+<context>
+    <name>WalletModel</name>
+    </context>
+<context>
+    <name>WalletView</name>
+    </context>
 <context>
     <name>bitcoin-core</name>
     <message>
@@ -1512,10 +1651,6 @@
         <source>Run in the background as a daemon and accept commands</source>
         <translation>ריצה כסוכן ברקע וקבלת פקודות</translation>
     </message>
-    <message>
-        <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
-        <translation>קבלת חיבורים מבחוץ (בררת מחדל: 1 ללא ‎-proxy או ‎-connect)</translation>
-    </message>
     <message>
         <source>Bitcoin Core</source>
         <translation>ליבת ביטקוין</translation>
@@ -1536,18 +1671,6 @@
         <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source>
         <translation>ביצוע פקודה כאשר העברה בארנק משתנה (%s ב־cmd יוחלף ב־TxID)</translation>
     </message>
-    <message>
-        <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
-        <translation>זוהי בניית ניסיון טרום-שחרור - השימוש בה על אחריותך - אין להשתמש לצורך כריה או יישומי מסחר</translation>
-    </message>
-    <message>
-        <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source>
-        <translation>אזהרה: נראה שלא כל הרשת מסכימה! נראה שישנם כורים שנתקלים בבעיות.</translation>
-    </message>
-    <message>
-        <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source>
-        <translation>אזהרה: נראה שישנה אי־הסכמה בינינו לבין שאר העמיתים שלנו! יתכן שעדיף לשדרג או שכל שאר העמיתים צריכים לשדרג.</translation>
-    </message>
     <message>
         <source>&lt;category&gt; can be:</source>
         <translation>&lt;קטגוריה&gt; יכולה להיות:</translation>
@@ -1560,10 +1683,6 @@
         <source>Change index out of range</source>
         <translation>אינדקס העודף מחוץ לתחום</translation>
     </message>
-    <message>
-        <source>Connect only to the specified node(s)</source>
-        <translation>התחבר רק לצמתים המצוינים</translation>
-    </message>
     <message>
         <source>Connection options:</source>
         <translation>הגדרות חיבור:</translation>
@@ -1736,10 +1855,6 @@
         <source>Transaction amount too small</source>
         <translation>סכום ההעברה קטן מדי</translation>
     </message>
-    <message>
-        <source>Transaction amounts must be positive</source>
-        <translation>סכומי ההעברות חייבים להיות חיוביים</translation>
-    </message>
     <message>
         <source>Transaction too large for fee policy</source>
         <translation>ההעברה גבוהה מדי עבור מדיניות העמלות</translation>
diff --git a/src/qt/locale/bitcoin_hi_IN.ts b/src/qt/locale/bitcoin_hi_IN.ts
index 86c53b4ce3dfd..20fbd0e0ae2c1 100644
--- a/src/qt/locale/bitcoin_hi_IN.ts
+++ b/src/qt/locale/bitcoin_hi_IN.ts
@@ -13,7 +13,10 @@
         <source>&amp;Delete</source>
         <translation>&amp;मिटाए !!</translation>
     </message>
-</context>
+    </context>
+<context>
+    <name>AddressTableModel</name>
+    </context>
 <context>
     <name>AskPassphraseDialog</name>
     <message>
@@ -28,7 +31,7 @@
         <source>Repeat new passphrase</source>
         <translation>दोबारा नया पहचान शब्द/अक्षर डालिए !</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>BanTableModel</name>
     </context>
@@ -135,7 +138,7 @@
         <source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;locked&lt;/b&gt;</source>
         <translation>वॉलेट एन्क्रिप्टेड है तथा अभी लॉक्ड है</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>CoinControlDialog</name>
     <message>
@@ -169,7 +172,7 @@
         <source>&amp;Address</source>
         <translation>&amp;पता</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>FreespaceChecker</name>
     </context>
@@ -191,6 +194,13 @@
         <translation>भूल</translation>
     </message>
     </context>
+<context>
+    <name>ModalOverlay</name>
+    <message>
+        <source>Form</source>
+        <translation>फार्म</translation>
+    </message>
+    </context>
 <context>
     <name>OpenURIDialog</name>
     </context>
@@ -220,6 +230,9 @@
         <translation>फार्म</translation>
     </message>
     </context>
+<context>
+    <name>PaymentServer</name>
+    </context>
 <context>
     <name>PeerTableModel</name>
     </context>
@@ -235,6 +248,12 @@
 </translation>
     </message>
     </context>
+<context>
+    <name>QObject::QObject</name>
+    </context>
+<context>
+    <name>QRImageWidget</name>
+    </context>
 <context>
     <name>RPCConsole</name>
     <message>
@@ -265,6 +284,9 @@
         <translation>&amp;पता कॉपी करे</translation>
     </message>
     </context>
+<context>
+    <name>RecentRequestsTableModel</name>
+    </context>
 <context>
     <name>SendCoinsDialog</name>
     <message>
@@ -319,6 +341,9 @@
         <translation>प्राप्तकर्ता:</translation>
     </message>
     </context>
+<context>
+    <name>SendConfirmationDialog</name>
+    </context>
 <context>
     <name>ShutdownWindow</name>
     </context>
@@ -351,16 +376,34 @@
 <context>
     <name>TrafficGraphWidget</name>
     </context>
+<context>
+    <name>TransactionDesc</name>
+    </context>
 <context>
     <name>TransactionDescDialog</name>
     <message>
         <source>This pane shows a detailed description of the transaction</source>
         <translation> ये खिड़की आपको लेन-देन का विस्तृत विवरण देगी !</translation>
     </message>
-</context>
+    </context>
+<context>
+    <name>TransactionTableModel</name>
+    </context>
+<context>
+    <name>TransactionView</name>
+    </context>
 <context>
     <name>UnitDisplayStatusBarControl</name>
     </context>
+<context>
+    <name>WalletFrame</name>
+    </context>
+<context>
+    <name>WalletModel</name>
+    </context>
+<context>
+    <name>WalletView</name>
+    </context>
 <context>
     <name>bitcoin-core</name>
     <message>
diff --git a/src/qt/locale/bitcoin_hr.ts b/src/qt/locale/bitcoin_hr.ts
index f5accfb0b8fe8..3956669ad4ba3 100644
--- a/src/qt/locale/bitcoin_hr.ts
+++ b/src/qt/locale/bitcoin_hr.ts
@@ -41,7 +41,34 @@
         <source>&amp;Delete</source>
         <translation>Iz&amp;briši</translation>
     </message>
-</context>
+    <message>
+        <source>Choose the address to send coins to</source>
+        <translation>Odaberi adresu na koju šalješ novac</translation>
+    </message>
+    <message>
+        <source>Choose the address to receive coins with</source>
+        <translation>Odaberi adresu na koju primaš novac</translation>
+    </message>
+    <message>
+        <source>C&amp;hoose</source>
+        <translation>&amp;Odaberi</translation>
+    </message>
+    <message>
+        <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source>
+        <translation>Ovo su vaše Bitcoin adrese za slanje novca. Uvijek provjerite iznos i adresu primatelja prije slanja novca.</translation>
+    </message>
+    <message>
+        <source>&amp;Copy Address</source>
+        <translation>&amp;Kopiraj adresu</translation>
+    </message>
+    <message>
+        <source>Exporting Failed</source>
+        <translation>Izvoz neuspješan</translation>
+    </message>
+    </context>
+<context>
+    <name>AddressTableModel</name>
+    </context>
 <context>
     <name>AskPassphraseDialog</name>
     <message>
@@ -60,7 +87,7 @@
         <source>Repeat new passphrase</source>
         <translation>Ponovite novu lozinku</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>BanTableModel</name>
     </context>
@@ -250,26 +277,6 @@
         <source>Processed %n block(s) of transaction history.</source>
         <translation><numerusform>Obrađen %n blok povijesti transakcije.</numerusform><numerusform>Obrađeno %n bloka povijesti transakcije.</numerusform><numerusform>Obrađeno %n blokova povijesti transakcije.</numerusform></translation>
     </message>
-    <message numerus="yes">
-        <source>%n hour(s)</source>
-        <translation><numerusform>%n sat</numerusform><numerusform>%n sata</numerusform><numerusform>%n sati</numerusform></translation>
-    </message>
-    <message numerus="yes">
-        <source>%n day(s)</source>
-        <translation><numerusform>%n dan</numerusform><numerusform>%n dana</numerusform><numerusform>%n dana</numerusform></translation>
-    </message>
-    <message numerus="yes">
-        <source>%n week(s)</source>
-        <translation><numerusform>%n tjedan</numerusform><numerusform>%n tjedna</numerusform><numerusform>%n tjedana</numerusform></translation>
-    </message>
-    <message>
-        <source>%1 and %2</source>
-        <translation>%1 i %2</translation>
-    </message>
-    <message numerus="yes">
-        <source>%n year(s)</source>
-        <translation><numerusform>%n godina</numerusform><numerusform>%n godine</numerusform><numerusform>%n godina</numerusform></translation>
-    </message>
     <message>
         <source>Last received block was generated %1 ago.</source>
         <translation>Zadnji primljeni blok je bio ustvaren prije %1.</translation>
@@ -344,7 +351,7 @@
         <source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;locked&lt;/b&gt;</source>
         <translation>Novčanik je &lt;b&gt;šifriran&lt;/b&gt; i trenutno &lt;b&gt;zaključan&lt;/b&gt;</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>CoinControlDialog</name>
     <message>
@@ -363,10 +370,6 @@
         <source>Amount:</source>
         <translation>Iznos:</translation>
     </message>
-    <message>
-        <source>Priority:</source>
-        <translation>Prioriteta:</translation>
-    </message>
     <message>
         <source>Fee:</source>
         <translation>Naknada:</translation>
@@ -407,11 +410,7 @@
         <source>Confirmed</source>
         <translation>Potvrđeno</translation>
     </message>
-    <message>
-        <source>Priority</source>
-        <translation>Prioriteta</translation>
-    </message>
-</context>
+    </context>
 <context>
     <name>EditAddressDialog</name>
     <message>
@@ -434,7 +433,7 @@
         <source>&amp;Address</source>
         <translation>&amp;Adresa</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>FreespaceChecker</name>
     <message>
@@ -484,6 +483,17 @@
         <translation>Greška</translation>
     </message>
     </context>
+<context>
+    <name>ModalOverlay</name>
+    <message>
+        <source>Form</source>
+        <translation>Oblik</translation>
+    </message>
+    <message>
+        <source>Last block time</source>
+        <translation>Posljednje vrijeme bloka</translation>
+    </message>
+    </context>
 <context>
     <name>OpenURIDialog</name>
     <message>
@@ -502,7 +512,7 @@
         <source>Select payment request file</source>
         <translation>Izaberi datoteku zahtjeva za plaćanje</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>OptionsDialog</name>
     <message>
@@ -641,6 +651,9 @@
         <translation>Ukupno:</translation>
     </message>
     </context>
+<context>
+    <name>PaymentServer</name>
+    </context>
 <context>
     <name>PeerTableModel</name>
     </context>
@@ -654,6 +667,16 @@
         <source>N/A</source>
         <translation>N/A</translation>
     </message>
+    <message>
+        <source>%1 and %2</source>
+        <translation>%1 i %2</translation>
+    </message>
+    </context>
+<context>
+    <name>QObject::QObject</name>
+    </context>
+<context>
+    <name>QRImageWidget</name>
     </context>
 <context>
     <name>RPCConsole</name>
@@ -791,7 +814,10 @@
         <source>&amp;Save Image...</source>
         <translation>&amp;Spremi sliku...</translation>
     </message>
-</context>
+    </context>
+<context>
+    <name>RecentRequestsTableModel</name>
+    </context>
 <context>
     <name>SendCoinsDialog</name>
     <message>
@@ -814,10 +840,6 @@
         <source>Amount:</source>
         <translation>Iznos:</translation>
     </message>
-    <message>
-        <source>Priority:</source>
-        <translation>Prioriteta:</translation>
-    </message>
     <message>
         <source>Fee:</source>
         <translation>Naknada:</translation>
@@ -862,7 +884,7 @@
         <source>S&amp;end</source>
         <translation>&amp;Pošalji</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>SendCoinsEntry</name>
     <message>
@@ -898,6 +920,9 @@
         <translation>Primatelj plaćanja:</translation>
     </message>
     </context>
+<context>
+    <name>SendConfirmationDialog</name>
+    </context>
 <context>
     <name>ShutdownWindow</name>
     </context>
@@ -954,16 +979,38 @@
 <context>
     <name>TrafficGraphWidget</name>
     </context>
+<context>
+    <name>TransactionDesc</name>
+    </context>
 <context>
     <name>TransactionDescDialog</name>
     <message>
         <source>This pane shows a detailed description of the transaction</source>
         <translation>Ovaj prozor prikazuje detaljni opis transakcije</translation>
     </message>
-</context>
+    </context>
+<context>
+    <name>TransactionTableModel</name>
+    </context>
+<context>
+    <name>TransactionView</name>
+    <message>
+        <source>Exporting Failed</source>
+        <translation>Izvoz neuspješan</translation>
+    </message>
+    </context>
 <context>
     <name>UnitDisplayStatusBarControl</name>
     </context>
+<context>
+    <name>WalletFrame</name>
+    </context>
+<context>
+    <name>WalletModel</name>
+    </context>
+<context>
+    <name>WalletView</name>
+    </context>
 <context>
     <name>bitcoin-core</name>
     <message>
@@ -994,10 +1041,6 @@
         <source>Block creation options:</source>
         <translation>Opcije za kreiranje bloka:</translation>
     </message>
-    <message>
-        <source>Connect only to the specified node(s)</source>
-        <translation>Poveži se samo sa određenim čvorom/čvorovima</translation>
-    </message>
     <message>
         <source>Error: Disk space is low!</source>
         <translation>Pogreška: Nema dovoljno prostora na disku!</translation>
diff --git a/src/qt/locale/bitcoin_hu.ts b/src/qt/locale/bitcoin_hu.ts
index 9eb0cf76c4319..49b9dc7d1c8ac 100644
--- a/src/qt/locale/bitcoin_hu.ts
+++ b/src/qt/locale/bitcoin_hu.ts
@@ -41,7 +41,10 @@
         <source>&amp;Delete</source>
         <translation>&amp;Törlés</translation>
     </message>
-</context>
+    </context>
+<context>
+    <name>AddressTableModel</name>
+    </context>
 <context>
     <name>AskPassphraseDialog</name>
     <message>
@@ -60,10 +63,18 @@
         <source>Repeat new passphrase</source>
         <translation>Új jelszó újra</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>BanTableModel</name>
-    </context>
+    <message>
+        <source>IP/Netmask</source>
+        <translation>IP-cím/maszk</translation>
+    </message>
+    <message>
+        <source>Banned Until</source>
+        <translation>Kitiltás vége</translation>
+    </message>
+</context>
 <context>
     <name>BitcoinGUI</name>
     <message>
@@ -254,26 +265,6 @@
         <source>Processed %n block(s) of transaction history.</source>
         <translation><numerusform>%n blokk feldolgozva a tranzakció előzményből.</numerusform><numerusform>%n blokk feldolgozva a tranzakció előzményből.</numerusform></translation>
     </message>
-    <message numerus="yes">
-        <source>%n hour(s)</source>
-        <translation><numerusform>%n óra</numerusform><numerusform>%n óra</numerusform></translation>
-    </message>
-    <message numerus="yes">
-        <source>%n day(s)</source>
-        <translation><numerusform>%n nap</numerusform><numerusform>%n nap</numerusform></translation>
-    </message>
-    <message numerus="yes">
-        <source>%n week(s)</source>
-        <translation><numerusform>%n hét</numerusform><numerusform>%n hét</numerusform></translation>
-    </message>
-    <message>
-        <source>%1 and %2</source>
-        <translation>%1 és %2</translation>
-    </message>
-    <message numerus="yes">
-        <source>%n year(s)</source>
-        <translation><numerusform>%n év</numerusform><numerusform>%n év</numerusform></translation>
-    </message>
     <message>
         <source>%1 behind</source>
         <translation>%1 lemaradás</translation>
@@ -352,7 +343,7 @@
         <source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;locked&lt;/b&gt;</source>
         <translation>Tárca &lt;b&gt;kódolva&lt;/b&gt; és jelenleg &lt;b&gt;zárva&lt;/b&gt;.</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>CoinControlDialog</name>
     <message>
@@ -371,10 +362,6 @@
         <source>Amount:</source>
         <translation>Összeg:</translation>
     </message>
-    <message>
-        <source>Priority:</source>
-        <translation>Prioritás:</translation>
-    </message>
     <message>
         <source>Fee:</source>
         <translation>Díj:</translation>
@@ -427,11 +414,7 @@
         <source>Confirmed</source>
         <translation>Megerősítve</translation>
     </message>
-    <message>
-        <source>Priority</source>
-        <translation>Prioritás</translation>
-    </message>
-</context>
+    </context>
 <context>
     <name>EditAddressDialog</name>
     <message>
@@ -454,7 +437,7 @@
         <source>&amp;Address</source>
         <translation>&amp;Cím</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>FreespaceChecker</name>
     <message>
@@ -524,6 +507,21 @@
         <translation><numerusform>%n GB elérhető szabad hely</numerusform><numerusform>%n GB elérhető szabad hely</numerusform></translation>
     </message>
     </context>
+<context>
+    <name>ModalOverlay</name>
+    <message>
+        <source>Form</source>
+        <translation>Űrlap</translation>
+    </message>
+    <message>
+        <source>Last block time</source>
+        <translation>Utolsó blokk ideje</translation>
+    </message>
+    <message>
+        <source>Hide</source>
+        <translation>Elrejtés</translation>
+    </message>
+    </context>
 <context>
     <name>OpenURIDialog</name>
     <message>
@@ -542,7 +540,7 @@
         <source>Select payment request file</source>
         <translation>Fizetési kérelmi fájl kiválasztása</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>OptionsDialog</name>
     <message>
@@ -753,17 +751,16 @@
         <translation>A legutóbbi tranzakciók</translation>
     </message>
     </context>
+<context>
+    <name>PaymentServer</name>
+    </context>
 <context>
     <name>PeerTableModel</name>
     <message>
         <source>User Agent</source>
         <translation>User Agent</translation>
     </message>
-    <message>
-        <source>Ping Time</source>
-        <translation>Ping idő</translation>
-    </message>
-</context>
+    </context>
 <context>
     <name>QObject</name>
     <message>
@@ -802,7 +799,17 @@
         <source>%1 ms</source>
         <translation>%1 ms</translation>
     </message>
-</context>
+    <message>
+        <source>%1 and %2</source>
+        <translation>%1 és %2</translation>
+    </message>
+    </context>
+<context>
+    <name>QObject::QObject</name>
+    </context>
+<context>
+    <name>QRImageWidget</name>
+    </context>
 <context>
     <name>RPCConsole</name>
     <message>
@@ -869,6 +876,10 @@
         <source>&amp;Peers</source>
         <translation>&amp;Peerek</translation>
     </message>
+    <message>
+        <source>Banned peers</source>
+        <translation>Kitiltott felek</translation>
+    </message>
     <message>
         <source>Select a peer to view detailed information.</source>
         <translation>Peer kijelölése a részletes információkért</translation>
@@ -1052,7 +1063,7 @@
         <source>Remove</source>
         <translation>Eltávolítás</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>ReceiveRequestDialog</name>
     <message>
@@ -1071,7 +1082,10 @@
         <source>&amp;Save Image...</source>
         <translation>&amp;Kép mentése</translation>
     </message>
-</context>
+    </context>
+<context>
+    <name>RecentRequestsTableModel</name>
+    </context>
 <context>
     <name>SendCoinsDialog</name>
     <message>
@@ -1102,10 +1116,6 @@
         <source>Amount:</source>
         <translation>Összeg:</translation>
     </message>
-    <message>
-        <source>Priority:</source>
-        <translation>Prioritás:</translation>
-    </message>
     <message>
         <source>Fee:</source>
         <translation>Díjak:</translation>
@@ -1182,7 +1192,7 @@
         <source>S&amp;end</source>
         <translation>&amp;Küldés</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>SendCoinsEntry</name>
     <message>
@@ -1229,7 +1239,10 @@
         <source>Memo:</source>
         <translation>Jegyzet:</translation>
     </message>
-</context>
+    </context>
+<context>
+    <name>SendConfirmationDialog</name>
+    </context>
 <context>
     <name>ShutdownWindow</name>
     <message>
@@ -1310,16 +1323,34 @@
         <translation>KB/s</translation>
     </message>
 </context>
+<context>
+    <name>TransactionDesc</name>
+    </context>
 <context>
     <name>TransactionDescDialog</name>
     <message>
         <source>This pane shows a detailed description of the transaction</source>
         <translation>Ez a mező a tranzakció részleteit mutatja</translation>
     </message>
-</context>
+    </context>
+<context>
+    <name>TransactionTableModel</name>
+    </context>
+<context>
+    <name>TransactionView</name>
+    </context>
 <context>
     <name>UnitDisplayStatusBarControl</name>
     </context>
+<context>
+    <name>WalletFrame</name>
+    </context>
+<context>
+    <name>WalletModel</name>
+    </context>
+<context>
+    <name>WalletView</name>
+    </context>
 <context>
     <name>bitcoin-core</name>
     <message>
@@ -1350,10 +1381,6 @@
         <translation>Háttérben futtatás daemonként és parancsok elfogadása
 </translation>
     </message>
-    <message>
-        <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
-        <translation>Kívülről érkező kapcsolatok elfogadása (alapértelmezett: 1, ha nem használt a -proxy vagy a -connect)</translation>
-    </message>
     <message>
         <source>Bitcoin Core</source>
         <translation>Bitcoin Core</translation>
@@ -1363,8 +1390,8 @@
         <translation>Parancs, amit akkor hajt végre, amikor egy tárca-tranzakció megváltozik  (%s a parancsban lecserélődik a blokk TxID-re)</translation>
     </message>
     <message>
-        <source>Connect only to the specified node(s)</source>
-        <translation>Csatlakozás csak a megadott csomóponthoz</translation>
+        <source>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</source>
+        <translation>UPnP használata porttovábbításra (alapértelmezett: 1, amikor kiszolgál és nem használt a -proxy)</translation>
     </message>
     <message>
         <source>Corrupted block database detected</source>
@@ -1406,6 +1433,10 @@
         <source>Incorrect or no genesis block found. Wrong datadir for network?</source>
         <translation>Helytelen vagy nemlétező genézis blokk. Helytelen hálózati adatkönyvtár?</translation>
     </message>
+    <message>
+        <source>Loading banlist...</source>
+        <translation>Tiltólista betöltése...</translation>
+    </message>
     <message>
         <source>Not enough file descriptors available.</source>
         <translation>Nincs elég fájlleíró. </translation>
@@ -1422,6 +1453,18 @@
         <source>Wallet options:</source>
         <translation>Tárca beállítások:</translation>
     </message>
+    <message>
+        <source>Discover own IP addresses (default: 1 when listening and no -externalip or -proxy)</source>
+        <translation>Saját IP-cím felfedezése (alapértelmezett: 1, amikor kiszolgál és nem használt a -externalip)</translation>
+    </message>
+    <message>
+        <source>Whitelisted peers cannot be DoS banned and their transactions are always relayed, even if they are already in the mempool, useful e.g. for a gateway</source>
+        <translation>A fehérlistán szereplő felek nem lesznek automatikusan kitiltva és a tranzakcióik is mindig továbbítva lesznek, akkor is ha már a megerősítésre váró listán (mempool) vannak. Hasznos például összekötő csomópontokon (gateway).</translation>
+    </message>
+    <message>
+        <source>(default: %u)</source>
+        <translation>(alapértelmezett: %u)</translation>
+    </message>
     <message>
         <source>Error reading from database, shutting down.</source>
         <translation>Hiba az adatbázis olvasásakor, leállítás</translation>
@@ -1446,10 +1489,6 @@
         <source>Transaction amount too small</source>
         <translation>Tranzakció összege túl alacsony</translation>
     </message>
-    <message>
-        <source>Transaction amounts must be positive</source>
-        <translation>Tranzakció összege pozitív kell legyen</translation>
-    </message>
     <message>
         <source>Transaction too large</source>
         <translation>Túl nagy tranzakció</translation>
@@ -1480,6 +1519,14 @@
         <source>Loading addresses...</source>
         <translation>Címek betöltése...</translation>
     </message>
+    <message>
+        <source>(default: %s)</source>
+        <translation>(alapértelmezett: %s)</translation>
+    </message>
+    <message>
+        <source>Include IP addresses in debug output (default: %u)</source>
+        <translation>IP-címek megjelenítése a naplóban (alapértelmezett: %u)</translation>
+    </message>
     <message>
         <source>Invalid -proxy address: '%s'</source>
         <translation>Érvénytelen -proxy cím: '%s'</translation>
diff --git a/src/qt/locale/bitcoin_id_ID.ts b/src/qt/locale/bitcoin_id_ID.ts
index feb6f690c4595..5cc5d71c6de5d 100644
--- a/src/qt/locale/bitcoin_id_ID.ts
+++ b/src/qt/locale/bitcoin_id_ID.ts
@@ -41,7 +41,10 @@
         <source>&amp;Delete</source>
         <translation>&amp;Hapus</translation>
     </message>
-</context>
+    </context>
+<context>
+    <name>AddressTableModel</name>
+    </context>
 <context>
     <name>AskPassphraseDialog</name>
     <message>
@@ -60,7 +63,7 @@
         <source>Repeat new passphrase</source>
         <translation>Ulangi kata kunci baru</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>BanTableModel</name>
     <message>
@@ -258,26 +261,6 @@
         <source>Processed %n block(s) of transaction history.</source>
         <translation><numerusform>%n blok dari riwayat transaksi diproses.</numerusform></translation>
     </message>
-    <message numerus="yes">
-        <source>%n hour(s)</source>
-        <translation><numerusform>%n jam</numerusform></translation>
-    </message>
-    <message numerus="yes">
-        <source>%n day(s)</source>
-        <translation><numerusform>%n hari</numerusform></translation>
-    </message>
-    <message numerus="yes">
-        <source>%n week(s)</source>
-        <translation><numerusform>%n minggu</numerusform></translation>
-    </message>
-    <message>
-        <source>%1 and %2</source>
-        <translation>%1 dan %2</translation>
-    </message>
-    <message numerus="yes">
-        <source>%n year(s)</source>
-        <translation><numerusform>%n tahun</numerusform></translation>
-    </message>
     <message>
         <source>%1 behind</source>
         <translation>kurang %1</translation>
@@ -356,7 +339,7 @@
         <source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;locked&lt;/b&gt;</source>
         <translation>Dompet saat ini &lt;b&gt;terenkripsi&lt;/b&gt; dan &lt;b&gt;terkunci&lt;/b&gt;</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>CoinControlDialog</name>
     <message>
@@ -375,10 +358,6 @@
         <source>Amount:</source>
         <translation>Jumlah:</translation>
     </message>
-    <message>
-        <source>Priority:</source>
-        <translation>Prioritas:</translation>
-    </message>
     <message>
         <source>Fee:</source>
         <translation>Biaya:</translation>
@@ -431,11 +410,7 @@
         <source>Confirmed</source>
         <translation>Terkonfirmasi</translation>
     </message>
-    <message>
-        <source>Priority</source>
-        <translation>Prioritas</translation>
-    </message>
-</context>
+    </context>
 <context>
     <name>EditAddressDialog</name>
     <message>
@@ -458,7 +433,7 @@
         <source>&amp;Address</source>
         <translation>&amp;Alamat</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>FreespaceChecker</name>
     <message>
@@ -560,6 +535,17 @@
         <translation><numerusform>(dari %n GB yang dibutuhkan)</numerusform></translation>
     </message>
 </context>
+<context>
+    <name>ModalOverlay</name>
+    <message>
+        <source>Form</source>
+        <translation>Formulir</translation>
+    </message>
+    <message>
+        <source>Last block time</source>
+        <translation>Waktu blok terakhir</translation>
+    </message>
+    </context>
 <context>
     <name>OpenURIDialog</name>
     <message>
@@ -578,7 +564,7 @@
         <source>Select payment request file</source>
         <translation>Pilih data permintaan pembayaran</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>OptionsDialog</name>
     <message>
@@ -821,6 +807,9 @@
         <translation>Jumlah saldo Anda sekarang</translation>
     </message>
     </context>
+<context>
+    <name>PaymentServer</name>
+    </context>
 <context>
     <name>PeerTableModel</name>
     <message>
@@ -850,6 +839,16 @@
         <source>N/A</source>
         <translation>T/S</translation>
     </message>
+    <message>
+        <source>%1 and %2</source>
+        <translation>%1 dan %2</translation>
+    </message>
+    </context>
+<context>
+    <name>QObject::QObject</name>
+    </context>
+<context>
+    <name>QRImageWidget</name>
     </context>
 <context>
     <name>RPCConsole</name>
@@ -1070,7 +1069,7 @@
         <source>Remove</source>
         <translation>Menghapus</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>ReceiveRequestDialog</name>
     <message>
@@ -1089,7 +1088,14 @@
         <source>&amp;Save Image...</source>
         <translation>&amp;Simpan Gambaran...</translation>
     </message>
-</context>
+    <message>
+        <source>Amount</source>
+        <translation>Jumlah</translation>
+    </message>
+    </context>
+<context>
+    <name>RecentRequestsTableModel</name>
+    </context>
 <context>
     <name>SendCoinsDialog</name>
     <message>
@@ -1124,10 +1130,6 @@
         <source>Amount:</source>
         <translation>Nilai:</translation>
     </message>
-    <message>
-        <source>Priority:</source>
-        <translation>Prioritas:</translation>
-    </message>
     <message>
         <source>Fee:</source>
         <translation>Biaya:</translation>
@@ -1156,10 +1158,6 @@
         <source>Recommended:</source>
         <translation>Disarankan</translation>
     </message>
-    <message>
-        <source>Confirmation time:</source>
-        <translation>Waktu konfirmasi:</translation>
-    </message>
     <message>
         <source>normal</source>
         <translation>normal</translation>
@@ -1200,7 +1198,7 @@
         <source>S&amp;end</source>
         <translation>K&amp;irim</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>SendCoinsEntry</name>
     <message>
@@ -1255,7 +1253,10 @@
         <source>Memo:</source>
         <translation>Catatan Peringatan:</translation>
     </message>
-</context>
+    </context>
+<context>
+    <name>SendConfirmationDialog</name>
+    </context>
 <context>
     <name>ShutdownWindow</name>
     <message>
@@ -1329,7 +1330,7 @@
         <source>Reset all verify message fields</source>
         <translation>Hapus semua bidang verifikasi pesan</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>SplashScreen</name>
     <message>
@@ -1344,16 +1345,38 @@
         <translation>KB/s</translation>
     </message>
 </context>
+<context>
+    <name>TransactionDesc</name>
+    <message>
+        <source>Amount</source>
+        <translation>Jumlah</translation>
+    </message>
+    </context>
 <context>
     <name>TransactionDescDialog</name>
     <message>
         <source>This pane shows a detailed description of the transaction</source>
         <translation>Jendela ini menampilkan deskripsi rinci dari transaksi tersebut</translation>
     </message>
-</context>
+    </context>
+<context>
+    <name>TransactionTableModel</name>
+    </context>
+<context>
+    <name>TransactionView</name>
+    </context>
 <context>
     <name>UnitDisplayStatusBarControl</name>
     </context>
+<context>
+    <name>WalletFrame</name>
+    </context>
+<context>
+    <name>WalletModel</name>
+    </context>
+<context>
+    <name>WalletView</name>
+    </context>
 <context>
     <name>bitcoin-core</name>
     <message>
@@ -1380,10 +1403,6 @@
         <source>Run in the background as a daemon and accept commands</source>
         <translation>Berjalan dibelakang sebagai daemin dan menerima perintah</translation>
     </message>
-    <message>
-        <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
-        <translation>Terima hubungan dari luar (standar: 1 kalau -proxy atau -connect tidak dipilih)</translation>
-    </message>
     <message>
         <source>Bitcoin Core</source>
         <translation>Bitcoin Core</translation>
@@ -1392,22 +1411,10 @@
         <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source>
         <translation>Jalankan perintah ketika perubahan transaksi dompet (%s di cmd digantikan oleh TxID)</translation>
     </message>
-    <message>
-        <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source>
-        <translation>Peringatan: Jaringan tidak semua bersetuju! Beberapa penambang dapat persoalan.</translation>
-    </message>
-    <message>
-        <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source>
-        <translation>Peringatan: Kami tidak bersetujuh dengan peer-peer kami! Kemungkinan Anda harus upgrade, atau node-node lain yang harus diupgrade.</translation>
-    </message>
     <message>
         <source>Block creation options:</source>
         <translation>Pilihan pembuatan blok:</translation>
     </message>
-    <message>
-        <source>Connect only to the specified node(s)</source>
-        <translation>Jangan menghubungkan node(-node) selain yang di daftar</translation>
-    </message>
     <message>
         <source>Connection options:</source>
         <translation>Pilih koneksi:</translation>
@@ -1512,10 +1519,6 @@
         <source>Transaction amount too small</source>
         <translation>Nilai transaksi terlalu kecil</translation>
     </message>
-    <message>
-        <source>Transaction amounts must be positive</source>
-        <translation>Nilai transaksi harus positif</translation>
-    </message>
     <message>
         <source>Transaction too large</source>
         <translation>Transaksi terlalu besar</translation>
diff --git a/src/qt/locale/bitcoin_it.ts b/src/qt/locale/bitcoin_it.ts
index 55bc9c3c82470..265120b19fdb2 100644
--- a/src/qt/locale/bitcoin_it.ts
+++ b/src/qt/locale/bitcoin_it.ts
@@ -3,7 +3,7 @@
     <name>AddressBookPage</name>
     <message>
         <source>Right-click to edit address or label</source>
-        <translation>Fare clic con il tasto destro del mouse per modificare l'indirizzo o l'etichetta</translation>
+        <translation>Fare clic con il tasto destro del mouse per modificare l'indirizzo o l'etichettadefault</translation>
     </message>
     <message>
         <source>Create a new address</source>
@@ -41,6 +41,77 @@
         <source>&amp;Delete</source>
         <translation>&amp;Elimina</translation>
     </message>
+    <message>
+        <source>Choose the address to send coins to</source>
+        <translation>Scegli l'indirizzo a cui inviare bitcoin</translation>
+    </message>
+    <message>
+        <source>Choose the address to receive coins with</source>
+        <translation>Scegli l'indirizzo con cui ricevere bitcoin</translation>
+    </message>
+    <message>
+        <source>C&amp;hoose</source>
+        <translation>Sc&amp;egli</translation>
+    </message>
+    <message>
+        <source>Sending addresses</source>
+        <translation>Indirizzi d'invio</translation>
+    </message>
+    <message>
+        <source>Receiving addresses</source>
+        <translation>Indirizzi di ricezione</translation>
+    </message>
+    <message>
+        <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source>
+        <translation>Questo è un elenco di indirizzi Bitcoin a cui puoi inviare pagamenti. Controlla sempre l'importo e l'indirizzo del beneficiario prima di inviare bitcoin.</translation>
+    </message>
+    <message>
+        <source>These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source>
+        <translation>Questi sono i tuoi indirizzi Bitcoin che puoi usare per ricevere pagamenti. Si raccomanda di generare un nuovo indirizzo per ogni transazione.</translation>
+    </message>
+    <message>
+        <source>&amp;Copy Address</source>
+        <translation>&amp;Copia l'indirizzo</translation>
+    </message>
+    <message>
+        <source>Copy &amp;Label</source>
+        <translation>Copia &amp;l'etichetta</translation>
+    </message>
+    <message>
+        <source>&amp;Edit</source>
+        <translation>&amp;Modifica</translation>
+    </message>
+    <message>
+        <source>Export Address List</source>
+        <translation>Esporta Lista Indirizzi</translation>
+    </message>
+    <message>
+        <source>Comma separated file (*.csv)</source>
+        <translation>Testo CSV (*.csv)</translation>
+    </message>
+    <message>
+        <source>Exporting Failed</source>
+        <translation>Esportazione Fallita</translation>
+    </message>
+    <message>
+        <source>There was an error trying to save the address list to %1. Please try again.</source>
+        <translation>Si è verificato un errore tentando di salvare la lista degli indirizzi su %1. Si prega di riprovare.</translation>
+    </message>
+</context>
+<context>
+    <name>AddressTableModel</name>
+    <message>
+        <source>Label</source>
+        <translation>Etichetta</translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation>Indirizzo</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(nessuna etichetta)</translation>
+    </message>
 </context>
 <context>
     <name>AskPassphraseDialog</name>
@@ -60,7 +131,67 @@
         <source>Repeat new passphrase</source>
         <translation>Ripeti la nuova passphrase</translation>
     </message>
-</context>
+    <message>
+        <source>Enter the new passphrase to the wallet.&lt;br/&gt;Please use a passphrase of &lt;b&gt;ten or more random characters&lt;/b&gt;, or &lt;b&gt;eight or more words&lt;/b&gt;.</source>
+        <translation>Inserisci la nuova passphrase per il portamonete.&lt;br/&gt;Si consiglia di utilizzare &lt;b&gt;almeno dieci caratteri casuali&lt;/b&gt; oppure &lt;b&gt;otto o più parole&lt;/b&gt;.</translation>
+    </message>
+    <message>
+        <source>Encrypt wallet</source>
+        <translation>Cifra il portamonete</translation>
+    </message>
+    <message>
+        <source>This operation needs your wallet passphrase to unlock the wallet.</source>
+        <translation>Questa operazione necessita della passphrase per sbloccare il portamonete.</translation>
+    </message>
+    <message>
+        <source>Unlock wallet</source>
+        <translation>Sblocca il portamonete</translation>
+    </message>
+    <message>
+        <source>This operation needs your wallet passphrase to decrypt the wallet.</source>
+        <translation>Quest'operazione necessita della passphrase per decifrare il portamonete,</translation>
+    </message>
+    <message>
+        <source>Decrypt wallet</source>
+        <translation>Decifra il portamonete</translation>
+    </message>
+    <message>
+        <source>Change passphrase</source>
+        <translation>Cambia la passphrase</translation>
+    </message>
+    <message>
+        <source>Enter the old passphrase and new passphrase to the wallet.</source>
+        <translation>Inserisci la vecchia e la nuova passphrase per il portamonete.</translation>
+    </message>
+    <message>
+        <source>Confirm wallet encryption</source>
+        <translation>Conferma la cifratura del portamonete</translation>
+    </message>
+    <message>
+        <source>Warning: If you encrypt your wallet and lose your passphrase, you will &lt;b&gt;LOSE ALL OF YOUR BITCOINS&lt;/b&gt;!</source>
+        <translation>Attenzione: perdendo la passphrase di un portamonete cifrato &lt;b&gt;TUTTI I PROPRI BITCOIN ANDRANNO PERSI&lt;/b&gt;!</translation>
+    </message>
+    <message>
+        <source>Are you sure you wish to encrypt your wallet?</source>
+        <translation>Si è sicuri di voler cifrare il portamonete?</translation>
+    </message>
+    <message>
+        <source>Wallet encrypted</source>
+        <translation>Portamonete cifrato</translation>
+    </message>
+    <message>
+        <source>Wallet encryption failed</source>
+        <translation>Il processo di crittografia del tuo portafogli è fallito</translation>
+    </message>
+    <message>
+        <source>Wallet unlock failed</source>
+        <translation>Sbloccaggio del portafoglio fallito</translation>
+    </message>
+    <message>
+        <source>The passphrase entered for the wallet decryption was incorrect.</source>
+        <translation>La frase inserita per decrittografare il tuo portafoglio è incorretta</translation>
+    </message>
+    </context>
 <context>
     <name>BanTableModel</name>
     <message>
@@ -114,6 +245,10 @@
         <source>&amp;About %1</source>
         <translation>&amp;Informazioni su %1</translation>
     </message>
+    <message>
+        <source>Show information about %1</source>
+        <translation>Mostra informazioni su %1</translation>
+    </message>
     <message>
         <source>About &amp;Qt</source>
         <translation>Informazioni su &amp;Qt</translation>
@@ -126,6 +261,10 @@
         <source>&amp;Options...</source>
         <translation>&amp;Opzioni...</translation>
     </message>
+    <message>
+        <source>Modify configuration options for %1</source>
+        <translation>Modifica le opzioni di configurazione per %1</translation>
+    </message>
     <message>
         <source>&amp;Encrypt Wallet...</source>
         <translation>&amp;Cifra il portamonete...</translation>
@@ -254,6 +393,14 @@
         <source>%n active connection(s) to Bitcoin network</source>
         <translation><numerusform>%n connessione attiva alla rete Bitcoin</numerusform><numerusform>%n connessioni alla rete Bitcoin attive</numerusform></translation>
     </message>
+    <message>
+        <source>Indexing blocks on disk...</source>
+        <translation>Indicizzando i blocchi su disco...</translation>
+    </message>
+    <message>
+        <source>Processing blocks on disk...</source>
+        <translation>Processando i blocchi su disco...</translation>
+    </message>
     <message>
         <source>No block source available...</source>
         <translation>Nessuna fonte di blocchi disponibile...</translation>
@@ -262,26 +409,6 @@
         <source>Processed %n block(s) of transaction history.</source>
         <translation><numerusform>Elaborato %n blocco dello storico transazioni.</numerusform><numerusform>Elaborati %n blocchi dello storico transazioni.</numerusform></translation>
     </message>
-    <message numerus="yes">
-        <source>%n hour(s)</source>
-        <translation><numerusform>%n ora</numerusform><numerusform>%n ore</numerusform></translation>
-    </message>
-    <message numerus="yes">
-        <source>%n day(s)</source>
-        <translation><numerusform>%n giorno</numerusform><numerusform>%n giorni</numerusform></translation>
-    </message>
-    <message numerus="yes">
-        <source>%n week(s)</source>
-        <translation><numerusform>%n settimana</numerusform><numerusform>%n settimane</numerusform></translation>
-    </message>
-    <message>
-        <source>%1 and %2</source>
-        <translation>%1 e %2</translation>
-    </message>
-    <message numerus="yes">
-        <source>%n year(s)</source>
-        <translation><numerusform>%n anno</numerusform><numerusform>%n anni</numerusform></translation>
-    </message>
     <message>
         <source>%1 behind</source>
         <translation>Indietro di %1</translation>
@@ -310,6 +437,14 @@
         <source>Up to date</source>
         <translation>Aggiornato</translation>
     </message>
+    <message>
+        <source>Show the %1 help message to get a list with possible Bitcoin command-line options</source>
+        <translation>Mostra il messaggio di aiuto di %1 per ottenere una lista di opzioni di comando per Bitcoin </translation>
+    </message>
+    <message>
+        <source>%1 client</source>
+        <translation>%1 client</translation>
+    </message>
     <message>
         <source>Catching up...</source>
         <translation>In aggiornamento...</translation>
@@ -360,7 +495,7 @@
         <source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;locked&lt;/b&gt;</source>
         <translation>Il portamonete è &lt;b&gt;cifrato&lt;/b&gt; ed attualmente &lt;b&gt;bloccato&lt;/b&gt;</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>CoinControlDialog</name>
     <message>
@@ -379,10 +514,6 @@
         <source>Amount:</source>
         <translation>Importo:</translation>
     </message>
-    <message>
-        <source>Priority:</source>
-        <translation>Priorità:</translation>
-    </message>
     <message>
         <source>Fee:</source>
         <translation>Commissione:</translation>
@@ -436,10 +567,10 @@
         <translation>Confermato</translation>
     </message>
     <message>
-        <source>Priority</source>
-        <translation>Priorità</translation>
+        <source>(no label)</source>
+        <translation>(nessuna etichetta)</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>EditAddressDialog</name>
     <message>
@@ -462,7 +593,7 @@
         <source>&amp;Address</source>
         <translation>&amp;Indirizzo</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>FreespaceChecker</name>
     <message>
@@ -496,6 +627,10 @@
         <source>(%1-bit)</source>
         <translation>(%1-bit)</translation>
     </message>
+    <message>
+        <source>About %1</source>
+        <translation>Informazioni %1</translation>
+    </message>
     <message>
         <source>Command-line options</source>
         <translation>Opzioni della riga di comando</translation>
@@ -532,13 +667,29 @@
         <source>Show splash screen on startup (default: %u)</source>
         <translation>Mostra schermata iniziale all'avvio (default: %u)</translation>
     </message>
-    </context>
+    <message>
+        <source>Reset all settings changed in the GUI</source>
+        <translation>Reimposta tutti i campi dell'interfaccia grafica</translation>
+    </message>
+</context>
 <context>
     <name>Intro</name>
     <message>
         <source>Welcome</source>
         <translation>Benvenuto</translation>
     </message>
+    <message>
+        <source>Welcome to %1.</source>
+        <translation>Benvenuto su %1.</translation>
+    </message>
+    <message>
+        <source>As this is the first time the program is launched, you can choose where %1 will store its data.</source>
+        <translation>Dato che questa è la prima volta che il programma viene lanciato, puoi scegliere dove %1 salverà i suoi dati.</translation>
+    </message>
+    <message>
+        <source>%1 will download and store a copy of the Bitcoin block chain. At least %2GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source>
+        <translation>%1 scaricherà e salverà una copia della Blockchain di Bitcoin. Saranno salvati almeno %2GB di dati in questo percorso e continueranno ad aumentare col tempo. Anche il portafoglio verrà salvato in questo percorso.</translation>
+    </message>
     <message>
         <source>Use the default data directory</source>
         <translation>Usa la cartella dati predefinita</translation>
@@ -564,6 +715,21 @@
         <translation><numerusform>(di %nGB richiesti)</numerusform><numerusform>(%n GB richiesti)</numerusform></translation>
     </message>
 </context>
+<context>
+    <name>ModalOverlay</name>
+    <message>
+        <source>Form</source>
+        <translation>Modulo</translation>
+    </message>
+    <message>
+        <source>Last block time</source>
+        <translation>Ora del blocco più recente</translation>
+    </message>
+    <message>
+        <source>Hide</source>
+        <translation>Nascondi</translation>
+    </message>
+    </context>
 <context>
     <name>OpenURIDialog</name>
     <message>
@@ -582,7 +748,7 @@
         <source>Select payment request file</source>
         <translation>Seleziona il file di richiesta di pagamento</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>OptionsDialog</name>
     <message>
@@ -593,6 +759,14 @@
         <source>&amp;Main</source>
         <translation>&amp;Principale</translation>
     </message>
+    <message>
+        <source>Automatically start %1 after logging in to the system.</source>
+        <translation>Avvia automaticamente %1 una volta effettuato l'accesso al sistema.</translation>
+    </message>
+    <message>
+        <source>&amp;Start %1 on system login</source>
+        <translation>&amp;Start %1 all'accesso al sistema</translation>
+    </message>
     <message>
         <source>Size of &amp;database cache</source>
         <translation>Dimensione della cache del &amp;database.</translation>
@@ -730,6 +904,14 @@ Per specificare più URL separarli con una barra verticale "|".</translation>
         <source>&amp;Window</source>
         <translation>&amp;Finestra</translation>
     </message>
+    <message>
+        <source>&amp;Hide the icon from the system tray.</source>
+        <translation>&amp;Nascondi l'icona nella barra delle applicazioni.</translation>
+    </message>
+    <message>
+        <source>Hide tray icon</source>
+        <translation>Nascondi l'icona della barra applicazioni</translation>
+    </message>
     <message>
         <source>Show only a tray icon after minimizing the window.</source>
         <translation>Mostra solo nella tray bar quando si riduce ad icona.</translation>
@@ -750,6 +932,10 @@ Per specificare più URL separarli con una barra verticale "|".</translation>
         <source>User Interface &amp;language:</source>
         <translation>&amp;Lingua Interfaccia Utente:</translation>
     </message>
+    <message>
+        <source>The user interface language can be set here. This setting will take effect after restarting %1.</source>
+        <translation>La lingua dell'interfaccia utente può essere impostata qui. L'impostazione avrà effetto dopo il riavvio %1.</translation>
+    </message>
     <message>
         <source>&amp;Unit to show amounts in:</source>
         <translation>&amp;Unità di misura con cui visualizzare gli importi:</translation>
@@ -874,6 +1060,9 @@ Per specificare più URL separarli con una barra verticale "|".</translation>
         <translation>Saldo corrente totale negli indirizzi di sola lettura</translation>
     </message>
 </context>
+<context>
+    <name>PaymentServer</name>
+    </context>
 <context>
     <name>PeerTableModel</name>
     <message>
@@ -884,11 +1073,7 @@ Per specificare più URL separarli con una barra verticale "|".</translation>
         <source>Node/Service</source>
         <translation>Nodo/Servizio</translation>
     </message>
-    <message>
-        <source>Ping Time</source>
-        <translation>Tempo di ping</translation>
-    </message>
-</context>
+    </context>
 <context>
     <name>QObject</name>
     <message>
@@ -927,7 +1112,17 @@ Per specificare più URL separarli con una barra verticale "|".</translation>
         <source>%1 ms</source>
         <translation>%1 ms</translation>
     </message>
-</context>
+    <message>
+        <source>%1 and %2</source>
+        <translation>%1 e %2</translation>
+    </message>
+    </context>
+<context>
+    <name>QObject::QObject</name>
+    </context>
+<context>
+    <name>QRImageWidget</name>
+    </context>
 <context>
     <name>RPCConsole</name>
     <message>
@@ -954,6 +1149,10 @@ Per specificare più URL separarli con una barra verticale "|".</translation>
         <source>Using BerkeleyDB version</source>
         <translation>Versione BerkeleyDB in uso</translation>
     </message>
+    <message>
+        <source>Datadir</source>
+        <translation>Datadir</translation>
+    </message>
     <message>
         <source>Startup time</source>
         <translation>Ora di avvio</translation>
@@ -1038,6 +1237,18 @@ Per specificare più URL separarli con una barra verticale "|".</translation>
         <source>User Agent</source>
         <translation>User Agent</translation>
     </message>
+    <message>
+        <source>Open the %1 debug log file from the current data directory. This can take a few seconds for large log files.</source>
+        <translation>Apri il file log del debug di %1 dalla cartella dati attuale. Può richiedere alcuni secondi per file di log di grandi dimensioni.</translation>
+    </message>
+    <message>
+        <source>Decrease font size</source>
+        <translation>Riduci dimensioni font.</translation>
+    </message>
+    <message>
+        <source>Increase font size</source>
+        <translation>Aumenta dimensioni font</translation>
+    </message>
     <message>
         <source>Services</source>
         <translation>Servizi</translation>
@@ -1114,14 +1325,6 @@ Per specificare più URL separarli con una barra verticale "|".</translation>
         <source>Clear console</source>
         <translation>Cancella console</translation>
     </message>
-    <message>
-        <source>&amp;Disconnect Node</source>
-        <translation>&amp;Nodo Disconnesso</translation>
-    </message>
-    <message>
-        <source>Ban Node for</source>
-        <translation>Nodo Bannato perché</translation>
-    </message>
     <message>
         <source>1 &amp;hour</source>
         <translation>1 &amp;ora</translation>
@@ -1139,8 +1342,8 @@ Per specificare più URL separarli con una barra verticale "|".</translation>
         <translation>1 &amp;anno</translation>
     </message>
     <message>
-        <source>&amp;Unban Node</source>
-        <translation>&amp;Elimina Ban Nodo</translation>
+        <source>Welcome to the %1 RPC console.</source>
+        <translation>Benvenuto nella console RPC di %1.</translation>
     </message>
     <message>
         <source>Use up and down arrows to navigate history, and &lt;b&gt;Ctrl-L&lt;/b&gt; to clear screen.</source>
@@ -1269,7 +1472,7 @@ Per specificare più URL separarli con una barra verticale "|".</translation>
         <source>Remove</source>
         <translation>Rimuovi</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>ReceiveRequestDialog</name>
     <message>
@@ -1288,7 +1491,26 @@ Per specificare più URL separarli con una barra verticale "|".</translation>
         <source>&amp;Save Image...</source>
         <translation>&amp;Salva Immagine...</translation>
     </message>
-</context>
+    <message>
+        <source>Address</source>
+        <translation>Indirizzo</translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation>Etichetta</translation>
+    </message>
+    </context>
+<context>
+    <name>RecentRequestsTableModel</name>
+    <message>
+        <source>Label</source>
+        <translation>Etichetta</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(nessuna etichetta)</translation>
+    </message>
+    </context>
 <context>
     <name>SendCoinsDialog</name>
     <message>
@@ -1323,10 +1545,6 @@ Per specificare più URL separarli con una barra verticale "|".</translation>
         <source>Amount:</source>
         <translation>Importo:</translation>
     </message>
-    <message>
-        <source>Priority:</source>
-        <translation>Priorità:</translation>
-    </message>
     <message>
         <source>Fee:</source>
         <translation>Commissione:</translation>
@@ -1395,10 +1613,6 @@ Per specificare più URL separarli con una barra verticale "|".</translation>
         <source>(Smart fee not initialized yet. This usually takes a few blocks...)</source>
         <translation>(Commissione intelligente non ancora inizializzata. Normalmente richiede un'attesa di alcuni blocchi...)</translation>
     </message>
-    <message>
-        <source>Confirmation time:</source>
-        <translation>Tempo di conferma:</translation>
-    </message>
     <message>
         <source>normal</source>
         <translation>normale</translation>
@@ -1439,6 +1653,10 @@ Per specificare più URL separarli con una barra verticale "|".</translation>
         <source>S&amp;end</source>
         <translation>&amp;Invia</translation>
     </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(nessuna etichetta)</translation>
+    </message>
 </context>
 <context>
     <name>SendCoinsEntry</name>
@@ -1518,9 +1736,16 @@ Per specificare più URL separarli con una barra verticale "|".</translation>
         <source>Memo:</source>
         <translation>Memo:</translation>
     </message>
-</context>
+    </context>
+<context>
+    <name>SendConfirmationDialog</name>
+    </context>
 <context>
     <name>ShutdownWindow</name>
+    <message>
+        <source>%1 is shutting down...</source>
+        <translation>Arresto di %1 in corso...</translation>
+    </message>
     <message>
         <source>Do not shut down the computer until this window disappears.</source>
         <translation>Non spegnere il computer fino a quando questa finestra non si sarà chiusa.</translation>
@@ -1612,7 +1837,7 @@ Per specificare più URL separarli con una barra verticale "|".</translation>
         <source>Reset all verify message fields</source>
         <translation>Reimposta tutti i campi della verifica messaggio</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>SplashScreen</name>
     <message>
@@ -1627,13 +1852,46 @@ Per specificare più URL separarli con una barra verticale "|".</translation>
         <translation>KB/s</translation>
     </message>
 </context>
+<context>
+    <name>TransactionDesc</name>
+    </context>
 <context>
     <name>TransactionDescDialog</name>
     <message>
         <source>This pane shows a detailed description of the transaction</source>
         <translation>Questo pannello mostra una descrizione dettagliata della transazione</translation>
     </message>
-</context>
+    </context>
+<context>
+    <name>TransactionTableModel</name>
+    <message>
+        <source>Label</source>
+        <translation>Etichetta</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(nessuna etichetta)</translation>
+    </message>
+    </context>
+<context>
+    <name>TransactionView</name>
+    <message>
+        <source>Comma separated file (*.csv)</source>
+        <translation>Testo CSV (*.csv)</translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation>Etichetta</translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation>Indirizzo</translation>
+    </message>
+    <message>
+        <source>Exporting Failed</source>
+        <translation>Esportazione Fallita</translation>
+    </message>
+    </context>
 <context>
     <name>UnitDisplayStatusBarControl</name>
     <message>
@@ -1641,6 +1899,15 @@ Per specificare più URL separarli con una barra verticale "|".</translation>
         <translation>Unità con cui visualizzare gli importi. Clicca per selezionare un'altra unità.</translation>
     </message>
 </context>
+<context>
+    <name>WalletFrame</name>
+    </context>
+<context>
+    <name>WalletModel</name>
+    </context>
+<context>
+    <name>WalletView</name>
+    </context>
 <context>
     <name>bitcoin-core</name>
     <message>
@@ -1703,30 +1970,62 @@ Per specificare più URL separarli con una barra verticale "|".</translation>
         <source>Unable to start HTTP server. See debug log for details.</source>
         <translation>Impossibile avviare il server HTTP. Dettagli nel log di debug.</translation>
     </message>
-    <message>
-        <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
-        <translation>Accetta connessioni dall'esterno (predefinito: 1 se -proxy o -connect non sono utilizzati)</translation>
-    </message>
     <message>
         <source>Bitcoin Core</source>
         <translation>Bitcoin Core</translation>
     </message>
+    <message>
+        <source>The %s developers</source>
+        <translation>Sviluppatori di %s</translation>
+    </message>
+    <message>
+        <source>A fee rate (in %s/kB) that will be used when fee estimation has insufficient data (default: %s)</source>
+        <translation>Un importo (in %s/kB) che sarà utilizzato quando la stima delle commissioni non ha abbastanza dati (default: %s)</translation>
+    </message>
+    <message>
+        <source>Accept relayed transactions received from whitelisted peers even when not relaying transactions (default: %d)</source>
+        <translation>Accetta le transazioni trasmesse ricevute da peers in whitelist anche se non si stanno trasmettendo transazioni (default: %d)</translation>
+    </message>
     <message>
         <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source>
         <translation>Associa all'indirizzo indicato e resta permanentemente in ascolto su di esso. Usa la notazione [host]:porta per l'IPv6</translation>
     </message>
+    <message>
+        <source>Cannot obtain a lock on data directory %s. %s is probably already running.</source>
+        <translation>Non è possibile ottenere i dati sulla cartella %s. Probabilmente %s è già in esecuzione.</translation>
+    </message>
     <message>
         <source>Delete all wallet transactions and only recover those parts of the blockchain through -rescan on startup</source>
         <translation>Elimina tutte le transazioni dal portamonete e recupera solo quelle che fanno parte della blockchain attraverso il comando -rescan all'avvio.</translation>
     </message>
     <message>
-        <source>Distributed under the MIT software license, see the accompanying file COPYING or &lt;http://www.opensource.org/licenses/mit-license.php&gt;.</source>
-        <translation>Distribuito secondo la licenza software MIT, vedi il file COPYING incluso oppure &lt;http://www.opensource.org/licenses/mit-license.php&gt;.</translation>
+        <source>Error loading %s: You can't enable HD on a already existing non-HD wallet</source>
+        <translation>Errore caricamento %s: Non puoi abilitare HD in un portafoglio non-HD già esistente</translation>
+    </message>
+    <message>
+        <source>Error reading %s! All keys read correctly, but transaction data or address book entries might be missing or incorrect.</source>
+        <translation>Errore lettura %s! Tutte le chiavi sono state lette correttamente, ma i dati delle transazioni o della rubrica potrebbero essere mancanti o non corretti.</translation>
     </message>
     <message>
         <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source>
         <translation>Esegue un comando quando lo stato di una transazione del portamonete cambia (%s in cmd è sostituito da TxID)</translation>
     </message>
+    <message>
+        <source>Maximum allowed median peer time offset adjustment. Local perspective of time may be influenced by peers forward or backward by this amount. (default: %u seconds)</source>
+        <translation>Regolazione della massima differenza media di tempo dei peer consentita. L'impostazione dell'orario locale può essere impostata in avanti o indietro di questa quantità. (default %u secondi)</translation>
+    </message>
+    <message>
+        <source>Maximum total fees (in %s) to use in a single wallet transaction or raw transaction; setting this too low may abort large transactions (default: %s)</source>
+        <translation>Totale massimo di commissioni (in %s) da usare in una transazione singola o di gruppo del wallet; valori troppo bassi possono abortire grandi transazioni (default: %s)</translation>
+    </message>
+    <message>
+        <source>Please check that your computer's date and time are correct! If your clock is wrong, %s will not work properly.</source>
+        <translation>Per favore controllate che la data del computer e l'ora siano corrette! Se il vostro orologio è sbagliato %s non funzionerà correttamente.</translation>
+    </message>
+    <message>
+        <source>Please contribute if you find %s useful. Visit %s for further information about the software.</source>
+        <translation>Per favore contribuite se ritenete %s utile. Visitate %s per maggiori informazioni riguardo il software.</translation>
+    </message>
     <message>
         <source>Set the number of script verification threads (%u to %d, 0 = auto, &lt;0 = leave that many cores free, default: %d)</source>
         <translation>Imposta il numero di thread per la verifica degli script (da %u a %d, 0 = automatico, &lt;0 = lascia questo numero di core liberi, predefinito: %d)</translation>
@@ -1736,24 +2035,20 @@ Per specificare più URL separarli con una barra verticale "|".</translation>
         <translation>Il database dei blocchi contiene un blocco che sembra provenire dal futuro. Questo può essere dovuto alla data e ora del tuo computer impostate in modo scorretto. Ricostruisci il database dei blocchi se sei certo che la data e l'ora sul tuo computer siano corrette</translation>
     </message>
     <message>
-        <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
-        <translation>Questa versione è una compilazione pre-rilascio - usala a tuo rischio - non utilizzarla per la generazione o per applicazioni di commercio</translation>
+        <source>Unable to rewind the database to a pre-fork state. You will need to redownload the blockchain</source>
+        <translation>Impossibile riportare il database ad un livello pre-fork. Dovrai riscaricare tutta la blockchain</translation>
     </message>
     <message>
         <source>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</source>
         <translation>Utilizza UPnP per mappare la porta in ascolto (default: 1 quando in ascolto e -proxy non è specificato)</translation>
     </message>
     <message>
-        <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source>
-        <translation>Attenzione: La rete non sembra trovarsi in pieno consenso! Alcuni minatori sembrano riscontrare problemi.</translation>
-    </message>
-    <message>
-        <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source>
-        <translation>Attenzione: Sembra che non vi sia pieno consenso con i nostri peer! Un aggiornamento da parte tua o degli altri nodi potrebbe essere necessario.</translation>
+        <source>You need to rebuild the database using -reindex-chainstate to change -txindex</source>
+        <translation>È necessario ricostruire il database usando -reindex per cambiare -txindex</translation>
     </message>
     <message>
-        <source>Whitelist peers connecting from the given netmask or IP address. Can be specified multiple times.</source>
-        <translation>Inserisce in whitelist i peer che si connettono da un dato indirizzo IP o netmask. Può essere specificato più volte.</translation>
+        <source>%s corrupt, salvage failed</source>
+        <translation>%s corrotto, recupero fallito</translation>
     </message>
     <message>
         <source>-maxmempool must be at least %d MB</source>
@@ -1763,18 +2058,34 @@ Per specificare più URL separarli con una barra verticale "|".</translation>
         <source>&lt;category&gt; can be:</source>
         <translation>Valori possibili per &lt;category&gt;:</translation>
     </message>
+    <message>
+        <source>Append comment to the user agent string</source>
+        <translation>Aggiungi commento alla stringa dell'applicazione utente</translation>
+    </message>
+    <message>
+        <source>Attempt to recover private keys from a corrupt wallet on startup</source>
+        <translation>Prova a recuperare le chiavi private da un portafoglio corrotto all'avvio</translation>
+    </message>
     <message>
         <source>Block creation options:</source>
         <translation>Opzioni creazione blocco:</translation>
     </message>
     <message>
-        <source>Connect only to the specified node(s)</source>
-        <translation>Connessione ai soli nodi specificati</translation>
+        <source>Cannot resolve -%s address: '%s'</source>
+        <translation>Impossobile risolvere l'indirizzo -%s: '%s'</translation>
+    </message>
+    <message>
+        <source>Change index out of range</source>
+        <translation>Cambio indice fuori paramentro</translation>
     </message>
     <message>
         <source>Connection options:</source>
         <translation>Opzioni di connessione:</translation>
     </message>
+    <message>
+        <source>Copyright (C) %i-%i</source>
+        <translation>Copyright (C) %i-%i</translation>
+    </message>
     <message>
         <source>Corrupted block database detected</source>
         <translation>Rilevato database blocchi corrotto</translation>
@@ -1807,6 +2118,10 @@ Per specificare più URL separarli con una barra verticale "|".</translation>
         <source>Enable publish raw transaction in &lt;address&gt;</source>
         <translation>Abilita pubblicazione transazione raw in &lt;address&gt;</translation>
     </message>
+    <message>
+        <source>Enable transaction replacement in the memory pool (default: %u)</source>
+        <translation>Abilita la sostituzione della transazione nel pool della memoria (default: %u)</translation>
+    </message>
     <message>
         <source>Error initializing block database</source>
         <translation>Errore durante l'inizializzazione del database dei blocchi</translation>
@@ -1815,6 +2130,22 @@ Per specificare più URL separarli con una barra verticale "|".</translation>
         <source>Error initializing wallet database environment %s!</source>
         <translation>Errore durante l'inizializzazione dell'ambiente del database del portamonete %s!</translation>
     </message>
+    <message>
+        <source>Error loading %s</source>
+        <translation>Errore caricamento %s</translation>
+    </message>
+    <message>
+        <source>Error loading %s: Wallet corrupted</source>
+        <translation>Errore caricamento %s: Portafoglio corrotto</translation>
+    </message>
+    <message>
+        <source>Error loading %s: Wallet requires newer version of %s</source>
+        <translation>Errore caricamento %s: il Portafoglio richiede una versione aggiornata di %s</translation>
+    </message>
+    <message>
+        <source>Error loading %s: You can't disable HD on a already existing HD wallet</source>
+        <translation>Errore caricamento %s: Non puoi disabilitare HD in un portafoglio HD già esistente</translation>
+    </message>
     <message>
         <source>Error loading block database</source>
         <translation>Errore durante il caricamento del database blocchi</translation>
@@ -1839,14 +2170,34 @@ Per specificare più URL separarli con una barra verticale "|".</translation>
         <source>Incorrect or no genesis block found. Wrong datadir for network?</source>
         <translation>Blocco genesi non corretto o non trovato. È possibile che la cartella dati appartenga ad un'altra rete.</translation>
     </message>
+    <message>
+        <source>Initialization sanity check failed. %s is shutting down.</source>
+        <translation>Test di integrità iniziale fallito. %s si arresterà.</translation>
+    </message>
     <message>
         <source>Invalid -onion address: '%s'</source>
         <translation>Indirizzo -onion non valido: '%s'</translation>
     </message>
+    <message>
+        <source>Invalid amount for -%s=&lt;amount&gt;: '%s'</source>
+        <translation>Importo non valido per -%s=&lt;amount&gt;: '%s'</translation>
+    </message>
+    <message>
+        <source>Invalid amount for -fallbackfee=&lt;amount&gt;: '%s'</source>
+        <translation>Importo non valido per -fallbackfee=&lt;amount&gt;: '%s'</translation>
+    </message>
     <message>
         <source>Keep the transaction memory pool below &lt;n&gt; megabytes (default: %u)</source>
         <translation>Mantieni la memory pool delle transazioni al di sotto di &lt;n&gt; megabytes (default: %u)</translation>
     </message>
+    <message>
+        <source>Loading banlist...</source>
+        <translation>Caricamento bloccati...</translation>
+    </message>
+    <message>
+        <source>Location of the auth cookie (default: data dir)</source>
+        <translation>Posizione del cookie di aiutorizzazione (default: data dir)</translation>
+    </message>
     <message>
         <source>Not enough file descriptors available.</source>
         <translation>Non ci sono abbastanza descrittori di file disponibili.</translation>
@@ -1855,6 +2206,14 @@ Per specificare più URL separarli con una barra verticale "|".</translation>
         <source>Only connect to nodes in network &lt;net&gt; (ipv4, ipv6 or onion)</source>
         <translation>Connessione ai soli nodi appartenenti alla rete &lt;net&gt; (ipv4, ipv6 o Tor)</translation>
     </message>
+    <message>
+        <source>Print this help message and exit</source>
+        <translation>Mostra questo messaggio di aiuto ed esci</translation>
+    </message>
+    <message>
+        <source>Print version and exit</source>
+        <translation>Mostra la versione ed esci</translation>
+    </message>
     <message>
         <source>Prune cannot be configured with a negative value.</source>
         <translation>La modalità prune non può essere configurata con un valore negativo.</translation>
@@ -1863,6 +2222,18 @@ Per specificare più URL separarli con una barra verticale "|".</translation>
         <source>Prune mode is incompatible with -txindex.</source>
         <translation>La modalità prune è incompatibile con l'opzione -txindex.</translation>
     </message>
+    <message>
+        <source>Rebuild chain state and block index from the blk*.dat files on disk</source>
+        <translation>Ricostruisci lo stato della catena e l'indice dei blocchi partendo dai file blk*.dat presenti sul disco</translation>
+    </message>
+    <message>
+        <source>Rebuild chain state from the currently indexed blocks</source>
+        <translation>Ricrea l'indice della catena dei blocchi partendo da quelli già indicizzati</translation>
+    </message>
+    <message>
+        <source>Rewinding blocks...</source>
+        <translation>Verifica blocchi...</translation>
+    </message>
     <message>
         <source>Set database cache size in megabytes (%d to %d, default: %d)</source>
         <translation>Imposta la dimensione della cache del database in megabyte (%d a %d, predefinito: %d)</translation>
@@ -1875,6 +2246,14 @@ Per specificare più URL separarli con una barra verticale "|".</translation>
         <source>Specify wallet file (within data directory)</source>
         <translation>Specifica il file del portamonete (all'interno della cartella dati)</translation>
     </message>
+    <message>
+        <source>The source code is available from %s.</source>
+        <translation>Il codice sorgente è disponibile in %s</translation>
+    </message>
+    <message>
+        <source>Unable to bind to %s on this computer. %s is probably already running.</source>
+        <translation>Impossibile collegarsi a %s su questo computer. Probabilmente %s è già in esecuzione.</translation>
+    </message>
     <message>
         <source>Unsupported argument -benchmark ignored, use -debug=bench.</source>
         <translation>Ignorata opzione -benchmark non supportata, utilizzare -debug=bench.</translation>
@@ -1907,6 +2286,14 @@ Per specificare più URL separarli con una barra verticale "|".</translation>
         <source>Wallet %s resides outside data directory %s</source>
         <translation>Il portamonete %s si trova al di fuori dalla cartella dati %s</translation>
     </message>
+    <message>
+        <source>Wallet debugging/testing options:</source>
+        <translation>Opzioni di Debug/Test del portafoglio:</translation>
+    </message>
+    <message>
+        <source>Wallet needed to be rewritten: restart %s to complete</source>
+        <translation>Il portamonete necessita di essere riscritto: riavviare %s per completare</translation>
+    </message>
     <message>
         <source>Wallet options:</source>
         <translation>Opzioni portamonete:</translation>
@@ -1955,10 +2342,6 @@ Per specificare più URL separarli con una barra verticale "|".</translation>
         <source>Maximum size of data in data carrier transactions we relay and mine (default: %u)</source>
         <translation>Dimensione massima dei dati in transazioni di trasporto dati che saranno trasmesse ed incluse nei blocchi (predefinito: %u)</translation>
     </message>
-    <message>
-        <source>Query for peer addresses via DNS lookup, if low on addresses (default: 1 unless -connect)</source>
-        <translation>Ottiene gli indirizzi dei peer attraverso interrogazioni DNS, in caso di scarsa disponibilità (predefinito: 1 a meno che -connect non sia specificato)</translation>
-    </message>
     <message>
         <source>Randomize credentials for every proxy connection. This enables Tor stream isolation (default: %u)</source>
         <translation>Randomizza le credenziali per ogni connessione proxy. Permette la Tor stream isolation (predefinito: %u)</translation>
@@ -1972,8 +2355,8 @@ Per specificare più URL separarli con una barra verticale "|".</translation>
         <translation>L'importo della transazione risulta troppo basso per l'invio una volta dedotte le commissioni.</translation>
     </message>
     <message>
-        <source>This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit &lt;https://www.openssl.org/&gt; and cryptographic software written by Eric Young and UPnP software written by Thomas Bernard.</source>
-        <translation>Questo prodotto include software sviluppato dal progetto OpenSSL per l'uso del Toolkit OpenSSL &lt;https://www.openssl.org/&gt;, software crittografico scritto da Eric Young e software UPnP scritto da Thomas Bernard.</translation>
+        <source>Use hierarchical deterministic key generation (HD) after BIP32. Only has effect during wallet creation/first start</source>
+        <translation>Usa la generazione gerarchica deterministica (HD) della chiave dopo BIP32. Valido solamente durante la creazione del portafoglio o al primo avvio</translation>
     </message>
     <message>
         <source>Whitelisted peers cannot be DoS banned and their transactions are always relayed, even if they are already in the mempool, useful e.g. for a gateway</source>
@@ -2083,10 +2466,6 @@ Per specificare più URL separarli con una barra verticale "|".</translation>
         <source>Transaction amount too small</source>
         <translation>Importo transazione troppo piccolo</translation>
     </message>
-    <message>
-        <source>Transaction amounts must be positive</source>
-        <translation>Gli importi della transazione devono essere positivi</translation>
-    </message>
     <message>
         <source>Transaction too large for fee policy</source>
         <translation>Transazione troppo grande in base alla policy sulle commissioni</translation>
@@ -2111,6 +2490,10 @@ Per specificare più URL separarli con una barra verticale "|".</translation>
         <source>Warning</source>
         <translation>Attenzione</translation>
     </message>
+    <message>
+        <source>Warning: unknown new rules activated (versionbit %i)</source>
+        <translation>Attenzione: nuove regole non conosciute attivate (versionbit %i)</translation>
+    </message>
     <message>
         <source>Whether to operate in a blocks only mode (default: %u)</source>
         <translation>Imposta se operare in modalità solo blocchi (default: %u)</translation>
@@ -2147,14 +2530,14 @@ Per specificare più URL separarli con una barra verticale "|".</translation>
         <source>-maxtxfee is set very high! Fees this large could be paid on a single transaction.</source>
         <translation>-maxtxfee è impostato molto alto! Commissioni così alte possono venir pagate anche su una singola transazione.</translation>
     </message>
-    <message>
-        <source>-paytxfee is set very high! This is the transaction fee you will pay if you send a transaction.</source>
-        <translation>-paytxfee è impostato su un valore molto elevato. Questa è la commissione che si paga quando si invia una transazione.</translation>
-    </message>
     <message>
         <source>Do not keep transactions in the mempool longer than &lt;n&gt; hours (default: %u)</source>
         <translation>Non mantenere le transazioni nella mempool più a lungo di &lt;n&gt; ore (default: %u)</translation>
     </message>
+    <message>
+        <source>Equivalent bytes per sigop in transactions for relay and mining (default: %u)</source>
+        <translation>Byte equivalenti per ottimizzazione segnale dedicati a ritrasmissione ed estrazione (default: %u)</translation>
+    </message>
     <message>
         <source>Fees (in %s/kB) smaller than this are considered zero fee for transaction creation (default: %s)</source>
         <translation>Le commissioni (in %s/kB) inferiori a questo valore sono considerate pari a zero per la creazione della transazione (default: %s)</translation>
@@ -2191,6 +2574,10 @@ Per specificare più URL separarli con una barra verticale "|".</translation>
         <source>Unsupported argument -socks found. Setting SOCKS version isn't possible anymore, only SOCKS5 proxies are supported.</source>
         <translation>Argomento -socks non supportato. Non è più possibile impostare la versione SOCKS, solamente i proxy SOCKS5 sono supportati.</translation>
     </message>
+    <message>
+        <source>Unsupported argument -whitelistalwaysrelay ignored, use -whitelistrelay and/or -whitelistforcerelay.</source>
+        <translation>Argomento non supportato -whitelistalwaysrelay è stato ignorato, utilizzare -whitelistrelay e/o -whitelistforcerelay.</translation>
+    </message>
     <message>
         <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: %s)</source>
         <translation>Usa un proxy SOCKS5 a parte per raggiungere i peer attraverso gli hidden services di Tor (predefinito: %s)</translation>
@@ -2199,6 +2586,14 @@ Per specificare più URL separarli con una barra verticale "|".</translation>
         <source>Username and hashed password for JSON-RPC connections. The field &lt;userpw&gt; comes in the format: &lt;USERNAME&gt;:&lt;SALT&gt;$&lt;HASH&gt;. A canonical python script is included in share/rpcuser. This option can be specified multiple times</source>
         <translation>Username e hash password per connessioni JSON-RPC. Il campo &lt;userpw&gt; utilizza il formato: &lt;USERNAME&gt;:&lt;SALT&gt;$&lt;HASH&gt;. Uno script python standard è incluso in share/rpcuser. Questa opzione può essere specificata più volte</translation>
     </message>
+    <message>
+        <source>Warning: Unknown block versions being mined! It's possible unknown rules are in effect</source>
+        <translation>Attenzione: si stanno minando versioni sconocsiute di blocchi! E' possibile che siano attive regole sconosciute</translation>
+    </message>
+    <message>
+        <source>Warning: Wallet file corrupt, data salvaged! Original %s saved as %s in %s; if your balance or transactions are incorrect you should restore from a backup.</source>
+        <translation>Attenzione: file del Portafoglio corrotto, dati recuperati! %s originale salvato come %s in %s; se il saldo o le transazioni non sono corrette effettua un ripristino da un backup.</translation>
+    </message>
     <message>
         <source>(default: %s)</source>
         <translation>(predefinito: %s)</translation>
@@ -2260,8 +2655,8 @@ Per specificare più URL separarli con una barra verticale "|".</translation>
         <translation>Imposta la dimensione del pool di chiavi a &lt;n&gt; (predefinito: %u)</translation>
     </message>
     <message>
-        <source>Set minimum block size in bytes (default: %u)</source>
-        <translation>Imposta la dimensione minima del blocco in byte (predefinito: %u)</translation>
+        <source>Set maximum BIP141 block weight (default: %d)</source>
+        <translation>Imposta la dimensione massima del blocco BIP141 (default: %d)</translation>
     </message>
     <message>
         <source>Set the number of threads to service RPC calls (default: %d)</source>
diff --git a/src/qt/locale/bitcoin_it_IT.ts b/src/qt/locale/bitcoin_it_IT.ts
index f89f4bdc48d11..09d40497fa73a 100644
--- a/src/qt/locale/bitcoin_it_IT.ts
+++ b/src/qt/locale/bitcoin_it_IT.ts
@@ -41,7 +41,10 @@
         <source>&amp;Delete</source>
         <translation>Cancella</translation>
     </message>
-</context>
+    </context>
+<context>
+    <name>AddressTableModel</name>
+    </context>
 <context>
     <name>AskPassphraseDialog</name>
     <message>
@@ -56,9 +59,17 @@
         <source>Repeat new passphrase</source>
         <translation>Ripeti nuova passphrase</translation>
     </message>
+    <message>
+        <source>Warning: The Caps Lock key is on!</source>
+        <translation>Attenzione: Il tasto blocco delle maiuscole è attivo!</translation>
+    </message>
 </context>
 <context>
     <name>BanTableModel</name>
+    <message>
+        <source>IP/Netmask</source>
+        <translation>IP/Netmask</translation>
+    </message>
     <message>
         <source>Banned Until</source>
         <translation>bannato fino </translation>
@@ -86,6 +97,9 @@
 <context>
     <name>Intro</name>
     </context>
+<context>
+    <name>ModalOverlay</name>
+    </context>
 <context>
     <name>OpenURIDialog</name>
     </context>
@@ -95,12 +109,21 @@
 <context>
     <name>OverviewPage</name>
     </context>
+<context>
+    <name>PaymentServer</name>
+    </context>
 <context>
     <name>PeerTableModel</name>
     </context>
 <context>
     <name>QObject</name>
     </context>
+<context>
+    <name>QObject::QObject</name>
+    </context>
+<context>
+    <name>QRImageWidget</name>
+    </context>
 <context>
     <name>RPCConsole</name>
     </context>
@@ -110,12 +133,18 @@
 <context>
     <name>ReceiveRequestDialog</name>
     </context>
+<context>
+    <name>RecentRequestsTableModel</name>
+    </context>
 <context>
     <name>SendCoinsDialog</name>
     </context>
 <context>
     <name>SendCoinsEntry</name>
     </context>
+<context>
+    <name>SendConfirmationDialog</name>
+    </context>
 <context>
     <name>ShutdownWindow</name>
     </context>
@@ -128,12 +157,30 @@
 <context>
     <name>TrafficGraphWidget</name>
     </context>
+<context>
+    <name>TransactionDesc</name>
+    </context>
 <context>
     <name>TransactionDescDialog</name>
     </context>
+<context>
+    <name>TransactionTableModel</name>
+    </context>
+<context>
+    <name>TransactionView</name>
+    </context>
 <context>
     <name>UnitDisplayStatusBarControl</name>
     </context>
+<context>
+    <name>WalletFrame</name>
+    </context>
+<context>
+    <name>WalletModel</name>
+    </context>
+<context>
+    <name>WalletView</name>
+    </context>
 <context>
     <name>bitcoin-core</name>
     </context>
diff --git a/src/qt/locale/bitcoin_ja.ts b/src/qt/locale/bitcoin_ja.ts
index 4948cc30675e9..548fa26cc1185 100644
--- a/src/qt/locale/bitcoin_ja.ts
+++ b/src/qt/locale/bitcoin_ja.ts
@@ -41,6 +41,77 @@
         <source>&amp;Delete</source>
         <translation>削除(&amp;D)</translation>
     </message>
+    <message>
+        <source>Choose the address to send coins to</source>
+        <translation>先のアドレスを選択</translation>
+    </message>
+    <message>
+        <source>Choose the address to receive coins with</source>
+        <translation>支払いを受け取るアドレスを指定する</translation>
+    </message>
+    <message>
+        <source>C&amp;hoose</source>
+        <translation>選択 (&amp;C)</translation>
+    </message>
+    <message>
+        <source>Sending addresses</source>
+        <translation>送金用</translation>
+    </message>
+    <message>
+        <source>Receiving addresses</source>
+        <translation>受け取りアドレス</translation>
+    </message>
+    <message>
+        <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source>
+        <translation>これらは支払いを送信するためのあなたの Bitcoin アドレスです。コインを送信する前に、常に額と受信アドレスを確認してください。</translation>
+    </message>
+    <message>
+        <source>These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source>
+        <translation>これらは支払いを受け取るためのビットコインアドレスです。トランザクションごとに新しい受け取り用アドレスを作成することが推奨されます。</translation>
+    </message>
+    <message>
+        <source>&amp;Copy Address</source>
+        <translation>アドレスをコピー (&amp;C)</translation>
+    </message>
+    <message>
+        <source>Copy &amp;Label</source>
+        <translation>ラベルをコピー (&amp;L)</translation>
+    </message>
+    <message>
+        <source>&amp;Edit</source>
+        <translation>編集 (&amp;E)</translation>
+    </message>
+    <message>
+        <source>Export Address List</source>
+        <translation>アドレス帳をエクスポート</translation>
+    </message>
+    <message>
+        <source>Comma separated file (*.csv)</source>
+        <translation>テキスト CSV (*.csv)</translation>
+    </message>
+    <message>
+        <source>Exporting Failed</source>
+        <translation>エクスポートに失敗しました</translation>
+    </message>
+    <message>
+        <source>There was an error trying to save the address list to %1. Please try again.</source>
+        <translation>トランザクション履歴を %1 へ保存する際にエラーが発生しました。再試行してください。</translation>
+    </message>
+</context>
+<context>
+    <name>AddressTableModel</name>
+    <message>
+        <source>Label</source>
+        <translation>ラベル</translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation>アドレス</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(ラベル無し)</translation>
+    </message>
 </context>
 <context>
     <name>AskPassphraseDialog</name>
@@ -60,6 +131,94 @@
         <source>Repeat new passphrase</source>
         <translation>新しいパスフレーズをもう一度</translation>
     </message>
+    <message>
+        <source>Enter the new passphrase to the wallet.&lt;br/&gt;Please use a passphrase of &lt;b&gt;ten or more random characters&lt;/b&gt;, or &lt;b&gt;eight or more words&lt;/b&gt;.</source>
+        <translation>ウォレットの新しいパスフレーズを入力してください。&lt;br/&gt;&lt;b&gt;10文字以上のランダムな文字&lt;/b&gt;で構成されたものか、&lt;b&gt;8単語以上の単語&lt;/b&gt;で構成されたパスフレーズを使用してください。</translation>
+    </message>
+    <message>
+        <source>Encrypt wallet</source>
+        <translation>ウォレットを暗号化する</translation>
+    </message>
+    <message>
+        <source>This operation needs your wallet passphrase to unlock the wallet.</source>
+        <translation>この操作はウォレットをアンロックするためにパスフレーズが必要です。</translation>
+    </message>
+    <message>
+        <source>Unlock wallet</source>
+        <translation>ウォレットをアンロックする</translation>
+    </message>
+    <message>
+        <source>This operation needs your wallet passphrase to decrypt the wallet.</source>
+        <translation>この操作はウォレットの暗号化解除のためにパスフレーズが必要です。</translation>
+    </message>
+    <message>
+        <source>Decrypt wallet</source>
+        <translation>ウォレットの暗号化を解除する</translation>
+    </message>
+    <message>
+        <source>Change passphrase</source>
+        <translation>パスフレーズの変更</translation>
+    </message>
+    <message>
+        <source>Enter the old passphrase and new passphrase to the wallet.</source>
+        <translation>ウォレットの古いパスフレーズおよび新しいパスフレーズを入力してください。</translation>
+    </message>
+    <message>
+        <source>Confirm wallet encryption</source>
+        <translation>ウォレットの暗号化を確認する</translation>
+    </message>
+    <message>
+        <source>Warning: If you encrypt your wallet and lose your passphrase, you will &lt;b&gt;LOSE ALL OF YOUR BITCOINS&lt;/b&gt;!</source>
+        <translation>警告: もしもあなたのウォレットを暗号化してパスフレーズを失ってしまったなら、&lt;b&gt;あなたの Bitcoin はすべて失われます&lt;/b&gt;!</translation>
+    </message>
+    <message>
+        <source>Are you sure you wish to encrypt your wallet?</source>
+        <translation>本当にウォレットを暗号化しますか?</translation>
+    </message>
+    <message>
+        <source>Wallet encrypted</source>
+        <translation>ウォレットは暗号化されました</translation>
+    </message>
+    <message>
+        <source>%1 will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source>
+        <translation>暗号化処理を完了させるため %1 をいますぐ終了します。ウォレットの暗号化では、コンピュータに感染したマルウェアなどによるビットコインの盗難から完全に守ることはできないことにご注意ください。</translation>
+    </message>
+    <message>
+        <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source>
+        <translation>重要: 過去のウォレット ファイルのバックアップは、暗号化された新しいウォレット ファイルに取り替える必要があります。セキュリティ上の理由により、暗号化された新しいウォレットを使い始めると、暗号化されていないウォレット ファイルのバックアップはすぐに使えなくなります。</translation>
+    </message>
+    <message>
+        <source>Wallet encryption failed</source>
+        <translation>ウォレットの暗号化に失敗しました</translation>
+    </message>
+    <message>
+        <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
+        <translation>内部エラーによりウォレットの暗号化が失敗しました。ウォレットは暗号化されませんでした。</translation>
+    </message>
+    <message>
+        <source>The supplied passphrases do not match.</source>
+        <translation>パスフレーズが同じではありません。</translation>
+    </message>
+    <message>
+        <source>Wallet unlock failed</source>
+        <translation>ウォレットのアンロックに失敗しました</translation>
+    </message>
+    <message>
+        <source>The passphrase entered for the wallet decryption was incorrect.</source>
+        <translation>ウォレットの暗号化解除のパスフレーズが正しくありません。</translation>
+    </message>
+    <message>
+        <source>Wallet decryption failed</source>
+        <translation>ウォレットの暗号化解除に失敗しました</translation>
+    </message>
+    <message>
+        <source>Wallet passphrase was successfully changed.</source>
+        <translation>ウォレットのパスフレーズの変更が成功しました。</translation>
+    </message>
+    <message>
+        <source>Warning: The Caps Lock key is on!</source>
+        <translation>警告: Caps Lock キーがオンになっています!</translation>
+    </message>
 </context>
 <context>
     <name>BanTableModel</name>
@@ -158,6 +317,18 @@
         <source>Open &amp;URI...</source>
         <translation>URI を開く (&amp;U)...</translation>
     </message>
+    <message>
+        <source>Click to disable network activity.</source>
+        <translation>クリックするとネットワーク活動を無効化します。</translation>
+    </message>
+    <message>
+        <source>Network activity disabled.</source>
+        <translation>ネットワーク活動は無効化されました。</translation>
+    </message>
+    <message>
+        <source>Click to enable network activity again.</source>
+        <translation>クリックするとネットワーク活動を再び有効化します。</translation>
+    </message>
     <message>
         <source>Reindexing blocks on disk...</source>
         <translation>ディスク上のブロックのインデックスを再作成中...</translation>
@@ -278,26 +449,6 @@
         <source>Processed %n block(s) of transaction history.</source>
         <translation><numerusform>トランザクション履歴の %n ブロックを処理しました。</numerusform></translation>
     </message>
-    <message numerus="yes">
-        <source>%n hour(s)</source>
-        <translation><numerusform>%n 時間</numerusform></translation>
-    </message>
-    <message numerus="yes">
-        <source>%n day(s)</source>
-        <translation><numerusform>%n 日</numerusform></translation>
-    </message>
-    <message numerus="yes">
-        <source>%n week(s)</source>
-        <translation><numerusform>%n 週間</numerusform></translation>
-    </message>
-    <message>
-        <source>%1 and %2</source>
-        <translation>%1 と %2</translation>
-    </message>
-    <message numerus="yes">
-        <source>%n year(s)</source>
-        <translation><numerusform>%n 年</numerusform></translation>
-    </message>
     <message>
         <source>%1 behind</source>
         <translation>%1 遅延</translation>
@@ -376,6 +527,14 @@
         <source>Incoming transaction</source>
         <translation>着金取引</translation>
     </message>
+    <message>
+        <source>HD key generation is &lt;b&gt;enabled&lt;/b&gt;</source>
+        <translation>HD鍵生成は&lt;b&gt;有効化&lt;/b&gt;されています</translation>
+    </message>
+    <message>
+        <source>HD key generation is &lt;b&gt;disabled&lt;/b&gt;</source>
+        <translation>HD鍵生成は&lt;b&gt;無効化&lt;/b&gt;されています</translation>
+    </message>
     <message>
         <source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;unlocked&lt;/b&gt;</source>
         <translation>ウォレットは&lt;b&gt;暗号化されて、アンロックされています&lt;/b&gt;</translation>
@@ -384,6 +543,10 @@
         <source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;locked&lt;/b&gt;</source>
         <translation>ウォレットは&lt;b&gt;暗号化されて、ロックされています&lt;/b&gt;</translation>
     </message>
+    <message>
+        <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source>
+        <translation>致命的なエラーが発生しました。Bitcoin は安全に継続することができず終了するでしょう。</translation>
+    </message>
 </context>
 <context>
     <name>CoinControlDialog</name>
@@ -403,10 +566,6 @@
         <source>Amount:</source>
         <translation>総額:</translation>
     </message>
-    <message>
-        <source>Priority:</source>
-        <translation>優先度:</translation>
-    </message>
     <message>
         <source>Fee:</source>
         <translation>手数料:</translation>
@@ -460,8 +619,84 @@
         <translation>検証済み</translation>
     </message>
     <message>
-        <source>Priority</source>
-        <translation>優先度</translation>
+        <source>Copy address</source>
+        <translation>アドレスをコピーする</translation>
+    </message>
+    <message>
+        <source>Copy label</source>
+        <translation>ラベルをコピーする</translation>
+    </message>
+    <message>
+        <source>Copy amount</source>
+        <translation>総額のコピー</translation>
+    </message>
+    <message>
+        <source>Copy transaction ID</source>
+        <translation>取引 ID をコピー</translation>
+    </message>
+    <message>
+        <source>Lock unspent</source>
+        <translation>未使用トランザクションをロックする</translation>
+    </message>
+    <message>
+        <source>Unlock unspent</source>
+        <translation>未使用トランザクションをアンロックする</translation>
+    </message>
+    <message>
+        <source>Copy quantity</source>
+        <translation>数量をコピーする</translation>
+    </message>
+    <message>
+        <source>Copy fee</source>
+        <translation>手数料をコピーする</translation>
+    </message>
+    <message>
+        <source>Copy after fee</source>
+        <translation>手数料差引後の値をコピーする</translation>
+    </message>
+    <message>
+        <source>Copy bytes</source>
+        <translation>バイト数をコピーする</translation>
+    </message>
+    <message>
+        <source>Copy dust</source>
+        <translation>ダストをコピーする</translation>
+    </message>
+    <message>
+        <source>Copy change</source>
+        <translation>釣り銭をコピー</translation>
+    </message>
+    <message>
+        <source>(%1 locked)</source>
+        <translation>(%1 がロック済み)</translation>
+    </message>
+    <message>
+        <source>yes</source>
+        <translation>はい</translation>
+    </message>
+    <message>
+        <source>no</source>
+        <translation>いいえ</translation>
+    </message>
+    <message>
+        <source>This label turns red if any recipient receives an amount smaller than the current dust threshold.</source>
+        <translation>少なくともひとつの受取額が現在のダスト閾値を下回る場合にはこのラベルは赤くなります。</translation>
+    </message>
+    <message>
+        <source>Can vary +/- %1 satoshi(s) per input.</source>
+        <translation>ひとつの入力につき %1 satoshi 前後ずれることがあります。</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>（ラベル無し）</translation>
+    </message>
+    <message>
+        <source>change from %1 (%2)</source>
+        <translation>%1 (%2) からのおつり</translation>
+    </message>
+    <message>
+        <source>(change)</source>
+        <translation>(おつり)</translation>
     </message>
 </context>
 <context>
@@ -486,6 +721,38 @@
         <source>&amp;Address</source>
         <translation>アドレス帳 (&amp;A)</translation>
     </message>
+    <message>
+        <source>New receiving address</source>
+        <translation>新しい受信アドレス</translation>
+    </message>
+    <message>
+        <source>New sending address</source>
+        <translation>新しい送信アドレス</translation>
+    </message>
+    <message>
+        <source>Edit receiving address</source>
+        <translation>入金アドレスを編集</translation>
+    </message>
+    <message>
+        <source>Edit sending address</source>
+        <translation>送信アドレスを編集</translation>
+    </message>
+    <message>
+        <source>The entered address "%1" is not a valid Bitcoin address.</source>
+        <translation>入力されたアドレス "%1" は無効な Bitcoin アドレスです。</translation>
+    </message>
+    <message>
+        <source>The entered address "%1" is already in the address book.</source>
+        <translation>入力されたアドレス "%1" は既にアドレス帳にあります。</translation>
+    </message>
+    <message>
+        <source>Could not unlock wallet.</source>
+        <translation>ウォレットをアンロックできませんでした。</translation>
+    </message>
+    <message>
+        <source>New key generation failed.</source>
+        <translation>新しいキーの生成に失敗しました。</translation>
+    </message>
 </context>
 <context>
     <name>FreespaceChecker</name>
@@ -608,6 +875,57 @@
         <translation><numerusform>(%n GB必要)</numerusform></translation>
     </message>
 </context>
+<context>
+    <name>ModalOverlay</name>
+    <message>
+        <source>Form</source>
+        <translation>フォーム</translation>
+    </message>
+    <message>
+        <source>Recent transactions may not yet be visible, and therefore your wallet's balance might be incorrect. This information will be correct once your wallet has finished synchronizing with the bitcoin network, as detailed below.</source>
+        <translation>確認できない最近のトランザクションがあるかもしれません。これによりウォレットの残高は不正確なものである可能性があります。この情報はウォレットが一度ビットコインネットワークへの同期が完了すると正確なものとなります。詳細は下記を参照してください。</translation>
+    </message>
+    <message>
+        <source>Attempting to spend bitcoins that are affected by not-yet-displayed transactions will not be accepted by the network.</source>
+        <translation>まだ表示されていないトランザクションが影響するビットコインを使用しようとすると、ネットワークから認証がなされないでしょう。</translation>
+    </message>
+    <message>
+        <source>Number of blocks left</source>
+        <translation>残りのブロック数</translation>
+    </message>
+    <message>
+        <source>Unknown...</source>
+        <translation>未知...</translation>
+    </message>
+    <message>
+        <source>Last block time</source>
+        <translation>最終ブロックの日時</translation>
+    </message>
+    <message>
+        <source>Progress</source>
+        <translation>進捗</translation>
+    </message>
+    <message>
+        <source>Progress increase per hour</source>
+        <translation>進捗状況は一時間ごとに増加します</translation>
+    </message>
+    <message>
+        <source>calculating...</source>
+        <translation>計算しています...</translation>
+    </message>
+    <message>
+        <source>Estimated time left until synced</source>
+        <translation>同期完了までの推定残り時間</translation>
+    </message>
+    <message>
+        <source>Hide</source>
+        <translation>隠す</translation>
+    </message>
+    <message>
+        <source>Unknown. Syncing Headers (%1)...</source>
+        <translation>未知。ヘッダを同期しています (%1)...</translation>
+    </message>
+</context>
 <context>
     <name>OpenURIDialog</name>
     <message>
@@ -626,6 +944,10 @@
         <source>Select payment request file</source>
         <translation>支払いリクエストファイルを選択してください</translation>
     </message>
+    <message>
+        <source>Select payment request file to open</source>
+        <translation>開きたい支払いリクエストファイルを選択してください</translation>
+    </message>
 </context>
 <context>
     <name>OptionsDialog</name>
@@ -937,6 +1259,97 @@
         <translation>監視限定アドレス内の現在の全残高</translation>
     </message>
 </context>
+<context>
+    <name>PaymentServer</name>
+    <message>
+        <source>Payment request error</source>
+        <translation>支払いのリクエストのエラーです</translation>
+    </message>
+    <message>
+        <source>Cannot start bitcoin: click-to-pay handler</source>
+        <translation>Bitcoin を起動できません: click-to-pay handler</translation>
+    </message>
+    <message>
+        <source>URI handling</source>
+        <translation>URI の操作</translation>
+    </message>
+    <message>
+        <source>Payment request fetch URL is invalid: %1</source>
+        <translation>支払い要求の取得先URLが無効です: %1</translation>
+    </message>
+    <message>
+        <source>Invalid payment address %1</source>
+        <translation>支払いのアドレス「%1」は無効です</translation>
+    </message>
+    <message>
+        <source>URI cannot be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source>
+        <translation>URI を解析できません! これは無効な Bitcoin アドレスあるいや不正な形式の URI パラメーターによって引き起こされる場合があります。</translation>
+    </message>
+    <message>
+        <source>Payment request file handling</source>
+        <translation>支払いリクエストファイルを処理しています</translation>
+    </message>
+    <message>
+        <source>Payment request file cannot be read! This can be caused by an invalid payment request file.</source>
+        <translation>支払いリクエストファイルを読み込めませんでした！無効な支払いリクエストファイルにより引き起こされた可能性があります。</translation>
+    </message>
+    <message>
+        <source>Payment request rejected</source>
+        <translation>支払い要求は拒否されました</translation>
+    </message>
+    <message>
+        <source>Payment request network doesn't match client network.</source>
+        <translation>支払いリクエストのネットワークは現在のクライアントのネットワークに一致しません。</translation>
+    </message>
+    <message>
+        <source>Payment request expired.</source>
+        <translation>支払いリクエストの期限が切れました。</translation>
+    </message>
+    <message>
+        <source>Payment request is not initialized.</source>
+        <translation>支払いリクエストは開始されていません。</translation>
+    </message>
+    <message>
+        <source>Unverified payment requests to custom payment scripts are unsupported.</source>
+        <translation>カスタム支払いスクリプトに対する、検証されていない支払いリクエストはサポートされていません。</translation>
+    </message>
+    <message>
+        <source>Invalid payment request.</source>
+        <translation>無効な支払いリクエスト。</translation>
+    </message>
+    <message>
+        <source>Requested payment amount of %1 is too small (considered dust).</source>
+        <translation>要求された支払額 %1 は少なすぎます (ダストとみなされてしまいます)。</translation>
+    </message>
+    <message>
+        <source>Refund from %1</source>
+        <translation>%1 からの返金</translation>
+    </message>
+    <message>
+        <source>Payment request %1 is too large (%2 bytes, allowed %3 bytes).</source>
+        <translation>支払リクエスト %1 は大きすぎます（%2バイトですが、%3バイトまでが許されています）。</translation>
+    </message>
+    <message>
+        <source>Error communicating with %1: %2</source>
+        <translation>%1: %2とコミュニケーション・エラーです</translation>
+    </message>
+    <message>
+        <source>Payment request cannot be parsed!</source>
+        <translation>支払リクエストを読み込めませんでした！</translation>
+    </message>
+    <message>
+        <source>Bad response from server %1</source>
+        <translation>サーバーの返事は無効 %1</translation>
+    </message>
+    <message>
+        <source>Network request error</source>
+        <translation>ネットワーク・リクエストのエラーです</translation>
+    </message>
+    <message>
+        <source>Payment acknowledged</source>
+        <translation>支払いは確認しました</translation>
+    </message>
+</context>
 <context>
     <name>PeerTableModel</name>
     <message>
@@ -948,8 +1361,12 @@
         <translation>ノード・サービス</translation>
     </message>
     <message>
-        <source>Ping Time</source>
-        <translation>Ping時間</translation>
+        <source>NodeId</source>
+        <translation>ノードID</translation>
+    </message>
+    <message>
+        <source>Ping</source>
+        <translation>Ping</translation>
     </message>
 </context>
 <context>
@@ -990,8 +1407,74 @@
         <source>%1 ms</source>
         <translation>%1ミリ秒</translation>
     </message>
-</context>
-<context>
+    <message numerus="yes">
+        <source>%n second(s)</source>
+        <translation><numerusform>%n 秒</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%n minute(s)</source>
+        <translation><numerusform>%n 分</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%n hour(s)</source>
+        <translation><numerusform>%n 時間</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%n day(s)</source>
+        <translation><numerusform>%n 日</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%n week(s)</source>
+        <translation><numerusform>%n 週間</numerusform></translation>
+    </message>
+    <message>
+        <source>%1 and %2</source>
+        <translation>%1 と %2</translation>
+    </message>
+    <message numerus="yes">
+        <source>%n year(s)</source>
+        <translation><numerusform>%n 年</numerusform></translation>
+    </message>
+    <message>
+        <source>%1 didn't yet exit safely...</source>
+        <translation>%1 はまだ安全に終了していません...</translation>
+    </message>
+</context>
+<context>
+    <name>QObject::QObject</name>
+    <message>
+        <source>Error: Specified data directory "%1" does not exist.</source>
+        <translation>エラー: 指定のデータ ディレクトリ "%1" は存在しません。</translation>
+    </message>
+    <message>
+        <source>Error: Cannot parse configuration file: %1. Only use key=value syntax.</source>
+        <translation>エラー: 設定ファイルをパースできません: %1。key=value という記法のみを利用してください。</translation>
+    </message>
+    <message>
+        <source>Error: %1</source>
+        <translation>エラー: %1</translation>
+    </message>
+</context>
+<context>
+    <name>QRImageWidget</name>
+    <message>
+        <source>&amp;Save Image...</source>
+        <translation>画像を保存(&amp;S)</translation>
+    </message>
+    <message>
+        <source>&amp;Copy Image</source>
+        <translation>画像をコピー(&amp;C)</translation>
+    </message>
+    <message>
+        <source>Save QR Code</source>
+        <translation>QR コードの保存</translation>
+    </message>
+    <message>
+        <source>PNG Image (*.png)</source>
+        <translation>PNG画像ファイル(*.png)</translation>
+    </message>
+</context>
+<context>
     <name>RPCConsole</name>
     <message>
         <source>N/A</source>
@@ -1149,6 +1632,10 @@
         <source>Ping Wait</source>
         <translation>Ping待ち</translation>
     </message>
+    <message>
+        <source>Min Ping</source>
+        <translation>最小 Ping</translation>
+    </message>
     <message>
         <source>Time Offset</source>
         <translation>時間オフセット</translation>
@@ -1193,14 +1680,6 @@
         <source>Clear console</source>
         <translation>コンソールをクリア</translation>
     </message>
-    <message>
-        <source>&amp;Disconnect Node</source>
-        <translation>ノードを切断する (&amp;D)</translation>
-    </message>
-    <message>
-        <source>Ban Node for</source>
-        <translation>ノードをbanする:</translation>
-    </message>
     <message>
         <source>1 &amp;hour</source>
         <translation>1時間 (&amp;H)</translation>
@@ -1218,8 +1697,16 @@
         <translation>1年 (&amp;Y)</translation>
     </message>
     <message>
-        <source>&amp;Unban Node</source>
-        <translation>ノードのbanを解除する (&amp;U)</translation>
+        <source>&amp;Disconnect</source>
+        <translation>切断 (&amp;D)</translation>
+    </message>
+    <message>
+        <source>Ban for</source>
+        <translation>Banする:</translation>
+    </message>
+    <message>
+        <source>&amp;Unban</source>
+        <translation>Banを解除する (&amp;U)</translation>
     </message>
     <message>
         <source>Welcome to the %1 RPC console.</source>
@@ -1233,6 +1720,14 @@
         <source>Type &lt;b&gt;help&lt;/b&gt; for an overview of available commands.</source>
         <translation>使用可能なコマンドを見るには &lt;b&gt;help&lt;/b&gt; と入力します。</translation>
     </message>
+    <message>
+        <source>WARNING: Scammers have been active, telling users to type commands here, stealing their wallet contents. Do not use this console without fully understanding the ramification of a command.</source>
+        <translation>警告: 詐欺師が活動しており、ユーザに対してここにコマンドを入力させることでウォレットの中身を盗もうとしています。コマンドの結果を完全に理解していない限り、このコンソールは利用しないでください。</translation>
+    </message>
+    <message>
+        <source>Network activity disabled</source>
+        <translation>ネットワーク活動は無効化されました</translation>
+    </message>
     <message>
         <source>%1 B</source>
         <translation>%1 B</translation>
@@ -1352,6 +1847,22 @@
         <source>Remove</source>
         <translation>削除</translation>
     </message>
+    <message>
+        <source>Copy URI</source>
+        <translation>URI をコピーする</translation>
+    </message>
+    <message>
+        <source>Copy label</source>
+        <translation>ラベルをコピーする</translation>
+    </message>
+    <message>
+        <source>Copy message</source>
+        <translation>メッセージをコピーする</translation>
+    </message>
+    <message>
+        <source>Copy amount</source>
+        <translation>総額のコピー</translation>
+    </message>
 </context>
 <context>
     <name>ReceiveRequestDialog</name>
@@ -1371,6 +1882,73 @@
         <source>&amp;Save Image...</source>
         <translation>画像を保存(&amp;S)</translation>
     </message>
+    <message>
+        <source>Request payment to %1</source>
+        <translation>%1 への支払いリクエストを行う</translation>
+    </message>
+    <message>
+        <source>Payment information</source>
+        <translation>支払い情報</translation>
+    </message>
+    <message>
+        <source>URI</source>
+        <translation>URI</translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation>アドレス</translation>
+    </message>
+    <message>
+        <source>Amount</source>
+        <translation>総額</translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation>ラベル</translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation>メッセージ</translation>
+    </message>
+    <message>
+        <source>Resulting URI too long, try to reduce the text for label / message.</source>
+        <translation>URI が長くなり過ぎます。ラベルやメッセージのテキストを短くしてください。</translation>
+    </message>
+    <message>
+        <source>Error encoding URI into QR Code.</source>
+        <translation>QR コード用の URI エンコードでエラー。</translation>
+    </message>
+</context>
+<context>
+    <name>RecentRequestsTableModel</name>
+    <message>
+        <source>Date</source>
+        <translation>日付</translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation>ラベル</translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation>メッセージ</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>（ラベル無し）</translation>
+    </message>
+    <message>
+        <source>(no message)</source>
+        <translation>（メッセージなし）</translation>
+    </message>
+    <message>
+        <source>(no amount requested)</source>
+        <translation>(金額指定なし)</translation>
+    </message>
+    <message>
+        <source>Requested</source>
+        <translation>要求</translation>
+    </message>
 </context>
 <context>
     <name>SendCoinsDialog</name>
@@ -1406,10 +1984,6 @@
         <source>Amount:</source>
         <translation>総額:</translation>
     </message>
-    <message>
-        <source>Priority:</source>
-        <translation>優先度:</translation>
-    </message>
     <message>
         <source>Fee:</source>
         <translation>手数料:</translation>
@@ -1431,301 +2005,974 @@
         <translation>カスタムおつりアドレス</translation>
     </message>
     <message>
-        <source>Transaction Fee:</source>
-        <translation>トランザクション手数料：</translation>
+        <source>Transaction Fee:</source>
+        <translation>トランザクション手数料：</translation>
+    </message>
+    <message>
+        <source>Choose...</source>
+        <translation>選択……</translation>
+    </message>
+    <message>
+        <source>collapse fee-settings</source>
+        <translation>手数料設定を折りたたむ</translation>
+    </message>
+    <message>
+        <source>per kilobyte</source>
+        <translation>1キロバイトあたり手数料</translation>
+    </message>
+    <message>
+        <source>If the custom fee is set to 1000 satoshis and the transaction is only 250 bytes, then "per kilobyte" only pays 250 satoshis in fee, while "total at least" pays 1000 satoshis. For transactions bigger than a kilobyte both pay by kilobyte.</source>
+        <translation>カスタム手数料が1000satoshiに設定されている場合、トランザクションサイズが250バイトとすると、「1キロバイトあたり手数料」では250satoshiの手数料のみを支払いますが、「最小手数料」では1000satoshiを支払います。1キロバイトを超えるトランザクションの場合には、どちらの方法を選択したとしても1キロバイトあたりで支払われます。</translation>
+    </message>
+    <message>
+        <source>Hide</source>
+        <translation>隠す</translation>
+    </message>
+    <message>
+        <source>total at least</source>
+        <translation>最小手数料</translation>
+    </message>
+    <message>
+        <source>Paying only the minimum fee is just fine as long as there is less transaction volume than space in the blocks. But be aware that this can end up in a never confirming transaction once there is more demand for bitcoin transactions than the network can process.</source>
+        <translation>ブロックの容量に比べてトランザクション流量が少ないうちは最小手数料のみの支払で十分です。しかしながらネットワークが処理しきれないほどbitcoinトランザクションの需要がひとたび生まれてしまった場合には、永遠に検証がされないトランザクションになってしまう可能性があることに注意してください。</translation>
+    </message>
+    <message>
+        <source>(read the tooltip)</source>
+        <translation>（ツールチップをお読みください）</translation>
+    </message>
+    <message>
+        <source>Recommended:</source>
+        <translation>推奨：</translation>
+    </message>
+    <message>
+        <source>Custom:</source>
+        <translation>カスタム：</translation>
+    </message>
+    <message>
+        <source>(Smart fee not initialized yet. This usually takes a few blocks...)</source>
+        <translation>（スマート手数料はまだ初期化されていません。これにはおおよそ数ブロックほどかかります……）</translation>
+    </message>
+    <message>
+        <source>normal</source>
+        <translation>普通</translation>
+    </message>
+    <message>
+        <source>fast</source>
+        <translation>高速</translation>
+    </message>
+    <message>
+        <source>Send to multiple recipients at once</source>
+        <translation>一度に複数の人に送る</translation>
+    </message>
+    <message>
+        <source>Add &amp;Recipient</source>
+        <translation>受取人を追加 (&amp;R)</translation>
+    </message>
+    <message>
+        <source>Clear all fields of the form.</source>
+        <translation>全ての入力項目をクリア</translation>
+    </message>
+    <message>
+        <source>Dust:</source>
+        <translation>ダスト：</translation>
+    </message>
+    <message>
+        <source>Confirmation time target:</source>
+        <translation>検証時間のターゲット:</translation>
+    </message>
+    <message>
+        <source>Clear &amp;All</source>
+        <translation>すべてクリア (&amp;A)</translation>
+    </message>
+    <message>
+        <source>Balance:</source>
+        <translation>残高:</translation>
+    </message>
+    <message>
+        <source>Confirm the send action</source>
+        <translation>送る操作を確認する</translation>
+    </message>
+    <message>
+        <source>S&amp;end</source>
+        <translation>送金 (&amp;E)</translation>
+    </message>
+    <message>
+        <source>Copy quantity</source>
+        <translation>数量をコピーする</translation>
+    </message>
+    <message>
+        <source>Copy amount</source>
+        <translation>総額のコピー</translation>
+    </message>
+    <message>
+        <source>Copy fee</source>
+        <translation>手数料をコピーする</translation>
+    </message>
+    <message>
+        <source>Copy after fee</source>
+        <translation>手数料差引後の値をコピーする</translation>
+    </message>
+    <message>
+        <source>Copy bytes</source>
+        <translation>バイト数をコピーする</translation>
+    </message>
+    <message>
+        <source>Copy dust</source>
+        <translation>ダストをコピーする</translation>
+    </message>
+    <message>
+        <source>Copy change</source>
+        <translation>釣り銭をコピー</translation>
+    </message>
+    <message>
+        <source>%1 to %2</source>
+        <translation>%1 から %2</translation>
+    </message>
+    <message>
+        <source>Are you sure you want to send?</source>
+        <translation>送ってよろしいですか？</translation>
+    </message>
+    <message>
+        <source>added as transaction fee</source>
+        <translation>取引手数料として追加された</translation>
+    </message>
+    <message>
+        <source>Total Amount %1</source>
+        <translation>合計：　%1</translation>
+    </message>
+    <message>
+        <source>or</source>
+        <translation>または</translation>
+    </message>
+    <message>
+        <source>Confirm send coins</source>
+        <translation>コインを送る確認</translation>
+    </message>
+    <message>
+        <source>The recipient address is not valid. Please recheck.</source>
+        <translation>受取アドレスが不正です。再チェックしてください。</translation>
+    </message>
+    <message>
+        <source>The amount to pay must be larger than 0.</source>
+        <translation>支払額は0より大きくないといけません。</translation>
+    </message>
+    <message>
+        <source>The amount exceeds your balance.</source>
+        <translation>額が残高を超えています。</translation>
+    </message>
+    <message>
+        <source>The total exceeds your balance when the %1 transaction fee is included.</source>
+        <translation>%1 の取引手数料を含めると額が残高を超えています。</translation>
+    </message>
+    <message>
+        <source>Duplicate address found: addresses should only be used once each.</source>
+        <translation>重複したアドレスが見つかりました: アドレスはそれぞれ一度のみ使用することができます。</translation>
+    </message>
+    <message>
+        <source>Transaction creation failed!</source>
+        <translation>トラザクションの作成に失敗しました!</translation>
+    </message>
+    <message>
+        <source>The transaction was rejected with the following reason: %1</source>
+        <translation>トランザクションは以下の理由により拒絶されました: %1</translation>
+    </message>
+    <message>
+        <source>A fee higher than %1 is considered an absurdly high fee.</source>
+        <translation>%1 よりも高い手数料の場合、手数料が高すぎると判断されます。</translation>
+    </message>
+    <message>
+        <source>Payment request expired.</source>
+        <translation>支払いリクエストの期限が切れました。</translation>
+    </message>
+    <message numerus="yes">
+        <source>%n block(s)</source>
+        <translation><numerusform>%n ブロック</numerusform></translation>
+    </message>
+    <message>
+        <source>Pay only the required fee of %1</source>
+        <translation>要求手数料 %1 のみを支払う</translation>
+    </message>
+    <message numerus="yes">
+        <source>Estimated to begin confirmation within %n block(s).</source>
+        <translation><numerusform>%n ブロック以内に検証が開始されると予想されます。</numerusform></translation>
+    </message>
+    <message>
+        <source>Warning: Invalid Bitcoin address</source>
+        <translation>警告：無効なBitcoinアドレスです</translation>
+    </message>
+    <message>
+        <source>Warning: Unknown change address</source>
+        <translation>警告：未知のおつりアドレスです</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>（ラベル無し）</translation>
+    </message>
+</context>
+<context>
+    <name>SendCoinsEntry</name>
+    <message>
+        <source>A&amp;mount:</source>
+        <translation>金額(&amp;A):</translation>
+    </message>
+    <message>
+        <source>Pay &amp;To:</source>
+        <translation>送り先(&amp;T):</translation>
+    </message>
+    <message>
+        <source>&amp;Label:</source>
+        <translation>ラベル(&amp;L):</translation>
+    </message>
+    <message>
+        <source>Choose previously used address</source>
+        <translation>前に使用したアドレスを選ぶ</translation>
+    </message>
+    <message>
+        <source>This is a normal payment.</source>
+        <translation>これは通常の支払です。</translation>
+    </message>
+    <message>
+        <source>The Bitcoin address to send the payment to</source>
+        <translation>支払の送金先Bitcoinアドレス</translation>
+    </message>
+    <message>
+        <source>Alt+A</source>
+        <translation>Alt+A</translation>
+    </message>
+    <message>
+        <source>Paste address from clipboard</source>
+        <translation>クリップボードからアドレスを貼付ける</translation>
+    </message>
+    <message>
+        <source>Alt+P</source>
+        <translation>Alt+P</translation>
+    </message>
+    <message>
+        <source>Remove this entry</source>
+        <translation>この項目を削除する</translation>
+    </message>
+    <message>
+        <source>The fee will be deducted from the amount being sent. The recipient will receive less bitcoins than you enter in the amount field. If multiple recipients are selected, the fee is split equally.</source>
+        <translation>送金する金額から手数料が差し引かれます。受取人は数量フィールドで指定した量よりも少ないビットコインを受け取ります。受取人が複数いる場合には、手数料は均等割されます。</translation>
+    </message>
+    <message>
+        <source>S&amp;ubtract fee from amount</source>
+        <translation>送金額から手数料を差し引く (&amp;U)</translation>
+    </message>
+    <message>
+        <source>Message:</source>
+        <translation>メッセージ:</translation>
+    </message>
+    <message>
+        <source>This is an unauthenticated payment request.</source>
+        <translation>これは未認証の支払いリクエストです。</translation>
+    </message>
+    <message>
+        <source>This is an authenticated payment request.</source>
+        <translation>これは認証済みの支払いリクエストです。</translation>
+    </message>
+    <message>
+        <source>Enter a label for this address to add it to the list of used addresses</source>
+        <translation>このアドレスに対するラベルを入力することで、使用済みアドレスの一覧に追加することができます</translation>
+    </message>
+    <message>
+        <source>A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
+        <translation>bitcoin: URIに添付されていたメッセージです。これは参照用としてトランザクションとともに保存されます。注意：このメッセージはBitcoinネットワークを通して送信されるわけではありません。</translation>
+    </message>
+    <message>
+        <source>Pay To:</source>
+        <translation>支払先:</translation>
+    </message>
+    <message>
+        <source>Memo:</source>
+        <translation>メモ：</translation>
+    </message>
+    <message>
+        <source>Enter a label for this address to add it to your address book</source>
+        <translation>アドレス帳に追加するには、このアドレスのラベルを入力します</translation>
+    </message>
+</context>
+<context>
+    <name>SendConfirmationDialog</name>
+    <message>
+        <source>Yes</source>
+        <translation>はい</translation>
+    </message>
+</context>
+<context>
+    <name>ShutdownWindow</name>
+    <message>
+        <source>%1 is shutting down...</source>
+        <translation>%1 をシャットダウンしています...</translation>
+    </message>
+    <message>
+        <source>Do not shut down the computer until this window disappears.</source>
+        <translation>このウィンドウが消えるまでコンピュータをシャットダウンしないで下さい。</translation>
+    </message>
+</context>
+<context>
+    <name>SignVerifyMessageDialog</name>
+    <message>
+        <source>Signatures - Sign / Verify a Message</source>
+        <translation>署名 - メッセージの署名/検証</translation>
+    </message>
+    <message>
+        <source>&amp;Sign Message</source>
+        <translation>メッセージの署名 (&amp;S)</translation>
+    </message>
+    <message>
+        <source>You can sign messages/agreements with your addresses to prove you can receive bitcoins sent to them. Be careful not to sign anything vague or random, as phishing attacks may try to trick you into signing your identity over to them. Only sign fully-detailed statements you agree to.</source>
+        <translation>あなたの所有しているアドレスによりメッセージや合意書に署名をすることで、それらアドレスに対して送られたビットコインを受け取ることができることを証明できます。フィッシング攻撃により不正にあなたの識別情報を署名させられてしまうことを防ぐために、不明確なものやランダムなものに対して署名しないよう注意してください。合意することが可能な、よく詳細の記された文言にのみ署名するようにしてください。</translation>
+    </message>
+    <message>
+        <source>The Bitcoin address to sign the message with</source>
+        <translation>メッセージを署名するBitcoinアドレス</translation>
+    </message>
+    <message>
+        <source>Choose previously used address</source>
+        <translation>前に使用したアドレスを選ぶ</translation>
+    </message>
+    <message>
+        <source>Alt+A</source>
+        <translation>Alt+A</translation>
+    </message>
+    <message>
+        <source>Paste address from clipboard</source>
+        <translation>クリップボードからアドレスを貼付ける</translation>
+    </message>
+    <message>
+        <source>Alt+P</source>
+        <translation>Alt+P</translation>
+    </message>
+    <message>
+        <source>Enter the message you want to sign here</source>
+        <translation>ここにあなたが署名するメッセージを入力します</translation>
+    </message>
+    <message>
+        <source>Signature</source>
+        <translation>署名</translation>
+    </message>
+    <message>
+        <source>Copy the current signature to the system clipboard</source>
+        <translation>現在の署名をシステムのクリップボードにコピーする</translation>
+    </message>
+    <message>
+        <source>Sign the message to prove you own this Bitcoin address</source>
+        <translation>この Bitcoin アドレスを所有していることを証明するためにメッセージに署名</translation>
+    </message>
+    <message>
+        <source>Sign &amp;Message</source>
+        <translation>メッセージの署名 (&amp;M)</translation>
+    </message>
+    <message>
+        <source>Reset all sign message fields</source>
+        <translation>入力項目の内容をすべて消去します</translation>
+    </message>
+    <message>
+        <source>Clear &amp;All</source>
+        <translation>すべてクリア (&amp;A)</translation>
+    </message>
+    <message>
+        <source>&amp;Verify Message</source>
+        <translation>メッセージの検証 (&amp;V)</translation>
+    </message>
+    <message>
+        <source>Enter the receiver's address, message (ensure you copy line breaks, spaces, tabs, etc. exactly) and signature below to verify the message. Be careful not to read more into the signature than what is in the signed message itself, to avoid being tricked by a man-in-the-middle attack. Note that this only proves the signing party receives with the address, it cannot prove sendership of any transaction!</source>
+        <translation>受取人のアドレスとメッセージ（改行やスペース、タブなども完全に一致するよう注意してください）および署名を以下に入力し、メッセージの署名を検証してください。中間者攻撃により騙されるのを防ぐため、署名対象のメッセージに書かれていること以上の意味を署名から読み取ろうとしないよう注意してください。これは署名作成者がこのアドレスで受け取ったことを証明するだけであり、トランザクションの送信権限を証明するものではないことに注意してください！</translation>
+    </message>
+    <message>
+        <source>The Bitcoin address the message was signed with</source>
+        <translation>メッセージの署名に使われたBitcoinアドレス</translation>
+    </message>
+    <message>
+        <source>Verify the message to ensure it was signed with the specified Bitcoin address</source>
+        <translation>指定された Bitcoin アドレスで署名されたことを保証するメッセージを検証</translation>
+    </message>
+    <message>
+        <source>Verify &amp;Message</source>
+        <translation>メッセージの検証 (&amp;M)</translation>
+    </message>
+    <message>
+        <source>Reset all verify message fields</source>
+        <translation>入力項目の内容をすべて消去します</translation>
+    </message>
+    <message>
+        <source>Click "Sign Message" to generate signature</source>
+        <translation>署名を作成するには"メッセージの署名"をクリック</translation>
+    </message>
+    <message>
+        <source>The entered address is invalid.</source>
+        <translation>不正なアドレスが入力されました。</translation>
+    </message>
+    <message>
+        <source>Please check the address and try again.</source>
+        <translation>アドレスを確かめてからもう一度試してください。</translation>
+    </message>
+    <message>
+        <source>The entered address does not refer to a key.</source>
+        <translation>入力されたアドレスに関連するキーがありません。</translation>
+    </message>
+    <message>
+        <source>Wallet unlock was cancelled.</source>
+        <translation>ウォレットのアンロックはキャンセルされました。</translation>
+    </message>
+    <message>
+        <source>Private key for the entered address is not available.</source>
+        <translation>入力されたアドレスのプライベート キーが無効です。</translation>
+    </message>
+    <message>
+        <source>Message signing failed.</source>
+        <translation>メッセージの署名に失敗しました。</translation>
+    </message>
+    <message>
+        <source>Message signed.</source>
+        <translation>メッセージに署名しました。</translation>
+    </message>
+    <message>
+        <source>The signature could not be decoded.</source>
+        <translation>署名がデコードできません。</translation>
+    </message>
+    <message>
+        <source>Please check the signature and try again.</source>
+        <translation>署名を確認してからもう一度試してください。</translation>
+    </message>
+    <message>
+        <source>The signature did not match the message digest.</source>
+        <translation>署名はメッセージ ダイジェストと一致しませんでした。</translation>
+    </message>
+    <message>
+        <source>Message verification failed.</source>
+        <translation>メッセージの検証に失敗しました。</translation>
+    </message>
+    <message>
+        <source>Message verified.</source>
+        <translation>メッセージは検証されました。</translation>
+    </message>
+</context>
+<context>
+    <name>SplashScreen</name>
+    <message>
+        <source>[testnet]</source>
+        <translation>[testnet]</translation>
+    </message>
+</context>
+<context>
+    <name>TrafficGraphWidget</name>
+    <message>
+        <source>KB/s</source>
+        <translation>KB/s</translation>
+    </message>
+</context>
+<context>
+    <name>TransactionDesc</name>
+    <message numerus="yes">
+        <source>Open for %n more block(s)</source>
+        <translation><numerusform>%n 以上のブロックを開く</numerusform></translation>
+    </message>
+    <message>
+        <source>Open until %1</source>
+        <translation>ユニット %1 を開く</translation>
+    </message>
+    <message>
+        <source>conflicted with a transaction with %1 confirmations</source>
+        <translation>%1 検証のトランザクションと衝突</translation>
+    </message>
+    <message>
+        <source>%1/offline</source>
+        <translation>%1/オフライン</translation>
+    </message>
+    <message>
+        <source>0/unconfirmed, %1</source>
+        <translation>0/未検証, %1</translation>
+    </message>
+    <message>
+        <source>in memory pool</source>
+        <translation>メモリプール内</translation>
+    </message>
+    <message>
+        <source>not in memory pool</source>
+        <translation>メモリプール外</translation>
+    </message>
+    <message>
+        <source>abandoned</source>
+        <translation>中止</translation>
+    </message>
+    <message>
+        <source>%1/unconfirmed</source>
+        <translation>%1/未検証</translation>
+    </message>
+    <message>
+        <source>%1 confirmations</source>
+        <translation>%1 確認</translation>
+    </message>
+    <message>
+        <source>Status</source>
+        <translation>ステータス</translation>
+    </message>
+    <message>
+        <source>, has not been successfully broadcast yet</source>
+        <translation>まだブロードキャストが成功していません</translation>
+    </message>
+    <message numerus="yes">
+        <source>, broadcast through %n node(s)</source>
+        <translation><numerusform>%n ノードにブロードキャスト</numerusform></translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation>日付</translation>
+    </message>
+    <message>
+        <source>Source</source>
+        <translation>ソース</translation>
+    </message>
+    <message>
+        <source>Generated</source>
+        <translation>生成された</translation>
+    </message>
+    <message>
+        <source>From</source>
+        <translation>送信</translation>
+    </message>
+    <message>
+        <source>unknown</source>
+        <translation>未確認</translation>
+    </message>
+    <message>
+        <source>To</source>
+        <translation>受信</translation>
+    </message>
+    <message>
+        <source>own address</source>
+        <translation>自分のアドレス</translation>
+    </message>
+    <message>
+        <source>watch-only</source>
+        <translation>監視限定</translation>
+    </message>
+    <message>
+        <source>label</source>
+        <translation>ラベル</translation>
+    </message>
+    <message>
+        <source>Credit</source>
+        <translation>クレジット</translation>
+    </message>
+    <message numerus="yes">
+        <source>matures in %n more block(s)</source>
+        <translation><numerusform>あと %n ブロックで成熟します</numerusform></translation>
+    </message>
+    <message>
+        <source>not accepted</source>
+        <translation>承認されなかった</translation>
+    </message>
+    <message>
+        <source>Debit</source>
+        <translation>引き落とし額</translation>
+    </message>
+    <message>
+        <source>Total debit</source>
+        <translation>総出金額</translation>
+    </message>
+    <message>
+        <source>Total credit</source>
+        <translation>総入金額</translation>
+    </message>
+    <message>
+        <source>Transaction fee</source>
+        <translation>取引手数料</translation>
+    </message>
+    <message>
+        <source>Net amount</source>
+        <translation>正味金額</translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation>メッセージ</translation>
+    </message>
+    <message>
+        <source>Comment</source>
+        <translation>コメント</translation>
+    </message>
+    <message>
+        <source>Transaction ID</source>
+        <translation>取引 ID</translation>
+    </message>
+    <message>
+        <source>Transaction total size</source>
+        <translation>トランザクションの全体サイズ</translation>
+    </message>
+    <message>
+        <source>Output index</source>
+        <translation>出力インデックス</translation>
+    </message>
+    <message>
+        <source>Merchant</source>
+        <translation>商人</translation>
+    </message>
+    <message>
+        <source>Generated coins must mature %1 blocks before they can be spent. When you generated this block, it was broadcast to the network to be added to the block chain. If it fails to get into the chain, its state will change to "not accepted" and it won't be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source>
+        <translation>生成されたコインは使う前に%1のブロックを完成させる必要があります。あなたが生成した時、このブロックはブロック チェーンに追加されるネットワークにブロードキャストされました。チェーンに追加されるのが失敗した場合、状態が"不承認"に変更されて使えなくなるでしょう。これは、別のノードがあなたの数秒前にブロックを生成する場合に時々起こるかもしれません。</translation>
+    </message>
+    <message>
+        <source>Debug information</source>
+        <translation>デバッグ情報</translation>
+    </message>
+    <message>
+        <source>Transaction</source>
+        <translation>取引</translation>
+    </message>
+    <message>
+        <source>Inputs</source>
+        <translation>入力</translation>
+    </message>
+    <message>
+        <source>Amount</source>
+        <translation>総額</translation>
+    </message>
+    <message>
+        <source>true</source>
+        <translation>正しい</translation>
+    </message>
+    <message>
+        <source>false</source>
+        <translation>正しくない</translation>
+    </message>
+</context>
+<context>
+    <name>TransactionDescDialog</name>
+    <message>
+        <source>This pane shows a detailed description of the transaction</source>
+        <translation>ここでは取引の詳細を表示しています</translation>
+    </message>
+    <message>
+        <source>Details for %1</source>
+        <translation>%1 の詳細</translation>
+    </message>
+</context>
+<context>
+    <name>TransactionTableModel</name>
+    <message>
+        <source>Date</source>
+        <translation>日付</translation>
     </message>
     <message>
-        <source>Choose...</source>
-        <translation>選択……</translation>
+        <source>Type</source>
+        <translation>タイプ</translation>
     </message>
     <message>
-        <source>collapse fee-settings</source>
-        <translation>手数料設定を折りたたむ</translation>
+        <source>Label</source>
+        <translation>ラベル</translation>
+    </message>
+    <message numerus="yes">
+        <source>Open for %n more block(s)</source>
+        <translation><numerusform>%n 以上のブロックを開く</numerusform></translation>
     </message>
     <message>
-        <source>per kilobyte</source>
-        <translation>1キロバイトあたり手数料</translation>
+        <source>Open until %1</source>
+        <translation>ユニット %1 を開く</translation>
     </message>
     <message>
-        <source>If the custom fee is set to 1000 satoshis and the transaction is only 250 bytes, then "per kilobyte" only pays 250 satoshis in fee, while "total at least" pays 1000 satoshis. For transactions bigger than a kilobyte both pay by kilobyte.</source>
-        <translation>カスタム手数料が1000satoshiに設定されている場合、トランザクションサイズが250バイトとすると、「1キロバイトあたり手数料」では250satoshiの手数料のみを支払いますが、「最小手数料」では1000satoshiを支払います。1キロバイトを超えるトランザクションの場合には、どちらの方法を選択したとしても1キロバイトあたりで支払われます。</translation>
+        <source>Offline</source>
+        <translation>オフライン</translation>
     </message>
     <message>
-        <source>Hide</source>
-        <translation>隠す</translation>
+        <source>Unconfirmed</source>
+        <translation>未検証</translation>
     </message>
     <message>
-        <source>total at least</source>
-        <translation>最小手数料</translation>
+        <source>Abandoned</source>
+        <translation>中止</translation>
     </message>
     <message>
-        <source>Paying only the minimum fee is just fine as long as there is less transaction volume than space in the blocks. But be aware that this can end up in a never confirming transaction once there is more demand for bitcoin transactions than the network can process.</source>
-        <translation>ブロックの容量に比べてトランザクション流量が少ないうちは最小手数料のみの支払で十分です。しかしながらネットワークが処理しきれないほどbitcoinトランザクションの需要がひとたび生まれてしまった場合には、永遠に検証がされないトランザクションになってしまう可能性があることに注意してください。</translation>
+        <source>Confirming (%1 of %2 recommended confirmations)</source>
+        <translation>検証中（%2の推奨検証数のうち、%1検証が完了）</translation>
     </message>
     <message>
-        <source>(read the tooltip)</source>
-        <translation>（ツールチップをお読みください）</translation>
+        <source>Confirmed (%1 confirmations)</source>
+        <translation>検証されました (%1 検証済み)</translation>
     </message>
     <message>
-        <source>Recommended:</source>
-        <translation>推奨：</translation>
+        <source>Conflicted</source>
+        <translation>衝突</translation>
     </message>
     <message>
-        <source>Custom:</source>
-        <translation>カスタム：</translation>
+        <source>Immature (%1 confirmations, will be available after %2)</source>
+        <translation>未成熟（%1検証。%2検証完了後に使用可能となります）</translation>
     </message>
     <message>
-        <source>(Smart fee not initialized yet. This usually takes a few blocks...)</source>
-        <translation>（スマート手数料はまだ初期化されていません。これにはおおよそ数ブロックほどかかります……）</translation>
+        <source>This block was not received by any other nodes and will probably not be accepted!</source>
+        <translation>このブロックは他のどのノードによっても受け取られないで、多分受け入れられないでしょう！</translation>
     </message>
     <message>
-        <source>Confirmation time:</source>
-        <translation>検証時間：</translation>
+        <source>Generated but not accepted</source>
+        <translation>生成されましたが承認されませんでした</translation>
     </message>
     <message>
-        <source>normal</source>
-        <translation>普通</translation>
+        <source>Received with</source>
+        <translation>送り主</translation>
     </message>
     <message>
-        <source>fast</source>
-        <translation>高速</translation>
+        <source>Received from</source>
+        <translation>送り主</translation>
     </message>
     <message>
-        <source>Send to multiple recipients at once</source>
-        <translation>一度に複数の人に送る</translation>
+        <source>Sent to</source>
+        <translation>送り先</translation>
     </message>
     <message>
-        <source>Add &amp;Recipient</source>
-        <translation>受取人を追加 (&amp;R)</translation>
+        <source>Payment to yourself</source>
+        <translation>自分自身への支払い</translation>
     </message>
     <message>
-        <source>Clear all fields of the form.</source>
-        <translation>全ての入力項目をクリア</translation>
+        <source>Mined</source>
+        <translation>発掘した</translation>
     </message>
     <message>
-        <source>Dust:</source>
-        <translation>ダスト：</translation>
+        <source>watch-only</source>
+        <translation>監視限定</translation>
     </message>
     <message>
-        <source>Clear &amp;All</source>
-        <translation>すべてクリア (&amp;A)</translation>
+        <source>(n/a)</source>
+        <translation>(n/a)</translation>
     </message>
     <message>
-        <source>Balance:</source>
-        <translation>残高:</translation>
+        <source>(no label)</source>
+        <translation>（ラベル無し）</translation>
     </message>
     <message>
-        <source>Confirm the send action</source>
-        <translation>送る操作を確認する</translation>
+        <source>Transaction status. Hover over this field to show number of confirmations.</source>
+        <translation>取引の状況。このフィールドの上にカーソルを置くと検証の数を表示します。</translation>
     </message>
     <message>
-        <source>S&amp;end</source>
-        <translation>送金 (&amp;E)</translation>
+        <source>Date and time that the transaction was received.</source>
+        <translation>取引を受信した日時。</translation>
     </message>
-</context>
-<context>
-    <name>SendCoinsEntry</name>
     <message>
-        <source>A&amp;mount:</source>
-        <translation>金額(&amp;A):</translation>
+        <source>Type of transaction.</source>
+        <translation>取引の種類。</translation>
     </message>
     <message>
-        <source>Pay &amp;To:</source>
-        <translation>送り先(&amp;T):</translation>
+        <source>Whether or not a watch-only address is involved in this transaction.</source>
+        <translation>監視限定アドレスがこのトランザクションに含まれているかどうか</translation>
     </message>
     <message>
-        <source>&amp;Label:</source>
-        <translation>ラベル(&amp;L):</translation>
+        <source>User-defined intent/purpose of the transaction.</source>
+        <translation>ユーザ定義のトランザクションの意図や目的。</translation>
     </message>
     <message>
-        <source>Choose previously used address</source>
-        <translation>前に使用したアドレスを選ぶ</translation>
+        <source>Amount removed from or added to balance.</source>
+        <translation>残高に追加または削除された総額。</translation>
     </message>
+</context>
+<context>
+    <name>TransactionView</name>
     <message>
-        <source>This is a normal payment.</source>
-        <translation>これは通常の支払です。</translation>
+        <source>All</source>
+        <translation>すべて</translation>
     </message>
     <message>
-        <source>The Bitcoin address to send the payment to</source>
-        <translation>支払の送金先Bitcoinアドレス</translation>
+        <source>Today</source>
+        <translation>今日</translation>
     </message>
     <message>
-        <source>Alt+A</source>
-        <translation>Alt+A</translation>
+        <source>This week</source>
+        <translation>今週</translation>
     </message>
     <message>
-        <source>Paste address from clipboard</source>
-        <translation>クリップボードからアドレスを貼付ける</translation>
+        <source>This month</source>
+        <translation>今月</translation>
     </message>
     <message>
-        <source>Alt+P</source>
-        <translation>Alt+P</translation>
+        <source>Last month</source>
+        <translation>先月</translation>
     </message>
     <message>
-        <source>Remove this entry</source>
-        <translation>この項目を削除する</translation>
+        <source>This year</source>
+        <translation>今年</translation>
     </message>
     <message>
-        <source>The fee will be deducted from the amount being sent. The recipient will receive less bitcoins than you enter in the amount field. If multiple recipients are selected, the fee is split equally.</source>
-        <translation>送金する金額から手数料が差し引かれます。受取人は数量フィールドで指定した量よりも少ないビットコインを受け取ります。受取人が複数いる場合には、手数料は均等割されます。</translation>
+        <source>Range...</source>
+        <translation>期間...</translation>
     </message>
     <message>
-        <source>S&amp;ubtract fee from amount</source>
-        <translation>送金額から手数料を差し引く (&amp;U)</translation>
+        <source>Received with</source>
+        <translation>送り主</translation>
     </message>
     <message>
-        <source>Message:</source>
-        <translation>メッセージ:</translation>
+        <source>Sent to</source>
+        <translation>送り先</translation>
     </message>
     <message>
-        <source>This is an unauthenticated payment request.</source>
-        <translation>これは未認証の支払いリクエストです。</translation>
+        <source>To yourself</source>
+        <translation>自分自身</translation>
     </message>
     <message>
-        <source>This is an authenticated payment request.</source>
-        <translation>これは認証済みの支払いリクエストです。</translation>
+        <source>Mined</source>
+        <translation>発掘した</translation>
     </message>
     <message>
-        <source>Enter a label for this address to add it to the list of used addresses</source>
-        <translation>このアドレスに対するラベルを入力することで、使用済みアドレスの一覧に追加することができます</translation>
+        <source>Other</source>
+        <translation>その他</translation>
     </message>
     <message>
-        <source>A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
-        <translation>bitcoin: URIに添付されていたメッセージです。これは参照用としてトランザクションとともに保存されます。注意：このメッセージはBitcoinネットワークを通して送信されるわけではありません。</translation>
+        <source>Enter address or label to search</source>
+        <translation>検索するアドレスまたはラベルを入力</translation>
     </message>
     <message>
-        <source>Pay To:</source>
-        <translation>支払先:</translation>
+        <source>Min amount</source>
+        <translation>最小の額</translation>
     </message>
     <message>
-        <source>Memo:</source>
-        <translation>メモ：</translation>
+        <source>Abandon transaction</source>
+        <translation>取引の中止</translation>
     </message>
-</context>
-<context>
-    <name>ShutdownWindow</name>
     <message>
-        <source>%1 is shutting down...</source>
-        <translation>%1 をシャットダウンしています...</translation>
+        <source>Copy address</source>
+        <translation>アドレスをコピーする</translation>
     </message>
     <message>
-        <source>Do not shut down the computer until this window disappears.</source>
-        <translation>このウィンドウが消えるまでコンピュータをシャットダウンしないで下さい。</translation>
+        <source>Copy label</source>
+        <translation>ラベルをコピーする</translation>
     </message>
-</context>
-<context>
-    <name>SignVerifyMessageDialog</name>
     <message>
-        <source>Signatures - Sign / Verify a Message</source>
-        <translation>署名 - メッセージの署名/検証</translation>
+        <source>Copy amount</source>
+        <translation>総額のコピー</translation>
     </message>
     <message>
-        <source>&amp;Sign Message</source>
-        <translation>メッセージの署名 (&amp;S)</translation>
+        <source>Copy transaction ID</source>
+        <translation>取引 ID をコピー</translation>
     </message>
     <message>
-        <source>You can sign messages/agreements with your addresses to prove you can receive bitcoins sent to them. Be careful not to sign anything vague or random, as phishing attacks may try to trick you into signing your identity over to them. Only sign fully-detailed statements you agree to.</source>
-        <translation>あなたの所有しているアドレスによりメッセージや合意書に署名をすることで、それらアドレスに対して送られたビットコインを受け取ることができることを証明できます。フィッシング攻撃により不正にあなたの識別情報を署名させられてしまうことを防ぐために、不明確なものやランダムなものに対して署名しないよう注意してください。合意することが可能な、よく詳細の記された文言にのみ署名するようにしてください。</translation>
+        <source>Copy raw transaction</source>
+        <translation>生トランザクションをコピー</translation>
     </message>
     <message>
-        <source>The Bitcoin address to sign the message with</source>
-        <translation>メッセージを署名するBitcoinアドレス</translation>
+        <source>Copy full transaction details</source>
+        <translation>トランザクションの詳細すべてをコピー</translation>
     </message>
     <message>
-        <source>Choose previously used address</source>
-        <translation>前に使用したアドレスを選ぶ</translation>
+        <source>Edit label</source>
+        <translation>ラベルの編集</translation>
     </message>
     <message>
-        <source>Alt+A</source>
-        <translation>Alt+A</translation>
+        <source>Show transaction details</source>
+        <translation>取引の詳細を表示</translation>
     </message>
     <message>
-        <source>Paste address from clipboard</source>
-        <translation>クリップボードからアドレスを貼付ける</translation>
+        <source>Export Transaction History</source>
+        <translation>トランザクション履歴をエクスポートする</translation>
     </message>
     <message>
-        <source>Alt+P</source>
-        <translation>Alt+P</translation>
+        <source>Comma separated file (*.csv)</source>
+        <translation>テキスト CSV (*.csv)</translation>
     </message>
     <message>
-        <source>Enter the message you want to sign here</source>
-        <translation>ここにあなたが署名するメッセージを入力します</translation>
+        <source>Confirmed</source>
+        <translation>検証済み</translation>
     </message>
     <message>
-        <source>Signature</source>
-        <translation>署名</translation>
+        <source>Watch-only</source>
+        <translation>監視限定</translation>
     </message>
     <message>
-        <source>Copy the current signature to the system clipboard</source>
-        <translation>現在の署名をシステムのクリップボードにコピーする</translation>
+        <source>Date</source>
+        <translation>日付</translation>
     </message>
     <message>
-        <source>Sign the message to prove you own this Bitcoin address</source>
-        <translation>この Bitcoin アドレスを所有していることを証明するためにメッセージに署名</translation>
+        <source>Type</source>
+        <translation>タイプ</translation>
     </message>
     <message>
-        <source>Sign &amp;Message</source>
-        <translation>メッセージの署名 (&amp;M)</translation>
+        <source>Label</source>
+        <translation>ラベル</translation>
     </message>
     <message>
-        <source>Reset all sign message fields</source>
-        <translation>入力項目の内容をすべて消去します</translation>
+        <source>Address</source>
+        <translation>アドレス</translation>
     </message>
     <message>
-        <source>Clear &amp;All</source>
-        <translation>すべてクリア (&amp;A)</translation>
+        <source>ID</source>
+        <translation>ID</translation>
     </message>
     <message>
-        <source>&amp;Verify Message</source>
-        <translation>メッセージの検証 (&amp;V)</translation>
+        <source>Exporting Failed</source>
+        <translation>エクスポートに失敗しました</translation>
     </message>
     <message>
-        <source>Enter the receiver's address, message (ensure you copy line breaks, spaces, tabs, etc. exactly) and signature below to verify the message. Be careful not to read more into the signature than what is in the signed message itself, to avoid being tricked by a man-in-the-middle attack. Note that this only proves the signing party receives with the address, it cannot prove sendership of any transaction!</source>
-        <translation>受取人のアドレスとメッセージ（改行やスペース、タブなども完全に一致するよう注意してください）および署名を以下に入力し、メッセージの署名を検証してください。中間者攻撃により騙されるのを防ぐため、署名対象のメッセージに書かれていること以上の意味を署名から読み取ろうとしないよう注意してください。これは署名作成者がこのアドレスで受け取ったことを証明するだけであり、トランザクションの送信権限を証明するものではないことに注意してください！</translation>
+        <source>There was an error trying to save the transaction history to %1.</source>
+        <translation>トランザクション履歴を %1 へ保存する際にエラーが発生しました。</translation>
     </message>
     <message>
-        <source>The Bitcoin address the message was signed with</source>
-        <translation>メッセージの署名に使われたBitcoinアドレス</translation>
+        <source>Exporting Successful</source>
+        <translation>エクスポートに成功しました</translation>
     </message>
     <message>
-        <source>Verify the message to ensure it was signed with the specified Bitcoin address</source>
-        <translation>指定された Bitcoin アドレスで署名されたことを保証するメッセージを検証</translation>
+        <source>The transaction history was successfully saved to %1.</source>
+        <translation>トランザクション履歴は正常に%1に保存されました。</translation>
     </message>
     <message>
-        <source>Verify &amp;Message</source>
-        <translation>メッセージの検証 (&amp;M)</translation>
+        <source>Range:</source>
+        <translation>期間:</translation>
     </message>
     <message>
-        <source>Reset all verify message fields</source>
-        <translation>入力項目の内容をすべて消去します</translation>
+        <source>to</source>
+        <translation>から</translation>
     </message>
 </context>
 <context>
-    <name>SplashScreen</name>
+    <name>UnitDisplayStatusBarControl</name>
     <message>
-        <source>[testnet]</source>
-        <translation>[testnet]</translation>
+        <source>Unit to show amounts in. Click to select another unit.</source>
+        <translation>金額を表示する際の単位。クリックすることで他の単位を選択します。</translation>
     </message>
 </context>
 <context>
-    <name>TrafficGraphWidget</name>
+    <name>WalletFrame</name>
     <message>
-        <source>KB/s</source>
-        <translation>KB/s</translation>
+        <source>No wallet has been loaded.</source>
+        <translation>ウォレットがロードされていません</translation>
     </message>
 </context>
 <context>
-    <name>TransactionDescDialog</name>
+    <name>WalletModel</name>
     <message>
-        <source>This pane shows a detailed description of the transaction</source>
-        <translation>ここでは取引の詳細を表示しています</translation>
+        <source>Send Coins</source>
+        <translation>コインを送る</translation>
     </message>
 </context>
 <context>
-    <name>UnitDisplayStatusBarControl</name>
+    <name>WalletView</name>
     <message>
-        <source>Unit to show amounts in. Click to select another unit.</source>
-        <translation>金額を表示する際の単位。クリックすることで他の単位を選択します。</translation>
+        <source>&amp;Export</source>
+        <translation>エクスポート (&amp;E)</translation>
+    </message>
+    <message>
+        <source>Export the data in the current tab to a file</source>
+        <translation>ファイルに現在のタブのデータをエクスポート</translation>
+    </message>
+    <message>
+        <source>Backup Wallet</source>
+        <translation>ウォレットのバックアップ</translation>
+    </message>
+    <message>
+        <source>Wallet Data (*.dat)</source>
+        <translation>ウォレット データ (*.dat)</translation>
+    </message>
+    <message>
+        <source>Backup Failed</source>
+        <translation>バックアップに失敗しました</translation>
+    </message>
+    <message>
+        <source>There was an error trying to save the wallet data to %1.</source>
+        <translation>ウォレットデータを%1へ保存する際にエラーが発生しました。</translation>
+    </message>
+    <message>
+        <source>Backup Successful</source>
+        <translation>バックアップ成功</translation>
+    </message>
+    <message>
+        <source>The wallet data was successfully saved to %1.</source>
+        <translation>ウォレット データは正常に%1に保存されました。</translation>
     </message>
 </context>
 <context>
@@ -1750,6 +2997,18 @@
         <source>Accept command line and JSON-RPC commands</source>
         <translation>コマンドラインと JSON-RPC コマンドを許可</translation>
     </message>
+    <message>
+        <source>Accept connections from outside (default: 1 if no -proxy or -connect/-noconnect)</source>
+        <translation>外部からの接続を許可 (初期値: -proxy または -connect/-noconnect を使用していない場合は1)</translation>
+    </message>
+    <message>
+        <source>Connect only to the specified node(s); -noconnect or -connect=0 alone to disable automatic connections</source>
+        <translation>指定されたノードにのみ接続を行う; -noconnect または -connect=0 だけを指定すると自動接続を無効化します</translation>
+    </message>
+    <message>
+        <source>Distributed under the MIT software license, see the accompanying file %s or %s</source>
+        <translation>MITソフトウェアライセンスのもとで配布されています。付属のファイル %s または %s を参照してください</translation>
+    </message>
     <message>
         <source>If &lt;category&gt; is not supplied or if &lt;category&gt; = 1, output all debugging information.</source>
         <translation>&lt;category&gt; が与えられなかった場合や &lt;category&gt; = 1 の場合には、すべてのデバッグ情報が出力されます。</translation>
@@ -1790,10 +3049,6 @@
         <source>Unable to start HTTP server. See debug log for details.</source>
         <translation>HTTPサーバを開始できませんでした。詳細はデバッグログをご確認ください。</translation>
     </message>
-    <message>
-        <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
-        <translation>外部からの接続を許可 (初期値:  -proxy または -connect を使用していない場合は1)</translation>
-    </message>
     <message>
         <source>Bitcoin Core</source>
         <translation>Bitcoin のコア</translation>
@@ -1802,10 +3057,6 @@
         <source>The %s developers</source>
         <translation>%s の開発者</translation>
     </message>
-    <message>
-        <source>-fallbackfee is set very high! This is the transaction fee you may pay when fee estimates are not available.</source>
-        <translation>-fallbackfee が高すぎます！これは手数料の推定機能が利用できない場合に支払うトランザクション手数料です。</translation>
-    </message>
     <message>
         <source>A fee rate (in %s/kB) that will be used when fee estimation has insufficient data (default: %s)</source>
         <translation>十分なデータが蓄積されていない場合に手数料推定機能が利用する手数料レート (%s/kB) (デフォルト: %s)</translation>
@@ -1826,10 +3077,6 @@
         <source>Delete all wallet transactions and only recover those parts of the blockchain through -rescan on startup</source>
         <translation>ウォレットの全トランザクションを削除し、これらを-rescanオプションを用いることで起動時にブロックチェインのデータのみからリカバリします。</translation>
     </message>
-    <message>
-        <source>Distributed under the MIT software license, see the accompanying file COPYING or &lt;http://www.opensource.org/licenses/mit-license.php&gt;.</source>
-        <translation>MITソフトウェアライセンスのもとで配布されています。付属のCOPYINGファイルまたは&lt;http://www.opensource.org/licenses/mit-license.php&gt;を参照してください。</translation>
-    </message>
     <message>
         <source>Error loading %s: You can't enable HD on a already existing non-HD wallet</source>
         <translation>%s の読み込みエラー: 非HDウォレットが既に存在するため、HDウォレットを有効化できません</translation>
@@ -1842,10 +3089,6 @@
         <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source>
         <translation>ウォレットの取引を変更する際にコマンドを実行 (cmd の %s は TxID に置換される)</translation>
     </message>
-    <message>
-        <source>Force relay of transactions from whitelisted peers even they violate local relay policy (default: %d)</source>
-        <translation>ホワイトリストのピアから受け取ったトランザクションに関しては、たとえローカルの中継ポリシーに違反しているとしても中継を行うようにする (デフォルト: %d)</translation>
-    </message>
     <message>
         <source>Maximum allowed median peer time offset adjustment. Local perspective of time may be influenced by peers forward or backward by this amount. (default: %u seconds)</source>
         <translation>時間オフセット調整値のピア中央値に対する最大の許容値。ローカル時間の見込み値は、接続するピアにより前方ないし後方へ影響されます。(初期値: %u 秒)</translation>
@@ -1883,16 +3126,16 @@
         <translation>リスン ポートの割当に UPnP を使用 (初期値: リスン中および-proxyが指定されていない場合は1)</translation>
     </message>
     <message>
-        <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source>
-        <translation>警告： ネットワークは完全に同意しないみたいです。マイナーは何かの問題を経験してるみたいなんです。</translation>
+        <source>Wallet will not create transactions that violate mempool chain limits (default: %u)</source>
+        <translation>ウォレットがmempoolチェーン制限数を超えてトランザクションを作らないようにする (初期値: %u)</translation>
     </message>
     <message>
-        <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source>
-        <translation>警告： ピアーと完全に同意しないみたいです！アップグレードは必要かもしれません、それとも他のノードはアップグレードは必要かもしれません。</translation>
+        <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source>
+        <translation>警告: ネットワークは完全に合意が取れていないようです。幾人かのマイナーに何らかの障害が発生しているようです。</translation>
     </message>
     <message>
-        <source>Whitelist peers connecting from the given netmask or IP address. Can be specified multiple times.</source>
-        <translation>与えられたネットマスクやIPアドレスから接続を行う、ホワイトリストのピア。複数回指定できます。</translation>
+        <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source>
+        <translation>警告: ピアと完全に合意が取れていないようです！このノードまたは他のノードのアップグレードが必要なようです。</translation>
     </message>
     <message>
         <source>You need to rebuild the database using -reindex-chainstate to change -txindex</source>
@@ -1927,12 +3170,12 @@
         <translation>-%s アドレス '%s' を解決できません</translation>
     </message>
     <message>
-        <source>Change index out of range</source>
-        <translation>おつりのインデックスが範囲外です</translation>
+        <source>Chain selection options:</source>
+        <translation>チェイン選択オプション:</translation>
     </message>
     <message>
-        <source>Connect only to the specified node(s)</source>
-        <translation>指定したノードだけに接続</translation>
+        <source>Change index out of range</source>
+        <translation>おつりのインデックスが範囲外です</translation>
     </message>
     <message>
         <source>Connection options:</source>
@@ -2055,10 +3298,6 @@
         <source>Location of the auth cookie (default: data dir)</source>
         <translation>認証クッキーの場所 (デフォルト: )</translation>
     </message>
-    <message>
-        <source>Minimum bytes per sigop in transactions we relay and mine (default: %u)</source>
-        <translation>中継や採掘を行ってもよい、sigopあたりの最小バイト数 (デフォルト: %u)</translation>
-    </message>
     <message>
         <source>Not enough file descriptors available.</source>
         <translation>使用可能なファイルディスクリプタが不足しています。</translation>
@@ -2099,10 +3338,6 @@
         <source>Set database cache size in megabytes (%d to %d, default: %d)</source>
         <translation>データベースのキャッシュサイズをメガバイトで設定 (%dから%d。初期値: %d)</translation>
     </message>
-    <message>
-        <source>Set maximum block cost (default: %d)</source>
-        <translation>最大ブロックコストを設定 (初期値: %d)</translation>
-    </message>
     <message>
         <source>Set maximum block size in bytes (default: %d)</source>
         <translation>最大ブロックサイズをバイトで設定 (初期値: %d)</translation>
@@ -2135,6 +3370,10 @@
         <source>Use UPnP to map the listening port (default: %u)</source>
         <translation>リッスンポートの割当に UPnP を使用 (初期値: %u)</translation>
     </message>
+    <message>
+        <source>Use the test chain</source>
+        <translation>テストチェインを利用する</translation>
+    </message>
     <message>
         <source>User Agent comment (%s) contains unsafe characters.</source>
         <translation>ユーザエージェントのコメント (%s) には安全でない文字が含まれています。</translation>
@@ -2207,10 +3446,6 @@
         <source>Maximum size of data in data carrier transactions we relay and mine (default: %u)</source>
         <translation>中継および採掘を行う際の、データ運送トランザクションの中のデータの最大サイズ (初期値: %u)</translation>
     </message>
-    <message>
-        <source>Query for peer addresses via DNS lookup, if low on addresses (default: 1 unless -connect)</source>
-        <translation>保有するピアアドレスが少ない場合、DNS ルックアップによりピアアドレスを問い合わせる (-connect を使っていない場合の初期値: 1)</translation>
-    </message>
     <message>
         <source>Randomize credentials for every proxy connection. This enables Tor stream isolation (default: %u)</source>
         <translation>認証情報をプロキシー接続ごとにランダム化する。これによりTorストリーム分離をすることができます (規定値: %u)</translation>
@@ -2223,10 +3458,6 @@
         <source>The transaction amount is too small to send after the fee has been deducted</source>
         <translation>手数料差引後のトランザクションの金額が小さすぎるため、送金できません。</translation>
     </message>
-    <message>
-        <source>This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit &lt;https://www.openssl.org/&gt; and cryptographic software written by Eric Young and UPnP software written by Thomas Bernard.</source>
-        <translation>この製品はOpenSSLプロジェクトにより開発されたソフトウェアをOpenSSLツールキットとして利用しています &lt;https://www.openssl.org/&gt;。また、Eric Young氏により開発された暗号ソフトウェア、Thomas Bernard氏により書かれたUPnPソフトウェアを用いています。</translation>
-    </message>
     <message>
         <source>Use hierarchical deterministic key generation (HD) after BIP32. Only has effect during wallet creation/first start</source>
         <translation>BIP32 に従った階層的決定性鍵生成方式 (HD) を利用します。ウォレットの生成時ないし最初に起動した時にのみ有効です。</translation>
@@ -2339,10 +3570,6 @@
         <source>Transaction amount too small</source>
         <translation>取引の額が小さ過ぎます</translation>
     </message>
-    <message>
-        <source>Transaction amounts must be positive</source>
-        <translation>取引の額は0より大きくしてください</translation>
-    </message>
     <message>
         <source>Transaction too large for fee policy</source>
         <translation>手数料ポリシーに対してトランザクションが大きすぎます</translation>
@@ -2407,18 +3634,22 @@
         <source>-maxtxfee is set very high! Fees this large could be paid on a single transaction.</source>
         <translation>-maxtxfee が非常に高く設定されています！ひとつのトランザクションでこの量の手数料が支払われてしまうことがあります。</translation>
     </message>
-    <message>
-        <source>-paytxfee is set very high! This is the transaction fee you will pay if you send a transaction.</source>
-        <translation>-paytxfee が非常に高く設定されています! これは取引を送信する場合に支払う取引手数料です。</translation>
-    </message>
     <message>
         <source>Do not keep transactions in the mempool longer than &lt;n&gt; hours (default: %u)</source>
         <translation>mempool内でトランザクションを &lt;n&gt; 時間以上保持しない (初期値: %u)</translation>
     </message>
+    <message>
+        <source>Equivalent bytes per sigop in transactions for relay and mining (default: %u)</source>
+        <translation>中継や採掘を行う際のトランザクション内の、sigopあたりバイト数の相当量 (初期値: %u)</translation>
+    </message>
     <message>
         <source>Fees (in %s/kB) smaller than this are considered zero fee for transaction creation (default: %s)</source>
         <translation>トランザクション作成の際、この値未満の手数料 (%s/kB単位) はゼロであるとみなす (デフォルト: %s)</translation>
     </message>
+    <message>
+        <source>Force relay of transactions from whitelisted peers even if they violate local relay policy (default: %d)</source>
+        <translation>ホワイトリストのピアから受け取ったトランザクションに関しては、たとえローカルの中継ポリシーに違反しているとしても中継を行うようにする (デフォルト: %d)</translation>
+    </message>
     <message>
         <source>How thorough the block verification of -checkblocks is (0-4, default: %u)</source>
         <translation>-checkblocks のブロックの検証レベル (0-4, 初期値: %u)</translation>
@@ -2435,10 +3666,26 @@
         <source>Output debugging information (default: %u, supplying &lt;category&gt; is optional)</source>
         <translation>デバッグ情報を出力する (初期値: %u, &lt;category&gt; の指定は任意です)</translation>
     </message>
+    <message>
+        <source>Query for peer addresses via DNS lookup, if low on addresses (default: 1 unless -connect/-noconnect)</source>
+        <translation>保有するピアアドレスが少ない場合、DNS ルックアップによりピアアドレスを問い合わせる (-connect/-noconnect を使っていない場合の初期値: 1)</translation>
+    </message>
+    <message>
+        <source>Sets the serialization of raw transaction or block hex returned in non-verbose mode, non-segwit(0) or segwit(1) (default: %d)</source>
+        <translation>非冗長モードで返却する生トランザクションやブロックの16進数表現のシリアライゼーションフォーマットを非 segwit (0) または segwit (1) のものに設定する (デフォルト: %d)</translation>
+    </message>
     <message>
         <source>Support filtering of blocks and transaction with bloom filters (default: %u)</source>
         <translation>Bloomフィルタによる、ブロックおよびトランザクションのフィルタリングを有効化する (初期値: %u)</translation>
     </message>
+    <message>
+        <source>This is the transaction fee you may pay when fee estimates are not available.</source>
+        <translation>これは手数料の推定機能が利用できない場合に支払うトランザクション手数料です。</translation>
+    </message>
+    <message>
+        <source>This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit %s and cryptographic software written by Eric Young and UPnP software written by Thomas Bernard.</source>
+        <translation>この製品はOpenSSLプロジェクトにより開発されたソフトウェアをOpenSSLツールキット %s として利用しています &lt;https://www.openssl.org/&gt;。また、Eric Young氏により開発された暗号ソフトウェア、Thomas Bernard氏により書かれたUPnPソフトウェアを用いています。</translation>
+    </message>
     <message>
         <source>Total length of network version string (%i) exceeds maximum length (%i). Reduce the number or size of uacomments.</source>
         <translation>ネットワークバージョン文字 (%i) の長さが最大の長さ (%i) を超えています。UAコメントの数や長さを削減してください。</translation>
@@ -2471,6 +3718,14 @@
         <source>Warning: Wallet file corrupt, data salvaged! Original %s saved as %s in %s; if your balance or transactions are incorrect you should restore from a backup.</source>
         <translation>警告: ウォレットファイルが破損していましたのでデータを復旧しました！元の %s は %s として %s に保存されました; 残高やトランザクションが正しくない場合にはバックアップから復元してください。</translation>
     </message>
+    <message>
+        <source>Whitelist peers connecting from the given IP address (e.g. 1.2.3.4) or CIDR notated network (e.g. 1.2.3.0/24). Can be specified multiple times.</source>
+        <translation>ホワイトリストとして登録するピアノ、接続元の IP アドレス (例: 1.2.3.4) または CIDR 表現のネットワーク (例: 1.2.3.0/24)。複数回指定することもできる</translation>
+    </message>
+    <message>
+        <source>%s is set very high!</source>
+        <translation>%s の設定値は高すぎます</translation>
+    </message>
     <message>
         <source>(default: %s)</source>
         <translation>(デフォルト: %s)</translation>
@@ -2491,6 +3746,10 @@
         <source>Invalid -proxy address: '%s'</source>
         <translation>無効な -proxy アドレス: '%s'</translation>
     </message>
+    <message>
+        <source>Keypool ran out, please call keypoolrefill first</source>
+        <translation>鍵プールが枯渇しました。まずはじめに keypoolrefill を呼び出してください</translation>
+    </message>
     <message>
         <source>Listen for JSON-RPC connections on &lt;port&gt; (default: %u or testnet: %u)</source>
         <translation>&lt;port&gt; で JSON-RPC 接続をリスン (初期値: %u、testnet は %u)</translation>
@@ -2527,13 +3786,17 @@
         <source>Relay non-P2SH multisig (default: %u)</source>
         <translation>P2SHでないマルチシグトランザクションをリレーする (初期値: %u)</translation>
     </message>
+    <message>
+        <source>Send transactions with full-RBF opt-in enabled (default: %u)</source>
+        <translation>full-RBF opt-in を利用してトランザクションを送信する (初期値: %u)</translation>
+    </message>
     <message>
         <source>Set key pool size to &lt;n&gt; (default: %u)</source>
         <translation>key pool のサイズを &lt;n&gt; (初期値: %u) にセット</translation>
     </message>
     <message>
-        <source>Set minimum block size in bytes (default: %u)</source>
-        <translation>最小ブロックサイズをバイトで設定 (初期値: %u)</translation>
+        <source>Set maximum BIP141 block weight (default: %d)</source>
+        <translation>BIP141ブロック重みの最大値を設定 (初期値: %d)</translation>
     </message>
     <message>
         <source>Set the number of threads to service RPC calls (default: %d)</source>
@@ -2555,10 +3818,38 @@
         <source>Spend unconfirmed change when sending transactions (default: %u)</source>
         <translation>トランザクション送信時に未検証のおつりを使用する (デフォルト: %u)</translation>
     </message>
+    <message>
+        <source>Starting network threads...</source>
+        <translation>ネットワークのスレッドを起動しています...</translation>
+    </message>
+    <message>
+        <source>The wallet will avoid paying less than the minimum relay fee.</source>
+        <translation>ウォレットは最小中継手数料を下回る額の支払を拒否します。</translation>
+    </message>
+    <message>
+        <source>This is the minimum transaction fee you pay on every transaction.</source>
+        <translation>これはすべてのトランザクションに対して最低限支払うべき手数料です。</translation>
+    </message>
+    <message>
+        <source>This is the transaction fee you will pay if you send a transaction.</source>
+        <translation>これは取引を送信する場合に支払う取引手数料です。</translation>
+    </message>
     <message>
         <source>Threshold for disconnecting misbehaving peers (default: %u)</source>
         <translation>不正なピアを切断するためのしきい値 (初期値: %u)</translation>
     </message>
+    <message>
+        <source>Transaction amounts must not be negative</source>
+        <translation>取引の額は負であってはいけません</translation>
+    </message>
+    <message>
+        <source>Transaction has too long of a mempool chain</source>
+        <translation>トランザクションのmempoolチェインが長過ぎます</translation>
+    </message>
+    <message>
+        <source>Transaction must have at least one recipient</source>
+        <translation>トランザクションは最低ひとつの受取先が必要です</translation>
+    </message>
     <message>
         <source>Unknown network specified in -onlynet: '%s'</source>
         <translation>-onlynet で指定された '%s' は未知のネットワークです</translation>
diff --git a/src/qt/locale/bitcoin_ka.ts b/src/qt/locale/bitcoin_ka.ts
index 80508be8eeb82..920f44758a6b1 100644
--- a/src/qt/locale/bitcoin_ka.ts
+++ b/src/qt/locale/bitcoin_ka.ts
@@ -37,7 +37,10 @@
         <source>&amp;Delete</source>
         <translation>&amp;წაშლა</translation>
     </message>
-</context>
+    </context>
+<context>
+    <name>AddressTableModel</name>
+    </context>
 <context>
     <name>AskPassphraseDialog</name>
     <message>
@@ -56,7 +59,7 @@
         <source>Repeat new passphrase</source>
         <translation>გაიმეორეთ ახალი ფრაზა-პაროლი</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>BanTableModel</name>
     </context>
@@ -238,10 +241,6 @@
         <source>No block source available...</source>
         <translation>ბლოკების წყარო მიუწვდომელია...</translation>
     </message>
-    <message>
-        <source>%1 and %2</source>
-        <translation>%1 და %2</translation>
-    </message>
     <message>
         <source>%1 behind</source>
         <translation>%1 გავლილია</translation>
@@ -290,7 +289,7 @@
         <source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;locked&lt;/b&gt;</source>
         <translation>საფულე &lt;b&gt;დაშიფრულია&lt;/b&gt; და ამჟამად &lt;b&gt;დაბლოკილია&lt;/b&gt;</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>CoinControlDialog</name>
     <message>
@@ -305,10 +304,6 @@
         <source>Amount:</source>
         <translation>თანხა:</translation>
     </message>
-    <message>
-        <source>Priority:</source>
-        <translation>პრიორიტეტი:</translation>
-    </message>
     <message>
         <source>Fee:</source>
         <translation>საკომისიო:</translation>
@@ -349,11 +344,7 @@
         <source>Confirmed</source>
         <translation>დადასტურებულია</translation>
     </message>
-    <message>
-        <source>Priority</source>
-        <translation>პრიორიტეტი</translation>
-    </message>
-</context>
+    </context>
 <context>
     <name>EditAddressDialog</name>
     <message>
@@ -376,7 +367,7 @@
         <source>&amp;Address</source>
         <translation>მის&amp;ამართი</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>FreespaceChecker</name>
     <message>
@@ -438,6 +429,17 @@
         <translation>შეცდომა</translation>
     </message>
     </context>
+<context>
+    <name>ModalOverlay</name>
+    <message>
+        <source>Form</source>
+        <translation>ფორმა</translation>
+    </message>
+    <message>
+        <source>Last block time</source>
+        <translation>ბოლო ბლოკის დრო</translation>
+    </message>
+    </context>
 <context>
     <name>OpenURIDialog</name>
     <message>
@@ -456,7 +458,7 @@
         <source>Select payment request file</source>
         <translation>გადახდის მოთხოვნის ფაილის არჩევა</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>OptionsDialog</name>
     <message>
@@ -639,6 +641,9 @@
         <translation>თქვენი სრული მიმდინარე ბალანსი</translation>
     </message>
     </context>
+<context>
+    <name>PaymentServer</name>
+    </context>
 <context>
     <name>PeerTableModel</name>
     </context>
@@ -660,6 +665,16 @@
         <source>N/A</source>
         <translation>მიუწვდ.</translation>
     </message>
+    <message>
+        <source>%1 and %2</source>
+        <translation>%1 და %2</translation>
+    </message>
+    </context>
+<context>
+    <name>QObject::QObject</name>
+    </context>
+<context>
+    <name>QRImageWidget</name>
     </context>
 <context>
     <name>RPCConsole</name>
@@ -842,7 +857,7 @@
         <source>Remove</source>
         <translation>წაშლა</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>ReceiveRequestDialog</name>
     <message>
@@ -861,7 +876,10 @@
         <source>&amp;Save Image...</source>
         <translation>გამო&amp;სახულების შენახვა...</translation>
     </message>
-</context>
+    </context>
+<context>
+    <name>RecentRequestsTableModel</name>
+    </context>
 <context>
     <name>SendCoinsDialog</name>
     <message>
@@ -896,10 +914,6 @@
         <source>Amount:</source>
         <translation>თანხა:</translation>
     </message>
-    <message>
-        <source>Priority:</source>
-        <translation>პრიორიტეტი:</translation>
-    </message>
     <message>
         <source>Fee:</source>
         <translation>საკომისიო:</translation>
@@ -952,7 +966,7 @@
         <source>S&amp;end</source>
         <translation>გაგ&amp;ზავნა</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>SendCoinsEntry</name>
     <message>
@@ -1011,7 +1025,10 @@
         <source>Memo:</source>
         <translation>შენიშვნა:</translation>
     </message>
-</context>
+    </context>
+<context>
+    <name>SendConfirmationDialog</name>
+    </context>
 <context>
     <name>ShutdownWindow</name>
     <message>
@@ -1089,7 +1106,7 @@
         <source>Reset all verify message fields</source>
         <translation>ვერიფიკაციის ყველა ველის წაშლა</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>SplashScreen</name>
     <message>
@@ -1104,16 +1121,34 @@
         <translation>KB/s</translation>
     </message>
 </context>
+<context>
+    <name>TransactionDesc</name>
+    </context>
 <context>
     <name>TransactionDescDialog</name>
     <message>
         <source>This pane shows a detailed description of the transaction</source>
         <translation>ტრანსაქციის დაწვრილებითი აღწერილობა</translation>
     </message>
-</context>
+    </context>
+<context>
+    <name>TransactionTableModel</name>
+    </context>
+<context>
+    <name>TransactionView</name>
+    </context>
 <context>
     <name>UnitDisplayStatusBarControl</name>
     </context>
+<context>
+    <name>WalletFrame</name>
+    </context>
+<context>
+    <name>WalletModel</name>
+    </context>
+<context>
+    <name>WalletView</name>
+    </context>
 <context>
     <name>bitcoin-core</name>
     <message>
@@ -1140,10 +1175,6 @@
         <source>Run in the background as a daemon and accept commands</source>
         <translation>რეზიდენტულად გაშვება და კომანდების მიღება</translation>
     </message>
-    <message>
-        <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
-        <translation>გარედან შეერთებების დაშვება (ნაგულისხმევი: 1 თუ არ გამოიყენება -proxy ან -connect)</translation>
-    </message>
     <message>
         <source>Bitcoin Core</source>
         <translation>Bitcoin Core</translation>
@@ -1156,18 +1187,6 @@
         <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source>
         <translation>კომანდის შესრულება საფულის ტრანსაქციის ცვლილებისას (%s კომანდაში ჩანაცვლდება TxID-ით)</translation>
     </message>
-    <message>
-        <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
-        <translation>ეს არის წინასწარი სატესტო ვერსია - გამოიყენეთ საკუთარი რისკით - არ გამოიყენოთ მოპოვებისა ან კომერციული მიზნებისათვის</translation>
-    </message>
-    <message>
-        <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source>
-        <translation>ყურადღება: ქსელში შეუთანხმებლობაა. შესაძლოა ცალკეულ მომპოვებლებს პრობლემები ექმნებათ!</translation>
-    </message>
-    <message>
-        <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source>
-        <translation>ყურადღება: ჩვენ არ ვეთანხმებით ყველა პირს. შესაძლოა თქვენ ან სხვა კვანძებს განახლება გჭირდებათ.</translation>
-    </message>
     <message>
         <source>&lt;category&gt; can be:</source>
         <translation>&lt;category&gt; შეიძლება იყოს:</translation>
@@ -1176,10 +1195,6 @@
         <source>Block creation options:</source>
         <translation>ბლოკის შექმნის ოპციები:</translation>
     </message>
-    <message>
-        <source>Connect only to the specified node(s)</source>
-        <translation>შეერთება მხოლოდ მითითებულ კვანძ(ებ)თან</translation>
-    </message>
     <message>
         <source>Corrupted block database detected</source>
         <translation>შენიშნულია ბლოკთა ბაზის დაზიანება</translation>
@@ -1280,10 +1295,6 @@
         <source>Transaction amount too small</source>
         <translation>ტრანსაქციების რაოდენობა ძალიან ცოტაა</translation>
     </message>
-    <message>
-        <source>Transaction amounts must be positive</source>
-        <translation>ტრანსაქციების რაოდენობა დადებითი რიცხვი უნდა იყოს</translation>
-    </message>
     <message>
         <source>Transaction too large</source>
         <translation>ტრანსაქცია ძალიან დიდია</translation>
diff --git a/src/qt/locale/bitcoin_kk_KZ.ts b/src/qt/locale/bitcoin_kk_KZ.ts
index ff02521264f73..2c9d228401f0b 100644
--- a/src/qt/locale/bitcoin_kk_KZ.ts
+++ b/src/qt/locale/bitcoin_kk_KZ.ts
@@ -25,7 +25,10 @@
         <source>&amp;Delete</source>
         <translation>Жою</translation>
     </message>
-</context>
+    </context>
+<context>
+    <name>AddressTableModel</name>
+    </context>
 <context>
     <name>AskPassphraseDialog</name>
     <message>
@@ -40,7 +43,7 @@
         <source>Repeat new passphrase</source>
         <translation>Жаңа құпия сөзді қайта енгізу</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>BanTableModel</name>
     </context>
@@ -90,26 +93,6 @@
         <source>&amp;Help</source>
         <translation>Көмек</translation>
     </message>
-    <message numerus="yes">
-        <source>%n hour(s)</source>
-        <translation><numerusform>%n сағат</numerusform></translation>
-    </message>
-    <message numerus="yes">
-        <source>%n day(s)</source>
-        <translation><numerusform>%n күн</numerusform></translation>
-    </message>
-    <message numerus="yes">
-        <source>%n week(s)</source>
-        <translation><numerusform>%n апта</numerusform></translation>
-    </message>
-    <message>
-        <source>%1 and %2</source>
-        <translation>%1 немесе %2</translation>
-    </message>
-    <message numerus="yes">
-        <source>%n year(s)</source>
-        <translation><numerusform>%n жыл</numerusform></translation>
-    </message>
     <message>
         <source>%1 behind</source>
         <translation>%1 қалмады</translation>
@@ -137,10 +120,6 @@
         <source>Amount:</source>
         <translation>Саны</translation>
     </message>
-    <message>
-        <source>Priority:</source>
-        <translation>Басымдық</translation>
-    </message>
     <message>
         <source>Fee:</source>
         <translation>Комиссия</translation>
@@ -169,11 +148,7 @@
         <source>Confirmed</source>
         <translation>Растық</translation>
     </message>
-    <message>
-        <source>Priority</source>
-        <translation>Басымдық</translation>
-    </message>
-</context>
+    </context>
 <context>
     <name>EditAddressDialog</name>
     <message>
@@ -184,7 +159,7 @@
         <source>&amp;Address</source>
         <translation>Адрес</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>FreespaceChecker</name>
     </context>
@@ -198,6 +173,9 @@
         <translation>қате</translation>
     </message>
     </context>
+<context>
+    <name>ModalOverlay</name>
+    </context>
 <context>
     <name>OpenURIDialog</name>
     </context>
@@ -211,6 +189,9 @@
 <context>
     <name>OverviewPage</name>
     </context>
+<context>
+    <name>PaymentServer</name>
+    </context>
 <context>
     <name>PeerTableModel</name>
     </context>
@@ -220,6 +201,16 @@
         <source>Amount</source>
         <translation>Саны</translation>
     </message>
+    <message>
+        <source>%1 and %2</source>
+        <translation>%1 немесе %2</translation>
+    </message>
+    </context>
+<context>
+    <name>QObject::QObject</name>
+    </context>
+<context>
+    <name>QRImageWidget</name>
     </context>
 <context>
     <name>RPCConsole</name>
@@ -238,16 +229,15 @@
 <context>
     <name>ReceiveRequestDialog</name>
     </context>
+<context>
+    <name>RecentRequestsTableModel</name>
+    </context>
 <context>
     <name>SendCoinsDialog</name>
     <message>
         <source>Amount:</source>
         <translation>Саны</translation>
     </message>
-    <message>
-        <source>Priority:</source>
-        <translation>Басымдық</translation>
-    </message>
     <message>
         <source>Fee:</source>
         <translation>Комиссия:</translation>
@@ -268,6 +258,9 @@
         <translation>Саны</translation>
     </message>
     </context>
+<context>
+    <name>SendConfirmationDialog</name>
+    </context>
 <context>
     <name>ShutdownWindow</name>
     </context>
@@ -280,12 +273,30 @@
 <context>
     <name>TrafficGraphWidget</name>
     </context>
+<context>
+    <name>TransactionDesc</name>
+    </context>
 <context>
     <name>TransactionDescDialog</name>
     </context>
+<context>
+    <name>TransactionTableModel</name>
+    </context>
+<context>
+    <name>TransactionView</name>
+    </context>
 <context>
     <name>UnitDisplayStatusBarControl</name>
     </context>
+<context>
+    <name>WalletFrame</name>
+    </context>
+<context>
+    <name>WalletModel</name>
+    </context>
+<context>
+    <name>WalletView</name>
+    </context>
 <context>
     <name>bitcoin-core</name>
     <message>
diff --git a/src/qt/locale/bitcoin_ko_KR.ts b/src/qt/locale/bitcoin_ko_KR.ts
index 012632c0e0a9f..4198b7ea56db9 100644
--- a/src/qt/locale/bitcoin_ko_KR.ts
+++ b/src/qt/locale/bitcoin_ko_KR.ts
@@ -41,6 +41,77 @@
         <source>&amp;Delete</source>
         <translation>삭제(&amp;D)</translation>
     </message>
+    <message>
+        <source>Choose the address to send coins to</source>
+        <translation>코인을 보내실 주소를 선택하세요</translation>
+    </message>
+    <message>
+        <source>Choose the address to receive coins with</source>
+        <translation>코인을 받으실 주소를 선택하세요</translation>
+    </message>
+    <message>
+        <source>C&amp;hoose</source>
+        <translation>선택 (&amp;H)</translation>
+    </message>
+    <message>
+        <source>Sending addresses</source>
+        <translation>보내는 주소들</translation>
+    </message>
+    <message>
+        <source>Receiving addresses</source>
+        <translation>받은 주소들</translation>
+    </message>
+    <message>
+        <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source>
+        <translation>비트코인을 보내는 계좌 주소입니다. 코인을 보내기 전에 잔고와 받는 주소를 항상 확인하세요.</translation>
+    </message>
+    <message>
+        <source>These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source>
+        <translation>비트코인을 받을 수 있는 계좌 주소입니다. 매 거래마다 새로운 주소 사용을 권장합니다. </translation>
+    </message>
+    <message>
+        <source>&amp;Copy Address</source>
+        <translation>계좌 복사(&amp;C)</translation>
+    </message>
+    <message>
+        <source>Copy &amp;Label</source>
+        <translation>라벨 복사(&amp;L)</translation>
+    </message>
+    <message>
+        <source>&amp;Edit</source>
+        <translation>편집 (&amp;E)</translation>
+    </message>
+    <message>
+        <source>Export Address List</source>
+        <translation>주소 목록 내보내기</translation>
+    </message>
+    <message>
+        <source>Comma separated file (*.csv)</source>
+        <translation>쉼표로 구분된 파일 (*.csv)</translation>
+    </message>
+    <message>
+        <source>Exporting Failed</source>
+        <translation>내보내기 실패</translation>
+    </message>
+    <message>
+        <source>There was an error trying to save the address list to %1. Please try again.</source>
+        <translation>%1으로 주소 리스트를 저장하는 동안 오류가 발생했습니다. 다시 시도해주세요.</translation>
+    </message>
+</context>
+<context>
+    <name>AddressTableModel</name>
+    <message>
+        <source>Label</source>
+        <translation>라벨</translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation>주소</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(라벨 없음)</translation>
+    </message>
 </context>
 <context>
     <name>AskPassphraseDialog</name>
@@ -60,6 +131,94 @@
         <source>Repeat new passphrase</source>
         <translation>새로운 암호 재확인</translation>
     </message>
+    <message>
+        <source>Enter the new passphrase to the wallet.&lt;br/&gt;Please use a passphrase of &lt;b&gt;ten or more random characters&lt;/b&gt;, or &lt;b&gt;eight or more words&lt;/b&gt;.</source>
+        <translation>지갑에 새로운 비밀문구를 입력하세요.&lt;br/&gt;비밀문구를 &lt;b&gt;열 개 이상의 무작위 글자&lt;/b&gt; 혹은 &lt;b&gt;여덟개 이상의 단어로&lt;b&gt; 정하세요.</translation>
+    </message>
+    <message>
+        <source>Encrypt wallet</source>
+        <translation>지갑 암호화</translation>
+    </message>
+    <message>
+        <source>This operation needs your wallet passphrase to unlock the wallet.</source>
+        <translation>이 작업을 실행하려면 사용자 지갑의 암호가 필요합니다.</translation>
+    </message>
+    <message>
+        <source>Unlock wallet</source>
+        <translation>지갑 잠금해제</translation>
+    </message>
+    <message>
+        <source>This operation needs your wallet passphrase to decrypt the wallet.</source>
+        <translation>이 작업은 지갑을 해독하기 위해 사용자 지갑의 암호가 필요합니다.</translation>
+    </message>
+    <message>
+        <source>Decrypt wallet</source>
+        <translation>지갑 복호화</translation>
+    </message>
+    <message>
+        <source>Change passphrase</source>
+        <translation>암호 변경</translation>
+    </message>
+    <message>
+        <source>Enter the old passphrase and new passphrase to the wallet.</source>
+        <translation>지갑의 기존 암호와 새로운 암호를 입력해주세요.</translation>
+    </message>
+    <message>
+        <source>Confirm wallet encryption</source>
+        <translation>지갑 암호화 승인</translation>
+    </message>
+    <message>
+        <source>Warning: If you encrypt your wallet and lose your passphrase, you will &lt;b&gt;LOSE ALL OF YOUR BITCOINS&lt;/b&gt;!</source>
+        <translation>경고: 만약 암호화 된 지갑의 비밀번호를 잃어버릴 경우, &lt;b&gt;모든 비트코인들을 잃어버릴 수 있습니다&lt;/b&gt;!</translation>
+    </message>
+    <message>
+        <source>Are you sure you wish to encrypt your wallet?</source>
+        <translation>지갑 암호화를 허용하시겠습니까?</translation>
+    </message>
+    <message>
+        <source>Wallet encrypted</source>
+        <translation>지갑 암호화 완료</translation>
+    </message>
+    <message>
+        <source>%1 will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source>
+        <translation>암호화 처리 과정을 끝내기 위해 %1을 종료합니다. 지갑 암호화는 컴퓨터로의 멀웨어 감염으로 인한 비트코인 도난을 완전히 방지할 수 없음을 기억하세요.</translation>
+    </message>
+    <message>
+        <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source>
+        <translation>중요: 본인 지갑 파일에서 만든 예전 백업들은 새로 생성한 암호화된 지갑 파일로 교체됩니다. 보안상 이유로 이전에 암호화하지 않은 지갑 파일 백업은 사용할 수 없게 되니 이른 시일 내로 새로 암호화된 지갑을 사용하시기 바랍니다.</translation>
+    </message>
+    <message>
+        <source>Wallet encryption failed</source>
+        <translation>지갑 암호화 실패</translation>
+    </message>
+    <message>
+        <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
+        <translation>지갑 암호화는 내부 에러로 인해 실패했습니다.  당신의 지갑은 암호화 되지 않았습니다.</translation>
+    </message>
+    <message>
+        <source>The supplied passphrases do not match.</source>
+        <translation>지정한 암호가 일치하지 않습니다.</translation>
+    </message>
+    <message>
+        <source>Wallet unlock failed</source>
+        <translation>지갑 잠금해제 실패</translation>
+    </message>
+    <message>
+        <source>The passphrase entered for the wallet decryption was incorrect.</source>
+        <translation>지갑 해독을 위한 암호가 틀렸습니다.</translation>
+    </message>
+    <message>
+        <source>Wallet decryption failed</source>
+        <translation>지갑 복호화 실패</translation>
+    </message>
+    <message>
+        <source>Wallet passphrase was successfully changed.</source>
+        <translation>지갑 비밀번호가 성공적으로 변경되었습니다.</translation>
+    </message>
+    <message>
+        <source>Warning: The Caps Lock key is on!</source>
+        <translation>경고: Caps Lock키가 켜져있습니다!</translation>
+    </message>
 </context>
 <context>
     <name>BanTableModel</name>
@@ -110,6 +269,14 @@
         <source>Quit application</source>
         <translation>어플리케이션 종료</translation>
     </message>
+    <message>
+        <source>&amp;About %1</source>
+        <translation>%1 정보(&amp;A)</translation>
+    </message>
+    <message>
+        <source>Show information about %1</source>
+        <translation>%1 정보를 표시합니다</translation>
+    </message>
     <message>
         <source>About &amp;Qt</source>
         <translation>&amp;Qt 정보</translation>
@@ -122,6 +289,10 @@
         <source>&amp;Options...</source>
         <translation>옵션(&amp;O)</translation>
     </message>
+    <message>
+        <source>Modify configuration options for %1</source>
+        <translation>%1 설정 옵션 수정</translation>
+    </message>
     <message>
         <source>&amp;Encrypt Wallet...</source>
         <translation>지갑 암호화(&amp;E)...</translation>
@@ -250,6 +421,14 @@
         <source>%n active connection(s) to Bitcoin network</source>
         <translation><numerusform>비트코인 네트워크에 %n개의 연결이 활성화되어 있습니다.</numerusform></translation>
     </message>
+    <message>
+        <source>Indexing blocks on disk...</source>
+        <translation>디스크에서 블록 색인중...</translation>
+    </message>
+    <message>
+        <source>Processing blocks on disk...</source>
+        <translation>디스크에서 블록 처리중...</translation>
+    </message>
     <message>
         <source>No block source available...</source>
         <translation>사용 가능한 블록이 없습니다...</translation>
@@ -258,26 +437,6 @@
         <source>Processed %n block(s) of transaction history.</source>
         <translation><numerusform>%n 블럭 만큼의 거래 기록이 처리됨.</numerusform></translation>
     </message>
-    <message numerus="yes">
-        <source>%n hour(s)</source>
-        <translation><numerusform>%n시간</numerusform></translation>
-    </message>
-    <message numerus="yes">
-        <source>%n day(s)</source>
-        <translation><numerusform>%n일</numerusform></translation>
-    </message>
-    <message numerus="yes">
-        <source>%n week(s)</source>
-        <translation><numerusform>%n주</numerusform></translation>
-    </message>
-    <message>
-        <source>%1 and %2</source>
-        <translation>%1 그리고 %2</translation>
-    </message>
-    <message numerus="yes">
-        <source>%n year(s)</source>
-        <translation><numerusform>%n년</numerusform></translation>
-    </message>
     <message>
         <source>%1 behind</source>
         <translation>%1 뒤에</translation>
@@ -306,6 +465,14 @@
         <source>Up to date</source>
         <translation>현재까지</translation>
     </message>
+    <message>
+        <source>Show the %1 help message to get a list with possible Bitcoin command-line options</source>
+        <translation>사용할 수 있는 비트코인 명령줄 옵션 목록을 가져오기 위해 %1 도움말 메시지를 표시합니다.</translation>
+    </message>
+    <message>
+        <source>%1 client</source>
+        <translation>%1 클라이언트</translation>
+    </message>
     <message>
         <source>Catching up...</source>
         <translation>블록 따라잡기...</translation>
@@ -356,7 +523,7 @@
         <source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;locked&lt;/b&gt;</source>
         <translation>지갑이 암호화 되었고 현재 잠겨져 있습니다</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>CoinControlDialog</name>
     <message>
@@ -375,10 +542,6 @@
         <source>Amount:</source>
         <translation>금액:</translation>
     </message>
-    <message>
-        <source>Priority:</source>
-        <translation>우선순위:</translation>
-    </message>
     <message>
         <source>Fee:</source>
         <translation>수수료:</translation>
@@ -432,8 +595,80 @@
         <translation>확인됨</translation>
     </message>
     <message>
-        <source>Priority</source>
-        <translation>우선순위</translation>
+        <source>Copy address</source>
+        <translation>주소 복사</translation>
+    </message>
+    <message>
+        <source>Copy label</source>
+        <translation>라벨 복사</translation>
+    </message>
+    <message>
+        <source>Copy amount</source>
+        <translation>거래액 복사</translation>
+    </message>
+    <message>
+        <source>Copy transaction ID</source>
+        <translation>거래 아이디 복사</translation>
+    </message>
+    <message>
+        <source>Lock unspent</source>
+        <translation>사용되지 않은 주소를 잠금 처리합니다.</translation>
+    </message>
+    <message>
+        <source>Unlock unspent</source>
+        <translation>사용되지 않은 주소를 잠금 해제합니다. </translation>
+    </message>
+    <message>
+        <source>Copy quantity</source>
+        <translation>수량 복사</translation>
+    </message>
+    <message>
+        <source>Copy fee</source>
+        <translation>수수료 복사</translation>
+    </message>
+    <message>
+        <source>Copy after fee</source>
+        <translation>수수료 이후 복사</translation>
+    </message>
+    <message>
+        <source>Copy bytes</source>
+        <translation>bytes 복사</translation>
+    </message>
+    <message>
+        <source>Copy dust</source>
+        <translation>더스트 복사</translation>
+    </message>
+    <message>
+        <source>Copy change</source>
+        <translation>잔돈 복사</translation>
+    </message>
+    <message>
+        <source>(%1 locked)</source>
+        <translation>(%1 잠금)</translation>
+    </message>
+    <message>
+        <source>yes</source>
+        <translation>예</translation>
+    </message>
+    <message>
+        <source>no</source>
+        <translation>아니요</translation>
+    </message>
+    <message>
+        <source>Can vary +/- %1 satoshi(s) per input.</source>
+        <translation>입력마다 +/- %1 사토시(s)가 변할 수 있습니다.</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(라벨 없음)</translation>
+    </message>
+    <message>
+        <source>change from %1 (%2)</source>
+        <translation>%1로부터 변경 (%2)</translation>
+    </message>
+    <message>
+        <source>(change)</source>
+        <translation>(잔돈)</translation>
     </message>
 </context>
 <context>
@@ -458,6 +693,38 @@
         <source>&amp;Address</source>
         <translation>주소(&amp;A)</translation>
     </message>
+    <message>
+        <source>New receiving address</source>
+        <translation>새 받는 주소</translation>
+    </message>
+    <message>
+        <source>New sending address</source>
+        <translation>새 보내는 주소</translation>
+    </message>
+    <message>
+        <source>Edit receiving address</source>
+        <translation>받는 주소 편집</translation>
+    </message>
+    <message>
+        <source>Edit sending address</source>
+        <translation>보내는 주소 편집</translation>
+    </message>
+    <message>
+        <source>The entered address "%1" is not a valid Bitcoin address.</source>
+        <translation>입력한 "%1" 주소는 올바른 비트코인 주소가 아닙니다.</translation>
+    </message>
+    <message>
+        <source>The entered address "%1" is already in the address book.</source>
+        <translation>입력된 주소는"%1" 이미 주소록에 있습니다.</translation>
+    </message>
+    <message>
+        <source>Could not unlock wallet.</source>
+        <translation>지갑을 잠금해제 할 수 없습니다.</translation>
+    </message>
+    <message>
+        <source>New key generation failed.</source>
+        <translation>새로운 키 생성이 실패하였습니다.</translation>
+    </message>
 </context>
 <context>
     <name>FreespaceChecker</name>
@@ -492,6 +759,10 @@
         <source>(%1-bit)</source>
         <translation>(%1-비트)</translation>
     </message>
+    <message>
+        <source>About %1</source>
+        <translation>%1 정보(&amp;A)</translation>
+    </message>
     <message>
         <source>Command-line options</source>
         <translation>명령줄 옵션</translation>
@@ -528,13 +799,29 @@
         <source>Show splash screen on startup (default: %u)</source>
         <translation>실행시 시작화면 보기 (기본값: %u)</translation>
     </message>
-    </context>
+    <message>
+        <source>Reset all settings changed in the GUI</source>
+        <translation>GUI를 통해 수정된 모든 설정을 초기화</translation>
+    </message>
+</context>
 <context>
     <name>Intro</name>
     <message>
         <source>Welcome</source>
         <translation>환영합니다</translation>
     </message>
+    <message>
+        <source>Welcome to %1.</source>
+        <translation>%1에 오신것을 환영합니다.</translation>
+    </message>
+    <message>
+        <source>As this is the first time the program is launched, you can choose where %1 will store its data.</source>
+        <translation>프로그램이 처음으로 실행되고 있습니다. %1가 어디에 데이터를 저장할지 선택할 수 있습니다. </translation>
+    </message>
+    <message>
+        <source>%1 will download and store a copy of the Bitcoin block chain. At least %2GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source>
+        <translation>%1가 블럭체인의 복사본을 다운로드 저장합니다. 적어도 %2GB의 데이터가 이 폴더에 저장되며 시간이 경과할수록 점차 증가합니다. 그리고 지갑 또한 이 폴더에 저장됩니다. </translation>
+    </message>
     <message>
         <source>Use the default data directory</source>
         <translation>기본 데이터 폴더를 사용하기</translation>
@@ -560,6 +847,21 @@
         <translation><numerusform>(%n GB가 필요)</numerusform></translation>
     </message>
 </context>
+<context>
+    <name>ModalOverlay</name>
+    <message>
+        <source>Form</source>
+        <translation>유형</translation>
+    </message>
+    <message>
+        <source>Last block time</source>
+        <translation>최종 블럭 시각</translation>
+    </message>
+    <message>
+        <source>Hide</source>
+        <translation>숨기기</translation>
+    </message>
+    </context>
 <context>
     <name>OpenURIDialog</name>
     <message>
@@ -578,6 +880,10 @@
         <source>Select payment request file</source>
         <translation>지불 요청 파일을 선택하세요</translation>
     </message>
+    <message>
+        <source>Select payment request file to open</source>
+        <translation>지불 요청 파일을 열기 위해서 선택하세요</translation>
+    </message>
 </context>
 <context>
     <name>OptionsDialog</name>
@@ -589,6 +895,14 @@
         <source>&amp;Main</source>
         <translation>메인(&amp;M)</translation>
     </message>
+    <message>
+        <source>Automatically start %1 after logging in to the system.</source>
+        <translation>시스템 로그인후에 %1을 자동으로 시작합니다.</translation>
+    </message>
+    <message>
+        <source>&amp;Start %1 on system login</source>
+        <translation>시스템 로그인시 %1 시작(&amp;S)</translation>
+    </message>
     <message>
         <source>Size of &amp;database cache</source>
         <translation>데이터베이스 캐시 크기(&amp;D)</translation>
@@ -691,7 +1005,7 @@
     </message>
     <message>
         <source>Port of the proxy (e.g. 9050)</source>
-        <translation>프록시의 포트번호입니다(예: 9050)</translation>
+        <translation>프록시의 포트번호입니다 (예: 9050)</translation>
     </message>
     <message>
         <source>Used for reaching peers via:</source>
@@ -725,6 +1039,14 @@
         <source>&amp;Window</source>
         <translation>창(&amp;W)</translation>
     </message>
+    <message>
+        <source>&amp;Hide the icon from the system tray.</source>
+        <translation>시스템 트레이 로 부터 아이콘 숨기기(&amp;H)</translation>
+    </message>
+    <message>
+        <source>Hide tray icon</source>
+        <translation>트레이 아이콘 숨기기</translation>
+    </message>
     <message>
         <source>Show only a tray icon after minimizing the window.</source>
         <translation>창을 최소화 하면 트레이에 아이콘만 표시합니다.</translation>
@@ -745,6 +1067,10 @@
         <source>User Interface &amp;language:</source>
         <translation>사용자 인터페이스 언어(&amp;L):</translation>
     </message>
+    <message>
+        <source>The user interface language can be set here. This setting will take effect after restarting %1.</source>
+        <translation>사용자 인터페이스 언어를 여기서 설정할 수 있습니다. 이 설정은 %1을 다시 시작할때 적용됩니다.</translation>
+    </message>
     <message>
         <source>&amp;Unit to show amounts in:</source>
         <translation>거래액을 표시할 단위(&amp;U):</translation>
@@ -869,6 +1195,21 @@
         <translation>모니터링 지갑의 현재 잔액</translation>
     </message>
 </context>
+<context>
+    <name>PaymentServer</name>
+    <message>
+        <source>Payment request error</source>
+        <translation>지불 요청 오류</translation>
+    </message>
+    <message>
+        <source>Cannot start bitcoin: click-to-pay handler</source>
+        <translation>비트코인을 시작할 수 없습니다: 지급제어기를 클릭하시오</translation>
+    </message>
+    <message>
+        <source>URI handling</source>
+        <translation>URI 핸들링</translation>
+    </message>
+    </context>
 <context>
     <name>PeerTableModel</name>
     <message>
@@ -879,11 +1220,7 @@
         <source>Node/Service</source>
         <translation>노드/서비스</translation>
     </message>
-    <message>
-        <source>Ping Time</source>
-        <translation>Ping 시간</translation>
-    </message>
-</context>
+    </context>
 <context>
     <name>QObject</name>
     <message>
@@ -922,7 +1259,17 @@
         <source>%1 ms</source>
         <translation>%1 ms</translation>
     </message>
-</context>
+    <message>
+        <source>%1 and %2</source>
+        <translation>%1 그리고 %2</translation>
+    </message>
+    </context>
+<context>
+    <name>QObject::QObject</name>
+    </context>
+<context>
+    <name>QRImageWidget</name>
+    </context>
 <context>
     <name>RPCConsole</name>
     <message>
@@ -949,6 +1296,10 @@
         <source>Using BerkeleyDB version</source>
         <translation>사용 중인 BerkeleyDB 버전</translation>
     </message>
+    <message>
+        <source>Datadir</source>
+        <translation>데이터 폴더</translation>
+    </message>
     <message>
         <source>Startup time</source>
         <translation>시작 시간</translation>
@@ -1033,6 +1384,18 @@
         <source>User Agent</source>
         <translation>유저 에이전트</translation>
     </message>
+    <message>
+        <source>Open the %1 debug log file from the current data directory. This can take a few seconds for large log files.</source>
+        <translation>%1 디버그 로그파일을 현재 데이터 폴더에서 엽니다. 용량이 큰 로그 파일들은 몇 초가 걸릴 수 있습니다.</translation>
+    </message>
+    <message>
+        <source>Decrease font size</source>
+        <translation>글자 크기 축소</translation>
+    </message>
+    <message>
+        <source>Increase font size</source>
+        <translation>글자 크기 확대</translation>
+    </message>
     <message>
         <source>Services</source>
         <translation>서비스</translation>
@@ -1109,14 +1472,6 @@
         <source>Clear console</source>
         <translation>콘솔 초기화</translation>
     </message>
-    <message>
-        <source>&amp;Disconnect Node</source>
-        <translation>끊긴 노드(&amp;D)</translation>
-    </message>
-    <message>
-        <source>Ban Node for</source>
-        <translation>추방된 노드:</translation>
-    </message>
     <message>
         <source>1 &amp;hour</source>
         <translation>1시간(&amp;H)</translation>
@@ -1134,8 +1489,8 @@
         <translation>1년(&amp;Y)</translation>
     </message>
     <message>
-        <source>&amp;Unban Node</source>
-        <translation>노드 추방 취소(&amp;U)</translation>
+        <source>Welcome to the %1 RPC console.</source>
+        <translation>%1 RPC 콘솔에 오신걸 환영합니다</translation>
     </message>
     <message>
         <source>Use up and down arrows to navigate history, and &lt;b&gt;Ctrl-L&lt;/b&gt; to clear screen.</source>
@@ -1264,6 +1619,14 @@
         <source>Remove</source>
         <translation>삭제</translation>
     </message>
+    <message>
+        <source>Copy label</source>
+        <translation>라벨 복사</translation>
+    </message>
+    <message>
+        <source>Copy amount</source>
+        <translation>거래액 복사</translation>
+    </message>
 </context>
 <context>
     <name>ReceiveRequestDialog</name>
@@ -1283,7 +1646,30 @@
         <source>&amp;Save Image...</source>
         <translation>이미지 저장(&amp;S)...</translation>
     </message>
-</context>
+    <message>
+        <source>Address</source>
+        <translation>주소</translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation>라벨</translation>
+    </message>
+    </context>
+<context>
+    <name>RecentRequestsTableModel</name>
+    <message>
+        <source>Date</source>
+        <translation>날짜</translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation>라벨</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(라벨 없음)</translation>
+    </message>
+    </context>
 <context>
     <name>SendCoinsDialog</name>
     <message>
@@ -1318,10 +1704,6 @@
         <source>Amount:</source>
         <translation>거래액:</translation>
     </message>
-    <message>
-        <source>Priority:</source>
-        <translation>우선순위:</translation>
-    </message>
     <message>
         <source>Fee:</source>
         <translation>수수료:</translation>
@@ -1390,10 +1772,6 @@
         <source>(Smart fee not initialized yet. This usually takes a few blocks...)</source>
         <translation>(Smart fee가 아직 초기화되지 않았습니다. 블록 분석이 완료될 때 까지 기다려주십시오...)</translation>
     </message>
-    <message>
-        <source>Confirmation time:</source>
-        <translation>승인 시간:</translation>
-    </message>
     <message>
         <source>normal</source>
         <translation>일반</translation>
@@ -1434,6 +1812,38 @@
         <source>S&amp;end</source>
         <translation>보내기(&amp;E)</translation>
     </message>
+    <message>
+        <source>Copy quantity</source>
+        <translation>수량 복사</translation>
+    </message>
+    <message>
+        <source>Copy amount</source>
+        <translation>거래액 복사</translation>
+    </message>
+    <message>
+        <source>Copy fee</source>
+        <translation>수수료 복사</translation>
+    </message>
+    <message>
+        <source>Copy after fee</source>
+        <translation>수수료 이후 복사</translation>
+    </message>
+    <message>
+        <source>Copy bytes</source>
+        <translation>bytes 복사</translation>
+    </message>
+    <message>
+        <source>Copy dust</source>
+        <translation>더스트 복사</translation>
+    </message>
+    <message>
+        <source>Copy change</source>
+        <translation>잔돈 복사</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(라벨 없음)</translation>
+    </message>
 </context>
 <context>
     <name>SendCoinsEntry</name>
@@ -1443,11 +1853,11 @@
     </message>
     <message>
         <source>Pay &amp;To:</source>
-        <translation>송금할 대상(&amp;T) : </translation>
+        <translation>송금할 대상(&amp;T):</translation>
     </message>
     <message>
         <source>&amp;Label:</source>
-        <translation>라벨(&amp;L)</translation>
+        <translation>라벨(&amp;L):</translation>
     </message>
     <message>
         <source>Choose previously used address</source>
@@ -1507,15 +1917,22 @@
     </message>
     <message>
         <source>Pay To:</source>
-        <translation>송금할 대상 : </translation>
+        <translation>송금할 대상:</translation>
     </message>
     <message>
         <source>Memo:</source>
         <translation>메모:</translation>
     </message>
-</context>
+    </context>
+<context>
+    <name>SendConfirmationDialog</name>
+    </context>
 <context>
     <name>ShutdownWindow</name>
+    <message>
+        <source>%1 is shutting down...</source>
+        <translation>%1이 종료 중입니다...</translation>
+    </message>
     <message>
         <source>Do not shut down the computer until this window disappears.</source>
         <translation>창이 사라지기 전까지 컴퓨터를 끄지마시오.</translation>
@@ -1607,7 +2024,7 @@
         <source>Reset all verify message fields</source>
         <translation>모든 검증 메시지 필드 재설정</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>SplashScreen</name>
     <message>
@@ -1622,12 +2039,153 @@
         <translation>KB/s</translation>
     </message>
 </context>
+<context>
+    <name>TransactionDesc</name>
+    <message>
+        <source>Date</source>
+        <translation>날짜</translation>
+    </message>
+    </context>
 <context>
     <name>TransactionDescDialog</name>
     <message>
         <source>This pane shows a detailed description of the transaction</source>
         <translation>이 창은 거래의 세부내역을 보여줍니다</translation>
     </message>
+    </context>
+<context>
+    <name>TransactionTableModel</name>
+    <message>
+        <source>Date</source>
+        <translation>날짜</translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation>형식</translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation>라벨</translation>
+    </message>
+    <message>
+        <source>Received with</source>
+        <translation>받은 주소</translation>
+    </message>
+    <message>
+        <source>Sent to</source>
+        <translation>보낸 주소</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(라벨 없음)</translation>
+    </message>
+    </context>
+<context>
+    <name>TransactionView</name>
+    <message>
+        <source>Received with</source>
+        <translation>받은 주소</translation>
+    </message>
+    <message>
+        <source>Sent to</source>
+        <translation>보낸 주소</translation>
+    </message>
+    <message>
+        <source>Abandon transaction</source>
+        <translation>버려진 트랜잭션</translation>
+    </message>
+    <message>
+        <source>Copy address</source>
+        <translation>주소 복사</translation>
+    </message>
+    <message>
+        <source>Copy label</source>
+        <translation>라벨 복사</translation>
+    </message>
+    <message>
+        <source>Copy amount</source>
+        <translation>거래액 복사</translation>
+    </message>
+    <message>
+        <source>Copy transaction ID</source>
+        <translation>트랜잭션 아이디 복사</translation>
+    </message>
+    <message>
+        <source>Copy raw transaction</source>
+        <translation>로우 트랜잭션 복사</translation>
+    </message>
+    <message>
+        <source>Copy full transaction details</source>
+        <translation>거래 세부 내역 복사</translation>
+    </message>
+    <message>
+        <source>Edit label</source>
+        <translation>라벨 수정</translation>
+    </message>
+    <message>
+        <source>Show transaction details</source>
+        <translation>거래 세부 내역 보기</translation>
+    </message>
+    <message>
+        <source>Export Transaction History</source>
+        <translation>거래 기록 내보내기</translation>
+    </message>
+    <message>
+        <source>Comma separated file (*.csv)</source>
+        <translation>쉼표로 구분된 파일 (*.csv)</translation>
+    </message>
+    <message>
+        <source>Confirmed</source>
+        <translation>확인됨</translation>
+    </message>
+    <message>
+        <source>Watch-only</source>
+        <translation>모니터링 지갑</translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation>날짜</translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation>형식</translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation>라벨</translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation>주소</translation>
+    </message>
+    <message>
+        <source>ID</source>
+        <translation>아이디</translation>
+    </message>
+    <message>
+        <source>Exporting Failed</source>
+        <translation>내보내기 실패</translation>
+    </message>
+    <message>
+        <source>There was an error trying to save the transaction history to %1.</source>
+        <translation>%1으로 거래 기록을 저장하는데 에러가 있었습니다.</translation>
+    </message>
+    <message>
+        <source>Exporting Successful</source>
+        <translation>내보내기 성공</translation>
+    </message>
+    <message>
+        <source>The transaction history was successfully saved to %1.</source>
+        <translation>거래 기록이 성공적으로 %1에 저장되었습니다.</translation>
+    </message>
+    <message>
+        <source>Range:</source>
+        <translation>범위:</translation>
+    </message>
+    <message>
+        <source>to</source>
+        <translation>상대방</translation>
+    </message>
 </context>
 <context>
     <name>UnitDisplayStatusBarControl</name>
@@ -1636,6 +2194,55 @@
         <translation>거래액을 표시하는 단위. 클릭해서 다른 단위를 선택할 수 있습니다.</translation>
     </message>
 </context>
+<context>
+    <name>WalletFrame</name>
+    <message>
+        <source>No wallet has been loaded.</source>
+        <translation>지갑 불러오기가 안됩니다.</translation>
+    </message>
+</context>
+<context>
+    <name>WalletModel</name>
+    <message>
+        <source>Send Coins</source>
+        <translation>코인 보내기</translation>
+    </message>
+</context>
+<context>
+    <name>WalletView</name>
+    <message>
+        <source>&amp;Export</source>
+        <translation>내보내기 (&amp;E)</translation>
+    </message>
+    <message>
+        <source>Export the data in the current tab to a file</source>
+        <translation>현재 탭에 있는 데이터를 파일로 내보내기</translation>
+    </message>
+    <message>
+        <source>Backup Wallet</source>
+        <translation>지갑 백업</translation>
+    </message>
+    <message>
+        <source>Wallet Data (*.dat)</source>
+        <translation>지갑 데이터 (*.dat)</translation>
+    </message>
+    <message>
+        <source>Backup Failed</source>
+        <translation>백업 실패</translation>
+    </message>
+    <message>
+        <source>There was an error trying to save the wallet data to %1.</source>
+        <translation>지갑 데이터를 %1 폴더에 저장하는 동안 오류가 발생했습니다. </translation>
+    </message>
+    <message>
+        <source>Backup Successful</source>
+        <translation>백업 성공</translation>
+    </message>
+    <message>
+        <source>The wallet data was successfully saved to %1.</source>
+        <translation>지갑 정보가 %1에 성공적으로 저장되었습니다.</translation>
+    </message>
+</context>
 <context>
     <name>bitcoin-core</name>
     <message>
@@ -1698,17 +2305,13 @@
         <source>Unable to start HTTP server. See debug log for details.</source>
         <translation>HTTP 서버를 시작할 수 없습니다. 자세한 사항은 디버그 로그를 확인 하세요.</translation>
     </message>
-    <message>
-        <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
-        <translation>외부 접속을 승인합니다</translation>
-    </message>
     <message>
         <source>Bitcoin Core</source>
         <translation>비트코인 코어</translation>
     </message>
     <message>
-        <source>-fallbackfee is set very high! This is the transaction fee you may pay when fee estimates are not available.</source>
-        <translation>-fallbackfee은 너무 높습니다! 이것은 수수료 예측을 이용할 수 없을 때 지불되는 트랜잭션 수수료입니다.</translation>
+        <source>The %s developers</source>
+        <translation>%s 코어 개발자</translation>
     </message>
     <message>
         <source>A fee rate (in %s/kB) that will be used when fee estimation has insufficient data (default: %s)</source>
@@ -1722,21 +2325,37 @@
         <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source>
         <translation>선택된 주소로 고정하며 항상 리슨(Listen)합니다. IPv6 프로토콜인 경우  [host]:port 방식의 명령어 표기법을 사용합니다.</translation>
     </message>
+    <message>
+        <source>Cannot obtain a lock on data directory %s. %s is probably already running.</source>
+        <translation>%s 데이터 디렉토리에 락을 걸 수 없었습니다. %s가 이미 실행 중인 것으로 보입니다.</translation>
+    </message>
     <message>
         <source>Delete all wallet transactions and only recover those parts of the blockchain through -rescan on startup</source>
         <translation>시작시 모든 지갑 트랜잭션을 삭제하고 -rescan을 통하여 블록체인만 복구합니다.</translation>
     </message>
     <message>
-        <source>Distributed under the MIT software license, see the accompanying file COPYING or &lt;http://www.opensource.org/licenses/mit-license.php&gt;.</source>
-        <translation>MIT 소프트웨어 라이센스에 따라 배포됩니다. 동봉된 파일 혹은 &lt;http://www.opensource.org/licenses/mit-license.php&gt;를 참조하세요.</translation>
+        <source>Error loading %s: You can't enable HD on a already existing non-HD wallet</source>
+        <translation>%s 불러오기 오류: 비-HD 지갑이 존재하는 상태에서 HD 지갑을 활성화 할 수 없습니다</translation>
+    </message>
+    <message>
+        <source>Error reading %s! All keys read correctly, but transaction data or address book entries might be missing or incorrect.</source>
+        <translation>%s 불러오기 오류: 주소 키는 모두 정확하게 로드되었으나 거래 데이터와 주소록 필드에서 누락이나 오류가 존재할 수 있습니다.</translation>
     </message>
     <message>
         <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source>
         <translation>지갑 거래가 바뀌면 명령을 실행합니다.(%s 안의 명령어가 TxID로 바뀝니다)</translation>
     </message>
     <message>
-        <source>Force relay of transactions from whitelisted peers even they violate local relay policy (default: %d)</source>
-        <translation>피어들이 로컬 중계 정책을 위반하더라도 화이트 리스트에 포함된 피어인경우 강제로 중계하기 (기본값: %d)</translation>
+        <source>Maximum total fees (in %s) to use in a single wallet transaction or raw transaction; setting this too low may abort large transactions (default: %s)</source>
+        <translation>하나의 지갑 트랜잭션에서의 총 수수료(%s)의 최대치; 너무 낮게 설정하면 큰 트랜잭션이 중지 됩니다 (기본값: %s)</translation>
+    </message>
+    <message>
+        <source>Please check that your computer's date and time are correct! If your clock is wrong, %s will not work properly.</source>
+        <translation>컴퓨터의 날짜와 시간이 올바른지 확인하십시오! 시간이 잘못되면 %s은 제대로 동작하지 않습니다.</translation>
+    </message>
+    <message>
+        <source>Please contribute if you find %s useful. Visit %s for further information about the software.</source>
+        <translation>%s가 유용하다고 생각한다면 프로젝트에 공헌해주세요. 이 소프트웨어에 대한 보다 자세한 정보는 %s를 방문해주십시오.</translation>
     </message>
     <message>
         <source>Set the number of script verification threads (%u to %d, 0 = auto, &lt;0 = leave that many cores free, default: %d)</source>
@@ -1747,24 +2366,20 @@
         <translation>블록 데이터베이스에 미래의 블록이 포함되어 있습니다. 이것은 사용자의 컴퓨터의 날짜와 시간이 올바르게 설정되어 있지 않을때 나타날 수 있습니다. 만약 사용자의 컴퓨터의 날짜와 시간이 올바르다고 확신할 때에만 블록 데이터 베이스의 재구성을 하십시오</translation>
     </message>
     <message>
-        <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
-        <translation>이 빌드 버전은 정식 출시 전 테스트의 목적이며, 예기치 않은 위험과 오류가 발생할 수 있습니다. 채굴과 상점용 소프트웨어로 사용하는 것을 권하지 않습니다.</translation>
+        <source>Unable to rewind the database to a pre-fork state. You will need to redownload the blockchain</source>
+        <translation>데이터베이스를 포크 전 상태로 돌리지 못했습니다. 블록체인을 다시 다운로드 해주십시오.</translation>
     </message>
     <message>
         <source>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</source>
         <translation>리슨(Listen) 포트를 할당하기 위해 UPnP 사용 (기본값: 열려있거나 -proxy 옵션을 사용하지 않을 시 1)</translation>
     </message>
     <message>
-        <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source>
-        <translation>경고 : 모든 네트워크가 동의해야 하나, 일부 채굴자들에게 문제가 있는 것으로 보입니다. </translation>
-    </message>
-    <message>
-        <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source>
-        <translation>경고: 현재 비트코인 버전이 다른 네트워크 참여자들과 동일하지 않는 것 같습니다. 당신 또는 다른 참여자들이 동일한 비트코인 버전으로 업그레이드 할 필요가 있습니다.</translation>
+        <source>You need to rebuild the database using -reindex-chainstate to change -txindex</source>
+        <translation>-txindex를 바꾸기 위해서는 -reindex-chainstate를 사용해서 데이터베이스를 재구성해야 합니다. </translation>
     </message>
     <message>
-        <source>Whitelist peers connecting from the given netmask or IP address. Can be specified multiple times.</source>
-        <translation>설정된 넷마스크 혹은 IP 주소로 화이트리스트에 포함된 피어에 접속합니다. 이 설정은 복수로 지정 할 수 있습니다.</translation>
+        <source>%s corrupt, salvage failed</source>
+        <translation>%s 손상되었고 복구가 실패하였습니다</translation>
     </message>
     <message>
         <source>-maxmempool must be at least %d MB</source>
@@ -1778,18 +2393,26 @@
         <source>Append comment to the user agent string</source>
         <translation>사용자 에이전트 문자열에 코멘트 첨부</translation>
     </message>
+    <message>
+        <source>Attempt to recover private keys from a corrupt wallet on startup</source>
+        <translation>시작시 망가진 wallet.dat에서 개인키 복원을 시도합니다</translation>
+    </message>
     <message>
         <source>Block creation options:</source>
         <translation>블록 생성 옵션:</translation>
     </message>
     <message>
-        <source>Connect only to the specified node(s)</source>
-        <translation>지정된 노드에만 연결하기</translation>
+        <source>Cannot resolve -%s address: '%s'</source>
+        <translation>%s 주소를 확인할 수 없습니다: '%s'</translation>
     </message>
     <message>
         <source>Connection options:</source>
         <translation>연결 설정 : </translation>
     </message>
+    <message>
+        <source>Copyright (C) %i-%i</source>
+        <translation>Copyright (C) %i-%i</translation>
+    </message>
     <message>
         <source>Corrupted block database detected</source>
         <translation>손상된 블록 데이터베이스가 감지되었습니다</translation>
@@ -1834,6 +2457,22 @@
         <source>Error initializing wallet database environment %s!</source>
         <translation>지갑 데이터베이스 환경 초기화하는데 오류 %s</translation>
     </message>
+    <message>
+        <source>Error loading %s</source>
+        <translation>%s 불러오기 오류</translation>
+    </message>
+    <message>
+        <source>Error loading %s: Wallet corrupted</source>
+        <translation>%s 불러오기 오류: 지갑 오류</translation>
+    </message>
+    <message>
+        <source>Error loading %s: Wallet requires newer version of %s</source>
+        <translation>%s 불러오기 에러: 지갑은 새 버전의 %s이 필요합니다</translation>
+    </message>
+    <message>
+        <source>Error loading %s: You can't disable HD on a already existing HD wallet</source>
+        <translation>%s 불러오기 오류: 이미 HD 지갑이 존재하는 상태에서 HD 지갑을 비활성화 할 수 없습니다</translation>
+    </message>
     <message>
         <source>Error loading block database</source>
         <translation>블록 데이터베이스를 불러오는데 오류</translation>
@@ -1858,10 +2497,18 @@
         <source>Incorrect or no genesis block found. Wrong datadir for network?</source>
         <translation>올바르지 않거나 생성된 블록을 찾을 수 없습니다. 잘못된 네트워크 자료 디렉토리?</translation>
     </message>
+    <message>
+        <source>Initialization sanity check failed. %s is shutting down.</source>
+        <translation>무결성 확인 초기화가 실패했습니다. %s가 종료됩니다.</translation>
+    </message>
     <message>
         <source>Invalid -onion address: '%s'</source>
         <translation>잘못된 -onion 주소입니다: '%s'</translation>
     </message>
+    <message>
+        <source>Invalid amount for -%s=&lt;amount&gt;: '%s'</source>
+        <translation>유효하지 않은 금액 -%s=&lt;amount&gt;: '%s'</translation>
+    </message>
     <message>
         <source>Invalid amount for -fallbackfee=&lt;amount&gt;: '%s'</source>
         <translation>유효하지 않은 금액 -fallbackfee=&lt;amount&gt;: '%s'</translation>
@@ -1871,12 +2518,12 @@
         <translation>트랜잭션 메모리 풀의 용량을 &lt;n&gt;메가바이트 아래로 유지하기 (기본값: %u)</translation>
     </message>
     <message>
-        <source>Location of the auth cookie (default: data dir)</source>
-        <translation>인증 쿠키의 위치 (기본값: data dir)</translation>
+        <source>Loading banlist...</source>
+        <translation>추방리스트를 불러오는 중...</translation>
     </message>
     <message>
-        <source>Minimum bytes per sigop in transactions we relay and mine (default: %u)</source>
-        <translation>중계 및 채굴을 할 때 트랜잭션에서의 sigop 당 데이터의 최소 크기 (기본값: %u)</translation>
+        <source>Location of the auth cookie (default: data dir)</source>
+        <translation>인증 쿠키의 위치 (기본값: data dir)</translation>
     </message>
     <message>
         <source>Not enough file descriptors available.</source>
@@ -1886,6 +2533,10 @@
         <source>Only connect to nodes in network &lt;net&gt; (ipv4, ipv6 or onion)</source>
         <translation>오직 &lt;net&gt; 네트워크로 로만 접속 (IPv4, IPv6 혹은 onion)</translation>
     </message>
+    <message>
+        <source>Print this help message and exit</source>
+        <translation>도움말 메시지 출력 후 종료</translation>
+    </message>
     <message>
         <source>Print version and exit</source>
         <translation>버전 출력후 종료</translation>
@@ -1898,6 +2549,18 @@
         <source>Prune mode is incompatible with -txindex.</source>
         <translation>블록 축소 모드는 -txindex와 호환되지 않습니다.</translation>
     </message>
+    <message>
+        <source>Rebuild chain state and block index from the blk*.dat files on disk</source>
+        <translation>현재의 blk*.dat 파일들로부터 블록체인 색인을 재구성합니다.</translation>
+    </message>
+    <message>
+        <source>Rebuild chain state from the currently indexed blocks</source>
+        <translation>현재 색인 된 블록들로부터 블록체인을 재구성합니다.</translation>
+    </message>
+    <message>
+        <source>Rewinding blocks...</source>
+        <translation>블록 되감는중...</translation>
+    </message>
     <message>
         <source>Set database cache size in megabytes (%d to %d, default: %d)</source>
         <translation>데이터베이스 케시 크기를 메가바이트로 설정(%d 부터 %d, 기본값: %d)</translation>
@@ -1910,6 +2573,14 @@
         <source>Specify wallet file (within data directory)</source>
         <translation>데이터 폴더 안에 지갑 파일을 선택하세요.</translation>
     </message>
+    <message>
+        <source>The source code is available from %s.</source>
+        <translation>소스코드는 %s 에서 확인하실 수 있습니다.</translation>
+    </message>
+    <message>
+        <source>Unable to bind to %s on this computer. %s is probably already running.</source>
+        <translation>이 컴퓨터의 %s에 바인딩 할 수 없습니다. 아마도 %s이 실행중인 것 같습니다.</translation>
+    </message>
     <message>
         <source>Unsupported argument -benchmark ignored, use -debug=bench.</source>
         <translation>지원하지 않는 인수 -benchmark 은 무시됩니다, -debug=bench 형태로 사용하세요.</translation>
@@ -1946,6 +2617,10 @@
         <source>Wallet debugging/testing options:</source>
         <translation>지갑 디버깅/테스트 옵션:</translation>
     </message>
+    <message>
+        <source>Wallet needed to be rewritten: restart %s to complete</source>
+        <translation>지갑을 새로 써야 합니다:  완성하기 위하여 %s을 다시 시작하십시오.</translation>
+    </message>
     <message>
         <source>Wallet options:</source>
         <translation>지갑 옵션:</translation>
@@ -1994,10 +2669,6 @@
         <source>Maximum size of data in data carrier transactions we relay and mine (default: %u)</source>
         <translation>중계 및 채굴을 할 때 데이터 운송 트랜잭션에서 데이터의 최대 크기 (기본값: %u)</translation>
     </message>
-    <message>
-        <source>Query for peer addresses via DNS lookup, if low on addresses (default: 1 unless -connect)</source>
-        <translation>DNS lookup를 통해 피어 주소에 대한 쿼리 보내기 (기본값: 1 -connect 예외)</translation>
-    </message>
     <message>
         <source>Randomize credentials for every proxy connection. This enables Tor stream isolation (default: %u)</source>
         <translation>인증정보를 프록시 연결마다 무작위로 합니다. 이는 Tor 스트림을 격리시킬 수 있습니다 (기본값: %u)</translation>
@@ -2010,10 +2681,6 @@
         <source>The transaction amount is too small to send after the fee has been deducted</source>
         <translation>거래액이 수수료를 지불하기엔 너무 작습니다</translation>
     </message>
-    <message>
-        <source>This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit &lt;https://www.openssl.org/&gt; and cryptographic software written by Eric Young and UPnP software written by Thomas Bernard.</source>
-        <translation>이 프로그램에는 OpenSSL 툴킷&lt;https://www.openssl.org/&gt; 사용 목적으로 개발한 OpenSSL 프로젝트를 포함하고 있으며, 암호화 프로그램은 Eric Young이, UPnP 프로그램은 Thomas Bernard가 작성했습니다.</translation>
-    </message>
     <message>
         <source>Whitelisted peers cannot be DoS banned and their transactions are always relayed, even if they are already in the mempool, useful e.g. for a gateway</source>
         <translation>화이트리스트에 포함된 피어는 이미 메모리풀에 포함되어 있어도 DoS 추방이 되지 않으며 그들의 트랜잭션이 항상 중계됩니다, 이는 예를 들면 게이트웨이에서 유용합니다.</translation>
@@ -2122,10 +2789,6 @@
         <source>Transaction amount too small</source>
         <translation>거래액이 너무 적습니다</translation>
     </message>
-    <message>
-        <source>Transaction amounts must be positive</source>
-        <translation>거래액은 반드시 정수여야합니다.</translation>
-    </message>
     <message>
         <source>Transaction too large for fee policy</source>
         <translation>수수료 정책에 비해 트랜잭션이 너무 큽니다</translation>
@@ -2186,10 +2849,6 @@
         <source>-maxtxfee is set very high! Fees this large could be paid on a single transaction.</source>
         <translation>-maxtxfee값이 너무 큽니다!  하나의 트랜잭션에 너무 큰 수수료가 지불 됩니다.</translation>
     </message>
-    <message>
-        <source>-paytxfee is set very high! This is the transaction fee you will pay if you send a transaction.</source>
-        <translation>-paytxfee값이 너무 큽니다! 이 값은 송금할때 지불할 송금 수수료입니다.</translation>
-    </message>
     <message>
         <source>Do not keep transactions in the mempool longer than &lt;n&gt; hours (default: %u)</source>
         <translation>메모리 풀에 있는 트랜잭션 기록을 &lt;n&gt;시간 후 부터는 유지하지 않기 (기본값: %u)</translation>
@@ -2246,6 +2905,18 @@
         <source>Warning: Unknown block versions being mined! It's possible unknown rules are in effect</source>
         <translation>경고: 알려지지 않은 버전의 블록이 채굴되었습니다. 알려지지 않은 규칙이 적용되었을 가능성이 있습니다.</translation>
     </message>
+    <message>
+        <source>Warning: Wallet file corrupt, data salvaged! Original %s saved as %s in %s; if your balance or transactions are incorrect you should restore from a backup.</source>
+        <translation>경고 : 지갑파일이 손상되어 데이터가 복구되었습니다. 원래의 %s 파일은 %s 후에 %s 이름으로 저장됩니다. 잔액과 거래 내역이 정확하지 않다면 백업 파일로 부터 복원해야 합니다. </translation>
+    </message>
+    <message>
+        <source>Whitelist peers connecting from the given IP address (e.g. 1.2.3.4) or CIDR notated network (e.g. 1.2.3.0/24). Can be specified multiple times.</source>
+        <translation>설정된 IP주소 (보기 1.2.3.4) 혹은 CIDR로 작성된 네트워크 (보기 1.2.3.0/24)로 화이트리스트에 포함된 피어에 접속합니다. 이 설정은 복수로 지정 할 수 있습니다.</translation>
+    </message>
+    <message>
+        <source>(default: %s)</source>
+        <translation>(기본값: %s)</translation>
+    </message>
     <message>
         <source>Always query for peer addresses via DNS lookup (default: %u)</source>
         <translation>DNS lookup을 통해 항상 피어주소에 대한 쿼리 보내기 (기본값: %u)</translation>
@@ -2322,6 +2993,10 @@
         <source>Spend unconfirmed change when sending transactions (default: %u)</source>
         <translation>트랜잭션을 보낼 때 검증되지 않은 잔돈 쓰기 (기본값: %u)</translation>
     </message>
+    <message>
+        <source>Starting network threads...</source>
+        <translation>네트워크 스레드 시작중...</translation>
+    </message>
     <message>
         <source>Threshold for disconnecting misbehaving peers (default: %u)</source>
         <translation>이상행동 네트워크 참여자의 연결을 차단시키기 위한 한계치 (기본값: %u)</translation>
diff --git a/src/qt/locale/bitcoin_ku_IQ.ts b/src/qt/locale/bitcoin_ku_IQ.ts
index da5e41a3583e9..a0d8510413aa2 100644
--- a/src/qt/locale/bitcoin_ku_IQ.ts
+++ b/src/qt/locale/bitcoin_ku_IQ.ts
@@ -25,7 +25,14 @@
         <source>&amp;Delete</source>
         <translation>&amp;سڕینەوە</translation>
     </message>
-</context>
+    </context>
+<context>
+    <name>AddressTableModel</name>
+    <message>
+        <source>Address</source>
+        <translation>ناوونیشان</translation>
+    </message>
+    </context>
 <context>
     <name>AskPassphraseDialog</name>
     </context>
@@ -69,10 +76,6 @@
         <source>Amount:</source>
         <translation>کۆ:</translation>
     </message>
-    <message>
-        <source>Priority:</source>
-        <translation>لەپێشی:</translation>
-    </message>
     <message>
         <source>Fee:</source>
         <translation>تێچوون:</translation>
@@ -86,10 +89,14 @@
         <translation>رێکەت</translation>
     </message>
     <message>
-        <source>Priority</source>
-        <translation>لەپێشی</translation>
+        <source>yes</source>
+        <translation>بەڵێ</translation>
     </message>
-</context>
+    <message>
+        <source>no</source>
+        <translation>نەخێر</translation>
+    </message>
+    </context>
 <context>
     <name>EditAddressDialog</name>
     </context>
@@ -118,6 +125,9 @@
         <translation>هەڵە</translation>
     </message>
     </context>
+<context>
+    <name>ModalOverlay</name>
+    </context>
 <context>
     <name>OpenURIDialog</name>
     </context>
@@ -135,6 +145,9 @@
         <translation>گشتی</translation>
     </message>
     </context>
+<context>
+    <name>PaymentServer</name>
+    </context>
 <context>
     <name>PeerTableModel</name>
     </context>
@@ -145,20 +158,42 @@
         <translation>سەرجەم</translation>
     </message>
     </context>
+<context>
+    <name>QObject::QObject</name>
+    </context>
+<context>
+    <name>QRImageWidget</name>
+    </context>
 <context>
     <name>RPCConsole</name>
     <message>
         <source>&amp;Information</source>
         <translation>&amp;زانیاری</translation>
     </message>
+    <message>
+        <source>General</source>
+        <translation>گشتی</translation>
+    </message>
+    <message>
+        <source>Network</source>
+        <translation>تۆڕ</translation>
+    </message>
     <message>
         <source>Name</source>
         <translation>ناو</translation>
     </message>
+    <message>
+        <source>Sent</source>
+        <translation>نێدرا</translation>
+    </message>
     <message>
         <source>Version</source>
         <translation>وەشان</translation>
     </message>
+    <message>
+        <source>Services</source>
+        <translation>خزمەتگوزاریەکان</translation>
+    </message>
     <message>
         <source>&amp;Open</source>
         <translation>&amp;کردنەوە</translation>
@@ -171,6 +206,34 @@
         <source>Totals</source>
         <translation>گشتییەکان</translation>
     </message>
+    <message>
+        <source>In:</source>
+        <translation>لە ناو</translation>
+    </message>
+    <message>
+        <source>Out:</source>
+        <translation>لەدەرەوە</translation>
+    </message>
+    <message>
+        <source>1 &amp;hour</source>
+        <translation>1&amp;سات</translation>
+    </message>
+    <message>
+        <source>1 &amp;day</source>
+        <translation>1&amp;ڕۆژ</translation>
+    </message>
+    <message>
+        <source>1 &amp;week</source>
+        <translation>1&amp;هەفتە</translation>
+    </message>
+    <message>
+        <source>1 &amp;year</source>
+        <translation>1&amp;ساڵ</translation>
+    </message>
+    <message>
+        <source>never</source>
+        <translation>هەرگیز</translation>
+    </message>
     <message>
         <source>Yes</source>
         <translation>بەڵێ</translation>
@@ -202,9 +265,24 @@
         <source>Remove</source>
         <translation>سڕینەوە</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>ReceiveRequestDialog</name>
+    <message>
+        <source>Address</source>
+        <translation>ناوونیشان</translation>
+    </message>
+    <message>
+        <source>Amount</source>
+        <translation>سەرجەم</translation>
+    </message>
+    </context>
+<context>
+    <name>RecentRequestsTableModel</name>
+    <message>
+        <source>Date</source>
+        <translation>رێکەت</translation>
+    </message>
     </context>
 <context>
     <name>SendCoinsDialog</name>
@@ -212,10 +290,6 @@
         <source>Amount:</source>
         <translation>کۆ:</translation>
     </message>
-    <message>
-        <source>Priority:</source>
-        <translation>لەپێشی:</translation>
-    </message>
     <message>
         <source>Fee:</source>
         <translation>تێچوون:</translation>
@@ -232,6 +306,13 @@
         <translation>پەیام:</translation>
     </message>
     </context>
+<context>
+    <name>SendConfirmationDialog</name>
+    <message>
+        <source>Yes</source>
+        <translation>بەڵێ</translation>
+    </message>
+</context>
 <context>
     <name>ShutdownWindow</name>
     </context>
@@ -244,12 +325,54 @@
 <context>
     <name>TrafficGraphWidget</name>
     </context>
+<context>
+    <name>TransactionDesc</name>
+    <message>
+        <source>Date</source>
+        <translation>رێکەت</translation>
+    </message>
+    <message>
+        <source>Amount</source>
+        <translation>سەرجەم</translation>
+    </message>
+    </context>
 <context>
     <name>TransactionDescDialog</name>
     </context>
+<context>
+    <name>TransactionTableModel</name>
+    <message>
+        <source>Date</source>
+        <translation>رێکەت</translation>
+    </message>
+    </context>
+<context>
+    <name>TransactionView</name>
+    <message>
+        <source>Date</source>
+        <translation>رێکەت</translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation>ناوونیشان</translation>
+    </message>
+    </context>
 <context>
     <name>UnitDisplayStatusBarControl</name>
     </context>
+<context>
+    <name>WalletFrame</name>
+    </context>
+<context>
+    <name>WalletModel</name>
+    </context>
+<context>
+    <name>WalletView</name>
+    <message>
+        <source>&amp;Export</source>
+        <translation>&amp;هەناردن</translation>
+    </message>
+    </context>
 <context>
     <name>bitcoin-core</name>
     <message>
diff --git a/src/qt/locale/bitcoin_ky.ts b/src/qt/locale/bitcoin_ky.ts
index 14cb9c2020198..da364c3bbc523 100644
--- a/src/qt/locale/bitcoin_ky.ts
+++ b/src/qt/locale/bitcoin_ky.ts
@@ -9,6 +9,17 @@
         <source>&amp;Delete</source>
         <translation>Ө&amp;чүрүү</translation>
     </message>
+    </context>
+<context>
+    <name>AddressTableModel</name>
+    <message>
+        <source>Address</source>
+        <translation>Дарек</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(аты жок)</translation>
+    </message>
 </context>
 <context>
     <name>AskPassphraseDialog</name>
@@ -65,6 +76,10 @@
         <source>Date</source>
         <translation>Дата</translation>
     </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(аты жок)</translation>
+    </message>
     </context>
 <context>
     <name>EditAddressDialog</name>
@@ -72,7 +87,7 @@
         <source>&amp;Address</source>
         <translation>&amp;Дарек</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>FreespaceChecker</name>
     </context>
@@ -90,6 +105,9 @@
         <translation>Ката</translation>
     </message>
     </context>
+<context>
+    <name>ModalOverlay</name>
+    </context>
 <context>
     <name>OpenURIDialog</name>
     </context>
@@ -135,12 +153,21 @@
 <context>
     <name>OverviewPage</name>
     </context>
+<context>
+    <name>PaymentServer</name>
+    </context>
 <context>
     <name>PeerTableModel</name>
     </context>
 <context>
     <name>QObject</name>
     </context>
+<context>
+    <name>QObject::QObject</name>
+    </context>
+<context>
+    <name>QRImageWidget</name>
+    </context>
 <context>
     <name>RPCConsole</name>
     <message>
@@ -181,6 +208,29 @@
     </context>
 <context>
     <name>ReceiveRequestDialog</name>
+    <message>
+        <source>Address</source>
+        <translation>Дарек</translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation>Билдирүү</translation>
+    </message>
+    </context>
+<context>
+    <name>RecentRequestsTableModel</name>
+    <message>
+        <source>Date</source>
+        <translation>Дата</translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation>Билдирүү</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(аты жок)</translation>
+    </message>
     </context>
 <context>
     <name>SendCoinsDialog</name>
@@ -192,6 +242,10 @@
         <source>S&amp;end</source>
         <translation>&amp;Жөнөтүү</translation>
     </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(аты жок)</translation>
+    </message>
 </context>
 <context>
     <name>SendCoinsEntry</name>
@@ -204,6 +258,9 @@
         <translation>Билдирүү:</translation>
     </message>
     </context>
+<context>
+    <name>SendConfirmationDialog</name>
+    </context>
 <context>
     <name>ShutdownWindow</name>
     </context>
@@ -224,12 +281,58 @@
 <context>
     <name>TrafficGraphWidget</name>
     </context>
+<context>
+    <name>TransactionDesc</name>
+    <message>
+        <source>%1/offline</source>
+        <translation>%1/тармакта эмес</translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation>Дата</translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation>Билдирүү</translation>
+    </message>
+    </context>
 <context>
     <name>TransactionDescDialog</name>
     </context>
+<context>
+    <name>TransactionTableModel</name>
+    <message>
+        <source>Date</source>
+        <translation>Дата</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(аты жок)</translation>
+    </message>
+    </context>
+<context>
+    <name>TransactionView</name>
+    <message>
+        <source>Date</source>
+        <translation>Дата</translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation>Дарек</translation>
+    </message>
+    </context>
 <context>
     <name>UnitDisplayStatusBarControl</name>
     </context>
+<context>
+    <name>WalletFrame</name>
+    </context>
+<context>
+    <name>WalletModel</name>
+    </context>
+<context>
+    <name>WalletView</name>
+    </context>
 <context>
     <name>bitcoin-core</name>
     <message>
diff --git a/src/qt/locale/bitcoin_la.ts b/src/qt/locale/bitcoin_la.ts
index dc532fe011933..3b67fa1e74479 100644
--- a/src/qt/locale/bitcoin_la.ts
+++ b/src/qt/locale/bitcoin_la.ts
@@ -25,7 +25,10 @@
         <source>&amp;Delete</source>
         <translation>&amp;Dele</translation>
     </message>
-</context>
+    </context>
+<context>
+    <name>AddressTableModel</name>
+    </context>
 <context>
     <name>AskPassphraseDialog</name>
     <message>
@@ -44,7 +47,7 @@
         <source>Repeat new passphrase</source>
         <translation>Itera novam tesseram</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>BanTableModel</name>
     </context>
@@ -242,7 +245,7 @@
         <source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;locked&lt;/b&gt;</source>
         <translation>Cassidile &lt;b&gt;cifratum&lt;/b&gt; est et iam nunc &lt;b&gt;seratum&lt;/b&gt;</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>CoinControlDialog</name>
     <message>
@@ -276,7 +279,7 @@
         <source>&amp;Address</source>
         <translation>&amp;Inscriptio</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>FreespaceChecker</name>
     </context>
@@ -306,6 +309,17 @@
         <translation>Error</translation>
     </message>
     </context>
+<context>
+    <name>ModalOverlay</name>
+    <message>
+        <source>Form</source>
+        <translation>Schema</translation>
+    </message>
+    <message>
+        <source>Last block time</source>
+        <translation>Hora postremi frusti</translation>
+    </message>
+    </context>
 <context>
     <name>OpenURIDialog</name>
     </context>
@@ -427,6 +441,9 @@
         <translation>Fossum pendendum quod nondum maturum est</translation>
     </message>
     </context>
+<context>
+    <name>PaymentServer</name>
+    </context>
 <context>
     <name>PeerTableModel</name>
     </context>
@@ -441,6 +458,12 @@
         <translation>N/A</translation>
     </message>
     </context>
+<context>
+    <name>QObject::QObject</name>
+    </context>
+<context>
+    <name>QRImageWidget</name>
+    </context>
 <context>
     <name>RPCConsole</name>
     <message>
@@ -530,6 +553,9 @@
         <translation>&amp;Copia Inscriptionem</translation>
     </message>
     </context>
+<context>
+    <name>RecentRequestsTableModel</name>
+    </context>
 <context>
     <name>SendCoinsDialog</name>
     <message>
@@ -572,7 +598,7 @@
         <source>S&amp;end</source>
         <translation>&amp;Mitte</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>SendCoinsEntry</name>
     <message>
@@ -608,6 +634,9 @@
         <translation>Pensa Ad:</translation>
     </message>
     </context>
+<context>
+    <name>SendConfirmationDialog</name>
+    </context>
 <context>
     <name>ShutdownWindow</name>
     </context>
@@ -677,7 +706,7 @@
         <source>Reset all verify message fields</source>
         <translation>Reconstitue omnes campos verificandi nuntii</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>SplashScreen</name>
     <message>
@@ -688,16 +717,34 @@
 <context>
     <name>TrafficGraphWidget</name>
     </context>
+<context>
+    <name>TransactionDesc</name>
+    </context>
 <context>
     <name>TransactionDescDialog</name>
     <message>
         <source>This pane shows a detailed description of the transaction</source>
         <translation>Haec tabula monstrat descriptionem verbosam transactionis</translation>
     </message>
-</context>
+    </context>
+<context>
+    <name>TransactionTableModel</name>
+    </context>
+<context>
+    <name>TransactionView</name>
+    </context>
 <context>
     <name>UnitDisplayStatusBarControl</name>
     </context>
+<context>
+    <name>WalletFrame</name>
+    </context>
+<context>
+    <name>WalletModel</name>
+    </context>
+<context>
+    <name>WalletView</name>
+    </context>
 <context>
     <name>bitcoin-core</name>
     <message>
@@ -724,10 +771,6 @@
         <source>Run in the background as a daemon and accept commands</source>
         <translation>Operare infere sicut daemon et mandata accipe</translation>
     </message>
-    <message>
-        <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
-        <translation>Accipe conexiones externas (praedefinitum: 1 nisi -proxy neque -connect)</translation>
-    </message>
     <message>
         <source>Bitcoin Core</source>
         <translation>Bitcoin Nucleus</translation>
@@ -740,18 +783,10 @@
         <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source>
         <translation>Facere mandatum quotiescumque cassidilis transactio mutet (%s in mandato sbstituitur ab TxID)</translation>
     </message>
-    <message>
-        <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
-        <translation>Hoc est prae-dimittum experimentala aedes - utere eo periculo tuo proprio - nolite utere fodendo vel applicationibus mercatoriis</translation>
-    </message>
     <message>
         <source>Block creation options:</source>
         <translation>Optiones creandi frustorum:</translation>
     </message>
-    <message>
-        <source>Connect only to the specified node(s)</source>
-        <translation>Conecte sole ad nodos specificatos (vel nodum specificatum)</translation>
-    </message>
     <message>
         <source>Corrupted block database detected</source>
         <translation>Corruptum databasum frustorum invenitur</translation>
@@ -816,10 +851,6 @@
         <source>Transaction amount too small</source>
         <translation>Magnitudo transactionis nimis parva</translation>
     </message>
-    <message>
-        <source>Transaction amounts must be positive</source>
-        <translation>Necesse est magnitudines transactionum positivas esse.</translation>
-    </message>
     <message>
         <source>Transaction too large</source>
         <translation>Transactio nimis magna</translation>
diff --git a/src/qt/locale/bitcoin_lt.ts b/src/qt/locale/bitcoin_lt.ts
index 1f6cda1f52b66..67fee9ae42d51 100644
--- a/src/qt/locale/bitcoin_lt.ts
+++ b/src/qt/locale/bitcoin_lt.ts
@@ -41,7 +41,10 @@
         <source>&amp;Delete</source>
         <translation>&amp;Trinti</translation>
     </message>
-</context>
+    </context>
+<context>
+    <name>AddressTableModel</name>
+    </context>
 <context>
     <name>AskPassphraseDialog</name>
     <message>
@@ -60,7 +63,7 @@
         <source>Repeat new passphrase</source>
         <translation>Pakartokite naują slaptafrazę</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>BanTableModel</name>
     <message>
@@ -258,7 +261,7 @@
         <source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;locked&lt;/b&gt;</source>
         <translation>Piniginė &lt;b&gt;užšifruota&lt;/b&gt; ir šiuo metu &lt;b&gt;užrakinta&lt;/b&gt;</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>CoinControlDialog</name>
     <message>
@@ -277,10 +280,6 @@
         <source>Amount:</source>
         <translation>Suma:</translation>
     </message>
-    <message>
-        <source>Priority:</source>
-        <translation>Pirmumas:</translation>
-    </message>
     <message>
         <source>Fee:</source>
         <translation>Mokestis:</translation>
@@ -321,11 +320,7 @@
         <source>Confirmed</source>
         <translation>Patvirtintas</translation>
     </message>
-    <message>
-        <source>Priority</source>
-        <translation>Pirmumas</translation>
-    </message>
-</context>
+    </context>
 <context>
     <name>EditAddressDialog</name>
     <message>
@@ -340,7 +335,7 @@
         <source>&amp;Address</source>
         <translation>&amp;Adresas</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>FreespaceChecker</name>
     <message>
@@ -378,6 +373,17 @@
         <translation>Klaida</translation>
     </message>
     </context>
+<context>
+    <name>ModalOverlay</name>
+    <message>
+        <source>Form</source>
+        <translation>Forma</translation>
+    </message>
+    <message>
+        <source>Last block time</source>
+        <translation>Paskutinio bloko laikas</translation>
+    </message>
+    </context>
 <context>
     <name>OpenURIDialog</name>
     </context>
@@ -539,6 +545,9 @@
         <translation>Jūsų balansas</translation>
     </message>
     </context>
+<context>
+    <name>PaymentServer</name>
+    </context>
 <context>
     <name>PeerTableModel</name>
     </context>
@@ -561,6 +570,12 @@
         <translation>nėra</translation>
     </message>
     </context>
+<context>
+    <name>QObject::QObject</name>
+    </context>
+<context>
+    <name>QRImageWidget</name>
+    </context>
 <context>
     <name>RPCConsole</name>
     <message>
@@ -702,6 +717,9 @@
         <translation>&amp;Kopijuoti adresą</translation>
     </message>
     </context>
+<context>
+    <name>RecentRequestsTableModel</name>
+    </context>
 <context>
     <name>SendCoinsDialog</name>
     <message>
@@ -724,10 +742,6 @@
         <source>Amount:</source>
         <translation>Suma:</translation>
     </message>
-    <message>
-        <source>Priority:</source>
-        <translation>Pirmumas:</translation>
-    </message>
     <message>
         <source>Fee:</source>
         <translation>Mokestis:</translation>
@@ -768,7 +782,7 @@
         <source>S&amp;end</source>
         <translation>&amp;Siųsti</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>SendCoinsEntry</name>
     <message>
@@ -804,6 +818,9 @@
         <translation>Mokėti gavėjui:</translation>
     </message>
     </context>
+<context>
+    <name>SendConfirmationDialog</name>
+    </context>
 <context>
     <name>ShutdownWindow</name>
     </context>
@@ -868,16 +885,34 @@
         <translation>KB/s</translation>
     </message>
 </context>
+<context>
+    <name>TransactionDesc</name>
+    </context>
 <context>
     <name>TransactionDescDialog</name>
     <message>
         <source>This pane shows a detailed description of the transaction</source>
         <translation>Šis langas sandorio detalų aprašymą</translation>
     </message>
-</context>
+    </context>
+<context>
+    <name>TransactionTableModel</name>
+    </context>
+<context>
+    <name>TransactionView</name>
+    </context>
 <context>
     <name>UnitDisplayStatusBarControl</name>
     </context>
+<context>
+    <name>WalletFrame</name>
+    </context>
+<context>
+    <name>WalletModel</name>
+    </context>
+<context>
+    <name>WalletView</name>
+    </context>
 <context>
     <name>bitcoin-core</name>
     <message>
@@ -904,10 +939,6 @@
         <source>Bitcoin Core</source>
         <translation>Bitcoin branduolys</translation>
     </message>
-    <message>
-        <source>Connect only to the specified node(s)</source>
-        <translation>Prisijungti tik prie nurodyto mazgo</translation>
-    </message>
     <message>
         <source>Error opening block database</source>
         <translation>Klaida atveriant blokų duombazę</translation>
diff --git a/src/qt/locale/bitcoin_lv_LV.ts b/src/qt/locale/bitcoin_lv_LV.ts
index 38333531e4816..750e0ff28df44 100644
--- a/src/qt/locale/bitcoin_lv_LV.ts
+++ b/src/qt/locale/bitcoin_lv_LV.ts
@@ -37,7 +37,10 @@
         <source>&amp;Delete</source>
         <translation>&amp;Dzēst</translation>
     </message>
-</context>
+    </context>
+<context>
+    <name>AddressTableModel</name>
+    </context>
 <context>
     <name>AskPassphraseDialog</name>
     <message>
@@ -56,7 +59,7 @@
         <source>Repeat new passphrase</source>
         <translation>Jaunā parole vēlreiz</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>BanTableModel</name>
     </context>
@@ -230,10 +233,6 @@
         <source>No block source available...</source>
         <translation>Nav pieejams neviens bloku avots...</translation>
     </message>
-    <message>
-        <source>%1 and %2</source>
-        <translation>%1 un %2</translation>
-    </message>
     <message>
         <source>%1 behind</source>
         <translation>%1 aizmugurē</translation>
@@ -278,7 +277,7 @@
         <source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;locked&lt;/b&gt;</source>
         <translation>Maciņš ir &lt;b&gt;šifrēts&lt;/b&gt; un pašlaik &lt;b&gt;slēgts&lt;/b&gt;</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>CoinControlDialog</name>
     <message>
@@ -293,10 +292,6 @@
         <source>Amount:</source>
         <translation>Daudzums:</translation>
     </message>
-    <message>
-        <source>Priority:</source>
-        <translation>Prioritāte:</translation>
-    </message>
     <message>
         <source>Fee:</source>
         <translation>Maksa:</translation>
@@ -337,11 +332,7 @@
         <source>Confirmed</source>
         <translation>Apstiprināts</translation>
     </message>
-    <message>
-        <source>Priority</source>
-        <translation>Prioritāte</translation>
-    </message>
-</context>
+    </context>
 <context>
     <name>EditAddressDialog</name>
     <message>
@@ -356,7 +347,7 @@
         <source>&amp;Address</source>
         <translation>&amp;Adrese</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>FreespaceChecker</name>
     <message>
@@ -418,6 +409,17 @@
         <translation>Kļūda</translation>
     </message>
     </context>
+<context>
+    <name>ModalOverlay</name>
+    <message>
+        <source>Form</source>
+        <translation>Forma</translation>
+    </message>
+    <message>
+        <source>Last block time</source>
+        <translation>Pēdējā bloka laiks</translation>
+    </message>
+    </context>
 <context>
     <name>OpenURIDialog</name>
     <message>
@@ -436,7 +438,7 @@
         <source>Select payment request file</source>
         <translation>Izvēlies maksājuma pieprasījuma datni</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>OptionsDialog</name>
     <message>
@@ -627,6 +629,9 @@
         <translation>Jūsu kopējā tekošā bilance</translation>
     </message>
     </context>
+<context>
+    <name>PaymentServer</name>
+    </context>
 <context>
     <name>PeerTableModel</name>
     </context>
@@ -648,6 +653,16 @@
         <source>N/A</source>
         <translation>N/A</translation>
     </message>
+    <message>
+        <source>%1 and %2</source>
+        <translation>%1 un %2</translation>
+    </message>
+    </context>
+<context>
+    <name>QObject::QObject</name>
+    </context>
+<context>
+    <name>QRImageWidget</name>
     </context>
 <context>
     <name>RPCConsole</name>
@@ -810,7 +825,7 @@
         <source>Remove</source>
         <translation>Noņemt</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>ReceiveRequestDialog</name>
     <message>
@@ -829,7 +844,10 @@
         <source>&amp;Save Image...</source>
         <translation>&amp;Saglabāt Attēlu...</translation>
     </message>
-</context>
+    </context>
+<context>
+    <name>RecentRequestsTableModel</name>
+    </context>
 <context>
     <name>SendCoinsDialog</name>
     <message>
@@ -864,10 +882,6 @@
         <source>Amount:</source>
         <translation>Daudzums:</translation>
     </message>
-    <message>
-        <source>Priority:</source>
-        <translation>Prioritāte:</translation>
-    </message>
     <message>
         <source>Fee:</source>
         <translation>Maksa:</translation>
@@ -916,7 +930,7 @@
         <source>S&amp;end</source>
         <translation>&amp;Sūtīt</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>SendCoinsEntry</name>
     <message>
@@ -967,7 +981,10 @@
         <source>Memo:</source>
         <translation>Memo:</translation>
     </message>
-</context>
+    </context>
+<context>
+    <name>SendConfirmationDialog</name>
+    </context>
 <context>
     <name>ShutdownWindow</name>
     <message>
@@ -1041,7 +1058,7 @@
         <source>Reset all verify message fields</source>
         <translation>Atiestatīt visus laukus</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>SplashScreen</name>
     <message>
@@ -1056,16 +1073,34 @@
         <translation>KB/s</translation>
     </message>
 </context>
+<context>
+    <name>TransactionDesc</name>
+    </context>
 <context>
     <name>TransactionDescDialog</name>
     <message>
         <source>This pane shows a detailed description of the transaction</source>
         <translation>Šis panelis parāda transakcijas detaļas</translation>
     </message>
-</context>
+    </context>
+<context>
+    <name>TransactionTableModel</name>
+    </context>
+<context>
+    <name>TransactionView</name>
+    </context>
 <context>
     <name>UnitDisplayStatusBarControl</name>
     </context>
+<context>
+    <name>WalletFrame</name>
+    </context>
+<context>
+    <name>WalletModel</name>
+    </context>
+<context>
+    <name>WalletView</name>
+    </context>
 <context>
     <name>bitcoin-core</name>
     <message>
@@ -1104,10 +1139,6 @@
         <source>Block creation options:</source>
         <translation>Bloka izveidošanas iestatījumi:</translation>
     </message>
-    <message>
-        <source>Connect only to the specified node(s)</source>
-        <translation>Savienoties tikai ar norādītajām nodēm.</translation>
-    </message>
     <message>
         <source>Connection options:</source>
         <translation>Savienojuma iestatījumi:</translation>
@@ -1160,10 +1191,6 @@
         <source>Transaction amount too small</source>
         <translation>Transakcijas summa ir pārāk maza</translation>
     </message>
-    <message>
-        <source>Transaction amounts must be positive</source>
-        <translation>Transakcijas summai ir jābūt pozitīvai</translation>
-    </message>
     <message>
         <source>Transaction too large</source>
         <translation>Transakcija ir pārāk liela</translation>
diff --git a/src/qt/locale/bitcoin_mk_MK.ts b/src/qt/locale/bitcoin_mk_MK.ts
index b696111a5379a..e11e415ec508e 100644
--- a/src/qt/locale/bitcoin_mk_MK.ts
+++ b/src/qt/locale/bitcoin_mk_MK.ts
@@ -41,7 +41,10 @@
         <source>&amp;Delete</source>
         <translation>&amp;Избриши</translation>
     </message>
-</context>
+    </context>
+<context>
+    <name>AddressTableModel</name>
+    </context>
 <context>
     <name>AskPassphraseDialog</name>
     <message>
@@ -56,7 +59,7 @@
         <source>Repeat new passphrase</source>
         <translation>Повторете ја новата тајна фраза</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>BanTableModel</name>
     </context>
@@ -178,26 +181,6 @@
         <source>Processed %n block(s) of transaction history.</source>
         <translation><numerusform>Обработен %n блок од историјата на трансакции.</numerusform><numerusform>Обработени %n блокови од историјата на трансакции.</numerusform></translation>
     </message>
-    <message numerus="yes">
-        <source>%n hour(s)</source>
-        <translation><numerusform>%n час</numerusform><numerusform>%n часови</numerusform></translation>
-    </message>
-    <message numerus="yes">
-        <source>%n day(s)</source>
-        <translation><numerusform>%n ден</numerusform><numerusform>%n денови</numerusform></translation>
-    </message>
-    <message numerus="yes">
-        <source>%n week(s)</source>
-        <translation><numerusform>%n недела</numerusform><numerusform>%n недели</numerusform></translation>
-    </message>
-    <message>
-        <source>%1 and %2</source>
-        <translation>%1 и %2</translation>
-    </message>
-    <message numerus="yes">
-        <source>%n year(s)</source>
-        <translation><numerusform>%n година</numerusform><numerusform>%n години</numerusform></translation>
-    </message>
     <message>
         <source>%1 behind</source>
         <translation>%1 позади</translation>
@@ -255,10 +238,6 @@
         <source>Amount:</source>
         <translation>Сума:</translation>
     </message>
-    <message>
-        <source>Priority:</source>
-        <translation>Приоритет:</translation>
-    </message>
     <message>
         <source>Fee:</source>
         <translation>Провизија:</translation>
@@ -283,11 +262,7 @@
         <source>Date</source>
         <translation>Дата</translation>
     </message>
-    <message>
-        <source>Priority</source>
-        <translation>Приоритет</translation>
-    </message>
-</context>
+    </context>
 <context>
     <name>EditAddressDialog</name>
     <message>
@@ -302,7 +277,7 @@
         <source>&amp;Address</source>
         <translation>&amp;Адреса</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>FreespaceChecker</name>
     <message>
@@ -328,6 +303,9 @@
         <translation>Грешка</translation>
     </message>
     </context>
+<context>
+    <name>ModalOverlay</name>
+    </context>
 <context>
     <name>OpenURIDialog</name>
     <message>
@@ -381,6 +359,9 @@
         <translation>Вкупно:</translation>
     </message>
     </context>
+<context>
+    <name>PaymentServer</name>
+    </context>
 <context>
     <name>PeerTableModel</name>
     </context>
@@ -410,7 +391,17 @@
         <source>%1 ms</source>
         <translation>%1 мс</translation>
     </message>
-</context>
+    <message>
+        <source>%1 and %2</source>
+        <translation>%1 и %2</translation>
+    </message>
+    </context>
+<context>
+    <name>QObject::QObject</name>
+    </context>
+<context>
+    <name>QRImageWidget</name>
+    </context>
 <context>
     <name>RPCConsole</name>
     <message>
@@ -495,7 +486,10 @@
         <source>&amp;Save Image...</source>
         <translation>&amp;Сними Слика...</translation>
     </message>
-</context>
+    </context>
+<context>
+    <name>RecentRequestsTableModel</name>
+    </context>
 <context>
     <name>SendCoinsDialog</name>
     <message>
@@ -506,10 +500,6 @@
         <source>Amount:</source>
         <translation>Сума:</translation>
     </message>
-    <message>
-        <source>Priority:</source>
-        <translation>Приоритет:</translation>
-    </message>
     <message>
         <source>Fee:</source>
         <translation>Провизија:</translation>
@@ -542,6 +532,9 @@
         <translation>Порака:</translation>
     </message>
     </context>
+<context>
+    <name>SendConfirmationDialog</name>
+    </context>
 <context>
     <name>ShutdownWindow</name>
     </context>
@@ -554,12 +547,30 @@
 <context>
     <name>TrafficGraphWidget</name>
     </context>
+<context>
+    <name>TransactionDesc</name>
+    </context>
 <context>
     <name>TransactionDescDialog</name>
     </context>
+<context>
+    <name>TransactionTableModel</name>
+    </context>
+<context>
+    <name>TransactionView</name>
+    </context>
 <context>
     <name>UnitDisplayStatusBarControl</name>
     </context>
+<context>
+    <name>WalletFrame</name>
+    </context>
+<context>
+    <name>WalletModel</name>
+    </context>
+<context>
+    <name>WalletView</name>
+    </context>
 <context>
     <name>bitcoin-core</name>
     <message>
diff --git a/src/qt/locale/bitcoin_mn.ts b/src/qt/locale/bitcoin_mn.ts
index d9ef0d127b8c9..6e13d2128871b 100644
--- a/src/qt/locale/bitcoin_mn.ts
+++ b/src/qt/locale/bitcoin_mn.ts
@@ -37,7 +37,10 @@
         <source>&amp;Delete</source>
         <translation>&amp;Устгах</translation>
     </message>
-</context>
+    </context>
+<context>
+    <name>AddressTableModel</name>
+    </context>
 <context>
     <name>AskPassphraseDialog</name>
     <message>
@@ -52,7 +55,7 @@
         <source>Repeat new passphrase</source>
         <translation>Шинэ нууц үгийг давтана уу</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>BanTableModel</name>
     </context>
@@ -174,7 +177,7 @@
         <source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;locked&lt;/b&gt;</source>
         <translation>Түрүйвч &lt;b&gt;цоожтой&lt;/b&gt; ба одоогоор цоож &lt;b&gt;хаалттай&lt;/b&gt; байна</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>CoinControlDialog</name>
     <message>
@@ -212,7 +215,7 @@
         <source>&amp;Address</source>
         <translation>&amp;Хаяг</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>FreespaceChecker</name>
     </context>
@@ -234,6 +237,13 @@
         <translation>Алдаа</translation>
     </message>
     </context>
+<context>
+    <name>ModalOverlay</name>
+    <message>
+        <source>Last block time</source>
+        <translation>Сүүлийн блокийн хугацаа</translation>
+    </message>
+    </context>
 <context>
     <name>OpenURIDialog</name>
     </context>
@@ -275,6 +285,9 @@
         <translation>Хэрэглэж болох хэмжээ:</translation>
     </message>
     </context>
+<context>
+    <name>PaymentServer</name>
+    </context>
 <context>
     <name>PeerTableModel</name>
     </context>
@@ -289,6 +302,12 @@
         <translation>Алга Байна</translation>
     </message>
     </context>
+<context>
+    <name>QObject::QObject</name>
+    </context>
+<context>
+    <name>QRImageWidget</name>
+    </context>
 <context>
     <name>RPCConsole</name>
     <message>
@@ -370,7 +389,7 @@
         <source>Remove</source>
         <translation>Устгах</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>ReceiveRequestDialog</name>
     <message>
@@ -378,6 +397,9 @@
         <translation>Хаягийг &amp;Хуулбарлах</translation>
     </message>
     </context>
+<context>
+    <name>RecentRequestsTableModel</name>
+    </context>
 <context>
     <name>SendCoinsDialog</name>
     <message>
@@ -424,7 +446,7 @@
         <source>S&amp;end</source>
         <translation>Яв&amp;уул</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>SendCoinsEntry</name>
     <message>
@@ -460,6 +482,9 @@
         <translation>Тѳлѳх хаяг:</translation>
     </message>
     </context>
+<context>
+    <name>SendConfirmationDialog</name>
+    </context>
 <context>
     <name>ShutdownWindow</name>
     <message>
@@ -492,16 +517,34 @@
 <context>
     <name>TrafficGraphWidget</name>
     </context>
+<context>
+    <name>TransactionDesc</name>
+    </context>
 <context>
     <name>TransactionDescDialog</name>
     <message>
         <source>This pane shows a detailed description of the transaction</source>
         <translation>Гүйлгээний дэлгэрэнгүйг энэ бичил цонх харуулж байна</translation>
     </message>
-</context>
+    </context>
+<context>
+    <name>TransactionTableModel</name>
+    </context>
+<context>
+    <name>TransactionView</name>
+    </context>
 <context>
     <name>UnitDisplayStatusBarControl</name>
     </context>
+<context>
+    <name>WalletFrame</name>
+    </context>
+<context>
+    <name>WalletModel</name>
+    </context>
+<context>
+    <name>WalletView</name>
+    </context>
 <context>
     <name>bitcoin-core</name>
     <message>
diff --git a/src/qt/locale/bitcoin_ms_MY.ts b/src/qt/locale/bitcoin_ms_MY.ts
index acfb38e418c7a..0108332dd75ea 100644
--- a/src/qt/locale/bitcoin_ms_MY.ts
+++ b/src/qt/locale/bitcoin_ms_MY.ts
@@ -34,7 +34,10 @@ Alihkan fail data ke dalam tab semasa</translation>
         <source>&amp;Delete</source>
         <translation>&amp;Padam</translation>
     </message>
-</context>
+    </context>
+<context>
+    <name>AddressTableModel</name>
+    </context>
 <context>
     <name>AskPassphraseDialog</name>
     </context>
@@ -61,7 +64,7 @@ Alihkan fail data ke dalam tab semasa</translation>
         <source>&amp;Address</source>
         <translation>Alamat</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>FreespaceChecker</name>
     </context>
@@ -71,6 +74,9 @@ Alihkan fail data ke dalam tab semasa</translation>
 <context>
     <name>Intro</name>
     </context>
+<context>
+    <name>ModalOverlay</name>
+    </context>
 <context>
     <name>OpenURIDialog</name>
     </context>
@@ -80,12 +86,21 @@ Alihkan fail data ke dalam tab semasa</translation>
 <context>
     <name>OverviewPage</name>
     </context>
+<context>
+    <name>PaymentServer</name>
+    </context>
 <context>
     <name>PeerTableModel</name>
     </context>
 <context>
     <name>QObject</name>
     </context>
+<context>
+    <name>QObject::QObject</name>
+    </context>
+<context>
+    <name>QRImageWidget</name>
+    </context>
 <context>
     <name>RPCConsole</name>
     </context>
@@ -99,6 +114,9 @@ Alihkan fail data ke dalam tab semasa</translation>
         <translation>&amp;Salin Alamat</translation>
     </message>
     </context>
+<context>
+    <name>RecentRequestsTableModel</name>
+    </context>
 <context>
     <name>SendCoinsDialog</name>
     <message>
@@ -109,6 +127,9 @@ Alihkan fail data ke dalam tab semasa</translation>
 <context>
     <name>SendCoinsEntry</name>
     </context>
+<context>
+    <name>SendConfirmationDialog</name>
+    </context>
 <context>
     <name>ShutdownWindow</name>
     </context>
@@ -121,12 +142,35 @@ Alihkan fail data ke dalam tab semasa</translation>
 <context>
     <name>TrafficGraphWidget</name>
     </context>
+<context>
+    <name>TransactionDesc</name>
+    </context>
 <context>
     <name>TransactionDescDialog</name>
     </context>
+<context>
+    <name>TransactionTableModel</name>
+    </context>
+<context>
+    <name>TransactionView</name>
+    </context>
 <context>
     <name>UnitDisplayStatusBarControl</name>
     </context>
+<context>
+    <name>WalletFrame</name>
+    </context>
+<context>
+    <name>WalletModel</name>
+    </context>
+<context>
+    <name>WalletView</name>
+    <message>
+        <source>Export the data in the current tab to a file</source>
+        <translation>
+Alihkan fail data ke dalam tab semasa</translation>
+    </message>
+    </context>
 <context>
     <name>bitcoin-core</name>
     </context>
diff --git a/src/qt/locale/bitcoin_nb.ts b/src/qt/locale/bitcoin_nb.ts
index 4538fd6e1e8c1..9749db2b1f9c6 100644
--- a/src/qt/locale/bitcoin_nb.ts
+++ b/src/qt/locale/bitcoin_nb.ts
@@ -41,7 +41,10 @@
         <source>&amp;Delete</source>
         <translation>&amp;Slett</translation>
     </message>
-</context>
+    </context>
+<context>
+    <name>AddressTableModel</name>
+    </context>
 <context>
     <name>AskPassphraseDialog</name>
     <message>
@@ -60,7 +63,7 @@
         <source>Repeat new passphrase</source>
         <translation>Gjenta ny adgangsfrase</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>BanTableModel</name>
     <message>
@@ -114,6 +117,10 @@
         <source>&amp;About %1</source>
         <translation> &amp;Om %1</translation>
     </message>
+    <message>
+        <source>Show information about %1</source>
+        <translation>Vis informasjon om %1</translation>
+    </message>
     <message>
         <source>About &amp;Qt</source>
         <translation>Om &amp;Qt</translation>
@@ -126,6 +133,10 @@
         <source>&amp;Options...</source>
         <translation>&amp;Innstillinger...</translation>
     </message>
+    <message>
+        <source>Modify configuration options for %1</source>
+        <translation>Endre innstilinger for %1</translation>
+    </message>
     <message>
         <source>&amp;Encrypt Wallet...</source>
         <translation>&amp;Krypter Lommebok...</translation>
@@ -262,26 +273,6 @@
         <source>Processed %n block(s) of transaction history.</source>
         <translation><numerusform>Lastet %n blokk med transaksjonshistorikk.</numerusform><numerusform>Lastet %n blokker med transaksjonshistorikk.</numerusform></translation>
     </message>
-    <message numerus="yes">
-        <source>%n hour(s)</source>
-        <translation><numerusform>%n time</numerusform><numerusform>%n timer</numerusform></translation>
-    </message>
-    <message numerus="yes">
-        <source>%n day(s)</source>
-        <translation><numerusform>%n dag</numerusform><numerusform>%n dager</numerusform></translation>
-    </message>
-    <message numerus="yes">
-        <source>%n week(s)</source>
-        <translation><numerusform>%n uke</numerusform><numerusform>%n uker</numerusform></translation>
-    </message>
-    <message>
-        <source>%1 and %2</source>
-        <translation>%1 og %2</translation>
-    </message>
-    <message numerus="yes">
-        <source>%n year(s)</source>
-        <translation><numerusform>%n år</numerusform><numerusform>%n år</numerusform></translation>
-    </message>
     <message>
         <source>%1 behind</source>
         <translation>%1 bak</translation>
@@ -310,6 +301,10 @@
         <source>Up to date</source>
         <translation>Oppdatert</translation>
     </message>
+    <message>
+        <source>%1 client</source>
+        <translation>%1 klient</translation>
+    </message>
     <message>
         <source>Catching up...</source>
         <translation>Laster ned...</translation>
@@ -360,7 +355,7 @@
         <source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;locked&lt;/b&gt;</source>
         <translation>Lommeboken er &lt;b&gt;kryptert&lt;/b&gt; og for tiden &lt;b&gt;låst&lt;/b&gt;</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>CoinControlDialog</name>
     <message>
@@ -379,10 +374,6 @@
         <source>Amount:</source>
         <translation>Beløp:</translation>
     </message>
-    <message>
-        <source>Priority:</source>
-        <translation>Prioritet:</translation>
-    </message>
     <message>
         <source>Fee:</source>
         <translation>Avgift:</translation>
@@ -435,11 +426,7 @@
         <source>Confirmed</source>
         <translation>Bekreftet</translation>
     </message>
-    <message>
-        <source>Priority</source>
-        <translation>Prioritet</translation>
-    </message>
-</context>
+    </context>
 <context>
     <name>EditAddressDialog</name>
     <message>
@@ -462,7 +449,7 @@
         <source>&amp;Address</source>
         <translation>&amp;Adresse</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>FreespaceChecker</name>
     <message>
@@ -496,6 +483,10 @@
         <source>(%1-bit)</source>
         <translation> (%1-bit)</translation>
     </message>
+    <message>
+        <source>About %1</source>
+        <translation>Om %1</translation>
+    </message>
     <message>
         <source>Command-line options</source>
         <translation>Kommandolinjevalg</translation>
@@ -539,6 +530,10 @@
         <source>Welcome</source>
         <translation>Velkommen</translation>
     </message>
+    <message>
+        <source>Welcome to %1.</source>
+        <translation>Velkommen til %1.</translation>
+    </message>
     <message>
         <source>Use the default data directory</source>
         <translation>Bruk standard datamappe</translation>
@@ -564,6 +559,21 @@
         <translation><numerusform>(av %n GB som trengs)</numerusform><numerusform>(av %n GB som trengs)</numerusform></translation>
     </message>
 </context>
+<context>
+    <name>ModalOverlay</name>
+    <message>
+        <source>Form</source>
+        <translation>Skjema</translation>
+    </message>
+    <message>
+        <source>Last block time</source>
+        <translation>Tidspunkt for siste blokk</translation>
+    </message>
+    <message>
+        <source>Hide</source>
+        <translation>Skjul</translation>
+    </message>
+    </context>
 <context>
     <name>OpenURIDialog</name>
     <message>
@@ -582,7 +592,7 @@
         <source>Select payment request file</source>
         <translation>Velg fil for betalingsetterspørring</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>OptionsDialog</name>
     <message>
@@ -729,6 +739,10 @@
         <source>&amp;Window</source>
         <translation>&amp;Vindu</translation>
     </message>
+    <message>
+        <source>Hide tray icon</source>
+        <translation>Skjul søppel ikon</translation>
+    </message>
     <message>
         <source>Show only a tray icon after minimizing the window.</source>
         <translation>Vis kun ikon i systemkurv etter minimering av vinduet.</translation>
@@ -873,6 +887,9 @@
         <translation>Nåværende totale balanse i kun observerbare adresser</translation>
     </message>
 </context>
+<context>
+    <name>PaymentServer</name>
+    </context>
 <context>
     <name>PeerTableModel</name>
     <message>
@@ -883,11 +900,7 @@
         <source>Node/Service</source>
         <translation>Node/Tjeneste</translation>
     </message>
-    <message>
-        <source>Ping Time</source>
-        <translation>Ping-tid</translation>
-    </message>
-</context>
+    </context>
 <context>
     <name>QObject</name>
     <message>
@@ -926,7 +939,17 @@
         <source>%1 ms</source>
         <translation>%1 ms</translation>
     </message>
-</context>
+    <message>
+        <source>%1 and %2</source>
+        <translation>%1 og %2</translation>
+    </message>
+    </context>
+<context>
+    <name>QObject::QObject</name>
+    </context>
+<context>
+    <name>QRImageWidget</name>
+    </context>
 <context>
     <name>RPCConsole</name>
     <message>
@@ -1037,6 +1060,14 @@
         <source>User Agent</source>
         <translation>Brukeragent</translation>
     </message>
+    <message>
+        <source>Decrease font size</source>
+        <translation>Forminsk font størrelsen</translation>
+    </message>
+    <message>
+        <source>Increase font size</source>
+        <translation>Forstørr font størrelse</translation>
+    </message>
     <message>
         <source>Services</source>
         <translation>Tjenester</translation>
@@ -1113,14 +1144,6 @@
         <source>Clear console</source>
         <translation>Tøm konsoll</translation>
     </message>
-    <message>
-        <source>&amp;Disconnect Node</source>
-        <translation>&amp;Koble fra node</translation>
-    </message>
-    <message>
-        <source>Ban Node for</source>
-        <translation>Steng node ute for</translation>
-    </message>
     <message>
         <source>1 &amp;hour</source>
         <translation>1 &amp;time</translation>
@@ -1137,10 +1160,6 @@
         <source>1 &amp;year</source>
         <translation>1 &amp;år</translation>
     </message>
-    <message>
-        <source>&amp;Unban Node</source>
-        <translation>Fjern &amp;Utestengning av Node</translation>
-    </message>
     <message>
         <source>Use up and down arrows to navigate history, and &lt;b&gt;Ctrl-L&lt;/b&gt; to clear screen.</source>
         <translation>Bruk opp og ned pil for å navigere historikken, og &lt;b&gt;Ctrl-L&lt;/b&gt; for å tømme skjermen.</translation>
@@ -1268,7 +1287,7 @@
         <source>Remove</source>
         <translation>Fjern</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>ReceiveRequestDialog</name>
     <message>
@@ -1287,7 +1306,10 @@
         <source>&amp;Save Image...</source>
         <translation>&amp;Lagre Bilde...</translation>
     </message>
-</context>
+    </context>
+<context>
+    <name>RecentRequestsTableModel</name>
+    </context>
 <context>
     <name>SendCoinsDialog</name>
     <message>
@@ -1322,10 +1344,6 @@
         <source>Amount:</source>
         <translation>Beløp:</translation>
     </message>
-    <message>
-        <source>Priority:</source>
-        <translation>Prioritet:</translation>
-    </message>
     <message>
         <source>Fee:</source>
         <translation>Gebyr:</translation>
@@ -1394,10 +1412,6 @@
         <source>(Smart fee not initialized yet. This usually takes a few blocks...)</source>
         <translation>(Smartgebyr ikke innført ennå. Dette tar vanligvis noen blokker...)</translation>
     </message>
-    <message>
-        <source>Confirmation time:</source>
-        <translation>Bekreftelsestid:</translation>
-    </message>
     <message>
         <source>normal</source>
         <translation>normal</translation>
@@ -1438,7 +1452,7 @@
         <source>S&amp;end</source>
         <translation>S&amp;end</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>SendCoinsEntry</name>
     <message>
@@ -1517,7 +1531,10 @@
         <source>Memo:</source>
         <translation>Memo:</translation>
     </message>
-</context>
+    </context>
+<context>
+    <name>SendConfirmationDialog</name>
+    </context>
 <context>
     <name>ShutdownWindow</name>
     <message>
@@ -1611,7 +1628,7 @@
         <source>Reset all verify message fields</source>
         <translation>Tilbakestill alle felter for meldingsverifikasjon</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>SplashScreen</name>
     <message>
@@ -1626,13 +1643,22 @@
         <translation>KB/s</translation>
     </message>
 </context>
+<context>
+    <name>TransactionDesc</name>
+    </context>
 <context>
     <name>TransactionDescDialog</name>
     <message>
         <source>This pane shows a detailed description of the transaction</source>
         <translation>Her vises en detaljert beskrivelse av transaksjonen</translation>
     </message>
-</context>
+    </context>
+<context>
+    <name>TransactionTableModel</name>
+    </context>
+<context>
+    <name>TransactionView</name>
+    </context>
 <context>
     <name>UnitDisplayStatusBarControl</name>
     <message>
@@ -1640,6 +1666,15 @@
         <translation>Enhet å vise beløper i. Klikk for å velge en annen enhet.</translation>
     </message>
 </context>
+<context>
+    <name>WalletFrame</name>
+    </context>
+<context>
+    <name>WalletModel</name>
+    </context>
+<context>
+    <name>WalletView</name>
+    </context>
 <context>
     <name>bitcoin-core</name>
     <message>
@@ -1702,10 +1737,6 @@
         <source>Unable to start HTTP server. See debug log for details.</source>
         <translation>Kunne ikke starte HTTP server. Se debug logg for detaljer.</translation>
     </message>
-    <message>
-        <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
-        <translation>Ta imot tilkoblinger fra utsiden (standardverdi: 1 hvis uten -proxy eller -connect)</translation>
-    </message>
     <message>
         <source>Bitcoin Core</source>
         <translation>Bitcoin Core</translation>
@@ -1718,10 +1749,6 @@
         <source>Delete all wallet transactions and only recover those parts of the blockchain through -rescan on startup</source>
         <translation>Slett alle transaksjoner i lommeboken og gjenopprett kun de delene av blokkjeden gjennom -rescan ved oppstart</translation>
     </message>
-    <message>
-        <source>Distributed under the MIT software license, see the accompanying file COPYING or &lt;http://www.opensource.org/licenses/mit-license.php&gt;.</source>
-        <translation>Distribuert under MIT programvarelisensen, se medfølgende fil COPYING eller &lt;http://www.opensource.org/licenses/mit-license.php&gt;.</translation>
-    </message>
     <message>
         <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source>
         <translation>Kjør kommando når en lommeboktransaksjon endres (%s i kommando er erstattet med TxID)</translation>
@@ -1734,26 +1761,10 @@
         <source>The block database contains a block which appears to be from the future. This may be due to your computer's date and time being set incorrectly. Only rebuild the block database if you are sure that your computer's date and time are correct</source>
         <translation>Blokkdatabasen inneholder en blokk som ser ut til å være fra fremtiden. Dette kan være fordi dato og tid på din datamaskin er satt feil. Gjenopprett kun blokkdatabasen når du er sikker på at dato og tid er satt riktig.</translation>
     </message>
-    <message>
-        <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
-        <translation>Dette er en forhåndssluppet testversjon - bruk på egen risiko - ikke for bruk til blokkutvinning eller bedriftsapplikasjoner</translation>
-    </message>
     <message>
         <source>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</source>
         <translation>Bruk UPnP for lytteport (standardverdi: 1 ved lytting og uten -proxy)</translation>
     </message>
-    <message>
-        <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source>
-        <translation>Advarsel: Nettverket ser ikke ut til å være enig! Noen minere ser ut til å ha problemer.</translation>
-    </message>
-    <message>
-        <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source>
-        <translation>Advarsel: Vi ser ikke ut til å være enige med våre noder! Du må oppgradere, eller andre noder må oppgradere.</translation>
-    </message>
-    <message>
-        <source>Whitelist peers connecting from the given netmask or IP address. Can be specified multiple times.</source>
-        <translation>Hvitelist noder som kobler til fra den oppgitte nettmasken eller IP-adressen. Kan oppgis flere ganger.</translation>
-    </message>
     <message>
         <source>-maxmempool must be at least %d MB</source>
         <translation>-maxmempool må være minst %d MB</translation>
@@ -1766,10 +1777,6 @@
         <source>Block creation options:</source>
         <translation>Valg for opprettelse av blokker:</translation>
     </message>
-    <message>
-        <source>Connect only to the specified node(s)</source>
-        <translation>Koble kun til angitt(e) node(r)</translation>
-    </message>
     <message>
         <source>Connection options:</source>
         <translation>Innstillinger for tilkobling:</translation>
@@ -1814,6 +1821,10 @@
         <source>Error initializing wallet database environment %s!</source>
         <translation>Feil under oppstart av lommeboken sitt databasemiljø %s!</translation>
     </message>
+    <message>
+        <source>Error loading %s</source>
+        <translation>Feil ved lasting av %s</translation>
+    </message>
     <message>
         <source>Error loading block database</source>
         <translation>Feil ved lasting av blokkdatabase</translation>
@@ -1854,6 +1865,14 @@
         <source>Only connect to nodes in network &lt;net&gt; (ipv4, ipv6 or onion)</source>
         <translation>Bare koble til noder i nettverket &lt;net&gt; (IPv4, IPv6 eller onion)</translation>
     </message>
+    <message>
+        <source>Print this help message and exit</source>
+        <translation>Skriv ut denne hjelpemeldingen og avslutt</translation>
+    </message>
+    <message>
+        <source>Print version and exit</source>
+        <translation>Skriv ut denne versjonen og avslutt</translation>
+    </message>
     <message>
         <source>Prune cannot be configured with a negative value.</source>
         <translation>Beskjæringsmodus kan ikke konfigureres med en negativ verdi.</translation>
@@ -1874,6 +1893,10 @@
         <source>Specify wallet file (within data directory)</source>
         <translation>Angi lommebokfil (inne i datamappe)</translation>
     </message>
+    <message>
+        <source>The source code is available from %s.</source>
+        <translation>Kildekoden er tilgjengelig fra %s.</translation>
+    </message>
     <message>
         <source>Unsupported argument -benchmark ignored, use -debug=bench.</source>
         <translation>Ustøttet argument -benchmark ble ignorert, bruk -debug=bench.</translation>
@@ -1954,10 +1977,6 @@
         <source>Maximum size of data in data carrier transactions we relay and mine (default: %u)</source>
         <translation>Maksimal størrelse på data i databærende transaksjoner vi videresender og ufører graving på (standardverdi: %u)</translation>
     </message>
-    <message>
-        <source>Query for peer addresses via DNS lookup, if low on addresses (default: 1 unless -connect)</source>
-        <translation>Søk etter nodeadresser via DNS-oppslag, hvis vi har få adresser å koble til (standard: 1 med mindre -connect)</translation>
-    </message>
     <message>
         <source>Randomize credentials for every proxy connection. This enables Tor stream isolation (default: %u)</source>
         <translation>Bruk tilfeldig identitet for hver proxytilkobling. Dette muliggjør TOR stream isolasjon (standardverdi: %u)</translation>
@@ -1970,10 +1989,6 @@
         <source>The transaction amount is too small to send after the fee has been deducted</source>
         <translation>Transaksjonsbeløpet er for lite til å sendes etter at gebyret er fratrukket</translation>
     </message>
-    <message>
-        <source>This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit &lt;https://www.openssl.org/&gt; and cryptographic software written by Eric Young and UPnP software written by Thomas Bernard.</source>
-        <translation>Dette produktet inneholder programvare utviklet av OpenSSL Project for bruk i OpenSSL Toolkit &lt;https://www.openssl.org/&gt; og kryptografisk programvare skrevet av Eric Young og UPnP-programvare skrevet av Thomas Bernard.</translation>
-    </message>
     <message>
         <source>Whitelisted peers cannot be DoS banned and their transactions are always relayed, even if they are already in the mempool, useful e.g. for a gateway</source>
         <translation>Hvitlistede noder kan ikke DoS-blokkeres, og deres transaksjoner videresendes alltid, selv om de allerede er i minnelageret. Nyttig f.eks. for en gateway.</translation>
@@ -2082,10 +2097,6 @@
         <source>Transaction amount too small</source>
         <translation>Transaksjonen er for liten</translation>
     </message>
-    <message>
-        <source>Transaction amounts must be positive</source>
-        <translation>Transaksjonsbeløpet må være positivt</translation>
-    </message>
     <message>
         <source>Transaction too large for fee policy</source>
         <translation>Transaksjon for stor for gebyrpolitikken</translation>
@@ -2146,10 +2157,6 @@
         <source>-maxtxfee is set very high! Fees this large could be paid on a single transaction.</source>
         <translation>-maxtxfee er satt veldig høyt! Så stort gebyr kan bli betalt ved en enkelt transaksjon.</translation>
     </message>
-    <message>
-        <source>-paytxfee is set very high! This is the transaction fee you will pay if you send a transaction.</source>
-        <translation>-paytxfee er satt veldig høyt! Dette er transaksjonsgebyret du betaler når du sender transaksjoner.</translation>
-    </message>
     <message>
         <source>Do not keep transactions in the mempool longer than &lt;n&gt; hours (default: %u)</source>
         <translation>Ikke hold transaksjoner i minnet lenger enn &lt;n&gt; timer (standard: %u)</translation>
@@ -2258,10 +2265,6 @@
         <source>Set key pool size to &lt;n&gt; (default: %u)</source>
         <translation>Angi størrelse på nøkkel-lager til &lt;n&gt; (standardverdi: %u)</translation>
     </message>
-    <message>
-        <source>Set minimum block size in bytes (default: %u)</source>
-        <translation>Sett minimum blokkstørrelse i bytes (standardverdi: %u)</translation>
-    </message>
     <message>
         <source>Set the number of threads to service RPC calls (default: %d)</source>
         <translation>Sett antall tråder til betjening av RPC-kall (standardverdi: %d)</translation>
diff --git a/src/qt/locale/bitcoin_ne.ts b/src/qt/locale/bitcoin_ne.ts
new file mode 100644
index 0000000000000..f7fb0e5a6e859
--- /dev/null
+++ b/src/qt/locale/bitcoin_ne.ts
@@ -0,0 +1,555 @@
+<TS language="ne" version="2.1">
+<context>
+    <name>AddressBookPage</name>
+    <message>
+        <source>Right-click to edit address or label</source>
+        <translation>ठेगाना वा लेबल सम्पादन गर्न दायाँ-क्लिक गर्नुहोस्</translation>
+    </message>
+    <message>
+        <source>Create a new address</source>
+        <translation>नयाँ ठेगाना सिर्जना गर्नुहोस्</translation>
+    </message>
+    <message>
+        <source>&amp;New</source>
+        <translation>&amp;amp;नयाँ</translation>
+    </message>
+    <message>
+        <source>Copy the currently selected address to the system clipboard</source>
+        <translation>भर्खरै चयन गरेको ठेगाना प्रणाली क्लिपबोर्डमा कपी गर्नुहोस्</translation>
+    </message>
+    <message>
+        <source>&amp;Copy</source>
+        <translation>&amp;amp;कपी गर्नुहोस्</translation>
+    </message>
+    <message>
+        <source>C&amp;lose</source>
+        <translation>बन्द गर्नुहोस्</translation>
+    </message>
+    <message>
+        <source>Delete the currently selected address from the list</source>
+        <translation>भर्खरै चयन गरेको ठेगाना सूचीबाट मेटाउनुहोस्</translation>
+    </message>
+    <message>
+        <source>Export the data in the current tab to a file</source>
+        <translation>वर्तमान ट्याबको डाटालाई फाइलमा निर्यात गर्नुहोस् </translation>
+    </message>
+    <message>
+        <source>&amp;Export</source>
+        <translation>&amp;amp;निर्यात गर्नुहोस्</translation>
+    </message>
+    <message>
+        <source>&amp;Delete</source>
+        <translation>&amp;amp;मेटाउनुहोस्</translation>
+    </message>
+    </context>
+<context>
+    <name>AddressTableModel</name>
+    </context>
+<context>
+    <name>AskPassphraseDialog</name>
+    <message>
+        <source>Passphrase Dialog</source>
+        <translation>पासफ्रेज संवाद</translation>
+    </message>
+    <message>
+        <source>Enter passphrase</source>
+        <translation>पासफ्रेज प्रवेश गर्नुहोस्</translation>
+    </message>
+    <message>
+        <source>New passphrase</source>
+        <translation>नयाँ पासफ्रेज</translation>
+    </message>
+    <message>
+        <source>Repeat new passphrase</source>
+        <translation>नयाँ पासफ्रेज दोहोर्याउनुहोस्</translation>
+    </message>
+    </context>
+<context>
+    <name>BanTableModel</name>
+    <message>
+        <source>IP/Netmask</source>
+        <translation>IP/नेटमास्क</translation>
+    </message>
+    <message>
+        <source>Banned Until</source>
+        <translation>प्रतिबन्धित समय</translation>
+    </message>
+</context>
+<context>
+    <name>BitcoinGUI</name>
+    <message>
+        <source>Sign &amp;message...</source>
+        <translation>सन्देशमा &amp;amp;हस्ताक्षर  गर्नुहोस्...</translation>
+    </message>
+    <message>
+        <source>Synchronizing with network...</source>
+        <translation>नेटवर्कमा समिकरण हुँदै...</translation>
+    </message>
+    <message>
+        <source>&amp;Overview</source>
+        <translation>शारांश</translation>
+    </message>
+    <message>
+        <source>Node</source>
+        <translation>नोड</translation>
+    </message>
+    <message>
+        <source>Show general overview of wallet</source>
+        <translation>वालेटको साधारण शारांश देखाउनुहोस्</translation>
+    </message>
+    <message>
+        <source>&amp;Transactions</source>
+        <translation>&amp;amp;कारोबार</translation>
+    </message>
+    <message>
+        <source>Browse transaction history</source>
+        <translation>कारोबारको इतिहास हेर्नुहोस्</translation>
+    </message>
+    <message>
+        <source>E&amp;xit</source>
+        <translation>बाहिर निस्कनुहोस्</translation>
+    </message>
+    <message>
+        <source>Quit application</source>
+        <translation>एप्लिकेसन बन्द गर्नुहोस्</translation>
+    </message>
+    <message>
+        <source>&amp;About %1</source>
+        <translation>&amp;amp;बारेमा %1</translation>
+    </message>
+    <message>
+        <source>Show information about %1</source>
+        <translation>%1 को बारेमा सूचना देखाउनुहोस्</translation>
+    </message>
+    <message>
+        <source>About &amp;Qt</source>
+        <translation>&amp;amp;Qt</translation>
+    </message>
+    <message>
+        <source>Show information about Qt</source>
+        <translation>Qt को बारेमा सूचना देखाउनुहोस्</translation>
+    </message>
+    <message>
+        <source>&amp;Options...</source>
+        <translation>&amp;amp;विकल्प...</translation>
+    </message>
+    <message>
+        <source>Modify configuration options for %1</source>
+        <translation>%1 का लागि कन्फिगुरेसनको विकल्प परिमार्जन गर्नुहोस</translation>
+    </message>
+    <message>
+        <source>&amp;Encrypt Wallet...</source>
+        <translation>&amp;amp;वालेटलाई इन्क्रिप्ट गर्नुहोस्...</translation>
+    </message>
+    <message>
+        <source>&amp;Backup Wallet...</source>
+        <translation>&amp;amp;वालेटलाई ब्याकअप गर्नुहोस्...</translation>
+    </message>
+    <message>
+        <source>&amp;Change Passphrase...</source>
+        <translation>&amp;amp;पासफ्रेज परिवर्तन गर्नुहोस्...</translation>
+    </message>
+    <message>
+        <source>&amp;Sending addresses...</source>
+        <translation>&amp;amp;पठाउने ठेगानाहरू...</translation>
+    </message>
+    <message>
+        <source>&amp;Receiving addresses...</source>
+        <translation>&amp;amp;प्राप्त गर्ने ठेगानाहरू...</translation>
+    </message>
+    <message>
+        <source>Open &amp;URI...</source>
+        <translation>URI &amp;amp;खोल्नुहोस्...</translation>
+    </message>
+    <message>
+        <source>Reindexing blocks on disk...</source>
+        <translation>डिस्कमा ब्लकलाई पुनः सूचीकरण गरिँदै...</translation>
+    </message>
+    <message>
+        <source>Send coins to a Bitcoin address</source>
+        <translation>बिटकोइन ठेगानामा सिक्का पठाउनुहोस्</translation>
+    </message>
+    <message>
+        <source>Backup wallet to another location</source>
+        <translation>वालेटलाई अर्को ठेगानामा ब्याकअप गर्नुहोस्</translation>
+    </message>
+    <message>
+        <source>Change the passphrase used for wallet encryption</source>
+        <translation>वालेट इन्क्रिप्सनमा प्रयोग हुने इन्क्रिप्सन पासफ्रेज परिवर्तन गर्नुहोस्</translation>
+    </message>
+    <message>
+        <source>&amp;Debug window</source>
+        <translation>&amp;amp;डिबग विन्डो</translation>
+    </message>
+    <message>
+        <source>Open debugging and diagnostic console</source>
+        <translation>डिबगिङ र डायाग्नोस्टिक कन्सोल खोल्नुहोस्</translation>
+    </message>
+    </context>
+<context>
+    <name>CoinControlDialog</name>
+    <message>
+        <source>Amount</source>
+        <translation>रकम</translation>
+    </message>
+    </context>
+<context>
+    <name>EditAddressDialog</name>
+    </context>
+<context>
+    <name>FreespaceChecker</name>
+    </context>
+<context>
+    <name>HelpMessageDialog</name>
+    </context>
+<context>
+    <name>Intro</name>
+    </context>
+<context>
+    <name>ModalOverlay</name>
+    </context>
+<context>
+    <name>OpenURIDialog</name>
+    </context>
+<context>
+    <name>OptionsDialog</name>
+    </context>
+<context>
+    <name>OverviewPage</name>
+    <message>
+        <source>The displayed information may be out of date. Your wallet automatically synchronizes with the Bitcoin network after a connection is established, but this process has not completed yet.</source>
+        <translation>देखाइएको सूचना पूरानो हुन सक्छ । कनेक्सन स्थापित भएपछि, तपाईंको वालेट बिटकोइन नेटवर्कमा स्वचालित रूपमा समिकरण हुन्छ , तर यो प्रक्रिया अहिले सम्म पूरा भएको छैन ।</translation>
+    </message>
+    <message>
+        <source>Watch-only:</source>
+        <translation>हेर्ने-मात्र:</translation>
+    </message>
+    <message>
+        <source>Available:</source>
+        <translation>उपलब्ध:</translation>
+    </message>
+    <message>
+        <source>Your current spendable balance</source>
+        <translation>तपाईंको खर्च गर्न मिल्ने ब्यालेन्स</translation>
+    </message>
+    <message>
+        <source>Pending:</source>
+        <translation>विचाराधिन:</translation>
+    </message>
+    <message>
+        <source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source>
+        <translation>अझै पुष्टि हुन बाँकी र खर्च गर्न मिल्ने ब्यालेन्समा गणना गर्न नमिल्ने जम्मा कारोबार</translation>
+    </message>
+    <message>
+        <source>Immature:</source>
+        <translation>अपरिपक्व:</translation>
+    </message>
+    <message>
+        <source>Mined balance that has not yet matured</source>
+        <translation>अझै परिपक्व नभएको खनन गरिएको ब्यालेन्स</translation>
+    </message>
+    <message>
+        <source>Balances</source>
+        <translation>ब्यालेन्स</translation>
+    </message>
+    <message>
+        <source>Mined balance in watch-only addresses that has not yet matured</source>
+        <translation>अहिलेसम्म परिपक्व नभएको खनन गरिएको, हेर्ने-मात्र ठेगानामा रहेको ब्यालेन्स</translation>
+    </message>
+    <message>
+        <source>Current total balance in watch-only addresses</source>
+        <translation>हेर्ने-मात्र ठेगानामा रहेको हालको जम्मा ब्यालेन्स</translation>
+    </message>
+</context>
+<context>
+    <name>PaymentServer</name>
+    </context>
+<context>
+    <name>PeerTableModel</name>
+    <message>
+        <source>User Agent</source>
+        <translation>प्रयोगकर्ता एजेन्ट</translation>
+    </message>
+    <message>
+        <source>Node/Service</source>
+        <translation>नोड/सेव</translation>
+    </message>
+    </context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Amount</source>
+        <translation>रकम</translation>
+    </message>
+    </context>
+<context>
+    <name>QObject::QObject</name>
+    </context>
+<context>
+    <name>QRImageWidget</name>
+    </context>
+<context>
+    <name>RPCConsole</name>
+    <message>
+        <source>User Agent</source>
+        <translation>प्रयोगकर्ता एजेन्ट</translation>
+    </message>
+    <message>
+        <source>Ping Time</source>
+        <translation>पिङ समय</translation>
+    </message>
+    </context>
+<context>
+    <name>ReceiveCoinsDialog</name>
+    </context>
+<context>
+    <name>ReceiveRequestDialog</name>
+    </context>
+<context>
+    <name>RecentRequestsTableModel</name>
+    </context>
+<context>
+    <name>SendCoinsDialog</name>
+    </context>
+<context>
+    <name>SendCoinsEntry</name>
+    <message>
+        <source>The fee will be deducted from the amount being sent. The recipient will receive less bitcoins than you enter in the amount field. If multiple recipients are selected, the fee is split equally.</source>
+        <translation>पठाइँदै गरेको रकमबाट शुल्क कटौती गरिनेछ । प्राप्तकर्ताले तपाईंले रकम क्षेत्रमा प्रवेष गरेको भन्दा थोरै बिटकोइन प्राप्त गर्ने छन् । धेरै प्राप्तकर्ता चयन गरिएको छ भने समान रूपमा शुल्क विभाजित गरिनेछ ।</translation>
+    </message>
+    <message>
+        <source>A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
+        <translation>बिटकोइनमा संलग्न गरिएको सन्देश: तपाईंको मध्यस्थको लागि कारोबारको साथमा भण्डारण गरिने URI । नोट: यो सन्देश बिटकोइन नेटवर्क मार्फत पठाइने छैन ।</translation>
+    </message>
+    </context>
+<context>
+    <name>SendConfirmationDialog</name>
+    </context>
+<context>
+    <name>ShutdownWindow</name>
+    </context>
+<context>
+    <name>SignVerifyMessageDialog</name>
+    <message>
+        <source>You can sign messages/agreements with your addresses to prove you can receive bitcoins sent to them. Be careful not to sign anything vague or random, as phishing attacks may try to trick you into signing your identity over to them. Only sign fully-detailed statements you agree to.</source>
+        <translation>आफ्नो ठेगानामा पठाइएको बिटकोइन प्राप्त गर्न सकिन्छ भनेर प्रमाणित गर्न तपाईंले ती ठेगानाले सन्देश/सम्झौताहरूमा हस्ताक्षर गर्न सक्नुहुन्छ । फिसिङ आक्रमणले तपाईंलाई छक्याएर अरूका लागि तपाईंको परिचयमा हस्ताक्षर गराउने प्रयास गर्न सक्ने भएकाले अस्पष्ट वा जथाभावीमा हस्ताक्षर गर्दा ध्यान दिनुहोस् । आफू सहमत भएको पूर्ण विस्तृत-कथनमा मात्र हस्ताक्षर गर्नुहोस् ।</translation>
+    </message>
+    </context>
+<context>
+    <name>SplashScreen</name>
+    </context>
+<context>
+    <name>TrafficGraphWidget</name>
+    </context>
+<context>
+    <name>TransactionDesc</name>
+    </context>
+<context>
+    <name>TransactionDescDialog</name>
+    </context>
+<context>
+    <name>TransactionTableModel</name>
+    </context>
+<context>
+    <name>TransactionView</name>
+    </context>
+<context>
+    <name>UnitDisplayStatusBarControl</name>
+    </context>
+<context>
+    <name>WalletFrame</name>
+    </context>
+<context>
+    <name>WalletModel</name>
+    </context>
+<context>
+    <name>WalletView</name>
+    </context>
+<context>
+    <name>bitcoin-core</name>
+    <message>
+        <source>The block database contains a block which appears to be from the future. This may be due to your computer's date and time being set incorrectly. Only rebuild the block database if you are sure that your computer's date and time are correct</source>
+        <translation>ब्लक डाटाबेसमा भविष्यबाट आए जस्तो देखिने एउटा ब्लक हुन्छ । तपाईंको कम्प्युटरको मिति र समय गलत तरिकाले सेट गरिएकाले यस्तो हुन सक्छ । तपाईं आफ्नो कम्प्युटरको मिति र समय सही छ भनेर पक्का हुनुहुन्छ भने मात्र ब्लक डाटाबेस पुनर्निर्माण गर्नुहोस् ।</translation>
+    </message>
+    <message>
+        <source>Unable to rewind the database to a pre-fork state. You will need to redownload the blockchain</source>
+        <translation>प्रि-फर्क अवस्थामा डाटाबेस रिवाइन्ड गर्न सकिएन । तपाईंले फेरि ब्लकचेन डाउनलोड गर्नु पर्ने हुन्छ</translation>
+    </message>
+    <message>
+        <source>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</source>
+        <translation>UPnP प्रयोग गरेर सुन्ने पोर्टलाई म्याप गर्नुहोस् (सुन्दा र -प्रोक्सी नहुँदा डिफल्ट: 1)</translation>
+    </message>
+    <message>
+        <source>You need to rebuild the database using -reindex-chainstate to change -txindex</source>
+        <translation>तपाईंले -चेनस्टेट-पुनः सूचकांकबाट -txindex परिवर्तन प्रयोग गरेर डाटाबेस पुनर्निर्माण गर्नु आवश्यक छ</translation>
+    </message>
+    <message>
+        <source>%s corrupt, salvage failed</source>
+        <translation>%s मा क्षति, बचाव विफल भयो</translation>
+    </message>
+    <message>
+        <source>-maxmempool must be at least %d MB</source>
+        <translation>-maxmempool कम्तिमा %d MB को हुनुपर्छ ।</translation>
+    </message>
+    <message>
+        <source>&lt;category&gt; can be:</source>
+        <translation>&amp;lt;वर्ग&amp;gt; निम्न आकारको हुनसक्छ:</translation>
+    </message>
+    <message>
+        <source>Append comment to the user agent string</source>
+        <translation>प्रयोगकर्ता एजेन्ट स्ट्रिङमा टिप्पणी जोड्नुहोस्</translation>
+    </message>
+    <message>
+        <source>Attempt to recover private keys from a corrupt wallet on startup</source>
+        <translation>स्टार्टअपमा क्षति पूगेको वालेटबाट निजी की प्राप्त गर्न प्रयास गर्नुहोस्</translation>
+    </message>
+    <message>
+        <source>Block creation options:</source>
+        <translation>ब्लक सिर्जनाको बिकल्प:</translation>
+    </message>
+    <message>
+        <source>Cannot resolve -%s address: '%s'</source>
+        <translation>-%s ठेगाना: &amp;apos;%s&amp;apos; निश्चय गर्न सकिँदैन</translation>
+    </message>
+    <message>
+        <source>Change index out of range</source>
+        <translation>सूचकांक परिवर्तन सीमा भन्दा बाहर</translation>
+    </message>
+    <message>
+        <source>Connection options:</source>
+        <translation>कनेक्सनको विकल्प:</translation>
+    </message>
+    <message>
+        <source>Copyright (C) %i-%i</source>
+        <translation>सर्वाधिकार (C) %i-%i</translation>
+    </message>
+    <message>
+        <source>Corrupted block database detected</source>
+        <translation>क्षति पुगेको ब्लक डाटाबेस फेला पर</translation>
+    </message>
+    <message>
+        <source>Debugging/Testing options:</source>
+        <translation>डिबगिङ/परीक्षणका विकल्पहरू:</translation>
+    </message>
+    <message>
+        <source>Do not load the wallet and disable wallet RPC calls</source>
+        <translation>वालेट लोड नगर्नुहोस् र वालेट RPC कलहरू अक्षम गर्नुहोस्</translation>
+    </message>
+    <message>
+        <source>Do you want to rebuild the block database now?</source>
+        <translation>तपाईं अहिले ब्लक डेटाबेस पुनर्निर्माण गर्न चाहनुहुन्छ ?</translation>
+    </message>
+    <message>
+        <source>Unable to bind to %s on this computer. %s is probably already running.</source>
+        <translation>यो कम्प्युटरको %s मा बाँध्न सकिएन । %s सम्भवित रूपमा पहिलैबाट चलिरहेको छ ।</translation>
+    </message>
+    <message>
+        <source>Unsupported argument -benchmark ignored, use -debug=bench.</source>
+        <translation>असमर्थित तर्क -बेन्चमार्कलाई बेवास्ता गरियो, -डिबग=बेन्च प्रयोग गर्नुहोस् ।</translation>
+    </message>
+    <message>
+        <source>Unsupported argument -debugnet ignored, use -debug=net.</source>
+        <translation>असमर्थित तर्क -डिबगनेटलाई बेवास्ता गरियो, -डिबग=नेट प्रयोग गर्नुहोस् । </translation>
+    </message>
+    <message>
+        <source>Unsupported argument -tor found, use -onion.</source>
+        <translation>असमर्थित तर्क -टोर फेला पर्यो, -ओनियन प्रयोग गर्नुहोस् । </translation>
+    </message>
+    <message>
+        <source>Use UPnP to map the listening port (default: %u)</source>
+        <translation>UPnP प्रयोग गरेर सुन्ने पोर्ट म्याप गर्नुहोस् (डिफल्ट: %u) </translation>
+    </message>
+    <message>
+        <source>Verifying blocks...</source>
+        <translation>ब्लक प्रमाणित गरिँदै...</translation>
+    </message>
+    <message>
+        <source>Verifying wallet...</source>
+        <translation>वालेट प्रमाणित गरिँदै...</translation>
+    </message>
+    <message>
+        <source>Wallet %s resides outside data directory %s</source>
+        <translation>वालेट %s डाटा निर्देशिका %s बाहिरमा बस्छ</translation>
+    </message>
+    <message>
+        <source>Wallet debugging/testing options:</source>
+        <translation>वालेट डिबगिङ/परीक्षणका विकल्पहरू:</translation>
+    </message>
+    <message>
+        <source>Wallet needed to be rewritten: restart %s to complete</source>
+        <translation>वालेट फेरि लेख्नु आवश्यक छ: पूरा गर्न %s लाई पुन: सुरु गर्नुहोस्</translation>
+    </message>
+    <message>
+        <source>Wallet options:</source>
+        <translation>वालेटका विकल्पहरू:</translation>
+    </message>
+    <message>
+        <source>Allow JSON-RPC connections from specified source. Valid for &lt;ip&gt; are a single IP (e.g. 1.2.3.4), a network/netmask (e.g. 1.2.3.4/255.255.255.0) or a network/CIDR (e.g. 1.2.3.4/24). This option can be specified multiple times</source>
+        <translation>निर्दिष्ट गरिएको स्रोतबाट आएको JSON-RPC कनेक्सनलाई अनुमति दिनुहोस् । एकल IP (e.g. 1.2.3.4), नेटवर्क/नेटमास्क (उदाहरण 1.2.3.4/255.255.255.0) वा नेटवर्क/CIDR (उदाहरण 1.2.3.4/24) &amp;lt;ip&amp;gt; का लागि मान्य छन् । यो विकल्पलाई धेरै पटक निर्दिष्ट गर्न सकिन्छ</translation>
+    </message>
+    <message>
+        <source>Bind to given address and whitelist peers connecting to it. Use [host]:port notation for IPv6</source>
+        <translation>दिइएको ठेगानामा बाँध्नुहोस् र यसमा कनेक्ट गर्ने सहकर्मीलाई श्वेतसूचीमा राख्नुहोस् । IPv6 लागि [होस्ट]:पोर्ट संकेतन प्रयोग गर्नुहोस्</translation>
+    </message>
+    <message>
+        <source>Bind to given address to listen for JSON-RPC connections. Use [host]:port notation for IPv6. This option can be specified multiple times (default: bind to all interfaces)</source>
+        <translation>JSON-RPC कनेक्सन सुन्नको लागि दिइएको ठेगानामा बाँध्नुहोस् । IPv6 लागि [होस्ट]:पोर्ट संकेतन प्रयोग गर्नुहोस् । यो विकल्पलाई धेरै पटक निर्दिष्ट गर्न सकिन्छ (डिफल्ट: सबै इन्टरफेसमा बाँध्नुहोस्)</translation>
+    </message>
+    <message>
+        <source>Create new files with system default permissions, instead of umask 077 (only effective with disabled wallet functionality)</source>
+        <translation>umask 077 को सट्टामा प्रणालीको डिफल्ट अनुमतिको साथमा नयाँ फाइलहरू सिर्जना गर्नुहोस् । (असक्षम गरिएको वालेट कार्यक्षमतामा मात्र प्रभावकारी हुने)</translation>
+    </message>
+    <message>
+        <source>Discover own IP addresses (default: 1 when listening and no -externalip or -proxy)</source>
+        <translation>आफ्नै IP ठेगाना पत्ता लगाउनुहोस् (सुन्दा र -बाहिरीआइपी वा -प्रोक्सी नहुँदा डिफल्ट: 1 )</translation>
+    </message>
+    <message>
+        <source>Error: Listening for incoming connections failed (listen returned error %s)</source>
+        <translation>त्रुटि: आगमन कनेक्सनमा सुन्ने कार्य असफल भयो (सुन्ने कार्यले त्रुटि %s फर्कायो)</translation>
+    </message>
+    <message>
+        <source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source>
+        <translation>सान्दर्भिक चेतावनी प्राप्त गर्दा आदेश कार्यान्वयन गर्नुहोस् नभए धेरै लामो फोर्क देखा पर्न सक्छ । (cmd को %s लाई सन्देशले प्रतिस्थापन गर्छ)</translation>
+    </message>
+    <message>
+        <source>Fees (in %s/kB) smaller than this are considered zero fee for relaying, mining and transaction creation (default: %s)</source>
+        <translation>रिले, खनन वा कारोबारको सिर्जनाको लागि यो भन्दा कम शुल्क (%s/kB मा) लाई शून्य शुल्कको रूपमा लिइन्छ । (डिफल्ट: %s)</translation>
+    </message>
+    <message>
+        <source>If paytxfee is not set, include enough fee so transactions begin confirmation on average within n blocks (default: %u)</source>
+        <translation>paytxfee सेट गरिएको छैन भने, औसतमा n ब्लक भित्र कारोबार पुष्टिकरण सुरु होस् भन्नका लागि पर्याप्त शुल्क समावेश गर्नुहोस् (डिफल्ट: %u)</translation>
+    </message>
+    <message>
+        <source>Invalid amount for -maxtxfee=&lt;amount&gt;: '%s' (must be at least the minrelay fee of %s to prevent stuck transactions)</source>
+        <translation>maxtxfee=&amp;lt;रकम&amp;gt;: का लागि अमान्य रकम &amp;apos;%s&amp;apos; (कारोबारलाई अड्कन नदिन अनिवार्य रूपमा कम्तिमा %s को न्यूनतम रिले शुल्क हुनु पर्छ)</translation>
+    </message>
+    <message>
+        <source>Maximum size of data in data carrier transactions we relay and mine (default: %u)</source>
+        <translation>हामीले रिले र खनन गर्ने डाटा वाहक कारोबारको डाटाको अधिकतम आकार (डिफल्ट: %u)</translation>
+    </message>
+    <message>
+        <source>Randomize credentials for every proxy connection. This enables Tor stream isolation (default: %u)</source>
+        <translation>हरेक प्रोक्सी कनेक्सनका लागि क्रेडिन्सियल अनियमित बनाउनुहोस् । यसले टोर स्ट्रिमको अलगावलाई सक्षम पार्छ (डिफल्ट: %u)</translation>
+    </message>
+    <message>
+        <source>Set maximum size of high-priority/low-fee transactions in bytes (default: %d)</source>
+        <translation>बाइटमा उच्च-प्राथमिकता/कम शुल्कको कारोबारको अधिकतम आकार सेट गर्नुहोस् (डिफल्ट: %d)</translation>
+    </message>
+    <message>
+        <source>The transaction amount is too small to send after the fee has been deducted</source>
+        <translation>कारोबार रकम शुल्क कटौती गरेपछि पठाउँदा धेरै नै सानो हुन्छ</translation>
+    </message>
+    <message>
+        <source>Use hierarchical deterministic key generation (HD) after BIP32. Only has effect during wallet creation/first start</source>
+        <translation>BIP32 पछि पदानुक्रमित निर्धारक की सिर्जना (HD) प्रयोग गर्नुहोस् ।. केवल वालेट सिर्जना/पहिलो सुरुवातको समयमा प्रभाव पार्छ</translation>
+    </message>
+    <message>
+        <source>Whitelisted peers cannot be DoS banned and their transactions are always relayed, even if they are already in the mempool, useful e.g. for a gateway</source>
+        <translation>श्वेतसूचीका सहकर्मी पहिलैबाट मेमपूल, उपयोगीमा भए पनि उनीहरूलाई DoS banned गर्न सकिँदैन र उनीहरूको कारोबार सधैं रिले हुन्छ, उदाहरण, गेटवेको लाग</translation>
+    </message>
+    <message>
+        <source>You need to rebuild the database using -reindex to go back to unpruned mode.  This will redownload the entire blockchain</source>
+        <translation>तपाईंले काटछाँट नगरेको मोडमा जान पुनः सूचकांक प्रयोग गरेर डाटाबेस पुनर्निर्माण गर्नु पर्ने हुन्छ । यसले सम्पूर्ण ब्लकचेनलाई फेरि डाउनलोड गर्नेछ</translation>
+    </message>
+    </context>
+</TS>
\ No newline at end of file
diff --git a/src/qt/locale/bitcoin_nl.ts b/src/qt/locale/bitcoin_nl.ts
index 781c5a8fd6672..3f5b903336317 100644
--- a/src/qt/locale/bitcoin_nl.ts
+++ b/src/qt/locale/bitcoin_nl.ts
@@ -41,6 +41,77 @@
         <source>&amp;Delete</source>
         <translation>&amp;Verwijder</translation>
     </message>
+    <message>
+        <source>Choose the address to send coins to</source>
+        <translation>Kies het adres om munten naar te versturen</translation>
+    </message>
+    <message>
+        <source>Choose the address to receive coins with</source>
+        <translation>Kies het adres om munten op te ontvangen</translation>
+    </message>
+    <message>
+        <source>C&amp;hoose</source>
+        <translation>K&amp;iezen</translation>
+    </message>
+    <message>
+        <source>Sending addresses</source>
+        <translation>Verzendadressen</translation>
+    </message>
+    <message>
+        <source>Receiving addresses</source>
+        <translation>Ontvangstadressen</translation>
+    </message>
+    <message>
+        <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source>
+        <translation>Dit zijn uw Bitcoinadressen om betalingen mee te verzenden. Controleer altijd het bedrag en het ontvangstadres voordat u uw bitcoins verzendt.</translation>
+    </message>
+    <message>
+        <source>These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source>
+        <translation>Dit zijn uw Bitcoin-adressen waarmee u betalingen kunt ontvangen. We raden u aan om een nieuw ontvangstadres voor elke transactie te gebruiken.</translation>
+    </message>
+    <message>
+        <source>&amp;Copy Address</source>
+        <translation>&amp;Kopiëer Adres</translation>
+    </message>
+    <message>
+        <source>Copy &amp;Label</source>
+        <translation>Kopieer &amp;Label</translation>
+    </message>
+    <message>
+        <source>&amp;Edit</source>
+        <translation>&amp;Bewerk</translation>
+    </message>
+    <message>
+        <source>Export Address List</source>
+        <translation>Exporteer adreslijst</translation>
+    </message>
+    <message>
+        <source>Comma separated file (*.csv)</source>
+        <translation>Kommagescheiden bestand (*.csv)</translation>
+    </message>
+    <message>
+        <source>Exporting Failed</source>
+        <translation>Export mislukt</translation>
+    </message>
+    <message>
+        <source>There was an error trying to save the address list to %1. Please try again.</source>
+        <translation>Een fout is opgetreden tijdens het opslaan van deze adreslijst naar %1. Probeer het nogmaals.</translation>
+    </message>
+</context>
+<context>
+    <name>AddressTableModel</name>
+    <message>
+        <source>Label</source>
+        <translation>Label</translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation>Adres</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(geen label)</translation>
+    </message>
 </context>
 <context>
     <name>AskPassphraseDialog</name>
@@ -60,6 +131,94 @@
         <source>Repeat new passphrase</source>
         <translation>Herhaal nieuw wachtwoord</translation>
     </message>
+    <message>
+        <source>Enter the new passphrase to the wallet.&lt;br/&gt;Please use a passphrase of &lt;b&gt;ten or more random characters&lt;/b&gt;, or &lt;b&gt;eight or more words&lt;/b&gt;.</source>
+        <translation>Voer een nieuw wachtwoord in voor uw portemonnee.&lt;br/&gt;Gebruik een wachtwoord van &lt;b&gt;tien of meer willekeurige karakters&lt;/b&gt;, of &lt;b&gt;acht of meer woorden&lt;/b&gt;.</translation>
+    </message>
+    <message>
+        <source>Encrypt wallet</source>
+        <translation>Versleutel portemonnee</translation>
+    </message>
+    <message>
+        <source>This operation needs your wallet passphrase to unlock the wallet.</source>
+        <translation>Deze operatie vereist uw portemonneewachtwoord om de portemonnee te openen.</translation>
+    </message>
+    <message>
+        <source>Unlock wallet</source>
+        <translation>Open portemonnee</translation>
+    </message>
+    <message>
+        <source>This operation needs your wallet passphrase to decrypt the wallet.</source>
+        <translation>Deze operatie vereist uw portemonneewachtwoord om de portemonnee te ontsleutelen</translation>
+    </message>
+    <message>
+        <source>Decrypt wallet</source>
+        <translation>Ontsleutel portemonnee</translation>
+    </message>
+    <message>
+        <source>Change passphrase</source>
+        <translation>Wijzig wachtwoord</translation>
+    </message>
+    <message>
+        <source>Enter the old passphrase and new passphrase to the wallet.</source>
+        <translation>Voer het oude en nieuwe wachtwoord in voor uw portemonnee.</translation>
+    </message>
+    <message>
+        <source>Confirm wallet encryption</source>
+        <translation>Bevestig versleuteling van de portemonnee</translation>
+    </message>
+    <message>
+        <source>Warning: If you encrypt your wallet and lose your passphrase, you will &lt;b&gt;LOSE ALL OF YOUR BITCOINS&lt;/b&gt;!</source>
+        <translation>Waarschuwing: Als u uw portemonnee versleutelt en uw wachtwoord vergeet, zult u &lt;b&gt;AL UW BITCOINS VERLIEZEN&lt;/b&gt;!</translation>
+    </message>
+    <message>
+        <source>Are you sure you wish to encrypt your wallet?</source>
+        <translation>Weet u zeker dat u uw portemonnee wilt versleutelen?</translation>
+    </message>
+    <message>
+        <source>Wallet encrypted</source>
+        <translation>Portemonnee versleuteld</translation>
+    </message>
+    <message>
+        <source>%1 will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source>
+        <translation>%1 zal nu afsluiten om het versleutelingsproces te voltooien. Onthoud dat het versleutelen van uw portemonnee u niet volledig kan beschermen: Malware kan uw computer infecteren en uw bitcoins stelen.</translation>
+    </message>
+    <message>
+        <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source>
+        <translation>BELANGRIJK: Elke eerder gemaakte backup van uw portemonneebestand dient u te vervangen door het nieuw gegenereerde, versleutelde portemonneebestand. Om veiligheidsredenen zullen eerdere backups van het niet-versleutelde portemonneebestand onbruikbaar worden zodra u uw nieuwe, versleutelde, portemonnee begint te gebruiken.</translation>
+    </message>
+    <message>
+        <source>Wallet encryption failed</source>
+        <translation>Portemonneeversleuteling mislukt</translation>
+    </message>
+    <message>
+        <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
+        <translation>Portemonneeversleuteling mislukt door een interne fout. Uw portemonnee is niet versleuteld.</translation>
+    </message>
+    <message>
+        <source>The supplied passphrases do not match.</source>
+        <translation>De opgegeven wachtwoorden komen niet overeen</translation>
+    </message>
+    <message>
+        <source>Wallet unlock failed</source>
+        <translation>Portemonnee openen mislukt</translation>
+    </message>
+    <message>
+        <source>The passphrase entered for the wallet decryption was incorrect.</source>
+        <translation>Het opgegeven wachtwoord voor de portemonnee-ontsleuteling is niet correct.</translation>
+    </message>
+    <message>
+        <source>Wallet decryption failed</source>
+        <translation>Portemonnee-ontsleuteling mislukt</translation>
+    </message>
+    <message>
+        <source>Wallet passphrase was successfully changed.</source>
+        <translation>Portemonneewachtwoord is met succes gewijzigd.</translation>
+    </message>
+    <message>
+        <source>Warning: The Caps Lock key is on!</source>
+        <translation>Waarschuwing: De Caps-Lock-toets staat aan!</translation>
+    </message>
 </context>
 <context>
     <name>BanTableModel</name>
@@ -278,26 +437,6 @@
         <source>Processed %n block(s) of transaction history.</source>
         <translation><numerusform>%n blok aan transactiegeschiedenis verwerkt.</numerusform><numerusform>%n blokken aan transactiegeschiedenis verwerkt.</numerusform></translation>
     </message>
-    <message numerus="yes">
-        <source>%n hour(s)</source>
-        <translation><numerusform>%n uur</numerusform><numerusform>%n uren</numerusform></translation>
-    </message>
-    <message numerus="yes">
-        <source>%n day(s)</source>
-        <translation><numerusform>%n dag</numerusform><numerusform>%n dagen</numerusform></translation>
-    </message>
-    <message numerus="yes">
-        <source>%n week(s)</source>
-        <translation><numerusform>%n week</numerusform><numerusform>%n weken</numerusform></translation>
-    </message>
-    <message>
-        <source>%1 and %2</source>
-        <translation>%1 en %2</translation>
-    </message>
-    <message numerus="yes">
-        <source>%n year(s)</source>
-        <translation><numerusform>%n jaar</numerusform><numerusform>%n jaren</numerusform></translation>
-    </message>
     <message>
         <source>%1 behind</source>
         <translation>%1 achter</translation>
@@ -384,7 +523,7 @@
         <source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;locked&lt;/b&gt;</source>
         <translation>Portemonnee is &lt;b&gt;versleuteld&lt;/b&gt; en momenteel &lt;b&gt;gesloten&lt;/b&gt;</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>CoinControlDialog</name>
     <message>
@@ -403,10 +542,6 @@
         <source>Amount:</source>
         <translation>Bedrag:</translation>
     </message>
-    <message>
-        <source>Priority:</source>
-        <translation>Prioriteit:</translation>
-    </message>
     <message>
         <source>Fee:</source>
         <translation>Transactiekosten:</translation>
@@ -460,8 +595,84 @@
         <translation>Bevestigd</translation>
     </message>
     <message>
-        <source>Priority</source>
-        <translation>Prioriteit</translation>
+        <source>Copy address</source>
+        <translation>Kopieer adres</translation>
+    </message>
+    <message>
+        <source>Copy label</source>
+        <translation>Kopieer label</translation>
+    </message>
+    <message>
+        <source>Copy amount</source>
+        <translation>Kopieer bedrag</translation>
+    </message>
+    <message>
+        <source>Copy transaction ID</source>
+        <translation>Kopieer transactie-ID</translation>
+    </message>
+    <message>
+        <source>Lock unspent</source>
+        <translation>Blokeer ongebruikte</translation>
+    </message>
+    <message>
+        <source>Unlock unspent</source>
+        <translation>Deblokkeer ongebruikte</translation>
+    </message>
+    <message>
+        <source>Copy quantity</source>
+        <translation>Kopieer aantal</translation>
+    </message>
+    <message>
+        <source>Copy fee</source>
+        <translation>Kopieer vergoeding</translation>
+    </message>
+    <message>
+        <source>Copy after fee</source>
+        <translation>Kopieer na vergoeding</translation>
+    </message>
+    <message>
+        <source>Copy bytes</source>
+        <translation>Kopieer bytes</translation>
+    </message>
+    <message>
+        <source>Copy dust</source>
+        <translation>Kopieër stof</translation>
+    </message>
+    <message>
+        <source>Copy change</source>
+        <translation>Kopieer wijziging</translation>
+    </message>
+    <message>
+        <source>(%1 locked)</source>
+        <translation>(%1 geblokkeerd)</translation>
+    </message>
+    <message>
+        <source>yes</source>
+        <translation>ja</translation>
+    </message>
+    <message>
+        <source>no</source>
+        <translation>nee</translation>
+    </message>
+    <message>
+        <source>This label turns red if any recipient receives an amount smaller than the current dust threshold.</source>
+        <translation>Dit label wordt rood, als een ontvanger een bedrag van minder dan de huidige dust-drempel gekregen heeft.</translation>
+    </message>
+    <message>
+        <source>Can vary +/- %1 satoshi(s) per input.</source>
+        <translation>Kan per input +/- %1 satoshi(s)  variëren.</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(geen label)</translation>
+    </message>
+    <message>
+        <source>change from %1 (%2)</source>
+        <translation>wijzig van %1 (%2)</translation>
+    </message>
+    <message>
+        <source>(change)</source>
+        <translation>(wijzig)</translation>
     </message>
 </context>
 <context>
@@ -486,6 +697,38 @@
         <source>&amp;Address</source>
         <translation>&amp;Adres</translation>
     </message>
+    <message>
+        <source>New receiving address</source>
+        <translation>Nieuw ontvangstadres</translation>
+    </message>
+    <message>
+        <source>New sending address</source>
+        <translation>Nieuw verzendadres</translation>
+    </message>
+    <message>
+        <source>Edit receiving address</source>
+        <translation>Bewerk ontvangstadres</translation>
+    </message>
+    <message>
+        <source>Edit sending address</source>
+        <translation>Bewerk verzendadres</translation>
+    </message>
+    <message>
+        <source>The entered address "%1" is not a valid Bitcoin address.</source>
+        <translation>Het opgegeven adres "%1" is een ongeldig Bitcoinadres.</translation>
+    </message>
+    <message>
+        <source>The entered address "%1" is already in the address book.</source>
+        <translation>Het opgegeven adres "%1" bestaat al in uw adresboek.</translation>
+    </message>
+    <message>
+        <source>Could not unlock wallet.</source>
+        <translation>Kon de portemonnee niet openen.</translation>
+    </message>
+    <message>
+        <source>New key generation failed.</source>
+        <translation>Genereren nieuwe sleutel mislukt.</translation>
+    </message>
 </context>
 <context>
     <name>FreespaceChecker</name>
@@ -608,6 +851,21 @@
         <translation><numerusform>(van %n GB nodig)</numerusform><numerusform>(van %n GB nodig)</numerusform></translation>
     </message>
 </context>
+<context>
+    <name>ModalOverlay</name>
+    <message>
+        <source>Form</source>
+        <translation>Vorm</translation>
+    </message>
+    <message>
+        <source>Last block time</source>
+        <translation>Tijd laatste blok</translation>
+    </message>
+    <message>
+        <source>Hide</source>
+        <translation>Verbergen</translation>
+    </message>
+    </context>
 <context>
     <name>OpenURIDialog</name>
     <message>
@@ -626,6 +884,10 @@
         <source>Select payment request file</source>
         <translation>Selecteer betalingsverzoek bestand</translation>
     </message>
+    <message>
+        <source>Select payment request file to open</source>
+        <translation>Selecteer betalingsverzoekbestand om te openen</translation>
+    </message>
 </context>
 <context>
     <name>OptionsDialog</name>
@@ -937,6 +1199,97 @@
         <translation>Huidige balans in alleen-bekijkbare adressen.</translation>
     </message>
 </context>
+<context>
+    <name>PaymentServer</name>
+    <message>
+        <source>Payment request error</source>
+        <translation>Fout bij betalingsverzoek</translation>
+    </message>
+    <message>
+        <source>Cannot start bitcoin: click-to-pay handler</source>
+        <translation>Kan bitcoin niet starten: click-to-pay handler</translation>
+    </message>
+    <message>
+        <source>URI handling</source>
+        <translation>URI-behandeling</translation>
+    </message>
+    <message>
+        <source>Payment request fetch URL is invalid: %1</source>
+        <translation>URL om betalingsverzoek te verkrijgen is ongeldig: %1</translation>
+    </message>
+    <message>
+        <source>Invalid payment address %1</source>
+        <translation>Ongeldig betalingsadres %1</translation>
+    </message>
+    <message>
+        <source>URI cannot be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source>
+        <translation>URI kan niet verwerkt worden! Dit kan het gevolg zijn van een ongeldig Bitcoin adres of misvormde URI parameters.</translation>
+    </message>
+    <message>
+        <source>Payment request file handling</source>
+        <translation>Betalingsverzoek bestandsafhandeling</translation>
+    </message>
+    <message>
+        <source>Payment request file cannot be read! This can be caused by an invalid payment request file.</source>
+        <translation>Betalingsverzoekbestand kan niet gelezen of verwerkt worden! Dit kan veroorzaakt worden door een ongeldig betalingsverzoekbestand.</translation>
+    </message>
+    <message>
+        <source>Payment request rejected</source>
+        <translation>Betalingsverzoek geweigerd</translation>
+    </message>
+    <message>
+        <source>Payment request network doesn't match client network.</source>
+        <translation>Betalingsaanvraagnetwerk komt niet overeen met klantennetwerk.</translation>
+    </message>
+    <message>
+        <source>Payment request expired.</source>
+        <translation>Betalingsverzoek verlopen.</translation>
+    </message>
+    <message>
+        <source>Payment request is not initialized.</source>
+        <translation>Betalingsaanvraag is niet geïnitialiseerd.</translation>
+    </message>
+    <message>
+        <source>Unverified payment requests to custom payment scripts are unsupported.</source>
+        <translation>Niet-geverifieerde betalingsverzoeken naar aangepaste betalingsscripts worden niet ondersteund.</translation>
+    </message>
+    <message>
+        <source>Invalid payment request.</source>
+        <translation>Ongeldig betalingsverzoek.</translation>
+    </message>
+    <message>
+        <source>Requested payment amount of %1 is too small (considered dust).</source>
+        <translation>Het gevraagde betalingsbedrag van %1 is te weinig (beschouwd als stof).</translation>
+    </message>
+    <message>
+        <source>Refund from %1</source>
+        <translation>Restitutie van %1</translation>
+    </message>
+    <message>
+        <source>Payment request %1 is too large (%2 bytes, allowed %3 bytes).</source>
+        <translation>Betalingsverzoek %1 is te groot (%2 bytes, toegestaan ​​%3 bytes).</translation>
+    </message>
+    <message>
+        <source>Error communicating with %1: %2</source>
+        <translation>Fout bij communiceren met %1: %2</translation>
+    </message>
+    <message>
+        <source>Payment request cannot be parsed!</source>
+        <translation>Betalingsverzoek kan niet worden verwerkt!</translation>
+    </message>
+    <message>
+        <source>Bad response from server %1</source>
+        <translation>Ongeldige respons van server %1</translation>
+    </message>
+    <message>
+        <source>Network request error</source>
+        <translation>Fout bij netwerkverzoek</translation>
+    </message>
+    <message>
+        <source>Payment acknowledged</source>
+        <translation>Betaling bevestigd</translation>
+    </message>
+</context>
 <context>
     <name>PeerTableModel</name>
     <message>
@@ -947,11 +1300,7 @@
         <source>Node/Service</source>
         <translation>Node/Dienst</translation>
     </message>
-    <message>
-        <source>Ping Time</source>
-        <translation>Ping tijd</translation>
-    </message>
-</context>
+    </context>
 <context>
     <name>QObject</name>
     <message>
@@ -990,6 +1339,32 @@
         <source>%1 ms</source>
         <translation>%1 ms</translation>
     </message>
+    <message>
+        <source>%1 and %2</source>
+        <translation>%1 en %2</translation>
+    </message>
+    </context>
+<context>
+    <name>QObject::QObject</name>
+    </context>
+<context>
+    <name>QRImageWidget</name>
+    <message>
+        <source>&amp;Save Image...</source>
+        <translation>&amp;Sla afbeelding op...</translation>
+    </message>
+    <message>
+        <source>&amp;Copy Image</source>
+        <translation>&amp;Afbeelding kopiëren</translation>
+    </message>
+    <message>
+        <source>Save QR Code</source>
+        <translation>Sla QR-code op</translation>
+    </message>
+    <message>
+        <source>PNG Image (*.png)</source>
+        <translation>PNG afbeelding (*.png)</translation>
+    </message>
 </context>
 <context>
     <name>RPCConsole</name>
@@ -1193,14 +1568,6 @@
         <source>Clear console</source>
         <translation>Maak console leeg</translation>
     </message>
-    <message>
-        <source>&amp;Disconnect Node</source>
-        <translation>&amp;Verbreek Verbinding Node</translation>
-    </message>
-    <message>
-        <source>Ban Node for</source>
-        <translation>Ban Node voor</translation>
-    </message>
     <message>
         <source>1 &amp;hour</source>
         <translation>1 &amp;uur</translation>
@@ -1217,10 +1584,6 @@
         <source>1 &amp;year</source>
         <translation>1 &amp;jaar</translation>
     </message>
-    <message>
-        <source>&amp;Unban Node</source>
-        <translation>&amp;Maak Ban Ongedaan voor Node</translation>
-    </message>
     <message>
         <source>Welcome to the %1 RPC console.</source>
         <translation>Welkom bij de %1 RPC-console.</translation>
@@ -1352,6 +1715,18 @@
         <source>Remove</source>
         <translation>Verwijder</translation>
     </message>
+    <message>
+        <source>Copy label</source>
+        <translation>Kopieer label</translation>
+    </message>
+    <message>
+        <source>Copy message</source>
+        <translation>Kopieer bericht</translation>
+    </message>
+    <message>
+        <source>Copy amount</source>
+        <translation>Kopieer bedrag</translation>
+    </message>
 </context>
 <context>
     <name>ReceiveRequestDialog</name>
@@ -1371,29 +1746,96 @@
         <source>&amp;Save Image...</source>
         <translation>&amp;Sla afbeelding op...</translation>
     </message>
-</context>
-<context>
-    <name>SendCoinsDialog</name>
     <message>
-        <source>Send Coins</source>
-        <translation>Verstuurde munten</translation>
+        <source>Request payment to %1</source>
+        <translation>Betalingsverzoek tot %1</translation>
     </message>
     <message>
-        <source>Coin Control Features</source>
-        <translation>Coin controle opties</translation>
+        <source>Payment information</source>
+        <translation>Betalingsinformatie</translation>
     </message>
     <message>
-        <source>Inputs...</source>
-        <translation>Invoer...</translation>
+        <source>URI</source>
+        <translation>URI</translation>
     </message>
     <message>
-        <source>automatically selected</source>
-        <translation>automatisch geselecteerd</translation>
+        <source>Address</source>
+        <translation>Adres</translation>
     </message>
     <message>
-        <source>Insufficient funds!</source>
-        <translation>Onvoldoende fonds!</translation>
-    </message>
+        <source>Amount</source>
+        <translation>Bedrag</translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation>Label</translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation>Bericht</translation>
+    </message>
+    <message>
+        <source>Resulting URI too long, try to reduce the text for label / message.</source>
+        <translation>Resulterende URI te lang, probeer de tekst korter te maken voor het label/bericht.</translation>
+    </message>
+    <message>
+        <source>Error encoding URI into QR Code.</source>
+        <translation>Fout tijdens encoderen URI in QR-code</translation>
+    </message>
+</context>
+<context>
+    <name>RecentRequestsTableModel</name>
+    <message>
+        <source>Date</source>
+        <translation>Datum</translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation>Label</translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation>Bericht</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(geen label)</translation>
+    </message>
+    <message>
+        <source>(no message)</source>
+        <translation>(geen bericht)</translation>
+    </message>
+    <message>
+        <source>(no amount requested)</source>
+        <translation>(geen bedrag aangevraagd)</translation>
+    </message>
+    <message>
+        <source>Requested</source>
+        <translation>Verzoek ingediend</translation>
+    </message>
+</context>
+<context>
+    <name>SendCoinsDialog</name>
+    <message>
+        <source>Send Coins</source>
+        <translation>Verstuurde munten</translation>
+    </message>
+    <message>
+        <source>Coin Control Features</source>
+        <translation>Coin controle opties</translation>
+    </message>
+    <message>
+        <source>Inputs...</source>
+        <translation>Invoer...</translation>
+    </message>
+    <message>
+        <source>automatically selected</source>
+        <translation>automatisch geselecteerd</translation>
+    </message>
+    <message>
+        <source>Insufficient funds!</source>
+        <translation>Onvoldoende fonds!</translation>
+    </message>
     <message>
         <source>Quantity:</source>
         <translation>Kwantiteit</translation>
@@ -1406,10 +1848,6 @@
         <source>Amount:</source>
         <translation>Bedrag:</translation>
     </message>
-    <message>
-        <source>Priority:</source>
-        <translation>Prioriteit:</translation>
-    </message>
     <message>
         <source>Fee:</source>
         <translation>Kosten:</translation>
@@ -1478,10 +1916,6 @@
         <source>(Smart fee not initialized yet. This usually takes a few blocks...)</source>
         <translation>(Slimme transactiekosten is nog niet geïnitialiseerd. Dit duurt meestal een paar blokken...)</translation>
     </message>
-    <message>
-        <source>Confirmation time:</source>
-        <translation>Bevestigings tijd:</translation>
-    </message>
     <message>
         <source>normal</source>
         <translation>normaal</translation>
@@ -1522,6 +1956,106 @@
         <source>S&amp;end</source>
         <translation>V&amp;erstuur</translation>
     </message>
+    <message>
+        <source>Copy quantity</source>
+        <translation>Kopieer aantal</translation>
+    </message>
+    <message>
+        <source>Copy amount</source>
+        <translation>Kopieer bedrag</translation>
+    </message>
+    <message>
+        <source>Copy fee</source>
+        <translation>Kopieer vergoeding</translation>
+    </message>
+    <message>
+        <source>Copy after fee</source>
+        <translation>Kopieer na vergoeding</translation>
+    </message>
+    <message>
+        <source>Copy bytes</source>
+        <translation>Kopieer bytes</translation>
+    </message>
+    <message>
+        <source>Copy dust</source>
+        <translation>Kopieër stof</translation>
+    </message>
+    <message>
+        <source>Copy change</source>
+        <translation>Kopieer wijziging</translation>
+    </message>
+    <message>
+        <source>%1 to %2</source>
+        <translation>%1 tot %2</translation>
+    </message>
+    <message>
+        <source>Are you sure you want to send?</source>
+        <translation>Weet u zeker dat u wilt verzenden?</translation>
+    </message>
+    <message>
+        <source>added as transaction fee</source>
+        <translation>toegevoegd als transactiekosten</translation>
+    </message>
+    <message>
+        <source>Total Amount %1</source>
+        <translation>Totaalbedrag %1</translation>
+    </message>
+    <message>
+        <source>or</source>
+        <translation>of</translation>
+    </message>
+    <message>
+        <source>Confirm send coins</source>
+        <translation>Bevestig versturen munten</translation>
+    </message>
+    <message>
+        <source>The recipient address is not valid. Please recheck.</source>
+        <translation>Het adres van de ontvanger is niet geldig. Gelieve opnieuw te controleren.</translation>
+    </message>
+    <message>
+        <source>The amount to pay must be larger than 0.</source>
+        <translation>Het ingevoerde bedrag moet groter zijn dan 0.</translation>
+    </message>
+    <message>
+        <source>The amount exceeds your balance.</source>
+        <translation>Het bedrag is hoger dan uw huidige saldo.</translation>
+    </message>
+    <message>
+        <source>The total exceeds your balance when the %1 transaction fee is included.</source>
+        <translation>Het totaal overschrijdt uw huidige saldo wanneer de %1 transactiekosten worden meegerekend.</translation>
+    </message>
+    <message>
+        <source>Duplicate address found: addresses should only be used once each.</source>
+        <translation>Dubbel adres gevonden: adressen mogen maar één keer worden gebruikt worden.</translation>
+    </message>
+    <message>
+        <source>Transaction creation failed!</source>
+        <translation>Transactiecreatie mislukt</translation>
+    </message>
+    <message>
+        <source>A fee higher than %1 is considered an absurdly high fee.</source>
+        <translation>Een vergoeding van meer dan %1 wordt beschouwd als een absurd hoge vergoeding.</translation>
+    </message>
+    <message>
+        <source>Payment request expired.</source>
+        <translation>Betalingsverzoek verlopen.</translation>
+    </message>
+    <message>
+        <source>Pay only the required fee of %1</source>
+        <translation>Betaal alleen de verplichte transactiekosten van %1</translation>
+    </message>
+    <message>
+        <source>Warning: Invalid Bitcoin address</source>
+        <translation>Waarschuwing: Ongeldig Bitcoinadres</translation>
+    </message>
+    <message>
+        <source>Warning: Unknown change address</source>
+        <translation>Waarschuwing: Onbekend wisselgeldadres</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(geen label)</translation>
+    </message>
 </context>
 <context>
     <name>SendCoinsEntry</name>
@@ -1601,6 +2135,17 @@
         <source>Memo:</source>
         <translation>Memo:</translation>
     </message>
+    <message>
+        <source>Enter a label for this address to add it to your address book</source>
+        <translation>Vul een label in voor dit adres om het toe te voegen aan uw adresboek</translation>
+    </message>
+</context>
+<context>
+    <name>SendConfirmationDialog</name>
+    <message>
+        <source>Yes</source>
+        <translation>Ja</translation>
+    </message>
 </context>
 <context>
     <name>ShutdownWindow</name>
@@ -1699,6 +2244,58 @@
         <source>Reset all verify message fields</source>
         <translation>Verwijder alles in de invulvelden</translation>
     </message>
+    <message>
+        <source>Click "Sign Message" to generate signature</source>
+        <translation>Klik op "Onderteken Bericht" om de handtekening te genereren</translation>
+    </message>
+    <message>
+        <source>The entered address is invalid.</source>
+        <translation>Het opgegeven adres is ongeldig.</translation>
+    </message>
+    <message>
+        <source>Please check the address and try again.</source>
+        <translation>Controleer het adres en probeer het opnieuw.</translation>
+    </message>
+    <message>
+        <source>The entered address does not refer to a key.</source>
+        <translation>Het opgegeven adres verwijst niet naar een sleutel.</translation>
+    </message>
+    <message>
+        <source>Wallet unlock was cancelled.</source>
+        <translation>Portemonnee-ontsleuteling is geannuleerd.</translation>
+    </message>
+    <message>
+        <source>Private key for the entered address is not available.</source>
+        <translation>Geheime sleutel voor het ingevoerde adres is niet beschikbaar.</translation>
+    </message>
+    <message>
+        <source>Message signing failed.</source>
+        <translation>Ondertekenen van het bericht is mislukt.</translation>
+    </message>
+    <message>
+        <source>Message signed.</source>
+        <translation>Bericht ondertekend.</translation>
+    </message>
+    <message>
+        <source>The signature could not be decoded.</source>
+        <translation>De handtekening kon niet worden gedecodeerd.</translation>
+    </message>
+    <message>
+        <source>Please check the signature and try again.</source>
+        <translation>Controleer de handtekening en probeer het opnieuw.</translation>
+    </message>
+    <message>
+        <source>The signature did not match the message digest.</source>
+        <translation>De handtekening hoort niet bij het bericht.</translation>
+    </message>
+    <message>
+        <source>Message verification failed.</source>
+        <translation>Berichtverificatie mislukt.</translation>
+    </message>
+    <message>
+        <source>Message verified.</source>
+        <translation>Bericht geverifiëerd.</translation>
+    </message>
 </context>
 <context>
     <name>SplashScreen</name>
@@ -1714,12 +2311,441 @@
         <translation>KB/s</translation>
     </message>
 </context>
+<context>
+    <name>TransactionDesc</name>
+    <message>
+        <source>Open until %1</source>
+        <translation>Open tot %1</translation>
+    </message>
+    <message>
+        <source>conflicted with a transaction with %1 confirmations</source>
+        <translation>geconflicteerd met een transactie met %1 confirmaties</translation>
+    </message>
+    <message>
+        <source>%1/offline</source>
+        <translation>%1/offline</translation>
+    </message>
+    <message>
+        <source>0/unconfirmed, %1</source>
+        <translation>0/onbevestigd, %1</translation>
+    </message>
+    <message>
+        <source>in memory pool</source>
+        <translation>in geheugenpoel</translation>
+    </message>
+    <message>
+        <source>not in memory pool</source>
+        <translation>niet in geheugenpoel</translation>
+    </message>
+    <message>
+        <source>abandoned</source>
+        <translation>opgegeven</translation>
+    </message>
+    <message>
+        <source>%1/unconfirmed</source>
+        <translation>%1/onbevestigd</translation>
+    </message>
+    <message>
+        <source>%1 confirmations</source>
+        <translation>%1 bevestigingen</translation>
+    </message>
+    <message>
+        <source>Status</source>
+        <translation>Status</translation>
+    </message>
+    <message>
+        <source>, has not been successfully broadcast yet</source>
+        <translation>, is nog niet met succes uitgezonden</translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation>Datum</translation>
+    </message>
+    <message>
+        <source>Source</source>
+        <translation>Bron</translation>
+    </message>
+    <message>
+        <source>Generated</source>
+        <translation>Gegenereerd</translation>
+    </message>
+    <message>
+        <source>From</source>
+        <translation>Van</translation>
+    </message>
+    <message>
+        <source>unknown</source>
+        <translation>onbekend</translation>
+    </message>
+    <message>
+        <source>To</source>
+        <translation>Aan</translation>
+    </message>
+    <message>
+        <source>own address</source>
+        <translation>eigen adres</translation>
+    </message>
+    <message>
+        <source>watch-only</source>
+        <translation>alleen-bekijkbaar</translation>
+    </message>
+    <message>
+        <source>label</source>
+        <translation>label</translation>
+    </message>
+    <message>
+        <source>Credit</source>
+        <translation>Credit</translation>
+    </message>
+    <message>
+        <source>not accepted</source>
+        <translation>niet geaccepteerd</translation>
+    </message>
+    <message>
+        <source>Debit</source>
+        <translation>Debet</translation>
+    </message>
+    <message>
+        <source>Total debit</source>
+        <translation>Totaal debit</translation>
+    </message>
+    <message>
+        <source>Total credit</source>
+        <translation>Totaal credit</translation>
+    </message>
+    <message>
+        <source>Transaction fee</source>
+        <translation>Transactiekosten</translation>
+    </message>
+    <message>
+        <source>Net amount</source>
+        <translation>Netto bedrag</translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation>Bericht</translation>
+    </message>
+    <message>
+        <source>Comment</source>
+        <translation>Opmerking</translation>
+    </message>
+    <message>
+        <source>Transaction ID</source>
+        <translation>Transactie-ID</translation>
+    </message>
+    <message>
+        <source>Output index</source>
+        <translation>Output index</translation>
+    </message>
+    <message>
+        <source>Merchant</source>
+        <translation>Handelaar</translation>
+    </message>
+    <message>
+        <source>Generated coins must mature %1 blocks before they can be spent. When you generated this block, it was broadcast to the network to be added to the block chain. If it fails to get into the chain, its state will change to "not accepted" and it won't be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source>
+        <translation>Gegenereerde munten moeten %1 blokken rijpen voordat ze kunnen worden besteed. Toen dit blok gegenereerd werd, werd het uitgezonden naar het netwerk om aan de blokketen toegevoegd te worden. Als het niet lukt om in de keten toegevoegd te worden, zal de status te veranderen naar "niet geaccepteerd" en zal het niet besteedbaar zijn. Dit kan soms gebeuren als een ander knooppunt een blok genereert binnen een paar seconden na die van u.</translation>
+    </message>
+    <message>
+        <source>Debug information</source>
+        <translation>Debug-informatie</translation>
+    </message>
+    <message>
+        <source>Transaction</source>
+        <translation>Transactie</translation>
+    </message>
+    <message>
+        <source>Inputs</source>
+        <translation>Inputs</translation>
+    </message>
+    <message>
+        <source>Amount</source>
+        <translation>Bedrag</translation>
+    </message>
+    <message>
+        <source>true</source>
+        <translation>waar</translation>
+    </message>
+    <message>
+        <source>false</source>
+        <translation>onwaar</translation>
+    </message>
+</context>
 <context>
     <name>TransactionDescDialog</name>
     <message>
         <source>This pane shows a detailed description of the transaction</source>
         <translation>Dit venster laat een uitgebreide beschrijving van de transactie zien</translation>
     </message>
+    <message>
+        <source>Details for %1</source>
+        <translation>Details voor %1</translation>
+    </message>
+</context>
+<context>
+    <name>TransactionTableModel</name>
+    <message>
+        <source>Date</source>
+        <translation>Datum</translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation>Type</translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation>Label</translation>
+    </message>
+    <message>
+        <source>Open until %1</source>
+        <translation>Open tot %1</translation>
+    </message>
+    <message>
+        <source>Offline</source>
+        <translation>Offline</translation>
+    </message>
+    <message>
+        <source>Unconfirmed</source>
+        <translation>Onbevestigd</translation>
+    </message>
+    <message>
+        <source>Abandoned</source>
+        <translation>Opgegeven</translation>
+    </message>
+    <message>
+        <source>Confirming (%1 of %2 recommended confirmations)</source>
+        <translation>Bevestigen (%1 van %2 aanbevolen bevestigingen)</translation>
+    </message>
+    <message>
+        <source>Confirmed (%1 confirmations)</source>
+        <translation>Bevestigd (%1 bevestigingen)</translation>
+    </message>
+    <message>
+        <source>Conflicted</source>
+        <translation>Conflicterend</translation>
+    </message>
+    <message>
+        <source>Immature (%1 confirmations, will be available after %2)</source>
+        <translation>Niet beschikbaar (%1 bevestigingen, zal beschikbaar zijn na %2)</translation>
+    </message>
+    <message>
+        <source>This block was not received by any other nodes and will probably not be accepted!</source>
+        <translation>Dit blok is niet ontvangen bij andere nodes en zal waarschijnlijk niet worden geaccepteerd!</translation>
+    </message>
+    <message>
+        <source>Generated but not accepted</source>
+        <translation>Gegenereerd maar niet geaccepteerd</translation>
+    </message>
+    <message>
+        <source>Received with</source>
+        <translation>Ontvangen met</translation>
+    </message>
+    <message>
+        <source>Received from</source>
+        <translation>Ontvangen van</translation>
+    </message>
+    <message>
+        <source>Sent to</source>
+        <translation>Verzonden aan</translation>
+    </message>
+    <message>
+        <source>Payment to yourself</source>
+        <translation>Betaling aan uzelf</translation>
+    </message>
+    <message>
+        <source>Mined</source>
+        <translation>Gedolven</translation>
+    </message>
+    <message>
+        <source>watch-only</source>
+        <translation>alleen-bekijkbaar</translation>
+    </message>
+    <message>
+        <source>(n/a)</source>
+        <translation>(nvt)</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(geen label)</translation>
+    </message>
+    <message>
+        <source>Transaction status. Hover over this field to show number of confirmations.</source>
+        <translation>Transactiestatus. Houd de cursor boven dit veld om het aantal bevestigingen te laten zien.</translation>
+    </message>
+    <message>
+        <source>Date and time that the transaction was received.</source>
+        <translation>Datum en tijd waarop deze transactie is ontvangen.</translation>
+    </message>
+    <message>
+        <source>Type of transaction.</source>
+        <translation>Type transactie.</translation>
+    </message>
+    <message>
+        <source>Whether or not a watch-only address is involved in this transaction.</source>
+        <translation>Of er een alleen-bekijken-adres is betrokken bij deze transactie.</translation>
+    </message>
+    <message>
+        <source>User-defined intent/purpose of the transaction.</source>
+        <translation>Door gebruiker gedefinieerde intentie/doel van de transactie.</translation>
+    </message>
+    <message>
+        <source>Amount removed from or added to balance.</source>
+        <translation>Bedrag verwijderd van of toegevoegd aan saldo.</translation>
+    </message>
+</context>
+<context>
+    <name>TransactionView</name>
+    <message>
+        <source>All</source>
+        <translation>Alles</translation>
+    </message>
+    <message>
+        <source>Today</source>
+        <translation>Vandaag</translation>
+    </message>
+    <message>
+        <source>This week</source>
+        <translation>Deze week</translation>
+    </message>
+    <message>
+        <source>This month</source>
+        <translation>Deze maand</translation>
+    </message>
+    <message>
+        <source>Last month</source>
+        <translation>Vorige maand</translation>
+    </message>
+    <message>
+        <source>This year</source>
+        <translation>Dit jaar</translation>
+    </message>
+    <message>
+        <source>Range...</source>
+        <translation>Bereik...</translation>
+    </message>
+    <message>
+        <source>Received with</source>
+        <translation>Ontvangen met</translation>
+    </message>
+    <message>
+        <source>Sent to</source>
+        <translation>Verzonden aan</translation>
+    </message>
+    <message>
+        <source>To yourself</source>
+        <translation>Aan uzelf</translation>
+    </message>
+    <message>
+        <source>Mined</source>
+        <translation>Gedolven</translation>
+    </message>
+    <message>
+        <source>Other</source>
+        <translation>Anders</translation>
+    </message>
+    <message>
+        <source>Enter address or label to search</source>
+        <translation>Vul adres of label in om te zoeken</translation>
+    </message>
+    <message>
+        <source>Min amount</source>
+        <translation>Min. bedrag</translation>
+    </message>
+    <message>
+        <source>Abandon transaction</source>
+        <translation>Doe afstand van transactie</translation>
+    </message>
+    <message>
+        <source>Copy address</source>
+        <translation>Kopieer adres</translation>
+    </message>
+    <message>
+        <source>Copy label</source>
+        <translation>Kopieer label</translation>
+    </message>
+    <message>
+        <source>Copy amount</source>
+        <translation>Kopieer bedrag</translation>
+    </message>
+    <message>
+        <source>Copy transaction ID</source>
+        <translation>Kopieer transactie-ID</translation>
+    </message>
+    <message>
+        <source>Copy raw transaction</source>
+        <translation>Kopieer ruwe transactie</translation>
+    </message>
+    <message>
+        <source>Copy full transaction details</source>
+        <translation>Kopieer volledige transactiedetials</translation>
+    </message>
+    <message>
+        <source>Edit label</source>
+        <translation>Bewerk label</translation>
+    </message>
+    <message>
+        <source>Show transaction details</source>
+        <translation>Toon transactiedetails</translation>
+    </message>
+    <message>
+        <source>Export Transaction History</source>
+        <translation>Exporteer transactiegeschiedenis</translation>
+    </message>
+    <message>
+        <source>Comma separated file (*.csv)</source>
+        <translation>Kommagescheiden bestand (*.csv)</translation>
+    </message>
+    <message>
+        <source>Confirmed</source>
+        <translation>Bevestigd</translation>
+    </message>
+    <message>
+        <source>Watch-only</source>
+        <translation>Alleen-bekijkbaar</translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation>Datum</translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation>Type</translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation>Label</translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation>Adres</translation>
+    </message>
+    <message>
+        <source>ID</source>
+        <translation>ID</translation>
+    </message>
+    <message>
+        <source>Exporting Failed</source>
+        <translation>Export mislukt</translation>
+    </message>
+    <message>
+        <source>There was an error trying to save the transaction history to %1.</source>
+        <translation>Er is een fout opgetreden bij het opslaan van de transactiegeschiedenis naar %1.</translation>
+    </message>
+    <message>
+        <source>Exporting Successful</source>
+        <translation>Export succesvol</translation>
+    </message>
+    <message>
+        <source>The transaction history was successfully saved to %1.</source>
+        <translation>De transactiegeschiedenis was succesvol bewaard in %1.</translation>
+    </message>
+    <message>
+        <source>Range:</source>
+        <translation>Bereik:</translation>
+    </message>
+    <message>
+        <source>to</source>
+        <translation>naar</translation>
+    </message>
 </context>
 <context>
     <name>UnitDisplayStatusBarControl</name>
@@ -1728,6 +2754,55 @@
         <translation>Eenheid om bedragen uit te drukken. Klik om een andere eenheid te selecteren.</translation>
     </message>
 </context>
+<context>
+    <name>WalletFrame</name>
+    <message>
+        <source>No wallet has been loaded.</source>
+        <translation>Er is geen portemonnee geladen.</translation>
+    </message>
+</context>
+<context>
+    <name>WalletModel</name>
+    <message>
+        <source>Send Coins</source>
+        <translation>Verstuur munten</translation>
+    </message>
+</context>
+<context>
+    <name>WalletView</name>
+    <message>
+        <source>&amp;Export</source>
+        <translation>&amp;Exporteer</translation>
+    </message>
+    <message>
+        <source>Export the data in the current tab to a file</source>
+        <translation>Exporteer de data in de huidige tab naar een bestand</translation>
+    </message>
+    <message>
+        <source>Backup Wallet</source>
+        <translation>Portemonnee backuppen</translation>
+    </message>
+    <message>
+        <source>Wallet Data (*.dat)</source>
+        <translation>Portemonneedata (*.dat)</translation>
+    </message>
+    <message>
+        <source>Backup Failed</source>
+        <translation>Backup mislukt</translation>
+    </message>
+    <message>
+        <source>There was an error trying to save the wallet data to %1.</source>
+        <translation>Er is een fout opgetreden bij het wegschrijven van de portemonneedata naar %1.</translation>
+    </message>
+    <message>
+        <source>Backup Successful</source>
+        <translation>Backup succesvol</translation>
+    </message>
+    <message>
+        <source>The wallet data was successfully saved to %1.</source>
+        <translation>De portemonneedata is succesvol opgeslagen in %1.</translation>
+    </message>
+</context>
 <context>
     <name>bitcoin-core</name>
     <message>
@@ -1790,17 +2865,13 @@
         <source>Unable to start HTTP server. See debug log for details.</source>
         <translation>Niet mogelijk ok HTTP-server te starten. Zie debuglogboek voor details.</translation>
     </message>
-    <message>
-        <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
-        <translation>Accepteer verbindingen van buitenaf (standaard: 1 als geen -proxy of -connect is opgegeven)</translation>
-    </message>
     <message>
         <source>Bitcoin Core</source>
         <translation>Bitcoin Core</translation>
     </message>
     <message>
-        <source>-fallbackfee is set very high! This is the transaction fee you may pay when fee estimates are not available.</source>
-        <translation>-fallbackfee is zeer hoog ingesteld! Dit zijn de transactie kosten die u mogelijk betaald wanneer de schattingen niet beschikbaar zijn.</translation>
+        <source>The %s developers</source>
+        <translation>De %s ontwikkelaars</translation>
     </message>
     <message>
         <source>A fee rate (in %s/kB) that will be used when fee estimation has insufficient data (default: %s)</source>
@@ -1823,8 +2894,8 @@
         <translation>Verwijder alle transacties van de portemonnee en herstel alleen de delen van de blokketen door -rescan tijdens het opstarten</translation>
     </message>
     <message>
-        <source>Distributed under the MIT software license, see the accompanying file COPYING or &lt;http://www.opensource.org/licenses/mit-license.php&gt;.</source>
-        <translation>Uitgegeven onder de MIT-softwarelicentie, zie het bijgevoegde bestand COPYING of &lt;http://www.opensource.org/licenses/mit-license.php&gt;.</translation>
+        <source>Error loading %s: You can't enable HD on a already existing non-HD wallet</source>
+        <translation>Fout bij het laden van %s: Je kan HD niet activeren voor een reeds bestaande niet-HD portemonnee</translation>
     </message>
     <message>
         <source>Error reading %s! All keys read correctly, but transaction data or address book entries might be missing or incorrect.</source>
@@ -1834,10 +2905,6 @@
         <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source>
         <translation>Voer opdracht uit zodra een portemonneetransactie verandert (%s in cmd wordt vervangen door TxID)</translation>
     </message>
-    <message>
-        <source>Force relay of transactions from whitelisted peers even they violate local relay policy (default: %d)</source>
-        <translation>Forceer het doorsturen van transacties van goedgekeurde peers, zelfs wanneer deze niet voldoen aan de lokale doorstuur regels (standaard: %d)</translation>
-    </message>
     <message>
         <source>Maximum allowed median peer time offset adjustment. Local perspective of time may be influenced by peers forward or backward by this amount. (default: %u seconds)</source>
         <translation>Maximum toegestane peer tijd compensatie. Lokaal perspectief van tijd mag worden beinvloed door peers die met deze hoeveelheid voor of achter lopen. (standaard: %u seconden)</translation>
@@ -1850,6 +2917,10 @@
         <source>Please check that your computer's date and time are correct! If your clock is wrong, %s will not work properly.</source>
         <translation>Waarschuwing: Controleer dat de datum en tijd van uw computer correct zijn ingesteld! Bij een onjuist ingestelde klok zal %s niet goed werken.</translation>
     </message>
+    <message>
+        <source>Please contribute if you find %s useful. Visit %s for further information about the software.</source>
+        <translation>Gelieve bij te dragen als je %s nuttig vindt. Bezoek %s voor meer informatie over de software.</translation>
+    </message>
     <message>
         <source>Set the number of script verification threads (%u to %d, 0 = auto, &lt;0 = leave that many cores free, default: %d)</source>
         <translation>Kies het aantal scriptverificatie processen (%u tot %d, 0 = auto, &lt;0 = laat dit aantal kernen vrij, standaard: %d)</translation>
@@ -1859,29 +2930,21 @@
         <translation>De blokdatabase bevat een blok dat lijkt uit de toekomst te komen. Dit kan gebeuren omdat de datum en tijd van uw computer niet goed staat. Herbouw de blokdatabase pas nadat u de datum en tijd van uw computer correct heeft ingesteld.</translation>
     </message>
     <message>
-        <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
-        <translation>Dit is een prerelease testversie – gebruik op eigen risico! Gebruik deze niet voor het delven van munten of handelsdoeleinden</translation>
+        <source>Unable to rewind the database to a pre-fork state. You will need to redownload the blockchain</source>
+        <translation>Niet mogelijk om de databank terug te draaien naar een staat voor de vork. Je zal je blokketen opnieuw moeten downloaden</translation>
     </message>
     <message>
         <source>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</source>
         <translation>Gebruik UPnP om de luisterende poort te mappen (standaard: 1 als er geluisterd worden en geen -proxy is meegegeven)</translation>
     </message>
-    <message>
-        <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source>
-        <translation>Waarschuwing: Het lijkt erop dat het netwerk geen consensus kan vinden! Sommige delvers lijken problemen te ondervinden.</translation>
-    </message>
-    <message>
-        <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source>
-        <translation>Waarschuwing: Het lijkt erop dat we geen consensus kunnen vinden met onze peers! Mogelijk dient u te upgraden, of andere nodes moeten wellicht upgraden.</translation>
-    </message>
-    <message>
-        <source>Whitelist peers connecting from the given netmask or IP address. Can be specified multiple times.</source>
-        <translation>Goedgekeurde peers die verbinden van het ingegeven netmask of IP adres. Kan meerdere keren gespecificeerd worden.</translation>
-    </message>
     <message>
         <source>You need to rebuild the database using -reindex-chainstate to change -txindex</source>
         <translation>Om -txindex te kunnen veranderen dient u de database opnieuw te bouwen met gebruik van -reindex-chainstate.</translation>
     </message>
+    <message>
+        <source>%s corrupt, salvage failed</source>
+        <translation>%s corrupt, veiligstellen mislukt</translation>
+    </message>
     <message>
         <source>-maxmempool must be at least %d MB</source>
         <translation>-maxmempool moet tenminste %d MB zijn</translation>
@@ -1910,10 +2973,6 @@
         <source>Change index out of range</source>
         <translation>Wijzigingsindex buiten bereik</translation>
     </message>
-    <message>
-        <source>Connect only to the specified node(s)</source>
-        <translation>Verbind alleen naar de gespecificeerde node(s)</translation>
-    </message>
     <message>
         <source>Connection options:</source>
         <translation>Verbindingsopties:</translation>
@@ -1978,6 +3037,10 @@
         <source>Error loading %s: Wallet requires newer version of %s</source>
         <translation>Fout bij laden %s: Portemonnee vereist een nieuwere versie van %s</translation>
     </message>
+    <message>
+        <source>Error loading %s: You can't disable HD on a already existing HD wallet</source>
+        <translation>Fout bij het laden van %s: Je kan HD niet deactiveren voor een reeds bestaande HD portemonnee</translation>
+    </message>
     <message>
         <source>Error loading block database</source>
         <translation>Fout bij het laden van blokkendatabase</translation>
@@ -2030,10 +3093,6 @@
         <source>Location of the auth cookie (default: data dir)</source>
         <translation>Locatie van de auth cookie (standaard: data dir)</translation>
     </message>
-    <message>
-        <source>Minimum bytes per sigop in transactions we relay and mine (default: %u)</source>
-        <translation>Minimum aantal bytes dat er per sigop in een transactie gerelayed en gemined worden (standaard: %u)</translation>
-    </message>
     <message>
         <source>Not enough file descriptors available.</source>
         <translation>Niet genoeg file descriptors beschikbaar.</translation>
@@ -2066,6 +3125,10 @@
         <source>Rebuild chain state from the currently indexed blocks</source>
         <translation>Herbouw ketenstaat vanuit de huidige geindexeerde blokken</translation>
     </message>
+    <message>
+        <source>Rewinding blocks...</source>
+        <translation>Blokken aan het terugdraaien...</translation>
+    </message>
     <message>
         <source>Set database cache size in megabytes (%d to %d, default: %d)</source>
         <translation>Zet database cache grootte in megabytes (%d tot %d, standaard: %d)</translation>
@@ -2078,6 +3141,10 @@
         <source>Specify wallet file (within data directory)</source>
         <translation>Specificeer het portemonnee bestand (vanuit de gegevensmap)</translation>
     </message>
+    <message>
+        <source>The source code is available from %s.</source>
+        <translation>De broncode is beschikbaar van %s.</translation>
+    </message>
     <message>
         <source>Unable to bind to %s on this computer. %s is probably already running.</source>
         <translation>Niet in staat om %s te verbinden op deze computer. %s draait waarschijnlijk al.</translation>
@@ -2170,10 +3237,6 @@
         <source>Maximum size of data in data carrier transactions we relay and mine (default: %u)</source>
         <translation>Maximale grootte va  n de gegevens in gegevensdragertransacties die we doorgeven en mijnen (standaard: %u)</translation>
     </message>
-    <message>
-        <source>Query for peer addresses via DNS lookup, if low on addresses (default: 1 unless -connect)</source>
-        <translation>Query voor peeradressen via DNS- lookup , als laag op adressen  (standaard: 1 unless -connect)</translation>
-    </message>
     <message>
         <source>Randomize credentials for every proxy connection. This enables Tor stream isolation (default: %u)</source>
         <translation>Gebruik willekeurige inloggegevens voor elke proxyverbinding. Dit maakt streamislatie voor Tor mogelijk (standaard: %u)</translation>
@@ -2187,8 +3250,8 @@
         <translation>Het transactiebedrag is te klein om te versturen nadat de transactiekosten in mindering zijn gebracht</translation>
     </message>
     <message>
-        <source>This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit &lt;https://www.openssl.org/&gt; and cryptographic software written by Eric Young and UPnP software written by Thomas Bernard.</source>
-        <translation>Dit product bevat software dat ontwikkeld is door het OpenSSL Project voor gebruik in de OpenSSL Toolkit &lt;https://www.openssl.org/&gt; en cryptografische software geschreven door Eric Young en UPnP software geschreven door Thomas Bernard.</translation>
+        <source>Use hierarchical deterministic key generation (HD) after BIP32. Only has effect during wallet creation/first start</source>
+        <translation>Gebruik hiërarchische deterministische sleutelgeneratie (HD) na BIP32. Dit heeft enkel effect bij het aanmaken van portemonnees of het eerste gebruik</translation>
     </message>
     <message>
         <source>Whitelisted peers cannot be DoS banned and their transactions are always relayed, even if they are already in the mempool, useful e.g. for a gateway</source>
@@ -2196,7 +3259,7 @@
     </message>
     <message>
         <source>You need to rebuild the database using -reindex to go back to unpruned mode.  This will redownload the entire blockchain</source>
-        <translation>U moet de database herbouwen met -reindex om terug te gaan naar de ongesnoeide modus. Dit zal de gehele blokkketen opnieuw downloaden.</translation>
+        <translation>U moet de database herbouwen met -reindex om terug te gaan naar de ongesnoeide modus. Dit zal de gehele blokketen opnieuw downloaden.</translation>
     </message>
     <message>
         <source>(default: %u)</source>
@@ -2298,10 +3361,6 @@
         <source>Transaction amount too small</source>
         <translation>Transactiebedrag te klein</translation>
     </message>
-    <message>
-        <source>Transaction amounts must be positive</source>
-        <translation>Transactiebedragen moeten positief zijn</translation>
-    </message>
     <message>
         <source>Transaction too large for fee policy</source>
         <translation>De transactie is te groot voor het transactiekostenbeleid</translation>
@@ -2366,18 +3425,22 @@
         <source>-maxtxfee is set very high! Fees this large could be paid on a single transaction.</source>
         <translation>-maxtxfee staat zeer hoog! Transactiekosten van de grootte kunnen worden gebruikt in een enkele transactie.</translation>
     </message>
-    <message>
-        <source>-paytxfee is set very high! This is the transaction fee you will pay if you send a transaction.</source>
-        <translation>-paytxfee staat zeer hoog! Dit is de transactiekosten die u betaalt als u een transactie doet.</translation>
-    </message>
     <message>
         <source>Do not keep transactions in the mempool longer than &lt;n&gt; hours (default: %u)</source>
         <translation>Bewaar transactie niet langer dan &lt;n&gt; uren in de geheugenpool (standaard: %u)</translation>
     </message>
+    <message>
+        <source>Equivalent bytes per sigop in transactions for relay and mining (default: %u)</source>
+        <translation>Equivalent byter per sigop in transactions voor doorsturen en mijnen (standaard: %u)</translation>
+    </message>
     <message>
         <source>Fees (in %s/kB) smaller than this are considered zero fee for transaction creation (default: %s)</source>
         <translation>Transactiekosten (in %s/kB) kleiner dan dit worden beschouwd dat geen transactiekosten in rekening worden gebracht voor transactiecreatie (standaard: %s)</translation>
     </message>
+    <message>
+        <source>Force relay of transactions from whitelisted peers even if they violate local relay policy (default: %d)</source>
+        <translation>Forceer het doorsturen van transacties van goedgekeurde peers, zelfs wanneer deze niet voldoen aan de lokale doorstuurregels (standaard: %d)</translation>
+    </message>
     <message>
         <source>How thorough the block verification of -checkblocks is (0-4, default: %u)</source>
         <translation>Hoe grondig de blokverificatie van -checkblocks is (0-4, standaard: %u)</translation>
@@ -2491,8 +3554,8 @@
         <translation>Stel sleutelpoelgrootte in op &lt;n&gt; (standaard: %u)</translation>
     </message>
     <message>
-        <source>Set minimum block size in bytes (default: %u)</source>
-        <translation>Stel minimum blokgrootte in in bytes (standaard: %u)</translation>
+        <source>Set maximum BIP141 block weight (default: %d)</source>
+        <translation>Zet het BIP141 maximum gewicht van een blok (standaard: %d)</translation>
     </message>
     <message>
         <source>Set the number of threads to service RPC calls (default: %d)</source>
@@ -2514,6 +3577,10 @@
         <source>Spend unconfirmed change when sending transactions (default: %u)</source>
         <translation>Besteed onbevestigd wisselgeld bij het doen van transacties (standaard: %u)</translation>
     </message>
+    <message>
+        <source>Starting network threads...</source>
+        <translation>Netwerkthread starten...</translation>
+    </message>
     <message>
         <source>Threshold for disconnecting misbehaving peers (default: %u)</source>
         <translation>Drempel om verbinding te verbreken naar zich misdragende peers (standaard: %u)</translation>
diff --git a/src/qt/locale/bitcoin_pam.ts b/src/qt/locale/bitcoin_pam.ts
index 53515433384c3..f09978f6b0ed2 100644
--- a/src/qt/locale/bitcoin_pam.ts
+++ b/src/qt/locale/bitcoin_pam.ts
@@ -33,7 +33,10 @@
         <source>&amp;Delete</source>
         <translation>&amp;Ilako</translation>
     </message>
-</context>
+    </context>
+<context>
+    <name>AddressTableModel</name>
+    </context>
 <context>
     <name>AskPassphraseDialog</name>
     <message>
@@ -52,7 +55,7 @@
         <source>Repeat new passphrase</source>
         <translation>Pasibayuan ya ing bayung passphrase</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>BanTableModel</name>
     </context>
@@ -222,7 +225,7 @@
         <source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;locked&lt;/b&gt;</source>
         <translation>Maka-&lt;b&gt;encrypt&lt;/b&gt; ya ing wallet at kasalukuyan yang maka-&lt;b&gt;locked&lt;/b&gt;</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>CoinControlDialog</name>
     <message>
@@ -256,7 +259,7 @@
         <source>&amp;Address</source>
         <translation>&amp;Address</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>FreespaceChecker</name>
     </context>
@@ -290,6 +293,17 @@
         <translation>Mali</translation>
     </message>
     </context>
+<context>
+    <name>ModalOverlay</name>
+    <message>
+        <source>Form</source>
+        <translation>Form</translation>
+    </message>
+    <message>
+        <source>Last block time</source>
+        <translation>Tatauling oras na ning block</translation>
+    </message>
+    </context>
 <context>
     <name>OpenURIDialog</name>
     </context>
@@ -411,6 +425,9 @@
         <translation>Ing kekang kasalungsungan kabuuang balanse</translation>
     </message>
     </context>
+<context>
+    <name>PaymentServer</name>
+    </context>
 <context>
     <name>PeerTableModel</name>
     </context>
@@ -425,6 +442,12 @@
         <translation>N/A</translation>
     </message>
     </context>
+<context>
+    <name>QObject::QObject</name>
+    </context>
+<context>
+    <name>QRImageWidget</name>
+    </context>
 <context>
     <name>RPCConsole</name>
     <message>
@@ -510,6 +533,9 @@
         <translation>&amp;Kopyan ing address</translation>
     </message>
     </context>
+<context>
+    <name>RecentRequestsTableModel</name>
+    </context>
 <context>
     <name>SendCoinsDialog</name>
     <message>
@@ -552,7 +578,7 @@
         <source>S&amp;end</source>
         <translation>Ipadala</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>SendCoinsEntry</name>
     <message>
@@ -588,6 +614,9 @@
         <translation>Ibayad kang:</translation>
     </message>
     </context>
+<context>
+    <name>SendConfirmationDialog</name>
+    </context>
 <context>
     <name>ShutdownWindow</name>
     </context>
@@ -657,7 +686,7 @@
         <source>Reset all verify message fields</source>
         <translation>Ibalik king dati reng ngan fields na ning pamag beripikang mensayi</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>SplashScreen</name>
     <message>
@@ -668,16 +697,34 @@
 <context>
     <name>TrafficGraphWidget</name>
     </context>
+<context>
+    <name>TransactionDesc</name>
+    </context>
 <context>
     <name>TransactionDescDialog</name>
     <message>
         <source>This pane shows a detailed description of the transaction</source>
         <translation>Ining pane a ini magpakit yang detalyadung description ning transaksion</translation>
     </message>
-</context>
+    </context>
+<context>
+    <name>TransactionTableModel</name>
+    </context>
+<context>
+    <name>TransactionView</name>
+    </context>
 <context>
     <name>UnitDisplayStatusBarControl</name>
     </context>
+<context>
+    <name>WalletFrame</name>
+    </context>
+<context>
+    <name>WalletModel</name>
+    </context>
+<context>
+    <name>WalletView</name>
+    </context>
 <context>
     <name>bitcoin-core</name>
     <message>
@@ -704,10 +751,6 @@
         <source>Run in the background as a daemon and accept commands</source>
         <translation>Gumana king gulut bilang daemon at tumanggap commands</translation>
     </message>
-    <message>
-        <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
-        <translation>Tumanggap koneksion menibat king kilwal (default: 1 if no -proxy or -connect)</translation>
-    </message>
     <message>
         <source>Bitcoin Core</source>
         <translation>Kapilubluban ning Bitcoin</translation>
@@ -716,10 +759,6 @@
         <source>Block creation options:</source>
         <translation>Pipamilian king pamag-gawang block:</translation>
     </message>
-    <message>
-        <source>Connect only to the specified node(s)</source>
-        <translation>Kumunekta mu king mepiling node(s)</translation>
-    </message>
     <message>
         <source>Corrupted block database detected</source>
         <translation>Mekapansin lang me-corrupt a block database</translation>
diff --git a/src/qt/locale/bitcoin_pl.ts b/src/qt/locale/bitcoin_pl.ts
index 09f748b83cbf8..b7369c50933a5 100644
--- a/src/qt/locale/bitcoin_pl.ts
+++ b/src/qt/locale/bitcoin_pl.ts
@@ -41,6 +41,77 @@
         <source>&amp;Delete</source>
         <translation>&amp;Usuń</translation>
     </message>
+    <message>
+        <source>Choose the address to send coins to</source>
+        <translation>Wybierz adres, na który chcesz wysłać monety</translation>
+    </message>
+    <message>
+        <source>Choose the address to receive coins with</source>
+        <translation>Wybierz adres, na który chcesz otrzymać monety</translation>
+    </message>
+    <message>
+        <source>C&amp;hoose</source>
+        <translation>W&amp;ybierz</translation>
+    </message>
+    <message>
+        <source>Sending addresses</source>
+        <translation>Adresy wysyłania</translation>
+    </message>
+    <message>
+        <source>Receiving addresses</source>
+        <translation>Adresy odbioru</translation>
+    </message>
+    <message>
+        <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source>
+        <translation>Tutaj znajdują się adresy Bitcoin na które wysyłasz płatności. Zawsze sprawdzaj ilość i adres odbiorcy przed wysyłką monet.</translation>
+    </message>
+    <message>
+        <source>These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source>
+        <translation>To są twoje adresy Bitcoin do odbierania płatności. Zaleca się używanie nowych adresów odbiorczych dla każdej transakcji.</translation>
+    </message>
+    <message>
+        <source>&amp;Copy Address</source>
+        <translation>&amp;Kopiuj adres</translation>
+    </message>
+    <message>
+        <source>Copy &amp;Label</source>
+        <translation>Kopiuj &amp;Etykietę</translation>
+    </message>
+    <message>
+        <source>&amp;Edit</source>
+        <translation>&amp;Edytuj</translation>
+    </message>
+    <message>
+        <source>Export Address List</source>
+        <translation>Eksportuj listę adresów</translation>
+    </message>
+    <message>
+        <source>Comma separated file (*.csv)</source>
+        <translation>Plik *.CSV (dane rozdzielane przecinkami)</translation>
+    </message>
+    <message>
+        <source>Exporting Failed</source>
+        <translation>Eksportowanie nie powiodło się</translation>
+    </message>
+    <message>
+        <source>There was an error trying to save the address list to %1. Please try again.</source>
+        <translation>Wystąpił błąd podczas próby zapisu listy adresów do %1. Proszę spróbować ponownie.</translation>
+    </message>
+</context>
+<context>
+    <name>AddressTableModel</name>
+    <message>
+        <source>Label</source>
+        <translation>Etykieta</translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation>Adres</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(brak etykiety)</translation>
+    </message>
 </context>
 <context>
     <name>AskPassphraseDialog</name>
@@ -60,6 +131,74 @@
         <source>Repeat new passphrase</source>
         <translation>Powtórz nowe hasło</translation>
     </message>
+    <message>
+        <source>Enter the new passphrase to the wallet.&lt;br/&gt;Please use a passphrase of &lt;b&gt;ten or more random characters&lt;/b&gt;, or &lt;b&gt;eight or more words&lt;/b&gt;.</source>
+        <translation>Wprowadź nowe hasło do portfela.&lt;br/&gt;Proszę używać hasła złożonego z &lt;b&gt;10 lub więcej losowych znaków&lt;/b&gt; albo &lt;b&gt;8 lub więcej słów.&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <source>Encrypt wallet</source>
+        <translation>Zaszyfruj portfel</translation>
+    </message>
+    <message>
+        <source>This operation needs your wallet passphrase to unlock the wallet.</source>
+        <translation>Ta operacja wymaga hasła do portfela aby odblokować portfel.</translation>
+    </message>
+    <message>
+        <source>Unlock wallet</source>
+        <translation>Odblokuj portfel</translation>
+    </message>
+    <message>
+        <source>This operation needs your wallet passphrase to decrypt the wallet.</source>
+        <translation>Ta operacja wymaga hasła portfela, aby go odszyfrować.</translation>
+    </message>
+    <message>
+        <source>Decrypt wallet</source>
+        <translation>Odszyfruj portfel</translation>
+    </message>
+    <message>
+        <source>Change passphrase</source>
+        <translation>Zmień hasło</translation>
+    </message>
+    <message>
+        <source>Enter the old passphrase and new passphrase to the wallet.</source>
+        <translation>Podaj stare i nowe hasło do portfela.</translation>
+    </message>
+    <message>
+        <source>Confirm wallet encryption</source>
+        <translation>Potwierdź szyfrowanie portfela</translation>
+    </message>
+    <message>
+        <source>Wallet encrypted</source>
+        <translation>Portfel zaszyfrowany</translation>
+    </message>
+    <message>
+        <source>Wallet encryption failed</source>
+        <translation>Szyfrowanie portfela nie powiodło się</translation>
+    </message>
+    <message>
+        <source>The supplied passphrases do not match.</source>
+        <translation>Podane hasła nie są takie same.</translation>
+    </message>
+    <message>
+        <source>Wallet unlock failed</source>
+        <translation>Odblokowanie portfela nie powiodło się</translation>
+    </message>
+    <message>
+        <source>The passphrase entered for the wallet decryption was incorrect.</source>
+        <translation>Wprowadzone hasło do odszyfrowania portfela jest niepoprawne.</translation>
+    </message>
+    <message>
+        <source>Wallet decryption failed</source>
+        <translation>Odszyfrowanie portfela nie powiodło się</translation>
+    </message>
+    <message>
+        <source>Wallet passphrase was successfully changed.</source>
+        <translation>Hasło do portfela zostało pomyślnie zmienione.</translation>
+    </message>
+    <message>
+        <source>Warning: The Caps Lock key is on!</source>
+        <translation>Ostrzeżenie: Caps Lock jest włączony!</translation>
+    </message>
 </context>
 <context>
     <name>BanTableModel</name>
@@ -278,26 +417,6 @@
         <source>Processed %n block(s) of transaction history.</source>
         <translation><numerusform>Przetworzono %n bloków historii transakcji.</numerusform><numerusform>Przetworzono %n bloków historii transakcji.</numerusform><numerusform>Przetworzono %n bloków historii transakcji.</numerusform></translation>
     </message>
-    <message numerus="yes">
-        <source>%n hour(s)</source>
-        <translation><numerusform>%n godzin</numerusform><numerusform>%n godzin</numerusform><numerusform>%n godzin</numerusform></translation>
-    </message>
-    <message numerus="yes">
-        <source>%n day(s)</source>
-        <translation><numerusform>dzień</numerusform><numerusform>%n dni</numerusform><numerusform>%n dni</numerusform></translation>
-    </message>
-    <message numerus="yes">
-        <source>%n week(s)</source>
-        <translation><numerusform>%n tygodni</numerusform><numerusform>%n tygodni</numerusform><numerusform>%n tygodni</numerusform></translation>
-    </message>
-    <message>
-        <source>%1 and %2</source>
-        <translation>%1 i %2</translation>
-    </message>
-    <message numerus="yes">
-        <source>%n year(s)</source>
-        <translation><numerusform>%n lat</numerusform><numerusform>%n lat</numerusform><numerusform>%n lat</numerusform></translation>
-    </message>
     <message>
         <source>%1 behind</source>
         <translation>%1 za</translation>
@@ -384,7 +503,7 @@
         <source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;locked&lt;/b&gt;</source>
         <translation>Portfel jest &lt;b&gt;zaszyfrowany&lt;/b&gt; i obecnie &lt;b&gt;zablokowany&lt;/b&gt;</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>CoinControlDialog</name>
     <message>
@@ -403,10 +522,6 @@
         <source>Amount:</source>
         <translation>Kwota:</translation>
     </message>
-    <message>
-        <source>Priority:</source>
-        <translation>Priorytet:</translation>
-    </message>
     <message>
         <source>Fee:</source>
         <translation>Opłata:</translation>
@@ -460,8 +575,84 @@
         <translation>Potwierdzony</translation>
     </message>
     <message>
-        <source>Priority</source>
-        <translation>Priorytet</translation>
+        <source>Copy address</source>
+        <translation>Kopiuj adres</translation>
+    </message>
+    <message>
+        <source>Copy label</source>
+        <translation>Kopiuj etykietę</translation>
+    </message>
+    <message>
+        <source>Copy amount</source>
+        <translation>Kopiuj kwotę</translation>
+    </message>
+    <message>
+        <source>Copy transaction ID</source>
+        <translation>Skopiuj ID transakcji</translation>
+    </message>
+    <message>
+        <source>Lock unspent</source>
+        <translation>Zablokuj niewydane</translation>
+    </message>
+    <message>
+        <source>Unlock unspent</source>
+        <translation>Odblokuj niewydane</translation>
+    </message>
+    <message>
+        <source>Copy quantity</source>
+        <translation>Skopiuj ilość</translation>
+    </message>
+    <message>
+        <source>Copy fee</source>
+        <translation>Skopiuj prowizję</translation>
+    </message>
+    <message>
+        <source>Copy after fee</source>
+        <translation>Skopiuj ilość po opłacie</translation>
+    </message>
+    <message>
+        <source>Copy bytes</source>
+        <translation>Skopiuj ilość bajtów</translation>
+    </message>
+    <message>
+        <source>Copy dust</source>
+        <translation>Kopiuj pył</translation>
+    </message>
+    <message>
+        <source>Copy change</source>
+        <translation>Skopiuj resztę</translation>
+    </message>
+    <message>
+        <source>(%1 locked)</source>
+        <translation>(%1 zablokowane)</translation>
+    </message>
+    <message>
+        <source>yes</source>
+        <translation>tak</translation>
+    </message>
+    <message>
+        <source>no</source>
+        <translation>nie</translation>
+    </message>
+    <message>
+        <source>This label turns red if any recipient receives an amount smaller than the current dust threshold.</source>
+        <translation>Ta etykieta staje się czerwona jeżeli którykolwiek odbiorca otrzymuje kwotę mniejszą niż obecny próg pyłu.</translation>
+    </message>
+    <message>
+        <source>Can vary +/- %1 satoshi(s) per input.</source>
+        <translation>Waha się +/- %1 satoshi na wejście.</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(brak etykiety)</translation>
+    </message>
+    <message>
+        <source>change from %1 (%2)</source>
+        <translation>reszta z %1 (%2)</translation>
+    </message>
+    <message>
+        <source>(change)</source>
+        <translation>(reszta)</translation>
     </message>
 </context>
 <context>
@@ -486,6 +677,30 @@
         <source>&amp;Address</source>
         <translation>&amp;Adres</translation>
     </message>
+    <message>
+        <source>New receiving address</source>
+        <translation>Nowy adres odbiorczy</translation>
+    </message>
+    <message>
+        <source>New sending address</source>
+        <translation>Nowy adres wysyłania</translation>
+    </message>
+    <message>
+        <source>Edit receiving address</source>
+        <translation>Zmień adres odbioru</translation>
+    </message>
+    <message>
+        <source>Edit sending address</source>
+        <translation>Zmień adres wysyłania</translation>
+    </message>
+    <message>
+        <source>Could not unlock wallet.</source>
+        <translation>Nie można było odblokować portfela.</translation>
+    </message>
+    <message>
+        <source>New key generation failed.</source>
+        <translation>Generowanie nowego klucza nie powiodło się.</translation>
+    </message>
 </context>
 <context>
     <name>FreespaceChecker</name>
@@ -608,6 +823,49 @@
         <translation><numerusform>(z %n GB potrzebnych)</numerusform><numerusform>(z %n GB potrzebnych)</numerusform><numerusform>(z %n GB potrzebnych)</numerusform></translation>
     </message>
 </context>
+<context>
+    <name>ModalOverlay</name>
+    <message>
+        <source>Form</source>
+        <translation>Formularz</translation>
+    </message>
+    <message>
+        <source>Number of blocks left</source>
+        <translation>Pozostało bloków</translation>
+    </message>
+    <message>
+        <source>Unknown...</source>
+        <translation>Nienznane...</translation>
+    </message>
+    <message>
+        <source>Last block time</source>
+        <translation>Czas ostatniego bloku</translation>
+    </message>
+    <message>
+        <source>Progress</source>
+        <translation>Postęp</translation>
+    </message>
+    <message>
+        <source>Progress increase per hour</source>
+        <translation>Przyrost postępu na godzinę</translation>
+    </message>
+    <message>
+        <source>calculating...</source>
+        <translation>obliczanie...</translation>
+    </message>
+    <message>
+        <source>Estimated time left until synced</source>
+        <translation>Przewidywany czas zakończenia synchronizacji</translation>
+    </message>
+    <message>
+        <source>Hide</source>
+        <translation>Ukryj</translation>
+    </message>
+    <message>
+        <source>Unknown. Syncing Headers (%1)...</source>
+        <translation>Nieznane. Synchronizowanie nagłówków (%1)...</translation>
+    </message>
+</context>
 <context>
     <name>OpenURIDialog</name>
     <message>
@@ -626,6 +884,10 @@
         <source>Select payment request file</source>
         <translation>Otwórz żądanie zapłaty z pliku</translation>
     </message>
+    <message>
+        <source>Select payment request file to open</source>
+        <translation>Wybierz plik żądania zapłaty do otwarcia</translation>
+    </message>
 </context>
 <context>
     <name>OptionsDialog</name>
@@ -937,6 +1199,17 @@
         <translation>Łączna kwota na podglądanych adresach</translation>
     </message>
 </context>
+<context>
+    <name>PaymentServer</name>
+    <message>
+        <source>Payment request error</source>
+        <translation>Błąd żądania płatności</translation>
+    </message>
+    <message>
+        <source>Cannot start bitcoin: click-to-pay handler</source>
+        <translation>Nie można uruchomić protokołu bitcoin: kliknij-by-zapłacić</translation>
+    </message>
+    </context>
 <context>
     <name>PeerTableModel</name>
     <message>
@@ -947,11 +1220,7 @@
         <source>Node/Service</source>
         <translation>Węzeł/Usługi</translation>
     </message>
-    <message>
-        <source>Ping Time</source>
-        <translation>Czas odpowiedzi</translation>
-    </message>
-</context>
+    </context>
 <context>
     <name>QObject</name>
     <message>
@@ -990,7 +1259,17 @@
         <source>%1 ms</source>
         <translation>%1 ms</translation>
     </message>
-</context>
+    <message>
+        <source>%1 and %2</source>
+        <translation>%1 i %2</translation>
+    </message>
+    </context>
+<context>
+    <name>QObject::QObject</name>
+    </context>
+<context>
+    <name>QRImageWidget</name>
+    </context>
 <context>
     <name>RPCConsole</name>
     <message>
@@ -1141,6 +1420,10 @@
         <source>Ping Time</source>
         <translation>Czas odpowiedzi</translation>
     </message>
+    <message>
+        <source>The duration of a currently outstanding ping.</source>
+        <translation>Czas trwania nadmiarowego pingu</translation>
+    </message>
     <message>
         <source>Ping Wait</source>
         <translation>Czas odpowiedzi</translation>
@@ -1189,14 +1472,6 @@
         <source>Clear console</source>
         <translation>Wyczyść konsolę</translation>
     </message>
-    <message>
-        <source>&amp;Disconnect Node</source>
-        <translation>Odłącz Nod</translation>
-    </message>
-    <message>
-        <source>Ban Node for</source>
-        <translation>Blokuj węzeł na okres</translation>
-    </message>
     <message>
         <source>1 &amp;hour</source>
         <translation>1 &amp;godzina</translation>
@@ -1213,10 +1488,6 @@
         <source>1 &amp;year</source>
         <translation>1 &amp;rok</translation>
     </message>
-    <message>
-        <source>&amp;Unban Node</source>
-        <translation>Odblokuj węzeł</translation>
-    </message>
     <message>
         <source>Welcome to the %1 RPC console.</source>
         <translation>Witaj w konsoli %1 RPC.</translation>
@@ -1348,6 +1619,14 @@
         <source>Remove</source>
         <translation>Usuń</translation>
     </message>
+    <message>
+        <source>Copy label</source>
+        <translation>Kopiuj etykietę</translation>
+    </message>
+    <message>
+        <source>Copy amount</source>
+        <translation>Kopiuj kwotę</translation>
+    </message>
 </context>
 <context>
     <name>ReceiveRequestDialog</name>
@@ -1367,7 +1646,30 @@
         <source>&amp;Save Image...</source>
         <translation>&amp;Zapisz obraz...</translation>
     </message>
-</context>
+    <message>
+        <source>Address</source>
+        <translation>Adres</translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation>Etykieta</translation>
+    </message>
+    </context>
+<context>
+    <name>RecentRequestsTableModel</name>
+    <message>
+        <source>Date</source>
+        <translation>Data</translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation>Etykieta</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(brak etykiety)</translation>
+    </message>
+    </context>
 <context>
     <name>SendCoinsDialog</name>
     <message>
@@ -1402,10 +1704,6 @@
         <source>Amount:</source>
         <translation>Kwota:</translation>
     </message>
-    <message>
-        <source>Priority:</source>
-        <translation>Priorytet:</translation>
-    </message>
     <message>
         <source>Fee:</source>
         <translation>Opłata:</translation>
@@ -1474,10 +1772,6 @@
         <source>(Smart fee not initialized yet. This usually takes a few blocks...)</source>
         <translation>(Sprytne opłaty nie są jeszcze zainicjowane. Trwa to zwykle kilka bloków...)</translation>
     </message>
-    <message>
-        <source>Confirmation time:</source>
-        <translation>Czas potwierdzenia:</translation>
-    </message>
     <message>
         <source>normal</source>
         <translation>normalnie</translation>
@@ -1518,6 +1812,38 @@
         <source>S&amp;end</source>
         <translation>Wy&amp;syłka</translation>
     </message>
+    <message>
+        <source>Copy quantity</source>
+        <translation>Skopiuj ilość</translation>
+    </message>
+    <message>
+        <source>Copy amount</source>
+        <translation>Kopiuj kwotę</translation>
+    </message>
+    <message>
+        <source>Copy fee</source>
+        <translation>Skopiuj prowizję</translation>
+    </message>
+    <message>
+        <source>Copy after fee</source>
+        <translation>Skopiuj ilość po opłacie</translation>
+    </message>
+    <message>
+        <source>Copy bytes</source>
+        <translation>Skopiuj ilość bajtów</translation>
+    </message>
+    <message>
+        <source>Copy dust</source>
+        <translation>Kopiuj pył</translation>
+    </message>
+    <message>
+        <source>Copy change</source>
+        <translation>Skopiuj resztę</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(brak etykiety)</translation>
+    </message>
 </context>
 <context>
     <name>SendCoinsEntry</name>
@@ -1597,7 +1923,10 @@
         <source>Memo:</source>
         <translation>Notatka:</translation>
     </message>
-</context>
+    </context>
+<context>
+    <name>SendConfirmationDialog</name>
+    </context>
 <context>
     <name>ShutdownWindow</name>
     <message>
@@ -1696,7 +2025,7 @@ Zwróć uwagę, że poprawnie zweryfikowana wiadomość potwierdza to, że nadaw
         <source>Reset all verify message fields</source>
         <translation>Resetuje wszystkie pola weryfikacji wiadomości</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>SplashScreen</name>
     <message>
@@ -1711,13 +2040,166 @@ Zwróć uwagę, że poprawnie zweryfikowana wiadomość potwierdza to, że nadaw
         <translation>KB/s</translation>
     </message>
 </context>
+<context>
+    <name>TransactionDesc</name>
+    <message>
+        <source>Date</source>
+        <translation>Data</translation>
+    </message>
+    <message>
+        <source>Source</source>
+        <translation>Źródło</translation>
+    </message>
+    <message>
+        <source>Generated</source>
+        <translation>Wygenerowano</translation>
+    </message>
+    <message>
+        <source>From</source>
+        <translation>Od</translation>
+    </message>
+    <message>
+        <source>unknown</source>
+        <translation>nieznane</translation>
+    </message>
+    <message>
+        <source>To</source>
+        <translation>Do</translation>
+    </message>
+    <message>
+        <source>own address</source>
+        <translation>własny adres</translation>
+    </message>
+    <message>
+        <source>watch-only</source>
+        <translation>tylko-obserwowany</translation>
+    </message>
+    <message>
+        <source>label</source>
+        <translation>etykieta</translation>
+    </message>
+    </context>
 <context>
     <name>TransactionDescDialog</name>
     <message>
         <source>This pane shows a detailed description of the transaction</source>
         <translation>Ten panel pokazuje szczegółowy opis transakcji</translation>
     </message>
-</context>
+    </context>
+<context>
+    <name>TransactionTableModel</name>
+    <message>
+        <source>Date</source>
+        <translation>Data</translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation>Etykieta</translation>
+    </message>
+    <message>
+        <source>Offline</source>
+        <translation>Offline</translation>
+    </message>
+    <message>
+        <source>Unconfirmed</source>
+        <translation>Niepotwierdzone</translation>
+    </message>
+    <message>
+        <source>Abandoned</source>
+        <translation>Porzucone</translation>
+    </message>
+    <message>
+        <source>Conflicted</source>
+        <translation>Skonfliktowane</translation>
+    </message>
+    <message>
+        <source>Generated but not accepted</source>
+        <translation>Wygenerowane ale nie zaakceptowane</translation>
+    </message>
+    <message>
+        <source>Sent to</source>
+        <translation>Wysłane do</translation>
+    </message>
+    <message>
+        <source>watch-only</source>
+        <translation>tylko-obserwowany</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(brak etykiety)</translation>
+    </message>
+    </context>
+<context>
+    <name>TransactionView</name>
+    <message>
+        <source>All</source>
+        <translation>Wszystko</translation>
+    </message>
+    <message>
+        <source>Today</source>
+        <translation>Dzisiaj</translation>
+    </message>
+    <message>
+        <source>This week</source>
+        <translation>W tym tygodniu</translation>
+    </message>
+    <message>
+        <source>This month</source>
+        <translation>W tym miesiącu</translation>
+    </message>
+    <message>
+        <source>Last month</source>
+        <translation>W zeszłym miesiącu</translation>
+    </message>
+    <message>
+        <source>This year</source>
+        <translation>W tym roku</translation>
+    </message>
+    <message>
+        <source>Range...</source>
+        <translation>Zakres...</translation>
+    </message>
+    <message>
+        <source>Sent to</source>
+        <translation>Wysłane do</translation>
+    </message>
+    <message>
+        <source>Copy address</source>
+        <translation>Kopiuj adres</translation>
+    </message>
+    <message>
+        <source>Copy label</source>
+        <translation>Kopiuj etykietę</translation>
+    </message>
+    <message>
+        <source>Copy amount</source>
+        <translation>Kopiuj kwotę</translation>
+    </message>
+    <message>
+        <source>Copy transaction ID</source>
+        <translation>Skopiuj ID transakcji</translation>
+    </message>
+    <message>
+        <source>Comma separated file (*.csv)</source>
+        <translation>Plik *.CSV (dane rozdzielane przecinkami)</translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation>Data</translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation>Etykieta</translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation>Adres</translation>
+    </message>
+    <message>
+        <source>Exporting Failed</source>
+        <translation>Eksportowanie nie powiodło się</translation>
+    </message>
+    </context>
 <context>
     <name>UnitDisplayStatusBarControl</name>
     <message>
@@ -1725,6 +2207,15 @@ Zwróć uwagę, że poprawnie zweryfikowana wiadomość potwierdza to, że nadaw
         <translation>Jednostka w jakiej pokazywane są kwoty. Kliknij aby wybrać inną.</translation>
     </message>
 </context>
+<context>
+    <name>WalletFrame</name>
+    </context>
+<context>
+    <name>WalletModel</name>
+    </context>
+<context>
+    <name>WalletView</name>
+    </context>
 <context>
     <name>bitcoin-core</name>
     <message>
@@ -1755,6 +2246,18 @@ Zwróć uwagę, że poprawnie zweryfikowana wiadomość potwierdza to, że nadaw
         <source>Prune configured below the minimum of %d MiB.  Please use a higher number.</source>
         <translation>Przycinanie skonfigurowano poniżej minimalnych %d MiB. Proszę użyć wyższej liczby.</translation>
     </message>
+    <message>
+        <source>Prune: last wallet synchronisation goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of pruned node)</source>
+        <translation>Prune: ostatnia synchronizacja portfela jest za danymi. Muszisz -reindexować (pobrać cały ciąg bloków ponownie w przypadku przyciętego węzła)</translation>
+    </message>
+    <message>
+        <source>Reduce storage requirements by pruning (deleting) old blocks. This mode is incompatible with -txindex and -rescan. Warning: Reverting this setting requires re-downloading the entire blockchain. (default: 0 = disable pruning blocks, &gt;%u = target size in MiB to use for block files)</source>
+        <translation>Zredukuj wymaganą ilość miejsca na dysku poprzez usuwanie starych bloków. Ten tryb jest niekompatybilny z -txindex oraz -rescan. Ostrzeżenie: Wycofanie tego ustawienia wymaga ponownego pobrania całego łańcucha bloków. (domyślnie: 0 = wyłącz usuwanie bloków, &gt;%u = docelowy rozmiar w MiB jaki wykorzystać na pliki z blokami)</translation>
+    </message>
+    <message>
+        <source>Rescans are not possible in pruned mode. You will need to use -reindex which will download the whole blockchain again.</source>
+        <translation>Ponowne skanowanie nie jest możliwe w trybie przycinania. Będzie trzeba użyć -reindex, co pobierze ponownie cały łańcuch bloków.</translation>
+    </message>
     <message>
         <source>Error: A fatal internal error occurred, see debug.log for details</source>
         <translation>Błąd: Wystąpił fatalny błąd wewnętrzny, sprawdź szczegóły w debug.log</translation>
@@ -1775,10 +2278,6 @@ Zwróć uwagę, że poprawnie zweryfikowana wiadomość potwierdza to, że nadaw
         <source>Unable to start HTTP server. See debug log for details.</source>
         <translation>Uruchomienie serwera HTTP nie powiodło się. Zobacz dziennik debugowania, aby uzyskać więcej szczegółów.</translation>
     </message>
-    <message>
-        <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
-        <translation>Akceptuj połączenia z zewnątrz (domyślnie: 1 jeśli nie ustawiono -proxy lub -connect)</translation>
-    </message>
     <message>
         <source>Bitcoin Core</source>
         <translation>Rdzeń Bitcoina</translation>
@@ -1788,8 +2287,12 @@ Zwróć uwagę, że poprawnie zweryfikowana wiadomość potwierdza to, że nadaw
         <translation>Deweloperzy %s</translation>
     </message>
     <message>
-        <source>-fallbackfee is set very high! This is the transaction fee you may pay when fee estimates are not available.</source>
-        <translation>-fallbackfee ma ustawioną bardzo dużą wartość!  Jest to prowizja za transakcje, którą możesz zapłacić gdy oszacowanie opłaty jest niemożliwe.</translation>
+        <source>A fee rate (in %s/kB) that will be used when fee estimation has insufficient data (default: %s)</source>
+        <translation>Stawka prowizji (w %s/kB), która będzie użyta, gdy oszacowane dane o prowizjach nie będą wystarczające (domyślnie: %s)</translation>
+    </message>
+    <message>
+        <source>Accept relayed transactions received from whitelisted peers even when not relaying transactions (default: %d)</source>
+        <translation>Accept relayed transactions received from whitelisted peers even when not relaying transactions (default: %d)</translation>
     </message>
     <message>
         <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source>
@@ -1803,10 +2306,6 @@ Zwróć uwagę, że poprawnie zweryfikowana wiadomość potwierdza to, że nadaw
         <source>Delete all wallet transactions and only recover those parts of the blockchain through -rescan on startup</source>
         <translation>Usuwa wszystkie transakcje w portfelu i tylko odtwarza te części z łańcucha bloków poprzez -rescan przy starcie</translation>
     </message>
-    <message>
-        <source>Distributed under the MIT software license, see the accompanying file COPYING or &lt;http://www.opensource.org/licenses/mit-license.php&gt;.</source>
-        <translation>Rozprowadzane na licencji MIT, zobacz dołączony plik COPYING lub &lt;http://www.opensource.org/licenses/mit-license.php&gt;.</translation>
-    </message>
     <message>
         <source>Error reading %s! All keys read correctly, but transaction data or address book entries might be missing or incorrect.</source>
         <translation>Błąd odczytu %s! Wszystkie klucze zostały odczytane poprawnie, ale może brakować  danych transakcji lub wpisów w książce adresowej, lub mogą one być nieprawidłowe.</translation>
@@ -1815,10 +2314,6 @@ Zwróć uwagę, że poprawnie zweryfikowana wiadomość potwierdza to, że nadaw
         <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source>
         <translation>Wykonaj polecenie, kiedy transakcja portfela ulegnie zmianie (%s w poleceniu zostanie zastąpione przez TxID)</translation>
     </message>
-    <message>
-        <source>Force relay of transactions from whitelisted peers even they violate local relay policy (default: %d)</source>
-        <translation>Wymuś przekazywanie transakcji od osób z białej listy, nawet jeśli narusza to lokalną politykę przekazywania (default: %d)</translation>
-    </message>
     <message>
         <source>Please check that your computer's date and time are correct! If your clock is wrong, %s will not work properly.</source>
         <translation>Proszę sprawdzić czy data i czas na Twoim komputerze są poprawne! Jeżeli ustawienia zegara będą złe, %s nie będzie działał prawidłowo.</translation>
@@ -1827,26 +2322,10 @@ Zwróć uwagę, że poprawnie zweryfikowana wiadomość potwierdza to, że nadaw
         <source>Set the number of script verification threads (%u to %d, 0 = auto, &lt;0 = leave that many cores free, default: %d)</source>
         <translation>Ustaw liczbę wątków skryptu weryfikacyjnego (%u do %d, 0 = auto, &lt;0 = zostaw tyle rdzeni wolnych, domyślnie: %d)</translation>
     </message>
-    <message>
-        <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
-        <translation>To jest testowa wersja - używaj na własne ryzyko - nie używaj do wykopywania oraz przy aplikacjach kupieckich</translation>
-    </message>
     <message>
         <source>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</source>
         <translation>Użyj UPnP do mapowania portu nasłuchu (domyślnie: 1 gdy nasłuchuje i brak -proxy)</translation>
     </message>
-    <message>
-        <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source>
-        <translation>Ostrzeżenie: Sieć nie wydaje się w pełni zgodna! Niektórzy górnicy wydają się doświadczać problemów.</translation>
-    </message>
-    <message>
-        <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source>
-        <translation>Uwaga: Wygląda na to, że nie ma pełnej zgodności z naszymi peerami! Możliwe, że potrzebujesz aktualizacji bądź inne węzły jej potrzebują</translation>
-    </message>
-    <message>
-        <source>Whitelist peers connecting from the given netmask or IP address. Can be specified multiple times.</source>
-        <translation>Dodawaj do białej listy węzły łączące się z podanej maski sieciowej lub adresu IP. Może być określona kilka razy.</translation>
-    </message>
     <message>
         <source>You need to rebuild the database using -reindex-chainstate to change -txindex</source>
         <translation>Musisz przebudować bazę używając -reindex-chainstate aby zmienić -txindex</translation>
@@ -1863,6 +2342,10 @@ Zwróć uwagę, że poprawnie zweryfikowana wiadomość potwierdza to, że nadaw
         <source>&lt;category&gt; can be:</source>
         <translation>&lt;category&gt; mogą być:</translation>
     </message>
+    <message>
+        <source>Append comment to the user agent string</source>
+        <translation>Dodaj komentarz do pola user agent</translation>
+    </message>
     <message>
         <source>Attempt to recover private keys from a corrupt wallet on startup</source>
         <translation>Próbuj odzyskać klucze prywatne z uszkodzonego portfela podczas uruchamiania.</translation>
@@ -1872,8 +2355,8 @@ Zwróć uwagę, że poprawnie zweryfikowana wiadomość potwierdza to, że nadaw
         <translation>Opcje tworzenia bloku:</translation>
     </message>
     <message>
-        <source>Connect only to the specified node(s)</source>
-        <translation>Łącz się tylko do wskazanego węzła/węzłów</translation>
+        <source>Cannot resolve -%s address: '%s'</source>
+        <translation>Nie można rozpoznać -%s adresu: '%s'</translation>
     </message>
     <message>
         <source>Connection options:</source>
@@ -1967,6 +2450,14 @@ Zwróć uwagę, że poprawnie zweryfikowana wiadomość potwierdza to, że nadaw
         <source>Keep the transaction memory pool below &lt;n&gt; megabytes (default: %u)</source>
         <translation>Utrzymuj obszar pamięci dla transakcji poniżej &lt;n&gt; MB (default: %u)</translation>
     </message>
+    <message>
+        <source>Loading banlist...</source>
+        <translation>Ładowanie listy zablokowanych...</translation>
+    </message>
+    <message>
+        <source>Location of the auth cookie (default: data dir)</source>
+        <translation>Lokalizacja autoryzacyjnego pliku cookie (domyślnie: ścieżka danych)</translation>
+    </message>
     <message>
         <source>Not enough file descriptors available.</source>
         <translation>Brak wystarczającej liczby deskryptorów plików. </translation>
@@ -2011,6 +2502,10 @@ Zwróć uwagę, że poprawnie zweryfikowana wiadomość potwierdza to, że nadaw
         <source>Specify wallet file (within data directory)</source>
         <translation>Określ plik portfela (w obrębie folderu danych)</translation>
     </message>
+    <message>
+        <source>The source code is available from %s.</source>
+        <translation>Kod źródłowy dostępny jest z %s.</translation>
+    </message>
     <message>
         <source>Unable to bind to %s on this computer. %s is probably already running.</source>
         <translation>Nie można przywiązać do %s na tym komputerze. %s prawdopodobnie jest już uruchomiony.</translation>
@@ -2099,10 +2594,6 @@ Zwróć uwagę, że poprawnie zweryfikowana wiadomość potwierdza to, że nadaw
         <source>Maximum size of data in data carrier transactions we relay and mine (default: %u)</source>
         <translation>Maksymalny rozmiar danych w transakcji przekazującej dane które przekazujemy i wydobywamy (domyślnie: %u)</translation>
     </message>
-    <message>
-        <source>Query for peer addresses via DNS lookup, if low on addresses (default: 1 unless -connect)</source>
-        <translation>Wyszukaj adresy węzłów wykorzystując zapytanie DNS, jeżeli masz mało adresów (domyślnie: 1 jeśli nie użyto -connect)</translation>
-    </message>
     <message>
         <source>Set maximum size of high-priority/low-fee transactions in bytes (default: %d)</source>
         <translation>Ustaw maksymalny rozmiar transakcji o wysokim priorytecie/niskiej prowizji w bajtach (domyślnie: %d)</translation>
@@ -2111,10 +2602,6 @@ Zwróć uwagę, że poprawnie zweryfikowana wiadomość potwierdza to, że nadaw
         <source>The transaction amount is too small to send after the fee has been deducted</source>
         <translation>Zbyt niska kwota transakcji do wysłania po odjęciu opłaty</translation>
     </message>
-    <message>
-        <source>This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit &lt;https://www.openssl.org/&gt; and cryptographic software written by Eric Young and UPnP software written by Thomas Bernard.</source>
-        <translation>Program ten zawiera oprogramowanie stworzone przez OpenSSL Project do użycia w OpensSSL Toolkit &lt;https://www.openssl.org/&gt;, oprogramowanie kryptograficzne napisane przez Eric Young oraz oprogramowanie UPnP napisane przez Thomas Bernard.</translation>
-    </message>
     <message>
         <source>Whitelisted peers cannot be DoS banned and their transactions are always relayed, even if they are already in the mempool, useful e.g. for a gateway</source>
         <translation>Węzły z białej listy nie mogą zostać zbanowane za ataki DoS, a ich transakcje będą zawsze przekazywane, nawet jeżeli będą znajdywać się już w pamięci, przydatne np. dla bramek płatniczych</translation>
@@ -2212,12 +2699,12 @@ Zwróć uwagę, że poprawnie zweryfikowana wiadomość potwierdza to, że nadaw
         <translation>Hasło zabezpieczające portu kontrolnego Tora (domyślnie: puste)</translation>
     </message>
     <message>
-        <source>Transaction amount too small</source>
-        <translation>Zbyt niska kwota transakcji </translation>
+        <source>Tor control port to use if onion listening enabled (default: %s)</source>
+        <translation>Port kontrolny sieci Tor jeśli onion listening jest włączone (domyślnie: %s)</translation>
     </message>
     <message>
-        <source>Transaction amounts must be positive</source>
-        <translation>Kwota transakcji musi być dodatnia</translation>
+        <source>Transaction amount too small</source>
+        <translation>Zbyt niska kwota transakcji </translation>
     </message>
     <message>
         <source>Transaction too large for fee policy</source>
@@ -2275,10 +2762,6 @@ Zwróć uwagę, że poprawnie zweryfikowana wiadomość potwierdza to, że nadaw
         <source>-maxtxfee is set very high! Fees this large could be paid on a single transaction.</source>
         <translation>-maxtxfee ma ustawioną badzo dużą wartość! Tak wysokie opłaty mogą być zapłacone w jednej transakcji.</translation>
     </message>
-    <message>
-        <source>-paytxfee is set very high! This is the transaction fee you will pay if you send a transaction.</source>
-        <translation>-paytxfee ma ustawioną bardzo dużą wartość! Jest to prowizja za transakcje, którą płacisz, gdy wysyłasz monety.</translation>
-    </message>
     <message>
         <source>Do not keep transactions in the mempool longer than &lt;n&gt; hours (default: %u)</source>
         <translation>Nie trzymaj w pamięci transakcji starszych niż &lt;n&gt; godz. (domyślnie: %u)</translation>
@@ -2331,6 +2814,10 @@ Zwróć uwagę, że poprawnie zweryfikowana wiadomość potwierdza to, że nadaw
         <source>Warning: Wallet file corrupt, data salvaged! Original %s saved as %s in %s; if your balance or transactions are incorrect you should restore from a backup.</source>
         <translation>Ostrzeżenie: Odtworzono dane z uszkodzonego pliku portfela! Oryginalny %s został zapisany jako %s w %s; jeśli twoje saldo lub transakcje są niepoprawne powinieneś odtworzyć kopię zapasową.</translation>
     </message>
+    <message>
+        <source>%s is set very high!</source>
+        <translation>%s jest ustawione bardzo wysoko!</translation>
+    </message>
     <message>
         <source>(default: %s)</source>
         <translation>(domyślnie: %s)</translation>
@@ -2391,10 +2878,6 @@ Zwróć uwagę, że poprawnie zweryfikowana wiadomość potwierdza to, że nadaw
         <source>Set key pool size to &lt;n&gt; (default: %u)</source>
         <translation>Ustaw rozmiar puli kluczy na &lt;n&gt; (domyślnie: %u)</translation>
     </message>
-    <message>
-        <source>Set minimum block size in bytes (default: %u)</source>
-        <translation>Ustaw minimalny rozmiar bloku w bajtach (domyślnie: %u)</translation>
-    </message>
     <message>
         <source>Set the number of threads to service RPC calls (default: %d)</source>
         <translation>Ustaw liczbę wątków do obsługi RPC (domyślnie: %d)</translation>
@@ -2419,6 +2902,14 @@ Zwróć uwagę, że poprawnie zweryfikowana wiadomość potwierdza to, że nadaw
         <source>Threshold for disconnecting misbehaving peers (default: %u)</source>
         <translation>Próg, po którym nastąpi rozłączenie węzłów nietrzymających się zasad (domyślnie: %u)</translation>
     </message>
+    <message>
+        <source>Transaction amounts must not be negative</source>
+        <translation>Kwota transakcji musi być dodatnia</translation>
+    </message>
+    <message>
+        <source>Transaction must have at least one recipient</source>
+        <translation>Transakcja wymaga co najmniej jednego odbiorcy</translation>
+    </message>
     <message>
         <source>Unknown network specified in -onlynet: '%s'</source>
         <translation>Nieznana sieć w -onlynet: '%s'</translation>
diff --git a/src/qt/locale/bitcoin_pt_BR.ts b/src/qt/locale/bitcoin_pt_BR.ts
index ee48c673413da..3589cdbc1b4d4 100644
--- a/src/qt/locale/bitcoin_pt_BR.ts
+++ b/src/qt/locale/bitcoin_pt_BR.ts
@@ -23,7 +23,7 @@
     </message>
     <message>
         <source>C&amp;lose</source>
-        <translation>&amp;Fechar</translation>
+        <translation>Fechar</translation>
     </message>
     <message>
         <source>Delete the currently selected address from the list</source>
@@ -41,6 +41,77 @@
         <source>&amp;Delete</source>
         <translation>&amp;Excluir</translation>
     </message>
+    <message>
+        <source>Choose the address to send coins to</source>
+        <translation>Escoha o endereço para enviar moedas</translation>
+    </message>
+    <message>
+        <source>Choose the address to receive coins with</source>
+        <translation>Escolha o enereço para receber moedas</translation>
+    </message>
+    <message>
+        <source>C&amp;hoose</source>
+        <translation>Escol&amp;ha</translation>
+    </message>
+    <message>
+        <source>Sending addresses</source>
+        <translation>Endereços de envio</translation>
+    </message>
+    <message>
+        <source>Receiving addresses</source>
+        <translation>Endereços de recebimento</translation>
+    </message>
+    <message>
+        <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source>
+        <translation>Estes são os seus endereços para enviar pagamentos. Sempre cheque a quantia e o endereço do destinatário antes de enviar moedas.</translation>
+    </message>
+    <message>
+        <source>These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source>
+        <translation>Estes são os seus endereços para receber pagamentos. É recomendado usar um novo para cada transação.</translation>
+    </message>
+    <message>
+        <source>&amp;Copy Address</source>
+        <translation>&amp;Copiar endereço</translation>
+    </message>
+    <message>
+        <source>Copy &amp;Label</source>
+        <translation>Copiar rótu&amp;lo</translation>
+    </message>
+    <message>
+        <source>&amp;Edit</source>
+        <translation>&amp;Editar</translation>
+    </message>
+    <message>
+        <source>Export Address List</source>
+        <translation>Exportar lista de endereços</translation>
+    </message>
+    <message>
+        <source>Comma separated file (*.csv)</source>
+        <translation>Comma separated file (*.csv)</translation>
+    </message>
+    <message>
+        <source>Exporting Failed</source>
+        <translation>Falha na exportação</translation>
+    </message>
+    <message>
+        <source>There was an error trying to save the address list to %1. Please try again.</source>
+        <translation>Erro ao salvar a lista de endereço para %1. Tente novamente.</translation>
+    </message>
+</context>
+<context>
+    <name>AddressTableModel</name>
+    <message>
+        <source>Label</source>
+        <translation>Rótuo</translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation>Endereço</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(sem rótuo)</translation>
+    </message>
 </context>
 <context>
     <name>AskPassphraseDialog</name>
@@ -60,6 +131,90 @@
         <source>Repeat new passphrase</source>
         <translation>Repita a nova frase de segurança</translation>
     </message>
+    <message>
+        <source>Enter the new passphrase to the wallet.&lt;br/&gt;Please use a passphrase of &lt;b&gt;ten or more random characters&lt;/b&gt;, or &lt;b&gt;eight or more words&lt;/b&gt;.</source>
+        <translation>Insira a nova senha para a carteira.&lt;br/&gt;Favor usar uma senha com &lt;b&gt;dez ou mais caracteres aleatórios&lt;/b&gt;, ou &lt;b&gt;oito ou mais palavras&lt;/b&gt;.</translation>
+    </message>
+    <message>
+        <source>Encrypt wallet</source>
+        <translation>Criptografar carteira</translation>
+    </message>
+    <message>
+        <source>This operation needs your wallet passphrase to unlock the wallet.</source>
+        <translation>Esta operação precisa da sua senha para desbloquear a carteira.</translation>
+    </message>
+    <message>
+        <source>Unlock wallet</source>
+        <translation>Desbloquear carteira</translation>
+    </message>
+    <message>
+        <source>This operation needs your wallet passphrase to decrypt the wallet.</source>
+        <translation>Esta operação precisa da sua senha para descriptografar a carteira</translation>
+    </message>
+    <message>
+        <source>Decrypt wallet</source>
+        <translation>Descriptografar carteira</translation>
+    </message>
+    <message>
+        <source>Change passphrase</source>
+        <translation>Alterar senha</translation>
+    </message>
+    <message>
+        <source>Enter the old passphrase and new passphrase to the wallet.</source>
+        <translation>Insira a senha antiga e a nova para a carteira.</translation>
+    </message>
+    <message>
+        <source>Confirm wallet encryption</source>
+        <translation>Confirmar criptografia da carteira</translation>
+    </message>
+    <message>
+        <source>Warning: If you encrypt your wallet and lose your passphrase, you will &lt;b&gt;LOSE ALL OF YOUR BITCOINS&lt;/b&gt;!</source>
+        <translation>Aviso: Se você criptografar sua carteira e perder sua senha, você vai &lt;b&gt;PERDER TODOS OS SEUS BITCOINS&lt;/b&gt;!</translation>
+    </message>
+    <message>
+        <source>Are you sure you wish to encrypt your wallet?</source>
+        <translation>Tem certeza que deseja criptografar a carteira?</translation>
+    </message>
+    <message>
+        <source>Wallet encrypted</source>
+        <translation>Carteira criptografada</translation>
+    </message>
+    <message>
+        <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source>
+        <translation>IMPORTANTE: Qualquer backup prévio que você tenha feito da sua carteira deve ser substituído pelo novo e encriptado arquivo gerado. Por razões de segurança, qualquer backup do arquivo não criptografado se tornará inútil assim que você começar a usar uma nova carteira criptografada.</translation>
+    </message>
+    <message>
+        <source>Wallet encryption failed</source>
+        <translation>Falha ao criptografar carteira</translation>
+    </message>
+    <message>
+        <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
+        <translation>Falha na criptografia devido a um erro inerno. Sua carteira não foi criptografada.</translation>
+    </message>
+    <message>
+        <source>The supplied passphrases do not match.</source>
+        <translation>As senhas não conferem.</translation>
+    </message>
+    <message>
+        <source>Wallet unlock failed</source>
+        <translation>Falha ao desbloquear carteira</translation>
+    </message>
+    <message>
+        <source>The passphrase entered for the wallet decryption was incorrect.</source>
+        <translation>A senha inserida para descriptografar a carteira está incorreta.</translation>
+    </message>
+    <message>
+        <source>Wallet decryption failed</source>
+        <translation>Falha ao descriptografar a carteira</translation>
+    </message>
+    <message>
+        <source>Wallet passphrase was successfully changed.</source>
+        <translation>A senha da carteira foi alterada com êxito.</translation>
+    </message>
+    <message>
+        <source>Warning: The Caps Lock key is on!</source>
+        <translation>Aviso: Tecla Caps Lock ativa!</translation>
+    </message>
 </context>
 <context>
     <name>BanTableModel</name>
@@ -158,6 +313,18 @@
         <source>Open &amp;URI...</source>
         <translation>Abrir &amp;URI...</translation>
     </message>
+    <message>
+        <source>Click to disable network activity.</source>
+        <translation>Clique para desativar a atividade de rede.</translation>
+    </message>
+    <message>
+        <source>Network activity disabled.</source>
+        <translation>Atividade de rede desativada.</translation>
+    </message>
+    <message>
+        <source>Click to enable network activity again.</source>
+        <translation>Clique para ativar a atividade de rede.</translation>
+    </message>
     <message>
         <source>Reindexing blocks on disk...</source>
         <translation>Reindexando blocos no disco...</translation>
@@ -176,7 +343,7 @@
     </message>
     <message>
         <source>&amp;Debug window</source>
-        <translation>Janela de &amp;Depuração</translation>
+        <translation>Janela de &amp;depuração</translation>
     </message>
     <message>
         <source>Open debugging and diagnostic console</source>
@@ -278,26 +445,6 @@
         <source>Processed %n block(s) of transaction history.</source>
         <translation><numerusform>%n bloco processado do histórico de transações.</numerusform><numerusform>%n blocos processados do histórico de transações.</numerusform></translation>
     </message>
-    <message numerus="yes">
-        <source>%n hour(s)</source>
-        <translation><numerusform>%n hora</numerusform><numerusform>%n horas</numerusform></translation>
-    </message>
-    <message numerus="yes">
-        <source>%n day(s)</source>
-        <translation><numerusform>%n dia</numerusform><numerusform>%n dias</numerusform></translation>
-    </message>
-    <message numerus="yes">
-        <source>%n week(s)</source>
-        <translation><numerusform>%n semana</numerusform><numerusform>%n semanas</numerusform></translation>
-    </message>
-    <message>
-        <source>%1 and %2</source>
-        <translation>%1 e %2</translation>
-    </message>
-    <message numerus="yes">
-        <source>%n year(s)</source>
-        <translation><numerusform>%n ano</numerusform><numerusform>%n anos</numerusform></translation>
-    </message>
     <message>
         <source>%1 behind</source>
         <translation>%1 atrás</translation>
@@ -332,7 +479,7 @@
     </message>
     <message>
         <source>%1 client</source>
-        <translation>cliente %1</translation>
+        <translation>%1</translation>
     </message>
     <message>
         <source>Catching up...</source>
@@ -376,6 +523,14 @@
         <source>Incoming transaction</source>
         <translation>Transação recebida</translation>
     </message>
+    <message>
+        <source>HD key generation is &lt;b&gt;enabled&lt;/b&gt;</source>
+        <translation>Geração de chave HD está &lt;b&gt;ativada&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <source>HD key generation is &lt;b&gt;disabled&lt;/b&gt;</source>
+        <translation>Geração de chave HD está &lt;b&gt;desativada&lt;/b&gt;</translation>
+    </message>
     <message>
         <source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;unlocked&lt;/b&gt;</source>
         <translation>Carteira está &lt;b&gt;criptografada&lt;/b&gt; e atualmente &lt;b&gt;desbloqueada&lt;/b&gt;</translation>
@@ -384,6 +539,10 @@
         <source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;locked&lt;/b&gt;</source>
         <translation>Carteira está &lt;b&gt;criptografada&lt;/b&gt; e atualmente &lt;b&gt;bloqueada&lt;/b&gt;</translation>
     </message>
+    <message>
+        <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source>
+        <translation>Um erro fatal ocorreu. Bitcoin não pode continuar em segurança e irá fechar.</translation>
+    </message>
 </context>
 <context>
     <name>CoinControlDialog</name>
@@ -403,10 +562,6 @@
         <source>Amount:</source>
         <translation>Quantia:</translation>
     </message>
-    <message>
-        <source>Priority:</source>
-        <translation>Prioridade:</translation>
-    </message>
     <message>
         <source>Fee:</source>
         <translation>Taxa:</translation>
@@ -441,11 +596,11 @@
     </message>
     <message>
         <source>Received with label</source>
-        <translation>Recebido com rótulo</translation>
+        <translation>Rótulo</translation>
     </message>
     <message>
         <source>Received with address</source>
-        <translation>Recebido com endereço </translation>
+        <translation>Endereço </translation>
     </message>
     <message>
         <source>Date</source>
@@ -460,8 +615,84 @@
         <translation>Confirmado</translation>
     </message>
     <message>
-        <source>Priority</source>
-        <translation>Prioridade</translation>
+        <source>Copy address</source>
+        <translation>Copiar endereço</translation>
+    </message>
+    <message>
+        <source>Copy label</source>
+        <translation>Copiar rótulo</translation>
+    </message>
+    <message>
+        <source>Copy amount</source>
+        <translation>Copiar quantia</translation>
+    </message>
+    <message>
+        <source>Copy transaction ID</source>
+        <translation>Copiar ID da transação</translation>
+    </message>
+    <message>
+        <source>Lock unspent</source>
+        <translation>Boquear saída</translation>
+    </message>
+    <message>
+        <source>Unlock unspent</source>
+        <translation>Desboquear saída</translation>
+    </message>
+    <message>
+        <source>Copy quantity</source>
+        <translation>Copiar quantia</translation>
+    </message>
+    <message>
+        <source>Copy fee</source>
+        <translation>Copiar taxa</translation>
+    </message>
+    <message>
+        <source>Copy after fee</source>
+        <translation>Copiar pós taxa</translation>
+    </message>
+    <message>
+        <source>Copy bytes</source>
+        <translation>Copiar bytes</translation>
+    </message>
+    <message>
+        <source>Copy dust</source>
+        <translation>Copiar poeira</translation>
+    </message>
+    <message>
+        <source>Copy change</source>
+        <translation>Copiar troco</translation>
+    </message>
+    <message>
+        <source>(%1 locked)</source>
+        <translation>(%1 bloqueada)</translation>
+    </message>
+    <message>
+        <source>yes</source>
+        <translation>sim</translation>
+    </message>
+    <message>
+        <source>no</source>
+        <translation>não</translation>
+    </message>
+    <message>
+        <source>This label turns red if any recipient receives an amount smaller than the current dust threshold.</source>
+        <translation>Este texto fica vermelho se qualquer destinatário receber uma quantidade menor que que o dust.</translation>
+    </message>
+    <message>
+        <source>Can vary +/- %1 satoshi(s) per input.</source>
+        <translation>Pode variar +/- %1 satoshi(s) por entrada</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(sem rótuo)</translation>
+    </message>
+    <message>
+        <source>change from %1 (%2)</source>
+        <translation>troco de %1 (%2)</translation>
+    </message>
+    <message>
+        <source>(change)</source>
+        <translation>(troco)</translation>
     </message>
 </context>
 <context>
@@ -486,6 +717,38 @@
         <source>&amp;Address</source>
         <translation>&amp;Endereço</translation>
     </message>
+    <message>
+        <source>New receiving address</source>
+        <translation>Novo endereço de recebimento</translation>
+    </message>
+    <message>
+        <source>New sending address</source>
+        <translation>Novo endereço de envio</translation>
+    </message>
+    <message>
+        <source>Edit receiving address</source>
+        <translation>Editar endereço de recebimento</translation>
+    </message>
+    <message>
+        <source>Edit sending address</source>
+        <translation>Editar endereço de envio</translation>
+    </message>
+    <message>
+        <source>The entered address "%1" is not a valid Bitcoin address.</source>
+        <translation>O endereço digitado "%1" não é um endereço válido.</translation>
+    </message>
+    <message>
+        <source>The entered address "%1" is already in the address book.</source>
+        <translation>O endereço digitado "%1" já se encontra no catálogo de endereços.</translation>
+    </message>
+    <message>
+        <source>Could not unlock wallet.</source>
+        <translation>Não foi possível desbloquear a carteira</translation>
+    </message>
+    <message>
+        <source>New key generation failed.</source>
+        <translation>Falha ao gerar chave</translation>
+    </message>
 </context>
 <context>
     <name>FreespaceChecker</name>
@@ -608,6 +871,57 @@
         <translation><numerusform>(de %n GB necessário)</numerusform><numerusform>(de %n GB necessário)</numerusform></translation>
     </message>
 </context>
+<context>
+    <name>ModalOverlay</name>
+    <message>
+        <source>Form</source>
+        <translation>Formulário</translation>
+    </message>
+    <message>
+        <source>Recent transactions may not yet be visible, and therefore your wallet's balance might be incorrect. This information will be correct once your wallet has finished synchronizing with the bitcoin network, as detailed below.</source>
+        <translation>Transações recentes podem não estar visíveis ainda, portanto o seu saldo pode estar incorreto. Esta informação será corrigida assim que sua carteira for sincronizada com a rede, como detalhado abaixo.</translation>
+    </message>
+    <message>
+        <source>Attempting to spend bitcoins that are affected by not-yet-displayed transactions will not be accepted by the network.</source>
+        <translation>Gastar moedas de transações desconhecidas podem não ser aceitas pela rede.</translation>
+    </message>
+    <message>
+        <source>Number of blocks left</source>
+        <translation>Número de blocos restantes</translation>
+    </message>
+    <message>
+        <source>Unknown...</source>
+        <translation>Desconhecido...</translation>
+    </message>
+    <message>
+        <source>Last block time</source>
+        <translation>Horário do último bloco</translation>
+    </message>
+    <message>
+        <source>Progress</source>
+        <translation>Progresso</translation>
+    </message>
+    <message>
+        <source>Progress increase per hour</source>
+        <translation>Aumento do progresso por hora</translation>
+    </message>
+    <message>
+        <source>calculating...</source>
+        <translation>calculando...</translation>
+    </message>
+    <message>
+        <source>Estimated time left until synced</source>
+        <translation>Tempo estimado para sincronizar</translation>
+    </message>
+    <message>
+        <source>Hide</source>
+        <translation>Ocultar</translation>
+    </message>
+    <message>
+        <source>Unknown. Syncing Headers (%1)...</source>
+        <translation>Desconhecido. Sincroniando cabeçahos (%1)...</translation>
+    </message>
+</context>
 <context>
     <name>OpenURIDialog</name>
     <message>
@@ -626,6 +940,10 @@
         <source>Select payment request file</source>
         <translation>Selecione o arquivo de cobrança</translation>
     </message>
+    <message>
+        <source>Select payment request file to open</source>
+        <translation>Selecione o arquivo de cobrança para ser aberto</translation>
+    </message>
 </context>
 <context>
     <name>OptionsDialog</name>
@@ -643,7 +961,7 @@
     </message>
     <message>
         <source>&amp;Start %1 on system login</source>
-        <translation>$Iniciar %1 ao fazer login no sistema</translation>
+        <translation>&amp;Iniciar %1 ao fazer login no sistema</translation>
     </message>
     <message>
         <source>Size of &amp;database cache</source>
@@ -937,6 +1255,97 @@
         <translation>Balanço total em endereços monitorados</translation>
     </message>
 </context>
+<context>
+    <name>PaymentServer</name>
+    <message>
+        <source>Payment request error</source>
+        <translation>Erro no pedido de pagamento</translation>
+    </message>
+    <message>
+        <source>Cannot start bitcoin: click-to-pay handler</source>
+        <translation>Não foi possível iniciar bitcoin: manipulador click-to-pay</translation>
+    </message>
+    <message>
+        <source>URI handling</source>
+        <translation>Manipulação de URI</translation>
+    </message>
+    <message>
+        <source>Payment request fetch URL is invalid: %1</source>
+        <translation>URL de cobrança é inválida: %1</translation>
+    </message>
+    <message>
+        <source>Invalid payment address %1</source>
+        <translation>Endereço de pagamento %1 inválido</translation>
+    </message>
+    <message>
+        <source>URI cannot be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source>
+        <translation>URI não pode ser analisado! Isto pode ser causado por um endereço inválido ou parâmetros URI informados incorretamente.</translation>
+    </message>
+    <message>
+        <source>Payment request file handling</source>
+        <translation>Manipulação de arquivo de cobrança</translation>
+    </message>
+    <message>
+        <source>Payment request file cannot be read! This can be caused by an invalid payment request file.</source>
+        <translation>Arquivo de pedido de pagamento não pode ser lido! Isto pode ser causado por uma requisição de pagamento inválida.</translation>
+    </message>
+    <message>
+        <source>Payment request rejected</source>
+        <translation>Pedido de pagamento rejeitado</translation>
+    </message>
+    <message>
+        <source>Payment request network doesn't match client network.</source>
+        <translation>Rede do pedido de pagamento não corresponde rede do cliente.</translation>
+    </message>
+    <message>
+        <source>Payment request expired.</source>
+        <translation>Pedido de pagamento expirado</translation>
+    </message>
+    <message>
+        <source>Payment request is not initialized.</source>
+        <translation>Pedido de pagamento não inicializado</translation>
+    </message>
+    <message>
+        <source>Unverified payment requests to custom payment scripts are unsupported.</source>
+        <translation>Pedidos de pagamento não verificados para scripts de pagamento personalizados não são suportados.</translation>
+    </message>
+    <message>
+        <source>Invalid payment request.</source>
+        <translation>Pedido de pagamento inválido</translation>
+    </message>
+    <message>
+        <source>Requested payment amount of %1 is too small (considered dust).</source>
+        <translation>Valor do pagamento solicitado de %1 é muito pequeno (Considerado poeira).</translation>
+    </message>
+    <message>
+        <source>Refund from %1</source>
+        <translation>Reembolso de %1</translation>
+    </message>
+    <message>
+        <source>Payment request %1 is too large (%2 bytes, allowed %3 bytes).</source>
+        <translation>Pedido de pagamento %1 é muito grande (%2 bytes, permitido %3 bytes).</translation>
+    </message>
+    <message>
+        <source>Error communicating with %1: %2</source>
+        <translation>Erro na comunicação com %1: %2</translation>
+    </message>
+    <message>
+        <source>Payment request cannot be parsed!</source>
+        <translation>Pedido de pagamento não pode ser analisado!</translation>
+    </message>
+    <message>
+        <source>Bad response from server %1</source>
+        <translation>Erro na resposta do servidor: %1</translation>
+    </message>
+    <message>
+        <source>Network request error</source>
+        <translation>Erro de solicitação de rede</translation>
+    </message>
+    <message>
+        <source>Payment acknowledged</source>
+        <translation>Pagamento reconhecido</translation>
+    </message>
+</context>
 <context>
     <name>PeerTableModel</name>
     <message>
@@ -948,7 +1357,7 @@
         <translation>Nó/Serviço</translation>
     </message>
     <message>
-        <source>Ping Time</source>
+        <source>Ping</source>
         <translation>Ping</translation>
     </message>
 </context>
@@ -990,15 +1399,81 @@
         <source>%1 ms</source>
         <translation>%1 ms</translation>
     </message>
-</context>
-<context>
-    <name>RPCConsole</name>
-    <message>
-        <source>N/A</source>
-        <translation>N/A</translation>
+    <message numerus="yes">
+        <source>%n second(s)</source>
+        <translation><numerusform>%n segundo</numerusform><numerusform>%n segundos</numerusform></translation>
     </message>
-    <message>
-        <source>Client version</source>
+    <message numerus="yes">
+        <source>%n minute(s)</source>
+        <translation><numerusform>%n minuto</numerusform><numerusform>%n minutos</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%n hour(s)</source>
+        <translation><numerusform>%n hora</numerusform><numerusform>%n horas</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%n day(s)</source>
+        <translation><numerusform>%n dia</numerusform><numerusform>%n dias</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%n week(s)</source>
+        <translation><numerusform>%n semana</numerusform><numerusform>%n semanas</numerusform></translation>
+    </message>
+    <message>
+        <source>%1 and %2</source>
+        <translation>%1 e %2</translation>
+    </message>
+    <message numerus="yes">
+        <source>%n year(s)</source>
+        <translation><numerusform>%n ano</numerusform><numerusform>%n anos</numerusform></translation>
+    </message>
+    <message>
+        <source>%1 didn't yet exit safely...</source>
+        <translation>%1 ainda não terminou com segurança...</translation>
+    </message>
+</context>
+<context>
+    <name>QObject::QObject</name>
+    <message>
+        <source>Error: Specified data directory "%1" does not exist.</source>
+        <translation>Erro: diretório de dados especificado "%1" não existe.</translation>
+    </message>
+    <message>
+        <source>Error: Cannot parse configuration file: %1. Only use key=value syntax.</source>
+        <translation>Erro: Não foi possível interpretar arquivo de configuração: %1. Utilize apenas a sintaxe chave=valor.</translation>
+    </message>
+    <message>
+        <source>Error: %1</source>
+        <translation>Erro: %1</translation>
+    </message>
+</context>
+<context>
+    <name>QRImageWidget</name>
+    <message>
+        <source>&amp;Save Image...</source>
+        <translation>&amp;Savar imagem</translation>
+    </message>
+    <message>
+        <source>&amp;Copy Image</source>
+        <translation>&amp;Copiar imagem</translation>
+    </message>
+    <message>
+        <source>Save QR Code</source>
+        <translation>Salvar código QR</translation>
+    </message>
+    <message>
+        <source>PNG Image (*.png)</source>
+        <translation>Imagem PNG (*.png)</translation>
+    </message>
+</context>
+<context>
+    <name>RPCConsole</name>
+    <message>
+        <source>N/A</source>
+        <translation>N/A</translation>
+    </message>
+    <message>
+        <source>Client version</source>
         <translation>Versão do cliente</translation>
     </message>
     <message>
@@ -1149,6 +1624,10 @@
         <source>Ping Wait</source>
         <translation>Espera de ping</translation>
     </message>
+    <message>
+        <source>Min Ping</source>
+        <translation>Ping min</translation>
+    </message>
     <message>
         <source>Time Offset</source>
         <translation>Offset de tempo</translation>
@@ -1187,20 +1666,12 @@
     </message>
     <message>
         <source>Debug log file</source>
-        <translation>Arquivo de log de Depuração</translation>
+        <translation>Arquivo de log de depuração</translation>
     </message>
     <message>
         <source>Clear console</source>
         <translation>Limpar console</translation>
     </message>
-    <message>
-        <source>&amp;Disconnect Node</source>
-        <translation>&amp;Desconectar Nó</translation>
-    </message>
-    <message>
-        <source>Ban Node for</source>
-        <translation>Banir nó por</translation>
-    </message>
     <message>
         <source>1 &amp;hour</source>
         <translation>1 &amp;hora</translation>
@@ -1218,8 +1689,16 @@
         <translation>1 &amp;ano</translation>
     </message>
     <message>
-        <source>&amp;Unban Node</source>
-        <translation>&amp;Desbanir nó</translation>
+        <source>&amp;Disconnect</source>
+        <translation>&amp;Desconectar</translation>
+    </message>
+    <message>
+        <source>Ban for</source>
+        <translation>Banir por</translation>
+    </message>
+    <message>
+        <source>&amp;Unban</source>
+        <translation>&amp;Desbanir</translation>
     </message>
     <message>
         <source>Welcome to the %1 RPC console.</source>
@@ -1233,6 +1712,14 @@
         <source>Type &lt;b&gt;help&lt;/b&gt; for an overview of available commands.</source>
         <translation>Digite &lt;b&gt;help&lt;/b&gt; para uma visão geral dos comandos disponíveis.</translation>
     </message>
+    <message>
+        <source>WARNING: Scammers have been active, telling users to type commands here, stealing their wallet contents. Do not use this console without fully understanding the ramification of a command.</source>
+        <translation>AVISO: Scammers atacam essa área, dizendo aos usuários que comandos digitar aqui, roubando informações da carteira. Não use este console sem entender completamente as ramificações do comando.</translation>
+    </message>
+    <message>
+        <source>Network activity disabled</source>
+        <translation>Atividade da rede disativada</translation>
+    </message>
     <message>
         <source>%1 B</source>
         <translation>%1 B</translation>
@@ -1352,6 +1839,22 @@
         <source>Remove</source>
         <translation>Remover</translation>
     </message>
+    <message>
+        <source>Copy URI</source>
+        <translation>Copiar URI</translation>
+    </message>
+    <message>
+        <source>Copy label</source>
+        <translation>Copiar rótulo</translation>
+    </message>
+    <message>
+        <source>Copy message</source>
+        <translation>Copiar mensagem</translation>
+    </message>
+    <message>
+        <source>Copy amount</source>
+        <translation>Copiar quantia</translation>
+    </message>
 </context>
 <context>
     <name>ReceiveRequestDialog</name>
@@ -1371,6 +1874,73 @@
         <source>&amp;Save Image...</source>
         <translation>&amp;Salvar Imagem...</translation>
     </message>
+    <message>
+        <source>Request payment to %1</source>
+        <translation>Pedido de pagamento para %1</translation>
+    </message>
+    <message>
+        <source>Payment information</source>
+        <translation>Informação do pagamento</translation>
+    </message>
+    <message>
+        <source>URI</source>
+        <translation>URI</translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation>Endereço</translation>
+    </message>
+    <message>
+        <source>Amount</source>
+        <translation>Quantia</translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation>Rótuo</translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation>Mensagem</translation>
+    </message>
+    <message>
+        <source>Resulting URI too long, try to reduce the text for label / message.</source>
+        <translation>URI resultante muito longa. Tente reduzir o texto do rótulo ou da mensagem.</translation>
+    </message>
+    <message>
+        <source>Error encoding URI into QR Code.</source>
+        <translation>Erro ao codigicar o URI em código QR</translation>
+    </message>
+</context>
+<context>
+    <name>RecentRequestsTableModel</name>
+    <message>
+        <source>Date</source>
+        <translation>Data</translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation>Rótuo</translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation>Mensagem</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(sem rótuo)</translation>
+    </message>
+    <message>
+        <source>(no message)</source>
+        <translation>(sem mensagem)</translation>
+    </message>
+    <message>
+        <source>(no amount requested)</source>
+        <translation>(nenhuma quantia solicitada)</translation>
+    </message>
+    <message>
+        <source>Requested</source>
+        <translation>Solicitado</translation>
+    </message>
 </context>
 <context>
     <name>SendCoinsDialog</name>
@@ -1406,10 +1976,6 @@
         <source>Amount:</source>
         <translation>Quantia:</translation>
     </message>
-    <message>
-        <source>Priority:</source>
-        <translation>Prioridade:</translation>
-    </message>
     <message>
         <source>Fee:</source>
         <translation>Taxa:</translation>
@@ -1475,253 +2041,930 @@
         <translation>Personalizado:</translation>
     </message>
     <message>
-        <source>(Smart fee not initialized yet. This usually takes a few blocks...)</source>
-        <translation>(Smart fee não iniciado. Isso requer alguns blocos...)</translation>
+        <source>(Smart fee not initialized yet. This usually takes a few blocks...)</source>
+        <translation>(Smart fee não iniciado. Isso requer alguns blocos...)</translation>
+    </message>
+    <message>
+        <source>normal</source>
+        <translation>normal</translation>
+    </message>
+    <message>
+        <source>fast</source>
+        <translation>rápido </translation>
+    </message>
+    <message>
+        <source>Send to multiple recipients at once</source>
+        <translation>Enviar para vários destinatários de uma só vez</translation>
+    </message>
+    <message>
+        <source>Add &amp;Recipient</source>
+        <translation>Adicionar destinatário</translation>
+    </message>
+    <message>
+        <source>Clear all fields of the form.</source>
+        <translation>Limpar todos os campos do formulário.</translation>
+    </message>
+    <message>
+        <source>Dust:</source>
+        <translation>Poeira:</translation>
+    </message>
+    <message>
+        <source>Confirmation time target:</source>
+        <translation>Confirmando tempo alvo:</translation>
+    </message>
+    <message>
+        <source>Clear &amp;All</source>
+        <translation>Limpar Tudo</translation>
+    </message>
+    <message>
+        <source>Balance:</source>
+        <translation>Saldo:</translation>
+    </message>
+    <message>
+        <source>Confirm the send action</source>
+        <translation>Confirmar o envio</translation>
+    </message>
+    <message>
+        <source>S&amp;end</source>
+        <translation>Enviar</translation>
+    </message>
+    <message>
+        <source>Copy quantity</source>
+        <translation>Copiar quantia</translation>
+    </message>
+    <message>
+        <source>Copy amount</source>
+        <translation>Copiar quantia</translation>
+    </message>
+    <message>
+        <source>Copy fee</source>
+        <translation>Copiar taxa</translation>
+    </message>
+    <message>
+        <source>Copy after fee</source>
+        <translation>Copiar pós taxa</translation>
+    </message>
+    <message>
+        <source>Copy bytes</source>
+        <translation>Copiar bytes</translation>
+    </message>
+    <message>
+        <source>Copy dust</source>
+        <translation>Copiar poeira</translation>
+    </message>
+    <message>
+        <source>Copy change</source>
+        <translation>Copiar troco</translation>
+    </message>
+    <message>
+        <source>%1 to %2</source>
+        <translation>%1 a %2</translation>
+    </message>
+    <message>
+        <source>Are you sure you want to send?</source>
+        <translation>Tem certeza que deseja enviar?</translation>
+    </message>
+    <message>
+        <source>added as transaction fee</source>
+        <translation>adicionado como taxa da transação </translation>
+    </message>
+    <message>
+        <source>Total Amount %1</source>
+        <translation>Quantia tota %1</translation>
+    </message>
+    <message>
+        <source>or</source>
+        <translation>ou</translation>
+    </message>
+    <message>
+        <source>Confirm send coins</source>
+        <translation>Confirme o envio de moedas</translation>
+    </message>
+    <message>
+        <source>The recipient address is not valid. Please recheck.</source>
+        <translation>Endereço de envio inváido. Favor checar.</translation>
+    </message>
+    <message>
+        <source>The amount to pay must be larger than 0.</source>
+        <translation>A quantia à pagar deve ser maior que 0</translation>
+    </message>
+    <message>
+        <source>The amount exceeds your balance.</source>
+        <translation>A quantia excede o seu saldo</translation>
+    </message>
+    <message>
+        <source>The total exceeds your balance when the %1 transaction fee is included.</source>
+        <translation>O total excede o seu saldo quando a taxa da transação %1 é incluída</translation>
+    </message>
+    <message>
+        <source>Duplicate address found: addresses should only be used once each.</source>
+        <translation>Endereço duplicado encontrado: Endereços devem ser usados somente uma vez cada.</translation>
+    </message>
+    <message>
+        <source>Transaction creation failed!</source>
+        <translation>Falha na criação da transação</translation>
+    </message>
+    <message>
+        <source>The transaction was rejected with the following reason: %1</source>
+        <translation>A transação foi negada pela seguinte razão: %1</translation>
+    </message>
+    <message>
+        <source>A fee higher than %1 is considered an absurdly high fee.</source>
+        <translation>Uma taxa maior que %1 é considerada uma taxa absurdamente alta.</translation>
+    </message>
+    <message>
+        <source>Payment request expired.</source>
+        <translation>Pedido de pagamento expirado</translation>
+    </message>
+    <message numerus="yes">
+        <source>%n block(s)</source>
+        <translation><numerusform>%n bloco</numerusform><numerusform>%n blocos</numerusform></translation>
+    </message>
+    <message>
+        <source>Pay only the required fee of %1</source>
+        <translation>Pagar somente a taxa requerida de %1</translation>
+    </message>
+    <message numerus="yes">
+        <source>Estimated to begin confirmation within %n block(s).</source>
+        <translation><numerusform>Confirmação em %n bloco.</numerusform><numerusform>Confirmação em %n blocos.</numerusform></translation>
+    </message>
+    <message>
+        <source>Warning: Invalid Bitcoin address</source>
+        <translation>Aviso: Endereço inválido</translation>
+    </message>
+    <message>
+        <source>Warning: Unknown change address</source>
+        <translation>Aviso: Endereço de troco inválido</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(sem rótuo)</translation>
+    </message>
+</context>
+<context>
+    <name>SendCoinsEntry</name>
+    <message>
+        <source>A&amp;mount:</source>
+        <translation>Q&amp;uantidade:</translation>
+    </message>
+    <message>
+        <source>Pay &amp;To:</source>
+        <translation>Pagar &amp;Para:</translation>
+    </message>
+    <message>
+        <source>&amp;Label:</source>
+        <translation>&amp;Rótulo:</translation>
+    </message>
+    <message>
+        <source>Choose previously used address</source>
+        <translation>Escolher endereço usado anteriormente</translation>
+    </message>
+    <message>
+        <source>This is a normal payment.</source>
+        <translation>Este é um pagamento normal.</translation>
+    </message>
+    <message>
+        <source>The Bitcoin address to send the payment to</source>
+        <translation>Endereço que enviará o pagamento</translation>
+    </message>
+    <message>
+        <source>Alt+A</source>
+        <translation>Alt+A</translation>
+    </message>
+    <message>
+        <source>Paste address from clipboard</source>
+        <translation>Colar o endereço da área de transferência</translation>
+    </message>
+    <message>
+        <source>Alt+P</source>
+        <translation>Alt+P</translation>
+    </message>
+    <message>
+        <source>Remove this entry</source>
+        <translation>Remover esta entrada</translation>
+    </message>
+    <message>
+        <source>The fee will be deducted from the amount being sent. The recipient will receive less bitcoins than you enter in the amount field. If multiple recipients are selected, the fee is split equally.</source>
+        <translation>A taxa será deduzida da quantia que está sendo enviada. O destinatário receberá menos bitcoins do que você colocou no campo de quantidade. Se vários destinatários estão selecionados, a taxa é dividida igualmente.</translation>
+    </message>
+    <message>
+        <source>S&amp;ubtract fee from amount</source>
+        <translation>&amp;Retirar taxa da quantia</translation>
+    </message>
+    <message>
+        <source>Message:</source>
+        <translation>Mensagem:</translation>
+    </message>
+    <message>
+        <source>This is an unauthenticated payment request.</source>
+        <translation>Esta é uma cobrança não autenticada.</translation>
+    </message>
+    <message>
+        <source>This is an authenticated payment request.</source>
+        <translation>Esta é uma cobrança autenticada.</translation>
+    </message>
+    <message>
+        <source>Enter a label for this address to add it to the list of used addresses</source>
+        <translation>Digite um rótulo para este endereço para adicioná-lo no catálogo</translation>
+    </message>
+    <message>
+        <source>A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
+        <translation>A mensagem que foi anexada ao bitcoin: URI na qual será gravada na transação para sua referência. Nota: Essa mensagem não será gravada publicamente na rede Bitcoin.</translation>
+    </message>
+    <message>
+        <source>Pay To:</source>
+        <translation>Pague Para:</translation>
+    </message>
+    <message>
+        <source>Memo:</source>
+        <translation>Memorizar:</translation>
+    </message>
+    <message>
+        <source>Enter a label for this address to add it to your address book</source>
+        <translation>Digite um rótulo para este endereço para adicioná-lo ao catálogo de endereços</translation>
+    </message>
+</context>
+<context>
+    <name>SendConfirmationDialog</name>
+    <message>
+        <source>Yes</source>
+        <translation>Sim</translation>
+    </message>
+</context>
+<context>
+    <name>ShutdownWindow</name>
+    <message>
+        <source>%1 is shutting down...</source>
+        <translation>%1 está desligando...</translation>
+    </message>
+    <message>
+        <source>Do not shut down the computer until this window disappears.</source>
+        <translation>Não desligue o computador até que esta janela desapareça.</translation>
+    </message>
+</context>
+<context>
+    <name>SignVerifyMessageDialog</name>
+    <message>
+        <source>Signatures - Sign / Verify a Message</source>
+        <translation>Assinaturas - Assinar / Verificar uma mensagem</translation>
+    </message>
+    <message>
+        <source>&amp;Sign Message</source>
+        <translation>&amp;Assinar mensagem</translation>
+    </message>
+    <message>
+        <source>You can sign messages/agreements with your addresses to prove you can receive bitcoins sent to them. Be careful not to sign anything vague or random, as phishing attacks may try to trick you into signing your identity over to them. Only sign fully-detailed statements you agree to.</source>
+        <translation>Você pode assinar mensagens com seus endereços para provar que você pode receber bitcoins enviados por alguém. Cuidado para não assinar nada vago ou aleatório, pois ataques phishing podem tentar te enganar para assinar coisas para eles como se fosse você. Somente assine termos bem detalhados que você concorde.</translation>
+    </message>
+    <message>
+        <source>The Bitcoin address to sign the message with</source>
+        <translation>O enderesso Bitcoin que assinará a mensagem</translation>
+    </message>
+    <message>
+        <source>Choose previously used address</source>
+        <translation>Escolha um endereço usado anteriormente</translation>
+    </message>
+    <message>
+        <source>Alt+A</source>
+        <translation>Alt+A</translation>
+    </message>
+    <message>
+        <source>Paste address from clipboard</source>
+        <translation>Colar o endereço da área de transferência</translation>
+    </message>
+    <message>
+        <source>Alt+P</source>
+        <translation>Alt+P</translation>
+    </message>
+    <message>
+        <source>Enter the message you want to sign here</source>
+        <translation>Entre a mensagem que você quer assinar aqui</translation>
+    </message>
+    <message>
+        <source>Signature</source>
+        <translation>Assinatura</translation>
+    </message>
+    <message>
+        <source>Copy the current signature to the system clipboard</source>
+        <translation>Copiar a assinatura para a área de transferência do sistema</translation>
+    </message>
+    <message>
+        <source>Sign the message to prove you own this Bitcoin address</source>
+        <translation>Assinar mensagem para provar que você é dono deste endereço Bitcoin</translation>
+    </message>
+    <message>
+        <source>Sign &amp;Message</source>
+        <translation>Assinar &amp;mensagem</translation>
+    </message>
+    <message>
+        <source>Reset all sign message fields</source>
+        <translation>Limpar todos os campos de assinatura da mensagem</translation>
+    </message>
+    <message>
+        <source>Clear &amp;All</source>
+        <translation>Limpar Tudo</translation>
+    </message>
+    <message>
+        <source>&amp;Verify Message</source>
+        <translation>&amp;Verificar mensagem</translation>
+    </message>
+    <message>
+        <source>Enter the receiver's address, message (ensure you copy line breaks, spaces, tabs, etc. exactly) and signature below to verify the message. Be careful not to read more into the signature than what is in the signed message itself, to avoid being tricked by a man-in-the-middle attack. Note that this only proves the signing party receives with the address, it cannot prove sendership of any transaction!</source>
+        <translation>Coloque o endereço do autor, a mensagem (certifique-se de copiar toda a mensagem, incluindo quebras de linha, espaços, tabulações, etc.) e a assinatura embaixo para verificar a mensagem. Cuidado para não ler mais da assinatura do que está assinado na mensagem, para evitar ser enganado pelo ataque man-in-the-middle. Note que isso somente prova a propriedade de um endereço, e não o remetende de qualquer transação.</translation>
+    </message>
+    <message>
+        <source>The Bitcoin address the message was signed with</source>
+        <translation>O enderesso Bitcoin que assionou a mesnagem</translation>
+    </message>
+    <message>
+        <source>Verify the message to ensure it was signed with the specified Bitcoin address</source>
+        <translation>Verificar mensagem para se assegurar que ela foi assinada pelo dono de um endereço Bitcoin específico.</translation>
+    </message>
+    <message>
+        <source>Verify &amp;Message</source>
+        <translation>Verificar &amp;mensagem</translation>
+    </message>
+    <message>
+        <source>Reset all verify message fields</source>
+        <translation>Limpar todos os campos de assinatura da mensagem</translation>
+    </message>
+    <message>
+        <source>Click "Sign Message" to generate signature</source>
+        <translation>Clique em "Assinar mensagem" para gerar a assinatura</translation>
+    </message>
+    <message>
+        <source>The entered address is invalid.</source>
+        <translation>O endereço digitado é inválido</translation>
+    </message>
+    <message>
+        <source>Please check the address and try again.</source>
+        <translation>Favor checar o endereço e tente novamente</translation>
+    </message>
+    <message>
+        <source>The entered address does not refer to a key.</source>
+        <translation>O endereço fornecido não se refere a uma chave.</translation>
+    </message>
+    <message>
+        <source>Wallet unlock was cancelled.</source>
+        <translation>O desbloqueio da carteira foi cancelado</translation>
+    </message>
+    <message>
+        <source>Private key for the entered address is not available.</source>
+        <translation>A chave privada do endereço inserido não está disponível</translation>
+    </message>
+    <message>
+        <source>Message signing failed.</source>
+        <translation>Falha ao assinar mensagem</translation>
+    </message>
+    <message>
+        <source>Message signed.</source>
+        <translation>Mensagem assinada</translation>
+    </message>
+    <message>
+        <source>The signature could not be decoded.</source>
+        <translation>A assinatura não pode ser descodificada</translation>
+    </message>
+    <message>
+        <source>Please check the signature and try again.</source>
+        <translation>Favor checar a assinatura e tente novamente</translation>
+    </message>
+    <message>
+        <source>The signature did not match the message digest.</source>
+        <translation>A assinatura não corresponde a mensagem</translation>
+    </message>
+    <message>
+        <source>Message verification failed.</source>
+        <translation>Falha na verificação da mensagem</translation>
+    </message>
+    <message>
+        <source>Message verified.</source>
+        <translation>Mensagem verificada</translation>
+    </message>
+</context>
+<context>
+    <name>SplashScreen</name>
+    <message>
+        <source>[testnet]</source>
+        <translation>[testnet]</translation>
+    </message>
+</context>
+<context>
+    <name>TrafficGraphWidget</name>
+    <message>
+        <source>KB/s</source>
+        <translation>KB/s</translation>
+    </message>
+</context>
+<context>
+    <name>TransactionDesc</name>
+    <message numerus="yes">
+        <source>Open for %n more block(s)</source>
+        <translation><numerusform>Abrir para mais %n bloco</numerusform><numerusform>Abrir para mais %n blocos</numerusform></translation>
+    </message>
+    <message>
+        <source>Open until %1</source>
+        <translation>Aberto até %1</translation>
+    </message>
+    <message>
+        <source>conflicted with a transaction with %1 confirmations</source>
+        <translation>conflitado com uma transação com %1 confirmações</translation>
+    </message>
+    <message>
+        <source>%1/offline</source>
+        <translation>%1/offline</translation>
+    </message>
+    <message>
+        <source>0/unconfirmed, %1</source>
+        <translation>0/não confirmado, %1</translation>
+    </message>
+    <message>
+        <source>in memory pool</source>
+        <translation>na memória</translation>
+    </message>
+    <message>
+        <source>not in memory pool</source>
+        <translation>não na memóra</translation>
+    </message>
+    <message>
+        <source>abandoned</source>
+        <translation>abandonado</translation>
+    </message>
+    <message>
+        <source>%1/unconfirmed</source>
+        <translation>%1/não confirmado</translation>
+    </message>
+    <message>
+        <source>%1 confirmations</source>
+        <translation>%1 confirmações</translation>
+    </message>
+    <message>
+        <source>Status</source>
+        <translation>Status</translation>
+    </message>
+    <message>
+        <source>, has not been successfully broadcast yet</source>
+        <translation>, ainda não foi propagada na rede com êxito.</translation>
+    </message>
+    <message numerus="yes">
+        <source>, broadcast through %n node(s)</source>
+        <translation><numerusform>, transmitido aravés de %n nó</numerusform><numerusform>, transmitido aravés de %n nós</numerusform></translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation>Data</translation>
+    </message>
+    <message>
+        <source>Source</source>
+        <translation>Fonte</translation>
+    </message>
+    <message>
+        <source>Generated</source>
+        <translation>Gerado</translation>
+    </message>
+    <message>
+        <source>From</source>
+        <translation>De</translation>
+    </message>
+    <message>
+        <source>unknown</source>
+        <translation>desconhecido</translation>
+    </message>
+    <message>
+        <source>To</source>
+        <translation>Para</translation>
+    </message>
+    <message>
+        <source>own address</source>
+        <translation>próprio endereço</translation>
+    </message>
+    <message>
+        <source>watch-only</source>
+        <translation>monitorado</translation>
+    </message>
+    <message>
+        <source>label</source>
+        <translation>rótulo</translation>
+    </message>
+    <message>
+        <source>Credit</source>
+        <translation>Crédito</translation>
+    </message>
+    <message numerus="yes">
+        <source>matures in %n more block(s)</source>
+        <translation><numerusform>maduro em mais %n bloco</numerusform><numerusform>maduro em mais %n blocos</numerusform></translation>
+    </message>
+    <message>
+        <source>not accepted</source>
+        <translation>não aceito</translation>
+    </message>
+    <message>
+        <source>Debit</source>
+        <translation>Débito</translation>
+    </message>
+    <message>
+        <source>Total debit</source>
+        <translation>Débito total</translation>
+    </message>
+    <message>
+        <source>Total credit</source>
+        <translation>Crédito total</translation>
+    </message>
+    <message>
+        <source>Transaction fee</source>
+        <translation>Taxa da transação</translation>
+    </message>
+    <message>
+        <source>Net amount</source>
+        <translation>Valor líquido</translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation>Mensagem</translation>
+    </message>
+    <message>
+        <source>Comment</source>
+        <translation>Comentário</translation>
+    </message>
+    <message>
+        <source>Transaction ID</source>
+        <translation>ID da transação</translation>
+    </message>
+    <message>
+        <source>Transaction total size</source>
+        <translation>Tamanho tota da transação</translation>
+    </message>
+    <message>
+        <source>Output index</source>
+        <translation>Index da saída</translation>
+    </message>
+    <message>
+        <source>Merchant</source>
+        <translation>Mercador</translation>
+    </message>
+    <message>
+        <source>Generated coins must mature %1 blocks before they can be spent. When you generated this block, it was broadcast to the network to be added to the block chain. If it fails to get into the chain, its state will change to "not accepted" and it won't be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source>
+        <translation>Moedas recém minerados precisam aguardar %1 blocos antes de serem gastos. Quando o bloco foi gerado, ele foi disseminado pela rede para ser adicionado à blockchain. Se ele falhar em ser inserido na cadeia, seu estado será modificado para "não aceito" e ele não poderá ser gasto. Isso pode acontecer eventualmente quando blocos são gerados quase que simultaneamente.</translation>
+    </message>
+    <message>
+        <source>Debug information</source>
+        <translation>Depurar informação</translation>
+    </message>
+    <message>
+        <source>Transaction</source>
+        <translation>Transação</translation>
+    </message>
+    <message>
+        <source>Inputs</source>
+        <translation>Entradas</translation>
+    </message>
+    <message>
+        <source>Amount</source>
+        <translation>Quantia</translation>
+    </message>
+    <message>
+        <source>true</source>
+        <translation>verdadeiro</translation>
+    </message>
+    <message>
+        <source>false</source>
+        <translation>falso</translation>
+    </message>
+</context>
+<context>
+    <name>TransactionDescDialog</name>
+    <message>
+        <source>This pane shows a detailed description of the transaction</source>
+        <translation>Este painel mostra uma descrição detalhada da transação</translation>
+    </message>
+    <message>
+        <source>Details for %1</source>
+        <translation>Detalhes para %1</translation>
+    </message>
+</context>
+<context>
+    <name>TransactionTableModel</name>
+    <message>
+        <source>Date</source>
+        <translation>Data</translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation>Tipo</translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation>Rótuo</translation>
+    </message>
+    <message numerus="yes">
+        <source>Open for %n more block(s)</source>
+        <translation><numerusform>Aberto por mais %n bloco</numerusform><numerusform>Aberto por mais %n blocos</numerusform></translation>
+    </message>
+    <message>
+        <source>Open until %1</source>
+        <translation>Aberto até %1</translation>
+    </message>
+    <message>
+        <source>Offline</source>
+        <translation>Offline</translation>
+    </message>
+    <message>
+        <source>Unconfirmed</source>
+        <translation>Não confirmado</translation>
+    </message>
+    <message>
+        <source>Abandoned</source>
+        <translation>Abandonado</translation>
+    </message>
+    <message>
+        <source>Confirming (%1 of %2 recommended confirmations)</source>
+        <translation>Confirmando (%1 de %2 confirmações recomendadas)</translation>
+    </message>
+    <message>
+        <source>Confirmed (%1 confirmations)</source>
+        <translation>Confirmado (%1 confirmações)</translation>
+    </message>
+    <message>
+        <source>Conflicted</source>
+        <translation>Conflitado</translation>
+    </message>
+    <message>
+        <source>Immature (%1 confirmations, will be available after %2)</source>
+        <translation>Recém-criado (%1 confirmações, disponível somente após %2)</translation>
+    </message>
+    <message>
+        <source>This block was not received by any other nodes and will probably not be accepted!</source>
+        <translation>Este bloco não foi recebido por nenhum outro participante da rede e provavelmente não será aceito!</translation>
+    </message>
+    <message>
+        <source>Generated but not accepted</source>
+        <translation>Gerado mas não aceito</translation>
     </message>
     <message>
-        <source>Confirmation time:</source>
-        <translation>Tempo de confirmação:</translation>
+        <source>Received with</source>
+        <translation>Recebido</translation>
     </message>
     <message>
-        <source>normal</source>
-        <translation>normal</translation>
+        <source>Received from</source>
+        <translation>Recebido</translation>
     </message>
     <message>
-        <source>fast</source>
-        <translation>rápido </translation>
+        <source>Sent to</source>
+        <translation>Enviado para</translation>
     </message>
     <message>
-        <source>Send to multiple recipients at once</source>
-        <translation>Enviar para vários destinatários de uma só vez</translation>
+        <source>Payment to yourself</source>
+        <translation>Pagamento para você mesmo</translation>
     </message>
     <message>
-        <source>Add &amp;Recipient</source>
-        <translation>Adicionar destinatário</translation>
+        <source>Mined</source>
+        <translation>Minerado</translation>
     </message>
     <message>
-        <source>Clear all fields of the form.</source>
-        <translation>Limpar todos os campos do formulário.</translation>
+        <source>watch-only</source>
+        <translation>monitorado</translation>
     </message>
     <message>
-        <source>Dust:</source>
-        <translation>Poeira:</translation>
+        <source>(n/a)</source>
+        <translation>(n/a)</translation>
     </message>
     <message>
-        <source>Clear &amp;All</source>
-        <translation>Limpar Tudo</translation>
+        <source>(no label)</source>
+        <translation>(sem rótuo)</translation>
     </message>
     <message>
-        <source>Balance:</source>
-        <translation>Saldo:</translation>
+        <source>Transaction status. Hover over this field to show number of confirmations.</source>
+        <translation>Status da transação. Passe o mouse sobre este campo para mostrar o número de confirmações.</translation>
     </message>
     <message>
-        <source>Confirm the send action</source>
-        <translation>Confirmar o envio</translation>
+        <source>Date and time that the transaction was received.</source>
+        <translation>Data e hora em que a transação foi recebida.</translation>
     </message>
     <message>
-        <source>S&amp;end</source>
-        <translation>Enviar</translation>
+        <source>Type of transaction.</source>
+        <translation>Tipo de transação</translation>
     </message>
-</context>
-<context>
-    <name>SendCoinsEntry</name>
     <message>
-        <source>A&amp;mount:</source>
-        <translation>Q&amp;uantidade:</translation>
+        <source>Whether or not a watch-only address is involved in this transaction.</source>
+        <translation>Mostrar ou não endereços monitorados na lista de transações.</translation>
     </message>
     <message>
-        <source>Pay &amp;To:</source>
-        <translation>Pagar &amp;Para:</translation>
+        <source>User-defined intent/purpose of the transaction.</source>
+        <translation>Intenção/Propósito definido pelo usuário para a transação</translation>
     </message>
     <message>
-        <source>&amp;Label:</source>
-        <translation>&amp;Rótulo:</translation>
+        <source>Amount removed from or added to balance.</source>
+        <translation>Quantidade debitada ou creditada ao saldo.</translation>
     </message>
+</context>
+<context>
+    <name>TransactionView</name>
     <message>
-        <source>Choose previously used address</source>
-        <translation>Escolher endereço usado anteriormente</translation>
+        <source>All</source>
+        <translation>Todos</translation>
     </message>
     <message>
-        <source>This is a normal payment.</source>
-        <translation>Este é um pagamento normal.</translation>
+        <source>Today</source>
+        <translation>Hoje</translation>
     </message>
     <message>
-        <source>The Bitcoin address to send the payment to</source>
-        <translation>Endereço que enviará o pagamento</translation>
+        <source>This week</source>
+        <translation>Essa semana</translation>
     </message>
     <message>
-        <source>Alt+A</source>
-        <translation>Alt+A</translation>
+        <source>This month</source>
+        <translation>Esse mês</translation>
     </message>
     <message>
-        <source>Paste address from clipboard</source>
-        <translation>Colar o endereço da área de transferência</translation>
+        <source>Last month</source>
+        <translation>Último mês</translation>
     </message>
     <message>
-        <source>Alt+P</source>
-        <translation>Alt+P</translation>
+        <source>This year</source>
+        <translation>Este ano</translation>
     </message>
     <message>
-        <source>Remove this entry</source>
-        <translation>Remover esta entrada</translation>
+        <source>Range...</source>
+        <translation>Intervalo...</translation>
     </message>
     <message>
-        <source>The fee will be deducted from the amount being sent. The recipient will receive less bitcoins than you enter in the amount field. If multiple recipients are selected, the fee is split equally.</source>
-        <translation>A taxa será deduzida da quantia sendo enviada. O destinatário receberá menos bitcoins do que você colocou no campo de quantidade. Se varios destinatários estão selecionados, a taxa é dividida igualmente.</translation>
+        <source>Received with</source>
+        <translation>Recebido</translation>
     </message>
     <message>
-        <source>S&amp;ubtract fee from amount</source>
-        <translation>&amp;Retirar taxa da quantia</translation>
+        <source>Sent to</source>
+        <translation>Enviado para</translation>
     </message>
     <message>
-        <source>Message:</source>
-        <translation>Mensagem:</translation>
+        <source>To yourself</source>
+        <translation>Para você mesmo</translation>
     </message>
     <message>
-        <source>This is an unauthenticated payment request.</source>
-        <translation>Esta é uma cobrança não autenticada.</translation>
+        <source>Mined</source>
+        <translation>Minerado</translation>
     </message>
     <message>
-        <source>This is an authenticated payment request.</source>
-        <translation>Esta é uma cobrança autenticada.</translation>
+        <source>Other</source>
+        <translation>Outro</translation>
     </message>
     <message>
-        <source>Enter a label for this address to add it to the list of used addresses</source>
-        <translation>Digite um rótulo para este endereço para adicioná-lo no catálogo</translation>
+        <source>Enter address or label to search</source>
+        <translation>Procure um endereço ou rótulo</translation>
     </message>
     <message>
-        <source>A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
-        <translation>A mensagem que foi anexada ao bitcoin: URI na qual será gravada na transação para sua referência. Nota: Essa mensagem não será gravada publicamente na rede Bitcoin.</translation>
+        <source>Min amount</source>
+        <translation>Quantia mínima</translation>
     </message>
     <message>
-        <source>Pay To:</source>
-        <translation>Pague Para:</translation>
+        <source>Abandon transaction</source>
+        <translation>Transação abandonada</translation>
     </message>
     <message>
-        <source>Memo:</source>
-        <translation>Memorizar:</translation>
+        <source>Copy address</source>
+        <translation>Copiar endereço</translation>
     </message>
-</context>
-<context>
-    <name>ShutdownWindow</name>
     <message>
-        <source>Do not shut down the computer until this window disappears.</source>
-        <translation>Não desligue o computador até que esta janela desapareça.</translation>
+        <source>Copy label</source>
+        <translation>Copiar rótulo</translation>
     </message>
-</context>
-<context>
-    <name>SignVerifyMessageDialog</name>
     <message>
-        <source>Signatures - Sign / Verify a Message</source>
-        <translation>Assinaturas - Assinar / Verificar uma mensagem</translation>
+        <source>Copy amount</source>
+        <translation>Copiar quantia</translation>
     </message>
     <message>
-        <source>&amp;Sign Message</source>
-        <translation>&amp;Assinar mensagem</translation>
+        <source>Copy transaction ID</source>
+        <translation>Copiar ID da transação</translation>
     </message>
     <message>
-        <source>You can sign messages/agreements with your addresses to prove you can receive bitcoins sent to them. Be careful not to sign anything vague or random, as phishing attacks may try to trick you into signing your identity over to them. Only sign fully-detailed statements you agree to.</source>
-        <translation>Você pode assinar mensagens com seus endereços para provar que você pode receber bitcoins enviados por alguém. Cuidado para não assinar nada vago ou aleatório, pois ataques phishing podem tentar te enganar para assinar coisas para eles como se fosse você. Somente assine termos bem detalhados que você concorde.</translation>
+        <source>Copy raw transaction</source>
+        <translation>Copiar o raw da transação</translation>
     </message>
     <message>
-        <source>The Bitcoin address to sign the message with</source>
-        <translation>O enderesso Bitcoin que assinará a mensagem</translation>
+        <source>Copy full transaction details</source>
+        <translation>Copiar dados completos da transação</translation>
     </message>
     <message>
-        <source>Choose previously used address</source>
-        <translation>Escolha um endereço usado anteriormente</translation>
+        <source>Edit label</source>
+        <translation>Editar rótulo</translation>
     </message>
     <message>
-        <source>Alt+A</source>
-        <translation>Alt+A</translation>
+        <source>Show transaction details</source>
+        <translation>Mostrar detalhes da transação</translation>
     </message>
     <message>
-        <source>Paste address from clipboard</source>
-        <translation>Colar o endereço da área de transferência</translation>
+        <source>Export Transaction History</source>
+        <translation>Exportar histórico de transações</translation>
     </message>
     <message>
-        <source>Alt+P</source>
-        <translation>Alt+P</translation>
+        <source>Comma separated file (*.csv)</source>
+        <translation>Comma separated file (*.csv)</translation>
     </message>
     <message>
-        <source>Enter the message you want to sign here</source>
-        <translation>Entre a mensagem que você quer assinar aqui</translation>
+        <source>Confirmed</source>
+        <translation>Confirmado</translation>
     </message>
     <message>
-        <source>Signature</source>
-        <translation>Assinatura</translation>
+        <source>Watch-only</source>
+        <translation>Monitorado</translation>
     </message>
     <message>
-        <source>Copy the current signature to the system clipboard</source>
-        <translation>Copiar a assinatura para a área de transferência do sistema</translation>
+        <source>Date</source>
+        <translation>Data</translation>
     </message>
     <message>
-        <source>Sign the message to prove you own this Bitcoin address</source>
-        <translation>Assinar mensagem para provar que você é dono deste endereço Bitcoin</translation>
+        <source>Type</source>
+        <translation>Tipo</translation>
     </message>
     <message>
-        <source>Sign &amp;Message</source>
-        <translation>Assinar &amp;mensagem</translation>
+        <source>Label</source>
+        <translation>Rótuo</translation>
     </message>
     <message>
-        <source>Reset all sign message fields</source>
-        <translation>Limpar todos os campos de assinatura da mensagem</translation>
+        <source>Address</source>
+        <translation>Endereço</translation>
     </message>
     <message>
-        <source>Clear &amp;All</source>
-        <translation>Limpar Tudo</translation>
+        <source>ID</source>
+        <translation>ID</translation>
     </message>
     <message>
-        <source>&amp;Verify Message</source>
-        <translation>&amp;Verificar mensagem</translation>
+        <source>Exporting Failed</source>
+        <translation>Falha na exportação</translation>
     </message>
     <message>
-        <source>Enter the receiver's address, message (ensure you copy line breaks, spaces, tabs, etc. exactly) and signature below to verify the message. Be careful not to read more into the signature than what is in the signed message itself, to avoid being tricked by a man-in-the-middle attack. Note that this only proves the signing party receives with the address, it cannot prove sendership of any transaction!</source>
-        <translation>Coloque o endereço do autor, a mensagem (certifique-se de copiar toda a mensagem, incluindo quebras de linha, espaços, tabulações, etc.) e a assinatura embaixo para verificar a mensagem. Cuidado para não ler mais da assinatura do que está assinado na mensagem, para evitar ser enganado pelo ataque man-in-the-middle. Note que isso somente prova a propriedade de um endereço, e não o remetende de qualquer transação.</translation>
+        <source>There was an error trying to save the transaction history to %1.</source>
+        <translation>Ocorreu um erro ao tentar salvar o histórico de transações em %1.</translation>
     </message>
     <message>
-        <source>The Bitcoin address the message was signed with</source>
-        <translation>O enderesso Bitcoin que assionou a mesnagem</translation>
+        <source>Exporting Successful</source>
+        <translation>Exportação feita com êxito</translation>
     </message>
     <message>
-        <source>Verify the message to ensure it was signed with the specified Bitcoin address</source>
-        <translation>Verificar mensagem para se assegurar que ela foi assinada pelo dono de um endereço Bitcoin específico.</translation>
+        <source>The transaction history was successfully saved to %1.</source>
+        <translation>O histórico de transação foi gravado com êxito em %1.</translation>
     </message>
     <message>
-        <source>Verify &amp;Message</source>
-        <translation>Verificar &amp;mensagem</translation>
+        <source>Range:</source>
+        <translation>Intervalo: </translation>
     </message>
     <message>
-        <source>Reset all verify message fields</source>
-        <translation>Limpar todos os campos de assinatura da mensagem</translation>
+        <source>to</source>
+        <translation>para</translation>
     </message>
 </context>
 <context>
-    <name>SplashScreen</name>
+    <name>UnitDisplayStatusBarControl</name>
     <message>
-        <source>[testnet]</source>
-        <translation>[testnet]</translation>
+        <source>Unit to show amounts in. Click to select another unit.</source>
+        <translation>Unidade para mostrar. Clique para selecionar outra unidade.</translation>
     </message>
 </context>
 <context>
-    <name>TrafficGraphWidget</name>
+    <name>WalletFrame</name>
     <message>
-        <source>KB/s</source>
-        <translation>KB/s</translation>
+        <source>No wallet has been loaded.</source>
+        <translation>Nenhuma carteira carregada</translation>
     </message>
 </context>
 <context>
-    <name>TransactionDescDialog</name>
+    <name>WalletModel</name>
     <message>
-        <source>This pane shows a detailed description of the transaction</source>
-        <translation>Este painel mostra uma descrição detalhada da transação</translation>
+        <source>Send Coins</source>
+        <translation>Enviar moedas</translation>
     </message>
 </context>
 <context>
-    <name>UnitDisplayStatusBarControl</name>
+    <name>WalletView</name>
     <message>
-        <source>Unit to show amounts in. Click to select another unit.</source>
-        <translation>Unidade para mostrar. Clique para selecionar outra unidade.</translation>
+        <source>&amp;Export</source>
+        <translation>&amp;Exportar</translation>
+    </message>
+    <message>
+        <source>Export the data in the current tab to a file</source>
+        <translation>Exportar os dados da guia atual para um arquivo</translation>
+    </message>
+    <message>
+        <source>Backup Wallet</source>
+        <translation>Backup da carteira</translation>
+    </message>
+    <message>
+        <source>Wallet Data (*.dat)</source>
+        <translation>Dados da carteira (*.dat)</translation>
+    </message>
+    <message>
+        <source>Backup Failed</source>
+        <translation>Falha no backup</translation>
+    </message>
+    <message>
+        <source>There was an error trying to save the wallet data to %1.</source>
+        <translation>Ocorreu um erro ao tentar salvar os dados da carteira em %1.</translation>
+    </message>
+    <message>
+        <source>Backup Successful</source>
+        <translation>Êxito no backup</translation>
+    </message>
+    <message>
+        <source>The wallet data was successfully saved to %1.</source>
+        <translation>Os dados da carteira foram salvos com êxito em %1.</translation>
     </message>
 </context>
 <context>
@@ -1746,25 +2989,37 @@
         <source>Accept command line and JSON-RPC commands</source>
         <translation>Aceitar linha de comando e comandos JSON-RPC</translation>
     </message>
+    <message>
+        <source>Accept connections from outside (default: 1 if no -proxy or -connect/-noconnect)</source>
+        <translation>Aceitar conecções de entrada (padrão: 1 sem -proxy ou -connect/-noconnect)</translation>
+    </message>
+    <message>
+        <source>Connect only to the specified node(s); -noconnect or -connect=0 alone to disable automatic connections</source>
+        <translation>Conectar somente a nós específicos; -noconnect ou -connect=0 sozinhos para desativar conecções automáticas</translation>
+    </message>
+    <message>
+        <source>Distributed under the MIT software license, see the accompanying file %s or %s</source>
+        <translation>Distribuído sob a MIT software license, veja o arquivo %s ou %s</translation>
+    </message>
     <message>
         <source>If &lt;category&gt; is not supplied or if &lt;category&gt; = 1, output all debugging information.</source>
         <translation>Se &lt;category&gt; não for suprida ou se &lt;category&gt; = 1, mostrar toda informação de depuração.</translation>
     </message>
     <message>
         <source>Prune configured below the minimum of %d MiB.  Please use a higher number.</source>
-        <translation>Corte configurado abaixo do nível mínimo de %d de MiB. Por favor use um número mais alto.</translation>
+        <translation>Prune configurado abaixo do mínimo de %d MiB. Por favor use um número mais alto.</translation>
     </message>
     <message>
         <source>Prune: last wallet synchronisation goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of pruned node)</source>
-        <translation>Corte: a ultima sincronização da carteira foi além do dado comprimido. Você precisa reindexar ( -reindex , faça o download de toda a blockchain novamente)</translation>
+        <translation>Prune: A ultima sincronização da carteira foi além do dado comprimido. Você precisa reindexar (fazer o download de toda a blockchain novamente)</translation>
     </message>
     <message>
         <source>Reduce storage requirements by pruning (deleting) old blocks. This mode is incompatible with -txindex and -rescan. Warning: Reverting this setting requires re-downloading the entire blockchain. (default: 0 = disable pruning blocks, &gt;%u = target size in MiB to use for block files)</source>
-        <translation>Reduza os requerimentos de armazenamento de dados (cortando) deletando blocos mais antigos. Esse modo é incompatível com -txindex e -rescan. Cuidado: Reverter essa configuração requer um novo download de toda a blockchain. (Padrão: 0 = desabilita o corte de blocos, &gt;%u = tamanho alvo em MiB para o uso de blocos cortados)</translation>
+        <translation>Reduza o armazenamento de dados apagando os blocos mais antigos. Esse modo é incompatível com -txindex e -rescan. Cuidado: Reverter essa configuração requer um novo download de toda a blockchain. (Padrão: 0 = desabilitado, &gt;%u = tamanho em MiB para o uso de blocos cortados)</translation>
     </message>
     <message>
         <source>Rescans are not possible in pruned mode. You will need to use -reindex which will download the whole blockchain again.</source>
-        <translation>Rescans não são possíveis no modo de corte. Você precisa usar -reindex, que irá fazer o download de toda a blockchain novamente.</translation>
+        <translation>Rescans não são possíveis no modo prune. Você precisa usar -reindex, que irá fazer o download de toda a blockchain novamente.</translation>
     </message>
     <message>
         <source>Error: A fatal internal error occurred, see debug.log for details</source>
@@ -1786,17 +3041,13 @@
         <source>Unable to start HTTP server. See debug log for details.</source>
         <translation>Não foi possível iniciar o servidor HTTP. Veja o log para detaihes.</translation>
     </message>
-    <message>
-        <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
-        <translation>Aceitar conexões externas (padrão: 1 se opções -proxy ou -connect não estiverem presentes)</translation>
-    </message>
     <message>
         <source>Bitcoin Core</source>
-        <translation>Bitcoin</translation>
+        <translation>Bitcoin Core</translation>
     </message>
     <message>
-        <source>-fallbackfee is set very high! This is the transaction fee you may pay when fee estimates are not available.</source>
-        <translation>-fallbackfee está muito alta! Essa é a taxa de transação que você vai pagar quando a taxa estimada não estiver disponível.</translation>
+        <source>The %s developers</source>
+        <translation>Desenvolvedores do %s</translation>
     </message>
     <message>
         <source>A fee rate (in %s/kB) that will be used when fee estimation has insufficient data (default: %s)</source>
@@ -1818,10 +3069,6 @@
         <source>Delete all wallet transactions and only recover those parts of the blockchain through -rescan on startup</source>
         <translation>Apaga todas as transações da carteira e somente recupera essas partes da blockchain usando o comando -rescan na inicialização</translation>
     </message>
-    <message>
-        <source>Distributed under the MIT software license, see the accompanying file COPYING or &lt;http://www.opensource.org/licenses/mit-license.php&gt;.</source>
-        <translation>Distribuido sob a licença MIT software license. Veja os termos em &lt;http://www.opensource.org/licenses/mit-license.php&gt;.</translation>
-    </message>
     <message>
         <source>Error loading %s: You can't enable HD on a already existing non-HD wallet</source>
         <translation>Erro ao carregar %s. Não é permitido habilitar HD em carteiras não-HD pre existentes.</translation>
@@ -1834,13 +3081,9 @@
         <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source>
         <translation>Executa um comando quando uma transação da carteira mudar (%s no comando será substituído por TxID)</translation>
     </message>
-    <message>
-        <source>Force relay of transactions from whitelisted peers even they violate local relay policy (default: %d)</source>
-        <translation>Força a retransmissão de transações de pares da lista branca, mesmo quando violam a política local de retransmissão (default: %d)</translation>
-    </message>
     <message>
         <source>Maximum allowed median peer time offset adjustment. Local perspective of time may be influenced by peers forward or backward by this amount. (default: %u seconds)</source>
-        <translation>A mediana máxima permitida de peer time compensa o ajuste. Perspectiva local de horário pode ser influenciada por pares à frente ou atrás neste montante. (padrão: %u segundos)</translation>
+        <translation>A media máxima permitida de peer time compensa o ajuste. Perspectiva local de horário pode ser influenciada por pares à frente ou atrás neste montante. (padrão: %u segundos)</translation>
     </message>
     <message>
         <source>Maximum total fees (in %s) to use in a single wallet transaction or raw transaction; setting this too low may abort large transactions (default: %s)</source>
@@ -1864,23 +3107,35 @@
     </message>
     <message>
         <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
-        <translation>Este pode ser um build de teste pré-lançamento - use por sua conta e risco - não use para mineração ou aplicações de comércio.</translation>
+        <translation>Este é um build de teste pré-lançamento - use por sua conta e risco - não use para mineração ou comércio.</translation>
+    </message>
+    <message>
+        <source>Unable to rewind the database to a pre-fork state. You will need to redownload the blockchain</source>
+        <translation>Não foi possível reanalisar o banco de dados para o estado pre-fork. Você precisa rebaixar o blockchain</translation>
     </message>
     <message>
         <source>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</source>
         <translation>Use UPnP para mapear a porta escutada (padrão: 1 quando escutando e sem -proxy)</translation>
     </message>
+    <message>
+        <source>Wallet will not create transactions that violate mempool chain limits (default: %u)</source>
+        <translation>A carteira não irá criar transações que vioem o imite de memória (padrão: %u)</translation>
+    </message>
     <message>
         <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source>
         <translation>Atenção: A rede não parecem concordar plenamente! Alguns mineiros parecem estar enfrentando problemas.</translation>
     </message>
     <message>
         <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source>
-        <translation>Atenção: Nós não parecemos concordar plenamente com nossos colegas! Você pode precisar atualizar ou outros nós podem precisar atualizar.</translation>
+        <translation>Atenção: Nós não parecemos concordar plenamente com nossos nós! Você pode precisar atualizar ou outros nós podem precisar atualizar.</translation>
+    </message>
+    <message>
+        <source>You need to rebuild the database using -reindex-chainstate to change -txindex</source>
+        <translation>Você precisa reconstruir o banco de dados utilizando -reindex-chainstate para mudar -txindex</translation>
     </message>
     <message>
-        <source>Whitelist peers connecting from the given netmask or IP address. Can be specified multiple times.</source>
-        <translation>Lista Branca pares de ligação da máscara de rede dado ou o endereço IP . Pode ser especificado várias vezes.</translation>
+        <source>%s corrupt, salvage failed</source>
+        <translation>%s corrompido, recuperação falhou</translation>
     </message>
     <message>
         <source>-maxmempool must be at least %d MB</source>
@@ -1903,13 +3158,25 @@
         <translation>Opções de criação de blocos:</translation>
     </message>
     <message>
-        <source>Connect only to the specified node(s)</source>
-        <translation>Conectar apenas a cliente(s) específico(s)</translation>
+        <source>Cannot resolve -%s address: '%s'</source>
+        <translation>Impossível resolver  -%s endereço: '%s'</translation>
+    </message>
+    <message>
+        <source>Chain selection options:</source>
+        <translation>Opções da rede:</translation>
+    </message>
+    <message>
+        <source>Change index out of range</source>
+        <translation>Índice de mudança fora da faixa.</translation>
     </message>
     <message>
         <source>Connection options:</source>
         <translation>Opções de conexão:</translation>
     </message>
+    <message>
+        <source>Copyright (C) %i-%i</source>
+        <translation>Copyright (C) %i-%i</translation>
+    </message>
     <message>
         <source>Corrupted block database detected</source>
         <translation>Detectado Banco de dados de blocos corrompido</translation>
@@ -1954,6 +3221,22 @@
         <source>Error initializing wallet database environment %s!</source>
         <translation>Erro ao inicializar ambiente de banco de dados de carteira %s!</translation>
     </message>
+    <message>
+        <source>Error loading %s</source>
+        <translation>Erro ao carregar %s</translation>
+    </message>
+    <message>
+        <source>Error loading %s: Wallet corrupted</source>
+        <translation>Erro ao carregar %s Carteira corrompida</translation>
+    </message>
+    <message>
+        <source>Error loading %s: Wallet requires newer version of %s</source>
+        <translation>Erro ao carregar %s A carteira requer a versão mais nova do %s</translation>
+    </message>
+    <message>
+        <source>Error loading %s: You can't disable HD on a already existing HD wallet</source>
+        <translation>Erro ao carregar %s: Você não pode desabilitar HD numa já existente carteira HD.</translation>
+    </message>
     <message>
         <source>Error loading block database</source>
         <translation>Erro ao carregar banco de dados de blocos</translation>
@@ -1978,10 +3261,18 @@
         <source>Incorrect or no genesis block found. Wrong datadir for network?</source>
         <translation>Bloco gênese incorreto ou não encontrado. Datadir errado para a rede?</translation>
     </message>
+    <message>
+        <source>Initialization sanity check failed. %s is shutting down.</source>
+        <translation>O teste de integridade de inicialização falhou. O %s está sendo desligado.</translation>
+    </message>
     <message>
         <source>Invalid -onion address: '%s'</source>
         <translation>Endereço -onion inválido: '%s'</translation>
     </message>
+    <message>
+        <source>Invalid amount for -%s=&lt;amount&gt;: '%s'</source>
+        <translation>Valor inválido para -%s=&lt;amount&gt;: '%s'</translation>
+    </message>
     <message>
         <source>Invalid amount for -fallbackfee=&lt;amount&gt;: '%s'</source>
         <translation>Valor inválido para -fallbackfee=&lt;amount&gt;: '%s'</translation>
@@ -1991,12 +3282,12 @@
         <translation>Mantenha a mempool de transações abaixo de &lt;n&gt; megabytes (padrão: %u)</translation>
     </message>
     <message>
-        <source>Location of the auth cookie (default: data dir)</source>
-        <translation>Localização do cookie de autenticação (padrão: diretório de dados)</translation>
+        <source>Loading banlist...</source>
+        <translation>Carregando lista de banidos...</translation>
     </message>
     <message>
-        <source>Minimum bytes per sigop in transactions we relay and mine (default: %u)</source>
-        <translation>Número mínimo de bytes por sigop em transações que transmitimos e mineramos (default: %u)</translation>
+        <source>Location of the auth cookie (default: data dir)</source>
+        <translation>Localização do cookie de autenticação (padrão: diretório de dados)</translation>
     </message>
     <message>
         <source>Not enough file descriptors available.</source>
@@ -2006,17 +3297,33 @@
         <source>Only connect to nodes in network &lt;net&gt; (ipv4, ipv6 or onion)</source>
         <translation>Somente conectar a clientes na rede &lt;net&gt; (ipv4, ipv6 ou onion)</translation>
     </message>
+    <message>
+        <source>Print this help message and exit</source>
+        <translation>Mostra essa mensagem de ajuda e sai</translation>
+    </message>
     <message>
         <source>Print version and exit</source>
-        <translation>Mostra a versão e sai</translation>
+        <translation>Mostra a versão e fecha</translation>
     </message>
     <message>
         <source>Prune cannot be configured with a negative value.</source>
-        <translation>O modo Prune não pode ser configurado com um valor negativo.</translation>
+        <translation>O modo prune não pode ser configurado com um valor negativo.</translation>
     </message>
     <message>
         <source>Prune mode is incompatible with -txindex.</source>
-        <translation>O modo Prune é incompatível com -txindex.</translation>
+        <translation>O modo prune é incompatível com -txindex.</translation>
+    </message>
+    <message>
+        <source>Rebuild chain state and block index from the blk*.dat files on disk</source>
+        <translation>Reconstruir índice de cadeia de bloco a partir dos arquivos blk*.dat no disco</translation>
+    </message>
+    <message>
+        <source>Rebuild chain state from the currently indexed blocks</source>
+        <translation>Reconstruir estado a partir dos blocos indexados</translation>
+    </message>
+    <message>
+        <source>Rewinding blocks...</source>
+        <translation>Reanalizando blocos...</translation>
     </message>
     <message>
         <source>Set database cache size in megabytes (%d to %d, default: %d)</source>
@@ -2030,6 +3337,10 @@
         <source>Specify wallet file (within data directory)</source>
         <translation>Especifique o arquivo da carteira (dentro do diretório de dados)</translation>
     </message>
+    <message>
+        <source>The source code is available from %s.</source>
+        <translation>O código fonte está disponível pelo %s</translation>
+    </message>
     <message>
         <source>Unsupported argument -benchmark ignored, use -debug=bench.</source>
         <translation>Argumento não suportado -benchmark ignorado, use -debug=bench.</translation>
@@ -2046,6 +3357,10 @@
         <source>Use UPnP to map the listening port (default: %u)</source>
         <translation>Use UPnP para mapear a porta de entrada (padrão: %u)</translation>
     </message>
+    <message>
+        <source>Use the test chain</source>
+        <translation>Usar a rede de testes</translation>
+    </message>
     <message>
         <source>User Agent comment (%s) contains unsafe characters.</source>
         <translation>Comentário do Agente de Usuário (%s) contém caracteres inseguros.</translation>
@@ -2062,6 +3377,14 @@
         <source>Wallet %s resides outside data directory %s</source>
         <translation>Carteira %s reside fora do diretório de dados %s</translation>
     </message>
+    <message>
+        <source>Wallet debugging/testing options:</source>
+        <translation>Opções de depuração/teste da Carteira</translation>
+    </message>
+    <message>
+        <source>Wallet needed to be rewritten: restart %s to complete</source>
+        <translation>A Carteira precisou ser reescrita: reinicie o %s para completar</translation>
+    </message>
     <message>
         <source>Wallet options:</source>
         <translation>Opções da carteira:</translation>
@@ -2092,7 +3415,7 @@
     </message>
     <message>
         <source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source>
-        <translation>Executa um comando quando um alerta relevante é recebido ou vemos uma longa segregação (%s em cmd é substituído pela mensagem)</translation>
+        <translation>Executa um comando quando um alerta relevante é recebido ou vemos uma longa segregação (%s é substituída pela mensagem)</translation>
     </message>
     <message>
         <source>Fees (in %s/kB) smaller than this are considered zero fee for relaying, mining and transaction creation (default: %s)</source>
@@ -2104,16 +3427,12 @@
     </message>
     <message>
         <source>Invalid amount for -maxtxfee=&lt;amount&gt;: '%s' (must be at least the minrelay fee of %s to prevent stuck transactions)</source>
-        <translation>Valor inválido para -maxtxfee = &lt;valor&gt;: '%s'( precisa ser pelo menos a comissão mínima de %s para prevenir travamento de transações)</translation>
+        <translation>Valor inválido para -maxtxfee=&lt;valor&gt;: '%s' (precisa ser pelo menos a taxa mínima de %s para prevenir que a transação nunca seja confirmada)</translation>
     </message>
     <message>
         <source>Maximum size of data in data carrier transactions we relay and mine (default: %u)</source>
         <translation>Tamanho máximo de dados em transações de dados de operadora (padrão %u)</translation>
     </message>
-    <message>
-        <source>Query for peer addresses via DNS lookup, if low on addresses (default: 1 unless -connect)</source>
-        <translation>Buscar por endereços de peers via busca DNS, se estiver baixo em endereços (padrão: 1 a não ser que -connect)</translation>
-    </message>
     <message>
         <source>Randomize credentials for every proxy connection. This enables Tor stream isolation (default: %u)</source>
         <translation>Gerar credenciais aleatórias para cada conexão por proxy. Isto habilita o isolamento de stream do Tor (padrão: %u)</translation>
@@ -2127,8 +3446,8 @@
         <translation>A quantia da transação é muito pequena para mandar </translation>
     </message>
     <message>
-        <source>This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit &lt;https://www.openssl.org/&gt; and cryptographic software written by Eric Young and UPnP software written by Thomas Bernard.</source>
-        <translation>Esse produto inclui software desenvolvido pelo Open SSL Project para uso na OpenSSL Toolkit &lt;https://www.openssl.org&gt; e software criptográfico escrito por Eric Young e software UPnP escrito por Thomas Bernard. </translation>
+        <source>Use hierarchical deterministic key generation (HD) after BIP32. Only has effect during wallet creation/first start</source>
+        <translation>Usar carteira HD. Somente tem efeito na criação de uma nova carteira</translation>
     </message>
     <message>
         <source>Whitelisted peers cannot be DoS banned and their transactions are always relayed, even if they are already in the mempool, useful e.g. for a gateway</source>
@@ -2238,10 +3557,6 @@
         <source>Transaction amount too small</source>
         <translation>Quantidade da transação muito pequena.</translation>
     </message>
-    <message>
-        <source>Transaction amounts must be positive</source>
-        <translation>As quantidades das transações devem ser positivas.</translation>
-    </message>
     <message>
         <source>Transaction too large for fee policy</source>
         <translation>Transação muito grande para enviar sem taxa</translation>
@@ -2306,18 +3621,22 @@
         <source>-maxtxfee is set very high! Fees this large could be paid on a single transaction.</source>
         <translation>-maxtxfee é muito alto! Essa quantia poderia ser paga em uma única transação.</translation>
     </message>
-    <message>
-        <source>-paytxfee is set very high! This is the transaction fee you will pay if you send a transaction.</source>
-        <translation>-paytxfee é muito alto! Este é o valor da taxa de transação que você irá pagar se enviar a transação.</translation>
-    </message>
     <message>
         <source>Do not keep transactions in the mempool longer than &lt;n&gt; hours (default: %u)</source>
         <translation>Não manter transações na mempool por mais que &lt;n&gt; horas (padrão: %u)</translation>
     </message>
+    <message>
+        <source>Equivalent bytes per sigop in transactions for relay and mining (default: %u)</source>
+        <translation>Número mínimo de bytes por assinatura em transações que transmitimos e mineramos (default: %u)</translation>
+    </message>
     <message>
         <source>Fees (in %s/kB) smaller than this are considered zero fee for transaction creation (default: %s)</source>
         <translation>Comissões (em %s/kB) menores serão consideradas como zero para criação de transação (padrão %s)</translation>
     </message>
+    <message>
+        <source>Force relay of transactions from whitelisted peers even if they violate local relay policy (default: %d)</source>
+        <translation>Força a retransmissão de transações de pares da lista branca, mesmo quando violam a política local de retransmissão (default: %d)</translation>
+    </message>
     <message>
         <source>How thorough the block verification of -checkblocks is (0-4, default: %u)</source>
         <translation>Quão completa a verificação de blocos do -checkblocks é (0-4, padrão: %u)</translation>
@@ -2334,10 +3653,26 @@
         <source>Output debugging information (default: %u, supplying &lt;category&gt; is optional)</source>
         <translation>Informação de saída de debug (padrão: %u, definir &lt;category&gt; é opcional)</translation>
     </message>
+    <message>
+        <source>Query for peer addresses via DNS lookup, if low on addresses (default: 1 unless -connect/-noconnect)</source>
+        <translation>Buscar por endereços de peers via DNS, se estiver baixo em endereços (padrão: 1 a não ser que -connect/-noconnect)</translation>
+    </message>
+    <message>
+        <source>Sets the serialization of raw transaction or block hex returned in non-verbose mode, non-segwit(0) or segwit(1) (default: %d)</source>
+        <translation>Define a criação do raw da transação ou bloco em modo não verbal, não segwit (0) ou segwit (1) (padrão: %d)</translation>
+    </message>
     <message>
         <source>Support filtering of blocks and transaction with bloom filters (default: %u)</source>
         <translation>Suportar filtragem de blocos e transações com filtros bloom (padrão: %u)</translation>
     </message>
+    <message>
+        <source>This is the transaction fee you may pay when fee estimates are not available.</source>
+        <translation>Esta é a taxa que você deve pagar quando a taxa estimada não está disponível.</translation>
+    </message>
+    <message>
+        <source>This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit %s and cryptographic software written by Eric Young and UPnP software written by Thomas Bernard.</source>
+        <translation>Esse produto inclui um software desenvolvido pelo OpenSSL Project para uso na OpenSSL Toolkit %s e software criptográfico escrito por Eric Young e software UPnP escrito por Thomas Bernard. </translation>
+    </message>
     <message>
         <source>Total length of network version string (%i) exceeds maximum length (%i). Reduce the number or size of uacomments.</source>
         <translation>O tamanho total da string de versão da rede (%i) excede o tamanho máximo (%i). Reduza o numero ou tamanho de uacomments.</translation>
@@ -2366,6 +3701,18 @@
         <source>Warning: Unknown block versions being mined! It's possible unknown rules are in effect</source>
         <translation>Aviso: Versões de bloco desconhecidas sendo mineradas! É possível que regras estranhas estejam ativas</translation>
     </message>
+    <message>
+        <source>Warning: Wallet file corrupt, data salvaged! Original %s saved as %s in %s; if your balance or transactions are incorrect you should restore from a backup.</source>
+        <translation>Atenção: Arquivo da carteira corrompido, dados recuperados! Original %s salvo como %s em %s; se seu saldo ou transações estiverem incorretos, você deve restaurar o backup.</translation>
+    </message>
+    <message>
+        <source>Whitelist peers connecting from the given IP address (e.g. 1.2.3.4) or CIDR notated network (e.g. 1.2.3.0/24). Can be specified multiple times.</source>
+        <translation>Lista Branca de conecções do endereço IP informado (ex: 1.2.3.4) ou com máscara de rede (ex: 1.2.3.0/24). Pode ser especificado várias vezes.</translation>
+    </message>
+    <message>
+        <source>%s is set very high!</source>
+        <translation>%s está muito alto!</translation>
+    </message>
     <message>
         <source>(default: %s)</source>
         <translation>(padrão: %s)</translation>
@@ -2386,6 +3733,10 @@
         <source>Invalid -proxy address: '%s'</source>
         <translation>Endereço -proxy inválido: '%s'</translation>
     </message>
+    <message>
+        <source>Keypool ran out, please call keypoolrefill first</source>
+        <translation>Erro na Keypool, favor executar keypoolrefill primeiro</translation>
+    </message>
     <message>
         <source>Listen for JSON-RPC connections on &lt;port&gt; (default: %u or testnet: %u)</source>
         <translation>Escutar por conexões JSON-RPC na porta &lt;port&gt; (padrão: %u ou testnet: %u)</translation>
@@ -2427,8 +3778,8 @@
         <translation>Defina o tamanho da chave para piscina&lt;n&gt; (padrão: %u)</translation>
     </message>
     <message>
-        <source>Set minimum block size in bytes (default: %u)</source>
-        <translation>Definir tamanho mínimo do bloco, em bytes (padrão: %u)</translation>
+        <source>Set maximum BIP141 block weight (default: %d)</source>
+        <translation>Define a altura máxima BIP141 do bloco (padrão: %d)</translation>
     </message>
     <message>
         <source>Set the number of threads to service RPC calls (default: %d)</source>
@@ -2450,10 +3801,38 @@
         <source>Spend unconfirmed change when sending transactions (default: %u)</source>
         <translation>Gastar troco não confirmado quando enviar transações (padrão: %u)</translation>
     </message>
+    <message>
+        <source>Starting network threads...</source>
+        <translation>Iniciando análise da rede...</translation>
+    </message>
+    <message>
+        <source>The wallet will avoid paying less than the minimum relay fee.</source>
+        <translation>A carteira irá evitar pagar menos que a taxa mínima.</translation>
+    </message>
+    <message>
+        <source>This is the minimum transaction fee you pay on every transaction.</source>
+        <translation>Esta é a taxa mínima que você deve pagar em cada transação.</translation>
+    </message>
+    <message>
+        <source>This is the transaction fee you will pay if you send a transaction.</source>
+        <translation>Esta é a taxa que você irá pagar se enviar a transação.</translation>
+    </message>
     <message>
         <source>Threshold for disconnecting misbehaving peers (default: %u)</source>
         <translation>Limite para desconectar peers mal comportados (padrão: %u)</translation>
     </message>
+    <message>
+        <source>Transaction amounts must not be negative</source>
+        <translation>As quantidades das transações devem ser positivas.</translation>
+    </message>
+    <message>
+        <source>Transaction has too long of a mempool chain</source>
+        <translation>A transação demorou muito na memória</translation>
+    </message>
+    <message>
+        <source>Transaction must have at least one recipient</source>
+        <translation>A transação deve ter ao menos um destinatário</translation>
+    </message>
     <message>
         <source>Unknown network specified in -onlynet: '%s'</source>
         <translation>Rede desconhecida especificada em -onlynet: '%s'</translation>
@@ -2488,7 +3867,7 @@
     </message>
     <message>
         <source>Done loading</source>
-        <translation>Carregamento terminado</translation>
+        <translation>Carregamento terminado!</translation>
     </message>
     <message>
         <source>Error</source>
diff --git a/src/qt/locale/bitcoin_pt_PT.ts b/src/qt/locale/bitcoin_pt_PT.ts
index eed262e010ee6..a2a52efd27c2e 100644
--- a/src/qt/locale/bitcoin_pt_PT.ts
+++ b/src/qt/locale/bitcoin_pt_PT.ts
@@ -41,7 +41,18 @@
         <source>&amp;Delete</source>
         <translation>&amp;Eliminar</translation>
     </message>
-</context>
+    <message>
+        <source>Choose the address to send coins to</source>
+        <translation>Escolhe qual o endereço para o  qual enviar moedas</translation>
+    </message>
+    <message>
+        <source>Choose the address to receive coins with</source>
+        <translation>Escolhe qual o endereço para receber moedas</translation>
+    </message>
+    </context>
+<context>
+    <name>AddressTableModel</name>
+    </context>
 <context>
     <name>AskPassphraseDialog</name>
     <message>
@@ -60,7 +71,7 @@
         <source>Repeat new passphrase</source>
         <translation>Repita a nova frase de palavra-passe</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>BanTableModel</name>
     <message>
@@ -278,26 +289,6 @@
         <source>Processed %n block(s) of transaction history.</source>
         <translation><numerusform>Processado %n bloco do histórico de transações.</numerusform><numerusform>Processados %n blocos do histórico de transações.</numerusform></translation>
     </message>
-    <message numerus="yes">
-        <source>%n hour(s)</source>
-        <translation><numerusform>%n hora</numerusform><numerusform>%n horas</numerusform></translation>
-    </message>
-    <message numerus="yes">
-        <source>%n day(s)</source>
-        <translation><numerusform>%n dia</numerusform><numerusform>%n dias</numerusform></translation>
-    </message>
-    <message numerus="yes">
-        <source>%n week(s)</source>
-        <translation><numerusform>%n semana</numerusform><numerusform>%n semanas</numerusform></translation>
-    </message>
-    <message>
-        <source>%1 and %2</source>
-        <translation>%1 e %2</translation>
-    </message>
-    <message numerus="yes">
-        <source>%n year(s)</source>
-        <translation><numerusform>%n ano</numerusform><numerusform>%n anos</numerusform></translation>
-    </message>
     <message>
         <source>%1 behind</source>
         <translation>%1 em atraso</translation>
@@ -376,7 +367,7 @@
         <source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;locked&lt;/b&gt;</source>
         <translation>A carteira está &lt;b&gt;encriptada&lt;/b&gt; e atualmente &lt;b&gt;bloqueada&lt;/b&gt;</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>CoinControlDialog</name>
     <message>
@@ -395,10 +386,6 @@
         <source>Amount:</source>
         <translation>Valor:</translation>
     </message>
-    <message>
-        <source>Priority:</source>
-        <translation>Prioridade:</translation>
-    </message>
     <message>
         <source>Fee:</source>
         <translation>Taxa:</translation>
@@ -451,11 +438,7 @@
         <source>Confirmed</source>
         <translation>Confirmada</translation>
     </message>
-    <message>
-        <source>Priority</source>
-        <translation>Prioridade</translation>
-    </message>
-</context>
+    </context>
 <context>
     <name>EditAddressDialog</name>
     <message>
@@ -478,7 +461,7 @@
         <source>&amp;Address</source>
         <translation>E&amp;ndereço</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>FreespaceChecker</name>
     <message>
@@ -588,6 +571,21 @@
         <translation><numerusform>(de %n GB necessários)</numerusform><numerusform>(de %n GB necessário)</numerusform></translation>
     </message>
 </context>
+<context>
+    <name>ModalOverlay</name>
+    <message>
+        <source>Form</source>
+        <translation>Formulário</translation>
+    </message>
+    <message>
+        <source>Last block time</source>
+        <translation>Data do último bloco</translation>
+    </message>
+    <message>
+        <source>Hide</source>
+        <translation>Esconder</translation>
+    </message>
+    </context>
 <context>
     <name>OpenURIDialog</name>
     <message>
@@ -606,7 +604,7 @@
         <source>Select payment request file</source>
         <translation>Seleccione o ficheiro de pedido de pagamento</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>OptionsDialog</name>
     <message>
@@ -910,6 +908,9 @@
         <translation>Saldo disponivél em enderços modo-verificação</translation>
     </message>
 </context>
+<context>
+    <name>PaymentServer</name>
+    </context>
 <context>
     <name>PeerTableModel</name>
     <message>
@@ -920,11 +921,7 @@
         <source>Node/Service</source>
         <translation>Nó/Serviço</translation>
     </message>
-    <message>
-        <source>Ping Time</source>
-        <translation>Tempo de Latência</translation>
-    </message>
-</context>
+    </context>
 <context>
     <name>QObject</name>
     <message>
@@ -963,7 +960,17 @@
         <source>%1 ms</source>
         <translation>%1 ms</translation>
     </message>
-</context>
+    <message>
+        <source>%1 and %2</source>
+        <translation>%1 e %2</translation>
+    </message>
+    </context>
+<context>
+    <name>QObject::QObject</name>
+    </context>
+<context>
+    <name>QRImageWidget</name>
+    </context>
 <context>
     <name>RPCConsole</name>
     <message>
@@ -1158,14 +1165,6 @@
         <source>Clear console</source>
         <translation>Limpar consola</translation>
     </message>
-    <message>
-        <source>&amp;Disconnect Node</source>
-        <translation>&amp;Desligar Nó</translation>
-    </message>
-    <message>
-        <source>Ban Node for</source>
-        <translation>Banir Nó por</translation>
-    </message>
     <message>
         <source>1 &amp;hour</source>
         <translation>1 &amp;hora</translation>
@@ -1182,10 +1181,6 @@
         <source>1 &amp;year</source>
         <translation>1 &amp;ano</translation>
     </message>
-    <message>
-        <source>&amp;Unban Node</source>
-        <translation>&amp;Desbloquear Nó</translation>
-    </message>
     <message>
         <source>Welcome to the %1 RPC console.</source>
         <translation>Bem-vindo à consola RPC da %1.</translation>
@@ -1317,7 +1312,7 @@
         <source>Remove</source>
         <translation>Remover</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>ReceiveRequestDialog</name>
     <message>
@@ -1336,7 +1331,14 @@
         <source>&amp;Save Image...</source>
         <translation>&amp;Salvar Imagem...</translation>
     </message>
-</context>
+    <message>
+        <source>Amount</source>
+        <translation>Valor</translation>
+    </message>
+    </context>
+<context>
+    <name>RecentRequestsTableModel</name>
+    </context>
 <context>
     <name>SendCoinsDialog</name>
     <message>
@@ -1371,10 +1373,6 @@
         <source>Amount:</source>
         <translation>Quantia:</translation>
     </message>
-    <message>
-        <source>Priority:</source>
-        <translation>Prioridade:</translation>
-    </message>
     <message>
         <source>Fee:</source>
         <translation>Taxa:</translation>
@@ -1443,10 +1441,6 @@
         <source>(Smart fee not initialized yet. This usually takes a few blocks...)</source>
         <translation>(Taxa inteligente ainda não foi acionada. Normalmente demora alguns blocos...)</translation>
     </message>
-    <message>
-        <source>Confirmation time:</source>
-        <translation>Tempo de confirmação:</translation>
-    </message>
     <message>
         <source>normal</source>
         <translation>normal</translation>
@@ -1487,7 +1481,7 @@
         <source>S&amp;end</source>
         <translation>E&amp;nviar</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>SendCoinsEntry</name>
     <message>
@@ -1566,7 +1560,10 @@
         <source>Memo:</source>
         <translation>Memorando:</translation>
     </message>
-</context>
+    </context>
+<context>
+    <name>SendConfirmationDialog</name>
+    </context>
 <context>
     <name>ShutdownWindow</name>
     <message>
@@ -1664,7 +1661,7 @@
         <source>Reset all verify message fields</source>
         <translation>Repor todos os campos de verificação de mensagem</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>SplashScreen</name>
     <message>
@@ -1679,13 +1676,26 @@
         <translation>KB/s</translation>
     </message>
 </context>
+<context>
+    <name>TransactionDesc</name>
+    <message>
+        <source>Amount</source>
+        <translation>Valor</translation>
+    </message>
+    </context>
 <context>
     <name>TransactionDescDialog</name>
     <message>
         <source>This pane shows a detailed description of the transaction</source>
         <translation>Esta janela mostra uma descrição detalhada da transação</translation>
     </message>
-</context>
+    </context>
+<context>
+    <name>TransactionTableModel</name>
+    </context>
+<context>
+    <name>TransactionView</name>
+    </context>
 <context>
     <name>UnitDisplayStatusBarControl</name>
     <message>
@@ -1693,6 +1703,19 @@
         <translation>Unidade de valores recebidos. Clique para selecionar outra unidade.</translation>
     </message>
 </context>
+<context>
+    <name>WalletFrame</name>
+    </context>
+<context>
+    <name>WalletModel</name>
+    </context>
+<context>
+    <name>WalletView</name>
+    <message>
+        <source>Export the data in the current tab to a file</source>
+        <translation>Exportar os dados no separador atual para um ficheiro</translation>
+    </message>
+    </context>
 <context>
     <name>bitcoin-core</name>
     <message>
@@ -1755,18 +1778,10 @@
         <source>Unable to start HTTP server. See debug log for details.</source>
         <translation>Não é possível iniciar o servidor HTTP. Verifique o debug.log para detalhes.</translation>
     </message>
-    <message>
-        <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
-        <translation>Aceitar ligações externas (padrão: 1 sem -proxy ou -connect)</translation>
-    </message>
     <message>
         <source>Bitcoin Core</source>
         <translation>Bitcoin Core</translation>
     </message>
-    <message>
-        <source>-fallbackfee is set very high! This is the transaction fee you may pay when fee estimates are not available.</source>
-        <translation>-fallbackfee está definida muito elevada! Esta é a taxa de transação pode poderá pagar quando as estimativas de taxas não estão disponíveis.</translation>
-    </message>
     <message>
         <source>A fee rate (in %s/kB) that will be used when fee estimation has insufficient data (default: %s)</source>
         <translation>Uma percentagem da taxa (em %s/kB) que será utilizada quando a estimativa da taxa tiver dados insuficientes (predefinição: %s)</translation>
@@ -1783,18 +1798,10 @@
         <source>Delete all wallet transactions and only recover those parts of the blockchain through -rescan on startup</source>
         <translation>Apague todas as transações da carteira e somente restore aquelas que façam parte do blockchain através de re-scan ao reiniciar o programa</translation>
     </message>
-    <message>
-        <source>Distributed under the MIT software license, see the accompanying file COPYING or &lt;http://www.opensource.org/licenses/mit-license.php&gt;.</source>
-        <translation>Distribuido através da licença de software MIT, verifique o ficheiro anexado COPYING ou &lt;http://www.opensource.org/licenses/mit-license.php&gt;.</translation>
-    </message>
     <message>
         <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source>
         <translation>Executar comando quando uma das transações na carteira mudar (no comando, %s é substituído pelo ID da Transação)</translation>
     </message>
-    <message>
-        <source>Force relay of transactions from whitelisted peers even they violate local relay policy (default: %d)</source>
-        <translation>Forçar retransmissão das transações a partir dos pares da lista branca, mesmo que estes violem a política de retransmissão local (predefinição: %d)</translation>
-    </message>
     <message>
         <source>Set the number of script verification threads (%u to %d, 0 = auto, &lt;0 = leave that many cores free, default: %d)</source>
         <translation>Defina o número de processos de verificação (%u até %d, 0 = automático, &lt;0 = ldisponibiliza esse número de núcleos livres, por defeito: %d)</translation>
@@ -1803,26 +1810,10 @@
         <source>The block database contains a block which appears to be from the future. This may be due to your computer's date and time being set incorrectly. Only rebuild the block database if you are sure that your computer's date and time are correct</source>
         <translation>A base de dados de blocos contém um bloco que aparenta ser do futuro. Isto pode ser causado por uma data incorrecta definida no seu computador. Reconstrua apenas a base de dados de blocos caso tenha a certeza de que a data e hora do seu computador estão correctos.</translation>
     </message>
-    <message>
-        <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
-        <translation>Esta é uma versão de testes pré-lançamento - use à sua responsabilidade - não usar para minar ou aplicações comerciais</translation>
-    </message>
     <message>
         <source>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</source>
         <translation>Utilizar UPnP para mapear a porta de escuta (predefinição: 1 quando escutar e sem -proxy)</translation>
     </message>
-    <message>
-        <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source>
-        <translation>Aviso: A rede não parece estar completamente de acordo! Parece que alguns mineiros estão com dificuldades técnicas.</translation>
-    </message>
-    <message>
-        <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source>
-        <translation>Atenção: Parecemos não estar de acordo com os nossos pares! Poderá ter que atualizar o seu cliente, ou outros nós poderão ter que atualizar os seus clientes.</translation>
-    </message>
-    <message>
-        <source>Whitelist peers connecting from the given netmask or IP address. Can be specified multiple times.</source>
-        <translation>Ligações na lista branca conectam desde a seguinte netmask ou endereço IP. Posse ser especificado varias vezes.</translation>
-    </message>
     <message>
         <source>-maxmempool must be at least %d MB</source>
         <translation>- máximo do banco de memória deverá ser pelo menos %d MB</translation>
@@ -1843,10 +1834,6 @@
         <source>Block creation options:</source>
         <translation>Opções da criação de bloco:</translation>
     </message>
-    <message>
-        <source>Connect only to the specified node(s)</source>
-        <translation>Apenas ligar ao(s) nó(s) especificado(s)</translation>
-    </message>
     <message>
         <source>Connection options:</source>
         <translation>Opções de ligação:</translation>
@@ -1951,10 +1938,6 @@
         <source>Location of the auth cookie (default: data dir)</source>
         <translation>Localização de cookie de autorização (predefinição: diretoria de dados)</translation>
     </message>
-    <message>
-        <source>Minimum bytes per sigop in transactions we relay and mine (default: %u)</source>
-        <translation>Mínimo de bytes por sigop nas transações que nós transmitimos e mine (predefinição: %u)</translation>
-    </message>
     <message>
         <source>Not enough file descriptors available.</source>
         <translation>Os descritores de ficheiros disponíveis são insuficientes.</translation>
@@ -2071,10 +2054,6 @@
         <source>Maximum size of data in data carrier transactions we relay and mine (default: %u)</source>
         <translation>Tamanho máximo dos dados em transacções que incluem dados que propagamos e mineramos (padrão: %u)</translation>
     </message>
-    <message>
-        <source>Query for peer addresses via DNS lookup, if low on addresses (default: 1 unless -connect)</source>
-        <translation>Encontrar pares usando DNS lookup, caso o número de endereços seja reduzido (padrão: 1 excepto -connect)</translation>
-    </message>
     <message>
         <source>Randomize credentials for every proxy connection. This enables Tor stream isolation (default: %u)</source>
         <translation>Usar credenciais aleatórias por cada ligação proxy. Permite que o Tor use stream isolation (padrão: %u)</translation>
@@ -2087,10 +2066,6 @@
         <source>The transaction amount is too small to send after the fee has been deducted</source>
         <translation>O montante da transacção é demasiado baixo após a dedução da taxa</translation>
     </message>
-    <message>
-        <source>This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit &lt;https://www.openssl.org/&gt; and cryptographic software written by Eric Young and UPnP software written by Thomas Bernard.</source>
-        <translation>Este produto inclui software desenvolvido pelo OpenSSL Project para utilização no OpenSSL Toolkit &lt;https://www.openssl.org/&gt;  e software criptográfico escrito por Eric Young e software UPnP escrito por Thomas Bernard.</translation>
-    </message>
     <message>
         <source>Whitelisted peers cannot be DoS banned and their transactions are always relayed, even if they are already in the mempool, useful e.g. for a gateway</source>
         <translation>Os pares enviados para a lista branca não podem ser DoS banidos e as suas transações são sempre retransmitidas, mesmo que já estejam no banco de memória, útil, por exemplo, para um acesso</translation>
@@ -2199,10 +2174,6 @@
         <source>Transaction amount too small</source>
         <translation>Quantia da transação é muito baixa</translation>
     </message>
-    <message>
-        <source>Transaction amounts must be positive</source>
-        <translation>Quantia da transação deverá ser positiva</translation>
-    </message>
     <message>
         <source>Transaction too large for fee policy</source>
         <translation>Transacção demasiado grande para a política de taxas</translation>
@@ -2267,10 +2238,6 @@
         <source>-maxtxfee is set very high! Fees this large could be paid on a single transaction.</source>
         <translation>-maxtxfee está definido com um valor muito alto! Taxas desta magnitude podem ser pagas numa única transacção.</translation>
     </message>
-    <message>
-        <source>-paytxfee is set very high! This is the transaction fee you will pay if you send a transaction.</source>
-        <translation>-paytxfee está definido com um valor muito alto! Esta é a taxa que irá pagar se enviar uma transacção.</translation>
-    </message>
     <message>
         <source>Do not keep transactions in the mempool longer than &lt;n&gt; hours (default: %u)</source>
         <translation>Não guardar transações no banco de memória por mais de &lt;n&gt; horas (predefinição: %u)</translation>
@@ -2387,10 +2354,6 @@
         <source>Set key pool size to &lt;n&gt; (default: %u)</source>
         <translation>Definir tamanho do banco de memória da chave para &lt;n&gt; (predefinição: %u)</translation>
     </message>
-    <message>
-        <source>Set minimum block size in bytes (default: %u)</source>
-        <translation>Definir tamanho minímo de um bloco em bytes (por defeito: %u)</translation>
-    </message>
     <message>
         <source>Set the number of threads to service RPC calls (default: %d)</source>
         <translation>Defina o número de processos para servir as chamadas RPC (por defeito: %d)</translation>
diff --git a/src/qt/locale/bitcoin_ro.ts b/src/qt/locale/bitcoin_ro.ts
index 270a4ba062994..ef87f1056ab48 100644
--- a/src/qt/locale/bitcoin_ro.ts
+++ b/src/qt/locale/bitcoin_ro.ts
@@ -41,7 +41,10 @@
         <source>&amp;Delete</source>
         <translation>Șterge</translation>
     </message>
-</context>
+    </context>
+<context>
+    <name>AddressTableModel</name>
+    </context>
 <context>
     <name>AskPassphraseDialog</name>
     <message>
@@ -60,58 +63,652 @@
         <source>Repeat new passphrase</source>
         <translation>Repetati noua parolă</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>BanTableModel</name>
-    </context>
+    <message>
+        <source>IP/Netmask</source>
+        <translation>IP/Netmask</translation>
+    </message>
+    <message>
+        <source>Banned Until</source>
+        <translation>Blocat până</translation>
+    </message>
+</context>
 <context>
     <name>BitcoinGUI</name>
+    <message>
+        <source>Sign &amp;message...</source>
+        <translation>Semnează &amp;mesajul...</translation>
+    </message>
+    <message>
+        <source>Synchronizing with network...</source>
+        <translation>Se sincronizează cu rețeaua</translation>
+    </message>
+    <message>
+        <source>Node</source>
+        <translation>Nod</translation>
+    </message>
+    <message>
+        <source>Show general overview of wallet</source>
+        <translation>Arată o prezentare generală a portofelului.</translation>
+    </message>
+    <message>
+        <source>&amp;Transactions</source>
+        <translation>&amp;Tranzacții</translation>
+    </message>
+    <message>
+        <source>Browse transaction history</source>
+        <translation>Navighează în istoricul tranzacțiilor</translation>
+    </message>
+    <message>
+        <source>Quit application</source>
+        <translation>Părăsește aplicația</translation>
+    </message>
+    <message>
+        <source>About &amp;Qt</source>
+        <translation>Despre &amp;Qt</translation>
+    </message>
+    <message>
+        <source>Show information about Qt</source>
+        <translation>Arată informații despre Qt</translation>
+    </message>
+    <message>
+        <source>&amp;Options...</source>
+        <translation>&amp;Opțiuni...</translation>
+    </message>
+    <message>
+        <source>&amp;Encrypt Wallet...</source>
+        <translation>&amp;Criptează portofelul...</translation>
+    </message>
+    <message>
+        <source>&amp;Backup Wallet...</source>
+        <translation>&amp;Backup portofel</translation>
+    </message>
+    <message>
+        <source>&amp;Change Passphrase...</source>
+        <translation>&amp;Schimbă parola...</translation>
+    </message>
+    <message>
+        <source>&amp;Sending addresses...</source>
+        <translation>&amp;Trimite adresele...</translation>
+    </message>
+    <message>
+        <source>&amp;Receiving addresses...</source>
+        <translation>&amp;Primește adresele...</translation>
+    </message>
+    <message>
+        <source>Open &amp;URI...</source>
+        <translation>Deschide &amp;URI...</translation>
+    </message>
+    <message>
+        <source>Send coins to a Bitcoin address</source>
+        <translation>Trimite monedele către o adresă Bitcoin</translation>
+    </message>
+    <message>
+        <source>Backup wallet to another location</source>
+        <translation>Fă o copie de rezervă a portofelului într-o altă locație</translation>
+    </message>
+    <message>
+        <source>Change the passphrase used for wallet encryption</source>
+        <translation>Schimbă parola folosită pentru criptarea portofelului</translation>
+    </message>
+    <message>
+        <source>&amp;Debug window</source>
+        <translation>&amp;Fereastra pentru depanare</translation>
+    </message>
+    <message>
+        <source>Open debugging and diagnostic console</source>
+        <translation>Pornește consola pentru depanare si diagnoză</translation>
+    </message>
+    <message>
+        <source>&amp;Verify message...</source>
+        <translation>&amp;Verifică mesajul...</translation>
+    </message>
+    <message>
+        <source>Bitcoin</source>
+        <translation>Bitcoin</translation>
+    </message>
+    <message>
+        <source>Wallet</source>
+        <translation>Portofel</translation>
+    </message>
+    <message>
+        <source>&amp;Send</source>
+        <translation>&amp;Trimite</translation>
+    </message>
+    <message>
+        <source>&amp;Receive</source>
+        <translation>&amp;Primește</translation>
+    </message>
+    <message>
+        <source>&amp;Show / Hide</source>
+        <translation>&amp;Arată/Ascunde</translation>
+    </message>
+    <message>
+        <source>Show or hide the main Window</source>
+        <translation>Arată sau ascunde fereastra principală</translation>
+    </message>
+    <message>
+        <source>Encrypt the private keys that belong to your wallet</source>
+        <translation>Criptează cheile private care aparțin portofelului tău.</translation>
+    </message>
+    <message>
+        <source>Sign messages with your Bitcoin addresses to prove you own them</source>
+        <translation>Semnează mesajele cu adresa ta de Bitcoin pentru a face dovada că îți aparțin.</translation>
+    </message>
+    <message>
+        <source>Verify messages to ensure they were signed with specified Bitcoin addresses</source>
+        <translation>Verifică mesajele cu scopul de a asigura faptul că au fost semnate cu adresa de Bitcoin specificată.</translation>
+    </message>
+    <message>
+        <source>&amp;File</source>
+        <translation>&amp;Fișier</translation>
+    </message>
+    <message>
+        <source>&amp;Settings</source>
+        <translation>&amp;Setări</translation>
+    </message>
+    <message>
+        <source>&amp;Help</source>
+        <translation>&amp;Ajutor</translation>
+    </message>
+    <message>
+        <source>Request payments (generates QR codes and bitcoin: URIs)</source>
+        <translation>Cerere plată (generează coduri QR și bitcoin: URIs)</translation>
+    </message>
+    <message>
+        <source>Open a bitcoin: URI or payment request</source>
+        <translation>Deschide un bitcoin: URI sau cerere de plată</translation>
+    </message>
+    <message>
+        <source>%1 behind</source>
+        <translation>%1 în urmă</translation>
+    </message>
+    <message>
+        <source>Last received block was generated %1 ago.</source>
+        <translation>Ultimul bloc primit a fost generat acum %1</translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation>Eroare</translation>
+    </message>
+    <message>
+        <source>Warning</source>
+        <translation>Atenționare</translation>
+    </message>
+    <message>
+        <source>Information</source>
+        <translation>Informație</translation>
+    </message>
+    <message>
+        <source>Up to date</source>
+        <translation>Actual</translation>
+    </message>
+    <message>
+        <source>Date: %1
+</source>
+        <translation>Data: %1</translation>
+    </message>
+    <message>
+        <source>Amount: %1
+</source>
+        <translation>Cantitate: %1</translation>
+    </message>
+    <message>
+        <source>Type: %1
+</source>
+        <translation>Tip: %1
+</translation>
+    </message>
+    <message>
+        <source>Label: %1
+</source>
+        <translation>Etichetă: %1
+</translation>
+    </message>
+    <message>
+        <source>Address: %1
+</source>
+        <translation>Adresa: %1
+</translation>
+    </message>
+    <message>
+        <source>Sent transaction</source>
+        <translation>Trimite tranzacția</translation>
+    </message>
+    <message>
+        <source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;unlocked&lt;/b&gt;</source>
+        <translation>Portofelul este &lt;b&gt;criptat&lt;/b&gt; și în prezent &lt;b&gt;deblocat&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;locked&lt;/b&gt;</source>
+        <translation>Portofelul este &lt;b&gt;criptat&lt;/b&gt; și în prezent &lt;b&gt;blocat&lt;/b&gt;</translation>
+    </message>
     </context>
 <context>
     <name>CoinControlDialog</name>
+    <message>
+        <source>Coin Selection</source>
+        <translation>Selecția monedelor</translation>
+    </message>
+    <message>
+        <source>Quantity:</source>
+        <translation>Cantitatea:</translation>
+    </message>
+    <message>
+        <source>Bytes:</source>
+        <translation>Biți:</translation>
+    </message>
+    <message>
+        <source>Amount:</source>
+        <translation>Cantitate:</translation>
+    </message>
+    <message>
+        <source>Fee:</source>
+        <translation>Taxa:</translation>
+    </message>
+    <message>
+        <source>After Fee:</source>
+        <translation>După taxă:</translation>
+    </message>
+    <message>
+        <source>Change:</source>
+        <translation>Schimbă:</translation>
+    </message>
+    <message>
+        <source>Tree mode</source>
+        <translation>Mod arbore</translation>
+    </message>
+    <message>
+        <source>List mode</source>
+        <translation>Mod listă</translation>
+    </message>
+    <message>
+        <source>Amount</source>
+        <translation>Cantitate</translation>
+    </message>
+    <message>
+        <source>Received with address</source>
+        <translation>Primit cu adresa</translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation>Data</translation>
+    </message>
+    <message>
+        <source>Confirmations</source>
+        <translation>Confirmări</translation>
+    </message>
+    <message>
+        <source>Confirmed</source>
+        <translation>Confirmat</translation>
+    </message>
     </context>
 <context>
     <name>EditAddressDialog</name>
+    <message>
+        <source>Edit Address</source>
+        <translation>Modifică adresa</translation>
+    </message>
+    <message>
+        <source>&amp;Address</source>
+        <translation>&amp;Adresa</translation>
+    </message>
     </context>
 <context>
     <name>FreespaceChecker</name>
+    <message>
+        <source>name</source>
+        <translation>Nume</translation>
+    </message>
+    <message>
+        <source>Directory already exists. Add %1 if you intend to create a new directory here.</source>
+        <translation>Directoriul există deja. Adaugă %1 dacă ai intenționat să creezi aici un directoriu nou.</translation>
+    </message>
     </context>
 <context>
     <name>HelpMessageDialog</name>
+    <message>
+        <source>version</source>
+        <translation>versiune</translation>
+    </message>
+    <message>
+        <source>(%1-bit)</source>
+        <translation>(%1-bit)</translation>
+    </message>
+    <message>
+        <source>Start minimized</source>
+        <translation>Pornește minimalizat</translation>
+    </message>
     </context>
 <context>
     <name>Intro</name>
+    <message>
+        <source>Welcome</source>
+        <translation>Bine ai venit!</translation>
+    </message>
+    <message>
+        <source>Use the default data directory</source>
+        <translation>Folosește directoriul pentru date din modul implicit.</translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation>Eroare</translation>
+    </message>
+    <message numerus="yes">
+        <source>%n GB of free space available</source>
+        <translation><numerusform>%n GB de spațiu liber disponibil</numerusform><numerusform>%n GB de spațiu liber disponibil</numerusform><numerusform>%n GB de spațiu liber disponibil</numerusform></translation>
+    </message>
+    </context>
+<context>
+    <name>ModalOverlay</name>
     </context>
 <context>
     <name>OpenURIDialog</name>
+    <message>
+        <source>Open URI</source>
+        <translation>Deschide URI</translation>
+    </message>
+    <message>
+        <source>URI:</source>
+        <translation>URI:</translation>
+    </message>
     </context>
 <context>
     <name>OptionsDialog</name>
+    <message>
+        <source>Options</source>
+        <translation>Opțiuni</translation>
+    </message>
+    <message>
+        <source>MB</source>
+        <translation>MB</translation>
+    </message>
+    <message>
+        <source>Accept connections from outside</source>
+        <translation>Acceptă conexiuni externe</translation>
+    </message>
+    <message>
+        <source>Allow incoming connections</source>
+        <translation>Acceptă conexiunea care sosește</translation>
+    </message>
+    <message>
+        <source>IP address of the proxy (e.g. IPv4: 127.0.0.1 / IPv6: ::1)</source>
+        <translation>Adresa IP a proxy-ului (ex. IPv4: 127.0.0.1 / IPv6: ::1)</translation>
+    </message>
+    <message>
+        <source>&amp;Reset Options</source>
+        <translation>&amp;Resetează opțiunile</translation>
+    </message>
+    <message>
+        <source>&amp;Network</source>
+        <translation>&amp;Rețea</translation>
+    </message>
+    <message>
+        <source>Expert</source>
+        <translation>Expert</translation>
+    </message>
+    <message>
+        <source>Proxy &amp;IP:</source>
+        <translation>Proxy &amp;IP:</translation>
+    </message>
+    <message>
+        <source>&amp;Port:</source>
+        <translation>&amp;Port:</translation>
+    </message>
+    <message>
+        <source>Port of the proxy (e.g. 9050)</source>
+        <translation>Portul pentru proxy (ex.: 9050)</translation>
+    </message>
+    <message>
+        <source>IPv4</source>
+        <translation>IPv4</translation>
+    </message>
+    <message>
+        <source>IPv6</source>
+        <translation>IPv6</translation>
+    </message>
+    <message>
+        <source>Tor</source>
+        <translation>Tor</translation>
+    </message>
+    <message>
+        <source>&amp;Window</source>
+        <translation>&amp;Fereastra</translation>
+    </message>
+    <message>
+        <source>&amp;OK</source>
+        <translation>&amp;OK</translation>
+    </message>
+    <message>
+        <source>&amp;Cancel</source>
+        <translation>&amp;Anulează</translation>
+    </message>
+    <message>
+        <source>default</source>
+        <translation>inițial</translation>
+    </message>
+    <message>
+        <source>none</source>
+        <translation>fără</translation>
+    </message>
+    <message>
+        <source>Confirm options reset</source>
+        <translation>Confirmă resetarea opțiunilor</translation>
+    </message>
+    <message>
+        <source>Client restart required to activate changes.</source>
+        <translation>Repornirea clientului este necesară pentru ca schimbările să fie activate</translation>
+    </message>
+    <message>
+        <source>Client will be shut down. Do you want to proceed?</source>
+        <translation>Clientul va fi oprit. Dorești sa continui?</translation>
+    </message>
+    <message>
+        <source>This change would require a client restart.</source>
+        <translation>Această schimbare necesită repornirea clientului.</translation>
+    </message>
     </context>
 <context>
     <name>OverviewPage</name>
+    <message>
+        <source>Available:</source>
+        <translation>Disponibil:</translation>
+    </message>
+    <message>
+        <source>Total:</source>
+        <translation>Total:</translation>
+    </message>
+    <message>
+        <source>Recent transactions</source>
+        <translation>Tranzacții recente</translation>
+    </message>
+    </context>
+<context>
+    <name>PaymentServer</name>
     </context>
 <context>
     <name>PeerTableModel</name>
     </context>
 <context>
     <name>QObject</name>
+    <message>
+        <source>Amount</source>
+        <translation>Cantitate</translation>
+    </message>
+    <message>
+        <source>%1 and %2</source>
+        <translation>%1 și %2</translation>
+    </message>
     </context>
 <context>
-    <name>RPCConsole</name>
+    <name>QObject::QObject</name>
     </context>
+<context>
+    <name>QRImageWidget</name>
+    </context>
+<context>
+    <name>RPCConsole</name>
+    <message>
+        <source>Client version</source>
+        <translation>Versiunea clientului</translation>
+    </message>
+    <message>
+        <source>&amp;Information</source>
+        <translation>&amp;Informații</translation>
+    </message>
+    <message>
+        <source>Debug window</source>
+        <translation>Fereastra pentru depanare</translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>General</translation>
+    </message>
+    <message>
+        <source>Network</source>
+        <translation>Rețea</translation>
+    </message>
+    <message>
+        <source>Name</source>
+        <translation>Nume</translation>
+    </message>
+    <message>
+        <source>Number of connections</source>
+        <translation>Numărul de conexiuni</translation>
+    </message>
+    <message>
+        <source>Received</source>
+        <translation>Primit</translation>
+    </message>
+    <message>
+        <source>Sent</source>
+        <translation>Trimis</translation>
+    </message>
+    <message>
+        <source>Direction</source>
+        <translation>Direcția</translation>
+    </message>
+    <message>
+        <source>Version</source>
+        <translation>Versiune</translation>
+    </message>
+    <message>
+        <source>Connection Time</source>
+        <translation>Durata conexiunii</translation>
+    </message>
+    <message>
+        <source>&amp;Open</source>
+        <translation>&amp;Deschide</translation>
+    </message>
+    <message>
+        <source>&amp;Console</source>
+        <translation>&amp;Consolă</translation>
+    </message>
+    <message>
+        <source>1 &amp;hour</source>
+        <translation>1 &amp;ore</translation>
+    </message>
+    <message>
+        <source>1 &amp;day</source>
+        <translation>1 &amp;zi</translation>
+    </message>
+    <message>
+        <source>1 &amp;week</source>
+        <translation>1 &amp;săptămână</translation>
+    </message>
+    <message>
+        <source>1 &amp;year</source>
+        <translation>1 &amp;an</translation>
+    </message>
+    <message>
+        <source>%1 B</source>
+        <translation>%1 B</translation>
+    </message>
+    <message>
+        <source>%1 KB</source>
+        <translation>%1 KB</translation>
+    </message>
+    <message>
+        <source>%1 MB</source>
+        <translation>%1 MB</translation>
+    </message>
+    <message>
+        <source>%1 GB</source>
+        <translation>%1 GB</translation>
+    </message>
+    <message>
+        <source>Yes</source>
+        <translation>Da</translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation>Nu</translation>
+    </message>
+    <message>
+        <source>Unknown</source>
+        <translation>Necunoscut</translation>
+    </message>
+</context>
 <context>
     <name>ReceiveCoinsDialog</name>
+    <message>
+        <source>&amp;Message:</source>
+        <translation>&amp;Mesaj:</translation>
+    </message>
+    <message>
+        <source>Show</source>
+        <translation>Arată</translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation>Elimină</translation>
+    </message>
     </context>
 <context>
     <name>ReceiveRequestDialog</name>
+    <message>
+        <source>&amp;Save Image...</source>
+        <translation>&amp;Salvează imaginea...</translation>
+    </message>
+    </context>
+<context>
+    <name>RecentRequestsTableModel</name>
     </context>
 <context>
     <name>SendCoinsDialog</name>
+    <message>
+        <source>Quantity:</source>
+        <translation>Cantitatea:</translation>
+    </message>
+    <message>
+        <source>Bytes:</source>
+        <translation>Biți:</translation>
+    </message>
+    <message>
+        <source>Amount:</source>
+        <translation>Cantitate:</translation>
+    </message>
+    <message>
+        <source>Fee:</source>
+        <translation>Taxa:</translation>
+    </message>
+    <message>
+        <source>After Fee:</source>
+        <translation>După taxă:</translation>
+    </message>
+    <message>
+        <source>Change:</source>
+        <translation>Schimbă:</translation>
+    </message>
     </context>
 <context>
     <name>SendCoinsEntry</name>
     </context>
+<context>
+    <name>SendConfirmationDialog</name>
+    </context>
 <context>
     <name>ShutdownWindow</name>
     </context>
@@ -124,13 +721,47 @@
 <context>
     <name>TrafficGraphWidget</name>
     </context>
+<context>
+    <name>TransactionDesc</name>
+    </context>
 <context>
     <name>TransactionDescDialog</name>
     </context>
+<context>
+    <name>TransactionTableModel</name>
+    </context>
+<context>
+    <name>TransactionView</name>
+    </context>
 <context>
     <name>UnitDisplayStatusBarControl</name>
     </context>
 <context>
-    <name>bitcoin-core</name>
+    <name>WalletFrame</name>
     </context>
+<context>
+    <name>WalletModel</name>
+    </context>
+<context>
+    <name>WalletView</name>
+    </context>
+<context>
+    <name>bitcoin-core</name>
+    <message>
+        <source>Bitcoin Core</source>
+        <translation>Bitcoin Core</translation>
+    </message>
+    <message>
+        <source>Information</source>
+        <translation>Informație</translation>
+    </message>
+    <message>
+        <source>Warning</source>
+        <translation>Atenționare</translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation>Eroare</translation>
+    </message>
+</context>
 </TS>
\ No newline at end of file
diff --git a/src/qt/locale/bitcoin_ro_RO.ts b/src/qt/locale/bitcoin_ro_RO.ts
index 489ed07639189..92fc87f4f2cae 100644
--- a/src/qt/locale/bitcoin_ro_RO.ts
+++ b/src/qt/locale/bitcoin_ro_RO.ts
@@ -41,7 +41,10 @@
         <source>&amp;Delete</source>
         <translation>&amp;Şterge</translation>
     </message>
-</context>
+    </context>
+<context>
+    <name>AddressTableModel</name>
+    </context>
 <context>
     <name>AskPassphraseDialog</name>
     <message>
@@ -60,7 +63,7 @@
         <source>Repeat new passphrase</source>
         <translation>Repetaţi noua frază de acces</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>BanTableModel</name>
     <message>
@@ -258,26 +261,6 @@
         <source>Processed %n block(s) of transaction history.</source>
         <translation><numerusform>S-a procesat %n bloc din istoricul tranzacţiilor.</numerusform><numerusform>S-au procesat %n blocuri din istoricul tranzacţiilor.</numerusform><numerusform>S-au procesat %n de blocuri din istoricul tranzacţiilor.</numerusform></translation>
     </message>
-    <message numerus="yes">
-        <source>%n hour(s)</source>
-        <translation><numerusform>%n oră</numerusform><numerusform>%n ore</numerusform><numerusform>%n ore</numerusform></translation>
-    </message>
-    <message numerus="yes">
-        <source>%n day(s)</source>
-        <translation><numerusform>%n zi</numerusform><numerusform>%n zile</numerusform><numerusform>%n de zile</numerusform></translation>
-    </message>
-    <message numerus="yes">
-        <source>%n week(s)</source>
-        <translation><numerusform>%n săptămână</numerusform><numerusform>%n săptămâni</numerusform><numerusform>%n de săptămâni</numerusform></translation>
-    </message>
-    <message>
-        <source>%1 and %2</source>
-        <translation>%1 şi %2</translation>
-    </message>
-    <message numerus="yes">
-        <source>%n year(s)</source>
-        <translation><numerusform>%n an</numerusform><numerusform>%n ani</numerusform><numerusform>%n de ani</numerusform></translation>
-    </message>
     <message>
         <source>%1 behind</source>
         <translation>%1 în urmă</translation>
@@ -356,7 +339,7 @@
         <source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;locked&lt;/b&gt;</source>
         <translation>Portofelul este &lt;b&gt;criptat&lt;/b&gt; iar în momentul de faţă este &lt;b&gt;blocat&lt;/b&gt;</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>CoinControlDialog</name>
     <message>
@@ -375,10 +358,6 @@
         <source>Amount:</source>
         <translation>Sumă:</translation>
     </message>
-    <message>
-        <source>Priority:</source>
-        <translation>Prioritate:</translation>
-    </message>
     <message>
         <source>Fee:</source>
         <translation>Taxă:</translation>
@@ -431,11 +410,7 @@
         <source>Confirmed</source>
         <translation>Confirmat</translation>
     </message>
-    <message>
-        <source>Priority</source>
-        <translation>Prioritate</translation>
-    </message>
-</context>
+    </context>
 <context>
     <name>EditAddressDialog</name>
     <message>
@@ -458,7 +433,7 @@
         <source>&amp;Address</source>
         <translation>&amp;Adresă</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>FreespaceChecker</name>
     <message>
@@ -564,6 +539,21 @@
         <translation><numerusform>(din %n GB necesar)</numerusform><numerusform>(din %n GB necesari)</numerusform><numerusform>(din %n GB necesari)</numerusform></translation>
     </message>
 </context>
+<context>
+    <name>ModalOverlay</name>
+    <message>
+        <source>Form</source>
+        <translation>Form</translation>
+    </message>
+    <message>
+        <source>Last block time</source>
+        <translation>Data ultimului bloc</translation>
+    </message>
+    <message>
+        <source>Hide</source>
+        <translation>Ascunde</translation>
+    </message>
+    </context>
 <context>
     <name>OpenURIDialog</name>
     <message>
@@ -582,7 +572,7 @@
         <source>Select payment request file</source>
         <translation>Selectaţi fişierul cerere de plată</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>OptionsDialog</name>
     <message>
@@ -857,6 +847,9 @@
         <translation>Soldul dvs. total în adresele doar-supraveghere</translation>
     </message>
 </context>
+<context>
+    <name>PaymentServer</name>
+    </context>
 <context>
     <name>PeerTableModel</name>
     <message>
@@ -867,11 +860,7 @@
         <source>Node/Service</source>
         <translation>Nod/Serviciu</translation>
     </message>
-    <message>
-        <source>Ping Time</source>
-        <translation>Timp ping</translation>
-    </message>
-</context>
+    </context>
 <context>
     <name>QObject</name>
     <message>
@@ -910,7 +899,21 @@
         <source>%1 ms</source>
         <translation>%1 ms</translation>
     </message>
-</context>
+    <message>
+        <source>%1 and %2</source>
+        <translation>%1 şi %2</translation>
+    </message>
+    </context>
+<context>
+    <name>QObject::QObject</name>
+    </context>
+<context>
+    <name>QRImageWidget</name>
+    <message>
+        <source>&amp;Save Image...</source>
+        <translation>&amp;Salvează imaginea...</translation>
+    </message>
+    </context>
 <context>
     <name>RPCConsole</name>
     <message>
@@ -1073,10 +1076,6 @@
         <source>Clear console</source>
         <translation>Curăţă consola</translation>
     </message>
-    <message>
-        <source>&amp;Disconnect Node</source>
-        <translation>&amp;Deconectare nod</translation>
-    </message>
     <message>
         <source>1 &amp;hour</source>
         <translation>1 &amp;oră</translation>
@@ -1216,7 +1215,7 @@
         <source>Remove</source>
         <translation>Înlătură</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>ReceiveRequestDialog</name>
     <message>
@@ -1235,7 +1234,14 @@
         <source>&amp;Save Image...</source>
         <translation>&amp;Salvează imaginea...</translation>
     </message>
-</context>
+    <message>
+        <source>Amount</source>
+        <translation>Cantitate</translation>
+    </message>
+    </context>
+<context>
+    <name>RecentRequestsTableModel</name>
+    </context>
 <context>
     <name>SendCoinsDialog</name>
     <message>
@@ -1270,10 +1276,6 @@
         <source>Amount:</source>
         <translation>Sumă:</translation>
     </message>
-    <message>
-        <source>Priority:</source>
-        <translation>Prioritate:</translation>
-    </message>
     <message>
         <source>Fee:</source>
         <translation>Taxă:</translation>
@@ -1322,10 +1324,6 @@
         <source>Custom:</source>
         <translation>Personalizat:</translation>
     </message>
-    <message>
-        <source>Confirmation time:</source>
-        <translation>Timp confirmare:</translation>
-    </message>
     <message>
         <source>normal</source>
         <translation>normal</translation>
@@ -1366,7 +1364,7 @@
         <source>S&amp;end</source>
         <translation>Trimit&amp;e</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>SendCoinsEntry</name>
     <message>
@@ -1429,7 +1427,10 @@
         <source>Memo:</source>
         <translation>Memo:</translation>
     </message>
-</context>
+    </context>
+<context>
+    <name>SendConfirmationDialog</name>
+    </context>
 <context>
     <name>ShutdownWindow</name>
     <message>
@@ -1519,7 +1520,7 @@
         <source>Reset all verify message fields</source>
         <translation>Resetează toate cîmpurile mesajelor semnate</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>SplashScreen</name>
     <message>
@@ -1534,13 +1535,26 @@
         <translation>KB/s</translation>
     </message>
 </context>
+<context>
+    <name>TransactionDesc</name>
+    <message>
+        <source>Amount</source>
+        <translation>Cantitate</translation>
+    </message>
+    </context>
 <context>
     <name>TransactionDescDialog</name>
     <message>
         <source>This pane shows a detailed description of the transaction</source>
         <translation>Acest panou arată o descriere detaliată a tranzacţiei</translation>
     </message>
-</context>
+    </context>
+<context>
+    <name>TransactionTableModel</name>
+    </context>
+<context>
+    <name>TransactionView</name>
+    </context>
 <context>
     <name>UnitDisplayStatusBarControl</name>
     <message>
@@ -1548,6 +1562,15 @@
         <translation>Unitatea în care sînt arătate sumele. Faceţi clic pentru a selecta o altă unitate.</translation>
     </message>
 </context>
+<context>
+    <name>WalletFrame</name>
+    </context>
+<context>
+    <name>WalletModel</name>
+    </context>
+<context>
+    <name>WalletView</name>
+    </context>
 <context>
     <name>bitcoin-core</name>
     <message>
@@ -1574,10 +1597,6 @@
         <source>Run in the background as a daemon and accept commands</source>
         <translation>Rulează în fundal ca un demon şi acceptă comenzi</translation>
     </message>
-    <message>
-        <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
-        <translation>Acceptă conexiuni din afară (implicit: 1 dacă nu se foloseşte -proxy sau -connect)</translation>
-    </message>
     <message>
         <source>Bitcoin Core</source>
         <translation>Nucleul Bitcoin</translation>
@@ -1586,10 +1605,6 @@
         <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source>
         <translation>Ataşaţi adresei date şi ascultaţi totdeauna pe ea. Folosiţi notaţia [host]:port pentru IPv6</translation>
     </message>
-    <message>
-        <source>Distributed under the MIT software license, see the accompanying file COPYING or &lt;http://www.opensource.org/licenses/mit-license.php&gt;.</source>
-        <translation>Distribuit sub licenţa de programe MIT/X11, vezi fişierul însoţitor COPYING sau &lt;http://www.opensource.org/licenses/mit-license.php&gt;.</translation>
-    </message>
     <message>
         <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source>
         <translation>Execută comanda cînd o tranzacţie a portofelului se schimbă (%s în cmd este înlocuit de TxID)</translation>
@@ -1598,18 +1613,6 @@
         <source>Set the number of script verification threads (%u to %d, 0 = auto, &lt;0 = leave that many cores free, default: %d)</source>
         <translation>Setează numărul de thread-uri de verificare a script-urilor (%u la %d, 0 = auto, &lt;0 = lasă atîtea nuclee libere, implicit: %d)</translation>
     </message>
-    <message>
-        <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
-        <translation>Aceasta este o versiune de test preliminară - vă asumaţi riscul folosind-o - nu folosiţi pentru minerit sau aplicaţiile comercianţilor</translation>
-    </message>
-    <message>
-        <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source>
-        <translation>Atenţie: Reţeaua nu pare să fie de acord în totalitate! Aparent nişte mineri au probleme.</translation>
-    </message>
-    <message>
-        <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source>
-        <translation>Atenţie: Aparent, nu sîntem de acord cu toţi partenerii noştri! Va trebui să faceţi o actualizare, sau alte noduri necesită actualizare.</translation>
-    </message>
     <message>
         <source>&lt;category&gt; can be:</source>
         <translation>&lt;category&gt; poate fi:</translation>
@@ -1618,10 +1621,6 @@
         <source>Block creation options:</source>
         <translation>Opţiuni creare bloc:</translation>
     </message>
-    <message>
-        <source>Connect only to the specified node(s)</source>
-        <translation>Conectare doar la nod(urile) specificate</translation>
-    </message>
     <message>
         <source>Connection options:</source>
         <translation>Opţiuni conexiune:</translation>
@@ -1730,10 +1729,6 @@
         <source>Set maximum size of high-priority/low-fee transactions in bytes (default: %d)</source>
         <translation>Setează mărimea pentru tranzacţiile prioritare/taxe mici în octeţi (implicit: %d)</translation>
     </message>
-    <message>
-        <source>This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit &lt;https://www.openssl.org/&gt; and cryptographic software written by Eric Young and UPnP software written by Thomas Bernard.</source>
-        <translation>Acest produs include programe dezvoltate de către Proiectul OpenSSL pentru a fi folosite în OpenSSL Toolkit &lt;https://www.openssl.org/&gt; şi programe criptografice scrise de către Eric Young şi programe UPnP scrise de către Thomas Bernard.</translation>
-    </message>
     <message>
         <source>(default: %u)</source>
         <translation>(implicit: %u)</translation>
@@ -1802,10 +1797,6 @@
         <source>Transaction amount too small</source>
         <translation>Suma tranzacţionată este prea mică</translation>
     </message>
-    <message>
-        <source>Transaction amounts must be positive</source>
-        <translation>Sumele tranzacţionate trebuie să fie pozitive</translation>
-    </message>
     <message>
         <source>Transaction too large for fee policy</source>
         <translation>Tranzacţie prea mare pentru politică gratis</translation>
@@ -1862,10 +1853,6 @@
         <source>Invalid -proxy address: '%s'</source>
         <translation>Adresa -proxy nevalidă: '%s'</translation>
     </message>
-    <message>
-        <source>Set minimum block size in bytes (default: %u)</source>
-        <translation>Setare mărime minimă bloc în octeţi (implicit: %u)</translation>
-    </message>
     <message>
         <source>Specify configuration file (default: %s)</source>
         <translation>Specificaţi fişierul configuraţie (implicit: %s)</translation>
diff --git a/src/qt/locale/bitcoin_ru.ts b/src/qt/locale/bitcoin_ru.ts
index 60f5d5dfa2a4c..aa30270415e22 100644
--- a/src/qt/locale/bitcoin_ru.ts
+++ b/src/qt/locale/bitcoin_ru.ts
@@ -41,6 +41,77 @@
         <source>&amp;Delete</source>
         <translation>&amp;Удалить</translation>
     </message>
+    <message>
+        <source>Choose the address to send coins to</source>
+        <translation>Выберите адрес для отправки перевода</translation>
+    </message>
+    <message>
+        <source>Choose the address to receive coins with</source>
+        <translation>Выберите адрес для получения перевода</translation>
+    </message>
+    <message>
+        <source>C&amp;hoose</source>
+        <translation>&amp;Выбрать</translation>
+    </message>
+    <message>
+        <source>Sending addresses</source>
+        <translation>Адреса отправки</translation>
+    </message>
+    <message>
+        <source>Receiving addresses</source>
+        <translation>Адреса получения</translation>
+    </message>
+    <message>
+        <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source>
+        <translation>Это ваши адреса Bitcoin для отправки платежей. Всегда проверяйте количество и адрес получателя перед отправкой перевода.</translation>
+    </message>
+    <message>
+        <source>These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source>
+        <translation>Это ваши адреса Bitcoin для приёма платежей. Рекомендуется использовать новый адрес получения для каждой транзакции.</translation>
+    </message>
+    <message>
+        <source>&amp;Copy Address</source>
+        <translation>Копировать &amp;адрес</translation>
+    </message>
+    <message>
+        <source>Copy &amp;Label</source>
+        <translation>Копировать &amp;метку</translation>
+    </message>
+    <message>
+        <source>&amp;Edit</source>
+        <translation>&amp;Правка</translation>
+    </message>
+    <message>
+        <source>Export Address List</source>
+        <translation>Экспортировать список адресов</translation>
+    </message>
+    <message>
+        <source>Comma separated file (*.csv)</source>
+        <translation>Текст, разделённый запятыми (*.csv)</translation>
+    </message>
+    <message>
+        <source>Exporting Failed</source>
+        <translation>Экспорт не удался</translation>
+    </message>
+    <message>
+        <source>There was an error trying to save the address list to %1. Please try again.</source>
+        <translation>Произошла ошибка при сохранении списка адресов в %1. Пожалуйста, попробуйте еще раз.</translation>
+    </message>
+</context>
+<context>
+    <name>AddressTableModel</name>
+    <message>
+        <source>Label</source>
+        <translation>Метка</translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation>Адрес</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(нет метки)</translation>
+    </message>
 </context>
 <context>
     <name>AskPassphraseDialog</name>
@@ -60,6 +131,94 @@
         <source>Repeat new passphrase</source>
         <translation>Повторите новый пароль</translation>
     </message>
+    <message>
+        <source>Enter the new passphrase to the wallet.&lt;br/&gt;Please use a passphrase of &lt;b&gt;ten or more random characters&lt;/b&gt;, or &lt;b&gt;eight or more words&lt;/b&gt;.</source>
+        <translation>Введите новый пароль бумажника.&lt;br/&gt;Используйте пароль, состоящий из &lt;b&gt;десяти или более случайных символов&lt;/b&gt;, или &lt;b&gt;восьми или более слов&lt;/b&gt;.</translation>
+    </message>
+    <message>
+        <source>Encrypt wallet</source>
+        <translation>Зашифровать бумажник</translation>
+    </message>
+    <message>
+        <source>This operation needs your wallet passphrase to unlock the wallet.</source>
+        <translation>Для выполнения операции требуется пароль вашего бумажника.</translation>
+    </message>
+    <message>
+        <source>Unlock wallet</source>
+        <translation>Разблокировать бумажник</translation>
+    </message>
+    <message>
+        <source>This operation needs your wallet passphrase to decrypt the wallet.</source>
+        <translation>Для выполнения операции требуется пароль вашего бумажника.</translation>
+    </message>
+    <message>
+        <source>Decrypt wallet</source>
+        <translation>Расшифровать бумажник</translation>
+    </message>
+    <message>
+        <source>Change passphrase</source>
+        <translation>Сменить пароль</translation>
+    </message>
+    <message>
+        <source>Enter the old passphrase and new passphrase to the wallet.</source>
+        <translation>Введите старый и новый пароль для бумажника.</translation>
+    </message>
+    <message>
+        <source>Confirm wallet encryption</source>
+        <translation>Подтвердите шифрование бумажника</translation>
+    </message>
+    <message>
+        <source>Warning: If you encrypt your wallet and lose your passphrase, you will &lt;b&gt;LOSE ALL OF YOUR BITCOINS&lt;/b&gt;!</source>
+        <translation>Предупреждение: если вы зашифруете бумажник и потеряете пароль, вы &lt;b&gt;ПОТЕРЯЕТЕ ВСЕ ВАШИ БИТКОИНЫ&lt;/b&gt;!</translation>
+    </message>
+    <message>
+        <source>Are you sure you wish to encrypt your wallet?</source>
+        <translation>Вы уверены, что хотите зашифровать ваш бумажник?</translation>
+    </message>
+    <message>
+        <source>Wallet encrypted</source>
+        <translation>Бумажник зашифрован</translation>
+    </message>
+    <message>
+        <source>%1 will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source>
+        <translation>Сейчас %1 закроется для завершения процесса шифрования. Помните, что шифрование вашего бумажника не может полностью защитить ваши биткоины от кражи с помощью инфицирования вашего компьютера вредоносным ПО.</translation>
+    </message>
+    <message>
+        <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source>
+        <translation>ВАЖНО: все предыдущие резервные копии вашего бумажника должны быть заменены новым зашифрованным файлом. В целях безопасности предыдущие резервные копии незашифрованного бумажника станут бесполезны, как только вы начнёте использовать новый зашифрованный бумажник.</translation>
+    </message>
+    <message>
+        <source>Wallet encryption failed</source>
+        <translation>Не удалось зашифровать бумажник</translation>
+    </message>
+    <message>
+        <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
+        <translation>Шифрование бумажника не удалось из-за внутренней ошибки. Ваш бумажник не был зашифрован.</translation>
+    </message>
+    <message>
+        <source>The supplied passphrases do not match.</source>
+        <translation>Введённые пароли не совпадают.</translation>
+    </message>
+    <message>
+        <source>Wallet unlock failed</source>
+        <translation>Разблокировка бумажника не удалась</translation>
+    </message>
+    <message>
+        <source>The passphrase entered for the wallet decryption was incorrect.</source>
+        <translation>Неверный пароль для расшифровки бумажника.</translation>
+    </message>
+    <message>
+        <source>Wallet decryption failed</source>
+        <translation>Расшифровка бумажника не удалась</translation>
+    </message>
+    <message>
+        <source>Wallet passphrase was successfully changed.</source>
+        <translation>Пароль бумажника успешно изменён.</translation>
+    </message>
+    <message>
+        <source>Warning: The Caps Lock key is on!</source>
+        <translation>Внимание: Caps Lock включен!</translation>
+    </message>
 </context>
 <context>
     <name>BanTableModel</name>
@@ -158,6 +317,18 @@
         <source>Open &amp;URI...</source>
         <translation>Открыть &amp;URI...</translation>
     </message>
+    <message>
+        <source>Click to disable network activity.</source>
+        <translation>Кликните, чтобы запретить сетевую активность.</translation>
+    </message>
+    <message>
+        <source>Network activity disabled.</source>
+        <translation>Сетевая активность запрещена.</translation>
+    </message>
+    <message>
+        <source>Click to enable network activity again.</source>
+        <translation>Кликните, чтобы снова разрешить сетевую активность.</translation>
+    </message>
     <message>
         <source>Reindexing blocks on disk...</source>
         <translation>Идёт переиндексация блоков на диске...</translation>
@@ -278,26 +449,6 @@
         <source>Processed %n block(s) of transaction history.</source>
         <translation><numerusform>Обработан %n блок истории транзакций.</numerusform><numerusform>Обработано %n блока истории транзакций.</numerusform><numerusform>Обработано %n блоков истории транзакций.</numerusform><numerusform>Обработано %n блоков истории транзакций.</numerusform></translation>
     </message>
-    <message numerus="yes">
-        <source>%n hour(s)</source>
-        <translation><numerusform>%n час</numerusform><numerusform>%n часа</numerusform><numerusform>%n часов</numerusform><numerusform>%n часов</numerusform></translation>
-    </message>
-    <message numerus="yes">
-        <source>%n day(s)</source>
-        <translation><numerusform>%n день</numerusform><numerusform>%n дня</numerusform><numerusform>%n дней</numerusform><numerusform>%n дней</numerusform></translation>
-    </message>
-    <message numerus="yes">
-        <source>%n week(s)</source>
-        <translation><numerusform>%n неделю</numerusform><numerusform>%n недели</numerusform><numerusform>%n недель</numerusform><numerusform>%n недель</numerusform></translation>
-    </message>
-    <message>
-        <source>%1 and %2</source>
-        <translation>%1 и %2</translation>
-    </message>
-    <message numerus="yes">
-        <source>%n year(s)</source>
-        <translation><numerusform>%n год</numerusform><numerusform>%n лет</numerusform><numerusform>%n лет</numerusform><numerusform>%n года</numerusform></translation>
-    </message>
     <message>
         <source>%1 behind</source>
         <translation>%1 позади</translation>
@@ -326,6 +477,10 @@
         <source>Up to date</source>
         <translation>Синхронизировано</translation>
     </message>
+    <message>
+        <source>Show the %1 help message to get a list with possible Bitcoin command-line options</source>
+        <translation>Показать помощь по %1, чтобы получить список доступных параметров командной строки</translation>
+    </message>
     <message>
         <source>%1 client</source>
         <translation>%1 клиент</translation>
@@ -372,6 +527,14 @@
         <source>Incoming transaction</source>
         <translation>Входящая транзакция</translation>
     </message>
+    <message>
+        <source>HD key generation is &lt;b&gt;enabled&lt;/b&gt;</source>
+        <translation>Генерация HD-ключей &lt;b&gt;разрешена&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <source>HD key generation is &lt;b&gt;disabled&lt;/b&gt;</source>
+        <translation>Генерация HD-ключей &lt;b&gt;запрещена&lt;/b&gt;</translation>
+    </message>
     <message>
         <source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;unlocked&lt;/b&gt;</source>
         <translation>Бумажник &lt;b&gt;зашифрован&lt;/b&gt; и в настоящее время &lt;b&gt;разблокирован&lt;/b&gt;</translation>
@@ -380,7 +543,7 @@
         <source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;locked&lt;/b&gt;</source>
         <translation>Бумажник &lt;b&gt;зашифрован&lt;/b&gt; и в настоящее время &lt;b&gt;заблокирован&lt;/b&gt;</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>CoinControlDialog</name>
     <message>
@@ -399,10 +562,6 @@
         <source>Amount:</source>
         <translation>Сумма:</translation>
     </message>
-    <message>
-        <source>Priority:</source>
-        <translation>Приоритет:</translation>
-    </message>
     <message>
         <source>Fee:</source>
         <translation>Комиссия:</translation>
@@ -456,8 +615,84 @@
         <translation>Подтверждено</translation>
     </message>
     <message>
-        <source>Priority</source>
-        <translation>Приоритет</translation>
+        <source>Copy address</source>
+        <translation>Копировать адрес</translation>
+    </message>
+    <message>
+        <source>Copy label</source>
+        <translation>Копировать метку</translation>
+    </message>
+    <message>
+        <source>Copy amount</source>
+        <translation>Копировать сумму</translation>
+    </message>
+    <message>
+        <source>Copy transaction ID</source>
+        <translation>Копировать ID транзакции</translation>
+    </message>
+    <message>
+        <source>Lock unspent</source>
+        <translation>Заблокировать непотраченное</translation>
+    </message>
+    <message>
+        <source>Unlock unspent</source>
+        <translation>Разблокировать непотраченное</translation>
+    </message>
+    <message>
+        <source>Copy quantity</source>
+        <translation>Копировать количество</translation>
+    </message>
+    <message>
+        <source>Copy fee</source>
+        <translation>Копировать комиссию</translation>
+    </message>
+    <message>
+        <source>Copy after fee</source>
+        <translation>Копировать после комиссии</translation>
+    </message>
+    <message>
+        <source>Copy bytes</source>
+        <translation>Копировать байты</translation>
+    </message>
+    <message>
+        <source>Copy dust</source>
+        <translation>Копировать пыль</translation>
+    </message>
+    <message>
+        <source>Copy change</source>
+        <translation>Копировать сдачу</translation>
+    </message>
+    <message>
+        <source>(%1 locked)</source>
+        <translation>(%1 заблокировано)</translation>
+    </message>
+    <message>
+        <source>yes</source>
+        <translation>да</translation>
+    </message>
+    <message>
+        <source>no</source>
+        <translation>нет</translation>
+    </message>
+    <message>
+        <source>This label turns red if any recipient receives an amount smaller than the current dust threshold.</source>
+        <translation>Эта метка станет красной, если любой получатель получит сумму меньше, чем текущий порог пыли.</translation>
+    </message>
+    <message>
+        <source>Can vary +/- %1 satoshi(s) per input.</source>
+        <translation>Может отличаться на +/- %1 сатоши на вход.</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(нет метки)</translation>
+    </message>
+    <message>
+        <source>change from %1 (%2)</source>
+        <translation>сдача с %1 (%2)</translation>
+    </message>
+    <message>
+        <source>(change)</source>
+        <translation>(сдача)</translation>
     </message>
 </context>
 <context>
@@ -482,6 +717,38 @@
         <source>&amp;Address</source>
         <translation>&amp;Адрес</translation>
     </message>
+    <message>
+        <source>New receiving address</source>
+        <translation>Новый адрес получения</translation>
+    </message>
+    <message>
+        <source>New sending address</source>
+        <translation>Новый адрес отправки</translation>
+    </message>
+    <message>
+        <source>Edit receiving address</source>
+        <translation>Изменить адрес получения</translation>
+    </message>
+    <message>
+        <source>Edit sending address</source>
+        <translation>Изменить адрес отправки</translation>
+    </message>
+    <message>
+        <source>The entered address "%1" is not a valid Bitcoin address.</source>
+        <translation>Введённый адрес "%1" не является правильным Bitcoin-адресом.</translation>
+    </message>
+    <message>
+        <source>The entered address "%1" is already in the address book.</source>
+        <translation>Введённый адрес "%1" уже находится в адресной книге.</translation>
+    </message>
+    <message>
+        <source>Could not unlock wallet.</source>
+        <translation>Не удается разблокировать бумажник.</translation>
+    </message>
+    <message>
+        <source>New key generation failed.</source>
+        <translation>Генерация нового ключа не удалась.</translation>
+    </message>
 </context>
 <context>
     <name>FreespaceChecker</name>
@@ -604,6 +871,57 @@
         <translation><numerusform>(из необходимых %n ГБ)</numerusform><numerusform>(из необходимых %n ГБ)</numerusform><numerusform>(из необходимых %n ГБ)</numerusform><numerusform>(из необходимых %n ГБ)</numerusform></translation>
     </message>
 </context>
+<context>
+    <name>ModalOverlay</name>
+    <message>
+        <source>Form</source>
+        <translation>Форма</translation>
+    </message>
+    <message>
+        <source>Recent transactions may not yet be visible, and therefore your wallet's balance might be incorrect. This information will be correct once your wallet has finished synchronizing with the bitcoin network, as detailed below.</source>
+        <translation>Недавние транзакции могут быть пока не видны, поэтому ваш баланс может отображаться некорректно. Эта информация станет корректной, как только ваш бумажник будет синхронизирован с сетью, см. подробности ниже.</translation>
+    </message>
+    <message>
+        <source>Attempting to spend bitcoins that are affected by not-yet-displayed transactions will not be accepted by the network.</source>
+        <translation>Попытка потратить биткоины из ещё не отображённых транзакций будет отвергнута сетью.</translation>
+    </message>
+    <message>
+        <source>Number of blocks left</source>
+        <translation>Число оставшихся блоков</translation>
+    </message>
+    <message>
+        <source>Unknown...</source>
+        <translation>Неизвестно...</translation>
+    </message>
+    <message>
+        <source>Last block time</source>
+        <translation>Время последнего блока</translation>
+    </message>
+    <message>
+        <source>Progress</source>
+        <translation>Прогресс</translation>
+    </message>
+    <message>
+        <source>Progress increase per hour</source>
+        <translation>Прогресс за час</translation>
+    </message>
+    <message>
+        <source>calculating...</source>
+        <translation>расчёт...</translation>
+    </message>
+    <message>
+        <source>Estimated time left until synced</source>
+        <translation>Примерное время до завершения синхронизации</translation>
+    </message>
+    <message>
+        <source>Hide</source>
+        <translation>Скрыть</translation>
+    </message>
+    <message>
+        <source>Unknown. Syncing Headers (%1)...</source>
+        <translation>Неизвестно. Синхронизация заголовков (%1)...</translation>
+    </message>
+</context>
 <context>
     <name>OpenURIDialog</name>
     <message>
@@ -622,6 +940,10 @@
         <source>Select payment request file</source>
         <translation>Выбрать файл запроса платежа</translation>
     </message>
+    <message>
+        <source>Select payment request file to open</source>
+        <translation>Выберите файл запроса платежа</translation>
+    </message>
 </context>
 <context>
     <name>OptionsDialog</name>
@@ -655,7 +977,7 @@
     </message>
     <message>
         <source>Accept connections from outside</source>
-        <translation>Разрешать соединения извне</translation>
+        <translation>Принимать входящие соединения</translation>
     </message>
     <message>
         <source>Allow incoming connections</source>
@@ -933,6 +1255,97 @@
         <translation>Текущий общий баланс на адресах наблюдения</translation>
     </message>
 </context>
+<context>
+    <name>PaymentServer</name>
+    <message>
+        <source>Payment request error</source>
+        <translation>Ошибка запроса платежа</translation>
+    </message>
+    <message>
+        <source>Cannot start bitcoin: click-to-pay handler</source>
+        <translation>Не удаётся запустить bitcoin: обработчик click-to-pay</translation>
+    </message>
+    <message>
+        <source>URI handling</source>
+        <translation>Обработка URI</translation>
+    </message>
+    <message>
+        <source>Payment request fetch URL is invalid: %1</source>
+        <translation>Неверный URL запроса платежа: %1</translation>
+    </message>
+    <message>
+        <source>Invalid payment address %1</source>
+        <translation>Неверный адрес платежа %1</translation>
+    </message>
+    <message>
+        <source>URI cannot be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source>
+        <translation>Не удалось обработать URI! Это может быть связано с неверным адресом Bitcoin или неправильными параметрами URI.</translation>
+    </message>
+    <message>
+        <source>Payment request file handling</source>
+        <translation>Обработка файла запроса платежа</translation>
+    </message>
+    <message>
+        <source>Payment request file cannot be read! This can be caused by an invalid payment request file.</source>
+        <translation>Файл запроса платежа не может быть прочитан! Обычно это происходит из-за неверного файла запроса платежа.</translation>
+    </message>
+    <message>
+        <source>Payment request rejected</source>
+        <translation>Запрос платежа отклонён</translation>
+    </message>
+    <message>
+        <source>Payment request network doesn't match client network.</source>
+        <translation>Сеть запроса платежа не совпадает с сетью клиента.</translation>
+    </message>
+    <message>
+        <source>Payment request expired.</source>
+        <translation>Запрос платежа просрочен.</translation>
+    </message>
+    <message>
+        <source>Payment request is not initialized.</source>
+        <translation>Запрос платежа не инициализирован.</translation>
+    </message>
+    <message>
+        <source>Unverified payment requests to custom payment scripts are unsupported.</source>
+        <translation>Непроверенные запросы платежей с нестандартными платёжными сценариями не поддерживаются.</translation>
+    </message>
+    <message>
+        <source>Invalid payment request.</source>
+        <translation>Неверный запрос платежа.</translation>
+    </message>
+    <message>
+        <source>Requested payment amount of %1 is too small (considered dust).</source>
+        <translation>Запрошенная сумма платежа %1 слишком мала (считается пылью).</translation>
+    </message>
+    <message>
+        <source>Refund from %1</source>
+        <translation>Возврат от %1</translation>
+    </message>
+    <message>
+        <source>Payment request %1 is too large (%2 bytes, allowed %3 bytes).</source>
+        <translation>Запрос платежа %1 слишком большой (%2 байтов, разрешено %3 байтов).</translation>
+    </message>
+    <message>
+        <source>Error communicating with %1: %2</source>
+        <translation>Ошибка связи с %1: %2</translation>
+    </message>
+    <message>
+        <source>Payment request cannot be parsed!</source>
+        <translation>Запрос платежа не может быть разобран!</translation>
+    </message>
+    <message>
+        <source>Bad response from server %1</source>
+        <translation>Плохой ответ сервера %1</translation>
+    </message>
+    <message>
+        <source>Network request error</source>
+        <translation>Ошибка сетевого запроса</translation>
+    </message>
+    <message>
+        <source>Payment acknowledged</source>
+        <translation>Платёж принят</translation>
+    </message>
+</context>
 <context>
     <name>PeerTableModel</name>
     <message>
@@ -944,8 +1357,12 @@
         <translation>Узел/сервис</translation>
     </message>
     <message>
-        <source>Ping Time</source>
-        <translation>Время задержки</translation>
+        <source>NodeId</source>
+        <translation>Id узла</translation>
+    </message>
+    <message>
+        <source>Ping</source>
+        <translation>Пинг</translation>
     </message>
 </context>
 <context>
@@ -986,10 +1403,60 @@
         <source>%1 ms</source>
         <translation>%1 мс</translation>
     </message>
-</context>
-<context>
-    <name>RPCConsole</name>
-    <message>
+    <message numerus="yes">
+        <source>%n second(s)</source>
+        <translation><numerusform>%n секунда</numerusform><numerusform>%n секунды</numerusform><numerusform>%n секунд</numerusform><numerusform>%n секунд</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%n minute(s)</source>
+        <translation><numerusform>%n минута</numerusform><numerusform>%n минут</numerusform><numerusform>%n минут</numerusform><numerusform>%n минут</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%n hour(s)</source>
+        <translation><numerusform>%n час</numerusform><numerusform>%n часа</numerusform><numerusform>%n часов</numerusform><numerusform>%n часов</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%n day(s)</source>
+        <translation><numerusform>%n день</numerusform><numerusform>%n дня</numerusform><numerusform>%n дней</numerusform><numerusform>%n дней</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%n week(s)</source>
+        <translation><numerusform>%n неделя</numerusform><numerusform>%n недели</numerusform><numerusform>%n недель</numerusform><numerusform>%n недель</numerusform></translation>
+    </message>
+    <message>
+        <source>%1 and %2</source>
+        <translation>%1 и %2</translation>
+    </message>
+    <message numerus="yes">
+        <source>%n year(s)</source>
+        <translation><numerusform>%n год</numerusform><numerusform>%n года</numerusform><numerusform>%n лет</numerusform><numerusform>%n лет</numerusform></translation>
+    </message>
+    </context>
+<context>
+    <name>QObject::QObject</name>
+    </context>
+<context>
+    <name>QRImageWidget</name>
+    <message>
+        <source>&amp;Save Image...</source>
+        <translation>&amp;Сохранить изображение...</translation>
+    </message>
+    <message>
+        <source>&amp;Copy Image</source>
+        <translation>Копировать &amp;изображение</translation>
+    </message>
+    <message>
+        <source>Save QR Code</source>
+        <translation>Сохранить QR-код</translation>
+    </message>
+    <message>
+        <source>PNG Image (*.png)</source>
+        <translation>Изображение PNG (*.png)</translation>
+    </message>
+</context>
+<context>
+    <name>RPCConsole</name>
+    <message>
         <source>N/A</source>
         <translation>Н/Д</translation>
     </message>
@@ -1145,6 +1612,10 @@
         <source>Ping Wait</source>
         <translation>Время задержки</translation>
     </message>
+    <message>
+        <source>Min Ping</source>
+        <translation>Мин. пинг</translation>
+    </message>
     <message>
         <source>Time Offset</source>
         <translation>Смещение времени</translation>
@@ -1189,14 +1660,6 @@
         <source>Clear console</source>
         <translation>Очистить консоль</translation>
     </message>
-    <message>
-        <source>&amp;Disconnect Node</source>
-        <translation>&amp;Отключить узел</translation>
-    </message>
-    <message>
-        <source>Ban Node for</source>
-        <translation>Заблокировать узел на</translation>
-    </message>
     <message>
         <source>1 &amp;hour</source>
         <translation>1 &amp;час</translation>
@@ -1214,8 +1677,16 @@
         <translation>1 &amp;год</translation>
     </message>
     <message>
-        <source>&amp;Unban Node</source>
-        <translation>&amp;Разблокировать узел</translation>
+        <source>&amp;Disconnect</source>
+        <translation>&amp;Отключиться</translation>
+    </message>
+    <message>
+        <source>Ban for</source>
+        <translation>Бан на</translation>
+    </message>
+    <message>
+        <source>&amp;Unban</source>
+        <translation>&amp;Разбанить</translation>
     </message>
     <message>
         <source>Welcome to the %1 RPC console.</source>
@@ -1229,6 +1700,14 @@
         <source>Type &lt;b&gt;help&lt;/b&gt; for an overview of available commands.</source>
         <translation>Напишите &lt;b&gt;help&lt;/b&gt; для просмотра доступных команд.</translation>
     </message>
+    <message>
+        <source>WARNING: Scammers have been active, telling users to type commands here, stealing their wallet contents. Do not use this console without fully understanding the ramification of a command.</source>
+        <translation>ВНИМАНИЕ: мошенники предлагали пользователям вводить сюда команды, похищая таким образом содержимое их бумажников. Не используйте эту консоль без полного понимания смысла команд.</translation>
+    </message>
+    <message>
+        <source>Network activity disabled</source>
+        <translation>Сетевая активность запрещена</translation>
+    </message>
     <message>
         <source>%1 B</source>
         <translation>%1 Б</translation>
@@ -1348,6 +1827,22 @@
         <source>Remove</source>
         <translation>Удалить</translation>
     </message>
+    <message>
+        <source>Copy URI</source>
+        <translation>Копировать URI</translation>
+    </message>
+    <message>
+        <source>Copy label</source>
+        <translation>Копировать метку</translation>
+    </message>
+    <message>
+        <source>Copy message</source>
+        <translation>Копировать сообщение</translation>
+    </message>
+    <message>
+        <source>Copy amount</source>
+        <translation>Копировать сумму</translation>
+    </message>
 </context>
 <context>
     <name>ReceiveRequestDialog</name>
@@ -1367,6 +1862,73 @@
         <source>&amp;Save Image...</source>
         <translation>&amp;Сохранить изображение...</translation>
     </message>
+    <message>
+        <source>Request payment to %1</source>
+        <translation>Запросить платёж на %1</translation>
+    </message>
+    <message>
+        <source>Payment information</source>
+        <translation>Информация платежа</translation>
+    </message>
+    <message>
+        <source>URI</source>
+        <translation>URI</translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation>Адрес</translation>
+    </message>
+    <message>
+        <source>Amount</source>
+        <translation>Сумма</translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation>Метка</translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation>Сообщение</translation>
+    </message>
+    <message>
+        <source>Resulting URI too long, try to reduce the text for label / message.</source>
+        <translation>Получившийся URI слишком длинный, попробуйте сократить текст метки / сообщения.</translation>
+    </message>
+    <message>
+        <source>Error encoding URI into QR Code.</source>
+        <translation>Ошибка кодирования URI в QR-код</translation>
+    </message>
+</context>
+<context>
+    <name>RecentRequestsTableModel</name>
+    <message>
+        <source>Date</source>
+        <translation>Дата</translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation>Метка</translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation>Сообщение</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(нет метки)</translation>
+    </message>
+    <message>
+        <source>(no message)</source>
+        <translation>(нет сообщения)</translation>
+    </message>
+    <message>
+        <source>(no amount requested)</source>
+        <translation>(нет запрошенной суммы)</translation>
+    </message>
+    <message>
+        <source>Requested</source>
+        <translation>Запрошено</translation>
+    </message>
 </context>
 <context>
     <name>SendCoinsDialog</name>
@@ -1402,10 +1964,6 @@
         <source>Amount:</source>
         <translation>Сумма:</translation>
     </message>
-    <message>
-        <source>Priority:</source>
-        <translation>Приоритет:</translation>
-    </message>
     <message>
         <source>Fee:</source>
         <translation>Комиссия:</translation>
@@ -1427,301 +1985,962 @@
         <translation>Свой адрес для сдачи</translation>
     </message>
     <message>
-        <source>Transaction Fee:</source>
-        <translation>Комиссия</translation>
+        <source>Transaction Fee:</source>
+        <translation>Комиссия</translation>
+    </message>
+    <message>
+        <source>Choose...</source>
+        <translation>Выберите...</translation>
+    </message>
+    <message>
+        <source>collapse fee-settings</source>
+        <translation>Свернуть настройки комиссии</translation>
+    </message>
+    <message>
+        <source>per kilobyte</source>
+        <translation>за килобайт</translation>
+    </message>
+    <message>
+        <source>If the custom fee is set to 1000 satoshis and the transaction is only 250 bytes, then "per kilobyte" only pays 250 satoshis in fee, while "total at least" pays 1000 satoshis. For transactions bigger than a kilobyte both pay by kilobyte.</source>
+        <translation>Если комиссия установлена в 1000 сатоши, а транзакция составляет лишь 250 байт, тогда комиссия "на килобайт" составит 250 сатоши, а "всего как минимум" — 1000 сатоши. Для транзакций крупнее килобайта в обоих случаях будет использоваться платёж "на килобайт".</translation>
+    </message>
+    <message>
+        <source>Hide</source>
+        <translation>Скрыть</translation>
+    </message>
+    <message>
+        <source>total at least</source>
+        <translation>Итого как минимум</translation>
+    </message>
+    <message>
+        <source>Paying only the minimum fee is just fine as long as there is less transaction volume than space in the blocks. But be aware that this can end up in a never confirming transaction once there is more demand for bitcoin transactions than the network can process.</source>
+        <translation>Уплата минимальной комиссии — не проблема, пока объём транзакций меньше, чем свободное место в блоках. Учтите, однако, что такая транзакция может никогда не подтвердиться, если спрос на транзакции превышает возможности сети по их обработке.</translation>
+    </message>
+    <message>
+        <source>(read the tooltip)</source>
+        <translation>(прочтите подсказку)</translation>
+    </message>
+    <message>
+        <source>Recommended:</source>
+        <translation>Рекомендовано:</translation>
+    </message>
+    <message>
+        <source>Custom:</source>
+        <translation>Выборочно:</translation>
+    </message>
+    <message>
+        <source>(Smart fee not initialized yet. This usually takes a few blocks...)</source>
+        <translation>(Умная комиссия пока не инициализирована. Обычно для этого требуется несколько блоков...)</translation>
+    </message>
+    <message>
+        <source>normal</source>
+        <translation>обычный</translation>
+    </message>
+    <message>
+        <source>fast</source>
+        <translation>ускоренный</translation>
+    </message>
+    <message>
+        <source>Send to multiple recipients at once</source>
+        <translation>Отправить нескольким получателям одновременно</translation>
+    </message>
+    <message>
+        <source>Add &amp;Recipient</source>
+        <translation>&amp;Добавить получателя</translation>
+    </message>
+    <message>
+        <source>Clear all fields of the form.</source>
+        <translation>Очистить все поля формы</translation>
+    </message>
+    <message>
+        <source>Dust:</source>
+        <translation>Пыль:</translation>
+    </message>
+    <message>
+        <source>Confirmation time target:</source>
+        <translation>Время подтверждения:</translation>
+    </message>
+    <message>
+        <source>Clear &amp;All</source>
+        <translation>Очистить &amp;всё</translation>
+    </message>
+    <message>
+        <source>Balance:</source>
+        <translation>Баланс:</translation>
+    </message>
+    <message>
+        <source>Confirm the send action</source>
+        <translation>Подтвердить отправку</translation>
+    </message>
+    <message>
+        <source>S&amp;end</source>
+        <translation>&amp;Отправить</translation>
+    </message>
+    <message>
+        <source>Copy quantity</source>
+        <translation>Копировать количество</translation>
+    </message>
+    <message>
+        <source>Copy amount</source>
+        <translation>Копировать сумму</translation>
+    </message>
+    <message>
+        <source>Copy fee</source>
+        <translation>Копировать комиссию</translation>
+    </message>
+    <message>
+        <source>Copy after fee</source>
+        <translation>Копировать после комиссии</translation>
+    </message>
+    <message>
+        <source>Copy bytes</source>
+        <translation>Копировать байты</translation>
+    </message>
+    <message>
+        <source>Copy dust</source>
+        <translation>Копировать пыль</translation>
+    </message>
+    <message>
+        <source>Copy change</source>
+        <translation>Копировать сдачу</translation>
+    </message>
+    <message>
+        <source>%1 to %2</source>
+        <translation>С %1 на %2</translation>
+    </message>
+    <message>
+        <source>Are you sure you want to send?</source>
+        <translation>Вы уверены, что хотите отправить?</translation>
+    </message>
+    <message>
+        <source>added as transaction fee</source>
+        <translation>добавлено как комиссия</translation>
+    </message>
+    <message>
+        <source>Total Amount %1</source>
+        <translation>Общая сумма %1</translation>
+    </message>
+    <message>
+        <source>or</source>
+        <translation>или</translation>
+    </message>
+    <message>
+        <source>Confirm send coins</source>
+        <translation>Подтвердите отправку монет</translation>
+    </message>
+    <message>
+        <source>The recipient address is not valid. Please recheck.</source>
+        <translation>Адрес получателя неверный. Пожалуйста, перепроверьте.</translation>
+    </message>
+    <message>
+        <source>The amount to pay must be larger than 0.</source>
+        <translation>Сумма для отправки должна быть больше 0.</translation>
+    </message>
+    <message>
+        <source>The amount exceeds your balance.</source>
+        <translation>Сумма превышает ваш баланс.</translation>
+    </message>
+    <message>
+        <source>The total exceeds your balance when the %1 transaction fee is included.</source>
+        <translation>Сумма с учётом комиссии %1 превысит ваш баланс.</translation>
+    </message>
+    <message>
+        <source>Duplicate address found: addresses should only be used once each.</source>
+        <translation>Обнаружен дублирующийся адрес: используйте каждый адрес только один раз.</translation>
+    </message>
+    <message>
+        <source>Transaction creation failed!</source>
+        <translation>Не удалось создать транзакцию!</translation>
+    </message>
+    <message>
+        <source>The transaction was rejected with the following reason: %1</source>
+        <translation>Транзакция была отвергнута по следующей причине: %1</translation>
+    </message>
+    <message>
+        <source>A fee higher than %1 is considered an absurdly high fee.</source>
+        <translation>Комиссия больше чем %1 считается невероятно большой.</translation>
+    </message>
+    <message>
+        <source>Payment request expired.</source>
+        <translation>Запрос платежа просрочен.</translation>
+    </message>
+    <message numerus="yes">
+        <source>%n block(s)</source>
+        <translation><numerusform>%n блок</numerusform><numerusform>%n блока</numerusform><numerusform>%n блоков</numerusform><numerusform>%n блоков</numerusform></translation>
+    </message>
+    <message>
+        <source>Pay only the required fee of %1</source>
+        <translation>Заплатить только обязательную комиссию %1</translation>
+    </message>
+    <message numerus="yes">
+        <source>Estimated to begin confirmation within %n block(s).</source>
+        <translation><numerusform>Начало подтверждения ожидается через %n блок.</numerusform><numerusform>Начало подтверждения ожидается через %n блока.</numerusform><numerusform>Начало подтверждения ожидается через %n блоков.</numerusform><numerusform>Начало подтверждения ожидается через %n блоков.</numerusform></translation>
+    </message>
+    <message>
+        <source>Warning: Invalid Bitcoin address</source>
+        <translation>Внимание: неверный адрес Bitcoin</translation>
+    </message>
+    <message>
+        <source>Warning: Unknown change address</source>
+        <translation>Внимание: неизвестный адрес для сдачи</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(нет метки)</translation>
+    </message>
+</context>
+<context>
+    <name>SendCoinsEntry</name>
+    <message>
+        <source>A&amp;mount:</source>
+        <translation>Ко&amp;личество:</translation>
+    </message>
+    <message>
+        <source>Pay &amp;To:</source>
+        <translation>Полу&amp;чатель:</translation>
+    </message>
+    <message>
+        <source>&amp;Label:</source>
+        <translation>&amp;Метка:</translation>
+    </message>
+    <message>
+        <source>Choose previously used address</source>
+        <translation>Выберите ранее использованный адрес</translation>
+    </message>
+    <message>
+        <source>This is a normal payment.</source>
+        <translation>Это нормальный платёж.</translation>
+    </message>
+    <message>
+        <source>The Bitcoin address to send the payment to</source>
+        <translation>Адрес Bitcoin, на который отправить платёж</translation>
+    </message>
+    <message>
+        <source>Alt+A</source>
+        <translation>Alt+A</translation>
+    </message>
+    <message>
+        <source>Paste address from clipboard</source>
+        <translation>Вставить адрес из буфера обмена</translation>
+    </message>
+    <message>
+        <source>Alt+P</source>
+        <translation>Alt+P</translation>
+    </message>
+    <message>
+        <source>Remove this entry</source>
+        <translation>Удалить эту запись</translation>
+    </message>
+    <message>
+        <source>The fee will be deducted from the amount being sent. The recipient will receive less bitcoins than you enter in the amount field. If multiple recipients are selected, the fee is split equally.</source>
+        <translation>С отправляемой суммы будет удержана комиссия. Получателю придёт меньше биткоинов, чем вы вводите в поле количества. Если выбрано несколько получателей, комиссия распределяется поровну.</translation>
+    </message>
+    <message>
+        <source>S&amp;ubtract fee from amount</source>
+        <translation>Вычесть комиссию из суммы</translation>
+    </message>
+    <message>
+        <source>Message:</source>
+        <translation>Сообщение:</translation>
+    </message>
+    <message>
+        <source>This is an unauthenticated payment request.</source>
+        <translation>Это неавторизованный запрос платежа.</translation>
+    </message>
+    <message>
+        <source>This is an authenticated payment request.</source>
+        <translation>Это авторизованный запрос платежа.</translation>
+    </message>
+    <message>
+        <source>Enter a label for this address to add it to the list of used addresses</source>
+        <translation>Введите метку для этого адреса, чтобы добавить его в список использованных</translation>
+    </message>
+    <message>
+        <source>A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
+        <translation>К bitcoin: URI было прикреплено сообщение, которое будет сохранено вместе с транзакцией для вашего сведения. Заметьте: сообщение не будет отправлено через сеть Bitcoin.</translation>
+    </message>
+    <message>
+        <source>Pay To:</source>
+        <translation>Получатель:</translation>
+    </message>
+    <message>
+        <source>Memo:</source>
+        <translation>Примечание:</translation>
+    </message>
+    <message>
+        <source>Enter a label for this address to add it to your address book</source>
+        <translation>Введите метку для данного адреса, чтобы добавить его в адресную книгу</translation>
+    </message>
+</context>
+<context>
+    <name>SendConfirmationDialog</name>
+    <message>
+        <source>Yes</source>
+        <translation>Да</translation>
+    </message>
+</context>
+<context>
+    <name>ShutdownWindow</name>
+    <message>
+        <source>%1 is shutting down...</source>
+        <translation>%1 выключается...</translation>
+    </message>
+    <message>
+        <source>Do not shut down the computer until this window disappears.</source>
+        <translation>Не выключайте компьютер, пока это окно не исчезнет.</translation>
+    </message>
+</context>
+<context>
+    <name>SignVerifyMessageDialog</name>
+    <message>
+        <source>Signatures - Sign / Verify a Message</source>
+        <translation>Подписи - подписать/проверить сообщение</translation>
+    </message>
+    <message>
+        <source>&amp;Sign Message</source>
+        <translation>&amp;Подписать сообщение</translation>
+    </message>
+    <message>
+        <source>You can sign messages/agreements with your addresses to prove you can receive bitcoins sent to them. Be careful not to sign anything vague or random, as phishing attacks may try to trick you into signing your identity over to them. Only sign fully-detailed statements you agree to.</source>
+        <translation>Вы можете подписывать сообщения/соглашения своими адресами, чтобы доказать свою возможность получать биткоины на них. Будьте осторожны, не подписывайте что-то неопределённое или случайное, так как фишинговые атаки могут обманным путём заставить вас подписать нежелательные сообщения. Подписывайте только те сообщения, с которыми вы согласны вплоть до мелочей.</translation>
+    </message>
+    <message>
+        <source>The Bitcoin address to sign the message with</source>
+        <translation>Адрес Bitcoin, которым подписать сообщение</translation>
+    </message>
+    <message>
+        <source>Choose previously used address</source>
+        <translation>Выберите ранее использованный адрес</translation>
+    </message>
+    <message>
+        <source>Alt+A</source>
+        <translation>Alt+A</translation>
+    </message>
+    <message>
+        <source>Paste address from clipboard</source>
+        <translation>Вставить адрес из буфера обмена</translation>
+    </message>
+    <message>
+        <source>Alt+P</source>
+        <translation>Alt+P</translation>
+    </message>
+    <message>
+        <source>Enter the message you want to sign here</source>
+        <translation>Введите сообщение для подписи</translation>
+    </message>
+    <message>
+        <source>Signature</source>
+        <translation>Подпись</translation>
+    </message>
+    <message>
+        <source>Copy the current signature to the system clipboard</source>
+        <translation>Скопировать текущую подпись в системный буфер обмена</translation>
+    </message>
+    <message>
+        <source>Sign the message to prove you own this Bitcoin address</source>
+        <translation>Подписать сообщение, чтобы доказать владение адресом Bitcoin</translation>
+    </message>
+    <message>
+        <source>Sign &amp;Message</source>
+        <translation>Подписать &amp;Сообщение</translation>
+    </message>
+    <message>
+        <source>Reset all sign message fields</source>
+        <translation>Сбросить значения всех полей подписывания сообщений</translation>
+    </message>
+    <message>
+        <source>Clear &amp;All</source>
+        <translation>Очистить &amp;всё</translation>
+    </message>
+    <message>
+        <source>&amp;Verify Message</source>
+        <translation>&amp;Проверить сообщение</translation>
+    </message>
+    <message>
+        <source>Enter the receiver's address, message (ensure you copy line breaks, spaces, tabs, etc. exactly) and signature below to verify the message. Be careful not to read more into the signature than what is in the signed message itself, to avoid being tricked by a man-in-the-middle attack. Note that this only proves the signing party receives with the address, it cannot prove sendership of any transaction!</source>
+        <translation>Введите ниже адрес получателя, сообщение (убедитесь, что переводы строк, пробелы, табы и т.п. в точности скопированы) и подпись, чтобы проверить сообщение. Убедитесь, что не скопировали лишнего в подпись, по сравнению с самим подписываемым сообщением, чтобы не стать жертвой атаки "man-in-the-middle". Заметьте, что эта операция удостоверяет лишь авторство подписавшего, но не может удостоверить отправителя транзакции.</translation>
+    </message>
+    <message>
+        <source>The Bitcoin address the message was signed with</source>
+        <translation>Адрес Bitcoin, которым было подписано сообщение</translation>
+    </message>
+    <message>
+        <source>Verify the message to ensure it was signed with the specified Bitcoin address</source>
+        <translation>Проверить сообщение, чтобы убедиться, что оно было подписано указанным адресом Bitcoin</translation>
+    </message>
+    <message>
+        <source>Verify &amp;Message</source>
+        <translation>Проверить &amp;Сообщение</translation>
+    </message>
+    <message>
+        <source>Reset all verify message fields</source>
+        <translation>Сбросить все поля проверки сообщения</translation>
+    </message>
+    <message>
+        <source>Click "Sign Message" to generate signature</source>
+        <translation>Нажмите "Подписать сообщение" для создания подписи</translation>
+    </message>
+    <message>
+        <source>The entered address is invalid.</source>
+        <translation>Введённый адрес неверен.</translation>
+    </message>
+    <message>
+        <source>Please check the address and try again.</source>
+        <translation>Пожалуйста, проверьте адрес и попробуйте ещё раз.</translation>
+    </message>
+    <message>
+        <source>The entered address does not refer to a key.</source>
+        <translation>Введённый адрес не связан с ключом.</translation>
+    </message>
+    <message>
+        <source>Wallet unlock was cancelled.</source>
+        <translation>Разблокировка бумажника была отменена.</translation>
+    </message>
+    <message>
+        <source>Private key for the entered address is not available.</source>
+        <translation>Недоступен секретный ключ для введённого адреса.</translation>
+    </message>
+    <message>
+        <source>Message signing failed.</source>
+        <translation>Не удалось подписать сообщение.</translation>
+    </message>
+    <message>
+        <source>Message signed.</source>
+        <translation>Сообщение подписано.</translation>
+    </message>
+    <message>
+        <source>The signature could not be decoded.</source>
+        <translation>Подпись не может быть раскодирована.</translation>
+    </message>
+    <message>
+        <source>Please check the signature and try again.</source>
+        <translation>Пожалуйста, проверьте подпись и попробуйте ещё раз.</translation>
+    </message>
+    <message>
+        <source>The signature did not match the message digest.</source>
+        <translation>Подпись не соответствует отпечатку сообщения.</translation>
+    </message>
+    <message>
+        <source>Message verification failed.</source>
+        <translation>Сообщение не прошло проверку.</translation>
+    </message>
+    <message>
+        <source>Message verified.</source>
+        <translation>Сообщение проверено.</translation>
+    </message>
+</context>
+<context>
+    <name>SplashScreen</name>
+    <message>
+        <source>[testnet]</source>
+        <translation>[тестовая сеть]</translation>
+    </message>
+</context>
+<context>
+    <name>TrafficGraphWidget</name>
+    <message>
+        <source>KB/s</source>
+        <translation>КБ/сек</translation>
+    </message>
+</context>
+<context>
+    <name>TransactionDesc</name>
+    <message>
+        <source>Open until %1</source>
+        <translation>Открыто до %1</translation>
+    </message>
+    <message>
+        <source>conflicted with a transaction with %1 confirmations</source>
+        <translation>конфликт с транзакцией с %1 подтверждений</translation>
+    </message>
+    <message>
+        <source>%1/offline</source>
+        <translation>%1/отключен</translation>
+    </message>
+    <message>
+        <source>0/unconfirmed, %1</source>
+        <translation>0/не подтверждено, %1</translation>
+    </message>
+    <message>
+        <source>in memory pool</source>
+        <translation>В памяти</translation>
+    </message>
+    <message>
+        <source>not in memory pool</source>
+        <translation>Не в памяти</translation>
+    </message>
+    <message>
+        <source>abandoned</source>
+        <translation>заброшено</translation>
+    </message>
+    <message>
+        <source>%1/unconfirmed</source>
+        <translation>%1/не подтверждено</translation>
+    </message>
+    <message>
+        <source>%1 confirmations</source>
+        <translation>%1 подтверждений</translation>
+    </message>
+    <message>
+        <source>Status</source>
+        <translation>Статус</translation>
+    </message>
+    <message>
+        <source>, has not been successfully broadcast yet</source>
+        <translation>, ещё не было успешно разослано</translation>
+    </message>
+    <message numerus="yes">
+        <source>, broadcast through %n node(s)</source>
+        <translation><numerusform>, разослано через %n узел</numerusform><numerusform>, разослано через %n узла</numerusform><numerusform>, разослано через %n узлов</numerusform><numerusform>, разослано через %n узлов</numerusform></translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation>Дата</translation>
+    </message>
+    <message>
+        <source>Source</source>
+        <translation>Источник</translation>
+    </message>
+    <message>
+        <source>Generated</source>
+        <translation>Сгенерированно</translation>
+    </message>
+    <message>
+        <source>From</source>
+        <translation>От</translation>
+    </message>
+    <message>
+        <source>unknown</source>
+        <translation>неизвестно</translation>
+    </message>
+    <message>
+        <source>To</source>
+        <translation>Для</translation>
+    </message>
+    <message>
+        <source>own address</source>
+        <translation>свой адрес</translation>
+    </message>
+    <message>
+        <source>watch-only</source>
+        <translation>только наблюдение</translation>
+    </message>
+    <message>
+        <source>label</source>
+        <translation>метка</translation>
+    </message>
+    <message>
+        <source>Credit</source>
+        <translation>Кредит</translation>
+    </message>
+    <message>
+        <source>not accepted</source>
+        <translation>не принято</translation>
+    </message>
+    <message>
+        <source>Debit</source>
+        <translation>Дебет</translation>
+    </message>
+    <message>
+        <source>Total debit</source>
+        <translation>Всего дебет</translation>
+    </message>
+    <message>
+        <source>Total credit</source>
+        <translation>Всего кредит</translation>
+    </message>
+    <message>
+        <source>Transaction fee</source>
+        <translation>Комиссия</translation>
+    </message>
+    <message>
+        <source>Net amount</source>
+        <translation>Чистая сумма</translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation>Сообщение</translation>
+    </message>
+    <message>
+        <source>Comment</source>
+        <translation>Комментарий</translation>
+    </message>
+    <message>
+        <source>Transaction ID</source>
+        <translation>ID транзакции</translation>
+    </message>
+    <message>
+        <source>Transaction total size</source>
+        <translation>Общий размер транзакции</translation>
+    </message>
+    <message>
+        <source>Output index</source>
+        <translation>Номер выхода</translation>
+    </message>
+    <message>
+        <source>Merchant</source>
+        <translation>Продавец</translation>
+    </message>
+    <message>
+        <source>Generated coins must mature %1 blocks before they can be spent. When you generated this block, it was broadcast to the network to be added to the block chain. If it fails to get into the chain, its state will change to "not accepted" and it won't be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source>
+        <translation>Сгенерированные монеты должны подождать %1 блоков, прежде чем они могут быть потрачены. Когда вы сгенерировали этот блок, он был отправлен в сеть для добавления в цепочку блоков. Если он не попадёт в цепь, его статус изменится на "не принят", и монеты будут недействительны. Это иногда происходит в случае, если другой узел сгенерирует блок на несколько секунд раньше вас.</translation>
+    </message>
+    <message>
+        <source>Debug information</source>
+        <translation>Отладочная информация</translation>
+    </message>
+    <message>
+        <source>Transaction</source>
+        <translation>Транзакция</translation>
+    </message>
+    <message>
+        <source>Inputs</source>
+        <translation>Входы</translation>
+    </message>
+    <message>
+        <source>Amount</source>
+        <translation>Сумма</translation>
+    </message>
+    <message>
+        <source>true</source>
+        <translation>истина</translation>
+    </message>
+    <message>
+        <source>false</source>
+        <translation>ложь</translation>
+    </message>
+</context>
+<context>
+    <name>TransactionDescDialog</name>
+    <message>
+        <source>This pane shows a detailed description of the transaction</source>
+        <translation>Эта панель отображает детальное описание транзакции.</translation>
+    </message>
+    <message>
+        <source>Details for %1</source>
+        <translation>Подробности %1</translation>
+    </message>
+</context>
+<context>
+    <name>TransactionTableModel</name>
+    <message>
+        <source>Date</source>
+        <translation>Дата</translation>
     </message>
     <message>
-        <source>Choose...</source>
-        <translation>Выберите...</translation>
+        <source>Type</source>
+        <translation>Тип</translation>
     </message>
     <message>
-        <source>collapse fee-settings</source>
-        <translation>Свернуть настройки комиссии</translation>
+        <source>Label</source>
+        <translation>Метка</translation>
     </message>
     <message>
-        <source>per kilobyte</source>
-        <translation>за килобайт</translation>
+        <source>Open until %1</source>
+        <translation>Открыто до %1</translation>
     </message>
     <message>
-        <source>If the custom fee is set to 1000 satoshis and the transaction is only 250 bytes, then "per kilobyte" only pays 250 satoshis in fee, while "total at least" pays 1000 satoshis. For transactions bigger than a kilobyte both pay by kilobyte.</source>
-        <translation>Если комиссия установлена в 1000 сатоши, а транзакция составляет лишь 250 байт, тогда комиссия "на килобайт" составит 250 сатоши, а "всего как минимум" — 1000 сатоши. Для транзакций крупнее килобайта в обоих случаях будет использоваться платёж "на килобайт".</translation>
+        <source>Offline</source>
+        <translation>Отключен</translation>
     </message>
     <message>
-        <source>Hide</source>
-        <translation>Скрыть</translation>
+        <source>Unconfirmed</source>
+        <translation>Не подтверждено</translation>
     </message>
     <message>
-        <source>total at least</source>
-        <translation>Итого как минимум</translation>
+        <source>Abandoned</source>
+        <translation>Заброшено</translation>
     </message>
     <message>
-        <source>Paying only the minimum fee is just fine as long as there is less transaction volume than space in the blocks. But be aware that this can end up in a never confirming transaction once there is more demand for bitcoin transactions than the network can process.</source>
-        <translation>Уплата минимальной комиссии — не проблема, пока объём транзакций меньше, чем свободное место в блоках. Учтите, однако, что такая транзакция может никогда не подтвердиться, если спрос на транзакции превышает возможности сети по их обработке.</translation>
+        <source>Confirming (%1 of %2 recommended confirmations)</source>
+        <translation>Подтверждается (%1 из %2 рекомендуемых подтверждений)</translation>
     </message>
     <message>
-        <source>(read the tooltip)</source>
-        <translation>(прочтите подсказку)</translation>
+        <source>Confirmed (%1 confirmations)</source>
+        <translation>Подтверждено (%1 подтверждений)</translation>
     </message>
     <message>
-        <source>Recommended:</source>
-        <translation>Рекомендовано:</translation>
+        <source>Conflicted</source>
+        <translation>В противоречии</translation>
     </message>
     <message>
-        <source>Custom:</source>
-        <translation>Выборочно:</translation>
+        <source>Immature (%1 confirmations, will be available after %2)</source>
+        <translation>Незрелый (%1 подтверждений, будет доступно после %2)</translation>
     </message>
     <message>
-        <source>(Smart fee not initialized yet. This usually takes a few blocks...)</source>
-        <translation>(Умная комиссия пока не инициализирована. Обычно для этого требуется несколько блоков...)</translation>
+        <source>This block was not received by any other nodes and will probably not be accepted!</source>
+        <translation>Этот блок не был получен другими узлами и, возможно, не будет принят!</translation>
     </message>
     <message>
-        <source>Confirmation time:</source>
-        <translation>Время подтверждения:</translation>
+        <source>Generated but not accepted</source>
+        <translation>Сгенерировано, но не принято</translation>
     </message>
     <message>
-        <source>normal</source>
-        <translation>обычный</translation>
+        <source>Received with</source>
+        <translation>Получено на</translation>
     </message>
     <message>
-        <source>fast</source>
-        <translation>ускоренный</translation>
+        <source>Received from</source>
+        <translation>Получено от</translation>
     </message>
     <message>
-        <source>Send to multiple recipients at once</source>
-        <translation>Отправить нескольким получателям одновременно</translation>
+        <source>Sent to</source>
+        <translation>Отправлено на</translation>
     </message>
     <message>
-        <source>Add &amp;Recipient</source>
-        <translation>&amp;Добавить получателя</translation>
+        <source>Payment to yourself</source>
+        <translation>Отправлено себе</translation>
     </message>
     <message>
-        <source>Clear all fields of the form.</source>
-        <translation>Очистить все поля формы</translation>
+        <source>Mined</source>
+        <translation>Добыто</translation>
     </message>
     <message>
-        <source>Dust:</source>
-        <translation>Пыль:</translation>
+        <source>watch-only</source>
+        <translation>только наблюдение</translation>
     </message>
     <message>
-        <source>Clear &amp;All</source>
-        <translation>Очистить &amp;всё</translation>
+        <source>(n/a)</source>
+        <translation>(недоступно)</translation>
     </message>
     <message>
-        <source>Balance:</source>
-        <translation>Баланс:</translation>
+        <source>(no label)</source>
+        <translation>(нет метки)</translation>
     </message>
     <message>
-        <source>Confirm the send action</source>
-        <translation>Подтвердить отправку</translation>
+        <source>Transaction status. Hover over this field to show number of confirmations.</source>
+        <translation>Статус транзакции. Подведите курсор к этому полю, чтобы увидеть количество подтверждений.</translation>
     </message>
     <message>
-        <source>S&amp;end</source>
-        <translation>&amp;Отправить</translation>
+        <source>Date and time that the transaction was received.</source>
+        <translation>Дата и время получения транзакции.</translation>
     </message>
-</context>
-<context>
-    <name>SendCoinsEntry</name>
     <message>
-        <source>A&amp;mount:</source>
-        <translation>Ко&amp;личество:</translation>
+        <source>Type of transaction.</source>
+        <translation>Тип транзакции.</translation>
     </message>
     <message>
-        <source>Pay &amp;To:</source>
-        <translation>Полу&amp;чатель:</translation>
+        <source>Whether or not a watch-only address is involved in this transaction.</source>
+        <translation>Использовался ли в транзакции адрес для наблюдения.</translation>
     </message>
     <message>
-        <source>&amp;Label:</source>
-        <translation>&amp;Метка:</translation>
+        <source>User-defined intent/purpose of the transaction.</source>
+        <translation>Определяемое пользователем намерение/цель транзакции.</translation>
     </message>
     <message>
-        <source>Choose previously used address</source>
-        <translation>Выберите ранее использованный адрес</translation>
+        <source>Amount removed from or added to balance.</source>
+        <translation>Снятая или добавленная к балансу сумма.</translation>
     </message>
+</context>
+<context>
+    <name>TransactionView</name>
     <message>
-        <source>This is a normal payment.</source>
-        <translation>Это нормальный платёж.</translation>
+        <source>All</source>
+        <translation>Все</translation>
     </message>
     <message>
-        <source>The Bitcoin address to send the payment to</source>
-        <translation>Адрес Bitcoin, на который отправить платёж</translation>
+        <source>Today</source>
+        <translation>Сегодня</translation>
     </message>
     <message>
-        <source>Alt+A</source>
-        <translation>Alt+A</translation>
+        <source>This week</source>
+        <translation>На этой неделе</translation>
     </message>
     <message>
-        <source>Paste address from clipboard</source>
-        <translation>Вставить адрес из буфера обмена</translation>
+        <source>This month</source>
+        <translation>В этом месяце</translation>
     </message>
     <message>
-        <source>Alt+P</source>
-        <translation>Alt+P</translation>
+        <source>Last month</source>
+        <translation>В прошлом месяце</translation>
     </message>
     <message>
-        <source>Remove this entry</source>
-        <translation>Удалить эту запись</translation>
+        <source>This year</source>
+        <translation>В этом году</translation>
     </message>
     <message>
-        <source>The fee will be deducted from the amount being sent. The recipient will receive less bitcoins than you enter in the amount field. If multiple recipients are selected, the fee is split equally.</source>
-        <translation>С отправляемой суммы будет удержана комиссия. Получателю придёт меньше биткоинов, чем вы вводите в поле количества. Если выбрано несколько получателей, комиссия распределяется поровну.</translation>
+        <source>Range...</source>
+        <translation>Диапазон...</translation>
     </message>
     <message>
-        <source>S&amp;ubtract fee from amount</source>
-        <translation>Вычесть комиссию из суммы</translation>
+        <source>Received with</source>
+        <translation>Получено на</translation>
     </message>
     <message>
-        <source>Message:</source>
-        <translation>Сообщение:</translation>
+        <source>Sent to</source>
+        <translation>Отправлено на</translation>
     </message>
     <message>
-        <source>This is an unauthenticated payment request.</source>
-        <translation>Это неавторизованный запрос платежа.</translation>
+        <source>To yourself</source>
+        <translation>Себе</translation>
     </message>
     <message>
-        <source>This is an authenticated payment request.</source>
-        <translation>Это авторизованный запрос платежа.</translation>
+        <source>Mined</source>
+        <translation>Добыто</translation>
     </message>
     <message>
-        <source>Enter a label for this address to add it to the list of used addresses</source>
-        <translation>Введите метку для этого адреса, чтобы добавить его в список использованных</translation>
+        <source>Other</source>
+        <translation>Другое</translation>
     </message>
     <message>
-        <source>A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
-        <translation>К bitcoin: URI было прикреплено сообщение, которое будет сохранено вместе с транзакцией для вашего сведения. Заметьте: сообщение не будет отправлено через сеть Bitcoin.</translation>
+        <source>Enter address or label to search</source>
+        <translation>Введите адрес или метку для поиска</translation>
     </message>
     <message>
-        <source>Pay To:</source>
-        <translation>Получатель:</translation>
+        <source>Min amount</source>
+        <translation>Мин. сумма</translation>
     </message>
     <message>
-        <source>Memo:</source>
-        <translation>Примечание:</translation>
+        <source>Abandon transaction</source>
+        <translation>Отказаться от транзакции</translation>
     </message>
-</context>
-<context>
-    <name>ShutdownWindow</name>
     <message>
-        <source>%1 is shutting down...</source>
-        <translation>%1 выключается...</translation>
+        <source>Copy address</source>
+        <translation>Копировать адрес</translation>
     </message>
     <message>
-        <source>Do not shut down the computer until this window disappears.</source>
-        <translation>Не выключайте компьютер, пока это окно не исчезнет.</translation>
+        <source>Copy label</source>
+        <translation>Копировать метку</translation>
     </message>
-</context>
-<context>
-    <name>SignVerifyMessageDialog</name>
     <message>
-        <source>Signatures - Sign / Verify a Message</source>
-        <translation>Подписи - подписать/проверить сообщение</translation>
+        <source>Copy amount</source>
+        <translation>Копировать сумму</translation>
     </message>
     <message>
-        <source>&amp;Sign Message</source>
-        <translation>&amp;Подписать сообщение</translation>
+        <source>Copy transaction ID</source>
+        <translation>Копировать ID транзакции</translation>
     </message>
     <message>
-        <source>You can sign messages/agreements with your addresses to prove you can receive bitcoins sent to them. Be careful not to sign anything vague or random, as phishing attacks may try to trick you into signing your identity over to them. Only sign fully-detailed statements you agree to.</source>
-        <translation>Вы можете подписывать сообщения/соглашения своими адресами, чтобы доказать свою возможность получать биткоины на них. Будьте осторожны, не подписывайте что-то неопределённое или случайное, так как фишинговые атаки могут обманным путём заставить вас подписать нежелательные сообщения. Подписывайте только те сообщения, с которыми вы согласны вплоть до мелочей.</translation>
+        <source>Copy raw transaction</source>
+        <translation>Копировать исходный код транзакции</translation>
     </message>
     <message>
-        <source>The Bitcoin address to sign the message with</source>
-        <translation>Адрес Bitcoin, которым подписать сообщение</translation>
+        <source>Copy full transaction details</source>
+        <translation>Копировать все подробности транзакции</translation>
     </message>
     <message>
-        <source>Choose previously used address</source>
-        <translation>Выберите ранее использованный адрес</translation>
+        <source>Edit label</source>
+        <translation>Изменить метку</translation>
     </message>
     <message>
-        <source>Alt+A</source>
-        <translation>Alt+A</translation>
+        <source>Show transaction details</source>
+        <translation>Показать подробности транзакции</translation>
     </message>
     <message>
-        <source>Paste address from clipboard</source>
-        <translation>Вставить адрес из буфера обмена</translation>
+        <source>Export Transaction History</source>
+        <translation>Экспортировать историю транзакций</translation>
     </message>
     <message>
-        <source>Alt+P</source>
-        <translation>Alt+P</translation>
+        <source>Comma separated file (*.csv)</source>
+        <translation>Текст, разделённый запятыми (*.csv)</translation>
     </message>
     <message>
-        <source>Enter the message you want to sign here</source>
-        <translation>Введите сообщение для подписи</translation>
+        <source>Confirmed</source>
+        <translation>Подтверждено</translation>
     </message>
     <message>
-        <source>Signature</source>
-        <translation>Подпись</translation>
+        <source>Watch-only</source>
+        <translation>Для наблюдения</translation>
     </message>
     <message>
-        <source>Copy the current signature to the system clipboard</source>
-        <translation>Скопировать текущую подпись в системный буфер обмена</translation>
+        <source>Date</source>
+        <translation>Дата</translation>
     </message>
     <message>
-        <source>Sign the message to prove you own this Bitcoin address</source>
-        <translation>Подписать сообщение, чтобы доказать владение адресом Bitcoin</translation>
+        <source>Type</source>
+        <translation>Тип</translation>
     </message>
     <message>
-        <source>Sign &amp;Message</source>
-        <translation>Подписать &amp;Сообщение</translation>
+        <source>Label</source>
+        <translation>Метка</translation>
     </message>
     <message>
-        <source>Reset all sign message fields</source>
-        <translation>Сбросить значения всех полей подписывания сообщений</translation>
+        <source>Address</source>
+        <translation>Адрес</translation>
     </message>
     <message>
-        <source>Clear &amp;All</source>
-        <translation>Очистить &amp;всё</translation>
+        <source>ID</source>
+        <translation>ID</translation>
     </message>
     <message>
-        <source>&amp;Verify Message</source>
-        <translation>&amp;Проверить сообщение</translation>
+        <source>Exporting Failed</source>
+        <translation>Экспорт не удался</translation>
     </message>
     <message>
-        <source>Enter the receiver's address, message (ensure you copy line breaks, spaces, tabs, etc. exactly) and signature below to verify the message. Be careful not to read more into the signature than what is in the signed message itself, to avoid being tricked by a man-in-the-middle attack. Note that this only proves the signing party receives with the address, it cannot prove sendership of any transaction!</source>
-        <translation>Введите ниже адрес получателя, сообщение (убедитесь, что переводы строк, пробелы, табы и т.п. в точности скопированы) и подпись, чтобы проверить сообщение. Убедитесь, что не скопировали лишнего в подпись, по сравнению с самим подписываемым сообщением, чтобы не стать жертвой атаки "man-in-the-middle". Заметьте, что эта операция удостоверяет лишь авторство подписавшего, но не может удостоверить отправителя транзакции.</translation>
+        <source>There was an error trying to save the transaction history to %1.</source>
+        <translation>Произошла ошибка при сохранении истории транзакций в %1.</translation>
     </message>
     <message>
-        <source>The Bitcoin address the message was signed with</source>
-        <translation>Адрес Bitcoin, которым было подписано сообщение</translation>
+        <source>Exporting Successful</source>
+        <translation>Экспорт успешно завершён</translation>
     </message>
     <message>
-        <source>Verify the message to ensure it was signed with the specified Bitcoin address</source>
-        <translation>Проверить сообщение, чтобы убедиться, что оно было подписано указанным адресом Bitcoin</translation>
+        <source>The transaction history was successfully saved to %1.</source>
+        <translation>История транзакций была успешно сохранена в %1.</translation>
     </message>
     <message>
-        <source>Verify &amp;Message</source>
-        <translation>Проверить &amp;Сообщение</translation>
+        <source>Range:</source>
+        <translation>Диапазон:</translation>
     </message>
     <message>
-        <source>Reset all verify message fields</source>
-        <translation>Сбросить все поля проверки сообщения</translation>
+        <source>to</source>
+        <translation>до</translation>
     </message>
 </context>
 <context>
-    <name>SplashScreen</name>
+    <name>UnitDisplayStatusBarControl</name>
     <message>
-        <source>[testnet]</source>
-        <translation>[тестовая сеть]</translation>
+        <source>Unit to show amounts in. Click to select another unit.</source>
+        <translation>Единица измерения количества монет. Щёлкните для выбора другой единицы.</translation>
     </message>
 </context>
 <context>
-    <name>TrafficGraphWidget</name>
+    <name>WalletFrame</name>
     <message>
-        <source>KB/s</source>
-        <translation>КБ/сек</translation>
+        <source>No wallet has been loaded.</source>
+        <translation>Не был загружен ни один бумажник.</translation>
     </message>
 </context>
 <context>
-    <name>TransactionDescDialog</name>
+    <name>WalletModel</name>
     <message>
-        <source>This pane shows a detailed description of the transaction</source>
-        <translation>Эта панель отображает детальное описание транзакции.</translation>
+        <source>Send Coins</source>
+        <translation>Отправка</translation>
     </message>
 </context>
 <context>
-    <name>UnitDisplayStatusBarControl</name>
+    <name>WalletView</name>
     <message>
-        <source>Unit to show amounts in. Click to select another unit.</source>
-        <translation>Единица измерения количества монет. Щёлкните для выбора другой единицы.</translation>
+        <source>&amp;Export</source>
+        <translation>&amp;Экспорт</translation>
+    </message>
+    <message>
+        <source>Export the data in the current tab to a file</source>
+        <translation>Экспортировать данные текущей вкладки в файл</translation>
+    </message>
+    <message>
+        <source>Backup Wallet</source>
+        <translation>Резервная копия бумажника</translation>
+    </message>
+    <message>
+        <source>Wallet Data (*.dat)</source>
+        <translation>Данные бумажника (*.dat)</translation>
+    </message>
+    <message>
+        <source>Backup Failed</source>
+        <translation>Резервное копирование не удалось</translation>
+    </message>
+    <message>
+        <source>There was an error trying to save the wallet data to %1.</source>
+        <translation>Произошла ошибка при сохранении данных бумажника в %1.</translation>
+    </message>
+    <message>
+        <source>Backup Successful</source>
+        <translation>Резервное копирование успешно завершено</translation>
+    </message>
+    <message>
+        <source>The wallet data was successfully saved to %1.</source>
+        <translation>Данные бумажника были успешно сохранены в %1.</translation>
     </message>
 </context>
 <context>
@@ -1746,6 +2965,18 @@
         <source>Accept command line and JSON-RPC commands</source>
         <translation>Принимать командную строку и команды JSON-RPC</translation>
     </message>
+    <message>
+        <source>Accept connections from outside (default: 1 if no -proxy or -connect/-noconnect)</source>
+        <translation>Принимать подключения снаружи (по умолчанию: 1, если не -proxy или -connect/-disconnect)</translation>
+    </message>
+    <message>
+        <source>Connect only to the specified node(s); -noconnect or -connect=0 alone to disable automatic connections</source>
+        <translation>Подключаться только к указанному узлу(ам); -noconnect или -connect=0 для запрета автоматических подключений</translation>
+    </message>
+    <message>
+        <source>Distributed under the MIT software license, see the accompanying file %s or %s</source>
+        <translation>Распространяется под лицензией MIT, см. приложенный файл %s или %s</translation>
+    </message>
     <message>
         <source>If &lt;category&gt; is not supplied or if &lt;category&gt; = 1, output all debugging information.</source>
         <translation>Если &lt;category&gt; не предоставлена или равна 1, выводить всю отладочную информацию.</translation>
@@ -1786,10 +3017,6 @@
         <source>Unable to start HTTP server. See debug log for details.</source>
         <translation>Невозможно запустить HTTP сервер. Смотри debug лог для подробностей.</translation>
     </message>
-    <message>
-        <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
-        <translation>Принимать подключения извне (по умолчанию: 1, если не используется -proxy или -connect)</translation>
-    </message>
     <message>
         <source>Bitcoin Core</source>
         <translation>Bitcoin Core</translation>
@@ -1799,8 +3026,8 @@
         <translation>Разработчики %s</translation>
     </message>
     <message>
-        <source>-fallbackfee is set very high! This is the transaction fee you may pay when fee estimates are not available.</source>
-        <translation>Установлено очень большое значение -fallbackfee! Это комиссия за транзацию, которую вы можете заплатить, если оценка размера комиссии не доступна. </translation>
+        <source>Accept relayed transactions received from whitelisted peers even when not relaying transactions (default: %d)</source>
+        <translation>Принимать транзакции пересылаемые от узлов из белого списка даже если они не удовлетворяют требованиям ретрансляции (по умолчанию: %d)</translation>
     </message>
     <message>
         <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source>
@@ -1815,8 +3042,8 @@
         <translation>Удалить все транзакции бумажника с возможностью восстановить эти части цепи блоков с помощью -rescan при запуске</translation>
     </message>
     <message>
-        <source>Distributed under the MIT software license, see the accompanying file COPYING or &lt;http://www.opensource.org/licenses/mit-license.php&gt;.</source>
-        <translation>Распространяется под лицензией MIT, см. приложенный файл COPYING или &lt;http://www.opensource.org/licenses/mit-license.php&gt;.</translation>
+        <source>Error loading %s: You can't enable HD on a already existing non-HD wallet</source>
+        <translation>Ошибка загрузки %s: Вы не можете включить HD в уже существующем не-HD кошельке</translation>
     </message>
     <message>
         <source>Error reading %s! All keys read correctly, but transaction data or address book entries might be missing or incorrect.</source>
@@ -1827,13 +3054,21 @@
         <translation>Выполнить команду, когда меняется транзакция в бумажнике (%s в команде заменяется на TxID)</translation>
     </message>
     <message>
-        <source>Force relay of transactions from whitelisted peers even they violate local relay policy (default: %d)</source>
-        <translation>Всегда разрешать транзакции, полученные от участников из белого списка (по умолчанию: %d)</translation>
+        <source>Maximum allowed median peer time offset adjustment. Local perspective of time may be influenced by peers forward or backward by this amount. (default: %u seconds)</source>
+        <translation>Максимально допустимое среднее отклонение времени участников. Локальное представление времени может меняться вперед или назад на это количество. (по умолчанию: %u секунд)</translation>
+    </message>
+    <message>
+        <source>Maximum total fees (in %s) to use in a single wallet transaction or raw transaction; setting this too low may abort large transactions (default: %s)</source>
+        <translation>Максимальная сумма комиссий (%s) для одной транзакции в бумажнике или сырой транзакции; слишком низкое значение может вызвать прерывание больших транзакций (по умолчанию: %s)</translation>
     </message>
     <message>
         <source>Please check that your computer's date and time are correct! If your clock is wrong, %s will not work properly.</source>
         <translation>Пожалуйста убедитесь в корректности установки времени и даты на вашем компьютере! Если время установлено неверно, %s не будет работать правильно.</translation>
     </message>
+    <message>
+        <source>Please contribute if you find %s useful. Visit %s for further information about the software.</source>
+        <translation>Пожалуйста, внести свой вклад, если вы найдете %s полезными. Посетите  %s для получения дополнительной информации о программном обеспечении.</translation>
+    </message>
     <message>
         <source>Set the number of script verification threads (%u to %d, 0 = auto, &lt;0 = leave that many cores free, default: %d)</source>
         <translation>Задать число потоков проверки скрипта (от %u до %d, 0=авто, &lt;0 = оставить столько ядер свободными, по умолчанию: %d)</translation>
@@ -1843,24 +3078,16 @@
         <translation>База данных блоков содержит блок, который появляется из будущего. Это может из-за некорректно установленных даты и времени на вашем компьютере. Остается только перестроивать базу блоков, если вы уверены, что дата и время корректны.</translation>
     </message>
     <message>
-        <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
-        <translation>Это пре-релизная тестовая сборка - используйте на свой страх и риск - не используйте для добычи или торговых приложений</translation>
+        <source>Unable to rewind the database to a pre-fork state. You will need to redownload the blockchain</source>
+        <translation>Невозможно отмотать базу данных до пред-форкового состояния. Вам будет необходимо перекачать цепочку блоков.</translation>
     </message>
     <message>
         <source>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</source>
         <translation>Использовать UPnP для проброса порта (по умолчанию: 1, если используется прослушивание и нет -proxy)</translation>
     </message>
     <message>
-        <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source>
-        <translation>Внимание: похоже, в сети нет полного согласия! Некоторый майнеры, возможно, испытывают проблемы.</translation>
-    </message>
-    <message>
-        <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source>
-        <translation>Внимание: мы не полностью согласны с подключенными участниками! Вам или другим участникам, возможно, следует обновиться.</translation>
-    </message>
-    <message>
-        <source>Whitelist peers connecting from the given netmask or IP address. Can be specified multiple times.</source>
-        <translation>Вносить в белый список участников, подключающихся с указанной маски сети или IP. Можно использовать многократно.</translation>
+        <source>You need to rebuild the database using -reindex-chainstate to change -txindex</source>
+        <translation>Вам необходимо пересобрать базы данных с помощью -reindex-chainstate, чтобы изменить -txindex</translation>
     </message>
     <message>
         <source>%s corrupt, salvage failed</source>
@@ -1887,8 +3114,12 @@
         <translation>Параметры создания блоков:</translation>
     </message>
     <message>
-        <source>Connect only to the specified node(s)</source>
-        <translation>Подключаться только к указанному узлу(ам)</translation>
+        <source>Cannot resolve -%s address: '%s'</source>
+        <translation>Не удаётся разрешить адрес в параметре -%s: '%s'</translation>
+    </message>
+    <message>
+        <source>Change index out of range</source>
+        <translation>Изменение индекса вне диапазона</translation>
     </message>
     <message>
         <source>Connection options:</source>
@@ -1930,6 +3161,10 @@
         <source>Enable publish raw transaction in &lt;address&gt;</source>
         <translation>Включить публичную сырую транзакцию в &lt;address&gt;</translation>
     </message>
+    <message>
+        <source>Enable transaction replacement in the memory pool (default: %u)</source>
+        <translation>Включить замену транзакций в пуле памяти (по умолчанию:%u)</translation>
+    </message>
     <message>
         <source>Error initializing block database</source>
         <translation>Ошибка инициализации БД блоков</translation>
@@ -1950,6 +3185,10 @@
         <source>Error loading %s: Wallet requires newer version of %s</source>
         <translation>Ошибка загрузки %s: Для бумажника требуется более новая версия %s</translation>
     </message>
+    <message>
+        <source>Error loading %s: You can't disable HD on a already existing HD wallet</source>
+        <translation>Ошибка загрузки %s: Вы не можете включить HD в уже существующем не-HD кошельке</translation>
+    </message>
     <message>
         <source>Error loading block database</source>
         <translation>Ошибка чтения базы данных блоков</translation>
@@ -1974,6 +3213,10 @@
         <source>Incorrect or no genesis block found. Wrong datadir for network?</source>
         <translation>Неверный или отсутствующий начальный блок. Неправильный каталог данных для сети?</translation>
     </message>
+    <message>
+        <source>Initialization sanity check failed. %s is shutting down.</source>
+        <translation>Начальная проверка исправности не удалась. %s завершает работу.</translation>
+    </message>
     <message>
         <source>Invalid -onion address: '%s'</source>
         <translation>Неверный -onion адрес: '%s'</translation>
@@ -1982,6 +3225,10 @@
         <source>Invalid amount for -%s=&lt;amount&gt;: '%s'</source>
         <translation>Неверная сумма для -%s=&lt;amount&gt;: '%s'</translation>
     </message>
+    <message>
+        <source>Invalid amount for -fallbackfee=&lt;amount&gt;: '%s'</source>
+        <translation>Недопустимая сумма для -fallbackfee=&lt;amount&gt;: '%s'</translation>
+    </message>
     <message>
         <source>Keep the transaction memory pool below &lt;n&gt; megabytes (default: %u)</source>
         <translation>Сбрасывать транзакции из памяти на диск каждые &lt;n&gt; мегабайт (по умолчанию: %u)</translation>
@@ -2018,17 +3265,21 @@
         <source>Prune mode is incompatible with -txindex.</source>
         <translation>Режим удаления блоков несовместим с -txindex.</translation>
     </message>
+    <message>
+        <source>Rebuild chain state and block index from the blk*.dat files on disk</source>
+        <translation>Перестроить состояние цепи блоков и индекс блоков из blk*.dat файлов с диска</translation>
+    </message>
     <message>
         <source>Rebuild chain state from the currently indexed blocks</source>
         <translation>Перестроить индекс цепи из текущих индексированных блоков</translation>
     </message>
     <message>
-        <source>Set database cache size in megabytes (%d to %d, default: %d)</source>
-        <translation>Установить размер кэша БД в мегабайтах(от %d до %d, по умолчанию: %d)</translation>
+        <source>Rewinding blocks...</source>
+        <translation>Перемотка блоков...</translation>
     </message>
     <message>
-        <source>Set maximum block cost (default: %d)</source>
-        <translation>Задать максимальную стоимость блока (по умолчанию: %d)</translation>
+        <source>Set database cache size in megabytes (%d to %d, default: %d)</source>
+        <translation>Установить размер кэша БД в мегабайтах(от %d до %d, по умолчанию: %d)</translation>
     </message>
     <message>
         <source>Set maximum block size in bytes (default: %d)</source>
@@ -2134,10 +3385,6 @@
         <source>Maximum size of data in data carrier transactions we relay and mine (default: %u)</source>
         <translation>Наибольший размер данных в носителе данных транзакций, которые мы передаем и генерируем (по умолчанию: %u)</translation>
     </message>
-    <message>
-        <source>Query for peer addresses via DNS lookup, if low on addresses (default: 1 unless -connect)</source>
-        <translation>Запрашивать адреса участников с помощью DNS, если адресов мало (по умолчанию: 1, если не указан -connect)</translation>
-    </message>
     <message>
         <source>Randomize credentials for every proxy connection. This enables Tor stream isolation (default: %u)</source>
         <translation>Использовать случайные учётные данные для каждого прокси-подключения. Эта функция позволяет изолировать потоки Tor (по умолчанию: %u)</translation>
@@ -2151,8 +3398,8 @@
         <translation>Сумма транзакции за вычетом комиссии слишком мала</translation>
     </message>
     <message>
-        <source>This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit &lt;https://www.openssl.org/&gt; and cryptographic software written by Eric Young and UPnP software written by Thomas Bernard.</source>
-        <translation>Этот продукт включает ПО, разработанное OpenSSL Project для использования в OpenSSL Toolkit &lt;https://www.openssl.org/&gt; и криптографическое ПО, написанное Eric Young и ПО для работы с UPnP, написанное Thomas Bernard.</translation>
+        <source>Use hierarchical deterministic key generation (HD) after BIP32. Only has effect during wallet creation/first start</source>
+        <translation>Использовать иерархическую детерминированную генерацию ключей (HD) после BIP32. Применяется в процессе создания бумажника / первого запуска</translation>
     </message>
     <message>
         <source>Whitelisted peers cannot be DoS banned and their transactions are always relayed, even if they are already in the mempool, useful e.g. for a gateway</source>
@@ -2262,10 +3509,6 @@
         <source>Transaction amount too small</source>
         <translation>Сумма транзакции слишком мала</translation>
     </message>
-    <message>
-        <source>Transaction amounts must be positive</source>
-        <translation>Сумма транзакции должна быть положительна</translation>
-    </message>
     <message>
         <source>Transaction too large for fee policy</source>
         <translation>Транзакция слишком большая для правил комиссии.</translation>
@@ -2330,18 +3573,22 @@
         <source>-maxtxfee is set very high! Fees this large could be paid on a single transaction.</source>
         <translation>Установлено очень большое значение -maxtxfee. Такие большие комиссии могут быть уплачены в отдельной транзакции.</translation>
     </message>
-    <message>
-        <source>-paytxfee is set very high! This is the transaction fee you will pay if you send a transaction.</source>
-        <translation>Установлено очень большое значение -paytxfee. Такие большие комиссии могут быть уплачены в отдельной транзакции.</translation>
-    </message>
     <message>
         <source>Do not keep transactions in the mempool longer than &lt;n&gt; hours (default: %u)</source>
         <translation>Не хранить транзакции в памяти дольше, чем &lt;n&gt; часов (по умолчанию %u)</translation>
     </message>
+    <message>
+        <source>Equivalent bytes per sigop in transactions for relay and mining (default: %u)</source>
+        <translation>Эквивалентных байт на sigop в транзакциях для ретрансляции или добычи (по умолчанию: %u)</translation>
+    </message>
     <message>
         <source>Fees (in %s/kB) smaller than this are considered zero fee for transaction creation (default: %s)</source>
         <translation>Комиссии (в %s/Кб) меньшие этого значения считаются нулевыми при создании транзакций (по умолчанию: %s)</translation>
     </message>
+    <message>
+        <source>Force relay of transactions from whitelisted peers even if they violate local relay policy (default: %d)</source>
+        <translation>Всегда ретранслировать транзакции, полученные из белого списка участников, даже если они нарушают локальную политику ретрансляции (по умолчанию: %d)</translation>
+    </message>
     <message>
         <source>How thorough the block verification of -checkblocks is (0-4, default: %u)</source>
         <translation>Насколько тщательна проверка контрольных блоков -checkblocks (0-4, по умолчанию: %u)</translation>
@@ -2358,10 +3605,26 @@
         <source>Output debugging information (default: %u, supplying &lt;category&gt; is optional)</source>
         <translation>Выводить отладочную информацию (по умолчанию: %u, указание &lt;category&gt; необязательно)</translation>
     </message>
+    <message>
+        <source>Query for peer addresses via DNS lookup, if low on addresses (default: 1 unless -connect/-noconnect)</source>
+        <translation>Запрашивать адреса участников с помощью DNS, если адресов мало (по умолчанию: 1, если не указан -connect/-noconnect)</translation>
+    </message>
+    <message>
+        <source>Sets the serialization of raw transaction or block hex returned in non-verbose mode, non-segwit(0) or segwit(1) (default: %d)</source>
+        <translation>Задаёт сериализацию сырой транзакции или хекса блока, возвращённого в не подробном режиме, non-segwit(0) или segwit(1) (по умолчанию: %d)</translation>
+    </message>
     <message>
         <source>Support filtering of blocks and transaction with bloom filters (default: %u)</source>
         <translation>Поддерживать фильтрацию блоков и транзакций с помощью фильтра Блума (по умолчанию: %u)</translation>
     </message>
+    <message>
+        <source>This is the transaction fee you may pay when fee estimates are not available.</source>
+        <translation>Это комиссия за транзакцию, которую вы можете заплатить, когда расчёт комиссии недоступен.</translation>
+    </message>
+    <message>
+        <source>This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit %s and cryptographic software written by Eric Young and UPnP software written by Thomas Bernard.</source>
+        <translation>Этот продукт включает ПО, разработанное OpenSSL Project для использования в OpenSSL Toolkit %s и криптографическое ПО, написанное Eric Young и ПО для работы с UPnP, написанное Thomas Bernard.</translation>
+    </message>
     <message>
         <source>Total length of network version string (%i) exceeds maximum length (%i). Reduce the number or size of uacomments.</source>
         <translation>Текущая длина строки версии сети (%i) превышает максимальную длину (%i). Увеливается количество или размер uacomments.</translation>
@@ -2374,6 +3637,10 @@
         <source>Unsupported argument -socks found. Setting SOCKS version isn't possible anymore, only SOCKS5 proxies are supported.</source>
         <translation>Обнаружен не поддерживаемый аргумент -socks. Выбор версии SOCKS более невозможен, поддерживаются только прокси SOCKS5.</translation>
     </message>
+    <message>
+        <source>Unsupported argument -whitelistalwaysrelay ignored, use -whitelistrelay and/or -whitelistforcerelay.</source>
+        <translation>Не поддерживаемый аргумент -whitelistalwaysrelay игнорируется, используйте -whitelistrelay и/или -whitelistforcerelay.</translation>
+    </message>
     <message>
         <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: %s)</source>
         <translation>Использовать отдельный прокси SOCKS5 для соединения с участниками через скрытые сервисы Tor (по умолчанию: %s)</translation>
@@ -2390,6 +3657,14 @@
         <source>Warning: Wallet file corrupt, data salvaged! Original %s saved as %s in %s; if your balance or transactions are incorrect you should restore from a backup.</source>
         <translation>Внимание: Файл бумажника поврежден, данные восстановлены! Оригинальный %s сохранен как %s в %s; Если баланс или транзакции некорректны, вы должны восстановить файл из резервной копии.</translation>
     </message>
+    <message>
+        <source>Whitelist peers connecting from the given IP address (e.g. 1.2.3.4) or CIDR notated network (e.g. 1.2.3.0/24). Can be specified multiple times.</source>
+        <translation>Вносить в белый список участников, подключающихся с указанного IP (напр. 1.2.3.4) или CIDR-адреса сети (напр. 1.2.3.0/24). Можно использовать многократно.</translation>
+    </message>
+    <message>
+        <source>%s is set very high!</source>
+        <translation>%s задан слишком высоким!</translation>
+    </message>
     <message>
         <source>(default: %s)</source>
         <translation>(по умолчанию: %s)</translation>
@@ -2410,6 +3685,10 @@
         <source>Invalid -proxy address: '%s'</source>
         <translation>Неверный адрес -proxy: '%s'</translation>
     </message>
+    <message>
+        <source>Keypool ran out, please call keypoolrefill first</source>
+        <translation>Пул ключей опустел, пожалуйста, выполните keypoolrefill</translation>
+    </message>
     <message>
         <source>Listen for JSON-RPC connections on &lt;port&gt; (default: %u or testnet: %u)</source>
         <translation>Прослушивать подключения JSON-RPC на &lt;порту&gt; (по умолчанию: %u или %u в тестовой сети)</translation>
@@ -2446,13 +3725,17 @@
         <source>Relay non-P2SH multisig (default: %u)</source>
         <translation>Транслировать не-P2SH мультиподпись (по умолчанию: %u)</translation>
     </message>
+    <message>
+        <source>Send transactions with full-RBF opt-in enabled (default: %u)</source>
+        <translation>Отправлять транзакции с включенным full-RBF (по умолчанию: %u)</translation>
+    </message>
     <message>
         <source>Set key pool size to &lt;n&gt; (default: %u)</source>
         <translation>Установить размер пула ключей в &lt;n&gt; (по умолчанию: %u)</translation>
     </message>
     <message>
-        <source>Set minimum block size in bytes (default: %u)</source>
-        <translation>Задать минимальный размер блока в байтах (по умолчанию: %u)</translation>
+        <source>Set maximum BIP141 block weight (default: %d)</source>
+        <translation>Задать максимальное BIP141 значение блока (по умолчанию: %d)</translation>
     </message>
     <message>
         <source>Set the number of threads to service RPC calls (default: %d)</source>
@@ -2474,10 +3757,38 @@
         <source>Spend unconfirmed change when sending transactions (default: %u)</source>
         <translation>Тратить неподтвержденную сдачу при отправке транзакций (по умолчанию: %u)</translation>
     </message>
+    <message>
+        <source>Starting network threads...</source>
+        <translation>Запускаем сетевые потоки...</translation>
+    </message>
+    <message>
+        <source>The wallet will avoid paying less than the minimum relay fee.</source>
+        <translation>Бумажник постарается не платить меньше, чем минимальная комиссия передачи.</translation>
+    </message>
+    <message>
+        <source>This is the minimum transaction fee you pay on every transaction.</source>
+        <translation>Это минимальная комиссия, которую вы платите с каждой транзакцией.</translation>
+    </message>
+    <message>
+        <source>This is the transaction fee you will pay if you send a transaction.</source>
+        <translation>Это комиссия, которую вы заплатите за эту транзакцию.</translation>
+    </message>
     <message>
         <source>Threshold for disconnecting misbehaving peers (default: %u)</source>
         <translation>Порог для отключения неправильно ведущих себя узлов (по умолчанию: %u)</translation>
     </message>
+    <message>
+        <source>Transaction amounts must not be negative</source>
+        <translation>Сумма транзакции не должна быть негативной</translation>
+    </message>
+    <message>
+        <source>Transaction has too long of a mempool chain</source>
+        <translation>У транзакции слишком длинная цепочка в пуле в памяти.</translation>
+    </message>
+    <message>
+        <source>Transaction must have at least one recipient</source>
+        <translation>У транзакции должен быть как минимум один получатель</translation>
+    </message>
     <message>
         <source>Unknown network specified in -onlynet: '%s'</source>
         <translation>В параметре -onlynet указана неизвестная сеть: '%s'</translation>
diff --git a/src/qt/locale/bitcoin_ru_RU.ts b/src/qt/locale/bitcoin_ru_RU.ts
index 66419728e2c20..60d98c41d9582 100644
--- a/src/qt/locale/bitcoin_ru_RU.ts
+++ b/src/qt/locale/bitcoin_ru_RU.ts
@@ -23,7 +23,7 @@
     </message>
     <message>
         <source>C&amp;lose</source>
-        <translation>Закрыть</translation>
+        <translation>&amp;Закрыть</translation>
     </message>
     <message>
         <source>Delete the currently selected address from the list</source>
@@ -41,19 +41,26 @@
         <source>&amp;Delete</source>
         <translation>Удалить</translation>
     </message>
-</context>
+    </context>
+<context>
+    <name>AddressTableModel</name>
+    </context>
 <context>
     <name>AskPassphraseDialog</name>
     <message>
         <source>Repeat new passphrase</source>
         <translation>Повторите новый пароль</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>BanTableModel</name>
     </context>
 <context>
     <name>BitcoinGUI</name>
+    <message>
+        <source>Bitcoin</source>
+        <translation>Bitcoin Core</translation>
+    </message>
     <message>
         <source>&amp;Command-line options</source>
         <translation>Опции командной строки</translation>
@@ -118,6 +125,9 @@
         <translation>Ошибка</translation>
     </message>
     </context>
+<context>
+    <name>ModalOverlay</name>
+    </context>
 <context>
     <name>OpenURIDialog</name>
     <message>
@@ -135,12 +145,21 @@
 <context>
     <name>OverviewPage</name>
     </context>
+<context>
+    <name>PaymentServer</name>
+    </context>
 <context>
     <name>PeerTableModel</name>
     </context>
 <context>
     <name>QObject</name>
     </context>
+<context>
+    <name>QObject::QObject</name>
+    </context>
+<context>
+    <name>QRImageWidget</name>
+    </context>
 <context>
     <name>RPCConsole</name>
     <message>
@@ -154,12 +173,18 @@
 <context>
     <name>ReceiveRequestDialog</name>
     </context>
+<context>
+    <name>RecentRequestsTableModel</name>
+    </context>
 <context>
     <name>SendCoinsDialog</name>
     </context>
 <context>
     <name>SendCoinsEntry</name>
     </context>
+<context>
+    <name>SendConfirmationDialog</name>
+    </context>
 <context>
     <name>ShutdownWindow</name>
     </context>
@@ -172,18 +197,44 @@
 <context>
     <name>TrafficGraphWidget</name>
     </context>
+<context>
+    <name>TransactionDesc</name>
+    </context>
 <context>
     <name>TransactionDescDialog</name>
     </context>
+<context>
+    <name>TransactionTableModel</name>
+    </context>
+<context>
+    <name>TransactionView</name>
+    </context>
 <context>
     <name>UnitDisplayStatusBarControl</name>
     </context>
+<context>
+    <name>WalletFrame</name>
+    </context>
+<context>
+    <name>WalletModel</name>
+    </context>
+<context>
+    <name>WalletView</name>
+    <message>
+        <source>&amp;Export</source>
+        <translation>Экспортировать</translation>
+    </message>
+    </context>
 <context>
     <name>bitcoin-core</name>
     <message>
         <source>Bitcoin Core</source>
         <translation>Bitcoin Core</translation>
     </message>
+    <message>
+        <source>Whitelisted peers cannot be DoS banned and their transactions are always relayed, even if they are already in the mempool, useful e.g. for a gateway</source>
+        <translation>bitcoin-core</translation>
+    </message>
     <message>
         <source>Information</source>
         <translation>Информация</translation>
@@ -192,6 +243,10 @@
         <source>Warning</source>
         <translation>Предупреждение</translation>
     </message>
+    <message>
+        <source>Do not keep transactions in the mempool longer than &lt;n&gt; hours (default: %u)</source>
+        <translation>Do not keep transactions in the mempool longer than &lt;n&gt; hours (default: %u)</translation>
+    </message>
     <message>
         <source>Error</source>
         <translation>Ошибка</translation>
diff --git a/src/qt/locale/bitcoin_sk.ts b/src/qt/locale/bitcoin_sk.ts
index a4f0ebcb4e17c..6c5828c4f830e 100644
--- a/src/qt/locale/bitcoin_sk.ts
+++ b/src/qt/locale/bitcoin_sk.ts
@@ -3,7 +3,7 @@
     <name>AddressBookPage</name>
     <message>
         <source>Right-click to edit address or label</source>
-        <translation>Kliknutím pravým tlačidlom upravte adresu alebo popis</translation>
+        <translation>Kliknutím pravým tlačidlom upraviť adresu alebo popis</translation>
     </message>
     <message>
         <source>Create a new address</source>
@@ -11,11 +11,11 @@
     </message>
     <message>
         <source>&amp;New</source>
-        <translation>&amp;Nové</translation>
+        <translation>&amp;Nový</translation>
     </message>
     <message>
         <source>Copy the currently selected address to the system clipboard</source>
-        <translation>Kopírovať práve zvolenú adresu do systémového klipbordu</translation>
+        <translation>Zkopírovať práve zvolenú adresu</translation>
     </message>
     <message>
         <source>&amp;Copy</source>
@@ -41,6 +41,13 @@
         <source>&amp;Delete</source>
         <translation>&amp;Zmazať</translation>
     </message>
+    </context>
+<context>
+    <name>AddressTableModel</name>
+    <message>
+        <source>(no label)</source>
+        <translation>(bez popisu)</translation>
+    </message>
 </context>
 <context>
     <name>AskPassphraseDialog</name>
@@ -60,7 +67,7 @@
         <source>Repeat new passphrase</source>
         <translation>Zopakujte nové heslo</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>BanTableModel</name>
     <message>
@@ -114,6 +121,10 @@
         <source>&amp;About %1</source>
         <translation>&amp;O %1</translation>
     </message>
+    <message>
+        <source>Show information about %1</source>
+        <translation>Ukázať informácie o %1</translation>
+    </message>
     <message>
         <source>About &amp;Qt</source>
         <translation>O &amp;Qt</translation>
@@ -126,6 +137,10 @@
         <source>&amp;Options...</source>
         <translation>&amp;Možnosti...</translation>
     </message>
+    <message>
+        <source>Modify configuration options for %1</source>
+        <translation>Upraviť nastavenia pre %1</translation>
+    </message>
     <message>
         <source>&amp;Encrypt Wallet...</source>
         <translation>&amp;Zašifrovať Peňaženku...</translation>
@@ -254,6 +269,14 @@
         <source>%n active connection(s) to Bitcoin network</source>
         <translation><numerusform>%n aktívne pripojenie do siete Bitcoin</numerusform><numerusform>%n aktívne pripojenia do siete Bitcoin</numerusform><numerusform>%n aktívnych pripojení do siete Bitcoin</numerusform></translation>
     </message>
+    <message>
+        <source>Indexing blocks on disk...</source>
+        <translation>Indexujem bloky na disku...</translation>
+    </message>
+    <message>
+        <source>Processing blocks on disk...</source>
+        <translation>Spracovávam bloky na disku...</translation>
+    </message>
     <message>
         <source>No block source available...</source>
         <translation>Nedostupný zdroj blokov...</translation>
@@ -262,26 +285,6 @@
         <source>Processed %n block(s) of transaction history.</source>
         <translation><numerusform>Spracovaných %n blok transakčnej histórie.</numerusform><numerusform>Spracovaných %n bloky transakčnej histórie.</numerusform><numerusform>Spracovaných %n blokov transakčnej histórie.</numerusform></translation>
     </message>
-    <message numerus="yes">
-        <source>%n hour(s)</source>
-        <translation><numerusform>%n hodina</numerusform><numerusform>%n hodiny</numerusform><numerusform>%n hodín</numerusform></translation>
-    </message>
-    <message numerus="yes">
-        <source>%n day(s)</source>
-        <translation><numerusform>%n deň</numerusform><numerusform>%n dni</numerusform><numerusform>%n dní</numerusform></translation>
-    </message>
-    <message numerus="yes">
-        <source>%n week(s)</source>
-        <translation><numerusform>%n týždeň</numerusform><numerusform>%n týždne</numerusform><numerusform>%n týždňov</numerusform></translation>
-    </message>
-    <message>
-        <source>%1 and %2</source>
-        <translation> %1 a  %2</translation>
-    </message>
-    <message numerus="yes">
-        <source>%n year(s)</source>
-        <translation><numerusform>%n rok</numerusform><numerusform>%n roky</numerusform><numerusform>%n rokov</numerusform></translation>
-    </message>
     <message>
         <source>%1 behind</source>
         <translation>%1 pozadu</translation>
@@ -310,6 +313,14 @@
         <source>Up to date</source>
         <translation>Aktualizovaný</translation>
     </message>
+    <message>
+        <source>Show the %1 help message to get a list with possible Bitcoin command-line options</source>
+        <translation>Ukáž %1 zoznam možných nastavení Bitcoinu pomocou príkazového riadku</translation>
+    </message>
+    <message>
+        <source>%1 client</source>
+        <translation>%1 klient</translation>
+    </message>
     <message>
         <source>Catching up...</source>
         <translation>Sťahujem...</translation>
@@ -360,7 +371,7 @@
         <source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;locked&lt;/b&gt;</source>
         <translation>Peňaženka je &lt;b&gt;zašifrovaná&lt;/b&gt; a momentálne &lt;b&gt;zamknutá&lt;/b&gt;</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>CoinControlDialog</name>
     <message>
@@ -379,10 +390,6 @@
         <source>Amount:</source>
         <translation>Suma:</translation>
     </message>
-    <message>
-        <source>Priority:</source>
-        <translation>Priorita:</translation>
-    </message>
     <message>
         <source>Fee:</source>
         <translation>Poplatok:</translation>
@@ -436,10 +443,10 @@
         <translation>Potvrdené</translation>
     </message>
     <message>
-        <source>Priority</source>
-        <translation>Priorita</translation>
+        <source>(no label)</source>
+        <translation>(bez popisu)</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>EditAddressDialog</name>
     <message>
@@ -462,7 +469,7 @@
         <source>&amp;Address</source>
         <translation>&amp;Adresa</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>FreespaceChecker</name>
     <message>
@@ -496,6 +503,10 @@
         <source>(%1-bit)</source>
         <translation>(%1-bit)</translation>
     </message>
+    <message>
+        <source>About %1</source>
+        <translation>O %1</translation>
+    </message>
     <message>
         <source>Command-line options</source>
         <translation>Voľby príkazového riadku</translation>
@@ -532,13 +543,29 @@
         <source>Show splash screen on startup (default: %u)</source>
         <translation>Zobraziť uvítaciu obrazovku pri štarte (predvolené: %u)</translation>
     </message>
-    </context>
+    <message>
+        <source>Reset all settings changed in the GUI</source>
+        <translation>Zrušiť všetky zmeny v GUI</translation>
+    </message>
+</context>
 <context>
     <name>Intro</name>
     <message>
         <source>Welcome</source>
         <translation>Vitajte</translation>
     </message>
+    <message>
+        <source>Welcome to %1.</source>
+        <translation>Vitajte v %1</translation>
+    </message>
+    <message>
+        <source>As this is the first time the program is launched, you can choose where %1 will store its data.</source>
+        <translation>Keďže toto je prvé spustenie programu, môžete si vybrať, kam %1 bude ukladať vaše údaje.</translation>
+    </message>
+    <message>
+        <source>%1 will download and store a copy of the Bitcoin block chain. At least %2GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source>
+        <translation>%1 stiahne a uloží kópiu Bitcoin block chain. Minimálne %2GB dát bude uložených v tejto zložke, a bude sa zväčšovať postupom času. Peňaženka bude taktiež uložená v tejto zložke.</translation>
+    </message>
     <message>
         <source>Use the default data directory</source>
         <translation>Použiť predvolený dátový adresár</translation>
@@ -564,6 +591,21 @@
         <translation><numerusform>(z %n GB potrebného)</numerusform><numerusform>(z %n GB potrebných)</numerusform><numerusform>(z %n GB potrebných)</numerusform></translation>
     </message>
 </context>
+<context>
+    <name>ModalOverlay</name>
+    <message>
+        <source>Form</source>
+        <translation>Forma</translation>
+    </message>
+    <message>
+        <source>Last block time</source>
+        <translation>Čas posledného bloku</translation>
+    </message>
+    <message>
+        <source>Hide</source>
+        <translation>Skryť</translation>
+    </message>
+    </context>
 <context>
     <name>OpenURIDialog</name>
     <message>
@@ -582,7 +624,7 @@
         <source>Select payment request file</source>
         <translation>Vyberte súbor s výzvou k platbe</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>OptionsDialog</name>
     <message>
@@ -593,6 +635,14 @@
         <source>&amp;Main</source>
         <translation>&amp;Hlavné</translation>
     </message>
+    <message>
+        <source>Automatically start %1 after logging in to the system.</source>
+        <translation>Automaticky spustiť %1 pri spustení systému.</translation>
+    </message>
+    <message>
+        <source>&amp;Start %1 on system login</source>
+        <translation>&amp;Spustiť %1 pri prihlásení</translation>
+    </message>
     <message>
         <source>Size of &amp;database cache</source>
         <translation>Veľkosť vyrovnávacej pamäti &amp;databázy</translation>
@@ -729,6 +779,14 @@
         <source>&amp;Window</source>
         <translation>&amp;Okno</translation>
     </message>
+    <message>
+        <source>&amp;Hide the icon from the system tray.</source>
+        <translation>&amp;Skryť ikonu zo systémovej lišty.</translation>
+    </message>
+    <message>
+        <source>Hide tray icon</source>
+        <translation>Skryť ikonu v oblasti oznámení</translation>
+    </message>
     <message>
         <source>Show only a tray icon after minimizing the window.</source>
         <translation>Zobraziť len ikonu na lište po minimalizovaní okna.</translation>
@@ -749,6 +807,10 @@
         <source>User Interface &amp;language:</source>
         <translation>Jazyk užívateľského rozhrania:</translation>
     </message>
+    <message>
+        <source>The user interface language can be set here. This setting will take effect after restarting %1.</source>
+        <translation>Jazyk uživateľského rozhrania sa dá nastaviť tu. Toto nastavenie sa uplatní až po reštarte %1.</translation>
+    </message>
     <message>
         <source>&amp;Unit to show amounts in:</source>
         <translation>&amp;Zobrazovať hodnoty v jednotkách:</translation>
@@ -873,6 +935,9 @@
         <translation>Aktuálny celkový zostatok pre adries ktoré sa iba sledujú</translation>
     </message>
 </context>
+<context>
+    <name>PaymentServer</name>
+    </context>
 <context>
     <name>PeerTableModel</name>
     <message>
@@ -883,11 +948,7 @@
         <source>Node/Service</source>
         <translation>Uzol/Služba</translation>
     </message>
-    <message>
-        <source>Ping Time</source>
-        <translation>Čas odozvy</translation>
-    </message>
-</context>
+    </context>
 <context>
     <name>QObject</name>
     <message>
@@ -926,7 +987,17 @@
         <source>%1 ms</source>
         <translation>%1 ms</translation>
     </message>
-</context>
+    <message>
+        <source>%1 and %2</source>
+        <translation> %1 a  %2</translation>
+    </message>
+    </context>
+<context>
+    <name>QObject::QObject</name>
+    </context>
+<context>
+    <name>QRImageWidget</name>
+    </context>
 <context>
     <name>RPCConsole</name>
     <message>
@@ -953,6 +1024,10 @@
         <source>Using BerkeleyDB version</source>
         <translation>Používa BerkeleyDB verziu</translation>
     </message>
+    <message>
+        <source>Datadir</source>
+        <translation>Zložka  s dátami</translation>
+    </message>
     <message>
         <source>Startup time</source>
         <translation>Čas spustenia</translation>
@@ -1038,6 +1113,18 @@
         <source>User Agent</source>
         <translation>Aplikácia</translation>
     </message>
+    <message>
+        <source>Open the %1 debug log file from the current data directory. This can take a few seconds for large log files.</source>
+        <translation>Otvoriť %1 ladiaci výpis z aktuálnej zložky. Pre veľké súbory to môže chvíľu trvať.</translation>
+    </message>
+    <message>
+        <source>Decrease font size</source>
+        <translation>Zmenšiť písmo</translation>
+    </message>
+    <message>
+        <source>Increase font size</source>
+        <translation>Zväčšiť písmo</translation>
+    </message>
     <message>
         <source>Services</source>
         <translation>Služby</translation>
@@ -1062,6 +1149,10 @@
         <source>Ping Time</source>
         <translation>Čas odozvy</translation>
     </message>
+    <message>
+        <source>The duration of a currently outstanding ping.</source>
+        <translation>Trvanie aktuálneho pingu</translation>
+    </message>
     <message>
         <source>Ping Wait</source>
         <translation>Čakanie na ping</translation>
@@ -1110,14 +1201,6 @@
         <source>Clear console</source>
         <translation>Vymazať konzolu</translation>
     </message>
-    <message>
-        <source>&amp;Disconnect Node</source>
-        <translation>&amp;Odpojené uzly</translation>
-    </message>
-    <message>
-        <source>Ban Node for</source>
-        <translation>Blokovať uzol na</translation>
-    </message>
     <message>
         <source>1 &amp;hour</source>
         <translation>1 &amp;hodinu</translation>
@@ -1135,8 +1218,8 @@
         <translation>1 &amp;rok</translation>
     </message>
     <message>
-        <source>&amp;Unban Node</source>
-        <translation>&amp;odblokovať uzol</translation>
+        <source>Welcome to the %1 RPC console.</source>
+        <translation>Vitajte v %1 RPC konzole</translation>
     </message>
     <message>
         <source>Use up and down arrows to navigate history, and &lt;b&gt;Ctrl-L&lt;/b&gt; to clear screen.</source>
@@ -1265,7 +1348,7 @@
         <source>Remove</source>
         <translation>Odstrániť</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>ReceiveRequestDialog</name>
     <message>
@@ -1284,7 +1367,14 @@
         <source>&amp;Save Image...</source>
         <translation>Uložiť obrázok...</translation>
     </message>
-</context>
+    </context>
+<context>
+    <name>RecentRequestsTableModel</name>
+    <message>
+        <source>(no label)</source>
+        <translation>(bez popisu)</translation>
+    </message>
+    </context>
 <context>
     <name>SendCoinsDialog</name>
     <message>
@@ -1319,10 +1409,6 @@
         <source>Amount:</source>
         <translation>Suma:</translation>
     </message>
-    <message>
-        <source>Priority:</source>
-        <translation>Priorita:</translation>
-    </message>
     <message>
         <source>Fee:</source>
         <translation>Poplatok:</translation>
@@ -1391,10 +1477,6 @@
         <source>(Smart fee not initialized yet. This usually takes a few blocks...)</source>
         <translation>(Automatický poplatok ešte nebol aktivovaný. Toto zvyčajne trvá niekoľko blokov...)</translation>
     </message>
-    <message>
-        <source>Confirmation time:</source>
-        <translation>Čas potvrdenia:</translation>
-    </message>
     <message>
         <source>normal</source>
         <translation>normálne</translation>
@@ -1435,6 +1517,14 @@
         <source>S&amp;end</source>
         <translation>&amp;Odoslať</translation>
     </message>
+    <message>
+        <source>or</source>
+        <translation>alebo</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(bez popisu)</translation>
+    </message>
 </context>
 <context>
     <name>SendCoinsEntry</name>
@@ -1514,9 +1604,16 @@
         <source>Memo:</source>
         <translation>Poznámka:</translation>
     </message>
-</context>
+    </context>
+<context>
+    <name>SendConfirmationDialog</name>
+    </context>
 <context>
     <name>ShutdownWindow</name>
+    <message>
+        <source>%1 is shutting down...</source>
+        <translation>%1 sa vypína...</translation>
+    </message>
     <message>
         <source>Do not shut down the computer until this window disappears.</source>
         <translation>Nevypínajte počítač kým toto okno nezmizne.</translation>
@@ -1600,7 +1697,7 @@
         <source>Reset all verify message fields</source>
         <translation>Obnoviť všetky polia v overiť správu</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>SplashScreen</name>
     <message>
@@ -1615,13 +1712,26 @@
         <translation>KB/s</translation>
     </message>
 </context>
+<context>
+    <name>TransactionDesc</name>
+    </context>
 <context>
     <name>TransactionDescDialog</name>
     <message>
         <source>This pane shows a detailed description of the transaction</source>
         <translation>Táto časť obrazovky zobrazuje detailný popis transakcie</translation>
     </message>
-</context>
+    </context>
+<context>
+    <name>TransactionTableModel</name>
+    <message>
+        <source>(no label)</source>
+        <translation>(bez popisu)</translation>
+    </message>
+    </context>
+<context>
+    <name>TransactionView</name>
+    </context>
 <context>
     <name>UnitDisplayStatusBarControl</name>
     <message>
@@ -1629,6 +1739,15 @@
         <translation>Jednotka pre zobrazovanie súm. Kliknite pre zvolenie inej jednotky.</translation>
     </message>
 </context>
+<context>
+    <name>WalletFrame</name>
+    </context>
+<context>
+    <name>WalletModel</name>
+    </context>
+<context>
+    <name>WalletView</name>
+    </context>
 <context>
     <name>bitcoin-core</name>
     <message>
@@ -1651,6 +1770,14 @@
         <source>Accept command line and JSON-RPC commands</source>
         <translation>Prijímať príkazy z príkazového riadku a JSON-RPC</translation>
     </message>
+    <message>
+        <source>If &lt;category&gt; is not supplied or if &lt;category&gt; = 1, output all debugging information.</source>
+        <translation>Pokiaľ &lt;category&gt; nie je nastavená, alebo &lt;category&gt; = 1, vypíš všetky informácie pre ladenie.</translation>
+    </message>
+    <message>
+        <source>Prune configured below the minimum of %d MiB.  Please use a higher number.</source>
+        <translation>Redukcia nastavená pod minimálnu hodnotu %d MiB. Prosím použite vyššiu hodnotu.</translation>
+    </message>
     <message>
         <source>Error: A fatal internal error occurred, see debug.log for details</source>
         <translation>Chyba: Vyskytla sa interná chyba, pre viac informácií zobrazte debug.log</translation>
@@ -1671,51 +1798,53 @@
         <source>Unable to start HTTP server. See debug log for details.</source>
         <translation>Nepodarilo sa spustiť HTTP server. Pre viac detailov zobrazte debug log.</translation>
     </message>
-    <message>
-        <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
-        <translation>Prijať spojenia zvonku (predvolené: 1 ak žiadne -proxy alebo -connect)</translation>
-    </message>
     <message>
         <source>Bitcoin Core</source>
         <translation>Jadro Bitcoin</translation>
     </message>
+    <message>
+        <source>The %s developers</source>
+        <translation>Vývojári %s</translation>
+    </message>
     <message>
         <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source>
         <translation>Spojiť s danou adresou a vždy na nej počúvať. Použite zápis [host]:port pre IPv6</translation>
     </message>
+    <message>
+        <source>Cannot obtain a lock on data directory %s. %s is probably already running.</source>
+        <translation>Nemožné uzamknúť zložku %s. %s pravdepodobne už beží.</translation>
+    </message>
     <message>
         <source>Delete all wallet transactions and only recover those parts of the blockchain through -rescan on startup</source>
         <translation>Vymazať všetky transakcie z peňaženky a pri spustení znova získať z reťazca blokov iba tie získané pomocou -rescan</translation>
     </message>
     <message>
-        <source>Distributed under the MIT software license, see the accompanying file COPYING or &lt;http://www.opensource.org/licenses/mit-license.php&gt;.</source>
-        <translation>Distribuované pod softvérovou licenciou MIT, viď sprievodný súbor COPYING alebo &lt;http://www.opensource.org/licenses/mit-license.php&gt;.</translation>
+        <source>Error loading %s: You can't enable HD on a already existing non-HD wallet</source>
+        <translation>Chyba počas načítavania %s: Nemôžete povoliť HD na už existujúcej non-HD peaženke</translation>
     </message>
     <message>
         <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source>
         <translation>Vykonaj príkaz keď sa zmení transakcia peňaženky (%s v príkaze je nahradená TxID)</translation>
     </message>
     <message>
-        <source>Set the number of script verification threads (%u to %d, 0 = auto, &lt;0 = leave that many cores free, default: %d)</source>
-        <translation>Nastaviť počeť vlákien overujúcich skripty (%u až %d, 0 = auto, &lt;0 = nechať toľkoto jadier voľných, prednastavené: %d)</translation>
+        <source>Please check that your computer's date and time are correct! If your clock is wrong, %s will not work properly.</source>
+        <translation>Prosím skontrolujte systémový čas a dátum. Keď je váš čas nesprávny, %s nebude fungovať správne.</translation>
     </message>
     <message>
-        <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
-        <translation>Toto je pred-testovacia verzia - použitie je na vlastné riziko - nepoužívajte na tvorbu bitcoin ani obchodovanie.</translation>
+        <source>Please contribute if you find %s useful. Visit %s for further information about the software.</source>
+        <translation>Keď si myslíte, že %s je užitočný, podporte nás. Pre viac informácií o software navštívte %s.</translation>
     </message>
     <message>
-        <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source>
-        <translation>Varovanie: Javí sa že sieť sieť úplne nesúhlasí! Niektorí mineri zjavne majú ťažkosti.
-
-The network does not appear to fully agree! Some miners appear to be experiencing issues.</translation>
+        <source>Set the number of script verification threads (%u to %d, 0 = auto, &lt;0 = leave that many cores free, default: %d)</source>
+        <translation>Nastaviť počeť vlákien overujúcich skripty (%u až %d, 0 = auto, &lt;0 = nechať toľkoto jadier voľných, prednastavené: %d)</translation>
     </message>
     <message>
-        <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source>
-        <translation>Varovanie: Zjavne sa úplne nezhodujeme s našimi peer-mi! Možno potrebujete prejsť na novšiu verziu alebo ostatné uzly potrebujú vyššiu verziu.</translation>
+        <source>The block database contains a block which appears to be from the future. This may be due to your computer's date and time being set incorrectly. Only rebuild the block database if you are sure that your computer's date and time are correct</source>
+        <translation>Databáza blokov obsahuje blok, ktorý vyzerá byť z budúcnosti. Toto môže byť spôsobené nesprávnym systémovým časom vášho počítača. Obnovujte databázu blokov len keď ste si istý, že systémový čas je nastavený správne.</translation>
     </message>
     <message>
-        <source>Whitelist peers connecting from the given netmask or IP address. Can be specified multiple times.</source>
-        <translation>Uzle na zoznam povolených, ktoré sa pripájajú z danej netmask alebo IP adresy. Môže byť zadané viac krát.</translation>
+        <source>%s corrupt, salvage failed</source>
+        <translation>%s je poškodený, záchrana zlyhala</translation>
     </message>
     <message>
         <source>-maxmempool must be at least %d MB</source>
@@ -1730,13 +1859,17 @@ The network does not appear to fully agree! Some miners appear to be experiencin
         <translation>Voľby vytvorenia bloku:</translation>
     </message>
     <message>
-        <source>Connect only to the specified node(s)</source>
-        <translation>Pripojiť sa len k určenej nóde</translation>
+        <source>Change index out of range</source>
+        <translation>Menný index mimo rozsah</translation>
     </message>
     <message>
         <source>Connection options:</source>
         <translation>Možnosti pripojenia:</translation>
     </message>
+    <message>
+        <source>Copyright (C) %i-%i</source>
+        <translation>Copyright (C) %i-%i</translation>
+    </message>
     <message>
         <source>Corrupted block database detected</source>
         <translation>Zistená poškodená databáza blokov</translation>
@@ -1765,6 +1898,10 @@ The network does not appear to fully agree! Some miners appear to be experiencin
         <source>Enable publish raw block in &lt;address&gt;</source>
         <translation>Povoliť zverejnenie raw bloku pre &lt;address&gt;</translation>
     </message>
+    <message>
+        <source>Enable publish raw transaction in &lt;address&gt;</source>
+        <translation>Povoliť publikovať hrubý prevod v &lt;address&gt;</translation>
+    </message>
     <message>
         <source>Error initializing block database</source>
         <translation>Chyba inicializácie databázy blokov</translation>
@@ -1809,6 +1946,10 @@ The network does not appear to fully agree! Some miners appear to be experiencin
         <source>Incorrect or no genesis block found. Wrong datadir for network?</source>
         <translation>Nesprávny alebo žiadny genesis blok nájdený. Nesprávny dátový priečinok alebo sieť?</translation>
     </message>
+    <message>
+        <source>Initialization sanity check failed. %s is shutting down.</source>
+        <translation>Kontrola čistoty pri inicializácií zlyhala. %s sa vypína.</translation>
+    </message>
     <message>
         <source>Invalid -onion address: '%s'</source>
         <translation>Neplatná -onion adresa:  '%s'</translation>
@@ -1825,6 +1966,10 @@ The network does not appear to fully agree! Some miners appear to be experiencin
         <source>Loading banlist...</source>
         <translation>Načítavam banlist...</translation>
     </message>
+    <message>
+        <source>Location of the auth cookie (default: data dir)</source>
+        <translation>Poloha overovacieho cookie súboru (predvolená: zložka s dátami)</translation>
+    </message>
     <message>
         <source>Not enough file descriptors available.</source>
         <translation>Nedostatok kľúčových slov súboru.</translation>
@@ -1833,6 +1978,14 @@ The network does not appear to fully agree! Some miners appear to be experiencin
         <source>Only connect to nodes in network &lt;net&gt; (ipv4, ipv6 or onion)</source>
         <translation>Pripojiť iba k uzlom v sieti &lt;net&gt; (ipv4, ipv6, alebo onion)</translation>
     </message>
+    <message>
+        <source>Print this help message and exit</source>
+        <translation>Vytlačiť túto pomocnú správu a ukončiť</translation>
+    </message>
+    <message>
+        <source>Print version and exit</source>
+        <translation>Vytlačiť verziu a ukončiť</translation>
+    </message>
     <message>
         <source>Prune cannot be configured with a negative value.</source>
         <translation>Redukovanie nemôže byť nastavené na zápornú hodnotu.</translation>
@@ -1841,6 +1994,14 @@ The network does not appear to fully agree! Some miners appear to be experiencin
         <source>Prune mode is incompatible with -txindex.</source>
         <translation>Redukovanie je nekompatibilné s -txindex.</translation>
     </message>
+    <message>
+        <source>Rebuild chain state and block index from the blk*.dat files on disk</source>
+        <translation>Obnoviť stav reťazca a index blokov zo súborov blk*.dat na disku.</translation>
+    </message>
+    <message>
+        <source>Rebuild chain state from the currently indexed blocks</source>
+        <translation>Obnoviť stav reťazca z aktuálne indexovaných blokov.</translation>
+    </message>
     <message>
         <source>Set database cache size in megabytes (%d to %d, default: %d)</source>
         <translation>Nastaviť veľkosť pomocnej pamäti databázy v megabajtoch (%d do %d, prednastavené: %d)</translation>
@@ -1853,6 +2014,14 @@ The network does not appear to fully agree! Some miners appear to be experiencin
         <source>Specify wallet file (within data directory)</source>
         <translation>Označ súbor peňaženky (v priečinku s dátami)</translation>
     </message>
+    <message>
+        <source>The source code is available from %s.</source>
+        <translation>Zdrojový kód je dostupný z %s</translation>
+    </message>
+    <message>
+        <source>Unable to bind to %s on this computer. %s is probably already running.</source>
+        <translation>Nemožné pripojiť k %s na tomto počíťači. %s už pravdepodobne beží.</translation>
+    </message>
     <message>
         <source>Unsupported argument -benchmark ignored, use -debug=bench.</source>
         <translation>Nepodporovaný parameter -benchmark bol ignorovaný, použite -debug=bench.</translation>
@@ -1881,6 +2050,14 @@ The network does not appear to fully agree! Some miners appear to be experiencin
         <source>Wallet %s resides outside data directory %s</source>
         <translation>Peňaženka %s sa nachádza mimo dátového priečinka %s </translation>
     </message>
+    <message>
+        <source>Wallet debugging/testing options:</source>
+        <translation>Ladiace / testovacie možnosti peňaženky.</translation>
+    </message>
+    <message>
+        <source>Wallet needed to be rewritten: restart %s to complete</source>
+        <translation>Peňaženka musí byť prepísaná: pre dokončenie reštartujte %s</translation>
+    </message>
     <message>
         <source>Wallet options:</source>
         <translation>Voľby peňaženky:</translation>
@@ -1925,10 +2102,6 @@ The network does not appear to fully agree! Some miners appear to be experiencin
         <source>Maximum size of data in data carrier transactions we relay and mine (default: %u)</source>
         <translation>Maximálna veľkosť dát v transakciách nosných dát, ktoré prenášame a ťažíme (predvolené: %u)</translation>
     </message>
-    <message>
-        <source>Query for peer addresses via DNS lookup, if low on addresses (default: 1 unless -connect)</source>
-        <translation>Dotaz na partnerské adresy pomocou vyhľadávania DNS v prípade nedostatku adries (predvolené: 1, pokiaľ -connect)</translation>
-    </message>
     <message>
         <source>Set maximum size of high-priority/low-fee transactions in bytes (default: %d)</source>
         <translation>Nastaviť najväčšiu veľkosť vysoká-dôležitosť/nízke-poplatky transakcií v bajtoch (prednastavené: %d)</translation>
@@ -1937,10 +2110,6 @@ The network does not appear to fully agree! Some miners appear to be experiencin
         <source>The transaction amount is too small to send after the fee has been deducted</source>
         <translation>Suma je príliš malá pre odoslanie tranzakcie</translation>
     </message>
-    <message>
-        <source>This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit &lt;https://www.openssl.org/&gt; and cryptographic software written by Eric Young and UPnP software written by Thomas Bernard.</source>
-        <translation>Tento produkt obsahuje softvér vyvinutý projektom OpenSSL pre použitie sady nástrojov OpenSSL &lt;https://www.openssl.org/&gt; a kryptografického softvéru napísaného Eric Young a UPnP softvér napísaný Thomas Bernard.</translation>
-    </message>
     <message>
         <source>Whitelisted peers cannot be DoS banned and their transactions are always relayed, even if they are already in the mempool, useful e.g. for a gateway</source>
         <translation>Uzle na zoznam povolených nemôžu byť DoS zakázané a ich transakcie vždy postúpené ďalej, aj v prípade, ak sú už pamäťovej fronte. Užitočné napr. pre brány</translation>
@@ -1997,6 +2166,10 @@ The network does not appear to fully agree! Some miners appear to be experiencin
         <source>RPC server options:</source>
         <translation>Možnosti servra RPC:</translation>
     </message>
+    <message>
+        <source>Rescan the block chain for missing wallet transactions on startup</source>
+        <translation>Pri spustení skontrolovať reťaz blokov pre chýbajúce transakcie peňaženky</translation>
+    </message>
     <message>
         <source>Send trace/debug info to console instead of debug.log file</source>
         <translation>Odoslať trace/debug informácie na konzolu namiesto debug.info žurnálu</translation>
@@ -2033,10 +2206,6 @@ The network does not appear to fully agree! Some miners appear to be experiencin
         <source>Transaction amount too small</source>
         <translation>Suma transakcie príliš malá</translation>
     </message>
-    <message>
-        <source>Transaction amounts must be positive</source>
-        <translation>Hodnoty transakcie musia byť väčšie ako nula (pozitívne)</translation>
-    </message>
     <message>
         <source>Transaction too large for fee policy</source>
         <translation>Transakcia je príliš veľká pre aktuálne podmienky poplatkov</translation>
@@ -2065,6 +2234,10 @@ The network does not appear to fully agree! Some miners appear to be experiencin
         <source>Zapping all transactions from wallet...</source>
         <translation>Zmazať všetky transakcie z peňaženky...</translation>
     </message>
+    <message>
+        <source>ZeroMQ notification options:</source>
+        <translation>Možnosti pripojenia ZeroMQ:</translation>
+    </message>
     <message>
         <source>Password for JSON-RPC connections</source>
         <translation>Heslo pre JSON-rPC spojenia</translation>
@@ -2101,10 +2274,38 @@ The network does not appear to fully agree! Some miners appear to be experiencin
         <source>Output debugging information (default: %u, supplying &lt;category&gt; is optional)</source>
         <translation>Výstupné ladiace informácie (predvolené: %u, dodanie &lt;category&gt; je voliteľné)</translation>
     </message>
+    <message>
+        <source>Total length of network version string (%i) exceeds maximum length (%i). Reduce the number or size of uacomments.</source>
+        <translation>Celková dĺžka verzie sieťového reťazca (%i) prekračuje maximálnu dĺžku (%i). Znížte počet a veľkosť komentárov.</translation>
+    </message>
+    <message>
+        <source>Tries to keep outbound traffic under the given target (in MiB per 24h), 0 = no limit (default: %d)</source>
+        <translation>Sa snaží držať odchádzajúce prevádzku v rámci daného cieľa (v MB za 24h), 0 = žiadny limit (predvolený: %d)</translation>
+    </message>
+    <message>
+        <source>Unsupported argument -socks found. Setting SOCKS version isn't possible anymore, only SOCKS5 proxies are supported.</source>
+        <translation>Nepodporovaný argument -socks nájdený. Nastavenie SOCKS verzie už nie je viac moźné, iba SOCKS5 proxies sú podporované.</translation>
+    </message>
+    <message>
+        <source>Unsupported argument -whitelistalwaysrelay ignored, use -whitelistrelay and/or -whitelistforcerelay.</source>
+        <translation>Nepodporovaný argument -whitelistalwaysrelay ignorovaný, použite -whitelistrelay a/alebo -whitelistforcerelay.</translation>
+    </message>
     <message>
         <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: %s)</source>
         <translation>Použiť samostatný SOCKS5 proxy server na dosiahnutie počítačov cez skryté služby Tor (predvolené: %s)</translation>
     </message>
+    <message>
+        <source>Username and hashed password for JSON-RPC connections. The field &lt;userpw&gt; comes in the format: &lt;USERNAME&gt;:&lt;SALT&gt;$&lt;HASH&gt;. A canonical python script is included in share/rpcuser. This option can be specified multiple times</source>
+        <translation>Užívateľské hash meno a heslo pre JSON-RPC pripojenia. Pole &lt;userpw&gt; je vo formáte &lt;USERNAME&gt;:&lt;SALT&gt;$&lt;HASH&gt;. Kanonický python skript je zahrnutý v share/rpcuser. Toto nastavenie môže byť špecifikované viac krát</translation>
+    </message>
+    <message>
+        <source>Warning: Unknown block versions being mined! It's possible unknown rules are in effect</source>
+        <translation>Varovanie: Neznáma verzia blokov sa doluje! Je možné, že neznáme pravidlá majú efekt</translation>
+    </message>
+    <message>
+        <source>Warning: Wallet file corrupt, data salvaged! Original %s saved as %s in %s; if your balance or transactions are incorrect you should restore from a backup.</source>
+        <translation>Varovanie: Peňaženka poškodená, dáta boli zachránené! Originálna %s ako %s v %s; ak váš zostatok alebo transakcie sú nesprávne, mali by ste obnoviť zálohu.</translation>
+    </message>
     <message>
         <source>(default: %s)</source>
         <translation>(predvolené: %s)</translation>
@@ -2161,10 +2362,6 @@ The network does not appear to fully agree! Some miners appear to be experiencin
         <source>Set key pool size to &lt;n&gt; (default: %u)</source>
         <translation>Nastaviť veľkosť kľúča fronty na &lt;n&gt; (predvolené: %u)</translation>
     </message>
-    <message>
-        <source>Set minimum block size in bytes (default: %u)</source>
-        <translation>Nastaviť minimálnu veľkosť bloku v bajtoch (predvolené: %u)</translation>
-    </message>
     <message>
         <source>Set the number of threads to service RPC calls (default: %d)</source>
         <translation>Nastaviť počet vlákien na obsluhu RPC volaní (predvolené: %d)</translation>
diff --git a/src/qt/locale/bitcoin_sl_SI.ts b/src/qt/locale/bitcoin_sl_SI.ts
index 16ef20ea3a061..1c8cb4ce56a15 100644
--- a/src/qt/locale/bitcoin_sl_SI.ts
+++ b/src/qt/locale/bitcoin_sl_SI.ts
@@ -41,7 +41,10 @@
         <source>&amp;Delete</source>
         <translation>I&amp;zbriši</translation>
     </message>
-</context>
+    </context>
+<context>
+    <name>AddressTableModel</name>
+    </context>
 <context>
     <name>AskPassphraseDialog</name>
     <message>
@@ -60,10 +63,18 @@
         <source>Repeat new passphrase</source>
         <translation>Ponovite novo geslo</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>BanTableModel</name>
-    </context>
+    <message>
+        <source>IP/Netmask</source>
+        <translation>IP/Netmaska</translation>
+    </message>
+    <message>
+        <source>Banned Until</source>
+        <translation>Prepoved do</translation>
+    </message>
+</context>
 <context>
     <name>BitcoinGUI</name>
     <message>
@@ -242,6 +253,14 @@
         <source>%n active connection(s) to Bitcoin network</source>
         <translation><numerusform>%n aktivna povezava v omrežje Bitcoin</numerusform><numerusform>%n aktivni povezavi v omrežje Bitcoin</numerusform><numerusform>%n aktivne povezave v omrežje Bitcoin</numerusform><numerusform>%n aktivnih povezav v omrežje Bitcoin</numerusform></translation>
     </message>
+    <message>
+        <source>Indexing blocks on disk...</source>
+        <translation>Indeksirani bloki na disku ...</translation>
+    </message>
+    <message>
+        <source>Processing blocks on disk...</source>
+        <translation>Obdelava blokov na disku ...</translation>
+    </message>
     <message>
         <source>No block source available...</source>
         <translation>Ni virov za prenos blokov ...</translation>
@@ -250,26 +269,6 @@
         <source>Processed %n block(s) of transaction history.</source>
         <translation><numerusform>%n obdelan blok zgodovine transakcij.</numerusform><numerusform>%n obdelana bloka zgodovine transakcij.</numerusform><numerusform>%n obdelani bloki zgodovine transakcij.</numerusform><numerusform>%n obdelanih blokov zgodovine transakcij.</numerusform></translation>
     </message>
-    <message numerus="yes">
-        <source>%n hour(s)</source>
-        <translation><numerusform>%n uro</numerusform><numerusform>%n uri</numerusform><numerusform>%n ure</numerusform><numerusform>%n ur</numerusform></translation>
-    </message>
-    <message numerus="yes">
-        <source>%n day(s)</source>
-        <translation><numerusform>%n dan</numerusform><numerusform>%n dneva</numerusform><numerusform>%n dni</numerusform><numerusform>%n dni</numerusform></translation>
-    </message>
-    <message numerus="yes">
-        <source>%n week(s)</source>
-        <translation><numerusform>%n teden</numerusform><numerusform>%n tedna</numerusform><numerusform>%n tedne</numerusform><numerusform>%n tednov</numerusform></translation>
-    </message>
-    <message>
-        <source>%1 and %2</source>
-        <translation>%1 in %2</translation>
-    </message>
-    <message numerus="yes">
-        <source>%n year(s)</source>
-        <translation><numerusform>%n leto</numerusform><numerusform>%n leti</numerusform><numerusform>%n leta</numerusform><numerusform>%n let</numerusform></translation>
-    </message>
     <message>
         <source>%1 behind</source>
         <translation>imam še %1 zaostanka</translation>
@@ -298,6 +297,10 @@
         <source>Up to date</source>
         <translation>Posodobljeno</translation>
     </message>
+    <message>
+        <source>%1 client</source>
+        <translation>%1 odjemalec</translation>
+    </message>
     <message>
         <source>Catching up...</source>
         <translation>Dohitevam omrežje ...</translation>
@@ -348,7 +351,7 @@
         <source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;locked&lt;/b&gt;</source>
         <translation>Denarnica je &lt;b&gt;šifrirana&lt;/b&gt; in trenutno &lt;b&gt;zaklenjena&lt;/b&gt;</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>CoinControlDialog</name>
     <message>
@@ -367,10 +370,6 @@
         <source>Amount:</source>
         <translation>Znesek:</translation>
     </message>
-    <message>
-        <source>Priority:</source>
-        <translation>Prioriteta:</translation>
-    </message>
     <message>
         <source>Fee:</source>
         <translation>Provizija:</translation>
@@ -423,11 +422,7 @@
         <source>Confirmed</source>
         <translation>Potrjeno</translation>
     </message>
-    <message>
-        <source>Priority</source>
-        <translation>Prioriteta</translation>
-    </message>
-</context>
+    </context>
 <context>
     <name>EditAddressDialog</name>
     <message>
@@ -450,7 +445,7 @@
         <source>&amp;Address</source>
         <translation>&amp;Naslov</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>FreespaceChecker</name>
     <message>
@@ -484,6 +479,10 @@
         <source>(%1-bit)</source>
         <translation>(%1-bit)</translation>
     </message>
+    <message>
+        <source>About %1</source>
+        <translation>O %1</translation>
+    </message>
     <message>
         <source>Command-line options</source>
         <translation>Možnosti ukazne vrstice</translation>
@@ -496,6 +495,18 @@
         <source>command-line options</source>
         <translation>možnosti ukazne vrstice</translation>
     </message>
+    <message>
+        <source>UI Options:</source>
+        <translation>UI možnosti:</translation>
+    </message>
+    <message>
+        <source>Set language, for example "de_DE" (default: system locale)</source>
+        <translation>Nastavi jezik, na primer "sl_SI" (privzeto: sistemsko)</translation>
+    </message>
+    <message>
+        <source>Start minimized</source>
+        <translation>Začni minimizirano</translation>
+    </message>
     </context>
 <context>
     <name>Intro</name>
@@ -503,6 +514,10 @@
         <source>Welcome</source>
         <translation>Dobrodošli</translation>
     </message>
+    <message>
+        <source>Welcome to %1.</source>
+        <translation>Dobrodošli v %1</translation>
+    </message>
     <message>
         <source>Use the default data directory</source>
         <translation>Uporabi privzeto podatkovno mapo</translation>
@@ -528,6 +543,21 @@
         <translation><numerusform>(od potrebnih %n GiB)</numerusform><numerusform>(od potrebnih %n GiB)</numerusform><numerusform>(od potrebnih %n GiB)</numerusform><numerusform>(od potrebnih %n GiB)</numerusform></translation>
     </message>
 </context>
+<context>
+    <name>ModalOverlay</name>
+    <message>
+        <source>Form</source>
+        <translation>Oblika</translation>
+    </message>
+    <message>
+        <source>Last block time</source>
+        <translation>Čas zadnjega bloka</translation>
+    </message>
+    <message>
+        <source>Hide</source>
+        <translation>Skrij</translation>
+    </message>
+    </context>
 <context>
     <name>OpenURIDialog</name>
     <message>
@@ -546,7 +576,7 @@
         <source>Select payment request file</source>
         <translation>Izbiranje datoteke z zahtevkom za plačilo</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>OptionsDialog</name>
     <message>
@@ -813,6 +843,9 @@
         <translation>Trenutno skupno stanje sredstev na opazovanih naslovih</translation>
     </message>
 </context>
+<context>
+    <name>PaymentServer</name>
+    </context>
 <context>
     <name>PeerTableModel</name>
     <message>
@@ -823,11 +856,7 @@
         <source>Node/Service</source>
         <translation>Naslov</translation>
     </message>
-    <message>
-        <source>Ping Time</source>
-        <translation>Odzivni čas</translation>
-    </message>
-</context>
+    </context>
 <context>
     <name>QObject</name>
     <message>
@@ -866,7 +895,17 @@
         <source>%1 ms</source>
         <translation>%1 ms</translation>
     </message>
-</context>
+    <message>
+        <source>%1 and %2</source>
+        <translation>%1 in %2</translation>
+    </message>
+    </context>
+<context>
+    <name>QObject::QObject</name>
+    </context>
+<context>
+    <name>QRImageWidget</name>
+    </context>
 <context>
     <name>RPCConsole</name>
     <message>
@@ -1136,7 +1175,7 @@
         <source>Remove</source>
         <translation>Odstrani</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>ReceiveRequestDialog</name>
     <message>
@@ -1155,7 +1194,10 @@
         <source>&amp;Save Image...</source>
         <translation>&amp;Shrani sliko ...</translation>
     </message>
-</context>
+    </context>
+<context>
+    <name>RecentRequestsTableModel</name>
+    </context>
 <context>
     <name>SendCoinsDialog</name>
     <message>
@@ -1190,10 +1232,6 @@
         <source>Amount:</source>
         <translation>Znesek:</translation>
     </message>
-    <message>
-        <source>Priority:</source>
-        <translation>Prioriteta:</translation>
-    </message>
     <message>
         <source>Fee:</source>
         <translation>Provizija:</translation>
@@ -1262,10 +1300,6 @@
         <source>(Smart fee not initialized yet. This usually takes a few blocks...)</source>
         <translation>(Samodejni obračun provizije še ni pripravljen. Po navadi izračun traja nekaj blokov ...)</translation>
     </message>
-    <message>
-        <source>Confirmation time:</source>
-        <translation>Čas do potrditve:</translation>
-    </message>
     <message>
         <source>normal</source>
         <translation>navadno</translation>
@@ -1306,7 +1340,7 @@
         <source>S&amp;end</source>
         <translation>&amp;Pošlji</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>SendCoinsEntry</name>
     <message>
@@ -1385,7 +1419,10 @@
         <source>Memo:</source>
         <translation>Opomba:</translation>
     </message>
-</context>
+    </context>
+<context>
+    <name>SendConfirmationDialog</name>
+    </context>
 <context>
     <name>ShutdownWindow</name>
     <message>
@@ -1479,7 +1516,7 @@
         <source>Reset all verify message fields</source>
         <translation>Počisti vsa polja za vnos v oknu za preverjanje</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>SplashScreen</name>
     <message>
@@ -1494,13 +1531,22 @@
         <translation>KiB/s</translation>
     </message>
 </context>
+<context>
+    <name>TransactionDesc</name>
+    </context>
 <context>
     <name>TransactionDescDialog</name>
     <message>
         <source>This pane shows a detailed description of the transaction</source>
         <translation>V tem podoknu so prikazane podrobnosti o transakciji</translation>
     </message>
-</context>
+    </context>
+<context>
+    <name>TransactionTableModel</name>
+    </context>
+<context>
+    <name>TransactionView</name>
+    </context>
 <context>
     <name>UnitDisplayStatusBarControl</name>
     <message>
@@ -1508,6 +1554,19 @@
         <translation>Merska enota za prikaz zneskov. Kliknite za izbiro druge enote.</translation>
     </message>
 </context>
+<context>
+    <name>WalletFrame</name>
+    </context>
+<context>
+    <name>WalletModel</name>
+    </context>
+<context>
+    <name>WalletView</name>
+    <message>
+        <source>Export the data in the current tab to a file</source>
+        <translation>Izvozi podatke v trenutnem zavihku v datoteko</translation>
+    </message>
+    </context>
 <context>
     <name>bitcoin-core</name>
     <message>
@@ -1534,10 +1593,6 @@
         <source>Run in the background as a daemon and accept commands</source>
         <translation>Teci v ozadju in sprejemaj ukaze</translation>
     </message>
-    <message>
-        <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
-        <translation>Sprejemaj zunanje povezave (privzeto: 1, razen če ste vklopili opciji -proxy ali -connect)</translation>
-    </message>
     <message>
         <source>Bitcoin Core</source>
         <translation>Bitcoin Core</translation>
@@ -1546,10 +1601,6 @@
         <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source>
         <translation>Veži dani naslov in tam vedno poslušaj. Za naslove protokola IPv6 uporabite zapis [gostitelj]:vrata.</translation>
     </message>
-    <message>
-        <source>Distributed under the MIT software license, see the accompanying file COPYING or &lt;http://www.opensource.org/licenses/mit-license.php&gt;.</source>
-        <translation>Distribuirano v okviru programske licence MIT. Podrobnosti so navedene v  priloženi datoteki COPYING ali na naslovu &lt;http://www.opensource.org/licenses/mit-license.php&gt;.</translation>
-    </message>
     <message>
         <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source>
         <translation>Izvedi ukaz, ko bo transakcija denarnice se spremenila (V cmd je bil TxID zamenjan za %s)</translation>
@@ -1558,22 +1609,6 @@
         <source>Set the number of script verification threads (%u to %d, 0 = auto, &lt;0 = leave that many cores free, default: %d)</source>
         <translation>Nastavi število niti za preverjanje skript (%u do %d, 0 = samodejno, &lt;0 toliko procesorskih jeder naj ostane prostih, privzeto: %d)</translation>
     </message>
-    <message>
-        <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
-        <translation>To je preizkusna različica še neizdanega programa. Uporabljate jo na lastno odgovornost. Programa ne uporabljajte je za rudarjenje ali trgovske aplikacije.</translation>
-    </message>
-    <message>
-        <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source>
-        <translation>Opozorilo: Trenutno na omrežju ni videti konsenza! Videti je, kot da bi imeli nekateri rudarji težave.</translation>
-    </message>
-    <message>
-        <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source>
-        <translation>Opozorilo: Trenutno se s soležniki ne strinjam v popolnosti! Mogoče bi morali vi ali drugi udeleženci posodobiti odjemalce.</translation>
-    </message>
-    <message>
-        <source>Whitelist peers connecting from the given netmask or IP address. Can be specified multiple times.</source>
-        <translation>Sprejemaj povezave samo od soležnikov, ki so na naslovih, ki ustrezajo navedeni omrežni maski ali naslovu. Opcijo lahko navedete večkrat.</translation>
-    </message>
     <message>
         <source>&lt;category&gt; can be:</source>
         <translation>&lt;category&gt; je lahko:</translation>
@@ -1582,10 +1617,6 @@
         <source>Block creation options:</source>
         <translation>Možnosti ustvarjanja blokov:</translation>
     </message>
-    <message>
-        <source>Connect only to the specified node(s)</source>
-        <translation>Poveži se samo z (enim ali več) navedenimi vozlišči</translation>
-    </message>
     <message>
         <source>Connection options:</source>
         <translation>Izbire povezave:</translation>
@@ -1762,10 +1793,6 @@
         <source>Transaction amount too small</source>
         <translation>Znesek je pramajhen</translation>
     </message>
-    <message>
-        <source>Transaction amounts must be positive</source>
-        <translation>Znesek mora biti pozitiven</translation>
-    </message>
     <message>
         <source>Transaction too large</source>
         <translation>Transkacija je prevelika</translation>
diff --git a/src/qt/locale/bitcoin_sq.ts b/src/qt/locale/bitcoin_sq.ts
index 6c86b7d9fcd87..8baddf691274d 100644
--- a/src/qt/locale/bitcoin_sq.ts
+++ b/src/qt/locale/bitcoin_sq.ts
@@ -33,6 +33,69 @@
         <source>&amp;Delete</source>
         <translation>&amp;Fshi</translation>
     </message>
+    <message>
+        <source>Choose the address to send coins to</source>
+        <translation>Zgjidh adresen ku do te dergoni monedhat</translation>
+    </message>
+    <message>
+        <source>Sending addresses</source>
+        <translation>Duke derguar adresen</translation>
+    </message>
+    <message>
+        <source>Receiving addresses</source>
+        <translation>Duke marr adresen</translation>
+    </message>
+    <message>
+        <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source>
+        <translation>Këto janë Bitcoin adresat e juaja për të dërguar pagesa. Gjithmon kontrolloni shumën dhe adresën pranuese para se të dërgoni monedha.</translation>
+    </message>
+    <message>
+        <source>These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source>
+        <translation>Këto janë Bitcoin adresat e juaja për të pranuar pagesa. Rekomandohet që gjithmon të përdorni një adresë të re për çdo transaksion.</translation>
+    </message>
+    <message>
+        <source>&amp;Copy Address</source>
+        <translation>&amp;Kopjo adresen</translation>
+    </message>
+    <message>
+        <source>Copy &amp;Label</source>
+        <translation>Kopjo &amp;Etiketë</translation>
+    </message>
+    <message>
+        <source>&amp;Edit</source>
+        <translation>&amp;Ndrysho</translation>
+    </message>
+    <message>
+        <source>Export Address List</source>
+        <translation>Eksporto listën e adresave</translation>
+    </message>
+    <message>
+        <source>Comma separated file (*.csv)</source>
+        <translation>Skedar i ndarë me pikëpresje(*.csv)</translation>
+    </message>
+    <message>
+        <source>Exporting Failed</source>
+        <translation>Eksportimi dështoj</translation>
+    </message>
+    <message>
+        <source>There was an error trying to save the address list to %1. Please try again.</source>
+        <translation>Gabim gjatë ruajtjes së listës së adresave në %1. Ju lutem provoni prapë.</translation>
+    </message>
+</context>
+<context>
+    <name>AddressTableModel</name>
+    <message>
+        <source>Label</source>
+        <translation>Etiketë</translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation>Adresë</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(pa etiketë)</translation>
+    </message>
 </context>
 <context>
     <name>AskPassphraseDialog</name>
@@ -48,7 +111,67 @@
         <source>Repeat new passphrase</source>
         <translation>Përsërisni frazkalimin e ri</translation>
     </message>
-</context>
+    <message>
+        <source>Encrypt wallet</source>
+        <translation>Kripto portofolin</translation>
+    </message>
+    <message>
+        <source>This operation needs your wallet passphrase to unlock the wallet.</source>
+        <translation>Ky veprim ka nevojë per frazkalimin e portofolit tuaj që të ç'kyç portofolin.</translation>
+    </message>
+    <message>
+        <source>Unlock wallet</source>
+        <translation>ç'kyç portofolin.</translation>
+    </message>
+    <message>
+        <source>This operation needs your wallet passphrase to decrypt the wallet.</source>
+        <translation>Ky veprim kërkon frazkalimin e portofolit tuaj që të dekriptoj portofolin.</translation>
+    </message>
+    <message>
+        <source>Decrypt wallet</source>
+        <translation>Dekripto portofolin</translation>
+    </message>
+    <message>
+        <source>Change passphrase</source>
+        <translation>Ndrysho frazkalimin</translation>
+    </message>
+    <message>
+        <source>Confirm wallet encryption</source>
+        <translation>Konfirmoni enkriptimin e portofolit</translation>
+    </message>
+    <message>
+        <source>Are you sure you wish to encrypt your wallet?</source>
+        <translation>Jeni te sigurt te enkriptoni portofolin tuaj?</translation>
+    </message>
+    <message>
+        <source>Wallet encrypted</source>
+        <translation>Portofoli u enkriptua</translation>
+    </message>
+    <message>
+        <source>Wallet encryption failed</source>
+        <translation>Enkriptimi i portofolit dështoi</translation>
+    </message>
+    <message>
+        <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
+        <translation>Enkriptimi i portofolit dështoi për shkak të një gabimi të brëndshëm. portofoli juaj nuk u enkriptua.</translation>
+    </message>
+    <message>
+        <source>The supplied passphrases do not match.</source>
+        <translation>Frazkalimet e plotësuara nuk përputhen.</translation>
+    </message>
+    <message>
+        <source>Wallet unlock failed</source>
+        <translation>ç'kyçja e portofolit dështoi</translation>
+    </message>
+    <message>
+        <source>The passphrase entered for the wallet decryption was incorrect.</source>
+        <translation>Frazkalimi i futur për dekriptimin e portofolit nuk ishte i saktë.</translation>
+    </message>
+    <message>
+        <source>Wallet decryption failed</source>
+        <translation>Dekriptimi i portofolit dështoi</translation>
+    </message>
+    </context>
 <context>
     <name>BanTableModel</name>
     </context>
@@ -126,10 +249,6 @@
         <source>Tabs toolbar</source>
         <translation>Shiriti i mjeteve</translation>
     </message>
-    <message>
-        <source>%1 and %2</source>
-        <translation>%1 dhe %2</translation>
-    </message>
     <message>
         <source>%1 behind</source>
         <translation>%1 Pas</translation>
@@ -166,7 +285,7 @@
         <source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;locked&lt;/b&gt;</source>
         <translation>Portofoli po &lt;b&gt; enkriptohet&lt;/b&gt; dhe është &lt;b&gt; i kyçur&lt;/b&gt;</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>CoinControlDialog</name>
     <message>
@@ -185,6 +304,22 @@
         <source>Date</source>
         <translation>Data</translation>
     </message>
+    <message>
+        <source>Copy address</source>
+        <translation>Kopjo adresën</translation>
+    </message>
+    <message>
+        <source>yes</source>
+        <translation>po</translation>
+    </message>
+    <message>
+        <source>no</source>
+        <translation>jo</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(pa etiketë)</translation>
+    </message>
     </context>
 <context>
     <name>EditAddressDialog</name>
@@ -200,6 +335,34 @@
         <source>&amp;Address</source>
         <translation>&amp;Adresa</translation>
     </message>
+    <message>
+        <source>New receiving address</source>
+        <translation>Adresë e re pritëse</translation>
+    </message>
+    <message>
+        <source>New sending address</source>
+        <translation>Adresë e re dërgimi</translation>
+    </message>
+    <message>
+        <source>Edit receiving address</source>
+        <translation>Ndrysho adresën pritëse</translation>
+    </message>
+    <message>
+        <source>Edit sending address</source>
+        <translation>ndrysho adresën dërguese</translation>
+    </message>
+    <message>
+        <source>The entered address "%1" is already in the address book.</source>
+        <translation>Adresa e dhënë "%1" është e zënë në librin e adresave. </translation>
+    </message>
+    <message>
+        <source>Could not unlock wallet.</source>
+        <translation>Nuk mund të ç'kyçet portofoli.</translation>
+    </message>
+    <message>
+        <source>New key generation failed.</source>
+        <translation>Krijimi i çelësit të ri dështoi.</translation>
+    </message>
 </context>
 <context>
     <name>FreespaceChecker</name>
@@ -226,6 +389,13 @@
         <translation>Problem</translation>
     </message>
     </context>
+<context>
+    <name>ModalOverlay</name>
+    <message>
+        <source>Form</source>
+        <translation>Formilarë</translation>
+    </message>
+    </context>
 <context>
     <name>OpenURIDialog</name>
     </context>
@@ -247,6 +417,9 @@
         <translation>Formilarë</translation>
     </message>
     </context>
+<context>
+    <name>PaymentServer</name>
+    </context>
 <context>
     <name>PeerTableModel</name>
     </context>
@@ -256,6 +429,16 @@
         <source>Amount</source>
         <translation>Sasia</translation>
     </message>
+    <message>
+        <source>%1 and %2</source>
+        <translation>%1 dhe %2</translation>
+    </message>
+    </context>
+<context>
+    <name>QObject::QObject</name>
+    </context>
+<context>
+    <name>QRImageWidget</name>
     </context>
 <context>
     <name>RPCConsole</name>
@@ -301,6 +484,33 @@
         <source>Copy &amp;Address</source>
         <translation>&amp;Kopjo adresen</translation>
     </message>
+    <message>
+        <source>Address</source>
+        <translation>Adresë</translation>
+    </message>
+    <message>
+        <source>Amount</source>
+        <translation>Sasia</translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation>Etiketë</translation>
+    </message>
+    </context>
+<context>
+    <name>RecentRequestsTableModel</name>
+    <message>
+        <source>Date</source>
+        <translation>Data</translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation>Etiketë</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(pa etiketë)</translation>
+    </message>
     </context>
 <context>
     <name>SendCoinsDialog</name>
@@ -328,7 +538,19 @@
         <source>Confirm the send action</source>
         <translation>Konfirmo veprimin e dërgimit</translation>
     </message>
-    </context>
+    <message>
+        <source>Confirm send coins</source>
+        <translation>konfirmo dërgimin e monedhave</translation>
+    </message>
+    <message>
+        <source>The amount to pay must be larger than 0.</source>
+        <translation>Shuma e paguar duhet të jetë më e madhe se 0.</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(pa etiketë)</translation>
+    </message>
+</context>
 <context>
     <name>SendCoinsEntry</name>
     <message>
@@ -359,6 +581,13 @@
         <source>Pay To:</source>
         <translation>Paguaj drejt:</translation>
     </message>
+    <message>
+        <source>Enter a label for this address to add it to your address book</source>
+        <translation>Krijoni një etiketë për këtë adresë që t'ja shtoni librit të adresave</translation>
+    </message>
+</context>
+<context>
+    <name>SendConfirmationDialog</name>
     </context>
 <context>
     <name>ShutdownWindow</name>
@@ -388,16 +617,166 @@
 <context>
     <name>TrafficGraphWidget</name>
     </context>
+<context>
+    <name>TransactionDesc</name>
+    <message>
+        <source>Open until %1</source>
+        <translation>Hapur deri më %1</translation>
+    </message>
+    <message>
+        <source>%1/unconfirmed</source>
+        <translation>%1/I pakonfirmuar</translation>
+    </message>
+    <message>
+        <source>%1 confirmations</source>
+        <translation>%1 konfirmimet</translation>
+    </message>
+    <message>
+        <source>, has not been successfully broadcast yet</source>
+        <translation>, nuk është transmetuar me sukses deri tani</translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation>Data</translation>
+    </message>
+    <message>
+        <source>unknown</source>
+        <translation>i/e panjohur</translation>
+    </message>
+    <message>
+        <source>Transaction</source>
+        <translation>transaksionit</translation>
+    </message>
+    <message>
+        <source>Amount</source>
+        <translation>Sasia</translation>
+    </message>
+    </context>
 <context>
     <name>TransactionDescDialog</name>
     <message>
         <source>This pane shows a detailed description of the transaction</source>
         <translation>Ky panel tregon një përshkrim të detajuar të transaksionit</translation>
     </message>
-</context>
+    </context>
+<context>
+    <name>TransactionTableModel</name>
+    <message>
+        <source>Date</source>
+        <translation>Data</translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation>Lloji</translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation>Etiketë</translation>
+    </message>
+    <message>
+        <source>Open until %1</source>
+        <translation>Hapur deri më %1</translation>
+    </message>
+    <message>
+        <source>Confirmed (%1 confirmations)</source>
+        <translation>I/E konfirmuar(%1 konfirmime)</translation>
+    </message>
+    <message>
+        <source>This block was not received by any other nodes and will probably not be accepted!</source>
+        <translation>Ky bllok është marrë nga ndonjë nyje dhe ka shumë mundësi të mos pranohet! </translation>
+    </message>
+    <message>
+        <source>Generated but not accepted</source>
+        <translation>I krijuar por i papranuar</translation>
+    </message>
+    <message>
+        <source>Received with</source>
+        <translation>Marrë me</translation>
+    </message>
+    <message>
+        <source>Sent to</source>
+        <translation>Dërguar drejt</translation>
+    </message>
+    <message>
+        <source>Payment to yourself</source>
+        <translation>Pagesë ndaj vetvetes</translation>
+    </message>
+    <message>
+        <source>Mined</source>
+        <translation>Minuar</translation>
+    </message>
+    <message>
+        <source>(n/a)</source>
+        <translation>(p/a)</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(pa etiketë)</translation>
+    </message>
+    </context>
+<context>
+    <name>TransactionView</name>
+    <message>
+        <source>Received with</source>
+        <translation>Marrë me</translation>
+    </message>
+    <message>
+        <source>Sent to</source>
+        <translation>Dërguar drejt</translation>
+    </message>
+    <message>
+        <source>Mined</source>
+        <translation>Minuar</translation>
+    </message>
+    <message>
+        <source>Copy address</source>
+        <translation>Kopjo adresën</translation>
+    </message>
+    <message>
+        <source>Comma separated file (*.csv)</source>
+        <translation>Skedar i ndarë me pikëpresje(*.csv)</translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation>Data</translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation>Lloji</translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation>Etiketë</translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation>Adresë</translation>
+    </message>
+    <message>
+        <source>Exporting Failed</source>
+        <translation>Eksportimi dështoj</translation>
+    </message>
+    </context>
 <context>
     <name>UnitDisplayStatusBarControl</name>
     </context>
+<context>
+    <name>WalletFrame</name>
+    </context>
+<context>
+    <name>WalletModel</name>
+    <message>
+        <source>Send Coins</source>
+        <translation>Dërgo Monedha</translation>
+    </message>
+</context>
+<context>
+    <name>WalletView</name>
+    <message>
+        <source>Export the data in the current tab to a file</source>
+        <translation>Eksporto të dhënat e skedës korrente në një skedar</translation>
+    </message>
+    </context>
 <context>
     <name>bitcoin-core</name>
     <message>
diff --git a/src/qt/locale/bitcoin_sr.ts b/src/qt/locale/bitcoin_sr.ts
index 6b6f1af6f6453..0fda9b9350dcd 100644
--- a/src/qt/locale/bitcoin_sr.ts
+++ b/src/qt/locale/bitcoin_sr.ts
@@ -1,6 +1,10 @@
 <TS language="sr" version="2.1">
 <context>
     <name>AddressBookPage</name>
+    <message>
+        <source>Right-click to edit address or label</source>
+        <translation>Kliknite desnim klikom radi izmene adrese ili oznake</translation>
+    </message>
     <message>
         <source>Create a new address</source>
         <translation>Napravite novu adresu</translation>
@@ -17,15 +21,26 @@
         <source>&amp;Copy</source>
         <translation>Kopirajte</translation>
     </message>
+    <message>
+        <source>C&amp;lose</source>
+        <translation>Zatvorite</translation>
+    </message>
     <message>
         <source>Delete the currently selected address from the list</source>
         <translation>Izbrisite trenutno izabranu adresu sa liste</translation>
     </message>
+    <message>
+        <source>Export the data in the current tab to a file</source>
+        <translation>Eksportuj podatke iz izabrane kartice u fajl</translation>
+    </message>
     <message>
         <source>&amp;Delete</source>
         <translation>&amp;Избриши</translation>
     </message>
-</context>
+    </context>
+<context>
+    <name>AddressTableModel</name>
+    </context>
 <context>
     <name>AskPassphraseDialog</name>
     <message>
@@ -40,7 +55,7 @@
         <source>Repeat new passphrase</source>
         <translation>Поновите нову лозинку</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>BanTableModel</name>
     </context>
@@ -154,7 +169,7 @@
         <source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;locked&lt;/b&gt;</source>
         <translation>Новчаник јс &lt;b&gt;шифрован&lt;/b&gt; и тренутно &lt;b&gt;закључан&lt;/b&gt;</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>CoinControlDialog</name>
     <message>
@@ -188,7 +203,7 @@
         <source>&amp;Address</source>
         <translation>&amp;Адреса</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>FreespaceChecker</name>
     </context>
@@ -206,6 +221,13 @@
 <context>
     <name>Intro</name>
     </context>
+<context>
+    <name>ModalOverlay</name>
+    <message>
+        <source>Form</source>
+        <translation>Форма</translation>
+    </message>
+    </context>
 <context>
     <name>OpenURIDialog</name>
     </context>
@@ -235,6 +257,9 @@
         <translation>Форма</translation>
     </message>
     </context>
+<context>
+    <name>PaymentServer</name>
+    </context>
 <context>
     <name>PeerTableModel</name>
     </context>
@@ -245,6 +270,12 @@
         <translation>iznos</translation>
     </message>
     </context>
+<context>
+    <name>QObject::QObject</name>
+    </context>
+<context>
+    <name>QRImageWidget</name>
+    </context>
 <context>
     <name>RPCConsole</name>
     </context>
@@ -270,6 +301,9 @@
         <translation>Kopirajte adresu</translation>
     </message>
     </context>
+<context>
+    <name>RecentRequestsTableModel</name>
+    </context>
 <context>
     <name>SendCoinsDialog</name>
     <message>
@@ -288,7 +322,7 @@
         <source>S&amp;end</source>
         <translation>&amp;Пошаљи</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>SendCoinsEntry</name>
     <message>
@@ -312,6 +346,9 @@
         <translation>Poruka:</translation>
     </message>
     </context>
+<context>
+    <name>SendConfirmationDialog</name>
+    </context>
 <context>
     <name>ShutdownWindow</name>
     </context>
@@ -336,16 +373,34 @@
 <context>
     <name>TrafficGraphWidget</name>
     </context>
+<context>
+    <name>TransactionDesc</name>
+    </context>
 <context>
     <name>TransactionDescDialog</name>
     <message>
         <source>This pane shows a detailed description of the transaction</source>
         <translation>Ovaj odeljak pokazuje detaljan opis transakcije</translation>
     </message>
-</context>
+    </context>
+<context>
+    <name>TransactionTableModel</name>
+    </context>
+<context>
+    <name>TransactionView</name>
+    </context>
 <context>
     <name>UnitDisplayStatusBarControl</name>
     </context>
+<context>
+    <name>WalletFrame</name>
+    </context>
+<context>
+    <name>WalletModel</name>
+    </context>
+<context>
+    <name>WalletView</name>
+    </context>
 <context>
     <name>bitcoin-core</name>
     <message>
diff --git a/src/qt/locale/bitcoin_sr@latin.ts b/src/qt/locale/bitcoin_sr@latin.ts
index 86243bc14c1ef..2cfb95fb2173f 100644
--- a/src/qt/locale/bitcoin_sr@latin.ts
+++ b/src/qt/locale/bitcoin_sr@latin.ts
@@ -41,7 +41,10 @@
         <source>&amp;Delete</source>
         <translation>&amp;Izbrisati</translation>
     </message>
-</context>
+    </context>
+<context>
+    <name>AddressTableModel</name>
+    </context>
 <context>
     <name>AskPassphraseDialog</name>
     <message>
@@ -60,7 +63,55 @@
         <source>Repeat new passphrase</source>
         <translation>Ponovo unesite pristupnu frazu</translation>
     </message>
-</context>
+    <message>
+        <source>Enter the new passphrase to the wallet.&lt;br/&gt;Please use a passphrase of &lt;b&gt;ten or more random characters&lt;/b&gt;, or &lt;b&gt;eight or more words&lt;/b&gt;.</source>
+        <translation>Unesite novu pristupnu frazu u novčanik. &lt;br/&gt;Molimo, koristite pristupnu frazu koja ima &lt;b&gt; deset ili više nasumičnih znakova&lt;/b&gt;, ili &lt;b&gt;osam ili više reči&lt;/b&gt;.</translation>
+    </message>
+    <message>
+        <source>Encrypt wallet</source>
+        <translation>Šifrujte novčanik</translation>
+    </message>
+    <message>
+        <source>This operation needs your wallet passphrase to unlock the wallet.</source>
+        <translation>Da biste otključali novčanik potrebno je da unesete svoju pristupnu frazu.</translation>
+    </message>
+    <message>
+        <source>Unlock wallet</source>
+        <translation>Otključajte novčanik</translation>
+    </message>
+    <message>
+        <source>This operation needs your wallet passphrase to decrypt the wallet.</source>
+        <translation>Da biste dešifrovali novčanik, potrebno je da unesete svoju pristupnu frazu.</translation>
+    </message>
+    <message>
+        <source>Decrypt wallet</source>
+        <translation>Dešifrujte novčanik</translation>
+    </message>
+    <message>
+        <source>Change passphrase</source>
+        <translation>Promenite pristupnu frazu</translation>
+    </message>
+    <message>
+        <source>Enter the old passphrase and new passphrase to the wallet.</source>
+        <translation>Unesite u novčanik staru pristupnu frazu i novu pristupnu frazu.</translation>
+    </message>
+    <message>
+        <source>Confirm wallet encryption</source>
+        <translation>Potvrdite šifrovanje novčanika</translation>
+    </message>
+    <message>
+        <source>Warning: If you encrypt your wallet and lose your passphrase, you will &lt;b&gt;LOSE ALL OF YOUR BITCOINS&lt;/b&gt;!</source>
+        <translation>Upozorenje: Ako šifrujete svoj novčanik, i potom izgubite svoju pristupnu frazu &lt;b&gt;IZGUBIĆETE SVE SVOJE BITKOINE&lt;/b&gt;!</translation>
+    </message>
+    <message>
+        <source>Are you sure you wish to encrypt your wallet?</source>
+        <translation>Da li ste sigurni da želite da šifrujete svoj novčanik?</translation>
+    </message>
+    <message>
+        <source>Wallet encrypted</source>
+        <translation>Novčanik je šifrovan</translation>
+    </message>
+    </context>
 <context>
     <name>BanTableModel</name>
     <message>
@@ -74,13 +125,143 @@
 </context>
 <context>
     <name>BitcoinGUI</name>
+    <message>
+        <source>Synchronizing with network...</source>
+        <translation>Usklađivanje sa mrežom...</translation>
+    </message>
+    <message>
+        <source>&amp;Overview</source>
+        <translation>&amp;Pregled</translation>
+    </message>
+    <message>
+        <source>Quit application</source>
+        <translation>Isključi aplikaciju</translation>
+    </message>
+    <message>
+        <source>&amp;Options...</source>
+        <translation>&amp;Opcije...</translation>
+    </message>
+    <message>
+        <source>&amp;Change Passphrase...</source>
+        <translation>&amp;Izmeni pristupnu frazu...</translation>
+    </message>
+    <message>
+        <source>&amp;Sending addresses...</source>
+        <translation>&amp;Slanje adresa...</translation>
+    </message>
+    <message>
+        <source>&amp;Receiving addresses...</source>
+        <translation>&amp;Primanje adresa...</translation>
+    </message>
+    <message>
+        <source>Open &amp;URI...</source>
+        <translation>Otvori &amp;URI...</translation>
+    </message>
+    <message>
+        <source>Send coins to a Bitcoin address</source>
+        <translation>Pošalji novčiće na Bitcoin adresu</translation>
+    </message>
+    <message>
+        <source>&amp;Verify message...</source>
+        <translation>&amp;Proveri poruku...</translation>
+    </message>
+    <message>
+        <source>Bitcoin</source>
+        <translation>Bitcoin</translation>
+    </message>
+    <message>
+        <source>Wallet</source>
+        <translation>Novčanik</translation>
+    </message>
+    <message>
+        <source>&amp;Send</source>
+        <translation>&amp;Pošalji</translation>
+    </message>
+    <message>
+        <source>&amp;Receive</source>
+        <translation>&amp;Primi</translation>
+    </message>
+    <message>
+        <source>&amp;Show / Hide</source>
+        <translation>&amp;Prikazati / Sakriti</translation>
+    </message>
+    <message>
+        <source>Show or hide the main Window</source>
+        <translation>Prikaži ili sakrij glavni prozor</translation>
+    </message>
+    <message>
+        <source>&amp;Settings</source>
+        <translation>&amp;Podešavanja</translation>
+    </message>
+    <message>
+        <source>&amp;Help</source>
+        <translation>&amp;Pomoć</translation>
+    </message>
     <message>
         <source>Error</source>
         <translation>Greska</translation>
     </message>
+    <message>
+        <source>Warning</source>
+        <translation>Upozorenje</translation>
+    </message>
+    <message>
+        <source>Information</source>
+        <translation>Informacije</translation>
+    </message>
+    <message>
+        <source>%1 client</source>
+        <translation>%1 klijent</translation>
+    </message>
+    <message>
+        <source>Date: %1
+</source>
+        <translation>Datum: %1
+</translation>
+    </message>
+    <message>
+        <source>Amount: %1
+</source>
+        <translation>Iznos: %1
+</translation>
+    </message>
+    <message>
+        <source>Type: %1
+</source>
+        <translation>Tip: %1
+</translation>
+    </message>
+    <message>
+        <source>Label: %1
+</source>
+        <translation>Oznaka: %1
+</translation>
+    </message>
+    <message>
+        <source>Address: %1
+</source>
+        <translation>Adresa: %1
+</translation>
+    </message>
     </context>
 <context>
     <name>CoinControlDialog</name>
+    <message>
+        <source>Quantity:</source>
+        <translation>Količina:</translation>
+    </message>
+    <message>
+        <source>Amount:</source>
+        <translation>Iznos:</translation>
+    </message>
+    <message>
+        <source>Fee:</source>
+        <translation>Naknada:</translation>
+    </message>
+    <message>
+        <source>After Fee:</source>
+        <translation>Nakon Naknade:</translation>
+    </message>
     <message>
         <source>Amount</source>
         <translation>Kolicina</translation>
@@ -92,6 +273,18 @@
     </context>
 <context>
     <name>EditAddressDialog</name>
+    <message>
+        <source>Edit Address</source>
+        <translation>Izmeni Adresu</translation>
+    </message>
+    <message>
+        <source>&amp;Label</source>
+        <translation>&amp;Oznaka</translation>
+    </message>
+    <message>
+        <source>&amp;Address</source>
+        <translation>&amp;Adresa</translation>
+    </message>
     </context>
 <context>
     <name>FreespaceChecker</name>
@@ -106,6 +299,9 @@
         <translation>Greska</translation>
     </message>
     </context>
+<context>
+    <name>ModalOverlay</name>
+    </context>
 <context>
     <name>OpenURIDialog</name>
     </context>
@@ -115,6 +311,9 @@
 <context>
     <name>OverviewPage</name>
     </context>
+<context>
+    <name>PaymentServer</name>
+    </context>
 <context>
     <name>PeerTableModel</name>
     </context>
@@ -125,6 +324,12 @@
         <translation>Kolicina</translation>
     </message>
     </context>
+<context>
+    <name>QObject::QObject</name>
+    </context>
+<context>
+    <name>QRImageWidget</name>
+    </context>
 <context>
     <name>RPCConsole</name>
     </context>
@@ -134,12 +339,34 @@
 <context>
     <name>ReceiveRequestDialog</name>
     </context>
+<context>
+    <name>RecentRequestsTableModel</name>
+    </context>
 <context>
     <name>SendCoinsDialog</name>
+    <message>
+        <source>Quantity:</source>
+        <translation>Količina:</translation>
+    </message>
+    <message>
+        <source>Amount:</source>
+        <translation>Iznos:</translation>
+    </message>
+    <message>
+        <source>Fee:</source>
+        <translation>Naknada:</translation>
+    </message>
+    <message>
+        <source>After Fee:</source>
+        <translation>Nakon Naknade:</translation>
+    </message>
     </context>
 <context>
     <name>SendCoinsEntry</name>
     </context>
+<context>
+    <name>SendConfirmationDialog</name>
+    </context>
 <context>
     <name>ShutdownWindow</name>
     </context>
@@ -152,18 +379,44 @@
 <context>
     <name>TrafficGraphWidget</name>
     </context>
+<context>
+    <name>TransactionDesc</name>
+    </context>
 <context>
     <name>TransactionDescDialog</name>
     </context>
+<context>
+    <name>TransactionTableModel</name>
+    </context>
+<context>
+    <name>TransactionView</name>
+    </context>
 <context>
     <name>UnitDisplayStatusBarControl</name>
     </context>
+<context>
+    <name>WalletFrame</name>
+    </context>
+<context>
+    <name>WalletModel</name>
+    </context>
+<context>
+    <name>WalletView</name>
+    </context>
 <context>
     <name>bitcoin-core</name>
     <message>
         <source>Bitcoin Core</source>
         <translation>Bitcoin Core</translation>
     </message>
+    <message>
+        <source>Information</source>
+        <translation>Informacije</translation>
+    </message>
+    <message>
+        <source>Warning</source>
+        <translation>Upozorenje</translation>
+    </message>
     <message>
         <source>Insufficient funds</source>
         <translation>Nedovoljno sredstava</translation>
diff --git a/src/qt/locale/bitcoin_sv.ts b/src/qt/locale/bitcoin_sv.ts
index ee46974d8b4e5..cc6b47e4d63f2 100644
--- a/src/qt/locale/bitcoin_sv.ts
+++ b/src/qt/locale/bitcoin_sv.ts
@@ -41,6 +41,78 @@
         <source>&amp;Delete</source>
         <translation>&amp;Radera</translation>
     </message>
+    <message>
+        <source>Choose the address to send coins to</source>
+        <translation>Välj en adress att sända betalning till</translation>
+    </message>
+    <message>
+        <source>Choose the address to receive coins with</source>
+        <translation>Välj en adress att ta emot betalning till</translation>
+    </message>
+    <message>
+        <source>C&amp;hoose</source>
+        <translation>V&amp;älj</translation>
+    </message>
+    <message>
+        <source>Sending addresses</source>
+        <translation>Avsändaradresser</translation>
+    </message>
+    <message>
+        <source>Receiving addresses</source>
+        <translation>Mottagaradresser</translation>
+    </message>
+    <message>
+        <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source>
+        <translation>Detta är dina Bitcoin adresser för att skicka betalningar. Kolla alltid summan och den mottagande adressen innan du skickar Bitcoins.</translation>
+    </message>
+    <message>
+        <source>These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source>
+        <translation>Detta är dina Bitcoin adresser för att ta emot betalningar. Det rekommenderas att använda en ny mottagningsadress för varje transaktion.</translation>
+    </message>
+    <message>
+        <source>&amp;Copy Address</source>
+        <translation>&amp;Kopiera adress</translation>
+    </message>
+    <message>
+        <source>Copy &amp;Label</source>
+        <translation>Kopiera &amp;etikett</translation>
+    </message>
+    <message>
+        <source>&amp;Edit</source>
+        <translation>&amp;Redigera</translation>
+    </message>
+    <message>
+        <source>Export Address List</source>
+        <translation>Exportera adresslista</translation>
+    </message>
+    <message>
+        <source>Comma separated file (*.csv)</source>
+        <translation>Kommaseparerad fil (*.csv)</translation>
+    </message>
+    <message>
+        <source>Exporting Failed</source>
+        <translation>Export misslyckades</translation>
+    </message>
+    <message>
+        <source>There was an error trying to save the address list to %1. Please try again.</source>
+        <translation>Det inträffade ett fel när adresslistan skulle sparas till %1.
+Var vänlig och försök igen.</translation>
+    </message>
+</context>
+<context>
+    <name>AddressTableModel</name>
+    <message>
+        <source>Label</source>
+        <translation>Etikett</translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation>Adress</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(Ingen etikett)</translation>
+    </message>
 </context>
 <context>
     <name>AskPassphraseDialog</name>
@@ -60,6 +132,94 @@
         <source>Repeat new passphrase</source>
         <translation>Upprepa nytt lösenord</translation>
     </message>
+    <message>
+        <source>Enter the new passphrase to the wallet.&lt;br/&gt;Please use a passphrase of &lt;b&gt;ten or more random characters&lt;/b&gt;, or &lt;b&gt;eight or more words&lt;/b&gt;.</source>
+        <translation>Ange plånbokens nya lösenord. &lt;br/&gt; Använd ett lösenord på &lt;b&gt;tio eller fler slumpmässiga tecken,&lt;/b&gt; eller &lt;b&gt;åtta eller fler ord.&lt;/b&gt;.</translation>
+    </message>
+    <message>
+        <source>Encrypt wallet</source>
+        <translation>Kryptera plånbok</translation>
+    </message>
+    <message>
+        <source>This operation needs your wallet passphrase to unlock the wallet.</source>
+        <translation>Denna operation behöver din plånboks lösenord för att låsa upp plånboken.</translation>
+    </message>
+    <message>
+        <source>Unlock wallet</source>
+        <translation>Lås upp plånbok</translation>
+    </message>
+    <message>
+        <source>This operation needs your wallet passphrase to decrypt the wallet.</source>
+        <translation>Denna operation behöver din plånboks lösenord för att dekryptera plånboken.</translation>
+    </message>
+    <message>
+        <source>Decrypt wallet</source>
+        <translation>Dekryptera plånbok</translation>
+    </message>
+    <message>
+        <source>Change passphrase</source>
+        <translation>Ändra lösenord</translation>
+    </message>
+    <message>
+        <source>Enter the old passphrase and new passphrase to the wallet.</source>
+        <translation>Ge det gamla lösenordet och det nya lösenordet för plånboken.</translation>
+    </message>
+    <message>
+        <source>Confirm wallet encryption</source>
+        <translation>Bekräfta kryptering av plånbok</translation>
+    </message>
+    <message>
+        <source>Warning: If you encrypt your wallet and lose your passphrase, you will &lt;b&gt;LOSE ALL OF YOUR BITCOINS&lt;/b&gt;!</source>
+        <translation>VARNING: Om du krypterar din plånbok och glömmer ditt lösenord, kommer du att &lt;b&gt;FÖRLORA ALLA DINA BITCOIN&lt;/b&gt;!</translation>
+    </message>
+    <message>
+        <source>Are you sure you wish to encrypt your wallet?</source>
+        <translation>Är du säker på att du vill kryptera din plånbok?</translation>
+    </message>
+    <message>
+        <source>Wallet encrypted</source>
+        <translation>Plånbok krypterad</translation>
+    </message>
+    <message>
+        <source>%1 will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source>
+        <translation>%1 kommer nu att stänga ner för att färdigställa krypteringen. Tänk på att en krypterad plånbok inte skyddar mot stöld om din dator är infekterad med en keylogger.</translation>
+    </message>
+    <message>
+        <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source>
+        <translation>VIKTIGT: Alla tidigare säkerhetskopior du har gjort av plånboksfilen ska ersättas med den nya genererade, krypterade plånboksfilen. Av säkerhetsskäl kommer tidigare säkerhetskopior av den okrypterade plånboksfilen blir oanvändbara när du börjar använda en ny, krypterad plånbok.</translation>
+    </message>
+    <message>
+        <source>Wallet encryption failed</source>
+        <translation>Kryptering av plånbok misslyckades</translation>
+    </message>
+    <message>
+        <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
+        <translation>Kryptering av plånbok misslyckades på grund av ett internt fel. Din plånbok blev inte krypterad.</translation>
+    </message>
+    <message>
+        <source>The supplied passphrases do not match.</source>
+        <translation>De angivna lösenorden överensstämmer inte.</translation>
+    </message>
+    <message>
+        <source>Wallet unlock failed</source>
+        <translation>Misslyckades låsa upp plånboken</translation>
+    </message>
+    <message>
+        <source>The passphrase entered for the wallet decryption was incorrect.</source>
+        <translation>Lösenordet för dekryptering av plånboken var felaktig.</translation>
+    </message>
+    <message>
+        <source>Wallet decryption failed</source>
+        <translation>Dekryptering av plånbok misslyckades</translation>
+    </message>
+    <message>
+        <source>Wallet passphrase was successfully changed.</source>
+        <translation>Plånbokens lösenord har ändrats.</translation>
+    </message>
+    <message>
+        <source>Warning: The Caps Lock key is on!</source>
+        <translation>Varning: Caps Lock är påslaget!</translation>
+    </message>
 </context>
 <context>
     <name>BanTableModel</name>
@@ -278,26 +438,6 @@
         <source>Processed %n block(s) of transaction history.</source>
         <translation><numerusform>Bearbetade %n block av transaktionshistoriken.</numerusform><numerusform>Bearbetade %n block av transaktionshistoriken.</numerusform></translation>
     </message>
-    <message numerus="yes">
-        <source>%n hour(s)</source>
-        <translation><numerusform>%n timme</numerusform><numerusform>%n timmar</numerusform></translation>
-    </message>
-    <message numerus="yes">
-        <source>%n day(s)</source>
-        <translation><numerusform>%n dag</numerusform><numerusform>%n dagar</numerusform></translation>
-    </message>
-    <message numerus="yes">
-        <source>%n week(s)</source>
-        <translation><numerusform>%n vecka</numerusform><numerusform>%n veckor</numerusform></translation>
-    </message>
-    <message>
-        <source>%1 and %2</source>
-        <translation>%1 och %2</translation>
-    </message>
-    <message numerus="yes">
-        <source>%n year(s)</source>
-        <translation><numerusform>%n år</numerusform><numerusform>%n år</numerusform></translation>
-    </message>
     <message>
         <source>%1 behind</source>
         <translation>%1 efter</translation>
@@ -384,7 +524,7 @@
         <source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;locked&lt;/b&gt;</source>
         <translation>Denna plånbok är &lt;b&gt;krypterad&lt;/b&gt; och för närvarande &lt;b&gt;låst&lt;/b&gt;</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>CoinControlDialog</name>
     <message>
@@ -403,10 +543,6 @@
         <source>Amount:</source>
         <translation>Belopp:</translation>
     </message>
-    <message>
-        <source>Priority:</source>
-        <translation>Prioritet:</translation>
-    </message>
     <message>
         <source>Fee:</source>
         <translation>Avgift:</translation>
@@ -460,10 +596,22 @@
         <translation>Bekräftad</translation>
     </message>
     <message>
-        <source>Priority</source>
-        <translation>Prioritet</translation>
+        <source>Copy address</source>
+        <translation>Kopiera adress</translation>
     </message>
-</context>
+    <message>
+        <source>Copy label</source>
+        <translation>Kopiera etikett</translation>
+    </message>
+    <message>
+        <source>Copy amount</source>
+        <translation>Kopiera belopp</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(Ingen etikett)</translation>
+    </message>
+    </context>
 <context>
     <name>EditAddressDialog</name>
     <message>
@@ -486,7 +634,7 @@
         <source>&amp;Address</source>
         <translation>&amp;Adress</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>FreespaceChecker</name>
     <message>
@@ -608,6 +756,21 @@
         <translation><numerusform>(av %n GB behövs)</numerusform><numerusform>(av %n GB behövs)</numerusform></translation>
     </message>
 </context>
+<context>
+    <name>ModalOverlay</name>
+    <message>
+        <source>Form</source>
+        <translation>Formulär</translation>
+    </message>
+    <message>
+        <source>Last block time</source>
+        <translation>Sista blocktid</translation>
+    </message>
+    <message>
+        <source>Hide</source>
+        <translation>Göm</translation>
+    </message>
+    </context>
 <context>
     <name>OpenURIDialog</name>
     <message>
@@ -626,7 +789,7 @@
         <source>Select payment request file</source>
         <translation>Välj betalningsbegäransfil</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>OptionsDialog</name>
     <message>
@@ -937,6 +1100,9 @@
         <translation>Nuvarande total balans i granska-bara adresser</translation>
     </message>
 </context>
+<context>
+    <name>PaymentServer</name>
+    </context>
 <context>
     <name>PeerTableModel</name>
     <message>
@@ -947,11 +1113,7 @@
         <source>Node/Service</source>
         <translation>Nod/Tjänst</translation>
     </message>
-    <message>
-        <source>Ping Time</source>
-        <translation>Pingtid</translation>
-    </message>
-</context>
+    </context>
 <context>
     <name>QObject</name>
     <message>
@@ -990,7 +1152,17 @@
         <source>%1 ms</source>
         <translation>%1 ms</translation>
     </message>
-</context>
+    <message>
+        <source>%1 and %2</source>
+        <translation>%1 och %2</translation>
+    </message>
+    </context>
+<context>
+    <name>QObject::QObject</name>
+    </context>
+<context>
+    <name>QRImageWidget</name>
+    </context>
 <context>
     <name>RPCConsole</name>
     <message>
@@ -1193,14 +1365,6 @@
         <source>Clear console</source>
         <translation>Rensa konsollen</translation>
     </message>
-    <message>
-        <source>&amp;Disconnect Node</source>
-        <translation>&amp;Koppla från nod</translation>
-    </message>
-    <message>
-        <source>Ban Node for</source>
-        <translation>Banna nod i</translation>
-    </message>
     <message>
         <source>1 &amp;hour</source>
         <translation>1 &amp;timme</translation>
@@ -1217,10 +1381,6 @@
         <source>1 &amp;year</source>
         <translation>1 &amp;år</translation>
     </message>
-    <message>
-        <source>&amp;Unban Node</source>
-        <translation>&amp;Ta bort ban från nod</translation>
-    </message>
     <message>
         <source>Welcome to the %1 RPC console.</source>
         <translation>Välkommen till %1 RPC-konsolen.</translation>
@@ -1352,6 +1512,14 @@
         <source>Remove</source>
         <translation>Ta bort</translation>
     </message>
+    <message>
+        <source>Copy label</source>
+        <translation>Kopiera etikett</translation>
+    </message>
+    <message>
+        <source>Copy amount</source>
+        <translation>Kopiera belopp</translation>
+    </message>
 </context>
 <context>
     <name>ReceiveRequestDialog</name>
@@ -1371,7 +1539,26 @@
         <source>&amp;Save Image...</source>
         <translation>&amp;Spara Bild...</translation>
     </message>
-</context>
+    <message>
+        <source>Address</source>
+        <translation>Adress</translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation>Etikett</translation>
+    </message>
+    </context>
+<context>
+    <name>RecentRequestsTableModel</name>
+    <message>
+        <source>Label</source>
+        <translation>Etikett</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(Ingen etikett)</translation>
+    </message>
+    </context>
 <context>
     <name>SendCoinsDialog</name>
     <message>
@@ -1406,10 +1593,6 @@
         <source>Amount:</source>
         <translation>Belopp:</translation>
     </message>
-    <message>
-        <source>Priority:</source>
-        <translation>Prioritet:</translation>
-    </message>
     <message>
         <source>Fee:</source>
         <translation>Avgift:</translation>
@@ -1478,10 +1661,6 @@
         <source>(Smart fee not initialized yet. This usually takes a few blocks...)</source>
         <translation>(Smartavgiften är inte initierad än. Detta tar vanligen några block...)</translation>
     </message>
-    <message>
-        <source>Confirmation time:</source>
-        <translation>Bekräftelsetid:</translation>
-    </message>
     <message>
         <source>normal</source>
         <translation>normal</translation>
@@ -1522,6 +1701,14 @@
         <source>S&amp;end</source>
         <translation>&amp;Skicka</translation>
     </message>
+    <message>
+        <source>Copy amount</source>
+        <translation>Kopiera belopp</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(Ingen etikett)</translation>
+    </message>
 </context>
 <context>
     <name>SendCoinsEntry</name>
@@ -1601,7 +1788,10 @@
         <source>Memo:</source>
         <translation>PM:</translation>
     </message>
-</context>
+    </context>
+<context>
+    <name>SendConfirmationDialog</name>
+    </context>
 <context>
     <name>ShutdownWindow</name>
     <message>
@@ -1699,7 +1889,7 @@
         <source>Reset all verify message fields</source>
         <translation>Rensa alla fält</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>SplashScreen</name>
     <message>
@@ -1714,13 +1904,58 @@
         <translation>KB/s</translation>
     </message>
 </context>
+<context>
+    <name>TransactionDesc</name>
+    </context>
 <context>
     <name>TransactionDescDialog</name>
     <message>
         <source>This pane shows a detailed description of the transaction</source>
         <translation>Den här panelen visar en detaljerad beskrivning av transaktionen</translation>
     </message>
-</context>
+    </context>
+<context>
+    <name>TransactionTableModel</name>
+    <message>
+        <source>Label</source>
+        <translation>Etikett</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(Ingen etikett)</translation>
+    </message>
+    </context>
+<context>
+    <name>TransactionView</name>
+    <message>
+        <source>Copy address</source>
+        <translation>Kopiera adress</translation>
+    </message>
+    <message>
+        <source>Copy label</source>
+        <translation>Kopiera etikett</translation>
+    </message>
+    <message>
+        <source>Copy amount</source>
+        <translation>Kopiera belopp</translation>
+    </message>
+    <message>
+        <source>Comma separated file (*.csv)</source>
+        <translation>Kommaseparerad fil (*.csv)</translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation>Etikett</translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation>Adress</translation>
+    </message>
+    <message>
+        <source>Exporting Failed</source>
+        <translation>Export misslyckades</translation>
+    </message>
+    </context>
 <context>
     <name>UnitDisplayStatusBarControl</name>
     <message>
@@ -1728,6 +1963,15 @@
         <translation>&amp;Enhet att visa belopp i. Klicka för att välja annan enhet.</translation>
     </message>
 </context>
+<context>
+    <name>WalletFrame</name>
+    </context>
+<context>
+    <name>WalletModel</name>
+    </context>
+<context>
+    <name>WalletView</name>
+    </context>
 <context>
     <name>bitcoin-core</name>
     <message>
@@ -1790,17 +2034,13 @@
         <source>Unable to start HTTP server. See debug log for details.</source>
         <translation>Kunde inte starta HTTP-server. Se avlusningsloggen för detaljer.</translation>
     </message>
-    <message>
-        <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
-        <translation>Acceptera anslutningar utifrån (förvalt: 1 om ingen -proxy eller -connect)</translation>
-    </message>
     <message>
         <source>Bitcoin Core</source>
         <translation>Bitcoin Core</translation>
     </message>
     <message>
-        <source>-fallbackfee is set very high! This is the transaction fee you may pay when fee estimates are not available.</source>
-        <translation>-fallbackfee är satt väldigt högt! Detta är avgiften du kan komma att betala om uppskattad avgift inte finns tillgänglig.</translation>
+        <source>The %s developers</source>
+        <translation>%s-utvecklarna</translation>
     </message>
     <message>
         <source>A fee rate (in %s/kB) that will be used when fee estimation has insufficient data (default: %s)</source>
@@ -1822,10 +2062,6 @@
         <source>Delete all wallet transactions and only recover those parts of the blockchain through -rescan on startup</source>
         <translation>Ta bort alla plånbokstransaktioner och återskapa bara dom som är en del av blockkedjan genom att ange -rescan vid uppstart</translation>
     </message>
-    <message>
-        <source>Distributed under the MIT software license, see the accompanying file COPYING or &lt;http://www.opensource.org/licenses/mit-license.php&gt;.</source>
-        <translation>Distribuerad under MIT mjukvarulicens, se den bifogade filen COPYING eller &lt;http://www.opensource.org/licenses/mit-license.php&gt;.</translation>
-    </message>
     <message>
         <source>Error loading %s: You can't enable HD on a already existing non-HD wallet</source>
         <translation>Fel vid laddning av %s: Du kan inte aktivera HD på en existerande icke-HD plånbok</translation>
@@ -1838,10 +2074,6 @@
         <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source>
         <translation>Exekvera kommando när en plånbokstransaktion ändras (%s i cmd är ersatt av TxID)</translation>
     </message>
-    <message>
-        <source>Force relay of transactions from whitelisted peers even they violate local relay policy (default: %d)</source>
-        <translation>Vidarebefodra alltid transaktioner från vitlistade noder även om de bryter mot lokala reläpolicyn (förvalt: %d)</translation>
-    </message>
     <message>
         <source>Maximum allowed median peer time offset adjustment. Local perspective of time may be influenced by peers forward or backward by this amount. (default: %u seconds)</source>
         <translation>Maximalt tillåten median-peer tidsoffset justering. Lokalt perspektiv av tiden kan bli påverkad av partners, framåt eller bakåt denna tidsrymd. (förvalt: %u sekunder)</translation>
@@ -1866,10 +2098,6 @@
         <source>The block database contains a block which appears to be from the future. This may be due to your computer's date and time being set incorrectly. Only rebuild the block database if you are sure that your computer's date and time are correct</source>
         <translation>Blockdatabasen innehåller ett block som verkar vara från framtiden. Detta kan vara på grund av att din dators datum och tid är felaktiga. Bygg bara om blockdatabasen om du är säker på att datorns datum och tid är korrekt</translation>
     </message>
-    <message>
-        <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
-        <translation>Detta är ett förhands testbygge - använd på egen risk - använd inte för mining eller handels applikationer</translation>
-    </message>
     <message>
         <source>Unable to rewind the database to a pre-fork state. You will need to redownload the blockchain</source>
         <translation>Kan inte spola tillbaka databasen till obeskärt läge. Du måste ladda ner blockkedjan igen</translation>
@@ -1878,18 +2106,6 @@
         <source>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</source>
         <translation>Använd UPnP för att mappa den lyssnande porten (förvalt: 1 när lyssning aktiverat och utan -proxy)</translation>
     </message>
-    <message>
-        <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source>
-        <translation>Varning: Nätverket verkar inte vara helt överens! Några miners verkar ha problem.</translation>
-    </message>
-    <message>
-        <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source>
-        <translation>Varning: Vi verkar inte helt överens med våra peers! Du kan behöva uppgradera, eller andra noder kan behöva uppgradera.</translation>
-    </message>
-    <message>
-        <source>Whitelist peers connecting from the given netmask or IP address. Can be specified multiple times.</source>
-        <translation>Vitlista klienter som ansluter från angivna nätmasker eller IP-adresser. Kan specificeras flera gånger.</translation>
-    </message>
     <message>
         <source>You need to rebuild the database using -reindex-chainstate to change -txindex</source>
         <translation>Du måste återskapa databasen med -reindex-chainstate för att ändra -txindex</translation>
@@ -1926,10 +2142,6 @@
         <source>Change index out of range</source>
         <translation>Förändringsindexet utom räckhåll</translation>
     </message>
-    <message>
-        <source>Connect only to the specified node(s)</source>
-        <translation>Koppla enbart upp till den/de specificerade noden/noder</translation>
-    </message>
     <message>
         <source>Connection options:</source>
         <translation>Anslutningsalternativ:</translation>
@@ -2050,10 +2262,6 @@
         <source>Location of the auth cookie (default: data dir)</source>
         <translation>Plats för authcookie (förvalt: datamapp)</translation>
     </message>
-    <message>
-        <source>Minimum bytes per sigop in transactions we relay and mine (default: %u)</source>
-        <translation>Minimum antal byte per sigop i transaktioner som vi reläar och bryter (förvalt: %u)</translation>
-    </message>
     <message>
         <source>Not enough file descriptors available.</source>
         <translation>Inte tillräckligt med filbeskrivningar tillgängliga.</translation>
@@ -2094,10 +2302,6 @@
         <source>Set database cache size in megabytes (%d to %d, default: %d)</source>
         <translation>Sätt databasens cachestorlek i megabyte (%d till %d, förvalt: %d)</translation>
     </message>
-    <message>
-        <source>Set maximum block cost (default: %d)</source>
-        <translation>Sätt maximal blockkostnad (förvalt: %d)</translation>
-    </message>
     <message>
         <source>Set maximum block size in bytes (default: %d)</source>
         <translation>Sätt maximal blockstorlek i byte (förvalt: %d)</translation>
@@ -2202,10 +2406,6 @@
         <source>Maximum size of data in data carrier transactions we relay and mine (default: %u)</source>
         <translation>Maximal storlek på data i databärartransaktioner som vi reläar och bryter (förvalt: %u) </translation>
     </message>
-    <message>
-        <source>Query for peer addresses via DNS lookup, if low on addresses (default: 1 unless -connect)</source>
-        <translation>Sök efter klientadresser med DNS sökningen, om det finns otillräckligt med adresser (förvalt: 1 om inte -connect)</translation>
-    </message>
     <message>
         <source>Randomize credentials for every proxy connection. This enables Tor stream isolation (default: %u)</source>
         <translation>Slumpa autentiseringen för varje proxyanslutning. Detta möjliggör Tor ström-isolering (förvalt: %u)</translation>
@@ -2218,10 +2418,6 @@
         <source>The transaction amount is too small to send after the fee has been deducted</source>
         <translation>Transaktionen är för liten att skicka efter det att avgiften har dragits</translation>
     </message>
-    <message>
-        <source>This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit &lt;https://www.openssl.org/&gt; and cryptographic software written by Eric Young and UPnP software written by Thomas Bernard.</source>
-        <translation>Denna produkten innehåller mjukvara utvecklad av OpenSSL Project för användning i OpenSSL Toolkit &lt;https://www.openssl.org/&gt; och kryptografisk mjukvara utvecklad av Eric Young samt UPnP-mjukvara skriven av Thomas Bernard.</translation>
-    </message>
     <message>
         <source>Use hierarchical deterministic key generation (HD) after BIP32. Only has effect during wallet creation/first start</source>
         <translation>Använd hierarkisk deterministisk nyckel generering (HD) efter BIP32. Har bara effekt under plånbokens skapande/första användning.</translation>
@@ -2334,10 +2530,6 @@
         <source>Transaction amount too small</source>
         <translation>Transaktions belopp för liten</translation>
     </message>
-    <message>
-        <source>Transaction amounts must be positive</source>
-        <translation>Transaktionens belopp måste vara positiva</translation>
-    </message>
     <message>
         <source>Transaction too large for fee policy</source>
         <translation>Transaktionen är för stor för avgiftspolicyn</translation>
@@ -2402,14 +2594,14 @@
         <source>-maxtxfee is set very high! Fees this large could be paid on a single transaction.</source>
         <translation>-maxtxfee är väldigt högt satt! Så höga avgifter kan komma att betalas för en enstaka transaktion.</translation>
     </message>
-    <message>
-        <source>-paytxfee is set very high! This is the transaction fee you will pay if you send a transaction.</source>
-        <translation>-paytxfee är väldigt högt satt! Det här är avgiften du kommer betala om du skickar en transaktion.</translation>
-    </message>
     <message>
         <source>Do not keep transactions in the mempool longer than &lt;n&gt; hours (default: %u)</source>
         <translation>Håll inte transaktioner i minnespoolen längre än &lt;n&gt; timmar (förvalt: %u)</translation>
     </message>
+    <message>
+        <source>Equivalent bytes per sigop in transactions for relay and mining (default: %u)</source>
+        <translation>Samma antal byte per sigop i transaktioner som vi reläar och bryter (förvalt: %u)</translation>
+    </message>
     <message>
         <source>Fees (in %s/kB) smaller than this are considered zero fee for transaction creation (default: %s)</source>
         <translation>Avgifter (i %s/kB) mindre än detta anses vara nollavgifter vid skapande av transaktion (standard: %s)</translation>
@@ -2527,8 +2719,8 @@
         <translation>Sätt storleken på nyckelpoolen till &lt;n&gt; (förvalt: %u)</translation>
     </message>
     <message>
-        <source>Set minimum block size in bytes (default: %u)</source>
-        <translation>Sätt minsta blockstorlek i byte (standard: %u)</translation>
+        <source>Set maximum BIP141 block weight (default: %d)</source>
+        <translation>Sätt maximal BIP141 blockvikt (förvalt: %d)</translation>
     </message>
     <message>
         <source>Set the number of threads to service RPC calls (default: %d)</source>
diff --git a/src/qt/locale/bitcoin_ta.ts b/src/qt/locale/bitcoin_ta.ts
index 921171c5449b2..ef8c26c41de1c 100644
--- a/src/qt/locale/bitcoin_ta.ts
+++ b/src/qt/locale/bitcoin_ta.ts
@@ -25,7 +25,22 @@
         <source>&amp;Delete</source>
         <translation>&amp;அழி</translation>
     </message>
-</context>
+    <message>
+        <source>Sending addresses</source>
+        <translation>முகவரிகள் அனுப்பப்படுகின்றன</translation>
+    </message>
+    <message>
+        <source>Receiving addresses</source>
+        <translation>முகவரிகள் பெறப்படுகின்றன</translation>
+    </message>
+    </context>
+<context>
+    <name>AddressTableModel</name>
+    <message>
+        <source>Address</source>
+        <translation>முகவரி</translation>
+    </message>
+    </context>
 <context>
     <name>AskPassphraseDialog</name>
     </context>
@@ -106,14 +121,6 @@
         <source>&amp;Help</source>
         <translation>&amp;உதவி</translation>
     </message>
-    <message numerus="yes">
-        <source>%n hour(s)</source>
-        <translation><numerusform>%n மணி</numerusform><numerusform>%n மணி</numerusform></translation>
-    </message>
-    <message>
-        <source>%1 and %2</source>
-        <translation>%1 மற்றும் %2</translation>
-    </message>
     <message>
         <source>%1 behind</source>
         <translation>%1 பின்னால்</translation>
@@ -169,10 +176,6 @@
         <source>Amount:</source>
         <translation>விலை:</translation>
     </message>
-    <message>
-        <source>Priority:</source>
-        <translation>முன்னுரிமை</translation>
-    </message>
     <message>
         <source>Fee:</source>
         <translation>கட்டணம்:</translation>
@@ -201,11 +204,7 @@
         <source>Confirmed</source>
         <translation>உறுதியாக</translation>
     </message>
-    <message>
-        <source>Priority</source>
-        <translation>முன்னுரிமை</translation>
-    </message>
-</context>
+    </context>
 <context>
     <name>EditAddressDialog</name>
     </context>
@@ -230,6 +229,17 @@
         <translation>தவறு</translation>
     </message>
     </context>
+<context>
+    <name>ModalOverlay</name>
+    <message>
+        <source>Form</source>
+        <translation>படிவம்</translation>
+    </message>
+    <message>
+        <source>Hide</source>
+        <translation>மறை</translation>
+    </message>
+    </context>
 <context>
     <name>OpenURIDialog</name>
     <message>
@@ -331,17 +341,16 @@
         <translation>மொத்தம்:</translation>
     </message>
     </context>
+<context>
+    <name>PaymentServer</name>
+    </context>
 <context>
     <name>PeerTableModel</name>
     <message>
         <source>User Agent</source>
         <translation>பயனர் முகவர்</translation>
     </message>
-    <message>
-        <source>Ping Time</source>
-        <translation>பிங் நேரம்</translation>
-    </message>
-</context>
+    </context>
 <context>
     <name>QObject</name>
     <message>
@@ -368,7 +377,17 @@
         <source>%1 ms</source>
         <translation>%1 ms</translation>
     </message>
-</context>
+    <message>
+        <source>%1 and %2</source>
+        <translation>%1 மற்றும் %2</translation>
+    </message>
+    </context>
+<context>
+    <name>QObject::QObject</name>
+    </context>
+<context>
+    <name>QRImageWidget</name>
+    </context>
 <context>
     <name>RPCConsole</name>
     <message>
@@ -530,7 +549,7 @@
         <source>Remove</source>
         <translation>நீக்கு</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>ReceiveRequestDialog</name>
     <message>
@@ -549,7 +568,14 @@
         <source>&amp;Save Image...</source>
         <translation>&amp;படத்தை சேமி...</translation>
     </message>
-</context>
+    <message>
+        <source>Address</source>
+        <translation>முகவரி</translation>
+    </message>
+    </context>
+<context>
+    <name>RecentRequestsTableModel</name>
+    </context>
 <context>
     <name>SendCoinsDialog</name>
     <message>
@@ -560,10 +586,6 @@
         <source>Amount:</source>
         <translation>விலை</translation>
     </message>
-    <message>
-        <source>Priority:</source>
-        <translation>முன்னுரிமை</translation>
-    </message>
     <message>
         <source>Fee:</source>
         <translation>கட்டணம்:</translation>
@@ -600,7 +622,7 @@
         <source>S&amp;end</source>
         <translation>&amp;அனுப்பு</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>SendCoinsEntry</name>
     <message>
@@ -624,6 +646,9 @@
         <translation>செய்தி:</translation>
     </message>
     </context>
+<context>
+    <name>SendConfirmationDialog</name>
+    </context>
 <context>
     <name>ShutdownWindow</name>
     </context>
@@ -652,12 +677,34 @@
         <translation>KB/s</translation>
     </message>
 </context>
+<context>
+    <name>TransactionDesc</name>
+    </context>
 <context>
     <name>TransactionDescDialog</name>
     </context>
+<context>
+    <name>TransactionTableModel</name>
+    </context>
+<context>
+    <name>TransactionView</name>
+    <message>
+        <source>Address</source>
+        <translation>முகவரி</translation>
+    </message>
+    </context>
 <context>
     <name>UnitDisplayStatusBarControl</name>
     </context>
+<context>
+    <name>WalletFrame</name>
+    </context>
+<context>
+    <name>WalletModel</name>
+    </context>
+<context>
+    <name>WalletView</name>
+    </context>
 <context>
     <name>bitcoin-core</name>
     <message>
diff --git a/src/qt/locale/bitcoin_th_TH.ts b/src/qt/locale/bitcoin_th_TH.ts
index 34c75263416b5..18e78847fc750 100644
--- a/src/qt/locale/bitcoin_th_TH.ts
+++ b/src/qt/locale/bitcoin_th_TH.ts
@@ -41,7 +41,10 @@
         <source>&amp;Delete</source>
         <translation>&amp;ลบ</translation>
     </message>
-</context>
+    </context>
+<context>
+    <name>AddressTableModel</name>
+    </context>
 <context>
     <name>AskPassphraseDialog</name>
     <message>
@@ -60,7 +63,7 @@
         <source>Repeat new passphrase</source>
         <translation>กรุณากรอกรหัสผ่านใหม่อีกครั้งหนึ่ง</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>BanTableModel</name>
     <message>
@@ -278,26 +281,6 @@
         <source>Processed %n block(s) of transaction history.</source>
         <translation><numerusform>%n บล็อกในประวัติรายการ ได้รับการดำเนินการเรียบร้อยแล้ว</numerusform></translation>
     </message>
-    <message numerus="yes">
-        <source>%n hour(s)</source>
-        <translation><numerusform>%n ชั่วโมง</numerusform></translation>
-    </message>
-    <message numerus="yes">
-        <source>%n day(s)</source>
-        <translation><numerusform>%n วัน</numerusform></translation>
-    </message>
-    <message numerus="yes">
-        <source>%n week(s)</source>
-        <translation><numerusform>%n สัปดาห์</numerusform></translation>
-    </message>
-    <message>
-        <source>%1 and %2</source>
-        <translation>%1 และ %2</translation>
-    </message>
-    <message numerus="yes">
-        <source>%n year(s)</source>
-        <translation><numerusform>%n ปี</numerusform></translation>
-    </message>
     <message>
         <source>%1 behind</source>
         <translation>%1 ตามหลัง</translation>
@@ -384,7 +367,7 @@
         <source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;locked&lt;/b&gt;</source>
         <translation>กระเป๋าเงินถูก &lt;b&gt;เข้ารหัส&lt;/b&gt; และในปัจจุบัน &lt;b&gt;ล็อค &lt;/b&gt;</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>CoinControlDialog</name>
     <message>
@@ -403,10 +386,6 @@
         <source>Amount:</source>
         <translation>จำนวน:</translation>
     </message>
-    <message>
-        <source>Priority:</source>
-        <translation>ความเร่งด่วน:</translation>
-    </message>
     <message>
         <source>Fee:</source>
         <translation>ค่าธรรมเนียม:</translation>
@@ -459,11 +438,7 @@
         <source>Confirmed</source>
         <translation>ยืนยันแล้ว</translation>
     </message>
-    <message>
-        <source>Priority</source>
-        <translation>ระดับความสำคัญ</translation>
-    </message>
-</context>
+    </context>
 <context>
     <name>EditAddressDialog</name>
     <message>
@@ -486,7 +461,7 @@
         <source>&amp;Address</source>
         <translation>&amp;ที่เก็บ</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>FreespaceChecker</name>
     <message>
@@ -497,6 +472,10 @@
         <source>name</source>
         <translation>ชื่อ</translation>
     </message>
+    <message>
+        <source>Directory already exists. Add %1 if you intend to create a new directory here.</source>
+        <translation>ไดเร็กทอรี่มีอยู่แล้ว ใส่เพิ่ม %1 หากท่านต้องการสร้างไดเร็กทอรี่ใหม่ที่นี่</translation>
+    </message>
     <message>
         <source>Path already exists, and is not a directory.</source>
         <translation>พาธ มีอยู่แล้ว พาธนี่ไม่ใช่ไดเร็กทอรี่</translation>
@@ -604,6 +583,13 @@
         <translation><numerusform>(ต้องการพื้นที่ %n GB)</numerusform></translation>
     </message>
 </context>
+<context>
+    <name>ModalOverlay</name>
+    <message>
+        <source>Form</source>
+        <translation>รูป</translation>
+    </message>
+    </context>
 <context>
     <name>OpenURIDialog</name>
     <message>
@@ -622,7 +608,7 @@
         <source>Select payment request file</source>
         <translation>เลือก ไฟล์การเรียกการชำระเงิน</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>OptionsDialog</name>
     <message>
@@ -797,6 +783,9 @@
         <translation>รูป</translation>
     </message>
     </context>
+<context>
+    <name>PaymentServer</name>
+    </context>
 <context>
     <name>PeerTableModel</name>
     </context>
@@ -806,6 +795,16 @@
         <source>Amount</source>
         <translation>จำนวน</translation>
     </message>
+    <message>
+        <source>%1 and %2</source>
+        <translation>%1 และ %2</translation>
+    </message>
+    </context>
+<context>
+    <name>QObject::QObject</name>
+    </context>
+<context>
+    <name>QRImageWidget</name>
     </context>
 <context>
     <name>RPCConsole</name>
@@ -820,6 +819,9 @@
 <context>
     <name>ReceiveRequestDialog</name>
     </context>
+<context>
+    <name>RecentRequestsTableModel</name>
+    </context>
 <context>
     <name>SendCoinsDialog</name>
     <message>
@@ -838,10 +840,6 @@
         <source>Amount:</source>
         <translation>จำนวน:</translation>
     </message>
-    <message>
-        <source>Priority:</source>
-        <translation>ความเร่งด่วน</translation>
-    </message>
     <message>
         <source>Fee:</source>
         <translation>ค่าธรรมเนียม:</translation>
@@ -866,6 +864,9 @@
         <translation>&amp;ชื่อ:</translation>
     </message>
     </context>
+<context>
+    <name>SendConfirmationDialog</name>
+    </context>
 <context>
     <name>ShutdownWindow</name>
     </context>
@@ -882,12 +883,30 @@
 <context>
     <name>TrafficGraphWidget</name>
     </context>
+<context>
+    <name>TransactionDesc</name>
+    </context>
 <context>
     <name>TransactionDescDialog</name>
     </context>
+<context>
+    <name>TransactionTableModel</name>
+    </context>
+<context>
+    <name>TransactionView</name>
+    </context>
 <context>
     <name>UnitDisplayStatusBarControl</name>
     </context>
+<context>
+    <name>WalletFrame</name>
+    </context>
+<context>
+    <name>WalletModel</name>
+    </context>
+<context>
+    <name>WalletView</name>
+    </context>
 <context>
     <name>bitcoin-core</name>
     <message>
diff --git a/src/qt/locale/bitcoin_tr.ts b/src/qt/locale/bitcoin_tr.ts
index e3a811b504e99..b210d0199065a 100644
--- a/src/qt/locale/bitcoin_tr.ts
+++ b/src/qt/locale/bitcoin_tr.ts
@@ -41,6 +41,61 @@
         <source>&amp;Delete</source>
         <translation>&amp;Sil</translation>
     </message>
+    <message>
+        <source>Choose the address to send coins to</source>
+        <translation>Parayı göndermek istediğiniz adresi seçiniz</translation>
+    </message>
+    <message>
+        <source>Choose the address to receive coins with</source>
+        <translation>Parayı almak istediğiniz adresi seçiniz</translation>
+    </message>
+    <message>
+        <source>C&amp;hoose</source>
+        <translation>S&amp;eçiniz</translation>
+    </message>
+    <message>
+        <source>Sending addresses</source>
+        <translation>Gönderilen adresler</translation>
+    </message>
+    <message>
+        <source>Receiving addresses</source>
+        <translation>Alınan adresler</translation>
+    </message>
+    <message>
+        <source>&amp;Copy Address</source>
+        <translation>&amp;Adres Kopyala</translation>
+    </message>
+    <message>
+        <source>Copy &amp;Label</source>
+        <translation>&amp;Etiketi kopyala</translation>
+    </message>
+    <message>
+        <source>&amp;Edit</source>
+        <translation>&amp;Değiştir</translation>
+    </message>
+    <message>
+        <source>Export Address List</source>
+        <translation>Adres listesini dışarı aktar</translation>
+    </message>
+    <message>
+        <source>Exporting Failed</source>
+        <translation>Dışarı aktarmada hata</translation>
+    </message>
+    </context>
+<context>
+    <name>AddressTableModel</name>
+    <message>
+        <source>Label</source>
+        <translation>Etiket</translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation>Adres</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(etiket yok)</translation>
+    </message>
 </context>
 <context>
     <name>AskPassphraseDialog</name>
@@ -60,7 +115,43 @@
         <source>Repeat new passphrase</source>
         <translation>Yeni parolayı tekrarlayınız</translation>
     </message>
-</context>
+    <message>
+        <source>Encrypt wallet</source>
+        <translation>Şifrelenmiş cüzdan</translation>
+    </message>
+    <message>
+        <source>Unlock wallet</source>
+        <translation>Cüzdan kilidini kaldır</translation>
+    </message>
+    <message>
+        <source>This operation needs your wallet passphrase to decrypt the wallet.</source>
+        <translation>Bu işlem, cüzdan şifresini çözmek için cüzdan parolanıza ihtiyaç duyuyor.</translation>
+    </message>
+    <message>
+        <source>Change passphrase</source>
+        <translation>Parola değiştir</translation>
+    </message>
+    <message>
+        <source>Confirm wallet encryption</source>
+        <translation>Cüzdan şifrelemesini onayla</translation>
+    </message>
+    <message>
+        <source>Are you sure you wish to encrypt your wallet?</source>
+        <translation>Cüzdanınızı şifrelemek istediğinizden emin misiniz?</translation>
+    </message>
+    <message>
+        <source>Wallet encrypted</source>
+        <translation>Cüzdan şifrelendi</translation>
+    </message>
+    <message>
+        <source>Wallet encryption failed</source>
+        <translation>Cüzdan şifreleme başarısız</translation>
+    </message>
+    <message>
+        <source>Wallet unlock failed</source>
+        <translation>Cüzdan kilidi kaldırma hatası</translation>
+    </message>
+    </context>
 <context>
     <name>BanTableModel</name>
     <message>
@@ -278,26 +369,6 @@
         <source>Processed %n block(s) of transaction history.</source>
         <translation><numerusform>Muamele tarihçesinden %n blok işlendi.</numerusform><numerusform>Muamele tarihçesinden %n blok işlendi</numerusform></translation>
     </message>
-    <message numerus="yes">
-        <source>%n hour(s)</source>
-        <translation><numerusform>%n saat</numerusform><numerusform>%n saat</numerusform></translation>
-    </message>
-    <message numerus="yes">
-        <source>%n day(s)</source>
-        <translation><numerusform>%n gün</numerusform><numerusform>%n gün</numerusform></translation>
-    </message>
-    <message numerus="yes">
-        <source>%n week(s)</source>
-        <translation><numerusform>%n hafta</numerusform><numerusform>%n hafta</numerusform></translation>
-    </message>
-    <message>
-        <source>%1 and %2</source>
-        <translation>%1 ve %2</translation>
-    </message>
-    <message numerus="yes">
-        <source>%n year(s)</source>
-        <translation><numerusform>%n yıl</numerusform><numerusform>%n yıl</numerusform></translation>
-    </message>
     <message>
         <source>%1 behind</source>
         <translation>%1 geride</translation>
@@ -384,7 +455,7 @@
         <source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;locked&lt;/b&gt;</source>
         <translation>Cüzdan &lt;b&gt;şifrelenmiştir&lt;/b&gt; ve şu anda &lt;b&gt;kilitlidir&lt;/b&gt;</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>CoinControlDialog</name>
     <message>
@@ -403,10 +474,6 @@
         <source>Amount:</source>
         <translation>Meblağ:</translation>
     </message>
-    <message>
-        <source>Priority:</source>
-        <translation>Öncelik:</translation>
-    </message>
     <message>
         <source>Fee:</source>
         <translation>Ücret:</translation>
@@ -460,10 +527,22 @@
         <translation>Doğrulandı</translation>
     </message>
     <message>
-        <source>Priority</source>
-        <translation>Öncelik</translation>
+        <source>Copy address</source>
+        <translation>Adres kopyala</translation>
     </message>
-</context>
+    <message>
+        <source>Copy label</source>
+        <translation>Etiket kopyala</translation>
+    </message>
+    <message>
+        <source>Copy amount</source>
+        <translation>Miktarı kopyala</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(etiket yok)</translation>
+    </message>
+    </context>
 <context>
     <name>EditAddressDialog</name>
     <message>
@@ -486,7 +565,7 @@
         <source>&amp;Address</source>
         <translation>&amp;Adres</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>FreespaceChecker</name>
     <message>
@@ -608,6 +687,21 @@
         <translation><numerusform>(gereken %n GB alandan)</numerusform><numerusform>(gereken %n GB alandan)</numerusform></translation>
     </message>
 </context>
+<context>
+    <name>ModalOverlay</name>
+    <message>
+        <source>Form</source>
+        <translation>Form</translation>
+    </message>
+    <message>
+        <source>Last block time</source>
+        <translation>Son blok zamanı</translation>
+    </message>
+    <message>
+        <source>Hide</source>
+        <translation>Sakla</translation>
+    </message>
+    </context>
 <context>
     <name>OpenURIDialog</name>
     <message>
@@ -626,7 +720,7 @@
         <source>Select payment request file</source>
         <translation>Ödeme talebi dosyasını seç</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>OptionsDialog</name>
     <message>
@@ -937,6 +1031,9 @@
         <translation>Sadece izlenen adreslerdeki güncel toplam bakiye</translation>
     </message>
 </context>
+<context>
+    <name>PaymentServer</name>
+    </context>
 <context>
     <name>PeerTableModel</name>
     <message>
@@ -947,11 +1044,7 @@
         <source>Node/Service</source>
         <translation>Düğüm/Servis</translation>
     </message>
-    <message>
-        <source>Ping Time</source>
-        <translation>Ping Süresi</translation>
-    </message>
-</context>
+    </context>
 <context>
     <name>QObject</name>
     <message>
@@ -990,7 +1083,21 @@
         <source>%1 ms</source>
         <translation>%1 ms</translation>
     </message>
-</context>
+    <message>
+        <source>%1 and %2</source>
+        <translation>%1 ve %2</translation>
+    </message>
+    </context>
+<context>
+    <name>QObject::QObject</name>
+    </context>
+<context>
+    <name>QRImageWidget</name>
+    <message>
+        <source>&amp;Save Image...</source>
+        <translation>Resmi ka&amp;ydet...</translation>
+    </message>
+    </context>
 <context>
     <name>RPCConsole</name>
     <message>
@@ -1193,14 +1300,6 @@
         <source>Clear console</source>
         <translation>Konsolu temizle</translation>
     </message>
-    <message>
-        <source>&amp;Disconnect Node</source>
-        <translation>Düğümle Bağlantıyı &amp;Kes</translation>
-    </message>
-    <message>
-        <source>Ban Node for</source>
-        <translation>Düğümü şu süre için yasakla:</translation>
-    </message>
     <message>
         <source>1 &amp;hour</source>
         <translation>1 &amp;saat</translation>
@@ -1217,10 +1316,6 @@
         <source>1 &amp;year</source>
         <translation>1 &amp;yıl</translation>
     </message>
-    <message>
-        <source>&amp;Unban Node</source>
-        <translation>Düğümün Yasağını Kald&amp;ır</translation>
-    </message>
     <message>
         <source>Welcome to the %1 RPC console.</source>
         <translation>%1 RPC konsoluna hoş geldiniz.</translation>
@@ -1352,6 +1447,14 @@
         <source>Remove</source>
         <translation>Kaldır</translation>
     </message>
+    <message>
+        <source>Copy label</source>
+        <translation>Etiket kopyala</translation>
+    </message>
+    <message>
+        <source>Copy amount</source>
+        <translation>Miktarı kopyala</translation>
+    </message>
 </context>
 <context>
     <name>ReceiveRequestDialog</name>
@@ -1371,7 +1474,26 @@
         <source>&amp;Save Image...</source>
         <translation>Resmi ka&amp;ydet...</translation>
     </message>
-</context>
+    <message>
+        <source>Address</source>
+        <translation>Adres</translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation>Etiket</translation>
+    </message>
+    </context>
+<context>
+    <name>RecentRequestsTableModel</name>
+    <message>
+        <source>Label</source>
+        <translation>Etiket</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(etiket yok)</translation>
+    </message>
+    </context>
 <context>
     <name>SendCoinsDialog</name>
     <message>
@@ -1406,10 +1528,6 @@
         <source>Amount:</source>
         <translation>Meblağ:</translation>
     </message>
-    <message>
-        <source>Priority:</source>
-        <translation>Öncelik:</translation>
-    </message>
     <message>
         <source>Fee:</source>
         <translation>Ücret:</translation>
@@ -1478,10 +1596,6 @@
         <source>(Smart fee not initialized yet. This usually takes a few blocks...)</source>
         <translation>(Zeki ücret henüz başlatılmadı. Bu genelde birkaç blok alır...)</translation>
     </message>
-    <message>
-        <source>Confirmation time:</source>
-        <translation>Teyit süresi:</translation>
-    </message>
     <message>
         <source>normal</source>
         <translation>normal</translation>
@@ -1522,6 +1636,14 @@
         <source>S&amp;end</source>
         <translation>G&amp;önder</translation>
     </message>
+    <message>
+        <source>Copy amount</source>
+        <translation>Miktarı kopyala</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(etiket yok)</translation>
+    </message>
 </context>
 <context>
     <name>SendCoinsEntry</name>
@@ -1601,7 +1723,10 @@
         <source>Memo:</source>
         <translation>Not:</translation>
     </message>
-</context>
+    </context>
+<context>
+    <name>SendConfirmationDialog</name>
+    </context>
 <context>
     <name>ShutdownWindow</name>
     <message>
@@ -1699,7 +1824,7 @@
         <source>Reset all verify message fields</source>
         <translation>Tüm mesaj kontrolü alanlarını sıfırla</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>SplashScreen</name>
     <message>
@@ -1714,13 +1839,54 @@
         <translation>KB/s</translation>
     </message>
 </context>
+<context>
+    <name>TransactionDesc</name>
+    </context>
 <context>
     <name>TransactionDescDialog</name>
     <message>
         <source>This pane shows a detailed description of the transaction</source>
         <translation>Bu pano muamelenin ayrıntılı açıklamasını gösterir</translation>
     </message>
-</context>
+    </context>
+<context>
+    <name>TransactionTableModel</name>
+    <message>
+        <source>Label</source>
+        <translation>Etiket</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(etiket yok)</translation>
+    </message>
+    </context>
+<context>
+    <name>TransactionView</name>
+    <message>
+        <source>Copy address</source>
+        <translation>Adres kopyala</translation>
+    </message>
+    <message>
+        <source>Copy label</source>
+        <translation>Etiket kopyala</translation>
+    </message>
+    <message>
+        <source>Copy amount</source>
+        <translation>Miktarı kopyala</translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation>Etiket</translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation>Adres</translation>
+    </message>
+    <message>
+        <source>Exporting Failed</source>
+        <translation>Dışarı aktarmada hata</translation>
+    </message>
+    </context>
 <context>
     <name>UnitDisplayStatusBarControl</name>
     <message>
@@ -1728,6 +1894,15 @@
         <translation>Meblağları göstermek için birim. Başka bir birim seçmek için tıklayınız.</translation>
     </message>
 </context>
+<context>
+    <name>WalletFrame</name>
+    </context>
+<context>
+    <name>WalletModel</name>
+    </context>
+<context>
+    <name>WalletView</name>
+    </context>
 <context>
     <name>bitcoin-core</name>
     <message>
@@ -1790,10 +1965,6 @@
         <source>Unable to start HTTP server. See debug log for details.</source>
         <translation>HTTP sunucusu başlatılamadı. Ayrıntılar için debug.log dosyasına bakınız.</translation>
     </message>
-    <message>
-        <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
-        <translation>Dışarıdan gelen bağlantıları kabul et (varsayılan: -proxy veya -connect yoksa 1)</translation>
-    </message>
     <message>
         <source>Bitcoin Core</source>
         <translation>Bitcoin Çekirdeği</translation>
@@ -1802,10 +1973,6 @@
         <source>The %s developers</source>
         <translation>%s geliştiricileri</translation>
     </message>
-    <message>
-        <source>-fallbackfee is set very high! This is the transaction fee you may pay when fee estimates are not available.</source>
-        <translation>-fallbackfee çok yüksek bir değere ayarlanmış! Ücret tahminleri mevcut değilken ödeyebileceğiniz muamele ücretidir bu.</translation>
-    </message>
     <message>
         <source>A fee rate (in %s/kB) that will be used when fee estimation has insufficient data (default: %s)</source>
         <translation>Ücret tahmini için yetersiz veri bulunduğunda kullanılacak ücret oranı (%s/kB olarak) (varsayılan: %s)</translation>
@@ -1826,10 +1993,6 @@
         <source>Delete all wallet transactions and only recover those parts of the blockchain through -rescan on startup</source>
         <translation>Tüm cüzdan muamelelerini sil ve başlangıçta -rescan ile sadece blok zincirinin parçası olanları geri getir</translation>
     </message>
-    <message>
-        <source>Distributed under the MIT software license, see the accompanying file COPYING or &lt;http://www.opensource.org/licenses/mit-license.php&gt;.</source>
-        <translation>MIT yazılım lisansı kapsamında yayınlanmıştır, ekteki COPYING dosyasına ya da &lt;http://www.opensource.org/licenses/mit-license.php&gt; adresine bakınız.</translation>
-    </message>
     <message>
         <source>Error loading %s: You can't enable HD on a already existing non-HD wallet</source>
         <translation>%s yüklenmesinde hata: zaten var olan ve HD olmayan bir cüzdanda HD etkinleştirilemez.</translation>
@@ -1842,10 +2005,6 @@
         <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source>
         <translation>Bir cüzdan muamelesi değiştiğinde komutu çalıştır (komuttaki %s muamele kimliği ile değiştirilecektir)</translation>
     </message>
-    <message>
-        <source>Force relay of transactions from whitelisted peers even they violate local relay policy (default: %d)</source>
-        <translation>Yerel aktarma politikasını ihlal ettiklerinde bile beyaz listedeki eşlerden gelen muamelelerin aktarılmasını zorla (varsayılan: %d)</translation>
-    </message>
     <message>
         <source>Maximum allowed median peer time offset adjustment. Local perspective of time may be influenced by peers forward or backward by this amount. (default: %u seconds)</source>
         <translation>Müsaade edilen azami medyan eş zamanı değişiklik sınırının ayarlaması. Zamanın yerel perspektifi bu miktar kadar ileri ya da geri eşler tarafından etkilenebilir. (Varsayılan %u saniye)</translation>
@@ -1870,10 +2029,6 @@
         <source>The block database contains a block which appears to be from the future. This may be due to your computer's date and time being set incorrectly. Only rebuild the block database if you are sure that your computer's date and time are correct</source>
         <translation>Blok veritabanı gelecekten gibi görünen bir blok içermektedir. Bu, bilgisayarınızın saat ve tarihinin yanlış ayarlanmış olmasından kaynaklanabilir. Blok veritabanını sadece bilgisayarınızın tarih ve saatinin doğru olduğundan eminseniz yeniden derleyin.</translation>
     </message>
-    <message>
-        <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
-        <translation>Bu yayın öncesi bir deneme sürümüdür - tüm riski siz üstlenmiş olursunuz - bitcoin oluşturmak ya da ticari uygulamalar için kullanmayınız</translation>
-    </message>
     <message>
         <source>Unable to rewind the database to a pre-fork state. You will need to redownload the blockchain</source>
         <translation>Veritabanını çatallama öncesi duruma geri sarmak mümkün değil. Blok zincirini tekrar indirmeniz gerekmektedir</translation>
@@ -1882,18 +2037,6 @@
         <source>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</source>
         <translation>Dinlenecek portu haritalamak için UPnP kullan (varsayılan: dinlenildiğinde ve -proxy olmadığında 1)</translation>
     </message>
-    <message>
-        <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source>
-        <translation>Uyarı: şebeke tamamen mutabık değil gibi görünüyor! Bazı madenciler sorun yaşıyor gibi görünüyor.</translation>
-    </message>
-    <message>
-        <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source>
-        <translation>Uyarı: eşlerimizle tamamen mutabık değiliz gibi görünüyor! Güncelleme yapmanız gerekebilir ya da diğer düğümlerin güncelleme yapmaları gerekebilir.</translation>
-    </message>
-    <message>
-        <source>Whitelist peers connecting from the given netmask or IP address. Can be specified multiple times.</source>
-        <translation>Belirtilen ağ maskesi ya da IP adresinden bağlanan eşleri beyaz listeye al. Birden fazla kez belirtilebilir.</translation>
-    </message>
     <message>
         <source>You need to rebuild the database using -reindex-chainstate to change -txindex</source>
         <translation>-txindex'i değiştirmek için veritabanını -reindex-chainstate kullanarak tekrar inşa etmeniz gerekmektedir</translation>
@@ -1930,10 +2073,6 @@
         <source>Change index out of range</source>
         <translation>Aralık dışında değişiklik endeksi</translation>
     </message>
-    <message>
-        <source>Connect only to the specified node(s)</source>
-        <translation>Sadece belirtilen düğüme veya düğümlere bağlan</translation>
-    </message>
     <message>
         <source>Connection options:</source>
         <translation>Bağlantı seçenekleri:</translation>
@@ -2054,10 +2193,6 @@
         <source>Location of the auth cookie (default: data dir)</source>
         <translation>auth çerezinin konumu (varsayılan: veri klasörü)</translation>
     </message>
-    <message>
-        <source>Minimum bytes per sigop in transactions we relay and mine (default: %u)</source>
-        <translation>Aktardığımız ve oluşturduğumuz muamelelerdeki sigop başına asgari bayt (varsayılan: %u)</translation>
-    </message>
     <message>
         <source>Not enough file descriptors available.</source>
         <translation>Kafi derecede dosya tanımlayıcıları mevcut değil.</translation>
@@ -2098,10 +2233,6 @@
         <source>Set database cache size in megabytes (%d to %d, default: %d)</source>
         <translation>Veritabanı önbellek boyutunu megabayt olarak belirt (%d ilâ %d, varsayılan: %d)</translation>
     </message>
-    <message>
-        <source>Set maximum block cost (default: %d)</source>
-        <translation>Azami blok maliyetini ayarla (varsayılan: %d)</translation>
-    </message>
     <message>
         <source>Set maximum block size in bytes (default: %d)</source>
         <translation>Azami blok boyutunu bayt olarak ayarla (varsayılan: %d)</translation>
@@ -2206,10 +2337,6 @@
         <source>Maximum size of data in data carrier transactions we relay and mine (default: %u)</source>
         <translation>Aktardığımız ve oluşturduğumuz veri taşıyıcı muamelelerindeki azami veri boyutu (varsayılan: %u)</translation>
     </message>
-    <message>
-        <source>Query for peer addresses via DNS lookup, if low on addresses (default: 1 unless -connect)</source>
-        <translation>Adres sayısı azaldıysa DNS sorgulamasıyla eş adresleri ara (varsayılan: 1 -connect kullanılmadıysa)</translation>
-    </message>
     <message>
         <source>Randomize credentials for every proxy connection. This enables Tor stream isolation (default: %u)</source>
         <translation>Her vekil bağlantısı için kimlik verilerini rastgele yap. Bu, Tor akış izolasyonunu etkinleştirir (varsayılan: %u)</translation>
@@ -2222,10 +2349,6 @@
         <source>The transaction amount is too small to send after the fee has been deducted</source>
         <translation>Bu muamele, ücret düşüldükten sonra göndermek için çok düşük</translation>
     </message>
-    <message>
-        <source>This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit &lt;https://www.openssl.org/&gt; and cryptographic software written by Eric Young and UPnP software written by Thomas Bernard.</source>
-        <translation>Bu ürün OpenSSL projesi tarafından OpenSSL araç takımı (http://www.openssl.org/) için geliştirilen yazılımlar, Eric Young (eay@cryptsoft.com) tarafından hazırlanmış şifreleme yazılımları ve Thomas Bernard tarafından programlanmış UPnP yazılımı içerir.</translation>
-    </message>
     <message>
         <source>Use hierarchical deterministic key generation (HD) after BIP32. Only has effect during wallet creation/first start</source>
         <translation>BIP32'den sonra hiyerarşik determinist (HD) anahtar üretimini kullan. Sadece cüzdan oluşturulmasında/ilk başlamada etkiye sahiptir.</translation>
@@ -2338,10 +2461,6 @@
         <source>Transaction amount too small</source>
         <translation>Muamele meblağı çok düşük</translation>
     </message>
-    <message>
-        <source>Transaction amounts must be positive</source>
-        <translation>Muamele tutarının pozitif olması lazımdır</translation>
-    </message>
     <message>
         <source>Transaction too large for fee policy</source>
         <translation>Ücret politikası için çok büyük muamele</translation>
@@ -2406,14 +2525,14 @@
         <source>-maxtxfee is set very high! Fees this large could be paid on a single transaction.</source>
         <translation>-maxtxfee çok yüksek bir değere ayarlanmış! Bu denli yüksek ücretler tek bir muamelede ödenebilir.</translation>
     </message>
-    <message>
-        <source>-paytxfee is set very high! This is the transaction fee you will pay if you send a transaction.</source>
-        <translation>-paytxfee çok yüksek bir değere ayarlanmış! Bu, muamele gönderirseniz ödeyeceğiniz muamele ücretidir.</translation>
-    </message>
     <message>
         <source>Do not keep transactions in the mempool longer than &lt;n&gt; hours (default: %u)</source>
         <translation>Muameleleri bellek alanında &lt;n&gt; saatten fazla tutma (varsayılan: %u)</translation>
     </message>
+    <message>
+        <source>Equivalent bytes per sigop in transactions for relay and mining (default: %u)</source>
+        <translation>Oluşturma ve aktarşa muamelelerinde sigop başına eşdeğer bayt (varsayılan: %u)</translation>
+    </message>
     <message>
         <source>Fees (in %s/kB) smaller than this are considered zero fee for transaction creation (default: %s)</source>
         <translation>Bundan düşük ücretler (%s/kB olarak) muamele oluşturulması için sıfır değerinde ücret olarak kabul edilir (varsayılan: %s)</translation>
@@ -2531,8 +2650,8 @@
         <translation>Anahtar alan boyutunu &lt;n&gt; değerine ayarla (varsayılan: %u)</translation>
     </message>
     <message>
-        <source>Set minimum block size in bytes (default: %u)</source>
-        <translation>Bayt olarak asgari blok boyutunu tanımla (varsayılan: %u)</translation>
+        <source>Set maximum BIP141 block weight (default: %d)</source>
+        <translation>Azami BIP141 blok ağırlığını ayarla (varsayılan: %d)</translation>
     </message>
     <message>
         <source>Set the number of threads to service RPC calls (default: %d)</source>
diff --git a/src/qt/locale/bitcoin_tr_TR.ts b/src/qt/locale/bitcoin_tr_TR.ts
index 344309c25fd33..c4e4d2983e1cb 100644
--- a/src/qt/locale/bitcoin_tr_TR.ts
+++ b/src/qt/locale/bitcoin_tr_TR.ts
@@ -41,7 +41,10 @@
         <source>&amp;Delete</source>
         <translation>&amp;Sil</translation>
     </message>
-</context>
+    </context>
+<context>
+    <name>AddressTableModel</name>
+    </context>
 <context>
     <name>AskPassphraseDialog</name>
     </context>
@@ -68,7 +71,7 @@
         <source>&amp;Address</source>
         <translation>Adres</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>FreespaceChecker</name>
     </context>
@@ -78,6 +81,9 @@
 <context>
     <name>Intro</name>
     </context>
+<context>
+    <name>ModalOverlay</name>
+    </context>
 <context>
     <name>OpenURIDialog</name>
     </context>
@@ -87,12 +93,21 @@
 <context>
     <name>OverviewPage</name>
     </context>
+<context>
+    <name>PaymentServer</name>
+    </context>
 <context>
     <name>PeerTableModel</name>
     </context>
 <context>
     <name>QObject</name>
     </context>
+<context>
+    <name>QObject::QObject</name>
+    </context>
+<context>
+    <name>QRImageWidget</name>
+    </context>
 <context>
     <name>RPCConsole</name>
     </context>
@@ -106,12 +121,18 @@
         <translation>&amp;Adresi Kopyala</translation>
     </message>
     </context>
+<context>
+    <name>RecentRequestsTableModel</name>
+    </context>
 <context>
     <name>SendCoinsDialog</name>
     </context>
 <context>
     <name>SendCoinsEntry</name>
     </context>
+<context>
+    <name>SendConfirmationDialog</name>
+    </context>
 <context>
     <name>ShutdownWindow</name>
     </context>
@@ -124,12 +145,30 @@
 <context>
     <name>TrafficGraphWidget</name>
     </context>
+<context>
+    <name>TransactionDesc</name>
+    </context>
 <context>
     <name>TransactionDescDialog</name>
     </context>
+<context>
+    <name>TransactionTableModel</name>
+    </context>
+<context>
+    <name>TransactionView</name>
+    </context>
 <context>
     <name>UnitDisplayStatusBarControl</name>
     </context>
+<context>
+    <name>WalletFrame</name>
+    </context>
+<context>
+    <name>WalletModel</name>
+    </context>
+<context>
+    <name>WalletView</name>
+    </context>
 <context>
     <name>bitcoin-core</name>
     </context>
diff --git a/src/qt/locale/bitcoin_uk.ts b/src/qt/locale/bitcoin_uk.ts
index a06cc9e0921a8..e423977ebaf3a 100644
--- a/src/qt/locale/bitcoin_uk.ts
+++ b/src/qt/locale/bitcoin_uk.ts
@@ -41,7 +41,10 @@
         <source>&amp;Delete</source>
         <translation>&amp;Видалити</translation>
     </message>
-</context>
+    </context>
+<context>
+    <name>AddressTableModel</name>
+    </context>
 <context>
     <name>AskPassphraseDialog</name>
     <message>
@@ -60,7 +63,7 @@
         <source>Repeat new passphrase</source>
         <translation>Повторіть пароль</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>BanTableModel</name>
     <message>
@@ -262,26 +265,6 @@
         <source>Processed %n block(s) of transaction history.</source>
         <translation><numerusform>Оброблено %n блок історії транзакцій.</numerusform><numerusform>Оброблено %n блоки історії транзакцій.</numerusform><numerusform>Оброблено %n блоків історії транзакцій.</numerusform></translation>
     </message>
-    <message numerus="yes">
-        <source>%n hour(s)</source>
-        <translation><numerusform>%n година</numerusform><numerusform>%n години</numerusform><numerusform>%n годин</numerusform></translation>
-    </message>
-    <message numerus="yes">
-        <source>%n day(s)</source>
-        <translation><numerusform>%n день</numerusform><numerusform>%n дні</numerusform><numerusform>%n днів</numerusform></translation>
-    </message>
-    <message numerus="yes">
-        <source>%n week(s)</source>
-        <translation><numerusform>%n тиждень</numerusform><numerusform>%n тижня</numerusform><numerusform>%n тижнів</numerusform></translation>
-    </message>
-    <message>
-        <source>%1 and %2</source>
-        <translation>%1 та %2</translation>
-    </message>
-    <message numerus="yes">
-        <source>%n year(s)</source>
-        <translation><numerusform>%n рік</numerusform><numerusform>%n роки</numerusform><numerusform>%n років</numerusform></translation>
-    </message>
     <message>
         <source>%1 behind</source>
         <translation>%1 тому</translation>
@@ -360,7 +343,7 @@
         <source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;locked&lt;/b&gt;</source>
         <translation>&lt;b&gt;Зашифрований&lt;/b&gt; гаманець &lt;b&gt;заблоковано&lt;/b&gt;</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>CoinControlDialog</name>
     <message>
@@ -379,10 +362,6 @@
         <source>Amount:</source>
         <translation>Сума:</translation>
     </message>
-    <message>
-        <source>Priority:</source>
-        <translation>Пріорітет:</translation>
-    </message>
     <message>
         <source>Fee:</source>
         <translation>Комісія:</translation>
@@ -435,11 +414,7 @@
         <source>Confirmed</source>
         <translation>Підтверджені</translation>
     </message>
-    <message>
-        <source>Priority</source>
-        <translation>Пріоритет</translation>
-    </message>
-</context>
+    </context>
 <context>
     <name>EditAddressDialog</name>
     <message>
@@ -462,7 +437,7 @@
         <source>&amp;Address</source>
         <translation>&amp;Адреса</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>FreespaceChecker</name>
     <message>
@@ -564,6 +539,21 @@
         <translation><numerusform>(в той час, як необхідно %n ГБ)</numerusform><numerusform>(в той час, як необхідно %n ГБ)</numerusform><numerusform>(в той час, як необхідно %n ГБ)</numerusform></translation>
     </message>
 </context>
+<context>
+    <name>ModalOverlay</name>
+    <message>
+        <source>Form</source>
+        <translation>Форма</translation>
+    </message>
+    <message>
+        <source>Last block time</source>
+        <translation>Час останнього блоку</translation>
+    </message>
+    <message>
+        <source>Hide</source>
+        <translation>Приховати</translation>
+    </message>
+    </context>
 <context>
     <name>OpenURIDialog</name>
     <message>
@@ -582,7 +572,7 @@
         <source>Select payment request file</source>
         <translation>Виберіть файл запиту платежу</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>OptionsDialog</name>
     <message>
@@ -873,6 +863,9 @@
         <translation>Поточний сукупний баланс в адресах для спостереження</translation>
     </message>
 </context>
+<context>
+    <name>PaymentServer</name>
+    </context>
 <context>
     <name>PeerTableModel</name>
     <message>
@@ -883,11 +876,7 @@
         <source>Node/Service</source>
         <translation>Вузол/Сервіс</translation>
     </message>
-    <message>
-        <source>Ping Time</source>
-        <translation>Затримка</translation>
-    </message>
-</context>
+    </context>
 <context>
     <name>QObject</name>
     <message>
@@ -926,7 +915,17 @@
         <source>%1 ms</source>
         <translation>%1 мс</translation>
     </message>
-</context>
+    <message>
+        <source>%1 and %2</source>
+        <translation>%1 та %2</translation>
+    </message>
+    </context>
+<context>
+    <name>QObject::QObject</name>
+    </context>
+<context>
+    <name>QRImageWidget</name>
+    </context>
 <context>
     <name>RPCConsole</name>
     <message>
@@ -1113,14 +1112,6 @@
         <source>Clear console</source>
         <translation>Очистити консоль</translation>
     </message>
-    <message>
-        <source>&amp;Disconnect Node</source>
-        <translation>&amp;Від'єднати Вузол</translation>
-    </message>
-    <message>
-        <source>Ban Node for</source>
-        <translation>Заблокувати Вузол на</translation>
-    </message>
     <message>
         <source>1 &amp;hour</source>
         <translation>1 &amp;годину</translation>
@@ -1137,10 +1128,6 @@
         <source>1 &amp;year</source>
         <translation>1 &amp;рік</translation>
     </message>
-    <message>
-        <source>&amp;Unban Node</source>
-        <translation>&amp;Розблокувати Вузол</translation>
-    </message>
     <message>
         <source>Use up and down arrows to navigate history, and &lt;b&gt;Ctrl-L&lt;/b&gt; to clear screen.</source>
         <translation>Використовуйте стрілки вгору вниз для навігації по історії, і &lt;b&gt;Ctrl-L&lt;/b&gt; для очищення екрана.</translation>
@@ -1268,7 +1255,7 @@
         <source>Remove</source>
         <translation>Вилучити</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>ReceiveRequestDialog</name>
     <message>
@@ -1287,7 +1274,10 @@
         <source>&amp;Save Image...</source>
         <translation>&amp;Зберегти зображення...</translation>
     </message>
-</context>
+    </context>
+<context>
+    <name>RecentRequestsTableModel</name>
+    </context>
 <context>
     <name>SendCoinsDialog</name>
     <message>
@@ -1322,10 +1312,6 @@
         <source>Amount:</source>
         <translation>Сума:</translation>
     </message>
-    <message>
-        <source>Priority:</source>
-        <translation>Пріорітет:</translation>
-    </message>
     <message>
         <source>Fee:</source>
         <translation>Комісія:</translation>
@@ -1394,10 +1380,6 @@
         <source>(Smart fee not initialized yet. This usually takes a few blocks...)</source>
         <translation>(Розумну оплату ще не ініціалізовано. Це, зазвичай, триває кілька блоків...)</translation>
     </message>
-    <message>
-        <source>Confirmation time:</source>
-        <translation>Час підтвердження:</translation>
-    </message>
     <message>
         <source>normal</source>
         <translation>звичайний</translation>
@@ -1438,7 +1420,7 @@
         <source>S&amp;end</source>
         <translation>&amp;Відправити</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>SendCoinsEntry</name>
     <message>
@@ -1517,7 +1499,10 @@
         <source>Memo:</source>
         <translation>Нотатка:</translation>
     </message>
-</context>
+    </context>
+<context>
+    <name>SendConfirmationDialog</name>
+    </context>
 <context>
     <name>ShutdownWindow</name>
     <message>
@@ -1611,7 +1596,7 @@
         <source>Reset all verify message fields</source>
         <translation>Скинути всі поля перевірки повідомлення</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>SplashScreen</name>
     <message>
@@ -1626,13 +1611,22 @@
         <translation>КБ/с</translation>
     </message>
 </context>
+<context>
+    <name>TransactionDesc</name>
+    </context>
 <context>
     <name>TransactionDescDialog</name>
     <message>
         <source>This pane shows a detailed description of the transaction</source>
         <translation>Даний діалог показує детальну статистику по вибраній транзакції</translation>
     </message>
-</context>
+    </context>
+<context>
+    <name>TransactionTableModel</name>
+    </context>
+<context>
+    <name>TransactionView</name>
+    </context>
 <context>
     <name>UnitDisplayStatusBarControl</name>
     <message>
@@ -1640,6 +1634,15 @@
         <translation>Одиниця виміру монет. Натисніть для вибору іншої.</translation>
     </message>
 </context>
+<context>
+    <name>WalletFrame</name>
+    </context>
+<context>
+    <name>WalletModel</name>
+    </context>
+<context>
+    <name>WalletView</name>
+    </context>
 <context>
     <name>bitcoin-core</name>
     <message>
@@ -1702,10 +1705,6 @@
         <source>Unable to start HTTP server. See debug log for details.</source>
         <translation>Неможливо запустити HTTP-сервер. Детальніший опис наведено в журналі зневадження.</translation>
     </message>
-    <message>
-        <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
-        <translation>Приймати підключення ззовні (типово: 1 за відсутності -proxy чи -connect)</translation>
-    </message>
     <message>
         <source>Bitcoin Core</source>
         <translation>Bitcoin Core</translation>
@@ -1718,10 +1717,6 @@
         <source>Delete all wallet transactions and only recover those parts of the blockchain through -rescan on startup</source>
         <translation>Видалити всі транзакції гаманця та відновити ті, що будуть знайдені під час запуску за допомогою -rescan</translation>
     </message>
-    <message>
-        <source>Distributed under the MIT software license, see the accompanying file COPYING or &lt;http://www.opensource.org/licenses/mit-license.php&gt;.</source>
-        <translation>Поширюється за ліцензією MIT, додаткова інформація міститься у файлі COPYING та за адресою &lt;http://www.opensource.org/licenses/mit-license.php&gt;.</translation>
-    </message>
     <message>
         <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source>
         <translation>Виконати команду, коли транзакція гаманця зміниться (замість %s в команді буде підставлено ідентифікатор транзакції)</translation>
@@ -1734,26 +1729,10 @@
         <source>The block database contains a block which appears to be from the future. This may be due to your computer's date and time being set incorrectly. Only rebuild the block database if you are sure that your computer's date and time are correct</source>
         <translation>Схоже, що база даних блоків містить блок з майбутнього. Це може статися із-за некоректно встановленої дати та/або часу. Перебудовуйте базу даних блоків лише тоді, коли ви переконані, що встановлено правильну дату і час</translation>
     </message>
-    <message>
-        <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
-        <translation>Це тестова збірка пре-релізної версії - використовуйте на свій страх і ризик - не застосовувати для добування монет або торгівлі</translation>
-    </message>
     <message>
         <source>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</source>
         <translation>Використовувати UPnP для відображення порту, що прослуховується (типово: 1 при прослуховуванні та за відсутності -proxy)</translation>
     </message>
-    <message>
-        <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source>
-        <translation>Увага: Частина мережі використовує інший головний ланцюжок! Деякі добувачі, можливо, зазнають проблем.</translation>
-    </message>
-    <message>
-        <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source>
-        <translation>Увага: Наш ланцюжок блоків відрізняється від ланцюжків підключених учасників! Можливо, вам, або іншим вузлам, необхідно оновитися.</translation>
-    </message>
-    <message>
-        <source>Whitelist peers connecting from the given netmask or IP address. Can be specified multiple times.</source>
-        <translation>Додати учасників, що під'єднуються з заданої підмережі чи IP-адреси, в білий список. Можна вказувати декілька разів.</translation>
-    </message>
     <message>
         <source>-maxmempool must be at least %d MB</source>
         <translation>-maxmempool має бути не менше %d МБ</translation>
@@ -1766,10 +1745,6 @@
         <source>Block creation options:</source>
         <translation>Опції створення блоку:</translation>
     </message>
-    <message>
-        <source>Connect only to the specified node(s)</source>
-        <translation>Підключитись лише до вказаного вузла/вузлів</translation>
-    </message>
     <message>
         <source>Connection options:</source>
         <translation>Параметри з'єднання:</translation>
@@ -1958,10 +1933,6 @@
         <source>Maximum size of data in data carrier transactions we relay and mine (default: %u)</source>
         <translation>Максимальний розмір даних в транзакціях носіїв даних, що ми передаємо і добуваємо (за замовчуванням: %u)</translation>
     </message>
-    <message>
-        <source>Query for peer addresses via DNS lookup, if low on addresses (default: 1 unless -connect)</source>
-        <translation>Дізнаватися адреси учасників через DNS при замалій кількості відомих адрес (типово: 1 за відсутності -connect)</translation>
-    </message>
     <message>
         <source>Randomize credentials for every proxy connection. This enables Tor stream isolation (default: %u)</source>
         <translation>Надавати випадкові дані доступу для кожного проксі-з'єднання. Це дозволяє ввімкнути ізоляцію потоків Tor'у (типово: %u)</translation>
@@ -1974,10 +1945,6 @@
         <source>The transaction amount is too small to send after the fee has been deducted</source>
         <translation>Залишок від суми транзакції зі сплатою комісії занадто малий </translation>
     </message>
-    <message>
-        <source>This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit &lt;https://www.openssl.org/&gt; and cryptographic software written by Eric Young and UPnP software written by Thomas Bernard.</source>
-        <translation>Цей продукт включає в себе програмне забезпечення, розроблене в рамках проекту OpenSSL &lt;https://www.openssl.org/&gt;, криптографічне програмне забезпечення, написане Еріком Янгом, та функції для роботи з UPnP, написані Томасом Бернардом.</translation>
-    </message>
     <message>
         <source>Whitelisted peers cannot be DoS banned and their transactions are always relayed, even if they are already in the mempool, useful e.g. for a gateway</source>
         <translation>Учасники, що знаходяться в білому списку, не можуть бути заблоковані за DoS та їхні транзакції завжди ретранслюватимуться (навіть якщо вони є в пам'яті), що може бути корисним, наприклад, для шлюзу</translation>
@@ -2086,10 +2053,6 @@
         <source>Transaction amount too small</source>
         <translation>Сума транзакції занадто мала</translation>
     </message>
-    <message>
-        <source>Transaction amounts must be positive</source>
-        <translation>Суми монет у транзакції мають бути позитивними</translation>
-    </message>
     <message>
         <source>Transaction too large for fee policy</source>
         <translation>Транзакція занадто велика для правил комісії</translation>
@@ -2150,10 +2113,6 @@
         <source>-maxtxfee is set very high! Fees this large could be paid on a single transaction.</source>
         <translation>Встановлено дуже велике значення -maxtxfee! Такі великі комісії можуть бути сплачені окремою транзакцією.</translation>
     </message>
-    <message>
-        <source>-paytxfee is set very high! This is the transaction fee you will pay if you send a transaction.</source>
-        <translation>Встановлено дуже велике значення -paytxfee! Цю комісію буде сплачено для проведення транзакції.</translation>
-    </message>
     <message>
         <source>Do not keep transactions in the mempool longer than &lt;n&gt; hours (default: %u)</source>
         <translation>Не тримати транзакції в пам'яті довше &lt;n&gt; годин (типово: %u)</translation>
@@ -2262,10 +2221,6 @@
         <source>Set key pool size to &lt;n&gt; (default: %u)</source>
         <translation>Встановити розмір пулу ключів &lt;n&gt; (типово: %u)</translation>
     </message>
-    <message>
-        <source>Set minimum block size in bytes (default: %u)</source>
-        <translation>Встановити мінімальний розмір блоку в байтах (типово: %u)</translation>
-    </message>
     <message>
         <source>Set the number of threads to service RPC calls (default: %d)</source>
         <translation>Встановити число потоків для обслуговування викликів RPC (типово: %d)</translation>
diff --git a/src/qt/locale/bitcoin_ur_PK.ts b/src/qt/locale/bitcoin_ur_PK.ts
index 6b43bf63e5102..923198c91a334 100644
--- a/src/qt/locale/bitcoin_ur_PK.ts
+++ b/src/qt/locale/bitcoin_ur_PK.ts
@@ -41,7 +41,10 @@
         <source>&amp;Delete</source>
         <translation>مٹا</translation>
     </message>
-</context>
+    </context>
+<context>
+    <name>AddressTableModel</name>
+    </context>
 <context>
     <name>AskPassphraseDialog</name>
     <message>
@@ -56,7 +59,7 @@
         <source>Repeat new passphrase</source>
         <translation>نیا پاس فریز دہرائیں</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>BanTableModel</name>
     </context>
@@ -92,7 +95,7 @@
         <source>&amp;Address</source>
         <translation> پتہ</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>FreespaceChecker</name>
     </context>
@@ -106,6 +109,9 @@
         <translation>نقص</translation>
     </message>
     </context>
+<context>
+    <name>ModalOverlay</name>
+    </context>
 <context>
     <name>OpenURIDialog</name>
     </context>
@@ -115,6 +121,9 @@
 <context>
     <name>OverviewPage</name>
     </context>
+<context>
+    <name>PaymentServer</name>
+    </context>
 <context>
     <name>PeerTableModel</name>
     </context>
@@ -125,6 +134,12 @@
         <translation>رقم</translation>
     </message>
     </context>
+<context>
+    <name>QObject::QObject</name>
+    </context>
+<context>
+    <name>QRImageWidget</name>
+    </context>
 <context>
     <name>RPCConsole</name>
     </context>
@@ -138,6 +153,9 @@
         <translation>کاپی پتہ</translation>
     </message>
     </context>
+<context>
+    <name>RecentRequestsTableModel</name>
+    </context>
 <context>
     <name>SendCoinsDialog</name>
     <message>
@@ -156,6 +174,9 @@
 <context>
     <name>SendCoinsEntry</name>
     </context>
+<context>
+    <name>SendConfirmationDialog</name>
+    </context>
 <context>
     <name>ShutdownWindow</name>
     </context>
@@ -168,12 +189,30 @@
 <context>
     <name>TrafficGraphWidget</name>
     </context>
+<context>
+    <name>TransactionDesc</name>
+    </context>
 <context>
     <name>TransactionDescDialog</name>
     </context>
+<context>
+    <name>TransactionTableModel</name>
+    </context>
+<context>
+    <name>TransactionView</name>
+    </context>
 <context>
     <name>UnitDisplayStatusBarControl</name>
     </context>
+<context>
+    <name>WalletFrame</name>
+    </context>
+<context>
+    <name>WalletModel</name>
+    </context>
+<context>
+    <name>WalletView</name>
+    </context>
 <context>
     <name>bitcoin-core</name>
     <message>
diff --git a/src/qt/locale/bitcoin_uz@Cyrl.ts b/src/qt/locale/bitcoin_uz@Cyrl.ts
index 0062abfc1d444..fe10a8a8e7b28 100644
--- a/src/qt/locale/bitcoin_uz@Cyrl.ts
+++ b/src/qt/locale/bitcoin_uz@Cyrl.ts
@@ -41,7 +41,10 @@
         <source>&amp;Delete</source>
         <translation>&amp;Ўчириш</translation>
     </message>
-</context>
+    </context>
+<context>
+    <name>AddressTableModel</name>
+    </context>
 <context>
     <name>AskPassphraseDialog</name>
     <message>
@@ -60,7 +63,7 @@
         <source>Repeat new passphrase</source>
         <translation>Янги махфий сузни такрорланг</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>BanTableModel</name>
     </context>
@@ -246,26 +249,6 @@
         <source>No block source available...</source>
         <translation>Блок манбалари мавжуд эмас...</translation>
     </message>
-    <message numerus="yes">
-        <source>%n hour(s)</source>
-        <translation><numerusform>%n соат</numerusform></translation>
-    </message>
-    <message numerus="yes">
-        <source>%n day(s)</source>
-        <translation><numerusform>%n кун</numerusform></translation>
-    </message>
-    <message numerus="yes">
-        <source>%n week(s)</source>
-        <translation><numerusform>%n ҳафта</numerusform></translation>
-    </message>
-    <message>
-        <source>%1 and %2</source>
-        <translation>%1 ва %2</translation>
-    </message>
-    <message numerus="yes">
-        <source>%n year(s)</source>
-        <translation><numerusform>%n йил</numerusform></translation>
-    </message>
     <message>
         <source>%1 behind</source>
         <translation>%1 орқада</translation>
@@ -314,7 +297,7 @@
         <source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;locked&lt;/b&gt;</source>
         <translation>Ҳамён &lt;b&gt;кодланган&lt;/b&gt; ва вақтинча &lt;b&gt;қулфланган&lt;/b&gt;</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>CoinControlDialog</name>
     <message>
@@ -329,10 +312,6 @@
         <source>Amount:</source>
         <translation>Миқдори:</translation>
     </message>
-    <message>
-        <source>Priority:</source>
-        <translation>Муҳимлиги:</translation>
-    </message>
     <message>
         <source>Fee:</source>
         <translation>Солиқ:</translation>
@@ -377,11 +356,7 @@
         <source>Confirmed</source>
         <translation>Тасдиқланди</translation>
     </message>
-    <message>
-        <source>Priority</source>
-        <translation>Муҳимлиги</translation>
-    </message>
-</context>
+    </context>
 <context>
     <name>EditAddressDialog</name>
     <message>
@@ -404,7 +379,7 @@
         <source>&amp;Address</source>
         <translation>&amp;Манзил</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>FreespaceChecker</name>
     <message>
@@ -474,6 +449,17 @@
         <translation>Хатолик</translation>
     </message>
     </context>
+<context>
+    <name>ModalOverlay</name>
+    <message>
+        <source>Form</source>
+        <translation>Шакл</translation>
+    </message>
+    <message>
+        <source>Last block time</source>
+        <translation>Сўнгги блок вақти</translation>
+    </message>
+    </context>
 <context>
     <name>OpenURIDialog</name>
     <message>
@@ -492,7 +478,7 @@
         <source>Select payment request file</source>
         <translation>Тўлов сўрови файлини танлаш</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>OptionsDialog</name>
     <message>
@@ -683,17 +669,16 @@
         <translation>Жорий умумий баланс фақат кўринадиган манзилларда</translation>
     </message>
 </context>
+<context>
+    <name>PaymentServer</name>
+    </context>
 <context>
     <name>PeerTableModel</name>
     <message>
         <source>User Agent</source>
         <translation>Фойдаланувчи вакил</translation>
     </message>
-    <message>
-        <source>Ping Time</source>
-        <translation>Ping вақти</translation>
-    </message>
-</context>
+    </context>
 <context>
     <name>QObject</name>
     <message>
@@ -724,7 +709,17 @@
         <source>%1 ms</source>
         <translation>%1 мс</translation>
     </message>
-</context>
+    <message>
+        <source>%1 and %2</source>
+        <translation>%1 ва %2</translation>
+    </message>
+    </context>
+<context>
+    <name>QObject::QObject</name>
+    </context>
+<context>
+    <name>QRImageWidget</name>
+    </context>
 <context>
     <name>RPCConsole</name>
     <message>
@@ -962,7 +957,7 @@
         <source>Remove</source>
         <translation>Ўчириш</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>ReceiveRequestDialog</name>
     <message>
@@ -977,7 +972,10 @@
         <source>&amp;Save Image...</source>
         <translation>Расмни &amp;сақлаш</translation>
     </message>
-</context>
+    </context>
+<context>
+    <name>RecentRequestsTableModel</name>
+    </context>
 <context>
     <name>SendCoinsDialog</name>
     <message>
@@ -1008,10 +1006,6 @@
         <source>Amount:</source>
         <translation>Миқдори:</translation>
     </message>
-    <message>
-        <source>Priority:</source>
-        <translation>Муҳимлиги:</translation>
-    </message>
     <message>
         <source>Fee:</source>
         <translation>Солиқ:</translation>
@@ -1048,10 +1042,6 @@
         <source>Recommended:</source>
         <translation>Тавсия этилган</translation>
     </message>
-    <message>
-        <source>Confirmation time:</source>
-        <translation>Тасдиқ вақти</translation>
-    </message>
     <message>
         <source>normal</source>
         <translation>Нормал</translation>
@@ -1088,7 +1078,7 @@
         <source>S&amp;end</source>
         <translation>Жў&amp;натиш</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>SendCoinsEntry</name>
     <message>
@@ -1132,6 +1122,9 @@
         <translation>Тўлов олувчи:</translation>
     </message>
     </context>
+<context>
+    <name>SendConfirmationDialog</name>
+    </context>
 <context>
     <name>ShutdownWindow</name>
     </context>
@@ -1172,16 +1165,34 @@
 <context>
     <name>TrafficGraphWidget</name>
     </context>
+<context>
+    <name>TransactionDesc</name>
+    </context>
 <context>
     <name>TransactionDescDialog</name>
     <message>
         <source>This pane shows a detailed description of the transaction</source>
         <translation>Ушбу ойна операциянинг батафсил таърифини кўрсатади</translation>
     </message>
-</context>
+    </context>
+<context>
+    <name>TransactionTableModel</name>
+    </context>
+<context>
+    <name>TransactionView</name>
+    </context>
 <context>
     <name>UnitDisplayStatusBarControl</name>
     </context>
+<context>
+    <name>WalletFrame</name>
+    </context>
+<context>
+    <name>WalletModel</name>
+    </context>
+<context>
+    <name>WalletView</name>
+    </context>
 <context>
     <name>bitcoin-core</name>
     <message>
diff --git a/src/qt/locale/bitcoin_vi.ts b/src/qt/locale/bitcoin_vi.ts
index e8bf01ab1b726..e6775bf2057ce 100644
--- a/src/qt/locale/bitcoin_vi.ts
+++ b/src/qt/locale/bitcoin_vi.ts
@@ -21,7 +21,10 @@
         <source>&amp;Delete</source>
         <translation>&amp;Xóa</translation>
     </message>
-</context>
+    </context>
+<context>
+    <name>AddressTableModel</name>
+    </context>
 <context>
     <name>AskPassphraseDialog</name>
     </context>
@@ -52,7 +55,7 @@
         <source>&amp;Address</source>
         <translation>Địa chỉ</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>FreespaceChecker</name>
     </context>
@@ -62,6 +65,9 @@
 <context>
     <name>Intro</name>
     </context>
+<context>
+    <name>ModalOverlay</name>
+    </context>
 <context>
     <name>OpenURIDialog</name>
     </context>
@@ -71,6 +77,9 @@
 <context>
     <name>OverviewPage</name>
     </context>
+<context>
+    <name>PaymentServer</name>
+    </context>
 <context>
     <name>PeerTableModel</name>
     </context>
@@ -81,6 +90,12 @@
         <translation>Số lượng</translation>
     </message>
     </context>
+<context>
+    <name>QObject::QObject</name>
+    </context>
+<context>
+    <name>QRImageWidget</name>
+    </context>
 <context>
     <name>RPCConsole</name>
     </context>
@@ -94,6 +109,9 @@
         <translation>Sao chép địa chỉ</translation>
     </message>
     </context>
+<context>
+    <name>RecentRequestsTableModel</name>
+    </context>
 <context>
     <name>SendCoinsDialog</name>
     <message>
@@ -104,6 +122,9 @@
 <context>
     <name>SendCoinsEntry</name>
     </context>
+<context>
+    <name>SendConfirmationDialog</name>
+    </context>
 <context>
     <name>ShutdownWindow</name>
     </context>
@@ -116,12 +137,30 @@
 <context>
     <name>TrafficGraphWidget</name>
     </context>
+<context>
+    <name>TransactionDesc</name>
+    </context>
 <context>
     <name>TransactionDescDialog</name>
     </context>
+<context>
+    <name>TransactionTableModel</name>
+    </context>
+<context>
+    <name>TransactionView</name>
+    </context>
 <context>
     <name>UnitDisplayStatusBarControl</name>
     </context>
+<context>
+    <name>WalletFrame</name>
+    </context>
+<context>
+    <name>WalletModel</name>
+    </context>
+<context>
+    <name>WalletView</name>
+    </context>
 <context>
     <name>bitcoin-core</name>
     </context>
diff --git a/src/qt/locale/bitcoin_vi_VN.ts b/src/qt/locale/bitcoin_vi_VN.ts
index a4e1588c9320c..c27111a52a21b 100644
--- a/src/qt/locale/bitcoin_vi_VN.ts
+++ b/src/qt/locale/bitcoin_vi_VN.ts
@@ -41,7 +41,10 @@
         <source>&amp;Delete</source>
         <translation>&amp;Xó&amp;a</translation>
     </message>
-</context>
+    </context>
+<context>
+    <name>AddressTableModel</name>
+    </context>
 <context>
     <name>AskPassphraseDialog</name>
     <message>
@@ -60,12 +63,28 @@
         <source>Repeat new passphrase</source>
         <translation>Điền lại passphrase</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>BanTableModel</name>
-    </context>
+    <message>
+        <source>IP/Netmask</source>
+        <translation>IP/Netmask</translation>
+    </message>
+    <message>
+        <source>Banned Until</source>
+        <translation>Bị cấm đến</translation>
+    </message>
+</context>
 <context>
     <name>BitcoinGUI</name>
+    <message>
+        <source>Sign &amp;message...</source>
+        <translation>Chứ ký &amp; Tin nhắn...</translation>
+    </message>
+    <message>
+        <source>Synchronizing with network...</source>
+        <translation>Đồng bộ hóa với mạng</translation>
+    </message>
     <message>
         <source>&amp;Overview</source>
         <translation>&amp;Tổng quan</translation>
@@ -74,6 +93,18 @@
         <source>Node</source>
         <translation>Node</translation>
     </message>
+    <message>
+        <source>Show general overview of wallet</source>
+        <translation>Hiện thỉ thông tin sơ lược chung về Ví</translation>
+    </message>
+    <message>
+        <source>&amp;Transactions</source>
+        <translation>&amp;Giao dịch</translation>
+    </message>
+    <message>
+        <source>Browse transaction history</source>
+        <translation>Duyệt tìm lịch sử giao dịch</translation>
+    </message>
     <message>
         <source>E&amp;xit</source>
         <translation>T&amp;hoát</translation>
@@ -82,6 +113,14 @@
         <source>Quit application</source>
         <translation>Thoát chương trình</translation>
     </message>
+    <message>
+        <source>&amp;About %1</source>
+        <translation>&amp;Thông tin về %1</translation>
+    </message>
+    <message>
+        <source>Show information about %1</source>
+        <translation>Hiện thông tin về %1</translation>
+    </message>
     <message>
         <source>About &amp;Qt</source>
         <translation>Về &amp;Qt</translation>
@@ -90,6 +129,30 @@
         <source>Show information about Qt</source>
         <translation>Xem thông tin về Qt</translation>
     </message>
+    <message>
+        <source>&amp;Options...</source>
+        <translation>&amp;Tùy chọn...</translation>
+    </message>
+    <message>
+        <source>Modify configuration options for %1</source>
+        <translation>Chỉnh sửa thiết đặt tùy chọn cho %1</translation>
+    </message>
+    <message>
+        <source>&amp;Encrypt Wallet...</source>
+        <translation>&amp;Mã hóa ví tiền</translation>
+    </message>
+    <message>
+        <source>&amp;Backup Wallet...</source>
+        <translation>&amp;Sao lưu ví tiền...</translation>
+    </message>
+    <message>
+        <source>&amp;Change Passphrase...</source>
+        <translation>&amp;Thay đổi mật khẩu...</translation>
+    </message>
+    <message>
+        <source>&amp;Sending addresses...</source>
+        <translation>&amp;Địa chỉ gửi</translation>
+    </message>
     <message>
         <source>&amp;Receiving addresses...</source>
         <translation>Địa chỉ nhận</translation>
@@ -98,6 +161,30 @@
         <source>Open &amp;URI...</source>
         <translation>Mở &amp;URI...</translation>
     </message>
+    <message>
+        <source>Reindexing blocks on disk...</source>
+        <translation>Đánh chỉ số (indexing) lại các khối (blocks) trên ổ đĩa ...</translation>
+    </message>
+    <message>
+        <source>Send coins to a Bitcoin address</source>
+        <translation>Gửi coins đến tài khoản Bitcoin</translation>
+    </message>
+    <message>
+        <source>Backup wallet to another location</source>
+        <translation>Sao lưu ví tiền ở vị trí khác</translation>
+    </message>
+    <message>
+        <source>Change the passphrase used for wallet encryption</source>
+        <translation>Thay đổi cụm mật mã dùng cho mã hoá Ví</translation>
+    </message>
+    <message>
+        <source>&amp;Debug window</source>
+        <translation>&amp;Cửa sổ xử lý lỗi (debug)</translation>
+    </message>
+    <message>
+        <source>&amp;Verify message...</source>
+        <translation>&amp;Tin nhắn xác thực</translation>
+    </message>
     <message>
         <source>Bitcoin</source>
         <translation>Bitcoin</translation>
@@ -122,6 +209,18 @@
         <source>Show or hide the main Window</source>
         <translation>Hiện hoặc ẩn cửa sổ chính</translation>
     </message>
+    <message>
+        <source>Encrypt the private keys that belong to your wallet</source>
+        <translation>Mã hoá các khoá bí mật trong Ví của bạn.</translation>
+    </message>
+    <message>
+        <source>Sign messages with your Bitcoin addresses to prove you own them</source>
+        <translation>Dùng địa chỉ Bitcoin của bạn ký các tin nhắn để xác minh những nội dung tin nhắn đó là của bạn.</translation>
+    </message>
+    <message>
+        <source>Verify messages to ensure they were signed with specified Bitcoin addresses</source>
+        <translation>Kiểm tra các tin nhắn để chắc chắn rằng chúng được ký bằng các địa chỉ Bitcoin xác định.</translation>
+    </message>
     <message>
         <source>&amp;File</source>
         <translation>&amp;File</translation>
@@ -134,25 +233,41 @@
         <source>&amp;Help</source>
         <translation>Trợ &amp;giúp</translation>
     </message>
-    <message numerus="yes">
-        <source>%n hour(s)</source>
-        <translation><numerusform>%n giờ</numerusform></translation>
+    <message>
+        <source>Tabs toolbar</source>
+        <translation>Thanh công cụ (toolbar)</translation>
     </message>
-    <message numerus="yes">
-        <source>%n day(s)</source>
-        <translation><numerusform>%n ngày</numerusform></translation>
+    <message>
+        <source>Request payments (generates QR codes and bitcoin: URIs)</source>
+        <translation>Yêu cầu thanh toán(tạo mã QR và địa chỉ Bitcoin: URLs)</translation>
     </message>
-    <message numerus="yes">
-        <source>%n week(s)</source>
-        <translation><numerusform>%n tuần</numerusform></translation>
+    <message>
+        <source>Show the list of used sending addresses and labels</source>
+        <translation>Hiện thỉ danh sách các địa chỉ và nhãn đã dùng để gửi.</translation>
     </message>
     <message>
-        <source>%1 and %2</source>
-        <translation>%1 và %2</translation>
+        <source>Show the list of used receiving addresses and labels</source>
+        <translation>Hiện thỉ danh sách các địa chỉ và nhãn đã dùng để nhận.</translation>
+    </message>
+    <message>
+        <source>Open a bitcoin: URI or payment request</source>
+        <translation>Mở bitcoin:URL hoặc yêu cầu thanh toán</translation>
+    </message>
+    <message>
+        <source>&amp;Command-line options</source>
+        <translation>7Tùy chọn dòng lệnh</translation>
     </message>
-    <message numerus="yes">
-        <source>%n year(s)</source>
-        <translation><numerusform>%n năm</numerusform></translation>
+    <message>
+        <source>%1 behind</source>
+        <translation>%1 chậm trễ</translation>
+    </message>
+    <message>
+        <source>Last received block was generated %1 ago.</source>
+        <translation>Khối (block) cuối cùng nhận được cách đây %1</translation>
+    </message>
+    <message>
+        <source>Transactions after this will not yet be visible.</source>
+        <translation>Những giao dịch sau đó sẽ không hiện thị.</translation>
     </message>
     <message>
         <source>Error</source>
@@ -170,6 +285,40 @@
         <source>Up to date</source>
         <translation>Đã cập nhật</translation>
     </message>
+    <message>
+        <source>Catching up...</source>
+        <translation>Bắt kịp...</translation>
+    </message>
+    <message>
+        <source>Date: %1
+</source>
+        <translation>Ngày: %1
+</translation>
+    </message>
+    <message>
+        <source>Amount: %1
+</source>
+        <translation>Số lượng: %1
+</translation>
+    </message>
+    <message>
+        <source>Type: %1
+</source>
+        <translation>Loại: %1
+</translation>
+    </message>
+    <message>
+        <source>Label: %1
+</source>
+        <translation>Nhãn hiệu: %1
+</translation>
+    </message>
+    <message>
+        <source>Address: %1
+</source>
+        <translation>Địa chỉ: %1
+</translation>
+    </message>
     <message>
         <source>Sent transaction</source>
         <translation>Giao dịch đã gửi</translation>
@@ -178,6 +327,14 @@
         <source>Incoming transaction</source>
         <translation>Giao dịch đang tới</translation>
     </message>
+    <message>
+        <source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;unlocked&lt;/b&gt;</source>
+        <translation>Ví tiền &lt;b&gt; đã được mã hóa&lt;/b&gt;và hiện &lt;b&gt;đang mở&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;locked&lt;/b&gt;</source>
+        <translation>Ví tiền &lt;b&gt; đã được mã hóa&lt;/b&gt;và hiện &lt;b&gt;đang khóa&lt;/b&gt;</translation>
+    </message>
     </context>
 <context>
     <name>CoinControlDialog</name>
@@ -193,18 +350,30 @@
         <source>Amount:</source>
         <translation>Lượng:</translation>
     </message>
-    <message>
-        <source>Priority:</source>
-        <translation>Tầm quan trọng:</translation>
-    </message>
     <message>
         <source>Fee:</source>
         <translation>Phí:</translation>
     </message>
+    <message>
+        <source>After Fee:</source>
+        <translation>Sau thuế, phí:</translation>
+    </message>
     <message>
         <source>Change:</source>
         <translation>Thay đổi:</translation>
     </message>
+    <message>
+        <source>(un)select all</source>
+        <translation>(bỏ)chọn tất cả</translation>
+    </message>
+    <message>
+        <source>Tree mode</source>
+        <translation>Chế độ cây</translation>
+    </message>
+    <message>
+        <source>List mode</source>
+        <translation>Chế độ danh sách</translation>
+    </message>
     <message>
         <source>Amount</source>
         <translation>Lượng</translation>
@@ -221,13 +390,13 @@
         <source>Confirmed</source>
         <translation>Đã xác nhận</translation>
     </message>
-    <message>
-        <source>Priority</source>
-        <translation>Tầm quan trọng</translation>
-    </message>
-</context>
+    </context>
 <context>
     <name>EditAddressDialog</name>
+    <message>
+        <source>Edit Address</source>
+        <translation>Thay đổi địa chỉ</translation>
+    </message>
     <message>
         <source>&amp;Label</source>
         <translation>Nhãn</translation>
@@ -236,7 +405,7 @@
         <source>&amp;Address</source>
         <translation>Địa chỉ</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>FreespaceChecker</name>
     <message>
@@ -250,6 +419,30 @@
         <source>version</source>
         <translation>version</translation>
     </message>
+    <message>
+        <source>(%1-bit)</source>
+        <translation>(%1-bit)</translation>
+    </message>
+    <message>
+        <source>Command-line options</source>
+        <translation>&amp;Tùy chọn dòng lệnh</translation>
+    </message>
+    <message>
+        <source>Usage:</source>
+        <translation>Mức sử dụng</translation>
+    </message>
+    <message>
+        <source>command-line options</source>
+        <translation>tùy chọn dòng lệnh</translation>
+    </message>
+    <message>
+        <source>Set language, for example "de_DE" (default: system locale)</source>
+        <translation>Chọn ngôn ngữ, ví dụ "de_DE" (mặc định: Vị trí hệ thống)</translation>
+    </message>
+    <message>
+        <source>Set SSL root certificates for payment request (default: -system-)</source>
+        <translation>Đặt chứng nhận SSL gốc cho yêu cầu giao dịch (mặc định: -hệ thống-)</translation>
+    </message>
     </context>
 <context>
     <name>Intro</name>
@@ -257,11 +450,26 @@
         <source>Welcome</source>
         <translation>Chào mừng</translation>
     </message>
+    <message>
+        <source>Use the default data directory</source>
+        <translation>Sử dụng vị trí dữ liệu mặc định</translation>
+    </message>
     <message>
         <source>Error</source>
         <translation>Lỗi</translation>
     </message>
     </context>
+<context>
+    <name>ModalOverlay</name>
+    <message>
+        <source>Form</source>
+        <translation>Form</translation>
+    </message>
+    <message>
+        <source>Hide</source>
+        <translation>Ẩn</translation>
+    </message>
+    </context>
 <context>
     <name>OpenURIDialog</name>
     <message>
@@ -287,14 +495,58 @@
         <source>MB</source>
         <translation>MB</translation>
     </message>
+    <message>
+        <source>Accept connections from outside</source>
+        <translation>Chấp nhận các kết nối từ bên ngoài</translation>
+    </message>
+    <message>
+        <source>Allow incoming connections</source>
+        <translation>Cho phép nhận kết nối</translation>
+    </message>
+    <message>
+        <source>IP address of the proxy (e.g. IPv4: 127.0.0.1 / IPv6: ::1)</source>
+        <translation>Địa chỉ IP của proxy (ví dụ IPv4: 127.0.0.1 / IPv6: ::1)</translation>
+    </message>
+    <message>
+        <source>Third party transaction URLs</source>
+        <translation>Phần mềm giao dịch bên thứ ba URLs</translation>
+    </message>
     <message>
         <source>W&amp;allet</source>
         <translation>Ví</translation>
     </message>
+    <message>
+        <source>Connect to the Bitcoin network through a SOCKS5 proxy.</source>
+        <translation>Kết nối đến máy chủ Bitcoin thông qua SOCKS5 proxy.</translation>
+    </message>
+    <message>
+        <source>Proxy &amp;IP:</source>
+        <translation>Proxy &amp;IP:</translation>
+    </message>
+    <message>
+        <source>&amp;Port:</source>
+        <translation>&amp;Cổng:</translation>
+    </message>
+    <message>
+        <source>Port of the proxy (e.g. 9050)</source>
+        <translation>Cổng proxy (e.g. 9050) </translation>
+    </message>
+    <message>
+        <source>IPv4</source>
+        <translation>IPv4</translation>
+    </message>
+    <message>
+        <source>IPv6</source>
+        <translation>IPv6</translation>
+    </message>
     <message>
         <source>&amp;Display</source>
         <translation>&amp;Hiển thị</translation>
     </message>
+    <message>
+        <source>User Interface &amp;language:</source>
+        <translation>Giao diện người dùng &amp; ngôn ngữ</translation>
+    </message>
     <message>
         <source>&amp;OK</source>
         <translation>&amp;OK</translation>
@@ -307,6 +559,10 @@
         <source>default</source>
         <translation>mặc định</translation>
     </message>
+    <message>
+        <source>none</source>
+        <translation>Trống</translation>
+    </message>
     </context>
 <context>
     <name>OverviewPage</name>
@@ -314,11 +570,22 @@
         <source>Form</source>
         <translation>Form</translation>
     </message>
+    <message>
+        <source>Available:</source>
+        <translation>Khả dụng</translation>
+    </message>
+    <message>
+        <source>Pending:</source>
+        <translation>Đang chờ</translation>
+    </message>
     <message>
         <source>Total:</source>
         <translation>Tổng:</translation>
     </message>
     </context>
+<context>
+    <name>PaymentServer</name>
+    </context>
 <context>
     <name>PeerTableModel</name>
     <message>
@@ -332,6 +599,20 @@
         <source>Amount</source>
         <translation>Lượng</translation>
     </message>
+    <message>
+        <source>%1 and %2</source>
+        <translation>%1 và %2</translation>
+    </message>
+    </context>
+<context>
+    <name>QObject::QObject</name>
+    </context>
+<context>
+    <name>QRImageWidget</name>
+    <message>
+        <source>&amp;Save Image...</source>
+        <translation>$Lưu hình ảnh...</translation>
+    </message>
     </context>
 <context>
     <name>RPCConsole</name>
@@ -359,6 +640,58 @@
         <source>User Agent</source>
         <translation>User Agent</translation>
     </message>
+    <message>
+        <source>1 &amp;hour</source>
+        <translation>1&amp;giờ</translation>
+    </message>
+    <message>
+        <source>1 &amp;day</source>
+        <translation>1&amp;ngày</translation>
+    </message>
+    <message>
+        <source>1 &amp;week</source>
+        <translation>1&amp;tuần</translation>
+    </message>
+    <message>
+        <source>1 &amp;year</source>
+        <translation>1&amp;năm</translation>
+    </message>
+    <message>
+        <source>Use up and down arrows to navigate history, and &lt;b&gt;Ctrl-L&lt;/b&gt; to clear screen.</source>
+        <translation>Sử dụng phím lên và xuống để di chuyển lịch sử, và &lt;b&gt;Ctrl-L&lt;/b&gt; để xóa màn hình</translation>
+    </message>
+    <message>
+        <source>Type &lt;b&gt;help&lt;/b&gt; for an overview of available commands.</source>
+        <translation>Gõ &lt;b&gt;help&lt;/b&gt; để xem nhưng câu lệnh có sẵn</translation>
+    </message>
+    <message>
+        <source>%1 B</source>
+        <translation>%1 B</translation>
+    </message>
+    <message>
+        <source>%1 KB</source>
+        <translation>%1 KB</translation>
+    </message>
+    <message>
+        <source>%1 MB</source>
+        <translation>%1 MB</translation>
+    </message>
+    <message>
+        <source>%1 GB</source>
+        <translation>%1 GB</translation>
+    </message>
+    <message>
+        <source>never</source>
+        <translation>không bao giờ</translation>
+    </message>
+    <message>
+        <source>Yes</source>
+        <translation>Đồng ý</translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation>Không</translation>
+    </message>
     </context>
 <context>
     <name>ReceiveCoinsDialog</name>
@@ -366,16 +699,123 @@
         <source>&amp;Amount:</source>
         <translation>Lượng:</translation>
     </message>
+    <message>
+        <source>&amp;Label:</source>
+        <translation>&amp;Nhãn</translation>
+    </message>
+    <message>
+        <source>&amp;Message:</source>
+        <translation>&amp;Tin nhắn:</translation>
+    </message>
+    <message>
+        <source>Use this form to request payments. All fields are &lt;b&gt;optional&lt;/b&gt;.</source>
+        <translation>Sử dụng form này để yêu cầu thanh toán. Tất cả các trường &lt;b&gt;không bắt buộc&lt;b&gt;</translation>
+    </message>
+    <message>
+        <source>Clear all fields of the form.</source>
+        <translation>Xóa tất cả các trường trong biểu mẫu</translation>
+    </message>
+    <message>
+        <source>Clear</source>
+        <translation>Xóa</translation>
+    </message>
+    <message>
+        <source>Requested payments history</source>
+        <translation>Lịch sử yêu cầu thanh toán</translation>
+    </message>
+    <message>
+        <source>&amp;Request payment</source>
+        <translation>&amp;Yêu cầu thanh toán</translation>
+    </message>
+    <message>
+        <source>Show</source>
+        <translation>Hiển thị</translation>
+    </message>
+    <message>
+        <source>Remove the selected entries from the list</source>
+        <translation>Xóa khỏi danh sách</translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation>Xóa</translation>
+    </message>
+    <message>
+        <source>Copy message</source>
+        <translation>Copy tin nhắn</translation>
+    </message>
     </context>
 <context>
     <name>ReceiveRequestDialog</name>
+    <message>
+        <source>QR Code</source>
+        <translation>QR Code</translation>
+    </message>
+    <message>
+        <source>Copy &amp;URI</source>
+        <translation>Copy &amp;URI</translation>
+    </message>
     <message>
         <source>Copy &amp;Address</source>
         <translation>&amp;Copy Địa Chỉ</translation>
     </message>
+    <message>
+        <source>&amp;Save Image...</source>
+        <translation>$Lưu hình ảnh...</translation>
+    </message>
+    <message>
+        <source>Request payment to %1</source>
+        <translation>Yêu cầu thanh toán cho %1</translation>
+    </message>
+    <message>
+        <source>Payment information</source>
+        <translation>Thông tin thanh toán</translation>
+    </message>
+    <message>
+        <source>URI</source>
+        <translation>URI</translation>
+    </message>
+    <message>
+        <source>Amount</source>
+        <translation>Lượng</translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation>Tin nhắn</translation>
+    </message>
+    <message>
+        <source>Error encoding URI into QR Code.</source>
+        <translation>Lỗi khi encode từ URI thành QR Code</translation>
+    </message>
+</context>
+<context>
+    <name>RecentRequestsTableModel</name>
+    <message>
+        <source>Message</source>
+        <translation>Tin nhắn</translation>
+    </message>
+    <message>
+        <source>(no message)</source>
+        <translation>(không tin nhắn)</translation>
+    </message>
     </context>
 <context>
     <name>SendCoinsDialog</name>
+    <message>
+        <source>Send Coins</source>
+        <translation>Gửi Coins</translation>
+    </message>
+    <message>
+        <source>Coin Control Features</source>
+        <translation>Tính năng Control Coin</translation>
+    </message>
+    <message>
+        <source>Inputs...</source>
+        <translation>Nhập...</translation>
+    </message>
+    <message>
+        <source>automatically selected</source>
+        <translation>Tự động chọn</translation>
+    </message>
     <message>
         <source>Insufficient funds!</source>
         <translation>Không đủ tiền</translation>
@@ -392,18 +832,94 @@
         <source>Amount:</source>
         <translation>Lượng:</translation>
     </message>
-    <message>
-        <source>Priority:</source>
-        <translation>Tầm quan trọng:</translation>
-    </message>
     <message>
         <source>Fee:</source>
         <translation>Phí:</translation>
     </message>
+    <message>
+        <source>After Fee:</source>
+        <translation>Sau thuế, phí:</translation>
+    </message>
     <message>
         <source>Change:</source>
         <translation>Thay đổi:</translation>
     </message>
+    <message>
+        <source>Transaction Fee:</source>
+        <translation>Phí giao dịch</translation>
+    </message>
+    <message>
+        <source>Choose...</source>
+        <translation>Chọn...</translation>
+    </message>
+    <message>
+        <source>collapse fee-settings</source>
+        <translation>Thu gọn fee-settings</translation>
+    </message>
+    <message>
+        <source>per kilobyte</source>
+        <translation>trên KB</translation>
+    </message>
+    <message>
+        <source>Hide</source>
+        <translation>Ẩn</translation>
+    </message>
+    <message>
+        <source>total at least</source>
+        <translation>Tổng cộng ít nhất</translation>
+    </message>
+    <message>
+        <source>(read the tooltip)</source>
+        <translation>(Đọc hướng dẫn)</translation>
+    </message>
+    <message>
+        <source>normal</source>
+        <translation>Bình thường</translation>
+    </message>
+    <message>
+        <source>fast</source>
+        <translation>Nhanh</translation>
+    </message>
+    <message>
+        <source>Send to multiple recipients at once</source>
+        <translation>Gửi đến nhiều người nhận trong một lần</translation>
+    </message>
+    <message>
+        <source>Add &amp;Recipient</source>
+        <translation>Thêm &amp;Người nhận</translation>
+    </message>
+    <message>
+        <source>Clear all fields of the form.</source>
+        <translation>Xóa tất cả các trường trong biểu mẫu</translation>
+    </message>
+    <message>
+        <source>Clear &amp;All</source>
+        <translation>Xóa &amp;Tất cả</translation>
+    </message>
+    <message>
+        <source>Balance:</source>
+        <translation>Tài khoản</translation>
+    </message>
+    <message>
+        <source>Confirm the send action</source>
+        <translation>Xác nhận sự gửi</translation>
+    </message>
+    <message>
+        <source>%1 to %2</source>
+        <translation>%1 đến %2</translation>
+    </message>
+    <message>
+        <source>Total Amount %1</source>
+        <translation>Tổng cộng %1</translation>
+    </message>
+    <message>
+        <source>or</source>
+        <translation>hoặc</translation>
+    </message>
+    <message>
+        <source>Confirm send coins</source>
+        <translation>Xác nhận gửi coins</translation>
+    </message>
     </context>
 <context>
     <name>SendCoinsEntry</name>
@@ -411,12 +927,27 @@
         <source>A&amp;mount:</source>
         <translation>Lượng:</translation>
     </message>
+    <message>
+        <source>&amp;Label:</source>
+        <translation>&amp;Nhãn</translation>
+    </message>
     </context>
+<context>
+    <name>SendConfirmationDialog</name>
+    <message>
+        <source>Yes</source>
+        <translation>Đồng ý</translation>
+    </message>
+</context>
 <context>
     <name>ShutdownWindow</name>
     </context>
 <context>
     <name>SignVerifyMessageDialog</name>
+    <message>
+        <source>Clear &amp;All</source>
+        <translation>Xóa &amp;Tất cả</translation>
+    </message>
     </context>
 <context>
     <name>SplashScreen</name>
@@ -424,12 +955,42 @@
 <context>
     <name>TrafficGraphWidget</name>
     </context>
+<context>
+    <name>TransactionDesc</name>
+    <message>
+        <source>Message</source>
+        <translation>Tin nhắn</translation>
+    </message>
+    <message>
+        <source>Amount</source>
+        <translation>Lượng</translation>
+    </message>
+    </context>
 <context>
     <name>TransactionDescDialog</name>
     </context>
+<context>
+    <name>TransactionTableModel</name>
+    </context>
+<context>
+    <name>TransactionView</name>
+    </context>
 <context>
     <name>UnitDisplayStatusBarControl</name>
     </context>
+<context>
+    <name>WalletFrame</name>
+    </context>
+<context>
+    <name>WalletModel</name>
+    <message>
+        <source>Send Coins</source>
+        <translation>Gửi Coins</translation>
+    </message>
+</context>
+<context>
+    <name>WalletView</name>
+    </context>
 <context>
     <name>bitcoin-core</name>
     <message>
diff --git a/src/qt/locale/bitcoin_zh.ts b/src/qt/locale/bitcoin_zh.ts
index bceba9dfdd86d..99d723deff993 100644
--- a/src/qt/locale/bitcoin_zh.ts
+++ b/src/qt/locale/bitcoin_zh.ts
@@ -2,6 +2,9 @@
 <context>
     <name>AddressBookPage</name>
     </context>
+<context>
+    <name>AddressTableModel</name>
+    </context>
 <context>
     <name>AskPassphraseDialog</name>
     </context>
@@ -42,6 +45,9 @@
         <translation>错误</translation>
     </message>
     </context>
+<context>
+    <name>ModalOverlay</name>
+    </context>
 <context>
     <name>OpenURIDialog</name>
     </context>
@@ -51,12 +57,21 @@
 <context>
     <name>OverviewPage</name>
     </context>
+<context>
+    <name>PaymentServer</name>
+    </context>
 <context>
     <name>PeerTableModel</name>
     </context>
 <context>
     <name>QObject</name>
     </context>
+<context>
+    <name>QObject::QObject</name>
+    </context>
+<context>
+    <name>QRImageWidget</name>
+    </context>
 <context>
     <name>RPCConsole</name>
     </context>
@@ -66,6 +81,13 @@
 <context>
     <name>ReceiveRequestDialog</name>
     </context>
+<context>
+    <name>RecentRequestsTableModel</name>
+    <message>
+        <source>Date</source>
+        <translation>日期</translation>
+    </message>
+    </context>
 <context>
     <name>SendCoinsDialog</name>
     <message>
@@ -76,10 +98,25 @@
         <source>Choose...</source>
         <translation>选择...</translation>
     </message>
+    <message>
+        <source>The recipient address is not valid. Please recheck.</source>
+        <translation>收款人地址无效，请再次确认。</translation>
+    </message>
+    <message>
+        <source>Pay only the required fee of %1</source>
+        <translation>仅支付全额的%1</translation>
+    </message>
+    <message>
+        <source>Warning: Invalid Bitcoin address</source>
+        <translation>警告：比特币地址无效</translation>
+    </message>
     </context>
 <context>
     <name>SendCoinsEntry</name>
     </context>
+<context>
+    <name>SendConfirmationDialog</name>
+    </context>
 <context>
     <name>ShutdownWindow</name>
     </context>
@@ -92,18 +129,44 @@
 <context>
     <name>TrafficGraphWidget</name>
     </context>
+<context>
+    <name>TransactionDesc</name>
+    <message>
+        <source>Date</source>
+        <translation>日期</translation>
+    </message>
+    </context>
 <context>
     <name>TransactionDescDialog</name>
     </context>
 <context>
-    <name>UnitDisplayStatusBarControl</name>
+    <name>TransactionTableModel</name>
+    <message>
+        <source>Date</source>
+        <translation>日期</translation>
+    </message>
     </context>
 <context>
-    <name>bitcoin-core</name>
+    <name>TransactionView</name>
     <message>
-        <source>Transaction amounts must be positive</source>
-        <translation>转账额度须为正数</translation>
+        <source>Date</source>
+        <translation>日期</translation>
     </message>
+    </context>
+<context>
+    <name>UnitDisplayStatusBarControl</name>
+    </context>
+<context>
+    <name>WalletFrame</name>
+    </context>
+<context>
+    <name>WalletModel</name>
+    </context>
+<context>
+    <name>WalletView</name>
+    </context>
+<context>
+    <name>bitcoin-core</name>
     <message>
         <source>Transaction too large for fee policy</source>
         <translation>根据费率标准，本次转账超额</translation>
diff --git a/src/qt/locale/bitcoin_zh_CN.ts b/src/qt/locale/bitcoin_zh_CN.ts
index 92a7006d30fdf..41ec0574d5094 100644
--- a/src/qt/locale/bitcoin_zh_CN.ts
+++ b/src/qt/locale/bitcoin_zh_CN.ts
@@ -41,6 +41,77 @@
         <source>&amp;Delete</source>
         <translation>删除(&amp;D)</translation>
     </message>
+    <message>
+        <source>Choose the address to send coins to</source>
+        <translation>选择要付钱过去的地址</translation>
+    </message>
+    <message>
+        <source>Choose the address to receive coins with</source>
+        <translation>选择要收钱进来的地址</translation>
+    </message>
+    <message>
+        <source>C&amp;hoose</source>
+        <translation>选择</translation>
+    </message>
+    <message>
+        <source>Sending addresses</source>
+        <translation>付款地址</translation>
+    </message>
+    <message>
+        <source>Receiving addresses</source>
+        <translation>收款地址</translation>
+    </message>
+    <message>
+        <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source>
+        <translation>这些是你要付款过去的比特币地址。在付钱之前，务必要检查金额和收款地址是否正确。</translation>
+    </message>
+    <message>
+        <source>These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source>
+        <translation>这些是你用来收款的比特币地址。建议在每次交易时，都使用一个新的收款地址。</translation>
+    </message>
+    <message>
+        <source>&amp;Copy Address</source>
+        <translation>复制地址</translation>
+    </message>
+    <message>
+        <source>Copy &amp;Label</source>
+        <translation>复制标签</translation>
+    </message>
+    <message>
+        <source>&amp;Edit</source>
+        <translation>编辑</translation>
+    </message>
+    <message>
+        <source>Export Address List</source>
+        <translation>导出地址列表</translation>
+    </message>
+    <message>
+        <source>Comma separated file (*.csv)</source>
+        <translation>逗号分隔文件 (*.csv)</translation>
+    </message>
+    <message>
+        <source>Exporting Failed</source>
+        <translation>导出失败</translation>
+    </message>
+    <message>
+        <source>There was an error trying to save the address list to %1. Please try again.</source>
+        <translation>存储地址列表到 %1 时发生错误。请再试一次。</translation>
+    </message>
+</context>
+<context>
+    <name>AddressTableModel</name>
+    <message>
+        <source>Label</source>
+        <translation>标签</translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation>地址</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(无标签)</translation>
+    </message>
 </context>
 <context>
     <name>AskPassphraseDialog</name>
@@ -60,6 +131,94 @@
         <source>Repeat new passphrase</source>
         <translation>重复新密码</translation>
     </message>
+    <message>
+        <source>Enter the new passphrase to the wallet.&lt;br/&gt;Please use a passphrase of &lt;b&gt;ten or more random characters&lt;/b&gt;, or &lt;b&gt;eight or more words&lt;/b&gt;.</source>
+        <translation>输入钱包的新密码。&lt;br/&gt;密码请用&lt;b&gt;10 个以上的随机字符&lt;/b&gt;，或是&lt;b&gt;8 个以上的字词&lt;/b&gt;。</translation>
+    </message>
+    <message>
+        <source>Encrypt wallet</source>
+        <translation>加密钱包</translation>
+    </message>
+    <message>
+        <source>This operation needs your wallet passphrase to unlock the wallet.</source>
+        <translation>这个操作需要你的钱包密码来解锁钱包。</translation>
+    </message>
+    <message>
+        <source>Unlock wallet</source>
+        <translation>解锁钱包</translation>
+    </message>
+    <message>
+        <source>This operation needs your wallet passphrase to decrypt the wallet.</source>
+        <translation>这个操作需要你的钱包密码来把钱包解密。</translation>
+    </message>
+    <message>
+        <source>Decrypt wallet</source>
+        <translation>解密钱包</translation>
+    </message>
+    <message>
+        <source>Change passphrase</source>
+        <translation>修改密码</translation>
+    </message>
+    <message>
+        <source>Enter the old passphrase and new passphrase to the wallet.</source>
+        <translation>请输入钱包的旧密码和新密码。</translation>
+    </message>
+    <message>
+        <source>Confirm wallet encryption</source>
+        <translation>确认钱包加密</translation>
+    </message>
+    <message>
+        <source>Warning: If you encrypt your wallet and lose your passphrase, you will &lt;b&gt;LOSE ALL OF YOUR BITCOINS&lt;/b&gt;!</source>
+        <translation>警告: 如果把钱包加密后又忘记密码，你就会从此&lt;b&gt;失去其中所有的比特币了&lt;/b&gt;！</translation>
+    </message>
+    <message>
+        <source>Are you sure you wish to encrypt your wallet?</source>
+        <translation>你确定要把钱包加密吗？</translation>
+    </message>
+    <message>
+        <source>Wallet encrypted</source>
+        <translation>钱包已加密</translation>
+    </message>
+    <message>
+        <source>%1 will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source>
+        <translation>%1 现在要关闭，以完成加密过程。请注意，加密钱包不能完全防止入侵你的电脑的恶意程序偷取钱币。</translation>
+    </message>
+    <message>
+        <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source>
+        <translation>重要: 请改用新产生的有加密的钱包文件，来取代旧钱包文件的备份。为了安全性，当你开始使用新的有加密的钱包后，旧钱包文件的备份就不能再使用了。</translation>
+    </message>
+    <message>
+        <source>Wallet encryption failed</source>
+        <translation>钱包加密失败</translation>
+    </message>
+    <message>
+        <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
+        <translation>因为内部错误导致钱包加密失败。你的钱包还是没加密。</translation>
+    </message>
+    <message>
+        <source>The supplied passphrases do not match.</source>
+        <translation>提供的密码不yi'zhi。</translation>
+    </message>
+    <message>
+        <source>Wallet unlock failed</source>
+        <translation>钱包解锁失败</translation>
+    </message>
+    <message>
+        <source>The passphrase entered for the wallet decryption was incorrect.</source>
+        <translation>输入用来解密钱包的密码不正确。</translation>
+    </message>
+    <message>
+        <source>Wallet decryption failed</source>
+        <translation>钱包解密失败</translation>
+    </message>
+    <message>
+        <source>Wallet passphrase was successfully changed.</source>
+        <translation>钱包密码修改成功。</translation>
+    </message>
+    <message>
+        <source>Warning: The Caps Lock key is on!</source>
+        <translation>警告: 大写字母锁定已开启！</translation>
+    </message>
 </context>
 <context>
     <name>BanTableModel</name>
@@ -112,7 +271,11 @@
     </message>
     <message>
         <source>&amp;About %1</source>
-        <translation>&amp;关于 %1</translation>
+        <translation>关于 %1</translation>
+    </message>
+    <message>
+        <source>Show information about %1</source>
+        <translation>显示 %1 相关信息</translation>
     </message>
     <message>
         <source>About &amp;Qt</source>
@@ -126,6 +289,10 @@
         <source>&amp;Options...</source>
         <translation>选项(&amp;O)...</translation>
     </message>
+    <message>
+        <source>Modify configuration options for %1</source>
+        <translation>修改%1配置选项</translation>
+    </message>
     <message>
         <source>&amp;Encrypt Wallet...</source>
         <translation>加密钱包(&amp;E)...</translation>
@@ -150,6 +317,18 @@
         <source>Open &amp;URI...</source>
         <translation>打开 &amp;URI...</translation>
     </message>
+    <message>
+        <source>Click to disable network activity.</source>
+        <translation>点击禁用网络活动。</translation>
+    </message>
+    <message>
+        <source>Network activity disabled.</source>
+        <translation>网络活动已禁用。</translation>
+    </message>
+    <message>
+        <source>Click to enable network activity again.</source>
+        <translation>点击重新开启网络活动。</translation>
+    </message>
     <message>
         <source>Reindexing blocks on disk...</source>
         <translation>正在为数据块重建索引...</translation>
@@ -232,7 +411,7 @@
     </message>
     <message>
         <source>Request payments (generates QR codes and bitcoin: URIs)</source>
-        <translation>请求支付（生成二维码和 bitcoin: URI）</translation>
+        <translation>请求支付 (生成二维码和 bitcoin: URI)</translation>
     </message>
     <message>
         <source>Show the list of used sending addresses and labels</source>
@@ -244,7 +423,7 @@
     </message>
     <message>
         <source>Open a bitcoin: URI or payment request</source>
-        <translation>打开一个比特币：URI 或支付请求</translation>
+        <translation>打开一个 bitcoin: URI 或支付请求</translation>
     </message>
     <message>
         <source>&amp;Command-line options</source>
@@ -254,6 +433,14 @@
         <source>%n active connection(s) to Bitcoin network</source>
         <translation><numerusform>%n 个到比特币网络的活动连接</numerusform></translation>
     </message>
+    <message>
+        <source>Indexing blocks on disk...</source>
+        <translation>正在为数据块建立索引...</translation>
+    </message>
+    <message>
+        <source>Processing blocks on disk...</source>
+        <translation>正在处理数据块...</translation>
+    </message>
     <message>
         <source>No block source available...</source>
         <translation>沒有可用的区块来源...</translation>
@@ -262,26 +449,6 @@
         <source>Processed %n block(s) of transaction history.</source>
         <translation><numerusform>已处理 %n 个交易历史数据块。</numerusform></translation>
     </message>
-    <message numerus="yes">
-        <source>%n hour(s)</source>
-        <translation><numerusform>%n 小时</numerusform></translation>
-    </message>
-    <message numerus="yes">
-        <source>%n day(s)</source>
-        <translation><numerusform>%n 天</numerusform></translation>
-    </message>
-    <message numerus="yes">
-        <source>%n week(s)</source>
-        <translation><numerusform>%n 周</numerusform></translation>
-    </message>
-    <message>
-        <source>%1 and %2</source>
-        <translation>%1 和 %2</translation>
-    </message>
-    <message numerus="yes">
-        <source>%n year(s)</source>
-        <translation><numerusform>%n 年</numerusform></translation>
-    </message>
     <message>
         <source>%1 behind</source>
         <translation>落后 %1 </translation>
@@ -310,6 +477,14 @@
         <source>Up to date</source>
         <translation>已是最新</translation>
     </message>
+    <message>
+        <source>Show the %1 help message to get a list with possible Bitcoin command-line options</source>
+        <translation>显示 %1 帮助信息，获取可用命令行选项列表</translation>
+    </message>
+    <message>
+        <source>%1 client</source>
+        <translation>%1 客戶</translation>
+    </message>
     <message>
         <source>Catching up...</source>
         <translation>更新中...</translation>
@@ -360,12 +535,16 @@
         <source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;locked&lt;/b&gt;</source>
         <translation>钱包已被&lt;b&gt;加密&lt;/b&gt;，当前为&lt;b&gt;锁定&lt;/b&gt;状态</translation>
     </message>
+    <message>
+        <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source>
+        <translation>发生严重错误。客户端无法安全地继续运行，即将退出。</translation>
+    </message>
 </context>
 <context>
     <name>CoinControlDialog</name>
     <message>
         <source>Coin Selection</source>
-        <translation>币源选择(Coin Selection)</translation>
+        <translation>选择钱币</translation>
     </message>
     <message>
         <source>Quantity:</source>
@@ -379,10 +558,6 @@
         <source>Amount:</source>
         <translation>金额：</translation>
     </message>
-    <message>
-        <source>Priority:</source>
-        <translation>优先级：</translation>
-    </message>
     <message>
         <source>Fee:</source>
         <translation>费用：</translation>
@@ -436,8 +611,84 @@
         <translation>已确认</translation>
     </message>
     <message>
-        <source>Priority</source>
-        <translation>优先级</translation>
+        <source>Copy address</source>
+        <translation>复制地址</translation>
+    </message>
+    <message>
+        <source>Copy label</source>
+        <translation>复制标签</translation>
+    </message>
+    <message>
+        <source>Copy amount</source>
+        <translation>复制金额</translation>
+    </message>
+    <message>
+        <source>Copy transaction ID</source>
+        <translation>复制交易识别码</translation>
+    </message>
+    <message>
+        <source>Lock unspent</source>
+        <translation>锁定未花费</translation>
+    </message>
+    <message>
+        <source>Unlock unspent</source>
+        <translation>解锁未花费</translation>
+    </message>
+    <message>
+        <source>Copy quantity</source>
+        <translation>复制数目</translation>
+    </message>
+    <message>
+        <source>Copy fee</source>
+        <translation>复制手续费</translation>
+    </message>
+    <message>
+        <source>Copy after fee</source>
+        <translation>复制计费后金额</translation>
+    </message>
+    <message>
+        <source>Copy bytes</source>
+        <translation>复制字节数</translation>
+    </message>
+    <message>
+        <source>Copy dust</source>
+        <translation>复制零散金额</translation>
+    </message>
+    <message>
+        <source>Copy change</source>
+        <translation>复制找零金额</translation>
+    </message>
+    <message>
+        <source>(%1 locked)</source>
+        <translation>(锁定 %1 枚)</translation>
+    </message>
+    <message>
+        <source>yes</source>
+        <translation>是</translation>
+    </message>
+    <message>
+        <source>no</source>
+        <translation>否</translation>
+    </message>
+    <message>
+        <source>This label turns red if any recipient receives an amount smaller than the current dust threshold.</source>
+        <translation>当任何一个收款金额小于目前的零散金额上限时，文字会变红色。</translation>
+    </message>
+    <message>
+        <source>Can vary +/- %1 satoshi(s) per input.</source>
+        <translation>每组输入可能有 +/- %1 个 satoshi 的误差。</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(无标签)</translation>
+    </message>
+    <message>
+        <source>change from %1 (%2)</source>
+        <translation>找零前是 %1 (%2)</translation>
+    </message>
+    <message>
+        <source>(change)</source>
+        <translation>(找零)</translation>
     </message>
 </context>
 <context>
@@ -462,6 +713,38 @@
         <source>&amp;Address</source>
         <translation>地址(&amp;A)</translation>
     </message>
+    <message>
+        <source>New receiving address</source>
+        <translation>新建收款地址</translation>
+    </message>
+    <message>
+        <source>New sending address</source>
+        <translation>新建付款地址</translation>
+    </message>
+    <message>
+        <source>Edit receiving address</source>
+        <translation>编辑收款地址</translation>
+    </message>
+    <message>
+        <source>Edit sending address</source>
+        <translation>编辑付款地址</translation>
+    </message>
+    <message>
+        <source>The entered address "%1" is not a valid Bitcoin address.</source>
+        <translation>输入的地址 %1 并不是有效的比特币地址。</translation>
+    </message>
+    <message>
+        <source>The entered address "%1" is already in the address book.</source>
+        <translation>输入的地址 %1 已经存在地址簿。</translation>
+    </message>
+    <message>
+        <source>Could not unlock wallet.</source>
+        <translation>无法将钱包解锁。</translation>
+    </message>
+    <message>
+        <source>New key generation failed.</source>
+        <translation>产生新的密钥失败了。</translation>
+    </message>
 </context>
 <context>
     <name>FreespaceChecker</name>
@@ -496,6 +779,10 @@
         <source>(%1-bit)</source>
         <translation>(%1 位)</translation>
     </message>
+    <message>
+        <source>About %1</source>
+        <translation>關於 %1</translation>
+    </message>
     <message>
         <source>Command-line options</source>
         <translation>命令行选项</translation>
@@ -532,13 +819,30 @@
         <source>Show splash screen on startup (default: %u)</source>
         <translation>显示启动画面（默认：%u）</translation>
     </message>
-    </context>
+    <message>
+        <source>Reset all settings changed in the GUI</source>
+        <translation>重置图形界面所有的变更设置</translation>
+    </message>
+</context>
 <context>
     <name>Intro</name>
     <message>
         <source>Welcome</source>
         <translation>欢迎</translation>
     </message>
+    <message>
+        <source>Welcome to %1.</source>
+        <translation>
+歡迎來到 %1</translation>
+    </message>
+    <message>
+        <source>As this is the first time the program is launched, you can choose where %1 will store its data.</source>
+        <translation>由于这是第一次启动此程序，您可以选择%1的数据所存储的位置</translation>
+    </message>
+    <message>
+        <source>%1 will download and store a copy of the Bitcoin block chain. At least %2GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source>
+        <translation>%1 会下载并存储一份比特币区块链的副本。至少有 %2GB 的数据会存储到这个目录中，并且还会持续增长。另外钱包资料也会储存在这个目录。</translation>
+    </message>
     <message>
         <source>Use the default data directory</source>
         <translation>使用默认的数据目录</translation>
@@ -564,6 +868,53 @@
         <translation><numerusform>(需要%n GB空间)</numerusform></translation>
     </message>
 </context>
+<context>
+    <name>ModalOverlay</name>
+    <message>
+        <source>Form</source>
+        <translation>表单</translation>
+    </message>
+    <message>
+        <source>Recent transactions may not yet be visible, and therefore your wallet's balance might be incorrect. This information will be correct once your wallet has finished synchronizing with the bitcoin network, as detailed below.</source>
+        <translation>近期交易可能尚未显示，因此当前余额可能不准确。以上信息将在与比特币网络完全同步后更正。详情如下</translation>
+    </message>
+    <message>
+        <source>Attempting to spend bitcoins that are affected by not-yet-displayed transactions will not be accepted by the network.</source>
+        <translation>尝试使用受未可见交易影响的余额将不被网络接受。</translation>
+    </message>
+    <message>
+        <source>Number of blocks left</source>
+        <translation>剩余区块数量</translation>
+    </message>
+    <message>
+        <source>Unknown...</source>
+        <translation>未知</translation>
+    </message>
+    <message>
+        <source>Last block time</source>
+        <translation>上一数据块时间</translation>
+    </message>
+    <message>
+        <source>Progress</source>
+        <translation>进度</translation>
+    </message>
+    <message>
+        <source>Progress increase per hour</source>
+        <translation>每小时进度增加</translation>
+    </message>
+    <message>
+        <source>calculating...</source>
+        <translation>正在计算</translation>
+    </message>
+    <message>
+        <source>Estimated time left until synced</source>
+        <translation>预计剩余同步时间</translation>
+    </message>
+    <message>
+        <source>Hide</source>
+        <translation>隐藏</translation>
+    </message>
+    </context>
 <context>
     <name>OpenURIDialog</name>
     <message>
@@ -582,6 +933,10 @@
         <source>Select payment request file</source>
         <translation>选择付款请求文件 </translation>
     </message>
+    <message>
+        <source>Select payment request file to open</source>
+        <translation>选择要打开的付款请求文件</translation>
+    </message>
 </context>
 <context>
     <name>OptionsDialog</name>
@@ -593,6 +948,14 @@
         <source>&amp;Main</source>
         <translation>主要(&amp;M)</translation>
     </message>
+    <message>
+        <source>Automatically start %1 after logging in to the system.</source>
+        <translation>在登入系统后自动启动 %1</translation>
+    </message>
+    <message>
+        <source>&amp;Start %1 on system login</source>
+        <translation>系统登入时启动 %1</translation>
+    </message>
     <message>
         <source>Size of &amp;database cache</source>
         <translation>数据库缓存大小(&amp;D)</translation>
@@ -719,7 +1082,7 @@
     </message>
     <message>
         <source>Connect to the Bitcoin network through a separate SOCKS5 proxy for Tor hidden services.</source>
-        <translation>在Tor匿名网络下通过不同的SOCKS5代理连接比特币网络</translation>
+        <translation>在 Tor 匿名网络下通过不同的 SOCKS5 代理连接比特币网络</translation>
     </message>
     <message>
         <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services:</source>
@@ -729,6 +1092,14 @@
         <source>&amp;Window</source>
         <translation>窗口(&amp;W)</translation>
     </message>
+    <message>
+        <source>&amp;Hide the icon from the system tray.</source>
+        <translation>不在通知区显示图标</translation>
+    </message>
+    <message>
+        <source>Hide tray icon</source>
+        <translation>不显示通知区图标</translation>
+    </message>
     <message>
         <source>Show only a tray icon after minimizing the window.</source>
         <translation>最小化窗口后仅显示托盘图标</translation>
@@ -749,6 +1120,10 @@
         <source>User Interface &amp;language:</source>
         <translation>用户界面语言(&amp;L)：</translation>
     </message>
+    <message>
+        <source>The user interface language can be set here. This setting will take effect after restarting %1.</source>
+        <translation>可以在这里设定用户界面的语言。这个设定在重启 %1 后才会生效。</translation>
+    </message>
     <message>
         <source>&amp;Unit to show amounts in:</source>
         <translation>比特币金额单位(&amp;U)：</translation>
@@ -806,7 +1181,7 @@
     </message>
     <message>
         <source>The displayed information may be out of date. Your wallet automatically synchronizes with the Bitcoin network after a connection is established, but this process has not completed yet.</source>
-        <translation>现在显示的消息可能是过期的. 在连接上比特币网络节点后，您的钱包将自动与网络同步，但是这个过程还没有完成。</translation>
+        <translation>现在显示的消息可能是过期的。在连接上比特币网络节点后，您的钱包将自动与网络同步，但是这个过程还没有完成。</translation>
     </message>
     <message>
         <source>Watch-only:</source>
@@ -874,48 +1249,144 @@
     </message>
 </context>
 <context>
-    <name>PeerTableModel</name>
+    <name>PaymentServer</name>
     <message>
-        <source>User Agent</source>
-        <translation>用户代理</translation>
+        <source>Payment request error</source>
+        <translation>要求付款时发生错误</translation>
     </message>
     <message>
-        <source>Node/Service</source>
-        <translation>节点/服务</translation>
+        <source>Cannot start bitcoin: click-to-pay handler</source>
+        <translation>无法启动 bitcoin 协议的“
+一键支付”处理器</translation>
     </message>
     <message>
-        <source>Ping Time</source>
-        <translation>Ping 时间</translation>
+        <source>URI handling</source>
+        <translation>URI 处理</translation>
     </message>
-</context>
-<context>
-    <name>QObject</name>
     <message>
-        <source>Amount</source>
-        <translation>金额</translation>
+        <source>Payment request fetch URL is invalid: %1</source>
+        <translation>取得付款请求的 URL 无效: %1</translation>
     </message>
     <message>
-        <source>Enter a Bitcoin address (e.g. %1)</source>
-        <translation>请输入一个比特币地址 (例如 %1)</translation>
+        <source>Invalid payment address %1</source>
+        <translation>无效的付款地址 %1</translation>
     </message>
     <message>
-        <source>%1 d</source>
-        <translation>%1 天</translation>
+        <source>URI cannot be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source>
+        <translation>无法解析 URI 地址！可能是因为比特币地址无效，或是 URI 参数格式错误。</translation>
     </message>
     <message>
-        <source>%1 h</source>
-        <translation>%1 小时</translation>
+        <source>Payment request file handling</source>
+        <translation>处理付款请求文件</translation>
     </message>
     <message>
-        <source>%1 m</source>
-        <translation>%1 分钟</translation>
+        <source>Payment request file cannot be read! This can be caused by an invalid payment request file.</source>
+        <translation>无法读取付款请求文件！可能是文件无效造成的。</translation>
     </message>
     <message>
-        <source>%1 s</source>
-        <translation>%1 秒</translation>
+        <source>Payment request rejected</source>
+        <translation>付款请求已被拒绝</translation>
     </message>
     <message>
-        <source>None</source>
+        <source>Payment request network doesn't match client network.</source>
+        <translation>付款请求的网络类型跟客户端不符。</translation>
+    </message>
+    <message>
+        <source>Payment request expired.</source>
+        <translation>付款请求已过期。</translation>
+    </message>
+    <message>
+        <source>Payment request is not initialized.</source>
+        <translation>支付请求未成形。</translation>
+    </message>
+    <message>
+        <source>Unverified payment requests to custom payment scripts are unsupported.</source>
+        <translation>不支持到自定义付款脚本的未验证付款请求。</translation>
+    </message>
+    <message>
+        <source>Invalid payment request.</source>
+        <translation>无效的支付请求。</translation>
+    </message>
+    <message>
+        <source>Requested payment amount of %1 is too small (considered dust).</source>
+        <translation>请求支付的金额 %1 太小（就像尘埃）。</translation>
+    </message>
+    <message>
+        <source>Refund from %1</source>
+        <translation>退款来自 %1</translation>
+    </message>
+    <message>
+        <source>Payment request %1 is too large (%2 bytes, allowed %3 bytes).</source>
+        <translation>支付请求 %1 太大 (%2 字节。只允许 %3 字节)。</translation>
+    </message>
+    <message>
+        <source>Error communicating with %1: %2</source>
+        <translation>%1: %2 通讯出错</translation>
+    </message>
+    <message>
+        <source>Payment request cannot be parsed!</source>
+        <translation>无法解析 付款请求！</translation>
+    </message>
+    <message>
+        <source>Bad response from server %1</source>
+        <translation>来自 %1 服务器的错误响应</translation>
+    </message>
+    <message>
+        <source>Network request error</source>
+        <translation>网络请求出错</translation>
+    </message>
+    <message>
+        <source>Payment acknowledged</source>
+        <translation>付款已确认</translation>
+    </message>
+</context>
+<context>
+    <name>PeerTableModel</name>
+    <message>
+        <source>User Agent</source>
+        <translation>用户代理</translation>
+    </message>
+    <message>
+        <source>Node/Service</source>
+        <translation>节点/服务</translation>
+    </message>
+    <message>
+        <source>NodeId</source>
+        <translation>节点ID</translation>
+    </message>
+    <message>
+        <source>Ping</source>
+        <translation> </translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Amount</source>
+        <translation>金额</translation>
+    </message>
+    <message>
+        <source>Enter a Bitcoin address (e.g. %1)</source>
+        <translation>请输入一个比特币地址 (例如 %1)</translation>
+    </message>
+    <message>
+        <source>%1 d</source>
+        <translation>%1 天</translation>
+    </message>
+    <message>
+        <source>%1 h</source>
+        <translation>%1 小时</translation>
+    </message>
+    <message>
+        <source>%1 m</source>
+        <translation>%1 分钟</translation>
+    </message>
+    <message>
+        <source>%1 s</source>
+        <translation>%1 秒</translation>
+    </message>
+    <message>
+        <source>None</source>
         <translation>无</translation>
     </message>
     <message>
@@ -926,6 +1397,72 @@
         <source>%1 ms</source>
         <translation>%1 毫秒</translation>
     </message>
+    <message numerus="yes">
+        <source>%n second(s)</source>
+        <translation><numerusform>%n 秒</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%n minute(s)</source>
+        <translation><numerusform>%n 分钟</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%n hour(s)</source>
+        <translation><numerusform>%n 小时</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%n day(s)</source>
+        <translation><numerusform>%n 天</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%n week(s)</source>
+        <translation><numerusform>%n 周</numerusform></translation>
+    </message>
+    <message>
+        <source>%1 and %2</source>
+        <translation>%1 和 %2</translation>
+    </message>
+    <message numerus="yes">
+        <source>%n year(s)</source>
+        <translation><numerusform>%n 年</numerusform></translation>
+    </message>
+    <message>
+        <source>%1 didn't yet exit safely...</source>
+        <translation>%1 尚未安全退出</translation>
+    </message>
+</context>
+<context>
+    <name>QObject::QObject</name>
+    <message>
+        <source>Error: Specified data directory "%1" does not exist.</source>
+        <translation>错误：指定的数据目录“%1”不存在。</translation>
+    </message>
+    <message>
+        <source>Error: Cannot parse configuration file: %1. Only use key=value syntax.</source>
+        <translation>错误：无法解析配置文件：%1。只接受 key=value语法。</translation>
+    </message>
+    <message>
+        <source>Error: %1</source>
+        <translation>错误：%1</translation>
+    </message>
+</context>
+<context>
+    <name>QRImageWidget</name>
+    <message>
+        <source>&amp;Save Image...</source>
+        <translation>保存图片(&amp;S)...</translation>
+    </message>
+    <message>
+        <source>&amp;Copy Image</source>
+        <translation>复制图片</translation>
+    </message>
+    <message>
+        <source>Save QR Code</source>
+        <translation>保存二维码</translation>
+    </message>
+    <message>
+        <source>PNG Image (*.png)</source>
+        <translation>PNG 图像(*.png)</translation>
+    </message>
 </context>
 <context>
     <name>RPCConsole</name>
@@ -953,6 +1490,10 @@
         <source>Using BerkeleyDB version</source>
         <translation>使用的 BerkeleyDB 版本</translation>
     </message>
+    <message>
+        <source>Datadir</source>
+        <translation>数据目录</translation>
+    </message>
     <message>
         <source>Startup time</source>
         <translation>启动时间</translation>
@@ -1037,6 +1578,14 @@
         <source>User Agent</source>
         <translation>用户代理</translation>
     </message>
+    <message>
+        <source>Decrease font size</source>
+        <translation>缩小文字</translation>
+    </message>
+    <message>
+        <source>Increase font size</source>
+        <translation>放大文字</translation>
+    </message>
     <message>
         <source>Services</source>
         <translation>服务</translation>
@@ -1061,10 +1610,18 @@
         <source>Ping Time</source>
         <translation>Ping 时间</translation>
     </message>
+    <message>
+        <source>The duration of a currently outstanding ping.</source>
+        <translation>目前这一次 ping 已经过去的时间。</translation>
+    </message>
     <message>
         <source>Ping Wait</source>
         <translation>Ping等待</translation>
     </message>
+    <message>
+        <source>Min Ping</source>
+        <translation>最小Ping值</translation>
+    </message>
     <message>
         <source>Time Offset</source>
         <translation>时间偏移</translation>
@@ -1095,7 +1652,7 @@
     </message>
     <message>
         <source>In:</source>
-        <translation>输入：</translation>
+        <translation>输入:</translation>
     </message>
     <message>
         <source>Out:</source>
@@ -1109,14 +1666,6 @@
         <source>Clear console</source>
         <translation>清空控制台</translation>
     </message>
-    <message>
-        <source>&amp;Disconnect Node</source>
-        <translation>(&amp;D)断开节点连接</translation>
-    </message>
-    <message>
-        <source>Ban Node for</source>
-        <translation>禁止节点连接时长：</translation>
-    </message>
     <message>
         <source>1 &amp;hour</source>
         <translation>1 小时(&amp;H)</translation>
@@ -1134,8 +1683,20 @@
         <translation>1 年(&amp;Y)</translation>
     </message>
     <message>
-        <source>&amp;Unban Node</source>
-        <translation>(&amp;U)允许节点连接</translation>
+        <source>&amp;Disconnect</source>
+        <translation>(&amp;D)断开</translation>
+    </message>
+    <message>
+        <source>Ban for</source>
+        <translation>禁止</translation>
+    </message>
+    <message>
+        <source>&amp;Unban</source>
+        <translation>重新允许</translation>
+    </message>
+    <message>
+        <source>Welcome to the %1 RPC console.</source>
+        <translation>欢迎使用 %1 的 RPC 控制台。</translation>
     </message>
     <message>
         <source>Use up and down arrows to navigate history, and &lt;b&gt;Ctrl-L&lt;/b&gt; to clear screen.</source>
@@ -1145,6 +1706,14 @@
         <source>Type &lt;b&gt;help&lt;/b&gt; for an overview of available commands.</source>
         <translation>使用 &lt;b&gt;help&lt;/b&gt; 命令显示帮助信息。</translation>
     </message>
+    <message>
+        <source>WARNING: Scammers have been active, telling users to type commands here, stealing their wallet contents. Do not use this console without fully understanding the ramification of a command.</source>
+        <translation>警告： 已有骗子通过要求用户在此输入指令以盗取钱包。不要在没有完全理解命令规范时使用控制台。</translation>
+    </message>
+    <message>
+        <source>Network activity disabled</source>
+        <translation>网络活动已禁用</translation>
+    </message>
     <message>
         <source>%1 B</source>
         <translation>%1 字节</translation>
@@ -1264,6 +1833,22 @@
         <source>Remove</source>
         <translation>移除</translation>
     </message>
+    <message>
+        <source>Copy URI</source>
+        <translation>复制URI</translation>
+    </message>
+    <message>
+        <source>Copy label</source>
+        <translation>复制标签</translation>
+    </message>
+    <message>
+        <source>Copy message</source>
+        <translation>复制消息</translation>
+    </message>
+    <message>
+        <source>Copy amount</source>
+        <translation>复制金额</translation>
+    </message>
 </context>
 <context>
     <name>ReceiveRequestDialog</name>
@@ -1283,7 +1868,70 @@
         <source>&amp;Save Image...</source>
         <translation>保存图片(&amp;S)...</translation>
     </message>
+    <message>
+        <source>Request payment to %1</source>
+        <translation>请求付款到 %1</translation>
+    </message>
+    <message>
+        <source>Payment information</source>
+        <translation>付款信息</translation>
+    </message>
+    <message>
+        <source>URI</source>
+        <translation>URI</translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation>地址</translation>
+    </message>
+    <message>
+        <source>Amount</source>
+        <translation>金额</translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation>标签</translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation>消息</translation>
+    </message>
+    <message>
+        <source>Resulting URI too long, try to reduce the text for label / message.</source>
+        <translation>URI 太长，请试着精简标签或消息文本。</translation>
+    </message>
+    <message>
+        <source>Error encoding URI into QR Code.</source>
+        <translation>把 URI 编码成二维码时发生错误。</translation>
+    </message>
 </context>
+<context>
+    <name>RecentRequestsTableModel</name>
+    <message>
+        <source>Date</source>
+        <translation>日期</translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation>标签</translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation>消息</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(无标签)</translation>
+    </message>
+    <message>
+        <source>(no message)</source>
+        <translation>(无消息)</translation>
+    </message>
+    <message>
+        <source>(no amount requested)</source>
+        <translation>（无请求金额）</translation>
+    </message>
+    </context>
 <context>
     <name>SendCoinsDialog</name>
     <message>
@@ -1319,321 +1967,970 @@
         <translation>金额：</translation>
     </message>
     <message>
-        <source>Priority:</source>
-        <translation>优先级：</translation>
+        <source>Fee:</source>
+        <translation>费用：</translation>
+    </message>
+    <message>
+        <source>After Fee:</source>
+        <translation>加上交易费用后:</translation>
+    </message>
+    <message>
+        <source>Change:</source>
+        <translation>变更 : </translation>
+    </message>
+    <message>
+        <source>If this is activated, but the change address is empty or invalid, change will be sent to a newly generated address.</source>
+        <translation>如果激活该选项，但是零钱地址用光或者非法，将会新生成零钱地址，转入零钱。</translation>
+    </message>
+    <message>
+        <source>Custom change address</source>
+        <translation>自定义零钱地址</translation>
+    </message>
+    <message>
+        <source>Transaction Fee:</source>
+        <translation>交易费用:</translation>
+    </message>
+    <message>
+        <source>Choose...</source>
+        <translation>选择... </translation>
+    </message>
+    <message>
+        <source>collapse fee-settings</source>
+        <translation>收起  费用设置 </translation>
+    </message>
+    <message>
+        <source>per kilobyte</source>
+        <translation>每kb</translation>
+    </message>
+    <message>
+        <source>If the custom fee is set to 1000 satoshis and the transaction is only 250 bytes, then "per kilobyte" only pays 250 satoshis in fee, while "total at least" pays 1000 satoshis. For transactions bigger than a kilobyte both pay by kilobyte.</source>
+        <translation>如果自定义交易费设置为 1000聪而交易大小只有250字节，则“每千字节" 模式只支付250聪交易费， 而"最少"模式则支付1000聪。 大于1000字节的交易按每千字节付费。</translation>
+    </message>
+    <message>
+        <source>Hide</source>
+        <translation>隐藏</translation>
+    </message>
+    <message>
+        <source>total at least</source>
+        <translation>最小额 </translation>
+    </message>
+    <message>
+        <source>Paying only the minimum fee is just fine as long as there is less transaction volume than space in the blocks. But be aware that this can end up in a never confirming transaction once there is more demand for bitcoin transactions than the network can process.</source>
+        <translation>交易量小时只支付最小交易费是可以的。但是请注意，当交易量大到超出网络可处理时您的交易可能永远无法确认。</translation>
+    </message>
+    <message>
+        <source>(read the tooltip)</source>
+        <translation>(请注意提示信息)</translation>
+    </message>
+    <message>
+        <source>Recommended:</source>
+        <translation>推荐：</translation>
+    </message>
+    <message>
+        <source>Custom:</source>
+        <translation>自定义：</translation>
+    </message>
+    <message>
+        <source>(Smart fee not initialized yet. This usually takes a few blocks...)</source>
+        <translation>(智能交易费用 尚未初始化。 需要再下载一些数据块...)</translation>
+    </message>
+    <message>
+        <source>normal</source>
+        <translation>一般</translation>
+    </message>
+    <message>
+        <source>fast</source>
+        <translation>快速</translation>
+    </message>
+    <message>
+        <source>Send to multiple recipients at once</source>
+        <translation>一次发送给多个接收者</translation>
+    </message>
+    <message>
+        <source>Add &amp;Recipient</source>
+        <translation>添加收款人(&amp;R)</translation>
+    </message>
+    <message>
+        <source>Clear all fields of the form.</source>
+        <translation>清除此表单的所有字段。</translation>
+    </message>
+    <message>
+        <source>Dust:</source>
+        <translation>小额：</translation>
+    </message>
+    <message>
+        <source>Clear &amp;All</source>
+        <translation>清除所有(&amp;A)</translation>
+    </message>
+    <message>
+        <source>Balance:</source>
+        <translation>余额：</translation>
+    </message>
+    <message>
+        <source>Confirm the send action</source>
+        <translation>确认发送货币</translation>
+    </message>
+    <message>
+        <source>S&amp;end</source>
+        <translation>发送(&amp;E)</translation>
+    </message>
+    <message>
+        <source>Copy quantity</source>
+        <translation>复制数目</translation>
+    </message>
+    <message>
+        <source>Copy amount</source>
+        <translation>复制金额</translation>
+    </message>
+    <message>
+        <source>Copy fee</source>
+        <translation>复制手续费</translation>
+    </message>
+    <message>
+        <source>Copy after fee</source>
+        <translation>复制计费后金额</translation>
+    </message>
+    <message>
+        <source>Copy bytes</source>
+        <translation>复制字节数</translation>
+    </message>
+    <message>
+        <source>Copy dust</source>
+        <translation>复制零散金额</translation>
+    </message>
+    <message>
+        <source>Copy change</source>
+        <translation>复制找零金额</translation>
+    </message>
+    <message>
+        <source>%1 to %2</source>
+        <translation>%1 到 %2</translation>
+    </message>
+    <message>
+        <source>Are you sure you want to send?</source>
+        <translation>您确定要发出吗？</translation>
+    </message>
+    <message>
+        <source>added as transaction fee</source>
+        <translation>已添加交易费</translation>
+    </message>
+    <message>
+        <source>Total Amount %1</source>
+        <translation>总金额 %1</translation>
+    </message>
+    <message>
+        <source>or</source>
+        <translation>或</translation>
+    </message>
+    <message>
+        <source>Confirm send coins</source>
+        <translation>确认发送货币</translation>
+    </message>
+    <message>
+        <source>The recipient address is not valid. Please recheck.</source>
+        <translation>接收人地址无效。请重新检查。</translation>
+    </message>
+    <message>
+        <source>The amount to pay must be larger than 0.</source>
+        <translation>支付金额必须大于0。</translation>
+    </message>
+    <message>
+        <source>The amount exceeds your balance.</source>
+        <translation>金额超出您的账上余额。</translation>
+    </message>
+    <message>
+        <source>The total exceeds your balance when the %1 transaction fee is included.</source>
+        <translation>计入 %1 交易费后的金额超出您的账上余额。</translation>
+    </message>
+    <message>
+        <source>Duplicate address found: addresses should only be used once each.</source>
+        <translation>发现重复地址：每个地址应该只使用一次。</translation>
+    </message>
+    <message>
+        <source>Transaction creation failed!</source>
+        <translation>交易创建失败！</translation>
+    </message>
+    <message>
+        <source>The transaction was rejected with the following reason: %1</source>
+        <translation>交易因以下原因拒绝：%1</translation>
+    </message>
+    <message>
+        <source>A fee higher than %1 is considered an absurdly high fee.</source>
+        <translation>超过 %1 的交易费被认为是荒谬的高费率。</translation>
+    </message>
+    <message>
+        <source>Payment request expired.</source>
+        <translation>付款请求已过期。</translation>
+    </message>
+    <message numerus="yes">
+        <source>%n block(s)</source>
+        <translation><numerusform>%n 个区块</numerusform></translation>
+    </message>
+    <message>
+        <source>Pay only the required fee of %1</source>
+        <translation>只支付必要费用 %1</translation>
+    </message>
+    <message numerus="yes">
+        <source>Estimated to begin confirmation within %n block(s).</source>
+        <translation><numerusform>预计 %n 个数据块后被确认。</numerusform></translation>
+    </message>
+    <message>
+        <source>Warning: Invalid Bitcoin address</source>
+        <translation>警告: 比特币地址无效</translation>
+    </message>
+    <message>
+        <source>Warning: Unknown change address</source>
+        <translation>警告：未知的更改地址</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(无标签)</translation>
+    </message>
+</context>
+<context>
+    <name>SendCoinsEntry</name>
+    <message>
+        <source>A&amp;mount:</source>
+        <translation>金额(&amp;M)</translation>
+    </message>
+    <message>
+        <source>Pay &amp;To:</source>
+        <translation>付给(&amp;T)：</translation>
+    </message>
+    <message>
+        <source>&amp;Label:</source>
+        <translation>标签(&amp;L)：</translation>
+    </message>
+    <message>
+        <source>Choose previously used address</source>
+        <translation>选择以前用过的地址</translation>
+    </message>
+    <message>
+        <source>This is a normal payment.</source>
+        <translation>这是笔正常的支付。</translation>
+    </message>
+    <message>
+        <source>The Bitcoin address to send the payment to</source>
+        <translation>付款目的地址</translation>
+    </message>
+    <message>
+        <source>Alt+A</source>
+        <translation>Alt+A</translation>
+    </message>
+    <message>
+        <source>Paste address from clipboard</source>
+        <translation>从剪贴板粘贴地址</translation>
+    </message>
+    <message>
+        <source>Alt+P</source>
+        <translation>Alt+P</translation>
+    </message>
+    <message>
+        <source>Remove this entry</source>
+        <translation>移除此项</translation>
+    </message>
+    <message>
+        <source>The fee will be deducted from the amount being sent. The recipient will receive less bitcoins than you enter in the amount field. If multiple recipients are selected, the fee is split equally.</source>
+        <translation>交易费将从发送总额中扣除。接收人将收到比您在金额框中输入的更少的比特币。如果选中了多个收件人，交易费平分。</translation>
+    </message>
+    <message>
+        <source>S&amp;ubtract fee from amount</source>
+        <translation>从金额中减去交易费(&amp;U)</translation>
+    </message>
+    <message>
+        <source>Message:</source>
+        <translation>消息：</translation>
+    </message>
+    <message>
+        <source>This is an unauthenticated payment request.</source>
+        <translation>这是一个未经验证的支付请求。</translation>
+    </message>
+    <message>
+        <source>This is an authenticated payment request.</source>
+        <translation>这是一个已经验证的支付请求。</translation>
+    </message>
+    <message>
+        <source>Enter a label for this address to add it to the list of used addresses</source>
+        <translation>请为此地址输入一个标签以将它加入用过的地址列表</translation>
+    </message>
+    <message>
+        <source>A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
+        <translation>bitcoin:URI 附带的备注信息，将会和交易一起存储，备查。 注意：该消息不会通过比特币网络传输。</translation>
+    </message>
+    <message>
+        <source>Pay To:</source>
+        <translation>支付给:</translation>
+    </message>
+    <message>
+        <source>Memo:</source>
+        <translation>便条：</translation>
+    </message>
+    <message>
+        <source>Enter a label for this address to add it to your address book</source>
+        <translation>为这个地址输入一个标签，以便将它添加到您的地址簿</translation>
+    </message>
+</context>
+<context>
+    <name>SendConfirmationDialog</name>
+    <message>
+        <source>Yes</source>
+        <translation>是</translation>
+    </message>
+</context>
+<context>
+    <name>ShutdownWindow</name>
+    <message>
+        <source>%1 is shutting down...</source>
+        <translation>正在关闭 %1 ...</translation>
+    </message>
+    <message>
+        <source>Do not shut down the computer until this window disappears.</source>
+        <translation>在此窗口消失前不要关闭计算机。</translation>
+    </message>
+</context>
+<context>
+    <name>SignVerifyMessageDialog</name>
+    <message>
+        <source>Signatures - Sign / Verify a Message</source>
+        <translation>签名 - 为消息签名/验证签名消息</translation>
+    </message>
+    <message>
+        <source>&amp;Sign Message</source>
+        <translation>签名消息(&amp;S)</translation>
+    </message>
+    <message>
+        <source>You can sign messages/agreements with your addresses to prove you can receive bitcoins sent to them. Be careful not to sign anything vague or random, as phishing attacks may try to trick you into signing your identity over to them. Only sign fully-detailed statements you agree to.</source>
+        <translation>您可以用你的地址对消息/协议进行签名，以证明您可以接收发送到该地址的比特币。注意不要对任何模棱两可或者随机的消息进行签名，以免遭受钓鱼式攻击。请确保消息内容准确的表达了您的真实意愿。</translation>
+    </message>
+    <message>
+        <source>The Bitcoin address to sign the message with</source>
+        <translation>用来对消息签名的地址 </translation>
+    </message>
+    <message>
+        <source>Choose previously used address</source>
+        <translation>选择以前用过的地址</translation>
+    </message>
+    <message>
+        <source>Alt+A</source>
+        <translation>Alt+A</translation>
+    </message>
+    <message>
+        <source>Paste address from clipboard</source>
+        <translation>从剪贴板粘贴地址</translation>
+    </message>
+    <message>
+        <source>Alt+P</source>
+        <translation>Alt+P</translation>
+    </message>
+    <message>
+        <source>Enter the message you want to sign here</source>
+        <translation>请输入您要发送的签名消息</translation>
+    </message>
+    <message>
+        <source>Signature</source>
+        <translation>签名</translation>
+    </message>
+    <message>
+        <source>Copy the current signature to the system clipboard</source>
+        <translation>复制当前签名至剪切板</translation>
+    </message>
+    <message>
+        <source>Sign the message to prove you own this Bitcoin address</source>
+        <translation>签名消息，证明这个地址属于您。</translation>
+    </message>
+    <message>
+        <source>Sign &amp;Message</source>
+        <translation>消息签名(&amp;M)</translation>
+    </message>
+    <message>
+        <source>Reset all sign message fields</source>
+        <translation>清空所有签名消息栏</translation>
+    </message>
+    <message>
+        <source>Clear &amp;All</source>
+        <translation>清除所有(&amp;A)</translation>
+    </message>
+    <message>
+        <source>&amp;Verify Message</source>
+        <translation>验证消息(&amp;V)</translation>
+    </message>
+    <message>
+        <source>Enter the receiver's address, message (ensure you copy line breaks, spaces, tabs, etc. exactly) and signature below to verify the message. Be careful not to read more into the signature than what is in the signed message itself, to avoid being tricked by a man-in-the-middle attack. Note that this only proves the signing party receives with the address, it cannot prove sendership of any transaction!</source>
+        <translation>请在下面输入接收者地址、消息（确保换行符、空格符、制表符等完全相同）和签名以验证消息。请仔细核对签名信息，以提防中间人攻击。请注意，这只是证明接收方签名的地址，它不能证明任何交易！</translation>
+    </message>
+    <message>
+        <source>The Bitcoin address the message was signed with</source>
+        <translation>消息使用的签名地址</translation>
+    </message>
+    <message>
+        <source>Verify the message to ensure it was signed with the specified Bitcoin address</source>
+        <translation>验证消息，确保消息是由指定的比特币地址签名过的。</translation>
+    </message>
+    <message>
+        <source>Verify &amp;Message</source>
+        <translation>验证消息签名(&amp;M)</translation>
+    </message>
+    <message>
+        <source>Reset all verify message fields</source>
+        <translation>清空所有验证消息栏</translation>
+    </message>
+    <message>
+        <source>Click "Sign Message" to generate signature</source>
+        <translation>单击“签名消息“产生签名。</translation>
+    </message>
+    <message>
+        <source>The entered address is invalid.</source>
+        <translation>输入的地址非法。</translation>
+    </message>
+    <message>
+        <source>Please check the address and try again.</source>
+        <translation>请检查地址后重试。</translation>
+    </message>
+    <message>
+        <source>The entered address does not refer to a key.</source>
+        <translation>输入的地址没有关联的公私钥对。</translation>
+    </message>
+    <message>
+        <source>Wallet unlock was cancelled.</source>
+        <translation>钱包解锁动作取消。</translation>
+    </message>
+    <message>
+        <source>Private key for the entered address is not available.</source>
+        <translation>找不到输入地址关联的私钥。</translation>
+    </message>
+    <message>
+        <source>Message signing failed.</source>
+        <translation>消息签名失败。</translation>
+    </message>
+    <message>
+        <source>Message signed.</source>
+        <translation>消息已签名。</translation>
+    </message>
+    <message>
+        <source>The signature could not be decoded.</source>
+        <translation>签名无法解码。</translation>
+    </message>
+    <message>
+        <source>Please check the signature and try again.</source>
+        <translation>请检查签名后重试。</translation>
+    </message>
+    <message>
+        <source>The signature did not match the message digest.</source>
+        <translation>签名与消息摘要不匹配。</translation>
+    </message>
+    <message>
+        <source>Message verification failed.</source>
+        <translation>消息验证失败。</translation>
+    </message>
+    <message>
+        <source>Message verified.</source>
+        <translation>消息验证成功。</translation>
+    </message>
+</context>
+<context>
+    <name>SplashScreen</name>
+    <message>
+        <source>[testnet]</source>
+        <translation>[测试网络]</translation>
+    </message>
+</context>
+<context>
+    <name>TrafficGraphWidget</name>
+    <message>
+        <source>KB/s</source>
+        <translation>KB/s</translation>
+    </message>
+</context>
+<context>
+    <name>TransactionDesc</name>
+    <message numerus="yes">
+        <source>Open for %n more block(s)</source>
+        <translation><numerusform>再打开 %n 个数据块</numerusform></translation>
+    </message>
+    <message>
+        <source>Open until %1</source>
+        <translation>至 %1 个数据块时开启</translation>
+    </message>
+    <message>
+        <source>conflicted with a transaction with %1 confirmations</source>
+        <translation>与一个有 %1 个确认的交易冲突</translation>
+    </message>
+    <message>
+        <source>%1/offline</source>
+        <translation>%1 / 离线</translation>
+    </message>
+    <message>
+        <source>0/unconfirmed, %1</source>
+        <translation>0/未确认，%1</translation>
+    </message>
+    <message>
+        <source>abandoned</source>
+        <translation>已抛弃</translation>
+    </message>
+    <message>
+        <source>%1/unconfirmed</source>
+        <translation>%1/未确认</translation>
+    </message>
+    <message>
+        <source>%1 confirmations</source>
+        <translation>%1 已确认</translation>
+    </message>
+    <message>
+        <source>Status</source>
+        <translation>状态</translation>
+    </message>
+    <message>
+        <source>, has not been successfully broadcast yet</source>
+        <translation>，未被成功广播</translation>
+    </message>
+    <message numerus="yes">
+        <source>, broadcast through %n node(s)</source>
+        <translation><numerusform>, 通过 %n 个节点广播 </numerusform></translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation>日期</translation>
+    </message>
+    <message>
+        <source>Source</source>
+        <translation>源</translation>
+    </message>
+    <message>
+        <source>Generated</source>
+        <translation>生成</translation>
+    </message>
+    <message>
+        <source>From</source>
+        <translation>来自</translation>
+    </message>
+    <message>
+        <source>unknown</source>
+        <translation>未知</translation>
+    </message>
+    <message>
+        <source>To</source>
+        <translation>到</translation>
+    </message>
+    <message>
+        <source>own address</source>
+        <translation>自己的地址</translation>
+    </message>
+    <message>
+        <source>watch-only</source>
+        <translation>观察地址(watch-only) </translation>
+    </message>
+    <message>
+        <source>label</source>
+        <translation>标签</translation>
+    </message>
+    <message>
+        <source>Credit</source>
+        <translation>收入</translation>
+    </message>
+    <message numerus="yes">
+        <source>matures in %n more block(s)</source>
+        <translation><numerusform>%n 个数据块后成熟(mature) </numerusform></translation>
+    </message>
+    <message>
+        <source>not accepted</source>
+        <translation>未被接受</translation>
+    </message>
+    <message>
+        <source>Debit</source>
+        <translation>支出</translation>
+    </message>
+    <message>
+        <source>Total debit</source>
+        <translation>总收入</translation>
+    </message>
+    <message>
+        <source>Total credit</source>
+        <translation>总支出</translation>
+    </message>
+    <message>
+        <source>Transaction fee</source>
+        <translation>交易费</translation>
+    </message>
+    <message>
+        <source>Net amount</source>
+        <translation>净额</translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation>消息</translation>
+    </message>
+    <message>
+        <source>Comment</source>
+        <translation>备注</translation>
+    </message>
+    <message>
+        <source>Transaction ID</source>
+        <translation>ID</translation>
+    </message>
+    <message>
+        <source>Transaction total size</source>
+        <translation>交易总大小</translation>
+    </message>
+    <message>
+        <source>Output index</source>
+        <translation>输出索引</translation>
+    </message>
+    <message>
+        <source>Merchant</source>
+        <translation>商家</translation>
+    </message>
+    <message>
+        <source>Generated coins must mature %1 blocks before they can be spent. When you generated this block, it was broadcast to the network to be added to the block chain. If it fails to get into the chain, its state will change to "not accepted" and it won't be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source>
+        <translation>生成的比特币在可以使用前必须有 %1 个成熟的区块。当您生成了此区块后，它将被广播到网络中以加入区块链。如果它未成功进入区块链，其状态将变更为“不接受”并且不可使用。这可能偶尔会发生，如果另一个节点比你早几秒钟成功生成一个区块。</translation>
+    </message>
+    <message>
+        <source>Debug information</source>
+        <translation>调试信息</translation>
+    </message>
+    <message>
+        <source>Transaction</source>
+        <translation>交易</translation>
     </message>
     <message>
-        <source>Fee:</source>
-        <translation>费用：</translation>
+        <source>Inputs</source>
+        <translation>输入</translation>
     </message>
     <message>
-        <source>After Fee:</source>
-        <translation>加上交易费用后:</translation>
+        <source>Amount</source>
+        <translation>金额</translation>
     </message>
     <message>
-        <source>Change:</source>
-        <translation>变更 : </translation>
+        <source>true</source>
+        <translation>是</translation>
     </message>
     <message>
-        <source>If this is activated, but the change address is empty or invalid, change will be sent to a newly generated address.</source>
-        <translation>如果激活该选项，但是零钱地址用光或者非法，将会新生成零钱地址，转入零钱。</translation>
+        <source>false</source>
+        <translation>否</translation>
     </message>
+</context>
+<context>
+    <name>TransactionDescDialog</name>
     <message>
-        <source>Custom change address</source>
-        <translation>自定义零钱地址</translation>
+        <source>This pane shows a detailed description of the transaction</source>
+        <translation>当前面板显示了交易的详细信息</translation>
     </message>
+    </context>
+<context>
+    <name>TransactionTableModel</name>
     <message>
-        <source>Transaction Fee:</source>
-        <translation>交易费用:</translation>
+        <source>Date</source>
+        <translation>日期</translation>
     </message>
     <message>
-        <source>Choose...</source>
-        <translation>选择... </translation>
+        <source>Type</source>
+        <translation>种类</translation>
     </message>
     <message>
-        <source>collapse fee-settings</source>
-        <translation>收起  费用设置 </translation>
+        <source>Label</source>
+        <translation>标签</translation>
     </message>
     <message>
-        <source>per kilobyte</source>
-        <translation>每kb</translation>
+        <source>Open until %1</source>
+        <translation>至 %1 个数据块时开启</translation>
     </message>
     <message>
-        <source>If the custom fee is set to 1000 satoshis and the transaction is only 250 bytes, then "per kilobyte" only pays 250 satoshis in fee, while "total at least" pays 1000 satoshis. For transactions bigger than a kilobyte both pay by kilobyte.</source>
-        <translation>如果自定义交易费设置为 1000聪而交易大小只有250字节，则“每千字节" 模式只支付250聪交易费， 而"最少"模式则支付1000聪。 大于1000字节的交易按每千字节付费。</translation>
+        <source>Offline</source>
+        <translation>掉线</translation>
     </message>
     <message>
-        <source>Hide</source>
-        <translation>隐藏</translation>
+        <source>Unconfirmed</source>
+        <translation>未确认的 </translation>
     </message>
     <message>
-        <source>total at least</source>
-        <translation>最小额 </translation>
+        <source>Confirming (%1 of %2 recommended confirmations)</source>
+        <translation>确认中 (推荐 %2个确认，已经有 %1个确认)</translation>
     </message>
     <message>
-        <source>Paying only the minimum fee is just fine as long as there is less transaction volume than space in the blocks. But be aware that this can end up in a never confirming transaction once there is more demand for bitcoin transactions than the network can process.</source>
-        <translation>交易量小时只支付最小交易费是可以的。但是请注意，当交易量大到超出网络可处理时您的交易可能永远无法确认。</translation>
+        <source>Confirmed (%1 confirmations)</source>
+        <translation>已确认 (%1 条确认信息)</translation>
     </message>
     <message>
-        <source>(read the tooltip)</source>
-        <translation>(请注意提示信息)</translation>
+        <source>Conflicted</source>
+        <translation>冲突的</translation>
     </message>
     <message>
-        <source>Recommended:</source>
-        <translation>推荐：</translation>
+        <source>Immature (%1 confirmations, will be available after %2)</source>
+        <translation>未成熟 (%1 个确认，将在 %2 个后可用)</translation>
     </message>
     <message>
-        <source>Custom:</source>
-        <translation>自定义：</translation>
+        <source>This block was not received by any other nodes and will probably not be accepted!</source>
+        <translation>此数据块未被任何其他节点接收，可能不被接受！</translation>
     </message>
     <message>
-        <source>(Smart fee not initialized yet. This usually takes a few blocks...)</source>
-        <translation>(智能交易费用 尚未初始化。 需要再下载一些数据块...)</translation>
+        <source>Generated but not accepted</source>
+        <translation>已生成但未被接受</translation>
     </message>
     <message>
-        <source>Confirmation time:</source>
-        <translation>确认时间：</translation>
+        <source>Received with</source>
+        <translation>收款</translation>
     </message>
     <message>
-        <source>normal</source>
-        <translation>一般</translation>
+        <source>Received from</source>
+        <translation>收款来自</translation>
     </message>
     <message>
-        <source>fast</source>
-        <translation>快速</translation>
+        <source>Sent to</source>
+        <translation>付款</translation>
     </message>
     <message>
-        <source>Send to multiple recipients at once</source>
-        <translation>一次发送给多个接收者</translation>
+        <source>Payment to yourself</source>
+        <translation>付款给自己</translation>
     </message>
     <message>
-        <source>Add &amp;Recipient</source>
-        <translation>添加收款人(&amp;R)</translation>
+        <source>Mined</source>
+        <translation>挖矿所得</translation>
     </message>
     <message>
-        <source>Clear all fields of the form.</source>
-        <translation>清除此表单的所有字段。</translation>
+        <source>watch-only</source>
+        <translation>观察地址(watch-only) </translation>
     </message>
     <message>
-        <source>Dust:</source>
-        <translation>小额：</translation>
+        <source>(n/a)</source>
+        <translation>（不可用）</translation>
     </message>
     <message>
-        <source>Clear &amp;All</source>
-        <translation>清除所有(&amp;A)</translation>
+        <source>(no label)</source>
+        <translation>(无标签)</translation>
     </message>
     <message>
-        <source>Balance:</source>
-        <translation>余额：</translation>
+        <source>Transaction status. Hover over this field to show number of confirmations.</source>
+        <translation>交易状态。 鼠标移到此区域可显示确认项数量。</translation>
     </message>
     <message>
-        <source>Confirm the send action</source>
-        <translation>确认发送货币</translation>
+        <source>Date and time that the transaction was received.</source>
+        <translation>接收到交易的时间</translation>
     </message>
     <message>
-        <source>S&amp;end</source>
-        <translation>发送(&amp;E)</translation>
+        <source>Type of transaction.</source>
+        <translation>交易类别。</translation>
     </message>
-</context>
-<context>
-    <name>SendCoinsEntry</name>
     <message>
-        <source>A&amp;mount:</source>
-        <translation>金额(&amp;M)</translation>
+        <source>Whether or not a watch-only address is involved in this transaction.</source>
+        <translation>该交易中是否涉及  观察地址(watch-only address)。</translation>
     </message>
     <message>
-        <source>Pay &amp;To:</source>
-        <translation>付给(&amp;T)：</translation>
+        <source>User-defined intent/purpose of the transaction.</source>
+        <translation>用户定义的该交易的意图/目的。</translation>
     </message>
     <message>
-        <source>&amp;Label:</source>
-        <translation>标签(&amp;L)：</translation>
+        <source>Amount removed from or added to balance.</source>
+        <translation>从余额添加或移除的金额。</translation>
     </message>
+</context>
+<context>
+    <name>TransactionView</name>
     <message>
-        <source>Choose previously used address</source>
-        <translation>选择以前用过的地址</translation>
+        <source>All</source>
+        <translation>全部</translation>
     </message>
     <message>
-        <source>This is a normal payment.</source>
-        <translation>这是笔正常的支付。</translation>
+        <source>Today</source>
+        <translation>今天</translation>
     </message>
     <message>
-        <source>The Bitcoin address to send the payment to</source>
-        <translation>付款目的地址</translation>
+        <source>This week</source>
+        <translation>这星期</translation>
     </message>
     <message>
-        <source>Alt+A</source>
-        <translation>Alt+A</translation>
+        <source>This month</source>
+        <translation>这个月</translation>
     </message>
     <message>
-        <source>Paste address from clipboard</source>
-        <translation>从剪贴板粘贴地址</translation>
+        <source>Last month</source>
+        <translation>上个月</translation>
     </message>
     <message>
-        <source>Alt+P</source>
-        <translation>Alt+P</translation>
+        <source>This year</source>
+        <translation>今年</translation>
     </message>
     <message>
-        <source>Remove this entry</source>
-        <translation>移除此项</translation>
+        <source>Range...</source>
+        <translation>指定范围...</translation>
     </message>
     <message>
-        <source>The fee will be deducted from the amount being sent. The recipient will receive less bitcoins than you enter in the amount field. If multiple recipients are selected, the fee is split equally.</source>
-        <translation>交易费将从发送总额中扣除。接收人将收到比您在金额框中输入的更少的比特币。如果选中了多个收件人，交易费平分。</translation>
+        <source>Received with</source>
+        <translation>收款</translation>
     </message>
     <message>
-        <source>S&amp;ubtract fee from amount</source>
-        <translation>从金额中减去交易费(&amp;U)</translation>
+        <source>Sent to</source>
+        <translation>付款</translation>
     </message>
     <message>
-        <source>Message:</source>
-        <translation>消息：</translation>
+        <source>To yourself</source>
+        <translation>给自己</translation>
     </message>
     <message>
-        <source>This is an unauthenticated payment request.</source>
-        <translation>这是一个未经验证的支付请求。</translation>
+        <source>Mined</source>
+        <translation>挖矿所得</translation>
     </message>
     <message>
-        <source>This is an authenticated payment request.</source>
-        <translation>这是一个已经验证的支付请求。</translation>
+        <source>Other</source>
+        <translation>其它</translation>
     </message>
     <message>
-        <source>Enter a label for this address to add it to the list of used addresses</source>
-        <translation>请为此地址输入一个标签以将它加入用过的地址列表</translation>
+        <source>Enter address or label to search</source>
+        <translation>输入地址或标签进行搜索</translation>
     </message>
     <message>
-        <source>A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
-        <translation>bitcoin:URI 附带的备注信息，将会和交易一起存储，备查。 注意：该消息不会通过比特币网络传输。</translation>
+        <source>Min amount</source>
+        <translation>最小金额</translation>
     </message>
     <message>
-        <source>Pay To:</source>
-        <translation>支付给:</translation>
+        <source>Abandon transaction</source>
+        <translation>放弃交易</translation>
     </message>
     <message>
-        <source>Memo:</source>
-        <translation>便条：</translation>
+        <source>Copy address</source>
+        <translation>复制地址</translation>
     </message>
-</context>
-<context>
-    <name>ShutdownWindow</name>
     <message>
-        <source>Do not shut down the computer until this window disappears.</source>
-        <translation>在此窗口消失前不要关闭计算机。</translation>
+        <source>Copy label</source>
+        <translation>复制标签</translation>
     </message>
-</context>
-<context>
-    <name>SignVerifyMessageDialog</name>
     <message>
-        <source>Signatures - Sign / Verify a Message</source>
-        <translation>签名 - 为消息签名/验证签名消息</translation>
+        <source>Copy amount</source>
+        <translation>复制金额</translation>
     </message>
     <message>
-        <source>&amp;Sign Message</source>
-        <translation>签名消息(&amp;S)</translation>
+        <source>Copy transaction ID</source>
+        <translation>复制交易识别码</translation>
     </message>
     <message>
-        <source>You can sign messages/agreements with your addresses to prove you can receive bitcoins sent to them. Be careful not to sign anything vague or random, as phishing attacks may try to trick you into signing your identity over to them. Only sign fully-detailed statements you agree to.</source>
-        <translation>您可以用你的地址对消息/协议进行签名，以证明您可以接收发送到该地址的比特币。注意不要对任何模棱两可或者随机的消息进行签名，以免遭受钓鱼式攻击。请确保消息内容准确的表达了您的真实意愿。</translation>
+        <source>Copy raw transaction</source>
+        <translation>复制原始交易</translation>
     </message>
     <message>
-        <source>The Bitcoin address to sign the message with</source>
-        <translation>用来对消息签名的地址 </translation>
+        <source>Copy full transaction details</source>
+        <translation>复制所有交易详情</translation>
     </message>
     <message>
-        <source>Choose previously used address</source>
-        <translation>选择以前用过的地址</translation>
+        <source>Edit label</source>
+        <translation>编辑标签</translation>
     </message>
     <message>
-        <source>Alt+A</source>
-        <translation>Alt+A</translation>
+        <source>Show transaction details</source>
+        <translation>显示交易详情</translation>
     </message>
     <message>
-        <source>Paste address from clipboard</source>
-        <translation>从剪贴板粘贴地址</translation>
+        <source>Export Transaction History</source>
+        <translation>导出交易历史</translation>
     </message>
     <message>
-        <source>Alt+P</source>
-        <translation>Alt+P</translation>
+        <source>Comma separated file (*.csv)</source>
+        <translation>逗号分隔文件 (*.csv)</translation>
     </message>
     <message>
-        <source>Enter the message you want to sign here</source>
-        <translation>请输入您要发送的签名消息</translation>
+        <source>Confirmed</source>
+        <translation>已确认</translation>
     </message>
     <message>
-        <source>Signature</source>
-        <translation>签名</translation>
+        <source>Watch-only</source>
+        <translation>观察地址(Watch-only) </translation>
     </message>
     <message>
-        <source>Copy the current signature to the system clipboard</source>
-        <translation>复制当前签名至剪切板</translation>
+        <source>Date</source>
+        <translation>日期</translation>
     </message>
     <message>
-        <source>Sign the message to prove you own this Bitcoin address</source>
-        <translation>签名消息，证明这个地址属于您。</translation>
+        <source>Type</source>
+        <translation>种类</translation>
     </message>
     <message>
-        <source>Sign &amp;Message</source>
-        <translation>消息签名(&amp;M)</translation>
+        <source>Label</source>
+        <translation>标签</translation>
     </message>
     <message>
-        <source>Reset all sign message fields</source>
-        <translation>清空所有签名消息栏</translation>
+        <source>Address</source>
+        <translation>地址</translation>
     </message>
     <message>
-        <source>Clear &amp;All</source>
-        <translation>清除所有(&amp;A)</translation>
+        <source>ID</source>
+        <translation>ID</translation>
     </message>
     <message>
-        <source>&amp;Verify Message</source>
-        <translation>验证消息(&amp;V)</translation>
+        <source>Exporting Failed</source>
+        <translation>导出失败</translation>
     </message>
     <message>
-        <source>Enter the receiver's address, message (ensure you copy line breaks, spaces, tabs, etc. exactly) and signature below to verify the message. Be careful not to read more into the signature than what is in the signed message itself, to avoid being tricked by a man-in-the-middle attack. Note that this only proves the signing party receives with the address, it cannot prove sendership of any transaction!</source>
-        <translation>请在下面输入接收者地址、消息（确保换行符、空格符、制表符等完全相同）和签名以验证消息。请仔细核对签名信息，以提防中间人攻击。请注意，这只是证明接收方签名的地址，它不能证明任何交易！</translation>
+        <source>There was an error trying to save the transaction history to %1.</source>
+        <translation>导出交易历史到 %1 时发生错误。</translation>
     </message>
     <message>
-        <source>The Bitcoin address the message was signed with</source>
-        <translation>消息使用的签名地址</translation>
+        <source>Exporting Successful</source>
+        <translation>导出成功</translation>
     </message>
     <message>
-        <source>Verify the message to ensure it was signed with the specified Bitcoin address</source>
-        <translation>验证消息，确保消息是由指定的比特币地址签名过的。</translation>
+        <source>The transaction history was successfully saved to %1.</source>
+        <translation>交易历史已成功保存到 %1。</translation>
     </message>
     <message>
-        <source>Verify &amp;Message</source>
-        <translation>验证消息签名(&amp;M)</translation>
+        <source>Range:</source>
+        <translation>范围：</translation>
     </message>
     <message>
-        <source>Reset all verify message fields</source>
-        <translation>清空所有验证消息栏</translation>
+        <source>to</source>
+        <translation>到</translation>
     </message>
 </context>
 <context>
-    <name>SplashScreen</name>
+    <name>UnitDisplayStatusBarControl</name>
     <message>
-        <source>[testnet]</source>
-        <translation>[测试网络]</translation>
+        <source>Unit to show amounts in. Click to select another unit.</source>
+        <translation>金额单位。单击选择别的单位。</translation>
     </message>
 </context>
 <context>
-    <name>TrafficGraphWidget</name>
+    <name>WalletFrame</name>
     <message>
-        <source>KB/s</source>
-        <translation>KB/s</translation>
+        <source>No wallet has been loaded.</source>
+        <translation>没有载入钱包。</translation>
     </message>
 </context>
 <context>
-    <name>TransactionDescDialog</name>
+    <name>WalletModel</name>
     <message>
-        <source>This pane shows a detailed description of the transaction</source>
-        <translation>当前面板显示了交易的详细信息</translation>
+        <source>Send Coins</source>
+        <translation>发送比特币</translation>
     </message>
 </context>
 <context>
-    <name>UnitDisplayStatusBarControl</name>
+    <name>WalletView</name>
     <message>
-        <source>Unit to show amounts in. Click to select another unit.</source>
-        <translation>金额单位。单击选择别的单位。</translation>
+        <source>&amp;Export</source>
+        <translation>导出(&amp;E)</translation>
+    </message>
+    <message>
+        <source>Export the data in the current tab to a file</source>
+        <translation>导出当前分页里的数据到文件</translation>
+    </message>
+    <message>
+        <source>Backup Wallet</source>
+        <translation>备份钱包</translation>
+    </message>
+    <message>
+        <source>Wallet Data (*.dat)</source>
+        <translation>钱包文件(*.dat)</translation>
+    </message>
+    <message>
+        <source>Backup Failed</source>
+        <translation>备份失败</translation>
+    </message>
+    <message>
+        <source>There was an error trying to save the wallet data to %1.</source>
+        <translation>尝试保存钱包数据至 %1 时发生错误。</translation>
+    </message>
+    <message>
+        <source>Backup Successful</source>
+        <translation>备份成功</translation>
+    </message>
+    <message>
+        <source>The wallet data was successfully saved to %1.</source>
+        <translation>钱包数据成功保存至 %1 。</translation>
     </message>
 </context>
 <context>
@@ -1703,17 +3000,13 @@
         <source>Unable to start HTTP server. See debug log for details.</source>
         <translation>无法启动HTTP服务，查看日志获取更多信息</translation>
     </message>
-    <message>
-        <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
-        <translation>接受来自外部的连接 (缺省: 如果不带 -proxy or -connect 参数设置为1)</translation>
-    </message>
     <message>
         <source>Bitcoin Core</source>
-        <translation>比特币核心</translation>
+        <translation>Bitcoin Core</translation>
     </message>
     <message>
-        <source>-fallbackfee is set very high! This is the transaction fee you may pay when fee estimates are not available.</source>
-        <translation>-fallbackfree 交易费设置得很高！这是在费用估计不可用时你可能会支付的交易费。</translation>
+        <source>The %s developers</source>
+        <translation>%s 开发人员</translation>
     </message>
     <message>
         <source>A fee rate (in %s/kB) that will be used when fee estimation has insufficient data (default: %s)</source>
@@ -1731,18 +3024,10 @@
         <source>Delete all wallet transactions and only recover those parts of the blockchain through -rescan on startup</source>
         <translation>删除钱包的所有交易记录，且只有用 -rescan参数启动客户端才能重新取回交易记录 </translation>
     </message>
-    <message>
-        <source>Distributed under the MIT software license, see the accompanying file COPYING or &lt;http://www.opensource.org/licenses/mit-license.php&gt;.</source>
-        <translation>Distributed under the MIT software license, see the accompanying file COPYING or &lt;http://www.opensource.org/licenses/mit-license.php&gt;.</translation>
-    </message>
     <message>
         <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source>
         <translation>当最佳区块变化时执行命令 (命令行中的 %s 会被替换成区块哈希值)</translation>
     </message>
-    <message>
-        <source>Force relay of transactions from whitelisted peers even they violate local relay policy (default: %d)</source>
-        <translation>强制关联来自白名单同行的交易即使他们违反本地关联政策(默认: %d)</translation>
-    </message>
     <message>
         <source>Set the number of script verification threads (%u to %d, 0 = auto, &lt;0 = leave that many cores free, default: %d)</source>
         <translation>设置脚本验证的程序 (%u 到 %d, 0 = 自动, &lt;0 = 保留自由的核心, 默认值: %d)</translation>
@@ -1751,26 +3036,10 @@
         <source>The block database contains a block which appears to be from the future. This may be due to your computer's date and time being set incorrectly. Only rebuild the block database if you are sure that your computer's date and time are correct</source>
         <translation>区块数据库包含未来的交易，这可能是由本机错误的日期时间引起。若确认本机日期时间正确，请重新建立区块数据库。</translation>
     </message>
-    <message>
-        <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
-        <translation>这是测试用的预发布版本 - 请谨慎使用 - 不要用来挖矿，或者在正式商用环境下使用</translation>
-    </message>
     <message>
         <source>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</source>
         <translation>使用UPnP暴露本机监听端口（默认：1 当正在监听且不使用代理）</translation>
     </message>
-    <message>
-        <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source>
-        <translation>警告：网络似乎并不完全同意！有些矿工似乎遇到了问题。</translation>
-    </message>
-    <message>
-        <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source>
-        <translation>警告：我们的同行似乎不完全同意！您可能需要升级，或者其他节点可能需要升级。</translation>
-    </message>
-    <message>
-        <source>Whitelist peers connecting from the given netmask or IP address. Can be specified multiple times.</source>
-        <translation>节点白名单,网络掩码或IP址。可多次指定。</translation>
-    </message>
     <message>
         <source>-maxmempool must be at least %d MB</source>
         <translation>-maxmempool 最小为%d MB</translation>
@@ -1788,13 +3057,17 @@
         <translation>数据块创建选项：</translation>
     </message>
     <message>
-        <source>Connect only to the specified node(s)</source>
-        <translation>仅连接到指定节点</translation>
+        <source>Cannot resolve -%s address: '%s'</source>
+        <translation>无法解析 - %s 地址： '%s'</translation>
     </message>
     <message>
         <source>Connection options:</source>
         <translation>连接选项：</translation>
     </message>
+    <message>
+        <source>Copyright (C) %i-%i</source>
+        <translation>版权所有 (C) %i-%i</translation>
+    </message>
     <message>
         <source>Corrupted block database detected</source>
         <translation>检测发现数据块数据库损坏。请使用 -reindex参数重启客户端。</translation>
@@ -1839,6 +3112,10 @@
         <source>Error initializing wallet database environment %s!</source>
         <translation>Error initializing wallet database environment %s!</translation>
     </message>
+    <message>
+        <source>Error loading %s</source>
+        <translation>载入 %s 时发生错误</translation>
+    </message>
     <message>
         <source>Error loading block database</source>
         <translation>导入数据块数据库出错</translation>
@@ -1879,10 +3156,6 @@
         <source>Location of the auth cookie (default: data dir)</source>
         <translation>认证Cookie的位置 (默认: data目录)</translation>
     </message>
-    <message>
-        <source>Minimum bytes per sigop in transactions we relay and mine (default: %u)</source>
-        <translation>我们关联和挖掘的每sigop的最低交易字节(默认: %u)</translation>
-    </message>
     <message>
         <source>Not enough file descriptors available.</source>
         <translation>没有足够的文件描述符可用。</translation>
@@ -1915,6 +3188,10 @@
         <source>Specify wallet file (within data directory)</source>
         <translation>指定钱包文件（数据目录内）</translation>
     </message>
+    <message>
+        <source>The source code is available from %s.</source>
+        <translation>源代码可以在 %s 获得。</translation>
+    </message>
     <message>
         <source>Unsupported argument -benchmark ignored, use -debug=bench.</source>
         <translation>忽略不支持的选项 -benchmark，使用 -debug=bench</translation>
@@ -1937,11 +3214,11 @@
     </message>
     <message>
         <source>Verifying blocks...</source>
-        <translation>正在验证数据库的完整性...</translation>
+        <translation>正在验证区块...</translation>
     </message>
     <message>
         <source>Verifying wallet...</source>
-        <translation>正在检测钱包的完整性...</translation>
+        <translation>正在验证钱包...</translation>
     </message>
     <message>
         <source>Wallet %s resides outside data directory %s</source>
@@ -1995,10 +3272,6 @@
         <source>Maximum size of data in data carrier transactions we relay and mine (default: %u)</source>
         <translation>Maximum size of data in data carrier transactions we relay and mine (default: %u)</translation>
     </message>
-    <message>
-        <source>Query for peer addresses via DNS lookup, if low on addresses (default: 1 unless -connect)</source>
-        <translation>通过DNS查询每个地址，如果短地址 (默认值: 1 除非 -连接)</translation>
-    </message>
     <message>
         <source>Randomize credentials for every proxy connection. This enables Tor stream isolation (default: %u)</source>
         <translation>为每个代理连接随机化凭据。这将启用 Tor 流隔离 (默认: %u)</translation>
@@ -2011,10 +3284,6 @@
         <source>The transaction amount is too small to send after the fee has been deducted</source>
         <translation>在交易费被扣除后发送的交易金额太小</translation>
     </message>
-    <message>
-        <source>This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit &lt;https://www.openssl.org/&gt; and cryptographic software written by Eric Young and UPnP software written by Thomas Bernard.</source>
-        <translation>This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit &lt;https://www.openssl.org/&gt; and cryptographic software written by Eric Young and UPnP software written by Thomas Bernard.</translation>
-    </message>
     <message>
         <source>Whitelisted peers cannot be DoS banned and their transactions are always relayed, even if they are already in the mempool, useful e.g. for a gateway</source>
         <translation>白名单节点不能被DoS banned ，且转发所有来自他们的交易(即便这些交易已经存在于mempool中)，常用于网关 </translation>
@@ -2043,6 +3312,10 @@
         <source>Error reading from database, shutting down.</source>
         <translation>读取数据库出错，关闭中。</translation>
     </message>
+    <message>
+        <source>Imports blocks from external blk000??.dat file on startup</source>
+        <translation>启动时从其他来源的  blk000??.dat 文件导入区块</translation>
+    </message>
     <message>
         <source>Information</source>
         <translation>信息</translation>
@@ -2071,6 +3344,10 @@
         <source>RPC server options:</source>
         <translation>RPC 服务器选项：</translation>
     </message>
+    <message>
+        <source>Reducing -maxconnections from %d to %d, because of system limitations.</source>
+        <translation>因为系统的限制，将 -maxconnections 参数从 %d 降到了 %d</translation>
+    </message>
     <message>
         <source>Rescan the block chain for missing wallet transactions on startup</source>
         <translation>重新扫描区块链以查找遗漏的钱包交易</translation>
@@ -2104,12 +3381,16 @@
         <translation>这是实验性的软件。</translation>
     </message>
     <message>
-        <source>Transaction amount too small</source>
-        <translation>交易量太小</translation>
+        <source>Tor control port password (default: empty)</source>
+        <translation>Tor 控制端口密码 (默认值: 空白)</translation>
     </message>
     <message>
-        <source>Transaction amounts must be positive</source>
-        <translation>交易金额必须是积极的</translation>
+        <source>Tor control port to use if onion listening enabled (default: %s)</source>
+        <translation>开启监听 onion 连接时的 Tor 控制端口号 (默认值: %s)</translation>
+    </message>
+    <message>
+        <source>Transaction amount too small</source>
+        <translation>交易量太小</translation>
     </message>
     <message>
         <source>Transaction too large for fee policy</source>
@@ -2135,13 +3416,17 @@
         <source>Warning</source>
         <translation>警告</translation>
     </message>
+    <message>
+        <source>Warning: unknown new rules activated (versionbit %i)</source>
+        <translation>警告: 不明的交易规则被启用了(versionbit %i)</translation>
+    </message>
     <message>
         <source>Whether to operate in a blocks only mode (default: %u)</source>
         <translation>是否用块方进行 (%u)</translation>
     </message>
     <message>
         <source>Zapping all transactions from wallet...</source>
-        <translation>Zapping all transactions from wallet...</translation>
+        <translation>正在消除錢包中的所有交易...</translation>
     </message>
     <message>
         <source>ZeroMQ notification options:</source>
@@ -2168,6 +3453,18 @@
         <source>(1 = keep tx meta data e.g. account owner and payment request information, 2 = drop tx meta data)</source>
         <translation>(1 = 保留 tx meta data , 如 account owner 和 payment request information, 2 = 不保留 tx meta data) </translation>
     </message>
+    <message>
+        <source>-maxtxfee is set very high! Fees this large could be paid on a single transaction.</source>
+        <translation>参数 -maxtxfee 设定了很高的金额！这是你一次交易就有可能付出的最高手续费。</translation>
+    </message>
+    <message>
+        <source>Do not keep transactions in the mempool longer than &lt;n&gt; hours (default: %u)</source>
+        <translation>不要让交易留在内存池中超过 &lt;n&gt; 个小时 (默认值: %u)</translation>
+    </message>
+    <message>
+        <source>Fees (in %s/kB) smaller than this are considered zero fee for transaction creation (default: %s)</source>
+        <translation>当产生交易时，如果每千字节 (kB) 的手续费比这个值 (单位是 %s) 低，就视为没支付手续费 (默认值: %s)</translation>
+    </message>
     <message>
         <source>How thorough the block verification of -checkblocks is (0-4, default: %u)</source>
         <translation>数据块验证 严密级别  -checkblocks (0-4, 默认: %u) </translation>
@@ -2184,10 +3481,22 @@
         <source>Output debugging information (default: %u, supplying &lt;category&gt; is optional)</source>
         <translation>输出调试信息 (默认: %u, 提供 &lt;category&gt; 是可选项)</translation>
     </message>
+    <message>
+        <source>Support filtering of blocks and transaction with bloom filters (default: %u)</source>
+        <translation>支持用 Bloom 过滤器来过滤区块和交易(默认值: %u)</translation>
+    </message>
+    <message>
+        <source>Total length of network version string (%i) exceeds maximum length (%i). Reduce the number or size of uacomments.</source>
+        <translation>网络版本字符串的总长度 (%i) 超过最大长度 (%i) 了。请减少 uacomment 参数的数目或长度。</translation>
+    </message>
     <message>
         <source>Tries to keep outbound traffic under the given target (in MiB per 24h), 0 = no limit (default: %d)</source>
         <translation>尝试保持上传带宽低于（MiB/24h），0=无限制（默认：%d）</translation>
     </message>
+    <message>
+        <source>Unsupported argument -socks found. Setting SOCKS version isn't possible anymore, only SOCKS5 proxies are supported.</source>
+        <translation>找到不再支持的 -socks 参数。现在只支持 SOCKS5 协议的代理服务器，因此不可以指定 SOCKS 协议版本。</translation>
+    </message>
     <message>
         <source>Unsupported argument -whitelistalwaysrelay ignored, use -whitelistrelay and/or -whitelistforcerelay.</source>
         <translation>一个不被支持的参数 -whitelistalwaysrelay 被忽略了。请使用 -whitelistrelay 或者 -whitelistforcerelay.</translation>
@@ -2196,6 +3505,10 @@
         <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: %s)</source>
         <translation>通过Tor隐藏服务连接节点时 使用不同的SOCKS5代理 (默认: %s)</translation>
     </message>
+    <message>
+        <source>Username and hashed password for JSON-RPC connections. The field &lt;userpw&gt; comes in the format: &lt;USERNAME&gt;:&lt;SALT&gt;$&lt;HASH&gt;. A canonical python script is included in share/rpcuser. This option can be specified multiple times</source>
+        <translation>JSON-RPC 连接要使用的用户名和散列密码。&lt;userpw&gt; 的格式是：&lt;用户名&gt;:&lt;盐&gt;$&lt;散列值&gt;。在 share/rpcuser 目录下有一个示范的 python 脚本。这个选项可以被多次指定。</translation>
+    </message>
     <message>
         <source>Warning: Unknown block versions being mined! It's possible unknown rules are in effect</source>
         <translation>警告: 未知的区块版本被挖掘！未知规则可能已生效</translation>
@@ -2260,10 +3573,6 @@
         <source>Set key pool size to &lt;n&gt; (default: %u)</source>
         <translation>设置私钥池大小为 &lt;n&gt; (默认：%u) </translation>
     </message>
-    <message>
-        <source>Set minimum block size in bytes (default: %u)</source>
-        <translation>设置数据块 最小字节数 (默认: %u) </translation>
-    </message>
     <message>
         <source>Set the number of threads to service RPC calls (default: %d)</source>
         <translation>设置RPC服务线程数 (默认: %d) </translation>
@@ -2284,6 +3593,10 @@
         <source>Spend unconfirmed change when sending transactions (default: %u)</source>
         <translation>付款时允许使用未确认的零钱 (默认: %u) </translation>
     </message>
+    <message>
+        <source>Starting network threads...</source>
+        <translation>正在启动网络线程...</translation>
+    </message>
     <message>
         <source>Threshold for disconnecting misbehaving peers (default: %u)</source>
         <translation>断开 非礼节点的阀值 (默认: %u) </translation>
@@ -2298,7 +3611,7 @@
     </message>
     <message>
         <source>Loading block index...</source>
-        <translation>正在加载数据块索引...</translation>
+        <translation>正在加载区块索引...</translation>
     </message>
     <message>
         <source>Add a node to connect to and attempt to keep the connection open</source>
diff --git a/src/qt/locale/bitcoin_zh_HK.ts b/src/qt/locale/bitcoin_zh_HK.ts
index aa014db0bd03e..2f3a8d1f1617f 100644
--- a/src/qt/locale/bitcoin_zh_HK.ts
+++ b/src/qt/locale/bitcoin_zh_HK.ts
@@ -41,7 +41,10 @@
         <source>&amp;Delete</source>
         <translation>刪除 &amp;D</translation>
     </message>
-</context>
+    </context>
+<context>
+    <name>AddressTableModel</name>
+    </context>
 <context>
     <name>AskPassphraseDialog</name>
     <message>
@@ -60,7 +63,7 @@
         <source>Repeat new passphrase</source>
         <translation>重複新密碼</translation>
     </message>
-</context>
+    </context>
 <context>
     <name>BanTableModel</name>
     <message>
@@ -214,6 +217,9 @@
 <context>
     <name>Intro</name>
     </context>
+<context>
+    <name>ModalOverlay</name>
+    </context>
 <context>
     <name>OpenURIDialog</name>
     </context>
@@ -223,12 +229,21 @@
 <context>
     <name>OverviewPage</name>
     </context>
+<context>
+    <name>PaymentServer</name>
+    </context>
 <context>
     <name>PeerTableModel</name>
     </context>
 <context>
     <name>QObject</name>
     </context>
+<context>
+    <name>QObject::QObject</name>
+    </context>
+<context>
+    <name>QRImageWidget</name>
+    </context>
 <context>
     <name>RPCConsole</name>
     </context>
@@ -238,12 +253,18 @@
 <context>
     <name>ReceiveRequestDialog</name>
     </context>
+<context>
+    <name>RecentRequestsTableModel</name>
+    </context>
 <context>
     <name>SendCoinsDialog</name>
     </context>
 <context>
     <name>SendCoinsEntry</name>
     </context>
+<context>
+    <name>SendConfirmationDialog</name>
+    </context>
 <context>
     <name>ShutdownWindow</name>
     </context>
@@ -256,12 +277,30 @@
 <context>
     <name>TrafficGraphWidget</name>
     </context>
+<context>
+    <name>TransactionDesc</name>
+    </context>
 <context>
     <name>TransactionDescDialog</name>
     </context>
+<context>
+    <name>TransactionTableModel</name>
+    </context>
+<context>
+    <name>TransactionView</name>
+    </context>
 <context>
     <name>UnitDisplayStatusBarControl</name>
     </context>
+<context>
+    <name>WalletFrame</name>
+    </context>
+<context>
+    <name>WalletModel</name>
+    </context>
+<context>
+    <name>WalletView</name>
+    </context>
 <context>
     <name>bitcoin-core</name>
     </context>
diff --git a/src/qt/locale/bitcoin_zh_TW.ts b/src/qt/locale/bitcoin_zh_TW.ts
index ab56f96795a50..44d596013b235 100644
--- a/src/qt/locale/bitcoin_zh_TW.ts
+++ b/src/qt/locale/bitcoin_zh_TW.ts
@@ -41,6 +41,77 @@
         <source>&amp;Delete</source>
         <translation>刪掉</translation>
     </message>
+    <message>
+        <source>Choose the address to send coins to</source>
+        <translation>選擇要付錢過去的位址</translation>
+    </message>
+    <message>
+        <source>Choose the address to receive coins with</source>
+        <translation>選擇要收錢進來的位址</translation>
+    </message>
+    <message>
+        <source>C&amp;hoose</source>
+        <translation>選取</translation>
+    </message>
+    <message>
+        <source>Sending addresses</source>
+        <translation>付款位址</translation>
+    </message>
+    <message>
+        <source>Receiving addresses</source>
+        <translation>收款位址</translation>
+    </message>
+    <message>
+        <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source>
+        <translation>這些是你要付款過去的 Bitcoin 位址。在付錢之前，務必要檢查金額和收款位址是否正確。</translation>
+    </message>
+    <message>
+        <source>These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source>
+        <translation>這些是你用來收款的 Bitcoin 位址。建議在每次交易時，都使用一個新的收款位址。</translation>
+    </message>
+    <message>
+        <source>&amp;Copy Address</source>
+        <translation>複製位址</translation>
+    </message>
+    <message>
+        <source>Copy &amp;Label</source>
+        <translation>複製標記</translation>
+    </message>
+    <message>
+        <source>&amp;Edit</source>
+        <translation>編輯</translation>
+    </message>
+    <message>
+        <source>Export Address List</source>
+        <translation>匯出位址清單</translation>
+    </message>
+    <message>
+        <source>Comma separated file (*.csv)</source>
+        <translation>逗點分隔資料檔(*.csv)</translation>
+    </message>
+    <message>
+        <source>Exporting Failed</source>
+        <translation>匯出失敗</translation>
+    </message>
+    <message>
+        <source>There was an error trying to save the address list to %1. Please try again.</source>
+        <translation>儲存位址列表到 %1 時發生錯誤。請重試一次。</translation>
+    </message>
+</context>
+<context>
+    <name>AddressTableModel</name>
+    <message>
+        <source>Label</source>
+        <translation>標記</translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation>位址</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(無標記)</translation>
+    </message>
 </context>
 <context>
     <name>AskPassphraseDialog</name>
@@ -60,6 +131,94 @@
         <source>Repeat new passphrase</source>
         <translation>重複新密碼</translation>
     </message>
+    <message>
+        <source>Enter the new passphrase to the wallet.&lt;br/&gt;Please use a passphrase of &lt;b&gt;ten or more random characters&lt;/b&gt;, or &lt;b&gt;eight or more words&lt;/b&gt;.</source>
+        <translation>輸入錢包的新密碼。&lt;br/&gt;密碼請用&lt;b&gt;10 個以上的隨機字元&lt;/b&gt;，或是&lt;b&gt;8 個以上的字詞&lt;/b&gt;。</translation>
+    </message>
+    <message>
+        <source>Encrypt wallet</source>
+        <translation>加密錢包</translation>
+    </message>
+    <message>
+        <source>This operation needs your wallet passphrase to unlock the wallet.</source>
+        <translation>這個動作需要你的錢包密碼來解鎖錢包。</translation>
+    </message>
+    <message>
+        <source>Unlock wallet</source>
+        <translation>解鎖錢包</translation>
+    </message>
+    <message>
+        <source>This operation needs your wallet passphrase to decrypt the wallet.</source>
+        <translation>這個動作需要你的錢包密碼來把錢包解密。</translation>
+    </message>
+    <message>
+        <source>Decrypt wallet</source>
+        <translation>解密錢包</translation>
+    </message>
+    <message>
+        <source>Change passphrase</source>
+        <translation>改變密碼</translation>
+    </message>
+    <message>
+        <source>Enter the old passphrase and new passphrase to the wallet.</source>
+        <translation>請輸入錢包的舊密碼和新密碼。</translation>
+    </message>
+    <message>
+        <source>Confirm wallet encryption</source>
+        <translation>確認錢包加密</translation>
+    </message>
+    <message>
+        <source>Warning: If you encrypt your wallet and lose your passphrase, you will &lt;b&gt;LOSE ALL OF YOUR BITCOINS&lt;/b&gt;!</source>
+        <translation>警告: 如果把錢包加密後又忘記密碼，你就會從此&lt;b&gt;失去其中所有的 Bitcoin 了&lt;/b&gt;！</translation>
+    </message>
+    <message>
+        <source>Are you sure you wish to encrypt your wallet?</source>
+        <translation>你確定要把錢包加密嗎？</translation>
+    </message>
+    <message>
+        <source>Wallet encrypted</source>
+        <translation>錢包已加密</translation>
+    </message>
+    <message>
+        <source>%1 will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source>
+        <translation>%1 現在要關閉，好完成加密程序。請注意，加密錢包不能完全防止入侵你的電腦的惡意程式偷取錢幣。</translation>
+    </message>
+    <message>
+        <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source>
+        <translation>重要: 請改用新產生有加密的錢包檔，來取代舊錢包檔的備份。為了安全性的理由，當你開始使用新的有加密的錢包後，舊錢包檔的備份就不能再使用了。</translation>
+    </message>
+    <message>
+        <source>Wallet encryption failed</source>
+        <translation>錢包加密失敗</translation>
+    </message>
+    <message>
+        <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
+        <translation>因為內部錯誤導致錢包加密失敗。你的錢包還是沒加密。</translation>
+    </message>
+    <message>
+        <source>The supplied passphrases do not match.</source>
+        <translation>提供的密碼不一樣。</translation>
+    </message>
+    <message>
+        <source>Wallet unlock failed</source>
+        <translation>錢包解鎖失敗</translation>
+    </message>
+    <message>
+        <source>The passphrase entered for the wallet decryption was incorrect.</source>
+        <translation>輸入要用來解密錢包的密碼不對。</translation>
+    </message>
+    <message>
+        <source>Wallet decryption failed</source>
+        <translation>錢包解密失敗</translation>
+    </message>
+    <message>
+        <source>Wallet passphrase was successfully changed.</source>
+        <translation>錢包密碼改成功了。</translation>
+    </message>
+    <message>
+        <source>Warning: The Caps Lock key is on!</source>
+        <translation>警告: 大寫字母鎖定作用中！</translation>
+    </message>
 </context>
 <context>
     <name>BanTableModel</name>
@@ -158,6 +317,18 @@
         <source>Open &amp;URI...</source>
         <translation>開啓 URI...</translation>
     </message>
+    <message>
+        <source>Click to disable network activity.</source>
+        <translation>按一下就會不使用網路。</translation>
+    </message>
+    <message>
+        <source>Network activity disabled.</source>
+        <translation>網路活動關閉了。</translation>
+    </message>
+    <message>
+        <source>Click to enable network activity again.</source>
+        <translation>按一下就又會使用網路。</translation>
+    </message>
     <message>
         <source>Reindexing blocks on disk...</source>
         <translation>正在為磁碟裡的區塊重建索引...</translation>
@@ -278,26 +449,6 @@
         <source>Processed %n block(s) of transaction history.</source>
         <translation><numerusform>已經處理了 %n 個區塊的交易紀錄。</numerusform></translation>
     </message>
-    <message numerus="yes">
-        <source>%n hour(s)</source>
-        <translation><numerusform>%n 個小時</numerusform></translation>
-    </message>
-    <message numerus="yes">
-        <source>%n day(s)</source>
-        <translation><numerusform>%n 天</numerusform></translation>
-    </message>
-    <message numerus="yes">
-        <source>%n week(s)</source>
-        <translation><numerusform>%n 個星期</numerusform></translation>
-    </message>
-    <message>
-        <source>%1 and %2</source>
-        <translation>%1又 %2</translation>
-    </message>
-    <message numerus="yes">
-        <source>%n year(s)</source>
-        <translation><numerusform>%n 年</numerusform></translation>
-    </message>
     <message>
         <source>%1 behind</source>
         <translation>落後 %1</translation>
@@ -376,6 +527,14 @@
         <source>Incoming transaction</source>
         <translation>收款交易</translation>
     </message>
+    <message>
+        <source>HD key generation is &lt;b&gt;enabled&lt;/b&gt;</source>
+        <translation>產生 HD 金鑰&lt;b&gt;已經啟用&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <source>HD key generation is &lt;b&gt;disabled&lt;/b&gt;</source>
+        <translation>產生 HD 金鑰&lt;b&gt;已經停用&lt;/b&gt;</translation>
+    </message>
     <message>
         <source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;unlocked&lt;/b&gt;</source>
         <translation>錢包&lt;b&gt;已加密&lt;/b&gt;並且&lt;b&gt;解鎖中&lt;/b&gt;</translation>
@@ -384,6 +543,10 @@
         <source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;locked&lt;/b&gt;</source>
         <translation>錢包&lt;b&gt;已加密&lt;/b&gt;並且&lt;b&gt;上鎖中&lt;/b&gt;</translation>
     </message>
+    <message>
+        <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source>
+        <translation>發生了致命的錯誤。Bitcoin 軟體沒辦法再繼續安全執行，只好結束。</translation>
+    </message>
 </context>
 <context>
     <name>CoinControlDialog</name>
@@ -403,10 +566,6 @@
         <source>Amount:</source>
         <translation>金額:</translation>
     </message>
-    <message>
-        <source>Priority:</source>
-        <translation>優先度:</translation>
-    </message>
     <message>
         <source>Fee:</source>
         <translation>手續費:</translation>
@@ -460,8 +619,84 @@
         <translation>已確認</translation>
     </message>
     <message>
-        <source>Priority</source>
-        <translation>優先度</translation>
+        <source>Copy address</source>
+        <translation>複製位址</translation>
+    </message>
+    <message>
+        <source>Copy label</source>
+        <translation>複製標記</translation>
+    </message>
+    <message>
+        <source>Copy amount</source>
+        <translation>複製金額</translation>
+    </message>
+    <message>
+        <source>Copy transaction ID</source>
+        <translation>複製交易識別碼</translation>
+    </message>
+    <message>
+        <source>Lock unspent</source>
+        <translation>鎖定不用</translation>
+    </message>
+    <message>
+        <source>Unlock unspent</source>
+        <translation>解鎖可用</translation>
+    </message>
+    <message>
+        <source>Copy quantity</source>
+        <translation>複製數目</translation>
+    </message>
+    <message>
+        <source>Copy fee</source>
+        <translation>複製手續費</translation>
+    </message>
+    <message>
+        <source>Copy after fee</source>
+        <translation>複製計費後金額</translation>
+    </message>
+    <message>
+        <source>Copy bytes</source>
+        <translation>複製位元組數</translation>
+    </message>
+    <message>
+        <source>Copy dust</source>
+        <translation>複製零散金額</translation>
+    </message>
+    <message>
+        <source>Copy change</source>
+        <translation>複製找零金額</translation>
+    </message>
+    <message>
+        <source>(%1 locked)</source>
+        <translation>(鎖定 %1 枚)</translation>
+    </message>
+    <message>
+        <source>yes</source>
+        <translation>是</translation>
+    </message>
+    <message>
+        <source>no</source>
+        <translation>否</translation>
+    </message>
+    <message>
+        <source>This label turns red if any recipient receives an amount smaller than the current dust threshold.</source>
+        <translation>當任何一個收款金額小於目前的零散金額上限時，文字會變紅色。</translation>
+    </message>
+    <message>
+        <source>Can vary +/- %1 satoshi(s) per input.</source>
+        <translation>每組輸入可能有 +/- %1 個 satoshi 的誤差。</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(無標記)</translation>
+    </message>
+    <message>
+        <source>change from %1 (%2)</source>
+        <translation>找零前是 %1 (%2)</translation>
+    </message>
+    <message>
+        <source>(change)</source>
+        <translation>(找零)</translation>
     </message>
 </context>
 <context>
@@ -486,6 +721,38 @@
         <source>&amp;Address</source>
         <translation>位址</translation>
     </message>
+    <message>
+        <source>New receiving address</source>
+        <translation>造新的收款位址</translation>
+    </message>
+    <message>
+        <source>New sending address</source>
+        <translation>造新的付款位址</translation>
+    </message>
+    <message>
+        <source>Edit receiving address</source>
+        <translation>編輯收款位址</translation>
+    </message>
+    <message>
+        <source>Edit sending address</source>
+        <translation>編輯付款位址</translation>
+    </message>
+    <message>
+        <source>The entered address "%1" is not a valid Bitcoin address.</source>
+        <translation>輸入的位址 %1 並不是有效的 Bitcoin 位址。</translation>
+    </message>
+    <message>
+        <source>The entered address "%1" is already in the address book.</source>
+        <translation>輸入的位址 %1 在位址簿中已經有了。</translation>
+    </message>
+    <message>
+        <source>Could not unlock wallet.</source>
+        <translation>沒辦法把錢包解鎖。</translation>
+    </message>
+    <message>
+        <source>New key generation failed.</source>
+        <translation>產生新的密鑰失敗了。</translation>
+    </message>
 </context>
 <context>
     <name>FreespaceChecker</name>
@@ -608,6 +875,57 @@
         <translation><numerusform>(需要 %n GB)</numerusform></translation>
     </message>
 </context>
+<context>
+    <name>ModalOverlay</name>
+    <message>
+        <source>Form</source>
+        <translation>表單</translation>
+    </message>
+    <message>
+        <source>Recent transactions may not yet be visible, and therefore your wallet's balance might be incorrect. This information will be correct once your wallet has finished synchronizing with the bitcoin network, as detailed below.</source>
+        <translation>最近的交易可能還看不到，因此錢包餘額可能不正確。在錢包軟體完成跟 bitcoin 網路的同步後，這裡的資訊就會正確。詳情請見下面。</translation>
+    </message>
+    <message>
+        <source>Attempting to spend bitcoins that are affected by not-yet-displayed transactions will not be accepted by the network.</source>
+        <translation>使用還沒顯示出來的交易所影響到的 bitcoin 可能會不被網路所接受。</translation>
+    </message>
+    <message>
+        <source>Number of blocks left</source>
+        <translation>剩餘區塊數</translation>
+    </message>
+    <message>
+        <source>Unknown...</source>
+        <translation>不明...</translation>
+    </message>
+    <message>
+        <source>Last block time</source>
+        <translation>最近區塊時間</translation>
+    </message>
+    <message>
+        <source>Progress</source>
+        <translation>進度</translation>
+    </message>
+    <message>
+        <source>Progress increase per hour</source>
+        <translation>每小時進度</translation>
+    </message>
+    <message>
+        <source>calculating...</source>
+        <translation>正在計算中...</translation>
+    </message>
+    <message>
+        <source>Estimated time left until synced</source>
+        <translation>預估完成同步所需時間</translation>
+    </message>
+    <message>
+        <source>Hide</source>
+        <translation>隱藏</translation>
+    </message>
+    <message>
+        <source>Unknown. Syncing Headers (%1)...</source>
+        <translation>不明。正在同步前導資料(%1)中...</translation>
+    </message>
+</context>
 <context>
     <name>OpenURIDialog</name>
     <message>
@@ -626,6 +944,10 @@
         <source>Select payment request file</source>
         <translation>選擇付款要求資料檔</translation>
     </message>
+    <message>
+        <source>Select payment request file to open</source>
+        <translation>選擇要開啟的付款要求資料檔</translation>
+    </message>
 </context>
 <context>
     <name>OptionsDialog</name>
@@ -938,96 +1260,257 @@
     </message>
 </context>
 <context>
-    <name>PeerTableModel</name>
+    <name>PaymentServer</name>
     <message>
-        <source>User Agent</source>
-        <translation>使用者代理</translation>
+        <source>Payment request error</source>
+        <translation>要求付款時發生錯誤</translation>
     </message>
     <message>
-        <source>Node/Service</source>
-        <translation>節點/服務</translation>
+        <source>Cannot start bitcoin: click-to-pay handler</source>
+        <translation>沒辦法啟動 bitcoin 協議的「按就付」處理器</translation>
     </message>
     <message>
-        <source>Ping Time</source>
-        <translation>Ping 時間</translation>
+        <source>URI handling</source>
+        <translation>URI 處理</translation>
     </message>
-</context>
-<context>
-    <name>QObject</name>
     <message>
-        <source>Amount</source>
-        <translation>金額</translation>
+        <source>Payment request fetch URL is invalid: %1</source>
+        <translation>取得付款要求的 URL 無效: %1</translation>
     </message>
     <message>
-        <source>Enter a Bitcoin address (e.g. %1)</source>
-        <translation>輸入 Bitcoin 位址 (比如說 %1)</translation>
+        <source>Invalid payment address %1</source>
+        <translation>無效的付款位址 %1</translation>
     </message>
     <message>
-        <source>%1 d</source>
-        <translation>%1 天</translation>
+        <source>URI cannot be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source>
+        <translation>沒辦法解析 URI 位址！可能是因為 Bitcoin 位址無效，或是 URI 參數格式錯誤。</translation>
     </message>
     <message>
-        <source>%1 h</source>
-        <translation>%1 小時</translation>
+        <source>Payment request file handling</source>
+        <translation>處理付款要求檔案</translation>
     </message>
     <message>
-        <source>%1 m</source>
-        <translation>%1 分鐘</translation>
+        <source>Payment request file cannot be read! This can be caused by an invalid payment request file.</source>
+        <translation>沒辦法讀取付款要求檔案！可能是無效的檔案造成的。</translation>
     </message>
     <message>
-        <source>%1 s</source>
-        <translation>%1 秒</translation>
+        <source>Payment request rejected</source>
+        <translation>付款的要求被拒絕了</translation>
     </message>
     <message>
-        <source>None</source>
-        <translation>無</translation>
+        <source>Payment request network doesn't match client network.</source>
+        <translation>付款要求的網路類型跟客戶端不符。</translation>
     </message>
     <message>
-        <source>N/A</source>
-        <translation>未知</translation>
+        <source>Payment request expired.</source>
+        <translation>付款的要求過期了。</translation>
     </message>
     <message>
-        <source>%1 ms</source>
-        <translation>%1 毫秒</translation>
+        <source>Payment request is not initialized.</source>
+        <translation>付款的要求沒有完成初始化。</translation>
     </message>
-</context>
-<context>
-    <name>RPCConsole</name>
     <message>
-        <source>N/A</source>
-        <translation>未知</translation>
+        <source>Unverified payment requests to custom payment scripts are unsupported.</source>
+        <translation>不支援含有自訂付款指令碼，且沒驗證過的付款要求。</translation>
     </message>
     <message>
-        <source>Client version</source>
-        <translation>客戶端軟體版本</translation>
+        <source>Invalid payment request.</source>
+        <translation>付款的要求無效。</translation>
     </message>
     <message>
-        <source>&amp;Information</source>
-        <translation>資訊</translation>
+        <source>Requested payment amount of %1 is too small (considered dust).</source>
+        <translation>要求付款的金額 %1 太少(會被網路認為是沒必要的零散錢)。</translation>
     </message>
     <message>
-        <source>Debug window</source>
-        <translation>除錯視窗</translation>
+        <source>Refund from %1</source>
+        <translation>來自 %1 的退款</translation>
     </message>
     <message>
-        <source>General</source>
-        <translation>普通</translation>
+        <source>Payment request %1 is too large (%2 bytes, allowed %3 bytes).</source>
+        <translation>付款要求 %1 過大 (%2 位元組, 上限 %3 位元組).</translation>
     </message>
     <message>
-        <source>Using BerkeleyDB version</source>
-        <translation>使用 BerkeleyDB 版本</translation>
+        <source>Error communicating with %1: %2</source>
+        <translation>跟 %1 通訊時發生錯誤: %2</translation>
     </message>
     <message>
-        <source>Datadir</source>
-        <translation>資料目錄</translation>
+        <source>Payment request cannot be parsed!</source>
+        <translation>沒辦法解析付款要求內容！</translation>
     </message>
     <message>
-        <source>Startup time</source>
-        <translation>啓動時間</translation>
+        <source>Bad response from server %1</source>
+        <translation>伺服器 %1 的回應有誤</translation>
     </message>
     <message>
-        <source>Network</source>
-        <translation>網路</translation>
+        <source>Network request error</source>
+        <translation>發出要求時發生網路錯誤</translation>
+    </message>
+    <message>
+        <source>Payment acknowledged</source>
+        <translation>付款已確認</translation>
+    </message>
+</context>
+<context>
+    <name>PeerTableModel</name>
+    <message>
+        <source>User Agent</source>
+        <translation>使用者代理</translation>
+    </message>
+    <message>
+        <source>Node/Service</source>
+        <translation>節點/服務</translation>
+    </message>
+    <message>
+        <source>NodeId</source>
+        <translation>節點識別碼</translation>
+    </message>
+    <message>
+        <source>Ping</source>
+        <translation>Ping  時間</translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Amount</source>
+        <translation>金額</translation>
+    </message>
+    <message>
+        <source>Enter a Bitcoin address (e.g. %1)</source>
+        <translation>輸入 Bitcoin 位址 (比如說 %1)</translation>
+    </message>
+    <message>
+        <source>%1 d</source>
+        <translation>%1 天</translation>
+    </message>
+    <message>
+        <source>%1 h</source>
+        <translation>%1 小時</translation>
+    </message>
+    <message>
+        <source>%1 m</source>
+        <translation>%1 分鐘</translation>
+    </message>
+    <message>
+        <source>%1 s</source>
+        <translation>%1 秒</translation>
+    </message>
+    <message>
+        <source>None</source>
+        <translation>無</translation>
+    </message>
+    <message>
+        <source>N/A</source>
+        <translation>未知</translation>
+    </message>
+    <message>
+        <source>%1 ms</source>
+        <translation>%1 毫秒</translation>
+    </message>
+    <message numerus="yes">
+        <source>%n second(s)</source>
+        <translation><numerusform>%n 秒鐘</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%n minute(s)</source>
+        <translation><numerusform>%n 分鐘</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%n hour(s)</source>
+        <translation><numerusform>%n 小時</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%n day(s)</source>
+        <translation><numerusform>%n 天</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%n week(s)</source>
+        <translation><numerusform>%n 星期</numerusform></translation>
+    </message>
+    <message>
+        <source>%1 and %2</source>
+        <translation>%1又 %2</translation>
+    </message>
+    <message numerus="yes">
+        <source>%n year(s)</source>
+        <translation><numerusform>%n 年</numerusform></translation>
+    </message>
+    <message>
+        <source>%1 didn't yet exit safely...</source>
+        <translation>%1 還沒有安全地結束...</translation>
+    </message>
+</context>
+<context>
+    <name>QObject::QObject</name>
+    <message>
+        <source>Error: Specified data directory "%1" does not exist.</source>
+        <translation>錯誤: 不存在指定的資料目錄 "%1" 。</translation>
+    </message>
+    <message>
+        <source>Error: Cannot parse configuration file: %1. Only use key=value syntax.</source>
+        <translation>錯誤: 沒辦法解析設定檔: %1。只能用「名稱=設定值」這種語法。</translation>
+    </message>
+    <message>
+        <source>Error: %1</source>
+        <translation>錯誤: %1</translation>
+    </message>
+</context>
+<context>
+    <name>QRImageWidget</name>
+    <message>
+        <source>&amp;Save Image...</source>
+        <translation>儲存圖片...</translation>
+    </message>
+    <message>
+        <source>&amp;Copy Image</source>
+        <translation>複製圖片</translation>
+    </message>
+    <message>
+        <source>Save QR Code</source>
+        <translation>儲存 QR Code</translation>
+    </message>
+    <message>
+        <source>PNG Image (*.png)</source>
+        <translation>PNG 圖檔(*.png)</translation>
+    </message>
+</context>
+<context>
+    <name>RPCConsole</name>
+    <message>
+        <source>N/A</source>
+        <translation>未知</translation>
+    </message>
+    <message>
+        <source>Client version</source>
+        <translation>客戶端軟體版本</translation>
+    </message>
+    <message>
+        <source>&amp;Information</source>
+        <translation>資訊</translation>
+    </message>
+    <message>
+        <source>Debug window</source>
+        <translation>除錯視窗</translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>普通</translation>
+    </message>
+    <message>
+        <source>Using BerkeleyDB version</source>
+        <translation>使用 BerkeleyDB 版本</translation>
+    </message>
+    <message>
+        <source>Datadir</source>
+        <translation>資料目錄</translation>
+    </message>
+    <message>
+        <source>Startup time</source>
+        <translation>啓動時間</translation>
+    </message>
+    <message>
+        <source>Network</source>
+        <translation>網路</translation>
     </message>
     <message>
         <source>Name</source>
@@ -1149,6 +1632,10 @@
         <source>Ping Wait</source>
         <translation>Ping 等待時間</translation>
     </message>
+    <message>
+        <source>Min Ping</source>
+        <translation>Ping 最短時間</translation>
+    </message>
     <message>
         <source>Time Offset</source>
         <translation>時間差</translation>
@@ -1193,14 +1680,6 @@
         <source>Clear console</source>
         <translation>清主控台</translation>
     </message>
-    <message>
-        <source>&amp;Disconnect Node</source>
-        <translation>跟節點斷線</translation>
-    </message>
-    <message>
-        <source>Ban Node for</source>
-        <translation>禁止節點連線:</translation>
-    </message>
     <message>
         <source>1 &amp;hour</source>
         <translation>1 小時</translation>
@@ -1218,8 +1697,16 @@
         <translation>1 年</translation>
     </message>
     <message>
-        <source>&amp;Unban Node</source>
-        <translation>解禁節點連線</translation>
+        <source>&amp;Disconnect</source>
+        <translation>斷線</translation>
+    </message>
+    <message>
+        <source>Ban for</source>
+        <translation>禁止連線</translation>
+    </message>
+    <message>
+        <source>&amp;Unban</source>
+        <translation>連線解禁</translation>
     </message>
     <message>
         <source>Welcome to the %1 RPC console.</source>
@@ -1233,6 +1720,14 @@
         <source>Type &lt;b&gt;help&lt;/b&gt; for an overview of available commands.</source>
         <translation>請打 &lt;b&gt;help&lt;/b&gt; 來看可用指令的簡介。</translation>
     </message>
+    <message>
+        <source>WARNING: Scammers have been active, telling users to type commands here, stealing their wallet contents. Do not use this console without fully understanding the ramification of a command.</source>
+        <translation>警告:  已知有詐騙集團會叫人在這個畫面輸入指令，以偷取他們錢包的內容物。請不要在沒有充分理解指令可能造成後果的情況下使用主控台。</translation>
+    </message>
+    <message>
+        <source>Network activity disabled</source>
+        <translation>網路活動已關閉</translation>
+    </message>
     <message>
         <source>%1 B</source>
         <translation>%1 B (位元組)</translation>
@@ -1352,6 +1847,22 @@
         <source>Remove</source>
         <translation>刪掉</translation>
     </message>
+    <message>
+        <source>Copy URI</source>
+        <translation>複製 URI</translation>
+    </message>
+    <message>
+        <source>Copy label</source>
+        <translation>複製標記</translation>
+    </message>
+    <message>
+        <source>Copy message</source>
+        <translation>複製訊息</translation>
+    </message>
+    <message>
+        <source>Copy amount</source>
+        <translation>複製金額</translation>
+    </message>
 </context>
 <context>
     <name>ReceiveRequestDialog</name>
@@ -1371,6 +1882,73 @@
         <source>&amp;Save Image...</source>
         <translation>儲存圖片...</translation>
     </message>
+    <message>
+        <source>Request payment to %1</source>
+        <translation>付款給 %1 的要求</translation>
+    </message>
+    <message>
+        <source>Payment information</source>
+        <translation>付款資訊</translation>
+    </message>
+    <message>
+        <source>URI</source>
+        <translation>URI</translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation>位址</translation>
+    </message>
+    <message>
+        <source>Amount</source>
+        <translation>金額</translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation>標記:</translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation>訊息</translation>
+    </message>
+    <message>
+        <source>Resulting URI too long, try to reduce the text for label / message.</source>
+        <translation>產生的 URI 過長，請試著縮短標記或訊息的文字內容。</translation>
+    </message>
+    <message>
+        <source>Error encoding URI into QR Code.</source>
+        <translation>把 URI 編碼成 QR Code 時發生錯誤。</translation>
+    </message>
+</context>
+<context>
+    <name>RecentRequestsTableModel</name>
+    <message>
+        <source>Date</source>
+        <translation>日期</translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation>標記:</translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation>訊息</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(無標記)</translation>
+    </message>
+    <message>
+        <source>(no message)</source>
+        <translation>(無訊息)</translation>
+    </message>
+    <message>
+        <source>(no amount requested)</source>
+        <translation>(無要求金額)</translation>
+    </message>
+    <message>
+        <source>Requested</source>
+        <translation>要求金額</translation>
+    </message>
 </context>
 <context>
     <name>SendCoinsDialog</name>
@@ -1406,10 +1984,6 @@
         <source>Amount:</source>
         <translation>金額:</translation>
     </message>
-    <message>
-        <source>Priority:</source>
-        <translation>優先度:</translation>
-    </message>
     <message>
         <source>Fee:</source>
         <translation>手續費:</translation>
@@ -1439,293 +2013,962 @@
         <translation>選項...</translation>
     </message>
     <message>
-        <source>collapse fee-settings</source>
-        <translation>展開手續費設定</translation>
+        <source>collapse fee-settings</source>
+        <translation>展開手續費設定</translation>
+    </message>
+    <message>
+        <source>per kilobyte</source>
+        <translation>每千位元組</translation>
+    </message>
+    <message>
+        <source>If the custom fee is set to 1000 satoshis and the transaction is only 250 bytes, then "per kilobyte" only pays 250 satoshis in fee, while "total at least" pays 1000 satoshis. For transactions bigger than a kilobyte both pay by kilobyte.</source>
+        <translation>如果自訂手續費設定為 1000 satoshi, 而交易資料大小只有 250 個位元組的話，那麽選擇「每千位元組」就只會付 250 satoshi 的手續費，換做選「總共至少」就會付 1000 satoshi. 但是如果交易資料大小超過一千個位元組，那麽兩者都是每千位元組的費用。</translation>
+    </message>
+    <message>
+        <source>Hide</source>
+        <translation>隱藏</translation>
+    </message>
+    <message>
+        <source>total at least</source>
+        <translation>總共最少</translation>
+    </message>
+    <message>
+        <source>Paying only the minimum fee is just fine as long as there is less transaction volume than space in the blocks. But be aware that this can end up in a never confirming transaction once there is more demand for bitcoin transactions than the network can process.</source>
+        <translation>當交易量少於區塊可容納的空間時，只付最低手續費不會有什麽問題。但是當交易量的需求成長到超過整體網路可以處理的量時，可能會造成一筆一直不會被確認的交易。</translation>
+    </message>
+    <message>
+        <source>(read the tooltip)</source>
+        <translation>(請看提示)</translation>
+    </message>
+    <message>
+        <source>Recommended:</source>
+        <translation>建議值:</translation>
+    </message>
+    <message>
+        <source>Custom:</source>
+        <translation>自訂:</translation>
+    </message>
+    <message>
+        <source>(Smart fee not initialized yet. This usually takes a few blocks...)</source>
+        <translation>(手續費智慧演算法還沒準備好。通常都要等幾個區塊才行...)</translation>
+    </message>
+    <message>
+        <source>normal</source>
+        <translation>正常</translation>
+    </message>
+    <message>
+        <source>fast</source>
+        <translation>快速</translation>
+    </message>
+    <message>
+        <source>Send to multiple recipients at once</source>
+        <translation>一次付給多個收款人</translation>
+    </message>
+    <message>
+        <source>Add &amp;Recipient</source>
+        <translation>增加收款人</translation>
+    </message>
+    <message>
+        <source>Clear all fields of the form.</source>
+        <translation>把表單中的所有欄位清空。</translation>
+    </message>
+    <message>
+        <source>Dust:</source>
+        <translation>零散錢:</translation>
+    </message>
+    <message>
+        <source>Confirmation time target:</source>
+        <translation>目標確認時間:</translation>
+    </message>
+    <message>
+        <source>Clear &amp;All</source>
+        <translation>全部清掉</translation>
+    </message>
+    <message>
+        <source>Balance:</source>
+        <translation>餘額:</translation>
+    </message>
+    <message>
+        <source>Confirm the send action</source>
+        <translation>確認付款動作</translation>
+    </message>
+    <message>
+        <source>S&amp;end</source>
+        <translation>付款</translation>
+    </message>
+    <message>
+        <source>Copy quantity</source>
+        <translation>複製數目</translation>
+    </message>
+    <message>
+        <source>Copy amount</source>
+        <translation>複製金額</translation>
+    </message>
+    <message>
+        <source>Copy fee</source>
+        <translation>複製手續費</translation>
+    </message>
+    <message>
+        <source>Copy after fee</source>
+        <translation>複製計費後金額</translation>
+    </message>
+    <message>
+        <source>Copy bytes</source>
+        <translation>複製位元組數</translation>
+    </message>
+    <message>
+        <source>Copy dust</source>
+        <translation>複製零散金額</translation>
+    </message>
+    <message>
+        <source>Copy change</source>
+        <translation>複製找零金額</translation>
+    </message>
+    <message>
+        <source>%1 to %2</source>
+        <translation>%1 給 %2</translation>
+    </message>
+    <message>
+        <source>Are you sure you want to send?</source>
+        <translation>你確定要付錢出去嗎？</translation>
+    </message>
+    <message>
+        <source>added as transaction fee</source>
+        <translation>加做交易手續費</translation>
+    </message>
+    <message>
+        <source>Total Amount %1</source>
+        <translation>總金額 %1</translation>
+    </message>
+    <message>
+        <source>or</source>
+        <translation>或</translation>
+    </message>
+    <message>
+        <source>Confirm send coins</source>
+        <translation>確認付款金額</translation>
+    </message>
+    <message>
+        <source>The recipient address is not valid. Please recheck.</source>
+        <translation>收款位址無效。請再檢查看看。</translation>
+    </message>
+    <message>
+        <source>The amount to pay must be larger than 0.</source>
+        <translation>付款金額必須大於零。</translation>
+    </message>
+    <message>
+        <source>The amount exceeds your balance.</source>
+        <translation>金額超過餘額了。</translation>
+    </message>
+    <message>
+        <source>The total exceeds your balance when the %1 transaction fee is included.</source>
+        <translation>包含 %1 的交易手續費後，總金額超過你的餘額了。</translation>
+    </message>
+    <message>
+        <source>Duplicate address found: addresses should only be used once each.</source>
+        <translation>發現有重複的位址: 每個位址只能出現一次。</translation>
+    </message>
+    <message>
+        <source>Transaction creation failed!</source>
+        <translation>製造交易失敗了！</translation>
+    </message>
+    <message>
+        <source>The transaction was rejected with the following reason: %1</source>
+        <translation>交易因為以下原因被拒絕了: %1</translation>
+    </message>
+    <message>
+        <source>A fee higher than %1 is considered an absurdly high fee.</source>
+        <translation>高於 %1 的手續費會被認為是不合理。</translation>
+    </message>
+    <message>
+        <source>Payment request expired.</source>
+        <translation>付款的要求過期了。</translation>
+    </message>
+    <message numerus="yes">
+        <source>%n block(s)</source>
+        <translation><numerusform>%n 個區塊</numerusform></translation>
+    </message>
+    <message>
+        <source>Pay only the required fee of %1</source>
+        <translation>只付必要的手續費 %1</translation>
+    </message>
+    <message>
+        <source>Warning: Invalid Bitcoin address</source>
+        <translation>警告: Bitcoin 位址無效</translation>
+    </message>
+    <message>
+        <source>Warning: Unknown change address</source>
+        <translation>警告: 不明的找零位址</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(無標記)</translation>
+    </message>
+</context>
+<context>
+    <name>SendCoinsEntry</name>
+    <message>
+        <source>A&amp;mount:</source>
+        <translation>金額:</translation>
+    </message>
+    <message>
+        <source>Pay &amp;To:</source>
+        <translation>付給:</translation>
+    </message>
+    <message>
+        <source>&amp;Label:</source>
+        <translation>標記:</translation>
+    </message>
+    <message>
+        <source>Choose previously used address</source>
+        <translation>選擇先前使用過的位址</translation>
+    </message>
+    <message>
+        <source>This is a normal payment.</source>
+        <translation>這是一筆正常的付款。</translation>
+    </message>
+    <message>
+        <source>The Bitcoin address to send the payment to</source>
+        <translation>接收付款的 Bitcoin 位址</translation>
+    </message>
+    <message>
+        <source>Alt+A</source>
+        <translation>Alt+A</translation>
+    </message>
+    <message>
+        <source>Paste address from clipboard</source>
+        <translation>貼上剪貼簿裡的位址</translation>
+    </message>
+    <message>
+        <source>Alt+P</source>
+        <translation>Alt+P</translation>
+    </message>
+    <message>
+        <source>Remove this entry</source>
+        <translation>刪掉這個項目</translation>
+    </message>
+    <message>
+        <source>The fee will be deducted from the amount being sent. The recipient will receive less bitcoins than you enter in the amount field. If multiple recipients are selected, the fee is split equally.</source>
+        <translation>手續費會從要付款出去的金額中扣掉。因此收款人會收到比輸入的金額還要少的 bitcoin。如果有多個收款人的話，手續費會平均分配來扣除。</translation>
+    </message>
+    <message>
+        <source>S&amp;ubtract fee from amount</source>
+        <translation>從付款金額減去手續費</translation>
+    </message>
+    <message>
+        <source>Message:</source>
+        <translation>訊息:</translation>
+    </message>
+    <message>
+        <source>This is an unauthenticated payment request.</source>
+        <translation>這是個沒有驗證過身份的付款要求。</translation>
+    </message>
+    <message>
+        <source>This is an authenticated payment request.</source>
+        <translation>這是個已經驗證過身份的付款要求。</translation>
+    </message>
+    <message>
+        <source>Enter a label for this address to add it to the list of used addresses</source>
+        <translation>請輸入這個位址的標記，來把它加進去已使用過位址的清單。</translation>
+    </message>
+    <message>
+        <source>A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
+        <translation>附加在 Bitcoin 付款協議的資源識別碼(URI)中的訊息，會和交易內容一起存起來，給你自己做參考。注意: 這個訊息不會送到 Bitcoin 網路上。</translation>
+    </message>
+    <message>
+        <source>Pay To:</source>
+        <translation>付給:</translation>
+    </message>
+    <message>
+        <source>Memo:</source>
+        <translation>備註:</translation>
+    </message>
+    <message>
+        <source>Enter a label for this address to add it to your address book</source>
+        <translation>請輸入這個位址的標記來把它加進位址簿中</translation>
+    </message>
+</context>
+<context>
+    <name>SendConfirmationDialog</name>
+    <message>
+        <source>Yes</source>
+        <translation>是</translation>
+    </message>
+</context>
+<context>
+    <name>ShutdownWindow</name>
+    <message>
+        <source>%1 is shutting down...</source>
+        <translation>正在關閉 %1 中...</translation>
+    </message>
+    <message>
+        <source>Do not shut down the computer until this window disappears.</source>
+        <translation> 在這個視窗不見以前，請不要關掉電腦。</translation>
+    </message>
+</context>
+<context>
+    <name>SignVerifyMessageDialog</name>
+    <message>
+        <source>Signatures - Sign / Verify a Message</source>
+        <translation>簽章 - 簽署或驗證訊息</translation>
+    </message>
+    <message>
+        <source>&amp;Sign Message</source>
+        <translation>簽署訊息</translation>
+    </message>
+    <message>
+        <source>You can sign messages/agreements with your addresses to prove you can receive bitcoins sent to them. Be careful not to sign anything vague or random, as phishing attacks may try to trick you into signing your identity over to them. Only sign fully-detailed statements you agree to.</source>
+        <translation>你可以用自己的位址簽署訊息或合約，來證明你可以從該位址收款。但是請小心，不要簽署語意含糊不清，或隨機產生的內容，因為釣魚式詐騙可能會用騙你簽署的手法來冒充是你。只有在語句中的細節你都同意時才簽署。</translation>
+    </message>
+    <message>
+        <source>The Bitcoin address to sign the message with</source>
+        <translation>用來簽署訊息的 Bitcoin 位址</translation>
+    </message>
+    <message>
+        <source>Choose previously used address</source>
+        <translation>選擇先前使用過的位址</translation>
+    </message>
+    <message>
+        <source>Alt+A</source>
+        <translation>Alt+A</translation>
+    </message>
+    <message>
+        <source>Paste address from clipboard</source>
+        <translation>貼上剪貼簿裡的位址</translation>
+    </message>
+    <message>
+        <source>Alt+P</source>
+        <translation>Alt+P</translation>
+    </message>
+    <message>
+        <source>Enter the message you want to sign here</source>
+        <translation>請在這裡輸入你想簽署的訊息</translation>
+    </message>
+    <message>
+        <source>Signature</source>
+        <translation>簽章</translation>
+    </message>
+    <message>
+        <source>Copy the current signature to the system clipboard</source>
+        <translation>複製目前的簽章到系統剪貼簿</translation>
+    </message>
+    <message>
+        <source>Sign the message to prove you own this Bitcoin address</source>
+        <translation>簽署這個訊息來證明這個 Bitcoin 位址是你的</translation>
+    </message>
+    <message>
+        <source>Sign &amp;Message</source>
+        <translation>簽署訊息</translation>
+    </message>
+    <message>
+        <source>Reset all sign message fields</source>
+        <translation>重設所有訊息簽署欄位</translation>
+    </message>
+    <message>
+        <source>Clear &amp;All</source>
+        <translation>全部清掉</translation>
+    </message>
+    <message>
+        <source>&amp;Verify Message</source>
+        <translation>驗證訊息</translation>
+    </message>
+    <message>
+        <source>Enter the receiver's address, message (ensure you copy line breaks, spaces, tabs, etc. exactly) and signature below to verify the message. Be careful not to read more into the signature than what is in the signed message itself, to avoid being tricked by a man-in-the-middle attack. Note that this only proves the signing party receives with the address, it cannot prove sendership of any transaction!</source>
+        <translation>請在下面輸入收款人的位址，訊息(請確定完整複製了所包含的換行，空格，跳位符號等等)，以及簽章，來驗證這個訊息。請小心，除了訊息內容以外，不要對簽章本身過度解讀，以避免被用「中間人攻擊法」詐騙。請注意，通過驗證的簽章只能證明簽章人確實可以從該位址收款，不能證明任何交易中的付款人身份！</translation>
+    </message>
+    <message>
+        <source>The Bitcoin address the message was signed with</source>
+        <translation>簽署這個訊息的 Bitcoin 位址</translation>
+    </message>
+    <message>
+        <source>Verify the message to ensure it was signed with the specified Bitcoin address</source>
+        <translation>驗證這個訊息來確定是用指定的 Bitcoin 位址簽署的</translation>
+    </message>
+    <message>
+        <source>Verify &amp;Message</source>
+        <translation>驗證訊息</translation>
+    </message>
+    <message>
+        <source>Reset all verify message fields</source>
+        <translation>重設所有訊息驗證欄位</translation>
+    </message>
+    <message>
+        <source>Click "Sign Message" to generate signature</source>
+        <translation>請按一下「簽署訊息」來產生簽章</translation>
+    </message>
+    <message>
+        <source>The entered address is invalid.</source>
+        <translation>輸入的位址無效。</translation>
+    </message>
+    <message>
+        <source>Please check the address and try again.</source>
+        <translation>請檢查位址是否正確後再試一次。</translation>
+    </message>
+    <message>
+        <source>The entered address does not refer to a key.</source>
+        <translation>輸入的位址沒有對應到你的任何密鑰。</translation>
+    </message>
+    <message>
+        <source>Wallet unlock was cancelled.</source>
+        <translation>錢包解鎖已取消。</translation>
+    </message>
+    <message>
+        <source>Private key for the entered address is not available.</source>
+        <translation>沒有對應輸入位址的密鑰。</translation>
+    </message>
+    <message>
+        <source>Message signing failed.</source>
+        <translation>訊息簽署失敗。</translation>
+    </message>
+    <message>
+        <source>Message signed.</source>
+        <translation>訊息簽署好了。</translation>
+    </message>
+    <message>
+        <source>The signature could not be decoded.</source>
+        <translation>沒辦法把這個簽章解碼。</translation>
+    </message>
+    <message>
+        <source>Please check the signature and try again.</source>
+        <translation>請檢查簽章是否正確後再試一次。</translation>
+    </message>
+    <message>
+        <source>The signature did not match the message digest.</source>
+        <translation>這個簽章跟訊息的數位摘要不符。</translation>
+    </message>
+    <message>
+        <source>Message verification failed.</source>
+        <translation>訊息驗證失敗。</translation>
+    </message>
+    <message>
+        <source>Message verified.</source>
+        <translation>訊息驗證沒錯。</translation>
+    </message>
+</context>
+<context>
+    <name>SplashScreen</name>
+    <message>
+        <source>[testnet]</source>
+        <translation>[testnet]</translation>
+    </message>
+</context>
+<context>
+    <name>TrafficGraphWidget</name>
+    <message>
+        <source>KB/s</source>
+        <translation>KB/s</translation>
+    </message>
+</context>
+<context>
+    <name>TransactionDesc</name>
+    <message numerus="yes">
+        <source>Open for %n more block(s)</source>
+        <translation><numerusform>到下 %n 個區塊生出來前可修改</numerusform></translation>
+    </message>
+    <message>
+        <source>Open until %1</source>
+        <translation>到 %1 前可修改</translation>
+    </message>
+    <message>
+        <source>conflicted with a transaction with %1 confirmations</source>
+        <translation>跟一個目前確認 %1 次的交易互相衝突</translation>
+    </message>
+    <message>
+        <source>%1/offline</source>
+        <translation>%1 次/離線中</translation>
+    </message>
+    <message>
+        <source>0/unconfirmed, %1</source>
+        <translation>0 次/未確認，%1</translation>
+    </message>
+    <message>
+        <source>in memory pool</source>
+        <translation>在記憶池中</translation>
+    </message>
+    <message>
+        <source>not in memory pool</source>
+        <translation>不在記憶池中</translation>
+    </message>
+    <message>
+        <source>abandoned</source>
+        <translation>已中止</translation>
+    </message>
+    <message>
+        <source>%1/unconfirmed</source>
+        <translation>%1 次/未確認</translation>
+    </message>
+    <message>
+        <source>%1 confirmations</source>
+        <translation>確認 %1 次</translation>
+    </message>
+    <message>
+        <source>Status</source>
+        <translation>狀態</translation>
+    </message>
+    <message>
+        <source>, has not been successfully broadcast yet</source>
+        <translation>，還沒成功公告出去</translation>
+    </message>
+    <message numerus="yes">
+        <source>, broadcast through %n node(s)</source>
+        <translation><numerusform>，已公告給 %n 個節點</numerusform></translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation>日期</translation>
+    </message>
+    <message>
+        <source>Source</source>
+        <translation>來源</translation>
+    </message>
+    <message>
+        <source>Generated</source>
+        <translation>生產出來</translation>
+    </message>
+    <message>
+        <source>From</source>
+        <translation>來源</translation>
+    </message>
+    <message>
+        <source>unknown</source>
+        <translation>未知</translation>
+    </message>
+    <message>
+        <source>To</source>
+        <translation>目的</translation>
+    </message>
+    <message>
+        <source>own address</source>
+        <translation>自己的位址</translation>
+    </message>
+    <message>
+        <source>watch-only</source>
+        <translation>只能看</translation>
+    </message>
+    <message>
+        <source>label</source>
+        <translation>標記</translation>
+    </message>
+    <message>
+        <source>Credit</source>
+        <translation>入帳</translation>
+    </message>
+    <message numerus="yes">
+        <source>matures in %n more block(s)</source>
+        <translation><numerusform>再等 %n 個區塊生出來後成熟</numerusform></translation>
+    </message>
+    <message>
+        <source>not accepted</source>
+        <translation>不被接受</translation>
+    </message>
+    <message>
+        <source>Debit</source>
+        <translation>出帳</translation>
+    </message>
+    <message>
+        <source>Total debit</source>
+        <translation>出帳總額</translation>
+    </message>
+    <message>
+        <source>Total credit</source>
+        <translation>入帳總額</translation>
+    </message>
+    <message>
+        <source>Transaction fee</source>
+        <translation>交易手續費</translation>
+    </message>
+    <message>
+        <source>Net amount</source>
+        <translation>淨額</translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation>訊息</translation>
+    </message>
+    <message>
+        <source>Comment</source>
+        <translation>附註</translation>
+    </message>
+    <message>
+        <source>Transaction ID</source>
+        <translation>交易識別碼</translation>
+    </message>
+    <message>
+        <source>Transaction total size</source>
+        <translation>交易總大小</translation>
+    </message>
+    <message>
+        <source>Output index</source>
+        <translation>輸出索引</translation>
+    </message>
+    <message>
+        <source>Merchant</source>
+        <translation>商家</translation>
+    </message>
+    <message>
+        <source>Generated coins must mature %1 blocks before they can be spent. When you generated this block, it was broadcast to the network to be added to the block chain. If it fails to get into the chain, its state will change to "not accepted" and it won't be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source>
+        <translation>生產出來的錢要再等 %1 個區塊生出來後才成熟可以用。當區塊生產出來時會公布到網路上，來被加進區塊鏈。如果加失敗了，狀態就會變成「不被接受」，而且不能夠花。如果在你生產出區塊的幾秒鐘內，也有其他節點生產出來的話，就有可能會發生這種情形。</translation>
+    </message>
+    <message>
+        <source>Debug information</source>
+        <translation>除錯資訊</translation>
+    </message>
+    <message>
+        <source>Transaction</source>
+        <translation>交易</translation>
+    </message>
+    <message>
+        <source>Inputs</source>
+        <translation>輸入</translation>
+    </message>
+    <message>
+        <source>Amount</source>
+        <translation>金額</translation>
+    </message>
+    <message>
+        <source>true</source>
+        <translation>是</translation>
+    </message>
+    <message>
+        <source>false</source>
+        <translation>否</translation>
+    </message>
+</context>
+<context>
+    <name>TransactionDescDialog</name>
+    <message>
+        <source>This pane shows a detailed description of the transaction</source>
+        <translation>這個版面顯示這次交易的詳細說明</translation>
+    </message>
+    <message>
+        <source>Details for %1</source>
+        <translation>交易 %1 的明細</translation>
+    </message>
+</context>
+<context>
+    <name>TransactionTableModel</name>
+    <message>
+        <source>Date</source>
+        <translation>日期</translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation>種類</translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation>標記:</translation>
+    </message>
+    <message numerus="yes">
+        <source>Open for %n more block(s)</source>
+        <translation><numerusform>到下 %n 個區塊生出來前可修改</numerusform></translation>
     </message>
     <message>
-        <source>per kilobyte</source>
-        <translation>每千位元組</translation>
+        <source>Open until %1</source>
+        <translation>到 %1 前可修改</translation>
     </message>
     <message>
-        <source>If the custom fee is set to 1000 satoshis and the transaction is only 250 bytes, then "per kilobyte" only pays 250 satoshis in fee, while "total at least" pays 1000 satoshis. For transactions bigger than a kilobyte both pay by kilobyte.</source>
-        <translation>如果自訂手續費設定為 1000 satoshi, 而交易資料大小只有 250 個位元組的話，那麽選擇「每千位元組」就只會付 250 satoshi 的手續費，換做選「總共至少」就會付 1000 satoshi. 但是如果交易資料大小超過一千個位元組，那麽兩者都是每千位元組的費用。</translation>
+        <source>Offline</source>
+        <translation>離線中</translation>
     </message>
     <message>
-        <source>Hide</source>
-        <translation>隱藏</translation>
+        <source>Unconfirmed</source>
+        <translation>未確認</translation>
     </message>
     <message>
-        <source>total at least</source>
-        <translation>總共最少</translation>
+        <source>Abandoned</source>
+        <translation>已中止</translation>
     </message>
     <message>
-        <source>Paying only the minimum fee is just fine as long as there is less transaction volume than space in the blocks. But be aware that this can end up in a never confirming transaction once there is more demand for bitcoin transactions than the network can process.</source>
-        <translation>當交易量少於區塊可容納的空間時，只付最低手續費不會有什麽問題。但是當交易量的需求成長到超過整體網路可以處理的量時，可能會造成一筆一直不會被確認的交易。</translation>
+        <source>Confirming (%1 of %2 recommended confirmations)</source>
+        <translation>確認中(已經 %1 次，建議至少 %2 次)</translation>
     </message>
     <message>
-        <source>(read the tooltip)</source>
-        <translation>(請看提示)</translation>
+        <source>Confirmed (%1 confirmations)</source>
+        <translation>已確認(%1 次)</translation>
     </message>
     <message>
-        <source>Recommended:</source>
-        <translation>建議值:</translation>
+        <source>Conflicted</source>
+        <translation>有衝突</translation>
     </message>
     <message>
-        <source>Custom:</source>
-        <translation>自訂:</translation>
+        <source>Immature (%1 confirmations, will be available after %2)</source>
+        <translation>未成熟(確認 %1 次，會在 %2 次後可用)</translation>
     </message>
     <message>
-        <source>(Smart fee not initialized yet. This usually takes a few blocks...)</source>
-        <translation>(手續費智慧演算法還沒準備好。通常都要等幾個區塊才行...)</translation>
+        <source>This block was not received by any other nodes and will probably not be accepted!</source>
+        <translation>沒有其他節點收到這個區塊，也許它不會被接受！</translation>
     </message>
     <message>
-        <source>Confirmation time:</source>
-        <translation>確認時間:</translation>
+        <source>Generated but not accepted</source>
+        <translation>生產出來但是不被接受</translation>
     </message>
     <message>
-        <source>normal</source>
-        <translation>正常</translation>
+        <source>Received with</source>
+        <translation>收款</translation>
     </message>
     <message>
-        <source>fast</source>
-        <translation>快速</translation>
+        <source>Received from</source>
+        <translation>收款自</translation>
     </message>
     <message>
-        <source>Send to multiple recipients at once</source>
-        <translation>一次付給多個收款人</translation>
+        <source>Sent to</source>
+        <translation>付款</translation>
     </message>
     <message>
-        <source>Add &amp;Recipient</source>
-        <translation>增加收款人</translation>
+        <source>Payment to yourself</source>
+        <translation>付給自己</translation>
     </message>
     <message>
-        <source>Clear all fields of the form.</source>
-        <translation>把表單中的所有欄位清空。</translation>
+        <source>Mined</source>
+        <translation>開採所得</translation>
     </message>
     <message>
-        <source>Dust:</source>
-        <translation>零散錢:</translation>
+        <source>watch-only</source>
+        <translation>只能看</translation>
     </message>
     <message>
-        <source>Clear &amp;All</source>
-        <translation>全部清掉</translation>
+        <source>(n/a)</source>
+        <translation>(不適用)</translation>
     </message>
     <message>
-        <source>Balance:</source>
-        <translation>餘額:</translation>
+        <source>(no label)</source>
+        <translation>(無標記)</translation>
     </message>
     <message>
-        <source>Confirm the send action</source>
-        <translation>確認付款動作</translation>
+        <source>Transaction status. Hover over this field to show number of confirmations.</source>
+        <translation>交易狀態。把游標停在欄位上會顯示確認次數。</translation>
     </message>
     <message>
-        <source>S&amp;end</source>
-        <translation>付款</translation>
+        <source>Date and time that the transaction was received.</source>
+        <translation>收到交易的日期和時間。</translation>
     </message>
-</context>
-<context>
-    <name>SendCoinsEntry</name>
     <message>
-        <source>A&amp;mount:</source>
-        <translation>金額:</translation>
+        <source>Type of transaction.</source>
+        <translation>交易的種類。</translation>
     </message>
     <message>
-        <source>Pay &amp;To:</source>
-        <translation>付給:</translation>
+        <source>Whether or not a watch-only address is involved in this transaction.</source>
+        <translation>不論如何有一個只能觀看的地只有參與這次的交易</translation>
     </message>
     <message>
-        <source>&amp;Label:</source>
-        <translation>標記:</translation>
+        <source>User-defined intent/purpose of the transaction.</source>
+        <translation>使用者定義的交易動機或理由。</translation>
     </message>
     <message>
-        <source>Choose previously used address</source>
-        <translation>選擇先前使用過的位址</translation>
+        <source>Amount removed from or added to balance.</source>
+        <translation>要減掉或加進餘額的金額。</translation>
     </message>
+</context>
+<context>
+    <name>TransactionView</name>
     <message>
-        <source>This is a normal payment.</source>
-        <translation>這是一筆正常的付款。</translation>
+        <source>All</source>
+        <translation>全部</translation>
     </message>
     <message>
-        <source>The Bitcoin address to send the payment to</source>
-        <translation>接收付款的 Bitcoin 位址</translation>
+        <source>Today</source>
+        <translation>今天</translation>
     </message>
     <message>
-        <source>Alt+A</source>
-        <translation>Alt+A</translation>
+        <source>This week</source>
+        <translation>這星期</translation>
     </message>
     <message>
-        <source>Paste address from clipboard</source>
-        <translation>貼上剪貼簿裡的位址</translation>
+        <source>This month</source>
+        <translation>這個月</translation>
     </message>
     <message>
-        <source>Alt+P</source>
-        <translation>Alt+P</translation>
+        <source>Last month</source>
+        <translation>上個月</translation>
     </message>
     <message>
-        <source>Remove this entry</source>
-        <translation>刪掉這個項目</translation>
+        <source>This year</source>
+        <translation>今年</translation>
     </message>
     <message>
-        <source>The fee will be deducted from the amount being sent. The recipient will receive less bitcoins than you enter in the amount field. If multiple recipients are selected, the fee is split equally.</source>
-        <translation>手續費會從要付款出去的金額中扣掉。因此收款人會收到比輸入的金額還要少的 bitcoin。如果有多個收款人的話，手續費會平均分配來扣除。</translation>
+        <source>Range...</source>
+        <translation>指定範圍...</translation>
     </message>
     <message>
-        <source>S&amp;ubtract fee from amount</source>
-        <translation>從付款金額減去手續費</translation>
+        <source>Received with</source>
+        <translation>收款</translation>
     </message>
     <message>
-        <source>Message:</source>
-        <translation>訊息:</translation>
+        <source>Sent to</source>
+        <translation>付款</translation>
     </message>
     <message>
-        <source>This is an unauthenticated payment request.</source>
-        <translation>這是個沒有驗證過身份的付款要求。</translation>
+        <source>To yourself</source>
+        <translation>給自己</translation>
     </message>
     <message>
-        <source>This is an authenticated payment request.</source>
-        <translation>這是個已經驗證過身份的付款要求。</translation>
+        <source>Mined</source>
+        <translation>開採所得</translation>
     </message>
     <message>
-        <source>Enter a label for this address to add it to the list of used addresses</source>
-        <translation>請輸入這個位址的標記，來把它加進去已使用過位址的清單。</translation>
+        <source>Other</source>
+        <translation>其它</translation>
     </message>
     <message>
-        <source>A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
-        <translation>附加在 Bitcoin 付款協議的資源識別碼(URI)中的訊息，會和交易內容一起存起來，給你自己做參考。注意: 這個訊息不會送到 Bitcoin 網路上。</translation>
+        <source>Enter address or label to search</source>
+        <translation>請輸入要搜尋的位址或標記</translation>
     </message>
     <message>
-        <source>Pay To:</source>
-        <translation>付給:</translation>
+        <source>Min amount</source>
+        <translation>最小金額</translation>
     </message>
     <message>
-        <source>Memo:</source>
-        <translation>備註:</translation>
+        <source>Abandon transaction</source>
+        <translation>中止交易</translation>
     </message>
-</context>
-<context>
-    <name>ShutdownWindow</name>
     <message>
-        <source>%1 is shutting down...</source>
-        <translation>正在關閉 %1 中...</translation>
+        <source>Copy address</source>
+        <translation>複製位址</translation>
     </message>
     <message>
-        <source>Do not shut down the computer until this window disappears.</source>
-        <translation> 在這個視窗不見以前，請不要關掉電腦。</translation>
+        <source>Copy label</source>
+        <translation>複製標記</translation>
     </message>
-</context>
-<context>
-    <name>SignVerifyMessageDialog</name>
     <message>
-        <source>Signatures - Sign / Verify a Message</source>
-        <translation>簽章 - 簽署或驗證訊息</translation>
+        <source>Copy amount</source>
+        <translation>複製金額</translation>
     </message>
     <message>
-        <source>&amp;Sign Message</source>
-        <translation>簽署訊息</translation>
+        <source>Copy transaction ID</source>
+        <translation>複製交易識別碼</translation>
     </message>
     <message>
-        <source>You can sign messages/agreements with your addresses to prove you can receive bitcoins sent to them. Be careful not to sign anything vague or random, as phishing attacks may try to trick you into signing your identity over to them. Only sign fully-detailed statements you agree to.</source>
-        <translation>你可以用自己的位址簽署訊息或合約，來證明你可以從該位址收款。但是請小心，不要簽署語意含糊不清，或隨機產生的內容，因為釣魚式詐騙可能會用騙你簽署的手法來冒充是你。只有在語句中的細節你都同意時才簽署。</translation>
+        <source>Copy raw transaction</source>
+        <translation>複製交易原始資料</translation>
     </message>
     <message>
-        <source>The Bitcoin address to sign the message with</source>
-        <translation>用來簽署訊息的 Bitcoin 位址</translation>
+        <source>Copy full transaction details</source>
+        <translation>複製完整交易明細</translation>
     </message>
     <message>
-        <source>Choose previously used address</source>
-        <translation>選擇先前使用過的位址</translation>
+        <source>Edit label</source>
+        <translation>編輯標記</translation>
     </message>
     <message>
-        <source>Alt+A</source>
-        <translation>Alt+A</translation>
+        <source>Show transaction details</source>
+        <translation>顯示交易明細</translation>
     </message>
     <message>
-        <source>Paste address from clipboard</source>
-        <translation>貼上剪貼簿裡的位址</translation>
+        <source>Export Transaction History</source>
+        <translation>匯出交易記錄</translation>
     </message>
     <message>
-        <source>Alt+P</source>
-        <translation>Alt+P</translation>
+        <source>Comma separated file (*.csv)</source>
+        <translation>逗點分隔資料檔(*.csv)</translation>
     </message>
     <message>
-        <source>Enter the message you want to sign here</source>
-        <translation>請在這裡輸入你想簽署的訊息</translation>
+        <source>Confirmed</source>
+        <translation>已確認</translation>
     </message>
     <message>
-        <source>Signature</source>
-        <translation>簽章</translation>
+        <source>Watch-only</source>
+        <translation>只能觀看的</translation>
     </message>
     <message>
-        <source>Copy the current signature to the system clipboard</source>
-        <translation>複製目前的簽章到系統剪貼簿</translation>
+        <source>Date</source>
+        <translation>日期</translation>
     </message>
     <message>
-        <source>Sign the message to prove you own this Bitcoin address</source>
-        <translation>簽署這個訊息來證明這個 Bitcoin 位址是你的</translation>
+        <source>Type</source>
+        <translation>種類</translation>
     </message>
     <message>
-        <source>Sign &amp;Message</source>
-        <translation>簽署訊息</translation>
+        <source>Label</source>
+        <translation>標記:</translation>
     </message>
     <message>
-        <source>Reset all sign message fields</source>
-        <translation>重設所有訊息簽署欄位</translation>
+        <source>Address</source>
+        <translation>位址</translation>
     </message>
     <message>
-        <source>Clear &amp;All</source>
-        <translation>全部清掉</translation>
+        <source>ID</source>
+        <translation>識別碼</translation>
     </message>
     <message>
-        <source>&amp;Verify Message</source>
-        <translation>驗證訊息</translation>
+        <source>Exporting Failed</source>
+        <translation>匯出失敗</translation>
     </message>
     <message>
-        <source>Enter the receiver's address, message (ensure you copy line breaks, spaces, tabs, etc. exactly) and signature below to verify the message. Be careful not to read more into the signature than what is in the signed message itself, to avoid being tricked by a man-in-the-middle attack. Note that this only proves the signing party receives with the address, it cannot prove sendership of any transaction!</source>
-        <translation>請在下面輸入收款人的位址，訊息(請確定完整複製了所包含的換行，空格，跳位符號等等)，以及簽章，來驗證這個訊息。請小心，除了訊息內容以外，不要對簽章本身過度解讀，以避免被用「中間人攻擊法」詐騙。請注意，通過驗證的簽章只能證明簽章人確實可以從該位址收款，不能證明任何交易中的付款人身份！</translation>
+        <source>There was an error trying to save the transaction history to %1.</source>
+        <translation>儲存交易記錄到 %1 時發生錯誤。</translation>
     </message>
     <message>
-        <source>The Bitcoin address the message was signed with</source>
-        <translation>簽署這個訊息的 Bitcoin 位址</translation>
+        <source>Exporting Successful</source>
+        <translation>匯出成功</translation>
     </message>
     <message>
-        <source>Verify the message to ensure it was signed with the specified Bitcoin address</source>
-        <translation>驗證這個訊息來確定是用指定的 Bitcoin 位址簽署的</translation>
+        <source>The transaction history was successfully saved to %1.</source>
+        <translation>交易記錄已經成功儲存到 %1 了。</translation>
     </message>
     <message>
-        <source>Verify &amp;Message</source>
-        <translation>驗證訊息</translation>
+        <source>Range:</source>
+        <translation>範圍:</translation>
     </message>
     <message>
-        <source>Reset all verify message fields</source>
-        <translation>重設所有訊息驗證欄位</translation>
+        <source>to</source>
+        <translation>到</translation>
     </message>
 </context>
 <context>
-    <name>SplashScreen</name>
+    <name>UnitDisplayStatusBarControl</name>
     <message>
-        <source>[testnet]</source>
-        <translation>[testnet]</translation>
+        <source>Unit to show amounts in. Click to select another unit.</source>
+        <translation>金額顯示單位。可以點選其他單位。</translation>
     </message>
 </context>
 <context>
-    <name>TrafficGraphWidget</name>
+    <name>WalletFrame</name>
     <message>
-        <source>KB/s</source>
-        <translation>KB/s</translation>
+        <source>No wallet has been loaded.</source>
+        <translation>沒有載入錢包。</translation>
     </message>
 </context>
 <context>
-    <name>TransactionDescDialog</name>
+    <name>WalletModel</name>
     <message>
-        <source>This pane shows a detailed description of the transaction</source>
-        <translation>這個版面顯示這次交易的詳細說明</translation>
+        <source>Send Coins</source>
+        <translation>付款</translation>
     </message>
 </context>
 <context>
-    <name>UnitDisplayStatusBarControl</name>
+    <name>WalletView</name>
     <message>
-        <source>Unit to show amounts in. Click to select another unit.</source>
-        <translation>金額顯示單位。可以點選其他單位。</translation>
+        <source>&amp;Export</source>
+        <translation>匯出</translation>
+    </message>
+    <message>
+        <source>Export the data in the current tab to a file</source>
+        <translation>將目前分頁的資料匯出存成檔案</translation>
+    </message>
+    <message>
+        <source>Backup Wallet</source>
+        <translation>備份錢包</translation>
+    </message>
+    <message>
+        <source>Wallet Data (*.dat)</source>
+        <translation>錢包資料檔(*.dat)</translation>
+    </message>
+    <message>
+        <source>Backup Failed</source>
+        <translation>備份失敗</translation>
+    </message>
+    <message>
+        <source>There was an error trying to save the wallet data to %1.</source>
+        <translation>儲存錢包資料到 %1 時發生錯誤。</translation>
+    </message>
+    <message>
+        <source>Backup Successful</source>
+        <translation>備份成功</translation>
+    </message>
+    <message>
+        <source>The wallet data was successfully saved to %1.</source>
+        <translation>錢包的資料已經成功儲存到 %1 了。</translation>
     </message>
 </context>
 <context>
@@ -1751,6 +2994,18 @@
         <translation>接受指令列和 JSON-RPC 指令
 </translation>
     </message>
+    <message>
+        <source>Accept connections from outside (default: 1 if no -proxy or -connect/-noconnect)</source>
+        <translation>是否接受外來連線(預設值: 當沒有 -proxy 或 -connect/-noconnect 時為 1)</translation>
+    </message>
+    <message>
+        <source>Connect only to the specified node(s); -noconnect or -connect=0 alone to disable automatic connections</source>
+        <translation>只連線到指定的節點。用 -noconnect 或是 -connect=0 可以關閉自動連線。</translation>
+    </message>
+    <message>
+        <source>Distributed under the MIT software license, see the accompanying file %s or %s</source>
+        <translation>依據 MIT 軟體授權條款散布，詳情請見附帶的 %s 檔案或是 %s</translation>
+    </message>
     <message>
         <source>If &lt;category&gt; is not supplied or if &lt;category&gt; = 1, output all debugging information.</source>
         <translation>如果沒有提供 &lt;category&gt; 或是值為 1 就會輸出所有的除錯資訊。</translation>
@@ -1791,10 +3046,6 @@
         <source>Unable to start HTTP server. See debug log for details.</source>
         <translation>無法啟動 HTTP 伺服器。詳情請看除錯紀錄。</translation>
     </message>
-    <message>
-        <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
-        <translation>是否接受外來連線(預設值: 當沒有 -proxy 或 -connect 時為 1)</translation>
-    </message>
     <message>
         <source>Bitcoin Core</source>
         <translation>Bitcoin Core</translation>
@@ -1803,10 +3054,6 @@
         <source>The %s developers</source>
         <translation>%s 開發人員</translation>
     </message>
-    <message>
-        <source>-fallbackfee is set very high! This is the transaction fee you may pay when fee estimates are not available.</source>
-        <translation>警告: -fallbackfee 設定了很高的金額！這是當預估手續費還沒計算出來時，交易付款預設會付的手續費。</translation>
-    </message>
     <message>
         <source>A fee rate (in %s/kB) that will be used when fee estimation has insufficient data (default: %s)</source>
         <translation>當沒有足夠的資料計算預估手續費時，所使用的手續費費率(單位是 %s/kB, 預設值: %s)</translation>
@@ -1827,10 +3074,6 @@
         <source>Delete all wallet transactions and only recover those parts of the blockchain through -rescan on startup</source>
         <translation>清掉錢包裡的所有交易，並且在下次啟動時，使用 -rescan 來從區塊鏈中復原回來。</translation>
     </message>
-    <message>
-        <source>Distributed under the MIT software license, see the accompanying file COPYING or &lt;http://www.opensource.org/licenses/mit-license.php&gt;.</source>
-        <translation>這套軟體是依據 MIT 軟體授權條款散布，詳情請見附帶的 COPYING 檔案，或是以下網站:  &lt;http://www.opensource.org/licenses/mit-license.php&gt;.</translation>
-    </message>
     <message>
         <source>Error loading %s: You can't enable HD on a already existing non-HD wallet</source>
         <translation>載入 %s 發生錯誤：不能對已存在的非 HD 錢包啟用 HD 功能。</translation>
@@ -1843,10 +3086,6 @@
         <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source>
         <translation>當錢包有交易改變時要執行的指令(指令中的 %s 會被取代成交易識別碼)</translation>
     </message>
-    <message>
-        <source>Force relay of transactions from whitelisted peers even they violate local relay policy (default: %d)</source>
-        <translation>強制轉發從白名點節點收到的交易，即使它們違反了本機的轉發準則(預設值: %d)</translation>
-    </message>
     <message>
         <source>Maximum allowed median peer time offset adjustment. Local perspective of time may be influenced by peers forward or backward by this amount. (default: %u seconds)</source>
         <translation>跟其他節點的時間差最高可接受的中位數值。本機所認為的時間可能會被其他節點影響，往前或往後在這個值之內。(預設值: %u 秒)</translation>
@@ -1873,7 +3112,7 @@
     </message>
     <message>
         <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
-        <translation>這是個還沒發表的測試版本 - 使用請自負風險 - 請不要用來開採或商業應用</translation>
+        <translation>這是個還沒發表的測試版本 - 使用請自負風險 - 請不要用來開採或做商業應用</translation>
     </message>
     <message>
         <source>Unable to rewind the database to a pre-fork state. You will need to redownload the blockchain</source>
@@ -1883,18 +3122,18 @@
         <source>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</source>
         <translation>是否要使用「通用即插即用」協定(UPnP)，來設定聽候連線的通訊埠的對應(預設值: 當有聽候連線且沒有指定 -proxy 參數時為 1)</translation>
     </message>
+    <message>
+        <source>Wallet will not create transactions that violate mempool chain limits (default: %u)</source>
+        <translation>錢包軟體不會產生違反記憶池交易鏈限制的交易(預設值: %u)</translation>
+    </message>
     <message>
         <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source>
-        <translation>警告: 節點網路對於區塊鏈結的決定目前有分歧！看來有些礦工會有問題。</translation>
+        <translation>警告: 位元幣網路對於區塊鏈結的決定目前有分歧！有些礦工看來會有問題。</translation>
     </message>
     <message>
         <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source>
         <translation>警告: 我們和某些連線的節點對於區塊鏈結的決定不同！你可能需要升級，或是需要等其它的節點升級。</translation>
     </message>
-    <message>
-        <source>Whitelist peers connecting from the given netmask or IP address. Can be specified multiple times.</source>
-        <translation>把來自指定網域或位址的節點放進白名單。這個選項可以設定多次。</translation>
-    </message>
     <message>
         <source>You need to rebuild the database using -reindex-chainstate to change -txindex</source>
         <translation>改變 -txindex 參數後，必須要用 -reindex-chainstate 參數來重建資料庫</translation>
@@ -1928,12 +3167,12 @@
         <translation>沒辦法解析 -%s 參數指定的位址: '%s'</translation>
     </message>
     <message>
-        <source>Change index out of range</source>
-        <translation>找零的索引值超出範圍</translation>
+        <source>Chain selection options:</source>
+        <translation>區塊鏈選項:</translation>
     </message>
     <message>
-        <source>Connect only to the specified node(s)</source>
-        <translation>只連線到指定節點(可多個)</translation>
+        <source>Change index out of range</source>
+        <translation>找零的索引值超出範圍</translation>
     </message>
     <message>
         <source>Connection options:</source>
@@ -2055,10 +3294,6 @@
         <source>Location of the auth cookie (default: data dir)</source>
         <translation>認證 cookie 資料的位置(預設值: 同資料目錄)</translation>
     </message>
-    <message>
-        <source>Minimum bytes per sigop in transactions we relay and mine (default: %u)</source>
-        <translation>轉發和開採時，對交易資料的 sigop 平均位元組數下限(預設值: %u)</translation>
-    </message>
     <message>
         <source>Not enough file descriptors available.</source>
         <translation>檔案描述元不足。</translation>
@@ -2093,16 +3328,12 @@
     </message>
     <message>
         <source>Rewinding blocks...</source>
-        <translation>倒轉回區塊鏈之前的狀態...</translation>
+        <translation>正在倒轉回區塊鏈之前的狀態...</translation>
     </message>
     <message>
         <source>Set database cache size in megabytes (%d to %d, default: %d)</source>
         <translation>設定資料庫快取大小是多少百萬位元組(MB，範圍: %d 到 %d，預設值: %d)</translation>
     </message>
-    <message>
-        <source>Set maximum block cost (default: %d)</source>
-        <translation>設定區塊成本的最大值(預設值: %d)</translation>
-    </message>
     <message>
         <source>Set maximum block size in bytes (default: %d)</source>
         <translation>設定區塊大小上限成多少位元組(預設值: %d)</translation>
@@ -2135,6 +3366,10 @@
         <source>Use UPnP to map the listening port (default: %u)</source>
         <translation>使用通用隨插即用 (UPnP) 協定來設定對應的服務連接埠(預設值: %u)</translation>
     </message>
+    <message>
+        <source>Use the test chain</source>
+        <translation>使用測試鏈</translation>
+    </message>
     <message>
         <source>User Agent comment (%s) contains unsafe characters.</source>
         <translation>使用者代理註解(%s)中含有不安全的字元。</translation>
@@ -2207,10 +3442,6 @@
         <source>Maximum size of data in data carrier transactions we relay and mine (default: %u)</source>
         <translation>轉發和開採時，對只帶資料的交易的大小上限(預設值: %u)</translation>
     </message>
-    <message>
-        <source>Query for peer addresses via DNS lookup, if low on addresses (default: 1 unless -connect)</source>
-        <translation>是否允許在節點位址數目不足時，使用域名查詢來搜尋節點 (預設值: 當沒用 -connect 時為 1)</translation>
-    </message>
     <message>
         <source>Randomize credentials for every proxy connection. This enables Tor stream isolation (default: %u)</source>
         <translation>對每個代理連線使用隨機產生的憑證。這個選項會開啟 Tor 的串流隔離(預設值: %u)</translation>
@@ -2223,10 +3454,6 @@
         <source>The transaction amount is too small to send after the fee has been deducted</source>
         <translation>扣除手續費後的交易金額太少而不能傳送</translation>
     </message>
-    <message>
-        <source>This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit &lt;https://www.openssl.org/&gt; and cryptographic software written by Eric Young and UPnP software written by Thomas Bernard.</source>
-        <translation>此產品也包含了由 OpenSSL Project 所開發的 OpenSSL Toolkit 軟體 &lt;https://www.openssl.org/&gt;, 和由 Eric Young 撰寫的加解密軟體，以及由 Thomas Bernard 所撰寫的 UPnP 軟體。</translation>
-    </message>
     <message>
         <source>Use hierarchical deterministic key generation (HD) after BIP32. Only has effect during wallet creation/first start</source>
         <translation>在 BIP32 開始作用後，啟用階層式可預期性密鑰產生方式(HD)。只有在產生新錢包或第一次啟動時才有作用。</translation>
@@ -2339,10 +3566,6 @@
         <source>Transaction amount too small</source>
         <translation>交易金額太小</translation>
     </message>
-    <message>
-        <source>Transaction amounts must be positive</source>
-        <translation>交易金額必須是正的</translation>
-    </message>
     <message>
         <source>Transaction too large for fee policy</source>
         <translation>根據交易手續費準則，本交易的位元量過大</translation>
@@ -2407,18 +3630,22 @@
         <source>-maxtxfee is set very high! Fees this large could be paid on a single transaction.</source>
         <translation>參數 -maxtxfee 設定了很高的金額！這可是你一次交易就有可能付出的最高手續費。</translation>
     </message>
-    <message>
-        <source>-paytxfee is set very high! This is the transaction fee you will pay if you send a transaction.</source>
-        <translation>參數 -paytxfee 設定了很高的金額！這可是你交易付款時所要付的手續費。</translation>
-    </message>
     <message>
         <source>Do not keep transactions in the mempool longer than &lt;n&gt; hours (default: %u)</source>
         <translation>不要讓交易留在記憶池中超過 &lt;n&gt; 個小時(預設值: %u)</translation>
     </message>
+    <message>
+        <source>Equivalent bytes per sigop in transactions for relay and mining (default: %u)</source>
+        <translation>轉發和開採時，交易資料中每個 sigop 的等同位元組數(預設值: %u)</translation>
+    </message>
     <message>
         <source>Fees (in %s/kB) smaller than this are considered zero fee for transaction creation (default: %s)</source>
         <translation>當製造交易時，如果每千位元組(kB)的手續費比這個值(單位是 %s)低，就視為沒付手續費(預設值: %s)</translation>
     </message>
+    <message>
+        <source>Force relay of transactions from whitelisted peers even if they violate local relay policy (default: %d)</source>
+        <translation>強制轉發從白名點節點收到的交易，即使它們違反了本機的轉發準則(預設值: %d)</translation>
+    </message>
     <message>
         <source>How thorough the block verification of -checkblocks is (0-4, default: %u)</source>
         <translation>使用 -checkblocks 檢查區塊的仔細程度(0 到 4，預設值: %u)</translation>
@@ -2435,10 +3662,26 @@
         <source>Output debugging information (default: %u, supplying &lt;category&gt; is optional)</source>
         <translation>輸出除錯資訊(預設值: %u, 不一定要指定 &lt;category&gt;)</translation>
     </message>
+    <message>
+        <source>Query for peer addresses via DNS lookup, if low on addresses (default: 1 unless -connect/-noconnect)</source>
+        <translation>是否允許在節點位址數目不足時，使用域名查詢來搜尋節點 (預設值: 當沒用 -connect/-noconnect 時為 1)</translation>
+    </message>
+    <message>
+        <source>Sets the serialization of raw transaction or block hex returned in non-verbose mode, non-segwit(0) or segwit(1) (default: %d)</source>
+        <translation>設定非冗長模式時，回傳的交易原始資料或區塊位元值的序列化形式：無 segwit 為 0，或是有 segwit 為 1 (預設值: %d)</translation>
+    </message>
     <message>
         <source>Support filtering of blocks and transaction with bloom filters (default: %u)</source>
         <translation>支援用布倫過濾器來過濾區塊和交易(預設值: %u)</translation>
     </message>
+    <message>
+        <source>This is the transaction fee you may pay when fee estimates are not available.</source>
+        <translation>這是當預估手續費還沒計算出來時，付款交易預設會付的手續費。</translation>
+    </message>
+    <message>
+        <source>This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit %s and cryptographic software written by Eric Young and UPnP software written by Thomas Bernard.</source>
+        <translation>此產品包含了由 OpenSSL Project 所開發的 OpenSSL Toolkit 軟體 %s, 由 Eric Young 撰寫的加解密軟體，以及由 Thomas Bernard 所撰寫的 UPnP 軟體。</translation>
+    </message>
     <message>
         <source>Total length of network version string (%i) exceeds maximum length (%i). Reduce the number or size of uacomments.</source>
         <translation>網路版本字串的總長度(%i)超過最大長度(%i)了。請減少 uacomment 參數的數目或長度。</translation>
@@ -2471,6 +3714,14 @@
         <source>Warning: Wallet file corrupt, data salvaged! Original %s saved as %s in %s; if your balance or transactions are incorrect you should restore from a backup.</source>
         <translation>警告: 錢包檔壞掉，但資料被救回來了！原來的檔案 %s 改儲存為 %s，在目錄 %s 下。 如果餘額或交易資料有誤的話，你應該要從備份資料復原回來。</translation>
     </message>
+    <message>
+        <source>Whitelist peers connecting from the given IP address (e.g. 1.2.3.4) or CIDR notated network (e.g. 1.2.3.0/24). Can be specified multiple times.</source>
+        <translation>把來自指定位址(例如：1.2.3.4)或 CIDR 格式網段(例如：1.2.3.0/24)的節點放進白名單。這個選項可以設定多次。</translation>
+    </message>
+    <message>
+        <source>%s is set very high!</source>
+        <translation>%s 的設定值異常大！</translation>
+    </message>
     <message>
         <source>(default: %s)</source>
         <translation>(預設值: %s)</translation>
@@ -2491,6 +3742,10 @@
         <source>Invalid -proxy address: '%s'</source>
         <translation>無效的 -proxy 位址: '%s'</translation>
     </message>
+    <message>
+        <source>Keypool ran out, please call keypoolrefill first</source>
+        <translation>密鑰池已經乾了，請先執行 keypoolrefill</translation>
+    </message>
     <message>
         <source>Listen for JSON-RPC connections on &lt;port&gt; (default: %u or testnet: %u)</source>
         <translation>在通訊埠 &lt;port&gt; 聽候 JSON-RPC 連線(預設值: %u, 或若為測試網路: %u)</translation>
@@ -2527,13 +3782,17 @@
         <source>Relay non-P2SH multisig (default: %u)</source>
         <translation>允許轉發非 P2SH 的多簽章交易(預設值: %u)</translation>
     </message>
+    <message>
+        <source>Send transactions with full-RBF opt-in enabled (default: %u)</source>
+        <translation>送出允許提高手續費(full-RBF)的交易(預設值: %u)</translation>
+    </message>
     <message>
         <source>Set key pool size to &lt;n&gt; (default: %u)</source>
         <translation>設定密鑰池大小為 &lt;n&gt; (預設值: %u)</translation>
     </message>
     <message>
-        <source>Set minimum block size in bytes (default: %u)</source>
-        <translation>設定區塊大小下限為多少位元組(預設值: %u)</translation>
+        <source>Set maximum BIP141 block weight (default: %d)</source>
+        <translation>設定 BIP141 區塊重量的最大值(預設值: %d)</translation>
     </message>
     <message>
         <source>Set the number of threads to service RPC calls (default: %d)</source>
@@ -2555,10 +3814,38 @@
         <source>Spend unconfirmed change when sending transactions (default: %u)</source>
         <translation>傳送交易時可以花還沒確認的零錢(預設值: %u)</translation>
     </message>
+    <message>
+        <source>Starting network threads...</source>
+        <translation>正在啟動網路執行緒...</translation>
+    </message>
+    <message>
+        <source>The wallet will avoid paying less than the minimum relay fee.</source>
+        <translation>錢包軟體會付多於最小轉發費用的手續費。</translation>
+    </message>
+    <message>
+        <source>This is the minimum transaction fee you pay on every transaction.</source>
+        <translation>這是你每次交易付款時最少要付的手續費。</translation>
+    </message>
+    <message>
+        <source>This is the transaction fee you will pay if you send a transaction.</source>
+        <translation>這是你交易付款時所要付的手續費。</translation>
+    </message>
     <message>
         <source>Threshold for disconnecting misbehaving peers (default: %u)</source>
         <translation>與亂搞的節點斷線的臨界值 (預設: %u)</translation>
     </message>
+    <message>
+        <source>Transaction amounts must not be negative</source>
+        <translation>交易金額不能是負的</translation>
+    </message>
+    <message>
+        <source>Transaction has too long of a mempool chain</source>
+        <translation>交易造成記憶池中的交易鏈太長</translation>
+    </message>
+    <message>
+        <source>Transaction must have at least one recipient</source>
+        <translation>交易必須至少要有一個收款人</translation>
+    </message>
     <message>
         <source>Unknown network specified in -onlynet: '%s'</source>
         <translation>在 -onlynet 指定了不明的網路別: '%s'</translation>

From 1fc4ec7bf224748d3d6271bffa23d121f015cbf3 Mon Sep 17 00:00:00 2001
From: mrbandrews <bandrewsny@gmail.com>
Date: Tue, 29 Nov 2016 12:39:19 -0500
Subject: [PATCH 1528/1802] Add pruneblockchain RPC to enable manual block file
 pruning.

---
 doc/man/bitcoin-qt.1    |  12 +++--
 doc/man/bitcoind.1      |  12 +++--
 qa/rpc-tests/pruning.py | 113 ++++++++++++++++++++++++++++++++++++++--
 src/init.cpp            |  16 +++---
 src/rpc/blockchain.cpp  |  31 +++++++++++
 src/rpc/client.cpp      |   1 +
 src/validation.cpp      |  44 ++++++++++++++--
 src/validation.h        |   2 +
 8 files changed, 207 insertions(+), 24 deletions(-)

diff --git a/doc/man/bitcoin-qt.1 b/doc/man/bitcoin-qt.1
index 24b529dac1671..2129a151e2de3 100644
--- a/doc/man/bitcoin-qt.1
+++ b/doc/man/bitcoin-qt.1
@@ -75,11 +75,13 @@ Specify pid file (default: bitcoind.pid)
 .HP
 \fB\-prune=\fR<n>
 .IP
-Reduce storage requirements by pruning (deleting) old blocks. This mode
-is incompatible with \fB\-txindex\fR and \fB\-rescan\fR. Warning: Reverting
-this setting requires re\-downloading the entire blockchain.
-(default: 0 = disable pruning blocks, >550 = target size in MiB
-to use for block files)
+Reduce storage requirements by enabling pruning (deleting) of old blocks.
+This allows the pruneblockchain RPC to be called to delete specific blocks,
+and enables automatic pruning of old blocks if a target size in MiB is
+provided. This mode is incompatible with \fB\-txindex\fR and \fB\-rescan\fR.
+Warning: Reverting this setting requires re\-downloading the entire blockchain.
+(default: 0 = disable pruning blocks, 1 = allow manual pruning via RPC, >550 =
+automatically prune block files to stay under the specified target size in MiB)
 .HP
 \fB\-reindex\-chainstate\fR
 .IP
diff --git a/doc/man/bitcoind.1 b/doc/man/bitcoind.1
index b99657a5fae3a..47539d81319eb 100644
--- a/doc/man/bitcoind.1
+++ b/doc/man/bitcoind.1
@@ -80,11 +80,13 @@ Specify pid file (default: bitcoind.pid)
 .HP
 \fB\-prune=\fR<n>
 .IP
-Reduce storage requirements by pruning (deleting) old blocks. This mode
-is incompatible with \fB\-txindex\fR and \fB\-rescan\fR. Warning: Reverting
-this setting requires re\-downloading the entire blockchain.
-(default: 0 = disable pruning blocks, >550 = target size in MiB
-to use for block files)
+Reduce storage requirements by enabling pruning (deleting) of old blocks.
+This allows the pruneblockchain RPC to be called to delete specific blocks,
+and enables automatic pruning of old blocks if a target size in MiB is
+provided. This mode is incompatible with \fB\-txindex\fR and \fB\-rescan\fR.
+Warning: Reverting this setting requires re\-downloading the entire blockchain.
+(default: 0 = disable pruning blocks, 1 = allow manual pruning via RPC, >550 =
+automatically prune block files to stay under the specified target size in MiB)
 .HP
 \fB\-reindex\-chainstate\fR
 .IP
diff --git a/qa/rpc-tests/pruning.py b/qa/rpc-tests/pruning.py
index 78b8938e4a9f6..062bc8dda4963 100755
--- a/qa/rpc-tests/pruning.py
+++ b/qa/rpc-tests/pruning.py
@@ -25,7 +25,7 @@ class PruneTest(BitcoinTestFramework):
     def __init__(self):
         super().__init__()
         self.setup_clean_chain = True
-        self.num_nodes = 3
+        self.num_nodes = 5
 
         # Cache for utxos, as the listunspent may take a long time later in the test
         self.utxo_cache_0 = []
@@ -43,10 +43,21 @@ def setup_network(self):
         self.nodes.append(start_node(2, self.options.tmpdir, ["-debug","-maxreceivebuffer=20000","-prune=550"], timewait=900))
         self.prunedir = self.options.tmpdir+"/node2/regtest/blocks/"
 
+        # Create node 3 to test manual pruning (it will be re-started with manual pruning later)
+        self.nodes.append(start_node(3, self.options.tmpdir, ["-debug=0","-maxreceivebuffer=20000","-blockmaxsize=999000"], timewait=900))
+        self.manualdir = self.options.tmpdir+"/node3/regtest/blocks/"
+
+        # Create node 4 to test wallet in prune mode, but do not connect
+        self.nodes.append(start_node(4, self.options.tmpdir, ["-debug=0", "-prune=550"]))
+
+        # Determine default relay fee
+        self.relayfee = self.nodes[0].getnetworkinfo()["relayfee"]
+
         connect_nodes(self.nodes[0], 1)
         connect_nodes(self.nodes[1], 2)
         connect_nodes(self.nodes[2], 0)
-        sync_blocks(self.nodes[0:3])
+        connect_nodes(self.nodes[0], 3)
+        sync_blocks(self.nodes[0:4])
 
     def create_big_chain(self):
         # Start by creating some coinbases we can spend later
@@ -57,7 +68,7 @@ def create_big_chain(self):
         for i in range(645):
             mine_large_block(self.nodes[0], self.utxo_cache_0)
 
-        sync_blocks(self.nodes[0:3])
+        sync_blocks(self.nodes[0:4])
 
     def test_height_min(self):
         if not os.path.isfile(self.prunedir+"blk00000.dat"):
@@ -212,6 +223,93 @@ def reorg_back(self):
         # Verify we can now have the data for a block previously pruned
         assert(self.nodes[2].getblock(self.forkhash)["height"] == self.forkheight)
 
+    def manual_test(self):
+        # at this point, node3 has 995 blocks and has not yet run in prune mode
+        self.nodes[3] = start_node(3, self.options.tmpdir, ["-debug=0"], timewait=900)
+        assert_raises_message(JSONRPCException, "not in prune mode", self.nodes[3].pruneblockchain, 500)
+        stop_node(self.nodes[3],3)
+
+        # now re-start in manual pruning mode
+        self.nodes[3] = start_node(3, self.options.tmpdir, ["-debug=0","-prune=1"], timewait=900)
+        assert_equal(self.nodes[3].getblockcount(), 995)
+
+        # should not prune because chain tip of node 3 (995) < PruneAfterHeight (1000)
+        assert_raises_message(JSONRPCException, "Blockchain is too short for pruning", self.nodes[3].pruneblockchain, 500)
+
+        # mine 6 blocks so we are at height 1001 (i.e., above PruneAfterHeight)
+        self.nodes[3].generate(6)
+
+        # negative and zero inputs should raise an exception
+        try:
+            self.nodes[3].pruneblockchain(-10)
+            raise AssertionError("pruneblockchain(-10) should have failed.")
+        except:
+            pass
+
+        try:
+            self.nodes[3].pruneblockchain(0)
+            raise AssertionError("pruneblockchain(0) should have failed.")
+        except:
+            pass
+
+        # height=100 too low to prune first block file so this is a no-op
+        self.nodes[3].pruneblockchain(100)
+        if not os.path.isfile(self.manualdir+"blk00000.dat"):
+            raise AssertionError("blk00000.dat is missing when should still be there")
+
+        # height=500 should prune first file
+        self.nodes[3].pruneblockchain(500)
+        if os.path.isfile(self.manualdir+"blk00000.dat"):
+            raise AssertionError("blk00000.dat is still there, should be pruned by now")
+        if not os.path.isfile(self.manualdir+"blk00001.dat"):
+            raise AssertionError("blk00001.dat is missing when should still be there")
+
+        # height=650 should prune second file
+        self.nodes[3].pruneblockchain(650)
+        if os.path.isfile(self.manualdir+"blk00001.dat"):
+            raise AssertionError("blk00001.dat is still there, should be pruned by now")
+
+        # height=1000 should not prune anything more, because tip-288 is in blk00002.dat.
+        self.nodes[3].pruneblockchain(1000)
+        if not os.path.isfile(self.manualdir+"blk00002.dat"):
+            raise AssertionError("blk00002.dat is still there, should be pruned by now")
+
+        # advance the tip so blk00002.dat and blk00003.dat can be pruned (the last 288 blocks should now be in blk00004.dat)
+        self.nodes[3].generate(288)
+        self.nodes[3].pruneblockchain(1000)
+        if os.path.isfile(self.manualdir+"blk00002.dat"):
+            raise AssertionError("blk00002.dat is still there, should be pruned by now")
+        if os.path.isfile(self.manualdir+"blk00003.dat"):
+            raise AssertionError("blk00003.dat is still there, should be pruned by now")
+
+        # stop node, start back up with auto-prune at 550MB, make sure still runs
+        stop_node(self.nodes[3],3)
+        self.nodes[3] = start_node(3, self.options.tmpdir, ["-debug=0","-prune=550"], timewait=900)
+
+        print("Success")
+
+    def wallet_test(self):
+        # check that the pruning node's wallet is still in good shape
+        print("Stop and start pruning node to trigger wallet rescan")
+        try:
+            stop_node(self.nodes[2], 2)
+            start_node(2, self.options.tmpdir, ["-debug=1","-prune=550"])
+            print("Success")
+        except Exception as detail:
+            raise AssertionError("Wallet test: unable to re-start the pruning node")
+
+        # check that wallet loads loads successfully when restarting a pruned node after IBD.
+        # this was reported to fail in #7494.
+        print ("Syncing node 4 to test wallet")
+        connect_nodes(self.nodes[0], 4)
+        nds = [self.nodes[0], self.nodes[4]]
+        sync_blocks(nds)
+        try:
+            stop_node(self.nodes[4],4) #stop and start to trigger rescan
+            start_node(4, self.options.tmpdir, ["-debug=1","-prune=550"])
+            print ("Success")
+        except Exception as detail:
+            raise AssertionError("Wallet test: unable to re-start node4")
 
     def run_test(self):
         print("Warning! This test requires 4GB of disk space and takes over 30 mins (up to 2 hours)")
@@ -226,6 +324,9 @@ def run_test(self):
         # Start by mining a simple chain that all nodes have
         # N0=N1=N2 **...*(995)
 
+        # stop manual-pruning node with 995 blocks
+        stop_node(self.nodes[3],3)
+
         print("Check that we haven't started pruning yet because we're below PruneAfterHeight")
         self.test_height_min()
         # Extend this chain past the PruneAfterHeight
@@ -308,6 +409,12 @@ def run_test(self):
         #
         # N1 doesn't change because 1033 on main chain (*) is invalid
 
+        print("Test manual pruning")
+        self.manual_test()
+
+        print("Test wallet re-scan")
+        self.wallet_test()
+
         print("Done")
 
 if __name__ == '__main__':
diff --git a/src/init.cpp b/src/init.cpp
index 992ce8ebdcf49..9ac69b7d39c2f 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -351,9 +351,9 @@ std::string HelpMessage(HelpMessageMode mode)
 #ifndef WIN32
     strUsage += HelpMessageOpt("-pid=<file>", strprintf(_("Specify pid file (default: %s)"), BITCOIN_PID_FILENAME));
 #endif
-    strUsage += HelpMessageOpt("-prune=<n>", strprintf(_("Reduce storage requirements by pruning (deleting) old blocks. This mode is incompatible with -txindex and -rescan. "
+    strUsage += HelpMessageOpt("-prune=<n>", strprintf(_("Reduce storage requirements by enabling pruning (deleting) of old blocks. This allows the pruneblockchain RPC to be called to delete specific blocks, and enables automatic pruning of old blocks if a target size in MiB is provided. This mode is incompatible with -txindex and -rescan. "
             "Warning: Reverting this setting requires re-downloading the entire blockchain. "
-            "(default: 0 = disable pruning blocks, >%u = target size in MiB to use for block files)"), MIN_DISK_SPACE_FOR_BLOCK_FILES / 1024 / 1024));
+            "(default: 0 = disable pruning blocks, 1 = allow manual pruning via RPC, >%u = automatically prune block files to stay under the specified target size in MiB)"), MIN_DISK_SPACE_FOR_BLOCK_FILES / 1024 / 1024));
     strUsage += HelpMessageOpt("-reindex-chainstate", _("Rebuild chain state from the currently indexed blocks"));
     strUsage += HelpMessageOpt("-reindex", _("Rebuild chain state and block index from the blk*.dat files on disk"));
 #ifndef WIN32
@@ -936,12 +936,16 @@ bool AppInitParameterInteraction()
         nScriptCheckThreads = MAX_SCRIPTCHECK_THREADS;
 
     // block pruning; get the amount of disk space (in MiB) to allot for block & undo files
-    int64_t nSignedPruneTarget = GetArg("-prune", 0) * 1024 * 1024;
-    if (nSignedPruneTarget < 0) {
+    int64_t nPruneArg = GetArg("-prune", 0);
+    if (nPruneArg < 0) {
         return InitError(_("Prune cannot be configured with a negative value."));
     }
-    nPruneTarget = (uint64_t) nSignedPruneTarget;
-    if (nPruneTarget) {
+    nPruneTarget = (uint64_t) nPruneArg * 1024 * 1024;
+    if (nPruneArg == 1) {  // manual pruning: -prune=1
+        LogPrintf("Block pruning enabled.  Use RPC call pruneblockchain(height) to manually prune block and undo files.\n");
+        nPruneTarget = std::numeric_limits<uint64_t>::max();
+        fPruneMode = true;
+    } else if (nPruneTarget) {
         if (nPruneTarget < MIN_DISK_SPACE_FOR_BLOCK_FILES) {
             return InitError(strprintf(_("Prune configured below the minimum of %d MiB.  Please use a higher number."), MIN_DISK_SPACE_FOR_BLOCK_FILES / 1024 / 1024));
         }
diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp
index 0b42c1d625b66..f49a333279691 100644
--- a/src/rpc/blockchain.cpp
+++ b/src/rpc/blockchain.cpp
@@ -814,6 +814,36 @@ static bool GetUTXOStats(CCoinsView *view, CCoinsStats &stats)
     return true;
 }
 
+UniValue pruneblockchain(const JSONRPCRequest& request)
+{
+    if (request.fHelp || request.params.size() != 1)
+        throw runtime_error(
+            "pruneblockchain\n"
+            "\nArguments:\n"
+            "1. \"height\"       (int, required) The block height to prune up to.\n");
+
+    if (!fPruneMode)
+        throw JSONRPCError(RPC_METHOD_NOT_FOUND, "Cannot prune blocks because node is not in prune mode.");
+
+    LOCK(cs_main);
+
+    int heightParam = request.params[0].get_int();
+    if (heightParam < 0)
+        throw JSONRPCError(RPC_INVALID_PARAMETER, "Negative block height.");
+
+    unsigned int height = (unsigned int) heightParam;
+    unsigned int chainHeight = (unsigned int) chainActive.Height();
+    if (chainHeight < Params().PruneAfterHeight())
+        throw JSONRPCError(RPC_INTERNAL_ERROR, "Blockchain is too short for pruning.");
+    else if (height > chainHeight)
+        throw JSONRPCError(RPC_INVALID_PARAMETER, "Blockchain is shorter than the attempted prune height.");
+    else if (height > chainHeight - MIN_BLOCKS_TO_KEEP)
+        LogPrint("rpc", "Attempt to prune blocks close to the tip.  Retaining the minimum number of blocks.");
+
+    PruneBlockFilesManual(height);
+    return NullUniValue;
+}
+
 UniValue gettxoutsetinfo(const JSONRPCRequest& request)
 {
     if (request.fHelp || request.params.size() != 0)
@@ -1384,6 +1414,7 @@ static const CRPCCommand commands[] =
     { "blockchain",         "getrawmempool",          &getrawmempool,          true,  {"verbose"} },
     { "blockchain",         "gettxout",               &gettxout,               true,  {"txid","n","include_mempool"} },
     { "blockchain",         "gettxoutsetinfo",        &gettxoutsetinfo,        true,  {} },
+    { "blockchain",         "pruneblockchain",        &pruneblockchain,        true,  {"height"} },
     { "blockchain",         "verifychain",            &verifychain,            true,  {"checklevel","nblocks"} },
 
     { "blockchain",         "preciousblock",          &preciousblock,          true,  {"blockhash"} },
diff --git a/src/rpc/client.cpp b/src/rpc/client.cpp
index 422d005f0ceb9..5d3c4584558ae 100644
--- a/src/rpc/client.cpp
+++ b/src/rpc/client.cpp
@@ -103,6 +103,7 @@ static const CRPCConvertParam vRPCConvertParams[] =
     { "importmulti", 1, "options" },
     { "verifychain", 0, "checklevel" },
     { "verifychain", 1, "nblocks" },
+    { "pruneblockchain", 0, "height" },
     { "keypoolrefill", 0, "newsize" },
     { "getrawmempool", 0, "verbose" },
     { "estimatefee", 0, "nblocks" },
diff --git a/src/validation.cpp b/src/validation.cpp
index 37a4186e0a848..109a71fe74d4e 100644
--- a/src/validation.cpp
+++ b/src/validation.cpp
@@ -185,7 +185,8 @@ enum FlushStateMode {
 };
 
 // See definition for documentation
-bool static FlushStateToDisk(CValidationState &state, FlushStateMode mode);
+bool static FlushStateToDisk(CValidationState &state, FlushStateMode mode, int nManualPruneHeight=0);
+void FindFilesToPruneManual(std::set<int>& setFilesToPrune, int nManualPruneHeight);
 
 bool IsFinalTx(const CTransaction &tx, int nBlockHeight, int64_t nBlockTime)
 {
@@ -1934,7 +1935,7 @@ bool ConnectBlock(const CBlock& block, CValidationState& state, CBlockIndex* pin
  * if they're too large, if it's been a while since the last write,
  * or always and in all cases if we're in prune mode and are deleting files.
  */
-bool static FlushStateToDisk(CValidationState &state, FlushStateMode mode) {
+bool static FlushStateToDisk(CValidationState &state, FlushStateMode mode, int nManualPruneHeight) {
     int64_t nMempoolUsage = mempool.DynamicMemoryUsage();
     const CChainParams& chainparams = Params();
     LOCK2(cs_main, cs_LastBlockFile);
@@ -1944,9 +1945,13 @@ bool static FlushStateToDisk(CValidationState &state, FlushStateMode mode) {
     std::set<int> setFilesToPrune;
     bool fFlushForPrune = false;
     try {
-    if (fPruneMode && fCheckForPruning && !fReindex) {
-        FindFilesToPrune(setFilesToPrune, chainparams.PruneAfterHeight());
-        fCheckForPruning = false;
+    if (fPruneMode && (fCheckForPruning || nManualPruneHeight > 0) && !fReindex) {
+        if (nManualPruneHeight > 0) {
+            FindFilesToPruneManual(setFilesToPrune, nManualPruneHeight);
+        } else {
+            FindFilesToPrune(setFilesToPrune, chainparams.PruneAfterHeight());
+            fCheckForPruning = false;
+        }
         if (!setFilesToPrune.empty()) {
             fFlushForPrune = true;
             if (!fHavePruned) {
@@ -3247,6 +3252,35 @@ void UnlinkPrunedFiles(std::set<int>& setFilesToPrune)
     }
 }
 
+/* Calculate the block/rev files to delete based on height specified by user with RPC command pruneblockchain */
+void FindFilesToPruneManual(std::set<int>& setFilesToPrune, int nManualPruneHeight)
+{
+    assert(fPruneMode && nManualPruneHeight > 0);
+
+    LOCK2(cs_main, cs_LastBlockFile);
+    if (chainActive.Tip() == NULL)
+        return;
+
+    // last block to prune is the lesser of (user-specified height, MIN_BLOCKS_TO_KEEP from the tip)
+    unsigned int nLastBlockWeCanPrune = min((unsigned)nManualPruneHeight, chainActive.Tip()->nHeight - MIN_BLOCKS_TO_KEEP);
+    int count=0;
+    for (int fileNumber = 0; fileNumber < nLastBlockFile; fileNumber++) {
+        if (vinfoBlockFile[fileNumber].nSize == 0 || vinfoBlockFile[fileNumber].nHeightLast > nLastBlockWeCanPrune)
+            continue;
+        PruneOneBlockFile(fileNumber);
+        setFilesToPrune.insert(fileNumber);
+        count++;
+    }
+    LogPrintf("Prune (Manual): prune_height=%d removed %d blk/rev pairs\n", nLastBlockWeCanPrune, count);
+}
+
+/* This function is called from the RPC code for pruneblockchain */
+void PruneBlockFilesManual(int nManualPruneHeight)
+{
+    CValidationState state;
+    FlushStateToDisk(state, FLUSH_STATE_NONE, nManualPruneHeight);
+}
+
 /* Calculate the block/rev files that should be deleted to remain under target*/
 void FindFilesToPrune(std::set<int>& setFilesToPrune, uint64_t nPruneAfterHeight)
 {
diff --git a/src/validation.h b/src/validation.h
index 631602a7017b8..f5e76c7d31e69 100644
--- a/src/validation.h
+++ b/src/validation.h
@@ -309,6 +309,8 @@ CBlockIndex * InsertBlockIndex(uint256 hash);
 void FlushStateToDisk();
 /** Prune block files and flush state to disk. */
 void PruneAndFlush();
+/** Prune block files up to a given height */
+void PruneBlockFilesManual(int nPruneUpToHeight);
 
 /** (try to) add transaction to memory pool **/
 bool AcceptToMemoryPool(CTxMemPool& pool, CValidationState &state, const CTransactionRef &tx, bool fLimitFree,

From afffeea7d98ba358acd54a89bc0e7ae1c4d54023 Mon Sep 17 00:00:00 2001
From: Russell Yanofsky <russ@yanofsky.org>
Date: Mon, 9 Jan 2017 13:35:12 -0500
Subject: [PATCH 1529/1802] fixup! Add pruneblockchain RPC to enable manual
 block file pruning.

Extend pruneblockchain RPC to accept block timestamps as well as block indices.
---
 qa/rpc-tests/pruning.py | 97 ++++++++++++++++++++++++-----------------
 src/rpc/blockchain.cpp  | 12 ++++-
 2 files changed, 67 insertions(+), 42 deletions(-)

diff --git a/qa/rpc-tests/pruning.py b/qa/rpc-tests/pruning.py
index 062bc8dda4963..25f07790034d3 100755
--- a/qa/rpc-tests/pruning.py
+++ b/qa/rpc-tests/pruning.py
@@ -25,7 +25,7 @@ class PruneTest(BitcoinTestFramework):
     def __init__(self):
         super().__init__()
         self.setup_clean_chain = True
-        self.num_nodes = 5
+        self.num_nodes = 6
 
         # Cache for utxos, as the listunspent may take a long time later in the test
         self.utxo_cache_0 = []
@@ -43,12 +43,12 @@ def setup_network(self):
         self.nodes.append(start_node(2, self.options.tmpdir, ["-debug","-maxreceivebuffer=20000","-prune=550"], timewait=900))
         self.prunedir = self.options.tmpdir+"/node2/regtest/blocks/"
 
-        # Create node 3 to test manual pruning (it will be re-started with manual pruning later)
+        # Create nodes 3 and 4 to test manual pruning (they will be re-started with manual pruning later)
         self.nodes.append(start_node(3, self.options.tmpdir, ["-debug=0","-maxreceivebuffer=20000","-blockmaxsize=999000"], timewait=900))
-        self.manualdir = self.options.tmpdir+"/node3/regtest/blocks/"
+        self.nodes.append(start_node(4, self.options.tmpdir, ["-debug=0","-maxreceivebuffer=20000","-blockmaxsize=999000"], timewait=900))
 
-        # Create node 4 to test wallet in prune mode, but do not connect
-        self.nodes.append(start_node(4, self.options.tmpdir, ["-debug=0", "-prune=550"]))
+        # Create nodes 5 to test wallet in prune mode, but do not connect
+        self.nodes.append(start_node(5, self.options.tmpdir, ["-debug=0", "-prune=550"]))
 
         # Determine default relay fee
         self.relayfee = self.nodes[0].getnetworkinfo()["relayfee"]
@@ -57,7 +57,8 @@ def setup_network(self):
         connect_nodes(self.nodes[1], 2)
         connect_nodes(self.nodes[2], 0)
         connect_nodes(self.nodes[0], 3)
-        sync_blocks(self.nodes[0:4])
+        connect_nodes(self.nodes[0], 4)
+        sync_blocks(self.nodes[0:5])
 
     def create_big_chain(self):
         # Start by creating some coinbases we can spend later
@@ -68,7 +69,7 @@ def create_big_chain(self):
         for i in range(645):
             mine_large_block(self.nodes[0], self.utxo_cache_0)
 
-        sync_blocks(self.nodes[0:4])
+        sync_blocks(self.nodes[0:5])
 
     def test_height_min(self):
         if not os.path.isfile(self.prunedir+"blk00000.dat"):
@@ -223,68 +224,78 @@ def reorg_back(self):
         # Verify we can now have the data for a block previously pruned
         assert(self.nodes[2].getblock(self.forkhash)["height"] == self.forkheight)
 
-    def manual_test(self):
-        # at this point, node3 has 995 blocks and has not yet run in prune mode
-        self.nodes[3] = start_node(3, self.options.tmpdir, ["-debug=0"], timewait=900)
-        assert_raises_message(JSONRPCException, "not in prune mode", self.nodes[3].pruneblockchain, 500)
-        stop_node(self.nodes[3],3)
+    def manual_test(self, node_number, use_timestamp):
+        # at this point, node has 995 blocks and has not yet run in prune mode
+        node = self.nodes[node_number] = start_node(node_number, self.options.tmpdir, ["-debug=0"], timewait=900)
+        assert_equal(node.getblockcount(), 995)
+        assert_raises_message(JSONRPCException, "not in prune mode", node.pruneblockchain, 500)
+        stop_node(node, node_number)
 
         # now re-start in manual pruning mode
-        self.nodes[3] = start_node(3, self.options.tmpdir, ["-debug=0","-prune=1"], timewait=900)
-        assert_equal(self.nodes[3].getblockcount(), 995)
+        node = self.nodes[node_number] = start_node(node_number, self.options.tmpdir, ["-debug=0","-prune=1"], timewait=900)
+        assert_equal(node.getblockcount(), 995)
+
+        def height(index):
+            if use_timestamp:
+                return node.getblockheader(node.getblockhash(index))["time"]
+            else:
+                return index
+
+        def has_block(index):
+            return os.path.isfile(self.options.tmpdir + "/node{}/regtest/blocks/blk{:05}.dat".format(node_number, index))
 
         # should not prune because chain tip of node 3 (995) < PruneAfterHeight (1000)
-        assert_raises_message(JSONRPCException, "Blockchain is too short for pruning", self.nodes[3].pruneblockchain, 500)
+        assert_raises_message(JSONRPCException, "Blockchain is too short for pruning", node.pruneblockchain, height(500))
 
         # mine 6 blocks so we are at height 1001 (i.e., above PruneAfterHeight)
-        self.nodes[3].generate(6)
+        node.generate(6)
 
         # negative and zero inputs should raise an exception
         try:
-            self.nodes[3].pruneblockchain(-10)
+            node.pruneblockchain(-10)
             raise AssertionError("pruneblockchain(-10) should have failed.")
         except:
             pass
 
         try:
-            self.nodes[3].pruneblockchain(0)
+            node.pruneblockchain(0)
             raise AssertionError("pruneblockchain(0) should have failed.")
         except:
             pass
 
         # height=100 too low to prune first block file so this is a no-op
-        self.nodes[3].pruneblockchain(100)
-        if not os.path.isfile(self.manualdir+"blk00000.dat"):
+        node.pruneblockchain(height(100))
+        if not has_block(0):
             raise AssertionError("blk00000.dat is missing when should still be there")
 
         # height=500 should prune first file
-        self.nodes[3].pruneblockchain(500)
-        if os.path.isfile(self.manualdir+"blk00000.dat"):
+        node.pruneblockchain(height(500))
+        if has_block(0):
             raise AssertionError("blk00000.dat is still there, should be pruned by now")
-        if not os.path.isfile(self.manualdir+"blk00001.dat"):
+        if not has_block(1):
             raise AssertionError("blk00001.dat is missing when should still be there")
 
         # height=650 should prune second file
-        self.nodes[3].pruneblockchain(650)
-        if os.path.isfile(self.manualdir+"blk00001.dat"):
+        node.pruneblockchain(height(650))
+        if has_block(1):
             raise AssertionError("blk00001.dat is still there, should be pruned by now")
 
         # height=1000 should not prune anything more, because tip-288 is in blk00002.dat.
-        self.nodes[3].pruneblockchain(1000)
-        if not os.path.isfile(self.manualdir+"blk00002.dat"):
+        node.pruneblockchain(height(1000))
+        if not has_block(2):
             raise AssertionError("blk00002.dat is still there, should be pruned by now")
 
         # advance the tip so blk00002.dat and blk00003.dat can be pruned (the last 288 blocks should now be in blk00004.dat)
-        self.nodes[3].generate(288)
-        self.nodes[3].pruneblockchain(1000)
-        if os.path.isfile(self.manualdir+"blk00002.dat"):
+        node.generate(288)
+        node.pruneblockchain(height(1000))
+        if has_block(2):
             raise AssertionError("blk00002.dat is still there, should be pruned by now")
-        if os.path.isfile(self.manualdir+"blk00003.dat"):
+        if has_block(3):
             raise AssertionError("blk00003.dat is still there, should be pruned by now")
 
         # stop node, start back up with auto-prune at 550MB, make sure still runs
-        stop_node(self.nodes[3],3)
-        self.nodes[3] = start_node(3, self.options.tmpdir, ["-debug=0","-prune=550"], timewait=900)
+        stop_node(node, node_number)
+        self.nodes[node_number] = start_node(node_number, self.options.tmpdir, ["-debug=0","-prune=550"], timewait=900)
 
         print("Success")
 
@@ -300,16 +311,16 @@ def wallet_test(self):
 
         # check that wallet loads loads successfully when restarting a pruned node after IBD.
         # this was reported to fail in #7494.
-        print ("Syncing node 4 to test wallet")
-        connect_nodes(self.nodes[0], 4)
-        nds = [self.nodes[0], self.nodes[4]]
+        print ("Syncing node 5 to test wallet")
+        connect_nodes(self.nodes[0], 5)
+        nds = [self.nodes[0], self.nodes[5]]
         sync_blocks(nds)
         try:
-            stop_node(self.nodes[4],4) #stop and start to trigger rescan
-            start_node(4, self.options.tmpdir, ["-debug=1","-prune=550"])
+            stop_node(self.nodes[5],5) #stop and start to trigger rescan
+            start_node(5, self.options.tmpdir, ["-debug=1","-prune=550"])
             print ("Success")
         except Exception as detail:
-            raise AssertionError("Wallet test: unable to re-start node4")
+            raise AssertionError("Wallet test: unable to re-start node5")
 
     def run_test(self):
         print("Warning! This test requires 4GB of disk space and takes over 30 mins (up to 2 hours)")
@@ -326,6 +337,7 @@ def run_test(self):
 
         # stop manual-pruning node with 995 blocks
         stop_node(self.nodes[3],3)
+        stop_node(self.nodes[4],4)
 
         print("Check that we haven't started pruning yet because we're below PruneAfterHeight")
         self.test_height_min()
@@ -409,8 +421,11 @@ def run_test(self):
         #
         # N1 doesn't change because 1033 on main chain (*) is invalid
 
-        print("Test manual pruning")
-        self.manual_test()
+        print("Test manual pruning with block indices")
+        self.manual_test(3, use_timestamp=False)
+
+        print("Test manual pruning with timestamps")
+        self.manual_test(4, use_timestamp=True)
 
         print("Test wallet re-scan")
         self.wallet_test()
diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp
index f49a333279691..e828618a82430 100644
--- a/src/rpc/blockchain.cpp
+++ b/src/rpc/blockchain.cpp
@@ -820,7 +820,7 @@ UniValue pruneblockchain(const JSONRPCRequest& request)
         throw runtime_error(
             "pruneblockchain\n"
             "\nArguments:\n"
-            "1. \"height\"       (int, required) The block height to prune up to.\n");
+            "1. \"height\"       (numeric, required) The block height to prune up to. May be set to a discrete height, or to a unix timestamp to prune based on block time.\n");
 
     if (!fPruneMode)
         throw JSONRPCError(RPC_METHOD_NOT_FOUND, "Cannot prune blocks because node is not in prune mode.");
@@ -831,6 +831,16 @@ UniValue pruneblockchain(const JSONRPCRequest& request)
     if (heightParam < 0)
         throw JSONRPCError(RPC_INVALID_PARAMETER, "Negative block height.");
 
+    // Height value more than a billion is too high to be a block height, and
+    // too low to be a block time (corresponds to timestamp from Sep 2001).
+    if (heightParam > 1000000000) {
+        CBlockIndex* pindex = chainActive.FindLatestBefore(heightParam);
+        if (!pindex) {
+            throw JSONRPCError(RPC_INTERNAL_ERROR, "Could not find block before specified timestamp.");
+        }
+        heightParam = pindex->nHeight;
+    }
+
     unsigned int height = (unsigned int) heightParam;
     unsigned int chainHeight = (unsigned int) chainActive.Height();
     if (chainHeight < Params().PruneAfterHeight())

From 766e8a40b478353a89622f42809ddb11e695a0c9 Mon Sep 17 00:00:00 2001
From: Suhas Daftuar <sdaftuar@gmail.com>
Date: Fri, 9 Dec 2016 15:31:06 -0500
Subject: [PATCH 1530/1802] [wallet] Add IsAllFromMe: true if all inputs are
 from wallet

---
 src/wallet/wallet.cpp | 23 +++++++++++++++++++++++
 src/wallet/wallet.h   |  6 ++++++
 2 files changed, 29 insertions(+)

diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index 2775f4def3d0a..be5d692c927e1 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -1154,6 +1154,8 @@ isminetype CWallet::IsMine(const CTxIn &txin) const
     return ISMINE_NO;
 }
 
+// Note that this function doesn't distinguish between a 0-valued input,
+// and a not-"is mine" (according to the filter) input.
 CAmount CWallet::GetDebit(const CTxIn &txin, const isminefilter& filter) const
 {
     {
@@ -1236,6 +1238,27 @@ CAmount CWallet::GetDebit(const CTransaction& tx, const isminefilter& filter) co
     return nDebit;
 }
 
+bool CWallet::IsAllFromMe(const CTransaction& tx, const isminefilter& filter) const
+{
+    LOCK(cs_wallet);
+
+    BOOST_FOREACH(const CTxIn& txin, tx.vin)
+    {
+        auto mi = mapWallet.find(txin.prevout.hash);
+        if (mi == mapWallet.end())
+            return false; // any unknown inputs can't be from us
+
+        const CWalletTx& prev = (*mi).second;
+
+        if (txin.prevout.n >= prev.tx->vout.size())
+            return false; // invalid input!
+
+        if (!(IsMine(prev.tx->vout[txin.prevout.n]) & filter))
+            return false;
+    }
+    return true;
+}
+
 CAmount CWallet::GetCredit(const CTransaction& tx, const isminefilter& filter) const
 {
     CAmount nCredit = 0;
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
index b9fa6bb24b391..8a587f4ed0453 100644
--- a/src/wallet/wallet.h
+++ b/src/wallet/wallet.h
@@ -825,6 +825,10 @@ class CWallet : public CCryptoKeyStore, public CValidationInterface
     std::set<CTxDestination> GetAccountAddresses(const std::string& strAccount) const;
 
     isminetype IsMine(const CTxIn& txin) const;
+    /**
+     * Returns amount of debit if the input matches the
+     * filter, otherwise returns 0
+     */
     CAmount GetDebit(const CTxIn& txin, const isminefilter& filter) const;
     isminetype IsMine(const CTxOut& txout) const;
     CAmount GetCredit(const CTxOut& txout, const isminefilter& filter) const;
@@ -834,6 +838,8 @@ class CWallet : public CCryptoKeyStore, public CValidationInterface
     /** should probably be renamed to IsRelevantToMe */
     bool IsFromMe(const CTransaction& tx) const;
     CAmount GetDebit(const CTransaction& tx, const isminefilter& filter) const;
+    /** Returns whether all of the inputs match the filter */
+    bool IsAllFromMe(const CTransaction& tx, const isminefilter& filter) const;
     CAmount GetCredit(const CTransaction& tx, const isminefilter& filter) const;
     CAmount GetChange(const CTransaction& tx) const;
     void SetBestChain(const CBlockLocator& loc);

From 1531652e02d856c1b8c3ba6f6e51e1983ac0540c Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Mon, 9 Jan 2017 14:38:06 -0500
Subject: [PATCH 1531/1802] Keep shared_ptrs to recently-replaced txn for
 compact blocks

---
 src/init.cpp           |  1 +
 src/net_processing.cpp | 24 ++++++++++++++++++++++--
 src/net_processing.h   |  2 ++
 3 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/src/init.cpp b/src/init.cpp
index 992ce8ebdcf49..7a89fb88798b4 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -346,6 +346,7 @@ std::string HelpMessage(HelpMessageMode mode)
     strUsage += HelpMessageOpt("-maxorphantx=<n>", strprintf(_("Keep at most <n> unconnectable transactions in memory (default: %u)"), DEFAULT_MAX_ORPHAN_TRANSACTIONS));
     strUsage += HelpMessageOpt("-maxmempool=<n>", strprintf(_("Keep the transaction memory pool below <n> megabytes (default: %u)"), DEFAULT_MAX_MEMPOOL_SIZE));
     strUsage += HelpMessageOpt("-mempoolexpiry=<n>", strprintf(_("Do not keep transactions in the mempool longer than <n> hours (default: %u)"), DEFAULT_MEMPOOL_EXPIRY));
+    strUsage += HelpMessageOpt("-blockreconstructionextratxn=<n>", strprintf(_("Extra transactions to keep in memory for compact block reconstructions (default: %u)"), DEFAULT_BLOCK_RECONSTRUCTION_EXTRA_TXN));
     strUsage += HelpMessageOpt("-par=<n>", strprintf(_("Set the number of script verification threads (%u to %d, 0 = auto, <0 = leave that many cores free, default: %d)"),
         -GetNumCores(), MAX_SCRIPTCHECK_THREADS, DEFAULT_SCRIPTCHECK_THREADS));
 #ifndef WIN32
diff --git a/src/net_processing.cpp b/src/net_processing.cpp
index 3a956e89e7cd3..c549b9eb9e46b 100644
--- a/src/net_processing.cpp
+++ b/src/net_processing.cpp
@@ -59,6 +59,9 @@ map<uint256, COrphanTx> mapOrphanTransactions GUARDED_BY(cs_main);
 map<COutPoint, set<map<uint256, COrphanTx>::iterator, IteratorComparator>> mapOrphanTransactionsByPrev GUARDED_BY(cs_main);
 void EraseOrphansFor(NodeId peer) EXCLUSIVE_LOCKS_REQUIRED(cs_main);
 
+static size_t vExtraTxnForCompactIt = 0;
+static std::vector<std::pair<uint256, CTransactionRef>> vExtraTxnForCompact GUARDED_BY(cs_main);
+
 static const uint64_t RANDOMIZER_ID_ADDRESS_RELAY = 0x3cac0035b5866b90ULL; // SHA256("main address relay")[0:8]
 
 // Internal stuff
@@ -586,6 +589,17 @@ void UnregisterNodeSignals(CNodeSignals& nodeSignals)
 // mapOrphanTransactions
 //
 
+void AddToCompactExtraTransactions(const CTransactionRef& tx)
+{
+    size_t max_extra_txn = GetArg("-blockreconstructionextratxn", DEFAULT_BLOCK_RECONSTRUCTION_EXTRA_TXN);
+    if (max_extra_txn <= 0)
+        return;
+    if (!vExtraTxnForCompact.size())
+        vExtraTxnForCompact.resize(max_extra_txn);
+    vExtraTxnForCompact[vExtraTxnForCompactIt] = std::make_pair(tx->GetWitnessHash(), tx);
+    vExtraTxnForCompactIt = (vExtraTxnForCompactIt + 1) % max_extra_txn;
+}
+
 bool AddOrphanTx(const CTransactionRef& tx, NodeId peer) EXCLUSIVE_LOCKS_REQUIRED(cs_main)
 {
     const uint256& hash = tx->GetHash();
@@ -1615,7 +1629,9 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
         pfrom->setAskFor.erase(inv.hash);
         mapAlreadyAskedFor.erase(inv.hash);
 
-        if (!AlreadyHave(inv) && AcceptToMemoryPool(mempool, state, ptx, true, &fMissingInputs)) {
+        std::list<CTransactionRef> lRemovedTxn;
+
+        if (!AlreadyHave(inv) && AcceptToMemoryPool(mempool, state, ptx, true, &fMissingInputs, &lRemovedTxn)) {
             mempool.check(pcoinsTip);
             RelayTransaction(tx, connman);
             for (unsigned int i = 0; i < tx.vout.size(); i++) {
@@ -1653,7 +1669,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
 
                     if (setMisbehaving.count(fromPeer))
                         continue;
-                    if (AcceptToMemoryPool(mempool, stateDummy, porphanTx, true, &fMissingInputs2)) {
+                    if (AcceptToMemoryPool(mempool, stateDummy, porphanTx, true, &fMissingInputs2, &lRemovedTxn)) {
                         LogPrint("mempool", "   accepted orphan tx %s\n", orphanHash.ToString());
                         RelayTransaction(orphanTx, connman);
                         for (unsigned int i = 0; i < orphanTx.vout.size(); i++) {
@@ -1743,6 +1759,10 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
                 }
             }
         }
+
+        for (const CTransactionRef& tx : lRemovedTxn)
+            AddToCompactExtraTransactions(tx);
+
         int nDoS = 0;
         if (state.IsInvalid(nDoS))
         {
diff --git a/src/net_processing.h b/src/net_processing.h
index 92ea21df724cc..a338e14a97b06 100644
--- a/src/net_processing.h
+++ b/src/net_processing.h
@@ -15,6 +15,8 @@ static const unsigned int DEFAULT_MAX_ORPHAN_TRANSACTIONS = 100;
 static const int64_t ORPHAN_TX_EXPIRE_TIME = 20 * 60;
 /** Minimum time between orphan transactions expire time checks in seconds */
 static const int64_t ORPHAN_TX_EXPIRE_INTERVAL = 5 * 60;
+/** Default number of orphan+recently-replaced txn to keep around for block reconstruction */
+static const unsigned int DEFAULT_BLOCK_RECONSTRUCTION_EXTRA_TXN = 100;
 
 /** Register with a network node to receive its signals */
 void RegisterNodeSignals(CNodeSignals& nodeSignals);

From 93380c5247526e2248248a7d539233ec48d11bdd Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Sun, 4 Dec 2016 20:44:37 -0800
Subject: [PATCH 1532/1802] Use replaced transactions in compact block
 reconstruction

---
 src/blockencodings.cpp            | 32 ++++++++++++++++++++++++++++++-
 src/blockencodings.h              |  3 ++-
 src/net_processing.cpp            |  4 ++--
 src/test/blockencodings_tests.cpp | 10 ++++++----
 4 files changed, 41 insertions(+), 8 deletions(-)

diff --git a/src/blockencodings.cpp b/src/blockencodings.cpp
index 72fe17bdc7ef8..43b4cb9b862ac 100644
--- a/src/blockencodings.cpp
+++ b/src/blockencodings.cpp
@@ -47,7 +47,7 @@ uint64_t CBlockHeaderAndShortTxIDs::GetShortID(const uint256& txhash) const {
 
 
 
-ReadStatus PartiallyDownloadedBlock::InitData(const CBlockHeaderAndShortTxIDs& cmpctblock) {
+ReadStatus PartiallyDownloadedBlock::InitData(const CBlockHeaderAndShortTxIDs& cmpctblock, std::vector<std::pair<uint256, CTransactionRef>>& extra_txn) {
     if (cmpctblock.header.IsNull() || (cmpctblock.shorttxids.empty() && cmpctblock.prefilledtxn.empty()))
         return READ_STATUS_INVALID;
     if (cmpctblock.shorttxids.size() + cmpctblock.prefilledtxn.size() > MAX_BLOCK_BASE_SIZE / MIN_TRANSACTION_BASE_SIZE)
@@ -104,6 +104,7 @@ ReadStatus PartiallyDownloadedBlock::InitData(const CBlockHeaderAndShortTxIDs& c
         return READ_STATUS_FAILED; // Short ID collision
 
     std::vector<bool> have_txn(txn_available.size());
+    {
     LOCK(pool->cs);
     const std::vector<std::pair<uint256, CTxMemPool::txiter> >& vTxHashes = pool->vTxHashes;
     for (size_t i = 0; i < vTxHashes.size(); i++) {
@@ -130,6 +131,35 @@ ReadStatus PartiallyDownloadedBlock::InitData(const CBlockHeaderAndShortTxIDs& c
         if (mempool_count == shorttxids.size())
             break;
     }
+    }
+
+    for (size_t i = 0; i < extra_txn.size(); i++) {
+        uint64_t shortid = cmpctblock.GetShortID(extra_txn[i].first);
+        std::unordered_map<uint64_t, uint16_t>::iterator idit = shorttxids.find(shortid);
+        if (idit != shorttxids.end()) {
+            if (!have_txn[idit->second]) {
+                txn_available[idit->second] = extra_txn[i].second;
+                have_txn[idit->second]  = true;
+                mempool_count++;
+            } else {
+                // If we find two mempool txn that match the short id, just request it.
+                // This should be rare enough that the extra bandwidth doesn't matter,
+                // but eating a round-trip due to FillBlock failure would be annoying
+                // Note that we dont want duplication between extra_txn and mempool to
+                // trigger this case, so we compare witness hashes first
+                if (txn_available[idit->second] &&
+                        txn_available[idit->second]->GetWitnessHash() != extra_txn[i].second->GetWitnessHash()) {
+                    txn_available[idit->second].reset();
+                    mempool_count--;
+                }
+            }
+        }
+        // Though ideally we'd continue scanning for the two-txn-match-shortid case,
+        // the performance win of an early exit here is too good to pass up and worth
+        // the extra risk.
+        if (mempool_count == shorttxids.size())
+            break;
+    }
 
     LogPrint("cmpctblock", "Initialized PartiallyDownloadedBlock for block %s using a cmpctblock of size %lu\n", cmpctblock.header.GetHash().ToString(), GetSerializeSize(cmpctblock, SER_NETWORK, PROTOCOL_VERSION));
 
diff --git a/src/blockencodings.h b/src/blockencodings.h
index 809ccbf9363fa..7bbd9c661098c 100644
--- a/src/blockencodings.h
+++ b/src/blockencodings.h
@@ -200,7 +200,8 @@ class PartiallyDownloadedBlock {
     CBlockHeader header;
     PartiallyDownloadedBlock(CTxMemPool* poolIn) : pool(poolIn) {}
 
-    ReadStatus InitData(const CBlockHeaderAndShortTxIDs& cmpctblock);
+    // extra_txn is a list of extra transactions to look at, in <witness hash, reference> form
+    ReadStatus InitData(const CBlockHeaderAndShortTxIDs& cmpctblock, std::vector<std::pair<uint256, CTransactionRef>>& extra_txn);
     bool IsTxAvailable(size_t index) const;
     ReadStatus FillBlock(CBlock& block, const std::vector<CTransactionRef>& vtx_missing);
 };
diff --git a/src/net_processing.cpp b/src/net_processing.cpp
index c549b9eb9e46b..8e23e54e06530 100644
--- a/src/net_processing.cpp
+++ b/src/net_processing.cpp
@@ -1879,7 +1879,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
                 }
 
                 PartiallyDownloadedBlock& partialBlock = *(*queuedBlockIt)->partialBlock;
-                ReadStatus status = partialBlock.InitData(cmpctblock);
+                ReadStatus status = partialBlock.InitData(cmpctblock, vExtraTxnForCompact);
                 if (status == READ_STATUS_INVALID) {
                     MarkBlockAsReceived(pindex->GetBlockHash()); // Reset in-flight state in case of whitelist
                     Misbehaving(pfrom->GetId(), 100);
@@ -1921,7 +1921,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
                 // Optimistically try to reconstruct anyway since we might be
                 // able to without any round trips.
                 PartiallyDownloadedBlock tempBlock(&mempool);
-                ReadStatus status = tempBlock.InitData(cmpctblock);
+                ReadStatus status = tempBlock.InitData(cmpctblock, vExtraTxnForCompact);
                 if (status != READ_STATUS_OK) {
                     // TODO: don't ignore failures
                     return true;
diff --git a/src/test/blockencodings_tests.cpp b/src/test/blockencodings_tests.cpp
index e3876e9695b2f..311ac024f3b2c 100644
--- a/src/test/blockencodings_tests.cpp
+++ b/src/test/blockencodings_tests.cpp
@@ -11,6 +11,8 @@
 
 #include <boost/test/unit_test.hpp>
 
+std::vector<std::pair<uint256, CTransactionRef>> extra_txn;
+
 struct RegtestingSetup : public TestingSetup {
     RegtestingSetup() : TestingSetup(CBaseChainParams::REGTEST) {}
 };
@@ -73,7 +75,7 @@ BOOST_AUTO_TEST_CASE(SimpleRoundTripTest)
         stream >> shortIDs2;
 
         PartiallyDownloadedBlock partialBlock(&pool);
-        BOOST_CHECK(partialBlock.InitData(shortIDs2) == READ_STATUS_OK);
+        BOOST_CHECK(partialBlock.InitData(shortIDs2, extra_txn) == READ_STATUS_OK);
         BOOST_CHECK( partialBlock.IsTxAvailable(0));
         BOOST_CHECK(!partialBlock.IsTxAvailable(1));
         BOOST_CHECK( partialBlock.IsTxAvailable(2));
@@ -179,7 +181,7 @@ BOOST_AUTO_TEST_CASE(NonCoinbasePreforwardRTTest)
         stream >> shortIDs2;
 
         PartiallyDownloadedBlock partialBlock(&pool);
-        BOOST_CHECK(partialBlock.InitData(shortIDs2) == READ_STATUS_OK);
+        BOOST_CHECK(partialBlock.InitData(shortIDs2, extra_txn) == READ_STATUS_OK);
         BOOST_CHECK(!partialBlock.IsTxAvailable(0));
         BOOST_CHECK( partialBlock.IsTxAvailable(1));
         BOOST_CHECK( partialBlock.IsTxAvailable(2));
@@ -245,7 +247,7 @@ BOOST_AUTO_TEST_CASE(SufficientPreforwardRTTest)
         stream >> shortIDs2;
 
         PartiallyDownloadedBlock partialBlock(&pool);
-        BOOST_CHECK(partialBlock.InitData(shortIDs2) == READ_STATUS_OK);
+        BOOST_CHECK(partialBlock.InitData(shortIDs2, extra_txn) == READ_STATUS_OK);
         BOOST_CHECK( partialBlock.IsTxAvailable(0));
         BOOST_CHECK( partialBlock.IsTxAvailable(1));
         BOOST_CHECK( partialBlock.IsTxAvailable(2));
@@ -300,7 +302,7 @@ BOOST_AUTO_TEST_CASE(EmptyBlockRoundTripTest)
         stream >> shortIDs2;
 
         PartiallyDownloadedBlock partialBlock(&pool);
-        BOOST_CHECK(partialBlock.InitData(shortIDs2) == READ_STATUS_OK);
+        BOOST_CHECK(partialBlock.InitData(shortIDs2, extra_txn) == READ_STATUS_OK);
         BOOST_CHECK(partialBlock.IsTxAvailable(0));
 
         CBlock block2;

From 7f8c8cab1e537809848088d3bfaa13ecca7ac8cc Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Mon, 9 Jan 2017 14:38:16 -0500
Subject: [PATCH 1533/1802] Consider all orphan txn for compact-block-extra-txn
 cache

---
 src/net_processing.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/net_processing.cpp b/src/net_processing.cpp
index 8e23e54e06530..bdcfacc06ab12 100644
--- a/src/net_processing.cpp
+++ b/src/net_processing.cpp
@@ -626,6 +626,8 @@ bool AddOrphanTx(const CTransactionRef& tx, NodeId peer) EXCLUSIVE_LOCKS_REQUIRE
         mapOrphanTransactionsByPrev[txin.prevout].insert(ret.first);
     }
 
+    AddToCompactExtraTransactions(tx);
+
     LogPrint("mempool", "stored orphan tx %s (mapsz %u outsz %u)\n", hash.ToString(),
              mapOrphanTransactions.size(), mapOrphanTransactionsByPrev.size());
     return true;

From 863edb45b9841c3058e883015c7576e6f69e3cc6 Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Mon, 9 Jan 2017 14:30:43 -0500
Subject: [PATCH 1534/1802] Consider all (<100k memusage) txn for
 compact-block-extra-txn cache

---
 src/net_processing.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/net_processing.cpp b/src/net_processing.cpp
index bdcfacc06ab12..6025615e4405e 100644
--- a/src/net_processing.cpp
+++ b/src/net_processing.cpp
@@ -1741,7 +1741,10 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
                 // See https://github.com/bitcoin/bitcoin/issues/8279 for details.
                 assert(recentRejects);
                 recentRejects->insert(tx.GetHash());
-            }
+                if (RecursiveDynamicUsage(*ptx) < 100000)
+                    AddToCompactExtraTransactions(ptx);
+            } else if (tx.HasWitness() && RecursiveDynamicUsage(*ptx) < 100000)
+                AddToCompactExtraTransactions(ptx);
 
             if (pfrom->fWhitelisted && GetBoolArg("-whitelistforcerelay", DEFAULT_WHITELISTFORCERELAY)) {
                 // Always relay transactions received from whitelisted peers, even

From 74994c6577a7ea129106e1ef0d5e30d87ca0499c Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Tue, 10 Jan 2017 11:58:27 -0800
Subject: [PATCH 1535/1802] Improve style w.r.t. if

---
 doc/developer-notes.md | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/doc/developer-notes.md b/doc/developer-notes.md
index ba03579e8687e..f8c34e060f9dd 100644
--- a/doc/developer-notes.md
+++ b/doc/developer-notes.md
@@ -11,9 +11,13 @@ gradually.
   - Braces on new lines for namespaces, classes, functions, methods.
   - Braces on the same line for everything else.
   - 4 space indentation (no tabs) for every block except namespaces.
-  - No indentation for public/protected/private or for namespaces.
+  - No indentation for `public`/`protected`/`private` or for `namespace`.
   - No extra spaces inside parenthesis; don't do ( this )
-  - No space after function names; one space after if, for and while.
+  - No space after function names; one space after `if`, `for` and `while`.
+  - If an `if` only has a single-statement then-clause, it can appear
+    on the same line as the if, without braces. In every other case,
+    braces are required, and the then and else clauses must appear
+    correctly indented on a new line.
   - `++i` is preferred over `i++`.
 
 Block style example:
@@ -22,14 +26,18 @@ namespace foo
 {
 class Class
 {
-    bool Function(char* psz, int n)
+    bool Function(const std::string& s, int n)
     {
         // Comment summarising what this section of code does
         for (int i = 0; i < n; ++i) {
             // When something fails, return early
-            if (!Something())
-                return false;
+            if (!Something()) return false;
             ...
+            if (SomethingElse()) {
+                DoMore();
+            } else {
+                DoLess();
+            }
         }
 
         // Success return is usually at the end

From fe7e593b24678082578e76d8f918d4544713b5f0 Mon Sep 17 00:00:00 2001
From: Suhas Daftuar <sdaftuar@gmail.com>
Date: Tue, 10 Jan 2017 15:21:21 -0500
Subject: [PATCH 1536/1802] Fix use-after-free in CTxMemPool::removeConflicts()

---
 src/txmempool.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/txmempool.cpp b/src/txmempool.cpp
index 4f4540a1fc7f7..373687430b116 100644
--- a/src/txmempool.cpp
+++ b/src/txmempool.cpp
@@ -581,8 +581,8 @@ void CTxMemPool::removeConflicts(const CTransaction &tx)
             const CTransaction &txConflict = *it->second;
             if (txConflict != tx)
             {
-                removeRecursive(txConflict);
                 ClearPrioritisation(txConflict.GetHash());
+                removeRecursive(txConflict);
             }
         }
     }

From 116419e58dddef8fe3ff9806a1d8ceebe64ae3e6 Mon Sep 17 00:00:00 2001
From: Alex Morcos <morcos@chaincode.com>
Date: Tue, 10 Jan 2017 16:53:10 -0500
Subject: [PATCH 1537/1802] Don't overwrite validation state with corruption
 check

AcceptToMemoryPool has several classes of return false statements.
- return state.Invalid or state.DoS directly itself
- return false and set fMissingInputs (state is valid)
- return false and state is set by failed CheckTransaction
- return false and state is set by failed CheckInputs.

This commit patches the last case where the state variable was reused for additional calls to CheckInputs to identify witness stripping as cause of validation failure.  After this commit, it should be the case that if !fMissingInputs, state is always Invalid if AcceptToMemoryPool returns false.
---
 src/validation.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/validation.cpp b/src/validation.cpp
index 37a4186e0a848..9c06a3d940159 100644
--- a/src/validation.cpp
+++ b/src/validation.cpp
@@ -919,12 +919,13 @@ bool AcceptToMemoryPoolWorker(CTxMemPool& pool, CValidationState& state, const C
             // SCRIPT_VERIFY_CLEANSTACK requires SCRIPT_VERIFY_WITNESS, so we
             // need to turn both off, and compare against just turning off CLEANSTACK
             // to see if the failure is specifically due to witness validation.
-            if (!tx.HasWitness() && CheckInputs(tx, state, view, true, scriptVerifyFlags & ~(SCRIPT_VERIFY_WITNESS | SCRIPT_VERIFY_CLEANSTACK), true, txdata) &&
-                !CheckInputs(tx, state, view, true, scriptVerifyFlags & ~SCRIPT_VERIFY_CLEANSTACK, true, txdata)) {
+            CValidationState stateDummy; // Want reported failures to be from first CheckInputs
+            if (!tx.HasWitness() && CheckInputs(tx, stateDummy, view, true, scriptVerifyFlags & ~(SCRIPT_VERIFY_WITNESS | SCRIPT_VERIFY_CLEANSTACK), true, txdata) &&
+                !CheckInputs(tx, stateDummy, view, true, scriptVerifyFlags & ~SCRIPT_VERIFY_CLEANSTACK, true, txdata)) {
                 // Only the witness is missing, so the transaction itself may be fine.
                 state.SetCorruptionPossible();
             }
-            return false;
+            return false; // state filled in by CheckInputs
         }
 
         // Check again against just the consensus-critical mandatory script

From 8ac18303da0776e25e98b2c1c952aa54091a0690 Mon Sep 17 00:00:00 2001
From: fanquake <fanquake@gmail.com>
Date: Wed, 4 Jan 2017 17:34:27 +0800
Subject: [PATCH 1538/1802] [depends] Latest config.guess and config.sub

---
 depends/config.guess | 12 +++++++++---
 depends/config.sub   | 31 ++++++++++++++++++++++---------
 2 files changed, 31 insertions(+), 12 deletions(-)

diff --git a/depends/config.guess b/depends/config.guess
index c4bd827a7bedc..bbd48b60e88b9 100755
--- a/depends/config.guess
+++ b/depends/config.guess
@@ -1,8 +1,8 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
-#   Copyright 1992-2016 Free Software Foundation, Inc.
+#   Copyright 1992-2017 Free Software Foundation, Inc.
 
-timestamp='2016-05-15'
+timestamp='2017-01-01'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -50,7 +50,7 @@ version="\
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright 1992-2016 Free Software Foundation, Inc.
+Copyright 1992-2017 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -1000,6 +1000,9 @@ EOF
 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
 	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
 	;;
+    mips64el:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
     openrisc*:Linux:*:*)
 	echo or1k-unknown-linux-${LIBC}
 	exit ;;
@@ -1032,6 +1035,9 @@ EOF
     ppcle:Linux:*:*)
 	echo powerpcle-unknown-linux-${LIBC}
 	exit ;;
+    riscv32:Linux:*:* | riscv64:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
     s390:Linux:*:* | s390x:Linux:*:*)
 	echo ${UNAME_MACHINE}-ibm-linux-${LIBC}
 	exit ;;
diff --git a/depends/config.sub b/depends/config.sub
index 6d86a1e2f77b3..7e792b4ae17ba 100755
--- a/depends/config.sub
+++ b/depends/config.sub
@@ -1,8 +1,8 @@
 #! /bin/sh
 # Configuration validation subroutine script.
-#   Copyright 1992-2016 Free Software Foundation, Inc.
+#   Copyright 1992-2017 Free Software Foundation, Inc.
 
-timestamp='2016-05-10'
+timestamp='2017-01-01'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -67,7 +67,7 @@ Report bugs and patches to <config-patches@gnu.org>."
 version="\
 GNU config.sub ($timestamp)
 
-Copyright 1992-2016 Free Software Foundation, Inc.
+Copyright 1992-2017 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -117,7 +117,7 @@ case $maybe_os in
   nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
   linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
   knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \
-  kopensolaris*-gnu* | \
+  kopensolaris*-gnu* | cloudabi*-eabi* | \
   storm-chaos* | os2-emx* | rtmk-nova*)
     os=-$maybe_os
     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
@@ -301,6 +301,7 @@ case $basic_machine in
 	| open8 | or1k | or1knd | or32 \
 	| pdp10 | pdp11 | pj | pjl \
 	| powerpc | powerpc64 | powerpc64le | powerpcle \
+	| pru \
 	| pyramid \
 	| riscv32 | riscv64 \
 	| rl78 | rx \
@@ -428,6 +429,7 @@ case $basic_machine in
 	| orion-* \
 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
+	| pru-* \
 	| pyramid-* \
 	| riscv32-* | riscv64-* \
 	| rl78-* | romp-* | rs6000-* | rx-* \
@@ -643,6 +645,14 @@ case $basic_machine in
 		basic_machine=m68k-bull
 		os=-sysv3
 		;;
+	e500v[12])
+		basic_machine=powerpc-unknown
+		os=$os"spe"
+		;;
+	e500v[12]-*)
+		basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
+		os=$os"spe"
+		;;
 	ebmon29k)
 		basic_machine=a29k-amd
 		os=-ebmon
@@ -1022,7 +1032,7 @@ case $basic_machine in
 	ppc-* | ppcbe-*)
 		basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
-	ppcle | powerpclittle | ppc-le | powerpc-little)
+	ppcle | powerpclittle)
 		basic_machine=powerpcle-unknown
 		;;
 	ppcle-* | powerpclittle-*)
@@ -1032,7 +1042,7 @@ case $basic_machine in
 		;;
 	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
-	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
+	ppc64le | powerpc64little)
 		basic_machine=powerpc64le-unknown
 		;;
 	ppc64le-* | powerpc64little-*)
@@ -1387,9 +1397,9 @@ case $os in
 	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
-	      | -chorusos* | -chorusrdb* | -cegcc* \
+	      | -chorusos* | -chorusrdb* | -cegcc* | -glidix* \
 	      | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
+	      | -midipix* | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
 	      | -linux-newlib* | -linux-musl* | -linux-uclibc* \
 	      | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \
 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
@@ -1399,7 +1409,7 @@ case $os in
 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
 	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \
-	      | -onefs* | -tirtos* | -phoenix*)
+	      | -onefs* | -tirtos* | -phoenix* | -fuchsia* | -redox*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
@@ -1628,6 +1638,9 @@ case $basic_machine in
 	sparc-* | *-sun)
 		os=-sunos4.1.1
 		;;
+	pru-*)
+		os=-elf
+		;;
 	*-be)
 		os=-beos
 		;;

From 4ed6faf381f4dfede28456b2c06570aa92d55cc0 Mon Sep 17 00:00:00 2001
From: fanquake <fanquake@gmail.com>
Date: Wed, 4 Jan 2017 20:54:13 +0800
Subject: [PATCH 1539/1802] [depends] Boost 1.63.0

---
 depends/packages/boost.mk | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/depends/packages/boost.mk b/depends/packages/boost.mk
index 4173c0d168f5b..57d96e4821295 100644
--- a/depends/packages/boost.mk
+++ b/depends/packages/boost.mk
@@ -1,8 +1,8 @@
 package=boost
-$(package)_version=1_61_0
-$(package)_download_path=https://sourceforge.net/projects/boost/files/boost/1.61.0
+$(package)_version=1_63_0
+$(package)_download_path=https://sourceforge.net/projects/boost/files/boost/1.63.0
 $(package)_file_name=$(package)_$($(package)_version).tar.bz2
-$(package)_sha256_hash=a547bd06c2fd9a71ba1d169d9cf0339da7ebf4753849a8f7d6fdb8feee99b640
+$(package)_sha256_hash=beae2529f759f6b3bf3f4969a19c2e9d6f0c503edcb2de4a61d1428519fcb3b0
 
 define $(package)_set_vars
 $(package)_config_opts_release=variant=release

From 6019d21a43791fccc807904b83d7424ec9389f43 Mon Sep 17 00:00:00 2001
From: fanquake <fanquake@gmail.com>
Date: Wed, 4 Jan 2017 20:54:52 +0800
Subject: [PATCH 1540/1802] [depends] FreeType 2.7.1

---
 depends/packages/freetype.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/depends/packages/freetype.mk b/depends/packages/freetype.mk
index 7cea28ff0bbf9..76b025c463189 100644
--- a/depends/packages/freetype.mk
+++ b/depends/packages/freetype.mk
@@ -1,8 +1,8 @@
 package=freetype
-$(package)_version=2.6.3
+$(package)_version=2.7.1
 $(package)_download_path=http://download.savannah.gnu.org/releases/$(package)
 $(package)_file_name=$(package)-$($(package)_version).tar.bz2
-$(package)_sha256_hash=371e707aa522acf5b15ce93f11183c725b8ed1ee8546d7b3af549863045863a2
+$(package)_sha256_hash=3a3bb2c4e15ffb433f2032f50a5b5a92558206822e22bfe8cbe339af4aa82f88
 
 define $(package)_set_vars
   $(package)_config_opts=--without-zlib --without-png --disable-static

From a4c6da085b8836e23f935475d92453ba063e4196 Mon Sep 17 00:00:00 2001
From: fanquake <fanquake@gmail.com>
Date: Wed, 4 Jan 2017 20:55:56 +0800
Subject: [PATCH 1541/1802] [depends] ccache 3.3.3

---
 depends/packages/native_ccache.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/depends/packages/native_ccache.mk b/depends/packages/native_ccache.mk
index a3a58604e583c..4ed61a49e9ca2 100644
--- a/depends/packages/native_ccache.mk
+++ b/depends/packages/native_ccache.mk
@@ -1,8 +1,8 @@
 package=native_ccache
-$(package)_version=3.3.1
+$(package)_version=3.3.3
 $(package)_download_path=https://samba.org/ftp/ccache
 $(package)_file_name=ccache-$($(package)_version).tar.bz2
-$(package)_sha256_hash=cb6e4bafbb19ba0a2ec43386b123a5f92a20e1e3384c071d5d13e0cb3c84bf73
+$(package)_sha256_hash=2985bc5e32ebe38d2958d508eb54ddcad39eed909489c0c2988035214597ca54
 
 define $(package)_set_vars
 $(package)_config_opts=

From c6347aec6c0258a4c55e6b9505ef9926be6ddf48 Mon Sep 17 00:00:00 2001
From: fanquake <fanquake@gmail.com>
Date: Wed, 4 Jan 2017 20:58:15 +0800
Subject: [PATCH 1542/1802] [depends] dbus 1.10.14

---
 depends/packages/dbus.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/depends/packages/dbus.mk b/depends/packages/dbus.mk
index 8ac9ab742bfe4..90ddcb923f215 100644
--- a/depends/packages/dbus.mk
+++ b/depends/packages/dbus.mk
@@ -1,8 +1,8 @@
 package=dbus
-$(package)_version=1.8.6
+$(package)_version=1.10.14
 $(package)_download_path=http://dbus.freedesktop.org/releases/dbus
 $(package)_file_name=$(package)-$($(package)_version).tar.gz
-$(package)_sha256_hash=eded83ca007b719f32761e60fd8b9ffd0f5796a4caf455b01b5a5ef740ebd23f
+$(package)_sha256_hash=23238f70353e38ce5ca183ebc9525c0d97ac00ef640ad29cf794782af6e6a083
 $(package)_dependencies=expat
 
 define $(package)_set_vars

From 67ca130f73b3f479cc17b5bf26a8c6dd1460ce5a Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Tue, 10 Jan 2017 20:03:38 -0500
Subject: [PATCH 1543/1802] build: fix for out-of-tree/distdir qt builds

---
 src/Makefile.qt.include | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Makefile.qt.include b/src/Makefile.qt.include
index 48abb9b4a2a70..cc773c44ec08c 100644
--- a/src/Makefile.qt.include
+++ b/src/Makefile.qt.include
@@ -354,7 +354,7 @@ endif
 
 RES_IMAGES = 
 
-RES_MOVIES = $(wildcard qt/res/movies/spinner-*.png)
+RES_MOVIES = $(wildcard $(srcdir)/qt/res/movies/spinner-*.png)
 
 BITCOIN_RC = qt/res/bitcoin-qt-res.rc
 

From 7f1fa99a216d41bc3cf96ff3d5e6185897af1fa9 Mon Sep 17 00:00:00 2001
From: fanquake <fanquake@gmail.com>
Date: Wed, 4 Jan 2017 21:02:09 +0800
Subject: [PATCH 1544/1802] [depends] native_ds_store 1.1.0

---
 depends/packages/native_ds_store.mk | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/depends/packages/native_ds_store.mk b/depends/packages/native_ds_store.mk
index 8e902af1b6e9a..49f5829ac1c02 100644
--- a/depends/packages/native_ds_store.mk
+++ b/depends/packages/native_ds_store.mk
@@ -1,9 +1,9 @@
 package=native_ds_store
-$(package)_version=c80c23706eae
+$(package)_version=1.1.0
 $(package)_download_path=https://bitbucket.org/al45tair/ds_store/get
-$(package)_download_file=$($(package)_version).tar.bz2
+$(package)_download_file=v$($(package)_version).tar.bz2
 $(package)_file_name=$(package)-$($(package)_version).tar.bz2
-$(package)_sha256_hash=ce1aa412211610c63d567bbe3e06213006a2d5ba5d76d89399c151b5472cb0da
+$(package)_sha256_hash=921596764d71d1bbd3297a90ef6d286f718794d667e4f81d91d14053525d64c1
 $(package)_install_libdir=$(build_prefix)/lib/python/dist-packages
 $(package)_dependencies=native_biplist
 

From faaf3ca0af683bc6317ff4d1524eb506ab1b2ac8 Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Wed, 21 Dec 2016 13:55:56 +0100
Subject: [PATCH 1545/1802] travis: make distdir before make

---
 .travis.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 6570e6571bc52..4087a854b48ab 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -58,9 +58,11 @@ script:
     - depends/$HOST/native/bin/ccache --max-size=$CCACHE_SIZE
     - test -n "$USE_SHELL" && eval '"$USE_SHELL" -c "./autogen.sh"' || ./autogen.sh
     - mkdir build && cd build
-    - ../configure $BITCOIN_CONFIG_ALL $BITCOIN_CONFIG || ( cat config.log && false)
+    - ../configure --cache-file=config.cache $BITCOIN_CONFIG_ALL $BITCOIN_CONFIG || ( cat config.log && false)
+    - make distdir VERSION=$HOST
+    - cd bitcoin-$HOST
+    - ./configure --cache-file=../config.cache $BITCOIN_CONFIG_ALL $BITCOIN_CONFIG || ( cat config.log && false)
     - make $MAKEJOBS $GOAL || ( echo "Build failure. Verbose build follows." && make $GOAL V=1 ; false )
-    - make distdir
     - export LD_LIBRARY_PATH=$TRAVIS_BUILD_DIR/depends/$HOST/lib
     - if [ "$RUN_TESTS" = "true" ]; then make $MAKEJOBS check VERBOSE=1; fi
     - if [ "$RUN_TESTS" = "true" ]; then qa/pull-tester/rpc-tests.py --coverage; fi

From e356d9a758fff44841c0a630ef6b048de05e53f0 Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Wed, 4 Jan 2017 07:35:39 -0800
Subject: [PATCH 1546/1802] Shorten variable names and switch to tx/s

---
 src/chainparams.cpp | 4 ++--
 src/chainparams.h   | 6 +++---
 src/validation.cpp  | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/chainparams.cpp b/src/chainparams.cpp
index 06196de362529..626dc9f8cbbd1 100644
--- a/src/chainparams.cpp
+++ b/src/chainparams.cpp
@@ -158,7 +158,7 @@ class CMainParams : public CChainParams {
             1397080064, // * UNIX timestamp of last checkpoint block
             36544669,   // * total number of transactions between genesis and last checkpoint
                         //   (the tx=... number in the SetBestChain debug.log lines)
-            60000.0     // * estimated number of transactions per day after checkpoint
+            0.7         // * estimated number of transactions per second after checkpoint
         };
     }
 };
@@ -242,7 +242,7 @@ class CTestNetParams : public CChainParams {
         chainTxData = ChainTxData{
             1337966069,
             1488,
-            300
+            0.0035
         };
 
     }
diff --git a/src/chainparams.h b/src/chainparams.h
index 8dbde9fc241eb..db524e8f8edfe 100644
--- a/src/chainparams.h
+++ b/src/chainparams.h
@@ -31,9 +31,9 @@ struct CCheckpointData {
 };
 
 struct ChainTxData {
-    int64_t nTimeLastCheckpoint;
-    int64_t nTransactionsLastCheckpoint;
-    double fTransactionsPerDay;
+    int64_t nTime;
+    int64_t nTxCount;
+    double dTxRate;
 };
 
 /**
diff --git a/src/validation.cpp b/src/validation.cpp
index 0ff9a00254bed..f9b1cd52ec2d6 100644
--- a/src/validation.cpp
+++ b/src/validation.cpp
@@ -4150,10 +4150,10 @@ double GuessVerificationProgress(const ChainTxData& data, CBlockIndex *pindex) {
 
     double fTxTotal;
 
-    if (pindex->nChainTx <= data.nTransactionsLastCheckpoint) {
-        fTxTotal = data.nTransactionsLastCheckpoint + (nNow - data.nTimeLastCheckpoint) / 86400.0 * data.fTransactionsPerDay;
+    if (pindex->nChainTx <= data.nTxCount) {
+        fTxTotal = data.nTxCount + (nNow - data.nTime) * data.dTxRate;
     } else {
-        fTxTotal = pindex->nChainTx + (nNow - pindex->GetBlockTime()) / 86400.0 * data.fTransactionsPerDay;
+        fTxTotal = pindex->nChainTx + (nNow - pindex->GetBlockTime()) * data.dTxRate;
     }
 
     return pindex->nChainTx / fTxTotal;

From df3637177a5988261e6ce704018e14140401e1e1 Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Wed, 4 Jan 2017 08:20:37 -0800
Subject: [PATCH 1547/1802] Update estimated transaction count data

---
 src/chainparams.cpp | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/chainparams.cpp b/src/chainparams.cpp
index 626dc9f8cbbd1..66b5d48fd9380 100644
--- a/src/chainparams.cpp
+++ b/src/chainparams.cpp
@@ -155,10 +155,11 @@ class CMainParams : public CChainParams {
         };
 
         chainTxData = ChainTxData{
-            1397080064, // * UNIX timestamp of last checkpoint block
-            36544669,   // * total number of transactions between genesis and last checkpoint
+            // Data as of block 00000000000000000166d612d5595e2b1cd88d71d695fc580af64d8da8658c23 (height 446482).
+            1483472411, // * UNIX timestamp of last known number of transactions
+            184495391,  // * total number of transactions between genesis and that timestamp
                         //   (the tx=... number in the SetBestChain debug.log lines)
-            0.7         // * estimated number of transactions per second after checkpoint
+            3.2         // * estimated number of transactions per second after that timestamp
         };
     }
 };
@@ -240,9 +241,10 @@ class CTestNetParams : public CChainParams {
         };
 
         chainTxData = ChainTxData{
-            1337966069,
-            1488,
-            0.0035
+            // Data as of block 00000000c2872f8f8a8935c8e3c5862be9038c97d4de2cf37ed496991166928a (height 1063660)
+            1483546230,
+            12834668,
+            0.15
         };
 
     }

From 918d1fb86b687693b4f248c14238676300872749 Mon Sep 17 00:00:00 2001
From: Russell Yanofsky <russ@yanofsky.org>
Date: Wed, 11 Jan 2017 14:25:32 -0500
Subject: [PATCH 1548/1802] Return height of last block pruned by
 pruneblockchain RPC

Change suggested by Jonas Schnelli <dev@jonasschnelli.ch> in
https://github.com/bitcoin/bitcoin/pull/7871#discussion_r95577623
---
 qa/rpc-tests/pruning.py | 27 ++++++++++++++++++++++-----
 src/rpc/blockchain.cpp  | 13 ++++++++++---
 2 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/qa/rpc-tests/pruning.py b/qa/rpc-tests/pruning.py
index 25f07790034d3..05e72e607863e 100755
--- a/qa/rpc-tests/pruning.py
+++ b/qa/rpc-tests/pruning.py
@@ -16,6 +16,8 @@
 import time
 import os
 
+MIN_BLOCKS_TO_KEEP = 288
+
 
 def calc_usage(blockdir):
     return sum(os.path.getsize(blockdir+f) for f in os.listdir(blockdir) if os.path.isfile(blockdir+f)) / (1024. * 1024.)
@@ -241,6 +243,21 @@ def height(index):
             else:
                 return index
 
+        def prune(index, expected_ret=None):
+            ret = node.pruneblockchain(height(index))
+            # Check the return value. When use_timestamp is True, just check
+            # that the return value is less than or equal to the expected
+            # value, because when more than one block is generated per second,
+            # a timestamp will not be granular enough to uniquely identify an
+            # individual block.
+            if expected_ret is None:
+                expected_ret = index
+            if use_timestamp:
+                assert_greater_than(ret, 0)
+                assert_greater_than(expected_ret + 1, ret)
+            else:
+                assert_equal(ret, expected_ret)
+
         def has_block(index):
             return os.path.isfile(self.options.tmpdir + "/node{}/regtest/blocks/blk{:05}.dat".format(node_number, index))
 
@@ -264,30 +281,30 @@ def has_block(index):
             pass
 
         # height=100 too low to prune first block file so this is a no-op
-        node.pruneblockchain(height(100))
+        prune(100)
         if not has_block(0):
             raise AssertionError("blk00000.dat is missing when should still be there")
 
         # height=500 should prune first file
-        node.pruneblockchain(height(500))
+        prune(500)
         if has_block(0):
             raise AssertionError("blk00000.dat is still there, should be pruned by now")
         if not has_block(1):
             raise AssertionError("blk00001.dat is missing when should still be there")
 
         # height=650 should prune second file
-        node.pruneblockchain(height(650))
+        prune(650)
         if has_block(1):
             raise AssertionError("blk00001.dat is still there, should be pruned by now")
 
         # height=1000 should not prune anything more, because tip-288 is in blk00002.dat.
-        node.pruneblockchain(height(1000))
+        prune(1000, 1001 - MIN_BLOCKS_TO_KEEP)
         if not has_block(2):
             raise AssertionError("blk00002.dat is still there, should be pruned by now")
 
         # advance the tip so blk00002.dat and blk00003.dat can be pruned (the last 288 blocks should now be in blk00004.dat)
         node.generate(288)
-        node.pruneblockchain(height(1000))
+        prune(1000)
         if has_block(2):
             raise AssertionError("blk00002.dat is still there, should be pruned by now")
         if has_block(3):
diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp
index e828618a82430..8a912ff3df87d 100644
--- a/src/rpc/blockchain.cpp
+++ b/src/rpc/blockchain.cpp
@@ -820,7 +820,12 @@ UniValue pruneblockchain(const JSONRPCRequest& request)
         throw runtime_error(
             "pruneblockchain\n"
             "\nArguments:\n"
-            "1. \"height\"       (numeric, required) The block height to prune up to. May be set to a discrete height, or to a unix timestamp to prune based on block time.\n");
+            "1. \"height\"       (numeric, required) The block height to prune up to. May be set to a discrete height, or to a unix timestamp to prune based on block time.\n"
+            "\nResult:\n"
+            "n    (numeric) Height of the last block pruned.\n"
+            "\nExamples:\n"
+            + HelpExampleCli("pruneblockchain", "1000")
+            + HelpExampleRpc("pruneblockchain", "1000"));
 
     if (!fPruneMode)
         throw JSONRPCError(RPC_METHOD_NOT_FOUND, "Cannot prune blocks because node is not in prune mode.");
@@ -847,11 +852,13 @@ UniValue pruneblockchain(const JSONRPCRequest& request)
         throw JSONRPCError(RPC_INTERNAL_ERROR, "Blockchain is too short for pruning.");
     else if (height > chainHeight)
         throw JSONRPCError(RPC_INVALID_PARAMETER, "Blockchain is shorter than the attempted prune height.");
-    else if (height > chainHeight - MIN_BLOCKS_TO_KEEP)
+    else if (height > chainHeight - MIN_BLOCKS_TO_KEEP) {
         LogPrint("rpc", "Attempt to prune blocks close to the tip.  Retaining the minimum number of blocks.");
+        height = chainHeight - MIN_BLOCKS_TO_KEEP;
+    }
 
     PruneBlockFilesManual(height);
-    return NullUniValue;
+    return uint64_t(height);
 }
 
 UniValue gettxoutsetinfo(const JSONRPCRequest& request)

From 54ee3fcb8f2d21ded2efd236aa0b974050f685ba Mon Sep 17 00:00:00 2001
From: Michael Rotarius <michael-rotarius@rotamedia.de>
Date: Wed, 11 Jan 2017 14:29:46 +0100
Subject: [PATCH 1549/1802] RPC help updated

---
 src/rpc/blockchain.cpp   |  6 ++---
 src/rpc/net.cpp          | 12 +++++----
 src/wallet/rpcwallet.cpp | 53 +++++++++++++++++++++++++---------------
 3 files changed, 43 insertions(+), 28 deletions(-)

diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp
index 0b42c1d625b66..59748dd200fe9 100644
--- a/src/rpc/blockchain.cpp
+++ b/src/rpc/blockchain.cpp
@@ -336,8 +336,8 @@ std::string EntryDescriptionString()
            "    \"modifiedfee\" : n,      (numeric) transaction fee with fee deltas used for mining priority\n"
            "    \"time\" : n,             (numeric) local time transaction entered pool in seconds since 1 Jan 1970 GMT\n"
            "    \"height\" : n,           (numeric) block height when transaction entered pool\n"
-           "    \"startingpriority\" : n, (numeric) priority when transaction entered pool\n"
-           "    \"currentpriority\" : n,  (numeric) transaction priority now\n"
+           "    \"startingpriority\" : n, (numeric) DEPRECATED. Priority when transaction entered pool\n"
+           "    \"currentpriority\" : n,  (numeric) DEPRECATED. Transaction priority now\n"
            "    \"descendantcount\" : n,  (numeric) number of in-mempool descendant transactions (including this one)\n"
            "    \"descendantsize\" : n,   (numeric) virtual transaction size of in-mempool descendants (including this one)\n"
            "    \"descendantfees\" : n,   (numeric) modified fees (see above) of in-mempool descendants (including this one)\n"
@@ -651,9 +651,9 @@ UniValue getblockheader(const JSONRPCRequest& request)
             "  \"nonce\" : n,           (numeric) The nonce\n"
             "  \"bits\" : \"1d00ffff\", (string) The bits\n"
             "  \"difficulty\" : x.xxx,  (numeric) The difficulty\n"
+            "  \"chainwork\" : \"0000...1f3\"     (string) Expected number of hashes required to produce the current chain (in hex)\n"
             "  \"previousblockhash\" : \"hash\",  (string) The hash of the previous block\n"
             "  \"nextblockhash\" : \"hash\",      (string) The hash of the next block\n"
-            "  \"chainwork\" : \"0000...1f3\"     (string) Expected number of hashes required to produce the current chain (in hex)\n"
             "}\n"
             "\nResult (for verbose=false):\n"
             "\"data\"             (string) A string that is serialized, hex-encoded data for block 'hash'.\n"
diff --git a/src/rpc/net.cpp b/src/rpc/net.cpp
index acbeb189e0029..27b9963a102d9 100644
--- a/src/rpc/net.cpp
+++ b/src/rpc/net.cpp
@@ -100,13 +100,14 @@ UniValue getpeerinfo(const JSONRPCRequest& request)
             "    \"inflight\": [\n"
             "       n,                        (numeric) The heights of blocks we're currently asking from this peer\n"
             "       ...\n"
-            "    ]\n"
+            "    ],\n"
+            "    \"whitelisted\": true|false, (boolean) Whether the peer is whitelisted\n"					
             "    \"bytessent_per_msg\": {\n"
-            "       \"addr\": n,             (numeric) The total bytes sent aggregated by message type\n"
+            "       \"addr\": n,              (numeric) The total bytes sent aggregated by message type\n"
             "       ...\n"
-            "    }\n"
+            "    },\n"
             "    \"bytesrecv_per_msg\": {\n"
-            "       \"addr\": n,             (numeric) The total bytes received aggregated by message type\n"
+            "       \"addr\": n,              (numeric) The total bytes received aggregated by message type\n"
             "       ...\n"
             "    }\n"
             "  }\n"
@@ -411,6 +412,7 @@ UniValue getnetworkinfo(const JSONRPCRequest& request)
             "    \"limited\": true|false,               (boolean) is the network limited using -onlynet?\n"
             "    \"reachable\": true|false,             (boolean) is the network reachable?\n"
             "    \"proxy\": \"host:port\"               (string) the proxy that is used for this network, or empty if none\n"
+            "    \"proxy_randomize_credentials\": true|false,  (string) Whether randomized credentials are used\n"
             "  }\n"
             "  ,...\n"
             "  ],\n"
@@ -423,7 +425,7 @@ UniValue getnetworkinfo(const JSONRPCRequest& request)
             "  }\n"
             "  ,...\n"
             "  ]\n"
-            "  \"warnings\": \"...\"                    (string) any network warnings (such as alert messages) \n"
+            "  \"warnings\": \"...\"                    (string) any network warnings\n"
             "}\n"
             "\nExamples:\n"
             + HelpExampleCli("getnetworkinfo", "")
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index 4dda480216bdd..82f89905623ac 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -446,9 +446,9 @@ UniValue listaddressgroupings(const JSONRPCRequest& request)
             "[\n"
             "  [\n"
             "    [\n"
-            "      \"address\",     (string) The bitcoin address\n"
+            "      \"address\",            (string) The bitcoin address\n"
             "      amount,                 (numeric) The amount in " + CURRENCY_UNIT + "\n"
-            "      \"account\"             (string, optional) The account (DEPRECATED)\n"
+            "      \"account\"             (string, optional) DEPRECATED. The account\n"
             "    ]\n"
             "    ,...\n"
             "  ]\n"
@@ -668,7 +668,7 @@ UniValue getbalance(const JSONRPCRequest& request)
             "\nArguments:\n"
             "1. \"account\"      (string, optional) DEPRECATED. The selected account, or \"*\" for entire wallet. It may be the default account using \"\".\n"
             "2. minconf          (numeric, optional, default=1) Only include transactions confirmed at least this many times.\n"
-            "3. include_watchonly (bool, optional, default=false) Also include balance in watchonly addresses (see 'importaddress')\n"
+            "3. include_watchonly (bool, optional, default=false) Also include balance in watch-only addresses (see 'importaddress')\n"
             "\nResult:\n"
             "amount              (numeric) The total amount in " + CURRENCY_UNIT + " received for this account.\n"
             "\nExamples:\n"
@@ -1258,7 +1258,7 @@ UniValue listreceivedbyaddress(const JSONRPCRequest& request)
             "\nArguments:\n"
             "1. minconf           (numeric, optional, default=1) The minimum number of confirmations before payments are included.\n"
             "2. include_empty     (bool, optional, default=false) Whether to include addresses that haven't received any payments.\n"
-            "3. include_watchonly (bool, optional, default=false) Whether to include watchonly addresses (see 'importaddress').\n"
+            "3. include_watchonly (bool, optional, default=false) Whether to include watch-only addresses (see 'importaddress').\n"
 
             "\nResult:\n"
             "[\n"
@@ -1268,7 +1268,11 @@ UniValue listreceivedbyaddress(const JSONRPCRequest& request)
             "    \"account\" : \"accountname\",       (string) DEPRECATED. The account of the receiving address. The default account is \"\".\n"
             "    \"amount\" : x.xxx,                  (numeric) The total amount in " + CURRENCY_UNIT + " received by the address\n"
             "    \"confirmations\" : n,               (numeric) The number of confirmations of the most recent transaction included\n"
-            "    \"label\" : \"label\"                (string) A comment for the address/transaction, if any\n"
+            "    \"label\" : \"label\",               (string) A comment for the address/transaction, if any\n"
+            "    \"txids\": [\n"
+            "       n,                                (numeric) The ids of transactions received with the address \n"
+            "       ...\n"
+            "    ]\n"
             "  }\n"
             "  ,...\n"
             "]\n"
@@ -1296,7 +1300,7 @@ UniValue listreceivedbyaccount(const JSONRPCRequest& request)
             "\nArguments:\n"
             "1. minconf           (numeric, optional, default=1) The minimum number of confirmations before payments are included.\n"
             "2. include_empty     (bool, optional, default=false) Whether to include accounts that haven't received any payments.\n"
-            "3. include_watchonly (bool, optional, default=false) Whether to include watchonly addresses (see 'importaddress').\n"
+            "3. include_watchonly (bool, optional, default=false) Whether to include watch-only addresses (see 'importaddress').\n"
 
             "\nResult:\n"
             "[\n"
@@ -1433,7 +1437,7 @@ UniValue listtransactions(const JSONRPCRequest& request)
             "1. \"account\"    (string, optional) DEPRECATED. The account name. Should be \"*\".\n"
             "2. count          (numeric, optional, default=10) The number of transactions to return\n"
             "3. skip           (numeric, optional, default=0) The number of transactions to skip\n"
-            "4. include_watchonly (bool, optional, default=false) Include transactions to watchonly addresses (see 'importaddress')\n"
+            "4. include_watchonly (bool, optional, default=false) Include transactions to watch-only addresses (see 'importaddress')\n"
             "\nResult:\n"
             "[\n"
             "  {\n"
@@ -1448,14 +1452,14 @@ UniValue listtransactions(const JSONRPCRequest& request)
             "    \"amount\": x.xxx,          (numeric) The amount in " + CURRENCY_UNIT + ". This is negative for the 'send' category, and for the\n"
             "                                         'move' category for moves outbound. It is positive for the 'receive' category,\n"
             "                                         and for the 'move' category for inbound funds.\n"
+            "    \"label\": \"label\",       (string) A comment for the address/transaction, if any\n"
             "    \"vout\": n,                (numeric) the vout value\n"
             "    \"fee\": x.xxx,             (numeric) The amount of the fee in " + CURRENCY_UNIT + ". This is negative and only available for the \n"
             "                                         'send' category of transactions.\n"
-            "    \"abandoned\": xxx          (bool) 'true' if the transaction has been abandoned (inputs are respendable).\n"
             "    \"confirmations\": n,       (numeric) The number of confirmations for the transaction. Available for 'send' and \n"
             "                                         'receive' category of transactions. Negative confirmations indicate the\n"
             "                                         transaction conflicts with the block chain\n"
-            "    \"trusted\": xxx            (bool) Whether we consider the outputs of this unconfirmed transaction safe to spend.\n"
+            "    \"trusted\": xxx,           (bool) Whether we consider the outputs of this unconfirmed transaction safe to spend.\n"
             "    \"blockhash\": \"hashvalue\", (string) The block hash containing the transaction. Available for 'send' and 'receive'\n"
             "                                          category of transactions.\n"
             "    \"blockindex\": n,          (numeric) The index of the transaction in the block that includes it. Available for 'send' and 'receive'\n"
@@ -1466,12 +1470,13 @@ UniValue listtransactions(const JSONRPCRequest& request)
             "    \"timereceived\": xxx,      (numeric) The time received in seconds since epoch (midnight Jan 1 1970 GMT). Available \n"
             "                                          for 'send' and 'receive' category of transactions.\n"
             "    \"comment\": \"...\",       (string) If a comment is associated with the transaction.\n"
-            "    \"label\": \"label\"        (string) A comment for the address/transaction, if any\n"
-            "    \"otheraccount\": \"accountname\",  (string) For the 'move' category of transactions, the account the funds came \n"
+            "    \"otheraccount\": \"accountname\",  (string) DEPRECATED. For the 'move' category of transactions, the account the funds came \n"
             "                                          from (for receiving funds, positive amounts), or went to (for sending funds,\n"
             "                                          negative amounts).\n"
-            "    \"bip125-replaceable\": \"yes|no|unknown\"  (string) Whether this transaction could be replaced due to BIP125 (replace-by-fee);\n"
+            "    \"bip125-replaceable\": \"yes|no|unknown\",  (string) Whether this transaction could be replaced due to BIP125 (replace-by-fee);\n"
             "                                                     may be unknown for unconfirmed transactions not in the mempool\n"
+            "    \"abandoned\": xxx          (bool) 'true' if the transaction has been abandoned (inputs are respendable). Only available for the \n"
+            "                                         'send' category of transactions.\n"
             "  }\n"
             "]\n"
 
@@ -1558,7 +1563,7 @@ UniValue listaccounts(const JSONRPCRequest& request)
             "\nDEPRECATED. Returns Object that has account names as keys, account balances as values.\n"
             "\nArguments:\n"
             "1. minconf             (numeric, optional, default=1) Only include transactions with at least this many confirmations\n"
-            "2. include_watchonly   (bool, optional, default=false) Include balances in watchonly addresses (see 'importaddress')\n"
+            "2. include_watchonly   (bool, optional, default=false) Include balances in watch-only addresses (see 'importaddress')\n"
             "\nResult:\n"
             "{                      (json object where keys are account names, and values are numeric balances\n"
             "  \"account\": x.xxx,  (numeric) The property name is the account name, and the value is the total balance for the account.\n"
@@ -1638,7 +1643,7 @@ UniValue listsinceblock(const JSONRPCRequest& request)
             "\nArguments:\n"
             "1. \"blockhash\"            (string, optional) The block hash to list transactions since\n"
             "2. target_confirmations:    (numeric, optional) The confirmations required, must be 1 or more\n"
-            "3. include_watchonly:       (bool, optional, default=false) Include transactions to watchonly addresses (see 'importaddress')"
+            "3. include_watchonly:       (bool, optional, default=false) Include transactions to watch-only addresses (see 'importaddress')"
             "\nResult:\n"
             "{\n"
             "  \"transactions\": [\n"
@@ -1657,6 +1662,9 @@ UniValue listsinceblock(const JSONRPCRequest& request)
             "    \"txid\": \"transactionid\",  (string) The transaction id. Available for 'send' and 'receive' category of transactions.\n"
             "    \"time\": xxx,              (numeric) The transaction time in seconds since epoch (Jan 1 1970 GMT).\n"
             "    \"timereceived\": xxx,      (numeric) The time received in seconds since epoch (Jan 1 1970 GMT). Available for 'send' and 'receive' category of transactions.\n"
+            "    \"bip125-replaceable\": \"yes|no|unknown\",  (string) Whether this transaction could be replaced due to BIP125 (replace-by-fee);\n"
+            "                                                   may be unknown for unconfirmed transactions not in the mempool\n"
+            "    \"abandoned\": xxx,         (bool) 'true' if the transaction has been abandoned (inputs are respendable). Only available for the 'send' category of transactions.\n"
             "    \"comment\": \"...\",       (string) If a comment is associated with the transaction.\n"
             "    \"label\" : \"label\"       (string) A comment for the address/transaction, if any\n"
             "    \"to\": \"...\",            (string) If a comment to is associated with the transaction.\n"
@@ -1730,10 +1738,12 @@ UniValue gettransaction(const JSONRPCRequest& request)
             "\nGet detailed information about in-wallet transaction <txid>\n"
             "\nArguments:\n"
             "1. \"txid\"                  (string, required) The transaction id\n"
-            "2. \"include_watchonly\"     (bool, optional, default=false) Whether to include watchonly addresses in balance calculation and details[]\n"
+            "2. \"include_watchonly\"     (bool, optional, default=false) Whether to include watch-only addresses in balance calculation and details[]\n"
             "\nResult:\n"
             "{\n"
             "  \"amount\" : x.xxx,        (numeric) The transaction amount in " + CURRENCY_UNIT + "\n"
+            "  \"fee\": x.xxx,            (numeric) The amount of the fee in " + CURRENCY_UNIT + ". This is negative and only available for the \n"
+            "                              'send' category of transactions.\n"
             "  \"confirmations\" : n,     (numeric) The number of confirmations\n"
             "  \"blockhash\" : \"hash\",  (string) The block hash\n"
             "  \"blockindex\" : xx,       (numeric) The index of the transaction in the block that includes it\n"
@@ -1741,16 +1751,20 @@ UniValue gettransaction(const JSONRPCRequest& request)
             "  \"txid\" : \"transactionid\",   (string) The transaction id.\n"
             "  \"time\" : ttt,            (numeric) The transaction time in seconds since epoch (1 Jan 1970 GMT)\n"
             "  \"timereceived\" : ttt,    (numeric) The time received in seconds since epoch (1 Jan 1970 GMT)\n"
-            "  \"bip125-replaceable\": \"yes|no|unknown\"  (string) Whether this transaction could be replaced due to BIP125 (replace-by-fee);\n"
+            "  \"bip125-replaceable\": \"yes|no|unknown\",  (string) Whether this transaction could be replaced due to BIP125 (replace-by-fee);\n"
             "                                                   may be unknown for unconfirmed transactions not in the mempool\n"
             "  \"details\" : [\n"
             "    {\n"
-            "      \"account\" : \"accountname\",  (string) DEPRECATED. The account name involved in the transaction, can be \"\" for the default account.\n"
-            "      \"address\" : \"address\",   (string) The bitcoin address involved in the transaction\n"
+            "      \"account\" : \"accountname\",      (string) DEPRECATED. The account name involved in the transaction, can be \"\" for the default account.\n"
+            "      \"address\" : \"address\",          (string) The bitcoin address involved in the transaction\n"
             "      \"category\" : \"send|receive\",    (string) The category, either 'send' or 'receive'\n"
             "      \"amount\" : x.xxx,                 (numeric) The amount in " + CURRENCY_UNIT + "\n"
             "      \"label\" : \"label\",              (string) A comment for the address/transaction, if any\n"
             "      \"vout\" : n,                       (numeric) the vout value\n"
+            "      \"fee\": x.xxx,                     (numeric) The amount of the fee in " + CURRENCY_UNIT + ". This is negative and only available for the \n"
+            "                                           'send' category of transactions.\n"
+            "      \"abandoned\": xxx                  (bool) 'true' if the transaction has been abandoned (inputs are respendable). Only available for the \n"
+            "                                           'send' category of transactions.\n"			
             "    }\n"
             "    ,...\n"
             "  ],\n"
@@ -2291,7 +2305,7 @@ UniValue getwalletinfo(const JSONRPCRequest& request)
             "  \"keypoolsize\": xxxx,          (numeric) how many new keys are pre-generated\n"
             "  \"unlocked_until\": ttt,        (numeric) the timestamp in seconds since epoch (midnight Jan 1 1970 GMT) that the wallet is unlocked for transfers, or 0 if the wallet is locked\n"
             "  \"paytxfee\": x.xxxx,           (numeric) the transaction fee configuration, set in " + CURRENCY_UNIT + "/kB\n"
-            "  \"hdmasterkeyid\": \"<hash160>\", (string) the Hash160 of the HD master pubkey\n"
+            "  \"hdmasterkeyid\": \"<hash160>\" (string) the Hash160 of the HD master pubkey\n"
             "}\n"
             "\nExamples:\n"
             + HelpExampleCli("getwalletinfo", "")
@@ -2490,7 +2504,6 @@ UniValue fundrawtransaction(const JSONRPCRequest& request)
                             "  \"fee\":       n,         (numeric) Fee in " + CURRENCY_UNIT + " the resulting transaction pays\n"
                             "  \"changepos\": n          (numeric) The position of the added change output, or -1\n"
                             "}\n"
-                            "\"hex\"             \n"
                             "\nExamples:\n"
                             "\nCreate a transaction with no inputs\n"
                             + HelpExampleCli("createrawtransaction", "\"[]\" \"{\\\"myaddress\\\":0.01}\"") +

From aad4cb50599b15d6fc439e465a616635e96466d1 Mon Sep 17 00:00:00 2001
From: Jeremy Rubin <jeremy.l.rubin@gmail.com>
Date: Wed, 11 Jan 2017 17:04:59 -0500
Subject: [PATCH 1550/1802] Address ryanofsky feedback on CCheckQueue
 benchmarks. Eliminated magic numbers, fixed scoping of vectors (and memory
 movement component of benchmark).

---
 src/bench/checkqueue.cpp | 39 ++++++++++++++++++++++++---------------
 1 file changed, 24 insertions(+), 15 deletions(-)

diff --git a/src/bench/checkqueue.cpp b/src/bench/checkqueue.cpp
index 280d24a5eff65..6fa9fe4fe8c48 100644
--- a/src/bench/checkqueue.cpp
+++ b/src/bench/checkqueue.cpp
@@ -15,6 +15,11 @@
 // This Benchmark tests the CheckQueue with the lightest
 // weight Checks, so it should make any lock contention
 // particularly visible
+static const int MIN_CORES = 2;
+static const size_t BATCHES = 101;
+static const size_t BATCH_SIZE = 30;
+static const int PREVECTOR_SIZE = 28;
+static const int QUEUE_BATCH_SIZE = 128;
 static void CCheckQueueSpeed(benchmark::State& state)
 {
     struct FakeJobNoWork {
@@ -24,21 +29,25 @@ static void CCheckQueueSpeed(benchmark::State& state)
         }
         void swap(FakeJobNoWork& x){};
     };
-    CCheckQueue<FakeJobNoWork> queue {128};
+    CCheckQueue<FakeJobNoWork> queue {QUEUE_BATCH_SIZE};
     boost::thread_group tg;
-    for (auto x = 0; x < std::max(2, GetNumCores()); ++x) {
+    for (auto x = 0; x < std::max(MIN_CORES, GetNumCores()); ++x) {
        tg.create_thread([&]{queue.Thread();});
     }
     while (state.KeepRunning()) {
         CCheckQueueControl<FakeJobNoWork> control(&queue);
-        // We can make vChecks out of the loop because calling Add doesn't
-        // change the size of the vector.
-        std::vector<FakeJobNoWork> vChecks;
-        vChecks.resize(30);
 
         // We call Add a number of times to simulate the behavior of adding
         // a block of transactions at once.
-        for (size_t j = 0; j < 101; ++j) {
+
+        std::vector<std::vector<FakeJobNoWork>> vBatches(BATCHES);
+        for (auto& vChecks : vBatches) {
+            vChecks.resize(BATCH_SIZE);
+        }
+        for (auto& vChecks : vBatches) {
+            // We can't make vChecks in the inner loop because we want to measure
+            // the cost of getting the memory to each thread and we might get the same
+            // memory
             control.Add(vChecks);
         }
         // control waits for completion by RAII, but
@@ -55,11 +64,11 @@ static void CCheckQueueSpeed(benchmark::State& state)
 static void CCheckQueueSpeedPrevectorJob(benchmark::State& state)
 {
     struct PrevectorJob {
-        prevector<28, uint8_t> p;
+        prevector<PREVECTOR_SIZE, uint8_t> p;
         PrevectorJob(){
         }
         PrevectorJob(FastRandomContext& insecure_rand){
-            p.resize(insecure_rand.rand32() % 56);
+            p.resize(insecure_rand.rand32() % (PREVECTOR_SIZE*2));
         }
         bool operator()()
         {
@@ -67,19 +76,19 @@ static void CCheckQueueSpeedPrevectorJob(benchmark::State& state)
         }
         void swap(PrevectorJob& x){p.swap(x.p);};
     };
-    CCheckQueue<PrevectorJob> queue {128};
+    CCheckQueue<PrevectorJob> queue {QUEUE_BATCH_SIZE};
     boost::thread_group tg;
-    for (auto x = 0; x < std::max(2, GetNumCores()); ++x) {
+    for (auto x = 0; x < std::max(MIN_CORES, GetNumCores()); ++x) {
        tg.create_thread([&]{queue.Thread();});
     }
     while (state.KeepRunning()) {
         // Make insecure_rand here so that each iteration is identical.
         FastRandomContext insecure_rand(true);
         CCheckQueueControl<PrevectorJob> control(&queue);
-        for (size_t j = 0; j < 101; ++j) {
-            std::vector<PrevectorJob> vChecks;
-            vChecks.reserve(30);
-            for (auto x = 0; x < 30; ++x)
+        std::vector<std::vector<PrevectorJob>> vBatches(BATCHES);
+        for (auto& vChecks : vBatches) {
+            vChecks.reserve(BATCH_SIZE);
+            for (size_t x = 0; x < BATCH_SIZE; ++x)
                 vChecks.emplace_back(insecure_rand);
             control.Add(vChecks);
         }

From 0df777db6d62a4fc3353edecdcc0094dc1abbd18 Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Wed, 11 Jan 2017 14:47:52 -0800
Subject: [PATCH 1551/1802] Use a temp pindex to avoid a const_cast in
 ProcessNewBlockHeaders

---
 src/validation.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/validation.cpp b/src/validation.cpp
index 20d75d957f37a..5f0cf10cec920 100644
--- a/src/validation.cpp
+++ b/src/validation.cpp
@@ -3035,11 +3035,13 @@ bool ProcessNewBlockHeaders(const std::vector<CBlockHeader>& headers, CValidatio
     {
         LOCK(cs_main);
         for (const CBlockHeader& header : headers) {
-            // cast away the ppindex-returns-const CBlockIndex - we're just assigning it to a CBlockIndex*
-            // that we own and is updated non-const anyway
-            if (!AcceptBlockHeader(header, state, chainparams, const_cast<CBlockIndex**>(ppindex))) {
+            CBlockIndex *pindex = NULL; // Use a temp pindex instead of ppindex to avoid a const_cast
+            if (!AcceptBlockHeader(header, state, chainparams, &pindex)) {
                 return false;
             }
+            if (ppindex) {
+                *ppindex = pindex;
+            }
         }
     }
     NotifyHeaderTip();

From db904db7e6b87fefecde564dea132ff8614726da Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Wed, 11 Jan 2017 15:30:50 -0800
Subject: [PATCH 1552/1802] Deprecate non-txindex getrawtransaction and better
 warning

---
 src/rpc/rawtransaction.cpp | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/rpc/rawtransaction.cpp b/src/rpc/rawtransaction.cpp
index 4996eb2a69130..f32854332334e 100644
--- a/src/rpc/rawtransaction.cpp
+++ b/src/rpc/rawtransaction.cpp
@@ -128,9 +128,11 @@ UniValue getrawtransaction(const JSONRPCRequest& request)
     if (request.fHelp || request.params.size() < 1 || request.params.size() > 2)
         throw runtime_error(
             "getrawtransaction \"txid\" ( verbose )\n"
-            "\nNOTE: By default this function only works sometimes. This is when the tx is in the mempool\n"
-            "or there is an unspent output in the utxo for this transaction. To make it always work,\n"
-            "you need to maintain a transaction index, using the -txindex command line option.\n"
+
+            "\nNOTE: By default this function only works for mempool transactions. If the -txindex option is\n"
+            "enabled, it also works for blockchain transactions.\n"
+            "DEPRECATED: for now, it also works for transactions with unspent outputs.\n"
+
             "\nReturn the raw transaction data.\n"
             "\nIf verbose is 'true', returns an Object with information about 'txid'.\n"
             "If verbose is 'false' or omitted, returns a string that is serialized, hex-encoded data for 'txid'.\n"
@@ -218,7 +220,9 @@ UniValue getrawtransaction(const JSONRPCRequest& request)
     CTransactionRef tx;
     uint256 hashBlock;
     if (!GetTransaction(hash, tx, Params().GetConsensus(), hashBlock, true))
-        throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "No information available about transaction");
+        throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, std::string(fTxIndex ? "No such mempool or blockchain transaction"
+            : "No such mempool transaction. Use -txindex to enable blockchain transaction queries") +
+            ". Use gettransaction for wallet transactions.");
 
     string strHex = EncodeHexTx(*tx, RPCSerializationFlags());
 

From 962f7f054fd9692f92d40c771cf3ba8ef0cde891 Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Wed, 11 Jan 2017 21:15:28 -0800
Subject: [PATCH 1553/1802] Call ActivateBestChain without cs_main/with
 most_recent_block

There is still a call to ActivateBestChain with cs_main if a peer
requests the block prior to it being validated, but this one is
more specifically-gated, so should be less of an issue.
---
 src/net_processing.cpp | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/net_processing.cpp b/src/net_processing.cpp
index 440696ae55daa..015921ebe93fe 100644
--- a/src/net_processing.cpp
+++ b/src/net_processing.cpp
@@ -964,8 +964,13 @@ void static ProcessGetData(CNode* pfrom, const Consensus::Params& consensusParam
                         // before ActivateBestChain but after AcceptBlock).
                         // In this case, we need to run ActivateBestChain prior to checking the relay
                         // conditions below.
+                        std::shared_ptr<const CBlock> a_recent_block;
+                        {
+                            LOCK(cs_most_recent_block);
+                            a_recent_block = most_recent_block;
+                        }
                         CValidationState dummy;
-                        ActivateBestChain(dummy, Params());
+                        ActivateBestChain(dummy, Params(), a_recent_block);
                     }
                     if (chainActive.Contains(mi->second)) {
                         send = true;
@@ -1525,8 +1530,6 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
         uint256 hashStop;
         vRecv >> locator >> hashStop;
 
-        LOCK(cs_main);
-
         // We might have announced the currently-being-connected tip using a
         // compact block, which resulted in the peer sending a getblocks
         // request, which we would otherwise respond to without the new block.
@@ -1535,10 +1538,17 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
         // for getheaders requests, and there are no known nodes which support
         // compact blocks but still use getblocks to request blocks.
         {
+            std::shared_ptr<const CBlock> a_recent_block;
+            {
+                LOCK(cs_most_recent_block);
+                a_recent_block = most_recent_block;
+            }
             CValidationState dummy;
-            ActivateBestChain(dummy, Params());
+            ActivateBestChain(dummy, Params(), a_recent_block);
         }
 
+        LOCK(cs_main);
+
         // Find the last block the caller has in the main chain
         const CBlockIndex* pindex = FindForkInGlobalIndex(chainActive, locator);
 

From fa2973678ef2b803b2f9daf52807f396bb7189e4 Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Thu, 12 Jan 2017 13:16:43 +0100
Subject: [PATCH 1554/1802] test: Include tx data in EXTRA_DIST

---
 src/Makefile.test.include | 50 ++++++++++++++++++++++++++++-----------
 1 file changed, 36 insertions(+), 14 deletions(-)

diff --git a/src/Makefile.test.include b/src/Makefile.test.include
index c1971213a495b..6aa89187fc9ba 100644
--- a/src/Makefile.test.include
+++ b/src/Makefile.test.include
@@ -13,32 +13,54 @@ EXTRA_DIST += \
 	test/bctest.py \
 	test/bitcoin-util-test.py \
 	test/data/bitcoin-util-test.json \
+	test/data/blanktxv1.hex \
 	test/data/blanktxv1.json \
+	test/data/blanktxv2.hex \
 	test/data/blanktxv2.json \
+	test/data/tt-delin1-out.hex \
 	test/data/tt-delin1-out.json \
+	test/data/tt-delout1-out.hex \
 	test/data/tt-delout1-out.json \
+	test/data/tt-locktime317000-out.hex \
 	test/data/tt-locktime317000-out.json \
+	test/data/tx394b54bb.hex \
+	test/data/txcreate1.hex \
 	test/data/txcreate1.json \
+	test/data/txcreate2.hex \
 	test/data/txcreate2.json \
+	test/data/txcreatedata1.hex \
 	test/data/txcreatedata1.json \
+	test/data/txcreatedata2.hex \
 	test/data/txcreatedata2.json \
+	test/data/txcreatedata_seq0.hex \
 	test/data/txcreatedata_seq0.json \
+	test/data/txcreatedata_seq1.hex \
 	test/data/txcreatedata_seq1.json \
-	test/data/txcreatesignv1.json \
-	test/data/blanktxv1.hex \
-	test/data/blanktxv2.hex \
-	test/data/tt-delin1-out.hex \
-	test/data/tt-delout1-out.hex \
-	test/data/tt-locktime317000-out.hex \
-	test/data/tx394b54bb.hex \
-	test/data/txcreate1.hex \
-	test/data/txcreate2.hex \
-	test/data/txcreatedata1.hex \
-	test/data/txcreatedata2.hex \
+	test/data/txcreatemultisig1.hex \
+	test/data/txcreatemultisig1.json \
+	test/data/txcreatemultisig2.hex \
+	test/data/txcreatemultisig2.json \
+	test/data/txcreatemultisig3.hex \
+	test/data/txcreatemultisig3.json \
+	test/data/txcreatemultisig4.hex \
+	test/data/txcreatemultisig4.json \
+	test/data/txcreateoutpubkey1.hex \
+	test/data/txcreateoutpubkey1.json \
+	test/data/txcreateoutpubkey2.hex \
+	test/data/txcreateoutpubkey2.json \
+	test/data/txcreateoutpubkey3.hex \
+	test/data/txcreateoutpubkey3.json \
+	test/data/txcreatescript1.hex \
+	test/data/txcreatescript1.json \
+	test/data/txcreatescript2.hex \
+	test/data/txcreatescript2.json \
+	test/data/txcreatescript3.hex \
+	test/data/txcreatescript3.json \
+	test/data/txcreatescript4.hex \
+	test/data/txcreatescript4.json \
 	test/data/txcreatesignv1.hex \
-	test/data/txcreatesignv2.hex \
-	test/data/txcreatedata_seq0.hex \
-	test/data/txcreatedata_seq1.hex
+	test/data/txcreatesignv1.json \
+	test/data/txcreatesignv2.hex
 
 JSON_TEST_FILES = \
   test/data/script_tests.json \

From 997a98a674df70a2192e8d8b91c631e5c241509d Mon Sep 17 00:00:00 2001
From: Gregory Maxwell <greg@xiph.org>
Date: Sun, 8 Jan 2017 04:05:14 +0000
Subject: [PATCH 1555/1802] Replace FindLatestBefore used by importmuti with
 FindEarliestAtLeast.

In spite of the name FindLatestBefore used std::lower_bound to try
 to find the earliest block with a nTime greater or equal to the
 the requested value.  But lower_bound uses bisection and requires
 the input to be ordered with respect to the comparison operation.
 Block times are not well ordered.

I don't know what lower_bound is permitted to do when the data
 is not sufficiently ordered, but it's probably not good.
 (I could construct an implementation which would infinite loop...)

To resolve the issue this commit introduces a maximum-so-far to the
 block indexes and searches that.

For clarity the function is renamed to reflect what it actually does.

An issue that remains is that there is no grace period in importmulti:
 If a address is created at time T and a send is immediately broadcast
 and included by a miner with a slow clock there may not yet have been
 any block with at least time T.

The normal rescan has a grace period of 7200 seconds, but importmulti
 does not.
---
 src/chain.cpp          |  4 ++--
 src/chain.h            | 13 +++++++++++--
 src/rpc/blockchain.cpp |  4 ++--
 src/validation.cpp     |  2 ++
 src/wallet/rpcdump.cpp |  4 ++--
 5 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/src/chain.cpp b/src/chain.cpp
index 3cd7b33920446..0f4d422b9fc66 100644
--- a/src/chain.cpp
+++ b/src/chain.cpp
@@ -61,10 +61,10 @@ const CBlockIndex *CChain::FindFork(const CBlockIndex *pindex) const {
     return pindex;
 }
 
-CBlockIndex* CChain::FindLatestBefore(int64_t nTime) const
+CBlockIndex* CChain::FindEarliestAtLeast(int64_t nTime) const
 {
     std::vector<CBlockIndex*>::const_iterator lower = std::lower_bound(vChain.begin(), vChain.end(), nTime,
-        [](CBlockIndex* pBlock, const int64_t& time) -> bool { return pBlock->GetBlockTime() < time; });
+        [](CBlockIndex* pBlock, const int64_t& time) -> bool { return pBlock->GetBlockTimeMax() < time; });
     return (lower == vChain.end() ? NULL : *lower);
 }
 
diff --git a/src/chain.h b/src/chain.h
index 989a71958ca15..acb29b667b760 100644
--- a/src/chain.h
+++ b/src/chain.h
@@ -202,6 +202,9 @@ class CBlockIndex
     //! (memory only) Sequential id assigned to distinguish order in which blocks are received.
     int32_t nSequenceId;
 
+    //! (memory only) Maximum nTime in the chain upto and including this block.
+    unsigned int nTimeMax;
+
     void SetNull()
     {
         phashBlock = NULL;
@@ -216,6 +219,7 @@ class CBlockIndex
         nChainTx = 0;
         nStatus = 0;
         nSequenceId = 0;
+        nTimeMax = 0;
 
         nVersion       = 0;
         hashMerkleRoot = uint256();
@@ -281,6 +285,11 @@ class CBlockIndex
         return (int64_t)nTime;
     }
 
+    int64_t GetBlockTimeMax() const
+    {
+        return (int64_t)nTimeMax;
+    }
+
     enum { nMedianTimeSpan=11 };
 
     int64_t GetMedianTimePast() const
@@ -461,8 +470,8 @@ class CChain {
     /** Find the last common block between this chain and a block index entry. */
     const CBlockIndex *FindFork(const CBlockIndex *pindex) const;
 
-    /** Find the most recent block with timestamp lower than the given. */
-    CBlockIndex* FindLatestBefore(int64_t nTime) const;
+    /** Find the earliest block with timestamp equal or greater than the given. */
+    CBlockIndex* FindEarliestAtLeast(int64_t nTime) const;
 };
 
 #endif // BITCOIN_CHAIN_H
diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp
index bbcbde71cda84..368654bfa6b8a 100644
--- a/src/rpc/blockchain.cpp
+++ b/src/rpc/blockchain.cpp
@@ -839,9 +839,9 @@ UniValue pruneblockchain(const JSONRPCRequest& request)
     // Height value more than a billion is too high to be a block height, and
     // too low to be a block time (corresponds to timestamp from Sep 2001).
     if (heightParam > 1000000000) {
-        CBlockIndex* pindex = chainActive.FindLatestBefore(heightParam);
+        CBlockIndex* pindex = chainActive.FindEarliestAtLeast(heightParam);
         if (!pindex) {
-            throw JSONRPCError(RPC_INTERNAL_ERROR, "Could not find block before specified timestamp.");
+            throw JSONRPCError(RPC_INTERNAL_ERROR, "Could not find block with at least the specified timestamp.");
         }
         heightParam = pindex->nHeight;
     }
diff --git a/src/validation.cpp b/src/validation.cpp
index 3faa1bf00525d..625307b6a7591 100644
--- a/src/validation.cpp
+++ b/src/validation.cpp
@@ -2606,6 +2606,7 @@ CBlockIndex* AddToBlockIndex(const CBlockHeader& block)
         pindexNew->nHeight = pindexNew->pprev->nHeight + 1;
         pindexNew->BuildSkip();
     }
+    pindexNew->nTimeMax = (pindexNew->pprev ? std::max(pindexNew->pprev->nTimeMax, pindexNew->nTime) : pindexNew->nTime);
     pindexNew->nChainWork = (pindexNew->pprev ? pindexNew->pprev->nChainWork : 0) + GetBlockProof(*pindexNew);
     pindexNew->RaiseValidity(BLOCK_VALID_TREE);
     if (pindexBestHeader == NULL || pindexBestHeader->nChainWork < pindexNew->nChainWork)
@@ -3416,6 +3417,7 @@ bool static LoadBlockIndexDB(const CChainParams& chainparams)
     {
         CBlockIndex* pindex = item.second;
         pindex->nChainWork = (pindex->pprev ? pindex->pprev->nChainWork : 0) + GetBlockProof(*pindex);
+        pindex->nTimeMax = (pindex->pprev ? std::max(pindex->pprev->nTimeMax, pindex->nTime) : pindex->nTime);
         // We can link the chain of blocks for which we've received transactions at some point.
         // Pruned nodes may have deleted the block.
         if (pindex->nTx > 0) {
diff --git a/src/wallet/rpcdump.cpp b/src/wallet/rpcdump.cpp
index a1912a78ec3b3..7d4ed70ed91ec 100644
--- a/src/wallet/rpcdump.cpp
+++ b/src/wallet/rpcdump.cpp
@@ -1048,8 +1048,8 @@ UniValue importmulti(const JSONRPCRequest& mainRequest)
         }
     }
 
-    if (fRescan && fRunScan && requests.size() && nLowestTimestamp <= chainActive.Tip()->GetBlockTime()) {
-        CBlockIndex* pindex = nLowestTimestamp > minimumTimestamp ? chainActive.FindLatestBefore(nLowestTimestamp) : chainActive.Genesis();
+    if (fRescan && fRunScan && requests.size() && nLowestTimestamp <= chainActive.Tip()->GetBlockTimeMax()) {
+        CBlockIndex* pindex = nLowestTimestamp > minimumTimestamp ? chainActive.FindEarliestAtLeast(nLowestTimestamp) : chainActive.Genesis();
 
         if (pindex) {
             pwalletMain->ScanForWalletTransactions(pindex, true);

From 4b06e41c309123c4eefce0d3578c01efe1ae10df Mon Sep 17 00:00:00 2001
From: Suhas Daftuar <sdaftuar@chaincode.com>
Date: Wed, 11 Jan 2017 21:31:00 -0500
Subject: [PATCH 1556/1802] Add unit test for FindEarliestAtLeast

---
 src/test/skiplist_tests.cpp | 43 +++++++++++++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)

diff --git a/src/test/skiplist_tests.cpp b/src/test/skiplist_tests.cpp
index 5b4ef3fe7df6e..0b2fe0ef9db1e 100644
--- a/src/test/skiplist_tests.cpp
+++ b/src/test/skiplist_tests.cpp
@@ -100,4 +100,47 @@ BOOST_AUTO_TEST_CASE(getlocator_test)
     }
 }
 
+BOOST_AUTO_TEST_CASE(findearliestatleast_test)
+{
+    std::vector<uint256> vHashMain(100000);
+    std::vector<CBlockIndex> vBlocksMain(100000);
+    for (unsigned int i=0; i<vBlocksMain.size(); i++) {
+        vHashMain[i] = ArithToUint256(i); // Set the hash equal to the height
+        vBlocksMain[i].nHeight = i;
+        vBlocksMain[i].pprev = i ? &vBlocksMain[i - 1] : NULL;
+        vBlocksMain[i].phashBlock = &vHashMain[i];
+        vBlocksMain[i].BuildSkip();
+        if (i < 10) {
+            vBlocksMain[i].nTime = i;
+            vBlocksMain[i].nTimeMax = i;
+        } else {
+            // randomly choose something in the range [MTP, MTP*2]
+            int64_t medianTimePast = vBlocksMain[i].GetMedianTimePast();
+            int r = insecure_rand() % medianTimePast;
+            vBlocksMain[i].nTime = r + medianTimePast;
+            vBlocksMain[i].nTimeMax = std::max(vBlocksMain[i].nTime, vBlocksMain[i-1].nTimeMax);
+        }
+    }
+    // Check that we set nTimeMax up correctly.
+    unsigned int curTimeMax = 0;
+    for (unsigned int i=0; i<vBlocksMain.size(); ++i) {
+        curTimeMax = std::max(curTimeMax, vBlocksMain[i].nTime);
+        BOOST_CHECK(curTimeMax == vBlocksMain[i].nTimeMax);
+    }
+
+    // Build a CChain for the main branch.
+    CChain chain;
+    chain.SetTip(&vBlocksMain.back());
+
+    // Verify that FindEarliestAtLeast is correct.
+    for (unsigned int i=0; i<10000; ++i) {
+        // Pick a random element in vBlocksMain.
+        int r = insecure_rand() % vBlocksMain.size();
+        int64_t test_time = vBlocksMain[r].nTime;
+        CBlockIndex *ret = chain.FindEarliestAtLeast(test_time);
+        BOOST_CHECK(ret->nTimeMax >= test_time);
+        BOOST_CHECK((ret->pprev==NULL) || ret->pprev->nTimeMax < test_time);
+        BOOST_CHECK(vBlocksMain[r].GetAncestor(ret->nHeight) == ret);
+    }
+}
 BOOST_AUTO_TEST_SUITE_END()

From b348287b79a91ef7c8432a4ade8bc0285680963f Mon Sep 17 00:00:00 2001
From: Alex Morcos <morcos@chaincode.com>
Date: Thu, 12 Jan 2017 12:09:15 -0500
Subject: [PATCH 1557/1802] Clarify that prioritisetransaction remains
 supported

---
 doc/release-notes.md | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/doc/release-notes.md b/doc/release-notes.md
index 7d0d689684575..b092a0b3132f4 100644
--- a/doc/release-notes.md
+++ b/doc/release-notes.md
@@ -58,9 +58,11 @@ Removal of Priority Estimation
   converted to the new format which is not readable by prior versions of the
   software.
 
-- The concept of "priority" transactions is planned to be removed in the next
-  major version. To prepare for this, the default for the rate limit of priority
-  transactions (`-limitfreerelay`) has been set to `0` kB/minute.
+- The concept of "priority" (coin age) transactions is planned to be removed in
+  the next major version. To prepare for this, the default for the rate limit of
+  priority transactions (`-limitfreerelay`) has been set to `0` kB/minute. This
+  is not to be confused with the `prioritisetransaction` RPC which will remain
+  supported for adding fee deltas to transactions.
 
 P2P connection management
 --------------------------

From 34ede124af29b0116735bdb7d6f55fef1be69119 Mon Sep 17 00:00:00 2001
From: Alex Morcos <morcos@chaincode.com>
Date: Thu, 12 Jan 2017 12:16:16 -0500
Subject: [PATCH 1558/1802] Document fee estimation changes

---
 doc/release-notes.md | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/doc/release-notes.md b/doc/release-notes.md
index b092a0b3132f4..595e16d959d76 100644
--- a/doc/release-notes.md
+++ b/doc/release-notes.md
@@ -48,6 +48,17 @@ Low-level RPC changes
   an optional third arg, which was always ignored. Make sure to never pass more
   than two arguments.
 
+Fee Estimation Changes
+----------------------
+
+- Since 0.13.2 fee estimation for a confirmation target of 1 block has been
+  disabled. This is only a minor behavior change as there was often insufficient
+  data for this target anyway. `estimatefee 1` will now always return -1 and
+  `estimatesmartfee 1` will start searching at a target of 2.
+
+- The default target for fee estimation is changed to 6 blocks in both the GUI
+  (previously 25) and for RPC calls (previously 2).
+
 Removal of Priority Estimation
 ------------------------------
 

From 843c560003b288a073f528ef16b83541f7a9b0ac Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Tue, 10 Jan 2017 14:14:01 -0800
Subject: [PATCH 1559/1802] Avoid unaligned access in crypto i/o

---
 src/crypto/common.h | 36 ++++++++++++++++++++++++++----------
 1 file changed, 26 insertions(+), 10 deletions(-)

diff --git a/src/crypto/common.h b/src/crypto/common.h
index 580c72f5a6480..4a9d1150b6777 100644
--- a/src/crypto/common.h
+++ b/src/crypto/common.h
@@ -10,57 +10,73 @@
 #endif
 
 #include <stdint.h>
+#include <string.h>
 
 #include "compat/endian.h"
 
 uint16_t static inline ReadLE16(const unsigned char* ptr)
 {
-    return le16toh(*((uint16_t*)ptr));
+    uint16_t x;
+    memcpy((char*)&x, ptr, 2);
+    return le16toh(x);
 }
 
 uint32_t static inline ReadLE32(const unsigned char* ptr)
 {
-    return le32toh(*((uint32_t*)ptr));
+    uint32_t x;
+    memcpy((char*)&x, ptr, 4);
+    return le32toh(x);
 }
 
 uint64_t static inline ReadLE64(const unsigned char* ptr)
 {
-    return le64toh(*((uint64_t*)ptr));
+    uint64_t x;
+    memcpy((char*)&x, ptr, 8);
+    return le64toh(x);
 }
 
 void static inline WriteLE16(unsigned char* ptr, uint16_t x)
 {
-    *((uint16_t*)ptr) = htole16(x);
+    uint16_t v = htole16(x);
+    memcpy(ptr, (char*)&v, 2);
 }
 
 void static inline WriteLE32(unsigned char* ptr, uint32_t x)
 {
-    *((uint32_t*)ptr) = htole32(x);
+    uint32_t v = htole32(x);
+    memcpy(ptr, (char*)&v, 4);
 }
 
 void static inline WriteLE64(unsigned char* ptr, uint64_t x)
 {
-    *((uint64_t*)ptr) = htole64(x);
+    uint64_t v = htole64(x);
+    memcpy(ptr, (char*)&v, 8);
 }
 
 uint32_t static inline ReadBE32(const unsigned char* ptr)
 {
-    return be32toh(*((uint32_t*)ptr));
+    uint32_t x;
+    memcpy((char*)&x, ptr, 4);
+    return be32toh(x);
 }
 
 uint64_t static inline ReadBE64(const unsigned char* ptr)
 {
-    return be64toh(*((uint64_t*)ptr));
+    uint64_t x;
+    memcpy((char*)&x, ptr, 8);
+    return be64toh(x);
 }
 
 void static inline WriteBE32(unsigned char* ptr, uint32_t x)
 {
-    *((uint32_t*)ptr) = htobe32(x);
+    uint32_t v = htobe32(x);
+    memcpy(ptr, (char*)&v, 4);
 }
 
 void static inline WriteBE64(unsigned char* ptr, uint64_t x)
 {
-    *((uint64_t*)ptr) = htobe64(x);
+    uint64_t v = htobe64(x);
+    memcpy(ptr, (char*)&v, 8);
 }
 
 #endif // BITCOIN_CRYPTO_COMMON_H

From f94f3e0df82cd9f1202b0741c6fcc83b3560cee8 Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Tue, 10 Jan 2017 14:34:20 -0800
Subject: [PATCH 1560/1802] Avoid integer overflows in scriptnum tests

---
 src/test/scriptnum_tests.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/test/scriptnum_tests.cpp b/src/test/scriptnum_tests.cpp
index 6b6689c7d3539..1d5893bdc3216 100644
--- a/src/test/scriptnum_tests.cpp
+++ b/src/test/scriptnum_tests.cpp
@@ -12,8 +12,10 @@
 
 BOOST_FIXTURE_TEST_SUITE(scriptnum_tests, BasicTestingSetup)
 
-static const int64_t values[] = \
-{ 0, 1, CHAR_MIN, CHAR_MAX, UCHAR_MAX, SHRT_MIN, USHRT_MAX, INT_MIN, INT_MAX, UINT_MAX, LONG_MIN, LONG_MAX };
+/** A selection of numbers that do not trigger int64_t overflow
+ *  when added/subtracted. */
+static const int64_t values[] = { 0, 1, -2, 127, 128, -255, 256, (1LL << 15) - 1, -(1LL << 16), (1LL << 24) - 1, (1LL << 31), 1 - (1LL << 32), 1LL << 40 };
+
 static const int64_t offsets[] = { 1, 0x79, 0x80, 0x81, 0xFF, 0x7FFF, 0x8000, 0xFFFF, 0x10000};
 
 static bool verify(const CScriptNum10& bignum, const CScriptNum& scriptnum)

From 6b03bfb840316d5bd96fd22af065a3998abdbefc Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Tue, 10 Jan 2017 14:46:07 -0800
Subject: [PATCH 1561/1802] Fix memory leak in wallet tests

---
 src/wallet/test/wallet_tests.cpp | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/wallet/test/wallet_tests.cpp b/src/wallet/test/wallet_tests.cpp
index c7ce6fd24352f..ca086c86a80b0 100644
--- a/src/wallet/test/wallet_tests.cpp
+++ b/src/wallet/test/wallet_tests.cpp
@@ -23,6 +23,8 @@
 
 using namespace std;
 
+std::vector<std::unique_ptr<CWalletTx>> wtxn;
+
 typedef set<pair<const CWalletTx*,unsigned int> > CoinSet;
 
 BOOST_FIXTURE_TEST_SUITE(wallet_tests, WalletTestingSetup)
@@ -42,21 +44,21 @@ static void add_coin(const CAmount& nValue, int nAge = 6*24, bool fIsFromMe = fa
         // so stop vin being empty, and cache a non-zero Debit to fake out IsFromMe()
         tx.vin.resize(1);
     }
-    CWalletTx* wtx = new CWalletTx(&wallet, MakeTransactionRef(std::move(tx)));
+    std::unique_ptr<CWalletTx> wtx(new CWalletTx(&wallet, MakeTransactionRef(std::move(tx))));
     if (fIsFromMe)
     {
         wtx->fDebitCached = true;
         wtx->nDebitCached = 1;
     }
-    COutput output(wtx, nInput, nAge, true, true);
+    COutput output(wtx.get(), nInput, nAge, true, true);
     vCoins.push_back(output);
+    wtxn.emplace_back(std::move(wtx));
 }
 
 static void empty_wallet(void)
 {
-    BOOST_FOREACH(COutput output, vCoins)
-        delete output.tx;
     vCoins.clear();
+    wtxn.clear();
 }
 
 static bool equal_sets(CoinSet a, CoinSet b)
@@ -349,6 +351,8 @@ BOOST_AUTO_TEST_CASE(ApproximateBestSubset)
     BOOST_CHECK(wallet.SelectCoinsMinConf(1003 * COIN, 1, 6, 0, vCoins, setCoinsRet, nValueRet));
     BOOST_CHECK_EQUAL(nValueRet, 1003 * COIN);
     BOOST_CHECK_EQUAL(setCoinsRet.size(), 2U);
+
+    empty_wallet();
 }
 
 BOOST_AUTO_TEST_SUITE_END()

From 5a0b7e4106bc97a7a67bda6bf6fbd7f26d892420 Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Tue, 10 Jan 2017 14:47:04 -0800
Subject: [PATCH 1562/1802] Fix memory leak in net_tests

---
 src/test/net_tests.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/test/net_tests.cpp b/src/test/net_tests.cpp
index 0bd7869f32fc4..b9ed4952bba68 100644
--- a/src/test/net_tests.cpp
+++ b/src/test/net_tests.cpp
@@ -162,12 +162,12 @@ BOOST_AUTO_TEST_CASE(cnode_simple_test)
     bool fInboundIn = false;
 
     // Test that fFeeler is false by default.
-    CNode* pnode1 = new CNode(id++, NODE_NETWORK, height, hSocket, addr, 0, 0, pszDest, fInboundIn);
+    std::unique_ptr<CNode> pnode1(new CNode(id++, NODE_NETWORK, height, hSocket, addr, 0, 0, pszDest, fInboundIn));
     BOOST_CHECK(pnode1->fInbound == false);
     BOOST_CHECK(pnode1->fFeeler == false);
 
     fInboundIn = true;
-    CNode* pnode2 = new CNode(id++, NODE_NETWORK, height, hSocket, addr, 1, 1, pszDest, fInboundIn);
+    std::unique_ptr<CNode> pnode2(new CNode(id++, NODE_NETWORK, height, hSocket, addr, 1, 1, pszDest, fInboundIn));
     BOOST_CHECK(pnode2->fInbound == true);
     BOOST_CHECK(pnode2->fFeeler == false);
 }

From 99f001eb52dda703bd326833430054b108de35a1 Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Tue, 10 Jan 2017 15:05:35 -0800
Subject: [PATCH 1563/1802] Fix memory leak in multiUserAuthorized

---
 src/httprpc.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/httprpc.cpp b/src/httprpc.cpp
index 742ff2b8fb6a3..93beda09a4895 100644
--- a/src/httprpc.cpp
+++ b/src/httprpc.cpp
@@ -113,8 +113,8 @@ static bool multiUserAuthorized(std::string strUserPass)
             std::string strHash = vFields[2];
 
             unsigned int KEY_SIZE = 32;
-            unsigned char *out = new unsigned char[KEY_SIZE]; 
-            
+            unsigned char out[KEY_SIZE];
+
             CHMAC_SHA256(reinterpret_cast<const unsigned char*>(strSalt.c_str()), strSalt.size()).Write(reinterpret_cast<const unsigned char*>(strPass.c_str()), strPass.size()).Finalize(out);
             std::vector<unsigned char> hexvec(out, out+KEY_SIZE);
             std::string strHashFromPass = HexStr(hexvec);

From 82e8baab3caaadb1d923d1332c577fb91b9c5747 Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Thu, 12 Jan 2017 12:06:32 -0800
Subject: [PATCH 1564/1802] Avoid boost dynamic_bitset in rest_getutxos

---
 src/rest.cpp | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/rest.cpp b/src/rest.cpp
index 8a7c985e72873..a8f8e753c68e1 100644
--- a/src/rest.cpp
+++ b/src/rest.cpp
@@ -17,7 +17,6 @@
 #include "version.h"
 
 #include <boost/algorithm/string.hpp>
-#include <boost/dynamic_bitset.hpp>
 
 #include <univalue.h>
 
@@ -502,7 +501,8 @@ static bool rest_getutxos(HTTPRequest* req, const std::string& strURIPart)
     vector<unsigned char> bitmap;
     vector<CCoin> outs;
     std::string bitmapStringRepresentation;
-    boost::dynamic_bitset<unsigned char> hits(vOutPoints.size());
+    std::vector<bool> hits;
+    bitmap.resize((vOutPoints.size() + 7) / 8);
     {
         LOCK2(cs_main, mempool.cs);
 
@@ -518,10 +518,11 @@ static bool rest_getutxos(HTTPRequest* req, const std::string& strURIPart)
         for (size_t i = 0; i < vOutPoints.size(); i++) {
             CCoins coins;
             uint256 hash = vOutPoints[i].hash;
+            bool hit = false;
             if (view.GetCoins(hash, coins)) {
                 mempool.pruneSpent(hash, coins);
                 if (coins.IsAvailable(vOutPoints[i].n)) {
-                    hits[i] = true;
+                    hit = true;
                     // Safe to index into vout here because IsAvailable checked if it's off the end of the array, or if
                     // n is valid but points to an already spent output (IsNull).
                     CCoin coin;
@@ -533,10 +534,11 @@ static bool rest_getutxos(HTTPRequest* req, const std::string& strURIPart)
                 }
             }
 
-            bitmapStringRepresentation.append(hits[i] ? "1" : "0"); // form a binary string representation (human-readable for json output)
+            hits.push_back(hit);
+            bitmapStringRepresentation.append(hit ? "1" : "0"); // form a binary string representation (human-readable for json output)
+            bitmap[i / 8] |= ((uint8_t)hit) << (i % 8);
         }
     }
-    boost::to_block_range(hits, std::back_inserter(bitmap));
 
     switch (rf) {
     case RF_BINARY: {

From 73666ad05932429c860efe74eb388d212c152fc4 Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Thu, 12 Jan 2017 12:15:17 -0800
Subject: [PATCH 1565/1802] Add comment to describe callers to
 ActivateBestChain

---
 src/validation.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/validation.cpp b/src/validation.cpp
index 5f0cf10cec920..a26426be576f5 100644
--- a/src/validation.cpp
+++ b/src/validation.cpp
@@ -2388,6 +2388,11 @@ static void NotifyHeaderTip() {
  * that is already loaded (to avoid loading it again from disk).
  */
 bool ActivateBestChain(CValidationState &state, const CChainParams& chainparams, std::shared_ptr<const CBlock> pblock) {
+    // Note that while we're often called here from ProcessNewBlock, this is
+    // far from a guarantee. Things in the P2P/RPC will often end up calling
+    // us in the middle of ProcessNewBlock - do not assume pblock is set
+    // sanely for performance or correctness!
+
     CBlockIndex *pindexMostWork = NULL;
     CBlockIndex *pindexNewTip = NULL;
     do {

From b55b4163462756cbb2341294b839a881333d8f1e Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Thu, 12 Jan 2017 12:19:14 -0800
Subject: [PATCH 1566/1802] Add extra_count lower bound to compact
 reconstruction debug print

---
 src/blockencodings.cpp | 4 +++-
 src/blockencodings.h   | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/blockencodings.cpp b/src/blockencodings.cpp
index 43b4cb9b862ac..c27cde2162f59 100644
--- a/src/blockencodings.cpp
+++ b/src/blockencodings.cpp
@@ -141,6 +141,7 @@ ReadStatus PartiallyDownloadedBlock::InitData(const CBlockHeaderAndShortTxIDs& c
                 txn_available[idit->second] = extra_txn[i].second;
                 have_txn[idit->second]  = true;
                 mempool_count++;
+                extra_count++;
             } else {
                 // If we find two mempool txn that match the short id, just request it.
                 // This should be rare enough that the extra bandwidth doesn't matter,
@@ -151,6 +152,7 @@ ReadStatus PartiallyDownloadedBlock::InitData(const CBlockHeaderAndShortTxIDs& c
                         txn_available[idit->second]->GetWitnessHash() != extra_txn[i].second->GetWitnessHash()) {
                     txn_available[idit->second].reset();
                     mempool_count--;
+                    extra_count--;
                 }
             }
         }
@@ -206,7 +208,7 @@ ReadStatus PartiallyDownloadedBlock::FillBlock(CBlock& block, const std::vector<
         return READ_STATUS_CHECKBLOCK_FAILED;
     }
 
-    LogPrint("cmpctblock", "Successfully reconstructed block %s with %lu txn prefilled, %lu txn from mempool and %lu txn requested\n", hash.ToString(), prefilled_count, mempool_count, vtx_missing.size());
+    LogPrint("cmpctblock", "Successfully reconstructed block %s with %lu txn prefilled, %lu txn from mempool (incl at least %lu from extra pool) and %lu txn requested\n", hash.ToString(), prefilled_count, mempool_count, extra_count, vtx_missing.size());
     if (vtx_missing.size() < 5) {
         for (const auto& tx : vtx_missing)
             LogPrint("cmpctblock", "Reconstructed block %s required tx %s\n", hash.ToString(), tx->GetHash().ToString());
diff --git a/src/blockencodings.h b/src/blockencodings.h
index 7bbd9c661098c..971476cbbdaef 100644
--- a/src/blockencodings.h
+++ b/src/blockencodings.h
@@ -194,7 +194,7 @@ class CBlockHeaderAndShortTxIDs {
 class PartiallyDownloadedBlock {
 protected:
     std::vector<CTransactionRef> txn_available;
-    size_t prefilled_count = 0, mempool_count = 0;
+    size_t prefilled_count = 0, mempool_count = 0, extra_count = 0;
     CTxMemPool* pool;
 public:
     CBlockHeader header;

From fac4c78028d132ee7becc1dc54a0c881ae1a0287 Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Thu, 12 Jan 2017 12:20:11 -0800
Subject: [PATCH 1567/1802] Make PartiallyDownloadedBlock::InitData's second
 param const

---
 src/blockencodings.cpp | 2 +-
 src/blockencodings.h   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/blockencodings.cpp b/src/blockencodings.cpp
index c27cde2162f59..48431cfb3c7b5 100644
--- a/src/blockencodings.cpp
+++ b/src/blockencodings.cpp
@@ -47,7 +47,7 @@ uint64_t CBlockHeaderAndShortTxIDs::GetShortID(const uint256& txhash) const {
 
 
 
-ReadStatus PartiallyDownloadedBlock::InitData(const CBlockHeaderAndShortTxIDs& cmpctblock, std::vector<std::pair<uint256, CTransactionRef>>& extra_txn) {
+ReadStatus PartiallyDownloadedBlock::InitData(const CBlockHeaderAndShortTxIDs& cmpctblock, const std::vector<std::pair<uint256, CTransactionRef>>& extra_txn) {
     if (cmpctblock.header.IsNull() || (cmpctblock.shorttxids.empty() && cmpctblock.prefilledtxn.empty()))
         return READ_STATUS_INVALID;
     if (cmpctblock.shorttxids.size() + cmpctblock.prefilledtxn.size() > MAX_BLOCK_BASE_SIZE / MIN_TRANSACTION_BASE_SIZE)
diff --git a/src/blockencodings.h b/src/blockencodings.h
index 971476cbbdaef..281db9fe01f32 100644
--- a/src/blockencodings.h
+++ b/src/blockencodings.h
@@ -201,7 +201,7 @@ class PartiallyDownloadedBlock {
     PartiallyDownloadedBlock(CTxMemPool* poolIn) : pool(poolIn) {}
 
     // extra_txn is a list of extra transactions to look at, in <witness hash, reference> form
-    ReadStatus InitData(const CBlockHeaderAndShortTxIDs& cmpctblock, std::vector<std::pair<uint256, CTransactionRef>>& extra_txn);
+    ReadStatus InitData(const CBlockHeaderAndShortTxIDs& cmpctblock, const std::vector<std::pair<uint256, CTransactionRef>>& extra_txn);
     bool IsTxAvailable(size_t index) const;
     ReadStatus FillBlock(CBlock& block, const std::vector<CTransactionRef>& vtx_missing);
 };

From 60befa3997b98d3f913010f2621bec734f643526 Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Sat, 31 Dec 2016 02:05:17 -0500
Subject: [PATCH 1568/1802] net: handle message accounting in ReceiveMsgBytes

This allows locking to be pushed down to only where it's needed

Also reuse the current time rather than checking multiple times.
---
 src/net.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/net.cpp b/src/net.cpp
index 6d9971a0f1536..776047171f677 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -648,6 +648,9 @@ void CNode::copyStats(CNodeStats &stats)
 bool CNode::ReceiveMsgBytes(const char *pch, unsigned int nBytes, bool& complete)
 {
     complete = false;
+    int64_t nTimeMicros = GetTimeMicros();
+    nLastRecv = nTimeMicros / 1000000;
+    nRecvBytes += nBytes;
     while (nBytes > 0) {
 
         // get current incomplete message, or create a new one
@@ -685,7 +688,7 @@ bool CNode::ReceiveMsgBytes(const char *pch, unsigned int nBytes, bool& complete
             assert(i != mapRecvBytesPerMsgCmd.end());
             i->second += msg.hdr.nMessageSize + CMessageHeader::HEADER_SIZE;
 
-            msg.nTime = GetTimeMicros();
+            msg.nTime = nTimeMicros;
             complete = true;
         }
     }
@@ -1237,8 +1240,6 @@ void CConnman::ThreadSocketHandler()
                                 pnode->CloseSocketDisconnect();
                             if(notify)
                                 condMsgProc.notify_one();
-                            pnode->nLastRecv = GetTime();
-                            pnode->nRecvBytes += nBytes;
                             RecordBytesRecv(nBytes);
                         }
                         else if (nBytes == 0)

From f5c36d19b636f01cc24417bc2b2f5b226ff3dd2c Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Sat, 31 Dec 2016 02:05:19 -0500
Subject: [PATCH 1569/1802] net: record bytes written before notifying the
 message processor

---
 src/net.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/net.cpp b/src/net.cpp
index 776047171f677..312a6e0940438 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -1238,9 +1238,9 @@ void CConnman::ThreadSocketHandler()
                             bool notify = false;
                             if (!pnode->ReceiveMsgBytes(pchBuf, nBytes, notify))
                                 pnode->CloseSocketDisconnect();
+                            RecordBytesRecv(nBytes);
                             if(notify)
                                 condMsgProc.notify_one();
-                            RecordBytesRecv(nBytes);
                         }
                         else if (nBytes == 0)
                         {

From ef7b5ecbb73e9fd3670494c99cfc13ccf3574170 Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Sat, 31 Dec 2016 02:05:21 -0500
Subject: [PATCH 1570/1802] net: Add a simple function for waking the message
 handler

This may be used publicly in the future
---
 src/net.cpp | 10 ++++++----
 src/net.h   |  2 ++
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/net.cpp b/src/net.cpp
index 312a6e0940438..36db77abb6199 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -1239,8 +1239,8 @@ void CConnman::ThreadSocketHandler()
                             if (!pnode->ReceiveMsgBytes(pchBuf, nBytes, notify))
                                 pnode->CloseSocketDisconnect();
                             RecordBytesRecv(nBytes);
-                            if(notify)
-                                condMsgProc.notify_one();
+                            if (notify)
+                                WakeMessageHandler();
                         }
                         else if (nBytes == 0)
                         {
@@ -1315,8 +1315,10 @@ void CConnman::ThreadSocketHandler()
     }
 }
 
-
-
+void CConnman::WakeMessageHandler()
+{
+    condMsgProc.notify_one();
+}
 
 
 
diff --git a/src/net.h b/src/net.h
index 6c12171bf2879..cc79cce8521df 100644
--- a/src/net.h
+++ b/src/net.h
@@ -341,6 +341,8 @@ class CConnman
     void ThreadSocketHandler();
     void ThreadDNSAddressSeed();
 
+    void WakeMessageHandler();
+
     uint64_t CalculateKeyedNetGroup(const CAddress& ad);
 
     CNode* FindNode(const CNetAddr& ip);

From c72cc88ed39652e44b5be48e9455f6f395bd7e83 Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Sat, 31 Dec 2016 02:05:23 -0500
Subject: [PATCH 1571/1802] net: remove useless comments

---
 src/net_processing.cpp | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/src/net_processing.cpp b/src/net_processing.cpp
index 556975d142572..43a97ff71864d 100644
--- a/src/net_processing.cpp
+++ b/src/net_processing.cpp
@@ -2445,9 +2445,6 @@ bool ProcessMessages(CNode* pfrom, CConnman& connman, std::atomic<bool>& interru
 {
     const CChainParams& chainparams = Params();
     unsigned int nMaxSendBufferSize = connman.GetSendBufferSize();
-    //if (fDebug)
-    //    LogPrintf("%s(%u messages)\n", __func__, pfrom->vRecvMsg.size());
-
     //
     // Message format
     //  (4) message start
@@ -2473,11 +2470,6 @@ bool ProcessMessages(CNode* pfrom, CConnman& connman, std::atomic<bool>& interru
         // get next message
         CNetMessage& msg = *it;
 
-        //if (fDebug)
-        //    LogPrintf("%s(message %u msgsz, %u bytes, complete:%s)\n", __func__,
-        //            msg.hdr.nMessageSize, msg.vRecv.size(),
-        //            msg.complete() ? "Y" : "N");
-
         // end, if an incomplete message is found
         if (!msg.complete())
             break;

From c5a8b1b946b1ab0bb82bd4270b2a40f5731abcff Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Sat, 31 Dec 2016 02:05:26 -0500
Subject: [PATCH 1572/1802] net: rework the way that the messagehandler sleeps

In order to sleep accurately, the message handler needs to know if _any_ node
has more processing that it should do before the entire thread sleeps.

Rather than returning a value that represents whether ProcessMessages
encountered a message that should trigger a disconnnect, interpret the return
value as whether or not that node has more work to do.

Also, use a global fProcessWake value that can be set by other threads,
which takes precedence (for one cycle) over the messagehandler's decision.

Note that the previous behavior was to only process one message per loop
(except in the case of a bad checksum or invalid header). That was changed in
PR #3180.

The only change here in that regard is that the current node now falls to the
back of the processing queue for the bad checksum/invalid header cases.
---
 src/net.cpp            | 30 ++++++++++++++------------
 src/net.h              |  3 +++
 src/net_processing.cpp | 48 ++++++++++++++++++++++--------------------
 src/net_processing.h   |  1 +
 4 files changed, 45 insertions(+), 37 deletions(-)

diff --git a/src/net.cpp b/src/net.cpp
index 36db77abb6199..947f016798238 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -1317,6 +1317,10 @@ void CConnman::ThreadSocketHandler()
 
 void CConnman::WakeMessageHandler()
 {
+    {
+        std::lock_guard<std::mutex> lock(mutexMsgProc);
+        fMsgProcWake = true;
+    }
     condMsgProc.notify_one();
 }
 
@@ -1839,7 +1843,7 @@ void CConnman::ThreadMessageHandler()
             }
         }
 
-        bool fSleep = true;
+        bool fMoreWork = false;
 
         BOOST_FOREACH(CNode* pnode, vNodesCopy)
         {
@@ -1851,16 +1855,8 @@ void CConnman::ThreadMessageHandler()
                 TRY_LOCK(pnode->cs_vRecvMsg, lockRecv);
                 if (lockRecv)
                 {
-                    if (!GetNodeSignals().ProcessMessages(pnode, *this, flagInterruptMsgProc))
-                        pnode->CloseSocketDisconnect();
-
-                    if (pnode->nSendSize < GetSendBufferSize())
-                    {
-                        if (!pnode->vRecvGetData.empty() || (!pnode->vRecvMsg.empty() && pnode->vRecvMsg.front().complete()))
-                        {
-                            fSleep = false;
-                        }
-                    }
+                    bool fMoreNodeWork = GetNodeSignals().ProcessMessages(pnode, *this, flagInterruptMsgProc);
+                    fMoreWork |= (fMoreNodeWork && pnode->nSendSize < GetSendBufferSize());
                 }
             }
             if (flagInterruptMsgProc)
@@ -1882,10 +1878,11 @@ void CConnman::ThreadMessageHandler()
                 pnode->Release();
         }
 
-        if (fSleep) {
-            std::unique_lock<std::mutex> lock(mutexMsgProc);
-            condMsgProc.wait_until(lock, std::chrono::steady_clock::now() + std::chrono::milliseconds(100));
+        std::unique_lock<std::mutex> lock(mutexMsgProc);
+        if (!fMoreWork) {
+            condMsgProc.wait_until(lock, std::chrono::steady_clock::now() + std::chrono::milliseconds(100), [this] { return fMsgProcWake; });
         }
+        fMsgProcWake = false;
     }
 }
 
@@ -2156,6 +2153,11 @@ bool CConnman::Start(CScheduler& scheduler, std::string& strNodeError, Options c
     interruptNet.reset();
     flagInterruptMsgProc = false;
 
+    {
+        std::unique_lock<std::mutex> lock(mutexMsgProc);
+        fMsgProcWake = false;
+    }
+
     // Send and receive from sockets, accept connections
     threadSocketHandler = std::thread(&TraceThread<std::function<void()> >, "net", std::function<void()>(std::bind(&CConnman::ThreadSocketHandler, this)));
 
diff --git a/src/net.h b/src/net.h
index cc79cce8521df..4fc41bddac602 100644
--- a/src/net.h
+++ b/src/net.h
@@ -424,6 +424,9 @@ class CConnman
     /** SipHasher seeds for deterministic randomness */
     const uint64_t nSeed0, nSeed1;
 
+    /** flag for waking the message processor. */
+    bool fMsgProcWake;
+
     std::condition_variable condMsgProc;
     std::mutex mutexMsgProc;
     std::atomic<bool> flagInterruptMsgProc;
diff --git a/src/net_processing.cpp b/src/net_processing.cpp
index 43a97ff71864d..605e142e8d68a 100644
--- a/src/net_processing.cpp
+++ b/src/net_processing.cpp
@@ -2453,36 +2453,43 @@ bool ProcessMessages(CNode* pfrom, CConnman& connman, std::atomic<bool>& interru
     //  (4) checksum
     //  (x) data
     //
-    bool fOk = true;
+    bool fMoreWork = false;
 
     if (!pfrom->vRecvGetData.empty())
         ProcessGetData(pfrom, chainparams.GetConsensus(), connman, interruptMsgProc);
 
+    if (pfrom->fDisconnect)
+        return false;
+
     // this maintains the order of responses
-    if (!pfrom->vRecvGetData.empty()) return fOk;
+    if (!pfrom->vRecvGetData.empty()) return true;
 
-    auto it = pfrom->vRecvMsg.begin();
-    while (!pfrom->fDisconnect && it != pfrom->vRecvMsg.end()) {
         // Don't bother if send buffer is too full to respond anyway
         if (pfrom->nSendSize >= nMaxSendBufferSize)
-            break;
+            return false;
 
-        // get next message
-        CNetMessage& msg = *it;
+        auto it = pfrom->vRecvMsg.begin();
+        if (it == pfrom->vRecvMsg.end())
+            return false;
 
         // end, if an incomplete message is found
-        if (!msg.complete())
-            break;
+        if (!it->complete())
+            return false;
+
+        // get next message
+        CNetMessage msg = std::move(*it);
 
         // at this point, any failure means we can delete the current message
-        it++;
+        pfrom->vRecvMsg.erase(pfrom->vRecvMsg.begin());
+
+        fMoreWork = !pfrom->vRecvMsg.empty() && pfrom->vRecvMsg.front().complete();
 
         msg.SetVersion(pfrom->GetRecvVersion());
         // Scan for message start
         if (memcmp(msg.hdr.pchMessageStart, chainparams.MessageStart(), CMessageHeader::MESSAGE_START_SIZE) != 0) {
             LogPrintf("PROCESSMESSAGE: INVALID MESSAGESTART %s peer=%d\n", SanitizeString(msg.hdr.GetCommand()), pfrom->id);
-            fOk = false;
-            break;
+            pfrom->fDisconnect = true;
+            return false;
         }
 
         // Read header
@@ -2490,7 +2497,7 @@ bool ProcessMessages(CNode* pfrom, CConnman& connman, std::atomic<bool>& interru
         if (!hdr.IsValid(chainparams.MessageStart()))
         {
             LogPrintf("PROCESSMESSAGE: ERRORS IN HEADER %s peer=%d\n", SanitizeString(hdr.GetCommand()), pfrom->id);
-            continue;
+            return fMoreWork;
         }
         string strCommand = hdr.GetCommand();
 
@@ -2506,7 +2513,7 @@ bool ProcessMessages(CNode* pfrom, CConnman& connman, std::atomic<bool>& interru
                SanitizeString(strCommand), nMessageSize,
                HexStr(hash.begin(), hash.begin()+CMessageHeader::CHECKSUM_SIZE),
                HexStr(hdr.pchChecksum, hdr.pchChecksum+CMessageHeader::CHECKSUM_SIZE));
-            continue;
+            return fMoreWork;
         }
 
         // Process message
@@ -2515,7 +2522,9 @@ bool ProcessMessages(CNode* pfrom, CConnman& connman, std::atomic<bool>& interru
         {
             fRet = ProcessMessage(pfrom, strCommand, vRecv, msg.nTime, chainparams, connman, interruptMsgProc);
             if (interruptMsgProc)
-                return true;
+                return false;
+            if (!pfrom->vRecvGetData.empty())
+                fMoreWork = true;
         }
         catch (const std::ios_base::failure& e)
         {
@@ -2549,14 +2558,7 @@ bool ProcessMessages(CNode* pfrom, CConnman& connman, std::atomic<bool>& interru
         if (!fRet)
             LogPrintf("%s(%s, %u bytes) FAILED peer=%d\n", __func__, SanitizeString(strCommand), nMessageSize, pfrom->id);
 
-        break;
-    }
-
-    // In case the connection got shut down, its receive buffer was wiped
-    if (!pfrom->fDisconnect)
-        pfrom->vRecvMsg.erase(pfrom->vRecvMsg.begin(), it);
-
-    return fOk;
+    return fMoreWork;
 }
 
 class CompareInvMempoolOrder
diff --git a/src/net_processing.h b/src/net_processing.h
index 230d805bd4730..1f33def1f7f2f 100644
--- a/src/net_processing.h
+++ b/src/net_processing.h
@@ -46,6 +46,7 @@ bool ProcessMessages(CNode* pfrom, CConnman& connman, std::atomic<bool>& interru
  * @param[in]   pto             The node which we are sending messages to.
  * @param[in]   connman         The connection manager for that node.
  * @param[in]   interrupt       Interrupt condition for processing threads
+ * @return                      True if there is more work to be done
  */
 bool SendMessages(CNode* pto, CConnman& connman, std::atomic<bool>& interrupt);
 

From 4d712e366ca7fffaf96394ef01c9246482c0d92e Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Sat, 31 Dec 2016 02:05:28 -0500
Subject: [PATCH 1573/1802] net: add a new message queue for the message
 processor

This separates the storage of messages from the net and queued messages for
processing, allowing the locks to be split.
---
 src/net.cpp            | 12 +++++++++++-
 src/net.h              |  3 +++
 src/net_processing.cpp | 25 ++++++++++---------------
 3 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/src/net.cpp b/src/net.cpp
index 947f016798238..df2109e3f7211 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -1239,8 +1239,18 @@ void CConnman::ThreadSocketHandler()
                             if (!pnode->ReceiveMsgBytes(pchBuf, nBytes, notify))
                                 pnode->CloseSocketDisconnect();
                             RecordBytesRecv(nBytes);
-                            if (notify)
+                            if (notify) {
+                                auto it(pnode->vRecvMsg.begin());
+                                for (; it != pnode->vRecvMsg.end(); ++it) {
+                                    if (!it->complete())
+                                        break;
+                                }
+                                {
+                                    LOCK(pnode->cs_vProcessMsg);
+                                    pnode->vProcessMsg.splice(pnode->vProcessMsg.end(), pnode->vRecvMsg, pnode->vRecvMsg.begin(), it);
+                                }
                                 WakeMessageHandler();
+                            }
                         }
                         else if (nBytes == 0)
                         {
diff --git a/src/net.h b/src/net.h
index 4fc41bddac602..21864e73d1ff1 100644
--- a/src/net.h
+++ b/src/net.h
@@ -608,6 +608,9 @@ class CNode
     std::deque<std::vector<unsigned char>> vSendMsg;
     CCriticalSection cs_vSend;
 
+    CCriticalSection cs_vProcessMsg;
+    std::list<CNetMessage> vProcessMsg;
+
     std::deque<CInv> vRecvGetData;
     std::list<CNetMessage> vRecvMsg;
     CCriticalSection cs_vRecvMsg;
diff --git a/src/net_processing.cpp b/src/net_processing.cpp
index 605e142e8d68a..9963a872e82ad 100644
--- a/src/net_processing.cpp
+++ b/src/net_processing.cpp
@@ -2468,21 +2468,16 @@ bool ProcessMessages(CNode* pfrom, CConnman& connman, std::atomic<bool>& interru
         if (pfrom->nSendSize >= nMaxSendBufferSize)
             return false;
 
-        auto it = pfrom->vRecvMsg.begin();
-        if (it == pfrom->vRecvMsg.end())
-            return false;
-
-        // end, if an incomplete message is found
-        if (!it->complete())
-            return false;
-
-        // get next message
-        CNetMessage msg = std::move(*it);
-
-        // at this point, any failure means we can delete the current message
-        pfrom->vRecvMsg.erase(pfrom->vRecvMsg.begin());
-
-        fMoreWork = !pfrom->vRecvMsg.empty() && pfrom->vRecvMsg.front().complete();
+        std::list<CNetMessage> msgs;
+        {
+            LOCK(pfrom->cs_vProcessMsg);
+            if (pfrom->vProcessMsg.empty())
+                return false;
+            // Just take one message
+            msgs.splice(msgs.begin(), pfrom->vProcessMsg, pfrom->vProcessMsg.begin());
+            fMoreWork = !pfrom->vProcessMsg.empty();
+        }
+        CNetMessage& msg(msgs.front());
 
         msg.SetVersion(pfrom->GetRecvVersion());
         // Scan for message start

From c6e8a9bcffe4c0f236e27c663f08785d1a0a783b Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Sat, 31 Dec 2016 02:05:30 -0500
Subject: [PATCH 1574/1802] net: add a flag to indicate when a node's process
 queue is full

Messages are dumped very quickly from the socket handler to the processor, so
it's the depth of the processing queue that's interesting.

The socket handler checks the process queue's size during the brief message
hand-off and pauses if necessary, and the processor possibly unpauses each time
a message is popped off of its queue.
---
 src/net.cpp            | 10 +++++++---
 src/net.h              | 11 ++---------
 src/net_processing.cpp |  2 ++
 3 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/src/net.cpp b/src/net.cpp
index df2109e3f7211..70c04d7a0ec82 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -1165,9 +1165,7 @@ void CConnman::ThreadSocketHandler()
                 }
                 {
                     TRY_LOCK(pnode->cs_vRecvMsg, lockRecv);
-                    if (lockRecv && (
-                        pnode->vRecvMsg.empty() || !pnode->vRecvMsg.front().complete() ||
-                        pnode->GetTotalRecvSize() <= GetReceiveFloodSize()))
+                    if (lockRecv && !pnode->fPauseRecv)
                         FD_SET(pnode->hSocket, &fdsetRecv);
                 }
             }
@@ -1240,14 +1238,18 @@ void CConnman::ThreadSocketHandler()
                                 pnode->CloseSocketDisconnect();
                             RecordBytesRecv(nBytes);
                             if (notify) {
+                                size_t nSizeAdded = 0;
                                 auto it(pnode->vRecvMsg.begin());
                                 for (; it != pnode->vRecvMsg.end(); ++it) {
                                     if (!it->complete())
                                         break;
+                                    nSizeAdded += it->vRecv.size() + CMessageHeader::HEADER_SIZE;
                                 }
                                 {
                                     LOCK(pnode->cs_vProcessMsg);
                                     pnode->vProcessMsg.splice(pnode->vProcessMsg.end(), pnode->vRecvMsg, pnode->vRecvMsg.begin(), it);
+                                    pnode->nProcessQueueSize += nSizeAdded;
+                                    pnode->fPauseRecv = pnode->nProcessQueueSize > nReceiveFloodSize;
                                 }
                                 WakeMessageHandler();
                             }
@@ -2592,6 +2594,8 @@ CNode::CNode(NodeId idIn, ServiceFlags nLocalServicesIn, int nMyStartingHeightIn
     minFeeFilter = 0;
     lastSentFeeFilter = 0;
     nextSendTimeFeeFilter = 0;
+    fPauseRecv = false;
+    nProcessQueueSize = 0;
 
     BOOST_FOREACH(const std::string &msg, getAllNetMessageTypes())
         mapRecvBytesPerMsgCmd[msg] = 0;
diff --git a/src/net.h b/src/net.h
index 21864e73d1ff1..0eb430a8bfcb8 100644
--- a/src/net.h
+++ b/src/net.h
@@ -610,6 +610,7 @@ class CNode
 
     CCriticalSection cs_vProcessMsg;
     std::list<CNetMessage> vProcessMsg;
+    size_t nProcessQueueSize;
 
     std::deque<CInv> vRecvGetData;
     std::list<CNetMessage> vRecvMsg;
@@ -650,6 +651,7 @@ class CNode
     const NodeId id;
 
     const uint64_t nKeyedNetGroup;
+    std::atomic_bool fPauseRecv;
 protected:
 
     mapMsgCmdSize mapSendBytesPerMsgCmd;
@@ -743,15 +745,6 @@ class CNode
         return nRefCount;
     }
 
-    // requires LOCK(cs_vRecvMsg)
-    unsigned int GetTotalRecvSize()
-    {
-        unsigned int total = 0;
-        BOOST_FOREACH(const CNetMessage &msg, vRecvMsg)
-            total += msg.vRecv.size() + 24;
-        return total;
-    }
-
     // requires LOCK(cs_vRecvMsg)
     bool ReceiveMsgBytes(const char *pch, unsigned int nBytes, bool& complete);
 
diff --git a/src/net_processing.cpp b/src/net_processing.cpp
index 9963a872e82ad..93b6e2ec014ec 100644
--- a/src/net_processing.cpp
+++ b/src/net_processing.cpp
@@ -2475,6 +2475,8 @@ bool ProcessMessages(CNode* pfrom, CConnman& connman, std::atomic<bool>& interru
                 return false;
             // Just take one message
             msgs.splice(msgs.begin(), pfrom->vProcessMsg, pfrom->vProcessMsg.begin());
+            pfrom->nProcessQueueSize -= msgs.front().vRecv.size() + CMessageHeader::HEADER_SIZE;
+            pfrom->fPauseRecv = pfrom->nProcessQueueSize > connman.GetReceiveFloodSize();
             fMoreWork = !pfrom->vProcessMsg.empty();
         }
         CNetMessage& msg(msgs.front());

From 991955ee81034dc3fbc1c2a8e60c04fc9e0b538c Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Sat, 31 Dec 2016 02:05:32 -0500
Subject: [PATCH 1575/1802] net: add a flag to indicate when a node's send
 buffer is full

Similar to the recv flag, but this one indicates whether or not the net's send
buffer is full.

The socket handler checks the send queue when a new message is added and pauses
if necessary, and possibly unpauses after each message is drained from its buffer.
---
 src/net.cpp            | 11 ++++++++---
 src/net.h              |  3 ++-
 src/net_processing.cpp |  6 ++----
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/net.cpp b/src/net.cpp
index 70c04d7a0ec82..8ae2bebd32b2a 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -761,7 +761,7 @@ const uint256& CNetMessage::GetMessageHash() const
 
 
 // requires LOCK(cs_vSend)
-size_t SocketSendData(CNode *pnode)
+size_t CConnman::SocketSendData(CNode *pnode)
 {
     auto it = pnode->vSendMsg.begin();
     size_t nSentSize = 0;
@@ -778,6 +778,7 @@ size_t SocketSendData(CNode *pnode)
             if (pnode->nSendOffset == data.size()) {
                 pnode->nSendOffset = 0;
                 pnode->nSendSize -= data.size();
+                pnode->fPauseSend = pnode->nSendSize > nSendBufferMaxSize;
                 it++;
             } else {
                 // could not send full message; stop sending more
@@ -1286,8 +1287,9 @@ void CConnman::ThreadSocketHandler()
                 TRY_LOCK(pnode->cs_vSend, lockSend);
                 if (lockSend) {
                     size_t nBytes = SocketSendData(pnode);
-                    if (nBytes)
+                    if (nBytes) {
                         RecordBytesSent(nBytes);
+                    }
                 }
             }
 
@@ -1868,7 +1870,7 @@ void CConnman::ThreadMessageHandler()
                 if (lockRecv)
                 {
                     bool fMoreNodeWork = GetNodeSignals().ProcessMessages(pnode, *this, flagInterruptMsgProc);
-                    fMoreWork |= (fMoreNodeWork && pnode->nSendSize < GetSendBufferSize());
+                    fMoreWork |= (fMoreNodeWork && !pnode->fPauseSend);
                 }
             }
             if (flagInterruptMsgProc)
@@ -2595,6 +2597,7 @@ CNode::CNode(NodeId idIn, ServiceFlags nLocalServicesIn, int nMyStartingHeightIn
     lastSentFeeFilter = 0;
     nextSendTimeFeeFilter = 0;
     fPauseRecv = false;
+    fPauseSend = false;
     nProcessQueueSize = 0;
 
     BOOST_FOREACH(const std::string &msg, getAllNetMessageTypes())
@@ -2675,6 +2678,8 @@ void CConnman::PushMessage(CNode* pnode, CSerializedNetMsg&& msg)
         pnode->mapSendBytesPerMsgCmd[msg.command] += nTotalSize;
         pnode->nSendSize += nTotalSize;
 
+        if (pnode->nSendSize > nSendBufferMaxSize)
+            pnode->fPauseSend = true;
         pnode->vSendMsg.push_back(std::move(serializedHeader));
         if (nMessageSize)
             pnode->vSendMsg.push_back(std::move(msg.data));
diff --git a/src/net.h b/src/net.h
index 0eb430a8bfcb8..db73be477f8a7 100644
--- a/src/net.h
+++ b/src/net.h
@@ -358,6 +358,7 @@ class CConnman
 
     NodeId GetNewNodeId();
 
+    size_t SocketSendData(CNode *pnode);
     //!check is the banlist has unwritten changes
     bool BannedSetIsDirty();
     //!set the "dirty" flag for the banlist
@@ -444,7 +445,6 @@ void Discover(boost::thread_group& threadGroup);
 void MapPort(bool fUseUPnP);
 unsigned short GetListenPort();
 bool BindListenPort(const CService &bindAddr, std::string& strError, bool fWhitelisted = false);
-size_t SocketSendData(CNode *pnode);
 
 struct CombinerAll
 {
@@ -652,6 +652,7 @@ class CNode
 
     const uint64_t nKeyedNetGroup;
     std::atomic_bool fPauseRecv;
+    std::atomic_bool fPauseSend;
 protected:
 
     mapMsgCmdSize mapSendBytesPerMsgCmd;
diff --git a/src/net_processing.cpp b/src/net_processing.cpp
index 93b6e2ec014ec..185ab980fe160 100644
--- a/src/net_processing.cpp
+++ b/src/net_processing.cpp
@@ -889,14 +889,13 @@ static void RelayAddress(const CAddress& addr, bool fReachable, CConnman& connma
 void static ProcessGetData(CNode* pfrom, const Consensus::Params& consensusParams, CConnman& connman, std::atomic<bool>& interruptMsgProc)
 {
     std::deque<CInv>::iterator it = pfrom->vRecvGetData.begin();
-    unsigned int nMaxSendBufferSize = connman.GetSendBufferSize();
     vector<CInv> vNotFound;
     CNetMsgMaker msgMaker(pfrom->GetSendVersion());
     LOCK(cs_main);
 
     while (it != pfrom->vRecvGetData.end()) {
         // Don't bother if send buffer is too full to respond anyway
-        if (pfrom->nSendSize >= nMaxSendBufferSize)
+        if (pfrom->fPauseSend)
             break;
 
         const CInv &inv = *it;
@@ -2444,7 +2443,6 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
 bool ProcessMessages(CNode* pfrom, CConnman& connman, std::atomic<bool>& interruptMsgProc)
 {
     const CChainParams& chainparams = Params();
-    unsigned int nMaxSendBufferSize = connman.GetSendBufferSize();
     //
     // Message format
     //  (4) message start
@@ -2465,7 +2463,7 @@ bool ProcessMessages(CNode* pfrom, CConnman& connman, std::atomic<bool>& interru
     if (!pfrom->vRecvGetData.empty()) return true;
 
         // Don't bother if send buffer is too full to respond anyway
-        if (pfrom->nSendSize >= nMaxSendBufferSize)
+        if (pfrom->fPauseSend)
             return false;
 
         std::list<CNetMessage> msgs;

From e60360e139852c655930e99d4bb4db554cd8385e Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Sat, 31 Dec 2016 02:05:36 -0500
Subject: [PATCH 1576/1802] net: remove cs_vRecvMsg

vRecvMsg is now only touched by the socket handler thread.

The accounting vars (nRecvBytes/nLastRecv/mapRecvBytesPerMsgCmd) are also
only used by the socket handler thread, with the exception of queries from
rpc/gui. These accesses are not threadsafe, but they never were. This needs to
be addressed separately.

Also, update comment describing data flow
---
 src/net.cpp            | 33 +++++++--------------------------
 src/net.h              |  4 +---
 src/net_processing.cpp |  1 -
 3 files changed, 8 insertions(+), 30 deletions(-)

diff --git a/src/net.cpp b/src/net.cpp
index 8ae2bebd32b2a..11638fcc02c37 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -644,7 +644,6 @@ void CNode::copyStats(CNodeStats &stats)
 }
 #undef X
 
-// requires LOCK(cs_vRecvMsg)
 bool CNode::ReceiveMsgBytes(const char *pch, unsigned int nBytes, bool& complete)
 {
     complete = false;
@@ -1080,13 +1079,9 @@ void CConnman::ThreadSocketHandler()
                         TRY_LOCK(pnode->cs_vSend, lockSend);
                         if (lockSend)
                         {
-                            TRY_LOCK(pnode->cs_vRecvMsg, lockRecv);
-                            if (lockRecv)
-                            {
                                 TRY_LOCK(pnode->cs_inventory, lockInv);
                                 if (lockInv)
                                     fDelete = true;
-                            }
                         }
                     }
                     if (fDelete)
@@ -1146,15 +1141,10 @@ void CConnman::ThreadSocketHandler()
                 //   write buffer in this case before receiving more. This avoids
                 //   needlessly queueing received data, if the remote peer is not themselves
                 //   receiving data. This means properly utilizing TCP flow control signalling.
-                // * Otherwise, if there is no (complete) message in the receive buffer,
-                //   or there is space left in the buffer, select() for receiving data.
-                // * (if neither of the above applies, there is certainly one message
-                //   in the receiver buffer ready to be processed).
-                // Together, that means that at least one of the following is always possible,
-                // so we don't deadlock:
-                // * We send some data.
-                // * We wait for data to be received (and disconnect after timeout).
-                // * We process a message in the buffer (message handler thread).
+                // * Otherwise, if there is space left in the receive buffer, select() for
+                //   receiving data.
+                // * Hand off all complete messages to the processor, to be handled without
+                //   blocking here.
                 {
                     TRY_LOCK(pnode->cs_vSend, lockSend);
                     if (lockSend) {
@@ -1165,8 +1155,7 @@ void CConnman::ThreadSocketHandler()
                     }
                 }
                 {
-                    TRY_LOCK(pnode->cs_vRecvMsg, lockRecv);
-                    if (lockRecv && !pnode->fPauseRecv)
+                    if (!pnode->fPauseRecv)
                         FD_SET(pnode->hSocket, &fdsetRecv);
                 }
             }
@@ -1225,8 +1214,6 @@ void CConnman::ThreadSocketHandler()
                 continue;
             if (FD_ISSET(pnode->hSocket, &fdsetRecv) || FD_ISSET(pnode->hSocket, &fdsetError))
             {
-                TRY_LOCK(pnode->cs_vRecvMsg, lockRecv);
-                if (lockRecv)
                 {
                     {
                         // typical socket buffer is 8K-64K
@@ -1865,14 +1852,8 @@ void CConnman::ThreadMessageHandler()
                 continue;
 
             // Receive messages
-            {
-                TRY_LOCK(pnode->cs_vRecvMsg, lockRecv);
-                if (lockRecv)
-                {
-                    bool fMoreNodeWork = GetNodeSignals().ProcessMessages(pnode, *this, flagInterruptMsgProc);
-                    fMoreWork |= (fMoreNodeWork && !pnode->fPauseSend);
-                }
-            }
+            bool fMoreNodeWork = GetNodeSignals().ProcessMessages(pnode, *this, flagInterruptMsgProc);
+            fMoreWork |= (fMoreNodeWork && !pnode->fPauseSend);
             if (flagInterruptMsgProc)
                 return;
 
diff --git a/src/net.h b/src/net.h
index db73be477f8a7..982a08f03a11a 100644
--- a/src/net.h
+++ b/src/net.h
@@ -613,8 +613,6 @@ class CNode
     size_t nProcessQueueSize;
 
     std::deque<CInv> vRecvGetData;
-    std::list<CNetMessage> vRecvMsg;
-    CCriticalSection cs_vRecvMsg;
     uint64_t nRecvBytes;
     std::atomic<int> nRecvVersion;
 
@@ -726,6 +724,7 @@ class CNode
     const ServiceFlags nLocalServices;
     const int nMyStartingHeight;
     int nSendVersion;
+    std::list<CNetMessage> vRecvMsg;  // Used only by SocketHandler thread
 public:
 
     NodeId GetId() const {
@@ -746,7 +745,6 @@ class CNode
         return nRefCount;
     }
 
-    // requires LOCK(cs_vRecvMsg)
     bool ReceiveMsgBytes(const char *pch, unsigned int nBytes, bool& complete);
 
     void SetRecvVersion(int nVersionIn)
diff --git a/src/net_processing.cpp b/src/net_processing.cpp
index 185ab980fe160..32a5862f26231 100644
--- a/src/net_processing.cpp
+++ b/src/net_processing.cpp
@@ -2439,7 +2439,6 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
     return true;
 }
 
-// requires LOCK(cs_vRecvMsg)
 bool ProcessMessages(CNode* pfrom, CConnman& connman, std::atomic<bool>& interruptMsgProc)
 {
     const CChainParams& chainparams = Params();

From e440ac7ef3b6f3ad1cd8fc7027cece40413202d9 Mon Sep 17 00:00:00 2001
From: Gregory Maxwell <greg@xiph.org>
Date: Fri, 6 Jan 2017 11:49:59 +0000
Subject: [PATCH 1577/1802] Introduce assumevalid setting to skip presumed
 valid scripts.

This disentangles the script validation skipping from checkpoints.

A new option is introduced "assumevalid" which specifies a block whos
 ancestors we assume all have valid scriptsigs and so we do not check
 them when they are also burried under the best header by two weeks
 worth of work.

Unlike checkpoints this has no influence on consensus unless you set
 it to a block with an invalid history.  Because of this it can be
 easily be updated without risk of influencing the network consensus.

This results in a massive IBD speedup.

This approach was independently recommended by Peter Todd and Luke-Jr
 since POW based signature skipping (see PR#9180) does not have the
 verifiable properties of a specific hash and may create bad incentives.

The downside is that, like checkpoints, the defaults bitrot and older
 releases will sync slower.  On the plus side users can provide their
 own value here, and if they set it to something crazy all that will
 happen is more time will be spend validating signatures.

Checkblocks and checklevel are also moved to the hidden debug options:
 Especially now that checkblocks has a low default there is little need
 to change these settings, and users frequently misunderstand them as
 influencing security or IBD speed.  By hiding them we offset the
 space added by this new option.
---
 doc/release-notes.md   | 23 ++++++++++++++++++++++-
 doc/release-process.md |  5 +++++
 src/chainparams.cpp    |  9 +++++++++
 src/consensus/params.h |  1 +
 src/init.cpp           | 11 +++++++++--
 src/validation.cpp     | 35 ++++++++++++++++++++++++++---------
 src/validation.h       |  3 +++
 7 files changed, 75 insertions(+), 12 deletions(-)

diff --git a/doc/release-notes.md b/doc/release-notes.md
index 7d0d689684575..cb3f7934cedcc 100644
--- a/doc/release-notes.md
+++ b/doc/release-notes.md
@@ -49,7 +49,7 @@ Low-level RPC changes
   than two arguments.
 
 Removal of Priority Estimation
-------------------------------
+-------------------------------
 
 - Estimation of "priority" needed for a transaction to be included within a target
   number of blocks has been removed.  The rpc calls are deprecated and will either
@@ -71,6 +71,27 @@ P2P connection management
 
 - New connections to manually added peers are much faster.
 
+Introduction of assumed-valid blocks
+-------------------------------------
+
+- A significant portion of the initial block download time is spent verifying
+  scripts/signatures.  Although the verification must pass to ensure the security
+  of the system, no other result from this verification is needed: If the node
+  knew the history of a given block were valid it could skip checking scripts
+  for its ancestors.
+
+- A new configuration option 'assumevalid' is provided to express this knowledge
+  to the software.  Unlike the 'checkpoints' in the past this setting does not
+  force the use of a particular chain: chains that are consistent with it are
+  processed quicker, but other chains are still accepted if they'd otherwise
+  be chosen as best. Also unlike 'checkpoints' the user can configure which
+  block history is assumed true, this means that even outdated software can
+  sync more quickly if the setting is updated by the user.
+
+- Because the validity of a chain history is a simple objective fact it is much
+  easier to review this setting.  As a result the software ships with a default
+  value adjusted to match the current chain shortly before release.  The use
+  of this default value can be disabled by setting -assumevalid=0
 
 0.14.0 Change log
 =================
diff --git a/doc/release-process.md b/doc/release-process.md
index 61f05b0771f3e..399ed25c91569 100644
--- a/doc/release-process.md
+++ b/doc/release-process.md
@@ -13,6 +13,11 @@ Before every minor and major release:
 * Update version in sources (see below)
 * Write release notes (see below)
 * Update `src/chainparams.cpp` nMinimumChainWork with information from the getblockchaininfo rpc.
+* Update `src/chainparams.cpp` defaultAssumeValid  with information from the getblockhash rpc.
+  - The selected value must not be orphaned so it may be useful to set the value two blocks back from the tip.
+  - Testnet should be set some tens of thousands back from the tip due to reorgs there.
+  - This update should be reviewed with a reindex-chainstate with assumevalid=0 to catch any defect
+     that causes rejection of blocks in the past history.
 
 Before every major release:
 
diff --git a/src/chainparams.cpp b/src/chainparams.cpp
index 66b5d48fd9380..d99f800f0a9d4 100644
--- a/src/chainparams.cpp
+++ b/src/chainparams.cpp
@@ -99,6 +99,9 @@ class CMainParams : public CChainParams {
         // The best chain should have at least this much work.
         consensus.nMinimumChainWork = uint256S("0x0000000000000000000000000000000000000000002cb971dd56d1c583c20f90");
 
+        // By default assume that the signatures in ancestors of this block are valid.
+        consensus.defaultAssumeValid = uint256S("0x0000000000000000030abc968e1bd635736e880b946085c93152969b9a81a6e2"); //447235
+
         /**
          * The message start string is designed to be unlikely to occur in normal data.
          * The characters are rarely used upper ASCII, not valid as UTF-8, and produce
@@ -201,6 +204,9 @@ class CTestNetParams : public CChainParams {
         // The best chain should have at least this much work.
         consensus.nMinimumChainWork = uint256S("0x0000000000000000000000000000000000000000000000198b4def2baa9338d6");
 
+        // By default assume that the signatures in ancestors of this block are valid.
+        consensus.defaultAssumeValid = uint256S("0x000000000871ee6842d3648317ccc8a435eb8cc3c2429aee94faff9ba26b05a0"); //1043841
+
         pchMessageStart[0] = 0x0b;
         pchMessageStart[1] = 0x11;
         pchMessageStart[2] = 0x09;
@@ -283,6 +289,9 @@ class CRegTestParams : public CChainParams {
         // The best chain should have at least this much work.
         consensus.nMinimumChainWork = uint256S("0x00");
 
+        // By default assume that the signatures in ancestors of this block are valid.
+        consensus.defaultAssumeValid = uint256S("0x00");
+
         pchMessageStart[0] = 0xfa;
         pchMessageStart[1] = 0xbf;
         pchMessageStart[2] = 0xb5;
diff --git a/src/consensus/params.h b/src/consensus/params.h
index edf445e1c7cfa..3f98938f7ee20 100644
--- a/src/consensus/params.h
+++ b/src/consensus/params.h
@@ -62,6 +62,7 @@ struct Params {
     int64_t nPowTargetTimespan;
     int64_t DifficultyAdjustmentInterval() const { return nPowTargetTimespan / nPowTargetSpacing; }
     uint256 nMinimumChainWork;
+    uint256 defaultAssumeValid;
 };
 } // namespace Consensus
 
diff --git a/src/init.cpp b/src/init.cpp
index 9ac69b7d39c2f..877371b5d196d 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -329,8 +329,7 @@ std::string HelpMessage(HelpMessageMode mode)
     strUsage += HelpMessageOpt("-blocknotify=<cmd>", _("Execute command when the best block changes (%s in cmd is replaced by block hash)"));
     if (showDebug)
         strUsage += HelpMessageOpt("-blocksonly", strprintf(_("Whether to operate in a blocks only mode (default: %u)"), DEFAULT_BLOCKSONLY));
-    strUsage += HelpMessageOpt("-checkblocks=<n>", strprintf(_("How many blocks to check at startup (default: %u, 0 = all)"), DEFAULT_CHECKBLOCKS));
-    strUsage += HelpMessageOpt("-checklevel=<n>", strprintf(_("How thorough the block verification of -checkblocks is (0-4, default: %u)"), DEFAULT_CHECKLEVEL));
+    strUsage +=HelpMessageOpt("-assumevalid=<hex>", strprintf(_("If this block is in the chain assume that it and its ancestors are valid and potentially skip their script verification (0 to verify all, default: %s, testnet: %s)"), Params(CBaseChainParams::MAIN).GetConsensus().defaultAssumeValid.GetHex(), Params(CBaseChainParams::TESTNET).GetConsensus().defaultAssumeValid.GetHex()));
     strUsage += HelpMessageOpt("-conf=<file>", strprintf(_("Specify configuration file (default: %s)"), BITCOIN_CONF_FILENAME));
     if (mode == HMM_BITCOIND)
     {
@@ -420,6 +419,8 @@ std::string HelpMessage(HelpMessageMode mode)
     strUsage += HelpMessageOpt("-uacomment=<cmt>", _("Append comment to the user agent string"));
     if (showDebug)
     {
+        strUsage += HelpMessageOpt("-checkblocks=<n>", strprintf(_("How many blocks to check at startup (default: %u, 0 = all)"), DEFAULT_CHECKBLOCKS));
+        strUsage += HelpMessageOpt("-checklevel=<n>", strprintf(_("How thorough the block verification of -checkblocks is (0-4, default: %u)"), DEFAULT_CHECKLEVEL));
         strUsage += HelpMessageOpt("-checkblockindex", strprintf("Do a full consistency check for mapBlockIndex, setBlockIndexCandidates, chainActive and mapBlocksUnlinked occasionally. Also sets -checkmempool (default: %u)", Params(CBaseChainParams::MAIN).DefaultConsistencyChecks()));
         strUsage += HelpMessageOpt("-checkmempool=<n>", strprintf("Run checks every <n> transactions (default: %u)", Params(CBaseChainParams::MAIN).DefaultConsistencyChecks()));
         strUsage += HelpMessageOpt("-checkpoints", strprintf("Disable expensive verification for known chain history (default: %u)", DEFAULT_CHECKPOINTS_ENABLED));
@@ -920,6 +921,12 @@ bool AppInitParameterInteraction()
     fCheckBlockIndex = GetBoolArg("-checkblockindex", chainparams.DefaultConsistencyChecks());
     fCheckpointsEnabled = GetBoolArg("-checkpoints", DEFAULT_CHECKPOINTS_ENABLED);
 
+    hashAssumeValid = uint256S(GetArg("-assumevalid", chainparams.GetConsensus().defaultAssumeValid.GetHex()));
+    if (!hashAssumeValid.IsNull())
+        LogPrintf("Assuming ancestors of block %s have valid signatures.\n", hashAssumeValid.GetHex());
+    else
+        LogPrintf("Validating signatures for all blocks.\n");
+
     // mempool limits
     int64_t nMempoolSizeMax = GetArg("-maxmempool", DEFAULT_MAX_MEMPOOL_SIZE) * 1000000;
     int64_t nMempoolSizeMin = GetArg("-limitdescendantsize", DEFAULT_DESCENDANT_SIZE_LIMIT) * 1000 * 40;
diff --git a/src/validation.cpp b/src/validation.cpp
index 3faa1bf00525d..69aa018730ed5 100644
--- a/src/validation.cpp
+++ b/src/validation.cpp
@@ -78,6 +78,7 @@ uint64_t nPruneTarget = 0;
 int64_t nMaxTipAge = DEFAULT_MAX_TIP_AGE;
 bool fEnableReplacement = DEFAULT_ENABLE_REPLACEMENT;
 
+uint256 hashAssumeValid;
 
 CFeeRate minRelayTxFee = CFeeRate(DEFAULT_MIN_RELAY_TX_FEE);
 CAmount maxTxFee = DEFAULT_TRANSACTION_MAXFEE;
@@ -1389,11 +1390,10 @@ bool CheckInputs(const CTransaction& tx, CValidationState &state, const CCoinsVi
         // Only if ALL inputs pass do we perform expensive ECDSA signature checks.
         // Helps prevent CPU exhaustion attacks.
 
-        // Skip ECDSA signature verification when connecting blocks before the
-        // last block chain checkpoint. Assuming the checkpoints are valid this
+        // Skip script verification when connecting blocks under the
+        // assumedvalid block. Assuming the assumedvalid block is valid this
         // is safe because block merkle hashes are still computed and checked,
-        // and any change will be caught at the next checkpoint. Of course, if
-        // the checkpoint is for a chain that's invalid due to false scriptSigs
+        // Of course, if an assumed valid block is invalid due to false scriptSigs
         // this optimization would allow an invalid chain to be accepted.
         if (fScriptChecks) {
             for (unsigned int i = 0; i < tx.vin.size(); i++) {
@@ -1721,11 +1721,28 @@ bool ConnectBlock(const CBlock& block, CValidationState& state, CBlockIndex* pin
     }
 
     bool fScriptChecks = true;
-    if (fCheckpointsEnabled) {
-        CBlockIndex *pindexLastCheckpoint = Checkpoints::GetLastCheckpoint(chainparams.Checkpoints());
-        if (pindexLastCheckpoint && pindexLastCheckpoint->GetAncestor(pindex->nHeight) == pindex) {
-            // This block is an ancestor of a checkpoint: disable script checks
-            fScriptChecks = false;
+    if (!hashAssumeValid.IsNull()) {
+        // We've been configured with the hash of a block which has been externally verified to have a valid history.
+        // A suitable default value is included with the software and updated from time to time.  Because validity
+        //  relative to a piece of software is an objective fact these defaults can be easily reviewed.
+        // This setting doesn't force the selection of any particular chain but makes validating some faster by
+        //  effectively caching the result of part of the verification.
+        BlockMap::const_iterator  it = mapBlockIndex.find(hashAssumeValid);
+        if (it != mapBlockIndex.end()) {
+            if (it->second->GetAncestor(pindex->nHeight) == pindex &&
+                pindexBestHeader->GetAncestor(pindex->nHeight) == pindex &&
+                pindexBestHeader->nChainWork >= UintToArith256(chainparams.GetConsensus().nMinimumChainWork)) {
+                // This block is a member of the assumed verified chain and an ancestor of the best header.
+                // The equivalent time check discourages hashpower from extorting the network via DOS attack
+                //  into accepting an invalid block through telling users they must manually set assumevalid.
+                //  Requiring a software change or burying the invalid block, regardless of the setting, makes
+                //  it hard to hide the implication of the demand.  This also avoids having release candidates
+                //  that are hardly doing any signature verification at all in testing without having to
+                //  artificially set the default assumed verified block further back.
+                // The test against nMinimumChainWork prevents the skipping when denied access to any chain at
+                //  least as good as the expected chain.
+                fScriptChecks = (GetBlockProofEquivalentTime(*pindexBestHeader, *pindex, *pindexBestHeader, chainparams.GetConsensus()) <= 60 * 60 * 24 * 7 * 2);
+            }
         }
     }
 
diff --git a/src/validation.h b/src/validation.h
index 40e8907724e93..f66f690775af5 100644
--- a/src/validation.h
+++ b/src/validation.h
@@ -186,6 +186,9 @@ extern CAmount maxTxFee;
 extern int64_t nMaxTipAge;
 extern bool fEnableReplacement;
 
+/** Block hash whose ancestors we will assume to have valid scripts without checking them. */
+extern uint256 hashAssumeValid;
+
 /** Best header we've seen so far (used for getheaders queries' starting points). */
 extern CBlockIndex *pindexBestHeader;
 

From ac4a0953060e34ddd8f4bd7aa28c719d8ed2c068 Mon Sep 17 00:00:00 2001
From: practicalswift <practicalswift@users.noreply.github.com>
Date: Thu, 12 Jan 2017 17:39:50 +0100
Subject: [PATCH 1578/1802] Remove unused Python variables

---
 contrib/testgen/base58.py                  | 1 -
 contrib/testgen/gen_base58_test_vectors.py | 1 -
 qa/rpc-tests/forknotify.py                 | 2 +-
 qa/rpc-tests/p2p-segwit.py                 | 1 -
 qa/rpc-tests/receivedby.py                 | 3 +--
 qa/rpc-tests/replace-by-fee.py             | 1 -
 qa/rpc-tests/wallet.py                     | 1 -
 7 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/contrib/testgen/base58.py b/contrib/testgen/base58.py
index bb0aeaff05b26..0d09692b36f03 100644
--- a/contrib/testgen/base58.py
+++ b/contrib/testgen/base58.py
@@ -84,7 +84,6 @@ def b58decode_chk(v):
     result = b58decode(v)
     if result is None:
         return None
-    h3 = checksum(result[:-4])
     if result[-4:] == checksum(result[:-4]):
         return result[:-4]
     else:
diff --git a/contrib/testgen/gen_base58_test_vectors.py b/contrib/testgen/gen_base58_test_vectors.py
index 7e475b7a36a4f..ac0701e6be607 100755
--- a/contrib/testgen/gen_base58_test_vectors.py
+++ b/contrib/testgen/gen_base58_test_vectors.py
@@ -45,7 +45,6 @@ def is_valid(v):
     result = b58decode_chk(v)
     if result is None:
         return False
-    valid = False
     for template in templates:
         prefix = str(bytearray(template[0]))
         suffix = str(bytearray(template[2]))
diff --git a/qa/rpc-tests/forknotify.py b/qa/rpc-tests/forknotify.py
index a1901aedab890..8b1403083f298 100755
--- a/qa/rpc-tests/forknotify.py
+++ b/qa/rpc-tests/forknotify.py
@@ -22,7 +22,7 @@ def __init__(self):
     def setup_network(self):
         self.nodes = []
         self.alert_filename = os.path.join(self.options.tmpdir, "alert.txt")
-        with open(self.alert_filename, 'w', encoding='utf8') as f:
+        with open(self.alert_filename, 'w', encoding='utf8'):
             pass  # Just open then close to create zero-length file
         self.nodes.append(start_node(0, self.options.tmpdir,
                             ["-blockversion=2", "-alertnotify=echo %s >> \"" + self.alert_filename + "\""]))
diff --git a/qa/rpc-tests/p2p-segwit.py b/qa/rpc-tests/p2p-segwit.py
index 51adec5cae494..b0ff3beace69d 100755
--- a/qa/rpc-tests/p2p-segwit.py
+++ b/qa/rpc-tests/p2p-segwit.py
@@ -951,7 +951,6 @@ def test_tx_relay_after_segwit_activation(self):
         tx.rehash()
 
         tx_hash = tx.sha256
-        tx_value = tx.vout[0].nValue
 
         # Verify that unnecessary witnesses are rejected.
         self.test_node.announce_tx_and_wait_for_getdata(tx)
diff --git a/qa/rpc-tests/receivedby.py b/qa/rpc-tests/receivedby.py
index 4f17b661cb28d..1b90b23330f04 100755
--- a/qa/rpc-tests/receivedby.py
+++ b/qa/rpc-tests/receivedby.py
@@ -14,7 +14,6 @@ def get_sub_array_from_array(object_array, to_match):
         Finds and returns a sub array from an array of arrays.
         to_match should be a unique idetifier of a sub array
     '''
-    num_matched = 0
     for item in object_array:
         all_match = True
         for key,value in to_match.items():
@@ -104,7 +103,7 @@ def run_test(self):
         received_by_account_json = get_sub_array_from_array(self.nodes[1].listreceivedbyaccount(),{"account":account})
         if len(received_by_account_json) == 0:
             raise AssertionError("No accounts found in node")
-        balance_by_account = rec_by_accountArr = self.nodes[1].getreceivedbyaccount(account)
+        balance_by_account = self.nodes[1].getreceivedbyaccount(account)
 
         txid = self.nodes[0].sendtoaddress(addr, 0.1)
         self.sync_all()
diff --git a/qa/rpc-tests/replace-by-fee.py b/qa/rpc-tests/replace-by-fee.py
index 8aba06c60c63f..2b29dfdd2bd92 100755
--- a/qa/rpc-tests/replace-by-fee.py
+++ b/qa/rpc-tests/replace-by-fee.py
@@ -393,7 +393,6 @@ def test_too_many_replacements(self):
         utxo = make_utxo(self.nodes[0], initial_nValue)
         fee = int(0.0001*COIN)
         split_value = int((initial_nValue-fee)/(MAX_REPLACEMENT_LIMIT+1))
-        actual_fee = initial_nValue - split_value*(MAX_REPLACEMENT_LIMIT+1)
 
         outputs = []
         for i in range(MAX_REPLACEMENT_LIMIT+1):
diff --git a/qa/rpc-tests/wallet.py b/qa/rpc-tests/wallet.py
index f325ecb4a3a72..c82e0adffa523 100755
--- a/qa/rpc-tests/wallet.py
+++ b/qa/rpc-tests/wallet.py
@@ -359,7 +359,6 @@ def run_test (self):
         rawtx = self.nodes[0].createrawtransaction([{"txid":singletxid, "vout":0}], {chain_addrs[0]:node0_balance/2-Decimal('0.01'), chain_addrs[1]:node0_balance/2-Decimal('0.01')})
         signedtx = self.nodes[0].signrawtransaction(rawtx)
         singletxid = self.nodes[0].sendrawtransaction(signedtx["hex"])
-        txids = [singletxid, singletxid]
         self.nodes[0].generate(1)
 
         # Make a long chain of unconfirmed payments without hitting mempool limit

From 90fd29bd0dcbaf5d5c4ef9e69824297c35f0b88e Mon Sep 17 00:00:00 2001
From: practicalswift <practicalswift@users.noreply.github.com>
Date: Thu, 12 Jan 2017 21:50:18 +0100
Subject: [PATCH 1579/1802] Remove unused int64_t nSinceLastSeen

---
 src/addrman.cpp | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/addrman.cpp b/src/addrman.cpp
index 662e931d252b5..d72042510a79a 100644
--- a/src/addrman.cpp
+++ b/src/addrman.cpp
@@ -54,11 +54,8 @@ double CAddrInfo::GetChance(int64_t nNow) const
 {
     double fChance = 1.0;
 
-    int64_t nSinceLastSeen = nNow - nTime;
     int64_t nSinceLastTry = nNow - nLastTry;
 
-    if (nSinceLastSeen < 0)
-        nSinceLastSeen = 0;
     if (nSinceLastTry < 0)
         nSinceLastTry = 0;
 

From 988d3009320f5363438af9070aaea7879efffb40 Mon Sep 17 00:00:00 2001
From: practicalswift <practicalswift@users.noreply.github.com>
Date: Thu, 12 Jan 2017 16:47:51 +0100
Subject: [PATCH 1580/1802] [qt] Rename formateNiceTimeOffset(qint64) to
 formatNiceTimeOffset(qint64)

---
 src/qt/bitcoingui.cpp   | 2 +-
 src/qt/guiutil.cpp      | 2 +-
 src/qt/guiutil.h        | 2 +-
 src/qt/modaloverlay.cpp | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp
index 9d5ff31fb4f57..a3cb376bcf593 100644
--- a/src/qt/bitcoingui.cpp
+++ b/src/qt/bitcoingui.cpp
@@ -817,7 +817,7 @@ void BitcoinGUI::setNumBlocks(int count, const QDateTime& blockDate, double nVer
     }
     else
     {
-        QString timeBehindText = GUIUtil::formateNiceTimeOffset(secs);
+        QString timeBehindText = GUIUtil::formatNiceTimeOffset(secs);
 
         progressBarLabel->setVisible(true);
         progressBar->setFormat(tr("%1 behind").arg(timeBehindText));
diff --git a/src/qt/guiutil.cpp b/src/qt/guiutil.cpp
index 4463cfdaefb0c..bc865c992af9d 100644
--- a/src/qt/guiutil.cpp
+++ b/src/qt/guiutil.cpp
@@ -951,7 +951,7 @@ QString formatTimeOffset(int64_t nTimeOffset)
   return QString(QObject::tr("%1 s")).arg(QString::number((int)nTimeOffset, 10));
 }
 
-QString formateNiceTimeOffset(qint64 secs)
+QString formatNiceTimeOffset(qint64 secs)
 {
     // Represent time from last generated block in human readable text
     QString timeBehindText;
diff --git a/src/qt/guiutil.h b/src/qt/guiutil.h
index b2c9338b5679a..5765b2ec4af0c 100644
--- a/src/qt/guiutil.h
+++ b/src/qt/guiutil.h
@@ -200,7 +200,7 @@ namespace GUIUtil
     /* Format a CNodeCombinedStats.nTimeOffset into a user-readable string. */
     QString formatTimeOffset(int64_t nTimeOffset);
 
-    QString formateNiceTimeOffset(qint64 secs);
+    QString formatNiceTimeOffset(qint64 secs);
 
     class ClickableLabel : public QLabel
     {
diff --git a/src/qt/modaloverlay.cpp b/src/qt/modaloverlay.cpp
index 3e8282e63dec7..89fb159956211 100644
--- a/src/qt/modaloverlay.cpp
+++ b/src/qt/modaloverlay.cpp
@@ -105,7 +105,7 @@ void ModalOverlay::tipUpdate(int count, const QDateTime& blockDate, double nVeri
         ui->progressIncreasePerH->setText(QString::number(progressPerHour*100, 'f', 2)+"%");
 
         // show expected remaining time
-        ui->expectedTimeLeft->setText(GUIUtil::formateNiceTimeOffset(remainingMSecs/1000.0));
+        ui->expectedTimeLeft->setText(GUIUtil::formatNiceTimeOffset(remainingMSecs/1000.0));
 
         static const int MAX_SAMPLES = 5000;
         if (blockProcessTime.count() > MAX_SAMPLES)

From 95bab821b3af268d23e9cf5f9da3dd7f1e396949 Mon Sep 17 00:00:00 2001
From: practicalswift <practicalswift@users.noreply.github.com>
Date: Tue, 10 Jan 2017 23:30:14 +0100
Subject: [PATCH 1581/1802] Remove unused Python imports

---
 contrib/devtools/github-merge.py        | 2 +-
 contrib/devtools/test-security-check.py | 1 -
 contrib/linearize/linearize-data.py     | 6 ------
 contrib/linearize/linearize-hashes.py   | 1 -
 contrib/zmq/zmq_sub.py                  | 1 -
 qa/rpc-tests/nodehandling.py            | 1 -
 qa/rpc-tests/p2p-mempool.py             | 1 -
 qa/rpc-tests/zmq_test.py                | 3 ---
 share/qt/extract_strings_qt.py          | 1 -
 src/test/bitcoin-util-test.py           | 1 -
 10 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/contrib/devtools/github-merge.py b/contrib/devtools/github-merge.py
index aae966a8f6b07..0cee0921b122c 100755
--- a/contrib/devtools/github-merge.py
+++ b/contrib/devtools/github-merge.py
@@ -15,7 +15,7 @@
 # In case of a clean merge that is accepted by the user, the local branch with
 # name $BRANCH is overwritten with the merged result, and optionally pushed.
 from __future__ import division,print_function,unicode_literals
-import os,sys
+import os
 from sys import stdin,stdout,stderr
 import argparse
 import subprocess
diff --git a/contrib/devtools/test-security-check.py b/contrib/devtools/test-security-check.py
index c0f120392e622..18f9835faa25a 100755
--- a/contrib/devtools/test-security-check.py
+++ b/contrib/devtools/test-security-check.py
@@ -7,7 +7,6 @@
 '''
 from __future__ import division,print_function
 import subprocess
-import sys
 import unittest
 
 def write_testcode(filename):
diff --git a/contrib/linearize/linearize-data.py b/contrib/linearize/linearize-data.py
index 043bf2e814fc1..3fdec134b86cc 100755
--- a/contrib/linearize/linearize-data.py
+++ b/contrib/linearize/linearize-data.py
@@ -8,16 +8,10 @@
 #
 
 from __future__ import print_function, division
-try: # Python 3
-    import http.client as httplib
-except ImportError: # Python 2
-    import httplib
-import json
 import struct
 import re
 import os
 import os.path
-import base64
 import sys
 import hashlib
 import datetime
diff --git a/contrib/linearize/linearize-hashes.py b/contrib/linearize/linearize-hashes.py
index f749da5396649..00a54d0820b76 100755
--- a/contrib/linearize/linearize-hashes.py
+++ b/contrib/linearize/linearize-hashes.py
@@ -13,7 +13,6 @@
 except ImportError: # Python 2
     import httplib
 import json
-import struct
 import re
 import base64
 import sys
diff --git a/contrib/zmq/zmq_sub.py b/contrib/zmq/zmq_sub.py
index 3dea5e3c1440c..6f57aa47e9648 100755
--- a/contrib/zmq/zmq_sub.py
+++ b/contrib/zmq/zmq_sub.py
@@ -3,7 +3,6 @@
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-import array
 import binascii
 import zmq
 import struct
diff --git a/qa/rpc-tests/nodehandling.py b/qa/rpc-tests/nodehandling.py
index e9682c4908f65..7313c79b54fa1 100755
--- a/qa/rpc-tests/nodehandling.py
+++ b/qa/rpc-tests/nodehandling.py
@@ -10,7 +10,6 @@
 from test_framework.test_framework import BitcoinTestFramework
 from test_framework.util import *
 
-import http.client
 import urllib.parse
 
 class NodeHandlingTest (BitcoinTestFramework):
diff --git a/qa/rpc-tests/p2p-mempool.py b/qa/rpc-tests/p2p-mempool.py
index 382d7f1e82ca0..1fd125fdcdd87 100755
--- a/qa/rpc-tests/p2p-mempool.py
+++ b/qa/rpc-tests/p2p-mempool.py
@@ -6,7 +6,6 @@
 from test_framework.mininode import *
 from test_framework.test_framework import BitcoinTestFramework
 from test_framework.util import *
-import time
 
 class TestNode(NodeConnCB):
     def __init__(self):
diff --git a/qa/rpc-tests/zmq_test.py b/qa/rpc-tests/zmq_test.py
index 3a116317fed96..e9afb2b09afff 100755
--- a/qa/rpc-tests/zmq_test.py
+++ b/qa/rpc-tests/zmq_test.py
@@ -12,9 +12,6 @@
 import zmq
 import struct
 
-import http.client
-import urllib.parse
-
 class ZMQTest (BitcoinTestFramework):
 
     def __init__(self):
diff --git a/share/qt/extract_strings_qt.py b/share/qt/extract_strings_qt.py
index 92e0df259e790..5492fdb8c5524 100755
--- a/share/qt/extract_strings_qt.py
+++ b/share/qt/extract_strings_qt.py
@@ -8,7 +8,6 @@
 '''
 from __future__ import division,print_function,unicode_literals
 from subprocess import Popen, PIPE
-import glob
 import operator
 import os
 import sys
diff --git a/src/test/bitcoin-util-test.py b/src/test/bitcoin-util-test.py
index 1c090b3f3f1e9..e2087187aaba6 100755
--- a/src/test/bitcoin-util-test.py
+++ b/src/test/bitcoin-util-test.py
@@ -5,7 +5,6 @@
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 from __future__ import division,print_function,unicode_literals
 import os
-import sys
 import bctest
 import buildenv
 import argparse

From d7c58ad514ee00db00589216166808258bc16b60 Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Sat, 24 Dec 2016 14:34:20 -0500
Subject: [PATCH 1582/1802] Split CNode::cs_vSend: message processing and
 message sending

cs_vSend is used for two purposes - to lock the datastructures used
to queue messages to place on the wire and to only call
SendMessages once at a time per-node. I believe SendMessages used
to access some of the vSendMsg stuff, but it doesn't anymore, so
these locks do not need to be on the same mutex, and also make
deadlocking much more likely.
---
 src/net.cpp | 22 +++++++++-------------
 src/net.h   |  2 ++
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/src/net.cpp b/src/net.cpp
index b275bdd8092fe..e7b4562eabc66 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -1147,12 +1147,10 @@ void CConnman::ThreadSocketHandler()
                 // * Hand off all complete messages to the processor, to be handled without
                 //   blocking here.
                 {
-                    TRY_LOCK(pnode->cs_vSend, lockSend);
-                    if (lockSend) {
-                        if (!pnode->vSendMsg.empty()) {
-                            FD_SET(pnode->hSocket, &fdsetSend);
-                            continue;
-                        }
+                    LOCK(pnode->cs_vSend);
+                    if (!pnode->vSendMsg.empty()) {
+                        FD_SET(pnode->hSocket, &fdsetSend);
+                        continue;
                     }
                 }
                 {
@@ -1272,12 +1270,10 @@ void CConnman::ThreadSocketHandler()
                 continue;
             if (FD_ISSET(pnode->hSocket, &fdsetSend))
             {
-                TRY_LOCK(pnode->cs_vSend, lockSend);
-                if (lockSend) {
-                    size_t nBytes = SocketSendData(pnode);
-                    if (nBytes) {
-                        RecordBytesSent(nBytes);
-                    }
+                LOCK(pnode->cs_vSend);
+                size_t nBytes = SocketSendData(pnode);
+                if (nBytes) {
+                    RecordBytesSent(nBytes);
                 }
             }
 
@@ -1875,7 +1871,7 @@ void CConnman::ThreadMessageHandler()
 
             // Send messages
             {
-                TRY_LOCK(pnode->cs_vSend, lockSend);
+                TRY_LOCK(pnode->cs_sendProcessing, lockSend);
                 if (lockSend)
                     GetNodeSignals().SendMessages(pnode, *this, flagInterruptMsgProc);
             }
diff --git a/src/net.h b/src/net.h
index 2baf82702c4d7..aef3ef9a7d7c9 100644
--- a/src/net.h
+++ b/src/net.h
@@ -618,6 +618,8 @@ class CNode
     std::list<CNetMessage> vProcessMsg;
     size_t nProcessQueueSize;
 
+    CCriticalSection cs_sendProcessing;
+
     std::deque<CInv> vRecvGetData;
     uint64_t nRecvBytes;
     std::atomic<int> nRecvVersion;

From 376b3c2c6e329357e4793c1d1b90d1dc0f30fed0 Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Thu, 12 Jan 2017 20:08:52 -0800
Subject: [PATCH 1583/1802] Make the cs_sendProcessing a LOCK instead of a
 TRY_LOCK

Technically cs_sendProcessing is entirely useless now because it
is only ever taken on the one MessageHandler thread, but because
there may be multiple of those in the future, it is left in place
---
 src/net.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/net.cpp b/src/net.cpp
index e7b4562eabc66..1019d59544288 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -1871,9 +1871,8 @@ void CConnman::ThreadMessageHandler()
 
             // Send messages
             {
-                TRY_LOCK(pnode->cs_sendProcessing, lockSend);
-                if (lockSend)
-                    GetNodeSignals().SendMessages(pnode, *this, flagInterruptMsgProc);
+                LOCK(pnode->cs_sendProcessing);
+                GetNodeSignals().SendMessages(pnode, *this, flagInterruptMsgProc);
             }
             if (flagInterruptMsgProc)
                 return;

From 02ee4eb2637db9077aefa1f5e59864218e016b93 Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Fri, 13 Jan 2017 15:49:31 -0500
Subject: [PATCH 1584/1802] Make most_recent_compact_block a pointer to a const

---
 src/net_processing.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/net_processing.cpp b/src/net_processing.cpp
index 015921ebe93fe..8bcb590675693 100644
--- a/src/net_processing.cpp
+++ b/src/net_processing.cpp
@@ -754,11 +754,11 @@ void PeerLogicValidation::SyncTransaction(const CTransaction& tx, const CBlockIn
 
 static CCriticalSection cs_most_recent_block;
 static std::shared_ptr<const CBlock> most_recent_block;
-static std::shared_ptr<CBlockHeaderAndShortTxIDs> most_recent_compact_block;
+static std::shared_ptr<const CBlockHeaderAndShortTxIDs> most_recent_compact_block;
 static uint256 most_recent_block_hash;
 
 void PeerLogicValidation::NewPoWValidBlock(const CBlockIndex *pindex, const std::shared_ptr<const CBlock>& pblock) {
-    std::shared_ptr<CBlockHeaderAndShortTxIDs> pcmpctblock = std::make_shared<CBlockHeaderAndShortTxIDs> (*pblock, true);
+    std::shared_ptr<const CBlockHeaderAndShortTxIDs> pcmpctblock = std::make_shared<const CBlockHeaderAndShortTxIDs> (*pblock, true);
     CNetMsgMaker msgMaker(PROTOCOL_VERSION);
 
     LOCK(cs_main);

From 02fcb2944d856d1cff0480fc7d8d9a660e22b28c Mon Sep 17 00:00:00 2001
From: fanquake <fanquake@gmail.com>
Date: Wed, 4 Jan 2017 21:16:31 +0800
Subject: [PATCH 1585/1802] [depends] Qt 5.7.1

---
 depends/packages/qt.mk                        | 18 ++++++-------
 depends/patches/qt/configure-xcoderun.patch   | 25 -------------------
 .../patches/qt/fix-xcb-include-order.patch    | 18 ++++++-------
 depends/patches/qt/fix_qt_pkgconfig.patch     |  6 ++---
 depends/patches/qt/mingw-uuidof.patch         | 18 ++++++-------
 depends/patches/qt/pidlist_absolute.patch     | 12 ++++-----
 6 files changed, 35 insertions(+), 62 deletions(-)
 delete mode 100644 depends/patches/qt/configure-xcoderun.patch

diff --git a/depends/packages/qt.mk b/depends/packages/qt.mk
index bdde15aa173df..545e1ea70798f 100644
--- a/depends/packages/qt.mk
+++ b/depends/packages/qt.mk
@@ -1,30 +1,30 @@
 PACKAGE=qt
-$(package)_version=5.6.1
-$(package)_download_path=http://download.qt.io/official_releases/qt/5.6/$($(package)_version)/submodules
+$(package)_version=5.7.1
+$(package)_download_path=http://download.qt.io/official_releases/qt/5.7/$($(package)_version)/submodules
 $(package)_suffix=opensource-src-$($(package)_version).tar.gz
 $(package)_file_name=qtbase-$($(package)_suffix)
-$(package)_sha256_hash=0ac67cf8d66d52b995f96c31c4b48117a1afb3db99eaa93e20ccd8f7f55f7fde
+$(package)_sha256_hash=95f83e532d23b3ddbde7973f380ecae1bac13230340557276f75f2e37984e410
 $(package)_dependencies=openssl
 $(package)_linux_dependencies=freetype fontconfig libxcb libX11 xproto libXext
 $(package)_build_subdir=qtbase
 $(package)_qt_libs=corelib network widgets gui plugins testlib
-$(package)_patches=mac-qmake.conf configure-xcoderun.patch mingw-uuidof.patch pidlist_absolute.patch fix-xcb-include-order.patch fix_qt_pkgconfig.patch
+$(package)_patches=mac-qmake.conf mingw-uuidof.patch pidlist_absolute.patch fix-xcb-include-order.patch fix_qt_pkgconfig.patch
 
 $(package)_qttranslations_file_name=qttranslations-$($(package)_suffix)
-$(package)_qttranslations_sha256_hash=dcc1534d247babca1840cb6d0a000671801a341ea352d0535474f86adadaf028
+$(package)_qttranslations_sha256_hash=3a15aebd523c6d89fb97b2d3df866c94149653a26d27a00aac9b6d3020bc5a1d
 
 
 $(package)_qttools_file_name=qttools-$($(package)_suffix)
-$(package)_qttools_sha256_hash=e0f845de28c31230dfa428f0190ccb3b91d1fc02481b1f064698ae4ef8376aa1
+$(package)_qttools_sha256_hash=22d67de915cb8cd93e16fdd38fa006224ad9170bd217c2be1e53045a8dd02f0f
 
 $(package)_extra_sources  = $($(package)_qttranslations_file_name)
 $(package)_extra_sources += $($(package)_qttools_file_name)
 
 define $(package)_set_vars
 $(package)_config_opts_release = -release
-$(package)_config_opts_debug   = -debug
+$(package)_config_opts_debug = -debug
 $(package)_config_opts += -bindir $(build_prefix)/bin
-$(package)_config_opts += -c++11
+$(package)_config_opts += -c++std c++11
 $(package)_config_opts += -confirm-license
 $(package)_config_opts += -dbus-runtime
 $(package)_config_opts += -hostprefix $(build_prefix)
@@ -46,7 +46,6 @@ $(package)_config_opts += -no-linuxfb
 $(package)_config_opts += -no-libudev
 $(package)_config_opts += -no-mitshm
 $(package)_config_opts += -no-mtdev
-$(package)_config_opts += -no-nis
 $(package)_config_opts += -no-pulseaudio
 $(package)_config_opts += -no-openvg
 $(package)_config_opts += -no-reduce-relocations
@@ -134,7 +133,6 @@ define $(package)_preprocess_cmds
   cp -f qtbase/mkspecs/macx-clang/Info.plist.app qtbase/mkspecs/macx-clang-linux/ &&\
   cp -f qtbase/mkspecs/macx-clang/qplatformdefs.h qtbase/mkspecs/macx-clang-linux/ &&\
   cp -f $($(package)_patch_dir)/mac-qmake.conf qtbase/mkspecs/macx-clang-linux/qmake.conf && \
-  patch -p1 < $($(package)_patch_dir)/configure-xcoderun.patch && \
   patch -p1 < $($(package)_patch_dir)/mingw-uuidof.patch && \
   patch -p1 < $($(package)_patch_dir)/pidlist_absolute.patch && \
   patch -p1 < $($(package)_patch_dir)/fix-xcb-include-order.patch && \
diff --git a/depends/patches/qt/configure-xcoderun.patch b/depends/patches/qt/configure-xcoderun.patch
deleted file mode 100644
index 08286d8420bb3..0000000000000
--- a/depends/patches/qt/configure-xcoderun.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- old/qtbase/configure
-+++ new/qtbase/configure
-@@ -543,7 +543,7 @@ if [ "$BUILD_ON_MAC" = "yes" ]; then
-         exit 2
-     fi
- 
--    if ! /usr/bin/xcrun -find xcrun >/dev/null 2>&1; then
-+    if ! /usr/bin/xcrun -find xcodebuild >/dev/null 2>&1; then
-         echo >&2
-         echo "   Xcode not set up properly. You may need to confirm the license" >&2
-         echo "   agreement by running /usr/bin/xcodebuild without arguments." >&2
-diff --git a/mkspecs/features/mac/default_pre.prf b/mkspecs/features/mac/default_pre.prf
-index 0cc8cd6..5df99d1 100644
---- old/qtbase/mkspecs/features/mac/default_pre.prf
-+++ new/qtbase/mkspecs/features/mac/default_pre.prf
-@@ -12,7 +12,7 @@ isEmpty(QMAKE_XCODE_DEVELOPER_PATH) {
-         error("Xcode is not installed in $${QMAKE_XCODE_DEVELOPER_PATH}. Please use xcode-select to choose Xcode installation path.")
- 
-     # Make sure Xcode is set up properly
--    isEmpty($$list($$system("/usr/bin/xcrun -find xcrun 2>/dev/null"))): \
-+    isEmpty($$list($$system("/usr/bin/xcrun -find xcodebuild 2>/dev/null"))): \
-         error("Xcode not set up properly. You may need to confirm the license agreement by running /usr/bin/xcodebuild.")
- }
- 
--- 
diff --git a/depends/patches/qt/fix-xcb-include-order.patch b/depends/patches/qt/fix-xcb-include-order.patch
index c7dbebedce831..ec2bc17d9bd9e 100644
--- a/depends/patches/qt/fix-xcb-include-order.patch
+++ b/depends/patches/qt/fix-xcb-include-order.patch
@@ -1,6 +1,6 @@
---- old/qtbase/src/plugins/platforms/xcb/xcb_qpa_lib.pro 2015-03-17 02:06:42.705930685 +0000
-+++ new/qtbase/src/plugins/platforms/xcb/xcb_qpa_lib.pro 2015-03-17 02:08:41.281926351 +0000
-@@ -74,8 +74,6 @@
+--- old/qtbase/src/plugins/platforms/xcb/xcb_qpa_lib.pro 2015-03-17
++++ new/qtbase/src/plugins/platforms/xcb/xcb_qpa_lib.pro 2015-03-17
+@@ -76,8 +76,6 @@
  
  DEFINES += $$QMAKE_DEFINES_XCB
  LIBS += $$QMAKE_LIBS_XCB
@@ -9,18 +9,18 @@
  
  CONFIG += qpa/genericunixfontdatabase
  
-@@ -87,7 +85,8 @@
+@@ -89,7 +87,8 @@
  contains(QT_CONFIG, xcb-qt) {
      DEFINES += XCB_USE_RENDER
      XCB_DIR = ../../../3rdparty/xcb
 -    INCLUDEPATH += $$XCB_DIR/include $$XCB_DIR/sysinclude
 +    QMAKE_CFLAGS += -I$$XCB_DIR/include -I$$XCB_DIR/sysinclude $$QMAKE_CFLAGS_XCB
 +    QMAKE_CXXFLAGS += -I$$XCB_DIR/include -I$$XCB_DIR/sysinclude $$QMAKE_CFLAGS_XCB
-     LIBS += -lxcb -L$$OUT_PWD/xcb-static -lxcb-static
+     LIBS += -lxcb -L$$MODULE_BASE_OUTDIR/lib -lxcb-static$$qtPlatformTargetSuffix()
  } else {
      LIBS += -lxcb -lxcb-image -lxcb-icccm -lxcb-sync -lxcb-xfixes -lxcb-shm -lxcb-randr -lxcb-shape -lxcb-keysyms -lxcb-xinerama
---- old/qtbase/src/plugins/platforms/xcb/xcb-static/xcb-static.pro      2015-03-17 02:07:04.641929383 +0000
-+++ new/qtbase/src/plugins/platforms/xcb/xcb-static/xcb-static.pro      2015-03-17 02:10:15.485922059 +0000
+--- old/qtbase/src/plugins/platforms/xcb/xcb-static/xcb-static.pro
++++ new/qtbase/src/plugins/platforms/xcb/xcb-static/xcb-static.pro
 @@ -9,7 +9,8 @@
  
  XCB_DIR = ../../../../3rdparty/xcb
@@ -31,8 +31,8 @@
  
  QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_XCB
  QMAKE_CFLAGS += $$QMAKE_CFLAGS_XCB
---- old/qtbase/src/plugins/platforms/xcb/xcb-plugin.pro	2015-07-24 16:02:59.530038830 -0400
-+++ new/qtbase/src/plugins/platforms/xcb/xcb-plugin.pro	2015-07-24 16:01:22.106037459 -0400
+--- old/qtbase/src/plugins/platforms/xcb/xcb-plugin.pro
++++ new/qtbase/src/plugins/platforms/xcb/xcb-plugin.pro
 @@ -6,6 +6,13 @@
      qxcbmain.cpp
  OTHER_FILES += xcb.json README
diff --git a/depends/patches/qt/fix_qt_pkgconfig.patch b/depends/patches/qt/fix_qt_pkgconfig.patch
index 3772db4f8b804..34302a9f2d2eb 100644
--- a/depends/patches/qt/fix_qt_pkgconfig.patch
+++ b/depends/patches/qt/fix_qt_pkgconfig.patch
@@ -1,6 +1,6 @@
---- old/qtbase/mkspecs/features/qt_module.prf 2016-03-17 02:06:42.705930685 +0000
-+++ new/qtbase/mkspecs/features/qt_module.prf 2016-03-17 02:06:42.705930685 +0000
-@@ -244,7 +244,7 @@
+--- old/qtbase/mkspecs/features/qt_module.prf
++++ new/qtbase/mkspecs/features/qt_module.prf
+@@ -245,7 +245,7 @@
  load(qt_targets)
  
  # this builds on top of qt_common
diff --git a/depends/patches/qt/mingw-uuidof.patch b/depends/patches/qt/mingw-uuidof.patch
index 975366e61229c..fb21923c8c36b 100644
--- a/depends/patches/qt/mingw-uuidof.patch
+++ b/depends/patches/qt/mingw-uuidof.patch
@@ -1,6 +1,6 @@
---- old/qtbase/src/plugins/platforms/windows/qwindowscontext.cpp	2015-06-20 17:40:20.956781548 -0400
-+++ new/qtbase/src/plugins/platforms/windows/qwindowscontext.cpp	2015-06-20 17:29:32.052772416 -0400
-@@ -69,7 +69,7 @@
+--- old/qtbase/src/plugins/platforms/windows/qwindowscontext.cpp
++++ new/qtbase/src/plugins/platforms/windows/qwindowscontext.cpp
+@@ -77,7 +77,7 @@
  #include <stdlib.h>
  #include <stdio.h>
  #include <windowsx.h>
@@ -9,8 +9,8 @@
  #  include <comdef.h>
  #endif
  
-@@ -762,7 +762,7 @@
-                           HWND_MESSAGE, NULL, (HINSTANCE)GetModuleHandle(0), NULL);
+@@ -814,7 +814,7 @@
+                           HWND_MESSAGE, NULL, static_cast<HINSTANCE>(GetModuleHandle(0)), NULL);
  }
  
 -#ifndef Q_OS_WINCE
@@ -18,16 +18,16 @@
  // Re-engineered from the inline function _com_error::ErrorMessage().
  // We cannot use it directly since it uses swprintf_s(), which is not
  // present in the MSVCRT.DLL found on Windows XP (QTBUG-35617).
-@@ -781,7 +781,7 @@
-          return QStringLiteral("IDispatch error #") + QString::number(wCode);
-      return QStringLiteral("Unknown error 0x0") + QString::number(comError.Error(), 16);
+@@ -833,7 +833,7 @@
+          return QString::asprintf("IDispatch error #%u", uint(wCode));
+      return QString::asprintf("Unknown error 0x0%x", uint(comError.Error()));
  }
 -#endif // !Q_OS_WINCE
 +#endif // !defined(Q_OS_WINCE) && (!defined(USE___UUIDOF) || (defined(USE___UUIDOF) && USE___UUIDOF == 1))
  
  /*!
      \brief Common COM error strings.
-@@ -846,12 +846,12 @@
+@@ -901,12 +901,12 @@
      default:
          break;
      }
diff --git a/depends/patches/qt/pidlist_absolute.patch b/depends/patches/qt/pidlist_absolute.patch
index 0b49c050dcc1f..c792824179056 100644
--- a/depends/patches/qt/pidlist_absolute.patch
+++ b/depends/patches/qt/pidlist_absolute.patch
@@ -1,7 +1,7 @@
 diff -dur old/qtbase/src/plugins/platforms/windows/qwindowscontext.h new/qtbase/src/plugins/platforms/windows/qwindowscontext.h
---- old/qtbase/src/plugins/platforms/windows/qwindowscontext.h	2015-06-29 22:04:40.000000000 +0200
-+++ new/qtbase/src/plugins/platforms/windows/qwindowscontext.h	2015-11-01 12:55:59.751234846 +0100
-@@ -124,10 +124,18 @@
+--- old/qtbase/src/plugins/platforms/windows/qwindowscontext.h
++++ new/qtbase/src/plugins/platforms/windows/qwindowscontext.h
+@@ -136,10 +136,18 @@
      inline void init();
  
      typedef HRESULT (WINAPI *SHCreateItemFromParsingName)(PCWSTR, IBindCtx *, const GUID&, void **);
@@ -21,9 +21,9 @@ diff -dur old/qtbase/src/plugins/platforms/windows/qwindowscontext.h new/qtbase/
      SHCreateItemFromParsingName sHCreateItemFromParsingName;
      SHGetKnownFolderIDList sHGetKnownFolderIDList;
 diff -dur old/qtbase/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp new/qtbase/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp
---- old/qtbase/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp	2015-06-29 22:04:40.000000000 +0200
-+++ new/qtbase/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp	2015-11-01 13:41:09.503149772 +0100
-@@ -1008,7 +1008,11 @@
+--- old/qtbase/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp
++++ new/qtbase/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp
+@@ -1016,7 +1016,11 @@
              qWarning() << __FUNCTION__ << ": Invalid CLSID: " << url.path();
              return Q_NULLPTR;
          }

From 2b32dea50316723cf9ea6f458c2a326705c9ea04 Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Fri, 13 Jan 2017 18:28:49 -0500
Subject: [PATCH 1586/1802] depends: use new variable layout for qt sdk

---
 depends/patches/qt/mac-qmake.conf | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/depends/patches/qt/mac-qmake.conf b/depends/patches/qt/mac-qmake.conf
index a6d0070cca648..402e0555b0130 100644
--- a/depends/patches/qt/mac-qmake.conf
+++ b/depends/patches/qt/mac-qmake.conf
@@ -11,10 +11,10 @@ QMAKE_XCODE_VERSION=4.3
 QMAKE_XCODE_DEVELOPER_PATH=/Developer
 QMAKE_MACOSX_DEPLOYMENT_TARGET = $${MAC_MIN_VERSION}
 QMAKE_MAC_SDK=macosx
-QMAKE_MAC_SDK.macosx.path = $${MAC_SDK_PATH}
+QMAKE_MAC_SDK.macosx.Path = $${MAC_SDK_PATH}
 QMAKE_MAC_SDK.macosx.platform_name = macosx
-QMAKE_MAC_SDK.macosx.version = $${MAC_SDK_VERSION}
-QMAKE_MAC_SDK.macosx.platform_path = /phony
+QMAKE_MAC_SDK.macosx.SDKVersion = $${MAC_SDK_VERSION}
+QMAKE_MAC_SDK.macosx.PlatformPath = /phony
 QMAKE_CFLAGS += -target $${MAC_TARGET}
 QMAKE_OBJECTIVE_CFLAGS += $$QMAKE_CFLAGS
 QMAKE_CXXFLAGS += $$QMAKE_CFLAGS

From c37ea4d403817c16e6b080d126b0a53c9930154d Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Fri, 13 Jan 2017 18:29:18 -0500
Subject: [PATCH 1587/1802] depends: fix qt translations build

Their buildsystem insists on using the installed ltranslate, but gets confused
about how to find it. Since we manually control the build order, just drop the
dependency.
---
 depends/packages/qt.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/depends/packages/qt.mk b/depends/packages/qt.mk
index 545e1ea70798f..383ef2dae617c 100644
--- a/depends/packages/qt.mk
+++ b/depends/packages/qt.mk
@@ -124,6 +124,7 @@ endef
 
 define $(package)_preprocess_cmds
   sed -i.old "s|updateqm.commands = \$$$$\$$$$LRELEASE|updateqm.commands = $($(package)_extract_dir)/qttools/bin/lrelease|" qttranslations/translations/translations.pro && \
+  sed -i.old "/updateqm.depends =/d" qttranslations/translations/translations.pro && \
   sed -i.old "s/src_plugins.depends = src_sql src_xml src_network/src_plugins.depends = src_xml src_network/" qtbase/src/src.pro && \
   sed -i.old "s|X11/extensions/XIproto.h|X11/X.h|" qtbase/src/plugins/platforms/xcb/qxcbxsettings.cpp && \
   sed -i.old 's/if \[ "$$$$XPLATFORM_MAC" = "yes" \]; then xspecvals=$$$$(macSDKify/if \[ "$$$$BUILD_ON_MAC" = "yes" \]; then xspecvals=$$$$(macSDKify/' qtbase/configure && \

From bb077fa5d099fe742e0593ceda81c3eaba57a02c Mon Sep 17 00:00:00 2001
From: fanquake <fanquake@gmail.com>
Date: Sat, 14 Jan 2017 14:26:00 +0800
Subject: [PATCH 1588/1802] [depends] Remove OBJCXX define from config.site.in

---
 depends/config.site.in | 1 -
 1 file changed, 1 deletion(-)

diff --git a/depends/config.site.in b/depends/config.site.in
index 27e3aedd8ed4f..3d7c9fd43c7a8 100644
--- a/depends/config.site.in
+++ b/depends/config.site.in
@@ -63,7 +63,6 @@ LDFLAGS="-L$depends_prefix/lib $LDFLAGS"
 CC="@CC@"
 CXX="@CXX@"
 OBJC="${CC}"
-OBJCXX="${CXX}"
 CCACHE=$depends_prefix/native/bin/ccache
 PYTHONPATH=$depends_prefix/native/lib/python/dist-packages:$PYTHONPATH
 

From afab9f47f619120f22e5d586d417c71551f8d000 Mon Sep 17 00:00:00 2001
From: practicalswift <practicalswift@users.noreply.github.com>
Date: Sat, 14 Jan 2017 20:18:20 +0100
Subject: [PATCH 1589/1802] [test] Avoid potential NULL pointer dereference in
 addrman_tests.cpp

---
 src/test/addrman_tests.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test/addrman_tests.cpp b/src/test/addrman_tests.cpp
index 48313915e7a43..322addc9f6fe4 100644
--- a/src/test/addrman_tests.cpp
+++ b/src/test/addrman_tests.cpp
@@ -297,7 +297,7 @@ BOOST_AUTO_TEST_CASE(addrman_find)
     // Test 18; Find does not discriminate by port number.
     CAddrInfo* info2 = addrman.Find(addr2);
     BOOST_CHECK(info2);
-    if (info2)
+    if (info2 && info1)
         BOOST_CHECK(info2->ToString() == info1->ToString());
 
     // Test 19: Find returns another IP matching what we searched on.

From 8fc698935f01a9f0675e509761fb69be8d43e80a Mon Sep 17 00:00:00 2001
From: practicalswift <practicalswift@users.noreply.github.com>
Date: Sat, 14 Jan 2017 21:45:32 +0100
Subject: [PATCH 1590/1802] Remove redundant semicolons

---
 src/hash.cpp                   | 2 +-
 src/rpc/mining.cpp             | 4 ++--
 src/test/versionbits_tests.cpp | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/hash.cpp b/src/hash.cpp
index a399ca9252a5f..a14a2386a264f 100644
--- a/src/hash.cpp
+++ b/src/hash.cpp
@@ -57,7 +57,7 @@ unsigned int MurmurHash3(unsigned int nHashSeed, const std::vector<unsigned char
             k1 = ROTL32(k1, 15);
             k1 *= c2;
             h1 ^= k1;
-        };
+        }
     }
 
     //----------
diff --git a/src/rpc/mining.cpp b/src/rpc/mining.cpp
index e46f55a8aa7e4..c594daca0d0dd 100644
--- a/src/rpc/mining.cpp
+++ b/src/rpc/mining.cpp
@@ -697,7 +697,7 @@ class submitblock_StateCatcher : public CValidationInterface
     bool found;
     CValidationState state;
 
-    submitblock_StateCatcher(const uint256 &hashIn) : hash(hashIn), found(false), state() {};
+    submitblock_StateCatcher(const uint256 &hashIn) : hash(hashIn), found(false), state() {}
 
 protected:
     virtual void BlockChecked(const CBlock& block, const CValidationState& stateIn) {
@@ -705,7 +705,7 @@ class submitblock_StateCatcher : public CValidationInterface
             return;
         found = true;
         state = stateIn;
-    };
+    }
 };
 
 UniValue submitblock(const JSONRPCRequest& request)
diff --git a/src/test/versionbits_tests.cpp b/src/test/versionbits_tests.cpp
index bae0eff7e55c7..e2b5573abd8c7 100644
--- a/src/test/versionbits_tests.cpp
+++ b/src/test/versionbits_tests.cpp
@@ -292,7 +292,7 @@ BOOST_AUTO_TEST_CASE(versionbits_computeblockversion)
         blocksToMine--;
         nTime += 600;
         nHeight += 1;
-    };
+    }
 
     nTime = nTimeout;
     // FAILED is only triggered at the end of a period, so CBV should be setting

From 7b5e3fe0ccb434821927c9cc2e9f2fb0d7f01dc4 Mon Sep 17 00:00:00 2001
From: John Newbery <john@johnnewbery.com>
Date: Fri, 13 Jan 2017 14:23:59 -0500
Subject: [PATCH 1591/1802] Add assumevalid testcase

Adds a qa testcase testing the new "-assumevalid" option. The testcase builds
a chain that includes and invalid signature for one of the transactions and
sends that chain to three nodes:

 - node0 has no -assumevalid parameter and rejects the invalid chain.
 - node1 has -assumevalid set and accepts the invalid chain.
 - node2 has -assumevalid set but the invalid block is not buried deep
   enough to assume invalid, and so rejects the invalid chain.
---
 qa/rpc-tests/assumevalid.py | 191 ++++++++++++++++++++++++++++++++++++
 1 file changed, 191 insertions(+)
 create mode 100755 qa/rpc-tests/assumevalid.py

diff --git a/qa/rpc-tests/assumevalid.py b/qa/rpc-tests/assumevalid.py
new file mode 100755
index 0000000000000..e4bc22951b394
--- /dev/null
+++ b/qa/rpc-tests/assumevalid.py
@@ -0,0 +1,191 @@
+#!/usr/bin/env python3
+# Copyright (c) 2014-2016 The Bitcoin Core developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or http://www.opensource.org/licenses/mit-license.php.
+'''
+assumevalid.py
+
+Test logic for skipping signature validation on blocks which we've assumed
+valid (https://github.com/bitcoin/bitcoin/pull/9484)
+
+We build a chain that includes and invalid signature for one of the
+transactions:
+
+    0:        genesis block
+    1:        block 1 with coinbase transaction output.
+    2-101:    bury that block with 100 blocks so the coinbase transaction
+              output can be spent
+    102:      a block containing a transaction spending the coinbase
+              transaction output. The transaction has an invalid signature. 
+    103-2202: bury the bad block with just over two weeks' worth of blocks
+              (2100 blocks)
+
+Start three nodes:
+
+    - node0 has no -assumevalid parameter. Try to sync to block 2202. It will
+      reject block 102 and only sync as far as block 101
+    - node1 has -assumevalid set to the hash of block 102. Try to sync to
+      block 2202. node1 will sync all the way to block 2202.
+    - node2 has -assumevalid set to the hash of block 102. Try to sync to
+      block 200. node2 will reject block 102 since it's assumed valid, but it
+      isn't buried by at least two weeks' work.
+'''
+
+from test_framework.mininode import *
+from test_framework.test_framework import BitcoinTestFramework
+from test_framework.util import *
+from test_framework.blocktools import create_block, create_coinbase
+from test_framework.key import CECKey
+from test_framework.script import *
+
+class BaseNode(SingleNodeConnCB):
+    def __init__(self):
+        SingleNodeConnCB.__init__(self)
+        self.last_inv = None
+        self.last_headers = None
+        self.last_block = None
+        self.last_getdata = None
+        self.block_announced = False
+        self.last_getheaders = None
+        self.disconnected = False
+        self.last_blockhash_announced = None
+
+    def on_close(self, conn):
+        self.disconnected = True
+
+    def wait_for_disconnect(self, timeout=60):
+        test_function = lambda: self.disconnected
+        assert(wait_until(test_function, timeout=timeout))
+        return
+
+    def send_header_for_blocks(self, new_blocks):
+        headers_message = msg_headers()
+        headers_message.headers = [ CBlockHeader(b) for b in new_blocks ]
+        self.send_message(headers_message)
+
+class SendHeadersTest(BitcoinTestFramework):
+    def __init__(self):
+        super().__init__()
+        self.setup_clean_chain = True
+        self.num_nodes = 3
+
+    def setup_network(self):
+        # Start node0. We don't start the other nodes yet since
+        # we need to pre-mine a block with an invalid transaction
+        # signature so we can pass in the block hash as assumevalid.
+        self.nodes = []
+        self.nodes.append(start_node(0, self.options.tmpdir, ["-debug"]))
+
+    def run_test(self):
+
+        # Connect to node0
+        node0 = BaseNode()
+        connections = []
+        connections.append(NodeConn('127.0.0.1', p2p_port(0), self.nodes[0], node0))
+        node0.add_connection(connections[0])
+
+        NetworkThread().start() # Start up network handling in another thread
+        node0.wait_for_verack()
+
+        # Build the blockchain
+        self.tip = int(self.nodes[0].getbestblockhash(), 16)
+        self.block_time = self.nodes[0].getblock(self.nodes[0].getbestblockhash())['time'] + 1
+
+        self.blocks = []
+
+        # Get a pubkey for the coinbase TXO
+        coinbase_key = CECKey()
+        coinbase_key.set_secretbytes(b"horsebattery")
+        coinbase_pubkey = coinbase_key.get_pubkey()
+
+        # Create the first block with a coinbase output to our key
+        height = 1
+        block = create_block(self.tip, create_coinbase(height, coinbase_pubkey), self.block_time)
+        self.blocks.append(block)
+        self.block_time += 1
+        block.solve()
+        # Save the coinbase for later
+        self.block1 = block
+        self.tip = block.sha256
+        height += 1
+
+        # Bury the block 100 deep so the coinbase output is spendable
+        for i in range(100):
+            block = create_block(self.tip, create_coinbase(height), self.block_time)
+            block.solve()
+            self.blocks.append(block)
+            self.tip = block.sha256
+            self.block_time += 1
+            height += 1
+
+        # Create a transaction spending the coinbase output with an invalid (null) signature
+        tx = CTransaction()
+        tx.vin.append(CTxIn(COutPoint(self.block1.vtx[0].sha256, 0), scriptSig=b""))
+        tx.vout.append(CTxOut(49*100000000, CScript([OP_TRUE])))
+        tx.calc_sha256()
+
+        block102 = create_block(self.tip, create_coinbase(height), self.block_time)
+        self.block_time += 1
+        block102.vtx.extend([tx])
+        block102.hashMerkleRoot = block102.calc_merkle_root()
+        block102.rehash()
+        block102.solve()
+        self.blocks.append(block102)
+        self.tip = block102.sha256
+        self.block_time += 1
+        height += 1
+
+        # Bury the assumed valid block 2100 deep
+        for i in range(2100):
+            block = create_block(self.tip, create_coinbase(height), self.block_time)
+            block.nVersion = 4
+            block.solve()
+            self.blocks.append(block)
+            self.tip = block.sha256
+            self.block_time += 1
+            height += 1
+
+        # Start node1 and node2 with assumevalid so they accept a block with a bad signature.
+        self.nodes.append(start_node(1, self.options.tmpdir,
+                                     ["-debug", "-assumevalid=" + hex(block102.sha256)]))
+        node1 = BaseNode()  # connects to node1
+        connections.append(NodeConn('127.0.0.1', p2p_port(1), self.nodes[1], node1))
+        node1.add_connection(connections[1])
+        node1.wait_for_verack()
+
+        self.nodes.append(start_node(2, self.options.tmpdir,
+                                     ["-debug", "-assumevalid=" + hex(block102.sha256)]))
+        node2 = BaseNode()  # connects to node2
+        connections.append(NodeConn('127.0.0.1', p2p_port(2), self.nodes[2], node2))
+        node2.add_connection(connections[2])
+        node2.wait_for_verack()
+
+        # send header lists to all three nodes
+        node0.send_header_for_blocks(self.blocks[0:2000])
+        node0.send_header_for_blocks(self.blocks[2000:])
+        node1.send_header_for_blocks(self.blocks[0:2000])
+        node1.send_header_for_blocks(self.blocks[2000:])
+        node2.send_header_for_blocks(self.blocks[0:200])
+
+        # Send 102 blocks to node0. Block 102 will be rejected.
+        for i in range(101):
+            node0.send_message(msg_block(self.blocks[i]))
+        node0.sync_with_ping() # make sure the most recent block is synced
+        node0.send_message(msg_block(self.blocks[101]))
+        assert_equal(self.nodes[0].getblock(self.nodes[0].getbestblockhash())['height'], 101)
+
+        # Send 3102 blocks to node1. All blocks will be accepted.
+        for i in range(2202):
+            node1.send_message(msg_block(self.blocks[i]))
+        node1.sync_with_ping() # make sure the most recent block is synced
+        assert_equal(self.nodes[1].getblock(self.nodes[1].getbestblockhash())['height'], 2202)
+
+        # Send 102 blocks to node2. Block 102 will be rejected.
+        for i in range(101):
+            node2.send_message(msg_block(self.blocks[i]))
+        node2.sync_with_ping() # make sure the most recent block is synced
+        node2.send_message(msg_block(self.blocks[101]))
+        assert_equal(self.nodes[2].getblock(self.nodes[2].getbestblockhash())['height'], 101)
+
+if __name__ == '__main__':
+    SendHeadersTest().main()

From f13914a0e9cf533d77dc870719842aa426a7926c Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Sat, 14 Jan 2017 16:00:00 -0800
Subject: [PATCH 1592/1802] Make WakeMessageHandler public

---
 src/net.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/net.h b/src/net.h
index 2baf82702c4d7..a9da38146bba5 100644
--- a/src/net.h
+++ b/src/net.h
@@ -328,6 +328,8 @@ class CConnman
     CSipHasher GetDeterministicRandomizer(uint64_t id);
 
     unsigned int GetReceiveFloodSize() const;
+
+    void WakeMessageHandler();
 private:
     struct ListenSocket {
         SOCKET socket;
@@ -344,8 +346,6 @@ class CConnman
     void ThreadSocketHandler();
     void ThreadDNSAddressSeed();
 
-    void WakeMessageHandler();
-
     uint64_t CalculateKeyedNetGroup(const CAddress& ad);
 
     CNode* FindNode(const CNetAddr& ip);

From 241d8938f4b5de1d2564ec7e064d8b0b8efd84a4 Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Sat, 14 Jan 2017 15:50:28 -0800
Subject: [PATCH 1593/1802] Wake message handling thread when we receive a new
 block

This forces the message handling thread to make another full
iteration of SendMessages prior to going back to sleep, ensuring
we announce the new block to all peers before sleeping.
---
 src/net_processing.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/net_processing.cpp b/src/net_processing.cpp
index 59c1d1bf8fa82..c19bf81577788 100644
--- a/src/net_processing.cpp
+++ b/src/net_processing.cpp
@@ -822,6 +822,7 @@ void PeerLogicValidation::UpdatedBlockTip(const CBlockIndex *pindexNew, const CB
                 }
             }
         });
+        connman->WakeMessageHandler();
     }
 
     nTimeBestReceived = GetTime();

From 7094bf7970b3403472a013aac511971ceb8855f7 Mon Sep 17 00:00:00 2001
From: Gregory Maxwell <greg@xiph.org>
Date: Sat, 14 Jan 2017 01:21:41 +0000
Subject: [PATCH 1594/1802] Trim down the XP notice and say more about what we
 support.

The big notice at the top of the release note is not interesting
 to most users now and apparently comes across poorly to some.

Better to provide more information about what we do support.
---
 doc/release-notes.md | 28 ++++++++++------------------
 1 file changed, 10 insertions(+), 18 deletions(-)

diff --git a/doc/release-notes.md b/doc/release-notes.md
index 7d0d689684575..ad9eea0f6b4c7 100644
--- a/doc/release-notes.md
+++ b/doc/release-notes.md
@@ -19,24 +19,16 @@ To receive security and update notifications, please subscribe to:
 Compatibility
 ==============
 
-Microsoft ended support for Windows XP on [April 8th, 2014](https://www.microsoft.com/en-us/WindowsForBusiness/end-of-xp-support),
-an OS initially released in 2001. This means that not even critical security
-updates will be released anymore. Without security updates, using a bitcoin
-wallet on a XP machine is irresponsible at least.
-
-In addition to that, with 0.12.x there have been varied reports of Bitcoin Core
-randomly crashing on Windows XP. It is [not clear](https://github.com/bitcoin/bitcoin/issues/7681#issuecomment-217439891)
-what the source of these crashes is, but it is likely that upstream
-libraries such as Qt are no longer being tested on XP.
-
-We do not have time nor resources to provide support for an OS that is
-end-of-life. From 0.13.0 on, Windows XP is no longer supported. Users are
-suggested to upgrade to a newer version of Windows, or install an alternative OS
-that is supported.
-
-No attempt is made to prevent installing or running the software on Windows XP,
-you can still do so at your own risk, but do not expect it to work: do not
-report issues about Windows XP to the issue tracker.
+Bitcoin Core is extensively tested on multiple operating systems using
+the Linux kernel, macOS 10.8+, and Windows Vista and later.
+
+Microsoft ended support for Windows XP on [April 8th, 2014](https://www.microsoft.com/en-us/WindowsForBusiness/end-of-xp-support).
+No attempt is made to prevent installing or running the software on Windows XP, you
+can still do so at your own risk but be aware that there are known instabilities.
+Please do not report issues about Windows XP to the issue tracker.
+
+Bitcoin Core should also work on most other Unix-like systems but is not
+frequently tested on them.
 
 Notable changes
 ===============

From 7b1add3c28aae8caf2e1517f15cd953eacbb4931 Mon Sep 17 00:00:00 2001
From: Alex Morcos <morcos@chaincode.com>
Date: Tue, 13 Dec 2016 13:43:35 -0500
Subject: [PATCH 1595/1802] Introduce -incrementalrelayfee

---
 src/init.cpp          | 17 ++++++++++++++++-
 src/policy/policy.cpp |  1 +
 src/policy/policy.h   |  3 +++
 src/txmempool.cpp     |  7 +++----
 src/txmempool.h       |  7 +------
 5 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/src/init.cpp b/src/init.cpp
index b0c045da15244..f3a3a1d276a89 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -465,8 +465,10 @@ std::string HelpMessage(HelpMessageMode mode)
     AppendParamsHelpMessages(strUsage, showDebug);
 
     strUsage += HelpMessageGroup(_("Node relay options:"));
-    if (showDebug)
+    if (showDebug) {
         strUsage += HelpMessageOpt("-acceptnonstdtxn", strprintf("Relay and mine \"non-standard\" transactions (%sdefault: %u)", "testnet/regtest only; ", !Params(CBaseChainParams::TESTNET).RequireStandard()));
+        strUsage += HelpMessageOpt("-incrementalrelayfee=<amt>", strprintf("Fee rate (in %s/kB) used to define cost of relay, used for mempool limiting and BIP 125 replacement. (default: %s)", CURRENCY_UNIT, FormatMoney(DEFAULT_INCREMENTAL_RELAY_FEE)));
+    }
     strUsage += HelpMessageOpt("-bytespersigop", strprintf(_("Equivalent bytes per sigop in transactions for relay and mining (default: %u)"), DEFAULT_BYTES_PER_SIGOP));
     strUsage += HelpMessageOpt("-datacarrier", strprintf(_("Relay and mine data carrier transactions (default: %u)"), DEFAULT_ACCEPT_DATACARRIER));
     strUsage += HelpMessageOpt("-datacarriersize", strprintf(_("Maximum size of data in data carrier transactions we relay and mine (default: %u)"), MAX_OP_RETURN_RELAY));
@@ -923,6 +925,15 @@ bool AppInitParameterInteraction()
     int64_t nMempoolSizeMin = GetArg("-limitdescendantsize", DEFAULT_DESCENDANT_SIZE_LIMIT) * 1000 * 40;
     if (nMempoolSizeMax < 0 || nMempoolSizeMax < nMempoolSizeMin)
         return InitError(strprintf(_("-maxmempool must be at least %d MB"), std::ceil(nMempoolSizeMin / 1000000.0)));
+    // incremental relay fee sets the minimimum feerate increase necessary for BIP 125 replacement in the mempool
+    // and the amount the mempool min fee increases above the feerate of txs evicted due to mempool limiting.
+    if (IsArgSet("-incrementalrelayfee"))
+    {
+        CAmount n = 0;
+        if (!ParseMoney(GetArg("-incrementalrelayfee", ""), n))
+            return InitError(AmountErrMsg("incrementalrelayfee", GetArg("-incrementalrelayfee", "")));
+        incrementalRelayFee = CFeeRate(n);
+    }
 
     // -par=0 means autodetect, but nScriptCheckThreads==0 means no concurrency
     nScriptCheckThreads = GetArg("-par", DEFAULT_SCRIPTCHECK_THREADS);
@@ -969,6 +980,10 @@ bool AppInitParameterInteraction()
             return InitError(AmountErrMsg("minrelaytxfee", GetArg("-minrelaytxfee", "")));
         // High fee check is done afterward in CWallet::ParameterInteraction()
         ::minRelayTxFee = CFeeRate(n);
+    } else if (incrementalRelayFee > ::minRelayTxFee) {
+        // Allow only setting incrementalRelayFee to control both
+        ::minRelayTxFee = incrementalRelayFee;
+        LogPrintf("Increasing minrelaytxfee to %s to match incrementalrelayfee\n",::minRelayTxFee.ToString());
     }
 
     // Sanity check argument for min fee for including tx in block
diff --git a/src/policy/policy.cpp b/src/policy/policy.cpp
index d318a0997c0dc..4dacd6b545d56 100644
--- a/src/policy/policy.cpp
+++ b/src/policy/policy.cpp
@@ -206,6 +206,7 @@ bool IsWitnessStandard(const CTransaction& tx, const CCoinsViewCache& mapInputs)
     return true;
 }
 
+CFeeRate incrementalRelayFee = CFeeRate(DEFAULT_INCREMENTAL_RELAY_FEE);
 unsigned int nBytesPerSigOp = DEFAULT_BYTES_PER_SIGOP;
 
 int64_t GetVirtualTransactionSize(int64_t nWeight, int64_t nSigOpCost)
diff --git a/src/policy/policy.h b/src/policy/policy.h
index 5c6a7b1865bb8..039122a59e762 100644
--- a/src/policy/policy.h
+++ b/src/policy/policy.h
@@ -30,6 +30,8 @@ static const unsigned int MAX_P2SH_SIGOPS = 15;
 static const unsigned int MAX_STANDARD_TX_SIGOPS_COST = MAX_BLOCK_SIGOPS_COST/5;
 /** Default for -maxmempool, maximum megabytes of mempool memory usage */
 static const unsigned int DEFAULT_MAX_MEMPOOL_SIZE = 300;
+/** Default for -incrementalrelayfee, which sets the minimum feerate increase for mempool limiting or BIP 125 replacement **/
+static const unsigned int DEFAULT_INCREMENTAL_RELAY_FEE = 1000;
 /** Default for -bytespersigop */
 static const unsigned int DEFAULT_BYTES_PER_SIGOP = 20;
 /** The maximum number of witness stack items in a standard P2WSH script */
@@ -85,6 +87,7 @@ bool AreInputsStandard(const CTransaction& tx, const CCoinsViewCache& mapInputs)
      */
 bool IsWitnessStandard(const CTransaction& tx, const CCoinsViewCache& mapInputs);
 
+extern CFeeRate incrementalRelayFee;
 extern unsigned int nBytesPerSigOp;
 
 /** Compute the virtual transaction size (weight reinterpreted as bytes). */
diff --git a/src/txmempool.cpp b/src/txmempool.cpp
index 4ccbcadefc345..c6eaf661da2b9 100644
--- a/src/txmempool.cpp
+++ b/src/txmempool.cpp
@@ -359,7 +359,6 @@ CTxMemPool::CTxMemPool(const CFeeRate& _minReasonableRelayFee) :
     nCheckFrequency = 0;
 
     minerPolicyEstimator = new CBlockPolicyEstimator(_minReasonableRelayFee);
-    minReasonableRelayFee = _minReasonableRelayFee;
 }
 
 CTxMemPool::~CTxMemPool()
@@ -1077,12 +1076,12 @@ CFeeRate CTxMemPool::GetMinFee(size_t sizelimit) const {
         rollingMinimumFeeRate = rollingMinimumFeeRate / pow(2.0, (time - lastRollingFeeUpdate) / halflife);
         lastRollingFeeUpdate = time;
 
-        if (rollingMinimumFeeRate < (double)minReasonableRelayFee.GetFeePerK() / 2) {
+        if (rollingMinimumFeeRate < (double)incrementalRelayFee.GetFeePerK() / 2) {
             rollingMinimumFeeRate = 0;
             return CFeeRate(0);
         }
     }
-    return std::max(CFeeRate(rollingMinimumFeeRate), minReasonableRelayFee);
+    return std::max(CFeeRate(rollingMinimumFeeRate), incrementalRelayFee);
 }
 
 void CTxMemPool::trackPackageRemoved(const CFeeRate& rate) {
@@ -1106,7 +1105,7 @@ void CTxMemPool::TrimToSize(size_t sizelimit, std::vector<uint256>* pvNoSpendsRe
         // to have 0 fee). This way, we don't allow txn to enter mempool with feerate
         // equal to txn which were removed with no block in between.
         CFeeRate removed(it->GetModFeesWithDescendants(), it->GetSizeWithDescendants());
-        removed += minReasonableRelayFee;
+        removed += incrementalRelayFee;
         trackPackageRemoved(removed);
         maxFeeRateRemoved = std::max(maxFeeRateRemoved, removed);
 
diff --git a/src/txmempool.h b/src/txmempool.h
index 7c68053f26f2a..359babee55b39 100644
--- a/src/txmempool.h
+++ b/src/txmempool.h
@@ -425,8 +425,6 @@ class CTxMemPool
     uint64_t totalTxSize;      //!< sum of all mempool tx' byte sizes
     uint64_t cachedInnerUsage; //!< sum of dynamic memory usage of all the map elements (NOT the maps themselves)
 
-    CFeeRate minReasonableRelayFee;
-
     mutable int64_t lastRollingFeeUpdate;
     mutable bool blockSinceLastRollingFeeBump;
     mutable double rollingMinimumFeeRate; //!< minimum fee to get into the pool, decreases exponentially
@@ -505,9 +503,6 @@ class CTxMemPool
     std::map<uint256, std::pair<double, CAmount> > mapDeltas;
 
     /** Create a new CTxMemPool.
-     *  minReasonableRelayFee should be a feerate which is, roughly, somewhere
-     *  around what it "costs" to relay a transaction around the network and
-     *  below which we would reasonably say a transaction has 0-effective-fee.
      */
     CTxMemPool(const CFeeRate& _minReasonableRelayFee);
     ~CTxMemPool();
@@ -591,7 +586,7 @@ class CTxMemPool
 
     /** The minimum fee to get into the mempool, which may itself not be enough
       *  for larger-sized transactions.
-      *  The minReasonableRelayFee constructor arg is used to bound the time it
+      *  The incrementalRelayFee policy variable is used to bound the time it
       *  takes the fee rate to go back down all the way to 0. When the feerate
       *  would otherwise be half of this, it is set to 0 instead.
       */

From eb30d1a5b215c6dd3763d7f7948f2dd8cb61f6bf Mon Sep 17 00:00:00 2001
From: Alex Morcos <morcos@chaincode.com>
Date: Tue, 13 Dec 2016 16:19:17 -0500
Subject: [PATCH 1596/1802] Introduce -dustrelayfee

---
 src/init.cpp                   | 11 +++++++++++
 src/policy/policy.cpp          |  3 ++-
 src/policy/policy.h            |  7 +++++++
 src/qt/coincontroldialog.cpp   |  9 +++++----
 src/qt/guiutil.cpp             |  4 ++--
 src/qt/paymentserver.cpp       |  4 ++--
 src/test/transaction_tests.cpp |  6 +++---
 src/wallet/wallet.cpp          | 10 +++++-----
 8 files changed, 37 insertions(+), 17 deletions(-)

diff --git a/src/init.cpp b/src/init.cpp
index f3a3a1d276a89..20c204a5c5b8e 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -468,6 +468,7 @@ std::string HelpMessage(HelpMessageMode mode)
     if (showDebug) {
         strUsage += HelpMessageOpt("-acceptnonstdtxn", strprintf("Relay and mine \"non-standard\" transactions (%sdefault: %u)", "testnet/regtest only; ", !Params(CBaseChainParams::TESTNET).RequireStandard()));
         strUsage += HelpMessageOpt("-incrementalrelayfee=<amt>", strprintf("Fee rate (in %s/kB) used to define cost of relay, used for mempool limiting and BIP 125 replacement. (default: %s)", CURRENCY_UNIT, FormatMoney(DEFAULT_INCREMENTAL_RELAY_FEE)));
+        strUsage += HelpMessageOpt("-dustrelayfee=<amt>", strprintf("Fee rate (in %s/kB) used to defined dust, the value of an output such that it will cost about 1/3 of its value in fees at this fee rate to spend it. (default: %s)", CURRENCY_UNIT, FormatMoney(DUST_RELAY_TX_FEE)));
     }
     strUsage += HelpMessageOpt("-bytespersigop", strprintf(_("Equivalent bytes per sigop in transactions for relay and mining (default: %u)"), DEFAULT_BYTES_PER_SIGOP));
     strUsage += HelpMessageOpt("-datacarrier", strprintf(_("Relay and mine data carrier transactions (default: %u)"), DEFAULT_ACCEPT_DATACARRIER));
@@ -995,6 +996,16 @@ bool AppInitParameterInteraction()
             return InitError(AmountErrMsg("blockmintxfee", GetArg("-blockmintxfee", "")));
     }
 
+    // Feerate used to define dust.  Shouldn't be changed lightly as old
+    // implementations may inadvertently create non-standard transactions
+    if (IsArgSet("-dustrelayfee"))
+    {
+        CAmount n = 0;
+        if (!ParseMoney(GetArg("-dustrelayfee", ""), n) || 0 == n)
+            return InitError(AmountErrMsg("dustrelayfee", GetArg("-dustrelayfee", "")));
+        dustRelayFee = CFeeRate(n);
+    }
+
     fRequireStandard = !GetBoolArg("-acceptnonstdtxn", !chainparams.RequireStandard());
     if (chainparams.RequireStandard() && !fRequireStandard)
         return InitError(strprintf("acceptnonstdtxn is not currently supported for %s chain", chainparams.NetworkIDString()));
diff --git a/src/policy/policy.cpp b/src/policy/policy.cpp
index 4dacd6b545d56..ec398f6627f19 100644
--- a/src/policy/policy.cpp
+++ b/src/policy/policy.cpp
@@ -105,7 +105,7 @@ bool IsStandardTx(const CTransaction& tx, std::string& reason, const bool witnes
         else if ((whichType == TX_MULTISIG) && (!fIsBareMultisigStd)) {
             reason = "bare-multisig";
             return false;
-        } else if (txout.IsDust(::minRelayTxFee)) {
+        } else if (txout.IsDust(dustRelayFee)) {
             reason = "dust";
             return false;
         }
@@ -207,6 +207,7 @@ bool IsWitnessStandard(const CTransaction& tx, const CCoinsViewCache& mapInputs)
 }
 
 CFeeRate incrementalRelayFee = CFeeRate(DEFAULT_INCREMENTAL_RELAY_FEE);
+CFeeRate dustRelayFee = CFeeRate(DUST_RELAY_TX_FEE);
 unsigned int nBytesPerSigOp = DEFAULT_BYTES_PER_SIGOP;
 
 int64_t GetVirtualTransactionSize(int64_t nWeight, int64_t nSigOpCost)
diff --git a/src/policy/policy.h b/src/policy/policy.h
index 039122a59e762..9b1323ac26f38 100644
--- a/src/policy/policy.h
+++ b/src/policy/policy.h
@@ -40,6 +40,12 @@ static const unsigned int MAX_STANDARD_P2WSH_STACK_ITEMS = 100;
 static const unsigned int MAX_STANDARD_P2WSH_STACK_ITEM_SIZE = 80;
 /** The maximum size of a standard witnessScript */
 static const unsigned int MAX_STANDARD_P2WSH_SCRIPT_SIZE = 3600;
+/** Min feerate for defining dust. Historically this has been the same as the
+ * minRelayTxFee, however changing the dust limit changes which transactions are
+ * standard and should be done with care and ideally rarely. It makes sense to
+ * only increase the dust limit after prior releases were already not creating
+ * outputs below the new threshold */
+static const unsigned int DUST_RELAY_TX_FEE = 1000;
 /**
  * Standard script verification flags that standard transactions will comply
  * with. However scripts violating these flags may still be present in valid
@@ -88,6 +94,7 @@ bool AreInputsStandard(const CTransaction& tx, const CCoinsViewCache& mapInputs)
 bool IsWitnessStandard(const CTransaction& tx, const CCoinsViewCache& mapInputs);
 
 extern CFeeRate incrementalRelayFee;
+extern CFeeRate dustRelayFee;
 extern unsigned int nBytesPerSigOp;
 
 /** Compute the virtual transaction size (weight reinterpreted as bytes). */
diff --git a/src/qt/coincontroldialog.cpp b/src/qt/coincontroldialog.cpp
index a0c2813477850..f8aba70d92fcc 100644
--- a/src/qt/coincontroldialog.cpp
+++ b/src/qt/coincontroldialog.cpp
@@ -15,7 +15,8 @@
 
 #include "wallet/coincontrol.h"
 #include "init.h"
-#include "validation.h" // For minRelayTxFee
+#include "policy/policy.h"
+#include "validation.h" // For mempool
 #include "wallet/wallet.h"
 
 #include <boost/assign/list_of.hpp> // for 'map_list_of()'
@@ -432,7 +433,7 @@ void CoinControlDialog::updateLabels(WalletModel *model, QDialog* dialog)
         {
             CTxOut txout(amount, (CScript)std::vector<unsigned char>(24, 0));
             txDummy.vout.push_back(txout);
-            if (txout.IsDust(::minRelayTxFee))
+            if (txout.IsDust(dustRelayFee))
                fDust = true;
         }
     }
@@ -545,10 +546,10 @@ void CoinControlDialog::updateLabels(WalletModel *model, QDialog* dialog)
             if (nChange > 0 && nChange < MIN_CHANGE)
             {
                 CTxOut txout(nChange, (CScript)std::vector<unsigned char>(24, 0));
-                if (txout.IsDust(::minRelayTxFee))
+                if (txout.IsDust(dustRelayFee))
                 {
                     if (CoinControlDialog::fSubtractFeeFromAmount) // dust-change will be raised until no dust
-                        nChange = txout.GetDustThreshold(::minRelayTxFee);
+                        nChange = txout.GetDustThreshold(dustRelayFee);
                     else
                     {
                         nPayFee += nChange;
diff --git a/src/qt/guiutil.cpp b/src/qt/guiutil.cpp
index 4463cfdaefb0c..de6e09b8b0758 100644
--- a/src/qt/guiutil.cpp
+++ b/src/qt/guiutil.cpp
@@ -11,7 +11,7 @@
 
 #include "primitives/transaction.h"
 #include "init.h"
-#include "validation.h" // For minRelayTxFee
+#include "policy/policy.h"
 #include "protocol.h"
 #include "script/script.h"
 #include "script/standard.h"
@@ -257,7 +257,7 @@ bool isDust(const QString& address, const CAmount& amount)
     CTxDestination dest = CBitcoinAddress(address.toStdString()).Get();
     CScript script = GetScriptForDestination(dest);
     CTxOut txOut(amount, script);
-    return txOut.IsDust(::minRelayTxFee);
+    return txOut.IsDust(dustRelayFee);
 }
 
 QString HtmlEscape(const QString& str, bool fMultiLine)
diff --git a/src/qt/paymentserver.cpp b/src/qt/paymentserver.cpp
index 6b2871424d71d..688e8123af8ae 100644
--- a/src/qt/paymentserver.cpp
+++ b/src/qt/paymentserver.cpp
@@ -10,7 +10,7 @@
 
 #include "base58.h"
 #include "chainparams.h"
-#include "validation.h" // For minRelayTxFee
+#include "policy/policy.h"
 #include "ui_interface.h"
 #include "util.h"
 #include "wallet/wallet.h"
@@ -582,7 +582,7 @@ bool PaymentServer::processPaymentRequest(const PaymentRequestPlus& request, Sen
 
         // Extract and check amounts
         CTxOut txOut(sendingTo.second, sendingTo.first);
-        if (txOut.IsDust(::minRelayTxFee)) {
+        if (txOut.IsDust(dustRelayFee)) {
             Q_EMIT message(tr("Payment request error"), tr("Requested payment amount of %1 is too small (considered dust).")
                 .arg(BitcoinUnits::formatWithUnit(optionsModel->getDisplayUnit(), sendingTo.second)),
                 CClientUIInterface::MSG_ERROR);
diff --git a/src/test/transaction_tests.cpp b/src/test/transaction_tests.cpp
index cd9294c7a9c76..53a2de1ce0cd6 100644
--- a/src/test/transaction_tests.cpp
+++ b/src/test/transaction_tests.cpp
@@ -692,7 +692,7 @@ BOOST_AUTO_TEST_CASE(test_IsStandard)
     BOOST_CHECK(IsStandardTx(t, reason));
 
     // Check dust with default relay fee:
-    CAmount nDustThreshold = 182 * minRelayTxFee.GetFeePerK()/1000 * 3;
+    CAmount nDustThreshold = 182 * dustRelayFee.GetFeePerK()/1000 * 3;
     BOOST_CHECK_EQUAL(nDustThreshold, 546);
     // dust:
     t.vout[0].nValue = nDustThreshold - 1;
@@ -703,14 +703,14 @@ BOOST_AUTO_TEST_CASE(test_IsStandard)
 
     // Check dust with odd relay fee to verify rounding:
     // nDustThreshold = 182 * 1234 / 1000 * 3
-    minRelayTxFee = CFeeRate(1234);
+    dustRelayFee = CFeeRate(1234);
     // dust:
     t.vout[0].nValue = 672 - 1;
     BOOST_CHECK(!IsStandardTx(t, reason));
     // not dust:
     t.vout[0].nValue = 672;
     BOOST_CHECK(IsStandardTx(t, reason));
-    minRelayTxFee = CFeeRate(DEFAULT_MIN_RELAY_TX_FEE);
+    dustRelayFee = CFeeRate(DUST_RELAY_TX_FEE);
 
     t.vout[0].scriptPubKey = CScript() << OP_1;
     BOOST_CHECK(!IsStandardTx(t, reason));
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index 96768325603b2..5f442fd21e0ff 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -2335,7 +2335,7 @@ bool CWallet::CreateTransaction(const vector<CRecipient>& vecSend, CWalletTx& wt
                         }
                     }
 
-                    if (txout.IsDust(::minRelayTxFee))
+                    if (txout.IsDust(dustRelayFee))
                     {
                         if (recipient.fSubtractFeeFromAmount && nFeeRet > 0)
                         {
@@ -2413,16 +2413,16 @@ bool CWallet::CreateTransaction(const vector<CRecipient>& vecSend, CWalletTx& wt
                     // 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 recipient.
-                    if (nSubtractFeeFromAmount > 0 && newTxOut.IsDust(::minRelayTxFee))
+                    if (nSubtractFeeFromAmount > 0 && newTxOut.IsDust(dustRelayFee))
                     {
-                        CAmount nDust = newTxOut.GetDustThreshold(::minRelayTxFee) - newTxOut.nValue;
+                        CAmount nDust = newTxOut.GetDustThreshold(dustRelayFee) - newTxOut.nValue;
                         newTxOut.nValue += nDust; // raise change until no more dust
                         for (unsigned int i = 0; i < vecSend.size(); i++) // subtract from first recipient
                         {
                             if (vecSend[i].fSubtractFeeFromAmount)
                             {
                                 txNew.vout[i].nValue -= nDust;
-                                if (txNew.vout[i].IsDust(::minRelayTxFee))
+                                if (txNew.vout[i].IsDust(dustRelayFee))
                                 {
                                     strFailReason = _("The transaction amount is too small to send after the fee has been deducted");
                                     return false;
@@ -2434,7 +2434,7 @@ bool CWallet::CreateTransaction(const vector<CRecipient>& vecSend, CWalletTx& wt
 
                     // Never create dust outputs; if we would, just
                     // add the dust to the fee.
-                    if (newTxOut.IsDust(::minRelayTxFee))
+                    if (newTxOut.IsDust(dustRelayFee))
                     {
                         nChangePosInOut = -1;
                         nFeeRet += nChange;

From b0819c7e9b428631b806d97ff19beb2e218df31f Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Mon, 16 Jan 2017 19:59:28 +0000
Subject: [PATCH 1597/1802] qt: periodic translations update

---
 src/qt/bitcoinstrings.cpp      |  15 +-
 src/qt/locale/bitcoin_cs.ts    |   4 -
 src/qt/locale/bitcoin_da.ts    |  16 +-
 src/qt/locale/bitcoin_de.ts    |   8 +-
 src/qt/locale/bitcoin_en.ts    |  41 +--
 src/qt/locale/bitcoin_en_GB.ts |   4 -
 src/qt/locale/bitcoin_es.ts    |  70 ++++-
 src/qt/locale/bitcoin_es_ES.ts |   4 -
 src/qt/locale/bitcoin_fr.ts    |   4 -
 src/qt/locale/bitcoin_it.ts    |   4 -
 src/qt/locale/bitcoin_ja.ts    |   4 -
 src/qt/locale/bitcoin_ko_KR.ts |   4 -
 src/qt/locale/bitcoin_nb.ts    |   4 -
 src/qt/locale/bitcoin_nl.ts    |   4 -
 src/qt/locale/bitcoin_pt_BR.ts |   8 +-
 src/qt/locale/bitcoin_pt_PT.ts | 530 +++++++++++++++++++++++++++++----
 src/qt/locale/bitcoin_ru.ts    |  78 ++++-
 src/qt/locale/bitcoin_sk.ts    |   4 -
 src/qt/locale/bitcoin_sv.ts    |   4 -
 src/qt/locale/bitcoin_tr.ts    |   4 -
 src/qt/locale/bitcoin_uk.ts    |   4 -
 src/qt/locale/bitcoin_zh_CN.ts |   4 -
 src/qt/locale/bitcoin_zh_TW.ts |   4 -
 23 files changed, 657 insertions(+), 169 deletions(-)

diff --git a/src/qt/bitcoinstrings.cpp b/src/qt/bitcoinstrings.cpp
index 348e7378ab449..64bc7dac038cb 100644
--- a/src/qt/bitcoinstrings.cpp
+++ b/src/qt/bitcoinstrings.cpp
@@ -132,14 +132,21 @@ QT_TRANSLATE_NOOP("bitcoin-core", ""
 "Randomize credentials for every proxy connection. This enables Tor stream "
 "isolation (default: %u)"),
 QT_TRANSLATE_NOOP("bitcoin-core", ""
-"Reduce storage requirements by pruning (deleting) old blocks. This mode is "
-"incompatible with -txindex and -rescan. Warning: Reverting this setting "
-"requires re-downloading the entire blockchain. (default: 0 = disable pruning "
-"blocks, >%u = target size in MiB to use for block files)"),
+"Reduce storage requirements by enabling pruning (deleting) of old blocks. "
+"This allows the pruneblockchain RPC to be called to delete specific blocks, "
+"and enables automatic pruning of old blocks if a target size in MiB is "
+"provided. This mode is incompatible with -txindex and -rescan. Warning: "
+"Reverting this setting requires re-downloading the entire blockchain. "
+"(default: 0 = disable pruning blocks, 1 = allow manual pruning via RPC, >%u "
+"= automatically prune block files to stay under the specified target size in "
+"MiB)"),
 QT_TRANSLATE_NOOP("bitcoin-core", ""
 "Rescans are not possible in pruned mode. You will need to use -reindex which "
 "will download the whole blockchain again."),
 QT_TRANSLATE_NOOP("bitcoin-core", ""
+"Set lowest fee rate (in %s/kB) for transactions to be included in block "
+"creation. (default: %s)"),
+QT_TRANSLATE_NOOP("bitcoin-core", ""
 "Set maximum size of high-priority/low-fee transactions in bytes (default: %d)"),
 QT_TRANSLATE_NOOP("bitcoin-core", ""
 "Set the number of script verification threads (%u to %d, 0 = auto, <0 = "
diff --git a/src/qt/locale/bitcoin_cs.ts b/src/qt/locale/bitcoin_cs.ts
index e0f4a18994c22..3b5d7947f6bea 100644
--- a/src/qt/locale/bitcoin_cs.ts
+++ b/src/qt/locale/bitcoin_cs.ts
@@ -3705,10 +3705,6 @@
         <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: %s)</source>
         <translation>Použít samostatnou SOCKS5 proxy ke spojení s protějšky přes skryté služby v Toru (výchozí: %s)</translation>
     </message>
-    <message>
-        <source>Username and hashed password for JSON-RPC connections. The field &lt;userpw&gt; comes in the format: &lt;USERNAME&gt;:&lt;SALT&gt;$&lt;HASH&gt;. A canonical python script is included in share/rpcuser. This option can be specified multiple times</source>
-        <translation>Uživatelské jméno a zahašované heslo pro JSON-RPC spojení. Pole &lt;userpw&gt; má formát: &lt;UŽIVATELSKÉ_JMÉNO&gt;:&lt;SŮL&gt;$&lt;HAŠ&gt;. Pomocný pythonní skript je přiložen v share/rpcuser. Tuto volbu lze použít i vícekrát</translation>
-    </message>
     <message>
         <source>Warning: Unknown block versions being mined! It's possible unknown rules are in effect</source>
         <translation>Upozornění: Síť těží neznámé verze bloků! Je možné, že jsou v platnosti neznámá pravidla</translation>
diff --git a/src/qt/locale/bitcoin_da.ts b/src/qt/locale/bitcoin_da.ts
index 9fc52efe57c53..0b49b5aefcd97 100644
--- a/src/qt/locale/bitcoin_da.ts
+++ b/src/qt/locale/bitcoin_da.ts
@@ -2204,6 +2204,14 @@
         <source>Warning: Unknown change address</source>
         <translation>Advarsel: Ukendt byttepengeadresse</translation>
     </message>
+    <message>
+        <source>Confirm custom change address</source>
+        <translation>Bekræft tilpasset byttepengeadresse</translation>
+    </message>
+    <message>
+        <source>The address you selected for change is not part of this wallet. Any or all funds in your wallet may be sent to this address. Are you sure?</source>
+        <translation>Den adresse, du har valgt til byttepenge, er ikke en del af denne tegnebog. Nogle af eller alle penge i din tegnebog kan blive sendt til denne adresse. Er du sikker?</translation>
+    </message>
     <message>
         <source>(no label)</source>
         <translation>(ingen mærkat)</translation>
@@ -3125,6 +3133,10 @@
         <source>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</source>
         <translation>Brug UPnP for at konfigurere den lyttende port (standard: 1 under lytning og ingen -proxy)</translation>
     </message>
+    <message>
+        <source>Username and hashed password for JSON-RPC connections. The field &lt;userpw&gt; comes in the format: &lt;USERNAME&gt;:&lt;SALT&gt;$&lt;HASH&gt;. A canonical python script is included in share/rpcuser. The client then connects normally using the rpcuser=&lt;USERNAME&gt;/rpcpassword=&lt;PASSWORD&gt; pair of arguments. This option can be specified multiple times</source>
+        <translation>Brugernavn og hashet adgangskode for JSON-RPC-forbindelser. Feltet &lt;userpw&gt; er i formatet: &lt;BRUGERNAVN&gt;:&lt;SALT&gt;$&lt;HASH&gt;. Et kanonisk Python-skript er inkluderet i share/rpcuser. Klienten forbinder så normalt ved hjælp af argumentparret rpcuser=&lt;BRUGERNAVN&gt;/rpcpassword=&lt;ADGANGSKODE&gt;. Dette tilvalg kan angives flere gange</translation>
+    </message>
     <message>
         <source>Wallet will not create transactions that violate mempool chain limits (default: %u)</source>
         <translation>Tegnebogen vil ikke oprette transaktioner, som overtræder begrænsningen for hukommelsespuljekæden (standard: %u)</translation>
@@ -3705,10 +3717,6 @@
         <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: %s)</source>
         <translation>Brug separat SOCS5-proxy for at nå knuder via skjulte Tor-tjenester (standard: %s)</translation>
     </message>
-    <message>
-        <source>Username and hashed password for JSON-RPC connections. The field &lt;userpw&gt; comes in the format: &lt;USERNAME&gt;:&lt;SALT&gt;$&lt;HASH&gt;. A canonical python script is included in share/rpcuser. This option can be specified multiple times</source>
-        <translation>Brugernavn og hashet adgangskode for JSON-RPC-forbindelser. Feltet &lt;userpw&gt; er i formatet: &lt;BRUGERNAVN&gt;:&lt;SALT&gt;$&lt;HASH&gt;. Et kanonisk Python-skript inkluderes i share/rpcuser. Dette tilvalg kan angives flere gange</translation>
-    </message>
     <message>
         <source>Warning: Unknown block versions being mined! It's possible unknown rules are in effect</source>
         <translation>Advarsel: Ukendte blokversioner bliver minet! Det er muligt, at ukendte regler er i brug</translation>
diff --git a/src/qt/locale/bitcoin_de.ts b/src/qt/locale/bitcoin_de.ts
index 25d3f45163edd..1dfd77cf61c57 100644
--- a/src/qt/locale/bitcoin_de.ts
+++ b/src/qt/locale/bitcoin_de.ts
@@ -2589,6 +2589,10 @@
         <source>Transaction total size</source>
         <translation>Gesamte Transaktionsgröße</translation>
     </message>
+    <message>
+        <source>Output index</source>
+        <translation>Ausgabeindex</translation>
+    </message>
     <message>
         <source>Merchant</source>
         <translation>Händler</translation>
@@ -3661,10 +3665,6 @@
         <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: %s)</source>
         <translation>Separaten SOCKS5-Proxy verwenden, um Gegenstellen über versteckte Tor-Dienste zu erreichen (Standard: %s)</translation>
     </message>
-    <message>
-        <source>Username and hashed password for JSON-RPC connections. The field &lt;userpw&gt; comes in the format: &lt;USERNAME&gt;:&lt;SALT&gt;$&lt;HASH&gt;. A canonical python script is included in share/rpcuser. This option can be specified multiple times</source>
-        <translation>Benutzername und gehashtes Passwort für JSON-RPC Verbindungen. Das Feld &lt;userpw&gt; kommt im Format: &lt;USERNAME&gt;:&lt;SALT&gt;$&lt;HASH&gt;. Ein entsprechendes Pythonskript ist in share/rpcuser inbegriffen. Diese Option kann mehrere Male spezifiziert werden</translation>
-    </message>
     <message>
         <source>Warning: Unknown block versions being mined! It's possible unknown rules are in effect</source>
         <translation>Warnung: Unbekannte Blockversion wird durch Mining erzeugt! Es ist möglich, dass unbekannte Regeln in Kraft sind.</translation>
diff --git a/src/qt/locale/bitcoin_en.ts b/src/qt/locale/bitcoin_en.ts
index 02a6888998f3c..60dcc9f701c5a 100644
--- a/src/qt/locale/bitcoin_en.ts
+++ b/src/qt/locale/bitcoin_en.ts
@@ -778,7 +778,7 @@
         <translation type="unfinished">Confirmed</translation>
     </message>
     <message>
-        <location filename="../coincontroldialog.cpp" line="+54"/>
+        <location filename="../coincontroldialog.cpp" line="+55"/>
         <source>Copy address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3862,7 +3862,7 @@
 <context>
     <name>bitcoin-core</name>
     <message>
-        <location filename="../bitcoinstrings.cpp" line="+304"/>
+        <location filename="../bitcoinstrings.cpp" line="+311"/>
         <source>Options:</source>
         <translation>Options:</translation>
     </message>
@@ -3887,7 +3887,7 @@
         <translation>Accept command line and JSON-RPC commands</translation>
     </message>
     <message>
-        <location line="-207"/>
+        <location line="-214"/>
         <source>Accept connections from outside (default: 1 if no -proxy or -connect/-noconnect)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3917,17 +3917,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
-        <source>Reduce storage requirements by pruning (deleting) old blocks. This mode is incompatible with -txindex and -rescan. Warning: Reverting this setting requires re-downloading the entire blockchain. (default: 0 = disable pruning blocks, &gt;%u = target size in MiB to use for block files)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
+        <location line="+18"/>
         <source>Rescans are not possible in pruned mode. You will need to use -reindex which will download the whole blockchain again.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+129"/>
+        <location line="+132"/>
         <source>Error: A fatal internal error occurred, see debug.log for details</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3952,7 +3947,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-346"/>
+        <location line="-353"/>
         <source>Bitcoin Core</source>
         <translation type="unfinished">Bitcoin Core</translation>
     </message>
@@ -4022,7 +4017,17 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+14"/>
+        <source>Reduce storage requirements by enabling pruning (deleting) of old blocks. This allows the pruneblockchain RPC to be called to delete specific blocks, and enables automatic pruning of old blocks if a target size in MiB is provided. This mode is incompatible with -txindex and -rescan. Warning: Reverting this setting requires re-downloading the entire blockchain. (default: 0 = disable pruning blocks, 1 = allow manual pruning via RPC, &gt;%u = automatically prune block files to stay under the specified target size in MiB)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>Set lowest fee rate (in %s/kB) for transactions to be included in block creation. (default: %s)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
         <source>Set the number of script verification threads (%u to %d, 0 = auto, &lt;0 = leave that many cores free, default: %d)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4397,7 +4402,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-344"/>
+        <location line="-351"/>
         <source>Allow JSON-RPC connections from specified source. Valid for &lt;ip&gt; are a single IP (e.g. 1.2.3.4), a network/netmask (e.g. 1.2.3.4/255.255.255.0) or a network/CIDR (e.g. 1.2.3.4/24). This option can be specified multiple times</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4457,7 +4462,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
+        <location line="+18"/>
         <source>Set maximum size of high-priority/low-fee transactions in bytes (default: %d)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4662,12 +4667,12 @@
         <translation>Password for JSON-RPC connections</translation>
     </message>
     <message>
-        <location line="-228"/>
+        <location line="-235"/>
         <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
         <translation>Execute command when the best block changes (%s in cmd is replaced by block hash)</translation>
     </message>
     <message>
-        <location line="+156"/>
+        <location line="+163"/>
         <source>Allow DNS lookups for -addnode, -seednode and -connect</source>
         <translation>Allow DNS lookups for -addnode, -seednode and -connect</translation>
     </message>
@@ -4677,7 +4682,7 @@
         <translation>Loading addresses...</translation>
     </message>
     <message>
-        <location line="-277"/>
+        <location line="-284"/>
         <source>(1 = keep tx meta data e.g. account owner and payment request information, 2 = drop tx meta data)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4732,7 +4737,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+26"/>
         <source>Sets the serialization of raw transaction or block hex returned in non-verbose mode, non-segwit(0) or segwit(1) (default: %d)</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/src/qt/locale/bitcoin_en_GB.ts b/src/qt/locale/bitcoin_en_GB.ts
index e2944030c74c2..1676f67979e26 100644
--- a/src/qt/locale/bitcoin_en_GB.ts
+++ b/src/qt/locale/bitcoin_en_GB.ts
@@ -2513,10 +2513,6 @@
         <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: %s)</source>
         <translation>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: %s)</translation>
     </message>
-    <message>
-        <source>Username and hashed password for JSON-RPC connections. The field &lt;userpw&gt; comes in the format: &lt;USERNAME&gt;:&lt;SALT&gt;$&lt;HASH&gt;. A canonical python script is included in share/rpcuser. This option can be specified multiple times</source>
-        <translation>Username and hashed password for JSON-RPC connections. The field &lt;userpw&gt; comes in the format: &lt;USERNAME&gt;:&lt;SALT&gt;$&lt;HASH&gt;. A canonical python script is included in share/rpcuser. This option can be specified multiple times</translation>
-    </message>
     <message>
         <source>Warning: Unknown block versions being mined! It's possible unknown rules are in effect</source>
         <translation>Warning: Unknown block versions being mined! It's possible unknown rules are in effect</translation>
diff --git a/src/qt/locale/bitcoin_es.ts b/src/qt/locale/bitcoin_es.ts
index 435ea110cfa27..5ba44a954c849 100644
--- a/src/qt/locale/bitcoin_es.ts
+++ b/src/qt/locale/bitcoin_es.ts
@@ -1360,7 +1360,15 @@
         <source>Node/Service</source>
         <translation>Nodo/Servicio</translation>
     </message>
-    </context>
+    <message>
+        <source>NodeId</source>
+        <translation>ID de nodo</translation>
+    </message>
+    <message>
+        <source>Ping</source>
+        <translation>Sonido</translation>
+    </message>
+</context>
 <context>
     <name>QObject</name>
     <message>
@@ -1399,14 +1407,54 @@
         <source>%1 ms</source>
         <translation>%1 ms</translation>
     </message>
+    <message numerus="yes">
+        <source>%n second(s)</source>
+        <translation><numerusform>%n segundo</numerusform><numerusform>%n segundos</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%n minute(s)</source>
+        <translation><numerusform>%n minuto</numerusform><numerusform>%n minutos</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%n hour(s)</source>
+        <translation><numerusform>%n hora</numerusform><numerusform>%n horas</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%n day(s)</source>
+        <translation><numerusform>%n dia</numerusform><numerusform>%n dias</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%n week(s)</source>
+        <translation><numerusform>%n semana</numerusform><numerusform>%n semanas</numerusform></translation>
+    </message>
     <message>
         <source>%1 and %2</source>
         <translation>%1 y %2</translation>
     </message>
-    </context>
+    <message numerus="yes">
+        <source>%n year(s)</source>
+        <translation><numerusform>%n año</numerusform><numerusform>%n años</numerusform></translation>
+    </message>
+    <message>
+        <source>%1 didn't yet exit safely...</source>
+        <translation>%1 no se ha cerrado de forma segura todavía...</translation>
+    </message>
+</context>
 <context>
     <name>QObject::QObject</name>
-    </context>
+    <message>
+        <source>Error: Specified data directory "%1" does not exist.</source>
+        <translation>Error: El directorio de datos «%1» especificado no existe.</translation>
+    </message>
+    <message>
+        <source>Error: Cannot parse configuration file: %1. Only use key=value syntax.</source>
+        <translation>Error: No se puede analizar el archivo de configuración: %1. Utilice únicamente la sintaxis clave=valor.</translation>
+    </message>
+    <message>
+        <source>Error: %1</source>
+        <translation>Error: %1</translation>
+    </message>
+</context>
 <context>
     <name>QRImageWidget</name>
     <message>
@@ -1584,6 +1632,10 @@
         <source>Ping Wait</source>
         <translation>Espera de Ping</translation>
     </message>
+    <message>
+        <source>Min Ping</source>
+        <translation>Sonido Mínimo</translation>
+    </message>
     <message>
         <source>Time Offset</source>
         <translation>Desplazamiento de tiempo</translation>
@@ -1644,6 +1696,14 @@
         <source>1 &amp;year</source>
         <translation>1 &amp;año</translation>
     </message>
+    <message>
+        <source>&amp;Disconnect</source>
+        <translation>&amp;Desconectar</translation>
+    </message>
+    <message>
+        <source>Ban for</source>
+        <translation>Prohibir para</translation>
+    </message>
     <message>
         <source>Welcome to the %1 RPC console.</source>
         <translation>Bienvenido a la consola RPC %1.</translation>
@@ -3546,10 +3606,6 @@
         <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: %s)</source>
         <translation>Usar distintos proxys SOCKS5 para comunicarse vía Tor de forma anónima (Por defecto: %s)</translation>
     </message>
-    <message>
-        <source>Username and hashed password for JSON-RPC connections. The field &lt;userpw&gt; comes in the format: &lt;USERNAME&gt;:&lt;SALT&gt;$&lt;HASH&gt;. A canonical python script is included in share/rpcuser. This option can be specified multiple times</source>
-        <translation>Nombre de usuario y hash de la contraseña para las conexiones JSON-RPC. El campo &lt;userpw&gt; tiene el formato: &lt;USERNAME&gt;:&lt;SALT&gt;$&lt;HASH&gt;. Se incluye un script python convencional en share/rpcuser. Esta opción puede ser especificada multiples veces</translation>
-    </message>
     <message>
         <source>Warning: Unknown block versions being mined! It's possible unknown rules are in effect</source>
         <translation>Advertencia: Se están minando versiones de bloques desconocidas! Es posible que normas desconocidas estén activas</translation>
diff --git a/src/qt/locale/bitcoin_es_ES.ts b/src/qt/locale/bitcoin_es_ES.ts
index 5ac57a5c25fe9..c971d664d8bbe 100644
--- a/src/qt/locale/bitcoin_es_ES.ts
+++ b/src/qt/locale/bitcoin_es_ES.ts
@@ -3482,10 +3482,6 @@
         <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: %s)</source>
         <translation>Usar distintos proxys SOCKS5 para comunicarse vía Tor de forma anónima (Por defecto: %s)</translation>
     </message>
-    <message>
-        <source>Username and hashed password for JSON-RPC connections. The field &lt;userpw&gt; comes in the format: &lt;USERNAME&gt;:&lt;SALT&gt;$&lt;HASH&gt;. A canonical python script is included in share/rpcuser. This option can be specified multiple times</source>
-        <translation>Nombre de usuario y hash de la contraseña para las conexiones JSON-RPC. El campo &lt;userpw&gt; tiene el formato: &lt;USERNAME&gt;:&lt;SALT&gt;$&lt;HASH&gt;. Se incluye un script python convencional en share/rpcuser. Esta opción puede ser especificada multiples veces</translation>
-    </message>
     <message>
         <source>Warning: Unknown block versions being mined! It's possible unknown rules are in effect</source>
         <translation>Advertencia: Se están minando versiones de bloques desconocidas! Es posible que normas desconocidas estén activas</translation>
diff --git a/src/qt/locale/bitcoin_fr.ts b/src/qt/locale/bitcoin_fr.ts
index bdcfed9584c15..eef88b43a35a7 100644
--- a/src/qt/locale/bitcoin_fr.ts
+++ b/src/qt/locale/bitcoin_fr.ts
@@ -3705,10 +3705,6 @@
         <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: %s)</source>
         <translation>Utiliser un serveur mandataire SOCKS5 séparé pour atteindre les pairs par les services cachés de Tor (par défaut : %s)</translation>
     </message>
-    <message>
-        <source>Username and hashed password for JSON-RPC connections. The field &lt;userpw&gt; comes in the format: &lt;USERNAME&gt;:&lt;SALT&gt;$&lt;HASH&gt;. A canonical python script is included in share/rpcuser. This option can be specified multiple times</source>
-        <translation>Nom d'utilisateur et mot de passe haché pour les connexions JSON-RPC. Le champ &lt;userpw&gt; vient au format : &lt;USERNAME&gt;:&lt;SALT&gt;$&lt;HASH&gt;. Un script python canonique est inclus dans share/rpcuser. Cette option peut être spécifiée plusieurs fois.</translation>
-    </message>
     <message>
         <source>Warning: Unknown block versions being mined! It's possible unknown rules are in effect</source>
         <translation>Avertissement : des versions de blocs inconnues sont minées ! Il est possible que des règles inconnues soient en vigeur</translation>
diff --git a/src/qt/locale/bitcoin_it.ts b/src/qt/locale/bitcoin_it.ts
index 265120b19fdb2..76cfdfafa53c8 100644
--- a/src/qt/locale/bitcoin_it.ts
+++ b/src/qt/locale/bitcoin_it.ts
@@ -2582,10 +2582,6 @@ Per specificare più URL separarli con una barra verticale "|".</translation>
         <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: %s)</source>
         <translation>Usa un proxy SOCKS5 a parte per raggiungere i peer attraverso gli hidden services di Tor (predefinito: %s)</translation>
     </message>
-    <message>
-        <source>Username and hashed password for JSON-RPC connections. The field &lt;userpw&gt; comes in the format: &lt;USERNAME&gt;:&lt;SALT&gt;$&lt;HASH&gt;. A canonical python script is included in share/rpcuser. This option can be specified multiple times</source>
-        <translation>Username e hash password per connessioni JSON-RPC. Il campo &lt;userpw&gt; utilizza il formato: &lt;USERNAME&gt;:&lt;SALT&gt;$&lt;HASH&gt;. Uno script python standard è incluso in share/rpcuser. Questa opzione può essere specificata più volte</translation>
-    </message>
     <message>
         <source>Warning: Unknown block versions being mined! It's possible unknown rules are in effect</source>
         <translation>Attenzione: si stanno minando versioni sconocsiute di blocchi! E' possibile che siano attive regole sconosciute</translation>
diff --git a/src/qt/locale/bitcoin_ja.ts b/src/qt/locale/bitcoin_ja.ts
index 548fa26cc1185..3b56a7685501c 100644
--- a/src/qt/locale/bitcoin_ja.ts
+++ b/src/qt/locale/bitcoin_ja.ts
@@ -3706,10 +3706,6 @@
         <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: %s)</source>
         <translation>Tor 秘匿サービスを通し、別々の SOCKS5 プロキシを用いることでピアに到達する (初期値: %s)</translation>
     </message>
-    <message>
-        <source>Username and hashed password for JSON-RPC connections. The field &lt;userpw&gt; comes in the format: &lt;USERNAME&gt;:&lt;SALT&gt;$&lt;HASH&gt;. A canonical python script is included in share/rpcuser. This option can be specified multiple times</source>
-        <translation>JSON-RPC接続時のユーザ名とハッシュ化されたパスワード。&lt;userpw&gt; フィールドのフォーマットは &lt;USERNAME&gt;:&lt;SALT&gt;$&lt;HASH&gt;。標準的な Python スクリプトが share/rpcuser 内に含まれています。このオプションは複数回指定できます。</translation>
-    </message>
     <message>
         <source>Warning: Unknown block versions being mined! It's possible unknown rules are in effect</source>
         <translation>警告: 未知のバージョンのブロックが採掘されました。未知のルールが導入された可能性があります</translation>
diff --git a/src/qt/locale/bitcoin_ko_KR.ts b/src/qt/locale/bitcoin_ko_KR.ts
index 4198b7ea56db9..a80c6ccc452c6 100644
--- a/src/qt/locale/bitcoin_ko_KR.ts
+++ b/src/qt/locale/bitcoin_ko_KR.ts
@@ -2897,10 +2897,6 @@
         <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: %s)</source>
         <translation>Tor 서비스를 이용하여 피어에게 연결하기 위해 분리된 SOCKS5 프록시를 사용 (기본값: %s)</translation>
     </message>
-    <message>
-        <source>Username and hashed password for JSON-RPC connections. The field &lt;userpw&gt; comes in the format: &lt;USERNAME&gt;:&lt;SALT&gt;$&lt;HASH&gt;. A canonical python script is included in share/rpcuser. This option can be specified multiple times</source>
-        <translation>JSON-RPC 연결시 사용자 이름과 해시화된 암호문. &lt;userpw&gt; 필드는 &lt;USERNAME&gt;:&lt;SALT&gt;$&lt;HASH&gt; 포멧으로 구성되어 있습니다. 전형적 파이썬 스크립트에선 share/rpcuser가 포함되어 있습니다. 이 옵션은 여러번 지정할 수 있습니다.</translation>
-    </message>
     <message>
         <source>Warning: Unknown block versions being mined! It's possible unknown rules are in effect</source>
         <translation>경고: 알려지지 않은 버전의 블록이 채굴되었습니다. 알려지지 않은 규칙이 적용되었을 가능성이 있습니다.</translation>
diff --git a/src/qt/locale/bitcoin_nb.ts b/src/qt/locale/bitcoin_nb.ts
index 9749db2b1f9c6..f98cdd32d22be 100644
--- a/src/qt/locale/bitcoin_nb.ts
+++ b/src/qt/locale/bitcoin_nb.ts
@@ -2201,10 +2201,6 @@
         <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: %s)</source>
         <translation>Bruk separate SOCKS5 proxyer for å nå noder via Tor skjulte tjenester (standardverdi: %s)</translation>
     </message>
-    <message>
-        <source>Username and hashed password for JSON-RPC connections. The field &lt;userpw&gt; comes in the format: &lt;USERNAME&gt;:&lt;SALT&gt;$&lt;HASH&gt;. A canonical python script is included in share/rpcuser. This option can be specified multiple times</source>
-        <translation>Brukernavn og hashet passord for JSON-RPC tilkoblinger. Feltet &lt;userpw&gt; kommer i formatet: &lt;USERNAME&gt;:&lt;SALT&gt;$&lt;HASH&gt;. Et Python-skript er inkludert i share/rpcuser. Dette alternativet kan angis flere ganger</translation>
-    </message>
     <message>
         <source>(default: %s)</source>
         <translation>(standardverdi: %s)</translation>
diff --git a/src/qt/locale/bitcoin_nl.ts b/src/qt/locale/bitcoin_nl.ts
index 3f5b903336317..8a09bed2ce09e 100644
--- a/src/qt/locale/bitcoin_nl.ts
+++ b/src/qt/locale/bitcoin_nl.ts
@@ -3481,10 +3481,6 @@
         <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: %s)</source>
         <translation>Gebruik een aparte SOCKS5 proxy om verborgen diensten van Tor te bereiken (standaard: %s)</translation>
     </message>
-    <message>
-        <source>Username and hashed password for JSON-RPC connections. The field &lt;userpw&gt; comes in the format: &lt;USERNAME&gt;:&lt;SALT&gt;$&lt;HASH&gt;. A canonical python script is included in share/rpcuser. This option can be specified multiple times</source>
-        <translation>Gebruikersnaam en gehasht wachtwoord voor JSON-RPC-verbindingen. De velden &lt;userpw&gt; is in het formaat: &lt;GEBRUIKERSNAAM&gt;:&lt;SALT&gt;$&lt;HASH&gt;. Een kanoniek Pythonscript is inbegrepen in de share/rpcuser. Deze optie kan meerdere keren worden meegegeven</translation>
-    </message>
     <message>
         <source>Warning: Unknown block versions being mined! It's possible unknown rules are in effect</source>
         <translation>Waarschuwing: Onbekende blok versies worden gemined! Er zijn mogelijk onbekende regels in werking getreden</translation>
diff --git a/src/qt/locale/bitcoin_pt_BR.ts b/src/qt/locale/bitcoin_pt_BR.ts
index 3589cdbc1b4d4..4d49399c11f31 100644
--- a/src/qt/locale/bitcoin_pt_BR.ts
+++ b/src/qt/locale/bitcoin_pt_BR.ts
@@ -2196,6 +2196,10 @@
         <source>Warning: Unknown change address</source>
         <translation>Aviso: Endereço de troco inválido</translation>
     </message>
+    <message>
+        <source>Confirm custom change address</source>
+        <translation>Confirmar endereço de troco personalizado</translation>
+    </message>
     <message>
         <source>(no label)</source>
         <translation>(sem rótuo)</translation>
@@ -3693,10 +3697,6 @@
         <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: %s)</source>
         <translation>Use um proxy SOCKS5 separado para alcançar participantes da rede via serviços ocultos Tor (padrão: %s)</translation>
     </message>
-    <message>
-        <source>Username and hashed password for JSON-RPC connections. The field &lt;userpw&gt; comes in the format: &lt;USERNAME&gt;:&lt;SALT&gt;$&lt;HASH&gt;. A canonical python script is included in share/rpcuser. This option can be specified multiple times</source>
-        <translation>Nome de usuário e senha hash para conexões JSON-RPC. O campo &lt;userpw&gt; vem com o formato: &lt;USERNAME&gt;:&lt;SALT&gt;$&lt;HASH&gt;. Um script python canônico é incluído em share/rpcuser. Essa opção pode ser especificada múltiplas vezes.</translation>
-    </message>
     <message>
         <source>Warning: Unknown block versions being mined! It's possible unknown rules are in effect</source>
         <translation>Aviso: Versões de bloco desconhecidas sendo mineradas! É possível que regras estranhas estejam ativas</translation>
diff --git a/src/qt/locale/bitcoin_pt_PT.ts b/src/qt/locale/bitcoin_pt_PT.ts
index a2a52efd27c2e..7bfb3e710d18e 100644
--- a/src/qt/locale/bitcoin_pt_PT.ts
+++ b/src/qt/locale/bitcoin_pt_PT.ts
@@ -43,35 +43,159 @@
     </message>
     <message>
         <source>Choose the address to send coins to</source>
-        <translation>Escolhe qual o endereço para o  qual enviar moedas</translation>
+        <translation>Escolha o endereço para enviar as moedas</translation>
     </message>
     <message>
         <source>Choose the address to receive coins with</source>
-        <translation>Escolhe qual o endereço para receber moedas</translation>
+        <translation>Escolha o endereço para receber as moedas</translation>
     </message>
-    </context>
+    <message>
+        <source>C&amp;hoose</source>
+        <translation>Escol&amp;her</translation>
+    </message>
+    <message>
+        <source>Sending addresses</source>
+        <translation>A enviar endereços</translation>
+    </message>
+    <message>
+        <source>Receiving addresses</source>
+        <translation>A receber endereços</translation>
+    </message>
+    <message>
+        <source>&amp;Copy Address</source>
+        <translation>&amp;Copiar Endereço</translation>
+    </message>
+    <message>
+        <source>Copy &amp;Label</source>
+        <translation>Copiar &amp;Etiqueta</translation>
+    </message>
+    <message>
+        <source>&amp;Edit</source>
+        <translation>&amp;Editar</translation>
+    </message>
+    <message>
+        <source>Export Address List</source>
+        <translation>Exportar Lista de Endereços</translation>
+    </message>
+    <message>
+        <source>Comma separated file (*.csv)</source>
+        <translation>Ficheiro separado por vírgulas (*.csv)</translation>
+    </message>
+    <message>
+        <source>Exporting Failed</source>
+        <translation>Exportação Falhou</translation>
+    </message>
+    <message>
+        <source>There was an error trying to save the address list to %1. Please try again.</source>
+        <translation>Ocorreu um erro ao tentar guardar a lista de endereços para %1. Por favor, tente novamente.</translation>
+    </message>
+</context>
 <context>
     <name>AddressTableModel</name>
-    </context>
+    <message>
+        <source>Label</source>
+        <translation>Etiqueta</translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation>Endereço</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(sem etiqueta)</translation>
+    </message>
+</context>
 <context>
     <name>AskPassphraseDialog</name>
     <message>
         <source>Passphrase Dialog</source>
-        <translation>Janela da frase de palavra-passe</translation>
+        <translation>Janela da Frase de Segurança</translation>
     </message>
     <message>
         <source>Enter passphrase</source>
-        <translation>Insira a frase de palavra-passe</translation>
+        <translation>Insira a frase de segurança</translation>
     </message>
     <message>
         <source>New passphrase</source>
-        <translation>Nova frase de palavra-passe</translation>
+        <translation>Nova frase de frase de segurança</translation>
     </message>
     <message>
         <source>Repeat new passphrase</source>
-        <translation>Repita a nova frase de palavra-passe</translation>
+        <translation>Repita a nova frase de frase de segurança</translation>
     </message>
-    </context>
+    <message>
+        <source>Enter the new passphrase to the wallet.&lt;br/&gt;Please use a passphrase of &lt;b&gt;ten or more random characters&lt;/b&gt;, or &lt;b&gt;eight or more words&lt;/b&gt;.</source>
+        <translation>Insira a nova frase de segurança para a carteira. &lt;br/&gt; Por favor, utilize uma frase de segurança de &lt;b&gt;10 ou mais carateres aleatórios,&lt;/b&gt; ou &lt;b&gt;oito ou mais palavras&lt;/b&gt;.</translation>
+    </message>
+    <message>
+        <source>Encrypt wallet</source>
+        <translation>Encriptar carteira</translation>
+    </message>
+    <message>
+        <source>This operation needs your wallet passphrase to unlock the wallet.</source>
+        <translation>Esta operação precisa da sua frase de segurança da carteira para desbloquear a mesma.</translation>
+    </message>
+    <message>
+        <source>Unlock wallet</source>
+        <translation>Desbloquear carteira</translation>
+    </message>
+    <message>
+        <source>This operation needs your wallet passphrase to decrypt the wallet.</source>
+        <translation>Esta operação precisa da sua frase de segurança da carteira para desencriptar a mesma.</translation>
+    </message>
+    <message>
+        <source>Decrypt wallet</source>
+        <translation>Desencriptar carteira</translation>
+    </message>
+    <message>
+        <source>Change passphrase</source>
+        <translation>Alterar frase de segurança</translation>
+    </message>
+    <message>
+        <source>Enter the old passphrase and new passphrase to the wallet.</source>
+        <translation>Insira a frase de segurança antiga e a nova frase de segurança para a carteira.</translation>
+    </message>
+    <message>
+        <source>Confirm wallet encryption</source>
+        <translation>Confirmar encriptação da carteira</translation>
+    </message>
+    <message>
+        <source>Warning: If you encrypt your wallet and lose your passphrase, you will &lt;b&gt;LOSE ALL OF YOUR BITCOINS&lt;/b&gt;!</source>
+        <translation>Aviso: se encriptar a sua carteira e perder a sua frase de segurnça, &lt;b&gt;PERDERÁ TODOS OS SEUS BITCOINS&lt;/b&gt;!</translation>
+    </message>
+    <message>
+        <source>Are you sure you wish to encrypt your wallet?</source>
+        <translation>Tem a certeza que deseja encriptar a sua carteira?</translation>
+    </message>
+    <message>
+        <source>Wallet encrypted</source>
+        <translation>Carteira encriptada</translation>
+    </message>
+    <message>
+        <source>Wallet encryption failed</source>
+        <translation>Encriptação da carteira falhou</translation>
+    </message>
+    <message>
+        <source>The supplied passphrases do not match.</source>
+        <translation>As frases de segurança fornecidas não coincidem.</translation>
+    </message>
+    <message>
+        <source>Wallet unlock failed</source>
+        <translation>Desbloqueio da carteira falhou</translation>
+    </message>
+    <message>
+        <source>Wallet decryption failed</source>
+        <translation>Desencriptação da carteira falhou</translation>
+    </message>
+    <message>
+        <source>Wallet passphrase was successfully changed.</source>
+        <translation>A frase de segurança da carteira foi alterada com sucesso.</translation>
+    </message>
+    <message>
+        <source>Warning: The Caps Lock key is on!</source>
+        <translation>Aviso: a tecla Caps Lock está ligada!</translation>
+    </message>
+</context>
 <context>
     <name>BanTableModel</name>
     <message>
@@ -95,7 +219,7 @@
     </message>
     <message>
         <source>&amp;Overview</source>
-        <translation>&amp;Sinopse</translation>
+        <translation>&amp;Resumo</translation>
     </message>
     <message>
         <source>Node</source>
@@ -103,7 +227,7 @@
     </message>
     <message>
         <source>Show general overview of wallet</source>
-        <translation>Mostrar sinopse geral da carteira</translation>
+        <translation>Mostrar resumo geral da carteira</translation>
     </message>
     <message>
         <source>&amp;Transactions</source>
@@ -123,19 +247,19 @@
     </message>
     <message>
         <source>&amp;About %1</source>
-        <translation>&amp;Acerca de %1</translation>
+        <translation>&amp;Sobre o %1</translation>
     </message>
     <message>
         <source>Show information about %1</source>
-        <translation>Mostrar informação sobre %1</translation>
+        <translation>Mostrar informação sobre o %1</translation>
     </message>
     <message>
         <source>About &amp;Qt</source>
-        <translation>Sobre &amp;Qt</translation>
+        <translation>Sobre o &amp;Qt</translation>
     </message>
     <message>
         <source>Show information about Qt</source>
-        <translation>Mostrar informação sobre Qt</translation>
+        <translation>Mostrar informação sobre o Qt</translation>
     </message>
     <message>
         <source>&amp;Options...</source>
@@ -151,11 +275,11 @@
     </message>
     <message>
         <source>&amp;Backup Wallet...</source>
-        <translation>&amp;Guardar Carteira...</translation>
+        <translation>Efetuar &amp;Cópia de Segurança da Carteira...</translation>
     </message>
     <message>
         <source>&amp;Change Passphrase...</source>
-        <translation>Alterar &amp;Frase de Palavra-passe...</translation>
+        <translation>Alterar &amp;Frase de Segurança...</translation>
     </message>
     <message>
         <source>&amp;Sending addresses...</source>
@@ -169,13 +293,25 @@
         <source>Open &amp;URI...</source>
         <translation>Abrir &amp;URI...</translation>
     </message>
+    <message>
+        <source>Click to disable network activity.</source>
+        <translation>Clique para desativar a atividade de rede.</translation>
+    </message>
+    <message>
+        <source>Network activity disabled.</source>
+        <translation>Atividade de rede desativada.</translation>
+    </message>
+    <message>
+        <source>Click to enable network activity again.</source>
+        <translation>Clique para ativar novamente a atividade de rede.</translation>
+    </message>
     <message>
         <source>Reindexing blocks on disk...</source>
         <translation>A reindexar os blocos no disco...</translation>
     </message>
     <message>
         <source>Send coins to a Bitcoin address</source>
-        <translation>Enviar moedas para um endereço bitcoin</translation>
+        <translation>Enviar moedas para um endereço Bitcoin</translation>
     </message>
     <message>
         <source>Backup wallet to another location</source>
@@ -183,11 +319,11 @@
     </message>
     <message>
         <source>Change the passphrase used for wallet encryption</source>
-        <translation>Alterar a frase de palavra-passe utilizada na encriptação da carteira</translation>
+        <translation>Alterar a frase de segurança utilizada na encriptação da carteira</translation>
     </message>
     <message>
         <source>&amp;Debug window</source>
-        <translation>Janela de &amp;depuração</translation>
+        <translation>Janela de &amp;Depuração</translation>
     </message>
     <message>
         <source>Open debugging and diagnostic console</source>
@@ -227,7 +363,7 @@
     </message>
     <message>
         <source>Sign messages with your Bitcoin addresses to prove you own them</source>
-        <translation>Assine mensagens com os seus endereços Bitcoin para provar que os controla</translation>
+        <translation>Assine as mensagens com os seus endereços Bitcoin para provar que é o proprietário dos mesmos</translation>
     </message>
     <message>
         <source>Verify messages to ensure they were signed with specified Bitcoin addresses</source>
@@ -317,6 +453,10 @@
         <source>Up to date</source>
         <translation>Atualizado</translation>
     </message>
+    <message>
+        <source>%1 client</source>
+        <translation>Cliente %1</translation>
+    </message>
     <message>
         <source>Catching up...</source>
         <translation>Recuperando o atraso...</translation>
@@ -359,6 +499,14 @@
         <source>Incoming transaction</source>
         <translation>Transação recebida</translation>
     </message>
+    <message>
+        <source>HD key generation is &lt;b&gt;enabled&lt;/b&gt;</source>
+        <translation>Criação de chave HD está &lt;b&gt;ativada&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <source>HD key generation is &lt;b&gt;disabled&lt;/b&gt;</source>
+        <translation>Criação de chave HD está &lt;b&gt;desativada&lt;/b&gt;</translation>
+    </message>
     <message>
         <source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;unlocked&lt;/b&gt;</source>
         <translation>A carteira está &lt;b&gt;encriptada&lt;/b&gt; e atualmente &lt;b&gt;desbloqueada&lt;/b&gt;</translation>
@@ -438,7 +586,75 @@
         <source>Confirmed</source>
         <translation>Confirmada</translation>
     </message>
-    </context>
+    <message>
+        <source>Copy address</source>
+        <translation>Copiar endereço</translation>
+    </message>
+    <message>
+        <source>Copy label</source>
+        <translation>Copiar etiqueta</translation>
+    </message>
+    <message>
+        <source>Copy amount</source>
+        <translation>Copiar valor</translation>
+    </message>
+    <message>
+        <source>Copy transaction ID</source>
+        <translation>Copiar Id. da transação</translation>
+    </message>
+    <message>
+        <source>Lock unspent</source>
+        <translation>Bloquear não gasto</translation>
+    </message>
+    <message>
+        <source>Unlock unspent</source>
+        <translation>Desbloquear não gasto</translation>
+    </message>
+    <message>
+        <source>Copy quantity</source>
+        <translation>Copiar quantidade</translation>
+    </message>
+    <message>
+        <source>Copy fee</source>
+        <translation>Copiar taxa</translation>
+    </message>
+    <message>
+        <source>Copy after fee</source>
+        <translation>Copiar depois da taxa</translation>
+    </message>
+    <message>
+        <source>Copy bytes</source>
+        <translation>Copiar bytes</translation>
+    </message>
+    <message>
+        <source>Copy change</source>
+        <translation>Copiar troco</translation>
+    </message>
+    <message>
+        <source>(%1 locked)</source>
+        <translation>(%1 bloqueado)</translation>
+    </message>
+    <message>
+        <source>yes</source>
+        <translation>sim</translation>
+    </message>
+    <message>
+        <source>no</source>
+        <translation>não</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(sem etiqueta)</translation>
+    </message>
+    <message>
+        <source>change from %1 (%2)</source>
+        <translation>troco de %1 (%2)</translation>
+    </message>
+    <message>
+        <source>(change)</source>
+        <translation>(troco)</translation>
+    </message>
+</context>
 <context>
     <name>EditAddressDialog</name>
     <message>
@@ -461,12 +677,20 @@
         <source>&amp;Address</source>
         <translation>E&amp;ndereço</translation>
     </message>
-    </context>
+    <message>
+        <source>Could not unlock wallet.</source>
+        <translation>Não foi possível desbloquear a carteira.</translation>
+    </message>
+    <message>
+        <source>New key generation failed.</source>
+        <translation>A criação da nova chave falhou.</translation>
+    </message>
+</context>
 <context>
     <name>FreespaceChecker</name>
     <message>
         <source>A new data directory will be created.</source>
-        <translation>Irá ser criada uma nova diretoria de dados.</translation>
+        <translation>Será criada uma nova diretoria de dados.</translation>
     </message>
     <message>
         <source>name</source>
@@ -478,7 +702,7 @@
     </message>
     <message>
         <source>Path already exists, and is not a directory.</source>
-        <translation>Caminho já existe, e não é uma pasta.</translation>
+        <translation>O caminho já existe, e este não é uma pasta.</translation>
     </message>
     <message>
         <source>Cannot create data directory here.</source>
@@ -497,7 +721,7 @@
     </message>
     <message>
         <source>About %1</source>
-        <translation>Sobre %1</translation>
+        <translation>Sobre o %1</translation>
     </message>
     <message>
         <source>Command-line options</source>
@@ -517,11 +741,11 @@
     </message>
     <message>
         <source>Choose data directory on startup (default: %u)</source>
-        <translation>Escolha a diretoria dos dados no arranque (predefinição: %u)</translation>
+        <translation>Escolher a pasta de dados no arranque (predefinição: %u)</translation>
     </message>
     <message>
         <source>Set language, for example "de_DE" (default: system locale)</source>
-        <translation>Definir linguagem, por exemplo "pt_PT" (por defeito: linguagem do sistema)</translation>
+        <translation>Definir idioma, por exemplo "pt_PT" (predefinição: idioma do sistema)</translation>
     </message>
     <message>
         <source>Start minimized</source>
@@ -529,13 +753,17 @@
     </message>
     <message>
         <source>Set SSL root certificates for payment request (default: -system-)</source>
-        <translation>Configurar certificados SSL root para pedido de pagamento (default: -system-)</translation>
+        <translation>Definir certificados de raiz SSL para pedidos de pagamento (predefinição: -system-)</translation>
     </message>
     <message>
         <source>Show splash screen on startup (default: %u)</source>
         <translation>Mostrar o ecrã de abertura no arranque (predefinição: %u)</translation>
     </message>
-    </context>
+    <message>
+        <source>Reset all settings changed in the GUI</source>
+        <translation>Redefinir todas as definições alteradas na GUI</translation>
+    </message>
+</context>
 <context>
     <name>Intro</name>
     <message>
@@ -544,19 +772,19 @@
     </message>
     <message>
         <source>Welcome to %1.</source>
-        <translation>Bem-vindo a %1.</translation>
+        <translation>Bem-vindo ao %1.</translation>
     </message>
     <message>
         <source>Use the default data directory</source>
-        <translation>Utilizar a diretoria de dados predefinida</translation>
+        <translation>Utilizar a pasta de dados predefinida</translation>
     </message>
     <message>
         <source>Use a custom data directory:</source>
-        <translation>Utilizar uma diretoria de dados personalizada:</translation>
+        <translation>Utilizar uma pasta de dados personalizada:</translation>
     </message>
     <message>
         <source>Error: Specified data directory "%1" cannot be created.</source>
-        <translation>Erro: não pode ser criada a diretoria de dados especificada como "%1.</translation>
+        <translation>Erro: não pode ser criada a pasta de dados especificada como "%1.</translation>
     </message>
     <message>
         <source>Error</source>
@@ -577,15 +805,39 @@
         <source>Form</source>
         <translation>Formulário</translation>
     </message>
+    <message>
+        <source>Number of blocks left</source>
+        <translation>Número de blocos restantes</translation>
+    </message>
+    <message>
+        <source>Unknown...</source>
+        <translation>Desconhecido...</translation>
+    </message>
     <message>
         <source>Last block time</source>
         <translation>Data do último bloco</translation>
     </message>
+    <message>
+        <source>Progress</source>
+        <translation>Progresso</translation>
+    </message>
+    <message>
+        <source>calculating...</source>
+        <translation>a calcular...</translation>
+    </message>
+    <message>
+        <source>Estimated time left until synced</source>
+        <translation>tempo restante estimado até à sincronização</translation>
+    </message>
     <message>
         <source>Hide</source>
-        <translation>Esconder</translation>
+        <translation>Ocultar</translation>
     </message>
-    </context>
+    <message>
+        <source>Unknown. Syncing Headers (%1)...</source>
+        <translation>Desconhecido. Sincronização de Cabeçalhos (%1)...</translation>
+    </message>
+</context>
 <context>
     <name>OpenURIDialog</name>
     <message>
@@ -602,9 +854,13 @@
     </message>
     <message>
         <source>Select payment request file</source>
-        <translation>Seleccione o ficheiro de pedido de pagamento</translation>
+        <translation>Selecione o ficheiro de pedido de pagamento</translation>
     </message>
-    </context>
+    <message>
+        <source>Select payment request file to open</source>
+        <translation>Selecione o ficheiro de pedido de pagamento para abrir</translation>
+    </message>
+</context>
 <context>
     <name>OptionsDialog</name>
     <message>
@@ -617,7 +873,7 @@
     </message>
     <message>
         <source>Automatically start %1 after logging in to the system.</source>
-        <translation>Começar o %1 automaticamente ao iniciar a sessão no sistema.</translation>
+        <translation>Iniciar automaticamente o %1 depois de iniciar a sessão no sistema.</translation>
     </message>
     <message>
         <source>&amp;Start %1 on system login</source>
@@ -645,7 +901,7 @@
     </message>
     <message>
         <source>IP address of the proxy (e.g. IPv4: 127.0.0.1 / IPv6: ::1)</source>
-        <translation>Endereço IP do proxy (p.ex. IPv4: 127.0.0.1 / IPv6: ::1)</translation>
+        <translation>Endereço de IP do proxy (exemplo, IPv4: 127.0.0.1 / IPv6: ::1)</translation>
     </message>
     <message>
         <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Exit in the menu.</source>
@@ -686,15 +942,15 @@
     </message>
     <message>
         <source>Expert</source>
-        <translation> Especialistas </translation>
+        <translation> Técnicos</translation>
     </message>
     <message>
         <source>Enable coin &amp;control features</source>
-        <translation>Ativar as funcionalidades de controlo de moedas</translation>
+        <translation>Ativar as funcionalidades de &amp;controlo de moedas</translation>
     </message>
     <message>
         <source>If you disable the spending of unconfirmed change, the change from a transaction cannot be used until that transaction has at least one confirmation. This also affects how your balance is computed.</source>
-        <translation>No caso de desativar o gasto de troco não confirmado, o troco de uma transação não poderá ser utilizado até que essa transação tenha pelo menos uma confirmação. Isto também afeta o cálculo do seu saldo.</translation>
+        <translation>Se desativar o gasto de troco não confirmado, o troco de uma transação não pode ser utilizado até que essa transação tenha pelo menos uma confirmação. Isto também afeta o cálculo do seu saldo.</translation>
     </message>
     <message>
         <source>&amp;Spend unconfirmed change</source>
@@ -760,6 +1016,10 @@
         <source>&amp;Window</source>
         <translation>&amp;Janela</translation>
     </message>
+    <message>
+        <source>&amp;Hide the icon from the system tray.</source>
+        <translation>&amp;Ocultar o ícone da bandeja do sistema.</translation>
+    </message>
     <message>
         <source>Hide tray icon</source>
         <translation>Ocultar ícone da bandeja</translation>
@@ -826,7 +1086,7 @@
     </message>
     <message>
         <source>This change would require a client restart.</source>
-        <translation>Esta alteração requer um reinício do cliente.</translation>
+        <translation>Esta alteração obrigará a um reinício do cliente.</translation>
     </message>
     <message>
         <source>The supplied proxy address is invalid.</source>
@@ -910,6 +1170,34 @@
 </context>
 <context>
     <name>PaymentServer</name>
+    <message>
+        <source>Payment request error</source>
+        <translation>Erro do pedido de pagamento</translation>
+    </message>
+    <message>
+        <source>Payment request rejected</source>
+        <translation>Pedido de pagamento rejeitado</translation>
+    </message>
+    <message>
+        <source>Payment request expired.</source>
+        <translation>Pedido de pagamento expirado.</translation>
+    </message>
+    <message>
+        <source>Payment request is not initialized.</source>
+        <translation>O pedido de pagamento não foi inicializado.</translation>
+    </message>
+    <message>
+        <source>Invalid payment request.</source>
+        <translation>Pedido de pagamento inválido.</translation>
+    </message>
+    <message>
+        <source>Refund from %1</source>
+        <translation>Reembolso de %1</translation>
+    </message>
+    <message>
+        <source>Error communicating with %1: %2</source>
+        <translation>Erro ao comunicar com %1: %2</translation>
+    </message>
     </context>
 <context>
     <name>PeerTableModel</name>
@@ -1312,7 +1600,15 @@
         <source>Remove</source>
         <translation>Remover</translation>
     </message>
-    </context>
+    <message>
+        <source>Copy label</source>
+        <translation>Copiar etiqueta</translation>
+    </message>
+    <message>
+        <source>Copy amount</source>
+        <translation>Copiar valor</translation>
+    </message>
+</context>
 <context>
     <name>ReceiveRequestDialog</name>
     <message>
@@ -1331,13 +1627,29 @@
         <source>&amp;Save Image...</source>
         <translation>&amp;Salvar Imagem...</translation>
     </message>
+    <message>
+        <source>Address</source>
+        <translation>Endereço</translation>
+    </message>
     <message>
         <source>Amount</source>
         <translation>Valor</translation>
     </message>
+    <message>
+        <source>Label</source>
+        <translation>Etiqueta</translation>
+    </message>
     </context>
 <context>
     <name>RecentRequestsTableModel</name>
+    <message>
+        <source>Label</source>
+        <translation>Etiqueta</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(sem etiqueta)</translation>
+    </message>
     </context>
 <context>
     <name>SendCoinsDialog</name>
@@ -1387,7 +1699,7 @@
     </message>
     <message>
         <source>If this is activated, but the change address is empty or invalid, change will be sent to a newly generated address.</source>
-        <translation>Se isto estiver ativo, mas o endereço de troco estiver vazio ou for inválido, o troco irá ser enviado para um novo endereço.</translation>
+        <translation>Se isto estiver ativo, mas o endereço de troco estiver vazio ou for inválido, o troco será enviado para um novo endereço gerado.</translation>
     </message>
     <message>
         <source>Custom change address</source>
@@ -1395,7 +1707,7 @@
     </message>
     <message>
         <source>Transaction Fee:</source>
-        <translation>Custo da Transação:</translation>
+        <translation>Taxa da transação:</translation>
     </message>
     <message>
         <source>Choose...</source>
@@ -1403,7 +1715,7 @@
     </message>
     <message>
         <source>collapse fee-settings</source>
-        <translation>fechar definições-de custos</translation>
+        <translation>ocultar definições de taxa</translation>
     </message>
     <message>
         <source>per kilobyte</source>
@@ -1411,7 +1723,7 @@
     </message>
     <message>
         <source>If the custom fee is set to 1000 satoshis and the transaction is only 250 bytes, then "per kilobyte" only pays 250 satoshis in fee, while "total at least" pays 1000 satoshis. For transactions bigger than a kilobyte both pay by kilobyte.</source>
-        <translation>Se a taxa fixa for 1000 satoshis e a transação for somente 250 bytes, pagará somente 250 satoshis "por kilobyte" em custos se trasacionar "pelo menos" 1000 satoshis. Transações superiores a um kilobyte são cobradas por kilobyte.</translation>
+        <translation>Se a taxa personalizada estiver definida para 1.000 satoshis e a transação é de apenas 250 bytes, então paga apenas 250 satoshis "por kilobyte" na taxa, enquanto em "total pelo menos" paga 1.000 satoshis. Para transações superiores a um kilobyte ambos pagam por kilobyte.</translation>
     </message>
     <message>
         <source>Hide</source>
@@ -1439,7 +1751,7 @@
     </message>
     <message>
         <source>(Smart fee not initialized yet. This usually takes a few blocks...)</source>
-        <translation>(Taxa inteligente ainda não foi acionada. Normalmente demora alguns blocos...)</translation>
+        <translation>(A taxa inteligente ainda não foi inicializada. Isto normalmente demora alguns blocos...)</translation>
     </message>
     <message>
         <source>normal</source>
@@ -1481,7 +1793,63 @@
         <source>S&amp;end</source>
         <translation>E&amp;nviar</translation>
     </message>
-    </context>
+    <message>
+        <source>Copy quantity</source>
+        <translation>Copiar quantidade</translation>
+    </message>
+    <message>
+        <source>Copy amount</source>
+        <translation>Copiar valor</translation>
+    </message>
+    <message>
+        <source>Copy fee</source>
+        <translation>Copiar taxa</translation>
+    </message>
+    <message>
+        <source>Copy after fee</source>
+        <translation>Copiar depois da taxa</translation>
+    </message>
+    <message>
+        <source>Copy bytes</source>
+        <translation>Copiar bytes</translation>
+    </message>
+    <message>
+        <source>Copy change</source>
+        <translation>Copiar troco</translation>
+    </message>
+    <message>
+        <source>added as transaction fee</source>
+        <translation>adicionado como taxa de transação</translation>
+    </message>
+    <message>
+        <source>The total exceeds your balance when the %1 transaction fee is included.</source>
+        <translation>O total excede o seu saldo quando a taxa de transação %1 está incluída.</translation>
+    </message>
+    <message>
+        <source>A fee higher than %1 is considered an absurdly high fee.</source>
+        <translation>Uma taxa superior a %1 é considerada uma taxa altamente absurda.</translation>
+    </message>
+    <message>
+        <source>Payment request expired.</source>
+        <translation>Pedido de pagamento expirado.</translation>
+    </message>
+    <message>
+        <source>Pay only the required fee of %1</source>
+        <translation>Pague apenas a taxa obrigatória de %1</translation>
+    </message>
+    <message>
+        <source>Warning: Unknown change address</source>
+        <translation>Aviso: endereço de troco desconhecido</translation>
+    </message>
+    <message>
+        <source>Confirm custom change address</source>
+        <translation>Confirmar endereço de troco personalizado</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(sem etiqueta)</translation>
+    </message>
+</context>
 <context>
     <name>SendCoinsEntry</name>
     <message>
@@ -1530,7 +1898,7 @@
     </message>
     <message>
         <source>S&amp;ubtract fee from amount</source>
-        <translation>S&amp;ubtrair taxa ao montante</translation>
+        <translation>S&amp;ubtrair a taxa ao montante</translation>
     </message>
     <message>
         <source>Message:</source>
@@ -1678,6 +2046,10 @@
 </context>
 <context>
     <name>TransactionDesc</name>
+    <message>
+        <source>Transaction fee</source>
+        <translation>Taxa de transação</translation>
+    </message>
     <message>
         <source>Amount</source>
         <translation>Valor</translation>
@@ -1692,9 +2064,49 @@
     </context>
 <context>
     <name>TransactionTableModel</name>
+    <message>
+        <source>Label</source>
+        <translation>Etiqueta</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(sem etiqueta)</translation>
+    </message>
     </context>
 <context>
     <name>TransactionView</name>
+    <message>
+        <source>Copy address</source>
+        <translation>Copiar endereço</translation>
+    </message>
+    <message>
+        <source>Copy label</source>
+        <translation>Copiar etiqueta</translation>
+    </message>
+    <message>
+        <source>Copy amount</source>
+        <translation>Copiar valor</translation>
+    </message>
+    <message>
+        <source>Copy transaction ID</source>
+        <translation>Copiar Id. da transação</translation>
+    </message>
+    <message>
+        <source>Comma separated file (*.csv)</source>
+        <translation>Ficheiro separado por vírgulas (*.csv)</translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation>Etiqueta</translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation>Endereço</translation>
+    </message>
+    <message>
+        <source>Exporting Failed</source>
+        <translation>Exportação Falhou</translation>
+    </message>
     </context>
 <context>
     <name>UnitDisplayStatusBarControl</name>
@@ -1764,7 +2176,7 @@
     </message>
     <message>
         <source>Fee (in %s/kB) to add to transactions you send (default: %s)</source>
-        <translation>Taxa (em %s/kB) a adicionar às transacções que envia (padrão: %s)</translation>
+        <translation>Taxa (em %s/kB) para adicionar às transações que envia (predefinição: %s)</translation>
     </message>
     <message>
         <source>Pruning blockstore...</source>
@@ -1800,7 +2212,7 @@
     </message>
     <message>
         <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source>
-        <translation>Executar comando quando uma das transações na carteira mudar (no comando, %s é substituído pelo ID da Transação)</translation>
+        <translation>Executar o comando quando uma transação da carteira muda (no comando, %s é substituído pela Id. da Transação)</translation>
     </message>
     <message>
         <source>Set the number of script verification threads (%u to %d, 0 = auto, &lt;0 = leave that many cores free, default: %d)</source>
@@ -2040,7 +2452,7 @@
     </message>
     <message>
         <source>Fees (in %s/kB) smaller than this are considered zero fee for relaying, mining and transaction creation (default: %s)</source>
-        <translation>Taxas (em %s/kB) abaixo deste valor são consideradas nulas para propagação, mineração e criação de transacções (padrão: %s)</translation>
+        <translation>Taxas (em %s/kB) inferiores a este valor são consideradas nulas para propagação, mineração e criação de transações (predefinição: %s)</translation>
     </message>
     <message>
         <source>If paytxfee is not set, include enough fee so transactions begin confirmation on average within n blocks (default: %u)</source>
@@ -2220,7 +2632,7 @@
     </message>
     <message>
         <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
-        <translation>Executar comando quando o melhor bloco mudar (no comando, %s é substituído pela hash do bloco)</translation>
+        <translation>Executar o comando quando o melhor bloco muda (no comando, %s é substituído pela hash do bloco)</translation>
     </message>
     <message>
         <source>Allow DNS lookups for -addnode, -seednode and -connect</source>
@@ -2286,10 +2698,6 @@
         <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: %s)</source>
         <translation>Use um proxy SOCKS5 separado para alcançar pares via serviços ocultos do Tor (padrão: %s)</translation>
     </message>
-    <message>
-        <source>Username and hashed password for JSON-RPC connections. The field &lt;userpw&gt; comes in the format: &lt;USERNAME&gt;:&lt;SALT&gt;$&lt;HASH&gt;. A canonical python script is included in share/rpcuser. This option can be specified multiple times</source>
-        <translation>Username e hash da password para ligações JSON-RPC. O campo &lt;userpw&gt; está no formato: &lt;USERNAME&gt;:&lt;SALT&gt;$&lt;HASH&gt;. Um script python está incluido em share/rpcuser. Esta opção pode ser especificada múltiplas vezes.</translation>
-    </message>
     <message>
         <source>Warning: Unknown block versions being mined! It's possible unknown rules are in effect</source>
         <translation>Atenção: Versões desconhecidas de blocos estão a ser mineradas! É possível que regras desconhecias estão a ser efetuadas</translation>
@@ -2372,7 +2780,7 @@
     </message>
     <message>
         <source>Spend unconfirmed change when sending transactions (default: %u)</source>
-        <translation>Gastar troco não confirmado ao enviar transacções (padrão: %u)</translation>
+        <translation>Gastar o troco não confirmado quando enviar transações (predefinição: %u)</translation>
     </message>
     <message>
         <source>Threshold for disconnecting misbehaving peers (default: %u)</source>
diff --git a/src/qt/locale/bitcoin_ru.ts b/src/qt/locale/bitcoin_ru.ts
index aa30270415e22..11fa2f7fea2a1 100644
--- a/src/qt/locale/bitcoin_ru.ts
+++ b/src/qt/locale/bitcoin_ru.ts
@@ -543,7 +543,11 @@
         <source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;locked&lt;/b&gt;</source>
         <translation>Бумажник &lt;b&gt;зашифрован&lt;/b&gt; и в настоящее время &lt;b&gt;заблокирован&lt;/b&gt;</translation>
     </message>
-    </context>
+    <message>
+        <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source>
+        <translation>Произошла неисправимая ошибка. Bitcoin не может безопасно продолжать работу и будет закрыт.</translation>
+    </message>
+</context>
 <context>
     <name>CoinControlDialog</name>
     <message>
@@ -1431,10 +1435,26 @@
         <source>%n year(s)</source>
         <translation><numerusform>%n год</numerusform><numerusform>%n года</numerusform><numerusform>%n лет</numerusform><numerusform>%n лет</numerusform></translation>
     </message>
-    </context>
+    <message>
+        <source>%1 didn't yet exit safely...</source>
+        <translation>%1 ещё не завершился безопасно...</translation>
+    </message>
+</context>
 <context>
     <name>QObject::QObject</name>
-    </context>
+    <message>
+        <source>Error: Specified data directory "%1" does not exist.</source>
+        <translation>Ошибка: указанный каталог "%1" не существует.</translation>
+    </message>
+    <message>
+        <source>Error: Cannot parse configuration file: %1. Only use key=value syntax.</source>
+        <translation>Ошибка: не удалось разобрать конфигурационный файл: %1. Используйте синтаксис вида ключ=значение.</translation>
+    </message>
+    <message>
+        <source>Error: %1</source>
+        <translation>Ошибка: %1</translation>
+    </message>
+</context>
 <context>
     <name>QRImageWidget</name>
     <message>
@@ -2184,6 +2204,14 @@
         <source>Warning: Unknown change address</source>
         <translation>Внимание: неизвестный адрес для сдачи</translation>
     </message>
+    <message>
+        <source>Confirm custom change address</source>
+        <translation>Подтвердите свой адрес для сдачи</translation>
+    </message>
+    <message>
+        <source>The address you selected for change is not part of this wallet. Any or all funds in your wallet may be sent to this address. Are you sure?</source>
+        <translation>Выбранный вами адрес для сдачи не принадлежит этому кошельку. Часть или все средства могут быть отправлены на этот адрес. Вы уверены?</translation>
+    </message>
     <message>
         <source>(no label)</source>
         <translation>(нет метки)</translation>
@@ -2445,6 +2473,10 @@
 </context>
 <context>
     <name>TransactionDesc</name>
+    <message numerus="yes">
+        <source>Open for %n more block(s)</source>
+        <translation><numerusform>Открыто для ещё %n блока</numerusform><numerusform>Открыто для ещё %n блоков</numerusform><numerusform>Открыто для ещё %n блоков</numerusform><numerusform>Открыто для ещё %n блоков</numerusform></translation>
+    </message>
     <message>
         <source>Open until %1</source>
         <translation>Открыто до %1</translation>
@@ -2533,6 +2565,10 @@
         <source>Credit</source>
         <translation>Кредит</translation>
     </message>
+    <message numerus="yes">
+        <source>matures in %n more block(s)</source>
+        <translation><numerusform>будет доступно через %n блок</numerusform><numerusform>будет доступно через %n блока</numerusform><numerusform>будет доступно через %n блоков</numerusform><numerusform>будет доступно через %n блоков</numerusform></translation>
+    </message>
     <message>
         <source>not accepted</source>
         <translation>не принято</translation>
@@ -2635,6 +2671,10 @@
         <source>Label</source>
         <translation>Метка</translation>
     </message>
+    <message numerus="yes">
+        <source>Open for %n more block(s)</source>
+        <translation><numerusform>Открыто для ещё %n блока</numerusform><numerusform>Открыто для ещё %n блоков</numerusform><numerusform>Открыто для ещё %n блоков</numerusform><numerusform>Открыто для ещё %n блоков</numerusform></translation>
+    </message>
     <message>
         <source>Open until %1</source>
         <translation>Открыто до %1</translation>
@@ -3077,6 +3117,10 @@
         <source>The block database contains a block which appears to be from the future. This may be due to your computer's date and time being set incorrectly. Only rebuild the block database if you are sure that your computer's date and time are correct</source>
         <translation>База данных блоков содержит блок, который появляется из будущего. Это может из-за некорректно установленных даты и времени на вашем компьютере. Остается только перестроивать базу блоков, если вы уверены, что дата и время корректны.</translation>
     </message>
+    <message>
+        <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
+        <translation>Это пре-релизная тестовая сборка - используйте на свой страх и риск - не используйте для добычи или торговых приложений</translation>
+    </message>
     <message>
         <source>Unable to rewind the database to a pre-fork state. You will need to redownload the blockchain</source>
         <translation>Невозможно отмотать базу данных до пред-форкового состояния. Вам будет необходимо перекачать цепочку блоков.</translation>
@@ -3085,6 +3129,22 @@
         <source>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</source>
         <translation>Использовать UPnP для проброса порта (по умолчанию: 1, если используется прослушивание и нет -proxy)</translation>
     </message>
+    <message>
+        <source>Username and hashed password for JSON-RPC connections. The field &lt;userpw&gt; comes in the format: &lt;USERNAME&gt;:&lt;SALT&gt;$&lt;HASH&gt;. A canonical python script is included in share/rpcuser. The client then connects normally using the rpcuser=&lt;USERNAME&gt;/rpcpassword=&lt;PASSWORD&gt; pair of arguments. This option can be specified multiple times</source>
+        <translation>Имя пользователя и хэш пароля для JSON-RPC соединений. Поле &lt;userpw&gt; использует формат: &lt;USERNAME&gt;:&lt;SALT&gt;$&lt;HASH&gt;. Каноничный пример скрипта на питоне находится в share/rpcuser. Эта опция может быть указана несколько раз</translation>
+    </message>
+    <message>
+        <source>Wallet will not create transactions that violate mempool chain limits (default: %u)</source>
+        <translation>Бумажник не будет создавать транзакции, которые нарушают лимиты цепочки пула в памяти (по умолчанию: %u)</translation>
+    </message>
+    <message>
+        <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source>
+        <translation>Внимание: похоже, в сети нет полного согласия! Некоторые майнеры, возможно, испытывают проблемы.</translation>
+    </message>
+    <message>
+        <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source>
+        <translation>Внимание: мы не полностью согласны с подключенными участниками! Вам или другим участникам, возможно, следует обновиться.</translation>
+    </message>
     <message>
         <source>You need to rebuild the database using -reindex-chainstate to change -txindex</source>
         <translation>Вам необходимо пересобрать базы данных с помощью -reindex-chainstate, чтобы изменить -txindex</translation>
@@ -3117,6 +3177,10 @@
         <source>Cannot resolve -%s address: '%s'</source>
         <translation>Не удаётся разрешить адрес в параметре -%s: '%s'</translation>
     </message>
+    <message>
+        <source>Chain selection options:</source>
+        <translation>Параметры выбора цепочки:</translation>
+    </message>
     <message>
         <source>Change index out of range</source>
         <translation>Изменение индекса вне диапазона</translation>
@@ -3313,6 +3377,10 @@
         <source>Use UPnP to map the listening port (default: %u)</source>
         <translation>Использовать UPnP для проброса порта (по умолчанию: %u)</translation>
     </message>
+    <message>
+        <source>Use the test chain</source>
+        <translation>Использовать тестовую цепочку</translation>
+    </message>
     <message>
         <source>User Agent comment (%s) contains unsafe characters.</source>
         <translation>Комментарий пользователя (%s) содержит небезопасные символы.</translation>
@@ -3645,10 +3713,6 @@
         <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: %s)</source>
         <translation>Использовать отдельный прокси SOCKS5 для соединения с участниками через скрытые сервисы Tor (по умолчанию: %s)</translation>
     </message>
-    <message>
-        <source>Username and hashed password for JSON-RPC connections. The field &lt;userpw&gt; comes in the format: &lt;USERNAME&gt;:&lt;SALT&gt;$&lt;HASH&gt;. A canonical python script is included in share/rpcuser. This option can be specified multiple times</source>
-        <translation>Имя пользователя и хэш пароля для JSON-RPC соединений. Поле &lt;userpw&gt; использует формат: &lt;USERNAME&gt;:&lt;SALT&gt;$&lt;HASH&gt;. Каноничный пример скрипта на питоне включен в "share/rpcuser". Эта опция может быть указана несколько раз</translation>
-    </message>
     <message>
         <source>Warning: Unknown block versions being mined! It's possible unknown rules are in effect</source>
         <translation>Внимание: Получена неизвестная версия блока! Возможно неизвестные правила вступили в силу.</translation>
diff --git a/src/qt/locale/bitcoin_sk.ts b/src/qt/locale/bitcoin_sk.ts
index 6c5828c4f830e..15a32b2050176 100644
--- a/src/qt/locale/bitcoin_sk.ts
+++ b/src/qt/locale/bitcoin_sk.ts
@@ -2294,10 +2294,6 @@
         <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: %s)</source>
         <translation>Použiť samostatný SOCKS5 proxy server na dosiahnutie počítačov cez skryté služby Tor (predvolené: %s)</translation>
     </message>
-    <message>
-        <source>Username and hashed password for JSON-RPC connections. The field &lt;userpw&gt; comes in the format: &lt;USERNAME&gt;:&lt;SALT&gt;$&lt;HASH&gt;. A canonical python script is included in share/rpcuser. This option can be specified multiple times</source>
-        <translation>Užívateľské hash meno a heslo pre JSON-RPC pripojenia. Pole &lt;userpw&gt; je vo formáte &lt;USERNAME&gt;:&lt;SALT&gt;$&lt;HASH&gt;. Kanonický python skript je zahrnutý v share/rpcuser. Toto nastavenie môže byť špecifikované viac krát</translation>
-    </message>
     <message>
         <source>Warning: Unknown block versions being mined! It's possible unknown rules are in effect</source>
         <translation>Varovanie: Neznáma verzia blokov sa doluje! Je možné, že neznáme pravidlá majú efekt</translation>
diff --git a/src/qt/locale/bitcoin_sv.ts b/src/qt/locale/bitcoin_sv.ts
index cc6b47e4d63f2..4d45d20cbfb76 100644
--- a/src/qt/locale/bitcoin_sv.ts
+++ b/src/qt/locale/bitcoin_sv.ts
@@ -2646,10 +2646,6 @@ Var vänlig och försök igen.</translation>
         <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: %s)</source>
         <translation>Använd separat SOCKS5 proxy för att nå kollegor via dolda tjänster i Tor (förvalt: -%s)</translation>
     </message>
-    <message>
-        <source>Username and hashed password for JSON-RPC connections. The field &lt;userpw&gt; comes in the format: &lt;USERNAME&gt;:&lt;SALT&gt;$&lt;HASH&gt;. A canonical python script is included in share/rpcuser. This option can be specified multiple times</source>
-        <translation>Användarnamn och hashat lösenord för JSON-RPC-anslutningar. Fältet &lt;userpw&gt; kommer i formatet: &lt;USERNAME&gt;:&lt;SALT&gt;$&lt;HASH&gt;. Ett kanoniskt pythonskript finns inkluderat i share/rpcuser. Detta alternativ kan anges flera gånger</translation>
-    </message>
     <message>
         <source>Warning: Unknown block versions being mined! It's possible unknown rules are in effect</source>
         <translation>Varning: Okända blockversioner bryts! Det är möjligt att okända regler används</translation>
diff --git a/src/qt/locale/bitcoin_tr.ts b/src/qt/locale/bitcoin_tr.ts
index b210d0199065a..d1249d09be056 100644
--- a/src/qt/locale/bitcoin_tr.ts
+++ b/src/qt/locale/bitcoin_tr.ts
@@ -2577,10 +2577,6 @@
         <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: %s)</source>
         <translation>Eşlere gizli Tor servisleri ile ulaşmak için ayrı SOCKS5 vekil sunucusu kullan (varsayılan: %s)</translation>
     </message>
-    <message>
-        <source>Username and hashed password for JSON-RPC connections. The field &lt;userpw&gt; comes in the format: &lt;USERNAME&gt;:&lt;SALT&gt;$&lt;HASH&gt;. A canonical python script is included in share/rpcuser. This option can be specified multiple times</source>
-        <translation>JSON-RPC bağlantıları için kullanıcı ismi ve karmalanmış parola. &lt;userpw&gt; alanı şu biçimdedir: &lt;USERNAME&gt;:&lt;SALT&gt;$&lt;HASH&gt;. Kanonik bir Python betiği share/rpcuser klasöründe bulunabilir. Bu seçenek birden çok kez belirtilebilir.</translation>
-    </message>
     <message>
         <source>Warning: Unknown block versions being mined! It's possible unknown rules are in effect</source>
         <translation>İkaz: bilinmeyen blok sürümü oluşturulmaya çalışılıyor. Bilinmeyen kuralların işlemesi mümkündür.</translation>
diff --git a/src/qt/locale/bitcoin_uk.ts b/src/qt/locale/bitcoin_uk.ts
index e423977ebaf3a..9c46c18224793 100644
--- a/src/qt/locale/bitcoin_uk.ts
+++ b/src/qt/locale/bitcoin_uk.ts
@@ -2157,10 +2157,6 @@
         <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: %s)</source>
         <translation>Використовувати окремий SOCKS5-проксі для з'єднання з учасниками через приховані сервіси Tor (типово: %s)</translation>
     </message>
-    <message>
-        <source>Username and hashed password for JSON-RPC connections. The field &lt;userpw&gt; comes in the format: &lt;USERNAME&gt;:&lt;SALT&gt;$&lt;HASH&gt;. A canonical python script is included in share/rpcuser. This option can be specified multiple times</source>
-        <translation>Логін та хешований пароль для зв'язків JSON-RPC. Поле &lt;userpw&gt; має формат: &lt;USERNAME&gt;:&lt;SALT&gt;$&lt;HASH&gt;. Класичний Python script додано до share/rpcuser. Цей параметр може бути застосований декілька разів.</translation>
-    </message>
     <message>
         <source>(default: %s)</source>
         <translation>(типово: %s)</translation>
diff --git a/src/qt/locale/bitcoin_zh_CN.ts b/src/qt/locale/bitcoin_zh_CN.ts
index 41ec0574d5094..8267a4f0e3032 100644
--- a/src/qt/locale/bitcoin_zh_CN.ts
+++ b/src/qt/locale/bitcoin_zh_CN.ts
@@ -3505,10 +3505,6 @@
         <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: %s)</source>
         <translation>通过Tor隐藏服务连接节点时 使用不同的SOCKS5代理 (默认: %s)</translation>
     </message>
-    <message>
-        <source>Username and hashed password for JSON-RPC connections. The field &lt;userpw&gt; comes in the format: &lt;USERNAME&gt;:&lt;SALT&gt;$&lt;HASH&gt;. A canonical python script is included in share/rpcuser. This option can be specified multiple times</source>
-        <translation>JSON-RPC 连接要使用的用户名和散列密码。&lt;userpw&gt; 的格式是：&lt;用户名&gt;:&lt;盐&gt;$&lt;散列值&gt;。在 share/rpcuser 目录下有一个示范的 python 脚本。这个选项可以被多次指定。</translation>
-    </message>
     <message>
         <source>Warning: Unknown block versions being mined! It's possible unknown rules are in effect</source>
         <translation>警告: 未知的区块版本被挖掘！未知规则可能已生效</translation>
diff --git a/src/qt/locale/bitcoin_zh_TW.ts b/src/qt/locale/bitcoin_zh_TW.ts
index 44d596013b235..bdcf9662972af 100644
--- a/src/qt/locale/bitcoin_zh_TW.ts
+++ b/src/qt/locale/bitcoin_zh_TW.ts
@@ -3702,10 +3702,6 @@
         <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: %s)</source>
         <translation>使用另外的 SOCK5 代理伺服器，來透過 Tor 隱藏服務跟其他節點聯絡(預設值: %s)</translation>
     </message>
-    <message>
-        <source>Username and hashed password for JSON-RPC connections. The field &lt;userpw&gt; comes in the format: &lt;USERNAME&gt;:&lt;SALT&gt;$&lt;HASH&gt;. A canonical python script is included in share/rpcuser. This option can be specified multiple times</source>
-        <translation>JSON-RPC 連線要用的使用者名稱和雜湊密碼。&lt;userpw&gt; 的格式是：&lt;使用者名稱&gt;:&lt;調味值&gt;$&lt;雜湊值&gt;。在 share/rpcuser 目錄下有一個示範的 python 程式。這個選項可以給很多次。</translation>
-    </message>
     <message>
         <source>Warning: Unknown block versions being mined! It's possible unknown rules are in effect</source>
         <translation>警告: 有礦工正在開採不明版本的區塊！這表示有不明的交易規則正在作用中</translation>

From 1ccfe9b1c93460e3d345948c3740cfeca45e2ee3 Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Mon, 16 Jan 2017 22:58:06 -0500
Subject: [PATCH 1598/1802] Clarify comment about mempool/extra conflicts

---
 src/blockencodings.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/blockencodings.cpp b/src/blockencodings.cpp
index 48431cfb3c7b5..4a311cbba2a65 100644
--- a/src/blockencodings.cpp
+++ b/src/blockencodings.cpp
@@ -143,7 +143,8 @@ ReadStatus PartiallyDownloadedBlock::InitData(const CBlockHeaderAndShortTxIDs& c
                 mempool_count++;
                 extra_count++;
             } else {
-                // If we find two mempool txn that match the short id, just request it.
+                // If we find two mempool/extra txn that match the short id, just
+                // request it.
                 // This should be rare enough that the extra bandwidth doesn't matter,
                 // but eating a round-trip due to FillBlock failure would be annoying
                 // Note that we dont want duplication between extra_txn and mempool to

From c5945804ca7e5edd9fce8c6de9b1f0ef775f9e79 Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Mon, 16 Jan 2017 23:00:58 -0500
Subject: [PATCH 1599/1802] Add braces around AddToCompactExtraTransactions

---
 src/net_processing.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/net_processing.cpp b/src/net_processing.cpp
index 6025615e4405e..b1e606abaed91 100644
--- a/src/net_processing.cpp
+++ b/src/net_processing.cpp
@@ -1741,10 +1741,12 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
                 // See https://github.com/bitcoin/bitcoin/issues/8279 for details.
                 assert(recentRejects);
                 recentRejects->insert(tx.GetHash());
-                if (RecursiveDynamicUsage(*ptx) < 100000)
+                if (RecursiveDynamicUsage(*ptx) < 100000) {
                     AddToCompactExtraTransactions(ptx);
-            } else if (tx.HasWitness() && RecursiveDynamicUsage(*ptx) < 100000)
+                }
+            } else if (tx.HasWitness() && RecursiveDynamicUsage(*ptx) < 100000) {
                 AddToCompactExtraTransactions(ptx);
+            }
 
             if (pfrom->fWhitelisted && GetBoolArg("-whitelistforcerelay", DEFAULT_WHITELISTFORCERELAY)) {
                 // Always relay transactions received from whitelisted peers, even

From ee5c1ce5a6155d502d8e779d3490d6cf66374c3f Mon Sep 17 00:00:00 2001
From: Karl-Johan Alm <karljohan-alm@garage.co.jp>
Date: Wed, 11 Jan 2017 15:31:16 +0900
Subject: [PATCH 1600/1802] Bug-fix: listsinceblock: use closest common
 ancestor when a block hash was provided for a chain that was not the main
 chain.

---
 src/wallet/rpcwallet.cpp | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index 2428ef04e2217..f99aed519aa1f 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -1679,7 +1679,7 @@ UniValue listsinceblock(const JSONRPCRequest& request)
 
     LOCK2(cs_main, pwalletMain->cs_wallet);
 
-    CBlockIndex *pindex = NULL;
+    const CBlockIndex *pindex = NULL;
     int target_confirms = 1;
     isminefilter filter = ISMINE_SPENDABLE;
 
@@ -1690,7 +1690,16 @@ UniValue listsinceblock(const JSONRPCRequest& request)
         blockId.SetHex(request.params[0].get_str());
         BlockMap::iterator it = mapBlockIndex.find(blockId);
         if (it != mapBlockIndex.end())
+        {
             pindex = it->second;
+            if (chainActive[pindex->nHeight] != pindex)
+            {
+                // the block being asked for is a part of a deactivated chain;
+                // we don't want to depend on its perceived height in the block
+                // chain, we want to instead use the last common ancestor
+                pindex = chainActive.FindFork(pindex);
+            }
+        }
     }
 
     if (request.params.size() > 1)
@@ -1701,9 +1710,10 @@ UniValue listsinceblock(const JSONRPCRequest& request)
             throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid parameter");
     }
 
-    if(request.params.size() > 2)
-        if(request.params[2].get_bool())
-            filter = filter | ISMINE_WATCH_ONLY;
+    if (request.params.size() > 2 && request.params[2].get_bool())
+    {
+        filter = filter | ISMINE_WATCH_ONLY;
+    }
 
     int depth = pindex ? (1 + chainActive.Height() - pindex->nHeight) : -1;
 

From 7ba0a00aae03b438e63d0ada9ff68a7618c7f907 Mon Sep 17 00:00:00 2001
From: Karl-Johan Alm <karljohan-alm@garage.co.jp>
Date: Wed, 11 Jan 2017 20:02:25 +0900
Subject: [PATCH 1601/1802] Testing: listsinceblock should not use orphan block
 height.

---
 qa/pull-tester/rpc-tests.py    |  1 +
 qa/rpc-tests/listsinceblock.py | 80 ++++++++++++++++++++++++++++++++++
 2 files changed, 81 insertions(+)
 create mode 100755 qa/rpc-tests/listsinceblock.py

diff --git a/qa/pull-tester/rpc-tests.py b/qa/pull-tester/rpc-tests.py
index 83b6bdfe48793..f3aa34a44d891 100755
--- a/qa/pull-tester/rpc-tests.py
+++ b/qa/pull-tester/rpc-tests.py
@@ -152,6 +152,7 @@
     'nulldummy.py',
     'import-rescan.py',
     'rpcnamedargs.py',
+    'listsinceblock.py',
 ]
 if ENABLE_ZMQ:
     testScripts.append('zmq_test.py')
diff --git a/qa/rpc-tests/listsinceblock.py b/qa/rpc-tests/listsinceblock.py
new file mode 100755
index 0000000000000..ca67b8ecebbaa
--- /dev/null
+++ b/qa/rpc-tests/listsinceblock.py
@@ -0,0 +1,80 @@
+#!/usr/bin/env python3
+# Copyright (c) 2017 The Bitcoin Core developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+from test_framework.test_framework import BitcoinTestFramework
+from test_framework.util import assert_equal
+
+class ListSinceBlockTest (BitcoinTestFramework):
+
+    def __init__(self):
+        super().__init__()
+        self.setup_clean_chain = True
+        self.num_nodes = 4
+
+    def run_test (self):
+        '''
+        `listsinceblock` did not behave correctly when handed a block that was
+        no longer in the main chain:
+
+             ab0
+          /       \
+        aa1 [tx0]   bb1
+         |           |
+        aa2         bb2
+         |           |
+        aa3         bb3
+                     |
+                    bb4
+
+        Consider a client that has only seen block `aa3` above. It asks the node
+        to `listsinceblock aa3`. But at some point prior the main chain switched
+        to the bb chain.
+
+        Previously: listsinceblock would find height=4 for block aa3 and compare
+        this to height=5 for the tip of the chain (bb4). It would then return
+        results restricted to bb3-bb4.
+
+        Now: listsinceblock finds the fork at ab0 and returns results in the
+        range bb1-bb4.
+
+        This test only checks that [tx0] is present.
+        '''
+
+        assert_equal(self.is_network_split, False)
+        self.nodes[2].generate(101)
+        self.sync_all()
+
+        assert_equal(self.nodes[0].getbalance(), 0)
+        assert_equal(self.nodes[1].getbalance(), 0)
+        assert_equal(self.nodes[2].getbalance(), 50)
+        assert_equal(self.nodes[3].getbalance(), 0)
+
+        # Split network into two
+        self.split_network()
+        assert_equal(self.is_network_split, True)
+
+        # send to nodes[0] from nodes[2]
+        senttx = self.nodes[2].sendtoaddress(self.nodes[0].getnewaddress(), 1)
+
+        # generate on both sides
+        lastblockhash = self.nodes[1].generate(6)[5]
+        self.nodes[2].generate(7)
+        print('lastblockhash=%s' % (lastblockhash))
+
+        self.sync_all()
+
+        self.join_network()
+
+        # listsinceblock(lastblockhash) should now include tx, as seen from nodes[0]
+        lsbres = self.nodes[0].listsinceblock(lastblockhash)
+        found = False
+        for tx in lsbres['transactions']:
+            if tx['txid'] == senttx:
+                found = True
+                break
+        assert_equal(found, True)
+
+if __name__ == '__main__':
+    ListSinceBlockTest().main()

From c70622e942a5da9a7afce32ba71447745ceefa45 Mon Sep 17 00:00:00 2001
From: John Newbery <john@johnnewbery.com>
Date: Fri, 13 Jan 2017 09:47:21 -0500
Subject: [PATCH 1602/1802] Docs: Update CONTRIBUTING.md

Update CONTRIBUTING.md to document the different components.

Notably, trivial should only be used for PRs that do not change the
code.
---
 CONTRIBUTING.md | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 06fcd8dd81301..47648cde22e40 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -53,7 +53,28 @@ about Git.
   - Create pull request
 
 The title of the pull request should be prefixed by the component or area that
-the pull request affects. Examples:
+the pull request affects. Valid areas as:
+
+  - *Consensus* for changes to consensus critical code
+  - *Docs* for changes to the documentation
+  - *Qt* for changes to bitcoin-qt
+  - *Mining* for changes to the mining code
+  - *Net* or *P2P* for changes to the peer-to-peer network code
+  - *RPC/REST/ZMQ* for changes to the RPC, REST or ZMQ APIs
+  - *Scripts and tools* for changes to the scripts and tools
+  - *Tests* for changes to the bitcoin unit tests or QA tests
+  - *Trivial* should **only** be used for PRs that do not change generated
+    executable code. Notably, refactors (change of function arguments and code
+    reorganization) and changes in behavior should **not** be marked as trivial.
+    Examples of trivial PRs are changes to:
+    - comments
+    - whitespace
+    - variable names
+    - logging and messages
+  - *Utils and libraries* for changes to the utils and libraries
+  - *Wallet* for changes to the wallet code
+
+Examples:
 
     Consensus: Add new opcode for BIP-XXXX OP_CHECKAWESOMESIG
     Net: Automatically create hidden service, listen on Tor

From c36ec715f06d212381e0edfa4344514f1a575701 Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Tue, 17 Jan 2017 22:37:40 -0500
Subject: [PATCH 1603/1802] depends: qt: disable printer for all platforms, not
 just osx

This also fixes the native osx build.
---
 depends/packages/qt.mk            | 2 ++
 depends/patches/qt/mac-qmake.conf | 1 -
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/depends/packages/qt.mk b/depends/packages/qt.mk
index 383ef2dae617c..6e38d1ac6a517 100644
--- a/depends/packages/qt.mk
+++ b/depends/packages/qt.mk
@@ -78,6 +78,8 @@ $(package)_config_opts += -reduce-exports
 $(package)_config_opts += -static
 $(package)_config_opts += -silent
 $(package)_config_opts += -v
+$(package)_config_opts += -no-feature-printer
+$(package)_config_opts += -no-feature-printdialog
 
 ifneq ($(build_os),darwin)
 $(package)_config_opts_darwin = -xplatform macx-clang-linux
diff --git a/depends/patches/qt/mac-qmake.conf b/depends/patches/qt/mac-qmake.conf
index 402e0555b0130..f565fe3e75d13 100644
--- a/depends/patches/qt/mac-qmake.conf
+++ b/depends/patches/qt/mac-qmake.conf
@@ -1,6 +1,5 @@
 MAKEFILE_GENERATOR = UNIX
 CONFIG += app_bundle incremental global_init_link_order lib_version_first plugin_no_soname absolute_library_soname
-DEFINES += QT_NO_PRINTER QT_NO_PRINTDIALOG
 QMAKE_INCREMENTAL_STYLE = sublib
 include(../common/macx.conf)
 include(../common/gcc-base-mac.conf)

From 40ec7c7b0d2a5a37de90635b676b16884b622dd6 Mon Sep 17 00:00:00 2001
From: Jonas Schnelli <dev@jonasschnelli.ch>
Date: Tue, 3 Jan 2017 15:09:57 +0100
Subject: [PATCH 1604/1802] [Qt] Improve progress display during headers-sync
 and peer-finding

---
 src/qt/bitcoingui.cpp | 14 ++++++++++++--
 src/qt/bitcoingui.h   |  2 ++
 src/qt/clientmodel.h  |  2 +-
 src/qt/modaloverlay.h |  3 +++
 4 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp
index 651ff842930f0..cd790c60850a7 100644
--- a/src/qt/bitcoingui.cpp
+++ b/src/qt/bitcoingui.cpp
@@ -748,6 +748,15 @@ void BitcoinGUI::setNetworkActive(bool networkActive)
     updateNetworkState();
 }
 
+void BitcoinGUI::updateHeadersSyncProgressLabel()
+{
+    int64_t headersTipTime = clientModel->getHeaderTipTime();
+    int headersTipHeight = clientModel->getHeaderTipHeight();
+    int estHeadersLeft = (GetTime() - headersTipTime)/600;
+    if (estHeadersLeft > REQ_HEADER_HEIGHT_DELTA_SYNC)
+        progressBarLabel->setText(tr("Syncing Headers (%1%)...").arg(QString::number(100.0 / (headersTipHeight+estHeadersLeft)*headersTipHeight, 'f', 1)));
+}
+
 void BitcoinGUI::setNumBlocks(int count, const QDateTime& blockDate, double nVerificationProgress, bool header)
 {
     if (modalOverlay)
@@ -768,9 +777,11 @@ void BitcoinGUI::setNumBlocks(int count, const QDateTime& blockDate, double nVer
     switch (blockSource) {
         case BLOCK_SOURCE_NETWORK:
             if (header) {
+                updateHeadersSyncProgressLabel();
                 return;
             }
             progressBarLabel->setText(tr("Synchronizing with network..."));
+            updateHeadersSyncProgressLabel();
             break;
         case BLOCK_SOURCE_DISK:
             if (header) {
@@ -786,8 +797,7 @@ void BitcoinGUI::setNumBlocks(int count, const QDateTime& blockDate, double nVer
             if (header) {
                 return;
             }
-            // Case: not Importing, not Reindexing and no network connection
-            progressBarLabel->setText(tr("No block source available..."));
+            progressBarLabel->setText(tr("Connecting to peers..."));
             break;
     }
 
diff --git a/src/qt/bitcoingui.h b/src/qt/bitcoingui.h
index 59540bfe6baa7..5c7851c566def 100644
--- a/src/qt/bitcoingui.h
+++ b/src/qt/bitcoingui.h
@@ -149,6 +149,8 @@ class BitcoinGUI : public QMainWindow
     /** Update UI with latest network info from model. */
     void updateNetworkState();
 
+    void updateHeadersSyncProgressLabel();
+
 Q_SIGNALS:
     /** Signal raised when a URI was entered or dragged to the GUI */
     void receivedURI(const QString &uri);
diff --git a/src/qt/clientmodel.h b/src/qt/clientmodel.h
index a641401425498..c495f621073dd 100644
--- a/src/qt/clientmodel.h
+++ b/src/qt/clientmodel.h
@@ -66,7 +66,7 @@ class ClientModel : public QObject
 
     //! Return true if core is doing initial block download
     bool inInitialBlockDownload() const;
-    //! Return true if core is importing blocks
+    //! Returns enum BlockSource of the current importing/syncing state
     enum BlockSource getBlockSource() const;
     //! Return true if network activity in core is enabled
     bool getNetworkActive() const;
diff --git a/src/qt/modaloverlay.h b/src/qt/modaloverlay.h
index 70d37b87add81..6d1f12164ef1f 100644
--- a/src/qt/modaloverlay.h
+++ b/src/qt/modaloverlay.h
@@ -8,6 +8,9 @@
 #include <QDateTime>
 #include <QWidget>
 
+//! The required delta of headers to the estimated number of available headers until we show the IBD progress
+static const int REQ_HEADER_HEIGHT_DELTA_SYNC = 24;
+
 namespace Ui {
     class ModalOverlay;
 }

From fc089ae47a3773b35111b4abdcac8192aead4578 Mon Sep 17 00:00:00 2001
From: James White <jamesmacwhite@users.noreply.github.com>
Date: Sat, 14 Jan 2017 08:26:31 +0000
Subject: [PATCH 1605/1802] Add IPv6 support to qos.sh

---
 contrib/qos/README.md |  4 ++--
 contrib/qos/tc.sh     | 30 ++++++++++++++++++++++--------
 2 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/contrib/qos/README.md b/contrib/qos/README.md
index 5e0a975fc64ff..0ded87c58f4ee 100644
--- a/contrib/qos/README.md
+++ b/contrib/qos/README.md
@@ -1,5 +1,5 @@
-### Qos ###
+### QoS (Quality of service) ###
 
-This is a Linux bash script that will set up tc to limit the outgoing bandwidth for connections to the Bitcoin network. It limits outbound TCP traffic with a source or destination port of 8333, but not if the destination IP is within a LAN (defined as 192.168.x.x).
+This is a Linux bash script that will set up tc to limit the outgoing bandwidth for connections to the Bitcoin network. It limits outbound TCP traffic with a source or destination port of 8333, but not if the destination IP is within a LAN.
 
 This means one can have an always-on bitcoind instance running, and another local bitcoind/bitcoin-qt instance which connects to this node and receives blocks from it.
diff --git a/contrib/qos/tc.sh b/contrib/qos/tc.sh
index aaf5e1fa11ed7..0d1dd65b4f58f 100644
--- a/contrib/qos/tc.sh
+++ b/contrib/qos/tc.sh
@@ -1,4 +1,4 @@
-# Copyright (c) 2013 The Bitcoin Core developers
+# Copyright (c) 2017 The Bitcoin Core developers
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
@@ -8,8 +8,10 @@ IF="eth0"
 LINKCEIL="1gbit"
 #limit outbound Bitcoin protocol traffic to this rate
 LIMIT="160kbit"
-#defines the address space for which you wish to disable rate limiting
-LOCALNET="192.168.0.0/16"
+#defines the IPv4 address space for which you wish to disable rate limiting
+LOCALNET_V4="192.168.0.0/16"
+#defines the IPv6 address space for which you wish to disable rate limiting
+LOCALNET_V6="fe80::/10"
 
 #delete existing rules
 tc qdisc del dev ${IF} root
@@ -28,6 +30,12 @@ tc class add dev ${IF} parent 1:1 classid 1:11 htb rate ${LIMIT} ceil ${LIMIT} p
 tc filter add dev ${IF} parent 1: protocol ip prio 1 handle 1 fw classid 1:10
 tc filter add dev ${IF} parent 1: protocol ip prio 2 handle 2 fw classid 1:11
 
+if [ ! -z "${LOCALNET_V6}" ] ; then
+	# v6 cannot have the same priority value as v4
+	tc filter add dev ${IF} parent 1: protocol ipv6 prio 3 handle 1 fw classid 1:10
+	tc filter add dev ${IF} parent 1: protocol ipv6 prio 4 handle 2 fw classid 1:11
+fi
+
 #delete any existing rules
 #disable for now
 #ret=0
@@ -37,9 +45,15 @@ tc filter add dev ${IF} parent 1: protocol ip prio 2 handle 2 fw classid 1:11
 #done
 
 #limit outgoing traffic to and from port 8333. but not when dealing with a host on the local network
-#	(defined by $LOCALNET)
-#	--set-mark marks packages matching these criteria with the number "2"
-#	these packages are filtered by the tc filter with "handle 2"
+#	(defined by $LOCALNET_V4 and $LOCALNET_V6)
+#	--set-mark marks packages matching these criteria with the number "2" (v4)
+#	--set-mark marks packages matching these criteria with the number "4" (v6)
+#	these packets are filtered by the tc filter with "handle 2"
 #	this filter sends the packages into the 1:11 class, and this class is limited to ${LIMIT}
-iptables -t mangle -A OUTPUT -p tcp -m tcp --dport 8333 ! -d ${LOCALNET} -j MARK --set-mark 0x2
-iptables -t mangle -A OUTPUT -p tcp -m tcp --sport 8333 ! -d ${LOCALNET} -j MARK --set-mark 0x2
+iptables -t mangle -A OUTPUT -p tcp -m tcp --dport 8333 ! -d ${LOCALNET_V4} -j MARK --set-mark 0x2
+iptables -t mangle -A OUTPUT -p tcp -m tcp --sport 8333 ! -d ${LOCALNET_V4} -j MARK --set-mark 0x2
+
+if [ ! -z "${LOCALNET_V6}" ] ; then
+	ip6tables -t mangle -A OUTPUT -p tcp -m tcp --dport 8333 ! -d ${LOCALNET_V6} -j MARK --set-mark 0x4
+	ip6tables -t mangle -A OUTPUT -p tcp -m tcp --sport 8333 ! -d ${LOCALNET_V6} -j MARK --set-mark 0x4
+fi

From 52dde66770d833ee5e42e7c5fee610453ae3852a Mon Sep 17 00:00:00 2001
From: Russell Yanofsky <russ@yanofsky.org>
Date: Tue, 17 Jan 2017 10:40:41 -0500
Subject: [PATCH 1606/1802] [wallet] Add include_unsafe argument to listunspent
 RPC

---
 src/rpc/server.cpp       | 14 +++++++++-----
 src/rpc/server.h         |  5 +++++
 src/wallet/rpcwallet.cpp | 31 ++++++++++++++++++++++---------
 3 files changed, 36 insertions(+), 14 deletions(-)

diff --git a/src/rpc/server.cpp b/src/rpc/server.cpp
index 1b94e100718de..283d458c8df90 100644
--- a/src/rpc/server.cpp
+++ b/src/rpc/server.cpp
@@ -79,16 +79,20 @@ void RPCTypeCheck(const UniValue& params,
             break;
 
         const UniValue& v = params[i];
-        if (!((v.type() == t) || (fAllowNull && (v.isNull()))))
-        {
-            string err = strprintf("Expected type %s, got %s",
-                                   uvTypeName(t), uvTypeName(v.type()));
-            throw JSONRPCError(RPC_TYPE_ERROR, err);
+        if (!(fAllowNull && v.isNull())) {
+            RPCTypeCheckArgument(v, t);
         }
         i++;
     }
 }
 
+void RPCTypeCheckArgument(const UniValue& value, UniValue::VType typeExpected)
+{
+    if (value.type() != typeExpected) {
+        throw JSONRPCError(RPC_TYPE_ERROR, strprintf("Expected type %s, got %s", uvTypeName(typeExpected), uvTypeName(value.type())));
+    }
+}
+
 void RPCTypeCheckObj(const UniValue& o,
     const map<string, UniValueType>& typesExpected,
     bool fAllowNull,
diff --git a/src/rpc/server.h b/src/rpc/server.h
index fed3d8c90f98e..52f82866dc0c2 100644
--- a/src/rpc/server.h
+++ b/src/rpc/server.h
@@ -78,6 +78,11 @@ bool RPCIsInWarmup(std::string *statusOut);
 void RPCTypeCheck(const UniValue& params,
                   const std::list<UniValue::VType>& typesExpected, bool fAllowNull=false);
 
+/**
+ * Type-check one argument; throws JSONRPCError if wrong type given.
+ */
+void RPCTypeCheckArgument(const UniValue& value, UniValue::VType typeExpected);
+
 /*
   Check for expected keys/value types in an Object.
 */
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index 4dda480216bdd..ffe0827befc2d 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -2350,9 +2350,9 @@ UniValue listunspent(const JSONRPCRequest& request)
     if (!EnsureWalletIsAvailable(request.fHelp))
         return NullUniValue;
 
-    if (request.fHelp || request.params.size() > 3)
+    if (request.fHelp || request.params.size() > 4)
         throw runtime_error(
-            "listunspent ( minconf maxconf  [\"addresses\",...] )\n"
+            "listunspent ( minconf maxconf  [\"addresses\",...] [include_unsafe] )\n"
             "\nReturns array of unspent transaction outputs\n"
             "with between minconf and maxconf (inclusive) confirmations.\n"
             "Optionally filter to only include txouts paid to specified addresses.\n"
@@ -2364,6 +2364,10 @@ UniValue listunspent(const JSONRPCRequest& request)
             "      \"address\"   (string) bitcoin address\n"
             "      ,...\n"
             "    ]\n"
+            "4. include_unsafe (bool, optional, default=true) Include outputs that are not safe to spend\n"
+            "                  because they come from unconfirmed untrusted transactions or unconfirmed\n"
+            "                  replacement transactions (cases where we are less sure that a conflicting\n"
+            "                  transaction won't be mined).\n"
             "\nResult\n"
             "[                   (array of json object)\n"
             "  {\n"
@@ -2387,18 +2391,21 @@ UniValue listunspent(const JSONRPCRequest& request)
             + HelpExampleRpc("listunspent", "6, 9999999 \"[\\\"1PGFqEzfmQch1gKD3ra4k18PNj3tTUUSqg\\\",\\\"1LtvqCaApEdUGFkpKMM4MstjcaL4dKg8SP\\\"]\"")
         );
 
-    RPCTypeCheck(request.params, boost::assign::list_of(UniValue::VNUM)(UniValue::VNUM)(UniValue::VARR));
-
     int nMinDepth = 1;
-    if (request.params.size() > 0)
+    if (request.params.size() > 0 && !request.params[0].isNull()) {
+        RPCTypeCheckArgument(request.params[0], UniValue::VNUM);
         nMinDepth = request.params[0].get_int();
+    }
 
     int nMaxDepth = 9999999;
-    if (request.params.size() > 1)
+    if (request.params.size() > 1 && !request.params[1].isNull()) {
+        RPCTypeCheckArgument(request.params[1], UniValue::VNUM);
         nMaxDepth = request.params[1].get_int();
+    }
 
     set<CBitcoinAddress> setAddress;
-    if (request.params.size() > 2) {
+    if (request.params.size() > 2 && !request.params[2].isNull()) {
+        RPCTypeCheckArgument(request.params[2], UniValue::VARR);
         UniValue inputs = request.params[2].get_array();
         for (unsigned int idx = 0; idx < inputs.size(); idx++) {
             const UniValue& input = inputs[idx];
@@ -2411,11 +2418,17 @@ UniValue listunspent(const JSONRPCRequest& request)
         }
     }
 
+    bool include_unsafe = true;
+    if (request.params.size() > 3 && !request.params[3].isNull()) {
+        RPCTypeCheckArgument(request.params[3], UniValue::VBOOL);
+        include_unsafe = request.params[3].get_bool();
+    }
+
     UniValue results(UniValue::VARR);
     vector<COutput> vecOutputs;
     assert(pwalletMain != NULL);
     LOCK2(cs_main, pwalletMain->cs_wallet);
-    pwalletMain->AvailableCoins(vecOutputs, false, NULL, true);
+    pwalletMain->AvailableCoins(vecOutputs, !include_unsafe, NULL, true);
     BOOST_FOREACH(const COutput& out, vecOutputs) {
         if (out.nDepth < nMinDepth || out.nDepth > nMaxDepth)
             continue;
@@ -2629,7 +2642,7 @@ static const CRPCCommand commands[] =
     { "wallet",             "listreceivedbyaddress",    &listreceivedbyaddress,    false,  {"minconf","include_empty","include_watchonly"} },
     { "wallet",             "listsinceblock",           &listsinceblock,           false,  {"blockhash","target_confirmations","include_watchonly"} },
     { "wallet",             "listtransactions",         &listtransactions,         false,  {"account","count","skip","include_watchonly"} },
-    { "wallet",             "listunspent",              &listunspent,              false,  {"minconf","maxconf","addresses"} },
+    { "wallet",             "listunspent",              &listunspent,              false,  {"minconf","maxconf","addresses","include_unsafe"} },
     { "wallet",             "lockunspent",              &lockunspent,              true,   {"unlock","transactions"} },
     { "wallet",             "move",                     &movecmd,                  false,  {"fromaccount","toaccount","amount","minconf","comment"} },
     { "wallet",             "sendfrom",                 &sendfrom,                 false,  {"fromaccount","toaddress","amount","minconf","comment","comment_to"} },

From cc0243ad32cee1cc9faab317364b889beaf07647 Mon Sep 17 00:00:00 2001
From: mrbandrews <bandrewsny@gmail.com>
Date: Fri, 9 Dec 2016 13:45:27 -0500
Subject: [PATCH 1607/1802] [RPC] bumpfee

This command allows a user to increase the fee on a wallet transaction T, creating a "bumper" transaction B.
T must signal that it is BIP-125 replaceable.
T's change output is decremented to pay the additional fee.  (B will not add inputs to T.)
T cannot have any descendant transactions.
Once B bumps T, neither T nor B's outputs can be spent until either T or (more likely) B is mined.

Includes code by @jonasschnelli and @ryanofsky
---
 qa/pull-tester/rpc-tests.py |   1 +
 qa/rpc-tests/bumpfee.py     | 317 ++++++++++++++++++++++++++++++++++++
 src/rpc/client.cpp          |   1 +
 src/wallet/rpcwallet.cpp    | 258 +++++++++++++++++++++++++++++
 src/wallet/wallet.cpp       |  67 ++++++++
 src/wallet/wallet.h         |   6 +
 6 files changed, 650 insertions(+)
 create mode 100755 qa/rpc-tests/bumpfee.py

diff --git a/qa/pull-tester/rpc-tests.py b/qa/pull-tester/rpc-tests.py
index 83b6bdfe48793..c87d3c71278cd 100755
--- a/qa/pull-tester/rpc-tests.py
+++ b/qa/pull-tester/rpc-tests.py
@@ -151,6 +151,7 @@
     'signmessages.py',
     'nulldummy.py',
     'import-rescan.py',
+    'bumpfee.py',
     'rpcnamedargs.py',
 ]
 if ENABLE_ZMQ:
diff --git a/qa/rpc-tests/bumpfee.py b/qa/rpc-tests/bumpfee.py
new file mode 100755
index 0000000000000..0ebd79f7f32ef
--- /dev/null
+++ b/qa/rpc-tests/bumpfee.py
@@ -0,0 +1,317 @@
+#!/usr/bin/env python3
+# Copyright (c) 2016 The Bitcoin Core developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+from segwit import send_to_witness
+from test_framework.test_framework import BitcoinTestFramework
+from test_framework import blocktools
+from test_framework.mininode import CTransaction
+from test_framework.util import *
+from test_framework.util import *
+
+import io
+import time
+
+# Sequence number that is BIP 125 opt-in and BIP 68-compliant
+BIP125_SEQUENCE_NUMBER = 0xfffffffd
+
+WALLET_PASSPHRASE = "test"
+WALLET_PASSPHRASE_TIMEOUT = 3600
+
+
+class BumpFeeTest(BitcoinTestFramework):
+    def __init__(self):
+        super().__init__()
+        self.num_nodes = 2
+        self.setup_clean_chain = True
+
+    def setup_network(self, split=False):
+        extra_args = [["-debug", "-prematurewitness", "-walletprematurewitness", "-walletrbf={}".format(i)]
+                      for i in range(self.num_nodes)]
+        self.nodes = start_nodes(self.num_nodes, self.options.tmpdir, extra_args)
+
+        # Encrypt wallet for test_locked_wallet_fails test
+        self.nodes[1].encryptwallet(WALLET_PASSPHRASE)
+        bitcoind_processes[1].wait()
+        self.nodes[1] = start_node(1, self.options.tmpdir, extra_args[1])
+        self.nodes[1].walletpassphrase(WALLET_PASSPHRASE, WALLET_PASSPHRASE_TIMEOUT)
+
+        connect_nodes_bi(self.nodes, 0, 1)
+        self.is_network_split = False
+        self.sync_all()
+
+    def run_test(self):
+        peer_node, rbf_node = self.nodes
+        rbf_node_address = rbf_node.getnewaddress()
+
+        # fund rbf node with 10 coins of 0.001 btc (100,000 satoshis)
+        print("Mining blocks...")
+        peer_node.generate(110)
+        self.sync_all()
+        for i in range(25):
+            peer_node.sendtoaddress(rbf_node_address, 0.001)
+        self.sync_all()
+        peer_node.generate(1)
+        self.sync_all()
+        assert_equal(rbf_node.getbalance(), Decimal("0.025"))
+
+        print("Running tests")
+        dest_address = peer_node.getnewaddress()
+        test_small_output_fails(rbf_node, dest_address)
+        test_dust_to_fee(rbf_node, dest_address)
+        test_simple_bumpfee_succeeds(rbf_node, peer_node, dest_address)
+        test_segwit_bumpfee_succeeds(rbf_node, dest_address)
+        test_nonrbf_bumpfee_fails(peer_node, dest_address)
+        test_notmine_bumpfee_fails(rbf_node, peer_node, dest_address)
+        test_bumpfee_with_descendant_fails(rbf_node, rbf_node_address, dest_address)
+        test_settxfee(rbf_node, dest_address)
+        test_rebumping(rbf_node, dest_address)
+        test_rebumping_not_replaceable(rbf_node, dest_address)
+        test_unconfirmed_not_spendable(rbf_node, rbf_node_address)
+        test_locked_wallet_fails(rbf_node, dest_address)
+        print("Success")
+
+
+def test_simple_bumpfee_succeeds(rbf_node, peer_node, dest_address):
+    rbfid = create_fund_sign_send(rbf_node, {dest_address: 0.00090000})
+    rbftx = rbf_node.gettransaction(rbfid)
+    sync_mempools((rbf_node, peer_node))
+    assert rbfid in rbf_node.getrawmempool() and rbfid in peer_node.getrawmempool()
+    bumped_tx = rbf_node.bumpfee(rbfid)
+    assert bumped_tx["fee"] - abs(rbftx["fee"]) > 0
+    # check that bumped_tx propogates, original tx was evicted and has a wallet conflict
+    sync_mempools((rbf_node, peer_node))
+    assert bumped_tx["txid"] in rbf_node.getrawmempool()
+    assert bumped_tx["txid"] in peer_node.getrawmempool()
+    assert rbfid not in rbf_node.getrawmempool()
+    assert rbfid not in peer_node.getrawmempool()
+    oldwtx = rbf_node.gettransaction(rbfid)
+    assert len(oldwtx["walletconflicts"]) > 0
+    # check wallet transaction replaces and replaced_by values
+    bumpedwtx = rbf_node.gettransaction(bumped_tx["txid"])
+    assert_equal(oldwtx["replaced_by_txid"], bumped_tx["txid"])
+    assert_equal(bumpedwtx["replaces_txid"], rbfid)
+
+
+def test_segwit_bumpfee_succeeds(rbf_node, dest_address):
+    # Create a transaction with segwit output, then create an RBF transaction
+    # which spends it, and make sure bumpfee can be called on it.
+
+    segwit_in = next(u for u in rbf_node.listunspent() if u["amount"] == Decimal("0.001"))
+    segwit_out = rbf_node.validateaddress(rbf_node.getnewaddress())
+    rbf_node.addwitnessaddress(segwit_out["address"])
+    segwitid = send_to_witness(
+        version=0,
+        node=rbf_node,
+        utxo=segwit_in,
+        pubkey=segwit_out["pubkey"],
+        encode_p2sh=False,
+        amount=Decimal("0.0009"),
+        sign=True)
+
+    rbfraw = rbf_node.createrawtransaction([{
+        'txid': segwitid,
+        'vout': 0,
+        "sequence": BIP125_SEQUENCE_NUMBER
+    }], {dest_address: Decimal("0.0005"),
+         get_change_address(rbf_node): Decimal("0.0003")})
+    rbfsigned = rbf_node.signrawtransaction(rbfraw)
+    rbfid = rbf_node.sendrawtransaction(rbfsigned["hex"])
+    assert rbfid in rbf_node.getrawmempool()
+
+    bumped_tx = rbf_node.bumpfee(rbfid)
+    assert bumped_tx["txid"] in rbf_node.getrawmempool()
+    assert rbfid not in rbf_node.getrawmempool()
+
+
+def test_nonrbf_bumpfee_fails(peer_node, dest_address):
+    # cannot replace a non RBF transaction (from node which did not enable RBF)
+    not_rbfid = create_fund_sign_send(peer_node, {dest_address: 0.00090000})
+    assert_raises_message(JSONRPCException, "not BIP 125 replaceable", peer_node.bumpfee, not_rbfid)
+
+
+def test_notmine_bumpfee_fails(rbf_node, peer_node, dest_address):
+    # cannot bump fee unless the tx has only inputs that we own.
+    # here, the rbftx has a peer_node coin and then adds a rbf_node input
+    # Note that this test depends upon the RPC code checking input ownership prior to change outputs
+    # (since it can't use fundrawtransaction, it lacks a proper change output)
+    utxos = [node.listunspent()[-1] for node in (rbf_node, peer_node)]
+    inputs = [{
+        "txid": utxo["txid"],
+        "vout": utxo["vout"],
+        "address": utxo["address"],
+        "sequence": BIP125_SEQUENCE_NUMBER
+    } for utxo in utxos]
+    output_val = sum(utxo["amount"] for utxo in utxos) - Decimal("0.001")
+    rawtx = rbf_node.createrawtransaction(inputs, {dest_address: output_val})
+    signedtx = rbf_node.signrawtransaction(rawtx)
+    signedtx = peer_node.signrawtransaction(signedtx["hex"])
+    rbfid = rbf_node.sendrawtransaction(signedtx["hex"])
+    assert_raises_message(JSONRPCException, "Transaction contains inputs that don't belong to this wallet",
+                          rbf_node.bumpfee, rbfid)
+
+
+def test_bumpfee_with_descendant_fails(rbf_node, rbf_node_address, dest_address):
+    # cannot bump fee if the transaction has a descendant
+    # parent is send-to-self, so we don't have to check which output is change when creating the child tx
+    parent_id = create_fund_sign_send(rbf_node, {rbf_node_address: 0.00050000})
+    tx = rbf_node.createrawtransaction([{"txid": parent_id, "vout": 0}], {dest_address: 0.00020000})
+    tx = rbf_node.signrawtransaction(tx)
+    txid = rbf_node.sendrawtransaction(tx["hex"])
+    assert_raises_message(JSONRPCException, "Transaction has descendants in the wallet", rbf_node.bumpfee, parent_id)
+
+
+def test_small_output_fails(rbf_node, dest_address):
+    # cannot bump fee with a too-small output
+    rbfid = spend_one_input(rbf_node,
+                            Decimal("0.00100000"),
+                            {dest_address: 0.00080000,
+                             get_change_address(rbf_node): Decimal("0.00010000")})
+    rbf_node.bumpfee(rbfid, {"totalFee": 20000})
+
+    rbfid = spend_one_input(rbf_node,
+                            Decimal("0.00100000"),
+                            {dest_address: 0.00080000,
+                             get_change_address(rbf_node): Decimal("0.00010000")})
+    assert_raises_message(JSONRPCException, "Change output is too small", rbf_node.bumpfee, rbfid, {"totalFee": 20001})
+
+
+def test_dust_to_fee(rbf_node, dest_address):
+    # check that if output is reduced to dust, it will be converted to fee
+    # the bumped tx sets fee=9900, but it converts to 10,000
+    rbfid = spend_one_input(rbf_node,
+                            Decimal("0.00100000"),
+                            {dest_address: 0.00080000,
+                             get_change_address(rbf_node): Decimal("0.00010000")})
+    fulltx = rbf_node.getrawtransaction(rbfid, 1)
+    bumped_tx = rbf_node.bumpfee(rbfid, {"totalFee": 19900})
+    full_bumped_tx = rbf_node.getrawtransaction(bumped_tx["txid"], 1)
+    assert_equal(bumped_tx["fee"], Decimal("0.00020000"))
+    assert_equal(len(fulltx["vout"]), 2)
+    assert_equal(len(full_bumped_tx["vout"]), 1)  #change output is eliminated
+
+
+def test_settxfee(rbf_node, dest_address):
+    # check that bumpfee reacts correctly to the use of settxfee (paytxfee)
+    # increase feerate by 2.5x, test that fee increased at least 2x
+    rbf_node.settxfee(Decimal("0.00001000"))
+    rbfid = create_fund_sign_send(rbf_node, {dest_address: 0.00090000})
+    rbftx = rbf_node.gettransaction(rbfid)
+    rbf_node.settxfee(Decimal("0.00002500"))
+    bumped_tx = rbf_node.bumpfee(rbfid)
+    assert bumped_tx["fee"] > 2 * abs(rbftx["fee"])
+    rbf_node.settxfee(Decimal("0.00000000"))  # unset paytxfee
+
+
+def test_rebumping(rbf_node, dest_address):
+    # check that re-bumping the original tx fails, but bumping the bumper succeeds
+    rbf_node.settxfee(Decimal("0.00001000"))
+    rbfid = create_fund_sign_send(rbf_node, {dest_address: 0.00090000})
+    bumped = rbf_node.bumpfee(rbfid, {"totalFee": 1000})
+    assert_raises_message(JSONRPCException, "already bumped", rbf_node.bumpfee, rbfid, {"totalFee": 2000})
+    rbf_node.bumpfee(bumped["txid"], {"totalFee": 2000})
+
+
+def test_rebumping_not_replaceable(rbf_node, dest_address):
+    # check that re-bumping a non-replaceable bump tx fails
+    rbfid = create_fund_sign_send(rbf_node, {dest_address: 0.00090000})
+    bumped = rbf_node.bumpfee(rbfid, {"totalFee": 10000, "replaceable": False})
+    assert_raises_message(JSONRPCException, "Transaction is not BIP 125 replaceable", rbf_node.bumpfee, bumped["txid"],
+                          {"totalFee": 20000})
+
+
+def test_unconfirmed_not_spendable(rbf_node, rbf_node_address):
+    # check that unconfirmed outputs from bumped transactions are not spendable
+    rbfid = create_fund_sign_send(rbf_node, {rbf_node_address: 0.00090000})
+    rbftx = rbf_node.gettransaction(rbfid)["hex"]
+    assert rbfid in rbf_node.getrawmempool()
+    bumpid = rbf_node.bumpfee(rbfid)["txid"]
+    assert bumpid in rbf_node.getrawmempool()
+    assert rbfid not in rbf_node.getrawmempool()
+
+    # check that outputs from the bump transaction are not spendable
+    # due to the replaces_txid check in CWallet::AvailableCoins
+    assert_equal([t for t in rbf_node.listunspent(minconf=0, include_unsafe=False) if t["txid"] == bumpid], [])
+
+    # submit a block with the rbf tx to clear the bump tx out of the mempool,
+    # then call abandon to make sure the wallet doesn't attempt to resubmit the
+    # bump tx, then invalidate the block so the rbf tx will be put back in the
+    # mempool. this makes it possible to check whether the rbf tx outputs are
+    # spendable before the rbf tx is confirmed.
+    block = submit_block_with_tx(rbf_node, rbftx)
+    rbf_node.abandontransaction(bumpid)
+    rbf_node.invalidateblock(block.hash)
+    assert bumpid not in rbf_node.getrawmempool()
+    assert rbfid in rbf_node.getrawmempool()
+
+    # check that outputs from the rbf tx are not spendable before the
+    # transaction is confirmed, due to the replaced_by_txid check in
+    # CWallet::AvailableCoins
+    assert_equal([t for t in rbf_node.listunspent(minconf=0, include_unsafe=False) if t["txid"] == rbfid], [])
+
+    # check that the main output from the rbf tx is spendable after confirmed
+    rbf_node.generate(1)
+    assert_equal(
+        sum(1 for t in rbf_node.listunspent(minconf=0, include_unsafe=False)
+            if t["txid"] == rbfid and t["address"] == rbf_node_address and t["spendable"]), 1)
+
+
+def test_locked_wallet_fails(rbf_node, dest_address):
+    rbfid = create_fund_sign_send(rbf_node, {dest_address: 0.00090000})
+    rbf_node.walletlock()
+    assert_raises_message(JSONRPCException, "Please enter the wallet passphrase with walletpassphrase first.",
+                          rbf_node.bumpfee, rbfid)
+
+
+def create_fund_sign_send(node, outputs):
+    rawtx = node.createrawtransaction([], outputs)
+    fundtx = node.fundrawtransaction(rawtx)
+    signedtx = node.signrawtransaction(fundtx["hex"])
+    txid = node.sendrawtransaction(signedtx["hex"])
+    return txid
+
+
+def spend_one_input(node, input_amount, outputs):
+    input = dict(sequence=BIP125_SEQUENCE_NUMBER, **next(u for u in node.listunspent() if u["amount"] == input_amount))
+    rawtx = node.createrawtransaction([input], outputs)
+    signedtx = node.signrawtransaction(rawtx)
+    txid = node.sendrawtransaction(signedtx["hex"])
+    return txid
+
+
+def get_change_address(node):
+    """Get a wallet change address.
+
+    There is no wallet RPC to access unused change addresses, so this creates a
+    dummy transaction, calls fundrawtransaction to give add an input and change
+    output, then returns the change address."""
+    dest_address = node.getnewaddress()
+    dest_amount = Decimal("0.00012345")
+    rawtx = node.createrawtransaction([], {dest_address: dest_amount})
+    fundtx = node.fundrawtransaction(rawtx)
+    info = node.decoderawtransaction(fundtx["hex"])
+    return next(address for out in info["vout"]
+                if out["value"] != dest_amount for address in out["scriptPubKey"]["addresses"])
+
+
+def submit_block_with_tx(node, tx):
+    ctx = CTransaction()
+    ctx.deserialize(io.BytesIO(hex_str_to_bytes(tx)))
+
+    tip = node.getbestblockhash()
+    height = node.getblockcount() + 1
+    block_time = node.getblockheader(tip)["mediantime"] + 1
+    block = blocktools.create_block(int(tip, 16), blocktools.create_coinbase(height), block_time)
+    block.vtx.append(ctx)
+    block.rehash()
+    block.hashMerkleRoot = block.calc_merkle_root()
+    block.solve()
+    error = node.submitblock(bytes_to_hex_str(block.serialize(True)))
+    if error is not None:
+        raise Exception(error)
+    return block
+
+
+if __name__ == "__main__":
+    BumpFeeTest().main()
diff --git a/src/rpc/client.cpp b/src/rpc/client.cpp
index 422d005f0ceb9..28d24b84fd76f 100644
--- a/src/rpc/client.cpp
+++ b/src/rpc/client.cpp
@@ -116,6 +116,7 @@ static const CRPCConvertParam vRPCConvertParams[] =
     { "setnetworkactive", 0, "state" },
     { "getmempoolancestors", 1, "verbose" },
     { "getmempooldescendants", 1, "verbose" },
+    { "bumpfee", 1, "options" },
     // Echo with conversion (For testing only)
     { "echojson", 0, "arg0" },
     { "echojson", 1, "arg1" },
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index ffe0827befc2d..dc2c6d292e684 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -11,8 +11,10 @@
 #include "init.h"
 #include "validation.h"
 #include "net.h"
+#include "policy/policy.h"
 #include "policy/rbf.h"
 #include "rpc/server.h"
+#include "script/sign.h"
 #include "timedata.h"
 #include "util.h"
 #include "utilmoneystr.h"
@@ -2595,6 +2597,261 @@ UniValue fundrawtransaction(const JSONRPCRequest& request)
     return result;
 }
 
+UniValue bumpfee(const JSONRPCRequest& request)
+{
+    if (!EnsureWalletIsAvailable(request.fHelp)) {
+        return NullUniValue;
+    }
+
+    if (request.fHelp || request.params.size() < 1 || request.params.size() > 2) {
+        throw runtime_error(
+            "bumpfee \"txid\" ( options ) \n"
+            "\nBumps the fee of an opt-in-RBF transaction T, replacing it with a new transaction B.\n"
+            "An opt-in RBF transaction with the given txid must be in the wallet.\n"
+            "The command will pay the additional fee by decreasing (or perhaps removing) its change output.\n"
+            "If the change output is not big enough to cover the increased fee, the command will currently fail\n"
+            "instead of adding new inputs to compensate. (A future implementation could improve this.)\n"
+            "The command will fail if the wallet or mempool contains a transaction that spends one of T's outputs.\n"
+            "By default, the new fee will be calculated automatically using estimatefee.\n"
+            "The user can specify a confirmation target for estimatefee.\n"
+            "Alternatively, the user can specify totalFee, or use RPC setpaytxfee to set a higher fee rate.\n"
+            "At a minimum, the new fee rate must be high enough to pay a new relay fee (relay fee amount returned\n"
+            "by getnetworkinfo RPC) and to enter the node's mempool.\n"
+            "\nArguments:\n"
+            "1. txid                  (string, required) The txid to be bumped\n"
+            "2. options               (object, optional)\n"
+            "   {\n"
+            "     \"confTarget\"        (numeric, optional) Confirmation target (in blocks)\n"
+            "     \"totalFee\"          (numeric, optional) Total fee (NOT feerate) to pay, in satoshis.\n"
+            "                         In rare cases, the actual fee paid might be slightly higher than the specified\n"
+            "                         totalFee if the tx change output has to be removed because it is too close to\n"
+            "                         the dust threshold.\n"
+            "     \"replaceable\"       (boolean, optional, default true) Whether the new transaction should still be\n"
+            "                         marked bip-125 replaceable. If true, the sequence numbers in the transaction will\n"
+            "                         be left unchanged from the original. If false, any input sequence numbers in the\n"
+            "                         original transaction that were less than 0xfffffffe will be increased to 0xfffffffe\n"
+            "                         so the new transaction will not be explicitly bip-125 replaceable (though it may\n"
+            "                         still be replacable in practice, for example if it has unconfirmed ancestors which\n"
+            "                         are replaceable).\n"
+            "   }\n"
+            "\nResult:\n"
+            "{\n"
+            "  \"txid\":    \"value\",   (string)  The id of the new transaction\n"
+            "  \"oldfee\":  n,         (numeric) Fee of the replaced transaction\n"
+            "  \"fee\":     n,         (numeric) Fee of the new transaction\n"
+            "}\n"
+            "\nExamples:\n"
+            "\nBump the fee, get the new transaction\'s txid\n" +
+            HelpExampleCli("bumpfee", "<txid>"));
+    }
+
+    RPCTypeCheck(request.params, boost::assign::list_of(UniValue::VSTR)(UniValue::VOBJ));
+    uint256 hash;
+    hash.SetHex(request.params[0].get_str());
+
+    // retrieve the original tx from the wallet
+    LOCK2(cs_main, pwalletMain->cs_wallet);
+    EnsureWalletIsUnlocked();
+    if (!pwalletMain->mapWallet.count(hash)) {
+        throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid or non-wallet transaction id");
+    }
+    CWalletTx& wtx = pwalletMain->mapWallet[hash];
+
+    if (pwalletMain->HasWalletSpend(hash)) {
+        throw JSONRPCError(RPC_MISC_ERROR, "Transaction has descendants in the wallet");
+    }
+
+    {
+        LOCK(mempool.cs);
+        auto it = mempool.mapTx.find(hash);
+        if (it != mempool.mapTx.end() && it->GetCountWithDescendants() > 1) {
+            throw JSONRPCError(RPC_MISC_ERROR, "Transaction has descendants in the mempool");
+        }
+    }
+
+    if (wtx.GetDepthInMainChain() != 0) {
+        throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Transaction has been mined, or is conflicted with a mined transaction");
+    }
+
+    if (!SignalsOptInRBF(wtx)) {
+        throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Transaction is not BIP 125 replaceable");
+    }
+
+    if (wtx.mapValue.count("replaced_by_txid")) {
+        throw JSONRPCError(RPC_INVALID_REQUEST, strprintf("Cannot bump transaction %s which was already bumped by transaction %s", hash.ToString(), wtx.mapValue.at("replaced_by_txid")));
+    }
+
+    // check that original tx consists entirely of our inputs
+    // if not, we can't bump the fee, because the wallet has no way of knowing the value of the other inputs (thus the fee)
+    if (!pwalletMain->IsAllFromMe(wtx, ISMINE_SPENDABLE)) {
+        throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Transaction contains inputs that don't belong to this wallet");
+    }
+
+    // figure out which output was change
+    // if there was no change output or multiple change outputs, fail
+    int nOutput = -1;
+    for (size_t i = 0; i < wtx.tx->vout.size(); ++i) {
+        if (pwalletMain->IsChange(wtx.tx->vout[i])) {
+            if (nOutput != -1) {
+                throw JSONRPCError(RPC_MISC_ERROR, "Transaction has multiple change outputs");
+            }
+            nOutput = i;
+        }
+    }
+    if (nOutput == -1) {
+        throw JSONRPCError(RPC_MISC_ERROR, "Transaction does not have a change output");
+    }
+
+    // optional parameters
+    bool specifiedConfirmTarget = false;
+    int newConfirmTarget = nTxConfirmTarget;
+    CAmount totalFee = 0;
+    bool replaceable = true;
+    if (request.params.size() > 1) {
+        UniValue options = request.params[1];
+        RPCTypeCheckObj(options,
+            {
+                {"confTarget", UniValueType(UniValue::VNUM)},
+                {"totalFee", UniValueType(UniValue::VNUM)},
+                {"replaceable", UniValueType(UniValue::VBOOL)},
+            },
+            true, true);
+
+        if (options.exists("confTarget") && options.exists("totalFee")) {
+            throw JSONRPCError(RPC_INVALID_PARAMETER, "confTarget and totalFee options should not both be set. Please provide either a confirmation target for fee estimation or an explicit total fee for the transaction.");
+        } else if (options.exists("confTarget")) {
+            specifiedConfirmTarget = true;
+            newConfirmTarget = options["confTarget"].get_int();
+            if (newConfirmTarget <= 0) { // upper-bound will be checked by estimatefee/smartfee
+                throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid confTarget (cannot be <= 0)");
+            }
+        } else if (options.exists("totalFee")) {
+            totalFee = options["totalFee"].get_int64();
+            if (totalFee <= 0) {
+                throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid totalFee (cannot be <= 0)");
+            } else if (totalFee > maxTxFee) {
+                throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid totalFee (cannot be higher than maxTxFee)");
+            }
+        }
+
+        if (options.exists("replaceable")) {
+            replaceable = options["replaceable"].get_bool();
+        }
+    }
+
+    // signature sizes can vary by a byte, so add 1 for each input when calculating the new fee
+    int64_t txSize = GetVirtualTransactionSize(*(wtx.tx));
+    const int64_t maxNewTxSize = txSize + wtx.tx->vin.size();
+
+    // calculate the old fee and fee-rate
+    CAmount nOldFee = wtx.GetDebit(ISMINE_SPENDABLE) - wtx.tx->GetValueOut();
+    CFeeRate nOldFeeRate(nOldFee, txSize);
+    CAmount nNewFee;
+    CFeeRate nNewFeeRate;
+
+    if (totalFee > 0) {
+        CAmount minTotalFee = nOldFeeRate.GetFee(maxNewTxSize) + minRelayTxFee.GetFee(maxNewTxSize);
+        if (totalFee < minTotalFee) {
+            throw JSONRPCError(RPC_INVALID_PARAMETER, strprintf("Invalid totalFee, must be at least %s (oldFee %s + relayFee %s)", FormatMoney(minTotalFee), nOldFeeRate.GetFee(maxNewTxSize), minRelayTxFee.GetFee(maxNewTxSize)));
+        }
+        nNewFee = totalFee;
+        nNewFeeRate = CFeeRate(totalFee, maxNewTxSize);
+    } else {
+        // use the user-defined payTxFee if possible, otherwise use smartfee / fallbackfee
+        if (!specifiedConfirmTarget && payTxFee.GetFeePerK() != 0) {
+            nNewFeeRate = payTxFee;
+        } else {
+            nNewFeeRate = mempool.estimateSmartFee(newConfirmTarget);
+        }
+        if (nNewFeeRate.GetFeePerK() == 0) {
+            nNewFeeRate = CWallet::fallbackFee;
+        }
+
+        // new fee rate must be at least old rate + minimum relay rate
+        if (nNewFeeRate.GetFeePerK() < nOldFeeRate.GetFeePerK() + ::minRelayTxFee.GetFeePerK()) {
+            nNewFeeRate = CFeeRate(nOldFeeRate.GetFeePerK() + ::minRelayTxFee.GetFeePerK());
+        }
+
+        nNewFee = nNewFeeRate.GetFee(maxNewTxSize);
+    }
+
+    // check that fee rate is higher than mempool's minimum fee
+    // (no point in bumping fee if we know that the new tx won't be accepted to the mempool)
+    // This may occur if the user set TotalFee or paytxfee too low, if fallbackfee is too low, or, perhaps,
+    // in a rare situation where the mempool minimum fee increased significantly since the fee estimation just a
+    // moment earlier. In this case, we report an error to the user, who may use totalFee to make an adjustment.
+    CFeeRate minMempoolFeeRate = mempool.GetMinFee(GetArg("-maxmempool", DEFAULT_MAX_MEMPOOL_SIZE) * 1000000);
+    if (nNewFeeRate.GetFeePerK() < minMempoolFeeRate.GetFeePerK()) {
+        throw JSONRPCError(RPC_MISC_ERROR, strprintf("New fee rate (%s) is less than the minimum fee rate (%s) to get into the mempool. totalFee value should to be at least %s or settxfee value should be at least %s to add transaction.", FormatMoney(nNewFeeRate.GetFeePerK()), FormatMoney(minMempoolFeeRate.GetFeePerK()), FormatMoney(minMempoolFeeRate.GetFee(maxNewTxSize)), FormatMoney(minMempoolFeeRate.GetFeePerK())));
+    }
+
+    // Now modify the output to increase the fee.
+    // If the output is not large enough to pay the fee, fail.
+    CAmount nDelta = nNewFee - nOldFee;
+    assert(nDelta > 0);
+    CMutableTransaction tx(*(wtx.tx));
+    CTxOut* poutput = &(tx.vout[nOutput]);
+    if (poutput->nValue < nDelta) {
+        throw JSONRPCError(RPC_MISC_ERROR, "Change output is too small to bump the fee");
+    }
+
+    // If the output would become dust, discard it (converting the dust to fee)
+    poutput->nValue -= nDelta;
+    if (poutput->nValue <= poutput->GetDustThreshold(::minRelayTxFee)) {
+        LogPrint("rpc", "Bumping fee and discarding dust output\n");
+        nNewFee += poutput->nValue;
+        tx.vout.erase(tx.vout.begin() + nOutput);
+    }
+
+    // Mark new tx not replaceable, if requested.
+    if (!replaceable) {
+        for (auto& input : tx.vin) {
+            if (input.nSequence < 0xfffffffe) input.nSequence = 0xfffffffe;
+        }
+    }
+
+    // sign the new tx
+    CTransaction txNewConst(tx);
+    int nIn = 0;
+    for (auto& input : tx.vin) {
+        std::map<uint256, CWalletTx>::const_iterator mi = pwalletMain->mapWallet.find(input.prevout.hash);
+        assert(mi != pwalletMain->mapWallet.end() && input.prevout.n < mi->second.tx->vout.size());
+        const CScript& scriptPubKey = mi->second.tx->vout[input.prevout.n].scriptPubKey;
+        const CAmount& amount = mi->second.tx->vout[input.prevout.n].nValue;
+        SignatureData sigdata;
+        if (!ProduceSignature(TransactionSignatureCreator(pwalletMain, &txNewConst, nIn, amount, SIGHASH_ALL), scriptPubKey, sigdata)) {
+            throw JSONRPCError(RPC_WALLET_ERROR, "Can't sign transaction.");
+        }
+        UpdateTransaction(tx, nIn, sigdata);
+        nIn++;
+    }
+
+    // commit/broadcast the tx
+    CReserveKey reservekey(pwalletMain);
+    CWalletTx wtxBumped(pwalletMain, MakeTransactionRef(std::move(tx)));
+    wtxBumped.mapValue["replaces_txid"] = hash.ToString();
+    CValidationState state;
+    if (!pwalletMain->CommitTransaction(wtxBumped, reservekey, g_connman.get(), state) || !state.IsValid()) {
+        throw JSONRPCError(RPC_WALLET_ERROR, strprintf("Error: The transaction was rejected! Reason given: %s", state.GetRejectReason()));
+    }
+
+    // mark the original tx as bumped
+    if (!pwalletMain->MarkReplaced(wtx.GetHash(), wtxBumped.GetHash())) {
+        // TODO: see if JSON-RPC has a standard way of returning a response
+        // along with an exception. It would be good to return information about
+        // wtxBumped to the caller even if marking the original transaction
+        // replaced does not succeed for some reason.
+        throw JSONRPCError(RPC_WALLET_ERROR, "Error: Created new bumpfee transaction but could not mark the original transaction as replaced.");
+    }
+
+    UniValue result(UniValue::VOBJ);
+    result.push_back(Pair("txid", wtxBumped.GetHash().GetHex()));
+    result.push_back(Pair("oldfee", ValueFromAmount(nOldFee)));
+    result.push_back(Pair("fee", ValueFromAmount(nNewFee)));
+
+    return result;
+}
+
 extern UniValue dumpprivkey(const JSONRPCRequest& request); // in rpcdump.cpp
 extern UniValue importprivkey(const JSONRPCRequest& request);
 extern UniValue importaddress(const JSONRPCRequest& request);
@@ -2614,6 +2871,7 @@ static const CRPCCommand commands[] =
     { "wallet",             "addmultisigaddress",       &addmultisigaddress,       true,   {"nrequired","keys","account"} },
     { "wallet",             "addwitnessaddress",        &addwitnessaddress,        true,   {"address"} },
     { "wallet",             "backupwallet",             &backupwallet,             true,   {"destination"} },
+    { "wallet",             "bumpfee",                  &bumpfee,                  true,   {"txid", "options"} },
     { "wallet",             "dumpprivkey",              &dumpprivkey,              true,   {"address"}  },
     { "wallet",             "dumpwallet",               &dumpwallet,               true,   {"filename"} },
     { "wallet",             "encryptwallet",            &encryptwallet,            true,   {"passphrase"} },
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index be5d692c927e1..c1e1f2d7ea52e 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -411,6 +411,13 @@ set<uint256> CWallet::GetConflicts(const uint256& txid) const
     return result;
 }
 
+bool CWallet::HasWalletSpend(const uint256& txid) const
+{
+    AssertLockHeld(cs_wallet);
+    auto iter = mapTxSpends.lower_bound(COutPoint(txid, 0));
+    return (iter != mapTxSpends.end() && iter->first.hash == txid);
+}
+
 void CWallet::Flush(bool shutdown)
 {
     bitdb.Flush(shutdown);
@@ -826,6 +833,35 @@ void CWallet::MarkDirty()
     }
 }
 
+bool CWallet::MarkReplaced(const uint256& originalHash, const uint256& newHash)
+{
+    LOCK(cs_wallet);
+
+    auto mi = mapWallet.find(originalHash);
+
+    // There is a bug if MarkReplaced is not called on an existing wallet transaction.
+    assert(mi != mapWallet.end());
+
+    CWalletTx& wtx = (*mi).second;
+
+    // Ensure for now that we're not overwriting data
+    assert(wtx.mapValue.count("replaced_by_txid") == 0);
+
+    wtx.mapValue["replaced_by_txid"] = newHash.ToString();
+
+    CWalletDB walletdb(strWalletFile, "r+");
+
+    bool success = true;
+    if (!walletdb.WriteTx(wtx)) {
+        LogPrintf("%s: Updating walletdb tx %s failed", __func__, wtx.GetHash().ToString());
+        success = false;
+    }
+
+    NotifyTransactionChanged(this, originalHash, CT_UPDATED);
+
+    return success;
+}
+
 bool CWallet::AddToWallet(const CWalletTx& wtxIn, bool fFlushOnClose)
 {
     LOCK(cs_wallet);
@@ -1981,6 +2017,37 @@ void CWallet::AvailableCoins(vector<COutput>& vCoins, bool fOnlyConfirmed, const
             if (nDepth == 0 && !pcoin->InMempool())
                 continue;
 
+            // We should not consider coins from transactions that are replacing
+            // other transactions.
+            //
+            // Example: There is a transaction A which is replaced by bumpfee
+            // transaction B. In this case, we want to prevent creation of
+            // a transaction B' which spends an output of B.
+            //
+            // Reason: If transaction A were initially confirmed, transactions B
+            // and B' would no longer be valid, so the user would have to create
+            // a new transaction C to replace B'. However, in the case of a
+            // one-block reorg, transactions B' and C might BOTH be accepted,
+            // when the user only wanted one of them. Specifically, there could
+            // be a 1-block reorg away from the chain where transactions A and C
+            // were accepted to another chain where B, B', and C were all
+            // accepted.
+            if (nDepth == 0 && fOnlyConfirmed && pcoin->mapValue.count("replaces_txid")) {
+                continue;
+            }
+
+            // Similarly, we should not consider coins from transactions that
+            // have been replaced. In the example above, we would want to prevent
+            // creation of a transaction A' spending an output of A, because if
+            // transaction B were initially confirmed, conflicting with A and
+            // A', we wouldn't want to the user to create a transaction D
+            // intending to replace A', but potentially resulting in a scenario
+            // where A, A', and D could all be accepted (instead of just B and
+            // D, or just A and A' like the user would want).
+            if (nDepth == 0 && fOnlyConfirmed && pcoin->mapValue.count("replaced_by_txid")) {
+                continue;
+            }
+
             for (unsigned int i = 0; i < pcoin->tx->vout.size(); i++) {
                 isminetype mine = IsMine(pcoin->tx->vout[i]);
                 if (!(IsSpent(wtxid, i)) && mine != ISMINE_NO &&
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
index 8a587f4ed0453..50c5025c24a26 100644
--- a/src/wallet/wallet.h
+++ b/src/wallet/wallet.h
@@ -891,6 +891,9 @@ class CWallet : public CCryptoKeyStore, public CValidationInterface
     //! Get wallet transactions that conflict with given transaction (spend same outputs)
     std::set<uint256> GetConflicts(const uint256& txid) const;
 
+    //! Check if a given transaction has any of its outputs spent by another transaction in the wallet
+    bool HasWalletSpend(const uint256& txid) const;
+
     //! Flush wallet (bitdb flush)
     void Flush(bool shutdown=false);
 
@@ -927,6 +930,9 @@ class CWallet : public CCryptoKeyStore, public CValidationInterface
     /* Mark a transaction (and it in-wallet descendants) as abandoned so its inputs may be respent. */
     bool AbandonTransaction(const uint256& hashTx);
 
+    /** Mark a transaction as replaced by another transaction (e.g., BIP 125). */
+    bool MarkReplaced(const uint256& originalHash, const uint256& newHash);
+
     /* Returns the wallets help message */
     static std::string GetWalletHelpString(bool showDebug);
 

From 989989354b68d3954fe2742b96c53eeb2e8a7670 Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Thu, 19 Jan 2017 11:03:36 -0500
Subject: [PATCH 1608/1802] Move wallet callbacks into cs_main (this
 effectively reverts #7946)

---
 src/validation.cpp | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/validation.cpp b/src/validation.cpp
index bb13cbaadbc8e..6bc20edd04b24 100644
--- a/src/validation.cpp
+++ b/src/validation.cpp
@@ -2473,20 +2473,19 @@ bool ActivateBestChain(CValidationState &state, const CChainParams& chainparams,
             pindexNewTip = chainActive.Tip();
             pindexFork = chainActive.FindFork(pindexOldTip);
             fInitialDownload = IsInitialBlockDownload();
+
+            // throw all transactions though the signal-interface
+            for (const auto& pair : connectTrace.blocksConnected) {
+                assert(pair.second);
+                const CBlock& block = *(pair.second);
+                for (unsigned int i = 0; i < block.vtx.size(); i++)
+                    GetMainSignals().SyncTransaction(*block.vtx[i], pair.first, i);
+            }
         }
         // When we reach this point, we switched to a new tip (stored in pindexNewTip).
 
         // Notifications/callbacks that can run without cs_main
 
-        // throw all transactions though the signal-interface
-        // while _not_ holding the cs_main lock
-        for (const auto& pair : connectTrace.blocksConnected) {
-            assert(pair.second);
-            const CBlock& block = *(pair.second);
-            for (unsigned int i = 0; i < block.vtx.size(); i++)
-                GetMainSignals().SyncTransaction(*block.vtx[i], pair.first, i);
-        }
-
         // Notify external listeners about the new tip.
         GetMainSignals().UpdatedBlockTip(pindexNewTip, pindexFork, fInitialDownload);
 

From 9aa4e6a6c2cb9b4465d014c8efa672a919ff8f89 Mon Sep 17 00:00:00 2001
From: Jonas Schnelli <dev@jonasschnelli.ch>
Date: Mon, 19 Dec 2016 09:04:05 +0100
Subject: [PATCH 1609/1802] [Wallet] Add an option to keep the change address
 key, true by default

---
 src/wallet/rpcwallet.cpp | 8 +++++++-
 src/wallet/wallet.cpp    | 6 +++++-
 src/wallet/wallet.h      | 2 +-
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index 2428ef04e2217..fa54197e7554c 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -2496,6 +2496,7 @@ UniValue fundrawtransaction(const JSONRPCRequest& request)
                             "     \"changePosition\"         (numeric, optional, default random) The index of the change output\n"
                             "     \"includeWatching\"        (boolean, optional, default false) Also select inputs which are watch only\n"
                             "     \"lockUnspents\"           (boolean, optional, default false) Lock selected unspent outputs\n"
+                            "     \"reserveChangeKey\"       (boolean, optional, default true) Reserves the change output key from the keypool\n"
                             "     \"feeRate\"                (numeric, optional, default not set: makes wallet determine the fee) Set a specific feerate (" + CURRENCY_UNIT + " per KB)\n"
                             "     \"subtractFeeFromOutputs\" (array, optional) A json array of integers.\n"
                             "                              The fee will be equally deducted from the amount of each specified output.\n"
@@ -2528,6 +2529,7 @@ UniValue fundrawtransaction(const JSONRPCRequest& request)
     int changePosition = -1;
     bool includeWatching = false;
     bool lockUnspents = false;
+    bool reserveChangeKey = true;
     CFeeRate feeRate = CFeeRate(0);
     bool overrideEstimatedFeerate = false;
     UniValue subtractFeeFromOutputs;
@@ -2549,6 +2551,7 @@ UniValue fundrawtransaction(const JSONRPCRequest& request)
                 {"changePosition", UniValueType(UniValue::VNUM)},
                 {"includeWatching", UniValueType(UniValue::VBOOL)},
                 {"lockUnspents", UniValueType(UniValue::VBOOL)},
+                {"reserveChangeKey", UniValueType(UniValue::VBOOL)},
                 {"feeRate", UniValueType()}, // will be checked below
                 {"subtractFeeFromOutputs", UniValueType(UniValue::VARR)},
             },
@@ -2572,6 +2575,9 @@ UniValue fundrawtransaction(const JSONRPCRequest& request)
         if (options.exists("lockUnspents"))
             lockUnspents = options["lockUnspents"].get_bool();
 
+        if (options.exists("reserveChangeKey"))
+            reserveChangeKey = options["reserveChangeKey"].get_bool();
+
         if (options.exists("feeRate"))
         {
             feeRate = CFeeRate(AmountFromValue(options["feeRate"]));
@@ -2608,7 +2614,7 @@ UniValue fundrawtransaction(const JSONRPCRequest& request)
     CAmount nFeeOut;
     string strFailReason;
 
-    if(!pwalletMain->FundTransaction(tx, nFeeOut, overrideEstimatedFeerate, feeRate, changePosition, strFailReason, includeWatching, lockUnspents, setSubtractFeeFromOutputs, changeAddress))
+    if(!pwalletMain->FundTransaction(tx, nFeeOut, overrideEstimatedFeerate, feeRate, changePosition, strFailReason, includeWatching, lockUnspents, setSubtractFeeFromOutputs, reserveChangeKey, changeAddress))
         throw JSONRPCError(RPC_INTERNAL_ERROR, strFailReason);
 
     UniValue result(UniValue::VOBJ);
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index 0b18be87649fd..06382af1847f8 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -2192,7 +2192,7 @@ bool CWallet::SelectCoins(const vector<COutput>& vAvailableCoins, const CAmount&
     return res;
 }
 
-bool CWallet::FundTransaction(CMutableTransaction& tx, CAmount& nFeeRet, bool overrideEstimatedFeeRate, const CFeeRate& specificFeeRate, int& nChangePosInOut, std::string& strFailReason, bool includeWatching, bool lockUnspents, const std::set<int>& setSubtractFeeFromOutputs, const CTxDestination& destChange)
+bool CWallet::FundTransaction(CMutableTransaction& tx, CAmount& nFeeRet, bool overrideEstimatedFeeRate, const CFeeRate& specificFeeRate, int& nChangePosInOut, std::string& strFailReason, bool includeWatching, bool lockUnspents, const std::set<int>& setSubtractFeeFromOutputs, bool keepReserveKey, const CTxDestination& destChange)
 {
     vector<CRecipient> vecSend;
 
@@ -2241,6 +2241,10 @@ bool CWallet::FundTransaction(CMutableTransaction& tx, CAmount& nFeeRet, bool ov
         }
     }
 
+    // optionally keep the change output key
+    if (keepReserveKey)
+        reservekey.KeepKey();
+
     return true;
 }
 
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
index 92ad09848655a..fb20062b965cb 100644
--- a/src/wallet/wallet.h
+++ b/src/wallet/wallet.h
@@ -780,7 +780,7 @@ class CWallet : public CCryptoKeyStore, public CValidationInterface
      * Insert additional inputs into the transaction by
      * calling CreateTransaction();
      */
-    bool FundTransaction(CMutableTransaction& tx, CAmount& nFeeRet, bool overrideEstimatedFeeRate, const CFeeRate& specificFeeRate, int& nChangePosInOut, std::string& strFailReason, bool includeWatching, bool lockUnspents, const std::set<int>& setSubtractFeeFromOutputs, const CTxDestination& destChange = CNoDestination());
+    bool FundTransaction(CMutableTransaction& tx, CAmount& nFeeRet, bool overrideEstimatedFeeRate, const CFeeRate& specificFeeRate, int& nChangePosInOut, std::string& strFailReason, bool includeWatching, bool lockUnspents, const std::set<int>& setSubtractFeeFromOutputs, bool keepReserveKey = true, const CTxDestination& destChange = CNoDestination());
 
     /**
      * Create a new transaction paying the recipients with a set of coins

From 9eb325d079c7bbce749abe79d0bbac34d8ef5806 Mon Sep 17 00:00:00 2001
From: Jonas Schnelli <dev@jonasschnelli.ch>
Date: Mon, 19 Dec 2016 09:10:33 +0100
Subject: [PATCH 1610/1802] [QA] Add test for fundrawtransactions new
 reserveChangeKey option

---
 qa/rpc-tests/fundrawtransaction.py | 28 +++++++++++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

diff --git a/qa/rpc-tests/fundrawtransaction.py b/qa/rpc-tests/fundrawtransaction.py
index b97e9aecdf422..b279c0b9d6569 100755
--- a/qa/rpc-tests/fundrawtransaction.py
+++ b/qa/rpc-tests/fundrawtransaction.py
@@ -651,7 +651,7 @@ def run_test(self):
         assert_equal(len(self.nodes[3].listunspent(1)), 1)
 
         inputs = []
-        outputs = {self.nodes[2].getnewaddress() : 1}
+        outputs = {self.nodes[3].getnewaddress() : 1}
         rawtx = self.nodes[3].createrawtransaction(inputs, outputs)
         result = self.nodes[3].fundrawtransaction(rawtx) # uses min_relay_tx_fee (set by settxfee)
         result2 = self.nodes[3].fundrawtransaction(rawtx, {"feeRate": 2*min_relay_tx_fee})
@@ -660,6 +660,32 @@ def run_test(self):
         assert_fee_amount(result2['fee'], count_bytes(result2['hex']), 2 * result_fee_rate)
         assert_fee_amount(result3['fee'], count_bytes(result3['hex']), 10 * result_fee_rate)
 
+        #############################
+        # Test address reuse option #
+        #############################
+
+        result3 = self.nodes[3].fundrawtransaction(rawtx, {"reserveChangeKey": False})
+        res_dec = self.nodes[0].decoderawtransaction(result3["hex"])
+        changeaddress = ""
+        for out in res_dec['vout']:
+            if out['value'] > 1.0:
+                changeaddress += out['scriptPubKey']['addresses'][0]
+        assert(changeaddress != "")
+        nextaddr = self.nodes[3].getnewaddress()
+        # frt should not have removed the key from the keypool
+        assert(changeaddress == nextaddr)
+
+        result3 = self.nodes[3].fundrawtransaction(rawtx)
+        res_dec = self.nodes[0].decoderawtransaction(result3["hex"])
+        changeaddress = ""
+        for out in res_dec['vout']:
+            if out['value'] > 1.0:
+                changeaddress += out['scriptPubKey']['addresses'][0]
+        assert(changeaddress != "")
+        nextaddr = self.nodes[3].getnewaddress()
+        # Now the change address key should be removed from the keypool
+        assert(changeaddress != nextaddr)
+
         ######################################
         # Test subtractFeeFromOutputs option #
         ######################################

From c9f3062d551823f006d400dddb54c12620cd29c4 Mon Sep 17 00:00:00 2001
From: Jonas Schnelli <dev@jonasschnelli.ch>
Date: Mon, 19 Dec 2016 09:12:28 +0100
Subject: [PATCH 1611/1802] Add fundrawtransactions new reserveChangeKey option
 to the release notes

---
 doc/release-notes.md | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/doc/release-notes.md b/doc/release-notes.md
index bbda55854ffe9..0ea9e1949e381 100644
--- a/doc/release-notes.md
+++ b/doc/release-notes.md
@@ -128,6 +128,16 @@ Call "getmininginfo" loses the "testnet" field in favor of the more generic "cha
 
 ### Wallet
 
+0.14.0 Fundrawtransaction change address reuse
+==============================================
+
+Before 0.14, `fundrawtransaction` was by default wallet stateless. In almost all cases `fundrawtransaction` does add a change-output to the outputs of the funded transaction. Before 0.14, the used keypool key was never marked as change-address key and directly returned to the keypool (leading to address reuse).
+Before 0.14, calling `getnewaddress` directly after `fundrawtransaction` did generate the same address as the change-output address.
+
+Since 0.14, fundrawtransaction does reserve the change-output-key from the keypool by default (optional by setting  `reserveChangeKey`, default = `true`)
+
+Users should also consider using `getrawchangeaddress()` in conjunction with `fundrawtransaction`'s `changeAddress` option.
+
 ### GUI
 
 ### Tests

From fa4d47814f298523aeb9a6658cc74fc46d316e33 Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Thu, 19 Jan 2017 20:51:59 +0100
Subject: [PATCH 1612/1802] qt: Use nPowTargetSpacing constant

---
 src/qt/bitcoingui.cpp      | 5 +++--
 src/qt/modaloverlay.cpp    | 6 ++++--
 src/qt/modaloverlay.h      | 2 +-
 src/qt/sendcoinsdialog.cpp | 3 ++-
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp
index b86437cede22d..f86b09644b86c 100644
--- a/src/qt/bitcoingui.cpp
+++ b/src/qt/bitcoingui.cpp
@@ -31,6 +31,7 @@
 #include "macdockiconhandler.h"
 #endif
 
+#include "chainparams.h"
 #include "init.h"
 #include "ui_interface.h"
 #include "util.h"
@@ -752,8 +753,8 @@ void BitcoinGUI::updateHeadersSyncProgressLabel()
 {
     int64_t headersTipTime = clientModel->getHeaderTipTime();
     int headersTipHeight = clientModel->getHeaderTipHeight();
-    int estHeadersLeft = (GetTime() - headersTipTime)/600;
-    if (estHeadersLeft > REQ_HEADER_HEIGHT_DELTA_SYNC)
+    int estHeadersLeft = (GetTime() - headersTipTime) / Params().GetConsensus().nPowTargetSpacing;
+    if (estHeadersLeft > HEADER_HEIGHT_DELTA_SYNC)
         progressBarLabel->setText(tr("Syncing Headers (%1%)...").arg(QString::number(100.0 / (headersTipHeight+estHeadersLeft)*headersTipHeight, 'f', 1)));
 }
 
diff --git a/src/qt/modaloverlay.cpp b/src/qt/modaloverlay.cpp
index 89fb159956211..4779ffa43f3a3 100644
--- a/src/qt/modaloverlay.cpp
+++ b/src/qt/modaloverlay.cpp
@@ -7,6 +7,8 @@
 
 #include "guiutil.h"
 
+#include "chainparams.h"
+
 #include <QResizeEvent>
 #include <QPropertyAnimation>
 
@@ -125,11 +127,11 @@ void ModalOverlay::tipUpdate(int count, const QDateTime& blockDate, double nVeri
 
     // estimate the number of headers left based on nPowTargetSpacing
     // and check if the gui is not aware of the the best header (happens rarely)
-    int estimateNumHeadersLeft = bestHeaderDate.secsTo(currentDate) / 600;
+    int estimateNumHeadersLeft = bestHeaderDate.secsTo(currentDate) / Params().GetConsensus().nPowTargetSpacing;
     bool hasBestHeader = bestHeaderHeight >= count;
 
     // show remaining number of blocks
-    if (estimateNumHeadersLeft < 24 && hasBestHeader) {
+    if (estimateNumHeadersLeft < HEADER_HEIGHT_DELTA_SYNC && hasBestHeader) {
         ui->numberOfBlocksLeft->setText(QString::number(bestHeaderHeight - count));
     } else {
         ui->numberOfBlocksLeft->setText(tr("Unknown. Syncing Headers (%1)...").arg(bestHeaderHeight));
diff --git a/src/qt/modaloverlay.h b/src/qt/modaloverlay.h
index 6d1f12164ef1f..21ccdbd8397e2 100644
--- a/src/qt/modaloverlay.h
+++ b/src/qt/modaloverlay.h
@@ -9,7 +9,7 @@
 #include <QWidget>
 
 //! The required delta of headers to the estimated number of available headers until we show the IBD progress
-static const int REQ_HEADER_HEIGHT_DELTA_SYNC = 24;
+static constexpr int HEADER_HEIGHT_DELTA_SYNC = 24;
 
 namespace Ui {
     class ModalOverlay;
diff --git a/src/qt/sendcoinsdialog.cpp b/src/qt/sendcoinsdialog.cpp
index 5aeda7a30df74..1e2842df73c75 100644
--- a/src/qt/sendcoinsdialog.cpp
+++ b/src/qt/sendcoinsdialog.cpp
@@ -16,6 +16,7 @@
 #include "walletmodel.h"
 
 #include "base58.h"
+#include "chainparams.h"
 #include "wallet/coincontrol.h"
 #include "validation.h" // mempool and minRelayTxFee
 #include "ui_interface.h"
@@ -608,7 +609,7 @@ void SendCoinsDialog::updateGlobalFeeVariables()
         CoinControlDialog::coinControl->nMinimumTotalFee = 0;
 
         // show the estimated reuquired time for confirmation
-        ui->confirmationTargetLabel->setText(GUIUtil::formatDurationStr(nConfirmTarget*600)+" / "+tr("%n block(s)", "", nConfirmTarget));
+        ui->confirmationTargetLabel->setText(GUIUtil::formatDurationStr(nConfirmTarget * Params().GetConsensus().nPowTargetSpacing) + " / " + tr("%n block(s)", "", nConfirmTarget));
     }
     else
     {

From 5b158707f23a290c750a083c8f7d43915bcc48c5 Mon Sep 17 00:00:00 2001
From: Alex Morcos <morcos@chaincode.com>
Date: Thu, 19 Jan 2017 16:17:38 -0500
Subject: [PATCH 1613/1802] Use incrementalRelayFee for BIP 125 replacement

---
 src/validation.cpp       |  4 ++--
 src/wallet/rpcwallet.cpp | 14 +++++++-------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/validation.cpp b/src/validation.cpp
index bb13cbaadbc8e..e605671e7dcf2 100644
--- a/src/validation.cpp
+++ b/src/validation.cpp
@@ -898,14 +898,14 @@ bool AcceptToMemoryPoolWorker(CTxMemPool& pool, CValidationState& state, const C
             // Finally in addition to paying more fees than the conflicts the
             // new transaction must pay for its own bandwidth.
             CAmount nDeltaFees = nModifiedFees - nConflictingFees;
-            if (nDeltaFees < ::minRelayTxFee.GetFee(nSize))
+            if (nDeltaFees < ::incrementalRelayFee.GetFee(nSize))
             {
                 return state.DoS(0, false,
                         REJECT_INSUFFICIENTFEE, "insufficient fee", false,
                         strprintf("rejecting replacement %s, not enough additional fees to relay; %s < %s",
                               hash.ToString(),
                               FormatMoney(nDeltaFees),
-                              FormatMoney(::minRelayTxFee.GetFee(nSize))));
+                              FormatMoney(::incrementalRelayFee.GetFee(nSize))));
             }
         }
 
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index 152e9cff90c4f..07c3688a4d3a4 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -2652,8 +2652,8 @@ UniValue bumpfee(const JSONRPCRequest& request)
             "By default, the new fee will be calculated automatically using estimatefee.\n"
             "The user can specify a confirmation target for estimatefee.\n"
             "Alternatively, the user can specify totalFee, or use RPC setpaytxfee to set a higher fee rate.\n"
-            "At a minimum, the new fee rate must be high enough to pay a new relay fee (relay fee amount returned\n"
-            "by getnetworkinfo RPC) and to enter the node's mempool.\n"
+            "At a minimum, the new fee rate must be high enough to pay a new relay fee over the original fee\n"
+            "to enter the node's mempool.\n"
             "\nArguments:\n"
             "1. txid                  (string, required) The txid to be bumped\n"
             "2. options               (object, optional)\n"
@@ -2787,9 +2787,9 @@ UniValue bumpfee(const JSONRPCRequest& request)
     CFeeRate nNewFeeRate;
 
     if (totalFee > 0) {
-        CAmount minTotalFee = nOldFeeRate.GetFee(maxNewTxSize) + minRelayTxFee.GetFee(maxNewTxSize);
+        CAmount minTotalFee = nOldFeeRate.GetFee(maxNewTxSize) + ::incrementalRelayFee.GetFee(maxNewTxSize);
         if (totalFee < minTotalFee) {
-            throw JSONRPCError(RPC_INVALID_PARAMETER, strprintf("Invalid totalFee, must be at least %s (oldFee %s + relayFee %s)", FormatMoney(minTotalFee), nOldFeeRate.GetFee(maxNewTxSize), minRelayTxFee.GetFee(maxNewTxSize)));
+            throw JSONRPCError(RPC_INVALID_PARAMETER, strprintf("Invalid totalFee, must be at least %s (oldFee %s + relayFee %s)", FormatMoney(minTotalFee), nOldFeeRate.GetFee(maxNewTxSize), ::incrementalRelayFee.GetFee(maxNewTxSize)));
         }
         nNewFee = totalFee;
         nNewFeeRate = CFeeRate(totalFee, maxNewTxSize);
@@ -2804,9 +2804,9 @@ UniValue bumpfee(const JSONRPCRequest& request)
             nNewFeeRate = CWallet::fallbackFee;
         }
 
-        // new fee rate must be at least old rate + minimum relay rate
-        if (nNewFeeRate.GetFeePerK() < nOldFeeRate.GetFeePerK() + ::minRelayTxFee.GetFeePerK()) {
-            nNewFeeRate = CFeeRate(nOldFeeRate.GetFeePerK() + ::minRelayTxFee.GetFeePerK());
+        // new fee rate must be at least old rate + minimum incremental relay rate
+        if (nNewFeeRate.GetFeePerK() < nOldFeeRate.GetFeePerK() + ::incrementalRelayFee.GetFeePerK()) {
+            nNewFeeRate = CFeeRate(nOldFeeRate.GetFeePerK() + ::incrementalRelayFee.GetFeePerK());
         }
 
         nNewFee = nNewFeeRate.GetFee(maxNewTxSize);

From de6400de5d4b654007f21901d9555ddea0face82 Mon Sep 17 00:00:00 2001
From: Alex Morcos <morcos@chaincode.com>
Date: Thu, 19 Jan 2017 16:18:24 -0500
Subject: [PATCH 1614/1802] Fix missing use of dustRelayFee

---
 src/wallet/rpcwallet.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index 07c3688a4d3a4..c0f7bbcb42fab 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -2834,7 +2834,7 @@ UniValue bumpfee(const JSONRPCRequest& request)
 
     // If the output would become dust, discard it (converting the dust to fee)
     poutput->nValue -= nDelta;
-    if (poutput->nValue <= poutput->GetDustThreshold(::minRelayTxFee)) {
+    if (poutput->nValue <= poutput->GetDustThreshold(::dustRelayFee)) {
         LogPrint("rpc", "Bumping fee and discarding dust output\n");
         nNewFee += poutput->nValue;
         tx.vout.erase(tx.vout.begin() + nOutput);

From 6b331e6cf977caa20c83a28a8c6c2af0b6c451c5 Mon Sep 17 00:00:00 2001
From: Alex Morcos <morcos@chaincode.com>
Date: Thu, 19 Jan 2017 21:02:54 -0500
Subject: [PATCH 1615/1802] Fix to have miner test aware of new separate block
 min tx fee

---
 src/test/miner_tests.cpp | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/test/miner_tests.cpp b/src/test/miner_tests.cpp
index 2f74f57d00724..f856d8a91a704 100644
--- a/src/test/miner_tests.cpp
+++ b/src/test/miner_tests.cpp
@@ -9,6 +9,7 @@
 #include "consensus/validation.h"
 #include "validation.h"
 #include "miner.h"
+#include "policy/policy.h"
 #include "pubkey.h"
 #include "script/standard.h"
 #include "txmempool.h"
@@ -24,6 +25,8 @@
 
 BOOST_FIXTURE_TEST_SUITE(miner_tests, TestingSetup)
 
+static CFeeRate blockMinFeeRate = CFeeRate(DEFAULT_BLOCK_MIN_TX_FEE);
+
 static
 struct {
     unsigned char extranonce;
@@ -112,7 +115,7 @@ void TestPackageSelection(const CChainParams& chainparams, CScript scriptPubKey,
     BOOST_CHECK(pblocktemplate->block.vtx[2]->GetHash() == hashHighFeeTx);
     BOOST_CHECK(pblocktemplate->block.vtx[3]->GetHash() == hashMediumFeeTx);
 
-    // Test that a package below the min relay fee doesn't get included
+    // Test that a package below the block min tx fee doesn't get included
     tx.vin[0].prevout.hash = hashHighFeeTx;
     tx.vout[0].nValue = 5000000000LL - 1000 - 50000; // 0 fee
     uint256 hashFreeTx = tx.GetHash();
@@ -120,8 +123,8 @@ void TestPackageSelection(const CChainParams& chainparams, CScript scriptPubKey,
     size_t freeTxSize = ::GetSerializeSize(tx, SER_NETWORK, PROTOCOL_VERSION);
 
     // Calculate a fee on child transaction that will put the package just
-    // below the min relay fee (assuming 1 child tx of the same size).
-    CAmount feeToUse = minRelayTxFee.GetFee(2*freeTxSize) - 1;
+    // below the block min tx fee (assuming 1 child tx of the same size).
+    CAmount feeToUse = blockMinFeeRate.GetFee(2*freeTxSize) - 1;
 
     tx.vin[0].prevout.hash = hashFreeTx;
     tx.vout[0].nValue = 5000000000LL - 1000 - 50000 - feeToUse;
@@ -158,7 +161,7 @@ void TestPackageSelection(const CChainParams& chainparams, CScript scriptPubKey,
     // This tx can't be mined by itself
     tx.vin[0].prevout.hash = hashFreeTx2;
     tx.vout.resize(1);
-    feeToUse = minRelayTxFee.GetFee(freeTxSize);
+    feeToUse = blockMinFeeRate.GetFee(freeTxSize);
     tx.vout[0].nValue = 5000000000LL - 100000000 - feeToUse;
     uint256 hashLowFeeTx2 = tx.GetHash();
     mempool.addUnchecked(hashLowFeeTx2, entry.Fee(feeToUse).SpendsCoinbase(false).FromTx(tx));

From bd92f2481c04db132555e151f4a57bb7a1c52ff1 Mon Sep 17 00:00:00 2001
From: Alex Morcos <morcos@chaincode.com>
Date: Thu, 19 Jan 2017 23:45:02 -0500
Subject: [PATCH 1616/1802] [bugfix] save feeDelta instead of priorityDelta in
 DumpMempool

---
 src/validation.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/validation.cpp b/src/validation.cpp
index bb13cbaadbc8e..0509773aa9dc1 100644
--- a/src/validation.cpp
+++ b/src/validation.cpp
@@ -4202,7 +4202,7 @@ void DumpMempool(void)
     {
         LOCK(mempool.cs);
         for (const auto &i : mempool.mapDeltas) {
-            mapDeltas[i.first] = i.second.first;
+            mapDeltas[i.first] = i.second.second;
         }
         vinfo = mempool.infoAll();
     }

From 8ff8d219c3d9a0b6f604bb99ca4a27ad77cdb69b Mon Sep 17 00:00:00 2001
From: Gregory Maxwell <greg@xiph.org>
Date: Fri, 20 Jan 2017 02:38:12 +0000
Subject: [PATCH 1617/1802] Send final alert message to older peers after
 connecting.

The old Bitcoin alert system has long since been retired.
( See also: https://bitcoin.org/en/alert/2016-11-01-alert-retirement )

This change causes each node to send any old peers that
 it connects with a copy of the final alert.

The alert it hardcode cancels all other alerts including
 other final alerts.
---
 src/net_processing.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/net_processing.cpp b/src/net_processing.cpp
index 36a52576357ee..e49333ed2ca77 100644
--- a/src/net_processing.cpp
+++ b/src/net_processing.cpp
@@ -1324,6 +1324,12 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
         pfrom->nTimeOffset = nTimeOffset;
         AddTimeData(pfrom->addr, nTimeOffset);
 
+        // If the peer is old enough to have the old alert system, send it the final alert.
+        if (pfrom->nVersion <= 70012) {
+            CDataStream finalAlert(ParseHex("60010000000000000000000000ffffff7f00000000ffffff7ffeffff7f01ffffff7f00000000ffffff7f00ffffff7f002f555247454e543a20416c657274206b657920636f6d70726f6d697365642c2075706772616465207265717569726564004630440220653febd6410f470f6bae11cad19c48413becb1ac2c17f908fd0fd53bdc3abd5202206d0e9c96fe88d4a0f01ed9dedae2b6f9e00da94cad0fecaae66ecf689bf71b50"), SER_NETWORK, PROTOCOL_VERSION);
+            connman.PushMessage(pfrom, CNetMsgMaker(nSendVersion).Make("alert", finalAlert));
+        }
+
         // Feeler connections exist only to verify if address is online.
         if (pfrom->fFeeler) {
             assert(pfrom->fInbound == false);

From 44f2baac486688dd499611f77a0cf73276758bf9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pavel=20Jan=C3=ADk?= <Pavel@Janik.cz>
Date: Thu, 19 Jan 2017 20:39:03 +0100
Subject: [PATCH 1618/1802] Do not shadow local variable named `tx`.

---
 src/net_processing.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/net_processing.cpp b/src/net_processing.cpp
index 36a52576357ee..5027c5109c1bb 100644
--- a/src/net_processing.cpp
+++ b/src/net_processing.cpp
@@ -1877,8 +1877,8 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
             }
         }
 
-        for (const CTransactionRef& tx : lRemovedTxn)
-            AddToCompactExtraTransactions(tx);
+        for (const CTransactionRef& removedTx : lRemovedTxn)
+            AddToCompactExtraTransactions(removedTx);
 
         int nDoS = 0;
         if (state.IsInvalid(nDoS))

From fe8e8efcf91fa92db68aabeb0a1709b032e60dd6 Mon Sep 17 00:00:00 2001
From: Alex Morcos <morcos@chaincode.com>
Date: Thu, 19 Jan 2017 21:18:46 -0500
Subject: [PATCH 1619/1802] [rpc] Add incremental relay fee to getnetworkinfo

---
 src/rpc/net.cpp          | 3 +++
 src/wallet/rpcwallet.cpp | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/rpc/net.cpp b/src/rpc/net.cpp
index 27b9963a102d9..36c22943791ed 100644
--- a/src/rpc/net.cpp
+++ b/src/rpc/net.cpp
@@ -10,6 +10,7 @@
 #include "net.h"
 #include "net_processing.h"
 #include "netbase.h"
+#include "policy/policy.h"
 #include "protocol.h"
 #include "sync.h"
 #include "timedata.h"
@@ -417,6 +418,7 @@ UniValue getnetworkinfo(const JSONRPCRequest& request)
             "  ,...\n"
             "  ],\n"
             "  \"relayfee\": x.xxxxxxxx,                (numeric) minimum relay fee for non-free transactions in " + CURRENCY_UNIT + "/kB\n"
+            "  \"incrementalfee\": x.xxxxxxxx,          (numeric) minimum fee increment for mempool limiting or BIP 125 replacement in " + CURRENCY_UNIT + "/kB\n"
             "  \"localaddresses\": [                    (array) list of local addresses\n"
             "  {\n"
             "    \"address\": \"xxxx\",                 (string) network address\n"
@@ -447,6 +449,7 @@ UniValue getnetworkinfo(const JSONRPCRequest& request)
     }
     obj.push_back(Pair("networks",      GetNetworksInfo()));
     obj.push_back(Pair("relayfee",      ValueFromAmount(::minRelayTxFee.GetFeePerK())));
+    obj.push_back(Pair("incrementalfee", ValueFromAmount(::incrementalRelayFee.GetFeePerK())));
     UniValue localAddresses(UniValue::VARR);
     {
         LOCK(cs_mapLocalHost);
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index c0f7bbcb42fab..b62fbeb10eb4e 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -2652,8 +2652,8 @@ UniValue bumpfee(const JSONRPCRequest& request)
             "By default, the new fee will be calculated automatically using estimatefee.\n"
             "The user can specify a confirmation target for estimatefee.\n"
             "Alternatively, the user can specify totalFee, or use RPC setpaytxfee to set a higher fee rate.\n"
-            "At a minimum, the new fee rate must be high enough to pay a new relay fee over the original fee\n"
-            "to enter the node's mempool.\n"
+            "At a minimum, the new fee rate must be high enough to pay an additional new relay fee (incrementalfee\n"
+            "returned by getnetworkinfo) to enter the node's mempool.\n"
             "\nArguments:\n"
             "1. txid                  (string, required) The txid to be bumped\n"
             "2. options               (object, optional)\n"

From b8d1b81077e4d0efcf9aafc00954d6ecd3d72d31 Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Fri, 20 Jan 2017 14:38:27 +0100
Subject: [PATCH 1620/1802] trivial: squash missing field 'argNames'
 initializer warning in qt tests

The additional initializer is for the named arguments, which are unused
in the test (and unfilled global fields will be initialized to 0
anyhow), so this is a no-op apart from the warning.
---
 src/qt/test/rpcnestedtests.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/qt/test/rpcnestedtests.cpp b/src/qt/test/rpcnestedtests.cpp
index fbec5722b6c22..bd496f149c61c 100644
--- a/src/qt/test/rpcnestedtests.cpp
+++ b/src/qt/test/rpcnestedtests.cpp
@@ -29,7 +29,7 @@ static UniValue rpcNestedTest_rpc(const JSONRPCRequest& request)
 
 static const CRPCCommand vRPCCommands[] =
 {
-    { "test", "rpcNestedTest", &rpcNestedTest_rpc, true },
+    { "test", "rpcNestedTest", &rpcNestedTest_rpc, true, {} },
 };
 
 void RPCNestedTests::rpcNestedTests()

From af01cd3a3d0647c071e94d7b0bda7128fb9aeebe Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Fri, 20 Jan 2017 13:44:48 +0000
Subject: [PATCH 1621/1802] qt: Periodic translation update

---
 src/qt/bitcoinstrings.cpp      |   7 ++
 src/qt/locale/bitcoin_af_ZA.ts |  20 ++++
 src/qt/locale/bitcoin_ca.ts    |   4 -
 src/qt/locale/bitcoin_ca_ES.ts |   4 -
 src/qt/locale/bitcoin_cs.ts    |   4 -
 src/qt/locale/bitcoin_da.ts    |   4 -
 src/qt/locale/bitcoin_de.ts    |   4 -
 src/qt/locale/bitcoin_en.ts    |  73 +++++++++------
 src/qt/locale/bitcoin_en_GB.ts |   4 -
 src/qt/locale/bitcoin_es.ts    |  44 ++++++++-
 src/qt/locale/bitcoin_es_ES.ts |   4 -
 src/qt/locale/bitcoin_fi.ts    |   4 -
 src/qt/locale/bitcoin_fr.ts    |  32 +++++--
 src/qt/locale/bitcoin_it.ts    |   4 -
 src/qt/locale/bitcoin_ja.ts    |  24 ++++-
 src/qt/locale/bitcoin_ko_KR.ts |   4 -
 src/qt/locale/bitcoin_nb.ts    |   4 -
 src/qt/locale/bitcoin_nl.ts    |   4 -
 src/qt/locale/bitcoin_pl.ts    | 166 +++++++++++++++++++++++++++++++--
 src/qt/locale/bitcoin_pt_BR.ts |  20 +++-
 src/qt/locale/bitcoin_pt_PT.ts |   4 -
 src/qt/locale/bitcoin_ru.ts    |   4 -
 src/qt/locale/bitcoin_sv.ts    |   4 -
 src/qt/locale/bitcoin_tr.ts    |   4 -
 src/qt/locale/bitcoin_uk.ts    |   4 -
 src/qt/locale/bitcoin_zh_CN.ts |   4 -
 src/qt/locale/bitcoin_zh_TW.ts |  24 ++++-
 27 files changed, 348 insertions(+), 134 deletions(-)

diff --git a/src/qt/bitcoinstrings.cpp b/src/qt/bitcoinstrings.cpp
index 64bc7dac038cb..a1e5cccc0b874 100644
--- a/src/qt/bitcoinstrings.cpp
+++ b/src/qt/bitcoinstrings.cpp
@@ -78,6 +78,9 @@ QT_TRANSLATE_NOOP("bitcoin-core", ""
 "Execute command when the best block changes (%s in cmd is replaced by block "
 "hash)"),
 QT_TRANSLATE_NOOP("bitcoin-core", ""
+"Extra transactions to keep in memory for compact block reconstructions "
+"(default: %u)"),
+QT_TRANSLATE_NOOP("bitcoin-core", ""
 "Fees (in %s/kB) smaller than this are considered zero fee for relaying, "
 "mining and transaction creation (default: %s)"),
 QT_TRANSLATE_NOOP("bitcoin-core", ""
@@ -95,6 +98,10 @@ QT_TRANSLATE_NOOP("bitcoin-core", ""
 "If paytxfee is not set, include enough fee so transactions begin "
 "confirmation on average within n blocks (default: %u)"),
 QT_TRANSLATE_NOOP("bitcoin-core", ""
+"If this block is in the chain assume that it and its ancestors are valid and "
+"potentially skip their script verification (0 to verify all, default: %s, "
+"testnet: %s)"),
+QT_TRANSLATE_NOOP("bitcoin-core", ""
 "Invalid amount for -maxtxfee=<amount>: '%s' (must be at least the minrelay "
 "fee of %s to prevent stuck transactions)"),
 QT_TRANSLATE_NOOP("bitcoin-core", ""
diff --git a/src/qt/locale/bitcoin_af_ZA.ts b/src/qt/locale/bitcoin_af_ZA.ts
index 1db5008384f9d..1679482c771c0 100644
--- a/src/qt/locale/bitcoin_af_ZA.ts
+++ b/src/qt/locale/bitcoin_af_ZA.ts
@@ -9,10 +9,22 @@
         <source>Copy the currently selected address to the system clipboard</source>
         <translation>Maak 'n kopie van die huidige adres na die stelsel klipbord</translation>
     </message>
+    <message>
+        <source>&amp;Copy</source>
+        <translation>&amp;Kopie</translation>
+    </message>
+    <message>
+        <source>Delete the currently selected address from the list</source>
+        <translation>Verwyder die huidiglik gekieste address van die lys</translation>
+    </message>
     <message>
         <source>&amp;Delete</source>
         <translation>&amp;Verwyder</translation>
     </message>
+    <message>
+        <source>Choose the address to send coins to</source>
+        <translation>Kies die address na wie die muntstukke gestuur moet word</translation>
+    </message>
     </context>
 <context>
     <name>AddressTableModel</name>
@@ -410,6 +422,14 @@
         <source>Copy amount</source>
         <translation>Kopieer bedrag</translation>
     </message>
+    <message>
+        <source>%1 to %2</source>
+        <translation>%1 tot %2</translation>
+    </message>
+    <message>
+        <source>or</source>
+        <translation>of</translation>
+    </message>
     <message>
         <source>(no label)</source>
         <translation>(geen etiket)</translation>
diff --git a/src/qt/locale/bitcoin_ca.ts b/src/qt/locale/bitcoin_ca.ts
index c09d857632794..fd5a197c3e213 100644
--- a/src/qt/locale/bitcoin_ca.ts
+++ b/src/qt/locale/bitcoin_ca.ts
@@ -2821,10 +2821,6 @@
         <source>Prune: last wallet synchronisation goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of pruned node)</source>
         <translation>Poda: la darrera sincronització del moneder va més enllà de les dades podades. Cal que activeu -reindex (baixeu tota la cadena de blocs de nou en cas de node podat)</translation>
     </message>
-    <message>
-        <source>Reduce storage requirements by pruning (deleting) old blocks. This mode is incompatible with -txindex and -rescan. Warning: Reverting this setting requires re-downloading the entire blockchain. (default: 0 = disable pruning blocks, &gt;%u = target size in MiB to use for block files)</source>
-        <translation>Reduïu els requisits d'emmagatzematge podant (suprimint) els blocs antics. Aquest mode és incompatible amb -txindex i -rescan. Avís: la reversió d'aquest paràmetre implica haver de tornar a baixar la cadena de blocs sencera. (per defecte: 0 = inhabilita la poda de blocs, &gt;%u = mida objectiu en MiB per utilitzar en els fitxers de blocs)</translation>
-    </message>
     <message>
         <source>Rescans are not possible in pruned mode. You will need to use -reindex which will download the whole blockchain again.</source>
         <translation>Els rescanejos no són possible en el mode de poda. Caldrà que utilitzeu -reindex, que tornarà a baixar la cadena de blocs sencera.</translation>
diff --git a/src/qt/locale/bitcoin_ca_ES.ts b/src/qt/locale/bitcoin_ca_ES.ts
index 838190b10e489..f88508a10fcdc 100644
--- a/src/qt/locale/bitcoin_ca_ES.ts
+++ b/src/qt/locale/bitcoin_ca_ES.ts
@@ -2821,10 +2821,6 @@
         <source>Prune: last wallet synchronisation goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of pruned node)</source>
         <translation>Poda: la darrera sincronització del moneder va més enllà de les dades podades. Cal que activeu -reindex (baixeu tota la cadena de blocs de nou en cas de node podat)</translation>
     </message>
-    <message>
-        <source>Reduce storage requirements by pruning (deleting) old blocks. This mode is incompatible with -txindex and -rescan. Warning: Reverting this setting requires re-downloading the entire blockchain. (default: 0 = disable pruning blocks, &gt;%u = target size in MiB to use for block files)</source>
-        <translation>Reduïu els requisits d'emmagatzematge podant (suprimint) els blocs antics. Aquest mode és incompatible amb -txindex i -rescan. Avís: la reversió d'aquest paràmetre implica haver de tornar a baixar la cadena de blocs sencera. (per defecte: 0 = inhabilita la poda de blocs, &gt;%u = mida objectiu en MiB per utilitzar en els fitxers de blocs)</translation>
-    </message>
     <message>
         <source>Rescans are not possible in pruned mode. You will need to use -reindex which will download the whole blockchain again.</source>
         <translation>Els rescanejos no són possible en el mode de poda. Caldrà que utilitzeu -reindex, que tornarà a baixar la cadena de blocs sencera.</translation>
diff --git a/src/qt/locale/bitcoin_cs.ts b/src/qt/locale/bitcoin_cs.ts
index 3b5d7947f6bea..2e911af14cd23 100644
--- a/src/qt/locale/bitcoin_cs.ts
+++ b/src/qt/locale/bitcoin_cs.ts
@@ -3021,10 +3021,6 @@
         <source>Prune: last wallet synchronisation goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of pruned node)</source>
         <translation>Prořezávání: poslední synchronizace peněženky proběhla před už prořezanými daty. Je třeba provést -reindex (tedy v případě prořezávacího režimu stáhnout znovu celý řetězec bloků)</translation>
     </message>
-    <message>
-        <source>Reduce storage requirements by pruning (deleting) old blocks. This mode is incompatible with -txindex and -rescan. Warning: Reverting this setting requires re-downloading the entire blockchain. (default: 0 = disable pruning blocks, &gt;%u = target size in MiB to use for block files)</source>
-        <translation>Omezit nároky na úložný prostor prořezáváním (mazáním) starých bloků. Tento režim není slučitelný s -txindex ani -rescan. Upozornění: opětovná změna tohoto nastavení bude vyžadovat nové stažení celého řetězce bloků. (výchozí: 0 = bloky neprořezávat, &gt;%u = cílová velikost souborů s bloky, v MiB)</translation>
-    </message>
     <message>
         <source>Rescans are not possible in pruned mode. You will need to use -reindex which will download the whole blockchain again.</source>
         <translation>V prořezávacím režimu není možné přeskenovávat řetězec bloků. Musíš provést -reindex, což znovu stáhne celý řetězec bloků.</translation>
diff --git a/src/qt/locale/bitcoin_da.ts b/src/qt/locale/bitcoin_da.ts
index 0b49b5aefcd97..75eb5ae94da21 100644
--- a/src/qt/locale/bitcoin_da.ts
+++ b/src/qt/locale/bitcoin_da.ts
@@ -3029,10 +3029,6 @@
         <source>Prune: last wallet synchronisation goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of pruned node)</source>
         <translation>Beskæring: Seneste synkronisering rækker udover beskårne data. Du er nødt til at bruge -reindex (downloade hele blokkæden igen i fald af beskåret knude)</translation>
     </message>
-    <message>
-        <source>Reduce storage requirements by pruning (deleting) old blocks. This mode is incompatible with -txindex and -rescan. Warning: Reverting this setting requires re-downloading the entire blockchain. (default: 0 = disable pruning blocks, &gt;%u = target size in MiB to use for block files)</source>
-        <translation>Reducér lagringskravene ved at beskære (slette) gamle blokke. Denne tilstand er ikke kompatibel med -txindex og -rescan. Advarsel: Fortrydelse af denne indstilling kræver gendownload af hele blokkæden. (standard: 0 = deaktivér beskæring af blokke, &gt;%u = målstørrelse i MiB der skal bruges på blokfiler)</translation>
-    </message>
     <message>
         <source>Rescans are not possible in pruned mode. You will need to use -reindex which will download the whole blockchain again.</source>
         <translation>Genindlæsninger er ikke mulige i beskåret tilstand. Du er nødt til at bruge -reindex, hvilket vil downloade hele blokkæden igen.</translation>
diff --git a/src/qt/locale/bitcoin_de.ts b/src/qt/locale/bitcoin_de.ts
index 1dfd77cf61c57..59a45e3175728 100644
--- a/src/qt/locale/bitcoin_de.ts
+++ b/src/qt/locale/bitcoin_de.ts
@@ -3005,10 +3005,6 @@
         <source>Prune: last wallet synchronisation goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of pruned node)</source>
         <translation>Prune (Kürzung): Die letzte Syncronisation der Wallet liegt vor gekürzten (gelöschten) Blöcken. Es ist ein -reindex (download der gesamten Blockkette) notwendig.</translation>
     </message>
-    <message>
-        <source>Reduce storage requirements by pruning (deleting) old blocks. This mode is incompatible with -txindex and -rescan. Warning: Reverting this setting requires re-downloading the entire blockchain. (default: 0 = disable pruning blocks, &gt;%u = target size in MiB to use for block files)</source>
-        <translation>Speicherplatzanforderung durch kürzen (löschen) alter Blöcke reduzieren. Dieser Modus ist nicht mit -txindex und -rescan kompatibel. Warnung: Die Umkehr dieser Einstellung erfordert das erneute Herunterladen der gesamten Blockkette. (Standard: 0 = deaktiviert das Kürzen von Blöcken, &gt;%u = Zielgröße in MiB, die für Blockdateien verwendet werden darf)</translation>
-    </message>
     <message>
         <source>Rescans are not possible in pruned mode. You will need to use -reindex which will download the whole blockchain again.</source>
         <translation>Rescans sind im pruned mode nicht möglich. Ein -reindex ist notwendig, welcher die gesmate Blockkette erneut herunterlädt.</translation>
diff --git a/src/qt/locale/bitcoin_en.ts b/src/qt/locale/bitcoin_en.ts
index 60dcc9f701c5a..dcfd86f366557 100644
--- a/src/qt/locale/bitcoin_en.ts
+++ b/src/qt/locale/bitcoin_en.ts
@@ -304,12 +304,12 @@
         <translation>Sign &amp;message...</translation>
     </message>
     <message>
-        <location line="+417"/>
+        <location line="+427"/>
         <source>Synchronizing with network...</source>
         <translation>Synchronizing with network...</translation>
     </message>
     <message>
-        <location line="-495"/>
+        <location line="-505"/>
         <source>&amp;Overview</source>
         <translation>&amp;Overview</translation>
     </message>
@@ -419,12 +419,17 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+53"/>
+        <location line="+27"/>
+        <source>Syncing Headers (%1%)...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+37"/>
         <source>Reindexing blocks on disk...</source>
         <translation>Reindexing blocks on disk...</translation>
     </message>
     <message>
-        <location line="-497"/>
+        <location line="-508"/>
         <source>Send coins to a Bitcoin address</source>
         <translation>Send coins to a Bitcoin address</translation>
     </message>
@@ -454,12 +459,12 @@
         <translation>&amp;Verify message...</translation>
     </message>
     <message>
-        <location line="+504"/>
+        <location line="+514"/>
         <source>Bitcoin</source>
         <translation>Bitcoin</translation>
     </message>
     <message>
-        <location line="-729"/>
+        <location line="-739"/>
         <source>Wallet</source>
         <translation>Wallet</translation>
     </message>
@@ -552,7 +557,7 @@
         </translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+60"/>
         <source>Indexing blocks on disk...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -561,13 +566,8 @@
         <source>Processing blocks on disk...</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+11"/>
-        <source>No block source available...</source>
-        <translation>No block source available...</translation>
-    </message>
     <message numerus="yes">
-        <location line="+9"/>
+        <location line="+19"/>
         <source>Processed %n block(s) of transaction history.</source>
         <translation>
             <numerusform>Processed %n block of transaction history.</numerusform>
@@ -610,7 +610,7 @@
         <translation>Up to date</translation>
     </message>
     <message>
-        <location line="-428"/>
+        <location line="-438"/>
         <source>Show the %1 help message to get a list with possible Bitcoin command-line options</source>
         <translation type="unfinished"></translation>
     </message>
@@ -620,7 +620,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+255"/>
+        <location line="+227"/>
+        <source>Connecting to peers...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+38"/>
         <source>Catching up...</source>
         <translation>Catching up...</translation>
     </message>
@@ -3862,7 +3867,7 @@
 <context>
     <name>bitcoin-core</name>
     <message>
-        <location filename="../bitcoinstrings.cpp" line="+311"/>
+        <location filename="../bitcoinstrings.cpp" line="+318"/>
         <source>Options:</source>
         <translation>Options:</translation>
     </message>
@@ -3887,7 +3892,7 @@
         <translation>Accept command line and JSON-RPC commands</translation>
     </message>
     <message>
-        <location line="-214"/>
+        <location line="-221"/>
         <source>Accept connections from outside (default: 1 if no -proxy or -connect/-noconnect)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3902,12 +3907,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+37"/>
         <source>If &lt;category&gt; is not supplied or if &lt;category&gt; = 1, output all debugging information.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+36"/>
         <source>Prune configured below the minimum of %d MiB.  Please use a higher number.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3947,7 +3952,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-353"/>
+        <location line="-360"/>
         <source>Bitcoin Core</source>
         <translation type="unfinished">Bitcoin Core</translation>
     </message>
@@ -3997,7 +4002,17 @@
         <translation>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+6"/>
+        <source>Extra transactions to keep in memory for compact block reconstructions (default: %u)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>If this block is in the chain assume that it and its ancestors are valid and potentially skip their script verification (0 to verify all, default: %s, testnet: %s)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
         <source>Maximum allowed median peer time offset adjustment. Local perspective of time may be influenced by peers forward or backward by this amount. (default: %u seconds)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4402,7 +4417,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-351"/>
+        <location line="-358"/>
         <source>Allow JSON-RPC connections from specified source. Valid for &lt;ip&gt; are a single IP (e.g. 1.2.3.4), a network/netmask (e.g. 1.2.3.4/255.255.255.0) or a network/CIDR (e.g. 1.2.3.4/24). This option can be specified multiple times</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4437,7 +4452,7 @@
         <translation>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+12"/>
         <source>Fees (in %s/kB) smaller than this are considered zero fee for relaying, mining and transaction creation (default: %s)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4447,7 +4462,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="+7"/>
         <source>Invalid amount for -maxtxfee=&lt;amount&gt;: &apos;%s&apos; (must be at least the minrelay fee of %s to prevent stuck transactions)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4667,12 +4682,12 @@
         <translation>Password for JSON-RPC connections</translation>
     </message>
     <message>
-        <location line="-235"/>
+        <location line="-242"/>
         <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
         <translation>Execute command when the best block changes (%s in cmd is replaced by block hash)</translation>
     </message>
     <message>
-        <location line="+163"/>
+        <location line="+170"/>
         <source>Allow DNS lookups for -addnode, -seednode and -connect</source>
         <translation>Allow DNS lookups for -addnode, -seednode and -connect</translation>
     </message>
@@ -4682,7 +4697,7 @@
         <translation>Loading addresses...</translation>
     </message>
     <message>
-        <location line="-284"/>
+        <location line="-291"/>
         <source>(1 = keep tx meta data e.g. account owner and payment request information, 2 = drop tx meta data)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4702,7 +4717,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+24"/>
         <source>Fees (in %s/kB) smaller than this are considered zero fee for transaction creation (default: %s)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4717,7 +4732,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
+        <location line="+15"/>
         <source>Maintain a full transaction index, used by the getrawtransaction rpc call (default: %u)</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/src/qt/locale/bitcoin_en_GB.ts b/src/qt/locale/bitcoin_en_GB.ts
index 1676f67979e26..df3aad508762d 100644
--- a/src/qt/locale/bitcoin_en_GB.ts
+++ b/src/qt/locale/bitcoin_en_GB.ts
@@ -1873,10 +1873,6 @@
         <source>Prune: last wallet synchronisation goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of pruned node)</source>
         <translation>Prune: last wallet synchronisation goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of pruned node)</translation>
     </message>
-    <message>
-        <source>Reduce storage requirements by pruning (deleting) old blocks. This mode is incompatible with -txindex and -rescan. Warning: Reverting this setting requires re-downloading the entire blockchain. (default: 0 = disable pruning blocks, &gt;%u = target size in MiB to use for block files)</source>
-        <translation>Reduce storage requirements by pruning (deleting) old blocks. This mode is incompatible with -txindex and -rescan. Warning: Reverting this setting requires re-downloading the entire blockchain. (default: 0 = disable pruning blocks, &gt;%u = target size in MiB to use for block files)</translation>
-    </message>
     <message>
         <source>Rescans are not possible in pruned mode. You will need to use -reindex which will download the whole blockchain again.</source>
         <translation>Rescans are not possible in pruned mode. You will need to use -reindex which will download the whole blockchain again.</translation>
diff --git a/src/qt/locale/bitcoin_es.ts b/src/qt/locale/bitcoin_es.ts
index 5ba44a954c849..b1e35148d7a96 100644
--- a/src/qt/locale/bitcoin_es.ts
+++ b/src/qt/locale/bitcoin_es.ts
@@ -1704,6 +1704,10 @@
         <source>Ban for</source>
         <translation>Prohibir para</translation>
     </message>
+    <message>
+        <source>&amp;Unban</source>
+        <translation>&amp;Unbano</translation>
+    </message>
     <message>
         <source>Welcome to the %1 RPC console.</source>
         <translation>Bienvenido a la consola RPC %1.</translation>
@@ -1716,6 +1720,14 @@
         <source>Type &lt;b&gt;help&lt;/b&gt; for an overview of available commands.</source>
         <translation>Escriba &lt;b&gt;help&lt;/b&gt; para ver un resumen de los comandos disponibles.</translation>
     </message>
+    <message>
+        <source>WARNING: Scammers have been active, telling users to type commands here, stealing their wallet contents. Do not use this console without fully understanding the ramification of a command.</source>
+        <translation>ADVERTENCIA: Los estafadores han sido activados, diciéndoles a los usuarios que escriban comandos aquí, robando el contenido de sus monederos. No utilice esta consola sin entender completamente la repercusión de un comando.</translation>
+    </message>
+    <message>
+        <source>Network activity disabled</source>
+        <translation>Actividad de red deshabilitada</translation>
+    </message>
     <message>
         <source>%1 B</source>
         <translation>%1 B</translation>
@@ -1835,6 +1847,10 @@
         <source>Remove</source>
         <translation>Eliminar</translation>
     </message>
+    <message>
+        <source>Copy URI</source>
+        <translation>Copiar URI</translation>
+    </message>
     <message>
         <source>Copy label</source>
         <translation>Copiar capa</translation>
@@ -2060,6 +2076,10 @@
         <source>Dust:</source>
         <translation>Polvo:</translation>
     </message>
+    <message>
+        <source>Confirmation time target:</source>
+        <translation>Objetivo de tiempo de confirmación</translation>
+    </message>
     <message>
         <source>Clear &amp;All</source>
         <translation>Vaciar &amp;todo</translation>
@@ -2152,6 +2172,10 @@
         <source>Transaction creation failed!</source>
         <translation>¡Falló la creación de transacción!</translation>
     </message>
+    <message>
+        <source>The transaction was rejected with the following reason: %1</source>
+        <translation>Se ha rechazado la transacción por la siguiente razón: %1</translation>
+    </message>
     <message>
         <source>A fee higher than %1 is considered an absurdly high fee.</source>
         <translation>Una comisión mayor que %1 se considera una cuota irracionalmente alta.</translation>
@@ -2160,10 +2184,18 @@
         <source>Payment request expired.</source>
         <translation>Solicitud de pago caducada.</translation>
     </message>
+    <message numerus="yes">
+        <source>%n block(s)</source>
+        <translation><numerusform>%n bloque</numerusform><numerusform>%n bloques</numerusform></translation>
+    </message>
     <message>
         <source>Pay only the required fee of %1</source>
         <translation>Pagar únicamente la comisión solicitada de %1</translation>
     </message>
+    <message numerus="yes">
+        <source>Estimated to begin confirmation within %n block(s).</source>
+        <translation><numerusform>Estimado para empezar la confirmación dentro de %n bloque.</numerusform><numerusform>Estimado para empezar la confirmación dentro de %n bloques.</numerusform></translation>
+    </message>
     <message>
         <source>Warning: Invalid Bitcoin address</source>
         <translation>Alerta: dirección Bitcoin inválida</translation>
@@ -2172,6 +2204,14 @@
         <source>Warning: Unknown change address</source>
         <translation>Alerta: dirección cambiada desconocida</translation>
     </message>
+    <message>
+        <source>Confirm custom change address</source>
+        <translation>Confirmar dirección de cambio personalizada</translation>
+    </message>
+    <message>
+        <source>The address you selected for change is not part of this wallet. Any or all funds in your wallet may be sent to this address. Are you sure?</source>
+        <translation>La dirección que ha seleccionado para cambiar no es parte de este monedero. ninguno o todos los fondos de su monedero pueden ser enviados a esta dirección. ¿Está seguro?</translation>
+    </message>
     <message>
         <source>(no label)</source>
         <translation>(sin etiqueta)</translation>
@@ -2959,10 +2999,6 @@
         <source>Prune: last wallet synchronisation goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of pruned node)</source>
         <translation>Poda: la ultima sincronizacion del monedero sobrepasa los datos podados. Necesitas reindexar con -reindex (o descargar la cadena de bloques de nuevo en el caso de un nodo podado)</translation>
     </message>
-    <message>
-        <source>Reduce storage requirements by pruning (deleting) old blocks. This mode is incompatible with -txindex and -rescan. Warning: Reverting this setting requires re-downloading the entire blockchain. (default: 0 = disable pruning blocks, &gt;%u = target size in MiB to use for block files)</source>
-        <translation>Reduce los requisitos de almacenaje podando (eliminando) los bloques viejos. Este modo es incompatible con -txindex y -rescan. Advertencia: Revertir este ajuste requiere volver a descargar la cadena de bloques al completo. (predeterminado: 0 = deshabilitar la poda de bloques, &gt;%u = objetivo de tamaño en MiB para usar para los archivos de bloques)</translation>
-    </message>
     <message>
         <source>Rescans are not possible in pruned mode. You will need to use -reindex which will download the whole blockchain again.</source>
         <translation>Nos es posible re-escanear en modo podado.Necesitas utilizar -reindex el cual descargara la cadena de bloques al completo de nuevo.</translation>
diff --git a/src/qt/locale/bitcoin_es_ES.ts b/src/qt/locale/bitcoin_es_ES.ts
index c971d664d8bbe..996b209ea21d7 100644
--- a/src/qt/locale/bitcoin_es_ES.ts
+++ b/src/qt/locale/bitcoin_es_ES.ts
@@ -2839,10 +2839,6 @@
         <source>Prune: last wallet synchronisation goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of pruned node)</source>
         <translation>Poda:  la ultima sincronizacion de la cartera sobrepasa los datos podados. Necesitas reindexar con -reindex (o descargar la cadena de bloques de nuevo en el caso de un nodo podado)</translation>
     </message>
-    <message>
-        <source>Reduce storage requirements by pruning (deleting) old blocks. This mode is incompatible with -txindex and -rescan. Warning: Reverting this setting requires re-downloading the entire blockchain. (default: 0 = disable pruning blocks, &gt;%u = target size in MiB to use for block files)</source>
-        <translation>Reduce los requisitos de almacenaje podando (eliminando) los bloques viejos. Este modo es incompatible con -txindex y -rescan. Advertencia: Revertir este ajuste requiere volver a descargar la cadena de bloques al completo. (predeterminado: 0 = deshabilitar la poda de bloques, &gt;%u = objetivo de tamaño en MiB para usar para los archivos de bloques)</translation>
-    </message>
     <message>
         <source>Rescans are not possible in pruned mode. You will need to use -reindex which will download the whole blockchain again.</source>
         <translation>Nos es posible re-escanear en modo podado.Necesitas utilizar -reindex el cual descargara la cadena de bloques al completo de nuevo.</translation>
diff --git a/src/qt/locale/bitcoin_fi.ts b/src/qt/locale/bitcoin_fi.ts
index db643e73d23c6..ba8880c4aac3a 100644
--- a/src/qt/locale/bitcoin_fi.ts
+++ b/src/qt/locale/bitcoin_fi.ts
@@ -1757,10 +1757,6 @@
         <source>Prune: last wallet synchronisation goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of pruned node)</source>
         <translation>Karsinta: viime lompakon synkronisointi menee karsitun datan taakse. Sinun tarvitsee ajaa -reindex (lataa koko lohkoketju uudelleen tapauksessa jossa karsiva noodi)</translation>
     </message>
-    <message>
-        <source>Reduce storage requirements by pruning (deleting) old blocks. This mode is incompatible with -txindex and -rescan. Warning: Reverting this setting requires re-downloading the entire blockchain. (default: 0 = disable pruning blocks, &gt;%u = target size in MiB to use for block files)</source>
-        <translation>Vähennä levytilan tarvetta karsimalla (poistamalla) vanhoja lohkoja. Tämä tila ei ole yhteensopiva -txindex ja -rescan -parametrien kanssa. Varoitus: Tämän asetuksen peruutus vaatii koko lohkoketjun uudelleenlataamisen. (oletus: 0 = poista karsinta käytöstä, &gt;%u = kohdekoko muodossa MiB jota käytetään lohkotiedostoille) </translation>
-    </message>
     <message>
         <source>Rescans are not possible in pruned mode. You will need to use -reindex which will download the whole blockchain again.</source>
         <translation>Uudelleenskannaukset eivät ole mahdollisia karsivassa tilassa. Sinun täytyy käyttää -reindex joka lataa koko lohkoketjun uudelleen.</translation>
diff --git a/src/qt/locale/bitcoin_fr.ts b/src/qt/locale/bitcoin_fr.ts
index eef88b43a35a7..23b4d2a66fa1c 100644
--- a/src/qt/locale/bitcoin_fr.ts
+++ b/src/qt/locale/bitcoin_fr.ts
@@ -1998,11 +1998,11 @@
     </message>
     <message>
         <source>If this is activated, but the change address is empty or invalid, change will be sent to a newly generated address.</source>
-        <translation>Si cette option est activée, et l'adresse de monnaie rendue est vide ou invalide, la monnaie sera envoyée vers une adresse nouvellement générée.</translation>
+        <translation>Si cette option est activée et l'adresse de monnaie est vide ou invalide, la monnaie sera envoyée vers une adresse nouvellement générée.</translation>
     </message>
     <message>
         <source>Custom change address</source>
-        <translation>Adresse personnalisée de monnaie rendue</translation>
+        <translation>Adresse personnalisée de monnaie</translation>
     </message>
     <message>
         <source>Transaction Fee:</source>
@@ -2202,7 +2202,15 @@
     </message>
     <message>
         <source>Warning: Unknown change address</source>
-        <translation>Avertissement : adresse de monnaie rendue inconnue</translation>
+        <translation>Avertissement : adresse de monnaie inconnue</translation>
+    </message>
+    <message>
+        <source>Confirm custom change address</source>
+        <translation>Confimer l'adresse personnalisée de monnaie</translation>
+    </message>
+    <message>
+        <source>The address you selected for change is not part of this wallet. Any or all funds in your wallet may be sent to this address. Are you sure?</source>
+        <translation>L'adresse que vous avez sélectionnée pour la monnaie ne fait pas partie de ce porte-monnaie. Les fonds de ce porte-monnaie peuvent en partie ou en totalité être envoyés vers cette adresse. Êtes-vous certain ?</translation>
     </message>
     <message>
         <source>(no label)</source>
@@ -2307,7 +2315,7 @@
     </message>
     <message>
         <source>Do not shut down the computer until this window disappears.</source>
-        <translation>Ne pas fermer l'ordinateur jusqu'à la disparition de cette fenêtre.</translation>
+        <translation>Ne pas éteindre l'ordinateur jusqu'à la disparition de cette fenêtre.</translation>
     </message>
 </context>
 <context>
@@ -3021,10 +3029,6 @@
         <source>Prune: last wallet synchronisation goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of pruned node)</source>
         <translation>Élagage : la dernière synchronisation de porte-monnaie va par-delà les données élaguées.  Vous devez -reindex (réindexer, télécharger de nouveau toute la chaîne de blocs en cas de nœud élagué)</translation>
     </message>
-    <message>
-        <source>Reduce storage requirements by pruning (deleting) old blocks. This mode is incompatible with -txindex and -rescan. Warning: Reverting this setting requires re-downloading the entire blockchain. (default: 0 = disable pruning blocks, &gt;%u = target size in MiB to use for block files)</source>
-        <translation>Réduire les exigences de stockage en élaguant (supprimant) les anciens blocs. Ce mode est incompatible avec -txindex et -rescan. Avertissement : ramener ce paramètre à sa valeur antérieure exige un nouveau téléchargement de la chaîne de blocs en entier (par défaut : 0 = désactiver l'élagage des blocs, &gt;%u = taille cible en Mio à utiliser pour les fichiers de blocs).</translation>
-    </message>
     <message>
         <source>Rescans are not possible in pruned mode. You will need to use -reindex which will download the whole blockchain again.</source>
         <translation>Les rebalayages sont impossibles en mode élagage. Vous devrez utiliser -reindex, ce qui téléchargera de nouveau la chaîne de blocs en entier.</translation>
@@ -3105,6 +3109,14 @@
         <source>Please contribute if you find %s useful. Visit %s for further information about the software.</source>
         <translation>Si vous trouvez %s utile, vous pouvez y contribuer. Vous trouverez davantage d'informations à propos du logiciel sur %s.</translation>
     </message>
+    <message>
+        <source>Reduce storage requirements by enabling pruning (deleting) of old blocks. This allows the pruneblockchain RPC to be called to delete specific blocks, and enables automatic pruning of old blocks if a target size in MiB is provided. This mode is incompatible with -txindex and -rescan. Warning: Reverting this setting requires re-downloading the entire blockchain. (default: 0 = disable pruning blocks, 1 = allow manual pruning via RPC, &gt;%u = automatically prune block files to stay under the specified target size in MiB)</source>
+        <translation>Réduire les exigences de stockage en activant l'élagage (suppression) des anciens blocs. Cela permet d'appeler le RPC « pruneblockchain » pour supprimer des blocs précis et active l'élagage automatique des anciens blocs si une taille cible en Mio est fournie. Ce mode n'est pas compatible avec -txindex et -rescan. Avertissement : ramener ce paramètre à sa valeur antérieure exige de retélécharger l'intégralité de la chaîne de blocs (par défaut : 0 = désactiver l'élagage des blocs, 1 = permettre l'élagage manuel par RPC, &gt;%u = élaguer automatiquement les fichiers de blocs pour rester en deçà de la taille cible précisée en Mio).</translation>
+    </message>
+    <message>
+        <source>Set lowest fee rate (in %s/kB) for transactions to be included in block creation. (default: %s)</source>
+        <translation>Définir le taux minimal de frais (en %s/ko) pour les transactions à inclure dans la création de blocs (par défaut : %s)</translation>
+    </message>
     <message>
         <source>Set the number of script verification threads (%u to %d, 0 = auto, &lt;0 = leave that many cores free, default: %d)</source>
         <translation>Définir le nombre de fils de vérification des scripts (%u à %d, 0 = auto, &lt; 0 = laisser ce nombre de cœurs inutilisés, par défaut : %d)</translation>
@@ -3125,6 +3137,10 @@
         <source>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</source>
         <translation>Utiliser l'UPnP pour mapper le port d'écoute (par défaut : 1 en écoute et sans -proxy)</translation>
     </message>
+    <message>
+        <source>Username and hashed password for JSON-RPC connections. The field &lt;userpw&gt; comes in the format: &lt;USERNAME&gt;:&lt;SALT&gt;$&lt;HASH&gt;. A canonical python script is included in share/rpcuser. The client then connects normally using the rpcuser=&lt;USERNAME&gt;/rpcpassword=&lt;PASSWORD&gt; pair of arguments. This option can be specified multiple times</source>
+        <translation>Nom d'utilisateur et mot de passe haché pour les connexions JSON-RPC. Le champ &lt;userpw&gt; est au format : &lt;USERNAME&gt;:&lt;SALT&gt;$&lt;HASH&gt;. Un script python canonique est inclus dans share/rpcuser. Le client se connecte ensuite normalement en utilisant la paire d'arguments rpcuser=&lt;USERNAME&gt;/rpcpassword=&lt;PASSWORD&gt;. Cette option peut être spécifiée plusieurs fois.</translation>
+    </message>
     <message>
         <source>Wallet will not create transactions that violate mempool chain limits (default: %u)</source>
         <translation>Un porte-monnaie ne créera aucune transaction qui enfreint les limites de chaîne de la réserve de mémoire (par défaut : %u)</translation>
diff --git a/src/qt/locale/bitcoin_it.ts b/src/qt/locale/bitcoin_it.ts
index 76cfdfafa53c8..1e359e52e58a6 100644
--- a/src/qt/locale/bitcoin_it.ts
+++ b/src/qt/locale/bitcoin_it.ts
@@ -1942,10 +1942,6 @@ Per specificare più URL separarli con una barra verticale "|".</translation>
         <source>Prune: last wallet synchronisation goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of pruned node)</source>
         <translation>Prune: l'ultima sincronizzazione del wallet risulta essere oltre la riduzione dei dati. È necessario eseguire un -reindex (scaricare nuovamente la blockchain in caso di nodo pruned)</translation>
     </message>
-    <message>
-        <source>Reduce storage requirements by pruning (deleting) old blocks. This mode is incompatible with -txindex and -rescan. Warning: Reverting this setting requires re-downloading the entire blockchain. (default: 0 = disable pruning blocks, &gt;%u = target size in MiB to use for block files)</source>
-        <translation>Riduce i requisiti di spazio di archiviazione attraverso la rimozione dei vecchi blocchi (pruning). Questa modalità è incompatibile con l'opzione -txindex e -rescan. Attenzione: ripristinando questa opzione l'intera blockchain dovrà essere riscaricata. (default: 0 = disabilita il pruning, &gt;%u = dimensione desiderata in MiB per i file dei blocchi)</translation>
-    </message>
     <message>
         <source>Rescans are not possible in pruned mode. You will need to use -reindex which will download the whole blockchain again.</source>
         <translation>Non è possibile un Rescan in modalità pruned. Sarà necessario utilizzare -reindex che farà scaricare nuovamente tutta la blockchain.</translation>
diff --git a/src/qt/locale/bitcoin_ja.ts b/src/qt/locale/bitcoin_ja.ts
index 3b56a7685501c..0f3c9e596a7ec 100644
--- a/src/qt/locale/bitcoin_ja.ts
+++ b/src/qt/locale/bitcoin_ja.ts
@@ -2204,6 +2204,14 @@
         <source>Warning: Unknown change address</source>
         <translation>警告：未知のおつりアドレスです</translation>
     </message>
+    <message>
+        <source>Confirm custom change address</source>
+        <translation>カスタムおつりアドレスを確認</translation>
+    </message>
+    <message>
+        <source>The address you selected for change is not part of this wallet. Any or all funds in your wallet may be sent to this address. Are you sure?</source>
+        <translation>おつりとして指定されたアドレスはこのウォレットに属さないもののようです。このウォレットの一部またはすべての資産がこのアドレスへ送金されます。よろしいですか？</translation>
+    </message>
     <message>
         <source>(no label)</source>
         <translation>（ラベル無し）</translation>
@@ -3021,10 +3029,6 @@
         <source>Prune: last wallet synchronisation goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of pruned node)</source>
         <translation>剪定: 最後のウォレット同期ポイントは、選定されたデータよりも過去のものとなっています。-reindexをする必要があります (剪定されたノードの場合、ブロックチェイン全体をダウンロードします)</translation>
     </message>
-    <message>
-        <source>Reduce storage requirements by pruning (deleting) old blocks. This mode is incompatible with -txindex and -rescan. Warning: Reverting this setting requires re-downloading the entire blockchain. (default: 0 = disable pruning blocks, &gt;%u = target size in MiB to use for block files)</source>
-        <translation>古いブロックを剪定する (削除する) ことで記憶容量の必要量を削減する。このモードを有効にすると-txindexや-rescanと互換性がなくなります。警告: この設定の再有効化には全ブロックチェインの再ダウンロードが必要となります。(規定値: 0 = ブロックの剪定無効、&gt;%u = ブロックファイルに使用するMiB単位の目標サイズ)</translation>
-    </message>
     <message>
         <source>Rescans are not possible in pruned mode. You will need to use -reindex which will download the whole blockchain again.</source>
         <translation>剪定モードでは再スキャンを行うことはできません。-reindexを指定し、ブロックチェイン全体を再ダウンロードする必要があります。</translation>
@@ -3105,6 +3109,14 @@
         <source>Please contribute if you find %s useful. Visit %s for further information about the software.</source>
         <translation>%s が有用だと感じられた方はぜひプロジェクトへの貢献をお願いします。ソフトウェアのより詳細な情報については %s をご覧ください。</translation>
     </message>
+    <message>
+        <source>Reduce storage requirements by enabling pruning (deleting) of old blocks. This allows the pruneblockchain RPC to be called to delete specific blocks, and enables automatic pruning of old blocks if a target size in MiB is provided. This mode is incompatible with -txindex and -rescan. Warning: Reverting this setting requires re-downloading the entire blockchain. (default: 0 = disable pruning blocks, 1 = allow manual pruning via RPC, &gt;%u = automatically prune block files to stay under the specified target size in MiB)</source>
+        <translation>古いブロックの剪定 (削除) を有効にすることでストレージの必要量を削減する。これにより pruneblockchain RPC を呼び出すことで指定されたブロックを削除することができます。またターゲットサイズが MiB 単位で指定された場合には古いブロックの自動剪定が有効となります。このモードは -txindex および -rescan オプションと互換性がありません。警告: この設定を最有効化するにはすべてのブロックチェーンの再ダウンロードが必要となります。(デフォルト: 0 = ブロックの剪定を無効化する, 1 = RPC 経由での手動剪定を許可する, &gt;%u = MiB 単位で指定されたターゲットサイズを常に下回るようにブロックファイルを自動的に剪定する)</translation>
+    </message>
+    <message>
+        <source>Set lowest fee rate (in %s/kB) for transactions to be included in block creation. (default: %s)</source>
+        <translation>ブロック生成時に取り込まれるトランザクションの最低手数料率 (%s/kB 単位)。(デフォルト: %s)</translation>
+    </message>
     <message>
         <source>Set the number of script verification threads (%u to %d, 0 = auto, &lt;0 = leave that many cores free, default: %d)</source>
         <translation>スクリプト検証スレッドを設定 (%uから%dの間, 0 = 自動, &lt;0 = たくさんのコアを自由にしておく, 初期値: %d)</translation>
@@ -3125,6 +3137,10 @@
         <source>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</source>
         <translation>リスン ポートの割当に UPnP を使用 (初期値: リスン中および-proxyが指定されていない場合は1)</translation>
     </message>
+    <message>
+        <source>Username and hashed password for JSON-RPC connections. The field &lt;userpw&gt; comes in the format: &lt;USERNAME&gt;:&lt;SALT&gt;$&lt;HASH&gt;. A canonical python script is included in share/rpcuser. The client then connects normally using the rpcuser=&lt;USERNAME&gt;/rpcpassword=&lt;PASSWORD&gt; pair of arguments. This option can be specified multiple times</source>
+        <translation>JSON-RPC 接続時のユーザ名とハッシュ化されたパスワード。&lt;userpw&gt; フィールドのフォーマットは &lt;USERNAME&gt;:&lt;SALT&gt;$&lt;HASH&gt;。標準的な Python スクリプトが share/rpcuser 内に含まれています。クライアントは通常の場合には rpcuser=&lt;USERNAME&gt;/rpcpassword=&lt;PASSWORD&gt; を利用して接続を行います。このオプションは複数回指定できます。</translation>
+    </message>
     <message>
         <source>Wallet will not create transactions that violate mempool chain limits (default: %u)</source>
         <translation>ウォレットがmempoolチェーン制限数を超えてトランザクションを作らないようにする (初期値: %u)</translation>
diff --git a/src/qt/locale/bitcoin_ko_KR.ts b/src/qt/locale/bitcoin_ko_KR.ts
index a80c6ccc452c6..b5af4602c8664 100644
--- a/src/qt/locale/bitcoin_ko_KR.ts
+++ b/src/qt/locale/bitcoin_ko_KR.ts
@@ -2277,10 +2277,6 @@
         <source>Prune: last wallet synchronisation goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of pruned node)</source>
         <translation>블록 축소: 마지막 지갑 동기화 지점이 축소된 데이터보다 과거의 것 입니다. -reindex가 필요합니다 (정지된 노드의 경우 모든 블록체인을 재다운로드합니다)</translation>
     </message>
-    <message>
-        <source>Reduce storage requirements by pruning (deleting) old blocks. This mode is incompatible with -txindex and -rescan. Warning: Reverting this setting requires re-downloading the entire blockchain. (default: 0 = disable pruning blocks, &gt;%u = target size in MiB to use for block files)</source>
-        <translation>오래된 블록을 제거(축소)하여 디스크 용량을 줄입니다. 이 모드는 -txindex 와 -rescan 과 호환되지 않습니다. 경고: 이 모드를 취소하면 모든 블록체인을 다시 다운로드 받아야 합니다. (기본값:0 = 블록 축소 비활성화, &gt;%u = 블록파일에 사용할 용량을 MiB단위로 지정)</translation>
-    </message>
     <message>
         <source>Rescans are not possible in pruned mode. You will need to use -reindex which will download the whole blockchain again.</source>
         <translation>블록 축소 모드에서는 재검색이 불가능 합니다. -reindex 명령을 사용해서 모든 블록체인을 다시 다운로드 해야 합니다.</translation>
diff --git a/src/qt/locale/bitcoin_nb.ts b/src/qt/locale/bitcoin_nb.ts
index f98cdd32d22be..1f76fdb0b3f5b 100644
--- a/src/qt/locale/bitcoin_nb.ts
+++ b/src/qt/locale/bitcoin_nb.ts
@@ -1709,10 +1709,6 @@
         <source>Prune: last wallet synchronisation goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of pruned node)</source>
         <translation>Beskjæring: siste lommeboksynkronisering går utenfor beskjærte data. Du må bruke -reindex (laster ned hele blokkjeden igjen for beskjærte noder)</translation>
     </message>
-    <message>
-        <source>Reduce storage requirements by pruning (deleting) old blocks. This mode is incompatible with -txindex and -rescan. Warning: Reverting this setting requires re-downloading the entire blockchain. (default: 0 = disable pruning blocks, &gt;%u = target size in MiB to use for block files)</source>
-        <translation>Reduser lagringsbehovet ved beskjæring (sletting) av gamle blokker. Denne modusen er ikke kompatibel med -txindex og -rescan. Advarsel: Tilbakestilling av denne innstillingen krever at hele blokkjeden må lastes ned på nytt. (Standardverdi: 0 = deaktiver beskjæring av blokker, &gt;%u = mål for størrelse i MiB å bruke for blokkfiler)</translation>
-    </message>
     <message>
         <source>Rescans are not possible in pruned mode. You will need to use -reindex which will download the whole blockchain again.</source>
         <translation>Omsøk er ikke mulig i beskjært modus. Du vil måtte bruke -reindex som vil laste nede hele blokkjeden på nytt.</translation>
diff --git a/src/qt/locale/bitcoin_nl.ts b/src/qt/locale/bitcoin_nl.ts
index 8a09bed2ce09e..9094cd40a556d 100644
--- a/src/qt/locale/bitcoin_nl.ts
+++ b/src/qt/locale/bitcoin_nl.ts
@@ -2837,10 +2837,6 @@
         <source>Prune: last wallet synchronisation goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of pruned node)</source>
         <translation>Snoei: laatste portemoneesynchronisatie gaat verder dan de gesnoeide data. U moet -reindex gebruiken (download opnieuw de gehele blokketen voor een weggesnoeide node)</translation>
     </message>
-    <message>
-        <source>Reduce storage requirements by pruning (deleting) old blocks. This mode is incompatible with -txindex and -rescan. Warning: Reverting this setting requires re-downloading the entire blockchain. (default: 0 = disable pruning blocks, &gt;%u = target size in MiB to use for block files)</source>
-        <translation>Beperk benodigde opslag door snoeien (verwijderen) van oude blokken. Deze modus is niet-compatibele met -txindex en -rescan. Waarschuwing: Terugzetten van deze instellingen vereist opnieuw downloaden van gehele de blokketen. (standaard:0 = uitzetten snoeimodus, &gt;%u = doelgrootte in MiB voor blokbestanden)</translation>
-    </message>
     <message>
         <source>Rescans are not possible in pruned mode. You will need to use -reindex which will download the whole blockchain again.</source>
         <translation>Herscannen is niet mogelijk in de snoeimodus. U moet -reindex gebruiken dat de hele blokketen opnieuw zal downloaden.</translation>
diff --git a/src/qt/locale/bitcoin_pl.ts b/src/qt/locale/bitcoin_pl.ts
index b7369c50933a5..ab6fb41870e1a 100644
--- a/src/qt/locale/bitcoin_pl.ts
+++ b/src/qt/locale/bitcoin_pl.ts
@@ -1209,7 +1209,47 @@
         <source>Cannot start bitcoin: click-to-pay handler</source>
         <translation>Nie można uruchomić protokołu bitcoin: kliknij-by-zapłacić</translation>
     </message>
-    </context>
+    <message>
+        <source>URI handling</source>
+        <translation>Obsługa URI</translation>
+    </message>
+    <message>
+        <source>Payment request expired.</source>
+        <translation>Żądanie płatności upłynęło.</translation>
+    </message>
+    <message>
+        <source>Payment request is not initialized.</source>
+        <translation>Żądanie płatności nie jest zainicjowane.</translation>
+    </message>
+    <message>
+        <source>Unverified payment requests to custom payment scripts are unsupported.</source>
+        <translation>Niezweryfikowane żądania płatności do własnych skryptów płatności są niewspierane.</translation>
+    </message>
+    <message>
+        <source>Invalid payment request.</source>
+        <translation>Nieprawidłowe żądanie płatności</translation>
+    </message>
+    <message>
+        <source>Refund from %1</source>
+        <translation>Zwrot z %1</translation>
+    </message>
+    <message>
+        <source>Payment request cannot be parsed!</source>
+        <translation>Żądanie płatności nie może zostać przetworzone.</translation>
+    </message>
+    <message>
+        <source>Bad response from server %1</source>
+        <translation>Błędna odpowiedź z serwera %1</translation>
+    </message>
+    <message>
+        <source>Network request error</source>
+        <translation>Błąd żądania sieci</translation>
+    </message>
+    <message>
+        <source>Payment acknowledged</source>
+        <translation>Płatność potwierdzona</translation>
+    </message>
+</context>
 <context>
     <name>PeerTableModel</name>
     <message>
@@ -1220,7 +1260,15 @@
         <source>Node/Service</source>
         <translation>Węzeł/Usługi</translation>
     </message>
-    </context>
+    <message>
+        <source>NodeId</source>
+        <translation>Identyfikator węzła</translation>
+    </message>
+    <message>
+        <source>Ping</source>
+        <translation>Ping</translation>
+    </message>
+</context>
 <context>
     <name>QObject</name>
     <message>
@@ -1259,6 +1307,14 @@
         <source>%1 ms</source>
         <translation>%1 ms</translation>
     </message>
+    <message numerus="yes">
+        <source>%n second(s)</source>
+        <translation><numerusform>%n sekunda</numerusform><numerusform>%n sekund</numerusform><numerusform>%n sekund</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%n minute(s)</source>
+        <translation><numerusform>%n minuta</numerusform><numerusform>%n minut</numerusform><numerusform>%n minut</numerusform></translation>
+    </message>
     <message>
         <source>%1 and %2</source>
         <translation>%1 i %2</translation>
@@ -1266,10 +1322,30 @@
     </context>
 <context>
     <name>QObject::QObject</name>
-    </context>
+    <message>
+        <source>Error: %1</source>
+        <translation>Błąd: %1</translation>
+    </message>
+</context>
 <context>
     <name>QRImageWidget</name>
-    </context>
+    <message>
+        <source>&amp;Save Image...</source>
+        <translation>&amp;Zapisz obraz...</translation>
+    </message>
+    <message>
+        <source>&amp;Copy Image</source>
+        <translation>&amp;Kopiuj obraz</translation>
+    </message>
+    <message>
+        <source>Save QR Code</source>
+        <translation>Zapisz Kod QR</translation>
+    </message>
+    <message>
+        <source>PNG Image (*.png)</source>
+        <translation>Obraz PNG (*.png)</translation>
+    </message>
+</context>
 <context>
     <name>RPCConsole</name>
     <message>
@@ -1428,6 +1504,10 @@
         <source>Ping Wait</source>
         <translation>Czas odpowiedzi</translation>
     </message>
+    <message>
+        <source>Min Ping</source>
+        <translation>Minimalny czas odpowiedzi</translation>
+    </message>
     <message>
         <source>Time Offset</source>
         <translation>Przesunięcie czasu</translation>
@@ -1488,6 +1568,18 @@
         <source>1 &amp;year</source>
         <translation>1 &amp;rok</translation>
     </message>
+    <message>
+        <source>&amp;Disconnect</source>
+        <translation>&amp;Rozłącz</translation>
+    </message>
+    <message>
+        <source>Ban for</source>
+        <translation>Zbanuj na</translation>
+    </message>
+    <message>
+        <source>&amp;Unban</source>
+        <translation>&amp;Odblokuj</translation>
+    </message>
     <message>
         <source>Welcome to the %1 RPC console.</source>
         <translation>Witaj w konsoli %1 RPC.</translation>
@@ -1619,10 +1711,18 @@
         <source>Remove</source>
         <translation>Usuń</translation>
     </message>
+    <message>
+        <source>Copy URI</source>
+        <translation>Kopiuj URI:</translation>
+    </message>
     <message>
         <source>Copy label</source>
         <translation>Kopiuj etykietę</translation>
     </message>
+    <message>
+        <source>Copy message</source>
+        <translation>Kopiuj wiadomość</translation>
+    </message>
     <message>
         <source>Copy amount</source>
         <translation>Kopiuj kwotę</translation>
@@ -1646,14 +1746,34 @@
         <source>&amp;Save Image...</source>
         <translation>&amp;Zapisz obraz...</translation>
     </message>
+    <message>
+        <source>Request payment to %1</source>
+        <translation>Zażądaj płatności do %1</translation>
+    </message>
+    <message>
+        <source>Payment information</source>
+        <translation>Informacje o płatności</translation>
+    </message>
+    <message>
+        <source>URI</source>
+        <translation>URI</translation>
+    </message>
     <message>
         <source>Address</source>
         <translation>Adres</translation>
     </message>
+    <message>
+        <source>Amount</source>
+        <translation>Kwota</translation>
+    </message>
     <message>
         <source>Label</source>
         <translation>Etykieta</translation>
     </message>
+    <message>
+        <source>Message</source>
+        <translation>Wiadomość</translation>
+    </message>
     </context>
 <context>
     <name>RecentRequestsTableModel</name>
@@ -1665,11 +1785,23 @@
         <source>Label</source>
         <translation>Etykieta</translation>
     </message>
+    <message>
+        <source>Message</source>
+        <translation>Wiadomość</translation>
+    </message>
     <message>
         <source>(no label)</source>
         <translation>(brak etykiety)</translation>
     </message>
-    </context>
+    <message>
+        <source>(no message)</source>
+        <translation>(brak wiadomości)</translation>
+    </message>
+    <message>
+        <source>Requested</source>
+        <translation>Zażądano</translation>
+    </message>
+</context>
 <context>
     <name>SendCoinsDialog</name>
     <message>
@@ -1796,6 +1928,10 @@
         <source>Dust:</source>
         <translation>Pył:</translation>
     </message>
+    <message>
+        <source>Confirmation time target:</source>
+        <translation>Docelowy czas potwierdzenia:</translation>
+    </message>
     <message>
         <source>Clear &amp;All</source>
         <translation>Wyczyść &amp;wszystko</translation>
@@ -1840,6 +1976,14 @@
         <source>Copy change</source>
         <translation>Skopiuj resztę</translation>
     </message>
+    <message>
+        <source>%1 to %2</source>
+        <translation>%1 do %2</translation>
+    </message>
+    <message>
+        <source>Payment request expired.</source>
+        <translation>Żądanie płatności upłynęło.</translation>
+    </message>
     <message>
         <source>(no label)</source>
         <translation>(brak etykiety)</translation>
@@ -2078,6 +2222,14 @@ Zwróć uwagę, że poprawnie zweryfikowana wiadomość potwierdza to, że nadaw
         <source>label</source>
         <translation>etykieta</translation>
     </message>
+    <message>
+        <source>Message</source>
+        <translation>Wiadomość</translation>
+    </message>
+    <message>
+        <source>Amount</source>
+        <translation>Kwota</translation>
+    </message>
     </context>
 <context>
     <name>TransactionDescDialog</name>
@@ -2250,10 +2402,6 @@ Zwróć uwagę, że poprawnie zweryfikowana wiadomość potwierdza to, że nadaw
         <source>Prune: last wallet synchronisation goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of pruned node)</source>
         <translation>Prune: ostatnia synchronizacja portfela jest za danymi. Muszisz -reindexować (pobrać cały ciąg bloków ponownie w przypadku przyciętego węzła)</translation>
     </message>
-    <message>
-        <source>Reduce storage requirements by pruning (deleting) old blocks. This mode is incompatible with -txindex and -rescan. Warning: Reverting this setting requires re-downloading the entire blockchain. (default: 0 = disable pruning blocks, &gt;%u = target size in MiB to use for block files)</source>
-        <translation>Zredukuj wymaganą ilość miejsca na dysku poprzez usuwanie starych bloków. Ten tryb jest niekompatybilny z -txindex oraz -rescan. Ostrzeżenie: Wycofanie tego ustawienia wymaga ponownego pobrania całego łańcucha bloków. (domyślnie: 0 = wyłącz usuwanie bloków, &gt;%u = docelowy rozmiar w MiB jaki wykorzystać na pliki z blokami)</translation>
-    </message>
     <message>
         <source>Rescans are not possible in pruned mode. You will need to use -reindex which will download the whole blockchain again.</source>
         <translation>Ponowne skanowanie nie jest możliwe w trybie przycinania. Będzie trzeba użyć -reindex, co pobierze ponownie cały łańcuch bloków.</translation>
diff --git a/src/qt/locale/bitcoin_pt_BR.ts b/src/qt/locale/bitcoin_pt_BR.ts
index 4d49399c11f31..e9ef5258f6e5a 100644
--- a/src/qt/locale/bitcoin_pt_BR.ts
+++ b/src/qt/locale/bitcoin_pt_BR.ts
@@ -2200,6 +2200,10 @@
         <source>Confirm custom change address</source>
         <translation>Confirmar endereço de troco personalizado</translation>
     </message>
+    <message>
+        <source>The address you selected for change is not part of this wallet. Any or all funds in your wallet may be sent to this address. Are you sure?</source>
+        <translation>O endereço selecionado para o troco não pertence a esta carteira. Alguns ou todos os fundos da sua carteira modem ser mandados para esse endereço. Tem certeza?</translation>
+    </message>
     <message>
         <source>(no label)</source>
         <translation>(sem rótuo)</translation>
@@ -3017,10 +3021,6 @@
         <source>Prune: last wallet synchronisation goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of pruned node)</source>
         <translation>Prune: A ultima sincronização da carteira foi além do dado comprimido. Você precisa reindexar (fazer o download de toda a blockchain novamente)</translation>
     </message>
-    <message>
-        <source>Reduce storage requirements by pruning (deleting) old blocks. This mode is incompatible with -txindex and -rescan. Warning: Reverting this setting requires re-downloading the entire blockchain. (default: 0 = disable pruning blocks, &gt;%u = target size in MiB to use for block files)</source>
-        <translation>Reduza o armazenamento de dados apagando os blocos mais antigos. Esse modo é incompatível com -txindex e -rescan. Cuidado: Reverter essa configuração requer um novo download de toda a blockchain. (Padrão: 0 = desabilitado, &gt;%u = tamanho em MiB para o uso de blocos cortados)</translation>
-    </message>
     <message>
         <source>Rescans are not possible in pruned mode. You will need to use -reindex which will download the whole blockchain again.</source>
         <translation>Rescans não são possíveis no modo prune. Você precisa usar -reindex, que irá fazer o download de toda a blockchain novamente.</translation>
@@ -3101,6 +3101,14 @@
         <source>Please contribute if you find %s useful. Visit %s for further information about the software.</source>
         <translation>Por favor contribua se você entender que %s é útil. Visite %s para mais informações sobre o software.</translation>
     </message>
+    <message>
+        <source>Reduce storage requirements by enabling pruning (deleting) of old blocks. This allows the pruneblockchain RPC to be called to delete specific blocks, and enables automatic pruning of old blocks if a target size in MiB is provided. This mode is incompatible with -txindex and -rescan. Warning: Reverting this setting requires re-downloading the entire blockchain. (default: 0 = disable pruning blocks, 1 = allow manual pruning via RPC, &gt;%u = automatically prune block files to stay under the specified target size in MiB)</source>
+        <translation>Reduz o requerimente de espaço habiitando o pruning (apagando) blocos antigos. Isso permite o chamar o comando pruneblockchain via RPC para apagar blocos específicos, e habiita o pruning automático de blocos antigos se o tamanho em MiB for atingido. Esse modo é incompatíve com -txindex e -rescan. Aviso: Reverter essa configuração requer re-baixar o blockchain inteiro. (padrão: 0 = disabilitado, 1 = permite o pruning manua via RPC, &gt;%u = pruna os blocos para ficar abaixo do expecificado, em MiB)</translation>
+    </message>
+    <message>
+        <source>Set lowest fee rate (in %s/kB) for transactions to be included in block creation. (default: %s)</source>
+        <translation>Taxa (em %s/KiB) a ser adicionada às transações que você mandar (padrão: %s)</translation>
+    </message>
     <message>
         <source>Set the number of script verification threads (%u to %d, 0 = auto, &lt;0 = leave that many cores free, default: %d)</source>
         <translation>Define o número de threads de verificação de script (%u a %d, 0 = automático, &lt;0 = número de cores deixados livres, padrão: %d)</translation>
@@ -3121,6 +3129,10 @@
         <source>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</source>
         <translation>Use UPnP para mapear a porta escutada (padrão: 1 quando escutando e sem -proxy)</translation>
     </message>
+    <message>
+        <source>Username and hashed password for JSON-RPC connections. The field &lt;userpw&gt; comes in the format: &lt;USERNAME&gt;:&lt;SALT&gt;$&lt;HASH&gt;. A canonical python script is included in share/rpcuser. The client then connects normally using the rpcuser=&lt;USERNAME&gt;/rpcpassword=&lt;PASSWORD&gt; pair of arguments. This option can be specified multiple times</source>
+        <translation>Nome de usuário e hash da senha para conexões JSON-RPC. O campo &lt;userpw&gt; vem com o formato: &lt;USERNAME&gt;:&lt;SALT&gt;$&lt;HASH&gt;. Um script python canônico é incluído em share/rpcuser. O cliente pode conectar normalmente usando o rpcuser=&lt;USERNAME&gt;/rpcpassword=&lt;PASSWORD&gt;. Esta opção pode ser especificado multiplas vezes</translation>
+    </message>
     <message>
         <source>Wallet will not create transactions that violate mempool chain limits (default: %u)</source>
         <translation>A carteira não irá criar transações que vioem o imite de memória (padrão: %u)</translation>
diff --git a/src/qt/locale/bitcoin_pt_PT.ts b/src/qt/locale/bitcoin_pt_PT.ts
index 7bfb3e710d18e..785cc537b76c6 100644
--- a/src/qt/locale/bitcoin_pt_PT.ts
+++ b/src/qt/locale/bitcoin_pt_PT.ts
@@ -2162,10 +2162,6 @@
         <source>Prune: last wallet synchronisation goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of pruned node)</source>
         <translation>Suprimir: a última sincronização da carteira vai além dos dados suprimidos. O que precisa para -reindex (transferir novamente toda a cadeia de blocos, no caso de nó suprimido)</translation>
     </message>
-    <message>
-        <source>Reduce storage requirements by pruning (deleting) old blocks. This mode is incompatible with -txindex and -rescan. Warning: Reverting this setting requires re-downloading the entire blockchain. (default: 0 = disable pruning blocks, &gt;%u = target size in MiB to use for block files)</source>
-        <translation>Reduza os requisitos de armazenamento podando (eliminando) blocos antigos. Este modo é incompatível com -txindex e -rescan. Aviso: Reverter esta opção requer um novo descarregamento da cadeia de blocos completa. (padrão: 0 = desactivar poda de blocos, &gt;%u = tamanho desejado em MiB para utilizar em ficheiros de blocos)</translation>
-    </message>
     <message>
         <source>Rescans are not possible in pruned mode. You will need to use -reindex which will download the whole blockchain again.</source>
         <translation>Reanálises não são possíveis no modo de suprimir. Para isso terá de utilizar -reindex que irá transferir novamente toda a cadeia de blocos.</translation>
diff --git a/src/qt/locale/bitcoin_ru.ts b/src/qt/locale/bitcoin_ru.ts
index 11fa2f7fea2a1..8dd94ff2204ad 100644
--- a/src/qt/locale/bitcoin_ru.ts
+++ b/src/qt/locale/bitcoin_ru.ts
@@ -3029,10 +3029,6 @@
         <source>Prune: last wallet synchronisation goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of pruned node)</source>
         <translation>Удаление: последняя синхронизация кошелька вышла за рамки удаленных данных. Вам нужен -reindex (скачать всю  цепь блоков в случае удаленного узла)</translation>
     </message>
-    <message>
-        <source>Reduce storage requirements by pruning (deleting) old blocks. This mode is incompatible with -txindex and -rescan. Warning: Reverting this setting requires re-downloading the entire blockchain. (default: 0 = disable pruning blocks, &gt;%u = target size in MiB to use for block files)</source>
-        <translation>Уменьшить размер хранилища за счёт удаления (обрезания) старых блоков. Этот режим несовместим с -txindex и  -rescan. Внимание: переключение этой опции обратно потребует полной загрузки цепи блоков. (по умолчанию: 0 = отключить удаление блоков, &gt;%u = целевой размер в Мб для файлов блоков)</translation>
-    </message>
     <message>
         <source>Rescans are not possible in pruned mode. You will need to use -reindex which will download the whole blockchain again.</source>
         <translation>Повторное сканирование не возможно в режиме удаления. Вам надо будет использовать -reindex, который загрузит заново всю цепь блоков.</translation>
diff --git a/src/qt/locale/bitcoin_sv.ts b/src/qt/locale/bitcoin_sv.ts
index 4d45d20cbfb76..fc7ccdeba22b9 100644
--- a/src/qt/locale/bitcoin_sv.ts
+++ b/src/qt/locale/bitcoin_sv.ts
@@ -2006,10 +2006,6 @@ Var vänlig och försök igen.</translation>
         <source>Prune: last wallet synchronisation goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of pruned node)</source>
         <translation>Beskärning: sista plånbokssynkroniseringen ligger utanför beskuren data. Du måste använda -reindex (ladda ner hela blockkedjan igen eftersom noden beskurits)</translation>
     </message>
-    <message>
-        <source>Reduce storage requirements by pruning (deleting) old blocks. This mode is incompatible with -txindex and -rescan. Warning: Reverting this setting requires re-downloading the entire blockchain. (default: 0 = disable pruning blocks, &gt;%u = target size in MiB to use for block files)</source>
-        <translation>Minska lagringsbehovet genom att beskära (ta bort) gamla block. Detta läge är inkompatibelt med -txindex och -rescan. Varning: Ändras denna inställning måste hela blockkedjan laddas ner igen. (förvalt: 0 = inaktivera beskärning av block, &gt;%u = målstorlek i MiB att använda för blockfiler)</translation>
-    </message>
     <message>
         <source>Rescans are not possible in pruned mode. You will need to use -reindex which will download the whole blockchain again.</source>
         <translation>Omskanningar kan inte göras i beskuret läge. Du måste använda -reindex vilket kommer ladda ner hela blockkedjan igen.</translation>
diff --git a/src/qt/locale/bitcoin_tr.ts b/src/qt/locale/bitcoin_tr.ts
index d1249d09be056..ae565ee6658d4 100644
--- a/src/qt/locale/bitcoin_tr.ts
+++ b/src/qt/locale/bitcoin_tr.ts
@@ -1937,10 +1937,6 @@
         <source>Prune: last wallet synchronisation goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of pruned node)</source>
         <translation>Budama: son cüzdan eşleşmesi budanmış verilerin ötesine gitmektedir. -reindex kullanmanız gerekmektedir (Budanmış düğüm ise tüm blok zincirini tekrar indirmeniz gerekir.)</translation>
     </message>
-    <message>
-        <source>Reduce storage requirements by pruning (deleting) old blocks. This mode is incompatible with -txindex and -rescan. Warning: Reverting this setting requires re-downloading the entire blockchain. (default: 0 = disable pruning blocks, &gt;%u = target size in MiB to use for block files)</source>
-        <translation>Depolama gerekliliğini eski blokları budayarak (silerek) düşür. Bu kip -txindex ve -rescan ile uyumsuzdur. İkaz: Bu ayarı geri almak tüm blok zincirini yeniden indirmeyi gerektirir. (varsayılan: 0 = blokları silmeyi devre dışı bırak, &gt;%u = MiB olarak blok dosyaları için kullanılacak hedef boyut)</translation>
-    </message>
     <message>
         <source>Rescans are not possible in pruned mode. You will need to use -reindex which will download the whole blockchain again.</source>
         <translation>Tekrar taramalar budanmış kipte mümkün değildir. Tüm blok zincirini tekrar indirecek olan -reindex seçeneğini kullanmanız gerekecektir.</translation>
diff --git a/src/qt/locale/bitcoin_uk.ts b/src/qt/locale/bitcoin_uk.ts
index 9c46c18224793..a817c1baf21ee 100644
--- a/src/qt/locale/bitcoin_uk.ts
+++ b/src/qt/locale/bitcoin_uk.ts
@@ -1677,10 +1677,6 @@
         <source>Prune: last wallet synchronisation goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of pruned node)</source>
         <translation>Операція відсікання: остання синхронізація вмісту гаманцю не обмежується діями над скороченими данними. Вам необхідно зробити переіндексацію -reindex (заново завантажити веcь ланцюжок блоків в разі появи скороченого ланцюга)</translation>
     </message>
-    <message>
-        <source>Reduce storage requirements by pruning (deleting) old blocks. This mode is incompatible with -txindex and -rescan. Warning: Reverting this setting requires re-downloading the entire blockchain. (default: 0 = disable pruning blocks, &gt;%u = target size in MiB to use for block files)</source>
-        <translation>Зменшити вимоги до наявного простору на носії даних за допомогою скорочення ланцюжка (видалення старих блоків). Цей режим несумісний з параметрами -txindex та -rescan. Увага: при поверненні до типового значення видалені частини ланцюжка буде повторно завантажено. (типово: 0 = вимкнути скорочення ланцюжка, &gt;%u = очікуваний розмір файлів блоків в МіБ)</translation>
-    </message>
     <message>
         <source>Rescans are not possible in pruned mode. You will need to use -reindex which will download the whole blockchain again.</source>
         <translation>Неможливо провести повторне сканування зі скороченим ланцюжком. Вам необхідно використати -reindex для завантаження повного ланцюжка блоків.</translation>
diff --git a/src/qt/locale/bitcoin_zh_CN.ts b/src/qt/locale/bitcoin_zh_CN.ts
index 8267a4f0e3032..e76d605a80369 100644
--- a/src/qt/locale/bitcoin_zh_CN.ts
+++ b/src/qt/locale/bitcoin_zh_CN.ts
@@ -2970,10 +2970,6 @@
         <source>Prune: last wallet synchronisation goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of pruned node)</source>
         <translation>修剪：最后的钱包同步超过了修剪的数据。你需要通过 -reindex (重新下载整个区块链以防修剪节点)</translation>
     </message>
-    <message>
-        <source>Reduce storage requirements by pruning (deleting) old blocks. This mode is incompatible with -txindex and -rescan. Warning: Reverting this setting requires re-downloading the entire blockchain. (default: 0 = disable pruning blocks, &gt;%u = target size in MiB to use for block files)</source>
-        <translation>通过修剪(删除)旧数据块减少存储需求。此模式与 -txindex 和 -rescan不兼容。警告：还原此设置需要重新下载整个区块链。(默认: 0 = 禁用修剪数据块， &gt;%u = 数据块文件目标大小，单位 MiB)</translation>
-    </message>
     <message>
         <source>Rescans are not possible in pruned mode. You will need to use -reindex which will download the whole blockchain again.</source>
         <translation>无法在开启修剪的状态下重扫描，请使用 -reindex重新下载完整的区块链。</translation>
diff --git a/src/qt/locale/bitcoin_zh_TW.ts b/src/qt/locale/bitcoin_zh_TW.ts
index bdcf9662972af..4a8b1474d8d56 100644
--- a/src/qt/locale/bitcoin_zh_TW.ts
+++ b/src/qt/locale/bitcoin_zh_TW.ts
@@ -2200,6 +2200,14 @@
         <source>Warning: Unknown change address</source>
         <translation>警告: 不明的找零位址</translation>
     </message>
+    <message>
+        <source>Confirm custom change address</source>
+        <translation>自定找零位址確認</translation>
+    </message>
+    <message>
+        <source>The address you selected for change is not part of this wallet. Any or all funds in your wallet may be sent to this address. Are you sure?</source>
+        <translation>選擇的找零位址並不屬於這個錢包。部份或是全部的錢會被送到這個位址去。你確定嗎？</translation>
+    </message>
     <message>
         <source>(no label)</source>
         <translation>(無標記)</translation>
@@ -3018,10 +3026,6 @@
         <source>Prune: last wallet synchronisation goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of pruned node)</source>
         <translation>修剪模式：錢包的最後同步狀態是在被修剪掉的區塊資料中。你需要用 -reindex 參數執行(會重新下載整個區塊鏈)</translation>
     </message>
-    <message>
-        <source>Reduce storage requirements by pruning (deleting) old blocks. This mode is incompatible with -txindex and -rescan. Warning: Reverting this setting requires re-downloading the entire blockchain. (default: 0 = disable pruning blocks, &gt;%u = target size in MiB to use for block files)</source>
-        <translation>修剪(刪除)掉老舊區塊來減少需要的儲存空間。這種模式會關閉錢包功能，並且和 -txindex 及 -rescan 參數不相容。警告: 從這種模式還原會需要重新下載一整個區塊鏈。(預設值: 0 表示不修剪區塊，&gt;%u 表示為區塊檔案的目標大小，單位是百萬位元組 MiB)</translation>
-    </message>
     <message>
         <source>Rescans are not possible in pruned mode. You will need to use -reindex which will download the whole blockchain again.</source>
         <translation>在修剪模式下沒辦法重新掃描區塊鏈。你需要配合使用 -reindex 參數來重新下載整個區塊鏈。</translation>
@@ -3102,6 +3106,14 @@
         <source>Please contribute if you find %s useful. Visit %s for further information about the software.</source>
         <translation>如果你覺得 %s 有用，可以幫助我們。關於這個軟體的更多資訊請見 %s。</translation>
     </message>
+    <message>
+        <source>Reduce storage requirements by enabling pruning (deleting) of old blocks. This allows the pruneblockchain RPC to be called to delete specific blocks, and enables automatic pruning of old blocks if a target size in MiB is provided. This mode is incompatible with -txindex and -rescan. Warning: Reverting this setting requires re-downloading the entire blockchain. (default: 0 = disable pruning blocks, 1 = allow manual pruning via RPC, &gt;%u = automatically prune block files to stay under the specified target size in MiB)</source>
+        <translation>修剪(刪除)掉老舊區塊以降低需要的儲存空間。這樣會增加一個 RPC 指令 pruneblockchain，可以使用它來刪除指定的區塊；也可以指定目標儲存空間大小，以啟用對老舊區塊的自動修剪功能。這個模式跟 -txindex 和 -rescan 參數不相容。警告: 還原回不修剪模式會需要重新下載一整個區塊鏈。(預設值: 0 表示不修剪區塊，1 表示允許使用 RPC 指令做修剪，&gt;%u 的值表示為區塊資料的目標大小，單位是百萬位元組，MiB)</translation>
+    </message>
+    <message>
+        <source>Set lowest fee rate (in %s/kB) for transactions to be included in block creation. (default: %s)</source>
+        <translation>設定製造區塊時，所要包含交易每千位元組的最低手續費(單位是 %s)。(預設值: %s)</translation>
+    </message>
     <message>
         <source>Set the number of script verification threads (%u to %d, 0 = auto, &lt;0 = leave that many cores free, default: %d)</source>
         <translation>設定指令碼驗證的執行緒數目 (%u 到 %d，0 表示程式自動決定，小於 0 表示保留處理器核心不用的數目，預設值: %d)</translation>
@@ -3122,6 +3134,10 @@
         <source>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</source>
         <translation>是否要使用「通用即插即用」協定(UPnP)，來設定聽候連線的通訊埠的對應(預設值: 當有聽候連線且沒有指定 -proxy 參數時為 1)</translation>
     </message>
+    <message>
+        <source>Username and hashed password for JSON-RPC connections. The field &lt;userpw&gt; comes in the format: &lt;USERNAME&gt;:&lt;SALT&gt;$&lt;HASH&gt;. A canonical python script is included in share/rpcuser. The client then connects normally using the rpcuser=&lt;USERNAME&gt;/rpcpassword=&lt;PASSWORD&gt; pair of arguments. This option can be specified multiple times</source>
+        <translation>JSON-RPC 連線要用的使用者名稱和雜湊密碼。&lt;userpw&gt; 的格式是：&lt;使用者名稱&gt;:&lt;調味值&gt;$&lt;雜湊值&gt;。在 share/rpcuser 目錄下有一個示範的 python 程式。之後客戶端程式就可以用這對參數正常連線：rpcuser=&lt;使用者名稱&gt; 和 rpcpassword=&lt;密碼&gt;。這個選項可以給很多次。</translation>
+    </message>
     <message>
         <source>Wallet will not create transactions that violate mempool chain limits (default: %u)</source>
         <translation>錢包軟體不會產生違反記憶池交易鏈限制的交易(預設值: %u)</translation>

From de1ae324bf3fb7451c1008a1a9721ff9f469533b Mon Sep 17 00:00:00 2001
From: Alex Morcos <morcos@chaincode.com>
Date: Wed, 11 Jan 2017 11:25:18 -0500
Subject: [PATCH 1622/1802] Exclude RBF txs from fee estimation

---
 src/validation.cpp | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/validation.cpp b/src/validation.cpp
index 109a71fe74d4e..f0b35324e88ba 100644
--- a/src/validation.cpp
+++ b/src/validation.cpp
@@ -793,7 +793,8 @@ bool AcceptToMemoryPoolWorker(CTxMemPool& pool, CValidationState& state, const C
         // subsequent RemoveStaged() and addUnchecked() calls don't guarantee
         // mempool consistency for us.
         LOCK(pool.cs);
-        if (setConflicts.size())
+        const bool fReplacementTransaction = setConflicts.size();
+        if (fReplacementTransaction)
         {
             CFeeRate newFeeRate(nModifiedFees, nSize);
             set<uint256> setConflictsParents;
@@ -954,10 +955,11 @@ bool AcceptToMemoryPoolWorker(CTxMemPool& pool, CValidationState& state, const C
         }
         pool.RemoveStaged(allConflicting, false);
 
-        // This transaction should only count for fee estimation if
-        // the node is not behind and it is not dependent on any other
-        // transactions in the mempool
-        bool validForFeeEstimation = IsCurrentForFeeEstimation() && pool.HasNoInputsOf(tx);
+        // This transaction should only count for fee estimation if it isn't a
+        // BIP 125 replacement transaction (may not be widely supported), the
+        // node is not behind, and the transaction is not dependent on any other
+        // transactions in the mempool.
+        bool validForFeeEstimation = !fReplacementTransaction && IsCurrentForFeeEstimation() && pool.HasNoInputsOf(tx);
 
         // Store transaction in memory
         pool.addUnchecked(hash, entry, setAncestors, validForFeeEstimation);

From dd5b0114cf9021e8639e48c2a33f0aaf82aeb14e Mon Sep 17 00:00:00 2001
From: John Newbery <john@johnnewbery.com>
Date: Fri, 20 Jan 2017 14:13:14 -0500
Subject: [PATCH 1623/1802] [Trivial] add comment about setting peer as HB
 peer.

This adds a comment to the new logic for setting HB peers based
on block validation (and aligns the code below to reflect the comment).
It's not obvious why we're checking mapBlocksInFlight. Add a comment to
explain.
---
 src/net_processing.cpp | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/net_processing.cpp b/src/net_processing.cpp
index 36a52576357ee..94faaac37b2a9 100644
--- a/src/net_processing.cpp
+++ b/src/net_processing.cpp
@@ -865,7 +865,15 @@ void PeerLogicValidation::BlockChecked(const CBlock& block, const CValidationSta
                 Misbehaving(it->second.first, nDoS);
         }
     }
-    else if (state.IsValid() && !IsInitialBlockDownload() && mapBlocksInFlight.count(hash) == mapBlocksInFlight.size()) {
+    // Check that:
+    // 1. The block is valid
+    // 2. We're not in initial block download
+    // 3. This is currently the best block we're aware of. We haven't updated
+    //    the tip yet so we have no way to check this directly here. Instead we
+    //    just check that there are currently no other blocks in flight.
+    else if (state.IsValid() &&
+             !IsInitialBlockDownload() &&
+             mapBlocksInFlight.count(hash) == mapBlocksInFlight.size()) {
         if (it != mapBlockSource.end()) {
             MaybeSetPeerAsAnnouncingHeaderAndIDs(it->second.first, *connman);
         }

From 5cdf10611fe5ea77d4632c24e69e68aa9b8119e0 Mon Sep 17 00:00:00 2001
From: practicalswift <practicalswift@users.noreply.github.com>
Date: Fri, 20 Jan 2017 22:55:26 +0100
Subject: [PATCH 1624/1802] Remove redundant semicolons in Python code

---
 contrib/devtools/clang-format-diff.py |  4 ++--
 contrib/devtools/optimize-pngs.py     |  2 +-
 contrib/zmq/zmq_sub.py                |  2 +-
 qa/rpc-tests/fundrawtransaction.py    |  2 +-
 qa/rpc-tests/importmulti.py           | 14 +++++++-------
 qa/rpc-tests/p2p-feefilter.py         |  4 ++--
 qa/rpc-tests/p2p-segwit.py            |  2 +-
 qa/rpc-tests/segwit.py                |  2 +-
 8 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/contrib/devtools/clang-format-diff.py b/contrib/devtools/clang-format-diff.py
index 13d2573b9ff87..7ea49b65e1776 100755
--- a/contrib/devtools/clang-format-diff.py
+++ b/contrib/devtools/clang-format-diff.py
@@ -128,7 +128,7 @@ def main():
         line_count = int(match.group(3))
       if line_count == 0:
         continue
-      end_line = start_line + line_count - 1;
+      end_line = start_line + line_count - 1
       lines_by_file.setdefault(filename, []).extend(
           ['-lines', str(start_line) + ':' + str(end_line)])
 
@@ -147,7 +147,7 @@ def main():
                          stderr=None, stdin=subprocess.PIPE)
     stdout, stderr = p.communicate()
     if p.returncode != 0:
-      sys.exit(p.returncode);
+      sys.exit(p.returncode)
 
     if not args.i:
       with open(filename) as f:
diff --git a/contrib/devtools/optimize-pngs.py b/contrib/devtools/optimize-pngs.py
index 0f653e010b95c..9286ab731f295 100755
--- a/contrib/devtools/optimize-pngs.py
+++ b/contrib/devtools/optimize-pngs.py
@@ -39,7 +39,7 @@ def content_hash(filename):
         if extension.lower() == '.png':
             print("optimizing "+file+"..."),
             file_path = os.path.join(absFolder, file)
-            fileMetaMap = {'file' : file, 'osize': os.path.getsize(file_path), 'sha256Old' : file_hash(file_path)};
+            fileMetaMap = {'file' : file, 'osize': os.path.getsize(file_path), 'sha256Old' : file_hash(file_path)}
             fileMetaMap['contentHashPre'] = content_hash(file_path)
         
             pngCrushOutput = ""
diff --git a/contrib/zmq/zmq_sub.py b/contrib/zmq/zmq_sub.py
index 6f57aa47e9648..5707188f23f85 100755
--- a/contrib/zmq/zmq_sub.py
+++ b/contrib/zmq/zmq_sub.py
@@ -22,7 +22,7 @@
         msg = zmqSubSocket.recv_multipart()
         topic = str(msg[0])
         body = msg[1]
-        sequence = "Unknown";
+        sequence = "Unknown"
         if len(msg[-1]) == 4:
           msgSequence = struct.unpack('<I', msg[-1])[-1]
           sequence = str(msgSequence)
diff --git a/qa/rpc-tests/fundrawtransaction.py b/qa/rpc-tests/fundrawtransaction.py
index b97e9aecdf422..162004065bb68 100755
--- a/qa/rpc-tests/fundrawtransaction.py
+++ b/qa/rpc-tests/fundrawtransaction.py
@@ -226,7 +226,7 @@ def run_test(self):
             assert(False)
         rawtxfund = self.nodes[2].fundrawtransaction(rawtx, {'changeAddress': change, 'changePosition': 0})
         dec_tx  = self.nodes[2].decoderawtransaction(rawtxfund['hex'])
-        out = dec_tx['vout'][0];
+        out = dec_tx['vout'][0]
         assert_equal(change, out['scriptPubKey']['addresses'][0])
 
 
diff --git a/qa/rpc-tests/importmulti.py b/qa/rpc-tests/importmulti.py
index 5c536f2f49528..e100a3af9d44d 100755
--- a/qa/rpc-tests/importmulti.py
+++ b/qa/rpc-tests/importmulti.py
@@ -108,7 +108,7 @@ def run_test (self):
             "scriptPubKey": address['scriptPubKey'],
             "pubkeys": [ address['pubkey'] ],
             "internal": True
-        }];
+        }]
         result = self.nodes[1].importmulti(request)
         assert_equal(result[0]['success'], True)
         address_assert = self.nodes[1].validateaddress(address['address'])
@@ -121,7 +121,7 @@ def run_test (self):
         request = [{
             "scriptPubKey": address['scriptPubKey'],
             "pubkeys": [ address['pubkey'] ]
-        }];
+        }]
         result = self.nodes[1].importmulti(request)
         assert_equal(result[0]['success'], False)
         assert_equal(result[0]['error']['code'], -8)
@@ -197,7 +197,7 @@ def run_test (self):
         self.nodes[1].generate(100)
         transactionid = self.nodes[1].sendtoaddress(multi_sig_script['address'], 10.00)
         self.nodes[1].generate(1)
-        transaction = self.nodes[1].gettransaction(transactionid);
+        transaction = self.nodes[1].gettransaction(transactionid)
 
         print("Should import a p2sh")
         result = self.nodes[1].importmulti([{
@@ -222,7 +222,7 @@ def run_test (self):
         self.nodes[1].generate(100)
         transactionid = self.nodes[1].sendtoaddress(multi_sig_script['address'], 10.00)
         self.nodes[1].generate(1)
-        transaction = self.nodes[1].gettransaction(transactionid);
+        transaction = self.nodes[1].gettransaction(transactionid)
 
         print("Should import a p2sh with respective redeem script")
         result = self.nodes[1].importmulti([{
@@ -246,7 +246,7 @@ def run_test (self):
         self.nodes[1].generate(100)
         transactionid = self.nodes[1].sendtoaddress(multi_sig_script['address'], 10.00)
         self.nodes[1].generate(1)
-        transaction = self.nodes[1].gettransaction(transactionid);
+        transaction = self.nodes[1].gettransaction(transactionid)
 
         print("Should import a p2sh with respective redeem script and private keys")
         result = self.nodes[1].importmulti([{
@@ -270,7 +270,7 @@ def run_test (self):
         self.nodes[1].generate(100)
         transactionid = self.nodes[1].sendtoaddress(multi_sig_script['address'], 10.00)
         self.nodes[1].generate(1)
-        transaction = self.nodes[1].gettransaction(transactionid);
+        transaction = self.nodes[1].gettransaction(transactionid)
 
         print("Should import a p2sh with respective redeem script and private keys")
         result = self.nodes[1].importmulti([{
@@ -312,7 +312,7 @@ def run_test (self):
             "scriptPubKey": address['scriptPubKey'],
             "pubkeys": [ address2['pubkey'] ],
             "internal": True
-        }];
+        }]
         result = self.nodes[1].importmulti(request)
         assert_equal(result[0]['success'], False)
         assert_equal(result[0]['error']['code'], -5)
diff --git a/qa/rpc-tests/p2p-feefilter.py b/qa/rpc-tests/p2p-feefilter.py
index 96d99d38a73c1..86ce0b42e639a 100755
--- a/qa/rpc-tests/p2p-feefilter.py
+++ b/qa/rpc-tests/p2p-feefilter.py
@@ -21,9 +21,9 @@ def allInvsMatch(invsExpected, testnode):
     for x in range(60):
         with mininode_lock:
             if (sorted(invsExpected) == sorted(testnode.txinvs)):
-                return True;
+                return True
         time.sleep(1)
-    return False;
+    return False
 
 # TestNode: bare-bones "peer".  Used to track which invs are received from a node
 # and to send the node feefilter messages.
diff --git a/qa/rpc-tests/p2p-segwit.py b/qa/rpc-tests/p2p-segwit.py
index 51adec5cae494..a7858ad3d854a 100755
--- a/qa/rpc-tests/p2p-segwit.py
+++ b/qa/rpc-tests/p2p-segwit.py
@@ -1662,7 +1662,7 @@ def test_witness_sigops(self):
         # too many sigops (contributing to legacy sigop count).
         checksig_count = (extra_sigops_available // 4) + 1
         scriptPubKey_checksigs = CScript([OP_CHECKSIG]*checksig_count)
-        tx2.vout.append(CTxOut(0, scriptPubKey_checksigs));
+        tx2.vout.append(CTxOut(0, scriptPubKey_checksigs))
         tx2.vin.pop()
         tx2.wit.vtxinwit.pop()
         tx2.vout[0].nValue -= tx.vout[-2].nValue
diff --git a/qa/rpc-tests/segwit.py b/qa/rpc-tests/segwit.py
index be6fae5088963..299f5387e7c24 100755
--- a/qa/rpc-tests/segwit.py
+++ b/qa/rpc-tests/segwit.py
@@ -39,7 +39,7 @@ def addlength(script):
     return scriptlen + script
 
 def create_witnessprogram(version, node, utxo, pubkey, encode_p2sh, amount):
-    pkscript = witness_script(version, pubkey);
+    pkscript = witness_script(version, pubkey)
     if (encode_p2sh):
         p2sh_hash = bytes_to_hex_str(ripemd160(sha256(hex_str_to_bytes(pkscript))))
         pkscript = "a914"+p2sh_hash+"87"

From 003cd60cc3697df25bb9dfa0bae0616a462af7ab Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Fri, 20 Jan 2017 18:10:48 -0500
Subject: [PATCH 1625/1802] Add missing mempool lock for
 CalculateMemPoolAncestors

---
 src/txmempool.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/txmempool.cpp b/src/txmempool.cpp
index 5b085f492da9f..34ca3bacad67f 100644
--- a/src/txmempool.cpp
+++ b/src/txmempool.cpp
@@ -173,6 +173,8 @@ void CTxMemPool::UpdateTransactionsFromBlock(const std::vector<uint256> &vHashes
 
 bool CTxMemPool::CalculateMemPoolAncestors(const CTxMemPoolEntry &entry, setEntries &setAncestors, uint64_t limitAncestorCount, uint64_t limitAncestorSize, uint64_t limitDescendantCount, uint64_t limitDescendantSize, std::string &errString, bool fSearchForParents /* = true */) const
 {
+    LOCK(cs);
+
     setEntries parentHashes;
     const CTransaction &tx = entry.GetTx();
 

From 5c66d41b7ffe8557ce5036613c9854d2f1dc3c37 Mon Sep 17 00:00:00 2001
From: Lauda <lauda.m@protonmail.ch>
Date: Fri, 13 Jan 2017 16:05:16 +0100
Subject: [PATCH 1626/1802] [Trivial] Grammar and typo correction

Minor corrections in src\test\* .
---
 src/test/cuckoocache_tests.cpp | 2 +-
 src/test/dbwrapper_tests.cpp   | 2 +-
 src/test/limitedmap_tests.cpp  | 2 +-
 src/test/scheduler_tests.cpp   | 4 ++--
 src/test/script_tests.cpp      | 2 +-
 src/test/test_bitcoin.cpp      | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/test/cuckoocache_tests.cpp b/src/test/cuckoocache_tests.cpp
index 1bc50d5ea9002..00446aa11e135 100644
--- a/src/test/cuckoocache_tests.cpp
+++ b/src/test/cuckoocache_tests.cpp
@@ -15,7 +15,7 @@
  *  with deterministic seeds)
  *  2) Some test methods are templated to allow for easier testing
  *  against new versions / comparing
- *  3) Results should be treated as a regression test, ie, did the behavior
+ *  3) Results should be treated as a regression test, i.e., did the behavior
  *  change significantly from what was expected. This can be OK, depending on
  *  the nature of the change, but requires updating the tests to reflect the new
  *  expected behavior. For example improving the hit rate may cause some tests
diff --git a/src/test/dbwrapper_tests.cpp b/src/test/dbwrapper_tests.cpp
index e5cb48ffcf48d..d5d158027b1ea 100644
--- a/src/test/dbwrapper_tests.cpp
+++ b/src/test/dbwrapper_tests.cpp
@@ -76,7 +76,7 @@ BOOST_AUTO_TEST_CASE(dbwrapper_batch)
         BOOST_CHECK(dbw.Read(key2, res));
         BOOST_CHECK_EQUAL(res.ToString(), in2.ToString());
 
-        // key3 never should've been written
+        // key3 should've never been written
         BOOST_CHECK(dbw.Read(key3, res) == false);
     }
 }
diff --git a/src/test/limitedmap_tests.cpp b/src/test/limitedmap_tests.cpp
index 55b9be5b00411..b071ab117b9cc 100644
--- a/src/test/limitedmap_tests.cpp
+++ b/src/test/limitedmap_tests.cpp
@@ -27,7 +27,7 @@ BOOST_AUTO_TEST_CASE(limitedmap_test)
     // make sure that the size is updated
     BOOST_CHECK(map.size() == 1);
 
-    // make sure that the new items is in the map
+    // make sure that the new item is in the map
     BOOST_CHECK(map.count(-1) == 1);
 
     // insert 10 new items
diff --git a/src/test/scheduler_tests.cpp b/src/test/scheduler_tests.cpp
index e1b0ab925872b..e4ddf9d618a88 100644
--- a/src/test/scheduler_tests.cpp
+++ b/src/test/scheduler_tests.cpp
@@ -47,8 +47,8 @@ BOOST_AUTO_TEST_CASE(manythreads)
     //
     // So... ten shared counters, which if all the tasks execute
     // properly will sum to the number of tasks done.
-    // Each task adds or subtracts from one of the counters a
-    // random amount, and then schedules another task 0-1000
+    // Each task adds or subtracts a random amount from one of the
+    // counters, and then schedules another task 0-1000
     // microseconds in the future to subtract or add from
     // the counter -random_amount+1, so in the end the shared
     // counters should sum to the number of initial tasks performed.
diff --git a/src/test/script_tests.cpp b/src/test/script_tests.cpp
index 6f057f43b496b..32184165f7e5a 100644
--- a/src/test/script_tests.cpp
+++ b/src/test/script_tests.cpp
@@ -465,7 +465,7 @@ class TestBuilder
 std::string JSONPrettyPrint(const UniValue& univalue)
 {
     std::string ret = univalue.write(4);
-    // Workaround for libunivalue pretty printer, which puts a space between comma's and newlines
+    // Workaround for libunivalue pretty printer, which puts a space between commas and newlines
     size_t pos = 0;
     while ((pos = ret.find(" \n", pos)) != std::string::npos) {
         ret.replace(pos, 2, "\n");
diff --git a/src/test/test_bitcoin.cpp b/src/test/test_bitcoin.cpp
index f0eaab2217cd2..4785415e3cc5d 100644
--- a/src/test/test_bitcoin.cpp
+++ b/src/test/test_bitcoin.cpp
@@ -147,7 +147,7 @@ CTxMemPoolEntry TestMemPoolEntryHelper::FromTx(const CMutableTransaction &tx, CT
 }
 
 CTxMemPoolEntry TestMemPoolEntryHelper::FromTx(const CTransaction &txn, CTxMemPool *pool) {
-    // Hack to assume either its completely dependent on other mempool txs or not at all
+    // Hack to assume either it's completely dependent on other mempool txs or not at all
     CAmount inChainValue = pool && pool->HasNoInputsOf(txn) ? txn.GetValueOut() : 0;
 
     return CTxMemPoolEntry(MakeTransactionRef(txn), nFee, nTime, dPriority, nHeight,

From 5a00659b58800ce52b652a31d551a984926c46de Mon Sep 17 00:00:00 2001
From: Russell Yanofsky <russ@yanofsky.org>
Date: Mon, 23 Jan 2017 09:54:11 -0500
Subject: [PATCH 1627/1802] [wallet] Clarify getbalance help string to explain
 interaction with bumpfee

Documentation change only, no change in behavior.
---
 src/wallet/rpcwallet.cpp | 24 +++++++++++++++++++-----
 1 file changed, 19 insertions(+), 5 deletions(-)

diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index 55e7558498d24..ef40032ee3405 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -668,8 +668,19 @@ UniValue getbalance(const JSONRPCRequest& request)
             "Note that the account \"\" is not the same as leaving the parameter out.\n"
             "The server total may be different to the balance in the default \"\" account.\n"
             "\nArguments:\n"
-            "1. \"account\"      (string, optional) DEPRECATED. The selected account, or \"*\" for entire wallet. It may be the default account using \"\".\n"
-            "2. minconf          (numeric, optional, default=1) Only include transactions confirmed at least this many times.\n"
+            "1. \"account\"         (string, optional) DEPRECATED. The account string may be given as a\n"
+            "                     specific account name to find the balance associated with wallet keys in\n"
+            "                     a named account, or as the empty string (\"\") to find the balance\n"
+            "                     associated with wallet keys not in any named account, or as \"*\" to find\n"
+            "                     the balance associated with all wallet keys regardless of account.\n"
+            "                     When this option is specified, it calculates the balance in a different\n"
+            "                     way than when it is not specified, and which can count spends twice when\n"
+            "                     there are conflicting pending transactions (such as those created by\n"
+            "                     the bumpfee command), temporarily resulting in low or even negative\n"
+            "                     balances. In general, account balance calculation is not considered\n"
+            "                     reliable and has resulted in confusing outcomes, so it is recommended to\n"
+            "                     avoid passing this argument.\n"
+            "2. minconf           (numeric, optional, default=1) Only include transactions confirmed at least this many times.\n"
             "3. include_watchonly (bool, optional, default=false) Also include balance in watch-only addresses (see 'importaddress')\n"
             "\nResult:\n"
             "amount              (numeric) The total amount in " + CURRENCY_UNIT + " received for this account.\n"
@@ -696,9 +707,12 @@ UniValue getbalance(const JSONRPCRequest& request)
             filter = filter | ISMINE_WATCH_ONLY;
 
     if (request.params[0].get_str() == "*") {
-        // Calculate total balance a different way from GetBalance()
-        // (GetBalance() sums up all unspent TxOuts)
-        // getbalance and "getbalance * 1 true" should return the same number
+        // Calculate total balance in a very different way from GetBalance().
+        // The biggest difference is that GetBalance() sums up all unspent
+        // TxOuts paying to the wallet, while this sums up both spent and
+        // unspent TxOuts paying to the wallet, and then subtracts the values of
+        // TxIns spending from the wallet. This also has fewer restrictions on
+        // which unconfirmed transactions are considered trusted.
         CAmount nBalance = 0;
         for (map<uint256, CWalletTx>::iterator it = pwalletMain->mapWallet.begin(); it != pwalletMain->mapWallet.end(); ++it)
         {

From ff25c32392596883c13623eed6018fabb7877ed7 Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Sat, 26 Mar 2016 16:44:50 +0100
Subject: [PATCH 1628/1802] mempool: add notification for added/removed entries

Add notification signals to make it possible to subscribe to mempool
changes:

- NotifyEntryAdded(CTransactionRef)>
- NotifyEntryRemoved(CTransactionRef, MemPoolRemovalReason)>

Also add a mempool removal reason enumeration, which is passed to the
removed notification based on why the transaction was removed from
the mempool.
---
 src/txmempool.cpp  | 23 +++++++++++++----------
 src/txmempool.h    | 25 ++++++++++++++++++++++---
 src/validation.cpp |  8 ++++----
 3 files changed, 39 insertions(+), 17 deletions(-)

diff --git a/src/txmempool.cpp b/src/txmempool.cpp
index 5b085f492da9f..54400caccc806 100644
--- a/src/txmempool.cpp
+++ b/src/txmempool.cpp
@@ -393,6 +393,7 @@ void CTxMemPool::AddTransactionsUpdated(unsigned int n)
 
 bool CTxMemPool::addUnchecked(const uint256& hash, const CTxMemPoolEntry &entry, setEntries &setAncestors, bool validFeeEstimate)
 {
+    NotifyEntryAdded(entry.GetSharedTx());
     // Add to memory pool without checking anything.
     // Used by main.cpp AcceptToMemoryPool(), which DOES do
     // all the appropriate checks.
@@ -449,8 +450,9 @@ bool CTxMemPool::addUnchecked(const uint256& hash, const CTxMemPoolEntry &entry,
     return true;
 }
 
-void CTxMemPool::removeUnchecked(txiter it)
+void CTxMemPool::removeUnchecked(txiter it, MemPoolRemovalReason reason)
 {
+    NotifyEntryRemoved(it->GetSharedTx(), reason);
     const uint256 hash = it->GetTx().GetHash();
     BOOST_FOREACH(const CTxIn& txin, it->GetTx().vin)
         mapNextTx.erase(txin.prevout);
@@ -502,7 +504,7 @@ void CTxMemPool::CalculateDescendants(txiter entryit, setEntries &setDescendants
     }
 }
 
-void CTxMemPool::removeRecursive(const CTransaction &origTx)
+void CTxMemPool::removeRecursive(const CTransaction &origTx, MemPoolRemovalReason reason)
 {
     // Remove transaction from memory pool
     {
@@ -529,7 +531,8 @@ void CTxMemPool::removeRecursive(const CTransaction &origTx)
         BOOST_FOREACH(txiter it, txToRemove) {
             CalculateDescendants(it, setAllRemoves);
         }
-        RemoveStaged(setAllRemoves, false);
+
+        RemoveStaged(setAllRemoves, false, reason);
     }
 }
 
@@ -567,7 +570,7 @@ void CTxMemPool::removeForReorg(const CCoinsViewCache *pcoins, unsigned int nMem
     for (txiter it : txToRemove) {
         CalculateDescendants(it, setAllRemoves);
     }
-    RemoveStaged(setAllRemoves, false);
+    RemoveStaged(setAllRemoves, false, MemPoolRemovalReason::REORG);
 }
 
 void CTxMemPool::removeConflicts(const CTransaction &tx)
@@ -581,7 +584,7 @@ void CTxMemPool::removeConflicts(const CTransaction &tx)
             if (txConflict != tx)
             {
                 ClearPrioritisation(txConflict.GetHash());
-                removeRecursive(txConflict);
+                removeRecursive(txConflict, MemPoolRemovalReason::CONFLICT);
             }
         }
     }
@@ -610,7 +613,7 @@ void CTxMemPool::removeForBlock(const std::vector<CTransactionRef>& vtx, unsigne
         if (it != mapTx.end()) {
             setEntries stage;
             stage.insert(it);
-            RemoveStaged(stage, true);
+            RemoveStaged(stage, true, MemPoolRemovalReason::BLOCK);
         }
         removeConflicts(*tx);
         ClearPrioritisation(tx->GetHash());
@@ -989,11 +992,11 @@ size_t CTxMemPool::DynamicMemoryUsage() const {
     return memusage::MallocUsage(sizeof(CTxMemPoolEntry) + 15 * sizeof(void*)) * mapTx.size() + memusage::DynamicUsage(mapNextTx) + memusage::DynamicUsage(mapDeltas) + memusage::DynamicUsage(mapLinks) + memusage::DynamicUsage(vTxHashes) + cachedInnerUsage;
 }
 
-void CTxMemPool::RemoveStaged(setEntries &stage, bool updateDescendants) {
+void CTxMemPool::RemoveStaged(setEntries &stage, bool updateDescendants, MemPoolRemovalReason reason) {
     AssertLockHeld(cs);
     UpdateForRemoveFromMempool(stage, updateDescendants);
     BOOST_FOREACH(const txiter& it, stage) {
-        removeUnchecked(it);
+        removeUnchecked(it, reason);
     }
 }
 
@@ -1009,7 +1012,7 @@ int CTxMemPool::Expire(int64_t time) {
     BOOST_FOREACH(txiter removeit, toremove) {
         CalculateDescendants(removeit, stage);
     }
-    RemoveStaged(stage, false);
+    RemoveStaged(stage, false, MemPoolRemovalReason::EXPIRY);
     return stage.size();
 }
 
@@ -1118,7 +1121,7 @@ void CTxMemPool::TrimToSize(size_t sizelimit, std::vector<uint256>* pvNoSpendsRe
             BOOST_FOREACH(txiter iter, stage)
                 txn.push_back(iter->GetTx());
         }
-        RemoveStaged(stage, false);
+        RemoveStaged(stage, false, MemPoolRemovalReason::SIZELIMIT);
         if (pvNoSpendsRemaining) {
             BOOST_FOREACH(const CTransaction& tx, txn) {
                 BOOST_FOREACH(const CTxIn& txin, tx.vin) {
diff --git a/src/txmempool.h b/src/txmempool.h
index ffb1c1309bb3c..f842a07dd6571 100644
--- a/src/txmempool.h
+++ b/src/txmempool.h
@@ -25,6 +25,8 @@
 #include "boost/multi_index/ordered_index.hpp"
 #include "boost/multi_index/hashed_index.hpp"
 
+#include <boost/signals2/signal.hpp>
+
 class CAutoFile;
 class CBlockIndex;
 
@@ -333,6 +335,19 @@ struct TxMempoolInfo
     int64_t nFeeDelta;
 };
 
+/** Reason why a transaction was removed from the mempool,
+ * this is passed to the notification signal.
+ */
+enum class MemPoolRemovalReason {
+    UNKNOWN = 0, //! Manually removed or unknown reason
+    EXPIRY,      //! Expired from mempool
+    SIZELIMIT,   //! Removed in size limiting
+    REORG,       //! Removed for reorganization
+    BLOCK,       //! Removed for block
+    CONFLICT,    //! Removed for conflict with in-block transaction
+    REPLACED     //! Removed for replacement
+};
+
 /**
  * CTxMemPool stores valid-according-to-the-current-best-chain transactions
  * that may be included in the next block.
@@ -521,10 +536,11 @@ class CTxMemPool
     bool addUnchecked(const uint256& hash, const CTxMemPoolEntry &entry, bool validFeeEstimate = true);
     bool addUnchecked(const uint256& hash, const CTxMemPoolEntry &entry, setEntries &setAncestors, bool validFeeEstimate = true);
 
-    void removeRecursive(const CTransaction &tx);
+    void removeRecursive(const CTransaction &tx, MemPoolRemovalReason reason = MemPoolRemovalReason::UNKNOWN);
     void removeForReorg(const CCoinsViewCache *pcoins, unsigned int nMemPoolHeight, int flags);
     void removeConflicts(const CTransaction &tx);
     void removeForBlock(const std::vector<CTransactionRef>& vtx, unsigned int nBlockHeight);
+
     void clear();
     void _clear(); //lock free
     bool CompareDepthAndScore(const uint256& hasha, const uint256& hashb);
@@ -551,7 +567,7 @@ class CTxMemPool
      *  Set updateDescendants to true when removing a tx that was in a block, so
      *  that any in-mempool descendants have their ancestor state updated.
      */
-    void RemoveStaged(setEntries &stage, bool updateDescendants);
+    void RemoveStaged(setEntries &stage, bool updateDescendants, MemPoolRemovalReason reason = MemPoolRemovalReason::UNKNOWN);
 
     /** When adding transactions from a disconnected block back to the mempool,
      *  new mempool entries may have children in the mempool (which is generally
@@ -647,6 +663,9 @@ class CTxMemPool
 
     size_t DynamicMemoryUsage() const;
 
+    boost::signals2::signal<void (CTransactionRef)> NotifyEntryAdded;
+    boost::signals2::signal<void (CTransactionRef, MemPoolRemovalReason)> NotifyEntryRemoved;
+
 private:
     /** UpdateForDescendants is used by UpdateTransactionsFromBlock to update
      *  the descendants for a single transaction that has been added to the
@@ -683,7 +702,7 @@ class CTxMemPool
      *  transactions in a chain before we've updated all the state for the
      *  removal.
      */
-    void removeUnchecked(txiter entry);
+    void removeUnchecked(txiter entry, MemPoolRemovalReason reason = MemPoolRemovalReason::UNKNOWN);
 };
 
 /** 
diff --git a/src/validation.cpp b/src/validation.cpp
index 881292d613b53..d382e121bc724 100644
--- a/src/validation.cpp
+++ b/src/validation.cpp
@@ -956,7 +956,7 @@ bool AcceptToMemoryPoolWorker(CTxMemPool& pool, CValidationState& state, const C
             if (plTxnReplaced)
                 plTxnReplaced->push_back(it->GetSharedTx());
         }
-        pool.RemoveStaged(allConflicting, false);
+        pool.RemoveStaged(allConflicting, false, MemPoolRemovalReason::REPLACED);
 
         // This transaction should only count for fee estimation if
         // the node is not behind and it is not dependent on any other
@@ -2166,7 +2166,7 @@ bool static DisconnectTip(CValidationState& state, const CChainParams& chainpara
             // ignore validation errors in resurrected transactions
             CValidationState stateDummy;
             if (tx.IsCoinBase() || !AcceptToMemoryPool(mempool, stateDummy, it, false, NULL, NULL, true)) {
-                mempool.removeRecursive(tx);
+                mempool.removeRecursive(tx, MemPoolRemovalReason::REORG);
             } else if (mempool.exists(tx.GetHash())) {
                 vHashUpdate.push_back(tx.GetHash());
             }
@@ -3597,7 +3597,7 @@ bool CVerifyDB::VerifyDB(const CChainParams& chainparams, CCoinsView *coinsview,
             return error("VerifyDB(): *** ReadBlockFromDisk failed at %d, hash=%s", pindex->nHeight, pindex->GetBlockHash().ToString());
         // check level 1: verify block validity
         if (nCheckLevel >= 1 && !CheckBlock(block, state, chainparams.GetConsensus()))
-            return error("%s: *** found bad block at %d, hash=%s (%s)\n", __func__, 
+            return error("%s: *** found bad block at %d, hash=%s (%s)\n", __func__,
                          pindex->nHeight, pindex->GetBlockHash().ToString(), FormatStateMessage(state));
         // check level 2: verify undo validity
         if (nCheckLevel >= 2 && pindex) {
@@ -3768,7 +3768,7 @@ bool LoadBlockIndex(const CChainParams& chainparams)
     return true;
 }
 
-bool InitBlockIndex(const CChainParams& chainparams) 
+bool InitBlockIndex(const CChainParams& chainparams)
 {
     LOCK(cs_main);
 

From 4afbde6028708541c4da8732a1bd12fb8735fdae Mon Sep 17 00:00:00 2001
From: Alex Morcos <morcos@chaincode.com>
Date: Fri, 16 Dec 2016 11:34:39 -0500
Subject: [PATCH 1629/1802] Introduce MemPoolConflictRemovalTracker

Analogue to ConnectTrace that tracks transactions that have been removed from the mempool due to conflicts and then passes them through SyncTransaction at the end of its scope.
---
 src/validation.cpp | 45 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)

diff --git a/src/validation.cpp b/src/validation.cpp
index d382e121bc724..b882416961ea0 100644
--- a/src/validation.cpp
+++ b/src/validation.cpp
@@ -157,6 +157,39 @@ namespace {
     set<int> setDirtyFileInfo;
 } // anon namespace
 
+/* Use this class to start tracking transactions that are removed from the
+ * mempool and pass all those transactions through SyncTransaction when the
+ * object goes out of scope. This is currently only used to call SyncTransaction
+ * on conflicts removed from the mempool during block connection.  Applied in
+ * ActivateBestChain around ActivateBestStep which in turn calls:
+ * ConnectTip->removeForBlock->removeConflicts
+ */
+class MemPoolConflictRemovalTracker
+{
+private:
+    std::vector<CTransactionRef> conflictedTxs;
+    CTxMemPool &pool;
+
+public:
+    MemPoolConflictRemovalTracker(CTxMemPool &_pool) : pool(_pool) {
+        pool.NotifyEntryRemoved.connect(boost::bind(&MemPoolConflictRemovalTracker::NotifyEntryRemoved, this, _1, _2));
+    }
+
+    void NotifyEntryRemoved(CTransactionRef txRemoved, MemPoolRemovalReason reason) {
+        if (reason == MemPoolRemovalReason::CONFLICT) {
+            conflictedTxs.push_back(txRemoved);
+        }
+    }
+
+    ~MemPoolConflictRemovalTracker() {
+        pool.NotifyEntryRemoved.disconnect(boost::bind(&MemPoolConflictRemovalTracker::NotifyEntryRemoved, this, _1, _2));
+        for (const auto& tx : conflictedTxs) {
+            GetMainSignals().SyncTransaction(*tx, NULL, CMainSignals::SYNC_TRANSACTION_NOT_IN_BLOCK);
+        }
+        conflictedTxs.clear();
+    }
+};
+
 CBlockIndex* FindForkInGlobalIndex(const CChain& chain, const CBlockLocator& locator)
 {
     // Find the first block the caller has in the main chain
@@ -2453,6 +2486,14 @@ bool ActivateBestChain(CValidationState &state, const CChainParams& chainparams,
         bool fInitialDownload;
         {
             LOCK(cs_main);
+            { // TODO: Tempoarily ensure that mempool removals are notified before
+              // connected transactions.  This shouldn't matter, but the abandoned
+              // state of transactions in our wallet is currently cleared when we
+              // receive another notification and there is a race condition where
+              // notification of a connected conflict might cause an outside process
+              // to abandon a transaction and then have it inadvertantly cleared by
+              // the notification that the conflicted transaction was evicted.
+            MemPoolConflictRemovalTracker mrt(mempool);
             CBlockIndex *pindexOldTip = chainActive.Tip();
             if (pindexMostWork == NULL) {
                 pindexMostWork = FindMostWorkChain();
@@ -2476,6 +2517,10 @@ bool ActivateBestChain(CValidationState &state, const CChainParams& chainparams,
             fInitialDownload = IsInitialBlockDownload();
 
             // throw all transactions though the signal-interface
+
+            } // MemPoolConflictRemovalTracker destroyed and conflict evictions are notified
+
+            // Transactions in the connnected block are notified
             for (const auto& pair : connectTrace.blocksConnected) {
                 assert(pair.second);
                 const CBlock& block = *(pair.second);

From 094e4b33839404d9c18200fc30d9a993a3dc106f Mon Sep 17 00:00:00 2001
From: Alex Morcos <morcos@chaincode.com>
Date: Fri, 16 Dec 2016 14:17:13 -0500
Subject: [PATCH 1630/1802] Better document usage of SyncTransaction

---
 src/validationinterface.h | 11 +++++++++--
 src/wallet/wallet.cpp     | 12 ++++++++++--
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/src/validationinterface.h b/src/validationinterface.h
index 594072719c6f2..a2e76f2036e1d 100644
--- a/src/validationinterface.h
+++ b/src/validationinterface.h
@@ -50,9 +50,16 @@ class CValidationInterface {
 struct CMainSignals {
     /** Notifies listeners of updated block chain tip */
     boost::signals2::signal<void (const CBlockIndex *, const CBlockIndex *, bool fInitialDownload)> UpdatedBlockTip;
-    /** A posInBlock value for SyncTransaction which indicates the transaction was conflicted, disconnected, or not in a block */
+    /** A posInBlock value for SyncTransaction calls for tranactions not
+     * included in connected blocks such as transactions removed from mempool,
+     * accepted to mempool or appearing in disconnected blocks.*/
     static const int SYNC_TRANSACTION_NOT_IN_BLOCK = -1;
-    /** Notifies listeners of updated transaction data (transaction, and optionally the block it is found in. */
+    /** Notifies listeners of updated transaction data (transaction, and
+     * optionally the block it is found in). Called with block data when
+     * transaction is included in a connected block, and without block data when
+     * transaction was accepted to mempool, removed from mempool (only when
+     * removal was due to conflict from connected block), or appeared in a
+     * disconnected block.*/
     boost::signals2::signal<void (const CTransaction &, const CBlockIndex *pindex, int posInBlock)> SyncTransaction;
     /** Notifies listeners of an updated transaction without new data (for now: a coinbase potentially becoming visible). */
     boost::signals2::signal<void (const uint256 &)> UpdatedTransaction;
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index 358a5ecfc190a..b4715622cf4f8 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -1003,9 +1003,17 @@ bool CWallet::LoadToWallet(const CWalletTx& wtxIn)
 }
 
 /**
- * Add a transaction to the wallet, or update it.
- * pblock is optional, but should be provided if the transaction is known to be in a block.
+ * Add a transaction to the wallet, or update it.  pIndex and posInBlock should
+ * be set when the transaction was known to be included in a block.  When
+ * posInBlock = SYNC_TRANSACTION_NOT_IN_BLOCK (-1) , then wallet state is not
+ * updated in AddToWallet, but notifications happen and cached balances are
+ * marked dirty.
  * If fUpdate is true, existing transactions will be updated.
+ * TODO: One exception to this is that the abandoned state is cleared under the
+ * assumption that any further notification of a transaction that was considered
+ * abandoned is an indication that it is not safe to be considered abandoned.
+ * Abandoned state should probably be more carefuly tracked via different
+ * posInBlock signals or by checking mempool presence when necessary.
  */
 bool CWallet::AddToWalletIfInvolvingMe(const CTransaction& tx, const CBlockIndex* pIndex, int posInBlock, bool fUpdate)
 {

From be31a2b3635b893930c731a2929bb593dae9847e Mon Sep 17 00:00:00 2001
From: Lauda <lauda.m@protonmail.ch>
Date: Mon, 23 Jan 2017 23:46:06 +0100
Subject: [PATCH 1631/1802] [Trivial] Update license year range to 2017

The same as #7363.
---
 COPYING                  | 2 +-
 configure.ac             | 2 +-
 contrib/debian/copyright | 2 +-
 src/clientversion.h      | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/COPYING b/COPYING
index c6be8e5470890..c6203c0f76d2b 100644
--- a/COPYING
+++ b/COPYING
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2009-2016 The Bitcoin Core developers
+Copyright (c) 2009-2017 The Bitcoin Core developers
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/configure.ac b/configure.ac
index 4723c69d5ddb3..346695043d9d1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5,7 +5,7 @@ define(_CLIENT_VERSION_MINOR, 13)
 define(_CLIENT_VERSION_REVISION, 99)
 define(_CLIENT_VERSION_BUILD, 0)
 define(_CLIENT_VERSION_IS_RELEASE, false)
-define(_COPYRIGHT_YEAR, 2016)
+define(_COPYRIGHT_YEAR, 2017)
 define(_COPYRIGHT_HOLDERS,[The %s developers])
 define(_COPYRIGHT_HOLDERS_SUBSTITUTION,[[Bitcoin Core]])
 AC_INIT([Bitcoin Core],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_REVISION],[https://github.com/bitcoin/bitcoin/issues],[bitcoin],[https://bitcoincore.org/])
diff --git a/contrib/debian/copyright b/contrib/debian/copyright
index 0fa06f1aa9fa9..72d64ce62d2a7 100644
--- a/contrib/debian/copyright
+++ b/contrib/debian/copyright
@@ -5,7 +5,7 @@ Upstream-Contact: Satoshi Nakamoto <satoshin@gmx.com>
 Source: https://github.com/bitcoin/bitcoin
 
 Files: *
-Copyright: 2009-2016, Bitcoin Core Developers
+Copyright: 2009-2017, Bitcoin Core Developers
 License: Expat
 Comment: The Bitcoin Core Developers encompasses the current developers listed on bitcoin.org,
          as well as the numerous contributors to the project.
diff --git a/src/clientversion.h b/src/clientversion.h
index 0cd7e517eedb9..0b27bb1bdfcce 100644
--- a/src/clientversion.h
+++ b/src/clientversion.h
@@ -26,7 +26,7 @@
  * Copyright year (2009-this)
  * Todo: update this when changing our copyright comments in the source
  */
-#define COPYRIGHT_YEAR 2016
+#define COPYRIGHT_YEAR 2017
 
 #endif //HAVE_CONFIG_H
 

From ac9a84679a46250c696301bee2d66e75ddeb1223 Mon Sep 17 00:00:00 2001
From: John Newbery <john@johnnewbery.com>
Date: Tue, 24 Jan 2017 12:08:07 -0500
Subject: [PATCH 1632/1802] [Trivial] fix logging typo in FlushStateToDisk()

---
 src/validation.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/validation.cpp b/src/validation.cpp
index b882416961ea0..e6bc2288d20e4 100644
--- a/src/validation.cpp
+++ b/src/validation.cpp
@@ -2061,7 +2061,7 @@ bool static FlushStateToDisk(CValidationState &state, FlushStateMode mode, int n
                 setDirtyBlockIndex.erase(it++);
             }
             if (!pblocktree->WriteBatchSync(vFiles, nLastBlockFile, vBlocks)) {
-                return AbortNode(state, "Files to write to block index database");
+                return AbortNode(state, "Failed to write to block index database");
             }
         }
         // Finally remove any pruned files

From 5be01906e59d484ec997b594e39bab528845bb78 Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Tue, 24 Jan 2017 16:49:15 -0500
Subject: [PATCH 1633/1802] Delete some unused (and broken) functions in
 CConnman

---
 src/net.cpp | 28 ----------------------------
 src/net.h   |  4 ----
 2 files changed, 32 deletions(-)

diff --git a/src/net.cpp b/src/net.cpp
index 1019d59544288..4e296a31141e3 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -2371,24 +2371,6 @@ void CConnman::GetNodeStats(std::vector<CNodeStats>& vstats)
     }
 }
 
-bool CConnman::DisconnectAddress(const CNetAddr& netAddr)
-{
-    if (CNode* pnode = FindNode(netAddr)) {
-        pnode->fDisconnect = true;
-        return true;
-    }
-    return false;
-}
-
-bool CConnman::DisconnectSubnet(const CSubNet& subNet)
-{
-    if (CNode* pnode = FindNode(subNet)) {
-        pnode->fDisconnect = true;
-        return true;
-    }
-    return false;
-}
-
 bool CConnman::DisconnectNode(const std::string& strNode)
 {
     if (CNode* pnode = FindNode(strNode)) {
@@ -2409,16 +2391,6 @@ bool CConnman::DisconnectNode(NodeId id)
     return false;
 }
 
-void CConnman::RelayTransaction(const CTransaction& tx)
-{
-    CInv inv(MSG_TX, tx.GetHash());
-    LOCK(cs_vNodes);
-    BOOST_FOREACH(CNode* pnode, vNodes)
-    {
-        pnode->PushInventory(inv);
-    }
-}
-
 void CConnman::RecordBytesRecv(uint64_t bytes)
 {
     LOCK(cs_totalBytesRecv);
diff --git a/src/net.h b/src/net.h
index 505962f51a079..0b8efcc882ad5 100644
--- a/src/net.h
+++ b/src/net.h
@@ -243,8 +243,6 @@ class CConnman
         post();
     };
 
-    void RelayTransaction(const CTransaction& tx);
-
     // Addrman functions
     size_t GetAddressCount() const;
     void SetServices(const CService &addr, ServiceFlags nServices);
@@ -286,10 +284,8 @@ class CConnman
 
     size_t GetNodeCount(NumConnections num);
     void GetNodeStats(std::vector<CNodeStats>& vstats);
-    bool DisconnectAddress(const CNetAddr& addr);
     bool DisconnectNode(const std::string& node);
     bool DisconnectNode(NodeId id);
-    bool DisconnectSubnet(const CSubNet& subnet);
 
     unsigned int GetSendBufferSize() const;
 

From 3c37dc40d39e1a1e56b6b0d3e660626a78656d4f Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Tue, 24 Jan 2017 16:50:27 -0500
Subject: [PATCH 1634/1802] Ensure cs_vNodes is held when using the return
 value from FindNode

---
 src/net.cpp | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/net.cpp b/src/net.cpp
index 4e296a31141e3..7489b3f32be0d 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -369,15 +369,13 @@ CNode* CConnman::ConnectNode(CAddress addrConnect, const char *pszDest, bool fCo
             // In that case, drop the connection that was just created, and return the existing CNode instead.
             // Also store the name we used to connect in that CNode, so that future FindNode() calls to that
             // name catch this early.
+            LOCK(cs_vNodes);
             CNode* pnode = FindNode((CService)addrConnect);
             if (pnode)
             {
                 pnode->AddRef();
-                {
-                    LOCK(cs_vNodes);
-                    if (pnode->addrName.empty()) {
-                        pnode->addrName = std::string(pszDest);
-                    }
+                if (pnode->addrName.empty()) {
+                    pnode->addrName = std::string(pszDest);
                 }
                 CloseSocket(hSocket);
                 return pnode;
@@ -2373,6 +2371,7 @@ void CConnman::GetNodeStats(std::vector<CNodeStats>& vstats)
 
 bool CConnman::DisconnectNode(const std::string& strNode)
 {
+    LOCK(cs_vNodes);
     if (CNode* pnode = FindNode(strNode)) {
         pnode->fDisconnect = true;
         return true;

From 29fb311858f098e79ed5334a128f2b0c8c88b235 Mon Sep 17 00:00:00 2001
From: Alex Morcos <morcos@chaincode.com>
Date: Tue, 24 Jan 2017 12:46:01 -0500
Subject: [PATCH 1635/1802] Increase minimum debug.log size to 10MB after
 shrink.

---
 src/init.cpp | 5 ++++-
 src/util.cpp | 8 ++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/init.cpp b/src/init.cpp
index 5be011f944dec..c3ceb22953b64 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -1149,8 +1149,11 @@ bool AppInitMain(boost::thread_group& threadGroup, CScheduler& scheduler)
 #ifndef WIN32
     CreatePidFile(GetPidFile(), getpid());
 #endif
-    if (GetBoolArg("-shrinkdebugfile", !fDebug))
+    if (GetBoolArg("-shrinkdebugfile", !fDebug)) {
+        // Do this first since it both loads a bunch of debug.log into memory,
+        // and because this needs to happen before any other debug.log printing
         ShrinkDebugFile();
+    }
 
     if (fPrintToDebugLog)
         OpenDebugLog();
diff --git a/src/util.cpp b/src/util.cpp
index 08ee6b8b87f20..ba157625d8055 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -723,13 +723,17 @@ void AllocateFileRange(FILE *file, unsigned int offset, unsigned int length) {
 
 void ShrinkDebugFile()
 {
+    // Amount of debug.log to save at end when shrinking (must fit in memory)
+    constexpr size_t RECENT_DEBUG_HISTORY_SIZE = 10 * 1000000;
     // Scroll debug.log if it's getting too big
     boost::filesystem::path pathLog = GetDataDir() / "debug.log";
     FILE* file = fopen(pathLog.string().c_str(), "r");
-    if (file && boost::filesystem::file_size(pathLog) > 10 * 1000000)
+    // If debug.log file is more than 10% bigger the RECENT_DEBUG_HISTORY_SIZE
+    // trim it down by saving only the last RECENT_DEBUG_HISTORY_SIZE bytes
+    if (file && boost::filesystem::file_size(pathLog) > 11 * (RECENT_DEBUG_HISTORY_SIZE / 10))
     {
         // Restart the file with some of the end
-        std::vector <char> vch(200000,0);
+        std::vector<char> vch(RECENT_DEBUG_HISTORY_SIZE, 0);
         fseek(file, -((long)vch.size()), SEEK_END);
         int nBytes = fread(vch.data(), 1, vch.size(), file);
         fclose(file);

From 99464bc38e9575ff47f8e33223b252dcea2055e3 Mon Sep 17 00:00:00 2001
From: Suhas Daftuar <sdaftuar@gmail.com>
Date: Thu, 19 Jan 2017 13:01:18 -0500
Subject: [PATCH 1636/1802] net: Consistently use GetTimeMicros() for
 inactivity checks

The use of mocktime in test logic means that comparisons between
GetTime() and GetTimeMicros()/1000000 are unreliable since the former
can use mocktime values while the latter always gets the system clock;
this changes the networking code's inactivity checks to consistently
use the system clock for inactivity comparisons.

Also remove some hacks from setmocktime() that are no longer needed,
now that we're using the system clock for nLastSend and nLastRecv.
---
 src/net.cpp           |  8 ++++----
 src/qt/rpcconsole.cpp |  6 +++---
 src/rpc/misc.cpp      | 16 +++++-----------
 src/utiltime.cpp      |  5 +++++
 src/utiltime.h        | 11 +++++++++++
 5 files changed, 28 insertions(+), 18 deletions(-)

diff --git a/src/net.cpp b/src/net.cpp
index b275bdd8092fe..97480df13145f 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -391,7 +391,7 @@ CNode* CConnman::ConnectNode(CAddress addrConnect, const char *pszDest, bool fCo
         uint64_t nonce = GetDeterministicRandomizer(RANDOMIZER_ID_LOCALHOSTNONCE).Write(id).Finalize();
         CNode* pnode = new CNode(id, nLocalServices, GetBestHeight(), hSocket, addrConnect, CalculateKeyedNetGroup(addrConnect), nonce, pszDest ? pszDest : "", false);
         pnode->nServicesExpected = ServiceFlags(addrConnect.nServices & nRelevantServices);
-        pnode->nTimeConnected = GetTime();
+        pnode->nTimeConnected = GetSystemTimeInSeconds();
         pnode->AddRef();
         GetNodeSignals().InitializeNode(pnode, *this);
         {
@@ -771,7 +771,7 @@ size_t CConnman::SocketSendData(CNode *pnode)
         assert(data.size() > pnode->nSendOffset);
         int nBytes = send(pnode->hSocket, reinterpret_cast<const char*>(data.data()) + pnode->nSendOffset, data.size() - pnode->nSendOffset, MSG_NOSIGNAL | MSG_DONTWAIT);
         if (nBytes > 0) {
-            pnode->nLastSend = GetTime();
+            pnode->nLastSend = GetSystemTimeInSeconds();
             pnode->nSendBytes += nBytes;
             pnode->nSendOffset += nBytes;
             nSentSize += nBytes;
@@ -1284,7 +1284,7 @@ void CConnman::ThreadSocketHandler()
             //
             // Inactivity checking
             //
-            int64_t nTime = GetTime();
+            int64_t nTime = GetSystemTimeInSeconds();
             if (nTime - pnode->nTimeConnected > 60)
             {
                 if (pnode->nLastRecv == 0 || pnode->nLastSend == 0)
@@ -2570,7 +2570,7 @@ CNode::CNode(NodeId idIn, ServiceFlags nLocalServicesIn, int nMyStartingHeightIn
     nLastRecv = 0;
     nSendBytes = 0;
     nRecvBytes = 0;
-    nTimeConnected = GetTime();
+    nTimeConnected = GetSystemTimeInSeconds();
     nTimeOffset = 0;
     addrName = addrNameIn == "" ? addr.ToStringIPPort() : addrNameIn;
     nVersion = 0;
diff --git a/src/qt/rpcconsole.cpp b/src/qt/rpcconsole.cpp
index 87d73b5f089ff..60406c2059777 100644
--- a/src/qt/rpcconsole.cpp
+++ b/src/qt/rpcconsole.cpp
@@ -1023,11 +1023,11 @@ void RPCConsole::updateNodeDetail(const CNodeCombinedStats *stats)
         peerAddrDetails += "<br />" + tr("via %1").arg(QString::fromStdString(stats->nodeStats.addrLocal));
     ui->peerHeading->setText(peerAddrDetails);
     ui->peerServices->setText(GUIUtil::formatServicesStr(stats->nodeStats.nServices));
-    ui->peerLastSend->setText(stats->nodeStats.nLastSend ? GUIUtil::formatDurationStr(GetTime() - stats->nodeStats.nLastSend) : tr("never"));
-    ui->peerLastRecv->setText(stats->nodeStats.nLastRecv ? GUIUtil::formatDurationStr(GetTime() - stats->nodeStats.nLastRecv) : tr("never"));
+    ui->peerLastSend->setText(stats->nodeStats.nLastSend ? GUIUtil::formatDurationStr(GetSystemTimeInSeconds() - stats->nodeStats.nLastSend) : tr("never"));
+    ui->peerLastRecv->setText(stats->nodeStats.nLastRecv ? GUIUtil::formatDurationStr(GetSystemTimeInSeconds() - stats->nodeStats.nLastRecv) : tr("never"));
     ui->peerBytesSent->setText(FormatBytes(stats->nodeStats.nSendBytes));
     ui->peerBytesRecv->setText(FormatBytes(stats->nodeStats.nRecvBytes));
-    ui->peerConnTime->setText(GUIUtil::formatDurationStr(GetTime() - stats->nodeStats.nTimeConnected));
+    ui->peerConnTime->setText(GUIUtil::formatDurationStr(GetSystemTimeInSeconds() - stats->nodeStats.nTimeConnected));
     ui->peerPingTime->setText(GUIUtil::formatPingTime(stats->nodeStats.dPingTime));
     ui->peerPingWait->setText(GUIUtil::formatPingTime(stats->nodeStats.dPingWait));
     ui->peerMinPing->setText(GUIUtil::formatPingTime(stats->nodeStats.dMinPing));
diff --git a/src/rpc/misc.cpp b/src/rpc/misc.cpp
index 54d8c3e035916..480c45516c55e 100644
--- a/src/rpc/misc.cpp
+++ b/src/rpc/misc.cpp
@@ -431,22 +431,16 @@ UniValue setmocktime(const JSONRPCRequest& request)
     if (!Params().MineBlocksOnDemand())
         throw runtime_error("setmocktime for regression testing (-regtest mode) only");
 
-    // cs_vNodes is locked and node send/receive times are updated
-    // atomically with the time change to prevent peers from being
-    // disconnected because we think we haven't communicated with them
-    // in a long time.
+    // For now, don't change mocktime if we're in the middle of validation, as
+    // this could have an effect on mempool time-based eviction, as well as
+    // IsCurrentForFeeEstimation() and IsInitialBlockDownload().
+    // TODO: figure out the right way to synchronize around mocktime, and
+    // ensure all callsites of GetTime() are accessing this safely.
     LOCK(cs_main);
 
     RPCTypeCheck(request.params, boost::assign::list_of(UniValue::VNUM));
     SetMockTime(request.params[0].get_int64());
 
-    uint64_t t = GetTime();
-    if(g_connman) {
-        g_connman->ForEachNode([t](CNode* pnode) {
-            pnode->nLastSend = pnode->nLastRecv = t;
-        });
-    }
-
     return NullUniValue;
 }
 
diff --git a/src/utiltime.cpp b/src/utiltime.cpp
index 7c5ee77265196..87a25866e9a5d 100644
--- a/src/utiltime.cpp
+++ b/src/utiltime.cpp
@@ -46,6 +46,11 @@ int64_t GetTimeMicros()
     return now;
 }
 
+int64_t GetSystemTimeInSeconds()
+{
+    return GetTimeMicros()/1000000;
+}
+
 /** Return a time useful for the debug log */
 int64_t GetLogTimeMicros()
 {
diff --git a/src/utiltime.h b/src/utiltime.h
index b2807267dbd5a..05c6790495098 100644
--- a/src/utiltime.h
+++ b/src/utiltime.h
@@ -9,9 +9,20 @@
 #include <stdint.h>
 #include <string>
 
+/**
+ * GetTimeMicros() and GetTimeMillis() both return the system time, but in
+ * different units. GetTime() returns the sytem time in seconds, but also
+ * supports mocktime, where the time can be specified by the user, eg for
+ * testing (eg with the setmocktime rpc, or -mocktime argument).
+ *
+ * TODO: Rework these functions to be type-safe (so that we don't inadvertently
+ * compare numbers with different units, or compare a mocktime to system time).
+ */
+
 int64_t GetTime();
 int64_t GetTimeMillis();
 int64_t GetTimeMicros();
+int64_t GetSystemTimeInSeconds(); // Like GetTime(), but not mockable
 int64_t GetLogTimeMicros();
 void SetMockTime(int64_t nMockTimeIn);
 void MilliSleep(int64_t n);

From 2f10f06196ace64c549172f9ab081d28115228d5 Mon Sep 17 00:00:00 2001
From: Suhas Daftuar <sdaftuar@chaincode.com>
Date: Wed, 25 Jan 2017 09:30:38 -0500
Subject: [PATCH 1637/1802] qa: Increase a sync_blocks timeout in pruning.py

---
 qa/rpc-tests/pruning.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qa/rpc-tests/pruning.py b/qa/rpc-tests/pruning.py
index 25f07790034d3..e740127d37f67 100755
--- a/qa/rpc-tests/pruning.py
+++ b/qa/rpc-tests/pruning.py
@@ -314,7 +314,7 @@ def wallet_test(self):
         print ("Syncing node 5 to test wallet")
         connect_nodes(self.nodes[0], 5)
         nds = [self.nodes[0], self.nodes[5]]
-        sync_blocks(nds)
+        sync_blocks(nds, wait=5, timeout=300)
         try:
             stop_node(self.nodes[5],5) #stop and start to trigger rescan
             start_node(5, self.options.tmpdir, ["-debug=1","-prune=550"])

From b9d95bd9a1b3e8613373ecd228805518f2852985 Mon Sep 17 00:00:00 2001
From: Douglas Roark <doug@bloq.com>
Date: Wed, 18 Jan 2017 22:22:46 -0800
Subject: [PATCH 1638/1802] Fix various minor linearization script issues
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- The last-timestamp-encountered variable wasn’t being used properly. Rewrite code to properly allow for new blockchain files to be written when split by month.
- Properly set a blockchain file’s access and modify times.
- Add a “debug output” option to quiet certain output that might not always be desirable.
- Update the README.
---
 contrib/linearize/README.md             | 10 +++++--
 contrib/linearize/example-linearize.cfg | 13 ++++++++-
 contrib/linearize/linearize-data.py     | 36 ++++++++++++++-----------
 3 files changed, 41 insertions(+), 18 deletions(-)

diff --git a/contrib/linearize/README.md b/contrib/linearize/README.md
index adc9a559cc34d..0971e7816b48f 100644
--- a/contrib/linearize/README.md
+++ b/contrib/linearize/README.md
@@ -32,8 +32,11 @@ Required configuration file settings:
 * `output`: Output directory for linearized `blocks/blkNNNNN.dat` output.
 
 Optional config file setting for linearize-data:
-* `file_timestamp`: Set each file's last-modified time to that of the most
-recent block in that file.
+* `debug_output`: Some printouts may not always be desired. If true, such output
+will be printed.
+* `file_timestamp`: Set each file's last-accessed and last-modified times,
+respectively, to the current time and to the timestamp of the most recent block
+written to the script's blockchain.
 * `genesis`: The hash of the genesis block in the blockchain.
 * `input`: bitcoind blocks/ directory containing blkNNNNN.dat
 * `hashlist`: text file containing list of block hashes created by
@@ -41,6 +44,9 @@ linearize-hashes.py.
 * `max_out_sz`: Maximum size for files created by the `output_file` option.
 (Default: `1000*1000*1000 bytes`)
 * `netmagic`: Network magic number.
+* `out_of_order_cache_sz`: If out-of-order blocks are being read, the block can
+be written to a cache so that the blockchain doesn't have to be seeked again.
+This option specifies the cache size. (Default: `100*1000*1000 bytes`)
 * `rev_hash_bytes`: If true, the block hash list written by linearize-hashes.py
 will be byte-reversed when read by linearize-data.py. See the linearize-hashes
 entry for more information.
diff --git a/contrib/linearize/example-linearize.cfg b/contrib/linearize/example-linearize.cfg
index cccdd792131ae..db53dc0ef69eb 100644
--- a/contrib/linearize/example-linearize.cfg
+++ b/contrib/linearize/example-linearize.cfg
@@ -1,4 +1,3 @@
-
 # bitcoind RPC settings (linearize-hashes)
 rpcuser=someuser
 rpcpassword=somepassword
@@ -21,6 +20,9 @@ input=/home/example/.bitcoin/blocks
 #genesis=000000000933ea01ad0ee984209779baaec3ced90fa3f408719526f8d77f4943
 #input=/home/example/.bitcoin/testnet3/blocks
 
+# "output" option causes blockchain files to be written to the given location,
+# with "output_file" ignored. If not used, "output_file" is used instead.
+# output=/home/example/blockchain_directory
 output_file=/home/example/Downloads/bootstrap.dat
 hashlist=hashlist.txt
 
@@ -29,3 +31,12 @@ out_of_order_cache_sz = 100000000
 
 # Do we want the reverse the hash bytes coming from getblockhash?
 rev_hash_bytes = False
+
+# On a new month, do we want to set the access and modify times of the new
+# blockchain file?
+file_timestamp = 0
+# Do we want to split the blockchain files given a new month or specific height?
+split_timestamp = 0
+
+# Do we want debug printouts?
+debug_output = False
diff --git a/contrib/linearize/linearize-data.py b/contrib/linearize/linearize-data.py
index 3fdec134b86cc..afcec2b60ae4f 100755
--- a/contrib/linearize/linearize-data.py
+++ b/contrib/linearize/linearize-data.py
@@ -134,7 +134,7 @@ def writeBlock(self, inhdr, blk_hdr, rawblock):
 		if not self.fileOutput and ((self.outsz + blockSizeOnDisk) > self.maxOutSz):
 			self.outF.close()
 			if self.setFileTime:
-				os.utime(outFname, (int(time.time()), highTS))
+				os.utime(self.outFname, (int(time.time()), self.highTS))
 			self.outF = None
 			self.outFname = None
 			self.outFn = self.outFn + 1
@@ -142,12 +142,12 @@ def writeBlock(self, inhdr, blk_hdr, rawblock):
 
 		(blkDate, blkTS) = get_blk_dt(blk_hdr)
 		if self.timestampSplit and (blkDate > self.lastDate):
-			print("New month " + blkDate.strftime("%Y-%m") + " @ " + hash_str)
-			lastDate = blkDate
-			if outF:
-				outF.close()
-				if setFileTime:
-					os.utime(outFname, (int(time.time()), highTS))
+			print("New month " + blkDate.strftime("%Y-%m") + " @ " + self.hash_str)
+			self.lastDate = blkDate
+			if self.outF:
+				self.outF.close()
+				if self.setFileTime:
+					os.utime(self.outFname, (int(time.time()), self.highTS))
 				self.outF = None
 				self.outFname = None
 				self.outFn = self.outFn + 1
@@ -155,11 +155,11 @@ def writeBlock(self, inhdr, blk_hdr, rawblock):
 
 		if not self.outF:
 			if self.fileOutput:
-				outFname = self.settings['output_file']
+				self.outFname = self.settings['output_file']
 			else:
-				outFname = os.path.join(self.settings['output'], "blk%05d.dat" % self.outFn)
-			print("Output file " + outFname)
-			self.outF = open(outFname, "wb")
+				self.outFname = os.path.join(self.settings['output'], "blk%05d.dat" % self.outFn)
+			print("Output file " + self.outFname)
+			self.outF = open(self.outFname, "wb")
 
 		self.outF.write(inhdr)
 		self.outF.write(blk_hdr)
@@ -223,13 +223,16 @@ def run(self):
 			blk_hdr = self.inF.read(80)
 			inExtent = BlockExtent(self.inFn, self.inF.tell(), inhdr, blk_hdr, inLen)
 
-			hash_str = calc_hash_str(blk_hdr)
-			if not hash_str in blkmap:
-				print("Skipping unknown block " + hash_str)
+			self.hash_str = calc_hash_str(blk_hdr)
+			if not self.hash_str in blkmap:
+				# Because blocks can be written to files out-of-order as of 0.10, the script
+				# may encounter blocks it doesn't know about. Treat as debug output.
+				if settings['debug_output'] == 'true':
+					print("Skipping unknown block " + self.hash_str)
 				self.inF.seek(inLen, os.SEEK_CUR)
 				continue
 
-			blkHeight = self.blkmap[hash_str]
+			blkHeight = self.blkmap[self.hash_str]
 			self.blkCountIn += 1
 
 			if self.blkCountOut == blkHeight:
@@ -295,12 +298,15 @@ def run(self):
 		settings['max_out_sz'] = 1000 * 1000 * 1000
 	if 'out_of_order_cache_sz' not in settings:
 		settings['out_of_order_cache_sz'] = 100 * 1000 * 1000
+	if 'debug_output' not in settings:
+		settings['debug_output'] = 'false'
 
 	settings['max_out_sz'] = int(settings['max_out_sz'])
 	settings['split_timestamp'] = int(settings['split_timestamp'])
 	settings['file_timestamp'] = int(settings['file_timestamp'])
 	settings['netmagic'] = unhexlify(settings['netmagic'].encode('utf-8'))
 	settings['out_of_order_cache_sz'] = int(settings['out_of_order_cache_sz'])
+	settings['debug_output'] = settings['debug_output'].lower()
 
 	if 'output_file' not in settings and 'output' not in settings:
 		print("Missing output file / directory")

From 236618061a445d2cb11e722cfac5fdae5be26abb Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Tue, 24 Jan 2017 16:51:22 -0500
Subject: [PATCH 1639/1802] Do not add to vNodes until
 fOneShot/fFeeler/fAddNode have been set

---
 src/net.cpp | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/net.cpp b/src/net.cpp
index 7489b3f32be0d..108d95a1762d2 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -342,8 +342,8 @@ CNode* CConnman::ConnectNode(CAddress addrConnect, const char *pszDest, bool fCo
         CNode* pnode = FindNode((CService)addrConnect);
         if (pnode)
         {
-            pnode->AddRef();
-            return pnode;
+            LogPrintf("Failed to open new connection, already connected\n");
+            return NULL;
         }
     }
 
@@ -373,12 +373,12 @@ CNode* CConnman::ConnectNode(CAddress addrConnect, const char *pszDest, bool fCo
             CNode* pnode = FindNode((CService)addrConnect);
             if (pnode)
             {
-                pnode->AddRef();
                 if (pnode->addrName.empty()) {
                     pnode->addrName = std::string(pszDest);
                 }
                 CloseSocket(hSocket);
-                return pnode;
+                LogPrintf("Failed to open new connection, already connected\n");
+                return NULL;
             }
         }
 
@@ -391,11 +391,6 @@ CNode* CConnman::ConnectNode(CAddress addrConnect, const char *pszDest, bool fCo
         pnode->nServicesExpected = ServiceFlags(addrConnect.nServices & nRelevantServices);
         pnode->nTimeConnected = GetTime();
         pnode->AddRef();
-        GetNodeSignals().InitializeNode(pnode, *this);
-        {
-            LOCK(cs_vNodes);
-            vNodes.push_back(pnode);
-        }
 
         return pnode;
     } else if (!proxyConnectionFailed) {
@@ -1838,6 +1833,12 @@ bool CConnman::OpenNetworkConnection(const CAddress& addrConnect, bool fCountFai
     if (fAddnode)
         pnode->fAddnode = true;
 
+    {
+        LOCK(cs_vNodes);
+        vNodes.push_back(pnode);
+    }
+    GetNodeSignals().InitializeNode(pnode, *this);
+
     return true;
 }
 

From ae9719ab87a05ca4c3293b2f8675f17b16ed5872 Mon Sep 17 00:00:00 2001
From: Alex Morcos <morcos@chaincode.com>
Date: Wed, 25 Jan 2017 22:20:02 -0500
Subject: [PATCH 1640/1802] Refactor GetMinimumFee to give option of providing
 targetFee

---
 src/wallet/wallet.cpp | 9 +++++++--
 src/wallet/wallet.h   | 5 +++++
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index 62519980992e0..c46d5ed780626 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -2790,8 +2790,13 @@ CAmount CWallet::GetRequiredFee(unsigned int nTxBytes)
 
 CAmount CWallet::GetMinimumFee(unsigned int nTxBytes, unsigned int nConfirmTarget, const CTxMemPool& pool)
 {
-    // payTxFee is user-set "I want to pay this much"
-    CAmount nFeeNeeded = payTxFee.GetFee(nTxBytes);
+    // payTxFee is the user-set global for desired feerate
+    return GetMinimumFee(nTxBytes, nConfirmTarget, pool, payTxFee.GetFee(nTxBytes));
+}
+
+CAmount CWallet::GetMinimumFee(unsigned int nTxBytes, unsigned int nConfirmTarget, const CTxMemPool& pool, CAmount targetFee)
+{
+    CAmount nFeeNeeded = targetFee;
     // User didn't set: use -txconfirmtarget to estimate...
     if (nFeeNeeded == 0) {
         int estimateFoundTarget = nConfirmTarget;
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
index ecc63a9a13a38..f95c0589d68fb 100644
--- a/src/wallet/wallet.h
+++ b/src/wallet/wallet.h
@@ -802,6 +802,11 @@ class CWallet : public CCryptoKeyStore, public CValidationInterface
      * and the required fee
      */
     static CAmount GetMinimumFee(unsigned int nTxBytes, unsigned int nConfirmTarget, const CTxMemPool& pool);
+    /**
+     * Estimate the minimum fee considering required fee and targetFee or if 0
+     * then fee estimation for nConfirmTarget
+     */
+    static CAmount GetMinimumFee(unsigned int nTxBytes, unsigned int nConfirmTarget, const CTxMemPool& pool, CAmount targetFee);
     /**
      * Return the minimum required fee taking into account the
      * floating relay fee and user set minimum transaction fee

From 04b877361be8a457b4d4f7fd2277d73f00e2e61c Mon Sep 17 00:00:00 2001
From: Jonas Schnelli <dev@jonasschnelli.ch>
Date: Thu, 26 Jan 2017 13:21:11 +0100
Subject: [PATCH 1641/1802] [Qt] fix transaction details output-index to
 reflect vout index

---
 src/qt/transactionrecord.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/qt/transactionrecord.cpp b/src/qt/transactionrecord.cpp
index cbdedbf68be11..a9d9b6887ec3b 100644
--- a/src/qt/transactionrecord.cpp
+++ b/src/qt/transactionrecord.cpp
@@ -47,14 +47,15 @@ QList<TransactionRecord> TransactionRecord::decomposeTransaction(const CWallet *
         //
         // Credit
         //
-        BOOST_FOREACH(const CTxOut& txout, wtx.tx->vout)
+        for(unsigned int i = 0; i < wtx.tx->vout.size(); i++)
         {
+            const CTxOut& txout = wtx.tx->vout[i];
             isminetype mine = wallet->IsMine(txout);
             if(mine)
             {
                 TransactionRecord sub(hash, nTime);
                 CTxDestination address;
-                sub.idx = parts.size(); // sequence number
+                sub.idx = i; // vout index
                 sub.credit = txout.nValue;
                 sub.involvesWatchAddress = mine & ISMINE_WATCH_ONLY;
                 if (ExtractDestination(txout.scriptPubKey, address) && IsMine(*wallet, address))
@@ -118,7 +119,7 @@ QList<TransactionRecord> TransactionRecord::decomposeTransaction(const CWallet *
             {
                 const CTxOut& txout = wtx.tx->vout[nOut];
                 TransactionRecord sub(hash, nTime);
-                sub.idx = parts.size();
+                sub.idx = nOut;
                 sub.involvesWatchAddress = involvesWatchAddress;
 
                 if(wallet->IsMine(txout))

From e8021ec9193c7e8137f9716bcafd197a357a624e Mon Sep 17 00:00:00 2001
From: Alex Morcos <morcos@chaincode.com>
Date: Wed, 25 Jan 2017 22:16:15 -0500
Subject: [PATCH 1642/1802] Use CWallet::GetMinimumFee in bumpfee

Use the wallet's fee calculation logic to properly clamp fee against minimums and maximums when calculating the fee for a bumpfee transaction.  Unless totalFee is explictly given, in which case, manually check against min, but do nothing to adjust given fee.

In all cases do a final check against maxTxFee (after adding any incremental amount).
---
 src/wallet/rpcwallet.cpp | 42 ++++++++++++++++++++++++----------------
 1 file changed, 25 insertions(+), 17 deletions(-)

diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index b62fbeb10eb4e..9ae36653b8cab 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -2739,6 +2739,10 @@ UniValue bumpfee(const JSONRPCRequest& request)
         throw JSONRPCError(RPC_MISC_ERROR, "Transaction does not have a change output");
     }
 
+    // signature sizes can vary by a byte, so add 1 for each input when calculating the new fee
+    int64_t txSize = GetVirtualTransactionSize(*(wtx.tx));
+    const int64_t maxNewTxSize = txSize + wtx.tx->vin.size();
+
     // optional parameters
     bool specifiedConfirmTarget = false;
     int newConfirmTarget = nTxConfirmTarget;
@@ -2764,10 +2768,11 @@ UniValue bumpfee(const JSONRPCRequest& request)
             }
         } else if (options.exists("totalFee")) {
             totalFee = options["totalFee"].get_int64();
-            if (totalFee <= 0) {
-                throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid totalFee (cannot be <= 0)");
-            } else if (totalFee > maxTxFee) {
-                throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid totalFee (cannot be higher than maxTxFee)");
+            CAmount requiredFee = CWallet::GetRequiredFee(maxNewTxSize);
+            if (totalFee < requiredFee ) {
+                throw JSONRPCError(RPC_INVALID_PARAMETER,
+                                   strprintf("Insufficient totalFee (cannot be less than required fee %s)",
+                                             FormatMoney(requiredFee)));
             }
         }
 
@@ -2776,10 +2781,6 @@ UniValue bumpfee(const JSONRPCRequest& request)
         }
     }
 
-    // signature sizes can vary by a byte, so add 1 for each input when calculating the new fee
-    int64_t txSize = GetVirtualTransactionSize(*(wtx.tx));
-    const int64_t maxNewTxSize = txSize + wtx.tx->vin.size();
-
     // calculate the old fee and fee-rate
     CAmount nOldFee = wtx.GetDebit(ISMINE_SPENDABLE) - wtx.tx->GetValueOut();
     CFeeRate nOldFeeRate(nOldFee, txSize);
@@ -2794,24 +2795,31 @@ UniValue bumpfee(const JSONRPCRequest& request)
         nNewFee = totalFee;
         nNewFeeRate = CFeeRate(totalFee, maxNewTxSize);
     } else {
-        // use the user-defined payTxFee if possible, otherwise use smartfee / fallbackfee
-        if (!specifiedConfirmTarget && payTxFee.GetFeePerK() != 0) {
-            nNewFeeRate = payTxFee;
-        } else {
-            nNewFeeRate = mempool.estimateSmartFee(newConfirmTarget);
+        // if user specified a confirm target then don't consider any global payTxFee
+        if (specifiedConfirmTarget) {
+            nNewFee = CWallet::GetMinimumFee(maxNewTxSize, newConfirmTarget, mempool, CAmount(0));
         }
-        if (nNewFeeRate.GetFeePerK() == 0) {
-            nNewFeeRate = CWallet::fallbackFee;
+        // otherwise use the regular wallet logic to select payTxFee or default confirm target
+        else {
+            nNewFee = CWallet::GetMinimumFee(maxNewTxSize, newConfirmTarget, mempool);
         }
 
+        nNewFeeRate = CFeeRate(nNewFee, maxNewTxSize);
+
         // new fee rate must be at least old rate + minimum incremental relay rate
         if (nNewFeeRate.GetFeePerK() < nOldFeeRate.GetFeePerK() + ::incrementalRelayFee.GetFeePerK()) {
             nNewFeeRate = CFeeRate(nOldFeeRate.GetFeePerK() + ::incrementalRelayFee.GetFeePerK());
+            nNewFee = nNewFeeRate.GetFee(maxNewTxSize);
         }
-
-        nNewFee = nNewFeeRate.GetFee(maxNewTxSize);
     }
 
+    // Check that in all cases the new fee doesn't violate maxTxFee
+     if (nNewFee > maxTxFee) {
+         throw JSONRPCError(RPC_MISC_ERROR,
+                            strprintf("Specified or calculated fee %s is too high (cannot be higher than maxTxFee %s)",
+                                      FormatMoney(nNewFee), FormatMoney(maxTxFee)));
+     }
+
     // check that fee rate is higher than mempool's minimum fee
     // (no point in bumping fee if we know that the new tx won't be accepted to the mempool)
     // This may occur if the user set TotalFee or paytxfee too low, if fallbackfee is too low, or, perhaps,

From fab035f2f7f7bcfca7898d00105f6cb539a2c8da Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Thu, 12 Jan 2017 03:59:21 +0100
Subject: [PATCH 1643/1802] qa: Actually test assertions in pruning.py

Also refactor to use wrapper for stop_node
---
 qa/rpc-tests/pruning.py | 38 +++++++++++++++++---------------------
 1 file changed, 17 insertions(+), 21 deletions(-)

diff --git a/qa/rpc-tests/pruning.py b/qa/rpc-tests/pruning.py
index 60a1a86fa8ca7..9d155478e251a 100755
--- a/qa/rpc-tests/pruning.py
+++ b/qa/rpc-tests/pruning.py
@@ -103,7 +103,7 @@ def create_chain_with_staleblocks(self):
             # Disconnect node 0 so it can mine a longer reorg chain without knowing about node 1's soon-to-be-stale chain
             # Node 2 stays connected, so it hears about the stale blocks and then reorg's when node0 reconnects
             # Stopping node 0 also clears its mempool, so it doesn't have node1's transactions to accidentally mine
-            stop_node(self.nodes[0],0)
+            self.stop_node(0)
             self.nodes[0]=start_node(0, self.options.tmpdir, ["-debug","-maxreceivebuffer=20000","-blockmaxsize=999000", "-checkblocks=5"], timewait=900)
             # Mine 24 blocks in node 1
             for i in range(24):
@@ -128,7 +128,7 @@ def reorg_test(self):
         # This will cause Node 2 to do a reorg requiring 288 blocks of undo data to the reorg_test chain
         # Reboot node 1 to clear its mempool (hopefully make the invalidate faster)
         # Lower the block max size so we don't keep mining all our big mempool transactions (from disconnected blocks)
-        stop_node(self.nodes[1],1)
+        self.stop_node(1)
         self.nodes[1]=start_node(1, self.options.tmpdir, ["-debug","-maxreceivebuffer=20000","-blockmaxsize=5000", "-checkblocks=5", "-disablesafemode"], timewait=900)
 
         height = self.nodes[1].getblockcount()
@@ -151,7 +151,7 @@ def reorg_test(self):
         print("New best height", self.nodes[1].getblockcount())
 
         # Reboot node1 to clear those giant tx's from mempool
-        stop_node(self.nodes[1],1)
+        self.stop_node(1)
         self.nodes[1]=start_node(1, self.options.tmpdir, ["-debug","-maxreceivebuffer=20000","-blockmaxsize=5000", "-checkblocks=5", "-disablesafemode"], timewait=900)
 
         print("Generating new longer chain of 300 more blocks")
@@ -231,7 +231,7 @@ def manual_test(self, node_number, use_timestamp):
         node = self.nodes[node_number] = start_node(node_number, self.options.tmpdir, ["-debug=0"], timewait=900)
         assert_equal(node.getblockcount(), 995)
         assert_raises_message(JSONRPCException, "not in prune mode", node.pruneblockchain, 500)
-        stop_node(node, node_number)
+        self.stop_node(node_number)
 
         # now re-start in manual pruning mode
         node = self.nodes[node_number] = start_node(node_number, self.options.tmpdir, ["-debug=0","-prune=1"], timewait=900)
@@ -266,25 +266,21 @@ def has_block(index):
 
         # mine 6 blocks so we are at height 1001 (i.e., above PruneAfterHeight)
         node.generate(6)
+        assert_equal(node.getblockchaininfo()["blocks"], 1001)
 
-        # negative and zero inputs should raise an exception
-        try:
-            node.pruneblockchain(-10)
-            raise AssertionError("pruneblockchain(-10) should have failed.")
-        except:
-            pass
-
-        try:
-            node.pruneblockchain(0)
-            raise AssertionError("pruneblockchain(0) should have failed.")
-        except:
-            pass
+        # negative heights should raise an exception
+        assert_raises_message(JSONRPCException, "Negative", node.pruneblockchain, -10)
 
         # height=100 too low to prune first block file so this is a no-op
         prune(100)
         if not has_block(0):
             raise AssertionError("blk00000.dat is missing when should still be there")
 
+        # Does nothing
+        node.pruneblockchain(height(0))
+        if not has_block(0):
+            raise AssertionError("blk00000.dat is missing when should still be there")
+
         # height=500 should prune first file
         prune(500)
         if has_block(0):
@@ -311,7 +307,7 @@ def has_block(index):
             raise AssertionError("blk00003.dat is still there, should be pruned by now")
 
         # stop node, start back up with auto-prune at 550MB, make sure still runs
-        stop_node(node, node_number)
+        self.stop_node(node_number)
         self.nodes[node_number] = start_node(node_number, self.options.tmpdir, ["-debug=0","-prune=550"], timewait=900)
 
         print("Success")
@@ -320,7 +316,7 @@ def wallet_test(self):
         # check that the pruning node's wallet is still in good shape
         print("Stop and start pruning node to trigger wallet rescan")
         try:
-            stop_node(self.nodes[2], 2)
+            self.stop_node(2)
             start_node(2, self.options.tmpdir, ["-debug=1","-prune=550"])
             print("Success")
         except Exception as detail:
@@ -333,7 +329,7 @@ def wallet_test(self):
         nds = [self.nodes[0], self.nodes[5]]
         sync_blocks(nds, wait=5, timeout=300)
         try:
-            stop_node(self.nodes[5],5) #stop and start to trigger rescan
+            self.stop_node(5) #stop and start to trigger rescan
             start_node(5, self.options.tmpdir, ["-debug=1","-prune=550"])
             print ("Success")
         except Exception as detail:
@@ -353,8 +349,8 @@ def run_test(self):
         # N0=N1=N2 **...*(995)
 
         # stop manual-pruning node with 995 blocks
-        stop_node(self.nodes[3],3)
-        stop_node(self.nodes[4],4)
+        self.stop_node(3)
+        self.stop_node(4)
 
         print("Check that we haven't started pruning yet because we're below PruneAfterHeight")
         self.test_height_min()

From 0c0c63f70a5376b87508e8f1c73dcbc59c8a96ed Mon Sep 17 00:00:00 2001
From: Alex Morcos <morcos@chaincode.com>
Date: Mon, 23 Jan 2017 13:15:24 -0500
Subject: [PATCH 1644/1802] Introduce WALLET_INCREMENTAL_RELAY_FEE

Have wallet's default bump value be higher than the default incrementalRelayFee to future proof against changes to incremental relay fee.  Only applies when not setting the fee rate directly.
---
 src/wallet/rpcwallet.cpp | 16 ++++++++++++----
 src/wallet/wallet.h      |  2 ++
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index 9ae36653b8cab..6517bae52cd39 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -2786,11 +2786,19 @@ UniValue bumpfee(const JSONRPCRequest& request)
     CFeeRate nOldFeeRate(nOldFee, txSize);
     CAmount nNewFee;
     CFeeRate nNewFeeRate;
+    // The wallet uses a conservative WALLET_INCREMENTAL_RELAY_FEE value to
+    // future proof against changes to network wide policy for incremental relay
+    // fee that our node may not be aware of.
+    CFeeRate walletIncrementalRelayFee = CFeeRate(WALLET_INCREMENTAL_RELAY_FEE);
+    if (::incrementalRelayFee > walletIncrementalRelayFee) {
+        walletIncrementalRelayFee = ::incrementalRelayFee;
+    }
 
     if (totalFee > 0) {
         CAmount minTotalFee = nOldFeeRate.GetFee(maxNewTxSize) + ::incrementalRelayFee.GetFee(maxNewTxSize);
         if (totalFee < minTotalFee) {
-            throw JSONRPCError(RPC_INVALID_PARAMETER, strprintf("Invalid totalFee, must be at least %s (oldFee %s + relayFee %s)", FormatMoney(minTotalFee), nOldFeeRate.GetFee(maxNewTxSize), ::incrementalRelayFee.GetFee(maxNewTxSize)));
+            throw JSONRPCError(RPC_INVALID_PARAMETER, strprintf("Insufficient totalFee, must be at least %s (oldFee %s + incrementalFee %s)",
+                                                                FormatMoney(minTotalFee), FormatMoney(nOldFeeRate.GetFee(maxNewTxSize)), FormatMoney(::incrementalRelayFee.GetFee(maxNewTxSize))));
         }
         nNewFee = totalFee;
         nNewFeeRate = CFeeRate(totalFee, maxNewTxSize);
@@ -2806,9 +2814,9 @@ UniValue bumpfee(const JSONRPCRequest& request)
 
         nNewFeeRate = CFeeRate(nNewFee, maxNewTxSize);
 
-        // new fee rate must be at least old rate + minimum incremental relay rate
-        if (nNewFeeRate.GetFeePerK() < nOldFeeRate.GetFeePerK() + ::incrementalRelayFee.GetFeePerK()) {
-            nNewFeeRate = CFeeRate(nOldFeeRate.GetFeePerK() + ::incrementalRelayFee.GetFeePerK());
+        // New fee rate must be at least old rate + minimum incremental relay rate
+        if (nNewFeeRate.GetFeePerK() < nOldFeeRate.GetFeePerK() + walletIncrementalRelayFee.GetFeePerK()) {
+            nNewFeeRate = CFeeRate(nOldFeeRate.GetFeePerK() + walletIncrementalRelayFee.GetFeePerK());
             nNewFee = nNewFeeRate.GetFee(maxNewTxSize);
         }
     }
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
index f95c0589d68fb..764a7aa268f74 100644
--- a/src/wallet/wallet.h
+++ b/src/wallet/wallet.h
@@ -48,6 +48,8 @@ static const CAmount DEFAULT_TRANSACTION_FEE = 0;
 static const CAmount DEFAULT_FALLBACK_FEE = 20000;
 //! -mintxfee default
 static const CAmount DEFAULT_TRANSACTION_MINFEE = 1000;
+//! minimum recommended increment for BIP 125 replacement txs
+static const CAmount WALLET_INCREMENTAL_RELAY_FEE = 5000;
 //! target minimum change amount
 static const CAmount MIN_CHANGE = CENT;
 //! final minimum change amount after paying for fees

From 4b189c13401bcd350c05cf8194beaeb3d18b3ebc Mon Sep 17 00:00:00 2001
From: Alex Morcos <morcos@chaincode.com>
Date: Mon, 23 Jan 2017 13:15:48 -0500
Subject: [PATCH 1645/1802] Change bumpfee result value from 'oldfee' to
 'origfee'.

The result value indicates the actual fee on the transaction that was replaced. But there is an error message which uses the description 'oldfee' to refer to the original fee rate applied to the new transaction's estimated max size.  It was confusing that two different uses of 'oldfee' had two different numeric values.
---
 src/wallet/rpcwallet.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index 6517bae52cd39..2e381630c8ad6 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -2674,8 +2674,8 @@ UniValue bumpfee(const JSONRPCRequest& request)
             "\nResult:\n"
             "{\n"
             "  \"txid\":    \"value\",   (string)  The id of the new transaction\n"
-            "  \"oldfee\":  n,         (numeric) Fee of the replaced transaction\n"
-            "  \"fee\":     n,         (numeric) Fee of the new transaction\n"
+            "  \"origfee\":  n,         (numeric) Fee of the replaced transaction\n"
+            "  \"fee\":      n,         (numeric) Fee of the new transaction\n"
             "}\n"
             "\nExamples:\n"
             "\nBump the fee, get the new transaction\'s txid\n" +
@@ -2899,7 +2899,7 @@ UniValue bumpfee(const JSONRPCRequest& request)
 
     UniValue result(UniValue::VOBJ);
     result.push_back(Pair("txid", wtxBumped.GetHash().GetHex()));
-    result.push_back(Pair("oldfee", ValueFromAmount(nOldFee)));
+    result.push_back(Pair("origfee", ValueFromAmount(nOldFee)));
     result.push_back(Pair("fee", ValueFromAmount(nNewFee)));
 
     return result;

From b7b48c8bbdf7a90861610b035d8b0a247ef78c45 Mon Sep 17 00:00:00 2001
From: Karl-Johan Alm <karljohan-alm@garage.co.jp>
Date: Fri, 27 Jan 2017 17:43:41 +0900
Subject: [PATCH 1646/1802] Refactor: Remove using namespace <xxx> from
 src/*.cpp.

---
 src/bloom.cpp          |  28 ++++++-----
 src/chain.cpp          |   2 -
 src/core_read.cpp      |  30 ++++++------
 src/core_write.cpp     |  42 ++++++++---------
 src/init.cpp           |  29 ++++++------
 src/merkleblock.cpp    |  12 ++---
 src/miner.cpp          |   6 +--
 src/net_processing.cpp | 104 ++++++++++++++++++++---------------------
 src/rest.cpp           |  52 ++++++++++-----------
 src/timedata.cpp       |   4 +-
 src/txdb.cpp           |  22 ++++-----
 src/txmempool.cpp      |   8 ++--
 src/validation.cpp     |  46 +++++++++---------
 13 files changed, 179 insertions(+), 206 deletions(-)

diff --git a/src/bloom.cpp b/src/bloom.cpp
index 520e10cdc8296..8d47cb76e8a58 100644
--- a/src/bloom.cpp
+++ b/src/bloom.cpp
@@ -19,15 +19,13 @@
 #define LN2SQUARED 0.4804530139182014246671025263266649717305529515945455
 #define LN2 0.6931471805599453094172321214581765680755001343602552
 
-using namespace std;
-
 CBloomFilter::CBloomFilter(unsigned int nElements, double nFPRate, unsigned int nTweakIn, unsigned char nFlagsIn) :
     /**
      * The ideal size for a bloom filter with a given number of elements and false positive rate is:
      * - nElements * log(fp rate) / ln(2)^2
      * We ignore filter parameters which will create a bloom filter larger than the protocol limits
      */
-    vData(min((unsigned int)(-1  / LN2SQUARED * nElements * log(nFPRate)), MAX_BLOOM_FILTER_SIZE * 8) / 8),
+    vData(std::min((unsigned int)(-1  / LN2SQUARED * nElements * log(nFPRate)), MAX_BLOOM_FILTER_SIZE * 8) / 8),
     /**
      * The ideal number of hash functions is filter size * ln(2) / number of elements
      * Again, we ignore filter parameters which will create a bloom filter with more hash functions than the protocol limits
@@ -35,7 +33,7 @@ CBloomFilter::CBloomFilter(unsigned int nElements, double nFPRate, unsigned int
      */
     isFull(false),
     isEmpty(true),
-    nHashFuncs(min((unsigned int)(vData.size() * 8 / nElements * LN2), MAX_HASH_FUNCS)),
+    nHashFuncs(std::min((unsigned int)(vData.size() * 8 / nElements * LN2), MAX_HASH_FUNCS)),
     nTweak(nTweakIn),
     nFlags(nFlagsIn)
 {
@@ -58,7 +56,7 @@ inline unsigned int CBloomFilter::Hash(unsigned int nHashNum, const std::vector<
     return MurmurHash3(nHashNum * 0xFBA4C795 + nTweak, vDataToHash) % (vData.size() * 8);
 }
 
-void CBloomFilter::insert(const vector<unsigned char>& vKey)
+void CBloomFilter::insert(const std::vector<unsigned char>& vKey)
 {
     if (isFull)
         return;
@@ -75,17 +73,17 @@ void CBloomFilter::insert(const COutPoint& outpoint)
 {
     CDataStream stream(SER_NETWORK, PROTOCOL_VERSION);
     stream << outpoint;
-    vector<unsigned char> data(stream.begin(), stream.end());
+    std::vector<unsigned char> data(stream.begin(), stream.end());
     insert(data);
 }
 
 void CBloomFilter::insert(const uint256& hash)
 {
-    vector<unsigned char> data(hash.begin(), hash.end());
+    std::vector<unsigned char> data(hash.begin(), hash.end());
     insert(data);
 }
 
-bool CBloomFilter::contains(const vector<unsigned char>& vKey) const
+bool CBloomFilter::contains(const std::vector<unsigned char>& vKey) const
 {
     if (isFull)
         return true;
@@ -105,13 +103,13 @@ bool CBloomFilter::contains(const COutPoint& outpoint) const
 {
     CDataStream stream(SER_NETWORK, PROTOCOL_VERSION);
     stream << outpoint;
-    vector<unsigned char> data(stream.begin(), stream.end());
+    std::vector<unsigned char> data(stream.begin(), stream.end());
     return contains(data);
 }
 
 bool CBloomFilter::contains(const uint256& hash) const
 {
-    vector<unsigned char> data(hash.begin(), hash.end());
+    std::vector<unsigned char> data(hash.begin(), hash.end());
     return contains(data);
 }
 
@@ -154,7 +152,7 @@ bool CBloomFilter::IsRelevantAndUpdate(const CTransaction& tx)
         // This means clients don't have to update the filter themselves when a new relevant tx 
         // is discovered in order to find spending transactions, which avoids round-tripping and race conditions.
         CScript::const_iterator pc = txout.scriptPubKey.begin();
-        vector<unsigned char> data;
+        std::vector<unsigned char> data;
         while (pc < txout.scriptPubKey.end())
         {
             opcodetype opcode;
@@ -168,7 +166,7 @@ bool CBloomFilter::IsRelevantAndUpdate(const CTransaction& tx)
                 else if ((nFlags & BLOOM_UPDATE_MASK) == BLOOM_UPDATE_P2PUBKEY_ONLY)
                 {
                     txnouttype type;
-                    vector<vector<unsigned char> > vSolutions;
+                    std::vector<std::vector<unsigned char> > vSolutions;
                     if (Solver(txout.scriptPubKey, type, vSolutions) &&
                             (type == TX_PUBKEY || type == TX_MULTISIG))
                         insert(COutPoint(hash, i));
@@ -189,7 +187,7 @@ bool CBloomFilter::IsRelevantAndUpdate(const CTransaction& tx)
 
         // Match if the filter contains any arbitrary script data element in any scriptSig in tx
         CScript::const_iterator pc = txin.scriptSig.begin();
-        vector<unsigned char> data;
+        std::vector<unsigned char> data;
         while (pc < txin.scriptSig.end())
         {
             opcodetype opcode;
@@ -280,7 +278,7 @@ void CRollingBloomFilter::insert(const std::vector<unsigned char>& vKey)
 
 void CRollingBloomFilter::insert(const uint256& hash)
 {
-    vector<unsigned char> vData(hash.begin(), hash.end());
+    std::vector<unsigned char> vData(hash.begin(), hash.end());
     insert(vData);
 }
 
@@ -300,7 +298,7 @@ bool CRollingBloomFilter::contains(const std::vector<unsigned char>& vKey) const
 
 bool CRollingBloomFilter::contains(const uint256& hash) const
 {
-    vector<unsigned char> vData(hash.begin(), hash.end());
+    std::vector<unsigned char> vData(hash.begin(), hash.end());
     return contains(vData);
 }
 
diff --git a/src/chain.cpp b/src/chain.cpp
index 0f4d422b9fc66..a5b369c4fc4c3 100644
--- a/src/chain.cpp
+++ b/src/chain.cpp
@@ -5,8 +5,6 @@
 
 #include "chain.h"
 
-using namespace std;
-
 /**
  * CChain implementation
  */
diff --git a/src/core_read.cpp b/src/core_read.cpp
index 85bb62c1761dd..a5f232c22857a 100644
--- a/src/core_read.cpp
+++ b/src/core_read.cpp
@@ -20,13 +20,11 @@
 #include <boost/algorithm/string/split.hpp>
 #include <boost/assign/list_of.hpp>
 
-using namespace std;
-
 CScript ParseScript(const std::string& s)
 {
     CScript result;
 
-    static map<string, opcodetype> mapOpNames;
+    static std::map<std::string, opcodetype> mapOpNames;
 
     if (mapOpNames.empty())
     {
@@ -39,7 +37,7 @@ CScript ParseScript(const std::string& s)
             const char* name = GetOpName((opcodetype)op);
             if (strcmp(name, "OP_UNKNOWN") == 0)
                 continue;
-            string strName(name);
+            std::string strName(name);
             mapOpNames[strName] = (opcodetype)op;
             // Convenience: OP_ADD and just ADD are both recognized:
             boost::algorithm::replace_first(strName, "OP_", "");
@@ -47,7 +45,7 @@ CScript ParseScript(const std::string& s)
         }
     }
 
-    vector<string> words;
+    std::vector<std::string> words;
     boost::algorithm::split(words, s, boost::algorithm::is_any_of(" \t\n"), boost::algorithm::token_compress_on);
 
     for (std::vector<std::string>::const_iterator w = words.begin(); w != words.end(); ++w)
@@ -57,16 +55,16 @@ CScript ParseScript(const std::string& s)
             // Empty string, ignore. (boost::split given '' will return one word)
         }
         else if (all(*w, boost::algorithm::is_digit()) ||
-            (boost::algorithm::starts_with(*w, "-") && all(string(w->begin()+1, w->end()), boost::algorithm::is_digit())))
+            (boost::algorithm::starts_with(*w, "-") && all(std::string(w->begin()+1, w->end()), boost::algorithm::is_digit())))
         {
             // Number
             int64_t n = atoi64(*w);
             result << n;
         }
-        else if (boost::algorithm::starts_with(*w, "0x") && (w->begin()+2 != w->end()) && IsHex(string(w->begin()+2, w->end())))
+        else if (boost::algorithm::starts_with(*w, "0x") && (w->begin()+2 != w->end()) && IsHex(std::string(w->begin()+2, w->end())))
         {
             // Raw hex data, inserted NOT pushed onto stack:
-            std::vector<unsigned char> raw = ParseHex(string(w->begin()+2, w->end()));
+            std::vector<unsigned char> raw = ParseHex(std::string(w->begin()+2, w->end()));
             result.insert(result.end(), raw.begin(), raw.end());
         }
         else if (w->size() >= 2 && boost::algorithm::starts_with(*w, "'") && boost::algorithm::ends_with(*w, "'"))
@@ -83,7 +81,7 @@ CScript ParseScript(const std::string& s)
         }
         else
         {
-            throw runtime_error("script parse error");
+            throw std::runtime_error("script parse error");
         }
     }
 
@@ -95,7 +93,7 @@ bool DecodeHexTx(CMutableTransaction& tx, const std::string& strHexTx, bool fTry
     if (!IsHex(strHexTx))
         return false;
 
-    vector<unsigned char> txData(ParseHex(strHexTx));
+    std::vector<unsigned char> txData(ParseHex(strHexTx));
 
     if (fTryNoWitness) {
         CDataStream ssData(txData, SER_NETWORK, PROTOCOL_VERSION | SERIALIZE_TRANSACTION_NO_WITNESS);
@@ -138,9 +136,9 @@ bool DecodeHexBlk(CBlock& block, const std::string& strHexBlk)
     return true;
 }
 
-uint256 ParseHashUV(const UniValue& v, const string& strName)
+uint256 ParseHashUV(const UniValue& v, const std::string& strName)
 {
-    string strHex;
+    std::string strHex;
     if (v.isStr())
         strHex = v.getValStr();
     return ParseHashStr(strHex, strName);  // Note: ParseHashStr("") throws a runtime_error
@@ -149,19 +147,19 @@ uint256 ParseHashUV(const UniValue& v, const string& strName)
 uint256 ParseHashStr(const std::string& strHex, const std::string& strName)
 {
     if (!IsHex(strHex)) // Note: IsHex("") is false
-        throw runtime_error(strName+" must be hexadecimal string (not '"+strHex+"')");
+        throw std::runtime_error(strName + " must be hexadecimal string (not '" + strHex + "')");
 
     uint256 result;
     result.SetHex(strHex);
     return result;
 }
 
-vector<unsigned char> ParseHexUV(const UniValue& v, const string& strName)
+std::vector<unsigned char> ParseHexUV(const UniValue& v, const std::string& strName)
 {
-    string strHex;
+    std::string strHex;
     if (v.isStr())
         strHex = v.getValStr();
     if (!IsHex(strHex))
-        throw runtime_error(strName+" must be hexadecimal string (not '"+strHex+"')");
+        throw std::runtime_error(strName + " must be hexadecimal string (not '" + strHex + "')");
     return ParseHex(strHex);
 }
diff --git a/src/core_write.cpp b/src/core_write.cpp
index ee8a897ca435d..b0993a131f02a 100644
--- a/src/core_write.cpp
+++ b/src/core_write.cpp
@@ -18,16 +18,14 @@
 #include <boost/assign/list_of.hpp>
 #include <boost/foreach.hpp>
 
-using namespace std;
-
-string FormatScript(const CScript& script)
+std::string FormatScript(const CScript& script)
 {
-    string ret;
+    std::string ret;
     CScript::const_iterator it = script.begin();
     opcodetype op;
     while (it != script.end()) {
         CScript::const_iterator it2 = it;
-        vector<unsigned char> vch;
+        std::vector<unsigned char> vch;
         if (script.GetOp2(it, op, &vch)) {
             if (op == OP_0) {
                 ret += "0 ";
@@ -36,9 +34,9 @@ string FormatScript(const CScript& script)
                 ret += strprintf("%i ", op - OP_1NEGATE - 1);
                 continue;
             } else if (op >= OP_NOP && op <= OP_NOP10) {
-                string str(GetOpName(op));
-                if (str.substr(0, 3) == string("OP_")) {
-                    ret += str.substr(3, string::npos) + " ";
+                std::string str(GetOpName(op));
+                if (str.substr(0, 3) == std::string("OP_")) {
+                    ret += str.substr(3, std::string::npos) + " ";
                     continue;
                 }
             }
@@ -55,14 +53,14 @@ string FormatScript(const CScript& script)
     return ret.substr(0, ret.size() - 1);
 }
 
-const map<unsigned char, string> mapSigHashTypes =
+const std::map<unsigned char, std::string> mapSigHashTypes =
     boost::assign::map_list_of
-    (static_cast<unsigned char>(SIGHASH_ALL), string("ALL"))
-    (static_cast<unsigned char>(SIGHASH_ALL|SIGHASH_ANYONECANPAY), string("ALL|ANYONECANPAY"))
-    (static_cast<unsigned char>(SIGHASH_NONE), string("NONE"))
-    (static_cast<unsigned char>(SIGHASH_NONE|SIGHASH_ANYONECANPAY), string("NONE|ANYONECANPAY"))
-    (static_cast<unsigned char>(SIGHASH_SINGLE), string("SINGLE"))
-    (static_cast<unsigned char>(SIGHASH_SINGLE|SIGHASH_ANYONECANPAY), string("SINGLE|ANYONECANPAY"))
+    (static_cast<unsigned char>(SIGHASH_ALL), std::string("ALL"))
+    (static_cast<unsigned char>(SIGHASH_ALL|SIGHASH_ANYONECANPAY), std::string("ALL|ANYONECANPAY"))
+    (static_cast<unsigned char>(SIGHASH_NONE), std::string("NONE"))
+    (static_cast<unsigned char>(SIGHASH_NONE|SIGHASH_ANYONECANPAY), std::string("NONE|ANYONECANPAY"))
+    (static_cast<unsigned char>(SIGHASH_SINGLE), std::string("SINGLE"))
+    (static_cast<unsigned char>(SIGHASH_SINGLE|SIGHASH_ANYONECANPAY), std::string("SINGLE|ANYONECANPAY"))
     ;
 
 /**
@@ -72,11 +70,11 @@ const map<unsigned char, string> mapSigHashTypes =
  *                                     of a signature. Only pass true for scripts you believe could contain signatures. For example,
  *                                     pass false, or omit the this argument (defaults to false), for scriptPubKeys.
  */
-string ScriptToAsmStr(const CScript& script, const bool fAttemptSighashDecode)
+std::string ScriptToAsmStr(const CScript& script, const bool fAttemptSighashDecode)
 {
-    string str;
+    std::string str;
     opcodetype opcode;
-    vector<unsigned char> vch;
+    std::vector<unsigned char> vch;
     CScript::const_iterator pc = script.begin();
     while (pc < script.end()) {
         if (!str.empty()) {
@@ -87,12 +85,12 @@ string ScriptToAsmStr(const CScript& script, const bool fAttemptSighashDecode)
             return str;
         }
         if (0 <= opcode && opcode <= OP_PUSHDATA4) {
-            if (vch.size() <= static_cast<vector<unsigned char>::size_type>(4)) {
+            if (vch.size() <= static_cast<std::vector<unsigned char>::size_type>(4)) {
                 str += strprintf("%d", CScriptNum(vch, false).getint());
             } else {
                 // the IsUnspendable check makes sure not to try to decode OP_RETURN data that may match the format of a signature
                 if (fAttemptSighashDecode && !script.IsUnspendable()) {
-                    string strSigHashDecode;
+                    std::string strSigHashDecode;
                     // goal: only attempt to decode a defined sighash type from data that looks like a signature within a scriptSig.
                     // this won't decode correctly formatted public keys in Pubkey or Multisig scripts due to
                     // the restrictions on the pubkey formats (see IsCompressedOrUncompressedPubKey) being incongruous with the
@@ -116,7 +114,7 @@ string ScriptToAsmStr(const CScript& script, const bool fAttemptSighashDecode)
     return str;
 }
 
-string EncodeHexTx(const CTransaction& tx, const int serialFlags)
+std::string EncodeHexTx(const CTransaction& tx, const int serialFlags)
 {
     CDataStream ssTx(SER_NETWORK, PROTOCOL_VERSION | serialFlags);
     ssTx << tx;
@@ -127,7 +125,7 @@ void ScriptPubKeyToUniv(const CScript& scriptPubKey,
                         UniValue& out, bool fIncludeHex)
 {
     txnouttype type;
-    vector<CTxDestination> addresses;
+    std::vector<CTxDestination> addresses;
     int nRequired;
 
     out.pushKV("asm", ScriptToAsmStr(scriptPubKey));
diff --git a/src/init.cpp b/src/init.cpp
index 5be011f944dec..453fd833a3ba7 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -65,8 +65,6 @@
 #include "zmq/zmqnotificationinterface.h"
 #endif
 
-using namespace std;
-
 bool fFeeEstimatesInitialized = false;
 static const bool DEFAULT_PROXYRANDOMIZE = true;
 static const bool DEFAULT_REST_ENABLE = false;
@@ -310,10 +308,10 @@ void OnRPCStopped()
 void OnRPCPreCommand(const CRPCCommand& cmd)
 {
     // Observe safe mode
-    string strWarning = GetWarnings("rpc");
+    std::string strWarning = GetWarnings("rpc");
     if (strWarning != "" && !GetBoolArg("-disablesafemode", DEFAULT_DISABLE_SAFEMODE) &&
         !cmd.okSafeMode)
-        throw JSONRPCError(RPC_FORBIDDEN_BY_SAFE_MODE, string("Safe mode: ") + strWarning);
+        throw JSONRPCError(RPC_FORBIDDEN_BY_SAFE_MODE, std::string("Safe mode: ") + strWarning);
 }
 
 std::string HelpMessage(HelpMessageMode mode)
@@ -322,7 +320,7 @@ std::string HelpMessage(HelpMessageMode mode)
 
     // When adding new options to the categories, please keep and ensure alphabetical ordering.
     // Do not translate _(...) -help-debug options, Many technical terms, and only a very small audience, so is unnecessary stress to translators.
-    string strUsage = HelpMessageGroup(_("Options:"));
+    std::string strUsage = HelpMessageGroup(_("Options:"));
     strUsage += HelpMessageOpt("-?", _("Print this help message and exit"));
     strUsage += HelpMessageOpt("-version", _("Print version and exit"));
     strUsage += HelpMessageOpt("-alertnotify=<cmd>", _("Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)"));
@@ -436,7 +434,7 @@ std::string HelpMessage(HelpMessageMode mode)
         strUsage += HelpMessageOpt("-limitdescendantsize=<n>", strprintf("Do not accept transactions if any ancestor would have more than <n> kilobytes of in-mempool descendants (default: %u).", DEFAULT_DESCENDANT_SIZE_LIMIT));
         strUsage += HelpMessageOpt("-bip9params=deployment:start:end", "Use given start/end times for specified BIP9 deployment (regtest-only)");
     }
-    string debugCategories = "addrman, alert, bench, cmpctblock, coindb, db, http, libevent, lock, mempool, mempoolrej, net, proxy, prune, rand, reindex, rpc, selectcoins, tor, zmq"; // Don't translate these and qt below
+    std::string debugCategories = "addrman, alert, bench, cmpctblock, coindb, db, http, libevent, lock, mempool, mempoolrej, net, proxy, prune, rand, reindex, rpc, selectcoins, tor, zmq"; // Don't translate these and qt below
     if (mode == HMM_BITCOIN_QT)
         debugCategories += ", qt";
     strUsage += HelpMessageOpt("-debug=<category>", strprintf(_("Output debugging information (default: %u, supplying <category> is optional)"), 0) + ". " +
@@ -576,15 +574,14 @@ struct CImportingNow
 // works correctly.
 void CleanupBlockRevFiles()
 {
-    using namespace boost::filesystem;
-    map<string, path> mapBlockFiles;
+    std::map<std::string, boost::filesystem::path> mapBlockFiles;
 
     // Glob all blk?????.dat and rev?????.dat files from the blocks directory.
     // Remove the rev files immediately and insert the blk file paths into an
     // ordered map keyed by block file index.
     LogPrintf("Removing unusable blk?????.dat and rev?????.dat files for -reindex with -prune\n");
-    path blocksdir = GetDataDir() / "blocks";
-    for (directory_iterator it(blocksdir); it != directory_iterator(); it++) {
+    boost::filesystem::path blocksdir = GetDataDir() / "blocks";
+    for (boost::filesystem::directory_iterator it(blocksdir); it != boost::filesystem::directory_iterator(); it++) {
         if (is_regular_file(*it) &&
             it->path().filename().string().length() == 12 &&
             it->path().filename().string().substr(8,4) == ".dat")
@@ -601,7 +598,7 @@ void CleanupBlockRevFiles()
     // keeping a separate counter.  Once we hit a gap (or if 0 doesn't exist)
     // start removing block files.
     int nContigCounter = 0;
-    BOOST_FOREACH(const PAIRTYPE(string, path)& item, mapBlockFiles) {
+    BOOST_FOREACH(const PAIRTYPE(std::string, boost::filesystem::path)& item, mapBlockFiles) {
         if (atoi(item.first) == nContigCounter) {
             nContigCounter++;
             continue;
@@ -894,8 +891,8 @@ bool AppInitParameterInteraction()
     fDebug = mapMultiArgs.count("-debug");
     // Special-case: if -debug=0/-nodebug is set, turn off debugging messages
     if (fDebug) {
-        const vector<string>& categories = mapMultiArgs.at("-debug");
-        if (GetBoolArg("-nodebug", false) || find(categories.begin(), categories.end(), string("0")) != categories.end())
+        const std::vector<std::string>& categories = mapMultiArgs.at("-debug");
+        if (GetBoolArg("-nodebug", false) || find(categories.begin(), categories.end(), std::string("0")) != categories.end())
             fDebug = false;
     }
 
@@ -1063,7 +1060,7 @@ bool AppInitParameterInteraction()
         if (!chainparams.MineBlocksOnDemand()) {
             return InitError("BIP9 parameters may only be overridden on regtest.");
         }
-        const vector<string>& deployments = mapMultiArgs.at("-bip9params");
+        const std::vector<std::string>& deployments = mapMultiArgs.at("-bip9params");
         for (auto i : deployments) {
             std::vector<std::string> vDeploymentParams;
             boost::split(vDeploymentParams, i, boost::is_any_of(":"));
@@ -1208,9 +1205,9 @@ bool AppInitMain(boost::thread_group& threadGroup, CScheduler& scheduler)
     RegisterNodeSignals(GetNodeSignals());
 
     // sanitize comments per BIP-0014, format user agent and check total size
-    std::vector<string> uacomments;
+    std::vector<std::string> uacomments;
     if (mapMultiArgs.count("-uacomment")) {
-        BOOST_FOREACH(string cmt, mapMultiArgs.at("-uacomment"))
+        BOOST_FOREACH(std::string cmt, mapMultiArgs.at("-uacomment"))
         {
             if (cmt != SanitizeString(cmt, SAFE_CHARS_UA_COMMENT))
                 return InitError(strprintf(_("User Agent comment (%s) contains unsafe characters."), cmt));
diff --git a/src/merkleblock.cpp b/src/merkleblock.cpp
index 86c8172a31df9..e3f3e4621ad8c 100644
--- a/src/merkleblock.cpp
+++ b/src/merkleblock.cpp
@@ -9,14 +9,12 @@
 #include "consensus/consensus.h"
 #include "utilstrencodings.h"
 
-using namespace std;
-
 CMerkleBlock::CMerkleBlock(const CBlock& block, CBloomFilter& filter)
 {
     header = block.GetBlockHeader();
 
-    vector<bool> vMatch;
-    vector<uint256> vHashes;
+    std::vector<bool> vMatch;
+    std::vector<uint256> vHashes;
 
     vMatch.reserve(block.vtx.size());
     vHashes.reserve(block.vtx.size());
@@ -27,7 +25,7 @@ CMerkleBlock::CMerkleBlock(const CBlock& block, CBloomFilter& filter)
         if (filter.IsRelevantAndUpdate(*block.vtx[i]))
         {
             vMatch.push_back(true);
-            vMatchedTxn.push_back(make_pair(i, hash));
+            vMatchedTxn.push_back(std::make_pair(i, hash));
         }
         else
             vMatch.push_back(false);
@@ -41,8 +39,8 @@ CMerkleBlock::CMerkleBlock(const CBlock& block, const std::set<uint256>& txids)
 {
     header = block.GetBlockHeader();
 
-    vector<bool> vMatch;
-    vector<uint256> vHashes;
+    std::vector<bool> vMatch;
+    std::vector<uint256> vHashes;
 
     vMatch.reserve(block.vtx.size());
     vHashes.reserve(block.vtx.size());
diff --git a/src/miner.cpp b/src/miner.cpp
index acded94168913..d01edd93b52e6 100644
--- a/src/miner.cpp
+++ b/src/miner.cpp
@@ -31,8 +31,6 @@
 #include <queue>
 #include <utility>
 
-using namespace std;
-
 //////////////////////////////////////////////////////////////////////////////
 //
 // BitcoinMiner
@@ -500,7 +498,7 @@ void BlockAssembler::addPackageTxs()
         }
 
         // Package can be added. Sort the entries in a valid order.
-        vector<CTxMemPool::txiter> sortedEntries;
+        std::vector<CTxMemPool::txiter> sortedEntries;
         SortForBlock(ancestors, iter, sortedEntries);
 
         for (size_t i=0; i<sortedEntries.size(); ++i) {
@@ -529,7 +527,7 @@ void BlockAssembler::addPriorityTxs()
     fNeedSizeAccounting = true;
 
     // This vector will be sorted into a priority queue:
-    vector<TxCoinAgePriority> vecPriority;
+    std::vector<TxCoinAgePriority> vecPriority;
     TxCoinAgePriorityCompare pricomparer;
     std::map<CTxMemPool::txiter, double, CTxMemPool::CompareIteratorByHash> waitPriMap;
     typedef std::map<CTxMemPool::txiter, double, CTxMemPool::CompareIteratorByHash>::iterator waitPriIter;
diff --git a/src/net_processing.cpp b/src/net_processing.cpp
index 678541a44fbfa..b9667eb6c64b7 100644
--- a/src/net_processing.cpp
+++ b/src/net_processing.cpp
@@ -32,8 +32,6 @@
 
 #include <boost/thread.hpp>
 
-using namespace std;
-
 #if defined(NDEBUG)
 # error "Bitcoin cannot be compiled without assertions."
 #endif
@@ -55,8 +53,8 @@ struct COrphanTx {
     NodeId fromPeer;
     int64_t nTimeExpire;
 };
-map<uint256, COrphanTx> mapOrphanTransactions GUARDED_BY(cs_main);
-map<COutPoint, set<map<uint256, COrphanTx>::iterator, IteratorComparator>> mapOrphanTransactionsByPrev GUARDED_BY(cs_main);
+std::map<uint256, COrphanTx> mapOrphanTransactions GUARDED_BY(cs_main);
+std::map<COutPoint, std::set<std::map<uint256, COrphanTx>::iterator, IteratorComparator>> mapOrphanTransactionsByPrev GUARDED_BY(cs_main);
 void EraseOrphansFor(NodeId peer) EXCLUSIVE_LOCKS_REQUIRED(cs_main);
 
 static size_t vExtraTxnForCompactIt = 0;
@@ -76,7 +74,7 @@ namespace {
      * Set mapBlockSource[hash].second to false if the node should not be
      * punished if the block is invalid.
      */
-    map<uint256, std::pair<NodeId, bool>> mapBlockSource;
+    std::map<uint256, std::pair<NodeId, bool>> mapBlockSource;
 
     /**
      * Filter for transactions that were recently rejected by
@@ -108,10 +106,10 @@ namespace {
         bool fValidatedHeaders;                                  //!< Whether this block has validated headers at the time of request.
         std::unique_ptr<PartiallyDownloadedBlock> partialBlock;  //!< Optional, used for CMPCTBLOCK downloads
     };
-    map<uint256, pair<NodeId, list<QueuedBlock>::iterator> > mapBlocksInFlight;
+    std::map<uint256, std::pair<NodeId, std::list<QueuedBlock>::iterator> > mapBlocksInFlight;
 
     /** Stack of nodes which we have set to announce using compact blocks */
-    list<NodeId> lNodesAnnouncingHeaderAndIDs;
+    std::list<NodeId> lNodesAnnouncingHeaderAndIDs;
 
     /** Number of preferable block download peers. */
     int nPreferredDownload = 0;
@@ -135,7 +133,7 @@ namespace {
 
 struct CBlockReject {
     unsigned char chRejectCode;
-    string strRejectReason;
+    std::string strRejectReason;
     uint256 hashBlock;
 };
 
@@ -172,7 +170,7 @@ struct CNodeState {
     bool fSyncStarted;
     //! Since when we're stalling block download progress (in microseconds), or 0.
     int64_t nStallingSince;
-    list<QueuedBlock> vBlocksInFlight;
+    std::list<QueuedBlock> vBlocksInFlight;
     //! When the first entry in vBlocksInFlight started downloading. Don't care when vBlocksInFlight is empty.
     int64_t nDownloadingSince;
     int nBlocksInFlight;
@@ -224,11 +222,11 @@ struct CNodeState {
 };
 
 /** Map maintaining per-node state. Requires cs_main. */
-map<NodeId, CNodeState> mapNodeState;
+std::map<NodeId, CNodeState> mapNodeState;
 
 // Requires cs_main.
 CNodeState *State(NodeId pnode) {
-    map<NodeId, CNodeState>::iterator it = mapNodeState.find(pnode);
+    std::map<NodeId, CNodeState>::iterator it = mapNodeState.find(pnode);
     if (it == mapNodeState.end())
         return NULL;
     return &it->second;
@@ -310,7 +308,7 @@ void FinalizeNode(NodeId nodeid, bool& fUpdateConnectionTime) {
 // Returns a bool indicating whether we requested this block.
 // Also used if a block was /not/ received and timed out or started with another peer
 bool MarkBlockAsReceived(const uint256& hash) {
-    map<uint256, pair<NodeId, list<QueuedBlock>::iterator> >::iterator itInFlight = mapBlocksInFlight.find(hash);
+    std::map<uint256, std::pair<NodeId, std::list<QueuedBlock>::iterator> >::iterator itInFlight = mapBlocksInFlight.find(hash);
     if (itInFlight != mapBlocksInFlight.end()) {
         CNodeState *state = State(itInFlight->second.first);
         state->nBlocksInFlightValidHeaders -= itInFlight->second.second->fValidatedHeaders;
@@ -334,12 +332,12 @@ bool MarkBlockAsReceived(const uint256& hash) {
 // Requires cs_main.
 // returns false, still setting pit, if the block was already in flight from the same peer
 // pit will only be valid as long as the same cs_main lock is being held
-bool MarkBlockAsInFlight(NodeId nodeid, const uint256& hash, const Consensus::Params& consensusParams, const CBlockIndex *pindex = NULL, list<QueuedBlock>::iterator **pit = NULL) {
+bool MarkBlockAsInFlight(NodeId nodeid, const uint256& hash, const Consensus::Params& consensusParams, const CBlockIndex* pindex = NULL, std::list<QueuedBlock>::iterator** pit = NULL) {
     CNodeState *state = State(nodeid);
     assert(state != NULL);
 
     // Short-circuit most stuff in case its from the same node
-    map<uint256, pair<NodeId, list<QueuedBlock>::iterator> >::iterator itInFlight = mapBlocksInFlight.find(hash);
+    std::map<uint256, std::pair<NodeId, std::list<QueuedBlock>::iterator> >::iterator itInFlight = mapBlocksInFlight.find(hash);
     if (itInFlight != mapBlocksInFlight.end() && itInFlight->second.first == nodeid) {
         *pit = &itInFlight->second.second;
         return false;
@@ -348,7 +346,7 @@ bool MarkBlockAsInFlight(NodeId nodeid, const uint256& hash, const Consensus::Pa
     // Make sure it's not listed somewhere already.
     MarkBlockAsReceived(hash);
 
-    list<QueuedBlock>::iterator it = state->vBlocksInFlight.insert(state->vBlocksInFlight.end(),
+    std::list<QueuedBlock>::iterator it = state->vBlocksInFlight.insert(state->vBlocksInFlight.end(),
             {hash, pindex, pindex != NULL, std::unique_ptr<PartiallyDownloadedBlock>(pit ? new PartiallyDownloadedBlock(&mempool) : NULL)});
     state->nBlocksInFlight++;
     state->nBlocksInFlightValidHeaders += it->fValidatedHeaders;
@@ -640,7 +638,7 @@ bool AddOrphanTx(const CTransactionRef& tx, NodeId peer) EXCLUSIVE_LOCKS_REQUIRE
 
 int static EraseOrphanTx(uint256 hash) EXCLUSIVE_LOCKS_REQUIRED(cs_main)
 {
-    map<uint256, COrphanTx>::iterator it = mapOrphanTransactions.find(hash);
+    std::map<uint256, COrphanTx>::iterator it = mapOrphanTransactions.find(hash);
     if (it == mapOrphanTransactions.end())
         return 0;
     BOOST_FOREACH(const CTxIn& txin, it->second.tx->vin)
@@ -659,10 +657,10 @@ int static EraseOrphanTx(uint256 hash) EXCLUSIVE_LOCKS_REQUIRED(cs_main)
 void EraseOrphansFor(NodeId peer)
 {
     int nErased = 0;
-    map<uint256, COrphanTx>::iterator iter = mapOrphanTransactions.begin();
+    std::map<uint256, COrphanTx>::iterator iter = mapOrphanTransactions.begin();
     while (iter != mapOrphanTransactions.end())
     {
-        map<uint256, COrphanTx>::iterator maybeErase = iter++; // increment to avoid iterator becoming invalid
+        std::map<uint256, COrphanTx>::iterator maybeErase = iter++; // increment to avoid iterator becoming invalid
         if (maybeErase->second.fromPeer == peer)
         {
             nErased += EraseOrphanTx(maybeErase->second.tx->GetHash());
@@ -681,10 +679,10 @@ unsigned int LimitOrphanTxSize(unsigned int nMaxOrphans) EXCLUSIVE_LOCKS_REQUIRE
         // Sweep out expired orphan pool entries:
         int nErased = 0;
         int64_t nMinExpTime = nNow + ORPHAN_TX_EXPIRE_TIME - ORPHAN_TX_EXPIRE_INTERVAL;
-        map<uint256, COrphanTx>::iterator iter = mapOrphanTransactions.begin();
+        std::map<uint256, COrphanTx>::iterator iter = mapOrphanTransactions.begin();
         while (iter != mapOrphanTransactions.end())
         {
-            map<uint256, COrphanTx>::iterator maybeErase = iter++;
+            std::map<uint256, COrphanTx>::iterator maybeErase = iter++;
             if (maybeErase->second.nTimeExpire <= nNow) {
                 nErased += EraseOrphanTx(maybeErase->second.tx->GetHash());
             } else {
@@ -699,7 +697,7 @@ unsigned int LimitOrphanTxSize(unsigned int nMaxOrphans) EXCLUSIVE_LOCKS_REQUIRE
     {
         // Evict a random orphan:
         uint256 randomhash = GetRandHash();
-        map<uint256, COrphanTx>::iterator it = mapOrphanTransactions.lower_bound(randomhash);
+        std::map<uint256, COrphanTx>::iterator it = mapOrphanTransactions.lower_bound(randomhash);
         if (it == mapOrphanTransactions.end())
             it = mapOrphanTransactions.begin();
         EraseOrphanTx(it->first);
@@ -961,7 +959,7 @@ static void RelayAddress(const CAddress& addr, bool fReachable, CConnman& connma
 void static ProcessGetData(CNode* pfrom, const Consensus::Params& consensusParams, CConnman& connman, std::atomic<bool>& interruptMsgProc)
 {
     std::deque<CInv>::iterator it = pfrom->vRecvGetData.begin();
-    vector<CInv> vNotFound;
+    std::vector<CInv> vNotFound;
     CNetMsgMaker msgMaker(pfrom->GetSendVersion());
     LOCK(cs_main);
 
@@ -1083,7 +1081,7 @@ void static ProcessGetData(CNode* pfrom, const Consensus::Params& consensusParam
                         // Bypass PushInventory, this must send even if redundant,
                         // and we want it right after the last block so they don't
                         // wait for other stuff first.
-                        vector<CInv> vInv;
+                        std::vector<CInv> vInv;
                         vInv.push_back(CInv(MSG_BLOCK, chainActive.Tip()->GetBlockHash()));
                         connman.PushMessage(pfrom, msgMaker.Make(NetMsgType::INV, vInv));
                         pfrom->hashContinue.SetNull();
@@ -1160,7 +1158,7 @@ inline void static SendBlockTransactions(const CBlock& block, const BlockTransac
     connman.PushMessage(pfrom, msgMaker.Make(nSendFlags, NetMsgType::BLOCKTXN, resp));
 }
 
-bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv, int64_t nTimeReceived, const CChainParams& chainparams, CConnman& connman, std::atomic<bool>& interruptMsgProc)
+bool static ProcessMessage(CNode* pfrom, std::string strCommand, CDataStream& vRecv, int64_t nTimeReceived, const CChainParams& chainparams, CConnman& connman, std::atomic<bool>& interruptMsgProc)
 {
     LogPrint("net", "received: %s (%u bytes) peer=%d\n", SanitizeString(strCommand), vRecv.size(), pfrom->id);
     if (IsArgSet("-dropmessagestest") && GetRand(GetArg("-dropmessagestest", 0)) == 0)
@@ -1190,7 +1188,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
         // Each connection can only send one version message
         if (pfrom->nVersion != 0)
         {
-            connman.PushMessage(pfrom, CNetMsgMaker(INIT_PROTO_VERSION).Make(NetMsgType::REJECT, strCommand, REJECT_DUPLICATE, string("Duplicate version message")));
+            connman.PushMessage(pfrom, CNetMsgMaker(INIT_PROTO_VERSION).Make(NetMsgType::REJECT, strCommand, REJECT_DUPLICATE, std::string("Duplicate version message")));
             LOCK(cs_main);
             Misbehaving(pfrom->GetId(), 1);
             return false;
@@ -1311,7 +1309,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
 
         pfrom->fSuccessfullyConnected = true;
 
-        string remoteAddr;
+        std::string remoteAddr;
         if (fLogIPs)
             remoteAddr = ", peeraddr=" + pfrom->addr.ToString();
 
@@ -1352,7 +1350,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
 
     if (strCommand == NetMsgType::VERACK)
     {
-        pfrom->SetRecvVersion(min(pfrom->nVersion, PROTOCOL_VERSION));
+        pfrom->SetRecvVersion(std::min(pfrom->nVersion, PROTOCOL_VERSION));
 
         if (!pfrom->fInbound) {
             // Mark this node as currently connected, so we update its timestamp later.
@@ -1385,7 +1383,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
 
     else if (strCommand == NetMsgType::ADDR)
     {
-        vector<CAddress> vAddr;
+        std::vector<CAddress> vAddr;
         vRecv >> vAddr;
 
         // Don't want addr from older versions unless seeding
@@ -1399,7 +1397,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
         }
 
         // Store the new addresses
-        vector<CAddress> vAddrOk;
+        std::vector<CAddress> vAddrOk;
         int64_t nNow = GetAdjustedTime();
         int64_t nSince = nNow - 10 * 60;
         BOOST_FOREACH(CAddress& addr, vAddr)
@@ -1462,7 +1460,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
 
     else if (strCommand == NetMsgType::INV)
     {
-        vector<CInv> vInv;
+        std::vector<CInv> vInv;
         vRecv >> vInv;
         if (vInv.size() > MAX_INV_SZ)
         {
@@ -1529,7 +1527,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
 
     else if (strCommand == NetMsgType::GETDATA)
     {
-        vector<CInv> vInv;
+        std::vector<CInv> vInv;
         vRecv >> vInv;
         if (vInv.size() > MAX_INV_SZ)
         {
@@ -1691,7 +1689,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
         }
 
         // we must use CBlocks, as CBlockHeaders won't include the 0x00 nTx count at the end
-        vector<CBlock> vHeaders;
+        std::vector<CBlock> vHeaders;
         int nLimit = MAX_HEADERS_RESULTS;
         LogPrint("net", "getheaders %d to %s from peer=%d\n", (pindex ? pindex->nHeight : -1), hashStop.IsNull() ? "end" : hashStop.ToString(), pfrom->id);
         for (; pindex; pindex = chainActive.Next(pindex))
@@ -1727,8 +1725,8 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
             return true;
         }
 
-        deque<COutPoint> vWorkQueue;
-        vector<uint256> vEraseQueue;
+        std::deque<COutPoint> vWorkQueue;
+        std::vector<uint256> vEraseQueue;
         CTransactionRef ptx;
         vRecv >> ptx;
         const CTransaction& tx = *ptx;
@@ -1761,7 +1759,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
                 mempool.size(), mempool.DynamicMemoryUsage() / 1000);
 
             // Recursively process any orphan transactions that depended on this one
-            set<NodeId> setMisbehaving;
+            std::set<NodeId> setMisbehaving;
             while (!vWorkQueue.empty()) {
                 auto itByPrev = mapOrphanTransactionsByPrev.find(vWorkQueue.front());
                 vWorkQueue.pop_front();
@@ -1955,7 +1953,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
         assert(pindex);
         UpdateBlockAvailability(pfrom->GetId(), pindex->GetBlockHash());
 
-        std::map<uint256, pair<NodeId, list<QueuedBlock>::iterator> >::iterator blockInFlightIt = mapBlocksInFlight.find(pindex->GetBlockHash());
+        std::map<uint256, std::pair<NodeId, std::list<QueuedBlock>::iterator> >::iterator blockInFlightIt = mapBlocksInFlight.find(pindex->GetBlockHash());
         bool fAlreadyInFlight = blockInFlightIt != mapBlocksInFlight.end();
 
         if (pindex->nStatus & BLOCK_HAVE_DATA) // Nothing to do here
@@ -1990,7 +1988,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
         if (pindex->nHeight <= chainActive.Height() + 2) {
             if ((!fAlreadyInFlight && nodestate->nBlocksInFlight < MAX_BLOCKS_IN_TRANSIT_PER_PEER) ||
                  (fAlreadyInFlight && blockInFlightIt->second.first == pfrom->GetId())) {
-                list<QueuedBlock>::iterator *queuedBlockIt = NULL;
+                std::list<QueuedBlock>::iterator* queuedBlockIt = NULL;
                 if (!MarkBlockAsInFlight(pfrom->GetId(), pindex->GetBlockHash(), chainparams.GetConsensus(), pindex, &queuedBlockIt)) {
                     if (!(*queuedBlockIt)->partialBlock)
                         (*queuedBlockIt)->partialBlock.reset(new PartiallyDownloadedBlock(&mempool));
@@ -2108,7 +2106,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
         {
             LOCK(cs_main);
 
-            map<uint256, pair<NodeId, list<QueuedBlock>::iterator> >::iterator it = mapBlocksInFlight.find(resp.blockhash);
+            std::map<uint256, std::pair<NodeId, std::list<QueuedBlock>::iterator> >::iterator it = mapBlocksInFlight.find(resp.blockhash);
             if (it == mapBlocksInFlight.end() || !it->second.second->partialBlock ||
                     it->second.first != pfrom->GetId()) {
                 LogPrint("net", "Peer %d sent us block transactions for block we weren't expecting\n", pfrom->id);
@@ -2265,7 +2263,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
         // If this set of headers is valid and ends in a block with at least as
         // much work as our tip, download as much as possible.
         if (fCanDirectFetch && pindexLast->IsValid(BLOCK_VALID_TREE) && chainActive.Tip()->nChainWork <= pindexLast->nChainWork) {
-            vector<const CBlockIndex *> vToFetch;
+            std::vector<const CBlockIndex*> vToFetch;
             const CBlockIndex *pindexWalk = pindexLast;
             // Calculate all the blocks we'd need to switch to pindexLast, up to a limit.
             while (pindexWalk && !chainActive.Contains(pindexWalk) && vToFetch.size() <= MAX_BLOCKS_IN_TRANSIT_PER_PEER) {
@@ -2286,7 +2284,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
                         pindexLast->GetBlockHash().ToString(),
                         pindexLast->nHeight);
             } else {
-                vector<CInv> vGetData;
+                std::vector<CInv> vGetData;
                 // Download as much as possible, from earliest to latest.
                 BOOST_REVERSE_FOREACH(const CBlockIndex *pindex, vToFetch) {
                     if (nodestate->nBlocksInFlight >= MAX_BLOCKS_IN_TRANSIT_PER_PEER) {
@@ -2365,7 +2363,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
         pfrom->fSentAddr = true;
 
         pfrom->vAddrToSend.clear();
-        vector<CAddress> vAddr = connman.GetAddresses();
+        std::vector<CAddress> vAddr = connman.GetAddresses();
         FastRandomContext insecure_rand;
         BOOST_FOREACH(const CAddress &addr, vAddr)
             pfrom->PushAddress(addr, insecure_rand);
@@ -2496,7 +2494,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
 
     else if (strCommand == NetMsgType::FILTERADD)
     {
-        vector<unsigned char> vData;
+        std::vector<unsigned char> vData;
         vRecv >> vData;
 
         // Nodes must NEVER send a data item > 520 bytes (the max size for a script data object,
@@ -2534,10 +2532,10 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
     {
         if (fDebug) {
             try {
-                string strMsg; unsigned char ccode; string strReason;
+                std::string strMsg; unsigned char ccode; std::string strReason;
                 vRecv >> LIMITED_STRING(strMsg, CMessageHeader::COMMAND_SIZE) >> ccode >> LIMITED_STRING(strReason, MAX_REJECT_MESSAGE_LENGTH);
 
-                ostringstream ss;
+                std::ostringstream ss;
                 ss << strMsg << " code " << itostr(ccode) << ": " << strReason;
 
                 if (strMsg == NetMsgType::BLOCK || strMsg == NetMsgType::TX)
@@ -2635,7 +2633,7 @@ bool ProcessMessages(CNode* pfrom, CConnman& connman, std::atomic<bool>& interru
             LogPrintf("PROCESSMESSAGE: ERRORS IN HEADER %s peer=%d\n", SanitizeString(hdr.GetCommand()), pfrom->id);
             return fMoreWork;
         }
-        string strCommand = hdr.GetCommand();
+        std::string strCommand = hdr.GetCommand();
 
         // Message size
         unsigned int nMessageSize = hdr.nMessageSize;
@@ -2664,7 +2662,7 @@ bool ProcessMessages(CNode* pfrom, CConnman& connman, std::atomic<bool>& interru
         }
         catch (const std::ios_base::failure& e)
         {
-            connman.PushMessage(pfrom, CNetMsgMaker(INIT_PROTO_VERSION).Make(NetMsgType::REJECT, strCommand, REJECT_MALFORMED, string("error parsing message")));
+            connman.PushMessage(pfrom, CNetMsgMaker(INIT_PROTO_VERSION).Make(NetMsgType::REJECT, strCommand, REJECT_MALFORMED, std::string("error parsing message")));
             if (strstr(e.what(), "end of data"))
             {
                 // Allow exceptions from under-length message on vRecv
@@ -2761,7 +2759,7 @@ bool SendMessages(CNode* pto, CConnman& connman, std::atomic<bool>& interruptMsg
         CNodeState &state = *State(pto->GetId());
 
         BOOST_FOREACH(const CBlockReject& reject, state.rejects)
-            connman.PushMessage(pto, msgMaker.Make(NetMsgType::REJECT, (string)NetMsgType::BLOCK, reject.chRejectCode, reject.strRejectReason, reject.hashBlock));
+            connman.PushMessage(pto, msgMaker.Make(NetMsgType::REJECT, (std::string)NetMsgType::BLOCK, reject.chRejectCode, reject.strRejectReason, reject.hashBlock));
         state.rejects.clear();
 
         if (state.fShouldBan) {
@@ -2794,7 +2792,7 @@ bool SendMessages(CNode* pto, CConnman& connman, std::atomic<bool>& interruptMsg
         //
         if (pto->nNextAddrSend < nNow) {
             pto->nNextAddrSend = PoissonNextSend(nNow, AVG_ADDRESS_BROADCAST_INTERVAL);
-            vector<CAddress> vAddr;
+            std::vector<CAddress> vAddr;
             vAddr.reserve(pto->vAddrToSend.size());
             BOOST_FOREACH(const CAddress& addr, pto->vAddrToSend)
             {
@@ -2862,7 +2860,7 @@ bool SendMessages(CNode* pto, CConnman& connman, std::atomic<bool>& interruptMsg
             // blocks, or if the peer doesn't want headers, just
             // add all to the inv queue.
             LOCK(pto->cs_inventory);
-            vector<CBlock> vHeaders;
+            std::vector<CBlock> vHeaders;
             bool fRevertToInv = ((!state.fPreferHeaders &&
                                  (!state.fPreferHeaderAndIDs || pto->vBlockHashesToAnnounce.size() > 1)) ||
                                 pto->vBlockHashesToAnnounce.size() > MAX_BLOCKS_TO_ANNOUNCE);
@@ -2994,7 +2992,7 @@ bool SendMessages(CNode* pto, CConnman& connman, std::atomic<bool>& interruptMsg
         //
         // Message: inventory
         //
-        vector<CInv> vInv;
+        std::vector<CInv> vInv;
         {
             LOCK(pto->cs_inventory);
             vInv.reserve(std::max<size_t>(pto->vInventoryBlockToSend.size(), INVENTORY_BROADCAST_MAX));
@@ -3059,7 +3057,7 @@ bool SendMessages(CNode* pto, CConnman& connman, std::atomic<bool>& interruptMsg
             // Determine transactions to relay
             if (fSendTrickle) {
                 // Produce a vector with all candidates for sending
-                vector<std::set<uint256>::iterator> vInvTx;
+                std::vector<std::set<uint256>::iterator> vInvTx;
                 vInvTx.reserve(pto->setInventoryTxToSend.size());
                 for (std::set<uint256>::iterator it = pto->setInventoryTxToSend.begin(); it != pto->setInventoryTxToSend.end(); it++) {
                     vInvTx.push_back(it);
@@ -3153,9 +3151,9 @@ bool SendMessages(CNode* pto, CConnman& connman, std::atomic<bool>& interruptMsg
         //
         // Message: getdata (blocks)
         //
-        vector<CInv> vGetData;
+        std::vector<CInv> vGetData;
         if (!pto->fClient && (fFetch || !IsInitialBlockDownload()) && state.nBlocksInFlight < MAX_BLOCKS_IN_TRANSIT_PER_PEER) {
-            vector<const CBlockIndex*> vToDownload;
+            std::vector<const CBlockIndex*> vToDownload;
             NodeId staller = -1;
             FindNextBlocksToDownload(pto->GetId(), MAX_BLOCKS_IN_TRANSIT_PER_PEER - state.nBlocksInFlight, vToDownload, staller, consensusParams);
             BOOST_FOREACH(const CBlockIndex *pindex, vToDownload) {
diff --git a/src/rest.cpp b/src/rest.cpp
index a8f8e753c68e1..54eefcafe364f 100644
--- a/src/rest.cpp
+++ b/src/rest.cpp
@@ -20,8 +20,6 @@
 
 #include <univalue.h>
 
-using namespace std;
-
 static const size_t MAX_GETUTXOS_OUTPOINTS = 15; //allow a max of 15 outpoints to be queried at once
 
 enum RetFormat {
@@ -64,7 +62,7 @@ extern UniValue mempoolToJSON(bool fVerbose = false);
 extern void ScriptPubKeyToJSON(const CScript& scriptPubKey, UniValue& out, bool fIncludeHex);
 extern UniValue blockheaderToJSON(const CBlockIndex* blockindex);
 
-static bool RESTERR(HTTPRequest* req, enum HTTPStatusCode status, string message)
+static bool RESTERR(HTTPRequest* req, enum HTTPStatusCode status, std::string message)
 {
     req->WriteHeader("Content-Type", "text/plain");
     req->WriteReply(status, message + "\r\n");
@@ -92,9 +90,9 @@ static enum RetFormat ParseDataFormat(std::string& param, const std::string& str
     return rf_names[0].rf;
 }
 
-static string AvailableDataFormatsString()
+static std::string AvailableDataFormatsString()
 {
-    string formats = "";
+    std::string formats = "";
     for (unsigned int i = 0; i < ARRAYLEN(rf_names); i++)
         if (strlen(rf_names[i].name) > 0) {
             formats.append(".");
@@ -108,7 +106,7 @@ static string AvailableDataFormatsString()
     return formats;
 }
 
-static bool ParseHashStr(const string& strReq, uint256& v)
+static bool ParseHashStr(const std::string& strReq, uint256& v)
 {
     if (!IsHex(strReq) || (strReq.size() != 64))
         return false;
@@ -132,7 +130,7 @@ static bool rest_headers(HTTPRequest* req,
         return false;
     std::string param;
     const RetFormat rf = ParseDataFormat(param, strURIPart);
-    vector<string> path;
+    std::vector<std::string> path;
     boost::split(path, param, boost::is_any_of("/"));
 
     if (path.size() != 2)
@@ -142,7 +140,7 @@ static bool rest_headers(HTTPRequest* req,
     if (count < 1 || count > 2000)
         return RESTERR(req, HTTP_BAD_REQUEST, "Header count out of range: " + path[0]);
 
-    string hashStr = path[1];
+    std::string hashStr = path[1];
     uint256 hash;
     if (!ParseHashStr(hashStr, hash))
         return RESTERR(req, HTTP_BAD_REQUEST, "Invalid hash: " + hashStr);
@@ -168,14 +166,14 @@ static bool rest_headers(HTTPRequest* req,
 
     switch (rf) {
     case RF_BINARY: {
-        string binaryHeader = ssHeader.str();
+        std::string binaryHeader = ssHeader.str();
         req->WriteHeader("Content-Type", "application/octet-stream");
         req->WriteReply(HTTP_OK, binaryHeader);
         return true;
     }
 
     case RF_HEX: {
-        string strHex = HexStr(ssHeader.begin(), ssHeader.end()) + "\n";
+        std::string strHex = HexStr(ssHeader.begin(), ssHeader.end()) + "\n";
         req->WriteHeader("Content-Type", "text/plain");
         req->WriteReply(HTTP_OK, strHex);
         return true;
@@ -185,7 +183,7 @@ static bool rest_headers(HTTPRequest* req,
         BOOST_FOREACH(const CBlockIndex *pindex, headers) {
             jsonHeaders.push_back(blockheaderToJSON(pindex));
         }
-        string strJSON = jsonHeaders.write() + "\n";
+        std::string strJSON = jsonHeaders.write() + "\n";
         req->WriteHeader("Content-Type", "application/json");
         req->WriteReply(HTTP_OK, strJSON);
         return true;
@@ -232,14 +230,14 @@ static bool rest_block(HTTPRequest* req,
 
     switch (rf) {
     case RF_BINARY: {
-        string binaryBlock = ssBlock.str();
+        std::string binaryBlock = ssBlock.str();
         req->WriteHeader("Content-Type", "application/octet-stream");
         req->WriteReply(HTTP_OK, binaryBlock);
         return true;
     }
 
     case RF_HEX: {
-        string strHex = HexStr(ssBlock.begin(), ssBlock.end()) + "\n";
+        std::string strHex = HexStr(ssBlock.begin(), ssBlock.end()) + "\n";
         req->WriteHeader("Content-Type", "text/plain");
         req->WriteReply(HTTP_OK, strHex);
         return true;
@@ -247,7 +245,7 @@ static bool rest_block(HTTPRequest* req,
 
     case RF_JSON: {
         UniValue objBlock = blockToJSON(block, pblockindex, showTxDetails);
-        string strJSON = objBlock.write() + "\n";
+        std::string strJSON = objBlock.write() + "\n";
         req->WriteHeader("Content-Type", "application/json");
         req->WriteReply(HTTP_OK, strJSON);
         return true;
@@ -287,7 +285,7 @@ static bool rest_chaininfo(HTTPRequest* req, const std::string& strURIPart)
         JSONRPCRequest jsonRequest;
         jsonRequest.params = UniValue(UniValue::VARR);
         UniValue chainInfoObject = getblockchaininfo(jsonRequest);
-        string strJSON = chainInfoObject.write() + "\n";
+        std::string strJSON = chainInfoObject.write() + "\n";
         req->WriteHeader("Content-Type", "application/json");
         req->WriteReply(HTTP_OK, strJSON);
         return true;
@@ -312,7 +310,7 @@ static bool rest_mempool_info(HTTPRequest* req, const std::string& strURIPart)
     case RF_JSON: {
         UniValue mempoolInfoObject = mempoolInfoToJSON();
 
-        string strJSON = mempoolInfoObject.write() + "\n";
+        std::string strJSON = mempoolInfoObject.write() + "\n";
         req->WriteHeader("Content-Type", "application/json");
         req->WriteReply(HTTP_OK, strJSON);
         return true;
@@ -337,7 +335,7 @@ static bool rest_mempool_contents(HTTPRequest* req, const std::string& strURIPar
     case RF_JSON: {
         UniValue mempoolObject = mempoolToJSON(true);
 
-        string strJSON = mempoolObject.write() + "\n";
+        std::string strJSON = mempoolObject.write() + "\n";
         req->WriteHeader("Content-Type", "application/json");
         req->WriteReply(HTTP_OK, strJSON);
         return true;
@@ -372,14 +370,14 @@ static bool rest_tx(HTTPRequest* req, const std::string& strURIPart)
 
     switch (rf) {
     case RF_BINARY: {
-        string binaryTx = ssTx.str();
+        std::string binaryTx = ssTx.str();
         req->WriteHeader("Content-Type", "application/octet-stream");
         req->WriteReply(HTTP_OK, binaryTx);
         return true;
     }
 
     case RF_HEX: {
-        string strHex = HexStr(ssTx.begin(), ssTx.end()) + "\n";
+        std::string strHex = HexStr(ssTx.begin(), ssTx.end()) + "\n";
         req->WriteHeader("Content-Type", "text/plain");
         req->WriteReply(HTTP_OK, strHex);
         return true;
@@ -388,7 +386,7 @@ static bool rest_tx(HTTPRequest* req, const std::string& strURIPart)
     case RF_JSON: {
         UniValue objTx(UniValue::VOBJ);
         TxToJSON(*tx, hashBlock, objTx);
-        string strJSON = objTx.write() + "\n";
+        std::string strJSON = objTx.write() + "\n";
         req->WriteHeader("Content-Type", "application/json");
         req->WriteReply(HTTP_OK, strJSON);
         return true;
@@ -410,7 +408,7 @@ static bool rest_getutxos(HTTPRequest* req, const std::string& strURIPart)
     std::string param;
     const RetFormat rf = ParseDataFormat(param, strURIPart);
 
-    vector<string> uriParts;
+    std::vector<std::string> uriParts;
     if (param.length() > 1)
     {
         std::string strUriParams = param.substr(1);
@@ -424,7 +422,7 @@ static bool rest_getutxos(HTTPRequest* req, const std::string& strURIPart)
 
     bool fInputParsed = false;
     bool fCheckMemPool = false;
-    vector<COutPoint> vOutPoints;
+    std::vector<COutPoint> vOutPoints;
 
     // parse/deserialize input
     // input-format = output-format, rest/getutxos/bin requires binary input, gives binary output, ...
@@ -498,8 +496,8 @@ static bool rest_getutxos(HTTPRequest* req, const std::string& strURIPart)
         return RESTERR(req, HTTP_BAD_REQUEST, strprintf("Error: max outpoints exceeded (max: %d, tried: %d)", MAX_GETUTXOS_OUTPOINTS, vOutPoints.size()));
 
     // check spentness and form a bitmap (as well as a JSON capable human-readable string representation)
-    vector<unsigned char> bitmap;
-    vector<CCoin> outs;
+    std::vector<unsigned char> bitmap;
+    std::vector<CCoin> outs;
     std::string bitmapStringRepresentation;
     std::vector<bool> hits;
     bitmap.resize((vOutPoints.size() + 7) / 8);
@@ -546,7 +544,7 @@ static bool rest_getutxos(HTTPRequest* req, const std::string& strURIPart)
         // use exact same output as mentioned in Bip64
         CDataStream ssGetUTXOResponse(SER_NETWORK, PROTOCOL_VERSION);
         ssGetUTXOResponse << chainActive.Height() << chainActive.Tip()->GetBlockHash() << bitmap << outs;
-        string ssGetUTXOResponseString = ssGetUTXOResponse.str();
+        std::string ssGetUTXOResponseString = ssGetUTXOResponse.str();
 
         req->WriteHeader("Content-Type", "application/octet-stream");
         req->WriteReply(HTTP_OK, ssGetUTXOResponseString);
@@ -556,7 +554,7 @@ static bool rest_getutxos(HTTPRequest* req, const std::string& strURIPart)
     case RF_HEX: {
         CDataStream ssGetUTXOResponse(SER_NETWORK, PROTOCOL_VERSION);
         ssGetUTXOResponse << chainActive.Height() << chainActive.Tip()->GetBlockHash() << bitmap << outs;
-        string strHex = HexStr(ssGetUTXOResponse.begin(), ssGetUTXOResponse.end()) + "\n";
+        std::string strHex = HexStr(ssGetUTXOResponse.begin(), ssGetUTXOResponse.end()) + "\n";
 
         req->WriteHeader("Content-Type", "text/plain");
         req->WriteReply(HTTP_OK, strHex);
@@ -588,7 +586,7 @@ static bool rest_getutxos(HTTPRequest* req, const std::string& strURIPart)
         objGetUTXOResponse.push_back(Pair("utxos", utxos));
 
         // return json string
-        string strJSON = objGetUTXOResponse.write() + "\n";
+        std::string strJSON = objGetUTXOResponse.write() + "\n";
         req->WriteHeader("Content-Type", "application/json");
         req->WriteReply(HTTP_OK, strJSON);
         return true;
diff --git a/src/timedata.cpp b/src/timedata.cpp
index c72252e6d8a7e..2ff6437c732cc 100644
--- a/src/timedata.cpp
+++ b/src/timedata.cpp
@@ -17,8 +17,6 @@
 
 #include <boost/foreach.hpp>
 
-using namespace std;
-
 static CCriticalSection cs_nTimeOffset;
 static int64_t nTimeOffset = 0;
 
@@ -51,7 +49,7 @@ void AddTimeData(const CNetAddr& ip, int64_t nOffsetSample)
 {
     LOCK(cs_nTimeOffset);
     // Ignore duplicates
-    static set<CNetAddr> setKnown;
+    static std::set<CNetAddr> setKnown;
     if (setKnown.size() == BITCOIN_TIMEDATA_MAX_SAMPLES)
         return;
     if (!setKnown.insert(ip).second)
diff --git a/src/txdb.cpp b/src/txdb.cpp
index c223abd590ece..1a30bb58ad80b 100644
--- a/src/txdb.cpp
+++ b/src/txdb.cpp
@@ -14,8 +14,6 @@
 
 #include <boost/thread.hpp>
 
-using namespace std;
-
 static const char DB_COINS = 'c';
 static const char DB_BLOCK_FILES = 'f';
 static const char DB_TXINDEX = 't';
@@ -32,11 +30,11 @@ CCoinsViewDB::CCoinsViewDB(size_t nCacheSize, bool fMemory, bool fWipe) : db(Get
 }
 
 bool CCoinsViewDB::GetCoins(const uint256 &txid, CCoins &coins) const {
-    return db.Read(make_pair(DB_COINS, txid), coins);
+    return db.Read(std::make_pair(DB_COINS, txid), coins);
 }
 
 bool CCoinsViewDB::HaveCoins(const uint256 &txid) const {
-    return db.Exists(make_pair(DB_COINS, txid));
+    return db.Exists(std::make_pair(DB_COINS, txid));
 }
 
 uint256 CCoinsViewDB::GetBestBlock() const {
@@ -53,9 +51,9 @@ bool CCoinsViewDB::BatchWrite(CCoinsMap &mapCoins, const uint256 &hashBlock) {
     for (CCoinsMap::iterator it = mapCoins.begin(); it != mapCoins.end();) {
         if (it->second.flags & CCoinsCacheEntry::DIRTY) {
             if (it->second.coins.IsPruned())
-                batch.Erase(make_pair(DB_COINS, it->first));
+                batch.Erase(std::make_pair(DB_COINS, it->first));
             else
-                batch.Write(make_pair(DB_COINS, it->first), it->second.coins);
+                batch.Write(std::make_pair(DB_COINS, it->first), it->second.coins);
             changed++;
         }
         count++;
@@ -73,7 +71,7 @@ CBlockTreeDB::CBlockTreeDB(size_t nCacheSize, bool fMemory, bool fWipe) : CDBWra
 }
 
 bool CBlockTreeDB::ReadBlockFileInfo(int nFile, CBlockFileInfo &info) {
-    return Read(make_pair(DB_BLOCK_FILES, nFile), info);
+    return Read(std::make_pair(DB_BLOCK_FILES, nFile), info);
 }
 
 bool CBlockTreeDB::WriteReindexing(bool fReindexing) {
@@ -139,23 +137,23 @@ void CCoinsViewDBCursor::Next()
 bool CBlockTreeDB::WriteBatchSync(const std::vector<std::pair<int, const CBlockFileInfo*> >& fileInfo, int nLastFile, const std::vector<const CBlockIndex*>& blockinfo) {
     CDBBatch batch(*this);
     for (std::vector<std::pair<int, const CBlockFileInfo*> >::const_iterator it=fileInfo.begin(); it != fileInfo.end(); it++) {
-        batch.Write(make_pair(DB_BLOCK_FILES, it->first), *it->second);
+        batch.Write(std::make_pair(DB_BLOCK_FILES, it->first), *it->second);
     }
     batch.Write(DB_LAST_BLOCK, nLastFile);
     for (std::vector<const CBlockIndex*>::const_iterator it=blockinfo.begin(); it != blockinfo.end(); it++) {
-        batch.Write(make_pair(DB_BLOCK_INDEX, (*it)->GetBlockHash()), CDiskBlockIndex(*it));
+        batch.Write(std::make_pair(DB_BLOCK_INDEX, (*it)->GetBlockHash()), CDiskBlockIndex(*it));
     }
     return WriteBatch(batch, true);
 }
 
 bool CBlockTreeDB::ReadTxIndex(const uint256 &txid, CDiskTxPos &pos) {
-    return Read(make_pair(DB_TXINDEX, txid), pos);
+    return Read(std::make_pair(DB_TXINDEX, txid), pos);
 }
 
 bool CBlockTreeDB::WriteTxIndex(const std::vector<std::pair<uint256, CDiskTxPos> >&vect) {
     CDBBatch batch(*this);
     for (std::vector<std::pair<uint256,CDiskTxPos> >::const_iterator it=vect.begin(); it!=vect.end(); it++)
-        batch.Write(make_pair(DB_TXINDEX, it->first), it->second);
+        batch.Write(std::make_pair(DB_TXINDEX, it->first), it->second);
     return WriteBatch(batch);
 }
 
@@ -175,7 +173,7 @@ bool CBlockTreeDB::LoadBlockIndexGuts(boost::function<CBlockIndex*(const uint256
 {
     std::unique_ptr<CDBIterator> pcursor(NewIterator());
 
-    pcursor->Seek(make_pair(DB_BLOCK_INDEX, uint256()));
+    pcursor->Seek(std::make_pair(DB_BLOCK_INDEX, uint256()));
 
     // Load mapBlockIndex
     while (pcursor->Valid()) {
diff --git a/src/txmempool.cpp b/src/txmempool.cpp
index 54400caccc806..a1a37dac755b1 100644
--- a/src/txmempool.cpp
+++ b/src/txmempool.cpp
@@ -18,8 +18,6 @@
 #include "utiltime.h"
 #include "version.h"
 
-using namespace std;
-
 CTxMemPoolEntry::CTxMemPoolEntry(const CTransactionRef& _tx, const CAmount& _nFee,
                                  int64_t _nTime, double _entryPriority, unsigned int _entryHeight,
                                  CAmount _inChainInputValue,
@@ -658,7 +656,7 @@ void CTxMemPool::check(const CCoinsViewCache *pcoins) const
     const int64_t nSpendHeight = GetSpendHeight(mempoolDuplicate);
 
     LOCK(cs);
-    list<const CTxMemPoolEntry*> waitingOnDependants;
+    std::list<const CTxMemPoolEntry*> waitingOnDependants;
     for (indexed_transaction_set::const_iterator it = mapTx.begin(); it != mapTx.end(); it++) {
         unsigned int i = 0;
         checkTotal += it->GetTxSize();
@@ -816,7 +814,7 @@ std::vector<CTxMemPool::indexed_transaction_set::const_iterator> CTxMemPool::Get
     return iters;
 }
 
-void CTxMemPool::queryHashes(vector<uint256>& vtxid)
+void CTxMemPool::queryHashes(std::vector<uint256>& vtxid)
 {
     LOCK(cs);
     auto iters = GetSortedDepthAndScore();
@@ -920,7 +918,7 @@ CTxMemPool::ReadFeeEstimates(CAutoFile& filein)
     return true;
 }
 
-void CTxMemPool::PrioritiseTransaction(const uint256 hash, const string strHash, double dPriorityDelta, const CAmount& nFeeDelta)
+void CTxMemPool::PrioritiseTransaction(const uint256 hash, const std::string strHash, double dPriorityDelta, const CAmount& nFeeDelta)
 {
     {
         LOCK(cs);
diff --git a/src/validation.cpp b/src/validation.cpp
index d499d7a0d17e6..5a14e7475e1c7 100644
--- a/src/validation.cpp
+++ b/src/validation.cpp
@@ -46,8 +46,6 @@
 #include <boost/math/distributions/poisson.hpp>
 #include <boost/thread.hpp>
 
-using namespace std;
-
 #if defined(NDEBUG)
 # error "Bitcoin cannot be compiled without assertions."
 #endif
@@ -90,7 +88,7 @@ static void CheckBlockIndex(const Consensus::Params& consensusParams);
 /** Constant stuff for coinbase transactions we create: */
 CScript COINBASE_FLAGS;
 
-const string strMessageMagic = "Bitcoin Signed Message:\n";
+const std::string strMessageMagic = "Bitcoin Signed Message:\n";
 
 // Internal stuff
 namespace {
@@ -123,11 +121,11 @@ namespace {
      * as good as our current tip or better. Entries may be failed, though, and pruning nodes may be
      * missing the data for the block.
      */
-    set<CBlockIndex*, CBlockIndexWorkComparator> setBlockIndexCandidates;
+    std::set<CBlockIndex*, CBlockIndexWorkComparator> setBlockIndexCandidates;
     /** All pairs A->B, where A (or one of its ancestors) misses transactions, but B has transactions.
      * Pruned nodes may have entries where B is missing data.
      */
-    multimap<CBlockIndex*, CBlockIndex*> mapBlocksUnlinked;
+    std::multimap<CBlockIndex*, CBlockIndex*> mapBlocksUnlinked;
 
     CCriticalSection cs_LastBlockFile;
     std::vector<CBlockFileInfo> vinfoBlockFile;
@@ -151,10 +149,10 @@ namespace {
     arith_uint256 nLastPreciousChainwork = 0;
 
     /** Dirty block index entries. */
-    set<CBlockIndex*> setDirtyBlockIndex;
+    std::set<CBlockIndex*> setDirtyBlockIndex;
 
     /** Dirty block file entries. */
-    set<int> setDirtyFileInfo;
+    std::set<int> setDirtyFileInfo;
 } // anon namespace
 
 /* Use this class to start tracking transactions that are removed from the
@@ -517,7 +515,7 @@ bool CheckTransaction(const CTransaction& tx, CValidationState &state, bool fChe
 
     // Check for duplicate inputs - note that this check is slow so we skip it in CheckBlock
     if (fCheckDuplicateInputs) {
-        set<COutPoint> vInOutPoints;
+        std::set<COutPoint> vInOutPoints;
         for (const auto& txin : tx.vin)
         {
             if (!vInOutPoints.insert(txin.prevout).second)
@@ -596,7 +594,7 @@ bool AcceptToMemoryPoolWorker(CTxMemPool& pool, CValidationState& state, const C
     }
 
     // Rather not work on nonstandard transactions (unless -testnet/-regtest)
-    string reason;
+    std::string reason;
     if (fRequireStandard && !IsStandardTx(tx, reason, witnessEnabled))
         return state.DoS(0, false, REJECT_NONSTANDARD, reason);
 
@@ -611,7 +609,7 @@ bool AcceptToMemoryPoolWorker(CTxMemPool& pool, CValidationState& state, const C
         return state.Invalid(false, REJECT_ALREADY_KNOWN, "txn-already-in-mempool");
 
     // Check for conflicts with in-memory transactions
-    set<uint256> setConflicts;
+    std::set<uint256> setConflicts;
     {
     LOCK(pool.cs); // protect pool.mapNextTx
     BOOST_FOREACH(const CTxIn &txin, tx.vin)
@@ -831,7 +829,7 @@ bool AcceptToMemoryPoolWorker(CTxMemPool& pool, CValidationState& state, const C
         if (fReplacementTransaction)
         {
             CFeeRate newFeeRate(nModifiedFees, nSize);
-            set<uint256> setConflictsParents;
+            std::set<uint256> setConflictsParents;
             const int maxDescendantsToVisit = 100;
             CTxMemPool::setEntries setIterConflicting;
             BOOST_FOREACH(const uint256 &hashConflicting, setConflicts)
@@ -2052,13 +2050,13 @@ bool static FlushStateToDisk(CValidationState &state, FlushStateMode mode, int n
         {
             std::vector<std::pair<int, const CBlockFileInfo*> > vFiles;
             vFiles.reserve(setDirtyFileInfo.size());
-            for (set<int>::iterator it = setDirtyFileInfo.begin(); it != setDirtyFileInfo.end(); ) {
-                vFiles.push_back(make_pair(*it, &vinfoBlockFile[*it]));
+            for (std::set<int>::iterator it = setDirtyFileInfo.begin(); it != setDirtyFileInfo.end(); ) {
+                vFiles.push_back(std::make_pair(*it, &vinfoBlockFile[*it]));
                 setDirtyFileInfo.erase(it++);
             }
             std::vector<const CBlockIndex*> vBlocks;
             vBlocks.reserve(setDirtyBlockIndex.size());
-            for (set<CBlockIndex*>::iterator it = setDirtyBlockIndex.begin(); it != setDirtyBlockIndex.end(); ) {
+            for (std::set<CBlockIndex*>::iterator it = setDirtyBlockIndex.begin(); it != setDirtyBlockIndex.end(); ) {
                 vBlocks.push_back(*it);
                 setDirtyBlockIndex.erase(it++);
             }
@@ -2670,7 +2668,7 @@ CBlockIndex* AddToBlockIndex(const CBlockHeader& block)
     // to avoid miners withholding blocks but broadcasting headers, to get a
     // competitive advantage.
     pindexNew->nSequenceId = 0;
-    BlockMap::iterator mi = mapBlockIndex.insert(make_pair(hash, pindexNew)).first;
+    BlockMap::iterator mi = mapBlockIndex.insert(std::make_pair(hash, pindexNew)).first;
     pindexNew->phashBlock = &((*mi).first);
     BlockMap::iterator miPrev = mapBlockIndex.find(block.hashPrevBlock);
     if (miPrev != mapBlockIndex.end())
@@ -2707,7 +2705,7 @@ bool ReceivedBlockTransactions(const CBlock &block, CValidationState& state, CBl
 
     if (pindexNew->pprev == NULL || pindexNew->pprev->nChainTx) {
         // If pindexNew is the genesis block or all parents are BLOCK_VALID_TRANSACTIONS.
-        deque<CBlockIndex*> queue;
+        std::deque<CBlockIndex*> queue;
         queue.push_back(pindexNew);
 
         // Recursively process any descendant blocks that now may be eligible to be connected.
@@ -3329,7 +3327,7 @@ void PruneOneBlockFile(const int fileNumber)
 
 void UnlinkPrunedFiles(std::set<int>& setFilesToPrune)
 {
-    for (set<int>::iterator it = setFilesToPrune.begin(); it != setFilesToPrune.end(); ++it) {
+    for (std::set<int>::iterator it = setFilesToPrune.begin(); it != setFilesToPrune.end(); ++it) {
         CDiskBlockPos pos(*it, 0);
         boost::filesystem::remove(GetBlockPosFilename(pos, "blk"));
         boost::filesystem::remove(GetBlockPosFilename(pos, "rev"));
@@ -3347,7 +3345,7 @@ void FindFilesToPruneManual(std::set<int>& setFilesToPrune, int nManualPruneHeig
         return;
 
     // last block to prune is the lesser of (user-specified height, MIN_BLOCKS_TO_KEEP from the tip)
-    unsigned int nLastBlockWeCanPrune = min((unsigned)nManualPruneHeight, chainActive.Tip()->nHeight - MIN_BLOCKS_TO_KEEP);
+    unsigned int nLastBlockWeCanPrune = std::min((unsigned)nManualPruneHeight, chainActive.Tip()->nHeight - MIN_BLOCKS_TO_KEEP);
     int count=0;
     for (int fileNumber = 0; fileNumber < nLastBlockFile; fileNumber++) {
         if (vinfoBlockFile[fileNumber].nSize == 0 || vinfoBlockFile[fileNumber].nHeightLast > nLastBlockWeCanPrune)
@@ -3474,8 +3472,8 @@ CBlockIndex * InsertBlockIndex(uint256 hash)
     // Create new
     CBlockIndex* pindexNew = new CBlockIndex();
     if (!pindexNew)
-        throw runtime_error(std::string(__func__) + ": new CBlockIndex failed");
-    mi = mapBlockIndex.insert(make_pair(hash, pindexNew)).first;
+        throw std::runtime_error(std::string(__func__) + ": new CBlockIndex failed");
+    mi = mapBlockIndex.insert(std::make_pair(hash, pindexNew)).first;
     pindexNew->phashBlock = &((*mi).first);
 
     return pindexNew;
@@ -3489,12 +3487,12 @@ bool static LoadBlockIndexDB(const CChainParams& chainparams)
     boost::this_thread::interruption_point();
 
     // Calculate nChainWork
-    vector<pair<int, CBlockIndex*> > vSortedByHeight;
+    std::vector<std::pair<int, CBlockIndex*> > vSortedByHeight;
     vSortedByHeight.reserve(mapBlockIndex.size());
     BOOST_FOREACH(const PAIRTYPE(uint256, CBlockIndex*)& item, mapBlockIndex)
     {
         CBlockIndex* pindex = item.second;
-        vSortedByHeight.push_back(make_pair(pindex->nHeight, pindex));
+        vSortedByHeight.push_back(std::make_pair(pindex->nHeight, pindex));
     }
     sort(vSortedByHeight.begin(), vSortedByHeight.end());
     BOOST_FOREACH(const PAIRTYPE(int, CBlockIndex*)& item, vSortedByHeight)
@@ -3545,7 +3543,7 @@ bool static LoadBlockIndexDB(const CChainParams& chainparams)
 
     // Check presence of blk files
     LogPrintf("Checking all blk files are present...\n");
-    set<int> setBlkDataFiles;
+    std::set<int> setBlkDataFiles;
     BOOST_FOREACH(const PAIRTYPE(uint256, CBlockIndex*)& item, mapBlockIndex)
     {
         CBlockIndex* pindex = item.second;
@@ -3932,7 +3930,7 @@ bool LoadExternalBlockFile(const CChainParams& chainparams, FILE* fileIn, CDiskB
                 NotifyHeaderTip();
 
                 // Recursively process earlier encountered successors of this block
-                deque<uint256> queue;
+                std::deque<uint256> queue;
                 queue.push_back(hash);
                 while (!queue.empty()) {
                     uint256 head = queue.front();

From cc16d99f1dc8305b1b255f1cc0f2b1516aa77ed0 Mon Sep 17 00:00:00 2001
From: practicalswift <practicalswift@users.noreply.github.com>
Date: Wed, 18 Jan 2017 16:15:37 +0100
Subject: [PATCH 1647/1802] [trivial] Fix typos in comments

---
 contrib/linearize/example-linearize.cfg | 2 +-
 src/addrman.cpp                         | 2 +-
 src/base58.h                            | 2 +-
 src/bench/perf.cpp                      | 2 +-
 src/blockencodings.h                    | 2 +-
 src/consensus/params.h                  | 2 +-
 src/cuckoocache.h                       | 4 ++--
 src/httprpc.cpp                         | 2 +-
 src/init.cpp                            | 2 +-
 src/netaddress.h                        | 2 +-
 src/qt/bantablemodel.cpp                | 2 +-
 src/qt/paymentserver.h                  | 4 ++--
 src/qt/sendcoinsdialog.cpp              | 2 +-
 src/qt/utilitydialog.cpp                | 2 +-
 src/rpc/net.cpp                         | 2 +-
 src/script/script.cpp                   | 2 +-
 src/test/serialize_tests.cpp            | 4 ++--
 src/torcontrol.cpp                      | 2 +-
 src/txmempool.h                         | 2 +-
 src/utiltime.cpp                        | 2 +-
 src/wallet/wallet.cpp                   | 2 +-
 21 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/contrib/linearize/example-linearize.cfg b/contrib/linearize/example-linearize.cfg
index cccdd792131ae..69f0e9247af97 100644
--- a/contrib/linearize/example-linearize.cfg
+++ b/contrib/linearize/example-linearize.cfg
@@ -24,7 +24,7 @@ input=/home/example/.bitcoin/blocks
 output_file=/home/example/Downloads/bootstrap.dat
 hashlist=hashlist.txt
 
-# Maxmimum size in bytes of out-of-order blocks cache in memory
+# Maximum size in bytes of out-of-order blocks cache in memory
 out_of_order_cache_sz = 100000000
 
 # Do we want the reverse the hash bytes coming from getblockhash?
diff --git a/src/addrman.cpp b/src/addrman.cpp
index 662e931d252b5..ab84bf8e35605 100644
--- a/src/addrman.cpp
+++ b/src/addrman.cpp
@@ -255,7 +255,7 @@ bool CAddrMan::Add_(const CAddress& addr, const CNetAddr& source, int64_t nTimeP
     int nId;
     CAddrInfo* pinfo = Find(addr, &nId);
 
-    // Do not set a penality for a source's self-announcement
+    // Do not set a penalty for a source's self-announcement
     if (addr == source) {
         nTimePenalty = 0;
     }
diff --git a/src/base58.h b/src/base58.h
index cccebc9e0e753..3998283bb13eb 100644
--- a/src/base58.h
+++ b/src/base58.h
@@ -147,7 +147,7 @@ template<typename K, int Size, CChainParams::Base58Type Type> class CBitcoinExtK
     K GetKey() {
         K ret;
         if (vchData.size() == Size) {
-            //if base58 encouded data not holds a ext key, return a !IsValid() key
+            // If base58 encoded data does not hold an ext key, return a !IsValid() key
             ret.Decode(&vchData[0]);
         }
         return ret;
diff --git a/src/bench/perf.cpp b/src/bench/perf.cpp
index 1f43e5d3ac6f1..a549ec29eaafd 100644
--- a/src/bench/perf.cpp
+++ b/src/bench/perf.cpp
@@ -6,7 +6,7 @@
 
 #if defined(__i386__) || defined(__x86_64__)
 
-/* These architectures support quering the cycle counter
+/* These architectures support querying the cycle counter
  * from user space, no need for any syscall overhead.
  */
 void perf_init(void) { }
diff --git a/src/blockencodings.h b/src/blockencodings.h
index 281db9fe01f32..5a1d80d421210 100644
--- a/src/blockencodings.h
+++ b/src/blockencodings.h
@@ -99,7 +99,7 @@ class BlockTransactions {
     }
 };
 
-// Dumb serialization/storage-helper for CBlockHeaderAndShortTxIDs and PartiallyDownlaodedBlock
+// Dumb serialization/storage-helper for CBlockHeaderAndShortTxIDs and PartiallyDownloadedBlock
 struct PrefilledTransaction {
     // Used as an offset since last prefilled tx in CBlockHeaderAndShortTxIDs,
     // as a proper transaction-in-block-index in PartiallyDownloadedBlock
diff --git a/src/consensus/params.h b/src/consensus/params.h
index 3f98938f7ee20..6240e82857eb9 100644
--- a/src/consensus/params.h
+++ b/src/consensus/params.h
@@ -47,7 +47,7 @@ struct Params {
     /** Block height at which BIP66 becomes active */
     int BIP66Height;
     /**
-     * Minimum blocks including miner confirmation of the total of 2016 blocks in a retargetting period,
+     * Minimum blocks including miner confirmation of the total of 2016 blocks in a retargeting period,
      * (nPowTargetTimespan / nPowTargetSpacing) which is also used for BIP9 deployments.
      * Examples: 1916 for 95%, 1512 for testchains.
      */
diff --git a/src/cuckoocache.h b/src/cuckoocache.h
index efd6a820b5ce0..ff47e9776b643 100644
--- a/src/cuckoocache.h
+++ b/src/cuckoocache.h
@@ -257,7 +257,7 @@ class cache
      *
      * First, epoch_check decrements and checks the cheap heuristic, and then does
      * a more expensive scan if the cheap heuristic runs out. If the expensive
-     * scan suceeds, the epochs are aged and old elements are allow_erased. The
+     * scan succeeds, the epochs are aged and old elements are allow_erased. The
      * cheap heuristic is reset to retrigger after the worst case growth of the
      * current epoch's elements would exceed the epoch_size.
      */
@@ -395,7 +395,7 @@ class cache
             * 1) On first iteration, last_loc == invalid(), find returns last, so
             *    last_loc defaults to locs[0].
             * 2) On further iterations, where last_loc == locs[k], last_loc will
-            *    go to locs[k+1 % 8], i.e., next of the 8 indicies wrapping around
+            *    go to locs[k+1 % 8], i.e., next of the 8 indices wrapping around
             *    to 0 if needed.
             *
             * This prevents moving the element we just put in.
diff --git a/src/httprpc.cpp b/src/httprpc.cpp
index 93beda09a4895..daac7a0f1a703 100644
--- a/src/httprpc.cpp
+++ b/src/httprpc.cpp
@@ -25,7 +25,7 @@
 static const char* WWW_AUTH_HEADER_DATA = "Basic realm=\"jsonrpc\"";
 
 /** Simple one-shot callback timer to be used by the RPC mechanism to e.g.
- * re-lock the wellet.
+ * re-lock the wallet.
  */
 class HTTPRPCTimer : public RPCTimerBase
 {
diff --git a/src/init.cpp b/src/init.cpp
index 5be011f944dec..e936e068f44ae 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -1553,7 +1553,7 @@ bool AppInitMain(boost::thread_group& threadGroup, CScheduler& scheduler)
     }
 
     if (chainparams.GetConsensus().vDeployments[Consensus::DEPLOYMENT_SEGWIT].nTimeout != 0) {
-        // Only advertize witness capabilities if they have a reasonable start time.
+        // Only advertise witness capabilities if they have a reasonable start time.
         // This allows us to have the code merged without a defined softfork, by setting its
         // end time to 0.
         // Note that setting NODE_WITNESS is never required: the only downside from not
diff --git a/src/netaddress.h b/src/netaddress.h
index bc430dd82335e..a85c2b7452e35 100644
--- a/src/netaddress.h
+++ b/src/netaddress.h
@@ -49,7 +49,7 @@ class CNetAddr
         bool IsIPv4() const;    // IPv4 mapped address (::FFFF:0:0/96, 0.0.0.0/0)
         bool IsIPv6() const;    // IPv6 address (not mapped IPv4, not Tor)
         bool IsRFC1918() const; // IPv4 private networks (10.0.0.0/8, 192.168.0.0/16, 172.16.0.0/12)
-        bool IsRFC2544() const; // IPv4 inter-network communcations (192.18.0.0/15)
+        bool IsRFC2544() const; // IPv4 inter-network communications (192.18.0.0/15)
         bool IsRFC6598() const; // IPv4 ISP-level NAT (100.64.0.0/10)
         bool IsRFC5737() const; // IPv4 documentation addresses (192.0.2.0/24, 198.51.100.0/24, 203.0.113.0/24)
         bool IsRFC3849() const; // IPv6 documentation address (2001:0DB8::/32)
diff --git a/src/qt/bantablemodel.cpp b/src/qt/bantablemodel.cpp
index 00a915dd8db7e..4b34e73eb7a45 100644
--- a/src/qt/bantablemodel.cpp
+++ b/src/qt/bantablemodel.cpp
@@ -64,7 +64,7 @@ class BanTablePriv
         }
 
         if (sortColumn >= 0)
-            // sort cachedBanlist (use stable sort to prevent rows jumping around unneceesarily)
+            // sort cachedBanlist (use stable sort to prevent rows jumping around unnecessarily)
             qStableSort(cachedBanlist.begin(), cachedBanlist.end(), BannedNodeLessThan(sortColumn, sortOrder));
     }
 
diff --git a/src/qt/paymentserver.h b/src/qt/paymentserver.h
index 37ee522d54398..9d46280a37b40 100644
--- a/src/qt/paymentserver.h
+++ b/src/qt/paymentserver.h
@@ -21,10 +21,10 @@
 //
 // When startup is finished and the main window is
 // shown, a signal is sent to slot uiReady(), which
-// emits a receivedURL() signal for any payment
+// emits a receivedURI() signal for any payment
 // requests that happened during startup.
 //
-// After startup, receivedURL() happens as usual.
+// After startup, receivedURI() happens as usual.
 //
 // This class has one more feature: a static
 // method that finds URIs passed in the command line
diff --git a/src/qt/sendcoinsdialog.cpp b/src/qt/sendcoinsdialog.cpp
index 1e2842df73c75..1c0ed663c1fdf 100644
--- a/src/qt/sendcoinsdialog.cpp
+++ b/src/qt/sendcoinsdialog.cpp
@@ -608,7 +608,7 @@ void SendCoinsDialog::updateGlobalFeeVariables()
         // set nMinimumTotalFee to 0 to not accidentally pay a custom fee
         CoinControlDialog::coinControl->nMinimumTotalFee = 0;
 
-        // show the estimated reuquired time for confirmation
+        // show the estimated required time for confirmation
         ui->confirmationTargetLabel->setText(GUIUtil::formatDurationStr(nConfirmTarget * Params().GetConsensus().nPowTargetSpacing) + " / " + tr("%n block(s)", "", nConfirmTarget));
     }
     else
diff --git a/src/qt/utilitydialog.cpp b/src/qt/utilitydialog.cpp
index 70efe279907da..7ab4125284666 100644
--- a/src/qt/utilitydialog.cpp
+++ b/src/qt/utilitydialog.cpp
@@ -39,7 +39,7 @@ HelpMessageDialog::HelpMessageDialog(QWidget *parent, bool about) :
 
     QString version = tr(PACKAGE_NAME) + " " + tr("version") + " " + QString::fromStdString(FormatFullVersion());
     /* On x86 add a bit specifier to the version so that users can distinguish between
-     * 32 and 64 bit builds. On other architectures, 32/64 bit may be more ambigious.
+     * 32 and 64 bit builds. On other architectures, 32/64 bit may be more ambiguous.
      */
 #if defined(__x86_64__)
     version += " " + tr("(%1-bit)").arg(64);
diff --git a/src/rpc/net.cpp b/src/rpc/net.cpp
index 27b9963a102d9..35747552feaf0 100644
--- a/src/rpc/net.cpp
+++ b/src/rpc/net.cpp
@@ -150,7 +150,7 @@ UniValue getpeerinfo(const JSONRPCRequest& request)
             obj.push_back(Pair("pingwait", stats.dPingWait));
         obj.push_back(Pair("version", stats.nVersion));
         // Use the sanitized form of subver here, to avoid tricksy remote peers from
-        // corrupting or modifiying the JSON output by putting special characters in
+        // corrupting or modifying the JSON output by putting special characters in
         // their ver message.
         obj.push_back(Pair("subver", stats.cleanSubVer));
         obj.push_back(Pair("inbound", stats.fInbound));
diff --git a/src/script/script.cpp b/src/script/script.cpp
index 828ce1a056f1b..9f4741b1cd95d 100644
--- a/src/script/script.cpp
+++ b/src/script/script.cpp
@@ -129,7 +129,7 @@ const char* GetOpName(opcodetype opcode)
     case OP_CHECKMULTISIG          : return "OP_CHECKMULTISIG";
     case OP_CHECKMULTISIGVERIFY    : return "OP_CHECKMULTISIGVERIFY";
 
-    // expanson
+    // expansion
     case OP_NOP1                   : return "OP_NOP1";
     case OP_CHECKLOCKTIMEVERIFY    : return "OP_CHECKLOCKTIMEVERIFY";
     case OP_CHECKSEQUENCEVERIFY    : return "OP_CHECKSEQUENCEVERIFY";
diff --git a/src/test/serialize_tests.cpp b/src/test/serialize_tests.cpp
index 2d54668eaf1e6..9661a66514049 100644
--- a/src/test/serialize_tests.cpp
+++ b/src/test/serialize_tests.cpp
@@ -90,7 +90,7 @@ BOOST_AUTO_TEST_CASE(sizes)
 
 BOOST_AUTO_TEST_CASE(floats_conversion)
 {
-    // Choose values that map unambigiously to binary floating point to avoid
+    // Choose values that map unambiguously to binary floating point to avoid
     // rounding issues at the compiler side.
     BOOST_CHECK_EQUAL(ser_uint32_to_float(0x00000000), 0.0F);
     BOOST_CHECK_EQUAL(ser_uint32_to_float(0x3f000000), 0.5F);
@@ -109,7 +109,7 @@ BOOST_AUTO_TEST_CASE(floats_conversion)
 
 BOOST_AUTO_TEST_CASE(doubles_conversion)
 {
-    // Choose values that map unambigiously to binary floating point to avoid
+    // Choose values that map unambiguously to binary floating point to avoid
     // rounding issues at the compiler side.
     BOOST_CHECK_EQUAL(ser_uint64_to_double(0x0000000000000000ULL), 0.0);
     BOOST_CHECK_EQUAL(ser_uint64_to_double(0x3fe0000000000000ULL), 0.5);
diff --git a/src/torcontrol.cpp b/src/torcontrol.cpp
index 5571b7de4457d..c49c5d9eb2a83 100644
--- a/src/torcontrol.cpp
+++ b/src/torcontrol.cpp
@@ -372,7 +372,7 @@ class TorController
     struct event *reconnect_ev;
     float reconnect_timeout;
     CService service;
-    /** Cooie for SAFECOOKIE auth */
+    /** Cookie for SAFECOOKIE auth */
     std::vector<uint8_t> cookie;
     /** ClientNonce for SAFECOOKIE auth */
     std::vector<uint8_t> clientNonce;
diff --git a/src/txmempool.h b/src/txmempool.h
index f842a07dd6571..db1a02455f862 100644
--- a/src/txmempool.h
+++ b/src/txmempool.h
@@ -355,7 +355,7 @@ enum class MemPoolRemovalReason {
  * Transactions are added when they are seen on the network (or created by the
  * local node), but not all transactions seen are added to the pool. For
  * example, the following new transactions will not be added to the mempool:
- * - a transaction which doesn't make the mimimum fee requirements.
+ * - a transaction which doesn't meet the minimum fee requirements.
  * - a new transaction that double-spends an input of a transaction already in
  * the pool where the new transaction does not meet the Replace-By-Fee
  * requirements as defined in BIP 125.
diff --git a/src/utiltime.cpp b/src/utiltime.cpp
index 87a25866e9a5d..c7b3e4f168655 100644
--- a/src/utiltime.cpp
+++ b/src/utiltime.cpp
@@ -63,7 +63,7 @@ void MilliSleep(int64_t n)
 {
 
 /**
- * Boost's sleep_for was uninterruptable when backed by nanosleep from 1.50
+ * Boost's sleep_for was uninterruptible when backed by nanosleep from 1.50
  * until fixed in 1.52. Use the deprecated sleep method for the broken case.
  * See: https://svn.boost.org/trac/boost/ticket/7238
  */
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index b4715622cf4f8..517202a9bb84a 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -2576,7 +2576,7 @@ bool CWallet::CreateTransaction(const vector<CRecipient>& vecSend, CWalletTx& wt
                 // BIP125 defines opt-in RBF as any nSequence < maxint-1, so
                 // we use the highest possible value in that range (maxint-2)
                 // to avoid conflicting with other possible uses of nSequence,
-                // and in the spirit of "smallest posible change from prior
+                // and in the spirit of "smallest possible change from prior
                 // behavior."
                 for (const auto& coin : setCoins)
                     txNew.vin.push_back(CTxIn(coin.first->GetHash(),coin.second,CScript(),

From 342eb9618abf53c21bd860bfccdf5b5195aab094 Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Thu, 19 Jan 2017 17:23:52 -0500
Subject: [PATCH 1648/1802] build: find qt's renamed helper libs from 5.7

---
 build-aux/m4/bitcoin_qt.m4 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build-aux/m4/bitcoin_qt.m4 b/build-aux/m4/bitcoin_qt.m4
index 509283a0b9cd9..f43fc3037f3d5 100644
--- a/build-aux/m4/bitcoin_qt.m4
+++ b/build-aux/m4/bitcoin_qt.m4
@@ -473,8 +473,8 @@ AC_DEFUN([_BITCOIN_QT_FIND_LIBS_WITHOUT_PKGCONFIG],[
   ])
 
   BITCOIN_QT_CHECK(AC_CHECK_LIB([z] ,[main],,AC_MSG_WARN([zlib not found. Assuming qt has it built-in])))
-  BITCOIN_QT_CHECK(AC_CHECK_LIB([png] ,[main],,AC_MSG_WARN([libpng not found. Assuming qt has it built-in])))
-  BITCOIN_QT_CHECK(AC_CHECK_LIB([jpeg] ,[main],,AC_MSG_WARN([libjpeg not found. Assuming qt has it built-in])))
+  BITCOIN_QT_CHECK(AC_SEARCH_LIBS([png_error] ,[qtpng png],,AC_MSG_WARN([libpng not found. Assuming qt has it built-in])))
+  BITCOIN_QT_CHECK(AC_SEARCH_LIBS([jpeg_create_decompress] ,[qtjpeg jpeg],,AC_MSG_WARN([libjpeg not found. Assuming qt has it built-in])))
   BITCOIN_QT_CHECK(AC_SEARCH_LIBS([pcre16_exec], [qtpcre pcre16],,AC_MSG_WARN([libpcre16 not found. Assuming qt has it built-in])))
   BITCOIN_QT_CHECK(AC_SEARCH_LIBS([hb_ot_tags_from_script] ,[qtharfbuzzng harfbuzz],,AC_MSG_WARN([libharfbuzz not found. Assuming qt has it built-in or support is disabled])))
   BITCOIN_QT_CHECK(AC_CHECK_LIB([${QT_LIB_PREFIX}Core]   ,[main],,BITCOIN_QT_FAIL(lib$QT_LIB_PREFIXCore not found)))

From 8efa34fb772bb320e657d18751f1751a4ee48731 Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Thu, 19 Jan 2017 17:20:35 -0500
Subject: [PATCH 1649/1802] depends: add a zlib build

qt5.7 changed the location of some of its symbols, creating a circular
dependency in Qt5Core. Rather than trying to fix that up, build our own zlib
rather than having it built for us.
---
 depends/packages/packages.mk |  2 +-
 depends/packages/qt.mk       |  4 ++--
 depends/packages/zlib.mk     | 25 +++++++++++++++++++++++++
 3 files changed, 28 insertions(+), 3 deletions(-)
 create mode 100644 depends/packages/zlib.mk

diff --git a/depends/packages/packages.mk b/depends/packages/packages.mk
index 4cf44385b88dc..088723ebd0d56 100644
--- a/depends/packages/packages.mk
+++ b/depends/packages/packages.mk
@@ -2,7 +2,7 @@ packages:=boost openssl libevent zeromq
 native_packages := native_ccache
 
 qt_native_packages = native_protobuf
-qt_packages = qrencode protobuf
+qt_packages = qrencode protobuf zlib
 
 qt_x86_64_linux_packages:=qt expat dbus libxcb xcb_proto libXau xproto freetype fontconfig libX11 xextproto libXext xtrans
 qt_i686_linux_packages:=$(qt_x86_64_linux_packages)
diff --git a/depends/packages/qt.mk b/depends/packages/qt.mk
index 6e38d1ac6a517..7898927a81ea6 100644
--- a/depends/packages/qt.mk
+++ b/depends/packages/qt.mk
@@ -4,7 +4,7 @@ $(package)_download_path=http://download.qt.io/official_releases/qt/5.7/$($(pack
 $(package)_suffix=opensource-src-$($(package)_version).tar.gz
 $(package)_file_name=qtbase-$($(package)_suffix)
 $(package)_sha256_hash=95f83e532d23b3ddbde7973f380ecae1bac13230340557276f75f2e37984e410
-$(package)_dependencies=openssl
+$(package)_dependencies=openssl zlib
 $(package)_linux_dependencies=freetype fontconfig libxcb libX11 xproto libXext
 $(package)_build_subdir=qtbase
 $(package)_qt_libs=corelib network widgets gui plugins testlib
@@ -73,7 +73,7 @@ $(package)_config_opts += -prefix $(host_prefix)
 $(package)_config_opts += -qt-libpng
 $(package)_config_opts += -qt-libjpeg
 $(package)_config_opts += -qt-pcre
-$(package)_config_opts += -qt-zlib
+$(package)_config_opts += -system-zlib
 $(package)_config_opts += -reduce-exports
 $(package)_config_opts += -static
 $(package)_config_opts += -silent
diff --git a/depends/packages/zlib.mk b/depends/packages/zlib.mk
new file mode 100644
index 0000000000000..7ff5d00bbdc64
--- /dev/null
+++ b/depends/packages/zlib.mk
@@ -0,0 +1,25 @@
+package=zlib
+$(package)_version=1.2.11
+$(package)_download_path=http://www.zlib.net
+$(package)_file_name=$(package)-$($(package)_version).tar.gz
+$(package)_sha256_hash=c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1
+
+define $(package)_set_vars
+$(package)_build_opts= CC="$($(package)_cc)"
+$(package)_build_opts+=CFLAGS="$($(package)_cflags) $($(package)_cppflags) -fPIC"
+$(package)_build_opts+=AR="$($(package)_ar)"
+$(package)_build_opts+=RANLIB="$($(package)_ranlib)"
+endef
+
+define $(package)_config_cmds
+  ./configure --static --prefix=$(host_prefix)
+endef
+
+define $(package)_build_cmds
+  $(MAKE) $($(package)_build_opts) libz.a
+endef
+
+define $(package)_stage_cmds
+  $(MAKE) DESTDIR=$($(package)_staging_dir) install $($(package)_build_opts)
+endef
+

From b5f374fef71ba2ba99e3d9629b66fd1491fd7c90 Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Fri, 27 Jan 2017 12:10:13 -0500
Subject: [PATCH 1650/1802] qt: fix build with zlib for target

This contains a few hacks very specific to Qt's buildsystem. These can be
reverted once we split the build between native and target builds.

Qt's build contains a circular dependency when not using a system zlib.
By far the easiest fix is to switch to a system zlib, rather than Qt's own.
However, that confuses Qt's cross build which assumes that when using a system
zlib, it should also find a system (native) zlib for native tools. The build
breaks if that zlib is not present.

To solve this:
1. Always use a system zlib rather than the one provided by qt
2. Set force_bootstrap, which instructs the build tools to be built as though
   we're cross-compiling (build != target)
3. For build tools, use qt's internal zlib so that a native zlib is not
required.

Step 3 means that if any zlib headers are found by the native build, it will
confuse Qt's internal zlib build. So we also need to make sure that the target
headers/libs aren't found. To do so, specify that our
cflags/cxxflags/cppflags/ldflags only apply for non-host builds.
---
 depends/packages/qt.mk            | 15 +++++++++------
 depends/patches/qt/mac-qmake.conf |  8 ++++----
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/depends/packages/qt.mk b/depends/packages/qt.mk
index 7898927a81ea6..bbfdb766ed694 100644
--- a/depends/packages/qt.mk
+++ b/depends/packages/qt.mk
@@ -140,12 +140,13 @@ define $(package)_preprocess_cmds
   patch -p1 < $($(package)_patch_dir)/pidlist_absolute.patch && \
   patch -p1 < $($(package)_patch_dir)/fix-xcb-include-order.patch && \
   patch -p1 < $($(package)_patch_dir)/fix_qt_pkgconfig.patch && \
-  echo "QMAKE_CFLAGS     += $($(package)_cflags) $($(package)_cppflags)" >> qtbase/mkspecs/common/gcc-base.conf && \
-  echo "QMAKE_CXXFLAGS   += $($(package)_cxxflags) $($(package)_cppflags)" >> qtbase/mkspecs/common/gcc-base.conf && \
-  echo "QMAKE_LFLAGS     += $($(package)_ldflags)" >> qtbase/mkspecs/common/gcc-base.conf && \
-  sed -i.old "s|QMAKE_CFLAGS            = |QMAKE_CFLAGS            = $($(package)_cflags) $($(package)_cppflags) |" qtbase/mkspecs/win32-g++/qmake.conf && \
-  sed -i.old "s|QMAKE_LFLAGS            = |QMAKE_LFLAGS            = $($(package)_ldflags) |" qtbase/mkspecs/win32-g++/qmake.conf && \
-  sed -i.old "s|QMAKE_CXXFLAGS          = |QMAKE_CXXFLAGS            = $($(package)_cxxflags) $($(package)_cppflags) |" qtbase/mkspecs/win32-g++/qmake.conf
+  echo "!host_build: QMAKE_CFLAGS     += $($(package)_cflags) $($(package)_cppflags)" >> qtbase/mkspecs/common/gcc-base.conf && \
+  echo "!host_build: QMAKE_CXXFLAGS   += $($(package)_cxxflags) $($(package)_cppflags)" >> qtbase/mkspecs/common/gcc-base.conf && \
+  echo "!host_build: QMAKE_LFLAGS     += $($(package)_ldflags)" >> qtbase/mkspecs/common/gcc-base.conf && \
+  sed -i.old "s|QMAKE_CFLAGS            = |!host_build: QMAKE_CFLAGS            = $($(package)_cflags) $($(package)_cppflags) |" qtbase/mkspecs/win32-g++/qmake.conf && \
+  sed -i.old "s|QMAKE_LFLAGS            = |!host_build: QMAKE_LFLAGS            = $($(package)_ldflags) |" qtbase/mkspecs/win32-g++/qmake.conf && \
+  sed -i.old "s|QMAKE_CXXFLAGS          = |!host_build: QMAKE_CXXFLAGS            = $($(package)_cxxflags) $($(package)_cppflags) |" qtbase/mkspecs/win32-g++/qmake.conf
+
 endef
 
 define $(package)_config_cmds
@@ -153,6 +154,8 @@ define $(package)_config_cmds
   export PKG_CONFIG_LIBDIR=$(host_prefix)/lib/pkgconfig && \
   export PKG_CONFIG_PATH=$(host_prefix)/share/pkgconfig  && \
   ./configure $($(package)_config_opts) && \
+  echo "host_build: QT_CONFIG ~= s/system-zlib/zlib" >> mkspecs/qconfig.pri && \
+  echo "CONFIG += force_bootstrap" >> mkspecs/qconfig.pri && \
   $(MAKE) sub-src-clean && \
   cd ../qttranslations && ../qtbase/bin/qmake qttranslations.pro -o Makefile && \
   cd translations && ../../qtbase/bin/qmake translations.pro -o Makefile && cd ../.. &&\
diff --git a/depends/patches/qt/mac-qmake.conf b/depends/patches/qt/mac-qmake.conf
index f565fe3e75d13..ca70d30b15e9c 100644
--- a/depends/patches/qt/mac-qmake.conf
+++ b/depends/patches/qt/mac-qmake.conf
@@ -14,10 +14,10 @@ QMAKE_MAC_SDK.macosx.Path = $${MAC_SDK_PATH}
 QMAKE_MAC_SDK.macosx.platform_name = macosx
 QMAKE_MAC_SDK.macosx.SDKVersion = $${MAC_SDK_VERSION}
 QMAKE_MAC_SDK.macosx.PlatformPath = /phony
-QMAKE_CFLAGS += -target $${MAC_TARGET}
-QMAKE_OBJECTIVE_CFLAGS += $$QMAKE_CFLAGS
-QMAKE_CXXFLAGS += $$QMAKE_CFLAGS
-QMAKE_LFLAGS += -target $${MAC_TARGET} -mlinker-version=$${MAC_LD64_VERSION}
+!host_build: QMAKE_CFLAGS += -target $${MAC_TARGET}
+!host_build: QMAKE_OBJECTIVE_CFLAGS += $$QMAKE_CFLAGS
+!host_build: QMAKE_CXXFLAGS += $$QMAKE_CFLAGS
+!host_build: QMAKE_LFLAGS += -target $${MAC_TARGET} -mlinker-version=$${MAC_LD64_VERSION}
 QMAKE_AR = $${CROSS_COMPILE}ar cq
 QMAKE_RANLIB=$${CROSS_COMPILE}ranlib
 QMAKE_LIBTOOL=$${CROSS_COMPILE}libtool

From 95f97f4b94b9d534cf61c3c82ff728eff00423e5 Mon Sep 17 00:00:00 2001
From: Luke Dashjr <luke-jr+git@utopios.org>
Date: Sat, 28 Jan 2017 08:03:57 +0000
Subject: [PATCH 1651/1802] Skip RAII event tests if libevent is built without
 event_set_mem_functions

---
 src/test/raii_event_tests.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/test/raii_event_tests.cpp b/src/test/raii_event_tests.cpp
index 87d25c0e2c4bc..0f40874f55c10 100644
--- a/src/test/raii_event_tests.cpp
+++ b/src/test/raii_event_tests.cpp
@@ -3,6 +3,10 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include <event2/event.h>
+
+#ifdef EVENT_SET_MEM_FUNCTIONS_IMPLEMENTED
+// It would probably be ideal to define dummy test(s) that report skipped, but boost::test doesn't seem to make that practical (at least not in versions available with common distros)
+
 #include <map>
 #include <stdlib.h>
 
@@ -86,3 +90,5 @@ BOOST_AUTO_TEST_CASE(raii_event_order)
 }
 
 BOOST_AUTO_TEST_SUITE_END()
+
+#endif  // EVENT_SET_MEM_FUNCTIONS_IMPLEMENTED

From fa5137c11d2d4accd9bfc68b3498e7e16829c3ab Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Sat, 28 Jan 2017 16:58:29 +0100
Subject: [PATCH 1652/1802] [doc] Remove unused clang format dev script

Also, update the clang format file to reflect the current coding
style mentioned in the developer notes.
---
 contrib/devtools/README.md       |  6 +---
 contrib/devtools/clang-format.py | 62 --------------------------------
 doc/developer-notes.md           |  7 ++--
 src/.clang-format                |  2 +-
 4 files changed, 6 insertions(+), 71 deletions(-)
 delete mode 100755 contrib/devtools/clang-format.py

diff --git a/contrib/devtools/README.md b/contrib/devtools/README.md
index 6c0047833f302..34f2af68666a9 100644
--- a/contrib/devtools/README.md
+++ b/contrib/devtools/README.md
@@ -8,11 +8,6 @@ check-doc.py
 Check if all command line args are documented. The return value indicates the
 number of undocumented args.
 
-clang-format.py
-===============
-
-A script to format cpp source code according to [.clang-format](../../src/.clang-format). This should only be applied to new files or files which are currently not actively developed on. Also, git subtrees are not subject to formatting.
-
 clang-format-diff.py
 ===================
 
@@ -24,6 +19,7 @@ the script should be called from the git root folder as follows.
 ```
 git diff -U0 HEAD~1.. | ./contrib/devtools/clang-format-diff.py -p1 -i -v
 ```
+
 copyright\_header.py
 ====================
 
diff --git a/contrib/devtools/clang-format.py b/contrib/devtools/clang-format.py
deleted file mode 100755
index cee99047ac67e..0000000000000
--- a/contrib/devtools/clang-format.py
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/usr/bin/env python
-'''
-Wrapper script for clang-format
-
-Copyright (c) 2015 MarcoFalke
-Copyright (c) 2015 The Bitcoin Core developers
-Distributed under the MIT software license, see the accompanying
-file COPYING or http://www.opensource.org/licenses/mit-license.php.
-'''
-
-import os
-import sys
-import subprocess
-
-tested_versions = ['3.6.0', '3.6.1', '3.6.2'] # A set of versions known to produce the same output
-accepted_file_extensions = ('.h', '.cpp') # Files to format
-
-def check_clang_format_version(clang_format_exe):
-    try:
-        output = subprocess.check_output([clang_format_exe, '-version'])
-        for ver in tested_versions:
-            if ver in output:
-                print "Detected clang-format version " + ver
-                return
-        raise RuntimeError("Untested version: " + output)
-    except Exception as e:
-        print 'Could not verify version of ' + clang_format_exe + '.'
-        raise e
-
-def check_command_line_args(argv):
-    required_args = ['{clang-format-exe}', '{files}']
-    example_args = ['clang-format-3.x', 'src/main.cpp', 'src/wallet/*']
-
-    if(len(argv) < len(required_args) + 1):
-        for word in (['Usage:', argv[0]] + required_args):
-            print word,
-        print ''
-        for word in (['E.g:', argv[0]] + example_args):
-            print word,
-        print ''
-        sys.exit(1)
-
-def run_clang_format(clang_format_exe, files):
-    for target in files:
-        if os.path.isdir(target):
-            for path, dirs, files in os.walk(target):
-                run_clang_format(clang_format_exe, (os.path.join(path, f) for f in files))
-        elif target.endswith(accepted_file_extensions):
-            print "Format " + target
-            subprocess.check_call([clang_format_exe, '-i', '-style=file', target], stdout=open(os.devnull, 'wb'), stderr=subprocess.STDOUT)
-        else:
-            print "Skip " + target
-
-def main(argv):
-    check_command_line_args(argv)
-    clang_format_exe = argv[1]
-    files = argv[2:]
-    check_clang_format_version(clang_format_exe)
-    run_clang_format(clang_format_exe, files)
-
-if __name__ == "__main__":
-    main(sys.argv)
diff --git a/doc/developer-notes.md b/doc/developer-notes.md
index f8c34e060f9dd..989ad8d03ebde 100644
--- a/doc/developer-notes.md
+++ b/doc/developer-notes.md
@@ -4,10 +4,11 @@ Developer Notes
 Various coding styles have been used during the history of the codebase,
 and the result is not very consistent. However, we're now trying to converge to
 a single style, so please use it in new code. Old code will be converted
-gradually.
+gradually and you are encouraged to use the provided
+[clang-format-diff script](/contrib/devtools/README.md#clang-format-diffpy)
+to clean up the patch automatically before submitting a pull request.
+
 - Basic rules specified in [src/.clang-format](/src/.clang-format).
-  Use a recent clang-format to format automatically using one of the [dev scripts]
-  (/contrib/devtools/README.md#clang-formatpy).
   - Braces on new lines for namespaces, classes, functions, methods.
   - Braces on the same line for everything else.
   - 4 space indentation (no tabs) for every block except namespaces.
diff --git a/src/.clang-format b/src/.clang-format
index 129f062ef8b72..fc53509138fad 100644
--- a/src/.clang-format
+++ b/src/.clang-format
@@ -6,7 +6,7 @@ AlignTrailingComments: true
 AllowAllParametersOfDeclarationOnNextLine: false
 AllowShortBlocksOnASingleLine: false
 AllowShortFunctionsOnASingleLine: All
-AllowShortIfStatementsOnASingleLine: false
+AllowShortIfStatementsOnASingleLine: true
 AllowShortLoopsOnASingleLine: false
 AlwaysBreakBeforeMultilineStrings: false
 AlwaysBreakTemplateDeclarations: true

From 5f62e3eb6381e455a1b83ab6fb368a132124d2a3 Mon Sep 17 00:00:00 2001
From: practicalswift <practicalswift@users.noreply.github.com>
Date: Sun, 29 Jan 2017 18:19:55 +0100
Subject: [PATCH 1653/1802] Fix typos

---
 contrib/gitian-build.sh           | 2 +-
 contrib/macdeploy/macdeployqtplus | 4 ++--
 contrib/rpm/README.md             | 2 +-
 share/certs/PrivateKeyNotes.md    | 2 +-
 src/qt/bitcoingui.cpp             | 2 +-
 src/qt/guiutil.cpp                | 4 ++--
 src/qt/guiutil.h                  | 2 +-
 7 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/contrib/gitian-build.sh b/contrib/gitian-build.sh
index 53c24e3a876ca..6ee5df47039e6 100755
--- a/contrib/gitian-build.sh
+++ b/contrib/gitian-build.sh
@@ -41,7 +41,7 @@ Options:
 -c|--commit	Indicate that the version argument is for a commit or branch
 -u|--url	Specify the URL of the repository. Default is https://github.com/bitcoin/bitcoin
 -v|--verify 	Verify the gitian build
--b|--build	Do a gitiain build
+-b|--build	Do a gitian build
 -s|--sign	Make signed binaries for Windows and Mac OSX
 -B|--buildsign	Build both signed and unsigned binaries
 -o|--os		Specify which Operating Systems the build is for. Default is lwx. l for linux, w for windows, x for osx
diff --git a/contrib/macdeploy/macdeployqtplus b/contrib/macdeploy/macdeployqtplus
index 73d4f159d868f..5995f9f438983 100755
--- a/contrib/macdeploy/macdeployqtplus
+++ b/contrib/macdeploy/macdeployqtplus
@@ -340,7 +340,7 @@ def deployFrameworks(frameworks, bundlePath, binaryPath, strip, verbose, deploym
         # install_name_tool the new id into the binary
         changeInstallName(framework.installName, framework.deployedInstallName, binaryPath, verbose)
         
-        # Copy farmework to app bundle.
+        # Copy framework to app bundle.
         deployedBinaryPath = copyFramework(framework, bundlePath, verbose)
         # Skip the rest if already was deployed.
         if deployedBinaryPath is None:
@@ -492,7 +492,7 @@ ap.add_argument("-no-strip", dest="strip", action="store_false", default=True, h
 ap.add_argument("-sign", dest="sign", action="store_true", default=False, help="sign .app bundle with codesign tool")
 ap.add_argument("-dmg", nargs="?", const="", metavar="basename", help="create a .dmg disk image; if basename is not specified, a camel-cased version of the app name is used")
 ap.add_argument("-fancy", nargs=1, metavar="plist", default=[], help="make a fancy looking disk image using the given plist file with instructions; requires -dmg to work")
-ap.add_argument("-add-qt-tr", nargs=1, metavar="languages", default=[], help="add Qt translation files to the bundle's ressources; the language list must be separated with commas, not with whitespace")
+ap.add_argument("-add-qt-tr", nargs=1, metavar="languages", default=[], help="add Qt translation files to the bundle's resources; the language list must be separated with commas, not with whitespace")
 ap.add_argument("-translations-dir", nargs=1, metavar="path", default=None, help="Path to Qt's translation files")
 ap.add_argument("-add-resources", nargs="+", metavar="path", default=[], help="list of additional files or folders to be copied into the bundle's resources; must be the last argument")
 ap.add_argument("-volname", nargs=1, metavar="volname", default=[], help="custom volume name for dmg")
diff --git a/contrib/rpm/README.md b/contrib/rpm/README.md
index aecb3ba84f20d..e1fd0b317b0ed 100644
--- a/contrib/rpm/README.md
+++ b/contrib/rpm/README.md
@@ -31,7 +31,7 @@ through `Source23` are used.
 Sources 30-39 should be reserved for SELinux related files. Currently only
 `Source30` through `Source32` are used. Until those files are in a tagged
 release, the full URL specified in the RPM spec file will not work. You can get
-them from the git ropository where you retrieved this file.
+them from the git repository where you retrieved this file.
 
 Sources 100+ are for files that are not source tarballs and are not maintained
 in the bitcoin git repository. At present only an SVG version of the Bitcoin
diff --git a/share/certs/PrivateKeyNotes.md b/share/certs/PrivateKeyNotes.md
index da299d168f0d0..8d50144c21f9b 100644
--- a/share/certs/PrivateKeyNotes.md
+++ b/share/certs/PrivateKeyNotes.md
@@ -2,7 +2,7 @@ Code-signing private key notes
 ==
 
 The private keys for these certificates were generated on Gavin's main work machine,
-following the certificate authoritys' recommendations for generating certificate
+following the certificate authority's recommendations for generating certificate
 signing requests.
 
 For OSX, the private key was generated by Keychain.app on Gavin's main work machine.
diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp
index f86b09644b86c..1c1acb6b1038b 100644
--- a/src/qt/bitcoingui.cpp
+++ b/src/qt/bitcoingui.cpp
@@ -770,7 +770,7 @@ void BitcoinGUI::setNumBlocks(int count, const QDateTime& blockDate, double nVer
     if (!clientModel)
         return;
 
-    // Prevent orphan statusbar messages (e.g. hover Quit in main menu, wait until chain-sync starts -> garbelled text)
+    // Prevent orphan statusbar messages (e.g. hover Quit in main menu, wait until chain-sync starts -> garbled text)
     statusBar()->clearMessage();
 
     // Acquire current block source
diff --git a/src/qt/guiutil.cpp b/src/qt/guiutil.cpp
index ea80a1f5492ef..5d6c0e2e31f25 100644
--- a/src/qt/guiutil.cpp
+++ b/src/qt/guiutil.cpp
@@ -536,7 +536,7 @@ int TableViewLastColumnResizingFixer::getAvailableWidthForColumn(int column)
     return nResult;
 }
 
-// Make sure we don't make the columns wider than the tables viewport width.
+// Make sure we don't make the columns wider than the table's viewport width.
 void TableViewLastColumnResizingFixer::adjustTableColumnsWidth()
 {
     disconnectViewHeadersSignals();
@@ -570,7 +570,7 @@ void TableViewLastColumnResizingFixer::on_sectionResized(int logicalIndex, int o
     }
 }
 
-// When the tabless geometry is ready, we manually perform the stretch of the "Message" column,
+// When the table's geometry is ready, we manually perform the stretch of the "Message" column,
 // as the "Stretch" resize mode does not allow for interactive resizing.
 void TableViewLastColumnResizingFixer::on_geometriesChanged()
 {
diff --git a/src/qt/guiutil.h b/src/qt/guiutil.h
index 5765b2ec4af0c..913aa5e24bf11 100644
--- a/src/qt/guiutil.h
+++ b/src/qt/guiutil.h
@@ -140,7 +140,7 @@ namespace GUIUtil
      * Also makes sure the column widths are never larger than the table's viewport.
      * In Qt, all columns are resizable from the right, but it's not intuitive resizing the last column from the right.
      * Usually our second to last columns behave as if stretched, and when on strech mode, columns aren't resizable
-     * interactively or programatically.
+     * interactively or programmatically.
      *
      * This helper object takes care of this issue.
      *

From 71fc17f6673eae2e44d226e21692283a85786c44 Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Mon, 30 Jan 2017 12:28:44 +0000
Subject: [PATCH 1654/1802] qt: periodic translations update

---
 src/qt/locale/bitcoin_af.ts          |   4 -
 src/qt/locale/bitcoin_ar.ts          |   4 -
 src/qt/locale/bitcoin_be_BY.ts       |   4 -
 src/qt/locale/bitcoin_bg.ts          |   4 -
 src/qt/locale/bitcoin_ca.ts          |   4 -
 src/qt/locale/bitcoin_ca@valencia.ts |   4 -
 src/qt/locale/bitcoin_ca_ES.ts       |   4 -
 src/qt/locale/bitcoin_cs.ts          |  16 ++-
 src/qt/locale/bitcoin_da.ts          |  28 +++-
 src/qt/locale/bitcoin_de.ts          |  20 ++-
 src/qt/locale/bitcoin_el_GR.ts       |   4 -
 src/qt/locale/bitcoin_en.ts          |   6 +-
 src/qt/locale/bitcoin_en_GB.ts       |   4 -
 src/qt/locale/bitcoin_eo.ts          |   4 -
 src/qt/locale/bitcoin_es.ts          |  13 +-
 src/qt/locale/bitcoin_es_DO.ts       |   4 -
 src/qt/locale/bitcoin_es_ES.ts       |   4 -
 src/qt/locale/bitcoin_et.ts          |   4 -
 src/qt/locale/bitcoin_fa.ts          |   4 -
 src/qt/locale/bitcoin_fi.ts          |   4 -
 src/qt/locale/bitcoin_fr.ts          |  12 +-
 src/qt/locale/bitcoin_fr_FR.ts       |   4 -
 src/qt/locale/bitcoin_gl.ts          |   4 -
 src/qt/locale/bitcoin_he.ts          |   4 -
 src/qt/locale/bitcoin_hu.ts          |   4 -
 src/qt/locale/bitcoin_id_ID.ts       |   4 -
 src/qt/locale/bitcoin_it.ts          |   4 -
 src/qt/locale/bitcoin_ja.ts          |  20 ++-
 src/qt/locale/bitcoin_ka.ts          |   4 -
 src/qt/locale/bitcoin_ko_KR.ts       |   4 -
 src/qt/locale/bitcoin_la.ts          |   4 -
 src/qt/locale/bitcoin_lv_LV.ts       |   4 -
 src/qt/locale/bitcoin_nb.ts          |   4 -
 src/qt/locale/bitcoin_nl.ts          |   4 -
 src/qt/locale/bitcoin_pl.ts          |  78 ++++++++++-
 src/qt/locale/bitcoin_pt_BR.ts       |  20 ++-
 src/qt/locale/bitcoin_pt_PT.ts       |   4 -
 src/qt/locale/bitcoin_ro_RO.ts       |   4 -
 src/qt/locale/bitcoin_ru.ts          |  10 +-
 src/qt/locale/bitcoin_sk.ts          |   4 -
 src/qt/locale/bitcoin_sl_SI.ts       |   4 -
 src/qt/locale/bitcoin_sr.ts          |  52 ++++++-
 src/qt/locale/bitcoin_sv.ts          | 198 +++++++++++++++++++++++++--
 src/qt/locale/bitcoin_th_TH.ts       |  16 ++-
 src/qt/locale/bitcoin_tr.ts          |   4 -
 src/qt/locale/bitcoin_uk.ts          |   4 -
 src/qt/locale/bitcoin_uz@Cyrl.ts     |   4 -
 src/qt/locale/bitcoin_zh_CN.ts       |   4 -
 src/qt/locale/bitcoin_zh_TW.ts       |  22 ++-
 49 files changed, 450 insertions(+), 201 deletions(-)

diff --git a/src/qt/locale/bitcoin_af.ts b/src/qt/locale/bitcoin_af.ts
index 8cbf5aadc5138..9726987b63b22 100644
--- a/src/qt/locale/bitcoin_af.ts
+++ b/src/qt/locale/bitcoin_af.ts
@@ -381,10 +381,6 @@
         <source>Processing blocks on disk...</source>
         <translation>Blokke op skyf word geprosesseer...</translation>
     </message>
-    <message>
-        <source>No block source available...</source>
-        <translation>Geen blokbron beskikbaar...</translation>
-    </message>
     <message>
         <source>%1 behind</source>
         <translation>%1 agter</translation>
diff --git a/src/qt/locale/bitcoin_ar.ts b/src/qt/locale/bitcoin_ar.ts
index 15c5158f217b0..9b865f29bff63 100644
--- a/src/qt/locale/bitcoin_ar.ts
+++ b/src/qt/locale/bitcoin_ar.ts
@@ -421,10 +421,6 @@
         <source>Processing blocks on disk...</source>
         <translation>معالجة الكتل على القرص...</translation>
     </message>
-    <message>
-        <source>No block source available...</source>
-        <translation>لا يوجد أي مصدر الكتلة</translation>
-    </message>
     <message>
         <source>%1 behind</source>
         <translation>خلف %1</translation>
diff --git a/src/qt/locale/bitcoin_be_BY.ts b/src/qt/locale/bitcoin_be_BY.ts
index d2c52f2c167d8..62f2ffc9e64da 100644
--- a/src/qt/locale/bitcoin_be_BY.ts
+++ b/src/qt/locale/bitcoin_be_BY.ts
@@ -389,10 +389,6 @@
         <source>&amp;Command-line options</source>
         <translation>Опцыі каманднага радка</translation>
     </message>
-    <message>
-        <source>No block source available...</source>
-        <translation>Крыніца блокаў недасяжная...</translation>
-    </message>
     <message>
         <source>%1 behind</source>
         <translation>%1 таму</translation>
diff --git a/src/qt/locale/bitcoin_bg.ts b/src/qt/locale/bitcoin_bg.ts
index 5a0fd2aec2302..c5716983043df 100644
--- a/src/qt/locale/bitcoin_bg.ts
+++ b/src/qt/locale/bitcoin_bg.ts
@@ -421,10 +421,6 @@
         <source>Processing blocks on disk...</source>
         <translation>Обработване на блокове на диска...</translation>
     </message>
-    <message>
-        <source>No block source available...</source>
-        <translation>Липсва източник на блоковете...</translation>
-    </message>
     <message>
         <source>%1 behind</source>
         <translation>%1 зад</translation>
diff --git a/src/qt/locale/bitcoin_ca.ts b/src/qt/locale/bitcoin_ca.ts
index fd5a197c3e213..84f51d18a866e 100644
--- a/src/qt/locale/bitcoin_ca.ts
+++ b/src/qt/locale/bitcoin_ca.ts
@@ -441,10 +441,6 @@
         <source>Processing blocks on disk...</source>
         <translation>S'estan processant els blocs al disc...</translation>
     </message>
-    <message>
-        <source>No block source available...</source>
-        <translation>No hi ha cap font de bloc disponible...</translation>
-    </message>
     <message numerus="yes">
         <source>Processed %n block(s) of transaction history.</source>
         <translation><numerusform>S'ha processat %n bloc de l'historial de transacció.</numerusform><numerusform>S'han processat %n blocs de l'historial de transacció.</numerusform></translation>
diff --git a/src/qt/locale/bitcoin_ca@valencia.ts b/src/qt/locale/bitcoin_ca@valencia.ts
index c4748c0afa82e..0123f8faab974 100644
--- a/src/qt/locale/bitcoin_ca@valencia.ts
+++ b/src/qt/locale/bitcoin_ca@valencia.ts
@@ -393,10 +393,6 @@
         <source>&amp;Command-line options</source>
         <translation>Opcions de la &amp;línia d'ordes</translation>
     </message>
-    <message>
-        <source>No block source available...</source>
-        <translation>No hi ha cap font de bloc disponible...</translation>
-    </message>
     <message>
         <source>%1 behind</source>
         <translation>%1 darrere</translation>
diff --git a/src/qt/locale/bitcoin_ca_ES.ts b/src/qt/locale/bitcoin_ca_ES.ts
index f88508a10fcdc..8cbb57bd3539d 100644
--- a/src/qt/locale/bitcoin_ca_ES.ts
+++ b/src/qt/locale/bitcoin_ca_ES.ts
@@ -441,10 +441,6 @@
         <source>Processing blocks on disk...</source>
         <translation>S'estan processant els blocs al disc...</translation>
     </message>
-    <message>
-        <source>No block source available...</source>
-        <translation>No hi ha cap font de bloc disponible...</translation>
-    </message>
     <message numerus="yes">
         <source>Processed %n block(s) of transaction history.</source>
         <translation><numerusform>S'ha processat %n bloc de l'historial de transacció.</numerusform><numerusform>S'han processat %n blocs de l'historial de transacció.</numerusform></translation>
diff --git a/src/qt/locale/bitcoin_cs.ts b/src/qt/locale/bitcoin_cs.ts
index 2e911af14cd23..67c595ab34ec7 100644
--- a/src/qt/locale/bitcoin_cs.ts
+++ b/src/qt/locale/bitcoin_cs.ts
@@ -441,10 +441,6 @@
         <source>Processing blocks on disk...</source>
         <translation>Zpracovávám bloky na disku...</translation>
     </message>
-    <message>
-        <source>No block source available...</source>
-        <translation>Není dostupný žádný zdroj bloků...</translation>
-    </message>
     <message numerus="yes">
         <source>Processed %n block(s) of transaction history.</source>
         <translation><numerusform>Zpracován %n blok transakční historie.</numerusform><numerusform>Zpracovány %n bloky transakční historie.</numerusform><numerusform>Zpracováno %n bloků transakční historie.</numerusform></translation>
@@ -2204,6 +2200,14 @@
         <source>Warning: Unknown change address</source>
         <translation>Upozornění: Neznámá adresa pro drobné</translation>
     </message>
+    <message>
+        <source>Confirm custom change address</source>
+        <translation>Potvrď vlastní adresu pro drobné</translation>
+    </message>
+    <message>
+        <source>The address you selected for change is not part of this wallet. Any or all funds in your wallet may be sent to this address. Are you sure?</source>
+        <translation>Adresa, kterou jsi zvolil pro drobné, není součástí této peněženky. Potenciálně všechny prostředky z tvé peněženky mohou být na tuto adresu odeslány. Souhlasíš, aby se tak stalo?</translation>
+    </message>
     <message>
         <source>(no label)</source>
         <translation>(bez označení)</translation>
@@ -3121,6 +3125,10 @@
         <source>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</source>
         <translation>Použít UPnP k namapování naslouchacího portu (výchozí: 1, pokud naslouchá a nepoužívá -proxy)</translation>
     </message>
+    <message>
+        <source>Username and hashed password for JSON-RPC connections. The field &lt;userpw&gt; comes in the format: &lt;USERNAME&gt;:&lt;SALT&gt;$&lt;HASH&gt;. A canonical python script is included in share/rpcuser. The client then connects normally using the rpcuser=&lt;USERNAME&gt;/rpcpassword=&lt;PASSWORD&gt; pair of arguments. This option can be specified multiple times</source>
+        <translation>Uživatelské jméno a zahašované heslo pro JSON-RPC spojení. Pole &lt;userpw&gt; má formát: &lt;UŽIVATELSKÉ_JMÉNO&gt;:&lt;SŮL&gt;$&lt;HAŠ&gt;. Pomocný pythonní skript je přiložen v share/rpcuser. Klient se pak už připojuje normálně pomocí páru argumentů rpcuser=&lt;UŽIVATELSKÉ_JMÉNO&gt;/rpcpassword=&lt;HESLO&gt;. Tuto volbu lze použít i vícekrát</translation>
+    </message>
     <message>
         <source>Wallet will not create transactions that violate mempool chain limits (default: %u)</source>
         <translation>Peněženka nebude vytvářet transakce, které by porušovaly limity transakčního zásobníku na řetězce (výchozí: %u)</translation>
diff --git a/src/qt/locale/bitcoin_da.ts b/src/qt/locale/bitcoin_da.ts
index 75eb5ae94da21..54ef4a2bdf5c5 100644
--- a/src/qt/locale/bitcoin_da.ts
+++ b/src/qt/locale/bitcoin_da.ts
@@ -329,6 +329,10 @@
         <source>Click to enable network activity again.</source>
         <translation>Klik for a aktivere netværksaktivitet igen.</translation>
     </message>
+    <message>
+        <source>Syncing Headers (%1%)...</source>
+        <translation>Synkroniserer hoveder (%1%)…</translation>
+    </message>
     <message>
         <source>Reindexing blocks on disk...</source>
         <translation>Genindekserer blokke på disken…</translation>
@@ -441,10 +445,6 @@
         <source>Processing blocks on disk...</source>
         <translation>Bearbejder blokke på disken…</translation>
     </message>
-    <message>
-        <source>No block source available...</source>
-        <translation>Ingen blokkilde tilgængelig…</translation>
-    </message>
     <message numerus="yes">
         <source>Processed %n block(s) of transaction history.</source>
         <translation><numerusform>Bearbejdede %n blok med transaktionshistorik.</numerusform><numerusform>Bearbejdede %n blokke med transaktionshistorik.</numerusform></translation>
@@ -485,6 +485,10 @@
         <source>%1 client</source>
         <translation>%1-klient</translation>
     </message>
+    <message>
+        <source>Connecting to peers...</source>
+        <translation>Forbinder til knuder…</translation>
+    </message>
     <message>
         <source>Catching up...</source>
         <translation>Indhenter…</translation>
@@ -3093,6 +3097,14 @@
         <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source>
         <translation>Udfør kommando, når en transaktion i tegnebogen ændres (%s i kommandoen erstattes med TxID)</translation>
     </message>
+    <message>
+        <source>Extra transactions to keep in memory for compact block reconstructions (default: %u)</source>
+        <translation>Ekstra transaktioner, der skal beholdes i hukommelsen til kompakte blokgenopbygninger (standard: %u)</translation>
+    </message>
+    <message>
+        <source>If this block is in the chain assume that it and its ancestors are valid and potentially skip their script verification (0 to verify all, default: %s, testnet: %s)</source>
+        <translation>Hvis denne blok er i kæden, så antag at den og dens forgængere er gyldige, og spring potentielt deres scriptverificering over (0 for at verificere alle, standard: %s, testnet: %s)</translation>
+    </message>
     <message>
         <source>Maximum allowed median peer time offset adjustment. Local perspective of time may be influenced by peers forward or backward by this amount. (default: %u seconds)</source>
         <translation>Justering af maksimalt tilladt gennemsnitlig afvigelse fra peer-tid. Den lokale opfattelse af tid kan blive påvirket frem eller tilbage af peers med denne mængde tid. (standard: %u sekunder)</translation>
@@ -3109,6 +3121,14 @@
         <source>Please contribute if you find %s useful. Visit %s for further information about the software.</source>
         <translation>Overvej venligst at bidrage til udviklingen, hvis du finder %s brugbar. Besøg %s for yderligere information om softwaren.</translation>
     </message>
+    <message>
+        <source>Reduce storage requirements by enabling pruning (deleting) of old blocks. This allows the pruneblockchain RPC to be called to delete specific blocks, and enables automatic pruning of old blocks if a target size in MiB is provided. This mode is incompatible with -txindex and -rescan. Warning: Reverting this setting requires re-downloading the entire blockchain. (default: 0 = disable pruning blocks, 1 = allow manual pruning via RPC, &gt;%u = automatically prune block files to stay under the specified target size in MiB)</source>
+        <translation>Reducér pladskravene ved at beskære (slette, "prune") gamle blokke. Dette tillader pruneblockchain-RPC'en at blive kaldt for at slette specifikke blokke, og det aktiverer automatisk beskæring af gamle blokke, hvis en målstørrelse i MiB er angivet. Denne tilstand er ikke kompatibel med -txindex og -rescan. Advarsel: Fortrydelse af denne indstilling kræver download af hele blokkæden igen. (standard: 0 = slå beskæring af blokke fra, 1 = tillad manuel beskæring via RPC, &gt;%u = beskær automatisk blokfiler for at bliver under den angivne målstørrelse i MiB)</translation>
+    </message>
+    <message>
+        <source>Set lowest fee rate (in %s/kB) for transactions to be included in block creation. (default: %s)</source>
+        <translation>Sæt den laveste gebyrrate (i %s/kB) for transaktioner, der skal inkluderes i blokoprettelse. (standard: %s)</translation>
+    </message>
     <message>
         <source>Set the number of script verification threads (%u to %d, 0 = auto, &lt;0 = leave that many cores free, default: %d)</source>
         <translation>Sæt antallet af scriptverificeringstråde (%u til %d, 0 = auto, &lt;0 = efterlad det antal kernet fri, standard: %d)</translation>
diff --git a/src/qt/locale/bitcoin_de.ts b/src/qt/locale/bitcoin_de.ts
index 59a45e3175728..af79d4773633c 100644
--- a/src/qt/locale/bitcoin_de.ts
+++ b/src/qt/locale/bitcoin_de.ts
@@ -329,6 +329,10 @@
         <source>Click to enable network activity again.</source>
         <translation>Klicken zum Aktivieren der Netzwerkaktivität.</translation>
     </message>
+    <message>
+        <source>Syncing Headers (%1%)...</source>
+        <translation>Kopfdaten werden synchronisiert (%1%)...</translation>
+    </message>
     <message>
         <source>Reindexing blocks on disk...</source>
         <translation>Reindiziere Blöcke auf Datenträger...</translation>
@@ -441,10 +445,6 @@
         <source>Processing blocks on disk...</source>
         <translation>Verarbeite Blöcke auf Datenträger...</translation>
     </message>
-    <message>
-        <source>No block source available...</source>
-        <translation>Keine Blockquelle verfügbar...</translation>
-    </message>
     <message numerus="yes">
         <source>Processed %n block(s) of transaction history.</source>
         <translation><numerusform>%n Block des Transaktionsverlaufs verarbeitet.</numerusform><numerusform>%n Blöcke des Transaktionsverlaufs verarbeitet.</numerusform></translation>
@@ -485,6 +485,10 @@
         <source>%1 client</source>
         <translation>%1 Client</translation>
     </message>
+    <message>
+        <source>Connecting to peers...</source>
+        <translation>Verbinde mit Netzwerk...</translation>
+    </message>
     <message>
         <source>Catching up...</source>
         <translation>Hole auf...</translation>
@@ -2192,6 +2196,10 @@
         <source>Warning: Unknown change address</source>
         <translation>Warnung: Unbekannte Wechselgeld-Adresse</translation>
     </message>
+    <message>
+        <source>Confirm custom change address</source>
+        <translation>Bestätige benutzerdefinierte Wechselgeld-Adresse</translation>
+    </message>
     <message>
         <source>(no label)</source>
         <translation>(keine Bezeichnung)</translation>
@@ -3101,6 +3109,10 @@
         <source>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</source>
         <translation>UPnP verwenden, um eine Portweiterleitung einzurichten (Standard: 1, wenn abgehört wird und -proxy nicht gesetzt ist)</translation>
     </message>
+    <message>
+        <source>Username and hashed password for JSON-RPC connections. The field &lt;userpw&gt; comes in the format: &lt;USERNAME&gt;:&lt;SALT&gt;$&lt;HASH&gt;. A canonical python script is included in share/rpcuser. The client then connects normally using the rpcuser=&lt;USERNAME&gt;/rpcpassword=&lt;PASSWORD&gt; pair of arguments. This option can be specified multiple times</source>
+        <translation>Benutzername und gehashtes Passwort für JSON-RPC Verbindungen. Das Feld &lt;userpw&gt; kommt im Format: &lt;USERNAME&gt;:&lt;SALT&gt;$&lt;HASH&gt;. Ein kanonisches Pythonskript ist in share/rpcuser inbegriffen. Der client benutzt wie gehabt, die rpcuser/rpcpassword Parameter. Diese Option kann mehrere Male spezifiziert werden</translation>
+    </message>
     <message>
         <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source>
         <translation>Warnung: Das Netzwerk scheint nicht vollständig übereinzustimmen! Einige Miner scheinen Probleme zu haben.</translation>
diff --git a/src/qt/locale/bitcoin_el_GR.ts b/src/qt/locale/bitcoin_el_GR.ts
index b1caab06b134e..0390a378e7717 100644
--- a/src/qt/locale/bitcoin_el_GR.ts
+++ b/src/qt/locale/bitcoin_el_GR.ts
@@ -245,10 +245,6 @@
         <source>&amp;Command-line options</source>
         <translation>&amp;Επιλογές γραμμής εντολών</translation>
     </message>
-    <message>
-        <source>No block source available...</source>
-        <translation>Η πηγή του μπλοκ δεν ειναι διαθέσιμη... </translation>
-    </message>
     <message>
         <source>%1 behind</source>
         <translation>%1 πίσω</translation>
diff --git a/src/qt/locale/bitcoin_en.ts b/src/qt/locale/bitcoin_en.ts
index dcfd86f366557..cc834a8b96af4 100644
--- a/src/qt/locale/bitcoin_en.ts
+++ b/src/qt/locale/bitcoin_en.ts
@@ -299,7 +299,7 @@
 <context>
     <name>BitcoinGUI</name>
     <message>
-        <location filename="../bitcoingui.cpp" line="+356"/>
+        <location filename="../bitcoingui.cpp" line="+357"/>
         <source>Sign &amp;message...</source>
         <translation>Sign &amp;message...</translation>
     </message>
@@ -1134,7 +1134,7 @@
     <message>
         <location line="+7"/>
         <location line="+26"/>
-        <location filename="../modaloverlay.cpp" line="+136"/>
+        <location filename="../modaloverlay.cpp" line="+138"/>
         <source>Unknown...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2533,7 +2533,7 @@
     <name>SendCoinsDialog</name>
     <message>
         <location filename="../forms/sendcoinsdialog.ui" line="+14"/>
-        <location filename="../sendcoinsdialog.cpp" line="+553"/>
+        <location filename="../sendcoinsdialog.cpp" line="+554"/>
         <source>Send Coins</source>
         <translation>Send Coins</translation>
     </message>
diff --git a/src/qt/locale/bitcoin_en_GB.ts b/src/qt/locale/bitcoin_en_GB.ts
index df3aad508762d..8af5db3e645eb 100644
--- a/src/qt/locale/bitcoin_en_GB.ts
+++ b/src/qt/locale/bitcoin_en_GB.ts
@@ -333,10 +333,6 @@
         <source>Processing blocks on disk...</source>
         <translation>Processing blocks on disk...</translation>
     </message>
-    <message>
-        <source>No block source available...</source>
-        <translation>No block source available...</translation>
-    </message>
     <message numerus="yes">
         <source>Processed %n block(s) of transaction history.</source>
         <translation><numerusform>Processed %n block of transaction history.</numerusform><numerusform>Processed %n blocks of transaction history.</numerusform></translation>
diff --git a/src/qt/locale/bitcoin_eo.ts b/src/qt/locale/bitcoin_eo.ts
index 2337c2bd2981d..b4ed5e7fd503f 100644
--- a/src/qt/locale/bitcoin_eo.ts
+++ b/src/qt/locale/bitcoin_eo.ts
@@ -241,10 +241,6 @@
         <source>&amp;Command-line options</source>
         <translation>&amp;Komandliniaj agordaĵoj</translation>
     </message>
-    <message>
-        <source>No block source available...</source>
-        <translation>Neniu fonto de blokoj trovebla...</translation>
-    </message>
     <message>
         <source>%1 behind</source>
         <translation>mankas %1</translation>
diff --git a/src/qt/locale/bitcoin_es.ts b/src/qt/locale/bitcoin_es.ts
index b1e35148d7a96..fc71bf841be38 100644
--- a/src/qt/locale/bitcoin_es.ts
+++ b/src/qt/locale/bitcoin_es.ts
@@ -329,6 +329,10 @@
         <source>Click to enable network activity again.</source>
         <translation>Pulsar para volver a habilitar la actividad de red.</translation>
     </message>
+    <message>
+        <source>Syncing Headers (%1%)...</source>
+        <translation>Sincronizando cabeceras (%1%)</translation>
+    </message>
     <message>
         <source>Reindexing blocks on disk...</source>
         <translation>Reindexando bloques en disco...</translation>
@@ -441,10 +445,6 @@
         <source>Processing blocks on disk...</source>
         <translation>Procesando bloques en disco...</translation>
     </message>
-    <message>
-        <source>No block source available...</source>
-        <translation>Ninguna fuente de bloques disponible...</translation>
-    </message>
     <message numerus="yes">
         <source>Processed %n block(s) of transaction history.</source>
         <translation><numerusform>%n bloque procesado del historial de transacciones.</numerusform><numerusform>%n bloques procesados del historial de transacciones.</numerusform></translation>
@@ -3618,6 +3618,11 @@
         <source>Output debugging information (default: %u, supplying &lt;category&gt; is optional)</source>
         <translation>Mostrar depuración (por defecto: %u, proporcionar &lt;category&gt; es opcional)</translation>
     </message>
+    <message>
+        <source>Sets the serialization of raw transaction or block hex returned in non-verbose mode, non-segwit(0) or segwit(1) (default: %d)</source>
+        <translation>https://www.transifex.com/joyful-world/breaking-english/
+Establecer la serialización de las transacciones sin procesar o el bloque hex devuelto en non-verbose mode, non-segwit(O) o segwit(1) (default: %d)</translation>
+    </message>
     <message>
         <source>Support filtering of blocks and transaction with bloom filters (default: %u)</source>
         <translation>Admite filtrado de bloques, y transacciones con filtros Bloom. Reduce la carga de red. ( por defecto :%u)</translation>
diff --git a/src/qt/locale/bitcoin_es_DO.ts b/src/qt/locale/bitcoin_es_DO.ts
index eb6583083b029..77e6ef16f3390 100644
--- a/src/qt/locale/bitcoin_es_DO.ts
+++ b/src/qt/locale/bitcoin_es_DO.ts
@@ -237,10 +237,6 @@
         <source>&amp;Command-line options</source>
         <translation>&amp;Opciones de linea de comando</translation>
     </message>
-    <message>
-        <source>No block source available...</source>
-        <translation>Ninguna fuente de bloques disponible ...</translation>
-    </message>
     <message>
         <source>%1 behind</source>
         <translation>%1 atrás</translation>
diff --git a/src/qt/locale/bitcoin_es_ES.ts b/src/qt/locale/bitcoin_es_ES.ts
index 996b209ea21d7..7865483183d9f 100644
--- a/src/qt/locale/bitcoin_es_ES.ts
+++ b/src/qt/locale/bitcoin_es_ES.ts
@@ -429,10 +429,6 @@
         <source>Processing blocks on disk...</source>
         <translation>Procesando bloques en disco...</translation>
     </message>
-    <message>
-        <source>No block source available...</source>
-        <translation>Ninguna fuente de bloques disponible ...</translation>
-    </message>
     <message numerus="yes">
         <source>Processed %n block(s) of transaction history.</source>
         <translation><numerusform>%n bloque procesado del historial de transacciones.</numerusform><numerusform>%n bloques procesados del historial de transacciones.</numerusform></translation>
diff --git a/src/qt/locale/bitcoin_et.ts b/src/qt/locale/bitcoin_et.ts
index 0512b9f117d98..f95b01d33b917 100644
--- a/src/qt/locale/bitcoin_et.ts
+++ b/src/qt/locale/bitcoin_et.ts
@@ -385,10 +385,6 @@
         <source>Processing blocks on disk...</source>
         <translation>Kõvakettal olevate plokkide töötlemine...</translation>
     </message>
-    <message>
-        <source>No block source available...</source>
-        <translation>Plokkide allikas pole saadaval...</translation>
-    </message>
     <message numerus="yes">
         <source>Processed %n block(s) of transaction history.</source>
         <translation><numerusform>Töödeldud %n plokk transaktsioonide ajaloost.</numerusform><numerusform>Töödeldud %n plokki transaktsioonide ajaloost.</numerusform></translation>
diff --git a/src/qt/locale/bitcoin_fa.ts b/src/qt/locale/bitcoin_fa.ts
index c1061822ca99f..c9cfad0f2a56c 100644
--- a/src/qt/locale/bitcoin_fa.ts
+++ b/src/qt/locale/bitcoin_fa.ts
@@ -357,10 +357,6 @@
         <source>Processing blocks on disk...</source>
         <translation>پردازش بلوک‌ها روی دیسک...</translation>
     </message>
-    <message>
-        <source>No block source available...</source>
-        <translation>منبعی برای دریافت بلاک در دسترس نیست...</translation>
-    </message>
     <message numerus="yes">
         <source>Processed %n block(s) of transaction history.</source>
         <translation><numerusform>پردازش %n  بلاک از تاریخچه ی تراکنش ها </numerusform></translation>
diff --git a/src/qt/locale/bitcoin_fi.ts b/src/qt/locale/bitcoin_fi.ts
index ba8880c4aac3a..ef76abc098e13 100644
--- a/src/qt/locale/bitcoin_fi.ts
+++ b/src/qt/locale/bitcoin_fi.ts
@@ -273,10 +273,6 @@
         <source>Processing blocks on disk...</source>
         <translation>Käsitellään lohkoja levyllä...</translation>
     </message>
-    <message>
-        <source>No block source available...</source>
-        <translation>Lohkojen lähdettä ei saatavilla...</translation>
-    </message>
     <message numerus="yes">
         <source>Processed %n block(s) of transaction history.</source>
         <translation><numerusform>Prosessoitu %n lohko rahansiirtohistoriasta.</numerusform><numerusform>Prosessoitu %n lohkoa rahansiirtohistoriasta.</numerusform></translation>
diff --git a/src/qt/locale/bitcoin_fr.ts b/src/qt/locale/bitcoin_fr.ts
index 23b4d2a66fa1c..92682ff297a45 100644
--- a/src/qt/locale/bitcoin_fr.ts
+++ b/src/qt/locale/bitcoin_fr.ts
@@ -441,10 +441,6 @@
         <source>Processing blocks on disk...</source>
         <translation>Traitement des blocs sur le disque...</translation>
     </message>
-    <message>
-        <source>No block source available...</source>
-        <translation>Aucune source de blocs disponible...</translation>
-    </message>
     <message numerus="yes">
         <source>Processed %n block(s) of transaction history.</source>
         <translation><numerusform>%n bloc d'historique transactionnel a été traité</numerusform><numerusform>%n blocs d'historique transactionnel ont été traités</numerusform></translation>
@@ -485,6 +481,10 @@
         <source>%1 client</source>
         <translation>Client %1</translation>
     </message>
+    <message>
+        <source>Connecting to peers...</source>
+        <translation>Connexion aux pairs...</translation>
+    </message>
     <message>
         <source>Catching up...</source>
         <translation>Rattrapage…</translation>
@@ -3093,6 +3093,10 @@
         <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source>
         <translation>Exécuter la commande lorsqu'une transaction de porte-monnaie change (%s dans la commande est remplacée par TxID)</translation>
     </message>
+    <message>
+        <source>If this block is in the chain assume that it and its ancestors are valid and potentially skip their script verification (0 to verify all, default: %s, testnet: %s)</source>
+        <translation>Si ce bloc est dans la chaîne, supposer qu'il est valide, ainsi que ces ancêtres, et ignorer potentiellement la vérification de leur script (0 pour tout vérifier, valeur par défaut : %s, réseau de test : %s)</translation>
+    </message>
     <message>
         <source>Maximum allowed median peer time offset adjustment. Local perspective of time may be influenced by peers forward or backward by this amount. (default: %u seconds)</source>
         <translation>Réglage moyen maximal autorisé de décalage de l'heure d'un pair. La perspective locale du temps peut être influencée par les pairs, en avance ou en retard, de cette valeur. (Par défaut : %u secondes)</translation>
diff --git a/src/qt/locale/bitcoin_fr_FR.ts b/src/qt/locale/bitcoin_fr_FR.ts
index d53baed462338..4d02aa5114d62 100644
--- a/src/qt/locale/bitcoin_fr_FR.ts
+++ b/src/qt/locale/bitcoin_fr_FR.ts
@@ -261,10 +261,6 @@
         <source>Indexing blocks on disk...</source>
         <translation>Indexation des blocs sur le disque...</translation>
     </message>
-    <message>
-        <source>No block source available...</source>
-        <translation>Aucun bloc source disponible</translation>
-    </message>
     <message>
         <source>%1 behind</source>
         <translation>en retard de %1</translation>
diff --git a/src/qt/locale/bitcoin_gl.ts b/src/qt/locale/bitcoin_gl.ts
index 5d31c632ac9d2..ff0804d79b52b 100644
--- a/src/qt/locale/bitcoin_gl.ts
+++ b/src/qt/locale/bitcoin_gl.ts
@@ -225,10 +225,6 @@
         <source>&amp;Command-line options</source>
         <translation>Opcións da liña de comandos</translation>
     </message>
-    <message>
-        <source>No block source available...</source>
-        <translation>Non hai orixe de bloques dispoñible...</translation>
-    </message>
     <message>
         <source>%1 behind</source>
         <translation>%1 detrás</translation>
diff --git a/src/qt/locale/bitcoin_he.ts b/src/qt/locale/bitcoin_he.ts
index 9293b794ad342..78ef446ff1b29 100644
--- a/src/qt/locale/bitcoin_he.ts
+++ b/src/qt/locale/bitcoin_he.ts
@@ -317,10 +317,6 @@
         <source>Processing blocks on disk...</source>
         <translation>מעבד בלוקים על הדיסק...</translation>
     </message>
-    <message>
-        <source>No block source available...</source>
-        <translation>אין מקור מקטעים זמין…</translation>
-    </message>
     <message>
         <source>%1 behind</source>
         <translation>%1 מאחור</translation>
diff --git a/src/qt/locale/bitcoin_hu.ts b/src/qt/locale/bitcoin_hu.ts
index 49b9dc7d1c8ac..28270e8c2e159 100644
--- a/src/qt/locale/bitcoin_hu.ts
+++ b/src/qt/locale/bitcoin_hu.ts
@@ -257,10 +257,6 @@
         <source>%n active connection(s) to Bitcoin network</source>
         <translation><numerusform>%n aktív kapcsolat a Bitcoin hálózathoz</numerusform><numerusform>%n aktív kapcsolat a Bitcoin hálózathoz</numerusform></translation>
     </message>
-    <message>
-        <source>No block source available...</source>
-        <translation>Blokk forrása ismeretlen...</translation>
-    </message>
     <message numerus="yes">
         <source>Processed %n block(s) of transaction history.</source>
         <translation><numerusform>%n blokk feldolgozva a tranzakció előzményből.</numerusform><numerusform>%n blokk feldolgozva a tranzakció előzményből.</numerusform></translation>
diff --git a/src/qt/locale/bitcoin_id_ID.ts b/src/qt/locale/bitcoin_id_ID.ts
index 5cc5d71c6de5d..fd77f07cd854f 100644
--- a/src/qt/locale/bitcoin_id_ID.ts
+++ b/src/qt/locale/bitcoin_id_ID.ts
@@ -253,10 +253,6 @@
         <source>%n active connection(s) to Bitcoin network</source>
         <translation><numerusform>%n koneksi aktif ke jaringan Bitcoin</numerusform></translation>
     </message>
-    <message>
-        <source>No block source available...</source>
-        <translation>Sumber blok tidak tersedia...</translation>
-    </message>
     <message numerus="yes">
         <source>Processed %n block(s) of transaction history.</source>
         <translation><numerusform>%n blok dari riwayat transaksi diproses.</numerusform></translation>
diff --git a/src/qt/locale/bitcoin_it.ts b/src/qt/locale/bitcoin_it.ts
index 1e359e52e58a6..484e7f86bd2bc 100644
--- a/src/qt/locale/bitcoin_it.ts
+++ b/src/qt/locale/bitcoin_it.ts
@@ -401,10 +401,6 @@
         <source>Processing blocks on disk...</source>
         <translation>Processando i blocchi su disco...</translation>
     </message>
-    <message>
-        <source>No block source available...</source>
-        <translation>Nessuna fonte di blocchi disponibile...</translation>
-    </message>
     <message numerus="yes">
         <source>Processed %n block(s) of transaction history.</source>
         <translation><numerusform>Elaborato %n blocco dello storico transazioni.</numerusform><numerusform>Elaborati %n blocchi dello storico transazioni.</numerusform></translation>
diff --git a/src/qt/locale/bitcoin_ja.ts b/src/qt/locale/bitcoin_ja.ts
index 0f3c9e596a7ec..f81818896fcf1 100644
--- a/src/qt/locale/bitcoin_ja.ts
+++ b/src/qt/locale/bitcoin_ja.ts
@@ -329,6 +329,10 @@
         <source>Click to enable network activity again.</source>
         <translation>クリックするとネットワーク活動を再び有効化します。</translation>
     </message>
+    <message>
+        <source>Syncing Headers (%1%)...</source>
+        <translation>未知。ヘッダを同期しています (%1%)...</translation>
+    </message>
     <message>
         <source>Reindexing blocks on disk...</source>
         <translation>ディスク上のブロックのインデックスを再作成中...</translation>
@@ -441,10 +445,6 @@
         <source>Processing blocks on disk...</source>
         <translation>ディスク上のブロックを処理しています...</translation>
     </message>
-    <message>
-        <source>No block source available...</source>
-        <translation>利用可能なブロックがありません...</translation>
-    </message>
     <message numerus="yes">
         <source>Processed %n block(s) of transaction history.</source>
         <translation><numerusform>トランザクション履歴の %n ブロックを処理しました。</numerusform></translation>
@@ -485,6 +485,10 @@
         <source>%1 client</source>
         <translation>%1 クライアント</translation>
     </message>
+    <message>
+        <source>Connecting to peers...</source>
+        <translation>ピアに接続しています...</translation>
+    </message>
     <message>
         <source>Catching up...</source>
         <translation>追跡中...</translation>
@@ -3093,6 +3097,14 @@
         <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source>
         <translation>ウォレットの取引を変更する際にコマンドを実行 (cmd の %s は TxID に置換される)</translation>
     </message>
+    <message>
+        <source>Extra transactions to keep in memory for compact block reconstructions (default: %u)</source>
+        <translation>コンパクトブロック再構成のために追加のトランザクションをメモリ内に保管しておく (デフォルト: %u)</translation>
+    </message>
+    <message>
+        <source>If this block is in the chain assume that it and its ancestors are valid and potentially skip their script verification (0 to verify all, default: %s, testnet: %s)</source>
+        <translation>このブロックがブロックチェーン内に含まれていた場合には、このブロックおよびそれ以前のすべてのブロックを有効であるとみなし、スクリプトの検証を省略する (0ならすべてを検証、デフォルト: %s、テストネット: %s)</translation>
+    </message>
     <message>
         <source>Maximum allowed median peer time offset adjustment. Local perspective of time may be influenced by peers forward or backward by this amount. (default: %u seconds)</source>
         <translation>時間オフセット調整値のピア中央値に対する最大の許容値。ローカル時間の見込み値は、接続するピアにより前方ないし後方へ影響されます。(初期値: %u 秒)</translation>
diff --git a/src/qt/locale/bitcoin_ka.ts b/src/qt/locale/bitcoin_ka.ts
index 920f44758a6b1..14378ebea16a6 100644
--- a/src/qt/locale/bitcoin_ka.ts
+++ b/src/qt/locale/bitcoin_ka.ts
@@ -237,10 +237,6 @@
         <source>&amp;Command-line options</source>
         <translation>საკომანდო სტრიქონის ოპ&amp;ციები</translation>
     </message>
-    <message>
-        <source>No block source available...</source>
-        <translation>ბლოკების წყარო მიუწვდომელია...</translation>
-    </message>
     <message>
         <source>%1 behind</source>
         <translation>%1 გავლილია</translation>
diff --git a/src/qt/locale/bitcoin_ko_KR.ts b/src/qt/locale/bitcoin_ko_KR.ts
index b5af4602c8664..9b5c1c077ef51 100644
--- a/src/qt/locale/bitcoin_ko_KR.ts
+++ b/src/qt/locale/bitcoin_ko_KR.ts
@@ -429,10 +429,6 @@
         <source>Processing blocks on disk...</source>
         <translation>디스크에서 블록 처리중...</translation>
     </message>
-    <message>
-        <source>No block source available...</source>
-        <translation>사용 가능한 블록이 없습니다...</translation>
-    </message>
     <message numerus="yes">
         <source>Processed %n block(s) of transaction history.</source>
         <translation><numerusform>%n 블럭 만큼의 거래 기록이 처리됨.</numerusform></translation>
diff --git a/src/qt/locale/bitcoin_la.ts b/src/qt/locale/bitcoin_la.ts
index 3b67fa1e74479..d84dd7e4e229d 100644
--- a/src/qt/locale/bitcoin_la.ts
+++ b/src/qt/locale/bitcoin_la.ts
@@ -193,10 +193,6 @@
         <source>&amp;Command-line options</source>
         <translation>Optiones mandati initiantis</translation>
     </message>
-    <message>
-        <source>No block source available...</source>
-        <translation>Nulla fons frustorum absens...</translation>
-    </message>
     <message>
         <source>%1 behind</source>
         <translation>%1 post</translation>
diff --git a/src/qt/locale/bitcoin_lv_LV.ts b/src/qt/locale/bitcoin_lv_LV.ts
index 750e0ff28df44..2953da443ab5c 100644
--- a/src/qt/locale/bitcoin_lv_LV.ts
+++ b/src/qt/locale/bitcoin_lv_LV.ts
@@ -229,10 +229,6 @@
         <source>&amp;Command-line options</source>
         <translation>&amp;Komandrindas iespējas</translation>
     </message>
-    <message>
-        <source>No block source available...</source>
-        <translation>Nav pieejams neviens bloku avots...</translation>
-    </message>
     <message>
         <source>%1 behind</source>
         <translation>%1 aizmugurē</translation>
diff --git a/src/qt/locale/bitcoin_nb.ts b/src/qt/locale/bitcoin_nb.ts
index 1f76fdb0b3f5b..183cbac80aaed 100644
--- a/src/qt/locale/bitcoin_nb.ts
+++ b/src/qt/locale/bitcoin_nb.ts
@@ -265,10 +265,6 @@
         <source>%n active connection(s) to Bitcoin network</source>
         <translation><numerusform>%n aktiv forbindelse til Bitcoin-nettverket</numerusform><numerusform>%n aktive forbindelser til Bitcoin-nettverket</numerusform></translation>
     </message>
-    <message>
-        <source>No block source available...</source>
-        <translation>Ingen kilde for blokker tilgjengelig...</translation>
-    </message>
     <message numerus="yes">
         <source>Processed %n block(s) of transaction history.</source>
         <translation><numerusform>Lastet %n blokk med transaksjonshistorikk.</numerusform><numerusform>Lastet %n blokker med transaksjonshistorikk.</numerusform></translation>
diff --git a/src/qt/locale/bitcoin_nl.ts b/src/qt/locale/bitcoin_nl.ts
index 9094cd40a556d..2b625b5a078b9 100644
--- a/src/qt/locale/bitcoin_nl.ts
+++ b/src/qt/locale/bitcoin_nl.ts
@@ -429,10 +429,6 @@
         <source>Processing blocks on disk...</source>
         <translation>Bezig met verwerken van blokken op harde schijf...</translation>
     </message>
-    <message>
-        <source>No block source available...</source>
-        <translation>Geen bron voor blokken beschikbaar...</translation>
-    </message>
     <message numerus="yes">
         <source>Processed %n block(s) of transaction history.</source>
         <translation><numerusform>%n blok aan transactiegeschiedenis verwerkt.</numerusform><numerusform>%n blokken aan transactiegeschiedenis verwerkt.</numerusform></translation>
diff --git a/src/qt/locale/bitcoin_pl.ts b/src/qt/locale/bitcoin_pl.ts
index ab6fb41870e1a..46348140700e7 100644
--- a/src/qt/locale/bitcoin_pl.ts
+++ b/src/qt/locale/bitcoin_pl.ts
@@ -167,14 +167,34 @@
         <source>Confirm wallet encryption</source>
         <translation>Potwierdź szyfrowanie portfela</translation>
     </message>
+    <message>
+        <source>Warning: If you encrypt your wallet and lose your passphrase, you will &lt;b&gt;LOSE ALL OF YOUR BITCOINS&lt;/b&gt;!</source>
+        <translation>Uwaga: jeśli zaszyfrujesz swój portfel i zgubisz hasło &lt;b&gt;STRACISZ WSZYSTKIE SWOJE BITCOINY&lt;/b&gt;!</translation>
+    </message>
+    <message>
+        <source>Are you sure you wish to encrypt your wallet?</source>
+        <translation>Jesteś pewien, że chcesz zaszyfrować swój portfel?</translation>
+    </message>
     <message>
         <source>Wallet encrypted</source>
         <translation>Portfel zaszyfrowany</translation>
     </message>
+    <message>
+        <source>%1 will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source>
+        <translation>%1 zamknie się aby dokończyć proces szyfrowania. Pamiętaj, że szyfrowanie portfela nie zabezpiecza w pełni Twoich bitcoinów przed kradzieżą przez wirusy lub trojany mogące zainfekować Twój komputer.</translation>
+    </message>
+    <message>
+        <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source>
+        <translation>WAŻNE: Wszystkie wykonane wcześniej kopie pliku portfela powinny być zamienione na nowe, szyfrowane pliki. Z powodów bezpieczeństwa, poprzednie kopie nieszyfrowanych plików portfela staną się bezużyteczne jak tylko zaczniesz korzystać z nowego, szyfrowanego portfela.</translation>
+    </message>
     <message>
         <source>Wallet encryption failed</source>
         <translation>Szyfrowanie portfela nie powiodło się</translation>
     </message>
+    <message>
+        <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
+        <translation>Szyfrowanie portfela nie powiodło się z powodu wewnętrznego błędu. Twój portfel nie został zaszyfrowany.</translation>
+    </message>
     <message>
         <source>The supplied passphrases do not match.</source>
         <translation>Podane hasła nie są takie same.</translation>
@@ -409,10 +429,6 @@
         <source>Processing blocks on disk...</source>
         <translation>Przetwarzanie blocks on disk...</translation>
     </message>
-    <message>
-        <source>No block source available...</source>
-        <translation>Brak dostępnych źródeł bloków...</translation>
-    </message>
     <message numerus="yes">
         <source>Processed %n block(s) of transaction history.</source>
         <translation><numerusform>Przetworzono %n bloków historii transakcji.</numerusform><numerusform>Przetworzono %n bloków historii transakcji.</numerusform><numerusform>Przetworzono %n bloków historii transakcji.</numerusform></translation>
@@ -1980,10 +1996,34 @@
         <source>%1 to %2</source>
         <translation>%1 do %2</translation>
     </message>
+    <message>
+        <source>or</source>
+        <translation>lub</translation>
+    </message>
+    <message>
+        <source>The amount to pay must be larger than 0.</source>
+        <translation>Kwota do zapłacenia musi być większa od 0.</translation>
+    </message>
+    <message>
+        <source>Transaction creation failed!</source>
+        <translation>Utworzenie transakcji nie powiodło się!</translation>
+    </message>
     <message>
         <source>Payment request expired.</source>
         <translation>Żądanie płatności upłynęło.</translation>
     </message>
+    <message>
+        <source>Pay only the required fee of %1</source>
+        <translation>Zapłać tylko wymaganą opłatę w wysokości %1</translation>
+    </message>
+    <message>
+        <source>Warning: Invalid Bitcoin address</source>
+        <translation>Ostrzeżenie: nieprawidłowy adres Bitcoin</translation>
+    </message>
+    <message>
+        <source>Warning: Unknown change address</source>
+        <translation>Ostrzeżenie: Nieznany adres reszty</translation>
+    </message>
     <message>
         <source>(no label)</source>
         <translation>(brak etykiety)</translation>
@@ -2070,7 +2110,11 @@
     </context>
 <context>
     <name>SendConfirmationDialog</name>
-    </context>
+    <message>
+        <source>Yes</source>
+        <translation>Tak</translation>
+    </message>
+</context>
 <context>
     <name>ShutdownWindow</name>
     <message>
@@ -2169,6 +2213,22 @@ Zwróć uwagę, że poprawnie zweryfikowana wiadomość potwierdza to, że nadaw
         <source>Reset all verify message fields</source>
         <translation>Resetuje wszystkie pola weryfikacji wiadomości</translation>
     </message>
+    <message>
+        <source>Wallet unlock was cancelled.</source>
+        <translation>Odblokowanie portfela zostało anulowane.</translation>
+    </message>
+    <message>
+        <source>Private key for the entered address is not available.</source>
+        <translation>Klucz prywatny dla podanego adresu nie jest dostępny.</translation>
+    </message>
+    <message>
+        <source>Message signing failed.</source>
+        <translation>Podpisanie wiadomości nie powiodło się.</translation>
+    </message>
+    <message>
+        <source>Message signed.</source>
+        <translation>Wiadomość podpisana.</translation>
+    </message>
     </context>
 <context>
     <name>SplashScreen</name>
@@ -2730,6 +2790,10 @@ Zwróć uwagę, że poprawnie zweryfikowana wiadomość potwierdza to, że nadaw
         <source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source>
         <translation>Uruchom polecenie przy otrzymaniu odpowiedniego powiadomienia lub gdy zobaczymy naprawdę długie rozgałęzienie (%s w poleceniu jest podstawiane za komunikat)</translation>
     </message>
+    <message>
+        <source>Fees (in %s/kB) smaller than this are considered zero fee for relaying, mining and transaction creation (default: %s)</source>
+        <translation>Opłaty (w %s/Kb) mniejsze niż ta, będą traktowane jako zerowe przy tworzeniu, przesyłaniu i zatwierdzaniu transakcji (domyślnie: %s)</translation>
+    </message>
     <message>
         <source>If paytxfee is not set, include enough fee so transactions begin confirmation on average within n blocks (default: %u)</source>
         <translation>Jeżeli nie ustawiono paytxfee, dołącz wystarczająca opłatę, aby transakcja mogła zostać zatwierdzona w ciągu średniej ilości n bloków (domyślnie: %u)</translation>
@@ -2750,6 +2814,10 @@ Zwróć uwagę, że poprawnie zweryfikowana wiadomość potwierdza to, że nadaw
         <source>The transaction amount is too small to send after the fee has been deducted</source>
         <translation>Zbyt niska kwota transakcji do wysłania po odjęciu opłaty</translation>
     </message>
+    <message>
+        <source>Use hierarchical deterministic key generation (HD) after BIP32. Only has effect during wallet creation/first start</source>
+        <translation>Użyj hierarchicznej deterministycznej metody generowania kluczy (HD) zgodnie z BIP32. Ma znaczenie tylko podczas tworzenia portfela/pierwszego startu.</translation>
+    </message>
     <message>
         <source>Whitelisted peers cannot be DoS banned and their transactions are always relayed, even if they are already in the mempool, useful e.g. for a gateway</source>
         <translation>Węzły z białej listy nie mogą zostać zbanowane za ataki DoS, a ich transakcje będą zawsze przekazywane, nawet jeżeli będą znajdywać się już w pamięci, przydatne np. dla bramek płatniczych</translation>
diff --git a/src/qt/locale/bitcoin_pt_BR.ts b/src/qt/locale/bitcoin_pt_BR.ts
index e9ef5258f6e5a..c6370353030e6 100644
--- a/src/qt/locale/bitcoin_pt_BR.ts
+++ b/src/qt/locale/bitcoin_pt_BR.ts
@@ -325,6 +325,10 @@
         <source>Click to enable network activity again.</source>
         <translation>Clique para ativar a atividade de rede.</translation>
     </message>
+    <message>
+        <source>Syncing Headers (%1%)...</source>
+        <translation>Sincronizando cabeçahos (%1%)...</translation>
+    </message>
     <message>
         <source>Reindexing blocks on disk...</source>
         <translation>Reindexando blocos no disco...</translation>
@@ -437,10 +441,6 @@
         <source>Processing blocks on disk...</source>
         <translation>Processando blocos no disco...</translation>
     </message>
-    <message>
-        <source>No block source available...</source>
-        <translation>Nenhum servidor disponível...</translation>
-    </message>
     <message numerus="yes">
         <source>Processed %n block(s) of transaction history.</source>
         <translation><numerusform>%n bloco processado do histórico de transações.</numerusform><numerusform>%n blocos processados do histórico de transações.</numerusform></translation>
@@ -481,6 +481,10 @@
         <source>%1 client</source>
         <translation>%1</translation>
     </message>
+    <message>
+        <source>Connecting to peers...</source>
+        <translation>Conectando...</translation>
+    </message>
     <message>
         <source>Catching up...</source>
         <translation>Recuperando o atraso ...</translation>
@@ -3085,6 +3089,14 @@
         <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source>
         <translation>Executa um comando quando uma transação da carteira mudar (%s no comando será substituído por TxID)</translation>
     </message>
+    <message>
+        <source>Extra transactions to keep in memory for compact block reconstructions (default: %u)</source>
+        <translation>Transações extras para manter na memória para reconstruções de blocos compactos (padrão: %u)</translation>
+    </message>
+    <message>
+        <source>If this block is in the chain assume that it and its ancestors are valid and potentially skip their script verification (0 to verify all, default: %s, testnet: %s)</source>
+        <translation>Se este bloco está no blockchain, assume-se que ele e seus ancestrais são válidos e podem ignorar a verificação de scripts (0 para verificar todos, padrão: %s, testnet: %s)</translation>
+    </message>
     <message>
         <source>Maximum allowed median peer time offset adjustment. Local perspective of time may be influenced by peers forward or backward by this amount. (default: %u seconds)</source>
         <translation>A media máxima permitida de peer time compensa o ajuste. Perspectiva local de horário pode ser influenciada por pares à frente ou atrás neste montante. (padrão: %u segundos)</translation>
diff --git a/src/qt/locale/bitcoin_pt_PT.ts b/src/qt/locale/bitcoin_pt_PT.ts
index 785cc537b76c6..c97272d4b73b3 100644
--- a/src/qt/locale/bitcoin_pt_PT.ts
+++ b/src/qt/locale/bitcoin_pt_PT.ts
@@ -417,10 +417,6 @@
         <source>Processing blocks on disk...</source>
         <translation>A processar blocos no disco...</translation>
     </message>
-    <message>
-        <source>No block source available...</source>
-        <translation>Nenhuma fonte de blocos disponível...</translation>
-    </message>
     <message numerus="yes">
         <source>Processed %n block(s) of transaction history.</source>
         <translation><numerusform>Processado %n bloco do histórico de transações.</numerusform><numerusform>Processados %n blocos do histórico de transações.</numerusform></translation>
diff --git a/src/qt/locale/bitcoin_ro_RO.ts b/src/qt/locale/bitcoin_ro_RO.ts
index 92fc87f4f2cae..3d3a4b04316fc 100644
--- a/src/qt/locale/bitcoin_ro_RO.ts
+++ b/src/qt/locale/bitcoin_ro_RO.ts
@@ -253,10 +253,6 @@
         <source>%n active connection(s) to Bitcoin network</source>
         <translation><numerusform>%n conexiune activă către reţeaua Bitcoin</numerusform><numerusform>%n conexiuni active către reţeaua Bitcoin</numerusform><numerusform>%n de conexiuni active către reţeaua Bitcoin</numerusform></translation>
     </message>
-    <message>
-        <source>No block source available...</source>
-        <translation>Nici o sursă de bloc disponibilă...</translation>
-    </message>
     <message numerus="yes">
         <source>Processed %n block(s) of transaction history.</source>
         <translation><numerusform>S-a procesat %n bloc din istoricul tranzacţiilor.</numerusform><numerusform>S-au procesat %n blocuri din istoricul tranzacţiilor.</numerusform><numerusform>S-au procesat %n de blocuri din istoricul tranzacţiilor.</numerusform></translation>
diff --git a/src/qt/locale/bitcoin_ru.ts b/src/qt/locale/bitcoin_ru.ts
index 8dd94ff2204ad..b5f40fc058900 100644
--- a/src/qt/locale/bitcoin_ru.ts
+++ b/src/qt/locale/bitcoin_ru.ts
@@ -63,7 +63,7 @@
     </message>
     <message>
         <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source>
-        <translation>Это ваши адреса Bitcoin для отправки платежей. Всегда проверяйте количество и адрес получателя перед отправкой перевода.</translation>
+        <translation>Это ваши адреса Bitcoin для отправки платежей. Всегда проверяйте сумму и адрес получателя перед отправкой перевода.</translation>
     </message>
     <message>
         <source>These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source>
@@ -441,10 +441,6 @@
         <source>Processing blocks on disk...</source>
         <translation>Обработка блоков на диске...</translation>
     </message>
-    <message>
-        <source>No block source available...</source>
-        <translation>Источник блоков недоступен...</translation>
-    </message>
     <message numerus="yes">
         <source>Processed %n block(s) of transaction history.</source>
         <translation><numerusform>Обработан %n блок истории транзакций.</numerusform><numerusform>Обработано %n блока истории транзакций.</numerusform><numerusform>Обработано %n блоков истории транзакций.</numerusform><numerusform>Обработано %n блоков истории транзакций.</numerusform></translation>
@@ -485,6 +481,10 @@
         <source>%1 client</source>
         <translation>%1 клиент</translation>
     </message>
+    <message>
+        <source>Connecting to peers...</source>
+        <translation>Подключение к пирам...</translation>
+    </message>
     <message>
         <source>Catching up...</source>
         <translation>Синхронизируется...</translation>
diff --git a/src/qt/locale/bitcoin_sk.ts b/src/qt/locale/bitcoin_sk.ts
index 15a32b2050176..87dc620f0e1bf 100644
--- a/src/qt/locale/bitcoin_sk.ts
+++ b/src/qt/locale/bitcoin_sk.ts
@@ -277,10 +277,6 @@
         <source>Processing blocks on disk...</source>
         <translation>Spracovávam bloky na disku...</translation>
     </message>
-    <message>
-        <source>No block source available...</source>
-        <translation>Nedostupný zdroj blokov...</translation>
-    </message>
     <message numerus="yes">
         <source>Processed %n block(s) of transaction history.</source>
         <translation><numerusform>Spracovaných %n blok transakčnej histórie.</numerusform><numerusform>Spracovaných %n bloky transakčnej histórie.</numerusform><numerusform>Spracovaných %n blokov transakčnej histórie.</numerusform></translation>
diff --git a/src/qt/locale/bitcoin_sl_SI.ts b/src/qt/locale/bitcoin_sl_SI.ts
index 1c8cb4ce56a15..8a21f978ef132 100644
--- a/src/qt/locale/bitcoin_sl_SI.ts
+++ b/src/qt/locale/bitcoin_sl_SI.ts
@@ -261,10 +261,6 @@
         <source>Processing blocks on disk...</source>
         <translation>Obdelava blokov na disku ...</translation>
     </message>
-    <message>
-        <source>No block source available...</source>
-        <translation>Ni virov za prenos blokov ...</translation>
-    </message>
     <message numerus="yes">
         <source>Processed %n block(s) of transaction history.</source>
         <translation><numerusform>%n obdelan blok zgodovine transakcij.</numerusform><numerusform>%n obdelana bloka zgodovine transakcij.</numerusform><numerusform>%n obdelani bloki zgodovine transakcij.</numerusform><numerusform>%n obdelanih blokov zgodovine transakcij.</numerusform></translation>
diff --git a/src/qt/locale/bitcoin_sr.ts b/src/qt/locale/bitcoin_sr.ts
index 0fda9b9350dcd..f880dd227e582 100644
--- a/src/qt/locale/bitcoin_sr.ts
+++ b/src/qt/locale/bitcoin_sr.ts
@@ -37,6 +37,22 @@
         <source>&amp;Delete</source>
         <translation>&amp;Избриши</translation>
     </message>
+    <message>
+        <source>Choose the address to send coins to</source>
+        <translation>Izbirajte adresu za slanje</translation>
+    </message>
+    <message>
+        <source>Choose the address to receive coins with</source>
+        <translation>Izbirajte adresu za primanje</translation>
+    </message>
+    <message>
+        <source>Sending addresses</source>
+        <translation>Adresa za slanje</translation>
+    </message>
+    <message>
+        <source>Receiving addresses</source>
+        <translation>Adresa za primanje</translation>
+    </message>
     </context>
 <context>
     <name>AddressTableModel</name>
@@ -145,6 +161,10 @@
         <source>Tabs toolbar</source>
         <translation>Трака са картицама</translation>
     </message>
+    <message>
+        <source>Error</source>
+        <translation>Greška</translation>
+    </message>
     <message>
         <source>Up to date</source>
         <translation>Ажурно</translation>
@@ -220,6 +240,10 @@
     </context>
 <context>
     <name>Intro</name>
+    <message>
+        <source>Error</source>
+        <translation>Greška</translation>
+    </message>
     </context>
 <context>
     <name>ModalOverlay</name>
@@ -278,6 +302,14 @@
     </context>
 <context>
     <name>RPCConsole</name>
+    <message>
+        <source>Yes</source>
+        <translation>Da</translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation>Ne</translation>
+    </message>
     </context>
 <context>
     <name>ReceiveCoinsDialog</name>
@@ -293,6 +325,10 @@
         <source>&amp;Message:</source>
         <translation>Poruka:</translation>
     </message>
+    <message>
+        <source>Show</source>
+        <translation>Prikaži</translation>
+    </message>
     </context>
 <context>
     <name>ReceiveRequestDialog</name>
@@ -348,7 +384,11 @@
     </context>
 <context>
     <name>SendConfirmationDialog</name>
-    </context>
+    <message>
+        <source>Yes</source>
+        <translation>Da</translation>
+    </message>
+</context>
 <context>
     <name>ShutdownWindow</name>
     </context>
@@ -431,6 +471,10 @@
         <source>Loading addresses...</source>
         <translation>učitavam adrese....</translation>
     </message>
+    <message>
+        <source>Insufficient funds</source>
+        <translation>Nedovoljno sredstava</translation>
+    </message>
     <message>
         <source>Loading block index...</source>
         <translation>Učitavam blok indeksa...</translation>
@@ -447,5 +491,9 @@
         <source>Done loading</source>
         <translation>Završeno učitavanje</translation>
     </message>
-    </context>
+    <message>
+        <source>Error</source>
+        <translation>Greška</translation>
+    </message>
+</context>
 </TS>
\ No newline at end of file
diff --git a/src/qt/locale/bitcoin_sv.ts b/src/qt/locale/bitcoin_sv.ts
index fc7ccdeba22b9..2986115a62096 100644
--- a/src/qt/locale/bitcoin_sv.ts
+++ b/src/qt/locale/bitcoin_sv.ts
@@ -318,6 +318,22 @@ Var vänlig och försök igen.</translation>
         <source>Open &amp;URI...</source>
         <translation>Öppna &amp;URI...</translation>
     </message>
+    <message>
+        <source>Click to disable network activity.</source>
+        <translation>Klicka för att inaktivera nätverksaktivitet.</translation>
+    </message>
+    <message>
+        <source>Network activity disabled.</source>
+        <translation>Nätverksaktivitet inaktiverad.</translation>
+    </message>
+    <message>
+        <source>Click to enable network activity again.</source>
+        <translation>Klicka för att aktivera nätverksaktivitet igen.</translation>
+    </message>
+    <message>
+        <source>Syncing Headers (%1%)...</source>
+        <translation>Synkar huvuden (%1%)...</translation>
+    </message>
     <message>
         <source>Reindexing blocks on disk...</source>
         <translation>Återindexerar block på disken...</translation>
@@ -430,10 +446,6 @@ Var vänlig och försök igen.</translation>
         <source>Processing blocks on disk...</source>
         <translation>Bearbetar block på disken...</translation>
     </message>
-    <message>
-        <source>No block source available...</source>
-        <translation>Ingen block-källa tillgänglig...</translation>
-    </message>
     <message numerus="yes">
         <source>Processed %n block(s) of transaction history.</source>
         <translation><numerusform>Bearbetade %n block av transaktionshistoriken.</numerusform><numerusform>Bearbetade %n block av transaktionshistoriken.</numerusform></translation>
@@ -474,6 +486,10 @@ Var vänlig och försök igen.</translation>
         <source>%1 client</source>
         <translation>%1-klient</translation>
     </message>
+    <message>
+        <source>Connecting to peers...</source>
+        <translation>Ansluter till noder...</translation>
+    </message>
     <message>
         <source>Catching up...</source>
         <translation>Hämtar senaste...</translation>
@@ -607,6 +623,18 @@ Var vänlig och försök igen.</translation>
         <source>Copy amount</source>
         <translation>Kopiera belopp</translation>
     </message>
+    <message>
+        <source>Copy transaction ID</source>
+        <translation>Kopiera transaktions-ID</translation>
+    </message>
+    <message>
+        <source>yes</source>
+        <translation>ja</translation>
+    </message>
+    <message>
+        <source>no</source>
+        <translation>nej</translation>
+    </message>
     <message>
         <source>(no label)</source>
         <translation>(Ingen etikett)</translation>
@@ -634,6 +662,10 @@ Var vänlig och försök igen.</translation>
         <source>&amp;Address</source>
         <translation>&amp;Adress</translation>
     </message>
+    <message>
+        <source>Could not unlock wallet.</source>
+        <translation>Kunde inte låsa upp plånboken.</translation>
+    </message>
     </context>
 <context>
     <name>FreespaceChecker</name>
@@ -762,15 +794,35 @@ Var vänlig och försök igen.</translation>
         <source>Form</source>
         <translation>Formulär</translation>
     </message>
+    <message>
+        <source>Number of blocks left</source>
+        <translation>Antal block kvar</translation>
+    </message>
+    <message>
+        <source>Unknown...</source>
+        <translation>Okänt...</translation>
+    </message>
     <message>
         <source>Last block time</source>
         <translation>Sista blocktid</translation>
     </message>
+    <message>
+        <source>Progress</source>
+        <translation>Förlopp</translation>
+    </message>
+    <message>
+        <source>calculating...</source>
+        <translation>beräknar...</translation>
+    </message>
     <message>
         <source>Hide</source>
         <translation>Göm</translation>
     </message>
-    </context>
+    <message>
+        <source>Unknown. Syncing Headers (%1)...</source>
+        <translation>Okänd. Synkar huvuden (%1)...</translation>
+    </message>
+</context>
 <context>
     <name>OpenURIDialog</name>
     <message>
@@ -1102,6 +1154,18 @@ Var vänlig och försök igen.</translation>
 </context>
 <context>
     <name>PaymentServer</name>
+    <message>
+        <source>URI handling</source>
+        <translation>URI-hantering</translation>
+    </message>
+    <message>
+        <source>Refund from %1</source>
+        <translation>Återbetalning från %1</translation>
+    </message>
+    <message>
+        <source>Bad response from server %1</source>
+        <translation>Felaktigt svar från server %1</translation>
+    </message>
     </context>
 <context>
     <name>PeerTableModel</name>
@@ -1113,7 +1177,11 @@ Var vänlig och försök igen.</translation>
         <source>Node/Service</source>
         <translation>Nod/Tjänst</translation>
     </message>
-    </context>
+    <message>
+        <source>Ping</source>
+        <translation>Ping</translation>
+    </message>
+</context>
 <context>
     <name>QObject</name>
     <message>
@@ -1152,14 +1220,42 @@ Var vänlig och försök igen.</translation>
         <source>%1 ms</source>
         <translation>%1 ms</translation>
     </message>
+    <message numerus="yes">
+        <source>%n second(s)</source>
+        <translation><numerusform>%n sekund</numerusform><numerusform>%n sekunder</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%n minute(s)</source>
+        <translation><numerusform>%n minut</numerusform><numerusform>%n minuter</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%n hour(s)</source>
+        <translation><numerusform>%n timme</numerusform><numerusform>%n timmar</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%n day(s)</source>
+        <translation><numerusform>%n dag</numerusform><numerusform>%n dagar</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%n week(s)</source>
+        <translation><numerusform>%n vecka</numerusform><numerusform>%n veckor</numerusform></translation>
+    </message>
     <message>
         <source>%1 and %2</source>
         <translation>%1 och %2</translation>
     </message>
+    <message numerus="yes">
+        <source>%n year(s)</source>
+        <translation><numerusform>%n år</numerusform><numerusform>%n år</numerusform></translation>
+    </message>
     </context>
 <context>
     <name>QObject::QObject</name>
-    </context>
+    <message>
+        <source>Error: %1</source>
+        <translation>Fel: %1</translation>
+    </message>
+</context>
 <context>
     <name>QRImageWidget</name>
     </context>
@@ -1512,10 +1608,18 @@ Var vänlig och försök igen.</translation>
         <source>Remove</source>
         <translation>Ta bort</translation>
     </message>
+    <message>
+        <source>Copy URI</source>
+        <translation>Kopiera URI</translation>
+    </message>
     <message>
         <source>Copy label</source>
         <translation>Kopiera etikett</translation>
     </message>
+    <message>
+        <source>Copy message</source>
+        <translation>Kopiera meddelande</translation>
+    </message>
     <message>
         <source>Copy amount</source>
         <translation>Kopiera belopp</translation>
@@ -1539,6 +1643,14 @@ Var vänlig och försök igen.</translation>
         <source>&amp;Save Image...</source>
         <translation>&amp;Spara Bild...</translation>
     </message>
+    <message>
+        <source>Payment information</source>
+        <translation>Betalinformaton</translation>
+    </message>
+    <message>
+        <source>URI</source>
+        <translation>URI</translation>
+    </message>
     <message>
         <source>Address</source>
         <translation>Adress</translation>
@@ -1547,17 +1659,33 @@ Var vänlig och försök igen.</translation>
         <source>Label</source>
         <translation>Etikett</translation>
     </message>
+    <message>
+        <source>Message</source>
+        <translation>Meddelande</translation>
+    </message>
     </context>
 <context>
     <name>RecentRequestsTableModel</name>
+    <message>
+        <source>Date</source>
+        <translation>Datum</translation>
+    </message>
     <message>
         <source>Label</source>
         <translation>Etikett</translation>
     </message>
+    <message>
+        <source>Message</source>
+        <translation>Meddelande</translation>
+    </message>
     <message>
         <source>(no label)</source>
         <translation>(Ingen etikett)</translation>
     </message>
+    <message>
+        <source>(no message)</source>
+        <translation>(inget meddelande)</translation>
+    </message>
     </context>
 <context>
     <name>SendCoinsDialog</name>
@@ -1705,6 +1833,18 @@ Var vänlig och försök igen.</translation>
         <source>Copy amount</source>
         <translation>Kopiera belopp</translation>
     </message>
+    <message>
+        <source>%1 to %2</source>
+        <translation>%1 till %2</translation>
+    </message>
+    <message>
+        <source>or</source>
+        <translation>eller</translation>
+    </message>
+    <message numerus="yes">
+        <source>%n block(s)</source>
+        <translation><numerusform>%n block</numerusform><numerusform>%n block</numerusform></translation>
+    </message>
     <message>
         <source>(no label)</source>
         <translation>(Ingen etikett)</translation>
@@ -1791,7 +1931,11 @@ Var vänlig och försök igen.</translation>
     </context>
 <context>
     <name>SendConfirmationDialog</name>
-    </context>
+    <message>
+        <source>Yes</source>
+        <translation>Ja</translation>
+    </message>
+</context>
 <context>
     <name>ShutdownWindow</name>
     <message>
@@ -1889,7 +2033,19 @@ Var vänlig och försök igen.</translation>
         <source>Reset all verify message fields</source>
         <translation>Rensa alla fält</translation>
     </message>
-    </context>
+    <message>
+        <source>Message signed.</source>
+        <translation>Meddelande signerat.</translation>
+    </message>
+    <message>
+        <source>The signature could not be decoded.</source>
+        <translation>Signaturen kunde inte avkodas.</translation>
+    </message>
+    <message>
+        <source>Message verified.</source>
+        <translation>Meddelande verifierat.</translation>
+    </message>
+</context>
 <context>
     <name>SplashScreen</name>
     <message>
@@ -1906,6 +2062,18 @@ Var vänlig och försök igen.</translation>
 </context>
 <context>
     <name>TransactionDesc</name>
+    <message>
+        <source>Status</source>
+        <translation>Status</translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation>Datum</translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation>Meddelande</translation>
+    </message>
     </context>
 <context>
     <name>TransactionDescDialog</name>
@@ -1916,6 +2084,10 @@ Var vänlig och försök igen.</translation>
     </context>
 <context>
     <name>TransactionTableModel</name>
+    <message>
+        <source>Date</source>
+        <translation>Datum</translation>
+    </message>
     <message>
         <source>Label</source>
         <translation>Etikett</translation>
@@ -1939,10 +2111,18 @@ Var vänlig och försök igen.</translation>
         <source>Copy amount</source>
         <translation>Kopiera belopp</translation>
     </message>
+    <message>
+        <source>Copy transaction ID</source>
+        <translation>Kopiera transaktions-ID</translation>
+    </message>
     <message>
         <source>Comma separated file (*.csv)</source>
         <translation>Kommaseparerad fil (*.csv)</translation>
     </message>
+    <message>
+        <source>Date</source>
+        <translation>Datum</translation>
+    </message>
     <message>
         <source>Label</source>
         <translation>Etikett</translation>
diff --git a/src/qt/locale/bitcoin_th_TH.ts b/src/qt/locale/bitcoin_th_TH.ts
index 18e78847fc750..ea84d11d39b31 100644
--- a/src/qt/locale/bitcoin_th_TH.ts
+++ b/src/qt/locale/bitcoin_th_TH.ts
@@ -41,6 +41,18 @@
         <source>&amp;Delete</source>
         <translation>&amp;ลบ</translation>
     </message>
+    <message>
+        <source>Choose the address to send coins to</source>
+        <translation>เลือกที่อยู่เพื่อส่งเหรียญไปไว้</translation>
+    </message>
+    <message>
+        <source>Choose the address to receive coins with</source>
+        <translation>เลือกที่อยู่เพื่อส่งเหรียญไปไว้</translation>
+    </message>
+    <message>
+        <source>Sending addresses</source>
+        <translation>ส่งที่อยู่</translation>
+    </message>
     </context>
 <context>
     <name>AddressTableModel</name>
@@ -273,10 +285,6 @@
         <source>Processing blocks on disk...</source>
         <translation>กำลังดำเนินการกับบล็อกในดิสก์...</translation>
     </message>
-    <message>
-        <source>No block source available...</source>
-        <translation>ไม่มีบล็อกเริ่มต้น ให้ใช้ได้...</translation>
-    </message>
     <message numerus="yes">
         <source>Processed %n block(s) of transaction history.</source>
         <translation><numerusform>%n บล็อกในประวัติรายการ ได้รับการดำเนินการเรียบร้อยแล้ว</numerusform></translation>
diff --git a/src/qt/locale/bitcoin_tr.ts b/src/qt/locale/bitcoin_tr.ts
index ae565ee6658d4..c37a518968e08 100644
--- a/src/qt/locale/bitcoin_tr.ts
+++ b/src/qt/locale/bitcoin_tr.ts
@@ -361,10 +361,6 @@
         <source>Processing blocks on disk...</source>
         <translation>Bloklar diske yazıdırılıyor...</translation>
     </message>
-    <message>
-        <source>No block source available...</source>
-        <translation>Hiçbir blok kaynağı mevcut değil...</translation>
-    </message>
     <message numerus="yes">
         <source>Processed %n block(s) of transaction history.</source>
         <translation><numerusform>Muamele tarihçesinden %n blok işlendi.</numerusform><numerusform>Muamele tarihçesinden %n blok işlendi</numerusform></translation>
diff --git a/src/qt/locale/bitcoin_uk.ts b/src/qt/locale/bitcoin_uk.ts
index a817c1baf21ee..2c017fc52e2e6 100644
--- a/src/qt/locale/bitcoin_uk.ts
+++ b/src/qt/locale/bitcoin_uk.ts
@@ -257,10 +257,6 @@
         <source>%n active connection(s) to Bitcoin network</source>
         <translation><numerusform>%n активне з'єднання з мережею Bitcoin</numerusform><numerusform>%n активні з'єднання з мережею Bitcoin</numerusform><numerusform>%n активних з'єднань з мережею Bitcoin</numerusform></translation>
     </message>
-    <message>
-        <source>No block source available...</source>
-        <translation>Недоступно жодного джерела блоків...</translation>
-    </message>
     <message numerus="yes">
         <source>Processed %n block(s) of transaction history.</source>
         <translation><numerusform>Оброблено %n блок історії транзакцій.</numerusform><numerusform>Оброблено %n блоки історії транзакцій.</numerusform><numerusform>Оброблено %n блоків історії транзакцій.</numerusform></translation>
diff --git a/src/qt/locale/bitcoin_uz@Cyrl.ts b/src/qt/locale/bitcoin_uz@Cyrl.ts
index fe10a8a8e7b28..3898c441af1f1 100644
--- a/src/qt/locale/bitcoin_uz@Cyrl.ts
+++ b/src/qt/locale/bitcoin_uz@Cyrl.ts
@@ -245,10 +245,6 @@
         <source>%n active connection(s) to Bitcoin network</source>
         <translation><numerusform>%n та Bitcoin тармоғига фаол уланиш мавжуд</numerusform></translation>
     </message>
-    <message>
-        <source>No block source available...</source>
-        <translation>Блок манбалари мавжуд эмас...</translation>
-    </message>
     <message>
         <source>%1 behind</source>
         <translation>%1 орқада</translation>
diff --git a/src/qt/locale/bitcoin_zh_CN.ts b/src/qt/locale/bitcoin_zh_CN.ts
index e76d605a80369..e98bc080e2694 100644
--- a/src/qt/locale/bitcoin_zh_CN.ts
+++ b/src/qt/locale/bitcoin_zh_CN.ts
@@ -441,10 +441,6 @@
         <source>Processing blocks on disk...</source>
         <translation>正在处理数据块...</translation>
     </message>
-    <message>
-        <source>No block source available...</source>
-        <translation>沒有可用的区块来源...</translation>
-    </message>
     <message numerus="yes">
         <source>Processed %n block(s) of transaction history.</source>
         <translation><numerusform>已处理 %n 个交易历史数据块。</numerusform></translation>
diff --git a/src/qt/locale/bitcoin_zh_TW.ts b/src/qt/locale/bitcoin_zh_TW.ts
index 4a8b1474d8d56..bd0533a83eaa3 100644
--- a/src/qt/locale/bitcoin_zh_TW.ts
+++ b/src/qt/locale/bitcoin_zh_TW.ts
@@ -329,6 +329,10 @@
         <source>Click to enable network activity again.</source>
         <translation>按一下就又會使用網路。</translation>
     </message>
+    <message>
+        <source>Syncing Headers (%1%)...</source>
+        <translation>正在同步前導資料(%1%)中...</translation>
+    </message>
     <message>
         <source>Reindexing blocks on disk...</source>
         <translation>正在為磁碟裡的區塊重建索引...</translation>
@@ -441,10 +445,6 @@
         <source>Processing blocks on disk...</source>
         <translation>正在處理磁碟裡的區塊資料...</translation>
     </message>
-    <message>
-        <source>No block source available...</source>
-        <translation>沒有可用的區塊來源...</translation>
-    </message>
     <message numerus="yes">
         <source>Processed %n block(s) of transaction history.</source>
         <translation><numerusform>已經處理了 %n 個區塊的交易紀錄。</numerusform></translation>
@@ -485,6 +485,10 @@
         <source>%1 client</source>
         <translation>%1 客戶端軟體</translation>
     </message>
+    <message>
+        <source>Connecting to peers...</source>
+        <translation>正在跟其他節點連線中...</translation>
+    </message>
     <message>
         <source>Catching up...</source>
         <translation>正在趕進度...</translation>
@@ -3090,6 +3094,14 @@
         <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source>
         <translation>當錢包有交易改變時要執行的指令(指令中的 %s 會被取代成交易識別碼)</translation>
     </message>
+    <message>
+        <source>Extra transactions to keep in memory for compact block reconstructions (default: %u)</source>
+        <translation>為了將摘要區塊完整回組而額外保留在記憶體中的交易數量(預設值: %u)</translation>
+    </message>
+    <message>
+        <source>If this block is in the chain assume that it and its ancestors are valid and potentially skip their script verification (0 to verify all, default: %s, testnet: %s)</source>
+        <translation>假設已經在區塊鏈中的區塊以及其先前的區塊都合法，因此對它們略過指令碼驗證(0 表示一律要驗證，預設值: %s, 測試網路: %s)</translation>
+    </message>
     <message>
         <source>Maximum allowed median peer time offset adjustment. Local perspective of time may be influenced by peers forward or backward by this amount. (default: %u seconds)</source>
         <translation>跟其他節點的時間差最高可接受的中位數值。本機所認為的時間可能會被其他節點影響，往前或往後在這個值之內。(預設值: %u 秒)</translation>
@@ -3384,7 +3396,7 @@
     </message>
     <message>
         <source>Use the test chain</source>
-        <translation>使用測試鏈</translation>
+        <translation>使用測試區塊鏈</translation>
     </message>
     <message>
         <source>User Agent comment (%s) contains unsafe characters.</source>

From d625b907a1800a5a30c4ad285641c7418d2c28c1 Mon Sep 17 00:00:00 2001
From: Suhas Daftuar <sdaftuar@chaincode.com>
Date: Thu, 26 Jan 2017 12:57:04 -0500
Subject: [PATCH 1655/1802] wallet: Refactor dummy signature signing for
 reusability

---
 src/wallet/wallet.cpp | 18 +++---------------
 src/wallet/wallet.h   | 27 +++++++++++++++++++++++++++
 2 files changed, 30 insertions(+), 15 deletions(-)

diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index 9a5f35b6e3702..a7b8022bd9c79 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -2583,21 +2583,9 @@ bool CWallet::CreateTransaction(const vector<CRecipient>& vecSend, CWalletTx& wt
                                               std::numeric_limits<unsigned int>::max() - (fWalletRbf ? 2 : 1)));
 
                 // Fill in dummy signatures for fee calculation.
-                int nIn = 0;
-                for (const auto& coin : setCoins)
-                {
-                    const CScript& scriptPubKey = coin.first->tx->vout[coin.second].scriptPubKey;
-                    SignatureData sigdata;
-
-                    if (!ProduceSignature(DummySignatureCreator(this), scriptPubKey, sigdata))
-                    {
-                        strFailReason = _("Signing transaction failed");
-                        return false;
-                    } else {
-                        UpdateTransaction(txNew, nIn, sigdata);
-                    }
-
-                    nIn++;
+                if (!DummySignTx(txNew, setCoins)) {
+                    strFailReason = _("Signing transaction failed");
+                    return false;
                 }
 
                 unsigned int nBytes = GetVirtualTransactionSize(txNew);
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
index 200ec0cba2bc4..1de04ae16a388 100644
--- a/src/wallet/wallet.h
+++ b/src/wallet/wallet.h
@@ -13,6 +13,7 @@
 #include "utilstrencodings.h"
 #include "validationinterface.h"
 #include "script/ismine.h"
+#include "script/sign.h"
 #include "wallet/crypter.h"
 #include "wallet/walletdb.h"
 #include "wallet/rpcwallet.h"
@@ -796,6 +797,8 @@ class CWallet : public CCryptoKeyStore, public CValidationInterface
     void ListAccountCreditDebit(const std::string& strAccount, std::list<CAccountingEntry>& entries);
     bool AddAccountingEntry(const CAccountingEntry&);
     bool AddAccountingEntry(const CAccountingEntry&, CWalletDB *pwalletdb);
+    template <typename ContainerType>
+    bool DummySignTx(CMutableTransaction &txNew, const ContainerType &coins);
 
     static CFeeRate minTxFee;
     static CFeeRate fallbackFee;
@@ -1028,4 +1031,28 @@ class CAccount
     }
 };
 
+// Helper for producing a bunch of max-sized low-S signatures (eg 72 bytes)
+// ContainerType is meant to hold pair<CWalletTx *, int>, and be iterable
+// so that each entry corresponds to each vIn, in order.
+template <typename ContainerType>
+bool CWallet::DummySignTx(CMutableTransaction &txNew, const ContainerType &coins)
+{
+    // Fill in dummy signatures for fee calculation.
+    int nIn = 0;
+    for (const auto& coin : coins)
+    {
+        const CScript& scriptPubKey = coin.first->tx->vout[coin.second].scriptPubKey;
+        SignatureData sigdata;
+
+        if (!ProduceSignature(DummySignatureCreator(this), scriptPubKey, sigdata))
+        {
+            return false;
+        } else {
+            UpdateTransaction(txNew, nIn, sigdata);
+        }
+
+        nIn++;
+    }
+    return true;
+}
 #endif // BITCOIN_WALLET_WALLET_H

From 178454dde93ffa55343c17fcc6414f1f982f71e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jorge=20Tim=C3=B3n?= <jtimon@jtimon.cc>
Date: Tue, 31 Jan 2017 01:09:29 +0100
Subject: [PATCH 1656/1802] Contrib: Add jtimon pgp keys for commit sigs and
 future gitian builds

---
 contrib/gitian-keys/jtimon-key.pgp | Bin 0 -> 10892 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 contrib/gitian-keys/jtimon-key.pgp

diff --git a/contrib/gitian-keys/jtimon-key.pgp b/contrib/gitian-keys/jtimon-key.pgp
new file mode 100644
index 0000000000000000000000000000000000000000..88d0de1503bb6a6bed7710b68b5526e85a855812
GIT binary patch
literal 10892
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

literal 0
HcmV?d00001


From d45955fa0992639d6c9856a73c5f7599cc14f811 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jorge=20Tim=C3=B3n?= <jtimon@jtimon.cc>
Date: Tue, 24 Jan 2017 02:32:52 +0100
Subject: [PATCH 1657/1802] Net: CConnman: Make some methods const

---
 src/net.cpp | 6 +++---
 src/net.h   | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/net.cpp b/src/net.cpp
index df88b12c76fd5..5a5d94cd118d6 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -754,7 +754,7 @@ const uint256& CNetMessage::GetMessageHash() const
 
 
 // requires LOCK(cs_vSend)
-size_t CConnman::SocketSendData(CNode *pnode)
+size_t CConnman::SocketSendData(CNode *pnode) const
 {
     auto it = pnode->vSendMsg.begin();
     size_t nSentSize = 0;
@@ -2687,12 +2687,12 @@ int64_t PoissonNextSend(int64_t nNow, int average_interval_seconds) {
     return nNow + (int64_t)(log1p(GetRand(1ULL << 48) * -0.0000000000000035527136788 /* -1/2^48 */) * average_interval_seconds * -1000000.0 + 0.5);
 }
 
-CSipHasher CConnman::GetDeterministicRandomizer(uint64_t id)
+CSipHasher CConnman::GetDeterministicRandomizer(uint64_t id) const
 {
     return CSipHasher(nSeed0, nSeed1).Write(id);
 }
 
-uint64_t CConnman::CalculateKeyedNetGroup(const CAddress& ad)
+uint64_t CConnman::CalculateKeyedNetGroup(const CAddress& ad) const
 {
     std::vector<unsigned char> vchNetGroup(ad.GetGroup());
 
diff --git a/src/net.h b/src/net.h
index 0b8efcc882ad5..6228f7b508409 100644
--- a/src/net.h
+++ b/src/net.h
@@ -321,7 +321,7 @@ class CConnman
     int GetBestHeight() const;
 
     /** Get a unique deterministic randomizer. */
-    CSipHasher GetDeterministicRandomizer(uint64_t id);
+    CSipHasher GetDeterministicRandomizer(uint64_t id) const;
 
     unsigned int GetReceiveFloodSize() const;
 
@@ -342,7 +342,7 @@ class CConnman
     void ThreadSocketHandler();
     void ThreadDNSAddressSeed();
 
-    uint64_t CalculateKeyedNetGroup(const CAddress& ad);
+    uint64_t CalculateKeyedNetGroup(const CAddress& ad) const;
 
     CNode* FindNode(const CNetAddr& ip);
     CNode* FindNode(const CSubNet& subNet);
@@ -357,7 +357,7 @@ class CConnman
 
     NodeId GetNewNodeId();
 
-    size_t SocketSendData(CNode *pnode);
+    size_t SocketSendData(CNode *pnode) const;
     //!check is the banlist has unwritten changes
     bool BannedSetIsDirty();
     //!set the "dirty" flag for the banlist

From fc7f2ffad481870e62ab2f798f941577983c5a39 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jorge=20Tim=C3=B3n?= <jtimon@jtimon.cc>
Date: Tue, 31 Jan 2017 22:57:40 +0100
Subject: [PATCH 1658/1802] Net: Make CNetMsgMaker more const

---
 src/net_processing.cpp | 10 +++++-----
 src/netmessagemaker.h  |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/net_processing.cpp b/src/net_processing.cpp
index b9667eb6c64b7..99577933810ab 100644
--- a/src/net_processing.cpp
+++ b/src/net_processing.cpp
@@ -778,7 +778,7 @@ static uint256 most_recent_block_hash;
 
 void PeerLogicValidation::NewPoWValidBlock(const CBlockIndex *pindex, const std::shared_ptr<const CBlock>& pblock) {
     std::shared_ptr<const CBlockHeaderAndShortTxIDs> pcmpctblock = std::make_shared<const CBlockHeaderAndShortTxIDs> (*pblock, true);
-    CNetMsgMaker msgMaker(PROTOCOL_VERSION);
+    const CNetMsgMaker msgMaker(PROTOCOL_VERSION);
 
     LOCK(cs_main);
 
@@ -960,7 +960,7 @@ void static ProcessGetData(CNode* pfrom, const Consensus::Params& consensusParam
 {
     std::deque<CInv>::iterator it = pfrom->vRecvGetData.begin();
     std::vector<CInv> vNotFound;
-    CNetMsgMaker msgMaker(pfrom->GetSendVersion());
+    const CNetMsgMaker msgMaker(pfrom->GetSendVersion());
     LOCK(cs_main);
 
     while (it != pfrom->vRecvGetData.end()) {
@@ -1153,7 +1153,7 @@ inline void static SendBlockTransactions(const CBlock& block, const BlockTransac
         resp.txn[i] = block.vtx[req.indexes[i]];
     }
     LOCK(cs_main);
-    CNetMsgMaker msgMaker(pfrom->GetSendVersion());
+    const CNetMsgMaker msgMaker(pfrom->GetSendVersion());
     int nSendFlags = State(pfrom->GetId())->fWantsCmpctWitness ? 0 : SERIALIZE_TRANSACTION_NO_WITNESS;
     connman.PushMessage(pfrom, msgMaker.Make(nSendFlags, NetMsgType::BLOCKTXN, resp));
 }
@@ -1346,7 +1346,7 @@ bool static ProcessMessage(CNode* pfrom, std::string strCommand, CDataStream& vR
     }
 
     // At this point, the outgoing message serialization version can't change.
-    CNetMsgMaker msgMaker(pfrom->GetSendVersion());
+    const CNetMsgMaker msgMaker(pfrom->GetSendVersion());
 
     if (strCommand == NetMsgType::VERACK)
     {
@@ -2721,7 +2721,7 @@ bool SendMessages(CNode* pto, CConnman& connman, std::atomic<bool>& interruptMsg
             return true;
 
         // If we get here, the outgoing message serialization version is set and can't change.
-        CNetMsgMaker msgMaker(pto->GetSendVersion());
+        const CNetMsgMaker msgMaker(pto->GetSendVersion());
 
         //
         // Message: ping
diff --git a/src/netmessagemaker.h b/src/netmessagemaker.h
index 7167434a19ebe..8e8a6e4a026ee 100644
--- a/src/netmessagemaker.h
+++ b/src/netmessagemaker.h
@@ -15,7 +15,7 @@ class CNetMsgMaker
     CNetMsgMaker(int nVersionIn) : nVersion(nVersionIn){}
 
     template <typename... Args>
-    CSerializedNetMsg Make(int nFlags, std::string sCommand, Args&&... args)
+    CSerializedNetMsg Make(int nFlags, std::string sCommand, Args&&... args) const
     {
         CSerializedNetMsg msg;
         msg.command = std::move(sCommand);
@@ -24,7 +24,7 @@ class CNetMsgMaker
     }
 
     template <typename... Args>
-    CSerializedNetMsg Make(std::string sCommand, Args&&... args)
+    CSerializedNetMsg Make(std::string sCommand, Args&&... args) const
     {
         return Make(0, std::move(sCommand), std::forward<Args>(args)...);
     }

From 0729102f99241b9716456ad40bf778c09f650b1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jorge=20Tim=C3=B3n?= <jtimon@jtimon.cc>
Date: Tue, 31 Jan 2017 23:07:20 +0100
Subject: [PATCH 1659/1802] Net: pass interruptMsgProc as const where possible

---
 src/net_processing.cpp | 8 ++++----
 src/net_processing.h   | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/net_processing.cpp b/src/net_processing.cpp
index 99577933810ab..1cc86a662684d 100644
--- a/src/net_processing.cpp
+++ b/src/net_processing.cpp
@@ -956,7 +956,7 @@ static void RelayAddress(const CAddress& addr, bool fReachable, CConnman& connma
     connman.ForEachNodeThen(std::move(sortfunc), std::move(pushfunc));
 }
 
-void static ProcessGetData(CNode* pfrom, const Consensus::Params& consensusParams, CConnman& connman, std::atomic<bool>& interruptMsgProc)
+void static ProcessGetData(CNode* pfrom, const Consensus::Params& consensusParams, CConnman& connman, const std::atomic<bool>& interruptMsgProc)
 {
     std::deque<CInv>::iterator it = pfrom->vRecvGetData.begin();
     std::vector<CInv> vNotFound;
@@ -1158,7 +1158,7 @@ inline void static SendBlockTransactions(const CBlock& block, const BlockTransac
     connman.PushMessage(pfrom, msgMaker.Make(nSendFlags, NetMsgType::BLOCKTXN, resp));
 }
 
-bool static ProcessMessage(CNode* pfrom, std::string strCommand, CDataStream& vRecv, int64_t nTimeReceived, const CChainParams& chainparams, CConnman& connman, std::atomic<bool>& interruptMsgProc)
+bool static ProcessMessage(CNode* pfrom, const std::string& strCommand, CDataStream& vRecv, int64_t nTimeReceived, const CChainParams& chainparams, CConnman& connman, const std::atomic<bool>& interruptMsgProc)
 {
     LogPrint("net", "received: %s (%u bytes) peer=%d\n", SanitizeString(strCommand), vRecv.size(), pfrom->id);
     if (IsArgSet("-dropmessagestest") && GetRand(GetArg("-dropmessagestest", 0)) == 0)
@@ -2579,7 +2579,7 @@ bool static ProcessMessage(CNode* pfrom, std::string strCommand, CDataStream& vR
     return true;
 }
 
-bool ProcessMessages(CNode* pfrom, CConnman& connman, std::atomic<bool>& interruptMsgProc)
+bool ProcessMessages(CNode* pfrom, CConnman& connman, const std::atomic<bool>& interruptMsgProc)
 {
     const CChainParams& chainparams = Params();
     //
@@ -2712,7 +2712,7 @@ class CompareInvMempoolOrder
     }
 };
 
-bool SendMessages(CNode* pto, CConnman& connman, std::atomic<bool>& interruptMsgProc)
+bool SendMessages(CNode* pto, CConnman& connman, const std::atomic<bool>& interruptMsgProc)
 {
     const Consensus::Params& consensusParams = Params().GetConsensus();
     {
diff --git a/src/net_processing.h b/src/net_processing.h
index 7351c0e99c168..9e3f1b715667a 100644
--- a/src/net_processing.h
+++ b/src/net_processing.h
@@ -49,7 +49,7 @@ bool GetNodeStateStats(NodeId nodeid, CNodeStateStats &stats);
 void Misbehaving(NodeId nodeid, int howmuch);
 
 /** Process protocol messages received from a given node */
-bool ProcessMessages(CNode* pfrom, CConnman& connman, std::atomic<bool>& interrupt);
+bool ProcessMessages(CNode* pfrom, CConnman& connman, const std::atomic<bool>& interrupt);
 /**
  * Send queued protocol messages to be sent to a give node.
  *
@@ -58,6 +58,6 @@ bool ProcessMessages(CNode* pfrom, CConnman& connman, std::atomic<bool>& interru
  * @param[in]   interrupt       Interrupt condition for processing threads
  * @return                      True if there is more work to be done
  */
-bool SendMessages(CNode* pto, CConnman& connman, std::atomic<bool>& interrupt);
+bool SendMessages(CNode* pto, CConnman& connman, const std::atomic<bool>& interrupt);
 
 #endif // BITCOIN_NET_PROCESSING_H

From f62659448cdfd752447117fb73ab5328fbe3e41d Mon Sep 17 00:00:00 2001
From: Suhas Daftuar <sdaftuar@chaincode.com>
Date: Thu, 26 Jan 2017 12:59:32 -0500
Subject: [PATCH 1660/1802] rpc: bumpfee: use correct maximum signed tx size
 for fee calculation

More accurate than simply adding one byte per input, and properly handles the
case where the original transaction happened to have very small signatures
---
 src/wallet/rpcwallet.cpp | 39 +++++++++++++++++++++++++++++++++++----
 1 file changed, 35 insertions(+), 4 deletions(-)

diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index bfc738afadfb8..4f763fd6e2f3a 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -2664,6 +2664,33 @@ UniValue fundrawtransaction(const JSONRPCRequest& request)
     return result;
 }
 
+// Calculate the size of the transaction assuming all signatures are max size
+// Use DummySignatureCreator, which inserts 72 byte signatures everywhere.
+// TODO: re-use this in CWallet::CreateTransaction (right now
+// CreateTransaction uses the constructed dummy-signed tx to do a priority
+// calculation, but we should be able to refactor after priority is removed).
+// NOTE: this requires that all inputs must be in mapWallet (eg the tx should
+// be IsAllFromMe).
+int64_t CalculateMaximumSignedTxSize(const CTransaction &tx)
+{
+    CMutableTransaction txNew(tx);
+    std::vector<pair<CWalletTx *, unsigned int>> vCoins;
+    // Look up the inputs.  We should have already checked that this transaction
+    // IsAllFromMe(ISMINE_SPENDABLE), so every input should already be in our
+    // wallet, with a valid index into the vout array.
+    for (auto& input : tx.vin) {
+        const auto mi = pwalletMain->mapWallet.find(input.prevout.hash);
+        assert(mi != pwalletMain->mapWallet.end() && input.prevout.n < mi->second.tx->vout.size());
+        vCoins.emplace_back(make_pair(&(mi->second), input.prevout.n));
+    }
+    if (!pwalletMain->DummySignTx(txNew, vCoins)) {
+        // This should never happen, because IsAllFromMe(ISMINE_SPENDABLE)
+        // implies that we can sign for every input.
+        throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Transaction contains inputs that cannot be signed");
+    }
+    return GetVirtualTransactionSize(txNew);
+}
+
 UniValue bumpfee(const JSONRPCRequest& request)
 {
     if (!EnsureWalletIsAvailable(request.fHelp)) {
@@ -2769,9 +2796,9 @@ UniValue bumpfee(const JSONRPCRequest& request)
         throw JSONRPCError(RPC_MISC_ERROR, "Transaction does not have a change output");
     }
 
-    // signature sizes can vary by a byte, so add 1 for each input when calculating the new fee
+    // Calculate the expected size of the new transaction.
     int64_t txSize = GetVirtualTransactionSize(*(wtx.tx));
-    const int64_t maxNewTxSize = txSize + wtx.tx->vin.size();
+    const int64_t maxNewTxSize = CalculateMaximumSignedTxSize(*wtx.tx);
 
     // optional parameters
     bool specifiedConfirmTarget = false;
@@ -2845,8 +2872,12 @@ UniValue bumpfee(const JSONRPCRequest& request)
         nNewFeeRate = CFeeRate(nNewFee, maxNewTxSize);
 
         // New fee rate must be at least old rate + minimum incremental relay rate
-        if (nNewFeeRate.GetFeePerK() < nOldFeeRate.GetFeePerK() + walletIncrementalRelayFee.GetFeePerK()) {
-            nNewFeeRate = CFeeRate(nOldFeeRate.GetFeePerK() + walletIncrementalRelayFee.GetFeePerK());
+        // walletIncrementalRelayFee.GetFeePerK() should be exact, because it's initialized
+        // in that unit (fee per kb).
+        // However, nOldFeeRate is a calculated value from the tx fee/size, so
+        // add 1 satoshi to the result, because it may have been rounded down.
+        if (nNewFeeRate.GetFeePerK() < nOldFeeRate.GetFeePerK() + 1 + walletIncrementalRelayFee.GetFeePerK()) {
+            nNewFeeRate = CFeeRate(nOldFeeRate.GetFeePerK() + 1 + walletIncrementalRelayFee.GetFeePerK());
             nNewFee = nNewFeeRate.GetFee(maxNewTxSize);
         }
     }

From 9522b53a91f28032c34b94662d50b000534708ce Mon Sep 17 00:00:00 2001
From: Suhas Daftuar <sdaftuar@chaincode.com>
Date: Thu, 26 Jan 2017 12:57:42 -0500
Subject: [PATCH 1661/1802] rpc: bumpfee: handle errors more gracefully

---
 src/wallet/rpcwallet.cpp | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index 4f763fd6e2f3a..8b135b0e0f7e3 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -2733,6 +2733,7 @@ UniValue bumpfee(const JSONRPCRequest& request)
             "  \"txid\":    \"value\",   (string)  The id of the new transaction\n"
             "  \"origfee\":  n,         (numeric) Fee of the replaced transaction\n"
             "  \"fee\":      n,         (numeric) Fee of the new transaction\n"
+            "  \"errors\":  [ str... ] (json array of strings) Errors encountered during processing (may be empty)\n"
             "}\n"
             "\nExamples:\n"
             "\nBump the fee, get the new transaction\'s txid\n" +
@@ -2945,23 +2946,32 @@ UniValue bumpfee(const JSONRPCRequest& request)
     CWalletTx wtxBumped(pwalletMain, MakeTransactionRef(std::move(tx)));
     wtxBumped.mapValue["replaces_txid"] = hash.ToString();
     CValidationState state;
-    if (!pwalletMain->CommitTransaction(wtxBumped, reservekey, g_connman.get(), state) || !state.IsValid()) {
+    if (!pwalletMain->CommitTransaction(wtxBumped, reservekey, g_connman.get(), state)) {
+        // NOTE: CommitTransaction never returns false, so this should never happen.
         throw JSONRPCError(RPC_WALLET_ERROR, strprintf("Error: The transaction was rejected! Reason given: %s", state.GetRejectReason()));
     }
 
+    UniValue vErrors(UniValue::VARR);
+    if (state.IsInvalid()) {
+        // This can happen if the mempool rejected the transaction.  Report
+        // what happened in the "errors" response.
+        vErrors.push_back(strprintf("Error: The transaction was rejected: %s", FormatStateMessage(state)));
+    }
+
     // mark the original tx as bumped
     if (!pwalletMain->MarkReplaced(wtx.GetHash(), wtxBumped.GetHash())) {
         // TODO: see if JSON-RPC has a standard way of returning a response
         // along with an exception. It would be good to return information about
         // wtxBumped to the caller even if marking the original transaction
         // replaced does not succeed for some reason.
-        throw JSONRPCError(RPC_WALLET_ERROR, "Error: Created new bumpfee transaction but could not mark the original transaction as replaced.");
+        vErrors.push_back("Error: Created new bumpfee transaction but could not mark the original transaction as replaced.");
     }
 
     UniValue result(UniValue::VOBJ);
     result.push_back(Pair("txid", wtxBumped.GetHash().GetHex()));
     result.push_back(Pair("origfee", ValueFromAmount(nOldFee)));
     result.push_back(Pair("fee", ValueFromAmount(nNewFee)));
+    result.push_back(Pair("errors", vErrors));
 
     return result;
 }

From 3eba88d44cdfd9d4d2bfc19cd6049d90ee05fc1c Mon Sep 17 00:00:00 2001
From: Gregory Sanders <gsanders87@gmail.com>
Date: Wed, 1 Feb 2017 12:18:31 -0500
Subject: [PATCH 1662/1802] clarify listunspent amount description

---
 src/wallet/rpcwallet.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index 6d08f60483413..8272bdc43fa2d 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -2402,7 +2402,7 @@ UniValue listunspent(const JSONRPCRequest& request)
             "    \"address\" : \"address\",    (string) the bitcoin address\n"
             "    \"account\" : \"account\",    (string) DEPRECATED. The associated account, or \"\" for the default account\n"
             "    \"scriptPubKey\" : \"key\",   (string) the script key\n"
-            "    \"amount\" : x.xxx,         (numeric) the transaction amount in " + CURRENCY_UNIT + "\n"
+            "    \"amount\" : x.xxx,         (numeric) the transaction output amount in " + CURRENCY_UNIT + "\n"
             "    \"confirmations\" : n,      (numeric) The number of confirmations\n"
             "    \"redeemScript\" : n        (string) The redeemScript if scriptPubKey is P2SH\n"
             "    \"spendable\" : xxx,        (bool) Whether we have the private keys to spend this output\n"

From 3e900acafaa2d40218d8b6167f1a80affd84c8c4 Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Tue, 31 Jan 2017 14:59:32 -0500
Subject: [PATCH 1663/1802] Require merge commits merge branches on top of
 other merge commits

Specifically, require that the left branch (first restult of git
show -s --format=format:%P) is a signed merge commit, instead of
allowing either. This is fine for now, but might need to be relaxed
in the future.

Also fixes an out-of-file-descriptors issue by holding too many
open FDs writing to /dev/null
---
 contrib/verify-commits/verify-commits.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/contrib/verify-commits/verify-commits.sh b/contrib/verify-commits/verify-commits.sh
index cfe4f11a0b7a2..b2cebdf1a0f9f 100755
--- a/contrib/verify-commits/verify-commits.sh
+++ b/contrib/verify-commits/verify-commits.sh
@@ -28,9 +28,10 @@ IS_SIGNED () {
 	local PARENTS
 	PARENTS=$(git show -s --format=format:%P $1)
 	for PARENT in $PARENTS; do
-		if IS_SIGNED $PARENT > /dev/null; then
+		if IS_SIGNED $PARENT; then
 			return 0;
 		fi
+		break
 	done
 	if ! "$HAVE_FAILED"; then
 		echo "No parent of $1 was signed with a trusted key!" > /dev/stderr

From ba94426d531d45643e37567412c3f9d97f71ae5f Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Tue, 31 Jan 2017 15:32:23 -0500
Subject: [PATCH 1664/1802] Test that pushes to bitcoin/bitcoin are signed per
 verify-commits

---
 .travis.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 4087a854b48ab..ccd249092527d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -51,6 +51,9 @@ before_script:
     - if [ -n "$OSX_SDK" -a -f depends/sdk-sources/MacOSX${OSX_SDK}.sdk.tar.gz ]; then tar -C depends/SDKs -xf depends/sdk-sources/MacOSX${OSX_SDK}.sdk.tar.gz; fi
     - make $MAKEJOBS -C depends HOST=$HOST $DEP_OPTS
 script:
+    - if [ "$RUN_TESTS" = "true" -a "$TRAVIS_REPO_SLUG" = "bitcoin/bitcoin" -a "$TRAVIS_PULL_REQUEST" = "false" ]; then while read LINE; do travis_retry gpg --keyserver hkp://pool.sks-keyservers.net --recv-keys $LINE; done < contrib/verify-commits/trusted-keys; fi
+    - if [ "$RUN_TESTS" = "true" -a "$TRAVIS_REPO_SLUG" = "bitcoin/bitcoin" -a "$TRAVIS_PULL_REQUEST" = "false" ]; then git fetch --unshallow; fi
+    - if [ "$RUN_TESTS" = "true" -a "$TRAVIS_REPO_SLUG" = "bitcoin/bitcoin" -a "$TRAVIS_PULL_REQUEST" = "false" ]; then contrib/verify-commits/verify-commits.sh; fi
     - export TRAVIS_COMMIT_LOG=`git log --format=fuller -1`
     - if [ -n "$USE_SHELL" ]; then export CONFIG_SHELL="$USE_SHELL"; fi
     - OUTDIR=$BASE_OUTDIR/$TRAVIS_PULL_REQUEST/$TRAVIS_JOB_NUMBER-$HOST

From 885cfdd2179a2aae733d0690f5a2ef23d181768e Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Thu, 2 Feb 2017 13:51:57 -0500
Subject: [PATCH 1665/1802] Fix super-unlikely race introduced in
 236618061a445d2cb11e72

Once the CNode has been added to vNodes, it is possible that it is
disconnected+deleted in the socket handler thread. However, after
that we now call InitializeNode, which accesses the pnode.

helgrind managed to tickle this case (somehow), but I suspect it
requires in immensely braindead scheduler.
---
 src/net.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/net.cpp b/src/net.cpp
index df88b12c76fd5..35d3348adcb3c 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -1833,11 +1833,11 @@ bool CConnman::OpenNetworkConnection(const CAddress& addrConnect, bool fCountFai
     if (fAddnode)
         pnode->fAddnode = true;
 
+    GetNodeSignals().InitializeNode(pnode, *this);
     {
         LOCK(cs_vNodes);
         vNodes.push_back(pnode);
     }
-    GetNodeSignals().InitializeNode(pnode, *this);
 
     return true;
 }

From 80ff0344aebbdebdfa7433d855b0aa9de6c4bed3 Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Wed, 14 Dec 2016 16:41:37 -0800
Subject: [PATCH 1666/1802] Dont deserialize nVersion into CNode, should fix
 #9212

---
 src/net_processing.cpp | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/net_processing.cpp b/src/net_processing.cpp
index b9667eb6c64b7..6dcb907bcfceb 100644
--- a/src/net_processing.cpp
+++ b/src/net_processing.cpp
@@ -1199,7 +1199,8 @@ bool static ProcessMessage(CNode* pfrom, std::string strCommand, CDataStream& vR
         CAddress addrFrom;
         uint64_t nNonce = 1;
         uint64_t nServiceInt;
-        vRecv >> pfrom->nVersion >> nServiceInt >> nTime >> addrMe;
+        int nVersion;
+        vRecv >> nVersion >> nServiceInt >> nTime >> addrMe;
         pfrom->nServices = ServiceFlags(nServiceInt);
         if (!pfrom->fInbound)
         {
@@ -1214,18 +1215,18 @@ bool static ProcessMessage(CNode* pfrom, std::string strCommand, CDataStream& vR
             return false;
         }
 
-        if (pfrom->nVersion < MIN_PEER_PROTO_VERSION)
+        if (nVersion < MIN_PEER_PROTO_VERSION)
         {
             // disconnect from peers older than this proto version
-            LogPrintf("peer=%d using obsolete version %i; disconnecting\n", pfrom->id, pfrom->nVersion);
+            LogPrintf("peer=%d using obsolete version %i; disconnecting\n", pfrom->id, nVersion);
             connman.PushMessage(pfrom, CNetMsgMaker(INIT_PROTO_VERSION).Make(NetMsgType::REJECT, strCommand, REJECT_OBSOLETE,
                                strprintf("Version must be %d or greater", MIN_PEER_PROTO_VERSION)));
             pfrom->fDisconnect = true;
             return false;
         }
 
-        if (pfrom->nVersion == 10300)
-            pfrom->nVersion = 300;
+        if (nVersion == 10300)
+            nVersion = 300;
         if (!vRecv.empty())
             vRecv >> addrFrom >> nNonce;
         if (!vRecv.empty()) {
@@ -1277,7 +1278,8 @@ bool static ProcessMessage(CNode* pfrom, std::string strCommand, CDataStream& vR
 
         // Change version
         connman.PushMessage(pfrom, CNetMsgMaker(INIT_PROTO_VERSION).Make(NetMsgType::VERACK));
-        int nSendVersion = std::min(pfrom->nVersion, PROTOCOL_VERSION);
+        int nSendVersion = std::min(nVersion, PROTOCOL_VERSION);
+        pfrom->nVersion = nVersion;
         pfrom->SetSendVersion(nSendVersion);
 
         if (!pfrom->fInbound)

From 2046617b5e06ddb7f960b28219c155995542f029 Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Wed, 18 Jan 2017 18:15:00 -0500
Subject: [PATCH 1667/1802] net: deserialize the entire version message locally

This avoids having some vars set if the version negotiation fails.

Also copy it all into CNode at the same site. nVersion and
fSuccessfullyConnected are set last, as they are the gates for the other vars.
Make them atomic for that reason.
---
 src/net.h              |  4 +--
 src/net_processing.cpp | 61 +++++++++++++++++++++++-------------------
 2 files changed, 36 insertions(+), 29 deletions(-)

diff --git a/src/net.h b/src/net.h
index 0b8efcc882ad5..c51ae5a18dff4 100644
--- a/src/net.h
+++ b/src/net.h
@@ -627,7 +627,7 @@ class CNode
     const CAddress addr;
     std::string addrName;
     CService addrLocal;
-    int nVersion;
+    std::atomic<int> nVersion;
     // strSubVer is whatever byte array we read from the wire. However, this field is intended
     // to be printed out, displayed to humans in various forms and so on. So we sanitize it and
     // store the sanitized version in cleanSubVer. The original should be used when dealing with
@@ -639,7 +639,7 @@ class CNode
     bool fAddnode;
     bool fClient;
     const bool fInbound;
-    bool fSuccessfullyConnected;
+    std::atomic_bool fSuccessfullyConnected;
     std::atomic_bool fDisconnect;
     // We use fRelayTxes for two purposes -
     // a) it allows us to not relay tx invs before receiving the peer's version message
diff --git a/src/net_processing.cpp b/src/net_processing.cpp
index 6dcb907bcfceb..d1e6b1ae045a6 100644
--- a/src/net_processing.cpp
+++ b/src/net_processing.cpp
@@ -1199,16 +1199,23 @@ bool static ProcessMessage(CNode* pfrom, std::string strCommand, CDataStream& vR
         CAddress addrFrom;
         uint64_t nNonce = 1;
         uint64_t nServiceInt;
+        ServiceFlags nServices;
         int nVersion;
+        int nSendVersion;
+        std::string strSubVer;
+        int nStartingHeight = -1;
+        bool fRelay = true;
+
         vRecv >> nVersion >> nServiceInt >> nTime >> addrMe;
-        pfrom->nServices = ServiceFlags(nServiceInt);
+        nSendVersion = std::min(nVersion, PROTOCOL_VERSION);
+        nServices = ServiceFlags(nServiceInt);
         if (!pfrom->fInbound)
         {
-            connman.SetServices(pfrom->addr, pfrom->nServices);
+            connman.SetServices(pfrom->addr, nServices);
         }
-        if (pfrom->nServicesExpected & ~pfrom->nServices)
+        if (pfrom->nServicesExpected & ~nServices)
         {
-            LogPrint("net", "peer=%d does not offer the expected services (%08x offered, %08x expected); disconnecting\n", pfrom->id, pfrom->nServices, pfrom->nServicesExpected);
+            LogPrint("net", "peer=%d does not offer the expected services (%08x offered, %08x expected); disconnecting\n", pfrom->id, nServices, pfrom->nServicesExpected);
             connman.PushMessage(pfrom, CNetMsgMaker(INIT_PROTO_VERSION).Make(NetMsgType::REJECT, strCommand, REJECT_NONSTANDARD,
                                strprintf("Expected to offer services %08x", pfrom->nServicesExpected)));
             pfrom->fDisconnect = true;
@@ -1230,20 +1237,13 @@ bool static ProcessMessage(CNode* pfrom, std::string strCommand, CDataStream& vR
         if (!vRecv.empty())
             vRecv >> addrFrom >> nNonce;
         if (!vRecv.empty()) {
-            vRecv >> LIMITED_STRING(pfrom->strSubVer, MAX_SUBVERSION_LENGTH);
-            pfrom->cleanSubVer = SanitizeString(pfrom->strSubVer);
+            vRecv >> LIMITED_STRING(strSubVer, MAX_SUBVERSION_LENGTH);
         }
         if (!vRecv.empty()) {
-            vRecv >> pfrom->nStartingHeight;
+            vRecv >> nStartingHeight;
         }
-        {
-            LOCK(pfrom->cs_filter);
-            if (!vRecv.empty())
-                vRecv >> pfrom->fRelayTxes; // set to true after we get the first filter* message
-            else
-                pfrom->fRelayTxes = true;
-        }
-
+        if (!vRecv.empty())
+            vRecv >> fRelay;
         // Disconnect if we connected to ourself
         if (pfrom->fInbound && !connman.CheckIncomingNonce(nNonce))
         {
@@ -1252,7 +1252,6 @@ bool static ProcessMessage(CNode* pfrom, std::string strCommand, CDataStream& vR
             return true;
         }
 
-        pfrom->addrLocal = addrMe;
         if (pfrom->fInbound && addrMe.IsRoutable())
         {
             SeenLocal(addrMe);
@@ -1262,9 +1261,25 @@ bool static ProcessMessage(CNode* pfrom, std::string strCommand, CDataStream& vR
         if (pfrom->fInbound)
             PushNodeVersion(pfrom, connman, GetAdjustedTime());
 
-        pfrom->fClient = !(pfrom->nServices & NODE_NETWORK);
+        connman.PushMessage(pfrom, CNetMsgMaker(INIT_PROTO_VERSION).Make(NetMsgType::VERACK));
+
+        pfrom->nServices = nServices;
+        pfrom->addrLocal = addrMe;
+        pfrom->strSubVer = strSubVer;
+        pfrom->cleanSubVer = SanitizeString(strSubVer);
+        pfrom->nStartingHeight = nStartingHeight;
+        pfrom->fClient = !(nServices & NODE_NETWORK);
+        {
+            LOCK(pfrom->cs_filter);
+            pfrom->fRelayTxes = fRelay; // set to true after we get the first filter* message
+        }
+
+        // Change version
+        pfrom->SetSendVersion(nSendVersion);
+        pfrom->nVersion = nVersion;
+        pfrom->fSuccessfullyConnected = true;
 
-        if((pfrom->nServices & NODE_WITNESS))
+        if((nServices & NODE_WITNESS))
         {
             LOCK(cs_main);
             State(pfrom->GetId())->fHaveWitness = true;
@@ -1276,12 +1291,6 @@ bool static ProcessMessage(CNode* pfrom, std::string strCommand, CDataStream& vR
         UpdatePreferredDownload(pfrom, State(pfrom->GetId()));
         }
 
-        // Change version
-        connman.PushMessage(pfrom, CNetMsgMaker(INIT_PROTO_VERSION).Make(NetMsgType::VERACK));
-        int nSendVersion = std::min(nVersion, PROTOCOL_VERSION);
-        pfrom->nVersion = nVersion;
-        pfrom->SetSendVersion(nSendVersion);
-
         if (!pfrom->fInbound)
         {
             // Advertise our address
@@ -1309,8 +1318,6 @@ bool static ProcessMessage(CNode* pfrom, std::string strCommand, CDataStream& vR
             connman.MarkAddressGood(pfrom->addr);
         }
 
-        pfrom->fSuccessfullyConnected = true;
-
         std::string remoteAddr;
         if (fLogIPs)
             remoteAddr = ", peeraddr=" + pfrom->addr.ToString();
@@ -1352,7 +1359,7 @@ bool static ProcessMessage(CNode* pfrom, std::string strCommand, CDataStream& vR
 
     if (strCommand == NetMsgType::VERACK)
     {
-        pfrom->SetRecvVersion(std::min(pfrom->nVersion, PROTOCOL_VERSION));
+        pfrom->SetRecvVersion(std::min(pfrom->nVersion.load(), PROTOCOL_VERSION));
 
         if (!pfrom->fInbound) {
             // Mark this node as currently connected, so we update its timestamp later.

From 12752af0cc99745d6273ef072645d999c26a9ef7 Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Fri, 20 Jan 2017 20:34:57 -0500
Subject: [PATCH 1668/1802] net: don't run callbacks on nodes that haven't
 completed the version handshake

Since ForEach* are can be used to send messages to  all nodes, the caller may
end up sending a message before the version handshake is complete. To limit
this, filter out these nodes. While we're at it, may as well filter out
disconnected nodes as well.

Delete unused methods rather than updating them.
---
 src/net.cpp |  7 ++++-
 src/net.h   | 75 ++++++++++++++---------------------------------------
 2 files changed, 25 insertions(+), 57 deletions(-)

diff --git a/src/net.cpp b/src/net.cpp
index df88b12c76fd5..19358dd5b795a 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -2630,6 +2630,11 @@ void CNode::AskFor(const CInv& inv)
     mapAskFor.insert(std::make_pair(nRequestTime, inv));
 }
 
+bool CConnman::NodeFullyConnected(const CNode* pnode)
+{
+    return pnode && pnode->fSuccessfullyConnected && !pnode->fDisconnect;
+}
+
 void CConnman::PushMessage(CNode* pnode, CSerializedNetMsg&& msg)
 {
     size_t nMessageSize = msg.data.size();
@@ -2680,7 +2685,7 @@ bool CConnman::ForNode(NodeId id, std::function<bool(CNode* pnode)> func)
             break;
         }
     }
-    return found != nullptr && func(found);
+    return found != nullptr && NodeFullyConnected(found) && func(found);
 }
 
 int64_t PoissonNextSend(int64_t nNow, int average_interval_seconds) {
diff --git a/src/net.h b/src/net.h
index c51ae5a18dff4..05f178f9c50fa 100644
--- a/src/net.h
+++ b/src/net.h
@@ -161,76 +161,34 @@ class CConnman
 
     void PushMessage(CNode* pnode, CSerializedNetMsg&& msg);
 
-    template<typename Callable>
-    bool ForEachNodeContinueIf(Callable&& func)
-    {
-        LOCK(cs_vNodes);
-        for (auto&& node : vNodes)
-            if(!func(node))
-                return false;
-        return true;
-    };
-
-    template<typename Callable>
-    bool ForEachNodeContinueIf(Callable&& func) const
-    {
-        LOCK(cs_vNodes);
-        for (const auto& node : vNodes)
-            if(!func(node))
-                return false;
-        return true;
-    };
-
-    template<typename Callable, typename CallableAfter>
-    bool ForEachNodeContinueIfThen(Callable&& pre, CallableAfter&& post)
-    {
-        bool ret = true;
-        LOCK(cs_vNodes);
-        for (auto&& node : vNodes)
-            if(!pre(node)) {
-                ret = false;
-                break;
-            }
-        post();
-        return ret;
-    };
-
-    template<typename Callable, typename CallableAfter>
-    bool ForEachNodeContinueIfThen(Callable&& pre, CallableAfter&& post) const
-    {
-        bool ret = true;
-        LOCK(cs_vNodes);
-        for (const auto& node : vNodes)
-            if(!pre(node)) {
-                ret = false;
-                break;
-            }
-        post();
-        return ret;
-    };
-
     template<typename Callable>
     void ForEachNode(Callable&& func)
     {
         LOCK(cs_vNodes);
-        for (auto&& node : vNodes)
-            func(node);
+        for (auto&& node : vNodes) {
+            if (NodeFullyConnected(node))
+                func(node);
+        }
     };
 
     template<typename Callable>
     void ForEachNode(Callable&& func) const
     {
         LOCK(cs_vNodes);
-        for (const auto& node : vNodes)
-            func(node);
+        for (auto&& node : vNodes) {
+            if (NodeFullyConnected(node))
+                func(node);
+        }
     };
 
     template<typename Callable, typename CallableAfter>
     void ForEachNodeThen(Callable&& pre, CallableAfter&& post)
     {
         LOCK(cs_vNodes);
-        for (auto&& node : vNodes)
-            pre(node);
+        for (auto&& node : vNodes) {
+            if (NodeFullyConnected(node))
+                pre(node);
+        }
         post();
     };
 
@@ -238,8 +196,10 @@ class CConnman
     void ForEachNodeThen(Callable&& pre, CallableAfter&& post) const
     {
         LOCK(cs_vNodes);
-        for (const auto& node : vNodes)
-            pre(node);
+        for (auto&& node : vNodes) {
+            if (NodeFullyConnected(node))
+                pre(node);
+        }
         post();
     };
 
@@ -372,6 +332,9 @@ class CConnman
     void RecordBytesRecv(uint64_t bytes);
     void RecordBytesSent(uint64_t bytes);
 
+    // Whether the node should be passed out in ForEach* callbacks
+    static bool NodeFullyConnected(const CNode* pnode);
+
     // Network usage totals
     CCriticalSection cs_totalBytesRecv;
     CCriticalSection cs_totalBytesSent;

From 7a8c2519015650acd51eaf42719f04e53f839bbe Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Thu, 26 Jan 2017 12:35:49 -0500
Subject: [PATCH 1669/1802] net: Disallow sending messages until the version
 handshake is complete

This is a change in behavior, though it's much more sane now than before.
---
 src/net_processing.cpp | 6 +++---
 src/test/DoS_tests.cpp | 4 ++++
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/net_processing.cpp b/src/net_processing.cpp
index d1e6b1ae045a6..a7acd6edffd13 100644
--- a/src/net_processing.cpp
+++ b/src/net_processing.cpp
@@ -1277,7 +1277,6 @@ bool static ProcessMessage(CNode* pfrom, std::string strCommand, CDataStream& vR
         // Change version
         pfrom->SetSendVersion(nSendVersion);
         pfrom->nVersion = nVersion;
-        pfrom->fSuccessfullyConnected = true;
 
         if((nServices & NODE_WITNESS))
         {
@@ -1387,6 +1386,7 @@ bool static ProcessMessage(CNode* pfrom, std::string strCommand, CDataStream& vR
             nCMPCTBLOCKVersion = 1;
             connman.PushMessage(pfrom, msgMaker.Make(NetMsgType::SENDCMPCT, fAnnounceUsingCMPCTBLOCK, nCMPCTBLOCKVersion));
         }
+        pfrom->fSuccessfullyConnected = true;
     }
 
 
@@ -2725,8 +2725,8 @@ bool SendMessages(CNode* pto, CConnman& connman, std::atomic<bool>& interruptMsg
 {
     const Consensus::Params& consensusParams = Params().GetConsensus();
     {
-        // Don't send anything until we get its version message
-        if (pto->nVersion == 0 || pto->fDisconnect)
+        // Don't send anything until the version handshake is complete
+        if (!pto->fSuccessfullyConnected || pto->fDisconnect)
             return true;
 
         // If we get here, the outgoing message serialization version is set and can't change.
diff --git a/src/test/DoS_tests.cpp b/src/test/DoS_tests.cpp
index 9345a44fb0903..a8f09ba6aef7a 100644
--- a/src/test/DoS_tests.cpp
+++ b/src/test/DoS_tests.cpp
@@ -55,6 +55,7 @@ BOOST_AUTO_TEST_CASE(DoS_banning)
     dummyNode1.SetSendVersion(PROTOCOL_VERSION);
     GetNodeSignals().InitializeNode(&dummyNode1, *connman);
     dummyNode1.nVersion = 1;
+    dummyNode1.fSuccessfullyConnected = true;
     Misbehaving(dummyNode1.GetId(), 100); // Should get banned
     SendMessages(&dummyNode1, *connman, interruptDummy);
     BOOST_CHECK(connman->IsBanned(addr1));
@@ -65,6 +66,7 @@ BOOST_AUTO_TEST_CASE(DoS_banning)
     dummyNode2.SetSendVersion(PROTOCOL_VERSION);
     GetNodeSignals().InitializeNode(&dummyNode2, *connman);
     dummyNode2.nVersion = 1;
+    dummyNode2.fSuccessfullyConnected = true;
     Misbehaving(dummyNode2.GetId(), 50);
     SendMessages(&dummyNode2, *connman, interruptDummy);
     BOOST_CHECK(!connman->IsBanned(addr2)); // 2 not banned yet...
@@ -85,6 +87,7 @@ BOOST_AUTO_TEST_CASE(DoS_banscore)
     dummyNode1.SetSendVersion(PROTOCOL_VERSION);
     GetNodeSignals().InitializeNode(&dummyNode1, *connman);
     dummyNode1.nVersion = 1;
+    dummyNode1.fSuccessfullyConnected = true;
     Misbehaving(dummyNode1.GetId(), 100);
     SendMessages(&dummyNode1, *connman, interruptDummy);
     BOOST_CHECK(!connman->IsBanned(addr1));
@@ -110,6 +113,7 @@ BOOST_AUTO_TEST_CASE(DoS_bantime)
     dummyNode.SetSendVersion(PROTOCOL_VERSION);
     GetNodeSignals().InitializeNode(&dummyNode, *connman);
     dummyNode.nVersion = 1;
+    dummyNode.fSuccessfullyConnected = true;
 
     Misbehaving(dummyNode.GetId(), 100);
     SendMessages(&dummyNode, *connman, interruptDummy);

From 08bb6f4ed48359aedd869450b99799b9c734084b Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Thu, 2 Feb 2017 14:33:41 -0500
Subject: [PATCH 1670/1802] net: log an error rather than asserting if send
 version is misused

Also cleaned up the comments and moved from the header to the .cpp so that
logging headers aren't needed from net.h
---
 src/net.cpp | 27 +++++++++++++++++++++++++++
 src/net.h   | 21 ++-------------------
 2 files changed, 29 insertions(+), 19 deletions(-)

diff --git a/src/net.cpp b/src/net.cpp
index 19358dd5b795a..db914096f8896 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -689,6 +689,33 @@ bool CNode::ReceiveMsgBytes(const char *pch, unsigned int nBytes, bool& complete
     return true;
 }
 
+void CNode::SetSendVersion(int nVersionIn)
+{
+    // Send version may only be changed in the version message, and
+    // only one version message is allowed per session. We can therefore
+    // treat this value as const and even atomic as long as it's only used
+    // once a version message has been successfully processed. Any attempt to
+    // set this twice is an error.
+    if (nSendVersion != 0) {
+        error("Send version already set for node: %i. Refusing to change from %i to %i", id, nSendVersion, nVersionIn);
+    } else {
+        nSendVersion = nVersionIn;
+    }
+}
+
+int CNode::GetSendVersion() const
+{
+    // The send version should always be explicitly set to
+    // INIT_PROTO_VERSION rather than using this value until SetSendVersion
+    // has been called.
+    if (nSendVersion == 0) {
+        error("Requesting unset send version for node: %i. Using %i", id, INIT_PROTO_VERSION);
+        return INIT_PROTO_VERSION;
+    }
+    return nSendVersion;
+}
+
+
 int CNetMessage::readHeader(const char *pch, unsigned int nBytes)
 {
     // copy data to temporary parsing buffer
diff --git a/src/net.h b/src/net.h
index 05f178f9c50fa..1e3033785ef40 100644
--- a/src/net.h
+++ b/src/net.h
@@ -723,25 +723,8 @@ class CNode
     {
         return nRecvVersion;
     }
-    void SetSendVersion(int nVersionIn)
-    {
-        // Send version may only be changed in the version message, and
-        // only one version message is allowed per session. We can therefore
-        // treat this value as const and even atomic as long as it's only used
-        // once the handshake is complete. Any attempt to set this twice is an
-        // error.
-        assert(nSendVersion == 0);
-        nSendVersion = nVersionIn;
-    }
-
-    int GetSendVersion() const
-    {
-        // The send version should always be explicitly set to
-        // INIT_PROTO_VERSION rather than using this value until the handshake
-        // is complete.
-        assert(nSendVersion != 0);
-        return nSendVersion;
-    }
+    void SetSendVersion(int nVersionIn);
+    int GetSendVersion() const;
 
     CNode* AddRef()
     {

From 7ea0ad539ff83f09cf617a9fb7c4d774e45efdc0 Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Sat, 6 Jun 2015 11:45:35 -0700
Subject: [PATCH 1671/1802] Fail in DecodeHexTx if there is extra data at the
 end

---
 src/core_read.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/core_read.cpp b/src/core_read.cpp
index a5f232c22857a..a8d667e3bc74e 100644
--- a/src/core_read.cpp
+++ b/src/core_read.cpp
@@ -111,6 +111,8 @@ bool DecodeHexTx(CMutableTransaction& tx, const std::string& strHexTx, bool fTry
     CDataStream ssData(txData, SER_NETWORK, PROTOCOL_VERSION);
     try {
         ssData >> tx;
+        if (!ssData.empty())
+            return false;
     }
     catch (const std::exception&) {
         return false;

From 922bea90c274d45b13812a031242964aa15b6c1d Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Sat, 28 Jan 2017 11:32:34 -0500
Subject: [PATCH 1672/1802] Better handle invalid parameters to
 signrawtransaction

This silently skips trying to merge signatures from inputs which
do not exist from transactions provided to signrawtransaction,
instead of hitting an assert.
---
 src/rpc/rawtransaction.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/rpc/rawtransaction.cpp b/src/rpc/rawtransaction.cpp
index c10de45f8bf8e..21396ebb09b78 100644
--- a/src/rpc/rawtransaction.cpp
+++ b/src/rpc/rawtransaction.cpp
@@ -835,7 +835,9 @@ UniValue signrawtransaction(const JSONRPCRequest& request)
 
         // ... and merge in other signatures:
         BOOST_FOREACH(const CMutableTransaction& txv, txVariants) {
-            sigdata = CombineSignatures(prevPubKey, TransactionSignatureChecker(&txConst, i, amount), sigdata, DataFromTransaction(txv, i));
+            if (txv.vin.size() > i) {
+                sigdata = CombineSignatures(prevPubKey, TransactionSignatureChecker(&txConst, i, amount), sigdata, DataFromTransaction(txv, i));
+            }
         }
 
         UpdateTransaction(mergedTx, i, sigdata);

From 691710a648c54c96c302ebbe666da85cfaada5f9 Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Thu, 2 Feb 2017 15:11:28 -0500
Subject: [PATCH 1673/1802] [qa] Test that decoderawtransaction throws with
 extra data appended

---
 qa/rpc-tests/signrawtransactions.py | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/qa/rpc-tests/signrawtransactions.py b/qa/rpc-tests/signrawtransactions.py
index c61a280616cf7..009f01f79b530 100755
--- a/qa/rpc-tests/signrawtransactions.py
+++ b/qa/rpc-tests/signrawtransactions.py
@@ -78,6 +78,16 @@ def script_verification_error_test(self):
         outputs = {'mpLQjfK79b7CCV4VMJWEWAj5Mpx8Up5zxB': 0.1}
 
         rawTx = self.nodes[0].createrawtransaction(inputs, outputs)
+
+        # Make sure decoderawtransaction is at least marginally sane
+        decodedRawTx = self.nodes[0].decoderawtransaction(rawTx)
+        for i, inp in enumerate(inputs):
+            assert_equal(decodedRawTx["vin"][i]["txid"], inp["txid"])
+            assert_equal(decodedRawTx["vin"][i]["vout"], inp["vout"])
+
+        # Make sure decoderawtransaction throws if there is extra data
+        assert_raises(JSONRPCException, self.nodes[0].decoderawtransaction, rawTx + "00")
+
         rawTxSigned = self.nodes[0].signrawtransaction(rawTx, scripts, privKeys)
 
         # 3) The transaction has no complete set of signatures

From ec4f7e433e5b1724ca427e73fb264de693e82235 Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Thu, 2 Feb 2017 16:24:31 -0500
Subject: [PATCH 1674/1802] [qa] Add second input to signrawtransaction test
 case

---
 qa/rpc-tests/signrawtransactions.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/qa/rpc-tests/signrawtransactions.py b/qa/rpc-tests/signrawtransactions.py
index 009f01f79b530..1705ab96c41dc 100755
--- a/qa/rpc-tests/signrawtransactions.py
+++ b/qa/rpc-tests/signrawtransactions.py
@@ -26,12 +26,14 @@ def successful_signing_test(self):
 
         1) The transaction has a complete set of signatures
         2) No script verification error occurred"""
-        privKeys = ['cUeKHd5orzT3mz8P9pxyREHfsWtVfgsfDjiZZBcjUBAaGk1BTj7N']
+        privKeys = ['cUeKHd5orzT3mz8P9pxyREHfsWtVfgsfDjiZZBcjUBAaGk1BTj7N', 'cVKpPfVKSJxKqVpE9awvXNWuLHCa5j5tiE7K6zbUSptFpTEtiFrA']
 
         inputs = [
-            # Valid pay-to-pubkey script
+            # Valid pay-to-pubkey scripts
             {'txid': '9b907ef1e3c26fc71fe4a4b3580bc75264112f95050014157059c736f0202e71', 'vout': 0,
-             'scriptPubKey': '76a91460baa0f494b38ce3c940dea67f3804dc52d1fb9488ac'}
+             'scriptPubKey': '76a91460baa0f494b38ce3c940dea67f3804dc52d1fb9488ac'},
+            {'txid': '83a4f6a6b73660e13ee6cb3c6063fa3759c50c9b7521d0536022961898f4fb02', 'vout': 0,
+             'scriptPubKey': '76a914669b857c03a5ed269d5d85a1ffac9ed5d663072788ac'},
         ]
 
         outputs = {'mpLQjfK79b7CCV4VMJWEWAj5Mpx8Up5zxB': 0.1}

From 4ec057dfa72fbb910fec69305af1ff6d5e03ca30 Mon Sep 17 00:00:00 2001
From: Russell Yanofsky <russ@yanofsky.org>
Date: Thu, 2 Feb 2017 17:34:22 -0500
Subject: [PATCH 1675/1802] [wallet] Set correct metadata on bumpfee wallet
 transactions

Preserve comment, order form, and account strings from the original wallet
transaction. Also set fTimeReceivedIsTxTime and fFromMe fields for consistency
with CWallet::CreateTransaction. The latter two fields don't influence current
wallet behavior, but do record that the transaction originated in the wallet
instead of coming from the network or sendrawtransaction.
---
 qa/rpc-tests/bumpfee.py  | 9 +++++++++
 src/wallet/rpcwallet.cpp | 5 +++++
 2 files changed, 14 insertions(+)

diff --git a/qa/rpc-tests/bumpfee.py b/qa/rpc-tests/bumpfee.py
index 0ebd79f7f32ef..ac282796c1460 100755
--- a/qa/rpc-tests/bumpfee.py
+++ b/qa/rpc-tests/bumpfee.py
@@ -69,6 +69,7 @@ def run_test(self):
         test_rebumping(rbf_node, dest_address)
         test_rebumping_not_replaceable(rbf_node, dest_address)
         test_unconfirmed_not_spendable(rbf_node, rbf_node_address)
+        test_bumpfee_metadata(rbf_node, dest_address)
         test_locked_wallet_fails(rbf_node, dest_address)
         print("Success")
 
@@ -257,6 +258,14 @@ def test_unconfirmed_not_spendable(rbf_node, rbf_node_address):
             if t["txid"] == rbfid and t["address"] == rbf_node_address and t["spendable"]), 1)
 
 
+def test_bumpfee_metadata(rbf_node, dest_address):
+    rbfid = rbf_node.sendtoaddress(dest_address, 0.00090000, "comment value", "to value")
+    bumped_tx = rbf_node.bumpfee(rbfid)
+    bumped_wtx = rbf_node.gettransaction(bumped_tx["txid"])
+    assert_equal(bumped_wtx["comment"], "comment value")
+    assert_equal(bumped_wtx["to"], "to value")
+
+
 def test_locked_wallet_fails(rbf_node, dest_address):
     rbfid = create_fund_sign_send(rbf_node, {dest_address: 0.00090000})
     rbf_node.walletlock()
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index 36753d111632e..45b572aa2e2e6 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -2944,7 +2944,12 @@ UniValue bumpfee(const JSONRPCRequest& request)
     // commit/broadcast the tx
     CReserveKey reservekey(pwalletMain);
     CWalletTx wtxBumped(pwalletMain, MakeTransactionRef(std::move(tx)));
+    wtxBumped.mapValue = wtx.mapValue;
     wtxBumped.mapValue["replaces_txid"] = hash.ToString();
+    wtxBumped.vOrderForm = wtx.vOrderForm;
+    wtxBumped.strFromAccount = wtx.strFromAccount;
+    wtxBumped.fTimeReceivedIsTxTime = true;
+    wtxBumped.fFromMe = true;
     CValidationState state;
     if (!pwalletMain->CommitTransaction(wtxBumped, reservekey, g_connman.get(), state)) {
         // NOTE: CommitTransaction never returns false, so this should never happen.

From 6dbfe08c29535bb7b0359de8fe22acedcbf3532a Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Thu, 2 Feb 2017 16:24:52 -0500
Subject: [PATCH 1676/1802] [qa] test signrawtransaction merge with missing
 inputs

---
 qa/rpc-tests/signrawtransactions.py | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/qa/rpc-tests/signrawtransactions.py b/qa/rpc-tests/signrawtransactions.py
index 1705ab96c41dc..109312bd5f2df 100755
--- a/qa/rpc-tests/signrawtransactions.py
+++ b/qa/rpc-tests/signrawtransactions.py
@@ -48,6 +48,22 @@ def successful_signing_test(self):
         # 2) No script verification error occurred
         assert 'errors' not in rawTxSigned
 
+        # Check that signrawtransaction doesn't blow up on garbage merge attempts
+        dummyTxInconsistent = self.nodes[0].createrawtransaction([inputs[0]], outputs)
+        rawTxUnsigned = self.nodes[0].signrawtransaction(rawTx + dummyTxInconsistent, inputs)
+
+        assert 'complete' in rawTxUnsigned
+        assert_equal(rawTxUnsigned['complete'], False)
+
+        # Check that signrawtransaction properly merges unsigned and signed txn, even with garbage in the middle
+        rawTxSigned2 = self.nodes[0].signrawtransaction(rawTxUnsigned["hex"] + dummyTxInconsistent + rawTxSigned["hex"], inputs)
+
+        assert 'complete' in rawTxSigned2
+        assert_equal(rawTxSigned2['complete'], True)
+
+        assert 'errors' not in rawTxSigned2
+
+
     def script_verification_error_test(self):
         """Creates and signs a raw transaction with valid (vin 0), invalid (vin 1) and one missing (vin 2) input script.
 

From fd13eca147be80f3ebd1a5a1db1ce75bbeeb1953 Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Thu, 2 Feb 2017 20:03:46 -0500
Subject: [PATCH 1677/1802] Lock cs_vSend and cs_inventory in a consistent
 order even in TRY

---
 src/net.cpp | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/net.cpp b/src/net.cpp
index df88b12c76fd5..5cddc6f44dcc0 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -1070,12 +1070,13 @@ void CConnman::ThreadSocketHandler()
                 {
                     bool fDelete = false;
                     {
-                        TRY_LOCK(pnode->cs_vSend, lockSend);
-                        if (lockSend)
+                        TRY_LOCK(pnode->cs_inventory, lockInv);
+                        if (lockInv)
                         {
-                                TRY_LOCK(pnode->cs_inventory, lockInv);
-                                if (lockInv)
-                                    fDelete = true;
+                            TRY_LOCK(pnode->cs_vSend, lockSend);
+                            if (lockSend) {
+                                fDelete = true;
+                            }
                         }
                     }
                     if (fDelete)

From 8465631845eac3db834942a4feb50f65c3401c68 Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Thu, 2 Feb 2017 22:22:01 -0500
Subject: [PATCH 1678/1802] Always enforce lock strict lock ordering (try or
 not)

---
 src/sync.cpp | 26 +-------------------------
 1 file changed, 1 insertion(+), 25 deletions(-)

diff --git a/src/sync.cpp b/src/sync.cpp
index a18d0f14858b4..25773f08e9830 100644
--- a/src/sync.cpp
+++ b/src/sync.cpp
@@ -77,52 +77,28 @@ boost::thread_specific_ptr<LockStack> lockstack;
 
 static void potential_deadlock_detected(const std::pair<void*, void*>& mismatch, const LockStack& s1, const LockStack& s2)
 {
-    // We attempt to not assert on probably-not deadlocks by assuming that
-    // a try lock will immediately have otherwise bailed if it had
-    // failed to get the lock
-    // We do this by, for the locks which triggered the potential deadlock,
-    // in either lockorder, checking that the second of the two which is locked
-    // is only a TRY_LOCK, ignoring locks if they are reentrant.
-    bool firstLocked = false;
-    bool secondLocked = false;
-    bool onlyMaybeDeadlock = false;
-
     LogPrintf("POTENTIAL DEADLOCK DETECTED\n");
     LogPrintf("Previous lock order was:\n");
     BOOST_FOREACH (const PAIRTYPE(void*, CLockLocation) & i, s2) {
         if (i.first == mismatch.first) {
             LogPrintf(" (1)");
-            if (!firstLocked && secondLocked && i.second.fTry)
-                onlyMaybeDeadlock = true;
-            firstLocked = true;
         }
         if (i.first == mismatch.second) {
             LogPrintf(" (2)");
-            if (!secondLocked && firstLocked && i.second.fTry)
-                onlyMaybeDeadlock = true;
-            secondLocked = true;
         }
         LogPrintf(" %s\n", i.second.ToString());
     }
-    firstLocked = false;
-    secondLocked = false;
     LogPrintf("Current lock order is:\n");
     BOOST_FOREACH (const PAIRTYPE(void*, CLockLocation) & i, s1) {
         if (i.first == mismatch.first) {
             LogPrintf(" (1)");
-            if (!firstLocked && secondLocked && i.second.fTry)
-                onlyMaybeDeadlock = true;
-            firstLocked = true;
         }
         if (i.first == mismatch.second) {
             LogPrintf(" (2)");
-            if (!secondLocked && firstLocked && i.second.fTry)
-                onlyMaybeDeadlock = true;
-            secondLocked = true;
         }
         LogPrintf(" %s\n", i.second.ToString());
     }
-    assert(onlyMaybeDeadlock);
+    assert(false);
 }
 
 static void push_lock(void* c, const CLockLocation& locklocation, bool fTry)

From 7b2d96b634f9fd283480caf3bece56138d0587e3 Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Fri, 3 Feb 2017 13:48:48 -0500
Subject: [PATCH 1679/1802] Access WorkQueue::running only within the cs lock.

This removes a "race" between Interrupt() and Run(), though it
should not effect any of our supported platforms.
---
 src/httpserver.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/httpserver.cpp b/src/httpserver.cpp
index 1692b43f28afe..e1763c6ad276c 100644
--- a/src/httpserver.cpp
+++ b/src/httpserver.cpp
@@ -118,7 +118,7 @@ class WorkQueue
     void Run()
     {
         ThreadCounter count(*this);
-        while (running) {
+        while (true) {
             std::unique_ptr<WorkItem> i;
             {
                 std::unique_lock<std::mutex> lock(cs);

From 2a962d4540a253f63803d1f145fa26b938e69633 Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Sat, 4 Feb 2017 16:44:05 -0500
Subject: [PATCH 1680/1802] Fixup style a bit by moving { to the same line as
 if statements

---
 src/net.cpp | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/net.cpp b/src/net.cpp
index 5cddc6f44dcc0..704d3b8d34fd8 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -1066,21 +1066,18 @@ void CConnman::ThreadSocketHandler()
             BOOST_FOREACH(CNode* pnode, vNodesDisconnectedCopy)
             {
                 // wait until threads are done using it
-                if (pnode->GetRefCount() <= 0)
-                {
+                if (pnode->GetRefCount() <= 0) {
                     bool fDelete = false;
                     {
                         TRY_LOCK(pnode->cs_inventory, lockInv);
-                        if (lockInv)
-                        {
+                        if (lockInv) {
                             TRY_LOCK(pnode->cs_vSend, lockSend);
                             if (lockSend) {
                                 fDelete = true;
                             }
                         }
                     }
-                    if (fDelete)
-                    {
+                    if (fDelete) {
                         vNodesDisconnected.remove(pnode);
                         DeleteNode(pnode);
                     }

From ac719c936dee55f386a8be88fe298d1b44b467dc Mon Sep 17 00:00:00 2001
From: Gregory Maxwell <greg@xiph.org>
Date: Sun, 5 Feb 2017 17:37:13 +0000
Subject: [PATCH 1681/1802] Init ECC context for test_bitcoin_fuzzy.

This avoids calling things like pubkey_parse with a null context argument.
---
 src/test/test_bitcoin_fuzzy.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/test/test_bitcoin_fuzzy.cpp b/src/test/test_bitcoin_fuzzy.cpp
index 376d8e428a7b8..c4983f6f5ccdf 100644
--- a/src/test/test_bitcoin_fuzzy.cpp
+++ b/src/test/test_bitcoin_fuzzy.cpp
@@ -18,6 +18,7 @@
 #include "streams.h"
 #include "undo.h"
 #include "version.h"
+#include "pubkey.h"
 
 #include <stdint.h>
 #include <unistd.h>
@@ -60,6 +61,7 @@ bool read_stdin(std::vector<char> &data) {
 
 int main(int argc, char **argv)
 {
+    ECCVerifyHandle globalVerifyHandle;
     std::vector<char> buffer;
     if (!read_stdin(buffer)) return 0;
 

From 45e2e085612463dd9cca9f1b221733afa6d52991 Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Mon, 6 Feb 2017 13:47:24 -0500
Subject: [PATCH 1682/1802] net: rearrange so that socket accesses can be
 grouped together

---
 src/net.cpp | 37 +++++++++++++++++++++++--------------
 1 file changed, 23 insertions(+), 14 deletions(-)

diff --git a/src/net.cpp b/src/net.cpp
index 4d0d781d6d2e8..b47514fd925d5 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -1152,9 +1152,6 @@ void CConnman::ThreadSocketHandler()
             {
                 if (pnode->hSocket == INVALID_SOCKET)
                     continue;
-                FD_SET(pnode->hSocket, &fdsetError);
-                hSocketMax = std::max(hSocketMax, pnode->hSocket);
-                have_fds = true;
 
                 // Implement the following logic:
                 // * If there is data to send, select() for sending data. As this only
@@ -1166,16 +1163,24 @@ void CConnman::ThreadSocketHandler()
                 //   receiving data.
                 // * Hand off all complete messages to the processor, to be handled without
                 //   blocking here.
+
+                bool select_recv = !pnode->fPauseRecv;
+                bool select_send;
                 {
                     LOCK(pnode->cs_vSend);
-                    if (!pnode->vSendMsg.empty()) {
-                        FD_SET(pnode->hSocket, &fdsetSend);
-                        continue;
-                    }
+                    select_send = !pnode->vSendMsg.empty();
                 }
-                {
-                    if (!pnode->fPauseRecv)
-                        FD_SET(pnode->hSocket, &fdsetRecv);
+
+                FD_SET(pnode->hSocket, &fdsetError);
+                hSocketMax = std::max(hSocketMax, pnode->hSocket);
+                have_fds = true;
+
+                if (select_send) {
+                    FD_SET(pnode->hSocket, &fdsetSend);
+                    continue;
+                }
+                if (select_recv) {
+                    FD_SET(pnode->hSocket, &fdsetRecv);
                 }
             }
         }
@@ -1229,9 +1234,15 @@ void CConnman::ThreadSocketHandler()
             //
             // Receive
             //
+            bool recvSet = false;
+            bool sendSet = false;
+            bool errorSet = false;
             if (pnode->hSocket == INVALID_SOCKET)
                 continue;
-            if (FD_ISSET(pnode->hSocket, &fdsetRecv) || FD_ISSET(pnode->hSocket, &fdsetError))
+            recvSet = FD_ISSET(pnode->hSocket, &fdsetRecv);
+            sendSet = FD_ISSET(pnode->hSocket, &fdsetSend);
+            errorSet = FD_ISSET(pnode->hSocket, &fdsetError);
+            if (recvSet || errorSet)
             {
                 {
                     {
@@ -1286,9 +1297,7 @@ void CConnman::ThreadSocketHandler()
             //
             // Send
             //
-            if (pnode->hSocket == INVALID_SOCKET)
-                continue;
-            if (FD_ISSET(pnode->hSocket, &fdsetSend))
+            if (sendSet)
             {
                 LOCK(pnode->cs_vSend);
                 size_t nBytes = SocketSendData(pnode);

From 9a0b784deaab6b9fffcab227d928987b981d0572 Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Mon, 6 Feb 2017 14:05:45 -0500
Subject: [PATCH 1683/1802] net: add a lock around hSocket

---
 src/net.cpp | 43 ++++++++++++++++++++++++++++---------------
 src/net.h   |  1 +
 2 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/src/net.cpp b/src/net.cpp
index b47514fd925d5..2625cccaa3a92 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -425,6 +425,7 @@ void CConnman::DumpBanlist()
 void CNode::CloseSocketDisconnect()
 {
     fDisconnect = true;
+    LOCK(cs_hSocket);
     if (hSocket != INVALID_SOCKET)
     {
         LogPrint("net", "disconnecting peer=%d\n", id);
@@ -789,7 +790,13 @@ size_t CConnman::SocketSendData(CNode *pnode) const
     while (it != pnode->vSendMsg.end()) {
         const auto &data = *it;
         assert(data.size() > pnode->nSendOffset);
-        int nBytes = send(pnode->hSocket, reinterpret_cast<const char*>(data.data()) + pnode->nSendOffset, data.size() - pnode->nSendOffset, MSG_NOSIGNAL | MSG_DONTWAIT);
+        int nBytes = 0;
+        {
+            LOCK(pnode->cs_hSocket);
+            if (pnode->hSocket == INVALID_SOCKET)
+                break;
+            nBytes = send(pnode->hSocket, reinterpret_cast<const char*>(data.data()) + pnode->nSendOffset, data.size() - pnode->nSendOffset, MSG_NOSIGNAL | MSG_DONTWAIT);
+        }
         if (nBytes > 0) {
             pnode->nLastSend = GetSystemTimeInSeconds();
             pnode->nSendBytes += nBytes;
@@ -1150,9 +1157,6 @@ void CConnman::ThreadSocketHandler()
             LOCK(cs_vNodes);
             BOOST_FOREACH(CNode* pnode, vNodes)
             {
-                if (pnode->hSocket == INVALID_SOCKET)
-                    continue;
-
                 // Implement the following logic:
                 // * If there is data to send, select() for sending data. As this only
                 //   happens when optimistic write failed, we choose to first drain the
@@ -1171,6 +1175,10 @@ void CConnman::ThreadSocketHandler()
                     select_send = !pnode->vSendMsg.empty();
                 }
 
+                LOCK(pnode->cs_hSocket);
+                if (pnode->hSocket == INVALID_SOCKET)
+                    continue;
+
                 FD_SET(pnode->hSocket, &fdsetError);
                 hSocketMax = std::max(hSocketMax, pnode->hSocket);
                 have_fds = true;
@@ -1237,18 +1245,27 @@ void CConnman::ThreadSocketHandler()
             bool recvSet = false;
             bool sendSet = false;
             bool errorSet = false;
-            if (pnode->hSocket == INVALID_SOCKET)
-                continue;
-            recvSet = FD_ISSET(pnode->hSocket, &fdsetRecv);
-            sendSet = FD_ISSET(pnode->hSocket, &fdsetSend);
-            errorSet = FD_ISSET(pnode->hSocket, &fdsetError);
+            {
+                LOCK(pnode->cs_hSocket);
+                if (pnode->hSocket == INVALID_SOCKET)
+                    continue;
+                recvSet = FD_ISSET(pnode->hSocket, &fdsetRecv);
+                sendSet = FD_ISSET(pnode->hSocket, &fdsetSend);
+                errorSet = FD_ISSET(pnode->hSocket, &fdsetError);
+            }
             if (recvSet || errorSet)
             {
                 {
                     {
                         // typical socket buffer is 8K-64K
                         char pchBuf[0x10000];
-                        int nBytes = recv(pnode->hSocket, pchBuf, sizeof(pchBuf), MSG_DONTWAIT);
+                        int nBytes = 0;
+                        {
+                            LOCK(pnode->cs_hSocket);
+                            if (pnode->hSocket == INVALID_SOCKET)
+                                continue;
+                            nBytes = recv(pnode->hSocket, pchBuf, sizeof(pchBuf), MSG_DONTWAIT);
+                        }
                         if (nBytes > 0)
                         {
                             bool notify = false;
@@ -2286,8 +2303,7 @@ void CConnman::Stop()
 
     // Close sockets
     BOOST_FOREACH(CNode* pnode, vNodes)
-        if (pnode->hSocket != INVALID_SOCKET)
-            CloseSocket(pnode->hSocket);
+        pnode->CloseSocketDisconnect();
     BOOST_FOREACH(ListenSocket& hListenSocket, vhListenSocket)
         if (hListenSocket.socket != INVALID_SOCKET)
             if (!CloseSocket(hListenSocket.socket))
@@ -2688,9 +2704,6 @@ void CConnman::PushMessage(CNode* pnode, CSerializedNetMsg&& msg)
     size_t nBytesSent = 0;
     {
         LOCK(pnode->cs_vSend);
-        if(pnode->hSocket == INVALID_SOCKET) {
-            return;
-        }
         bool optimisticSend(pnode->vSendMsg.empty());
 
         //log total amount of bytes per command
diff --git a/src/net.h b/src/net.h
index 38f8d82ceb306..e5a19e0f43ef4 100644
--- a/src/net.h
+++ b/src/net.h
@@ -572,6 +572,7 @@ class CNode
     uint64_t nSendBytes;
     std::deque<std::vector<unsigned char>> vSendMsg;
     CCriticalSection cs_vSend;
+    CCriticalSection cs_hSocket;
 
     CCriticalSection cs_vProcessMsg;
     std::list<CNetMessage> vProcessMsg;

From 8713de83a076c0e8e80f3bb0a6edf1f17d3856db Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Tue, 7 Feb 2017 09:41:47 +0000
Subject: [PATCH 1684/1802] build: Add options to override BDB cflags/libs

Add environment settings to specify the CFLAGS and LIBS to be used for
BerkeleyDB directly. These will completely by-pass autodetection in the
same way as other similar flags.

```
BDB_CFLAGS  C compiler flags for BerkeleyDB, bypasses autodetection
BDB_LIBS    Linker flags for BerkeleyDB, bypasses autodetection
```

Implements #3921.
---
 build-aux/m4/bitcoin_find_bdb48.m4 | 120 +++++++++++++++--------------
 1 file changed, 64 insertions(+), 56 deletions(-)

diff --git a/build-aux/m4/bitcoin_find_bdb48.m4 b/build-aux/m4/bitcoin_find_bdb48.m4
index 0c3d49c2bc0af..980f1e8f19cd2 100644
--- a/build-aux/m4/bitcoin_find_bdb48.m4
+++ b/build-aux/m4/bitcoin_find_bdb48.m4
@@ -3,68 +3,76 @@ dnl Distributed under the MIT software license, see the accompanying
 dnl file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 AC_DEFUN([BITCOIN_FIND_BDB48],[
-  AC_MSG_CHECKING([for Berkeley DB C++ headers])
-  BDB_CPPFLAGS=
-  BDB_LIBS=
-  bdbpath=X
-  bdb48path=X
-  bdbdirlist=
-  for _vn in 4.8 48 4 5 ''; do
-    for _pfx in b lib ''; do
-      bdbdirlist="$bdbdirlist ${_pfx}db${_vn}"
+  AC_ARG_VAR(BDB_CFLAGS, [C compiler flags for BerkeleyDB, bypasses autodetection])
+  AC_ARG_VAR(BDB_LIBS, [Linker flags for BerkeleyDB, bypasses autodetection])
+
+  if test "x$BDB_CFLAGS" = "x"; then
+    AC_MSG_CHECKING([for Berkeley DB C++ headers])
+    BDB_CPPFLAGS=
+    bdbpath=X
+    bdb48path=X
+    bdbdirlist=
+    for _vn in 4.8 48 4 5 ''; do
+      for _pfx in b lib ''; do
+        bdbdirlist="$bdbdirlist ${_pfx}db${_vn}"
+      done
+    done
+    for searchpath in $bdbdirlist ''; do
+      test -n "${searchpath}" && searchpath="${searchpath}/"
+      AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+        #include <${searchpath}db_cxx.h>
+      ]],[[
+        #if !((DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 8) || DB_VERSION_MAJOR > 4)
+          #error "failed to find bdb 4.8+"
+        #endif
+      ]])],[
+        if test "x$bdbpath" = "xX"; then
+          bdbpath="${searchpath}"
+        fi
+      ],[
+        continue
+      ])
+      AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+        #include <${searchpath}db_cxx.h>
+      ]],[[
+        #if !(DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR == 8)
+          #error "failed to find bdb 4.8"
+        #endif
+      ]])],[
+        bdb48path="${searchpath}"
+        break
+      ],[])
     done
-  done
-  for searchpath in $bdbdirlist ''; do
-    test -n "${searchpath}" && searchpath="${searchpath}/"
-    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
-      #include <${searchpath}db_cxx.h>
-    ]],[[
-      #if !((DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 8) || DB_VERSION_MAJOR > 4)
-        #error "failed to find bdb 4.8+"
-      #endif
-    ]])],[
-      if test "x$bdbpath" = "xX"; then
-        bdbpath="${searchpath}"
-      fi
-    ],[
-      continue
-    ])
-    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
-      #include <${searchpath}db_cxx.h>
-    ]],[[
-      #if !(DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR == 8)
-        #error "failed to find bdb 4.8"
-      #endif
-    ]])],[
-      bdb48path="${searchpath}"
-      break
-    ],[])
-  done
-  if test "x$bdbpath" = "xX"; then
-    AC_MSG_RESULT([no])
-    AC_MSG_ERROR([libdb_cxx headers missing, ]AC_PACKAGE_NAME[ requires this library for wallet functionality (--disable-wallet to disable wallet functionality)])
-  elif test "x$bdb48path" = "xX"; then
-    BITCOIN_SUBDIR_TO_INCLUDE(BDB_CPPFLAGS,[${bdbpath}],db_cxx)
-    AC_ARG_WITH([incompatible-bdb],[AS_HELP_STRING([--with-incompatible-bdb], [allow using a bdb version other than 4.8])],[
-      AC_MSG_WARN([Found Berkeley DB other than 4.8; wallets opened by this build will not be portable!])
-    ],[
-      AC_MSG_ERROR([Found Berkeley DB other than 4.8, required for portable wallets (--with-incompatible-bdb to ignore or --disable-wallet to disable wallet functionality)])
-    ])
+    if test "x$bdbpath" = "xX"; then
+      AC_MSG_RESULT([no])
+      AC_MSG_ERROR([libdb_cxx headers missing, ]AC_PACKAGE_NAME[ requires this library for wallet functionality (--disable-wallet to disable wallet functionality)])
+    elif test "x$bdb48path" = "xX"; then
+      BITCOIN_SUBDIR_TO_INCLUDE(BDB_CPPFLAGS,[${bdbpath}],db_cxx)
+      AC_ARG_WITH([incompatible-bdb],[AS_HELP_STRING([--with-incompatible-bdb], [allow using a bdb version other than 4.8])],[
+        AC_MSG_WARN([Found Berkeley DB other than 4.8; wallets opened by this build will not be portable!])
+      ],[
+        AC_MSG_ERROR([Found Berkeley DB other than 4.8, required for portable wallets (--with-incompatible-bdb to ignore or --disable-wallet to disable wallet functionality)])
+      ])
+    else
+      BITCOIN_SUBDIR_TO_INCLUDE(BDB_CPPFLAGS,[${bdb48path}],db_cxx)
+      bdbpath="${bdb48path}"
+    fi
   else
-    BITCOIN_SUBDIR_TO_INCLUDE(BDB_CPPFLAGS,[${bdb48path}],db_cxx)
-    bdbpath="${bdb48path}"
+    BDB_CPPFLAGS=${BDB_CFLAGS}
   fi
   AC_SUBST(BDB_CPPFLAGS)
   
-  # TODO: Ideally this could find the library version and make sure it matches the headers being used
-  for searchlib in db_cxx-4.8 db_cxx; do
-    AC_CHECK_LIB([$searchlib],[main],[
-      BDB_LIBS="-l${searchlib}"
-      break
-    ])
-  done
   if test "x$BDB_LIBS" = "x"; then
-      AC_MSG_ERROR([libdb_cxx missing, ]AC_PACKAGE_NAME[ requires this library for wallet functionality (--disable-wallet to disable wallet functionality)])
+    # TODO: Ideally this could find the library version and make sure it matches the headers being used
+    for searchlib in db_cxx-4.8 db_cxx; do
+      AC_CHECK_LIB([$searchlib],[main],[
+        BDB_LIBS="-l${searchlib}"
+        break
+      ])
+    done
+    if test "x$BDB_LIBS" = "x"; then
+        AC_MSG_ERROR([libdb_cxx missing, ]AC_PACKAGE_NAME[ requires this library for wallet functionality (--disable-wallet to disable wallet functionality)])
+    fi
   fi
   AC_SUBST(BDB_LIBS)
 ])

From 5cc2ebb619b6bc7125e6a5f83f860dfcaa759d93 Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Tue, 7 Feb 2017 09:58:18 +0000
Subject: [PATCH 1685/1802] Update OpenBSD and FreeBSD build steps

Re-try with most recent versions, and use BDB_CFLAGS/BDB_LIBS to
directly point at BerkeleyDB instead of CPPFLAGS hacks.
---
 doc/build-openbsd.md | 6 ++++--
 doc/build-unix.md    | 4 ++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/doc/build-openbsd.md b/doc/build-openbsd.md
index 55283d6dcea93..f4a9826d8079a 100644
--- a/doc/build-openbsd.md
+++ b/doc/build-openbsd.md
@@ -1,6 +1,6 @@
 OpenBSD build guide
 ======================
-(updated for OpenBSD 5.9)
+(updated for OpenBSD 6.0)
 
 This guide describes how to build bitcoind and command-line utilities on OpenBSD.
 
@@ -124,7 +124,7 @@ To configure with wallet:
 ```bash
 ./configure --with-gui=no --with-boost=$BOOST_PREFIX \
     CC=egcc CXX=eg++ CPP=ecpp \
-    LDFLAGS="-L${BDB_PREFIX}/lib/" CPPFLAGS="-I${BDB_PREFIX}/include/"
+    BDB_LIBS="-L${BDB_PREFIX}/lib -ldb_cxx-4.8" BDB_CFLAGS="-I${BDB_PREFIX}/include"
 ```
 
 To configure without wallet:
@@ -142,6 +142,8 @@ gmake check
 Clang (not currently working)
 ------------------------------
 
+WARNING: This is outdated, needs to be updated for OpenBSD 6.0 and re-tried.
+
 Using a newer g++ results in linking the new code to a new libstdc++.
 Libraries built with the old g++, will still import the old library.
 This gives conflicts, necessitating rebuild of all C++ dependencies of the application.
diff --git a/doc/build-unix.md b/doc/build-unix.md
index 5b0a38457e8e5..31a88a1b18c64 100644
--- a/doc/build-unix.md
+++ b/doc/build-unix.md
@@ -315,7 +315,7 @@ For further documentation on the depends system see [README.md](../depends/READM
 Building on FreeBSD
 --------------------
 
-(Updated as of FreeBSD 10.3)
+(Updated as of FreeBSD 11.0)
 
 Clang is installed by default as `cc` compiler, this makes it easier to get
 started than on [OpenBSD](build-openbsd.md). Installing dependencies:
@@ -337,7 +337,7 @@ with 4.8-built Bitcoin Core is needed follow the steps under "Berkeley DB" above
 Then build using:
 
     ./autogen.sh
-    ./configure --with-incompatible-bdb CPPFLAGS=-I/usr/local/include/db5 LDFLAGS=-L/usr/local/lib/db5
+    ./configure --with-incompatible-bdb BDB_CFLAGS="-I/usr/local/include/db5" BDB_LIBS="-L/usr/local/lib -ldb_cxx-5"
     make
 
 *Note on debugging*: The version of `gdb` installed by default is [ancient and considered harmful](https://wiki.freebsd.org/GdbRetirement).

From a47da4b6fecaba81dafe777b25be24e04a428e37 Mon Sep 17 00:00:00 2001
From: practicalswift <practicalswift@users.noreply.github.com>
Date: Fri, 3 Feb 2017 09:20:54 +0100
Subject: [PATCH 1686/1802] Use z = std::max(x - y, 0); instead of z = x - y;
 if (z < 0) z = 0;

---
 src/addrman.cpp              | 6 +-----
 src/qt/coincontroldialog.cpp | 4 +---
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/addrman.cpp b/src/addrman.cpp
index f3c238fbb2cb0..b6ab4c6305184 100644
--- a/src/addrman.cpp
+++ b/src/addrman.cpp
@@ -53,11 +53,7 @@ bool CAddrInfo::IsTerrible(int64_t nNow) const
 double CAddrInfo::GetChance(int64_t nNow) const
 {
     double fChance = 1.0;
-
-    int64_t nSinceLastTry = nNow - nLastTry;
-
-    if (nSinceLastTry < 0)
-        nSinceLastTry = 0;
+    int64_t nSinceLastTry = std::max<int64_t>(nNow - nLastTry, 0);
 
     // deprioritize very recent attempts away
     if (nSinceLastTry < 60 * 10)
diff --git a/src/qt/coincontroldialog.cpp b/src/qt/coincontroldialog.cpp
index f8aba70d92fcc..d4fd8bd37262c 100644
--- a/src/qt/coincontroldialog.cpp
+++ b/src/qt/coincontroldialog.cpp
@@ -563,9 +563,7 @@ void CoinControlDialog::updateLabels(WalletModel *model, QDialog* dialog)
         }
 
         // after fee
-        nAfterFee = nAmount - nPayFee;
-        if (nAfterFee < 0)
-            nAfterFee = 0;
+        nAfterFee = std::max<CAmount>(nAmount - nPayFee, 0);
     }
 
     // actually update labels

From 29c53289a9e6bb34a098ea87d923968e3ac6d75d Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Tue, 7 Feb 2017 19:07:29 +0100
Subject: [PATCH 1687/1802] bench: Fix initialization order in registration

The initialization order of global data structures in different
implementation units is undefined. Making use of this is essentially
gambling on what the linker does, the so-called [Static initialization
order fiasco](https://isocpp.org/wiki/faq/ctors#static-init-order).

In this case it apparently worked on Linux but failed on OpenBSD and
FreeBSD.

To create it on first use, make the registration structure local to
a function.

Fixes #8910.
---
 src/bench/bench.cpp | 16 ++++++++--------
 src/bench/bench.h   |  3 ++-
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/bench/bench.cpp b/src/bench/bench.cpp
index 1bd9d06b803a5..3c9df4f713c14 100644
--- a/src/bench/bench.cpp
+++ b/src/bench/bench.cpp
@@ -9,7 +9,10 @@
 #include <iomanip>
 #include <sys/time.h>
 
-std::map<std::string, benchmark::BenchFunction> benchmark::BenchRunner::benchmarks;
+benchmark::BenchRunner::BenchmarkMap &benchmark::BenchRunner::benchmarks() {
+    static std::map<std::string, benchmark::BenchFunction> benchmarks_map;
+    return benchmarks_map;
+}
 
 static double gettimedouble(void) {
     struct timeval tv;
@@ -19,7 +22,7 @@ static double gettimedouble(void) {
 
 benchmark::BenchRunner::BenchRunner(std::string name, benchmark::BenchFunction func)
 {
-    benchmarks.insert(std::make_pair(name, func));
+    benchmarks().insert(std::make_pair(name, func));
 }
 
 void
@@ -29,12 +32,9 @@ benchmark::BenchRunner::RunAll(double elapsedTimeForOne)
     std::cout << "#Benchmark" << "," << "count" << "," << "min" << "," << "max" << "," << "average" << ","
               << "min_cycles" << "," << "max_cycles" << "," << "average_cycles" << "\n";
 
-    for (std::map<std::string,benchmark::BenchFunction>::iterator it = benchmarks.begin();
-         it != benchmarks.end(); ++it) {
-
-        State state(it->first, elapsedTimeForOne);
-        benchmark::BenchFunction& func = it->second;
-        func(state);
+    for (const auto &p: benchmarks()) {
+        State state(p.first, elapsedTimeForOne);
+        p.second(state);
     }
     perf_fini();
 }
diff --git a/src/bench/bench.h b/src/bench/bench.h
index 80dad6a8ef587..0e7605c726779 100644
--- a/src/bench/bench.h
+++ b/src/bench/bench.h
@@ -63,7 +63,8 @@ namespace benchmark {
 
     class BenchRunner
     {
-        static std::map<std::string, BenchFunction> benchmarks;
+        typedef std::map<std::string, BenchFunction> BenchmarkMap;
+        static BenchmarkMap &benchmarks();
 
     public:
         BenchRunner(std::string name, BenchFunction func);

From 618ee9249b178d94911ea66cb4b5291f000ef1fb Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Tue, 7 Feb 2017 14:15:28 -0500
Subject: [PATCH 1688/1802] Further-enforce lockordering by enforcing directly
 after TRY_LOCKs

---
 src/sync.cpp | 28 +++++++++++++---------------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/src/sync.cpp b/src/sync.cpp
index 25773f08e9830..fce57f1df9f72 100644
--- a/src/sync.cpp
+++ b/src/sync.cpp
@@ -110,21 +110,19 @@ static void push_lock(void* c, const CLockLocation& locklocation, bool fTry)
 
     (*lockstack).push_back(std::make_pair(c, locklocation));
 
-    if (!fTry) {
-        BOOST_FOREACH (const PAIRTYPE(void*, CLockLocation) & i, (*lockstack)) {
-            if (i.first == c)
-                break;
-
-            std::pair<void*, void*> p1 = std::make_pair(i.first, c);
-            if (lockdata.lockorders.count(p1))
-                continue;
-            lockdata.lockorders[p1] = (*lockstack);
-
-            std::pair<void*, void*> p2 = std::make_pair(c, i.first);
-            lockdata.invlockorders.insert(p2);
-            if (lockdata.lockorders.count(p2))
-                potential_deadlock_detected(p1, lockdata.lockorders[p2], lockdata.lockorders[p1]);
-        }
+    BOOST_FOREACH (const PAIRTYPE(void*, CLockLocation) & i, (*lockstack)) {
+        if (i.first == c)
+            break;
+
+        std::pair<void*, void*> p1 = std::make_pair(i.first, c);
+        if (lockdata.lockorders.count(p1))
+            continue;
+        lockdata.lockorders[p1] = (*lockstack);
+
+        std::pair<void*, void*> p2 = std::make_pair(c, i.first);
+        lockdata.invlockorders.insert(p2);
+        if (lockdata.lockorders.count(p2))
+            potential_deadlock_detected(p1, lockdata.lockorders[p2], lockdata.lockorders[p1]);
     }
 }
 

From 2cbd1196b7a07b08cfd91417f2e8ddd09d9f2082 Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Tue, 7 Feb 2017 15:23:17 -0500
Subject: [PATCH 1689/1802] Disconnect peers which we do not receive VERACKs
 from within 60 sec

---
 src/net.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/net.cpp b/src/net.cpp
index 4d0d781d6d2e8..3394f8a08ea43 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -1323,6 +1323,11 @@ void CConnman::ThreadSocketHandler()
                     LogPrintf("ping timeout: %fs\n", 0.000001 * (GetTimeMicros() - pnode->nPingUsecStart));
                     pnode->fDisconnect = true;
                 }
+                else if (!pnode->fSuccessfullyConnected)
+                {
+                    LogPrintf("version handshake timeout from %d\n", pnode->id);
+                    pnode->fDisconnect = true;
+                }
             }
         }
         {

From 9db8eecac1c713c760c0217b6acb7455c657fa8b Mon Sep 17 00:00:00 2001
From: John Newbery <john@johnnewbery.com>
Date: Tue, 7 Feb 2017 09:56:53 -0500
Subject: [PATCH 1690/1802] Fix RPC failure testing

Make sure that RPC tests are actually checking failures correctly by:

- Catching JSON RPC exceptions and verifying the error codes and messages.
- Failing the test case if the JSON RPC exception isn't raised.
---
 qa/rpc-tests/rpcnamedargs.py        |  2 +-
 qa/rpc-tests/test_framework/util.py | 23 ++++++++++++++++++++---
 2 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/qa/rpc-tests/rpcnamedargs.py b/qa/rpc-tests/rpcnamedargs.py
index 0484204668edd..da2d8f040f0a2 100755
--- a/qa/rpc-tests/rpcnamedargs.py
+++ b/qa/rpc-tests/rpcnamedargs.py
@@ -37,7 +37,7 @@ def run_test(self):
         h = node.help(command='getinfo')
         assert(h.startswith('getinfo\n'))
 
-        assert_raises_jsonrpc(-8, node.help, random='getinfo')
+        assert_raises_jsonrpc(-8, 'Unknown named parameter', node.help, random='getinfo')
 
         h = node.getblockhash(height=0)
         node.getblock(blockhash=h)
diff --git a/qa/rpc-tests/test_framework/util.py b/qa/rpc-tests/test_framework/util.py
index aca82c8b6f71e..dc8555c44c08c 100644
--- a/qa/rpc-tests/test_framework/util.py
+++ b/qa/rpc-tests/test_framework/util.py
@@ -550,13 +550,30 @@ def assert_raises_message(exc, message, fun, *args, **kwds):
     else:
         raise AssertionError("No exception raised")
 
-def assert_raises_jsonrpc(code, fun, *args, **kwds):
-    '''Check for specific JSONRPC exception code'''
+def assert_raises_jsonrpc(code, message, fun, *args, **kwds):
+    """Run an RPC and verify that a specific JSONRPC exception code and message is raised.
+
+    Calls function `fun` with arguments `args` and `kwds`. Catches a JSONRPCException
+    and verifies that the error code and message are as expected. Throws AssertionError if
+    no JSONRPCException was returned or if the error code/message are not as expected.
+
+    Args:
+        code (int), optional: the error code returned by the RPC call (defined
+            in src/rpc/protocol.h). Set to None if checking the error code is not required.
+        message (string), optional: [a substring of] the error string returned by the
+            RPC call. Set to None if checking the error string is not required
+        fun (function): the function to call. This should be the name of an RPC.
+        args*: positional arguments for the function.
+        kwds**: named arguments for the function.
+    """
     try:
         fun(*args, **kwds)
     except JSONRPCException as e:
-        if e.error["code"] != code:
+        # JSONRPCException was thrown as expected. Check the code and message values are correct.
+        if (code is not None) and (code != e.error["code"]):
             raise AssertionError("Unexpected JSONRPC error code %i" % e.error["code"])
+        if (message is not None) and (message not in e.error['message']):
+            raise AssertionError("Expected substring not found:"+e.error['message'])
     except Exception as e:
         raise AssertionError("Unexpected exception raised: "+type(e).__name__)
     else:

From 8aaba7a6b7327a4c83308c68b50f07ed4c2aa675 Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Tue, 7 Feb 2017 17:35:57 -0500
Subject: [PATCH 1691/1802] qa: mininode learns when a socket connects, not its
 first action

---
 qa/rpc-tests/test_framework/mininode.py | 36 ++++++++++++++++---------
 1 file changed, 24 insertions(+), 12 deletions(-)

diff --git a/qa/rpc-tests/test_framework/mininode.py b/qa/rpc-tests/test_framework/mininode.py
index 91daa4ab1f585..696a065282c62 100755
--- a/qa/rpc-tests/test_framework/mininode.py
+++ b/qa/rpc-tests/test_framework/mininode.py
@@ -1614,7 +1614,7 @@ class NodeConn(asyncore.dispatcher):
         "regtest": b"\xfa\xbf\xb5\xda",   # regtest
     }
 
-    def __init__(self, dstaddr, dstport, rpc, callback, net="regtest", services=NODE_NETWORK):
+    def __init__(self, dstaddr, dstport, rpc, callback, net="regtest", services=NODE_NETWORK, send_version=True):
         asyncore.dispatcher.__init__(self, map=mininode_socket_map)
         self.log = logging.getLogger("NodeConn(%s:%d)" % (dstaddr, dstport))
         self.dstaddr = dstaddr
@@ -1631,14 +1631,16 @@ def __init__(self, dstaddr, dstport, rpc, callback, net="regtest", services=NODE
         self.disconnect = False
         self.nServices = 0
 
-        # stuff version msg into sendbuf
-        vt = msg_version()
-        vt.nServices = services
-        vt.addrTo.ip = self.dstaddr
-        vt.addrTo.port = self.dstport
-        vt.addrFrom.ip = "0.0.0.0"
-        vt.addrFrom.port = 0
-        self.send_message(vt, True)
+        if send_version:
+            # stuff version msg into sendbuf
+            vt = msg_version()
+            vt.nServices = services
+            vt.addrTo.ip = self.dstaddr
+            vt.addrTo.port = self.dstport
+            vt.addrFrom.ip = "0.0.0.0"
+            vt.addrFrom.port = 0
+            self.send_message(vt, True)
+
         print('MiniNode: Connecting to Bitcoin Node IP # ' + dstaddr + ':' \
             + str(dstport))
 
@@ -1652,8 +1654,9 @@ def show_debug_msg(self, msg):
         self.log.debug(msg)
 
     def handle_connect(self):
-        self.show_debug_msg("MiniNode: Connected & Listening: \n")
-        self.state = "connected"
+        if self.state != "connected":
+            self.show_debug_msg("MiniNode: Connected & Listening: \n")
+            self.state = "connected"
 
     def handle_close(self):
         self.show_debug_msg("MiniNode: Closing Connection to %s:%d... "
@@ -1681,11 +1684,20 @@ def readable(self):
 
     def writable(self):
         with mininode_lock:
+            pre_connection = self.state == "connecting"
             length = len(self.sendbuf)
-        return (length > 0)
+        return (length > 0 or pre_connection)
 
     def handle_write(self):
         with mininode_lock:
+            # asyncore does not expose socket connection, only the first read/write
+            # event, thus we must check connection manually here to know when we
+            # actually connect
+            if self.state == "connecting":
+                self.handle_connect()
+            if not self.writable():
+                return
+
             try:
                 sent = self.send(self.sendbuf)
             except:

From b436f92f727686cd8a10ddff5cd22ee6366fe8c8 Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Tue, 7 Feb 2017 17:40:28 -0500
Subject: [PATCH 1692/1802] qa: Expose on-connection to mininode listeners

---
 qa/rpc-tests/test_framework/mininode.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/qa/rpc-tests/test_framework/mininode.py b/qa/rpc-tests/test_framework/mininode.py
index 696a065282c62..5b563c58ae1e1 100755
--- a/qa/rpc-tests/test_framework/mininode.py
+++ b/qa/rpc-tests/test_framework/mininode.py
@@ -1540,6 +1540,7 @@ def on_ping(self, conn, message):
         if conn.ver_send > BIP0031_VERSION:
             conn.send_message(msg_pong(message.nonce))
     def on_reject(self, conn, message): pass
+    def on_open(self, conn): pass
     def on_close(self, conn): pass
     def on_mempool(self, conn): pass
     def on_pong(self, conn, message): pass
@@ -1657,6 +1658,7 @@ def handle_connect(self):
         if self.state != "connected":
             self.show_debug_msg("MiniNode: Connected & Listening: \n")
             self.state = "connected"
+            self.cb.on_open(self)
 
     def handle_close(self):
         self.show_debug_msg("MiniNode: Closing Connection to %s:%d... "

From c8cee26100c4f5196aff452d75a24ea7f1135595 Mon Sep 17 00:00:00 2001
From: Luke Dashjr <luke-jr+git@utopios.org>
Date: Wed, 8 Feb 2017 04:07:13 +0000
Subject: [PATCH 1693/1802] Qt/Intro: Update block chain size

---
 src/qt/intro.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/qt/intro.cpp b/src/qt/intro.cpp
index 6d6af54290fd5..9c2aab602bdb0 100644
--- a/src/qt/intro.cpp
+++ b/src/qt/intro.cpp
@@ -23,7 +23,7 @@
 
 static const uint64_t GB_BYTES = 1000000000LL;
 /* Minimum free space (in GB) needed for data directory */
-static const uint64_t BLOCK_CHAIN_SIZE = 80;
+static const uint64_t BLOCK_CHAIN_SIZE = 120;
 /* Minimum free space (in GB) needed for data directory when pruned; Does not include prune target */
 static const uint64_t CHAIN_STATE_SIZE = 2;
 /* Total required space (in GB) depending on user choice (prune, not prune) */

From 93ffba7163b4f3c0262c58c1e76e252350e4260e Mon Sep 17 00:00:00 2001
From: Luke Dashjr <luke-jr+git@utopios.org>
Date: Wed, 8 Feb 2017 04:00:16 +0000
Subject: [PATCH 1694/1802] Bugfix: Qt/Intro: Chain state needs to be stored
 even with the full blockchain

---
 src/qt/intro.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/qt/intro.cpp b/src/qt/intro.cpp
index 9c2aab602bdb0..e45ba2d151292 100644
--- a/src/qt/intro.cpp
+++ b/src/qt/intro.cpp
@@ -126,8 +126,10 @@ Intro::Intro(QWidget *parent) :
     ui->storageLabel->setText(ui->storageLabel->text().arg(tr(PACKAGE_NAME)));
     uint64_t pruneTarget = std::max<int64_t>(0, GetArg("-prune", 0));
     requiredSpace = BLOCK_CHAIN_SIZE;
-    if (pruneTarget)
-        requiredSpace = CHAIN_STATE_SIZE + std::ceil(pruneTarget * 1024 * 1024.0 / GB_BYTES);
+    if (pruneTarget) {
+        requiredSpace = std::ceil(pruneTarget * 1024 * 1024.0 / GB_BYTES);
+    }
+    requiredSpace += CHAIN_STATE_SIZE;
     ui->sizeWarningLabel->setText(ui->sizeWarningLabel->text().arg(tr(PACKAGE_NAME)).arg(requiredSpace));
     startThread();
 }

From a9baa6d742c0425af4fb048cbd85707143227e84 Mon Sep 17 00:00:00 2001
From: Luke Dashjr <luke-jr+git@utopios.org>
Date: Wed, 8 Feb 2017 19:16:00 +0000
Subject: [PATCH 1695/1802] Bugfix: Qt/Intro: Pruned nodes never require *more*
 space

---
 src/qt/intro.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/qt/intro.cpp b/src/qt/intro.cpp
index e45ba2d151292..96bddb81edf42 100644
--- a/src/qt/intro.cpp
+++ b/src/qt/intro.cpp
@@ -127,7 +127,10 @@ Intro::Intro(QWidget *parent) :
     uint64_t pruneTarget = std::max<int64_t>(0, GetArg("-prune", 0));
     requiredSpace = BLOCK_CHAIN_SIZE;
     if (pruneTarget) {
-        requiredSpace = std::ceil(pruneTarget * 1024 * 1024.0 / GB_BYTES);
+        uint64_t prunedGBs = std::ceil(pruneTarget * 1024 * 1024.0 / GB_BYTES);
+        if (prunedGBs <= requiredSpace) {
+            requiredSpace = prunedGBs;
+        }
     }
     requiredSpace += CHAIN_STATE_SIZE;
     ui->sizeWarningLabel->setText(ui->sizeWarningLabel->text().arg(tr(PACKAGE_NAME)).arg(requiredSpace));

From 36164faa338d387177c6328496f63ac11eda3b78 Mon Sep 17 00:00:00 2001
From: Koki Takahashi <Koki.Takahashi@jp.sony.com>
Date: Fri, 3 Feb 2017 17:12:21 +0900
Subject: [PATCH 1696/1802] Fix typo and spelling inconsistency in
 CONTRIBUTING.md

Fix spellings of GitHub

Remove unnecessary changes

Fix GitHub spelling on doc/translation_process.md
---
 CONTRIBUTING.md            | 2 +-
 contrib/README.md          | 2 +-
 contrib/devtools/README.md | 2 +-
 doc/developer-notes.md     | 2 +-
 doc/translation_process.md | 4 ++--
 doc/zmq.md                 | 4 ++--
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 47648cde22e40..7f97b108b1f59 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -194,7 +194,7 @@ request. Typically reviewers will review the code for obvious errors, as well as
 test out the patch set and opine on the technical merits of the patch. Project
 maintainers take into account the peer review when determining if there is
 consensus to merge a pull request (remember that discussions may have been
-spread out over github, mailing list and IRC discussions). The following
+spread out over GitHub, mailing list and IRC discussions). The following
 language is used within pull-request comments:
 
   - ACK means "I have tested the code and I agree it should be merged";
diff --git a/contrib/README.md b/contrib/README.md
index 4ea9700f59d95..6f750106e4710 100644
--- a/contrib/README.md
+++ b/contrib/README.md
@@ -3,7 +3,7 @@ Repository Tools
 
 ### [Developer tools](/contrib/devtools) ###
 Specific tools for developers working on this repository.
-Contains the script `github-merge.py` for merging github pull requests securely and signing them using GPG.
+Contains the script `github-merge.py` for merging GitHub pull requests securely and signing them using GPG.
 
 ### [Verify-Commits](/contrib/verify-commits) ###
 Tool to verify that every merge commit was signed by a developer using the above `github-merge.py` script.
diff --git a/contrib/devtools/README.md b/contrib/devtools/README.md
index 34f2af68666a9..67c5e15a15041 100644
--- a/contrib/devtools/README.md
+++ b/contrib/devtools/README.md
@@ -125,7 +125,7 @@ check or whatever).
 
 This means that there are no potential race conditions (where a
 pullreq gets updated while you're reviewing it, but before you click
-merge), and when using GPG signatures, that even a compromised github
+merge), and when using GPG signatures, that even a compromised GitHub
 couldn't mess with the sources.
 
 Setup
diff --git a/doc/developer-notes.md b/doc/developer-notes.md
index 989ad8d03ebde..3a7e4f73b3d60 100644
--- a/doc/developer-notes.md
+++ b/doc/developer-notes.md
@@ -448,7 +448,7 @@ Current subtrees include:
   - Upstream at https://github.com/jgarzik/univalue ; report important PRs to Core to avoid delay.
 
 
-Git and github tips
+Git and GitHub tips
 ---------------------
 
 - For resolving merge/rebase conflicts, it can be useful to enable diff3 style using
diff --git a/doc/translation_process.md b/doc/translation_process.md
index 9e9ced245722a..1702637d53ebd 100644
--- a/doc/translation_process.md
+++ b/doc/translation_process.md
@@ -4,7 +4,7 @@ Translations
 The Bitcoin-Core project has been designed to support multiple localisations. This makes adding new phrases, and completely new languages easily achievable. For managing all application translations, Bitcoin-Core makes use of the Transifex online translation management tool.
 
 ### Helping to translate (using Transifex)
-Transifex is setup to monitor the Github repo for updates, and when code containing new translations is found, Transifex will process any changes. It may take several hours after a pull-request has been merged, to appear in the Transifex web interface.
+Transifex is setup to monitor the GitHub repo for updates, and when code containing new translations is found, Transifex will process any changes. It may take several hours after a pull-request has been merged, to appear in the Transifex web interface.
 
 Multiple language support is critical in assisting Bitcoin’s global adoption, and growth. One of Bitcoin’s greatest strengths is cross-border money transfers, any help making that easier is greatly appreciated.
 
@@ -32,7 +32,7 @@ QToolBar *toolbar = addToolBar(tr("Tabs toolbar"));
 ### Creating a pull-request
 For general PRs, you shouldn’t include any updates to the translation source files. They will be updated periodically, primarily around pre-releases, allowing time for any new phrases to be translated before public releases. This is also important in avoiding translation related merge conflicts.
 
-When an updated source file is merged into the Github repo, Transifex will automatically detect it (although it can take several hours). Once processed, the new strings will show up as "Remaining" in the Transifex web interface and are ready for translators.
+When an updated source file is merged into the GitHub repo, Transifex will automatically detect it (although it can take several hours). Once processed, the new strings will show up as "Remaining" in the Transifex web interface and are ready for translators.
 
 To create the pull-request, use the following commands:
 ```
diff --git a/doc/zmq.md b/doc/zmq.md
index 6079e3254f783..1019ff6653b78 100644
--- a/doc/zmq.md
+++ b/doc/zmq.md
@@ -1,4 +1,4 @@
-# Block and Transaction Broadcasting With ZeroMQ
+# Block and Transaction Broadcasting with ZeroMQ
 
 [ZeroMQ](http://zeromq.org/) is a lightweight wrapper around TCP
 connections, inter-process communication, and shared-memory,
@@ -50,7 +50,7 @@ during the *configure* step of building bitcoind:
     $ ./configure --disable-zmq (other options)
 
 To actually enable operation, one must set the appropriate options on
-the commandline or in the configuration file.
+the command line or in the configuration file.
 
 ## Usage
 

From ca9955e706d346ea54ee128741444107af9b3977 Mon Sep 17 00:00:00 2001
From: Jonas Schnelli <dev@jonasschnelli.ch>
Date: Thu, 9 Feb 2017 11:28:01 +0100
Subject: [PATCH 1697/1802] Remove bitseed.xf2.org form the dns seed list

---
 src/chainparams.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/chainparams.cpp b/src/chainparams.cpp
index d99f800f0a9d4..6c6f677df79cf 100644
--- a/src/chainparams.cpp
+++ b/src/chainparams.cpp
@@ -124,7 +124,6 @@ class CMainParams : public CChainParams {
         vSeeds.push_back(CDNSSeedData("bluematt.me", "dnsseed.bluematt.me", true)); // Matt Corallo, only supports x9
         vSeeds.push_back(CDNSSeedData("dashjr.org", "dnsseed.bitcoin.dashjr.org")); // Luke Dashjr
         vSeeds.push_back(CDNSSeedData("bitcoinstats.com", "seed.bitcoinstats.com", true)); // Christian Decker, supports x1 - xf
-        vSeeds.push_back(CDNSSeedData("xf2.org", "bitseed.xf2.org")); // Jeff Garzik
         vSeeds.push_back(CDNSSeedData("bitcoin.jonasschnelli.ch", "seed.bitcoin.jonasschnelli.ch", true)); // Jonas Schnelli, only supports x1, x5, x9, and xd
 
         base58Prefixes[PUBKEY_ADDRESS] = std::vector<unsigned char>(1,0);

From 66f861ade9db108f979a9bdf8d90e8fca028e2a3 Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Tue, 7 Feb 2017 17:43:36 -0500
Subject: [PATCH 1698/1802] Add a test for P2P inactivity timeouts

---
 qa/pull-tester/rpc-tests.py  |   1 +
 qa/rpc-tests/p2p-timeouts.py | 103 +++++++++++++++++++++++++++++++++++
 2 files changed, 104 insertions(+)
 create mode 100755 qa/rpc-tests/p2p-timeouts.py

diff --git a/qa/pull-tester/rpc-tests.py b/qa/pull-tester/rpc-tests.py
index 26bc6a73dfa28..2cf4adb9a0431 100755
--- a/qa/pull-tester/rpc-tests.py
+++ b/qa/pull-tester/rpc-tests.py
@@ -168,6 +168,7 @@
     # vv Tests less than 2m vv
     'bip68-sequence.py',
     'getblocktemplate_longpoll.py',
+    'p2p-timeouts.py',
     # vv Tests less than 60s vv
     'bip9-softforks.py',
     'p2p-feefilter.py',
diff --git a/qa/rpc-tests/p2p-timeouts.py b/qa/rpc-tests/p2p-timeouts.py
new file mode 100755
index 0000000000000..f1b190587d8ef
--- /dev/null
+++ b/qa/rpc-tests/p2p-timeouts.py
@@ -0,0 +1,103 @@
+#!/usr/bin/env python3
+# Copyright (c) 2016 The Bitcoin Core developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or http://www.opensource.org/licenses/mit-license.php.
+""" TimeoutsTest -- test various net timeouts (only in extended tests)
+
+- Create three bitcoind nodes:
+
+    no_verack_node - we never send a verack in response to their version
+    no_version_node - we never send a version (only a ping)
+    no_send_node - we never send any P2P message.
+
+- Start all three nodes
+- Wait 1 second
+- Assert that we're connected
+- Send a ping to no_verack_node and no_version_node
+- Wait 30 seconds
+- Assert that we're still connected
+- Send a ping to no_verack_node and no_version_node
+- Wait 31 seconds
+- Assert that we're no longer connected (timeout to receive version/verack is 60 seconds)
+"""
+
+from time import sleep
+
+from test_framework.mininode import *
+from test_framework.test_framework import BitcoinTestFramework
+from test_framework.util import *
+
+class TestNode(SingleNodeConnCB):
+    def __init__(self):
+        SingleNodeConnCB.__init__(self)
+        self.connected = False
+        self.received_version = False
+
+    def on_open(self, conn):
+        self.connected = True
+
+    def on_close(self, conn):
+        self.connected = False
+
+    def on_version(self, conn, message):
+        # Don't send a verack in response
+        self.received_version = True
+
+class TimeoutsTest(BitcoinTestFramework):
+    def __init__(self):
+        super().__init__()
+        self.setup_clean_chain = True
+        self.num_nodes = 1
+
+    def setup_network(self):
+        self.nodes = []
+
+        # Start up node0 to be a version 1, pre-segwit node.
+        self.nodes = start_nodes(self.num_nodes, self.options.tmpdir, 
+                [["-debug", "-logtimemicros=1"]])
+
+    def run_test(self):
+        # Setup the p2p connections and start up the network thread.
+        self.no_verack_node = TestNode() # never send verack
+        self.no_version_node = TestNode() # never send version (just ping)
+        self.no_send_node = TestNode() # never send anything
+
+        connections = []
+        connections.append(NodeConn('127.0.0.1', p2p_port(0), self.nodes[0], self.no_verack_node))
+        connections.append(NodeConn('127.0.0.1', p2p_port(0), self.nodes[0], self.no_version_node, send_version=False))
+        connections.append(NodeConn('127.0.0.1', p2p_port(0), self.nodes[0], self.no_send_node, send_version=False))
+        self.no_verack_node.add_connection(connections[0])
+        self.no_version_node.add_connection(connections[1])
+        self.no_send_node.add_connection(connections[2])
+
+        NetworkThread().start()  # Start up network handling in another thread
+
+        sleep(1)
+
+        assert(self.no_verack_node.connected)
+        assert(self.no_version_node.connected)
+        assert(self.no_send_node.connected)
+
+        ping_msg = msg_ping()
+        connections[0].send_message(ping_msg)
+        connections[1].send_message(ping_msg)
+
+        sleep(30)
+
+        assert(self.no_verack_node.received_version)
+
+        assert(self.no_verack_node.connected)
+        assert(self.no_version_node.connected)
+        assert(self.no_send_node.connected)
+
+        connections[0].send_message(ping_msg)
+        connections[1].send_message(ping_msg)
+
+        sleep(31)
+
+        assert(not self.no_verack_node.connected)
+        assert(not self.no_version_node.connected)
+        assert(not self.no_send_node.connected)
+
+if __name__ == '__main__':
+    TimeoutsTest().main()

From 5e903a5ed96809af31cdcf6037e6c284832a02a6 Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Fri, 10 Feb 2017 08:49:04 +0000
Subject: [PATCH 1699/1802] devtools: Handle Qt formatting characters edge-case
 in update-translations.py

If both numeric format specifiers and "others" are used, assume we're
dealing with a Qt-formatted message. In the case of Qt formatting (see
https://doc.qt.io/qt-5/qstring.html#arg) only numeric formats are
replaced at all. This means "(percentage: %1%)" is valid (which was
introduced in #9461), without needing any kind of escaping that would be
necessary for strprintf.  Without this, this function would wrongly
detect '%)' as a printf format specifier.
---
 contrib/devtools/update-translations.py | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/contrib/devtools/update-translations.py b/contrib/devtools/update-translations.py
index 78b9f9d179eb6..2011841005930 100755
--- a/contrib/devtools/update-translations.py
+++ b/contrib/devtools/update-translations.py
@@ -65,6 +65,14 @@ def split_format_specifiers(specifiers):
         else:
             other.append(s)
 
+    # If both numeric format specifiers and "others" are used, assume we're dealing
+    # with a Qt-formatted message. In the case of Qt formatting (see https://doc.qt.io/qt-5/qstring.html#arg)
+    # only numeric formats are replaced at all. This means "(percentage: %1%)" is valid, without needing
+    # any kind of escaping that would be necessary for strprintf. Without this, this function
+    # would wrongly detect '%)' as a printf format specifier.
+    if numeric:
+        other = []
+
     # numeric (Qt) can be present in any order, others (strprintf) must be in specified order
     return set(numeric),other
 

From 7179e7ca0db493dccbfd88f64738252844aab6ff Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Fri, 10 Feb 2017 08:56:36 +0000
Subject: [PATCH 1700/1802] qt: Periodic translations update

---
 src/qt/locale/bitcoin_cs.ts    |   24 +
 src/qt/locale/bitcoin_en.ts    |    2 +-
 src/qt/locale/bitcoin_et.ts    |   28 +
 src/qt/locale/bitcoin_fr.ts    |    4 +
 src/qt/locale/bitcoin_it.ts    |    4 -
 src/qt/locale/bitcoin_pt_BR.ts |   40 +-
 src/qt/locale/bitcoin_tr.ts    | 1608 ++++++++++++++++++++++++++++----
 src/qt/locale/bitcoin_zh_CN.ts |   26 +-
 8 files changed, 1512 insertions(+), 224 deletions(-)

diff --git a/src/qt/locale/bitcoin_cs.ts b/src/qt/locale/bitcoin_cs.ts
index 67c595ab34ec7..f38c425137020 100644
--- a/src/qt/locale/bitcoin_cs.ts
+++ b/src/qt/locale/bitcoin_cs.ts
@@ -329,6 +329,10 @@
         <source>Click to enable network activity again.</source>
         <translation>Kliknutím opět umožníš spojení do sítě.</translation>
     </message>
+    <message>
+        <source>Syncing Headers (%1%)...</source>
+        <translation>Synchronizuji záhlaví bloků (%1 %)…</translation>
+    </message>
     <message>
         <source>Reindexing blocks on disk...</source>
         <translation>Vytvářím nový index bloků na disku...</translation>
@@ -481,6 +485,10 @@
         <source>%1 client</source>
         <translation>%1 klient</translation>
     </message>
+    <message>
+        <source>Connecting to peers...</source>
+        <translation>Připojuji se…</translation>
+    </message>
     <message>
         <source>Catching up...</source>
         <translation>Stahuji...</translation>
@@ -3089,6 +3097,14 @@
         <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source>
         <translation>Spustit příkaz, když se objeví transakce týkající se peněženky (%s se v příkazu nahradí za TxID)</translation>
     </message>
+    <message>
+        <source>Extra transactions to keep in memory for compact block reconstructions (default: %u)</source>
+        <translation>Počet extra transakcí, které se mají držet v paměti pro účely rekonstrukce kompaktních bloků (výchozí: %u)</translation>
+    </message>
+    <message>
+        <source>If this block is in the chain assume that it and its ancestors are valid and potentially skip their script verification (0 to verify all, default: %s, testnet: %s)</source>
+        <translation>Pokud je tenhle blok v řetězci, tak předpokládat, že on i jeho následníci jsou platní, a potenciálně přeskočit ověřování jejich skriptů (0 = ověřovat vše, výchozí: %s, testnet: %s)</translation>
+    </message>
     <message>
         <source>Maximum allowed median peer time offset adjustment. Local perspective of time may be influenced by peers forward or backward by this amount. (default: %u seconds)</source>
         <translation>Maximální povolené seřizování času mediánem časů protějšků. Místní vnímání času může být ovlivněno protějšky, a to dopředu nebo dozadu až o toto množství. (výchozí: %u vteřin)</translation>
@@ -3105,6 +3121,14 @@
         <source>Please contribute if you find %s useful. Visit %s for further information about the software.</source>
         <translation>Prosíme, zapoj se nebo přispěj, pokud ti %s přijde užitečný. Více informací o programu je na %s.</translation>
     </message>
+    <message>
+        <source>Reduce storage requirements by enabling pruning (deleting) of old blocks. This allows the pruneblockchain RPC to be called to delete specific blocks, and enables automatic pruning of old blocks if a target size in MiB is provided. This mode is incompatible with -txindex and -rescan. Warning: Reverting this setting requires re-downloading the entire blockchain. (default: 0 = disable pruning blocks, 1 = allow manual pruning via RPC, &gt;%u = automatically prune block files to stay under the specified target size in MiB)</source>
+        <translation>Omezit nároky na úložný prostor prořezáváním (mazáním) starých bloků. Tato volba také umožní použít RPC volání pruneblockchain ke smazání konkrétních bloků a dále automatické prořezávání starých bloků, pokud je zadána cílová velikost souborů s bloky v MiB. Tento režim není slučitelný s -txindex ani -rescan. Upozornění: opětovná změna tohoto nastavení bude vyžadovat nové stažení celého řetězce bloků. (výchozí: 0 = bloky neprořezávat, 1 = povolit ruční prořezávání skrze RPC, &gt;%u = automatické prořezávání bloků tak, aby byla udržena cílová velikost souborů s bloky, v MiB)</translation>
+    </message>
+    <message>
+        <source>Set lowest fee rate (in %s/kB) for transactions to be included in block creation. (default: %s)</source>
+        <translation>Nastavit nejnižší akceptovatelný poplatek (v %s/kB) pro transakce, které mají být zahrnuty do nových bloků. (výchozí: %s)</translation>
+    </message>
     <message>
         <source>Set the number of script verification threads (%u to %d, 0 = auto, &lt;0 = leave that many cores free, default: %d)</source>
         <translation>Nastavení počtu vláken pro verifikaci skriptů (%u až %d, 0 = automaticky, &lt;0 = nechat daný počet jader volný, výchozí: %d)</translation>
diff --git a/src/qt/locale/bitcoin_en.ts b/src/qt/locale/bitcoin_en.ts
index cc834a8b96af4..f62f1e4a734d3 100644
--- a/src/qt/locale/bitcoin_en.ts
+++ b/src/qt/locale/bitcoin_en.ts
@@ -1083,7 +1083,7 @@
         <translation>Use a custom data directory:</translation>
     </message>
     <message>
-        <location filename="../intro.cpp" line="+89"/>
+        <location filename="../intro.cpp" line="+94"/>
         <source>Error: Specified data directory &quot;%1&quot; cannot be created.</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/src/qt/locale/bitcoin_et.ts b/src/qt/locale/bitcoin_et.ts
index f95b01d33b917..313d5e3be14b6 100644
--- a/src/qt/locale/bitcoin_et.ts
+++ b/src/qt/locale/bitcoin_et.ts
@@ -214,6 +214,10 @@
 </context>
 <context>
     <name>BanTableModel</name>
+    <message>
+        <source>IP/Netmask</source>
+        <translation>IP/Võrgumask</translation>
+    </message>
     </context>
 <context>
     <name>BitcoinGUI</name>
@@ -787,6 +791,10 @@
         <source>&amp;Window</source>
         <translation>&amp;Aken</translation>
     </message>
+    <message>
+        <source>Hide tray icon</source>
+        <translation>Peida tegumiriba ikoon</translation>
+    </message>
     <message>
         <source>Show only a tray icon after minimizing the window.</source>
         <translation>Minimeeri systray alale.</translation>
@@ -903,10 +911,30 @@
         <source>N/A</source>
         <translation>N/A</translation>
     </message>
+    <message>
+        <source>%1 ms</source>
+        <translation>%1 ms</translation>
+    </message>
+    <message numerus="yes">
+        <source>%n hour(s)</source>
+        <translation><numerusform>%n tund</numerusform><numerusform>%n tundi</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%n day(s)</source>
+        <translation><numerusform>%n päev</numerusform><numerusform>%n päeva</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%n week(s)</source>
+        <translation><numerusform>%n nädal</numerusform><numerusform>%n nädalat</numerusform></translation>
+    </message>
     <message>
         <source>%1 and %2</source>
         <translation>%1 ja %2</translation>
     </message>
+    <message numerus="yes">
+        <source>%n year(s)</source>
+        <translation><numerusform>%n aasta</numerusform><numerusform>%n aastat</numerusform></translation>
+    </message>
     </context>
 <context>
     <name>QObject::QObject</name>
diff --git a/src/qt/locale/bitcoin_fr.ts b/src/qt/locale/bitcoin_fr.ts
index 92682ff297a45..21800231596a0 100644
--- a/src/qt/locale/bitcoin_fr.ts
+++ b/src/qt/locale/bitcoin_fr.ts
@@ -329,6 +329,10 @@
         <source>Click to enable network activity again.</source>
         <translation>Cliquer pour réactiver l'activité réseau.</translation>
     </message>
+    <message>
+        <source>Syncing Headers (%1%)...</source>
+        <translation>Synchronisation des en-têtes (%1)...</translation>
+    </message>
     <message>
         <source>Reindexing blocks on disk...</source>
         <translation>Réindexation des blocs sur le disque...</translation>
diff --git a/src/qt/locale/bitcoin_it.ts b/src/qt/locale/bitcoin_it.ts
index 484e7f86bd2bc..9f2c7626de095 100644
--- a/src/qt/locale/bitcoin_it.ts
+++ b/src/qt/locale/bitcoin_it.ts
@@ -702,10 +702,6 @@
         <source>Error</source>
         <translation>Errore</translation>
     </message>
-    <message numerus="yes">
-        <source>%n GB of free space available</source>
-        <translation><numerusform>GB di spazio libero disponibile</numerusform><numerusform>%n GB di spazio disponibile</numerusform></translation>
-    </message>
     <message numerus="yes">
         <source>(of %n GB needed)</source>
         <translation><numerusform>(di %nGB richiesti)</numerusform><numerusform>(%n GB richiesti)</numerusform></translation>
diff --git a/src/qt/locale/bitcoin_pt_BR.ts b/src/qt/locale/bitcoin_pt_BR.ts
index c6370353030e6..3202587cbd54b 100644
--- a/src/qt/locale/bitcoin_pt_BR.ts
+++ b/src/qt/locale/bitcoin_pt_BR.ts
@@ -23,7 +23,7 @@
     </message>
     <message>
         <source>C&amp;lose</source>
-        <translation>Fechar</translation>
+        <translation>&amp;Fechar</translation>
     </message>
     <message>
         <source>Delete the currently selected address from the list</source>
@@ -39,7 +39,7 @@
     </message>
     <message>
         <source>&amp;Delete</source>
-        <translation>&amp;Excluir</translation>
+        <translation>E&amp;xcluir</translation>
     </message>
     <message>
         <source>Choose the address to send coins to</source>
@@ -102,7 +102,7 @@
     <name>AddressTableModel</name>
     <message>
         <source>Label</source>
-        <translation>Rótuo</translation>
+        <translation>Rótulo</translation>
     </message>
     <message>
         <source>Address</source>
@@ -110,7 +110,7 @@
     </message>
     <message>
         <source>(no label)</source>
-        <translation>(sem rótuo)</translation>
+        <translation>(sem rótulo)</translation>
     </message>
 </context>
 <context>
@@ -231,7 +231,7 @@
     <name>BitcoinGUI</name>
     <message>
         <source>Sign &amp;message...</source>
-        <translation>&amp;Assinar mensagem...</translation>
+        <translation>Assinar &amp;mensagem...</translation>
     </message>
     <message>
         <source>Synchronizing with network...</source>
@@ -375,7 +375,7 @@
     </message>
     <message>
         <source>&amp;Show / Hide</source>
-        <translation>&amp;Exibir/Ocultar</translation>
+        <translation>&amp;Exibir / Ocultar</translation>
     </message>
     <message>
         <source>Show or hide the main Window</source>
@@ -479,7 +479,7 @@
     </message>
     <message>
         <source>%1 client</source>
-        <translation>%1</translation>
+        <translation>%1 cliente</translation>
     </message>
     <message>
         <source>Connecting to peers...</source>
@@ -688,7 +688,7 @@
     </message>
     <message>
         <source>(no label)</source>
-        <translation>(sem rótuo)</translation>
+        <translation>(sem rótulo)</translation>
     </message>
     <message>
         <source>change from %1 (%2)</source>
@@ -1360,6 +1360,10 @@
         <source>Node/Service</source>
         <translation>Nó/Serviço</translation>
     </message>
+    <message>
+        <source>NodeId</source>
+        <translation>ID do nó</translation>
+    </message>
     <message>
         <source>Ping</source>
         <translation>Ping</translation>
@@ -1900,7 +1904,7 @@
     </message>
     <message>
         <source>Label</source>
-        <translation>Rótuo</translation>
+        <translation>Rótulo</translation>
     </message>
     <message>
         <source>Message</source>
@@ -1923,7 +1927,7 @@
     </message>
     <message>
         <source>Label</source>
-        <translation>Rótuo</translation>
+        <translation>Rótulo</translation>
     </message>
     <message>
         <source>Message</source>
@@ -1931,7 +1935,7 @@
     </message>
     <message>
         <source>(no label)</source>
-        <translation>(sem rótuo)</translation>
+        <translation>(sem rótulo)</translation>
     </message>
     <message>
         <source>(no message)</source>
@@ -2210,7 +2214,7 @@
     </message>
     <message>
         <source>(no label)</source>
-        <translation>(sem rótuo)</translation>
+        <translation>(sem rótulo)</translation>
     </message>
 </context>
 <context>
@@ -2665,7 +2669,7 @@
     </message>
     <message>
         <source>Label</source>
-        <translation>Rótuo</translation>
+        <translation>Rótulo</translation>
     </message>
     <message numerus="yes">
         <source>Open for %n more block(s)</source>
@@ -2741,7 +2745,7 @@
     </message>
     <message>
         <source>(no label)</source>
-        <translation>(sem rótuo)</translation>
+        <translation>(sem rótulo)</translation>
     </message>
     <message>
         <source>Transaction status. Hover over this field to show number of confirmations.</source>
@@ -2888,7 +2892,7 @@
     </message>
     <message>
         <source>Label</source>
-        <translation>Rótuo</translation>
+        <translation>Rótulo</translation>
     </message>
     <message>
         <source>Address</source>
@@ -3797,6 +3801,10 @@
         <source>Relay non-P2SH multisig (default: %u)</source>
         <translation>Retransmitir P2SH não multisig (padrão: %u)</translation>
     </message>
+    <message>
+        <source>Send transactions with full-RBF opt-in enabled (default: %u)</source>
+        <translation>Ativar opção full-RBF nas transações enviadas (padrão: %u)</translation>
+    </message>
     <message>
         <source>Set key pool size to &lt;n&gt; (default: %u)</source>
         <translation>Defina o tamanho da chave para piscina&lt;n&gt; (padrão: %u)</translation>
@@ -3819,7 +3827,7 @@
     </message>
     <message>
         <source>Specify pid file (default: %s)</source>
-        <translation>Especificar aqrquivo pid (padrão: %s)</translation>
+        <translation>Especificar arquivo pid (padrão: %s)</translation>
     </message>
     <message>
         <source>Spend unconfirmed change when sending transactions (default: %u)</source>
diff --git a/src/qt/locale/bitcoin_tr.ts b/src/qt/locale/bitcoin_tr.ts
index c37a518968e08..2de0d14ddd24b 100644
--- a/src/qt/locale/bitcoin_tr.ts
+++ b/src/qt/locale/bitcoin_tr.ts
@@ -35,7 +35,7 @@
     </message>
     <message>
         <source>&amp;Export</source>
-        <translation>&amp;Dışa aktar</translation>
+        <translation>&amp;Dışarı aktar</translation>
     </message>
     <message>
         <source>&amp;Delete</source>
@@ -59,15 +59,23 @@
     </message>
     <message>
         <source>Receiving addresses</source>
-        <translation>Alınan adresler</translation>
+        <translation>Alım adresleri</translation>
+    </message>
+    <message>
+        <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source>
+        <translation>Bunlar ödemeleri göndermek için kullanacağınız Bitcoin adreslerinizdir. Bitcoin yollamadan önce tutarı ve alıcının alım adresini her zaman kontrol ediniz.</translation>
+    </message>
+    <message>
+        <source>These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source>
+        <translation>Bunlar ödemeleri almak için kullanacağınız Bitcoin adreslerinizdir. Her işlem için yeni bir alım adresi kullanmanız tavsiye edilir.</translation>
     </message>
     <message>
         <source>&amp;Copy Address</source>
-        <translation>&amp;Adres Kopyala</translation>
+        <translation>&amp;Adresi Kopyala</translation>
     </message>
     <message>
         <source>Copy &amp;Label</source>
-        <translation>&amp;Etiketi kopyala</translation>
+        <translation>&amp;Etiketi Kopyala</translation>
     </message>
     <message>
         <source>&amp;Edit</source>
@@ -75,13 +83,21 @@
     </message>
     <message>
         <source>Export Address List</source>
-        <translation>Adres listesini dışarı aktar</translation>
+        <translation>Adres Listesini Dışarı Aktar</translation>
+    </message>
+    <message>
+        <source>Comma separated file (*.csv)</source>
+        <translation>Virgülle ayrılmış değerler dosyası (*.csv)</translation>
     </message>
     <message>
         <source>Exporting Failed</source>
-        <translation>Dışarı aktarmada hata</translation>
+        <translation>Dışarı Aktarım Başarısız Oldu</translation>
+    </message>
+    <message>
+        <source>There was an error trying to save the address list to %1. Please try again.</source>
+        <translation>Adres listesinin %1 konumuna kaydedilmesi sırasında bir hata meydana geldi. Lütfen tekrar deneyin.</translation>
     </message>
-    </context>
+</context>
 <context>
     <name>AddressTableModel</name>
     <message>
@@ -101,7 +117,7 @@
     <name>AskPassphraseDialog</name>
     <message>
         <source>Passphrase Dialog</source>
-        <translation>Parola diyaloğu</translation>
+        <translation>Parola Diyaloğu</translation>
     </message>
     <message>
         <source>Enter passphrase</source>
@@ -115,9 +131,17 @@
         <source>Repeat new passphrase</source>
         <translation>Yeni parolayı tekrarlayınız</translation>
     </message>
+    <message>
+        <source>Enter the new passphrase to the wallet.&lt;br/&gt;Please use a passphrase of &lt;b&gt;ten or more random characters&lt;/b&gt;, or &lt;b&gt;eight or more words&lt;/b&gt;.</source>
+        <translation>Cüzdan için yeni parolayı giriniz.&lt;br/&gt;Lütfen &lt;b&gt;on ya da daha fazla rastgele karakter&lt;/b&gt; veya &lt;b&gt;sekiz ya da daha fazla kelime&lt;/b&gt; içeren bir parola kullanınız.</translation>
+    </message>
     <message>
         <source>Encrypt wallet</source>
-        <translation>Şifrelenmiş cüzdan</translation>
+        <translation>Cüzdanı şifrele</translation>
+    </message>
+    <message>
+        <source>This operation needs your wallet passphrase to unlock the wallet.</source>
+        <translation>Bu eylem cüzdan kilidini açmak için cüzdan parolanızı gerektirir.</translation>
     </message>
     <message>
         <source>Unlock wallet</source>
@@ -125,16 +149,28 @@
     </message>
     <message>
         <source>This operation needs your wallet passphrase to decrypt the wallet.</source>
-        <translation>Bu işlem, cüzdan şifresini çözmek için cüzdan parolanıza ihtiyaç duyuyor.</translation>
+        <translation>Bu eylem, cüzdan şifresini çözmek için cüzdan parolanıza ihtiyaç duyuyor.</translation>
+    </message>
+    <message>
+        <source>Decrypt wallet</source>
+        <translation>Cüzdanın şifrelemesini aç</translation>
     </message>
     <message>
         <source>Change passphrase</source>
         <translation>Parola değiştir</translation>
     </message>
+    <message>
+        <source>Enter the old passphrase and new passphrase to the wallet.</source>
+        <translation>Eski ve yeni parolanızı cüzdana giriniz.</translation>
+    </message>
     <message>
         <source>Confirm wallet encryption</source>
         <translation>Cüzdan şifrelemesini onayla</translation>
     </message>
+    <message>
+        <source>Warning: If you encrypt your wallet and lose your passphrase, you will &lt;b&gt;LOSE ALL OF YOUR BITCOINS&lt;/b&gt;!</source>
+        <translation>Uyarı: Eğer cüzdanınızı şifreler ve parolanızı kaybederseniz &lt;b&gt;TÜM BİTCOİNLERİNİZİ KAYBEDECEKSİNİZ&lt;/b&gt;!</translation>
+    </message>
     <message>
         <source>Are you sure you wish to encrypt your wallet?</source>
         <translation>Cüzdanınızı şifrelemek istediğinizden emin misiniz?</translation>
@@ -143,35 +179,67 @@
         <source>Wallet encrypted</source>
         <translation>Cüzdan şifrelendi</translation>
     </message>
+    <message>
+        <source>%1 will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source>
+        <translation>Şifreleme işleminin bitirilmesi için %1 kapatılacak. Her ne kadar cüzdanınızı şifreleseniz de şifrelemenin bitcoinlerinizi bilgisayarınıza bulaşan zararlılardan tam olarak koruyamayacağını unutmayın.</translation>
+    </message>
+    <message>
+        <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source>
+        <translation>ÖNEMLİ: Önceden yapmış olduğunuz cüzdan dosyası yedeklemelerinin yeni oluşturulan şifrelenmiş cüzdan dosyası ile değiştirilmeleri gerekir. Güvenlik nedenleriyle yeni, şifrelenmiş cüzdanı kullanmaya başladığınızda eski şifrelenmemiş cüzdan dosyaları işe yaramaz hale gelecektir.</translation>
+    </message>
     <message>
         <source>Wallet encryption failed</source>
         <translation>Cüzdan şifreleme başarısız</translation>
     </message>
+    <message>
+        <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
+        <translation>Dahili bir hata yüzünden cüzdan şifrelemesi başarısız oldu. Cüzdanın şifrelenmedi.</translation>
+    </message>
+    <message>
+        <source>The supplied passphrases do not match.</source>
+        <translation>Girilen parolalar birbiriyle eşleşmiyor.</translation>
+    </message>
     <message>
         <source>Wallet unlock failed</source>
-        <translation>Cüzdan kilidi kaldırma hatası</translation>
+        <translation>Cüzdan kilidini kaldırma başarısız oldu</translation>
+    </message>
+    <message>
+        <source>The passphrase entered for the wallet decryption was incorrect.</source>
+        <translation>Cüzdan şifresinin açılması için girilen parola yanlıştı.</translation>
+    </message>
+    <message>
+        <source>Wallet decryption failed</source>
+        <translation>Cüzdan şifresinin açılması başarısız oldu</translation>
     </message>
-    </context>
+    <message>
+        <source>Wallet passphrase was successfully changed.</source>
+        <translation>Cüzdan parolası başarılı bir şekilde değiştirildi.</translation>
+    </message>
+    <message>
+        <source>Warning: The Caps Lock key is on!</source>
+        <translation>Uyarı: Caps Lock tuşu etkin durumda!</translation>
+    </message>
+</context>
 <context>
     <name>BanTableModel</name>
     <message>
         <source>IP/Netmask</source>
-        <translation>IP/Ağ maskesi</translation>
+        <translation>IP/Ağ Maskesi</translation>
     </message>
     <message>
         <source>Banned Until</source>
-        <translation>Şu vakte kadar yasaklı:</translation>
+        <translation>Şu zamana kadar yasaklı:</translation>
     </message>
 </context>
 <context>
     <name>BitcoinGUI</name>
     <message>
         <source>Sign &amp;message...</source>
-        <translation>&amp;Mesaj imzala...</translation>
+        <translation>&amp;İleti imzala...</translation>
     </message>
     <message>
         <source>Synchronizing with network...</source>
-        <translation>Şebeke ile senkronizasyon...</translation>
+        <translation>Ağ ile senkronize ediliyor...</translation>
     </message>
     <message>
         <source>&amp;Overview</source>
@@ -187,15 +255,15 @@
     </message>
     <message>
         <source>&amp;Transactions</source>
-        <translation>&amp;Muameleler</translation>
+        <translation>&amp;İşlemler</translation>
     </message>
     <message>
         <source>Browse transaction history</source>
-        <translation>Muamele tarihçesini tara</translation>
+        <translation>İşlem geçmişine gözat</translation>
     </message>
     <message>
         <source>E&amp;xit</source>
-        <translation>&amp;Çık</translation>
+        <translation>Ç&amp;ık</translation>
     </message>
     <message>
         <source>Quit application</source>
@@ -203,7 +271,7 @@
     </message>
     <message>
         <source>&amp;About %1</source>
-        <translation>%1 &amp;hakkında</translation>
+        <translation>%1 &amp;Hakkında</translation>
     </message>
     <message>
         <source>Show information about %1</source>
@@ -211,11 +279,11 @@
     </message>
     <message>
         <source>About &amp;Qt</source>
-        <translation>&amp;Qt hakkında</translation>
+        <translation>&amp;Qt Hakkında</translation>
     </message>
     <message>
         <source>Show information about Qt</source>
-        <translation>Qt hakkında bilgi görüntü</translation>
+        <translation>Qt hakkında bilgi göster</translation>
     </message>
     <message>
         <source>&amp;Options...</source>
@@ -227,15 +295,15 @@
     </message>
     <message>
         <source>&amp;Encrypt Wallet...</source>
-        <translation>Cüzdanı &amp;şifrele...</translation>
+        <translation>Cüzdanı &amp;Şifrele...</translation>
     </message>
     <message>
         <source>&amp;Backup Wallet...</source>
-        <translation>Cüzdanı &amp;yedekle...</translation>
+        <translation>Cüzdanı &amp;Yedekle...</translation>
     </message>
     <message>
         <source>&amp;Change Passphrase...</source>
-        <translation>Parolayı &amp;değiştir...</translation>
+        <translation>Parolayı &amp;Değiştir...</translation>
     </message>
     <message>
         <source>&amp;Sending addresses...</source>
@@ -247,15 +315,31 @@
     </message>
     <message>
         <source>Open &amp;URI...</source>
-        <translation>&amp;URI aç...</translation>
+        <translation>&amp;URI Aç...</translation>
+    </message>
+    <message>
+        <source>Click to disable network activity.</source>
+        <translation>Ağ etkinliğini devre dışı bırakmak için tıklayın.</translation>
+    </message>
+    <message>
+        <source>Network activity disabled.</source>
+        <translation>Ağ etkinliği devre dışı bırakılmış.</translation>
+    </message>
+    <message>
+        <source>Click to enable network activity again.</source>
+        <translation>Ağ etkinliğini yeniden etkinleştirmek için tıklayın.</translation>
+    </message>
+    <message>
+        <source>Syncing Headers (%1%)...</source>
+        <translation>Üstbilgiler Senkronize Ediliyor (%1%)...</translation>
     </message>
     <message>
         <source>Reindexing blocks on disk...</source>
-        <translation>Diskteki bloklar yeniden endeksleniyor...</translation>
+        <translation>Diskteki bloklar yeniden indeksleniyor...</translation>
     </message>
     <message>
         <source>Send coins to a Bitcoin address</source>
-        <translation>Bir Bitcoin adresine Bitcoin yolla</translation>
+        <translation>Bir bitcoin adresine bitcoin gönder</translation>
     </message>
     <message>
         <source>Backup wallet to another location</source>
@@ -275,7 +359,7 @@
     </message>
     <message>
         <source>&amp;Verify message...</source>
-        <translation>Mesaj &amp;kontrol et...</translation>
+        <translation>İletiyi &amp;kontrol et...</translation>
     </message>
     <message>
         <source>Bitcoin</source>
@@ -295,23 +379,23 @@
     </message>
     <message>
         <source>&amp;Show / Hide</source>
-        <translation>&amp;Göster / Sakla</translation>
+        <translation>&amp;Göster / Gizle</translation>
     </message>
     <message>
         <source>Show or hide the main Window</source>
-        <translation>Ana pencereyi görüntüle ya da sakla</translation>
+        <translation>Ana pencereyi göster ya da gizle</translation>
     </message>
     <message>
         <source>Encrypt the private keys that belong to your wallet</source>
-        <translation>Cüzdanınızın özel anahtarlarını şifrele</translation>
+        <translation>Cüzdanınıza ait özel anahtarları şifreleyin</translation>
     </message>
     <message>
         <source>Sign messages with your Bitcoin addresses to prove you own them</source>
-        <translation>Mesajları adreslerin size ait olduğunu ispatlamak için Bitcoin adresleri ile imzala</translation>
+        <translation>İletileri adreslerin size ait olduğunu ispatlamak için Bitcoin adresleri ile imzala</translation>
     </message>
     <message>
         <source>Verify messages to ensure they were signed with specified Bitcoin addresses</source>
-        <translation>Belirtilen Bitcoin adresleri ile imzalandıklarından emin olmak için mesajları kontrol et</translation>
+        <translation>Belirtilen Bitcoin adresleri ile imzalandıklarından emin olmak için iletileri kontrol et</translation>
     </message>
     <message>
         <source>&amp;File</source>
@@ -351,7 +435,7 @@
     </message>
     <message numerus="yes">
         <source>%n active connection(s) to Bitcoin network</source>
-        <translation><numerusform>Bitcoin şebekesine %n faal bağlantı</numerusform><numerusform>Bitcoin şebekesine %n faal bağlantı</numerusform></translation>
+        <translation><numerusform>Bitcoin şebekesine %n faal bağlantı</numerusform><numerusform>Bitcoin ağına %n etkin bağlantı var</numerusform></translation>
     </message>
     <message>
         <source>Indexing blocks on disk...</source>
@@ -359,11 +443,11 @@
     </message>
     <message>
         <source>Processing blocks on disk...</source>
-        <translation>Bloklar diske yazıdırılıyor...</translation>
+        <translation>Bloklar diske işleniyor...</translation>
     </message>
     <message numerus="yes">
         <source>Processed %n block(s) of transaction history.</source>
-        <translation><numerusform>Muamele tarihçesinden %n blok işlendi.</numerusform><numerusform>Muamele tarihçesinden %n blok işlendi</numerusform></translation>
+        <translation><numerusform>Muamele tarihçesinden %n blok işlendi.</numerusform><numerusform>İşlem tarihçesinden %n blok işlendi</numerusform></translation>
     </message>
     <message>
         <source>%1 behind</source>
@@ -371,11 +455,11 @@
     </message>
     <message>
         <source>Last received block was generated %1 ago.</source>
-        <translation>Son alınan blok %1 evvel oluşturulmuştu.</translation>
+        <translation>Son alınan blok %1 önce oluşturulmuştu.</translation>
     </message>
     <message>
         <source>Transactions after this will not yet be visible.</source>
-        <translation>Bundan sonraki muameleler henüz görüntülenemez.</translation>
+        <translation>Bundan sonraki işlemler henüz görüntülenemez.</translation>
     </message>
     <message>
         <source>Error</source>
@@ -399,7 +483,11 @@
     </message>
     <message>
         <source>%1 client</source>
-        <translation>%1 istemcisi</translation>
+        <translation>%1 istemci</translation>
+    </message>
+    <message>
+        <source>Connecting to peers...</source>
+        <translation>Eşlere bağlanılıyor...</translation>
     </message>
     <message>
         <source>Catching up...</source>
@@ -414,7 +502,7 @@
     <message>
         <source>Amount: %1
 </source>
-        <translation>Meblağ: %1
+        <translation>Tutar: %1
 </translation>
     </message>
     <message>
@@ -437,11 +525,19 @@
     </message>
     <message>
         <source>Sent transaction</source>
-        <translation>Muamele yollandı</translation>
+        <translation>İşlem gönderildi</translation>
     </message>
     <message>
         <source>Incoming transaction</source>
-        <translation>Gelen muamele</translation>
+        <translation>Gelen işlem</translation>
+    </message>
+    <message>
+        <source>HD key generation is &lt;b&gt;enabled&lt;/b&gt;</source>
+        <translation>HD anahtar oluşturma &lt;b&gt;etkin&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <source>HD key generation is &lt;b&gt;disabled&lt;/b&gt;</source>
+        <translation>HD anahtar oluşturma &lt;b&gt;devre dışı&lt;/b&gt;</translation>
     </message>
     <message>
         <source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;unlocked&lt;/b&gt;</source>
@@ -451,7 +547,11 @@
         <source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;locked&lt;/b&gt;</source>
         <translation>Cüzdan &lt;b&gt;şifrelenmiştir&lt;/b&gt; ve şu anda &lt;b&gt;kilitlidir&lt;/b&gt;</translation>
     </message>
-    </context>
+    <message>
+        <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source>
+        <translation>Ölümcül bir hata oluştu. Bitcoin yazılımı artık güvenli bir şekilde çalışmaya devam edemediği için kapatılacaktır.</translation>
+    </message>
+</context>
 <context>
     <name>CoinControlDialog</name>
     <message>
@@ -468,7 +568,7 @@
     </message>
     <message>
         <source>Amount:</source>
-        <translation>Meblağ:</translation>
+        <translation>Tutar:</translation>
     </message>
     <message>
         <source>Fee:</source>
@@ -500,7 +600,7 @@
     </message>
     <message>
         <source>Amount</source>
-        <translation>Meblağ</translation>
+        <translation>Tutar</translation>
     </message>
     <message>
         <source>Received with label</source>
@@ -532,13 +632,77 @@
     </message>
     <message>
         <source>Copy amount</source>
+        <translation>Tutarı kopyala</translation>
+    </message>
+    <message>
+        <source>Copy transaction ID</source>
+        <translation>İşlem ID'sini kopyala</translation>
+    </message>
+    <message>
+        <source>Lock unspent</source>
+        <translation>Harcanmamışı kilitle</translation>
+    </message>
+    <message>
+        <source>Unlock unspent</source>
+        <translation>Harcanmamışın kilidini aç</translation>
+    </message>
+    <message>
+        <source>Copy quantity</source>
         <translation>Miktarı kopyala</translation>
     </message>
+    <message>
+        <source>Copy fee</source>
+        <translation>Ücreti kopyala</translation>
+    </message>
+    <message>
+        <source>Copy after fee</source>
+        <translation>Ücretten sonrasını kopyala</translation>
+    </message>
+    <message>
+        <source>Copy bytes</source>
+        <translation>Baytları kopyala</translation>
+    </message>
+    <message>
+        <source>Copy dust</source>
+        <translation>Tozu kopyala</translation>
+    </message>
+    <message>
+        <source>Copy change</source>
+        <translation>Para üstünü kopyala</translation>
+    </message>
+    <message>
+        <source>(%1 locked)</source>
+        <translation>(%1 kilitlendi)</translation>
+    </message>
+    <message>
+        <source>yes</source>
+        <translation>evet</translation>
+    </message>
+    <message>
+        <source>no</source>
+        <translation>hayır</translation>
+    </message>
+    <message>
+        <source>This label turns red if any recipient receives an amount smaller than the current dust threshold.</source>
+        <translation>Eğer herhangi bir alıcı mevcut toz eşiğinden daha düşük bir tutar alırsa bu etiket kırmızıya dönüşür.</translation>
+    </message>
+    <message>
+        <source>Can vary +/- %1 satoshi(s) per input.</source>
+        <translation>Girdi başına +/- %1 satoshi değişebilir.</translation>
+    </message>
     <message>
         <source>(no label)</source>
         <translation>(etiket yok)</translation>
     </message>
-    </context>
+    <message>
+        <source>change from %1 (%2)</source>
+        <translation>%1 ögesinden para üstü (%2)</translation>
+    </message>
+    <message>
+        <source>(change)</source>
+        <translation>(para üstü)</translation>
+    </message>
+</context>
 <context>
     <name>EditAddressDialog</name>
     <message>
@@ -561,7 +725,39 @@
         <source>&amp;Address</source>
         <translation>&amp;Adres</translation>
     </message>
-    </context>
+    <message>
+        <source>New receiving address</source>
+        <translation>Yeni alım adresi</translation>
+    </message>
+    <message>
+        <source>New sending address</source>
+        <translation>Yeni gönderi adresi</translation>
+    </message>
+    <message>
+        <source>Edit receiving address</source>
+        <translation>Alım adresini düzenle</translation>
+    </message>
+    <message>
+        <source>Edit sending address</source>
+        <translation>Gönderi adresini düzenle</translation>
+    </message>
+    <message>
+        <source>The entered address "%1" is not a valid Bitcoin address.</source>
+        <translation>Girilen "%1" adresi geçerli bir Bitcoin adresi değildir.</translation>
+    </message>
+    <message>
+        <source>The entered address "%1" is already in the address book.</source>
+        <translation>Girilen "%1" adresi zaten adres defterinde mevcuttur.</translation>
+    </message>
+    <message>
+        <source>Could not unlock wallet.</source>
+        <translation>Cüzdan kilidi açılamadı.</translation>
+    </message>
+    <message>
+        <source>New key generation failed.</source>
+        <translation>Yeni anahtar oluşturulması başarısız oldu.</translation>
+    </message>
+</context>
 <context>
     <name>FreespaceChecker</name>
     <message>
@@ -574,7 +770,7 @@
     </message>
     <message>
         <source>Directory already exists. Add %1 if you intend to create a new directory here.</source>
-        <translation>Klasör hâlihazırda mevcuttur. Burada yeni bir klasör oluşturmak istiyorsanız, %1 ilâve ediniz.</translation>
+        <translation>Klasör zaten mevcuttur. Burada yeni bir klasör oluşturmak istiyorsanız, %1 ekleyiniz.</translation>
     </message>
     <message>
         <source>Path already exists, and is not a directory.</source>
@@ -656,7 +852,7 @@
     </message>
     <message>
         <source>%1 will download and store a copy of the Bitcoin block chain. At least %2GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source>
-        <translation>%1, Bitcoin blok zincirinin bir kopyasını indirecek ve saklayacaktır. Bu klasörde en az %2GB veri saklanacak ve bu zamanla artacaktır. Cüzdan da bu klasörde saklanacaktır.</translation>
+        <translation>%1, Bitcoin blok zincirinin bir kopyasını indirecek ve saklayacaktır. Bu klasörde en az %2 GB veri saklanacak ve bu zamanla artacaktır. Cüzdan da bu klasörde saklanacaktır.</translation>
     </message>
     <message>
         <source>Use the default data directory</source>
@@ -689,20 +885,56 @@
         <source>Form</source>
         <translation>Form</translation>
     </message>
+    <message>
+        <source>Recent transactions may not yet be visible, and therefore your wallet's balance might be incorrect. This information will be correct once your wallet has finished synchronizing with the bitcoin network, as detailed below.</source>
+        <translation>Son işlemler henüz görünmeyebilir ve bu nedenle cüzdanınızın bakiyesi yanlış olabilir. Bu bilgiler, aşağıda detaylandırıldığı gibi, cüzdanınız bitcoin ağı ile senkronizasyonunu tamamladığında doğru olacaktır. </translation>
+    </message>
+    <message>
+        <source>Attempting to spend bitcoins that are affected by not-yet-displayed transactions will not be accepted by the network.</source>
+        <translation>Henüz görüntülenmeyen işlemlerden etkilenen bitcoinleri harcama girişiminde bulunmak ağ tarafından kabul edilmeyecektir.</translation>
+    </message>
+    <message>
+        <source>Number of blocks left</source>
+        <translation>Kalan blok sayısı</translation>
+    </message>
+    <message>
+        <source>Unknown...</source>
+        <translation>Bilinmiyor...</translation>
+    </message>
     <message>
         <source>Last block time</source>
         <translation>Son blok zamanı</translation>
     </message>
+    <message>
+        <source>Progress</source>
+        <translation>İlerleme</translation>
+    </message>
+    <message>
+        <source>Progress increase per hour</source>
+        <translation>Saat başı ilerleme artışı</translation>
+    </message>
+    <message>
+        <source>calculating...</source>
+        <translation>hesaplanıyor...</translation>
+    </message>
+    <message>
+        <source>Estimated time left until synced</source>
+        <translation>Senkronize edilene kadar kalan tahmini süre</translation>
+    </message>
     <message>
         <source>Hide</source>
-        <translation>Sakla</translation>
+        <translation>Gizle</translation>
     </message>
-    </context>
+    <message>
+        <source>Unknown. Syncing Headers (%1)...</source>
+        <translation>Bilinmeyen. Üstbilgiler Senkronize Ediliyor (%1)...</translation>
+    </message>
+</context>
 <context>
     <name>OpenURIDialog</name>
     <message>
         <source>Open URI</source>
-        <translation>URI aç</translation>
+        <translation>URI Aç</translation>
     </message>
     <message>
         <source>Open payment request from URI or file</source>
@@ -716,7 +948,11 @@
         <source>Select payment request file</source>
         <translation>Ödeme talebi dosyasını seç</translation>
     </message>
-    </context>
+    <message>
+        <source>Select payment request file to open</source>
+        <translation>Açılacak ödeme talebi dosyasını seç</translation>
+    </message>
+</context>
 <context>
     <name>OptionsDialog</name>
     <message>
@@ -725,7 +961,7 @@
     </message>
     <message>
         <source>&amp;Main</source>
-        <translation>&amp;Esas ayarlar</translation>
+        <translation>&amp;Genel</translation>
     </message>
     <message>
         <source>Automatically start %1 after logging in to the system.</source>
@@ -737,7 +973,7 @@
     </message>
     <message>
         <source>Size of &amp;database cache</source>
-        <translation>&amp;Veritabanı tamponunun boyutu</translation>
+        <translation>&amp;Veritabanı önbelleğinin boyutu</translation>
     </message>
     <message>
         <source>MB</source>
@@ -765,15 +1001,15 @@
     </message>
     <message>
         <source>Third party URLs (e.g. a block explorer) that appear in the transactions tab as context menu items. %s in the URL is replaced by transaction hash. Multiple URLs are separated by vertical bar |.</source>
-        <translation>Muameleler sekmesinde bağlam menüsü unsurları olarak görünen üçüncü taraf bağlantıları (mesela bir blok tarayıcısı). URL'deki %s, muamele hash değeri ile değiştirilecektir. Birden çok bağlantılar düşey çubuklar | ile ayrılacaktır.</translation>
+        <translation>İşlemler sekmesinde bağlam menüsü unsurları olarak görünen üçüncü taraf bağlantıları (mesela bir blok tarayıcısı). URL'deki %s, işlem hash değeri ile değiştirilecektir. Birden çok bağlantılar düşey çubuklar | ile ayrılacaktır.</translation>
     </message>
     <message>
         <source>Third party transaction URLs</source>
-        <translation>Üçüncü taraf muamele URL'leri</translation>
+        <translation>Üçüncü parti işlem URL'leri</translation>
     </message>
     <message>
         <source>Active command-line options that override above options:</source>
-        <translation>Yukarıdaki seçeneklerin yerine geçen faal komut satırı seçenekleri:</translation>
+        <translation>Yukarıdaki seçeneklerin yerine geçen etkin komut satırı seçenekleri:</translation>
     </message>
     <message>
         <source>Reset all client options to default.</source>
@@ -781,11 +1017,11 @@
     </message>
     <message>
         <source>&amp;Reset Options</source>
-        <translation>Seçenekleri Sıfı&amp;rla</translation>
+        <translation>Seçenekleri &amp;Sıfırla</translation>
     </message>
     <message>
         <source>&amp;Network</source>
-        <translation>&amp;Şebeke</translation>
+        <translation>&amp;Ağ</translation>
     </message>
     <message>
         <source>(0 = auto, &lt;0 = leave that many cores free)</source>
@@ -805,11 +1041,11 @@
     </message>
     <message>
         <source>If you disable the spending of unconfirmed change, the change from a transaction cannot be used until that transaction has at least one confirmation. This also affects how your balance is computed.</source>
-        <translation>Teyit edilmemiş para üstünü harcamayı devre dışı bırakırsanız, bir muamelenin para üstü bu muamele için en az bir teyit olana dek harcanamaz. Bu, aynı zamanda bakiyenizin nasıl hesaplandığını da etkiler.</translation>
+        <translation>Doğrulanmamış para üstünü harcamayı devre dışı bırakırsanız, bir işlemin para üstü bu işlem için en az bir doğrulama olana dek harcanamaz. Bu, aynı zamanda bakiyenizin nasıl hesaplandığını da etkiler.</translation>
     </message>
     <message>
         <source>&amp;Spend unconfirmed change</source>
-        <translation>Teyit edilmemiş para üstünü &amp;harca</translation>
+        <translation>Doğrulanmamış para üstünü &amp;harca</translation>
     </message>
     <message>
         <source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source>
@@ -821,15 +1057,15 @@
     </message>
     <message>
         <source>Connect to the Bitcoin network through a SOCKS5 proxy.</source>
-        <translation>Bitcoin şebekesine SOCKS5 vekil sunucusu vasıtasıyla bağlan.</translation>
+        <translation>Bitcoin ağına bir SOCKS5 vekil sunucusu aracılığıyla bağlan.</translation>
     </message>
     <message>
         <source>&amp;Connect through SOCKS5 proxy (default proxy):</source>
-        <translation>SOCKS5 vekil sunucusu vasıtasıyla &amp;bağlan (varsayılan vekil sunucusu):</translation>
+        <translation>SOCKS5 vekil sunucusu aracılığıyla &amp;bağlan (varsayılan vekil sunucusu):</translation>
     </message>
     <message>
         <source>Proxy &amp;IP:</source>
-        <translation>Vekil &amp;İP:</translation>
+        <translation>Vekil &amp;IP:</translation>
     </message>
     <message>
         <source>&amp;Port:</source>
@@ -841,11 +1077,11 @@
     </message>
     <message>
         <source>Used for reaching peers via:</source>
-        <translation>Eşlere ulaşmak için kullanılır, şu yoluyla:</translation>
+        <translation>Eşlere ulaşmak için kullanılır, şu üzerinden:</translation>
     </message>
     <message>
         <source>Shows, if the supplied default SOCKS5 proxy is used to reach peers via this network type.</source>
-        <translation>Bu şebeke türü yoluyla eşlere bağlanmak için belirtilen varsayılan SOCKS5 vekil sunucusunun kullanılıp kullanılmadığını gösterir.</translation>
+        <translation>Bu ağ türü yoluyla eşlere bağlanmak için belirtilen varsayılan SOCKS5 vekil sunucusunun kullanılıp kullanılmadığını gösterir.</translation>
     </message>
     <message>
         <source>IPv4</source>
@@ -861,7 +1097,7 @@
     </message>
     <message>
         <source>Connect to the Bitcoin network through a separate SOCKS5 proxy for Tor hidden services.</source>
-        <translation>Bitcoin şebekesine gizli Tor servisleri için ayrı bir SOCKS5 vekil sunucusu vasıtasıyla bağlan.</translation>
+        <translation>Bitcoin ağına gizli Tor servisleri için ayrı bir SOCKS5 vekil sunucusu aracılığıyla bağlan.</translation>
     </message>
     <message>
         <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services:</source>
@@ -873,15 +1109,15 @@
     </message>
     <message>
         <source>&amp;Hide the icon from the system tray.</source>
-        <translation>İkonu sistem çekmecesinden &amp;sakla</translation>
+        <translation>Simgeyi görev çubuğundan &amp;gizle</translation>
     </message>
     <message>
         <source>Hide tray icon</source>
-        <translation>Sistem çekmecesi ikonunu sakla</translation>
+        <translation>Görev çubuğu simgesini gizle</translation>
     </message>
     <message>
         <source>Show only a tray icon after minimizing the window.</source>
-        <translation>Küçültüldükten sonra sadece çekmece ikonu göster.</translation>
+        <translation>Küçültüldükten sonra sadece tepsi simgesi göster.</translation>
     </message>
     <message>
         <source>&amp;Minimize to the tray instead of the taskbar</source>
@@ -905,7 +1141,7 @@
     </message>
     <message>
         <source>&amp;Unit to show amounts in:</source>
-        <translation>Meblağları göstermek için &amp;birim:</translation>
+        <translation>Tutarı göstermek için &amp;birim:</translation>
     </message>
     <message>
         <source>Choose the default subdivision unit to show in the interface and when sending coins.</source>
@@ -960,7 +1196,7 @@
     </message>
     <message>
         <source>The displayed information may be out of date. Your wallet automatically synchronizes with the Bitcoin network after a connection is established, but this process has not completed yet.</source>
-        <translation>Görüntülenen veriler zaman aşımına uğramış olabilir. Bağlantı kurulduğunda cüzdanınız otomatik olarak şebeke ile eşleşir ancak bu işlem henüz tamamlanmamıştır.</translation>
+        <translation>Görüntülenen bilgiler güncel olmayabilir. Bağlantı kurulduğunda cüzdanınız otomatik olarak Bitcoin ağı ile senkronize olur ancak bu işlem henüz tamamlanmamıştır.</translation>
     </message>
     <message>
         <source>Watch-only:</source>
@@ -980,7 +1216,7 @@
     </message>
     <message>
         <source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source>
-        <translation>Henüz teyit edilmemiş ve harcanabilir bakiyeye eklenmemiş muamelelerin toplamı</translation>
+        <translation>Henüz doğrulanmamış ve harcanabilir bakiyeye eklenmemiş işlemlerin toplamı</translation>
     </message>
     <message>
         <source>Immature:</source>
@@ -1012,11 +1248,11 @@
     </message>
     <message>
         <source>Recent transactions</source>
-        <translation>Son muameleler</translation>
+        <translation>Son işlemler</translation>
     </message>
     <message>
         <source>Unconfirmed transactions to watch-only addresses</source>
-        <translation>Sadece izlenen adreslere gelen teyit edilmemiş muameleler</translation>
+        <translation>Sadece izlenen adreslere gelen doğrulanmamış işlemler</translation>
     </message>
     <message>
         <source>Mined balance in watch-only addresses that has not yet matured</source>
@@ -1029,7 +1265,95 @@
 </context>
 <context>
     <name>PaymentServer</name>
-    </context>
+    <message>
+        <source>Payment request error</source>
+        <translation>Ödeme talebi hatası</translation>
+    </message>
+    <message>
+        <source>Cannot start bitcoin: click-to-pay handler</source>
+        <translation>Bitcoin başlatılamadı: tıkla-ve-öde yöneticisi</translation>
+    </message>
+    <message>
+        <source>URI handling</source>
+        <translation>URI yönetimi</translation>
+    </message>
+    <message>
+        <source>Payment request fetch URL is invalid: %1</source>
+        <translation>Ödeme talebini alma URL'i geçersiz: %1</translation>
+    </message>
+    <message>
+        <source>Invalid payment address %1</source>
+        <translation>%1 ödeme adresi geçersizdir</translation>
+    </message>
+    <message>
+        <source>URI cannot be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source>
+        <translation>URI ayrıştırılamıyor! Bunun nedeni geçersiz bir Bitcoin adresi veya hatalı biçimlendirilmiş URI değişkenleri olabilir.</translation>
+    </message>
+    <message>
+        <source>Payment request file handling</source>
+        <translation>Ödeme talebi dosyası yönetimi</translation>
+    </message>
+    <message>
+        <source>Payment request file cannot be read! This can be caused by an invalid payment request file.</source>
+        <translation>Ödeme talebi dosyası okunamıyor! Bunun nedeni geçersiz bir ödeme talebi dosyası olabilir.</translation>
+    </message>
+    <message>
+        <source>Payment request rejected</source>
+        <translation>Ödeme talebi reddedildi</translation>
+    </message>
+    <message>
+        <source>Payment request network doesn't match client network.</source>
+        <translation>Ödeme talebi ağı, istemci ağıyla eşleşmiyor.</translation>
+    </message>
+    <message>
+        <source>Payment request expired.</source>
+        <translation>Ödeme talebinin geçerlilik süresi bitti.</translation>
+    </message>
+    <message>
+        <source>Payment request is not initialized.</source>
+        <translation>Ödeme talebi başlatılmadı.</translation>
+    </message>
+    <message>
+        <source>Unverified payment requests to custom payment scripts are unsupported.</source>
+        <translation>Özel ödeme betiklerine, doğrulanmamış ödeme talepleri desteklenmez.</translation>
+    </message>
+    <message>
+        <source>Invalid payment request.</source>
+        <translation>Geçersiz ödeme talebi.</translation>
+    </message>
+    <message>
+        <source>Requested payment amount of %1 is too small (considered dust).</source>
+        <translation>Talep edilen %1 ödeme tutarı çok küçüktür (toz olarak kabul edilir).</translation>
+    </message>
+    <message>
+        <source>Refund from %1</source>
+        <translation>%1 adresinden geri ödeme</translation>
+    </message>
+    <message>
+        <source>Payment request %1 is too large (%2 bytes, allowed %3 bytes).</source>
+        <translation>%1 ödeme talebi çok büyük (%2 bayt, üst sınır %3 bayt).</translation>
+    </message>
+    <message>
+        <source>Error communicating with %1: %2</source>
+        <translation>%1 ile iletişimde hata: %2</translation>
+    </message>
+    <message>
+        <source>Payment request cannot be parsed!</source>
+        <translation>Ödeme talebi ayrıştırılamaz!</translation>
+    </message>
+    <message>
+        <source>Bad response from server %1</source>
+        <translation>%1 sunucusundan hatalı yanıt</translation>
+    </message>
+    <message>
+        <source>Network request error</source>
+        <translation>Ağ talebi hatası</translation>
+    </message>
+    <message>
+        <source>Payment acknowledged</source>
+        <translation>Ödeme kabul edildi</translation>
+    </message>
+</context>
 <context>
     <name>PeerTableModel</name>
     <message>
@@ -1040,12 +1364,20 @@
         <source>Node/Service</source>
         <translation>Düğüm/Servis</translation>
     </message>
-    </context>
+    <message>
+        <source>NodeId</source>
+        <translation>Düğüm ID'si</translation>
+    </message>
+    <message>
+        <source>Ping</source>
+        <translation>Ping</translation>
+    </message>
+</context>
 <context>
     <name>QObject</name>
     <message>
         <source>Amount</source>
-        <translation>Meblağ</translation>
+        <translation>Tutar</translation>
     </message>
     <message>
         <source>Enter a Bitcoin address (e.g. %1)</source>
@@ -1079,21 +1411,73 @@
         <source>%1 ms</source>
         <translation>%1 ms</translation>
     </message>
+    <message numerus="yes">
+        <source>%n second(s)</source>
+        <translation><numerusform>%n saniye</numerusform><numerusform>%n saniye</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%n minute(s)</source>
+        <translation><numerusform>%n dakika</numerusform><numerusform>%n dakika</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%n hour(s)</source>
+        <translation><numerusform>%n saat</numerusform><numerusform>%n saat</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%n day(s)</source>
+        <translation><numerusform>%n gün</numerusform><numerusform>%n gün</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%n week(s)</source>
+        <translation><numerusform>%n hafta</numerusform><numerusform>%n hafta</numerusform></translation>
+    </message>
     <message>
         <source>%1 and %2</source>
         <translation>%1 ve %2</translation>
     </message>
-    </context>
+    <message numerus="yes">
+        <source>%n year(s)</source>
+        <translation><numerusform>%n yıl</numerusform><numerusform>%n yıl</numerusform></translation>
+    </message>
+    <message>
+        <source>%1 didn't yet exit safely...</source>
+        <translation>%1  henüz güvenli bir şekilde çıkış yapmamıştır...</translation>
+    </message>
+</context>
 <context>
     <name>QObject::QObject</name>
-    </context>
+    <message>
+        <source>Error: Specified data directory "%1" does not exist.</source>
+        <translation>Hata: Belirtilen "%1" veri klasörü yoktur.</translation>
+    </message>
+    <message>
+        <source>Error: Cannot parse configuration file: %1. Only use key=value syntax.</source>
+        <translation>Hata: %1 yapılandırma dosyası ayrıştırılamadı. Sadece anahtar=değer dizimini kullanınız.</translation>
+    </message>
+    <message>
+        <source>Error: %1</source>
+        <translation>Hata: %1</translation>
+    </message>
+</context>
 <context>
     <name>QRImageWidget</name>
     <message>
         <source>&amp;Save Image...</source>
         <translation>Resmi ka&amp;ydet...</translation>
     </message>
-    </context>
+    <message>
+        <source>&amp;Copy Image</source>
+        <translation>Resmi &amp;Kopyala</translation>
+    </message>
+    <message>
+        <source>Save QR Code</source>
+        <translation>QR Kodu Kaydet</translation>
+    </message>
+    <message>
+        <source>PNG Image (*.png)</source>
+        <translation>PNG Resim (*.png)</translation>
+    </message>
+</context>
 <context>
     <name>RPCConsole</name>
     <message>
@@ -1106,7 +1490,7 @@
     </message>
     <message>
         <source>&amp;Information</source>
-        <translation>&amp;Malumat</translation>
+        <translation>&amp;Bilgi</translation>
     </message>
     <message>
         <source>Debug window</source>
@@ -1130,7 +1514,7 @@
     </message>
     <message>
         <source>Network</source>
-        <translation>Şebeke</translation>
+        <translation>Ağ</translation>
     </message>
     <message>
         <source>Name</source>
@@ -1154,7 +1538,7 @@
     </message>
     <message>
         <source>Current number of transactions</source>
-        <translation>Güncel muamele sayısı</translation>
+        <translation>Güncel işlem sayısı</translation>
     </message>
     <message>
         <source>Memory usage</source>
@@ -1198,7 +1582,7 @@
     </message>
     <message>
         <source>Synced Headers</source>
-        <translation>Eşleşmiş Başlıklar</translation>
+        <translation>Eşleşmiş Üstbilgiler</translation>
     </message>
     <message>
         <source>Synced Blocks</source>
@@ -1252,6 +1636,10 @@
         <source>Ping Wait</source>
         <translation>Ping Beklemesi</translation>
     </message>
+    <message>
+        <source>Min Ping</source>
+        <translation>En Düşük Ping</translation>
+    </message>
     <message>
         <source>Time Offset</source>
         <translation>Saat Farkı</translation>
@@ -1270,7 +1658,7 @@
     </message>
     <message>
         <source>&amp;Network Traffic</source>
-        <translation>&amp;Şebeke trafiği</translation>
+        <translation>&amp;Ağ trafiği</translation>
     </message>
     <message>
         <source>&amp;Clear</source>
@@ -1312,18 +1700,38 @@
         <source>1 &amp;year</source>
         <translation>1 &amp;yıl</translation>
     </message>
+    <message>
+        <source>&amp;Disconnect</source>
+        <translation>&amp;Bağlantıyı Kes</translation>
+    </message>
+    <message>
+        <source>Ban for</source>
+        <translation>Yasakla</translation>
+    </message>
+    <message>
+        <source>&amp;Unban</source>
+        <translation>&amp;Yasaklamayı Kaldır</translation>
+    </message>
     <message>
         <source>Welcome to the %1 RPC console.</source>
         <translation>%1 RPC konsoluna hoş geldiniz.</translation>
     </message>
     <message>
         <source>Use up and down arrows to navigate history, and &lt;b&gt;Ctrl-L&lt;/b&gt; to clear screen.</source>
-        <translation>Tarihçede gezinmek için imleç tuşlarını kullanınız, &lt;b&gt;Ctrl-L&lt;/b&gt; ile de ekranı temizleyebilirsiniz.</translation>
+        <translation>Tarihçede gezinmek için aşağı ve yukarı ok tuşlarını kullanınız, &lt;b&gt;Ctrl-L&lt;/b&gt; ile de ekranı temizleyebilirsiniz.</translation>
     </message>
     <message>
         <source>Type &lt;b&gt;help&lt;/b&gt; for an overview of available commands.</source>
         <translation>Mevcut komutların listesi için &lt;b&gt;help&lt;/b&gt; yazınız.</translation>
     </message>
+    <message>
+        <source>WARNING: Scammers have been active, telling users to type commands here, stealing their wallet contents. Do not use this console without fully understanding the ramification of a command.</source>
+        <translation>UYARI: Bitcoin dolandırıcılarının çok fazla etkin olduğu zamanlarda, dolandırıcılar bazı kullanıcılara buraya komutlar yazmalarını söylerek onların cüzdanlarındaki bitcoinleri çalmışlardır. Bir komutun sonuçlarını tam olarak anlamadan bu konsolu kullanmayın.</translation>
+    </message>
+    <message>
+        <source>Network activity disabled</source>
+        <translation>Ağ etkinliği devre dışı bırakıldı</translation>
+    </message>
     <message>
         <source>%1 B</source>
         <translation>%1 B</translation>
@@ -1377,7 +1785,7 @@
     <name>ReceiveCoinsDialog</name>
     <message>
         <source>&amp;Amount:</source>
-        <translation>&amp;Meblağ:</translation>
+        <translation>&amp;Tutar:</translation>
     </message>
     <message>
         <source>&amp;Label:</source>
@@ -1385,7 +1793,7 @@
     </message>
     <message>
         <source>&amp;Message:</source>
-        <translation>Me&amp;saj:</translation>
+        <translation>&amp;İleti:</translation>
     </message>
     <message>
         <source>Reuse one of the previously used receiving addresses. Reusing addresses has security and privacy issues. Do not use this unless re-generating a payment request made before.</source>
@@ -1397,7 +1805,7 @@
     </message>
     <message>
         <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source>
-        <translation>Talep açıldığında gösterilecek, isteğinize dayalı, ödeme talebi ile ilişkilendirilecek bir mesaj. Not: Bu mesaj ödeme ile birlikte Bitcoin şebekesi üzerinden gönderilmeyecektir.</translation>
+        <translation>Talep açıldığında gösterilecek, isteğinize dayalı, ödeme talebi ile ilişkilendirilecek bir ileti. Not: Bu ileti ödeme ile birlikte Bitcoin ağı üzerinden gönderilmeyecektir.</translation>
     </message>
     <message>
         <source>An optional label to associate with the new receiving address.</source>
@@ -1409,7 +1817,7 @@
     </message>
     <message>
         <source>An optional amount to request. Leave this empty or zero to not request a specific amount.</source>
-        <translation>Seçiminize dayalı talep edilecek meblağ. Belli bir meblağ talep etmemek için bunu boş bırakın veya sıfır değerini kullanın.</translation>
+        <translation>Seçiminize dayalı talep edilecek tutar. Belli bir tutar talep etmemek için bunu boş bırakın veya sıfır değerini kullanın.</translation>
     </message>
     <message>
         <source>Clear all fields of the form.</source>
@@ -1443,13 +1851,21 @@
         <source>Remove</source>
         <translation>Kaldır</translation>
     </message>
+    <message>
+        <source>Copy URI</source>
+        <translation>URI'yi kopyala</translation>
+    </message>
     <message>
         <source>Copy label</source>
         <translation>Etiket kopyala</translation>
     </message>
+    <message>
+        <source>Copy message</source>
+        <translation>İletiyi kopyala</translation>
+    </message>
     <message>
         <source>Copy amount</source>
-        <translation>Miktarı kopyala</translation>
+        <translation>Tutarı kopyala</translation>
     </message>
 </context>
 <context>
@@ -1470,26 +1886,74 @@
         <source>&amp;Save Image...</source>
         <translation>Resmi ka&amp;ydet...</translation>
     </message>
+    <message>
+        <source>Request payment to %1</source>
+        <translation>%1 unsuruna ödeme talep et</translation>
+    </message>
+    <message>
+        <source>Payment information</source>
+        <translation>Ödeme bilgisi</translation>
+    </message>
+    <message>
+        <source>URI</source>
+        <translation>URI</translation>
+    </message>
     <message>
         <source>Address</source>
         <translation>Adres</translation>
     </message>
+    <message>
+        <source>Amount</source>
+        <translation>Tutar</translation>
+    </message>
     <message>
         <source>Label</source>
         <translation>Etiket</translation>
     </message>
-    </context>
+    <message>
+        <source>Message</source>
+        <translation>İleti</translation>
+    </message>
+    <message>
+        <source>Resulting URI too long, try to reduce the text for label / message.</source>
+        <translation>Sonuç URI çok uzun, etiket ya da ileti metnini kısaltmayı deneyiniz.</translation>
+    </message>
+    <message>
+        <source>Error encoding URI into QR Code.</source>
+        <translation>URI'nin QR koduna kodlanmasında hata oluştu.</translation>
+    </message>
+</context>
 <context>
     <name>RecentRequestsTableModel</name>
+    <message>
+        <source>Date</source>
+        <translation>Tarih</translation>
+    </message>
     <message>
         <source>Label</source>
         <translation>Etiket</translation>
     </message>
+    <message>
+        <source>Message</source>
+        <translation>İleti</translation>
+    </message>
     <message>
         <source>(no label)</source>
         <translation>(etiket yok)</translation>
     </message>
-    </context>
+    <message>
+        <source>(no message)</source>
+        <translation>(ileti yok)</translation>
+    </message>
+    <message>
+        <source>(no amount requested)</source>
+        <translation>(tutar talep edilmedi)</translation>
+    </message>
+    <message>
+        <source>Requested</source>
+        <translation>Talep edilen</translation>
+    </message>
+</context>
 <context>
     <name>SendCoinsDialog</name>
     <message>
@@ -1522,7 +1986,7 @@
     </message>
     <message>
         <source>Amount:</source>
-        <translation>Meblağ:</translation>
+        <translation>Tutar:</translation>
     </message>
     <message>
         <source>Fee:</source>
@@ -1546,7 +2010,7 @@
     </message>
     <message>
         <source>Transaction Fee:</source>
-        <translation>Muamele ücreti:</translation>
+        <translation>İşlem ücreti:</translation>
     </message>
     <message>
         <source>Choose...</source>
@@ -1562,11 +2026,11 @@
     </message>
     <message>
         <source>If the custom fee is set to 1000 satoshis and the transaction is only 250 bytes, then "per kilobyte" only pays 250 satoshis in fee, while "total at least" pays 1000 satoshis. For transactions bigger than a kilobyte both pay by kilobyte.</source>
-        <translation>Eğer özel ücret 1000 satoşi olarak ayarlandıysa ve muamele sadece 250 baytsa, "kilobayt başı" ücret olarak sadece 250 satoşi öder ve "toplam asgari" 1000 satoşi öder. Bir kilobayttan yüksek muameleler için ikisi de kilobayt başı ödeme yapar.</translation>
+        <translation>Eğer özel ücret 1000 satoşi olarak ayarlandıysa ve işlem sadece 250 baytsa, "kilobayt başı" ücret olarak sadece 250 satoşi öder ve "toplam asgari" 1000 satoşi öder. Bir kilobayttan yüksek işlemler için ikisi de kilobayt başı ödeme yapar.</translation>
     </message>
     <message>
         <source>Hide</source>
-        <translation>Sakla</translation>
+        <translation>Gizle</translation>
     </message>
     <message>
         <source>total at least</source>
@@ -1574,7 +2038,7 @@
     </message>
     <message>
         <source>Paying only the minimum fee is just fine as long as there is less transaction volume than space in the blocks. But be aware that this can end up in a never confirming transaction once there is more demand for bitcoin transactions than the network can process.</source>
-        <translation>Asgari ücreti ödemek, bloklarda boşluktan daha az muamele hacmi olduğu sürece bir sorun çıkarmaz. Fakat şebekenin işleyecebileceğinden daha çok bitcoin muameleleri talebi olduğunda bunun asla teyit edilmeyen bir muamele olabileceğinin farkında olmalısınız.</translation>
+        <translation>Gerekli olan en az ücreti ödemek, bloklarda boşluktan daha az işlem hacmi olduğu sürece bir sorun çıkarmaz. Fakat ağın işleyecebileceğinden daha çok bitcoin işlemi talebi olduğunda bunun asla doğrulanmayan bir işlem olabileceğinin farkında olmalısınız.</translation>
     </message>
     <message>
         <source>(read the tooltip)</source>
@@ -1616,6 +2080,10 @@
         <source>Dust:</source>
         <translation>Toz:</translation>
     </message>
+    <message>
+        <source>Confirmation time target:</source>
+        <translation>Doğrulama süresi hedefi:</translation>
+    </message>
     <message>
         <source>Clear &amp;All</source>
         <translation>Tümünü &amp;temizle</translation>
@@ -1633,19 +2101,127 @@
         <translation>G&amp;önder</translation>
     </message>
     <message>
-        <source>Copy amount</source>
+        <source>Copy quantity</source>
         <translation>Miktarı kopyala</translation>
     </message>
     <message>
-        <source>(no label)</source>
-        <translation>(etiket yok)</translation>
+        <source>Copy amount</source>
+        <translation>Tutarı kopyala</translation>
+    </message>
+    <message>
+        <source>Copy fee</source>
+        <translation>Ücreti kopyala</translation>
+    </message>
+    <message>
+        <source>Copy after fee</source>
+        <translation>Ücretten sonrasını kopyala</translation>
+    </message>
+    <message>
+        <source>Copy bytes</source>
+        <translation>Baytları kopyala</translation>
+    </message>
+    <message>
+        <source>Copy dust</source>
+        <translation>Tozu kopyala</translation>
+    </message>
+    <message>
+        <source>Copy change</source>
+        <translation>Para üstünü kopyala</translation>
+    </message>
+    <message>
+        <source>%1 to %2</source>
+        <translation>%1 ögesinden %2 unsuruna</translation>
+    </message>
+    <message>
+        <source>Are you sure you want to send?</source>
+        <translation>Göndermek istediğinizden emin misiniz?</translation>
+    </message>
+    <message>
+        <source>added as transaction fee</source>
+        <translation>işlem ücreti olarak eklendi</translation>
+    </message>
+    <message>
+        <source>Total Amount %1</source>
+        <translation>Toplam Tutar %1</translation>
+    </message>
+    <message>
+        <source>or</source>
+        <translation>veya</translation>
+    </message>
+    <message>
+        <source>Confirm send coins</source>
+        <translation>Bitcoin gönderimini onaylayın</translation>
+    </message>
+    <message>
+        <source>The recipient address is not valid. Please recheck.</source>
+        <translation>Alıcı adresi geçerli değildir. Lütfen tekrar kontrol ediniz.</translation>
+    </message>
+    <message>
+        <source>The amount to pay must be larger than 0.</source>
+        <translation>Ödeyeceğiniz tutarın 0'dan yüksek olması gerekir.</translation>
+    </message>
+    <message>
+        <source>The amount exceeds your balance.</source>
+        <translation>Tutar bakiyenizden yüksektir.</translation>
+    </message>
+    <message>
+        <source>The total exceeds your balance when the %1 transaction fee is included.</source>
+        <translation>Toplam, %1 işlem ücreti eklendiğinde bakiyenizi geçmektedir.</translation>
+    </message>
+    <message>
+        <source>Duplicate address found: addresses should only be used once each.</source>
+        <translation>Tekrarlayan adres bulundu: adresler sadece bir kez kullanılmalıdır.</translation>
+    </message>
+    <message>
+        <source>Transaction creation failed!</source>
+        <translation>İşlem oluşturma başarısız!</translation>
+    </message>
+    <message>
+        <source>The transaction was rejected with the following reason: %1</source>
+        <translation>İşlem şu nedenden dolayı reddedildi: %1</translation>
+    </message>
+    <message>
+        <source>A fee higher than %1 is considered an absurdly high fee.</source>
+        <translation>%1 tutarından yüksek bir ücret saçma derecede yüksek bir ücret olarak kabul edilir.</translation>
+    </message>
+    <message>
+        <source>Payment request expired.</source>
+        <translation>Ödeme talebinin geçerlilik süresi bitti.</translation>
+    </message>
+    <message numerus="yes">
+        <source>%n block(s)</source>
+        <translation><numerusform>%n blok</numerusform><numerusform>%n blok</numerusform></translation>
+    </message>
+    <message>
+        <source>Pay only the required fee of %1</source>
+        <translation>Sadece asgari ücret olan %1 tutarını öde</translation>
+    </message>
+    <message>
+        <source>Warning: Invalid Bitcoin address</source>
+        <translation>Uyarı: geçersiz Bitcoin adresi</translation>
+    </message>
+    <message>
+        <source>Warning: Unknown change address</source>
+        <translation>Uyarı: Bilinmeyen para üstü adresi</translation>
+    </message>
+    <message>
+        <source>Confirm custom change address</source>
+        <translation>Özel para üstü adresini onayla</translation>
+    </message>
+    <message>
+        <source>The address you selected for change is not part of this wallet. Any or all funds in your wallet may be sent to this address. Are you sure?</source>
+        <translation>Para üstü için seçtiğiniz adres bu cüzdanın bir parçası değil. Cüzdanınızdaki bir miktar veya tüm para bu adrese gönderilebilir. Emin misiniz?</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(etiket yok)</translation>
     </message>
 </context>
 <context>
     <name>SendCoinsEntry</name>
     <message>
         <source>A&amp;mount:</source>
-        <translation>Mebla&amp;ğ:</translation>
+        <translation>T&amp;utar:</translation>
     </message>
     <message>
         <source>Pay &amp;To:</source>
@@ -1681,19 +2257,19 @@
     </message>
     <message>
         <source>Remove this entry</source>
-        <translation>Bu unsuru kaldır</translation>
+        <translation>Bu ögeyi kaldır</translation>
     </message>
     <message>
         <source>The fee will be deducted from the amount being sent. The recipient will receive less bitcoins than you enter in the amount field. If multiple recipients are selected, the fee is split equally.</source>
-        <translation>Ücret yollanan meblağdan alınacaktır. Alıcı meblağ alanında girdiğinizden daha az bitcoin alacaktır.  Eğer birden çok alıcı seçiliyse ücret eşit olarak bölünecektir.</translation>
+        <translation>Ücret yollanan tutardan alınacaktır. Alıcı tutar alanına girdiğinizden daha az bitcoin alacaktır. Eğer birden çok alıcı seçiliyse ücret eşit olarak bölünecektir.</translation>
     </message>
     <message>
         <source>S&amp;ubtract fee from amount</source>
-        <translation>Ücreti meblağdan düş</translation>
+        <translation>Ücreti tutardan düş</translation>
     </message>
     <message>
         <source>Message:</source>
-        <translation>Mesaj:</translation>
+        <translation>İleti:</translation>
     </message>
     <message>
         <source>This is an unauthenticated payment request.</source>
@@ -1709,7 +2285,7 @@
     </message>
     <message>
         <source>A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
-        <translation>Bitcoin: URI'siyle ilişkili ve bilginiz için muameleyle saklanacak bir mesaj. Not: Bu mesaj Bitcoin şebekesi üzerinden gönderilmeyecektir.</translation>
+        <translation>Referans için bitcoin: URI'siyle iliştirilmiş işlemle birlikte depolanacak bir ileti. Not: Bu mesaj Bitcoin ağı üzerinden gönderilmeyecektir.</translation>
     </message>
     <message>
         <source>Pay To:</source>
@@ -1719,10 +2295,18 @@
         <source>Memo:</source>
         <translation>Not:</translation>
     </message>
-    </context>
+    <message>
+        <source>Enter a label for this address to add it to your address book</source>
+        <translation>Adres defterinize eklemek için bu adrese bir etiket giriniz</translation>
+    </message>
+</context>
 <context>
     <name>SendConfirmationDialog</name>
-    </context>
+    <message>
+        <source>Yes</source>
+        <translation>Evet</translation>
+    </message>
+</context>
 <context>
     <name>ShutdownWindow</name>
     <message>
@@ -1738,19 +2322,19 @@
     <name>SignVerifyMessageDialog</name>
     <message>
         <source>Signatures - Sign / Verify a Message</source>
-        <translation>İmzalar - Mesaj İmzala / Kontrol et</translation>
+        <translation>İmzalar - İleti İmzala / Kontrol et</translation>
     </message>
     <message>
         <source>&amp;Sign Message</source>
-        <translation>Mesaj &amp;imzala</translation>
+        <translation>İleti &amp;imzala</translation>
     </message>
     <message>
         <source>You can sign messages/agreements with your addresses to prove you can receive bitcoins sent to them. Be careful not to sign anything vague or random, as phishing attacks may try to trick you into signing your identity over to them. Only sign fully-detailed statements you agree to.</source>
-        <translation>Adreslerinize yollanan bitcoinleri alabileceğiniz ispatlamak için adreslerinizle mesaj/anlaşma imzalayabilirsiniz. Oltalama saldırılarının kimliğinizi imzanızla elde etmeyi deneyebilecekleri için belirsiz ya da rastgele hiçbir şey imzalamamaya dikkat ediniz. Sadece ayrıntılı açıklaması olan ve tümüne katıldığınız ifadeleri imzalayınız.</translation>
+        <translation>Adreslerinize yollanan bitcoinleri alabileceğiniz ispatlamak için adreslerinizle iletiler/anlaşmalar imzalayabilirsiniz. Oltalama saldırılarının kimliğinizi imzanızla elde etmeyi deneyebilecekleri için belirsiz ya da rastgele hiçbir şey imzalamamaya dikkat ediniz. Sadece ayrıntılı açıklaması olan ve tümüne katıldığınız ifadeleri imzalayınız.</translation>
     </message>
     <message>
         <source>The Bitcoin address to sign the message with</source>
-        <translation>Mesajın imzalanmasında kullanılacak Bitcoin adresi</translation>
+        <translation>İletinin imzalanmasında kullanılacak Bitcoin adresi</translation>
     </message>
     <message>
         <source>Choose previously used address</source>
@@ -1770,7 +2354,7 @@
     </message>
     <message>
         <source>Enter the message you want to sign here</source>
-        <translation>İmzalamak istediğiniz mesajı burada giriniz</translation>
+        <translation>İmzalamak istediğiniz iletiyi burada giriniz</translation>
     </message>
     <message>
         <source>Signature</source>
@@ -1782,15 +2366,15 @@
     </message>
     <message>
         <source>Sign the message to prove you own this Bitcoin address</source>
-        <translation>Bu Bitcoin adresinin sizin olduğunu ispatlamak için mesajı imzalayın</translation>
+        <translation>Bu Bitcoin adresinin sizin olduğunu ispatlamak için iletiyi imzalayın</translation>
     </message>
     <message>
         <source>Sign &amp;Message</source>
-        <translation>&amp;Mesajı imzala</translation>
+        <translation>&amp;İletiyi imzala</translation>
     </message>
     <message>
         <source>Reset all sign message fields</source>
-        <translation>Tüm mesaj alanlarını sıfırla</translation>
+        <translation>Tüm ileti alanlarını sıfırla</translation>
     </message>
     <message>
         <source>Clear &amp;All</source>
@@ -1798,29 +2382,81 @@
     </message>
     <message>
         <source>&amp;Verify Message</source>
-        <translation>Mesaj &amp;kontrol et</translation>
+        <translation>İletiyi &amp;kontrol et</translation>
     </message>
     <message>
         <source>Enter the receiver's address, message (ensure you copy line breaks, spaces, tabs, etc. exactly) and signature below to verify the message. Be careful not to read more into the signature than what is in the signed message itself, to avoid being tricked by a man-in-the-middle attack. Note that this only proves the signing party receives with the address, it cannot prove sendership of any transaction!</source>
-        <translation>Alıcının adresini, mesajı (satır sonları, boşluklar, sekmeler vs. karakterleri tam olarak kopyaladığınızdan emin olunuz) ve imzayı aşağıda giriniz. Bir ortadaki adam saldırısı tarafından kandırılmaya mâni olmak için imzadan, imzalı mesajın içeriğini aşan bir anlam çıkarmamaya dikkat ediniz. Bunun sadece imzalayan tarafın adres ile alım yapabildiğini ispatladığını ve herhangi bir muamelenin gönderi tarafını kanıtlayamayacağını unutmayınız!</translation>
+        <translation>Alıcının adresini, iletiyi (satır sonları, boşluklar, sekmeler vs. karakterleri tam olarak kopyaladığınızdan emin olunuz) ve imzayı aşağıya giriniz. Bir ortadaki adam saldırısı tarafından kandırılmaya engel olmak için imzadan, imzalı iletinin içeriğini aşan bir anlam çıkarmamaya dikkat ediniz. Bunun sadece imzalayan tarafın adres ile alım yapabildiğini ispatladığını ve herhangi bir işlemin gönderi tarafını kanıtlayamayacağını unutmayınız!</translation>
     </message>
     <message>
         <source>The Bitcoin address the message was signed with</source>
-        <translation>Mesajın imzalanmasında kullanılan Bitcoin adresi</translation>
+        <translation>İletinin imzalanmasında kullanılan Bitcoin adresi</translation>
     </message>
     <message>
         <source>Verify the message to ensure it was signed with the specified Bitcoin address</source>
-        <translation>Belirtilen Bitcoin adresi ile imzalandığını doğrulamak için mesajı kontrol et</translation>
+        <translation>Belirtilen Bitcoin adresi ile imzalandığını doğrulamak için iletiyi kontrol et</translation>
     </message>
     <message>
         <source>Verify &amp;Message</source>
-        <translation>&amp;Mesaj kontrol et</translation>
+        <translation>&amp;İletiyi kontrol et</translation>
     </message>
     <message>
         <source>Reset all verify message fields</source>
-        <translation>Tüm mesaj kontrolü alanlarını sıfırla</translation>
+        <translation>Tüm ileti kontrolü alanlarını sıfırla</translation>
+    </message>
+    <message>
+        <source>Click "Sign Message" to generate signature</source>
+        <translation>İmzayı oluşturmak için "İletiyi İmzala"ya tıklayın</translation>
+    </message>
+    <message>
+        <source>The entered address is invalid.</source>
+        <translation>Girilen adres geçersizdir.</translation>
+    </message>
+    <message>
+        <source>Please check the address and try again.</source>
+        <translation>Lütfen adresi kontrol edip tekrar deneyiniz.</translation>
+    </message>
+    <message>
+        <source>The entered address does not refer to a key.</source>
+        <translation>Girilen adres herhangi bir anahtara işaret etmemektedir.</translation>
+    </message>
+    <message>
+        <source>Wallet unlock was cancelled.</source>
+        <translation>Cüzdan kilidinin açılması iptal edildi.</translation>
     </message>
-    </context>
+    <message>
+        <source>Private key for the entered address is not available.</source>
+        <translation>Girilen adres için özel anahtar mevcut değildir.</translation>
+    </message>
+    <message>
+        <source>Message signing failed.</source>
+        <translation>İleti imzalaması başarısız oldu.</translation>
+    </message>
+    <message>
+        <source>Message signed.</source>
+        <translation>İleti imzalandı.</translation>
+    </message>
+    <message>
+        <source>The signature could not be decoded.</source>
+        <translation>İmzanın kodu çözülemedi.</translation>
+    </message>
+    <message>
+        <source>Please check the signature and try again.</source>
+        <translation>Lütfen imzayı kontrol edip tekrar deneyiniz.</translation>
+    </message>
+    <message>
+        <source>The signature did not match the message digest.</source>
+        <translation>İmza iletinin özeti ile eşleşmedi.</translation>
+    </message>
+    <message>
+        <source>Message verification failed.</source>
+        <translation>İleti doğrulaması başarısız oldu.</translation>
+    </message>
+    <message>
+        <source>Message verified.</source>
+        <translation>İleti doğrulandı.</translation>
+    </message>
+</context>
 <context>
     <name>SplashScreen</name>
     <message>
@@ -1837,27 +2473,367 @@
 </context>
 <context>
     <name>TransactionDesc</name>
-    </context>
+    <message numerus="yes">
+        <source>Open for %n more block(s)</source>
+        <translation><numerusform>%n taneden daha fazla blok için açık</numerusform><numerusform>%n taneden daha fazla blok için açık</numerusform></translation>
+    </message>
+    <message>
+        <source>Open until %1</source>
+        <translation>%1 değerine dek açık</translation>
+    </message>
+    <message>
+        <source>conflicted with a transaction with %1 confirmations</source>
+        <translation>%1 doğrulamalı bir işlem ile çelişti</translation>
+    </message>
+    <message>
+        <source>%1/offline</source>
+        <translation>%1/çevrim dışı</translation>
+    </message>
+    <message>
+        <source>0/unconfirmed, %1</source>
+        <translation>0/doğrulanmamış, %1</translation>
+    </message>
+    <message>
+        <source>in memory pool</source>
+        <translation>bellek alanında</translation>
+    </message>
+    <message>
+        <source>not in memory pool</source>
+        <translation>bellek alanında değil</translation>
+    </message>
+    <message>
+        <source>abandoned</source>
+        <translation>terk edilmiş</translation>
+    </message>
+    <message>
+        <source>%1/unconfirmed</source>
+        <translation>%1/doğrulanmadı</translation>
+    </message>
+    <message>
+        <source>%1 confirmations</source>
+        <translation>%1 doğrulama</translation>
+    </message>
+    <message>
+        <source>Status</source>
+        <translation>Durum</translation>
+    </message>
+    <message>
+        <source>, has not been successfully broadcast yet</source>
+        <translation>, henüz başarılı bir şekilde yayınlanmadı</translation>
+    </message>
+    <message numerus="yes">
+        <source>, broadcast through %n node(s)</source>
+        <translation><numerusform>, %n düğüm aracılığıyla yayınlandı</numerusform><numerusform>, %n düğüm aracılığıyla yayınlandı</numerusform></translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation>Tarih</translation>
+    </message>
+    <message>
+        <source>Source</source>
+        <translation>Kaynak</translation>
+    </message>
+    <message>
+        <source>Generated</source>
+        <translation>Oluşturuldu</translation>
+    </message>
+    <message>
+        <source>From</source>
+        <translation>Gönderen</translation>
+    </message>
+    <message>
+        <source>unknown</source>
+        <translation>bilinmiyor</translation>
+    </message>
+    <message>
+        <source>To</source>
+        <translation>Alıcı</translation>
+    </message>
+    <message>
+        <source>own address</source>
+        <translation>kendi adresiniz</translation>
+    </message>
+    <message>
+        <source>watch-only</source>
+        <translation>sadece-izlenen</translation>
+    </message>
+    <message>
+        <source>label</source>
+        <translation>etiket</translation>
+    </message>
+    <message>
+        <source>Credit</source>
+        <translation>Alınan Tutar</translation>
+    </message>
+    <message numerus="yes">
+        <source>matures in %n more block(s)</source>
+        <translation><numerusform>%n ek blok sonrasında olgunlaşacak</numerusform><numerusform>%n ek blok sonrasında olgunlaşacak</numerusform></translation>
+    </message>
+    <message>
+        <source>not accepted</source>
+        <translation>kabul edilmedi</translation>
+    </message>
+    <message>
+        <source>Debit</source>
+        <translation>Çekilen Tutar</translation>
+    </message>
+    <message>
+        <source>Total debit</source>
+        <translation>Toplam çekilen tutar</translation>
+    </message>
+    <message>
+        <source>Total credit</source>
+        <translation>Toplam alınan tutar</translation>
+    </message>
+    <message>
+        <source>Transaction fee</source>
+        <translation>İşlem ücreti</translation>
+    </message>
+    <message>
+        <source>Net amount</source>
+        <translation>Net tutar</translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation>İleti</translation>
+    </message>
+    <message>
+        <source>Comment</source>
+        <translation>Yorum</translation>
+    </message>
+    <message>
+        <source>Transaction ID</source>
+        <translation>İşlem ID'si</translation>
+    </message>
+    <message>
+        <source>Transaction total size</source>
+        <translation>İşlemin toplam boyutu</translation>
+    </message>
+    <message>
+        <source>Output index</source>
+        <translation>Çıktı indeksi</translation>
+    </message>
+    <message>
+        <source>Merchant</source>
+        <translation>Tüccar</translation>
+    </message>
+    <message>
+        <source>Generated coins must mature %1 blocks before they can be spent. When you generated this block, it was broadcast to the network to be added to the block chain. If it fails to get into the chain, its state will change to "not accepted" and it won't be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source>
+        <translation>Oluşturulan bitcoin'lerin harcanabilmelerinden önce %1 blok beklemeleri gerekmektedir. Bu blok, oluşturduğunuzda, blok zincirine eklenmesi için ağda yayınlandı. Zincire eklenmesi başarısız olursa, durumu "kabul edilmedi" olarak değiştirilecek ve harcanamayacaktır. Bu, bazen başka bir düğüm sizden birkaç saniye önce ya da sonra blok oluşturursa meydana gelebilir.</translation>
+    </message>
+    <message>
+        <source>Debug information</source>
+        <translation>Hata ayıklama bilgisi</translation>
+    </message>
+    <message>
+        <source>Transaction</source>
+        <translation>İşlem</translation>
+    </message>
+    <message>
+        <source>Inputs</source>
+        <translation>Girdiler</translation>
+    </message>
+    <message>
+        <source>Amount</source>
+        <translation>Tutar</translation>
+    </message>
+    <message>
+        <source>true</source>
+        <translation>doğru</translation>
+    </message>
+    <message>
+        <source>false</source>
+        <translation>yanlış</translation>
+    </message>
+</context>
 <context>
     <name>TransactionDescDialog</name>
     <message>
         <source>This pane shows a detailed description of the transaction</source>
-        <translation>Bu pano muamelenin ayrıntılı açıklamasını gösterir</translation>
+        <translation>Bu pano işlemin ayrıntılı açıklamasını gösterir</translation>
+    </message>
+    <message>
+        <source>Details for %1</source>
+        <translation>%1 için ayrıntılar</translation>
     </message>
-    </context>
+</context>
 <context>
     <name>TransactionTableModel</name>
+    <message>
+        <source>Date</source>
+        <translation>Tarih</translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation>Tür</translation>
+    </message>
     <message>
         <source>Label</source>
         <translation>Etiket</translation>
     </message>
+    <message numerus="yes">
+        <source>Open for %n more block(s)</source>
+        <translation><numerusform>%n taneden daha fazla blok için açık</numerusform><numerusform>%n taneden daha fazla blok için açık</numerusform></translation>
+    </message>
+    <message>
+        <source>Open until %1</source>
+        <translation>%1 değerine dek açık</translation>
+    </message>
+    <message>
+        <source>Offline</source>
+        <translation>Çevrim dışı</translation>
+    </message>
+    <message>
+        <source>Unconfirmed</source>
+        <translation>Doğrulanmamış</translation>
+    </message>
+    <message>
+        <source>Abandoned</source>
+        <translation>Terk edilmiş</translation>
+    </message>
+    <message>
+        <source>Confirming (%1 of %2 recommended confirmations)</source>
+        <translation>Doğrulanıyor (%1 kere doğrulandı, önerilen doğrulama sayısı %2)</translation>
+    </message>
+    <message>
+        <source>Confirmed (%1 confirmations)</source>
+        <translation>Doğrulandı (%1 doğrulama)</translation>
+    </message>
+    <message>
+        <source>Conflicted</source>
+        <translation>Uyuşmadı</translation>
+    </message>
+    <message>
+        <source>Immature (%1 confirmations, will be available after %2)</source>
+        <translation>Olgunlaşmamış (%1 doğrulama, %2 doğrulama sonra kullanılabilir olacaktır)</translation>
+    </message>
+    <message>
+        <source>This block was not received by any other nodes and will probably not be accepted!</source>
+        <translation>Bu blok başka hiçbir düğüm tarafından alınmamıştır ve muhtemelen kabul edilmeyecektir!</translation>
+    </message>
+    <message>
+        <source>Generated but not accepted</source>
+        <translation>Oluşturuldu ama kabul edilmedi</translation>
+    </message>
+    <message>
+        <source>Received with</source>
+        <translation>Şununla alındı</translation>
+    </message>
+    <message>
+        <source>Received from</source>
+        <translation>Alındığı kişi</translation>
+    </message>
+    <message>
+        <source>Sent to</source>
+        <translation>Gönderildiği adres</translation>
+    </message>
+    <message>
+        <source>Payment to yourself</source>
+        <translation>Kendinize ödeme</translation>
+    </message>
+    <message>
+        <source>Mined</source>
+        <translation>Madenden çıkarılan</translation>
+    </message>
+    <message>
+        <source>watch-only</source>
+        <translation>sadece-izlenen</translation>
+    </message>
+    <message>
+        <source>(n/a)</source>
+        <translation>(mevcut değil)</translation>
+    </message>
     <message>
         <source>(no label)</source>
         <translation>(etiket yok)</translation>
     </message>
-    </context>
+    <message>
+        <source>Transaction status. Hover over this field to show number of confirmations.</source>
+        <translation>İşlem durumu. Doğrulama sayısını görüntülemek için fare imlecini bu alanın üzerinde tutunuz.</translation>
+    </message>
+    <message>
+        <source>Date and time that the transaction was received.</source>
+        <translation>İşlemin alındığı tarih ve zaman.</translation>
+    </message>
+    <message>
+        <source>Type of transaction.</source>
+        <translation>İşlemin türü.</translation>
+    </message>
+    <message>
+        <source>Whether or not a watch-only address is involved in this transaction.</source>
+        <translation>Bu işleme sadece-izlenen bir adresin dahil edilip, edilmediği.</translation>
+    </message>
+    <message>
+        <source>User-defined intent/purpose of the transaction.</source>
+        <translation>İşlemin kullanıcı tanımlı amacı.</translation>
+    </message>
+    <message>
+        <source>Amount removed from or added to balance.</source>
+        <translation>Bakiyeden kaldırılan ya da bakiyeye eklenen tutar.</translation>
+    </message>
+</context>
 <context>
     <name>TransactionView</name>
+    <message>
+        <source>All</source>
+        <translation>Hepsi</translation>
+    </message>
+    <message>
+        <source>Today</source>
+        <translation>Bugün</translation>
+    </message>
+    <message>
+        <source>This week</source>
+        <translation>Bu hafta</translation>
+    </message>
+    <message>
+        <source>This month</source>
+        <translation>Bu ay</translation>
+    </message>
+    <message>
+        <source>Last month</source>
+        <translation>Geçen ay</translation>
+    </message>
+    <message>
+        <source>This year</source>
+        <translation>Bu yıl</translation>
+    </message>
+    <message>
+        <source>Range...</source>
+        <translation>Tarih Aralığı</translation>
+    </message>
+    <message>
+        <source>Received with</source>
+        <translation>Şununla alındı</translation>
+    </message>
+    <message>
+        <source>Sent to</source>
+        <translation>Gönderildiği adres</translation>
+    </message>
+    <message>
+        <source>To yourself</source>
+        <translation>Kendinize</translation>
+    </message>
+    <message>
+        <source>Mined</source>
+        <translation>Madenden çıkarılan</translation>
+    </message>
+    <message>
+        <source>Other</source>
+        <translation>Diğer</translation>
+    </message>
+    <message>
+        <source>Enter address or label to search</source>
+        <translation>Aranacak adres ya da etiket giriniz</translation>
+    </message>
+    <message>
+        <source>Min amount</source>
+        <translation>En düşük tutar</translation>
+    </message>
+    <message>
+        <source>Abandon transaction</source>
+        <translation>İşlemden vazgeç</translation>
+    </message>
     <message>
         <source>Copy address</source>
         <translation>Adres kopyala</translation>
@@ -1868,7 +2844,51 @@
     </message>
     <message>
         <source>Copy amount</source>
-        <translation>Miktarı kopyala</translation>
+        <translation>Tutarı kopyala</translation>
+    </message>
+    <message>
+        <source>Copy transaction ID</source>
+        <translation>İşlem ID'sini kopyala</translation>
+    </message>
+    <message>
+        <source>Copy raw transaction</source>
+        <translation>Ham işlemi kopyala</translation>
+    </message>
+    <message>
+        <source>Copy full transaction details</source>
+        <translation>Tüm işlem ayrıntılarını kopyala</translation>
+    </message>
+    <message>
+        <source>Edit label</source>
+        <translation>Etiketi düzenle</translation>
+    </message>
+    <message>
+        <source>Show transaction details</source>
+        <translation>İşlem ayrıntılarını göster</translation>
+    </message>
+    <message>
+        <source>Export Transaction History</source>
+        <translation>İşlem Tarihçesini Dışarı Aktar</translation>
+    </message>
+    <message>
+        <source>Comma separated file (*.csv)</source>
+        <translation>Virgülle ayrılmış değerler dosyası (*.csv)</translation>
+    </message>
+    <message>
+        <source>Confirmed</source>
+        <translation>Doğrulandı</translation>
+    </message>
+    <message>
+        <source>Watch-only</source>
+        <translation>Sadece izlenen</translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation>Tarih</translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation>Tür</translation>
     </message>
     <message>
         <source>Label</source>
@@ -1878,27 +2898,91 @@
         <source>Address</source>
         <translation>Adres</translation>
     </message>
+    <message>
+        <source>ID</source>
+        <translation>ID</translation>
+    </message>
     <message>
         <source>Exporting Failed</source>
         <translation>Dışarı aktarmada hata</translation>
     </message>
-    </context>
+    <message>
+        <source>There was an error trying to save the transaction history to %1.</source>
+        <translation>İşlem tarihçesinin %1 konumuna kaydedilmeye çalışıldığı sırada bir hata meydana geldi.</translation>
+    </message>
+    <message>
+        <source>Exporting Successful</source>
+        <translation>Dışarı Aktarma Başarılı</translation>
+    </message>
+    <message>
+        <source>The transaction history was successfully saved to %1.</source>
+        <translation>İşlem tarihçesi %1 konumuna başarıyla kaydedildi.</translation>
+    </message>
+    <message>
+        <source>Range:</source>
+        <translation>Tarih Aralığı:</translation>
+    </message>
+    <message>
+        <source>to</source>
+        <translation>Alıcı</translation>
+    </message>
+</context>
 <context>
     <name>UnitDisplayStatusBarControl</name>
     <message>
         <source>Unit to show amounts in. Click to select another unit.</source>
-        <translation>Meblağları göstermek için birim. Başka bir birim seçmek için tıklayınız.</translation>
+        <translation>Tutarı göstermek için birim. Başka bir birim seçmek için tıklayınız.</translation>
     </message>
 </context>
 <context>
     <name>WalletFrame</name>
-    </context>
+    <message>
+        <source>No wallet has been loaded.</source>
+        <translation>Hiçbir cüzdan yüklenmedi.</translation>
+    </message>
+</context>
 <context>
     <name>WalletModel</name>
-    </context>
+    <message>
+        <source>Send Coins</source>
+        <translation>Bitcoini Gönder</translation>
+    </message>
+</context>
 <context>
     <name>WalletView</name>
-    </context>
+    <message>
+        <source>&amp;Export</source>
+        <translation>&amp;Dışarı aktar</translation>
+    </message>
+    <message>
+        <source>Export the data in the current tab to a file</source>
+        <translation>Mevcut sekmedeki verileri bir dosyaya aktar</translation>
+    </message>
+    <message>
+        <source>Backup Wallet</source>
+        <translation>Cüzdanı Yedekle</translation>
+    </message>
+    <message>
+        <source>Wallet Data (*.dat)</source>
+        <translation>Cüzdan Verileri (*.dat)</translation>
+    </message>
+    <message>
+        <source>Backup Failed</source>
+        <translation>Yedekleme Başarısız Oldu</translation>
+    </message>
+    <message>
+        <source>There was an error trying to save the wallet data to %1.</source>
+        <translation>Cüzdan verilerinin %1 konumuna kaydedilmesi sırasında bir hata meydana geldi.</translation>
+    </message>
+    <message>
+        <source>Backup Successful</source>
+        <translation>Yedekleme Başarılı</translation>
+    </message>
+    <message>
+        <source>The wallet data was successfully saved to %1.</source>
+        <translation>Cüzdan verileri %1 konumuna başarıyla kaydedildi.</translation>
+    </message>
+</context>
 <context>
     <name>bitcoin-core</name>
     <message>
@@ -1921,13 +3005,25 @@
         <source>Accept command line and JSON-RPC commands</source>
         <translation>Komut satırı ve JSON-RPC komutlarını kabul et</translation>
     </message>
+    <message>
+        <source>Accept connections from outside (default: 1 if no -proxy or -connect/-noconnect)</source>
+        <translation>Dışarıdan gelen bağlantıları kabul et (varsayılan: 1 eğer -proxy veya -connect/-noconnect yoksa)</translation>
+    </message>
+    <message>
+        <source>Connect only to the specified node(s); -noconnect or -connect=0 alone to disable automatic connections</source>
+        <translation>-noconnect ile yalnızca belirtilen düğümleri bağlayın veya yalnız otomatik bağlantıları devre dışı bırakmak için -connect=0 kullanın.</translation>
+    </message>
+    <message>
+        <source>Distributed under the MIT software license, see the accompanying file %s or %s</source>
+        <translation>MIT yazılım lisansı altında dağıtılmıştır, beraberindeki %s ya da %s dosyasına bakınız.</translation>
+    </message>
     <message>
         <source>If &lt;category&gt; is not supplied or if &lt;category&gt; = 1, output all debugging information.</source>
-        <translation>Eğer &lt;kategori&gt; belirtilmemişse ya da &lt;kategori&gt; = 1 ise, tüm hata ayıklama verilerini dök.</translation>
+        <translation>Eğer &lt;kategori&gt; belirtilmemişse ya da &lt;kategori&gt; = 1 ise, tüm hata ayıklama verilerini çıktı al.</translation>
     </message>
     <message>
         <source>Prune configured below the minimum of %d MiB.  Please use a higher number.</source>
-        <translation>Budama, asgari değer olan %d MiB'den düşük olarak ayarlanmıştır. Lütfen daha yüksek bir sayı kullanınız.</translation>
+        <translation>Budama, en düşük değer olan %d MiB'den düşük olarak ayarlanmıştır. Lütfen daha yüksek bir sayı kullanınız.</translation>
     </message>
     <message>
         <source>Prune: last wallet synchronisation goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of pruned node)</source>
@@ -1943,7 +3039,7 @@
     </message>
     <message>
         <source>Fee (in %s/kB) to add to transactions you send (default: %s)</source>
-        <translation>Yolladığınız muamelelere eklenecek ücret (%s/kB olarak) (varsayılan: %s)</translation>
+        <translation>Yolladığınız işlemlere eklenecek ücret (%s/kB olarak) (varsayılan: %s)</translation>
     </message>
     <message>
         <source>Pruning blockstore...</source>
@@ -1971,7 +3067,7 @@
     </message>
     <message>
         <source>Accept relayed transactions received from whitelisted peers even when not relaying transactions (default: %d)</source>
-        <translation>Muameleler aktarılmadığında dahi beyaz listedeki eşlerden aktarılan muameleleri kabul et (varsayılan: %d)</translation>
+        <translation>İşlemler aktarılmadığında dahi beyaz listedeki eşlerden aktarılan işlemleri kabul et (varsayılan: %d)</translation>
     </message>
     <message>
         <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source>
@@ -1983,7 +3079,7 @@
     </message>
     <message>
         <source>Delete all wallet transactions and only recover those parts of the blockchain through -rescan on startup</source>
-        <translation>Tüm cüzdan muamelelerini sil ve başlangıçta -rescan ile sadece blok zincirinin parçası olanları geri getir</translation>
+        <translation>Tüm cüzdan işlemlerini sil ve başlangıçta -rescan ile sadece blok zincirinin parçası olanları geri getir</translation>
     </message>
     <message>
         <source>Error loading %s: You can't enable HD on a already existing non-HD wallet</source>
@@ -1991,19 +3087,27 @@
     </message>
     <message>
         <source>Error reading %s! All keys read correctly, but transaction data or address book entries might be missing or incorrect.</source>
-        <translation>%s dosyasının okunması sırasında bir hata meydana geldi! Tüm anahtarlar doğru bir şekilde okundu, ancak muamele verileri ya da adres defteri unsurları hatalı veya eksik olabilir.</translation>
+        <translation>%s dosyasının okunması sırasında bir hata meydana geldi! Tüm anahtarlar doğru bir şekilde okundu, ancak işlem verileri ya da adres defteri ögeleri hatalı veya eksik olabilir.</translation>
     </message>
     <message>
         <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source>
-        <translation>Bir cüzdan muamelesi değiştiğinde komutu çalıştır (komuttaki %s muamele kimliği ile değiştirilecektir)</translation>
+        <translation>Bir cüzdan işlemi değiştiğinde komutu çalıştır (komuttaki %s işlem kimliği ile değiştirilecektir)</translation>
+    </message>
+    <message>
+        <source>Extra transactions to keep in memory for compact block reconstructions (default: %u)</source>
+        <translation>Daha küçük boyutlu blok yeniden yapılandırması için fazladan işlemleri bellekte tut. (varsayılan: %u)</translation>
+    </message>
+    <message>
+        <source>If this block is in the chain assume that it and its ancestors are valid and potentially skip their script verification (0 to verify all, default: %s, testnet: %s)</source>
+        <translation>Eğer bu blok zincirde yer alıyorsa onun ve atalarının geçerli olduğunu varsay ve potansiyel olarak onların betik doğrulamasını atla.  (Tümünü doğrulamak için 0, varsayılan %s, testnet: %s)</translation>
     </message>
     <message>
         <source>Maximum allowed median peer time offset adjustment. Local perspective of time may be influenced by peers forward or backward by this amount. (default: %u seconds)</source>
-        <translation>Müsaade edilen azami medyan eş zamanı değişiklik sınırının ayarlaması. Zamanın yerel perspektifi bu miktar kadar ileri ya da geri eşler tarafından etkilenebilir. (Varsayılan %u saniye)</translation>
+        <translation>İzin verilen edilen en yüksek medyan eş zamanı değişiklik sınırının ayarlaması. Zamanın yerel perspektifi bu miktar kadar ileri ya da geri eşler tarafından etkilenebilir. (Varsayılan %u saniye)</translation>
     </message>
     <message>
         <source>Maximum total fees (in %s) to use in a single wallet transaction or raw transaction; setting this too low may abort large transactions (default: %s)</source>
-        <translation>Tek cüzdan muamelesinde ya da ham muamelede kullanılacak azami toplam ücret (%s olarak); bunu çok düşük olarak ayarlamak büyük muameleleri iptal edebilir (varsayılan: %s)</translation>
+        <translation>Tek bir cüzdan işleminde ya da ham işlemde kullanılacak en yüksek toplam ücret (%s olarak); bunu çok düşük olarak ayarlamak büyük işlemleri iptal edebilir (varsayılan: %s)</translation>
     </message>
     <message>
         <source>Please check that your computer's date and time are correct! If your clock is wrong, %s will not work properly.</source>
@@ -2013,6 +3117,14 @@
         <source>Please contribute if you find %s useful. Visit %s for further information about the software.</source>
         <translation>%s programını faydalı buluyorsanız lütfen katkıda bulununuz. Yazılım hakkında daha fazla bilgi için %s adresini ziyaret ediniz.</translation>
     </message>
+    <message>
+        <source>Reduce storage requirements by enabling pruning (deleting) of old blocks. This allows the pruneblockchain RPC to be called to delete specific blocks, and enables automatic pruning of old blocks if a target size in MiB is provided. This mode is incompatible with -txindex and -rescan. Warning: Reverting this setting requires re-downloading the entire blockchain. (default: 0 = disable pruning blocks, 1 = allow manual pruning via RPC, &gt;%u = automatically prune block files to stay under the specified target size in MiB)</source>
+        <translation>Eski blokları budamayı (silme) etkinleştirerek depolama gereksinimlerini azaltın. Bu belirli blokları silmek için pruneblockchain uzak yordam çağrısına (RPC) izin verir. Eğer bloklar hedef mebibyte boyutuna ulaşırsa eski blokların otomatik olarak budanmasını sağlar. Bu kip, -txindex ve -rescan ile uyumsuzdur. Uyarı: Bu ayarı geri almak, blok zincirinin tamamını yeniden yüklemeyi gerektirir. (varsayılan: 0 = blok budaması devre dışı, 1 = RPC üzerinden manuel budamaya izin verir, &gt;%u = mebibyte olarak belirtilen hedef boyutun altında kalması için blok dosyalarını otomatik olarak budar)</translation>
+    </message>
+    <message>
+        <source>Set lowest fee rate (in %s/kB) for transactions to be included in block creation. (default: %s)</source>
+        <translation>Blok oluşturmaya dahil olan işlemler için en düşük ücret oranını (%s/kB olarak) ayarla. (varsayılan: %s)</translation>
+    </message>
     <message>
         <source>Set the number of script verification threads (%u to %d, 0 = auto, &lt;0 = leave that many cores free, default: %d)</source>
         <translation>Betik kontrolü iş parçacıklarının sayısını belirler (%u ilâ %d, 0 = otomatik, &lt;0 = bu sayıda çekirdeği kullanma, varsayılan: %d)</translation>
@@ -2021,6 +3133,10 @@
         <source>The block database contains a block which appears to be from the future. This may be due to your computer's date and time being set incorrectly. Only rebuild the block database if you are sure that your computer's date and time are correct</source>
         <translation>Blok veritabanı gelecekten gibi görünen bir blok içermektedir. Bu, bilgisayarınızın saat ve tarihinin yanlış ayarlanmış olmasından kaynaklanabilir. Blok veritabanını sadece bilgisayarınızın tarih ve saatinin doğru olduğundan eminseniz yeniden derleyin.</translation>
     </message>
+    <message>
+        <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
+        <translation>Bu kararlı sürümden önceki bir deneme sürümüdür. - risklerini bilerek kullanma sorumluluğu sizdedir - bitcoin oluşturmak ya da ticari uygulamalar için kullanmayınız</translation>
+    </message>
     <message>
         <source>Unable to rewind the database to a pre-fork state. You will need to redownload the blockchain</source>
         <translation>Veritabanını çatallama öncesi duruma geri sarmak mümkün değil. Blok zincirini tekrar indirmeniz gerekmektedir</translation>
@@ -2029,6 +3145,22 @@
         <source>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</source>
         <translation>Dinlenecek portu haritalamak için UPnP kullan (varsayılan: dinlenildiğinde ve -proxy olmadığında 1)</translation>
     </message>
+    <message>
+        <source>Username and hashed password for JSON-RPC connections. The field &lt;userpw&gt; comes in the format: &lt;USERNAME&gt;:&lt;SALT&gt;$&lt;HASH&gt;. A canonical python script is included in share/rpcuser. The client then connects normally using the rpcuser=&lt;USERNAME&gt;/rpcpassword=&lt;PASSWORD&gt; pair of arguments. This option can be specified multiple times</source>
+        <translation>JSON-RPC bağlantıları için kullanıcı adı ve karmalanmış parola. &lt;userpw&gt; alanı şu biçimdedir: &lt;KULLANICI ADI&gt;:&lt;SALT&gt;$&lt;HASH&gt;. Kanonik bir Python betiği share/rpcuser klasöründe bulunabilir. Ardından istemci normal şekilde rpcuser=&lt;KULLANICI ADI&gt;/rpcpassword=&lt;PAROLA&gt; argüman çiftini kullanarak bağlanabilir. Bu seçenek birden çok kez belirtilebilir.</translation>
+    </message>
+    <message>
+        <source>Wallet will not create transactions that violate mempool chain limits (default: %u)</source>
+        <translation>Cüzdan, zincir bellek alanı limitlerini ihlal eden işlem oluşturmayacak. (varsayılan: %u)</translation>
+    </message>
+    <message>
+        <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source>
+        <translation>Uyarı: Ağ üyeleri aralarında tamamen anlaşmış gibi gözükmüyor! Bazı madenciler sorun yaşıyor gibi görünmektedir.</translation>
+    </message>
+    <message>
+        <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source>
+        <translation>Uyarı: Ağ eşlerimizle tamamen anlaşamamışız gibi görünüyor! Güncelleme yapmanız gerekebilir ya da diğer düğümlerin güncelleme yapmaları gerekebilir.</translation>
+    </message>
     <message>
         <source>You need to rebuild the database using -reindex-chainstate to change -txindex</source>
         <translation>-txindex'i değiştirmek için veritabanını -reindex-chainstate kullanarak tekrar inşa etmeniz gerekmektedir</translation>
@@ -2039,7 +3171,7 @@
     </message>
     <message>
         <source>-maxmempool must be at least %d MB</source>
-        <translation>-maxmempool asgari %d MB olmalıdır</translation>
+        <translation>-maxmempool en az %d MB olmalıdır</translation>
     </message>
     <message>
         <source>&lt;category&gt; can be:</source>
@@ -2061,9 +3193,13 @@
         <source>Cannot resolve -%s address: '%s'</source>
         <translation>Çözümlenemedi - %s adres: '%s'</translation>
     </message>
+    <message>
+        <source>Chain selection options:</source>
+        <translation>Blok zinciri seçim ayarları:</translation>
+    </message>
     <message>
         <source>Change index out of range</source>
-        <translation>Aralık dışında değişiklik endeksi</translation>
+        <translation>Aralık dışında değişiklik indeksi</translation>
     </message>
     <message>
         <source>Connection options:</source>
@@ -2095,7 +3231,7 @@
     </message>
     <message>
         <source>Enable publish hash transaction in &lt;address&gt;</source>
-        <translation>Karma değer muamelesinin &lt;adres&gt;te yayınlanmasını etkinleştir</translation>
+        <translation>Karma değer işleminin &lt;adres&gt;te yayınlanmasını etkinleştir</translation>
     </message>
     <message>
         <source>Enable publish raw block in &lt;address&gt;</source>
@@ -2103,11 +3239,11 @@
     </message>
     <message>
         <source>Enable publish raw transaction in &lt;address&gt;</source>
-        <translation>Ham muamelenin &lt;adres&gt;te yayınlanmasını etkinleştir</translation>
+        <translation>Ham işlemin &lt;adres&gt;te yayınlanmasını etkinleştir</translation>
     </message>
     <message>
         <source>Enable transaction replacement in the memory pool (default: %u)</source>
-        <translation>Bellek alanında muamele değiştirmeyi etkinleştir (varsayılan: %u)</translation>
+        <translation>Bellek alanında işlem değiştirmeyi etkinleştir (varsayılan: %u)</translation>
     </message>
     <message>
         <source>Error initializing block database</source>
@@ -2155,7 +3291,7 @@
     </message>
     <message>
         <source>Incorrect or no genesis block found. Wrong datadir for network?</source>
-        <translation>Yanlış ya da bulunamamış doğuş bloku. Şebeke için yanlış veri klasörü mü?</translation>
+        <translation>Yanlış ya da bulunamamış doğuş bloğu. Ağ için yanlış veri klasörü mü?</translation>
     </message>
     <message>
         <source>Initialization sanity check failed. %s is shutting down.</source>
@@ -2167,15 +3303,15 @@
     </message>
     <message>
         <source>Invalid amount for -%s=&lt;amount&gt;: '%s'</source>
-        <translation>-%s=&lt;meblağ&gt; için geçersiz meblağ: '%s'</translation>
+        <translation>-%s=&lt;tutar&gt; için geçersiz tutar: '%s'</translation>
     </message>
     <message>
         <source>Invalid amount for -fallbackfee=&lt;amount&gt;: '%s'</source>
-        <translation> -fallbackfee=&lt;meblağ&gt; için geçersiz meblağ: '%s'</translation>
+        <translation> -fallbackfee=&lt;tutar&gt; için geçersiz tutar: '%s'</translation>
     </message>
     <message>
         <source>Keep the transaction memory pool below &lt;n&gt; megabytes (default: %u)</source>
-        <translation>Muamele bellek alanını &lt;n&gt; megabayttan düşük tut (varsayılan: %u)</translation>
+        <translation>İşlem bellek alanını &lt;n&gt; megabayttan düşük tut (varsayılan: %u)</translation>
     </message>
     <message>
         <source>Loading banlist...</source>
@@ -2191,7 +3327,7 @@
     </message>
     <message>
         <source>Only connect to nodes in network &lt;net&gt; (ipv4, ipv6 or onion)</source>
-        <translation>Sadece &lt;net&gt; şebekesindeki düğümlere bağlan (ipv4, ipv6 veya onion)</translation>
+        <translation>Sadece &lt;net&gt; ağındaki düğümlere bağlan (ipv4, ipv6 veya onion)</translation>
     </message>
     <message>
         <source>Print this help message and exit</source>
@@ -2211,11 +3347,11 @@
     </message>
     <message>
         <source>Rebuild chain state and block index from the blk*.dat files on disk</source>
-        <translation>Zincir durumu ve blok endeksini diskteki blk*.dat dosyalarından yeniden derle</translation>
+        <translation>Zincir durumu ve blok indeksini diskteki blk*.dat dosyalarından yeniden derle</translation>
     </message>
     <message>
         <source>Rebuild chain state from the currently indexed blocks</source>
-        <translation>Zincir durumunu güncel olarak endekslenen bloklardan yeniden derle</translation>
+        <translation>Zincir durumunu güncel olarak indekslenen bloklardan yeniden derle</translation>
     </message>
     <message>
         <source>Rewinding blocks...</source>
@@ -2227,7 +3363,7 @@
     </message>
     <message>
         <source>Set maximum block size in bytes (default: %d)</source>
-        <translation>Azami blok boyutunu bayt olarak ayarla (varsayılan: %d)</translation>
+        <translation>En yüksek blok boyutunu bayt olarak ayarla (varsayılan: %d)</translation>
     </message>
     <message>
         <source>Specify wallet file (within data directory)</source>
@@ -2257,6 +3393,10 @@
         <source>Use UPnP to map the listening port (default: %u)</source>
         <translation>Dinleme portunu haritalamak için UPnP kullan (varsayılan: %u)</translation>
     </message>
+    <message>
+        <source>Use the test chain</source>
+        <translation>Test blok zincirini kullan</translation>
+    </message>
     <message>
         <source>User Agent comment (%s) contains unsafe characters.</source>
         <translation>Kullanıcı Aracı açıklaması (%s) güvensiz karakterler içermektedir.</translation>
@@ -2287,7 +3427,7 @@
     </message>
     <message>
         <source>Allow JSON-RPC connections from specified source. Valid for &lt;ip&gt; are a single IP (e.g. 1.2.3.4), a network/netmask (e.g. 1.2.3.4/255.255.255.0) or a network/CIDR (e.g. 1.2.3.4/24). This option can be specified multiple times</source>
-        <translation>Belirtilen kaynaktan JSON-RPC bağlantılarını kabul et. Bir &lt;ip&gt; için geçerli olanlar şunlardır: salt IP adresi (mesela 1.2.3.4), bir şebeke/ağ maskesi (örneğin 1.2.3.4/255.255.255.0) ya da bir şebeke/CIDR (mesela 1.2.3.4/24). Bu seçenek birden fazla kez belirtilebilir</translation>
+        <translation>Belirtilen kaynaktan JSON-RPC bağlantılarını kabul et. Bir &lt;ip&gt; için geçerli olanlar şunlardır: IP adresi (mesela 1.2.3.4), bir ağ/ağ maskesi (örneğin 1.2.3.4/255.255.255.0) ya da bir ağ/CIDR (mesela 1.2.3.4/24). Bu seçenek birden fazla kez belirtilebilir</translation>
     </message>
     <message>
         <source>Bind to given address and whitelist peers connecting to it. Use [host]:port notation for IPv6</source>
@@ -2315,19 +3455,19 @@
     </message>
     <message>
         <source>Fees (in %s/kB) smaller than this are considered zero fee for relaying, mining and transaction creation (default: %s)</source>
-        <translation>Bundan düşük ücretler (%s/kB olarak) aktarma, oluşturma ve muamele yaratma için sıfır değerinde ücret olarak kabul edilir (varsayılan: %s)</translation>
+        <translation>Bundan düşük ücretler (%s/kB olarak) aktarma, oluşturma ve işlem yaratma için sıfır değerinde ücret olarak kabul edilir (varsayılan: %s)</translation>
     </message>
     <message>
         <source>If paytxfee is not set, include enough fee so transactions begin confirmation on average within n blocks (default: %u)</source>
-        <translation>Eğer paytxfee ayarlanmadıysa kafi derecede ücret ekleyin ki muameleler teyite vasati n blok içinde başlasın (varsayılan: %u)</translation>
+        <translation>Eğer paytxfee ayarlanmadıysa kafi derecede ücret ekleyin ki işlemler teyite vasati n blok içinde başlasın (varsayılan: %u)</translation>
     </message>
     <message>
         <source>Invalid amount for -maxtxfee=&lt;amount&gt;: '%s' (must be at least the minrelay fee of %s to prevent stuck transactions)</source>
-        <translation>-maxtxfee=&lt;tutar&gt; için geçersiz tutar: '%s' (Sıkışmış muameleleri önlemek için en az %s değerinde asgari aktarım ücretine eşit olmalıdır)</translation>
+        <translation>-maxtxfee=&lt;tutar&gt; için geçersiz tutar: '%s' (Sıkışmış işlemleri önlemek için en az %s değerinde en düşük aktarım ücretine eşit olmalıdır)</translation>
     </message>
     <message>
         <source>Maximum size of data in data carrier transactions we relay and mine (default: %u)</source>
-        <translation>Aktardığımız ve oluşturduğumuz veri taşıyıcı muamelelerindeki azami veri boyutu (varsayılan: %u)</translation>
+        <translation>Aktardığımız ve oluşturduğumuz veri taşıyıcı işlemlerindeki en yüksek veri boyutu (varsayılan: %u)</translation>
     </message>
     <message>
         <source>Randomize credentials for every proxy connection. This enables Tor stream isolation (default: %u)</source>
@@ -2335,11 +3475,11 @@
     </message>
     <message>
         <source>Set maximum size of high-priority/low-fee transactions in bytes (default: %d)</source>
-        <translation>Yüksek öncelikli/düşük ücretli muamelelerin azami boyutunu bayt olarak ayarla (varsayılan: %d)</translation>
+        <translation>Yüksek öncelikli/düşük ücretli işlemlerin en yüksek boyutunu bayt olarak ayarla (varsayılan: %d)</translation>
     </message>
     <message>
         <source>The transaction amount is too small to send after the fee has been deducted</source>
-        <translation>Bu muamele, ücret düşüldükten sonra göndermek için çok düşük</translation>
+        <translation>Bu işlem, tutar düşüldükten sonra göndermek için çok düşük</translation>
     </message>
     <message>
         <source>Use hierarchical deterministic key generation (HD) after BIP32. Only has effect during wallet creation/first start</source>
@@ -2347,7 +3487,7 @@
     </message>
     <message>
         <source>Whitelisted peers cannot be DoS banned and their transactions are always relayed, even if they are already in the mempool, useful e.g. for a gateway</source>
-        <translation>Beyaz listeye alınan eşler DoS yasaklamasına uğramazlar ve muameleleri zaten mempool'da olsalar da daima aktarılır, bu mesela bir geçit için kullanışlıdır</translation>
+        <translation>Beyaz listeye alınan eşler DoS yasaklamasına uğramazlar ve işlemleri zaten mempool'da olsalar da daima aktarılır, bu mesela bir geçit için kullanışlıdır</translation>
     </message>
     <message>
         <source>You need to rebuild the database using -reindex to go back to unpruned mode.  This will redownload the entire blockchain</source>
@@ -2391,7 +3531,7 @@
     </message>
     <message>
         <source>Keep at most &lt;n&gt; unconnectable transactions in memory (default: %u)</source>
-        <translation>Hafızada en çok &lt;n&gt; bağlanılamaz muamele tut (varsayılan: %u)</translation>
+        <translation>Hafızada en çok &lt;n&gt; bağlanılamaz işlem tut (varsayılan: %u)</translation>
     </message>
     <message>
         <source>Need to specify a port with -whitebind: '%s'</source>
@@ -2399,7 +3539,7 @@
     </message>
     <message>
         <source>Node relay options:</source>
-        <translation>Düğüm röle seçenekleri:</translation>
+        <translation>Düğüm aktarma seçenekleri:</translation>
     </message>
     <message>
         <source>RPC server options:</source>
@@ -2411,15 +3551,15 @@
     </message>
     <message>
         <source>Rescan the block chain for missing wallet transactions on startup</source>
-        <translation>Başlangıçta blok zincirini eksik cüzdan muameleleri için tekrar tara</translation>
+        <translation>Başlangıçta blok zincirini eksik cüzdan işlemleri için tekrar tara</translation>
     </message>
     <message>
         <source>Send trace/debug info to console instead of debug.log file</source>
-        <translation>Trace/hata ayıklama verilerini debug.log dosyası yerine konsola gönder</translation>
+        <translation>İzleme/hata ayıklama verilerini debug.log dosyası yerine konsola gönder</translation>
     </message>
     <message>
         <source>Send transactions as zero-fee transactions if possible (default: %u)</source>
-        <translation>Muameleleri mümkünse ücretsiz olarak gönder (varsayılan: %u)</translation>
+        <translation>İşlemleri mümkünse ücretsiz olarak gönder (varsayılan: %u)</translation>
     </message>
     <message>
         <source>Show all debugging options (usage: --help -help-debug)</source>
@@ -2431,11 +3571,11 @@
     </message>
     <message>
         <source>Signing transaction failed</source>
-        <translation>Muamelenin imzalanması başarısız oldu</translation>
+        <translation>İşlemin imzalanması başarısız oldu</translation>
     </message>
     <message>
         <source>The transaction amount is too small to pay the fee</source>
-        <translation>Muamele meblağı ücreti ödemek için çok düşük</translation>
+        <translation>İşlemdeki bitcoin tutarı ücreti ödemek için çok düşük</translation>
     </message>
     <message>
         <source>This is experimental software.</source>
@@ -2447,23 +3587,23 @@
     </message>
     <message>
         <source>Tor control port to use if onion listening enabled (default: %s)</source>
-        <translation>Eğer onion dinlenmesi etkinse kullanılacak Tor kontrol portu (varsayılan: %s)</translation>
+        <translation>Eğer onion dinlemesi etkinse kullanılacak Tor kontrol portu (varsayılan: %s)</translation>
     </message>
     <message>
         <source>Transaction amount too small</source>
-        <translation>Muamele meblağı çok düşük</translation>
+        <translation>İşlem tutarı çok düşük</translation>
     </message>
     <message>
         <source>Transaction too large for fee policy</source>
-        <translation>Ücret politikası için çok büyük muamele</translation>
+        <translation>Ücret politikası için işlem çok büyük</translation>
     </message>
     <message>
         <source>Transaction too large</source>
-        <translation>Muamele çok büyük</translation>
+        <translation>İşlem çok büyük</translation>
     </message>
     <message>
         <source>Unable to bind to %s on this computer (bind returned error %s)</source>
-        <translation>Bu bilgisayarda %s unsuruna bağlanılamadı (bağlanma %s hatasını verdi)</translation>
+        <translation>Bu bilgisayarda %s ögesine bağlanılamadı (bağlanma %s hatasını verdi)</translation>
     </message>
     <message>
         <source>Upgrade wallet to latest format on startup</source>
@@ -2479,15 +3619,15 @@
     </message>
     <message>
         <source>Warning: unknown new rules activated (versionbit %i)</source>
-        <translation>İkaz: bilinmeyen yeni kurallar etkinleştirilmiştir (versionbit %i)</translation>
+        <translation>Uyarı: bilinmeyen yeni kurallar etkinleştirilmiştir (versionbit %i)</translation>
     </message>
     <message>
         <source>Whether to operate in a blocks only mode (default: %u)</source>
-        <translation>Salt blok kipinde çalışılıp çalışılmayacağı (varsayılan: %u)</translation>
+        <translation>Sadece blok kipinde çalışılıp çalışılmayacağı (varsayılan: %u)</translation>
     </message>
     <message>
         <source>Zapping all transactions from wallet...</source>
-        <translation>Cüzdandaki tüm muameleler kaldırılıyor...</translation>
+        <translation>Cüzdandaki tüm işlemler kaldırılıyor...</translation>
     </message>
     <message>
         <source>ZeroMQ notification options:</source>
@@ -2515,19 +3655,23 @@
     </message>
     <message>
         <source>-maxtxfee is set very high! Fees this large could be paid on a single transaction.</source>
-        <translation>-maxtxfee çok yüksek bir değere ayarlanmış! Bu denli yüksek ücretler tek bir muamelede ödenebilir.</translation>
+        <translation>-maxtxfee çok yüksek bir değere ayarlanmış! Bu denli yüksek ücretler tek bir işlemde ödenebilir.</translation>
     </message>
     <message>
         <source>Do not keep transactions in the mempool longer than &lt;n&gt; hours (default: %u)</source>
-        <translation>Muameleleri bellek alanında &lt;n&gt; saatten fazla tutma (varsayılan: %u)</translation>
+        <translation>İşlemleri bellek alanında &lt;n&gt; saatten fazla tutma (varsayılan: %u)</translation>
     </message>
     <message>
         <source>Equivalent bytes per sigop in transactions for relay and mining (default: %u)</source>
-        <translation>Oluşturma ve aktarşa muamelelerinde sigop başına eşdeğer bayt (varsayılan: %u)</translation>
+        <translation>Oluşturma ve aktarma işlemlerinde sigop başına eşdeğer bayt (varsayılan: %u)</translation>
     </message>
     <message>
         <source>Fees (in %s/kB) smaller than this are considered zero fee for transaction creation (default: %s)</source>
-        <translation>Bundan düşük ücretler (%s/kB olarak) muamele oluşturulması için sıfır değerinde ücret olarak kabul edilir (varsayılan: %s)</translation>
+        <translation>Bundan düşük ücretler (%s/kB olarak) işlem oluşturulması için sıfır değerinde ücret olarak kabul edilir (varsayılan: %s)</translation>
+    </message>
+    <message>
+        <source>Force relay of transactions from whitelisted peers even if they violate local relay policy (default: %d)</source>
+        <translation>Yerel aktarma politikasını ihlal etseler bile beyaz listedeki eşlerden gelen işlemlerin aktarılmasını zorla (varsayılan: %d)</translation>
     </message>
     <message>
         <source>How thorough the block verification of -checkblocks is (0-4, default: %u)</source>
@@ -2535,7 +3679,7 @@
     </message>
     <message>
         <source>Maintain a full transaction index, used by the getrawtransaction rpc call (default: %u)</source>
-        <translation>Muamelelerin tamamının indeksini tut, getrawtransaction rpc çağrısı tarafından kullanılır (varsayılan: %u)</translation>
+        <translation>İşlemlerin tamamının indeksini tut, getrawtransaction rpc çağrısı tarafından kullanılır (varsayılan: %u)</translation>
     </message>
     <message>
         <source>Number of seconds to keep misbehaving peers from reconnecting (default: %u)</source>
@@ -2543,15 +3687,31 @@
     </message>
     <message>
         <source>Output debugging information (default: %u, supplying &lt;category&gt; is optional)</source>
-        <translation>Hata ayıklama bilgisi dök (varsayılan: %u, &lt;kategori&gt; sağlanması seçime dayalıdır)</translation>
+        <translation>Hata ayıklama bilgisini dök (varsayılan: %u, &lt;kategori&gt; sağlanması seçime dayalıdır)</translation>
+    </message>
+    <message>
+        <source>Query for peer addresses via DNS lookup, if low on addresses (default: 1 unless -connect/-noconnect)</source>
+        <translation>Adres sayısı azaldıysa DNS sorgulamasıyla eş adresleri ara (varsayılan: 1  -connect/-noconnect kullanılmadıysa)</translation>
+    </message>
+    <message>
+        <source>Sets the serialization of raw transaction or block hex returned in non-verbose mode, non-segwit(0) or segwit(1) (default: %d)</source>
+        <translation>Ham işlemin serileştirilmesini ayarlar veya blok non-verbose, non-segwit(0) veya segwit(1) kipinde onaltılık değeri döndürür (default: %d)</translation>
     </message>
     <message>
         <source>Support filtering of blocks and transaction with bloom filters (default: %u)</source>
-        <translation>Blokların ve muamelelerin bloom filtreleri ile süzülmesini destekle (varsayılan: %u)</translation>
+        <translation>Blokların ve işlemlerin bloom filtreleri ile süzülmesini destekle (varsayılan: %u)</translation>
+    </message>
+    <message>
+        <source>This is the transaction fee you may pay when fee estimates are not available.</source>
+        <translation>İşlem ücret tahminleri mevcut olmadığında ödeyebileceğiniz işlem ücreti budur.</translation>
+    </message>
+    <message>
+        <source>This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit %s and cryptographic software written by Eric Young and UPnP software written by Thomas Bernard.</source>
+        <translation>Bu ürün OpenSSL Projesi tarafından geliştirilen OpenSSL araç takımınında kullanılmak üzere yazılan yazılımları %s Eric Young  tarafından yazılmış şifreleme yazılımını ve Thomas Bernard tarafından yazılmış UPnP yazılımını içerir.</translation>
     </message>
     <message>
         <source>Total length of network version string (%i) exceeds maximum length (%i). Reduce the number or size of uacomments.</source>
-        <translation>Şebeke sürümü zincirinin toplam boyutu (%i) azami boyutu geçmektedir (%i). Kullanıcı aracı açıklamasının sayısı veya boyutunu azaltınız.</translation>
+        <translation>Ağ sürümü zincirinin toplam boyutu (%i) en yüksek boyutu geçmektedir (%i). Kullanıcı aracı açıklamasının sayısı veya boyutunu azaltınız.</translation>
     </message>
     <message>
         <source>Tries to keep outbound traffic under the given target (in MiB per 24h), 0 = no limit (default: %d)</source>
@@ -2571,11 +3731,19 @@
     </message>
     <message>
         <source>Warning: Unknown block versions being mined! It's possible unknown rules are in effect</source>
-        <translation>İkaz: bilinmeyen blok sürümü oluşturulmaya çalışılıyor. Bilinmeyen kuralların işlemesi mümkündür.</translation>
+        <translation>Uyarı: Bilinmeyen blok sürümü oluşturulmaya çalışılıyor. Bilinmeyen kuralların işlemesi mümkündür.</translation>
     </message>
     <message>
         <source>Warning: Wallet file corrupt, data salvaged! Original %s saved as %s in %s; if your balance or transactions are incorrect you should restore from a backup.</source>
-        <translation>Uyarı: wallet.dat bozuk, veriler geri kazanıldı! Özgün %s, %s olarak %s klasörüne kaydedildi; bakiyeniz ya da muameleleriniz yanlışsa bir yedeklemeden tekrar yüklemeniz gerekir.</translation>
+        <translation>Uyarı: wallet.dat bozuk, veriler geri kazanıldı! Özgün %s, %s olarak %s klasörüne kaydedildi; bakiyeniz ya da işlemleriniz yanlışsa bir yedeklemeden tekrar yüklemeniz gerekir.</translation>
+    </message>
+    <message>
+        <source>Whitelist peers connecting from the given IP address (e.g. 1.2.3.4) or CIDR notated network (e.g. 1.2.3.0/24). Can be specified multiple times.</source>
+        <translation>Beyaz listeye eklenen eşler verilen IP adresinden (ör. 1.2.3.4) veya CIDR ağından (ör. 1.2.3.0/24) bağlanabilir. Değerler birden çok kez kullanılabilir.</translation>
+    </message>
+    <message>
+        <source>%s is set very high!</source>
+        <translation>%s çok yüksek ayarlanmış!</translation>
     </message>
     <message>
         <source>(default: %s)</source>
@@ -2597,6 +3765,10 @@
         <source>Invalid -proxy address: '%s'</source>
         <translation>Geçersiz -proxy adresi: '%s'</translation>
     </message>
+    <message>
+        <source>Keypool ran out, please call keypoolrefill first</source>
+        <translation>Keypool tükendi, lütfen önce keypoolrefill'i çağırın</translation>
+    </message>
     <message>
         <source>Listen for JSON-RPC connections on &lt;port&gt; (default: %u or testnet: %u)</source>
         <translation>JSON-RPC bağlantılarını &lt;port&gt; üzerinde dinle (varsayılan: %u veya tesnet: %u)</translation>
@@ -2611,15 +3783,15 @@
     </message>
     <message>
         <source>Make the wallet broadcast transactions</source>
-        <translation>Cüzdanın muameleleri yayınlamasını sağla</translation>
+        <translation>Cüzdanın işlemleri yayınlamasını sağla</translation>
     </message>
     <message>
         <source>Maximum per-connection receive buffer, &lt;n&gt;*1000 bytes (default: %u)</source>
-        <translation>Her bağlantı için azami alım tamponu, &lt;n&gt;*1000 bayt (varsayılan: %u)</translation>
+        <translation>Her bağlantı için en yüksek alım tamponu, &lt;n&gt;*1000 bayt (varsayılan: %u)</translation>
     </message>
     <message>
         <source>Maximum per-connection send buffer, &lt;n&gt;*1000 bytes (default: %u)</source>
-        <translation>Her bağlantı için azami yollama tamponu, &lt;n&gt;*1000 bayt (varsayılan: %u)</translation>
+        <translation>Her bağlantı için çok gönderme tamponu, &lt;n&gt;*1000 bayt (varsayılan: %u)</translation>
     </message>
     <message>
         <source>Prepend debug output with timestamp (default: %u)</source>
@@ -2627,19 +3799,23 @@
     </message>
     <message>
         <source>Relay and mine data carrier transactions (default: %u)</source>
-        <translation>Veri taşıyıcı muameleleri oluştur ve aktar (varsayılan: %u)</translation>
+        <translation>Veri taşıyıcı işlemleri oluştur ve aktar (varsayılan: %u)</translation>
     </message>
     <message>
         <source>Relay non-P2SH multisig (default: %u)</source>
         <translation>P2SH olmayan çoklu imzaları aktar (varsayılan: %u)</translation>
     </message>
+    <message>
+        <source>Send transactions with full-RBF opt-in enabled (default: %u)</source>
+        <translation>İşlemleri full-RBF opt-in ile gönder etkinleştirildi (default: %u)</translation>
+    </message>
     <message>
         <source>Set key pool size to &lt;n&gt; (default: %u)</source>
         <translation>Anahtar alan boyutunu &lt;n&gt; değerine ayarla (varsayılan: %u)</translation>
     </message>
     <message>
         <source>Set maximum BIP141 block weight (default: %d)</source>
-        <translation>Azami BIP141 blok ağırlığını ayarla (varsayılan: %d)</translation>
+        <translation>En yüksek BIP141 blok ağırlığını ayarla (varsayılan: %d)</translation>
     </message>
     <message>
         <source>Set the number of threads to service RPC calls (default: %d)</source>
@@ -2651,7 +3827,7 @@
     </message>
     <message>
         <source>Specify connection timeout in milliseconds (minimum: 1, default: %d)</source>
-        <translation>Bağlantı zaman aşım süresini milisaniye olarak belirt (asgari: 1, varsayılan: %d)</translation>
+        <translation>Bağlantı zaman aşım süresini milisaniye olarak belirt (en düşüki: 1, varsayılan: %d)</translation>
     </message>
     <message>
         <source>Specify pid file (default: %s)</source>
@@ -2659,15 +3835,43 @@
     </message>
     <message>
         <source>Spend unconfirmed change when sending transactions (default: %u)</source>
-        <translation>Gönderme muamelelerinde teyit edilmemiş para üstünü harca (varsayılan: %u)</translation>
+        <translation>Gönderme işlemlerinde doğrulanmamış para üstünü harca (varsayılan: %u)</translation>
+    </message>
+    <message>
+        <source>Starting network threads...</source>
+        <translation>Ağ iş parçacıkları başlatılıyor...</translation>
+    </message>
+    <message>
+        <source>The wallet will avoid paying less than the minimum relay fee.</source>
+        <translation>Cüzdan en az aktarma ücretinden daha az ödeme yapmaktan sakınacaktır.</translation>
+    </message>
+    <message>
+        <source>This is the minimum transaction fee you pay on every transaction.</source>
+        <translation>Bu her işlemde ödeceğiniz en düşük işlem ücretidir.</translation>
+    </message>
+    <message>
+        <source>This is the transaction fee you will pay if you send a transaction.</source>
+        <translation>Eğer bir gönderme işlemi yaparsanız bu ödeyeceğiniz işlem ücretidir.</translation>
     </message>
     <message>
         <source>Threshold for disconnecting misbehaving peers (default: %u)</source>
         <translation>Aksaklık gösteren eşlerle bağlantıyı kesme sınırı (varsayılan: %u)</translation>
     </message>
+    <message>
+        <source>Transaction amounts must not be negative</source>
+        <translation>İşlem tutarı negatif olmamalıdır</translation>
+    </message>
+    <message>
+        <source>Transaction has too long of a mempool chain</source>
+        <translation>İşlem çok uzun bir mempool zincirine sahip</translation>
+    </message>
+    <message>
+        <source>Transaction must have at least one recipient</source>
+        <translation>İşlemin en az bir alıcısı olması gerekir</translation>
+    </message>
     <message>
         <source>Unknown network specified in -onlynet: '%s'</source>
-        <translation>-onlynet için bilinmeyen bir şebeke belirtildi: '%s'</translation>
+        <translation>-onlynet için bilinmeyen bir ağ belirtildi: '%s'</translation>
     </message>
     <message>
         <source>Insufficient funds</source>
@@ -2679,7 +3883,7 @@
     </message>
     <message>
         <source>Add a node to connect to and attempt to keep the connection open</source>
-        <translation>Bağlanılacak düğüm ekle ve bağlantıyı zinde tutmaya çalış</translation>
+        <translation>Bağlanılacak düğüm ekle ve bağlantıyı sürekli açık tutmaya çalış</translation>
     </message>
     <message>
         <source>Loading wallet...</source>
@@ -2695,7 +3899,7 @@
     </message>
     <message>
         <source>Rescanning...</source>
-        <translation>Yeniden tarama...</translation>
+        <translation>Yeniden taranıyor...</translation>
     </message>
     <message>
         <source>Done loading</source>
diff --git a/src/qt/locale/bitcoin_zh_CN.ts b/src/qt/locale/bitcoin_zh_CN.ts
index e98bc080e2694..20875c232722a 100644
--- a/src/qt/locale/bitcoin_zh_CN.ts
+++ b/src/qt/locale/bitcoin_zh_CN.ts
@@ -481,6 +481,10 @@
         <source>%1 client</source>
         <translation>%1 客戶</translation>
     </message>
+    <message>
+        <source>Connecting to peers...</source>
+        <translation>正在连接到节点……</translation>
+    </message>
     <message>
         <source>Catching up...</source>
         <translation>更新中...</translation>
@@ -1927,7 +1931,11 @@
         <source>(no amount requested)</source>
         <translation>（无请求金额）</translation>
     </message>
-    </context>
+    <message>
+        <source>Requested</source>
+        <translation>总额</translation>
+    </message>
+</context>
 <context>
     <name>SendCoinsDialog</name>
     <message>
@@ -2178,6 +2186,10 @@
         <source>Warning: Unknown change address</source>
         <translation>警告：未知的更改地址</translation>
     </message>
+    <message>
+        <source>The address you selected for change is not part of this wallet. Any or all funds in your wallet may be sent to this address. Are you sure?</source>
+        <translation>你选择的找零地址未被包含在本钱包中，你钱包中的部分或全部金额将被发送至该地址。你确定要这样做吗？</translation>
+    </message>
     <message>
         <source>(no label)</source>
         <translation>(无标签)</translation>
@@ -2459,6 +2471,14 @@
         <source>0/unconfirmed, %1</source>
         <translation>0/未确认，%1</translation>
     </message>
+    <message>
+        <source>in memory pool</source>
+        <translation>在内存池中</translation>
+    </message>
+    <message>
+        <source>not in memory pool</source>
+        <translation>不在内存池中</translation>
+    </message>
     <message>
         <source>abandoned</source>
         <translation>已抛弃</translation>
@@ -3200,6 +3220,10 @@
         <source>Use UPnP to map the listening port (default: %u)</source>
         <translation>使用UPnp映射监听端口 (默认: %u) </translation>
     </message>
+    <message>
+        <source>Use the test chain</source>
+        <translation>使用测试链</translation>
+    </message>
     <message>
         <source>User Agent comment (%s) contains unsafe characters.</source>
         <translation>用户代理评论(%s)包含不安全的字符。</translation>

From 4dfac2c95084dd0bcf0d7d5dc2e9d60f027a7be4 Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Fri, 10 Feb 2017 10:16:14 +0100
Subject: [PATCH 1701/1802] Update seeds tooling to Python 3

All the other tooling scripts require Python 3, it makes sense to do so
here too.

Also document the dependency on python3-dnspython.
---
 contrib/seeds/README.md         | 11 ++++++++---
 contrib/seeds/generate-seeds.py |  6 +++---
 contrib/seeds/makeseeds.py      | 14 +++++++-------
 3 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/contrib/seeds/README.md b/contrib/seeds/README.md
index c595f83eb95b2..aa97dafdb57b5 100644
--- a/contrib/seeds/README.md
+++ b/contrib/seeds/README.md
@@ -1,4 +1,4 @@
-### Seeds ###
+# Seeds
 
 Utility to generate the seeds.txt list that is compiled into the client
 (see [src/chainparamsseeds.h](/src/chainparamsseeds.h) and other utilities in [contrib/seeds](/contrib/seeds)).
@@ -6,6 +6,11 @@ Utility to generate the seeds.txt list that is compiled into the client
 The seeds compiled into the release are created from sipa's DNS seed data, like this:
 
     curl -s http://bitcoin.sipa.be/seeds.txt > seeds_main.txt
-    python makeseeds.py < seeds_main.txt > nodes_main.txt
-    python generate-seeds.py . > ../../src/chainparamsseeds.h
+    python3 makeseeds.py < seeds_main.txt > nodes_main.txt
+    python3 generate-seeds.py . > ../../src/chainparamsseeds.h
 
+## Dependencies
+
+Ubuntu:
+
+    sudo apt-get install python3-dnspython
diff --git a/contrib/seeds/generate-seeds.py b/contrib/seeds/generate-seeds.py
index f43dc0b218adb..b0ac92ae03639 100755
--- a/contrib/seeds/generate-seeds.py
+++ b/contrib/seeds/generate-seeds.py
@@ -1,5 +1,5 @@
-#!/usr/bin/env python
-# Copyright (c) 2014 Wladimir J. van der Laan
+#!/usr/bin/env python3
+# Copyright (c) 2014-2017 Wladimir J. van der Laan
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 '''
@@ -31,7 +31,7 @@
 
 These should be pasted into `src/chainparamsseeds.h`.
 '''
-from __future__ import print_function, division
+
 from base64 import b32decode
 from binascii import a2b_hex
 import sys, os
diff --git a/contrib/seeds/makeseeds.py b/contrib/seeds/makeseeds.py
index 95498d20e2765..33fbb5851e739 100755
--- a/contrib/seeds/makeseeds.py
+++ b/contrib/seeds/makeseeds.py
@@ -1,5 +1,5 @@
-#!/usr/bin/env python
-# Copyright (c) 2013-2016 The Bitcoin Core developers
+#!/usr/bin/env python3
+# Copyright (c) 2013-2017 The Bitcoin Core developers
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 #
@@ -14,13 +14,13 @@
 
 # These are hosts that have been observed to be behaving strangely (e.g.
 # aggressively connecting to every node).
-SUSPICIOUS_HOSTS = set([
+SUSPICIOUS_HOSTS = {
     "130.211.129.106", "178.63.107.226",
     "83.81.130.26", "88.198.17.7", "148.251.238.178", "176.9.46.6",
     "54.173.72.127", "54.174.10.182", "54.183.64.54", "54.194.231.211",
     "54.66.214.167", "54.66.220.137", "54.67.33.14", "54.77.251.214",
     "54.94.195.96", "54.94.200.247"
-])
+}
 
 import re
 import sys
@@ -104,7 +104,7 @@ def filtermultiport(ips):
     hist = collections.defaultdict(list)
     for ip in ips:
         hist[ip['sortkey']].append(ip)
-    return [value[0] for (key,value) in hist.items() if len(value)==1]
+    return [value[0] for (key,value) in list(hist.items()) if len(value)==1]
 
 # Based on Greg Maxwell's seed_filter.py
 def filterbyasn(ips, max_per_asn, max_total):
@@ -164,9 +164,9 @@ def main():
 
     for ip in ips:
         if ip['net'] == 'ipv6':
-            print '[%s]:%i' % (ip['ip'], ip['port'])
+            print('[%s]:%i' % (ip['ip'], ip['port']))
         else:
-            print '%s:%i' % (ip['ip'], ip['port'])
+            print('%s:%i' % (ip['ip'], ip['port']))
 
 if __name__ == '__main__':
     main()

From bfa9393c06decdcb679f82350102863f0b4ca7a8 Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Fri, 10 Feb 2017 10:58:17 +0100
Subject: [PATCH 1702/1802] contrib/seeds: Update PATTERN_AGENT

gmaxwell: Adds the newest versions, drops everything multiple softforks ago.
---
 contrib/seeds/README.md    | 3 +++
 contrib/seeds/makeseeds.py | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/contrib/seeds/README.md b/contrib/seeds/README.md
index aa97dafdb57b5..afe902fd7f063 100644
--- a/contrib/seeds/README.md
+++ b/contrib/seeds/README.md
@@ -3,6 +3,9 @@
 Utility to generate the seeds.txt list that is compiled into the client
 (see [src/chainparamsseeds.h](/src/chainparamsseeds.h) and other utilities in [contrib/seeds](/contrib/seeds)).
 
+Be sure to update `PATTERN_AGENT` in `makeseeds.py` to include the current version,
+and remove old versions as necessary.
+
 The seeds compiled into the release are created from sipa's DNS seed data, like this:
 
     curl -s http://bitcoin.sipa.be/seeds.txt > seeds_main.txt
diff --git a/contrib/seeds/makeseeds.py b/contrib/seeds/makeseeds.py
index 33fbb5851e739..34f0f576716ed 100755
--- a/contrib/seeds/makeseeds.py
+++ b/contrib/seeds/makeseeds.py
@@ -30,7 +30,7 @@
 PATTERN_IPV4 = re.compile(r"^((\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})):(\d+)$")
 PATTERN_IPV6 = re.compile(r"^\[([0-9a-z:]+)\]:(\d+)$")
 PATTERN_ONION = re.compile(r"^([abcdefghijklmnopqrstuvwxyz234567]{16}\.onion):(\d+)$")
-PATTERN_AGENT = re.compile(r"^(\/Satoshi:0\.8\.6\/|\/Satoshi:0\.9\.(2|3|4|5)\/|\/Satoshi:0\.10\.\d{1,2}\/|\/Satoshi:0\.11\.\d{1,2}\/)$")
+PATTERN_AGENT = re.compile(r"^(/Satoshi:0.12.(0|1|99)/|/Satoshi:0.13.(0|1|2|99)/)$")
 
 def parseline(line):
     sline = line.split()

From a60677e394faf57968be57e44ece127c3bb6881f Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Fri, 10 Feb 2017 10:29:13 +0100
Subject: [PATCH 1703/1802] Pre-0.14.0 hardcoded seeds update

---
 contrib/seeds/nodes_main.txt | 1831 +++++++++++++++++++---------------
 src/chainparamsseeds.h       | 1831 +++++++++++++++++++---------------
 2 files changed, 2062 insertions(+), 1600 deletions(-)

diff --git a/contrib/seeds/nodes_main.txt b/contrib/seeds/nodes_main.txt
index f1854b27f9a59..0451771daed45 100644
--- a/contrib/seeds/nodes_main.txt
+++ b/contrib/seeds/nodes_main.txt
@@ -1,937 +1,1168 @@
-5.2.145.201:8333
-5.22.142.214:8333
-5.53.172.197:8333
-5.189.161.164:8333
-5.230.140.166:8333
-5.231.3.130:8333
-5.255.80.103:8333
-14.202.230.49:8333
-18.85.11.130:8333
-23.91.97.25:8333
-23.94.100.122:8333
-23.95.99.132:8333
-24.115.8.206:8333
-24.127.128.191:8333
-24.154.178.25:8333
-24.207.103.43:8333
-24.207.104.105:8333
-24.210.230.150:8333
-24.224.18.84:8333
-24.246.168.106:8333
-27.254.64.47:8333
-31.6.71.123:8333
-31.6.71.124:8333
-31.14.134.13:8333
-31.30.36.220:8333
-31.164.6.104:8333
+2.7.8.12:8333
+2.228.70.198:8333
+5.39.64.7:8333
+5.45.80.34:38333
+5.51.160.38:8333
+5.61.33.33:8333
+5.61.37.12:8333
+5.95.80.47:8333
+5.102.164.173:8333
+5.175.71.130:8333
+5.189.165.22:8333
+5.199.130.228:8333
+5.228.100.222:8333
+5.255.64.231:8333
+13.93.6.133:8333
+18.85.34.10:8333
+18.241.0.63:8333
+23.28.128.65:8333
+23.248.113.52:8333
+23.253.151.73:8333
+24.4.96.121:8333
+24.69.65.191:8333
+24.87.8.43:8333
+24.150.224.110:8333
+24.227.69.146:8333
+27.0.235.33:8333
 31.170.106.203:8333
-31.185.134.201:8333
-31.204.128.99:8333
-31.204.128.219:8333
-37.1.219.88:8333
-37.97.132.109:8333
-37.120.160.55:8333
+31.184.197.96:8333
+31.214.240.56:8333
+37.1.202.134:8333
+37.18.74.232:8333
+37.34.48.17:8333
+37.48.64.140:8333
+37.97.141.116:8333
+37.120.164.16:8333
 37.120.169.123:8333
-37.139.32.46:8333
-37.221.163.218:8333
-38.130.192.72:8333
-41.75.96.80:8333
-45.3.0.49:8333
-45.33.72.185:8333
-45.33.96.129:8333
-45.56.4.63:8333
-45.79.0.127:8333
-45.79.80.102:8333
-45.79.97.30:8333
-45.79.132.219:8333
-46.21.97.135:8333
-46.28.205.67:8333
-46.28.206.188:8333
-46.29.20.209:8333
-46.50.234.179:8333
-46.101.160.168:8333
-46.166.161.35:8333
-46.166.161.103:8333
-46.182.132.100:8333
-46.218.227.92:8333
-46.226.109.20:8333
-46.227.66.132:8333
-46.227.66.138:8333
-46.229.165.154:8333
-46.229.165.155:8333
+37.143.9.128:8333
+37.153.172.227:8333
+37.193.227.16:8333
+37.205.8.78:8333
+37.220.0.114:8333
+37.232.218.199:8333
+38.140.161.53:8333
+40.87.70.120:8333
+41.162.163.93:8333
+42.2.198.48:8333
+45.20.67.1:8333
+45.55.197.77:8333
+45.56.97.63:8333
+45.58.38.162:8333
+45.63.1.33:8333
+45.79.2.70:8333
+46.16.240.98:8333
+46.19.137.74:8333
+46.28.206.146:8333
+46.32.252.197:8333
+46.59.13.59:8333
+46.59.39.195:8333
+46.148.16.210:8333
+46.160.195.121:8333
+46.166.142.21:8333
+46.166.160.29:8330
+46.188.44.20:8333
 46.229.238.187:8333
-46.234.104.48:8333
-46.239.107.74:8333
-46.244.0.138:8333
-46.254.72.195:8333
-50.5.13.44:8333
-50.7.37.114:8333
-50.30.37.103:8333
-50.39.105.60:8333
-50.106.40.231:8333
-52.29.0.37:8333
-52.76.192.246:8333
-54.152.192.179:8333
-54.169.64.174:8333
-54.175.160.22:8333
-54.199.128.0:8333
-58.96.171.129:8333
-58.161.238.57:8333
-60.251.195.221:8333
-61.35.225.19:8333
+46.231.16.149:8333
+47.88.100.130:8333
+47.89.192.134:8333
+47.185.194.160:8333
+47.189.129.218:8333
+49.65.2.140:8333
+50.3.72.129:8333
+50.31.99.225:8333
+51.175.33.95:8333
+52.1.165.219:8333
+52.10.170.186:8333
+52.51.128.216:8333
+54.197.130.244:8333
+58.59.2.22:8333
+58.84.6.81:8333
+59.125.8.143:8333
+59.167.130.139:8333
+61.47.2.20:8333
 62.43.130.178:8333
-62.65.39.12:8333
+62.76.96.6:8333
 62.107.200.30:8333
+62.133.15.58:8333
 62.133.194.2:8333
-62.181.238.186:8333
-62.183.22.50:8333
-62.210.85.120:8333
-62.210.162.89:8333
+62.133.194.156:8333
+62.138.1.95:8333
+62.216.238.3:8333
 62.238.34.125:8333
-64.25.171.73:8333
-64.27.166.30:8333
-64.53.137.101:8333
-64.71.72.44:8333
+63.137.40.207:8333
+63.231.96.109:8333
+64.78.240.150:8333
 64.83.225.146:8333
-64.121.3.163:8333
-64.203.102.86:8333
-65.94.131.59:8333
-65.188.136.233:8333
-66.11.162.218:8333
-66.23.228.133:8333
-66.90.137.89:8333
-66.114.33.49:8333
-66.150.105.77:8333
+64.137.236.68:8833
+64.156.193.120:8333
+66.79.160.82:8333
+66.91.230.231:8333
+66.135.128.121:8333
 66.172.10.4:8333
 66.194.38.250:8333
 66.194.38.253:8333
-66.194.38.254:8333
-66.231.97.172:8333
+66.215.34.26:8333
 66.240.237.155:8333
-67.159.13.34:8333
-67.205.74.206:8333
+67.205.96.108:8333
+67.205.128.5:8333
+67.219.233.140:8333
 67.221.193.55:8333
-67.227.72.17:8333
-68.65.120.53:8333
-68.65.205.226:9000
-68.144.4.34:8333
-69.39.49.199:8333
+68.100.196.118:8333
+68.132.193.222:8333
+68.168.118.234:8333
+69.11.97.43:8333
+69.30.229.10:8333
 69.50.171.205:8333
-69.65.41.21:8333
-69.113.98.61:8333
-69.119.97.39:8333
-69.146.70.124:8333
-69.193.71.2:8333
-70.46.10.237:8333
-70.80.200.187:8333
-70.185.97.117:8333
-71.254.160.25:8333
-72.28.203.5:8333
-72.52.130.110:8333
-72.83.194.122:8333
-72.128.32.167:8333
-72.179.136.80:8333
-72.235.38.70:8333
-74.50.44.193:8333
-74.72.60.83:8333
-74.80.234.116:8333
-74.207.233.193:8333
-75.112.233.128:8333
-75.118.166.197:8333
-75.140.0.241:8333
-75.159.240.66:8333
-75.174.5.26:8333
-76.72.160.252:8333
-76.72.160.254:8333
-76.74.170.112:8333
-76.79.201.54:8333
-76.175.166.164:8333
-76.179.105.27:8333
-77.68.37.200:8333
-77.234.49.196:8333
-77.247.229.93:8333
-78.24.72.78:8333
-78.47.32.147:8333
-78.84.100.95:8333
-78.121.69.23:8333
-78.129.167.5:8333
-78.193.96.155:8333
-79.19.37.179:8333
+69.125.193.145:8333
+69.162.139.125:8333
+70.35.98.39:8333
+70.112.32.29:8333
+71.126.181.146:8333
+72.180.32.105:8333
+73.226.64.145:8333
+74.83.140.242:8333
+74.84.128.158:9333
+74.122.237.124:8333
+74.215.133.145:8333
+75.76.101.169:8333
+75.85.13.8:8333
+75.86.168.13:8333
+75.170.97.25:8333
+75.177.137.134:8333
+76.76.227.136:8333
+77.53.136.6:8333
+77.110.11.52:8333
+78.25.32.206:8333
+78.34.8.120:8333
+78.46.32.99:8333
+78.56.9.214:8333
+78.56.229.177:8333
+78.129.237.245:8333
+78.196.172.45:8333
 79.132.230.144:8333
-79.133.43.63:8333
-79.134.201.66:8333
 79.169.35.235:8333
-80.57.227.14:8333
+79.172.194.219:8333
 80.64.65.87:8333
-80.86.92.70:8333
-80.100.203.151:8333
-80.101.32.121:8333
-80.161.178.73:8333
-80.240.129.170:8333
-81.7.11.50:8333
-81.7.11.55:8333
-81.17.17.40:9333
-81.30.39.83:8333
-81.90.36.7:9444
-81.136.224.77:8333
-81.162.231.211:8333
-81.184.0.143:8333
-81.198.128.86:8333
+80.89.137.115:8333
+80.93.36.173:8333
+80.101.167.100:8333
+80.114.34.158:8333
+80.127.136.50:8333
+80.188.139.82:8333
+80.222.39.77:8333
+80.223.105.69:8333
+80.229.151.187:8333
+80.240.129.221:8333
+81.7.10.238:8333
+81.7.13.84:8333
+81.27.96.92:8333
+81.35.143.98:8333
+81.82.201.5:8333
+81.83.96.5:8333
+81.169.227.36:8333
+81.171.2.119:8333
+81.171.38.130:8333
+81.175.255.118:8333
+81.207.8.49:8333
+81.228.194.187:8333
+82.9.1.77:8333
 82.11.33.229:8333
-82.79.128.134:8333
-82.118.233.111:8333
-82.135.139.30:8333
+82.102.13.117:8333
+82.116.203.240:8333
+82.130.103.16:8333
+82.136.65.227:8333
+82.158.227.238:8333
+82.197.212.25:8333
 82.199.102.10:8333
-82.221.106.17:8333
-82.221.108.21:8333
+82.200.204.41:8333
+82.200.204.119:8333
+82.221.105.223:8333
 82.221.108.27:8333
-83.137.41.3:8333
-83.142.197.168:8333
+82.221.111.136:8333
+82.221.139.97:8333
+83.137.41.10:8333
 83.143.130.19:8333
 83.150.9.196:8333
-83.183.17.191:8333
-83.227.173.83:8333
-83.230.5.15:8333
-83.233.105.151:443
-83.246.75.8:8333
-83.250.133.158:8333
-83.255.66.118:8334
-84.24.69.59:8333
+83.169.2.43:8333
+83.217.203.130:8333
+83.249.88.52:8333
+84.26.162.92:8333
 84.42.193.6:8333
-84.45.98.87:8333
-84.54.128.11:8333
-84.212.200.24:8333
-84.215.198.109:8333
-84.230.4.177:8333
-85.95.228.83:8333
-85.95.228.123:8333
-85.114.128.134:8333
-85.214.66.168:8333
-85.214.147.162:8333
-85.243.168.4:8333
-86.1.0.18:8333
-87.79.77.106:8333
-87.91.156.110:8333
-87.236.196.222:8333
-88.85.75.152:8333
-88.87.1.230:8333
-88.87.92.102:8333
-88.89.69.202:8333
-88.97.72.229:8333
-88.164.117.99:8333
-88.198.32.131:8333
+84.134.194.115:8333
+84.201.32.115:8333
+84.212.232.71:8333
+84.238.140.176:8333
+85.10.104.34:8333
+85.21.144.226:8333
+85.25.194.12:8333
+85.144.79.190:8333
+85.145.228.192:8333
+85.194.238.130:8333
+85.228.201.80:8333
+85.229.228.174:8333
+85.236.233.87:8333
+86.80.204.185:8333
+86.105.227.190:8333
+86.135.39.40:8333
+87.106.139.127:8333
+87.120.8.5:8333
+87.120.37.230:8333
+87.239.101.102:8333
+87.243.197.82:8333
+88.112.112.173:8333
+88.150.192.17:8333
+88.185.155.134:8333
+88.202.202.221:8333
 88.202.230.87:8333
-88.214.193.154:8343
-88.214.194.226:8343
-89.10.155.88:8333
-89.46.101.44:8333
-89.163.224.212:8333
-89.174.248.20:8333
-89.202.231.198:8333
-89.212.75.6:8333
+88.208.39.182:8333
+89.34.99.41:8333
+89.163.224.187:8333
+89.169.233.150:8333
+89.184.65.85:8333
+89.212.91.219:8333
+89.249.178.36:8333
 90.149.38.172:8333
-90.169.106.139:8333
-91.64.101.150:8333
-91.65.196.179:8333
-91.121.80.17:8333
-91.126.77.77:8333
-91.145.76.156:8333
-91.152.150.35:8333
-91.192.137.17:8333
-91.196.170.110:8333
+91.65.97.157:8333
+91.107.64.143:8333
+91.114.35.107:8333
+91.135.0.187:8333
+91.145.110.95:8333
+91.157.38.151:8333
 91.197.44.133:8333
-91.207.68.144:8333
-91.210.105.28:8333
-91.211.102.101:8333
-91.211.106.34:8333
-91.214.200.205:8333
-91.220.43.146:8333
-91.222.71.89:8333
-91.224.140.242:8333
-91.229.76.14:8333
+91.205.176.54:8333
+91.206.203.10:8333
+91.206.203.18:8333
+91.215.35.130:8333
+91.219.239.159:8333
+91.223.133.2:8333
+91.223.133.40:8333
+91.226.10.90:8333
+91.240.141.169:8333
 92.27.7.209:8333
-92.51.167.88:8333
-92.247.229.163:8333
-93.84.114.106:8333
-93.113.36.172:8333
+92.89.67.207:8333
+92.221.201.138:8333
+93.95.187.122:8333
+93.103.73.187:8333
+93.123.80.47:8333
 93.188.224.253:8333
-94.75.239.69:8333
-94.190.227.112:8333
-94.214.2.74:8333
-94.224.162.65:8333
-94.236.198.253:8333
+93.190.69.242:8333
+94.19.12.244:8333
+94.156.128.116:8333
+94.177.171.73:8333
+94.181.44.104:8333
+94.237.26.173:8333
 94.242.229.158:8333
-95.84.138.99:8333
-95.95.168.87:8333
+94.255.128.98:8333
+95.79.35.50:8333
+95.91.41.39:8333
 95.110.234.93:8333
-95.130.9.200:8333
-95.165.168.168:8333
-95.170.235.254:8333
-95.211.130.154:8333
-96.46.68.104:8333
-96.127.202.148:8333
-97.76.171.35:8333
-98.160.160.67:8333
-99.126.197.187:8333
-99.198.173.1:8333
-101.100.174.138:8333
-101.164.201.208:8333
-103.224.165.48:8333
-104.128.225.223:8333
+95.128.48.209:8333
+95.183.48.71:8333
+96.23.67.85:8333
+97.64.177.10:8333
+97.104.201.95:8333
+98.29.197.149:8333
+98.169.2.107:8333
+99.232.48.72:8333
+101.100.141.55:8333
+103.7.32.40:8333
+103.53.225.69:8333
+103.249.106.74:8333
+104.128.224.13:8333
 104.128.228.252:8333
-104.131.192.94:8333
-104.155.45.201:8334
-104.194.28.195:8663
-104.211.1.27:8333
-104.221.38.177:8333
-104.236.9.79:8333
-104.236.129.178:8333
-104.236.186.249:8333
-104.236.194.15:8333
-104.238.128.214:8333
+104.155.1.158:8333
+104.168.128.50:8333
+104.199.160.228:8333
+104.204.109.11:8333
+104.219.251.118:8333
+104.223.3.129:8333
+104.223.3.219:8333
 104.238.130.182:8333
-106.38.234.84:8333
-106.185.36.204:8333
-106.185.38.67:8333
-107.6.4.145:8333
-107.150.2.6:8333
-107.150.40.234:8333
-107.170.13.184:8333
-107.181.250.216:8333
-107.191.101.111:8333
-107.191.106.115:8333
+104.245.99.227:8333
+106.38.234.89:8333
+106.104.134.218:8333
+107.136.6.71:8333
+107.150.45.210:8333
+107.151.144.103:8333
+107.170.44.99:8333
+107.181.137.133:8333
+107.191.102.13:8333
+108.58.252.82:8333
+108.59.9.167:8333
 108.59.12.163:8333
-108.161.129.247:8333
-109.193.160.140:8333
-109.197.13.54:8333
-109.230.7.248:8333
-109.234.106.191:8333
-109.236.137.80:8333
-109.251.161.121:8333
-112.65.231.226:8333
-115.70.166.57:8333
-115.159.42.80:8333
-117.18.73.34:8333
-118.67.201.40:8333
-118.100.86.246:8333
-118.110.104.152:8333
-119.224.64.141:8333
+108.162.106.215:8333
+108.168.133.164:8333
+108.173.202.101:8333
+108.180.110.190:8333
+109.29.75.40:8333
+109.120.194.136:8333
+109.230.230.88:8333
+109.235.67.115:8333
+109.235.69.120:8333
+109.236.90.199:8333
+109.255.0.107:8333
+110.10.130.12:8333
+110.10.176.94:8333
+110.132.172.251:8333
+111.90.158.17:8333
+115.66.205.171:8333
+116.31.123.139:8333
+118.192.48.46:8333
+118.193.164.98:8333
+119.29.156.231:8333
+119.63.44.133:19980
+119.81.99.27:8333
+119.106.12.169:8333
+119.147.137.155:19980
+119.185.1.182:8333
 120.55.193.136:8333
-122.106.169.178:8333
-123.203.174.15:8333
-123.255.232.94:8333
-124.148.165.165:8333
-124.232.141.31:8333
-128.30.92.69:8333
-128.39.141.182:8333
-128.84.167.20:8333
-128.111.73.10:8333
-128.127.38.195:8333
+121.254.173.23:8333
+121.254.173.40:8333
+123.56.129.45:8333
+123.203.163.128:8333
+123.206.32.198:8333
+124.189.160.221:8333
+124.189.192.232:8333
 128.140.224.162:8333
-128.199.101.104:8333
-128.233.224.35:8333
-128.253.3.193:20020
-130.180.228.138:8333
-130.185.144.213:8333
-130.255.73.207:8333
-133.218.233.11:8333
-134.249.128.23:8333
-136.159.234.234:8333
-137.116.160.176:8333
-139.162.2.145:8333
-139.162.23.117:8333
-141.134.69.253:8333
-141.255.162.215:8333
-144.122.163.187:8333
-145.131.3.54:8333
-145.255.4.94:8333
-146.0.32.101:8337
-147.83.72.91:8333
-148.103.28.68:8333
-149.5.32.102:8333
-149.210.164.195:8333
-150.101.163.241:8333
-151.236.11.189:8333
-152.3.136.56:8333
-154.20.208.25:8333
-158.181.104.149:8333
-159.253.96.226:8333
-160.36.130.180:8333
+128.199.68.205:8333
+130.234.207.115:8333
+131.113.41.123:8333
+131.114.72.104:8333
+132.204.108.155:8333
+134.119.13.230:8333
+134.213.133.206:8333
+134.213.133.207:8333
+135.23.5.3:8333
+137.74.0.66:8333
+138.68.1.45:8333
+138.68.2.194:8333
+138.68.64.19:8333
+138.68.64.28:8333
+139.59.42.248:8333
+139.220.240.153:8333
+140.112.107.118:8333
+140.186.224.112:8333
+141.52.64.141:8333
+142.68.237.107:8333
+142.217.12.106:8333
+146.60.204.92:8333
+146.185.161.209:8333
+148.103.7.119:8333
+149.210.133.244:8333
+150.229.0.143:8333
+151.231.238.25:8333
+151.248.160.227:8333
+153.230.228.15:8333
+155.133.43.249:8333
+158.58.238.145:8333
+158.109.79.13:34821
+159.203.70.208:8333
+160.16.206.31:8333
 162.209.1.233:8333
 162.209.4.125:8333
-162.209.106.123:8333
-162.210.198.184:8333
-162.248.99.164:53011
+162.216.192.231:8333
+162.243.100.111:8333
+162.246.11.194:8333
 162.248.102.117:8333
-162.251.108.53:8333
-163.44.2.48:8333
-163.158.36.17:8333
-166.230.71.67:8333
-167.160.36.62:8333
-167.160.169.92:8333
-168.93.129.220:8333
-169.55.99.84:8333
-169.228.66.43:8333
-172.9.169.242:8333
-173.32.11.194:8333
-173.230.228.136:8333
-173.246.107.34:8333
-173.254.235.34:8333
-174.0.128.222:8333
-174.25.130.148:8333
-174.50.64.101:8333
-175.140.232.141:8333
-176.36.37.62:8333
-176.46.9.96:8333
-176.124.110.27:8333
-177.39.16.102:8333
-178.17.173.2:8333
-178.62.5.248:8333
-178.62.70.16:8333
+162.252.46.83:8333
+163.172.33.78:8333
+163.172.194.30:8333
+169.229.198.106:8333
+170.75.195.168:8333
+172.103.205.197:8333
+172.245.225.126:8333
+173.179.37.8:8333
+173.208.203.74:8333
+173.252.46.16:8333
+174.117.141.124:8333
+175.126.38.158:8333
+175.126.38.177:8333
+175.139.106.119:8333
+175.140.232.66:8333
+176.9.117.100:8333
+176.36.33.121:8333
+176.36.99.222:8333
+176.56.227.36:8333
+176.100.100.206:8333
+176.106.144.183:8333
+176.123.7.148:8333
+176.126.167.10:8333
+176.223.201.198:8333
+178.62.68.62:8333
+178.62.102.56:8333
 178.62.203.185:8333
-178.79.160.118:8333
-178.169.206.244:8333
-178.193.234.62:8333
-178.199.96.108:8333
-178.254.18.96:8333
+178.124.197.101:8333
+178.170.138.202:8333
+178.175.129.18:8333
+178.188.47.62:8333
+178.199.240.22:8333
+178.218.209.162:8333
+178.237.35.34:8333
+178.238.224.242:8333
+178.254.34.144:8333
 178.254.34.161:8333
-178.255.41.123:8333
-180.210.34.58:9801
-182.92.226.212:8333
-182.171.246.142:8333
-184.23.8.9:8333
-184.58.162.35:8333
-184.154.9.170:8333
-185.8.238.165:8333
+179.43.183.2:8333
+180.200.128.58:8333
+182.93.34.130:8333
+185.8.238.197:8333
+185.11.139.172:8333
 185.24.97.11:8333
-185.31.137.139:8333
-185.38.44.64:8333
-185.53.128.180:8333
-185.53.129.244:8333
-185.77.129.119:8333
-185.77.129.156:8333
-185.82.203.92:8333
-188.20.97.18:8333
-188.126.8.14:8333
-188.138.33.239:8333
-188.155.136.70:8333
+185.24.233.100:8333
+185.25.48.71:8333
+185.25.48.114:8333
+185.28.76.179:8333
+185.70.105.152:8339
+185.77.128.69:8333
+185.77.128.241:8333
+185.86.79.87:8333
+185.89.102.2:3333
+185.89.102.53:3333
+185.109.144.155:8333
+185.117.75.50:8333
+185.121.173.223:8333
+185.128.41.157:8333
+185.130.226.106:8333
+185.145.130.76:8333
+188.63.192.104:8333
+188.113.164.231:8333
 188.166.229.112:8333
-188.182.108.129:8333
-188.226.225.174:8010
-188.242.171.8:8333
-188.243.4.139:8333
-190.10.9.234:8333
-190.10.10.147:8333
+188.214.128.77:8333
+190.10.8.211:8333
 190.81.160.184:8333
-190.85.201.37:8333
-192.34.227.230:8333
-192.77.189.200:8333
-192.124.224.7:8333
-192.146.137.1:8333
-192.203.228.71:8333
-192.206.202.20:8333
-193.0.109.3:8333
-193.41.229.130:8333
-193.41.229.156:8333
+190.111.231.19:8333
+192.131.44.93:8333
+192.206.202.6:8333
+192.227.245.133:8333
+192.241.74.123:8333
+192.241.74.126:8333
+192.254.71.222:8333
+193.10.64.85:8333
+193.46.80.101:8333
 193.49.43.219:8333
-193.147.71.120:8333
-193.179.65.233:8333
+193.93.79.215:8333
 193.183.99.46:8333
-193.192.37.135:8333
 193.234.224.195:8333
-194.58.108.213:8333
-194.187.96.2:8333
-194.255.31.59:8333
-195.36.6.101:8333
-195.58.238.243:8333
-195.197.175.190:8333
-195.239.1.66:8333
-198.48.196.230:8333
-198.50.192.160:8333
-198.57.210.27:8333
-198.84.195.179:8333
-198.167.140.8:8333
+193.239.80.155:8333
+194.63.140.208:8333
+194.87.1.232:8333
+194.187.227.18:8333
+194.247.12.136:8333
+195.91.176.86:8333
+196.28.98.20:8333
+198.44.249.35:8333
+198.84.172.252:8333
 198.204.224.106:8333
-199.127.226.245:8333
-199.201.110.8:8333
-199.233.234.90:8333
+198.211.97.46:8333
+199.66.64.198:8333
+199.101.100.58:8333
+199.101.100.59:8333
+199.127.224.50:8333
+200.46.241.71:8333
 200.116.98.185:8333
-202.60.70.18:8333
-203.151.140.14:8333
-204.112.203.52:8333
+203.9.225.13:8333
+203.177.142.37:8333
 205.200.247.149:8333
-207.226.141.253:8333
-207.255.42.202:8333
-208.53.164.19:8333
-208.66.68.127:8333
-208.66.68.130:8333
-208.71.171.232:8341
-208.76.200.200:8333
-208.82.98.189:8333
-208.85.193.31:8333
-208.111.48.41:8333
-208.111.48.45:8333
-209.34.232.72:8333
-209.81.9.223:8333
-209.90.224.2:8333
+205.209.131.150:13838
+206.53.64.74:8333
+206.72.192.69:8333
+206.123.112.180:8333
+208.66.208.153:8333
+208.68.174.76:8333
+208.107.97.242:8333
+208.111.48.132:8333
+208.118.235.190:8333
+209.6.205.126:8333
+209.40.96.121:8333
+209.58.130.137:8333
+209.73.142.226:8333
 209.90.224.4:8333
-209.126.98.174:8333
-209.136.72.69:8333
-209.195.4.74:8333
-209.197.13.62:8333
-211.72.227.8:8333
-212.51.144.42:8333
-212.71.233.127:8333
-212.126.14.122:8333
-212.159.44.50:8333
-213.5.36.58:8333
-213.57.33.10:8333
-213.66.205.194:8333
-213.136.73.125:8333
-213.155.3.216:8333
-213.155.7.24:8333
-213.167.17.6:8333
-213.223.138.13:8333
-216.15.78.182:8333
-216.38.129.164:8333
-216.48.168.8:8333
-216.169.141.169:8333
-216.245.206.181:8333
-216.249.204.161:8333
-216.250.138.230:8333
+209.126.69.243:8333
+209.126.108.91:8333
+209.195.4.18:8333
+209.250.6.190:8333
+210.54.37.225:8333
+210.223.3.44:8333
+211.149.234.109:8333
+212.51.140.183:8333
+212.90.179.206:8333
+212.93.226.90:8333
+212.110.171.118:8333
+212.202.132.17:8333
+213.91.205.134:8333
+213.165.68.218:8333
+213.196.200.213:8333
+216.59.4.212:8333
+216.74.32.109:8333
+216.158.225.70:8333
+216.164.138.13:8333
+216.167.236.247:8333
+216.197.79.74:8333
 217.11.225.189:8333
-217.12.34.158:8333
-217.12.202.33:8333
-217.20.171.43:8333
-217.23.1.126:8333
-217.23.11.138:8333
+217.12.199.207:8333
+217.20.130.72:8333
+217.23.6.148:8333
+217.23.140.103:8333
+217.28.96.180:8333
+217.35.130.42:8333
 217.111.66.79:8333
-217.155.202.191:8333
 217.158.9.102:8333
-217.172.32.18:20993
-220.245.196.37:8333
-[2001:1291:2bf:1::100]:8333
+217.168.143.169:8333
+217.209.32.219:8333
+218.161.33.165:8333
+221.121.144.138:8333
+[2001:0:4137:9e76:2048:3a84:bb91:e846]:8333
+[2001:0:4137:9e76:2066:e9e:b489:f8b8]:8333
+[2001:0:4137:9e76:3854:1211:b5ac:a96b]:8333
+[2001:0:4137:9e76:4e3:1f66:cd4c:829f]:8333
+[2001:0:4137:9e76:ad:1f4:9ea9:fa2e]:8333
+[2001:0:4137:9e76:e5:baa:b66f:f418]:8333
+[2001:0:53aa:64c:20a2:59c4:ad22:93ea]:8333
+[2001:0:53aa:64c:59:617f:a10d:e0]:8333
+[2001:0:5ef5:79fb:200f:3ae5:3cbc:74c9]:8333
+[2001:0:5ef5:79fb:38f2:13b4:b208:5604]:8333
+[2001:0:5ef5:79fd:200b:22a7:cc50:f52d]:8333
+[2001:0:5ef5:79fd:24ef:1aef:a994:303d]:8333
+[2001:0:5ef5:79fd:24fc:b5d:ad4f:4db2]:8333
+[2001:0:5ef5:79fd:28bf:2d23:e02e:c3ef]:8333
+[2001:0:5ef5:79fd:3cd0:3c2e:da44:a759]:8333
+[2001:0:5ef5:79fd:87e:fd7:b1c2:1b4]:8333
+[2001:0:9d38:6ab8:18db:3bda:ab90:e81e]:8333
+[2001:0:9d38:6ab8:4e7:1660:862f:a6d7]:8333
+[2001:0:9d38:6ab8:6:2b:5074:9588]:8333
+[2001:0:9d38:6abd:10f8:a7d7:bb90:f524]:8333
+[2001:13d8:1c01:1000::11]:8333
+[2001:15c0:65ff:610::2]:8333
+[2001:1608:10:156:ae::4adb]:8333
+[2001:1620:b1b:8888:20d:b9ff:fe41:6710]:8333
+[2001:1620:b1b:face:20d:b9ff:fe41:6710]:8333
 [2001:1620:f00:282::2]:8333
 [2001:1620:f00:8282::1]:8333
-[2001:19f0:5000:8de8:5400:ff:fe12:55e4]:8333
-[2001:19f0:6c00:9103:5400:ff:fe10:a8d3]:8333
-[2001:1b60:3:172:142b:6dff:fe7a:117]:8333
-[2001:410:a000:4050:8463:90b0:fffb:4e58]:8333
+[2001:1680:101:1ae::1]:8333
+[2001:16d8:ff00:85de:20c:29ff:fe52:9594]:8333
+[2001:19f0:4400:434d:5400:ff:fe42:2678]:8333
+[2001:19f0:5000:8c8b:5400:ff:fe1f:c023]:8333
+[2001:19f0:5000:8ce6:5400:ff:fe1b:24a9]:8333
+[2001:19f0:5:314:5400:ff:fe2c:42e8]:8333
+[2001:19f0:5:51b:5400:ff:fe49:fe5b]:8333
+[2001:19f0:5:bc:5400:ff:fe3b:9339]:8333
+[2001:1af8:4020:a020:5::]:8333
+[2001:1bc8:1a0:590e:2e0:f4ff:fe16:3a39]:8333
+[2001:1c04:1401:8f00:f4fe:4fff:fe0c:df40]:8333
+[2001:4128:6135:10:20c:29ff:fe69:9e81]:8333
 [2001:4128:6135:2010:21e:bff:fee8:a3c0]:8333
-[2001:41d0:1008:761::17c]:8333
+[2001:4128:6135:e001:5054:ff:fe37:e9eb]:8333
+[2001:41d0:1000:1024::]:8333
+[2001:41d0:1000:1433::]:8333
+[2001:41d0:1004:22ae::]:8333
+[2001:41d0:1004:2996::]:8333
+[2001:41d0:1008:11e0::1a5c:6d9d]:8333
+[2001:41d0:1008:11e0::b74:baf7]:8333
+[2001:41d0:1008:237a::]:8333
+[2001:41d0:1008:2752::]:8333
+[2001:41d0:1008:494::]:8333
 [2001:41d0:1:45d8::1]:8333
-[2001:41d0:1:6cd3::]:8333
+[2001:41d0:1:5630::1]:8333
+[2001:41d0:1:6f57::1]:8333
+[2001:41d0:1:801e::1]:8333
+[2001:41d0:1:8852::1]:8333
 [2001:41d0:1:8b26::1]:8333
-[2001:41d0:1:afda::]:8200
+[2001:41d0:1:a5b8::1]:8333
 [2001:41d0:1:b26b::1]:8333
 [2001:41d0:1:c139::1]:8333
 [2001:41d0:1:c8d7::1]:8333
-[2001:41d0:1:f59f::33]:8333
-[2001:41d0:1:f7cc::1]:8333
-[2001:41d0:2:1021::1]:8333
-[2001:41d0:2:37c3::]:8200
-[2001:41d0:2:4797:2323:2323:2323:2323]:8333
-[2001:41d0:2:53df::]:8333
+[2001:41d0:1:d227::]:8333
+[2001:41d0:1:dbc4::1]:8333
+[2001:41d0:1:dc5d::1]:8333
+[2001:41d0:1:e13b::1]:8333
+[2001:41d0:1:ef5b::1]:8333
+[2001:41d0:2:16be::1]:8333
+[2001:41d0:2:203c::1]:8333
+[2001:41d0:2:38c5::1]:8333
+[2001:41d0:2:519::]:8333
 [2001:41d0:2:9c94::1]:8333
-[2001:41d0:2:9d3e::1]:8333
-[2001:41d0:2:a24f::]:8333
-[2001:41d0:2:a35a::]:8333
-[2001:41d0:2:b2b8::]:8333
-[2001:41d0:2:c1d9::]:8333
-[2001:41d0:2:c6e::]:8333
+[2001:41d0:2:b792::]:8333
+[2001:41d0:2:bf2a::]:8333
+[2001:41d0:2:c793::]:8333
 [2001:41d0:2:c9bf::]:8333
-[2001:41d0:2:f1a5::]:8333
-[2001:41d0:52:a00::105f]:8333
-[2001:41d0:52:cff::6f5]:8333
-[2001:41d0:52:d00::6e2]:8333
-[2001:41d0:8:3e75::1]:8333
-[2001:41d0:8:62ab::1]:8333
+[2001:41d0:303:4f0::]:8333
+[2001:41d0:8:1a8a::1]:8333
+[2001:41d0:8:3fa9::1]:8333
+[2001:41d0:8:4670::1]:8333
+[2001:41d0:8:4f48::1]:8333
 [2001:41d0:8:6728::]:8333
-[2001:41d0:8:b30a::1]:8333
-[2001:41d0:8:bc26::1]:8333
-[2001:41d0:8:be9a::1]:8333
-[2001:41d0:8:d984::]:8333
-[2001:41d0:8:eb8b::]:8333
-[2001:41d0:a:13a2::1]:8333
-[2001:41d0:a:2b18::1]:8333
-[2001:41d0:a:2d14::]:8333
-[2001:41d0:a:4558::1df2:76d3]:8333
-[2001:41d0:a:4aaa::]:8333
-[2001:41d0:a:635b::1]:8333
-[2001:41d0:a:63d8::1]:8333
+[2001:41d0:8:72c2:d:242:ac11:2]:8333
+[2001:41d0:8:8007::]:8333
+[2001:41d0:8:a71c::]:8333
+[2001:41d0:8:bccc::1]:8333
+[2001:41d0:8:bd45::1]:8333
+[2001:41d0:8:c67c::]:8333
+[2001:41d0:8:de3d::1]:8333
+[2001:41d0:8:e257::1]:8333
+[2001:41d0:8:e3e4::1]:8333
+[2001:41d0:a:14cc::1]:8333
+[2001:41d0:a:15b2::1]:8333
+[2001:41d0:a:1ac9::1]:8333
+[2001:41d0:a:2496::1]:8333
+[2001:41d0:a:308c::]:8333
+[2001:41d0:a:5879::]:8333
+[2001:41d0:a:6810::1]:8333
+[2001:41d0:a:682d::1]:8333
 [2001:41d0:a:6c29::1]:8333
-[2001:41d0:a:f9cd::1]:8333
-[2001:41d0:d:20a4::]:8333
+[2001:41d0:a:f52a::1]:8333
+[2001:41d0:d:111c::]:8333
+[2001:41d0:e:1388::1]:8333
 [2001:41d0:e:26b::1]:8333
+[2001:41d0:e:f73::1]:8333
 [2001:41d0:fc8c:a200:7a24:afff:fe9d:c69b]:8333
+[2001:41f0:61:0:72f3:95ff:fe09:7521]:8333
 [2001:41f0:61::7]:8333
-[2001:41f0::2]:8333
-[2001:44b8:41bd:6101:148e:4022:4950:e861]:8333
-[2001:470:1:2f9:0:1:107a:a301]:8333
-[2001:470:1f0b:ad6::2]:8333
-[2001:470:1f11:12d5::ae1:5611]:8333
+[2001:4428:200:8171:db6:2ff4:9c0e:a2da]:8333
+[2001:470:1f07:151c:baac:6fff:feb7:3ba9]:8333
+[2001:470:1f0b:ad6:a60:6eff:fec6:2323]:8333
+[2001:470:1f11:617::10f]:8333
+[2001:470:1f14:73e::2]:8333
 [2001:470:1f14:7d::2]:8333
-[2001:470:27:ce::2]:8333
+[2001:470:1f15:11f8::10]:8333
+[2001:470:1f15:1b95:2c3e:8a9a:24e1:7084]:8333
+[2001:470:1f15:e9b::3ef]:8333
+[2001:470:1f1d:3a9::10]:8333
+[2001:470:25:482::2]:8333
+[2001:470:27:19f::2]:8333
+[2001:470:27:665::2]:8333
+[2001:470:28:365::4]:8333
 [2001:470:41:6::2]:8333
-[2001:470:507d:0:6ab5:99ff:fe73:ac18]:8333
-[2001:470:583e::2a]:8333
-[2001:470:5f:5f::232]:8333
-[2001:470:66:119::2]:8333
-[2001:470:6c4f::cafe]:8333
-[2001:470:6f:327:913b:7fe:8545:a4f5]:8333
-[2001:470:7dda:1::1]:8333
-[2001:470:95c1::2]:8333
-[2001:470:b1d0:ffff::1000]:8333
-[2001:470:d00d:0:3664:a9ff:fe9a:5150]:8333
-[2001:470:fab7:1::1]:8333
-[2001:4800:7819:104:be76:4eff:fe05:c828]:8333
-[2001:4800:7819:104:be76:4eff:fe05:c9a0]:8333
+[2001:470:727b::11:14]:8333
+[2001:470:7:2f0::2]:8333
+[2001:470:7:65::2]:8333
+[2001:470:7f85::2]:8333
+[2001:470:8:2e1:5825:39df:3e4c:54a8]:8333
+[2001:470:8:2e1::43]:8333
+[2001:470:8:2e1:ae2a:e257:4470:6350]:8333
+[2001:470:a:c13::2]:8333
 [2001:4801:7819:74:b745:b9d5:ff10:a61a]:8333
 [2001:4801:7819:74:b745:b9d5:ff10:aaec]:8333
 [2001:4801:7828:104:be76:4eff:fe10:1325]:8333
-[2001:4802:7800:1:be76:4eff:fe20:f023]:8333
 [2001:4802:7800:2:30d7:1775:ff20:1858]:8333
-[2001:4802:7800:2:be76:4eff:fe20:6c26]:8333
-[2001:4802:7802:101:be76:4eff:fe20:256]:8333
-[2001:4802:7802:103:be76:4eff:fe20:2de8]:8333
-[2001:4830:1100:2e8::2]:8333
-[2001:4b98:dc2:41:216:3eff:fe56:f659]:8333
-[2001:4ba0:fffa:5d::93]:8333
-[2001:4ba0:ffff:1be:1:1005:0:1]:8333
-[2001:4dd0:ff00:867f::3]:8333
+[2001:4ba0:babe:832::]:8333
+[2001:4ba0:cafe:379::1]:8333
+[2001:4ba0:ffee:33::10]:8333
 [2001:4dd0:ff00:9a67::9]:8333
-[2001:5c0:1400:b::3cc7]:8333
 [2001:610:1b19::3]:8333
 [2001:610:600:a41::2]:8333
-[2001:67c:26b4::]:8333
-[2001:8d8:840:500::39:1ae]:8333
-[2001:8d8:965:4a00::10:9343]:8333
-[2001:980:4650:1:2e0:53ff:fe13:2449]:8333
+[2001:678:174:4021::2:8333]:8333
+[2001:67c:16dc:1201:5054:ff:fe17:4dac]:8333
+[2001:67c:2128:ffff:6062:36ff:fe30:6532]:8333
+[2001:67c:2564:331:3547:6e28:85a4:fb27]:8333
+[2001:6a0:200:368::2]:8333
+[2001:718:801:311:5054:ff:fe19:c483]:8333
+[2001:7b8:2ff:8f::2]:8333
+[2001:8d8:8a6:4400::3f:86c]:8333
+[2001:8d8:923:8400::87:ebd]:8333
+[2001:960:66d::2]:8333
 [2001:981:46:1:ba27:ebff:fe5b:edee]:8333
-[2001:9c8:53e9:369a:226:2dff:fe1b:7472]:8333
-[2001:9d8:cafe:3::87]:8333
-[2001:b10:11:21:3e07:54ff:fe48:7248]:8333
-[2001:ba8:1f1:f34c::2]:8333
-[2001:bc8:2310:100::1]:8333
-[2001:bc8:3427:101:7a4f:8be:2611:6e79]:8333
-[2001:bc8:3505:200::1]:8333
-[2001:cc0:a004::30:1d]:8333
-[2001:e42:102:1209:153:121:76:171]:8333
-[2002:17ea:14eb::17ea:14eb]:8333
-[2002:2f8:2bc5::2f8:2bc5]:8333
-[2002:4047:482c::4047:482c]:8333
-[2002:45c3:8cca::45c3:8cca]:8333
-[2002:46bb:8a41:0:226:b0ff:feed:5f12]:8888
-[2002:46bb:8c3c:0:8d55:8fbb:15fa:f4e0]:8765
-[2002:4c48:a0fe::4c48:a0fe]:8333
-[2002:4d44:25c8::4d44:25c8]:8333
-[2002:505f:aaa2::505f:aaa2]:8333
-[2002:5bc1:799d::5bc1:799d]:8333
-[2002:6dec:5472::6dec:5472]:8333
-[2002:8c6d:6521:9617:12bf:48ff:fed8:1724]:8333
-[2002:ac52:94e2::ac52:94e2]:8333
-[2002:af7e:3eca::af7e:3eca]:8333
-[2002:b009:20c5::b009:20c5]:8333
-[2002:c06f:39a0::c06f:39a0]:8333
-[2002:c23a:738a::c23a:738a]:8333
-[2002:c70f:7442::c70f:7442]:8333
-[2002:cec5:be4f::cec5:be4f]:8333
-[2002:d149:9e3a::d149:9e3a]:8333
+[2001:ba8:1f1:f069::2]:8333
+[2001:bc8:225f:10e:505:6573:7573:d0a]:8333
+[2001:bc8:2706::1]:8333
+[2001:bc8:323c:100::53]:8333
+[2001:bc8:323c:100::80:4]:8333
+[2001:bc8:323c:100::cafe]:8333
+[2001:bc8:3680:4242::1]:8333
+[2001:bc8:399f:f000::1]:8333
+[2001:bc8:3cbf::5]:8333
+[2001:bc8:4700:2300::19:807]:8333
+[2001:e42:102:1805:160:16:206:31]:8333
+[2002:12f1:3f::12f1:3f]:8333
+[2002:1e2:5349::1e2:5349]:8333
+[2002:1e2:5588::1e2:5588]:8333
+[2002:2501:cf62::2501:cf62]:8333
+[2002:268c:a135::268c:a135]:8333
+[2002:2a33:99db::2a33:99db]:8332
+[2002:2ebc:2c14::7]:8333
+[2002:2f59:2c9c::2f59:2c9c]:11885
+[2002:2f5a:3619::2f5a:3619]:8333
+[2002:2f5a:36a4::2f5a:36a4]:8333
+[2002:2f5a:429::2f5a:429]:8333
+[2002:2f5a:562a::2f5a:562a]:8333
+[2002:3a3b:216::3a3b:216]:8333
+[2002:3dfa:5d23::3dfa:5d23]:8333
+[2002:424f:a052::424f:a052]:8333
+[2002:451e:e922::451e:e922]:8333
+[2002:4540:4b30::4540:4b30]:8333
+[2002:51ab:7cc::51ab:7cc]:8333
+[2002:527:de11::527:de11]:8333
+[2002:5395:7d01::5395:7d01]:8333
+[2002:5395:7d2a::5395:7d2a]:8333
+[2002:5669:e3be::5669:e3be]:8333
+[2002:566a:5d6d::566a:5d6d]:8333
+[2002:59b9:f820::59b9:f820]:8333
+[2002:59f8:ac69::59f8:ac69]:8333
+[2002:5bd4:b65a::5bd4:b65a]:8333
+[2002:5c3f:39db::5c3f:39db]:8333
+[2002:5d33:8d03::5d33:8d03]:8333
+[2002:5d67:49bb::5d67:49bb]:8333
+[2002:5dae:5d5f::5dae:5d5f]:8333
+[2002:5dbe:8cc6::5dbe:8cc6]:8333
+[2002:5dbe:9503::5dbe:9503]:8333
+[2002:5fd3:8944::5fd3:8944]:8333
+[2002:5fd3:9467::5fd3:9467]:8333
+[2002:67f9:6a48::67f9:6a48]:8333
+[2002:67f9:6a4a::67f9:6a4a]:8333
+[2002:67f9:6a95::67f9:6a95]:8333
+[2002:6a0e:3ea8::6a0e:3ea8]:10011
+[2002:6b96:375a::6b96:375a]:8333
+[2002:6ca8:cffb::6ca8:cffb]:8333
+[2002:6caf:234::6caf:234]:8333
+[2002:6dec:58f5::6dec:58f5]:8333
+[2002:6dec:5ac7::6dec:5ac7]:8333
+[2002:7237:4a02::7237:4a02]:20033
+[2002:7237:94fd::7237:94fd]:10011
+[2002:7237:e428::7237:e428]:8333
+[2002:7237:fcf6::7237:fcf6]:20188
+[2002:76c0:96e6::76c0:96e6]:8333
+[2002:7819:7e80::7819:7e80]:7743
+[2002:781a:ea86::781a:ea86]:8333
+[2002:781a:f3c2::781a:f3c2]:14475
+[2002:784c:c2c0::784c:c2c0]:8333
+[2002:784c:ec97::784c:ec97]:8333
+[2002:792b:261a::792b:261a]:8333
+[2002:88f3:8cca::88f3:8cca]:8333
+[2002:88f3:a83c::88f3:a83c]:8333
+[2002:8ac9:516f::8ac9:516f]:8333
+[2002:8b81:6d78::8b81:6d78]:50344
+[2002:8b81:6e5c::8b81:6e5c]:38176
+[2002:8bc4:90a6::8bc4:90a6]:8333
+[2002:ac52:b854::ac52:b854]:8333
+[2002:add0:c14a::add0:c14a]:8333
+[2002:b07e:a70a::b07e:a70a]:8333
+[2002:b27c:c565:1::250]:8333
+[2002:b27c:c565::1]:8333
+[2002:b94d:80f1::b94d:80f1]:8333
+[2002:b982:e26a::b982:e26a]:8333
+[2002:bcd5:3145::bcd5:3145]:8333
+[2002:c08a:d22b::c08a:d22b]:8333
+[2002:c0c7:f8e3::c0c7:f8e3]:32771
+[2002:c1a9:fc5a::c1a9:fc5a]:8333
+[2002:c23f:8fc5::c23f:8fc5]:8333
+[2002:d395:ea6d::d395:ea6d]:8333
 [2002:d917:ca5::d917:ca5]:8333
-[2400:8900::f03c:91ff:fe50:153f]:8333
-[2400:8900::f03c:91ff:fe6e:823e]:8333
-[2400:8900::f03c:91ff:fea8:1934]:8333
-[2400:8901::f03c:91ff:fe26:c4d6]:8333
+[2002:d917:e91::d917:e91]:8333
+[2002:db71:f434::db71:f434]:8333
+[2400:2651:161:1000:6847:d40f:aaa3:4848]:8333
 [2400:8901::f03c:91ff:fec8:4280]:8333
-[2400:8901::f03c:91ff:fec8:660f]:8333
-[2401:1800:7800:102:be76:4eff:fe1c:559]:8333
 [2401:1800:7800:102:be76:4eff:fe1c:a7d]:8333
+[2401:2500:203:10:153:120:156:83]:8333
+[2401:a400:3200:5600:14ee:f361:4bdc:1f7c]:8333
+[2403:4200:403:2::ff]:8333
 [2405:aa00:2::40]:8333
-[2600:3c00::f03c:91ff:fe18:59b2]:8333
-[2600:3c00::f03c:91ff:fe26:bfb6]:8333
-[2600:3c00::f03c:91ff:fe33:88e3]:8333
-[2600:3c00::f03c:91ff:fe6e:7297]:8333
-[2600:3c00::f03c:91ff:fe84:8a6e]:8333
+[240b:10:ca20:f0:224:e8ff:fe1f:60d9]:8333
+[240b:250:1e0:2400:b9ef:8fe3:a69a:7378]:8333
+[240d:1a:302:8600:8876:a36d:12ee:f285]:8333
+[2600:3c00::f03c:91ff:fe91:3e49]:8333
+[2600:3c00::f03c:91ff:febb:981e]:8333
 [2600:3c01::f03c:91ff:fe18:6adf]:8333
-[2600:3c01::f03c:91ff:fe26:c4b8]:8333
-[2600:3c01::f03c:91ff:fe3b:1f76]:8333
-[2600:3c01::f03c:91ff:fe50:5e06]:8333
-[2600:3c01::f03c:91ff:fe61:289b]:8333
 [2600:3c01::f03c:91ff:fe69:89e9]:8333
-[2600:3c01::f03c:91ff:fe84:ac15]:8333
-[2600:3c01::f03c:91ff:fe98:68bb]:8333
-[2600:3c02::f03c:91ff:fe26:713]:8333
-[2600:3c02::f03c:91ff:fe26:c49e]:8333
-[2600:3c02::f03c:91ff:fe84:97d8]:8333
-[2600:3c02::f03c:91ff:fec8:8feb]:8333
+[2600:3c01::f03c:91ff:fe91:6a29]:8333
+[2600:3c01::f03c:91ff:fef1:1eaa]:8333
 [2600:3c03::f03c:91ff:fe18:da80]:8333
-[2600:3c03::f03c:91ff:fe26:c49b]:8333
-[2600:3c03::f03c:91ff:fe50:5fa7]:8333
+[2600:3c03::f03c:91ff:fe28:1445]:8333
 [2600:3c03::f03c:91ff:fe67:d2e]:8333
-[2600:3c03::f03c:91ff:fe6e:1803]:8333
-[2600:3c03::f03c:91ff:fec8:4bbe]:8333
-[2600:3c03::f03c:91ff:fee4:4e16]:8333
-[2601:18d:8300:58a6::2e4]:8333
-[2601:240:4600:40c0:250:56ff:fea4:6305]:8333
-[2601:581:c200:a719:542c:9cd5:4852:f7d9]:8333
-[2601:647:4900:85f1:ca2a:14ff:fe51:bb35]:8333
-[2601:c2:c002:b300:54a0:15b5:19f7:530d]:8333
-[2602:306:ccff:ad7f:b116:52be:64ba:db3a]:8333
-[2602:ae:1982:9400:846:f78c:fec:4d57]:8333
+[2600:3c03::f03c:91ff:fe89:116f]:8333
+[2600:3c03::f03c:91ff:feb0:5fc4]:8333
+[2600:3c03::f03c:91ff:fee0:233e]:8333
+[2600:3c03::f03c:91ff:fee0:51]:8333
+[2600:8805:2400:14e:226:4aff:fe02:2ba4]:8333
+[2600:8807:5080:3301:1487:83b7:33d7:eb97]:8333
+[2601:186:c100:6bcd:16bd:cea1:235d:1c19]:8333
+[2601:18c:4200:28d0:e4d:e9ff:fec5:76d0]:8333
+[2601:247:8201:6251:30e6:7b95:69bf:9248]:8333
+[2601:602:9980:f78:211:11ff:fec5:1ae]:8333
+[2602:ae:1993:de00:2c50:9a44:8f11:77a5]:8333
+[2602:ff68:0:1:21e:bff:feca:db72]:8333
+[2602:ff68:0:1:2bd:27ff:feb0:adf8]:8333
+[2602:ff68:0:1::5]:8333
+[2602:ff68:0:5:2bd:27ff:feb0:adf8]:8333
 [2602:ffc5:1f::1f:2d61]:8333
 [2602:ffc5:1f::1f:9211]:8333
-[2602:ffc5::75d5:c1c3]:8333
+[2602:ffc5::9e63:27a2]:8333
+[2602:ffc5::c30:1c75]:8333
 [2602:ffc5::ffc5:b844]:8333
 [2602:ffe8:100:2::457:936b]:8333
-[2602:ffe8:100:2::9d20:2e3c]:8333
-[2602:ffea:1001:72b::578b]:8333
-[2602:ffea:a::24c4:d9fd]:8333
-[2604:0:c1:100:1ec1:deff:fe54:2235]:8333
-[2604:180:1:1af::42a9]:8333
-[2604:180:3:702::c9de]:8333
-[2604:4080:1114:0:3285:a9ff:fe93:850c]:8333
-[2604:6000:ffc0:3c:64a3:94d0:4f1d:1da8]:8333
-[2605:6000:f380:9a01:ba09:8aff:fed4:3511]:8333
-[2605:6001:e00f:7b00:c587:6d91:6eff:eeba]:8333
-[2605:f700:c0:1::25c3:2a3e]:8333
-[2606:6000:a441:9903:5054:ff:fe78:66ff]:8333
-[2607:5300:100:200::1c83]:9334
-[2607:5300:10::a1]:8333
-[2607:5300:60:1c2f::1]:8333
-[2607:5300:60:2b90::1]:8333
-[2607:5300:60:3320::1]:8333
-[2607:5300:60:385::1]:8333
-[2607:5300:60:4a85::]:8333
-[2607:5300:60:65e4::]:8333
-[2607:5300:60:6918::]:8333
-[2607:5300:60:711a:78::a7b5]:8333
-[2607:5300:60:714::1]:8333
-[2607:5300:60:870::1]:8333
-[2607:5300:60:952e:3733::1414]:8333
-[2607:f1c0:848:1000::48:943c]:8333
-[2607:f2e0:f:5df::2]:8333
-[2607:f748:1200:f8:21e:67ff:fe99:8f07]:8333
-[2607:f948:0:1::7]:8333
-[2607:ff68:100:36::131]:8333
-[2803:6900:1::117]:8333
-[2a00:1098:0:80:1000:25:0:1]:8333
-[2a00:1178:2:43:5054:ff:fe84:f86f]:8333
-[2a00:1178:2:43:5054:ff:fee7:2eb6]:8333
-[2a00:1178:2:43:8983:cc27:d72:d97a]:8333
-[2a00:1328:e100:cc42:230:48ff:fe92:55c]:8333
+[2604:180:2:eee::ca46]:8333
+[2604:880:d:85::be37]:8333
+[2604:9a00:2100:a009:2::]:8333
+[2604:a880:2:d0::301:8001]:8333
+[2604:a880:2:d0::4a9:1001]:8333
+[2604:a880:2:d0::53a:c001]:8333
+[2604:a880:400:d0::ad7:e001]:8333
+[2604:a880:400:d0::dcf:f001]:8333
+[2605:4d00::50]:8333
+[2605:6000:edc8:300::ddfe]:8333
+[2605:6000:ffc0:70:74d5:225c:f553:5bb8]:8333
+[2606:6000:c148:7003:5054:ff:fe78:66ff]:8333
+[2606:6000:e6d6:d701:d428:5e44:a2c9:3ff6]:8333
+[2606:c680:1:4a:2016:d1ff:fe93:52a7]:8333
+[2607:5300:203:118:3733::1414]:8333
+[2607:5300:60:13bb::1]:8333
+[2607:5300:60:1966::1]:8333
+[2607:5300:60:2218::]:8333
+[2607:5300:60:3775::]:8333
+[2607:5300:60:3ddf::]:8333
+[2607:5300:60:a654::]:8333
+[2607:5300:60:a7a3::]:8333
+[2607:5300:60:ac0::1]:8333
+[2607:5300:60:cf97::]:8333
+[2607:f0d0:1901:19::6]:8333
+[2607:f128:40:1202:69:162:139:125]:8333
+[2607:f128:40:1703::2]:8333
+[2607:f178:0:8::106]:8333
+[2607:f1c0:84d:8900::7e:cad]:8333
+[2607:f948:0:1::1:40]:8333
+[2607:fcd0:100:2302::6094:635a]:8333
+[2607:fcd0:100:6a00::3a96:1]:8333
+[2607:fcd0:100:6a02::7ff0:1]:8333
+[2607:fcd0:100:8203::8c58:dbc]:8333
+[2607:fea8:1360:9c2:221a:6ff:fe47:776d]:8333
+[2607:fea8:4da0:9ce:5114:a8ec:20f5:a50b]:8333
+[2607:fea8:5df:fda0:feaa:14ff:feda:c79a]:8333
+[2607:fea8:84c0:163:f42c:baff:fecc:6bbf]:8333
+[2607:ff10:c5:502:225:90ff:fe32:d446]:8333
+[2607:ff48:aa81:800::96cf:1]:8333
+[2620:11c:5001:1118:d267:e5ff:fee9:e673]:8333
+[2620:b8:4000:1000::93:1]:8333
+[2800:1a0::9]:8333
+[2a00:1178:2:43:19fd:d43e:b77:edeb]:8333
+[2a00:1178:2:43:b4e3:e562:f811:d761]:8333
 [2a00:14f0:e000:80d2:cd1a::1]:8333
+[2a00:1630:14::101]:8333
 [2a00:1630:2:1802:188:122:91:11]:8333
-[2a00:18e0:0:1800::1]:8333
-[2a00:18e0:0:dcc5:109:234:106:191]:8333
-[2a00:1a28:1157:87::94c7]:8333
+[2a00:1630:2:500::4]:8333
+[2a00:1768:2001:24::148:218]:8333
+[2a00:1768:2001:27::142:21]:8333
+[2a00:1a48:7810:101:be76:4eff:fe08:c774]:8333
 [2a00:1ca8:37::a5fc:40d1]:8333
 [2a00:1ca8:37::ab6d:ce2c]:8333
-[2a00:7143:100:0:216:3eff:fe2e:74a3]:8333
-[2a00:7143:100:0:216:3eff:fed3:5c21]:8333
-[2a00:7c80:0:45::123]:8333
+[2a00:1dc0:2255:10::2]:8333
+[2a00:7c80:0:71::8]:8333
+[2a00:7c80:0:97::7]:8333
+[2a00:bbe0:0:42:222:64ff:fe9a:e206]:8333
+[2a00:c98:2050:a020:3::110]:8333
+[2a00:dcc0:eda:98:183:193:1d24:b53a]:8333
 [2a00:dcc0:eda:98:183:193:c382:6bdb]:8333
 [2a00:dcc0:eda:98:183:193:f72e:d943]:8333
-[2a00:f820:17::4af:1]:8333
-[2a00:f940:2:1:2::101d]:8333
-[2a00:f940:2:1:2::6ac]:8333
-[2a01:1b0:7999:402::131]:8333
-[2a01:238:42dd:f900:7a6c:2bc6:4041:c43]:8333
-[2a01:238:4313:6300:2189:1c97:696b:5ea]:8333
-[2a01:488:66:1000:5c33:91f9:0:1]:8333
-[2a01:488:66:1000:b01c:178d:0:1]:8333
+[2a00:f90:ff0:c100:53c4:97a7:8b59:796a]:8333
+[2a01:238:435c:de00:b110:38cf:192d:b2c]:28333
+[2a01:348:6:7cf::2]:8333
+[2a01:368:e012:8888:216:3eff:fe24:1162]:8333
+[2a01:488:66:1000:53a9:22b:0:1]:8333
+[2a01:488:67:1000:523:ffa7:0:1]:8333
+[2a01:488:67:1000:b01c:3379:0:1]:8333
 [2a01:4f8:100:34ce::2]:8333
-[2a01:4f8:100:34e4::2]:8333
 [2a01:4f8:100:44e7::2]:8333
-[2a01:4f8:100:510e::2]:8333
-[2a01:4f8:100:5128::2]:8333
-[2a01:4f8:110:5105::2]:8333
-[2a01:4f8:110:516c::2]:8333
+[2a01:4f8:10a:2e4::2]:8333
+[2a01:4f8:10a:34e::2]:8333
+[2a01:4f8:10a:51d::2]:8333
+[2a01:4f8:10a:622::2]:8333
+[2a01:4f8:10a:85f::2]:8333
+[2a01:4f8:10a:864::2]:8333
+[2a01:4f8:10a:d04::2]:8333
+[2a01:4f8:110:334c::2]:8333
+[2a01:4f8:110:536e::2]:8333
 [2a01:4f8:120:43e4::2]:8333
-[2a01:4f8:120:62e6::2]:8333
 [2a01:4f8:120:702e::2]:8333
-[2a01:4f8:120:8203::2]:8333
-[2a01:4f8:121:234d::2]:8333
-[2a01:4f8:121:261::2]:8333
-[2a01:4f8:130:11ea::2]:8333
+[2a01:4f8:121:4346::2]:8333
 [2a01:4f8:130:3332::2]:8333
-[2a01:4f8:130:40ab::2]:8333
-[2a01:4f8:130:632c::2]:8333
-[2a01:4f8:130:6366::2]:8333
-[2a01:4f8:130:934f::2]:8333
+[2a01:4f8:131:33ad::2]:8333
 [2a01:4f8:131:33ad:fea1::666]:8333
-[2a01:4f8:140:2195::2]:8333
-[2a01:4f8:140:6333::2]:8333
-[2a01:4f8:140:930d::2]:8333
+[2a01:4f8:140:31b0::2]:8333
+[2a01:4f8:140:4088::2]:8333
+[2a01:4f8:140:931a::2]:8333
 [2a01:4f8:140:93b0::2]:8333
-[2a01:4f8:141:1167::2]:8333
+[2a01:4f8:141:13ad::c451]:8333
 [2a01:4f8:141:186::2]:8333
-[2a01:4f8:141:53f0::2]:8333
-[2a01:4f8:150:336a::2]:8333
-[2a01:4f8:150:72ee::4202]:8333
-[2a01:4f8:150:8324::2]:9001
-[2a01:4f8:151:21ca::2]:8333
-[2a01:4f8:151:41c2:0:5404:a67e:f250]:8333
-[2a01:4f8:151:5128::2]:8333
+[2a01:4f8:141:22ae::2]:8333
+[2a01:4f8:141:322c::2]:8333
+[2a01:4f8:150:11d4::2]:8333
+[2a01:4f8:150:440f::2]:8333
+[2a01:4f8:150:61ee::2]:8333
+[2a01:4f8:150:726b::2]:8333
+[2a01:4f8:151:30c9::2]:15000
+[2a01:4f8:151:41a2::2]:8333
+[2a01:4f8:151:41cc::2]:8333
 [2a01:4f8:151:52c6::154]:8333
-[2a01:4f8:151:6347::2]:9001
-[2a01:4f8:160:5136::2]:8333
-[2a01:4f8:160:72c5::2858:e1c5]:8333
-[2a01:4f8:160:72c5::593b:60d5]:8333
+[2a01:4f8:151:600b::1:1]:8333
+[2a01:4f8:151:7175::2]:8333
+[2a01:4f8:160:41f0::1:33]:8333
+[2a01:4f8:160:5328::27f0:187a]:8333
 [2a01:4f8:160:814f::2]:8333
-[2a01:4f8:161:13d0::2]:8333
-[2a01:4f8:161:228f::2]:8333
-[2a01:4f8:161:51c4::2]:8333
-[2a01:4f8:161:60a7::2]:8333
+[2a01:4f8:161:21ad::333:30]:8333
 [2a01:4f8:161:7026::2]:8333
-[2a01:4f8:161:9184::2]:8333
-[2a01:4f8:162:2108::2]:8333
-[2a01:4f8:162:218c::2]:8333
-[2a01:4f8:162:4443::2]:8333
-[2a01:4f8:162:51a3::2]:8333
+[2a01:4f8:162:4110::2]:8333
+[2a01:4f8:162:4348::2]:8333
+[2a01:4f8:171:1c1b::2]:8333
+[2a01:4f8:171:1c3::2]:8333
+[2a01:4f8:171:2258::2]:8333
+[2a01:4f8:171:2a70::2]:8333
+[2a01:4f8:171:2e1b::2]:8333
+[2a01:4f8:171:2f28::2]:8333
+[2a01:4f8:171:3248::2]:8333
+[2a01:4f8:171:380c::2]:8333
 [2a01:4f8:171:b93::2]:8333
-[2a01:4f8:190:1483::1]:8333
-[2a01:4f8:190:4495::2]:8333
-[2a01:4f8:190:64c9::2]:8333
+[2a01:4f8:171:d0a::2]:8333
+[2a01:4f8:172:116c::2]:8333
+[2a01:4f8:172:1287::2]:8333
+[2a01:4f8:172:17a9::2]:8333
+[2a01:4f8:172:1ca7::2]:8333
+[2a01:4f8:172:2159::2]:8333
+[2a01:4f8:172:3a41::2]:8333
+[2a01:4f8:172:3b42::2]:8333
+[2a01:4f8:172:3ec1::2]:8333
+[2a01:4f8:172:3ec2::2]:8333
+[2a01:4f8:172:aeb::2]:8333
+[2a01:4f8:172:aec::2]:8333
+[2a01:4f8:173:10ab::2]:8333
+[2a01:4f8:173:1551::2]:8333
+[2a01:4f8:173:1bca::2]:8333
+[2a01:4f8:173:1e2e::2]:8333
+[2a01:4f8:173:2162::2]:8333
+[2a01:4f8:173:21e6::2]:8333
+[2a01:4f8:173:42::2]:8333
+[2a01:4f8:173:cc1::2]:8333
+[2a01:4f8:190:1253::2]:8333
+[2a01:4f8:190:24eb::2]:8333
+[2a01:4f8:190:34f0::2]:8333
+[2a01:4f8:190:528d::2]:8333
 [2a01:4f8:190:91ce::2]:8333
 [2a01:4f8:191:2194::83]:8333
 [2a01:4f8:191:40e8::2]:8333
-[2a01:4f8:191:44b4::2]:8333
-[2a01:4f8:191:8242::2]:8333
-[2a01:4f8:191:83a2::2]:8333
-[2a01:4f8:192:11b2::2]:8333
+[2a01:4f8:191:8165::2]:22556
+[2a01:4f8:191:81b7::2]:8333
+[2a01:4f8:191:8328::3]:8333
+[2a01:4f8:192:11b2::2]:8343
 [2a01:4f8:192:216c::2]:8333
-[2a01:4f8:192:22b3::2]:8333
+[2a01:4f8:192:22af::2]:8333
+[2a01:4f8:192:2422::2]:8333
+[2a01:4f8:192:34d0::2]:8333
 [2a01:4f8:192:440b::2]:8333
+[2a01:4f8:192:5230::2]:8333
 [2a01:4f8:192:db::2]:8333
 [2a01:4f8:200:1012::2]:8333
-[2a01:4f8:200:23d1::dead:beef]:8333
-[2a01:4f8:200:506d::2]:8333
-[2a01:4f8:200:51f0::2]:8333
-[2a01:4f8:200:5389::2]:8333
-[2a01:4f8:200:53e3::2]:8333
-[2a01:4f8:200:6344::2]:8333
-[2a01:4f8:200:6396::2]:8333
-[2a01:4f8:200:63af::119]:8333
-[2a01:4f8:200:71e3:78b4:f3ff:fead:e8cf]:8333
-[2a01:4f8:201:214c::2]:8333
-[2a01:4f8:201:233:1::3]:8333
-[2a01:4f8:201:3e3::2]:8333
+[2a01:4f8:200:414e::2]:8333
+[2a01:4f8:200:416a::2]:8333
+[2a01:4f8:201:21a7::2]:8333
+[2a01:4f8:201:4017::11]:8333
 [2a01:4f8:201:6011::4]:8333
 [2a01:4f8:201:60d5::2]:8333
-[2a01:4f8:202:265::2]:8333
-[2a01:4f8:202:3115::2]:8333
+[2a01:4f8:202:12d6::2]:8333
 [2a01:4f8:202:31e3::2]:8333
-[2a01:4f8:202:31ef::2]:8333
-[2a01:4f8:202:3392::2]:8333
+[2a01:4f8:202:32c6::2]:8333
 [2a01:4f8:202:53c3::2]:8333
-[2a01:4f8:202:63f4::2]:8333
-[2a01:4f8:202:7227::2]:8333
-[2a01:4f8:210:2227::2]:8333
-[2a01:4f8:210:24aa::2]:8333
 [2a01:4f8:211:14cf::2]:8333
-[2a01:4f8:211:181b::2]:8333
-[2a01:4f8:212:289e::2]:8333
-[2a01:4f8:212:33db::2]:18333
-[2a01:4f8:a0:112f::2]:8333
-[2a01:4f8:a0:3174::2]:8333
-[2a01:4f8:a0:328c::2]:8333
-[2a01:4f8:a0:5243::2]:8333
-[2a01:4f8:c17:19b9::2]:8333
-[2a01:4f8:c17:1a41::2]:8333
-[2a01:4f8:c17:1a92::2]:8333
-[2a01:4f8:c17:273::2]:8333
-[2a01:4f8:c17:435::2]:8333
-[2a01:4f8:c17:755::2]:8333
-[2a01:4f8:c17:b54::2]:8333
-[2a01:4f8:d16:9384::2]:8333
+[2a01:4f8:211:1ec5::2]:8333
+[2a01:4f8:211:483::2]:8333
+[2a01:4f8:211:d99::8]:8333
+[2a01:4f8:212:1826::2]:8333
+[2a01:4f8:212:27a8::2]:8333
+[2a01:4f8:221:801::2]:8333
+[2a01:4f8:a0:12cc::2]:8333
+[2a01:4f8:a0:746a:101:1:1:2]:8333
+[2a01:4f8:a0:828a::2]:8333
+[2a01:4f8:c17:2eef::2]:8333
+[2a01:4f8:c17:2f3c::2]:3333
+[2a01:4f8:c17:3b02::2]:8333
+[2a01:4f8:c17:4245::2]:8333
+[2a01:4f8:c17:464f::2]:8333
+[2a01:4f8:c17:4a1c::2]:8333
+[2a01:4f8:c17:4c5d::2]:8333
+[2a01:4f8:c17:67f8::2]:8333
+[2a01:4f8:c17:6dd0::2]:8333
+[2a01:4f8:c17:710b::2]:8333
+[2a01:4f8:c17:714::2]:8333
+[2a01:4f8:c17:72c6::2]:8333
 [2a01:608:ffff:a009:8bf5:879d:e51a:f837]:8333
-[2a01:680:10:10:f2de:f1ff:fec9:dc0]:8333
-[2a01:7c8:aaac:1f6:5054:ff:fe30:e585]:8333
-[2a01:7c8:aaac:20b:5054:ff:fe24:435e]:8333
+[2a01:680:10:10::1]:8333
+[2a01:6f0:ffff:120::8dcb]:8333
+[2a01:79c:cebc:857c:98c1:88ff:fef5:90de]:8333
+[2a01:79d:7377:2629:7e57:7e57:1:1]:8333
 [2a01:7c8:aaac:43d:5054:ff:fe4e:3dd4]:8333
-[2a01:7c8:aaad:256::1]:8333
-[2a01:7c8:aab6:ea:5054:ff:feff:eac3]:8333
-[2a01:7c8:aab9:5a:5054:ff:fe89:7b26]:8333
-[2a01:7c8:aabc:2c8:5054:ff:fe35:6581]:8333
-[2a01:7e00::f03c:91ff:fe18:301e]:8333
-[2a01:7e00::f03c:91ff:fe18:3942]:8333
+[2a01:7c8:aab5:3e6:5054:ff:fed7:4e54]:8333
+[2a01:7c8:aabd:3d5:5054:ff:fe95:f586]:8333
+[2a01:7c8:aac1:453:d0d2:af96:fa88:5d0e]:8333
+[2a01:7c8:aac3:663:5054:ff:fe25:8c69]:8333
+[2a01:7c8:aac3:97:5054:ff:fea7:3780]:8333
+[2a01:7c8:aac4:567:5054:ff:fedc:518a]:8333
 [2a01:7e00::f03c:91ff:fe26:8c87]:8333
-[2a01:7e00::f03c:91ff:fe50:6206]:8333
-[2a01:7e00::f03c:91ff:fe67:559d]:8333
-[2a01:7e00::f03c:91ff:fe84:434f]:8333
+[2a01:7e00::f03c:91ff:fe50:94b8]:8333
+[2a01:7e00::f03c:91ff:fe55:2c]:8333
 [2a01:7e00::f03c:91ff:fe89:1143]:8333
-[2a01:7e00::f03c:91ff:fe98:2505]:8333
-[2a01:7e00::f03c:91ff:fedb:352e]:8333
-[2a01:7e01::f03c:91ff:fec8:d7b5]:8333
-[2a01:e34:ee33:1640:c504:f677:b28a:ba42]:8333
-[2a01:e35:2e7e:bc0:e079:f55e:cef3:b5d7]:8333
+[2a01:7e00::f03c:91ff:fe89:53fd]:8333
+[2a01:7e00::f03c:91ff:fedf:b70f]:8333
+[2a01:b000::4166:515b:ef9e:b3]:8333
+[2a01:b2e0:2::40]:8333
+[2a01:e34:ec29:24c0:f3:ddaf:9f59:586f]:8333
+[2a01:e34:eed7:6670:ec1b:bf7c:b012:6069]:8333
 [2a01:e35:2ee5:610:21f:d0ff:fe4e:7460]:8333
 [2a01:e35:8a3f:47c0:c617:feff:fe3c:9fbd]:8333
-[2a01:e35:8aca:6a0:211:aff:fe5e:295e]:8333
-[2a02:180:a:18:81:7:11:50]:8333
-[2a02:1810:1d87:6a00:5604:a6ff:fe60:d87d]:8333
-[2a02:2168:1144:5c01:d63d:7eff:fedd:4f8e]:8333
-[2a02:2498:6d7b:7001:b508:b39d:2cea:5b7a]:8333
-[2a02:2528:503:2::15]:8333
-[2a02:2528:fa:1a56:216:44ff:fe6a:d112]:8333
-[2a02:27f8:2012:0:e9f7:268f:c441:6129]:8333
+[2a01:e35:8bff:70b0:1e1b:dff:fe0b:236d]:8333
+[2a02:1205:34c3:a4e0:d63d:7eff:fe98:10c8]:8333
+[2a02:1205:34da:aa00:5882:249d:ddbf:bc43]:8333
+[2a02:1205:5051:a640:d6ae:52ff:fea3:ac]:8333
+[2a02:1205:c689:d980:baae:edff:feea:9445]:8333
+[2a02:120b:2c2a:5ec0:10dd:31ff:fe42:5079]:8333
+[2a02:120b:2c35:69d0:219:99ff:fe6b:4ec3]:8333
+[2a02:120b:c3c2:ff60:21f:5bff:fec3:a7ad]:24312
+[2a02:13b8:4000:1000:216:e6ff:fe92:8619]:8333
+[2a02:13b8:4000:1000::27]:8333
+[2a02:17d0:2a:4400:40f:3dd4:b053:47ad]:8333
+[2a02:180:1:1::517:afb]:8333
+[2a02:180:6:1::18]:8333
+[2a02:1810:1d11:f900:6872:f28e:8126:f635]:8333
+[2a02:27a8:0:1:52e5:49ff:fee3:3b49]:8333
 [2a02:348:86:3011::1]:8333
-[2a02:4780:1:1::1:8a01]:8333
-[2a02:578:5002:116::2]:8333
+[2a02:390:9000:0:218:7dff:fe10:be33]:8333
+[2a02:582:78c1:7600:2d49:6212:29d3:abb]:8333
 [2a02:6080::1:190b:69e3]:8333
-[2a02:6080::1:e893:d9d6]:8333
-[2a02:770:4000::139]:8333
+[2a02:750:7:3305::575]:8333
+[2a02:752:100:3::53]:8333
+[2a02:7aa0:1201::7501:d950]:8333
 [2a02:7aa0:1201::deb3:81a2]:8333
-[2a02:8010:b001::5860:59b5]:8333
-[2a02:810d:21c0:f00:a248:1cff:feb8:5348]:8333
-[2a02:a50::21b:24ff:fe93:4e39]:8333
-[2a02:a80:0:1200::2]:8333
-[2a02:c200:0:10:2:1:5830:1]:8333
-[2a02:c200:0:10:2:5:4692:1]:8333
-[2a02:c200:0:10:3:0:7158:1]:8333
-[2a02:c200:0:10::2244:1]:8333
-[2a02:c200:1:10:2:3:3339:1]:8333
-[2a02:c200:1:10:2:3:7844:1]:8333
-[2a02:c200:1:10:2:5:6288:1]:8333
-[2a02:c200:1:10:3:0:5912:1]:8333
+[2a02:7aa0:1619::a037:69a6]:8333
+[2a02:810d:14c0:8694:d250:99ff:fe81:23d9]:8333
+[2a02:a50::dacb:8aff:fe36:8d2d]:8333
+[2a02:c200:0:10:3:0:2591:1]:8333
+[2a02:c200:1:10:2:5:9982:1]:8333
+[2a02:c200:1:10:3:0:9290:1]:8333
+[2a02:c205:3000:7158::1]:8333
+[2a02:c205:3001:4522::1]:8333
+[2a02:c205:3001:6549::1]:8333
+[2a02:c207:2008:3772::1]:8333
+[2a02:c207:2008:6519::1]:8333
+[2a02:c207:2009:213::1]:8333
+[2a02:c207:2009:7858::1]:8333
+[2a02:c207:2010:302::1]:8333
+[2a02:c207:3001:5824::1]:8333
+[2a02:ce80:0:20::1]:8333
 [2a03:4000:2:496::8]:8333
+[2a03:4000:6:416c::53]:8333
 [2a03:4000:6:8009::1]:8333
-[2a03:4000:6:8063::bcd0]:8333
-[2a03:4900:fffc:b::2]:8333
-[2a03:b0c0:1:d0::d:5001]:8333
+[2a03:4000:9:8e::1]:8333
+[2a03:7380:2140:17:51fe:3519:b571:4a13]:8333
+[2a03:b0c0:0:1010::7a3:1001]:8333
+[2a03:b0c0:0:1010::7aa:4001]:8333
+[2a03:b0c0:3:d0::1b99:c001]:8333
+[2a03:b0c0:3:d0::1b99:e001]:8333
+[2a03:b0c0:3:d0::1b9a:3001]:8333
+[2a03:b0c0:3:d0::2208:6001]:8333
+[2a03:b0c0:3:d0::23f7:1001]:8333
+[2a03:b0c0:3:d0::23f7:9001]:8333
+[2a03:b0c0:3:d0::23fb:2001]:8333
+[2a03:b0c0:3:d0::23fb:3001]:8333
+[2a03:b0c0:3:d0::23fb:5001]:8333
+[2a03:b0c0:3:d0::23fb:7001]:8333
+[2a03:b0c0:3:d0::2400:1]:8333
+[2a03:b0c0:3:d0::2400:3001]:8333
+[2a03:b0c0:3:d0::2400:e001]:8333
+[2a03:b0c0:3:d0::2401:e001]:8333
+[2a03:b0c0:3:d0::2402:2001]:8333
+[2a03:b0c0:3:d0::2402:8001]:8333
+[2a03:b0c0:3:d0::2402:9001]:8333
+[2a03:b0c0:3:d0::2402:b001]:8333
+[2a03:b0c0:3:d0::2402:d001]:8333
+[2a03:b0c0:3:d0::2403:1001]:8333
+[2a03:b0c0:3:d0::2403:2001]:8333
+[2a03:b0c0:3:d0::2403:4001]:8333
+[2a03:b0c0:3:d0::2403:6001]:8333
+[2a03:b0c0:3:d0::2403:a001]:8333
+[2a03:b0c0:3:d0::2403:b001]:8333
+[2a03:b0c0:3:d0::2403:f001]:8333
+[2a03:b0c0:3:d0::2404:6001]:8333
+[2a03:b0c0:3:d0::2404:b001]:8333
 [2a03:f80:ed15:149:154:155:235:1]:8333
-[2a03:f80:ed15:149:154:155:241:1]:8333
-[2a03:f80:ed16:ca7:ea75:b12d:2af:9e2a]:8333
-[2a04:1980:3100:1aab:290:faff:fe70:a3d8]:8333
-[2a04:1980:3100:1aab:e61d:2dff:fe29:f590]:8333
-[2a04:2f80:6:200::89]:8333
-[2a04:ac00:1:4a0b:5054:ff:fe00:5af5]:8333
-[2a04:ad80:0:68::35da]:8333
-3ffk7iumtx3cegbi.onion:8333
+[2a04:1980:3100:1aac:e61d:2dff:fe29:f241]:8333
+[2a04:1980:3100:1aac:e61d:2dff:fe29:f251]:8333
+[2a04:2180:0:1::5a49:3c06]:8333
+[2a04:2180:1:7::3]:8333
+[2a04:2e00:5:2e:9a4b:e1ff:fe62:6dc0]:8333
+[2a04:3542:1000:910:8492:b8ff:fe91:711d]:8333
+[2a04:dbc3:fffe:0:e61f:13ff:fe95:8401]:8333
+[2a06:9fc0:2a06:9fc0:2a06:9fc1:67c:e706]:8333
+[2c0f:f738:2004:82::]:8333
+2hryb3uh3tzwgnya.onion:8333
 3nmbbakinewlgdln.onion:8333
-4j77gihpokxu2kj4.onion:8333
-546esc6botbjfbxb.onion:8333
-5at7sq5nm76xijkd.onion:8333
-77mx2jsxaoyesz2p.onion:8333
-7g7j54btiaxhtsiy.onion:8333
-a6obdgzn67l7exu3.onion:8333
-ab64h7olpl7qpxci.onion:8333
-am2a4rahltfuxz6l.onion:8333
-azuxls4ihrr2mep7.onion:8333
-bitcoin7bi4op7wb.onion:8333
-bitcoinostk4e4re.onion:8333
+3qeri3tmhzmpegyv.onion:8333
+4wdknmecghcmclq5.onion:8333
+53tsjt6zq3iasv5q.onion:8333
+5cg7qeywvwo6vxpt.onion:8333
+5gbcrgqxcbxj253s.onion:8333
+6cn4ilbwkrkh7gwo.onion:8333
+6e4jrnn7igeqxmlf.onion:8333
+6ymgbvnn6d5nfmv4.onion:8333
+6zsh3bfduhpo7ldl.onion:8333
+72fq6phv4fg4rhvh.onion:8333
+7gdqp6npusk4lfwk.onion:8333
+a7emxol55e623lqc.onion:8333
+assbiydziq77zaki.onion:8333
+bafk5ioatlgt7dgl.onion:8333
 bk7yp6epnmcllq72.onion:8333
-bmutjfrj5btseddb.onion:8333
-ceeji4qpfs3ms3zc.onion:8333
-clexmzqio7yhdao4.onion:8333
+brwqezn6le54w2bb.onion:8333
+bs4bq6s6qkvt5hpi.onion:8333
+bup5n5e3kurvjzf3.onion:8333
+c2tpqkaz4ihjzwgb.onion:8333
+cernrmrk5zomzozn.onion:8333
+cfyegj64ht3jpodr.onion:8333
+cg5vg54cazzpvoug.onion:8333
+cgk4u2lxrvml4jvb.onion:8333
+cjygd7pu5lqkky5j.onion:8333
+d6wubsdtr46dd5ki.onion:8333
+dfq6yjc3aelplwr4.onion:8333
+dqpxwlpnv3z3hznl.onion:8333
+eamfospuveabaimd.onion:8333
+ep2mjzox3kvb6ax4.onion:8333
+fpbxb4wjudiw2w5a.onion:8333
+fu5hfsbbf5jwsvhv.onion:8333
+g4freoibsczujle3.onion:8333
 gb5ypqt63du3wfhn.onion:8333
-h2vlpudzphzqxutd.onion:8333
-n42h7r6oumcfsbrs.onion:4176
-ncwk3lutemffcpc4.onion:8333
+ggdy2pb2avlbtjwq.onion:8333
+gh2aiddzxmvyrnue.onion:8333
+gnxgylbgzvaazkq7.onion:8333
+hnizdxnejel64ubk.onion:8333
+htvdcmlc3abji2ab.onion:8443
+hwuboois4gslupgx.onion:8333
+hxz6gowludlj6d5a.onion:8333
+j6umo4bnsztpsonc.onion:8333
+jdunmaocwbbnw565.onion:8333
+ktv3qlxl7xvmdlf4.onion:8333
+kvd44sw7skb5folw.onion:8333
+kwimnzm6vd4zakvl.onion:8333
+la5xhk3lprxzxmz2.onion:8333
+lc7cx67end26uutp.onion:8352
+mwu5og2agcspmgkx.onion:8333
+mzxkipiyekaoh7my.onion:8333
+n6rwlrtwpqc7qwo7.onion:8333
+nj36424yccqph62z.onion:8333
+o256w7t3vcgktmxk.onion:8333
+o4sl5na6jeqgi3l6.onion:8333
 okdzjarwekbshnof.onion:8333
-pjghcivzkoersesd.onion:8333
-rw7ocjltix26mefn.onion:8333
-uws7itep7o3yinxo.onion:8333
-vk3qjdehyy4dwcxw.onion:8333
+oyebydl2pacx6v26.onion:8333
+p5mx2imj75dpmime.onion:8333
+psco6bxjewljrczx.onion:8333
+pxtgswet6tlgrbwj.onion:8333
+rb4v3fhgx2zr4rre.onion:8333
+rjlnp3hwvrsmap6e.onion:8333
+rlafimkctvz63llg.onion:8333
+rxjvy5eyttep5tts.onion:8333
+seoskudzk6vn6mqz.onion:8333
+tpgdufxxsw3jkrdf.onion:8333
+tuiyvqgi3o675pjb.onion:8333
+tx4zd7d5exonnblh.onion:8333
+uokg6avfgbhofls3.onion:8333
+v3gjphgqy5hygcml.onion:8333
+vhdoxqq63xr53ol7.onion:8333
+visevrizz3quyagj.onion:8333
 vqpye2k5rcqvj5mq.onion:8333
-wpi7rpvhnndl52ee.onion:8333
+wfsx2gi7djhy22hk.onion:8333
+wg6vwmbrzyyzapun.onion:8333
+xub4w3w4wwk56xiq.onion:8333
+ycivnom44dmxx4ob.onion:8333
+ywskufc62bf2fum4.onion:8333
+z4fax2vxg23t2ddf.onion:8333
+zo5dklwelmdrpo5n.onion:8333
diff --git a/src/chainparamsseeds.h b/src/chainparamsseeds.h
index 1406e86805d67..396a411689a81 100644
--- a/src/chainparamsseeds.h
+++ b/src/chainparamsseeds.h
@@ -8,943 +8,1174 @@
  * IPv4 as well as onion addresses are wrapped inside a IPv6 address accordingly.
  */
 static SeedSpec6 pnSeed6_main[] = {
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x05,0x02,0x91,0xc9}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x05,0x16,0x8e,0xd6}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x05,0x35,0xac,0xc5}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x05,0xbd,0xa1,0xa4}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x05,0xe6,0x8c,0xa6}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x05,0xe7,0x03,0x82}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x05,0xff,0x50,0x67}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x0e,0xca,0xe6,0x31}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x12,0x55,0x0b,0x82}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x17,0x5b,0x61,0x19}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x17,0x5e,0x64,0x7a}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x17,0x5f,0x63,0x84}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x18,0x73,0x08,0xce}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x18,0x7f,0x80,0xbf}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x18,0x9a,0xb2,0x19}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x18,0xcf,0x67,0x2b}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x18,0xcf,0x68,0x69}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x18,0xd2,0xe6,0x96}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x18,0xe0,0x12,0x54}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x18,0xf6,0xa8,0x6a}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x1b,0xfe,0x40,0x2f}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x1f,0x06,0x47,0x7b}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x1f,0x06,0x47,0x7c}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x1f,0x0e,0x86,0x0d}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x1f,0x1e,0x24,0xdc}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x1f,0xa4,0x06,0x68}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x02,0x07,0x08,0x0c}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x02,0xe4,0x46,0xc6}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x05,0x27,0x40,0x07}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x05,0x2d,0x50,0x22}, 38333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x05,0x33,0xa0,0x26}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x05,0x3d,0x21,0x21}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x05,0x3d,0x25,0x0c}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x05,0x5f,0x50,0x2f}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x05,0x66,0xa4,0xad}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x05,0xaf,0x47,0x82}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x05,0xbd,0xa5,0x16}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x05,0xc7,0x82,0xe4}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x05,0xe4,0x64,0xde}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x05,0xff,0x40,0xe7}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x0d,0x5d,0x06,0x85}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x12,0x55,0x22,0x0a}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x12,0xf1,0x00,0x3f}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x17,0x1c,0x80,0x41}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x17,0xf8,0x71,0x34}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x17,0xfd,0x97,0x49}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x18,0x04,0x60,0x79}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x18,0x45,0x41,0xbf}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x18,0x57,0x08,0x2b}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x18,0x96,0xe0,0x6e}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x18,0xe3,0x45,0x92}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x1b,0x00,0xeb,0x21}, 8333},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x1f,0xaa,0x6a,0xcb}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x1f,0xb9,0x86,0xc9}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x1f,0xcc,0x80,0x63}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x1f,0xcc,0x80,0xdb}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x25,0x01,0xdb,0x58}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x25,0x61,0x84,0x6d}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x25,0x78,0xa0,0x37}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x1f,0xb8,0xc5,0x60}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x1f,0xd6,0xf0,0x38}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x25,0x01,0xca,0x86}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x25,0x12,0x4a,0xe8}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x25,0x22,0x30,0x11}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x25,0x30,0x40,0x8c}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x25,0x61,0x8d,0x74}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x25,0x78,0xa4,0x10}, 8333},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x25,0x78,0xa9,0x7b}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x25,0x8b,0x20,0x2e}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x25,0xdd,0xa3,0xda}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x26,0x82,0xc0,0x48}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x29,0x4b,0x60,0x50}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2d,0x03,0x00,0x31}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2d,0x21,0x48,0xb9}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2d,0x21,0x60,0x81}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2d,0x38,0x04,0x3f}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2d,0x4f,0x00,0x7f}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2d,0x4f,0x50,0x66}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2d,0x4f,0x61,0x1e}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2d,0x4f,0x84,0xdb}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2e,0x15,0x61,0x87}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2e,0x1c,0xcd,0x43}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2e,0x1c,0xce,0xbc}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2e,0x1d,0x14,0xd1}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2e,0x32,0xea,0xb3}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2e,0x65,0xa0,0xa8}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2e,0xa6,0xa1,0x23}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2e,0xa6,0xa1,0x67}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2e,0xb6,0x84,0x64}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2e,0xda,0xe3,0x5c}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2e,0xe2,0x6d,0x14}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2e,0xe3,0x42,0x84}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2e,0xe3,0x42,0x8a}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2e,0xe5,0xa5,0x9a}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2e,0xe5,0xa5,0x9b}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x25,0x8f,0x09,0x80}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x25,0x99,0xac,0xe3}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x25,0xc1,0xe3,0x10}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x25,0xcd,0x08,0x4e}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x25,0xdc,0x00,0x72}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x25,0xe8,0xda,0xc7}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x26,0x8c,0xa1,0x35}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x28,0x57,0x46,0x78}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x29,0xa2,0xa3,0x5d}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2a,0x02,0xc6,0x30}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2d,0x14,0x43,0x01}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2d,0x37,0xc5,0x4d}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2d,0x38,0x61,0x3f}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2d,0x3a,0x26,0xa2}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2d,0x3f,0x01,0x21}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2d,0x4f,0x02,0x46}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2e,0x10,0xf0,0x62}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2e,0x13,0x89,0x4a}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2e,0x1c,0xce,0x92}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2e,0x20,0xfc,0xc5}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2e,0x3b,0x0d,0x3b}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2e,0x3b,0x27,0xc3}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2e,0x94,0x10,0xd2}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2e,0xa0,0xc3,0x79}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2e,0xa6,0x8e,0x15}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2e,0xa6,0xa0,0x1d}, 8330},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2e,0xbc,0x2c,0x14}, 8333},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2e,0xe5,0xee,0xbb}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2e,0xea,0x68,0x30}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2e,0xef,0x6b,0x4a}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2e,0xf4,0x00,0x8a}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2e,0xfe,0x48,0xc3}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x32,0x05,0x0d,0x2c}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x32,0x07,0x25,0x72}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x32,0x1e,0x25,0x67}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x32,0x27,0x69,0x3c}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x32,0x6a,0x28,0xe7}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x34,0x1d,0x00,0x25}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x34,0x4c,0xc0,0xf6}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x36,0x98,0xc0,0xb3}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x36,0xa9,0x40,0xae}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x36,0xaf,0xa0,0x16}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x36,0xc7,0x80,0x00}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x3a,0x60,0xab,0x81}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x3a,0xa1,0xee,0x39}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x3c,0xfb,0xc3,0xdd}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x3d,0x23,0xe1,0x13}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2e,0xe7,0x10,0x95}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2f,0x58,0x64,0x82}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2f,0x59,0xc0,0x86}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2f,0xb9,0xc2,0xa0}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2f,0xbd,0x81,0xda}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x31,0x41,0x02,0x8c}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x32,0x03,0x48,0x81}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x32,0x1f,0x63,0xe1}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x33,0xaf,0x21,0x5f}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x34,0x01,0xa5,0xdb}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x34,0x0a,0xaa,0xba}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x34,0x33,0x80,0xd8}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x36,0xc5,0x82,0xf4}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x3a,0x3b,0x02,0x16}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x3a,0x54,0x06,0x51}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x3b,0x7d,0x08,0x8f}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x3b,0xa7,0x82,0x8b}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x3d,0x2f,0x02,0x14}, 8333},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x3e,0x2b,0x82,0xb2}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x3e,0x41,0x27,0x0c}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x3e,0x4c,0x60,0x06}, 8333},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x3e,0x6b,0xc8,0x1e}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x3e,0x85,0x0f,0x3a}, 8333},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x3e,0x85,0xc2,0x02}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x3e,0xb5,0xee,0xba}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x3e,0xb7,0x16,0x32}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x3e,0xd2,0x55,0x78}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x3e,0xd2,0xa2,0x59}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x3e,0x85,0xc2,0x9c}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x3e,0x8a,0x01,0x5f}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x3e,0xd8,0xee,0x03}, 8333},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x3e,0xee,0x22,0x7d}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x40,0x19,0xab,0x49}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x40,0x1b,0xa6,0x1e}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x40,0x35,0x89,0x65}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x40,0x47,0x48,0x2c}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x3f,0x89,0x28,0xcf}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x3f,0xe7,0x60,0x6d}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x40,0x4e,0xf0,0x96}, 8333},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x40,0x53,0xe1,0x92}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x40,0x79,0x03,0xa3}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x40,0xcb,0x66,0x56}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x41,0x5e,0x83,0x3b}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x41,0xbc,0x88,0xe9}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x42,0x0b,0xa2,0xda}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x42,0x17,0xe4,0x85}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x42,0x5a,0x89,0x59}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x42,0x72,0x21,0x31}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x42,0x96,0x69,0x4d}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x40,0x89,0xec,0x44}, 8833},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x40,0x9c,0xc1,0x78}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x42,0x4f,0xa0,0x52}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x42,0x5b,0xe6,0xe7}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x42,0x87,0x80,0x79}, 8333},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x42,0xac,0x0a,0x04}, 8333},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x42,0xc2,0x26,0xfa}, 8333},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x42,0xc2,0x26,0xfd}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x42,0xc2,0x26,0xfe}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x42,0xe7,0x61,0xac}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x42,0xd7,0x22,0x1a}, 8333},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x42,0xf0,0xed,0x9b}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x43,0x9f,0x0d,0x22}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x43,0xcd,0x4a,0xce}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x43,0xcd,0x60,0x6c}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x43,0xcd,0x80,0x05}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x43,0xdb,0xe9,0x8c}, 8333},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x43,0xdd,0xc1,0x37}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x43,0xe3,0x48,0x11}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x44,0x41,0x78,0x35}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x44,0x41,0xcd,0xe2}, 9000},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x44,0x90,0x04,0x22}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x45,0x27,0x31,0xc7}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x44,0x64,0xc4,0x76}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x44,0x84,0xc1,0xde}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x44,0xa8,0x76,0xea}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x45,0x0b,0x61,0x2b}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x45,0x1e,0xe5,0x0a}, 8333},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x45,0x32,0xab,0xcd}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x45,0x41,0x29,0x15}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x45,0x71,0x62,0x3d}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x45,0x77,0x61,0x27}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x45,0x92,0x46,0x7c}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x45,0xc1,0x47,0x02}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x46,0x2e,0x0a,0xed}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x46,0x50,0xc8,0xbb}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x46,0xb9,0x61,0x75}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x47,0xfe,0xa0,0x19}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x48,0x1c,0xcb,0x05}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x48,0x34,0x82,0x6e}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x48,0x53,0xc2,0x7a}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x48,0x80,0x20,0xa7}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x48,0xb3,0x88,0x50}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x48,0xeb,0x26,0x46}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4a,0x32,0x2c,0xc1}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4a,0x48,0x3c,0x53}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4a,0x50,0xea,0x74}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4a,0xcf,0xe9,0xc1}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4b,0x70,0xe9,0x80}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4b,0x76,0xa6,0xc5}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4b,0x8c,0x00,0xf1}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4b,0x9f,0xf0,0x42}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4b,0xae,0x05,0x1a}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4c,0x48,0xa0,0xfc}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4c,0x48,0xa0,0xfe}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4c,0x4a,0xaa,0x70}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4c,0x4f,0xc9,0x36}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4c,0xaf,0xa6,0xa4}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4c,0xb3,0x69,0x1b}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4d,0x44,0x25,0xc8}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4d,0xea,0x31,0xc4}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4d,0xf7,0xe5,0x5d}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4e,0x18,0x48,0x4e}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4e,0x2f,0x20,0x93}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4e,0x54,0x64,0x5f}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4e,0x79,0x45,0x17}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4e,0x81,0xa7,0x05}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4e,0xc1,0x60,0x9b}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4f,0x13,0x25,0xb3}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x45,0x7d,0xc1,0x91}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x45,0xa2,0x8b,0x7d}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x46,0x23,0x62,0x27}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x46,0x70,0x20,0x1d}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x47,0x7e,0xb5,0x92}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x48,0xb4,0x20,0x69}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x49,0xe2,0x40,0x91}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4a,0x53,0x8c,0xf2}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4a,0x54,0x80,0x9e}, 9333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4a,0x7a,0xed,0x7c}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4a,0xd7,0x85,0x91}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4b,0x4c,0x65,0xa9}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4b,0x55,0x0d,0x08}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4b,0x56,0xa8,0x0d}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4b,0xaa,0x61,0x19}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4b,0xb1,0x89,0x86}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4c,0x4c,0xe3,0x88}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4d,0x35,0x88,0x06}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4d,0x6e,0x0b,0x34}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4e,0x19,0x20,0xce}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4e,0x22,0x08,0x78}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4e,0x2e,0x20,0x63}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4e,0x38,0x09,0xd6}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4e,0x38,0xe5,0xb1}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4e,0x81,0xed,0xf5}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4e,0xc4,0xac,0x2d}, 8333},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4f,0x84,0xe6,0x90}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4f,0x85,0x2b,0x3f}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4f,0x86,0xc9,0x42}, 8333},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4f,0xa9,0x23,0xeb}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x50,0x39,0xe3,0x0e}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4f,0xac,0xc2,0xdb}, 8333},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x50,0x40,0x41,0x57}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x50,0x56,0x5c,0x46}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x50,0x64,0xcb,0x97}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x50,0x65,0x20,0x79}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x50,0xa1,0xb2,0x49}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x50,0xf0,0x81,0xaa}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x51,0x07,0x0b,0x32}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x51,0x07,0x0b,0x37}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x51,0x11,0x11,0x28}, 9333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x51,0x1e,0x27,0x53}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x51,0x5a,0x24,0x07}, 9444},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x51,0x88,0xe0,0x4d}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x51,0xa2,0xe7,0xd3}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x51,0xb8,0x00,0x8f}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x51,0xc6,0x80,0x56}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x50,0x59,0x89,0x73}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x50,0x5d,0x24,0xad}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x50,0x65,0xa7,0x64}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x50,0x72,0x22,0x9e}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x50,0x7f,0x88,0x32}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x50,0xbc,0x8b,0x52}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x50,0xde,0x27,0x4d}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x50,0xdf,0x69,0x45}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x50,0xe5,0x97,0xbb}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x50,0xf0,0x81,0xdd}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x51,0x07,0x0a,0xee}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x51,0x07,0x0d,0x54}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x51,0x1b,0x60,0x5c}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x51,0x23,0x8f,0x62}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x51,0x52,0xc9,0x05}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x51,0x53,0x60,0x05}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x51,0xa9,0xe3,0x24}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x51,0xab,0x02,0x77}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x51,0xab,0x26,0x82}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x51,0xaf,0xff,0x76}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x51,0xcf,0x08,0x31}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x51,0xe4,0xc2,0xbb}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x52,0x09,0x01,0x4d}, 8333},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x52,0x0b,0x21,0xe5}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x52,0x4f,0x80,0x86}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x52,0x76,0xe9,0x6f}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x52,0x87,0x8b,0x1e}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x52,0x66,0x0d,0x75}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x52,0x74,0xcb,0xf0}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x52,0x82,0x67,0x10}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x52,0x88,0x41,0xe3}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x52,0x9e,0xe3,0xee}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x52,0xc5,0xd4,0x19}, 8333},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x52,0xc7,0x66,0x0a}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x52,0xdd,0x6a,0x11}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x52,0xdd,0x6c,0x15}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x52,0xc8,0xcc,0x29}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x52,0xc8,0xcc,0x77}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x52,0xdd,0x69,0xdf}, 8333},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x52,0xdd,0x6c,0x1b}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x53,0x89,0x29,0x03}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x53,0x8e,0xc5,0xa8}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x52,0xdd,0x6f,0x88}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x52,0xdd,0x8b,0x61}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x53,0x89,0x29,0x0a}, 8333},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x53,0x8f,0x82,0x13}, 8333},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x53,0x96,0x09,0xc4}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x53,0xb7,0x11,0xbf}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x53,0xe3,0xad,0x53}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x53,0xe6,0x05,0x0f}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x53,0xe9,0x69,0x97}, 443},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x53,0xf6,0x4b,0x08}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x53,0xfa,0x85,0x9e}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x53,0xff,0x42,0x76}, 8334},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x54,0x18,0x45,0x3b}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x53,0xa9,0x02,0x2b}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x53,0xd9,0xcb,0x82}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x53,0xf9,0x58,0x34}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x54,0x1a,0xa2,0x5c}, 8333},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x54,0x2a,0xc1,0x06}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x54,0x2d,0x62,0x57}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x54,0x36,0x80,0x0b}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x54,0xd4,0xc8,0x18}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x54,0xd7,0xc6,0x6d}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x54,0xe6,0x04,0xb1}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x55,0x5f,0xe4,0x53}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x55,0x5f,0xe4,0x7b}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x55,0x72,0x80,0x86}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x55,0xd6,0x42,0xa8}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x55,0xd6,0x93,0xa2}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x55,0xf3,0xa8,0x04}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x56,0x01,0x00,0x12}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x57,0x4f,0x4d,0x6a}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x57,0x5b,0x9c,0x6e}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x57,0xec,0xc4,0xde}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x58,0x55,0x4b,0x98}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x58,0x57,0x01,0xe6}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x58,0x57,0x5c,0x66}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x58,0x59,0x45,0xca}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x58,0x61,0x48,0xe5}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x58,0xa4,0x75,0x63}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x58,0xc6,0x20,0x83}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x54,0x86,0xc2,0x73}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x54,0xc9,0x20,0x73}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x54,0xd4,0xe8,0x47}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x54,0xee,0x8c,0xb0}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x55,0x0a,0x68,0x22}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x55,0x15,0x90,0xe2}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x55,0x19,0xc2,0x0c}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x55,0x90,0x4f,0xbe}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x55,0x91,0xe4,0xc0}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x55,0xc2,0xee,0x82}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x55,0xe4,0xc9,0x50}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x55,0xe5,0xe4,0xae}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x55,0xec,0xe9,0x57}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x56,0x50,0xcc,0xb9}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x56,0x69,0xe3,0xbe}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x56,0x87,0x27,0x28}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x57,0x6a,0x8b,0x7f}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x57,0x78,0x08,0x05}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x57,0x78,0x25,0xe6}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x57,0xef,0x65,0x66}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x57,0xf3,0xc5,0x52}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x58,0x70,0x70,0xad}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x58,0x96,0xc0,0x11}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x58,0xb9,0x9b,0x86}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x58,0xca,0xca,0xdd}, 8333},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x58,0xca,0xe6,0x57}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x58,0xd6,0xc1,0x9a}, 8343},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x58,0xd6,0xc2,0xe2}, 8343},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x59,0x0a,0x9b,0x58}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x59,0x2e,0x65,0x2c}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x59,0xa3,0xe0,0xd4}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x59,0xae,0xf8,0x14}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x59,0xca,0xe7,0xc6}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x59,0xd4,0x4b,0x06}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x58,0xd0,0x27,0xb6}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x59,0x22,0x63,0x29}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x59,0xa3,0xe0,0xbb}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x59,0xa9,0xe9,0x96}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x59,0xb8,0x41,0x55}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x59,0xd4,0x5b,0xdb}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x59,0xf9,0xb2,0x24}, 8333},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5a,0x95,0x26,0xac}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5a,0xa9,0x6a,0x8b}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5b,0x40,0x65,0x96}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5b,0x41,0xc4,0xb3}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5b,0x79,0x50,0x11}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5b,0x7e,0x4d,0x4d}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5b,0x91,0x4c,0x9c}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5b,0x98,0x96,0x23}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5b,0xc0,0x89,0x11}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5b,0xc4,0xaa,0x6e}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5b,0x41,0x61,0x9d}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5b,0x6b,0x40,0x8f}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5b,0x72,0x23,0x6b}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5b,0x87,0x00,0xbb}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5b,0x91,0x6e,0x5f}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5b,0x9d,0x26,0x97}, 8333},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5b,0xc5,0x2c,0x85}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5b,0xcf,0x44,0x90}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5b,0xd2,0x69,0x1c}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5b,0xd3,0x66,0x65}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5b,0xd3,0x6a,0x22}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5b,0xd6,0xc8,0xcd}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5b,0xdc,0x2b,0x92}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5b,0xde,0x47,0x59}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5b,0xe0,0x8c,0xf2}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5b,0xe5,0x4c,0x0e}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5b,0xcd,0xb0,0x36}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5b,0xce,0xcb,0x0a}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5b,0xce,0xcb,0x12}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5b,0xd7,0x23,0x82}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5b,0xdb,0xef,0x9f}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5b,0xdf,0x85,0x02}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5b,0xdf,0x85,0x28}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5b,0xe2,0x0a,0x5a}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5b,0xf0,0x8d,0xa9}, 8333},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5c,0x1b,0x07,0xd1}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5c,0x33,0xa7,0x58}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5c,0xf7,0xe5,0xa3}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5d,0x54,0x72,0x6a}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5d,0x71,0x24,0xac}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5c,0x59,0x43,0xcf}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5c,0xdd,0xc9,0x8a}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5d,0x5f,0xbb,0x7a}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5d,0x67,0x49,0xbb}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5d,0x7b,0x50,0x2f}, 8333},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5d,0xbc,0xe0,0xfd}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5e,0x4b,0xef,0x45}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5e,0xbe,0xe3,0x70}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5e,0xd6,0x02,0x4a}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5e,0xe0,0xa2,0x41}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5e,0xec,0xc6,0xfd}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5d,0xbe,0x45,0xf2}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5e,0x13,0x0c,0xf4}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5e,0x9c,0x80,0x74}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5e,0xb1,0xab,0x49}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5e,0xb5,0x2c,0x68}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5e,0xed,0x1a,0xad}, 8333},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5e,0xf2,0xe5,0x9e}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5f,0x54,0x8a,0x63}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5f,0x5f,0xa8,0x57}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5e,0xff,0x80,0x62}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5f,0x4f,0x23,0x32}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5f,0x5b,0x29,0x27}, 8333},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5f,0x6e,0xea,0x5d}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5f,0x82,0x09,0xc8}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5f,0xa5,0xa8,0xa8}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5f,0xaa,0xeb,0xfe}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5f,0xd3,0x82,0x9a}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x60,0x2e,0x44,0x68}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x60,0x7f,0xca,0x94}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x61,0x4c,0xab,0x23}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x62,0xa0,0xa0,0x43}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x63,0x7e,0xc5,0xbb}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x63,0xc6,0xad,0x01}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x65,0x64,0xae,0x8a}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x65,0xa4,0xc9,0xd0}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x67,0xe0,0xa5,0x30}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x68,0x80,0xe1,0xdf}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5f,0x80,0x30,0xd1}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5f,0xb7,0x30,0x47}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x60,0x17,0x43,0x55}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x61,0x40,0xb1,0x0a}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x61,0x68,0xc9,0x5f}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x62,0x1d,0xc5,0x95}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x62,0xa9,0x02,0x6b}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x63,0xe8,0x30,0x48}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x65,0x64,0x8d,0x37}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x67,0x07,0x20,0x28}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x67,0x35,0xe1,0x45}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x67,0xf9,0x6a,0x4a}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x68,0x80,0xe0,0x0d}, 8333},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x68,0x80,0xe4,0xfc}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x68,0x83,0xc0,0x5e}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x68,0x9b,0x2d,0xc9}, 8334},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x68,0xc2,0x1c,0xc3}, 8663},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x68,0xd3,0x01,0x1b}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x68,0xdd,0x26,0xb1}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x68,0xec,0x09,0x4f}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x68,0xec,0x81,0xb2}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x68,0xec,0xba,0xf9}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x68,0xec,0xc2,0x0f}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x68,0xee,0x80,0xd6}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x68,0x9b,0x01,0x9e}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x68,0xa8,0x80,0x32}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x68,0xc7,0xa0,0xe4}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x68,0xcc,0x6d,0x0b}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x68,0xdb,0xfb,0x76}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x68,0xdf,0x03,0x81}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x68,0xdf,0x03,0xdb}, 8333},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x68,0xee,0x82,0xb6}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x6a,0x26,0xea,0x54}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x6a,0xb9,0x24,0xcc}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x6a,0xb9,0x26,0x43}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x6b,0x06,0x04,0x91}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x6b,0x96,0x02,0x06}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x6b,0x96,0x28,0xea}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x6b,0xaa,0x0d,0xb8}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x6b,0xb5,0xfa,0xd8}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x6b,0xbf,0x65,0x6f}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x6b,0xbf,0x6a,0x73}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x68,0xf5,0x63,0xe3}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x6a,0x26,0xea,0x59}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x6a,0x68,0x86,0xda}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x6b,0x88,0x06,0x47}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x6b,0x96,0x2d,0xd2}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x6b,0x97,0x90,0x67}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x6b,0xaa,0x2c,0x63}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x6b,0xb5,0x89,0x85}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x6b,0xbf,0x66,0x0d}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x6c,0x3a,0xfc,0x52}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x6c,0x3b,0x09,0xa7}, 8333},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x6c,0x3b,0x0c,0xa3}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x6c,0xa1,0x81,0xf7}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x6d,0xc1,0xa0,0x8c}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x6d,0xc5,0x0d,0x36}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x6d,0xe6,0x07,0xf8}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x6d,0xea,0x6a,0xbf}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x6d,0xec,0x89,0x50}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x6d,0xfb,0xa1,0x79}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x70,0x41,0xe7,0xe2}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x73,0x46,0xa6,0x39}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x73,0x9f,0x2a,0x50}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x75,0x12,0x49,0x22}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x76,0x43,0xc9,0x28}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x76,0x64,0x56,0xf6}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x76,0x6e,0x68,0x98}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x77,0xe0,0x40,0x8d}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x6c,0xa2,0x6a,0xd7}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x6c,0xa8,0x85,0xa4}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x6c,0xad,0xca,0x65}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x6c,0xb4,0x6e,0xbe}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x6d,0x1d,0x4b,0x28}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x6d,0x78,0xc2,0x88}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x6d,0xe6,0xe6,0x58}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x6d,0xeb,0x43,0x73}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x6d,0xeb,0x45,0x78}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x6d,0xec,0x5a,0xc7}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x6d,0xff,0x00,0x6b}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x6e,0x0a,0x82,0x0c}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x6e,0x0a,0xb0,0x5e}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x6e,0x84,0xac,0xfb}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x6f,0x5a,0x9e,0x11}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x73,0x42,0xcd,0xab}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x74,0x1f,0x7b,0x8b}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x76,0xc0,0x30,0x2e}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x76,0xc1,0xa4,0x62}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x77,0x1d,0x9c,0xe7}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x77,0x3f,0x2c,0x85}, 19980},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x77,0x51,0x63,0x1b}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x77,0x6a,0x0c,0xa9}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x77,0x93,0x89,0x9b}, 19980},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x77,0xb9,0x01,0xb6}, 8333},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x78,0x37,0xc1,0x88}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x7a,0x6a,0xa9,0xb2}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x7b,0xcb,0xae,0x0f}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x7b,0xff,0xe8,0x5e}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x7c,0x94,0xa5,0xa5}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x7c,0xe8,0x8d,0x1f}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x80,0x1e,0x5c,0x45}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x80,0x27,0x8d,0xb6}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x80,0x54,0xa7,0x14}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x80,0x6f,0x49,0x0a}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x80,0x7f,0x26,0xc3}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x79,0xfe,0xad,0x17}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x79,0xfe,0xad,0x28}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x7b,0x38,0x81,0x2d}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x7b,0xcb,0xa3,0x80}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x7b,0xce,0x20,0xc6}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x7c,0xbd,0xa0,0xdd}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x7c,0xbd,0xc0,0xe8}, 8333},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x80,0x8c,0xe0,0xa2}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x80,0xc7,0x65,0x68}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x80,0xe9,0xe0,0x23}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x80,0xfd,0x03,0xc1}, 20020},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x82,0xb4,0xe4,0x8a}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x82,0xb9,0x90,0xd5}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x82,0xff,0x49,0xcf}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x85,0xda,0xe9,0x0b}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x86,0xf9,0x80,0x17}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x88,0x9f,0xea,0xea}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x89,0x74,0xa0,0xb0}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x8b,0xa2,0x02,0x91}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x8b,0xa2,0x17,0x75}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x8d,0x86,0x45,0xfd}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x8d,0xff,0xa2,0xd7}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x90,0x7a,0xa3,0xbb}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x91,0x83,0x03,0x36}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x91,0xff,0x04,0x5e}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x92,0x00,0x20,0x65}, 8337},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x93,0x53,0x48,0x5b}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x94,0x67,0x1c,0x44}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x95,0x05,0x20,0x66}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x95,0xd2,0xa4,0xc3}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x96,0x65,0xa3,0xf1}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x97,0xec,0x0b,0xbd}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x98,0x03,0x88,0x38}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x9a,0x14,0xd0,0x19}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x9e,0xb5,0x68,0x95}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x9f,0xfd,0x60,0xe2}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xa0,0x24,0x82,0xb4}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x80,0xc7,0x44,0xcd}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x82,0xea,0xcf,0x73}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x83,0x71,0x29,0x7b}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x83,0x72,0x48,0x68}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x84,0xcc,0x6c,0x9b}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x86,0x77,0x0d,0xe6}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x86,0xd5,0x85,0xce}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x86,0xd5,0x85,0xcf}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x87,0x17,0x05,0x03}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x89,0x4a,0x00,0x42}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x8a,0x44,0x01,0x2d}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x8a,0x44,0x02,0xc2}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x8a,0x44,0x40,0x13}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x8a,0x44,0x40,0x1c}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x8b,0x3b,0x2a,0xf8}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x8b,0xdc,0xf0,0x99}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x8c,0x70,0x6b,0x76}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x8c,0xba,0xe0,0x70}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x8d,0x34,0x40,0x8d}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x8e,0x44,0xed,0x6b}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x8e,0xd9,0x0c,0x6a}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x92,0x3c,0xcc,0x5c}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x92,0xb9,0xa1,0xd1}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x94,0x67,0x07,0x77}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x95,0xd2,0x85,0xf4}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x96,0xe5,0x00,0x8f}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x97,0xe7,0xee,0x19}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x97,0xf8,0xa0,0xe3}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x99,0xe6,0xe4,0x0f}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x9b,0x85,0x2b,0xf9}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x9e,0x3a,0xee,0x91}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x9e,0x6d,0x4f,0x0d}, 34821},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x9f,0xcb,0x46,0xd0}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xa0,0x10,0xce,0x1f}, 8333},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xa2,0xd1,0x01,0xe9}, 8333},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xa2,0xd1,0x04,0x7d}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xa2,0xd1,0x6a,0x7b}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xa2,0xd2,0xc6,0xb8}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xa2,0xf8,0x63,0xa4}, 53011},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xa2,0xd8,0xc0,0xe7}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xa2,0xf3,0x64,0x6f}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xa2,0xf6,0x0b,0xc2}, 8333},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xa2,0xf8,0x66,0x75}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xa2,0xfb,0x6c,0x35}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xa3,0x2c,0x02,0x30}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xa3,0x9e,0x24,0x11}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xa6,0xe6,0x47,0x43}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xa7,0xa0,0x24,0x3e}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xa7,0xa0,0xa9,0x5c}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xa8,0x5d,0x81,0xdc}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xa9,0x37,0x63,0x54}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xa9,0xe4,0x42,0x2b}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xac,0x09,0xa9,0xf2}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xad,0x20,0x0b,0xc2}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xad,0xe6,0xe4,0x88}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xad,0xf6,0x6b,0x22}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xad,0xfe,0xeb,0x22}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xae,0x00,0x80,0xde}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xae,0x19,0x82,0x94}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xae,0x32,0x40,0x65}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xaf,0x8c,0xe8,0x8d}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb0,0x24,0x25,0x3e}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb0,0x2e,0x09,0x60}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb0,0x7c,0x6e,0x1b}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb1,0x27,0x10,0x66}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb2,0x11,0xad,0x02}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb2,0x3e,0x05,0xf8}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb2,0x3e,0x46,0x10}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xa2,0xfc,0x2e,0x53}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xa3,0xac,0x21,0x4e}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xa3,0xac,0xc2,0x1e}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xa9,0xe5,0xc6,0x6a}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xaa,0x4b,0xc3,0xa8}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xac,0x67,0xcd,0xc5}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xac,0xf5,0xe1,0x7e}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xad,0xb3,0x25,0x08}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xad,0xd0,0xcb,0x4a}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xad,0xfc,0x2e,0x10}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xae,0x75,0x8d,0x7c}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xaf,0x7e,0x26,0x9e}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xaf,0x7e,0x26,0xb1}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xaf,0x8b,0x6a,0x77}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xaf,0x8c,0xe8,0x42}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb0,0x09,0x75,0x64}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb0,0x24,0x21,0x79}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb0,0x24,0x63,0xde}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb0,0x38,0xe3,0x24}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb0,0x64,0x64,0xce}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb0,0x6a,0x90,0xb7}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb0,0x7b,0x07,0x94}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb0,0x7e,0xa7,0x0a}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb0,0xdf,0xc9,0xc6}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb2,0x3e,0x44,0x3e}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb2,0x3e,0x66,0x38}, 8333},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb2,0x3e,0xcb,0xb9}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb2,0x4f,0xa0,0x76}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb2,0xa9,0xce,0xf4}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb2,0xc1,0xea,0x3e}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb2,0xc7,0x60,0x6c}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb2,0xfe,0x12,0x60}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb2,0x7c,0xc5,0x65}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb2,0xaa,0x8a,0xca}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb2,0xaf,0x81,0x12}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb2,0xbc,0x2f,0x3e}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb2,0xc7,0xf0,0x16}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb2,0xda,0xd1,0xa2}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb2,0xed,0x23,0x22}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb2,0xee,0xe0,0xf2}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb2,0xfe,0x22,0x90}, 8333},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb2,0xfe,0x22,0xa1}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb2,0xff,0x29,0x7b}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb4,0xd2,0x22,0x3a}, 9801},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb6,0x5c,0xe2,0xd4}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb6,0xab,0xf6,0x8e}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb8,0x17,0x08,0x09}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb8,0x3a,0xa2,0x23}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb8,0x9a,0x09,0xaa}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0x08,0xee,0xa5}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb3,0x2b,0xb7,0x02}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb4,0xc8,0x80,0x3a}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb6,0x5d,0x22,0x82}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0x08,0xee,0xc5}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0x0b,0x8b,0xac}, 8333},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0x18,0x61,0x0b}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0x1f,0x89,0x8b}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0x26,0x2c,0x40}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0x35,0x80,0xb4}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0x35,0x81,0xf4}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0x4d,0x81,0x77}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0x4d,0x81,0x9c}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0x52,0xcb,0x5c}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xbc,0x14,0x61,0x12}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xbc,0x7e,0x08,0x0e}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xbc,0x8a,0x21,0xef}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xbc,0x9b,0x88,0x46}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0x18,0xe9,0x64}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0x19,0x30,0x47}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0x19,0x30,0x72}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0x1c,0x4c,0xb3}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0x46,0x69,0x98}, 8339},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0x4d,0x80,0x45}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0x4d,0x80,0xf1}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0x56,0x4f,0x57}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0x59,0x66,0x02}, 3333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0x59,0x66,0x35}, 3333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0x6d,0x90,0x9b}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0x75,0x4b,0x32}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0x79,0xad,0xdf}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0x80,0x29,0x9d}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0x82,0xe2,0x6a}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0x91,0x82,0x4c}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xbc,0x3f,0xc0,0x68}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xbc,0x71,0xa4,0xe7}, 8333},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xbc,0xa6,0xe5,0x70}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xbc,0xb6,0x6c,0x81}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xbc,0xe2,0xe1,0xae}, 8010},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xbc,0xf2,0xab,0x08}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xbc,0xf3,0x04,0x8b}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xbe,0x0a,0x09,0xea}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xbe,0x0a,0x0a,0x93}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xbc,0xd6,0x80,0x4d}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xbe,0x0a,0x08,0xd3}, 8333},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xbe,0x51,0xa0,0xb8}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xbe,0x55,0xc9,0x25}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc0,0x22,0xe3,0xe6}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc0,0x4d,0xbd,0xc8}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc0,0x7c,0xe0,0x07}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc0,0x92,0x89,0x01}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc0,0xcb,0xe4,0x47}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc0,0xce,0xca,0x14}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc1,0x00,0x6d,0x03}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc1,0x29,0xe5,0x82}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc1,0x29,0xe5,0x9c}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xbe,0x6f,0xe7,0x13}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc0,0x83,0x2c,0x5d}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc0,0xce,0xca,0x06}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc0,0xe3,0xf5,0x85}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc0,0xf1,0x4a,0x7b}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc0,0xf1,0x4a,0x7e}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc0,0xfe,0x47,0xde}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc1,0x0a,0x40,0x55}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc1,0x2e,0x50,0x65}, 8333},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc1,0x31,0x2b,0xdb}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc1,0x93,0x47,0x78}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc1,0xb3,0x41,0xe9}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc1,0x5d,0x4f,0xd7}, 8333},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc1,0xb7,0x63,0x2e}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc1,0xc0,0x25,0x87}, 8333},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc1,0xea,0xe0,0xc3}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc2,0x3a,0x6c,0xd5}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc2,0xbb,0x60,0x02}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc2,0xff,0x1f,0x3b}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc3,0x24,0x06,0x65}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc3,0x3a,0xee,0xf3}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc3,0xc5,0xaf,0xbe}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc3,0xef,0x01,0x42}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc6,0x30,0xc4,0xe6}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc6,0x32,0xc0,0xa0}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc6,0x39,0xd2,0x1b}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc6,0x54,0xc3,0xb3}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc6,0xa7,0x8c,0x08}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc1,0xef,0x50,0x9b}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc2,0x3f,0x8c,0xd0}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc2,0x57,0x01,0xe8}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc2,0xbb,0xe3,0x12}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc2,0xf7,0x0c,0x88}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc3,0x5b,0xb0,0x56}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc4,0x1c,0x62,0x14}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc6,0x2c,0xf9,0x23}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc6,0x54,0xac,0xfc}, 8333},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc6,0xcc,0xe0,0x6a}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc7,0x7f,0xe2,0xf5}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc7,0xc9,0x6e,0x08}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc7,0xe9,0xea,0x5a}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc6,0xd3,0x61,0x2e}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc7,0x42,0x40,0xc6}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc7,0x65,0x64,0x3a}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc7,0x65,0x64,0x3b}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc7,0x7f,0xe0,0x32}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc8,0x2e,0xf1,0x47}, 8333},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc8,0x74,0x62,0xb9}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xca,0x3c,0x46,0x12}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xcb,0x97,0x8c,0x0e}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xcc,0x70,0xcb,0x34}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xcb,0x09,0xe1,0x0d}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xcb,0xb1,0x8e,0x25}, 8333},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xcd,0xc8,0xf7,0x95}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xcf,0xe2,0x8d,0xfd}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xcf,0xff,0x2a,0xca}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd0,0x35,0xa4,0x13}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd0,0x42,0x44,0x7f}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd0,0x42,0x44,0x82}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd0,0x47,0xab,0xe8}, 8341},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd0,0x4c,0xc8,0xc8}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd0,0x52,0x62,0xbd}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd0,0x55,0xc1,0x1f}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd0,0x6f,0x30,0x29}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd0,0x6f,0x30,0x2d}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd1,0x22,0xe8,0x48}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd1,0x51,0x09,0xdf}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd1,0x5a,0xe0,0x02}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xcd,0xd1,0x83,0x96}, 13838},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xce,0x35,0x40,0x4a}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xce,0x48,0xc0,0x45}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xce,0x7b,0x70,0xb4}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd0,0x42,0xd0,0x99}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd0,0x44,0xae,0x4c}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd0,0x6b,0x61,0xf2}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd0,0x6f,0x30,0x84}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd0,0x76,0xeb,0xbe}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd1,0x06,0xcd,0x7e}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd1,0x28,0x60,0x79}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd1,0x3a,0x82,0x89}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd1,0x49,0x8e,0xe2}, 8333},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd1,0x5a,0xe0,0x04}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd1,0x7e,0x62,0xae}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd1,0x88,0x48,0x45}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd1,0xc3,0x04,0x4a}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd1,0xc5,0x0d,0x3e}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd3,0x48,0xe3,0x08}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd4,0x33,0x90,0x2a}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd4,0x47,0xe9,0x7f}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd4,0x7e,0x0e,0x7a}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd4,0x9f,0x2c,0x32}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd5,0x05,0x24,0x3a}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd5,0x39,0x21,0x0a}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd5,0x42,0xcd,0xc2}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd5,0x88,0x49,0x7d}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd5,0x9b,0x03,0xd8}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd5,0x9b,0x07,0x18}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd5,0xa7,0x11,0x06}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd5,0xdf,0x8a,0x0d}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd8,0x0f,0x4e,0xb6}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd8,0x26,0x81,0xa4}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd8,0x30,0xa8,0x08}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd8,0xa9,0x8d,0xa9}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd8,0xf5,0xce,0xb5}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd8,0xf9,0xcc,0xa1}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd8,0xfa,0x8a,0xe6}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd1,0x7e,0x45,0xf3}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd1,0x7e,0x6c,0x5b}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd1,0xc3,0x04,0x12}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd1,0xfa,0x06,0xbe}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd2,0x36,0x25,0xe1}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd2,0xdf,0x03,0x2c}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd3,0x95,0xea,0x6d}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd4,0x33,0x8c,0xb7}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd4,0x5a,0xb3,0xce}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd4,0x5d,0xe2,0x5a}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd4,0x6e,0xab,0x76}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd4,0xca,0x84,0x11}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd5,0x5b,0xcd,0x86}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd5,0xa5,0x44,0xda}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd5,0xc4,0xc8,0xd5}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd8,0x3b,0x04,0xd4}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd8,0x4a,0x20,0x6d}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd8,0x9e,0xe1,0x46}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd8,0xa4,0x8a,0x0d}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd8,0xa7,0xec,0xf7}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd8,0xc5,0x4f,0x4a}, 8333},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd9,0x0b,0xe1,0xbd}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd9,0x0c,0x22,0x9e}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd9,0x0c,0xca,0x21}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd9,0x14,0xab,0x2b}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd9,0x17,0x01,0x7e}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd9,0x17,0x0b,0x8a}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd9,0x0c,0xc7,0xcf}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd9,0x14,0x82,0x48}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd9,0x17,0x06,0x94}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd9,0x17,0x8c,0x67}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd9,0x1c,0x60,0xb4}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd9,0x23,0x82,0x2a}, 8333},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd9,0x6f,0x42,0x4f}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd9,0x9b,0xca,0xbf}, 8333},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd9,0x9e,0x09,0x66}, 8333},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd9,0xac,0x20,0x12}, 20993},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xdc,0xf5,0xc4,0x25}, 8333},
-    {{0x20,0x01,0x12,0x91,0x02,0xbf,0x00,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x00}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd9,0xa8,0x8f,0xa9}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd9,0xd1,0x20,0xdb}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xda,0xa1,0x21,0xa5}, 8333},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xdd,0x79,0x90,0x8a}, 8333},
+    {{0x20,0x01,0x00,0x00,0x41,0x37,0x9e,0x76,0x20,0x48,0x3a,0x84,0xbb,0x91,0xe8,0x46}, 8333},
+    {{0x20,0x01,0x00,0x00,0x41,0x37,0x9e,0x76,0x20,0x66,0x0e,0x9e,0xb4,0x89,0xf8,0xb8}, 8333},
+    {{0x20,0x01,0x00,0x00,0x41,0x37,0x9e,0x76,0x38,0x54,0x12,0x11,0xb5,0xac,0xa9,0x6b}, 8333},
+    {{0x20,0x01,0x00,0x00,0x41,0x37,0x9e,0x76,0x04,0xe3,0x1f,0x66,0xcd,0x4c,0x82,0x9f}, 8333},
+    {{0x20,0x01,0x00,0x00,0x41,0x37,0x9e,0x76,0x00,0xad,0x01,0xf4,0x9e,0xa9,0xfa,0x2e}, 8333},
+    {{0x20,0x01,0x00,0x00,0x41,0x37,0x9e,0x76,0x00,0xe5,0x0b,0xaa,0xb6,0x6f,0xf4,0x18}, 8333},
+    {{0x20,0x01,0x00,0x00,0x53,0xaa,0x06,0x4c,0x20,0xa2,0x59,0xc4,0xad,0x22,0x93,0xea}, 8333},
+    {{0x20,0x01,0x00,0x00,0x53,0xaa,0x06,0x4c,0x00,0x59,0x61,0x7f,0xa1,0x0d,0x00,0xe0}, 8333},
+    {{0x20,0x01,0x00,0x00,0x5e,0xf5,0x79,0xfb,0x20,0x0f,0x3a,0xe5,0x3c,0xbc,0x74,0xc9}, 8333},
+    {{0x20,0x01,0x00,0x00,0x5e,0xf5,0x79,0xfb,0x38,0xf2,0x13,0xb4,0xb2,0x08,0x56,0x04}, 8333},
+    {{0x20,0x01,0x00,0x00,0x5e,0xf5,0x79,0xfd,0x20,0x0b,0x22,0xa7,0xcc,0x50,0xf5,0x2d}, 8333},
+    {{0x20,0x01,0x00,0x00,0x5e,0xf5,0x79,0xfd,0x24,0xef,0x1a,0xef,0xa9,0x94,0x30,0x3d}, 8333},
+    {{0x20,0x01,0x00,0x00,0x5e,0xf5,0x79,0xfd,0x24,0xfc,0x0b,0x5d,0xad,0x4f,0x4d,0xb2}, 8333},
+    {{0x20,0x01,0x00,0x00,0x5e,0xf5,0x79,0xfd,0x28,0xbf,0x2d,0x23,0xe0,0x2e,0xc3,0xef}, 8333},
+    {{0x20,0x01,0x00,0x00,0x5e,0xf5,0x79,0xfd,0x3c,0xd0,0x3c,0x2e,0xda,0x44,0xa7,0x59}, 8333},
+    {{0x20,0x01,0x00,0x00,0x5e,0xf5,0x79,0xfd,0x08,0x7e,0x0f,0xd7,0xb1,0xc2,0x01,0xb4}, 8333},
+    {{0x20,0x01,0x00,0x00,0x9d,0x38,0x6a,0xb8,0x18,0xdb,0x3b,0xda,0xab,0x90,0xe8,0x1e}, 8333},
+    {{0x20,0x01,0x00,0x00,0x9d,0x38,0x6a,0xb8,0x04,0xe7,0x16,0x60,0x86,0x2f,0xa6,0xd7}, 8333},
+    {{0x20,0x01,0x00,0x00,0x9d,0x38,0x6a,0xb8,0x00,0x06,0x00,0x2b,0x50,0x74,0x95,0x88}, 8333},
+    {{0x20,0x01,0x00,0x00,0x9d,0x38,0x6a,0xbd,0x10,0xf8,0xa7,0xd7,0xbb,0x90,0xf5,0x24}, 8333},
+    {{0x20,0x01,0x13,0xd8,0x1c,0x01,0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x11}, 8333},
+    {{0x20,0x01,0x15,0xc0,0x65,0xff,0x06,0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
+    {{0x20,0x01,0x16,0x08,0x00,0x10,0x01,0x56,0x00,0xae,0x00,0x00,0x00,0x00,0x4a,0xdb}, 8333},
+    {{0x20,0x01,0x16,0x20,0x0b,0x1b,0x88,0x88,0x02,0x0d,0xb9,0xff,0xfe,0x41,0x67,0x10}, 8333},
+    {{0x20,0x01,0x16,0x20,0x0b,0x1b,0xfa,0xce,0x02,0x0d,0xb9,0xff,0xfe,0x41,0x67,0x10}, 8333},
     {{0x20,0x01,0x16,0x20,0x0f,0x00,0x02,0x82,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
     {{0x20,0x01,0x16,0x20,0x0f,0x00,0x82,0x82,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333},
-    {{0x20,0x01,0x19,0xf0,0x50,0x00,0x8d,0xe8,0x54,0x00,0x00,0xff,0xfe,0x12,0x55,0xe4}, 8333},
-    {{0x20,0x01,0x19,0xf0,0x6c,0x00,0x91,0x03,0x54,0x00,0x00,0xff,0xfe,0x10,0xa8,0xd3}, 8333},
-    {{0x20,0x01,0x1b,0x60,0x00,0x03,0x01,0x72,0x14,0x2b,0x6d,0xff,0xfe,0x7a,0x01,0x17}, 8333},
-    {{0x20,0x01,0x04,0x10,0xa0,0x00,0x40,0x50,0x84,0x63,0x90,0xb0,0xff,0xfb,0x4e,0x58}, 8333},
+    {{0x20,0x01,0x16,0x80,0x01,0x01,0x01,0xae,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333},
+    {{0x20,0x01,0x16,0xd8,0xff,0x00,0x85,0xde,0x02,0x0c,0x29,0xff,0xfe,0x52,0x95,0x94}, 8333},
+    {{0x20,0x01,0x19,0xf0,0x44,0x00,0x43,0x4d,0x54,0x00,0x00,0xff,0xfe,0x42,0x26,0x78}, 8333},
+    {{0x20,0x01,0x19,0xf0,0x50,0x00,0x8c,0x8b,0x54,0x00,0x00,0xff,0xfe,0x1f,0xc0,0x23}, 8333},
+    {{0x20,0x01,0x19,0xf0,0x50,0x00,0x8c,0xe6,0x54,0x00,0x00,0xff,0xfe,0x1b,0x24,0xa9}, 8333},
+    {{0x20,0x01,0x19,0xf0,0x00,0x05,0x03,0x14,0x54,0x00,0x00,0xff,0xfe,0x2c,0x42,0xe8}, 8333},
+    {{0x20,0x01,0x19,0xf0,0x00,0x05,0x05,0x1b,0x54,0x00,0x00,0xff,0xfe,0x49,0xfe,0x5b}, 8333},
+    {{0x20,0x01,0x19,0xf0,0x00,0x05,0x00,0xbc,0x54,0x00,0x00,0xff,0xfe,0x3b,0x93,0x39}, 8333},
+    {{0x20,0x01,0x1a,0xf8,0x40,0x20,0xa0,0x20,0x00,0x05,0x00,0x00,0x00,0x00,0x00,0x00}, 8333},
+    {{0x20,0x01,0x1b,0xc8,0x01,0xa0,0x59,0x0e,0x02,0xe0,0xf4,0xff,0xfe,0x16,0x3a,0x39}, 8333},
+    {{0x20,0x01,0x1c,0x04,0x14,0x01,0x8f,0x00,0xf4,0xfe,0x4f,0xff,0xfe,0x0c,0xdf,0x40}, 8333},
+    {{0x20,0x01,0x41,0x28,0x61,0x35,0x00,0x10,0x02,0x0c,0x29,0xff,0xfe,0x69,0x9e,0x81}, 8333},
     {{0x20,0x01,0x41,0x28,0x61,0x35,0x20,0x10,0x02,0x1e,0x0b,0xff,0xfe,0xe8,0xa3,0xc0}, 8333},
-    {{0x20,0x01,0x41,0xd0,0x10,0x08,0x07,0x61,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x7c}, 8333},
+    {{0x20,0x01,0x41,0x28,0x61,0x35,0xe0,0x01,0x50,0x54,0x00,0xff,0xfe,0x37,0xe9,0xeb}, 8333},
+    {{0x20,0x01,0x41,0xd0,0x10,0x00,0x10,0x24,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8333},
+    {{0x20,0x01,0x41,0xd0,0x10,0x00,0x14,0x33,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8333},
+    {{0x20,0x01,0x41,0xd0,0x10,0x04,0x22,0xae,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8333},
+    {{0x20,0x01,0x41,0xd0,0x10,0x04,0x29,0x96,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8333},
+    {{0x20,0x01,0x41,0xd0,0x10,0x08,0x11,0xe0,0x00,0x00,0x00,0x00,0x1a,0x5c,0x6d,0x9d}, 8333},
+    {{0x20,0x01,0x41,0xd0,0x10,0x08,0x11,0xe0,0x00,0x00,0x00,0x00,0x0b,0x74,0xba,0xf7}, 8333},
+    {{0x20,0x01,0x41,0xd0,0x10,0x08,0x23,0x7a,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8333},
+    {{0x20,0x01,0x41,0xd0,0x10,0x08,0x27,0x52,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8333},
+    {{0x20,0x01,0x41,0xd0,0x10,0x08,0x04,0x94,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8333},
     {{0x20,0x01,0x41,0xd0,0x00,0x01,0x45,0xd8,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333},
-    {{0x20,0x01,0x41,0xd0,0x00,0x01,0x6c,0xd3,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8333},
+    {{0x20,0x01,0x41,0xd0,0x00,0x01,0x56,0x30,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333},
+    {{0x20,0x01,0x41,0xd0,0x00,0x01,0x6f,0x57,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333},
+    {{0x20,0x01,0x41,0xd0,0x00,0x01,0x80,0x1e,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333},
+    {{0x20,0x01,0x41,0xd0,0x00,0x01,0x88,0x52,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333},
     {{0x20,0x01,0x41,0xd0,0x00,0x01,0x8b,0x26,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333},
-    {{0x20,0x01,0x41,0xd0,0x00,0x01,0xaf,0xda,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8200},
+    {{0x20,0x01,0x41,0xd0,0x00,0x01,0xa5,0xb8,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333},
     {{0x20,0x01,0x41,0xd0,0x00,0x01,0xb2,0x6b,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333},
     {{0x20,0x01,0x41,0xd0,0x00,0x01,0xc1,0x39,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333},
     {{0x20,0x01,0x41,0xd0,0x00,0x01,0xc8,0xd7,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333},
-    {{0x20,0x01,0x41,0xd0,0x00,0x01,0xf5,0x9f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x33}, 8333},
-    {{0x20,0x01,0x41,0xd0,0x00,0x01,0xf7,0xcc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333},
-    {{0x20,0x01,0x41,0xd0,0x00,0x02,0x10,0x21,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333},
-    {{0x20,0x01,0x41,0xd0,0x00,0x02,0x37,0xc3,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8200},
-    {{0x20,0x01,0x41,0xd0,0x00,0x02,0x47,0x97,0x23,0x23,0x23,0x23,0x23,0x23,0x23,0x23}, 8333},
-    {{0x20,0x01,0x41,0xd0,0x00,0x02,0x53,0xdf,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8333},
+    {{0x20,0x01,0x41,0xd0,0x00,0x01,0xd2,0x27,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8333},
+    {{0x20,0x01,0x41,0xd0,0x00,0x01,0xdb,0xc4,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333},
+    {{0x20,0x01,0x41,0xd0,0x00,0x01,0xdc,0x5d,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333},
+    {{0x20,0x01,0x41,0xd0,0x00,0x01,0xe1,0x3b,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333},
+    {{0x20,0x01,0x41,0xd0,0x00,0x01,0xef,0x5b,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333},
+    {{0x20,0x01,0x41,0xd0,0x00,0x02,0x16,0xbe,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333},
+    {{0x20,0x01,0x41,0xd0,0x00,0x02,0x20,0x3c,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333},
+    {{0x20,0x01,0x41,0xd0,0x00,0x02,0x38,0xc5,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333},
+    {{0x20,0x01,0x41,0xd0,0x00,0x02,0x05,0x19,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8333},
     {{0x20,0x01,0x41,0xd0,0x00,0x02,0x9c,0x94,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333},
-    {{0x20,0x01,0x41,0xd0,0x00,0x02,0x9d,0x3e,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333},
-    {{0x20,0x01,0x41,0xd0,0x00,0x02,0xa2,0x4f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8333},
-    {{0x20,0x01,0x41,0xd0,0x00,0x02,0xa3,0x5a,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8333},
-    {{0x20,0x01,0x41,0xd0,0x00,0x02,0xb2,0xb8,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8333},
-    {{0x20,0x01,0x41,0xd0,0x00,0x02,0xc1,0xd9,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8333},
-    {{0x20,0x01,0x41,0xd0,0x00,0x02,0x0c,0x6e,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8333},
+    {{0x20,0x01,0x41,0xd0,0x00,0x02,0xb7,0x92,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8333},
+    {{0x20,0x01,0x41,0xd0,0x00,0x02,0xbf,0x2a,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8333},
+    {{0x20,0x01,0x41,0xd0,0x00,0x02,0xc7,0x93,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8333},
     {{0x20,0x01,0x41,0xd0,0x00,0x02,0xc9,0xbf,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8333},
-    {{0x20,0x01,0x41,0xd0,0x00,0x02,0xf1,0xa5,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8333},
-    {{0x20,0x01,0x41,0xd0,0x00,0x52,0x0a,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x10,0x5f}, 8333},
-    {{0x20,0x01,0x41,0xd0,0x00,0x52,0x0c,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x06,0xf5}, 8333},
-    {{0x20,0x01,0x41,0xd0,0x00,0x52,0x0d,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x06,0xe2}, 8333},
-    {{0x20,0x01,0x41,0xd0,0x00,0x08,0x3e,0x75,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333},
-    {{0x20,0x01,0x41,0xd0,0x00,0x08,0x62,0xab,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333},
+    {{0x20,0x01,0x41,0xd0,0x03,0x03,0x04,0xf0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8333},
+    {{0x20,0x01,0x41,0xd0,0x00,0x08,0x1a,0x8a,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333},
+    {{0x20,0x01,0x41,0xd0,0x00,0x08,0x3f,0xa9,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333},
+    {{0x20,0x01,0x41,0xd0,0x00,0x08,0x46,0x70,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333},
+    {{0x20,0x01,0x41,0xd0,0x00,0x08,0x4f,0x48,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333},
     {{0x20,0x01,0x41,0xd0,0x00,0x08,0x67,0x28,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8333},
-    {{0x20,0x01,0x41,0xd0,0x00,0x08,0xb3,0x0a,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333},
-    {{0x20,0x01,0x41,0xd0,0x00,0x08,0xbc,0x26,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333},
-    {{0x20,0x01,0x41,0xd0,0x00,0x08,0xbe,0x9a,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333},
-    {{0x20,0x01,0x41,0xd0,0x00,0x08,0xd9,0x84,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8333},
-    {{0x20,0x01,0x41,0xd0,0x00,0x08,0xeb,0x8b,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8333},
-    {{0x20,0x01,0x41,0xd0,0x00,0x0a,0x13,0xa2,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333},
-    {{0x20,0x01,0x41,0xd0,0x00,0x0a,0x2b,0x18,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333},
-    {{0x20,0x01,0x41,0xd0,0x00,0x0a,0x2d,0x14,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8333},
-    {{0x20,0x01,0x41,0xd0,0x00,0x0a,0x45,0x58,0x00,0x00,0x00,0x00,0x1d,0xf2,0x76,0xd3}, 8333},
-    {{0x20,0x01,0x41,0xd0,0x00,0x0a,0x4a,0xaa,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8333},
-    {{0x20,0x01,0x41,0xd0,0x00,0x0a,0x63,0x5b,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333},
-    {{0x20,0x01,0x41,0xd0,0x00,0x0a,0x63,0xd8,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333},
+    {{0x20,0x01,0x41,0xd0,0x00,0x08,0x72,0xc2,0x00,0x0d,0x02,0x42,0xac,0x11,0x00,0x02}, 8333},
+    {{0x20,0x01,0x41,0xd0,0x00,0x08,0x80,0x07,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8333},
+    {{0x20,0x01,0x41,0xd0,0x00,0x08,0xa7,0x1c,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8333},
+    {{0x20,0x01,0x41,0xd0,0x00,0x08,0xbc,0xcc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333},
+    {{0x20,0x01,0x41,0xd0,0x00,0x08,0xbd,0x45,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333},
+    {{0x20,0x01,0x41,0xd0,0x00,0x08,0xc6,0x7c,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8333},
+    {{0x20,0x01,0x41,0xd0,0x00,0x08,0xde,0x3d,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333},
+    {{0x20,0x01,0x41,0xd0,0x00,0x08,0xe2,0x57,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333},
+    {{0x20,0x01,0x41,0xd0,0x00,0x08,0xe3,0xe4,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333},
+    {{0x20,0x01,0x41,0xd0,0x00,0x0a,0x14,0xcc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333},
+    {{0x20,0x01,0x41,0xd0,0x00,0x0a,0x15,0xb2,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333},
+    {{0x20,0x01,0x41,0xd0,0x00,0x0a,0x1a,0xc9,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333},
+    {{0x20,0x01,0x41,0xd0,0x00,0x0a,0x24,0x96,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333},
+    {{0x20,0x01,0x41,0xd0,0x00,0x0a,0x30,0x8c,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8333},
+    {{0x20,0x01,0x41,0xd0,0x00,0x0a,0x58,0x79,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8333},
+    {{0x20,0x01,0x41,0xd0,0x00,0x0a,0x68,0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333},
+    {{0x20,0x01,0x41,0xd0,0x00,0x0a,0x68,0x2d,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333},
     {{0x20,0x01,0x41,0xd0,0x00,0x0a,0x6c,0x29,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333},
-    {{0x20,0x01,0x41,0xd0,0x00,0x0a,0xf9,0xcd,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333},
-    {{0x20,0x01,0x41,0xd0,0x00,0x0d,0x20,0xa4,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8333},
+    {{0x20,0x01,0x41,0xd0,0x00,0x0a,0xf5,0x2a,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333},
+    {{0x20,0x01,0x41,0xd0,0x00,0x0d,0x11,0x1c,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8333},
+    {{0x20,0x01,0x41,0xd0,0x00,0x0e,0x13,0x88,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333},
     {{0x20,0x01,0x41,0xd0,0x00,0x0e,0x02,0x6b,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333},
+    {{0x20,0x01,0x41,0xd0,0x00,0x0e,0x0f,0x73,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333},
     {{0x20,0x01,0x41,0xd0,0xfc,0x8c,0xa2,0x00,0x7a,0x24,0xaf,0xff,0xfe,0x9d,0xc6,0x9b}, 8333},
+    {{0x20,0x01,0x41,0xf0,0x00,0x61,0x00,0x00,0x72,0xf3,0x95,0xff,0xfe,0x09,0x75,0x21}, 8333},
     {{0x20,0x01,0x41,0xf0,0x00,0x61,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x07}, 8333},
-    {{0x20,0x01,0x41,0xf0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
-    {{0x20,0x01,0x44,0xb8,0x41,0xbd,0x61,0x01,0x14,0x8e,0x40,0x22,0x49,0x50,0xe8,0x61}, 8333},
-    {{0x20,0x01,0x04,0x70,0x00,0x01,0x02,0xf9,0x00,0x00,0x00,0x01,0x10,0x7a,0xa3,0x01}, 8333},
-    {{0x20,0x01,0x04,0x70,0x1f,0x0b,0x0a,0xd6,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
-    {{0x20,0x01,0x04,0x70,0x1f,0x11,0x12,0xd5,0x00,0x00,0x00,0x00,0x0a,0xe1,0x56,0x11}, 8333},
+    {{0x20,0x01,0x44,0x28,0x02,0x00,0x81,0x71,0x0d,0xb6,0x2f,0xf4,0x9c,0x0e,0xa2,0xda}, 8333},
+    {{0x20,0x01,0x04,0x70,0x1f,0x07,0x15,0x1c,0xba,0xac,0x6f,0xff,0xfe,0xb7,0x3b,0xa9}, 8333},
+    {{0x20,0x01,0x04,0x70,0x1f,0x0b,0x0a,0xd6,0x0a,0x60,0x6e,0xff,0xfe,0xc6,0x23,0x23}, 8333},
+    {{0x20,0x01,0x04,0x70,0x1f,0x11,0x06,0x17,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x0f}, 8333},
+    {{0x20,0x01,0x04,0x70,0x1f,0x14,0x07,0x3e,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
     {{0x20,0x01,0x04,0x70,0x1f,0x14,0x00,0x7d,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
-    {{0x20,0x01,0x04,0x70,0x00,0x27,0x00,0xce,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
+    {{0x20,0x01,0x04,0x70,0x1f,0x15,0x11,0xf8,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x10}, 8333},
+    {{0x20,0x01,0x04,0x70,0x1f,0x15,0x1b,0x95,0x2c,0x3e,0x8a,0x9a,0x24,0xe1,0x70,0x84}, 8333},
+    {{0x20,0x01,0x04,0x70,0x1f,0x15,0x0e,0x9b,0x00,0x00,0x00,0x00,0x00,0x00,0x03,0xef}, 8333},
+    {{0x20,0x01,0x04,0x70,0x1f,0x1d,0x03,0xa9,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x10}, 8333},
+    {{0x20,0x01,0x04,0x70,0x00,0x25,0x04,0x82,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
+    {{0x20,0x01,0x04,0x70,0x00,0x27,0x01,0x9f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
+    {{0x20,0x01,0x04,0x70,0x00,0x27,0x06,0x65,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
+    {{0x20,0x01,0x04,0x70,0x00,0x28,0x03,0x65,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x04}, 8333},
     {{0x20,0x01,0x04,0x70,0x00,0x41,0x00,0x06,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
-    {{0x20,0x01,0x04,0x70,0x50,0x7d,0x00,0x00,0x6a,0xb5,0x99,0xff,0xfe,0x73,0xac,0x18}, 8333},
-    {{0x20,0x01,0x04,0x70,0x58,0x3e,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x2a}, 8333},
-    {{0x20,0x01,0x04,0x70,0x00,0x5f,0x00,0x5f,0x00,0x00,0x00,0x00,0x00,0x00,0x02,0x32}, 8333},
-    {{0x20,0x01,0x04,0x70,0x00,0x66,0x01,0x19,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
-    {{0x20,0x01,0x04,0x70,0x6c,0x4f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xca,0xfe}, 8333},
-    {{0x20,0x01,0x04,0x70,0x00,0x6f,0x03,0x27,0x91,0x3b,0x07,0xfe,0x85,0x45,0xa4,0xf5}, 8333},
-    {{0x20,0x01,0x04,0x70,0x7d,0xda,0x00,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333},
-    {{0x20,0x01,0x04,0x70,0x95,0xc1,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
-    {{0x20,0x01,0x04,0x70,0xb1,0xd0,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x10,0x00}, 8333},
-    {{0x20,0x01,0x04,0x70,0xd0,0x0d,0x00,0x00,0x36,0x64,0xa9,0xff,0xfe,0x9a,0x51,0x50}, 8333},
-    {{0x20,0x01,0x04,0x70,0xfa,0xb7,0x00,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333},
-    {{0x20,0x01,0x48,0x00,0x78,0x19,0x01,0x04,0xbe,0x76,0x4e,0xff,0xfe,0x05,0xc8,0x28}, 8333},
-    {{0x20,0x01,0x48,0x00,0x78,0x19,0x01,0x04,0xbe,0x76,0x4e,0xff,0xfe,0x05,0xc9,0xa0}, 8333},
+    {{0x20,0x01,0x04,0x70,0x72,0x7b,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x11,0x00,0x14}, 8333},
+    {{0x20,0x01,0x04,0x70,0x00,0x07,0x02,0xf0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
+    {{0x20,0x01,0x04,0x70,0x00,0x07,0x00,0x65,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
+    {{0x20,0x01,0x04,0x70,0x7f,0x85,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
+    {{0x20,0x01,0x04,0x70,0x00,0x08,0x02,0xe1,0x58,0x25,0x39,0xdf,0x3e,0x4c,0x54,0xa8}, 8333},
+    {{0x20,0x01,0x04,0x70,0x00,0x08,0x02,0xe1,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x43}, 8333},
+    {{0x20,0x01,0x04,0x70,0x00,0x08,0x02,0xe1,0xae,0x2a,0xe2,0x57,0x44,0x70,0x63,0x50}, 8333},
+    {{0x20,0x01,0x04,0x70,0x00,0x0a,0x0c,0x13,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
     {{0x20,0x01,0x48,0x01,0x78,0x19,0x00,0x74,0xb7,0x45,0xb9,0xd5,0xff,0x10,0xa6,0x1a}, 8333},
     {{0x20,0x01,0x48,0x01,0x78,0x19,0x00,0x74,0xb7,0x45,0xb9,0xd5,0xff,0x10,0xaa,0xec}, 8333},
     {{0x20,0x01,0x48,0x01,0x78,0x28,0x01,0x04,0xbe,0x76,0x4e,0xff,0xfe,0x10,0x13,0x25}, 8333},
-    {{0x20,0x01,0x48,0x02,0x78,0x00,0x00,0x01,0xbe,0x76,0x4e,0xff,0xfe,0x20,0xf0,0x23}, 8333},
     {{0x20,0x01,0x48,0x02,0x78,0x00,0x00,0x02,0x30,0xd7,0x17,0x75,0xff,0x20,0x18,0x58}, 8333},
-    {{0x20,0x01,0x48,0x02,0x78,0x00,0x00,0x02,0xbe,0x76,0x4e,0xff,0xfe,0x20,0x6c,0x26}, 8333},
-    {{0x20,0x01,0x48,0x02,0x78,0x02,0x01,0x01,0xbe,0x76,0x4e,0xff,0xfe,0x20,0x02,0x56}, 8333},
-    {{0x20,0x01,0x48,0x02,0x78,0x02,0x01,0x03,0xbe,0x76,0x4e,0xff,0xfe,0x20,0x2d,0xe8}, 8333},
-    {{0x20,0x01,0x48,0x30,0x11,0x00,0x02,0xe8,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
-    {{0x20,0x01,0x4b,0x98,0x0d,0xc2,0x00,0x41,0x02,0x16,0x3e,0xff,0xfe,0x56,0xf6,0x59}, 8333},
-    {{0x20,0x01,0x4b,0xa0,0xff,0xfa,0x00,0x5d,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x93}, 8333},
-    {{0x20,0x01,0x4b,0xa0,0xff,0xff,0x01,0xbe,0x00,0x01,0x10,0x05,0x00,0x00,0x00,0x01}, 8333},
-    {{0x20,0x01,0x4d,0xd0,0xff,0x00,0x86,0x7f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x03}, 8333},
+    {{0x20,0x01,0x4b,0xa0,0xba,0xbe,0x08,0x32,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8333},
+    {{0x20,0x01,0x4b,0xa0,0xca,0xfe,0x03,0x79,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333},
+    {{0x20,0x01,0x4b,0xa0,0xff,0xee,0x00,0x33,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x10}, 8333},
     {{0x20,0x01,0x4d,0xd0,0xff,0x00,0x9a,0x67,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x09}, 8333},
-    {{0x20,0x01,0x05,0xc0,0x14,0x00,0x00,0x0b,0x00,0x00,0x00,0x00,0x00,0x00,0x3c,0xc7}, 8333},
     {{0x20,0x01,0x06,0x10,0x1b,0x19,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x03}, 8333},
     {{0x20,0x01,0x06,0x10,0x06,0x00,0x0a,0x41,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
-    {{0x20,0x01,0x06,0x7c,0x26,0xb4,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8333},
-    {{0x20,0x01,0x08,0xd8,0x08,0x40,0x05,0x00,0x00,0x00,0x00,0x00,0x00,0x39,0x01,0xae}, 8333},
-    {{0x20,0x01,0x08,0xd8,0x09,0x65,0x4a,0x00,0x00,0x00,0x00,0x00,0x00,0x10,0x93,0x43}, 8333},
-    {{0x20,0x01,0x09,0x80,0x46,0x50,0x00,0x01,0x02,0xe0,0x53,0xff,0xfe,0x13,0x24,0x49}, 8333},
+    {{0x20,0x01,0x06,0x78,0x01,0x74,0x40,0x21,0x00,0x00,0x00,0x00,0x00,0x02,0x83,0x33}, 8333},
+    {{0x20,0x01,0x06,0x7c,0x16,0xdc,0x12,0x01,0x50,0x54,0x00,0xff,0xfe,0x17,0x4d,0xac}, 8333},
+    {{0x20,0x01,0x06,0x7c,0x21,0x28,0xff,0xff,0x60,0x62,0x36,0xff,0xfe,0x30,0x65,0x32}, 8333},
+    {{0x20,0x01,0x06,0x7c,0x25,0x64,0x03,0x31,0x35,0x47,0x6e,0x28,0x85,0xa4,0xfb,0x27}, 8333},
+    {{0x20,0x01,0x06,0xa0,0x02,0x00,0x03,0x68,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
+    {{0x20,0x01,0x07,0x18,0x08,0x01,0x03,0x11,0x50,0x54,0x00,0xff,0xfe,0x19,0xc4,0x83}, 8333},
+    {{0x20,0x01,0x07,0xb8,0x02,0xff,0x00,0x8f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
+    {{0x20,0x01,0x08,0xd8,0x08,0xa6,0x44,0x00,0x00,0x00,0x00,0x00,0x00,0x3f,0x08,0x6c}, 8333},
+    {{0x20,0x01,0x08,0xd8,0x09,0x23,0x84,0x00,0x00,0x00,0x00,0x00,0x00,0x87,0x0e,0xbd}, 8333},
+    {{0x20,0x01,0x09,0x60,0x06,0x6d,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
     {{0x20,0x01,0x09,0x81,0x00,0x46,0x00,0x01,0xba,0x27,0xeb,0xff,0xfe,0x5b,0xed,0xee}, 8333},
-    {{0x20,0x01,0x09,0xc8,0x53,0xe9,0x36,0x9a,0x02,0x26,0x2d,0xff,0xfe,0x1b,0x74,0x72}, 8333},
-    {{0x20,0x01,0x09,0xd8,0xca,0xfe,0x00,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x87}, 8333},
-    {{0x20,0x01,0x0b,0x10,0x00,0x11,0x00,0x21,0x3e,0x07,0x54,0xff,0xfe,0x48,0x72,0x48}, 8333},
-    {{0x20,0x01,0x0b,0xa8,0x01,0xf1,0xf3,0x4c,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
-    {{0x20,0x01,0x0b,0xc8,0x23,0x10,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333},
-    {{0x20,0x01,0x0b,0xc8,0x34,0x27,0x01,0x01,0x7a,0x4f,0x08,0xbe,0x26,0x11,0x6e,0x79}, 8333},
-    {{0x20,0x01,0x0b,0xc8,0x35,0x05,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333},
-    {{0x20,0x01,0x0c,0xc0,0xa0,0x04,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x30,0x00,0x1d}, 8333},
-    {{0x20,0x01,0x0e,0x42,0x01,0x02,0x12,0x09,0x01,0x53,0x01,0x21,0x00,0x76,0x01,0x71}, 8333},
-    {{0x20,0x02,0x17,0xea,0x14,0xeb,0x00,0x00,0x00,0x00,0x00,0x00,0x17,0xea,0x14,0xeb}, 8333},
-    {{0x20,0x02,0x02,0xf8,0x2b,0xc5,0x00,0x00,0x00,0x00,0x00,0x00,0x02,0xf8,0x2b,0xc5}, 8333},
-    {{0x20,0x02,0x40,0x47,0x48,0x2c,0x00,0x00,0x00,0x00,0x00,0x00,0x40,0x47,0x48,0x2c}, 8333},
-    {{0x20,0x02,0x45,0xc3,0x8c,0xca,0x00,0x00,0x00,0x00,0x00,0x00,0x45,0xc3,0x8c,0xca}, 8333},
-    {{0x20,0x02,0x46,0xbb,0x8a,0x41,0x00,0x00,0x02,0x26,0xb0,0xff,0xfe,0xed,0x5f,0x12}, 8888},
-    {{0x20,0x02,0x46,0xbb,0x8c,0x3c,0x00,0x00,0x8d,0x55,0x8f,0xbb,0x15,0xfa,0xf4,0xe0}, 8765},
-    {{0x20,0x02,0x4c,0x48,0xa0,0xfe,0x00,0x00,0x00,0x00,0x00,0x00,0x4c,0x48,0xa0,0xfe}, 8333},
-    {{0x20,0x02,0x4d,0x44,0x25,0xc8,0x00,0x00,0x00,0x00,0x00,0x00,0x4d,0x44,0x25,0xc8}, 8333},
-    {{0x20,0x02,0x50,0x5f,0xaa,0xa2,0x00,0x00,0x00,0x00,0x00,0x00,0x50,0x5f,0xaa,0xa2}, 8333},
-    {{0x20,0x02,0x5b,0xc1,0x79,0x9d,0x00,0x00,0x00,0x00,0x00,0x00,0x5b,0xc1,0x79,0x9d}, 8333},
-    {{0x20,0x02,0x6d,0xec,0x54,0x72,0x00,0x00,0x00,0x00,0x00,0x00,0x6d,0xec,0x54,0x72}, 8333},
-    {{0x20,0x02,0x8c,0x6d,0x65,0x21,0x96,0x17,0x12,0xbf,0x48,0xff,0xfe,0xd8,0x17,0x24}, 8333},
-    {{0x20,0x02,0xac,0x52,0x94,0xe2,0x00,0x00,0x00,0x00,0x00,0x00,0xac,0x52,0x94,0xe2}, 8333},
-    {{0x20,0x02,0xaf,0x7e,0x3e,0xca,0x00,0x00,0x00,0x00,0x00,0x00,0xaf,0x7e,0x3e,0xca}, 8333},
-    {{0x20,0x02,0xb0,0x09,0x20,0xc5,0x00,0x00,0x00,0x00,0x00,0x00,0xb0,0x09,0x20,0xc5}, 8333},
-    {{0x20,0x02,0xc0,0x6f,0x39,0xa0,0x00,0x00,0x00,0x00,0x00,0x00,0xc0,0x6f,0x39,0xa0}, 8333},
-    {{0x20,0x02,0xc2,0x3a,0x73,0x8a,0x00,0x00,0x00,0x00,0x00,0x00,0xc2,0x3a,0x73,0x8a}, 8333},
-    {{0x20,0x02,0xc7,0x0f,0x74,0x42,0x00,0x00,0x00,0x00,0x00,0x00,0xc7,0x0f,0x74,0x42}, 8333},
-    {{0x20,0x02,0xce,0xc5,0xbe,0x4f,0x00,0x00,0x00,0x00,0x00,0x00,0xce,0xc5,0xbe,0x4f}, 8333},
-    {{0x20,0x02,0xd1,0x49,0x9e,0x3a,0x00,0x00,0x00,0x00,0x00,0x00,0xd1,0x49,0x9e,0x3a}, 8333},
+    {{0x20,0x01,0x0b,0xa8,0x01,0xf1,0xf0,0x69,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
+    {{0x20,0x01,0x0b,0xc8,0x22,0x5f,0x01,0x0e,0x05,0x05,0x65,0x73,0x75,0x73,0x0d,0x0a}, 8333},
+    {{0x20,0x01,0x0b,0xc8,0x27,0x06,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333},
+    {{0x20,0x01,0x0b,0xc8,0x32,0x3c,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x53}, 8333},
+    {{0x20,0x01,0x0b,0xc8,0x32,0x3c,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0x00,0x04}, 8333},
+    {{0x20,0x01,0x0b,0xc8,0x32,0x3c,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xca,0xfe}, 8333},
+    {{0x20,0x01,0x0b,0xc8,0x36,0x80,0x42,0x42,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333},
+    {{0x20,0x01,0x0b,0xc8,0x39,0x9f,0xf0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333},
+    {{0x20,0x01,0x0b,0xc8,0x3c,0xbf,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x05}, 8333},
+    {{0x20,0x01,0x0b,0xc8,0x47,0x00,0x23,0x00,0x00,0x00,0x00,0x00,0x00,0x19,0x08,0x07}, 8333},
+    {{0x20,0x01,0x0e,0x42,0x01,0x02,0x18,0x05,0x01,0x60,0x00,0x16,0x02,0x06,0x00,0x31}, 8333},
+    {{0x20,0x02,0x12,0xf1,0x00,0x3f,0x00,0x00,0x00,0x00,0x00,0x00,0x12,0xf1,0x00,0x3f}, 8333},
+    {{0x20,0x02,0x01,0xe2,0x53,0x49,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0xe2,0x53,0x49}, 8333},
+    {{0x20,0x02,0x01,0xe2,0x55,0x88,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0xe2,0x55,0x88}, 8333},
+    {{0x20,0x02,0x25,0x01,0xcf,0x62,0x00,0x00,0x00,0x00,0x00,0x00,0x25,0x01,0xcf,0x62}, 8333},
+    {{0x20,0x02,0x26,0x8c,0xa1,0x35,0x00,0x00,0x00,0x00,0x00,0x00,0x26,0x8c,0xa1,0x35}, 8333},
+    {{0x20,0x02,0x2a,0x33,0x99,0xdb,0x00,0x00,0x00,0x00,0x00,0x00,0x2a,0x33,0x99,0xdb}, 8332},
+    {{0x20,0x02,0x2e,0xbc,0x2c,0x14,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x07}, 8333},
+    {{0x20,0x02,0x2f,0x59,0x2c,0x9c,0x00,0x00,0x00,0x00,0x00,0x00,0x2f,0x59,0x2c,0x9c}, 11885},
+    {{0x20,0x02,0x2f,0x5a,0x36,0x19,0x00,0x00,0x00,0x00,0x00,0x00,0x2f,0x5a,0x36,0x19}, 8333},
+    {{0x20,0x02,0x2f,0x5a,0x36,0xa4,0x00,0x00,0x00,0x00,0x00,0x00,0x2f,0x5a,0x36,0xa4}, 8333},
+    {{0x20,0x02,0x2f,0x5a,0x04,0x29,0x00,0x00,0x00,0x00,0x00,0x00,0x2f,0x5a,0x04,0x29}, 8333},
+    {{0x20,0x02,0x2f,0x5a,0x56,0x2a,0x00,0x00,0x00,0x00,0x00,0x00,0x2f,0x5a,0x56,0x2a}, 8333},
+    {{0x20,0x02,0x3a,0x3b,0x02,0x16,0x00,0x00,0x00,0x00,0x00,0x00,0x3a,0x3b,0x02,0x16}, 8333},
+    {{0x20,0x02,0x3d,0xfa,0x5d,0x23,0x00,0x00,0x00,0x00,0x00,0x00,0x3d,0xfa,0x5d,0x23}, 8333},
+    {{0x20,0x02,0x42,0x4f,0xa0,0x52,0x00,0x00,0x00,0x00,0x00,0x00,0x42,0x4f,0xa0,0x52}, 8333},
+    {{0x20,0x02,0x45,0x1e,0xe9,0x22,0x00,0x00,0x00,0x00,0x00,0x00,0x45,0x1e,0xe9,0x22}, 8333},
+    {{0x20,0x02,0x45,0x40,0x4b,0x30,0x00,0x00,0x00,0x00,0x00,0x00,0x45,0x40,0x4b,0x30}, 8333},
+    {{0x20,0x02,0x51,0xab,0x07,0xcc,0x00,0x00,0x00,0x00,0x00,0x00,0x51,0xab,0x07,0xcc}, 8333},
+    {{0x20,0x02,0x05,0x27,0xde,0x11,0x00,0x00,0x00,0x00,0x00,0x00,0x05,0x27,0xde,0x11}, 8333},
+    {{0x20,0x02,0x53,0x95,0x7d,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x53,0x95,0x7d,0x01}, 8333},
+    {{0x20,0x02,0x53,0x95,0x7d,0x2a,0x00,0x00,0x00,0x00,0x00,0x00,0x53,0x95,0x7d,0x2a}, 8333},
+    {{0x20,0x02,0x56,0x69,0xe3,0xbe,0x00,0x00,0x00,0x00,0x00,0x00,0x56,0x69,0xe3,0xbe}, 8333},
+    {{0x20,0x02,0x56,0x6a,0x5d,0x6d,0x00,0x00,0x00,0x00,0x00,0x00,0x56,0x6a,0x5d,0x6d}, 8333},
+    {{0x20,0x02,0x59,0xb9,0xf8,0x20,0x00,0x00,0x00,0x00,0x00,0x00,0x59,0xb9,0xf8,0x20}, 8333},
+    {{0x20,0x02,0x59,0xf8,0xac,0x69,0x00,0x00,0x00,0x00,0x00,0x00,0x59,0xf8,0xac,0x69}, 8333},
+    {{0x20,0x02,0x5b,0xd4,0xb6,0x5a,0x00,0x00,0x00,0x00,0x00,0x00,0x5b,0xd4,0xb6,0x5a}, 8333},
+    {{0x20,0x02,0x5c,0x3f,0x39,0xdb,0x00,0x00,0x00,0x00,0x00,0x00,0x5c,0x3f,0x39,0xdb}, 8333},
+    {{0x20,0x02,0x5d,0x33,0x8d,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x5d,0x33,0x8d,0x03}, 8333},
+    {{0x20,0x02,0x5d,0x67,0x49,0xbb,0x00,0x00,0x00,0x00,0x00,0x00,0x5d,0x67,0x49,0xbb}, 8333},
+    {{0x20,0x02,0x5d,0xae,0x5d,0x5f,0x00,0x00,0x00,0x00,0x00,0x00,0x5d,0xae,0x5d,0x5f}, 8333},
+    {{0x20,0x02,0x5d,0xbe,0x8c,0xc6,0x00,0x00,0x00,0x00,0x00,0x00,0x5d,0xbe,0x8c,0xc6}, 8333},
+    {{0x20,0x02,0x5d,0xbe,0x95,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x5d,0xbe,0x95,0x03}, 8333},
+    {{0x20,0x02,0x5f,0xd3,0x89,0x44,0x00,0x00,0x00,0x00,0x00,0x00,0x5f,0xd3,0x89,0x44}, 8333},
+    {{0x20,0x02,0x5f,0xd3,0x94,0x67,0x00,0x00,0x00,0x00,0x00,0x00,0x5f,0xd3,0x94,0x67}, 8333},
+    {{0x20,0x02,0x67,0xf9,0x6a,0x48,0x00,0x00,0x00,0x00,0x00,0x00,0x67,0xf9,0x6a,0x48}, 8333},
+    {{0x20,0x02,0x67,0xf9,0x6a,0x4a,0x00,0x00,0x00,0x00,0x00,0x00,0x67,0xf9,0x6a,0x4a}, 8333},
+    {{0x20,0x02,0x67,0xf9,0x6a,0x95,0x00,0x00,0x00,0x00,0x00,0x00,0x67,0xf9,0x6a,0x95}, 8333},
+    {{0x20,0x02,0x6a,0x0e,0x3e,0xa8,0x00,0x00,0x00,0x00,0x00,0x00,0x6a,0x0e,0x3e,0xa8}, 10011},
+    {{0x20,0x02,0x6b,0x96,0x37,0x5a,0x00,0x00,0x00,0x00,0x00,0x00,0x6b,0x96,0x37,0x5a}, 8333},
+    {{0x20,0x02,0x6c,0xa8,0xcf,0xfb,0x00,0x00,0x00,0x00,0x00,0x00,0x6c,0xa8,0xcf,0xfb}, 8333},
+    {{0x20,0x02,0x6c,0xaf,0x02,0x34,0x00,0x00,0x00,0x00,0x00,0x00,0x6c,0xaf,0x02,0x34}, 8333},
+    {{0x20,0x02,0x6d,0xec,0x58,0xf5,0x00,0x00,0x00,0x00,0x00,0x00,0x6d,0xec,0x58,0xf5}, 8333},
+    {{0x20,0x02,0x6d,0xec,0x5a,0xc7,0x00,0x00,0x00,0x00,0x00,0x00,0x6d,0xec,0x5a,0xc7}, 8333},
+    {{0x20,0x02,0x72,0x37,0x4a,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x72,0x37,0x4a,0x02}, 20033},
+    {{0x20,0x02,0x72,0x37,0x94,0xfd,0x00,0x00,0x00,0x00,0x00,0x00,0x72,0x37,0x94,0xfd}, 10011},
+    {{0x20,0x02,0x72,0x37,0xe4,0x28,0x00,0x00,0x00,0x00,0x00,0x00,0x72,0x37,0xe4,0x28}, 8333},
+    {{0x20,0x02,0x72,0x37,0xfc,0xf6,0x00,0x00,0x00,0x00,0x00,0x00,0x72,0x37,0xfc,0xf6}, 20188},
+    {{0x20,0x02,0x76,0xc0,0x96,0xe6,0x00,0x00,0x00,0x00,0x00,0x00,0x76,0xc0,0x96,0xe6}, 8333},
+    {{0x20,0x02,0x78,0x19,0x7e,0x80,0x00,0x00,0x00,0x00,0x00,0x00,0x78,0x19,0x7e,0x80}, 7743},
+    {{0x20,0x02,0x78,0x1a,0xea,0x86,0x00,0x00,0x00,0x00,0x00,0x00,0x78,0x1a,0xea,0x86}, 8333},
+    {{0x20,0x02,0x78,0x1a,0xf3,0xc2,0x00,0x00,0x00,0x00,0x00,0x00,0x78,0x1a,0xf3,0xc2}, 14475},
+    {{0x20,0x02,0x78,0x4c,0xc2,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x78,0x4c,0xc2,0xc0}, 8333},
+    {{0x20,0x02,0x78,0x4c,0xec,0x97,0x00,0x00,0x00,0x00,0x00,0x00,0x78,0x4c,0xec,0x97}, 8333},
+    {{0x20,0x02,0x79,0x2b,0x26,0x1a,0x00,0x00,0x00,0x00,0x00,0x00,0x79,0x2b,0x26,0x1a}, 8333},
+    {{0x20,0x02,0x88,0xf3,0x8c,0xca,0x00,0x00,0x00,0x00,0x00,0x00,0x88,0xf3,0x8c,0xca}, 8333},
+    {{0x20,0x02,0x88,0xf3,0xa8,0x3c,0x00,0x00,0x00,0x00,0x00,0x00,0x88,0xf3,0xa8,0x3c}, 8333},
+    {{0x20,0x02,0x8a,0xc9,0x51,0x6f,0x00,0x00,0x00,0x00,0x00,0x00,0x8a,0xc9,0x51,0x6f}, 8333},
+    {{0x20,0x02,0x8b,0x81,0x6d,0x78,0x00,0x00,0x00,0x00,0x00,0x00,0x8b,0x81,0x6d,0x78}, 50344},
+    {{0x20,0x02,0x8b,0x81,0x6e,0x5c,0x00,0x00,0x00,0x00,0x00,0x00,0x8b,0x81,0x6e,0x5c}, 38176},
+    {{0x20,0x02,0x8b,0xc4,0x90,0xa6,0x00,0x00,0x00,0x00,0x00,0x00,0x8b,0xc4,0x90,0xa6}, 8333},
+    {{0x20,0x02,0xac,0x52,0xb8,0x54,0x00,0x00,0x00,0x00,0x00,0x00,0xac,0x52,0xb8,0x54}, 8333},
+    {{0x20,0x02,0xad,0xd0,0xc1,0x4a,0x00,0x00,0x00,0x00,0x00,0x00,0xad,0xd0,0xc1,0x4a}, 8333},
+    {{0x20,0x02,0xb0,0x7e,0xa7,0x0a,0x00,0x00,0x00,0x00,0x00,0x00,0xb0,0x7e,0xa7,0x0a}, 8333},
+    {{0x20,0x02,0xb2,0x7c,0xc5,0x65,0x00,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x02,0x50}, 8333},
+    {{0x20,0x02,0xb2,0x7c,0xc5,0x65,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333},
+    {{0x20,0x02,0xb9,0x4d,0x80,0xf1,0x00,0x00,0x00,0x00,0x00,0x00,0xb9,0x4d,0x80,0xf1}, 8333},
+    {{0x20,0x02,0xb9,0x82,0xe2,0x6a,0x00,0x00,0x00,0x00,0x00,0x00,0xb9,0x82,0xe2,0x6a}, 8333},
+    {{0x20,0x02,0xbc,0xd5,0x31,0x45,0x00,0x00,0x00,0x00,0x00,0x00,0xbc,0xd5,0x31,0x45}, 8333},
+    {{0x20,0x02,0xc0,0x8a,0xd2,0x2b,0x00,0x00,0x00,0x00,0x00,0x00,0xc0,0x8a,0xd2,0x2b}, 8333},
+    {{0x20,0x02,0xc0,0xc7,0xf8,0xe3,0x00,0x00,0x00,0x00,0x00,0x00,0xc0,0xc7,0xf8,0xe3}, 32771},
+    {{0x20,0x02,0xc1,0xa9,0xfc,0x5a,0x00,0x00,0x00,0x00,0x00,0x00,0xc1,0xa9,0xfc,0x5a}, 8333},
+    {{0x20,0x02,0xc2,0x3f,0x8f,0xc5,0x00,0x00,0x00,0x00,0x00,0x00,0xc2,0x3f,0x8f,0xc5}, 8333},
+    {{0x20,0x02,0xd3,0x95,0xea,0x6d,0x00,0x00,0x00,0x00,0x00,0x00,0xd3,0x95,0xea,0x6d}, 8333},
     {{0x20,0x02,0xd9,0x17,0x0c,0xa5,0x00,0x00,0x00,0x00,0x00,0x00,0xd9,0x17,0x0c,0xa5}, 8333},
-    {{0x24,0x00,0x89,0x00,0x00,0x00,0x00,0x00,0xf0,0x3c,0x91,0xff,0xfe,0x50,0x15,0x3f}, 8333},
-    {{0x24,0x00,0x89,0x00,0x00,0x00,0x00,0x00,0xf0,0x3c,0x91,0xff,0xfe,0x6e,0x82,0x3e}, 8333},
-    {{0x24,0x00,0x89,0x00,0x00,0x00,0x00,0x00,0xf0,0x3c,0x91,0xff,0xfe,0xa8,0x19,0x34}, 8333},
-    {{0x24,0x00,0x89,0x01,0x00,0x00,0x00,0x00,0xf0,0x3c,0x91,0xff,0xfe,0x26,0xc4,0xd6}, 8333},
+    {{0x20,0x02,0xd9,0x17,0x0e,0x91,0x00,0x00,0x00,0x00,0x00,0x00,0xd9,0x17,0x0e,0x91}, 8333},
+    {{0x20,0x02,0xdb,0x71,0xf4,0x34,0x00,0x00,0x00,0x00,0x00,0x00,0xdb,0x71,0xf4,0x34}, 8333},
+    {{0x24,0x00,0x26,0x51,0x01,0x61,0x10,0x00,0x68,0x47,0xd4,0x0f,0xaa,0xa3,0x48,0x48}, 8333},
     {{0x24,0x00,0x89,0x01,0x00,0x00,0x00,0x00,0xf0,0x3c,0x91,0xff,0xfe,0xc8,0x42,0x80}, 8333},
-    {{0x24,0x00,0x89,0x01,0x00,0x00,0x00,0x00,0xf0,0x3c,0x91,0xff,0xfe,0xc8,0x66,0x0f}, 8333},
-    {{0x24,0x01,0x18,0x00,0x78,0x00,0x01,0x02,0xbe,0x76,0x4e,0xff,0xfe,0x1c,0x05,0x59}, 8333},
     {{0x24,0x01,0x18,0x00,0x78,0x00,0x01,0x02,0xbe,0x76,0x4e,0xff,0xfe,0x1c,0x0a,0x7d}, 8333},
+    {{0x24,0x01,0x25,0x00,0x02,0x03,0x00,0x10,0x01,0x53,0x01,0x20,0x01,0x56,0x00,0x83}, 8333},
+    {{0x24,0x01,0xa4,0x00,0x32,0x00,0x56,0x00,0x14,0xee,0xf3,0x61,0x4b,0xdc,0x1f,0x7c}, 8333},
+    {{0x24,0x03,0x42,0x00,0x04,0x03,0x00,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff}, 8333},
     {{0x24,0x05,0xaa,0x00,0x00,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x40}, 8333},
-    {{0x26,0x00,0x3c,0x00,0x00,0x00,0x00,0x00,0xf0,0x3c,0x91,0xff,0xfe,0x18,0x59,0xb2}, 8333},
-    {{0x26,0x00,0x3c,0x00,0x00,0x00,0x00,0x00,0xf0,0x3c,0x91,0xff,0xfe,0x26,0xbf,0xb6}, 8333},
-    {{0x26,0x00,0x3c,0x00,0x00,0x00,0x00,0x00,0xf0,0x3c,0x91,0xff,0xfe,0x33,0x88,0xe3}, 8333},
-    {{0x26,0x00,0x3c,0x00,0x00,0x00,0x00,0x00,0xf0,0x3c,0x91,0xff,0xfe,0x6e,0x72,0x97}, 8333},
-    {{0x26,0x00,0x3c,0x00,0x00,0x00,0x00,0x00,0xf0,0x3c,0x91,0xff,0xfe,0x84,0x8a,0x6e}, 8333},
+    {{0x24,0x0b,0x00,0x10,0xca,0x20,0x00,0xf0,0x02,0x24,0xe8,0xff,0xfe,0x1f,0x60,0xd9}, 8333},
+    {{0x24,0x0b,0x02,0x50,0x01,0xe0,0x24,0x00,0xb9,0xef,0x8f,0xe3,0xa6,0x9a,0x73,0x78}, 8333},
+    {{0x24,0x0d,0x00,0x1a,0x03,0x02,0x86,0x00,0x88,0x76,0xa3,0x6d,0x12,0xee,0xf2,0x85}, 8333},
+    {{0x26,0x00,0x3c,0x00,0x00,0x00,0x00,0x00,0xf0,0x3c,0x91,0xff,0xfe,0x91,0x3e,0x49}, 8333},
+    {{0x26,0x00,0x3c,0x00,0x00,0x00,0x00,0x00,0xf0,0x3c,0x91,0xff,0xfe,0xbb,0x98,0x1e}, 8333},
     {{0x26,0x00,0x3c,0x01,0x00,0x00,0x00,0x00,0xf0,0x3c,0x91,0xff,0xfe,0x18,0x6a,0xdf}, 8333},
-    {{0x26,0x00,0x3c,0x01,0x00,0x00,0x00,0x00,0xf0,0x3c,0x91,0xff,0xfe,0x26,0xc4,0xb8}, 8333},
-    {{0x26,0x00,0x3c,0x01,0x00,0x00,0x00,0x00,0xf0,0x3c,0x91,0xff,0xfe,0x3b,0x1f,0x76}, 8333},
-    {{0x26,0x00,0x3c,0x01,0x00,0x00,0x00,0x00,0xf0,0x3c,0x91,0xff,0xfe,0x50,0x5e,0x06}, 8333},
-    {{0x26,0x00,0x3c,0x01,0x00,0x00,0x00,0x00,0xf0,0x3c,0x91,0xff,0xfe,0x61,0x28,0x9b}, 8333},
     {{0x26,0x00,0x3c,0x01,0x00,0x00,0x00,0x00,0xf0,0x3c,0x91,0xff,0xfe,0x69,0x89,0xe9}, 8333},
-    {{0x26,0x00,0x3c,0x01,0x00,0x00,0x00,0x00,0xf0,0x3c,0x91,0xff,0xfe,0x84,0xac,0x15}, 8333},
-    {{0x26,0x00,0x3c,0x01,0x00,0x00,0x00,0x00,0xf0,0x3c,0x91,0xff,0xfe,0x98,0x68,0xbb}, 8333},
-    {{0x26,0x00,0x3c,0x02,0x00,0x00,0x00,0x00,0xf0,0x3c,0x91,0xff,0xfe,0x26,0x07,0x13}, 8333},
-    {{0x26,0x00,0x3c,0x02,0x00,0x00,0x00,0x00,0xf0,0x3c,0x91,0xff,0xfe,0x26,0xc4,0x9e}, 8333},
-    {{0x26,0x00,0x3c,0x02,0x00,0x00,0x00,0x00,0xf0,0x3c,0x91,0xff,0xfe,0x84,0x97,0xd8}, 8333},
-    {{0x26,0x00,0x3c,0x02,0x00,0x00,0x00,0x00,0xf0,0x3c,0x91,0xff,0xfe,0xc8,0x8f,0xeb}, 8333},
+    {{0x26,0x00,0x3c,0x01,0x00,0x00,0x00,0x00,0xf0,0x3c,0x91,0xff,0xfe,0x91,0x6a,0x29}, 8333},
+    {{0x26,0x00,0x3c,0x01,0x00,0x00,0x00,0x00,0xf0,0x3c,0x91,0xff,0xfe,0xf1,0x1e,0xaa}, 8333},
     {{0x26,0x00,0x3c,0x03,0x00,0x00,0x00,0x00,0xf0,0x3c,0x91,0xff,0xfe,0x18,0xda,0x80}, 8333},
-    {{0x26,0x00,0x3c,0x03,0x00,0x00,0x00,0x00,0xf0,0x3c,0x91,0xff,0xfe,0x26,0xc4,0x9b}, 8333},
-    {{0x26,0x00,0x3c,0x03,0x00,0x00,0x00,0x00,0xf0,0x3c,0x91,0xff,0xfe,0x50,0x5f,0xa7}, 8333},
+    {{0x26,0x00,0x3c,0x03,0x00,0x00,0x00,0x00,0xf0,0x3c,0x91,0xff,0xfe,0x28,0x14,0x45}, 8333},
     {{0x26,0x00,0x3c,0x03,0x00,0x00,0x00,0x00,0xf0,0x3c,0x91,0xff,0xfe,0x67,0x0d,0x2e}, 8333},
-    {{0x26,0x00,0x3c,0x03,0x00,0x00,0x00,0x00,0xf0,0x3c,0x91,0xff,0xfe,0x6e,0x18,0x03}, 8333},
-    {{0x26,0x00,0x3c,0x03,0x00,0x00,0x00,0x00,0xf0,0x3c,0x91,0xff,0xfe,0xc8,0x4b,0xbe}, 8333},
-    {{0x26,0x00,0x3c,0x03,0x00,0x00,0x00,0x00,0xf0,0x3c,0x91,0xff,0xfe,0xe4,0x4e,0x16}, 8333},
-    {{0x26,0x01,0x01,0x8d,0x83,0x00,0x58,0xa6,0x00,0x00,0x00,0x00,0x00,0x00,0x02,0xe4}, 8333},
-    {{0x26,0x01,0x02,0x40,0x46,0x00,0x40,0xc0,0x02,0x50,0x56,0xff,0xfe,0xa4,0x63,0x05}, 8333},
-    {{0x26,0x01,0x05,0x81,0xc2,0x00,0xa7,0x19,0x54,0x2c,0x9c,0xd5,0x48,0x52,0xf7,0xd9}, 8333},
-    {{0x26,0x01,0x06,0x47,0x49,0x00,0x85,0xf1,0xca,0x2a,0x14,0xff,0xfe,0x51,0xbb,0x35}, 8333},
-    {{0x26,0x01,0x00,0xc2,0xc0,0x02,0xb3,0x00,0x54,0xa0,0x15,0xb5,0x19,0xf7,0x53,0x0d}, 8333},
-    {{0x26,0x02,0x03,0x06,0xcc,0xff,0xad,0x7f,0xb1,0x16,0x52,0xbe,0x64,0xba,0xdb,0x3a}, 8333},
-    {{0x26,0x02,0x00,0xae,0x19,0x82,0x94,0x00,0x08,0x46,0xf7,0x8c,0x0f,0xec,0x4d,0x57}, 8333},
+    {{0x26,0x00,0x3c,0x03,0x00,0x00,0x00,0x00,0xf0,0x3c,0x91,0xff,0xfe,0x89,0x11,0x6f}, 8333},
+    {{0x26,0x00,0x3c,0x03,0x00,0x00,0x00,0x00,0xf0,0x3c,0x91,0xff,0xfe,0xb0,0x5f,0xc4}, 8333},
+    {{0x26,0x00,0x3c,0x03,0x00,0x00,0x00,0x00,0xf0,0x3c,0x91,0xff,0xfe,0xe0,0x23,0x3e}, 8333},
+    {{0x26,0x00,0x3c,0x03,0x00,0x00,0x00,0x00,0xf0,0x3c,0x91,0xff,0xfe,0xe0,0x00,0x51}, 8333},
+    {{0x26,0x00,0x88,0x05,0x24,0x00,0x01,0x4e,0x02,0x26,0x4a,0xff,0xfe,0x02,0x2b,0xa4}, 8333},
+    {{0x26,0x00,0x88,0x07,0x50,0x80,0x33,0x01,0x14,0x87,0x83,0xb7,0x33,0xd7,0xeb,0x97}, 8333},
+    {{0x26,0x01,0x01,0x86,0xc1,0x00,0x6b,0xcd,0x16,0xbd,0xce,0xa1,0x23,0x5d,0x1c,0x19}, 8333},
+    {{0x26,0x01,0x01,0x8c,0x42,0x00,0x28,0xd0,0x0e,0x4d,0xe9,0xff,0xfe,0xc5,0x76,0xd0}, 8333},
+    {{0x26,0x01,0x02,0x47,0x82,0x01,0x62,0x51,0x30,0xe6,0x7b,0x95,0x69,0xbf,0x92,0x48}, 8333},
+    {{0x26,0x01,0x06,0x02,0x99,0x80,0x0f,0x78,0x02,0x11,0x11,0xff,0xfe,0xc5,0x01,0xae}, 8333},
+    {{0x26,0x02,0x00,0xae,0x19,0x93,0xde,0x00,0x2c,0x50,0x9a,0x44,0x8f,0x11,0x77,0xa5}, 8333},
+    {{0x26,0x02,0xff,0x68,0x00,0x00,0x00,0x01,0x02,0x1e,0x0b,0xff,0xfe,0xca,0xdb,0x72}, 8333},
+    {{0x26,0x02,0xff,0x68,0x00,0x00,0x00,0x01,0x02,0xbd,0x27,0xff,0xfe,0xb0,0xad,0xf8}, 8333},
+    {{0x26,0x02,0xff,0x68,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x05}, 8333},
+    {{0x26,0x02,0xff,0x68,0x00,0x00,0x00,0x05,0x02,0xbd,0x27,0xff,0xfe,0xb0,0xad,0xf8}, 8333},
     {{0x26,0x02,0xff,0xc5,0x00,0x1f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x1f,0x2d,0x61}, 8333},
     {{0x26,0x02,0xff,0xc5,0x00,0x1f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x1f,0x92,0x11}, 8333},
-    {{0x26,0x02,0xff,0xc5,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x75,0xd5,0xc1,0xc3}, 8333},
+    {{0x26,0x02,0xff,0xc5,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x9e,0x63,0x27,0xa2}, 8333},
+    {{0x26,0x02,0xff,0xc5,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0c,0x30,0x1c,0x75}, 8333},
     {{0x26,0x02,0xff,0xc5,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xc5,0xb8,0x44}, 8333},
     {{0x26,0x02,0xff,0xe8,0x01,0x00,0x00,0x02,0x00,0x00,0x00,0x00,0x04,0x57,0x93,0x6b}, 8333},
-    {{0x26,0x02,0xff,0xe8,0x01,0x00,0x00,0x02,0x00,0x00,0x00,0x00,0x9d,0x20,0x2e,0x3c}, 8333},
-    {{0x26,0x02,0xff,0xea,0x10,0x01,0x07,0x2b,0x00,0x00,0x00,0x00,0x00,0x00,0x57,0x8b}, 8333},
-    {{0x26,0x02,0xff,0xea,0x00,0x0a,0x00,0x00,0x00,0x00,0x00,0x00,0x24,0xc4,0xd9,0xfd}, 8333},
-    {{0x26,0x04,0x00,0x00,0x00,0xc1,0x01,0x00,0x1e,0xc1,0xde,0xff,0xfe,0x54,0x22,0x35}, 8333},
-    {{0x26,0x04,0x01,0x80,0x00,0x01,0x01,0xaf,0x00,0x00,0x00,0x00,0x00,0x00,0x42,0xa9}, 8333},
-    {{0x26,0x04,0x01,0x80,0x00,0x03,0x07,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0xc9,0xde}, 8333},
-    {{0x26,0x04,0x40,0x80,0x11,0x14,0x00,0x00,0x32,0x85,0xa9,0xff,0xfe,0x93,0x85,0x0c}, 8333},
-    {{0x26,0x04,0x60,0x00,0xff,0xc0,0x00,0x3c,0x64,0xa3,0x94,0xd0,0x4f,0x1d,0x1d,0xa8}, 8333},
-    {{0x26,0x05,0x60,0x00,0xf3,0x80,0x9a,0x01,0xba,0x09,0x8a,0xff,0xfe,0xd4,0x35,0x11}, 8333},
-    {{0x26,0x05,0x60,0x01,0xe0,0x0f,0x7b,0x00,0xc5,0x87,0x6d,0x91,0x6e,0xff,0xee,0xba}, 8333},
-    {{0x26,0x05,0xf7,0x00,0x00,0xc0,0x00,0x01,0x00,0x00,0x00,0x00,0x25,0xc3,0x2a,0x3e}, 8333},
-    {{0x26,0x06,0x60,0x00,0xa4,0x41,0x99,0x03,0x50,0x54,0x00,0xff,0xfe,0x78,0x66,0xff}, 8333},
-    {{0x26,0x07,0x53,0x00,0x01,0x00,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x1c,0x83}, 9334},
-    {{0x26,0x07,0x53,0x00,0x00,0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xa1}, 8333},
-    {{0x26,0x07,0x53,0x00,0x00,0x60,0x1c,0x2f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333},
-    {{0x26,0x07,0x53,0x00,0x00,0x60,0x2b,0x90,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333},
-    {{0x26,0x07,0x53,0x00,0x00,0x60,0x33,0x20,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333},
-    {{0x26,0x07,0x53,0x00,0x00,0x60,0x03,0x85,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333},
-    {{0x26,0x07,0x53,0x00,0x00,0x60,0x4a,0x85,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8333},
-    {{0x26,0x07,0x53,0x00,0x00,0x60,0x65,0xe4,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8333},
-    {{0x26,0x07,0x53,0x00,0x00,0x60,0x69,0x18,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8333},
-    {{0x26,0x07,0x53,0x00,0x00,0x60,0x71,0x1a,0x00,0x78,0x00,0x00,0x00,0x00,0xa7,0xb5}, 8333},
-    {{0x26,0x07,0x53,0x00,0x00,0x60,0x07,0x14,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333},
-    {{0x26,0x07,0x53,0x00,0x00,0x60,0x08,0x70,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333},
-    {{0x26,0x07,0x53,0x00,0x00,0x60,0x95,0x2e,0x37,0x33,0x00,0x00,0x00,0x00,0x14,0x14}, 8333},
-    {{0x26,0x07,0xf1,0xc0,0x08,0x48,0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x48,0x94,0x3c}, 8333},
-    {{0x26,0x07,0xf2,0xe0,0x00,0x0f,0x05,0xdf,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
-    {{0x26,0x07,0xf7,0x48,0x12,0x00,0x00,0xf8,0x02,0x1e,0x67,0xff,0xfe,0x99,0x8f,0x07}, 8333},
-    {{0x26,0x07,0xf9,0x48,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x07}, 8333},
-    {{0x26,0x07,0xff,0x68,0x01,0x00,0x00,0x36,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x31}, 8333},
-    {{0x28,0x03,0x69,0x00,0x00,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x17}, 8333},
-    {{0x2a,0x00,0x10,0x98,0x00,0x00,0x00,0x80,0x10,0x00,0x00,0x25,0x00,0x00,0x00,0x01}, 8333},
-    {{0x2a,0x00,0x11,0x78,0x00,0x02,0x00,0x43,0x50,0x54,0x00,0xff,0xfe,0x84,0xf8,0x6f}, 8333},
-    {{0x2a,0x00,0x11,0x78,0x00,0x02,0x00,0x43,0x50,0x54,0x00,0xff,0xfe,0xe7,0x2e,0xb6}, 8333},
-    {{0x2a,0x00,0x11,0x78,0x00,0x02,0x00,0x43,0x89,0x83,0xcc,0x27,0x0d,0x72,0xd9,0x7a}, 8333},
-    {{0x2a,0x00,0x13,0x28,0xe1,0x00,0xcc,0x42,0x02,0x30,0x48,0xff,0xfe,0x92,0x05,0x5c}, 8333},
+    {{0x26,0x04,0x01,0x80,0x00,0x02,0x0e,0xee,0x00,0x00,0x00,0x00,0x00,0x00,0xca,0x46}, 8333},
+    {{0x26,0x04,0x08,0x80,0x00,0x0d,0x00,0x85,0x00,0x00,0x00,0x00,0x00,0x00,0xbe,0x37}, 8333},
+    {{0x26,0x04,0x9a,0x00,0x21,0x00,0xa0,0x09,0x00,0x02,0x00,0x00,0x00,0x00,0x00,0x00}, 8333},
+    {{0x26,0x04,0xa8,0x80,0x00,0x02,0x00,0xd0,0x00,0x00,0x00,0x00,0x03,0x01,0x80,0x01}, 8333},
+    {{0x26,0x04,0xa8,0x80,0x00,0x02,0x00,0xd0,0x00,0x00,0x00,0x00,0x04,0xa9,0x10,0x01}, 8333},
+    {{0x26,0x04,0xa8,0x80,0x00,0x02,0x00,0xd0,0x00,0x00,0x00,0x00,0x05,0x3a,0xc0,0x01}, 8333},
+    {{0x26,0x04,0xa8,0x80,0x04,0x00,0x00,0xd0,0x00,0x00,0x00,0x00,0x0a,0xd7,0xe0,0x01}, 8333},
+    {{0x26,0x04,0xa8,0x80,0x04,0x00,0x00,0xd0,0x00,0x00,0x00,0x00,0x0d,0xcf,0xf0,0x01}, 8333},
+    {{0x26,0x05,0x4d,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x50}, 8333},
+    {{0x26,0x05,0x60,0x00,0xed,0xc8,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xdd,0xfe}, 8333},
+    {{0x26,0x05,0x60,0x00,0xff,0xc0,0x00,0x70,0x74,0xd5,0x22,0x5c,0xf5,0x53,0x5b,0xb8}, 8333},
+    {{0x26,0x06,0x60,0x00,0xc1,0x48,0x70,0x03,0x50,0x54,0x00,0xff,0xfe,0x78,0x66,0xff}, 8333},
+    {{0x26,0x06,0x60,0x00,0xe6,0xd6,0xd7,0x01,0xd4,0x28,0x5e,0x44,0xa2,0xc9,0x3f,0xf6}, 8333},
+    {{0x26,0x06,0xc6,0x80,0x00,0x01,0x00,0x4a,0x20,0x16,0xd1,0xff,0xfe,0x93,0x52,0xa7}, 8333},
+    {{0x26,0x07,0x53,0x00,0x02,0x03,0x01,0x18,0x37,0x33,0x00,0x00,0x00,0x00,0x14,0x14}, 8333},
+    {{0x26,0x07,0x53,0x00,0x00,0x60,0x13,0xbb,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333},
+    {{0x26,0x07,0x53,0x00,0x00,0x60,0x19,0x66,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333},
+    {{0x26,0x07,0x53,0x00,0x00,0x60,0x22,0x18,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8333},
+    {{0x26,0x07,0x53,0x00,0x00,0x60,0x37,0x75,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8333},
+    {{0x26,0x07,0x53,0x00,0x00,0x60,0x3d,0xdf,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8333},
+    {{0x26,0x07,0x53,0x00,0x00,0x60,0xa6,0x54,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8333},
+    {{0x26,0x07,0x53,0x00,0x00,0x60,0xa7,0xa3,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8333},
+    {{0x26,0x07,0x53,0x00,0x00,0x60,0x0a,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333},
+    {{0x26,0x07,0x53,0x00,0x00,0x60,0xcf,0x97,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8333},
+    {{0x26,0x07,0xf0,0xd0,0x19,0x01,0x00,0x19,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x06}, 8333},
+    {{0x26,0x07,0xf1,0x28,0x00,0x40,0x12,0x02,0x00,0x69,0x01,0x62,0x01,0x39,0x01,0x25}, 8333},
+    {{0x26,0x07,0xf1,0x28,0x00,0x40,0x17,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
+    {{0x26,0x07,0xf1,0x78,0x00,0x00,0x00,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x06}, 8333},
+    {{0x26,0x07,0xf1,0xc0,0x08,0x4d,0x89,0x00,0x00,0x00,0x00,0x00,0x00,0x7e,0x0c,0xad}, 8333},
+    {{0x26,0x07,0xf9,0x48,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x00,0x00,0x01,0x00,0x40}, 8333},
+    {{0x26,0x07,0xfc,0xd0,0x01,0x00,0x23,0x02,0x00,0x00,0x00,0x00,0x60,0x94,0x63,0x5a}, 8333},
+    {{0x26,0x07,0xfc,0xd0,0x01,0x00,0x6a,0x00,0x00,0x00,0x00,0x00,0x3a,0x96,0x00,0x01}, 8333},
+    {{0x26,0x07,0xfc,0xd0,0x01,0x00,0x6a,0x02,0x00,0x00,0x00,0x00,0x7f,0xf0,0x00,0x01}, 8333},
+    {{0x26,0x07,0xfc,0xd0,0x01,0x00,0x82,0x03,0x00,0x00,0x00,0x00,0x8c,0x58,0x0d,0xbc}, 8333},
+    {{0x26,0x07,0xfe,0xa8,0x13,0x60,0x09,0xc2,0x22,0x1a,0x06,0xff,0xfe,0x47,0x77,0x6d}, 8333},
+    {{0x26,0x07,0xfe,0xa8,0x4d,0xa0,0x09,0xce,0x51,0x14,0xa8,0xec,0x20,0xf5,0xa5,0x0b}, 8333},
+    {{0x26,0x07,0xfe,0xa8,0x05,0xdf,0xfd,0xa0,0xfe,0xaa,0x14,0xff,0xfe,0xda,0xc7,0x9a}, 8333},
+    {{0x26,0x07,0xfe,0xa8,0x84,0xc0,0x01,0x63,0xf4,0x2c,0xba,0xff,0xfe,0xcc,0x6b,0xbf}, 8333},
+    {{0x26,0x07,0xff,0x10,0x00,0xc5,0x05,0x02,0x02,0x25,0x90,0xff,0xfe,0x32,0xd4,0x46}, 8333},
+    {{0x26,0x07,0xff,0x48,0xaa,0x81,0x08,0x00,0x00,0x00,0x00,0x00,0x96,0xcf,0x00,0x01}, 8333},
+    {{0x26,0x20,0x01,0x1c,0x50,0x01,0x11,0x18,0xd2,0x67,0xe5,0xff,0xfe,0xe9,0xe6,0x73}, 8333},
+    {{0x26,0x20,0x00,0xb8,0x40,0x00,0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x93,0x00,0x01}, 8333},
+    {{0x28,0x00,0x01,0xa0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x09}, 8333},
+    {{0x2a,0x00,0x11,0x78,0x00,0x02,0x00,0x43,0x19,0xfd,0xd4,0x3e,0x0b,0x77,0xed,0xeb}, 8333},
+    {{0x2a,0x00,0x11,0x78,0x00,0x02,0x00,0x43,0xb4,0xe3,0xe5,0x62,0xf8,0x11,0xd7,0x61}, 8333},
     {{0x2a,0x00,0x14,0xf0,0xe0,0x00,0x80,0xd2,0xcd,0x1a,0x00,0x00,0x00,0x00,0x00,0x01}, 8333},
+    {{0x2a,0x00,0x16,0x30,0x00,0x14,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x01}, 8333},
     {{0x2a,0x00,0x16,0x30,0x00,0x02,0x18,0x02,0x01,0x88,0x01,0x22,0x00,0x91,0x00,0x11}, 8333},
-    {{0x2a,0x00,0x18,0xe0,0x00,0x00,0x18,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333},
-    {{0x2a,0x00,0x18,0xe0,0x00,0x00,0xdc,0xc5,0x01,0x09,0x02,0x34,0x01,0x06,0x01,0x91}, 8333},
-    {{0x2a,0x00,0x1a,0x28,0x11,0x57,0x00,0x87,0x00,0x00,0x00,0x00,0x00,0x00,0x94,0xc7}, 8333},
+    {{0x2a,0x00,0x16,0x30,0x00,0x02,0x05,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x04}, 8333},
+    {{0x2a,0x00,0x17,0x68,0x20,0x01,0x00,0x24,0x00,0x00,0x00,0x00,0x01,0x48,0x02,0x18}, 8333},
+    {{0x2a,0x00,0x17,0x68,0x20,0x01,0x00,0x27,0x00,0x00,0x00,0x00,0x01,0x42,0x00,0x21}, 8333},
+    {{0x2a,0x00,0x1a,0x48,0x78,0x10,0x01,0x01,0xbe,0x76,0x4e,0xff,0xfe,0x08,0xc7,0x74}, 8333},
     {{0x2a,0x00,0x1c,0xa8,0x00,0x37,0x00,0x00,0x00,0x00,0x00,0x00,0xa5,0xfc,0x40,0xd1}, 8333},
     {{0x2a,0x00,0x1c,0xa8,0x00,0x37,0x00,0x00,0x00,0x00,0x00,0x00,0xab,0x6d,0xce,0x2c}, 8333},
-    {{0x2a,0x00,0x71,0x43,0x01,0x00,0x00,0x00,0x02,0x16,0x3e,0xff,0xfe,0x2e,0x74,0xa3}, 8333},
-    {{0x2a,0x00,0x71,0x43,0x01,0x00,0x00,0x00,0x02,0x16,0x3e,0xff,0xfe,0xd3,0x5c,0x21}, 8333},
-    {{0x2a,0x00,0x7c,0x80,0x00,0x00,0x00,0x45,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x23}, 8333},
+    {{0x2a,0x00,0x1d,0xc0,0x22,0x55,0x00,0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
+    {{0x2a,0x00,0x7c,0x80,0x00,0x00,0x00,0x71,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x08}, 8333},
+    {{0x2a,0x00,0x7c,0x80,0x00,0x00,0x00,0x97,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x07}, 8333},
+    {{0x2a,0x00,0xbb,0xe0,0x00,0x00,0x00,0x42,0x02,0x22,0x64,0xff,0xfe,0x9a,0xe2,0x06}, 8333},
+    {{0x2a,0x00,0x0c,0x98,0x20,0x50,0xa0,0x20,0x00,0x03,0x00,0x00,0x00,0x00,0x01,0x10}, 8333},
+    {{0x2a,0x00,0xdc,0xc0,0x0e,0xda,0x00,0x98,0x01,0x83,0x01,0x93,0x1d,0x24,0xb5,0x3a}, 8333},
     {{0x2a,0x00,0xdc,0xc0,0x0e,0xda,0x00,0x98,0x01,0x83,0x01,0x93,0xc3,0x82,0x6b,0xdb}, 8333},
     {{0x2a,0x00,0xdc,0xc0,0x0e,0xda,0x00,0x98,0x01,0x83,0x01,0x93,0xf7,0x2e,0xd9,0x43}, 8333},
-    {{0x2a,0x00,0xf8,0x20,0x00,0x17,0x00,0x00,0x00,0x00,0x00,0x00,0x04,0xaf,0x00,0x01}, 8333},
-    {{0x2a,0x00,0xf9,0x40,0x00,0x02,0x00,0x01,0x00,0x02,0x00,0x00,0x00,0x00,0x10,0x1d}, 8333},
-    {{0x2a,0x00,0xf9,0x40,0x00,0x02,0x00,0x01,0x00,0x02,0x00,0x00,0x00,0x00,0x06,0xac}, 8333},
-    {{0x2a,0x01,0x01,0xb0,0x79,0x99,0x04,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x31}, 8333},
-    {{0x2a,0x01,0x02,0x38,0x42,0xdd,0xf9,0x00,0x7a,0x6c,0x2b,0xc6,0x40,0x41,0x0c,0x43}, 8333},
-    {{0x2a,0x01,0x02,0x38,0x43,0x13,0x63,0x00,0x21,0x89,0x1c,0x97,0x69,0x6b,0x05,0xea}, 8333},
-    {{0x2a,0x01,0x04,0x88,0x00,0x66,0x10,0x00,0x5c,0x33,0x91,0xf9,0x00,0x00,0x00,0x01}, 8333},
-    {{0x2a,0x01,0x04,0x88,0x00,0x66,0x10,0x00,0xb0,0x1c,0x17,0x8d,0x00,0x00,0x00,0x01}, 8333},
+    {{0x2a,0x00,0x0f,0x90,0x0f,0xf0,0xc1,0x00,0x53,0xc4,0x97,0xa7,0x8b,0x59,0x79,0x6a}, 8333},
+    {{0x2a,0x01,0x02,0x38,0x43,0x5c,0xde,0x00,0xb1,0x10,0x38,0xcf,0x19,0x2d,0x0b,0x2c}, 28333},
+    {{0x2a,0x01,0x03,0x48,0x00,0x06,0x07,0xcf,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
+    {{0x2a,0x01,0x03,0x68,0xe0,0x12,0x88,0x88,0x02,0x16,0x3e,0xff,0xfe,0x24,0x11,0x62}, 8333},
+    {{0x2a,0x01,0x04,0x88,0x00,0x66,0x10,0x00,0x53,0xa9,0x02,0x2b,0x00,0x00,0x00,0x01}, 8333},
+    {{0x2a,0x01,0x04,0x88,0x00,0x67,0x10,0x00,0x05,0x23,0xff,0xa7,0x00,0x00,0x00,0x01}, 8333},
+    {{0x2a,0x01,0x04,0x88,0x00,0x67,0x10,0x00,0xb0,0x1c,0x33,0x79,0x00,0x00,0x00,0x01}, 8333},
     {{0x2a,0x01,0x04,0xf8,0x01,0x00,0x34,0xce,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
-    {{0x2a,0x01,0x04,0xf8,0x01,0x00,0x34,0xe4,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
     {{0x2a,0x01,0x04,0xf8,0x01,0x00,0x44,0xe7,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
-    {{0x2a,0x01,0x04,0xf8,0x01,0x00,0x51,0x0e,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
-    {{0x2a,0x01,0x04,0xf8,0x01,0x00,0x51,0x28,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
-    {{0x2a,0x01,0x04,0xf8,0x01,0x10,0x51,0x05,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
-    {{0x2a,0x01,0x04,0xf8,0x01,0x10,0x51,0x6c,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
+    {{0x2a,0x01,0x04,0xf8,0x01,0x0a,0x02,0xe4,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
+    {{0x2a,0x01,0x04,0xf8,0x01,0x0a,0x03,0x4e,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
+    {{0x2a,0x01,0x04,0xf8,0x01,0x0a,0x05,0x1d,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
+    {{0x2a,0x01,0x04,0xf8,0x01,0x0a,0x06,0x22,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
+    {{0x2a,0x01,0x04,0xf8,0x01,0x0a,0x08,0x5f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
+    {{0x2a,0x01,0x04,0xf8,0x01,0x0a,0x08,0x64,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
+    {{0x2a,0x01,0x04,0xf8,0x01,0x0a,0x0d,0x04,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
+    {{0x2a,0x01,0x04,0xf8,0x01,0x10,0x33,0x4c,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
+    {{0x2a,0x01,0x04,0xf8,0x01,0x10,0x53,0x6e,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
     {{0x2a,0x01,0x04,0xf8,0x01,0x20,0x43,0xe4,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
-    {{0x2a,0x01,0x04,0xf8,0x01,0x20,0x62,0xe6,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
     {{0x2a,0x01,0x04,0xf8,0x01,0x20,0x70,0x2e,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
-    {{0x2a,0x01,0x04,0xf8,0x01,0x20,0x82,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
-    {{0x2a,0x01,0x04,0xf8,0x01,0x21,0x23,0x4d,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
-    {{0x2a,0x01,0x04,0xf8,0x01,0x21,0x02,0x61,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
-    {{0x2a,0x01,0x04,0xf8,0x01,0x30,0x11,0xea,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
+    {{0x2a,0x01,0x04,0xf8,0x01,0x21,0x43,0x46,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
     {{0x2a,0x01,0x04,0xf8,0x01,0x30,0x33,0x32,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
-    {{0x2a,0x01,0x04,0xf8,0x01,0x30,0x40,0xab,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
-    {{0x2a,0x01,0x04,0xf8,0x01,0x30,0x63,0x2c,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
-    {{0x2a,0x01,0x04,0xf8,0x01,0x30,0x63,0x66,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
-    {{0x2a,0x01,0x04,0xf8,0x01,0x30,0x93,0x4f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
+    {{0x2a,0x01,0x04,0xf8,0x01,0x31,0x33,0xad,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
     {{0x2a,0x01,0x04,0xf8,0x01,0x31,0x33,0xad,0xfe,0xa1,0x00,0x00,0x00,0x00,0x06,0x66}, 8333},
-    {{0x2a,0x01,0x04,0xf8,0x01,0x40,0x21,0x95,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
-    {{0x2a,0x01,0x04,0xf8,0x01,0x40,0x63,0x33,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
-    {{0x2a,0x01,0x04,0xf8,0x01,0x40,0x93,0x0d,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
+    {{0x2a,0x01,0x04,0xf8,0x01,0x40,0x31,0xb0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
+    {{0x2a,0x01,0x04,0xf8,0x01,0x40,0x40,0x88,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
+    {{0x2a,0x01,0x04,0xf8,0x01,0x40,0x93,0x1a,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
     {{0x2a,0x01,0x04,0xf8,0x01,0x40,0x93,0xb0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
-    {{0x2a,0x01,0x04,0xf8,0x01,0x41,0x11,0x67,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
+    {{0x2a,0x01,0x04,0xf8,0x01,0x41,0x13,0xad,0x00,0x00,0x00,0x00,0x00,0x00,0xc4,0x51}, 8333},
     {{0x2a,0x01,0x04,0xf8,0x01,0x41,0x01,0x86,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
-    {{0x2a,0x01,0x04,0xf8,0x01,0x41,0x53,0xf0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
-    {{0x2a,0x01,0x04,0xf8,0x01,0x50,0x33,0x6a,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
-    {{0x2a,0x01,0x04,0xf8,0x01,0x50,0x72,0xee,0x00,0x00,0x00,0x00,0x00,0x00,0x42,0x02}, 8333},
-    {{0x2a,0x01,0x04,0xf8,0x01,0x50,0x83,0x24,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 9001},
-    {{0x2a,0x01,0x04,0xf8,0x01,0x51,0x21,0xca,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
-    {{0x2a,0x01,0x04,0xf8,0x01,0x51,0x41,0xc2,0x00,0x00,0x54,0x04,0xa6,0x7e,0xf2,0x50}, 8333},
-    {{0x2a,0x01,0x04,0xf8,0x01,0x51,0x51,0x28,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
+    {{0x2a,0x01,0x04,0xf8,0x01,0x41,0x22,0xae,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
+    {{0x2a,0x01,0x04,0xf8,0x01,0x41,0x32,0x2c,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
+    {{0x2a,0x01,0x04,0xf8,0x01,0x50,0x11,0xd4,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
+    {{0x2a,0x01,0x04,0xf8,0x01,0x50,0x44,0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
+    {{0x2a,0x01,0x04,0xf8,0x01,0x50,0x61,0xee,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
+    {{0x2a,0x01,0x04,0xf8,0x01,0x50,0x72,0x6b,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
+    {{0x2a,0x01,0x04,0xf8,0x01,0x51,0x30,0xc9,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 15000},
+    {{0x2a,0x01,0x04,0xf8,0x01,0x51,0x41,0xa2,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
+    {{0x2a,0x01,0x04,0xf8,0x01,0x51,0x41,0xcc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
     {{0x2a,0x01,0x04,0xf8,0x01,0x51,0x52,0xc6,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x54}, 8333},
-    {{0x2a,0x01,0x04,0xf8,0x01,0x51,0x63,0x47,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 9001},
-    {{0x2a,0x01,0x04,0xf8,0x01,0x60,0x51,0x36,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
-    {{0x2a,0x01,0x04,0xf8,0x01,0x60,0x72,0xc5,0x00,0x00,0x00,0x00,0x28,0x58,0xe1,0xc5}, 8333},
-    {{0x2a,0x01,0x04,0xf8,0x01,0x60,0x72,0xc5,0x00,0x00,0x00,0x00,0x59,0x3b,0x60,0xd5}, 8333},
+    {{0x2a,0x01,0x04,0xf8,0x01,0x51,0x60,0x0b,0x00,0x00,0x00,0x00,0x00,0x01,0x00,0x01}, 8333},
+    {{0x2a,0x01,0x04,0xf8,0x01,0x51,0x71,0x75,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
+    {{0x2a,0x01,0x04,0xf8,0x01,0x60,0x41,0xf0,0x00,0x00,0x00,0x00,0x00,0x01,0x00,0x33}, 8333},
+    {{0x2a,0x01,0x04,0xf8,0x01,0x60,0x53,0x28,0x00,0x00,0x00,0x00,0x27,0xf0,0x18,0x7a}, 8333},
     {{0x2a,0x01,0x04,0xf8,0x01,0x60,0x81,0x4f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
-    {{0x2a,0x01,0x04,0xf8,0x01,0x61,0x13,0xd0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
-    {{0x2a,0x01,0x04,0xf8,0x01,0x61,0x22,0x8f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
-    {{0x2a,0x01,0x04,0xf8,0x01,0x61,0x51,0xc4,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
-    {{0x2a,0x01,0x04,0xf8,0x01,0x61,0x60,0xa7,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
+    {{0x2a,0x01,0x04,0xf8,0x01,0x61,0x21,0xad,0x00,0x00,0x00,0x00,0x03,0x33,0x00,0x30}, 8333},
     {{0x2a,0x01,0x04,0xf8,0x01,0x61,0x70,0x26,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
-    {{0x2a,0x01,0x04,0xf8,0x01,0x61,0x91,0x84,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
-    {{0x2a,0x01,0x04,0xf8,0x01,0x62,0x21,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
-    {{0x2a,0x01,0x04,0xf8,0x01,0x62,0x21,0x8c,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
-    {{0x2a,0x01,0x04,0xf8,0x01,0x62,0x44,0x43,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
-    {{0x2a,0x01,0x04,0xf8,0x01,0x62,0x51,0xa3,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
+    {{0x2a,0x01,0x04,0xf8,0x01,0x62,0x41,0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
+    {{0x2a,0x01,0x04,0xf8,0x01,0x62,0x43,0x48,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
+    {{0x2a,0x01,0x04,0xf8,0x01,0x71,0x1c,0x1b,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
+    {{0x2a,0x01,0x04,0xf8,0x01,0x71,0x01,0xc3,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
+    {{0x2a,0x01,0x04,0xf8,0x01,0x71,0x22,0x58,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
+    {{0x2a,0x01,0x04,0xf8,0x01,0x71,0x2a,0x70,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
+    {{0x2a,0x01,0x04,0xf8,0x01,0x71,0x2e,0x1b,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
+    {{0x2a,0x01,0x04,0xf8,0x01,0x71,0x2f,0x28,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
+    {{0x2a,0x01,0x04,0xf8,0x01,0x71,0x32,0x48,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
+    {{0x2a,0x01,0x04,0xf8,0x01,0x71,0x38,0x0c,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
     {{0x2a,0x01,0x04,0xf8,0x01,0x71,0x0b,0x93,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
-    {{0x2a,0x01,0x04,0xf8,0x01,0x90,0x14,0x83,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333},
-    {{0x2a,0x01,0x04,0xf8,0x01,0x90,0x44,0x95,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
-    {{0x2a,0x01,0x04,0xf8,0x01,0x90,0x64,0xc9,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
+    {{0x2a,0x01,0x04,0xf8,0x01,0x71,0x0d,0x0a,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
+    {{0x2a,0x01,0x04,0xf8,0x01,0x72,0x11,0x6c,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
+    {{0x2a,0x01,0x04,0xf8,0x01,0x72,0x12,0x87,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
+    {{0x2a,0x01,0x04,0xf8,0x01,0x72,0x17,0xa9,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
+    {{0x2a,0x01,0x04,0xf8,0x01,0x72,0x1c,0xa7,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
+    {{0x2a,0x01,0x04,0xf8,0x01,0x72,0x21,0x59,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
+    {{0x2a,0x01,0x04,0xf8,0x01,0x72,0x3a,0x41,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
+    {{0x2a,0x01,0x04,0xf8,0x01,0x72,0x3b,0x42,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
+    {{0x2a,0x01,0x04,0xf8,0x01,0x72,0x3e,0xc1,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
+    {{0x2a,0x01,0x04,0xf8,0x01,0x72,0x3e,0xc2,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
+    {{0x2a,0x01,0x04,0xf8,0x01,0x72,0x0a,0xeb,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
+    {{0x2a,0x01,0x04,0xf8,0x01,0x72,0x0a,0xec,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
+    {{0x2a,0x01,0x04,0xf8,0x01,0x73,0x10,0xab,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
+    {{0x2a,0x01,0x04,0xf8,0x01,0x73,0x15,0x51,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
+    {{0x2a,0x01,0x04,0xf8,0x01,0x73,0x1b,0xca,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
+    {{0x2a,0x01,0x04,0xf8,0x01,0x73,0x1e,0x2e,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
+    {{0x2a,0x01,0x04,0xf8,0x01,0x73,0x21,0x62,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
+    {{0x2a,0x01,0x04,0xf8,0x01,0x73,0x21,0xe6,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
+    {{0x2a,0x01,0x04,0xf8,0x01,0x73,0x00,0x42,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
+    {{0x2a,0x01,0x04,0xf8,0x01,0x73,0x0c,0xc1,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
+    {{0x2a,0x01,0x04,0xf8,0x01,0x90,0x12,0x53,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
+    {{0x2a,0x01,0x04,0xf8,0x01,0x90,0x24,0xeb,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
+    {{0x2a,0x01,0x04,0xf8,0x01,0x90,0x34,0xf0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
+    {{0x2a,0x01,0x04,0xf8,0x01,0x90,0x52,0x8d,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
     {{0x2a,0x01,0x04,0xf8,0x01,0x90,0x91,0xce,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
     {{0x2a,0x01,0x04,0xf8,0x01,0x91,0x21,0x94,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x83}, 8333},
     {{0x2a,0x01,0x04,0xf8,0x01,0x91,0x40,0xe8,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
-    {{0x2a,0x01,0x04,0xf8,0x01,0x91,0x44,0xb4,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
-    {{0x2a,0x01,0x04,0xf8,0x01,0x91,0x82,0x42,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
-    {{0x2a,0x01,0x04,0xf8,0x01,0x91,0x83,0xa2,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
-    {{0x2a,0x01,0x04,0xf8,0x01,0x92,0x11,0xb2,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
+    {{0x2a,0x01,0x04,0xf8,0x01,0x91,0x81,0x65,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 22556},
+    {{0x2a,0x01,0x04,0xf8,0x01,0x91,0x81,0xb7,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
+    {{0x2a,0x01,0x04,0xf8,0x01,0x91,0x83,0x28,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x03}, 8333},
+    {{0x2a,0x01,0x04,0xf8,0x01,0x92,0x11,0xb2,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8343},
     {{0x2a,0x01,0x04,0xf8,0x01,0x92,0x21,0x6c,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
-    {{0x2a,0x01,0x04,0xf8,0x01,0x92,0x22,0xb3,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
+    {{0x2a,0x01,0x04,0xf8,0x01,0x92,0x22,0xaf,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
+    {{0x2a,0x01,0x04,0xf8,0x01,0x92,0x24,0x22,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
+    {{0x2a,0x01,0x04,0xf8,0x01,0x92,0x34,0xd0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
     {{0x2a,0x01,0x04,0xf8,0x01,0x92,0x44,0x0b,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
+    {{0x2a,0x01,0x04,0xf8,0x01,0x92,0x52,0x30,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
     {{0x2a,0x01,0x04,0xf8,0x01,0x92,0x00,0xdb,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
     {{0x2a,0x01,0x04,0xf8,0x02,0x00,0x10,0x12,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
-    {{0x2a,0x01,0x04,0xf8,0x02,0x00,0x23,0xd1,0x00,0x00,0x00,0x00,0xde,0xad,0xbe,0xef}, 8333},
-    {{0x2a,0x01,0x04,0xf8,0x02,0x00,0x50,0x6d,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
-    {{0x2a,0x01,0x04,0xf8,0x02,0x00,0x51,0xf0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
-    {{0x2a,0x01,0x04,0xf8,0x02,0x00,0x53,0x89,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
-    {{0x2a,0x01,0x04,0xf8,0x02,0x00,0x53,0xe3,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
-    {{0x2a,0x01,0x04,0xf8,0x02,0x00,0x63,0x44,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
-    {{0x2a,0x01,0x04,0xf8,0x02,0x00,0x63,0x96,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
-    {{0x2a,0x01,0x04,0xf8,0x02,0x00,0x63,0xaf,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x19}, 8333},
-    {{0x2a,0x01,0x04,0xf8,0x02,0x00,0x71,0xe3,0x78,0xb4,0xf3,0xff,0xfe,0xad,0xe8,0xcf}, 8333},
-    {{0x2a,0x01,0x04,0xf8,0x02,0x01,0x21,0x4c,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
-    {{0x2a,0x01,0x04,0xf8,0x02,0x01,0x02,0x33,0x00,0x01,0x00,0x00,0x00,0x00,0x00,0x03}, 8333},
-    {{0x2a,0x01,0x04,0xf8,0x02,0x01,0x03,0xe3,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
+    {{0x2a,0x01,0x04,0xf8,0x02,0x00,0x41,0x4e,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
+    {{0x2a,0x01,0x04,0xf8,0x02,0x00,0x41,0x6a,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
+    {{0x2a,0x01,0x04,0xf8,0x02,0x01,0x21,0xa7,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
+    {{0x2a,0x01,0x04,0xf8,0x02,0x01,0x40,0x17,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x11}, 8333},
     {{0x2a,0x01,0x04,0xf8,0x02,0x01,0x60,0x11,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x04}, 8333},
     {{0x2a,0x01,0x04,0xf8,0x02,0x01,0x60,0xd5,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
-    {{0x2a,0x01,0x04,0xf8,0x02,0x02,0x02,0x65,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
-    {{0x2a,0x01,0x04,0xf8,0x02,0x02,0x31,0x15,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
+    {{0x2a,0x01,0x04,0xf8,0x02,0x02,0x12,0xd6,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
     {{0x2a,0x01,0x04,0xf8,0x02,0x02,0x31,0xe3,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
-    {{0x2a,0x01,0x04,0xf8,0x02,0x02,0x31,0xef,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
-    {{0x2a,0x01,0x04,0xf8,0x02,0x02,0x33,0x92,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
+    {{0x2a,0x01,0x04,0xf8,0x02,0x02,0x32,0xc6,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
     {{0x2a,0x01,0x04,0xf8,0x02,0x02,0x53,0xc3,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
-    {{0x2a,0x01,0x04,0xf8,0x02,0x02,0x63,0xf4,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
-    {{0x2a,0x01,0x04,0xf8,0x02,0x02,0x72,0x27,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
-    {{0x2a,0x01,0x04,0xf8,0x02,0x10,0x22,0x27,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
-    {{0x2a,0x01,0x04,0xf8,0x02,0x10,0x24,0xaa,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
     {{0x2a,0x01,0x04,0xf8,0x02,0x11,0x14,0xcf,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
-    {{0x2a,0x01,0x04,0xf8,0x02,0x11,0x18,0x1b,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
-    {{0x2a,0x01,0x04,0xf8,0x02,0x12,0x28,0x9e,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
-    {{0x2a,0x01,0x04,0xf8,0x02,0x12,0x33,0xdb,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 18333},
-    {{0x2a,0x01,0x04,0xf8,0x00,0xa0,0x11,0x2f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
-    {{0x2a,0x01,0x04,0xf8,0x00,0xa0,0x31,0x74,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
-    {{0x2a,0x01,0x04,0xf8,0x00,0xa0,0x32,0x8c,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
-    {{0x2a,0x01,0x04,0xf8,0x00,0xa0,0x52,0x43,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
-    {{0x2a,0x01,0x04,0xf8,0x0c,0x17,0x19,0xb9,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
-    {{0x2a,0x01,0x04,0xf8,0x0c,0x17,0x1a,0x41,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
-    {{0x2a,0x01,0x04,0xf8,0x0c,0x17,0x1a,0x92,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
-    {{0x2a,0x01,0x04,0xf8,0x0c,0x17,0x02,0x73,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
-    {{0x2a,0x01,0x04,0xf8,0x0c,0x17,0x04,0x35,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
-    {{0x2a,0x01,0x04,0xf8,0x0c,0x17,0x07,0x55,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
-    {{0x2a,0x01,0x04,0xf8,0x0c,0x17,0x0b,0x54,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
-    {{0x2a,0x01,0x04,0xf8,0x0d,0x16,0x93,0x84,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
+    {{0x2a,0x01,0x04,0xf8,0x02,0x11,0x1e,0xc5,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
+    {{0x2a,0x01,0x04,0xf8,0x02,0x11,0x04,0x83,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
+    {{0x2a,0x01,0x04,0xf8,0x02,0x11,0x0d,0x99,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x08}, 8333},
+    {{0x2a,0x01,0x04,0xf8,0x02,0x12,0x18,0x26,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
+    {{0x2a,0x01,0x04,0xf8,0x02,0x12,0x27,0xa8,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
+    {{0x2a,0x01,0x04,0xf8,0x02,0x21,0x08,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
+    {{0x2a,0x01,0x04,0xf8,0x00,0xa0,0x12,0xcc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
+    {{0x2a,0x01,0x04,0xf8,0x00,0xa0,0x74,0x6a,0x01,0x01,0x00,0x01,0x00,0x01,0x00,0x02}, 8333},
+    {{0x2a,0x01,0x04,0xf8,0x00,0xa0,0x82,0x8a,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
+    {{0x2a,0x01,0x04,0xf8,0x0c,0x17,0x2e,0xef,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
+    {{0x2a,0x01,0x04,0xf8,0x0c,0x17,0x2f,0x3c,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 3333},
+    {{0x2a,0x01,0x04,0xf8,0x0c,0x17,0x3b,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
+    {{0x2a,0x01,0x04,0xf8,0x0c,0x17,0x42,0x45,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
+    {{0x2a,0x01,0x04,0xf8,0x0c,0x17,0x46,0x4f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
+    {{0x2a,0x01,0x04,0xf8,0x0c,0x17,0x4a,0x1c,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
+    {{0x2a,0x01,0x04,0xf8,0x0c,0x17,0x4c,0x5d,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
+    {{0x2a,0x01,0x04,0xf8,0x0c,0x17,0x67,0xf8,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
+    {{0x2a,0x01,0x04,0xf8,0x0c,0x17,0x6d,0xd0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
+    {{0x2a,0x01,0x04,0xf8,0x0c,0x17,0x71,0x0b,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
+    {{0x2a,0x01,0x04,0xf8,0x0c,0x17,0x07,0x14,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
+    {{0x2a,0x01,0x04,0xf8,0x0c,0x17,0x72,0xc6,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
     {{0x2a,0x01,0x06,0x08,0xff,0xff,0xa0,0x09,0x8b,0xf5,0x87,0x9d,0xe5,0x1a,0xf8,0x37}, 8333},
-    {{0x2a,0x01,0x06,0x80,0x00,0x10,0x00,0x10,0xf2,0xde,0xf1,0xff,0xfe,0xc9,0x0d,0xc0}, 8333},
-    {{0x2a,0x01,0x07,0xc8,0xaa,0xac,0x01,0xf6,0x50,0x54,0x00,0xff,0xfe,0x30,0xe5,0x85}, 8333},
-    {{0x2a,0x01,0x07,0xc8,0xaa,0xac,0x02,0x0b,0x50,0x54,0x00,0xff,0xfe,0x24,0x43,0x5e}, 8333},
+    {{0x2a,0x01,0x06,0x80,0x00,0x10,0x00,0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333},
+    {{0x2a,0x01,0x06,0xf0,0xff,0xff,0x01,0x20,0x00,0x00,0x00,0x00,0x00,0x00,0x8d,0xcb}, 8333},
+    {{0x2a,0x01,0x07,0x9c,0xce,0xbc,0x85,0x7c,0x98,0xc1,0x88,0xff,0xfe,0xf5,0x90,0xde}, 8333},
+    {{0x2a,0x01,0x07,0x9d,0x73,0x77,0x26,0x29,0x7e,0x57,0x7e,0x57,0x00,0x01,0x00,0x01}, 8333},
     {{0x2a,0x01,0x07,0xc8,0xaa,0xac,0x04,0x3d,0x50,0x54,0x00,0xff,0xfe,0x4e,0x3d,0xd4}, 8333},
-    {{0x2a,0x01,0x07,0xc8,0xaa,0xad,0x02,0x56,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333},
-    {{0x2a,0x01,0x07,0xc8,0xaa,0xb6,0x00,0xea,0x50,0x54,0x00,0xff,0xfe,0xff,0xea,0xc3}, 8333},
-    {{0x2a,0x01,0x07,0xc8,0xaa,0xb9,0x00,0x5a,0x50,0x54,0x00,0xff,0xfe,0x89,0x7b,0x26}, 8333},
-    {{0x2a,0x01,0x07,0xc8,0xaa,0xbc,0x02,0xc8,0x50,0x54,0x00,0xff,0xfe,0x35,0x65,0x81}, 8333},
-    {{0x2a,0x01,0x7e,0x00,0x00,0x00,0x00,0x00,0xf0,0x3c,0x91,0xff,0xfe,0x18,0x30,0x1e}, 8333},
-    {{0x2a,0x01,0x7e,0x00,0x00,0x00,0x00,0x00,0xf0,0x3c,0x91,0xff,0xfe,0x18,0x39,0x42}, 8333},
+    {{0x2a,0x01,0x07,0xc8,0xaa,0xb5,0x03,0xe6,0x50,0x54,0x00,0xff,0xfe,0xd7,0x4e,0x54}, 8333},
+    {{0x2a,0x01,0x07,0xc8,0xaa,0xbd,0x03,0xd5,0x50,0x54,0x00,0xff,0xfe,0x95,0xf5,0x86}, 8333},
+    {{0x2a,0x01,0x07,0xc8,0xaa,0xc1,0x04,0x53,0xd0,0xd2,0xaf,0x96,0xfa,0x88,0x5d,0x0e}, 8333},
+    {{0x2a,0x01,0x07,0xc8,0xaa,0xc3,0x06,0x63,0x50,0x54,0x00,0xff,0xfe,0x25,0x8c,0x69}, 8333},
+    {{0x2a,0x01,0x07,0xc8,0xaa,0xc3,0x00,0x97,0x50,0x54,0x00,0xff,0xfe,0xa7,0x37,0x80}, 8333},
+    {{0x2a,0x01,0x07,0xc8,0xaa,0xc4,0x05,0x67,0x50,0x54,0x00,0xff,0xfe,0xdc,0x51,0x8a}, 8333},
     {{0x2a,0x01,0x7e,0x00,0x00,0x00,0x00,0x00,0xf0,0x3c,0x91,0xff,0xfe,0x26,0x8c,0x87}, 8333},
-    {{0x2a,0x01,0x7e,0x00,0x00,0x00,0x00,0x00,0xf0,0x3c,0x91,0xff,0xfe,0x50,0x62,0x06}, 8333},
-    {{0x2a,0x01,0x7e,0x00,0x00,0x00,0x00,0x00,0xf0,0x3c,0x91,0xff,0xfe,0x67,0x55,0x9d}, 8333},
-    {{0x2a,0x01,0x7e,0x00,0x00,0x00,0x00,0x00,0xf0,0x3c,0x91,0xff,0xfe,0x84,0x43,0x4f}, 8333},
+    {{0x2a,0x01,0x7e,0x00,0x00,0x00,0x00,0x00,0xf0,0x3c,0x91,0xff,0xfe,0x50,0x94,0xb8}, 8333},
+    {{0x2a,0x01,0x7e,0x00,0x00,0x00,0x00,0x00,0xf0,0x3c,0x91,0xff,0xfe,0x55,0x00,0x2c}, 8333},
     {{0x2a,0x01,0x7e,0x00,0x00,0x00,0x00,0x00,0xf0,0x3c,0x91,0xff,0xfe,0x89,0x11,0x43}, 8333},
-    {{0x2a,0x01,0x7e,0x00,0x00,0x00,0x00,0x00,0xf0,0x3c,0x91,0xff,0xfe,0x98,0x25,0x05}, 8333},
-    {{0x2a,0x01,0x7e,0x00,0x00,0x00,0x00,0x00,0xf0,0x3c,0x91,0xff,0xfe,0xdb,0x35,0x2e}, 8333},
-    {{0x2a,0x01,0x7e,0x01,0x00,0x00,0x00,0x00,0xf0,0x3c,0x91,0xff,0xfe,0xc8,0xd7,0xb5}, 8333},
-    {{0x2a,0x01,0x0e,0x34,0xee,0x33,0x16,0x40,0xc5,0x04,0xf6,0x77,0xb2,0x8a,0xba,0x42}, 8333},
-    {{0x2a,0x01,0x0e,0x35,0x2e,0x7e,0x0b,0xc0,0xe0,0x79,0xf5,0x5e,0xce,0xf3,0xb5,0xd7}, 8333},
+    {{0x2a,0x01,0x7e,0x00,0x00,0x00,0x00,0x00,0xf0,0x3c,0x91,0xff,0xfe,0x89,0x53,0xfd}, 8333},
+    {{0x2a,0x01,0x7e,0x00,0x00,0x00,0x00,0x00,0xf0,0x3c,0x91,0xff,0xfe,0xdf,0xb7,0x0f}, 8333},
+    {{0x2a,0x01,0xb0,0x00,0x00,0x00,0x00,0x00,0x41,0x66,0x51,0x5b,0xef,0x9e,0x00,0xb3}, 8333},
+    {{0x2a,0x01,0xb2,0xe0,0x00,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x40}, 8333},
+    {{0x2a,0x01,0x0e,0x34,0xec,0x29,0x24,0xc0,0x00,0xf3,0xdd,0xaf,0x9f,0x59,0x58,0x6f}, 8333},
+    {{0x2a,0x01,0x0e,0x34,0xee,0xd7,0x66,0x70,0xec,0x1b,0xbf,0x7c,0xb0,0x12,0x60,0x69}, 8333},
     {{0x2a,0x01,0x0e,0x35,0x2e,0xe5,0x06,0x10,0x02,0x1f,0xd0,0xff,0xfe,0x4e,0x74,0x60}, 8333},
     {{0x2a,0x01,0x0e,0x35,0x8a,0x3f,0x47,0xc0,0xc6,0x17,0xfe,0xff,0xfe,0x3c,0x9f,0xbd}, 8333},
-    {{0x2a,0x01,0x0e,0x35,0x8a,0xca,0x06,0xa0,0x02,0x11,0x0a,0xff,0xfe,0x5e,0x29,0x5e}, 8333},
-    {{0x2a,0x02,0x01,0x80,0x00,0x0a,0x00,0x18,0x00,0x81,0x00,0x07,0x00,0x11,0x00,0x50}, 8333},
-    {{0x2a,0x02,0x18,0x10,0x1d,0x87,0x6a,0x00,0x56,0x04,0xa6,0xff,0xfe,0x60,0xd8,0x7d}, 8333},
-    {{0x2a,0x02,0x21,0x68,0x11,0x44,0x5c,0x01,0xd6,0x3d,0x7e,0xff,0xfe,0xdd,0x4f,0x8e}, 8333},
-    {{0x2a,0x02,0x24,0x98,0x6d,0x7b,0x70,0x01,0xb5,0x08,0xb3,0x9d,0x2c,0xea,0x5b,0x7a}, 8333},
-    {{0x2a,0x02,0x25,0x28,0x05,0x03,0x00,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x15}, 8333},
-    {{0x2a,0x02,0x25,0x28,0x00,0xfa,0x1a,0x56,0x02,0x16,0x44,0xff,0xfe,0x6a,0xd1,0x12}, 8333},
-    {{0x2a,0x02,0x27,0xf8,0x20,0x12,0x00,0x00,0xe9,0xf7,0x26,0x8f,0xc4,0x41,0x61,0x29}, 8333},
+    {{0x2a,0x01,0x0e,0x35,0x8b,0xff,0x70,0xb0,0x1e,0x1b,0x0d,0xff,0xfe,0x0b,0x23,0x6d}, 8333},
+    {{0x2a,0x02,0x12,0x05,0x34,0xc3,0xa4,0xe0,0xd6,0x3d,0x7e,0xff,0xfe,0x98,0x10,0xc8}, 8333},
+    {{0x2a,0x02,0x12,0x05,0x34,0xda,0xaa,0x00,0x58,0x82,0x24,0x9d,0xdd,0xbf,0xbc,0x43}, 8333},
+    {{0x2a,0x02,0x12,0x05,0x50,0x51,0xa6,0x40,0xd6,0xae,0x52,0xff,0xfe,0xa3,0x00,0xac}, 8333},
+    {{0x2a,0x02,0x12,0x05,0xc6,0x89,0xd9,0x80,0xba,0xae,0xed,0xff,0xfe,0xea,0x94,0x45}, 8333},
+    {{0x2a,0x02,0x12,0x0b,0x2c,0x2a,0x5e,0xc0,0x10,0xdd,0x31,0xff,0xfe,0x42,0x50,0x79}, 8333},
+    {{0x2a,0x02,0x12,0x0b,0x2c,0x35,0x69,0xd0,0x02,0x19,0x99,0xff,0xfe,0x6b,0x4e,0xc3}, 8333},
+    {{0x2a,0x02,0x12,0x0b,0xc3,0xc2,0xff,0x60,0x02,0x1f,0x5b,0xff,0xfe,0xc3,0xa7,0xad}, 24312},
+    {{0x2a,0x02,0x13,0xb8,0x40,0x00,0x10,0x00,0x02,0x16,0xe6,0xff,0xfe,0x92,0x86,0x19}, 8333},
+    {{0x2a,0x02,0x13,0xb8,0x40,0x00,0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x27}, 8333},
+    {{0x2a,0x02,0x17,0xd0,0x00,0x2a,0x44,0x00,0x04,0x0f,0x3d,0xd4,0xb0,0x53,0x47,0xad}, 8333},
+    {{0x2a,0x02,0x01,0x80,0x00,0x01,0x00,0x01,0x00,0x00,0x00,0x00,0x05,0x17,0x0a,0xfb}, 8333},
+    {{0x2a,0x02,0x01,0x80,0x00,0x06,0x00,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x18}, 8333},
+    {{0x2a,0x02,0x18,0x10,0x1d,0x11,0xf9,0x00,0x68,0x72,0xf2,0x8e,0x81,0x26,0xf6,0x35}, 8333},
+    {{0x2a,0x02,0x27,0xa8,0x00,0x00,0x00,0x01,0x52,0xe5,0x49,0xff,0xfe,0xe3,0x3b,0x49}, 8333},
     {{0x2a,0x02,0x03,0x48,0x00,0x86,0x30,0x11,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333},
-    {{0x2a,0x02,0x47,0x80,0x00,0x01,0x00,0x01,0x00,0x00,0x00,0x00,0x00,0x01,0x8a,0x01}, 8333},
-    {{0x2a,0x02,0x05,0x78,0x50,0x02,0x01,0x16,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
+    {{0x2a,0x02,0x03,0x90,0x90,0x00,0x00,0x00,0x02,0x18,0x7d,0xff,0xfe,0x10,0xbe,0x33}, 8333},
+    {{0x2a,0x02,0x05,0x82,0x78,0xc1,0x76,0x00,0x2d,0x49,0x62,0x12,0x29,0xd3,0x0a,0xbb}, 8333},
     {{0x2a,0x02,0x60,0x80,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x19,0x0b,0x69,0xe3}, 8333},
-    {{0x2a,0x02,0x60,0x80,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0xe8,0x93,0xd9,0xd6}, 8333},
-    {{0x2a,0x02,0x07,0x70,0x40,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x39}, 8333},
+    {{0x2a,0x02,0x07,0x50,0x00,0x07,0x33,0x05,0x00,0x00,0x00,0x00,0x00,0x00,0x05,0x75}, 8333},
+    {{0x2a,0x02,0x07,0x52,0x01,0x00,0x00,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x53}, 8333},
+    {{0x2a,0x02,0x7a,0xa0,0x12,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x75,0x01,0xd9,0x50}, 8333},
     {{0x2a,0x02,0x7a,0xa0,0x12,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0xde,0xb3,0x81,0xa2}, 8333},
-    {{0x2a,0x02,0x80,0x10,0xb0,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x58,0x60,0x59,0xb5}, 8333},
-    {{0x2a,0x02,0x81,0x0d,0x21,0xc0,0x0f,0x00,0xa2,0x48,0x1c,0xff,0xfe,0xb8,0x53,0x48}, 8333},
-    {{0x2a,0x02,0x0a,0x50,0x00,0x00,0x00,0x00,0x02,0x1b,0x24,0xff,0xfe,0x93,0x4e,0x39}, 8333},
-    {{0x2a,0x02,0x0a,0x80,0x00,0x00,0x12,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
-    {{0x2a,0x02,0xc2,0x00,0x00,0x00,0x00,0x10,0x00,0x02,0x00,0x01,0x58,0x30,0x00,0x01}, 8333},
-    {{0x2a,0x02,0xc2,0x00,0x00,0x00,0x00,0x10,0x00,0x02,0x00,0x05,0x46,0x92,0x00,0x01}, 8333},
-    {{0x2a,0x02,0xc2,0x00,0x00,0x00,0x00,0x10,0x00,0x03,0x00,0x00,0x71,0x58,0x00,0x01}, 8333},
-    {{0x2a,0x02,0xc2,0x00,0x00,0x00,0x00,0x10,0x00,0x00,0x00,0x00,0x22,0x44,0x00,0x01}, 8333},
-    {{0x2a,0x02,0xc2,0x00,0x00,0x01,0x00,0x10,0x00,0x02,0x00,0x03,0x33,0x39,0x00,0x01}, 8333},
-    {{0x2a,0x02,0xc2,0x00,0x00,0x01,0x00,0x10,0x00,0x02,0x00,0x03,0x78,0x44,0x00,0x01}, 8333},
-    {{0x2a,0x02,0xc2,0x00,0x00,0x01,0x00,0x10,0x00,0x02,0x00,0x05,0x62,0x88,0x00,0x01}, 8333},
-    {{0x2a,0x02,0xc2,0x00,0x00,0x01,0x00,0x10,0x00,0x03,0x00,0x00,0x59,0x12,0x00,0x01}, 8333},
+    {{0x2a,0x02,0x7a,0xa0,0x16,0x19,0x00,0x00,0x00,0x00,0x00,0x00,0xa0,0x37,0x69,0xa6}, 8333},
+    {{0x2a,0x02,0x81,0x0d,0x14,0xc0,0x86,0x94,0xd2,0x50,0x99,0xff,0xfe,0x81,0x23,0xd9}, 8333},
+    {{0x2a,0x02,0x0a,0x50,0x00,0x00,0x00,0x00,0xda,0xcb,0x8a,0xff,0xfe,0x36,0x8d,0x2d}, 8333},
+    {{0x2a,0x02,0xc2,0x00,0x00,0x00,0x00,0x10,0x00,0x03,0x00,0x00,0x25,0x91,0x00,0x01}, 8333},
+    {{0x2a,0x02,0xc2,0x00,0x00,0x01,0x00,0x10,0x00,0x02,0x00,0x05,0x99,0x82,0x00,0x01}, 8333},
+    {{0x2a,0x02,0xc2,0x00,0x00,0x01,0x00,0x10,0x00,0x03,0x00,0x00,0x92,0x90,0x00,0x01}, 8333},
+    {{0x2a,0x02,0xc2,0x05,0x30,0x00,0x71,0x58,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333},
+    {{0x2a,0x02,0xc2,0x05,0x30,0x01,0x45,0x22,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333},
+    {{0x2a,0x02,0xc2,0x05,0x30,0x01,0x65,0x49,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333},
+    {{0x2a,0x02,0xc2,0x07,0x20,0x08,0x37,0x72,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333},
+    {{0x2a,0x02,0xc2,0x07,0x20,0x08,0x65,0x19,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333},
+    {{0x2a,0x02,0xc2,0x07,0x20,0x09,0x02,0x13,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333},
+    {{0x2a,0x02,0xc2,0x07,0x20,0x09,0x78,0x58,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333},
+    {{0x2a,0x02,0xc2,0x07,0x20,0x10,0x03,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333},
+    {{0x2a,0x02,0xc2,0x07,0x30,0x01,0x58,0x24,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333},
+    {{0x2a,0x02,0xce,0x80,0x00,0x00,0x00,0x20,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333},
     {{0x2a,0x03,0x40,0x00,0x00,0x02,0x04,0x96,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x08}, 8333},
+    {{0x2a,0x03,0x40,0x00,0x00,0x06,0x41,0x6c,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x53}, 8333},
     {{0x2a,0x03,0x40,0x00,0x00,0x06,0x80,0x09,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333},
-    {{0x2a,0x03,0x40,0x00,0x00,0x06,0x80,0x63,0x00,0x00,0x00,0x00,0x00,0x00,0xbc,0xd0}, 8333},
-    {{0x2a,0x03,0x49,0x00,0xff,0xfc,0x00,0x0b,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333},
-    {{0x2a,0x03,0xb0,0xc0,0x00,0x01,0x00,0xd0,0x00,0x00,0x00,0x00,0x00,0x0d,0x50,0x01}, 8333},
+    {{0x2a,0x03,0x40,0x00,0x00,0x09,0x00,0x8e,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333},
+    {{0x2a,0x03,0x73,0x80,0x21,0x40,0x00,0x17,0x51,0xfe,0x35,0x19,0xb5,0x71,0x4a,0x13}, 8333},
+    {{0x2a,0x03,0xb0,0xc0,0x00,0x00,0x10,0x10,0x00,0x00,0x00,0x00,0x07,0xa3,0x10,0x01}, 8333},
+    {{0x2a,0x03,0xb0,0xc0,0x00,0x00,0x10,0x10,0x00,0x00,0x00,0x00,0x07,0xaa,0x40,0x01}, 8333},
+    {{0x2a,0x03,0xb0,0xc0,0x00,0x03,0x00,0xd0,0x00,0x00,0x00,0x00,0x1b,0x99,0xc0,0x01}, 8333},
+    {{0x2a,0x03,0xb0,0xc0,0x00,0x03,0x00,0xd0,0x00,0x00,0x00,0x00,0x1b,0x99,0xe0,0x01}, 8333},
+    {{0x2a,0x03,0xb0,0xc0,0x00,0x03,0x00,0xd0,0x00,0x00,0x00,0x00,0x1b,0x9a,0x30,0x01}, 8333},
+    {{0x2a,0x03,0xb0,0xc0,0x00,0x03,0x00,0xd0,0x00,0x00,0x00,0x00,0x22,0x08,0x60,0x01}, 8333},
+    {{0x2a,0x03,0xb0,0xc0,0x00,0x03,0x00,0xd0,0x00,0x00,0x00,0x00,0x23,0xf7,0x10,0x01}, 8333},
+    {{0x2a,0x03,0xb0,0xc0,0x00,0x03,0x00,0xd0,0x00,0x00,0x00,0x00,0x23,0xf7,0x90,0x01}, 8333},
+    {{0x2a,0x03,0xb0,0xc0,0x00,0x03,0x00,0xd0,0x00,0x00,0x00,0x00,0x23,0xfb,0x20,0x01}, 8333},
+    {{0x2a,0x03,0xb0,0xc0,0x00,0x03,0x00,0xd0,0x00,0x00,0x00,0x00,0x23,0xfb,0x30,0x01}, 8333},
+    {{0x2a,0x03,0xb0,0xc0,0x00,0x03,0x00,0xd0,0x00,0x00,0x00,0x00,0x23,0xfb,0x50,0x01}, 8333},
+    {{0x2a,0x03,0xb0,0xc0,0x00,0x03,0x00,0xd0,0x00,0x00,0x00,0x00,0x23,0xfb,0x70,0x01}, 8333},
+    {{0x2a,0x03,0xb0,0xc0,0x00,0x03,0x00,0xd0,0x00,0x00,0x00,0x00,0x24,0x00,0x00,0x01}, 8333},
+    {{0x2a,0x03,0xb0,0xc0,0x00,0x03,0x00,0xd0,0x00,0x00,0x00,0x00,0x24,0x00,0x30,0x01}, 8333},
+    {{0x2a,0x03,0xb0,0xc0,0x00,0x03,0x00,0xd0,0x00,0x00,0x00,0x00,0x24,0x00,0xe0,0x01}, 8333},
+    {{0x2a,0x03,0xb0,0xc0,0x00,0x03,0x00,0xd0,0x00,0x00,0x00,0x00,0x24,0x01,0xe0,0x01}, 8333},
+    {{0x2a,0x03,0xb0,0xc0,0x00,0x03,0x00,0xd0,0x00,0x00,0x00,0x00,0x24,0x02,0x20,0x01}, 8333},
+    {{0x2a,0x03,0xb0,0xc0,0x00,0x03,0x00,0xd0,0x00,0x00,0x00,0x00,0x24,0x02,0x80,0x01}, 8333},
+    {{0x2a,0x03,0xb0,0xc0,0x00,0x03,0x00,0xd0,0x00,0x00,0x00,0x00,0x24,0x02,0x90,0x01}, 8333},
+    {{0x2a,0x03,0xb0,0xc0,0x00,0x03,0x00,0xd0,0x00,0x00,0x00,0x00,0x24,0x02,0xb0,0x01}, 8333},
+    {{0x2a,0x03,0xb0,0xc0,0x00,0x03,0x00,0xd0,0x00,0x00,0x00,0x00,0x24,0x02,0xd0,0x01}, 8333},
+    {{0x2a,0x03,0xb0,0xc0,0x00,0x03,0x00,0xd0,0x00,0x00,0x00,0x00,0x24,0x03,0x10,0x01}, 8333},
+    {{0x2a,0x03,0xb0,0xc0,0x00,0x03,0x00,0xd0,0x00,0x00,0x00,0x00,0x24,0x03,0x20,0x01}, 8333},
+    {{0x2a,0x03,0xb0,0xc0,0x00,0x03,0x00,0xd0,0x00,0x00,0x00,0x00,0x24,0x03,0x40,0x01}, 8333},
+    {{0x2a,0x03,0xb0,0xc0,0x00,0x03,0x00,0xd0,0x00,0x00,0x00,0x00,0x24,0x03,0x60,0x01}, 8333},
+    {{0x2a,0x03,0xb0,0xc0,0x00,0x03,0x00,0xd0,0x00,0x00,0x00,0x00,0x24,0x03,0xa0,0x01}, 8333},
+    {{0x2a,0x03,0xb0,0xc0,0x00,0x03,0x00,0xd0,0x00,0x00,0x00,0x00,0x24,0x03,0xb0,0x01}, 8333},
+    {{0x2a,0x03,0xb0,0xc0,0x00,0x03,0x00,0xd0,0x00,0x00,0x00,0x00,0x24,0x03,0xf0,0x01}, 8333},
+    {{0x2a,0x03,0xb0,0xc0,0x00,0x03,0x00,0xd0,0x00,0x00,0x00,0x00,0x24,0x04,0x60,0x01}, 8333},
+    {{0x2a,0x03,0xb0,0xc0,0x00,0x03,0x00,0xd0,0x00,0x00,0x00,0x00,0x24,0x04,0xb0,0x01}, 8333},
     {{0x2a,0x03,0x0f,0x80,0xed,0x15,0x01,0x49,0x01,0x54,0x01,0x55,0x02,0x35,0x00,0x01}, 8333},
-    {{0x2a,0x03,0x0f,0x80,0xed,0x15,0x01,0x49,0x01,0x54,0x01,0x55,0x02,0x41,0x00,0x01}, 8333},
-    {{0x2a,0x03,0x0f,0x80,0xed,0x16,0x0c,0xa7,0xea,0x75,0xb1,0x2d,0x02,0xaf,0x9e,0x2a}, 8333},
-    {{0x2a,0x04,0x19,0x80,0x31,0x00,0x1a,0xab,0x02,0x90,0xfa,0xff,0xfe,0x70,0xa3,0xd8}, 8333},
-    {{0x2a,0x04,0x19,0x80,0x31,0x00,0x1a,0xab,0xe6,0x1d,0x2d,0xff,0xfe,0x29,0xf5,0x90}, 8333},
-    {{0x2a,0x04,0x2f,0x80,0x00,0x06,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x89}, 8333},
-    {{0x2a,0x04,0xac,0x00,0x00,0x01,0x4a,0x0b,0x50,0x54,0x00,0xff,0xfe,0x00,0x5a,0xf5}, 8333},
-    {{0x2a,0x04,0xad,0x80,0x00,0x00,0x00,0x68,0x00,0x00,0x00,0x00,0x00,0x00,0x35,0xda}, 8333},
-    {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0xd9,0x4a,0xaf,0xa2,0x8c,0x9d,0xf6,0x22,0x18,0x28}, 8333},
+    {{0x2a,0x04,0x19,0x80,0x31,0x00,0x1a,0xac,0xe6,0x1d,0x2d,0xff,0xfe,0x29,0xf2,0x41}, 8333},
+    {{0x2a,0x04,0x19,0x80,0x31,0x00,0x1a,0xac,0xe6,0x1d,0x2d,0xff,0xfe,0x29,0xf2,0x51}, 8333},
+    {{0x2a,0x04,0x21,0x80,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x00,0x5a,0x49,0x3c,0x06}, 8333},
+    {{0x2a,0x04,0x21,0x80,0x00,0x01,0x00,0x07,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x03}, 8333},
+    {{0x2a,0x04,0x2e,0x00,0x00,0x05,0x00,0x2e,0x9a,0x4b,0xe1,0xff,0xfe,0x62,0x6d,0xc0}, 8333},
+    {{0x2a,0x04,0x35,0x42,0x10,0x00,0x09,0x10,0x84,0x92,0xb8,0xff,0xfe,0x91,0x71,0x1d}, 8333},
+    {{0x2a,0x04,0xdb,0xc3,0xff,0xfe,0x00,0x00,0xe6,0x1f,0x13,0xff,0xfe,0x95,0x84,0x01}, 8333},
+    {{0x2a,0x06,0x9f,0xc0,0x2a,0x06,0x9f,0xc0,0x2a,0x06,0x9f,0xc1,0x06,0x7c,0xe7,0x06}, 8333},
+    {{0x2c,0x0f,0xf7,0x38,0x20,0x04,0x00,0x82,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8333},
+    {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0xd1,0xe3,0x80,0xee,0x87,0xdc,0xf3,0x63,0x37,0x00}, 8333},
     {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0xdb,0x58,0x10,0x81,0x48,0x69,0x2c,0xb3,0x0d,0x6d}, 8333},
-    {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0xe2,0x7f,0xf3,0x20,0xef,0x72,0xaf,0x4d,0x29,0x3c}, 8333},
-    {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0xef,0x3c,0x49,0x0b,0xc1,0x74,0xc2,0x92,0x86,0xe1}, 8333},
-    {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0xe8,0x27,0xf9,0x43,0xad,0x67,0xfd,0x74,0x25,0x43}, 8333},
-    {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0xff,0xd9,0x7d,0x26,0x57,0x03,0xb0,0x49,0x67,0x4f}, 8333},
-    {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0xf9,0xbe,0x9e,0xf0,0x33,0x40,0x2e,0x79,0xc9,0x18}, 8333},
-    {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x07,0x9c,0x11,0x9b,0x2d,0xf7,0xd7,0xf2,0x5e,0x9b}, 8333},
-    {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x00,0x7d,0xc3,0xfd,0xcb,0x7a,0xff,0x07,0xdc,0x48}, 8333},
-    {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x03,0x34,0x0e,0x44,0x07,0x5c,0xcb,0x4b,0xe7,0xcb}, 8333},
-    {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x06,0x69,0x75,0xcb,0x88,0x3c,0x63,0xa6,0x11,0xff}, 8333},
-    {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x0a,0x26,0x27,0x21,0xbf,0x0a,0x38,0xe7,0xfe,0xc1}, 8333},
-    {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x0a,0x26,0x27,0x21,0xae,0x94,0xd5,0xc2,0x72,0x24}, 8333},
+    {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0xdc,0x09,0x14,0x6e,0x6c,0x3e,0x58,0xf2,0x1b,0x15}, 8333},
+    {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0xe5,0x86,0xa6,0xb0,0x82,0x31,0xc4,0xc1,0x2e,0x1d}, 8333},
+    {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0xee,0xe7,0x24,0xcf,0xd9,0x86,0xd0,0x09,0x57,0xb0}, 8333},
+    {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0xe8,0x8d,0xf8,0x13,0x16,0xad,0x9d,0xea,0xdd,0xf3}, 8333},
+    {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0xe9,0x82,0x28,0x9a,0x17,0x10,0x6e,0x9d,0x77,0x72}, 8333},
+    {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0xf0,0x9b,0xc4,0x2c,0x36,0x54,0x54,0x7f,0x9a,0xce}, 8333},
+    {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0xf1,0x38,0x98,0xb5,0xbf,0x41,0x89,0x0b,0xb1,0x65}, 8333},
+    {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0xf6,0x18,0x60,0xd5,0xad,0xf0,0xfa,0xd2,0xb2,0xbc}, 8333},
+    {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0xf6,0x64,0x7d,0x84,0xa3,0xa1,0xde,0xef,0xac,0x6b}, 8333},
+    {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0xfe,0x8b,0x0f,0x3c,0xf5,0xe1,0x4d,0xc8,0x9e,0xa7}, 8333},
+    {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0xf9,0x87,0x07,0xf9,0xaf,0xa4,0x95,0xc5,0x96,0xca}, 8333},
+    {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x07,0xc8,0xcb,0xb9,0x7d,0xe9,0x3d,0xad,0xae,0x02}, 8333},
+    {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x04,0xa4,0x14,0x60,0x79,0x44,0x3f,0xfc,0x81,0x48}, 8333},
+    {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x08,0x0a,0xae,0xa1,0xc0,0x9a,0xcd,0x3f,0x8c,0xcb}, 8333},
     {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x0a,0xbf,0x87,0xf8,0x8f,0x6b,0x04,0xb5,0xc3,0xfa}, 8333},
-    {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x0b,0x29,0x34,0x96,0x29,0xe8,0x67,0x22,0x0c,0x61}, 8333},
-    {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x11,0x08,0x94,0x72,0x0f,0x2c,0xb6,0xc9,0x6f,0x22}, 8333},
-    {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x12,0xc9,0x76,0x66,0x08,0x77,0xf0,0x71,0x81,0xdc}, 8333},
+    {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x0c,0x6d,0x02,0x65,0xbe,0x59,0x3b,0xcb,0x68,0x21}, 8333},
+    {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x0c,0xb8,0x18,0x7a,0x5e,0x82,0xab,0x3e,0x9d,0xe8}, 8333},
+    {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x0d,0x1f,0xd6,0xf4,0x9b,0x55,0x23,0x54,0xe4,0xbb}, 8333},
+    {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x16,0xa6,0xf8,0x28,0x19,0xe2,0x0e,0x9c,0xd8,0xc1}, 8333},
+    {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x11,0x22,0xd8,0xb2,0x2a,0xee,0x5c,0xcc,0xbb,0x2d}, 8333},
+    {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x11,0x70,0x43,0x27,0xdc,0x3c,0xf6,0x97,0xb8,0x71}, 8333},
+    {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x11,0xbb,0x53,0x77,0x82,0x06,0x72,0xfa,0xba,0x86}, 8333},
+    {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x11,0x95,0xca,0x69,0x77,0x8d,0x58,0xbe,0x26,0xa1}, 8333},
+    {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x12,0x70,0x61,0xfd,0xf4,0xea,0xe0,0xa5,0x63,0xa9}, 8333},
+    {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x1f,0xad,0x40,0xc8,0x73,0x8f,0x3c,0x31,0xf5,0x48}, 8333},
+    {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x19,0x61,0xec,0x24,0x5b,0x01,0x16,0xf5,0xda,0x3c}, 8333},
+    {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x1c,0x1f,0x7b,0x2d,0xed,0xae,0xf3,0xb3,0xe5,0xab}, 8333},
+    {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x20,0x18,0x57,0x49,0xf4,0xa9,0x00,0x10,0x21,0x83}, 8333},
+    {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x23,0xf4,0xc4,0xe5,0xd7,0xda,0xaa,0x1f,0x02,0xfc}, 8333},
+    {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x2b,0xc3,0x70,0xf2,0xc9,0xa0,0xd1,0x6d,0x5b,0xa0}, 8333},
+    {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x2d,0x3a,0x72,0xc8,0x21,0x2f,0x53,0x69,0x54,0xf5}, 8333},
+    {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x37,0x0b,0x12,0x39,0x01,0x90,0xb3,0x44,0xac,0x9b}, 8333},
     {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x30,0x7b,0x87,0xc2,0x7e,0xd8,0xe9,0xbb,0x14,0xed}, 8333},
-    {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x3e,0xaa,0xb7,0xd0,0x79,0x79,0xf3,0x0b,0xd2,0x63}, 8333},
-    {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x6f,0x34,0x7f,0xc7,0xce,0xa3,0x04,0x59,0x06,0x32}, 4176},
-    {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x68,0xac,0xad,0xae,0x93,0x23,0x0a,0x51,0x3c,0x5c}, 8333},
+    {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x31,0x87,0x8d,0x3c,0x3a,0x05,0x56,0x19,0xa6,0xd0}, 8333},
+    {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x31,0xf4,0x04,0x0c,0x79,0xbb,0x2b,0x88,0xb6,0x84}, 8333},
+    {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x33,0x6e,0x6c,0x2c,0x26,0xcd,0x40,0x0c,0xaa,0x1f}, 8333},
+    {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x3b,0x51,0x91,0xdd,0xa4,0x49,0x17,0xee,0x50,0x2a}, 8333},
+    {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x3c,0xea,0x31,0x31,0x62,0xd8,0x02,0x94,0x68,0x01}, 8443},
+    {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x3d,0xa8,0x17,0x39,0x12,0xe1,0xa4,0xba,0x3c,0xd7}, 8333},
+    {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x3d,0xf3,0xe3,0x3a,0xcb,0xa0,0xd6,0x9f,0x0f,0xa0}, 8333},
+    {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x4f,0xa8,0xc7,0x70,0x2d,0x96,0x66,0xf9,0x39,0xa2}, 8333},
+    {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x48,0xe8,0xd6,0x01,0xc2,0xb0,0x42,0xdb,0x77,0xdd}, 8333},
+    {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x54,0xeb,0xb8,0x2e,0xeb,0xfd,0xea,0xc1,0xac,0xbc}, 8333},
+    {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x55,0x47,0xce,0x4a,0xdf,0x92,0x83,0xd2,0xb9,0x76}, 8333},
+    {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x55,0x90,0xc6,0xe5,0x9e,0xa8,0xf9,0x90,0x2a,0xab}, 8333},
+    {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x58,0x3b,0x73,0xab,0x6b,0x7c,0x6f,0x9b,0xb3,0x3a}, 8333},
+    {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x58,0xbe,0x2b,0xfb,0xe4,0x68,0xf5,0xea,0x52,0x6f}, 8352},
+    {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x65,0xa9,0xd7,0x1b,0x40,0x30,0xa4,0xf6,0x19,0x57}, 8333},
+    {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x66,0x6e,0xa4,0x3d,0x18,0x22,0x80,0xe3,0xfd,0x98}, 8333},
+    {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x6f,0xa3,0x65,0xc6,0x76,0x7c,0x05,0xf8,0x59,0xdf}, 8333},
+    {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x6a,0x77,0xee,0x6b,0x98,0x10,0xa0,0xf3,0xfb,0x59}, 8333},
+    {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x76,0xbb,0xeb,0x7e,0x7b,0xa8,0x8c,0xa9,0xb2,0xea}, 8333},
+    {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x77,0x24,0xbe,0xb4,0x1e,0x49,0x20,0x64,0x6d,0x7e}, 8333},
     {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x72,0x87,0x94,0x82,0x36,0x22,0x83,0x23,0xb5,0xc5}, 8333},
-    {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x7a,0x4c,0x71,0x22,0xb9,0x53,0x89,0x19,0x12,0x43}, 8333},
-    {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x8d,0xbe,0xe1,0x25,0x73,0x45,0xf5,0xe6,0x10,0xad}, 8333},
-    {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0xa5,0xa5,0xf4,0x4c,0x8f,0xfb,0xb7,0x84,0x36,0xee}, 8333},
-    {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0xaa,0xb7,0x04,0x8c,0x87,0xc6,0x38,0x3b,0x0a,0xf6}, 8333},
+    {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x76,0x08,0x1c,0x0d,0x7a,0x78,0x05,0x7f,0x57,0x5e}, 8333},
+    {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x7f,0x59,0x7d,0x21,0x89,0xff,0x46,0xf6,0x21,0x84}, 8333},
+    {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x7c,0x84,0xef,0x06,0xe9,0x25,0x96,0x98,0x8b,0x37}, 8333},
+    {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x7d,0xe6,0x69,0x58,0x93,0xf4,0xd6,0x68,0x86,0xc9}, 8333},
+    {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x88,0x79,0x5d,0x94,0xe6,0xbe,0xb3,0x1e,0x46,0x24}, 8333},
+    {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x8a,0x56,0xd7,0xec,0xf6,0xac,0x64,0xc0,0x3f,0xc4}, 8333},
+    {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x8a,0xc0,0x54,0x31,0x42,0x9d,0x73,0xed,0xad,0x66}, 8333},
+    {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x8d,0xd3,0x5c,0x74,0x98,0x9c,0xc8,0xfe,0xce,0x72}, 8333},
+    {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x91,0x1d,0x25,0x50,0x79,0x57,0xaa,0xdf,0x32,0x19}, 8333},
+    {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x9b,0xcc,0x3a,0x16,0xf7,0x95,0xb6,0x95,0x44,0x65}, 8333},
+    {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x9d,0x11,0x8a,0xc0,0xc8,0xdb,0xbd,0xfe,0xbd,0x21}, 8333},
+    {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x9d,0xf9,0x91,0xfc,0x7d,0x25,0xdc,0xd6,0x85,0x67}, 8333},
+    {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0xa3,0x94,0x6f,0x02,0xa5,0x30,0x4e,0xe2,0xae,0x5b}, 8333},
+    {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0xae,0xcc,0x97,0x9c,0xd0,0xc7,0x4f,0x83,0x09,0x8b}, 8333},
+    {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0xa9,0xc6,0xeb,0xc2,0x1e,0xdd,0xe3,0xdd,0xb9,0x7f}, 8333},
+    {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0xaa,0x24,0x4a,0xc5,0x19,0xce,0xe1,0x4c,0x00,0xc9}, 8333},
     {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0xac,0x1f,0x82,0x69,0x5d,0x88,0xa1,0x54,0xf5,0x90}, 8333},
-    {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0xb3,0xd1,0xf8,0xbe,0xa7,0x6b,0x46,0xbe,0xe8,0x84}, 8333}
+    {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0xb1,0x65,0x7d,0x19,0x1f,0x1a,0x4f,0x8d,0x68,0xea}, 8333},
+    {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0xb1,0xbd,0x5b,0x30,0x31,0xce,0x31,0x90,0x3e,0x8d}, 8333},
+    {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0xbd,0x03,0xcb,0x6e,0xdc,0xb5,0x95,0xdf,0x5d,0x10}, 8333},
+    {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0xc0,0x91,0x56,0xb9,0x9c,0xe0,0xd9,0x7b,0xf1,0xc1}, 8333},
+    {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0xc5,0xa4,0xaa,0x14,0x5e,0xd0,0x4b,0xa2,0xd1,0x9c}, 8333},
+    {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0xcf,0x0a,0x0b,0xea,0xb7,0x36,0xb7,0x3d,0x0c,0x65}, 8333},
+    {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0xcb,0xba,0x35,0x2e,0xc4,0x5b,0x07,0x17,0xbb,0xad}, 8333}
 };
 
 static SeedSpec6 pnSeed6_test[] = {

From 321d0fc6b6624c65508f8b9059418cb936f0bbbe Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Mon, 6 Feb 2017 02:34:57 -0500
Subject: [PATCH 1704/1802] net: fix a few races. Credit @TheBlueMatt

These are (afaik) all long-standing races or concurrent accesses. Going
forward, we can clean these up so that they're not all individual atomic
accesses.

- Reintroduce cs_vRecv to guard receive-specific vars
- Lock vRecv/vSend for CNodeStats
- Make some vars atomic.
- Only set the connection time in CNode's constructor so that it doesn't change
---
 src/net.cpp            | 16 +++++++++++-----
 src/net.h              | 19 ++++++++++---------
 src/net_processing.cpp |  2 +-
 3 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/src/net.cpp b/src/net.cpp
index 7c45cff1dd286..c96ca469ff62e 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -389,7 +389,6 @@ CNode* CConnman::ConnectNode(CAddress addrConnect, const char *pszDest, bool fCo
         uint64_t nonce = GetDeterministicRandomizer(RANDOMIZER_ID_LOCALHOSTNONCE).Write(id).Finalize();
         CNode* pnode = new CNode(id, nLocalServices, GetBestHeight(), hSocket, addrConnect, CalculateKeyedNetGroup(addrConnect), nonce, pszDest ? pszDest : "", false);
         pnode->nServicesExpected = ServiceFlags(addrConnect.nServices & nRelevantServices);
-        pnode->nTimeConnected = GetSystemTimeInSeconds();
         pnode->AddRef();
 
         return pnode;
@@ -612,10 +611,16 @@ void CNode::copyStats(CNodeStats &stats)
     X(fInbound);
     X(fAddnode);
     X(nStartingHeight);
-    X(nSendBytes);
-    X(mapSendBytesPerMsgCmd);
-    X(nRecvBytes);
-    X(mapRecvBytesPerMsgCmd);
+    {
+        LOCK(cs_vSend);
+        X(mapSendBytesPerMsgCmd);
+        X(nSendBytes);
+    }
+    {
+        LOCK(cs_vRecv);
+        X(mapRecvBytesPerMsgCmd);
+        X(nRecvBytes);
+    }
     X(fWhitelisted);
 
     // It is common for nodes with good ping times to suddenly become lagged,
@@ -643,6 +648,7 @@ bool CNode::ReceiveMsgBytes(const char *pch, unsigned int nBytes, bool& complete
 {
     complete = false;
     int64_t nTimeMicros = GetTimeMicros();
+    LOCK(cs_vRecv);
     nLastRecv = nTimeMicros / 1000000;
     nRecvBytes += nBytes;
     while (nBytes > 0) {
diff --git a/src/net.h b/src/net.h
index e5a19e0f43ef4..89501c764e50a 100644
--- a/src/net.h
+++ b/src/net.h
@@ -573,6 +573,7 @@ class CNode
     std::deque<std::vector<unsigned char>> vSendMsg;
     CCriticalSection cs_vSend;
     CCriticalSection cs_hSocket;
+    CCriticalSection cs_vRecv;
 
     CCriticalSection cs_vProcessMsg;
     std::list<CNetMessage> vProcessMsg;
@@ -584,10 +585,10 @@ class CNode
     uint64_t nRecvBytes;
     std::atomic<int> nRecvVersion;
 
-    int64_t nLastSend;
-    int64_t nLastRecv;
+    std::atomic<int64_t> nLastSend;
+    std::atomic<int64_t> nLastRecv;
     int64_t nTimeConnected;
-    int64_t nTimeOffset;
+    std::atomic<int64_t> nTimeOffset;
     const CAddress addr;
     std::string addrName;
     CService addrLocal;
@@ -614,7 +615,7 @@ class CNode
     CSemaphoreGrant grantOutbound;
     CCriticalSection cs_filter;
     CBloomFilter* pfilter;
-    int nRefCount;
+    std::atomic<int> nRefCount;
     const NodeId id;
 
     const uint64_t nKeyedNetGroup;
@@ -665,15 +666,15 @@ class CNode
 
     // Ping time measurement:
     // The pong reply we're expecting, or 0 if no pong expected.
-    uint64_t nPingNonceSent;
+    std::atomic<uint64_t> nPingNonceSent;
     // Time (in usec) the last ping was sent, or 0 if no ping was ever sent.
-    int64_t nPingUsecStart;
+    std::atomic<int64_t> nPingUsecStart;
     // Last measured round-trip time.
-    int64_t nPingUsecTime;
+    std::atomic<int64_t> nPingUsecTime;
     // Best measured round-trip time.
-    int64_t nMinPingUsecTime;
+    std::atomic<int64_t> nMinPingUsecTime;
     // Whether a ping is requested.
-    bool fPingQueued;
+    std::atomic<bool> fPingQueued;
     // Minimum fee rate with which to filter inv's to this node
     CAmount minFeeFilter;
     CCriticalSection cs_feeFilter;
diff --git a/src/net_processing.cpp b/src/net_processing.cpp
index bb14e69d83c23..e89a897bd544d 100644
--- a/src/net_processing.cpp
+++ b/src/net_processing.cpp
@@ -2450,7 +2450,7 @@ bool static ProcessMessage(CNode* pfrom, const std::string& strCommand, CDataStr
                     if (pingUsecTime > 0) {
                         // Successful ping time measurement, replace previous
                         pfrom->nPingUsecTime = pingUsecTime;
-                        pfrom->nMinPingUsecTime = std::min(pfrom->nMinPingUsecTime, pingUsecTime);
+                        pfrom->nMinPingUsecTime = std::min(pfrom->nMinPingUsecTime.load(), pingUsecTime);
                     } else {
                         // This should never happen
                         sProblem = "Timing mishap";

From 644f1234e22626a7b5618a1dae60a8457a4063b1 Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Mon, 6 Feb 2017 11:42:49 -0500
Subject: [PATCH 1705/1802] Make nTimeConnected const in CNode

---
 src/net.cpp | 2 +-
 src/net.h   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/net.cpp b/src/net.cpp
index c96ca469ff62e..0e6e00d58b721 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -2574,6 +2574,7 @@ unsigned int CConnman::GetReceiveFloodSize() const { return nReceiveFloodSize; }
 unsigned int CConnman::GetSendBufferSize() const{ return nSendBufferMaxSize; }
 
 CNode::CNode(NodeId idIn, ServiceFlags nLocalServicesIn, int nMyStartingHeightIn, SOCKET hSocketIn, const CAddress& addrIn, uint64_t nKeyedNetGroupIn, uint64_t nLocalHostNonceIn, const std::string& addrNameIn, bool fInboundIn) :
+    nTimeConnected(GetSystemTimeInSeconds()),
     addr(addrIn),
     fInbound(fInboundIn),
     id(idIn),
@@ -2593,7 +2594,6 @@ CNode::CNode(NodeId idIn, ServiceFlags nLocalServicesIn, int nMyStartingHeightIn
     nLastRecv = 0;
     nSendBytes = 0;
     nRecvBytes = 0;
-    nTimeConnected = GetSystemTimeInSeconds();
     nTimeOffset = 0;
     addrName = addrNameIn == "" ? addr.ToStringIPPort() : addrNameIn;
     nVersion = 0;
diff --git a/src/net.h b/src/net.h
index 89501c764e50a..4bbcfac88b13b 100644
--- a/src/net.h
+++ b/src/net.h
@@ -587,7 +587,7 @@ class CNode
 
     std::atomic<int64_t> nLastSend;
     std::atomic<int64_t> nLastRecv;
-    int64_t nTimeConnected;
+    const int64_t nTimeConnected;
     std::atomic<int64_t> nTimeOffset;
     const CAddress addr;
     std::string addrName;

From ae683c1b1960b32134f5a5a29504691c91f39cf3 Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Mon, 6 Feb 2017 11:44:38 -0500
Subject: [PATCH 1706/1802] Avoid copying CNodeStats to make helgrind OK with
 buggy std::string

---
 src/net.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/net.cpp b/src/net.cpp
index 0e6e00d58b721..b7243dce20505 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -2420,9 +2420,8 @@ void CConnman::GetNodeStats(std::vector<CNodeStats>& vstats)
     vstats.reserve(vNodes.size());
     for(std::vector<CNode*>::iterator it = vNodes.begin(); it != vNodes.end(); ++it) {
         CNode* pnode = *it;
-        CNodeStats stats;
-        pnode->copyStats(stats);
-        vstats.push_back(stats);
+        vstats.emplace_back();
+        pnode->copyStats(vstats.back());
     }
 }
 

From 512731bed0782f10092de35a960153b17ecc11eb Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Mon, 6 Feb 2017 11:53:34 -0500
Subject: [PATCH 1707/1802] Access fRelayTxes with cs_filter lock in copyStats

---
 src/net.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/net.cpp b/src/net.cpp
index b7243dce20505..ea8a2a0a4aefd 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -600,7 +600,10 @@ void CNode::copyStats(CNodeStats &stats)
     stats.nodeid = this->GetId();
     X(nServices);
     X(addr);
-    X(fRelayTxes);
+    {
+        LOCK(cs_filter);
+        X(fRelayTxes);
+    }
     X(nLastSend);
     X(nLastRecv);
     X(nTimeConnected);

From 96f42d8a12871b8d5c4e31fd27d8135f97c6b3e0 Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Mon, 6 Feb 2017 12:15:30 -0500
Subject: [PATCH 1708/1802] Make nStartingHeight atomic

---
 src/net.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/net.h b/src/net.h
index 4bbcfac88b13b..566284c70b6d3 100644
--- a/src/net.h
+++ b/src/net.h
@@ -628,7 +628,7 @@ class CNode
 
 public:
     uint256 hashContinue;
-    int nStartingHeight;
+    std::atomic<int> nStartingHeight;
 
     // flood relay
     std::vector<CAddress> vAddrToSend;

From 0f3187261519c7568ef4211ce12b9740a3c1200f Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Mon, 6 Feb 2017 12:20:16 -0500
Subject: [PATCH 1709/1802] Make nServices atomic

---
 src/net.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/net.h b/src/net.h
index 566284c70b6d3..cf742a8caa59c 100644
--- a/src/net.h
+++ b/src/net.h
@@ -564,7 +564,7 @@ class CNode
     friend class CConnman;
 public:
     // socket
-    ServiceFlags nServices;
+    std::atomic<ServiceFlags> nServices;
     ServiceFlags nServicesExpected;
     SOCKET hSocket;
     size_t nSendSize; // total size of all vSendMsg entries

From 22b4966a29501c4f3f2e970ac5008fbd91e665a9 Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Mon, 6 Feb 2017 12:08:31 -0500
Subject: [PATCH 1710/1802] Move [clean|str]SubVer writes/copyStats into a lock

---
 src/net.cpp            |  5 ++++-
 src/net.h              |  1 +
 src/net_processing.cpp | 11 ++++++++---
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/net.cpp b/src/net.cpp
index ea8a2a0a4aefd..e7521f86d1437 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -610,7 +610,10 @@ void CNode::copyStats(CNodeStats &stats)
     X(nTimeOffset);
     X(addrName);
     X(nVersion);
-    X(cleanSubVer);
+    {
+        LOCK(cs_SubVer);
+        X(cleanSubVer);
+    }
     X(fInbound);
     X(fAddnode);
     X(nStartingHeight);
diff --git a/src/net.h b/src/net.h
index cf742a8caa59c..ddc050eb1f67c 100644
--- a/src/net.h
+++ b/src/net.h
@@ -598,6 +598,7 @@ class CNode
     // store the sanitized version in cleanSubVer. The original should be used when dealing with
     // the network or wire types and the cleaned string used when displayed or logged.
     std::string strSubVer, cleanSubVer;
+    CCriticalSection cs_SubVer; // used for both cleanSubVer and strSubVer
     bool fWhitelisted; // This peer can bypass DoS banning.
     bool fFeeler; // If true this node is being used as a short lived feeler.
     bool fOneShot;
diff --git a/src/net_processing.cpp b/src/net_processing.cpp
index e89a897bd544d..b5feac2d59266 100644
--- a/src/net_processing.cpp
+++ b/src/net_processing.cpp
@@ -1211,6 +1211,7 @@ bool static ProcessMessage(CNode* pfrom, const std::string& strCommand, CDataStr
         int nVersion;
         int nSendVersion;
         std::string strSubVer;
+        std::string cleanSubVer;
         int nStartingHeight = -1;
         bool fRelay = true;
 
@@ -1246,6 +1247,7 @@ bool static ProcessMessage(CNode* pfrom, const std::string& strCommand, CDataStr
             vRecv >> addrFrom >> nNonce;
         if (!vRecv.empty()) {
             vRecv >> LIMITED_STRING(strSubVer, MAX_SUBVERSION_LENGTH);
+            cleanSubVer = SanitizeString(strSubVer);
         }
         if (!vRecv.empty()) {
             vRecv >> nStartingHeight;
@@ -1273,8 +1275,11 @@ bool static ProcessMessage(CNode* pfrom, const std::string& strCommand, CDataStr
 
         pfrom->nServices = nServices;
         pfrom->addrLocal = addrMe;
-        pfrom->strSubVer = strSubVer;
-        pfrom->cleanSubVer = SanitizeString(strSubVer);
+        {
+            LOCK(pfrom->cs_SubVer);
+            pfrom->strSubVer = strSubVer;
+            pfrom->cleanSubVer = cleanSubVer;
+        }
         pfrom->nStartingHeight = nStartingHeight;
         pfrom->fClient = !(nServices & NODE_NETWORK);
         {
@@ -1330,7 +1335,7 @@ bool static ProcessMessage(CNode* pfrom, const std::string& strCommand, CDataStr
             remoteAddr = ", peeraddr=" + pfrom->addr.ToString();
 
         LogPrintf("receive version message: %s: version %d, blocks=%d, us=%s, peer=%d%s\n",
-                  pfrom->cleanSubVer, pfrom->nVersion,
+                  cleanSubVer, pfrom->nVersion,
                   pfrom->nStartingHeight, addrMe.ToString(), pfrom->id,
                   remoteAddr);
 

From d8f2b8a8c032b83a3bd90750e58abaeece7e34e7 Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Mon, 6 Feb 2017 17:38:57 -0500
Subject: [PATCH 1711/1802] Make nTimeBestReceived atomic

---
 src/net_processing.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/net_processing.cpp b/src/net_processing.cpp
index b5feac2d59266..62397e68ce0cb 100644
--- a/src/net_processing.cpp
+++ b/src/net_processing.cpp
@@ -36,7 +36,7 @@
 # error "Bitcoin cannot be compiled without assertions."
 #endif
 
-int64_t nTimeBestReceived = 0; // Used only to inform the wallet of when we last received a block
+std::atomic<int64_t> nTimeBestReceived(0); // Used only to inform the wallet of when we last received a block
 
 struct IteratorComparator
 {

From 036073bf87c07f8d69e39168dd93a52f1aafe85c Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Mon, 6 Feb 2017 12:04:34 -0500
Subject: [PATCH 1712/1802] Move CNode::addrName accesses behind locked
 accessors

---
 src/net.cpp            | 30 ++++++++++++++++++++++--------
 src/net.h              |  8 +++++++-
 src/net_processing.cpp |  2 +-
 3 files changed, 30 insertions(+), 10 deletions(-)

diff --git a/src/net.cpp b/src/net.cpp
index e7521f86d1437..8aa12619843fa 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -307,9 +307,11 @@ CNode* CConnman::FindNode(const CSubNet& subNet)
 CNode* CConnman::FindNode(const std::string& addrName)
 {
     LOCK(cs_vNodes);
-    BOOST_FOREACH(CNode* pnode, vNodes)
-        if (pnode->addrName == addrName)
+    BOOST_FOREACH(CNode* pnode, vNodes) {
+        if (pnode->GetAddrName() == addrName) {
             return (pnode);
+        }
+    }
     return NULL;
 }
 
@@ -373,9 +375,7 @@ CNode* CConnman::ConnectNode(CAddress addrConnect, const char *pszDest, bool fCo
             CNode* pnode = FindNode((CService)addrConnect);
             if (pnode)
             {
-                if (pnode->addrName.empty()) {
-                    pnode->addrName = std::string(pszDest);
-                }
+                pnode->MaybeSetAddrName(std::string(pszDest));
                 CloseSocket(hSocket);
                 LogPrintf("Failed to open new connection, already connected\n");
                 return NULL;
@@ -593,6 +593,19 @@ void CConnman::AddWhitelistedRange(const CSubNet &subnet) {
     vWhitelistedRange.push_back(subnet);
 }
 
+
+std::string CNode::GetAddrName() const {
+    LOCK(cs_addrName);
+    return addrName;
+}
+
+void CNode::MaybeSetAddrName(const std::string& addrNameIn) {
+    LOCK(cs_addrName);
+    if (addrName.empty()) {
+        addrName = addrNameIn;
+    }
+}
+
 #undef X
 #define X(name) stats.name = name
 void CNode::copyStats(CNodeStats &stats)
@@ -608,7 +621,7 @@ void CNode::copyStats(CNodeStats &stats)
     X(nLastRecv);
     X(nTimeConnected);
     X(nTimeOffset);
-    X(addrName);
+    stats.addrName = GetAddrName();
     X(nVersion);
     {
         LOCK(cs_SubVer);
@@ -1798,8 +1811,9 @@ std::vector<AddedNodeInfo> CConnman::GetAddedNodeInfo()
             if (pnode->addr.IsValid()) {
                 mapConnected[pnode->addr] = pnode->fInbound;
             }
-            if (!pnode->addrName.empty()) {
-                mapConnectedByName[pnode->addrName] = std::make_pair(pnode->fInbound, static_cast<const CService&>(pnode->addr));
+            std::string addrName = pnode->GetAddrName();
+            if (!addrName.empty()) {
+                mapConnectedByName[std::move(addrName)] = std::make_pair(pnode->fInbound, static_cast<const CService&>(pnode->addr));
             }
         }
     }
diff --git a/src/net.h b/src/net.h
index ddc050eb1f67c..2cfc74e3d55c9 100644
--- a/src/net.h
+++ b/src/net.h
@@ -590,7 +590,6 @@ class CNode
     const int64_t nTimeConnected;
     std::atomic<int64_t> nTimeOffset;
     const CAddress addr;
-    std::string addrName;
     CService addrLocal;
     std::atomic<int> nVersion;
     // strSubVer is whatever byte array we read from the wire. However, this field is intended
@@ -696,6 +695,9 @@ class CNode
     const int nMyStartingHeight;
     int nSendVersion;
     std::list<CNetMessage> vRecvMsg;  // Used only by SocketHandler thread
+
+    mutable CCriticalSection cs_addrName;
+    std::string addrName;
 public:
 
     NodeId GetId() const {
@@ -798,6 +800,10 @@ class CNode
     {
         return nLocalServices;
     }
+
+    std::string GetAddrName() const;
+    //! Sets the addrName only if it was not previously set
+    void MaybeSetAddrName(const std::string& addrNameIn);
 };
 
 
diff --git a/src/net_processing.cpp b/src/net_processing.cpp
index 62397e68ce0cb..b0c9b3c71ba17 100644
--- a/src/net_processing.cpp
+++ b/src/net_processing.cpp
@@ -264,7 +264,7 @@ void PushNodeVersion(CNode *pnode, CConnman& connman, int64_t nTime)
 
 void InitializeNode(CNode *pnode, CConnman& connman) {
     CAddress addr = pnode->addr;
-    std::string addrName = pnode->addrName;
+    std::string addrName = pnode->GetAddrName();
     NodeId nodeid = pnode->GetId();
     {
         LOCK(cs_main);

From db2dc7a58cb0a3df58188b748df8e0d04ba76f00 Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Mon, 6 Feb 2017 12:18:51 -0500
Subject: [PATCH 1713/1802] Move CNode::addrLocal access behind locked
 accessors

---
 src/net.cpp            | 24 ++++++++++++++++++++----
 src/net.h              |  8 +++++++-
 src/net_processing.cpp |  4 ++--
 3 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/src/net.cpp b/src/net.cpp
index 8aa12619843fa..505eb971c09e9 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -164,8 +164,9 @@ int GetnScore(const CService& addr)
 // Is our peer's addrLocal potentially useful as an external IP source?
 bool IsPeerAddrLocalGood(CNode *pnode)
 {
-    return fDiscover && pnode->addr.IsRoutable() && pnode->addrLocal.IsRoutable() &&
-           !IsLimited(pnode->addrLocal.GetNetwork());
+    CService addrLocal = pnode->GetAddrLocal();
+    return fDiscover && pnode->addr.IsRoutable() && addrLocal.IsRoutable() &&
+           !IsLimited(addrLocal.GetNetwork());
 }
 
 // pushes our own address to a peer
@@ -180,7 +181,7 @@ void AdvertiseLocal(CNode *pnode)
         if (IsPeerAddrLocalGood(pnode) && (!addrLocal.IsRoutable() ||
              GetRand((GetnScore(addrLocal) > LOCAL_MANUAL) ? 8:2) == 0))
         {
-            addrLocal.SetIP(pnode->addrLocal);
+            addrLocal.SetIP(pnode->GetAddrLocal());
         }
         if (addrLocal.IsRoutable())
         {
@@ -606,6 +607,20 @@ void CNode::MaybeSetAddrName(const std::string& addrNameIn) {
     }
 }
 
+CService CNode::GetAddrLocal() const {
+    LOCK(cs_addrLocal);
+    return addrLocal;
+}
+
+void CNode::SetAddrLocal(const CService& addrLocalIn) {
+    LOCK(cs_addrLocal);
+    if (addrLocal.IsValid()) {
+        error("Addr local already set for node: %i. Refusing to change from %s to %s", id, addrLocal.ToString(), addrLocalIn.ToString());
+    } else {
+        addrLocal = addrLocalIn;
+    }
+}
+
 #undef X
 #define X(name) stats.name = name
 void CNode::copyStats(CNodeStats &stats)
@@ -659,7 +674,8 @@ void CNode::copyStats(CNodeStats &stats)
     stats.dPingWait = (((double)nPingUsecWait) / 1e6);
 
     // Leave string empty if addrLocal invalid (not filled in yet)
-    stats.addrLocal = addrLocal.IsValid() ? addrLocal.ToString() : "";
+    CService addrLocalUnlocked = GetAddrLocal();
+    stats.addrLocal = addrLocalUnlocked.IsValid() ? addrLocalUnlocked.ToString() : "";
 }
 #undef X
 
diff --git a/src/net.h b/src/net.h
index 2cfc74e3d55c9..29b6a44c88ff2 100644
--- a/src/net.h
+++ b/src/net.h
@@ -590,7 +590,6 @@ class CNode
     const int64_t nTimeConnected;
     std::atomic<int64_t> nTimeOffset;
     const CAddress addr;
-    CService addrLocal;
     std::atomic<int> nVersion;
     // strSubVer is whatever byte array we read from the wire. However, this field is intended
     // to be printed out, displayed to humans in various forms and so on. So we sanitize it and
@@ -698,6 +697,9 @@ class CNode
 
     mutable CCriticalSection cs_addrName;
     std::string addrName;
+
+    CService addrLocal;
+    mutable CCriticalSection cs_addrLocal;
 public:
 
     NodeId GetId() const {
@@ -731,6 +733,10 @@ class CNode
     void SetSendVersion(int nVersionIn);
     int GetSendVersion() const;
 
+    CService GetAddrLocal() const;
+    //! May not be called more than once
+    void SetAddrLocal(const CService& addrLocalIn);
+
     CNode* AddRef()
     {
         nRefCount++;
diff --git a/src/net_processing.cpp b/src/net_processing.cpp
index b0c9b3c71ba17..7d76aa0b4860f 100644
--- a/src/net_processing.cpp
+++ b/src/net_processing.cpp
@@ -1274,7 +1274,7 @@ bool static ProcessMessage(CNode* pfrom, const std::string& strCommand, CDataStr
         connman.PushMessage(pfrom, CNetMsgMaker(INIT_PROTO_VERSION).Make(NetMsgType::VERACK));
 
         pfrom->nServices = nServices;
-        pfrom->addrLocal = addrMe;
+        pfrom->SetAddrLocal(addrMe);
         {
             LOCK(pfrom->cs_SubVer);
             pfrom->strSubVer = strSubVer;
@@ -1315,7 +1315,7 @@ bool static ProcessMessage(CNode* pfrom, const std::string& strCommand, CDataStr
                     LogPrint("net", "ProcessMessages: advertising address %s\n", addr.ToString());
                     pfrom->PushAddress(addr, insecure_rand);
                 } else if (IsPeerAddrLocalGood(pfrom)) {
-                    addr.SetIP(pfrom->addrLocal);
+                    addr.SetIP(addrMe);
                     LogPrint("net", "ProcessMessages: advertising address %s\n", addr.ToString());
                     pfrom->PushAddress(addr, insecure_rand);
                 }

From 442887f27fb5809e72862d4385eba86588bc97d0 Mon Sep 17 00:00:00 2001
From: Russell Yanofsky <russ@yanofsky.org>
Date: Fri, 3 Feb 2017 16:23:13 -0500
Subject: [PATCH 1714/1802] Require timestamps for importmulti keys

Additionally, accept a "now" timestamp, to allow avoiding rescans for keys
which are known never to have been used.

Note that the behavior when "now" is specified is slightly different than the
previous behavior when no timestamp was specified at all. Previously, when no
timestamp was specified, it would avoid rescanning during the importmulti call,
but set the key's nCreateTime value to 1, which would not prevent future block
reads in later ScanForWalletTransactions calls. With this change, passing a
"now" timestamp will set the key's nCreateTime to the current block time
instead of 1.

Fixes #9491
---
 qa/rpc-tests/import-rescan.py |  1 +
 qa/rpc-tests/importmulti.py   | 37 ++++++++++++++++++++++++++++++++---
 src/wallet/rpcdump.cpp        | 35 +++++++++++++++++++++++++++------
 3 files changed, 64 insertions(+), 9 deletions(-)

diff --git a/qa/rpc-tests/import-rescan.py b/qa/rpc-tests/import-rescan.py
index e683df26db625..8f60e63e2e50d 100755
--- a/qa/rpc-tests/import-rescan.py
+++ b/qa/rpc-tests/import-rescan.py
@@ -33,6 +33,7 @@ def call_import_rpc(call, data, address, scriptPubKey, pubkey, key, label, node,
             "scriptPubKey": {
                 "address": address
             },
+            "timestamp": "now",
             "pubkeys": [pubkey] if data == Data.pub else [],
             "keys": [key] if data == Data.priv else [],
             "label": label,
diff --git a/qa/rpc-tests/importmulti.py b/qa/rpc-tests/importmulti.py
index e100a3af9d44d..b4d4b6c5b8048 100755
--- a/qa/rpc-tests/importmulti.py
+++ b/qa/rpc-tests/importmulti.py
@@ -52,7 +52,8 @@ def run_test (self):
         result = self.nodes[1].importmulti([{
             "scriptPubKey": {
                 "address": address['address']
-            }
+            },
+            "timestamp": "now",
         }])
         assert_equal(result[0]['success'], True)
         address_assert = self.nodes[1].validateaddress(address['address'])
@@ -65,6 +66,7 @@ def run_test (self):
         address = self.nodes[0].validateaddress(self.nodes[0].getnewaddress())
         result = self.nodes[1].importmulti([{
             "scriptPubKey": address['scriptPubKey'],
+            "timestamp": "now",
             "internal": True
         }])
         assert_equal(result[0]['success'], True)
@@ -76,7 +78,8 @@ def run_test (self):
         print("Should not import a scriptPubKey without internal flag")
         address = self.nodes[0].validateaddress(self.nodes[0].getnewaddress())
         result = self.nodes[1].importmulti([{
-            "scriptPubKey": address['scriptPubKey']
+            "scriptPubKey": address['scriptPubKey'],
+            "timestamp": "now",
         }])
         assert_equal(result[0]['success'], False)
         assert_equal(result[0]['error']['code'], -8)
@@ -93,6 +96,7 @@ def run_test (self):
             "scriptPubKey": {
                 "address": address['address']
             },
+            "timestamp": "now",
             "pubkeys": [ address['pubkey'] ]
         }])
         assert_equal(result[0]['success'], True)
@@ -106,6 +110,7 @@ def run_test (self):
         address = self.nodes[0].validateaddress(self.nodes[0].getnewaddress())
         request = [{
             "scriptPubKey": address['scriptPubKey'],
+            "timestamp": "now",
             "pubkeys": [ address['pubkey'] ],
             "internal": True
         }]
@@ -120,6 +125,7 @@ def run_test (self):
         address = self.nodes[0].validateaddress(self.nodes[0].getnewaddress())
         request = [{
             "scriptPubKey": address['scriptPubKey'],
+            "timestamp": "now",
             "pubkeys": [ address['pubkey'] ]
         }]
         result = self.nodes[1].importmulti(request)
@@ -137,6 +143,7 @@ def run_test (self):
             "scriptPubKey": {
                 "address": address['address']
             },
+            "timestamp": "now",
             "keys": [ self.nodes[0].dumpprivkey(address['address']) ]
         }])
         assert_equal(result[0]['success'], True)
@@ -151,6 +158,7 @@ def run_test (self):
             "scriptPubKey": {
                 "address": address['address']
             },
+            "timestamp": "now",
             "keys": [ self.nodes[0].dumpprivkey(address['address']) ],
             "watchonly": True
         }])
@@ -166,6 +174,7 @@ def run_test (self):
         address = self.nodes[0].validateaddress(self.nodes[0].getnewaddress())
         result = self.nodes[1].importmulti([{
             "scriptPubKey": address['scriptPubKey'],
+            "timestamp": "now",
             "keys": [ self.nodes[0].dumpprivkey(address['address']) ],
             "internal": True
         }])
@@ -179,6 +188,7 @@ def run_test (self):
         address = self.nodes[0].validateaddress(self.nodes[0].getnewaddress())
         result = self.nodes[1].importmulti([{
             "scriptPubKey": address['scriptPubKey'],
+            "timestamp": "now",
             "keys": [ self.nodes[0].dumpprivkey(address['address']) ]
         }])
         assert_equal(result[0]['success'], False)
@@ -203,7 +213,8 @@ def run_test (self):
         result = self.nodes[1].importmulti([{
             "scriptPubKey": {
                 "address": multi_sig_script['address']
-            }
+            },
+            "timestamp": "now",
         }])
         assert_equal(result[0]['success'], True)
         address_assert = self.nodes[1].validateaddress(multi_sig_script['address'])
@@ -229,6 +240,7 @@ def run_test (self):
             "scriptPubKey": {
                 "address": multi_sig_script['address']
             },
+            "timestamp": "now",
             "redeemscript": multi_sig_script['redeemScript']
         }])
         assert_equal(result[0]['success'], True)
@@ -253,6 +265,7 @@ def run_test (self):
             "scriptPubKey": {
                 "address": multi_sig_script['address']
             },
+            "timestamp": "now",
             "redeemscript": multi_sig_script['redeemScript'],
             "keys": [ self.nodes[0].dumpprivkey(sig_address_1['address']), self.nodes[0].dumpprivkey(sig_address_2['address'])]
         }])
@@ -277,6 +290,7 @@ def run_test (self):
             "scriptPubKey": {
                 "address": multi_sig_script['address']
             },
+            "timestamp": "now",
             "redeemscript": multi_sig_script['redeemScript'],
             "keys": [ self.nodes[0].dumpprivkey(sig_address_1['address']), self.nodes[0].dumpprivkey(sig_address_2['address'])],
             "watchonly": True
@@ -294,6 +308,7 @@ def run_test (self):
             "scriptPubKey": {
                 "address": address['address']
             },
+            "timestamp": "now",
             "pubkeys": [ address2['pubkey'] ]
         }])
         assert_equal(result[0]['success'], False)
@@ -310,6 +325,7 @@ def run_test (self):
         address2 = self.nodes[0].validateaddress(self.nodes[0].getnewaddress())
         request = [{
             "scriptPubKey": address['scriptPubKey'],
+            "timestamp": "now",
             "pubkeys": [ address2['pubkey'] ],
             "internal": True
         }]
@@ -330,6 +346,7 @@ def run_test (self):
             "scriptPubKey": {
                 "address": address['address']
             },
+            "timestamp": "now",
             "keys": [ self.nodes[0].dumpprivkey(address2['address']) ]
         }])
         assert_equal(result[0]['success'], False)
@@ -346,6 +363,7 @@ def run_test (self):
         address2 = self.nodes[0].validateaddress(self.nodes[0].getnewaddress())
         result = self.nodes[1].importmulti([{
             "scriptPubKey": address['scriptPubKey'],
+            "timestamp": "now",
             "keys": [ self.nodes[0].dumpprivkey(address2['address']) ],
             "internal": True
         }])
@@ -356,5 +374,18 @@ def run_test (self):
         assert_equal(address_assert['iswatchonly'], False)
         assert_equal(address_assert['ismine'], False)
 
+        # Bad or missing timestamps
+        print("Should throw on invalid or missing timestamp values")
+        assert_raises_message(JSONRPCException, 'Missing required timestamp field for key',
+            self.nodes[1].importmulti, [{
+                "scriptPubKey": address['scriptPubKey'],
+            }])
+        assert_raises_message(JSONRPCException, 'Expected number or "now" timestamp value for key. got type string',
+            self.nodes[1].importmulti, [{
+                "scriptPubKey": address['scriptPubKey'],
+                "timestamp": "",
+            }])
+
+
 if __name__ == '__main__':
     ImportMultiTest ().main ()
diff --git a/src/wallet/rpcdump.cpp b/src/wallet/rpcdump.cpp
index 7d4ed70ed91ec..4674c95bfe606 100644
--- a/src/wallet/rpcdump.cpp
+++ b/src/wallet/rpcdump.cpp
@@ -640,7 +640,8 @@ UniValue dumpwallet(const JSONRPCRequest& request)
 }
 
 
-UniValue processImport(const UniValue& data) {
+UniValue ProcessImport(const UniValue& data, const int64_t timestamp)
+{
     try {
         bool success = false;
 
@@ -659,7 +660,6 @@ UniValue processImport(const UniValue& data) {
         const bool& internal = data.exists("internal") ? data["internal"].get_bool() : false;
         const bool& watchOnly = data.exists("watchonly") ? data["watchonly"].get_bool() : false;
         const string& label = data.exists("label") && !internal ? data["label"].get_str() : "";
-        const int64_t& timestamp = data.exists("timestamp") && data["timestamp"].get_int64() > 1 ? data["timestamp"].get_int64() : 1;
 
         bool isScript = scriptPubKey.getType() == UniValue::VSTR;
         bool isP2SH = strRedeemScript.length() > 0;
@@ -958,6 +958,20 @@ UniValue processImport(const UniValue& data) {
     }
 }
 
+int64_t GetImportTimestamp(const UniValue& data, int64_t now)
+{
+    if (data.exists("timestamp")) {
+        const UniValue& timestamp = data["timestamp"];
+        if (timestamp.isNum()) {
+            return timestamp.get_int64();
+        } else if (timestamp.isStr() && timestamp.get_str() == "now") {
+            return now;
+        }
+        throw JSONRPCError(RPC_TYPE_ERROR, strprintf("Expected number or \"now\" timestamp value for key. got type %s", uvTypeName(timestamp.type())));
+    }
+    throw JSONRPCError(RPC_TYPE_ERROR, "Missing required timestamp field for key");
+}
+
 UniValue importmulti(const JSONRPCRequest& mainRequest)
 {
     // clang-format off
@@ -970,13 +984,17 @@ UniValue importmulti(const JSONRPCRequest& mainRequest)
             "  [     (array of json objects)\n"
             "    {\n"
             "      \"scriptPubKey\": \"<script>\" | { \"address\":\"<address>\" }, (string / json, required) Type of scriptPubKey (string for script, json for address)\n"
+            "      \"timestamp\": timestamp | \"now\"                        , (integer / string, required) Creation time of the key in seconds since epoch (Jan 1 1970 GMT),\n"
+            "                                                              or the string \"now\" to substitute the current synced blockchain time. The timestamp of the oldest\n"
+            "                                                              key will determine how far back blockchain rescans need to begin for missing wallet transactions.\n"
+            "                                                              \"now\" can be specified to bypass scanning, for keys which are known to never have been used, and\n"
+            "                                                              0 can be specified to scan the entire blockchain.\n"
             "      \"redeemscript\": \"<script>\"                            , (string, optional) Allowed only if the scriptPubKey is a P2SH address or a P2SH scriptPubKey\n"
             "      \"pubkeys\": [\"<pubKey>\", ... ]                         , (array, optional) Array of strings giving pubkeys that must occur in the output or redeemscript\n"
             "      \"keys\": [\"<key>\", ... ]                               , (array, optional) Array of strings giving private keys whose corresponding public keys must occur in the output or redeemscript\n"
             "      \"internal\": <true>                                    , (boolean, optional, default: false) Stating whether matching outputs should be be treated as not incoming payments\n"
             "      \"watchonly\": <true>                                   , (boolean, optional, default: false) Stating whether matching outputs should be considered watched even when they're not spendable, only allowed if keys are empty\n"
             "      \"label\": <label>                                      , (string, optional, default: '') Label to assign to the address (aka account name, for now), only allowed with internal=false\n"
-            "      \"timestamp\": 1454686740,                                (integer, optional, default now) Timestamp\n"
             "    }\n"
             "  ,...\n"
             "  ]\n"
@@ -1015,6 +1033,12 @@ UniValue importmulti(const JSONRPCRequest& mainRequest)
     LOCK2(cs_main, pwalletMain->cs_wallet);
     EnsureWalletIsUnlocked();
 
+    // Verify all timestamps are present before importing any keys.
+    const int64_t now = chainActive.Tip() ? chainActive.Tip()->GetBlockTime() : 0;
+    for (const UniValue& data : requests.getValues()) {
+        GetImportTimestamp(data, now);
+    }
+
     bool fRunScan = false;
     const int64_t minimumTimestamp = 1;
     int64_t nLowestTimestamp = 0;
@@ -1028,7 +1052,8 @@ UniValue importmulti(const JSONRPCRequest& mainRequest)
     UniValue response(UniValue::VARR);
 
     BOOST_FOREACH (const UniValue& data, requests.getValues()) {
-        const UniValue result = processImport(data);
+        const int64_t timestamp = std::max(GetImportTimestamp(data, now), minimumTimestamp);
+        const UniValue result = ProcessImport(data, timestamp);
         response.push_back(result);
 
         if (!fRescan) {
@@ -1041,8 +1066,6 @@ UniValue importmulti(const JSONRPCRequest& mainRequest)
         }
 
         // Get the lowest timestamp.
-        const int64_t& timestamp = data.exists("timestamp") && data["timestamp"].get_int64() > minimumTimestamp ? data["timestamp"].get_int64() : minimumTimestamp;
-
         if (timestamp < nLowestTimestamp) {
             nLowestTimestamp = timestamp;
         }

From 3cf991756cf357b651c6415e3d950e5aa9d355ab Mon Sep 17 00:00:00 2001
From: Russell Yanofsky <russ@yanofsky.org>
Date: Mon, 6 Feb 2017 11:13:05 -0500
Subject: [PATCH 1715/1802] Add test to check new importmulti "now" value

Easiest way to test this was to expose the timestamp via the validateaddress
RPC (which was already looking up and returning key metadata).
---
 qa/rpc-tests/importmulti.py |  2 ++
 src/rpc/misc.cpp            | 15 +++++++++++----
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/qa/rpc-tests/importmulti.py b/qa/rpc-tests/importmulti.py
index b4d4b6c5b8048..b9874ccb855dd 100755
--- a/qa/rpc-tests/importmulti.py
+++ b/qa/rpc-tests/importmulti.py
@@ -139,6 +139,7 @@ def run_test (self):
         # Address + Private key + !watchonly
         print("Should import an address with private key")
         address = self.nodes[0].validateaddress(self.nodes[0].getnewaddress())
+        timestamp = self.nodes[1].getblock(self.nodes[1].getbestblockhash())['time']
         result = self.nodes[1].importmulti([{
             "scriptPubKey": {
                 "address": address['address']
@@ -150,6 +151,7 @@ def run_test (self):
         address_assert = self.nodes[1].validateaddress(address['address'])
         assert_equal(address_assert['iswatchonly'], False)
         assert_equal(address_assert['ismine'], True)
+        assert_equal(address_assert['timestamp'], timestamp)
 
         # Address + Private key + watchonly
         print("Should not import an address with private key and with watchonly")
diff --git a/src/rpc/misc.cpp b/src/rpc/misc.cpp
index 480c45516c55e..25fad3c2e38e3 100644
--- a/src/rpc/misc.cpp
+++ b/src/rpc/misc.cpp
@@ -167,6 +167,7 @@ UniValue validateaddress(const JSONRPCRequest& request)
             "  \"pubkey\" : \"publickeyhex\",    (string) The hex value of the raw public key\n"
             "  \"iscompressed\" : true|false,  (boolean) If the address is compressed\n"
             "  \"account\" : \"account\"         (string) DEPRECATED. The account associated with the address, \"\" is the default account\n"
+            "  \"timestamp\" : timestamp,        (number, optional) The creation time of the key if available in seconds since epoch (Jan 1 1970 GMT)\n"
             "  \"hdkeypath\" : \"keypath\"       (string, optional) The HD keypath if the key is HD and available\n"
             "  \"hdmasterkeyid\" : \"<hash160>\" (string, optional) The Hash160 of the HD master pubkey\n"
             "}\n"
@@ -204,10 +205,16 @@ UniValue validateaddress(const JSONRPCRequest& request)
         if (pwalletMain && pwalletMain->mapAddressBook.count(dest))
             ret.push_back(Pair("account", pwalletMain->mapAddressBook[dest].name));
         CKeyID keyID;
-        if (pwalletMain && address.GetKeyID(keyID) && pwalletMain->mapKeyMetadata.count(keyID) && !pwalletMain->mapKeyMetadata[keyID].hdKeypath.empty())
-        {
-            ret.push_back(Pair("hdkeypath", pwalletMain->mapKeyMetadata[keyID].hdKeypath));
-            ret.push_back(Pair("hdmasterkeyid", pwalletMain->mapKeyMetadata[keyID].hdMasterKeyID.GetHex()));
+        if (pwalletMain) {
+            const auto& meta = pwalletMain->mapKeyMetadata;
+            auto it = address.GetKeyID(keyID) ? meta.find(keyID) : meta.end();
+            if (it != meta.end()) {
+                ret.push_back(Pair("timestamp", it->second.nCreateTime));
+                if (!it->second.hdKeypath.empty()) {
+                    ret.push_back(Pair("hdkeypath", it->second.hdKeypath));
+                    ret.push_back(Pair("hdmasterkeyid", it->second.hdMasterKeyID.GetHex()));
+                }
+            }
         }
 #endif
     }

From 266a8114cbe2a87a6c84d7690a7716a18d782c56 Mon Sep 17 00:00:00 2001
From: Russell Yanofsky <russ@yanofsky.org>
Date: Tue, 7 Feb 2017 11:08:08 -0500
Subject: [PATCH 1716/1802] Use MTP for importmulti "now" timestamps

---
 qa/rpc-tests/importmulti.py | 2 +-
 src/wallet/rpcdump.cpp      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/qa/rpc-tests/importmulti.py b/qa/rpc-tests/importmulti.py
index b9874ccb855dd..52e40d6c1cc3d 100755
--- a/qa/rpc-tests/importmulti.py
+++ b/qa/rpc-tests/importmulti.py
@@ -139,7 +139,7 @@ def run_test (self):
         # Address + Private key + !watchonly
         print("Should import an address with private key")
         address = self.nodes[0].validateaddress(self.nodes[0].getnewaddress())
-        timestamp = self.nodes[1].getblock(self.nodes[1].getbestblockhash())['time']
+        timestamp = self.nodes[1].getblock(self.nodes[1].getbestblockhash())['mediantime']
         result = self.nodes[1].importmulti([{
             "scriptPubKey": {
                 "address": address['address']
diff --git a/src/wallet/rpcdump.cpp b/src/wallet/rpcdump.cpp
index 4674c95bfe606..9310a320c76c4 100644
--- a/src/wallet/rpcdump.cpp
+++ b/src/wallet/rpcdump.cpp
@@ -1034,7 +1034,7 @@ UniValue importmulti(const JSONRPCRequest& mainRequest)
     EnsureWalletIsUnlocked();
 
     // Verify all timestamps are present before importing any keys.
-    const int64_t now = chainActive.Tip() ? chainActive.Tip()->GetBlockTime() : 0;
+    const int64_t now = chainActive.Tip() ? chainActive.Tip()->GetMedianTimePast() : 0;
     for (const UniValue& data : requests.getValues()) {
         GetImportTimestamp(data, now);
     }

From a58370e6a2d4dce50eefbcab5bde9f14facef8fc Mon Sep 17 00:00:00 2001
From: Russell Yanofsky <russ@yanofsky.org>
Date: Tue, 8 Nov 2016 16:28:20 -0500
Subject: [PATCH 1717/1802] Dedup nTimeFirstKey update logic

Also make nTimeFirstKey member variable private.

This is just a cleanup change, it doesn't change behavior in any significant
way.
---
 src/wallet/rpcdump.cpp  | 13 ++++---------
 src/wallet/wallet.cpp   | 19 ++++++++++++++-----
 src/wallet/wallet.h     |  6 ++++--
 src/wallet/walletdb.cpp |  9 ++-------
 4 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/src/wallet/rpcdump.cpp b/src/wallet/rpcdump.cpp
index 9310a320c76c4..f358d720cd930 100644
--- a/src/wallet/rpcdump.cpp
+++ b/src/wallet/rpcdump.cpp
@@ -143,7 +143,7 @@ UniValue importprivkey(const JSONRPCRequest& request)
             throw JSONRPCError(RPC_WALLET_ERROR, "Error adding key to wallet");
 
         // whenever a key is imported, we need to scan the whole chain
-        pwalletMain->nTimeFirstKey = 1; // 0 would be considered 'no value'
+        pwalletMain->UpdateTimeFirstKey(1);
 
         if (fRescan) {
             pwalletMain->ScanForWalletTransactions(chainActive.Genesis(), true);
@@ -500,8 +500,7 @@ UniValue importwallet(const JSONRPCRequest& request)
     while (pindex && pindex->pprev && pindex->GetBlockTime() > nTimeBegin - 7200)
         pindex = pindex->pprev;
 
-    if (!pwalletMain->nTimeFirstKey || nTimeBegin < pwalletMain->nTimeFirstKey)
-        pwalletMain->nTimeFirstKey = nTimeBegin;
+    pwalletMain->UpdateTimeFirstKey(nTimeBegin);
 
     LogPrintf("Rescanning last %i blocks\n", chainActive.Height() - pindex->nHeight + 1);
     pwalletMain->ScanForWalletTransactions(pindex);
@@ -782,9 +781,7 @@ UniValue ProcessImport(const UniValue& data, const int64_t timestamp)
                         throw JSONRPCError(RPC_WALLET_ERROR, "Error adding key to wallet");
                     }
 
-                    if (timestamp < pwalletMain->nTimeFirstKey) {
-                        pwalletMain->nTimeFirstKey = timestamp;
-                    }
+                    pwalletMain->UpdateTimeFirstKey(timestamp);
                 }
             }
 
@@ -912,9 +909,7 @@ UniValue ProcessImport(const UniValue& data, const int64_t timestamp)
                     throw JSONRPCError(RPC_WALLET_ERROR, "Error adding key to wallet");
                 }
 
-                if (timestamp < pwalletMain->nTimeFirstKey) {
-                    pwalletMain->nTimeFirstKey = timestamp;
-                }
+                pwalletMain->UpdateTimeFirstKey(timestamp);
 
                 success = true;
             }
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index a5e8752fc0daa..192af22cb8396 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -113,8 +113,7 @@ CPubKey CWallet::GenerateNewKey()
     assert(secret.VerifyPubKey(pubkey));
 
     mapKeyMetadata[pubkey.GetID()] = metadata;
-    if (!nTimeFirstKey || nCreationTime < nTimeFirstKey)
-        nTimeFirstKey = nCreationTime;
+    UpdateTimeFirstKey(nCreationTime);
 
     if (!AddKeyPubKey(secret, pubkey))
         throw std::runtime_error(std::string(__func__) + ": AddKey failed");
@@ -210,9 +209,7 @@ bool CWallet::AddCryptedKey(const CPubKey &vchPubKey,
 bool CWallet::LoadKeyMetadata(const CPubKey &pubkey, const CKeyMetadata &meta)
 {
     AssertLockHeld(cs_wallet); // mapKeyMetadata
-    if (meta.nCreateTime && (!nTimeFirstKey || meta.nCreateTime < nTimeFirstKey))
-        nTimeFirstKey = meta.nCreateTime;
-
+    UpdateTimeFirstKey(meta.nCreateTime);
     mapKeyMetadata[pubkey.GetID()] = meta;
     return true;
 }
@@ -222,6 +219,18 @@ bool CWallet::LoadCryptedKey(const CPubKey &vchPubKey, const std::vector<unsigne
     return CCryptoKeyStore::AddCryptedKey(vchPubKey, vchCryptedSecret);
 }
 
+void CWallet::UpdateTimeFirstKey(int64_t nCreateTime)
+{
+    AssertLockHeld(cs_wallet);
+    if (nCreateTime <= 1) {
+        // Cannot determine birthday information, so set the wallet birthday to
+        // the beginning of time.
+        nTimeFirstKey = 1;
+    } else if (!nTimeFirstKey || nCreateTime < nTimeFirstKey) {
+        nTimeFirstKey = nCreateTime;
+    }
+}
+
 bool CWallet::AddCScript(const CScript& redeemScript)
 {
     if (!CCryptoKeyStore::AddCScript(redeemScript))
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
index ea4787c3639cc..8d3ee9dddcf6e 100644
--- a/src/wallet/wallet.h
+++ b/src/wallet/wallet.h
@@ -611,6 +611,9 @@ class CWallet : public CCryptoKeyStore, public CValidationInterface
     bool fFileBacked;
 
     std::set<int64_t> setKeyPool;
+
+    int64_t nTimeFirstKey;
+
 public:
     /*
      * Main wallet lock.
@@ -688,8 +691,6 @@ class CWallet : public CCryptoKeyStore, public CValidationInterface
 
     std::set<COutPoint> setLockedCoins;
 
-    int64_t nTimeFirstKey;
-
     const CWalletTx* GetWalletTx(const uint256& hash) const;
 
     //! check whether we are allowed to upgrade (or already support) to the named feature
@@ -730,6 +731,7 @@ class CWallet : public CCryptoKeyStore, public CValidationInterface
     bool LoadKeyMetadata(const CPubKey &pubkey, const CKeyMetadata &metadata);
 
     bool LoadMinVersion(int nVersion) { AssertLockHeld(cs_wallet); nWalletVersion = nVersion; nWalletMaxVersion = std::max(nWalletMaxVersion, nVersion); return true; }
+    void UpdateTimeFirstKey(int64_t nCreateTime);
 
     //! Adds an encrypted key to the store, and saves it to disk.
     bool AddCryptedKey(const CPubKey &vchPubKey, const std::vector<unsigned char> &vchCryptedSecret);
diff --git a/src/wallet/walletdb.cpp b/src/wallet/walletdb.cpp
index b00ce36b708b2..15e1e4c45f6e0 100644
--- a/src/wallet/walletdb.cpp
+++ b/src/wallet/walletdb.cpp
@@ -357,7 +357,7 @@ ReadKeyValue(CWallet* pwallet, CDataStream& ssKey, CDataStream& ssValue,
 
             // Watch-only addresses have no birthday information for now,
             // so set the wallet birthday to the beginning of time.
-            pwallet->nTimeFirstKey = 1;
+            pwallet->UpdateTimeFirstKey(1);
         }
         else if (strType == "key" || strType == "wkey")
         {
@@ -467,11 +467,6 @@ ReadKeyValue(CWallet* pwallet, CDataStream& ssKey, CDataStream& ssValue,
             wss.nKeyMeta++;
 
             pwallet->LoadKeyMetadata(vchPubKey, keyMeta);
-
-            // find earliest key creation time, as wallet birthday
-            if (!pwallet->nTimeFirstKey ||
-                (keyMeta.nCreateTime < pwallet->nTimeFirstKey))
-                pwallet->nTimeFirstKey = keyMeta.nCreateTime;
         }
         else if (strType == "defaultkey")
         {
@@ -626,7 +621,7 @@ DBErrors CWalletDB::LoadWallet(CWallet* pwallet)
 
     // nTimeFirstKey is only reliable if all keys have metadata
     if ((wss.nKeys + wss.nCKeys) != wss.nKeyMeta)
-        pwallet->nTimeFirstKey = 1; // 0 would be considered 'no value'
+        pwallet->UpdateTimeFirstKey(1);
 
     BOOST_FOREACH(uint256 hash, wss.vWalletUpgrade)
         WriteTx(pwallet->mapWallet[hash]);

From a80f98b1c7a49432dc53d18d0fb51ac334de96be Mon Sep 17 00:00:00 2001
From: Russell Yanofsky <russ@yanofsky.org>
Date: Tue, 8 Nov 2016 16:55:02 -0500
Subject: [PATCH 1718/1802] Use importmulti timestamp when importing watch only
 keys

When importing a watch-only address over importmulti with a specific timestamp,
the wallet's nTimeFirstKey is currently set to 1. After this change, the
provided timestamp will be used and stored as metadata associated with
watch-only key. This can improve wallet performance because it can avoid the
need to scan the entire blockchain for watch only addresses when timestamps are
provided.

Also adds timestamp to validateaddress return value (needed for tests).

Fixes #9034.
---
 qa/rpc-tests/importmulti.py | 33 ++++++++++++++++++++++++++++++++-
 src/rpc/misc.cpp            |  3 +++
 src/wallet/rpcdump.cpp      | 20 +++++++++++---------
 src/wallet/wallet.cpp       | 27 ++++++++++++++++++---------
 src/wallet/wallet.h         | 21 +++++++++++++++++----
 src/wallet/walletdb.cpp     | 36 +++++++++++++++++++++++++-----------
 src/wallet/walletdb.h       |  2 +-
 7 files changed, 107 insertions(+), 35 deletions(-)

diff --git a/qa/rpc-tests/importmulti.py b/qa/rpc-tests/importmulti.py
index 52e40d6c1cc3d..02a932e737f06 100755
--- a/qa/rpc-tests/importmulti.py
+++ b/qa/rpc-tests/importmulti.py
@@ -20,6 +20,7 @@ def run_test (self):
         print ("Mining blocks...")
         self.nodes[0].generate(1)
         self.nodes[1].generate(1)
+        timestamp = self.nodes[1].getblock(self.nodes[1].getbestblockhash())['mediantime']
 
         # keyword definition
         PRIV_KEY = 'privkey'
@@ -59,6 +60,9 @@ def run_test (self):
         address_assert = self.nodes[1].validateaddress(address['address'])
         assert_equal(address_assert['iswatchonly'], True)
         assert_equal(address_assert['ismine'], False)
+        assert_equal(address_assert['timestamp'], timestamp)
+        watchonly_address = address['address']
+        watchonly_timestamp = timestamp
 
 
         # ScriptPubKey + internal
@@ -73,6 +77,7 @@ def run_test (self):
         address_assert = self.nodes[1].validateaddress(address['address'])
         assert_equal(address_assert['iswatchonly'], True)
         assert_equal(address_assert['ismine'], False)
+        assert_equal(address_assert['timestamp'], timestamp)
 
         # ScriptPubKey + !internal
         print("Should not import a scriptPubKey without internal flag")
@@ -87,6 +92,7 @@ def run_test (self):
         address_assert = self.nodes[1].validateaddress(address['address'])
         assert_equal(address_assert['iswatchonly'], False)
         assert_equal(address_assert['ismine'], False)
+        assert_equal('timestamp' in address_assert, False)
 
 
         # Address + Public key + !Internal
@@ -103,6 +109,7 @@ def run_test (self):
         address_assert = self.nodes[1].validateaddress(address['address'])
         assert_equal(address_assert['iswatchonly'], True)
         assert_equal(address_assert['ismine'], False)
+        assert_equal(address_assert['timestamp'], timestamp)
 
 
         # ScriptPubKey + Public key + internal
@@ -119,6 +126,7 @@ def run_test (self):
         address_assert = self.nodes[1].validateaddress(address['address'])
         assert_equal(address_assert['iswatchonly'], True)
         assert_equal(address_assert['ismine'], False)
+        assert_equal(address_assert['timestamp'], timestamp)
 
         # ScriptPubKey + Public key + !internal
         print("Should not import a scriptPubKey without internal and with public key")
@@ -135,11 +143,11 @@ def run_test (self):
         address_assert = self.nodes[1].validateaddress(address['address'])
         assert_equal(address_assert['iswatchonly'], False)
         assert_equal(address_assert['ismine'], False)
+        assert_equal('timestamp' in address_assert, False)
 
         # Address + Private key + !watchonly
         print("Should import an address with private key")
         address = self.nodes[0].validateaddress(self.nodes[0].getnewaddress())
-        timestamp = self.nodes[1].getblock(self.nodes[1].getbestblockhash())['mediantime']
         result = self.nodes[1].importmulti([{
             "scriptPubKey": {
                 "address": address['address']
@@ -170,6 +178,7 @@ def run_test (self):
         address_assert = self.nodes[1].validateaddress(address['address'])
         assert_equal(address_assert['iswatchonly'], False)
         assert_equal(address_assert['ismine'], False)
+        assert_equal('timestamp' in address_assert, False)
 
         # ScriptPubKey + Private key + internal
         print("Should import a scriptPubKey with internal and with private key")
@@ -184,6 +193,7 @@ def run_test (self):
         address_assert = self.nodes[1].validateaddress(address['address'])
         assert_equal(address_assert['iswatchonly'], False)
         assert_equal(address_assert['ismine'], True)
+        assert_equal(address_assert['timestamp'], timestamp)
 
         # ScriptPubKey + Private key + !internal
         print("Should not import a scriptPubKey without internal and with private key")
@@ -199,6 +209,7 @@ def run_test (self):
         address_assert = self.nodes[1].validateaddress(address['address'])
         assert_equal(address_assert['iswatchonly'], False)
         assert_equal(address_assert['ismine'], False)
+        assert_equal('timestamp' in address_assert, False)
 
 
         # P2SH address
@@ -209,6 +220,7 @@ def run_test (self):
         self.nodes[1].generate(100)
         transactionid = self.nodes[1].sendtoaddress(multi_sig_script['address'], 10.00)
         self.nodes[1].generate(1)
+        timestamp = self.nodes[1].getblock(self.nodes[1].getbestblockhash())['mediantime']
         transaction = self.nodes[1].gettransaction(transactionid)
 
         print("Should import a p2sh")
@@ -222,6 +234,7 @@ def run_test (self):
         address_assert = self.nodes[1].validateaddress(multi_sig_script['address'])
         assert_equal(address_assert['isscript'], True)
         assert_equal(address_assert['iswatchonly'], True)
+        assert_equal(address_assert['timestamp'], timestamp)
         p2shunspent = self.nodes[1].listunspent(0,999999, [multi_sig_script['address']])[0]
         assert_equal(p2shunspent['spendable'], False)
         assert_equal(p2shunspent['solvable'], False)
@@ -235,6 +248,7 @@ def run_test (self):
         self.nodes[1].generate(100)
         transactionid = self.nodes[1].sendtoaddress(multi_sig_script['address'], 10.00)
         self.nodes[1].generate(1)
+        timestamp = self.nodes[1].getblock(self.nodes[1].getbestblockhash())['mediantime']
         transaction = self.nodes[1].gettransaction(transactionid)
 
         print("Should import a p2sh with respective redeem script")
@@ -246,6 +260,8 @@ def run_test (self):
             "redeemscript": multi_sig_script['redeemScript']
         }])
         assert_equal(result[0]['success'], True)
+        address_assert = self.nodes[1].validateaddress(multi_sig_script['address'])
+        assert_equal(address_assert['timestamp'], timestamp)
 
         p2shunspent = self.nodes[1].listunspent(0,999999, [multi_sig_script['address']])[0]
         assert_equal(p2shunspent['spendable'], False)
@@ -260,6 +276,7 @@ def run_test (self):
         self.nodes[1].generate(100)
         transactionid = self.nodes[1].sendtoaddress(multi_sig_script['address'], 10.00)
         self.nodes[1].generate(1)
+        timestamp = self.nodes[1].getblock(self.nodes[1].getbestblockhash())['mediantime']
         transaction = self.nodes[1].gettransaction(transactionid)
 
         print("Should import a p2sh with respective redeem script and private keys")
@@ -272,6 +289,8 @@ def run_test (self):
             "keys": [ self.nodes[0].dumpprivkey(sig_address_1['address']), self.nodes[0].dumpprivkey(sig_address_2['address'])]
         }])
         assert_equal(result[0]['success'], True)
+        address_assert = self.nodes[1].validateaddress(multi_sig_script['address'])
+        assert_equal(address_assert['timestamp'], timestamp)
 
         p2shunspent = self.nodes[1].listunspent(0,999999, [multi_sig_script['address']])[0]
         assert_equal(p2shunspent['spendable'], False)
@@ -319,6 +338,7 @@ def run_test (self):
         address_assert = self.nodes[1].validateaddress(address['address'])
         assert_equal(address_assert['iswatchonly'], False)
         assert_equal(address_assert['ismine'], False)
+        assert_equal('timestamp' in address_assert, False)
 
 
         # ScriptPubKey + Public key + internal + Wrong pubkey
@@ -338,6 +358,7 @@ def run_test (self):
         address_assert = self.nodes[1].validateaddress(address['address'])
         assert_equal(address_assert['iswatchonly'], False)
         assert_equal(address_assert['ismine'], False)
+        assert_equal('timestamp' in address_assert, False)
 
 
         # Address + Private key + !watchonly + Wrong private key
@@ -357,6 +378,7 @@ def run_test (self):
         address_assert = self.nodes[1].validateaddress(address['address'])
         assert_equal(address_assert['iswatchonly'], False)
         assert_equal(address_assert['ismine'], False)
+        assert_equal('timestamp' in address_assert, False)
 
 
         # ScriptPubKey + Private key + internal + Wrong private key
@@ -375,6 +397,15 @@ def run_test (self):
         address_assert = self.nodes[1].validateaddress(address['address'])
         assert_equal(address_assert['iswatchonly'], False)
         assert_equal(address_assert['ismine'], False)
+        assert_equal('timestamp' in address_assert, False)
+
+        # restart nodes to check for proper serialization/deserialization of watch only address
+        stop_nodes(self.nodes)
+        self.nodes = start_nodes(2, self.options.tmpdir)
+        address_assert = self.nodes[1].validateaddress(watchonly_address)
+        assert_equal(address_assert['iswatchonly'], True)
+        assert_equal(address_assert['ismine'], False)
+        assert_equal(address_assert['timestamp'], watchonly_timestamp);
 
         # Bad or missing timestamps
         print("Should throw on invalid or missing timestamp values")
diff --git a/src/rpc/misc.cpp b/src/rpc/misc.cpp
index 25fad3c2e38e3..6fd50127bd5b3 100644
--- a/src/rpc/misc.cpp
+++ b/src/rpc/misc.cpp
@@ -208,6 +208,9 @@ UniValue validateaddress(const JSONRPCRequest& request)
         if (pwalletMain) {
             const auto& meta = pwalletMain->mapKeyMetadata;
             auto it = address.GetKeyID(keyID) ? meta.find(keyID) : meta.end();
+            if (it == meta.end()) {
+                it = meta.find(CScriptID(scriptPubKey));
+            }
             if (it != meta.end()) {
                 ret.push_back(Pair("timestamp", it->second.nCreateTime));
                 if (!it->second.hdKeypath.empty()) {
diff --git a/src/wallet/rpcdump.cpp b/src/wallet/rpcdump.cpp
index f358d720cd930..0a3225937e1b2 100644
--- a/src/wallet/rpcdump.cpp
+++ b/src/wallet/rpcdump.cpp
@@ -161,7 +161,7 @@ void ImportScript(const CScript& script, const string& strLabel, bool isRedeemSc
 
     pwalletMain->MarkDirty();
 
-    if (!pwalletMain->HaveWatchOnly(script) && !pwalletMain->AddWatchOnly(script))
+    if (!pwalletMain->HaveWatchOnly(script) && !pwalletMain->AddWatchOnly(script, 0 /* nCreateTime */))
         throw JSONRPCError(RPC_WALLET_ERROR, "Error adding address to wallet");
 
     if (isRedeemScript) {
@@ -575,15 +575,17 @@ UniValue dumpwallet(const JSONRPCRequest& request)
     if (!file.is_open())
         throw JSONRPCError(RPC_INVALID_PARAMETER, "Cannot open wallet dump file");
 
-    std::map<CKeyID, int64_t> mapKeyBirth;
+    std::map<CTxDestination, int64_t> mapKeyBirth;
     std::set<CKeyID> setKeyPool;
     pwalletMain->GetKeyBirthTimes(mapKeyBirth);
     pwalletMain->GetAllReserveKeys(setKeyPool);
 
     // sort time/key pairs
     std::vector<std::pair<int64_t, CKeyID> > vKeyBirth;
-    for (std::map<CKeyID, int64_t>::const_iterator it = mapKeyBirth.begin(); it != mapKeyBirth.end(); it++) {
-        vKeyBirth.push_back(std::make_pair(it->second, it->first));
+    for (const auto& entry : mapKeyBirth) {
+        if (const CKeyID* keyID = boost::get<CKeyID>(&entry.first)) { // set and test
+            vKeyBirth.push_back(std::make_pair(entry.second, *keyID));
+        }
     }
     mapKeyBirth.clear();
     std::sort(vKeyBirth.begin(), vKeyBirth.end());
@@ -720,7 +722,7 @@ UniValue ProcessImport(const UniValue& data, const int64_t timestamp)
 
             pwalletMain->MarkDirty();
 
-            if (!pwalletMain->HaveWatchOnly(redeemScript) && !pwalletMain->AddWatchOnly(redeemScript)) {
+            if (!pwalletMain->HaveWatchOnly(redeemScript) && !pwalletMain->AddWatchOnly(redeemScript, timestamp)) {
                 throw JSONRPCError(RPC_WALLET_ERROR, "Error adding address to wallet");
             }
 
@@ -737,7 +739,7 @@ UniValue ProcessImport(const UniValue& data, const int64_t timestamp)
 
             pwalletMain->MarkDirty();
 
-            if (!pwalletMain->HaveWatchOnly(redeemDestination) && !pwalletMain->AddWatchOnly(redeemDestination)) {
+            if (!pwalletMain->HaveWatchOnly(redeemDestination) && !pwalletMain->AddWatchOnly(redeemDestination, timestamp)) {
                 throw JSONRPCError(RPC_WALLET_ERROR, "Error adding address to wallet");
             }
 
@@ -830,7 +832,7 @@ UniValue ProcessImport(const UniValue& data, const int64_t timestamp)
 
                 pwalletMain->MarkDirty();
 
-                if (!pwalletMain->HaveWatchOnly(pubKeyScript) && !pwalletMain->AddWatchOnly(pubKeyScript)) {
+                if (!pwalletMain->HaveWatchOnly(pubKeyScript) && !pwalletMain->AddWatchOnly(pubKeyScript, timestamp)) {
                     throw JSONRPCError(RPC_WALLET_ERROR, "Error adding address to wallet");
                 }
 
@@ -848,7 +850,7 @@ UniValue ProcessImport(const UniValue& data, const int64_t timestamp)
 
                 pwalletMain->MarkDirty();
 
-                if (!pwalletMain->HaveWatchOnly(scriptRawPubKey) && !pwalletMain->AddWatchOnly(scriptRawPubKey)) {
+                if (!pwalletMain->HaveWatchOnly(scriptRawPubKey) && !pwalletMain->AddWatchOnly(scriptRawPubKey, timestamp)) {
                     throw JSONRPCError(RPC_WALLET_ERROR, "Error adding address to wallet");
                 }
 
@@ -922,7 +924,7 @@ UniValue ProcessImport(const UniValue& data, const int64_t timestamp)
 
                 pwalletMain->MarkDirty();
 
-                if (!pwalletMain->HaveWatchOnly(script) && !pwalletMain->AddWatchOnly(script)) {
+                if (!pwalletMain->HaveWatchOnly(script) && !pwalletMain->AddWatchOnly(script, timestamp)) {
                     throw JSONRPCError(RPC_WALLET_ERROR, "Error adding address to wallet");
                 }
 
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index 192af22cb8396..f8f5a9306dc1c 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -206,11 +206,11 @@ bool CWallet::AddCryptedKey(const CPubKey &vchPubKey,
     return false;
 }
 
-bool CWallet::LoadKeyMetadata(const CPubKey &pubkey, const CKeyMetadata &meta)
+bool CWallet::LoadKeyMetadata(const CTxDestination& keyID, const CKeyMetadata &meta)
 {
     AssertLockHeld(cs_wallet); // mapKeyMetadata
     UpdateTimeFirstKey(meta.nCreateTime);
-    mapKeyMetadata[pubkey.GetID()] = meta;
+    mapKeyMetadata[keyID] = meta;
     return true;
 }
 
@@ -256,15 +256,22 @@ bool CWallet::LoadCScript(const CScript& redeemScript)
     return CCryptoKeyStore::AddCScript(redeemScript);
 }
 
-bool CWallet::AddWatchOnly(const CScript &dest)
+bool CWallet::AddWatchOnly(const CScript& dest)
 {
     if (!CCryptoKeyStore::AddWatchOnly(dest))
         return false;
-    nTimeFirstKey = 1; // No birthday information for watch-only keys.
+    const CKeyMetadata& meta = mapKeyMetadata[CScriptID(dest)];
+    UpdateTimeFirstKey(meta.nCreateTime);
     NotifyWatchonlyChanged(true);
     if (!fFileBacked)
         return true;
-    return CWalletDB(strWalletFile).WriteWatchOnly(dest);
+    return CWalletDB(strWalletFile).WriteWatchOnly(dest, meta);
+}
+
+bool CWallet::AddWatchOnly(const CScript& dest, int64_t nCreateTime)
+{
+    mapKeyMetadata[CScriptID(dest)].nCreateTime = nCreateTime;
+    return AddWatchOnly(dest);
 }
 
 bool CWallet::RemoveWatchOnly(const CScript &dest)
@@ -3425,14 +3432,16 @@ class CAffectedKeysVisitor : public boost::static_visitor<void> {
     void operator()(const CNoDestination &none) {}
 };
 
-void CWallet::GetKeyBirthTimes(std::map<CKeyID, int64_t> &mapKeyBirth) const {
+void CWallet::GetKeyBirthTimes(std::map<CTxDestination, int64_t> &mapKeyBirth) const {
     AssertLockHeld(cs_wallet); // mapKeyMetadata
     mapKeyBirth.clear();
 
     // get birth times for keys with metadata
-    for (std::map<CKeyID, CKeyMetadata>::const_iterator it = mapKeyMetadata.begin(); it != mapKeyMetadata.end(); it++)
-        if (it->second.nCreateTime)
-            mapKeyBirth[it->first] = it->second.nCreateTime;
+    for (const auto& entry : mapKeyMetadata) {
+        if (entry.second.nCreateTime) {
+            mapKeyBirth[entry.first] = entry.second.nCreateTime;
+        }
+    }
 
     // map in which we'll infer heights of other keys
     CBlockIndex *pindexMax = chainActive[std::max(0, chainActive.Height() - 144)]; // the tip can be reorganized; use a 144-block safety margin
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
index 8d3ee9dddcf6e..990c3bdf4196a 100644
--- a/src/wallet/wallet.h
+++ b/src/wallet/wallet.h
@@ -614,6 +614,17 @@ class CWallet : public CCryptoKeyStore, public CValidationInterface
 
     int64_t nTimeFirstKey;
 
+    /**
+     * Private version of AddWatchOnly method which does not accept a
+     * timestamp, and which will reset the wallet's nTimeFirstKey value to 1 if
+     * the watch key did not previously have a timestamp associated with it.
+     * Because this is an inherited virtual method, it is accessible despite
+     * being marked private, but it is marked private anyway to encourage use
+     * of the other AddWatchOnly which accepts a timestamp and sets
+     * nTimeFirstKey more intelligently for more efficient rescans.
+     */
+    bool AddWatchOnly(const CScript& dest) override;
+
 public:
     /*
      * Main wallet lock.
@@ -638,7 +649,9 @@ class CWallet : public CCryptoKeyStore, public CValidationInterface
             mapKeyMetadata[keyid] = CKeyMetadata(keypool.nTime);
     }
 
-    std::map<CKeyID, CKeyMetadata> mapKeyMetadata;
+    // Map from Key ID (for regular keys) or Script ID (for watch-only keys) to
+    // key metadata.
+    std::map<CTxDestination, CKeyMetadata> mapKeyMetadata;
 
     typedef std::map<unsigned int, CMasterKey> MasterKeyMap;
     MasterKeyMap mapMasterKeys;
@@ -728,7 +741,7 @@ class CWallet : public CCryptoKeyStore, public CValidationInterface
     //! Adds a key to the store, without saving it to disk (used by LoadWallet)
     bool LoadKey(const CKey& key, const CPubKey &pubkey) { return CCryptoKeyStore::AddKeyPubKey(key, pubkey); }
     //! Load metadata (used by LoadWallet)
-    bool LoadKeyMetadata(const CPubKey &pubkey, const CKeyMetadata &metadata);
+    bool LoadKeyMetadata(const CTxDestination& pubKey, const CKeyMetadata &metadata);
 
     bool LoadMinVersion(int nVersion) { AssertLockHeld(cs_wallet); nWalletVersion = nVersion; nWalletMaxVersion = std::max(nWalletMaxVersion, nVersion); return true; }
     void UpdateTimeFirstKey(int64_t nCreateTime);
@@ -750,7 +763,7 @@ class CWallet : public CCryptoKeyStore, public CValidationInterface
     bool GetDestData(const CTxDestination &dest, const std::string &key, std::string *value) const;
 
     //! Adds a watch-only address to the store, and saves it to disk.
-    bool AddWatchOnly(const CScript &dest);
+    bool AddWatchOnly(const CScript& dest, int64_t nCreateTime);
     bool RemoveWatchOnly(const CScript &dest);
     //! Adds a watch-only address to the store, without saving it to disk (used by LoadWallet)
     bool LoadWatchOnly(const CScript &dest);
@@ -759,7 +772,7 @@ class CWallet : public CCryptoKeyStore, public CValidationInterface
     bool ChangeWalletPassphrase(const SecureString& strOldWalletPassphrase, const SecureString& strNewWalletPassphrase);
     bool EncryptWallet(const SecureString& strWalletPassphrase);
 
-    void GetKeyBirthTimes(std::map<CKeyID, int64_t> &mapKeyBirth) const;
+    void GetKeyBirthTimes(std::map<CTxDestination, int64_t> &mapKeyBirth) const;
 
     /** 
      * Increment the next transaction order id
diff --git a/src/wallet/walletdb.cpp b/src/wallet/walletdb.cpp
index 15e1e4c45f6e0..106a59d562304 100644
--- a/src/wallet/walletdb.cpp
+++ b/src/wallet/walletdb.cpp
@@ -120,15 +120,19 @@ bool CWalletDB::WriteCScript(const uint160& hash, const CScript& redeemScript)
     return Write(std::make_pair(std::string("cscript"), hash), *(const CScriptBase*)(&redeemScript), false);
 }
 
-bool CWalletDB::WriteWatchOnly(const CScript &dest)
+bool CWalletDB::WriteWatchOnly(const CScript &dest, const CKeyMetadata& keyMeta)
 {
     nWalletDBUpdateCounter++;
+    if (!Write(std::make_pair(std::string("watchmeta"), *(const CScriptBase*)(&dest)), keyMeta))
+        return false;
     return Write(std::make_pair(std::string("watchs"), *(const CScriptBase*)(&dest)), '1');
 }
 
 bool CWalletDB::EraseWatchOnly(const CScript &dest)
 {
     nWalletDBUpdateCounter++;
+    if (!Erase(std::make_pair(std::string("watchmeta"), *(const CScriptBase*)(&dest))))
+        return false;
     return Erase(std::make_pair(std::string("watchs"), *(const CScriptBase*)(&dest)));
 }
 
@@ -259,6 +263,7 @@ class CWalletScanState {
 public:
     unsigned int nKeys;
     unsigned int nCKeys;
+    unsigned int nWatchKeys;
     unsigned int nKeyMeta;
     bool fIsEncrypted;
     bool fAnyUnordered;
@@ -266,7 +271,7 @@ class CWalletScanState {
     vector<uint256> vWalletUpgrade;
 
     CWalletScanState() {
-        nKeys = nCKeys = nKeyMeta = 0;
+        nKeys = nCKeys = nWatchKeys = nKeyMeta = 0;
         fIsEncrypted = false;
         fAnyUnordered = false;
         nFileVersion = 0;
@@ -348,16 +353,13 @@ ReadKeyValue(CWallet* pwallet, CDataStream& ssKey, CDataStream& ssValue,
         }
         else if (strType == "watchs")
         {
+            wss.nWatchKeys++;
             CScript script;
             ssKey >> *(CScriptBase*)(&script);
             char fYes;
             ssValue >> fYes;
             if (fYes == '1')
                 pwallet->LoadWatchOnly(script);
-
-            // Watch-only addresses have no birthday information for now,
-            // so set the wallet birthday to the beginning of time.
-            pwallet->UpdateTimeFirstKey(1);
         }
         else if (strType == "key" || strType == "wkey")
         {
@@ -458,15 +460,27 @@ ReadKeyValue(CWallet* pwallet, CDataStream& ssKey, CDataStream& ssValue,
             }
             wss.fIsEncrypted = true;
         }
-        else if (strType == "keymeta")
+        else if (strType == "keymeta" || strType == "watchmeta")
         {
-            CPubKey vchPubKey;
-            ssKey >> vchPubKey;
+            CTxDestination keyID;
+            if (strType == "keymeta")
+            {
+              CPubKey vchPubKey;
+              ssKey >> vchPubKey;
+              keyID = vchPubKey.GetID();
+            }
+            else if (strType == "watchmeta")
+            {
+              CScript script;
+              ssKey >> *(CScriptBase*)(&script);
+              keyID = CScriptID(script);
+            }
+
             CKeyMetadata keyMeta;
             ssValue >> keyMeta;
             wss.nKeyMeta++;
 
-            pwallet->LoadKeyMetadata(vchPubKey, keyMeta);
+            pwallet->LoadKeyMetadata(keyID, keyMeta);
         }
         else if (strType == "defaultkey")
         {
@@ -620,7 +634,7 @@ DBErrors CWalletDB::LoadWallet(CWallet* pwallet)
            wss.nKeys, wss.nCKeys, wss.nKeyMeta, wss.nKeys + wss.nCKeys);
 
     // nTimeFirstKey is only reliable if all keys have metadata
-    if ((wss.nKeys + wss.nCKeys) != wss.nKeyMeta)
+    if ((wss.nKeys + wss.nCKeys + wss.nWatchKeys) != wss.nKeyMeta)
         pwallet->UpdateTimeFirstKey(1);
 
     BOOST_FOREACH(uint256 hash, wss.vWalletUpgrade)
diff --git a/src/wallet/walletdb.h b/src/wallet/walletdb.h
index 8437a95ba7744..c7c65465df9a8 100644
--- a/src/wallet/walletdb.h
+++ b/src/wallet/walletdb.h
@@ -135,7 +135,7 @@ class CWalletDB : public CDB
 
     bool WriteCScript(const uint160& hash, const CScript& redeemScript);
 
-    bool WriteWatchOnly(const CScript &script);
+    bool WriteWatchOnly(const CScript &script, const CKeyMetadata &keymeta);
     bool EraseWatchOnly(const CScript &script);
 
     bool WriteBestBlock(const CBlockLocator& locator);

From 0b4f273e9cf7166dbd103e116b5d991e359e673d Mon Sep 17 00:00:00 2001
From: Luke Dashjr <luke-jr+git@utopios.org>
Date: Mon, 13 Feb 2017 22:49:10 +0000
Subject: [PATCH 1719/1802] Bugfix: Qt/Options: Restore persistent "restart
 required" notice

---
 src/qt/optionsdialog.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/qt/optionsdialog.cpp b/src/qt/optionsdialog.cpp
index 647c860bdc7ec..6d65f4c11621b 100644
--- a/src/qt/optionsdialog.cpp
+++ b/src/qt/optionsdialog.cpp
@@ -258,6 +258,9 @@ void OptionsDialog::showRestartWarning(bool fPersistent)
 void OptionsDialog::clearStatusLabel()
 {
     ui->statusLabel->clear();
+    if (model && model->isRestartRequired()) {
+        showRestartWarning(true);
+    }
 }
 
 void OptionsDialog::updateProxyValidationState()
@@ -267,7 +270,7 @@ void OptionsDialog::updateProxyValidationState()
     if (pUiProxyIp->isValid() && (!ui->proxyPort->isEnabled() || ui->proxyPort->text().toInt() > 0) && (!ui->proxyPortTor->isEnabled() || ui->proxyPortTor->text().toInt() > 0))
     {
         setOkButtonState(otherProxyWidget->isValid()); //only enable ok button if both proxys are valid
-        ui->statusLabel->clear();
+        clearStatusLabel();
     }
     else
     {

From 9acf25cc013c013ee5b07dba7b1319b7c5a7b6a4 Mon Sep 17 00:00:00 2001
From: Russell Yanofsky <russ@yanofsky.org>
Date: Mon, 13 Feb 2017 17:54:51 -0500
Subject: [PATCH 1720/1802] Return error when importmulti called with invalid
 address.

Lack of error checking noticed by Alex Morcos <morcos@chaincode.com>
---
 qa/rpc-tests/importmulti.py | 10 ++++++++++
 src/wallet/rpcdump.cpp      |  3 +++
 2 files changed, 13 insertions(+)

diff --git a/qa/rpc-tests/importmulti.py b/qa/rpc-tests/importmulti.py
index e100a3af9d44d..43964610e5b3e 100755
--- a/qa/rpc-tests/importmulti.py
+++ b/qa/rpc-tests/importmulti.py
@@ -59,6 +59,16 @@ def run_test (self):
         assert_equal(address_assert['iswatchonly'], True)
         assert_equal(address_assert['ismine'], False)
 
+        print("Should not import an invalid address")
+        result = self.nodes[1].importmulti([{
+            "scriptPubKey": {
+                "address": "not valid address",
+            },
+            "timestamp": "now",
+        }])
+        assert_equal(result[0]['success'], False)
+        assert_equal(result[0]['error']['code'], -5)
+        assert_equal(result[0]['error']['message'], 'Invalid address')
 
         # ScriptPubKey + internal
         print("Should import a scriptPubKey with internal flag")
diff --git a/src/wallet/rpcdump.cpp b/src/wallet/rpcdump.cpp
index 7d4ed70ed91ec..738643eb0170b 100644
--- a/src/wallet/rpcdump.cpp
+++ b/src/wallet/rpcdump.cpp
@@ -671,6 +671,9 @@ UniValue processImport(const UniValue& data) {
 
         if (!isScript) {
             address = CBitcoinAddress(output);
+            if (!address.IsValid()) {
+                throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid address");
+            }
             script = GetScriptForDestination(address.Get());
         } else {
             if (!IsHex(output)) {

From c45b9fb54c5ca068a5e276c3bd6ebf4ae720f6f7 Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Tue, 7 Feb 2017 12:02:02 -0500
Subject: [PATCH 1721/1802] net: correctly ban before the handshake is complete

7a8c251901 made a change to avoid getting into SendMessages() until the
version handshake (VERSION + VERACK) is complete. That was done to avoid
leaking out messages to nodes who could connect, but never bothered sending
us their version/verack.

Unfortunately, the ban tally and possible disconnect are done as part of
SendMessages(). So after 7a8c251901, if a peer managed to do something
bannable before completing the handshake (say send 100 non-version messages
before their version), they wouldn't actually end up getting
disconnected/banned. That's fixed here by checking the banscore as part of
ProcessMessages() in addition to SendMessages().
---
 src/net_processing.cpp | 60 ++++++++++++++++++++++++++----------------
 1 file changed, 37 insertions(+), 23 deletions(-)

diff --git a/src/net_processing.cpp b/src/net_processing.cpp
index bb14e69d83c23..587e857970c48 100644
--- a/src/net_processing.cpp
+++ b/src/net_processing.cpp
@@ -2596,6 +2596,36 @@ bool static ProcessMessage(CNode* pfrom, const std::string& strCommand, CDataStr
     return true;
 }
 
+static bool SendRejectsAndCheckIfBanned(CNode* pnode, CConnman& connman)
+{
+    AssertLockHeld(cs_main);
+    CNodeState &state = *State(pnode->GetId());
+
+    BOOST_FOREACH(const CBlockReject& reject, state.rejects) {
+        connman.PushMessage(pnode, CNetMsgMaker(INIT_PROTO_VERSION).Make(NetMsgType::REJECT, (std::string)NetMsgType::BLOCK, reject.chRejectCode, reject.strRejectReason, reject.hashBlock));
+    }
+    state.rejects.clear();
+
+    if (state.fShouldBan) {
+        state.fShouldBan = false;
+        if (pnode->fWhitelisted)
+            LogPrintf("Warning: not punishing whitelisted peer %s!\n", pnode->addr.ToString());
+        else if (pnode->fAddnode)
+            LogPrintf("Warning: not punishing addnoded peer %s!\n", pnode->addr.ToString());
+        else {
+            pnode->fDisconnect = true;
+            if (pnode->addr.IsLocal())
+                LogPrintf("Warning: not banning local peer %s!\n", pnode->addr.ToString());
+            else
+            {
+                connman.Ban(pnode->addr, BanReasonNodeMisbehaving);
+            }
+        }
+        return true;
+    }
+    return false;
+}
+
 bool ProcessMessages(CNode* pfrom, CConnman& connman, const std::atomic<bool>& interruptMsgProc)
 {
     const CChainParams& chainparams = Params();
@@ -2706,8 +2736,12 @@ bool ProcessMessages(CNode* pfrom, CConnman& connman, const std::atomic<bool>& i
             PrintExceptionContinue(NULL, "ProcessMessages()");
         }
 
-        if (!fRet)
+        if (!fRet) {
             LogPrintf("%s(%s, %u bytes) FAILED peer=%d\n", __func__, SanitizeString(strCommand), nMessageSize, pfrom->id);
+        }
+
+        LOCK(cs_main);
+        SendRejectsAndCheckIfBanned(pfrom, connman);
 
     return fMoreWork;
 }
@@ -2773,30 +2807,10 @@ bool SendMessages(CNode* pto, CConnman& connman, const std::atomic<bool>& interr
         if (!lockMain)
             return true;
 
+        if (SendRejectsAndCheckIfBanned(pto, connman))
+            return true;
         CNodeState &state = *State(pto->GetId());
 
-        BOOST_FOREACH(const CBlockReject& reject, state.rejects)
-            connman.PushMessage(pto, msgMaker.Make(NetMsgType::REJECT, (std::string)NetMsgType::BLOCK, reject.chRejectCode, reject.strRejectReason, reject.hashBlock));
-        state.rejects.clear();
-
-        if (state.fShouldBan) {
-            state.fShouldBan = false;
-            if (pto->fWhitelisted)
-                LogPrintf("Warning: not punishing whitelisted peer %s!\n", pto->addr.ToString());
-            else if (pto->fAddnode)
-                LogPrintf("Warning: not punishing addnoded peer %s!\n", pto->addr.ToString());
-            else {
-                pto->fDisconnect = true;
-                if (pto->addr.IsLocal())
-                    LogPrintf("Warning: not banning local peer %s!\n", pto->addr.ToString());
-                else
-                {
-                    connman.Ban(pto->addr, BanReasonNodeMisbehaving);
-                }
-                return true;
-            }
-        }
-
         // Address refresh broadcast
         int64_t nNow = GetTimeMicros();
         if (!IsInitialBlockDownload() && pto->nNextLocalAddrSend < nNow) {

From 8502e7acbe0f42fd6e6979681bc9c4610c4fb8cb Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Wed, 8 Feb 2017 01:02:49 -0500
Subject: [PATCH 1722/1802] net: parse reject earlier

Prior to this change, all messages were ignored until a VERSION message was
received, as well as possibly incurring a ban score.

Since REJECT messages can be sent at any time (including as a response to a bad
VERSION message), make sure to always parse them.

Moving this parsing up keeps it from being caught in the
if (pfrom->nVersion == 0) check below.
---
 src/net_processing.cpp | 50 ++++++++++++++++++++----------------------
 1 file changed, 24 insertions(+), 26 deletions(-)

diff --git a/src/net_processing.cpp b/src/net_processing.cpp
index 587e857970c48..b304da76c254a 100644
--- a/src/net_processing.cpp
+++ b/src/net_processing.cpp
@@ -1190,8 +1190,31 @@ bool static ProcessMessage(CNode* pfrom, const std::string& strCommand, CDataStr
         }
     }
 
+    if (strCommand == NetMsgType::REJECT)
+    {
+        if (fDebug) {
+            try {
+                std::string strMsg; unsigned char ccode; std::string strReason;
+                vRecv >> LIMITED_STRING(strMsg, CMessageHeader::COMMAND_SIZE) >> ccode >> LIMITED_STRING(strReason, MAX_REJECT_MESSAGE_LENGTH);
+
+                std::ostringstream ss;
+                ss << strMsg << " code " << itostr(ccode) << ": " << strReason;
 
-    if (strCommand == NetMsgType::VERSION)
+                if (strMsg == NetMsgType::BLOCK || strMsg == NetMsgType::TX)
+                {
+                    uint256 hash;
+                    vRecv >> hash;
+                    ss << ": hash " << hash.ToString();
+                }
+                LogPrint("net", "Reject %s\n", SanitizeString(ss.str()));
+            } catch (const std::ios_base::failure&) {
+                // Avoid feedback loops by preventing reject messages from triggering a new reject message.
+                LogPrint("net", "Unparseable reject message received\n");
+            }
+        }
+    }
+
+    else if (strCommand == NetMsgType::VERSION)
     {
         // Each connection can only send one version message
         if (pfrom->nVersion != 0)
@@ -2544,31 +2567,6 @@ bool static ProcessMessage(CNode* pfrom, const std::string& strCommand, CDataStr
         pfrom->fRelayTxes = true;
     }
 
-
-    else if (strCommand == NetMsgType::REJECT)
-    {
-        if (fDebug) {
-            try {
-                std::string strMsg; unsigned char ccode; std::string strReason;
-                vRecv >> LIMITED_STRING(strMsg, CMessageHeader::COMMAND_SIZE) >> ccode >> LIMITED_STRING(strReason, MAX_REJECT_MESSAGE_LENGTH);
-
-                std::ostringstream ss;
-                ss << strMsg << " code " << itostr(ccode) << ": " << strReason;
-
-                if (strMsg == NetMsgType::BLOCK || strMsg == NetMsgType::TX)
-                {
-                    uint256 hash;
-                    vRecv >> hash;
-                    ss << ": hash " << hash.ToString();
-                }
-                LogPrint("net", "Reject %s\n", SanitizeString(ss.str()));
-            } catch (const std::ios_base::failure&) {
-                // Avoid feedback loops by preventing reject messages from triggering a new reject message.
-                LogPrint("net", "Unparseable reject message received\n");
-            }
-        }
-    }
-
     else if (strCommand == NetMsgType::FEEFILTER) {
         CAmount newFeeFilter = 0;
         vRecv >> newFeeFilter;

From cbfc5a6728d389fbb15e0555cdf50f1b04595106 Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Wed, 8 Feb 2017 01:04:53 -0500
Subject: [PATCH 1723/1802] net: require a verack before responding to anything
 else

7a8c251901 made this logic hard to follow. After that change, messages would
not be sent to a peer via SendMessages() before the handshake was complete, but
messages could still be sent as a response to an incoming message.

For example, if a peer had not yet sent a verack, we wouldn't notify it about
new blocks, but we would respond to a PING with a PONG.

This change makes the behavior straightforward: until we've received a verack,
never send any message other than version/verack/reject.

The behavior until a VERACK is received has always been undefined, this change
just tightens our policy.

This also makes testing much easier, because we can now connect but not send
version/verack, and anything sent to us is an error.
---
 src/net_processing.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/net_processing.cpp b/src/net_processing.cpp
index b304da76c254a..f458a352560cc 100644
--- a/src/net_processing.cpp
+++ b/src/net_processing.cpp
@@ -1420,6 +1420,13 @@ bool static ProcessMessage(CNode* pfrom, const std::string& strCommand, CDataStr
         pfrom->fSuccessfullyConnected = true;
     }
 
+    else if (!pfrom->fSuccessfullyConnected)
+    {
+        // Must have a verack message before anything else
+        LOCK(cs_main);
+        Misbehaving(pfrom->GetId(), 1);
+        return false;
+    }
 
     else if (strCommand == NetMsgType::ADDR)
     {

From 5b5e4f8330634dc33446854677badc52aef43b82 Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Tue, 7 Feb 2017 17:35:57 -0500
Subject: [PATCH 1724/1802] qa: mininode learns when a socket connects, not its
 first action

---
 qa/rpc-tests/test_framework/mininode.py | 36 ++++++++++++++++---------
 1 file changed, 24 insertions(+), 12 deletions(-)

diff --git a/qa/rpc-tests/test_framework/mininode.py b/qa/rpc-tests/test_framework/mininode.py
index 91daa4ab1f585..696a065282c62 100755
--- a/qa/rpc-tests/test_framework/mininode.py
+++ b/qa/rpc-tests/test_framework/mininode.py
@@ -1614,7 +1614,7 @@ class NodeConn(asyncore.dispatcher):
         "regtest": b"\xfa\xbf\xb5\xda",   # regtest
     }
 
-    def __init__(self, dstaddr, dstport, rpc, callback, net="regtest", services=NODE_NETWORK):
+    def __init__(self, dstaddr, dstport, rpc, callback, net="regtest", services=NODE_NETWORK, send_version=True):
         asyncore.dispatcher.__init__(self, map=mininode_socket_map)
         self.log = logging.getLogger("NodeConn(%s:%d)" % (dstaddr, dstport))
         self.dstaddr = dstaddr
@@ -1631,14 +1631,16 @@ def __init__(self, dstaddr, dstport, rpc, callback, net="regtest", services=NODE
         self.disconnect = False
         self.nServices = 0
 
-        # stuff version msg into sendbuf
-        vt = msg_version()
-        vt.nServices = services
-        vt.addrTo.ip = self.dstaddr
-        vt.addrTo.port = self.dstport
-        vt.addrFrom.ip = "0.0.0.0"
-        vt.addrFrom.port = 0
-        self.send_message(vt, True)
+        if send_version:
+            # stuff version msg into sendbuf
+            vt = msg_version()
+            vt.nServices = services
+            vt.addrTo.ip = self.dstaddr
+            vt.addrTo.port = self.dstport
+            vt.addrFrom.ip = "0.0.0.0"
+            vt.addrFrom.port = 0
+            self.send_message(vt, True)
+
         print('MiniNode: Connecting to Bitcoin Node IP # ' + dstaddr + ':' \
             + str(dstport))
 
@@ -1652,8 +1654,9 @@ def show_debug_msg(self, msg):
         self.log.debug(msg)
 
     def handle_connect(self):
-        self.show_debug_msg("MiniNode: Connected & Listening: \n")
-        self.state = "connected"
+        if self.state != "connected":
+            self.show_debug_msg("MiniNode: Connected & Listening: \n")
+            self.state = "connected"
 
     def handle_close(self):
         self.show_debug_msg("MiniNode: Closing Connection to %s:%d... "
@@ -1681,11 +1684,20 @@ def readable(self):
 
     def writable(self):
         with mininode_lock:
+            pre_connection = self.state == "connecting"
             length = len(self.sendbuf)
-        return (length > 0)
+        return (length > 0 or pre_connection)
 
     def handle_write(self):
         with mininode_lock:
+            # asyncore does not expose socket connection, only the first read/write
+            # event, thus we must check connection manually here to know when we
+            # actually connect
+            if self.state == "connecting":
+                self.handle_connect()
+            if not self.writable():
+                return
+
             try:
                 sent = self.send(self.sendbuf)
             except:

From 8650bbb660eaf8c81d714f1518ecc8c35ae17463 Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Tue, 7 Feb 2017 17:40:28 -0500
Subject: [PATCH 1725/1802] qa: Expose on-connection to mininode listeners

---
 qa/rpc-tests/test_framework/mininode.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/qa/rpc-tests/test_framework/mininode.py b/qa/rpc-tests/test_framework/mininode.py
index 696a065282c62..5b563c58ae1e1 100755
--- a/qa/rpc-tests/test_framework/mininode.py
+++ b/qa/rpc-tests/test_framework/mininode.py
@@ -1540,6 +1540,7 @@ def on_ping(self, conn, message):
         if conn.ver_send > BIP0031_VERSION:
             conn.send_message(msg_pong(message.nonce))
     def on_reject(self, conn, message): pass
+    def on_open(self, conn): pass
     def on_close(self, conn): pass
     def on_mempool(self, conn): pass
     def on_pong(self, conn, message): pass
@@ -1657,6 +1658,7 @@ def handle_connect(self):
         if self.state != "connected":
             self.show_debug_msg("MiniNode: Connected & Listening: \n")
             self.state = "connected"
+            self.cb.on_open(self)
 
     def handle_close(self):
         self.show_debug_msg("MiniNode: Closing Connection to %s:%d... "

From d9434918d277bba534933ebc8c63ba81e613f603 Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Wed, 8 Feb 2017 01:17:58 -0500
Subject: [PATCH 1726/1802] qa: add a test to detect leaky p2p messages

This is certainly not exhaustive, but it's better than nothing. Adds checks
for:

- Any message received before sending a version
- Any message received other than version/reject before sending a verack

It also tries to goad the remote into sending a pong, address, or block
announcement.
---
 qa/pull-tester/rpc-tests.py   |   1 +
 qa/rpc-tests/p2p-leaktests.py | 145 ++++++++++++++++++++++++++++++++++
 2 files changed, 146 insertions(+)
 create mode 100755 qa/rpc-tests/p2p-leaktests.py

diff --git a/qa/pull-tester/rpc-tests.py b/qa/pull-tester/rpc-tests.py
index 26bc6a73dfa28..31018125416a2 100755
--- a/qa/pull-tester/rpc-tests.py
+++ b/qa/pull-tester/rpc-tests.py
@@ -154,6 +154,7 @@
     'bumpfee.py',
     'rpcnamedargs.py',
     'listsinceblock.py',
+    'p2p-leaktests.py',
 ]
 if ENABLE_ZMQ:
     testScripts.append('zmq_test.py')
diff --git a/qa/rpc-tests/p2p-leaktests.py b/qa/rpc-tests/p2p-leaktests.py
new file mode 100755
index 0000000000000..41ca84d779890
--- /dev/null
+++ b/qa/rpc-tests/p2p-leaktests.py
@@ -0,0 +1,145 @@
+#!/usr/bin/env python3
+# Copyright (c) 2017 The Bitcoin Core developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+from test_framework.mininode import *
+from test_framework.test_framework import BitcoinTestFramework
+from test_framework.util import *
+
+'''
+Test for message sending before handshake completion
+
+A node should never send anything other than VERSION/VERACK/REJECT until it's
+received a VERACK.
+
+This test connects to a node and sends it a few messages, trying to intice it
+into sending us something it shouldn't.
+'''
+
+banscore = 10
+
+class CLazyNode(NodeConnCB):
+    def __init__(self):
+        self.connection = None
+        self.unexpected_msg = False
+        self.connected = False
+        super().__init__()
+
+    def add_connection(self, conn):
+        self.connection = conn
+
+    def send_message(self, message):
+        self.connection.send_message(message)
+
+    def bad_message(self, message):
+        self.unexpected_msg = True
+        print("should not have received message: %s" % message.command)
+
+    def on_open(self, conn):
+        self.connected = True
+
+    def on_version(self, conn, message): self.bad_message(message)
+    def on_verack(self, conn, message): self.bad_message(message)
+    def on_reject(self, conn, message): self.bad_message(message)
+    def on_inv(self, conn, message): self.bad_message(message)
+    def on_addr(self, conn, message): self.bad_message(message)
+    def on_alert(self, conn, message): self.bad_message(message)
+    def on_getdata(self, conn, message): self.bad_message(message)
+    def on_getblocks(self, conn, message): self.bad_message(message)
+    def on_tx(self, conn, message): self.bad_message(message)
+    def on_block(self, conn, message): self.bad_message(message)
+    def on_getaddr(self, conn, message): self.bad_message(message)
+    def on_headers(self, conn, message): self.bad_message(message)
+    def on_getheaders(self, conn, message): self.bad_message(message)
+    def on_ping(self, conn, message): self.bad_message(message)
+    def on_mempool(self, conn): self.bad_message(message)
+    def on_pong(self, conn, message): self.bad_message(message)
+    def on_feefilter(self, conn, message): self.bad_message(message)
+    def on_sendheaders(self, conn, message): self.bad_message(message)
+    def on_sendcmpct(self, conn, message): self.bad_message(message)
+    def on_cmpctblock(self, conn, message): self.bad_message(message)
+    def on_getblocktxn(self, conn, message): self.bad_message(message)
+    def on_blocktxn(self, conn, message): self.bad_message(message)
+
+# Node that never sends a version. We'll use this to send a bunch of messages
+# anyway, and eventually get disconnected.
+class CNodeNoVersionBan(CLazyNode):
+    def __init__(self):
+        super().__init__()
+
+    # send a bunch of veracks without sending a message. This should get us disconnected.
+    # NOTE: implementation-specific check here. Remove if bitcoind ban behavior changes
+    def on_open(self, conn):
+        super().on_open(conn)
+        for i in range(banscore):
+            self.send_message(msg_verack())
+
+    def on_reject(self, conn, message): pass
+
+# Node that never sends a version. This one just sits idle and hopes to receive
+# any message (it shouldn't!)
+class CNodeNoVersionIdle(CLazyNode):
+    def __init__(self):
+        super().__init__()
+
+# Node that sends a version but not a verack.
+class CNodeNoVerackIdle(CLazyNode):
+    def __init__(self):
+        self.version_received = False
+        super().__init__()
+
+    def on_reject(self, conn, message): pass
+    def on_verack(self, conn, message): pass
+    # When version is received, don't reply with a verack. Instead, see if the
+    # node will give us a message that it shouldn't. This is not an exhaustive
+    # list!
+    def on_version(self, conn, message):
+        self.version_received = True
+        conn.send_message(msg_ping())
+        conn.send_message(msg_getaddr())
+
+class P2PLeakTest(BitcoinTestFramework):
+    def __init__(self):
+        super().__init__()
+        self.num_nodes = 1
+    def setup_network(self):
+        extra_args = [['-debug', '-banscore='+str(banscore)]
+                      for i in range(self.num_nodes)]
+        self.nodes = start_nodes(self.num_nodes, self.options.tmpdir, extra_args)
+
+    def run_test(self):
+        no_version_bannode = CNodeNoVersionBan()
+        no_version_idlenode = CNodeNoVersionIdle()
+        no_verack_idlenode = CNodeNoVerackIdle()
+
+        connections = []
+        connections.append(NodeConn('127.0.0.1', p2p_port(0), self.nodes[0], no_version_bannode, send_version=False))
+        connections.append(NodeConn('127.0.0.1', p2p_port(0), self.nodes[0], no_version_idlenode, send_version=False))
+        connections.append(NodeConn('127.0.0.1', p2p_port(0), self.nodes[0], no_verack_idlenode))
+        no_version_bannode.add_connection(connections[0])
+        no_version_idlenode.add_connection(connections[1])
+        no_verack_idlenode.add_connection(connections[2])
+
+        NetworkThread().start()  # Start up network handling in another thread
+
+        assert(wait_until(lambda: no_version_bannode.connected and no_version_idlenode.connected and no_verack_idlenode.version_received, timeout=10))
+
+        # Mine a block and make sure that it's not sent to the connected nodes
+        self.nodes[0].generate(1)
+
+        #Give the node enough time to possibly leak out a message
+        time.sleep(5)
+
+        #This node should have been banned
+        assert(no_version_bannode.connection.state == "closed")
+
+        [conn.disconnect_node() for conn in connections]
+
+        # Make sure no unexpected messages came in
+        assert(no_version_bannode.unexpected_msg == False)
+        assert(no_version_idlenode.unexpected_msg == False)
+        assert(no_verack_idlenode.unexpected_msg == False)
+
+if __name__ == '__main__':
+    P2PLeakTest().main()

From 4b6ccccc16b615c01939678e589f8e09cfc15d70 Mon Sep 17 00:00:00 2001
From: Jonas Schnelli <dev@jonasschnelli.ch>
Date: Tue, 14 Feb 2017 11:05:50 +0100
Subject: [PATCH 1727/1802] Selectively suppress deprecation warnings

---
 src/qt/guiutil.cpp          | 3 +++
 src/qt/paymentrequestplus.h | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/src/qt/guiutil.cpp b/src/qt/guiutil.cpp
index 5d6c0e2e31f25..e0961fe7dd8d3 100644
--- a/src/qt/guiutil.cpp
+++ b/src/qt/guiutil.cpp
@@ -762,6 +762,8 @@ bool SetStartOnSystemStartup(bool fAutoStart)
 
 
 #elif defined(Q_OS_MAC)
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 // based on: https://github.com/Mozketo/LaunchAtLoginController/blob/master/LaunchAtLoginController.m
 
 #include <CoreFoundation/CoreFoundation.h>
@@ -824,6 +826,7 @@ bool SetStartOnSystemStartup(bool fAutoStart)
     }
     return true;
 }
+#pragma GCC diagnostic pop
 #else
 
 bool GetStartOnSystemStartup() { return false; }
diff --git a/src/qt/paymentrequestplus.h b/src/qt/paymentrequestplus.h
index ee1a37d83cdeb..a2fea3fdc64fb 100644
--- a/src/qt/paymentrequestplus.h
+++ b/src/qt/paymentrequestplus.h
@@ -5,7 +5,10 @@
 #ifndef BITCOIN_QT_PAYMENTREQUESTPLUS_H
 #define BITCOIN_QT_PAYMENTREQUESTPLUS_H
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 #include "paymentrequest.pb.h"
+#pragma GCC diagnostic pop
 
 #include "base58.h"
 

From 6c5427d24ca18ce01e46242876e24f68a9c72cc3 Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Wed, 15 Feb 2017 11:31:28 +0100
Subject: [PATCH 1728/1802] wallet: Prevent "overrides a member function but is
 not marked 'override'" warnings

Because it is used inconsistently at least version 5.4.0 of g++ to
complains about methods that don't use override. There is two ways to go
about this: remove override from the methods having it, or add it to the
methods missing it. I chose the second.
---
 src/wallet/wallet.h | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
index 990c3bdf4196a..a7b15a8441c84 100644
--- a/src/wallet/wallet.h
+++ b/src/wallet/wallet.h
@@ -737,7 +737,7 @@ class CWallet : public CCryptoKeyStore, public CValidationInterface
     CPubKey GenerateNewKey();
     void DeriveNewChildKey(CKeyMetadata& metadata, CKey& secret);
     //! Adds a key to the store, and saves it to disk.
-    bool AddKeyPubKey(const CKey& key, const CPubKey &pubkey);
+    bool AddKeyPubKey(const CKey& key, const CPubKey &pubkey) override;
     //! Adds a key to the store, without saving it to disk (used by LoadWallet)
     bool LoadKey(const CKey& key, const CPubKey &pubkey) { return CCryptoKeyStore::AddKeyPubKey(key, pubkey); }
     //! Load metadata (used by LoadWallet)
@@ -747,10 +747,10 @@ class CWallet : public CCryptoKeyStore, public CValidationInterface
     void UpdateTimeFirstKey(int64_t nCreateTime);
 
     //! Adds an encrypted key to the store, and saves it to disk.
-    bool AddCryptedKey(const CPubKey &vchPubKey, const std::vector<unsigned char> &vchCryptedSecret);
+    bool AddCryptedKey(const CPubKey &vchPubKey, const std::vector<unsigned char> &vchCryptedSecret) override;
     //! Adds an encrypted key to the store, without saving it to disk (used by LoadWallet)
     bool LoadCryptedKey(const CPubKey &vchPubKey, const std::vector<unsigned char> &vchCryptedSecret);
-    bool AddCScript(const CScript& redeemScript);
+    bool AddCScript(const CScript& redeemScript) override;
     bool LoadCScript(const CScript& redeemScript);
 
     //! Adds a destination data tuple to the store, and saves it to disk
@@ -764,7 +764,7 @@ class CWallet : public CCryptoKeyStore, public CValidationInterface
 
     //! Adds a watch-only address to the store, and saves it to disk.
     bool AddWatchOnly(const CScript& dest, int64_t nCreateTime);
-    bool RemoveWatchOnly(const CScript &dest);
+    bool RemoveWatchOnly(const CScript &dest) override;
     //! Adds a watch-only address to the store, without saving it to disk (used by LoadWallet)
     bool LoadWatchOnly(const CScript &dest);
 
@@ -786,11 +786,11 @@ class CWallet : public CCryptoKeyStore, public CValidationInterface
     void MarkDirty();
     bool AddToWallet(const CWalletTx& wtxIn, bool fFlushOnClose=true);
     bool LoadToWallet(const CWalletTx& wtxIn);
-    void SyncTransaction(const CTransaction& tx, const CBlockIndex *pindex, int posInBlock);
+    void SyncTransaction(const CTransaction& tx, const CBlockIndex *pindex, int posInBlock) override;
     bool AddToWalletIfInvolvingMe(const CTransaction& tx, const CBlockIndex* pIndex, int posInBlock, bool fUpdate);
     int ScanForWalletTransactions(CBlockIndex* pindexStart, bool fUpdate = false);
     void ReacceptWalletTransactions();
-    void ResendWalletTransactions(int64_t nBestBlockTime, CConnman* connman);
+    void ResendWalletTransactions(int64_t nBestBlockTime, CConnman* connman) override;
     std::vector<uint256> ResendWalletTransactionsBefore(int64_t nTime, CConnman* connman);
     CAmount GetBalance() const;
     CAmount GetUnconfirmedBalance() const;
@@ -872,7 +872,7 @@ class CWallet : public CCryptoKeyStore, public CValidationInterface
     bool IsAllFromMe(const CTransaction& tx, const isminefilter& filter) const;
     CAmount GetCredit(const CTransaction& tx, const isminefilter& filter) const;
     CAmount GetChange(const CTransaction& tx) const;
-    void SetBestChain(const CBlockLocator& loc);
+    void SetBestChain(const CBlockLocator& loc) override;
 
     DBErrors LoadWallet(bool& fFirstRunRet);
     DBErrors ZapWalletTx(std::vector<CWalletTx>& vWtx);
@@ -882,9 +882,9 @@ class CWallet : public CCryptoKeyStore, public CValidationInterface
 
     bool DelAddressBook(const CTxDestination& address);
 
-    void UpdatedTransaction(const uint256 &hashTx);
+    void UpdatedTransaction(const uint256 &hashTx) override;
 
-    void Inventory(const uint256 &hash)
+    void Inventory(const uint256 &hash) override
     {
         {
             LOCK(cs_wallet);
@@ -894,8 +894,8 @@ class CWallet : public CCryptoKeyStore, public CValidationInterface
         }
     }
 
-    void GetScriptForMining(boost::shared_ptr<CReserveScript> &script);
-    void ResetRequestCount(const uint256 &hash)
+    void GetScriptForMining(boost::shared_ptr<CReserveScript> &script) override;
+    void ResetRequestCount(const uint256 &hash) override
     {
         LOCK(cs_wallet);
         mapRequestCount[hash] = 0;

From ba803efb687c2cb408176c546a544a8466c652ea Mon Sep 17 00:00:00 2001
From: Suhas Daftuar <sdaftuar@gmail.com>
Date: Mon, 13 Feb 2017 17:28:39 -0500
Subject: [PATCH 1729/1802] Harden against mistakes handling invalid blocks

Fixes a bug in AcceptBlock() in invoking CheckBlock() with incorrect
arguments, and restores a call to CheckBlock() from ProcessNewBlock()
as belt-and-suspenders.

Updates the (overspecified) tests to match behavior.
---
 qa/rpc-tests/p2p-fullblocktest.py |  4 ++--
 src/validation.cpp                | 16 +++++++++++-----
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/qa/rpc-tests/p2p-fullblocktest.py b/qa/rpc-tests/p2p-fullblocktest.py
index e4b889d761bec..44e5f10322465 100755
--- a/qa/rpc-tests/p2p-fullblocktest.py
+++ b/qa/rpc-tests/p2p-fullblocktest.py
@@ -398,7 +398,7 @@ def update_block(block_number, new_transactions):
 
         # Extend the b26 chain to make sure bitcoind isn't accepting b26
         b27 = block(27, spend=out[7])
-        yield rejected(RejectResult(16, b'bad-prevblk'))
+        yield rejected(RejectResult(0, b'bad-prevblk'))
 
         # Now try a too-large-coinbase script
         tip(15)
@@ -410,7 +410,7 @@ def update_block(block_number, new_transactions):
 
         # Extend the b28 chain to make sure bitcoind isn't accepting b28
         b29 = block(29, spend=out[7])
-        yield rejected(RejectResult(16, b'bad-prevblk'))
+        yield rejected(RejectResult(0, b'bad-prevblk'))
 
         # b30 has a max-sized coinbase scriptSig.
         tip(23)
diff --git a/src/validation.cpp b/src/validation.cpp
index fe8f8365be098..4ce0723b21ccc 100644
--- a/src/validation.cpp
+++ b/src/validation.cpp
@@ -3187,7 +3187,7 @@ static bool AcceptBlock(const std::shared_ptr<const CBlock>& pblock, CValidation
     }
     if (fNewBlock) *fNewBlock = true;
 
-    if (!CheckBlock(block, state, chainparams.GetConsensus(), GetAdjustedTime()) ||
+    if (!CheckBlock(block, state, chainparams.GetConsensus()) ||
         !ContextualCheckBlock(block, state, chainparams.GetConsensus(), pindex->pprev)) {
         if (state.IsInvalid() && !state.CorruptionPossible()) {
             pindex->nStatus |= BLOCK_FAILED_VALID;
@@ -3229,13 +3229,19 @@ static bool AcceptBlock(const std::shared_ptr<const CBlock>& pblock, CValidation
 bool ProcessNewBlock(const CChainParams& chainparams, const std::shared_ptr<const CBlock> pblock, bool fForceProcessing, bool *fNewBlock)
 {
     {
-        LOCK(cs_main);
-
-        // Store to disk
         CBlockIndex *pindex = NULL;
         if (fNewBlock) *fNewBlock = false;
         CValidationState state;
-        bool ret = AcceptBlock(pblock, state, chainparams, &pindex, fForceProcessing, NULL, fNewBlock);
+        // Ensure that CheckBlock() passes before calling AcceptBlock, as
+        // belt-and-suspenders.
+        bool ret = CheckBlock(*pblock, state, chainparams.GetConsensus());
+
+        LOCK(cs_main);
+
+        if (ret) {
+            // Store to disk
+            ret = AcceptBlock(pblock, state, chainparams, &pindex, fForceProcessing, NULL, fNewBlock);
+        }
         CheckBlockIndex(chainparams.GetConsensus());
         if (!ret) {
             GetMainSignals().BlockChecked(*pblock, state);

From 07afcd6379bb46ace5856f6a47a9188cf9aed2ea Mon Sep 17 00:00:00 2001
From: Russell Yanofsky <russ@yanofsky.org>
Date: Wed, 15 Feb 2017 17:01:30 -0500
Subject: [PATCH 1730/1802] Add missing cs_wallet lock that triggers new lock
 held assertion

A new AssertLockHeld(cs_wallet) call was added in commit a58370e
"Dedup nTimeFirstKey update logic" (part of PR #9108).

The lock held assertion will fail when loading prexisting wallets files from
before the #9108 merge that have watch-only keys.
---
 src/wallet/walletdb.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/wallet/walletdb.cpp b/src/wallet/walletdb.cpp
index 106a59d562304..81fdde401ecb6 100644
--- a/src/wallet/walletdb.cpp
+++ b/src/wallet/walletdb.cpp
@@ -559,8 +559,8 @@ DBErrors CWalletDB::LoadWallet(CWallet* pwallet)
     bool fNoncriticalErrors = false;
     DBErrors result = DB_LOAD_OK;
 
+    LOCK(pwallet->cs_wallet);
     try {
-        LOCK(pwallet->cs_wallet);
         int nMinVersion = 0;
         if (Read((string)"minversion", nMinVersion))
         {

From 00e623d0b8cd1c261a2671aa8ab221a0474bc7c8 Mon Sep 17 00:00:00 2001
From: CryptAxe <cryptaxe@gmail.com>
Date: Tue, 14 Feb 2017 23:00:04 -0800
Subject: [PATCH 1731/1802] [Trivial] Update comments referencing main.cpp

---
 CONTRIBUTING.md        | 4 ++--
 src/test/DoS_tests.cpp | 2 +-
 src/txmempool.cpp      | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 47648cde22e40..b932b2dd853ff 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -38,7 +38,7 @@ fixes or code moves with actual code changes.
 Commit messages should be verbose by default consisting of a short subject line
 (50 chars max), a blank line and detailed explanatory text as separate
 paragraph(s); unless the title alone is self-explanatory (like "Corrected typo
-in main.cpp") then a single title line is sufficient. Commit messages should be
+in init.cpp") then a single title line is sufficient. Commit messages should be
 helpful to people reading your code in the future, so explain the reasoning for
 your decisions. Further explanation [here](http://chris.beams.io/posts/git-commit/).
 
@@ -79,7 +79,7 @@ Examples:
     Consensus: Add new opcode for BIP-XXXX OP_CHECKAWESOMESIG
     Net: Automatically create hidden service, listen on Tor
     Qt: Add feed bump button
-    Trivial: Fix typo in main.cpp
+    Trivial: Fix typo in init.cpp
 
 If a pull request is specifically not to be considered for merging (yet) please
 prefix the title with [WIP] or use [Tasks Lists](https://help.github.com/articles/basic-writing-and-formatting-syntax/#task-lists)
diff --git a/src/test/DoS_tests.cpp b/src/test/DoS_tests.cpp
index a8f09ba6aef7a..c62e6ae838a94 100644
--- a/src/test/DoS_tests.cpp
+++ b/src/test/DoS_tests.cpp
@@ -23,7 +23,7 @@
 #include <boost/foreach.hpp>
 #include <boost/test/unit_test.hpp>
 
-// Tests this internal-to-main.cpp method:
+// Tests these internal-to-net_processing.cpp methods:
 extern bool AddOrphanTx(const CTransactionRef& tx, NodeId peer);
 extern void EraseOrphansFor(NodeId peer);
 extern unsigned int LimitOrphanTxSize(unsigned int nMaxOrphans);
diff --git a/src/txmempool.cpp b/src/txmempool.cpp
index 236527a2ba87d..5842dd88d838c 100644
--- a/src/txmempool.cpp
+++ b/src/txmempool.cpp
@@ -395,7 +395,7 @@ bool CTxMemPool::addUnchecked(const uint256& hash, const CTxMemPoolEntry &entry,
 {
     NotifyEntryAdded(entry.GetSharedTx());
     // Add to memory pool without checking anything.
-    // Used by main.cpp AcceptToMemoryPool(), which DOES do
+    // Used by AcceptToMemoryPool(), which DOES do
     // all the appropriate checks.
     LOCK(cs);
     indexed_transaction_set::iterator newit = mapTx.insert(entry).first;

From 8be0866883ff4efec9182194e900a05742e1b322 Mon Sep 17 00:00:00 2001
From: Russell Yanofsky <russ@yanofsky.org>
Date: Tue, 14 Feb 2017 15:00:34 -0500
Subject: [PATCH 1732/1802] [qa] Simplify import-rescan.py

Get rid of partial functions so the test can be more easily extended to add
more variants of imports with options that affect rescanning (e.g. different
key timestamps).

Also change the second half of the test to send /to/ the imported addresses,
instead of /from/ the imported addresses. The goal of this part of the test was
to confirm that the wallet would pick up new transactions after an import
regardless of whether or not a rescan happened during the import. But because
the wallet can only do this reliably for incoming transactions and not outgoing
transactions (which require the wallet to look up transaction inputs) the test
previously was less meaningful than it should have been.
---
 qa/rpc-tests/import-rescan.py | 224 +++++++++++++++++-----------------
 1 file changed, 112 insertions(+), 112 deletions(-)

diff --git a/qa/rpc-tests/import-rescan.py b/qa/rpc-tests/import-rescan.py
index 8f60e63e2e50d..7734ad5e47e85 100755
--- a/qa/rpc-tests/import-rescan.py
+++ b/qa/rpc-tests/import-rescan.py
@@ -2,6 +2,22 @@
 # Copyright (c) 2014-2016 The Bitcoin Core developers
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
+"""Test rescan behavior of importaddress, importpubkey, importprivkey, and
+importmulti RPCs with different types of keys and rescan options.
+
+Test uses three connected nodes.
+
+In the first part of the test, node 0 creates an address for each type of
+import RPC call and sends BTC to it. Then nodes 1 and 2 import the addresses,
+and the test makes listtransactions and getbalance calls to confirm that the
+importing node either did or did not execute rescans picking up the send
+transactions.
+
+In the second part of the test, node 0 sends more BTC to each address, and the
+test makes more listtransactions and getbalance calls to confirm that the
+importing nodes pick up the new transactions regardless of whether rescans
+happened previously.
+"""
 
 from test_framework.test_framework import BitcoinTestFramework
 from test_framework.util import (start_nodes, connect_nodes, sync_blocks, assert_equal)
@@ -10,53 +26,72 @@
 import collections
 import enum
 import itertools
-import functools
 
 Call = enum.Enum("Call", "single multi")
 Data = enum.Enum("Data", "address pub priv")
-ImportNode = collections.namedtuple("ImportNode", "rescan")
-
-
-def call_import_rpc(call, data, address, scriptPubKey, pubkey, key, label, node, rescan):
-    """Helper that calls a wallet import RPC on a bitcoin node."""
-    watchonly = data != Data.priv
-    if call == Call.single:
-        if data == Data.address:
-            response = node.importaddress(address, label, rescan)
-        elif data == Data.pub:
-            response = node.importpubkey(pubkey, label, rescan)
-        elif data == Data.priv:
-            response = node.importprivkey(key, label, rescan)
-        assert_equal(response, None)
-    elif call == Call.multi:
-        response = node.importmulti([{
-            "scriptPubKey": {
-                "address": address
-            },
-            "timestamp": "now",
-            "pubkeys": [pubkey] if data == Data.pub else [],
-            "keys": [key] if data == Data.priv else [],
-            "label": label,
-            "watchonly": watchonly
-        }], {"rescan": rescan})
-        assert_equal(response, [{"success": True}])
-    return watchonly
-
-
-# List of RPCs that import a wallet key or address in various ways.
-IMPORT_RPCS = [functools.partial(call_import_rpc, call, data) for call, data in itertools.product(Call, Data)]
-
-# List of bitcoind nodes that will import keys.
-IMPORT_NODES = [
-    ImportNode(rescan=True),
-    ImportNode(rescan=False),
-]
+Rescan = enum.Enum("Rescan", "no yes")
+
+
+class Variant(collections.namedtuple("Variant", "call data rescan")):
+    """Helper for importing one key and verifying scanned transactions."""
+
+    def do_import(self):
+        """Call one key import RPC."""
+
+        if self.call == Call.single:
+            if self.data == Data.address:
+                response = self.node.importaddress(self.address["address"], self.label, self.rescan == Rescan.yes)
+            elif self.data == Data.pub:
+                response = self.node.importpubkey(self.address["pubkey"], self.label, self.rescan == Rescan.yes)
+            elif self.data == Data.priv:
+                response = self.node.importprivkey(self.key, self.label, self.rescan == Rescan.yes)
+            assert_equal(response, None)
+        elif self.call == Call.multi:
+            response = self.node.importmulti([{
+                "scriptPubKey": {
+                    "address": self.address["address"]
+                },
+                "timestamp": "now",
+                "pubkeys": [self.address["pubkey"]] if self.data == Data.pub else [],
+                "keys": [self.key] if self.data == Data.priv else [],
+                "label": self.label,
+                "watchonly": self.data != Data.priv
+            }], {"rescan": self.rescan == Rescan.yes})
+            assert_equal(response, [{"success": True}])
+
+    def check(self, txid=None, amount=None):
+        """Verify that getbalance/listtransactions return expected values."""
+
+        balance = self.node.getbalance(self.label, 0, True)
+        assert_equal(balance, self.expected_balance)
+
+        txs = self.node.listtransactions(self.label, 10000, 0, True)
+        assert_equal(len(txs), self.expected_txs)
+
+        if txid is not None:
+            tx, = [tx for tx in txs if tx["txid"] == txid]
+            assert_equal(tx["account"], self.label)
+            assert_equal(tx["address"], self.address["address"])
+            assert_equal(tx["amount"], amount)
+            assert_equal(tx["category"], "receive")
+            assert_equal(tx["label"], self.label)
+            assert_equal(tx["txid"], txid)
+            assert_equal(tx["confirmations"], 1)
+            assert_equal("trusted" not in tx, True)
+            if self.data != Data.priv:
+                assert_equal(tx["involvesWatchonly"], True)
+            else:
+                assert_equal("involvesWatchonly" not in tx, True)
+
+
+# List of Variants for each way a key or address could be imported.
+IMPORT_VARIANTS = [Variant(*variants) for variants in itertools.product(Call, Data, Rescan)]
 
 
 class ImportRescanTest(BitcoinTestFramework):
     def __init__(self):
         super().__init__()
-        self.num_nodes = 1 + len(IMPORT_NODES)
+        self.num_nodes = 3
 
     def setup_network(self):
         extra_args = [["-debug=1"] for _ in range(self.num_nodes)]
@@ -67,89 +102,54 @@ def setup_network(self):
     def run_test(self):
         # Create one transaction on node 0 with a unique amount and label for
         # each possible type of wallet import RPC.
-        import_rpc_variants = []
-        for i, import_rpc in enumerate(IMPORT_RPCS):
-            label = "label{}".format(i)
-            addr = self.nodes[0].validateaddress(self.nodes[0].getnewaddress(label))
-            key = self.nodes[0].dumpprivkey(addr["address"])
-            amount = 24.9375 - i * .0625
-            txid = self.nodes[0].sendtoaddress(addr["address"], amount)
-            import_rpc = functools.partial(import_rpc, addr["address"], addr["scriptPubKey"], addr["pubkey"], key,
-                                           label)
-            import_rpc_variants.append((import_rpc, label, amount, txid, addr))
-
+        for i, variant in enumerate(IMPORT_VARIANTS):
+            variant.label = "label {} {}".format(i, variant)
+            variant.address = self.nodes[0].validateaddress(self.nodes[0].getnewaddress(variant.label))
+            variant.key = self.nodes[0].dumpprivkey(variant.address["address"])
+            variant.initial_amount = 25 - (i + 1) / 4.0
+            variant.initial_txid = self.nodes[0].sendtoaddress(variant.address["address"], variant.initial_amount)
+
+        # Generate a block containing the initial transactions.
         self.nodes[0].generate(1)
         assert_equal(self.nodes[0].getrawmempool(), [])
         sync_blocks(self.nodes)
 
-        # For each importing node and variation of wallet import RPC, invoke
-        # the RPC and check the results from getbalance and listtransactions.
-        for node, import_node in zip(self.nodes[1:], IMPORT_NODES):
-            for import_rpc, label, amount, txid, addr in import_rpc_variants:
-                watchonly = import_rpc(node, import_node.rescan)
-
-                balance = node.getbalance(label, 0, True)
-                if import_node.rescan:
-                    assert_equal(balance, amount)
-                else:
-                    assert_equal(balance, 0)
-
-                txs = node.listtransactions(label, 10000, 0, True)
-                if import_node.rescan:
-                    assert_equal(len(txs), 1)
-                    assert_equal(txs[0]["account"], label)
-                    assert_equal(txs[0]["address"], addr["address"])
-                    assert_equal(txs[0]["amount"], amount)
-                    assert_equal(txs[0]["category"], "receive")
-                    assert_equal(txs[0]["label"], label)
-                    assert_equal(txs[0]["txid"], txid)
-                    assert_equal(txs[0]["confirmations"], 1)
-                    assert_equal("trusted" not in txs[0], True)
-                    if watchonly:
-                        assert_equal(txs[0]["involvesWatchonly"], True)
-                    else:
-                        assert_equal("involvesWatchonly" not in txs[0], True)
-                else:
-                    assert_equal(len(txs), 0)
-
-        # Create spends for all the imported addresses.
-        spend_txids = []
+        # For each variation of wallet key import, invoke the import RPC and
+        # check the results from getbalance and listtransactions. Import to
+        # node 1 if rescanning is expected, and to node 2 if rescanning is not
+        # expected. Node 2 is reserved for imports that do not cause rescans,
+        # so later import calls don't inadvertently cause the wallet to pick up
+        # transactions from earlier import calls where a rescan was not
+        # expected (this would make it complicated to figure out expected
+        # balances in the second part of the test.)
+        for variant in IMPORT_VARIANTS:
+            variant.node = self.nodes[1 if variant.rescan == Rescan.yes else 2]
+            variant.do_import()
+            if variant.rescan == Rescan.yes:
+                variant.expected_balance = variant.initial_amount
+                variant.expected_txs = 1
+                variant.check(variant.initial_txid, variant.initial_amount)
+            else:
+                variant.expected_balance = 0
+                variant.expected_txs = 0
+                variant.check()
+
+        # Create new transactions sending to each address.
         fee = self.nodes[0].getnetworkinfo()["relayfee"]
-        for import_rpc, label, amount, txid, addr in import_rpc_variants:
-            raw_tx = self.nodes[0].getrawtransaction(txid)
-            decoded_tx = self.nodes[0].decoderawtransaction(raw_tx)
-            input_vout = next(out["n"] for out in decoded_tx["vout"]
-                              if out["scriptPubKey"]["addresses"] == [addr["address"]])
-            inputs = [{"txid": txid, "vout": input_vout}]
-            outputs = {self.nodes[0].getnewaddress(): Decimal(amount) - fee}
-            raw_spend_tx = self.nodes[0].createrawtransaction(inputs, outputs)
-            signed_spend_tx = self.nodes[0].signrawtransaction(raw_spend_tx)
-            spend_txid = self.nodes[0].sendrawtransaction(signed_spend_tx["hex"])
-            spend_txids.append(spend_txid)
+        for i, variant in enumerate(IMPORT_VARIANTS):
+            variant.sent_amount = 25 - (2 * i + 1) / 8.0
+            variant.sent_txid = self.nodes[0].sendtoaddress(variant.address["address"], variant.sent_amount)
 
+        # Generate a block containing the new transactions.
         self.nodes[0].generate(1)
         assert_equal(self.nodes[0].getrawmempool(), [])
         sync_blocks(self.nodes)
 
-        # Check the results from getbalance and listtransactions after the spends.
-        for node, import_node in zip(self.nodes[1:], IMPORT_NODES):
-            txs = node.listtransactions("*", 10000, 0, True)
-            for (import_rpc, label, amount, txid, addr), spend_txid in zip(import_rpc_variants, spend_txids):
-                balance = node.getbalance(label, 0, True)
-                spend_tx = [tx for tx in txs if tx["txid"] == spend_txid]
-                if import_node.rescan:
-                    assert_equal(balance, amount)
-                    assert_equal(len(spend_tx), 1)
-                    assert_equal(spend_tx[0]["account"], "")
-                    assert_equal(spend_tx[0]["amount"] + spend_tx[0]["fee"], -amount)
-                    assert_equal(spend_tx[0]["category"], "send")
-                    assert_equal("label" not in spend_tx[0], True)
-                    assert_equal(spend_tx[0]["confirmations"], 1)
-                    assert_equal("trusted" not in spend_tx[0], True)
-                    assert_equal("involvesWatchonly" not in txs[0], True)
-                else:
-                    assert_equal(balance, 0)
-                    assert_equal(spend_tx, [])
+        # Check the latest results from getbalance and listtransactions.
+        for variant in IMPORT_VARIANTS:
+            variant.expected_balance += variant.sent_amount
+            variant.expected_txs += 1
+            variant.check(variant.sent_txid, variant.sent_amount)
 
 
 if __name__ == "__main__":

From c28583d0629bc6e12ea5d8c660c9b3586be5ad71 Mon Sep 17 00:00:00 2001
From: Russell Yanofsky <russ@yanofsky.org>
Date: Tue, 14 Feb 2017 17:39:26 -0500
Subject: [PATCH 1733/1802] [qa] Extend import-rescan.py to test specific key
 timestamps

---
 qa/rpc-tests/import-rescan.py | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/qa/rpc-tests/import-rescan.py b/qa/rpc-tests/import-rescan.py
index 7734ad5e47e85..7ca606828f3f5 100755
--- a/qa/rpc-tests/import-rescan.py
+++ b/qa/rpc-tests/import-rescan.py
@@ -20,7 +20,7 @@
 """
 
 from test_framework.test_framework import BitcoinTestFramework
-from test_framework.util import (start_nodes, connect_nodes, sync_blocks, assert_equal)
+from test_framework.util import (start_nodes, connect_nodes, sync_blocks, assert_equal, set_node_times)
 from decimal import Decimal
 
 import collections
@@ -29,13 +29,13 @@
 
 Call = enum.Enum("Call", "single multi")
 Data = enum.Enum("Data", "address pub priv")
-Rescan = enum.Enum("Rescan", "no yes")
+Rescan = enum.Enum("Rescan", "no yes late_timestamp")
 
 
 class Variant(collections.namedtuple("Variant", "call data rescan")):
     """Helper for importing one key and verifying scanned transactions."""
 
-    def do_import(self):
+    def do_import(self, timestamp):
         """Call one key import RPC."""
 
         if self.call == Call.single:
@@ -51,15 +51,15 @@ def do_import(self):
                 "scriptPubKey": {
                     "address": self.address["address"]
                 },
-                "timestamp": "now",
+                "timestamp": timestamp + (1 if self.rescan == Rescan.late_timestamp else 0),
                 "pubkeys": [self.address["pubkey"]] if self.data == Data.pub else [],
                 "keys": [self.key] if self.data == Data.priv else [],
                 "label": self.label,
                 "watchonly": self.data != Data.priv
-            }], {"rescan": self.rescan == Rescan.yes})
+            }], {"rescan": self.rescan in (Rescan.yes, Rescan.late_timestamp)})
             assert_equal(response, [{"success": True}])
 
-    def check(self, txid=None, amount=None):
+    def check(self, txid=None, amount=None, confirmations=None):
         """Verify that getbalance/listtransactions return expected values."""
 
         balance = self.node.getbalance(self.label, 0, True)
@@ -76,7 +76,7 @@ def check(self, txid=None, amount=None):
             assert_equal(tx["category"], "receive")
             assert_equal(tx["label"], self.label)
             assert_equal(tx["txid"], txid)
-            assert_equal(tx["confirmations"], 1)
+            assert_equal(tx["confirmations"], confirmations)
             assert_equal("trusted" not in tx, True)
             if self.data != Data.priv:
                 assert_equal(tx["involvesWatchonly"], True)
@@ -109,9 +109,13 @@ def run_test(self):
             variant.initial_amount = 25 - (i + 1) / 4.0
             variant.initial_txid = self.nodes[0].sendtoaddress(variant.address["address"], variant.initial_amount)
 
-        # Generate a block containing the initial transactions.
+        # Generate a block containing the initial transactions, then another
+        # block further in the future (past the rescan window).
         self.nodes[0].generate(1)
         assert_equal(self.nodes[0].getrawmempool(), [])
+        timestamp = self.nodes[0].getblockheader(self.nodes[0].getbestblockhash())["time"]
+        set_node_times(self.nodes, timestamp + 1)
+        self.nodes[0].generate(1)
         sync_blocks(self.nodes)
 
         # For each variation of wallet key import, invoke the import RPC and
@@ -124,11 +128,11 @@ def run_test(self):
         # balances in the second part of the test.)
         for variant in IMPORT_VARIANTS:
             variant.node = self.nodes[1 if variant.rescan == Rescan.yes else 2]
-            variant.do_import()
+            variant.do_import(timestamp)
             if variant.rescan == Rescan.yes:
                 variant.expected_balance = variant.initial_amount
                 variant.expected_txs = 1
-                variant.check(variant.initial_txid, variant.initial_amount)
+                variant.check(variant.initial_txid, variant.initial_amount, 2)
             else:
                 variant.expected_balance = 0
                 variant.expected_txs = 0
@@ -149,7 +153,7 @@ def run_test(self):
         for variant in IMPORT_VARIANTS:
             variant.expected_balance += variant.sent_amount
             variant.expected_txs += 1
-            variant.check(variant.sent_txid, variant.sent_amount)
+            variant.check(variant.sent_txid, variant.sent_amount, 1)
 
 
 if __name__ == "__main__":

From 38d3e9ee5900dffb02207211ad5da8f0751e4605 Mon Sep 17 00:00:00 2001
From: Russell Yanofsky <russ@yanofsky.org>
Date: Wed, 15 Feb 2017 11:28:50 -0500
Subject: [PATCH 1734/1802] [qa] Extend import-rescan.py to test imports on
 pruned nodes.

---
 qa/rpc-tests/import-rescan.py | 64 +++++++++++++++++++++++------------
 1 file changed, 43 insertions(+), 21 deletions(-)

diff --git a/qa/rpc-tests/import-rescan.py b/qa/rpc-tests/import-rescan.py
index 7ca606828f3f5..bd03491f11b16 100755
--- a/qa/rpc-tests/import-rescan.py
+++ b/qa/rpc-tests/import-rescan.py
@@ -5,10 +5,8 @@
 """Test rescan behavior of importaddress, importpubkey, importprivkey, and
 importmulti RPCs with different types of keys and rescan options.
 
-Test uses three connected nodes.
-
 In the first part of the test, node 0 creates an address for each type of
-import RPC call and sends BTC to it. Then nodes 1 and 2 import the addresses,
+import RPC call and sends BTC to it. Then other nodes import the addresses,
 and the test makes listtransactions and getbalance calls to confirm that the
 importing node either did or did not execute rescans picking up the send
 transactions.
@@ -19,6 +17,7 @@
 happened previously.
 """
 
+from test_framework.authproxy import JSONRPCException
 from test_framework.test_framework import BitcoinTestFramework
 from test_framework.util import (start_nodes, connect_nodes, sync_blocks, assert_equal, set_node_times)
 from decimal import Decimal
@@ -32,7 +31,7 @@
 Rescan = enum.Enum("Rescan", "no yes late_timestamp")
 
 
-class Variant(collections.namedtuple("Variant", "call data rescan")):
+class Variant(collections.namedtuple("Variant", "call data rescan prune")):
     """Helper for importing one key and verifying scanned transactions."""
 
     def do_import(self, timestamp):
@@ -40,12 +39,16 @@ def do_import(self, timestamp):
 
         if self.call == Call.single:
             if self.data == Data.address:
-                response = self.node.importaddress(self.address["address"], self.label, self.rescan == Rescan.yes)
+                response, error = try_rpc(self.node.importaddress, self.address["address"], self.label,
+                                          self.rescan == Rescan.yes)
             elif self.data == Data.pub:
-                response = self.node.importpubkey(self.address["pubkey"], self.label, self.rescan == Rescan.yes)
+                response, error = try_rpc(self.node.importpubkey, self.address["pubkey"], self.label,
+                                          self.rescan == Rescan.yes)
             elif self.data == Data.priv:
-                response = self.node.importprivkey(self.key, self.label, self.rescan == Rescan.yes)
+                response, error = try_rpc(self.node.importprivkey, self.key, self.label, self.rescan == Rescan.yes)
             assert_equal(response, None)
+            assert_equal(error, {'message': 'Rescan is disabled in pruned mode',
+                                 'code': -4} if self.expect_disabled else None)
         elif self.call == Call.multi:
             response = self.node.importmulti([{
                 "scriptPubKey": {
@@ -85,16 +88,29 @@ def check(self, txid=None, amount=None, confirmations=None):
 
 
 # List of Variants for each way a key or address could be imported.
-IMPORT_VARIANTS = [Variant(*variants) for variants in itertools.product(Call, Data, Rescan)]
+IMPORT_VARIANTS = [Variant(*variants) for variants in itertools.product(Call, Data, Rescan, (False, True))]
+
+# List of nodes to import keys to. Half the nodes will have pruning disabled,
+# half will have it enabled. Different nodes will be used for imports that are
+# expected to cause rescans, and imports that are not expected to cause
+# rescans, in order to prevent rescans during later imports picking up
+# transactions associated with earlier imports. This makes it easier to keep
+# track of expected balances and transactions.
+ImportNode = collections.namedtuple("ImportNode", "prune rescan")
+IMPORT_NODES = [ImportNode(*fields) for fields in itertools.product((False, True), repeat=2)]
 
 
 class ImportRescanTest(BitcoinTestFramework):
     def __init__(self):
         super().__init__()
-        self.num_nodes = 3
+        self.num_nodes = 1 + len(IMPORT_NODES)
 
     def setup_network(self):
         extra_args = [["-debug=1"] for _ in range(self.num_nodes)]
+        for i, import_node in enumerate(IMPORT_NODES, 1):
+            if import_node.prune:
+                extra_args[i] += ["-prune=1"]
+
         self.nodes = start_nodes(self.num_nodes, self.options.tmpdir, extra_args)
         for i in range(1, self.num_nodes):
             connect_nodes(self.nodes[i], 0)
@@ -119,17 +135,13 @@ def run_test(self):
         sync_blocks(self.nodes)
 
         # For each variation of wallet key import, invoke the import RPC and
-        # check the results from getbalance and listtransactions. Import to
-        # node 1 if rescanning is expected, and to node 2 if rescanning is not
-        # expected. Node 2 is reserved for imports that do not cause rescans,
-        # so later import calls don't inadvertently cause the wallet to pick up
-        # transactions from earlier import calls where a rescan was not
-        # expected (this would make it complicated to figure out expected
-        # balances in the second part of the test.)
+        # check the results from getbalance and listtransactions.
         for variant in IMPORT_VARIANTS:
-            variant.node = self.nodes[1 if variant.rescan == Rescan.yes else 2]
+            variant.expect_disabled = variant.rescan == Rescan.yes and variant.prune and variant.call == Call.single
+            expect_rescan = variant.rescan == Rescan.yes and not variant.expect_disabled
+            variant.node = self.nodes[1 + IMPORT_NODES.index(ImportNode(variant.prune, expect_rescan))]
             variant.do_import(timestamp)
-            if variant.rescan == Rescan.yes:
+            if expect_rescan:
                 variant.expected_balance = variant.initial_amount
                 variant.expected_txs = 1
                 variant.check(variant.initial_txid, variant.initial_amount, 2)
@@ -151,9 +163,19 @@ def run_test(self):
 
         # Check the latest results from getbalance and listtransactions.
         for variant in IMPORT_VARIANTS:
-            variant.expected_balance += variant.sent_amount
-            variant.expected_txs += 1
-            variant.check(variant.sent_txid, variant.sent_amount, 1)
+            if not variant.expect_disabled:
+                variant.expected_balance += variant.sent_amount
+                variant.expected_txs += 1
+                variant.check(variant.sent_txid, variant.sent_amount, 1)
+            else:
+                variant.check()
+
+
+def try_rpc(func, *args, **kwargs):
+    try:
+        return func(*args, **kwargs), None
+    except JSONRPCException as e:
+        return None, e.error
 
 
 if __name__ == "__main__":

From e662af358305b9fa4da772ec37c8356a9fc92ab6 Mon Sep 17 00:00:00 2001
From: Russell Yanofsky <russ@yanofsky.org>
Date: Tue, 14 Feb 2017 17:39:26 -0500
Subject: [PATCH 1735/1802] Use 2 hour grace period for key timestamps in
 importmulti rescans

Gregory Maxwell <greg@xiph.org> pointed out the lack of grace period in
https://github.com/bitcoin/bitcoin/pull/9490#issue-199407998.

The importwallet RPC which uses key timestamps in a similar way already has a 2
hour grace period.
---
 qa/rpc-tests/import-rescan.py | 7 +++++--
 src/wallet/rpcdump.cpp        | 5 +++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/qa/rpc-tests/import-rescan.py b/qa/rpc-tests/import-rescan.py
index bd03491f11b16..54cc6d2642adf 100755
--- a/qa/rpc-tests/import-rescan.py
+++ b/qa/rpc-tests/import-rescan.py
@@ -54,7 +54,7 @@ def do_import(self, timestamp):
                 "scriptPubKey": {
                     "address": self.address["address"]
                 },
-                "timestamp": timestamp + (1 if self.rescan == Rescan.late_timestamp else 0),
+                "timestamp": timestamp + RESCAN_WINDOW + (1 if self.rescan == Rescan.late_timestamp else 0),
                 "pubkeys": [self.address["pubkey"]] if self.data == Data.pub else [],
                 "keys": [self.key] if self.data == Data.priv else [],
                 "label": self.label,
@@ -99,6 +99,9 @@ def check(self, txid=None, amount=None, confirmations=None):
 ImportNode = collections.namedtuple("ImportNode", "prune rescan")
 IMPORT_NODES = [ImportNode(*fields) for fields in itertools.product((False, True), repeat=2)]
 
+# Rescans start at the earliest block up to 2 hours before the key timestamp.
+RESCAN_WINDOW = 2 * 60 * 60
+
 
 class ImportRescanTest(BitcoinTestFramework):
     def __init__(self):
@@ -130,7 +133,7 @@ def run_test(self):
         self.nodes[0].generate(1)
         assert_equal(self.nodes[0].getrawmempool(), [])
         timestamp = self.nodes[0].getblockheader(self.nodes[0].getbestblockhash())["time"]
-        set_node_times(self.nodes, timestamp + 1)
+        set_node_times(self.nodes, timestamp + RESCAN_WINDOW + 1)
         self.nodes[0].generate(1)
         sync_blocks(self.nodes)
 
diff --git a/src/wallet/rpcdump.cpp b/src/wallet/rpcdump.cpp
index 908655d4118d3..30f2414675a38 100644
--- a/src/wallet/rpcdump.cpp
+++ b/src/wallet/rpcdump.cpp
@@ -988,7 +988,8 @@ UniValue importmulti(const JSONRPCRequest& mainRequest)
             "                                                              or the string \"now\" to substitute the current synced blockchain time. The timestamp of the oldest\n"
             "                                                              key will determine how far back blockchain rescans need to begin for missing wallet transactions.\n"
             "                                                              \"now\" can be specified to bypass scanning, for keys which are known to never have been used, and\n"
-            "                                                              0 can be specified to scan the entire blockchain.\n"
+            "                                                              0 can be specified to scan the entire blockchain. Blocks up to 2 hours before the earliest key\n"
+            "                                                              creation time of all keys being imported by the importmulti call will be scanned.\n"
             "      \"redeemscript\": \"<script>\"                            , (string, optional) Allowed only if the scriptPubKey is a P2SH address or a P2SH scriptPubKey\n"
             "      \"pubkeys\": [\"<pubKey>\", ... ]                         , (array, optional) Array of strings giving pubkeys that must occur in the output or redeemscript\n"
             "      \"keys\": [\"<key>\", ... ]                               , (array, optional) Array of strings giving private keys whose corresponding public keys must occur in the output or redeemscript\n"
@@ -1072,7 +1073,7 @@ UniValue importmulti(const JSONRPCRequest& mainRequest)
     }
 
     if (fRescan && fRunScan && requests.size() && nLowestTimestamp <= chainActive.Tip()->GetBlockTimeMax()) {
-        CBlockIndex* pindex = nLowestTimestamp > minimumTimestamp ? chainActive.FindEarliestAtLeast(nLowestTimestamp) : chainActive.Genesis();
+        CBlockIndex* pindex = nLowestTimestamp > minimumTimestamp ? chainActive.FindEarliestAtLeast(std::max<int64_t>(nLowestTimestamp - 7200, 0)) : chainActive.Genesis();
 
         if (pindex) {
             pwalletMain->ScanForWalletTransactions(pindex, true);

From 3f78e460ba980d38149ee50ff5dfd75741aad9f2 Mon Sep 17 00:00:00 2001
From: Gregory Maxwell <greg@xiph.org>
Date: Thu, 16 Feb 2017 19:31:03 +0000
Subject: [PATCH 1736/1802] Update nMinimumChainWork and defaultAssumeValid.

---
 src/chainparams.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/chainparams.cpp b/src/chainparams.cpp
index 6c6f677df79cf..383d9849af975 100644
--- a/src/chainparams.cpp
+++ b/src/chainparams.cpp
@@ -97,10 +97,10 @@ class CMainParams : public CChainParams {
         consensus.vDeployments[Consensus::DEPLOYMENT_SEGWIT].nTimeout = 1510704000; // November 15th, 2017.
 
         // The best chain should have at least this much work.
-        consensus.nMinimumChainWork = uint256S("0x0000000000000000000000000000000000000000002cb971dd56d1c583c20f90");
+        consensus.nMinimumChainWork = uint256S("0x0000000000000000000000000000000000000000003f94d1ad391682fe038bf5");
 
         // By default assume that the signatures in ancestors of this block are valid.
-        consensus.defaultAssumeValid = uint256S("0x0000000000000000030abc968e1bd635736e880b946085c93152969b9a81a6e2"); //447235
+        consensus.defaultAssumeValid = uint256S("0x00000000000000000013176bf8d7dfeab4e1db31dc93bc311b436e82ab226b90"); //453354
 
         /**
          * The message start string is designed to be unlikely to occur in normal data.
@@ -201,10 +201,10 @@ class CTestNetParams : public CChainParams {
         consensus.vDeployments[Consensus::DEPLOYMENT_SEGWIT].nTimeout = 1493596800; // May 1st 2017
 
         // The best chain should have at least this much work.
-        consensus.nMinimumChainWork = uint256S("0x0000000000000000000000000000000000000000000000198b4def2baa9338d6");
+        consensus.nMinimumChainWork = uint256S("0x00000000000000000000000000000000000000000000001f057509eba81aed91");
 
         // By default assume that the signatures in ancestors of this block are valid.
-        consensus.defaultAssumeValid = uint256S("0x000000000871ee6842d3648317ccc8a435eb8cc3c2429aee94faff9ba26b05a0"); //1043841
+        consensus.defaultAssumeValid = uint256S("0x00000000000128796ee387cf110ccb9d2f36cffaf7f73079c995377c65ac0dcc"); //1079274
 
         pchMessageStart[0] = 0x0b;
         pchMessageStart[1] = 0x11;

From 91fb506e0a156d5b4f2e9ca76ee8de0b591b2ee0 Mon Sep 17 00:00:00 2001
From: Alex Morcos <morcos@chaincode.com>
Date: Thu, 16 Feb 2017 11:07:15 -0500
Subject: [PATCH 1737/1802] Add two hour buffer to manual pruning

---
 src/rpc/blockchain.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp
index 368654bfa6b8a..7b69c81ff9c42 100644
--- a/src/rpc/blockchain.cpp
+++ b/src/rpc/blockchain.cpp
@@ -820,7 +820,8 @@ UniValue pruneblockchain(const JSONRPCRequest& request)
         throw runtime_error(
             "pruneblockchain\n"
             "\nArguments:\n"
-            "1. \"height\"       (numeric, required) The block height to prune up to. May be set to a discrete height, or to a unix timestamp to prune based on block time.\n"
+            "1. \"height\"       (numeric, required) The block height to prune up to. May be set to a discrete height, or a unix timestamp\n"
+            "                  to prune blocks whose block time is at least 2 hours older than the provided timestamp.\n"
             "\nResult:\n"
             "n    (numeric) Height of the last block pruned.\n"
             "\nExamples:\n"
@@ -839,7 +840,8 @@ UniValue pruneblockchain(const JSONRPCRequest& request)
     // Height value more than a billion is too high to be a block height, and
     // too low to be a block time (corresponds to timestamp from Sep 2001).
     if (heightParam > 1000000000) {
-        CBlockIndex* pindex = chainActive.FindEarliestAtLeast(heightParam);
+        // Add a 2 hour buffer to include blocks which might have had old timestamps
+        CBlockIndex* pindex = chainActive.FindEarliestAtLeast(heightParam - 7200);
         if (!pindex) {
             throw JSONRPCError(RPC_INTERNAL_ERROR, "Could not find block with at least the specified timestamp.");
         }

From 55c403b8febe02555c52bac7028cd6b1f006fad1 Mon Sep 17 00:00:00 2001
From: John Newbery <john@johnnewbery.com>
Date: Wed, 15 Feb 2017 14:19:16 -0500
Subject: [PATCH 1738/1802] Ensure `-maxsigcachesize` is in valid range

- If the -maxsigcachesize parameter is set to zero, setup a minimum sized
sigcache (2 elements) rather than segfaulting.
- Handle maxsigcachesize being negative
- Handle maxsigcachesize being too large
---
 src/script/sigcache.cpp | 5 +++--
 src/script/sigcache.h   | 2 ++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/script/sigcache.cpp b/src/script/sigcache.cpp
index 09bedc54605d4..6f364e42d13d8 100644
--- a/src/script/sigcache.cpp
+++ b/src/script/sigcache.cpp
@@ -93,8 +93,9 @@ static CSignatureCache signatureCache;
 // To be called once in AppInit2/TestingSetup to initialize the signatureCache
 void InitSignatureCache()
 {
-    size_t nMaxCacheSize = GetArg("-maxsigcachesize", DEFAULT_MAX_SIG_CACHE_SIZE) * ((size_t) 1 << 20);
-    if (nMaxCacheSize <= 0) return;
+    // nMaxCacheSize is unsigned. If -maxsigcachesize is set to zero,
+    // setup_bytes creates the minimum possible cache (2 elements).
+    size_t nMaxCacheSize = std::min(std::max((int64_t)0, GetArg("-maxsigcachesize", DEFAULT_MAX_SIG_CACHE_SIZE)), MAX_MAX_SIG_CACHE_SIZE) * ((size_t) 1 << 20);
     size_t nElems = signatureCache.setup_bytes(nMaxCacheSize);
     LogPrintf("Using %zu MiB out of %zu requested for signature cache, able to store %zu elements\n",
             (nElems*sizeof(uint256)) >>20, nMaxCacheSize>>20, nElems);
diff --git a/src/script/sigcache.h b/src/script/sigcache.h
index c123a9ba0f2ed..238952bb954df 100644
--- a/src/script/sigcache.h
+++ b/src/script/sigcache.h
@@ -14,6 +14,8 @@
 // systems). Due to how we count cache size, actual memory usage is slightly
 // more (~32.25 MB)
 static const unsigned int DEFAULT_MAX_SIG_CACHE_SIZE = 32;
+// Maximum sig cache size allowed
+static const int64_t MAX_MAX_SIG_CACHE_SIZE = 16384;
 
 class CPubKey;
 

From bc69f34b3537a7d34fb7f89b4acd619749bc6cc2 Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Fri, 17 Feb 2017 17:23:37 +0100
Subject: [PATCH 1739/1802] build: bump version to 0.14.0

---
 configure.ac           | 6 +++---
 doc/Doxyfile           | 2 +-
 doc/README.md          | 2 +-
 doc/README_windows.txt | 2 +-
 src/clientversion.h    | 6 +++---
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/configure.ac b/configure.ac
index 346695043d9d1..2b2a001d5d38e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,10 +1,10 @@
 dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N)
 AC_PREREQ([2.60])
 define(_CLIENT_VERSION_MAJOR, 0)
-define(_CLIENT_VERSION_MINOR, 13)
-define(_CLIENT_VERSION_REVISION, 99)
+define(_CLIENT_VERSION_MINOR, 14)
+define(_CLIENT_VERSION_REVISION, 0)
 define(_CLIENT_VERSION_BUILD, 0)
-define(_CLIENT_VERSION_IS_RELEASE, false)
+define(_CLIENT_VERSION_IS_RELEASE, true)
 define(_COPYRIGHT_YEAR, 2017)
 define(_COPYRIGHT_HOLDERS,[The %s developers])
 define(_COPYRIGHT_HOLDERS_SUBSTITUTION,[[Bitcoin Core]])
diff --git a/doc/Doxyfile b/doc/Doxyfile
index ef55acdbc330c..a10e4a552cdc0 100644
--- a/doc/Doxyfile
+++ b/doc/Doxyfile
@@ -38,7 +38,7 @@ PROJECT_NAME           = "Bitcoin Core"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 0.13.99
+PROJECT_NUMBER         = 0.14.0
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a
diff --git a/doc/README.md b/doc/README.md
index 36684e5401281..fb2e0ee7d00cb 100644
--- a/doc/README.md
+++ b/doc/README.md
@@ -1,4 +1,4 @@
-Bitcoin Core 0.13.99
+Bitcoin Core 0.14.0
 =====================
 
 Setup
diff --git a/doc/README_windows.txt b/doc/README_windows.txt
index 74a05138a4280..67eb7873a1743 100644
--- a/doc/README_windows.txt
+++ b/doc/README_windows.txt
@@ -1,4 +1,4 @@
-Bitcoin Core 0.13.99
+Bitcoin Core 0.14.0
 =====================
 
 Intro
diff --git a/src/clientversion.h b/src/clientversion.h
index 0b27bb1bdfcce..2b259fb9f02fe 100644
--- a/src/clientversion.h
+++ b/src/clientversion.h
@@ -15,12 +15,12 @@
 
 //! These need to be macros, as clientversion.cpp's and bitcoin*-res.rc's voodoo requires it
 #define CLIENT_VERSION_MAJOR 0
-#define CLIENT_VERSION_MINOR 13
-#define CLIENT_VERSION_REVISION 99
+#define CLIENT_VERSION_MINOR 14
+#define CLIENT_VERSION_REVISION 0
 #define CLIENT_VERSION_BUILD 0
 
 //! Set to true for release, false for prerelease or test build
-#define CLIENT_VERSION_IS_RELEASE false
+#define CLIENT_VERSION_IS_RELEASE true
 
 /**
  * Copyright year (2009-this)

From f68e4414d77aeb60d8dee1b2e53a195ff15b2c48 Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Fri, 17 Feb 2017 16:42:12 +0000
Subject: [PATCH 1740/1802] qt: pre-rc1 translations update

---
 src/qt/locale/bitcoin_af_ZA.ts |  64 ++++
 src/qt/locale/bitcoin_en.ts    |   6 +-
 src/qt/locale/bitcoin_es.ts    |   4 +
 src/qt/locale/bitcoin_it.ts    | 652 ++++++++++++++++++++++++++++++++-
 src/qt/locale/bitcoin_pl.ts    |  12 +-
 src/qt/locale/bitcoin_ru.ts    |  20 +
 src/qt/locale/bitcoin_zh_HK.ts | 374 ++++++++++++++++++-
 7 files changed, 1103 insertions(+), 29 deletions(-)

diff --git a/src/qt/locale/bitcoin_af_ZA.ts b/src/qt/locale/bitcoin_af_ZA.ts
index 1679482c771c0..432e8c3faf8cd 100644
--- a/src/qt/locale/bitcoin_af_ZA.ts
+++ b/src/qt/locale/bitcoin_af_ZA.ts
@@ -5,6 +5,10 @@
         <source>Create a new address</source>
         <translation>Skep 'n nuwe adres</translation>
     </message>
+    <message>
+        <source>&amp;New</source>
+        <translation>&amp;Nuwe</translation>
+    </message>
     <message>
         <source>Copy the currently selected address to the system clipboard</source>
         <translation>Maak 'n kopie van die huidige adres na die stelsel klipbord</translation>
@@ -17,6 +21,14 @@
         <source>Delete the currently selected address from the list</source>
         <translation>Verwyder die huidiglik gekieste address van die lys</translation>
     </message>
+    <message>
+        <source>Export the data in the current tab to a file</source>
+        <translation>Voer inligting uit van die huidige blad na n lêer</translation>
+    </message>
+    <message>
+        <source>&amp;Export</source>
+        <translation>&amp;Uitvoer</translation>
+    </message>
     <message>
         <source>&amp;Delete</source>
         <translation>&amp;Verwyder</translation>
@@ -25,6 +37,42 @@
         <source>Choose the address to send coins to</source>
         <translation>Kies die address na wie die muntstukke gestuur moet word</translation>
     </message>
+    <message>
+        <source>C&amp;hoose</source>
+        <translation>K&amp;ies</translation>
+    </message>
+    <message>
+        <source>Sending addresses</source>
+        <translation>Stuur adresse</translation>
+    </message>
+    <message>
+        <source>Receiving addresses</source>
+        <translation>Ontvang adresse</translation>
+    </message>
+    <message>
+        <source>&amp;Copy Address</source>
+        <translation>&amp;Kopie adres</translation>
+    </message>
+    <message>
+        <source>Copy &amp;Label</source>
+        <translation>Kopie &amp;Etiket</translation>
+    </message>
+    <message>
+        <source>&amp;Edit</source>
+        <translation>&amp;Wysig</translation>
+    </message>
+    <message>
+        <source>Export Address List</source>
+        <translation>Voer adres lys uit</translation>
+    </message>
+    <message>
+        <source>Comma separated file (*.csv)</source>
+        <translation>Koma geskeide lêers (*.csv)</translation>
+    </message>
+    <message>
+        <source>Exporting Failed</source>
+        <translation>Uitvoering Misluk</translation>
+    </message>
     </context>
 <context>
     <name>AddressTableModel</name>
@@ -660,6 +708,10 @@
         <source>Copy amount</source>
         <translation>Kopieer bedrag</translation>
     </message>
+    <message>
+        <source>Comma separated file (*.csv)</source>
+        <translation>Koma geskeide lêers (*.csv)</translation>
+    </message>
     <message>
         <source>Date</source>
         <translation>Datum</translation>
@@ -680,6 +732,10 @@
         <source>ID</source>
         <translation>ID</translation>
     </message>
+    <message>
+        <source>Exporting Failed</source>
+        <translation>Uitvoering Misluk</translation>
+    </message>
     <message>
         <source>Range:</source>
         <translation>Reeks:</translation>
@@ -704,6 +760,14 @@
 </context>
 <context>
     <name>WalletView</name>
+    <message>
+        <source>&amp;Export</source>
+        <translation>&amp;Uitvoer</translation>
+    </message>
+    <message>
+        <source>Export the data in the current tab to a file</source>
+        <translation>Voer inligting uit van die huidige blad na n lêer</translation>
+    </message>
     </context>
 <context>
     <name>bitcoin-core</name>
diff --git a/src/qt/locale/bitcoin_en.ts b/src/qt/locale/bitcoin_en.ts
index f62f1e4a734d3..a66fa55cfedbc 100644
--- a/src/qt/locale/bitcoin_en.ts
+++ b/src/qt/locale/bitcoin_en.ts
@@ -849,7 +849,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+183"/>
+        <location line="+181"/>
         <source>yes</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1499,7 +1499,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+25"/>
+        <location line="+28"/>
         <source>The supplied proxy address is invalid.</source>
         <translation>The supplied proxy address is invalid.</translation>
     </message>
@@ -1760,7 +1760,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+759"/>
+        <location line="+762"/>
         <source>%1 d</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/src/qt/locale/bitcoin_es.ts b/src/qt/locale/bitcoin_es.ts
index fc71bf841be38..e23064b0fefd5 100644
--- a/src/qt/locale/bitcoin_es.ts
+++ b/src/qt/locale/bitcoin_es.ts
@@ -3747,6 +3747,10 @@ Establecer la serialización de las transacciones sin procesar o el bloque hex d
         <source>Starting network threads...</source>
         <translation>Iniciando funciones de red...</translation>
     </message>
+    <message>
+        <source>This is the minimum transaction fee you pay on every transaction.</source>
+        <translation>Esta es la tarifa mínima de transacción que usted paga en cada transacción.</translation>
+    </message>
     <message>
         <source>Threshold for disconnecting misbehaving peers (default: %u)</source>
         <translation>Umbral para la desconexión de pares con mal comportamiento (predeterminado: %u)</translation>
diff --git a/src/qt/locale/bitcoin_it.ts b/src/qt/locale/bitcoin_it.ts
index 9f2c7626de095..b8c89c51af0d5 100644
--- a/src/qt/locale/bitcoin_it.ts
+++ b/src/qt/locale/bitcoin_it.ts
@@ -562,11 +562,75 @@
         <source>Confirmed</source>
         <translation>Confermato</translation>
     </message>
+    <message>
+        <source>Copy address</source>
+        <translation>Copia indirizzo</translation>
+    </message>
+    <message>
+        <source>Copy label</source>
+        <translation>Copia etichetta</translation>
+    </message>
+    <message>
+        <source>Copy amount</source>
+        <translation>Copia l'importo</translation>
+    </message>
+    <message>
+        <source>Copy transaction ID</source>
+        <translation>Copia l'ID transazione</translation>
+    </message>
+    <message>
+        <source>Lock unspent</source>
+        <translation>Bloccare non spesi</translation>
+    </message>
+    <message>
+        <source>Unlock unspent</source>
+        <translation>Sbloccare non spesi</translation>
+    </message>
+    <message>
+        <source>Copy quantity</source>
+        <translation>Copia quantità</translation>
+    </message>
+    <message>
+        <source>Copy fee</source>
+        <translation>Copia commissione</translation>
+    </message>
+    <message>
+        <source>Copy after fee</source>
+        <translation>Copia dopo commissione</translation>
+    </message>
+    <message>
+        <source>Copy bytes</source>
+        <translation>Copia byte</translation>
+    </message>
+    <message>
+        <source>Copy dust</source>
+        <translation>Copia trascurabile</translation>
+    </message>
+    <message>
+        <source>Copy change</source>
+        <translation>Copia resto</translation>
+    </message>
+    <message>
+        <source>(%1 locked)</source>
+        <translation>(%1 bloccato)</translation>
+    </message>
+    <message>
+        <source>yes</source>
+        <translation>sì</translation>
+    </message>
+    <message>
+        <source>no</source>
+        <translation>no</translation>
+    </message>
     <message>
         <source>(no label)</source>
         <translation>(nessuna etichetta)</translation>
     </message>
-    </context>
+    <message>
+        <source>(change)</source>
+        <translation>(resto)</translation>
+    </message>
+</context>
 <context>
     <name>EditAddressDialog</name>
     <message>
@@ -702,6 +766,10 @@
         <source>Error</source>
         <translation>Errore</translation>
     </message>
+    <message numerus="yes">
+        <source>%n GB of free space available</source>
+        <translation><numerusform>GB di spazio libero disponibile</numerusform><numerusform>%n GB di spazio disponibile</numerusform></translation>
+    </message>
     <message numerus="yes">
         <source>(of %n GB needed)</source>
         <translation><numerusform>(di %nGB richiesti)</numerusform><numerusform>(%n GB richiesti)</numerusform></translation>
@@ -713,6 +781,10 @@
         <source>Form</source>
         <translation>Modulo</translation>
     </message>
+    <message>
+        <source>Unknown...</source>
+        <translation>Sconosciuto...</translation>
+    </message>
     <message>
         <source>Last block time</source>
         <translation>Ora del blocco più recente</translation>
@@ -1054,6 +1126,14 @@ Per specificare più URL separarli con una barra verticale "|".</translation>
 </context>
 <context>
     <name>PaymentServer</name>
+    <message>
+        <source>Payment request expired.</source>
+        <translation>Richiesta di pagamento scaduta.</translation>
+    </message>
+    <message>
+        <source>Invalid payment request.</source>
+        <translation>Richiesta di pagamento invalida</translation>
+    </message>
     </context>
 <context>
     <name>PeerTableModel</name>
@@ -1065,7 +1145,11 @@ Per specificare più URL separarli con una barra verticale "|".</translation>
         <source>Node/Service</source>
         <translation>Nodo/Servizio</translation>
     </message>
-    </context>
+    <message>
+        <source>Ping</source>
+        <translation>Ping</translation>
+    </message>
+</context>
 <context>
     <name>QObject</name>
     <message>
@@ -1104,17 +1188,49 @@ Per specificare più URL separarli con una barra verticale "|".</translation>
         <source>%1 ms</source>
         <translation>%1 ms</translation>
     </message>
+    <message numerus="yes">
+        <source>%n second(s)</source>
+        <translation><numerusform>%n secondo</numerusform><numerusform>%n secondi</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%n minute(s)</source>
+        <translation><numerusform>%n minuto</numerusform><numerusform>%n minuti</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%n hour(s)</source>
+        <translation><numerusform>%n ora</numerusform><numerusform>%n ore</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%n day(s)</source>
+        <translation><numerusform>%n giorno</numerusform><numerusform>%n giorni</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%n week(s)</source>
+        <translation><numerusform>%n settimana</numerusform><numerusform>%n settimane</numerusform></translation>
+    </message>
     <message>
         <source>%1 and %2</source>
         <translation>%1 e %2</translation>
     </message>
+    <message numerus="yes">
+        <source>%n year(s)</source>
+        <translation><numerusform>%n anno</numerusform><numerusform>%n anni</numerusform></translation>
+    </message>
     </context>
 <context>
     <name>QObject::QObject</name>
-    </context>
+    <message>
+        <source>Error: %1</source>
+        <translation>Errore: %1</translation>
+    </message>
+</context>
 <context>
     <name>QRImageWidget</name>
-    </context>
+    <message>
+        <source>PNG Image (*.png)</source>
+        <translation>Immagine PNG (*.png)</translation>
+    </message>
+</context>
 <context>
     <name>RPCConsole</name>
     <message>
@@ -1464,7 +1580,23 @@ Per specificare più URL separarli con una barra verticale "|".</translation>
         <source>Remove</source>
         <translation>Rimuovi</translation>
     </message>
-    </context>
+    <message>
+        <source>Copy URI</source>
+        <translation>Copia URI</translation>
+    </message>
+    <message>
+        <source>Copy label</source>
+        <translation>Copia etichetta</translation>
+    </message>
+    <message>
+        <source>Copy message</source>
+        <translation>Copia il messaggio</translation>
+    </message>
+    <message>
+        <source>Copy amount</source>
+        <translation>Copia l'importo</translation>
+    </message>
+</context>
 <context>
     <name>ReceiveRequestDialog</name>
     <message>
@@ -1483,26 +1615,58 @@ Per specificare più URL separarli con una barra verticale "|".</translation>
         <source>&amp;Save Image...</source>
         <translation>&amp;Salva Immagine...</translation>
     </message>
+    <message>
+        <source>URI</source>
+        <translation>URI</translation>
+    </message>
     <message>
         <source>Address</source>
         <translation>Indirizzo</translation>
     </message>
+    <message>
+        <source>Amount</source>
+        <translation>Importo</translation>
+    </message>
     <message>
         <source>Label</source>
         <translation>Etichetta</translation>
     </message>
+    <message>
+        <source>Message</source>
+        <translation>Messaggio</translation>
+    </message>
     </context>
 <context>
     <name>RecentRequestsTableModel</name>
+    <message>
+        <source>Date</source>
+        <translation>Data</translation>
+    </message>
     <message>
         <source>Label</source>
         <translation>Etichetta</translation>
     </message>
+    <message>
+        <source>Message</source>
+        <translation>Messaggio</translation>
+    </message>
     <message>
         <source>(no label)</source>
         <translation>(nessuna etichetta)</translation>
     </message>
-    </context>
+    <message>
+        <source>(no message)</source>
+        <translation>(nessun messaggio)</translation>
+    </message>
+    <message>
+        <source>(no amount requested)</source>
+        <translation>(nessun importo richiesto)</translation>
+    </message>
+    <message>
+        <source>Requested</source>
+        <translation>Richiesto</translation>
+    </message>
+</context>
 <context>
     <name>SendCoinsDialog</name>
     <message>
@@ -1645,6 +1809,54 @@ Per specificare più URL separarli con una barra verticale "|".</translation>
         <source>S&amp;end</source>
         <translation>&amp;Invia</translation>
     </message>
+    <message>
+        <source>Copy quantity</source>
+        <translation>Copia quantità</translation>
+    </message>
+    <message>
+        <source>Copy amount</source>
+        <translation>Copia l'importo</translation>
+    </message>
+    <message>
+        <source>Copy fee</source>
+        <translation>Copia commissione</translation>
+    </message>
+    <message>
+        <source>Copy after fee</source>
+        <translation>Copia dopo commissione</translation>
+    </message>
+    <message>
+        <source>Copy bytes</source>
+        <translation>Copia byte</translation>
+    </message>
+    <message>
+        <source>Copy dust</source>
+        <translation>Copia trascurabile</translation>
+    </message>
+    <message>
+        <source>Copy change</source>
+        <translation>Copia resto</translation>
+    </message>
+    <message>
+        <source>%1 to %2</source>
+        <translation>%1 a %2</translation>
+    </message>
+    <message>
+        <source>Payment request expired.</source>
+        <translation>Richiesta di pagamento scaduta.</translation>
+    </message>
+    <message numerus="yes">
+        <source>%n block(s)</source>
+        <translation><numerusform>%n blocco</numerusform><numerusform>%n blocchi</numerusform></translation>
+    </message>
+    <message>
+        <source>Warning: Invalid Bitcoin address</source>
+        <translation>Attenzione: Indirizzo Bitcoin non valido</translation>
+    </message>
+    <message>
+        <source>Warning: Unknown change address</source>
+        <translation>Attenzione: Indirizzo per il resto sconosciuto</translation>
+    </message>
     <message>
         <source>(no label)</source>
         <translation>(nessuna etichetta)</translation>
@@ -1731,7 +1943,11 @@ Per specificare più URL separarli con una barra verticale "|".</translation>
     </context>
 <context>
     <name>SendConfirmationDialog</name>
-    </context>
+    <message>
+        <source>Yes</source>
+        <translation>Si</translation>
+    </message>
+</context>
 <context>
     <name>ShutdownWindow</name>
     <message>
@@ -1829,7 +2045,55 @@ Per specificare più URL separarli con una barra verticale "|".</translation>
         <source>Reset all verify message fields</source>
         <translation>Reimposta tutti i campi della verifica messaggio</translation>
     </message>
-    </context>
+    <message>
+        <source>The entered address is invalid.</source>
+        <translation>L'indirizzo inserito non è valido.</translation>
+    </message>
+    <message>
+        <source>Please check the address and try again.</source>
+        <translation>Per favore controlla l'indirizzo e prova di nuovo.</translation>
+    </message>
+    <message>
+        <source>The entered address does not refer to a key.</source>
+        <translation>L'indirizzo bitcoin inserito non è associato a nessuna chiave.</translation>
+    </message>
+    <message>
+        <source>Wallet unlock was cancelled.</source>
+        <translation>Sblocco del portamonete annullato.</translation>
+    </message>
+    <message>
+        <source>Private key for the entered address is not available.</source>
+        <translation>La chiave privata per l'indirizzo inserito non è disponibile.</translation>
+    </message>
+    <message>
+        <source>Message signing failed.</source>
+        <translation>Firma messaggio fallita.</translation>
+    </message>
+    <message>
+        <source>Message signed.</source>
+        <translation>Messaggio firmato.</translation>
+    </message>
+    <message>
+        <source>The signature could not be decoded.</source>
+        <translation>Non è stato possibile decodificare la firma.</translation>
+    </message>
+    <message>
+        <source>Please check the signature and try again.</source>
+        <translation>Per favore controlla la firma e prova di nuovo.</translation>
+    </message>
+    <message>
+        <source>The signature did not match the message digest.</source>
+        <translation>La firma non corrisponde al digest del messaggio.</translation>
+    </message>
+    <message>
+        <source>Message verification failed.</source>
+        <translation>Verifica messaggio fallita.</translation>
+    </message>
+    <message>
+        <source>Message verified.</source>
+        <translation>Messaggio verificato.</translation>
+    </message>
+</context>
 <context>
     <name>SplashScreen</name>
     <message>
@@ -1846,7 +2110,123 @@ Per specificare più URL separarli con una barra verticale "|".</translation>
 </context>
 <context>
     <name>TransactionDesc</name>
-    </context>
+    <message>
+        <source>%1/offline</source>
+        <translation>%1/offline</translation>
+    </message>
+    <message>
+        <source>Status</source>
+        <translation>Stato</translation>
+    </message>
+    <message>
+        <source>, has not been successfully broadcast yet</source>
+        <translation>, non è ancora stata trasmessa con successo</translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation>Data</translation>
+    </message>
+    <message>
+        <source>Source</source>
+        <translation>Sorgente</translation>
+    </message>
+    <message>
+        <source>Generated</source>
+        <translation>Generato</translation>
+    </message>
+    <message>
+        <source>From</source>
+        <translation>Da</translation>
+    </message>
+    <message>
+        <source>unknown</source>
+        <translation>sconosciuto</translation>
+    </message>
+    <message>
+        <source>To</source>
+        <translation>A</translation>
+    </message>
+    <message>
+        <source>own address</source>
+        <translation>proprio indirizzo</translation>
+    </message>
+    <message>
+        <source>watch-only</source>
+        <translation>sola lettura</translation>
+    </message>
+    <message>
+        <source>label</source>
+        <translation>etichetta</translation>
+    </message>
+    <message>
+        <source>Credit</source>
+        <translation>Credito</translation>
+    </message>
+    <message>
+        <source>not accepted</source>
+        <translation>non accettate</translation>
+    </message>
+    <message>
+        <source>Debit</source>
+        <translation>Debito</translation>
+    </message>
+    <message>
+        <source>Total debit</source>
+        <translation>Debito totale</translation>
+    </message>
+    <message>
+        <source>Total credit</source>
+        <translation>Credito totale</translation>
+    </message>
+    <message>
+        <source>Transaction fee</source>
+        <translation>Commissione transazione</translation>
+    </message>
+    <message>
+        <source>Net amount</source>
+        <translation>Importo netto</translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation>Messaggio</translation>
+    </message>
+    <message>
+        <source>Comment</source>
+        <translation>Commento</translation>
+    </message>
+    <message>
+        <source>Transaction ID</source>
+        <translation>ID della transazione</translation>
+    </message>
+    <message>
+        <source>Merchant</source>
+        <translation>Commerciante</translation>
+    </message>
+    <message>
+        <source>Debug information</source>
+        <translation>Informazione di debug</translation>
+    </message>
+    <message>
+        <source>Transaction</source>
+        <translation>Transazione</translation>
+    </message>
+    <message>
+        <source>Inputs</source>
+        <translation>Input</translation>
+    </message>
+    <message>
+        <source>Amount</source>
+        <translation>Importo</translation>
+    </message>
+    <message>
+        <source>true</source>
+        <translation>vero</translation>
+    </message>
+    <message>
+        <source>false</source>
+        <translation>falso</translation>
+    </message>
+</context>
 <context>
     <name>TransactionDescDialog</name>
     <message>
@@ -1856,21 +2236,201 @@ Per specificare più URL separarli con una barra verticale "|".</translation>
     </context>
 <context>
     <name>TransactionTableModel</name>
+    <message>
+        <source>Date</source>
+        <translation>Data</translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation>Tipo</translation>
+    </message>
     <message>
         <source>Label</source>
         <translation>Etichetta</translation>
     </message>
+    <message>
+        <source>Offline</source>
+        <translation>Offline</translation>
+    </message>
+    <message>
+        <source>Unconfirmed</source>
+        <translation>Non confermata</translation>
+    </message>
+    <message>
+        <source>Confirmed (%1 confirmations)</source>
+        <translation>Confermata (%1 conferme)</translation>
+    </message>
+    <message>
+        <source>This block was not received by any other nodes and will probably not be accepted!</source>
+        <translation>Questo blocco non è stato ricevuto da alcun altro nodo e probabilmente non sarà accettato!</translation>
+    </message>
+    <message>
+        <source>Generated but not accepted</source>
+        <translation>Generati, ma non accettati</translation>
+    </message>
+    <message>
+        <source>Received with</source>
+        <translation>Ricevuto tramite</translation>
+    </message>
+    <message>
+        <source>Sent to</source>
+        <translation>Inviato a</translation>
+    </message>
+    <message>
+        <source>Payment to yourself</source>
+        <translation>Pagamento a te stesso</translation>
+    </message>
+    <message>
+        <source>Mined</source>
+        <translation>Ottenuto dal mining</translation>
+    </message>
+    <message>
+        <source>watch-only</source>
+        <translation>sola lettura</translation>
+    </message>
+    <message>
+        <source>(n/a)</source>
+        <translation>(n/d)</translation>
+    </message>
     <message>
         <source>(no label)</source>
         <translation>(nessuna etichetta)</translation>
     </message>
-    </context>
+    <message>
+        <source>Transaction status. Hover over this field to show number of confirmations.</source>
+        <translation>Stato della transazione. Passare con il mouse su questo campo per visualizzare il numero di conferme.</translation>
+    </message>
+    <message>
+        <source>Date and time that the transaction was received.</source>
+        <translation>Data e ora in cui la transazione è stata ricevuta.</translation>
+    </message>
+    <message>
+        <source>Type of transaction.</source>
+        <translation>Tipo di transazione.</translation>
+    </message>
+    <message>
+        <source>Whether or not a watch-only address is involved in this transaction.</source>
+        <translation>Indica se un indirizzo di sola lettura sia o meno coinvolto in questa transazione.</translation>
+    </message>
+    <message>
+        <source>User-defined intent/purpose of the transaction.</source>
+        <translation>Intento/scopo della transazione definito dall'utente.</translation>
+    </message>
+    <message>
+        <source>Amount removed from or added to balance.</source>
+        <translation>Importo rimosso o aggiunto al saldo.</translation>
+    </message>
+</context>
 <context>
     <name>TransactionView</name>
+    <message>
+        <source>All</source>
+        <translation>Tutti</translation>
+    </message>
+    <message>
+        <source>Today</source>
+        <translation>Oggi</translation>
+    </message>
+    <message>
+        <source>This week</source>
+        <translation>Questa settimana</translation>
+    </message>
+    <message>
+        <source>This month</source>
+        <translation>Questo mese</translation>
+    </message>
+    <message>
+        <source>Last month</source>
+        <translation>Il mese scorso</translation>
+    </message>
+    <message>
+        <source>This year</source>
+        <translation>Quest'anno</translation>
+    </message>
+    <message>
+        <source>Range...</source>
+        <translation>Intervallo...</translation>
+    </message>
+    <message>
+        <source>Received with</source>
+        <translation>Ricevuto tramite</translation>
+    </message>
+    <message>
+        <source>Sent to</source>
+        <translation>Inviato a</translation>
+    </message>
+    <message>
+        <source>To yourself</source>
+        <translation>A te stesso</translation>
+    </message>
+    <message>
+        <source>Mined</source>
+        <translation>Ottenuto dal mining</translation>
+    </message>
+    <message>
+        <source>Other</source>
+        <translation>Altro</translation>
+    </message>
+    <message>
+        <source>Enter address or label to search</source>
+        <translation>Inserisci un indirizzo o un'etichetta da cercare</translation>
+    </message>
+    <message>
+        <source>Min amount</source>
+        <translation>Importo minimo</translation>
+    </message>
+    <message>
+        <source>Copy address</source>
+        <translation>Copia indirizzo</translation>
+    </message>
+    <message>
+        <source>Copy label</source>
+        <translation>Copia etichetta</translation>
+    </message>
+    <message>
+        <source>Copy amount</source>
+        <translation>Copia l'importo</translation>
+    </message>
+    <message>
+        <source>Copy transaction ID</source>
+        <translation>Copia l'ID transazione</translation>
+    </message>
+    <message>
+        <source>Copy raw transaction</source>
+        <translation>Copia la transazione raw</translation>
+    </message>
+    <message>
+        <source>Edit label</source>
+        <translation>Modifica l'etichetta</translation>
+    </message>
+    <message>
+        <source>Show transaction details</source>
+        <translation>Mostra i dettagli della transazione</translation>
+    </message>
+    <message>
+        <source>Export Transaction History</source>
+        <translation>Esporta lo storico delle transazioni</translation>
+    </message>
     <message>
         <source>Comma separated file (*.csv)</source>
         <translation>Testo CSV (*.csv)</translation>
     </message>
+    <message>
+        <source>Confirmed</source>
+        <translation>Confermato</translation>
+    </message>
+    <message>
+        <source>Watch-only</source>
+        <translation>Sola lettura</translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation>Data</translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation>Tipo</translation>
+    </message>
     <message>
         <source>Label</source>
         <translation>Etichetta</translation>
@@ -1879,11 +2439,35 @@ Per specificare più URL separarli con una barra verticale "|".</translation>
         <source>Address</source>
         <translation>Indirizzo</translation>
     </message>
+    <message>
+        <source>ID</source>
+        <translation>ID</translation>
+    </message>
     <message>
         <source>Exporting Failed</source>
         <translation>Esportazione Fallita</translation>
     </message>
-    </context>
+    <message>
+        <source>There was an error trying to save the transaction history to %1.</source>
+        <translation>Si è verificato un errore durante il salvataggio dello storico delle transazioni in %1.</translation>
+    </message>
+    <message>
+        <source>Exporting Successful</source>
+        <translation>Esportazione Riuscita</translation>
+    </message>
+    <message>
+        <source>The transaction history was successfully saved to %1.</source>
+        <translation>Lo storico delle transazioni e' stato salvato con successo in %1.</translation>
+    </message>
+    <message>
+        <source>Range:</source>
+        <translation>Intervallo:</translation>
+    </message>
+    <message>
+        <source>to</source>
+        <translation>a</translation>
+    </message>
+</context>
 <context>
     <name>UnitDisplayStatusBarControl</name>
     <message>
@@ -1893,13 +2477,53 @@ Per specificare più URL separarli con una barra verticale "|".</translation>
 </context>
 <context>
     <name>WalletFrame</name>
-    </context>
+    <message>
+        <source>No wallet has been loaded.</source>
+        <translation>Non è stato caricato alcun portamonete.</translation>
+    </message>
+</context>
 <context>
     <name>WalletModel</name>
-    </context>
+    <message>
+        <source>Send Coins</source>
+        <translation>Invia Bitcoin</translation>
+    </message>
+</context>
 <context>
     <name>WalletView</name>
-    </context>
+    <message>
+        <source>&amp;Export</source>
+        <translation>&amp;Esporta</translation>
+    </message>
+    <message>
+        <source>Export the data in the current tab to a file</source>
+        <translation>Esporta su file i dati contenuti nella tabella corrente</translation>
+    </message>
+    <message>
+        <source>Backup Wallet</source>
+        <translation>Backup Portamonete</translation>
+    </message>
+    <message>
+        <source>Wallet Data (*.dat)</source>
+        <translation>Dati Portamonete (*.dat)</translation>
+    </message>
+    <message>
+        <source>Backup Failed</source>
+        <translation>Backup Fallito</translation>
+    </message>
+    <message>
+        <source>There was an error trying to save the wallet data to %1.</source>
+        <translation>Si è verificato un errore durante il salvataggio dei dati del portamonete in %1.</translation>
+    </message>
+    <message>
+        <source>Backup Successful</source>
+        <translation>Backup eseguito con successo</translation>
+    </message>
+    <message>
+        <source>The wallet data was successfully saved to %1.</source>
+        <translation>Il portamonete è stato correttamente salvato in %1.</translation>
+    </message>
+</context>
 <context>
     <name>bitcoin-core</name>
     <message>
diff --git a/src/qt/locale/bitcoin_pl.ts b/src/qt/locale/bitcoin_pl.ts
index 46348140700e7..6d6d6718fa77d 100644
--- a/src/qt/locale/bitcoin_pl.ts
+++ b/src/qt/locale/bitcoin_pl.ts
@@ -419,7 +419,7 @@
     </message>
     <message numerus="yes">
         <source>%n active connection(s) to Bitcoin network</source>
-        <translation><numerusform>%n aktywnych połączeń do sieci Bitcoin</numerusform><numerusform>%n aktywnych połączeń do sieci Bitcoin</numerusform><numerusform>%n aktywnych połączeń do sieci Bitcoin</numerusform></translation>
+        <translation><numerusform>%n aktywnych połączeń do sieci Bitcoin</numerusform><numerusform>%n aktywnych połączeń do sieci Bitcoin</numerusform><numerusform>%n aktywnych połączeń do sieci Bitcoin</numerusform><numerusform>%n aktywnych połączeń do sieci Bitcoin</numerusform></translation>
     </message>
     <message>
         <source>Indexing blocks on disk...</source>
@@ -431,7 +431,7 @@
     </message>
     <message numerus="yes">
         <source>Processed %n block(s) of transaction history.</source>
-        <translation><numerusform>Przetworzono %n bloków historii transakcji.</numerusform><numerusform>Przetworzono %n bloków historii transakcji.</numerusform><numerusform>Przetworzono %n bloków historii transakcji.</numerusform></translation>
+        <translation><numerusform>Przetworzono %n bloków historii transakcji.</numerusform><numerusform>Przetworzono %n bloków historii transakcji.</numerusform><numerusform>Przetworzono %n bloków historii transakcji.</numerusform><numerusform>Przetworzono %n bloków historii transakcji.</numerusform></translation>
     </message>
     <message>
         <source>%1 behind</source>
@@ -832,11 +832,11 @@
     </message>
     <message numerus="yes">
         <source>%n GB of free space available</source>
-        <translation><numerusform>%n GB dostępnego wolnego miejsca</numerusform><numerusform>%n GB dostępnego wolnego miejsca</numerusform><numerusform>%n GB dostępnego wolnego miejsca</numerusform></translation>
+        <translation><numerusform>%n GB dostępnego wolnego miejsca</numerusform><numerusform>%n GB dostępnego wolnego miejsca</numerusform><numerusform>%n GB dostępnego wolnego miejsca</numerusform><numerusform>%n GB dostępnego wolnego miejsca</numerusform></translation>
     </message>
     <message numerus="yes">
         <source>(of %n GB needed)</source>
-        <translation><numerusform>(z %n GB potrzebnych)</numerusform><numerusform>(z %n GB potrzebnych)</numerusform><numerusform>(z %n GB potrzebnych)</numerusform></translation>
+        <translation><numerusform>(z %n GB potrzebnych)</numerusform><numerusform>(z %n GB potrzebnych)</numerusform><numerusform>(z %n GB potrzebnych)</numerusform><numerusform>(z %n GB potrzebnych)</numerusform></translation>
     </message>
 </context>
 <context>
@@ -1325,11 +1325,11 @@
     </message>
     <message numerus="yes">
         <source>%n second(s)</source>
-        <translation><numerusform>%n sekunda</numerusform><numerusform>%n sekund</numerusform><numerusform>%n sekund</numerusform></translation>
+        <translation><numerusform>%n sekunda</numerusform><numerusform>%n sekund</numerusform><numerusform>%n sekund</numerusform><numerusform>%n sekund</numerusform></translation>
     </message>
     <message numerus="yes">
         <source>%n minute(s)</source>
-        <translation><numerusform>%n minuta</numerusform><numerusform>%n minut</numerusform><numerusform>%n minut</numerusform></translation>
+        <translation><numerusform>%n minuta</numerusform><numerusform>%n minut</numerusform><numerusform>%n minut</numerusform><numerusform>%n minut</numerusform></translation>
     </message>
     <message>
         <source>%1 and %2</source>
diff --git a/src/qt/locale/bitcoin_ru.ts b/src/qt/locale/bitcoin_ru.ts
index b5f40fc058900..7d013416ff76b 100644
--- a/src/qt/locale/bitcoin_ru.ts
+++ b/src/qt/locale/bitcoin_ru.ts
@@ -329,6 +329,10 @@
         <source>Click to enable network activity again.</source>
         <translation>Кликните, чтобы снова разрешить сетевую активность.</translation>
     </message>
+    <message>
+        <source>Syncing Headers (%1%)...</source>
+        <translation>Синхронизация заголовков (%1%)...</translation>
+    </message>
     <message>
         <source>Reindexing blocks on disk...</source>
         <translation>Идёт переиндексация блоков на диске...</translation>
@@ -3089,6 +3093,14 @@
         <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source>
         <translation>Выполнить команду, когда меняется транзакция в бумажнике (%s в команде заменяется на TxID)</translation>
     </message>
+    <message>
+        <source>Extra transactions to keep in memory for compact block reconstructions (default: %u)</source>
+        <translation>Хранить в памяти дополнительные транзакции для реконструкции компактных блоков (по умолчанию: %u)</translation>
+    </message>
+    <message>
+        <source>If this block is in the chain assume that it and its ancestors are valid and potentially skip their script verification (0 to verify all, default: %s, testnet: %s)</source>
+        <translation>Если этот блок в цепи, считать его и последующие блоки верными и потенциально пропускать проверку их скриптов (0 для проверки всех, по умолчанию: %s, тестовая сеть: %s)</translation>
+    </message>
     <message>
         <source>Maximum allowed median peer time offset adjustment. Local perspective of time may be influenced by peers forward or backward by this amount. (default: %u seconds)</source>
         <translation>Максимально допустимое среднее отклонение времени участников. Локальное представление времени может меняться вперед или назад на это количество. (по умолчанию: %u секунд)</translation>
@@ -3105,6 +3117,14 @@
         <source>Please contribute if you find %s useful. Visit %s for further information about the software.</source>
         <translation>Пожалуйста, внести свой вклад, если вы найдете %s полезными. Посетите  %s для получения дополнительной информации о программном обеспечении.</translation>
     </message>
+    <message>
+        <source>Reduce storage requirements by enabling pruning (deleting) of old blocks. This allows the pruneblockchain RPC to be called to delete specific blocks, and enables automatic pruning of old blocks if a target size in MiB is provided. This mode is incompatible with -txindex and -rescan. Warning: Reverting this setting requires re-downloading the entire blockchain. (default: 0 = disable pruning blocks, 1 = allow manual pruning via RPC, &gt;%u = automatically prune block files to stay under the specified target size in MiB)</source>
+        <translation>Уменьшить размер хранилища за счёт обрезания (удаления) старых блоков. Будет разрешён вызов RPC метода pruneblockchain для удаления определённых блоков и разрешено автоматическое обрезание старых блоков, если указан целевой размер в Мб. Этот режим несовместим с -txindex и -rescan. Внимание: переключение этой опции обратно потребует полной загрузки цепи блоков. (по умолчанию: 0 = отключить обрезание блоков, 1 = разрешить ручное обрезание через RPC, &gt;%u = автоматически обрезать файлы блоков, чтобы они были меньше указанного размера в Мб)</translation>
+    </message>
+    <message>
+        <source>Set lowest fee rate (in %s/kB) for transactions to be included in block creation. (default: %s)</source>
+        <translation>Задать минимальный курс комиссии (в %s/Кб) для  транзакцийб включаемых в создаваемый блок. (по умолчанию: %s)</translation>
+    </message>
     <message>
         <source>Set the number of script verification threads (%u to %d, 0 = auto, &lt;0 = leave that many cores free, default: %d)</source>
         <translation>Задать число потоков проверки скрипта (от %u до %d, 0=авто, &lt;0 = оставить столько ядер свободными, по умолчанию: %d)</translation>
diff --git a/src/qt/locale/bitcoin_zh_HK.ts b/src/qt/locale/bitcoin_zh_HK.ts
index 2f3a8d1f1617f..2049715b856e0 100644
--- a/src/qt/locale/bitcoin_zh_HK.ts
+++ b/src/qt/locale/bitcoin_zh_HK.ts
@@ -41,10 +41,70 @@
         <source>&amp;Delete</source>
         <translation>刪除 &amp;D</translation>
     </message>
-    </context>
+    <message>
+        <source>Choose the address to send coins to</source>
+        <translation>選擇要付錢過去的地址</translation>
+    </message>
+    <message>
+        <source>Choose the address to receive coins with</source>
+        <translation>選擇要收錢的地址</translation>
+    </message>
+    <message>
+        <source>C&amp;hoose</source>
+        <translation>選擇 &amp;h</translation>
+    </message>
+    <message>
+        <source>Sending addresses</source>
+        <translation>付款地址</translation>
+    </message>
+    <message>
+        <source>Receiving addresses</source>
+        <translation>收款地址</translation>
+    </message>
+    <message>
+        <source>&amp;Copy Address</source>
+        <translation>複製地址 &amp;C</translation>
+    </message>
+    <message>
+        <source>Copy &amp;Label</source>
+        <translation>複製標記 &amp;L</translation>
+    </message>
+    <message>
+        <source>&amp;Edit</source>
+        <translation>編輯 &amp;E</translation>
+    </message>
+    <message>
+        <source>Export Address List</source>
+        <translation>匯出地址清單</translation>
+    </message>
+    <message>
+        <source>Comma separated file (*.csv)</source>
+        <translation>逗號分隔檔 (*.csv)</translation>
+    </message>
+    <message>
+        <source>Exporting Failed</source>
+        <translation>匯出失敗</translation>
+    </message>
+    <message>
+        <source>There was an error trying to save the address list to %1. Please try again.</source>
+        <translation>儲存地址列表到 %1 時發生錯誤。請再試一次。</translation>
+    </message>
+</context>
 <context>
     <name>AddressTableModel</name>
-    </context>
+    <message>
+        <source>Label</source>
+        <translation>標記</translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation>地址</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(無標記)</translation>
+    </message>
+</context>
 <context>
     <name>AskPassphraseDialog</name>
     <message>
@@ -63,7 +123,91 @@
         <source>Repeat new passphrase</source>
         <translation>重複新密碼</translation>
     </message>
-    </context>
+    <message>
+        <source>Encrypt wallet</source>
+        <translation>加密錢包</translation>
+    </message>
+    <message>
+        <source>This operation needs your wallet passphrase to unlock the wallet.</source>
+        <translation>這個動作需要你的錢包密碼來將錢包解鎖。</translation>
+    </message>
+    <message>
+        <source>Unlock wallet</source>
+        <translation>解鎖錢包</translation>
+    </message>
+    <message>
+        <source>This operation needs your wallet passphrase to decrypt the wallet.</source>
+        <translation>這個動作需要你的錢包密碼來將錢包解密。</translation>
+    </message>
+    <message>
+        <source>Decrypt wallet</source>
+        <translation>解密錢包</translation>
+    </message>
+    <message>
+        <source>Change passphrase</source>
+        <translation>更改密碼</translation>
+    </message>
+    <message>
+        <source>Enter the old passphrase and new passphrase to the wallet.</source>
+        <translation>輸入舊密碼和新密碼至錢包。</translation>
+    </message>
+    <message>
+        <source>Confirm wallet encryption</source>
+        <translation>確認錢包加密</translation>
+    </message>
+    <message>
+        <source>Warning: If you encrypt your wallet and lose your passphrase, you will &lt;b&gt;LOSE ALL OF YOUR BITCOINS&lt;/b&gt;!</source>
+        <translation>警告: 如果你將錢包加密後又忘記密碼，你就會&lt;b&gt;失去所有 Bitcoin 了&lt;/b&gt;！</translation>
+    </message>
+    <message>
+        <source>Are you sure you wish to encrypt your wallet?</source>
+        <translation>你確定要把錢包加密嗎？</translation>
+    </message>
+    <message>
+        <source>Wallet encrypted</source>
+        <translation>錢包已加密</translation>
+    </message>
+    <message>
+        <source>%1 will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source>
+        <translation>%1 現在要關閉來完成加密程序。請記得將錢包加密不能完全防止你的 Bitcoins 經被入侵電腦的惡意程式偷取。</translation>
+    </message>
+    <message>
+        <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source>
+        <translation>重要: 請改用新產生的加密錢包檔，來取代所以舊錢包檔的備份。為安全計，當你開始使用新的加密錢包檔後，舊錢包檔的備份就不能再使用了。</translation>
+    </message>
+    <message>
+        <source>Wallet encryption failed</source>
+        <translation>錢包加密失敗</translation>
+    </message>
+    <message>
+        <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
+        <translation>因內部錯誤導致錢包加密失敗，你的錢包尚未加密。</translation>
+    </message>
+    <message>
+        <source>The supplied passphrases do not match.</source>
+        <translation>提供的密碼不一致。</translation>
+    </message>
+    <message>
+        <source>Wallet unlock failed</source>
+        <translation>錢包解鎖失敗</translation>
+    </message>
+    <message>
+        <source>The passphrase entered for the wallet decryption was incorrect.</source>
+        <translation>用來解密錢包的密碼不對。</translation>
+    </message>
+    <message>
+        <source>Wallet decryption failed</source>
+        <translation>錢包解密失敗</translation>
+    </message>
+    <message>
+        <source>Wallet passphrase was successfully changed.</source>
+        <translation>錢包密碼已成功更改。</translation>
+    </message>
+    <message>
+        <source>Warning: The Caps Lock key is on!</source>
+        <translation>警告: Caps Lock 已啟用！</translation>
+    </message>
+</context>
 <context>
     <name>BanTableModel</name>
     <message>
@@ -113,6 +257,14 @@
         <source>Quit application</source>
         <translation>結束應用程式</translation>
     </message>
+    <message>
+        <source>&amp;About %1</source>
+        <translation>關於 %1 &amp;A</translation>
+    </message>
+    <message>
+        <source>Show information about %1</source>
+        <translation>顯示 %1 的相關資訊</translation>
+    </message>
     <message>
         <source>About &amp;Qt</source>
         <translation>關於 Qt &amp;Q</translation>
@@ -125,6 +277,10 @@
         <source>&amp;Options...</source>
         <translation>選項... &amp;O</translation>
     </message>
+    <message>
+        <source>Modify configuration options for %1</source>
+        <translation>修正 %1 的設定選項</translation>
+    </message>
     <message>
         <source>&amp;Encrypt Wallet...</source>
         <translation>加密錢包... &amp;E</translation>
@@ -201,9 +357,51 @@
         <source>Show or hide the main Window</source>
         <translation>顯示或隱藏主視窗</translation>
     </message>
+    <message>
+        <source>&amp;File</source>
+        <translation>檔案 &amp;F</translation>
+    </message>
+    <message>
+        <source>&amp;Settings</source>
+        <translation>設定 &amp;S</translation>
+    </message>
+    <message>
+        <source>&amp;Help</source>
+        <translation>說明 &amp;H</translation>
+    </message>
+    <message>
+        <source>Request payments (generates QR codes and bitcoin: URIs)</source>
+        <translation>要求付款 (產生QR碼 bitcoin: URIs)</translation>
+    </message>
+    <message>
+        <source>Indexing blocks on disk...</source>
+        <translation>正在為磁碟區塊建立索引...</translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation>錯誤</translation>
+    </message>
+    <message>
+        <source>Warning</source>
+        <translation>警告</translation>
+    </message>
+    <message>
+        <source>Information</source>
+        <translation>資訊</translation>
+    </message>
+    <message>
+        <source>Date: %1
+</source>
+        <translation>日期: %1
+</translation>
+    </message>
     </context>
 <context>
     <name>CoinControlDialog</name>
+    <message>
+        <source>(no label)</source>
+        <translation>(無標記)</translation>
+    </message>
     </context>
 <context>
     <name>EditAddressDialog</name>
@@ -216,6 +414,10 @@
     </context>
 <context>
     <name>Intro</name>
+    <message>
+        <source>Error</source>
+        <translation>錯誤</translation>
+    </message>
     </context>
 <context>
     <name>ModalOverlay</name>
@@ -237,28 +439,144 @@
     </context>
 <context>
     <name>QObject</name>
+    <message>
+        <source>Enter a Bitcoin address (e.g. %1)</source>
+        <translation>輸入一個 Bitcoin 位址 (例如 %1)</translation>
+    </message>
+    <message>
+        <source>%1 d</source>
+        <translation>%1 日</translation>
+    </message>
+    <message>
+        <source>%1 h</source>
+        <translation>%1 小時</translation>
+    </message>
+    <message>
+        <source>%1 m</source>
+        <translation>%1 分</translation>
+    </message>
+    <message>
+        <source>%1 s</source>
+        <translation>%1 秒</translation>
+    </message>
+    <message>
+        <source>None</source>
+        <translation>沒有</translation>
+    </message>
+    <message>
+        <source>N/A</source>
+        <translation>N/A</translation>
+    </message>
+    <message>
+        <source>%1 ms</source>
+        <translation>%1 亳秒</translation>
+    </message>
+    <message numerus="yes">
+        <source>%n second(s)</source>
+        <translation><numerusform>%n 秒</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%n minute(s)</source>
+        <translation><numerusform>%n 分鐘</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%n hour(s)</source>
+        <translation><numerusform>%n 小時</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%n day(s)</source>
+        <translation><numerusform>%n 日</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%n week(s)</source>
+        <translation><numerusform>%n 星期</numerusform></translation>
+    </message>
+    <message>
+        <source>%1 and %2</source>
+        <translation>%1 和 %2</translation>
+    </message>
+    <message numerus="yes">
+        <source>%n year(s)</source>
+        <translation><numerusform>%n 年</numerusform></translation>
+    </message>
     </context>
 <context>
     <name>QObject::QObject</name>
     </context>
 <context>
     <name>QRImageWidget</name>
-    </context>
+    <message>
+        <source>Save QR Code</source>
+        <translation>儲存 QR 碼</translation>
+    </message>
+    <message>
+        <source>PNG Image (*.png)</source>
+        <translation>PNG 影像(*.png)</translation>
+    </message>
+</context>
 <context>
     <name>RPCConsole</name>
+    <message>
+        <source>N/A</source>
+        <translation>N/A</translation>
+    </message>
+    <message>
+        <source>&amp;Information</source>
+        <translation>資訊 &amp;I</translation>
+    </message>
+    <message>
+        <source>Debug window</source>
+        <translation>除錯視窗</translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>一般</translation>
+    </message>
+    <message>
+        <source>Received</source>
+        <translation>已接收</translation>
+    </message>
+    <message>
+        <source>Sent</source>
+        <translation>已送出</translation>
+    </message>
+    <message>
+        <source>Version</source>
+        <translation>版本</translation>
+    </message>
     </context>
 <context>
     <name>ReceiveCoinsDialog</name>
     </context>
 <context>
     <name>ReceiveRequestDialog</name>
+    <message>
+        <source>Address</source>
+        <translation>地址</translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation>標記</translation>
+    </message>
     </context>
 <context>
     <name>RecentRequestsTableModel</name>
+    <message>
+        <source>Label</source>
+        <translation>標記</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(無標記)</translation>
+    </message>
     </context>
 <context>
     <name>SendCoinsDialog</name>
-    </context>
+    <message>
+        <source>(no label)</source>
+        <translation>(無標記)</translation>
+    </message>
+</context>
 <context>
     <name>SendCoinsEntry</name>
     </context>
@@ -279,15 +597,47 @@
     </context>
 <context>
     <name>TransactionDesc</name>
+    <message>
+        <source>Open until %1</source>
+        <translation>開放至 %1</translation>
+    </message>
     </context>
 <context>
     <name>TransactionDescDialog</name>
     </context>
 <context>
     <name>TransactionTableModel</name>
+    <message>
+        <source>Label</source>
+        <translation>標記</translation>
+    </message>
+    <message>
+        <source>Open until %1</source>
+        <translation>開放至 %1</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(無標記)</translation>
+    </message>
     </context>
 <context>
     <name>TransactionView</name>
+    <message>
+        <source>Comma separated file (*.csv)</source>
+        <translation>逗號分隔檔 (*.csv)</translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation>標記</translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation>地址</translation>
+    </message>
+    <message>
+        <source>Exporting Failed</source>
+        <translation>匯出失敗</translation>
+    </message>
     </context>
 <context>
     <name>UnitDisplayStatusBarControl</name>
@@ -303,5 +653,17 @@
     </context>
 <context>
     <name>bitcoin-core</name>
-    </context>
+    <message>
+        <source>Information</source>
+        <translation>資訊</translation>
+    </message>
+    <message>
+        <source>Warning</source>
+        <translation>警告</translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation>錯誤</translation>
+    </message>
+</context>
 </TS>
\ No newline at end of file

From 1a02ecc73af4b4ac36da1bd04f9e7eddf640e48f Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Fri, 17 Feb 2017 17:47:06 +0100
Subject: [PATCH 1741/1802] doc: Update release notes from wiki

---
 doc/release-notes.md | 278 ++++++++++++++++++++++++++++++++++---------
 1 file changed, 221 insertions(+), 57 deletions(-)

diff --git a/doc/release-notes.md b/doc/release-notes.md
index 0ea9e1949e381..f83b0ce8fc9df 100644
--- a/doc/release-notes.md
+++ b/doc/release-notes.md
@@ -1,9 +1,9 @@
 (note: this is a temporary file, to be added-to by anybody, and moved to
 release-notes at release time)
 
-Bitcoin Core version *version* is now available from:
+Bitcoin Core version 0.14.0 is now available from:
 
-  <https://bitcoin.org/bin/bitcoin-core-*version*/>
+  <https://bitcoin.org/bin/bitcoin-core-0.14.0/>
 
 This is a new major version release, including new features, various bugfixes
 and performance improvements, as well as updated translations.
@@ -22,9 +22,9 @@ Compatibility
 Bitcoin Core is extensively tested on multiple operating systems using
 the Linux kernel, macOS 10.8+, and Windows Vista and later.
 
-Microsoft ended support for Windows XP on [April 8th, 2014](https://www.microsoft.com/en-us/WindowsForBusiness/end-of-xp-support).
+Microsoft ended support for Windows XP on [April 8th, 2014](https://www.microsoft.com/en-us/WindowsForBusiness/end-of-xp-support),
 No attempt is made to prevent installing or running the software on Windows XP, you
-can still do so at your own risk but be aware that there are known instabilities.
+can still do so at your own risk but be aware that there are known instabilities and issues.
 Please do not report issues about Windows XP to the issue tracker.
 
 Bitcoin Core should also work on most other Unix-like systems but is not
@@ -33,18 +33,222 @@ frequently tested on them.
 Notable changes
 ===============
 
+Manual Pruning
+--------------
+
+Bitcoin Core has supported automatically pruning the blockchain since 0.11. Pruning
+the blockchain allows for significant storage space savings as the vast majority of
+the downloaded data can be discarded after processing so very little of it remains
+on the disk.
+
+Manual block pruning can now be enabled by setting `-prune=1`. Once that is set,
+the RPC command `pruneblockchain` can be used to prune the blockchain up to the
+specified height or timestamp.
+
+`getinfo` Deprecated
+--------------------
+
+The `getinfo` RPC command has been deprecated. Each field in the RPC call
+has been moved to another command's output with that command also giving
+additional information that `getinfo` did not provide. The following table
+shows where each field has been moved to:
+
+|`getinfo` field   | Moved to                                  |
+|------------------|-------------------------------------------|
+`"version"`	   | `getnetworkinfo()["version"]`
+`"protocolversion"`| `getnetworkinfo()["protocolversion"]`
+`"walletversion"`  | `getwalletinfo()["walletversion"]`
+`"balance"`	   | `getwalletinfo()["balance"]`
+`"blocks"`	   | `getblockchaininfo()["blocks"]`
+`"timeoffset"`	   | `getnetworkinfo()["timeoffset"]`
+`"connections"`	   | `getnetworkinfo()["connections"]`
+`"proxy"`	   | `getnetworkinfo()["networks"][0]["proxy"]`
+`"difficulty"`	   | `getblockchaininfo()["difficulty"]`
+`"testnet"`	   | `getblockchaininfo()["chain"] == "test"`
+`"keypoololdest"`  | `getwalletinfo()["keypoololdest"]`
+`"keypoolsize"`	   | `getwalletinfo()["keypoolsize"]`
+`"unlocked_until"` | `getwalletinfo()["unlocked_until"]`
+`"paytxfee"`	   | `getwalletinfo()["paytxfee"]`
+`"relayfee"`	   | `getnetworkinfo()["relayfee"]`
+`"errors"`	   | `getnetworkinfo()["warnings"]`
+
+ZMQ On Windows
+--------------
+
+Previously the ZeroMQ notification system was unavailable on Windows
+due to various issues with ZMQ. These have been fixed upstream and
+now ZMQ can be used on Windows. Please see [this document](https://github.com/bitcoin/bitcoin/blob/master/doc/zmq.md) for
+help with using ZMQ in general.
+
+Nested RPC Commands in Debug Console
+------------------------------------
+
+The ability to nest RPC commands has been added to the debug console. This
+allows users to have the output of a command become the input to another
+command without running the commands separately.
+
+The nested RPC commands use bracket syntax (i.e. `getwalletinfo()`) and can
+be nested (i.e. `getblock(getblockhash(1))`). Simple queries can be
+done with square brackets where object values are accessed with either an 
+array index or a non-quoted string (i.e. `listunspent()[0][txid]`). Both
+commas and spaces can be used to separate parameters in both the bracket syntax
+and normal RPC command syntax.
+
+Network Activity Toggle
+-----------------------
+
+A RPC command and GUI toggle have been added to enable or disable all p2p
+network activity. The network status icon in the bottom right hand corner 
+is now the GUI toggle. Clicking the icon will either enable or disable all
+p2p network activity. If network activity is disabled, the icon will 
+be grayed out with an X on top of it.
+
+Additionally the `setnetworkactive` RPC command has been added which does
+the same thing as the GUI icon. The command takes one boolean parameter,
+`true` enables networking and `false` disables it.
+
+Out-of-sync Modal Info Layer
+----------------------------
+
+When Bitcoin Core is out-of-sync on startup, a semi-transparent information
+layer will be shown over top of the normal display. This layer contains
+details about the current sync progress and estimates the amount of time
+remaining to finish syncing. This layer can also be hidden and subsequently
+unhidden by clicking on the progress bar at the bottom of the window.
+
+Support for JSON-RPC Named Arguments
+------------------------------------
+
+Commands sent over the JSON-RPC interface and through the `bitcoin-cli` binary
+can now use named arguments. This follows the [JSON-RPC specification](http://www.jsonrpc.org/specification)
+for passing parameters by-name with an object.
+
+`bitcoin-cli` has been updated to support this by parsing `name=value` arguments
+when the `-named` option is given.
+
+Some examples:
+
+    src/bitcoin-cli -named help command="help"
+    src/bitcoin-cli -named getblockhash height=0
+    src/bitcoin-cli -named getblock blockhash=000000000019d6689c085ae165831e934ff763ae46a2a6c172b3f1b60a8ce26f
+    src/bitcoin-cli -named sendtoaddress address="(snip)" amount="1.0" subtractfeefromamount=true
+
+The order of arguments doesn't matter in this case. Named arguments are also
+useful to leave out arguments that should stay at their default value. The
+rarely-used arguments `comment` and `comment_to` to `sendtoaddress`, for example, can
+be left out. However, this is not yet implemented for many RPC calls, this is
+expected to land in a later release.
+
+The RPC server remains fully backwards compatible with positional arguments.
+
+Opt into RBF When Sending
+-------------------------
+
+A new startup option, `-walletrbf`, has been added to allow users to have all
+transactions sent opt into RBF support. The default value for this option is
+currently `false`, so transactions will not opt into RBF by default.
+
+Sensitive Data Is No Longer Stored In Debug Console History
+-----------------------------------------------------------
+
+The debug console maintains a history of previously entered commands that can be
+accessed by pressing the Up-arrow key so that users can easily reuse previously
+entered commands. Commands which have sensitive information such as passphrases and
+private keys will now have a `(...)` in place of the parameters when accessed through
+the history.
+
+Retaining the Mempool Across Restarts
+-------------------------------------
+
+The mempool will be saved to the data directory prior to shutdown
+to a `mempool.dat` file. This file preserves the mempool so that when the node
+restarts the mempool can be filled with transactions without waiting for new transactions
+to be created. This will also preserve any changes made to a transaction through
+commands such as `prioritisetransaction` so that those changes will not be lost.
+
+Final Alert
+-----------
+
+The Alert System was [disabled and deprecated](https://bitcoin.org/en/alert/2016-11-01-alert-retirement) in Bitcoin Core 0.12.1 and removed in 0.13.0. 
+To Alert System was retired with a maximum sequence final alert which causes any nodes
+supporting the Alert System to display a static hard-coded "Alert Key Compromised" message which also
+prevents any other alerts from overriding it. This final alert is hard-coded into this release
+so that all old nodes receive the final alert.
+
+GUI Changes
+-----------
+
+ - After resetting the options by clicking the `Reset Options` button 
+   in the options dialog or with the `-resetguioptions` startup option, 
+   the user will be prompted to choose the data directory again. This 
+   is to ensure that custom data directories will be kept after the 
+   option reset which clears the custom data directory set via the choose 
+   datadir dialog.
+
+ - Multiple peers can now be selected in the list of peers in the debug 
+   window. This allows for users to ban or disconnect multiple peers 
+   simultaneously instead of banning them one at a time.
+
+ - An indicator has been added to the bottom right hand corner of the main
+   window to indicate whether the wallet being used is a HD wallet. This
+   icon will be grayed out with an X on top of it if the wallet is not a
+   HD wallet.
+
 Low-level RPC changes
 ----------------------
 
-- `importprunedfunds` only accepts two required arguments. Some versions accept
-  an optional third arg, which was always ignored. Make sure to never pass more
-  than two arguments.
+ - `importprunedfunds` only accepts two required arguments. Some versions accept
+   an optional third arg, which was always ignored. Make sure to never pass more
+   than two arguments.
+
+ - The first boolean argument to `getaddednodeinfo` has been removed. This is 
+   an incompatible change.
+
+ - RPC command "getmininginfo" loses the "testnet" field in favor of the more
+   generic "chain" (which has been present for years).
+
+ - A new RPC command `preciousblock` has been added which marks a block as
+   precious. A precious block will be treated as if it were received earlier
+   than a competing block.
+
+ - A new RPC command `importmulti` has been added which receives an array of 
+   JSON objects representing the intention of importing a public key, a 
+   private key, an address and script/p2sh
+
+ - Use of `getrawtransaction` for retrieving confirmed transactions with unspent
+   outputs has been deprecated. For now this will still work, but in the future
+   it may change to only be able to retrieve information about transactions in
+   the mempool or if `txindex` is enabled.
+
+ - A new RPC command `getmemoryinfo` has been added which will return information
+   about the memory usage of Bitcoin Core. This was added in conjunction with
+   optimizations to memory management. See [Pull #8753](https://github.com/bitcoin/bitcoin/pull/8753)
+   for more information.
+
+HTTP REST Changes
+-----------------
+
+ - UTXO set query (`GET /rest/getutxos/<checkmempool>/<txid>-<n>/<txid>-<n>
+   /.../<txid>-<n>.<bin|hex|json>`) responses were changed to return status 
+   code `HTTP_BAD_REQUEST` (400) instead of `HTTP_INTERNAL_SERVER_ERROR` (500)
+   when requests contain invalid parameters.
+
+Minimum Fee Rate Policies
+-------------------------
+
+Since the changes in 0.12 to automatically limit the size of the mempool and improve the performance of block creation in mining code it has not been important for relay nodes or miners to set `-minrelaytxfee`. With this release the following concepts that were tied to this option have been separated out:
+- incremental relay fee used for calculating BIP 125 replacement and mempool limiting. (1000 satoshis/kB)
+- calculation of threshold for a dust output. (effectively 3 * 1000 satoshis/kB)
+- minimum fee rate of a package of transactions to be included in a block created by the mining code. If miners wish to set this minimum they can use the new `-blockmintxfee` option.  (defaults to 1000 satoshis/kB)
+
+The `-minrelaytxfee` option continues to exist but is recommended to be left unset.
 
 Fee Estimation Changes
 ----------------------
 
 - Since 0.13.2 fee estimation for a confirmation target of 1 block has been
-  disabled. This is only a minor behavior change as there was often insufficient
+  disabled. The fee slider will no longer be able to choose a target of 1 block.
+  This is only a minor behavior change as there was often insufficient
   data for this target anyway. `estimatefee 1` will now always return -1 and
   `estimatesmartfee 1` will start searching at a target of 2.
 
@@ -52,7 +256,7 @@ Fee Estimation Changes
   (previously 25) and for RPC calls (previously 2).
 
 Removal of Priority Estimation
--------------------------------
+------------------------------
 
 - Estimation of "priority" needed for a transaction to be included within a target
   number of blocks has been removed.  The rpc calls are deprecated and will either
@@ -61,42 +265,20 @@ Removal of Priority Estimation
   converted to the new format which is not readable by prior versions of the
   software.
 
-- The concept of "priority" (coin age) transactions is planned to be removed in
-  the next major version. To prepare for this, the default for the rate limit of
-  priority transactions (`-limitfreerelay`) has been set to `0` kB/minute. This
-  is not to be confused with the `prioritisetransaction` RPC which will remain
-  supported for adding fee deltas to transactions.
+- Support for "priority" (coin age) transaction sorting for mining is
+  considered deprecated in Core and will be removed in the next major version.
+  This is not to be confused with the `prioritisetransaction` RPC which will remain
+  supported by Core for adding fee deltas to transactions.
 
 P2P connection management
 --------------------------
 
-- Peers manually added through the addnode option or addnode RPC now have their own
+- Peers manually added through the `-addnode` option or `addnode` RPC now have their own
   limit of eight connections which does not compete with other inbound or outbound
-  connection usage and is not subject to the maxconnections limitation.
-
-- New connections to manually added peers are much faster.
-
-Introduction of assumed-valid blocks
--------------------------------------
+  connection usage and is not subject to the limitation imposed by the `-maxconnections`
+  option.
 
-- A significant portion of the initial block download time is spent verifying
-  scripts/signatures.  Although the verification must pass to ensure the security
-  of the system, no other result from this verification is needed: If the node
-  knew the history of a given block were valid it could skip checking scripts
-  for its ancestors.
-
-- A new configuration option 'assumevalid' is provided to express this knowledge
-  to the software.  Unlike the 'checkpoints' in the past this setting does not
-  force the use of a particular chain: chains that are consistent with it are
-  processed quicker, but other chains are still accepted if they'd otherwise
-  be chosen as best. Also unlike 'checkpoints' the user can configure which
-  block history is assumed true, this means that even outdated software can
-  sync more quickly if the setting is updated by the user.
-
-- Because the validity of a chain history is a simple objective fact it is much
-  easier to review this setting.  As a result the software ships with a default
-  value adjusted to match the current chain shortly before release.  The use
-  of this default value can be disabled by setting -assumevalid=0
+- New connections to manually added peers are performed more quickly.
 
 0.14.0 Change log
 =================
@@ -108,14 +290,6 @@ git merge commit are mentioned.
 
 ### RPC and REST
 
-UTXO set query (`GET /rest/getutxos/<checkmempool>/<txid>-<n>/<txid>-<n>/.../<txid>-<n>.<bin|hex|json>`) responses
-were changed to return status code HTTP_BAD_REQUEST (400) instead of HTTP_INTERNAL_SERVER_ERROR (500) when requests
-contain invalid parameters.
-
-The first boolean argument to `getaddednodeinfo` has been removed. This is an incompatible change.
-
-Call "getmininginfo" loses the "testnet" field in favor of the more generic "chain" (which has been present for years).
-
 ### Configuration and command-line options
 
 ### Block and transaction handling
@@ -128,16 +302,6 @@ Call "getmininginfo" loses the "testnet" field in favor of the more generic "cha
 
 ### Wallet
 
-0.14.0 Fundrawtransaction change address reuse
-==============================================
-
-Before 0.14, `fundrawtransaction` was by default wallet stateless. In almost all cases `fundrawtransaction` does add a change-output to the outputs of the funded transaction. Before 0.14, the used keypool key was never marked as change-address key and directly returned to the keypool (leading to address reuse).
-Before 0.14, calling `getnewaddress` directly after `fundrawtransaction` did generate the same address as the change-output address.
-
-Since 0.14, fundrawtransaction does reserve the change-output-key from the keypool by default (optional by setting  `reserveChangeKey`, default = `true`)
-
-Users should also consider using `getrawchangeaddress()` in conjunction with `fundrawtransaction`'s `changeAddress` option.
-
 ### GUI
 
 ### Tests

From 268c390d02d99a4a93a0a01221e273d2b9695ff7 Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Fri, 17 Feb 2017 18:21:18 +0100
Subject: [PATCH 1742/1802] doc: Update manpages for 0.14.0

---
 doc/man/bitcoin-cli.1 |  30 ++++++------
 doc/man/bitcoin-qt.1  | 107 +++++++++++++++++++++++++++---------------
 doc/man/bitcoin-tx.1  |  35 ++++++++++----
 doc/man/bitcoind.1    | 107 +++++++++++++++++++++++++++---------------
 4 files changed, 179 insertions(+), 100 deletions(-)

diff --git a/doc/man/bitcoin-cli.1 b/doc/man/bitcoin-cli.1
index 11b690cf856c0..844ec40a48582 100644
--- a/doc/man/bitcoin-cli.1
+++ b/doc/man/bitcoin-cli.1
@@ -1,19 +1,17 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.46.5.
-.TH BITCOIN-CLI "1" "September 2016" "bitcoin-cli v0.13.0.0" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.3.
+.TH BITCOIN-CLI "1" "February 2017" "bitcoin-cli v0.14.0.0" "User Commands"
 .SH NAME
-bitcoin-cli \- manual page for bitcoin-cli v0.13.0.0
+bitcoin-cli \- manual page for bitcoin-cli v0.14.0.0
 .SH DESCRIPTION
-Bitcoin Core RPC client version v0.13.0.0
+Bitcoin Core RPC client version v0.14.0.0\-dirty
 .SS "Usage:"
 .TP
 bitcoin\-cli [options] <command> [params]
 Send command to Bitcoin Core
-.TP
-bitcoin\-cli [options] help
-List commands
-.TP
-bitcoin\-cli [options] help <command>
-Get help for a command
+.IP
+bitcoin\-cli [options] \fB\-named\fR <command> [name=value] ... Send command to Bitcoin Core (with named arguments)
+bitcoin\-cli [options] help                List commands
+bitcoin\-cli [options] help <command>      Get help for a command
 .SH OPTIONS
 .HP
 \-?
@@ -40,6 +38,10 @@ Enter regression test mode, which uses a special chain in which blocks
 can be solved instantly. This is intended for regression testing
 tools and app development.
 .HP
+\fB\-named\fR
+.IP
+Pass named instead of positional arguments (default: false)
+.HP
 \fB\-rpcconnect=\fR<ip>
 .IP
 Send commands to node running on <ip> (default: 127.0.0.1)
@@ -69,7 +71,7 @@ Timeout during HTTP requests (default: 900)
 Read extra arguments from standard input, one per line until EOF/Ctrl\-D
 (recommended for sensitive information such as passphrases)
 .SH COPYRIGHT
-Copyright (C) 2009-2016 The Bitcoin Core developers
+Copyright (C) 2009-2017 The Bitcoin Core developers
 
 Please contribute if you find Bitcoin Core useful. Visit
 <https://bitcoincore.org> for further information about the software.
@@ -77,8 +79,8 @@ The source code is available from <https://github.com/bitcoin/bitcoin>.
 
 This is experimental software.
 Distributed under the MIT software license, see the accompanying file COPYING
-or <http://www.opensource.org/licenses/mit-license.php>.
+or <https://opensource.org/licenses/MIT>
 
 This product includes software developed by the OpenSSL Project for use in the
-OpenSSL Toolkit <https://www.openssl.org/> and cryptographic software written
-by Eric Young and UPnP software written by Thomas Bernard.
+OpenSSL Toolkit <https://www.openssl.org> and cryptographic software written by
+Eric Young and UPnP software written by Thomas Bernard.
diff --git a/doc/man/bitcoin-qt.1 b/doc/man/bitcoin-qt.1
index 2129a151e2de3..c1edae22b3601 100644
--- a/doc/man/bitcoin-qt.1
+++ b/doc/man/bitcoin-qt.1
@@ -1,9 +1,9 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.46.5.
-.TH BITCOIN-QT "1" "September 2016" "bitcoin-qt v0.13.0.0" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.3.
+.TH BITCOIN-QT "1" "February 2017" "bitcoin-qt v0.14.0.0" "User Commands"
 .SH NAME
-bitcoin-qt \- manual page for bitcoin-qt v0.13.0.0
+bitcoin-qt \- manual page for bitcoin-qt v0.14.0.0
 .SH DESCRIPTION
-Bitcoin Core version v0.13.0.0 (64\-bit)
+Bitcoin Core version v0.14.0.0\-dirty (64\-bit)
 Usage:
 .IP
 bitcoin\-qt [command\-line options]
@@ -27,13 +27,14 @@ long fork (%s in cmd is replaced by message)
 Execute command when the best block changes (%s in cmd is replaced by
 block hash)
 .HP
-\fB\-checkblocks=\fR<n>
+\fB\-assumevalid=\fR<hex>
 .IP
-How many blocks to check at startup (default: 288, 0 = all)
-.HP
-\fB\-checklevel=\fR<n>
-.IP
-How thorough the block verification of \fB\-checkblocks\fR is (0\-4, default: 3)
+If this block is in the chain assume that it and its ancestors are valid
+and potentially skip their script verification (0 to verify all,
+default:
+00000000000000000013176bf8d7dfeab4e1db31dc93bc311b436e82ab226b90,
+testnet:
+00000000000128796ee387cf110ccb9d2f36cffaf7f73079c995377c65ac0dcc)
 .HP
 \fB\-conf=\fR<file>
 .IP
@@ -62,11 +63,16 @@ Keep the transaction memory pool below <n> megabytes (default: 300)
 \fB\-mempoolexpiry=\fR<n>
 .IP
 Do not keep transactions in the mempool longer than <n> hours (default:
-72)
+336)
+.HP
+\fB\-blockreconstructionextratxn=\fR<n>
+.IP
+Extra transactions to keep in memory for compact block reconstructions
+(default: 100)
 .HP
 \fB\-par=\fR<n>
 .IP
-Set the number of script verification threads (\fB\-4\fR to 16, 0 = auto, <0 =
+Set the number of script verification threads (\fB\-6\fR to 16, 0 = auto, <0 =
 leave that many cores free, default: 0)
 .HP
 \fB\-pid=\fR<file>
@@ -75,13 +81,15 @@ Specify pid file (default: bitcoind.pid)
 .HP
 \fB\-prune=\fR<n>
 .IP
-Reduce storage requirements by enabling pruning (deleting) of old blocks.
-This allows the pruneblockchain RPC to be called to delete specific blocks,
-and enables automatic pruning of old blocks if a target size in MiB is
-provided. This mode is incompatible with \fB\-txindex\fR and \fB\-rescan\fR.
-Warning: Reverting this setting requires re\-downloading the entire blockchain.
-(default: 0 = disable pruning blocks, 1 = allow manual pruning via RPC, >550 =
-automatically prune block files to stay under the specified target size in MiB)
+Reduce storage requirements by enabling pruning (deleting) of old
+blocks. This allows the pruneblockchain RPC to be called to
+delete specific blocks, and enables automatic pruning of old
+blocks if a target size in MiB is provided. This mode is
+incompatible with \fB\-txindex\fR and \fB\-rescan\fR. Warning: Reverting this
+setting requires re\-downloading the entire blockchain. (default:
+0 = disable pruning blocks, 1 = allow manual pruning via RPC,
+>550 = automatically prune block files to stay under the
+specified target size in MiB)
 .HP
 \fB\-reindex\-chainstate\fR
 .IP
@@ -123,7 +131,8 @@ for IPv6
 .HP
 \fB\-connect=\fR<ip>
 .IP
-Connect only to the specified node(s)
+Connect only to the specified node(s); \fB\-noconnect\fR or \fB\-connect\fR=\fI\,0\/\fR alone to
+disable automatic connections
 .HP
 \fB\-discover\fR
 .IP
@@ -137,7 +146,7 @@ Allow DNS lookups for \fB\-addnode\fR, \fB\-seednode\fR and \fB\-connect\fR (def
 \fB\-dnsseed\fR
 .IP
 Query for peer addresses via DNS lookup, if low on addresses (default: 1
-unless \fB\-connect\fR)
+unless \fB\-connect\fR/\-noconnect)
 .HP
 \fB\-externalip=\fR<ip>
 .IP
@@ -149,7 +158,8 @@ Always query for peer addresses via DNS lookup (default: 0)
 .HP
 \fB\-listen\fR
 .IP
-Accept connections from outside (default: 1 if no \fB\-proxy\fR or \fB\-connect\fR)
+Accept connections from outside (default: 1 if no \fB\-proxy\fR or
+\fB\-connect\fR/\-noconnect)
 .HP
 \fB\-listenonion\fR
 .IP
@@ -204,6 +214,11 @@ Connect through SOCKS5 proxy
 Randomize credentials for every proxy connection. This enables Tor
 stream isolation (default: 1)
 .HP
+\fB\-rpcserialversion\fR
+.IP
+Sets the serialization of raw transaction or block hex returned in
+non\-verbose mode, non\-segwit(0) or segwit(1) (default: 1)
+.HP
 \fB\-seednode=\fR<ip>
 .IP
 Connect to a node to retrieve peer addresses, and disconnect
@@ -221,17 +236,22 @@ Tor control port to use if onion listening enabled (default:
 .IP
 Tor control port password (default: empty)
 .HP
+\fB\-upnp\fR
+.IP
+Use UPnP to map the listening port (default: 0)
+.HP
 \fB\-whitebind=\fR<addr>
 .IP
 Bind to given address and whitelist peers connecting to it. Use
 [host]:port notation for IPv6
 .HP
-\fB\-whitelist=\fR<netmask>
+\fB\-whitelist=\fR<IP address or network>
 .IP
-Whitelist peers connecting from the given netmask or IP address. Can be
-specified multiple times. Whitelisted peers cannot be DoS banned
-and their transactions are always relayed, even if they are
-already in the mempool, useful e.g. for a gateway
+Whitelist peers connecting from the given IP address (e.g. 1.2.3.4) or
+CIDR notated network (e.g. 1.2.3.0/24). Can be specified multiple
+times. Whitelisted peers cannot be DoS banned and their
+transactions are always relayed, even if they are already in the
+mempool, useful e.g. for a gateway
 .HP
 \fB\-whitelistrelay\fR
 .IP
@@ -240,7 +260,7 @@ not relaying transactions (default: 1)
 .HP
 \fB\-whitelistforcerelay\fR
 .IP
-Force relay of transactions from whitelisted peers even they violate
+Force relay of transactions from whitelisted peers even if they violate
 local relay policy (default: 1)
 .HP
 \fB\-maxuploadtarget=\fR<n>
@@ -287,13 +307,17 @@ Spend unconfirmed change when sending transactions (default: 1)
 \fB\-txconfirmtarget=\fR<n>
 .IP
 If paytxfee is not set, include enough fee so transactions begin
-confirmation on average within n blocks (default: 2)
+confirmation on average within n blocks (default: 6)
 .HP
 \fB\-usehd\fR
 .IP
 Use hierarchical deterministic key generation (HD) after BIP32. Only has
 effect during wallet creation/first start (default: 1)
 .HP
+\fB\-walletrbf\fR
+.IP
+Send transactions with full\-RBF opt\-in enabled (default: 0)
+.HP
 \fB\-upgradewallet\fR
 .IP
 Upgrade wallet to latest format on startup
@@ -347,9 +371,9 @@ Append comment to the user agent string
 Output debugging information (default: 0, supplying <category> is
 optional). If <category> is not supplied or if <category> = 1,
 output all debugging information.<category> can be: addrman,
-alert, bench, coindb, db, http, libevent, lock, mempool,
-mempoolrej, net, proxy, prune, rand, reindex, rpc, selectcoins,
-tor, zmq, qt.
+alert, bench, cmpctblock, coindb, db, http, libevent, lock,
+mempool, mempoolrej, net, proxy, prune, rand, reindex, rpc,
+selectcoins, tor, zmq, qt.
 .HP
 \fB\-help\-debug\fR
 .IP
@@ -422,6 +446,11 @@ Set maximum block size in bytes (default: 750000)
 .IP
 Set maximum size of high\-priority/low\-fee transactions in bytes
 (default: 0)
+.HP
+\fB\-blockmintxfee=\fR<amt>
+.IP
+Set lowest fee rate (in BTC/kB) for transactions to be included in block
+creation. (default: 0.00001)
 .PP
 RPC server options:
 .HP
@@ -455,8 +484,10 @@ Password for JSON\-RPC connections
 .IP
 Username and hashed password for JSON\-RPC connections. The field
 <userpw> comes in the format: <USERNAME>:<SALT>$<HASH>. A
-canonical python script is included in share/rpcuser. This option
-can be specified multiple times
+canonical python script is included in share/rpcuser. The client
+then connects normally using the
+rpcuser=<USERNAME>/rpcpassword=<PASSWORD> pair of arguments. This
+option can be specified multiple times
 .HP
 \fB\-rpcport=\fR<port>
 .IP
@@ -500,7 +531,7 @@ Show splash screen on startup (default: 1)
 .IP
 Reset all settings changed in the GUI
 .SH COPYRIGHT
-Copyright (C) 2009-2016 The Bitcoin Core developers
+Copyright (C) 2009-2017 The Bitcoin Core developers
 
 Please contribute if you find Bitcoin Core useful. Visit
 <https://bitcoincore.org> for further information about the software.
@@ -508,8 +539,8 @@ The source code is available from <https://github.com/bitcoin/bitcoin>.
 
 This is experimental software.
 Distributed under the MIT software license, see the accompanying file COPYING
-or <http://www.opensource.org/licenses/mit-license.php>.
+or <https://opensource.org/licenses/MIT>
 
 This product includes software developed by the OpenSSL Project for use in the
-OpenSSL Toolkit <https://www.openssl.org/> and cryptographic software written
-by Eric Young and UPnP software written by Thomas Bernard.
+OpenSSL Toolkit <https://www.openssl.org> and cryptographic software written by
+Eric Young and UPnP software written by Thomas Bernard.
diff --git a/doc/man/bitcoin-tx.1 b/doc/man/bitcoin-tx.1
index 5c4e31e7f7922..73d4e4b794253 100644
--- a/doc/man/bitcoin-tx.1
+++ b/doc/man/bitcoin-tx.1
@@ -1,9 +1,9 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.46.5.
-.TH BITCOIN-TX "1" "September 2016" "bitcoin-tx v0.13.0.0" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.3.
+.TH BITCOIN-TX "1" "February 2017" "bitcoin-tx v0.14.0.0" "User Commands"
 .SH NAME
-bitcoin-tx \- manual page for bitcoin-tx v0.13.0.0
+bitcoin-tx \- manual page for bitcoin-tx v0.14.0.0
 .SH DESCRIPTION
-Bitcoin Core bitcoin\-tx utility version v0.13.0.0
+Bitcoin Core bitcoin\-tx utility version v0.14.0.0\-dirty
 .SS "Usage:"
 .TP
 bitcoin\-tx [options] <hex\-tx> [commands]
@@ -67,13 +67,28 @@ outaddr=VALUE:ADDRESS
 .IP
 Add address\-based output to TX
 .IP
+outpubkey=VALUE:PUBKEY[:FLAGS]
+.IP
+Add pay\-to\-pubkey output to TX. Optionally add the "W" flag to produce a
+pay\-to\-witness\-pubkey\-hash output. Optionally add the "S" flag to
+wrap the output in a pay\-to\-script\-hash.
+.IP
 outdata=[VALUE:]DATA
 .IP
 Add data\-based output to TX
 .IP
-outscript=VALUE:SCRIPT
+outscript=VALUE:SCRIPT[:FLAGS]
+.IP
+Add raw script output to TX. Optionally add the "W" flag to produce a
+pay\-to\-witness\-script\-hash output. Optionally add the "S" flag to
+wrap the output in a pay\-to\-script\-hash.
+.IP
+outmultisig=VALUE:REQUIRED:PUBKEYS:PUBKEY1:PUBKEY2:....[:FLAGS]
 .IP
-Add raw script output to TX
+Add Pay To n\-of\-m Multi\-sig output to TX. n = REQUIRED, m = PUBKEYS.
+Optionally add the "W" flag to produce a
+pay\-to\-witness\-script\-hash output. Optionally add the "S" flag to
+wrap the output in a pay\-to\-script\-hash.
 .IP
 sign=SIGHASH\-FLAGS
 .IP
@@ -92,7 +107,7 @@ set=NAME:JSON\-STRING
 .IP
 Set register NAME to given JSON\-STRING
 .SH COPYRIGHT
-Copyright (C) 2009-2016 The Bitcoin Core developers
+Copyright (C) 2009-2017 The Bitcoin Core developers
 
 Please contribute if you find Bitcoin Core useful. Visit
 <https://bitcoincore.org> for further information about the software.
@@ -100,8 +115,8 @@ The source code is available from <https://github.com/bitcoin/bitcoin>.
 
 This is experimental software.
 Distributed under the MIT software license, see the accompanying file COPYING
-or <http://www.opensource.org/licenses/mit-license.php>.
+or <https://opensource.org/licenses/MIT>
 
 This product includes software developed by the OpenSSL Project for use in the
-OpenSSL Toolkit <https://www.openssl.org/> and cryptographic software written
-by Eric Young and UPnP software written by Thomas Bernard.
+OpenSSL Toolkit <https://www.openssl.org> and cryptographic software written by
+Eric Young and UPnP software written by Thomas Bernard.
diff --git a/doc/man/bitcoind.1 b/doc/man/bitcoind.1
index 47539d81319eb..e8c68c18edde6 100644
--- a/doc/man/bitcoind.1
+++ b/doc/man/bitcoind.1
@@ -1,9 +1,9 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.46.5.
-.TH BITCOIND "1" "September 2016" "bitcoind v0.13.0.0" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.3.
+.TH BITCOIND "1" "February 2017" "bitcoind v0.14.0.0" "User Commands"
 .SH NAME
-bitcoind \- manual page for bitcoind v0.13.0.0
+bitcoind \- manual page for bitcoind v0.14.0.0
 .SH DESCRIPTION
-Bitcoin Core Daemon version v0.13.0.0
+Bitcoin Core Daemon version v0.14.0.0\-dirty
 .SS "Usage:"
 .TP
 bitcoind [options]
@@ -28,13 +28,14 @@ long fork (%s in cmd is replaced by message)
 Execute command when the best block changes (%s in cmd is replaced by
 block hash)
 .HP
-\fB\-checkblocks=\fR<n>
+\fB\-assumevalid=\fR<hex>
 .IP
-How many blocks to check at startup (default: 288, 0 = all)
-.HP
-\fB\-checklevel=\fR<n>
-.IP
-How thorough the block verification of \fB\-checkblocks\fR is (0\-4, default: 3)
+If this block is in the chain assume that it and its ancestors are valid
+and potentially skip their script verification (0 to verify all,
+default:
+00000000000000000013176bf8d7dfeab4e1db31dc93bc311b436e82ab226b90,
+testnet:
+00000000000128796ee387cf110ccb9d2f36cffaf7f73079c995377c65ac0dcc)
 .HP
 \fB\-conf=\fR<file>
 .IP
@@ -67,11 +68,16 @@ Keep the transaction memory pool below <n> megabytes (default: 300)
 \fB\-mempoolexpiry=\fR<n>
 .IP
 Do not keep transactions in the mempool longer than <n> hours (default:
-72)
+336)
+.HP
+\fB\-blockreconstructionextratxn=\fR<n>
+.IP
+Extra transactions to keep in memory for compact block reconstructions
+(default: 100)
 .HP
 \fB\-par=\fR<n>
 .IP
-Set the number of script verification threads (\fB\-4\fR to 16, 0 = auto, <0 =
+Set the number of script verification threads (\fB\-6\fR to 16, 0 = auto, <0 =
 leave that many cores free, default: 0)
 .HP
 \fB\-pid=\fR<file>
@@ -80,13 +86,15 @@ Specify pid file (default: bitcoind.pid)
 .HP
 \fB\-prune=\fR<n>
 .IP
-Reduce storage requirements by enabling pruning (deleting) of old blocks.
-This allows the pruneblockchain RPC to be called to delete specific blocks,
-and enables automatic pruning of old blocks if a target size in MiB is
-provided. This mode is incompatible with \fB\-txindex\fR and \fB\-rescan\fR.
-Warning: Reverting this setting requires re\-downloading the entire blockchain.
-(default: 0 = disable pruning blocks, 1 = allow manual pruning via RPC, >550 =
-automatically prune block files to stay under the specified target size in MiB)
+Reduce storage requirements by enabling pruning (deleting) of old
+blocks. This allows the pruneblockchain RPC to be called to
+delete specific blocks, and enables automatic pruning of old
+blocks if a target size in MiB is provided. This mode is
+incompatible with \fB\-txindex\fR and \fB\-rescan\fR. Warning: Reverting this
+setting requires re\-downloading the entire blockchain. (default:
+0 = disable pruning blocks, 1 = allow manual pruning via RPC,
+>550 = automatically prune block files to stay under the
+specified target size in MiB)
 .HP
 \fB\-reindex\-chainstate\fR
 .IP
@@ -128,7 +136,8 @@ for IPv6
 .HP
 \fB\-connect=\fR<ip>
 .IP
-Connect only to the specified node(s)
+Connect only to the specified node(s); \fB\-noconnect\fR or \fB\-connect\fR=\fI\,0\/\fR alone to
+disable automatic connections
 .HP
 \fB\-discover\fR
 .IP
@@ -142,7 +151,7 @@ Allow DNS lookups for \fB\-addnode\fR, \fB\-seednode\fR and \fB\-connect\fR (def
 \fB\-dnsseed\fR
 .IP
 Query for peer addresses via DNS lookup, if low on addresses (default: 1
-unless \fB\-connect\fR)
+unless \fB\-connect\fR/\-noconnect)
 .HP
 \fB\-externalip=\fR<ip>
 .IP
@@ -154,7 +163,8 @@ Always query for peer addresses via DNS lookup (default: 0)
 .HP
 \fB\-listen\fR
 .IP
-Accept connections from outside (default: 1 if no \fB\-proxy\fR or \fB\-connect\fR)
+Accept connections from outside (default: 1 if no \fB\-proxy\fR or
+\fB\-connect\fR/\-noconnect)
 .HP
 \fB\-listenonion\fR
 .IP
@@ -209,6 +219,11 @@ Connect through SOCKS5 proxy
 Randomize credentials for every proxy connection. This enables Tor
 stream isolation (default: 1)
 .HP
+\fB\-rpcserialversion\fR
+.IP
+Sets the serialization of raw transaction or block hex returned in
+non\-verbose mode, non\-segwit(0) or segwit(1) (default: 1)
+.HP
 \fB\-seednode=\fR<ip>
 .IP
 Connect to a node to retrieve peer addresses, and disconnect
@@ -226,17 +241,22 @@ Tor control port to use if onion listening enabled (default:
 .IP
 Tor control port password (default: empty)
 .HP
+\fB\-upnp\fR
+.IP
+Use UPnP to map the listening port (default: 0)
+.HP
 \fB\-whitebind=\fR<addr>
 .IP
 Bind to given address and whitelist peers connecting to it. Use
 [host]:port notation for IPv6
 .HP
-\fB\-whitelist=\fR<netmask>
+\fB\-whitelist=\fR<IP address or network>
 .IP
-Whitelist peers connecting from the given netmask or IP address. Can be
-specified multiple times. Whitelisted peers cannot be DoS banned
-and their transactions are always relayed, even if they are
-already in the mempool, useful e.g. for a gateway
+Whitelist peers connecting from the given IP address (e.g. 1.2.3.4) or
+CIDR notated network (e.g. 1.2.3.0/24). Can be specified multiple
+times. Whitelisted peers cannot be DoS banned and their
+transactions are always relayed, even if they are already in the
+mempool, useful e.g. for a gateway
 .HP
 \fB\-whitelistrelay\fR
 .IP
@@ -245,7 +265,7 @@ not relaying transactions (default: 1)
 .HP
 \fB\-whitelistforcerelay\fR
 .IP
-Force relay of transactions from whitelisted peers even they violate
+Force relay of transactions from whitelisted peers even if they violate
 local relay policy (default: 1)
 .HP
 \fB\-maxuploadtarget=\fR<n>
@@ -292,13 +312,17 @@ Spend unconfirmed change when sending transactions (default: 1)
 \fB\-txconfirmtarget=\fR<n>
 .IP
 If paytxfee is not set, include enough fee so transactions begin
-confirmation on average within n blocks (default: 2)
+confirmation on average within n blocks (default: 6)
 .HP
 \fB\-usehd\fR
 .IP
 Use hierarchical deterministic key generation (HD) after BIP32. Only has
 effect during wallet creation/first start (default: 1)
 .HP
+\fB\-walletrbf\fR
+.IP
+Send transactions with full\-RBF opt\-in enabled (default: 0)
+.HP
 \fB\-upgradewallet\fR
 .IP
 Upgrade wallet to latest format on startup
@@ -352,9 +376,9 @@ Append comment to the user agent string
 Output debugging information (default: 0, supplying <category> is
 optional). If <category> is not supplied or if <category> = 1,
 output all debugging information.<category> can be: addrman,
-alert, bench, coindb, db, http, libevent, lock, mempool,
-mempoolrej, net, proxy, prune, rand, reindex, rpc, selectcoins,
-tor, zmq.
+alert, bench, cmpctblock, coindb, db, http, libevent, lock,
+mempool, mempoolrej, net, proxy, prune, rand, reindex, rpc,
+selectcoins, tor, zmq.
 .HP
 \fB\-help\-debug\fR
 .IP
@@ -427,6 +451,11 @@ Set maximum block size in bytes (default: 750000)
 .IP
 Set maximum size of high\-priority/low\-fee transactions in bytes
 (default: 0)
+.HP
+\fB\-blockmintxfee=\fR<amt>
+.IP
+Set lowest fee rate (in BTC/kB) for transactions to be included in block
+creation. (default: 0.00001)
 .PP
 RPC server options:
 .HP
@@ -460,8 +489,10 @@ Password for JSON\-RPC connections
 .IP
 Username and hashed password for JSON\-RPC connections. The field
 <userpw> comes in the format: <USERNAME>:<SALT>$<HASH>. A
-canonical python script is included in share/rpcuser. This option
-can be specified multiple times
+canonical python script is included in share/rpcuser. The client
+then connects normally using the
+rpcuser=<USERNAME>/rpcpassword=<PASSWORD> pair of arguments. This
+option can be specified multiple times
 .HP
 \fB\-rpcport=\fR<port>
 .IP
@@ -479,7 +510,7 @@ option can be specified multiple times
 .IP
 Set the number of threads to service RPC calls (default: 4)
 .SH COPYRIGHT
-Copyright (C) 2009-2016 The Bitcoin Core developers
+Copyright (C) 2009-2017 The Bitcoin Core developers
 
 Please contribute if you find Bitcoin Core useful. Visit
 <https://bitcoincore.org> for further information about the software.
@@ -487,8 +518,8 @@ The source code is available from <https://github.com/bitcoin/bitcoin>.
 
 This is experimental software.
 Distributed under the MIT software license, see the accompanying file COPYING
-or <http://www.opensource.org/licenses/mit-license.php>.
+or <https://opensource.org/licenses/MIT>
 
 This product includes software developed by the OpenSSL Project for use in the
-OpenSSL Toolkit <https://www.openssl.org/> and cryptographic software written
-by Eric Young and UPnP software written by Thomas Bernard.
+OpenSSL Toolkit <https://www.openssl.org> and cryptographic software written by
+Eric Young and UPnP software written by Thomas Bernard.

From 42f5f212873acaf2e8af40e81cd5dc26bd18ff34 Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Fri, 17 Feb 2017 12:48:04 -0500
Subject: [PATCH 1743/1802] release: bump gitian descriptors for a new 0.14
 package cache

---
 contrib/gitian-descriptors/gitian-linux.yml | 2 +-
 contrib/gitian-descriptors/gitian-osx.yml   | 2 +-
 contrib/gitian-descriptors/gitian-win.yml   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/contrib/gitian-descriptors/gitian-linux.yml b/contrib/gitian-descriptors/gitian-linux.yml
index 6f43119ba24e6..b126f83fee775 100644
--- a/contrib/gitian-descriptors/gitian-linux.yml
+++ b/contrib/gitian-descriptors/gitian-linux.yml
@@ -1,5 +1,5 @@
 ---
-name: "bitcoin-linux-0.13"
+name: "bitcoin-linux-0.14"
 enable_cache: true
 suites:
 - "trusty"
diff --git a/contrib/gitian-descriptors/gitian-osx.yml b/contrib/gitian-descriptors/gitian-osx.yml
index 991976d59eaa0..77381b861986c 100644
--- a/contrib/gitian-descriptors/gitian-osx.yml
+++ b/contrib/gitian-descriptors/gitian-osx.yml
@@ -1,5 +1,5 @@
 ---
-name: "bitcoin-osx-0.13"
+name: "bitcoin-osx-0.14"
 enable_cache: true
 suites:
 - "trusty"
diff --git a/contrib/gitian-descriptors/gitian-win.yml b/contrib/gitian-descriptors/gitian-win.yml
index fe01b5b95726a..0bb4f23bfe3dd 100644
--- a/contrib/gitian-descriptors/gitian-win.yml
+++ b/contrib/gitian-descriptors/gitian-win.yml
@@ -1,5 +1,5 @@
 ---
-name: "bitcoin-win-0.13"
+name: "bitcoin-win-0.14"
 enable_cache: true
 suites:
 - "trusty"

From 871e19ac84ae71b3d22928d5cb3bbf4f0f013b07 Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Fri, 17 Feb 2017 19:27:35 +0100
Subject: [PATCH 1744/1802] doc: Add list of authors to release notes

Generated from git, so there may be duplicate authors
if someone used multiple mail addresses.
---
 doc/release-notes.md | 100 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 100 insertions(+)

diff --git a/doc/release-notes.md b/doc/release-notes.md
index f83b0ce8fc9df..5d14c99dece29 100644
--- a/doc/release-notes.md
+++ b/doc/release-notes.md
@@ -313,5 +313,105 @@ Credits
 
 Thanks to everyone who directly contributed to this release:
 
+- accraze
+- adlawren
+- Alex Morcos
+- Alexey Vesnin
+- Amir Abrams
+- Anders Øyvind Urke-Sætre
+- Anditto Heristyo
+- Andrew Chow
+- anduck
+- Anthony Towns
+- Brian Deery
+- BtcDrak
+- Chris Moore
+- Chris Stewart
+- Christian Barcenas
+- Christian Decker
+- Cory Fields
+- crowning-
+- CryptAxe
+- CryptoVote
+- Dagur Valberg Johannsson
+- Daniel Cousens
+- Daniel Kraft
+- Derek Miller
+- djpnewton
+- Don Patterson
+- Doug
+- Douglas Roark
+- Ethan Heilman
+- fsb4000
+- Gaurav Rana
+- Geoffrey Tsui
+- Greg Walker
+- Gregory Maxwell
+- Gregory Sanders
+- Hampus Sjöberg
+- instagibbs
+- isle2983
+- Ivo van der Sangen
+- James White
+- Jameson Lopp
+- Jeremy Rubin
+- Jiaxing Wang
+- jnewbery
+- John Newbery
+- Johnson Lau
+- Jon Lund Steffensen
+- Jonas Schnelli
+- jonnynewbs
+- Jorge Timón
+- Justin Camarena
+- Karl-Johan Alm
+- Kaz Wesley
+- Koki Takahashi
+- Lauda
+- leijurv
+- lizhi
+- Luke Dashjr
+- maiiz
+- MarcoFalke
+- Marty Jones
+- Masahiko Hyuga
+- Matt Corallo
+- Matthew King
+- matthias
+- Micha
+- Michael Ford
+- Michael Rotarius
+- Mitchell Cash
+- mrbandrews
+- mruddy
+- Nicolas DORIER
+- NicolasDorier
+- nomnombtc
+- Patrick Strateman
+- Pavel Janík
+- Pedro Branco
+- Peter Todd
+- Pieter Wuille
+- poole\_party
+- practicalswift
+- R E Broadley
+- randy-waterhouse
+- Richard Kiss
+- Robert McLaughlin
+- rodasmith
+- Russell Yanofsky
+- S. Matthew English
+- Sev
+- Spencer Lievens
+- Stanislas Marion
+- Steven
+- Suhas Daftuar
+- Thomas Snider
+- UdjinM6
+- unsystemizer
+- whythat
+- Will Binns
+- Wladimir J. van der Laan
+- wodry
 
 As well as everyone that helped translating on [Transifex](https://www.transifex.com/projects/p/bitcoin/).

From 1577f0731a7bf0b9486ccf757cae4e0d4f478279 Mon Sep 17 00:00:00 2001
From: Gregory Maxwell <greg@xiph.org>
Date: Fri, 17 Feb 2017 18:50:01 +0000
Subject: [PATCH 1745/1802] Restore removed release notes.

---
 doc/release-notes.md | 40 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/doc/release-notes.md b/doc/release-notes.md
index 5d14c99dece29..c23f7ff0c1482 100644
--- a/doc/release-notes.md
+++ b/doc/release-notes.md
@@ -280,6 +280,46 @@ P2P connection management
 
 - New connections to manually added peers are performed more quickly.
 
+Introduction of assumed-valid blocks
+-------------------------------------
+
+- A significant portion of the initial block download time is spent verifying
+  scripts/signatures.  Although the verification must pass to ensure the security
+  of the system, no other result from this verification is needed: If the node
+  knew the history of a given block were valid it could skip checking scripts
+  for its ancestors.
+
+- A new configuration option 'assumevalid' is provided to express this knowledge
+  to the software.  Unlike the 'checkpoints' in the past this setting does not
+  force the use of a particular chain: chains that are consistent with it are
+  processed quicker, but other chains are still accepted if they'd otherwise
+  be chosen as best. Also unlike 'checkpoints' the user can configure which
+  block history is assumed true, this means that even outdated software can
+  sync more quickly if the setting is updated by the user.
+
+- Because the validity of a chain history is a simple objective fact it is much
+  easier to review this setting.  As a result the software ships with a default
+  value adjusted to match the current chain shortly before release.  The use
+  of this default value can be disabled by setting -assumevalid=0
+
+Fundrawtransaction change address reuse
+----------------------------------------
+
+- Before 0.14, `fundrawtransaction` was by default wallet stateless. In
+  almost all cases `fundrawtransaction` does add a change-output to the
+  outputs of the funded transaction. Before 0.14, the used keypool key was
+  never marked as change-address key and directly returned to the keypool
+  (leading to address reuse).  Before 0.14, calling `getnewaddress`
+  directly after `fundrawtransaction` did generate the same address as
+  the change-output address.
+
+- Since 0.14, fundrawtransaction does reserve the change-output-key from
+  the keypool by default (optional by setting  `reserveChangeKey`, default =
+  `true`)
+
+- Users should also consider using `getrawchangeaddress()` in conjunction
+  with `fundrawtransaction`'s `changeAddress` option.
+
 0.14.0 Change log
 =================
 

From 618709141147f74771da0795cf0dccb47c606d24 Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Fri, 17 Feb 2017 21:44:05 +0100
Subject: [PATCH 1746/1802] doc: Add changelog for 0.14.0 to release notes

---
 doc/release-notes.md | 386 +++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 376 insertions(+), 10 deletions(-)

diff --git a/doc/release-notes.md b/doc/release-notes.md
index 5d14c99dece29..bae09c771488d 100644
--- a/doc/release-notes.md
+++ b/doc/release-notes.md
@@ -284,29 +284,395 @@ P2P connection management
 =================
 
 Detailed release notes follow. This overview includes changes that affect
-behavior, not code moves, refactors and string updates. For convenience in locating
-the code changes and accompanying discussion, both the pull request and
-git merge commit are mentioned.
-
-### RPC and REST
-
-### Configuration and command-line options
+behavior, not code moves, minor refactors and string updates. For convenience
+in locating the code changes and accompanying discussion, both the pull request
+and git merge commit are mentioned.
+
+### RPC and other APIs
+- #8421 `b77bb95` httpserver: drop boost dependency (theuni)
+- #8638 `f061415` rest.cpp: change `HTTP_INTERNAL_SERVER_ERROR` to `HTTP_BAD_REQUEST` (djpnewton)
+- #8272 `91990ee` Make the dummy argument to getaddednodeinfo optional (sipa)
+- #8722 `bb843ad` bitcoin-cli: More detailed error reporting (laanwj)
+- #6996 `7f71a3c` Add preciousblock RPC (sipa)
+- #8788 `97c7f73` Give RPC commands more information about the RPC request (jonasschnelli)
+- #7948 `5d2c8e5` Augment getblockchaininfo bip9\_softforks data (mruddy)
+- #8980 `0e22855` importmulti: Avoid using boost::variant::operator!=, which is only in newer boost versions (luke-jr)
+- #9087 `924de0b` Give more details when "generate" fails (jtimon)
+- #9025 `4d8558a` Getrawtransaction should take a bool for verbose (jnewbery)
+- #8811 `5754e03` Add support for JSON-RPC named arguments (laanwj)
+- #9520 `2456a83` Deprecate non-txindex getrawtransaction and better warning (sipa)
+- #9518 `a65ced1` Return height of last block pruned by pruneblockchain RPC (ryanofsky)
+- #9222 `7cb024e` Add 'subtractFeeFromAmount' option to 'fundrawtransaction' (dooglus)
+- #8456 `2ef52d3` Simplified `bumpfee` command (mrbandrews)
+- #9516 `727a798` Bug-fix: listsinceblock: use fork point as reference for blocks in reorg'd chains (kallewoof)
+- #9640 `7bfb770` Bumpfee: bugfixes for error handling and feerate calculation (sdaftuar)
+- #9673 `8d6447e` Set correct metadata on bumpfee wallet transactions (ryanofsky)
+- #9650 `40f7e27` Better handle invalid parameters to signrawtransaction (TheBlueMatt)
+- #9682 `edc9e63` Require timestamps for importmulti keys (ryanofsky)
+- #9108 `d8e8b06` Use importmulti timestamp when importing watch only keys (on top of #9682) (ryanofsky)
+- #9756 `7a93af8` Return error when importmulti called with invalid address (ryanofsky)
+- #9778 `ad168ef` Add two hour buffer to manual pruning (morcos)
+- #9761 `9828f9a` Use 2 hour grace period for key timestamps in importmulti rescans (ryanofsky)
+- #9474 `48d7e0d` Mark the minconf parameter to move as ignored (sipa)
 
 ### Block and transaction handling
+- #8391 `37d83bb` Consensus: Remove ISM (NicolasDorier)
+- #8365 `618c9dd` Treat high-sigop transactions as larger rather than rejecting them (sipa)
+- #8814 `14b7b3f` wallet, policy: ParameterInteraction: Don't allow 0 fee (MarcoFalke)
+- #8515 `9bdf526` A few mempool removal optimizations (sipa)
+- #8448 `101c642` Store mempool and prioritization data to disk (sipa)
+- #7730 `3c03dc2` Remove priority estimation (morcos)
+- #9111 `fb15610` Remove unused variable `UNLIKELY_PCT` from fees.h (fanquake)
+- #9133 `434e683` Unset fImporting for loading mempool (morcos)
+- #9179 `b9a87b4` Set `DEFAULT_LIMITFREERELAY` = 0 kB/minute (MarcoFalke)
+- #9239 `3fbf079` Disable fee estimates for 1-block target (morcos)
+- #7562 `1eef038` Bump transaction version default to 2 (btcdrak)
+- #9313,#9367 If we don't allow free txs, always send a fee filter (morcos)
+- #9346 `b99a093` Batch construct batches (sipa)
+- #9262 `5a70572` Prefer coins that have fewer ancestors, sanity check txn before ATMP (instagibbs)
+- #9288 `1ce7ede` Fix a bug if the min fee is 0 for FeeFilterRounder (morcos)
+- #9395 `0fc1c31` Add test for `-walletrejectlongchains` (morcos)
+- #9107 `7dac1e5` Safer modify new coins (morcos)
+- #9312 `a72f76c` Increase mempool expiry time to 2 weeks (morcos)
+- #8610 `c252685` Share unused mempool memory with coincache (sipa)
+- #9138 `f646275` Improve fee estimation (morcos)
+- #9408 `46b249e` Allow shutdown during LoadMempool, dump only when necessary (jonasschnelli)
+- #9310 `8c87f17` Assert FRESH validity in CCoinsViewCache::BatchWrite (ryanofsky)
+- #7871 `e2e624d` Manual block file pruning (mrbandrews)
+- #9507 `0595042` Fix use-after-free in CTxMemPool::removeConflicts() (sdaftuar)
+- #9380 `dd98f04` Separate different uses of minimum fees (morcos)
+- #9596 `71148b8` bugfix save feeDelta instead of priorityDelta in DumpMempool (morcos)
+- #9371 `4a1dc35` Notify on removal (morcos)
+- #9519 `9b4d267` Exclude RBF replacement txs from fee estimation (morcos)
+- #8606 `e2a1a1e` Fix some locks (sipa)
+- #8681 `6898213` Performance Regression Fix: Pre-Allocate txChanged vector (JeremyRubin)
+- #8223 `744d265` c++11: Use std::unique\_ptr for block creation (domob1812)
+- #9125 `7490ae8` Make CBlock a vector of shared\_ptr of CTransactions (sipa)
+- #8930 `93566e0` Move orphan processing to ActivateBestChain (TheBlueMatt)
+- #8580 `46904ee` Make CTransaction actually immutable (sipa)
+- #9240 `a1dcf2e` Remove txConflicted (morcos)
+- #8589 `e8cfe1e` Inline CTxInWitness inside CTxIn (sipa)
+- #9349 `2db4cbc` Make CScript (and prevector) c++11 movable (sipa)
+- #9252 `ce5c1f4` Release cs\_main before calling ProcessNewBlock, or processing headers (cmpctblock handling) (sdaftuar)
+- #9283 `869781c` A few more CTransactionRef optimizations (sipa)
+- #9499 `9c9af5a` Use recent-rejects, orphans, and recently-replaced txn for compact-block-reconstruction
 
 ### P2P protocol and network code
+- #8128 `1030fa7` Turn net structures into dumb storage classes (theuni)
+- #8282 `026c6ed` Feeler connections to increase online addrs in the tried table (EthanHeilman)
+- #8462 `53f8f22` Move AdvertiseLocal debug output to net category (Mirobit)
+- #8612 `84decb5` Check for compatibility with download in FindNextBlocksToDownload (sipa)
+- #8594 `5b2ea29` Do not add random inbound peers to addrman (gmaxwell)
+- #8085 `6423116` Begin encapsulation (theuni)
+- #8715 `881d7ea` only delete CConnman if it's been created (theuni)
+- #8707 `f07424a` Fix maxuploadtarget setting (theuni)
+- #8661 `d2e4655` Do not set an addr time penalty when a peer advertises itself (gmaxwell)
+- #8822 `9bc6a6b` Consistent checksum handling (laanwj)
+- #8936 `1230890` Report NodeId in misbehaving debug (rebroad)
+- #8968 `3cf496d` Don't hold cs\_main when calling ProcessNewBlock from a cmpctblock (TheBlueMatt)
+- #9002 `e1d1f57` Make connect=0 disable automatic outbound connections (gmaxwell)
+- #9050 `fcf61b8` Make a few values immutable, and use deterministic randomness for the localnonce (theuni)
+- #8969 `3665483` Decouple peer-processing-logic from block-connection-logic (#2) (TheBlueMatt)
+- #8708 `c8c572f` have CConnman handle message sending (theuni)
+- #8709 `1e50d22` Allow filterclear messages for enabling TX relay only (rebroad)
+- #9045 `9f554e0` Hash P2P messages as they are received instead of at process-time (TheBlueMatt)
+- #9026 `dc6b940` Fix handling of invalid compact blocks (sdaftuar)
+- #8996 `ab914a6` Network activity toggle (luke-jr)
+- #9131 `62af164` fNetworkActive is not protected by a lock, use an atomic (jonasschnelli)
+- #8872 `0c577f2` Remove block-request logic from INV message processing (TheBlueMatt)
+- #8690 `791b58d` Do not fully sort all nodes for addr relay (sipa)
+- #9128 `76fec09` Decouple CConnman and message serialization (theuni)
+- #9226 `3bf06e9` Remove fNetworkNode and pnodeLocalHost (gmaxwell)
+- #9352 `a7f7651` Attempt reconstruction from all compact block announcements (sdaftuar)
+- #9319 `a55716a` Break addnode out from the outbound connection limits (gmaxwell)
+- #9261 `2742568` Add unstored orphans with rejected parents to recentRejects (morcos)
+- #9441 `8b66bf7` Massive speedup. Net locks overhaul (theuni)
+- #9375 `3908fc4` Relay compact block messages prior to full block connection (TheBlueMatt)
+- #9400 `8a445c5` Set peers as HB peers upon full block validation (instagibbs)
+- #9561 `6696b46` Wake message handling thread when we receive a new block (TheBlueMatt)
+- #9535 `82274c0` Split CNode::cs\_vSend: message processing and message sending (TheBlueMatt)
+- #9606 `3f9f962` Consistently use GetTimeMicros() for inactivity checks (sdaftuar)
+- #9594 `fd70211` Send final alert message to older peers after connecting (gmaxwell)
+- #9626 `36966a1` Clean up a few CConnman cs\_vNodes/CNode things (TheBlueMatt)
+- #9609 `4966917` Fix remaining net assertions (theuni)
+- #9671 `7821db3` Fix super-unlikely race introduced in 236618061a445d2cb11e72 (TheBlueMatt)
+- #9730 `33f3b21` Remove bitseed.xf2.org form the dns seed list (jonasschnelli)
+- #9698 `2447c10` Fix socket close race (theuni)
+- #9708 `a06ede9` Clean up all known races/platform-specific UB at the time PR was opened (TheBlueMatt)
+- #9715 `b08656e` Disconnect peers which we do not receive VERACKs from within 60 sec (TheBlueMatt)
+- #9720 `e87ce95` Fix banning and disallow sending messages before receiving verack (theuni)
+- #9268 `09c4fd1` Fix rounding privacy leak introduced in #9260 (TheBlueMatt)
+- #9075 `9346f84` Decouple peer-processing-logic from block-connection-logic (#3) (TheBlueMatt)
+- #8688 `047ded0` Move static global randomizer seeds into CConnman (sipa)
+- #9289 `d9ae1ce` net: drop boost::thread\_group (theuni)
 
 ### Validation
+- #9014 `d04aeba` Fix block-connection performance regression (TheBlueMatt)
+- #9299 `d52ce89` Remove no longer needed check for premature v2 txs (morcos)
+- #9273 `b68685a` Remove unused `CDiskBlockPos*` argument from ProcessNewBlock (TheBlueMatt)
+- #8895 `b83264d` Better SigCache Implementation (JeremyRubin)
+- #9490 `e126d0c` Replace FindLatestBefore used by importmulti with FindEarliestAtLeast (gmaxwell)
+- #9484 `812714f` Introduce assumevalid setting to skip validation presumed valid scripts (gmaxwell)
+- #9511 `7884956` Don't overwrite validation state with corruption check (morcos)
+- #9765 `1e92e04` Harden against mistakes handling invalid blocks (sdaftuar)
+- #9779 `3c02b95` Update nMinimumChainWork and defaultAssumeValid (gmaxwell)
+- #8524 `19b0f33` Precompute sighashes (sipa)
 
 ### Build system
-
-### Wallet
+- #8238 `6caf3ee` ZeroMQ 4.1.5 && ZMQ on Windows (fanquake)
+- #8520 `b40e19c` Remove check for `openssl/ec.h` (laanwj)
+- #8617 `de07fdc` Include instructions to extract Mac OS X SDK on Linux using 7zip and SleuthKit (luke-jr)
+- #8566 `7b98895` Easy to use gitian building script (achow101)
+- #8604 `f256843` build,doc: Update for 0.13.0+ and OpenBSD 5.9 (laanwj)
+- #8640 `2663e51` depends: Remove Qt46 package (fanquake)
+- #8645 `8ea4440` Remove unused Qt 4.6 patch (droark)
+- #8608 `7e9ab95` Install manpages via make install, also add some autogenerated manpages (nomnombtc)
+- #8781 `ca69ef4` contrib: delete `qt_translations.py` (MarcoFalke)
+- #8783 `64dc645` share: remove qt/protobuf.pri (MarcoFalke)
+- #8423 `3166dff` depends: expat 2.2.0, ccache 3.3.1, fontconfig 2.12.1 (fanquake)
+- #8791 `b694b0d` travis: cross-mac: explicitly enable gui (MarcoFalke)
+- #8820 `dc64141` depends: Fix Qt compilation with Xcode 8 (fanquake)
+- #8730 `489a6ab` depends: Add libevent compatibility patch for windows (laanwj)
+- #8819 `c841816` depends: Boost 1.61.0 (fanquake)
+- #8826 `f560d95` Do not include `env_win.cc` on non-Windows systems (paveljanik)
+- #8948 `e077e00` Reorder Windows gitian build order to match Linux (Michagogo)
+- #8568 `078900d` new var `DIST_CONTRIB` adds useful things for packagers from contrib (nomnombtc)
+- #9114 `21e6c6b` depends: Set `OSX_MIN_VERSION` to 10.8 (fanquake)
+- #9140 `018a4eb` Bugfix: Correctly replace generated headers and fail cleanly (luke-jr)
+- #9156 `a8b2a82` Add compile and link options echo to configure (jonasschnelli)
+- #9393 `03d85f6` Include cuckoocache header in Makefile (MarcoFalke)
+- #9420 `bebe369` Fix linker error when configured with --enable-lcov (droark)
+- #9412 `53442af` Fix 'make deploy' for OSX (jonasschnelli)
+- #9475 `7014506` Let autoconf detect presence of `EVP_MD_CTX_new` (luke-jr)
+- #9513 `bbf193f` Fix qt distdir builds (theuni)
+- #9471 `ca615e6` depends: libevent 2.1.7rc (fanquake)
+- #9468 `f9117f2` depends: Dependency updates for 0.14.0 (fanquake)
+- #9469 `01c4576` depends: Qt 5.7.1 (fanquake)
+- #9574 `5ac6687` depends: Fix QT build on OSX (fanquake)
+- #9646 `720b579` depends: Fix cross build for qt5.7 (theuni)
+- #9705 `6a55515` Add options to override BDB cflags/libs (laanwj)
+- #8249 `4e1567a` Enable (and check for) 64-bit ASLR on Windows (laanwj)
+- #9758 `476cc47` Selectively suppress deprecation warnings (jonasschnelli)
+- #9783 `6d61a2b` release: bump gitian descriptors for a new 0.14 package cache (theuni)
 
 ### GUI
+- #8192 `c503863` Remove URLs from About dialog translations (fanquake)
+- #8540 `36404ae` Fix random segfault when closing "Choose data directory" dialog (laanwj)
+- #8517 `2468292` Show wallet HD state in statusbar (jonasschnelli)
+- #8463 `62a5a8a` Remove Priority from coincontrol dialog (MarcoFalke)
+- #7579 `0606f95` Show network/chain errors in the GUI (jonasschnelli)
+- #8583 `c19f8a4` Show XTHIN in GUI (rebroad)
+- #7783 `4335d5a` RPC-Console: support nested commands and simple value queries (jonasschnelli)
+- #8672 `6052d50` Show transaction size in transaction details window (Cocosoft)
+- #8777 `fec6af7` WalletModel: Expose disablewallet (MarcoFalke)
+- #8371 `24f72e9` Add out-of-sync modal info layer (jonasschnelli)
+- #8885 `b2fec4e` Fix ban from qt console (theuni)
+- #8821 `bf8e68a` sync-overlay: Don't block during reindex (MarcoFalke)
+- #8906 `088d1f4` sync-overlay: Don't show progress twice (MarcoFalke)
+- #8918 `47ace42` Add "Copy URI" to payment request context menu (luke-jr)
+- #8925 `f628d9a` Display minimum ping in debug window (rebroad)
+- #8774 `3e942a7` Qt refactors to better abstract wallet access (luke-jr)
+- #8985 `7b1bfa3` Use pindexBestHeader instead of setBlockIndexCandidates for NotifyHeaderTip() (jonasschnelli)
+- #8989 `d2143dc` Overhaul smart-fee slider, adjust default confirmation target (jonasschnelli)
+- #9043 `273bde3` Return useful error message on ATMP failure (MarcoFalke)
+- #9088 `4e57824` Reduce ambiguity of warning message (rebroad)
+- #8874 `e984730` Multiple Selection for peer and ban tables (achow101)
+- #9145 `924745d` Make network disabled icon 50% opaque (MarcoFalke)
+- #9130 `ac489b2` Mention the new network toggle functionality in the tooltip (paveljanik)
+- #9218 `4d955fc` Show progress overlay when clicking spinner icon (laanwj)
+- #9280 `e15660c` Show ModalOverlay by pressing the progress bar, allow hiding (jonasschnelli)
+- #9296 `fde7d99` Fix missed change to WalletTx structure (morcos)
+- #9266 `2044e37` Bugfix: Qt/RPCConsole: Put column enum in the right places (luke-jr)
+- #9255 `9851a84` layoutAboutToChange signal is called layoutAboutToBeChanged (laanwj)
+- #9330 `47e6a19` Console: add security warning (jonasschnelli)
+- #9329 `db45ad8` Console: allow empty arguments (jonasschnelli)
+- #8877 `6dc4c43` Qt RPC console: history sensitive-data filter, and saving input line when browsing history (luke-jr)
+- #9462 `649cf5f` Do not translate tilde character (MarcoFalke)
+- #9457 `123ea73` Select more files for translation (MarcoFalke)
+- #9413 `fd7d8c7` CoinControl: Allow non-wallet owned change addresses (jonasschnelli)
+- #9461 `b250686` Improve progress display during headers-sync and peer-finding (jonasschnelli)
+- #9588 `5086452` Use nPowTargetSpacing constant (MarcoFalke)
+- #9637 `d9e4d1d` Fix transaction details output-index to reflect vout index (jonasschnelli)
+- #9718 `36f9d3a` Qt/Intro: Various fixes (luke-jr)
+- #9735 `ec66d06` devtools: Handle Qt formatting characters edge-case in update-translations.py (laanwj)
+- #9755 `a441db0` Bugfix: Qt/Options: Restore persistent "restart required" notice (luke-jr)
 
-### Tests
+### Wallet
+- #8367 `045106b` Ensure <0.13 clients can't open HD wallets (jonasschnelli)
+- #8152 `b9c1cd8` Remove `CWalletDB*` parameter from CWallet::AddToWallet (pstratem)
+- #8432 `c7e05b3` Make CWallet::fFileBacked private (pstratem)
+- #8445 `f916700` Move CWallet::setKeyPool to private section of CWallet (pstratem)
+- #8564 `0168019` Remove unused code/conditions in ReadAtCursor (jonasschnelli)
+- #8601 `37ac678` Add option to opt into full-RBF when sending funds (rebase, original by petertodd) (laanwj)
+- #8494 `a5b20ed` init, wallet: ParameterInteraction() iff wallet enabled (MarcoFalke)
+- #8760 `02ac669` init: Get rid of some `ENABLE_WALLET` (MarcoFalke)
+- #8696 `a1f8d3e` Wallet: Remove last external reference to CWalletDB (pstratem)
+- #8768 `886e8c9` init: Get rid of fDisableWallet (MarcoFalke)
+- #8486 `ab0b411` Add high transaction fee warnings (MarcoFalke)
+- #8851 `940748b` Move key derivation logic from GenerateNewKey to DeriveNewChildKey (pstratem) (MarcoFalke)
+- #8287 `e10af96` Set fLimitFree = true (MarcoFalke)
+- #8928 `c587577` Fix init segfault where InitLoadWallet() calls ATMP before genesis (TheBlueMatt)
+- #7551 `f2d7056` Add importmulti RPC call (pedrobranco)
+- #9016 `0dcb888` Return useful error message on ATMP failure (instagibbs)
+- #8753 `f8723d2` Locked memory manager (laanwj)
+- #8828 `a4fd8df` Move CWalletDB::ReorderTransactions to CWallet (pstratem)
+- #8977 `6a1343f` Refactor wallet/init interaction (Reaccept wtx, flush thread) (jonasschnelli)
+- #9036 `ed0cc50` Change default confirm target from 2 to 6 (laanwj)
+- #9071 `d1871da` Declare wallet.h functions inline (sipa)
+- #9132 `f54e460` Make strWalletFile const (jonasschnelli)
+- #9141 `5ea5e04` Remove unnecessary calls to CheckFinalTx (jonasschnelli)
+- #9165 `c01f16a` SendMoney: use already-calculated balance (instagibbs)
+- #9311 `a336d13` Flush wallet after abandontransaction (morcos)
+- #8717 `38e4887` Addition of ImmatureCreditCached to MarkDirty() (spencerlievens)
+- #9446 `510c0d9` SetMerkleBranch: remove unused code, remove cs\_main lock requirement (jonasschnelli)
+- #8776 `2a524b8` Wallet refactoring leading up to multiwallet (luke-jr)
+- #9465 `a7d55c9` Do not perform ECDSA signing in the fee calculation inner loop (gmaxwell)
+- #9404 `12e3112` Smarter coordination of change and fee in CreateTransaction (morcos)
+- #9377 `fb75cd0` fundrawtransaction: Keep change-output keys by default, make it optional (jonasschnelli)
+- #9578 `923dc44` Add missing mempool lock for CalculateMemPoolAncestors (TheBlueMatt)
+- #9227 `02464da` Make nWalletDBUpdated atomic to avoid a potential race (pstratem)
+- #9764 `f8af89a` Prevent "overrides a member function but is not marked 'override'" warnings (laanwj)
+- #9771 `e43a585` Add missing cs\_wallet lock that triggers new lock held assertion (ryanofsky)
+- #9316 `3097ea4` Disable free transactions when relay is disabled (MarcoFalke)
+- #9615 `d2c9e4d` Wallet incremental fee (morcos)
+
+### Tests and QA
+- #8270 `6e5e5ab` Tests: Use portable #! in python scripts (/usr/bin/env) (ChoHag)
+- #8534,#8504 Remove java comparison tool (laanwj,MarcoFalke)
+- #8482 `740cff5` Use single cache dir for chains (MarcoFalke)
+- #8450 `21857d2` Replace `rpc_wallet_tests.cpp` with python RPC unit tests (pstratem)
+- #8671 `ddc3080` Minimal fix to slow prevector tests as stopgap measure (JeremyRubin)
+- #8680 `666eaf0` Address Travis spurious failures (theuni)
+- #8789 `e31a43c` pull-tester: Only print output when failed (MarcoFalke)
+- #8810 `14e8f99` tests: Add exception error message for JSONRPCException (laanwj)
+- #8830 `ef0801b` test: Add option to run bitcoin-util-test.py manually (jnewbery)
+- #8881 `e66cc1d` Add some verbose logging to bitcoin-util-test.py (jnewbery)
+- #8922 `0329511` Send segwit-encoded blocktxn messages in p2p-compactblocks (TheBlueMatt)
+- #8873 `74dc388` Add microbenchmarks to profile more code paths (ryanofsky)
+- #9032 `6a8be7b` test: Add format-dependent comparison to bctest (laanwj)
+- #9023 `774db92` Add logging to bitcoin-util-test.py (jnewbery)
+- #9065 `c9bdf9a` Merge `doc/unit-tests.md` into `src/test/README.md` (laanwj)
+- #9069 `ed64bce` Clean up bctest.py and bitcoin-util-test.py (jnewbery)
+- #9095 `b8f43e3` test: Fix test\_random includes (MarcoFalke)
+- #8894 `faec09b` Testing: Include fRelay in mininode version messages (jnewbery)
+- #9097 `e536499` Rework `sync_*` and preciousblock.py (MarcoFalke)
+- #9049 `71bc39e` Remove duplicatable duplicate-input check from CheckTransaction (TheBlueMatt)
+- #9136 `b422913` sync\_blocks cleanup (ryanofsky)
+- #9151 `4333b1c` proxy\_test: Calculate hardcoded port numbers (MarcoFalke)
+- #9206 `e662d28` Make test constant consistent with consensus.h (btcdrak)
+- #9139 `0de7fd3` Change sync\_blocks to pick smarter maxheight (on top of #9196) (ryanofsky)
+- #9100 `97ec6e5` tx\_valid: re-order inputs to how they are encoded (dcousens)
+- #9202 `e56cf67` bench: Add support for measuring CPU cycles (laanwj)
+- #9223 `5412c08` unification of Bloom filter representation (s-matthew-english)
+- #9257 `d7ba4a2` Dump debug logs on travis failures (sdaftuar)
+- #9221 `9e4bb31` Get rid of duplicate code (MarcoFalke)
+- #9274 `919db03` Use cached utxo set to fix performance regression (MarcoFalke)
+- #9276 `ea33f19` Some minor testing cleanups (morcos)
+- #9291 `8601784` Remove mapOrphanTransactionsByPrev from DoS\_tests (sipa)
+- #9309 `76fcd9d` Wallet needs to stay unlocked for whole test (morcos)
+- #9172 `5bc209c` Resurrect pstratem's "Simple fuzzing framework" (laanwj)
+- #9331 `c6fd923` Add test for rescan feature of wallet key import RPCs (ryanofsky)
+- #9354 `b416095` Make fuzzer actually test CTxOutCompressor (sipa)
+- #9390,#9416 travis: make distdir (MarcoFalke)
+- #9308 `0698639` test: Add CCoinsViewCache Access/Modify/Write tests (ryanofsky)
+- #9406 `0f921e6` Re-enable a blank v1 Tx JSON test (droark)
+- #9435 `dbc8a8c` Removed unused variable in test, fixing warning (ryanofsky)
+- #9436 `dce853e` test: Include tx data in `EXTRA_DIST` (MarcoFalke)
+- #9525 `02e5308` test: Include tx data in `EXTRA_DIST` (MarcoFalke)
+- #9498 `054d664` Basic CCheckQueue Benchmarks (JeremyRubin)
+- #9554 `0b96abc` test: Avoid potential NULL pointer dereference in `addrman_tests.cpp` (practicalswift)
+- #9628 `f895023` Increase a sync\_blocks timeout in pruning.py (sdaftuar)
+- #9638 `a7ea2f8` Actually test assertions in pruning.py (MarcoFalke)
+- #9647 `e99f0d7` Skip RAII event tests if libevent is built without `event_set_mem_functions` (luke-jr)
+- #9691 `fc67cd2` Init ECC context for `test_bitcoin_fuzzy` (gmaxwell)
+- #9712 `d304fef` bench: Fix initialization order in registration (laanwj)
+- #9707 `b860915` Fix RPC failure testing (jnewbery)
+- #8621 `e8ed6eb` contrib: python: Don't use shell=True (MarcoFalke)
+- #9269 `43e8150` Align struct COrphan definition (sipa)
+
+### Documentation
+- #8332 `806b9e7` Clarify witness branches in transaction.h serialization (dcousens)
+- #8935 `0306978` Documentation: Building on Windows with WSL (pooleja)
+- #9144 `c98f6b3` Correct waitforblockheight example help text (fanquake)
+- #9407 `041331e` Added missing colons in when running help command (anditto)
+- #9378 `870cd2b` Add documentation for CWalletTx::fFromMe member (ryanofsky)
+- #9297 `0b73807` Various RPC help outputs updated (Mirobit)
+- #9613 `07421cf` Clarify getbalance help string to explain interaction with bumpfee (ryanofsky)
+- #9663 `e30d928` Clarify listunspent amount description (instagibbs)
+- #9396 `d65a13b` Updated listsinceblock rpc documentation (accraze)
+- #8747 `ce43630` rpc: Fix transaction size comments and RPC help text (jnewbery)
+- #8058 `bbd9740` Doc: Add issue template (AmirAbrams)
+- #8567 `85d4e21` Add default port numbers to REST doc (djpnewton)
+- #8624 `89de153` build: Mention curl (MarcoFalke)
+- #8786 `9da7366` Mandatory copyright agreement (achow101)
+- #8823 `7b05af6` Add privacy recommendation when running hidden service (laanwj)
+- #9433 `caa2f10` Update the Windows build notes (droark)
+- #8879 `f928050` Rework docs (MarcoFalke)
+- #8887 `61d191f` Improve GitHub issue template (fanquake)
+- #8787 `279bbad` Add missing autogen to example builds (AmirAbrams)
+- #8892 `d270c30` Add build instructions for FreeBSD (laanwj)
+- #8890 `c71a654` Update Doxygen configuration file (fanquake)
+- #9207 `fa1f944` Move comments above bash command in build-unix (AmirAbrams)
+- #9219 `c4522e7` Improve windows build instructions using Linux subsystem (laanwj)
+- #8954 `932d02a` contrib: Add README for pgp keys (MarcoFalke)
+- #9093 `2fae5b9` release-process: Mention GitHub release and archived release notes (MarcoFalke)
+- #8743 `bae178f` Remove old manpages from contrib/debian in favour of doc/man (fanquake)
+- #9550 `4105cb6` Trim down the XP notice and say more about what we support (gmaxwell)
+- #9246 `9851498` Developer docs about existing subtrees (gmaxwell)
+- #9401 `c2ea1e6` Make rpcauth help message clearer, add example in example .conf (instagibbs)
+- #9022,#9033 Document dropping OS X 10.7 support (fanquake, MarcoFalke)
+- #8771 `bc9e3ab` contributing: Mention not to open several pulls (luke-jr)
+- #8852 `7b784cc` Mention Gitian building script in doc (Laudaa) (laanwj)
+- #8915 `03dd707` Add copyright/patent issues to possible NACK reasons (petertodd)
+- #8965 `23e03f8` Mention that PPA doesn't support Debian (anduck)
+- #9115 `bfc7aad` Mention reporting security issues responsibly (paveljanik)
 
 ### Miscellaneous
+- #8274 `7a2d402` util: Update tinyformat (laanwj)
+- #8291 `5cac8b1` util: CopyrightHolders: Check for untranslated substitution (MarcoFalke)
+- #8557 `44691f3` contrib: Rework verifybinaries (MarcoFalke)
+- #8813 `fb24d7e` bitcoind: Daemonize using daemon(3) (laanwj)
+- #9004 `67728a3` Clarify `listenonion` (unsystemizer)
+- #8674 `bae81b8` tools for analyzing, updating and adding copyright headers in source files (isle2983)
+- #8976 `8c6218a` libconsensus: Add input validation of flags (laanwj)
+- #9112 `46027e8` Avoid ugly exception in log on unknown inv type (laanwj)
+- #8837 `2108911` Allow bitcoin-tx to parse partial transactions (jnewbery)
+- #9204 `74ced54` Clarify CreateTransaction error messages (instagibbs)
+- #9265 `31bcc66` bitcoin-cli: Make error message less confusing (laanwj)
+- #9303 `72bf1b3` Update comments in ctaes (sipa)
+- #9417 `c4b7d4f` Do not evaluate hidden LogPrint arguments (sipa)
+- #9506 `593a00c` RFC: Improve style for if indentation (sipa)
+- #8883 `d5d4ad8` Add all standard TXO types to bitcoin-tx (jnewbery)
+- #9531 `23281a4` Release notes for estimation changes  (morcos)
+- #9486 `f62bc10` Make peer=%d log prints consistent (TheBlueMatt)
+- #9552 `41cb05c` Add IPv6 support to qos.sh (jamesmacwhite)
+- #9542 `e9e7993` Docs: Update CONTRIBUTING.md (jnewbery)
+- #9649 `53ab12d` Remove unused clang format dev script (MarcoFalke)
+- #9625 `77bd8c4` Increase minimum debug.log size to 10MB after shrink (morcos)
+- #9070 `7b22e50` Lockedpool fixes (kazcw)
+- #8779 `7008e28` contrib: Delete spendfrom (MarcoFalke)
+- #9587,#8793,#9496,#8191,#8109,#8655,#8472,#8677,#8981,#9124  Avoid shadowing of variables (paveljanik)
+- #9063 `f2a6e82` Use deprecated `MAP_ANON` if `MAP_ANONYMOUS` is not defined (paveljanik)
+- #9060 `1107653` Fix bloom filter init to isEmpty = true (robmcl4)
+- #8613 `613bda4` LevelDB 1.19 (sipa)
+- #9225 `5488514` Fix some benign races (TheBlueMatt)
+- #8736 `5fa7b07` base58: Improve DecodeBase58 performance (wjx)
+- #9039 `e81df49` Various serialization simplifcations and optimizations (sipa)
+- #9010 `a143b88` Split up AppInit2 into multiple phases, daemonize after datadir lock errors (laanwj)
+- #9230 `c79e52a` Fix some benign races in timestamp logging (TheBlueMatt)
+- #9183,#9260 Mrs Peacock in The Library with The Candlestick (killed main.{h,cpp}) (TheBlueMatt)
+- #9236 `7f72568` Fix races for strMiscWarning and `fLargeWork*Found`, make QT runawayException use GetWarnings (gmaxwell)
+- #9243 `7aa7004` Clean up mapArgs and mapMultiArgs Usage (TheBlueMatt)
+- #9387 `cfe41d7` RAII of libevent stuff using unique ptrs with deleters (kallewoof)
+- #9472 `fac0f30` Disentangle progress estimation from checkpoints and update it (sipa)
+- #9512 `6012967` Fix various things -fsanitize complains about (sipa)
+- #9373,#9580 Various linearization script issues (droark)
+- #9674 `dd163f5` Lock debugging: Always enforce strict lock ordering (try or not) (TheBlueMatt)
+- #8453,#9334  Update to latest libsecp256k1 (laanwj,sipa)
+- #9656 `7c93952` Check verify-commits on pushes to master (TheBlueMatt)
+- #9679 `a351162` Access WorkQueue::running only within the cs lock (TheBlueMatt)
+- #9777 `8dee822` Handle unusual maxsigcachesize gracefully (jnewbery)
+- #8863,#8807 univalue: Pull subtree (MarcoFalke)
 
 Credits
 =======

From f873564231d694b47e6e7e5430f4e0785a036664 Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Fri, 17 Feb 2017 11:41:45 -0800
Subject: [PATCH 1747/1802] Make KEY_SIZE a compile-time constant

Github-Pull: #9785
Rebased-From: 914fad155d9fc76b42b3a0414dd14b5ebc36062f
---
 src/httprpc.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/httprpc.cpp b/src/httprpc.cpp
index daac7a0f1a703..8ac6925acdac6 100644
--- a/src/httprpc.cpp
+++ b/src/httprpc.cpp
@@ -112,7 +112,7 @@ static bool multiUserAuthorized(std::string strUserPass)
             std::string strSalt = vFields[1];
             std::string strHash = vFields[2];
 
-            unsigned int KEY_SIZE = 32;
+            static const unsigned int KEY_SIZE = 32;
             unsigned char out[KEY_SIZE];
 
             CHMAC_SHA256(reinterpret_cast<const unsigned char*>(strSalt.c_str()), strSalt.size()).Write(reinterpret_cast<const unsigned char*>(strPass.c_str()), strPass.size()).Finalize(out);

From 973e345f7f71c7909e701afb35a8fd944dcc9970 Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Fri, 17 Feb 2017 11:54:32 -0800
Subject: [PATCH 1748/1802] Move BIP70_MAX_PAYMENTREQUEST_SIZE to header

Github-Pull: #9785
Rebased-From: c801c82e253dc4956069b6110f65b43f538dd5a1
---
 src/qt/paymentserver.cpp | 2 --
 src/qt/paymentserver.h   | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/qt/paymentserver.cpp b/src/qt/paymentserver.cpp
index 688e8123af8ae..dd75f12076d9e 100644
--- a/src/qt/paymentserver.cpp
+++ b/src/qt/paymentserver.cpp
@@ -55,8 +55,6 @@ const char* BIP70_MESSAGE_PAYMENTREQUEST = "PaymentRequest";
 const char* BIP71_MIMETYPE_PAYMENT = "application/bitcoin-payment";
 const char* BIP71_MIMETYPE_PAYMENTACK = "application/bitcoin-paymentack";
 const char* BIP71_MIMETYPE_PAYMENTREQUEST = "application/bitcoin-paymentrequest";
-// BIP70 max payment request size in bytes (DoS protection)
-const qint64 BIP70_MAX_PAYMENTREQUEST_SIZE = 50000;
 
 struct X509StoreDeleter {
       void operator()(X509_STORE* b) {
diff --git a/src/qt/paymentserver.h b/src/qt/paymentserver.h
index 9d46280a37b40..7c6d4507fe6ce 100644
--- a/src/qt/paymentserver.h
+++ b/src/qt/paymentserver.h
@@ -53,7 +53,7 @@ class QUrl;
 QT_END_NAMESPACE
 
 // BIP70 max payment request size in bytes (DoS protection)
-extern const qint64 BIP70_MAX_PAYMENTREQUEST_SIZE;
+static const qint64 BIP70_MAX_PAYMENTREQUEST_SIZE = 50000;
 
 class PaymentServer : public QObject
 {

From 2afefeade6e668cab0643a5c22ff203ce1e509b0 Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Fri, 17 Feb 2017 15:04:30 -0500
Subject: [PATCH 1749/1802] boost: remove iostreams includes

They're unused and produce nasty deprecation warnings

Github-Pull: #9786
Rebased-From: 3301587dc5c7937141282f3799592d1e398495fb
---
 src/rpc/server.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/rpc/server.cpp b/src/rpc/server.cpp
index 283d458c8df90..0b763acd451d6 100644
--- a/src/rpc/server.cpp
+++ b/src/rpc/server.cpp
@@ -18,8 +18,6 @@
 #include <boost/bind.hpp>
 #include <boost/filesystem.hpp>
 #include <boost/foreach.hpp>
-#include <boost/iostreams/concepts.hpp>
-#include <boost/iostreams/stream.hpp>
 #include <boost/shared_ptr.hpp>
 #include <boost/signals2/signal.hpp>
 #include <boost/thread.hpp>

From 40c754cb38cdc8bc27cfcfe3af8be869d4eab969 Mon Sep 17 00:00:00 2001
From: Russell Yanofsky <russ@yanofsky.org>
Date: Tue, 14 Feb 2017 09:38:29 -0500
Subject: [PATCH 1750/1802] [wallet] Remove importmulti always-true check

Remove "nLowestTimestamp <= chainActive.Tip()->GetBlockTimeMax()" check from
importmulti, which is always true because nLowestTimestamp is set to the
minimum of the most recent block time and all the imported key timestamps,
which is necessarily lower than the maximum block time.

Github-Pull: #9760
Rebased-From: ec1267f13b7d0b9b5058c6821cf8dbf74e02d17c
---
 src/wallet/rpcdump.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/wallet/rpcdump.cpp b/src/wallet/rpcdump.cpp
index 30f2414675a38..e95c71ac8a145 100644
--- a/src/wallet/rpcdump.cpp
+++ b/src/wallet/rpcdump.cpp
@@ -1072,7 +1072,7 @@ UniValue importmulti(const JSONRPCRequest& mainRequest)
         }
     }
 
-    if (fRescan && fRunScan && requests.size() && nLowestTimestamp <= chainActive.Tip()->GetBlockTimeMax()) {
+    if (fRescan && fRunScan && requests.size()) {
         CBlockIndex* pindex = nLowestTimestamp > minimumTimestamp ? chainActive.FindEarliestAtLeast(std::max<int64_t>(nLowestTimestamp - 7200, 0)) : chainActive.Genesis();
 
         if (pindex) {

From 6552729f38eadefa1531aeee13d7a07427c0c076 Mon Sep 17 00:00:00 2001
From: Luke Dashjr <luke-jr+git@utopios.org>
Date: Mon, 23 Jan 2017 23:39:07 +0000
Subject: [PATCH 1751/1802] Bugfix: RPC/Mining: GBT should return 1 MB
 sizelimit before segwit activates

Github-Pull: #9619
Rebased-From: 9fc7f0bce94f1cea0239b1543227f22a3f3b9274
---
 src/rpc/mining.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/rpc/mining.cpp b/src/rpc/mining.cpp
index c594daca0d0dd..77cd282a3da4c 100644
--- a/src/rpc/mining.cpp
+++ b/src/rpc/mining.cpp
@@ -676,8 +676,12 @@ UniValue getblocktemplate(const JSONRPCRequest& request)
         nSigOpLimit /= WITNESS_SCALE_FACTOR;
     }
     result.push_back(Pair("sigoplimit", nSigOpLimit));
-    result.push_back(Pair("sizelimit", (int64_t)MAX_BLOCK_SERIALIZED_SIZE));
-    result.push_back(Pair("weightlimit", (int64_t)MAX_BLOCK_WEIGHT));
+    if (fPreSegWit) {
+        result.push_back(Pair("sizelimit", (int64_t)MAX_BLOCK_BASE_SIZE));
+    } else {
+        result.push_back(Pair("sizelimit", (int64_t)MAX_BLOCK_SERIALIZED_SIZE));
+        result.push_back(Pair("weightlimit", (int64_t)MAX_BLOCK_WEIGHT));
+    }
     result.push_back(Pair("curtime", pblock->GetBlockTime()));
     result.push_back(Pair("bits", strprintf("%08x", pblock->nBits)));
     result.push_back(Pair("height", (int64_t)(pindexPrev->nHeight+1)));

From 861cb0c83db0571c2863f6b6276314e115c266ee Mon Sep 17 00:00:00 2001
From: Luke Dashjr <luke-jr+git@utopios.org>
Date: Thu, 2 Feb 2017 20:08:54 +0000
Subject: [PATCH 1752/1802] QA: Test GBT size/weight limit values

Github-Pull: #9619
Rebased-From: 279f944e8d3b437d31210f3ba3e798e98a9334fc
---
 qa/rpc-tests/segwit.py | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/qa/rpc-tests/segwit.py b/qa/rpc-tests/segwit.py
index 299f5387e7c24..d6831e00e36ad 100755
--- a/qa/rpc-tests/segwit.py
+++ b/qa/rpc-tests/segwit.py
@@ -130,10 +130,14 @@ def run_test(self):
         print("Verify sigops are counted in GBT with pre-BIP141 rules before the fork")
         txid = self.nodes[0].sendtoaddress(self.nodes[0].getnewaddress(), 1)
         tmpl = self.nodes[0].getblocktemplate({})
+        assert(tmpl['sizelimit'] == 1000000)
+        assert('weightlimit' not in tmpl)
         assert(tmpl['sigoplimit'] == 20000)
         assert(tmpl['transactions'][0]['hash'] == txid)
         assert(tmpl['transactions'][0]['sigops'] == 2)
         tmpl = self.nodes[0].getblocktemplate({'rules':['segwit']})
+        assert(tmpl['sizelimit'] == 1000000)
+        assert('weightlimit' not in tmpl)
         assert(tmpl['sigoplimit'] == 20000)
         assert(tmpl['transactions'][0]['hash'] == txid)
         assert(tmpl['transactions'][0]['sigops'] == 2)
@@ -241,6 +245,8 @@ def run_test(self):
         print("Verify sigops are counted in GBT with BIP141 rules after the fork")
         txid = self.nodes[0].sendtoaddress(self.nodes[0].getnewaddress(), 1)
         tmpl = self.nodes[0].getblocktemplate({'rules':['segwit']})
+        assert(tmpl['sizelimit'] >= 3999577)  # actual maximum size is lower due to minimum mandatory non-witness data
+        assert(tmpl['weightlimit'] == 4000000)
         assert(tmpl['sigoplimit'] == 80000)
         assert(tmpl['transactions'][0]['txid'] == txid)
         assert(tmpl['transactions'][0]['sigops'] == 8)
@@ -250,6 +256,8 @@ def run_test(self):
         try:
             tmpl = self.nodes[0].getblocktemplate({})
             assert(len(tmpl['transactions']) == 1)  # Doesn't include witness tx
+            assert(tmpl['sizelimit'] == 1000000)
+            assert('weightlimit' not in tmpl)
             assert(tmpl['sigoplimit'] == 20000)
             assert(tmpl['transactions'][0]['hash'] == txid)
             assert(tmpl['transactions'][0]['sigops'] == 2)

From 3972a8efb2f8fd727ca045dcf89104c9f8a2f846 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pavel=20Jan=C3=ADk?= <Pavel@Janik.cz>
Date: Mon, 20 Feb 2017 18:14:06 +0100
Subject: [PATCH 1753/1802] Read/write mempool.dat as a binary.

mempool.dat is a binary file and thus it should be read/written as such.

Fixes #9810.

Github-Pull: #9813
Rebased-From: 171fc91f061d4a980eedfa522e302b8598408cc5
---
 src/validation.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/validation.cpp b/src/validation.cpp
index 4ce0723b21ccc..3e749c2df18cc 100644
--- a/src/validation.cpp
+++ b/src/validation.cpp
@@ -4180,7 +4180,7 @@ static const uint64_t MEMPOOL_DUMP_VERSION = 1;
 bool LoadMempool(void)
 {
     int64_t nExpiryTimeout = GetArg("-mempoolexpiry", DEFAULT_MEMPOOL_EXPIRY) * 60 * 60;
-    FILE* filestr = fopen((GetDataDir() / "mempool.dat").string().c_str(), "r");
+    FILE* filestr = fopen((GetDataDir() / "mempool.dat").string().c_str(), "rb");
     CAutoFile file(filestr, SER_DISK, CLIENT_VERSION);
     if (file.IsNull()) {
         LogPrintf("Failed to open mempool file from disk. Continuing anyway.\n");
@@ -4261,7 +4261,7 @@ void DumpMempool(void)
     int64_t mid = GetTimeMicros();
 
     try {
-        FILE* filestr = fopen((GetDataDir() / "mempool.dat.new").string().c_str(), "w");
+        FILE* filestr = fopen((GetDataDir() / "mempool.dat.new").string().c_str(), "wb");
         if (!filestr) {
             return;
         }

From ae1c4e24a6510b2ace819eccbb928a3cb0074daf Mon Sep 17 00:00:00 2001
From: Chris Moore <dooglus@gmail.com>
Date: Sun, 19 Feb 2017 10:03:27 -0800
Subject: [PATCH 1754/1802] Fix typo in release notes.

---
 doc/release-notes.md | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/doc/release-notes.md b/doc/release-notes.md
index 93cb9c3c70cbc..032f7147a3ad8 100644
--- a/doc/release-notes.md
+++ b/doc/release-notes.md
@@ -170,7 +170,7 @@ Final Alert
 -----------
 
 The Alert System was [disabled and deprecated](https://bitcoin.org/en/alert/2016-11-01-alert-retirement) in Bitcoin Core 0.12.1 and removed in 0.13.0. 
-To Alert System was retired with a maximum sequence final alert which causes any nodes
+The Alert System was retired with a maximum sequence final alert which causes any nodes
 supporting the Alert System to display a static hard-coded "Alert Key Compromised" message which also
 prevents any other alerts from overriding it. This final alert is hard-coded into this release
 so that all old nodes receive the final alert.
@@ -204,7 +204,7 @@ Low-level RPC changes
  - The first boolean argument to `getaddednodeinfo` has been removed. This is 
    an incompatible change.
 
- - RPC command "getmininginfo" loses the "testnet" field in favor of the more
+ - RPC command `getmininginfo` loses the "testnet" field in favor of the more
    generic "chain" (which has been present for years).
 
  - A new RPC command `preciousblock` has been added which marks a block as
@@ -259,7 +259,7 @@ Removal of Priority Estimation
 ------------------------------
 
 - Estimation of "priority" needed for a transaction to be included within a target
-  number of blocks has been removed.  The rpc calls are deprecated and will either
+  number of blocks has been removed.  The RPC calls are deprecated and will either
   return -1 or 1e24 appropriately. The format for `fee_estimates.dat` has also
   changed to no longer save these priority estimates. It will automatically be
   converted to the new format which is not readable by prior versions of the
@@ -755,7 +755,6 @@ Thanks to everyone who directly contributed to this release:
 - Gregory Maxwell
 - Gregory Sanders
 - Hampus Sjöberg
-- instagibbs
 - isle2983
 - Ivo van der Sangen
 - James White
@@ -791,7 +790,6 @@ Thanks to everyone who directly contributed to this release:
 - mrbandrews
 - mruddy
 - Nicolas DORIER
-- NicolasDorier
 - nomnombtc
 - Patrick Strateman
 - Pavel Janík
@@ -819,5 +817,6 @@ Thanks to everyone who directly contributed to this release:
 - Will Binns
 - Wladimir J. van der Laan
 - wodry
+- Zak Wilcox
 
 As well as everyone that helped translating on [Transifex](https://www.transifex.com/projects/p/bitcoin/).

From e22c0671c74bc4db70b3ba04d093cd110f9f22a7 Mon Sep 17 00:00:00 2001
From: kirit93 <kirit.thadaka@gmail.com>
Date: Sun, 19 Feb 2017 12:05:02 +0530
Subject: [PATCH 1755/1802] Fix for issue #9775. Added check for open()
 returning a NULL pointer.

Github-Pull: #9798
Rebased-From: 40f11f8872c3e9f380f8278f984dfdabffe77539
---
 src/util.cpp | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/util.cpp b/src/util.cpp
index ba157625d8055..78c353dfe521d 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -214,12 +214,13 @@ void OpenDebugLog()
     assert(vMsgsBeforeOpenLog);
     boost::filesystem::path pathDebug = GetDataDir() / "debug.log";
     fileout = fopen(pathDebug.string().c_str(), "a");
-    if (fileout) setbuf(fileout, NULL); // unbuffered
-
-    // dump buffered messages from before we opened the log
-    while (!vMsgsBeforeOpenLog->empty()) {
-        FileWriteStr(vMsgsBeforeOpenLog->front(), fileout);
-        vMsgsBeforeOpenLog->pop_front();
+    if (fileout) {
+        setbuf(fileout, NULL); // unbuffered
+        // dump buffered messages from before we opened the log
+        while (!vMsgsBeforeOpenLog->empty()) {
+            FileWriteStr(vMsgsBeforeOpenLog->front(), fileout);
+            vMsgsBeforeOpenLog->pop_front();
+        }
     }
 
     delete vMsgsBeforeOpenLog;
@@ -838,4 +839,4 @@ std::string CopyrightHolders(const std::string& strPrefix)
         strCopyrightHolders += "\n" + strPrefix + "The Bitcoin Core developers";
     }
     return strCopyrightHolders;
-}
+}
\ No newline at end of file

From 7d75a5a93c161aa4de22ac862702ba0241e8faa2 Mon Sep 17 00:00:00 2001
From: Jonas Schnelli <dev@jonasschnelli.ch>
Date: Tue, 21 Feb 2017 14:36:36 +0100
Subject: [PATCH 1756/1802] Fix segfault crash when shutdown the GUI in
 disablewallet mode

Github-Pull: #9817
Rebased-From: 312c4f10574ccf6dfe0d4ecb3ce928733d3a1e52
---
 src/qt/bitcoingui.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp
index 1c1acb6b1038b..be79a67990e5b 100644
--- a/src/qt/bitcoingui.cpp
+++ b/src/qt/bitcoingui.cpp
@@ -518,7 +518,10 @@ void BitcoinGUI::setClientModel(ClientModel *_clientModel)
         // Propagate cleared model to child objects
         rpcConsole->setClientModel(nullptr);
 #ifdef ENABLE_WALLET
-        walletFrame->setClientModel(nullptr);
+        if (walletFrame)
+        {
+            walletFrame->setClientModel(nullptr);
+        }
 #endif // ENABLE_WALLET
         unitDisplayControl->setOptionsModel(nullptr);
     }

From 9072395e5fddb1f2590138a179ab0868646a38a0 Mon Sep 17 00:00:00 2001
From: Russell Yanofsky <russ@yanofsky.org>
Date: Thu, 16 Feb 2017 10:49:03 -0500
Subject: [PATCH 1757/1802] Return errors from importmulti if complete rescans
 are not successful

Github-Pull: #9773
Rebased-From: e2e2f4c856363bbb0e3b5ba4df225f3754c3db39
---
 src/validation.cpp               |  7 +++-
 src/validation.h                 | 10 +++++-
 src/wallet/rpcdump.cpp           | 25 +++++++++++--
 src/wallet/test/wallet_tests.cpp | 60 ++++++++++++++++++++++++++++++++
 src/wallet/wallet.cpp            | 23 +++++++-----
 src/wallet/wallet.h              |  2 +-
 6 files changed, 114 insertions(+), 13 deletions(-)

diff --git a/src/validation.cpp b/src/validation.cpp
index 3e749c2df18cc..e8a3736e5dd51 100644
--- a/src/validation.cpp
+++ b/src/validation.cpp
@@ -3331,7 +3331,7 @@ void PruneOneBlockFile(const int fileNumber)
 }
 
 
-void UnlinkPrunedFiles(std::set<int>& setFilesToPrune)
+void UnlinkPrunedFiles(const std::set<int>& setFilesToPrune)
 {
     for (std::set<int>::iterator it = setFilesToPrune.begin(); it != setFilesToPrune.end(); ++it) {
         CDiskBlockPos pos(*it, 0);
@@ -4163,6 +4163,11 @@ std::string CBlockFileInfo::ToString() const
     return strprintf("CBlockFileInfo(blocks=%u, size=%u, heights=%u...%u, time=%s...%s)", nBlocks, nSize, nHeightFirst, nHeightLast, DateTimeStrFormat("%Y-%m-%d", nTimeFirst), DateTimeStrFormat("%Y-%m-%d", nTimeLast));
 }
 
+CBlockFileInfo* GetBlockFileInfo(size_t n)
+{
+    return &vinfoBlockFile.at(n);
+}
+
 ThresholdState VersionBitsTipState(const Consensus::Params& params, Consensus::DeploymentPos pos)
 {
     LOCK(cs_main);
diff --git a/src/validation.h b/src/validation.h
index 6fcbb1c10849b..9c606f2419409 100644
--- a/src/validation.h
+++ b/src/validation.h
@@ -299,10 +299,15 @@ double GuessVerificationProgress(const ChainTxData& data, CBlockIndex* pindex);
  */
 void FindFilesToPrune(std::set<int>& setFilesToPrune, uint64_t nPruneAfterHeight);
 
+/**
+ *  Mark one block file as pruned.
+ */
+void PruneOneBlockFile(const int fileNumber);
+
 /**
  *  Actually unlink the specified files
  */
-void UnlinkPrunedFiles(std::set<int>& setFilesToPrune);
+void UnlinkPrunedFiles(const std::set<int>& setFilesToPrune);
 
 /** Create a new block index entry for a given block hash */
 CBlockIndex * InsertBlockIndex(uint256 hash);
@@ -562,6 +567,9 @@ static const unsigned int REJECT_ALREADY_KNOWN = 0x101;
 /** Transaction conflicts with a transaction already known */
 static const unsigned int REJECT_CONFLICT = 0x102;
 
+/** Get block file info entry for one block file */
+CBlockFileInfo* GetBlockFileInfo(size_t n);
+
 /** Dump the mempool to disk. */
 void DumpMempool();
 
diff --git a/src/wallet/rpcdump.cpp b/src/wallet/rpcdump.cpp
index e95c71ac8a145..8a9e7d1444ad1 100644
--- a/src/wallet/rpcdump.cpp
+++ b/src/wallet/rpcdump.cpp
@@ -1074,11 +1074,32 @@ UniValue importmulti(const JSONRPCRequest& mainRequest)
 
     if (fRescan && fRunScan && requests.size()) {
         CBlockIndex* pindex = nLowestTimestamp > minimumTimestamp ? chainActive.FindEarliestAtLeast(std::max<int64_t>(nLowestTimestamp - 7200, 0)) : chainActive.Genesis();
-
+        CBlockIndex* scannedRange = nullptr;
         if (pindex) {
-            pwalletMain->ScanForWalletTransactions(pindex, true);
+            scannedRange = pwalletMain->ScanForWalletTransactions(pindex, true);
             pwalletMain->ReacceptWalletTransactions();
         }
+
+        if (!scannedRange || scannedRange->nHeight > pindex->nHeight) {
+            std::vector<UniValue> results = response.getValues();
+            response.clear();
+            response.setArray();
+            size_t i = 0;
+            for (const UniValue& request : requests.getValues()) {
+                // If key creation date is within the successfully scanned
+                // range, or if the import result already has an error set, let
+                // the result stand unmodified. Otherwise replace the result
+                // with an error message.
+                if (GetImportTimestamp(request, now) - 7200 >= scannedRange->GetBlockTimeMax() || results.at(i).exists("error")) {
+                    response.push_back(results.at(i));
+                } else {
+                    UniValue result = UniValue(UniValue::VOBJ);
+                    result.pushKV("success", UniValue(false));
+                    result.pushKV("error", JSONRPCError(RPC_MISC_ERROR, strprintf("Failed to rescan before time %d, transactions may be missing.", scannedRange->GetBlockTimeMax())));
+                    response.push_back(std::move(result));
+                }
+            }
+        }
     }
 
     return response;
diff --git a/src/wallet/test/wallet_tests.cpp b/src/wallet/test/wallet_tests.cpp
index ca086c86a80b0..d32e8ba06adb0 100644
--- a/src/wallet/test/wallet_tests.cpp
+++ b/src/wallet/test/wallet_tests.cpp
@@ -9,10 +9,16 @@
 #include <utility>
 #include <vector>
 
+#include "rpc/server.h"
+#include "test/test_bitcoin.h"
+#include "validation.h"
 #include "wallet/test/wallet_test_fixture.h"
 
 #include <boost/foreach.hpp>
 #include <boost/test/unit_test.hpp>
+#include <univalue.h>
+
+extern UniValue importmulti(const JSONRPCRequest& request);
 
 // how many times to run all the tests to have a chance to catch errors that only show up with particular random shuffles
 #define RUN_TESTS 100
@@ -355,4 +361,58 @@ BOOST_AUTO_TEST_CASE(ApproximateBestSubset)
     empty_wallet();
 }
 
+BOOST_FIXTURE_TEST_CASE(rescan, TestChain100Setup)
+{
+    LOCK(cs_main);
+
+    // Cap last block file size, and mine new block in a new block file.
+    CBlockIndex* oldTip = chainActive.Tip();
+    GetBlockFileInfo(oldTip->GetBlockPos().nFile)->nSize = MAX_BLOCKFILE_SIZE;
+    CreateAndProcessBlock({}, GetScriptForRawPubKey(coinbaseKey.GetPubKey()));
+    CBlockIndex* newTip = chainActive.Tip();
+
+    // Verify ScanForWalletTransactions picks up transactions in both the old
+    // and new block files.
+    {
+        CWallet wallet;
+        LOCK(wallet.cs_wallet);
+        wallet.AddKeyPubKey(coinbaseKey, coinbaseKey.GetPubKey());
+        BOOST_CHECK_EQUAL(oldTip, wallet.ScanForWalletTransactions(oldTip));
+        BOOST_CHECK_EQUAL(wallet.GetImmatureBalance(), 100 * COIN);
+    }
+
+    // Prune the older block file.
+    PruneOneBlockFile(oldTip->GetBlockPos().nFile);
+    UnlinkPrunedFiles({oldTip->GetBlockPos().nFile});
+
+    // Verify ScanForWalletTransactions only picks transactions in the new block
+    // file.
+    {
+        CWallet wallet;
+        LOCK(wallet.cs_wallet);
+        wallet.AddKeyPubKey(coinbaseKey, coinbaseKey.GetPubKey());
+        BOOST_CHECK_EQUAL(newTip, wallet.ScanForWalletTransactions(oldTip));
+        BOOST_CHECK_EQUAL(wallet.GetImmatureBalance(), 50 * COIN);
+    }
+
+    {
+        CWallet wallet;
+        ::pwalletMain = &wallet;
+        UniValue key;
+        key.setObject();
+        key.pushKV("scriptPubKey", HexStr(GetScriptForRawPubKey(coinbaseKey.GetPubKey())));
+        key.pushKV("timestamp", 0);
+        key.pushKV("internal", UniValue(true));
+        UniValue keys;
+        keys.setArray();
+        keys.push_back(key);
+        JSONRPCRequest request;
+        request.params.setArray();
+        request.params.push_back(keys);
+
+        UniValue response = importmulti(request);
+        BOOST_CHECK_EQUAL(response.write(), strprintf("[{\"success\":false,\"error\":{\"code\":-1,\"message\":\"Failed to rescan before time %d, transactions may be missing.\"}}]", newTip->GetBlockTimeMax()));
+    }
+}
+
 BOOST_AUTO_TEST_SUITE_END()
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index f8f5a9306dc1c..1b59c3cd80c15 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -1545,10 +1545,14 @@ void CWalletTx::GetAccountAmounts(const string& strAccount, CAmount& nReceived,
  * Scan the block chain (starting in pindexStart) for transactions
  * from or to us. If fUpdate is true, found transactions that already
  * exist in the wallet will be updated.
+ *
+ * Returns pointer to the first block in the last contiguous range that was
+ * successfully scanned.
+ *
  */
-int CWallet::ScanForWalletTransactions(CBlockIndex* pindexStart, bool fUpdate)
+CBlockIndex* CWallet::ScanForWalletTransactions(CBlockIndex* pindexStart, bool fUpdate)
 {
-    int ret = 0;
+    CBlockIndex* ret = nullptr;
     int64_t nNow = GetTime();
     const CChainParams& chainParams = Params();
 
@@ -1570,12 +1574,15 @@ int CWallet::ScanForWalletTransactions(CBlockIndex* pindexStart, bool fUpdate)
                 ShowProgress(_("Rescanning..."), std::max(1, std::min(99, (int)((GuessVerificationProgress(chainParams.TxData(), pindex) - dProgressStart) / (dProgressTip - dProgressStart) * 100))));
 
             CBlock block;
-            ReadBlockFromDisk(block, pindex, Params().GetConsensus());
-            int posInBlock;
-            for (posInBlock = 0; posInBlock < (int)block.vtx.size(); posInBlock++)
-            {
-                if (AddToWalletIfInvolvingMe(*block.vtx[posInBlock], pindex, posInBlock, fUpdate))
-                    ret++;
+            if (ReadBlockFromDisk(block, pindex, Params().GetConsensus())) {
+                for (size_t posInBlock = 0; posInBlock < block.vtx.size(); ++posInBlock) {
+                    AddToWalletIfInvolvingMe(*block.vtx[posInBlock], pindex, posInBlock, fUpdate);
+                }
+                if (!ret) {
+                    ret = pindex;
+                }
+            } else {
+                ret = nullptr;
             }
             pindex = chainActive.Next(pindex);
             if (GetTime() >= nNow + 60) {
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
index a7b15a8441c84..98e4fb87b9107 100644
--- a/src/wallet/wallet.h
+++ b/src/wallet/wallet.h
@@ -788,7 +788,7 @@ class CWallet : public CCryptoKeyStore, public CValidationInterface
     bool LoadToWallet(const CWalletTx& wtxIn);
     void SyncTransaction(const CTransaction& tx, const CBlockIndex *pindex, int posInBlock) override;
     bool AddToWalletIfInvolvingMe(const CTransaction& tx, const CBlockIndex* pIndex, int posInBlock, bool fUpdate);
-    int ScanForWalletTransactions(CBlockIndex* pindexStart, bool fUpdate = false);
+    CBlockIndex* ScanForWalletTransactions(CBlockIndex* pindexStart, bool fUpdate = false);
     void ReacceptWalletTransactions();
     void ResendWalletTransactions(int64_t nBestBlockTime, CConnman* connman) override;
     std::vector<uint256> ResendWalletTransactionsBefore(int64_t nTime, CConnman* connman);

From 9d3f9d2a5991e6e561e323f488cb40a803408b6b Mon Sep 17 00:00:00 2001
From: John Newbery <john@johnnewbery.com>
Date: Tue, 7 Feb 2017 11:20:06 -0500
Subject: [PATCH 1758/1802] [Trivial] Remove incorrect help message from
 gettxoutproof()

Github-Pull: #9711
Rebased-From: 9949ebfa6a548260858df429f4d0e716e0a26065
---
 src/rpc/rawtransaction.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/rpc/rawtransaction.cpp b/src/rpc/rawtransaction.cpp
index 21396ebb09b78..bf16f27498f87 100644
--- a/src/rpc/rawtransaction.cpp
+++ b/src/rpc/rawtransaction.cpp
@@ -245,7 +245,6 @@ UniValue gettxoutproof(const JSONRPCRequest& request)
             "unspent output in the utxo for this transaction. To make it always work,\n"
             "you need to maintain a transaction index, using the -txindex command line option or\n"
             "specify the block in which the transaction is included manually (by blockhash).\n"
-            "\nReturn the raw transaction data.\n"
             "\nArguments:\n"
             "1. \"txids\"       (string) A json array of txids to filter\n"
             "    [\n"

From 599c69abe3101512eeee13733c0f58eb3e363eae Mon Sep 17 00:00:00 2001
From: Russell Yanofsky <russ@yanofsky.org>
Date: Tue, 21 Feb 2017 12:57:30 -0500
Subject: [PATCH 1759/1802] Fix pruning test broken by 2 hour manual prune
 window

Regression happened in 91fb506 Add two hour buffer to manual pruning.

Github-Pull: #9820
Rebased-From: 874c7363d794c18a3b46d3d2a03f19c88f3a20cf
---
 qa/rpc-tests/pruning.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/qa/rpc-tests/pruning.py b/qa/rpc-tests/pruning.py
index 9d155478e251a..1e6d4191869fa 100755
--- a/qa/rpc-tests/pruning.py
+++ b/qa/rpc-tests/pruning.py
@@ -18,6 +18,11 @@
 
 MIN_BLOCKS_TO_KEEP = 288
 
+# Rescans start at the earliest block up to 2 hours before a key timestamp, so
+# the manual prune RPC avoids pruning blocks in the same window to be
+# compatible with pruning based on key creation time.
+RESCAN_WINDOW = 2 * 60 * 60
+
 
 def calc_usage(blockdir):
     return sum(os.path.getsize(blockdir+f) for f in os.listdir(blockdir) if os.path.isfile(blockdir+f)) / (1024. * 1024.)
@@ -239,7 +244,7 @@ def manual_test(self, node_number, use_timestamp):
 
         def height(index):
             if use_timestamp:
-                return node.getblockheader(node.getblockhash(index))["time"]
+                return node.getblockheader(node.getblockhash(index))["time"] + RESCAN_WINDOW
             else:
                 return index
 

From 260c71cbb857d12540a2f53372282d11f2b401a8 Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Wed, 22 Feb 2017 11:29:43 +0100
Subject: [PATCH 1760/1802] qa: Check return code when stopping nodes

This includes work by jnewbery

Github-Pull: #9824
Rebased-From: fa4cd2e998e0ebebe283a6243f7f752123a105ab
---
 qa/rpc-tests/fundrawtransaction.py  |  4 +++-
 qa/rpc-tests/rpcbind_test.py        | 19 +++++++------------
 qa/rpc-tests/test_framework/util.py | 19 +++++--------------
 3 files changed, 15 insertions(+), 27 deletions(-)

diff --git a/qa/rpc-tests/fundrawtransaction.py b/qa/rpc-tests/fundrawtransaction.py
index 7396ba46a4f13..8d2bc73c0cce7 100755
--- a/qa/rpc-tests/fundrawtransaction.py
+++ b/qa/rpc-tests/fundrawtransaction.py
@@ -469,7 +469,9 @@ def run_test(self):
         # locked wallet test
         self.nodes[1].encryptwallet("test")
         self.nodes.pop(1)
-        stop_nodes(self.nodes)
+        stop_node(self.nodes[0], 0)
+        stop_node(self.nodes[1], 2)
+        stop_node(self.nodes[2], 3)
 
         self.nodes = start_nodes(self.num_nodes, self.options.tmpdir)
         # This test is not meant to test fee estimation and we'd like
diff --git a/qa/rpc-tests/rpcbind_test.py b/qa/rpc-tests/rpcbind_test.py
index d78d0b884e9ed..1010c54aa5c22 100755
--- a/qa/rpc-tests/rpcbind_test.py
+++ b/qa/rpc-tests/rpcbind_test.py
@@ -35,11 +35,9 @@ def run_bind_test(self, allow_ips, connect_to, addresses, expected):
             base_args += ['-rpcallowip=' + x for x in allow_ips]
         binds = ['-rpcbind='+addr for addr in addresses]
         self.nodes = start_nodes(self.num_nodes, self.options.tmpdir, [base_args + binds], connect_to)
-        try:
-            pid = bitcoind_processes[0].pid
-            assert_equal(set(get_bind_addrs(pid)), set(expected))
-        finally:
-            stop_nodes(self.nodes)
+        pid = bitcoind_processes[0].pid
+        assert_equal(set(get_bind_addrs(pid)), set(expected))
+        stop_nodes(self.nodes)
 
     def run_allowip_test(self, allow_ips, rpchost, rpcport):
         '''
@@ -48,13 +46,10 @@ def run_allowip_test(self, allow_ips, rpchost, rpcport):
         '''
         base_args = ['-disablewallet', '-nolisten'] + ['-rpcallowip='+x for x in allow_ips]
         self.nodes = start_nodes(self.num_nodes, self.options.tmpdir, [base_args])
-        try:
-            # connect to node through non-loopback interface
-            node = get_rpc_proxy(rpc_url(0, "%s:%d" % (rpchost, rpcport)), 0)
-            node.getnetworkinfo()
-        finally:
-            node = None # make sure connection will be garbage collected and closed
-            stop_nodes(self.nodes)
+        # connect to node through non-loopback interface
+        node = get_rpc_proxy(rpc_url(0, "%s:%d" % (rpchost, rpcport)), 0)
+        node.getnetworkinfo()
+        stop_nodes(self.nodes)
 
     def run_test(self):
         # due to OS-specific network stats queries, this test works only on Linux
diff --git a/qa/rpc-tests/test_framework/util.py b/qa/rpc-tests/test_framework/util.py
index dc8555c44c08c..ec151c2a65d2d 100644
--- a/qa/rpc-tests/test_framework/util.py
+++ b/qa/rpc-tests/test_framework/util.py
@@ -375,28 +375,19 @@ def stop_node(node, i):
         node.stop()
     except http.client.CannotSendRequest as e:
         print("WARN: Unable to stop node: " + repr(e))
-    bitcoind_processes[i].wait(timeout=BITCOIND_PROC_WAIT_TIMEOUT)
+    return_code = bitcoind_processes[i].wait(timeout=BITCOIND_PROC_WAIT_TIMEOUT)
+    assert_equal(return_code, 0)
     del bitcoind_processes[i]
 
 def stop_nodes(nodes):
-    for node in nodes:
-        try:
-            node.stop()
-        except http.client.CannotSendRequest as e:
-            print("WARN: Unable to stop node: " + repr(e))
-    del nodes[:] # Emptying array closes connections as a side effect
-    wait_bitcoinds()
+    for i, node in enumerate(nodes):
+        stop_node(node, i)
+    assert not bitcoind_processes.values() # All connections must be gone now
 
 def set_node_times(nodes, t):
     for node in nodes:
         node.setmocktime(t)
 
-def wait_bitcoinds():
-    # Wait for all bitcoinds to cleanly exit
-    for bitcoind in bitcoind_processes.values():
-        bitcoind.wait(timeout=BITCOIND_PROC_WAIT_TIMEOUT)
-    bitcoind_processes.clear()
-
 def connect_nodes(from_connection, node_num):
     ip_port = "127.0.0.1:"+str(p2p_port(node_num))
     from_connection.addnode(ip_port, "onetry")

From 749fe95fdc979612f41b4b4ee0f58ac1bb425913 Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Tue, 21 Feb 2017 11:56:07 -0500
Subject: [PATCH 1761/1802] build: warn about variable length arrays

Github-Pull: #9789
Rebased-From: b602fe0f7372256bd2bc8c116d23dee3253882f9
---
 configure.ac | 1 +
 1 file changed, 1 insertion(+)

diff --git a/configure.ac b/configure.ac
index 2b2a001d5d38e..e4f8f6f6eb2fb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -210,6 +210,7 @@ if test "x$CXXFLAGS_overridden" = "xno"; then
   AX_CHECK_COMPILE_FLAG([-Wall],[CXXFLAGS="$CXXFLAGS -Wall"],,[[$CXXFLAG_WERROR]])
   AX_CHECK_COMPILE_FLAG([-Wextra],[CXXFLAGS="$CXXFLAGS -Wextra"],,[[$CXXFLAG_WERROR]])
   AX_CHECK_COMPILE_FLAG([-Wformat],[CXXFLAGS="$CXXFLAGS -Wformat"],,[[$CXXFLAG_WERROR]])
+  AX_CHECK_COMPILE_FLAG([-Wvla],[CXXFLAGS="$CXXFLAGS -Wvla"],,[[$CXXFLAG_WERROR]])
   AX_CHECK_COMPILE_FLAG([-Wformat-security],[CXXFLAGS="$CXXFLAGS -Wformat-security"],,[[$CXXFLAG_WERROR]])
 
   ## Some compilers (gcc) ignore unknown -Wno-* options, but warn about all

From 05e906dbc68e3a88a358f2f08750c51b6e9d9856 Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Tue, 21 Feb 2017 11:56:26 -0500
Subject: [PATCH 1762/1802] build: add --enable-werror option

This turns some compiler warnings into errors. Useful for c-i.

Github-Pull: #9789
Rebased-From: 205830a37b7ffa4f8fa306e5c9eafcee3777fa68
---
 configure.ac    | 17 +++++++++++++++++
 src/Makefile.am |  2 +-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index e4f8f6f6eb2fb..95e85e6d0549e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -192,6 +192,13 @@ AC_ARG_ENABLE([debug],
     [enable_debug=$enableval],
     [enable_debug=no])
 
+# Turn warnings into errors
+AC_ARG_ENABLE([werror],
+    [AS_HELP_STRING([--enable-werror],
+                    [Treat certain compiler warnings as errors (default is no)])],
+    [enable_werror=$enableval],
+    [enable_werror=no])
+
 AC_LANG_PUSH([C++])
 AX_CHECK_COMPILE_FLAG([-Werror],[CXXFLAG_WERROR="-Werror"],[CXXFLAG_WERROR=""])
 
@@ -206,6 +213,14 @@ if test "x$enable_debug" = xyes; then
     fi
 fi
 
+ERROR_CXXFLAGS=
+if test "x$enable_werror" = "xyes"; then
+  if test "x$CXXFLAG_WERROR" = "x"; then
+    AC_MSG_ERROR("enable-werror set but -Werror is not usable")
+  fi
+  AX_CHECK_COMPILE_FLAG([-Werror=vla],[ERROR_CXXFLAGS="$ERROR_CXXFLAGS -Werror=vla"],,[[$CXXFLAG_WERROR]])
+fi
+
 if test "x$CXXFLAGS_overridden" = "xno"; then
   AX_CHECK_COMPILE_FLAG([-Wall],[CXXFLAGS="$CXXFLAGS -Wall"],,[[$CXXFLAG_WERROR]])
   AX_CHECK_COMPILE_FLAG([-Wextra],[CXXFLAGS="$CXXFLAGS -Wextra"],,[[$CXXFLAG_WERROR]])
@@ -1067,6 +1082,7 @@ AC_SUBST(BITCOIN_CLI_NAME)
 AC_SUBST(BITCOIN_TX_NAME)
 
 AC_SUBST(RELDFLAGS)
+AC_SUBST(ERROR_CXXFLAGS)
 AC_SUBST(HARDENED_CXXFLAGS)
 AC_SUBST(HARDENED_CPPFLAGS)
 AC_SUBST(HARDENED_LDFLAGS)
@@ -1156,6 +1172,7 @@ echo "  with test     = $use_tests"
 echo "  with bench    = $use_bench"
 echo "  with upnp     = $use_upnp"
 echo "  debug enabled = $enable_debug"
+echo "  werror        = $enable_werror"
 echo 
 echo "  target os     = $TARGET_OS"
 echo "  build os      = $BUILD_OS"
diff --git a/src/Makefile.am b/src/Makefile.am
index a2072865a34fb..e8d22313dca33 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -5,7 +5,7 @@
 DIST_SUBDIRS = secp256k1 univalue
 
 AM_LDFLAGS = $(PTHREAD_CFLAGS) $(LIBTOOL_LDFLAGS) $(HARDENED_LDFLAGS)
-AM_CXXFLAGS = $(HARDENED_CXXFLAGS)
+AM_CXXFLAGS = $(HARDENED_CXXFLAGS) $(ERROR_CXXFLAGS)
 AM_CPPFLAGS = $(HARDENED_CPPFLAGS)
 EXTRA_LIBRARIES =
 

From 99fd85cb44fe9983c64cfa376299e67b18568304 Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Wed, 22 Feb 2017 13:33:22 -0500
Subject: [PATCH 1763/1802] build: force a c++ standard to be specified

Newer compilers may switch to newer standards by default. For example, gcc6
uses std=gnu++14 by default.

Github-Pull: #9831
Rebased-From: 9829c54de2725037ee0702306cbaa99fc9aa1826
---
 build-aux/m4/ax_cxx_compile_stdcxx.m4 | 8 +++++++-
 configure.ac                          | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/build-aux/m4/ax_cxx_compile_stdcxx.m4 b/build-aux/m4/ax_cxx_compile_stdcxx.m4
index 2c18e49c56c0b..f147cee3b117f 100644
--- a/build-aux/m4/ax_cxx_compile_stdcxx.m4
+++ b/build-aux/m4/ax_cxx_compile_stdcxx.m4
@@ -57,8 +57,14 @@ AC_DEFUN([AX_CXX_COMPILE_STDCXX], [dnl
         [$3], [mandatory], [ax_cxx_compile_cxx$1_required=true],
         [$3], [optional], [ax_cxx_compile_cxx$1_required=false],
         [m4_fatal([invalid third argument `$3' to AX_CXX_COMPILE_STDCXX])])
+  m4_if([$4], [], [ax_cxx_compile_cxx$1_try_default=true],
+        [$4], [default], [ax_cxx_compile_cxx$1_try_default=true],
+        [$4], [nodefault], [ax_cxx_compile_cxx$1_try_default=false],
+        [m4_fatal([invalid fourth argument `$4' to AX_CXX_COMPILE_STDCXX])])
   AC_LANG_PUSH([C++])dnl
   ac_success=no
+
+  m4_if([$4], [nodefault], [], [dnl
   AC_CACHE_CHECK(whether $CXX supports C++$1 features by default,
   ax_cv_cxx_compile_cxx$1,
   [AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_testbody_$1])],
@@ -66,7 +72,7 @@ AC_DEFUN([AX_CXX_COMPILE_STDCXX], [dnl
     [ax_cv_cxx_compile_cxx$1=no])])
   if test x$ax_cv_cxx_compile_cxx$1 = xyes; then
     ac_success=yes
-  fi
+  fi])
 
   m4_if([$2], [noext], [], [dnl
   if test x$ac_success = xno; then
diff --git a/configure.ac b/configure.ac
index 95e85e6d0549e..a2332578a63ba 100644
--- a/configure.ac
+++ b/configure.ac
@@ -55,7 +55,7 @@ case $host in
   ;;
 esac
 dnl Require C++11 compiler (no GNU extensions)
-AX_CXX_COMPILE_STDCXX([11], [noext], [mandatory])
+AX_CXX_COMPILE_STDCXX([11], [noext], [mandatory], [nodefault])
 dnl Check if -latomic is required for <std::atomic>
 CHECK_ATOMIC
 

From 847e3753a6d6a6ab4dd081e2945cb200faf730d4 Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Thu, 23 Feb 2017 19:28:30 +0000
Subject: [PATCH 1764/1802] qt: pre-rc2 translations update

---
 src/qt/locale/bitcoin_en.ts    |  20 +--
 src/qt/locale/bitcoin_fr_FR.ts | 312 ++++++++++++++++++++++++++++++++-
 src/qt/locale/bitcoin_zh_CN.ts |   4 +
 3 files changed, 322 insertions(+), 14 deletions(-)

diff --git a/src/qt/locale/bitcoin_en.ts b/src/qt/locale/bitcoin_en.ts
index a66fa55cfedbc..e6a9c9228d336 100644
--- a/src/qt/locale/bitcoin_en.ts
+++ b/src/qt/locale/bitcoin_en.ts
@@ -304,12 +304,12 @@
         <translation>Sign &amp;message...</translation>
     </message>
     <message>
-        <location line="+427"/>
+        <location line="+430"/>
         <source>Synchronizing with network...</source>
         <translation>Synchronizing with network...</translation>
     </message>
     <message>
-        <location line="-505"/>
+        <location line="-508"/>
         <source>&amp;Overview</source>
         <translation>&amp;Overview</translation>
     </message>
@@ -404,7 +404,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+357"/>
+        <location line="+360"/>
         <source>Click to disable network activity.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -429,7 +429,7 @@
         <translation>Reindexing blocks on disk...</translation>
     </message>
     <message>
-        <location line="-508"/>
+        <location line="-511"/>
         <source>Send coins to a Bitcoin address</source>
         <translation>Send coins to a Bitcoin address</translation>
     </message>
@@ -459,12 +459,12 @@
         <translation>&amp;Verify message...</translation>
     </message>
     <message>
-        <location line="+514"/>
+        <location line="+517"/>
         <source>Bitcoin</source>
         <translation>Bitcoin</translation>
     </message>
     <message>
-        <location line="-739"/>
+        <location line="-742"/>
         <source>Wallet</source>
         <translation>Wallet</translation>
     </message>
@@ -549,7 +549,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
-        <location line="+354"/>
+        <location line="+357"/>
         <source>%n active connection(s) to Bitcoin network</source>
         <translation>
             <numerusform>%n active connection to Bitcoin network</numerusform>
@@ -610,12 +610,12 @@
         <translation>Up to date</translation>
     </message>
     <message>
-        <location line="-438"/>
+        <location line="-441"/>
         <source>Show the %1 help message to get a list with possible Bitcoin command-line options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+197"/>
+        <location line="+200"/>
         <source>%1 client</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1601,7 +1601,7 @@
 <context>
     <name>PaymentServer</name>
     <message>
-        <location filename="../paymentserver.cpp" line="+328"/>
+        <location filename="../paymentserver.cpp" line="+326"/>
         <location line="+216"/>
         <location line="+42"/>
         <location line="+113"/>
diff --git a/src/qt/locale/bitcoin_fr_FR.ts b/src/qt/locale/bitcoin_fr_FR.ts
index 4d02aa5114d62..12cd54d405e8b 100644
--- a/src/qt/locale/bitcoin_fr_FR.ts
+++ b/src/qt/locale/bitcoin_fr_FR.ts
@@ -41,10 +41,46 @@
         <source>&amp;Delete</source>
         <translation>&amp;Supprimer</translation>
     </message>
+    <message>
+        <source>C&amp;hoose</source>
+        <translation>C&amp;oisir</translation>
+    </message>
+    <message>
+        <source>Copy &amp;Label</source>
+        <translation>Copier &amp;Étiquette </translation>
+    </message>
+    <message>
+        <source>&amp;Edit</source>
+        <translation>&amp;Éditer </translation>
+    </message>
+    <message>
+        <source>Export Address List</source>
+        <translation>Exporter la liste d'adresses</translation>
+    </message>
+    <message>
+        <source>Comma separated file (*.csv)</source>
+        <translation>Valeurs séparées par des virgules (*.csv)</translation>
+    </message>
+    <message>
+        <source>Exporting Failed</source>
+        <translation>Échec de l'export</translation>
+    </message>
     </context>
 <context>
     <name>AddressTableModel</name>
-    </context>
+    <message>
+        <source>Label</source>
+        <translation>Étiquette</translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation>Adresse</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(aucune étiquette)</translation>
+    </message>
+</context>
 <context>
     <name>AskPassphraseDialog</name>
     <message>
@@ -63,6 +99,22 @@
         <source>Repeat new passphrase</source>
         <translation>Répétez la phrase de passe</translation>
     </message>
+    <message>
+        <source>Encrypt wallet</source>
+        <translation>Chiffrer le porte-monnaie</translation>
+    </message>
+    <message>
+        <source>Unlock wallet</source>
+        <translation>Déverrouiller le porte-monnaie</translation>
+    </message>
+    <message>
+        <source>Decrypt wallet</source>
+        <translation>Décrypter le porte-monnaie</translation>
+    </message>
+    <message>
+        <source>Wallet encrypted</source>
+        <translation>Porte-monnaie chiffré</translation>
+    </message>
     </context>
 <context>
     <name>BanTableModel</name>
@@ -414,6 +466,42 @@
         <source>Confirmed</source>
         <translation>Confirmée</translation>
     </message>
+    <message>
+        <source>Copy address</source>
+        <translation>Copier l'adresse</translation>
+    </message>
+    <message>
+        <source>Copy label</source>
+        <translation>Copier l'étiquette</translation>
+    </message>
+    <message>
+        <source>Copy amount</source>
+        <translation>Copier le montant</translation>
+    </message>
+    <message>
+        <source>Copy fee</source>
+        <translation>Copier les frais</translation>
+    </message>
+    <message>
+        <source>Copy after fee</source>
+        <translation>Copier après les frais</translation>
+    </message>
+    <message>
+        <source>Copy bytes</source>
+        <translation>Copier les octets</translation>
+    </message>
+    <message>
+        <source>yes</source>
+        <translation>oui</translation>
+    </message>
+    <message>
+        <source>no</source>
+        <translation>non</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(aucune étiquette)</translation>
+    </message>
     </context>
 <context>
     <name>EditAddressDialog</name>
@@ -797,6 +885,14 @@
     </context>
 <context>
     <name>QRImageWidget</name>
+    <message>
+        <source>&amp;Copy Image</source>
+        <translation>&amp;Copier image</translation>
+    </message>
+    <message>
+        <source>Save QR Code</source>
+        <translation>Sauvegarder QR code</translation>
+    </message>
     </context>
 <context>
     <name>RPCConsole</name>
@@ -1055,7 +1151,15 @@
         <source>Remove</source>
         <translation>Retirer</translation>
     </message>
-    </context>
+    <message>
+        <source>Copy label</source>
+        <translation>Copier l'étiquette</translation>
+    </message>
+    <message>
+        <source>Copy amount</source>
+        <translation>Copier le montant</translation>
+    </message>
+</context>
 <context>
     <name>ReceiveRequestDialog</name>
     <message>
@@ -1074,9 +1178,37 @@
         <source>&amp;Save Image...</source>
         <translation>&amp;Sauvegarder image</translation>
     </message>
+    <message>
+        <source>Address</source>
+        <translation>Adresse</translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation>Étiquette</translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation>Message</translation>
+    </message>
     </context>
 <context>
     <name>RecentRequestsTableModel</name>
+    <message>
+        <source>Date</source>
+        <translation>Date</translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation>Étiquette</translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation>Message</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(aucune étiquette)</translation>
+    </message>
     </context>
 <context>
     <name>SendCoinsDialog</name>
@@ -1180,7 +1312,27 @@
         <source>S&amp;end</source>
         <translation>E&amp;voyer</translation>
     </message>
-    </context>
+    <message>
+        <source>Copy amount</source>
+        <translation>Copier le montant</translation>
+    </message>
+    <message>
+        <source>Copy fee</source>
+        <translation>Copier les frais</translation>
+    </message>
+    <message>
+        <source>Copy after fee</source>
+        <translation>Copier après les frais</translation>
+    </message>
+    <message>
+        <source>Copy bytes</source>
+        <translation>Copier les octets</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(aucune étiquette)</translation>
+    </message>
+</context>
 <context>
     <name>SendCoinsEntry</name>
     <message>
@@ -1305,7 +1457,83 @@
 </context>
 <context>
     <name>TransactionDesc</name>
-    </context>
+    <message>
+        <source>Status</source>
+        <translation>État</translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation>Date</translation>
+    </message>
+    <message>
+        <source>Source</source>
+        <translation>Source</translation>
+    </message>
+    <message>
+        <source>Generated</source>
+        <translation>Généré</translation>
+    </message>
+    <message>
+        <source>From</source>
+        <translation>De</translation>
+    </message>
+    <message>
+        <source>unknown</source>
+        <translation>inconnu</translation>
+    </message>
+    <message>
+        <source>To</source>
+        <translation>Á</translation>
+    </message>
+    <message>
+        <source>own address</source>
+        <translation>Votre adresse</translation>
+    </message>
+    <message>
+        <source>watch-only</source>
+        <translation>Lecture uniquement</translation>
+    </message>
+    <message>
+        <source>label</source>
+        <translation>Étiquette </translation>
+    </message>
+    <message>
+        <source>Credit</source>
+        <translation>Crédit</translation>
+    </message>
+    <message>
+        <source>Debit</source>
+        <translation>Débit</translation>
+    </message>
+    <message>
+        <source>Total debit</source>
+        <translation>Débit total</translation>
+    </message>
+    <message>
+        <source>Total credit</source>
+        <translation>Crédit total </translation>
+    </message>
+    <message>
+        <source>Net amount</source>
+        <translation>Montant net</translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation>Message</translation>
+    </message>
+    <message>
+        <source>Comment</source>
+        <translation>Commentaire </translation>
+    </message>
+    <message>
+        <source>true</source>
+        <translation>vrai</translation>
+    </message>
+    <message>
+        <source>false</source>
+        <translation>faux</translation>
+    </message>
+</context>
 <context>
     <name>TransactionDescDialog</name>
     <message>
@@ -1315,9 +1543,85 @@
     </context>
 <context>
     <name>TransactionTableModel</name>
+    <message>
+        <source>Date</source>
+        <translation>Date</translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation>Étiquette</translation>
+    </message>
+    <message>
+        <source>watch-only</source>
+        <translation>Lecture uniquement</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(aucune étiquette)</translation>
+    </message>
     </context>
 <context>
     <name>TransactionView</name>
+    <message>
+        <source>All</source>
+        <translation>Toutes</translation>
+    </message>
+    <message>
+        <source>Today</source>
+        <translation>Aujourd'hui</translation>
+    </message>
+    <message>
+        <source>This week</source>
+        <translation>Cette semaine</translation>
+    </message>
+    <message>
+        <source>This month</source>
+        <translation>Ce mois</translation>
+    </message>
+    <message>
+        <source>Last month</source>
+        <translation>Mois dernier</translation>
+    </message>
+    <message>
+        <source>This year</source>
+        <translation>Cette année</translation>
+    </message>
+    <message>
+        <source>Other</source>
+        <translation>Autres</translation>
+    </message>
+    <message>
+        <source>Copy address</source>
+        <translation>Copier l'adresse</translation>
+    </message>
+    <message>
+        <source>Copy label</source>
+        <translation>Copier l'étiquette</translation>
+    </message>
+    <message>
+        <source>Copy amount</source>
+        <translation>Copier le montant</translation>
+    </message>
+    <message>
+        <source>Comma separated file (*.csv)</source>
+        <translation>Valeurs séparées par des virgules (*.csv)</translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation>Date</translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation>Étiquette</translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation>Adresse</translation>
+    </message>
+    <message>
+        <source>Exporting Failed</source>
+        <translation>Échec de l'export</translation>
+    </message>
     </context>
 <context>
     <name>UnitDisplayStatusBarControl</name>
diff --git a/src/qt/locale/bitcoin_zh_CN.ts b/src/qt/locale/bitcoin_zh_CN.ts
index 20875c232722a..30e59d9260407 100644
--- a/src/qt/locale/bitcoin_zh_CN.ts
+++ b/src/qt/locale/bitcoin_zh_CN.ts
@@ -3240,6 +3240,10 @@
         <source>Wallet %s resides outside data directory %s</source>
         <translation>钱包 %s 在外部的数据目录 %s</translation>
     </message>
+    <message>
+        <source>Wallet debugging/testing options:</source>
+        <translation>钱包调试/测试选项：</translation>
+    </message>
     <message>
         <source>Wallet options:</source>
         <translation>钱包选项:</translation>

From 3b2f7fdcaea36c8c5c93b21030d4e2327d2b6e8c Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Thu, 23 Feb 2017 21:38:15 +0100
Subject: [PATCH 1765/1802] doc: Add authors and changes since rc1 to release
 notes

---
 doc/release-notes.md | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/doc/release-notes.md b/doc/release-notes.md
index 032f7147a3ad8..1f85dedb33460 100644
--- a/doc/release-notes.md
+++ b/doc/release-notes.md
@@ -354,6 +354,8 @@ and git merge commit are mentioned.
 - #9778 `ad168ef` Add two hour buffer to manual pruning (morcos)
 - #9761 `9828f9a` Use 2 hour grace period for key timestamps in importmulti rescans (ryanofsky)
 - #9474 `48d7e0d` Mark the minconf parameter to move as ignored (sipa)
+- #9619 `861cb0c` Bugfix: RPC/Mining: GBT should return 1 MB sizelimit before segwit activates (luke-jr)
+- #9773 `9072395` Return errors from importmulti if complete rescans are not successful (ryanofsky)
 
 ### Block and transaction handling
 - #8391 `37d83bb` Consensus: Remove ISM (NicolasDorier)
@@ -396,6 +398,7 @@ and git merge commit are mentioned.
 - #9252 `ce5c1f4` Release cs\_main before calling ProcessNewBlock, or processing headers (cmpctblock handling) (sdaftuar)
 - #9283 `869781c` A few more CTransactionRef optimizations (sipa)
 - #9499 `9c9af5a` Use recent-rejects, orphans, and recently-replaced txn for compact-block-reconstruction
+- #9813 `3972a8e` Read/write mempool.dat as a binary (paveljanik)
 
 ### P2P protocol and network code
 - #8128 `1030fa7` Turn net structures into dumb storage classes (theuni)
@@ -494,6 +497,8 @@ and git merge commit are mentioned.
 - #8249 `4e1567a` Enable (and check for) 64-bit ASLR on Windows (laanwj)
 - #9758 `476cc47` Selectively suppress deprecation warnings (jonasschnelli)
 - #9783 `6d61a2b` release: bump gitian descriptors for a new 0.14 package cache (theuni)
+- #9789 `749fe95` build: add --enable-werror and warn on vla's (theuni)
+- #9831 `99fd85c` build: force a c++ standard to be specified (theuni)
 
 ### GUI
 - #8192 `c503863` Remove URLs from About dialog translations (fanquake)
@@ -536,6 +541,7 @@ and git merge commit are mentioned.
 - #9718 `36f9d3a` Qt/Intro: Various fixes (luke-jr)
 - #9735 `ec66d06` devtools: Handle Qt formatting characters edge-case in update-translations.py (laanwj)
 - #9755 `a441db0` Bugfix: Qt/Options: Restore persistent "restart required" notice (luke-jr)
+- #9817 `7d75a5a` Fix segfault crash when shutdown the GUI in disablewallet mode (jonasschnelli)
 
 ### Wallet
 - #8367 `045106b` Ensure <0.13 clients can't open HD wallets (jonasschnelli)
@@ -575,6 +581,7 @@ and git merge commit are mentioned.
 - #9771 `e43a585` Add missing cs\_wallet lock that triggers new lock held assertion (ryanofsky)
 - #9316 `3097ea4` Disable free transactions when relay is disabled (MarcoFalke)
 - #9615 `d2c9e4d` Wallet incremental fee (morcos)
+- #9760 `40c754c` Remove importmulti always-true check (ryanofsky)
 
 ### Tests and QA
 - #8270 `6e5e5ab` Tests: Use portable #! in python scripts (/usr/bin/env) (ChoHag)
@@ -629,6 +636,8 @@ and git merge commit are mentioned.
 - #9707 `b860915` Fix RPC failure testing (jnewbery)
 - #8621 `e8ed6eb` contrib: python: Don't use shell=True (MarcoFalke)
 - #9269 `43e8150` Align struct COrphan definition (sipa)
+- #9820 `599c69a` Fix pruning test broken by 2 hour manual prune window (ryanofsky)
+- #9824 `260c71c` qa: Check return code when stopping nodes (MarcoFalke)
 
 ### Documentation
 - #8332 `806b9e7` Clarify witness branches in transaction.h serialization (dcousens)
@@ -713,6 +722,7 @@ and git merge commit are mentioned.
 - #9679 `a351162` Access WorkQueue::running only within the cs lock (TheBlueMatt)
 - #9777 `8dee822` Handle unusual maxsigcachesize gracefully (jnewbery)
 - #8863,#8807 univalue: Pull subtree (MarcoFalke)
+- #9798 `e22c067` Fix Issue #9775 (Check returned value of fopen) (kirit93)
 
 Credits
 =======
@@ -771,6 +781,7 @@ Thanks to everyone who directly contributed to this release:
 - Justin Camarena
 - Karl-Johan Alm
 - Kaz Wesley
+- kirit93
 - Koki Takahashi
 - Lauda
 - leijurv

From 95e68dfe35bb34e437d56c2c97cdfe6fc0a7b30b Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Fri, 17 Feb 2017 15:37:18 -0500
Subject: [PATCH 1766/1802] release: add a few performance-related notes

---
 doc/release-notes.md | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/doc/release-notes.md b/doc/release-notes.md
index 032f7147a3ad8..700fc1fe66324 100644
--- a/doc/release-notes.md
+++ b/doc/release-notes.md
@@ -33,6 +33,28 @@ frequently tested on them.
 Notable changes
 ===============
 
+Performance Improvements
+--------------
+
+Validation speed and network propagation performance have been greatly
+improved, leading to much shorter sync and initial block download times.
+
+- The script signature cache has been reimplemented as a "cuckoo cache",
+  allowing for more signatures to be cached and faster lookups.
+- Assumed-valid blocks have been introduced which allows script validation to
+  be skipped for ancestors of known-good blocks, without changing the security
+  model. See below for more details.
+- In some cases, compact blocks are now relayed before being fully validated as
+  per BIP152.
+- P2P networking has been refactored with a focus on concurrency and
+  throughput. Network operations are no longer bottlenecked by validation. As a
+  result, block fetching is several times faster than previous releases in many
+  cases.
+- The UTXO cache now claims unused mempool memory. This speeds up initial block
+  download as UTXO lookups are a major bottleneck there, and there is no use for
+  the mempool at that stage.
+
+
 Manual Pruning
 --------------
 

From fa230fde648937f7d7f704a54d621c2366cfb4c4 Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Fri, 24 Feb 2017 01:36:32 +0100
Subject: [PATCH 1767/1802] doc: Small release notes fixups in the list of
 pulls

---
 doc/release-notes.md | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/doc/release-notes.md b/doc/release-notes.md
index 33f5ed1f87ef1..557f8985d0620 100644
--- a/doc/release-notes.md
+++ b/doc/release-notes.md
@@ -359,7 +359,6 @@ and git merge commit are mentioned.
 - #8788 `97c7f73` Give RPC commands more information about the RPC request (jonasschnelli)
 - #7948 `5d2c8e5` Augment getblockchaininfo bip9\_softforks data (mruddy)
 - #8980 `0e22855` importmulti: Avoid using boost::variant::operator!=, which is only in newer boost versions (luke-jr)
-- #9087 `924de0b` Give more details when "generate" fails (jtimon)
 - #9025 `4d8558a` Getrawtransaction should take a bool for verbose (jnewbery)
 - #8811 `5754e03` Add support for JSON-RPC named arguments (laanwj)
 - #9520 `2456a83` Deprecate non-txindex getrawtransaction and better warning (sipa)
@@ -419,7 +418,7 @@ and git merge commit are mentioned.
 - #9349 `2db4cbc` Make CScript (and prevector) c++11 movable (sipa)
 - #9252 `ce5c1f4` Release cs\_main before calling ProcessNewBlock, or processing headers (cmpctblock handling) (sdaftuar)
 - #9283 `869781c` A few more CTransactionRef optimizations (sipa)
-- #9499 `9c9af5a` Use recent-rejects, orphans, and recently-replaced txn for compact-block-reconstruction
+- #9499 `9c9af5a` Use recent-rejects, orphans, and recently-replaced txn for compact-block-reconstruction (TheBlueMatt)
 - #9813 `3972a8e` Read/write mempool.dat as a binary (paveljanik)
 
 ### P2P protocol and network code
@@ -566,7 +565,6 @@ and git merge commit are mentioned.
 - #9817 `7d75a5a` Fix segfault crash when shutdown the GUI in disablewallet mode (jonasschnelli)
 
 ### Wallet
-- #8367 `045106b` Ensure <0.13 clients can't open HD wallets (jonasschnelli)
 - #8152 `b9c1cd8` Remove `CWalletDB*` parameter from CWallet::AddToWallet (pstratem)
 - #8432 `c7e05b3` Make CWallet::fFileBacked private (pstratem)
 - #8445 `f916700` Move CWallet::setKeyPool to private section of CWallet (pstratem)
@@ -577,7 +575,7 @@ and git merge commit are mentioned.
 - #8696 `a1f8d3e` Wallet: Remove last external reference to CWalletDB (pstratem)
 - #8768 `886e8c9` init: Get rid of fDisableWallet (MarcoFalke)
 - #8486 `ab0b411` Add high transaction fee warnings (MarcoFalke)
-- #8851 `940748b` Move key derivation logic from GenerateNewKey to DeriveNewChildKey (pstratem) (MarcoFalke)
+- #8851 `940748b` Move key derivation logic from GenerateNewKey to DeriveNewChildKey (pstratem)
 - #8287 `e10af96` Set fLimitFree = true (MarcoFalke)
 - #8928 `c587577` Fix init segfault where InitLoadWallet() calls ATMP before genesis (TheBlueMatt)
 - #7551 `f2d7056` Add importmulti RPC call (pedrobranco)
@@ -656,7 +654,6 @@ and git merge commit are mentioned.
 - #9691 `fc67cd2` Init ECC context for `test_bitcoin_fuzzy` (gmaxwell)
 - #9712 `d304fef` bench: Fix initialization order in registration (laanwj)
 - #9707 `b860915` Fix RPC failure testing (jnewbery)
-- #8621 `e8ed6eb` contrib: python: Don't use shell=True (MarcoFalke)
 - #9269 `43e8150` Align struct COrphan definition (sipa)
 - #9820 `599c69a` Fix pruning test broken by 2 hour manual prune window (ryanofsky)
 - #9824 `260c71c` qa: Check return code when stopping nodes (MarcoFalke)
@@ -702,6 +699,7 @@ and git merge commit are mentioned.
 - #8274 `7a2d402` util: Update tinyformat (laanwj)
 - #8291 `5cac8b1` util: CopyrightHolders: Check for untranslated substitution (MarcoFalke)
 - #8557 `44691f3` contrib: Rework verifybinaries (MarcoFalke)
+- #8621 `e8ed6eb` contrib: python: Don't use shell=True (MarcoFalke)
 - #8813 `fb24d7e` bitcoind: Daemonize using daemon(3) (laanwj)
 - #9004 `67728a3` Clarify `listenonion` (unsystemizer)
 - #8674 `bae81b8` tools for analyzing, updating and adding copyright headers in source files (isle2983)

From eddaa6b35d41aefead1a57ea54e7e15ce069f79a Mon Sep 17 00:00:00 2001
From: Russell Yanofsky <russ@yanofsky.org>
Date: Thu, 23 Feb 2017 13:05:40 -0500
Subject: [PATCH 1768/1802] [qa] Make import-rescan.py watchonly check reliable

Send payments during the test from a different node than the node generating
keys to be imported, so the spending node doesn't create transactions that
inadvertently involve (spend funds from) the imported keys.

Fixes #9826

Github-Pull: #9839
Rebased-From: 864890adf5fefcf969f82f70949199b68b36f165
---
 qa/rpc-tests/import-rescan.py | 30 ++++++++++++++++++------------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/qa/rpc-tests/import-rescan.py b/qa/rpc-tests/import-rescan.py
index 54cc6d2642adf..7f2c321746c88 100755
--- a/qa/rpc-tests/import-rescan.py
+++ b/qa/rpc-tests/import-rescan.py
@@ -5,11 +5,11 @@
 """Test rescan behavior of importaddress, importpubkey, importprivkey, and
 importmulti RPCs with different types of keys and rescan options.
 
-In the first part of the test, node 0 creates an address for each type of
-import RPC call and sends BTC to it. Then other nodes import the addresses,
-and the test makes listtransactions and getbalance calls to confirm that the
-importing node either did or did not execute rescans picking up the send
-transactions.
+In the first part of the test, node 1 creates an address for each type of
+import RPC call and node 0 sends BTC to it. Then other nodes import the
+addresses, and the test makes listtransactions and getbalance calls to confirm
+that the importing node either did or did not execute rescans picking up the
+send transactions.
 
 In the second part of the test, node 0 sends more BTC to each address, and the
 test makes more listtransactions and getbalance calls to confirm that the
@@ -81,6 +81,12 @@ def check(self, txid=None, amount=None, confirmations=None):
             assert_equal(tx["txid"], txid)
             assert_equal(tx["confirmations"], confirmations)
             assert_equal("trusted" not in tx, True)
+            # Verify the transaction is correctly marked watchonly depending on
+            # whether the transaction pays to an imported public key or
+            # imported private key. The test setup ensures that transaction
+            # inputs will not be from watchonly keys (important because
+            # involvesWatchonly will be true if either the transaction output
+            # or inputs are watchonly).
             if self.data != Data.priv:
                 assert_equal(tx["involvesWatchonly"], True)
             else:
@@ -106,11 +112,11 @@ def check(self, txid=None, amount=None, confirmations=None):
 class ImportRescanTest(BitcoinTestFramework):
     def __init__(self):
         super().__init__()
-        self.num_nodes = 1 + len(IMPORT_NODES)
+        self.num_nodes = 2 + len(IMPORT_NODES)
 
     def setup_network(self):
         extra_args = [["-debug=1"] for _ in range(self.num_nodes)]
-        for i, import_node in enumerate(IMPORT_NODES, 1):
+        for i, import_node in enumerate(IMPORT_NODES, 2):
             if import_node.prune:
                 extra_args[i] += ["-prune=1"]
 
@@ -123,9 +129,9 @@ def run_test(self):
         # each possible type of wallet import RPC.
         for i, variant in enumerate(IMPORT_VARIANTS):
             variant.label = "label {} {}".format(i, variant)
-            variant.address = self.nodes[0].validateaddress(self.nodes[0].getnewaddress(variant.label))
-            variant.key = self.nodes[0].dumpprivkey(variant.address["address"])
-            variant.initial_amount = 25 - (i + 1) / 4.0
+            variant.address = self.nodes[1].validateaddress(self.nodes[1].getnewaddress(variant.label))
+            variant.key = self.nodes[1].dumpprivkey(variant.address["address"])
+            variant.initial_amount = 10 - (i + 1) / 4.0
             variant.initial_txid = self.nodes[0].sendtoaddress(variant.address["address"], variant.initial_amount)
 
         # Generate a block containing the initial transactions, then another
@@ -142,7 +148,7 @@ def run_test(self):
         for variant in IMPORT_VARIANTS:
             variant.expect_disabled = variant.rescan == Rescan.yes and variant.prune and variant.call == Call.single
             expect_rescan = variant.rescan == Rescan.yes and not variant.expect_disabled
-            variant.node = self.nodes[1 + IMPORT_NODES.index(ImportNode(variant.prune, expect_rescan))]
+            variant.node = self.nodes[2 + IMPORT_NODES.index(ImportNode(variant.prune, expect_rescan))]
             variant.do_import(timestamp)
             if expect_rescan:
                 variant.expected_balance = variant.initial_amount
@@ -156,7 +162,7 @@ def run_test(self):
         # Create new transactions sending to each address.
         fee = self.nodes[0].getnetworkinfo()["relayfee"]
         for i, variant in enumerate(IMPORT_VARIANTS):
-            variant.sent_amount = 25 - (2 * i + 1) / 8.0
+            variant.sent_amount = 10 - (2 * i + 1) / 8.0
             variant.sent_txid = self.nodes[0].sendtoaddress(variant.address["address"], variant.sent_amount)
 
         # Generate a block containing the new transactions.

From 50ae5c711a35828e91bbf880c9508776703ec51e Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Sun, 26 Feb 2017 12:15:47 -0500
Subject: [PATCH 1769/1802] Document increase in memory usage due to
 mempool/dbcache sharing

---
 doc/release-notes.md | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/doc/release-notes.md b/doc/release-notes.md
index 557f8985d0620..1bf9261c8d651 100644
--- a/doc/release-notes.md
+++ b/doc/release-notes.md
@@ -342,6 +342,16 @@ Fundrawtransaction change address reuse
 - Users should also consider using `getrawchangeaddress()` in conjunction
   with `fundrawtransaction`'s `changeAddress` option.
 
+Unused mempool memory used by coincache
+----------------------------------------
+
+- Before 0.14, memory reserved for mempool (using the `-maxmempool` option)
+  went unused during initial block download, or IBD. In 0.14, the UTXO DB cache
+  (controlled with the `-dbcache` option) borrows memory from the mempool
+  when there is extra memory available. This may result in an increase in
+  memory usage during IBD for those previously relying on only the `-dbcache`
+  option to limit memory during that time.
+
 0.14.0 Change log
 =================
 

From 29bae0c6c5a03890e3498f1ee194f5bef5426091 Mon Sep 17 00:00:00 2001
From: Russell Yanofsky <russ@yanofsky.org>
Date: Mon, 27 Feb 2017 11:35:35 -0500
Subject: [PATCH 1770/1802] Mention bumpfee in 0.14 release notes.

---
 doc/release-notes.md | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/doc/release-notes.md b/doc/release-notes.md
index 33f5ed1f87ef1..9c7064d0dcc8a 100644
--- a/doc/release-notes.md
+++ b/doc/release-notes.md
@@ -168,7 +168,8 @@ Opt into RBF When Sending
 
 A new startup option, `-walletrbf`, has been added to allow users to have all
 transactions sent opt into RBF support. The default value for this option is
-currently `false`, so transactions will not opt into RBF by default.
+currently `false`, so transactions will not opt into RBF by default. The new
+`bumpfee` RPC can be used to replace transactions that opt into RBF.
 
 Sensitive Data Is No Longer Stored In Debug Console History
 -----------------------------------------------------------
@@ -247,6 +248,11 @@ Low-level RPC changes
    optimizations to memory management. See [Pull #8753](https://github.com/bitcoin/bitcoin/pull/8753)
    for more information.
 
+ - A new RPC command `bumpfee` has been added which allows replacing an
+   unconfirmed wallet transaction that signaled RBF (see the `-walletrbf`
+   startup option above) with a new transaction that pays a higher fee, and
+   should be more likely to get confirmed quickly.
+
 HTTP REST Changes
 -----------------
 

From 50953c2aadca85c8664eac612072b0df98fceee7 Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Mon, 27 Feb 2017 13:15:39 +0100
Subject: [PATCH 1771/1802] tests: Fix dangling pwalletMain pointer in wallet
 tests

Github-Pull: #9875
Rebased-From: 75a109338fbbe9a30c54d76010b538c8ac1080ac
---
 src/wallet/test/wallet_tests.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/wallet/test/wallet_tests.cpp b/src/wallet/test/wallet_tests.cpp
index d32e8ba06adb0..43d7e3c617d74 100644
--- a/src/wallet/test/wallet_tests.cpp
+++ b/src/wallet/test/wallet_tests.cpp
@@ -397,6 +397,7 @@ BOOST_FIXTURE_TEST_CASE(rescan, TestChain100Setup)
 
     {
         CWallet wallet;
+        CWallet *backup = ::pwalletMain;
         ::pwalletMain = &wallet;
         UniValue key;
         key.setObject();
@@ -412,6 +413,7 @@ BOOST_FIXTURE_TEST_CASE(rescan, TestChain100Setup)
 
         UniValue response = importmulti(request);
         BOOST_CHECK_EQUAL(response.write(), strprintf("[{\"success\":false,\"error\":{\"code\":-1,\"message\":\"Failed to rescan before time %d, transactions may be missing.\"}}]", newTip->GetBlockTimeMax()));
+        ::pwalletMain = backup;
     }
 }
 

From 69832aaad53c9236062ad89c28ad5f28b359b448 Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Fri, 24 Feb 2017 18:20:03 -0500
Subject: [PATCH 1772/1802] don't throw std::bad_alloc when out of memory.
 Instead, terminate immediately

Github-Pull: #9856
Rebased-From: c5f008a4166bae4350881a74fc04a87d7a5c4ed5
---
 src/init.cpp | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/src/init.cpp b/src/init.cpp
index 7c108ac4a6381..5820d8f57c357 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -801,6 +801,19 @@ ServiceFlags nLocalServices = NODE_NETWORK;
 
 }
 
+[[noreturn]] static void new_handler_terminate()
+{
+    // Rather than throwing std::bad-alloc if allocation fails, terminate
+    // immediately to (try to) avoid chain corruption.
+    // Since LogPrintf may itself allocate memory, set the handler directly
+    // to terminate first.
+    std::set_new_handler(std::terminate);
+    LogPrintf("Error: Out of memory. Terminating.\n");
+
+    // The log was successful, terminate now.
+    std::terminate();
+};
+
 bool AppInitBasicSetup()
 {
     // ********************************************************* Step 1: setup
@@ -853,6 +866,9 @@ bool AppInitBasicSetup()
     // Ignore SIGPIPE, otherwise it will bring the daemon down if the client closes unexpectedly
     signal(SIGPIPE, SIG_IGN);
 #endif
+
+    std::set_new_handler(new_handler_terminate);
+
     return true;
 }
 

From 775cf54d0e0ad97e043e46fd88018ed6e0bd2684 Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Sat, 25 Feb 2017 01:06:25 -0500
Subject: [PATCH 1773/1802] prevector: assert successful allocation

Github-Pull: #9856
Rebased-From: d4ee7baef729da5e18b5e5c3d6ddb5b97df8d4e4
---
 src/prevector.h | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/prevector.h b/src/prevector.h
index 6b2f578f5c869..cba2e30057afa 100644
--- a/src/prevector.h
+++ b/src/prevector.h
@@ -5,6 +5,7 @@
 #ifndef _BITCOIN_PREVECTOR_H_
 #define _BITCOIN_PREVECTOR_H_
 
+#include <assert.h>
 #include <stdlib.h>
 #include <stdint.h>
 #include <string.h>
@@ -170,10 +171,15 @@ class prevector {
             }
         } else {
             if (!is_direct()) {
+                /* FIXME: Because malloc/realloc here won't call new_handler if allocation fails, assert
+                    success. These should instead use an allocator or new/delete so that handlers
+                    are called as necessary, but performance would be slightly degraded by doing so. */
                 _union.indirect = static_cast<char*>(realloc(_union.indirect, ((size_t)sizeof(T)) * new_capacity));
+                assert(_union.indirect);
                 _union.capacity = new_capacity;
             } else {
                 char* new_indirect = static_cast<char*>(malloc(((size_t)sizeof(T)) * new_capacity));
+                assert(new_indirect);
                 T* src = direct_ptr(0);
                 T* dst = reinterpret_cast<T*>(new_indirect);
                 memcpy(dst, src, size() * sizeof(T));

From 08e0690f3f3b2f33040916200e8d4444298cf226 Mon Sep 17 00:00:00 2001
From: Russell Yanofsky <russ@yanofsky.org>
Date: Thu, 23 Feb 2017 13:44:12 -0500
Subject: [PATCH 1774/1802] Update sendfrom RPC help to correct coin selection
 misconception

Github-Pull: #9840
Rebased-From: f81f0d003079b96b8c33d3dfe76f90e50344bcd8
---
 src/wallet/rpcwallet.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index 45b572aa2e2e6..510b2d6ebcdd4 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -819,6 +819,9 @@ UniValue sendfrom(const JSONRPCRequest& request)
             + HelpRequiringPassphrase() + "\n"
             "\nArguments:\n"
             "1. \"fromaccount\"       (string, required) The name of the account to send funds from. May be the default account using \"\".\n"
+            "                       Specifying an account does not influence coin selection, but it does associate the newly created\n"
+            "                       transaction with the account, so the account's balance computation and transaction history can reflect\n"
+            "                       the spend.\n"
             "2. \"toaddress\"         (string, required) The bitcoin address to send funds to.\n"
             "3. amount                (numeric or string, required) The amount in " + CURRENCY_UNIT + " (transaction fee is added on top).\n"
             "4. minconf               (numeric, optional, default=1) Only use funds with at least this many confirmations.\n"

From a48b998ff377a827357732b8868b0de10768129d Mon Sep 17 00:00:00 2001
From: Suhas Daftuar <sdaftuar@gmail.com>
Date: Mon, 27 Feb 2017 12:14:14 -0500
Subject: [PATCH 1775/1802] [doc] Update doc/bips.md for BIP90 implementation

Github-Pull: #9879
Rebased-From: fe71661ae16abe09dcf245ee2eb4c55c5655b219
---
 doc/bips.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/bips.md b/doc/bips.md
index 4f4161008916e..bc8dcb6fb3c33 100644
--- a/doc/bips.md
+++ b/doc/bips.md
@@ -20,6 +20,7 @@ BIPs that are implemented by Bitcoin Core (up-to-date up to **v0.13.0**):
 * [`BIP 66`](https://github.com/bitcoin/bips/blob/master/bip-0066.mediawiki): The strict DER rules and associated version 3 blocks have been implemented since **v0.10.0** ([PR #5713](https://github.com/bitcoin/bitcoin/pull/5713)).
 * [`BIP 68`](https://github.com/bitcoin/bips/blob/master/bip-0068.mediawiki): Sequence locks have been implemented as of **v0.12.1**  ([PR #7184](https://github.com/bitcoin/bitcoin/pull/7184)), and have been activated since *block 419328*.
 * [`BIP 70`](https://github.com/bitcoin/bips/blob/master/bip-0070.mediawiki) [`71`](https://github.com/bitcoin/bips/blob/master/bip-0071.mediawiki) [`72`](https://github.com/bitcoin/bips/blob/master/bip-0072.mediawiki): Payment Protocol support has been available in Bitcoin Core GUI since **v0.9.0** ([PR #5216](https://github.com/bitcoin/bitcoin/pull/5216)).
+* [`BIP 90`](https://github.com/bitcoin/bips/blob/master/bip-0090.mediawiki): Trigger mechanism for activation of BIPs 34, 65, and 66 has been simplified to block height checks since **v0.14.0** ([PR #8391](https://github.com/bitcoin/bitcoin/pull/8391)).
 * [`BIP 111`](https://github.com/bitcoin/bips/blob/master/bip-0111.mediawiki): `NODE_BLOOM` service bit added, and enforced for all peer versions as of **v0.13.0** ([PR #6579](https://github.com/bitcoin/bitcoin/pull/6579) and [PR #6641](https://github.com/bitcoin/bitcoin/pull/6641)).
 * [`BIP 112`](https://github.com/bitcoin/bips/blob/master/bip-0112.mediawiki): The CHECKSEQUENCEVERIFY opcode has been implemented since **v0.12.1** ([PR #7524](https://github.com/bitcoin/bitcoin/pull/7524)) and has been activated since *block 419328*.
 * [`BIP 113`](https://github.com/bitcoin/bips/blob/master/bip-0113.mediawiki): Median time past lock-time calculations have been implemented since **v0.12.1** ([PR #6566](https://github.com/bitcoin/bitcoin/pull/6566)) and have been activated since *block 419328*.

From 289204fbe0c188b3cd145dd7b2e271f97a956ba3 Mon Sep 17 00:00:00 2001
From: Marijn Stollenga <m.stollenga@gmail.com>
Date: Sun, 26 Feb 2017 14:01:05 +0100
Subject: [PATCH 1776/1802] Change bitcoin address in RPC helpaddress to an
 invalid address, so people don't accidentally send coins there (like I did).

Github-Pull: #9865
Rebased-From: 83ac719d34f98cc1d3efa6ece2b95145bcde8775
---
 src/rpc/misc.cpp         |  8 ++++----
 src/wallet/rpcwallet.cpp | 30 +++++++++++++++---------------
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/src/rpc/misc.cpp b/src/rpc/misc.cpp
index 6fd50127bd5b3..0bcc2a97cc388 100644
--- a/src/rpc/misc.cpp
+++ b/src/rpc/misc.cpp
@@ -347,11 +347,11 @@ UniValue verifymessage(const JSONRPCRequest& request)
             "\nUnlock the wallet for 30 seconds\n"
             + HelpExampleCli("walletpassphrase", "\"mypassphrase\" 30") +
             "\nCreate the signature\n"
-            + HelpExampleCli("signmessage", "\"1D1ZrZNe3JUo7ZycKEYQQiQAWd9y54F4XZ\" \"my message\"") +
+            + HelpExampleCli("signmessage", "\"1D1ZrZNe3JUo7ZycKEYQQiQAWd9y54F4XX\" \"my message\"") +
             "\nVerify the signature\n"
-            + HelpExampleCli("verifymessage", "\"1D1ZrZNe3JUo7ZycKEYQQiQAWd9y54F4XZ\" \"signature\" \"my message\"") +
+            + HelpExampleCli("verifymessage", "\"1D1ZrZNe3JUo7ZycKEYQQiQAWd9y54F4XX\" \"signature\" \"my message\"") +
             "\nAs json rpc\n"
-            + HelpExampleRpc("verifymessage", "\"1D1ZrZNe3JUo7ZycKEYQQiQAWd9y54F4XZ\", \"signature\", \"my message\"")
+            + HelpExampleRpc("verifymessage", "\"1D1ZrZNe3JUo7ZycKEYQQiQAWd9y54F4XX\", \"signature\", \"my message\"")
         );
 
     LOCK(cs_main);
@@ -400,7 +400,7 @@ UniValue signmessagewithprivkey(const JSONRPCRequest& request)
             "\nCreate the signature\n"
             + HelpExampleCli("signmessagewithprivkey", "\"privkey\" \"my message\"") +
             "\nVerify the signature\n"
-            + HelpExampleCli("verifymessage", "\"1D1ZrZNe3JUo7ZycKEYQQiQAWd9y54F4XZ\" \"signature\" \"my message\"") +
+            + HelpExampleCli("verifymessage", "\"1D1ZrZNe3JUo7ZycKEYQQiQAWd9y54F4XX\" \"signature\" \"my message\"") +
             "\nAs json rpc\n"
             + HelpExampleRpc("signmessagewithprivkey", "\"privkey\", \"my message\"")
         );
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index 510b2d6ebcdd4..5cf1592376f5a 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -236,8 +236,8 @@ UniValue setaccount(const JSONRPCRequest& request)
             "1. \"address\"         (string, required) The bitcoin address to be associated with an account.\n"
             "2. \"account\"         (string, required) The account to assign the address to.\n"
             "\nExamples:\n"
-            + HelpExampleCli("setaccount", "\"1D1ZrZNe3JUo7ZycKEYQQiQAWd9y54F4XZ\" \"tabby\"")
-            + HelpExampleRpc("setaccount", "\"1D1ZrZNe3JUo7ZycKEYQQiQAWd9y54F4XZ\", \"tabby\"")
+            + HelpExampleCli("setaccount", "\"1D1ZrZNe3JUo7ZycKEYQQiQAWd9y54F4XX\" \"tabby\"")
+            + HelpExampleRpc("setaccount", "\"1D1ZrZNe3JUo7ZycKEYQQiQAWd9y54F4XX\", \"tabby\"")
         );
 
     LOCK2(cs_main, pwalletMain->cs_wallet);
@@ -283,8 +283,8 @@ UniValue getaccount(const JSONRPCRequest& request)
             "\nResult:\n"
             "\"accountname\"        (string) the account address\n"
             "\nExamples:\n"
-            + HelpExampleCli("getaccount", "\"1D1ZrZNe3JUo7ZycKEYQQiQAWd9y54F4XZ\"")
-            + HelpExampleRpc("getaccount", "\"1D1ZrZNe3JUo7ZycKEYQQiQAWd9y54F4XZ\"")
+            + HelpExampleCli("getaccount", "\"1D1ZrZNe3JUo7ZycKEYQQiQAWd9y54F4XX\"")
+            + HelpExampleRpc("getaccount", "\"1D1ZrZNe3JUo7ZycKEYQQiQAWd9y54F4XX\"")
         );
 
     LOCK2(cs_main, pwalletMain->cs_wallet);
@@ -503,11 +503,11 @@ UniValue signmessage(const JSONRPCRequest& request)
             "\nUnlock the wallet for 30 seconds\n"
             + HelpExampleCli("walletpassphrase", "\"mypassphrase\" 30") +
             "\nCreate the signature\n"
-            + HelpExampleCli("signmessage", "\"1D1ZrZNe3JUo7ZycKEYQQiQAWd9y54F4XZ\" \"my message\"") +
+            + HelpExampleCli("signmessage", "\"1D1ZrZNe3JUo7ZycKEYQQiQAWd9y54F4XX\" \"my message\"") +
             "\nVerify the signature\n"
-            + HelpExampleCli("verifymessage", "\"1D1ZrZNe3JUo7ZycKEYQQiQAWd9y54F4XZ\" \"signature\" \"my message\"") +
+            + HelpExampleCli("verifymessage", "\"1D1ZrZNe3JUo7ZycKEYQQiQAWd9y54F4XX\" \"signature\" \"my message\"") +
             "\nAs json rpc\n"
-            + HelpExampleRpc("signmessage", "\"1D1ZrZNe3JUo7ZycKEYQQiQAWd9y54F4XZ\", \"my message\"")
+            + HelpExampleRpc("signmessage", "\"1D1ZrZNe3JUo7ZycKEYQQiQAWd9y54F4XX\", \"my message\"")
         );
 
     LOCK2(cs_main, pwalletMain->cs_wallet);
@@ -556,13 +556,13 @@ UniValue getreceivedbyaddress(const JSONRPCRequest& request)
             "amount   (numeric) The total amount in " + CURRENCY_UNIT + " received at this address.\n"
             "\nExamples:\n"
             "\nThe amount from transactions with at least 1 confirmation\n"
-            + HelpExampleCli("getreceivedbyaddress", "\"1D1ZrZNe3JUo7ZycKEYQQiQAWd9y54F4XZ\"") +
+            + HelpExampleCli("getreceivedbyaddress", "\"1D1ZrZNe3JUo7ZycKEYQQiQAWd9y54F4XX\"") +
             "\nThe amount including unconfirmed transactions, zero confirmations\n"
-            + HelpExampleCli("getreceivedbyaddress", "\"1D1ZrZNe3JUo7ZycKEYQQiQAWd9y54F4XZ\" 0") +
+            + HelpExampleCli("getreceivedbyaddress", "\"1D1ZrZNe3JUo7ZycKEYQQiQAWd9y54F4XX\" 0") +
             "\nThe amount with at least 6 confirmation, very safe\n"
-            + HelpExampleCli("getreceivedbyaddress", "\"1D1ZrZNe3JUo7ZycKEYQQiQAWd9y54F4XZ\" 6") +
+            + HelpExampleCli("getreceivedbyaddress", "\"1D1ZrZNe3JUo7ZycKEYQQiQAWd9y54F4XX\" 6") +
             "\nAs a json rpc call\n"
-            + HelpExampleRpc("getreceivedbyaddress", "\"1D1ZrZNe3JUo7ZycKEYQQiQAWd9y54F4XZ\", 6")
+            + HelpExampleRpc("getreceivedbyaddress", "\"1D1ZrZNe3JUo7ZycKEYQQiQAWd9y54F4XX\", 6")
        );
 
     LOCK2(cs_main, pwalletMain->cs_wallet);
@@ -906,13 +906,13 @@ UniValue sendmany(const JSONRPCRequest& request)
             "                                    the number of addresses.\n"
             "\nExamples:\n"
             "\nSend two amounts to two different addresses:\n"
-            + HelpExampleCli("sendmany", "\"\" \"{\\\"1D1ZrZNe3JUo7ZycKEYQQiQAWd9y54F4XZ\\\":0.01,\\\"1353tsE8YMTA4EuV7dgUXGjNFf9KpVvKHz\\\":0.02}\"") +
+            + HelpExampleCli("sendmany", "\"\" \"{\\\"1D1ZrZNe3JUo7ZycKEYQQiQAWd9y54F4XX\\\":0.01,\\\"1353tsE8YMTA4EuV7dgUXGjNFf9KpVvKHz\\\":0.02}\"") +
             "\nSend two amounts to two different addresses setting the confirmation and comment:\n"
-            + HelpExampleCli("sendmany", "\"\" \"{\\\"1D1ZrZNe3JUo7ZycKEYQQiQAWd9y54F4XZ\\\":0.01,\\\"1353tsE8YMTA4EuV7dgUXGjNFf9KpVvKHz\\\":0.02}\" 6 \"testing\"") +
+            + HelpExampleCli("sendmany", "\"\" \"{\\\"1D1ZrZNe3JUo7ZycKEYQQiQAWd9y54F4XX\\\":0.01,\\\"1353tsE8YMTA4EuV7dgUXGjNFf9KpVvKHz\\\":0.02}\" 6 \"testing\"") +
             "\nSend two amounts to two different addresses, subtract fee from amount:\n"
-            + HelpExampleCli("sendmany", "\"\" \"{\\\"1D1ZrZNe3JUo7ZycKEYQQiQAWd9y54F4XZ\\\":0.01,\\\"1353tsE8YMTA4EuV7dgUXGjNFf9KpVvKHz\\\":0.02}\" 1 \"\" \"[\\\"1D1ZrZNe3JUo7ZycKEYQQiQAWd9y54F4XZ\\\",\\\"1353tsE8YMTA4EuV7dgUXGjNFf9KpVvKHz\\\"]\"") +
+            + HelpExampleCli("sendmany", "\"\" \"{\\\"1D1ZrZNe3JUo7ZycKEYQQiQAWd9y54F4XX\\\":0.01,\\\"1353tsE8YMTA4EuV7dgUXGjNFf9KpVvKHz\\\":0.02}\" 1 \"\" \"[\\\"1D1ZrZNe3JUo7ZycKEYQQiQAWd9y54F4XX\\\",\\\"1353tsE8YMTA4EuV7dgUXGjNFf9KpVvKHz\\\"]\"") +
             "\nAs a json rpc call\n"
-            + HelpExampleRpc("sendmany", "\"\", \"{\\\"1D1ZrZNe3JUo7ZycKEYQQiQAWd9y54F4XZ\\\":0.01,\\\"1353tsE8YMTA4EuV7dgUXGjNFf9KpVvKHz\\\":0.02}\", 6, \"testing\"")
+            + HelpExampleRpc("sendmany", "\"\", \"{\\\"1D1ZrZNe3JUo7ZycKEYQQiQAWd9y54F4XX\\\":0.01,\\\"1353tsE8YMTA4EuV7dgUXGjNFf9KpVvKHz\\\":0.02}\", 6, \"testing\"")
         );
 
     LOCK2(cs_main, pwalletMain->cs_wallet);

From 1825a03f8144572eaf532b6b3b3acc1a09577d1f Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Fri, 17 Feb 2017 15:28:28 -0800
Subject: [PATCH 1777/1802] Avoid VLA in hash.h

Github-Pull: #9791
Rebased-From: 5c8fd508112016c3821b71112270afe83e6949ac
---
 src/hash.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/hash.h b/src/hash.h
index 3b86fcc033c1c..eacb8f04fef37 100644
--- a/src/hash.h
+++ b/src/hash.h
@@ -25,9 +25,9 @@ class CHash256 {
     static const size_t OUTPUT_SIZE = CSHA256::OUTPUT_SIZE;
 
     void Finalize(unsigned char hash[OUTPUT_SIZE]) {
-        unsigned char buf[sha.OUTPUT_SIZE];
+        unsigned char buf[CSHA256::OUTPUT_SIZE];
         sha.Finalize(buf);
-        sha.Reset().Write(buf, sha.OUTPUT_SIZE).Finalize(hash);
+        sha.Reset().Write(buf, CSHA256::OUTPUT_SIZE).Finalize(hash);
     }
 
     CHash256& Write(const unsigned char *data, size_t len) {
@@ -49,9 +49,9 @@ class CHash160 {
     static const size_t OUTPUT_SIZE = CRIPEMD160::OUTPUT_SIZE;
 
     void Finalize(unsigned char hash[OUTPUT_SIZE]) {
-        unsigned char buf[sha.OUTPUT_SIZE];
+        unsigned char buf[CSHA256::OUTPUT_SIZE];
         sha.Finalize(buf);
-        CRIPEMD160().Write(buf, sha.OUTPUT_SIZE).Finalize(hash);
+        CRIPEMD160().Write(buf, CSHA256::OUTPUT_SIZE).Finalize(hash);
     }
 
     CHash160& Write(const unsigned char *data, size_t len) {

From 8d2d08efaa5fb6b29638fef7fb9bdf051db85f2e Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Tue, 28 Feb 2017 11:48:40 +0000
Subject: [PATCH 1778/1802] qt: pre-rc3 translations update

---
 src/qt/locale/bitcoin_es.ts |  48 +++
 src/qt/locale/bitcoin_sk.ts | 642 +++++++++++++++++++++++++++++++++++-
 2 files changed, 679 insertions(+), 11 deletions(-)

diff --git a/src/qt/locale/bitcoin_es.ts b/src/qt/locale/bitcoin_es.ts
index e23064b0fefd5..6e220ea9605db 100644
--- a/src/qt/locale/bitcoin_es.ts
+++ b/src/qt/locale/bitcoin_es.ts
@@ -485,6 +485,10 @@
         <source>%1 client</source>
         <translation>%1 cliente</translation>
     </message>
+    <message>
+        <source>Connecting to peers...</source>
+        <translation>Conectando a pares...</translation>
+    </message>
     <message>
         <source>Catching up...</source>
         <translation>Actualizando...</translation>
@@ -2473,6 +2477,10 @@
 </context>
 <context>
     <name>TransactionDesc</name>
+    <message numerus="yes">
+        <source>Open for %n more block(s)</source>
+        <translation><numerusform>Abrir para %n bloque más</numerusform><numerusform>Abrir para %n bloques más</numerusform></translation>
+    </message>
     <message>
         <source>Open until %1</source>
         <translation>Abierto hasta %1</translation>
@@ -2517,6 +2525,10 @@
         <source>, has not been successfully broadcast yet</source>
         <translation>, no ha sido emitido con éxito aún</translation>
     </message>
+    <message numerus="yes">
+        <source>, broadcast through %n node(s)</source>
+        <translation><numerusform>, transmitir a través de %n nodo</numerusform><numerusform>, transmitir a través de %n nodos</numerusform></translation>
+    </message>
     <message>
         <source>Date</source>
         <translation>Fecha</translation>
@@ -2557,6 +2569,10 @@
         <source>Credit</source>
         <translation>Credito</translation>
     </message>
+    <message numerus="yes">
+        <source>matures in %n more block(s)</source>
+        <translation><numerusform>disponible en %n bloque más</numerusform><numerusform>disponible en %n bloques más</numerusform></translation>
+    </message>
     <message>
         <source>not accepted</source>
         <translation>no aceptada</translation>
@@ -2593,6 +2609,10 @@
         <source>Transaction ID</source>
         <translation>Identificador de transacción (ID)</translation>
     </message>
+    <message>
+        <source>Transaction total size</source>
+        <translation>Tamaño total de transacción</translation>
+    </message>
     <message>
         <source>Output index</source>
         <translation>Indice de salida</translation>
@@ -2655,6 +2675,10 @@
         <source>Label</source>
         <translation>Etiqueta</translation>
     </message>
+    <message numerus="yes">
+        <source>Open for %n more block(s)</source>
+        <translation><numerusform>Abrir para %n bloque más</numerusform><numerusform>Abrir para %n bloques más</numerusform></translation>
+    </message>
     <message>
         <source>Open until %1</source>
         <translation>Abierto hasta %1</translation>
@@ -2987,6 +3011,18 @@
         <translation>Aceptar comandos consola y JSON-RPC
 </translation>
     </message>
+    <message>
+        <source>Accept connections from outside (default: 1 if no -proxy or -connect/-noconnect)</source>
+        <translation>Aceptar conexiones desde el exterior (predeterminado: 1 si no -proxy o -connect/-desconectar)</translation>
+    </message>
+    <message>
+        <source>Connect only to the specified node(s); -noconnect or -connect=0 alone to disable automatic connections</source>
+        <translation>Conectar sólo al nodo(s) especificado; -no conectar or -conectar=solo 0 para deshabilitar conexiones automáticas</translation>
+    </message>
+    <message>
+        <source>Distributed under the MIT software license, see the accompanying file %s or %s</source>
+        <translation>Distribuido bajo la licencia de software MIT, vea el archivo adjunto %s o %s</translation>
+    </message>
     <message>
         <source>If &lt;category&gt; is not supplied or if &lt;category&gt; = 1, output all debugging information.</source>
         <translation>Si &lt;category&gt; no es proporcionado o si &lt;category&gt; =1, muestra toda la información de depuración.</translation>
@@ -3064,6 +3100,14 @@
         <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source>
         <translation>Ejecutar comando cuando una transacción del monedero cambia (%s en cmd se remplazará por TxID)</translation>
     </message>
+    <message>
+        <source>Extra transactions to keep in memory for compact block reconstructions (default: %u)</source>
+        <translation>Transacciones extra a mantener en la memoria para reconstrucciones de bloque compacto (predeterminado: %u)</translation>
+    </message>
+    <message>
+        <source>If this block is in the chain assume that it and its ancestors are valid and potentially skip their script verification (0 to verify all, default: %s, testnet: %s)</source>
+        <translation>Si este bloque está en la cadena asuma que sus predecesores y él son válidos y potencialmente se saltan su script de verificación (0 para verificar todo, predeterminado: %s, testnet: %s)</translation>
+    </message>
     <message>
         <source>Maximum allowed median peer time offset adjustment. Local perspective of time may be influenced by peers forward or backward by this amount. (default: %u seconds)</source>
         <translation>Ajuste máximo permitido del tiempo offset medio de pares. La perspectiva local de tiempo se verá influenciada por los pares anteriores y posteriores a esta cantidad. (Por defecto: %u segundos)</translation>
@@ -3679,6 +3723,10 @@ Establecer la serialización de las transacciones sin procesar o el bloque hex d
         <source>Invalid -proxy address: '%s'</source>
         <translation>Dirección -proxy inválida: '%s'</translation>
     </message>
+    <message>
+        <source>Keypool ran out, please call keypoolrefill first</source>
+        <translation>Keypool se ha agotado, llame a keypoolrefill primero</translation>
+    </message>
     <message>
         <source>Listen for JSON-RPC connections on &lt;port&gt; (default: %u or testnet: %u)</source>
         <translation>Escuchar conexiones JSON-RPC en &lt;puerto&gt; (predeterminado: %u o testnet: %u)</translation>
diff --git a/src/qt/locale/bitcoin_sk.ts b/src/qt/locale/bitcoin_sk.ts
index 87dc620f0e1bf..1bc26d55d6680 100644
--- a/src/qt/locale/bitcoin_sk.ts
+++ b/src/qt/locale/bitcoin_sk.ts
@@ -41,9 +41,61 @@
         <source>&amp;Delete</source>
         <translation>&amp;Zmazať</translation>
     </message>
-    </context>
+    <message>
+        <source>Choose the address to send coins to</source>
+        <translation>Zvoľte adresu kam poslať mince</translation>
+    </message>
+    <message>
+        <source>Choose the address to receive coins with</source>
+        <translation>Zvoľte adresu na ktorú chcete prijať mince</translation>
+    </message>
+    <message>
+        <source>Sending addresses</source>
+        <translation>Odosielajúce adresy</translation>
+    </message>
+    <message>
+        <source>Receiving addresses</source>
+        <translation>Prijímajúce adresy</translation>
+    </message>
+    <message>
+        <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source>
+        <translation>Toto sú Vaše Bitcoin adresy pre posielanie platieb. Vždy skontrolujte sumu a prijímaciu adresu pred poslaním mincí.</translation>
+    </message>
+    <message>
+        <source>These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source>
+        <translation>Toto sú vaše Bitcoin adresy pre prijímanie platieb. Odporúča sa použiť vždy novú prijímaciu adresu pre každú transakciu.</translation>
+    </message>
+    <message>
+        <source>&amp;Copy Address</source>
+        <translation>&amp;Kopírovať adresu</translation>
+    </message>
+    <message>
+        <source>Copy &amp;Label</source>
+        <translation>Kopírovať &amp;popis</translation>
+    </message>
+    <message>
+        <source>&amp;Edit</source>
+        <translation>&amp;Upraviť</translation>
+    </message>
+    <message>
+        <source>Export Address List</source>
+        <translation>Exportovať zoznam adries</translation>
+    </message>
+    <message>
+        <source>There was an error trying to save the address list to %1. Please try again.</source>
+        <translation>Nastala chyba pri pokuse uložiť zoznam adries do %1. Skúste znovu.</translation>
+    </message>
+</context>
 <context>
     <name>AddressTableModel</name>
+    <message>
+        <source>Label</source>
+        <translation>Popis</translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation>Adresa</translation>
+    </message>
     <message>
         <source>(no label)</source>
         <translation>(bez popisu)</translation>
@@ -67,6 +119,38 @@
         <source>Repeat new passphrase</source>
         <translation>Zopakujte nové heslo</translation>
     </message>
+    <message>
+        <source>Encrypt wallet</source>
+        <translation>Zašifrovať peňaženku</translation>
+    </message>
+    <message>
+        <source>Unlock wallet</source>
+        <translation>Odomknúť peňaženku</translation>
+    </message>
+    <message>
+        <source>Decrypt wallet</source>
+        <translation>Dešifrovať peňaženku</translation>
+    </message>
+    <message>
+        <source>Change passphrase</source>
+        <translation>Zmena hesla</translation>
+    </message>
+    <message>
+        <source>Confirm wallet encryption</source>
+        <translation>Potvrďte zašifrovanie peňaženky</translation>
+    </message>
+    <message>
+        <source>Are you sure you wish to encrypt your wallet?</source>
+        <translation>Ste si istí, že si želáte zašifrovať peňaženku?</translation>
+    </message>
+    <message>
+        <source>Wallet encrypted</source>
+        <translation>Peňaženka zašifrovaná</translation>
+    </message>
+    <message>
+        <source>Wallet unlock failed</source>
+        <translation>Odomykanie peňaženky zlyhalo</translation>
+    </message>
     </context>
 <context>
     <name>BanTableModel</name>
@@ -438,6 +522,26 @@
         <source>Confirmed</source>
         <translation>Potvrdené</translation>
     </message>
+    <message>
+        <source>Copy address</source>
+        <translation>Kopírovať adresu</translation>
+    </message>
+    <message>
+        <source>Copy label</source>
+        <translation>Kopírovať popis</translation>
+    </message>
+    <message>
+        <source>Copy amount</source>
+        <translation>Kopírovať sumu</translation>
+    </message>
+    <message>
+        <source>Copy dust</source>
+        <translation>Kopírovať prach</translation>
+    </message>
+    <message>
+        <source>This label turns red if any recipient receives an amount smaller than the current dust threshold.</source>
+        <translation>Tento popis sčervenie ak ktorýkoľvek príjemca dostane sumu menšiu ako súčasný limit pre "prach".</translation>
+    </message>
     <message>
         <source>(no label)</source>
         <translation>(bez popisu)</translation>
@@ -465,6 +569,30 @@
         <source>&amp;Address</source>
         <translation>&amp;Adresa</translation>
     </message>
+    <message>
+        <source>New receiving address</source>
+        <translation>Nová adresa pre prijímanie</translation>
+    </message>
+    <message>
+        <source>New sending address</source>
+        <translation>Nová adresa pre odoslanie</translation>
+    </message>
+    <message>
+        <source>Edit receiving address</source>
+        <translation>Upraviť prijímajúcu adresu</translation>
+    </message>
+    <message>
+        <source>Edit sending address</source>
+        <translation>Upraviť odosielaciu adresu</translation>
+    </message>
+    <message>
+        <source>The entered address "%1" is not a valid Bitcoin address.</source>
+        <translation>Vložená adresa "%1" nieje platnou adresou Bitcoin.</translation>
+    </message>
+    <message>
+        <source>The entered address "%1" is already in the address book.</source>
+        <translation>Vložená adresa "%1" sa už nachádza v adresári.</translation>
+    </message>
     </context>
 <context>
     <name>FreespaceChecker</name>
@@ -597,6 +725,10 @@
         <source>Last block time</source>
         <translation>Čas posledného bloku</translation>
     </message>
+    <message>
+        <source>Estimated time left until synced</source>
+        <translation>Odhadovaný čas do ukončenia synchronizácie</translation>
+    </message>
     <message>
         <source>Hide</source>
         <translation>Skryť</translation>
@@ -620,7 +752,11 @@
         <source>Select payment request file</source>
         <translation>Vyberte súbor s výzvou k platbe</translation>
     </message>
-    </context>
+    <message>
+        <source>Select payment request file to open</source>
+        <translation>Vyberte ktorý súbor s výzvou na platbu otvoriť</translation>
+    </message>
+</context>
 <context>
     <name>OptionsDialog</name>
     <message>
@@ -933,7 +1069,71 @@
 </context>
 <context>
     <name>PaymentServer</name>
-    </context>
+    <message>
+        <source>Payment request error</source>
+        <translation>Chyba pri vyžiadaní platby</translation>
+    </message>
+    <message>
+        <source>Payment request fetch URL is invalid: %1</source>
+        <translation>URL pre stiahnutie výzvy na zaplatenie je neplatné: %1</translation>
+    </message>
+    <message>
+        <source>Invalid payment address %1</source>
+        <translation>Neplatná adresa platby %1</translation>
+    </message>
+    <message>
+        <source>URI cannot be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source>
+        <translation>URI sa nedá analyzovať! To môže byť spôsobené neplatnou Bitcoin adresou alebo zle nastavenými vlastnosťami URI.</translation>
+    </message>
+    <message>
+        <source>Payment request file handling</source>
+        <translation>Obsluha súboru s požiadavkou na platbu</translation>
+    </message>
+    <message>
+        <source>Payment request file cannot be read! This can be caused by an invalid payment request file.</source>
+        <translation>Súbor s výzvou na zaplatenie sa nedá čítať! To môže byť spôsobené aj neplatným súborom s výzvou.</translation>
+    </message>
+    <message>
+        <source>Payment request rejected</source>
+        <translation>Požiadavka na platbu zamietnutá</translation>
+    </message>
+    <message>
+        <source>Payment request network doesn't match client network.</source>
+        <translation>Sieť požiadavky na platbu nie je zhodná so sieťou klienta.</translation>
+    </message>
+    <message>
+        <source>Payment request expired.</source>
+        <translation>Vypršala platnosť požiadavky na platbu.</translation>
+    </message>
+    <message>
+        <source>Payment request is not initialized.</source>
+        <translation>Požiadavka na platbu nie je inicializovaná</translation>
+    </message>
+    <message>
+        <source>Unverified payment requests to custom payment scripts are unsupported.</source>
+        <translation>Program nepodporuje neoverené platobné požiadavky na vlastné skripty.</translation>
+    </message>
+    <message>
+        <source>Invalid payment request.</source>
+        <translation>Chybná požiadavka na platbu.</translation>
+    </message>
+    <message>
+        <source>Requested payment amount of %1 is too small (considered dust).</source>
+        <translation>Požadovaná suma platby %1 je príliš nízka (považovaná za prach).</translation>
+    </message>
+    <message>
+        <source>Payment request %1 is too large (%2 bytes, allowed %3 bytes).</source>
+        <translation>Požiadavka na platbu %1 je príliš veľká (%2 bajtov, povolené je %3 bajtov).</translation>
+    </message>
+    <message>
+        <source>Payment request cannot be parsed!</source>
+        <translation>Požiadavka na platbu nemôže byť analyzovaná!</translation>
+    </message>
+    <message>
+        <source>Payment acknowledged</source>
+        <translation>Platba potvrdená</translation>
+    </message>
+</context>
 <context>
     <name>PeerTableModel</name>
     <message>
@@ -983,10 +1183,18 @@
         <source>%1 ms</source>
         <translation>%1 ms</translation>
     </message>
+    <message numerus="yes">
+        <source>%n week(s)</source>
+        <translation><numerusform>%n týždeň</numerusform><numerusform>%n týždne</numerusform><numerusform>%n týždňov</numerusform></translation>
+    </message>
     <message>
         <source>%1 and %2</source>
         <translation> %1 a  %2</translation>
     </message>
+    <message numerus="yes">
+        <source>%n year(s)</source>
+        <translation><numerusform>%n rok</numerusform><numerusform>%n roky</numerusform><numerusform>%n rokov</numerusform></translation>
+    </message>
     </context>
 <context>
     <name>QObject::QObject</name>
@@ -1022,7 +1230,7 @@
     </message>
     <message>
         <source>Datadir</source>
-        <translation>Zložka  s dátami</translation>
+        <translation>Priečinok s dátami</translation>
     </message>
     <message>
         <source>Startup time</source>
@@ -1225,6 +1433,10 @@
         <source>Type &lt;b&gt;help&lt;/b&gt; for an overview of available commands.</source>
         <translation>Napíš &lt;b&gt;help&lt;/b&gt; pre prehľad dostupných príkazov.</translation>
     </message>
+    <message>
+        <source>WARNING: Scammers have been active, telling users to type commands here, stealing their wallet contents. Do not use this console without fully understanding the ramification of a command.</source>
+        <translation>VAROVANIE: Podvodníci sú aktívni a môžu nabádať používateľov napísať sem príkazy, pomocou ktorých ukradnú ich obsah peňaženky. Nepoužívajte túto konzolu ak nerozumiete presne účinkom príkazov.</translation>
+    </message>
     <message>
         <source>%1 B</source>
         <translation>%1 B</translation>
@@ -1344,7 +1556,19 @@
         <source>Remove</source>
         <translation>Odstrániť</translation>
     </message>
-    </context>
+    <message>
+        <source>Copy label</source>
+        <translation>Kopírovať popis</translation>
+    </message>
+    <message>
+        <source>Copy message</source>
+        <translation>Kopírovať správu</translation>
+    </message>
+    <message>
+        <source>Copy amount</source>
+        <translation>Kopírovať sumu</translation>
+    </message>
+</context>
 <context>
     <name>ReceiveRequestDialog</name>
     <message>
@@ -1363,14 +1587,66 @@
         <source>&amp;Save Image...</source>
         <translation>Uložiť obrázok...</translation>
     </message>
+    <message>
+        <source>Request payment to %1</source>
+        <translation>Vyžiadať platbu pre %1</translation>
+    </message>
+    <message>
+        <source>Payment information</source>
+        <translation>Informácia o platbe</translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation>Adresa</translation>
+    </message>
+    <message>
+        <source>Amount</source>
+        <translation>Suma</translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation>Popis</translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation>Správa</translation>
+    </message>
+    <message>
+        <source>Resulting URI too long, try to reduce the text for label / message.</source>
+        <translation>Výsledné URI je príliš dlhé, skúste skrátiť text pre popis alebo správu.</translation>
+    </message>
     </context>
 <context>
     <name>RecentRequestsTableModel</name>
+    <message>
+        <source>Date</source>
+        <translation>Dátum</translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation>Popis</translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation>Správa</translation>
+    </message>
     <message>
         <source>(no label)</source>
         <translation>(bez popisu)</translation>
     </message>
-    </context>
+    <message>
+        <source>(no message)</source>
+        <translation>(žiadna správa)</translation>
+    </message>
+    <message>
+        <source>(no amount requested)</source>
+        <translation>(nepožadovaná žiadna suma)</translation>
+    </message>
+    <message>
+        <source>Requested</source>
+        <translation>Požadované</translation>
+    </message>
+</context>
 <context>
     <name>SendCoinsDialog</name>
     <message>
@@ -1497,6 +1773,10 @@
         <source>Dust:</source>
         <translation>Prach:</translation>
     </message>
+    <message>
+        <source>Confirmation time target:</source>
+        <translation>Cieľový čas potvrdenia:</translation>
+    </message>
     <message>
         <source>Clear &amp;All</source>
         <translation>&amp;Zmazať všetko</translation>
@@ -1513,10 +1793,62 @@
         <source>S&amp;end</source>
         <translation>&amp;Odoslať</translation>
     </message>
+    <message>
+        <source>Copy amount</source>
+        <translation>Kopírovať sumu</translation>
+    </message>
+    <message>
+        <source>Copy dust</source>
+        <translation>Kopírovať prach</translation>
+    </message>
+    <message>
+        <source>Total Amount %1</source>
+        <translation>Celková suma %1</translation>
+    </message>
     <message>
         <source>or</source>
         <translation>alebo</translation>
     </message>
+    <message>
+        <source>Confirm send coins</source>
+        <translation>Potvrďte odoslanie mincí</translation>
+    </message>
+    <message>
+        <source>The recipient address is not valid. Please recheck.</source>
+        <translation>Adresa príjemcu je neplatná. Prosím, overte ju.</translation>
+    </message>
+    <message>
+        <source>The amount to pay must be larger than 0.</source>
+        <translation>Suma na úhradu musí byť väčšia ako 0.</translation>
+    </message>
+    <message>
+        <source>The amount exceeds your balance.</source>
+        <translation>Suma je vyššia ako Váš zostatok.</translation>
+    </message>
+    <message>
+        <source>Duplicate address found: addresses should only be used once each.</source>
+        <translation>Našla sa duplicitná adresa: každá adresa by sa mala použiť len raz.</translation>
+    </message>
+    <message>
+        <source>Payment request expired.</source>
+        <translation>Vypršala platnosť požiadavky na platbu.</translation>
+    </message>
+    <message numerus="yes">
+        <source>Estimated to begin confirmation within %n block(s).</source>
+        <translation><numerusform>Odhadovaný začiatok potvrdzovania po %n bloku.</numerusform><numerusform>Odhadovaný začiatok potvrdzovania po %n blokoch.</numerusform><numerusform>Odhadovaný začiatok potvrdzovania po %n blokoch.</numerusform></translation>
+    </message>
+    <message>
+        <source>Warning: Invalid Bitcoin address</source>
+        <translation>Varovanie: Neplatná Bitcoin adresa</translation>
+    </message>
+    <message>
+        <source>Confirm custom change address</source>
+        <translation>Potvrďte zmenu adresy</translation>
+    </message>
+    <message>
+        <source>The address you selected for change is not part of this wallet. Any or all funds in your wallet may be sent to this address. Are you sure?</source>
+        <translation>Zadaná adresa nie je súčasťou tejto peňaženky. Časť alebo všetky peniaze z peňaženky môžu byť odoslané na túto adresu. Ste si istý?</translation>
+    </message>
     <message>
         <source>(no label)</source>
         <translation>(bez popisu)</translation>
@@ -1600,7 +1932,11 @@
         <source>Memo:</source>
         <translation>Poznámka:</translation>
     </message>
-    </context>
+    <message>
+        <source>Enter a label for this address to add it to your address book</source>
+        <translation>Zadajte popis pre túto adresu pre pridanie do adresára</translation>
+    </message>
+</context>
 <context>
     <name>SendConfirmationDialog</name>
     </context>
@@ -1625,6 +1961,10 @@
         <source>&amp;Sign Message</source>
         <translation>&amp;Podpísať Správu</translation>
     </message>
+    <message>
+        <source>You can sign messages/agreements with your addresses to prove you can receive bitcoins sent to them. Be careful not to sign anything vague or random, as phishing attacks may try to trick you into signing your identity over to them. Only sign fully-detailed statements you agree to.</source>
+        <translation>Môžete podpísať správy svojou adresou a dokázať, že viete prijímať mince zaslané na túto adresu. Buďte však opatrní a podpíšte len podrobné prehlásenia, s ktorými plne súhlasíte, nakoľko útoky typu "phishing" Vás môžu lákať k podpísaniu nejasných alebo príliš všeobecných tvrdení čím prevezmú vašu identitu.</translation>
+    </message>
     <message>
         <source>The Bitcoin address to sign the message with</source>
         <translation>Bitcoin adresa pre podpísanie správy s</translation>
@@ -1677,6 +2017,10 @@
         <source>&amp;Verify Message</source>
         <translation>O&amp;veriť správu...</translation>
     </message>
+    <message>
+        <source>Enter the receiver's address, message (ensure you copy line breaks, spaces, tabs, etc. exactly) and signature below to verify the message. Be careful not to read more into the signature than what is in the signed message itself, to avoid being tricked by a man-in-the-middle attack. Note that this only proves the signing party receives with the address, it cannot prove sendership of any transaction!</source>
+        <translation>Vložte adresu príjemcu, správu (uistite sa, že presne kopírujete ukončenia riadkov, medzery, odrážky, atď.) a podpis pre potvrdenie správy. Buďte opatrní a nedomýšľajte si viac než je uvedené v samotnej podpísanej správe a môžete sa tak vyhnúť podvodu MITM útokom. Toto len potvrdzuje, že podpisujúca strana môže prijímať na tejto adrese, nepotvrdzuje to vlastníctvo žiadnej transakcie!</translation>
+    </message>
     <message>
         <source>The Bitcoin address the message was signed with</source>
         <translation>Adresa Bitcoin, ktorou bola podpísaná správa</translation>
@@ -1693,7 +2037,55 @@
         <source>Reset all verify message fields</source>
         <translation>Obnoviť všetky polia v overiť správu</translation>
     </message>
-    </context>
+    <message>
+        <source>Click "Sign Message" to generate signature</source>
+        <translation>Kliknite "Podpísať správu" pre vytvorenie podpisu</translation>
+    </message>
+    <message>
+        <source>The entered address is invalid.</source>
+        <translation>Zadaná adresa je neplatná.</translation>
+    </message>
+    <message>
+        <source>Please check the address and try again.</source>
+        <translation>Prosím skontrolujte adresu a skúste znova.</translation>
+    </message>
+    <message>
+        <source>The entered address does not refer to a key.</source>
+        <translation>Vložená adresa nezodpovedá žiadnemu kľúču.</translation>
+    </message>
+    <message>
+        <source>Private key for the entered address is not available.</source>
+        <translation>Súkromný kľúč pre zadanú adresu nieje k dispozícii.</translation>
+    </message>
+    <message>
+        <source>Message signing failed.</source>
+        <translation>Podpísanie správy zlyhalo.</translation>
+    </message>
+    <message>
+        <source>Message signed.</source>
+        <translation>Správa podpísaná.</translation>
+    </message>
+    <message>
+        <source>The signature could not be decoded.</source>
+        <translation>Podpis nie je možné dekódovať.</translation>
+    </message>
+    <message>
+        <source>Please check the signature and try again.</source>
+        <translation>Prosím skontrolujte podpis a skúste znova.</translation>
+    </message>
+    <message>
+        <source>The signature did not match the message digest.</source>
+        <translation>Podpis sa nezhoduje so zhrnutím správy.</translation>
+    </message>
+    <message>
+        <source>Message verification failed.</source>
+        <translation>Overenie správy zlyhalo.</translation>
+    </message>
+    <message>
+        <source>Message verified.</source>
+        <translation>Správa overená.</translation>
+    </message>
+</context>
 <context>
     <name>SplashScreen</name>
     <message>
@@ -1710,6 +2102,54 @@
 </context>
 <context>
     <name>TransactionDesc</name>
+    <message>
+        <source>conflicted with a transaction with %1 confirmations</source>
+        <translation>koliduje s transakciou s %1 potvrdeniami</translation>
+    </message>
+    <message>
+        <source>0/unconfirmed, %1</source>
+        <translation>0/nepotvrdené, %1</translation>
+    </message>
+    <message>
+        <source>%1/unconfirmed</source>
+        <translation>%1/nepotvrdené</translation>
+    </message>
+    <message>
+        <source>%1 confirmations</source>
+        <translation>%1 potvrdení</translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation>Dátum</translation>
+    </message>
+    <message>
+        <source>own address</source>
+        <translation>vlastná adresa</translation>
+    </message>
+    <message>
+        <source>label</source>
+        <translation>popis</translation>
+    </message>
+    <message>
+        <source>Credit</source>
+        <translation>Kredit</translation>
+    </message>
+    <message>
+        <source>Total credit</source>
+        <translation>Celkový kredit</translation>
+    </message>
+    <message>
+        <source>Net amount</source>
+        <translation>Suma netto</translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation>Správa</translation>
+    </message>
+    <message>
+        <source>Amount</source>
+        <translation>Suma</translation>
+    </message>
     </context>
 <context>
     <name>TransactionDescDialog</name>
@@ -1720,13 +2160,181 @@
     </context>
 <context>
     <name>TransactionTableModel</name>
+    <message>
+        <source>Date</source>
+        <translation>Dátum</translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation>Typ</translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation>Popis</translation>
+    </message>
+    <message>
+        <source>Unconfirmed</source>
+        <translation>Nepotvrdené</translation>
+    </message>
+    <message>
+        <source>Confirming (%1 of %2 recommended confirmations)</source>
+        <translation>Potvrdzujem (%1 z %2 odporúčaných potvrdení)</translation>
+    </message>
+    <message>
+        <source>Confirmed (%1 confirmations)</source>
+        <translation>Potvrdené (%1 potvrdení)</translation>
+    </message>
+    <message>
+        <source>Immature (%1 confirmations, will be available after %2)</source>
+        <translation>Nezrelé (%1 potvrdení, bude dostupné po %2)</translation>
+    </message>
+    <message>
+        <source>This block was not received by any other nodes and will probably not be accepted!</source>
+        <translation>Ten blok nebol prijatý žiadnym iným uzlom a pravdepodobne nebude akceptovaný!</translation>
+    </message>
+    <message>
+        <source>Received with</source>
+        <translation>Prijaté s</translation>
+    </message>
+    <message>
+        <source>Received from</source>
+        <translation>Prijaté od</translation>
+    </message>
+    <message>
+        <source>Sent to</source>
+        <translation>Odoslané na</translation>
+    </message>
+    <message>
+        <source>Payment to yourself</source>
+        <translation>Platba sebe samému</translation>
+    </message>
+    <message>
+        <source>Mined</source>
+        <translation>Vyťažené</translation>
+    </message>
     <message>
         <source>(no label)</source>
         <translation>(bez popisu)</translation>
     </message>
-    </context>
+    <message>
+        <source>Transaction status. Hover over this field to show number of confirmations.</source>
+        <translation>Stav transakcie. Prejdite ponad toto pole pre zobrazenie počtu potvrdení.</translation>
+    </message>
+    <message>
+        <source>Date and time that the transaction was received.</source>
+        <translation>Dátum a čas prijatia transakcie.</translation>
+    </message>
+    <message>
+        <source>Type of transaction.</source>
+        <translation>Typ transakcie.</translation>
+    </message>
+    <message>
+        <source>Whether or not a watch-only address is involved in this transaction.</source>
+        <translation>Či je v tejto transakcii adresy iba na sledovanie.</translation>
+    </message>
+    <message>
+        <source>Amount removed from or added to balance.</source>
+        <translation>Suma pridaná alebo odobraná k zostatku.</translation>
+    </message>
+</context>
 <context>
     <name>TransactionView</name>
+    <message>
+        <source>All</source>
+        <translation>Všetky</translation>
+    </message>
+    <message>
+        <source>Today</source>
+        <translation>Dnes</translation>
+    </message>
+    <message>
+        <source>This week</source>
+        <translation>Tento týždeň</translation>
+    </message>
+    <message>
+        <source>This month</source>
+        <translation>Tento mesiac</translation>
+    </message>
+    <message>
+        <source>Last month</source>
+        <translation>Minulý mesiac</translation>
+    </message>
+    <message>
+        <source>This year</source>
+        <translation>Tento rok</translation>
+    </message>
+    <message>
+        <source>Range...</source>
+        <translation>Rozsah...</translation>
+    </message>
+    <message>
+        <source>Received with</source>
+        <translation>Prijaté s</translation>
+    </message>
+    <message>
+        <source>Sent to</source>
+        <translation>Odoslané na</translation>
+    </message>
+    <message>
+        <source>To yourself</source>
+        <translation>Ku mne</translation>
+    </message>
+    <message>
+        <source>Mined</source>
+        <translation>Vyťažené</translation>
+    </message>
+    <message>
+        <source>Other</source>
+        <translation>Iné</translation>
+    </message>
+    <message>
+        <source>Enter address or label to search</source>
+        <translation>Zadajte adresu alebo popis pre hľadanie</translation>
+    </message>
+    <message>
+        <source>Min amount</source>
+        <translation>Minimálna suma</translation>
+    </message>
+    <message>
+        <source>Copy address</source>
+        <translation>Kopírovať adresu</translation>
+    </message>
+    <message>
+        <source>Copy label</source>
+        <translation>Kopírovať popis</translation>
+    </message>
+    <message>
+        <source>Copy amount</source>
+        <translation>Kopírovať sumu</translation>
+    </message>
+    <message>
+        <source>Edit label</source>
+        <translation>Upraviť popis</translation>
+    </message>
+    <message>
+        <source>Confirmed</source>
+        <translation>Potvrdené</translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation>Dátum</translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation>Typ</translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation>Popis</translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation>Adresa</translation>
+    </message>
+    <message>
+        <source>Range:</source>
+        <translation>Rozsah:</translation>
+    </message>
     </context>
 <context>
     <name>UnitDisplayStatusBarControl</name>
@@ -1796,12 +2404,16 @@
     </message>
     <message>
         <source>Bitcoin Core</source>
-        <translation>Jadro Bitcoin</translation>
+        <translation>Bitcoin Core</translation>
     </message>
     <message>
         <source>The %s developers</source>
         <translation>Vývojári %s</translation>
     </message>
+    <message>
+        <source>Accept relayed transactions received from whitelisted peers even when not relaying transactions (default: %d)</source>
+        <translation>Akceptovať postúpené transakcie od povolených partnerov aj keď normálne nepostupujete transakcie (predvolené: %d)</translation>
+    </message>
     <message>
         <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source>
         <translation>Spojiť s danou adresou a vždy na nej počúvať. Použite zápis [host]:port pre IPv6</translation>
@@ -1964,7 +2576,7 @@
     </message>
     <message>
         <source>Location of the auth cookie (default: data dir)</source>
-        <translation>Poloha overovacieho cookie súboru (predvolená: zložka s dátami)</translation>
+        <translation>Umiestnenie overovacieho cookie súboru (predvolená: Priečinok s dátami)</translation>
     </message>
     <message>
         <source>Not enough file descriptors available.</source>
@@ -2298,6 +2910,10 @@
         <source>Warning: Wallet file corrupt, data salvaged! Original %s saved as %s in %s; if your balance or transactions are incorrect you should restore from a backup.</source>
         <translation>Varovanie: Peňaženka poškodená, dáta boli zachránené! Originálna %s ako %s v %s; ak váš zostatok alebo transakcie sú nesprávne, mali by ste obnoviť zálohu.</translation>
     </message>
+    <message>
+        <source>Whitelist peers connecting from the given IP address (e.g. 1.2.3.4) or CIDR notated network (e.g. 1.2.3.0/24). Can be specified multiple times.</source>
+        <translation>Povoliť partnerov pripájajúcich sa z danej IP adresy (napr. 1.2.3.4) alebo zo siete vo formáte CIDR (napr. 1.2.3.0/24). Môže byť zadané viackrát.</translation>
+    </message>
     <message>
         <source>(default: %s)</source>
         <translation>(predvolené: %s)</translation>
@@ -2378,6 +2994,10 @@
         <source>Threshold for disconnecting misbehaving peers (default: %u)</source>
         <translation>Hranica pre odpájanie zle sa správajúcim partnerským uzlom (predvolené: %u)</translation>
     </message>
+    <message>
+        <source>Transaction amounts must not be negative</source>
+        <translation>Sumy transakcií nesmú byť záporné</translation>
+    </message>
     <message>
         <source>Unknown network specified in -onlynet: '%s'</source>
         <translation>Neznáma sieť upresnená v -onlynet: '%s'</translation>

From 58800e3556aefbc002b9554b3af5167655fd7943 Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Tue, 28 Feb 2017 13:43:04 +0100
Subject: [PATCH 1779/1802] doc: pre-rc3 changelog update

---
 doc/release-notes.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/doc/release-notes.md b/doc/release-notes.md
index 9d3c3e34feeb0..37e79958e88d0 100644
--- a/doc/release-notes.md
+++ b/doc/release-notes.md
@@ -497,6 +497,7 @@ and git merge commit are mentioned.
 - #9765 `1e92e04` Harden against mistakes handling invalid blocks (sdaftuar)
 - #9779 `3c02b95` Update nMinimumChainWork and defaultAssumeValid (gmaxwell)
 - #8524 `19b0f33` Precompute sighashes (sipa)
+- #9791 `1825a03` Avoid VLA in hash.h (sipa)
 
 ### Build system
 - #8238 `6caf3ee` ZeroMQ 4.1.5 && ZMQ on Windows (fanquake)
@@ -673,6 +674,8 @@ and git merge commit are mentioned.
 - #9269 `43e8150` Align struct COrphan definition (sipa)
 - #9820 `599c69a` Fix pruning test broken by 2 hour manual prune window (ryanofsky)
 - #9824 `260c71c` qa: Check return code when stopping nodes (MarcoFalke)
+- #9875 `50953c2` tests: Fix dangling pwalletMain pointer in wallet tests (laanwj)
+- #9839 `eddaa6b` [qa] Make import-rescan.py watchonly check reliable (ryanofsky)
 
 ### Documentation
 - #8332 `806b9e7` Clarify witness branches in transaction.h serialization (dcousens)
@@ -710,6 +713,8 @@ and git merge commit are mentioned.
 - #8915 `03dd707` Add copyright/patent issues to possible NACK reasons (petertodd)
 - #8965 `23e03f8` Mention that PPA doesn't support Debian (anduck)
 - #9115 `bfc7aad` Mention reporting security issues responsibly (paveljanik)
+- #9840 `08e0690` Update sendfrom RPC help to correct coin selection misconception (ryanofsky)
+- #9865 `289204f` Change bitcoin address in RPC help message (marijnfs)
 
 ### Miscellaneous
 - #8274 `7a2d402` util: Update tinyformat (laanwj)
@@ -759,6 +764,7 @@ and git merge commit are mentioned.
 - #9777 `8dee822` Handle unusual maxsigcachesize gracefully (jnewbery)
 - #8863,#8807 univalue: Pull subtree (MarcoFalke)
 - #9798 `e22c067` Fix Issue #9775 (Check returned value of fopen) (kirit93)
+- #9856 `69832aa` Terminate immediately when allocation fails (theuni)
 
 Credits
 =======
@@ -825,6 +831,7 @@ Thanks to everyone who directly contributed to this release:
 - Luke Dashjr
 - maiiz
 - MarcoFalke
+- Marijn Stollenga
 - Marty Jones
 - Masahiko Hyuga
 - Matt Corallo

From ad24256a65aa4281831e14097a29ac1efe8b5c02 Mon Sep 17 00:00:00 2001
From: Russell Yanofsky <russ@yanofsky.org>
Date: Wed, 22 Feb 2017 14:11:44 -0500
Subject: [PATCH 1780/1802] Fix importmulti returning rescan errors for wrong
 keys

Bug was a missing ++i line in a new range for loop added in commit e2e2f4c
"Return errors from importmulti if complete rescans are not successful"

Github-Pull: #9829
Rebased-From: 306bd72157f089b962b9c537bbacf710a4158647
---
 src/wallet/rpcdump.cpp           |  1 +
 src/wallet/test/wallet_tests.cpp | 17 ++++++++++++++---
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/wallet/rpcdump.cpp b/src/wallet/rpcdump.cpp
index 8a9e7d1444ad1..20a3cbda1e78b 100644
--- a/src/wallet/rpcdump.cpp
+++ b/src/wallet/rpcdump.cpp
@@ -1098,6 +1098,7 @@ UniValue importmulti(const JSONRPCRequest& mainRequest)
                     result.pushKV("error", JSONRPCError(RPC_MISC_ERROR, strprintf("Failed to rescan before time %d, transactions may be missing.", scannedRange->GetBlockTimeMax())));
                     response.push_back(std::move(result));
                 }
+                ++i;
             }
         }
     }
diff --git a/src/wallet/test/wallet_tests.cpp b/src/wallet/test/wallet_tests.cpp
index 43d7e3c617d74..7ac2112dd29e7 100644
--- a/src/wallet/test/wallet_tests.cpp
+++ b/src/wallet/test/wallet_tests.cpp
@@ -395,24 +395,35 @@ BOOST_FIXTURE_TEST_CASE(rescan, TestChain100Setup)
         BOOST_CHECK_EQUAL(wallet.GetImmatureBalance(), 50 * COIN);
     }
 
+    // Verify importmulti RPC returns failure for a key whose creation time is
+    // before the missing block, and success for a key whose creation time is
+    // after.
     {
         CWallet wallet;
         CWallet *backup = ::pwalletMain;
         ::pwalletMain = &wallet;
+        UniValue keys;
+        keys.setArray();
         UniValue key;
         key.setObject();
         key.pushKV("scriptPubKey", HexStr(GetScriptForRawPubKey(coinbaseKey.GetPubKey())));
         key.pushKV("timestamp", 0);
         key.pushKV("internal", UniValue(true));
-        UniValue keys;
-        keys.setArray();
+        keys.push_back(key);
+        key.clear();
+        key.setObject();
+        CKey futureKey;
+        futureKey.MakeNewKey(true);
+        key.pushKV("scriptPubKey", HexStr(GetScriptForRawPubKey(futureKey.GetPubKey())));
+        key.pushKV("timestamp", newTip->GetBlockTimeMax() + 7200);
+        key.pushKV("internal", UniValue(true));
         keys.push_back(key);
         JSONRPCRequest request;
         request.params.setArray();
         request.params.push_back(keys);
 
         UniValue response = importmulti(request);
-        BOOST_CHECK_EQUAL(response.write(), strprintf("[{\"success\":false,\"error\":{\"code\":-1,\"message\":\"Failed to rescan before time %d, transactions may be missing.\"}}]", newTip->GetBlockTimeMax()));
+        BOOST_CHECK_EQUAL(response.write(), strprintf("[{\"success\":false,\"error\":{\"code\":-1,\"message\":\"Failed to rescan before time %d, transactions may be missing.\"}},{\"success\":true}]", newTip->GetBlockTimeMax()));
         ::pwalletMain = backup;
     }
 }

From 5e709122343e1a336ee8ee21b003a298a65813f3 Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Mon, 27 Feb 2017 20:23:23 -0500
Subject: [PATCH 1781/1802] Add Pieter's old signed commits to revsig-commits

Github-Pull: #9884
Rebased-From: a4b02f4275c3f35492bbdde27e9295497b919a52
---
 contrib/verify-commits/allow-revsig-commits | 104 ++++++++++++++++++++
 1 file changed, 104 insertions(+)

diff --git a/contrib/verify-commits/allow-revsig-commits b/contrib/verify-commits/allow-revsig-commits
index e69de29bb2d1d..f0088cdca4af8 100644
--- a/contrib/verify-commits/allow-revsig-commits
+++ b/contrib/verify-commits/allow-revsig-commits
@@ -0,0 +1,104 @@
+a06ede9a138d0fb86b0de17c42b936d9fe6e2158
+923dc447eaa8e017985b2afbbb12dd1283fbea0e
+71148b8947fe8b4d756822420a7f31c380159425
+6696b4635ceb9b47aaa63244bff9032fa7b08354
+812714fd80e96e28cd288c553c83838cecbfc2d9
+8a445c5651edb9a1f51497055b7ddf4402be9188
+e126d0c12ca66278d9e7b12187c5ff4fc02a7e6c
+3908fc4728059719bed0e1c7b1c8b388c2d4a8da
+8b66bf74e2a349e71eaa183af81fa63eaee76ad2
+05950427d310654774031764a7141a1a4fd9c6e4
+07fd147b9f12e9205afd66a624edce357977d615
+12e31127948fa4bb01c3bddc1b8c85b432f7465b
+8c87f175d335e9d9e93f987d871ae9f05f6a10a7
+46b249e578e8a3dfbe85bc7253a12e82ef4b658b
+a55716abe5662ec74c2f8af93023f1e7cca901fc
+f646275b90b1de93bc62b4c4d045d75ac0b96eee
+c252685aa5867631e9a5ef07ccae7c7c25cae8ff
+a7d55c93385359952d85decd5037843ac70ba3d4
+7dac1e5e9e887f5f6ff146e812a05bd3bf281eae
+2a524b8e8fe69ef487fd8ea1b4f7a03f473ed201
+ce5c1f4acae43477989cdf9a82ed33703919cda2
+2db4cbcc437f51f5dac82cc4de46f383b92e6f11
+7aa700424cbda387536373d8dfec88aee43f950e
+b99a093afed880f23fb279c443cc6ae5e379cc43
+b83264d9c7a8ddb79f64bd9540caddc8632ef31f
+57e337d40e94ba33d8cd265c134d6ef857b32b59
+a1dcf2e1087beaf3981739fd2bb74f35ecad630a
+d38b0d7a6b6056cba26999b702815775e2437d87
+815640ec6af9a38d6a2da4a4400056e2f4105080
+09c4fd157c5b88df2d97fad4826c79b094db90c9
+2efcfa5acfacb958973d9e8125e1d81f102e2dfd
+dc6dee41f7cf2ba93fcd0fea7c157e4b2775d439
+ad826b3df9f763b49f1e3e3d50c4efdd438c7547
+c1a52276848d8caa9a9789dff176408c1aa6b1ed
+3bf06e9bac57b5b5a746677b75e297a7b154bdbd
+72ae6f8cf0224370e8121d6769b21e612ca15d6f
+a143b88dbd4971ecfdd1d39a494489c8f2db0344
+76fec09d878d6dbf214bdb6228d480bd9195db4c
+93566e0c37c5ae104095474fea89f00dcb40f551
+407d9232ef5cb1ebf6cff21f3d13e07ea4158eeb
+9346f8429957e356d21c665bab59fe45bcf1f74e
+6eeac6e30d65f9a972067c1ea8c49978c8e631ac
+dc6b9406bdfab2af8c86cb080cb3e6cf8f2385d8
+9f554e03ebe5701c1b75ff03b3d6152095c0cad3
+05009935f9ac070197113954d680bc2c9150b9b3
+508404de98a8a5435f52916cef8f328e82651961
+ed0cc50afed146c27f6d8129c683c225fb940093
+6429cfa8a70308241c576aeb92ffe3db5203b2ef
+6898213409811b140843c3d89af43328c3b22fad
+5b2ea29cf4fd298346437bb16a54407f8c1f9dca
+e2a1a1ee895149c544d4ae295466611f0cec3094
+e82fb872ff5cc8fd22d43327c1ee3e755f61c562
+19b0f33de0efd9da788e8e4f3fdc2a9e159abdb1
+89de1538ce1f8c00f80e8d11f43e1b77e24d7dea
+de07fdcf77e97b8613091285e4d0a734f5de7492
+01680195f8aa586c55c44767397380def3a23b54
+05e1c85fb687c82ae477c72d4a7e2d6b0c692167
+c072b8fd95cd4fa84f08189a0cd8b173ea2dbb8e
+9a0ed08b40b15ae2b791aa8549b53e69934b4ea7
+53f8f226bd1d627c4a6dec5862a1d4ea5a933e45
+9d0f43b7ca7241d8a018fd35dd3bc01555235ec6
+f12d2b5a8ac397e4bcaefcc19898f8ff5705dea5
+8250de13587ed05ca45df3e12c5dc9bcb1500e2c
+d727f77e390426e9e463336bda08d50c451c7086
+484312bda2d43e3ea60047be076332299463adf8
+c7e05b35ab0a791c7a8e2d863e716fdec6f3f671
+b9c1cd81848da9de1baf9c2f29c19c50e549de13
+8ea7d31e384975019733b5778feabbd9955c79d8
+f798b891bcecea9548eedacae70eeb9906c1ddbf
+ebefe7a00b46579cdd1e033a8c7fd8ce9aa578e4
+ad087638ee4864d6244ec9381ff764bfa6ee5086
+66db2d62d59817320c9182fc18e75a93b76828ea
+7ce9ac5c83b1844a518ef2e12e87aae3cacdfe58
+4286f43025149cf44207c3ad98e4a1f068520ada
+cd0c5135ab2291aaa5410ac919bad3fc87249a4a
+66ed450d771a8fc01c159a8402648ebd1c35eb4c
+a82f03393a32842d49236e8666ee57805ca701f8
+f972b04d63eb8af79ff3cec1dc561ed13dfa6053
+ec45cc5e27668171b55271b0c735194c70e7da41
+715e9fd7454f7a48d7adba7d42f662c20a3e3367
+2e0a99037dcc35bc63ba0d54371bc678af737c8e
+7fa8d758598407f3bf0beb0118dc122ea5340736
+6a22373771edbc3c7513cacb9355f880c73c2cbf
+b89ef131147f71a96152a7b5c4374266cdf539b2
+01d8359983e2f77b5118fede3ffa947072c666c8
+58f0c929a3d70a4bff79cc200f1c186f71ef1675
+950be19727a581970591d8f8138dfe4725750382
+425278d17bd0edf8a3a7cc81e55016f7fd8e7726
+c028c7b7557da2baff7af8840108e8be4db8e0c6
+47a7cfb0aa2498f6801026d258a59f9de48f60b0
+f6b7df3155ddb4cedfbcf5d3eb3383d4614b3a85
+d72098038f3b55a714ed8adb34fab547b15eb0d5
+c49c825bd9f4764536b45df5a684d97173673fc7
+33799afe83eec4200ff140e9bf5eae83701a4d7f
+5c3f8ddcaa1164079105c452429fccf8127b01b6
+1f01443567b03ac75a91c810f1733f5c21b5699d
+b3e42b6d02e8d19658a9135e427ebceab5367779
+69b3a6dd9d9a0adf5506c8b9fde42187356bd4a8
+bafd075c5e6a1088ef0f1aa0b0b224e026a3d3e0
+7daa3adb242d9c8728fdb15c6af6596aaad5502f
+514993554c370f4cf30a109ac28d5d64893dbf0a
+c8d2473e6cb042e7275a10c49d3f6a4a91bf0166
+386f4385ab04b0b2c3d47bddc0dc0f2de7354964
+9f33dba05c01ecc5c56eb1284ab7d64d42f55171

From eff783a0fe7b9eaaba9eef6539bdf0f62ce9f07e Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Tue, 28 Feb 2017 16:20:07 -0500
Subject: [PATCH 1782/1802] depends: make osx output deterministic

ld64 is threaded, and uses a worker for each CPU to parse input files. But
there's a bug in the parser causing dependencies to be calculated differently
based on which files have already been parsed.

As a result, builders with more CPUs are more likely to see non-determinism.

This looks to have been fixed in a newer version of ld64, so just disable
threading for now. There's no noticible slowdown.

Github-Pull: #9891
Rebased-From: 9e4d842afc67c63448cbbe30e5cea906e9c87f7e
---
 depends/packages/native_cctools.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/depends/packages/native_cctools.mk b/depends/packages/native_cctools.mk
index 797480c25eb2f..44d238cc4c2a6 100644
--- a/depends/packages/native_cctools.mk
+++ b/depends/packages/native_cctools.mk
@@ -38,7 +38,8 @@ $(package)_cxx=$($(package)_extract_dir)/toolchain/bin/clang++
 endef
 
 define $(package)_preprocess_cmds
-  cd $($(package)_build_subdir); ./autogen.sh
+  cd $($(package)_build_subdir); ./autogen.sh && \
+  sed -i.old "/define HAVE_PTHREADS/d" ld64/src/ld/InputFiles.h
 endef
 
 define $(package)_config_cmds

From a80dc94554e7ec9ea810ce341ac7b5ad3fd66a88 Mon Sep 17 00:00:00 2001
From: Luke Dashjr <luke-jr+git@utopios.org>
Date: Tue, 28 Feb 2017 22:59:57 +0000
Subject: [PATCH 1783/1802] Bugfix: Only install manpages for built programs

Github-Pull: #9892
Rebased-From: 8c156b7f70ecd46af2172e052c89510f032c5090
---
 doc/man/Makefile.am | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/doc/man/Makefile.am b/doc/man/Makefile.am
index 5252ef4a19aa4..08ff4d6ac1d5c 100644
--- a/doc/man/Makefile.am
+++ b/doc/man/Makefile.am
@@ -1 +1,13 @@
-dist_man1_MANS=bitcoind.1 bitcoin-qt.1 bitcoin-cli.1 bitcoin-tx.1
+dist_man1_MANS=
+
+if BUILD_BITCOIND
+  dist_man1_MANS+=bitcoind.1
+endif
+
+if ENABLE_QT
+  dist_man1_MANS+=bitcoin-qt.1
+endif
+
+if BUILD_BITCOIN_UTILS
+  dist_man1_MANS+=bitcoin-cli.1 bitcoin-tx.1
+endif

From 589cd63b303158b565d49d2ce26c9e46b0bba8bd Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Fri, 3 Mar 2017 19:02:23 -0500
Subject: [PATCH 1784/1802] Allow any subkey in verify-commits

---
 contrib/verify-commits/gpg.sh       | 2 +-
 contrib/verify-commits/trusted-keys | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/contrib/verify-commits/gpg.sh b/contrib/verify-commits/gpg.sh
index 09ff23754473f..2944bb269d7bb 100755
--- a/contrib/verify-commits/gpg.sh
+++ b/contrib/verify-commits/gpg.sh
@@ -12,7 +12,7 @@ for LINE in $(echo "$INPUT" | gpg --trust-model always "$@" 2>/dev/null); do
 	case "$LINE" in
 	"[GNUPG:] VALIDSIG "*)
 		while read KEY; do
-			case "$LINE" in "[GNUPG:] VALIDSIG $KEY "*) VALID=true;; esac
+			[ "${LINE#?GNUPG:? VALIDSIG * * * * * * * * * }" = "$KEY" ] && VALID=true
 		done < ./contrib/verify-commits/trusted-keys
 		;;
 	"[GNUPG:] REVKEYSIG "*)
diff --git a/contrib/verify-commits/trusted-keys b/contrib/verify-commits/trusted-keys
index 75242c2a9760b..5610692616e1d 100644
--- a/contrib/verify-commits/trusted-keys
+++ b/contrib/verify-commits/trusted-keys
@@ -1,4 +1,4 @@
 71A3B16735405025D447E8F274810B012346C9A6
-3F1888C6DCA92A6499C4911FDBA1A67379A1A931
+133EAC179436F14A5CF1B794860FEB804E669320
 32EE5C4C3FA15CCADB46ABE529D4BCB6416F53EC
-FE09B823E6D83A3BC7983EAA2D7F2372E50FE137
+B8B3F1C0E58C15DB6A81D30C3648A882F4316B9B

From 43a987c1cbcd04b9c59052606c3c31c56abc826e Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Sun, 5 Mar 2017 11:19:17 -0500
Subject: [PATCH 1785/1802] Fix regsig checking for subkey sigs in
 verify-commits

Rebased-From: bbd757940bcb0628df6f7a5bd1fb348cf2290502
---
 contrib/verify-commits/gpg.sh | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/contrib/verify-commits/gpg.sh b/contrib/verify-commits/gpg.sh
index 2944bb269d7bb..4b2649eaaaa1d 100755
--- a/contrib/verify-commits/gpg.sh
+++ b/contrib/verify-commits/gpg.sh
@@ -17,12 +17,8 @@ for LINE in $(echo "$INPUT" | gpg --trust-model always "$@" 2>/dev/null); do
 		;;
 	"[GNUPG:] REVKEYSIG "*)
 		[ "$BITCOIN_VERIFY_COMMITS_ALLOW_REVSIG" != 1 ] && exit 1
-		while read KEY; do
-			case "$LINE" in "[GNUPG:] REVKEYSIG ${KEY#????????????????????????} "*)
-				REVSIG=true
-				GOODREVSIG="[GNUPG:] GOODSIG ${KEY#????????????????????????} "
-			esac
-		done < ./contrib/verify-commits/trusted-keys
+		REVSIG=true
+		GOODREVSIG="[GNUPG:] GOODSIG ${LINE#* * *}"
 		;;
 	esac
 done

From 808be3f0287fe00fb86d72eef716e252dae70f37 Mon Sep 17 00:00:00 2001
From: Braydon Fuller <braydon@bitpay.com>
Date: Thu, 2 Jun 2016 11:52:24 -0400
Subject: [PATCH 1786/1802] --- bitcore start ---


From d9bee477bacd478d21abc6398706abd0914c8198 Mon Sep 17 00:00:00 2001
From: Braydon Fuller <braydon@bitpay.com>
Date: Tue, 4 Oct 2016 14:58:32 -0400
Subject: [PATCH 1787/1802] indexes: adds additional address, spent and
 timestamp indexes

Adds new bitcoin.conf configuration options for three new indexes:
-addressindex=1
-spentindex=1
-timestampindex=1

The addressindex records all changes to an address for retrieving txids, balances and
unspent outputs for addresses. Changes are stored and sorted in block order. Both p2sh
and p2pkh address types are supported. The index records two sets of key/value pairs.
The first records all activity and is useful for viewing transaction history and
all changes. The second is specifically for retrieving unspent outputs by address, and
is smaller as values are removed once they are spent.

The spentindex has multiple purposes and brings closer together inputs and outputs of
transactions. The main purpose is to efficiently determine the address and amount of
an input's previous output. The second purpose is to be able to determine which
input spent an output.

The timestampindex keeps track of timestamps with block hashes and is useful for searching
blocks by date instead of by height. This is useful for a block explorer that will give
search options by date. The index uses logical time correction to make sure that the
results are sorted in block order. The logical time of a block is actual timestamp of the
block, unless it is less than (earlier) the previous block's logical time, and in that
case it is one second greater than the previous block's logical time.

Includes logical time fix by Chethan Krishna

Conflicts:
	src/main.cpp
	src/main.h
	src/txdb.cpp
	src/txdb.h
	src/txmempool.h
---
 src/Makefile.am       |   2 +
 src/addressindex.h    |  82 ++++++++++
 src/base58.cpp        |  17 +++
 src/base58.h          |   1 +
 src/init.cpp          |   4 +
 src/script/script.cpp |  11 ++
 src/script/script.h   |   2 +
 src/serialize.h       |  11 ++
 src/spentindex.h      |  98 ++++++++++++
 src/txdb.cpp          | 166 ++++++++++++++++++++
 src/txdb.h            |  26 ++++
 src/txmempool.cpp     | 141 +++++++++++++++++
 src/txmempool.h       |  23 +++
 src/validation.cpp    | 267 ++++++++++++++++++++++++++++++++
 src/validation.h      | 343 ++++++++++++++++++++++++++++++++++++++++++
 15 files changed, 1194 insertions(+)
 create mode 100644 src/addressindex.h
 create mode 100644 src/spentindex.h

diff --git a/src/Makefile.am b/src/Makefile.am
index e8d22313dca33..7fe329575137f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -77,6 +77,8 @@ endif
 # bitcoin core #
 BITCOIN_CORE_H = \
   addrdb.h \
+  addressindex.h \
+  spentindex.h \
   addrman.h \
   base58.h \
   bloom.h \
diff --git a/src/addressindex.h b/src/addressindex.h
new file mode 100644
index 0000000000000..9e734b84dcdca
--- /dev/null
+++ b/src/addressindex.h
@@ -0,0 +1,82 @@
+// Copyright (c) 2009-2010 Satoshi Nakamoto
+// Copyright (c) 2009-2015 The Bitcoin Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#ifndef BITCOIN_ADDRESSINDEX_H
+#define BITCOIN_ADDRESSINDEX_H
+
+#include "uint256.h"
+#include "amount.h"
+
+struct CMempoolAddressDelta
+{
+    int64_t time;
+    CAmount amount;
+    uint256 prevhash;
+    unsigned int prevout;
+
+    CMempoolAddressDelta(int64_t t, CAmount a, uint256 hash, unsigned int out) {
+        time = t;
+        amount = a;
+        prevhash = hash;
+        prevout = out;
+    }
+
+    CMempoolAddressDelta(int64_t t, CAmount a) {
+        time = t;
+        amount = a;
+        prevhash.SetNull();
+        prevout = 0;
+    }
+};
+
+struct CMempoolAddressDeltaKey
+{
+    int type;
+    uint160 addressBytes;
+    uint256 txhash;
+    unsigned int index;
+    int spending;
+
+    CMempoolAddressDeltaKey(int addressType, uint160 addressHash, uint256 hash, unsigned int i, int s) {
+        type = addressType;
+        addressBytes = addressHash;
+        txhash = hash;
+        index = i;
+        spending = s;
+    }
+
+    CMempoolAddressDeltaKey(int addressType, uint160 addressHash) {
+        type = addressType;
+        addressBytes = addressHash;
+        txhash.SetNull();
+        index = 0;
+        spending = 0;
+    }
+};
+
+struct CMempoolAddressDeltaKeyCompare
+{
+    bool operator()(const CMempoolAddressDeltaKey& a, const CMempoolAddressDeltaKey& b) const {
+        if (a.type == b.type) {
+            if (a.addressBytes == b.addressBytes) {
+                if (a.txhash == b.txhash) {
+                    if (a.index == b.index) {
+                        return a.spending < b.spending;
+                    } else {
+                        return a.index < b.index;
+                    }
+                } else {
+                    return a.txhash < b.txhash;
+                }
+            } else {
+                return a.addressBytes < b.addressBytes;
+            }
+        } else {
+            return a.type < b.type;
+        }
+    }
+};
+
+#endif // BITCOIN_ADDRESSINDEX_H
diff --git a/src/base58.cpp b/src/base58.cpp
index e2f475bb7feb6..bc2b00386ee75 100644
--- a/src/base58.cpp
+++ b/src/base58.cpp
@@ -271,6 +271,23 @@ CTxDestination CBitcoinAddress::Get() const
         return CNoDestination();
 }
 
+bool CBitcoinAddress::GetIndexKey(uint160& hashBytes, int& type) const
+{
+    if (!IsValid()) {
+        return false;
+    } else if (vchVersion == Params().Base58Prefix(CChainParams::PUBKEY_ADDRESS)) {
+        memcpy(&hashBytes, &vchData[0], 20);
+        type = 1;
+        return true;
+    } else if (vchVersion == Params().Base58Prefix(CChainParams::SCRIPT_ADDRESS)) {
+        memcpy(&hashBytes, &vchData[0], 20);
+        type = 2;
+        return true;
+    }
+
+    return false;
+}
+
 bool CBitcoinAddress::GetKeyID(CKeyID& keyID) const
 {
     if (!IsValid() || vchVersion != Params().Base58Prefix(CChainParams::PUBKEY_ADDRESS))
diff --git a/src/base58.h b/src/base58.h
index 3998283bb13eb..c51dc9361e533 100644
--- a/src/base58.h
+++ b/src/base58.h
@@ -116,6 +116,7 @@ class CBitcoinAddress : public CBase58Data {
 
     CTxDestination Get() const;
     bool GetKeyID(CKeyID &keyID) const;
+    bool GetIndexKey(uint160& hashBytes, int& type) const;
     bool IsScript() const;
 };
 
diff --git a/src/init.cpp b/src/init.cpp
index 5820d8f57c357..1f0f682987c2a 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -359,6 +359,10 @@ std::string HelpMessage(HelpMessageMode mode)
 #endif
     strUsage += HelpMessageOpt("-txindex", strprintf(_("Maintain a full transaction index, used by the getrawtransaction rpc call (default: %u)"), DEFAULT_TXINDEX));
 
+    strUsage += HelpMessageOpt("-addressindex", strprintf(_("Maintain a full address index, used to query for the balance, txids and unspent outputs for addresses (default: %u)"), DEFAULT_ADDRESSINDEX));
+    strUsage += HelpMessageOpt("-timestampindex", strprintf(_("Maintain a timestamp index for block hashes, used to query blocks hashes by a range of timestamps (default: %u)"), DEFAULT_TIMESTAMPINDEX));
+    strUsage += HelpMessageOpt("-spentindex", strprintf(_("Maintain a full spent index, used to query the spending txid and input index for an outpoint (default: %u)"), DEFAULT_SPENTINDEX));
+
     strUsage += HelpMessageGroup(_("Connection options:"));
     strUsage += HelpMessageOpt("-addnode=<ip>", _("Add a node to connect to and attempt to keep the connection open"));
     strUsage += HelpMessageOpt("-banscore=<n>", strprintf(_("Threshold for disconnecting misbehaving peers (default: %u)"), DEFAULT_BANSCORE_THRESHOLD));
diff --git a/src/script/script.cpp b/src/script/script.cpp
index 9f4741b1cd95d..f2e8f85e4ac0f 100644
--- a/src/script/script.cpp
+++ b/src/script/script.cpp
@@ -201,6 +201,17 @@ unsigned int CScript::GetSigOpCount(const CScript& scriptSig) const
     return subscript.GetSigOpCount(true);
 }
 
+bool CScript::IsPayToPublicKeyHash() const
+{
+    // Extra-fast test for pay-to-pubkey-hash CScripts:
+    return (this->size() == 25 &&
+	    (*this)[0] == OP_DUP &&
+	    (*this)[1] == OP_HASH160 &&
+	    (*this)[2] == 0x14 &&
+	    (*this)[23] == OP_EQUALVERIFY &&
+	    (*this)[24] == OP_CHECKSIG);
+}
+
 bool CScript::IsPayToScriptHash() const
 {
     // Extra-fast test for pay-to-script-hash CScripts:
diff --git a/src/script/script.h b/src/script/script.h
index 654dff4625ddc..8d28f9cc02d89 100644
--- a/src/script/script.h
+++ b/src/script/script.h
@@ -619,6 +619,8 @@ class CScript : public CScriptBase
      */
     unsigned int GetSigOpCount(const CScript& scriptSig) const;
 
+    bool IsPayToPublicKeyHash() const;
+
     bool IsPayToScriptHash() const;
     bool IsPayToWitnessScriptHash() const;
     bool IsWitnessProgram(int& version, std::vector<unsigned char>& program) const;
diff --git a/src/serialize.h b/src/serialize.h
index e4d72d2348f17..fa4b0c838656a 100644
--- a/src/serialize.h
+++ b/src/serialize.h
@@ -77,6 +77,11 @@ template<typename Stream> inline void ser_writedata32(Stream &s, uint32_t obj)
     obj = htole32(obj);
     s.write((char*)&obj, 4);
 }
+template<typename Stream> inline void ser_writedata32be(Stream &s, uint32_t obj)
+{
+    obj = htobe32(obj);
+    s.write((char*)&obj, 4);
+}
 template<typename Stream> inline void ser_writedata64(Stream &s, uint64_t obj)
 {
     obj = htole64(obj);
@@ -100,6 +105,12 @@ template<typename Stream> inline uint32_t ser_readdata32(Stream &s)
     s.read((char*)&obj, 4);
     return le32toh(obj);
 }
+template<typename Stream> inline uint32_t ser_readdata32be(Stream &s)
+{
+    uint32_t obj;
+    s.read((char*)&obj, 4);
+    return be32toh(obj);
+}
 template<typename Stream> inline uint64_t ser_readdata64(Stream &s)
 {
     uint64_t obj;
diff --git a/src/spentindex.h b/src/spentindex.h
new file mode 100644
index 0000000000000..bd5da45d60dbc
--- /dev/null
+++ b/src/spentindex.h
@@ -0,0 +1,98 @@
+// Copyright (c) 2009-2010 Satoshi Nakamoto
+// Copyright (c) 2009-2015 The Bitcoin Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#ifndef BITCOIN_SPENTINDEX_H
+#define BITCOIN_SPENTINDEX_H
+
+#include "uint256.h"
+#include "amount.h"
+
+struct CSpentIndexKey {
+    uint256 txid;
+    unsigned int outputIndex;
+
+    ADD_SERIALIZE_METHODS;
+
+    template <typename Stream, typename Operation>
+    inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) {
+        READWRITE(txid);
+        READWRITE(outputIndex);
+    }
+
+    CSpentIndexKey(uint256 t, unsigned int i) {
+        txid = t;
+        outputIndex = i;
+    }
+
+    CSpentIndexKey() {
+        SetNull();
+    }
+
+    void SetNull() {
+        txid.SetNull();
+        outputIndex = 0;
+    }
+
+};
+
+struct CSpentIndexValue {
+    uint256 txid;
+    unsigned int inputIndex;
+    int blockHeight;
+    CAmount satoshis;
+    int addressType;
+    uint160 addressHash;
+
+    ADD_SERIALIZE_METHODS;
+
+    template <typename Stream, typename Operation>
+    inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) {
+        READWRITE(txid);
+        READWRITE(inputIndex);
+        READWRITE(blockHeight);
+        READWRITE(satoshis);
+        READWRITE(addressType);
+        READWRITE(addressHash);
+    }
+
+    CSpentIndexValue(uint256 t, unsigned int i, int h, CAmount s, int type, uint160 a) {
+        txid = t;
+        inputIndex = i;
+        blockHeight = h;
+        satoshis = s;
+        addressType = type;
+        addressHash = a;
+    }
+
+    CSpentIndexValue() {
+        SetNull();
+    }
+
+    void SetNull() {
+        txid.SetNull();
+        inputIndex = 0;
+        blockHeight = 0;
+        satoshis = 0;
+        addressType = 0;
+        addressHash.SetNull();
+    }
+
+    bool IsNull() const {
+        return txid.IsNull();
+    }
+};
+
+struct CSpentIndexKeyCompare
+{
+    bool operator()(const CSpentIndexKey& a, const CSpentIndexKey& b) const {
+        if (a.txid == b.txid) {
+            return a.outputIndex < b.outputIndex;
+        } else {
+            return a.txid < b.txid;
+        }
+    }
+};
+
+#endif // BITCOIN_SPENTINDEX_H
diff --git a/src/txdb.cpp b/src/txdb.cpp
index 1a30bb58ad80b..c49562e9944ae 100644
--- a/src/txdb.cpp
+++ b/src/txdb.cpp
@@ -17,6 +17,11 @@
 static const char DB_COINS = 'c';
 static const char DB_BLOCK_FILES = 'f';
 static const char DB_TXINDEX = 't';
+static const char DB_ADDRESSINDEX = 'a';
+static const char DB_ADDRESSUNSPENTINDEX = 'u';
+static const char DB_TIMESTAMPINDEX = 's';
+static const char DB_BLOCKHASHINDEX = 'z';
+static const char DB_SPENTINDEX = 'p';
 static const char DB_BLOCK_INDEX = 'b';
 
 static const char DB_BEST_BLOCK = 'B';
@@ -157,6 +162,157 @@ bool CBlockTreeDB::WriteTxIndex(const std::vector<std::pair<uint256, CDiskTxPos>
     return WriteBatch(batch);
 }
 
+bool CBlockTreeDB::ReadSpentIndex(CSpentIndexKey &key, CSpentIndexValue &value) {
+    return Read(make_pair(DB_SPENTINDEX, key), value);
+}
+
+bool CBlockTreeDB::UpdateSpentIndex(const std::vector<std::pair<CSpentIndexKey, CSpentIndexValue> >&vect) {
+    CDBBatch batch(&GetObfuscateKey());
+    for (std::vector<std::pair<CSpentIndexKey,CSpentIndexValue> >::const_iterator it=vect.begin(); it!=vect.end(); it++) {
+        if (it->second.IsNull()) {
+            batch.Erase(make_pair(DB_SPENTINDEX, it->first));
+        } else {
+            batch.Write(make_pair(DB_SPENTINDEX, it->first), it->second);
+        }
+    }
+    return WriteBatch(batch);
+}
+
+bool CBlockTreeDB::UpdateAddressUnspentIndex(const std::vector<std::pair<CAddressUnspentKey, CAddressUnspentValue > >&vect) {
+    CDBBatch batch(&GetObfuscateKey());
+    for (std::vector<std::pair<CAddressUnspentKey, CAddressUnspentValue> >::const_iterator it=vect.begin(); it!=vect.end(); it++) {
+        if (it->second.IsNull()) {
+            batch.Erase(make_pair(DB_ADDRESSUNSPENTINDEX, it->first));
+        } else {
+            batch.Write(make_pair(DB_ADDRESSUNSPENTINDEX, it->first), it->second);
+        }
+    }
+    return WriteBatch(batch);
+}
+
+bool CBlockTreeDB::ReadAddressUnspentIndex(uint160 addressHash, int type,
+                                           std::vector<std::pair<CAddressUnspentKey, CAddressUnspentValue> > &unspentOutputs) {
+
+    boost::scoped_ptr<CDBIterator> pcursor(NewIterator());
+
+    pcursor->Seek(make_pair(DB_ADDRESSUNSPENTINDEX, CAddressIndexIteratorKey(type, addressHash)));
+
+    while (pcursor->Valid()) {
+        boost::this_thread::interruption_point();
+        std::pair<char,CAddressUnspentKey> key;
+        if (pcursor->GetKey(key) && key.first == DB_ADDRESSUNSPENTINDEX && key.second.hashBytes == addressHash) {
+            CAddressUnspentValue nValue;
+            if (pcursor->GetValue(nValue)) {
+                unspentOutputs.push_back(make_pair(key.second, nValue));
+                pcursor->Next();
+            } else {
+                return error("failed to get address unspent value");
+            }
+        } else {
+            break;
+        }
+    }
+
+    return true;
+}
+
+bool CBlockTreeDB::WriteAddressIndex(const std::vector<std::pair<CAddressIndexKey, CAmount > >&vect) {
+    CDBBatch batch(&GetObfuscateKey());
+    for (std::vector<std::pair<CAddressIndexKey, CAmount> >::const_iterator it=vect.begin(); it!=vect.end(); it++)
+        batch.Write(make_pair(DB_ADDRESSINDEX, it->first), it->second);
+    return WriteBatch(batch);
+}
+
+bool CBlockTreeDB::EraseAddressIndex(const std::vector<std::pair<CAddressIndexKey, CAmount > >&vect) {
+    CDBBatch batch(&GetObfuscateKey());
+    for (std::vector<std::pair<CAddressIndexKey, CAmount> >::const_iterator it=vect.begin(); it!=vect.end(); it++)
+        batch.Erase(make_pair(DB_ADDRESSINDEX, it->first));
+    return WriteBatch(batch);
+}
+
+bool CBlockTreeDB::ReadAddressIndex(uint160 addressHash, int type,
+                                    std::vector<std::pair<CAddressIndexKey, CAmount> > &addressIndex,
+                                    int start, int end) {
+
+    boost::scoped_ptr<CDBIterator> pcursor(NewIterator());
+
+    if (start > 0 && end > 0) {
+        pcursor->Seek(make_pair(DB_ADDRESSINDEX, CAddressIndexIteratorHeightKey(type, addressHash, start)));
+    } else {
+        pcursor->Seek(make_pair(DB_ADDRESSINDEX, CAddressIndexIteratorKey(type, addressHash)));
+    }
+
+    while (pcursor->Valid()) {
+        boost::this_thread::interruption_point();
+        std::pair<char,CAddressIndexKey> key;
+        if (pcursor->GetKey(key) && key.first == DB_ADDRESSINDEX && key.second.hashBytes == addressHash) {
+            if (end > 0 && key.second.blockHeight > end) {
+                break;
+            }
+            CAmount nValue;
+            if (pcursor->GetValue(nValue)) {
+                addressIndex.push_back(make_pair(key.second, nValue));
+                pcursor->Next();
+            } else {
+                return error("failed to get address index value");
+            }
+        } else {
+            break;
+        }
+    }
+
+    return true;
+}
+
+bool CBlockTreeDB::WriteTimestampIndex(const CTimestampIndexKey &timestampIndex) {
+    CDBBatch batch(&GetObfuscateKey());
+    batch.Write(make_pair(DB_TIMESTAMPINDEX, timestampIndex), 0);
+    return WriteBatch(batch);
+}
+
+bool CBlockTreeDB::ReadTimestampIndex(const unsigned int &high, const unsigned int &low, const bool fActiveOnly, std::vector<std::pair<uint256, unsigned int> > &hashes) {
+
+    boost::scoped_ptr<CDBIterator> pcursor(NewIterator());
+
+    pcursor->Seek(make_pair(DB_TIMESTAMPINDEX, CTimestampIndexIteratorKey(low)));
+
+    while (pcursor->Valid()) {
+        boost::this_thread::interruption_point();
+        std::pair<char, CTimestampIndexKey> key;
+        if (pcursor->GetKey(key) && key.first == DB_TIMESTAMPINDEX && key.second.timestamp < high) {
+            if (fActiveOnly) {
+                if (blockOnchainActive(key.second.blockHash)) {
+                    hashes.push_back(std::make_pair(key.second.blockHash, key.second.timestamp));
+                }
+            } else {
+                hashes.push_back(std::make_pair(key.second.blockHash, key.second.timestamp));
+            }
+
+            pcursor->Next();
+        } else {
+            break;
+        }
+    }
+
+    return true;
+}
+
+bool CBlockTreeDB::WriteTimestampBlockIndex(const CTimestampBlockIndexKey &blockhashIndex, const CTimestampBlockIndexValue &logicalts) {
+    CDBBatch batch(&GetObfuscateKey());
+    batch.Write(make_pair(DB_BLOCKHASHINDEX, blockhashIndex), logicalts);
+    return WriteBatch(batch);
+}
+
+bool CBlockTreeDB::ReadTimestampBlockIndex(const uint256 &hash, unsigned int &ltimestamp) {
+
+    CTimestampBlockIndexValue(lts);
+    if (!Read(std::make_pair(DB_BLOCKHASHINDEX, hash), lts))
+	return false;
+
+    ltimestamp = lts.ltimestamp;
+    return true;
+}
+
 bool CBlockTreeDB::WriteFlag(const std::string &name, bool fValue) {
     return Write(std::make_pair(DB_FLAG, name), fValue ? '1' : '0');
 }
@@ -169,6 +325,16 @@ bool CBlockTreeDB::ReadFlag(const std::string &name, bool &fValue) {
     return true;
 }
 
+bool CBlockTreeDB::blockOnchainActive(const uint256 &hash) {
+    CBlockIndex* pblockindex = mapBlockIndex[hash];
+    
+    if (!chainActive.Contains(pblockindex)) {
+        return false;
+    }
+    
+    return true;
+}
+
 bool CBlockTreeDB::LoadBlockIndexGuts(boost::function<CBlockIndex*(const uint256&)> insertBlockIndex)
 {
     std::unique_ptr<CDBIterator> pcursor(NewIterator());
diff --git a/src/txdb.h b/src/txdb.h
index 7f5cf2b583fdf..ae9a2f30cf543 100644
--- a/src/txdb.h
+++ b/src/txdb.h
@@ -19,6 +19,17 @@
 
 class CBlockIndex;
 class CCoinsViewDBCursor;
+struct CAddressUnspentKey;
+struct CAddressUnspentValue;
+struct CAddressIndexKey;
+struct CAddressIndexIteratorKey;
+struct CAddressIndexIteratorHeightKey;
+struct CTimestampIndexKey;
+struct CTimestampIndexIteratorKey;
+struct CTimestampBlockIndexKey;
+struct CTimestampBlockIndexValue;
+struct CSpentIndexKey;
+struct CSpentIndexValue;
 class uint256;
 
 //! -dbcache default (MiB)
@@ -114,9 +125,24 @@ class CBlockTreeDB : public CDBWrapper
     bool ReadReindexing(bool &fReindex);
     bool ReadTxIndex(const uint256 &txid, CDiskTxPos &pos);
     bool WriteTxIndex(const std::vector<std::pair<uint256, CDiskTxPos> > &list);
+    bool ReadSpentIndex(CSpentIndexKey &key, CSpentIndexValue &value);
+    bool UpdateSpentIndex(const std::vector<std::pair<CSpentIndexKey, CSpentIndexValue> >&vect);
+    bool UpdateAddressUnspentIndex(const std::vector<std::pair<CAddressUnspentKey, CAddressUnspentValue > >&vect);
+    bool ReadAddressUnspentIndex(uint160 addressHash, int type,
+                                 std::vector<std::pair<CAddressUnspentKey, CAddressUnspentValue> > &vect);
+    bool WriteAddressIndex(const std::vector<std::pair<CAddressIndexKey, CAmount> > &vect);
+    bool EraseAddressIndex(const std::vector<std::pair<CAddressIndexKey, CAmount> > &vect);
+    bool ReadAddressIndex(uint160 addressHash, int type,
+                          std::vector<std::pair<CAddressIndexKey, CAmount> > &addressIndex,
+                          int start = 0, int end = 0);
+    bool WriteTimestampIndex(const CTimestampIndexKey &timestampIndex);
+    bool ReadTimestampIndex(const unsigned int &high, const unsigned int &low, const bool fActiveOnly, std::vector<std::pair<uint256, unsigned int> > &vect);
+    bool WriteTimestampBlockIndex(const CTimestampBlockIndexKey &blockhashIndex, const CTimestampBlockIndexValue &logicalts);
+    bool ReadTimestampBlockIndex(const uint256 &hash, unsigned int &logicalTS);
     bool WriteFlag(const std::string &name, bool fValue);
     bool ReadFlag(const std::string &name, bool &fValue);
     bool LoadBlockIndexGuts(boost::function<CBlockIndex*(const uint256&)> insertBlockIndex);
+    bool blockOnchainActive(const uint256 &hash);
 };
 
 #endif // BITCOIN_TXDB_H
diff --git a/src/txmempool.cpp b/src/txmempool.cpp
index 5842dd88d838c..047968efbfffb 100644
--- a/src/txmempool.cpp
+++ b/src/txmempool.cpp
@@ -450,6 +450,145 @@ bool CTxMemPool::addUnchecked(const uint256& hash, const CTxMemPoolEntry &entry,
     return true;
 }
 
+void CTxMemPool::addAddressIndex(const CTxMemPoolEntry &entry, const CCoinsViewCache &view)
+{
+    LOCK(cs);
+    const CTransaction& tx = entry.GetTx();
+    std::vector<CMempoolAddressDeltaKey> inserted;
+
+    uint256 txhash = tx.GetHash();
+    for (unsigned int j = 0; j < tx.vin.size(); j++) {
+        const CTxIn input = tx.vin[j];
+        const CTxOut &prevout = view.GetOutputFor(input);
+        if (prevout.scriptPubKey.IsPayToScriptHash()) {
+            vector<unsigned char> hashBytes(prevout.scriptPubKey.begin()+2, prevout.scriptPubKey.begin()+22);
+            CMempoolAddressDeltaKey key(2, uint160(hashBytes), txhash, j, 1);
+            CMempoolAddressDelta delta(entry.GetTime(), prevout.nValue * -1, input.prevout.hash, input.prevout.n);
+            mapAddress.insert(make_pair(key, delta));
+            inserted.push_back(key);
+        } else if (prevout.scriptPubKey.IsPayToPublicKeyHash()) {
+            vector<unsigned char> hashBytes(prevout.scriptPubKey.begin()+3, prevout.scriptPubKey.begin()+23);
+            CMempoolAddressDeltaKey key(1, uint160(hashBytes), txhash, j, 1);
+            CMempoolAddressDelta delta(entry.GetTime(), prevout.nValue * -1, input.prevout.hash, input.prevout.n);
+            mapAddress.insert(make_pair(key, delta));
+            inserted.push_back(key);
+        }
+    }
+
+    for (unsigned int k = 0; k < tx.vout.size(); k++) {
+        const CTxOut &out = tx.vout[k];
+        if (out.scriptPubKey.IsPayToScriptHash()) {
+            vector<unsigned char> hashBytes(out.scriptPubKey.begin()+2, out.scriptPubKey.begin()+22);
+            CMempoolAddressDeltaKey key(2, uint160(hashBytes), txhash, k, 0);
+            mapAddress.insert(make_pair(key, CMempoolAddressDelta(entry.GetTime(), out.nValue)));
+            inserted.push_back(key);
+        } else if (out.scriptPubKey.IsPayToPublicKeyHash()) {
+            vector<unsigned char> hashBytes(out.scriptPubKey.begin()+3, out.scriptPubKey.begin()+23);
+            std::pair<addressDeltaMap::iterator,bool> ret;
+            CMempoolAddressDeltaKey key(1, uint160(hashBytes), txhash, k, 0);
+            mapAddress.insert(make_pair(key, CMempoolAddressDelta(entry.GetTime(), out.nValue)));
+            inserted.push_back(key);
+        }
+    }
+
+    mapAddressInserted.insert(make_pair(txhash, inserted));
+}
+
+bool CTxMemPool::getAddressIndex(std::vector<std::pair<uint160, int> > &addresses,
+                                 std::vector<std::pair<CMempoolAddressDeltaKey, CMempoolAddressDelta> > &results)
+{
+    LOCK(cs);
+    for (std::vector<std::pair<uint160, int> >::iterator it = addresses.begin(); it != addresses.end(); it++) {
+        addressDeltaMap::iterator ait = mapAddress.lower_bound(CMempoolAddressDeltaKey((*it).second, (*it).first));
+        while (ait != mapAddress.end() && (*ait).first.addressBytes == (*it).first && (*ait).first.type == (*it).second) {
+            results.push_back(*ait);
+            ait++;
+        }
+    }
+    return true;
+}
+
+bool CTxMemPool::removeAddressIndex(const uint256 txhash)
+{
+    LOCK(cs);
+    addressDeltaMapInserted::iterator it = mapAddressInserted.find(txhash);
+
+    if (it != mapAddressInserted.end()) {
+        std::vector<CMempoolAddressDeltaKey> keys = (*it).second;
+        for (std::vector<CMempoolAddressDeltaKey>::iterator mit = keys.begin(); mit != keys.end(); mit++) {
+            mapAddress.erase(*mit);
+        }
+        mapAddressInserted.erase(it);
+    }
+
+    return true;
+}
+
+void CTxMemPool::addSpentIndex(const CTxMemPoolEntry &entry, const CCoinsViewCache &view)
+{
+    LOCK(cs);
+
+    const CTransaction& tx = entry.GetTx();
+    std::vector<CSpentIndexKey> inserted;
+
+    uint256 txhash = tx.GetHash();
+    for (unsigned int j = 0; j < tx.vin.size(); j++) {
+        const CTxIn input = tx.vin[j];
+        const CTxOut &prevout = view.GetOutputFor(input);
+        uint160 addressHash;
+        int addressType;
+
+        if (prevout.scriptPubKey.IsPayToScriptHash()) {
+            addressHash = uint160(vector<unsigned char> (prevout.scriptPubKey.begin()+2, prevout.scriptPubKey.begin()+22));
+            addressType = 2;
+        } else if (prevout.scriptPubKey.IsPayToPublicKeyHash()) {
+            addressHash = uint160(vector<unsigned char> (prevout.scriptPubKey.begin()+3, prevout.scriptPubKey.begin()+23));
+            addressType = 1;
+        } else {
+            addressHash.SetNull();
+            addressType = 0;
+        }
+
+        CSpentIndexKey key = CSpentIndexKey(input.prevout.hash, input.prevout.n);
+        CSpentIndexValue value = CSpentIndexValue(txhash, j, -1, prevout.nValue, addressType, addressHash);
+
+        mapSpent.insert(make_pair(key, value));
+        inserted.push_back(key);
+
+    }
+
+    mapSpentInserted.insert(make_pair(txhash, inserted));
+}
+
+bool CTxMemPool::getSpentIndex(CSpentIndexKey &key, CSpentIndexValue &value)
+{
+    LOCK(cs);
+    mapSpentIndex::iterator it;
+
+    it = mapSpent.find(key);
+    if (it != mapSpent.end()) {
+        value = it->second;
+        return true;
+    }
+    return false;
+}
+
+bool CTxMemPool::removeSpentIndex(const uint256 txhash)
+{
+    LOCK(cs);
+    mapSpentIndexInserted::iterator it = mapSpentInserted.find(txhash);
+
+    if (it != mapSpentInserted.end()) {
+        std::vector<CSpentIndexKey> keys = (*it).second;
+        for (std::vector<CSpentIndexKey>::iterator mit = keys.begin(); mit != keys.end(); mit++) {
+            mapSpent.erase(*mit);
+        }
+        mapSpentInserted.erase(it);
+    }
+
+    return true;
+}
+
 void CTxMemPool::removeUnchecked(txiter it, MemPoolRemovalReason reason)
 {
     NotifyEntryRemoved(it->GetSharedTx(), reason);
@@ -473,6 +612,8 @@ void CTxMemPool::removeUnchecked(txiter it, MemPoolRemovalReason reason)
     mapTx.erase(it);
     nTransactionsUpdated++;
     minerPolicyEstimator->removeTx(hash);
+    removeAddressIndex(hash);
+    removeSpentIndex(hash);
 }
 
 // Calculates descendants of entry that are not already in setDescendants, and adds to
diff --git a/src/txmempool.h b/src/txmempool.h
index db1a02455f862..9fd8a1173df61 100644
--- a/src/txmempool.h
+++ b/src/txmempool.h
@@ -13,6 +13,8 @@
 #include <utility>
 #include <string>
 
+#include "addressindex.h"
+#include "spentindex.h"
 #include "amount.h"
 #include "coins.h"
 #include "indirectmap.h"
@@ -506,6 +508,18 @@ class CTxMemPool
     typedef std::map<txiter, TxLinks, CompareIteratorByHash> txlinksMap;
     txlinksMap mapLinks;
 
+    typedef std::map<CMempoolAddressDeltaKey, CMempoolAddressDelta, CMempoolAddressDeltaKeyCompare> addressDeltaMap;
+    addressDeltaMap mapAddress;
+
+    typedef std::map<uint256, std::vector<CMempoolAddressDeltaKey> > addressDeltaMapInserted;
+    addressDeltaMapInserted mapAddressInserted;
+
+    typedef std::map<CSpentIndexKey, CSpentIndexValue, CSpentIndexKeyCompare> mapSpentIndex;
+    mapSpentIndex mapSpent;
+
+    typedef std::map<uint256, std::vector<CSpentIndexKey> > mapSpentIndexInserted;
+    mapSpentIndexInserted mapSpentInserted;
+
     void UpdateParent(txiter entry, txiter parent, bool add);
     void UpdateChild(txiter entry, txiter child, bool add);
 
@@ -536,6 +550,15 @@ class CTxMemPool
     bool addUnchecked(const uint256& hash, const CTxMemPoolEntry &entry, bool validFeeEstimate = true);
     bool addUnchecked(const uint256& hash, const CTxMemPoolEntry &entry, setEntries &setAncestors, bool validFeeEstimate = true);
 
+    void addAddressIndex(const CTxMemPoolEntry &entry, const CCoinsViewCache &view);
+    bool getAddressIndex(std::vector<std::pair<uint160, int> > &addresses,
+                         std::vector<std::pair<CMempoolAddressDeltaKey, CMempoolAddressDelta> > &results);
+    bool removeAddressIndex(const uint256 txhash);
+
+    void addSpentIndex(const CTxMemPoolEntry &entry, const CCoinsViewCache &view);
+    bool getSpentIndex(CSpentIndexKey &key, CSpentIndexValue &value);
+    bool removeSpentIndex(const uint256 txhash);
+
     void removeRecursive(const CTransaction &tx, MemPoolRemovalReason reason = MemPoolRemovalReason::UNKNOWN);
     void removeForReorg(const CCoinsViewCache *pcoins, unsigned int nMemPoolHeight, int flags);
     void removeConflicts(const CTransaction &tx);
diff --git a/src/validation.cpp b/src/validation.cpp
index e8a3736e5dd51..400ee066a1aa9 100644
--- a/src/validation.cpp
+++ b/src/validation.cpp
@@ -65,6 +65,9 @@ int nScriptCheckThreads = 0;
 std::atomic_bool fImporting(false);
 bool fReindex = false;
 bool fTxIndex = false;
+bool fAddressIndex = false;
+bool fTimestampIndex = false;
+bool fSpentIndex = false;
 bool fHavePruned = false;
 bool fPruneMode = false;
 bool fIsBareMultisigStd = DEFAULT_PERMIT_BAREMULTISIG;
@@ -999,6 +1002,16 @@ bool AcceptToMemoryPoolWorker(CTxMemPool& pool, CValidationState& state, const C
         // Store transaction in memory
         pool.addUnchecked(hash, entry, setAncestors, validForFeeEstimation);
 
+        // Add memory address index
+        if (fAddressIndex) {
+            pool.addAddressIndex(entry, view);
+        }
+
+        // Add memory spent index
+        if (fSpentIndex) {
+            pool.addSpentIndex(entry, view);
+        }
+
         // trim mempool and check if tx was trimmed
         if (!fOverrideMempoolLimit) {
             LimitMempoolSize(pool, GetArg("-maxmempool", DEFAULT_MAX_MEMPOOL_SIZE) * 1000000, GetArg("-mempoolexpiry", DEFAULT_MEMPOOL_EXPIRY) * 60 * 60);
@@ -1035,6 +1048,55 @@ bool AcceptToMemoryPool(CTxMemPool& pool, CValidationState &state, const CTransa
     return AcceptToMemoryPoolWithTime(pool, state, tx, fLimitFree, pfMissingInputs, GetTime(), plTxnReplaced, fOverrideMempoolLimit, nAbsurdFee);
 }
 
+bool GetTimestampIndex(const unsigned int &high, const unsigned int &low, const bool fActiveOnly, std::vector<std::pair<uint256, unsigned int> > &hashes)
+{
+    if (!fTimestampIndex)
+        return error("Timestamp index not enabled");
+
+    if (!pblocktree->ReadTimestampIndex(high, low, fActiveOnly, hashes))
+        return error("Unable to get hashes for timestamps");
+
+    return true;
+}
+
+bool GetSpentIndex(CSpentIndexKey &key, CSpentIndexValue &value)
+{
+    if (!fSpentIndex)
+        return false;
+
+    if (mempool.getSpentIndex(key, value))
+        return true;
+
+    if (!pblocktree->ReadSpentIndex(key, value))
+        return false;
+
+    return true;
+}
+
+bool GetAddressIndex(uint160 addressHash, int type,
+                     std::vector<std::pair<CAddressIndexKey, CAmount> > &addressIndex, int start, int end)
+{
+    if (!fAddressIndex)
+        return error("address index not enabled");
+
+    if (!pblocktree->ReadAddressIndex(addressHash, type, addressIndex, start, end))
+        return error("unable to get txids for address");
+
+    return true;
+}
+
+bool GetAddressUnspent(uint160 addressHash, int type,
+                       std::vector<std::pair<CAddressUnspentKey, CAddressUnspentValue> > &unspentOutputs)
+{
+    if (!fAddressIndex)
+        return error("address index not enabled");
+
+    if (!pblocktree->ReadAddressUnspentIndex(addressHash, type, unspentOutputs))
+        return error("unable to get txids for address");
+
+    return true;
+}
+
 /** Return transaction in txOut, and if it was found inside a block, its hash is placed in hashBlock */
 bool GetTransaction(const uint256 &hash, CTransactionRef &txOut, const Consensus::Params& consensusParams, uint256 &hashBlock, bool fAllowSlow)
 {
@@ -1601,11 +1663,46 @@ bool DisconnectBlock(const CBlock& block, CValidationState& state, const CBlockI
     if (blockUndo.vtxundo.size() + 1 != block.vtx.size())
         return error("DisconnectBlock(): block and undo data inconsistent");
 
+    std::vector<std::pair<CAddressIndexKey, CAmount> > addressIndex;
+    std::vector<std::pair<CAddressUnspentKey, CAddressUnspentValue> > addressUnspentIndex;
+    std::vector<std::pair<CSpentIndexKey, CSpentIndexValue> > spentIndex;
+
     // undo transactions in reverse order
     for (int i = block.vtx.size() - 1; i >= 0; i--) {
         const CTransaction &tx = *(block.vtx[i]);
         uint256 hash = tx.GetHash();
 
+        if (fAddressIndex) {
+
+            for (unsigned int k = tx.vout.size(); k-- > 0;) {
+                const CTxOut &out = tx.vout[k];
+
+                if (out.scriptPubKey.IsPayToScriptHash()) {
+                    vector<unsigned char> hashBytes(out.scriptPubKey.begin()+2, out.scriptPubKey.begin()+22);
+
+                    // undo receiving activity
+                    addressIndex.push_back(make_pair(CAddressIndexKey(2, uint160(hashBytes), pindex->nHeight, i, hash, k, false), out.nValue));
+
+                    // undo unspent index
+                    addressUnspentIndex.push_back(make_pair(CAddressUnspentKey(2, uint160(hashBytes), hash, k), CAddressUnspentValue()));
+
+                } else if (out.scriptPubKey.IsPayToPublicKeyHash()) {
+                    vector<unsigned char> hashBytes(out.scriptPubKey.begin()+3, out.scriptPubKey.begin()+23);
+
+                    // undo receiving activity
+                    addressIndex.push_back(make_pair(CAddressIndexKey(1, uint160(hashBytes), pindex->nHeight, i, hash, k, false), out.nValue));
+
+                    // undo unspent index
+                    addressUnspentIndex.push_back(make_pair(CAddressUnspentKey(1, uint160(hashBytes), hash, k), CAddressUnspentValue()));
+
+                } else {
+                    continue;
+                }
+
+            }
+
+        }
+
         // Check that all outputs are available and match the outputs in the block itself
         // exactly.
         {
@@ -1635,10 +1732,45 @@ bool DisconnectBlock(const CBlock& block, CValidationState& state, const CBlockI
                 const CTxInUndo &undo = txundo.vprevout[j];
                 if (!ApplyTxInUndo(undo, view, out))
                     fClean = false;
+
+                const CTxIn input = tx.vin[j];
+
+                if (fSpentIndex) {
+                    // undo and delete the spent index
+                    spentIndex.push_back(make_pair(CSpentIndexKey(input.prevout.hash, input.prevout.n), CSpentIndexValue()));
+                }
+
+                if (fAddressIndex) {
+                    const CTxOut &prevout = view.GetOutputFor(tx.vin[j]);
+                    if (prevout.scriptPubKey.IsPayToScriptHash()) {
+                        vector<unsigned char> hashBytes(prevout.scriptPubKey.begin()+2, prevout.scriptPubKey.begin()+22);
+
+                        // undo spending activity
+                        addressIndex.push_back(make_pair(CAddressIndexKey(2, uint160(hashBytes), pindex->nHeight, i, hash, j, true), prevout.nValue * -1));
+
+                        // restore unspent index
+                        addressUnspentIndex.push_back(make_pair(CAddressUnspentKey(2, uint160(hashBytes), input.prevout.hash, input.prevout.n), CAddressUnspentValue(prevout.nValue, prevout.scriptPubKey, undo.nHeight)));
+
+
+                    } else if (prevout.scriptPubKey.IsPayToPublicKeyHash()) {
+                        vector<unsigned char> hashBytes(prevout.scriptPubKey.begin()+3, prevout.scriptPubKey.begin()+23);
+
+                        // undo spending activity
+                        addressIndex.push_back(make_pair(CAddressIndexKey(1, uint160(hashBytes), pindex->nHeight, i, hash, j, true), prevout.nValue * -1));
+
+                        // restore unspent index
+                        addressUnspentIndex.push_back(make_pair(CAddressUnspentKey(1, uint160(hashBytes), input.prevout.hash, input.prevout.n), CAddressUnspentValue(prevout.nValue, prevout.scriptPubKey, undo.nHeight)));
+
+                    } else {
+                        continue;
+                    }
+                }
+
             }
         }
     }
 
+
     // move best block pointer to prevout block
     view.SetBestBlock(pindex->pprev->GetBlockHash());
 
@@ -1647,6 +1779,15 @@ bool DisconnectBlock(const CBlock& block, CValidationState& state, const CBlockI
         return true;
     }
 
+    if (fAddressIndex) {
+        if (!pblocktree->EraseAddressIndex(addressIndex)) {
+            return AbortNode(state, "Failed to delete address index");
+        }
+        if (!pblocktree->UpdateAddressUnspentIndex(addressUnspentIndex)) {
+            return AbortNode(state, "Failed to write address unspent index");
+        }
+    }
+
     return fClean;
 }
 
@@ -1871,6 +2012,7 @@ bool ConnectBlock(const CBlock& block, CValidationState& state, CBlockIndex* pin
     for (unsigned int i = 0; i < block.vtx.size(); i++)
     {
         const CTransaction &tx = *(block.vtx[i]);
+        const uint256 txhash = tx.GetHash();
 
         nInputs += tx.vin.size();
 
@@ -1892,6 +2034,43 @@ bool ConnectBlock(const CBlock& block, CValidationState& state, CBlockIndex* pin
                 return state.DoS(100, error("%s: contains a non-BIP68-final transaction", __func__),
                                  REJECT_INVALID, "bad-txns-nonfinal");
             }
+
+            if (fAddressIndex || fSpentIndex)
+            {
+                for (size_t j = 0; j < tx.vin.size(); j++) {
+
+                    const CTxIn input = tx.vin[j];
+                    const CTxOut &prevout = view.GetOutputFor(tx.vin[j]);
+                    uint160 hashBytes;
+                    int addressType;
+
+                    if (prevout.scriptPubKey.IsPayToScriptHash()) {
+                        hashBytes = uint160(vector <unsigned char>(prevout.scriptPubKey.begin()+2, prevout.scriptPubKey.begin()+22));
+                        addressType = 2;
+                    } else if (prevout.scriptPubKey.IsPayToPublicKeyHash()) {
+                        hashBytes = uint160(vector <unsigned char>(prevout.scriptPubKey.begin()+3, prevout.scriptPubKey.begin()+23));
+                        addressType = 1;
+                    } else {
+                        hashBytes.SetNull();
+                        addressType = 0;
+                    }
+
+                    if (fAddressIndex && addressType > 0) {
+                        // record spending activity
+                        addressIndex.push_back(make_pair(CAddressIndexKey(addressType, hashBytes, pindex->nHeight, i, txhash, j, true), prevout.nValue * -1));
+
+                        // remove address from unspent index
+                        addressUnspentIndex.push_back(make_pair(CAddressUnspentKey(addressType, hashBytes, input.prevout.hash, input.prevout.n), CAddressUnspentValue()));
+                    }
+
+                    if (fSpentIndex) {
+                        // add the spent index to determine the txid and input that spent an output
+                        // and to find the amount and address from an input
+                        spentIndex.push_back(make_pair(CSpentIndexKey(input.prevout.hash, input.prevout.n), CSpentIndexValue(txhash, j, pindex->nHeight, prevout.nValue, addressType, hashBytes)));
+                    }
+                }
+
+            }
         }
 
         // GetTransactionSigOpCost counts 3 types of sigops:
@@ -1916,6 +2095,35 @@ bool ConnectBlock(const CBlock& block, CValidationState& state, CBlockIndex* pin
             control.Add(vChecks);
         }
 
+        if (fAddressIndex) {
+            for (unsigned int k = 0; k < tx.vout.size(); k++) {
+                const CTxOut &out = tx.vout[k];
+
+                if (out.scriptPubKey.IsPayToScriptHash()) {
+                    vector<unsigned char> hashBytes(out.scriptPubKey.begin()+2, out.scriptPubKey.begin()+22);
+
+                    // record receiving activity
+                    addressIndex.push_back(make_pair(CAddressIndexKey(2, uint160(hashBytes), pindex->nHeight, i, txhash, k, false), out.nValue));
+
+                    // record unspent output
+                    addressUnspentIndex.push_back(make_pair(CAddressUnspentKey(2, uint160(hashBytes), txhash, k), CAddressUnspentValue(out.nValue, out.scriptPubKey, pindex->nHeight)));
+
+                } else if (out.scriptPubKey.IsPayToPublicKeyHash()) {
+                    vector<unsigned char> hashBytes(out.scriptPubKey.begin()+3, out.scriptPubKey.begin()+23);
+
+                    // record receiving activity
+                    addressIndex.push_back(make_pair(CAddressIndexKey(1, uint160(hashBytes), pindex->nHeight, i, txhash, k, false), out.nValue));
+
+                    // record unspent output
+                    addressUnspentIndex.push_back(make_pair(CAddressUnspentKey(1, uint160(hashBytes), txhash, k), CAddressUnspentValue(out.nValue, out.scriptPubKey, pindex->nHeight)));
+
+                } else {
+                    continue;
+                }
+
+            }
+        }
+
         CTxUndo undoDummy;
         if (i > 0) {
             blockundo.vtxundo.push_back(CTxUndo());
@@ -1966,6 +2174,41 @@ bool ConnectBlock(const CBlock& block, CValidationState& state, CBlockIndex* pin
         if (!pblocktree->WriteTxIndex(vPos))
             return AbortNode(state, "Failed to write transaction index");
 
+    if (fAddressIndex) {
+        if (!pblocktree->WriteAddressIndex(addressIndex)) {
+            return AbortNode(state, "Failed to write address index");
+        }
+
+        if (!pblocktree->UpdateAddressUnspentIndex(addressUnspentIndex)) {
+            return AbortNode(state, "Failed to write address unspent index");
+        }
+    }
+
+    if (fSpentIndex)
+        if (!pblocktree->UpdateSpentIndex(spentIndex))
+            return AbortNode(state, "Failed to write transaction index");
+
+    if (fTimestampIndex) {
+        unsigned int logicalTS = pindex->nTime;
+        unsigned int prevLogicalTS = 0;
+
+        // retrieve logical timestamp of the previous block
+        if (pindex->pprev)
+            if (!pblocktree->ReadTimestampBlockIndex(pindex->pprev->GetBlockHash(), prevLogicalTS))
+                LogPrintf("%s: Failed to read previous block's logical timestamp\n", __func__);
+
+        if (logicalTS <= prevLogicalTS) {
+            logicalTS = prevLogicalTS + 1;
+            LogPrintf("%s: Previous logical timestamp is newer Actual[%d] prevLogical[%d] Logical[%d]\n", __func__, pindex->nTime, prevLogicalTS, logicalTS);
+        }
+
+        if (!pblocktree->WriteTimestampIndex(CTimestampIndexKey(logicalTS, pindex->GetBlockHash())))
+            return AbortNode(state, "Failed to write timestamp index");
+
+        if (!pblocktree->WriteTimestampBlockIndex(CTimestampBlockIndexKey(pindex->GetBlockHash()), CTimestampBlockIndexValue(logicalTS)))
+            return AbortNode(state, "Failed to write blockhash index");
+    }
+
     // add this block to the view's block chain
     view.SetBestBlock(pindex->GetBlockHash());
 
@@ -3579,6 +3822,18 @@ bool static LoadBlockIndexDB(const CChainParams& chainparams)
     pblocktree->ReadFlag("txindex", fTxIndex);
     LogPrintf("%s: transaction index %s\n", __func__, fTxIndex ? "enabled" : "disabled");
 
+    // Check whether we have an address index
+    pblocktree->ReadFlag("addressindex", fAddressIndex);
+    LogPrintf("%s: address index %s\n", __func__, fAddressIndex ? "enabled" : "disabled");
+
+    // Check whether we have a timestamp index
+    pblocktree->ReadFlag("timestampindex", fTimestampIndex);
+    LogPrintf("%s: timestamp index %s\n", __func__, fTimestampIndex ? "enabled" : "disabled");
+
+    // Check whether we have a spent index
+    pblocktree->ReadFlag("spentindex", fSpentIndex);
+    LogPrintf("%s: spent index %s\n", __func__, fSpentIndex ? "enabled" : "disabled");
+
     // Load pointer to end of best chain
     BlockMap::iterator it = mapBlockIndex.find(pcoinsTip->GetBestBlock());
     if (it == mapBlockIndex.end())
@@ -3830,6 +4085,18 @@ bool InitBlockIndex(const CChainParams& chainparams)
     // Use the provided setting for -txindex in the new database
     fTxIndex = GetBoolArg("-txindex", DEFAULT_TXINDEX);
     pblocktree->WriteFlag("txindex", fTxIndex);
+
+    // Use the provided setting for -addressindex in the new database
+    fAddressIndex = GetBoolArg("-addressindex", DEFAULT_ADDRESSINDEX);
+    pblocktree->WriteFlag("addressindex", fAddressIndex);
+
+    // Use the provided setting for -timestampindex in the new database
+    fTimestampIndex = GetBoolArg("-timestampindex", DEFAULT_TIMESTAMPINDEX);
+    pblocktree->WriteFlag("timestampindex", fTimestampIndex);
+
+    fSpentIndex = GetBoolArg("-spentindex", DEFAULT_SPENTINDEX);
+    pblocktree->WriteFlag("spentindex", fSpentIndex);
+
     LogPrintf("Initializing databases...\n");
 
     // Only add the genesis block if not reindexing (in which case we reuse the one already on disk)
diff --git a/src/validation.h b/src/validation.h
index 9c606f2419409..e8d7ffef7bbb1 100644
--- a/src/validation.h
+++ b/src/validation.h
@@ -17,6 +17,7 @@
 #include "script/script_error.h"
 #include "sync.h"
 #include "versionbits.h"
+#include "spentindex.h"
 
 #include <algorithm>
 #include <exception>
@@ -132,6 +133,9 @@ static const int64_t MAX_FEE_ESTIMATION_TIP_AGE = 3 * 60 * 60;
 static const bool DEFAULT_PERMIT_BAREMULTISIG = true;
 static const bool DEFAULT_CHECKPOINTS_ENABLED = true;
 static const bool DEFAULT_TXINDEX = false;
+static const bool DEFAULT_ADDRESSINDEX = false;
+static const bool DEFAULT_TIMESTAMPINDEX = false;
+static const bool DEFAULT_SPENTINDEX = false;
 static const unsigned int DEFAULT_BANSCORE_THRESHOLD = 100;
 
 /** Default for -mempoolreplacement */
@@ -338,6 +342,338 @@ ThresholdState VersionBitsTipState(const Consensus::Params& params, Consensus::D
 /** Get the block height at which the BIP9 deployment switched into the state for the block building on the current tip. */
 int VersionBitsTipStateSinceHeight(const Consensus::Params& params, Consensus::DeploymentPos pos);
 
+struct CTimestampIndexIteratorKey {
+    unsigned int timestamp;
+
+    size_t GetSerializeSize(int nType, int nVersion) const {
+        return 4;
+    }
+    template<typename Stream>
+    void Serialize(Stream& s, int nType, int nVersion) const {
+        ser_writedata32be(s, timestamp);
+    }
+    template<typename Stream>
+    void Unserialize(Stream& s, int nType, int nVersion) {
+        timestamp = ser_readdata32be(s);
+    }
+
+    CTimestampIndexIteratorKey(unsigned int time) {
+        timestamp = time;
+    }
+
+    CTimestampIndexIteratorKey() {
+        SetNull();
+    }
+
+    void SetNull() {
+        timestamp = 0;
+    }
+};
+
+struct CTimestampIndexKey {
+    unsigned int timestamp;
+    uint256 blockHash;
+
+    size_t GetSerializeSize(int nType, int nVersion) const {
+        return 36;
+    }
+    template<typename Stream>
+    void Serialize(Stream& s, int nType, int nVersion) const {
+        ser_writedata32be(s, timestamp);
+        blockHash.Serialize(s, nType, nVersion);
+    }
+    template<typename Stream>
+    void Unserialize(Stream& s, int nType, int nVersion) {
+        timestamp = ser_readdata32be(s);
+        blockHash.Unserialize(s, nType, nVersion);
+    }
+
+    CTimestampIndexKey(unsigned int time, uint256 hash) {
+        timestamp = time;
+        blockHash = hash;
+    }
+
+    CTimestampIndexKey() {
+        SetNull();
+    }
+
+    void SetNull() {
+        timestamp = 0;
+        blockHash.SetNull();
+    }
+};
+
+struct CTimestampBlockIndexKey {
+    uint256 blockHash;
+
+    size_t GetSerializeSize(int nType, int nVersion) const {
+        return 32;
+    }
+
+    template<typename Stream>
+    void Serialize(Stream& s, int nType, int nVersion) const {
+        blockHash.Serialize(s, nType, nVersion);
+    }
+
+    template<typename Stream>
+    void Unserialize(Stream& s, int nType, int nVersion) {
+        blockHash.Unserialize(s, nType, nVersion);
+    }
+
+    CTimestampBlockIndexKey(uint256 hash) {
+        blockHash = hash;
+    }
+
+    CTimestampBlockIndexKey() {
+        SetNull();
+    }
+
+    void SetNull() {
+        blockHash.SetNull();
+    }
+};
+
+struct CTimestampBlockIndexValue {
+    unsigned int ltimestamp;
+    size_t GetSerializeSize(int nType, int nVersion) const {
+        return 4;
+    }
+
+    template<typename Stream>
+    void Serialize(Stream& s, int nType, int nVersion) const {
+        ser_writedata32be(s, ltimestamp);
+    }
+
+    template<typename Stream>
+    void Unserialize(Stream& s, int nType, int nVersion) {
+        ltimestamp = ser_readdata32be(s);
+    }
+
+    CTimestampBlockIndexValue (unsigned int time) {
+        ltimestamp = time;
+    }
+
+    CTimestampBlockIndexValue() {
+        SetNull();
+    }
+
+    void SetNull() {
+        ltimestamp = 0;
+    }
+};
+
+struct CAddressUnspentKey {
+    unsigned int type;
+    uint160 hashBytes;
+    uint256 txhash;
+    size_t index;
+
+    size_t GetSerializeSize(int nType, int nVersion) const {
+        return 57;
+    }
+    template<typename Stream>
+    void Serialize(Stream& s, int nType, int nVersion) const {
+        ser_writedata8(s, type);
+        hashBytes.Serialize(s, nType, nVersion);
+        txhash.Serialize(s, nType, nVersion);
+        ser_writedata32(s, index);
+    }
+    template<typename Stream>
+    void Unserialize(Stream& s, int nType, int nVersion) {
+        type = ser_readdata8(s);
+        hashBytes.Unserialize(s, nType, nVersion);
+        txhash.Unserialize(s, nType, nVersion);
+        index = ser_readdata32(s);
+    }
+
+    CAddressUnspentKey(unsigned int addressType, uint160 addressHash, uint256 txid, size_t indexValue) {
+        type = addressType;
+        hashBytes = addressHash;
+        txhash = txid;
+        index = indexValue;
+    }
+
+    CAddressUnspentKey() {
+        SetNull();
+    }
+
+    void SetNull() {
+        type = 0;
+        hashBytes.SetNull();
+        txhash.SetNull();
+        index = 0;
+    }
+};
+
+struct CAddressUnspentValue {
+    CAmount satoshis;
+    CScript script;
+    int blockHeight;
+
+    ADD_SERIALIZE_METHODS;
+
+    template <typename Stream, typename Operation>
+    inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) {
+        READWRITE(satoshis);
+        READWRITE(*(CScriptBase*)(&script));
+        READWRITE(blockHeight);
+    }
+
+    CAddressUnspentValue(CAmount sats, CScript scriptPubKey, int height) {
+        satoshis = sats;
+        script = scriptPubKey;
+        blockHeight = height;
+    }
+
+    CAddressUnspentValue() {
+        SetNull();
+    }
+
+    void SetNull() {
+        satoshis = -1;
+        script.clear();
+        blockHeight = 0;
+    }
+
+    bool IsNull() const {
+        return (satoshis == -1);
+    }
+};
+
+struct CAddressIndexKey {
+    unsigned int type;
+    uint160 hashBytes;
+    int blockHeight;
+    unsigned int txindex;
+    uint256 txhash;
+    size_t index;
+    bool spending;
+
+    size_t GetSerializeSize(int nType, int nVersion) const {
+        return 66;
+    }
+    template<typename Stream>
+    void Serialize(Stream& s, int nType, int nVersion) const {
+        ser_writedata8(s, type);
+        hashBytes.Serialize(s, nType, nVersion);
+        // Heights are stored big-endian for key sorting in LevelDB
+        ser_writedata32be(s, blockHeight);
+        ser_writedata32be(s, txindex);
+        txhash.Serialize(s, nType, nVersion);
+        ser_writedata32(s, index);
+        char f = spending;
+        ser_writedata8(s, f);
+    }
+    template<typename Stream>
+    void Unserialize(Stream& s, int nType, int nVersion) {
+        type = ser_readdata8(s);
+        hashBytes.Unserialize(s, nType, nVersion);
+        blockHeight = ser_readdata32be(s);
+        txindex = ser_readdata32be(s);
+        txhash.Unserialize(s, nType, nVersion);
+        index = ser_readdata32(s);
+        char f = ser_readdata8(s);
+        spending = f;
+    }
+
+    CAddressIndexKey(unsigned int addressType, uint160 addressHash, int height, int blockindex,
+                     uint256 txid, size_t indexValue, bool isSpending) {
+        type = addressType;
+        hashBytes = addressHash;
+        blockHeight = height;
+        txindex = blockindex;
+        txhash = txid;
+        index = indexValue;
+        spending = isSpending;
+    }
+
+    CAddressIndexKey() {
+        SetNull();
+    }
+
+    void SetNull() {
+        type = 0;
+        hashBytes.SetNull();
+        blockHeight = 0;
+        txindex = 0;
+        txhash.SetNull();
+        index = 0;
+        spending = false;
+    }
+
+};
+
+struct CAddressIndexIteratorKey {
+    unsigned int type;
+    uint160 hashBytes;
+
+    size_t GetSerializeSize(int nType, int nVersion) const {
+        return 21;
+    }
+    template<typename Stream>
+    void Serialize(Stream& s, int nType, int nVersion) const {
+        ser_writedata8(s, type);
+        hashBytes.Serialize(s, nType, nVersion);
+    }
+    template<typename Stream>
+    void Unserialize(Stream& s, int nType, int nVersion) {
+        type = ser_readdata8(s);
+        hashBytes.Unserialize(s, nType, nVersion);
+    }
+
+    CAddressIndexIteratorKey(unsigned int addressType, uint160 addressHash) {
+        type = addressType;
+        hashBytes = addressHash;
+    }
+
+    CAddressIndexIteratorKey() {
+        SetNull();
+    }
+
+    void SetNull() {
+        type = 0;
+        hashBytes.SetNull();
+    }
+};
+
+struct CAddressIndexIteratorHeightKey {
+    unsigned int type;
+    uint160 hashBytes;
+    int blockHeight;
+
+    size_t GetSerializeSize(int nType, int nVersion) const {
+        return 25;
+    }
+    template<typename Stream>
+    void Serialize(Stream& s, int nType, int nVersion) const {
+        ser_writedata8(s, type);
+        hashBytes.Serialize(s, nType, nVersion);
+        ser_writedata32be(s, blockHeight);
+    }
+    template<typename Stream>
+    void Unserialize(Stream& s, int nType, int nVersion) {
+        type = ser_readdata8(s);
+        hashBytes.Unserialize(s, nType, nVersion);
+        blockHeight = ser_readdata32be(s);
+    }
+
+    CAddressIndexIteratorHeightKey(unsigned int addressType, uint160 addressHash, int height) {
+        type = addressType;
+        hashBytes = addressHash;
+        blockHeight = height;
+    }
+
+    CAddressIndexIteratorHeightKey() {
+        SetNull();
+    }
+
+    void SetNull() {
+        type = 0;
+        hashBytes.SetNull();
+        blockHeight = 0;
+    }
+};
+
 /** 
  * Count ECDSA signature operations the old-fashioned (pre-0.6) way
  * @return number of sigops this transaction's outputs will produce when spent
@@ -467,6 +803,13 @@ class CScriptCheck
     ScriptError GetScriptError() const { return error; }
 };
 
+bool GetTimestampIndex(const unsigned int &high, const unsigned int &low, const bool fActiveOnly, std::vector<std::pair<uint256, unsigned int> > &hashes);
+bool GetSpentIndex(CSpentIndexKey &key, CSpentIndexValue &value);
+bool GetAddressIndex(uint160 addressHash, int type,
+                     std::vector<std::pair<CAddressIndexKey, CAmount> > &addressIndex,
+                     int start = 0, int end = 0);
+bool GetAddressUnspent(uint160 addressHash, int type,
+                       std::vector<std::pair<CAddressUnspentKey, CAddressUnspentValue> > &unspentOutputs);
 
 /** Functions for disk access for blocks */
 bool WriteBlockToDisk(const CBlock& block, CDiskBlockPos& pos, const CMessageHeader::MessageStartChars& messageStart);

From 9dcd6d42607fe51b010048a03f958bc366da423d Mon Sep 17 00:00:00 2001
From: Braydon Fuller <braydon@bitpay.com>
Date: Tue, 4 Oct 2016 15:00:31 -0400
Subject: [PATCH 1788/1802] rpc: adds rpc commands for address, spent and
 timestamp indexes

Adds new rpc commands that use the address, spent and timestamp indexes,
including the new commands:

- getblockdeltas
- getblockhashes
- getaddressmempool
- getaddressutxos
- getaddressdeltas
- getaddressbalance
- getaddresstxids
- getspentinfo

And modifications to the command:
- getrawtransaction

Conflicts:
	src/rpc/blockchain.cpp
	src/rpc/client.cpp
	src/rpc/misc.cpp
	src/rpc/rawtransaction.cpp
	src/rpc/server.cpp
	src/rpcserver.h
---
 src/rpc/blockchain.cpp     | 210 +++++++++++++++
 src/rpc/client.cpp         |   9 +
 src/rpc/misc.cpp           | 535 +++++++++++++++++++++++++++++++++++++
 src/rpc/rawtransaction.cpp | 136 +++++++++-
 4 files changed, 880 insertions(+), 10 deletions(-)

diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp
index 7b69c81ff9c42..a1603dcead760 100644
--- a/src/rpc/blockchain.cpp
+++ b/src/rpc/blockchain.cpp
@@ -4,6 +4,7 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include "amount.h"
+#include "base58.h"
 #include "chain.h"
 #include "chainparams.h"
 #include "checkpoints.h"
@@ -13,6 +14,10 @@
 #include "policy/policy.h"
 #include "primitives/transaction.h"
 #include "rpc/server.h"
+#include "script/script.h"
+#include "script/script_error.h"
+#include "script/sign.h"
+#include "script/standard.h"
 #include "streams.h"
 #include "sync.h"
 #include "txmempool.h"
@@ -102,6 +107,112 @@ UniValue blockheaderToJSON(const CBlockIndex* blockindex)
     return result;
 }
 
+UniValue blockToDeltasJSON(const CBlock& block, const CBlockIndex* blockindex)
+{
+    UniValue result(UniValue::VOBJ);
+    result.push_back(Pair("hash", block.GetHash().GetHex()));
+    int confirmations = -1;
+    // Only report confirmations if the block is on the main chain
+    if (chainActive.Contains(blockindex)) {
+        confirmations = chainActive.Height() - blockindex->nHeight + 1;
+    } else {
+        throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Block is an orphan");
+    }
+    result.push_back(Pair("confirmations", confirmations));
+    result.push_back(Pair("size", (int)::GetSerializeSize(block, SER_NETWORK, PROTOCOL_VERSION)));
+    result.push_back(Pair("height", blockindex->nHeight));
+    result.push_back(Pair("version", block.nVersion));
+    result.push_back(Pair("merkleroot", block.hashMerkleRoot.GetHex()));
+
+    UniValue deltas(UniValue::VARR);
+
+    for (unsigned int i = 0; i < block.vtx.size(); i++) {
+        const CTransaction &tx = block.vtx[i];
+        const uint256 txhash = tx.GetHash();
+
+        UniValue entry(UniValue::VOBJ);
+        entry.push_back(Pair("txid", txhash.GetHex()));
+        entry.push_back(Pair("index", (int)i));
+
+        UniValue inputs(UniValue::VARR);
+
+        if (!tx.IsCoinBase()) {
+
+            for (size_t j = 0; j < tx.vin.size(); j++) {
+                const CTxIn input = tx.vin[j];
+
+                UniValue delta(UniValue::VOBJ);
+
+                CSpentIndexValue spentInfo;
+                CSpentIndexKey spentKey(input.prevout.hash, input.prevout.n);
+
+                if (GetSpentIndex(spentKey, spentInfo)) {
+                    if (spentInfo.addressType == 1) {
+                        delta.push_back(Pair("address", CBitcoinAddress(CKeyID(spentInfo.addressHash)).ToString()));
+                    } else if (spentInfo.addressType == 2)  {
+                        delta.push_back(Pair("address", CBitcoinAddress(CScriptID(spentInfo.addressHash)).ToString()));
+                    } else {
+                        continue;
+                    }
+                    delta.push_back(Pair("satoshis", -1 * spentInfo.satoshis));
+                    delta.push_back(Pair("index", (int)j));
+                    delta.push_back(Pair("prevtxid", input.prevout.hash.GetHex()));
+                    delta.push_back(Pair("prevout", (int)input.prevout.n));
+
+                    inputs.push_back(delta);
+                } else {
+                    throw JSONRPCError(RPC_INTERNAL_ERROR, "Spent information not available");
+                }
+
+            }
+        }
+
+        entry.push_back(Pair("inputs", inputs));
+
+        UniValue outputs(UniValue::VARR);
+
+        for (unsigned int k = 0; k < tx.vout.size(); k++) {
+            const CTxOut &out = tx.vout[k];
+
+            UniValue delta(UniValue::VOBJ);
+
+            if (out.scriptPubKey.IsPayToScriptHash()) {
+                vector<unsigned char> hashBytes(out.scriptPubKey.begin()+2, out.scriptPubKey.begin()+22);
+                delta.push_back(Pair("address", CBitcoinAddress(CScriptID(uint160(hashBytes))).ToString()));
+
+            } else if (out.scriptPubKey.IsPayToPublicKeyHash()) {
+                vector<unsigned char> hashBytes(out.scriptPubKey.begin()+3, out.scriptPubKey.begin()+23);
+                delta.push_back(Pair("address", CBitcoinAddress(CKeyID(uint160(hashBytes))).ToString()));
+            } else {
+                continue;
+            }
+
+            delta.push_back(Pair("satoshis", out.nValue));
+            delta.push_back(Pair("index", (int)k));
+
+            outputs.push_back(delta);
+        }
+
+        entry.push_back(Pair("outputs", outputs));
+        deltas.push_back(entry);
+
+    }
+    result.push_back(Pair("deltas", deltas));
+    result.push_back(Pair("time", block.GetBlockTime()));
+    result.push_back(Pair("mediantime", (int64_t)blockindex->GetMedianTimePast()));
+    result.push_back(Pair("nonce", (uint64_t)block.nNonce));
+    result.push_back(Pair("bits", strprintf("%08x", block.nBits)));
+    result.push_back(Pair("difficulty", GetDifficulty(blockindex)));
+    result.push_back(Pair("chainwork", blockindex->nChainWork.GetHex()));
+
+    if (blockindex->pprev)
+        result.push_back(Pair("previousblockhash", blockindex->pprev->GetBlockHash().GetHex()));
+    CBlockIndex *pnext = chainActive.Next(blockindex);
+    if (pnext)
+        result.push_back(Pair("nextblockhash", pnext->GetBlockHash().GetHex()));
+    return result;
+}
+
 UniValue blockToJSON(const CBlock& block, const CBlockIndex* blockindex, bool txDetails = false)
 {
     UniValue result(UniValue::VOBJ);
@@ -603,6 +714,102 @@ UniValue getmempoolentry(const JSONRPCRequest& request)
     return info;
 }
 
+UniValue getblockdeltas(const UniValue& params, bool fHelp)
+{
+    if (fHelp || params.size() != 1)
+        throw runtime_error("");
+
+    std::string strHash = params[0].get_str();
+    uint256 hash(uint256S(strHash));
+
+    if (mapBlockIndex.count(hash) == 0)
+        throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Block not found");
+
+    CBlock block;
+    CBlockIndex* pblockindex = mapBlockIndex[hash];
+
+    if (fHavePruned && !(pblockindex->nStatus & BLOCK_HAVE_DATA) && pblockindex->nTx > 0)
+        throw JSONRPCError(RPC_INTERNAL_ERROR, "Block not available (pruned data)");
+
+    if(!ReadBlockFromDisk(block, pblockindex, Params().GetConsensus()))
+        throw JSONRPCError(RPC_INTERNAL_ERROR, "Can't read block from disk");
+
+    return blockToDeltasJSON(block, pblockindex);
+}
+
+UniValue getblockhashes(const UniValue& params, bool fHelp)
+{
+    if (fHelp || params.size() < 2)
+        throw runtime_error(
+            "getblockhashes timestamp\n"
+            "\nReturns array of hashes of blocks within the timestamp range provided.\n"
+            "\nArguments:\n"
+            "1. high         (numeric, required) The newer block timestamp\n"
+            "2. low          (numeric, required) The older block timestamp\n"
+            "3. options      (string, required) A json object\n"
+            "    {\n"
+            "      \"noOrphans\":true   (boolean) will only include blocks on the main chain\n"
+            "      \"logicalTimes\":true   (boolean) will include logical timestamps with hashes\n"
+            "    }\n"
+            "\nResult:\n"
+            "[\n"
+            "  \"hash\"         (string) The block hash\n"
+            "]\n"
+            "[\n"
+            "  {\n"
+            "    \"blockhash\": (string) The block hash\n"
+            "    \"logicalts\": (numeric) The logical timestamp\n"
+            "  }\n"
+            "]\n"
+            "\nExamples:\n"
+            + HelpExampleCli("getblockhashes", "1231614698 1231024505")
+            + HelpExampleRpc("getblockhashes", "1231614698, 1231024505")
+            + HelpExampleCli("getblockhashes", "1231614698 1231024505 '{\"noOrphans\":false, \"logicalTimes\":true}'")
+            );
+
+    unsigned int high = params[0].get_int();
+    unsigned int low = params[1].get_int();
+    bool fActiveOnly = false;
+    bool fLogicalTS = false;
+
+    if (params.size() > 2) {
+        if (params[2].isObject()) {
+            UniValue noOrphans = find_value(params[2].get_obj(), "noOrphans");
+            UniValue returnLogical = find_value(params[2].get_obj(), "logicalTimes");
+
+            if (noOrphans.isBool())
+                fActiveOnly = noOrphans.get_bool();
+
+            if (returnLogical.isBool())
+                fLogicalTS = returnLogical.get_bool();
+        }
+    }
+
+    std::vector<std::pair<uint256, unsigned int> > blockHashes;
+
+    if (fActiveOnly)
+        LOCK(cs_main);
+
+    if (!GetTimestampIndex(high, low, fActiveOnly, blockHashes)) {
+        throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "No information available for block hashes");
+    }
+
+    UniValue result(UniValue::VARR);
+
+    for (std::vector<std::pair<uint256, unsigned int> >::const_iterator it=blockHashes.begin(); it!=blockHashes.end(); it++) {
+        if (fLogicalTS) {
+            UniValue item(UniValue::VOBJ);
+            item.push_back(Pair("blockhash", it->first.GetHex()));
+            item.push_back(Pair("logicalts", (int)it->second));
+            result.push_back(item);
+        } else {
+            result.push_back(it->first.GetHex());
+        }
+    }
+
+    return result;
+}
+
 UniValue getblockhash(const JSONRPCRequest& request)
 {
     if (request.fHelp || request.params.size() != 1)
@@ -1422,6 +1629,8 @@ static const CRPCCommand commands[] =
     { "blockchain",         "getbestblockhash",       &getbestblockhash,       true,  {} },
     { "blockchain",         "getblockcount",          &getblockcount,          true,  {} },
     { "blockchain",         "getblock",               &getblock,               true,  {"blockhash","verbose"} },
+    { "blockchain",         "getblockdeltas",         &getblockdeltas,         false },
+    { "blockchain",         "getblockhashes",         &getblockhashes,         true  },
     { "blockchain",         "getblockhash",           &getblockhash,           true,  {"height"} },
     { "blockchain",         "getblockheader",         &getblockheader,         true,  {"blockhash","verbose"} },
     { "blockchain",         "getchaintips",           &getchaintips,           true,  {} },
@@ -1435,6 +1644,7 @@ static const CRPCCommand commands[] =
     { "blockchain",         "gettxoutsetinfo",        &gettxoutsetinfo,        true,  {} },
     { "blockchain",         "pruneblockchain",        &pruneblockchain,        true,  {"height"} },
     { "blockchain",         "verifychain",            &verifychain,            true,  {"checklevel","nblocks"} },
+    { "blockchain",         "getspentinfo",           &getspentinfo,           false },
 
     { "blockchain",         "preciousblock",          &preciousblock,          true,  {"blockhash"} },
 
diff --git a/src/rpc/client.cpp b/src/rpc/client.cpp
index 5bdd84e555116..26af26cc10fa7 100644
--- a/src/rpc/client.cpp
+++ b/src/rpc/client.cpp
@@ -117,6 +117,15 @@ static const CRPCConvertParam vRPCConvertParams[] =
     { "setnetworkactive", 0, "state" },
     { "getmempoolancestors", 1, "verbose" },
     { "getmempooldescendants", 1, "verbose" },
+    { "getblockhashes", 0 },
+    { "getblockhashes", 1 },
+    { "getblockhashes", 2 },
+    { "getspentinfo", 0},
+    { "getaddresstxids", 0},
+    { "getaddressbalance", 0},
+    { "getaddressdeltas", 0},
+    { "getaddressutxos", 0},
+    { "getaddressmempool", 0},
     { "bumpfee", 1, "options" },
     // Echo with conversion (For testing only)
     { "echojson", 0, "arg0" },
diff --git a/src/rpc/misc.cpp b/src/rpc/misc.cpp
index 0bcc2a97cc388..2ae91531da8db 100644
--- a/src/rpc/misc.cpp
+++ b/src/rpc/misc.cpp
@@ -11,6 +11,7 @@
 #include "netbase.h"
 #include "rpc/server.h"
 #include "timedata.h"
+#include "txmempool.h"
 #include "util.h"
 #include "utilstrencodings.h"
 #ifdef ENABLE_WALLET
@@ -519,6 +520,13 @@ static const CRPCCommand commands[] =
     { "util",               "verifymessage",          &verifymessage,          true,  {"address","signature","message"} },
     { "util",               "signmessagewithprivkey", &signmessagewithprivkey, true,  {"privkey","message"} },
 
+    /* Address index */
+    { "addressindex",       "getaddressmempool",      &getaddressmempool,      true  },
+    { "addressindex",       "getaddressutxos",        &getaddressutxos,        false },
+    { "addressindex",       "getaddressdeltas",       &getaddressdeltas,       false },
+    { "addressindex",       "getaddresstxids",        &getaddresstxids,        false },
+    { "addressindex",       "getaddressbalance",      &getaddressbalance,      false },
+
     /* Not shown in help */
     { "hidden",             "setmocktime",            &setmocktime,            true,  {"timestamp"}},
     { "hidden",             "echo",                   &echo,                   true,  {"arg0","arg1","arg2","arg3","arg4","arg5","arg6","arg7","arg8","arg9"}},
@@ -530,3 +538,530 @@ void RegisterMiscRPCCommands(CRPCTable &t)
     for (unsigned int vcidx = 0; vcidx < ARRAYLEN(commands); vcidx++)
         t.appendCommand(commands[vcidx].name, &commands[vcidx]);
 }
+
+bool getAddressFromIndex(const int &type, const uint160 &hash, std::string &address)
+{
+    if (type == 2) {
+        address = CBitcoinAddress(CScriptID(hash)).ToString();
+    } else if (type == 1) {
+        address = CBitcoinAddress(CKeyID(hash)).ToString();
+    } else {
+        return false;
+    }
+    return true;
+}
+
+bool getAddressesFromParams(const UniValue& params, std::vector<std::pair<uint160, int> > &addresses)
+{
+    if (params[0].isStr()) {
+        CBitcoinAddress address(params[0].get_str());
+        uint160 hashBytes;
+        int type = 0;
+        if (!address.GetIndexKey(hashBytes, type)) {
+            throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid address");
+        }
+        addresses.push_back(std::make_pair(hashBytes, type));
+    } else if (params[0].isObject()) {
+
+        UniValue addressValues = find_value(params[0].get_obj(), "addresses");
+        if (!addressValues.isArray()) {
+            throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Addresses is expected to be an array");
+        }
+
+        std::vector<UniValue> values = addressValues.getValues();
+
+        for (std::vector<UniValue>::iterator it = values.begin(); it != values.end(); ++it) {
+
+            CBitcoinAddress address(it->get_str());
+            uint160 hashBytes;
+            int type = 0;
+            if (!address.GetIndexKey(hashBytes, type)) {
+                throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid address");
+            }
+            addresses.push_back(std::make_pair(hashBytes, type));
+        }
+    } else {
+        throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid address");
+    }
+
+    return true;
+}
+
+bool heightSort(std::pair<CAddressUnspentKey, CAddressUnspentValue> a,
+                std::pair<CAddressUnspentKey, CAddressUnspentValue> b) {
+    return a.second.blockHeight < b.second.blockHeight;
+}
+
+bool timestampSort(std::pair<CMempoolAddressDeltaKey, CMempoolAddressDelta> a,
+                   std::pair<CMempoolAddressDeltaKey, CMempoolAddressDelta> b) {
+    return a.second.time < b.second.time;
+}
+
+UniValue getaddressmempool(const UniValue& params, bool fHelp)
+{
+    if (fHelp || params.size() != 1)
+        throw runtime_error(
+            "getaddressmempool\n"
+            "\nReturns all mempool deltas for an address (requires addressindex to be enabled).\n"
+            "\nArguments:\n"
+            "{\n"
+            "  \"addresses\"\n"
+            "    [\n"
+            "      \"address\"  (string) The base58check encoded address\n"
+            "      ,...\n"
+            "    ]\n"
+            "}\n"
+            "\nResult:\n"
+            "[\n"
+            "  {\n"
+            "    \"address\"  (string) The base58check encoded address\n"
+            "    \"txid\"  (string) The related txid\n"
+            "    \"index\"  (number) The related input or output index\n"
+            "    \"satoshis\"  (number) The difference of satoshis\n"
+            "    \"timestamp\"  (number) The time the transaction entered the mempool (seconds)\n"
+            "    \"prevtxid\"  (string) The previous txid (if spending)\n"
+            "    \"prevout\"  (string) The previous transaction output index (if spending)\n"
+            "  }\n"
+            "]\n"
+            "\nExamples:\n"
+            + HelpExampleCli("getaddressmempool", "'{\"addresses\": [\"12c6DSiU4Rq3P4ZxziKxzrL5LmMBrzjrJX\"]}'")
+            + HelpExampleRpc("getaddressmempool", "{\"addresses\": [\"12c6DSiU4Rq3P4ZxziKxzrL5LmMBrzjrJX\"]}")
+        );
+
+    std::vector<std::pair<uint160, int> > addresses;
+
+    if (!getAddressesFromParams(params, addresses)) {
+        throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid address");
+    }
+
+    std::vector<std::pair<CMempoolAddressDeltaKey, CMempoolAddressDelta> > indexes;
+
+    if (!mempool.getAddressIndex(addresses, indexes)) {
+        throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "No information available for address");
+    }
+
+    std::sort(indexes.begin(), indexes.end(), timestampSort);
+
+    UniValue result(UniValue::VARR);
+
+    for (std::vector<std::pair<CMempoolAddressDeltaKey, CMempoolAddressDelta> >::iterator it = indexes.begin();
+         it != indexes.end(); it++) {
+
+        std::string address;
+        if (!getAddressFromIndex(it->first.type, it->first.addressBytes, address)) {
+            throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Unknown address type");
+        }
+
+        UniValue delta(UniValue::VOBJ);
+        delta.push_back(Pair("address", address));
+        delta.push_back(Pair("txid", it->first.txhash.GetHex()));
+        delta.push_back(Pair("index", (int)it->first.index));
+        delta.push_back(Pair("satoshis", it->second.amount));
+        delta.push_back(Pair("timestamp", it->second.time));
+        if (it->second.amount < 0) {
+            delta.push_back(Pair("prevtxid", it->second.prevhash.GetHex()));
+            delta.push_back(Pair("prevout", (int)it->second.prevout));
+        }
+        result.push_back(delta);
+    }
+
+    return result;
+}
+
+UniValue getaddressutxos(const UniValue& params, bool fHelp)
+{
+    if (fHelp || params.size() != 1)
+        throw runtime_error(
+            "getaddressutxos\n"
+            "\nReturns all unspent outputs for an address (requires addressindex to be enabled).\n"
+            "\nArguments:\n"
+            "{\n"
+            "  \"addresses\"\n"
+            "    [\n"
+            "      \"address\"  (string) The base58check encoded address\n"
+            "      ,...\n"
+            "    ],\n"
+            "  \"chainInfo\"  (boolean) Include chain info with results\n"
+            "}\n"
+            "\nResult\n"
+            "[\n"
+            "  {\n"
+            "    \"address\"  (string) The address base58check encoded\n"
+            "    \"txid\"  (string) The output txid\n"
+            "    \"height\"  (number) The block height\n"
+            "    \"outputIndex\"  (number) The output index\n"
+            "    \"script\"  (strin) The script hex encoded\n"
+            "    \"satoshis\"  (number) The number of satoshis of the output\n"
+            "  }\n"
+            "]\n"
+            "\nExamples:\n"
+            + HelpExampleCli("getaddressutxos", "'{\"addresses\": [\"12c6DSiU4Rq3P4ZxziKxzrL5LmMBrzjrJX\"]}'")
+            + HelpExampleRpc("getaddressutxos", "{\"addresses\": [\"12c6DSiU4Rq3P4ZxziKxzrL5LmMBrzjrJX\"]}")
+            );
+
+    bool includeChainInfo = false;
+    if (params[0].isObject()) {
+        UniValue chainInfo = find_value(params[0].get_obj(), "chainInfo");
+        if (chainInfo.isBool()) {
+            includeChainInfo = chainInfo.get_bool();
+        }
+    }
+
+    std::vector<std::pair<uint160, int> > addresses;
+
+    if (!getAddressesFromParams(params, addresses)) {
+        throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid address");
+    }
+
+    std::vector<std::pair<CAddressUnspentKey, CAddressUnspentValue> > unspentOutputs;
+
+    for (std::vector<std::pair<uint160, int> >::iterator it = addresses.begin(); it != addresses.end(); it++) {
+        if (!GetAddressUnspent((*it).first, (*it).second, unspentOutputs)) {
+            throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "No information available for address");
+        }
+    }
+
+    std::sort(unspentOutputs.begin(), unspentOutputs.end(), heightSort);
+
+    UniValue utxos(UniValue::VARR);
+
+    for (std::vector<std::pair<CAddressUnspentKey, CAddressUnspentValue> >::const_iterator it=unspentOutputs.begin(); it!=unspentOutputs.end(); it++) {
+        UniValue output(UniValue::VOBJ);
+        std::string address;
+        if (!getAddressFromIndex(it->first.type, it->first.hashBytes, address)) {
+            throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Unknown address type");
+        }
+
+        output.push_back(Pair("address", address));
+        output.push_back(Pair("txid", it->first.txhash.GetHex()));
+        output.push_back(Pair("outputIndex", (int)it->first.index));
+        output.push_back(Pair("script", HexStr(it->second.script.begin(), it->second.script.end())));
+        output.push_back(Pair("satoshis", it->second.satoshis));
+        output.push_back(Pair("height", it->second.blockHeight));
+        utxos.push_back(output);
+    }
+
+    if (includeChainInfo) {
+        UniValue result(UniValue::VOBJ);
+        result.push_back(Pair("utxos", utxos));
+
+        LOCK(cs_main);
+        result.push_back(Pair("hash", chainActive.Tip()->GetBlockHash().GetHex()));
+        result.push_back(Pair("height", (int)chainActive.Height()));
+        return result;
+    } else {
+        return utxos;
+    }
+}
+
+UniValue getaddressdeltas(const UniValue& params, bool fHelp)
+{
+    if (fHelp || params.size() != 1 || !params[0].isObject())
+        throw runtime_error(
+            "getaddressdeltas\n"
+            "\nReturns all changes for an address (requires addressindex to be enabled).\n"
+            "\nArguments:\n"
+            "{\n"
+            "  \"addresses\"\n"
+            "    [\n"
+            "      \"address\"  (string) The base58check encoded address\n"
+            "      ,...\n"
+            "    ]\n"
+            "  \"start\" (number) The start block height\n"
+            "  \"end\" (number) The end block height\n"
+            "  \"chainInfo\" (boolean) Include chain info in results, only applies if start and end specified\n"
+            "}\n"
+            "\nResult:\n"
+            "[\n"
+            "  {\n"
+            "    \"satoshis\"  (number) The difference of satoshis\n"
+            "    \"txid\"  (string) The related txid\n"
+            "    \"index\"  (number) The related input or output index\n"
+            "    \"height\"  (number) The block height\n"
+            "    \"address\"  (string) The base58check encoded address\n"
+            "  }\n"
+            "]\n"
+            "\nExamples:\n"
+            + HelpExampleCli("getaddressdeltas", "'{\"addresses\": [\"12c6DSiU4Rq3P4ZxziKxzrL5LmMBrzjrJX\"]}'")
+            + HelpExampleRpc("getaddressdeltas", "{\"addresses\": [\"12c6DSiU4Rq3P4ZxziKxzrL5LmMBrzjrJX\"]}")
+        );
+
+
+    UniValue startValue = find_value(params[0].get_obj(), "start");
+    UniValue endValue = find_value(params[0].get_obj(), "end");
+
+    UniValue chainInfo = find_value(params[0].get_obj(), "chainInfo");
+    bool includeChainInfo = false;
+    if (chainInfo.isBool()) {
+        includeChainInfo = chainInfo.get_bool();
+    }
+
+    int start = 0;
+    int end = 0;
+
+    if (startValue.isNum() && endValue.isNum()) {
+        start = startValue.get_int();
+        end = endValue.get_int();
+        if (start <= 0 || end <= 0) {
+            throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Start and end is expected to be greater than zero");
+        }
+        if (end < start) {
+            throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "End value is expected to be greater than start");
+        }
+    }
+
+    std::vector<std::pair<uint160, int> > addresses;
+
+    if (!getAddressesFromParams(params, addresses)) {
+        throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid address");
+    }
+
+    std::vector<std::pair<CAddressIndexKey, CAmount> > addressIndex;
+
+    for (std::vector<std::pair<uint160, int> >::iterator it = addresses.begin(); it != addresses.end(); it++) {
+        if (start > 0 && end > 0) {
+            if (!GetAddressIndex((*it).first, (*it).second, addressIndex, start, end)) {
+                throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "No information available for address");
+            }
+        } else {
+            if (!GetAddressIndex((*it).first, (*it).second, addressIndex)) {
+                throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "No information available for address");
+            }
+        }
+    }
+
+    UniValue deltas(UniValue::VARR);
+
+    for (std::vector<std::pair<CAddressIndexKey, CAmount> >::const_iterator it=addressIndex.begin(); it!=addressIndex.end(); it++) {
+        std::string address;
+        if (!getAddressFromIndex(it->first.type, it->first.hashBytes, address)) {
+            throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Unknown address type");
+        }
+
+        UniValue delta(UniValue::VOBJ);
+        delta.push_back(Pair("satoshis", it->second));
+        delta.push_back(Pair("txid", it->first.txhash.GetHex()));
+        delta.push_back(Pair("index", (int)it->first.index));
+        delta.push_back(Pair("blockindex", (int)it->first.txindex));
+        delta.push_back(Pair("height", it->first.blockHeight));
+        delta.push_back(Pair("address", address));
+        deltas.push_back(delta);
+    }
+
+    UniValue result(UniValue::VOBJ);
+
+    if (includeChainInfo && start > 0 && end > 0) {
+        LOCK(cs_main);
+
+        if (start > chainActive.Height() || end > chainActive.Height()) {
+            throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Start or end is outside chain range");
+        }
+
+        CBlockIndex* startIndex = chainActive[start];
+        CBlockIndex* endIndex = chainActive[end];
+
+        UniValue startInfo(UniValue::VOBJ);
+        UniValue endInfo(UniValue::VOBJ);
+
+        startInfo.push_back(Pair("hash", startIndex->GetBlockHash().GetHex()));
+        startInfo.push_back(Pair("height", start));
+
+        endInfo.push_back(Pair("hash", endIndex->GetBlockHash().GetHex()));
+        endInfo.push_back(Pair("height", end));
+
+        result.push_back(Pair("deltas", deltas));
+        result.push_back(Pair("start", startInfo));
+        result.push_back(Pair("end", endInfo));
+
+        return result;
+    } else {
+        return deltas;
+    }
+}
+
+UniValue getaddressbalance(const UniValue& params, bool fHelp)
+{
+    if (fHelp || params.size() != 1)
+        throw runtime_error(
+            "getaddressbalance\n"
+            "\nReturns the balance for an address(es) (requires addressindex to be enabled).\n"
+            "\nArguments:\n"
+            "{\n"
+            "  \"addresses\"\n"
+            "    [\n"
+            "      \"address\"  (string) The base58check encoded address\n"
+            "      ,...\n"
+            "    ]\n"
+            "}\n"
+            "\nResult:\n"
+            "{\n"
+            "  \"balance\"  (string) The current balance in satoshis\n"
+            "  \"received\"  (string) The total number of satoshis received (including change)\n"
+            "}\n"
+            "\nExamples:\n"
+            + HelpExampleCli("getaddressbalance", "'{\"addresses\": [\"12c6DSiU4Rq3P4ZxziKxzrL5LmMBrzjrJX\"]}'")
+            + HelpExampleRpc("getaddressbalance", "{\"addresses\": [\"12c6DSiU4Rq3P4ZxziKxzrL5LmMBrzjrJX\"]}")
+        );
+
+    std::vector<std::pair<uint160, int> > addresses;
+
+    if (!getAddressesFromParams(params, addresses)) {
+        throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid address");
+    }
+
+    std::vector<std::pair<CAddressIndexKey, CAmount> > addressIndex;
+
+    for (std::vector<std::pair<uint160, int> >::iterator it = addresses.begin(); it != addresses.end(); it++) {
+        if (!GetAddressIndex((*it).first, (*it).second, addressIndex)) {
+            throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "No information available for address");
+        }
+    }
+
+    CAmount balance = 0;
+    CAmount received = 0;
+
+    for (std::vector<std::pair<CAddressIndexKey, CAmount> >::const_iterator it=addressIndex.begin(); it!=addressIndex.end(); it++) {
+        if (it->second > 0) {
+            received += it->second;
+        }
+        balance += it->second;
+    }
+
+    UniValue result(UniValue::VOBJ);
+    result.push_back(Pair("balance", balance));
+    result.push_back(Pair("received", received));
+
+    return result;
+
+}
+
+UniValue getaddresstxids(const UniValue& params, bool fHelp)
+{
+    if (fHelp || params.size() != 1)
+        throw runtime_error(
+            "getaddresstxids\n"
+            "\nReturns the txids for an address(es) (requires addressindex to be enabled).\n"
+            "\nArguments:\n"
+            "{\n"
+            "  \"addresses\"\n"
+            "    [\n"
+            "      \"address\"  (string) The base58check encoded address\n"
+            "      ,...\n"
+            "    ]\n"
+            "  \"start\" (number) The start block height\n"
+            "  \"end\" (number) The end block height\n"
+            "}\n"
+            "\nResult:\n"
+            "[\n"
+            "  \"transactionid\"  (string) The transaction id\n"
+            "  ,...\n"
+            "]\n"
+            "\nExamples:\n"
+            + HelpExampleCli("getaddresstxids", "'{\"addresses\": [\"12c6DSiU4Rq3P4ZxziKxzrL5LmMBrzjrJX\"]}'")
+            + HelpExampleRpc("getaddresstxids", "{\"addresses\": [\"12c6DSiU4Rq3P4ZxziKxzrL5LmMBrzjrJX\"]}")
+        );
+
+    std::vector<std::pair<uint160, int> > addresses;
+
+    if (!getAddressesFromParams(params, addresses)) {
+        throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid address");
+    }
+
+    int start = 0;
+    int end = 0;
+    if (params[0].isObject()) {
+        UniValue startValue = find_value(params[0].get_obj(), "start");
+        UniValue endValue = find_value(params[0].get_obj(), "end");
+        if (startValue.isNum() && endValue.isNum()) {
+            start = startValue.get_int();
+            end = endValue.get_int();
+        }
+    }
+
+    std::vector<std::pair<CAddressIndexKey, CAmount> > addressIndex;
+
+    for (std::vector<std::pair<uint160, int> >::iterator it = addresses.begin(); it != addresses.end(); it++) {
+        if (start > 0 && end > 0) {
+            if (!GetAddressIndex((*it).first, (*it).second, addressIndex, start, end)) {
+                throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "No information available for address");
+            }
+        } else {
+            if (!GetAddressIndex((*it).first, (*it).second, addressIndex)) {
+                throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "No information available for address");
+            }
+        }
+    }
+
+    std::set<std::pair<int, std::string> > txids;
+    UniValue result(UniValue::VARR);
+
+    for (std::vector<std::pair<CAddressIndexKey, CAmount> >::const_iterator it=addressIndex.begin(); it!=addressIndex.end(); it++) {
+        int height = it->first.blockHeight;
+        std::string txid = it->first.txhash.GetHex();
+
+        if (addresses.size() > 1) {
+            txids.insert(std::make_pair(height, txid));
+        } else {
+            if (txids.insert(std::make_pair(height, txid)).second) {
+                result.push_back(txid);
+            }
+        }
+    }
+
+    if (addresses.size() > 1) {
+        for (std::set<std::pair<int, std::string> >::const_iterator it=txids.begin(); it!=txids.end(); it++) {
+            result.push_back(it->second);
+        }
+    }
+
+    return result;
+
+}
+
+UniValue getspentinfo(const UniValue& params, bool fHelp)
+{
+
+    if (fHelp || params.size() != 1 || !params[0].isObject())
+        throw runtime_error(
+            "getspentinfo\n"
+            "\nReturns the txid and index where an output is spent.\n"
+            "\nArguments:\n"
+            "{\n"
+            "  \"txid\" (string) The hex string of the txid\n"
+            "  \"index\" (number) The start block height\n"
+            "}\n"
+            "\nResult:\n"
+            "{\n"
+            "  \"txid\"  (string) The transaction id\n"
+            "  \"index\"  (number) The spending input index\n"
+            "  ,...\n"
+            "}\n"
+            "\nExamples:\n"
+            + HelpExampleCli("getspentinfo", "'{\"txid\": \"0437cd7f8525ceed2324359c2d0ba26006d92d856a9c20fa0241106ee5a597c9\", \"index\": 0}'")
+            + HelpExampleRpc("getspentinfo", "{\"txid\": \"0437cd7f8525ceed2324359c2d0ba26006d92d856a9c20fa0241106ee5a597c9\", \"index\": 0}")
+        );
+
+    UniValue txidValue = find_value(params[0].get_obj(), "txid");
+    UniValue indexValue = find_value(params[0].get_obj(), "index");
+
+    if (!txidValue.isStr() || !indexValue.isNum()) {
+        throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid txid or index");
+    }
+
+    uint256 txid = ParseHashV(txidValue, "txid");
+    int outputIndex = indexValue.get_int();
+
+    CSpentIndexKey key(txid, outputIndex);
+    CSpentIndexValue value;
+
+    if (!GetSpentIndex(key, value)) {
+        throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Unable to get spent info");
+    }
+
+    UniValue obj(UniValue::VOBJ);
+    obj.push_back(Pair("txid", value.txid.GetHex()));
+    obj.push_back(Pair("index", (int)value.inputIndex));
+    obj.push_back(Pair("height", value.blockHeight));
+
+    return obj;
+}
diff --git a/src/rpc/rawtransaction.cpp b/src/rpc/rawtransaction.cpp
index bf16f27498f87..b44413494414c 100644
--- a/src/rpc/rawtransaction.cpp
+++ b/src/rpc/rawtransaction.cpp
@@ -59,6 +59,99 @@ void ScriptPubKeyToJSON(const CScript& scriptPubKey, UniValue& out, bool fInclud
     out.push_back(Pair("addresses", a));
 }
 
+void TxToJSONExpanded(const CTransaction& tx, const uint256 hashBlock, UniValue& entry,
+                      int nHeight = 0, int nConfirmations = 0, int nBlockTime = 0)
+{
+
+    uint256 txid = tx.GetHash();
+    entry.push_back(Pair("txid", txid.GetHex()));
+    entry.push_back(Pair("hash", tx.GetWitnessHash().GetHex()));
+    entry.push_back(Pair("size", (int)::GetSerializeSize(tx, SER_NETWORK, PROTOCOL_VERSION)));
+    entry.push_back(Pair("vsize", (int)::GetVirtualTransactionSize(tx)));
+    entry.push_back(Pair("version", tx.nVersion));
+    entry.push_back(Pair("locktime", (int64_t)tx.nLockTime));
+    UniValue vin(UniValue::VARR);
+    BOOST_FOREACH(const CTxIn& txin, tx.vin) {
+        UniValue in(UniValue::VOBJ);
+        if (tx.IsCoinBase())
+            in.push_back(Pair("coinbase", HexStr(txin.scriptSig.begin(), txin.scriptSig.end())));
+        else {
+            in.push_back(Pair("txid", txin.prevout.hash.GetHex()));
+            in.push_back(Pair("vout", (int64_t)txin.prevout.n));
+            UniValue o(UniValue::VOBJ);
+            o.push_back(Pair("asm", ScriptToAsmStr(txin.scriptSig, true)));
+            o.push_back(Pair("hex", HexStr(txin.scriptSig.begin(), txin.scriptSig.end())));
+            in.push_back(Pair("scriptSig", o));
+
+            // Add address and value info if spentindex enabled
+            CSpentIndexValue spentInfo;
+            CSpentIndexKey spentKey(txin.prevout.hash, txin.prevout.n);
+            if (GetSpentIndex(spentKey, spentInfo)) {
+                in.push_back(Pair("value", ValueFromAmount(spentInfo.satoshis)));
+                in.push_back(Pair("valueSat", spentInfo.satoshis));
+                if (spentInfo.addressType == 1) {
+                    in.push_back(Pair("address", CBitcoinAddress(CKeyID(spentInfo.addressHash)).ToString()));
+                } else if (spentInfo.addressType == 2)  {
+                    in.push_back(Pair("address", CBitcoinAddress(CScriptID(spentInfo.addressHash)).ToString()));
+                }
+            }
+
+        }
+        if (!tx.wit.IsNull()) {
+            if (!tx.wit.vtxinwit[i].IsNull()) {
+                UniValue txinwitness(UniValue::VARR);
+                for (unsigned int j = 0; j < tx.wit.vtxinwit[i].scriptWitness.stack.size(); j++) {
+                    std::vector<unsigned char> item = tx.wit.vtxinwit[i].scriptWitness.stack[j];
+                    txinwitness.push_back(HexStr(item.begin(), item.end()));
+                }
+                in.push_back(Pair("txinwitness", txinwitness));
+            }
+
+        }
+        in.push_back(Pair("sequence", (int64_t)txin.nSequence));
+        vin.push_back(in);
+    }
+    entry.push_back(Pair("vin", vin));
+    UniValue vout(UniValue::VARR);
+    for (unsigned int i = 0; i < tx.vout.size(); i++) {
+        const CTxOut& txout = tx.vout[i];
+        UniValue out(UniValue::VOBJ);
+        out.push_back(Pair("value", ValueFromAmount(txout.nValue)));
+        out.push_back(Pair("valueSat", txout.nValue));
+        out.push_back(Pair("n", (int64_t)i));
+        UniValue o(UniValue::VOBJ);
+        ScriptPubKeyToJSON(txout.scriptPubKey, o, true);
+        out.push_back(Pair("scriptPubKey", o));
+
+        // Add spent information if spentindex is enabled
+        CSpentIndexValue spentInfo;
+        CSpentIndexKey spentKey(txid, i);
+        if (GetSpentIndex(spentKey, spentInfo)) {
+            out.push_back(Pair("spentTxId", spentInfo.txid.GetHex()));
+            out.push_back(Pair("spentIndex", (int)spentInfo.inputIndex));
+            out.push_back(Pair("spentHeight", spentInfo.blockHeight));
+        }
+
+        vout.push_back(out);
+    }
+    entry.push_back(Pair("vout", vout));
+
+    if (!hashBlock.IsNull()) {
+        entry.push_back(Pair("blockhash", hashBlock.GetHex()));
+
+        if (nConfirmations > 0) {
+            entry.push_back(Pair("height", nHeight));
+            entry.push_back(Pair("confirmations", nConfirmations));
+            entry.push_back(Pair("time", nBlockTime));
+            entry.push_back(Pair("blocktime", nBlockTime));
+        } else {
+            entry.push_back(Pair("height", -1));
+            entry.push_back(Pair("confirmations", 0));
+        }
+    }
+
+}
+
 void TxToJSON(const CTransaction& tx, const uint256 hashBlock, UniValue& entry)
 {
     entry.push_back(Pair("txid", tx.GetHash().GetHex()));
@@ -94,11 +187,13 @@ void TxToJSON(const CTransaction& tx, const uint256 hashBlock, UniValue& entry)
         vin.push_back(in);
     }
     entry.push_back(Pair("vin", vin));
+
     UniValue vout(UniValue::VARR);
     for (unsigned int i = 0; i < tx.vout.size(); i++) {
         const CTxOut& txout = tx.vout[i];
         UniValue out(UniValue::VOBJ);
         out.push_back(Pair("value", ValueFromAmount(txout.nValue)));
+        out.push_back(Pair("valueSat", txout.nValue));
         out.push_back(Pair("n", (int64_t)i));
         UniValue o(UniValue::VOBJ);
         ScriptPubKeyToJSON(txout.scriptPubKey, o, true);
@@ -113,12 +208,14 @@ void TxToJSON(const CTransaction& tx, const uint256 hashBlock, UniValue& entry)
         if (mi != mapBlockIndex.end() && (*mi).second) {
             CBlockIndex* pindex = (*mi).second;
             if (chainActive.Contains(pindex)) {
+                entry.push_back(Pair("height", pindex->nHeight));
                 entry.push_back(Pair("confirmations", 1 + chainActive.Height() - pindex->nHeight));
                 entry.push_back(Pair("time", pindex->GetBlockTime()));
                 entry.push_back(Pair("blocktime", pindex->GetBlockTime()));
-            }
-            else
+            } else {
+                entry.push_back(Pair("height", -1));
                 entry.push_back(Pair("confirmations", 0));
+            }
         }
     }
 }
@@ -195,8 +292,6 @@ UniValue getrawtransaction(const JSONRPCRequest& request)
             + HelpExampleRpc("getrawtransaction", "\"mytxid\", true")
         );
 
-    LOCK(cs_main);
-
     uint256 hash = ParseHashV(request.params[0], "parameter 1");
 
     // Accept either a bool (true) or a num (>=1) to indicate verbose output.
@@ -217,12 +312,32 @@ UniValue getrawtransaction(const JSONRPCRequest& request)
         } 
     }
 
-    CTransactionRef tx;
+    CTransaction tx;
+
     uint256 hashBlock;
-    if (!GetTransaction(hash, tx, Params().GetConsensus(), hashBlock, true))
-        throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, std::string(fTxIndex ? "No such mempool or blockchain transaction"
-            : "No such mempool transaction. Use -txindex to enable blockchain transaction queries") +
-            ". Use gettransaction for wallet transactions.");
+    int nHeight = 0;
+    int nConfirmations = 0;
+    int nBlockTime = 0;
+
+    {
+        LOCK(cs_main);
+        if (!GetTransaction(hash, tx, Params().GetConsensus(), hashBlock, true))
+            throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "No information available about transaction");
+
+        BlockMap::iterator mi = mapBlockIndex.find(hashBlock);
+        if (mi != mapBlockIndex.end() && (*mi).second) {
+            CBlockIndex* pindex = (*mi).second;
+            if (chainActive.Contains(pindex)) {
+                nHeight = pindex->nHeight;
+                nConfirmations = 1 + chainActive.Height() - pindex->nHeight;
+                nBlockTime = pindex->GetBlockTime();
+            } else {
+                nHeight = -1;
+                nConfirmations = 0;
+                nBlockTime = pindex->GetBlockTime();
+            }
+        }
+    }
 
     string strHex = EncodeHexTx(*tx, RPCSerializationFlags());
 
@@ -231,7 +346,8 @@ UniValue getrawtransaction(const JSONRPCRequest& request)
 
     UniValue result(UniValue::VOBJ);
     result.push_back(Pair("hex", strHex));
-    TxToJSON(*tx, hashBlock, result);
+    TxToJSONExpanded(*tx, hashBlock, result, nHeight, nConfirmations, nBlockTime);
+
     return result;
 }
 

From b2a6d0447a6200b3558c822708287fe35ca0b1a5 Mon Sep 17 00:00:00 2001
From: Braydon Fuller <braydon@bitpay.com>
Date: Tue, 4 Oct 2016 15:01:44 -0400
Subject: [PATCH 1789/1802] tests: adds rpc tests for address, spent and
 timestamp indexes

Tests the functionality of the indexes as well as the rpc commands
---
 qa/pull-tester/rpc-tests.py    |   3 +
 qa/rpc-tests/addressindex.py   | 349 +++++++++++++++++++++++++++++++++
 qa/rpc-tests/spentindex.py     | 139 +++++++++++++
 qa/rpc-tests/timestampindex.py |  61 ++++++
 qa/rpc-tests/txindex.py        |  73 +++++++
 5 files changed, 625 insertions(+)
 create mode 100755 qa/rpc-tests/addressindex.py
 create mode 100755 qa/rpc-tests/spentindex.py
 create mode 100755 qa/rpc-tests/timestampindex.py
 create mode 100755 qa/rpc-tests/txindex.py

diff --git a/qa/pull-tester/rpc-tests.py b/qa/pull-tester/rpc-tests.py
index 20ab0fdd1de30..8a3422c99ef66 100755
--- a/qa/pull-tester/rpc-tests.py
+++ b/qa/pull-tester/rpc-tests.py
@@ -137,6 +137,9 @@
     'proxy_test.py',
     'signrawtransactions.py',
     'nodehandling.py',
+    'addressindex.py',
+    'timestampindex.py',
+    'spentindex.py',
     'decodescript.py',
     'blockchain.py',
     'disablewallet.py',
diff --git a/qa/rpc-tests/addressindex.py b/qa/rpc-tests/addressindex.py
new file mode 100755
index 0000000000000..8b0b6d38af41e
--- /dev/null
+++ b/qa/rpc-tests/addressindex.py
@@ -0,0 +1,349 @@
+#!/usr/bin/env python2
+# Copyright (c) 2014-2015 The Bitcoin Core developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#
+# Test addressindex generation and fetching
+#
+
+import time
+from test_framework.test_framework import BitcoinTestFramework
+from test_framework.util import *
+from test_framework.script import *
+from test_framework.mininode import *
+import binascii
+
+class AddressIndexTest(BitcoinTestFramework):
+
+    def setup_chain(self):
+        print("Initializing test directory "+self.options.tmpdir)
+        initialize_chain_clean(self.options.tmpdir, 4)
+
+    def setup_network(self):
+        self.nodes = []
+        # Nodes 0/1 are "wallet" nodes
+        self.nodes.append(start_node(0, self.options.tmpdir, ["-debug", "-relaypriority=0"]))
+        self.nodes.append(start_node(1, self.options.tmpdir, ["-debug", "-addressindex"]))
+        # Nodes 2/3 are used for testing
+        self.nodes.append(start_node(2, self.options.tmpdir, ["-debug", "-addressindex", "-relaypriority=0"]))
+        self.nodes.append(start_node(3, self.options.tmpdir, ["-debug", "-addressindex"]))
+        connect_nodes(self.nodes[0], 1)
+        connect_nodes(self.nodes[0], 2)
+        connect_nodes(self.nodes[0], 3)
+
+        self.is_network_split = False
+        self.sync_all()
+
+    def run_test(self):
+        print "Mining blocks..."
+        self.nodes[0].generate(105)
+        self.sync_all()
+
+        chain_height = self.nodes[1].getblockcount()
+        assert_equal(chain_height, 105)
+        assert_equal(self.nodes[1].getbalance(), 0)
+        assert_equal(self.nodes[2].getbalance(), 0)
+
+        # Check that balances are correct
+        balance0 = self.nodes[1].getaddressbalance("2N2JD6wb56AfK4tfmM6PwdVmoYk2dCKf4Br")
+        assert_equal(balance0["balance"], 0)
+
+        # Check p2pkh and p2sh address indexes
+        print "Testing p2pkh and p2sh address index..."
+
+        txid0 = self.nodes[0].sendtoaddress("mo9ncXisMeAoXwqcV5EWuyncbmCcQN4rVs", 10)
+        self.nodes[0].generate(1)
+
+        txidb0 = self.nodes[0].sendtoaddress("2N2JD6wb56AfK4tfmM6PwdVmoYk2dCKf4Br", 10)
+        self.nodes[0].generate(1)
+
+        txid1 = self.nodes[0].sendtoaddress("mo9ncXisMeAoXwqcV5EWuyncbmCcQN4rVs", 15)
+        self.nodes[0].generate(1)
+
+        txidb1 = self.nodes[0].sendtoaddress("2N2JD6wb56AfK4tfmM6PwdVmoYk2dCKf4Br", 15)
+        self.nodes[0].generate(1)
+
+        txid2 = self.nodes[0].sendtoaddress("mo9ncXisMeAoXwqcV5EWuyncbmCcQN4rVs", 20)
+        self.nodes[0].generate(1)
+
+        txidb2 = self.nodes[0].sendtoaddress("2N2JD6wb56AfK4tfmM6PwdVmoYk2dCKf4Br", 20)
+        self.nodes[0].generate(1)
+
+        self.sync_all()
+
+        txids = self.nodes[1].getaddresstxids("mo9ncXisMeAoXwqcV5EWuyncbmCcQN4rVs")
+        assert_equal(len(txids), 3)
+        assert_equal(txids[0], txid0)
+        assert_equal(txids[1], txid1)
+        assert_equal(txids[2], txid2)
+
+        txidsb = self.nodes[1].getaddresstxids("2N2JD6wb56AfK4tfmM6PwdVmoYk2dCKf4Br")
+        assert_equal(len(txidsb), 3)
+        assert_equal(txidsb[0], txidb0)
+        assert_equal(txidsb[1], txidb1)
+        assert_equal(txidsb[2], txidb2)
+
+        # Check that limiting by height works
+        print "Testing querying txids by range of block heights.."
+        height_txids = self.nodes[1].getaddresstxids({
+            "addresses": ["2N2JD6wb56AfK4tfmM6PwdVmoYk2dCKf4Br"],
+            "start": 105,
+            "end": 110
+        })
+        assert_equal(len(height_txids), 2)
+        assert_equal(height_txids[0], txidb0)
+        assert_equal(height_txids[1], txidb1)
+
+        # Check that multiple addresses works
+        multitxids = self.nodes[1].getaddresstxids({"addresses": ["2N2JD6wb56AfK4tfmM6PwdVmoYk2dCKf4Br", "mo9ncXisMeAoXwqcV5EWuyncbmCcQN4rVs"]})
+        assert_equal(len(multitxids), 6)
+        assert_equal(multitxids[0], txid0)
+        assert_equal(multitxids[1], txidb0)
+        assert_equal(multitxids[2], txid1)
+        assert_equal(multitxids[3], txidb1)
+        assert_equal(multitxids[4], txid2)
+        assert_equal(multitxids[5], txidb2)
+
+        # Check that balances are correct
+        balance0 = self.nodes[1].getaddressbalance("2N2JD6wb56AfK4tfmM6PwdVmoYk2dCKf4Br")
+        assert_equal(balance0["balance"], 45 * 100000000)
+
+        # Check that outputs with the same address will only return one txid
+        print "Testing for txid uniqueness..."
+        addressHash = "6349a418fc4578d10a372b54b45c280cc8c4382f".decode("hex")
+        scriptPubKey = CScript([OP_HASH160, addressHash, OP_EQUAL])
+        unspent = self.nodes[0].listunspent()
+        tx = CTransaction()
+        tx.vin = [CTxIn(COutPoint(int(unspent[0]["txid"], 16), unspent[0]["vout"]))]
+        tx.vout = [CTxOut(10, scriptPubKey), CTxOut(11, scriptPubKey)]
+        tx.rehash()
+
+        signed_tx = self.nodes[0].signrawtransaction(binascii.hexlify(tx.serialize()).decode("utf-8"))
+        sent_txid = self.nodes[0].sendrawtransaction(signed_tx["hex"], True)
+
+        self.nodes[0].generate(1)
+        self.sync_all()
+
+        txidsmany = self.nodes[1].getaddresstxids("2N2JD6wb56AfK4tfmM6PwdVmoYk2dCKf4Br")
+        assert_equal(len(txidsmany), 4)
+        assert_equal(txidsmany[3], sent_txid)
+
+        # Check that balances are correct
+        print "Testing balances..."
+        balance0 = self.nodes[1].getaddressbalance("2N2JD6wb56AfK4tfmM6PwdVmoYk2dCKf4Br")
+        assert_equal(balance0["balance"], 45 * 100000000 + 21)
+
+        # Check that balances are correct after spending
+        print "Testing balances after spending..."
+        privkey2 = "cSdkPxkAjA4HDr5VHgsebAPDEh9Gyub4HK8UJr2DFGGqKKy4K5sG"
+        address2 = "mgY65WSfEmsyYaYPQaXhmXMeBhwp4EcsQW"
+        addressHash2 = "0b2f0a0c31bfe0406b0ccc1381fdbe311946dadc".decode("hex")
+        scriptPubKey2 = CScript([OP_DUP, OP_HASH160, addressHash2, OP_EQUALVERIFY, OP_CHECKSIG])
+        self.nodes[0].importprivkey(privkey2)
+
+        unspent = self.nodes[0].listunspent()
+        tx = CTransaction()
+        tx.vin = [CTxIn(COutPoint(int(unspent[0]["txid"], 16), unspent[0]["vout"]))]
+        amount = unspent[0]["amount"] * 100000000
+        tx.vout = [CTxOut(amount, scriptPubKey2)]
+        tx.rehash()
+        signed_tx = self.nodes[0].signrawtransaction(binascii.hexlify(tx.serialize()).decode("utf-8"))
+        spending_txid = self.nodes[0].sendrawtransaction(signed_tx["hex"], True)
+        self.nodes[0].generate(1)
+        self.sync_all()
+        balance1 = self.nodes[1].getaddressbalance(address2)
+        assert_equal(balance1["balance"], amount)
+
+        tx = CTransaction()
+        tx.vin = [CTxIn(COutPoint(int(spending_txid, 16), 0))]
+        send_amount = 1 * 100000000 + 12840
+        change_amount = amount - send_amount - 10000
+        tx.vout = [CTxOut(change_amount, scriptPubKey2), CTxOut(send_amount, scriptPubKey)]
+        tx.rehash()
+
+        signed_tx = self.nodes[0].signrawtransaction(binascii.hexlify(tx.serialize()).decode("utf-8"))
+        sent_txid = self.nodes[0].sendrawtransaction(signed_tx["hex"], True)
+        self.nodes[0].generate(1)
+        self.sync_all()
+
+        balance2 = self.nodes[1].getaddressbalance(address2)
+        assert_equal(balance2["balance"], change_amount)
+
+        # Check that deltas are returned correctly
+        deltas = self.nodes[1].getaddressdeltas({"addresses": [address2], "start": 1, "end": 200})
+        balance3 = 0
+        for delta in deltas:
+            balance3 += delta["satoshis"]
+        assert_equal(balance3, change_amount)
+        assert_equal(deltas[0]["address"], address2)
+        assert_equal(deltas[0]["blockindex"], 1)
+
+        # Check that entire range will be queried
+        deltasAll = self.nodes[1].getaddressdeltas({"addresses": [address2]})
+        assert_equal(len(deltasAll), len(deltas))
+
+        # Check that deltas can be returned from range of block heights
+        deltas = self.nodes[1].getaddressdeltas({"addresses": [address2], "start": 113, "end": 113})
+        assert_equal(len(deltas), 1)
+
+        # Check that unspent outputs can be queried
+        print "Testing utxos..."
+        utxos = self.nodes[1].getaddressutxos({"addresses": [address2]})
+        assert_equal(len(utxos), 1)
+        assert_equal(utxos[0]["satoshis"], change_amount)
+
+        # Check that indexes will be updated with a reorg
+        print "Testing reorg..."
+
+        best_hash = self.nodes[0].getbestblockhash()
+        self.nodes[0].invalidateblock(best_hash)
+        self.nodes[1].invalidateblock(best_hash)
+        self.nodes[2].invalidateblock(best_hash)
+        self.nodes[3].invalidateblock(best_hash)
+        self.sync_all()
+
+        balance4 = self.nodes[1].getaddressbalance(address2)
+        assert_equal(balance4, balance1)
+
+        utxos2 = self.nodes[1].getaddressutxos({"addresses": [address2]})
+        assert_equal(len(utxos2), 1)
+        assert_equal(utxos2[0]["satoshis"], amount)
+
+        # Check sorting of utxos
+        self.nodes[2].generate(150)
+
+        txidsort1 = self.nodes[2].sendtoaddress(address2, 50)
+        self.nodes[2].generate(1)
+        txidsort2 = self.nodes[2].sendtoaddress(address2, 50)
+        self.nodes[2].generate(1)
+        self.sync_all()
+
+        utxos3 = self.nodes[1].getaddressutxos({"addresses": [address2]})
+        assert_equal(len(utxos3), 3)
+        assert_equal(utxos3[0]["height"], 114)
+        assert_equal(utxos3[1]["height"], 264)
+        assert_equal(utxos3[2]["height"], 265)
+
+        # Check mempool indexing
+        print "Testing mempool indexing..."
+
+        privKey3 = "cVfUn53hAbRrDEuMexyfgDpZPhF7KqXpS8UZevsyTDaugB7HZ3CD"
+        address3 = "mw4ynwhS7MmrQ27hr82kgqu7zryNDK26JB"
+        addressHash3 = "aa9872b5bbcdb511d89e0e11aa27da73fd2c3f50".decode("hex")
+        scriptPubKey3 = CScript([OP_DUP, OP_HASH160, addressHash3, OP_EQUALVERIFY, OP_CHECKSIG])
+        address4 = "2N8oFVB2vThAKury4vnLquW2zVjsYjjAkYQ"
+        scriptPubKey4 = CScript([OP_HASH160, addressHash3, OP_EQUAL])
+        unspent = self.nodes[2].listunspent()
+
+        tx = CTransaction()
+        tx.vin = [CTxIn(COutPoint(int(unspent[0]["txid"], 16), unspent[0]["vout"]))]
+        amount = unspent[0]["amount"] * 100000000
+        tx.vout = [CTxOut(amount, scriptPubKey3)]
+        tx.rehash()
+        signed_tx = self.nodes[2].signrawtransaction(binascii.hexlify(tx.serialize()).decode("utf-8"))
+        memtxid1 = self.nodes[2].sendrawtransaction(signed_tx["hex"], True)
+        time.sleep(2)
+
+        tx2 = CTransaction()
+        tx2.vin = [CTxIn(COutPoint(int(unspent[1]["txid"], 16), unspent[1]["vout"]))]
+        amount = unspent[1]["amount"] * 100000000
+        tx2.vout = [
+            CTxOut(amount / 4, scriptPubKey3),
+            CTxOut(amount / 4, scriptPubKey3),
+            CTxOut(amount / 4, scriptPubKey4),
+            CTxOut(amount / 4, scriptPubKey4)
+        ]
+        tx2.rehash()
+        signed_tx2 = self.nodes[2].signrawtransaction(binascii.hexlify(tx2.serialize()).decode("utf-8"))
+        memtxid2 = self.nodes[2].sendrawtransaction(signed_tx2["hex"], True)
+        time.sleep(2)
+
+        mempool = self.nodes[2].getaddressmempool({"addresses": [address3]})
+        assert_equal(len(mempool), 3)
+        assert_equal(mempool[0]["txid"], memtxid1)
+        assert_equal(mempool[0]["address"], address3)
+        assert_equal(mempool[0]["index"], 0)
+        assert_equal(mempool[1]["txid"], memtxid2)
+        assert_equal(mempool[1]["index"], 0)
+        assert_equal(mempool[2]["txid"], memtxid2)
+        assert_equal(mempool[2]["index"], 1)
+
+        self.nodes[2].generate(1);
+        self.sync_all();
+        mempool2 = self.nodes[2].getaddressmempool({"addresses": [address3]})
+        assert_equal(len(mempool2), 0)
+
+        tx = CTransaction()
+        tx.vin = [
+            CTxIn(COutPoint(int(memtxid2, 16), 0)),
+            CTxIn(COutPoint(int(memtxid2, 16), 1))
+        ]
+        tx.vout = [CTxOut(amount / 2 - 10000, scriptPubKey2)]
+        tx.rehash()
+        self.nodes[2].importprivkey(privKey3)
+        signed_tx3 = self.nodes[2].signrawtransaction(binascii.hexlify(tx.serialize()).decode("utf-8"))
+        memtxid3 = self.nodes[2].sendrawtransaction(signed_tx3["hex"], True)
+        time.sleep(2)
+
+        mempool3 = self.nodes[2].getaddressmempool({"addresses": [address3]})
+        assert_equal(len(mempool3), 2)
+        assert_equal(mempool3[0]["prevtxid"], memtxid2)
+        assert_equal(mempool3[0]["prevout"], 0)
+        assert_equal(mempool3[1]["prevtxid"], memtxid2)
+        assert_equal(mempool3[1]["prevout"], 1)
+
+        # sending and receiving to the same address
+        privkey1 = "cQY2s58LhzUCmEXN8jtAp1Etnijx78YRZ466w4ikX1V4UpTpbsf8"
+        address1 = "myAUWSHnwsQrhuMWv4Br6QsCnpB41vFwHn"
+        address1hash = "c192bff751af8efec15135d42bfeedf91a6f3e34".decode("hex")
+        address1script = CScript([OP_DUP, OP_HASH160, address1hash, OP_EQUALVERIFY, OP_CHECKSIG])
+
+        self.nodes[0].sendtoaddress(address1, 10)
+        self.nodes[0].generate(1)
+        self.sync_all()
+
+        utxos = self.nodes[1].getaddressutxos({"addresses": [address1]})
+        assert_equal(len(utxos), 1)
+
+        tx = CTransaction()
+        tx.vin = [
+            CTxIn(COutPoint(int(utxos[0]["txid"], 16), utxos[0]["outputIndex"]))
+        ]
+        amount = utxos[0]["satoshis"] - 1000
+        tx.vout = [CTxOut(amount, address1script)]
+        tx.rehash()
+        self.nodes[0].importprivkey(privkey1)
+        signed_tx = self.nodes[0].signrawtransaction(binascii.hexlify(tx.serialize()).decode("utf-8"))
+        mem_txid = self.nodes[0].sendrawtransaction(signed_tx["hex"], True)
+
+        self.sync_all()
+        mempool_deltas = self.nodes[2].getaddressmempool({"addresses": [address1]})
+        assert_equal(len(mempool_deltas), 2)
+
+        # Include chaininfo in results
+        print "Testing results with chain info..."
+
+        deltas_with_info = self.nodes[1].getaddressdeltas({
+            "addresses": [address2],
+            "start": 1,
+            "end": 200,
+            "chainInfo": True
+        })
+        start_block_hash = self.nodes[1].getblockhash(1);
+        end_block_hash = self.nodes[1].getblockhash(200);
+        assert_equal(deltas_with_info["start"]["height"], 1)
+        assert_equal(deltas_with_info["start"]["hash"], start_block_hash)
+        assert_equal(deltas_with_info["end"]["height"], 200)
+        assert_equal(deltas_with_info["end"]["hash"], end_block_hash)
+
+        utxos_with_info = self.nodes[1].getaddressutxos({"addresses": [address2], "chainInfo": True})
+        expected_tip_block_hash = self.nodes[1].getblockhash(267);
+        assert_equal(utxos_with_info["height"], 267)
+        assert_equal(utxos_with_info["hash"], expected_tip_block_hash)
+
+        print "Passed\n"
+
+
+if __name__ == '__main__':
+    AddressIndexTest().main()
diff --git a/qa/rpc-tests/spentindex.py b/qa/rpc-tests/spentindex.py
new file mode 100755
index 0000000000000..1366dbe315e4f
--- /dev/null
+++ b/qa/rpc-tests/spentindex.py
@@ -0,0 +1,139 @@
+#!/usr/bin/env python2
+# Copyright (c) 2014-2015 The Bitcoin Core developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#
+# Test addressindex generation and fetching
+#
+
+import time
+from test_framework.test_framework import BitcoinTestFramework
+from test_framework.util import *
+from test_framework.script import *
+from test_framework.mininode import *
+import binascii
+
+class SpentIndexTest(BitcoinTestFramework):
+
+    def setup_chain(self):
+        print("Initializing test directory "+self.options.tmpdir)
+        initialize_chain_clean(self.options.tmpdir, 4)
+
+    def setup_network(self):
+        self.nodes = []
+        # Nodes 0/1 are "wallet" nodes
+        self.nodes.append(start_node(0, self.options.tmpdir, ["-debug"]))
+        self.nodes.append(start_node(1, self.options.tmpdir, ["-debug", "-spentindex"]))
+        # Nodes 2/3 are used for testing
+        self.nodes.append(start_node(2, self.options.tmpdir, ["-debug", "-spentindex"]))
+        self.nodes.append(start_node(3, self.options.tmpdir, ["-debug", "-spentindex", "-txindex"]))
+        connect_nodes(self.nodes[0], 1)
+        connect_nodes(self.nodes[0], 2)
+        connect_nodes(self.nodes[0], 3)
+
+        self.is_network_split = False
+        self.sync_all()
+
+    def run_test(self):
+        print "Mining blocks..."
+        self.nodes[0].generate(105)
+        self.sync_all()
+
+        chain_height = self.nodes[1].getblockcount()
+        assert_equal(chain_height, 105)
+
+        # Check that
+        print "Testing spent index..."
+
+        privkey = "cSdkPxkAjA4HDr5VHgsebAPDEh9Gyub4HK8UJr2DFGGqKKy4K5sG"
+        address = "mgY65WSfEmsyYaYPQaXhmXMeBhwp4EcsQW"
+        addressHash = "0b2f0a0c31bfe0406b0ccc1381fdbe311946dadc".decode("hex")
+        scriptPubKey = CScript([OP_DUP, OP_HASH160, addressHash, OP_EQUALVERIFY, OP_CHECKSIG])
+        unspent = self.nodes[0].listunspent()
+        tx = CTransaction()
+        amount = unspent[0]["amount"] * 100000000
+        tx.vin = [CTxIn(COutPoint(int(unspent[0]["txid"], 16), unspent[0]["vout"]))]
+        tx.vout = [CTxOut(amount, scriptPubKey)]
+        tx.rehash()
+
+        signed_tx = self.nodes[0].signrawtransaction(binascii.hexlify(tx.serialize()).decode("utf-8"))
+        txid = self.nodes[0].sendrawtransaction(signed_tx["hex"], True)
+        self.nodes[0].generate(1)
+        self.sync_all()
+
+        print "Testing getspentinfo method..."
+
+        # Check that the spentinfo works standalone
+        info = self.nodes[1].getspentinfo({"txid": unspent[0]["txid"], "index": unspent[0]["vout"]})
+        assert_equal(info["txid"], txid)
+        assert_equal(info["index"], 0)
+        assert_equal(info["height"], 106)
+
+        print "Testing getrawtransaction method..."
+
+        # Check that verbose raw transaction includes spent info
+        txVerbose = self.nodes[3].getrawtransaction(unspent[0]["txid"], 1)
+        assert_equal(txVerbose["vout"][unspent[0]["vout"]]["spentTxId"], txid)
+        assert_equal(txVerbose["vout"][unspent[0]["vout"]]["spentIndex"], 0)
+        assert_equal(txVerbose["vout"][unspent[0]["vout"]]["spentHeight"], 106)
+
+        # Check that verbose raw transaction includes input values
+        txVerbose2 = self.nodes[3].getrawtransaction(txid, 1)
+        assert_equal(txVerbose2["vin"][0]["value"], Decimal(unspent[0]["amount"]))
+        assert_equal(txVerbose2["vin"][0]["valueSat"], amount)
+
+        # Check that verbose raw transaction includes address values and input values
+        privkey2 = "cSdkPxkAjA4HDr5VHgsebAPDEh9Gyub4HK8UJr2DFGGqKKy4K5sG"
+        address2 = "mgY65WSfEmsyYaYPQaXhmXMeBhwp4EcsQW"
+        addressHash2 = "0b2f0a0c31bfe0406b0ccc1381fdbe311946dadc".decode("hex")
+        scriptPubKey2 = CScript([OP_DUP, OP_HASH160, addressHash2, OP_EQUALVERIFY, OP_CHECKSIG])
+        tx2 = CTransaction()
+        tx2.vin = [CTxIn(COutPoint(int(txid, 16), 0))]
+        tx2.vout = [CTxOut(amount, scriptPubKey2)]
+        tx.rehash()
+        self.nodes[0].importprivkey(privkey)
+        signed_tx2 = self.nodes[0].signrawtransaction(binascii.hexlify(tx2.serialize()).decode("utf-8"))
+        txid2 = self.nodes[0].sendrawtransaction(signed_tx2["hex"], True)
+
+        # Check the mempool index
+        self.sync_all()
+        txVerbose3 = self.nodes[1].getrawtransaction(txid2, 1)
+        assert_equal(txVerbose3["vin"][0]["address"], address2)
+        assert_equal(txVerbose3["vin"][0]["value"], Decimal(unspent[0]["amount"]))
+        assert_equal(txVerbose3["vin"][0]["valueSat"], amount)
+
+        # Check the database index
+        block_hash = self.nodes[0].generate(1)
+        self.sync_all()
+
+        txVerbose4 = self.nodes[3].getrawtransaction(txid2, 1)
+        assert_equal(txVerbose4["vin"][0]["address"], address2)
+        assert_equal(txVerbose4["vin"][0]["value"], Decimal(unspent[0]["amount"]))
+        assert_equal(txVerbose4["vin"][0]["valueSat"], amount)
+
+
+        # Check block deltas
+        print "Testing getblockdeltas..."
+
+        block = self.nodes[3].getblockdeltas(block_hash[0])
+        assert_equal(len(block["deltas"]), 2)
+        assert_equal(block["deltas"][0]["index"], 0)
+        assert_equal(len(block["deltas"][0]["inputs"]), 0)
+        assert_equal(len(block["deltas"][0]["outputs"]), 0)
+        assert_equal(block["deltas"][1]["index"], 1)
+        assert_equal(block["deltas"][1]["txid"], txid2)
+        assert_equal(block["deltas"][1]["inputs"][0]["index"], 0)
+        assert_equal(block["deltas"][1]["inputs"][0]["address"], "mgY65WSfEmsyYaYPQaXhmXMeBhwp4EcsQW")
+        assert_equal(block["deltas"][1]["inputs"][0]["satoshis"], amount * -1)
+        assert_equal(block["deltas"][1]["inputs"][0]["prevtxid"], txid)
+        assert_equal(block["deltas"][1]["inputs"][0]["prevout"], 0)
+        assert_equal(block["deltas"][1]["outputs"][0]["index"], 0)
+        assert_equal(block["deltas"][1]["outputs"][0]["address"], "mgY65WSfEmsyYaYPQaXhmXMeBhwp4EcsQW")
+        assert_equal(block["deltas"][1]["outputs"][0]["satoshis"], amount)
+
+        print "Passed\n"
+
+
+if __name__ == '__main__':
+    SpentIndexTest().main()
diff --git a/qa/rpc-tests/timestampindex.py b/qa/rpc-tests/timestampindex.py
new file mode 100755
index 0000000000000..289c81b2a5212
--- /dev/null
+++ b/qa/rpc-tests/timestampindex.py
@@ -0,0 +1,61 @@
+#!/usr/bin/env python2
+# Copyright (c) 2014-2015 The Bitcoin Core developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#
+# Test timestampindex generation and fetching
+#
+
+import time
+
+from test_framework.test_framework import BitcoinTestFramework
+from test_framework.util import *
+
+
+class TimestampIndexTest(BitcoinTestFramework):
+
+    def setup_chain(self):
+        print("Initializing test directory "+self.options.tmpdir)
+        initialize_chain_clean(self.options.tmpdir, 4)
+
+    def setup_network(self):
+        self.nodes = []
+        # Nodes 0/1 are "wallet" nodes
+        self.nodes.append(start_node(0, self.options.tmpdir, ["-debug"]))
+        self.nodes.append(start_node(1, self.options.tmpdir, ["-debug", "-timestampindex"]))
+        # Nodes 2/3 are used for testing
+        self.nodes.append(start_node(2, self.options.tmpdir, ["-debug"]))
+        self.nodes.append(start_node(3, self.options.tmpdir, ["-debug", "-timestampindex"]))
+        connect_nodes(self.nodes[0], 1)
+        connect_nodes(self.nodes[0], 2)
+        connect_nodes(self.nodes[0], 3)
+
+        self.is_network_split = False
+        self.sync_all()
+
+    def run_test(self):
+        print "Mining 25 blocks..."
+        blockhashes = self.nodes[0].generate(25)
+        time.sleep(3)
+        print "Mining 25 blocks..."
+        blockhashes.extend(self.nodes[0].generate(25))
+        time.sleep(3)
+        print "Mining 25 blocks..."
+        blockhashes.extend(self.nodes[0].generate(25))
+        self.sync_all()
+        low = self.nodes[1].getblock(blockhashes[0])["time"]
+        high = low + 76
+
+        print "Checking timestamp index..."
+        hashes = self.nodes[1].getblockhashes(high, low)
+
+        assert_equal(len(hashes), len(blockhashes))
+
+        assert_equal(hashes, blockhashes)
+
+        print "Passed\n"
+
+
+if __name__ == '__main__':
+    TimestampIndexTest().main()
diff --git a/qa/rpc-tests/txindex.py b/qa/rpc-tests/txindex.py
new file mode 100755
index 0000000000000..b139253b769ec
--- /dev/null
+++ b/qa/rpc-tests/txindex.py
@@ -0,0 +1,73 @@
+#!/usr/bin/env python2
+# Copyright (c) 2014-2015 The Bitcoin Core developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#
+# Test txindex generation and fetching
+#
+
+import time
+from test_framework.test_framework import BitcoinTestFramework
+from test_framework.util import *
+from test_framework.script import *
+from test_framework.mininode import *
+import binascii
+
+class TxIndexTest(BitcoinTestFramework):
+
+    def setup_chain(self):
+        print("Initializing test directory "+self.options.tmpdir)
+        initialize_chain_clean(self.options.tmpdir, 4)
+
+    def setup_network(self):
+        self.nodes = []
+        # Nodes 0/1 are "wallet" nodes
+        self.nodes.append(start_node(0, self.options.tmpdir, ["-debug"]))
+        self.nodes.append(start_node(1, self.options.tmpdir, ["-debug", "-txindex"]))
+        # Nodes 2/3 are used for testing
+        self.nodes.append(start_node(2, self.options.tmpdir, ["-debug", "-txindex"]))
+        self.nodes.append(start_node(3, self.options.tmpdir, ["-debug", "-txindex"]))
+        connect_nodes(self.nodes[0], 1)
+        connect_nodes(self.nodes[0], 2)
+        connect_nodes(self.nodes[0], 3)
+
+        self.is_network_split = False
+        self.sync_all()
+
+    def run_test(self):
+        print "Mining blocks..."
+        self.nodes[0].generate(105)
+        self.sync_all()
+
+        chain_height = self.nodes[1].getblockcount()
+        assert_equal(chain_height, 105)
+
+        print "Testing transaction index..."
+
+        privkey = "cSdkPxkAjA4HDr5VHgsebAPDEh9Gyub4HK8UJr2DFGGqKKy4K5sG"
+        address = "mgY65WSfEmsyYaYPQaXhmXMeBhwp4EcsQW"
+        addressHash = "0b2f0a0c31bfe0406b0ccc1381fdbe311946dadc".decode("hex")
+        scriptPubKey = CScript([OP_DUP, OP_HASH160, addressHash, OP_EQUALVERIFY, OP_CHECKSIG])
+        unspent = self.nodes[0].listunspent()
+        tx = CTransaction()
+        amount = unspent[0]["amount"] * 100000000
+        tx.vin = [CTxIn(COutPoint(int(unspent[0]["txid"], 16), unspent[0]["vout"]))]
+        tx.vout = [CTxOut(amount, scriptPubKey)]
+        tx.rehash()
+
+        signed_tx = self.nodes[0].signrawtransaction(binascii.hexlify(tx.serialize()).decode("utf-8"))
+        txid = self.nodes[0].sendrawtransaction(signed_tx["hex"], True)
+        self.nodes[0].generate(1)
+        self.sync_all()
+
+        # Check verbose raw transaction results
+        verbose = self.nodes[3].getrawtransaction(unspent[0]["txid"], 1)
+        assert_equal(verbose["vout"][0]["valueSat"], 5000000000);
+        assert_equal(verbose["vout"][0]["value"], 50);
+
+        print "Passed\n"
+
+
+if __name__ == '__main__':
+    TxIndexTest().main()

From 2212e82f1e8310bb2221f6df808b196447dfd3ed Mon Sep 17 00:00:00 2001
From: Braydon Fuller <braydon@bitpay.com>
Date: Tue, 4 Oct 2016 15:03:13 -0400
Subject: [PATCH 1790/1802] tests: adds unit test for IsPayToPublicKeyHash
 method

---
 src/Makefile.test.include       |  1 +
 src/test/script_P2PKH_tests.cpp | 59 +++++++++++++++++++++++++++++++++
 2 files changed, 60 insertions(+)
 create mode 100644 src/test/script_P2PKH_tests.cpp

diff --git a/src/Makefile.test.include b/src/Makefile.test.include
index 4d44b35bb6184..7d85bfbb45237 100644
--- a/src/Makefile.test.include
+++ b/src/Makefile.test.include
@@ -116,6 +116,7 @@ BITCOIN_TESTS =\
   test/sanity_tests.cpp \
   test/scheduler_tests.cpp \
   test/script_P2SH_tests.cpp \
+  test/script_P2PKH_tests.cpp \
   test/script_tests.cpp \
   test/scriptnum_tests.cpp \
   test/serialize_tests.cpp \
diff --git a/src/test/script_P2PKH_tests.cpp b/src/test/script_P2PKH_tests.cpp
new file mode 100644
index 0000000000000..3a7dc16608aaa
--- /dev/null
+++ b/src/test/script_P2PKH_tests.cpp
@@ -0,0 +1,59 @@
+// Copyright (c) 2012-2015 The Bitcoin Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#include "script/script.h"
+#include "test/test_bitcoin.h"
+
+#include <boost/test/unit_test.hpp>
+
+using namespace std;
+
+BOOST_FIXTURE_TEST_SUITE(script_P2PKH_tests, BasicTestingSetup)
+
+BOOST_AUTO_TEST_CASE(IsPayToPublicKeyHash)
+{
+    // Test CScript::IsPayToPublicKeyHash()
+    uint160 dummy;
+    CScript p2pkh;
+    p2pkh << OP_DUP << OP_HASH160 << ToByteVector(dummy) << OP_EQUALVERIFY << OP_CHECKSIG;
+    BOOST_CHECK(p2pkh.IsPayToPublicKeyHash());
+
+    static const unsigned char direct[] = {
+        OP_DUP, OP_HASH160, 20, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, OP_EQUALVERIFY, OP_CHECKSIG
+    };
+    BOOST_CHECK(CScript(direct, direct+sizeof(direct)).IsPayToPublicKeyHash());
+
+    static const unsigned char notp2pkh1[] = {
+        OP_DUP, OP_HASH160, 20, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, OP_EQUALVERIFY, OP_CHECKSIG, OP_CHECKSIG
+    };
+    BOOST_CHECK(!CScript(notp2pkh1, notp2pkh1+sizeof(notp2pkh1)).IsPayToPublicKeyHash());
+
+    static const unsigned char p2sh[] = {
+        OP_HASH160, 20, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, OP_EQUAL
+    };
+    BOOST_CHECK(!CScript(p2sh, p2sh+sizeof(p2sh)).IsPayToPublicKeyHash());
+
+    static const unsigned char extra[] = {
+        OP_DUP, OP_HASH160, 20, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, OP_EQUALVERIFY, OP_CHECKSIG, OP_CHECKSIG
+    };
+    BOOST_CHECK(!CScript(extra, extra+sizeof(extra)).IsPayToPublicKeyHash());
+
+    static const unsigned char missing[] = {
+        OP_HASH160, 20, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, OP_EQUALVERIFY, OP_CHECKSIG, OP_RETURN
+    };
+    BOOST_CHECK(!CScript(missing, missing+sizeof(missing)).IsPayToPublicKeyHash());
+
+    static const unsigned char missing2[] = {
+        OP_DUP, OP_HASH160, 20, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+    };
+    BOOST_CHECK(!CScript(missing2, missing2+sizeof(missing)).IsPayToPublicKeyHash());
+
+    static const unsigned char tooshort[] = {
+        OP_DUP, OP_HASH160, 2, 0,0, OP_EQUALVERIFY, OP_CHECKSIG
+    };
+    BOOST_CHECK(!CScript(tooshort, tooshort+sizeof(direct)).IsPayToPublicKeyHash());
+
+}
+
+BOOST_AUTO_TEST_SUITE_END()

From b6be3b896f2ca665c254e9a0a92c849043a3d1a4 Mon Sep 17 00:00:00 2001
From: Braydon Fuller <braydon@bitpay.com>
Date: Wed, 5 Oct 2016 14:21:25 -0400
Subject: [PATCH 1791/1802] indexes: refactoring and fixes applying changes to
 0.13

---
 src/addressindex.h         | 213 +++++++++++++++++++++++
 src/rpc/blockchain.cpp     |   1 -
 src/rpc/misc.cpp           |  59 +++----
 src/rpc/rawtransaction.cpp |   3 +-
 src/timestampindex.h       | 131 +++++++++++++++
 src/txdb.cpp               |  24 +--
 src/txdb.h                 |  16 +-
 src/validation.cpp         |  11 ++
 src/validation.h           | 335 +------------------------------------
 9 files changed, 401 insertions(+), 392 deletions(-)
 create mode 100644 src/timestampindex.h

diff --git a/src/addressindex.h b/src/addressindex.h
index 9e734b84dcdca..dbb09c7fe9b4c 100644
--- a/src/addressindex.h
+++ b/src/addressindex.h
@@ -8,6 +8,219 @@
 
 #include "uint256.h"
 #include "amount.h"
+#include "script/script.h"
+
+struct CAddressUnspentKey {
+    unsigned int type;
+    uint160 hashBytes;
+    uint256 txhash;
+    size_t index;
+
+    size_t GetSerializeSize(int nType, int nVersion) const {
+        return 57;
+    }
+    template<typename Stream>
+    void Serialize(Stream& s, int nType, int nVersion) const {
+        ser_writedata8(s, type);
+        hashBytes.Serialize(s, nType, nVersion);
+        txhash.Serialize(s, nType, nVersion);
+        ser_writedata32(s, index);
+    }
+    template<typename Stream>
+    void Unserialize(Stream& s, int nType, int nVersion) {
+        type = ser_readdata8(s);
+        hashBytes.Unserialize(s, nType, nVersion);
+        txhash.Unserialize(s, nType, nVersion);
+        index = ser_readdata32(s);
+    }
+
+    CAddressUnspentKey(unsigned int addressType, uint160 addressHash, uint256 txid, size_t indexValue) {
+        type = addressType;
+        hashBytes = addressHash;
+        txhash = txid;
+        index = indexValue;
+    }
+
+    CAddressUnspentKey() {
+        SetNull();
+    }
+
+    void SetNull() {
+        type = 0;
+        hashBytes.SetNull();
+        txhash.SetNull();
+        index = 0;
+    }
+};
+
+struct CAddressUnspentValue {
+    CAmount satoshis;
+    CScript script;
+    int blockHeight;
+
+    ADD_SERIALIZE_METHODS;
+
+    template <typename Stream, typename Operation>
+    inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) {
+        READWRITE(satoshis);
+        READWRITE(*(CScriptBase*)(&script));
+        READWRITE(blockHeight);
+    }
+
+    CAddressUnspentValue(CAmount sats, CScript scriptPubKey, int height) {
+        satoshis = sats;
+        script = scriptPubKey;
+        blockHeight = height;
+    }
+
+    CAddressUnspentValue() {
+        SetNull();
+    }
+
+    void SetNull() {
+        satoshis = -1;
+        script.clear();
+        blockHeight = 0;
+    }
+
+    bool IsNull() const {
+        return (satoshis == -1);
+    }
+};
+
+struct CAddressIndexKey {
+    unsigned int type;
+    uint160 hashBytes;
+    int blockHeight;
+    unsigned int txindex;
+    uint256 txhash;
+    size_t index;
+    bool spending;
+
+    size_t GetSerializeSize(int nType, int nVersion) const {
+        return 66;
+    }
+    template<typename Stream>
+    void Serialize(Stream& s, int nType, int nVersion) const {
+        ser_writedata8(s, type);
+        hashBytes.Serialize(s, nType, nVersion);
+        // Heights are stored big-endian for key sorting in LevelDB
+        ser_writedata32be(s, blockHeight);
+        ser_writedata32be(s, txindex);
+        txhash.Serialize(s, nType, nVersion);
+        ser_writedata32(s, index);
+        char f = spending;
+        ser_writedata8(s, f);
+    }
+    template<typename Stream>
+    void Unserialize(Stream& s, int nType, int nVersion) {
+        type = ser_readdata8(s);
+        hashBytes.Unserialize(s, nType, nVersion);
+        blockHeight = ser_readdata32be(s);
+        txindex = ser_readdata32be(s);
+        txhash.Unserialize(s, nType, nVersion);
+        index = ser_readdata32(s);
+        char f = ser_readdata8(s);
+        spending = f;
+    }
+
+    CAddressIndexKey(unsigned int addressType, uint160 addressHash, int height, int blockindex,
+                     uint256 txid, size_t indexValue, bool isSpending) {
+        type = addressType;
+        hashBytes = addressHash;
+        blockHeight = height;
+        txindex = blockindex;
+        txhash = txid;
+        index = indexValue;
+        spending = isSpending;
+    }
+
+    CAddressIndexKey() {
+        SetNull();
+    }
+
+    void SetNull() {
+        type = 0;
+        hashBytes.SetNull();
+        blockHeight = 0;
+        txindex = 0;
+        txhash.SetNull();
+        index = 0;
+        spending = false;
+    }
+
+};
+
+struct CAddressIndexIteratorKey {
+    unsigned int type;
+    uint160 hashBytes;
+
+    size_t GetSerializeSize(int nType, int nVersion) const {
+        return 21;
+    }
+    template<typename Stream>
+    void Serialize(Stream& s, int nType, int nVersion) const {
+        ser_writedata8(s, type);
+        hashBytes.Serialize(s, nType, nVersion);
+    }
+    template<typename Stream>
+    void Unserialize(Stream& s, int nType, int nVersion) {
+        type = ser_readdata8(s);
+        hashBytes.Unserialize(s, nType, nVersion);
+    }
+
+    CAddressIndexIteratorKey(unsigned int addressType, uint160 addressHash) {
+        type = addressType;
+        hashBytes = addressHash;
+    }
+
+    CAddressIndexIteratorKey() {
+        SetNull();
+    }
+
+    void SetNull() {
+        type = 0;
+        hashBytes.SetNull();
+    }
+};
+
+struct CAddressIndexIteratorHeightKey {
+    unsigned int type;
+    uint160 hashBytes;
+    int blockHeight;
+
+    size_t GetSerializeSize(int nType, int nVersion) const {
+        return 25;
+    }
+    template<typename Stream>
+    void Serialize(Stream& s, int nType, int nVersion) const {
+        ser_writedata8(s, type);
+        hashBytes.Serialize(s, nType, nVersion);
+        ser_writedata32be(s, blockHeight);
+    }
+    template<typename Stream>
+    void Unserialize(Stream& s, int nType, int nVersion) {
+        type = ser_readdata8(s);
+        hashBytes.Unserialize(s, nType, nVersion);
+        blockHeight = ser_readdata32be(s);
+    }
+
+    CAddressIndexIteratorHeightKey(unsigned int addressType, uint160 addressHash, int height) {
+        type = addressType;
+        hashBytes = addressHash;
+        blockHeight = height;
+    }
+
+    CAddressIndexIteratorHeightKey() {
+        SetNull();
+    }
+
+    void SetNull() {
+        type = 0;
+        hashBytes.SetNull();
+        blockHeight = 0;
+    }
+};
 
 struct CMempoolAddressDelta
 {
diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp
index a1603dcead760..b3fe708bc7316 100644
--- a/src/rpc/blockchain.cpp
+++ b/src/rpc/blockchain.cpp
@@ -1644,7 +1644,6 @@ static const CRPCCommand commands[] =
     { "blockchain",         "gettxoutsetinfo",        &gettxoutsetinfo,        true,  {} },
     { "blockchain",         "pruneblockchain",        &pruneblockchain,        true,  {"height"} },
     { "blockchain",         "verifychain",            &verifychain,            true,  {"checklevel","nblocks"} },
-    { "blockchain",         "getspentinfo",           &getspentinfo,           false },
 
     { "blockchain",         "preciousblock",          &preciousblock,          true,  {"blockhash"} },
 
diff --git a/src/rpc/misc.cpp b/src/rpc/misc.cpp
index 2ae91531da8db..e18766d90c9d7 100644
--- a/src/rpc/misc.cpp
+++ b/src/rpc/misc.cpp
@@ -510,35 +510,6 @@ UniValue echo(const JSONRPCRequest& request)
     return request.params;
 }
 
-static const CRPCCommand commands[] =
-{ //  category              name                      actor (function)         okSafeMode
-  //  --------------------- ------------------------  -----------------------  ----------
-    { "control",            "getinfo",                &getinfo,                true,  {} }, /* uses wallet if enabled */
-    { "control",            "getmemoryinfo",          &getmemoryinfo,          true,  {} },
-    { "util",               "validateaddress",        &validateaddress,        true,  {"address"} }, /* uses wallet if enabled */
-    { "util",               "createmultisig",         &createmultisig,         true,  {"nrequired","keys"} },
-    { "util",               "verifymessage",          &verifymessage,          true,  {"address","signature","message"} },
-    { "util",               "signmessagewithprivkey", &signmessagewithprivkey, true,  {"privkey","message"} },
-
-    /* Address index */
-    { "addressindex",       "getaddressmempool",      &getaddressmempool,      true  },
-    { "addressindex",       "getaddressutxos",        &getaddressutxos,        false },
-    { "addressindex",       "getaddressdeltas",       &getaddressdeltas,       false },
-    { "addressindex",       "getaddresstxids",        &getaddresstxids,        false },
-    { "addressindex",       "getaddressbalance",      &getaddressbalance,      false },
-
-    /* Not shown in help */
-    { "hidden",             "setmocktime",            &setmocktime,            true,  {"timestamp"}},
-    { "hidden",             "echo",                   &echo,                   true,  {"arg0","arg1","arg2","arg3","arg4","arg5","arg6","arg7","arg8","arg9"}},
-    { "hidden",             "echojson",               &echo,                  true,  {"arg0","arg1","arg2","arg3","arg4","arg5","arg6","arg7","arg8","arg9"}},
-};
-
-void RegisterMiscRPCCommands(CRPCTable &t)
-{
-    for (unsigned int vcidx = 0; vcidx < ARRAYLEN(commands); vcidx++)
-        t.appendCommand(commands[vcidx].name, &commands[vcidx]);
-}
-
 bool getAddressFromIndex(const int &type, const uint160 &hash, std::string &address)
 {
     if (type == 2) {
@@ -1065,3 +1036,33 @@ UniValue getspentinfo(const UniValue& params, bool fHelp)
 
     return obj;
 }
+
+static const CRPCCommand commands[] =
+{ //  category              name                      actor (function)         okSafeMode
+  //  --------------------- ------------------------  -----------------------  ----------
+    { "control",            "getinfo",                &getinfo,                true,  {} }, /* uses wallet if enabled */
+    { "control",            "getmemoryinfo",          &getmemoryinfo,          true,  {} },
+    { "util",               "validateaddress",        &validateaddress,        true,  {"address"} }, /* uses wallet if enabled */
+    { "util",               "createmultisig",         &createmultisig,         true,  {"nrequired","keys"} },
+    { "util",               "verifymessage",          &verifymessage,          true,  {"address","signature","message"} },
+    { "util",               "signmessagewithprivkey", &signmessagewithprivkey, true,  {"privkey","message"} },
+
+    /* Address index */
+    { "addressindex",       "getaddressmempool",      &getaddressmempool,      true  },
+    { "addressindex",       "getaddressutxos",        &getaddressutxos,        false },
+    { "addressindex",       "getaddressdeltas",       &getaddressdeltas,       false },
+    { "addressindex",       "getaddresstxids",        &getaddresstxids,        false },
+    { "addressindex",       "getaddressbalance",      &getaddressbalance,      false },
+
+    /* Not shown in help */
+    { "hidden",             "setmocktime",            &setmocktime,            true,  {"timestamp"}},
+    { "hidden",             "echo",                   &echo,                   true,  {"arg0","arg1","arg2","arg3","arg4","arg5","arg6","arg7","arg8","arg9"}},
+    { "hidden",             "echojson",               &echo,                  true,  {"arg0","arg1","arg2","arg3","arg4","arg5","arg6","arg7","arg8","arg9"}},
+};
+
+void RegisterMiscRPCCommands(CRPCTable &t)
+{
+    for (unsigned int vcidx = 0; vcidx < ARRAYLEN(commands); vcidx++)
+        t.appendCommand(commands[vcidx].name, &commands[vcidx]);
+}
+
diff --git a/src/rpc/rawtransaction.cpp b/src/rpc/rawtransaction.cpp
index b44413494414c..97ff7e988dadd 100644
--- a/src/rpc/rawtransaction.cpp
+++ b/src/rpc/rawtransaction.cpp
@@ -71,7 +71,8 @@ void TxToJSONExpanded(const CTransaction& tx, const uint256 hashBlock, UniValue&
     entry.push_back(Pair("version", tx.nVersion));
     entry.push_back(Pair("locktime", (int64_t)tx.nLockTime));
     UniValue vin(UniValue::VARR);
-    BOOST_FOREACH(const CTxIn& txin, tx.vin) {
+    for (unsigned int i = 0; i < tx.vin.size(); i++) {
+        const CTxIn& txin = tx.vin[i];
         UniValue in(UniValue::VOBJ);
         if (tx.IsCoinBase())
             in.push_back(Pair("coinbase", HexStr(txin.scriptSig.begin(), txin.scriptSig.end())));
diff --git a/src/timestampindex.h b/src/timestampindex.h
new file mode 100644
index 0000000000000..ea792797e18e1
--- /dev/null
+++ b/src/timestampindex.h
@@ -0,0 +1,131 @@
+// Copyright (c) 2009-2010 Satoshi Nakamoto
+// Copyright (c) 2009-2015 The Bitcoin Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#ifndef BITCOIN_TIMESTAMPINDEX_H
+#define BITCOIN_TIMESTAMPINDEX_H
+
+#include "uint256.h"
+
+struct CTimestampIndexIteratorKey {
+    unsigned int timestamp;
+
+    size_t GetSerializeSize(int nType, int nVersion) const {
+        return 4;
+    }
+    template<typename Stream>
+    void Serialize(Stream& s, int nType, int nVersion) const {
+        ser_writedata32be(s, timestamp);
+    }
+    template<typename Stream>
+    void Unserialize(Stream& s, int nType, int nVersion) {
+        timestamp = ser_readdata32be(s);
+    }
+
+    CTimestampIndexIteratorKey(unsigned int time) {
+        timestamp = time;
+    }
+
+    CTimestampIndexIteratorKey() {
+        SetNull();
+    }
+
+    void SetNull() {
+        timestamp = 0;
+    }
+};
+
+struct CTimestampIndexKey {
+    unsigned int timestamp;
+    uint256 blockHash;
+
+    size_t GetSerializeSize(int nType, int nVersion) const {
+        return 36;
+    }
+    template<typename Stream>
+    void Serialize(Stream& s, int nType, int nVersion) const {
+        ser_writedata32be(s, timestamp);
+        blockHash.Serialize(s, nType, nVersion);
+    }
+    template<typename Stream>
+    void Unserialize(Stream& s, int nType, int nVersion) {
+        timestamp = ser_readdata32be(s);
+        blockHash.Unserialize(s, nType, nVersion);
+    }
+
+    CTimestampIndexKey(unsigned int time, uint256 hash) {
+        timestamp = time;
+        blockHash = hash;
+    }
+
+    CTimestampIndexKey() {
+        SetNull();
+    }
+
+    void SetNull() {
+        timestamp = 0;
+        blockHash.SetNull();
+    }
+};
+
+struct CTimestampBlockIndexKey {
+    uint256 blockHash;
+
+    size_t GetSerializeSize(int nType, int nVersion) const {
+        return 32;
+    }
+
+    template<typename Stream>
+    void Serialize(Stream& s, int nType, int nVersion) const {
+        blockHash.Serialize(s, nType, nVersion);
+    }
+
+    template<typename Stream>
+    void Unserialize(Stream& s, int nType, int nVersion) {
+        blockHash.Unserialize(s, nType, nVersion);
+    }
+
+    CTimestampBlockIndexKey(uint256 hash) {
+        blockHash = hash;
+    }
+
+    CTimestampBlockIndexKey() {
+        SetNull();
+    }
+
+    void SetNull() {
+        blockHash.SetNull();
+    }
+};
+
+struct CTimestampBlockIndexValue {
+    unsigned int ltimestamp;
+    size_t GetSerializeSize(int nType, int nVersion) const {
+        return 4;
+    }
+
+    template<typename Stream>
+    void Serialize(Stream& s, int nType, int nVersion) const {
+        ser_writedata32be(s, ltimestamp);
+    }
+
+    template<typename Stream>
+    void Unserialize(Stream& s, int nType, int nVersion) {
+        ltimestamp = ser_readdata32be(s);
+    }
+
+    CTimestampBlockIndexValue (unsigned int time) {
+        ltimestamp = time;
+    }
+
+    CTimestampBlockIndexValue() {
+        SetNull();
+    }
+
+    void SetNull() {
+        ltimestamp = 0;
+    }
+};
+
+#endif // BITCOIN_TIMESTAMPINDEX_H
diff --git a/src/txdb.cpp b/src/txdb.cpp
index c49562e9944ae..2f3d32b1ad13b 100644
--- a/src/txdb.cpp
+++ b/src/txdb.cpp
@@ -167,7 +167,7 @@ bool CBlockTreeDB::ReadSpentIndex(CSpentIndexKey &key, CSpentIndexValue &value)
 }
 
 bool CBlockTreeDB::UpdateSpentIndex(const std::vector<std::pair<CSpentIndexKey, CSpentIndexValue> >&vect) {
-    CDBBatch batch(&GetObfuscateKey());
+    CDBBatch batch(*this);
     for (std::vector<std::pair<CSpentIndexKey,CSpentIndexValue> >::const_iterator it=vect.begin(); it!=vect.end(); it++) {
         if (it->second.IsNull()) {
             batch.Erase(make_pair(DB_SPENTINDEX, it->first));
@@ -179,7 +179,7 @@ bool CBlockTreeDB::UpdateSpentIndex(const std::vector<std::pair<CSpentIndexKey,
 }
 
 bool CBlockTreeDB::UpdateAddressUnspentIndex(const std::vector<std::pair<CAddressUnspentKey, CAddressUnspentValue > >&vect) {
-    CDBBatch batch(&GetObfuscateKey());
+    CDBBatch batch(*this);
     for (std::vector<std::pair<CAddressUnspentKey, CAddressUnspentValue> >::const_iterator it=vect.begin(); it!=vect.end(); it++) {
         if (it->second.IsNull()) {
             batch.Erase(make_pair(DB_ADDRESSUNSPENTINDEX, it->first));
@@ -217,14 +217,14 @@ bool CBlockTreeDB::ReadAddressUnspentIndex(uint160 addressHash, int type,
 }
 
 bool CBlockTreeDB::WriteAddressIndex(const std::vector<std::pair<CAddressIndexKey, CAmount > >&vect) {
-    CDBBatch batch(&GetObfuscateKey());
+    CDBBatch batch(*this);
     for (std::vector<std::pair<CAddressIndexKey, CAmount> >::const_iterator it=vect.begin(); it!=vect.end(); it++)
         batch.Write(make_pair(DB_ADDRESSINDEX, it->first), it->second);
     return WriteBatch(batch);
 }
 
 bool CBlockTreeDB::EraseAddressIndex(const std::vector<std::pair<CAddressIndexKey, CAmount > >&vect) {
-    CDBBatch batch(&GetObfuscateKey());
+    CDBBatch batch(*this);
     for (std::vector<std::pair<CAddressIndexKey, CAmount> >::const_iterator it=vect.begin(); it!=vect.end(); it++)
         batch.Erase(make_pair(DB_ADDRESSINDEX, it->first));
     return WriteBatch(batch);
@@ -265,7 +265,7 @@ bool CBlockTreeDB::ReadAddressIndex(uint160 addressHash, int type,
 }
 
 bool CBlockTreeDB::WriteTimestampIndex(const CTimestampIndexKey &timestampIndex) {
-    CDBBatch batch(&GetObfuscateKey());
+    CDBBatch batch(*this);
     batch.Write(make_pair(DB_TIMESTAMPINDEX, timestampIndex), 0);
     return WriteBatch(batch);
 }
@@ -281,7 +281,7 @@ bool CBlockTreeDB::ReadTimestampIndex(const unsigned int &high, const unsigned i
         std::pair<char, CTimestampIndexKey> key;
         if (pcursor->GetKey(key) && key.first == DB_TIMESTAMPINDEX && key.second.timestamp < high) {
             if (fActiveOnly) {
-                if (blockOnchainActive(key.second.blockHash)) {
+                if (HashOnchainActive(key.second.blockHash)) {
                     hashes.push_back(std::make_pair(key.second.blockHash, key.second.timestamp));
                 }
             } else {
@@ -298,7 +298,7 @@ bool CBlockTreeDB::ReadTimestampIndex(const unsigned int &high, const unsigned i
 }
 
 bool CBlockTreeDB::WriteTimestampBlockIndex(const CTimestampBlockIndexKey &blockhashIndex, const CTimestampBlockIndexValue &logicalts) {
-    CDBBatch batch(&GetObfuscateKey());
+    CDBBatch batch(*this);
     batch.Write(make_pair(DB_BLOCKHASHINDEX, blockhashIndex), logicalts);
     return WriteBatch(batch);
 }
@@ -325,16 +325,6 @@ bool CBlockTreeDB::ReadFlag(const std::string &name, bool &fValue) {
     return true;
 }
 
-bool CBlockTreeDB::blockOnchainActive(const uint256 &hash) {
-    CBlockIndex* pblockindex = mapBlockIndex[hash];
-    
-    if (!chainActive.Contains(pblockindex)) {
-        return false;
-    }
-    
-    return true;
-}
-
 bool CBlockTreeDB::LoadBlockIndexGuts(boost::function<CBlockIndex*(const uint256&)> insertBlockIndex)
 {
     std::unique_ptr<CDBIterator> pcursor(NewIterator());
diff --git a/src/txdb.h b/src/txdb.h
index ae9a2f30cf543..659362ab62bc2 100644
--- a/src/txdb.h
+++ b/src/txdb.h
@@ -6,9 +6,13 @@
 #ifndef BITCOIN_TXDB_H
 #define BITCOIN_TXDB_H
 
+#include "main.h"
 #include "coins.h"
 #include "dbwrapper.h"
 #include "chain.h"
+#include "addressindex.h"
+#include "spentindex.h"
+#include "timestampindex.h"
 
 #include <map>
 #include <string>
@@ -19,17 +23,6 @@
 
 class CBlockIndex;
 class CCoinsViewDBCursor;
-struct CAddressUnspentKey;
-struct CAddressUnspentValue;
-struct CAddressIndexKey;
-struct CAddressIndexIteratorKey;
-struct CAddressIndexIteratorHeightKey;
-struct CTimestampIndexKey;
-struct CTimestampIndexIteratorKey;
-struct CTimestampBlockIndexKey;
-struct CTimestampBlockIndexValue;
-struct CSpentIndexKey;
-struct CSpentIndexValue;
 class uint256;
 
 //! -dbcache default (MiB)
@@ -142,7 +135,6 @@ class CBlockTreeDB : public CDBWrapper
     bool WriteFlag(const std::string &name, bool fValue);
     bool ReadFlag(const std::string &name, bool &fValue);
     bool LoadBlockIndexGuts(boost::function<CBlockIndex*(const uint256&)> insertBlockIndex);
-    bool blockOnchainActive(const uint256 &hash);
 };
 
 #endif // BITCOIN_TXDB_H
diff --git a/src/validation.cpp b/src/validation.cpp
index 400ee066a1aa9..2e3896a4f2cc4 100644
--- a/src/validation.cpp
+++ b/src/validation.cpp
@@ -1073,6 +1073,17 @@ bool GetSpentIndex(CSpentIndexKey &key, CSpentIndexValue &value)
     return true;
 }
 
+bool HashOnchainActive(const uint256 &hash)
+{
+    CBlockIndex* pblockindex = mapBlockIndex[hash];
+
+    if (!chainActive.Contains(pblockindex)) {
+        return false;
+    }
+
+    return true;
+}
+
 bool GetAddressIndex(uint160 addressHash, int type,
                      std::vector<std::pair<CAddressIndexKey, CAmount> > &addressIndex, int start, int end)
 {
diff --git a/src/validation.h b/src/validation.h
index e8d7ffef7bbb1..79030ad3fc622 100644
--- a/src/validation.h
+++ b/src/validation.h
@@ -18,6 +18,8 @@
 #include "sync.h"
 #include "versionbits.h"
 #include "spentindex.h"
+#include "addressindex.h"
+#include "timestampindex.h"
 
 #include <algorithm>
 #include <exception>
@@ -342,338 +344,6 @@ ThresholdState VersionBitsTipState(const Consensus::Params& params, Consensus::D
 /** Get the block height at which the BIP9 deployment switched into the state for the block building on the current tip. */
 int VersionBitsTipStateSinceHeight(const Consensus::Params& params, Consensus::DeploymentPos pos);
 
-struct CTimestampIndexIteratorKey {
-    unsigned int timestamp;
-
-    size_t GetSerializeSize(int nType, int nVersion) const {
-        return 4;
-    }
-    template<typename Stream>
-    void Serialize(Stream& s, int nType, int nVersion) const {
-        ser_writedata32be(s, timestamp);
-    }
-    template<typename Stream>
-    void Unserialize(Stream& s, int nType, int nVersion) {
-        timestamp = ser_readdata32be(s);
-    }
-
-    CTimestampIndexIteratorKey(unsigned int time) {
-        timestamp = time;
-    }
-
-    CTimestampIndexIteratorKey() {
-        SetNull();
-    }
-
-    void SetNull() {
-        timestamp = 0;
-    }
-};
-
-struct CTimestampIndexKey {
-    unsigned int timestamp;
-    uint256 blockHash;
-
-    size_t GetSerializeSize(int nType, int nVersion) const {
-        return 36;
-    }
-    template<typename Stream>
-    void Serialize(Stream& s, int nType, int nVersion) const {
-        ser_writedata32be(s, timestamp);
-        blockHash.Serialize(s, nType, nVersion);
-    }
-    template<typename Stream>
-    void Unserialize(Stream& s, int nType, int nVersion) {
-        timestamp = ser_readdata32be(s);
-        blockHash.Unserialize(s, nType, nVersion);
-    }
-
-    CTimestampIndexKey(unsigned int time, uint256 hash) {
-        timestamp = time;
-        blockHash = hash;
-    }
-
-    CTimestampIndexKey() {
-        SetNull();
-    }
-
-    void SetNull() {
-        timestamp = 0;
-        blockHash.SetNull();
-    }
-};
-
-struct CTimestampBlockIndexKey {
-    uint256 blockHash;
-
-    size_t GetSerializeSize(int nType, int nVersion) const {
-        return 32;
-    }
-
-    template<typename Stream>
-    void Serialize(Stream& s, int nType, int nVersion) const {
-        blockHash.Serialize(s, nType, nVersion);
-    }
-
-    template<typename Stream>
-    void Unserialize(Stream& s, int nType, int nVersion) {
-        blockHash.Unserialize(s, nType, nVersion);
-    }
-
-    CTimestampBlockIndexKey(uint256 hash) {
-        blockHash = hash;
-    }
-
-    CTimestampBlockIndexKey() {
-        SetNull();
-    }
-
-    void SetNull() {
-        blockHash.SetNull();
-    }
-};
-
-struct CTimestampBlockIndexValue {
-    unsigned int ltimestamp;
-    size_t GetSerializeSize(int nType, int nVersion) const {
-        return 4;
-    }
-
-    template<typename Stream>
-    void Serialize(Stream& s, int nType, int nVersion) const {
-        ser_writedata32be(s, ltimestamp);
-    }
-
-    template<typename Stream>
-    void Unserialize(Stream& s, int nType, int nVersion) {
-        ltimestamp = ser_readdata32be(s);
-    }
-
-    CTimestampBlockIndexValue (unsigned int time) {
-        ltimestamp = time;
-    }
-
-    CTimestampBlockIndexValue() {
-        SetNull();
-    }
-
-    void SetNull() {
-        ltimestamp = 0;
-    }
-};
-
-struct CAddressUnspentKey {
-    unsigned int type;
-    uint160 hashBytes;
-    uint256 txhash;
-    size_t index;
-
-    size_t GetSerializeSize(int nType, int nVersion) const {
-        return 57;
-    }
-    template<typename Stream>
-    void Serialize(Stream& s, int nType, int nVersion) const {
-        ser_writedata8(s, type);
-        hashBytes.Serialize(s, nType, nVersion);
-        txhash.Serialize(s, nType, nVersion);
-        ser_writedata32(s, index);
-    }
-    template<typename Stream>
-    void Unserialize(Stream& s, int nType, int nVersion) {
-        type = ser_readdata8(s);
-        hashBytes.Unserialize(s, nType, nVersion);
-        txhash.Unserialize(s, nType, nVersion);
-        index = ser_readdata32(s);
-    }
-
-    CAddressUnspentKey(unsigned int addressType, uint160 addressHash, uint256 txid, size_t indexValue) {
-        type = addressType;
-        hashBytes = addressHash;
-        txhash = txid;
-        index = indexValue;
-    }
-
-    CAddressUnspentKey() {
-        SetNull();
-    }
-
-    void SetNull() {
-        type = 0;
-        hashBytes.SetNull();
-        txhash.SetNull();
-        index = 0;
-    }
-};
-
-struct CAddressUnspentValue {
-    CAmount satoshis;
-    CScript script;
-    int blockHeight;
-
-    ADD_SERIALIZE_METHODS;
-
-    template <typename Stream, typename Operation>
-    inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) {
-        READWRITE(satoshis);
-        READWRITE(*(CScriptBase*)(&script));
-        READWRITE(blockHeight);
-    }
-
-    CAddressUnspentValue(CAmount sats, CScript scriptPubKey, int height) {
-        satoshis = sats;
-        script = scriptPubKey;
-        blockHeight = height;
-    }
-
-    CAddressUnspentValue() {
-        SetNull();
-    }
-
-    void SetNull() {
-        satoshis = -1;
-        script.clear();
-        blockHeight = 0;
-    }
-
-    bool IsNull() const {
-        return (satoshis == -1);
-    }
-};
-
-struct CAddressIndexKey {
-    unsigned int type;
-    uint160 hashBytes;
-    int blockHeight;
-    unsigned int txindex;
-    uint256 txhash;
-    size_t index;
-    bool spending;
-
-    size_t GetSerializeSize(int nType, int nVersion) const {
-        return 66;
-    }
-    template<typename Stream>
-    void Serialize(Stream& s, int nType, int nVersion) const {
-        ser_writedata8(s, type);
-        hashBytes.Serialize(s, nType, nVersion);
-        // Heights are stored big-endian for key sorting in LevelDB
-        ser_writedata32be(s, blockHeight);
-        ser_writedata32be(s, txindex);
-        txhash.Serialize(s, nType, nVersion);
-        ser_writedata32(s, index);
-        char f = spending;
-        ser_writedata8(s, f);
-    }
-    template<typename Stream>
-    void Unserialize(Stream& s, int nType, int nVersion) {
-        type = ser_readdata8(s);
-        hashBytes.Unserialize(s, nType, nVersion);
-        blockHeight = ser_readdata32be(s);
-        txindex = ser_readdata32be(s);
-        txhash.Unserialize(s, nType, nVersion);
-        index = ser_readdata32(s);
-        char f = ser_readdata8(s);
-        spending = f;
-    }
-
-    CAddressIndexKey(unsigned int addressType, uint160 addressHash, int height, int blockindex,
-                     uint256 txid, size_t indexValue, bool isSpending) {
-        type = addressType;
-        hashBytes = addressHash;
-        blockHeight = height;
-        txindex = blockindex;
-        txhash = txid;
-        index = indexValue;
-        spending = isSpending;
-    }
-
-    CAddressIndexKey() {
-        SetNull();
-    }
-
-    void SetNull() {
-        type = 0;
-        hashBytes.SetNull();
-        blockHeight = 0;
-        txindex = 0;
-        txhash.SetNull();
-        index = 0;
-        spending = false;
-    }
-
-};
-
-struct CAddressIndexIteratorKey {
-    unsigned int type;
-    uint160 hashBytes;
-
-    size_t GetSerializeSize(int nType, int nVersion) const {
-        return 21;
-    }
-    template<typename Stream>
-    void Serialize(Stream& s, int nType, int nVersion) const {
-        ser_writedata8(s, type);
-        hashBytes.Serialize(s, nType, nVersion);
-    }
-    template<typename Stream>
-    void Unserialize(Stream& s, int nType, int nVersion) {
-        type = ser_readdata8(s);
-        hashBytes.Unserialize(s, nType, nVersion);
-    }
-
-    CAddressIndexIteratorKey(unsigned int addressType, uint160 addressHash) {
-        type = addressType;
-        hashBytes = addressHash;
-    }
-
-    CAddressIndexIteratorKey() {
-        SetNull();
-    }
-
-    void SetNull() {
-        type = 0;
-        hashBytes.SetNull();
-    }
-};
-
-struct CAddressIndexIteratorHeightKey {
-    unsigned int type;
-    uint160 hashBytes;
-    int blockHeight;
-
-    size_t GetSerializeSize(int nType, int nVersion) const {
-        return 25;
-    }
-    template<typename Stream>
-    void Serialize(Stream& s, int nType, int nVersion) const {
-        ser_writedata8(s, type);
-        hashBytes.Serialize(s, nType, nVersion);
-        ser_writedata32be(s, blockHeight);
-    }
-    template<typename Stream>
-    void Unserialize(Stream& s, int nType, int nVersion) {
-        type = ser_readdata8(s);
-        hashBytes.Unserialize(s, nType, nVersion);
-        blockHeight = ser_readdata32be(s);
-    }
-
-    CAddressIndexIteratorHeightKey(unsigned int addressType, uint160 addressHash, int height) {
-        type = addressType;
-        hashBytes = addressHash;
-        blockHeight = height;
-    }
-
-    CAddressIndexIteratorHeightKey() {
-        SetNull();
-    }
-
-    void SetNull() {
-        type = 0;
-        hashBytes.SetNull();
-        blockHeight = 0;
-    }
-};
-
 /** 
  * Count ECDSA signature operations the old-fashioned (pre-0.6) way
  * @return number of sigops this transaction's outputs will produce when spent
@@ -805,6 +475,7 @@ class CScriptCheck
 
 bool GetTimestampIndex(const unsigned int &high, const unsigned int &low, const bool fActiveOnly, std::vector<std::pair<uint256, unsigned int> > &hashes);
 bool GetSpentIndex(CSpentIndexKey &key, CSpentIndexValue &value);
+bool HashOnchainActive(const uint256 &hash);
 bool GetAddressIndex(uint160 addressHash, int type,
                      std::vector<std::pair<CAddressIndexKey, CAmount> > &addressIndex,
                      int start = 0, int end = 0);

From 9420cba46fb8cd6c69c781d1fca9e1d3964aa94b Mon Sep 17 00:00:00 2001
From: Braydon Fuller <braydon@bitpay.com>
Date: Wed, 5 Oct 2016 18:39:13 -0400
Subject: [PATCH 1792/1802] indexes: additional logging and checks for indexes

---
 src/init.cpp       | 18 ++++++++++++++++++
 src/validation.cpp |  6 ++++++
 src/validation.h   |  3 +++
 3 files changed, 27 insertions(+)

diff --git a/src/init.cpp b/src/init.cpp
index 1f0f682987c2a..ffd23addad05f 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -1467,6 +1467,24 @@ bool AppInitMain(boost::thread_group& threadGroup, CScheduler& scheduler)
                     break;
                 }
 
+                // Check for changed -addressindex state
+                if (fAddressIndex != GetBoolArg("-addressindex", DEFAULT_ADDRESSINDEX)) {
+                    strLoadError = _("You need to rebuild the database using -reindex-chainstate to change -addressindex");
+                    break;
+                }
+
+                // Check for changed -spentindex state
+                if (fSpentIndex != GetBoolArg("-spentindex", DEFAULT_SPENTINDEX)) {
+                    strLoadError = _("You need to rebuild the database using -reindex-chainstate to change -spentindex");
+                    break;
+                }
+
+                // Check for changed -timestampindex state
+                if (fTimestampIndex != GetBoolArg("-timestampindex", DEFAULT_TIMESTAMPINDEX)) {
+                    strLoadError = _("You need to rebuild the database using -reindex-chainstate to change -timestampindex");
+                    break;
+                }
+
                 // Check for changed -prune state.  What we are concerned about is a user who has pruned blocks
                 // in the past, but is now trying to run unpruned.
                 if (fHavePruned && !fPruneMode) {
diff --git a/src/validation.cpp b/src/validation.cpp
index 2e3896a4f2cc4..0bd6c50003960 100644
--- a/src/validation.cpp
+++ b/src/validation.cpp
@@ -1890,6 +1890,7 @@ static int64_t nTimeTotal = 0;
 bool ConnectBlock(const CBlock& block, CValidationState& state, CBlockIndex* pindex,
                   CCoinsViewCache& view, const CChainParams& chainparams, bool fJustCheck)
 {
+
     AssertLockHeld(cs_main);
 
     int64_t nTimeStart = GetTimeMicros();
@@ -4096,17 +4097,22 @@ bool InitBlockIndex(const CChainParams& chainparams)
     // Use the provided setting for -txindex in the new database
     fTxIndex = GetBoolArg("-txindex", DEFAULT_TXINDEX);
     pblocktree->WriteFlag("txindex", fTxIndex);
+    LogPrintf("%s: transaction index %s\n", __func__, fTxIndex ? "enabled" : "disabled");
 
     // Use the provided setting for -addressindex in the new database
     fAddressIndex = GetBoolArg("-addressindex", DEFAULT_ADDRESSINDEX);
     pblocktree->WriteFlag("addressindex", fAddressIndex);
+    LogPrintf("%s: address index %s\n", __func__, fAddressIndex ? "enabled" : "disabled");
 
     // Use the provided setting for -timestampindex in the new database
     fTimestampIndex = GetBoolArg("-timestampindex", DEFAULT_TIMESTAMPINDEX);
     pblocktree->WriteFlag("timestampindex", fTimestampIndex);
+    LogPrintf("%s: timestamp index %s\n", __func__, fTimestampIndex ? "enabled" : "disabled");
 
+    // Use the provided setting for -spentindex in the new database
     fSpentIndex = GetBoolArg("-spentindex", DEFAULT_SPENTINDEX);
     pblocktree->WriteFlag("spentindex", fSpentIndex);
+    LogPrintf("%s: spent index %s\n", __func__, fSpentIndex ? "enabled" : "disabled");
 
     LogPrintf("Initializing databases...\n");
 
diff --git a/src/validation.h b/src/validation.h
index 79030ad3fc622..6ce9ddc9bf202 100644
--- a/src/validation.h
+++ b/src/validation.h
@@ -173,6 +173,9 @@ extern std::atomic_bool fImporting;
 extern bool fReindex;
 extern int nScriptCheckThreads;
 extern bool fTxIndex;
+extern bool fAddressIndex;
+extern bool fSpentIndex;
+extern bool fTimestampIndex;
 extern bool fIsBareMultisigStd;
 extern bool fRequireStandard;
 extern bool fCheckBlockIndex;

From 5acd4254e05d8b63e08071260c6118d4f9ee4f9b Mon Sep 17 00:00:00 2001
From: Braydon Fuller <braydon@bitpay.com>
Date: Wed, 5 Oct 2016 18:39:57 -0400
Subject: [PATCH 1793/1802] tests: update rpc index tests for 0.13

---
 qa/rpc-tests/addressindex.py   | 52 +++++++++++++++++-----------------
 qa/rpc-tests/spentindex.py     | 38 +++++++++++++------------
 qa/rpc-tests/timestampindex.py | 12 ++++----
 3 files changed, 52 insertions(+), 50 deletions(-)

diff --git a/qa/rpc-tests/addressindex.py b/qa/rpc-tests/addressindex.py
index 8b0b6d38af41e..6968e0dca8133 100755
--- a/qa/rpc-tests/addressindex.py
+++ b/qa/rpc-tests/addressindex.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python3
 # Copyright (c) 2014-2015 The Bitcoin Core developers
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
@@ -36,7 +36,7 @@ def setup_network(self):
         self.sync_all()
 
     def run_test(self):
-        print "Mining blocks..."
+        print("Mining blocks...")
         self.nodes[0].generate(105)
         self.sync_all()
 
@@ -50,7 +50,7 @@ def run_test(self):
         assert_equal(balance0["balance"], 0)
 
         # Check p2pkh and p2sh address indexes
-        print "Testing p2pkh and p2sh address index..."
+        print("Testing p2pkh and p2sh address index...")
 
         txid0 = self.nodes[0].sendtoaddress("mo9ncXisMeAoXwqcV5EWuyncbmCcQN4rVs", 10)
         self.nodes[0].generate(1)
@@ -85,7 +85,7 @@ def run_test(self):
         assert_equal(txidsb[2], txidb2)
 
         # Check that limiting by height works
-        print "Testing querying txids by range of block heights.."
+        print("Testing querying txids by range of block heights..")
         height_txids = self.nodes[1].getaddresstxids({
             "addresses": ["2N2JD6wb56AfK4tfmM6PwdVmoYk2dCKf4Br"],
             "start": 105,
@@ -110,8 +110,8 @@ def run_test(self):
         assert_equal(balance0["balance"], 45 * 100000000)
 
         # Check that outputs with the same address will only return one txid
-        print "Testing for txid uniqueness..."
-        addressHash = "6349a418fc4578d10a372b54b45c280cc8c4382f".decode("hex")
+        print("Testing for txid uniqueness...")
+        addressHash = bytes([99,73,164,24,252,69,120,209,10,55,43,84,180,92,40,12,200,196,56,47])
         scriptPubKey = CScript([OP_HASH160, addressHash, OP_EQUAL])
         unspent = self.nodes[0].listunspent()
         tx = CTransaction()
@@ -130,22 +130,22 @@ def run_test(self):
         assert_equal(txidsmany[3], sent_txid)
 
         # Check that balances are correct
-        print "Testing balances..."
+        print("Testing balances...")
         balance0 = self.nodes[1].getaddressbalance("2N2JD6wb56AfK4tfmM6PwdVmoYk2dCKf4Br")
         assert_equal(balance0["balance"], 45 * 100000000 + 21)
 
         # Check that balances are correct after spending
-        print "Testing balances after spending..."
+        print("Testing balances after spending...")
         privkey2 = "cSdkPxkAjA4HDr5VHgsebAPDEh9Gyub4HK8UJr2DFGGqKKy4K5sG"
         address2 = "mgY65WSfEmsyYaYPQaXhmXMeBhwp4EcsQW"
-        addressHash2 = "0b2f0a0c31bfe0406b0ccc1381fdbe311946dadc".decode("hex")
+        addressHash2 = bytes([11,47,10,12,49,191,224,64,107,12,204,19,129,253,190,49,25,70,218,220])
         scriptPubKey2 = CScript([OP_DUP, OP_HASH160, addressHash2, OP_EQUALVERIFY, OP_CHECKSIG])
         self.nodes[0].importprivkey(privkey2)
 
         unspent = self.nodes[0].listunspent()
         tx = CTransaction()
         tx.vin = [CTxIn(COutPoint(int(unspent[0]["txid"], 16), unspent[0]["vout"]))]
-        amount = unspent[0]["amount"] * 100000000
+        amount = int(unspent[0]["amount"] * 100000000 - 100000)
         tx.vout = [CTxOut(amount, scriptPubKey2)]
         tx.rehash()
         signed_tx = self.nodes[0].signrawtransaction(binascii.hexlify(tx.serialize()).decode("utf-8"))
@@ -188,13 +188,13 @@ def run_test(self):
         assert_equal(len(deltas), 1)
 
         # Check that unspent outputs can be queried
-        print "Testing utxos..."
+        print("Testing utxos...")
         utxos = self.nodes[1].getaddressutxos({"addresses": [address2]})
         assert_equal(len(utxos), 1)
         assert_equal(utxos[0]["satoshis"], change_amount)
 
         # Check that indexes will be updated with a reorg
-        print "Testing reorg..."
+        print("Testing reorg...")
 
         best_hash = self.nodes[0].getbestblockhash()
         self.nodes[0].invalidateblock(best_hash)
@@ -226,11 +226,11 @@ def run_test(self):
         assert_equal(utxos3[2]["height"], 265)
 
         # Check mempool indexing
-        print "Testing mempool indexing..."
+        print("Testing mempool indexing...")
 
         privKey3 = "cVfUn53hAbRrDEuMexyfgDpZPhF7KqXpS8UZevsyTDaugB7HZ3CD"
         address3 = "mw4ynwhS7MmrQ27hr82kgqu7zryNDK26JB"
-        addressHash3 = "aa9872b5bbcdb511d89e0e11aa27da73fd2c3f50".decode("hex")
+        addressHash3 = bytes([170,152,114,181,187,205,181,17,216,158,14,17,170,39,218,115,253,44,63,80])
         scriptPubKey3 = CScript([OP_DUP, OP_HASH160, addressHash3, OP_EQUALVERIFY, OP_CHECKSIG])
         address4 = "2N8oFVB2vThAKury4vnLquW2zVjsYjjAkYQ"
         scriptPubKey4 = CScript([OP_HASH160, addressHash3, OP_EQUAL])
@@ -238,7 +238,7 @@ def run_test(self):
 
         tx = CTransaction()
         tx.vin = [CTxIn(COutPoint(int(unspent[0]["txid"], 16), unspent[0]["vout"]))]
-        amount = unspent[0]["amount"] * 100000000
+        amount = int(unspent[0]["amount"] * 100000000 - 100000)
         tx.vout = [CTxOut(amount, scriptPubKey3)]
         tx.rehash()
         signed_tx = self.nodes[2].signrawtransaction(binascii.hexlify(tx.serialize()).decode("utf-8"))
@@ -247,12 +247,12 @@ def run_test(self):
 
         tx2 = CTransaction()
         tx2.vin = [CTxIn(COutPoint(int(unspent[1]["txid"], 16), unspent[1]["vout"]))]
-        amount = unspent[1]["amount"] * 100000000
+        amount = int(unspent[1]["amount"] * 100000000 - 100000)
         tx2.vout = [
-            CTxOut(amount / 4, scriptPubKey3),
-            CTxOut(amount / 4, scriptPubKey3),
-            CTxOut(amount / 4, scriptPubKey4),
-            CTxOut(amount / 4, scriptPubKey4)
+            CTxOut(int(amount / 4), scriptPubKey3),
+            CTxOut(int(amount / 4), scriptPubKey3),
+            CTxOut(int(amount / 4), scriptPubKey4),
+            CTxOut(int(amount / 4), scriptPubKey4)
         ]
         tx2.rehash()
         signed_tx2 = self.nodes[2].signrawtransaction(binascii.hexlify(tx2.serialize()).decode("utf-8"))
@@ -269,7 +269,7 @@ def run_test(self):
         assert_equal(mempool[2]["txid"], memtxid2)
         assert_equal(mempool[2]["index"], 1)
 
-        self.nodes[2].generate(1);
+        blk_hashes = self.nodes[2].generate(1);
         self.sync_all();
         mempool2 = self.nodes[2].getaddressmempool({"addresses": [address3]})
         assert_equal(len(mempool2), 0)
@@ -279,7 +279,7 @@ def run_test(self):
             CTxIn(COutPoint(int(memtxid2, 16), 0)),
             CTxIn(COutPoint(int(memtxid2, 16), 1))
         ]
-        tx.vout = [CTxOut(amount / 2 - 10000, scriptPubKey2)]
+        tx.vout = [CTxOut(int(amount / 2 - 10000), scriptPubKey2)]
         tx.rehash()
         self.nodes[2].importprivkey(privKey3)
         signed_tx3 = self.nodes[2].signrawtransaction(binascii.hexlify(tx.serialize()).decode("utf-8"))
@@ -296,7 +296,7 @@ def run_test(self):
         # sending and receiving to the same address
         privkey1 = "cQY2s58LhzUCmEXN8jtAp1Etnijx78YRZ466w4ikX1V4UpTpbsf8"
         address1 = "myAUWSHnwsQrhuMWv4Br6QsCnpB41vFwHn"
-        address1hash = "c192bff751af8efec15135d42bfeedf91a6f3e34".decode("hex")
+        address1hash = bytes([193,146,191,247,81,175,142,254,193,81,53,212,43,254,237,249,26,111,62,52])
         address1script = CScript([OP_DUP, OP_HASH160, address1hash, OP_EQUALVERIFY, OP_CHECKSIG])
 
         self.nodes[0].sendtoaddress(address1, 10)
@@ -310,7 +310,7 @@ def run_test(self):
         tx.vin = [
             CTxIn(COutPoint(int(utxos[0]["txid"], 16), utxos[0]["outputIndex"]))
         ]
-        amount = utxos[0]["satoshis"] - 1000
+        amount = int(utxos[0]["satoshis"] - 1000)
         tx.vout = [CTxOut(amount, address1script)]
         tx.rehash()
         self.nodes[0].importprivkey(privkey1)
@@ -322,7 +322,7 @@ def run_test(self):
         assert_equal(len(mempool_deltas), 2)
 
         # Include chaininfo in results
-        print "Testing results with chain info..."
+        print("Testing results with chain info...")
 
         deltas_with_info = self.nodes[1].getaddressdeltas({
             "addresses": [address2],
@@ -342,7 +342,7 @@ def run_test(self):
         assert_equal(utxos_with_info["height"], 267)
         assert_equal(utxos_with_info["hash"], expected_tip_block_hash)
 
-        print "Passed\n"
+        print("Passed\n")
 
 
 if __name__ == '__main__':
diff --git a/qa/rpc-tests/spentindex.py b/qa/rpc-tests/spentindex.py
index 1366dbe315e4f..4119a11aef04e 100755
--- a/qa/rpc-tests/spentindex.py
+++ b/qa/rpc-tests/spentindex.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python3
 # Copyright (c) 2014-2015 The Bitcoin Core developers
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
@@ -36,7 +36,7 @@ def setup_network(self):
         self.sync_all()
 
     def run_test(self):
-        print "Mining blocks..."
+        print("Mining blocks...")
         self.nodes[0].generate(105)
         self.sync_all()
 
@@ -44,15 +44,16 @@ def run_test(self):
         assert_equal(chain_height, 105)
 
         # Check that
-        print "Testing spent index..."
+        print("Testing spent index...")
 
+        feeSatoshis = 10000
         privkey = "cSdkPxkAjA4HDr5VHgsebAPDEh9Gyub4HK8UJr2DFGGqKKy4K5sG"
         address = "mgY65WSfEmsyYaYPQaXhmXMeBhwp4EcsQW"
-        addressHash = "0b2f0a0c31bfe0406b0ccc1381fdbe311946dadc".decode("hex")
+        addressHash = bytes([11,47,10,12,49,191,224,64,107,12,204,19,129,253,190,49,25,70,218,220])
         scriptPubKey = CScript([OP_DUP, OP_HASH160, addressHash, OP_EQUALVERIFY, OP_CHECKSIG])
         unspent = self.nodes[0].listunspent()
         tx = CTransaction()
-        amount = unspent[0]["amount"] * 100000000
+        amount = int(unspent[0]["amount"] * 100000000 - feeSatoshis)
         tx.vin = [CTxIn(COutPoint(int(unspent[0]["txid"], 16), unspent[0]["vout"]))]
         tx.vout = [CTxOut(amount, scriptPubKey)]
         tx.rehash()
@@ -62,7 +63,7 @@ def run_test(self):
         self.nodes[0].generate(1)
         self.sync_all()
 
-        print "Testing getspentinfo method..."
+        print("Testing getspentinfo method...")
 
         # Check that the spentinfo works standalone
         info = self.nodes[1].getspentinfo({"txid": unspent[0]["txid"], "index": unspent[0]["vout"]})
@@ -70,7 +71,7 @@ def run_test(self):
         assert_equal(info["index"], 0)
         assert_equal(info["height"], 106)
 
-        print "Testing getrawtransaction method..."
+        print("Testing getrawtransaction method...")
 
         # Check that verbose raw transaction includes spent info
         txVerbose = self.nodes[3].getrawtransaction(unspent[0]["txid"], 1)
@@ -80,16 +81,17 @@ def run_test(self):
 
         # Check that verbose raw transaction includes input values
         txVerbose2 = self.nodes[3].getrawtransaction(txid, 1)
-        assert_equal(txVerbose2["vin"][0]["value"], Decimal(unspent[0]["amount"]))
-        assert_equal(txVerbose2["vin"][0]["valueSat"], amount)
+        assert_equal(float(txVerbose2["vin"][0]["value"]), (amount + feeSatoshis) / 100000000)
+        assert_equal(txVerbose2["vin"][0]["valueSat"], amount + feeSatoshis)
 
         # Check that verbose raw transaction includes address values and input values
         privkey2 = "cSdkPxkAjA4HDr5VHgsebAPDEh9Gyub4HK8UJr2DFGGqKKy4K5sG"
         address2 = "mgY65WSfEmsyYaYPQaXhmXMeBhwp4EcsQW"
-        addressHash2 = "0b2f0a0c31bfe0406b0ccc1381fdbe311946dadc".decode("hex")
+        addressHash2 = bytes([11,47,10,12,49,191,224,64,107,12,204,19,129,253,190,49,25,70,218,220])
         scriptPubKey2 = CScript([OP_DUP, OP_HASH160, addressHash2, OP_EQUALVERIFY, OP_CHECKSIG])
         tx2 = CTransaction()
         tx2.vin = [CTxIn(COutPoint(int(txid, 16), 0))]
+        amount = int(amount - feeSatoshis);
         tx2.vout = [CTxOut(amount, scriptPubKey2)]
         tx.rehash()
         self.nodes[0].importprivkey(privkey)
@@ -100,8 +102,9 @@ def run_test(self):
         self.sync_all()
         txVerbose3 = self.nodes[1].getrawtransaction(txid2, 1)
         assert_equal(txVerbose3["vin"][0]["address"], address2)
-        assert_equal(txVerbose3["vin"][0]["value"], Decimal(unspent[0]["amount"]))
-        assert_equal(txVerbose3["vin"][0]["valueSat"], amount)
+        assert_equal(txVerbose3["vin"][0]["valueSat"], amount + feeSatoshis)
+        assert_equal(float(txVerbose3["vin"][0]["value"]), (amount + feeSatoshis) / 100000000)
+
 
         # Check the database index
         block_hash = self.nodes[0].generate(1)
@@ -109,12 +112,11 @@ def run_test(self):
 
         txVerbose4 = self.nodes[3].getrawtransaction(txid2, 1)
         assert_equal(txVerbose4["vin"][0]["address"], address2)
-        assert_equal(txVerbose4["vin"][0]["value"], Decimal(unspent[0]["amount"]))
-        assert_equal(txVerbose4["vin"][0]["valueSat"], amount)
-
+        assert_equal(txVerbose4["vin"][0]["valueSat"], amount + feeSatoshis)
+        assert_equal(float(txVerbose4["vin"][0]["value"]), (amount + feeSatoshis) / 100000000)
 
         # Check block deltas
-        print "Testing getblockdeltas..."
+        print("Testing getblockdeltas...")
 
         block = self.nodes[3].getblockdeltas(block_hash[0])
         assert_equal(len(block["deltas"]), 2)
@@ -125,14 +127,14 @@ def run_test(self):
         assert_equal(block["deltas"][1]["txid"], txid2)
         assert_equal(block["deltas"][1]["inputs"][0]["index"], 0)
         assert_equal(block["deltas"][1]["inputs"][0]["address"], "mgY65WSfEmsyYaYPQaXhmXMeBhwp4EcsQW")
-        assert_equal(block["deltas"][1]["inputs"][0]["satoshis"], amount * -1)
+        assert_equal(block["deltas"][1]["inputs"][0]["satoshis"], (amount + feeSatoshis) * -1)
         assert_equal(block["deltas"][1]["inputs"][0]["prevtxid"], txid)
         assert_equal(block["deltas"][1]["inputs"][0]["prevout"], 0)
         assert_equal(block["deltas"][1]["outputs"][0]["index"], 0)
         assert_equal(block["deltas"][1]["outputs"][0]["address"], "mgY65WSfEmsyYaYPQaXhmXMeBhwp4EcsQW")
         assert_equal(block["deltas"][1]["outputs"][0]["satoshis"], amount)
 
-        print "Passed\n"
+        print("Passed\n")
 
 
 if __name__ == '__main__':
diff --git a/qa/rpc-tests/timestampindex.py b/qa/rpc-tests/timestampindex.py
index 289c81b2a5212..85942b7ef6929 100755
--- a/qa/rpc-tests/timestampindex.py
+++ b/qa/rpc-tests/timestampindex.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python3
 # Copyright (c) 2014-2015 The Bitcoin Core developers
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
@@ -35,26 +35,26 @@ def setup_network(self):
         self.sync_all()
 
     def run_test(self):
-        print "Mining 25 blocks..."
+        print("Mining 25 blocks...")
         blockhashes = self.nodes[0].generate(25)
         time.sleep(3)
-        print "Mining 25 blocks..."
+        print("Mining 25 blocks...")
         blockhashes.extend(self.nodes[0].generate(25))
         time.sleep(3)
-        print "Mining 25 blocks..."
+        print("Mining 25 blocks...")
         blockhashes.extend(self.nodes[0].generate(25))
         self.sync_all()
         low = self.nodes[1].getblock(blockhashes[0])["time"]
         high = low + 76
 
-        print "Checking timestamp index..."
+        print("Checking timestamp index...")
         hashes = self.nodes[1].getblockhashes(high, low)
 
         assert_equal(len(hashes), len(blockhashes))
 
         assert_equal(hashes, blockhashes)
 
-        print "Passed\n"
+        print("Passed\n")
 
 
 if __name__ == '__main__':

From 6f1ebe9eb256b46eea428a5eeb3a55fbfcb8cc4a Mon Sep 17 00:00:00 2001
From: Braydon Fuller <braydon@bitpay.com>
Date: Wed, 13 Jul 2016 18:38:04 -0400
Subject: [PATCH 1794/1802] db: add options to configure block index database

There was a previous assumption that blockindex would be quite small. With addressindex
and spentindex enabled the blockindex is much larger and the amount of cache allocated for
it should also increase. Furthermore, enabling compression should decrease the amount of
disk space required and less data to write/read. The default leveldb max_open_files is set to
1000, for the blockindex the default is set to 1000 with compression. The 64 value that is
current is kept for the utxo database and does not enable compression. Two additional options
are added here to be able to configure the values for leveldb and the block index:

- `-dbmaxopenfiles` A number of files for leveldb to keep open
- `-dbcompression` Boolean 0 or 1 to enable snappy leveldb compression

Conflicts:
	src/dbwrapper.cpp
	src/init.cpp
---
 src/dbwrapper.cpp | 10 +++++-----
 src/dbwrapper.h   | 16 +++++++++-------
 src/init.cpp      | 19 +++++++++++++++++--
 src/txdb.cpp      |  4 ++--
 src/txdb.h        |  2 +-
 src/validation.h  |  2 ++
 6 files changed, 36 insertions(+), 17 deletions(-)

diff --git a/src/dbwrapper.cpp b/src/dbwrapper.cpp
index 94ebedeb72afd..66ce78d015ec5 100644
--- a/src/dbwrapper.cpp
+++ b/src/dbwrapper.cpp
@@ -15,14 +15,14 @@
 #include <memenv.h>
 #include <stdint.h>
 
-static leveldb::Options GetOptions(size_t nCacheSize)
+static leveldb::Options GetOptions(size_t nCacheSize, bool compression, int maxOpenFiles)
 {
     leveldb::Options options;
     options.block_cache = leveldb::NewLRUCache(nCacheSize / 2);
     options.write_buffer_size = nCacheSize / 4; // up to two write buffers may be held in memory simultaneously
     options.filter_policy = leveldb::NewBloomFilterPolicy(10);
-    options.compression = leveldb::kNoCompression;
-    options.max_open_files = 64;
+    options.compression = compression ? leveldb::kSnappyCompression : leveldb::kNoCompression;
+    options.max_open_files = maxOpenFiles;
     if (leveldb::kMajorVersion > 1 || (leveldb::kMajorVersion == 1 && leveldb::kMinorVersion >= 16)) {
         // LevelDB versions before 1.16 consider short writes to be corruption. Only trigger error
         // on corruption in later versions.
@@ -31,14 +31,14 @@ static leveldb::Options GetOptions(size_t nCacheSize)
     return options;
 }
 
-CDBWrapper::CDBWrapper(const boost::filesystem::path& path, size_t nCacheSize, bool fMemory, bool fWipe, bool obfuscate)
+CDBWrapper::CDBWrapper(const boost::filesystem::path& path, size_t nCacheSize, bool fMemory, bool fWipe, bool obfuscate, bool compression, int maxOpenFiles)
 {
     penv = NULL;
     readoptions.verify_checksums = true;
     iteroptions.verify_checksums = true;
     iteroptions.fill_cache = false;
     syncoptions.sync = true;
-    options = GetOptions(nCacheSize);
+    options = GetOptions(nCacheSize, compression, maxOpenFiles);
     options.create_if_missing = true;
     if (fMemory) {
         penv = leveldb::NewMemEnv(leveldb::Env::Default());
diff --git a/src/dbwrapper.h b/src/dbwrapper.h
index dd59cc00ff095..76b0747d8980c 100644
--- a/src/dbwrapper.h
+++ b/src/dbwrapper.h
@@ -192,14 +192,16 @@ class CDBWrapper
 
 public:
     /**
-     * @param[in] path        Location in the filesystem where leveldb data will be stored.
-     * @param[in] nCacheSize  Configures various leveldb cache settings.
-     * @param[in] fMemory     If true, use leveldb's memory environment.
-     * @param[in] fWipe       If true, remove all existing data.
-     * @param[in] obfuscate   If true, store data obfuscated via simple XOR. If false, XOR
-     *                        with a zero'd byte array.
+     * @param[in] path          Location in the filesystem where leveldb data will be stored.
+     * @param[in] nCacheSize    Configures various leveldb cache settings.
+     * @param[in] fMemory       If true, use leveldb's memory environment.
+     * @param[in] fWipe         If true, remove all existing data.
+     * @param[in] obfuscate     If true, store data obfuscated via simple XOR. If false, XOR
+     *                          with a zero'd byte array.
+     * @param[in] compression   Enable snappy compression for the database
+     * @param[in] maxOpenFiles  The maximum number of open files for the database
      */
-    CDBWrapper(const boost::filesystem::path& path, size_t nCacheSize, bool fMemory = false, bool fWipe = false, bool obfuscate = false);
+    CDBWrapper(const boost::filesystem::path& path, size_t nCacheSize, bool fMemory = false, bool fWipe = false, bool obfuscate = false, bool compression = false, int maxOpenFiles = 64);
     ~CDBWrapper();
 
     template <typename K, typename V>
diff --git a/src/init.cpp b/src/init.cpp
index ffd23addad05f..b3a35606734f0 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -1400,12 +1400,25 @@ bool AppInitMain(boost::thread_group& threadGroup, CScheduler& scheduler)
         }
     }
 
+    // block tree db settings
+    int dbMaxOpenFiles = GetArg("-dbmaxopenfiles", DEFAULT_DB_MAX_OPEN_FILES);
+    bool dbCompression = GetBoolArg("-dbcompression", DEFAULT_DB_COMPRESSION);
+
+    LogPrintf("Block index database configuration:\n");
+    LogPrintf("* Using %d max open files\n", dbMaxOpenFiles);
+    LogPrintf("* Compression is %s\n", dbCompression ? "enabled" : "disabled");
+
     // cache size calculations
     int64_t nTotalCache = (GetArg("-dbcache", nDefaultDbCache) << 20);
     nTotalCache = std::max(nTotalCache, nMinDbCache << 20); // total cache cannot be less than nMinDbCache
     nTotalCache = std::min(nTotalCache, nMaxDbCache << 20); // total cache cannot be greater than nMaxDbcache
     int64_t nBlockTreeDBCache = nTotalCache / 8;
-    nBlockTreeDBCache = std::min(nBlockTreeDBCache, (GetBoolArg("-txindex", DEFAULT_TXINDEX) ? nMaxBlockDBAndTxIndexCache : nMaxBlockDBCache) << 20);
+    if (GetBoolArg("-addressindex", DEFAULT_ADDRESSINDEX) || GetBoolArg("-spentindex", DEFAULT_SPENTINDEX)) {
+        // enable 3/4 of the cache if addressindex and/or spentindex is enabled
+        nBlockTreeDBCache = nTotalCache * 3 / 4;
+    } else {
+        nBlockTreeDBCache = std::min(nBlockTreeDBCache, (GetBoolArg("-txindex", DEFAULT_TXINDEX) ? nMaxBlockDBAndTxIndexCache : nMaxBlockDBCache) << 20);
+    }
     nTotalCache -= nBlockTreeDBCache;
     int64_t nCoinDBCache = std::min(nTotalCache / 2, (nTotalCache / 4) + (1 << 23)); // use 25%-50% of the remainder for disk cache
     nCoinDBCache = std::min(nCoinDBCache, nMaxCoinsDBCache << 20); // cap total coins db cache
@@ -1413,6 +1426,7 @@ bool AppInitMain(boost::thread_group& threadGroup, CScheduler& scheduler)
     nCoinCacheUsage = nTotalCache; // the rest goes to in-memory cache
     int64_t nMempoolSizeMax = GetArg("-maxmempool", DEFAULT_MAX_MEMPOOL_SIZE) * 1000000;
     LogPrintf("Cache configuration:\n");
+    LogPrintf("* Max cache setting possible %.1fMiB\n", nMaxDbCache);
     LogPrintf("* Using %.1fMiB for block index database\n", nBlockTreeDBCache * (1.0 / 1024 / 1024));
     LogPrintf("* Using %.1fMiB for chain state database\n", nCoinDBCache * (1.0 / 1024 / 1024));
     LogPrintf("* Using %.1fMiB for in-memory UTXO set (plus up to %.1fMiB of unused mempool space)\n", nCoinCacheUsage * (1.0 / 1024 / 1024), nMempoolSizeMax * (1.0 / 1024 / 1024));
@@ -1433,8 +1447,9 @@ bool AppInitMain(boost::thread_group& threadGroup, CScheduler& scheduler)
                 delete pcoinscatcher;
                 delete pblocktree;
 
-                pblocktree = new CBlockTreeDB(nBlockTreeDBCache, false, fReindex);
+                pblocktree = new CBlockTreeDB(nBlockTreeDBCache, false, fReindex, dbCompression, dbMaxOpenFiles);
                 pcoinsdbview = new CCoinsViewDB(nCoinDBCache, false, fReindex || fReindexChainState);
+
                 pcoinscatcher = new CCoinsViewErrorCatcher(pcoinsdbview);
                 pcoinsTip = new CCoinsViewCache(pcoinscatcher);
 
diff --git a/src/txdb.cpp b/src/txdb.cpp
index 2f3d32b1ad13b..741642657aac5 100644
--- a/src/txdb.cpp
+++ b/src/txdb.cpp
@@ -30,7 +30,7 @@ static const char DB_REINDEX_FLAG = 'R';
 static const char DB_LAST_BLOCK = 'l';
 
 
-CCoinsViewDB::CCoinsViewDB(size_t nCacheSize, bool fMemory, bool fWipe) : db(GetDataDir() / "chainstate", nCacheSize, fMemory, fWipe, true) 
+CCoinsViewDB::CCoinsViewDB(size_t nCacheSize, bool fMemory, bool fWipe) : db(GetDataDir() / "chainstate", nCacheSize, fMemory, fWipe, true, false, 64)
 {
 }
 
@@ -72,7 +72,7 @@ bool CCoinsViewDB::BatchWrite(CCoinsMap &mapCoins, const uint256 &hashBlock) {
     return db.WriteBatch(batch);
 }
 
-CBlockTreeDB::CBlockTreeDB(size_t nCacheSize, bool fMemory, bool fWipe) : CDBWrapper(GetDataDir() / "blocks" / "index", nCacheSize, fMemory, fWipe) {
+CBlockTreeDB::CBlockTreeDB(size_t nCacheSize, bool fMemory, bool fWipe, bool compression, int maxOpenFiles) : CDBWrapper(GetDataDir() / "blocks" / "index", nCacheSize, fMemory, fWipe, false, compression, maxOpenFiles) {
 }
 
 bool CBlockTreeDB::ReadBlockFileInfo(int nFile, CBlockFileInfo &info) {
diff --git a/src/txdb.h b/src/txdb.h
index 659362ab62bc2..4376ad369b588 100644
--- a/src/txdb.h
+++ b/src/txdb.h
@@ -106,7 +106,7 @@ class CCoinsViewDBCursor: public CCoinsViewCursor
 class CBlockTreeDB : public CDBWrapper
 {
 public:
-    CBlockTreeDB(size_t nCacheSize, bool fMemory = false, bool fWipe = false);
+    CBlockTreeDB(size_t nCacheSize, bool fMemory = false, bool fWipe = false, bool compression = true, int maxOpenFiles = 1000);
 private:
     CBlockTreeDB(const CBlockTreeDB&);
     void operator=(const CBlockTreeDB&);
diff --git a/src/validation.h b/src/validation.h
index 6ce9ddc9bf202..b072440a33a64 100644
--- a/src/validation.h
+++ b/src/validation.h
@@ -138,6 +138,8 @@ static const bool DEFAULT_TXINDEX = false;
 static const bool DEFAULT_ADDRESSINDEX = false;
 static const bool DEFAULT_TIMESTAMPINDEX = false;
 static const bool DEFAULT_SPENTINDEX = false;
+static const unsigned int DEFAULT_DB_MAX_OPEN_FILES = 1000;
+static const bool DEFAULT_DB_COMPRESSION = true;
 static const unsigned int DEFAULT_BANSCORE_THRESHOLD = 100;
 
 /** Default for -mempoolreplacement */

From 59738d909f09d50d689a35a157cf496094ebddb0 Mon Sep 17 00:00:00 2001
From: Braydon Fuller <braydon@bitpay.com>
Date: Thu, 14 Jul 2016 16:30:31 -0400
Subject: [PATCH 1795/1802] tests: test dbwrapper options compression and
 maxopenfiles

---
 src/test/dbwrapper_tests.cpp | 43 ++++++++++++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)

diff --git a/src/test/dbwrapper_tests.cpp b/src/test/dbwrapper_tests.cpp
index d5d158027b1ea..a6661270f1936 100644
--- a/src/test/dbwrapper_tests.cpp
+++ b/src/test/dbwrapper_tests.cpp
@@ -43,6 +43,49 @@ BOOST_AUTO_TEST_CASE(dbwrapper)
     }
 }
 
+BOOST_AUTO_TEST_CASE(dbwrapper_compression)
+{
+    // Perform tests both with compression and without
+    for (int i = 0; i < 2; i++) {
+        bool compression = (bool)i;
+        path ph = temp_directory_path() / unique_path();
+        CDBWrapper dbw(ph, (1 << 20), true, false, false, compression);
+        char key = 'k';
+        uint256 in = GetRandHash();
+        uint256 res;
+
+        BOOST_CHECK(dbw.Write(key, in));
+        BOOST_CHECK(dbw.Read(key, res));
+        BOOST_CHECK_EQUAL(res.ToString(), in.ToString());
+    }
+}
+
+BOOST_AUTO_TEST_CASE(dbwrapper_maxopenfiles_64)
+{
+    path ph = temp_directory_path() / unique_path();
+    CDBWrapper dbw(ph, (1 << 20), true, false, false, false, 64);
+    char key = 'k';
+    uint256 in = GetRandHash();
+    uint256 res;
+
+    BOOST_CHECK(dbw.Write(key, in));
+    BOOST_CHECK(dbw.Read(key, res));
+    BOOST_CHECK_EQUAL(res.ToString(), in.ToString());
+}
+
+BOOST_AUTO_TEST_CASE(dbwrapper_maxopenfiles_1000)
+{
+    path ph = temp_directory_path() / unique_path();
+    CDBWrapper dbw(ph, (1 << 20), true, false, false, false, 1000);
+    char key = 'k';
+    uint256 in = GetRandHash();
+    uint256 res;
+
+    BOOST_CHECK(dbw.Write(key, in));
+    BOOST_CHECK(dbw.Read(key, res));
+    BOOST_CHECK_EQUAL(res.ToString(), in.ToString());
+}
+
 // Test batch operations
 BOOST_AUTO_TEST_CASE(dbwrapper_batch)
 {

From 9891651d0890d014b53708d9fac85c32018249be Mon Sep 17 00:00:00 2001
From: Braydon Fuller <braydon@bitpay.com>
Date: Wed, 5 Oct 2016 20:24:42 -0400
Subject: [PATCH 1796/1802] doc: optional dbmaxopenfiles and dbcompression

---
 contrib/devtools/check-doc.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contrib/devtools/check-doc.py b/contrib/devtools/check-doc.py
index 249214e9318de..69a5c220e9555 100755
--- a/contrib/devtools/check-doc.py
+++ b/contrib/devtools/check-doc.py
@@ -21,7 +21,7 @@
 REGEX_ARG = re.compile(r'(?:map(?:Multi)?Args(?:\.count\(|\[)|Get(?:Bool)?Arg\()\"(\-[^\"]+?)\"')
 REGEX_DOC = re.compile(r'HelpMessageOpt\(\"(\-[^\"=]+?)(?:=|\")')
 # list unsupported, deprecated and duplicate args as they need no documentation
-SET_DOC_OPTIONAL = set(['-rpcssl', '-benchmark', '-h', '-help', '-socks', '-tor', '-debugnet', '-whitelistalwaysrelay', '-prematurewitness', '-walletprematurewitness', '-promiscuousmempoolflags', '-blockminsize'])
+SET_DOC_OPTIONAL = set(['-rpcssl', '-benchmark', '-h', '-help', '-socks', '-tor', '-debugnet', '-whitelistalwaysrelay', '-prematurewitness', '-walletprematurewitness', '-promiscuousmempoolflags', '-blockminsize', '-dbmaxopenfiles', '-dbcompression'])
 
 def main():
   used = check_output(CMD_GREP_ARGS, shell=True)

From 9c1ea9605649df292540d0b12822f5d3ff52d2e1 Mon Sep 17 00:00:00 2001
From: Braydon Fuller <courier@braydon.com>
Date: Thu, 6 Oct 2016 22:04:59 -0400
Subject: [PATCH 1797/1802] tests: include and fix txindex test with rpc tests

---
 qa/pull-tester/rpc-tests.py |  1 +
 qa/rpc-tests/txindex.py     | 12 ++++++------
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/qa/pull-tester/rpc-tests.py b/qa/pull-tester/rpc-tests.py
index 8a3422c99ef66..5cb0862326a21 100755
--- a/qa/pull-tester/rpc-tests.py
+++ b/qa/pull-tester/rpc-tests.py
@@ -140,6 +140,7 @@
     'addressindex.py',
     'timestampindex.py',
     'spentindex.py',
+    'txindex.py',
     'decodescript.py',
     'blockchain.py',
     'disablewallet.py',
diff --git a/qa/rpc-tests/txindex.py b/qa/rpc-tests/txindex.py
index b139253b769ec..08e176c96bfa9 100755
--- a/qa/rpc-tests/txindex.py
+++ b/qa/rpc-tests/txindex.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python3
 # Copyright (c) 2014-2015 The Bitcoin Core developers
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
@@ -36,22 +36,22 @@ def setup_network(self):
         self.sync_all()
 
     def run_test(self):
-        print "Mining blocks..."
+        print("Mining blocks...")
         self.nodes[0].generate(105)
         self.sync_all()
 
         chain_height = self.nodes[1].getblockcount()
         assert_equal(chain_height, 105)
 
-        print "Testing transaction index..."
+        print("Testing transaction index...")
 
         privkey = "cSdkPxkAjA4HDr5VHgsebAPDEh9Gyub4HK8UJr2DFGGqKKy4K5sG"
         address = "mgY65WSfEmsyYaYPQaXhmXMeBhwp4EcsQW"
-        addressHash = "0b2f0a0c31bfe0406b0ccc1381fdbe311946dadc".decode("hex")
+        addressHash = bytes([11,47,10,12,49,191,224,64,107,12,204,19,129,253,190,49,25,70,218,220])
         scriptPubKey = CScript([OP_DUP, OP_HASH160, addressHash, OP_EQUALVERIFY, OP_CHECKSIG])
         unspent = self.nodes[0].listunspent()
         tx = CTransaction()
-        amount = unspent[0]["amount"] * 100000000
+        amount = int(unspent[0]["amount"] * 100000000)
         tx.vin = [CTxIn(COutPoint(int(unspent[0]["txid"], 16), unspent[0]["vout"]))]
         tx.vout = [CTxOut(amount, scriptPubKey)]
         tx.rehash()
@@ -66,7 +66,7 @@ def run_test(self):
         assert_equal(verbose["vout"][0]["valueSat"], 5000000000);
         assert_equal(verbose["vout"][0]["value"], 50);
 
-        print "Passed\n"
+        print("Passed\n")
 
 
 if __name__ == '__main__':

From 06efaec9ee48aeeebd42dfbd39019539d9ec07e8 Mon Sep 17 00:00:00 2001
From: Braydon Fuller <braydon@bitpay.com>
Date: Fri, 7 Oct 2016 11:49:40 -0400
Subject: [PATCH 1798/1802] build: include timestampindex.h in makefile

---
 src/Makefile.am | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Makefile.am b/src/Makefile.am
index 7fe329575137f..3f0719a48c0ec 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -79,6 +79,7 @@ BITCOIN_CORE_H = \
   addrdb.h \
   addressindex.h \
   spentindex.h \
+  timestampindex.h \
   addrman.h \
   base58.h \
   bloom.h \

From 539d7ec19ec3f6c790934ef50e78cfa26e9393b1 Mon Sep 17 00:00:00 2001
From: Karel Bilek <kb@karelbilek.com>
Date: Sun, 2 Apr 2017 02:11:09 +0200
Subject: [PATCH 1799/1802] Bitcore 0.14.0 fixes

---
 qa/rpc-tests/txindex.py      |  2 +-
 src/addressindex.h           | 50 +++++++++++++--------------
 src/rpc/blockchain.cpp       | 28 +++++++--------
 src/rpc/client.cpp           | 18 +++++-----
 src/rpc/misc.cpp             | 67 +++++++++++++++++++-----------------
 src/rpc/rawtransaction.cpp   | 10 +++---
 src/spentindex.h             |  4 +--
 src/test/dbwrapper_tests.cpp |  6 ++--
 src/timestampindex.h         | 32 ++++++++---------
 src/txdb.cpp                 | 31 +++++++++--------
 src/txdb.h                   |  1 -
 src/txmempool.cpp            | 28 +++++++--------
 src/validation.cpp           | 53 +++++++++++++++-------------
 13 files changed, 169 insertions(+), 161 deletions(-)

diff --git a/qa/rpc-tests/txindex.py b/qa/rpc-tests/txindex.py
index 08e176c96bfa9..49012ccd06ef9 100755
--- a/qa/rpc-tests/txindex.py
+++ b/qa/rpc-tests/txindex.py
@@ -51,7 +51,7 @@ def run_test(self):
         scriptPubKey = CScript([OP_DUP, OP_HASH160, addressHash, OP_EQUALVERIFY, OP_CHECKSIG])
         unspent = self.nodes[0].listunspent()
         tx = CTransaction()
-        amount = int(unspent[0]["amount"] * 100000000)
+        amount = int(unspent[0]["amount"] * 10000000)
         tx.vin = [CTxIn(COutPoint(int(unspent[0]["txid"], 16), unspent[0]["vout"]))]
         tx.vout = [CTxOut(amount, scriptPubKey)]
         tx.rehash()
diff --git a/src/addressindex.h b/src/addressindex.h
index dbb09c7fe9b4c..bc10605833bb2 100644
--- a/src/addressindex.h
+++ b/src/addressindex.h
@@ -16,21 +16,21 @@ struct CAddressUnspentKey {
     uint256 txhash;
     size_t index;
 
-    size_t GetSerializeSize(int nType, int nVersion) const {
+    size_t GetSerializeSize() const {
         return 57;
     }
     template<typename Stream>
-    void Serialize(Stream& s, int nType, int nVersion) const {
+    void Serialize(Stream& s) const {
         ser_writedata8(s, type);
-        hashBytes.Serialize(s, nType, nVersion);
-        txhash.Serialize(s, nType, nVersion);
+        hashBytes.Serialize(s);
+        txhash.Serialize(s);
         ser_writedata32(s, index);
     }
     template<typename Stream>
-    void Unserialize(Stream& s, int nType, int nVersion) {
+    void Unserialize(Stream& s) {
         type = ser_readdata8(s);
-        hashBytes.Unserialize(s, nType, nVersion);
-        txhash.Unserialize(s, nType, nVersion);
+        hashBytes.Unserialize(s);
+        txhash.Unserialize(s);
         index = ser_readdata32(s);
     }
 
@@ -61,7 +61,7 @@ struct CAddressUnspentValue {
     ADD_SERIALIZE_METHODS;
 
     template <typename Stream, typename Operation>
-    inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) {
+    inline void SerializationOp(Stream& s, Operation ser_action) {
         READWRITE(satoshis);
         READWRITE(*(CScriptBase*)(&script));
         READWRITE(blockHeight);
@@ -97,28 +97,28 @@ struct CAddressIndexKey {
     size_t index;
     bool spending;
 
-    size_t GetSerializeSize(int nType, int nVersion) const {
+    size_t GetSerializeSize() const {
         return 66;
     }
     template<typename Stream>
-    void Serialize(Stream& s, int nType, int nVersion) const {
+    void Serialize(Stream& s) const {
         ser_writedata8(s, type);
-        hashBytes.Serialize(s, nType, nVersion);
+        hashBytes.Serialize(s);
         // Heights are stored big-endian for key sorting in LevelDB
         ser_writedata32be(s, blockHeight);
         ser_writedata32be(s, txindex);
-        txhash.Serialize(s, nType, nVersion);
+        txhash.Serialize(s);
         ser_writedata32(s, index);
         char f = spending;
         ser_writedata8(s, f);
     }
     template<typename Stream>
-    void Unserialize(Stream& s, int nType, int nVersion) {
+    void Unserialize(Stream& s) {
         type = ser_readdata8(s);
-        hashBytes.Unserialize(s, nType, nVersion);
+        hashBytes.Unserialize(s);
         blockHeight = ser_readdata32be(s);
         txindex = ser_readdata32be(s);
-        txhash.Unserialize(s, nType, nVersion);
+        txhash.Unserialize(s);
         index = ser_readdata32(s);
         char f = ser_readdata8(s);
         spending = f;
@@ -155,18 +155,18 @@ struct CAddressIndexIteratorKey {
     unsigned int type;
     uint160 hashBytes;
 
-    size_t GetSerializeSize(int nType, int nVersion) const {
+    size_t GetSerializeSize() const {
         return 21;
     }
     template<typename Stream>
-    void Serialize(Stream& s, int nType, int nVersion) const {
+    void Serialize(Stream& s) const {
         ser_writedata8(s, type);
-        hashBytes.Serialize(s, nType, nVersion);
+        hashBytes.Serialize(s);
     }
     template<typename Stream>
-    void Unserialize(Stream& s, int nType, int nVersion) {
+    void Unserialize(Stream& s) {
         type = ser_readdata8(s);
-        hashBytes.Unserialize(s, nType, nVersion);
+        hashBytes.Unserialize(s);
     }
 
     CAddressIndexIteratorKey(unsigned int addressType, uint160 addressHash) {
@@ -189,19 +189,19 @@ struct CAddressIndexIteratorHeightKey {
     uint160 hashBytes;
     int blockHeight;
 
-    size_t GetSerializeSize(int nType, int nVersion) const {
+    size_t GetSerializeSize() const {
         return 25;
     }
     template<typename Stream>
-    void Serialize(Stream& s, int nType, int nVersion) const {
+    void Serialize(Stream& s) const {
         ser_writedata8(s, type);
-        hashBytes.Serialize(s, nType, nVersion);
+        hashBytes.Serialize(s);
         ser_writedata32be(s, blockHeight);
     }
     template<typename Stream>
-    void Unserialize(Stream& s, int nType, int nVersion) {
+    void Unserialize(Stream& s) {
         type = ser_readdata8(s);
-        hashBytes.Unserialize(s, nType, nVersion);
+        hashBytes.Unserialize(s);
         blockHeight = ser_readdata32be(s);
     }
 
diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp
index b3fe708bc7316..1be68caac4769 100644
--- a/src/rpc/blockchain.cpp
+++ b/src/rpc/blockchain.cpp
@@ -127,7 +127,7 @@ UniValue blockToDeltasJSON(const CBlock& block, const CBlockIndex* blockindex)
     UniValue deltas(UniValue::VARR);
 
     for (unsigned int i = 0; i < block.vtx.size(); i++) {
-        const CTransaction &tx = block.vtx[i];
+        const CTransaction &tx = *(block.vtx[i]);
         const uint256 txhash = tx.GetHash();
 
         UniValue entry(UniValue::VOBJ);
@@ -714,12 +714,12 @@ UniValue getmempoolentry(const JSONRPCRequest& request)
     return info;
 }
 
-UniValue getblockdeltas(const UniValue& params, bool fHelp)
+UniValue getblockdeltas(const JSONRPCRequest& request)
 {
-    if (fHelp || params.size() != 1)
+    if (request.fHelp || request.params.size() != 1)
         throw runtime_error("");
 
-    std::string strHash = params[0].get_str();
+    std::string strHash = request.params[0].get_str();
     uint256 hash(uint256S(strHash));
 
     if (mapBlockIndex.count(hash) == 0)
@@ -737,9 +737,9 @@ UniValue getblockdeltas(const UniValue& params, bool fHelp)
     return blockToDeltasJSON(block, pblockindex);
 }
 
-UniValue getblockhashes(const UniValue& params, bool fHelp)
+UniValue getblockhashes(const JSONRPCRequest& request)
 {
-    if (fHelp || params.size() < 2)
+    if (request.fHelp || request.params.size() < 2)
         throw runtime_error(
             "getblockhashes timestamp\n"
             "\nReturns array of hashes of blocks within the timestamp range provided.\n"
@@ -767,15 +767,15 @@ UniValue getblockhashes(const UniValue& params, bool fHelp)
             + HelpExampleCli("getblockhashes", "1231614698 1231024505 '{\"noOrphans\":false, \"logicalTimes\":true}'")
             );
 
-    unsigned int high = params[0].get_int();
-    unsigned int low = params[1].get_int();
+    unsigned int high = request.params[0].get_int();
+    unsigned int low = request.params[1].get_int();
     bool fActiveOnly = false;
     bool fLogicalTS = false;
 
-    if (params.size() > 2) {
-        if (params[2].isObject()) {
-            UniValue noOrphans = find_value(params[2].get_obj(), "noOrphans");
-            UniValue returnLogical = find_value(params[2].get_obj(), "logicalTimes");
+    if (request.params.size() > 2) {
+        if (request.params[2].isObject()) {
+            UniValue noOrphans = find_value(request.params[2].get_obj(), "noOrphans");
+            UniValue returnLogical = find_value(request.params[2].get_obj(), "logicalTimes");
 
             if (noOrphans.isBool())
                 fActiveOnly = noOrphans.get_bool();
@@ -1629,8 +1629,8 @@ static const CRPCCommand commands[] =
     { "blockchain",         "getbestblockhash",       &getbestblockhash,       true,  {} },
     { "blockchain",         "getblockcount",          &getblockcount,          true,  {} },
     { "blockchain",         "getblock",               &getblock,               true,  {"blockhash","verbose"} },
-    { "blockchain",         "getblockdeltas",         &getblockdeltas,         false },
-    { "blockchain",         "getblockhashes",         &getblockhashes,         true  },
+    { "blockchain",         "getblockdeltas",         &getblockdeltas,         false, {} },
+    { "blockchain",         "getblockhashes",         &getblockhashes,         true,  {}  },
     { "blockchain",         "getblockhash",           &getblockhash,           true,  {"height"} },
     { "blockchain",         "getblockheader",         &getblockheader,         true,  {"blockhash","verbose"} },
     { "blockchain",         "getchaintips",           &getchaintips,           true,  {} },
diff --git a/src/rpc/client.cpp b/src/rpc/client.cpp
index 26af26cc10fa7..bbfff51dde73e 100644
--- a/src/rpc/client.cpp
+++ b/src/rpc/client.cpp
@@ -117,15 +117,15 @@ static const CRPCConvertParam vRPCConvertParams[] =
     { "setnetworkactive", 0, "state" },
     { "getmempoolancestors", 1, "verbose" },
     { "getmempooldescendants", 1, "verbose" },
-    { "getblockhashes", 0 },
-    { "getblockhashes", 1 },
-    { "getblockhashes", 2 },
-    { "getspentinfo", 0},
-    { "getaddresstxids", 0},
-    { "getaddressbalance", 0},
-    { "getaddressdeltas", 0},
-    { "getaddressutxos", 0},
-    { "getaddressmempool", 0},
+    { "getblockhashes", 0 , "high"},
+    { "getblockhashes", 1, "low"},
+    { "getblockhashes", 2, "options" },
+    { "getspentinfo", 0, "txid_index"},
+    { "getaddresstxids", 0, "addresses"},
+    { "getaddressbalance", 0, "addresses"},
+    { "getaddressdeltas", 0, "addresses"},
+    { "getaddressutxos", 0, "addresses"},
+    { "getaddressmempool", 0, "addresses"},
     { "bumpfee", 1, "options" },
     // Echo with conversion (For testing only)
     { "echojson", 0, "arg0" },
diff --git a/src/rpc/misc.cpp b/src/rpc/misc.cpp
index e18766d90c9d7..487fd95f879ca 100644
--- a/src/rpc/misc.cpp
+++ b/src/rpc/misc.cpp
@@ -568,9 +568,9 @@ bool timestampSort(std::pair<CMempoolAddressDeltaKey, CMempoolAddressDelta> a,
     return a.second.time < b.second.time;
 }
 
-UniValue getaddressmempool(const UniValue& params, bool fHelp)
+UniValue getaddressmempool(const JSONRPCRequest& request)
 {
-    if (fHelp || params.size() != 1)
+    if (request.fHelp || request.params.size() != 1)
         throw runtime_error(
             "getaddressmempool\n"
             "\nReturns all mempool deltas for an address (requires addressindex to be enabled).\n"
@@ -601,7 +601,7 @@ UniValue getaddressmempool(const UniValue& params, bool fHelp)
 
     std::vector<std::pair<uint160, int> > addresses;
 
-    if (!getAddressesFromParams(params, addresses)) {
+    if (!getAddressesFromParams(request.params, addresses)) {
         throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid address");
     }
 
@@ -639,9 +639,9 @@ UniValue getaddressmempool(const UniValue& params, bool fHelp)
     return result;
 }
 
-UniValue getaddressutxos(const UniValue& params, bool fHelp)
+UniValue getaddressutxos(const JSONRPCRequest& request)
 {
-    if (fHelp || params.size() != 1)
+    if (request.fHelp || request.params.size() != 1)
         throw runtime_error(
             "getaddressutxos\n"
             "\nReturns all unspent outputs for an address (requires addressindex to be enabled).\n"
@@ -671,8 +671,8 @@ UniValue getaddressutxos(const UniValue& params, bool fHelp)
             );
 
     bool includeChainInfo = false;
-    if (params[0].isObject()) {
-        UniValue chainInfo = find_value(params[0].get_obj(), "chainInfo");
+    if (request.params[0].isObject()) {
+        UniValue chainInfo = find_value(request.params[0].get_obj(), "chainInfo");
         if (chainInfo.isBool()) {
             includeChainInfo = chainInfo.get_bool();
         }
@@ -680,7 +680,7 @@ UniValue getaddressutxos(const UniValue& params, bool fHelp)
 
     std::vector<std::pair<uint160, int> > addresses;
 
-    if (!getAddressesFromParams(params, addresses)) {
+    if (!getAddressesFromParams(request.params, addresses)) {
         throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid address");
     }
 
@@ -725,9 +725,9 @@ UniValue getaddressutxos(const UniValue& params, bool fHelp)
     }
 }
 
-UniValue getaddressdeltas(const UniValue& params, bool fHelp)
+UniValue getaddressdeltas(const JSONRPCRequest& request)
 {
-    if (fHelp || params.size() != 1 || !params[0].isObject())
+    if (request.fHelp || request.params.size() != 1 || !request.params[0].isObject())
         throw runtime_error(
             "getaddressdeltas\n"
             "\nReturns all changes for an address (requires addressindex to be enabled).\n"
@@ -758,10 +758,10 @@ UniValue getaddressdeltas(const UniValue& params, bool fHelp)
         );
 
 
-    UniValue startValue = find_value(params[0].get_obj(), "start");
-    UniValue endValue = find_value(params[0].get_obj(), "end");
+    UniValue startValue = find_value(request.params[0].get_obj(), "start");
+    UniValue endValue = find_value(request.params[0].get_obj(), "end");
 
-    UniValue chainInfo = find_value(params[0].get_obj(), "chainInfo");
+    UniValue chainInfo = find_value(request.params[0].get_obj(), "chainInfo");
     bool includeChainInfo = false;
     if (chainInfo.isBool()) {
         includeChainInfo = chainInfo.get_bool();
@@ -783,7 +783,7 @@ UniValue getaddressdeltas(const UniValue& params, bool fHelp)
 
     std::vector<std::pair<uint160, int> > addresses;
 
-    if (!getAddressesFromParams(params, addresses)) {
+    if (!getAddressesFromParams(request.params, addresses)) {
         throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid address");
     }
 
@@ -850,9 +850,9 @@ UniValue getaddressdeltas(const UniValue& params, bool fHelp)
     }
 }
 
-UniValue getaddressbalance(const UniValue& params, bool fHelp)
+UniValue getaddressbalance(const JSONRPCRequest& request)
 {
-    if (fHelp || params.size() != 1)
+    if (request.fHelp || request.params.size() != 1)
         throw runtime_error(
             "getaddressbalance\n"
             "\nReturns the balance for an address(es) (requires addressindex to be enabled).\n"
@@ -876,7 +876,7 @@ UniValue getaddressbalance(const UniValue& params, bool fHelp)
 
     std::vector<std::pair<uint160, int> > addresses;
 
-    if (!getAddressesFromParams(params, addresses)) {
+    if (!getAddressesFromParams(request.params, addresses)) {
         throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid address");
     }
 
@@ -906,9 +906,9 @@ UniValue getaddressbalance(const UniValue& params, bool fHelp)
 
 }
 
-UniValue getaddresstxids(const UniValue& params, bool fHelp)
+UniValue getaddresstxids(const JSONRPCRequest& request)
 {
-    if (fHelp || params.size() != 1)
+    if (request.fHelp || request.params.size() != 1)
         throw runtime_error(
             "getaddresstxids\n"
             "\nReturns the txids for an address(es) (requires addressindex to be enabled).\n"
@@ -934,15 +934,15 @@ UniValue getaddresstxids(const UniValue& params, bool fHelp)
 
     std::vector<std::pair<uint160, int> > addresses;
 
-    if (!getAddressesFromParams(params, addresses)) {
+    if (!getAddressesFromParams(request.params, addresses)) {
         throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid address");
     }
 
     int start = 0;
     int end = 0;
-    if (params[0].isObject()) {
-        UniValue startValue = find_value(params[0].get_obj(), "start");
-        UniValue endValue = find_value(params[0].get_obj(), "end");
+    if (request.params[0].isObject()) {
+        UniValue startValue = find_value(request.params[0].get_obj(), "start");
+        UniValue endValue = find_value(request.params[0].get_obj(), "end");
         if (startValue.isNum() && endValue.isNum()) {
             start = startValue.get_int();
             end = endValue.get_int();
@@ -989,10 +989,10 @@ UniValue getaddresstxids(const UniValue& params, bool fHelp)
 
 }
 
-UniValue getspentinfo(const UniValue& params, bool fHelp)
+UniValue getspentinfo(const JSONRPCRequest& request)
 {
 
-    if (fHelp || params.size() != 1 || !params[0].isObject())
+    if (request.fHelp || request.params.size() != 1 || !request.params[0].isObject())
         throw runtime_error(
             "getspentinfo\n"
             "\nReturns the txid and index where an output is spent.\n"
@@ -1012,8 +1012,8 @@ UniValue getspentinfo(const UniValue& params, bool fHelp)
             + HelpExampleRpc("getspentinfo", "{\"txid\": \"0437cd7f8525ceed2324359c2d0ba26006d92d856a9c20fa0241106ee5a597c9\", \"index\": 0}")
         );
 
-    UniValue txidValue = find_value(params[0].get_obj(), "txid");
-    UniValue indexValue = find_value(params[0].get_obj(), "index");
+    UniValue txidValue = find_value(request.params[0].get_obj(), "txid");
+    UniValue indexValue = find_value(request.params[0].get_obj(), "index");
 
     if (!txidValue.isStr() || !indexValue.isNum()) {
         throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid txid or index");
@@ -1048,11 +1048,14 @@ static const CRPCCommand commands[] =
     { "util",               "signmessagewithprivkey", &signmessagewithprivkey, true,  {"privkey","message"} },
 
     /* Address index */
-    { "addressindex",       "getaddressmempool",      &getaddressmempool,      true  },
-    { "addressindex",       "getaddressutxos",        &getaddressutxos,        false },
-    { "addressindex",       "getaddressdeltas",       &getaddressdeltas,       false },
-    { "addressindex",       "getaddresstxids",        &getaddresstxids,        false },
-    { "addressindex",       "getaddressbalance",      &getaddressbalance,      false },
+    { "addressindex",       "getaddressmempool",      &getaddressmempool,      true,  {}},
+    { "addressindex",       "getaddressutxos",        &getaddressutxos,        false, {} },
+    { "addressindex",       "getaddressdeltas",       &getaddressdeltas,       false, {} },
+    { "addressindex",       "getaddresstxids",        &getaddresstxids,        false, {} },
+    { "addressindex",       "getaddressbalance",      &getaddressbalance,      false, {} },
+
+    /* Blockchain */
+    { "blockchain",         "getspentinfo",           &getspentinfo,           false, {} },
 
     /* Not shown in help */
     { "hidden",             "setmocktime",            &setmocktime,            true,  {"timestamp"}},
diff --git a/src/rpc/rawtransaction.cpp b/src/rpc/rawtransaction.cpp
index 97ff7e988dadd..777662d329442 100644
--- a/src/rpc/rawtransaction.cpp
+++ b/src/rpc/rawtransaction.cpp
@@ -98,11 +98,11 @@ void TxToJSONExpanded(const CTransaction& tx, const uint256 hashBlock, UniValue&
             }
 
         }
-        if (!tx.wit.IsNull()) {
-            if (!tx.wit.vtxinwit[i].IsNull()) {
+        if (tx.HasWitness()) {
+            if (!tx.vin[i].scriptWitness.IsNull()) {
                 UniValue txinwitness(UniValue::VARR);
-                for (unsigned int j = 0; j < tx.wit.vtxinwit[i].scriptWitness.stack.size(); j++) {
-                    std::vector<unsigned char> item = tx.wit.vtxinwit[i].scriptWitness.stack[j];
+                for (unsigned int j = 0; j < tx.vin[i].scriptWitness.stack.size(); j++) {
+                    std::vector<unsigned char> item = tx.vin[i].scriptWitness.stack[j];
                     txinwitness.push_back(HexStr(item.begin(), item.end()));
                 }
                 in.push_back(Pair("txinwitness", txinwitness));
@@ -313,7 +313,7 @@ UniValue getrawtransaction(const JSONRPCRequest& request)
         } 
     }
 
-    CTransaction tx;
+    CTransactionRef tx;
 
     uint256 hashBlock;
     int nHeight = 0;
diff --git a/src/spentindex.h b/src/spentindex.h
index bd5da45d60dbc..7b9da423bcd90 100644
--- a/src/spentindex.h
+++ b/src/spentindex.h
@@ -16,7 +16,7 @@ struct CSpentIndexKey {
     ADD_SERIALIZE_METHODS;
 
     template <typename Stream, typename Operation>
-    inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) {
+    inline void SerializationOp(Stream& s, Operation ser_action) {
         READWRITE(txid);
         READWRITE(outputIndex);
     }
@@ -48,7 +48,7 @@ struct CSpentIndexValue {
     ADD_SERIALIZE_METHODS;
 
     template <typename Stream, typename Operation>
-    inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) {
+    inline void SerializationOp(Stream& s, Operation ser_action) {
         READWRITE(txid);
         READWRITE(inputIndex);
         READWRITE(blockHeight);
diff --git a/src/test/dbwrapper_tests.cpp b/src/test/dbwrapper_tests.cpp
index a6661270f1936..e293409140e01 100644
--- a/src/test/dbwrapper_tests.cpp
+++ b/src/test/dbwrapper_tests.cpp
@@ -48,7 +48,7 @@ BOOST_AUTO_TEST_CASE(dbwrapper_compression)
     // Perform tests both with compression and without
     for (int i = 0; i < 2; i++) {
         bool compression = (bool)i;
-        path ph = temp_directory_path() / unique_path();
+        boost::filesystem::path ph = boost::filesystem::temp_directory_path() / boost::filesystem::unique_path();
         CDBWrapper dbw(ph, (1 << 20), true, false, false, compression);
         char key = 'k';
         uint256 in = GetRandHash();
@@ -62,7 +62,7 @@ BOOST_AUTO_TEST_CASE(dbwrapper_compression)
 
 BOOST_AUTO_TEST_CASE(dbwrapper_maxopenfiles_64)
 {
-    path ph = temp_directory_path() / unique_path();
+    boost::filesystem::path ph = boost::filesystem::temp_directory_path() / boost::filesystem::unique_path();
     CDBWrapper dbw(ph, (1 << 20), true, false, false, false, 64);
     char key = 'k';
     uint256 in = GetRandHash();
@@ -75,7 +75,7 @@ BOOST_AUTO_TEST_CASE(dbwrapper_maxopenfiles_64)
 
 BOOST_AUTO_TEST_CASE(dbwrapper_maxopenfiles_1000)
 {
-    path ph = temp_directory_path() / unique_path();
+    boost::filesystem::path ph = boost::filesystem::temp_directory_path() / boost::filesystem::unique_path();
     CDBWrapper dbw(ph, (1 << 20), true, false, false, false, 1000);
     char key = 'k';
     uint256 in = GetRandHash();
diff --git a/src/timestampindex.h b/src/timestampindex.h
index ea792797e18e1..cb182a71358b9 100644
--- a/src/timestampindex.h
+++ b/src/timestampindex.h
@@ -11,15 +11,15 @@
 struct CTimestampIndexIteratorKey {
     unsigned int timestamp;
 
-    size_t GetSerializeSize(int nType, int nVersion) const {
+    size_t GetSerializeSize() const {
         return 4;
     }
     template<typename Stream>
-    void Serialize(Stream& s, int nType, int nVersion) const {
+    void Serialize(Stream& s) const {
         ser_writedata32be(s, timestamp);
     }
     template<typename Stream>
-    void Unserialize(Stream& s, int nType, int nVersion) {
+    void Unserialize(Stream& s) {
         timestamp = ser_readdata32be(s);
     }
 
@@ -40,18 +40,18 @@ struct CTimestampIndexKey {
     unsigned int timestamp;
     uint256 blockHash;
 
-    size_t GetSerializeSize(int nType, int nVersion) const {
+    size_t GetSerializeSize() const {
         return 36;
     }
     template<typename Stream>
-    void Serialize(Stream& s, int nType, int nVersion) const {
+    void Serialize(Stream& s) const {
         ser_writedata32be(s, timestamp);
-        blockHash.Serialize(s, nType, nVersion);
+        blockHash.Serialize(s);
     }
     template<typename Stream>
-    void Unserialize(Stream& s, int nType, int nVersion) {
+    void Unserialize(Stream& s) {
         timestamp = ser_readdata32be(s);
-        blockHash.Unserialize(s, nType, nVersion);
+        blockHash.Unserialize(s);
     }
 
     CTimestampIndexKey(unsigned int time, uint256 hash) {
@@ -72,18 +72,18 @@ struct CTimestampIndexKey {
 struct CTimestampBlockIndexKey {
     uint256 blockHash;
 
-    size_t GetSerializeSize(int nType, int nVersion) const {
+    size_t GetSerializeSize() const {
         return 32;
     }
 
     template<typename Stream>
-    void Serialize(Stream& s, int nType, int nVersion) const {
-        blockHash.Serialize(s, nType, nVersion);
+    void Serialize(Stream& s) const {
+        blockHash.Serialize(s);
     }
 
     template<typename Stream>
-    void Unserialize(Stream& s, int nType, int nVersion) {
-        blockHash.Unserialize(s, nType, nVersion);
+    void Unserialize(Stream& s) {
+        blockHash.Unserialize(s);
     }
 
     CTimestampBlockIndexKey(uint256 hash) {
@@ -101,17 +101,17 @@ struct CTimestampBlockIndexKey {
 
 struct CTimestampBlockIndexValue {
     unsigned int ltimestamp;
-    size_t GetSerializeSize(int nType, int nVersion) const {
+    size_t GetSerializeSize() const {
         return 4;
     }
 
     template<typename Stream>
-    void Serialize(Stream& s, int nType, int nVersion) const {
+    void Serialize(Stream& s) const {
         ser_writedata32be(s, ltimestamp);
     }
 
     template<typename Stream>
-    void Unserialize(Stream& s, int nType, int nVersion) {
+    void Unserialize(Stream& s) {
         ltimestamp = ser_readdata32be(s);
     }
 
diff --git a/src/txdb.cpp b/src/txdb.cpp
index 741642657aac5..e74dfd4880acb 100644
--- a/src/txdb.cpp
+++ b/src/txdb.cpp
@@ -9,6 +9,7 @@
 #include "hash.h"
 #include "pow.h"
 #include "uint256.h"
+#include "validation.h"
 
 #include <stdint.h>
 
@@ -163,16 +164,16 @@ bool CBlockTreeDB::WriteTxIndex(const std::vector<std::pair<uint256, CDiskTxPos>
 }
 
 bool CBlockTreeDB::ReadSpentIndex(CSpentIndexKey &key, CSpentIndexValue &value) {
-    return Read(make_pair(DB_SPENTINDEX, key), value);
+    return Read(std::make_pair(DB_SPENTINDEX, key), value);
 }
 
 bool CBlockTreeDB::UpdateSpentIndex(const std::vector<std::pair<CSpentIndexKey, CSpentIndexValue> >&vect) {
     CDBBatch batch(*this);
     for (std::vector<std::pair<CSpentIndexKey,CSpentIndexValue> >::const_iterator it=vect.begin(); it!=vect.end(); it++) {
         if (it->second.IsNull()) {
-            batch.Erase(make_pair(DB_SPENTINDEX, it->first));
+            batch.Erase(std::make_pair(DB_SPENTINDEX, it->first));
         } else {
-            batch.Write(make_pair(DB_SPENTINDEX, it->first), it->second);
+            batch.Write(std::make_pair(DB_SPENTINDEX, it->first), it->second);
         }
     }
     return WriteBatch(batch);
@@ -182,9 +183,9 @@ bool CBlockTreeDB::UpdateAddressUnspentIndex(const std::vector<std::pair<CAddres
     CDBBatch batch(*this);
     for (std::vector<std::pair<CAddressUnspentKey, CAddressUnspentValue> >::const_iterator it=vect.begin(); it!=vect.end(); it++) {
         if (it->second.IsNull()) {
-            batch.Erase(make_pair(DB_ADDRESSUNSPENTINDEX, it->first));
+            batch.Erase(std::make_pair(DB_ADDRESSUNSPENTINDEX, it->first));
         } else {
-            batch.Write(make_pair(DB_ADDRESSUNSPENTINDEX, it->first), it->second);
+            batch.Write(std::make_pair(DB_ADDRESSUNSPENTINDEX, it->first), it->second);
         }
     }
     return WriteBatch(batch);
@@ -195,7 +196,7 @@ bool CBlockTreeDB::ReadAddressUnspentIndex(uint160 addressHash, int type,
 
     boost::scoped_ptr<CDBIterator> pcursor(NewIterator());
 
-    pcursor->Seek(make_pair(DB_ADDRESSUNSPENTINDEX, CAddressIndexIteratorKey(type, addressHash)));
+    pcursor->Seek(std::make_pair(DB_ADDRESSUNSPENTINDEX, CAddressIndexIteratorKey(type, addressHash)));
 
     while (pcursor->Valid()) {
         boost::this_thread::interruption_point();
@@ -203,7 +204,7 @@ bool CBlockTreeDB::ReadAddressUnspentIndex(uint160 addressHash, int type,
         if (pcursor->GetKey(key) && key.first == DB_ADDRESSUNSPENTINDEX && key.second.hashBytes == addressHash) {
             CAddressUnspentValue nValue;
             if (pcursor->GetValue(nValue)) {
-                unspentOutputs.push_back(make_pair(key.second, nValue));
+                unspentOutputs.push_back(std::make_pair(key.second, nValue));
                 pcursor->Next();
             } else {
                 return error("failed to get address unspent value");
@@ -219,14 +220,14 @@ bool CBlockTreeDB::ReadAddressUnspentIndex(uint160 addressHash, int type,
 bool CBlockTreeDB::WriteAddressIndex(const std::vector<std::pair<CAddressIndexKey, CAmount > >&vect) {
     CDBBatch batch(*this);
     for (std::vector<std::pair<CAddressIndexKey, CAmount> >::const_iterator it=vect.begin(); it!=vect.end(); it++)
-        batch.Write(make_pair(DB_ADDRESSINDEX, it->first), it->second);
+        batch.Write(std::make_pair(DB_ADDRESSINDEX, it->first), it->second);
     return WriteBatch(batch);
 }
 
 bool CBlockTreeDB::EraseAddressIndex(const std::vector<std::pair<CAddressIndexKey, CAmount > >&vect) {
     CDBBatch batch(*this);
     for (std::vector<std::pair<CAddressIndexKey, CAmount> >::const_iterator it=vect.begin(); it!=vect.end(); it++)
-        batch.Erase(make_pair(DB_ADDRESSINDEX, it->first));
+        batch.Erase(std::make_pair(DB_ADDRESSINDEX, it->first));
     return WriteBatch(batch);
 }
 
@@ -237,9 +238,9 @@ bool CBlockTreeDB::ReadAddressIndex(uint160 addressHash, int type,
     boost::scoped_ptr<CDBIterator> pcursor(NewIterator());
 
     if (start > 0 && end > 0) {
-        pcursor->Seek(make_pair(DB_ADDRESSINDEX, CAddressIndexIteratorHeightKey(type, addressHash, start)));
+        pcursor->Seek(std::make_pair(DB_ADDRESSINDEX, CAddressIndexIteratorHeightKey(type, addressHash, start)));
     } else {
-        pcursor->Seek(make_pair(DB_ADDRESSINDEX, CAddressIndexIteratorKey(type, addressHash)));
+        pcursor->Seek(std::make_pair(DB_ADDRESSINDEX, CAddressIndexIteratorKey(type, addressHash)));
     }
 
     while (pcursor->Valid()) {
@@ -251,7 +252,7 @@ bool CBlockTreeDB::ReadAddressIndex(uint160 addressHash, int type,
             }
             CAmount nValue;
             if (pcursor->GetValue(nValue)) {
-                addressIndex.push_back(make_pair(key.second, nValue));
+                addressIndex.push_back(std::make_pair(key.second, nValue));
                 pcursor->Next();
             } else {
                 return error("failed to get address index value");
@@ -266,7 +267,7 @@ bool CBlockTreeDB::ReadAddressIndex(uint160 addressHash, int type,
 
 bool CBlockTreeDB::WriteTimestampIndex(const CTimestampIndexKey &timestampIndex) {
     CDBBatch batch(*this);
-    batch.Write(make_pair(DB_TIMESTAMPINDEX, timestampIndex), 0);
+    batch.Write(std::make_pair(DB_TIMESTAMPINDEX, timestampIndex), 0);
     return WriteBatch(batch);
 }
 
@@ -274,7 +275,7 @@ bool CBlockTreeDB::ReadTimestampIndex(const unsigned int &high, const unsigned i
 
     boost::scoped_ptr<CDBIterator> pcursor(NewIterator());
 
-    pcursor->Seek(make_pair(DB_TIMESTAMPINDEX, CTimestampIndexIteratorKey(low)));
+    pcursor->Seek(std::make_pair(DB_TIMESTAMPINDEX, CTimestampIndexIteratorKey(low)));
 
     while (pcursor->Valid()) {
         boost::this_thread::interruption_point();
@@ -299,7 +300,7 @@ bool CBlockTreeDB::ReadTimestampIndex(const unsigned int &high, const unsigned i
 
 bool CBlockTreeDB::WriteTimestampBlockIndex(const CTimestampBlockIndexKey &blockhashIndex, const CTimestampBlockIndexValue &logicalts) {
     CDBBatch batch(*this);
-    batch.Write(make_pair(DB_BLOCKHASHINDEX, blockhashIndex), logicalts);
+    batch.Write(std::make_pair(DB_BLOCKHASHINDEX, blockhashIndex), logicalts);
     return WriteBatch(batch);
 }
 
diff --git a/src/txdb.h b/src/txdb.h
index 4376ad369b588..eb612a5e10879 100644
--- a/src/txdb.h
+++ b/src/txdb.h
@@ -6,7 +6,6 @@
 #ifndef BITCOIN_TXDB_H
 #define BITCOIN_TXDB_H
 
-#include "main.h"
 #include "coins.h"
 #include "dbwrapper.h"
 #include "chain.h"
diff --git a/src/txmempool.cpp b/src/txmempool.cpp
index 047968efbfffb..64592e6c194a6 100644
--- a/src/txmempool.cpp
+++ b/src/txmempool.cpp
@@ -399,7 +399,7 @@ bool CTxMemPool::addUnchecked(const uint256& hash, const CTxMemPoolEntry &entry,
     // all the appropriate checks.
     LOCK(cs);
     indexed_transaction_set::iterator newit = mapTx.insert(entry).first;
-    mapLinks.insert(make_pair(newit, TxLinks()));
+    mapLinks.insert(std::make_pair(newit, TxLinks()));
 
     // Update transaction for any feeDelta created by PrioritiseTransaction
     // TODO: refactor so that the fee delta is calculated before inserting
@@ -461,16 +461,16 @@ void CTxMemPool::addAddressIndex(const CTxMemPoolEntry &entry, const CCoinsViewC
         const CTxIn input = tx.vin[j];
         const CTxOut &prevout = view.GetOutputFor(input);
         if (prevout.scriptPubKey.IsPayToScriptHash()) {
-            vector<unsigned char> hashBytes(prevout.scriptPubKey.begin()+2, prevout.scriptPubKey.begin()+22);
+            std::vector<unsigned char> hashBytes(prevout.scriptPubKey.begin()+2, prevout.scriptPubKey.begin()+22);
             CMempoolAddressDeltaKey key(2, uint160(hashBytes), txhash, j, 1);
             CMempoolAddressDelta delta(entry.GetTime(), prevout.nValue * -1, input.prevout.hash, input.prevout.n);
-            mapAddress.insert(make_pair(key, delta));
+            mapAddress.insert(std::make_pair(key, delta));
             inserted.push_back(key);
         } else if (prevout.scriptPubKey.IsPayToPublicKeyHash()) {
-            vector<unsigned char> hashBytes(prevout.scriptPubKey.begin()+3, prevout.scriptPubKey.begin()+23);
+            std::vector<unsigned char> hashBytes(prevout.scriptPubKey.begin()+3, prevout.scriptPubKey.begin()+23);
             CMempoolAddressDeltaKey key(1, uint160(hashBytes), txhash, j, 1);
             CMempoolAddressDelta delta(entry.GetTime(), prevout.nValue * -1, input.prevout.hash, input.prevout.n);
-            mapAddress.insert(make_pair(key, delta));
+            mapAddress.insert(std::make_pair(key, delta));
             inserted.push_back(key);
         }
     }
@@ -478,20 +478,20 @@ void CTxMemPool::addAddressIndex(const CTxMemPoolEntry &entry, const CCoinsViewC
     for (unsigned int k = 0; k < tx.vout.size(); k++) {
         const CTxOut &out = tx.vout[k];
         if (out.scriptPubKey.IsPayToScriptHash()) {
-            vector<unsigned char> hashBytes(out.scriptPubKey.begin()+2, out.scriptPubKey.begin()+22);
+            std::vector<unsigned char> hashBytes(out.scriptPubKey.begin()+2, out.scriptPubKey.begin()+22);
             CMempoolAddressDeltaKey key(2, uint160(hashBytes), txhash, k, 0);
-            mapAddress.insert(make_pair(key, CMempoolAddressDelta(entry.GetTime(), out.nValue)));
+            mapAddress.insert(std::make_pair(key, CMempoolAddressDelta(entry.GetTime(), out.nValue)));
             inserted.push_back(key);
         } else if (out.scriptPubKey.IsPayToPublicKeyHash()) {
-            vector<unsigned char> hashBytes(out.scriptPubKey.begin()+3, out.scriptPubKey.begin()+23);
+            std::vector<unsigned char> hashBytes(out.scriptPubKey.begin()+3, out.scriptPubKey.begin()+23);
             std::pair<addressDeltaMap::iterator,bool> ret;
             CMempoolAddressDeltaKey key(1, uint160(hashBytes), txhash, k, 0);
-            mapAddress.insert(make_pair(key, CMempoolAddressDelta(entry.GetTime(), out.nValue)));
+            mapAddress.insert(std::make_pair(key, CMempoolAddressDelta(entry.GetTime(), out.nValue)));
             inserted.push_back(key);
         }
     }
 
-    mapAddressInserted.insert(make_pair(txhash, inserted));
+    mapAddressInserted.insert(std::make_pair(txhash, inserted));
 }
 
 bool CTxMemPool::getAddressIndex(std::vector<std::pair<uint160, int> > &addresses,
@@ -539,10 +539,10 @@ void CTxMemPool::addSpentIndex(const CTxMemPoolEntry &entry, const CCoinsViewCac
         int addressType;
 
         if (prevout.scriptPubKey.IsPayToScriptHash()) {
-            addressHash = uint160(vector<unsigned char> (prevout.scriptPubKey.begin()+2, prevout.scriptPubKey.begin()+22));
+            addressHash = uint160(std::vector<unsigned char> (prevout.scriptPubKey.begin()+2, prevout.scriptPubKey.begin()+22));
             addressType = 2;
         } else if (prevout.scriptPubKey.IsPayToPublicKeyHash()) {
-            addressHash = uint160(vector<unsigned char> (prevout.scriptPubKey.begin()+3, prevout.scriptPubKey.begin()+23));
+            addressHash = uint160(std::vector<unsigned char> (prevout.scriptPubKey.begin()+3, prevout.scriptPubKey.begin()+23));
             addressType = 1;
         } else {
             addressHash.SetNull();
@@ -552,12 +552,12 @@ void CTxMemPool::addSpentIndex(const CTxMemPoolEntry &entry, const CCoinsViewCac
         CSpentIndexKey key = CSpentIndexKey(input.prevout.hash, input.prevout.n);
         CSpentIndexValue value = CSpentIndexValue(txhash, j, -1, prevout.nValue, addressType, addressHash);
 
-        mapSpent.insert(make_pair(key, value));
+        mapSpent.insert(std::make_pair(key, value));
         inserted.push_back(key);
 
     }
 
-    mapSpentInserted.insert(make_pair(txhash, inserted));
+    mapSpentInserted.insert(std::make_pair(txhash, inserted));
 }
 
 bool CTxMemPool::getSpentIndex(CSpentIndexKey &key, CSpentIndexValue &value)
diff --git a/src/validation.cpp b/src/validation.cpp
index 0bd6c50003960..2369021f9edac 100644
--- a/src/validation.cpp
+++ b/src/validation.cpp
@@ -1689,22 +1689,22 @@ bool DisconnectBlock(const CBlock& block, CValidationState& state, const CBlockI
                 const CTxOut &out = tx.vout[k];
 
                 if (out.scriptPubKey.IsPayToScriptHash()) {
-                    vector<unsigned char> hashBytes(out.scriptPubKey.begin()+2, out.scriptPubKey.begin()+22);
+                    std::vector<unsigned char> hashBytes(out.scriptPubKey.begin()+2, out.scriptPubKey.begin()+22);
 
                     // undo receiving activity
-                    addressIndex.push_back(make_pair(CAddressIndexKey(2, uint160(hashBytes), pindex->nHeight, i, hash, k, false), out.nValue));
+                    addressIndex.push_back(std::make_pair(CAddressIndexKey(2, uint160(hashBytes), pindex->nHeight, i, hash, k, false), out.nValue));
 
                     // undo unspent index
-                    addressUnspentIndex.push_back(make_pair(CAddressUnspentKey(2, uint160(hashBytes), hash, k), CAddressUnspentValue()));
+                    addressUnspentIndex.push_back(std::make_pair(CAddressUnspentKey(2, uint160(hashBytes), hash, k), CAddressUnspentValue()));
 
                 } else if (out.scriptPubKey.IsPayToPublicKeyHash()) {
-                    vector<unsigned char> hashBytes(out.scriptPubKey.begin()+3, out.scriptPubKey.begin()+23);
+                    std::vector<unsigned char> hashBytes(out.scriptPubKey.begin()+3, out.scriptPubKey.begin()+23);
 
                     // undo receiving activity
-                    addressIndex.push_back(make_pair(CAddressIndexKey(1, uint160(hashBytes), pindex->nHeight, i, hash, k, false), out.nValue));
+                    addressIndex.push_back(std::make_pair(CAddressIndexKey(1, uint160(hashBytes), pindex->nHeight, i, hash, k, false), out.nValue));
 
                     // undo unspent index
-                    addressUnspentIndex.push_back(make_pair(CAddressUnspentKey(1, uint160(hashBytes), hash, k), CAddressUnspentValue()));
+                    addressUnspentIndex.push_back(std::make_pair(CAddressUnspentKey(1, uint160(hashBytes), hash, k), CAddressUnspentValue()));
 
                 } else {
                     continue;
@@ -1748,29 +1748,29 @@ bool DisconnectBlock(const CBlock& block, CValidationState& state, const CBlockI
 
                 if (fSpentIndex) {
                     // undo and delete the spent index
-                    spentIndex.push_back(make_pair(CSpentIndexKey(input.prevout.hash, input.prevout.n), CSpentIndexValue()));
+                    spentIndex.push_back(std::make_pair(CSpentIndexKey(input.prevout.hash, input.prevout.n), CSpentIndexValue()));
                 }
 
                 if (fAddressIndex) {
                     const CTxOut &prevout = view.GetOutputFor(tx.vin[j]);
                     if (prevout.scriptPubKey.IsPayToScriptHash()) {
-                        vector<unsigned char> hashBytes(prevout.scriptPubKey.begin()+2, prevout.scriptPubKey.begin()+22);
+                        std::vector<unsigned char> hashBytes(prevout.scriptPubKey.begin()+2, prevout.scriptPubKey.begin()+22);
 
                         // undo spending activity
-                        addressIndex.push_back(make_pair(CAddressIndexKey(2, uint160(hashBytes), pindex->nHeight, i, hash, j, true), prevout.nValue * -1));
+                        addressIndex.push_back(std::make_pair(CAddressIndexKey(2, uint160(hashBytes), pindex->nHeight, i, hash, j, true), prevout.nValue * -1));
 
                         // restore unspent index
-                        addressUnspentIndex.push_back(make_pair(CAddressUnspentKey(2, uint160(hashBytes), input.prevout.hash, input.prevout.n), CAddressUnspentValue(prevout.nValue, prevout.scriptPubKey, undo.nHeight)));
+                        addressUnspentIndex.push_back(std::make_pair(CAddressUnspentKey(2, uint160(hashBytes), input.prevout.hash, input.prevout.n), CAddressUnspentValue(prevout.nValue, prevout.scriptPubKey, undo.nHeight)));
 
 
                     } else if (prevout.scriptPubKey.IsPayToPublicKeyHash()) {
-                        vector<unsigned char> hashBytes(prevout.scriptPubKey.begin()+3, prevout.scriptPubKey.begin()+23);
+                        std::vector<unsigned char> hashBytes(prevout.scriptPubKey.begin()+3, prevout.scriptPubKey.begin()+23);
 
                         // undo spending activity
-                        addressIndex.push_back(make_pair(CAddressIndexKey(1, uint160(hashBytes), pindex->nHeight, i, hash, j, true), prevout.nValue * -1));
+                        addressIndex.push_back(std::make_pair(CAddressIndexKey(1, uint160(hashBytes), pindex->nHeight, i, hash, j, true), prevout.nValue * -1));
 
                         // restore unspent index
-                        addressUnspentIndex.push_back(make_pair(CAddressUnspentKey(1, uint160(hashBytes), input.prevout.hash, input.prevout.n), CAddressUnspentValue(prevout.nValue, prevout.scriptPubKey, undo.nHeight)));
+                        addressUnspentIndex.push_back(std::make_pair(CAddressUnspentKey(1, uint160(hashBytes), input.prevout.hash, input.prevout.n), CAddressUnspentValue(prevout.nValue, prevout.scriptPubKey, undo.nHeight)));
 
                     } else {
                         continue;
@@ -2021,6 +2021,11 @@ bool ConnectBlock(const CBlock& block, CValidationState& state, CBlockIndex* pin
     blockundo.vtxundo.reserve(block.vtx.size() - 1);
     std::vector<PrecomputedTransactionData> txdata;
     txdata.reserve(block.vtx.size()); // Required so that pointers to individual PrecomputedTransactionData don't get invalidated
+
+    std::vector<std::pair<CAddressIndexKey, CAmount> > addressIndex;
+    std::vector<std::pair<CAddressUnspentKey, CAddressUnspentValue> > addressUnspentIndex;
+    std::vector<std::pair<CSpentIndexKey, CSpentIndexValue> > spentIndex;
+
     for (unsigned int i = 0; i < block.vtx.size(); i++)
     {
         const CTransaction &tx = *(block.vtx[i]);
@@ -2057,10 +2062,10 @@ bool ConnectBlock(const CBlock& block, CValidationState& state, CBlockIndex* pin
                     int addressType;
 
                     if (prevout.scriptPubKey.IsPayToScriptHash()) {
-                        hashBytes = uint160(vector <unsigned char>(prevout.scriptPubKey.begin()+2, prevout.scriptPubKey.begin()+22));
+                        hashBytes = uint160(std::vector <unsigned char>(prevout.scriptPubKey.begin()+2, prevout.scriptPubKey.begin()+22));
                         addressType = 2;
                     } else if (prevout.scriptPubKey.IsPayToPublicKeyHash()) {
-                        hashBytes = uint160(vector <unsigned char>(prevout.scriptPubKey.begin()+3, prevout.scriptPubKey.begin()+23));
+                        hashBytes = uint160(std::vector <unsigned char>(prevout.scriptPubKey.begin()+3, prevout.scriptPubKey.begin()+23));
                         addressType = 1;
                     } else {
                         hashBytes.SetNull();
@@ -2069,16 +2074,16 @@ bool ConnectBlock(const CBlock& block, CValidationState& state, CBlockIndex* pin
 
                     if (fAddressIndex && addressType > 0) {
                         // record spending activity
-                        addressIndex.push_back(make_pair(CAddressIndexKey(addressType, hashBytes, pindex->nHeight, i, txhash, j, true), prevout.nValue * -1));
+                        addressIndex.push_back(std::make_pair(CAddressIndexKey(addressType, hashBytes, pindex->nHeight, i, txhash, j, true), prevout.nValue * -1));
 
                         // remove address from unspent index
-                        addressUnspentIndex.push_back(make_pair(CAddressUnspentKey(addressType, hashBytes, input.prevout.hash, input.prevout.n), CAddressUnspentValue()));
+                        addressUnspentIndex.push_back(std::make_pair(CAddressUnspentKey(addressType, hashBytes, input.prevout.hash, input.prevout.n), CAddressUnspentValue()));
                     }
 
                     if (fSpentIndex) {
                         // add the spent index to determine the txid and input that spent an output
                         // and to find the amount and address from an input
-                        spentIndex.push_back(make_pair(CSpentIndexKey(input.prevout.hash, input.prevout.n), CSpentIndexValue(txhash, j, pindex->nHeight, prevout.nValue, addressType, hashBytes)));
+                        spentIndex.push_back(std::make_pair(CSpentIndexKey(input.prevout.hash, input.prevout.n), CSpentIndexValue(txhash, j, pindex->nHeight, prevout.nValue, addressType, hashBytes)));
                     }
                 }
 
@@ -2112,22 +2117,22 @@ bool ConnectBlock(const CBlock& block, CValidationState& state, CBlockIndex* pin
                 const CTxOut &out = tx.vout[k];
 
                 if (out.scriptPubKey.IsPayToScriptHash()) {
-                    vector<unsigned char> hashBytes(out.scriptPubKey.begin()+2, out.scriptPubKey.begin()+22);
+                    std::vector<unsigned char> hashBytes(out.scriptPubKey.begin()+2, out.scriptPubKey.begin()+22);
 
                     // record receiving activity
-                    addressIndex.push_back(make_pair(CAddressIndexKey(2, uint160(hashBytes), pindex->nHeight, i, txhash, k, false), out.nValue));
+                    addressIndex.push_back(std::make_pair(CAddressIndexKey(2, uint160(hashBytes), pindex->nHeight, i, txhash, k, false), out.nValue));
 
                     // record unspent output
-                    addressUnspentIndex.push_back(make_pair(CAddressUnspentKey(2, uint160(hashBytes), txhash, k), CAddressUnspentValue(out.nValue, out.scriptPubKey, pindex->nHeight)));
+                    addressUnspentIndex.push_back(std::make_pair(CAddressUnspentKey(2, uint160(hashBytes), txhash, k), CAddressUnspentValue(out.nValue, out.scriptPubKey, pindex->nHeight)));
 
                 } else if (out.scriptPubKey.IsPayToPublicKeyHash()) {
-                    vector<unsigned char> hashBytes(out.scriptPubKey.begin()+3, out.scriptPubKey.begin()+23);
+                    std::vector<unsigned char> hashBytes(out.scriptPubKey.begin()+3, out.scriptPubKey.begin()+23);
 
                     // record receiving activity
-                    addressIndex.push_back(make_pair(CAddressIndexKey(1, uint160(hashBytes), pindex->nHeight, i, txhash, k, false), out.nValue));
+                    addressIndex.push_back(std::make_pair(CAddressIndexKey(1, uint160(hashBytes), pindex->nHeight, i, txhash, k, false), out.nValue));
 
                     // record unspent output
-                    addressUnspentIndex.push_back(make_pair(CAddressUnspentKey(1, uint160(hashBytes), txhash, k), CAddressUnspentValue(out.nValue, out.scriptPubKey, pindex->nHeight)));
+                    addressUnspentIndex.push_back(std::make_pair(CAddressUnspentKey(1, uint160(hashBytes), txhash, k), CAddressUnspentValue(out.nValue, out.scriptPubKey, pindex->nHeight)));
 
                 } else {
                     continue;

From 917a910974a5f194d5e86de75d9aeb21dd394756 Mon Sep 17 00:00:00 2001
From: Karel Bilek <kb@karelbilek.com>
Date: Fri, 7 Apr 2017 16:44:29 +0200
Subject: [PATCH 1800/1802] Adding docker build

---
 .gitignore              |  1 +
 build_docker/Dockerfile | 22 ++++++++++++++++++++++
 build_docker/Makefile   |  4 ++++
 build_docker/dist.sh    | 22 ++++++++++++++++++++++
 4 files changed, 49 insertions(+)
 create mode 100644 build_docker/Dockerfile
 create mode 100644 build_docker/Makefile
 create mode 100755 build_docker/dist.sh

diff --git a/.gitignore b/.gitignore
index 8ace3c7123219..63a939148ba2e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -105,6 +105,7 @@ qa/pull-tester/tests_config.py
 qa/cache/*
 
 !src/leveldb*/Makefile
+!build_docker/Makefile
 
 /doc/doxygen/
 
diff --git a/build_docker/Dockerfile b/build_docker/Dockerfile
new file mode 100644
index 0000000000000..405c0637ece63
--- /dev/null
+++ b/build_docker/Dockerfile
@@ -0,0 +1,22 @@
+FROM debian:jessie
+MAINTAINER slush@satoshilabs.com
+
+ENV DEBIAN_FRONTEND noninteractive
+ENV HOME /root
+ENV TERM linux
+
+RUN apt-get update && \
+    apt-get upgrade -qy && \
+    apt-get install -qy apt-transport-https curl git && \
+    echo 'deb https://deb.nodesource.com/node_4.x jessie main' | tee /etc/apt/sources.list.d/nodesource.list && \
+    curl -s https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add -
+RUN apt-get update && \
+    apt-get -qy install nodejs python make build-essential libzmq3-dev devscripts dh-systemd
+RUN apt-get -qy install libtool autotools-dev automake pkg-config libssl-dev libevent-dev bsdmainutils
+RUN apt-get -qy install libboost-system-dev libboost-filesystem-dev libboost-chrono-dev libboost-program-options-dev libboost-test-dev libboost-thread-dev
+RUN git clone 'https://github.com/satoshilabs/bitcoin.git' && cd bitcoin
+RUN cd bitcoin && ./autogen.sh
+RUN cd bitcoin && ./configure --disable-wallet
+RUN cd bitcoin && make
+ADD dist.sh /dist.sh
+RUN ./dist.sh
diff --git a/build_docker/Makefile b/build_docker/Makefile
new file mode 100644
index 0000000000000..7dd85d5512742
--- /dev/null
+++ b/build_docker/Makefile
@@ -0,0 +1,4 @@
+all:
+	docker build -t bitcoind-build .
+	rm -rf output && mkdir output
+	docker run -t -v `pwd`/output:/output bitcoind-build /bin/sh -c 'cp /bitcoin/*.tar.gz /output'
diff --git a/build_docker/dist.sh b/build_docker/dist.sh
new file mode 100755
index 0000000000000..d73c4d3ce6365
--- /dev/null
+++ b/build_docker/dist.sh
@@ -0,0 +1,22 @@
+#!/usr/bin/env bash
+
+cd bitcoin
+mkdir bitcoin-0.14.0
+cd bitcoin-0.14.0
+mkdir bin
+cp ../src/bitcoin-cli ./bin
+cp ../src/bitcoind ./bin
+cp ../src/bitcoin-tx ./bin
+strip ./bin/*
+
+mkdir include
+cp ../src/script/bitcoinconsensus.h ./include
+
+mkdir lib
+cp ../src/.libs/libbitcoinconsensus.so.0.0.0 ./lib
+ln -s ./lib/libbitcoinconsensus.so.0.0.0 ./lib.libbitcoinconsensus.so.0
+ln -s ./lib/libbitcoinconsensus.so.0.0.0 ./lib.libbitcoinconsensus.so
+strip ./lib/libbitcoinconsensus.so.0.0.0
+
+cd ..
+tar zcvf bitcoin-0.14.0-linux64.tar.gz bitcoin-0.14.0

From 11bb81a191cf81372260c28385d222d99cb83f51 Mon Sep 17 00:00:00 2001
From: Karel Bilek <kb@karelbilek.com>
Date: Sun, 16 Apr 2017 22:34:30 +0200
Subject: [PATCH 1801/1802] Using different docker build

---
 build_docker/Dockerfile    |  24 ++-----
 build_docker/Makefile      |   4 --
 build_docker/README.md     |  18 ++++++
 build_docker/build.sh      |  47 ++++++++++++++
 build_docker/dist.sh       |  22 -------
 build_docker/run_inside.sh | 127 +++++++++++++++++++++++++++++++++++++
 6 files changed, 199 insertions(+), 43 deletions(-)
 delete mode 100644 build_docker/Makefile
 create mode 100644 build_docker/README.md
 create mode 100755 build_docker/build.sh
 delete mode 100755 build_docker/dist.sh
 create mode 100644 build_docker/run_inside.sh

diff --git a/build_docker/Dockerfile b/build_docker/Dockerfile
index 405c0637ece63..4a503ccd21853 100644
--- a/build_docker/Dockerfile
+++ b/build_docker/Dockerfile
@@ -1,22 +1,12 @@
-FROM debian:jessie
+FROM ubuntu:xenial
 MAINTAINER slush@satoshilabs.com
 
 ENV DEBIAN_FRONTEND noninteractive
-ENV HOME /root
-ENV TERM linux
 
 RUN apt-get update && \
-    apt-get upgrade -qy && \
-    apt-get install -qy apt-transport-https curl git && \
-    echo 'deb https://deb.nodesource.com/node_4.x jessie main' | tee /etc/apt/sources.list.d/nodesource.list && \
-    curl -s https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add -
-RUN apt-get update && \
-    apt-get -qy install nodejs python make build-essential libzmq3-dev devscripts dh-systemd
-RUN apt-get -qy install libtool autotools-dev automake pkg-config libssl-dev libevent-dev bsdmainutils
-RUN apt-get -qy install libboost-system-dev libboost-filesystem-dev libboost-chrono-dev libboost-program-options-dev libboost-test-dev libboost-thread-dev
-RUN git clone 'https://github.com/satoshilabs/bitcoin.git' && cd bitcoin
-RUN cd bitcoin && ./autogen.sh
-RUN cd bitcoin && ./configure --disable-wallet
-RUN cd bitcoin && make
-ADD dist.sh /dist.sh
-RUN ./dist.sh
+    apt-get -qy install curl g++-aarch64-linux-gnu g++-4.8-aarch64-linux-gnu gcc-4.8-aarch64-linux-gnu binutils-aarch64-linux-gnu \
+          g++-4.8-multilib \
+          gcc-4.8-multilib binutils-gold git-core pkg-config autoconf libtool automake faketime bsdmainutils ca-certificates python locales
+
+ADD run_inside.sh /run.sh
+RUN chmod +x /run.sh
diff --git a/build_docker/Makefile b/build_docker/Makefile
deleted file mode 100644
index 7dd85d5512742..0000000000000
--- a/build_docker/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-all:
-	docker build -t bitcoind-build .
-	rm -rf output && mkdir output
-	docker run -t -v `pwd`/output:/output bitcoind-build /bin/sh -c 'cp /bitcoin/*.tar.gz /output'
diff --git a/build_docker/README.md b/build_docker/README.md
new file mode 100644
index 0000000000000..ec53a448d48c9
--- /dev/null
+++ b/build_docker/README.md
@@ -0,0 +1,18 @@
+Building bitcoind for fun and profit
+-----
+
+Run the script like this
+
+```
+./build.sh .. 4
+```
+
+for building in the directory above, with 4 cores
+
+Building takes about 15-25 minutes with 4 cores (on my PC), most of it downloading and building boost/zmq/...
+
+QT gui, wallet, tests and benchmarks are all disabled and are not built, since we don't need that. If you want to change that, change `CONFIGFLAGS` in `run_inside.sh`.
+
+Boost is downloaded from my Dropbox instead of sourceforge as in the original bitcoin build, since sourceforge is slow and the download took 1 hour, dominating the total time of the build, for no real reason. If you don't like that, just remove the `boost_download_path` in `run_inside.sh` or change it to your own URL.
+
+The `run_inside.sh` is kinda complicated, but that's because it's copied from [here](https://github.com/bitcoin/bitcoin/blob/master/contrib/gitian-descriptors/gitian-linux.yml) :) I don't really understand 50% of it
diff --git a/build_docker/build.sh b/build_docker/build.sh
new file mode 100755
index 0000000000000..d9f2de3fca3bd
--- /dev/null
+++ b/build_docker/build.sh
@@ -0,0 +1,47 @@
+#!/usr/bin/env bash
+
+if [ "x$1" == "x" ] || [ "x$2" == "x" ]; then
+  echo "./build.sh bitcoin-dir number-of-processes" >&2
+  echo "           for example: ./build.sh ../ 4" >&2
+  echo "more processes = faster build, more CPU" >&2
+  exit 1
+fi
+
+
+BITCOINPATH=`realpath "${1/#\~/$HOME}"`
+
+if [ ! -f $BITCOINPATH/src/bitcoind.cpp ]; then 
+  echo "First parameter doesn't seem like a bitcoin path" >&2
+  echo "" >&2
+  echo "./build.sh bitcoin-dir number-of-processes" >&2
+  echo "           for example: ./build.sh ../ 4" >&2
+  echo "more processes = faster build, more CPU" >&2
+
+  exit 1
+fi
+
+re='^[0-9]+$'
+if ! [[ $2 =~ $re ]] ; then
+  echo "Second parameter not a number" >&2
+  echo "" >&2
+  echo "./build.sh bitcoin-dir number-of-processes" >&2
+  echo "           for example: ./build.sh ../ 4" >&2
+  echo "more processes = faster build, more CPU" >&2
+
+  exit 1
+fi
+
+set -ex
+
+docker build -t bitcoind_build .
+
+docker run -v $BITCOINPATH:/bitcoin bitcoind_build /run.sh $2
+
+cd $BITCOINPATH/out
+
+# renaming from Bitcoin name to Bitcore name.... stupid thing
+rm -f $BITCOINPATH/out/bitcoin-0.14.0-x86_64-linux-gnu-debug.tar.gz
+rename s/x86_64-linux-gnu/linux64/ $BITCOINPATH/out/*.tar.gz
+
+sha256sum *.tar.gz > SHA256SUMS
+gpg --digest-algo sha256 --clearsign SHA256SUMS
diff --git a/build_docker/dist.sh b/build_docker/dist.sh
deleted file mode 100755
index d73c4d3ce6365..0000000000000
--- a/build_docker/dist.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/usr/bin/env bash
-
-cd bitcoin
-mkdir bitcoin-0.14.0
-cd bitcoin-0.14.0
-mkdir bin
-cp ../src/bitcoin-cli ./bin
-cp ../src/bitcoind ./bin
-cp ../src/bitcoin-tx ./bin
-strip ./bin/*
-
-mkdir include
-cp ../src/script/bitcoinconsensus.h ./include
-
-mkdir lib
-cp ../src/.libs/libbitcoinconsensus.so.0.0.0 ./lib
-ln -s ./lib/libbitcoinconsensus.so.0.0.0 ./lib.libbitcoinconsensus.so.0
-ln -s ./lib/libbitcoinconsensus.so.0.0.0 ./lib.libbitcoinconsensus.so
-strip ./lib/libbitcoinconsensus.so.0.0.0
-
-cd ..
-tar zcvf bitcoin-0.14.0-linux64.tar.gz bitcoin-0.14.0
diff --git a/build_docker/run_inside.sh b/build_docker/run_inside.sh
new file mode 100644
index 0000000000000..920a6ac909e29
--- /dev/null
+++ b/build_docker/run_inside.sh
@@ -0,0 +1,127 @@
+#!/usr/bin/env bash
+
+set -ex
+
+
+locale-gen en_US.UTF-8
+update-locale LANG=en_US.UTF-8
+
+export LANG='en_US.UTF-8'
+export LC_ALL='en_US.UTF-8'
+umask 002
+export OUTDIR=/bitcoin/out
+rm -rf $OUTDIR
+mkdir $OUTDIR
+chmod a+rwx $OUTDIR
+
+MAKEOPTS=(-j$1)
+
+
+WRAP_DIR=$HOME/wrapped
+HOSTS="x86_64-linux-gnu"
+CONFIGFLAGS="--enable-glibc-back-compat --enable-reduce-exports --disable-bench --disable-gui-tests --disable-wallet --with-gui=no --disable-tests --disable-bench"
+HOST_CFLAGS="-O2 -g"
+HOST_CXXFLAGS="-O2 -g"
+HOST_LDFLAGS=-static-libstdc++
+
+export QT_RCC_TEST=1
+export GZIP="-9n"
+export TZ="UTC"
+export BUILD_DIR=`pwd`
+mkdir -p ${WRAP_DIR}
+if test -n "$GBUILD_CACHE_ENABLED"; then
+	export SOURCES_PATH=${GBUILD_COMMON_CACHE}
+	export BASE_CACHE=${GBUILD_PACKAGE_CACHE}
+	mkdir -p ${BASE_CACHE} ${SOURCES_PATH}
+fi
+
+export PATH_orig=${PATH}
+export PATH=${WRAP_DIR}:${PATH}
+
+EXTRA_INCLUDES_BASE=$WRAP_DIR/extra_includes
+mkdir -p $EXTRA_INCLUDES_BASE
+
+# x86 needs /usr/include/i386-linux-gnu/asm pointed to /usr/include/x86_64-linux-gnu/asm,
+# but we can't write there. Instead, create a link here and force it to be included in the
+# search paths by wrapping gcc/g++.
+
+mkdir -p $EXTRA_INCLUDES_BASE/i686-pc-linux-gnu
+rm -f $WRAP_DIR/extra_includes/i686-pc-linux-gnu/asm
+ln -s /usr/include/x86_64-linux-gnu/asm $EXTRA_INCLUDES_BASE/i686-pc-linux-gnu/asm
+
+for prog in gcc g++; do
+rm -f ${WRAP_DIR}/${prog}
+cat << EOF > ${WRAP_DIR}/${prog}
+#!/bin/bash
+REAL="`which -a ${prog} | grep -v ${WRAP_DIR}/${prog} | head -1`"
+for var in "\$@"
+do
+	if [ "\$var" = "-m32" ]; then
+		export C_INCLUDE_PATH="$EXTRA_INCLUDES_BASE/i686-pc-linux-gnu"
+		export CPLUS_INCLUDE_PATH="$EXTRA_INCLUDES_BASE/i686-pc-linux-gnu"
+		break
+	fi
+done
+\$REAL \$@
+EOF
+chmod +x ${WRAP_DIR}/${prog}
+done
+
+cd bitcoin
+BASEPREFIX=`pwd`/depends
+# Build dependencies for each host
+for i in $HOSTS; do
+	EXTRA_INCLUDES="$EXTRA_INCLUDES_BASE/$i"
+	if [ -d "$EXTRA_INCLUDES" ]; then
+		export HOST_ID_SALT="$EXTRA_INCLUDES"
+	fi
+	make ${MAKEOPTS} -C ${BASEPREFIX} NO_QT=1 NO_WALLET=1 HOST="${i}" boost_download_path='https://www.dropbox.com/s/vgn8gn04xyja128/boost_1_63_0.tar.bz2?dl=1'
+	unset HOST_ID_SALT
+done
+
+export PATH=${PATH_orig}
+export PATH=${WRAP_DIR}:${PATH}
+
+# Create the release tarball using (arbitrarily) the first host
+./autogen.sh
+CONFIG_SITE=${BASEPREFIX}/`echo "${HOSTS}" | awk '{print $1;}'`/share/config.site ./configure --prefix=/
+make dist
+SOURCEDIST=`echo bitcoin-*.tar.gz`
+DISTNAME=`echo ${SOURCEDIST} | sed 's/.tar.*//'`
+# Correct tar file order
+mkdir -p temp
+pushd temp
+tar xf ../$SOURCEDIST
+find bitcoin-* | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ../$SOURCEDIST
+popd
+
+ORIGPATH="$PATH"
+# Extract the release tarball into a dir for each host and build
+for i in ${HOSTS}; do
+	export PATH=${BASEPREFIX}/${i}/native/bin:${ORIGPATH}
+	mkdir -p distsrc-${i}
+	cd distsrc-${i}
+	INSTALLPATH=`pwd`/installed/${DISTNAME}
+	mkdir -p ${INSTALLPATH}
+	tar --strip-components=1 -xf ../$SOURCEDIST
+
+	CONFIG_SITE=${BASEPREFIX}/${i}/share/config.site ./configure --prefix=/ --disable-ccache  --disable-maintainer-mode --disable-dependency-tracking ${CONFIGFLAGS} CFLAGS="${HOST_CFLAGS}" CXXFLAGS="${HOST_CXXFLAGS}" LDFLAGS="${HOST_LDFLAGS}"
+	make ${MAKEOPTS}
+	make ${MAKEOPTS} -C src check-security
+
+	make install DESTDIR=${INSTALLPATH}
+	cd installed
+	find . -name "lib*.la" -delete
+	find . -name "lib*.a" -delete
+	rm -rf ${DISTNAME}/lib/pkgconfig
+	find ${DISTNAME}/bin -type f -executable -exec ../contrib/devtools/split-debug.sh {} {} {}.dbg \;
+	find ${DISTNAME}/lib -type f -exec ../contrib/devtools/split-debug.sh {} {} {}.dbg \;
+	find ${DISTNAME} -not -name "*.dbg" | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ${OUTDIR}/${DISTNAME}-${i}.tar.gz
+	find ${DISTNAME} -name "*.dbg" | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ${OUTDIR}/${DISTNAME}-${i}-debug.tar.gz
+	cd ../../
+	rm -rf distsrc-${i}
+done
+mkdir -p $OUTDIR/src
+mv $SOURCEDIST $OUTDIR/src
+
+

From 063590dd4ff0dfce5997c427189c88d7495ada8c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karel=20B=C3=ADlek?= <kb@karelbilek.com>
Date: Mon, 15 May 2017 11:18:14 +0200
Subject: [PATCH 1802/1802] Update README.md

---
 README.md | 83 ++-----------------------------------------------------
 1 file changed, 2 insertions(+), 81 deletions(-)

diff --git a/README.md b/README.md
index 38a90dde4969f..85ec8727a4279 100644
--- a/README.md
+++ b/README.md
@@ -1,82 +1,3 @@
-Bitcoin Core integration/staging tree
-=====================================
+This is fork of bitpay/bitcoin, rebased on 0.14.0 bitcoin
 
-[![Build Status](https://travis-ci.org/bitcoin/bitcoin.svg?branch=master)](https://travis-ci.org/bitcoin/bitcoin)
-
-https://bitcoincore.org
-
-What is Bitcoin?
-----------------
-
-Bitcoin is an experimental digital currency that enables instant payments to
-anyone, anywhere in the world. Bitcoin uses peer-to-peer technology to operate
-with no central authority: managing transactions and issuing money are carried
-out collectively by the network. Bitcoin Core is the name of open source
-software which enables the use of this currency.
-
-For more information, as well as an immediately useable, binary version of
-the Bitcoin Core software, see https://bitcoin.org/en/download, or read the
-[original whitepaper](https://bitcoincore.org/bitcoin.pdf).
-
-License
--------
-
-Bitcoin Core is released under the terms of the MIT license. See [COPYING](COPYING) for more
-information or see https://opensource.org/licenses/MIT.
-
-Development Process
--------------------
-
-The `master` branch is regularly built and tested, but is not guaranteed to be
-completely stable. [Tags](https://github.com/bitcoin/bitcoin/tags) are created
-regularly to indicate new official, stable release versions of Bitcoin Core.
-
-The contribution workflow is described in [CONTRIBUTING.md](CONTRIBUTING.md).
-
-The developer [mailing list](https://lists.linuxfoundation.org/mailman/listinfo/bitcoin-dev)
-should be used to discuss complicated or controversial changes before working
-on a patch set.
-
-Developer IRC can be found on Freenode at #bitcoin-core-dev.
-
-Testing
--------
-
-Testing and code review is the bottleneck for development; we get more pull
-requests than we can review and test on short notice. Please be patient and help out by testing
-other people's pull requests, and remember this is a security-critical project where any mistake might cost people
-lots of money.
-
-### Automated Testing
-
-Developers are strongly encouraged to write [unit tests](src/test/README.md) for new code, and to
-submit new unit tests for old code. Unit tests can be compiled and run
-(assuming they weren't disabled in configure) with: `make check`. Further details on running
-and extending unit tests can be found in [/src/test/README.md](/src/test/README.md).
-
-There are also [regression and integration tests](/qa) of the RPC interface, written
-in Python, that are run automatically on the build server.
-These tests can be run (if the [test dependencies](/qa) are installed) with: `qa/pull-tester/rpc-tests.py`
-
-The Travis CI system makes sure that every pull request is built for Windows, Linux, and OS X, and that unit/sanity tests are run automatically.
-
-### Manual Quality Assurance (QA) Testing
-
-Changes should be tested by somebody other than the developer who wrote the
-code. This is especially important for large or high-risk changes. It is useful
-to add a test plan to the pull request description if testing the changes is
-not straightforward.
-
-Translations
-------------
-
-Changes to translations as well as new translations can be submitted to
-[Bitcoin Core's Transifex page](https://www.transifex.com/projects/p/bitcoin/).
-
-Translations are periodically pulled from Transifex and merged into the git repository. See the
-[translation process](doc/translation_process.md) for details on how this works.
-
-**Important**: We do not accept translation changes as GitHub pull requests because the next
-pull from Transifex would automatically overwrite them again.
-
-Translators should also subscribe to the [mailing list](https://groups.google.com/forum/#!forum/bitcoin-translators).
+This is more experimental repo; the repo we actually use at production is at satoshilabs/bitcoin so go there